commit 263ff5f89589bbc43d2abf785c7d3ce9231e8e77
Author: mdelfede <mdelfede@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date:   Sat Jun 7 22:31:27 2008 +0000

    changed svn layout
    
    git-svn-id: svn://ultimatepp.org/upp/trunk@281 f0d560ea-af0d-0410-9eb7-867de7ffcac7

diff --git a/examples/AddressBook/AddressBook.cpp b/examples/AddressBook/AddressBook.cpp
new file mode 100644
index 000000000..91d84f369
--- /dev/null
+++ b/examples/AddressBook/AddressBook.cpp
@@ -0,0 +1,204 @@
+// This is an upp conversion of qt example, see
+// http://doc.trolltech.com/3.0/addressbook-example.html
+
+#include <CtrlLib/CtrlLib.h>
+#include <Report/Report.h>
+
+using namespace Upp;
+
+#define LAYOUTFILE <AddressBook/AddressBook.lay>
+#include <CtrlCore/lay.h>
+
+class AddressBook : public WithAddressBookLayout<TopWindow> {
+	WithModifyLayout<ParentCtrl> modify;
+	WithSearchLayout<ParentCtrl> search;
+	FileSel fs;
+	String  filename;
+
+	void SetupSearch();
+	void Add();
+	void Change();
+	void Search();
+	void Open();
+	void Save();
+	void SaveAs();
+	void Print();
+	void Quit();
+	void FileMenu(Bar& bar);
+	void MainMenu(Bar& bar);
+
+	typedef AddressBook CLASSNAME;
+
+public:
+	void Serialize(Stream& s);
+
+	AddressBook();
+};
+
+AddressBook::AddressBook()
+{
+	CtrlLayout(*this, "Address book");
+	CtrlLayout(modify);
+	CtrlLayout(search);
+	tab.Add(modify, "Modify");
+	tab.Add(search, "Search");
+	ActiveFocus(search.name);
+	search.oname = true;
+	search.oname <<= search.osurname <<= search.oaddress
+	             <<= search.oemail <<= THISBACK(SetupSearch);
+	array.AddColumn("Name");
+	array.AddColumn("Surname");
+	array.AddColumn("Address");
+	array.AddColumn("Email");
+	modify.add <<= THISBACK(Add);
+	modify.change <<= THISBACK(Change);
+	search.search <<= THISBACK(Search);
+	SetupSearch();
+	fs.AllFilesType();
+	menu.Set(THISBACK(MainMenu));
+}
+
+void AddressBook::FileMenu(Bar& bar)
+{
+	bar.Add("Open..", CtrlImg::open(), THISBACK(Open));
+	bar.Add("Save", CtrlImg::save(), THISBACK(Save));
+	bar.Add("Save as..", CtrlImg::save_as(), THISBACK(SaveAs));
+	bar.Separator();
+	bar.Add("Print", CtrlImg::print(), THISBACK(Print));
+	bar.Separator();
+	bar.Add("Quit", THISBACK(Quit));
+}
+
+void AddressBook::MainMenu(Bar& bar)
+{
+	bar.Add("File", THISBACK(FileMenu));
+}
+
+void AddressBook::SetupSearch()
+{
+	search.name.Enable(search.oname);
+	search.surname.Enable(search.osurname);
+	search.address.Enable(search.oaddress);
+	search.email.Enable(search.oemail);
+}
+
+void AddressBook::Add()
+{
+	array.Add(~modify.name, ~modify.surname, ~modify.address, ~modify.email);
+	array.GoEnd();
+	modify.name <<= modify.surname <<= modify.address <<= modify.email <<= Null;
+	ActiveFocus(modify.name);
+}
+
+void AddressBook::Change()
+{
+	if(array.IsCursor()) {
+		array.Set(0, ~modify.name);
+		array.Set(1, ~modify.surname);
+		array.Set(2, ~modify.address);
+		array.Set(3, ~modify.email);
+	}
+}
+
+bool Contains(const String& text, const String& substr)
+{
+	for(const char *s = text; s <= text.End() - substr.GetLength(); s++)
+		if(strncmp(s, substr, substr.GetLength()) == 0)
+			return true;
+	return false;
+}
+
+void AddressBook::Search()
+{
+	if(!array.GetCount()) return;
+	bool sc = true;
+	array.ClearSelection();
+	for(int i = 0; i < array.GetCount(); i++) {
+		if((!search.oname || Contains(array.Get(i, 0), ~search.name)) &&
+		   (!search.osurname || Contains(array.Get(i, 1), ~search.surname)) &&
+		   (!search.oaddress || Contains(array.Get(i, 2), ~search.address)) &&
+		   (!search.oemail || Contains(array.Get(i, 3), ~search.email))) {
+			array.Select(i);
+			if(sc) {
+				array.SetCursor(i);
+				array.CenterCursor();
+				sc = false;
+			};
+		}
+	}
+}
+
+void AddressBook::Open()
+{
+	if(!fs.ExecuteOpen()) return;
+	filename = fs;
+	FileIn in(filename);
+	if(!in) {
+		Exclamation("Unable to open [* " + DeQtf(filename));
+		return;
+	}
+	array.Clear();
+	while(!in.IsEof()) {
+		Vector<Value> q;
+		for(int i = 0; i < 4; i++)
+			q.Add(in.GetLine());
+		array.Add(q);
+	}
+}
+
+void AddressBook::Save()
+{
+	if(IsEmpty(filename)) {
+		SaveAs();
+		return;
+	}
+	FileOut out(filename);
+	if(!out) {
+		Exclamation("Unable to open " + filename);
+		return;
+	}
+	for(int i = 0; i < array.GetCount(); i++)
+		for(int q = 0; q < 4; q++)
+			out.PutLine(String(array.Get(i, q)));
+}
+
+void AddressBook::SaveAs()
+{
+	if(!fs.ExecuteSaveAs()) return;
+	filename = fs;
+	Save();
+}
+
+void AddressBook::Print()
+{
+	String qtf;
+	qtf = "{{1:1:1:1 Name:: Surname:: Address:: Email";
+	for(int i = 0; i < array.GetCount(); i++)
+		for(int q = 0; q < 4; q++)
+			qtf << ":: " << DeQtf((String)array.Get(i, q));
+	Report report;
+	report << qtf;
+	Perform(report);
+}
+
+void AddressBook::Quit()
+{
+	Break();
+}
+
+void AddressBook::Serialize(Stream& s)
+{
+	int version = 0;
+	s / version;
+	s % search.oname % search.osurname % search.oaddress % search.oemail;
+	s % fs;
+	SetupSearch();
+}
+
+GUI_APP_MAIN
+{
+	AddressBook ab;
+	LoadFromFile(ab);
+	ab.Run();
+	StoreToFile(ab);
+}
diff --git a/examples/AddressBook/AddressBook.lay b/examples/AddressBook/AddressBook.lay
new file mode 100644
index 000000000..49af3166a
--- /dev/null
+++ b/examples/AddressBook/AddressBook.lay
@@ -0,0 +1,30 @@
+LAYOUT(AddressBookLayout, 512, 456)
+	ITEM(MenuBar, menu, LeftPosZ(0, 216).TopPosZ(0, 20))
+	ITEM(TabCtrl, tab, LeftPosZ(8, 496).TopPosZ(32, 84))
+	ITEM(ArrayCtrl, array, LeftPosZ(8, 496).TopPosZ(124, 324))
+END_LAYOUT
+
+LAYOUT(ModifyLayout, 480, 52)
+	ITEM(Label, dv___0, SetLabel(t_("&Name")).LeftPosZ(8, 48).TopPosZ(8, 15))
+	ITEM(EditField, name, LeftPosZ(8, 96).TopPosZ(28, 19))
+	ITEM(Label, dv___2, SetLabel(t_("&Surname")).LeftPosZ(108, 48).TopPosZ(8, 15))
+	ITEM(EditField, surname, LeftPosZ(108, 96).TopPosZ(28, 19))
+	ITEM(Label, dv___4, SetLabel(t_("&Address")).LeftPosZ(208, 48).TopPosZ(8, 15))
+	ITEM(EditField, address, LeftPosZ(208, 96).TopPosZ(28, 19))
+	ITEM(Label, dv___6, SetLabel(t_("&Email")).LeftPosZ(308, 48).TopPosZ(8, 15))
+	ITEM(EditField, email, LeftPosZ(308, 96).TopPosZ(28, 19))
+	ITEM(Button, add, SetLabel(t_("Ad&d")).LeftPosZ(416, 56).TopPosZ(4, 20))
+	ITEM(Button, change, SetLabel(t_("&Change")).LeftPosZ(416, 56).TopPosZ(28, 20))
+END_LAYOUT
+
+LAYOUT(SearchLayout, 480, 56)
+	ITEM(Option, oname, SetLabel(t_("&Name")).LeftPosZ(8, 56).TopPosZ(8, 18))
+	ITEM(EditField, name, LeftPosZ(8, 96).TopPosZ(28, 19))
+	ITEM(Option, osurname, SetLabel(t_("&Surname")).LeftPosZ(108, 64).TopPosZ(8, 18))
+	ITEM(EditField, surname, LeftPosZ(108, 96).TopPosZ(28, 19))
+	ITEM(Option, oaddress, SetLabel(t_("&Address")).LeftPosZ(208, 64).TopPosZ(8, 18))
+	ITEM(EditField, address, LeftPosZ(208, 96).TopPosZ(28, 19))
+	ITEM(Option, oemail, SetLabel(t_("&Email")).LeftPosZ(308, 52).TopPosZ(8, 18))
+	ITEM(EditField, email, LeftPosZ(308, 96).TopPosZ(28, 19))
+	ITEM(Button, search, SetLabel(t_("&Search")).LeftPosZ(416, 56).TopPosZ(28, 20))
+END_LAYOUT
diff --git a/examples/AddressBook/AddressBook.upp b/examples/AddressBook/AddressBook.upp
new file mode 100644
index 000000000..baf64d82a
--- /dev/null
+++ b/examples/AddressBook/AddressBook.upp
@@ -0,0 +1,13 @@
+description "Simple address book application";
+
+uses
+	CtrlLib,
+	Report;
+
+file
+	AddressBook.cpp,
+	AddressBook.lay;
+
+mainconfig
+	"" = "GUI";
+
diff --git a/examples/AddressBookXML/AddressBook.cpp b/examples/AddressBookXML/AddressBook.cpp
new file mode 100644
index 000000000..8a988e708
--- /dev/null
+++ b/examples/AddressBookXML/AddressBook.cpp
@@ -0,0 +1,232 @@
+#include <CtrlLib/CtrlLib.h>
+#include <Report/Report.h>
+
+using namespace Upp;
+
+#define LAYOUTFILE <AddressBookXML/AddressBook.lay>
+#include <CtrlCore/lay.h>
+
+class AddressBook : public WithAddressBookLayout<TopWindow> {
+	WithModifyLayout<ParentCtrl> modify;
+	WithSearchLayout<ParentCtrl> search;
+	FileSel fs;
+	String  filename;
+
+	void SetupSearch();
+	void Add();
+	void Change();
+	void Search();
+	void Open();
+	void Save();
+	void SaveAs();
+	void Print();
+	void Quit();
+	void FileMenu(Bar& bar);
+	void MainMenu(Bar& bar);
+
+	typedef AddressBook CLASSNAME;
+
+public:
+	void Serialize(Stream& s);
+
+	AddressBook();
+};
+
+AddressBook::AddressBook()
+{
+	CtrlLayout(*this, "Address book");
+	CtrlLayout(modify);
+	CtrlLayout(search);
+	tab.Add(modify, "Modify");
+	tab.Add(search, "Search");
+	ActiveFocus(search.name);
+	search.oname = true;
+	search.oname <<= search.osurname <<= search.oaddress
+	             <<= search.oemail <<= THISBACK(SetupSearch);
+	array.AddColumn("Name");
+	array.AddColumn("Surname");
+	array.AddColumn("Address");
+	array.AddColumn("Email");
+	modify.add <<= THISBACK(Add);
+	modify.change <<= THISBACK(Change);
+	search.search <<= THISBACK(Search);
+	SetupSearch();
+	fs.AllFilesType();
+	menu.Set(THISBACK(MainMenu));
+}
+
+void AddressBook::FileMenu(Bar& bar)
+{
+	bar.Add("Open..", CtrlImg::open(), THISBACK(Open));
+	bar.Add("Save", CtrlImg::save(), THISBACK(Save));
+	bar.Add("Save as..", CtrlImg::save_as(), THISBACK(SaveAs));
+	bar.Separator();
+	bar.Add("Print", CtrlImg::print(), THISBACK(Print));
+	bar.Separator();
+	bar.Add("Quit", THISBACK(Quit));
+}
+
+void AddressBook::MainMenu(Bar& bar)
+{
+	bar.Add("File", THISBACK(FileMenu));
+}
+
+void AddressBook::SetupSearch()
+{
+	search.name.Enable(search.oname);
+	search.surname.Enable(search.osurname);
+	search.address.Enable(search.oaddress);
+	search.email.Enable(search.oemail);
+}
+
+void AddressBook::Add()
+{
+	array.Add(~modify.name, ~modify.surname, ~modify.address, ~modify.email);
+	array.GoEnd();
+	modify.name <<= modify.surname <<= modify.address <<= modify.email <<= Null;
+	ActiveFocus(modify.name);
+}
+
+void AddressBook::Change()
+{
+	if(array.IsCursor()) {
+		array.Set(0, ~modify.name);
+		array.Set(1, ~modify.surname);
+		array.Set(2, ~modify.address);
+		array.Set(3, ~modify.email);
+	}
+}
+
+bool Contains(const String& text, const String& substr)
+{
+	for(const char *s = text; s <= text.End() - substr.GetLength(); s++)
+		if(strncmp(s, substr, substr.GetLength()) == 0)
+			return true;
+	return false;
+}
+
+void AddressBook::Search()
+{
+	if(!array.GetCount()) return;
+	bool sc = true;
+	array.ClearSelection();
+	for(int i = 0; i < array.GetCount(); i++) {
+		if((!search.oname || Contains(array.Get(i, 0), ~search.name)) &&
+		   (!search.osurname || Contains(array.Get(i, 1), ~search.surname)) &&
+		   (!search.oaddress || Contains(array.Get(i, 2), ~search.address)) &&
+		   (!search.oemail || Contains(array.Get(i, 3), ~search.email))) {
+			array.Select(i);
+			if(sc) {
+				array.SetCursor(i);
+				array.CenterCursor();
+				sc = false;
+			};
+		}
+	}
+}
+
+void AddressBook::Open()
+{
+	if(!fs.ExecuteOpen()) return;
+	filename = fs;
+	array.Clear();
+	try {
+		String d = LoadFile(filename);
+		XmlParser p(d);
+		while(!p.IsTag())
+			p.Skip();
+		p.PassTag("AddressBook");
+		while(!p.IsEof()) {
+			if(p.Tag("person")) {
+				String name;
+				String surname;
+				String address;
+				String email;
+				while(!p.End()) {
+					if(p.Tag("name"))
+						name = p.ReadText();
+					else
+					if(p.Tag("surname"))
+						surname = p.ReadText();
+					else
+					if(p.Tag("address"))
+						address = p.ReadText();
+					else
+					if(p.Tag("email"))
+						email = p.ReadText();
+					else {
+						p.Skip();
+						continue;
+					}
+					p.PassEnd();
+				}
+				array.Add(name, surname, address, email);
+			}
+			else
+				p.Skip();
+		}
+	}
+	catch(XmlError) {
+		Exclamation("Error reading the input file!");
+	}
+}
+
+void AddressBook::Save()
+{
+	if(IsEmpty(filename)) {
+		SaveAs();
+		return;
+	}
+	String xml;
+	for(int i = 0; i < array.GetCount(); i++)
+		xml <<
+			XmlTag("person") (
+				XmlTag("name").Text(array.Get(i, 0)) +
+				XmlTag("surname").Text(array.Get(i, 1)) +
+				XmlTag("address").Text(array.Get(i, 2)) +
+				XmlTag("email").Text(array.Get(i, 3))
+			);
+	if(!SaveFile(filename, XmlDoc("AddressBook", xml)))
+		Exclamation("Error saving the file!");
+}
+
+void AddressBook::SaveAs()
+{
+	if(!fs.ExecuteSaveAs()) return;
+	filename = fs;
+	Save();
+}
+
+void AddressBook::Print()
+{
+	String qtf;
+	qtf = "{{1:1:1:1 Name:: Surname:: Address:: Email";
+	for(int i = 0; i < array.GetCount(); i++)
+		for(int q = 0; q < 4; q++)
+			qtf << ":: " << DeQtf((String)array.Get(i, q));
+	Report report;
+	report << qtf;
+	Perform(report);
+}
+
+void AddressBook::Quit()
+{
+	Break();
+}
+
+void AddressBook::Serialize(Stream& s)
+{
+	int version = 0;
+	s / version;
+	s % search.oname % search.osurname % search.oaddress % search.oemail;
+	s % fs;
+	SetupSearch();
+}
+
+GUI_APP_MAIN
+{
+	AddressBook ab;
+	LoadFromFile(ab);
+	ab.Run();
+	StoreToFile(ab);
+}
diff --git a/examples/AddressBookXML/AddressBook.lay b/examples/AddressBookXML/AddressBook.lay
new file mode 100644
index 000000000..af6a2c9cf
--- /dev/null
+++ b/examples/AddressBookXML/AddressBook.lay
@@ -0,0 +1,30 @@
+LAYOUT(AddressBookLayout, 516, 456)
+	ITEM(MenuBar, menu, LeftPosZ(0, 200).TopPosZ(0, 20))
+	ITEM(TabCtrl, tab, LeftPosZ(8, 500).TopPosZ(32, 84))
+	ITEM(ArrayCtrl, array, LeftPosZ(8, 500).TopPosZ(124, 324))
+END_LAYOUT
+
+LAYOUT(ModifyLayout, 480, 52)
+	ITEM(Label, dv___0, SetLabel(t_("&Name")).LeftPosZ(8, 48).TopPosZ(8, 15))
+	ITEM(EditField, name, LeftPosZ(8, 96).TopPosZ(28, 19))
+	ITEM(Label, dv___2, SetLabel(t_("&Surname")).LeftPosZ(108, 48).TopPosZ(8, 15))
+	ITEM(EditField, surname, LeftPosZ(108, 96).TopPosZ(28, 19))
+	ITEM(Label, dv___4, SetLabel(t_("&Address")).LeftPosZ(208, 48).TopPosZ(8, 15))
+	ITEM(EditField, address, LeftPosZ(208, 96).TopPosZ(28, 19))
+	ITEM(Label, dv___6, SetLabel(t_("&Email")).LeftPosZ(308, 48).TopPosZ(8, 15))
+	ITEM(EditField, email, LeftPosZ(308, 96).TopPosZ(28, 19))
+	ITEM(Button, add, SetLabel(t_("Ad&d")).LeftPosZ(416, 56).TopPosZ(4, 20))
+	ITEM(Button, change, SetLabel(t_("&Change")).LeftPosZ(416, 56).TopPosZ(28, 20))
+END_LAYOUT
+
+LAYOUT(SearchLayout, 480, 56)
+	ITEM(Option, oname, SetLabel(t_("&Name")).LeftPosZ(8, 56).TopPosZ(8, 18))
+	ITEM(EditField, name, LeftPosZ(8, 96).TopPosZ(28, 19))
+	ITEM(Option, osurname, SetLabel(t_("&Surname")).LeftPosZ(108, 64).TopPosZ(8, 18))
+	ITEM(EditField, surname, LeftPosZ(108, 96).TopPosZ(28, 19))
+	ITEM(Option, oaddress, SetLabel(t_("&Address")).LeftPosZ(208, 64).TopPosZ(8, 18))
+	ITEM(EditField, address, LeftPosZ(208, 96).TopPosZ(28, 19))
+	ITEM(Option, oemail, SetLabel(t_("&Email")).LeftPosZ(308, 52).TopPosZ(8, 18))
+	ITEM(EditField, email, LeftPosZ(308, 96).TopPosZ(28, 19))
+	ITEM(Button, search, SetLabel(t_("&Search")).LeftPosZ(416, 56).TopPosZ(28, 20))
+END_LAYOUT
diff --git a/examples/AddressBookXML/AddressBookXML.upp b/examples/AddressBookXML/AddressBookXML.upp
new file mode 100644
index 000000000..a253aa3a9
--- /dev/null
+++ b/examples/AddressBookXML/AddressBookXML.upp
@@ -0,0 +1,13 @@
+description "Address book application, uses XML to store data (using SAX like U++ classes)";
+
+uses
+	CtrlLib,
+	Report;
+
+file
+	AddressBook.cpp,
+	AddressBook.lay;
+
+mainconfig
+	"" = "GUI";
+
diff --git a/examples/AddressBookXML2/AddressBook.cpp b/examples/AddressBookXML2/AddressBook.cpp
new file mode 100644
index 000000000..88925af8c
--- /dev/null
+++ b/examples/AddressBookXML2/AddressBook.cpp
@@ -0,0 +1,228 @@
+#include <CtrlLib/CtrlLib.h>
+#include <Report/Report.h>
+
+using namespace Upp;
+
+#define LAYOUTFILE <AddressBookXML2/AddressBook.lay>
+#include <CtrlCore/lay.h>
+
+#define TAG_ADDRESSBOOK "AddressBook"
+#define TAG_PERSON "person"
+#define TAG_NAME "name"
+#define TAG_SURNAME "surname"
+#define TAG_ADDRESS "address"
+#define TAG_EMAIL "email"
+
+class AddressBook : public WithAddressBookLayout<TopWindow> {
+	WithModifyLayout<ParentCtrl> modify;
+	WithSearchLayout<ParentCtrl> search;
+	FileSel fs;
+	String  filename;
+
+	void SetupSearch();
+	void Add();
+	void Change();
+	void Search();
+	void Open();
+	void Save();
+	void SaveAs();
+	void Print();
+	void Quit();
+	void FileMenu(Bar& bar);
+	void MainMenu(Bar& bar);
+
+	typedef AddressBook CLASSNAME;
+
+public:
+	void Serialize(Stream& s);
+
+	AddressBook();
+};
+
+AddressBook::AddressBook()
+{
+	CtrlLayout(*this, "Address book");
+	CtrlLayout(modify);
+	CtrlLayout(search);
+	tab.Add(modify, "Modify");
+	tab.Add(search, "Search");
+	ActiveFocus(search.name);
+	search.oname = true;
+	search.oname <<= search.osurname <<= search.oaddress
+	             <<= search.oemail <<= THISBACK(SetupSearch);
+	array.AddColumn(TAG_NAME, "Name");
+	array.AddColumn(TAG_SURNAME, "Surname");
+	array.AddColumn(TAG_ADDRESS, "Address");
+	array.AddColumn(TAG_EMAIL, "Email");
+	modify.add <<= THISBACK(Add);
+	modify.change <<= THISBACK(Change);
+	search.search <<= THISBACK(Search);
+	SetupSearch();
+	fs.AllFilesType();
+	menu.Set(THISBACK(MainMenu));
+}
+
+void AddressBook::FileMenu(Bar& bar)
+{
+	bar.Add("Open..", CtrlImg::open(), THISBACK(Open));
+	bar.Add("Save", CtrlImg::save(), THISBACK(Save));
+	bar.Add("Save as..", CtrlImg::save_as(), THISBACK(SaveAs));
+	bar.Separator();
+	bar.Add("Print", CtrlImg::print(), THISBACK(Print));
+	bar.Separator();
+	bar.Add("Quit", THISBACK(Quit));
+}
+
+void AddressBook::MainMenu(Bar& bar)
+{
+	bar.Add("File", THISBACK(FileMenu));
+}
+
+void AddressBook::SetupSearch()
+{
+	search.name.Enable(search.oname);
+	search.surname.Enable(search.osurname);
+	search.address.Enable(search.oaddress);
+	search.email.Enable(search.oemail);
+}
+
+void AddressBook::Add()
+{
+	array.Add(~modify.name, ~modify.surname, ~modify.address, ~modify.email);
+	array.GoEnd();
+	modify.name <<= modify.surname <<= modify.address <<= modify.email <<= Null;
+	ActiveFocus(modify.name);
+}
+
+void AddressBook::Change()
+{
+	if(array.IsCursor()) {
+		array.Set(0, ~modify.name);
+		array.Set(1, ~modify.surname);
+		array.Set(2, ~modify.address);
+		array.Set(3, ~modify.email);
+	}
+}
+
+bool Contains(const String& text, const String& substr)
+{
+	for(const char *s = text; s <= text.End() - substr.GetLength(); s++)
+		if(strncmp(s, substr, substr.GetLength()) == 0)
+			return true;
+	return false;
+}
+
+void AddressBook::Search()
+{
+	if(!array.GetCount()) return;
+	bool sc = true;
+	array.ClearSelection();
+	for(int i = 0; i < array.GetCount(); i++) {
+		if((!search.oname || Contains(array.Get(i, 0), ~search.name)) &&
+		   (!search.osurname || Contains(array.Get(i, 1), ~search.surname)) &&
+		   (!search.oaddress || Contains(array.Get(i, 2), ~search.address)) &&
+		   (!search.oemail || Contains(array.Get(i, 3), ~search.email))) {
+			array.Select(i);
+			if(sc) {
+				array.SetCursor(i);
+				array.CenterCursor();
+				sc = false;
+			};
+		}
+	}
+}
+
+void AddressBook::Open()
+{
+	if(!fs.ExecuteOpen()) return;
+	filename = fs;
+	array.Clear();
+	try {
+		String d = LoadFile(filename);
+		XmlNode n = ParseXML(d);
+		if(n.GetCount()==0 || n[0].GetTag() != TAG_ADDRESSBOOK)
+			throw XmlError("No AddressBook tag");
+		const XmlNode &ab = n[0];
+		array.SetCount(ab.GetCount());
+		for(int i=0; i < ab.GetCount(); i++){
+			const XmlNode &person = ab[i];
+			for(int j=0; j < person.GetCount(); j++){
+				const XmlNode &prop = person[j];
+				if(prop.IsTag(TAG_NAME))
+					array.Set(i, TAG_NAME, prop[0].GetText());
+				else
+				if(prop.IsTag(TAG_SURNAME))
+					array.Set(i, TAG_SURNAME, prop[0].GetText());
+				else
+				if(prop.IsTag(TAG_ADDRESS))
+					array.Set(i, TAG_ADDRESS, prop[0].GetText());
+				else
+				if(prop.IsTag(TAG_EMAIL))
+					array.Set(i, TAG_EMAIL, prop[0].GetText());
+			}
+		}
+	}
+	catch(XmlError &e) {
+		Exclamation("Error reading the input file:&" + DeQtf(e) );
+	}
+}
+
+void AddressBook::Save()
+{
+	if(IsEmpty(filename)) {
+		SaveAs();
+		return;
+	}
+	XmlNode n;
+	XmlNode &ab = n.Add(TAG_ADDRESSBOOK);
+	for(int i=0; i < array.GetCount(); i++) {
+		XmlNode &person = ab.Add(TAG_PERSON);
+		person.Add(TAG_NAME).Add().CreateText(array.Get(i, TAG_NAME));
+		person.Add(TAG_SURNAME).Add().CreateText(array.Get(i, TAG_SURNAME));
+		person.Add(TAG_ADDRESS).Add().CreateText(array.Get(i, TAG_ADDRESS));
+		person.Add(TAG_EMAIL).Add().CreateText(array.Get(i, TAG_EMAIL));
+	}
+	if(!SaveFile(filename, AsXML(n)))
+		Exclamation("Error saving the file!");
+}
+
+void AddressBook::SaveAs()
+{
+	if(!fs.ExecuteSaveAs()) return;
+	filename = fs;
+	Save();
+}
+
+void AddressBook::Print()
+{
+	String qtf;
+	qtf = "{{1:1:1:1 Name:: Surname:: Address:: Email";
+	for(int i = 0; i < array.GetCount(); i++)
+		for(int q = 0; q < 4; q++)
+			qtf << ":: " << DeQtf((String)array.Get(i, q));
+	Report report;
+	report << qtf;
+	Perform(report);
+}
+
+void AddressBook::Quit()
+{
+	Break();
+}
+
+void AddressBook::Serialize(Stream& s)
+{
+	int version = 0;
+	s / version;
+	s % search.oname % search.osurname % search.oaddress % search.oemail;
+	s % fs;
+	SetupSearch();
+}
+
+GUI_APP_MAIN
+{
+	AddressBook ab;
+	LoadFromFile(ab);
+	ab.Run();
+	StoreToFile(ab);
+}
diff --git a/examples/AddressBookXML2/AddressBook.lay b/examples/AddressBookXML2/AddressBook.lay
new file mode 100644
index 000000000..98f9f2884
--- /dev/null
+++ b/examples/AddressBookXML2/AddressBook.lay
@@ -0,0 +1,30 @@
+LAYOUT(AddressBookLayout, 532, 456)
+	ITEM(MenuBar, menu, LeftPosZ(0, 200).TopPosZ(0, 20))
+	ITEM(TabCtrl, tab, LeftPosZ(8, 516).TopPosZ(32, 84))
+	ITEM(ArrayCtrl, array, LeftPosZ(8, 516).TopPosZ(124, 324))
+END_LAYOUT
+
+LAYOUT(ModifyLayout, 480, 52)
+	ITEM(Label, dv___0, SetLabel(t_("&Name")).LeftPosZ(8, 48).TopPosZ(8, 15))
+	ITEM(EditField, name, LeftPosZ(8, 96).TopPosZ(28, 19))
+	ITEM(Label, dv___2, SetLabel(t_("&Surname")).LeftPosZ(108, 48).TopPosZ(8, 15))
+	ITEM(EditField, surname, LeftPosZ(108, 96).TopPosZ(28, 19))
+	ITEM(Label, dv___4, SetLabel(t_("&Address")).LeftPosZ(208, 48).TopPosZ(8, 15))
+	ITEM(EditField, address, LeftPosZ(208, 96).TopPosZ(28, 19))
+	ITEM(Label, dv___6, SetLabel(t_("&Email")).LeftPosZ(308, 48).TopPosZ(8, 15))
+	ITEM(EditField, email, LeftPosZ(308, 96).TopPosZ(28, 19))
+	ITEM(Button, add, SetLabel(t_("Ad&d")).LeftPosZ(416, 56).TopPosZ(4, 20))
+	ITEM(Button, change, SetLabel(t_("&Change")).LeftPosZ(416, 56).TopPosZ(28, 20))
+END_LAYOUT
+
+LAYOUT(SearchLayout, 480, 56)
+	ITEM(Option, oname, SetLabel(t_("&Name")).LeftPosZ(8, 56).TopPosZ(8, 18))
+	ITEM(EditField, name, LeftPosZ(8, 96).TopPosZ(28, 19))
+	ITEM(Option, osurname, SetLabel(t_("&Surname")).LeftPosZ(108, 64).TopPosZ(8, 18))
+	ITEM(EditField, surname, LeftPosZ(108, 96).TopPosZ(28, 19))
+	ITEM(Option, oaddress, SetLabel(t_("&Address")).LeftPosZ(208, 64).TopPosZ(8, 18))
+	ITEM(EditField, address, LeftPosZ(208, 96).TopPosZ(28, 19))
+	ITEM(Option, oemail, SetLabel(t_("&Email")).LeftPosZ(308, 52).TopPosZ(8, 18))
+	ITEM(EditField, email, LeftPosZ(308, 96).TopPosZ(28, 19))
+	ITEM(Button, search, SetLabel(t_("&Search")).LeftPosZ(416, 56).TopPosZ(28, 20))
+END_LAYOUT
diff --git a/examples/AddressBookXML2/AddressBookXML2.upp b/examples/AddressBookXML2/AddressBookXML2.upp
new file mode 100644
index 000000000..5425b838e
--- /dev/null
+++ b/examples/AddressBookXML2/AddressBookXML2.upp
@@ -0,0 +1,13 @@
+description "Address book application, uses XML to store data (using DOM like U++ classes)";
+
+uses
+	CtrlLib,
+	Report;
+
+file
+	AddressBook.cpp,
+	AddressBook.lay;
+
+mainconfig
+	"" = "GUI";
+
diff --git a/examples/AnimatedHello/AnimatedHello.upp b/examples/AnimatedHello/AnimatedHello.upp
new file mode 100644
index 000000000..1064f098c
--- /dev/null
+++ b/examples/AnimatedHello/AnimatedHello.upp
@@ -0,0 +1,11 @@
+description "Animated Hello world example";
+
+uses
+	CtrlLib;
+
+file
+	Hello.cpp;
+
+mainconfig
+	"" = "GUI";
+
diff --git a/examples/AnimatedHello/Hello.cpp b/examples/AnimatedHello/Hello.cpp
new file mode 100644
index 000000000..ce3912a59
--- /dev/null
+++ b/examples/AnimatedHello/Hello.cpp
@@ -0,0 +1,62 @@
+// This is Upp conversion of Qt example, see
+// http://doc.trolltech.com/3.0/hello-example.html
+
+#include <CtrlLib/CtrlLib.h>
+
+using namespace Upp;
+
+class HelloWorld : public TopWindow {
+public:
+	virtual void LeftDown(Point, dword);
+	virtual void Paint(Draw& w);
+
+private:
+	String text;
+	
+	void Animate()                        { Refresh(); }
+
+public:
+	typedef HelloWorld CLASSNAME;
+
+	HelloWorld& Text(const String& t)     { text = t; Refresh(); return *this; }
+
+	HelloWorld();
+};
+
+HelloWorld::HelloWorld()
+{
+	SetTimeCallback(-40, THISBACK(Animate));
+	BackPaint();
+	Zoomable().Sizeable();
+	SetRect(0, 0, 260, 80);
+}
+
+void HelloWorld::LeftDown(Point, dword)
+{
+	Close();
+}
+
+void HelloWorld::Paint(Draw& w)
+{
+	Size sz = GetSize();
+    static int sin_tbl[16] = {
+        0, 38, 71, 92, 100, 92, 71, 38, 0, -38, -71, -92, -100, -92, -71, -38
+	};
+	w.DrawRect(sz, White);
+	Size tsz = GetTextSize(text, Roman(32));
+	Point pos = (sz - tsz) / 2;
+	for(int i = 0; i < text.GetLength(); i++) {
+		int q = (i + GetTickCount() / 40) & 15;
+		w.DrawText(pos.x, pos.y + sin_tbl[q] * (sz.cy - 32) / 200,
+		           ~text + i, Roman(32), HsvColorf(q / 15.0, 1, 0.5), 1);
+		pos.x += Roman(32).Info()[text[i]];
+	}
+}
+
+GUI_APP_MAIN
+{
+	HelloWorld hw;
+	hw.Title("Hello world example");
+	hw.Text(Nvl(Join(CommandLine(), " "), "Hello world !"));
+	hw.Run();
+}
diff --git a/examples/Bombs/Bombs.upp b/examples/Bombs/Bombs.upp
new file mode 100644
index 000000000..4bd77b366
--- /dev/null
+++ b/examples/Bombs/Bombs.upp
@@ -0,0 +1,13 @@
+description "Mine sweeping game";
+
+uses
+	CtrlLib;
+
+file
+	main.cpp,
+	bombs.rc,
+	bombs.iml;
+
+mainconfig
+	"" = "GUI";
+
diff --git a/examples/Bombs/bombs.iml b/examples/Bombs/bombs.iml
new file mode 100644
index 000000000..709f204de
--- /dev/null
+++ b/examples/Bombs/bombs.iml
@@ -0,0 +1,21 @@
+IMAGE_META(icon_file, "icon.ico")
+IMAGE_META(icon_large, "Small")
+IMAGE_META(icon_bpp, "8")
+IMAGE_BEGIN(Small)
+	IMAGE_SCAN("�\1\0\0\377�\1\0\0\377�\1\0\0\377")
+	IMAGE_SCAN("�\1\0\0\377")
+	IMAGE_SCAN("ɂ\0\0\377�\0\377\377�\1\0\0\377")
+	IMAGE_SCAN("�\2\377\377\377\0\0\377�\0\377\377�\1\0\0\377")
+	IMAGE_SCAN("�\1\377\377\377�\0\0\0\2\377\377\377\0\377\377")
+	IMAGE_SCAN("ń\377\377\377\3\0\0\0\377\377\377\0\0\377�\1\0\0\377")
+	IMAGE_SCAN("Â\377\377\377�\0\0\0�\377\377\377�\1\0\0\377")
+	IMAGE_SCAN("�\1\377\377\377�\0\0\0�\377\377\377�\0\0\0\1\377\377\377")
+	IMAGE_SCAN("�\1\377\377\377�\0\0\0�\377\377\377�\0\0\0\1\377\377\377")
+	IMAGE_SCAN("\1\377\377\377�\0\0\0�\377\377\377�\0\0\0\1\377\377\377")
+	IMAGE_SCAN("\1\377\377\377�\0\0\0\1\377\377\377�\0\0\0\1\377\377\377")
+	IMAGE_SCAN("\1\377\377\377�\0\0\0\1\377\377\377")
+	IMAGE_SCAN("\1\377\377\377�\0\0\0\1\377\377\377")
+	IMAGE_SCAN("�\1\377\377\377�\0\0\0\1\377\377\377")
+	IMAGE_SCAN("‚\377\377\377�\0\0\0�\377\377\377")
+	IMAGE_SCAN("Ĉ\377\377\377")
+IMAGE_PACKED(Small, "\2\20\0\0\0\20\0\0\0\377\377\377\377\1\0\0\0\0\0\0\0")
diff --git a/examples/Bombs/bombs.rc b/examples/Bombs/bombs.rc
new file mode 100644
index 000000000..f4762d006
--- /dev/null
+++ b/examples/Bombs/bombs.rc
@@ -0,0 +1 @@
+5555 ICON DISCARDABLE "icon.ico"
diff --git a/examples/Bombs/icon.ico b/examples/Bombs/icon.ico
new file mode 100644
index 000000000..147e3267c
Binary files /dev/null and b/examples/Bombs/icon.ico differ
diff --git a/examples/Bombs/main.cpp b/examples/Bombs/main.cpp
new file mode 100644
index 000000000..828f4051c
--- /dev/null
+++ b/examples/Bombs/main.cpp
@@ -0,0 +1,225 @@
+#include <CtrlLib/CtrlLib.h>
+
+using namespace Upp;
+
+class Bombs : public TopWindow {
+public:
+	virtual void Paint(Draw& w);
+	virtual void LeftDown(Point p, dword flags);
+	virtual void RightDown(Point p, dword flags);
+
+private:
+	Size         level;
+	int          cx, cy;
+	int          normal_cells, bombs;
+	Buffer<byte> field;
+	MenuBar      menu;
+	StatusBar    status;
+
+	byte& Field(int x, int y) { return field[x + y * cx]; }
+
+	enum {
+		HIDDEN = 16,
+		BOMB = 32,
+		MARK = 64,
+		EXPLODED = 128,
+
+		UNIT = 30,
+	};
+
+	void About();
+
+	void File(Bar& menu);
+	void Game(Bar& menu);
+	void Menu(Bar& menu);
+
+	void ShowStatus();
+	void Level(Size sz);
+
+	void Uncover(int x, int y);
+	void Generate();
+	void UncoverAll();
+
+public:
+	typedef Bombs CLASSNAME;
+	Bombs();
+};
+
+void Bombs::Generate()
+{
+	cx = level.cx;
+	cy = level.cy;
+	field.Alloc(cx * cy);
+	for(int i = cx * cy - 1; i >= 0; i--)
+		field[i] = (rand() & 15) < 3 ? HIDDEN|BOMB : HIDDEN;
+	normal_cells = 0;
+	for(int x = 0; x < cx; x++)
+		for(int y = 0; y < cy; y++)
+			if((Field(x, y) & BOMB) == 0) {
+				normal_cells++;
+				for(int xx = -1; xx <= 1; xx++)
+					for(int yy = -1; yy <= 1; yy++)
+						if((xx || yy) && x + xx >= 0 && x + xx < cx && y + yy >= 0 && y + yy < cy &&
+						   (Field(x + xx, y + yy) & BOMB))
+							Field(x, y)++;
+			}
+	bombs = cx * cy - normal_cells;
+	Rect r = GetRect();
+	r.SetSize(AddFrameSize(UNIT * cx, UNIT * cy));
+	SetRect(r);
+	ShowStatus();
+	Refresh();
+}
+
+void Bombs::UncoverAll()
+{
+	for(int i = cx * cy - 1; i >= 0; i--)
+		field[i] &= ~HIDDEN;
+	Refresh();
+}
+
+void Bombs::Paint(Draw& w)
+{
+	for(int x = 0; x < cx; x++)
+		for(int y = 0; y < cy; y++) {
+			byte f = Field(x, y);
+			w.DrawRect(x * UNIT, y * UNIT + UNIT - 1, UNIT, 1, SBlack);
+			w.DrawRect(x * UNIT + UNIT - 1, y * UNIT, 1, UNIT, SBlack);
+			w.DrawRect(x * UNIT, y * UNIT, UNIT - 1, UNIT - 1,
+			           (f & (HIDDEN|MARK)) ? SLtGray : f & BOMB ? SLtRed : SWhite);
+			String txt;
+			Color ink = SBlack;
+			Color cross = Null;
+			if(f & MARK) {
+				txt = "M";
+				ink = SLtRed;
+				if((f & (HIDDEN|BOMB)) == BOMB) {
+					ink = SLtBlue;
+					cross = SLtRed;
+				}
+			}
+			else
+			if(!(f & HIDDEN))
+				if(f & BOMB)
+					txt = "B";
+				else {
+					f = f & 15;
+					txt = String(f + '0', 1);
+					ink = f == 0 ? SLtGreen : f == 1 ? SLtBlue : SBlack;
+				}
+			Size tsz = GetTextSize(txt, Roman(2 * UNIT / 3));
+			w.DrawText(x * UNIT + (UNIT - tsz.cx) / 2, y * UNIT + (UNIT - tsz.cy) / 2,
+			           txt, Roman(2 * UNIT / 3), ink);
+			if(f & EXPLODED)
+				cross = SLtBlue;
+			w.DrawLine(x * UNIT, y * UNIT, x * UNIT + UNIT - 1, y * UNIT + UNIT - 1, 1, cross);
+			w.DrawLine(x * UNIT, y * UNIT + UNIT - 1, x * UNIT + UNIT - 1, y * UNIT, 1, cross);
+		}
+}
+
+void Bombs::Uncover(int x, int y)
+{
+	if(x >= 0 && x < cx && y >= 0 && y < cy) {
+		byte& f = Field(x, y);
+		if((f & (HIDDEN|MARK)) == HIDDEN) {
+			if(f & BOMB) {
+				f |= EXPLODED;
+				normal_cells = 0;
+				UncoverAll();
+				return;
+			}
+			if((f &= ~HIDDEN) == 0)
+				for(int xx = -1; xx <= 1; xx++)
+					for(int yy = -1; yy <= 1; yy++)
+						if(xx || yy)
+							Uncover(x + xx, y + yy);
+			normal_cells--;
+			if(normal_cells == 0) {
+				UncoverAll();
+				PromptOK("[*@4A6 Nice!]&You have found all the bombs!");
+			}
+		}
+	}
+}
+
+void Bombs::LeftDown(Point p, dword flags)
+{
+	if(!normal_cells)
+		return;
+	p /= UNIT;
+	Uncover(p.x, p.y);
+	Refresh();
+	ShowStatus();
+}
+
+void Bombs::RightDown(Point p, dword flags)
+{
+	if(!normal_cells)
+		return;
+	p /= UNIT;
+	if(Field(p.x, p.y) & HIDDEN) {
+		Field(p.x, p.y) ^= MARK;
+		Refresh();
+	}
+}
+
+void Bombs::ShowStatus()
+{
+	status = Format("%d bombs, %d cells remaining", bombs, normal_cells);
+}
+
+void Bombs::Level(Size sz)
+{
+	level = sz;
+}
+
+void Bombs::About()
+{
+	PromptOK("[*A9/ uBombs]&[A5 Ultimate`+`+ example]");
+}
+
+void Bombs::File(Bar& menu)
+{
+	menu.Add("Exit", Breaker(IDOK));
+	menu.Separator();
+	menu.Add("About..", THISBACK(About));
+}
+
+void Bombs::Game(Bar& menu)
+{
+	menu.Add("Restart", THISBACK(Generate));
+	menu.Separator();
+	menu.Add("Easy", THISBACK1(Level, Size(10, 10)))
+	    .Check(level.cx == 10);
+	menu.Add("Medium", THISBACK1(Level, Size(15, 15)))
+	    .Check(level.cx == 15);
+	menu.Add("Difficult", THISBACK1(Level, Size(25, 20)))
+	    .Check(level.cx == 25);
+}
+
+void Bombs::Menu(Bar& menu)
+{
+	menu.Add("File", THISBACK(File));
+	menu.Add("Game", THISBACK(Game));
+}
+
+#define IMAGECLASS BombsImg
+#define IMAGEFILE  <Bombs/bombs.iml>
+#include <Draw/iml.h>
+
+Bombs::Bombs()
+{
+	level = Size(10, 10);
+	AddFrame(menu);
+	menu.Set(THISBACK(Menu));
+	AddFrame(status);
+	AddFrame(InsetFrame());
+	Title("uBombs");
+	Icon(BombsImg::Small());
+	Generate();
+}
+
+GUI_APP_MAIN
+{
+	Bombs().Run();
+}
diff --git a/examples/Button/Button.cpp b/examples/Button/Button.cpp
new file mode 100644
index 000000000..55f486e87
--- /dev/null
+++ b/examples/Button/Button.cpp
@@ -0,0 +1,40 @@
+#include <CtrlLib/CtrlLib.h>
+
+// http://java.sun.com/docs/books/tutorial/uiswing/start/swingTour.html
+
+using namespace Upp;
+
+struct ButtonApp : TopWindow {
+	int    count;
+	Button button;
+	Label  label;
+
+	void RefreshLabel()
+	{
+		label = Format("Number of button clicks %d", count);
+	}
+	void Click()
+	{
+		++count;
+		RefreshLabel();
+	}
+
+	typedef ButtonApp CLASSNAME;
+
+	ButtonApp()
+	{
+		count = 0;
+		button <<= THISBACK(Click);
+		button.SetLabel("&I'm an Ultimate++ button!");
+		Add(button.VCenterPos(20).HCenterPos(200));
+		Add(label.BottomPos(0, 20).HCenterPos(200));
+		label.SetAlign(ALIGN_CENTER);
+		Sizeable().Zoomable();
+		RefreshLabel();
+	}
+};
+
+GUI_APP_MAIN
+{
+	ButtonApp().Run();
+}
diff --git a/examples/Button/Button.upp b/examples/Button/Button.upp
new file mode 100644
index 000000000..f89c502e2
--- /dev/null
+++ b/examples/Button/Button.upp
@@ -0,0 +1,11 @@
+description "Counting button clicks";
+
+uses
+	CtrlLib;
+
+file
+	Button.cpp;
+
+mainconfig
+	"" = "GUI";
+
diff --git a/examples/Clock/Clock.upp b/examples/Clock/Clock.upp
new file mode 100644
index 000000000..50702206a
--- /dev/null
+++ b/examples/Clock/Clock.upp
@@ -0,0 +1,11 @@
+description "Analogue / digital clock";
+
+uses
+	CtrlLib;
+
+file
+	main.cpp;
+
+mainconfig
+	"" = "GUI";
+
diff --git a/examples/Clock/main.cpp b/examples/Clock/main.cpp
new file mode 100644
index 000000000..816d0b9a3
--- /dev/null
+++ b/examples/Clock/main.cpp
@@ -0,0 +1,63 @@
+#include <CtrlLib/CtrlLib.h>
+
+using namespace Upp;
+
+struct App : TopWindow {
+	void PaintPtr(Draw& w, double pos, double m, int d, Color color, Size sz2)
+	{
+		w.DrawLine(sz2.cx, sz2.cy,
+		           sz2.cx + int(m * sin(pos * 2 * M_PI) * sz2.cx),
+		           sz2.cy - int(m * cos(pos * 2 * M_PI) * sz2.cy),
+		           d, color);
+	}
+
+	void PaintCenteredText(Draw& w, int x, int y, const char *text, Font fnt, Color c)
+	{
+		Size tsz = GetTextSize(text, fnt);
+		w.DrawText(x - tsz.cx / 2, y - tsz.cy / 2, text, fnt, c);
+	}
+
+	virtual void Paint(Draw& w)
+	{
+		Size sz = GetSize();
+		w.DrawRect(sz, SLtGray);
+		sz -= 6;
+		w.Offset(3, 3);
+		Size sz2 = sz / 2;
+		w.DrawEllipse(0, 0, sz.cx, sz.cy, SWhite, 3, SBlack);
+		Font fnt = Arial(min(sz.cx, sz.cy) / 10);
+		for(int i = 1; i <= 12; i++) {
+			int d = i % 3 == 0 ? 3 : 2;
+			PaintCenteredText(w, sz2.cx + int(0.8 * sin(i * M_PI / 6) * sz2.cx),
+			                  sz2.cy - int(0.8 * cos(i * M_PI / 6) * sz2.cy),
+			                  AsString(i), i % 3 ? fnt : fnt().Bold(), SBlack);
+		}
+		Date date = GetSysDate();
+		PaintCenteredText(w, sz.cx / 2, 3 * sz.cy / 5, GetLanguageInfo().FormatDate(date),
+		                  fnt().Bold(), SLtBlue);
+		double tm = double(GetSysTime() - ToTime(date));
+		PaintPtr(w, tm / 60, 0.75, 1, SRed, sz2);
+		PaintPtr(w, tm / 3600, 0.6, 2, SCyan, sz2);
+		PaintPtr(w, tm / 3600 / 12, 0.5, 4, SBlack, sz2);
+		w.End();
+	}
+
+	void Timer()
+	{
+		Refresh();
+	}
+
+	App()
+	{
+		SetRect(0, 0, 150, 150);
+		Sizeable().Zoomable();
+		BackPaint();
+		SetTimeCallback(-1000, callback(this, &App::Timer));
+		Title("Clock");
+	}
+};
+
+GUI_APP_MAIN
+{
+	App().Run();
+}
diff --git a/examples/CodeMetric/Analyse.cpp b/examples/CodeMetric/Analyse.cpp
new file mode 100644
index 000000000..f385f46ce
--- /dev/null
+++ b/examples/CodeMetric/Analyse.cpp
@@ -0,0 +1,120 @@
+#include <CppBase/CppBase.h>
+#include "Analyse.h"
+
+
+bool ContainsAt(const String &source, const String &pattern, int pos = 0)
+{
+	return    pos >= 0
+	       && pos + pattern.GetLength() <= source.GetLength()
+	       && 0 == memcmp(source.Begin() + pos, pattern.Begin(), pattern.GetLength());
+}
+
+bool StartsWith(const String &source, const String &pattern)
+{
+	return ContainsAt(source, pattern, 0);
+}
+
+bool EndsWith(const String &source, const String &pattern)
+{
+	return ContainsAt(source, pattern, source.GetLength() - pattern.GetLength());
+}
+
+String InsertNestingToSignature(String natural, String nesting)
+{
+	if(StartsWith(nesting, "::"))
+		nesting.Remove(0, 2);
+	if(nesting.GetCount() && !EndsWith(nesting, "::"))
+		nesting << "::";
+
+	int pos = natural.Find('('); // find the first opening parenthesis
+	pos--;
+	while(pos >= 0 && !iscid(natural[pos])) // skip over non-id chars before paren.
+		pos--;
+	if(pos < 0) return "";
+	while(pos >= 0 && iscid(natural[pos])) // skip over last id before paren
+		pos--;
+	natural.Insert(pos+1, nesting);
+	return natural;
+}
+
+int BodyPos(const Vector<CppPos> &pos)
+{
+	for(int i = 0; i < pos.GetCount(); i++)
+		if(pos[i].impl)
+			return pos[i].line;
+	return 0;
+}
+
+CodeMetric::CodeMetric(const String &fileContent) :
+  orphanLines(0), blankLines(0), commentLines(0)
+{
+	StringStream stream(fileContent);
+	CppBase base;
+	Parser parser;
+	parser.whenFnEnd = THISBACK(StoreMetric);
+	parser.Do(stream, Vector<String>(), base, "file", THISBACK(StoreError));
+
+	const SrcFile &srcFile = parser.getPreprocessedFile();
+
+	commentLines = srcFile.commentLinesRemoved;
+	blankLines   = srcFile.blankLinesRemoved;
+	orphanLines  = parser.symbolsOutsideFunctions.GetStat(';');
+	totalLLOC    = orphanLines;
+	sumCC1 = sumCC2 = sumDepth = 0;
+
+	for(int i = 0; i < functions.GetCount(); i++) {
+		totalLLOC += functions[i].logicalLinesOfCode;
+		sumCC1    += functions[i].cyclomaticComplexity1;
+		sumCC2    += functions[i].cyclomaticComplexity2;
+		sumDepth  += functions[i].scopeDepth;
+	}
+}
+
+
+String CodeMetric::ToString() const
+{
+	String s;
+	s << "LLOC: " << totalLLOC
+	  << ", Blank: " << blankLines
+	  << ", Comments: " << commentLines;
+	if(errors != "")
+		s << "\nErrors:\n" << errors;
+	return s;
+}
+
+void CodeMetric::StoreError(int line, const String &msg)
+{
+	errors << "line " << line << ": " << msg << "\n";
+}
+
+int CodeMetric::LogicalLinesOfCode(const LexSymbolStat &symbolStat)
+{
+	static Vector<int> oneLiners(
+	  Vector<int>() << tk_if << tk_else << tk_switch << tk_case
+	                << tk_for << tk_do << tk_while << tk_try << tk_catch
+	                << tk_struct << tk_class << tk_namespace
+	                << tk_public << tk_private << tk_protected
+	                << ';');
+	return symbolStat.SumStat( oneLiners );
+}
+
+void CodeMetric::StoreMetric(const Parser::FunctionStat & functionStat)
+{
+	static Vector<int> cc1_symbols(
+	  Vector<int>() << tk_if << tk_case << tk_for << tk_while << tk_catch);
+
+	static Vector<int> cc2_symbols(
+	  Vector<int>() << t_and << t_or << '?');
+
+
+	FunctionEntry &entry = functions.Add();
+
+	entry.pos                   = BodyPos(functionStat.cppItem.pos);
+	entry.name                  = InsertNestingToSignature(functionStat.cppItem.natural,
+	                                                       functionStat.nesting);
+	int cc1 = 1 + functionStat.symbolStat.SumStat( cc1_symbols );
+	entry.cyclomaticComplexity1 = cc1;
+	entry.cyclomaticComplexity2 = cc1 + functionStat.symbolStat.SumStat( cc2_symbols );
+	entry.logicalLinesOfCode    = 2 + LogicalLinesOfCode(functionStat.symbolStat);
+	entry.scopeDepth            = functionStat.maxScopeDepth;
+}
diff --git a/examples/CodeMetric/Analyse.h b/examples/CodeMetric/Analyse.h
new file mode 100644
index 000000000..744903656
--- /dev/null
+++ b/examples/CodeMetric/Analyse.h
@@ -0,0 +1,36 @@
+#ifndef _CppAnalyse_Analyze_h_
+#define _CppAnalyse_Analyze_h_
+
+#include <CppBase/CppBase.h>
+
+using namespace Upp;
+
+struct CodeMetric
+{
+public:
+	struct FunctionEntry : public Moveable<FunctionEntry>
+	{
+		String name;
+		int pos;
+		int cyclomaticComplexity1;
+		int cyclomaticComplexity2;
+		int logicalLinesOfCode;
+		int scopeDepth;
+	};
+
+	int orphanLines, blankLines, commentLines;
+	int totalLLOC, sumCC1, sumCC2, sumDepth;
+	Vector<FunctionEntry> functions;
+	String errors;
+
+	explicit CodeMetric(const String &fileContent);
+	String ToString() const;
+
+private:
+	typedef CodeMetric CLASSNAME;
+	void StoreError(int line, const String &msg);
+	void StoreMetric(const Parser::FunctionStat & functionStat);
+	int LogicalLinesOfCode(const LexSymbolStat &symbolStat);
+};
+
+#endif
diff --git a/examples/CodeMetric/AnalyseGui.h b/examples/CodeMetric/AnalyseGui.h
new file mode 100644
index 000000000..a16cc02fb
--- /dev/null
+++ b/examples/CodeMetric/AnalyseGui.h
@@ -0,0 +1,36 @@
+#ifndef _CppAnalyse_AnalyseGui_h
+#define _CppAnalyse_AnalyseGui_h
+
+#include <CtrlLib/CtrlLib.h>
+
+using namespace Upp;
+
+class WarningDisplay : public Display
+{
+	int limit;
+	Color warningColor;
+public:
+	WarningDisplay(int limit, Color warningColor = Color(255, 128, 128));
+	void PaintBackground(Draw& w, const Rect& r, const Value& q,
+	                     Color ink, Color paper, dword style) const;
+};
+
+class AnalyseGui : public TopWindow
+{
+public:
+	typedef AnalyseGui CLASSNAME;
+	MenuBar      menu;
+	Splitter     splitter;
+	LineEdit     source;
+	ArrayCtrl    chart;
+	LineEdit     textMetric;
+	WarningDisplay ccDisplay, llocDisplay, depthDisplay;
+
+	AnalyseGui();
+	void MainMenu(Bar& menu);
+	void Open();
+	void UpdateMetric();
+	void GotoFunction();
+};
+
+#endif
diff --git a/examples/CodeMetric/AnalyseGui.iml b/examples/CodeMetric/AnalyseGui.iml
new file mode 100644
index 000000000..939a03cbd
--- /dev/null
+++ b/examples/CodeMetric/AnalyseGui.iml
@@ -0,0 +1,18 @@
+IMAGE_BEGIN(GaugeIcon)
+	IMAGE_SCAN("Ƅ\377\377\377�")
+	IMAGE_SCAN("Ă\377\377\377�\0\0\0�\377\377\377�")
+	IMAGE_SCAN("�\1\377\377\377�\0\0\0\2\377\377\377\0\0\0�\377\377\377�\0\0\0\1\377\377\377�")
+	IMAGE_SCAN("�\3\377\377\377\0\0\377����\377\377\377\1\0\0\0�\377\377\377\3���\0\0\0\377\377\377�")
+	IMAGE_SCAN("�\2\377\377\377\0\0\0�\0\0\377\1��\377�\377\377\377\5���\0\0\0���\0\0\0\377\377\377�")
+	IMAGE_SCAN("�\3\377\377\377\0\0\0\377\377\377�\0\0\377\1��\377�\377\377\377\5\0\0\0���\377\377\377\0\0\0\377\377\377�")
+	IMAGE_SCAN("\2\377\377\377\0\0\0�\377\377\377\1��\377�\0\0\377\1��\377�\377\377\377\1\0\0\0\1\377\377\377")
+	IMAGE_SCAN("\2\377\377\377\0\0\0�\377\377\377\1��\377�\0\0\377\1\0\0\0�\377\377\377\1\0\0\0\1\377\377\377")
+	IMAGE_SCAN("\1\377\377\377�\0\0\0�\377\377\377\3��\377\0\0\377\0\0\0�\377\377\377�\0\0\0\1\377\377\377")
+	IMAGE_SCAN("\2\377\377\377\0\0\0�\0\377\0\1�\377��\377\377\377\1��\377�\0\0\377\1\0\0\0\1\377\377\377")
+	IMAGE_SCAN("�\2\377\377\377\0\0\0�\0\377\0\1�\377��\377\377\377\1��\377�\0\0\377\2\0\0\0\377\377\377�")
+	IMAGE_SCAN("�\2\377\377\377\0\0\0�\0\377\0�\377\377\377�\0\0\377\2\0\0\0\377\377\377�")
+	IMAGE_SCAN("�\4\377\377\377\0\0\0\0\377\0\0\0\0�\377\377\377\4\0\0\0\0\0\377\0\0\0\377\377\377�")
+	IMAGE_SCAN("�\3\377\377\377\0\0\0\0\377\0�\377\377\377\3\0\0\377\0\0\0\377\377\377�")
+	IMAGE_SCAN("Ĉ\377\377\377�")
+	IMAGE_SCAN("Ƅ\377\377\377�")
+IMAGE_PACKED(GaugeIcon, "\2\20\0\0\0\20\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0")
diff --git a/examples/CodeMetric/CodeMetric.upp b/examples/CodeMetric/CodeMetric.upp
new file mode 100644
index 000000000..819be53a3
--- /dev/null
+++ b/examples/CodeMetric/CodeMetric.upp
@@ -0,0 +1,16 @@
+description "Investigating C++ cyclometric complexity";
+
+uses
+	CtrlLib,
+	CppBase;
+
+file
+	AnalyseGui.h,
+	Analyse.h,
+	AnalyseGui.iml,
+	Analyse.cpp,
+	main.cpp;
+
+mainconfig
+	"" = "GUI";
+
diff --git a/examples/CodeMetric/icon.ico b/examples/CodeMetric/icon.ico
new file mode 100644
index 000000000..4012786aa
Binary files /dev/null and b/examples/CodeMetric/icon.ico differ
diff --git a/examples/CodeMetric/main.cpp b/examples/CodeMetric/main.cpp
new file mode 100644
index 000000000..168369656
--- /dev/null
+++ b/examples/CodeMetric/main.cpp
@@ -0,0 +1,127 @@
+#include "AnalyseGui.h"
+#include "Analyse.h"
+
+#define IMAGECLASS Images
+#define IMAGEFILE  <CodeMetric/AnalyseGui.iml>
+#include <Draw/iml.h>
+
+String defaultCode =
+ "/*"
+ "  This tool measures certain source code metrics.\n"
+ "  You can type, paste, or load the code you would like measure into this text area.\n"
+ "  Metrics provided are:\n"
+ "  - Cyclomatic complexity 1: counts the decision points per method, thus estimating the\n"
+ "  number of testcases needed for each method.\n"
+ "  - Cyclomatic complexity 2: CC1 extended with the implicit decisions created by the\n"
+ "  && || and ?: operators. Evaluation:\n"
+ "  CC2  1-10  simple, low risk method\n"
+ "  CC2  10-20 moderate complexity & risk method\n"
+ "  CC2  21-50 high complexity & risk method\n"
+ "  CC2  >50   too complex, untestable method, should be refactored\n"
+ "  - Depth: measures deepest scope embedding level per method. This estimates the human\n"
+ "  memory needed to keep in mind the current context. Any methods with depth > 5 is\n"
+ "  considered too complex, and candidate for refactoring\n"
+ "  - Logical Lines Of Code: estimates the amount of source code per method in a way\n"
+ "  which is mostly independent from code formatting style. Methods longer than 80 LLOC are\n"
+ "  too long, and should be refactored.\n"
+ "*/\n"
+ "int main()\n"
+ "{\n"
+ "    return 0;\n"
+ "}\n";
+
+String defaultTitle = "CodeMetric GUI";
+
+
+WarningDisplay::WarningDisplay(int limit, Color warningColor) :
+  limit(limit), warningColor(warningColor)
+{
+}
+
+void WarningDisplay::PaintBackground(Draw& w, const Rect& r, const Value& q,
+	                                 Color ink, Color paper, dword style) const
+{
+	int v = (int)q;
+	if(v >= limit)
+		paper = warningColor;
+	Display::PaintBackground(w, r, q, ink, paper, style);
+}
+
+void AnalyseGui::MainMenu(Bar &bar)
+{
+	bar.Add("Load file", THISBACK(Open));
+}
+
+void AnalyseGui::Open()
+{
+	FileSelector fsel;
+	fsel.ExecuteOpen("Select file");
+	String fileName = fsel.Get();
+	if(fileName == "")
+		return;
+	source <<= LoadFile(fileName);
+	UpdateMetric();
+	Title(defaultTitle + "  [" + fileName + "]");
+}
+
+void AnalyseGui::UpdateMetric()
+{
+	String s = ~source;
+	CodeMetric metric(s);
+	chart.Clear();
+	for(int i = 0; i < metric.functions.GetCount(); i++)
+	{
+		CodeMetric::FunctionEntry & entry =
+		  metric.functions[i];
+		chart.Add(entry.name,
+		          entry.pos,
+		          entry.cyclomaticComplexity1,
+		          entry.cyclomaticComplexity2,
+		          entry.logicalLinesOfCode,
+		          entry.scopeDepth);
+	}
+
+	textMetric.SetData(metric.ToString());
+}
+
+void AnalyseGui::GotoFunction()
+{
+	int cursor = chart.GetCursor();
+	if(cursor >= 0 && cursor < chart.GetCount())
+	{
+		int pos = (int)chart.Get(cursor, 1);
+		source.SetCursor( source.GetPos(pos) );
+		source.CenterCursor();
+	}
+}
+
+AnalyseGui::AnalyseGui() :
+  ccDisplay(50), llocDisplay(80), depthDisplay(5)
+{
+	Title(defaultTitle);
+	Icon(Images::GaugeIcon);
+	AddFrame(menu);
+	menu.Set( THISBACK(MainMenu) );
+	source <<= THISBACK(UpdateMetric);
+	source <<= defaultCode;
+	textMetric.SetEditable(false);
+	chart.AddColumn("Function", 80);
+	chart.AddColumn("Pos", 15);
+	chart.AddColumn("CC1", 15).SetDisplay(ccDisplay);
+	chart.AddColumn("CC2", 15).SetDisplay(ccDisplay);
+	chart.AddColumn("LLOC", 15).SetDisplay(llocDisplay);
+	chart.AddColumn("Depth", 15).SetDisplay(depthDisplay);
+	chart.WhenLeftDouble = THISBACK(GotoFunction);
+	UpdateMetric();
+	splitter.Vert() << source << chart << textMetric;
+	splitter.SetPos(9000, 1);
+	splitter.SetPos(6500, 0);
+	Add(splitter.SizePos());
+	Sizeable().Zoomable();
+}
+
+
+GUI_APP_MAIN
+{
+	AnalyseGui().Run();
+}
diff --git a/examples/Color/Color.h b/examples/Color/Color.h
new file mode 100644
index 000000000..d2d5aeb68
--- /dev/null
+++ b/examples/Color/Color.h
@@ -0,0 +1,16 @@
+#ifndef _Color_Color_h
+#define _Color_Color_h
+
+#include <CtrlLib/CtrlLib.h>
+
+using namespace Upp;
+
+class ColorWindow : public TopWindow {
+public:
+	typedef Color CLASSNAME;
+	ColorWindow();
+
+	virtual void Paint(Draw& draw);
+};
+
+#endif
diff --git a/examples/Color/Color.upp b/examples/Color/Color.upp
new file mode 100644
index 000000000..1001e278e
--- /dev/null
+++ b/examples/Color/Color.upp
@@ -0,0 +1,12 @@
+description "Paints text using different colors";
+
+uses
+	CtrlLib;
+
+file
+	Color.h,
+	main.cpp;
+
+mainconfig
+	"" = "GUI";
+
diff --git a/examples/Color/main.cpp b/examples/Color/main.cpp
new file mode 100644
index 000000000..ce053b94c
--- /dev/null
+++ b/examples/Color/main.cpp
@@ -0,0 +1,21 @@
+#include "Color.h"
+
+ColorWindow::ColorWindow()
+{
+	Sizeable().Zoomable();
+	SetRect(100, 100, 100, 100);
+}
+
+void ColorWindow::Paint(Draw& draw)
+{
+	draw.DrawRect(draw.GetClip(), White());
+	for(int i = 0; i < 16; i++) {
+		Color c(i & 1 ? 255 : 0, i & 2 ? 255 : 0, i & 4 ? 255 : 0);
+		draw.DrawText(0, i * 30, AsString(c), Arial(30).Underline(), c);
+	}
+}
+
+GUI_APP_MAIN
+{
+	ColorWindow().Run();
+}
diff --git a/examples/CompDir/CompDir.h b/examples/CompDir/CompDir.h
new file mode 100644
index 000000000..c4dd06364
--- /dev/null
+++ b/examples/CompDir/CompDir.h
@@ -0,0 +1,10 @@
+#ifndef _CompDir_CompDir_h
+#define _CompDir_CompDir_h
+
+#include <CtrlLib/CtrlLib.h>
+
+using namespace Upp;
+
+#include "textdiff.h"
+
+#endif
diff --git a/examples/CompDir/CompDir.iml b/examples/CompDir/CompDir.iml
new file mode 100644
index 000000000..f2afb8dbc
--- /dev/null
+++ b/examples/CompDir/CompDir.iml
@@ -0,0 +1,102 @@
+IMAGE_BEGIN(a_file)
+	IMAGE_SCAN("Œ\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\0\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\0\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\0�\0\0\0�\0\377\0\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\0\1\0\0\0�\0\377\0\1\0\0\0�\0\377\0\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\0\1\0\0\0�\0\377\0\1\0\0\0�\0\377\0\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\0�\0\0\0�\0\377\0\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\0\1\0\0\0�\0\377\0\1\0\0\0�\0\377\0\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\0\1\0\0\0�\0\377\0\1\0\0\0�\0\377\0\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\0\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\0\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\0�\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\0\1\0\0\0�\0�\1\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\0\3\0\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\0�\0\0\0")
+	IMAGE_SCAN("ˆ\0\0\0")
+IMAGE_PACKED(a_file, "\2\20\0\0\0\20\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(b_file)
+	IMAGE_SCAN("Œ\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377�\0\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377�\0\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377�\0�\0\0\0�\377�\0\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377�\0\1\0\0\0�\377�\0\1\0\0\0�\377�\0\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377�\0�\0\0\0�\377�\0\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377�\0\1\0\0\0�\377�\0\1\0\0\0�\377�\0\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377�\0\1\0\0\0�\377�\0\1\0\0\0�\377�\0\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377�\0�\0\0\0�\377�\0\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377�\0\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377�\0\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377�\0�\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377�\0\1\0\0\0�\377\0\0\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377�\0\3\0\0\0\377\0\0\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377�\0�\0\0\0")
+	IMAGE_SCAN("ˆ\0\0\0")
+IMAGE_PACKED(b_file, "\2\20\0\0\0\20\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(ab_file)
+	IMAGE_SCAN("Œ\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\0\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\0�\0\0\0�\0\377\0\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\0\1\0\0\0�\0\377\0\1\0\0\0�\0\377\0\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\0�\0\0\0�\0\377\0\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\0\1\0\0\0�\0\377\0\1\0\0\0�\0\377\0\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\0\1\0\0\0")
+	IMAGE_SCAN("�\12\0\0\0\0\377\0\0\0\0\0\377\0\0\0\0\0\377\0\0\0\0\0\377\0\0\0\0\0\377\0�\0\0\0")
+	IMAGE_SCAN("‚\0\0\0\12\377�\0\0\0\0\377�\0\0\0\0\377�\0\0\0\0\377�\0\0\0\0\377�\0\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377�\0\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377�\0�\0\0\0�\377�\0\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377�\0�\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377�\0\1\0\0\0�\377�\0\1\0\0\0�\377\0\0\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377�\0�\0\0\0\2\377\0\0\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377�\0�\0\0\0")
+	IMAGE_SCAN("ˆ\0\0\0")
+IMAGE_PACKED(ab_file, "\2\20\0\0\0\20\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(a_dir)
+	IMAGE_SCAN("")
+	IMAGE_SCAN("")
+	IMAGE_SCAN("…\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377\377\377\1\0\0\0")
+	IMAGE_SCAN("��\0\0\0")
+	IMAGE_SCAN("�\2\0\0\0\0\377\0�\377\377\377\2\0\377\0\0\0\0")
+	IMAGE_SCAN("�\2\0\0\0\377\377\377�\0\377\0\2\0��\0\0\0")
+	IMAGE_SCAN("�\2\0\0\0\377\377\377�\0\377\0\2\0��\0\0\0")
+	IMAGE_SCAN("�\2\0\0\0\377\377\377�\0\377\0\2\0��\0\0\0")
+	IMAGE_SCAN("�\2\0\0\0\377\377\377�\0\377\0\2\0��\0\0\0")
+	IMAGE_SCAN("�\2\0\0\0\377\377\377�\0\377\0\2\0��\0\0\0")
+	IMAGE_SCAN("�\2\0\0\0\377\377\377�\0\377\0\2\0��\0\0\0")
+	IMAGE_SCAN("�\2\0\0\0\0\377\0�\0��\1\0\0\0")
+	IMAGE_SCAN("Œ\0\0\0")
+IMAGE_PACKED(a_dir, "\2\20\0\0\0\20\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(b_dir)
+	IMAGE_SCAN("")
+	IMAGE_SCAN("")
+	IMAGE_SCAN("…\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377\377\377\1\0\0\0")
+	IMAGE_SCAN("��\0\0\0")
+	IMAGE_SCAN("�\2\0\0\0\377�\0�\377\377\377\2\377�\0\0\0\0")
+	IMAGE_SCAN("�\2\0\0\0\377\377\377�\377�\0\2\0��\0\0\0")
+	IMAGE_SCAN("�\2\0\0\0\377\377\377�\377�\0\2\0��\0\0\0")
+	IMAGE_SCAN("�\2\0\0\0\377\377\377�\377�\0\2\0��\0\0\0")
+	IMAGE_SCAN("�\2\0\0\0\377\377\377�\377�\0\2\0��\0\0\0")
+	IMAGE_SCAN("�\2\0\0\0\377\377\377�\377�\0\2\0��\0\0\0")
+	IMAGE_SCAN("�\2\0\0\0\377\377\377�\377�\0\2\0��\0\0\0")
+	IMAGE_SCAN("�\2\0\0\0\377�\0�\0��\1\0\0\0")
+	IMAGE_SCAN("Œ\0\0\0")
+IMAGE_PACKED(b_dir, "\2\20\0\0\0\20\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(ab_dir)
+	IMAGE_SCAN("")
+	IMAGE_SCAN("")
+	IMAGE_SCAN("…\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377\377\377\1\0\0\0")
+	IMAGE_SCAN("��\0\0\0")
+	IMAGE_SCAN("�\2\0\0\0\0\377\0�\377\377\377\2\377�\0\0\0\0")
+	IMAGE_SCAN("�\2\0\0\0\377\377\377�\0\377\0\1\0\0\0�\377�\0\2\0��\0\0\0")
+	IMAGE_SCAN("�\2\0\0\0\377\377\377�\0\377\0\1\0\0\0�\377�\0\2\0��\0\0\0")
+	IMAGE_SCAN("�\2\0\0\0\377\377\377�\0\377\0\1\0\0\0�\377�\0\2\0��\0\0\0")
+	IMAGE_SCAN("�\2\0\0\0\377\377\377�\0\377\0\1\0\0\0�\377�\0\2\0��\0\0\0")
+	IMAGE_SCAN("�\2\0\0\0\377\377\377�\0\377\0\1\0\0\0�\377�\0\2\0��\0\0\0")
+	IMAGE_SCAN("�\2\0\0\0\377\377\377�\0\377\0\1\0\0\0�\377�\0\2\0��\0\0\0")
+	IMAGE_SCAN("�\2\0\0\0\0\377\0�\0��\1\0\0\0")
+	IMAGE_SCAN("Œ\0\0\0")
+IMAGE_PACKED(ab_dir, "\2\20\0\0\0\20\0\0\0\0\0\0\0\377\377\377\377\0\0\0\0")
diff --git a/examples/CompDir/CompDir.lay b/examples/CompDir/CompDir.lay
new file mode 100644
index 000000000..c6655a7b5
--- /dev/null
+++ b/examples/CompDir/CompDir.lay
@@ -0,0 +1,15 @@
+#ifdef LAYOUTFILE
+
+LAYOUT(CompareDirLayout, 496, 492)
+	ITEM(Label, dv___0, SetLabel(t_("Folder &A:")).LeftPosZ(4, 52).TopPosZ(4, 19))
+	ITEM(EditField, path_a, HSizePosZ(56, 4).TopPosZ(4, 19))
+	ITEM(Label, dv___2, SetLabel(t_("Folder &B:")).LeftPosZ(4, 52).TopPosZ(26, 19))
+	ITEM(EditField, path_b, HSizePosZ(56, 4).TopPosZ(26, 19))
+	ITEM(Label, dv___4, SetLabel(t_("File &mask:")).LeftPosZ(4, 52).TopPosZ(48, 19))
+	ITEM(EditField, file_mask, HSizePosZ(56, 68).TopPosZ(48, 19))
+	ITEM(Button, refresh, SetLabel(t_("&Refresh")).RightPosZ(4, 60).TopPosZ(48, 18))
+	ITEM(Splitter, splitter, HSizePosZ(4, 4).VSizePosZ(70, 4))
+END_LAYOUT
+
+#endif
+
diff --git a/examples/CompDir/CompDir.upp b/examples/CompDir/CompDir.upp
new file mode 100644
index 000000000..cb5a27857
--- /dev/null
+++ b/examples/CompDir/CompDir.upp
@@ -0,0 +1,16 @@
+description "Compares directory contents";
+
+uses
+	CtrlLib;
+
+file
+	CompDir.h,
+	textdiff.h,
+	textdiff.cpp,
+	main.cpp,
+	CompDir.lay,
+	CompDir.iml;
+
+mainconfig
+	"" = "GUI";
+
diff --git a/examples/CompDir/main.cpp b/examples/CompDir/main.cpp
new file mode 100644
index 000000000..f161f2c01
--- /dev/null
+++ b/examples/CompDir/main.cpp
@@ -0,0 +1,286 @@
+#include "CompDir.h"
+#pragma hdrstop
+
+#define LAYOUTFILE <CompDir/CompDir.lay>
+#include <CtrlCore/lay.h>
+
+#define IMAGEFILE  <CompDir/CompDir.iml>
+#define IMAGECLASS CompDirImg
+#include <Draw/iml.h>
+
+String NormalizePathCase(String fn)
+{
+#ifdef PLATFORM_WIN32 // !PATH_CASE
+	return ToLower(fn);
+#else
+	return fn;
+#endif
+}
+
+static String ExpandTabs(String line, int tabsize = 4)
+{
+	String out;
+	int pos = 0;
+	for(const char *p = line; *p; p++)
+		if(*p == '\t') {
+			int left = tabsize - pos % tabsize;
+			out.Cat(' ', left);
+			pos += left;
+		}
+		else {
+			out.Cat(*p);
+			pos++;
+		}
+	return out;
+}
+
+class DlgCompareDir : public WithCompareDirLayout<TopWindow> {
+public:
+	typedef DlgCompareDir CLASSNAME;
+	DlgCompareDir();
+
+	void Run();
+
+	void Serialize(Stream& stream);
+
+private:
+	void CmdRefresh();
+	void DoTreeCursor();
+	int  Refresh(String rel_path, int parent);
+	void DoBrowse(Ctrl *field);
+	void ToolTree(Bar& bar);
+	String GetTreePath() const;
+
+private:
+	struct FileInfo : Moveable<FileInfo>
+	{
+		FileInfo() {}
+		FileInfo(String name, int64 size, Time time) : name(name), size(size), time(time) {}
+
+		String name;
+		int64  size;
+		Time   time;
+	};
+
+	bool FetchDir(String dir, VectorMap<String, FileInfo>& files, VectorMap<String, String>& dirs);
+
+	FrameRight<Button> browse_a, browse_b;
+	TreeCtrl tree;
+	StaticRect editor;
+	LineEdit lineedit;
+	RichTextCtrl qtf;
+	String pa, pb, fm;
+};
+
+DlgCompareDir::DlgCompareDir()
+{
+	CtrlLayout(*this, "Compare directories");
+	Sizeable().Zoomable();
+	refresh <<= THISBACK(CmdRefresh);
+	splitter.Vert(tree, editor);
+	editor << lineedit.SizePos() << qtf.SizePos();
+	qtf.Background(White());
+	qtf.SetFrame(InsetFrame());
+	path_a.AddFrame(browse_a);
+	browse_a.SetImage(CtrlImg::right_arrow());
+	browse_a <<= THISBACK1(DoBrowse, &path_a);
+	path_b.AddFrame(browse_b);
+	browse_b.SetImage(CtrlImg::right_arrow());
+	browse_b <<= THISBACK1(DoBrowse, &path_b);
+	file_mask <<= "*.cpp *.h *.hpp *.c *.C *.cxx *.cc *.lay *.iml *.upp *.sch *.dph";
+	tree.WhenCursor = THISBACK(DoTreeCursor);
+	lineedit.SetReadOnly();
+	lineedit.SetFont(Courier(14));
+}
+
+void DlgCompareDir::Run()
+{
+	TopWindow::Run();
+}
+
+void DlgCompareDir::Serialize(Stream& stream)
+{
+	int version = 1;
+	stream / version;
+	stream % path_a % path_b % file_mask;
+	SerializePlacement(stream);
+	stream % splitter;
+}
+
+void DlgCompareDir::CmdRefresh()
+{
+	pa = path_a;
+	pb = path_b;
+	fm = file_mask;
+	tree.Clear();
+	Image icon;
+	switch(Refresh(Null, 0)) {
+	case 0: icon = CtrlImg::Dir(); break;
+	case 1: icon = CompDirImg::a_dir(); break;
+	case 2: icon = CompDirImg::b_dir(); break;
+	case 3: icon = CompDirImg::ab_dir(); break;
+	}
+	tree.SetRoot(icon, "Root");
+}
+
+bool DlgCompareDir::FetchDir(String dir, VectorMap<String, FileInfo>& files, VectorMap<String, String>& dirs)
+{
+	FindFile ff;
+	if(!ff.Search(AppendFileName(dir, "*")))
+		return false;
+	do
+		if(ff.IsFile() && PatternMatchMulti(fm, ff.GetName()))
+			files.Add(NormalizePathCase(ff.GetName()), FileInfo(ff.GetName(), ff.GetLength(), ff.GetLastWriteTime()));
+		else if(ff.IsFolder())
+			dirs.Add(NormalizePathCase(ff.GetName()), ff.GetName());
+	while(ff.Next());
+	return true;
+}
+
+int DlgCompareDir::Refresh(String rel_path, int parent)
+{
+	FindFile ff;
+	VectorMap<String, FileInfo> afile, bfile;
+	VectorMap<String, String> adir, bdir;
+	String arel = AppendFileName(pa, rel_path);
+	String brel = AppendFileName(pb, rel_path);
+	int done = 0;
+	if(!FetchDir(arel, afile, adir))
+		done |= 2;
+	if(!FetchDir(brel, bfile, bdir))
+		done |= 1;
+
+	Index<String> dir_index;
+	dir_index <<= adir.GetIndex();
+	FindAppend(dir_index, bdir.GetKeys());
+	Vector<String> dirs(dir_index.PickKeys());
+	Sort(dirs, GetLanguageInfo());
+	for(int i = 0; i < dirs.GetCount(); i++) {
+		int fa = adir.Find(dirs[i]), fb = bdir.Find(dirs[i]);
+		String dn = (fb >= 0 ? bdir[fb] : adir[fa]);
+		int dirpar = tree.Add(parent, CtrlImg::Dir(), dn);
+		int dirdone = Refresh(AppendFileName(rel_path, dirs[i]), dirpar);
+		done |= dirdone;
+		switch(dirdone) {
+		case 0: tree.Remove(dirpar); break;
+		case 1: tree.SetNode(dirpar, TreeCtrl::Node().SetImage(CompDirImg::a_dir()).Set(dn)); break;
+		case 2: tree.SetNode(dirpar, TreeCtrl::Node().SetImage(CompDirImg::b_dir()).Set(dn)); break;
+		case 3: tree.SetNode(dirpar, TreeCtrl::Node().SetImage(CompDirImg::ab_dir()).Set(dn)); break;
+		}
+	}
+	Index<String> name_index;
+	name_index <<= afile.GetIndex();
+	FindAppend(name_index, bfile.GetKeys());
+	Vector<String> names(name_index.PickKeys());
+	Sort(names, GetLanguageInfo());
+	for(int i = 0; i < names.GetCount(); i++) {
+		int fa = afile.Find(names[i]), fb = bfile.Find(names[i]);
+		if(fa < 0) {
+			tree.Add(parent, CompDirImg::b_file(), NFormat("%s: B (%`, %0n)", bfile[fb].name, bfile[fb].time, bfile[fb].size));
+			done |= 2;
+		}
+		else if(fb < 0) {
+			tree.Add(parent, CompDirImg::a_file(), NFormat("%s: A (%`, %0n)", afile[fa].name, afile[fa].time, afile[fa].size));
+			done |= 1;
+		}
+		else if(afile[fa].size != bfile[fb].size
+		|| LoadFile(AppendFileName(arel, names[i])) != LoadFile(AppendFileName(brel, names[i]))) {
+			tree.Add(parent, CompDirImg::ab_file(), NFormat("%s: A (%`, %0n), B (%`, %0n)",
+				bfile[fb].name, afile[fa].time, afile[fa].size, bfile[fb].time, bfile[fb].size));
+			done |= 3;
+		}
+	}
+	return done;
+}
+
+String DlgCompareDir::GetTreePath() const
+{
+	int i = tree.GetCursor();
+	if(i < 0)
+		return String::GetVoid();
+	if(i == 0)
+		return Null;
+	String s = tree.Get(i);
+	int f = s.Find(':');
+	if(f >= 0)
+		s.Trim(f);
+	while(i = tree.GetParent(i))
+		s = AppendFileName(String(tree.Get(i)), s);
+	return s;
+}
+
+void DlgCompareDir::DoTreeCursor()
+{
+	String s = GetTreePath();
+	if(IsNull(s))
+		return;
+	String fa = AppendFileName(pa, s), fb = AppendFileName(pb, s);
+	String da = LoadFile(fa), db = LoadFile(fb);
+	if(!IsNull(da) || !IsNull(db))
+		if(IsNull(da) || IsNull(db)) {
+			qtf.Hide();
+			lineedit.Show();
+			lineedit <<= Nvl(db, da);
+		}
+		else {
+			lineedit.Hide();
+			qtf.Show();
+			String comptext = "[C2 ";
+			Vector<String> la = GetStringLineMap(da), lb = GetStringLineMap(db);
+			Array<TextSection> sections = CompareLineMaps(la, lb);
+			for(int s = 0; s < sections.GetCount(); s++) {
+				const TextSection& sec = sections[s];
+				if(sec.same) {
+					comptext << "[@(0.0.0) \1";
+					if(sec.count1 <= 6)
+						for(int i = 0; i < sec.count1; i++)
+							comptext << ExpandTabs(la[i + sec.start1]) << '\n';
+					else {
+						for(int i = 0; i < 3; i++)
+							comptext << ExpandTabs(la[i + sec.start1]) << '\n';
+						comptext << "...\n";
+						for(int i = -3; i < 0; i++)
+							comptext << ExpandTabs(la[i + sec.start1 + sec.count1]) << '\n';
+					}
+					comptext << "\1]";
+				}
+				else {
+					if(sec.count1) {
+						comptext << "[@(0.160.0) \1";
+						for(int i = 0; i < sec.count1; i++)
+							comptext << ExpandTabs(la[sec.start1 + i]) << '\n';
+						comptext << "\1]";
+					}
+					if(sec.count2) {
+						comptext << "[@(0.0.255) \1";
+						for(int i = 0; i < sec.count2; i++)
+							comptext << ExpandTabs(lb[sec.start2 + i]) << '\n';
+						comptext << "\1]";
+					}
+				}
+			}
+			qtf.SetQTF(comptext);
+		}
+}
+
+void DlgCompareDir::DoBrowse(Ctrl *field)
+{
+	FileSel fsel;
+	fsel.AllFilesType();
+	static String recent_dir;
+	fsel <<= Nvl((String)~*field, recent_dir);
+	if(fsel.ExecuteSelectDir())
+		*field <<= recent_dir = ~fsel;
+}
+
+void DlgCompareDir::ToolTree(Bar& bar)
+{
+}
+
+GUI_APP_MAIN
+{
+	DlgCompareDir cmpdlg;
+	LoadFromFile(cmpdlg, ConfigFile());
+	cmpdlg.Run();
+	StoreToFile(cmpdlg, ConfigFile());
+}
diff --git a/examples/CompDir/textdiff.cpp b/examples/CompDir/textdiff.cpp
new file mode 100644
index 000000000..c81ad2210
--- /dev/null
+++ b/examples/CompDir/textdiff.cpp
@@ -0,0 +1,209 @@
+#include "CompDir.h"
+
+template <class I>
+static int CompareGetCount(I a, I b, int max_count)
+{
+	if(max_count <= 0 || *a != *b)
+		return 0;
+	int left;
+	for(left = max_count; --left > 0;)
+		if(*++a != *++b)
+			return max_count - left;
+	return max_count;
+}
+
+Vector<String> GetLineMap(Stream& stream)
+{
+	Vector<String> out;
+	int emp = 0;
+	if(stream.IsOpen())
+		while(!stream.IsEof()) {
+			String s = stream.GetLine();
+			const char *p = s, *e = s.End(), *f = e;
+			while(e > p && (byte)e[-1] <= ' ')
+				e--;
+			if(e == p)
+				emp++;
+			else
+			{
+				while(emp-- > 0)
+					out.Add(Null);
+				if(e != f)
+					s.Trim(e - p);
+				out.Add(s);
+				emp = 0;
+			}
+		}
+	return out;
+}
+
+Vector<String> GetFileLineMap(const String& path)
+{
+	FileIn fi(path);
+	return GetLineMap(fi);
+}
+
+Vector<String> GetStringLineMap(const String& s)
+{
+	StringStream ss(s);
+	return GetLineMap(ss);
+}
+
+class TextComparator
+{
+public:
+	TextComparator(const Vector<String>& f1, const Vector<String>& f2);
+
+	Array<TextSection>    GetSections() const;
+
+private:
+	bool                  Find(int start1, int end1, int start2, int end2, int& best_match, int& best_count) const;
+	void                  Split(Array<TextSection>& dest, int start1, int end1, int start2, int end2) const;
+
+private:
+	Vector<HashBase>      hash1;
+	Vector<HashBase>      hash2;
+	const Vector<String>& file1;
+	const Vector<String>& file2;
+};
+
+Array<TextSection> CompareLineMaps(const Vector<String>& s1, const Vector<String>& s2)
+{
+	return TextComparator(s1, s2).GetSections();
+}
+
+static void CalcHash(Vector<HashBase>& hash, const Vector<String>& file, int limit)
+{
+	{ // 1st row
+		HashBase& first = hash.Add();
+		for(int i = 0; i < file.GetCount(); i++)
+			first.Add(GetHashValue(file[i]));
+	}
+	static const int prime[] =
+	{
+		3,  5,  7,   11,  13,  17,  19,  21,
+		23, 29, 31,  37,  41,  43,  47,  51,
+		53, 61, 67,  71,  73,  79,  83,  87,
+		89, 97, 101, 103, 107, 109, 113, 117,
+	};
+	const int *pp = prime;
+	for(int l = 1; l < limit; l <<= 1) {
+		HashBase& nhash = hash.Add();
+		const HashBase& ohash = hash[hash.GetCount() - 2];
+		int pri = *pp++;
+		int t;
+		for(t = l; t < ohash.GetCount(); t++)
+			nhash.Add(ohash[t - l] + pri * ohash[t]);
+		for(t -= l; t < ohash.GetCount(); t++)
+			nhash.Add(ohash[t]);
+	}
+}
+
+TextComparator::TextComparator(const Vector<String>& f1, const Vector<String>& f2)
+: file1(f1), file2(f2)
+{
+	int limit = min(f1.GetCount(), f2.GetCount());
+	CalcHash(hash1, f1, limit);
+	CalcHash(hash2, f2, limit);
+}
+
+static bool CompareSection(const TextSection& ta, const TextSection& tb)
+{
+	return ta.start1 < tb.start1 || ta.start1 == tb.start1 && ta.start2 < tb.start2;
+}
+
+Array<TextSection> TextComparator::GetSections() const
+{
+	Array<TextSection> output;
+	Split(output, 0, file1.GetCount(), 0, file2.GetCount());
+	Sort(output, &CompareSection);
+	return output;
+}
+
+static int GetHashLevel(int min_count, int hash_count)
+{
+	int l = 0;
+	hash_count--;
+	while(min_count > 1 && l < hash_count)
+	{
+		min_count >>= 1;
+		l++;
+	}
+	return l;
+}
+
+bool TextComparator::Find(int start1, int end1, int start2, int end2, int& best_match, int& best_count) const
+{
+	ASSERT(end1 > start1 && end2 > start2);
+	bool done = false;
+	const String *f1 = file1.Begin() + start1;
+	int len1 = end1 - start1;
+	int lvl = GetHashLevel(best_count + 1, hash1.GetCount());
+	int chunk = 1 << lvl;
+	int last = max(best_count - chunk + 1, 0);
+	const HashBase *hp1 = &hash1[lvl];
+	const HashBase *hp2 = &hash2[lvl];
+	const unsigned *h1 = hp1->Begin() + start1;
+
+	int i = hp2->Find(*h1);
+	while(i >= 0)
+		if(i + best_count >= end2)
+			return done;
+		else {
+			if(i >= start2 && h1[last] == (*hp2)[i + last]) {
+				int top = min(len1, end2 - i);
+				int hc = CompareGetCount(h1, hp2->Begin() + i, top) + chunk - 1;
+				int cnt = CompareGetCount(f1, file2.Begin() + i, min(hc, top));
+				if(cnt > best_count) {
+					best_count = cnt;
+					best_match = i;
+					done = true;
+					last = best_count - chunk + 1;
+					if(best_count + 1 >= 2 * chunk)
+					{
+						lvl = GetHashLevel(best_count + 1, hash1.GetCount());
+						chunk = 1 << lvl;
+						last = best_count - chunk + 1;
+						hp1 = &hash1[lvl];
+						hp2 = &hash2[lvl];
+						h1 = hp1->Begin() + start1;
+						int oi = i;
+						for(i = hp2->Find(*h1); i >= 0 && i <= oi; i = hp2->FindNext(i))
+							;
+						continue;
+					}
+				}
+			}
+			i = hp2->FindNext(i);
+		}
+	return done;
+}
+
+void TextComparator::Split(Array<TextSection>& dest, int start1, int end1, int start2, int end2) const
+{
+	ASSERT(start1 <= end1 && start2 <= end2);
+	while(start1 < end1 && start2 < end2) {
+		int new1 = -1, new2 = -1, count = 0;
+		for(int i = start1; i + count < end1; i++)
+			if(Find(i, end1, start2, end2, new2, count))
+				new1 = i;
+		if(count == 0)
+			break; // no match at all
+		ASSERT(new1 >= start1 && new1 + count <= end1);
+		ASSERT(new2 >= start2 && new2 + count <= end2);
+		dest.Add(TextSection(new1, count, new2, count, true));
+		if(new1 - start1 >= end1 - new1 - count) { // head is longer - recurse for tail
+			Split(dest, new1 + count, end1, new2 + count, end2);
+			end1 = new1;
+			end2 = new2;
+		}
+		else { // tail is longer - recurse for head
+			Split(dest, start1, new1, start2, new2);
+			start1 = new1 + count;
+			start2 = new2 + count;
+		}
+		ASSERT(start1 <= end1 && start2 <= end2);
+	}
+	if(start1 < end1 || start2 < end2)
+		dest.Add(TextSection(start1, end1 - start1, start2, end2 - start2, false));
+}
diff --git a/examples/CompDir/textdiff.h b/examples/CompDir/textdiff.h
new file mode 100644
index 000000000..33ffda248
--- /dev/null
+++ b/examples/CompDir/textdiff.h
@@ -0,0 +1,23 @@
+#ifndef _CompDir_textdiff_h_
+#define _CompDir_textdiff_h_
+
+class TextSection
+{
+public:
+	TextSection(int start1, int count1, int start2, int count2, bool same)
+		: start1(start1), count1(count1), start2(start2), count2(count2), same(same) {}
+
+public:
+	int      start1;
+	int      count1;
+	int      start2;
+	int      count2 : 31;
+	unsigned same   : 1;
+};
+
+Array<TextSection> CompareLineMaps(const Vector<String>& l1, const Vector<String>& l2);
+Vector<String>     GetLineMap(Stream& stream);
+Vector<String>     GetFileLineMap(const String& path);
+Vector<String>     GetStringLineMap(const String &s);
+
+#endif
diff --git a/examples/Converter/Converter.upp b/examples/Converter/Converter.upp
new file mode 100644
index 000000000..9127b8bfd
--- /dev/null
+++ b/examples/Converter/Converter.upp
@@ -0,0 +1,12 @@
+description "Converts metric units and U.S. units (meters / feets etc..)";
+
+uses
+	CtrlLib;
+
+file
+	main.cpp,
+	converter.lay;
+
+mainconfig
+	"" = "GUI";
+
diff --git a/examples/Converter/converter.lay b/examples/Converter/converter.lay
new file mode 100644
index 000000000..8d5998cb9
--- /dev/null
+++ b/examples/Converter/converter.lay
@@ -0,0 +1,11 @@
+#ifdef LAYOUTFILE
+
+LAYOUT(ConverterPaneLayout, 244, 76)
+	ITEM(LabelBox, title, LeftPosZ(8, 228).TopPosZ(4, 64))
+	ITEM(EditDoubleSpin, value, LeftPosZ(16, 144).TopPosZ(20, 19))
+	ITEM(SliderCtrl, slider, LeftPosZ(16, 144).TopPosZ(40, 20))
+	ITEM(DropList, unit, LeftPosZ(164, 64).TopPosZ(20, 19))
+END_LAYOUT
+
+#endif
+
diff --git a/examples/Converter/main.cpp b/examples/Converter/main.cpp
new file mode 100644
index 000000000..371dc5ce0
--- /dev/null
+++ b/examples/Converter/main.cpp
@@ -0,0 +1,78 @@
+#include <CtrlLib/CtrlLib.h>
+
+using namespace Upp;
+
+// http://www.ictp.trieste.it/~manuals/programming/Java/tutorial/uiswing/overview/anatomy.html
+
+#define LAYOUTFILE <Converter/converter.lay>
+#include <CtrlCore/lay.h>
+
+struct ConverterPane : WithConverterPaneLayout<StaticRect> {
+	ConverterPane *slave;
+	void AdjustSlave()
+	{
+		slave->slider <<= slave->value <<=
+			IsNull(value) ? 0.0 : (double)~unit * (double)~value / (double)~slave->unit;
+	}
+	void ValueChanged()
+	{
+		slider <<= ~value;
+		AdjustSlave();
+	}
+	void SliderChanged()
+	{
+		value <<= ~slider;
+		AdjustSlave();
+	}
+
+	typedef ConverterPane CLASSNAME;
+
+	ConverterPane()
+	{
+		CtrlLayout(*this);
+		slider.Range(10000);
+		slider <<= value <<= 0;
+		value <<= THISBACK(ValueChanged);
+		slider <<= THISBACK(SliderChanged);
+		unit <<= THISBACK(AdjustSlave);
+	}
+};
+
+struct Converter : TopWindow
+{
+	ConverterPane metric, us;
+
+	typedef Converter CLASSNAME;
+
+	Converter()
+	{
+		Title("Converter");
+		Size sz = metric.GetLayoutSize();
+		SetRect(0, 0, metric.GetSize().cx, metric.GetSize().cy * 2);
+		Add(metric.HSizePos().TopPos(0, sz.cy));
+		Add(us.HSizePos().BottomPos(0, sz.cy));
+
+		metric.title = "Metric units";
+		metric.unit.Add(0.01, "Centimeters");
+		metric.unit.Add(1.0, "Meters");
+		metric.unit.Add(1000.0, "Kilometers");
+		metric.unit <<= 1.0;
+
+		us.title = "U.S. units";
+		us.unit.Add(0.0254, "Inches");
+		us.unit.Add(0.305, "Feet");
+		us.unit.Add(0.914, "Yards");
+		us.unit.Add(1613.0, "Miles");
+		us.unit <<= 0.305;
+
+		us.slave = &metric;
+		metric.slave = &us;
+
+		metric.AdjustSlave();
+	}
+};
+
+GUI_APP_MAIN
+{
+	Converter().Run();
+}
diff --git a/examples/Days/Days.h b/examples/Days/Days.h
new file mode 100644
index 000000000..aabc5f376
--- /dev/null
+++ b/examples/Days/Days.h
@@ -0,0 +1,19 @@
+#ifndef _Days_Days_h
+#define _Days_Days_h
+
+#include <CtrlLib/CtrlLib.h>
+
+using namespace Upp;
+
+#define LAYOUTFILE <Days/Days.lay>
+#include <CtrlCore/lay.h>
+
+class Days : public WithDaysLayout<TopWindow> {
+public:
+	void Compute();
+
+	typedef Days CLASSNAME;
+	Days();
+};
+
+#endif
diff --git a/examples/Days/Days.lay b/examples/Days/Days.lay
new file mode 100644
index 000000000..71bb52292
--- /dev/null
+++ b/examples/Days/Days.lay
@@ -0,0 +1,8 @@
+LAYOUT(DaysLayout, 320, 64)
+	ITEM(EditDate, date1, LeftPosZ(52, 100).TopPosZ(8, 19))
+	ITEM(Label, dv___1, SetLabel(t_("Date 1")).LeftPosZ(8, 40).TopPosZ(8, 19))
+	ITEM(EditDate, date2, LeftPosZ(212, 100).TopPosZ(8, 19))
+	ITEM(Label, dv___3, SetLabel(t_("Date 2")).LeftPosZ(168, 40).TopPosZ(8, 19))
+	ITEM(Label, result, LeftPosZ(8, 304).TopPosZ(36, 19))
+END_LAYOUT
+
diff --git a/examples/Days/Days.upp b/examples/Days/Days.upp
new file mode 100644
index 000000000..eb1e08dfc
--- /dev/null
+++ b/examples/Days/Days.upp
@@ -0,0 +1,13 @@
+description "Displays a number of days between two dates";
+
+uses
+	CtrlLib;
+
+file
+	Days.h,
+	main.cpp,
+	Days.lay;
+
+mainconfig
+	"" = "GUI";
+
diff --git a/examples/Days/main.cpp b/examples/Days/main.cpp
new file mode 100644
index 000000000..4f892b07e
--- /dev/null
+++ b/examples/Days/main.cpp
@@ -0,0 +1,20 @@
+#include "Days.h"
+
+void Days::Compute()
+{
+	result = IsNull(date1) || IsNull(date2) ? "" :
+	         Format("There is %d day(s) between %` and %`", abs(Date(~date1) - Date(~date2)), ~date1, ~date2);
+}
+
+Days::Days()
+{
+	CtrlLayout(*this, "Days");
+	date1 <<= THISBACK(Compute);
+	date2 <<= THISBACK(Compute);
+	Compute();
+}
+
+GUI_APP_MAIN
+{
+	Days().Run();
+}
diff --git a/examples/DbfView/AUTHORS b/examples/DbfView/AUTHORS
new file mode 100644
index 000000000..f782e5b62
--- /dev/null
+++ b/examples/DbfView/AUTHORS
@@ -0,0 +1,2 @@
+Mirek Fidler <cxl@ntllib.org>
+Tomas Rylek  <rylek@volny.cz>
\ No newline at end of file
diff --git a/examples/DbfView/COPYING b/examples/DbfView/COPYING
new file mode 100644
index 000000000..33aa39102
--- /dev/null
+++ b/examples/DbfView/COPYING
@@ -0,0 +1,30 @@
+Copyright (C) 2005 Mirek Fidler, Tomas Rylek and various contributors (see AUTHORS)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to
+deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies of the Software and its Copyright notices. In addition publicly
+documented acknowledgment must be given that this software has been used if no
+source code of this software is made available publicly. This includes
+acknowledgments in either Copyright notices, Manuals, Publicity and Marketing
+documents or any documentation provided with any product containing this
+software. This License does not apply to any software that links to the
+libraries provided by this software (statically or dynamically), but only to
+the software provided.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+-----------
+
+Please see the COPYING.PLAIN for a plain-english explanation of this notice
+and it's intent.
diff --git a/examples/DbfView/COPYING-PLAIN b/examples/DbfView/COPYING-PLAIN
new file mode 100644
index 000000000..770a8132f
--- /dev/null
+++ b/examples/DbfView/COPYING-PLAIN
@@ -0,0 +1,33 @@
+Plain English Copyright Notice
+
+This file is not intended to be the actual License. The reason this file
+exists is that we here are programmers and engineers. We aren't lawyers. We
+provide licenses that we THINK say the right things, but we have our own
+intentions at heart. This is a plain-english explanation of what those
+intentions are, and if you follow them you will be within the "spirit" of
+the license.
+
+The intent is for us to enjoy writing software that is useful to us (the
+AUTHORS) and allow others to use it freely and also benefit from the work we
+put into making it. We don't want to restrict others using it. They should
+not *HAVE* to make the source code of the applications they write that
+simply link to these libraries (be that statically or dynamically), or for
+them to be limited as to what license they choose to use (be it open, closed
+or anything else). But we would like to know you are using these libraries.
+We simply would like to know that it has been useful to someone. This is why
+we ask for acknowledgement of some sort.
+
+You can do what you want with the source of this software - it doesn't
+matter. We still have it here for ourselves and it is open and free to use
+and download and play with. It can't be taken away. We don't really mind what
+you do with the source to your software. We would simply like to know that
+you are using it - especially if it makes it to a commerical product. If you
+simply e-mail all the AUTHORS (see COPYING and AUTHORS files) telling us, and
+then make sure you include a paragraph or page in the manual or in the "About.."
+box for the product with the copyright notice and state that you used this
+software, we will be very happy. If you want to contribute back modifications
+and fixes you may have made we will welcome those too with open arms (generally).
+If you want help with changes needed, ports needed or features to be added,
+arrangements can be easily made with some dialogue.
+
+Mirek Fidler <cxl@ntllib.org>
diff --git a/examples/DbfView/DbfView.cpp b/examples/DbfView/DbfView.cpp
new file mode 100644
index 000000000..32fc78bcb
--- /dev/null
+++ b/examples/DbfView/DbfView.cpp
@@ -0,0 +1,73 @@
+#include <CtrlLib/CtrlLib.h>
+#include <plugin/dbf/dbf.h>
+
+using namespace Upp;
+
+struct DbfView : public TopWindow {
+	Splitter s;
+	ArrayCtrl table;
+	ArrayCtrl row;
+	DbfStream dbf;
+
+	void EnterRow();
+	void Perform();
+
+	typedef DbfView CLASSNAME;
+
+	DbfView();
+};
+
+String FormatField(const DbfStream::Field& f)
+{
+	return f.name + Format(" (%c%d)", f.type, f.width);
+}
+
+void DbfView::EnterRow()
+{
+	row.Clear();
+	if(!dbf.Fetch(table.GetCursor()))
+		return;
+	for(int i = 0; i < dbf.GetFieldCount(); i++)
+		row.Add(FormatField(dbf.GetField(i)), dbf[i]);
+}
+
+void DbfView::Perform()
+{
+	FileSel fs;
+	LoadFromFile(fs);
+	fs.AllFilesType();
+	fs.Type("*.dbf", "dbf");
+	if(!fs.ExecuteOpen("DBF..")) return;
+	StoreToFile(fs);
+	if(!dbf.Open(~fs))
+		Exclamation("Can't open input file");
+	for(int i = 0; i < min(4, dbf.GetFieldCount()); i++)
+		table.AddColumn(FormatField(dbf.GetField(i)));
+	while(dbf.Fetch()) {
+		Vector<Value> v;
+		for(int i = 0; i < min(4, dbf.GetFieldCount()); i++)
+			v.Add(dbf[i]);
+		table.Add(v);
+	}
+	Run();
+}
+
+DbfView::DbfView()
+{
+	s.Set(table, row);
+	s.SetPos(7000);
+	Add(s.SizePos());
+	Sizeable().Zoomable();
+	table.WhenEnterRow = THISBACK(EnterRow);
+	row.AddColumn("Column");
+	row.AddColumn("Value", 2);
+}
+
+GUI_APP_MAIN
+{
+	SetDefaultCharset(CHARSET_WIN1250);
+	SetLanguage(LNG_CZECH);
+	Ctrl::NoLayoutZoom();
+
+	DbfView().Perform();
+}
diff --git a/examples/DbfView/DbfView.upp b/examples/DbfView/DbfView.upp
new file mode 100644
index 000000000..918a70167
--- /dev/null
+++ b/examples/DbfView/DbfView.upp
@@ -0,0 +1,16 @@
+description "Viewer of DBF files";
+
+uses
+	plugin\dbf,
+	CtrlLib;
+
+file
+	DbfView.cpp,
+	Info readonly separator,
+	COPYING,
+	COPYING-PLAIN,
+	AUTHORS;
+
+mainconfig
+	"" = "GUI";
+
diff --git a/examples/EyeCare/EyeCare.cpp b/examples/EyeCare/EyeCare.cpp
new file mode 100644
index 000000000..c82f5cc79
--- /dev/null
+++ b/examples/EyeCare/EyeCare.cpp
@@ -0,0 +1,216 @@
+#include "EyeCare.h"
+
+#define IMAGECLASS EyeCareImg
+#define  IMAGEFILE <EyeCare/EyeCare.iml>
+#include <Draw/iml.h>
+
+#define TOPICFILE <EyeCare/app.tpp/all.i>
+#include <Core/topic_group.h>
+
+#ifdef _DEBUG
+#define MINUTE_M 1000 // to reduce waiting when debugging....
+#else
+#define MINUTE_M 60 * 1000
+#endif
+
+void EyeCare::About()
+{
+	dismiss.Kill();
+	ignore++;
+	WithAboutDialogLayout<TopWindow> dlg;
+	dlg.text = GetTopic("topic://EyeCare/app/about$en-us").text;
+	CtrlLayoutOK(dlg, "About");
+	dlg.CenterScreen();
+	dlg.Run();
+	ignore--;
+	Restart();
+}
+
+void EyeCare::Restart()
+{
+	relax.KillSet(-(int)~config.relax * MINUTE_M, THISBACK(Relax));
+	wash.KillSet(-(int)~config.wash * MINUTE_M, THISBACK(Wash));
+}
+
+void EyeCare::Perform(int newstate)
+{
+	if(newstate < state)
+		return;
+	state = newstate;
+	String txt1[] = {
+		t_("Welcome to Eye Care!"),
+		t_("Eye relaxing time..."),
+		t_("Eye washing time...")
+	};
+	String txt2[] = {
+        t_("This program will remind you at regular intervals\nto take care of your eyes and relax/wash them."),
+        t_("Now move your eyes away, from the monitor\nand view some distant object for 15 seconds."),
+        t_("Now move to the wash room, and gently wash \nyour eyes with water to prevent dryness.")
+	};
+	dismiss.KillSet(15000, THISBACK(Dismiss));
+	text1 = txt1[state];
+	text2 = txt2[state];
+	if(!IsOpen())
+		OpenMain();
+	Show();
+	SetForeground();
+}
+
+void EyeCare::Launch()
+{
+	Perform(LAUNCH);
+}
+
+void EyeCare::Dismiss()
+{
+	state = -1;
+	Hide();
+}
+
+void EyeCare::Relax()
+{
+	if(ignore) return;
+	Perform(RELAX);
+}
+
+void EyeCare::Wash()
+{
+	if(ignore) return;
+	Perform(WASH);
+}
+
+void EyeCare::Sync()
+{
+#ifdef PLATFORM_WIN32
+	ExStyle(config.topmost ? GetExStyle() | WS_EX_TOPMOST
+	                       : GetExStyle() & ~WS_EX_TOPMOST);
+#endif
+	trayicon.Icon(ignore ? EyeCareImg::off() : EyeCareImg::icon());
+	if(config.hideicon)
+		ignore = false;
+	trayicon.Show(!config.hideicon);
+	Restart();
+}
+
+void EyeCare::Configure()
+{
+	dismiss.Kill();
+	relax.Kill();
+	wash.Kill();
+	config.Execute();
+	Sync();
+}
+
+void EyeCare::Ignore()
+{
+	ignore = !ignore;
+	Sync();
+}
+
+void EyeCare::SettingsMenu(Bar& bar)
+{
+	bar.Add(t_("Configuration"), THISBACK(Configure))
+	   .Help(t_("Change settings"));
+	bar.Add(t_("Exit"), THISBACK(Exit))
+	   .Help(t_("Exit the application"));
+}
+
+void EyeCare::HelpMenu(Bar& bar)
+{
+	bar.Add(t_("About"), THISBACK(About))
+	   .Help(t_("About EyeCare"));
+}
+
+void EyeCare::MainMenu(Bar& bar)
+{
+	bar.Add(t_("Settings"), THISBACK(SettingsMenu));
+	bar.Add(t_("Help"), THISBACK(HelpMenu));
+}
+
+void EyeCare::TrayMenu(Bar& bar)
+{
+	bar.Add(t_("Show EyeCare"), THISBACK(Launch));
+	bar.Add(t_("Ignore eyes"), THISBACK(Ignore))
+	   .Check(ignore);
+	bar.Add(t_("About.."), THISBACK(About));
+	bar.Add(t_("Exit"), THISBACK(Exit));
+}
+
+void EyeCare::Serialize(Stream& s)
+{
+	int version = 1;
+	s / version;
+	s % config.relax % config.wash % config.hideicon % config.topmost;
+	s % ignore;
+	SerializePlacement(s);
+}
+
+const char regpath[] = "Software\\Microsoft\\Windows\\CurrentVersion\\Run";
+const char regname[] = "EyeCareUpp";
+
+void EyeCare::Exit()
+{
+	Break();
+	trayicon.Break();
+#ifdef PLATFORM_WIN32
+	HKEY hkey;
+	if(RegOpenKeyEx(HKEY_CURRENT_USER, regpath, 0, KEY_ALL_ACCESS, &hkey) == ERROR_SUCCESS) {
+		RegDeleteValue(hkey, regname);
+		RegCloseKey(hkey);
+	}
+#endif
+}
+
+void EyeCare::Do()
+{
+	LoadFromFile(*this);
+	Sync();
+	Launch();
+	Restart();
+#ifdef PLATFORM_WIN32
+	HKEY key;
+	if(RegCreateKey(HKEY_CURRENT_USER, regpath, &key) == ERROR_SUCCESS) {
+		RegSetValueEx(key, regname, 0, REG_SZ, GetExeFilePath(), GetExeFilePath().GetLength() + 1);
+		RegCloseKey(key);
+	}
+#endif
+	trayicon.Run();
+	StoreToFile(*this);
+}
+
+EyeCare::EyeCare()
+{
+	CtrlLayoutOKCancel(config, t_("Configuration"));
+	CtrlLayout(*this, t_("EyeCare"));
+	menu.Set(THISBACK(MainMenu));
+	image.SetImage(EyeCareImg::eye());
+	CenterScreen();
+	hide <<= THISBACK(Hide);
+	config.relax <<= 5;
+	config.wash <<= 55;
+	Icon(EyeCareImg::icon());
+	state = -1;
+
+	trayicon.WhenBar = THISBACK(TrayMenu);
+	trayicon.WhenLeftDouble = THISBACK(Launch);
+	trayicon.Icon(EyeCareImg::icon());
+	trayicon.Tip(t_("EyeCare"));
+}
+
+GUI_APP_MAIN
+{
+#ifdef PLATFORM_WIN32
+	static const char unique_name[] = "EyeCare_$_$_U++";
+	if(::FindWindow(NULL, unique_name)) {
+		Exclamation(t_("EyeCare is already running."));
+		return;
+	}
+	TopWindow singlechk;
+	singlechk.SetRect(-1, -1, 1, 1);
+	singlechk.Hide();
+	singlechk.Title(unique_name);
+	singlechk.Open();
+#endif
+
+	EyeCare().Do();
+}
diff --git a/examples/EyeCare/EyeCare.h b/examples/EyeCare/EyeCare.h
new file mode 100644
index 000000000..d97b0e6e5
--- /dev/null
+++ b/examples/EyeCare/EyeCare.h
@@ -0,0 +1,48 @@
+#ifndef _EyeCare_EyeCare_h_
+#define _EyeCare_EyeCare_h_
+
+#include <CtrlLib/CtrlLib.h>
+
+using namespace Upp;
+
+#define LAYOUTFILE <EyeCare/EyeCare.lay>
+#include <CtrlCore/lay.h>
+
+class EyeCare : public WithEyeCareLayout<TopWindow> {
+	enum { LAUNCH, RELAX, WASH };
+	int          state;
+	int          ignore;
+	TimeCallback relax, wash, dismiss;
+	TrayIcon     trayicon;
+	WithConfigurationLayout<TopWindow> config;
+
+
+	void Perform(int newstate);
+	void Relax();
+	void Wash();
+	void Configure();
+	void Dismiss();
+
+	void MainMenu(Bar& menu);
+	void SettingsMenu(Bar& bar);
+	void HelpMenu(Bar& bar);
+	void TrayMenu(Bar& bar);
+
+	void Ignore();
+	void Launch();
+	void Restart();
+	void Sync();
+	void About();
+	void StartLaunch();
+	void Exit();
+
+public:
+	void Serialize(Stream& s);
+	void Do();
+
+	typedef EyeCare CLASSNAME;
+
+	EyeCare();
+};
+
+#endif
diff --git a/examples/EyeCare/EyeCare.iml b/examples/EyeCare/EyeCare.iml
new file mode 100644
index 000000000..61c74d660
--- /dev/null
+++ b/examples/EyeCare/EyeCare.iml
@@ -0,0 +1,127 @@
+IMAGE_BEGIN(eye)
+	IMAGE_SCAN("�\377\377\377�\377\377\377�\377\377\377�\377\377\377�\377\377\377�\377\377\377�\377\377\377")
+	IMAGE_SCAN("�\377\377\377�\377\377\377�\377\377\377�\377\377\377�\377\377\377�\377\377\377�\377\377\377")
+	IMAGE_SCAN("�\377\377\377�\377\377\377�\377\377\377�\377\377\377�\377\377\377�\377\377\377�\377\377\377")
+	IMAGE_SCAN("�\377\377\377�\377\377\377�\377\377\377�\377\377\377�\377\377\377�\377\377\377�\377\377\377")
+	IMAGE_SCAN("�\377\377\377�\377\377\377�\377\377\377�\377\377\377�\377\377\377�\377\377\377�\377\377\377")
+	IMAGE_SCAN("�\377\377\377�\377\377\377�\377\377\377�\377\377\377�\377\377\377�\377\377\377�\377\377\377")
+	IMAGE_SCAN("�\377\377\377�\377\377\377�\377\377\377�\377\377\377�\377\377\377�\377\377\377�\377\377\377")
+	IMAGE_SCAN("�\377\377\377�\377\377\377�\377\377\377�\377\377\377�\377\377\377�\377\377\377�\377\377\377")
+	IMAGE_SCAN("�\377\377\377�\377\377\377�\377\377\377�\377\377\377�\377\377\377�\377\377\377�\377\377\377")
+	IMAGE_SCAN("�\377\377\377�\377\377\377�\377\377\377�\377\377\377�\377\377\377�\377\377\377�\377\377\377")
+	IMAGE_SCAN("�\377\377\377�\377\377\377�\377\377\377�\377\377\377�\377\377\377�\377\377\377�\377\377\377")
+	IMAGE_SCAN("�\377\377\377�\377\377\377�\377\377\377�\377\377\377�\377\377\377�\377\377\377�\377\377\377")
+	IMAGE_SCAN("�\377\377\377�\377\377\377����\6����������������������\4���������������\5�������������������\1��������������������������\377\377\377�\377\377\377")
+	IMAGE_SCAN("�\377\377\377�\377\377\377��������\3�����������������\3������������\5��������������Ԃ���\2���������\1���������������������������\377\377\377�\377\377\377")
+	IMAGE_SCAN("�\377\377\377�\377\377\377����\1�������\2����������\12�������������ɼ����ɼ�Ƹ�ɼ�Ƹ��ò\14ĵ�������������ƺ��Ƹ�̺���������������\1�����������������������\377\377\377�\377\377\377")
+	IMAGE_SCAN("�\377\377\377�\377\377\377����\1�������\4�����������͂���\32����Ѿ�̺�Ѿ�������������������������̺˼������������x���ĵ��Ų������������\377��������\1����������������\377\377\377�\377\377\377")
+	IMAGE_SCAN("�\377\377\377�\377\377\377����\3�������������\6����������Ѿ�����̂��ӂ���\2���\377��������\24�������������Ӽ�ɵ˻�ò����������¬�ӽ��κ���������������������\1�������������������\377\377\377�\377\377"
+	"\377")
+	IMAGE_SCAN("�\377\377\377�\377\377\377����\1�������\11����������ɼ�Ѿ�����������݂\377��\2�����݂\377�����\2�����Ӄ���\10�������Ӽ�κ�ʴ�ijӽ�î�����\10î�Ӽ��ij����������������������������������\377\377\377�\377"
+	"\377\377")
+	IMAGE_SCAN("�\377\377\377�\377\377\377����\7������ƽ����������������\1\377�����\377��\5��������������͂���\2�����̂���\23�������������Ӽپ�̵�î��������¬�Ƹ�������������������������������������\377\377\377�\377"
+	"\377\377")
+	IMAGE_SCAN("�\377\377\377�\377\377\377����\4����������ž����\1������\17������������\377���������������Ӽ�Ӻ�˫�ʴ�̺�Ӽ����\4����Ӽ�����Ă���\3����ij̵��î�\10ĵ��Ų����������������������\0\0\0�����\0\0\0������"
+	"���\377\377\377�\377\377\377")
+	IMAGE_SCAN("�\377\377\377�\377\377\377����\5��������������Ԃ���\2���������\10������������\377���������ѵ��ã\15��}˱�ʬ�پ�Ѷ��Dzӽ�����ͳ����Dz�ͳ�Ӻ����\15�Ӻ�ij�¬Ѷ�ʹ�ĵ�˼��̺���������\377���������\0\0\0�"
+	"����\0\0\0���������\377\377\377�\377\377\377")
+	IMAGE_SCAN("�\377\377\377�\377\377\377����\2���������\1��܅���\12����������Ѿ�κ�ʴʴ���{�����k���c\2�jF�vV���k\7��{���ȧ�ӹ��ģ�ʭ�Ƭ��ʭ\2�Ͳ�ѵ��ͳ\13�ãӼ�˻�Ӽ��Ų�Ӽ�������������������\0\0\0�����\0\0\0���"
+	"��\0\0\0�����\0\0\0���������\377\377\377�\377\377\377")
+	IMAGE_SCAN("�\377\377\377�\377\377\377����\25����������������������������������������κ�����z��������c�vV�gE��g=\15�jF�xL�[6|V5�sK�_A�xLß���tŢ{ӯ�ӵ�Ը��ڽ�\2����ģ��ã\10Ӽ��ä�Dz�Ӻ�������������������\0\0\0"
+	"�����\0\0\0�����\0\0\0�����\0\0\0���������\377\377\377�\377\377\377")
+	IMAGE_SCAN("�\377\377\377�\377\377\377����\2���������\14������\377���������������ռڻ������i�rS��gE\10|V5�[6vJ%{Q*sG\34j@\27vJ%sG\34��[6\11�b;sG\34vJ%�g=�jF�xL��f��j��t�Ţ{����\1�ģ��ã\10�ģ�Ͳ�ٺ��������������"
+	"�����\0\0\0�����\0\0\0\1����\0\0\0�����\0\0\0�����\0\0\0�����\0\0\0�����\0\0\0�����\0\0\0�����\0\0\0�����\0\0\0�����\0\0\0�����\377\377\377�\377\377\377")
+	IMAGE_SCAN("�\377\377\377�\377\377\377����\1������\1������\15\377������������ѷӯ���d�gE|V5b>$Z4\30^1\13e:\23�{Q*��jF\5�[6�g=�[6d8\17j@\27�^1\13\1d8\17��[6\23�jF�sK�xL�{U��[��^��rśxҮ�Ѳ�ڽ�����ģ�Ƭ�Ѫ�ѵ����"
+	"������������\0\0\0�����\0\0\0�����\0\0\0�����\0\0\0�����\0\0\0�����\0\0\0�����\0\0\0�����\0\0\0�����\377\377\377�\377\377\377")
+	IMAGE_SCAN("�\377\377\377�\377\377\377����\4���������������\22\377�����ӽ������k�g=j@\27Z4\30sG\34{Q*�[6�sK�jF��[�{U�sK�b;�[6��sK\1�{U��b;\5|V5j@\27{Q*j@\27�[6��b;\13�g=�jF�{U��jŢ{��tŢ{α�ӵ�ڽ��ģ��ʭ\5�Ӻ���"
+	"�������������\0\0\0�����\0\0\0�����\0\0\0�����\0\0\0�����\0\0\0�����\0\0\0�����\0\0\0�����\0\0\0�����\377\377\377�\377\377\377")
+	IMAGE_SCAN("�\377\377\377�\377\377\377������������\27�����������������Ļ����x�}b�jF�[6sG\34vJ%�jF�sK�{Uśx\377۽�ֺٴ��vVb>$I#\15�Z4\30\10�gE��[��k��f�vV�jF�_AjG\'��[6��b;\2�jF��[���f\14��j��q��}ʬ�Ը��Ÿ�ģ�ͳ��"
+	"���������ߏ����\0\0\0�����\0\0\0�����\0\0\0�����\0\0\0�����\0\0\0�����\0\0\0�����\0\0\0�����\0\0\0�����\0\0\0�����\0\0\0�����\0\0\0�����\0\0\0�����\377\377\377�\377\377\377")
+	IMAGE_SCAN("�\377\377\377�\377\377\377����\2����������\3��������܂���\7���î��r\\yaK�rS��f�xL��b;\11�xL�~dśx�˫\377۽�ֺڻ��kVZ4\30�;\30\2\21J&\21I#\15�_Aȧ���|��f��j�sK�jF|V5�b;�gE�jF�gE�[6�b;�g=���^\11��[��jŢ"
+	"{Ѳ�ڽ��Ÿ�ͳ�����Ԃ�������\0\0\0�����\0\0\0�����\0\0\0�����\0\0\0�����\0\0\0�����\0\0\0�����\0\0\0�����\0\0\0�����\0\0\0�����\0\0\0�����\0\0\0�����\377\377\377�\377\377\377")
+	IMAGE_SCAN("�\377\377\377�\377\377\377����\2����������7����������Ͳ�����f�vV��f��zȧ�Ѳ��sK�jF�{U��fŢ{˱��Ͳ���Ҵ�ß��~dZ4\30D\31\4U)\24;\30\2D\31\4U)\24��u�Ÿ��qŢ{��^�{U��[�jF��rśx�{U�vV�[6d8\17�b;�[*�{U��^��"
+	"rҮ�ٴ�ڽ��Ͳ����������������\0\0\0�����\0\0\0�����\0\0\0�����\0\0\0�����\0\0\0�����\0\0\0�����\0\0\0�����\0\0\0�����\0\0\0�����\0\0\0�����\377\377\377�\377\377\377")
+	IMAGE_SCAN("�\377\377\377�\377\377\377����\34����������������ѷ�ģȧ���c�vV��iß�Ҵ�ڻ�Ը��sK�jF��k��}ȧ�ӹ��ش����Ƭʬ��kVU\'\13D\31\4�U)\24�I#\15\5|V5ȧ�Ѳ�α�Ţ{���^\7�vVȧ�ٴ���|��r�~d�b;��[*\13�sK��[��^Ţ{ȧ"
+	"�Ү�ڻ��̺��������܏����\0\0\0�����\0\0\0�����\0\0\0�����\0\0\0�����\0\0\0�����\0\0\0�����\0\0\0�����\0\0\0�����\0\0\0�����\0\0\0�����\377\377\377�\377\377\377")
+	IMAGE_SCAN("�\377\377\377�\377\377\377��������\34�������ѵҴ���c��g��s���¬�ӽ��κ����ģ�sK�rSŢ{ӵ�Ը��ã�ٺ����r\\�_AZ4\30D\31\4U)\24U\'\13U)\24�D\31\4\33b>$ӵ��Υα�Ү�ȧ���r��dӹ��ѷڻ�Ҵ�ȧ���j�xL�g=�xL�{U��"
+	"[śxȧ�Ү�ʴ��Ų��������܏����\0\0\0�����\0\0\0�����\0\0\0�����\0\0\0�����\0\0\0�����\0\0\0�����\0\0\0�����\0\0\0�����\377\377\377�\377\377\377")
+	IMAGE_SCAN("�\377\377\377�\377\377\377\33����������������ʭ��{�vV�}b��zӹ��ͳ�������������ٺ�vV�rSҮ��Ÿڽ��ͳ����lQ;\30\2=\"\7�D\31\4\1U)\24�D\31\4\5U)\24;\30\2jG\'�Ѫ�ׯ�Ѳ�\26ٴ���|��u�ʭ����ѵ�īѯ�ȧ���f�xL�"
+	"sK�b;�jF��f��tʬ�ʴ��ʴ�������������\0\0\0�����\0\0\0�����\0\0\0\1����\0\0\0�����\0\0\0�����\0\0\0�����\0\0\0�����\0\0\0�����\0\0\0�����\377\377\377�\377\377\377")
+	IMAGE_SCAN("�\377\377\377�\377\377\377����\"�Ͳѯ�ʬ���c�gE�vV˱�ʴ��ī�����������������̦�m�rSȧ��ģڻ��ҳ������=\"\7I#\15Z4\30I#\15U\'\13D\31\4I#\15U)\24*\10\0}aC�ѵ��Ѫ\25Ը�ӵ��������������������īڻ�α���j�{"
+	"U�gE�jF��f��rʬ�̵��Ѿ��т�������\0\0\0�����\0\0\0�����\0\0\0\1����\0\0\0�����\0\0\0�����\0\0\0�����\0\0\0�����\0\0\0�����\0\0\0�����\0\0\0�����\377\377\377�\377\377\377")
+	IMAGE_SCAN("�\377\377\377�\377\377\377\36�ռ�Ͳȧ���k�vV�[6�lQ˱�ӹ��ī������������������\377������vV���ڽ��ã�ѵ������jG\';\30\2J&\21D\31\4J&\21�I#\15\0251\17\0=\"\7��{����Ѫ�ش͸�˱����î�����������������Ӻ����"
+	"����t��c��s�ß�\6ӹ��¬����������������\0\0\0�����\0\0\0�����\0\0\0�����\0\0\0�����\0\0\0�����\0\0\0�����\0\0\0�����\0\0\0�����\0\0\0�����\0\0\0�����\377\377\377�\377\377\377")
+	IMAGE_SCAN("�\377\377\377�\377\377\377\36�˫��k�rS�}b��d�}b��k͸�ʴ��κ����������������������˫��m��zӹ��ã�ҳ�ٺ��̟�iZ4\30;\30\2D\31\4J&\21�I#\15\13;\30\2�}b�ܽ\377���˫�˥͸�¬����˼�������\15�������ãѲ���}�"
+	"�m���˱�ʬ�پ��Ѿ�������������\0\0\0�����\0\0\0�����\0\0\0\1����\0\0\0�����\0\0\0�����\0\0\0�����\0\0\0�����\0\0\0�����\0\0\0�����\0\0\0�����\0\0\0�����\0\0\0�����\0\0\0�����\0\0\0�����\377\377\377�"
+	"\377\377\377")
+	IMAGE_SCAN("�\377\377\377�\377\377\377\15��{�rS��sԸ���i}aC��mӼ��Ӻ���������������\2�����Ă��z\20ӹ��ã�ҳ�ش����ܽ��sb>$D\31\0041\17\0;\30\2J&\21�lQ���\377���ὂ�Ȥ\5����������Ƹ�������\7�������ٺ�ã¬���~¬��"
+	"�ī\4����������������\0\0\0�����\0\0\0�����\0\0\0�����\0\0\0�����\0\0\0�����\0\0\0�����\0\0\0�����\0\0\0�����\0\0\0�����\0\0\0�����\0\0\0�����\0\0\0�����\0\0\0�����\377\377\377�\377\377\377")
+	IMAGE_SCAN("�\377\377\377�\377\377\377\15�ҳ�äӼ��ҳӼ���z�{`��f�Ų�̺������������\33\377���ij�������ä�ī�˥�ã�������ռѯ����¬��ij���������ڵ�Ѭ���������ƺ��������������\14�������ҳӹ����î��¬�κ������\377"
+	"���������\0\0\0�����\0\0\0�����\0\0\0�����\0\0\0�����\0\0\0�����\0\0\0�����\0\0\0�����\0\0\0�����\0\0\0�����\0\0\0�����\0\0\0�����\0\0\0�����\0\0\0�����\377\377\377�\377\377\377")
+	IMAGE_SCAN("�\377\377\377�\377\377\377\3\377�����\377�����\3��������Ԃ�̺\6����������������������\10���̵����˱��ä�ش�ٺ�������\6����������������ٺ��ٺ\7�˪����������������������\14����ɵ�˪˻�ĵ��ò�Ѿ������\377"
+	"������������\0\0\0�����\0\0\0�����\0\0\0�����\0\0\0�����\0\0\0�����\0\0\0�����\0\0\0�����\0\0\0�����\377\377\377�\377\377\377")
+	IMAGE_SCAN("�\377\377\377�\377\377\377\2������������\21���\377�����������������������������������̵����Ŵ��ҳ��˫\35�ʭ�ѵ����������������ٺ�ڵ�Ҳ¹��������Ų�������������������Ѿ���˻�˼��ɵ���������\377�����"
+	"�����\0\0\0�����\0\0\0�����\0\0\0�����\0\0\0�����\0\0\0�����\0\0\0�����\0\0\0�����\0\0\0�����\377\377\377�\377\377\377")
+	IMAGE_SCAN("�\377\377\377�\377\377\377��������\1������\16�������������������������������κ¬����Ŵ���˫\2�ʭ�ѵ��Ӻ\6�κ�ʴ�Ӻ�ͳ�˪ǽ�����\1�ͳ����\15�������������òü����˼��ɵ�������������������\0\0\0������"
+	"�������\377\377\377�\377\377\377")
+	IMAGE_SCAN("�\377\377\377�\377\377\377�����������\2���������\14����������������ī���������Ŵ�ӹ�ڻ��پ�\17�¬�Ųʴ�Ŵ�����������˪�������������������������\6����ʴ�������������������\0\0\0�������������\377\377"
+	"\377�\377\377\377")
+	IMAGE_SCAN("�\377\377\377�\377\377\377����\2����������\2����������\4�����������܂���\12�������������������˫Ŵ���������������\15���������������¹��Ҳ�������κ�ǹ����ij��¬\6����Ȥ�ҳ������������\1����������\0\0"
+	"\0�������������\377\377\377�\377\377\377")
+	IMAGE_SCAN("�\377\377\377�\377\377\377��������\4���������������\32�������������������Ӻ�ٺ�Ѭ�ٺ�ҳ�˫�ã�ī�¬˼�ƺ�ʹ�ʴ�ʹ��Ѭ����Ӽ�äʴ�ӽ���ij\10�¬�Ӻ��������������������\1�����������\0\0\0������������"
+	"�\377\377\377�\377\377\377")
+	IMAGE_SCAN("�\377\377\377�\377\377\377\1�����������\1�����������\11����������������̺�ʴ�Ӽ�ٺ��Ҳ��ҳ\11�Ӽ����������¬Ӽ��˪�ٺ�Ҳ�ӽ�\13����Dz���������������������\377��������\1�������\0\0\0�������������\377"
+	"\377\377�\377\377\377")
+	IMAGE_SCAN("�\377\377\377�\377\377\377����\6���������������������\6��������������������Ų\7ӽ�����̺����Ų����ʴ����\12����������������������������������������������\377\377\377�\377\377\377")
+	IMAGE_SCAN("�\377\377\377�\377\377\377����\6�����������������܃���\23�������������������Ѿ���������������������������������������\1����������������������\377\377\377�\377\377\377")
+	IMAGE_SCAN("�\377\377\377�\377\377\377�����������\21���������������������������������������������������\2���������\1�������������������\377\377\377�\377\377\377")
+	IMAGE_SCAN("�\377\377\377�\377\377\377��������������\2�����ڂ���\5��������������ڂ���\5����������������������������������\377\377\377�\377\377\377")
+	IMAGE_SCAN("�\377\377\377�\377\377\377��������\2���������\1������\4������������������\1�������������������\377\377\377�\377\377\377")
+	IMAGE_SCAN("�\377\377\377�\377\377\377�����������\7������������������������\4�������������������������������\377\377\377�\377\377\377")
+	IMAGE_SCAN("�\377\377\377�\377\377\377�\377\377\377�\377\377\377�\377\377\377�\377\377\377�\377\377\377")
+	IMAGE_SCAN("�\377\377\377�\377\377\377�\377\377\377�\377\377\377�\377\377\377�\377\377\377�\377\377\377")
+	IMAGE_SCAN("�\377\377\377�\377\377\377�\377\377\377�\377\377\377�\377\377\377�\377\377\377�\377\377\377")
+	IMAGE_SCAN("�\377\377\377�\377\377\377�\377\377\377�\377\377\377�\377\377\377�\377\377\377�\377\377\377")
+	IMAGE_SCAN("�\377\377\377�\377\377\377�\377\377\377�\377\377\377�\377\377\377�\377\377\377�\377\377\377")
+	IMAGE_SCAN("�\377\377\377�\377\377\377�\377\377\377�\377\377\377�\377\377\377�\377\377\377�\377\377\377")
+	IMAGE_SCAN("�\377\377\377�\377\377\377�\377\377\377�\377\377\377�\377\377\377�\377\377\377�\377\377\377")
+	IMAGE_SCAN("�\377\377\377�\377\377\377�\377\377\377�\377\377\377�\377\377\377�\377\377\377�\377\377\377")
+	IMAGE_SCAN("�\377\377\377�\377\377\377�\377\377\377�\377\377\377�\377\377\377�\377\377\377�\377\377\377")
+	IMAGE_SCAN("�\377\377\377�\377\377\377�\377\377\377�\377\377\377�\377\377\377�\377\377\377�\377\377\377")
+IMAGE_PACKED(eye, "\2�\1\0\0<\0\0\0L\0\0\0\14\0\0\0\0\0\0\0")
+IMAGE_BEGIN(icon)
+	IMAGE_SCAN("�\0\0\0�")
+	IMAGE_SCAN("\1\0\0\0�\0\0�\1\0\0\0\1www")
+	IMAGE_SCAN("\4\0\0\0\0\0�UUU�������\4���wwwUUUBBB�\"\"\"\2\0\0�\0\0\0\1www")
+	IMAGE_SCAN("\2\0\0\0\0\0�����\3������www�UUU�\"\"\"\2\0\0�\0\0\0\1www")
+	IMAGE_SCAN("\6\0\0\0\0\0�������www\21\21\21�\"\"\"\1\0\0\0�\"\"\"\2\0\0�\0\0\0\1www")
+	IMAGE_SCAN("\6\0\0\0\0\0����BBB\"\"\"����\21\21\21\5\0\0\0\21\21\21\"\"\"\0\0�\0\0\0\1www")
+	IMAGE_SCAN("\4\0\0\0\0\0�BBB\21\21\21�\0\0\0�\21\21\21\2\0\0�\0\0\0\1www")
+	IMAGE_SCAN("\7\0\0\0\0\0�\21\21\21\0\0\0UUU\"\"\"����\0\0\0\5\"\"\"\0\0\0\"\"\"\0\0�\0\0\0\1www")
+	IMAGE_SCAN("\5\0\0\0\0\0�UUU������\0\0\0\1UUU�\"\"\"\2\0\0�\0\0\0\1www")
+	IMAGE_SCAN("\3\0\0\0\0\0���݃����\0\0\0\3\21\21\21\0\0\0www�BBB\2\0\0�\0\0\0\1www")
+	IMAGE_SCAN("\4\0\0\0\0\0�����������\1����UUU\4BBB���\0\0�\0\0\0\1www")
+	IMAGE_SCAN("\5\0\0\0\0\0��������������\1www�UUU\4������\0\0�\0\0\0\1www")
+	IMAGE_SCAN("\2\0\0\0\0\0�����\2����������\5���������\0\0�\0\0\0\1www")
+	IMAGE_SCAN("\1\0\0\0�\0\0�\1\0\0\0\1www")
+	IMAGE_SCAN("�\0\0\0\1www")
+	IMAGE_SCAN("��www")
+IMAGE_PACKED(icon, "\2\20\0\0\0\20\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(off)
+	IMAGE_SCAN("�\0\0\0�")
+	IMAGE_SCAN("\1\0\0\0�\0\0�\1\0\0\0\1www")
+	IMAGE_SCAN("\1\0\0\0�\0\0�����\5���wwwUUUBBB\"\"\"�\0\0�\1\0\0\0\1www")
+	IMAGE_SCAN("\1\0\0\0�\0\0�\3������www�UUU�\0\0�\1\0\0\0\1www")
+	IMAGE_SCAN("\3\0\0\0\0\0���݃\0\0��\"\"\"�\0\0�\3\"\"\"\0\0�\0\0\0\1www")
+	IMAGE_SCAN("\4\0\0\0\0\0����BBB�\0\0�\1\21\21\21�\0\0�\4\21\21\21\"\"\"\0\0�\0\0\0\1www")
+	IMAGE_SCAN("\5\0\0\0\0\0�BBB\21\21\21\0\0\0�\0\0�\1\0\0\0�\21\21\21\2\0\0�\0\0\0\1www")
+	IMAGE_SCAN("\6\0\0\0\0\0�\21\21\21\0\0\0UUU\"\"\"�\0\0�\6\0\0\0\"\"\"\0\0\0\"\"\"\0\0�\0\0\0\1www")
+	IMAGE_SCAN("\5\0\0\0\0\0�UUU������\0\0�\1UUU�\"\"\"\2\0\0�\0\0\0\1www")
+	IMAGE_SCAN("\4\0\0\0\0\0���ݲ���\0\0�\1\0\0\0�\0\0��BBB\2\0\0�\0\0\0\1www")
+	IMAGE_SCAN("\3\0\0\0\0\0����\0\0�\1����UUU�\0\0�\3���\0\0�\0\0\0\1www")
+	IMAGE_SCAN("\1\0\0\0�\0\0�����\1www�UUU�\0\0�\1\0\0\0\1www")
+	IMAGE_SCAN("\1\0\0\0�\0\0�\3�������������\1����\0\0�\1\0\0\0\1www")
+	IMAGE_SCAN("\1\0\0\0�\0\0�\1\0\0\0\1www")
+	IMAGE_SCAN("�\0\0\0\1www")
+	IMAGE_SCAN("��www")
+IMAGE_PACKED(off, "\2\20\0\0\0\20\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0")
diff --git a/examples/EyeCare/EyeCare.lay b/examples/EyeCare/EyeCare.lay
new file mode 100644
index 000000000..3dc86ee88
--- /dev/null
+++ b/examples/EyeCare/EyeCare.lay
@@ -0,0 +1,28 @@
+LAYOUT(EyeCareLayout, 270, 216)
+	ITEM(MenuBar, menu, LeftPosZ(0, 256).TopPosZ(0, 24))
+	ITEM(ImageCtrl, image, LeftPosZ(10, 253).TopPosZ(32, 40))
+	ITEM(LabelBox, dv___2, LeftPosZ(8, 257).TopPosZ(24, 162))
+	ITEM(Label, text1, SetLabel(t_("text1")).SetFont(Roman(16).Bold()).LeftPosZ(16, 241).TopPosZ(75, 25))
+	ITEM(Label, text2, LeftPosZ(16, 241).TopPosZ(105, 35))
+	ITEM(Button, hide, SetLabel(t_("HIDE")).SetFont(Arial(25).Bold()).LeftPosZ(15, 242).TopPosZ(143, 35))
+	ITEM(StatusBar, status, LeftPosZ(0, 256).TopPosZ(192, 24))
+END_LAYOUT
+
+LAYOUT(ConfigurationLayout, 216, 144)
+	ITEM(LabelBox, dv___0, SetLabel(t_("EyeCare")).LeftPosZ(8, 200).TopPosZ(4, 132))
+	ITEM(Label, dv___1, SetLabel(t_("Relaxing time (minutes):")).LeftPosZ(16, 121).TopPosZ(24, 19))
+	ITEM(EditInt, relax, LeftPosZ(148, 48).TopPosZ(24, 19))
+	ITEM(Label, dv___3, SetLabel(t_("Washing time (Minutes):")).LeftPosZ(16, 125).TopPosZ(48, 19))
+	ITEM(EditInt, wash, LeftPosZ(148, 48).TopPosZ(48, 19))
+	ITEM(Option, topmost, SetLabel(t_("Stay on top")).LeftPosZ(16, 84).TopPosZ(76, 19))
+	ITEM(Option, hideicon, SetLabel(t_("Hide try icon")).RightPosZ(16, 84).TopPosZ(76, 19))
+	ITEM(Button, ok, SetLabel(t_("OK")).LeftPosZ(28, 72).TopPosZ(104, 24))
+	ITEM(Button, cancel, SetLabel(t_("Cancel")).LeftPosZ(112, 72).TopPosZ(104, 24))
+END_LAYOUT
+
+LAYOUT(AboutDialogLayout, 304, 196)
+	ITEM(LabelBox, dv___0, SetLabel(t_("EyeCare")).LeftPosZ(4, 296).TopPosZ(0, 160))
+	ITEM(RichTextCtrl, text, LeftPosZ(12, 280).TopPosZ(20, 132))
+	ITEM(Button, ok, SetLabel(t_("OK")).LeftPosZ(228, 72).TopPosZ(168, 24))
+END_LAYOUT
+
diff --git a/examples/EyeCare/EyeCare.upp b/examples/EyeCare/EyeCare.upp
new file mode 100644
index 000000000..06520cf6c
--- /dev/null
+++ b/examples/EyeCare/EyeCare.upp
@@ -0,0 +1,15 @@
+description "Tray application that reminds user to take care about his eyes";
+
+uses
+	CtrlLib;
+
+file
+	EyeCare.h,
+	EyeCare.cpp,
+	icon.rc,
+	EyeCare.lay,
+	EyeCare.iml;
+
+mainconfig
+	"" = "GUI";
+
diff --git a/examples/EyeCare/app.tpp/about$en-us.tpp b/examples/EyeCare/app.tpp/about$en-us.tpp
new file mode 100644
index 000000000..6e896d642
--- /dev/null
+++ b/examples/EyeCare/app.tpp/about$en-us.tpp
@@ -0,0 +1,5 @@
+TITLE("EyeCare/u++ 1.0")
+COMPRESSED
+120,156,173,145,75,111,220,32,20,133,255,10,82,166,85,155,135,135,123,1,131,237,77,95,89,69,106,163,84,81,23,150,167,48,54,201,208,248,37,27,107,102,84,53,191,189,56,211,42,170,162,40,155,178,0,113,225,124,231,30,200,145,44,22,244,148,30,209,23,70,250,201,222,152,169,246,69,238,56,87,153,65,145,221,93,124,73,178,227,119,111,98,254,118,166,64,160,48,9,76,9,6,28,227,48,1,3,20,200,56,40,76,184,98,76,209,180,172,205,56,22,121,141,74,101,179,8,79,241,8,165,64,144,92,113,5,76,42,12,90,164,20,169,68,1,156,41,20,105,101,199,178,200,141,98,217,241,85,28,68,108,118,10,112,10,49,114,201,145,50,138,60,88,129,82,28,164,80,44,137,227,180,52,189,119,93,251,199,203,1,32,100,107,144,89,232,249,254,254,62,2,78,15,29,240,0,3,202,67,171,16,106,148,163,4,145,208,68,40,80,148,5,184,144,84,164,189,25,76,243,124,116,241,98,116,73,83,231,109,64,28,159,0,200,32,137,79,227,35,224,50,4,85,140,11,37,
+105,48,71,68,198,16,24,38,9,138,88,200,116,99,77,101,135,34,255,249,253,23,201,71,250,16,63,127,117,254,249,236,250,43,57,223,219,143,102,176,203,73,159,232,19,2,17,45,94,23,243,29,70,14,235,106,227,125,175,83,189,212,203,169,239,117,52,118,211,80,218,155,110,184,181,58,106,173,215,75,19,202,11,87,89,189,120,191,238,38,175,23,182,213,103,211,168,163,141,111,234,21,201,87,43,114,57,173,107,87,146,170,107,140,107,201,122,79,138,235,7,59,111,77,243,159,108,14,24,114,101,93,211,215,182,177,173,55,243,191,145,238,38,116,240,8,223,110,183,58,218,238,182,174,186,181,62,136,131,129,94,174,200,118,247,237,80,41,158,222,46,187,202,246,67,247,195,150,126,222,52,122,89,187,245,96,134,125,56,127,4,153,177,95,17,187,51,179,123,49,71,124,194,233,7,183,55,237,157,142,92,59,91,94,30,182,228,67,87,59,83,144,105,116,237,45,241,27,251,143,240,153,183,112,109,101,119,127,147,95,215,222,53,198,219,249,69,139,168,248,13,86,169,13,138,
+
diff --git a/examples/EyeCare/app.tpp/all.i b/examples/EyeCare/app.tpp/all.i
new file mode 100644
index 000000000..066a44bd4
--- /dev/null
+++ b/examples/EyeCare/app.tpp/all.i
@@ -0,0 +1,4 @@
+TOPIC("about$en-us")
+#include "about$en-us.tpp"
+END_TOPIC
+
diff --git a/examples/EyeCare/icon.ico b/examples/EyeCare/icon.ico
new file mode 100644
index 000000000..4012786aa
Binary files /dev/null and b/examples/EyeCare/icon.ico differ
diff --git a/examples/EyeCare/icon.rc b/examples/EyeCare/icon.rc
new file mode 100644
index 000000000..77db3bb6d
--- /dev/null
+++ b/examples/EyeCare/icon.rc
@@ -0,0 +1 @@
+9999 ICON "icon.ico"
diff --git a/examples/EyeCare/icon16x16.png b/examples/EyeCare/icon16x16.png
new file mode 100644
index 000000000..f2cc03528
Binary files /dev/null and b/examples/EyeCare/icon16x16.png differ
diff --git a/examples/HelloWorld/HelloWorld.upp b/examples/HelloWorld/HelloWorld.upp
new file mode 100644
index 000000000..ea5fc748a
--- /dev/null
+++ b/examples/HelloWorld/HelloWorld.upp
@@ -0,0 +1,11 @@
+description "Rudimentary HelloWorld application with menu and status bar";
+
+uses
+	CtrlLib;
+
+file
+	hello.cpp;
+
+mainconfig
+	"" = "GUI";
+
diff --git a/examples/HelloWorld/hello.cpp b/examples/HelloWorld/hello.cpp
new file mode 100644
index 000000000..13dd6aeb6
--- /dev/null
+++ b/examples/HelloWorld/hello.cpp
@@ -0,0 +1,48 @@
+#include <CtrlLib/CtrlLib.h>
+
+using namespace Upp;
+
+class HelloWorld : public TopWindow {
+	MenuBar menu;
+	StatusBar status;
+
+	void FileMenu(Bar& bar);
+	void MainMenu(Bar& bar);
+	void About();
+
+public:
+	typedef HelloWorld CLASSNAME;
+
+	HelloWorld();
+};
+
+void HelloWorld::About()
+{
+	PromptOK("{{1@5 [@9= This is the]::@2 [A5@0 Ultimate`+`+ Hello world sample}}");
+}
+
+void HelloWorld::FileMenu(Bar& bar)
+{
+	bar.Add("About..", THISBACK(About));
+	bar.Separator();
+	bar.Add("Exit", THISBACK(Close));
+}
+
+void HelloWorld::MainMenu(Bar& bar)
+{
+	menu.Add("File", THISBACK(FileMenu));
+}
+
+HelloWorld::HelloWorld()
+{
+	AddFrame(menu);
+	AddFrame(status);
+	menu.Set(THISBACK(MainMenu));
+	status = "Welcome to the Ultimate++ !";
+}
+
+GUI_APP_MAIN
+{
+	SetLanguage(LNG_ENGLISH);
+	HelloWorld().Run();
+}
diff --git a/examples/HomeBudget/HomeBudget.cpp b/examples/HomeBudget/HomeBudget.cpp
new file mode 100644
index 000000000..e74467b94
--- /dev/null
+++ b/examples/HomeBudget/HomeBudget.cpp
@@ -0,0 +1,873 @@
+#include <CtrlLib/CtrlLib.h>
+#include <DropGrid/DropGrid.h>
+#include <GridCtrl/GridCtrl.h>
+#include <plugin/sqlite3/lib/sqlite3.h>
+#include <plugin/sqlite3/Sqlite3.h>
+
+using namespace Upp;
+
+#define IMAGEFILE <HomeBudget/HomeBudget.iml>
+#define IMAGECLASS Images
+#include <Draw/iml.h>
+
+#define SCHEMADIALECT <plugin/sqlite3/Sqlite3Schema.h>
+#define MODEL <HomeBudget/HomeBudget.sch>
+
+#include <Sql/sch_schema.h>
+#include <Sql/sch_header.h>
+#include <Sql/sch_source.h>
+
+#define LAYOUTFILE <HomeBudget/HomeBudget.lay>
+#include <CtrlCore/lay.h>
+
+#define TOPICFILE <HomeBudget/src.tpp/all.i>
+#include <Core/topic_group.h>
+#define TOPICFILE <HomeBudget/help.tpp/all.i>
+#include <Core/topic_group.h>
+
+#define TFILE <HomeBudget/HomeBudget.t>
+#include <Core/t.h>
+
+#include "HomeBudget.h"
+
+struct ConvMonth : Convert
+{
+	Value Format(const Value &q) const
+	{
+		Date dt = (Date) q;
+		return q.IsNull() ? "" : ::Format("%Month %.4d", dt.month, dt.year);
+	}
+};
+
+struct ConvDouble : Convert
+{
+	Value Format(const Value &q) const
+	{
+		return q.IsNull() ? Null : ::Format("%.2f", q);
+	}
+};
+
+struct DispPM : GridDisplay
+{
+	virtual void Paint(Draw &w, int x, int y, int cx, int cy, const Value &val, dword style,
+			           Color &fg, Color &bg, Font &fnt, bool found, int fs, int fe)
+	{
+		if(!val.IsNull())
+		{
+			int t = int(val) < 0 ? 0 : 1;
+			SetCenterImage(t ? Images::Plus : Images::Minus);
+		}
+		else
+			SetCenterImage(Null);
+		GridDisplay::Paint(w, x, y, cx, cy, Value(""), style, fg, bg, fnt, found, fs, fe);
+	}
+};
+
+HomeBudget::HomeBudget()
+{
+	lang = 0;
+}
+
+void HomeBudget::Setup()
+{
+	CtrlLayout(*this, String(t_("Home budget")) + " 1.0");
+
+	Icon(Images::SmallIcon());
+	LargeIcon(Images::LargeIcon());
+
+	tab.Add(money.SizePos(), t_("Expenses"));
+	tab.Add(spl.Horz(groups, categories), t_("Categories"));
+	spl.SetPos(2000);
+
+	money.AddIndex(ID);
+	money.AddColumn(CAT_ID, t_("Category")).Edit(category).SetConvert(category);
+	money.AddColumn(PM, t_("Plus / Minus")).SetDisplay(Single<DispPM>()).Edit(plusminus);
+	money.AddColumn(VALUE, t_("Value")).Edit(val).Default(0).SetConvert(Single<ConvDouble>());
+	money.AddColumn(DT, t_("When")).Edit(dt).Default(GetSysDate());
+	money.AddColumn(DESC, t_("Describe")).Edit(es);
+	money.Appending().Removing().Editing().Accepting().Canceling();
+	money.RejectNullRow();
+	money.WhenInsertRow = THISBACK(InsertMoney);
+	money.WhenUpdateRow = THISBACK(UpdateMoney);
+	money.WhenRemoveRow = THISBACK(RemoveMoney);
+	money.SetToolBar();
+
+	Date dt = GetSysDate();
+	dt.day = 1;
+
+	month.AddIndex(ID);
+	month.AddColumn(DT, t_("Month")).Edit(months).SetConvert(Single<ConvMonth>()).Default(dt);
+	month.Appending().Removing().Editing().Accepting().Canceling();
+	month.WhenInsertRow = THISBACK(InsertDate);
+	month.WhenUpdateRow = THISBACK(UpdateDate);
+	month.WhenRemoveRow = THISBACK(RemoveDate);
+	month.WhenChangeRow = THISBACK(ChangeDate);
+	month.WhenAcceptRow = THISBACK(AcceptDate);
+	month.WhenNewRow    = THISBACK(NewDate);
+	month.SetToolBar();
+
+	groups.AddIndex(ID);
+	groups.AddColumn(NAME, t_("Name")).Edit(eg);
+	groups.Appending().Removing().Editing().Accepting().Canceling();
+	groups.RejectNullRow();
+	groups.SetToolBar();
+	groups.WhenInsertRow = THISBACK(InsertGroup);
+	groups.WhenUpdateRow = THISBACK(UpdateGroup);
+	groups.WhenRemoveRow = THISBACK(RemoveGroup);
+	groups.WhenChangeRow = THISBACK(ChangeGroup);
+
+	categories.AddIndex(ID);
+	categories.AddColumn(NAME, t_("Name")).Edit(ec);
+	categories.AddColumn(DEFVALUE, t_("Default value")).Edit(defval).SetConvert(Single<ConvDouble>());
+	categories.AddColumn(PM, t_("Plus / Minus")).Edit(dlpm).SetConvert(dlpm).Default(-1);
+	categories.AddColumn(INNEWMONTH, t_("Default for a new month")).Edit(yesno).SetConvert(yesno).Default(0);
+	categories.WhenInsertRow = THISBACK(InsertCategory);
+	categories.WhenUpdateRow = THISBACK(UpdateCategory);
+	categories.WhenRemoveRow = THISBACK(RemoveCategory);
+	categories.WhenAcceptRow = THISBACK(UpdateCategories);
+	categories.Appending().Removing().Editing();
+	categories.RejectNullRow();
+	categories.SetToolBar();
+
+	mostpr.AddColumn(t_("Name"));
+	mostpr.AddColumn(t_("Amount")).SetConvert(Single<ConvDouble>()).AlignCenter();
+	mostcat.AddColumn(t_("Name"));
+	mostcat.AddColumn(t_("Amount")).SetConvert(Single<ConvDouble>()).AlignCenter();
+
+	tabmost.Add(mostpr.SizePos(), t_("Product"));
+	tabmost.Add(mostcat.SizePos(), t_("Category"));
+
+	dlpm.Add(-1, t_("Minus")).Add(1, t_("Plus"));
+	plusminus.Add(-1, t_("Minus")).Add(1, t_("Plus"));
+	yesno.Add(0, t_("No")).Add(1, t_("Yes"));
+
+	GenMonthList(dt.year);
+
+	SQL * Delete(MONEY).Where(IsNull(CAT_ID));
+
+	LoadDates();
+	LoadGroups();
+
+	UpdateCategories();
+
+	if(month.GetCount() > 0)
+	{
+		month.GoEnd();
+		UpdateSummary();
+	}
+	EnableMoney();
+	Sizeable().Zoomable();
+
+	category <<= THISBACK(UpdateValue);
+	exit <<= THISBACK(Close);
+	options <<= THISBACK(Options);
+	about <<= THISBACK(About);
+	help <<= THISBACK(Help);
+
+	category.AlwaysDrop().Resizeable(false).Header(false);
+	category.AddPlus(THISBACK(NewCategory));
+
+	dosummary = true;
+}
+
+void HomeBudget::Serialize(Stream &s)
+{
+	int version = 1;
+	s / version;
+	SerializePlacement(s);
+	s % spl;
+	s % lang;
+	//s % categories;
+	//s % money;
+}
+
+void HomeBudget::GenMonthList(int year)
+{
+	months.Clear();
+	for(int i = 0; i < 12; i++)
+		months.Add(Date(year, i + 1, 1), Format("%Month %.4d", i + 1, year));
+}
+
+void HomeBudget::LoadMoney(int dtid)
+{
+	money.Clear();
+	SQL * Select(ID, CAT_ID, PM, VALUE, DT, DESC).From(MONEY).Where(DT_ID == dtid);
+	while(SQL.Fetch())
+	{
+		money.Add();
+		money(ID) = SQL[ID];
+		money(CAT_ID) = SQL[CAT_ID];
+		money(PM) = SQL[PM];
+		money(VALUE) = SQL[VALUE];
+		money(DT) = SQL[DT];
+		money(DESC) = SQL[DESC];
+	}
+}
+
+void HomeBudget::LoadDates()
+{
+	month.Clear();
+	SQL * Select(ID, DT).From(DATES);
+	while(SQL.Fetch())
+		month.Add(SQL);
+}
+
+void HomeBudget::LoadGroups()
+{
+	groups.Clear();
+	SQL * Select(ID, NAME).From(GROUPS);
+	while(SQL.Fetch())
+		groups.Add(SQL);
+
+	if(!groups.IsEmpty())
+		groups.SetCursor(0);
+	else
+		categories.Disable();
+}
+
+void HomeBudget::LoadCategories(int group_id)
+{
+	categories.Clear();
+	SQL * Select(ID, NAME, DEFVALUE, PM, INNEWMONTH).From(CATEGORIES).Where(GR_ID == group_id);
+	while(SQL.Fetch())
+		categories.Add(SQL);
+}
+
+int HomeBudget::GetCategorySign()
+{
+	SQL * Select(PM).From(CATEGORIES).Where(ID == money.Get(CAT_ID));
+	Value v = SQL.Fetch() ? SQL[0] : Value(0);
+	return v;
+}
+
+void HomeBudget::UpdateCategories()
+{
+	category.Clear();
+	SQL & Select(ID.Of(CATEGORIES), NAME.Of(CATEGORIES), NAME.Of(GROUPS))
+		.From(CATEGORIES, GROUPS)
+		.Where(GR_ID == ID.Of(GROUPS))
+		.OrderBy(NAME.Of(GROUPS), NAME.Of(CATEGORIES));
+
+	while(SQL.Fetch())
+		category.Add(SQL[0], Format("%s - %s", SQL[2], SQL[1]));
+}
+
+void HomeBudget::InsertGroup()
+{
+	try
+	{
+		SQL & Insert(GROUPS)
+			(NAME, groups(1));
+		groups(0) = SQL.GetInsertedId();
+
+		categories.Clear();
+		categories.Enable();
+	}
+	catch(SqlExc &e)
+	{
+		groups.CancelInsert();
+		Exclamation("[* " + DeQtfLf(e) + "]");
+	}
+
+}
+
+void HomeBudget::UpdateGroup()
+{
+	try
+	{
+		SQL & ::Update(GROUPS)
+			(NAME, groups(1))
+			.Where(ID == groups(0));
+	}
+	catch(SqlExc &e)
+	{
+		groups.CancelUpdate();
+		Exclamation("[* " + DeQtfLf(e) + "]");
+	}
+}
+
+void HomeBudget::RemoveGroup()
+{
+	if(categories.IsEmpty())
+	{
+		SQL & Delete(GROUPS).Where(ID == groups(ID));
+	}
+	else
+	{
+		PromptOK(t_("You can't remove this group. It is not empty."));
+		groups.CancelRemove();
+	}
+
+	if(groups.GetCount() == 1)
+		categories.Disable();
+}
+
+struct AddNewCat : WithNewCategoryLayout<TopWindow>
+{
+	typedef AddNewCat CLASSNAME;
+	bool newgroup;
+
+	AddNewCat()
+	{
+		newgroup = false;
+		CtrlLayoutOKCancel(*this, t_("New item"));
+		addgroup.SetImage(Images::SmallPlus());
+		addgroup <<= THISBACK(NewGroup);
+		groups <<= THISBACK(SelGroup);
+		addgroup.NoWantFocus();
+
+		int cnt = 0;
+		SQL * Select(ID, NAME).From(GROUPS);
+		while(SQL.Fetch())
+		{
+			groups.Add(SQL[ID], SQL[NAME]);
+			cnt++;
+		}
+
+		bool isgroup = cnt > 0;
+		if(isgroup)
+			groups.SetIndex(0);
+		else
+			ok.Disable();
+
+		pm = 1;
+	}
+
+	void SelGroup()
+	{
+		ok.Enable();
+	}
+
+	void NewGroup()
+	{
+		WithNewGroupLayout<TopWindow> dlg;
+		CtrlLayoutOKCancel(dlg, t_("New category"));
+		if(dlg.Execute() == IDOK)
+		{
+			try
+			{
+				SQL & ::Insert(GROUPS)(NAME, ~dlg.name);
+				int64 id = SQL.GetInsertedId();
+				groups.Add(id, ~dlg.name);
+				groups <<= id;
+				ok.Enable();
+				newgroup = true;
+			}
+			catch(SqlExc &e)
+			{
+				Exclamation("[* " + DeQtfLf(e) + "]");
+			}
+		}
+	}
+	bool IsNewGroup() { return newgroup; }
+};
+
+void HomeBudget::NewCategory()
+{
+	AddNewCat dlg;
+
+	if(dlg.Execute() == IDOK)
+	{
+		try
+		{
+			SQL & ::Insert(CATEGORIES)
+			    (GR_ID, ~dlg.groups)
+				(NAME, ~dlg.name)
+				(DEFVALUE, 0)
+				(PM, dlg.pm == 0 ? 1 : -1)
+				(INNEWMONTH, 0);
+
+			int64 id = SQL.GetInsertedId();
+			UpdateCategories();
+			money.Set(CAT_ID, id);
+			UpdateValue();
+
+			int gid = ~dlg.groups;
+
+			if(dlg.IsNewGroup())
+			{
+				groups.Add(Value(gid), dlg.groups.GetValue());
+				groups.GoEnd();
+				categories.Enable();
+			}
+			int c = groups.GetCursor();
+			if(c >= 0 && gid == groups(c, 0))
+				LoadCategories(gid);
+		}
+		catch(SqlExc &e)
+		{
+			Exclamation("[* " + DeQtfLf(e) + "]");
+		}
+	}
+}
+
+void HomeBudget::InsertCategory()
+{
+	try
+	{
+		SQL & Insert(CATEGORIES)
+		    (GR_ID, groups(ID))
+			(NAME, categories(NAME))
+			(DEFVALUE, categories(DEFVALUE))
+			(PM, categories(PM))
+			(INNEWMONTH, categories(INNEWMONTH));
+
+		categories(0) = SQL.GetInsertedId();
+	}
+	catch(SqlExc &e)
+	{
+		categories.CancelInsert();
+		Exclamation("[* " + DeQtfLf(e) + "]");
+	}
+
+}
+
+void HomeBudget::UpdateCategory()
+{
+	try
+	{
+		SQL & ::Update(CATEGORIES)
+			(NAME, categories(NAME))
+			(DEFVALUE, categories(DEFVALUE))
+			(PM, categories(PM))
+			(INNEWMONTH, categories(INNEWMONTH))
+			.Where(ID == categories(ID));
+
+		UpdateSummary();
+	}
+	catch(SqlExc &e)
+	{
+		categories.CancelUpdate();
+		Exclamation("[* " + DeQtfLf(e) + "]");
+	}
+}
+
+void HomeBudget::ChangeGroup()
+{
+	LoadCategories(groups(ID));
+}
+
+void HomeBudget::RemoveCategory()
+{
+	try
+	{
+		SQL * ::Select(CAT_ID, NAME)
+			.From(MONEY, CATEGORIES)
+			.Where(CAT_ID == categories(ID) && ID.Of(CATEGORIES) == categories(ID))
+			.Limit(1);
+
+		if(SQL.Fetch())
+		{
+			PromptOK(Format(t_("Item '%s' can't be removed. It is used in calculations."), AsString(SQL[1])));
+			categories.CancelRemove();
+		}
+		else
+			SQL & ::Delete(CATEGORIES).Where(ID == categories(ID));
+	}
+	catch(SqlExc &e)
+	{
+		categories.CancelRemove();
+		Exclamation("[* " + DeQtfLf(e) + "]");
+	}
+}
+
+void HomeBudget::InsertMoney()
+{
+	try
+	{
+		SQL & ::Insert(MONEY)
+			(DT_ID,  dtid)
+			(CAT_ID, money(CAT_ID))
+			(PM,     money(PM))
+			(VALUE,  money(VALUE))
+			(DT,     money(DT))
+			(DESC,   money(DESC));
+
+		money(ID) = SQL.GetInsertedId();
+
+		if(dosummary)
+			UpdateSummary();
+	}
+	catch(SqlExc &e)
+	{
+		money.CancelInsert();
+		Exclamation("[* " + DeQtfLf(e) + "]");
+	}
+}
+
+void HomeBudget::UpdateMoney()
+{
+	try
+	{
+		SQL & ::Update(MONEY)
+			(DT_ID,  dtid)
+			(CAT_ID, money(CAT_ID))
+			(PM,     money(PM))
+			(VALUE,  money(VALUE))
+			(DT,     money(DT))
+			(DESC,   money(DESC))
+			.Where(ID == money(ID));
+
+		UpdateSummary();
+	}
+	catch(SqlExc &e)
+	{
+		money.CancelUpdate();
+		Exclamation("[* " + DeQtfLf(e) + "]");
+	}
+}
+
+void HomeBudget::RemoveMoney()
+{
+	try
+	{
+		SQL & ::Delete(MONEY).Where(ID == money(ID));
+		UpdateSummary();
+	}
+	catch(SqlExc &e)
+	{
+		money.CancelRemove();
+		Exclamation("[* " + DeQtfLf(e) + "]");
+	}
+}
+
+void HomeBudget::InsertDate()
+{
+	try
+	{
+		SQL & ::Insert(DATES)(DT, month(DT));
+		month(ID) = dtid = (int) SQL.GetInsertedId();
+		EnableMoney();
+	}
+	catch(SqlExc &e)
+	{
+		month.CancelInsert();
+		Exclamation("[* " + DeQtfLf(e) + "]");
+	}
+}
+
+void HomeBudget::EnableMoney(int cnt)
+{
+	money.Enable(cnt < 0 ? month.GetCount() > 0 : cnt);
+}
+
+void HomeBudget::UpdateDate()
+{
+	try
+	{
+		SQL & ::Update(DATES)(DT, month(DT)).Where(ID == month(ID));
+	}
+	catch(SqlExc &e)
+	{
+		month.CancelUpdate();
+		Exclamation("[* " + DeQtfLf(e) + "]");
+	}
+}
+
+void HomeBudget::RemoveDate()
+{
+	try
+	{
+		SQL.Begin();
+		SQL & ::Delete(MONEY).Where(DT_ID == month(ID));
+		SQL & ::Delete(DATES).Where(ID == month(ID));
+		SQL.Commit();
+		bool en = month.GetCount() <= 1 ? false : true;
+		EnableMoney(en);
+		if(!en)
+			money.Clear();
+	}
+	catch(SqlExc &e)
+	{
+		month.CancelRemove();
+		Exclamation("[* " + DeQtfLf(e) + "]");
+	}
+
+}
+
+void HomeBudget::ChangeDate()
+{
+	dtid = month(ID);
+	LoadMoney(dtid);
+	UpdateSummary();
+	GenMonthList(((Date) month(DT)).year);
+}
+
+void HomeBudget::NewDate()
+{
+	money.Clear();
+	UpdateSummary();
+}
+
+void HomeBudget::AcceptDate()
+{
+	if(!month.IsNewRow())
+		return;
+
+	dosummary = false;
+	SQL.Begin();
+	SQL * Select(ID, DEFVALUE, PM).From(CATEGORIES).Where(INNEWMONTH == 1);
+	while(SQL.Fetch())
+	{
+		money.Add();
+		money(CAT_ID) = SQL[ID];
+		money(VALUE) = SQL[DEFVALUE];
+		money(PM) = SQL[PM];
+		InsertMoney();
+		money.RefreshNewRow();
+	}
+	SQL.Commit();
+	dosummary = true;
+	UpdateSummary();
+}
+
+void HomeBudget::UpdateSummary()
+{
+	if(!month.IsCursor())
+		return;
+
+	float p = 0, tp = 0;
+	float m = 0, tm = 0;
+	float r = 0, tr = 0;
+
+	mostcat.Clear();
+	mostpr.Clear();
+
+	try
+	{
+		SQL & ::Select(PM, SqlSum(VALUE))
+			.From(MONEY, DATES)
+			.Where(DT.Of(DATES) < month(DT) && DT_ID == ID.Of(DATES) && NotNull(VALUE))
+			.GroupBy(PM);
+
+		while(SQL.Fetch())
+		{
+			int pm = SQL[PM];
+			float v = (float) int(SQL[1]);
+			if(pm < 0)
+				tm = v;
+			else
+				tp = v;
+		}
+
+		tr = tp - tm;
+
+		SQL & ::Select(PM, SqlSum(VALUE))
+			.From(MONEY)
+			.Where(DT_ID == dtid && NotNull(VALUE))
+			.GroupBy(PM);
+
+		while(SQL.Fetch())
+		{
+			int pm = SQL[PM];
+			float v = (float) int(SQL[1]);
+			if(pm < 0)
+				m = v;
+			else
+				p = v;
+		}
+
+		SQL & ::Select(NAME, SqlId("sum(value) as val"))
+			.From(MONEY, CATEGORIES)
+			.Where(DT_ID == dtid && CAT_ID == ID.Of(CATEGORIES) && PM.Of(MONEY) < 0)
+			.GroupBy(CAT_ID)
+			.OrderBy(Descending(SqlId("val")));
+
+		while(SQL.Fetch())
+			mostpr.Add(SQL);
+
+		SQL & ::Select(NAME.Of(GROUPS), SqlId("sum(value) as val"))
+			.From(MONEY, GROUPS, CATEGORIES)
+			.Where(DT_ID == dtid && PM.Of(MONEY) < 0 && CAT_ID == ID.Of(CATEGORIES) && GR_ID == ID.Of(GROUPS))
+			.GroupBy(GR_ID)
+			.OrderBy(Descending(SqlId("val")));
+
+		while(SQL.Fetch())
+			mostcat.Add(SQL);
+	}
+	catch(SqlExc &e)
+	{
+		Exclamation("[* " + DeQtfLf(e) + "]");
+	}
+
+	r = p - m;
+	plus.SetText(Format("%.2f", p));
+	minus.SetText(Format("%.2f", m));
+	SetRest(rest, r);
+	SetRest(prev_month, tr);
+	SetRest(real_rest, r + tr);
+}
+
+void HomeBudget::ClearSummary()
+{
+	plus.SetText("");
+	minus.SetText("");
+	rest.SetText("");
+	prev_month.SetText("");
+	real_rest.SetText("");
+	mostpr.Clear();
+	mostcat.Clear();
+}
+
+void HomeBudget::SetRest(StaticText &rest, float r)
+{
+	if(r == 0)
+	{
+		rest.SetText("0.00");
+		rest.SetInk(Black);
+	}
+	else if(r > 0)
+	{
+		rest.SetText(Format("+%.2f", r));
+		rest.SetInk(Green);
+	}
+	else
+	{
+		rest.SetText(Format("%.2f", r));
+		rest.SetInk(LtRed);
+	}
+}
+
+void HomeBudget::UpdateValue()
+{
+	try
+	{
+		SQL & Select(DEFVALUE).From(CATEGORIES).Where(ID == money.Get(CAT_ID));
+		Value v = SQL.Fetch() ? SQL[0] : Value(0);
+		money.Set(VALUE, v);
+		money.Set(PM, GetCategorySign());
+	}
+	catch(SqlExc &e)
+	{
+		Exclamation("[* " + DeQtfLf(e) + "]");
+	}
+}
+
+void HomeBudget::Options()
+{
+	WithOptionsLayout<TopWindow> dlg;
+	CtrlLayoutOK(dlg, t_("Options"));
+	dlg.lang.Add(0, "English").Add(1, "Polski").SetIndex(lang);
+	dlg.clear <<= THISBACK(ClearAll);
+	if(dlg.Execute() != IDOK)
+		return;
+	lang = ~dlg.lang;
+}
+
+void HomeBudget::ClearAll()
+{
+	try
+	{
+		SQL & ::Delete(CATEGORIES);
+		SQL & ::Delete(GROUPS);
+		SQL & ::Delete(MONEY);
+		SQL & ::Delete(DATES);
+		//SQL.ExecuteX("VACUUM");
+
+		LoadDates();
+		LoadGroups();
+		UpdateCategories();
+		money.Clear();
+		categories.Clear();
+		EnableMoney();
+
+		PromptOK(t_("Database was cleared"));
+	}
+	catch(SqlExc &e)
+	{
+		Exclamation("[* " + DeQtfLf(e) + "]");
+	}
+}
+
+void HomeBudget::About()
+{
+	WithAboutLayout<TopWindow> dlg;
+	CtrlLayoutCancel(dlg, t_("O programie"));
+	dlg.info.NoSb();
+	Size sz = dlg.info.GetSize();
+	dlg.info.SetQTF(GetTopic(String("HomeBudget/src/About$") + (lang == 0 ? "en-us" : "pl-pl")), Zoom(150, 1400));
+	dlg.info.SetZoom(Zoom(1, 1));
+	dlg.Execute();
+}
+
+void HomeBudget::Help()
+{
+	PromptOK(t_("No help available yet"));
+/*	HomeBudgetHelp dlg;
+	dlg.AddTree(0, Images::Plus(), "HomeBudget/help/Introduction$pl-pl", "Wprowadzenie");
+	dlg.AddTree(0, Images::Plus(), "HomeBudget/help/T0$pl-pl", "Instrukcja");
+	dlg.AddTree(0, Images::Plus(), "HomeBudget/src/About$pl-pl", "ala");
+	dlg.Execute();
+*/
+}
+
+HomeBudgetHelp::HomeBudgetHelp()
+{
+}
+
+Topic HomeBudgetHelp::AcquireTopic(const String& topic)
+{
+	Topic t;
+	t = GetTopic(topic);
+	t.text = (const char *) GetTopic(topic);
+	//String path = topic;
+	//if(FileExists(path))
+	//	t.text = ReadTopic(LoadFile(path)) .text;
+	return t;
+}
+
+GUI_APP_MAIN
+{
+	bool nodb = false;
+	Sqlite3Session db;
+	db.LogErrors(true);
+
+	#ifdef flagDEBUG
+	db.SetTrace();
+	nodb = true;
+	#endif
+
+	FileIn fi("HomeBudget.db3");
+	if(fi.IsError() || fi.GetSize() <= 0)
+		nodb = true;
+	fi.Close();
+
+	if(!db.Open(ConfigFile("HomeBudget.db3")))
+	{
+		Exclamation(t_("Can't create or open database file"));
+		return;
+	}
+
+	SQL = db;
+
+	if(nodb)
+	{
+		SqlSchema sch(SQLITE3);
+		StdStatementExecutor se(db);
+		All_Tables(sch);
+		if(sch.ScriptChanged(SqlSchema::UPGRADE))
+			Sqlite3PerformScript(sch.Upgrade(), se);
+		if(sch.ScriptChanged(SqlSchema::ATTRIBUTES))
+		{
+			Sqlite3PerformScript(sch.Attributes(), se);
+		}
+		if(sch.ScriptChanged(SqlSchema::CONFIG))
+		{
+			Sqlite3PerformScript(sch.ConfigDrop(), se);
+			Sqlite3PerformScript(sch.Config(), se);
+		}
+		sch.SaveNormal();
+	}
+
+	HomeBudget hb;
+
+	LoadFromFile(hb);
+
+	if(hb.lang == 0)
+		SetLanguage(LNGC_('E','N','U','S', CHARSET_UNICODE));
+	else
+		SetLanguage(LNGC_('P','L','P','L', CHARSET_UNICODE));
+	hb.Setup();
+	hb.Run();
+	StoreToFile(hb);
+}
diff --git a/examples/HomeBudget/HomeBudget.h b/examples/HomeBudget/HomeBudget.h
new file mode 100644
index 000000000..6130885cb
--- /dev/null
+++ b/examples/HomeBudget/HomeBudget.h
@@ -0,0 +1,85 @@
+#ifndef _HomeBudget_HomeBudget_h
+#define _HomeBudget_HomeBudget_h
+
+class HomeBudgetHelp : public HelpWindow
+{
+	public:
+		HomeBudgetHelp();
+		virtual Topic AcquireTopic(const String& topic);
+};
+
+class HomeBudget : public WithHomeBudgetLayout<TopWindow>
+{
+	public:
+		typedef HomeBudget CLASSNAME;
+
+		GridCtrl groups;
+		GridCtrl categories;
+		GridCtrl money;
+		GridCtrl mostpr;
+		GridCtrl mostcat;
+		Splitter spl;
+		DropDate dt;
+		DropGrid dlpm, category, months, yesno, plusminus;
+		EditDouble defval, val;
+		EditStringNotNull eg, ec;
+		EditString es;
+		//FrameRight<Button> newcat;
+
+		int dtid;
+		bool dosummary;
+		int lang;
+
+		HomeBudget();
+
+		void NewGroup();
+		void NewCategory();
+
+		void InsertGroup();
+		void UpdateGroup();
+		void RemoveGroup();
+		void ChangeGroup();
+
+		void InsertCategory();
+		void UpdateCategory();
+		void RemoveCategory();
+		void LoadCategories(int group_id);
+		void UpdateCategories();
+
+		void InsertMoney();
+		void UpdateMoney();
+		void RemoveMoney();
+
+		void InsertDate();
+		void UpdateDate();
+		void RemoveDate();
+		void ChangeDate();
+		void NewDate();
+		void AcceptDate();
+
+		void LoadDates();
+		void LoadGroups();
+
+		void UpdateSummary();
+		void ClearSummary();
+		void UpdateValue();
+		void GenMonthList(int year);
+		void Serialize(Stream &s);
+		void Options();
+		void About();
+		void Setup();
+
+		void Help();
+
+		void SetRest(StaticText &rest, float r);
+		int GetCategorySign();
+
+		void ClearAll();
+
+
+		void LoadMoney(int did);
+		void EnableMoney(int cnt = -1);
+
+};
+
+#endif
diff --git a/examples/HomeBudget/HomeBudget.ico b/examples/HomeBudget/HomeBudget.ico
new file mode 100644
index 000000000..0a539470b
Binary files /dev/null and b/examples/HomeBudget/HomeBudget.ico differ
diff --git a/examples/HomeBudget/HomeBudget.iml b/examples/HomeBudget/HomeBudget.iml
new file mode 100644
index 000000000..1e9dd2994
--- /dev/null
+++ b/examples/HomeBudget/HomeBudget.iml
@@ -0,0 +1,106 @@
+IMAGE_BEGIN(SmallIcon)
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�\0\0\0")
+	IMAGE_SCAN("\1\0\0\0����\2����������\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0����\6���#^�\34]�!`�7f��������\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0����\6���\15H�\24P�&V�\31L��������\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0����\6e��\21S�\30Z�.b����������\2������\1\0\0\0")
+	IMAGE_SCAN("\17\0\0\0������������W��\27g�\33W�@m�������ٷ��۩����\1\0\0\0")
+	IMAGE_SCAN("\17\0\0\0���O��\'��*��-��(��\27X�%Y�a�����⺬�ڪ����\1\0\0\0")
+	IMAGE_SCAN("\17\0\0\0���W��\33n�\'��=��+��\34`�5f�q�����߾��Ų߷����\1\0\0\0")
+	IMAGE_SCAN("\17\0\0\0���N��\34o�$z�<��*y�\31Y�Cp�}�����ʗ��{ඦ���\1\0\0\0")
+	IMAGE_SCAN("\17\0\0\0������\32d�#v�7��,��S��o��w�����ᰟ鲝������\1\0\0\0")
+	IMAGE_SCAN("\17\0\0\0������\35v�&��8��2}�������w�����ⷦ祋������\1\0\0\0")
+	IMAGE_SCAN("\7\0\0\0��������͊�����������\4�����������ނ���\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0����\1\0\0\0")
+	IMAGE_SCAN("�\0\0\0")
+	IMAGE_SCAN("�")
+IMAGE_PACKED(SmallIcon, "\2\20\0\0\0\20\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(LargeIcon)
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�\0\0\0")
+	IMAGE_SCAN("\1\0\0\0����\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0����\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0����\5�������������������\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0����\13���n��3r�\36b�\25\\�\25\\�\25\\�\32`�.o�b���������\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0����\13���\33;|\13B�\20K�\24R�\35\\�!]�\33U�\27J{\27:V�������\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0����\13���a��\17M�\22Q�\24T�\31X�&]�#[�\30U�\26N���݊���\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0����\13���\\}�\12:�\14D�\20H�\26M�!R�,Q|\26Do\36Dd������\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0����\22���/V�\20S�\23Z�\25\\�\34a� a�%]�j�¤������������������������������\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0����\13~��\23X�\16L�\17I�\21J�\22K�+U�Or�������������\4�����������؃���\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0����\22���\21>�\16K�\23S�\32[�&^�,W�1]�?`��������������������˻鱟Njw����\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0����\27������������}��{��@��\33w�\25`�\26Y�\"c�)f�y�̴�А����������|֒{�力⧑ٿ�����\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0����\2���J���\'��\24\'��(��)��(��)��(��\27Y�\23I�\'P\177,Y�V\177��������������������Ŵݛ�ػ�����\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0����\5���\\��&��\'��\'���(��\22)��*��*��)��\26[�\30a� f�*d�Y��{�������\177��z�{�飊ܤ�ؿ�����\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0����\32���s��\26`�\36~�!��(��2��=��=��+x�\"i|!w�\31V�\36U�&R�Lz�[��������ؾ��²���留ׇk�ƽ�������\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0����\32������\26^�\33k�\34j�\36l�&u�7��>��.��*��\34Wu\24K�\"Q�Sx�d��������Ǻ�ѳ�蹧�ɶ������غ��������\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0����\31���m��\24X�\25W�\33o�\37��)��9��F��3u�$es\25N�\33X�&W�Cm�{��Lw�z������¿����ʸ��|ϗ�����\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0����\31���k��#��$��\"��%��.��6��;��.��\"gy v�\34_�$b����Lx���Ė��������ї��\177�u�{^������\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0����\27���\24N�\25Q�\27]�\34g�%n�8u�=��-��,��\36g�\34[�\37[�G{���誹Ɲ���������|兀櫖ң�����\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0����\27���1`�\35r� ��&��0��:��C��0}�$t�)��/Y�@b�Hl�Cq�����������������¬ߒw˜�����\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0����\27���i��\27U�\34e�\36j�%r�2��=��3��+��W�����������M{�x��������ԡ�ꭖꯙ箙Ε�����\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0����\13���T��\34n�\24R�\32e� s�)y�6v�7{�)|��������\12���|�Ə��������Ǐ\177�y�}ߤ�ի�����\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0����\12���\32o�%��&��,��5��B��5��N~�������\12������i������¿�÷�Ƴ�ێt��Ȅ���\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0����\11������[\177�;l�7n}N��{������������\7������ɷ�ձ�溩���������\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0����\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0����\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0����\1\0\0\0")
+	IMAGE_SCAN("�\0\0\0")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�")
+IMAGE_PACKED(LargeIcon, "\2 \0\0\0 \0\0\0\0\0\0\0\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(Plus)
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("ǂ\0�\0�")
+	IMAGE_SCAN("ǂ\0�\0�")
+	IMAGE_SCAN("ǂ\0�\0�")
+	IMAGE_SCAN("ǂ\0�\0�")
+	IMAGE_SCAN("Ê\0�\0�")
+	IMAGE_SCAN("Ê\0�\0�")
+	IMAGE_SCAN("ǂ\0�\0�")
+	IMAGE_SCAN("ǂ\0�\0�")
+	IMAGE_SCAN("ǂ\0�\0�")
+	IMAGE_SCAN("ǂ\0�\0�")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�")
+IMAGE_PACKED(Plus, "\2\20\0\0\0\20\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(SmallPlus)
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("ǂ\0\0\0�")
+	IMAGE_SCAN("ǂ\0\0\0�")
+	IMAGE_SCAN("ǂ\0\0\0�")
+	IMAGE_SCAN("Ĉ\0\0\0�")
+	IMAGE_SCAN("Ĉ\0\0\0�")
+	IMAGE_SCAN("ǂ\0\0\0�")
+	IMAGE_SCAN("ǂ\0\0\0�")
+	IMAGE_SCAN("ǂ\0\0\0�")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�")
+IMAGE_PACKED(SmallPlus, "\2\20\0\0\0\20\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(Minus)
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("Ê\0\0\377�")
+	IMAGE_SCAN("Ê\0\0\377�")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�")
+IMAGE_PACKED(Minus, "\2\20\0\0\0\20\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0")
diff --git a/examples/HomeBudget/HomeBudget.lay b/examples/HomeBudget/HomeBudget.lay
new file mode 100644
index 000000000..6fefca67a
--- /dev/null
+++ b/examples/HomeBudget/HomeBudget.lay
@@ -0,0 +1,51 @@
+LAYOUT(HomeBudgetLayout, 748, 530)
+	ITEM(GridCtrl, month, LeftPosZ(4, 124).VSizePosZ(4, 34))
+	ITEM(TabCtrl, tab, HSizePosZ(132, 2).VSizePosZ(4, 186))
+	ITEM(Button, about, SetLabel(t_("About")).LeftPosZ(4, 76).BottomPosZ(4, 26))
+	ITEM(Button, help, SetLabel(t_("Help")).LeftPosZ(84, 76).BottomPosZ(4, 26))
+	ITEM(Button, options, SetLabel(t_("Options")).LeftPosZ(164, 76).BottomPosZ(4, 26))
+	ITEM(Button, exit, SetLabel(t_("Exit")).RightPosZ(6, 76).BottomPosZ(4, 26))
+	ITEM(LabelBox, dv___6, SetLabel(t_("Summary")).HSizePosZ(132, 224).BottomPosZ(34, 148))
+	ITEM(StaticText, dv___7, SetText(t_("Income:")).SetFont(StdFont(18).Bold()).LeftPosZ(140, 88).BottomPosZ(144, 22))
+	ITEM(StaticText, plus, SetFont(StdFont(18).Bold()).HSizePosZ(232, 376).BottomPosZ(144, 22))
+	ITEM(StaticText, dv___9, SetText(t_("Spent:")).SetFont(StdFont(18).Bold()).LeftPosZ(140, 88).BottomPosZ(118, 24))
+	ITEM(StaticText, minus, SetFont(StdFont(18).Bold()).HSizePosZ(232, 376).BottomPosZ(120, 22))
+	ITEM(StaticText, rest_label, SetText(t_("Rest:")).SetFont(StdFont(18).Bold()).LeftPosZ(140, 88).BottomPosZ(96, 22))
+	ITEM(StaticText, rest, SetFont(StdFont(18).Bold()).HSizePosZ(232, 376).BottomPosZ(96, 22))
+	ITEM(StaticText, dv___13, SetText(t_("Amount from prev. month:")).SetFont(StdFont(18).Bold()).LeftPosZ(140, 246).BottomPosZ(72, 22))
+	ITEM(StaticText, prev_month, SetFont(StdFont(18).Bold()).HSizePosZ(388, 232).BottomPosZ(72, 22))
+	ITEM(StaticText, dv___15, SetText(t_("Final rest:")).SetFont(StdFont(18).Bold()).LeftPosZ(140, 246).BottomPosZ(48, 22))
+	ITEM(StaticText, real_rest, SetFont(StdFont(18).Bold()).HSizePosZ(388, 232).BottomPosZ(48, 22))
+	ITEM(LabelBox, dv___17, SetLabel(t_("Most expensive")).RightPosZ(4, 216).BottomPosZ(34, 148))
+	ITEM(TabCtrl, tabmost, RightPosZ(12, 200).BottomPosZ(42, 124))
+END_LAYOUT
+
+LAYOUT(OptionsLayout, 216, 86)
+	ITEM(StaticText, dv___0, SetText(t_("Language")).LeftPosZ(4, 60).TopPosZ(4, 18))
+	ITEM(DropList, lang, LeftPosZ(68, 144).TopPosZ(4, 19))
+	ITEM(Button, ok, SetLabel(t_("OK")).RightPosZ(4, 74).BottomPosZ(4, 24))
+	ITEM(Button, clear, SetLabel(t_("Clear all data from database")).RightPosZ(4, 208).BottomPosZ(34, 24))
+END_LAYOUT
+
+LAYOUT(AboutLayout, 456, 288)
+	ITEM(RichTextView, info, SetFrame(BlackFrame()).HSizePosZ(4, 4).TopPosZ(4, 252))
+	ITEM(Button, cancel, SetLabel(t_("OK")).HCenterPosZ(72, 0).TopPosZ(260, 24))
+END_LAYOUT
+
+LAYOUT(NewCategoryLayout, 244, 108)
+	ITEM(StaticText, dv___0, SetText(t_("Category")).LeftPosZ(4, 60).TopPosZ(4, 19))
+	ITEM(DropList, groups, LeftPosZ(68, 146).TopPosZ(4, 20))
+	ITEM(Button, addgroup, LeftPosZ(218, 20).TopPosZ(4, 20))
+	ITEM(StaticText, dv___3, SetText(t_("Name")).LeftPosZ(4, 60).TopPosZ(26, 19))
+	ITEM(EditString, name, LeftPosZ(68, 172).TopPosZ(26, 19))
+	ITEM(Switch, pm, SetLabel(t_("Plus\nMinus")).LeftPosZ(68, 100).TopPosZ(50, 15))
+	ITEM(Button, ok, SetLabel(t_("OK")).LeftPosZ(88, 74).TopPosZ(80, 24))
+	ITEM(Button, cancel, SetLabel(t_("Cancel")).LeftPosZ(166, 74).TopPosZ(80, 24))
+END_LAYOUT
+
+LAYOUT(NewGroupLayout, 204, 56)
+	ITEM(StaticText, dv___0, SetText(t_("Name")).LeftPosZ(4, 60).TopPosZ(4, 19))
+	ITEM(EditString, name, LeftPosZ(68, 130).TopPosZ(4, 19))
+	ITEM(Button, ok, SetLabel(t_("OK")).LeftPosZ(48, 74).TopPosZ(28, 24))
+	ITEM(Button, cancel, SetLabel(t_("Cancel")).LeftPosZ(126, 74).TopPosZ(28, 24))
+END_LAYOUT
diff --git a/examples/HomeBudget/HomeBudget.rc b/examples/HomeBudget/HomeBudget.rc
new file mode 100644
index 000000000..82f7731f6
--- /dev/null
+++ b/examples/HomeBudget/HomeBudget.rc
@@ -0,0 +1 @@
+5555 ICON DISCARDABLE "HomeBudget.ico"
\ No newline at end of file
diff --git a/examples/HomeBudget/HomeBudget.sch b/examples/HomeBudget/HomeBudget.sch
new file mode 100644
index 000000000..0e8db20c9
--- /dev/null
+++ b/examples/HomeBudget/HomeBudget.sch
@@ -0,0 +1,28 @@
+TABLE_(DATES)
+	INT_   (ID) PRIMARY_KEY
+	DATE_  (DT)
+END_TABLE
+
+TABLE_(GROUPS)
+	INT     (ID) PRIMARY_KEY
+	STRING_ (NAME, 500)
+END_TABLE
+
+TABLE_(CATEGORIES)
+	INT 	(ID) PRIMARY_KEY
+	INT_    (GR_ID)
+	STRING  (NAME, 500)
+	DOUBLE_ (DEFVALUE)
+	INT_    (PM)
+	INT_    (INNEWMONTH)
+END_TABLE
+
+TABLE_(MONEY)
+	INT  (ID) PRIMARY_KEY
+	INT_ (DT_ID)
+	INT_ (CAT_ID)
+	INT  (PM)
+	DOUBLE_ (VALUE)
+	DATE (DT)
+	STRING_ (DESC, 1024)
+END_TABLE
diff --git a/examples/HomeBudget/HomeBudget.t b/examples/HomeBudget/HomeBudget.t
new file mode 100644
index 000000000..55e1d96af
--- /dev/null
+++ b/examples/HomeBudget/HomeBudget.t
@@ -0,0 +1,92 @@
+T_("Exit")
+plPL("Zakończ")
+T_("Options")
+plPL("Ustawienia")
+T_("About")
+plPL("O programie")
+
+T_("Home budget")
+plPL("Budżet domowy")
+T_("Expenses")
+plPL("Wydatki")
+T_("Categories")
+plPL("Kategorie")
+T_("Summary")
+plPL("Podsumowanie")
+T_("Category")
+plPL("Kategoria")
+T_("Product")
+plPL("Produkt")
+T_("Value")
+plPL("Ile")
+T_("When")
+plPL("Kiedy")
+T_("Describe")
+plPL("Opis")
+T_("Month")
+plPL("Miesiąc")
+T_("Default value")
+plPL("Wartość domyślna")
+T_("Plus / Minus")
+plPL("Plus / Minus")
+T_("Default for a new month")
+plPL("Domyślnie w nowym miesiącu")
+T_("Minus")
+plPL("Minus")
+T_("Plus")
+plPL("Plus")
+T_("No")
+plPL("Nie")
+T_("Yes")
+plPL("Tak")
+
+T_("Name")
+plPL("Nazwa")
+
+T_("Language")
+plPL("Język")
+
+T_("Income:")
+plPL("Dochód:")
+T_("Spent:")
+//T_("Laid out:")
+plPL("Wydano:")
+T_("Rest:")
+plPL("Zostało:")
+T_("Amount from prev. month:")
+plPL("Kwota z poprz. miesiąca:")
+T_("Final rest:")
+plPL("Realnie zostało:")
+T_("Most expensive")
+plPL("Najwięcej wydano na")
+T_("Product")
+plPL("Produkt")
+T_("Category")
+plPL("Kategoria")
+T_("Amount")
+plPL("Ile")
+
+T_("New item")
+plPL("Nowa pozycja")
+T_("New category")
+plPL("Nowa kategoria")
+
+T_("No help available yet")
+plPL("Pomoc nie jest obecnie dostępna")
+
+T_("You can't remove this group. It is not empty.")
+plPL("Nie można usunąc tej grupy. Nie jest pusta.")
+
+T_("Item '%s' can't be removed. It is used in calculations.")
+plPL("Nie można usunąć pozycji '%s'. Jest wykorzystywana w rozliczeniach.")
+
+T_("Clear all data from database")
+plPL("Usuń wszystkie dane z bazy danych")
+
+T_("Database was cleared")
+plPL("Baza danych została wyczyszczona")
+
+T_("Can't create or open database file")
+plPL("Nie można utworzyć lub otworzyć bazy danych")
+T_("Database file is corrupted")
+plPL("Plik bazy danych jest uszkodzony")
diff --git a/examples/HomeBudget/HomeBudget.upp b/examples/HomeBudget/HomeBudget.upp
new file mode 100644
index 000000000..e33bf656e
--- /dev/null
+++ b/examples/HomeBudget/HomeBudget.upp
@@ -0,0 +1,20 @@
+description "Demonstrates using of GridCtrl and Sqlite3 database";
+
+charset "UTF-8";
+
+uses
+	CtrlLib,
+	plugin\sqlite3,
+	GridCtrl,
+	DropGrid;
+
+file
+	HomeBudget.t,
+	HomeBudget.sch,
+	HomeBudget.h,
+	HomeBudget.cpp,
+	HomeBudget.iml,
+	HomeBudget.lay;
+
+mainconfig
+	"" = "GUI";
diff --git a/examples/HomeBudget/help.tpp/Introduction$pl-pl.tpp b/examples/HomeBudget/help.tpp/Introduction$pl-pl.tpp
new file mode 100644
index 000000000..f4f088503
--- /dev/null
+++ b/examples/HomeBudget/help.tpp/Introduction$pl-pl.tpp
@@ -0,0 +1,3 @@
+TITLE("Welcome to Home Budget - the world of expenses...")
+COMPRESSED
+120,156,139,86,80,81,49,208,49,80,54,32,0,172,92,82,211,18,75,115,74,98,163,171,227,107,85,3,124,116,3,124,20,162,139,13,172,21,194,83,115,146,243,115,83,21,74,242,21,60,64,180,83,105,74,122,106,137,66,130,174,66,73,70,170,66,121,126,81,78,138,66,126,154,66,106,69,65,106,94,113,106,177,158,158,158,90,44,88,99,44,0,156,96,35,16,
diff --git a/examples/HomeBudget/help.tpp/T0$pl-pl.tpp b/examples/HomeBudget/help.tpp/T0$pl-pl.tpp
new file mode 100644
index 000000000..feb5906bf
--- /dev/null
+++ b/examples/HomeBudget/help.tpp/T0$pl-pl.tpp
@@ -0,0 +1,3 @@
+TITLE("T9!!!!")
+COMPRESSED
+120,156,139,86,80,81,49,208,49,80,54,32,0,172,92,82,211,18,75,115,74,98,163,171,227,107,85,3,124,116,3,124,20,162,139,13,172,21,98,1,212,39,15,225,
diff --git a/examples/HomeBudget/help.tpp/all.i b/examples/HomeBudget/help.tpp/all.i
new file mode 100644
index 000000000..278f048fa
--- /dev/null
+++ b/examples/HomeBudget/help.tpp/all.i
@@ -0,0 +1,7 @@
+TOPIC("Introduction$pl-pl")
+#include "Introduction$pl-pl.tpp"
+END_TOPIC
+
+TOPIC("T0$pl-pl")
+#include "T0$pl-pl.tpp"
+END_TOPIC
diff --git a/examples/HomeBudget/init b/examples/HomeBudget/init
new file mode 100644
index 000000000..d1e2a7170
--- /dev/null
+++ b/examples/HomeBudget/init
@@ -0,0 +1,7 @@
+#ifndef _HomeBudget_icpp_init_stub
+#define _HomeBudget_icpp_init_stub
+#include "CtrlLib/init"
+#include "plugin\sqlite3/init"
+#include "GridCtrl/init"
+#include "DropGrid/init"
+#endif
diff --git a/examples/HomeBudget/src.tpp/About$en-us.tpp b/examples/HomeBudget/src.tpp/About$en-us.tpp
new file mode 100644
index 000000000..c63a24186
--- /dev/null
+++ b/examples/HomeBudget/src.tpp/About$en-us.tpp
@@ -0,0 +1,105 @@
+TITLE("")
+COMPRESSED
+120,156,148,187,247,143,68,75,118,30,246,175,60,64,150,96,89,18,249,222,211,219,192,93,8,160,108,209,178,96,217,2,40,10,254,97,65,153,180,189,34,23,94,145,4,119,101,24,16,44,116,156,206,57,77,231,52,157,115,206,57,231,52,211,57,231,156,123,58,119,123,104,1,134,13,24,54,124,112,235,214,189,168,58,161,46,78,157,250,190,31,238,47,190,249,79,254,147,111,255,254,183,127,235,219,255,15,249,217,63,249,229,191,249,211,127,247,235,223,254,241,47,126,251,253,239,253,232,231,127,248,251,255,233,247,63,253,157,239,190,255,201,239,124,255,163,31,253,221,159,126,25,249,238,239,127,247,183,190,255,246,187,239,126,239,219,127,248,211,31,126,239,187,31,127,251,195,15,223,253,228,135,239,127,252,211,239,191,186,111,127,248,209,63,252,238,39,223,253,236,143,126,245,219,95,255,242,143,127,241,127,83,254,210,253,254,239,127,255,183,126,244,211,239,126,244,221,79,191,255,241,15,63,252,232,167,63,249,233,15,223,126,255,123,63,252,248,247,190,92,125,255,237,79,190,251,
+238,251,31,253,240,179,127,254,171,191,248,159,255,248,23,255,254,191,255,223,254,246,31,252,183,255,224,95,253,203,111,126,241,205,191,255,247,223,253,77,104,255,230,219,159,255,249,119,63,255,245,239,126,255,227,191,254,106,191,253,221,239,126,248,31,190,218,151,143,31,126,250,119,255,240,251,111,126,241,155,239,126,254,143,254,222,151,251,111,254,171,127,241,223,252,193,55,255,249,191,250,39,255,244,15,254,232,155,255,229,119,190,251,157,111,255,206,31,255,226,55,223,254,252,31,253,225,223,251,238,107,244,191,248,203,127,251,87,255,238,183,191,252,235,111,254,250,151,127,246,171,223,124,61,252,234,47,254,236,155,191,252,55,223,252,249,95,254,219,95,126,243,203,255,245,175,126,249,23,191,249,229,111,254,248,103,63,251,253,239,255,240,219,111,254,70,239,215,223,255,232,199,63,255,15,255,225,63,124,247,221,143,190,255,249,15,223,124,25,251,138,232,39,95,33,255,236,251,159,124,251,163,175,168,254,236,219,159,255,63,77,252,199,255,238,183,127,254,151,127,253,179,111,254,255,202,
+127,140,246,215,63,252,244,219,159,255,234,187,31,125,251,243,127,241,237,255,197,232,63,249,211,191,248,213,47,127,253,205,127,253,151,191,249,127,153,246,159,253,235,63,255,237,111,255,234,79,126,246,39,191,251,39,191,251,63,253,217,111,254,228,119,254,234,79,255,199,175,219,175,255,245,151,254,63,251,167,255,236,143,254,241,63,255,230,95,254,139,255,242,143,254,187,127,252,135,127,240,31,173,252,240,205,215,130,255,143,53,124,243,139,191,253,237,183,255,224,219,111,191,249,253,223,255,213,191,253,211,63,251,229,207,126,242,195,63,252,59,63,254,209,143,1,224,35,96,2,248,63,229,4,99,205,217,208,247,250,100,101,87,151,236,6,54,246,173,59,176,190,89,131,141,248,186,4,39,66,142,146,16,79,106,68,74,165,113,239,26,135,87,150,225,75,33,30,242,134,143,194,241,89,81,220,207,162,233,227,48,168,219,17,205,28,47,153,116,221,145,174,30,135,155,189,125,183,60,212,158,131,234,181,132,77,113,46,207,233,181,181,162,53,64,77,19,176,253,156,61,95,37,39,207,26,
+136,128,222,2,29,70,86,74,134,3,46,207,39,174,251,92,12,45,171,75,225,185,123,22,11,221,205,147,128,16,246,41,235,71,7,94,58,205,166,179,155,169,227,193,143,31,164,115,231,150,121,152,100,207,90,204,250,2,151,124,226,183,16,16,22,159,169,82,215,54,0,4,164,62,143,223,223,154,12,252,177,132,194,95,21,101,238,97,57,122,14,159,247,96,175,163,145,128,221,87,76,134,7,122,35,107,129,42,68,184,2,112,115,193,68,56,48,136,135,151,65,192,72,156,215,71,150,68,229,107,128,203,209,157,252,28,60,8,6,128,67,137,50,188,130,235,108,1,246,113,18,243,230,167,62,252,117,146,36,11,97,13,176,103,195,165,247,73,57,239,132,103,163,197,226,113,205,174,235,163,102,114,31,223,251,169,140,188,84,138,183,176,228,154,107,172,160,143,53,236,205,88,113,62,28,186,76,234,108,64,178,200,221,232,123,233,97,45,93,6,149,150,9,26,203,81,52,56,80,113,212,218,142,13,126,169,250,144,242,226,213,64,121,236,69,113,131,70,205,205,155,26,126,123,226,79,
+41,111,139,154,160,110,79,100,255,11,215,149,105,156,211,166,157,224,184,120,230,104,133,184,53,39,136,72,72,113,59,240,97,228,175,151,37,97,6,171,224,108,173,170,165,62,165,206,151,66,233,0,179,209,78,1,206,0,112,105,66,245,76,18,37,148,218,27,42,27,196,10,99,140,114,9,53,106,234,102,74,151,139,8,77,31,25,135,226,230,245,94,5,131,44,118,100,8,151,130,178,218,71,162,21,22,156,147,116,206,136,160,248,232,3,43,47,81,143,128,235,222,102,36,27,13,161,217,138,14,54,244,249,208,178,157,241,21,247,211,206,150,114,79,85,106,189,170,171,206,22,75,107,20,211,252,110,81,4,53,168,254,130,166,176,54,40,197,37,85,93,27,32,39,91,96,243,104,7,216,27,60,239,50,148,243,93,40,109,227,118,116,71,174,171,139,203,226,78,126,239,9,42,189,176,32,55,66,50,214,96,205,158,67,155,239,160,123,145,221,91,171,15,24,117,220,91,45,19,107,110,74,150,5,58,127,125,39,135,169,173,179,151,182,13,86,159,189,93,241,244,164,178,238,192,126,
+124,128,135,237,20,32,135,147,124,169,183,95,26,75,109,154,32,24,47,184,40,227,138,245,22,25,66,171,51,36,244,180,159,130,149,117,31,120,201,235,187,45,177,199,81,182,202,47,60,176,177,23,108,53,11,14,247,87,235,169,17,185,47,121,156,99,148,22,102,26,75,24,16,222,125,24,98,39,71,240,222,177,14,92,26,222,187,186,29,116,151,100,28,220,154,59,115,188,127,208,22,139,101,39,158,26,211,212,204,120,159,6,168,76,216,250,53,52,51,218,102,104,163,148,69,123,91,124,188,136,230,184,85,44,85,106,120,45,171,186,47,176,36,130,57,120,162,139,211,109,184,137,132,6,0,131,155,60,112,187,50,0,70,230,189,143,188,216,44,20,140,6,190,121,90,31,199,251,9,166,16,131,57,2,230,5,232,113,141,161,139,3,96,127,86,248,47,0,39,167,221,164,102,214,0,9,128,177,95,124,128,243,11,73,109,249,162,104,77,177,10,23,134,141,212,82,239,183,71,23,148,138,82,15,72,193,211,177,29,25,206,18,148,132,223,127,220,236,100,99,65,133,94,175,37,200,
+157,106,157,146,136,174,44,158,197,80,31,68,92,131,213,249,152,192,157,99,173,3,140,132,61,249,86,215,24,14,119,141,161,47,254,200,141,193,155,129,112,23,127,216,120,227,7,220,237,154,151,230,80,215,30,94,217,56,86,166,221,18,145,105,148,88,154,126,2,198,159,188,198,254,147,183,95,120,233,198,142,215,183,181,128,200,11,245,75,244,120,74,20,11,108,24,197,238,213,22,179,188,39,24,81,112,117,83,199,176,102,115,78,118,222,47,175,207,154,24,213,116,51,86,53,148,195,61,237,49,133,166,103,188,126,15,23,194,124,76,232,194,92,203,83,230,134,174,90,62,221,167,59,92,160,232,14,239,186,165,250,219,202,198,7,47,175,129,136,139,175,5,124,122,113,224,62,119,3,147,187,34,82,55,146,157,187,49,121,59,245,68,117,132,205,129,199,50,24,163,209,93,195,61,83,4,214,142,131,125,91,48,112,169,191,3,183,108,183,222,166,114,235,49,203,188,201,52,234,136,210,218,186,1,175,15,58,94,171,113,251,160,74,238,30,235,221,100,23,24,235,49,186,199,165,30,
+189,133,214,31,26,17,183,207,205,244,185,184,10,59,218,58,237,253,129,154,82,95,31,140,94,49,41,61,194,238,17,173,30,9,75,115,131,193,20,107,151,37,91,84,77,71,139,181,244,66,165,175,230,59,166,154,201,95,20,196,211,74,238,144,220,23,145,136,7,234,232,109,202,246,30,176,180,118,120,167,87,53,227,167,59,191,26,216,192,94,32,58,137,90,194,154,32,96,57,213,58,171,182,73,166,133,62,58,241,9,16,15,29,113,60,107,160,147,152,68,186,79,45,217,180,175,41,161,115,178,108,142,119,3,163,87,8,185,231,155,198,20,46,158,112,218,189,145,50,97,136,192,189,218,180,168,250,44,54,71,243,121,46,220,15,236,71,211,76,86,153,161,178,251,174,116,75,115,11,199,85,52,80,106,213,23,162,71,110,232,87,102,251,51,115,135,106,38,242,173,49,72,16,105,164,240,232,177,97,57,26,29,84,128,187,57,47,88,49,227,149,204,177,157,108,178,6,168,140,37,76,155,246,64,5,108,80,23,180,240,78,62,245,101,71,126,162,100,43,43,47,72,141,254,37,88,
+243,10,84,1,145,64,9,240,9,208,97,62,255,194,211,220,181,139,66,14,191,0,226,249,22,53,100,195,161,87,86,190,213,217,105,46,1,200,111,118,65,242,105,198,63,13,238,147,87,222,87,135,43,92,23,65,224,36,200,238,118,32,255,94,178,178,47,204,222,254,201,112,174,176,146,185,143,187,142,88,102,29,236,50,204,169,17,165,151,58,90,33,161,79,229,111,64,19,1,66,158,18,149,132,161,156,130,100,229,193,42,168,53,4,130,28,116,160,72,5,208,83,5,251,89,179,28,97,150,67,55,159,85,132,228,208,195,207,63,131,149,184,80,133,111,195,81,210,58,154,193,235,130,16,90,200,245,21,5,200,112,105,214,67,249,30,191,105,200,124,115,25,112,38,177,169,247,28,89,20,243,198,212,228,199,117,237,167,30,44,172,163,38,203,165,94,170,145,213,115,153,0,21,159,254,201,205,192,210,238,122,55,117,10,55,190,215,136,216,101,234,98,215,218,206,235,98,31,35,172,145,112,139,0,87,211,34,190,121,84,49,47,81,25,243,58,43,101,226,219,66,73,25,11,160,230,
+23,40,63,201,219,12,179,181,55,219,158,108,99,249,199,85,246,249,50,126,35,125,234,186,202,92,159,14,126,239,20,107,194,228,192,15,72,181,249,98,173,167,199,124,149,16,246,78,55,252,14,184,13,121,167,10,184,209,205,93,186,20,14,3,93,8,208,78,32,106,100,19,5,35,215,143,106,117,197,77,247,185,106,142,180,12,193,111,161,232,146,234,60,1,143,6,51,165,69,70,121,93,198,108,110,32,231,121,210,200,96,143,248,197,189,55,12,163,226,62,83,200,212,70,204,157,52,20,46,153,198,222,232,81,40,31,35,202,134,243,210,55,82,150,37,123,43,146,199,196,30,18,99,38,97,213,122,210,11,51,17,80,33,251,29,51,3,46,1,215,32,138,6,90,161,202,139,54,86,127,85,152,15,2,24,75,1,189,35,32,64,6,74,160,30,218,81,189,180,43,18,30,173,65,126,97,56,205,199,139,108,15,186,70,135,87,110,71,75,163,217,60,128,150,92,221,91,181,8,250,72,116,212,66,186,223,246,226,49,243,6,116,108,96,110,109,36,247,208,227,110,162,136,179,199,251,
+218,214,246,12,144,198,100,123,49,18,159,73,248,217,70,206,178,50,12,73,26,173,202,91,121,65,44,19,23,212,226,202,70,55,206,26,171,124,90,170,45,88,137,117,149,34,120,221,187,53,147,98,78,211,210,117,189,61,156,184,30,44,196,137,196,235,199,86,211,233,16,14,157,121,215,66,49,55,72,110,18,73,198,15,160,229,15,153,16,218,199,245,110,129,230,76,242,29,48,172,5,26,216,119,175,219,245,76,147,48,180,245,230,169,138,132,108,102,191,186,77,227,29,123,15,178,141,73,93,54,138,151,190,113,115,234,83,35,246,101,187,212,204,175,64,188,190,36,208,111,66,163,198,12,36,238,220,208,238,177,185,230,152,129,93,74,111,176,109,4,182,173,49,137,198,190,232,80,160,233,23,99,140,123,8,182,13,141,138,123,35,114,17,211,46,243,104,225,66,117,36,33,169,85,136,233,70,90,222,239,253,151,219,91,228,110,111,31,65,162,191,41,180,173,35,205,69,226,57,218,172,183,163,48,170,78,188,100,248,49,76,117,91,37,234,99,44,50,15,102,162,231,169,215,221,77,
+253,212,222,201,85,35,241,50,226,252,77,53,119,188,220,228,49,32,77,193,243,190,56,132,59,210,164,253,130,108,220,85,24,49,243,170,18,152,49,246,249,181,43,96,126,38,27,55,40,110,44,242,211,182,246,236,48,149,133,207,245,245,225,194,154,74,58,32,55,114,126,179,220,57,167,150,96,74,211,66,84,185,185,106,1,65,173,146,16,211,85,110,10,35,233,106,173,144,194,253,8,71,91,224,4,230,165,16,107,161,115,86,234,91,45,59,209,180,186,194,90,167,173,174,157,139,246,19,192,8,89,161,124,21,223,38,144,234,44,35,162,185,226,136,96,231,200,220,11,82,23,38,173,207,2,212,51,242,40,208,111,133,80,148,188,5,174,190,32,22,73,158,5,110,166,30,73,109,250,8,150,29,178,85,33,59,76,92,152,75,78,243,197,115,160,221,241,98,210,58,202,190,37,124,221,69,214,39,207,228,156,79,138,178,191,178,201,154,165,233,88,195,220,95,23,117,194,74,104,120,125,187,73,176,151,145,208,72,34,5,51,164,107,44,2,35,56,8,140,27,69,99,139,181,164,78,
+73,99,14,79,28,125,47,3,91,156,148,65,41,111,13,129,105,207,18,33,149,117,200,116,132,222,6,61,226,193,26,208,53,226,153,183,44,202,168,117,116,98,148,3,222,219,189,144,45,172,27,36,15,205,100,162,61,181,238,162,17,35,124,31,150,208,120,30,221,85,92,182,69,38,99,35,194,158,219,216,74,195,158,83,61,135,242,114,169,117,84,242,109,183,44,124,211,239,76,208,54,199,82,156,85,225,31,213,24,181,6,72,52,156,178,220,103,190,166,15,54,245,253,55,107,236,100,180,174,140,210,209,27,217,122,37,27,3,88,113,92,15,197,207,69,27,166,121,59,49,111,95,21,126,105,149,72,28,97,177,40,29,32,196,136,129,211,85,97,212,235,79,121,243,153,141,150,220,104,202,238,51,118,87,28,49,141,247,143,243,242,130,254,240,136,54,95,168,64,222,102,151,253,254,106,89,104,142,207,6,146,242,1,35,85,97,192,175,141,218,250,106,25,134,185,117,252,115,28,232,148,116,24,232,133,137,218,231,45,3,250,50,110,169,80,24,35,189,170,148,20,196,106,117,65,161,
+174,111,116,147,196,62,86,192,0,199,99,212,44,11,106,12,249,137,172,57,52,14,193,27,171,138,47,100,198,70,60,36,199,72,109,129,53,72,223,67,213,104,232,53,22,128,209,227,48,166,239,62,198,240,56,17,81,134,37,7,212,216,47,149,249,203,140,93,150,81,124,240,145,109,67,247,46,206,43,36,150,30,141,43,156,230,133,237,177,40,69,129,69,67,11,239,7,51,11,251,39,151,168,220,149,222,27,30,156,100,213,98,61,218,133,107,152,160,162,71,44,120,54,118,149,204,182,146,122,112,153,184,84,134,181,68,102,132,25,237,166,188,229,175,122,196,160,191,125,160,59,140,41,54,161,135,134,232,76,127,47,233,139,162,116,149,177,226,208,151,5,120,58,53,85,167,54,231,118,216,112,206,236,240,167,114,253,175,4,244,137,179,115,64,0,207,117,151,123,105,72,191,78,80,45,175,117,203,153,139,143,165,62,227,35,195,100,214,163,221,252,207,82,165,196,131,229,35,231,58,237,142,41,45,42,161,214,139,127,121,77,144,27,71,168,145,251,242,145,123,93,42,220,58,221,21,
+22,205,208,35,230,62,171,87,193,159,231,129,33,66,133,129,184,82,16,240,2,59,185,212,180,97,162,215,119,128,189,223,94,123,136,96,80,136,120,43,172,157,125,130,53,12,209,38,241,229,175,140,129,152,138,111,11,82,135,108,49,228,35,84,211,212,169,170,127,106,16,245,164,187,14,135,88,116,100,239,107,34,204,8,216,116,18,10,42,19,55,106,236,137,17,167,24,126,177,150,17,65,18,204,147,49,175,159,147,228,163,37,234,49,162,36,27,146,103,236,130,146,196,108,103,83,238,222,210,209,123,39,214,73,96,44,115,139,123,11,11,62,208,132,59,9,78,191,174,97,238,79,130,173,87,198,48,247,148,233,142,136,152,91,69,205,174,38,231,157,72,114,83,225,195,39,142,59,189,126,103,41,25,87,6,146,232,190,250,229,102,160,4,24,72,9,35,133,232,164,130,121,229,27,90,91,204,203,36,31,121,93,134,205,59,51,7,231,32,157,102,99,203,93,26,237,199,249,51,98,112,228,93,92,218,87,202,207,179,11,64,158,171,217,187,152,85,99,26,59,85,224,14,26,125,37,
+51,216,88,111,110,14,51,209,217,90,231,69,44,51,53,212,149,147,252,85,87,79,71,135,229,177,236,131,182,86,163,172,7,160,194,206,197,71,241,39,120,16,252,230,92,113,225,132,172,22,41,94,156,143,179,238,46,68,162,120,10,51,15,85,207,85,92,162,236,160,46,64,65,150,175,2,254,118,24,29,248,211,125,21,55,129,93,216,229,93,251,34,251,168,185,154,52,68,233,209,198,249,102,120,92,39,139,235,228,227,220,54,114,229,167,52,43,16,105,26,226,109,66,162,113,15,230,197,133,4,249,176,48,63,23,18,199,73,206,129,37,36,222,66,32,168,76,12,153,142,2,104,88,218,91,163,45,114,192,124,241,163,159,194,129,148,18,88,152,20,13,139,57,221,72,32,6,26,197,229,97,177,22,10,191,58,68,139,114,143,38,185,205,11,163,107,123,149,181,202,215,216,164,181,98,133,100,119,236,201,47,95,70,61,192,152,225,107,190,228,137,52,26,173,95,215,202,106,213,26,223,242,93,130,223,185,118,122,180,184,49,220,10,52,194,235,218,181,53,210,108,242,240,180,233,248,
+125,16,150,67,125,29,193,238,164,84,115,83,78,210,186,72,131,223,38,116,60,84,32,9,54,90,175,50,62,36,238,250,224,235,104,178,182,203,83,133,115,74,45,170,216,160,219,161,86,25,26,110,57,181,152,90,219,200,100,6,243,214,162,165,246,90,226,149,45,44,238,46,233,193,59,182,128,121,18,63,123,236,8,243,43,225,192,19,150,218,31,136,210,153,193,51,51,217,111,38,146,126,39,190,44,86,245,11,159,142,46,7,90,240,107,75,60,19,56,177,121,14,134,194,76,162,243,227,67,97,178,33,23,39,251,162,218,6,219,203,119,47,3,110,65,41,14,59,234,51,13,231,12,191,63,15,29,210,253,204,127,137,55,223,10,84,153,50,177,123,167,156,121,80,135,81,111,117,232,157,0,56,160,85,127,133,190,130,200,160,52,141,58,12,86,17,172,90,157,213,2,101,119,153,140,10,144,186,205,159,249,91,50,222,77,110,159,183,253,214,191,247,215,159,37,40,180,98,59,79,44,103,40,157,210,142,228,119,52,250,92,12,139,156,221,205,30,188,250,244,171,171,7,215,179,131,
+28,194,166,33,69,250,21,52,220,123,230,61,115,179,111,128,247,76,24,4,195,35,154,158,31,162,93,75,44,0,191,120,74,179,197,171,83,69,220,180,216,159,37,202,197,85,200,221,166,49,21,24,39,9,93,88,222,251,232,157,127,31,121,93,106,192,235,199,203,129,3,219,95,129,209,253,85,81,199,228,150,92,244,251,34,50,159,55,225,37,245,174,209,156,66,228,79,31,34,191,127,137,17,119,113,106,95,3,43,24,104,169,207,252,52,145,14,36,157,246,72,139,147,145,16,105,128,181,8,181,51,234,253,4,132,211,121,138,54,42,98,34,48,240,50,136,199,137,7,168,21,212,120,83,106,0,92,32,96,48,232,156,55,212,177,39,150,216,121,41,3,145,154,48,29,136,206,109,161,25,111,218,237,18,40,148,43,1,88,87,232,148,1,176,61,103,156,104,99,218,121,56,2,180,189,35,163,194,233,132,192,211,146,141,199,234,201,63,190,248,112,156,15,67,189,233,248,220,163,99,251,72,243,91,31,121,128,200,151,129,146,85,1,79,112,186,244,206,238,78,209,162,148,121,107,120,
+44,163,121,107,221,25,103,180,131,11,83,142,182,212,183,198,106,189,99,55,229,205,126,103,189,46,240,231,107,242,122,85,95,15,235,27,245,226,22,132,9,18,68,170,119,55,91,26,225,32,200,19,9,101,9,19,55,42,9,73,53,42,174,4,229,146,234,42,227,84,189,209,71,10,206,194,36,228,118,208,105,84,103,40,22,156,25,97,113,33,74,46,51,0,36,158,69,189,141,32,199,137,116,243,169,162,41,61,81,65,53,65,246,242,174,128,51,192,123,7,70,192,250,243,100,64,39,226,241,210,175,5,233,235,64,108,209,196,169,80,3,192,160,0,249,224,9,207,73,181,50,153,74,165,164,32,29,206,232,45,107,56,160,51,204,233,239,235,238,165,81,248,57,48,158,9,179,66,218,27,110,35,34,214,204,180,16,14,237,234,123,98,192,173,95,96,79,91,47,134,40,61,148,24,228,6,166,204,246,16,62,62,23,81,235,126,55,156,116,48,149,136,121,56,110,46,210,197,22,113,102,213,139,50,227,26,7,113,170,97,101,65,177,172,79,213,217,222,205,109,74,74,132,92,15,137,
+50,106,62,70,162,18,199,137,88,112,246,40,179,82,159,99,210,213,135,31,97,132,117,165,223,204,62,180,205,85,54,84,28,13,231,105,185,113,30,32,5,36,120,241,82,81,6,232,233,41,113,126,214,94,148,190,111,91,174,47,166,119,15,108,86,146,103,250,152,217,182,154,128,254,228,240,185,153,172,232,183,246,245,21,124,162,21,73,199,115,189,235,92,135,231,153,125,242,86,47,169,185,176,157,134,67,106,181,86,39,89,85,24,20,167,223,99,103,246,121,10,99,236,68,149,75,169,54,127,207,84,47,217,204,96,75,159,76,65,46,213,4,6,232,142,46,26,136,139,137,128,5,205,4,220,82,204,106,176,226,78,29,230,77,147,6,129,154,122,178,16,160,87,80,131,12,228,203,90,87,17,231,99,98,30,36,39,61,233,223,194,104,144,54,89,130,91,42,164,77,218,44,247,71,20,245,150,71,225,15,169,243,225,209,163,9,166,154,78,47,97,186,74,148,141,37,200,85,228,128,254,2,128,194,81,128,125,65,246,126,40,122,76,117,128,23,57,54,240,158,139,22,255,249,9,42,
+63,204,159,55,182,214,251,112,120,58,173,124,232,2,3,208,121,84,209,57,102,89,197,75,209,196,19,170,160,149,79,51,144,25,31,225,10,238,236,153,200,51,229,5,30,241,210,69,15,184,164,252,165,173,14,55,78,26,113,206,46,206,49,16,86,106,215,166,253,252,38,77,85,227,130,224,126,198,137,60,194,201,158,103,192,73,148,33,30,29,29,247,234,239,223,23,175,96,29,250,131,127,34,142,235,28,178,177,141,198,234,136,72,221,235,139,48,197,35,136,145,162,14,213,14,151,24,202,74,220,136,76,35,85,43,114,77,168,105,34,173,204,78,211,39,212,182,70,198,104,108,81,1,224,55,34,243,7,122,92,168,33,137,103,183,23,178,55,196,191,165,47,151,154,239,137,158,55,60,142,211,6,12,88,15,212,17,139,244,124,43,102,212,87,82,136,66,152,246,43,60,131,243,250,216,140,134,89,246,211,212,89,109,13,171,189,119,247,5,104,47,250,1,204,178,175,109,144,174,61,208,115,0,67,30,112,194,157,11,186,122,217,240,11,1,112,153,155,37,7,111,100,203,209,16,251,
+73,156,121,42,52,84,186,42,203,92,165,109,83,197,165,158,188,240,73,173,94,66,136,122,27,46,63,185,132,143,137,241,36,162,26,136,31,88,94,28,70,205,218,132,253,84,165,124,184,159,69,97,13,91,197,126,92,107,224,207,79,40,98,181,68,189,203,48,86,110,158,179,188,26,21,79,238,242,99,61,245,195,176,230,5,208,199,43,140,5,239,113,65,155,92,61,190,221,246,118,182,253,113,193,186,150,150,234,204,114,231,55,36,55,207,9,183,141,102,52,120,224,231,245,253,249,201,137,161,200,94,130,179,121,58,138,212,147,142,207,21,50,55,61,95,104,227,162,130,118,239,250,48,159,167,14,49,103,146,217,156,37,181,26,249,197,83,47,195,109,132,175,234,154,228,21,196,107,129,120,134,206,87,82,7,6,158,96,212,253,68,146,233,160,128,251,51,24,117,161,104,108,72,34,225,66,128,211,225,56,205,137,33,62,49,239,55,51,91,181,103,240,215,122,123,124,82,121,187,25,224,69,47,18,39,160,112,2,28,74,184,131,60,10,223,133,75,152,12,13,75,28,60,215,88,201,
+22,23,57,184,242,225,133,45,77,175,167,243,76,160,57,241,172,27,203,71,166,46,145,40,20,253,204,60,172,39,197,188,173,198,0,128,6,250,151,94,170,56,55,17,168,201,4,171,228,62,74,145,52,161,139,38,135,237,175,242,250,53,142,215,70,2,42,11,199,123,78,36,242,142,184,74,165,242,30,185,230,217,59,125,229,221,147,238,32,218,26,240,73,182,202,187,137,43,207,41,95,233,108,121,140,171,137,94,14,69,9,183,153,176,66,110,171,31,21,238,123,95,47,219,44,169,58,198,19,117,21,58,116,61,239,48,31,21,50,237,41,139,107,147,3,220,208,165,19,89,80,56,229,97,246,37,255,160,42,39,166,54,207,190,2,0,236,5,229,161,224,189,241,25,130,204,103,227,208,165,164,147,147,16,12,110,97,115,29,238,14,35,212,23,76,27,77,60,201,70,222,241,146,101,175,63,198,153,61,213,49,87,55,22,70,249,61,71,103,140,164,8,140,71,68,154,162,18,27,93,33,109,23,178,135,229,135,212,242,110,119,230,98,10,155,227,82,100,79,110,185,214,0,85,99,115,
+225,45,103,253,98,15,85,38,244,145,65,54,231,145,117,109,109,89,25,158,202,33,94,142,182,97,124,185,191,124,64,168,2,144,108,234,112,75,90,241,227,99,135,161,35,215,98,128,249,42,237,132,222,163,128,38,16,114,186,210,147,80,55,242,126,65,66,109,218,36,43,69,31,185,175,193,231,77,7,178,159,70,124,245,110,168,119,116,15,201,203,107,187,246,254,188,248,90,30,20,67,59,174,54,120,16,37,210,197,193,127,124,209,208,151,210,21,161,178,241,155,31,215,81,210,85,219,6,113,115,219,169,27,96,3,99,173,154,210,98,169,245,23,11,61,105,101,108,216,170,183,184,243,140,14,206,72,224,62,138,36,141,153,125,206,74,108,139,52,144,198,91,91,244,126,46,215,40,138,185,12,181,223,204,207,101,32,105,142,5,235,231,151,73,69,0,214,75,150,201,207,247,235,25,162,172,133,32,34,165,191,142,180,251,201,212,47,204,230,159,137,94,143,113,212,128,124,3,244,38,100,232,241,44,141,239,103,81,196,220,169,138,45,92,175,185,103,70,38,213,216,166,39,158,103,209,
+137,182,131,194,171,107,213,242,188,62,110,19,248,99,248,162,237,189,235,197,11,74,186,171,181,37,89,84,166,84,87,97,137,79,217,34,56,100,146,78,121,205,1,224,96,198,196,54,66,45,93,161,152,219,204,148,226,30,52,219,177,30,187,237,108,74,58,26,85,14,141,172,196,85,239,235,232,220,236,74,77,48,87,35,131,220,211,65,182,212,33,137,103,147,112,143,4,180,114,229,221,176,213,196,91,18,136,149,230,110,119,117,214,185,251,218,105,112,10,198,16,103,204,102,58,72,31,207,240,226,102,187,46,188,226,27,159,107,136,96,111,172,231,124,215,4,35,82,231,112,13,149,76,89,40,175,40,90,21,238,165,149,227,228,106,108,248,86,139,14,43,241,65,149,15,54,168,124,244,98,214,199,18,161,103,136,152,105,64,77,232,139,161,202,44,22,182,178,145,27,51,26,191,117,114,38,66,122,23,161,70,91,40,88,11,84,21,177,206,131,142,89,176,194,140,9,85,150,72,229,117,34,204,172,80,158,231,20,212,27,145,177,150,76,7,115,84,68,177,118,188,239,69,42,20,23,
+251,61,191,102,56,108,202,101,138,145,70,105,203,31,69,174,167,205,225,232,93,76,138,224,113,213,188,233,245,159,173,225,38,88,178,112,105,56,119,82,149,86,27,168,126,233,60,36,31,13,161,141,251,129,112,152,162,70,119,31,115,152,37,125,60,140,186,234,72,43,26,136,3,231,173,105,123,208,12,110,126,135,72,138,33,54,62,140,65,121,205,91,76,110,66,148,27,54,195,218,39,19,151,25,228,85,183,115,216,243,187,25,165,221,170,58,99,162,109,204,239,139,106,110,28,156,164,189,107,158,250,54,220,194,22,43,75,193,24,227,210,60,23,45,49,86,240,215,121,70,183,244,89,77,226,163,63,52,108,32,227,57,73,58,243,64,225,198,112,45,255,146,10,109,196,68,171,1,137,47,146,201,93,100,122,110,4,134,24,95,84,46,197,211,13,183,240,196,162,60,142,128,223,96,1,244,66,67,187,41,239,175,7,196,18,96,160,100,3,240,115,61,124,222,198,62,34,28,240,71,174,88,35,80,67,200,117,130,189,102,54,14,240,194,85,192,198,6,195,151,87,222,109,78,2,139,
+88,249,128,171,224,7,193,11,66,97,190,75,66,112,17,19,186,85,144,236,2,38,203,98,202,247,216,173,31,185,82,167,242,33,216,109,153,52,53,134,250,222,107,106,230,151,226,199,86,34,144,47,14,31,215,62,231,48,146,32,63,51,3,210,162,32,90,24,104,246,126,17,89,155,64,23,138,150,109,177,159,83,63,242,183,129,221,141,125,81,240,39,162,119,53,63,62,20,172,118,110,40,201,125,145,132,220,123,196,121,74,171,235,87,221,170,235,12,21,116,203,215,76,102,123,159,106,164,80,192,138,130,9,49,0,97,244,56,7,185,141,204,235,43,242,179,121,185,95,92,185,7,118,165,96,115,31,53,77,144,84,65,162,219,99,12,24,98,52,112,51,4,125,165,143,123,161,44,195,80,152,133,146,230,84,94,13,199,64,122,244,192,76,96,230,14,22,185,12,1,205,169,213,174,198,104,82,89,62,42,171,183,161,190,187,98,104,206,152,92,197,161,205,120,44,200,2,9,209,3,130,212,190,221,9,35,249,195,234,108,93,184,16,150,216,28,160,185,36,140,148,2,37,121,239,71,
+147,253,232,55,131,130,196,174,24,53,117,238,101,27,92,20,223,86,212,222,27,69,238,159,94,107,86,87,58,26,3,19,28,233,23,194,72,37,112,126,176,186,119,103,15,116,211,146,252,194,44,97,131,240,69,201,123,165,76,198,23,3,80,178,104,74,149,216,5,44,237,24,187,156,52,62,252,62,60,127,140,173,233,250,64,126,159,46,91,220,40,252,46,102,147,127,139,248,23,201,203,189,203,8,247,144,50,66,124,74,30,226,25,116,171,24,105,49,3,169,121,7,227,29,16,139,73,69,17,90,254,85,176,29,250,225,5,95,72,182,74,75,156,86,232,194,58,234,52,152,228,108,61,60,52,156,158,182,40,104,158,75,131,249,187,148,47,90,105,201,53,144,91,0,4,16,117,149,228,133,236,29,191,32,17,82,137,244,246,36,88,48,247,88,50,30,143,17,190,109,161,104,178,154,155,164,40,193,95,59,173,100,5,81,56,219,39,66,88,238,238,70,163,169,63,77,229,18,167,61,45,225,213,141,115,205,240,98,199,30,91,189,15,57,53,85,202,140,26,118,5,231,75,183,34,9,
+70,245,18,115,55,105,225,165,138,150,8,115,137,208,53,200,140,133,221,20,222,39,80,44,104,159,76,151,50,128,209,215,145,209,208,192,26,41,167,49,133,221,42,205,38,130,115,37,37,43,248,91,131,243,129,55,58,251,69,224,208,72,43,35,7,206,178,90,138,6,231,231,177,190,17,22,6,244,17,230,39,244,166,8,217,44,154,230,120,3,49,25,32,233,11,46,26,237,231,129,59,136,40,196,172,54,7,13,110,55,143,243,65,197,188,230,185,144,89,74,64,217,191,137,90,129,62,238,41,233,127,117,24,9,153,236,14,145,61,73,185,225,140,175,187,113,170,202,40,252,65,66,164,20,144,36,245,133,15,141,141,219,240,246,236,36,37,166,231,74,32,137,238,32,211,77,39,122,252,178,162,125,54,205,166,137,105,151,36,25,238,124,11,62,168,88,13,101,209,57,32,247,212,191,6,9,91,232,108,78,168,53,77,159,12,124,168,209,3,25,32,32,245,58,20,197,19,144,84,136,50,166,222,14,88,166,43,102,179,33,235,123,250,249,33,38,87,221,31,183,233,43,209,237,39,154,
+237,196,32,123,99,16,96,78,192,197,180,193,104,85,203,235,238,73,249,113,158,196,79,216,51,110,104,49,214,42,243,118,114,97,230,75,84,25,87,16,228,134,248,220,252,190,27,29,81,184,113,249,27,187,192,95,59,235,203,14,128,91,127,213,36,225,184,185,239,29,55,30,44,175,177,22,250,18,195,93,100,77,254,166,192,193,124,81,22,186,192,73,149,95,120,193,198,121,35,173,27,178,227,3,56,75,215,129,54,91,25,201,14,236,145,152,41,62,223,64,223,155,97,225,109,131,126,187,72,132,32,5,0,181,199,172,77,136,244,65,7,115,216,66,182,145,35,124,130,134,47,1,79,0,220,107,119,100,132,39,97,66,136,58,225,175,60,98,240,102,210,235,248,121,181,72,133,173,49,97,91,46,90,136,141,72,112,55,81,31,27,25,57,225,180,216,25,34,23,139,139,180,108,126,90,129,40,230,251,60,138,185,134,2,85,92,161,48,46,139,118,183,196,242,210,191,46,238,165,248,141,25,96,88,176,61,204,9,234,2,137,61,155,166,130,253,195,114,67,171,214,125,208,70,122,203,
+156,65,125,206,24,178,184,51,218,239,94,90,72,120,159,196,166,123,216,226,131,127,183,62,148,139,44,187,62,184,36,87,246,248,188,30,161,46,74,195,163,84,231,216,127,26,106,71,67,213,136,59,47,170,78,51,230,113,128,81,53,13,82,75,205,142,81,76,83,150,249,35,94,132,153,21,51,154,225,145,128,125,136,66,147,236,101,248,62,83,145,165,26,97,95,170,18,173,184,97,96,252,129,6,167,160,137,253,3,11,125,96,241,79,42,67,180,199,200,140,76,147,66,143,203,179,67,227,74,186,119,24,110,28,35,38,194,1,76,117,142,105,146,100,122,139,189,159,72,40,197,30,207,223,155,234,21,133,237,118,60,65,143,53,138,78,255,232,238,120,17,166,72,87,162,179,188,77,122,150,190,23,125,76,13,93,139,134,187,68,163,145,150,247,102,60,157,74,137,0,194,182,143,208,225,179,117,29,254,120,189,238,226,251,239,110,129,93,169,239,152,237,200,15,38,251,253,19,79,170,18,48,11,220,88,132,14,245,86,17,241,168,133,74,159,136,164,235,86,230,94,139,116,104,142,160,
+24,16,152,180,121,13,171,128,56,244,223,167,195,178,31,65,161,91,0,153,208,13,146,185,48,107,183,79,129,102,115,207,68,105,73,75,43,186,26,21,171,21,181,91,169,153,180,90,207,209,153,59,247,156,156,8,211,7,118,36,156,61,12,128,79,116,196,213,137,139,38,230,183,79,206,219,145,62,239,238,165,6,251,59,226,181,49,77,170,49,225,3,77,44,44,144,42,34,97,104,154,237,129,167,239,247,222,94,190,179,155,202,100,118,149,149,94,28,38,49,157,227,80,94,216,157,81,106,99,57,82,47,37,107,172,247,213,235,170,170,136,208,219,198,205,251,100,7,150,148,6,234,60,197,249,64,124,11,75,244,194,90,189,125,113,61,180,29,160,94,217,192,48,23,223,242,126,227,129,31,90,166,207,131,180,16,24,66,169,203,34,140,193,86,161,197,10,139,203,41,215,121,181,75,160,33,29,211,162,214,199,196,1,125,244,139,212,81,109,198,73,110,19,159,105,95,158,196,153,165,251,47,60,91,242,165,214,247,191,34,102,15,244,122,244,142,124,44,46,181,121,112,87,90,89,96,
+171,227,190,33,117,168,38,74,71,153,83,128,101,65,137,121,82,108,234,138,68,71,49,254,218,181,192,75,189,168,165,171,183,47,35,195,22,46,118,143,209,203,122,82,209,68,154,31,206,106,107,143,239,92,30,205,159,151,122,224,128,171,96,59,34,38,174,216,228,120,4,110,238,48,253,158,183,37,148,69,22,244,98,63,111,68,187,75,13,76,158,115,186,77,97,34,31,60,225,122,9,111,56,221,104,1,163,173,90,79,137,12,58,32,214,186,105,70,5,68,134,133,200,228,35,19,219,207,36,197,235,25,103,112,0,1,117,223,27,69,247,222,62,202,13,115,199,59,157,61,85,126,10,23,245,244,71,90,34,111,88,80,60,121,12,188,84,76,178,101,154,216,82,16,145,48,172,79,48,36,36,128,205,213,152,52,142,113,119,36,40,53,97,120,209,45,14,62,103,91,187,9,81,105,84,231,234,197,210,100,193,74,106,108,195,99,69,104,152,103,5,247,86,67,49,116,7,84,60,146,200,140,134,174,58,253,245,115,109,99,7,233,174,190,19,122,149,249,73,237,185,242,138,159,188,189,
+95,98,122,89,93,70,55,130,25,149,248,132,27,239,0,114,197,138,37,248,97,178,223,110,167,72,156,158,35,226,159,49,247,252,28,81,161,145,26,161,50,62,83,143,48,28,77,95,123,82,98,185,220,88,87,251,58,7,108,29,76,177,222,199,250,168,183,36,172,242,254,227,51,140,132,234,146,157,47,10,146,29,210,164,133,221,251,92,179,123,199,25,250,25,199,206,168,217,237,39,34,197,208,34,42,42,233,22,146,195,95,173,12,242,197,178,237,221,14,246,181,115,182,177,151,16,120,43,208,91,9,212,30,199,157,88,50,171,76,201,152,18,13,116,216,107,164,149,113,159,98,20,76,80,47,45,221,52,28,210,121,118,157,65,22,51,44,208,33,110,111,17,180,51,202,34,19,198,124,70,117,128,23,44,213,158,71,61,80,59,175,251,202,147,2,108,172,179,191,183,109,13,128,5,195,27,220,64,132,218,193,97,101,59,25,130,52,155,193,194,58,49,77,154,120,252,178,188,171,90,31,194,216,34,119,63,165,88,203,86,171,171,58,0,88,192,227,135,181,211,0,60,217,203,18,199,
+116,86,92,103,245,47,215,41,203,136,190,136,105,215,20,73,217,187,161,230,67,50,170,182,143,162,27,23,208,36,139,158,116,218,204,93,178,200,220,69,111,106,70,88,1,100,233,233,71,129,38,171,176,13,169,189,211,16,48,162,9,209,63,142,164,76,234,61,152,228,31,59,163,72,66,204,189,153,51,30,171,105,59,177,76,166,55,71,113,42,96,195,82,157,205,43,11,171,96,6,6,134,178,34,169,10,203,103,87,148,20,156,5,174,89,230,44,104,173,0,82,213,200,167,24,222,148,144,76,113,49,80,80,49,20,75,21,175,142,137,8,183,53,133,83,139,74,180,106,60,134,136,88,42,97,91,104,114,135,103,240,250,254,244,14,60,136,228,43,125,7,31,43,167,244,11,73,212,235,84,113,248,184,205,3,40,67,111,185,6,53,109,6,108,58,3,165,123,35,58,90,21,59,226,23,28,150,8,123,22,50,140,87,135,66,20,222,207,50,172,161,246,111,217,43,3,188,163,153,127,0,60,212,150,202,183,42,66,12,193,25,145,189,46,234,40,106,240,45,189,117,140,62,83,77,123,
+144,112,179,196,112,222,125,198,126,110,223,56,105,218,152,92,18,226,237,135,14,55,55,159,197,244,252,183,88,84,16,130,148,149,149,50,107,240,182,120,209,83,225,38,42,156,170,39,32,181,68,172,9,83,128,27,74,168,227,65,136,93,59,105,199,11,190,146,43,242,239,198,248,203,108,166,102,105,192,33,96,34,50,237,169,94,244,117,254,170,9,63,103,153,198,105,157,182,233,109,115,11,190,57,33,4,171,112,225,157,198,115,219,174,26,179,13,173,229,185,179,238,159,111,24,233,81,218,191,200,27,108,21,40,221,91,159,148,117,44,55,2,189,240,176,28,92,170,167,63,223,244,12,102,164,179,25,74,239,74,13,42,121,44,160,227,37,238,43,174,89,128,41,184,121,216,50,199,92,10,137,138,139,12,154,74,60,79,213,80,95,63,25,47,88,56,224,43,98,20,125,101,22,151,7,11,247,145,6,117,63,87,124,48,80,171,2,60,220,176,204,169,226,50,178,108,229,235,107,41,39,10,193,244,99,216,5,43,12,96,106,162,120,17,236,30,122,197,139,210,185,13,98,23,91,254,
+19,203,209,7,44,142,218,230,12,118,131,221,57,97,15,35,126,133,221,59,170,230,78,243,18,21,84,25,160,97,51,101,194,98,182,3,128,80,52,226,75,93,178,4,153,95,102,241,165,85,16,28,173,133,68,24,126,139,31,227,245,133,121,188,108,129,254,36,13,240,53,127,67,55,194,118,89,159,173,206,194,60,42,199,122,205,140,188,157,150,18,210,218,41,193,133,35,221,82,2,67,32,211,240,178,148,160,128,173,17,197,200,68,227,183,247,190,248,99,244,117,40,81,105,117,181,114,170,83,46,230,147,249,120,78,155,173,102,116,187,125,205,125,22,215,9,7,78,18,139,72,220,206,139,231,57,89,26,206,83,197,125,97,182,84,153,43,227,136,11,153,224,154,249,149,179,34,92,218,2,11,182,192,188,173,75,234,12,30,245,216,203,34,29,175,231,20,250,171,12,191,184,25,156,252,201,23,147,114,80,241,11,242,149,172,239,16,92,195,45,247,189,247,105,222,14,82,14,40,31,207,103,64,59,183,192,65,76,86,173,247,4,45,149,59,210,51,233,71,80,140,82,194,88,225,64,
+140,24,223,184,190,35,207,108,199,169,49,5,144,251,75,26,67,146,184,183,93,146,217,13,151,62,212,178,119,130,242,130,203,139,78,56,200,225,145,229,22,173,187,11,32,90,189,101,57,13,128,222,147,97,211,42,150,93,1,92,108,168,0,65,166,98,59,178,93,39,159,187,54,213,208,126,40,210,237,23,67,59,60,220,181,135,187,188,74,29,195,167,113,116,96,43,116,231,3,160,58,237,226,136,8,28,209,39,57,217,250,140,73,56,77,206,80,137,129,30,154,136,157,205,187,222,123,210,112,173,23,58,227,4,195,172,4,106,251,153,194,97,120,193,176,88,39,44,232,243,121,3,28,18,178,209,41,103,219,161,3,133,170,160,161,6,20,37,42,33,227,75,106,73,212,144,169,232,26,213,217,89,205,61,229,210,199,224,145,235,57,64,9,238,238,168,78,142,204,170,190,209,158,53,212,38,116,21,186,220,69,145,74,193,168,74,61,18,21,213,98,170,198,41,169,191,34,210,79,134,133,245,136,209,174,69,147,163,131,232,245,95,109,25,27,172,149,108,101,163,144,20,46,49,124,110,
+224,216,161,164,141,164,78,10,146,241,112,134,177,53,24,183,147,250,3,184,166,172,222,115,253,227,24,180,240,160,43,249,86,207,52,194,93,12,1,135,55,61,190,55,114,78,183,106,169,49,107,154,153,145,195,234,170,10,192,51,1,4,244,6,99,199,211,92,170,36,146,200,122,84,137,85,177,115,156,44,115,53,19,108,251,94,128,166,99,46,116,225,70,3,200,45,116,228,149,141,246,222,233,144,59,1,205,36,194,95,92,168,23,55,14,248,146,134,4,154,144,192,187,216,47,106,189,68,93,97,44,180,129,205,51,131,93,134,69,84,235,91,167,151,54,251,64,98,31,37,53,251,180,227,68,231,111,205,57,17,204,34,6,190,114,178,227,123,149,246,167,115,52,3,229,239,145,244,148,66,30,181,177,198,89,62,55,54,51,229,15,15,16,194,78,67,64,46,241,56,212,178,141,226,224,19,17,78,55,209,234,40,154,41,209,71,70,92,175,134,241,38,80,219,118,42,82,37,110,40,98,213,149,152,238,218,28,37,105,37,126,60,165,32,10,124,62,105,175,246,199,166,53,118,12,70,
+74,88,2,46,253,210,120,129,163,87,220,179,189,85,205,21,34,18,141,246,124,243,202,34,103,93,175,55,187,251,43,12,6,61,94,202,117,44,147,237,213,92,219,217,129,139,246,225,73,97,96,30,25,252,25,48,112,113,131,180,123,197,52,41,214,82,143,35,250,73,6,234,179,160,46,56,58,3,214,46,239,103,215,244,227,230,110,71,22,196,206,199,226,99,84,255,168,76,27,121,182,141,71,193,208,186,88,11,229,202,150,125,42,109,151,136,197,26,154,48,201,219,186,254,34,40,154,175,8,237,12,107,156,57,168,218,221,11,239,138,41,72,118,178,208,49,64,84,84,103,167,1,211,55,85,150,252,159,104,154,45,229,60,138,48,84,232,48,132,44,243,156,88,201,137,241,41,190,86,222,206,156,240,241,100,123,131,92,120,254,96,32,75,128,147,137,80,58,50,17,16,234,179,177,182,72,154,252,232,78,41,248,254,237,72,228,227,164,137,35,209,0,35,25,34,96,162,158,43,162,58,51,40,231,90,45,219,99,165,96,150,14,163,236,10,77,79,5,148,83,241,123,75,44,131,150,
+146,44,119,227,196,254,178,91,190,236,95,103,19,210,115,202,228,190,81,104,28,93,198,213,91,142,41,245,199,103,31,89,36,238,70,103,180,186,251,233,60,87,140,235,65,4,136,16,180,78,245,214,43,215,195,221,163,253,34,25,101,90,117,98,219,43,85,124,53,107,248,22,31,189,67,227,214,115,122,228,165,217,98,101,59,222,47,208,235,234,152,191,176,215,158,101,248,24,189,113,14,75,238,248,133,247,224,98,159,242,86,122,234,77,31,75,159,234,102,166,193,38,40,8,147,174,252,154,142,58,143,92,229,59,15,213,87,89,232,8,62,46,139,167,237,77,209,218,240,19,224,31,63,33,83,225,169,209,27,199,193,71,210,39,46,52,21,127,94,98,141,45,69,174,255,36,43,92,154,38,129,113,216,63,30,103,141,203,45,219,35,236,147,77,226,81,98,194,161,101,222,155,165,189,219,60,150,155,7,242,161,227,119,116,157,220,58,106,181,51,128,40,196,34,29,12,15,66,194,132,65,144,51,233,98,41,93,226,53,93,158,123,149,75,109,145,213,81,190,156,180,68,113,143,160,223,
+125,212,125,143,155,95,134,41,4,238,254,22,191,171,193,23,156,12,25,226,163,95,38,2,226,101,172,234,173,167,35,2,142,58,252,85,252,58,217,25,85,215,205,206,171,115,88,90,178,149,164,180,210,52,47,104,149,117,129,193,142,95,133,186,224,236,142,125,0,156,238,42,236,120,63,132,214,166,123,113,177,121,29,136,80,211,122,84,188,200,133,1,2,219,75,100,247,4,85,250,8,196,3,94,129,208,162,236,227,140,159,0,54,23,215,188,142,19,58,61,169,25,3,195,249,72,45,1,234,218,108,170,46,30,238,125,25,240,206,101,30,34,241,232,129,145,55,69,9,12,15,191,89,203,112,200,110,186,8,38,55,149,235,67,174,238,32,24,152,227,53,132,108,203,148,109,29,107,21,2,35,205,98,89,163,7,44,165,35,197,140,36,142,176,26,23,115,242,225,174,109,158,254,180,190,78,82,210,98,151,255,105,219,178,163,166,91,108,116,88,235,182,99,245,78,78,240,184,159,224,199,33,93,139,240,44,203,189,165,101,95,59,249,76,46,129,140,167,110,192,201,128,0,17,45,63,
+149,227,147,127,12,217,130,95,131,151,126,126,70,14,137,97,132,173,74,190,32,127,146,31,28,208,158,27,32,60,4,226,163,91,60,130,163,213,32,171,65,199,55,37,231,38,145,109,111,5,54,180,224,248,53,126,85,158,222,43,7,254,211,210,220,239,50,138,86,177,14,89,73,38,22,110,134,240,97,126,166,19,103,246,1,191,142,152,222,160,190,107,111,13,21,164,182,158,213,168,127,192,148,140,116,227,177,242,146,55,73,222,122,75,104,44,51,146,231,247,138,207,53,227,3,178,240,48,64,135,38,230,168,176,102,84,15,238,231,113,13,162,152,4,158,151,50,40,215,126,103,226,45,45,114,191,113,190,87,235,188,251,21,107,201,144,10,146,152,112,81,234,130,25,217,97,25,55,222,104,166,112,117,109,53,192,45,7,216,229,70,216,114,105,11,230,35,53,197,78,103,117,83,5,200,119,16,196,29,166,122,213,85,207,248,2,177,135,141,108,51,174,247,159,241,249,136,14,202,13,5,57,115,88,176,25,10,42,230,154,179,98,102,85,204,74,40,253,53,156,36,46,176,38,164,1,
+204,75,137,2,212,133,169,51,82,17,235,190,133,22,59,133,68,108,245,238,74,197,200,130,27,122,169,1,118,86,115,47,12,252,62,98,83,90,48,79,227,241,158,156,192,146,51,168,101,190,181,84,183,207,249,124,191,103,150,86,106,110,157,107,125,220,59,196,235,168,124,47,68,43,177,84,244,49,24,15,39,153,197,158,232,160,15,122,109,58,141,59,44,121,98,36,5,83,177,144,188,55,142,66,19,86,121,196,105,72,104,231,27,184,210,222,78,168,134,68,79,165,222,102,71,37,107,75,108,203,160,154,217,235,42,55,189,130,199,244,15,212,230,188,98,129,214,199,12,228,32,52,100,217,78,62,56,69,75,187,110,29,24,16,105,222,123,141,251,68,76,151,11,197,13,205,247,93,126,107,17,227,146,125,80,119,75,161,34,85,239,208,71,44,3,173,189,197,22,224,56,28,210,88,182,210,75,77,44,187,3,230,224,222,226,3,127,110,30,176,232,2,78,19,88,150,134,141,90,172,116,104,124,30,26,233,5,166,161,228,187,88,157,210,157,149,19,214,29,17,247,249,184,183,29,177,
+59,110,24,155,135,225,212,13,183,235,83,118,104,239,18,42,71,24,105,186,26,140,22,102,254,61,65,34,27,124,194,227,27,116,34,112,86,77,183,58,133,157,142,109,42,12,89,19,157,179,6,184,38,212,174,187,35,246,154,230,126,32,70,6,154,251,32,96,159,197,239,163,140,192,55,127,22,185,132,163,17,134,23,40,51,209,132,49,20,176,50,7,245,190,209,194,61,54,195,98,129,238,138,13,113,32,108,148,14,241,132,38,66,24,193,142,21,3,103,117,70,60,235,104,170,133,230,158,53,200,236,169,110,214,124,127,186,75,142,211,73,195,170,89,73,134,30,103,75,200,225,86,42,77,49,136,13,229,210,50,125,84,197,123,203,69,68,196,214,94,138,231,80,185,184,215,26,247,147,129,15,247,85,249,156,173,69,173,144,12,73,209,136,59,233,105,164,22,83,88,182,8,244,237,15,72,117,147,136,95,192,54,130,105,206,55,143,102,128,237,210,175,123,36,253,150,79,225,204,143,225,9,70,30,68,209,245,92,118,1,101,152,228,34,64,182,77,118,93,213,182,27,103,42,236,23,
+102,66,101,49,219,250,11,230,30,230,65,82,211,79,182,116,237,78,157,247,224,216,100,214,252,172,36,242,139,4,237,93,118,232,50,222,195,169,48,234,147,58,165,45,167,153,116,216,244,92,182,21,25,247,38,6,48,237,225,215,8,206,232,24,6,185,150,190,219,162,27,56,55,125,231,54,58,116,239,196,238,245,43,150,169,167,207,205,172,85,208,121,51,204,51,25,31,142,51,68,179,15,147,234,233,67,102,135,110,24,21,91,174,42,235,76,165,248,187,73,234,89,240,151,113,79,19,187,197,126,106,181,230,8,20,183,136,52,75,42,57,1,29,34,97,23,144,152,85,167,74,103,156,190,162,151,56,129,35,63,46,48,40,3,224,71,243,194,252,23,60,15,28,5,168,8,73,45,69,238,47,234,45,190,7,110,210,199,138,242,19,209,158,182,64,127,161,84,168,47,34,247,43,209,51,252,16,51,46,108,83,50,206,98,194,87,153,207,186,5,77,187,160,120,108,108,211,160,129,193,40,75,181,154,230,43,145,174,43,207,97,22,118,241,17,132,200,49,220,114,95,60,155,205,132,57,
+161,113,171,84,0,228,186,69,29,82,19,88,245,244,118,223,87,161,170,21,58,231,14,86,199,214,184,235,29,119,106,247,227,75,152,200,129,233,112,30,103,202,17,65,149,223,8,84,110,6,23,133,62,25,240,235,78,221,185,215,237,123,108,206,86,157,240,97,92,201,72,98,45,178,94,218,176,168,255,241,206,56,98,80,228,171,69,203,216,234,96,150,118,250,117,30,179,84,169,51,117,182,57,149,28,98,132,58,253,139,67,30,160,159,47,105,223,181,173,229,64,140,112,203,139,25,207,187,154,64,177,229,75,122,160,77,249,30,98,95,199,186,187,46,163,216,41,251,134,201,109,187,236,43,229,26,145,151,112,117,215,190,155,86,9,31,170,68,228,37,129,59,225,234,214,60,221,229,209,218,122,207,70,184,131,76,248,9,122,103,83,151,230,107,121,31,26,199,102,76,12,223,248,245,119,55,186,125,163,201,179,168,137,230,65,24,171,134,3,123,111,112,155,64,79,199,53,211,18,190,39,31,236,17,84,57,93,60,244,25,161,113,204,21,26,151,17,41,206,242,178,176,210,245,66,141,
+62,168,146,68,77,137,39,49,2,227,242,62,138,220,24,133,234,249,24,114,15,111,225,35,102,155,49,1,85,196,251,203,81,221,181,165,84,2,75,3,234,142,152,53,144,215,38,92,43,211,161,108,71,157,79,242,182,149,105,141,42,57,249,117,91,103,248,228,137,180,130,18,213,40,228,106,149,230,50,145,43,87,114,169,123,221,44,26,110,186,207,165,38,244,2,19,97,112,241,188,218,35,157,176,228,246,193,205,228,233,232,44,192,43,241,227,109,27,171,168,118,73,52,149,42,67,64,153,142,100,220,21,140,171,219,189,55,178,154,111,144,60,3,121,207,169,211,180,175,4,28,54,208,163,61,36,233,94,241,33,95,174,115,62,46,249,100,73,227,73,99,131,170,213,71,103,173,177,214,161,33,89,93,134,107,244,193,204,66,122,174,10,48,144,164,164,72,207,84,190,233,231,162,45,251,193,131,166,179,2,67,182,220,181,148,9,146,189,46,166,153,231,0,243,142,182,86,135,226,43,250,53,84,157,183,250,67,81,81,254,12,217,230,246,88,255,216,201,134,230,228,33,29,67,22,218,
+48,68,210,5,10,142,176,211,136,88,178,72,203,85,36,77,241,64,141,54,234,206,119,249,244,80,242,86,109,147,82,218,205,254,18,131,7,164,218,198,120,227,3,116,216,157,102,75,222,89,198,117,75,226,29,83,54,217,212,194,100,71,241,133,57,63,139,130,227,135,129,253,22,6,189,165,185,47,81,92,100,206,197,193,11,244,32,231,18,240,59,55,175,187,211,171,173,102,105,100,84,241,130,173,18,109,216,142,245,79,226,0,92,175,78,178,84,195,113,14,123,188,111,175,105,205,50,255,58,7,160,208,102,141,139,5,232,205,219,162,4,203,26,88,146,175,160,79,229,170,232,31,127,174,187,117,55,149,75,162,38,8,80,77,52,166,201,100,226,210,76,124,153,202,208,23,41,141,147,222,68,147,78,125,93,119,210,171,159,99,167,106,172,96,212,219,44,147,143,130,149,65,113,214,73,236,108,60,58,254,24,245,141,155,117,233,21,248,154,216,239,233,66,241,130,203,224,60,68,175,123,122,24,229,232,112,140,27,8,246,124,188,5,51,225,89,108,97,219,202,97,158,92,188,179,225,
+214,153,163,220,230,121,164,1,70,195,145,82,119,114,114,80,153,175,253,244,32,173,20,47,126,155,145,126,175,163,133,12,13,80,87,101,116,177,216,184,1,210,89,180,223,32,87,120,14,232,183,75,234,169,53,80,100,243,21,248,206,182,149,43,245,209,34,200,29,140,0,26,108,140,190,109,25,79,33,183,29,131,119,60,197,184,102,119,173,86,187,46,14,131,71,234,40,156,45,236,165,19,136,68,149,129,56,55,128,137,236,117,44,45,139,93,63,99,155,151,113,20,92,209,117,174,194,155,73,40,189,127,16,220,72,4,48,161,77,200,226,92,230,145,179,185,28,215,23,211,112,107,255,60,146,199,193,203,94,14,97,122,21,105,64,77,158,142,82,184,47,20,2,231,165,177,6,12,28,182,40,49,243,69,249,242,209,196,198,14,177,143,32,128,79,221,23,163,227,205,149,159,97,122,66,92,145,175,48,125,91,86,226,40,142,203,5,5,106,21,182,215,19,10,221,131,222,145,192,17,124,236,91,180,148,151,189,193,16,147,12,58,20,104,119,179,39,35,150,107,33,2,35,212,183,142,
+188,160,131,188,160,117,42,186,165,204,36,235,94,95,15,125,135,251,186,236,166,11,220,96,189,52,118,102,188,64,101,87,110,157,96,140,251,46,9,124,130,66,61,164,164,175,222,13,214,203,61,108,180,134,228,165,46,54,162,251,220,109,217,222,122,174,117,244,53,145,118,165,143,171,73,93,30,137,118,134,6,168,255,5,236,107,45,103,30,151,54,248,136,52,252,119,80,255,228,141,124,232,32,94,156,244,45,216,136,105,23,7,80,239,5,243,64,218,228,132,85,31,30,102,198,69,12,224,46,55,36,198,138,53,34,120,30,36,102,226,98,59,2,144,77,243,130,37,233,164,250,193,88,168,185,237,57,159,59,146,189,174,84,71,244,150,26,56,71,133,129,27,153,8,122,207,2,29,242,216,90,69,134,187,168,50,120,160,252,150,155,202,148,21,100,28,139,219,90,188,17,206,91,152,33,22,8,177,162,32,11,142,98,22,253,144,40,37,168,184,97,168,203,107,85,21,25,57,221,180,107,138,89,113,121,102,211,120,179,56,15,164,200,235,80,171,166,157,208,220,111,31,68,164,201,7,
+234,40,59,49,106,30,62,222,73,171,32,214,10,143,13,149,231,56,251,221,236,12,55,248,197,130,110,145,140,181,34,83,154,38,17,195,218,149,163,66,176,177,28,29,8,104,203,253,226,47,142,176,0,127,175,130,167,185,61,54,79,217,149,203,18,9,52,120,50,134,66,166,81,129,110,111,76,42,144,242,249,108,16,70,14,58,251,201,80,62,26,103,219,15,113,167,25,34,51,171,132,12,15,30,31,96,132,251,245,72,63,238,4,143,220,33,114,18,22,161,170,196,197,66,193,52,163,203,14,201,254,148,23,190,209,93,2,220,23,122,171,194,191,216,106,170,121,166,178,158,221,252,179,215,47,224,250,72,102,34,79,86,110,33,10,47,23,28,27,108,60,207,154,124,42,93,220,159,155,229,49,184,231,87,21,242,203,26,196,152,209,56,17,239,2,158,177,26,230,10,75,72,246,126,122,85,229,167,2,17,125,238,134,14,244,38,126,51,136,92,240,217,237,79,4,214,2,140,212,2,198,110,58,17,102,19,67,6,22,148,87,231,19,150,58,237,250,56,177,74,234,181,87,102,254,141,
+54,125,19,89,24,254,146,48,158,1,24,196,81,5,127,126,228,248,203,238,96,84,56,142,245,17,123,37,65,156,142,130,72,61,6,99,244,58,162,107,45,252,123,107,81,64,6,90,14,156,94,83,101,247,27,173,8,183,110,73,217,197,142,134,250,10,126,10,46,208,180,203,244,210,117,60,43,20,24,41,111,163,245,242,155,176,23,48,82,17,122,60,66,207,47,133,2,236,110,161,172,220,238,173,121,186,27,190,1,93,74,23,4,60,51,28,240,81,237,205,112,13,191,211,249,90,220,150,130,242,153,159,121,153,201,119,149,79,214,251,96,85,19,123,243,138,192,111,107,161,203,91,123,149,134,109,59,199,249,220,16,193,105,142,213,166,235,38,211,105,45,45,16,192,129,39,230,169,139,215,58,29,95,231,226,27,121,6,106,130,76,219,244,28,146,153,8,244,112,125,216,39,40,243,100,210,69,59,149,120,44,114,247,163,208,66,58,92,84,118,56,234,52,94,46,65,213,92,30,115,131,97,219,221,208,131,33,33,0,186,209,227,45,163,2,175,129,60,110,10,22,22,16,234,40,221,
+15,182,216,244,233,196,120,16,142,219,103,207,143,35,76,252,198,86,156,228,34,196,176,90,53,247,186,214,137,105,170,55,152,179,51,70,201,182,239,118,118,197,16,118,145,66,140,187,244,124,150,183,100,73,3,209,41,27,5,123,115,51,95,182,120,195,127,242,78,19,66,12,30,201,190,146,172,177,189,82,121,98,41,189,111,41,117,52,192,47,7,204,156,165,144,60,17,178,224,152,224,1,160,23,7,97,20,200,187,42,237,62,185,109,189,113,27,218,203,24,103,184,244,126,41,2,154,151,253,225,99,153,114,205,156,252,6,171,230,144,230,75,199,199,178,113,240,16,243,18,91,65,33,205,101,13,162,164,59,94,40,62,39,100,187,200,141,44,217,117,178,87,151,42,39,145,153,5,25,120,104,18,3,67,184,120,156,14,0,21,211,1,183,116,20,250,154,139,134,25,138,112,85,74,106,43,251,187,180,244,86,190,158,6,231,153,33,175,63,127,228,91,139,102,153,4,142,208,156,67,88,161,114,226,218,139,175,171,51,27,52,104,86,229,237,84,110,15,16,228,96,154,170,178,35,102,
+152,219,122,43,6,165,48,226,90,180,214,213,201,126,236,111,187,70,106,131,179,44,83,13,199,218,112,88,236,167,213,134,241,235,245,233,218,172,247,143,61,200,252,224,220,146,151,225,97,167,223,209,67,177,209,26,58,7,72,253,217,40,5,67,216,89,185,158,117,17,86,10,206,116,205,115,29,8,77,95,49,231,135,204,182,66,166,94,110,227,118,203,157,24,214,158,230,56,221,241,114,114,251,134,114,124,102,240,68,8,221,124,52,233,56,44,191,206,229,186,250,37,80,174,204,65,42,107,89,186,12,122,222,226,147,143,206,236,48,175,45,92,198,44,246,209,46,80,238,164,143,167,99,73,27,215,211,185,179,59,158,93,133,100,166,215,222,113,223,254,176,195,155,114,23,93,94,218,125,168,35,72,99,88,113,76,134,141,115,238,220,225,108,204,143,221,71,21,81,77,237,132,202,218,213,26,184,74,108,66,216,249,136,219,2,87,172,1,150,91,5,134,145,174,226,61,51,61,126,52,164,249,105,34,235,225,190,190,17,176,239,126,232,105,22,60,201,78,44,104,162,92,150,113,76,0,
+203,206,154,56,94,162,102,187,198,175,102,193,204,28,218,220,37,84,55,40,213,94,80,97,105,75,60,12,229,228,166,77,14,114,228,52,59,49,86,73,164,46,101,134,215,229,165,251,151,213,73,104,91,105,246,205,138,14,110,125,24,238,251,247,119,197,237,16,115,183,197,237,72,148,73,219,54,85,145,205,8,2,178,63,49,177,16,69,95,162,25,224,216,48,206,38,184,91,156,21,224,152,67,74,145,244,57,155,63,135,178,214,213,254,241,138,255,116,189,151,16,150,87,224,203,60,101,188,154,146,224,139,225,64,194,28,216,85,175,203,155,185,71,160,232,125,34,147,220,60,174,138,80,138,180,113,219,50,78,225,146,141,34,170,133,59,168,199,55,220,33,205,199,236,216,123,79,239,22,70,119,15,69,67,126,74,216,87,69,243,217,76,232,42,226,139,129,119,243,181,38,146,77,156,107,203,127,80,145,102,146,98,255,94,156,125,84,82,12,23,203,204,11,214,82,236,107,57,198,174,135,92,58,21,202,226,164,41,242,190,90,115,156,75,71,9,77,81,121,243,0,223,211,66,162,235,
+81,8,52,13,189,150,15,66,111,155,48,199,69,42,182,132,176,15,234,196,217,50,11,103,106,56,10,166,94,125,154,78,71,80,226,101,201,94,150,100,128,184,80,19,54,153,234,107,145,122,28,129,104,228,48,139,162,58,25,125,68,182,51,153,92,115,62,191,191,185,250,74,51,212,179,123,66,173,40,162,142,75,44,31,214,182,107,54,127,169,185,161,198,70,37,168,194,225,8,113,156,159,188,250,155,223,29,161,83,141,51,160,232,239,104,47,113,33,65,39,161,232,211,83,202,219,133,107,125,221,42,85,204,88,119,185,177,101,26,159,209,45,27,29,39,201,49,31,22,182,162,21,174,32,21,154,51,122,229,231,240,82,210,54,32,23,107,245,184,232,90,237,137,92,44,46,52,174,197,173,218,152,81,128,189,35,118,56,147,70,7,151,117,86,243,103,78,179,27,221,233,166,176,67,21,158,182,117,27,166,154,87,93,213,156,116,125,100,99,190,98,42,60,216,167,79,66,46,103,227,216,18,160,139,225,189,77,18,132,152,70,232,220,123,210,37,235,152,254,113,53,176,30,185,26,109,
+133,124,107,247,191,62,250,140,58,137,137,187,51,196,20,38,187,81,143,50,5,16,207,44,174,203,236,215,179,142,60,185,89,139,155,138,125,187,12,186,227,10,148,156,180,24,48,86,114,99,171,116,154,222,199,249,123,221,157,58,22,34,192,21,56,82,145,192,48,18,152,210,141,196,212,110,182,129,231,112,77,45,7,150,193,61,33,186,4,6,145,203,14,23,53,141,216,10,62,71,21,5,57,13,159,217,71,183,5,84,90,93,86,41,91,213,95,171,172,94,213,186,203,253,192,175,6,45,131,118,187,148,80,178,146,182,253,238,214,91,92,62,161,197,173,37,0,42,185,118,44,116,133,31,174,27,251,38,128,176,91,8,140,70,216,39,55,45,229,162,145,192,100,168,239,245,153,233,144,202,250,120,228,112,253,87,181,171,44,114,74,147,68,43,198,35,98,95,139,93,85,107,182,170,172,115,3,121,52,160,24,51,221,238,36,141,159,95,59,14,242,216,177,250,191,183,245,30,173,22,109,233,185,222,95,57,224,230,189,8,95,55,46,24,225,134,241,95,176,91,70,70,178,116,44,21,
+148,85,69,213,169,107,220,184,176,114,216,123,229,156,115,206,57,167,189,114,206,57,231,156,247,202,209,91,66,200,110,24,102,99,50,97,142,249,141,193,24,239,251,126,157,249,24,185,167,210,214,197,156,63,143,221,242,57,66,29,116,164,237,228,44,243,18,106,85,90,77,47,111,111,106,112,2,193,143,123,35,44,153,61,80,162,123,53,10,85,224,182,79,206,95,23,137,164,217,165,77,52,99,90,23,21,184,177,159,165,229,141,11,40,58,161,212,149,179,26,71,53,107,8,74,10,81,147,160,244,102,29,151,110,78,148,226,207,169,140,85,85,50,181,159,187,153,106,181,29,200,252,29,155,9,134,229,126,156,191,239,103,216,247,237,228,78,86,210,31,14,23,191,135,179,197,72,27,101,185,74,24,2,157,113,29,108,196,134,144,92,206,4,213,30,39,221,83,241,226,37,90,132,199,237,37,72,162,2,143,153,46,2,18,67,56,212,6,167,138,230,87,194,202,27,85,25,122,133,57,22,55,215,105,228,121,18,163,64,13,195,165,143,245,40,190,150,126,144,158,35,57,60,241,40,160,
+63,10,170,111,189,100,178,207,167,39,226,170,156,72,72,229,251,88,41,135,127,138,64,22,97,88,100,234,119,31,2,174,18,10,236,26,186,217,67,63,55,245,69,47,235,12,139,16,210,192,92,81,151,34,249,199,42,52,240,95,79,57,220,210,137,136,81,88,197,177,146,61,53,178,87,203,139,238,171,165,104,55,44,158,23,203,51,54,165,5,214,250,254,102,35,70,12,108,169,198,173,254,186,53,113,108,179,33,189,24,81,29,243,225,125,163,69,218,204,154,80,149,42,108,186,230,249,231,2,129,175,220,246,89,117,232,130,217,123,253,28,135,98,157,64,183,43,13,167,246,216,242,118,245,54,195,227,254,88,39,192,21,44,247,117,219,79,198,139,79,236,119,70,42,163,72,61,26,23,83,80,244,94,204,166,253,65,190,220,44,229,35,139,189,167,129,153,13,212,102,57,180,148,207,133,227,159,96,114,153,203,229,228,98,48,175,37,203,150,53,220,163,66,217,28,238,70,132,148,226,254,10,148,219,230,141,23,164,126,218,62,164,164,85,16,216,16,190,153,239,207,119,39,189,248,209,
+19,9,60,190,238,92,141,109,186,239,251,64,252,144,205,142,75,171,152,142,16,51,144,13,105,213,175,59,117,93,97,48,169,11,73,156,241,174,216,153,152,58,64,70,203,219,151,241,57,52,60,139,61,59,208,48,251,50,180,102,252,253,140,31,191,32,178,98,191,205,224,241,195,241,136,234,151,127,62,217,4,215,49,132,147,134,68,150,51,25,139,168,159,22,225,117,152,89,76,154,231,17,84,196,1,170,47,216,3,252,14,60,112,142,167,189,156,56,206,62,231,241,199,17,60,244,89,106,22,0,158,106,154,48,54,20,5,162,6,189,44,4,193,67,244,64,41,195,79,160,37,121,187,48,206,38,60,77,77,248,37,100,135,137,103,19,207,109,1,134,151,157,110,189,242,221,191,90,146,18,15,211,90,194,109,215,109,148,48,147,62,2,233,36,220,3,121,2,123,178,120,246,85,250,216,84,82,55,223,46,94,85,145,199,174,139,164,65,142,21,196,101,25,40,109,234,179,169,20,75,200,146,9,73,61,34,145,71,21,10,185,80,34,119,150,246,106,174,90,168,95,221,162,185,140,104,
+27,175,99,207,203,14,219,50,130,234,149,16,154,195,221,47,128,249,141,38,166,124,217,141,59,179,146,10,101,215,194,153,105,11,25,234,192,20,132,112,115,42,135,230,116,56,202,113,169,198,157,211,210,235,136,107,159,70,164,129,72,154,0,43,154,177,174,225,158,9,208,66,207,103,187,231,154,51,150,170,197,12,54,126,123,240,139,138,212,122,83,106,61,94,173,7,48,199,230,198,79,100,27,32,159,139,88,36,211,21,122,104,196,97,141,192,16,3,19,19,168,190,166,141,108,172,31,139,230,233,83,65,208,40,138,65,37,134,164,96,221,21,101,104,113,38,145,210,21,254,244,119,84,252,66,203,165,242,32,50,157,62,9,38,11,136,52,164,71,107,223,111,9,254,40,150,56,33,147,38,212,33,97,65,100,76,62,49,58,67,36,194,224,249,177,174,48,124,30,188,41,9,22,124,35,145,47,126,19,35,230,159,110,141,165,26,57,144,154,56,82,194,4,162,34,120,173,213,92,222,140,27,38,143,13,132,227,19,134,54,190,172,10,96,201,5,240,143,44,248,206,92,203,47,52,25,
+132,38,211,222,24,50,202,32,51,122,57,148,165,235,202,65,239,191,198,171,137,107,208,26,146,61,223,246,227,44,182,51,135,253,28,63,166,75,88,145,240,83,38,126,106,38,18,123,73,144,115,12,12,67,198,146,32,129,0,34,34,105,44,189,90,58,3,31,244,236,42,158,28,204,69,226,83,201,248,120,195,125,175,187,123,184,94,6,61,23,62,57,82,82,204,155,214,48,226,26,182,33,165,108,243,139,5,3,148,65,163,171,147,125,37,229,179,18,76,43,198,65,13,153,16,48,80,64,136,73,231,161,231,186,114,90,114,51,151,97,225,207,63,142,0,143,112,94,227,189,40,196,60,93,189,154,141,1,175,134,224,246,177,2,12,122,194,77,162,208,249,192,76,217,118,185,27,201,24,179,185,173,199,19,61,139,122,117,206,31,195,44,53,204,20,162,190,114,62,16,137,238,235,171,248,250,163,37,175,151,138,113,82,131,47,106,204,138,136,166,154,191,38,217,171,84,123,181,235,96,82,186,242,45,11,176,199,167,205,228,36,111,79,141,216,54,128,40,122,49,12,219,96,62,189,0,
+26,220,203,96,238,92,115,126,28,7,53,161,176,99,23,6,198,141,126,22,89,242,68,126,149,246,218,40,121,135,214,187,217,230,174,132,83,18,1,130,11,165,31,104,252,178,195,56,249,87,50,19,71,102,63,14,222,132,237,163,208,220,253,36,199,136,53,196,174,2,8,187,229,103,115,179,160,94,144,169,220,173,65,168,38,197,121,181,88,203,114,83,54,8,61,231,126,209,193,223,167,13,159,216,95,167,162,64,101,149,137,228,214,187,100,56,20,180,63,115,113,247,45,121,127,0,206,178,9,182,156,195,5,175,33,232,83,242,243,152,249,10,184,183,57,190,220,183,219,201,145,52,212,135,146,4,210,248,68,148,254,54,255,99,13,76,162,222,234,142,217,152,72,200,23,206,52,147,241,159,237,229,251,86,176,45,99,83,16,183,118,33,140,134,31,243,102,29,77,204,250,226,170,113,13,173,237,134,135,248,109,192,72,5,35,59,174,121,161,115,229,123,29,161,113,154,133,190,117,39,21,202,237,60,114,117,51,0,176,108,241,169,126,69,169,211,133,11,176,215,178,196,164,230,100,37,
+113,166,50,97,33,127,216,71,107,186,155,154,102,51,196,44,12,9,184,153,6,134,83,234,7,172,55,86,89,32,136,215,212,153,24,224,52,81,19,75,155,50,5,163,45,35,170,159,3,139,112,32,95,190,76,34,98,83,64,8,246,4,204,30,240,55,195,35,80,107,24,112,13,67,93,206,30,177,9,137,82,216,62,202,155,79,242,150,245,228,116,109,10,122,192,143,203,51,69,135,89,251,74,172,119,237,60,89,90,153,131,96,20,204,234,197,99,49,232,52,86,97,230,184,43,80,99,72,91,18,31,229,112,182,114,132,59,58,164,169,251,163,252,180,112,149,123,2,127,143,106,104,14,16,205,1,167,1,30,100,254,145,32,191,18,25,226,79,97,126,240,121,203,15,190,85,117,233,101,177,250,102,71,205,107,234,12,134,178,181,219,226,174,91,53,54,119,248,99,218,196,200,180,115,180,117,92,87,153,209,234,188,86,125,247,71,151,102,68,19,29,60,201,132,239,117,45,57,50,146,240,243,125,92,12,165,71,198,244,242,216,110,245,115,116,174,200,169,191,48,29,10,68,18,16,189,
+184,167,35,87,216,228,42,5,28,104,3,59,33,255,126,217,225,250,159,188,36,124,166,115,141,130,122,181,81,130,194,55,210,40,13,84,28,25,22,2,198,10,16,20,251,124,205,184,15,164,94,251,212,107,31,186,107,134,45,220,176,14,106,250,61,78,65,211,62,66,27,103,252,10,242,38,81,136,109,80,40,111,222,216,181,186,177,177,153,36,44,143,198,250,14,246,246,201,176,138,210,100,91,57,175,71,247,253,2,190,219,42,206,211,110,189,156,52,109,181,32,195,229,41,62,31,156,103,171,183,19,184,43,188,152,179,174,223,155,119,232,252,8,143,235,219,84,0,105,85,34,45,74,148,190,164,132,201,175,224,164,160,42,69,213,136,100,231,181,68,142,169,168,91,219,211,253,97,158,221,190,48,34,241,53,121,123,85,135,111,197,162,122,17,63,193,101,232,93,219,61,151,130,42,110,20,93,252,186,108,124,216,67,225,180,43,90,22,70,130,20,38,211,107,0,236,231,17,15,80,90,247,68,239,147,162,182,208,180,2,55,164,145,138,185,112,73,165,165,170,49,181,92,26,227,133,
+165,223,200,231,245,193,88,150,247,106,137,125,235,66,164,233,246,234,187,241,17,198,205,213,57,116,243,227,155,49,242,248,239,10,97,186,153,54,117,220,248,193,237,146,191,176,63,57,121,101,195,92,216,98,239,20,73,68,214,41,182,245,19,111,38,237,94,95,79,219,118,247,93,226,194,234,99,1,40,1,65,244,161,14,187,0,214,178,144,161,138,136,128,41,204,228,216,219,224,235,178,119,101,167,123,119,182,56,105,243,131,214,173,42,131,136,185,102,195,156,63,25,147,236,139,208,208,112,23,143,38,245,118,207,193,238,129,92,240,116,43,51,120,179,143,88,207,78,125,114,243,235,20,104,29,191,9,188,79,249,229,78,197,254,84,181,203,159,156,82,26,230,81,80,249,225,126,80,24,99,34,36,141,248,50,244,170,167,63,208,48,127,219,208,37,77,62,75,49,179,160,110,162,160,111,88,138,93,217,169,12,209,64,132,213,107,39,58,77,159,206,130,9,235,60,224,238,119,139,108,113,66,158,100,192,250,98,73,155,188,144,101,17,248,121,26,16,79,70,142,178,252,73,116,85,48,
+13,80,37,13,162,166,147,5,248,73,105,77,73,27,133,227,166,200,157,169,235,210,14,73,93,8,100,101,132,116,94,36,48,235,182,173,86,213,187,234,121,226,87,142,198,153,110,196,195,132,203,215,216,137,221,223,160,231,102,170,172,246,136,99,229,27,166,190,167,212,83,115,69,99,42,248,14,149,91,158,118,128,255,129,83,51,31,122,99,63,109,47,177,77,214,193,172,125,203,13,212,16,206,194,8,239,68,104,108,7,23,104,221,132,216,165,216,174,16,131,159,91,76,238,58,207,65,140,206,246,87,115,49,247,101,43,229,229,166,22,247,166,110,205,94,57,126,231,62,213,3,171,198,243,212,92,38,169,4,149,184,57,118,222,15,219,125,55,56,39,39,153,79,109,59,61,66,121,239,135,243,163,112,70,59,55,55,120,199,188,196,164,75,167,151,108,170,126,52,243,150,102,51,60,85,47,39,195,179,238,91,227,176,207,212,44,63,25,151,142,155,221,252,3,223,98,184,43,55,245,162,61,85,20,222,113,250,197,249,13,91,51,181,213,69,9,153,242,86,29,114,197,200,107,83,153,
+205,215,115,38,148,243,193,95,211,1,195,140,167,125,197,5,217,114,67,16,166,55,135,200,149,5,11,69,7,3,28,9,79,153,194,145,218,19,197,60,73,94,191,179,250,193,122,225,30,91,195,232,171,167,220,130,166,91,159,79,241,189,162,225,214,92,199,229,227,90,164,61,50,12,207,227,125,232,187,11,157,244,166,225,114,142,237,109,220,220,85,28,100,219,135,145,200,114,190,28,41,109,66,136,208,195,167,101,82,224,140,166,185,109,62,250,195,74,19,17,46,250,48,128,109,198,204,61,147,173,175,9,84,165,251,209,22,156,111,117,217,90,174,239,168,37,239,14,71,5,1,81,83,85,104,10,10,121,251,199,148,95,39,49,250,107,57,210,130,11,210,193,41,129,154,220,147,98,225,95,92,115,230,224,56,128,215,7,204,157,223,241,137,221,250,235,178,68,214,178,109,87,36,164,34,156,113,42,112,131,11,59,129,48,44,64,137,128,87,127,246,113,123,159,92,162,98,113,49,21,58,212,91,172,102,125,141,122,174,209,190,139,51,30,183,125,54,255,78,188,213,148,147,158,146,142,
+40,213,45,45,227,222,182,212,142,175,233,242,222,108,156,159,106,195,55,95,196,126,53,243,177,228,130,55,238,159,181,227,179,62,223,0,211,47,148,113,159,108,70,242,15,100,124,10,35,132,39,175,210,215,54,253,80,12,177,44,51,218,246,53,179,109,23,100,105,125,214,85,41,102,65,253,35,242,249,166,2,179,216,215,155,158,118,45,228,98,155,93,121,227,5,243,61,95,122,27,37,160,197,5,117,16,5,92,48,38,16,181,77,130,181,79,213,141,145,22,209,162,42,10,56,204,226,254,1,57,6,99,230,16,51,102,17,71,205,82,121,200,210,35,213,11,37,205,181,91,212,72,87,178,72,77,222,137,23,84,241,194,93,225,155,147,7,39,18,82,196,214,132,233,36,28,63,249,29,147,126,111,39,50,3,240,147,218,101,19,18,66,42,160,195,37,154,8,206,120,198,153,111,136,103,193,148,190,76,108,18,205,226,152,125,236,243,236,110,93,241,189,115,68,173,56,252,137,37,128,22,101,113,55,194,244,41,191,60,99,177,169,27,89,5,199,170,178,231,206,6,44,210,68,64,81,
+214,39,201,70,11,177,70,208,152,44,202,147,150,203,230,142,49,97,173,15,148,51,60,64,158,40,89,93,219,237,108,197,68,168,248,206,243,117,48,166,146,40,83,20,115,142,91,1,206,113,240,62,22,213,32,19,169,208,184,11,2,154,253,118,59,92,91,3,78,171,211,122,49,254,122,100,202,185,163,170,207,223,184,62,7,181,81,198,0,210,120,210,218,119,72,70,228,250,43,170,254,124,10,12,134,111,99,41,28,199,149,163,209,206,228,87,235,49,20,124,79,249,181,79,238,11,146,121,201,55,110,2,129,99,15,119,190,131,1,20,164,23,190,175,61,220,238,171,91,123,165,23,76,1,38,115,208,173,49,13,106,172,205,86,198,183,178,32,151,140,117,91,204,177,53,66,22,15,42,98,63,251,44,87,55,28,73,96,200,20,33,116,4,162,2,13,46,137,141,90,168,117,81,4,206,90,96,83,101,52,33,141,130,140,161,234,248,16,150,24,67,148,84,49,92,137,243,159,113,89,161,41,150,115,136,134,162,117,62,201,239,171,56,89,228,234,203,87,195,101,43,210,237,180,64,187,
+40,11,85,25,81,191,13,68,169,60,55,2,176,138,122,23,35,90,23,202,0,205,107,17,142,251,148,18,170,0,76,248,24,142,105,107,201,69,9,204,199,94,245,136,232,105,224,226,92,33,8,110,61,226,185,211,129,95,49,159,235,186,0,63,225,135,47,207,45,239,249,73,68,158,27,1,40,21,197,5,152,77,226,84,94,207,252,213,135,39,62,76,69,189,109,34,174,182,16,108,75,171,135,228,185,80,34,156,108,234,174,134,160,18,154,221,89,190,122,5,13,154,92,26,90,26,12,43,7,253,194,54,38,50,69,147,22,205,209,207,120,29,242,10,61,146,152,163,111,72,53,34,203,77,163,165,221,12,218,147,199,223,64,126,98,251,242,129,183,219,123,2,181,156,194,41,43,189,140,114,38,170,105,51,209,110,31,112,162,130,159,165,222,179,244,185,57,165,60,70,69,236,56,187,123,43,119,182,161,53,47,147,29,60,16,2,33,64,64,44,36,103,247,43,43,151,11,120,110,200,33,31,147,249,21,72,254,121,246,65,249,200,147,4,160,3,30,61,227,33,0,160,15,208,67,16,
+213,2,15,93,166,4,126,190,191,38,236,35,247,244,106,78,26,94,236,101,65,241,18,200,100,230,169,199,161,47,198,28,123,99,12,86,42,55,152,167,155,173,148,163,153,15,9,212,219,163,208,43,173,122,171,128,14,218,59,89,195,7,138,102,162,42,107,146,46,4,22,8,170,175,122,131,188,114,14,179,159,159,210,73,181,179,157,12,37,119,17,202,169,133,121,101,246,229,121,196,228,30,79,181,252,81,76,96,27,106,167,175,90,39,134,94,138,92,241,83,173,55,145,164,223,251,230,108,98,38,78,115,226,52,100,134,123,152,248,81,28,219,144,196,162,164,141,201,102,17,63,185,211,254,47,198,157,152,38,166,17,210,40,228,27,146,12,207,88,90,58,231,5,72,76,213,116,88,78,137,30,148,159,205,219,252,74,134,211,101,233,104,113,164,131,19,188,94,219,24,75,93,57,225,67,209,107,244,120,143,37,182,64,201,212,242,99,181,242,113,85,41,178,180,107,156,174,152,208,109,136,25,107,33,105,32,61,51,54,188,252,90,81,179,1,202,155,192,92,234,248,84,136,46,211,10,
+172,185,101,168,122,200,176,50,4,237,243,129,195,180,130,28,66,0,68,138,102,131,14,123,86,94,10,175,218,131,100,197,199,189,157,9,149,2,198,120,57,36,240,21,127,245,138,241,150,225,202,226,92,133,41,14,46,203,6,161,101,62,125,167,231,179,169,17,107,167,202,118,129,227,45,32,20,43,140,110,182,194,17,45,145,56,190,70,163,246,203,208,228,63,111,105,182,46,46,76,97,137,224,239,164,134,126,157,49,27,171,155,137,114,198,157,115,108,118,225,176,189,101,5,196,23,133,176,0,50,231,93,23,1,221,74,65,251,192,155,116,71,166,146,153,56,7,91,214,121,154,26,94,157,250,5,9,123,172,244,239,53,51,113,234,159,30,100,40,104,101,38,244,24,31,39,70,223,16,46,147,103,74,8,220,33,7,109,139,95,14,114,12,200,132,53,67,228,193,136,207,167,118,50,108,64,117,179,66,85,177,240,103,11,59,45,84,72,8,132,39,30,102,22,240,17,146,109,43,20,25,98,185,171,40,118,126,33,107,117,142,17,68,133,139,205,112,68,185,195,98,200,204,171,114,166,
+193,37,202,152,31,149,28,204,57,175,183,11,106,157,231,92,24,114,106,150,142,127,13,196,164,15,13,219,215,1,242,85,52,181,102,195,36,159,94,21,174,232,211,129,124,27,200,80,150,45,236,80,93,238,196,216,193,251,8,215,56,34,238,221,129,221,125,30,21,249,149,182,155,164,54,235,162,65,176,191,166,234,6,159,33,155,222,33,34,219,17,65,80,251,82,157,234,238,223,137,221,87,225,14,137,205,190,190,118,201,241,92,133,100,109,34,118,236,83,234,241,103,247,89,211,65,96,18,130,82,42,40,194,216,232,169,52,144,137,12,64,54,193,48,116,65,48,152,188,132,94,189,32,233,137,180,91,41,101,19,161,150,179,184,183,199,222,33,39,99,181,9,166,35,73,37,29,97,253,118,54,180,188,182,187,159,133,252,160,54,223,200,175,224,46,225,9,214,34,120,107,34,72,131,57,125,167,87,247,211,229,57,57,13,211,114,203,69,184,51,9,45,58,115,0,53,76,175,83,171,248,80,153,186,36,188,189,141,202,34,208,42,120,170,20,25,95,33,247,172,164,72,247,164,64,68,
+142,213,135,26,141,51,74,172,9,70,26,209,108,172,247,165,216,198,127,157,15,124,142,56,68,135,73,84,172,156,250,250,98,10,139,220,137,213,50,1,173,197,221,242,142,110,199,19,229,138,205,246,1,114,222,79,47,177,55,31,115,120,134,240,183,175,157,9,236,240,99,23,11,201,104,46,189,28,243,62,140,162,218,104,190,30,148,213,82,211,199,213,149,183,166,251,83,158,131,22,182,247,128,101,45,165,123,130,2,6,217,135,226,56,199,116,145,131,22,118,50,124,123,54,86,183,52,249,95,108,19,209,133,218,35,11,19,198,160,9,87,218,141,74,238,231,48,145,50,196,191,184,197,71,73,49,168,199,196,15,252,163,215,162,201,54,175,205,164,70,180,171,212,26,45,10,149,42,120,23,220,197,140,166,216,175,167,218,231,206,35,123,239,159,196,189,167,249,193,203,100,230,30,170,135,241,86,46,127,94,97,46,46,236,22,135,62,202,236,48,16,229,222,38,33,34,110,162,60,148,115,89,73,189,228,135,35,148,69,33,5,193,109,132,153,108,153,47,217,219,61,66,91,70,90,227,
+7,116,225,99,64,109,136,198,32,61,227,18,55,106,107,209,182,186,71,185,117,51,205,194,237,76,125,42,149,211,208,24,158,58,187,92,79,114,121,138,197,252,187,129,230,36,34,42,243,93,149,157,147,149,64,91,209,220,84,23,114,18,106,122,60,123,11,22,124,87,198,48,75,94,85,223,56,69,229,124,201,86,128,147,125,138,67,176,112,242,4,11,139,106,230,18,247,7,14,238,204,233,155,245,180,76,153,189,78,152,129,154,140,35,139,147,96,225,120,7,63,168,38,52,219,152,161,233,43,93,183,102,52,114,123,93,241,136,246,189,158,114,175,25,205,237,248,237,82,212,84,163,196,167,102,117,57,44,246,23,195,246,108,24,58,19,174,150,27,245,236,29,32,49,46,119,85,185,246,241,92,173,104,189,143,58,47,21,195,232,34,236,106,102,112,50,21,233,160,176,57,76,9,102,94,253,112,177,81,168,63,124,242,205,66,186,67,88,5,148,116,66,196,82,50,195,97,234,61,4,228,129,113,178,229,58,171,108,190,51,165,202,73,25,124,155,117,215,15,128,43,214,17,249,250,146,
+179,72,146,159,41,170,14,163,130,65,103,144,76,7,53,213,235,102,96,19,76,177,88,148,20,128,60,54,130,51,171,226,107,99,192,140,50,220,54,109,197,94,211,58,43,130,81,104,136,125,192,144,43,6,188,80,230,230,141,209,63,70,57,243,202,50,226,52,28,15,178,247,21,90,50,156,90,39,69,48,241,105,13,36,10,51,246,57,79,66,142,18,255,178,34,17,192,132,32,24,64,40,176,71,215,22,42,209,202,198,159,89,228,163,158,67,60,119,112,46,175,68,58,243,138,56,46,13,136,101,151,179,78,184,199,66,199,92,88,25,106,83,97,153,246,148,126,86,87,19,51,197,2,188,65,112,16,254,210,121,133,176,77,119,45,88,90,65,162,5,118,101,104,180,190,216,187,116,74,61,202,225,123,234,80,110,74,153,225,130,137,198,66,69,24,185,64,215,149,74,48,86,25,198,174,147,161,143,18,28,88,160,218,249,90,194,133,56,25,248,183,211,173,58,180,50,193,5,65,101,22,174,23,22,72,179,74,95,254,244,2,249,128,9,211,231,124,188,205,73,126,157,12,185,238,138,
+162,2,211,40,108,135,72,163,131,197,203,92,71,159,102,123,222,237,125,202,102,199,43,76,219,5,19,137,44,38,121,208,153,85,188,229,145,156,30,52,245,190,236,194,26,156,225,91,83,175,6,100,104,231,83,218,116,3,68,231,57,150,216,55,165,126,60,182,100,84,79,172,69,155,229,97,221,24,254,215,50,248,202,158,161,181,115,77,173,197,43,78,46,161,243,209,139,31,87,17,18,138,102,28,14,143,135,167,250,40,178,40,18,67,173,169,224,5,124,171,45,145,198,38,246,182,116,88,35,193,165,88,111,216,97,202,118,176,241,46,133,75,75,76,121,77,200,228,56,15,221,196,118,186,111,170,131,128,22,186,135,79,18,201,113,2,67,78,150,216,85,153,219,90,235,108,103,138,220,205,149,88,239,183,226,208,230,203,25,163,160,140,113,17,177,112,205,73,141,1,245,250,11,94,147,66,26,33,131,65,13,158,78,102,182,65,93,36,146,135,35,184,113,117,13,248,206,193,29,10,228,229,254,47,127,33,170,65,22,58,198,125,94,39,5,187,32,115,229,100,247,224,232,207,62,49,
+191,252,116,6,31,212,170,60,133,75,124,171,187,223,234,117,4,102,117,210,149,54,118,69,110,49,86,140,110,57,114,227,22,80,49,46,60,166,110,139,239,170,169,99,29,68,93,158,68,132,135,38,8,155,145,163,135,36,63,125,109,79,46,227,80,78,194,137,192,221,119,92,125,64,96,183,106,197,189,224,217,31,181,18,20,201,184,98,93,177,185,206,91,56,212,126,210,110,94,211,119,115,125,121,181,162,253,202,51,251,72,248,226,159,26,97,137,64,105,175,91,241,87,56,21,7,199,237,162,76,223,62,125,144,215,20,20,75,244,157,61,79,122,243,30,177,189,204,164,73,155,245,66,54,86,242,8,88,93,145,97,229,94,129,190,94,200,248,233,181,129,124,10,66,236,218,71,122,197,114,30,126,27,199,239,31,15,226,117,216,153,78,132,86,157,234,133,52,148,29,104,99,1,227,16,227,188,27,9,109,40,222,226,6,26,22,166,242,156,42,39,28,100,225,18,44,70,95,146,77,82,178,76,242,69,179,81,238,60,201,30,164,5,185,67,94,124,14,249,140,181,161,228,37,191,8,
+58,250,203,132,121,25,226,26,159,2,180,226,38,53,167,97,86,163,143,81,145,207,173,116,187,29,176,90,85,192,72,252,121,168,228,37,54,133,171,55,207,132,60,54,123,126,163,187,54,146,34,87,158,134,170,219,6,223,233,82,171,142,104,207,204,157,201,30,152,233,43,239,95,229,159,139,43,241,88,51,56,159,101,200,127,113,232,63,225,129,158,135,115,111,204,123,219,230,66,158,235,103,214,26,85,227,142,72,31,214,207,152,103,192,152,191,36,213,216,125,175,75,90,32,43,7,97,14,255,20,245,250,94,250,107,7,108,58,249,83,253,89,184,17,183,83,213,68,242,193,160,229,41,132,131,215,34,119,235,229,51,161,153,255,125,244,11,11,28,90,4,172,175,5,132,252,154,145,127,77,240,35,118,215,246,241,21,4,146,100,2,46,151,33,29,207,68,200,173,62,33,219,46,229,209,44,2,254,29,48,177,247,86,161,39,198,65,149,40,220,154,199,36,182,37,181,28,48,209,88,169,93,188,195,112,254,216,235,49,146,188,119,157,18,212,125,134,240,67,69,45,115,23,9,189,87,
+118,19,22,246,186,201,251,222,231,115,148,47,223,74,80,137,250,131,145,248,34,63,19,246,86,182,134,92,8,72,195,149,134,181,20,179,230,66,4,3,146,235,249,75,96,0,111,14,212,161,45,77,51,17,92,35,35,178,152,155,111,1,235,158,140,91,49,188,22,44,168,250,208,190,228,37,32,190,233,160,173,61,229,227,68,190,48,33,158,235,220,119,157,241,1,23,137,179,63,122,41,115,214,196,202,64,206,81,49,216,71,138,27,97,232,53,79,243,166,89,180,186,106,82,171,169,26,232,112,96,16,216,190,60,46,95,139,5,65,207,208,21,2,201,76,30,178,184,6,143,78,126,14,202,219,190,127,208,238,207,140,0,222,163,195,239,243,187,234,16,145,56,44,236,126,98,231,162,169,167,79,246,234,155,9,101,127,15,239,254,218,37,25,230,213,184,1,236,208,40,23,128,192,68,176,189,198,109,226,252,128,46,33,253,21,252,28,7,217,66,131,26,137,255,134,49,10,153,111,228,53,24,163,73,196,113,141,129,187,247,239,203,125,191,161,2,230,236,159,35,98,69,143,55,34,120,
+225,28,23,240,162,134,185,167,79,113,134,94,0,141,148,229,202,33,253,96,80,96,228,114,90,104,115,35,194,117,203,54,82,11,14,23,87,179,43,67,209,106,82,218,227,16,18,110,55,151,148,129,157,125,122,108,36,193,111,46,114,98,233,191,51,79,144,91,134,210,27,242,161,134,242,218,201,74,68,181,151,127,95,77,79,60,226,238,185,1,28,186,85,65,135,17,60,84,124,102,90,166,221,186,94,5,96,87,168,32,23,173,7,250,252,104,125,118,192,130,230,33,96,71,212,199,189,127,221,57,33,33,102,48,196,75,183,184,2,193,218,45,139,78,145,89,211,99,253,154,140,19,169,241,66,146,146,20,200,18,54,246,130,25,194,103,6,188,19,237,211,204,203,149,226,230,195,201,105,246,212,64,106,134,253,158,155,0,114,163,33,233,111,80,51,199,74,33,12,198,124,47,15,4,167,11,253,41,163,252,88,96,246,122,26,230,40,65,42,225,126,193,177,136,104,224,58,29,242,205,100,42,8,59,193,39,216,139,251,15,81,200,139,73,38,36,177,130,49,170,242,19,156,3,80,244,
+202,143,68,109,72,223,201,100,165,178,13,62,196,39,51,20,206,240,215,131,73,78,159,152,210,32,163,106,17,164,234,3,117,12,215,39,230,178,12,33,23,240,28,83,150,91,221,70,41,34,119,18,116,59,185,148,159,134,178,39,168,220,151,56,51,95,78,6,129,106,88,121,141,3,92,91,214,78,234,208,37,87,191,64,17,94,129,201,53,53,75,42,216,130,124,153,46,34,157,78,216,240,248,209,193,158,49,188,103,222,199,4,193,203,96,216,136,74,226,161,121,36,107,78,151,37,254,201,217,197,88,20,136,198,60,219,152,127,233,156,12,29,245,72,82,79,210,40,169,37,188,34,88,191,6,218,242,194,43,140,71,16,159,238,46,220,222,74,68,214,159,71,175,251,162,234,77,125,223,196,15,101,106,220,47,23,94,214,196,151,60,30,88,171,228,129,73,238,78,156,221,20,7,146,165,185,170,172,64,119,180,146,122,30,143,18,193,248,87,101,35,167,203,176,205,99,124,7,58,168,117,114,233,153,206,158,123,189,240,5,143,56,157,5,72,104,103,3,191,87,218,165,52,103,133,24,
+231,150,148,156,181,74,169,142,243,93,92,50,37,202,207,231,182,40,2,159,228,251,112,250,113,125,221,75,46,251,136,91,180,110,200,215,29,2,155,144,252,211,18,110,25,22,210,118,140,224,186,10,134,63,65,208,39,80,15,79,241,4,18,94,207,66,204,118,191,58,89,77,100,237,230,72,205,29,216,49,92,150,94,251,109,253,166,52,65,43,207,198,49,94,135,231,178,145,108,74,66,131,253,84,222,131,134,61,119,212,198,37,122,241,194,237,145,175,124,61,142,154,221,26,202,5,101,150,41,199,230,251,28,223,64,95,64,205,14,46,35,162,231,73,162,11,82,22,25,5,132,86,26,184,48,67,243,35,51,244,118,164,70,135,102,232,22,45,198,177,189,31,86,176,194,10,254,200,92,36,31,25,181,25,49,34,74,154,33,246,74,83,142,195,20,240,222,73,60,209,31,226,4,140,39,101,176,50,31,71,96,103,119,106,63,198,34,239,119,208,179,4,215,186,223,194,21,109,22,38,227,97,88,186,244,238,223,194,68,52,204,170,24,136,4,102,86,182,27,173,168,46,76,0,47,255,
+237,140,180,192,115,157,101,255,141,63,80,194,25,169,57,236,121,4,249,54,22,13,210,46,98,191,141,152,20,156,29,23,215,42,166,224,197,236,22,156,75,89,73,242,64,73,162,173,28,21,234,136,57,156,207,76,147,165,68,170,120,30,174,34,139,202,202,32,47,193,36,58,45,133,185,2,73,163,50,107,154,155,220,16,14,53,155,254,120,4,242,216,197,71,98,150,73,213,153,41,57,87,53,103,22,95,78,151,203,194,99,231,235,20,76,102,219,184,115,42,31,115,202,218,211,158,143,69,26,95,32,194,2,70,159,21,222,145,186,222,72,189,179,183,226,181,42,212,67,94,166,49,233,8,184,60,150,66,152,84,25,50,188,192,89,22,251,242,152,187,135,76,142,106,173,78,28,75,53,64,238,226,141,22,105,17,61,57,145,208,83,99,198,59,101,172,51,227,182,58,121,222,36,147,134,7,193,203,55,35,46,191,38,250,240,232,140,192,150,165,116,203,136,5,94,164,189,134,234,245,148,17,204,250,254,6,179,221,0,168,183,7,201,176,104,249,186,197,210,219,244,252,204,31,61,178,
+49,36,229,27,30,73,244,177,35,136,128,109,167,110,101,140,229,154,214,117,194,1,109,180,96,95,1,218,23,118,199,83,230,108,40,137,8,11,198,23,73,109,0,252,238,71,77,237,51,105,230,242,22,106,137,56,15,223,114,166,58,129,21,180,44,24,187,235,200,235,167,249,213,251,198,24,147,41,103,36,191,211,222,12,206,64,194,135,66,232,186,214,192,152,80,125,178,233,88,159,243,219,253,124,92,38,154,73,175,223,223,159,63,12,219,232,58,100,75,16,147,218,58,66,114,245,215,204,187,34,171,99,144,17,212,72,122,101,114,33,32,161,175,205,219,198,91,129,181,55,115,42,222,78,180,221,121,81,187,186,222,251,234,4,158,101,76,32,24,150,201,243,202,3,156,123,134,71,19,41,46,159,46,30,170,217,181,18,74,191,103,196,172,152,224,233,88,12,183,205,148,34,10,95,92,190,147,234,146,236,200,37,76,225,52,98,133,214,95,4,199,74,253,120,75,242,131,10,118,53,138,66,199,10,106,157,233,99,63,115,117,62,183,128,146,112,227,199,237,218,81,24,254,88,164,57,
+187,31,229,218,9,34,99,129,158,80,234,26,205,229,220,110,173,29,158,172,107,228,124,222,110,209,4,85,201,201,39,142,53,170,39,78,204,140,131,156,103,22,247,148,155,131,10,142,235,41,79,118,88,24,107,141,207,59,60,124,115,15,128,195,224,81,87,90,123,7,7,158,230,187,240,199,99,119,242,102,182,222,47,220,26,190,13,154,202,174,80,50,200,230,200,63,73,200,148,25,237,150,99,66,162,230,167,125,196,152,190,124,50,200,18,143,57,34,50,95,206,150,248,42,53,92,145,114,62,10,101,139,86,154,247,243,135,113,255,241,254,230,82,168,69,18,85,101,174,148,14,197,10,90,238,154,178,52,139,123,189,214,112,20,26,142,108,237,233,168,230,77,143,225,8,155,23,42,174,145,210,231,88,78,78,32,201,174,232,174,79,94,107,176,12,79,7,133,166,67,97,175,157,123,136,178,95,206,213,94,160,174,245,119,178,126,70,82,144,255,217,53,239,135,168,39,254,20,19,240,62,176,163,200,25,203,101,122,17,201,76,63,73,151,131,111,230,59,232,57,24,189,232,107,230,96,
+108,128,212,109,178,95,69,22,172,200,77,226,90,46,177,201,37,250,187,204,235,87,12,123,219,210,103,108,14,125,197,67,153,234,60,3,54,125,160,108,206,79,208,137,12,251,156,253,248,201,248,251,208,53,218,111,51,160,227,44,173,222,137,160,100,31,4,72,7,191,85,130,154,21,235,151,97,190,134,78,201,185,12,2,25,2,129,19,141,255,64,249,56,119,188,76,83,63,100,216,246,166,49,0,111,18,117,66,6,155,141,28,191,215,51,113,216,119,119,184,228,196,83,193,66,10,219,87,90,233,145,205,149,99,200,105,239,180,246,211,178,62,8,190,109,184,61,186,176,135,160,131,22,2,102,131,248,237,216,215,229,98,243,242,65,141,47,84,31,30,134,68,82,161,160,40,24,28,5,217,33,114,40,72,141,72,55,94,132,189,67,35,182,69,248,221,123,53,188,249,8,211,186,206,250,76,108,99,167,199,180,29,31,190,250,245,32,113,183,197,64,174,116,137,36,188,195,243,15,137,110,154,106,5,120,8,141,3,198,233,197,192,31,254,103,147,216,54,132,77,35,219,49,150,137,196,
+136,51,172,252,42,140,133,211,18,146,218,221,109,160,193,225,77,253,221,227,205,85,14,219,193,167,74,206,199,196,89,181,131,136,188,77,105,219,183,113,230,167,104,227,163,148,105,193,156,226,45,31,170,8,25,32,141,149,124,214,82,87,107,46,118,181,37,220,134,253,5,242,204,191,178,104,205,114,40,101,42,232,136,78,202,14,154,195,125,199,170,140,245,180,164,113,80,235,143,72,39,159,200,137,12,34,50,14,155,114,193,13,162,3,94,105,224,198,228,243,229,0,156,178,194,155,44,235,69,154,47,204,193,137,100,74,118,184,170,241,183,45,36,52,192,174,88,53,216,243,22,60,0,76,251,104,244,166,110,199,166,207,249,200,105,45,165,188,44,213,247,81,7,82,178,22,54,66,34,76,29,135,219,0,215,157,20,7,233,249,163,83,114,171,134,21,63,233,200,32,180,251,160,67,4,22,34,139,227,195,162,215,93,137,161,90,83,249,186,254,250,86,110,118,125,88,8,175,184,214,21,210,226,31,104,126,31,128,115,139,194,73,150,84,252,45,67,200,93,251,56,75,211,139,50,240,
+250,30,209,181,230,199,232,199,209,209,153,61,58,90,72,244,114,88,198,142,129,215,178,135,99,13,136,55,14,217,170,143,73,99,85,145,39,63,241,202,105,134,189,18,34,131,148,102,78,35,120,56,95,95,14,106,159,189,254,40,86,255,152,183,37,161,140,173,78,100,238,164,228,103,70,40,191,212,21,4,173,140,149,93,146,162,21,114,12,112,250,16,221,161,239,136,129,28,95,149,12,68,70,103,134,97,112,157,176,48,43,64,28,136,161,208,25,185,231,171,7,117,24,164,76,117,70,220,46,92,48,229,181,13,84,135,61,211,215,28,129,217,33,224,245,83,230,144,71,30,11,170,97,74,207,208,232,55,153,184,157,64,84,101,66,83,104,107,151,181,223,199,25,221,49,196,247,157,174,247,171,20,90,127,6,247,166,87,213,192,90,110,194,22,104,41,117,180,200,71,77,236,50,21,208,188,46,162,85,239,28,13,18,5,102,238,232,101,213,126,27,137,31,129,233,235,53,237,128,66,4,95,216,16,187,104,84,92,125,19,75,194,10,141,173,72,225,59,107,242,43,72,223,118,86,14,
+218,85,152,253,224,122,87,165,193,201,38,0,194,3,74,161,57,160,88,38,44,168,154,223,224,73,48,8,238,238,87,55,238,41,219,243,69,98,203,175,92,167,71,83,126,178,201,38,107,6,94,145,160,90,124,207,41,226,30,34,1,178,51,179,132,180,189,203,134,162,172,26,164,30,135,226,96,171,46,172,195,138,181,11,79,233,191,203,165,107,3,222,28,102,49,181,158,50,149,255,162,78,248,8,99,21,5,115,73,187,247,47,224,42,32,239,222,99,192,149,16,140,50,229,252,205,74,240,171,46,231,179,138,56,76,79,177,231,193,79,101,64,207,49,243,183,206,254,230,212,148,227,212,167,216,22,135,134,227,104,43,109,148,186,138,27,8,51,176,25,48,146,59,40,9,152,151,72,225,54,23,223,227,132,118,166,119,12,193,103,186,248,78,211,185,121,149,86,217,170,42,109,234,92,118,186,193,232,190,53,103,37,185,41,77,232,165,128,233,106,66,68,187,22,146,26,128,9,115,210,68,23,86,47,38,105,62,232,147,107,133,255,225,52,177,180,99,174,155,130,140,140,166,117,159,168,
+78,103,50,103,170,240,38,153,126,176,136,116,75,92,24,233,35,115,178,160,31,148,215,178,211,113,50,180,240,209,35,237,185,203,61,58,232,5,46,59,139,105,106,122,238,159,0,211,42,56,155,230,65,26,251,8,226,198,165,231,206,88,209,188,192,196,126,26,199,74,1,189,212,171,72,39,163,165,98,52,206,147,134,159,79,31,40,31,67,202,94,154,12,70,212,121,117,156,156,7,54,2,99,92,92,161,124,173,94,57,7,82,36,227,28,171,121,153,221,28,141,141,40,18,18,228,13,229,162,174,93,67,204,4,11,171,185,178,117,30,199,107,174,18,131,133,232,162,21,14,11,237,207,142,41,153,114,181,77,24,63,218,21,178,75,69,206,251,42,37,215,176,175,68,207,71,218,241,179,0,189,60,18,248,181,0,97,195,11,125,135,202,152,119,174,136,116,39,82,144,61,29,170,76,204,181,195,88,94,94,111,230,216,67,113,57,69,239,110,48,180,119,203,227,69,238,33,141,227,151,132,38,99,52,89,153,248,168,147,201,181,190,188,147,123,128,77,158,14,245,226,140,231,158,1,163,
+51,120,116,62,129,152,187,176,213,196,136,175,156,68,175,122,173,72,4,78,46,20,69,59,142,181,40,119,189,81,166,227,63,38,98,3,103,57,108,113,242,31,212,202,231,101,80,248,118,63,133,126,53,27,44,214,222,246,228,248,221,144,104,143,73,217,147,87,113,163,214,154,118,106,197,126,88,150,162,183,65,102,152,217,230,135,57,80,55,198,27,199,188,15,245,71,37,50,9,106,109,94,64,40,141,104,138,41,254,135,42,226,131,47,110,197,167,221,186,156,164,202,1,255,38,97,122,103,223,4,47,50,216,17,249,217,37,123,25,13,254,138,176,223,202,112,159,234,170,72,67,149,3,251,115,118,255,8,137,195,2,71,32,198,47,120,240,60,137,224,214,44,228,2,248,82,37,178,240,80,216,143,162,206,43,113,183,120,252,154,85,50,125,157,67,172,83,168,213,106,105,251,231,162,116,129,180,78,24,71,183,153,89,83,219,221,223,245,190,89,123,86,116,91,165,217,253,161,252,138,64,103,117,34,192,13,141,40,243,216,17,31,202,77,118,89,221,174,234,184,195,181,60,235,251,165,
+201,62,119,108,150,123,247,165,40,8,106,148,73,157,215,247,6,49,202,225,212,236,74,72,236,155,17,184,153,71,239,60,28,172,215,195,130,89,18,252,59,143,26,196,41,57,48,75,144,34,245,46,100,140,53,81,195,229,60,173,38,107,47,221,104,128,170,5,113,188,207,39,77,77,20,141,85,187,21,187,240,40,237,134,180,171,136,92,175,155,178,206,72,26,4,20,77,104,59,26,124,230,237,31,176,197,122,66,182,170,93,113,25,23,155,110,73,164,184,36,95,232,1,79,159,125,107,110,69,125,114,136,97,127,130,18,236,227,117,11,201,3,94,152,35,151,19,38,205,170,105,16,17,3,229,26,74,72,189,253,14,221,189,33,27,89,46,131,133,58,180,142,167,32,105,54,24,239,156,24,14,154,10,103,142,84,156,145,55,6,10,170,150,244,79,167,65,31,67,236,167,137,218,62,70,216,183,70,68,148,77,42,228,150,6,159,170,73,8,76,21,5,202,87,66,142,89,131,184,151,171,132,58,134,248,212,78,18,167,202,79,116,11,81,201,11,14,75,134,178,222,101,184,155,3,54,
+74,243,105,204,2,238,174,227,181,222,16,56,198,41,164,24,43,45,14,28,107,19,228,190,151,97,74,148,135,62,38,34,100,21,238,29,52,244,13,213,28,7,228,76,6,15,142,228,209,67,94,71,123,116,176,243,71,92,102,148,96,164,141,221,39,248,118,102,113,235,213,155,94,78,169,193,38,146,24,222,22,61,95,173,118,91,27,247,103,116,227,27,118,172,221,125,150,246,30,208,10,239,192,228,181,193,121,87,3,183,247,133,214,186,60,35,179,13,79,61,239,243,114,247,67,175,153,66,3,76,119,60,93,243,67,247,90,64,64,194,154,109,182,236,45,123,255,24,167,68,50,38,187,6,180,81,205,67,201,46,66,17,34,241,21,177,235,42,106,210,222,19,27,39,200,124,150,126,226,76,135,46,181,236,68,90,121,184,83,137,29,14,121,205,161,44,15,43,93,22,125,209,233,55,193,58,253,51,74,50,123,166,184,121,118,170,194,85,233,193,12,141,205,213,248,126,188,79,226,107,82,89,48,70,208,19,41,83,229,245,230,116,151,206,222,161,223,148,171,177,64,192,142,132,71,13,
+253,180,56,84,111,251,209,230,143,81,7,125,144,90,69,87,142,36,112,168,234,121,108,200,125,157,125,168,87,136,134,222,49,23,36,241,211,154,170,183,113,103,155,218,79,239,19,232,238,151,115,142,166,59,42,16,239,93,253,249,101,102,128,69,184,7,232,188,183,251,130,117,48,144,58,108,197,115,131,30,143,192,236,93,68,0,186,81,94,245,77,219,22,33,213,228,240,45,242,7,135,6,209,93,174,37,112,45,162,201,161,45,30,31,194,19,76,51,148,98,126,60,76,28,186,200,201,60,14,53,134,41,140,191,175,229,47,64,239,86,22,9,166,123,124,129,112,210,235,21,178,101,169,233,28,231,10,249,37,142,168,21,71,47,24,116,188,31,1,160,67,129,217,29,243,170,7,229,194,32,76,165,230,104,46,98,162,189,157,103,116,238,240,171,217,10,105,183,144,31,151,119,13,151,94,239,140,89,81,180,42,135,180,179,24,227,179,195,217,40,72,83,126,6,55,23,178,48,149,120,59,168,28,246,75,251,167,237,228,146,108,146,226,105,118,92,56,141,242,39,241,44,123,146,224,204,
+27,130,241,216,151,193,5,15,172,18,150,195,64,13,105,136,43,175,53,70,43,179,32,132,105,24,179,128,87,210,106,53,64,236,13,219,211,46,11,191,51,194,17,255,66,42,241,110,197,157,115,49,21,5,44,178,94,219,110,227,131,145,198,162,61,92,150,234,84,205,102,231,208,156,199,225,169,0,79,61,176,59,241,128,173,135,129,191,54,137,80,64,97,207,24,101,81,212,172,216,12,53,222,175,245,224,61,157,198,31,29,178,138,91,245,162,54,11,232,172,23,27,70,40,97,63,105,18,3,224,185,249,36,145,204,32,127,95,97,233,33,241,83,55,28,73,135,232,225,173,22,109,195,138,182,210,1,72,101,90,30,92,159,53,169,249,122,33,120,15,230,197,66,112,236,158,210,173,219,0,184,225,6,49,42,63,117,226,29,66,123,182,174,148,220,139,88,4,180,140,188,159,81,226,84,62,178,188,66,154,90,26,238,161,141,222,147,37,15,143,124,207,46,211,181,74,248,106,123,190,196,57,224,27,213,215,41,215,5,149,208,207,30,227,165,91,125,204,131,112,88,39,2,220,16,207,
+223,102,9,31,75,244,63,83,219,232,55,171,159,165,193,250,170,138,46,136,90,105,253,5,145,5,164,61,121,206,208,160,225,3,191,173,191,137,239,154,139,46,32,240,64,223,21,74,197,107,41,187,189,212,20,102,116,243,71,117,52,188,26,40,189,228,163,16,28,79,165,255,72,196,253,89,145,81,143,122,160,132,52,114,234,130,233,121,130,186,1,19,15,220,116,85,86,31,34,237,21,76,73,241,6,27,2,203,128,65,222,252,205,16,118,79,159,107,36,41,157,121,151,111,201,102,163,246,156,92,71,72,210,5,220,88,30,250,177,123,208,187,230,221,207,152,189,2,31,133,248,75,181,8,150,93,218,137,206,91,215,204,60,149,175,116,223,155,15,220,119,227,169,85,76,248,90,89,119,85,204,121,43,165,236,105,238,177,190,206,188,141,236,222,174,193,129,14,35,120,55,129,35,243,169,194,26,152,109,151,239,56,142,195,195,140,142,209,43,55,22,220,158,164,22,43,192,193,226,3,108,206,129,175,48,169,63,50,70,236,252,78,164,243,81,135,16,251,177,125,216,145,132,36,35,47,
+57,131,194,89,15,193,190,58,72,63,236,8,200,17,90,59,223,107,38,207,147,73,111,0,7,69,117,85,47,232,51,5,198,30,67,17,225,86,23,67,248,97,36,18,252,41,33,129,228,98,14,105,24,215,190,29,214,119,37,176,54,105,176,55,43,130,91,90,164,230,80,157,67,162,7,170,115,216,182,135,116,55,215,189,122,139,150,65,208,198,161,123,29,124,164,58,95,225,24,22,58,177,240,191,225,29,54,109,192,199,197,43,64,74,32,127,164,95,70,243,66,132,79,52,105,144,195,222,113,29,75,12,150,167,45,244,177,194,37,86,109,170,133,118,109,172,190,45,185,195,196,43,24,95,87,210,8,192,156,210,54,212,90,56,72,157,85,155,185,210,163,159,59,97,103,169,104,153,88,41,9,166,224,235,43,14,128,245,50,253,251,103,235,102,91,15,124,11,125,240,18,123,61,144,64,191,202,164,207,182,68,173,170,1,127,151,26,204,175,219,240,45,109,208,98,184,59,133,219,229,202,238,48,93,90,163,214,168,95,156,247,187,190,179,120,5,150,193,35,182,43,184,147,48,39,244,
+204,16,18,58,33,81,212,20,150,90,35,238,169,42,121,107,18,27,185,14,186,174,203,239,215,227,41,96,124,204,9,26,96,25,44,54,186,244,82,2,114,117,197,202,95,158,132,83,231,253,102,1,158,96,56,3,194,248,26,173,115,60,10,30,33,2,233,167,61,208,124,120,188,31,195,235,38,65,78,24,67,224,108,223,151,141,251,147,208,28,155,154,194,81,85,116,244,172,194,206,45,31,223,18,231,194,2,163,143,71,88,9,136,157,20,222,93,113,253,184,74,150,185,188,53,221,219,107,157,149,140,144,194,81,53,6,17,37,153,59,126,74,80,123,183,247,220,221,194,248,45,149,95,13,66,207,82,165,160,188,116,210,33,113,147,237,196,152,222,152,101,205,3,170,89,64,171,212,176,1,103,73,0,43,128,196,219,145,89,159,162,125,101,180,1,135,136,54,3,218,99,245,173,1,162,78,89,12,136,78,201,124,24,69,18,239,69,196,211,140,1,9,184,105,213,159,229,183,214,45,133,110,239,194,115,90,5,235,58,232,144,189,78,231,16,24,140,54,175,231,251,232,152,62,190,59,
+212,204,179,53,232,220,164,82,79,42,170,125,213,122,169,79,136,72,201,44,4,8,128,97,60,112,106,113,5,93,82,179,33,161,190,143,40,66,14,253,99,237,49,107,76,193,5,17,223,218,218,246,66,99,122,23,249,247,245,76,217,128,163,128,103,244,101,177,209,0,218,123,231,85,241,124,30,238,198,55,245,233,243,69,73,221,103,226,121,7,144,154,65,64,29,254,146,144,185,133,211,41,117,218,56,122,239,168,226,61,244,238,185,215,20,244,186,137,144,139,208,191,249,155,255,250,95,255,5,53,248,223,253,245,255,240,239,144,194,127,165,49,254,255,62,252,159,255,233,119,127,254,229,239,254,248,199,223,255,238,239,255,238,183,223,253,225,159,127,249,203,159,127,253,243,47,255,235,255,135,106,248,151,63,254,241,111,255,234,207,127,248,203,159,254,254,215,255,227,15,127,250,199,95,255,246,175,254,249,215,223,254,183,95,254,151,223,255,246,187,255,243,239,126,251,245,111,255,195,223,254,135,191,249,229,183,95,255,254,159,254,249,15,191,255,195,63,254,223,255,6,128,252,247,175,252,
+59,238,240,191,249,253,127,255,159,255,250,79,255,233,63,253,191,236,196,127,45,224,127,252,253,239,127,249,211,239,254,241,159,126,251,243,47,127,250,245,207,191,254,233,191,252,250,15,127,245,203,255,244,135,63,254,238,159,255,241,63,254,242,15,191,251,243,111,127,250,221,255,254,151,223,254,21,28,249,167,159,226,254,229,230,255,250,221,111,255,244,135,191,252,246,203,223,253,242,95,254,238,247,191,251,135,95,126,106,255,23,146,228,47,63,51,249,135,95,255,248,167,95,127,102,242,51,200,191,45,195,127,251,215,255,70,121,252,229,111,254,31,65,81,106,104,
diff --git a/examples/HomeBudget/src.tpp/About$pl-pl.tpp b/examples/HomeBudget/src.tpp/About$pl-pl.tpp
new file mode 100644
index 000000000..741209f2d
--- /dev/null
+++ b/examples/HomeBudget/src.tpp/About$pl-pl.tpp
@@ -0,0 +1,105 @@
+TITLE("")
+COMPRESSED
+120,156,148,187,247,175,68,203,150,22,246,175,92,9,140,140,193,51,247,94,238,11,243,158,144,6,107,176,133,140,61,210,48,8,89,79,15,207,51,243,128,49,3,131,152,135,71,8,25,117,60,157,115,58,157,211,233,156,115,206,57,167,115,58,231,156,115,159,206,221,62,99,97,11,75,200,150,151,118,237,210,150,170,190,85,171,180,106,213,247,253,176,127,241,205,95,253,171,223,254,205,111,255,202,183,255,31,246,179,223,251,245,63,253,213,191,253,211,223,252,242,23,191,249,254,119,126,244,243,63,248,221,255,242,251,159,254,214,119,223,255,228,183,190,255,209,143,254,250,79,191,64,190,251,155,223,253,149,239,191,253,238,187,223,249,246,111,253,244,135,223,249,238,199,223,254,240,195,119,63,249,225,251,31,255,244,251,175,238,219,31,126,244,183,190,251,201,119,63,251,195,63,249,205,159,254,250,151,191,248,127,76,254,154,251,253,223,252,254,175,252,232,167,223,253,232,187,159,126,255,227,31,126,248,209,79,127,242,211,31,190,253,254,119,126,248,241,239,124,185,250,254,219,159,124,247,
+221,247,63,250,225,103,127,255,79,254,213,191,248,229,47,254,253,255,252,191,127,243,139,111,254,253,191,255,238,47,23,245,79,191,253,249,63,255,238,231,127,250,219,223,255,248,223,124,181,223,252,246,119,63,252,47,95,237,11,253,135,159,254,245,63,248,254,155,95,252,249,119,63,255,219,127,227,203,241,55,191,248,47,254,238,255,248,95,255,195,127,240,205,127,243,15,127,47,228,248,187,127,248,205,239,253,254,255,240,251,255,232,127,250,230,127,251,173,239,126,235,219,95,254,181,95,254,226,207,191,253,249,223,254,131,191,241,221,127,50,242,191,255,179,127,249,175,255,237,111,126,253,111,254,236,47,126,245,205,175,255,226,79,254,248,215,255,234,159,252,175,191,250,230,47,254,221,31,255,234,55,255,34,96,248,139,111,254,248,207,254,229,159,253,197,191,251,39,255,252,151,191,252,217,207,126,247,251,63,248,246,155,191,196,248,211,239,127,244,227,159,255,135,255,240,31,190,251,238,71,223,255,252,135,111,190,128,191,86,250,147,175,32,126,246,253,79,190,253,209,215,106,255,217,183,63,
+255,207,13,252,191,156,254,157,127,251,155,63,251,55,63,251,230,255,175,253,199,8,254,244,135,159,126,251,243,63,249,238,71,223,254,252,247,191,253,207,128,255,222,175,254,213,159,252,250,79,191,2,251,243,255,183,241,255,213,63,254,231,191,249,205,191,254,163,159,253,209,111,255,209,111,255,241,63,251,243,63,250,173,127,253,171,127,242,245,250,211,127,252,159,0,253,189,255,238,239,253,225,223,249,251,223,252,131,223,255,111,255,240,31,253,157,63,248,187,255,17,238,135,111,190,182,226,255,140,238,155,223,253,221,63,249,151,191,250,103,191,254,217,79,126,248,91,127,237,199,63,250,49,0,124,4,76,0,255,183,157,96,172,57,27,250,94,159,172,236,234,146,221,192,198,190,117,7,214,55,107,176,17,95,151,224,68,200,81,18,226,73,141,72,169,52,238,93,227,240,202,50,124,41,196,67,222,240,81,56,62,43,138,251,89,52,125,28,6,117,59,162,153,227,37,147,174,59,210,213,227,112,179,183,239,150,135,218,115,80,189,150,176,41,206,229,57,189,182,86,180,6,168,105,2,182,
+159,179,231,171,228,228,89,3,17,208,91,160,195,200,74,201,112,192,229,249,196,117,159,139,161,101,117,41,60,119,207,98,161,187,121,18,16,194,62,101,253,232,192,75,167,217,116,118,51,117,60,248,241,131,116,238,220,50,15,147,236,89,139,89,95,224,146,79,252,22,2,194,226,51,85,234,218,6,128,128,212,231,241,251,91,147,129,63,150,80,248,171,162,204,61,44,71,207,225,243,30,236,117,52,18,176,251,138,201,240,64,111,100,45,80,133,8,87,0,110,46,152,8,7,6,241,240,50,8,24,137,243,250,200,146,168,124,13,112,57,186,147,159,131,7,193,0,112,40,81,134,87,112,157,45,192,62,78,98,222,252,212,135,191,78,146,100,33,172,1,246,108,184,244,62,41,231,157,240,108,180,88,60,174,217,117,125,212,76,238,227,123,63,149,145,151,74,241,22,150,92,115,141,21,244,177,134,189,25,43,206,135,67,151,73,157,13,72,22,185,27,125,47,61,172,165,203,160,210,50,65,99,57,138,6,7,42,142,90,219,177,193,47,85,31,82,94,188,26,40,143,189,40,110,208,168,
+185,121,83,195,111,79,252,41,229,109,81,19,212,237,137,236,127,225,186,50,141,115,218,180,19,28,23,207,28,173,16,183,230,4,17,9,41,110,7,62,140,252,245,178,36,204,96,21,156,173,85,181,212,167,212,249,82,40,29,96,54,218,41,192,25,0,46,77,168,158,73,162,132,82,123,67,101,131,88,97,140,81,46,161,70,77,221,76,233,114,17,161,233,35,227,80,220,188,222,171,96,144,197,142,12,225,82,80,86,251,72,180,194,130,115,146,206,25,17,20,31,125,96,229,37,234,17,112,221,219,140,100,163,33,52,91,209,193,134,62,31,90,182,51,190,226,126,218,217,82,238,169,74,173,87,117,213,217,98,105,141,98,154,223,45,138,160,6,213,95,208,20,214,6,165,184,164,170,107,3,228,100,11,108,30,237,0,123,131,231,93,134,114,190,11,165,109,220,142,238,200,117,117,113,89,220,201,239,61,65,165,23,22,228,70,72,198,26,172,217,115,104,243,29,116,47,178,123,107,245,1,163,142,123,171,101,98,205,77,201,178,64,231,175,239,228,48,181,117,246,210,182,193,234,179,183,
+43,158,158,84,214,29,216,143,15,240,176,157,2,228,112,146,47,245,246,75,99,169,77,19,4,227,5,23,101,92,177,222,34,67,104,117,134,132,158,246,83,176,178,238,3,47,121,125,183,37,246,56,202,86,249,133,7,54,246,130,173,102,193,225,254,106,61,53,34,247,37,143,115,140,210,194,76,99,9,3,194,187,15,67,236,228,8,222,59,214,129,75,195,123,87,183,131,238,146,140,131,91,115,103,142,247,15,218,98,177,236,196,83,99,154,154,25,239,211,0,149,9,91,191,134,102,70,219,12,109,148,178,104,111,139,143,23,209,28,183,138,165,74,13,175,101,85,247,5,150,68,48,7,79,116,113,186,13,55,145,208,0,96,112,147,7,110,87,6,192,200,188,247,145,23,155,133,130,209,192,55,79,235,227,120,63,193,20,98,48,71,192,188,0,61,174,49,116,113,0,236,207,10,255,5,224,228,180,155,212,204,26,32,1,48,246,139,15,112,126,33,169,45,95,20,173,41,86,225,194,176,145,90,234,253,246,232,130,82,81,234,1,41,120,58,182,35,195,89,130,146,240,251,143,155,157,
+108,44,168,208,235,181,4,185,83,173,83,18,209,149,197,179,24,234,131,136,107,176,58,31,19,184,115,172,117,128,145,176,39,223,234,26,195,225,174,49,244,197,31,185,49,120,51,16,238,226,15,27,111,252,128,187,93,243,210,28,234,218,195,43,27,199,202,180,91,34,50,141,18,75,211,79,192,248,147,215,216,127,242,246,11,47,221,216,241,250,182,22,16,121,161,126,137,30,79,137,98,129,13,163,216,189,218,98,150,247,4,35,10,174,110,234,24,214,108,206,201,206,251,229,245,89,19,163,154,110,198,170,134,114,184,167,61,166,208,244,140,215,239,225,66,152,143,9,93,152,107,121,202,220,208,85,203,167,251,116,135,11,20,221,225,93,183,84,127,91,217,248,224,229,53,16,113,241,181,128,79,47,14,220,231,110,96,114,87,68,234,70,178,115,55,38,111,167,158,168,142,176,57,240,88,6,99,52,186,107,184,103,138,192,218,113,176,111,11,6,46,245,119,224,150,237,214,219,84,110,61,102,153,55,153,70,29,81,90,91,55,224,245,65,199,107,53,110,31,84,201,221,99,189,155,236,
+2,99,61,70,247,184,212,163,183,208,250,67,35,226,246,185,153,62,23,87,97,71,91,167,189,63,80,83,234,235,131,209,43,38,165,71,216,61,162,213,35,97,105,110,48,152,98,237,178,100,139,170,233,104,177,150,94,168,244,213,124,199,84,51,249,139,130,120,90,201,29,146,251,34,18,241,64,29,189,77,217,222,3,150,214,14,239,244,170,102,252,116,231,87,3,27,216,11,68,39,81,75,88,19,4,44,167,90,103,213,54,201,180,208,71,39,62,1,226,161,35,142,103,13,116,18,147,72,247,169,37,155,246,53,37,116,78,150,205,241,110,96,244,10,33,247,124,211,152,194,197,19,78,187,55,82,38,12,17,184,87,155,22,85,159,197,230,104,62,207,133,251,129,253,104,154,201,42,51,84,118,223,149,110,105,110,225,184,138,6,74,173,250,66,244,200,13,253,202,108,127,102,238,80,205,68,190,53,6,9,34,141,20,30,61,54,44,71,163,131,10,112,55,231,5,43,102,188,146,57,182,147,77,214,0,149,177,132,105,211,30,168,128,13,234,130,22,222,201,167,190,236,200,79,148,108,
+101,229,5,169,209,191,4,107,94,129,42,32,18,40,1,62,1,58,204,231,95,120,154,187,118,81,200,225,23,64,60,223,162,134,108,56,244,202,202,183,58,59,205,37,0,249,205,46,72,62,205,248,167,193,125,242,202,251,234,112,133,235,34,8,156,4,217,221,14,228,223,75,86,246,133,217,219,63,25,206,21,86,50,247,113,215,17,203,172,131,93,134,57,53,162,244,82,71,43,36,244,169,252,13,104,34,64,200,83,162,146,48,148,83,144,172,60,88,5,181,134,64,144,131,14,20,169,0,122,170,96,63,107,150,35,204,114,232,230,179,138,144,28,122,248,249,103,176,18,23,170,240,109,56,74,90,71,51,120,93,16,66,11,185,190,162,0,25,46,205,122,40,223,227,55,13,153,111,46,3,206,36,54,245,158,35,139,98,222,152,154,252,184,174,253,212,131,133,117,212,100,185,212,75,53,178,122,46,19,160,226,211,63,185,25,88,218,93,239,166,78,225,198,247,26,17,187,76,93,236,90,219,121,93,236,99,132,53,18,110,17,224,106,90,196,55,143,42,230,37,42,99,94,103,165,76,
+124,91,40,41,99,1,212,252,2,229,39,121,155,97,182,246,102,219,147,109,44,255,184,202,62,95,198,111,164,79,93,87,153,235,211,193,239,157,98,77,152,28,248,1,169,54,95,172,245,244,152,175,18,194,222,233,134,223,1,183,33,239,84,1,55,186,185,75,151,194,97,160,11,1,218,9,68,141,108,162,96,228,250,81,173,174,184,233,62,87,205,145,150,33,248,45,20,93,82,157,39,224,209,96,166,180,200,40,175,203,152,205,13,228,60,79,26,25,236,17,191,184,247,134,97,84,220,103,10,153,218,136,185,147,134,194,37,211,216,27,61,10,229,99,68,217,112,94,250,70,202,178,100,111,69,242,152,216,67,98,204,36,172,90,79,122,97,38,2,42,100,191,99,102,192,37,224,26,68,209,64,43,84,121,209,198,234,175,10,243,65,0,99,41,160,119,4,4,200,64,9,212,67,59,170,151,118,69,194,163,53,200,47,12,167,249,120,145,237,65,215,232,240,202,237,104,105,52,155,7,208,146,171,123,171,22,65,31,137,142,90,72,247,219,94,60,102,222,128,142,13,204,173,141,228,30,
+122,220,77,20,113,246,120,95,199,218,158,1,210,152,108,47,70,226,51,9,63,219,200,89,86,134,33,73,163,85,121,43,47,136,101,226,130,90,92,217,232,198,89,99,149,79,75,181,5,43,177,174,82,4,175,123,183,102,82,204,105,90,186,174,183,135,19,215,131,133,56,145,120,253,216,106,58,29,194,161,51,239,90,40,230,6,201,77,34,201,248,1,180,252,33,19,66,251,184,222,45,208,156,73,190,3,134,181,64,3,251,238,117,187,158,105,18,134,182,222,60,85,145,144,205,236,87,183,105,188,99,239,65,182,49,169,203,70,241,210,55,110,78,125,106,196,190,108,151,154,249,21,136,215,151,4,250,77,104,212,152,129,196,157,27,218,61,54,215,28,51,176,75,233,13,182,141,192,182,53,38,209,216,23,29,10,52,253,98,140,113,15,193,182,161,81,113,111,68,46,98,218,101,30,45,92,168,142,36,36,181,10,49,221,72,203,251,189,255,114,123,139,220,237,237,35,72,244,151,133,182,117,164,185,72,60,71,155,245,118,20,70,213,137,151,12,63,134,169,110,171,68,125,140,69,230,
+193,76,244,60,245,186,187,169,159,218,59,185,106,36,94,70,156,191,172,230,142,151,155,60,6,164,41,120,222,23,135,112,71,154,180,95,144,141,187,10,35,102,94,85,2,51,198,62,191,118,5,204,207,100,227,6,197,141,69,126,218,214,158,29,166,178,240,185,190,62,92,88,83,73,7,228,70,206,111,150,59,231,212,18,76,105,90,136,42,55,87,45,32,168,85,18,98,186,202,77,97,36,93,173,21,82,184,31,225,104,11,156,192,188,20,98,45,116,206,74,125,171,101,39,154,86,87,88,235,180,213,181,115,209,126,2,24,33,43,148,175,226,219,4,82,157,101,68,52,87,28,17,236,28,153,123,65,234,194,164,245,89,128,122,70,30,5,250,173,16,138,146,183,192,213,23,197,34,201,179,192,205,212,35,169,77,31,193,178,67,182,42,100,135,137,11,115,201,105,190,120,14,180,59,94,76,90,71,217,183,132,175,187,200,250,228,153,156,243,73,81,246,87,54,89,179,52,29,107,152,251,235,162,78,88,9,13,175,111,55,9,246,50,18,26,73,164,96,134,116,141,69,96,4,7,129,
+113,163,104,108,177,150,212,41,105,204,225,137,163,239,101,96,139,147,50,40,229,173,33,48,237,89,34,164,178,14,153,142,208,219,160,71,60,88,3,186,70,60,243,150,69,25,181,142,78,140,114,192,123,187,23,178,133,117,131,228,161,153,76,180,167,214,93,52,98,132,239,195,18,26,207,163,187,138,203,182,200,100,108,68,216,115,27,91,105,216,115,170,231,80,94,46,181,142,74,190,237,150,133,111,250,157,9,218,230,88,138,179,42,252,163,26,163,214,0,137,134,83,150,251,204,215,244,193,166,190,255,102,141,157,140,214,149,81,58,122,35,91,175,100,99,0,43,142,235,161,248,185,104,195,52,111,39,230,237,171,194,47,173,18,137,35,44,22,165,3,132,24,49,112,186,42,140,122,253,41,111,62,179,209,146,27,77,217,125,198,238,138,35,166,241,254,113,94,94,208,31,30,209,230,139,21,200,219,236,178,223,95,45,11,205,241,217,64,82,62,96,164,42,12,248,181,81,91,95,45,195,48,183,142,127,142,3,157,146,14,3,189,48,81,251,188,101,64,95,198,45,21,10,99,164,87,
+149,146,130,88,173,46,40,212,245,141,110,146,216,199,10,24,224,120,140,154,101,65,141,33,63,145,53,135,198,33,120,99,85,241,197,204,216,136,135,228,24,169,45,176,6,233,123,168,26,13,189,198,2,48,122,28,198,244,221,199,24,30,39,34,202,176,228,128,26,251,165,50,127,153,177,203,50,138,15,62,178,109,232,222,197,121,133,196,210,163,113,133,211,188,176,61,22,165,40,176,104,104,225,253,96,102,97,255,228,18,149,187,210,123,195,131,147,172,90,172,71,187,112,13,19,84,244,136,5,207,198,174,146,217,86,82,15,46,19,151,202,176,150,200,140,48,163,221,148,183,252,85,143,24,244,183,15,116,135,49,197,38,244,208,16,157,233,239,37,125,81,148,174,50,86,28,250,178,0,79,167,166,234,212,230,220,14,27,206,153,29,254,84,174,255,149,128,62,113,118,14,8,224,185,238,114,47,13,233,215,9,170,229,181,110,57,115,241,177,212,103,124,100,152,204,122,180,155,255,89,170,148,120,176,124,228,92,167,221,49,165,69,37,212,122,241,47,175,9,114,227,8,53,114,95,62,
+114,175,75,133,91,167,187,194,162,25,122,196,220,103,245,42,248,243,60,48,68,168,48,16,87,10,2,94,96,39,151,154,54,76,244,250,14,176,247,219,107,15,17,12,10,17,111,133,181,179,79,176,134,33,218,36,190,252,149,49,16,83,241,109,65,234,144,45,134,124,132,106,154,58,85,245,79,13,162,158,116,215,225,16,139,142,236,125,77,132,25,1,155,78,66,65,101,226,70,141,61,49,226,20,195,47,214,50,34,72,130,121,50,230,245,115,146,124,180,68,61,70,148,100,67,242,140,93,80,146,152,237,108,202,221,91,58,122,239,196,58,9,140,101,110,113,111,97,193,7,154,112,39,193,233,215,53,204,253,73,176,245,202,24,230,158,50,221,17,17,115,171,168,217,213,228,188,19,73,110,42,124,248,196,113,167,215,239,44,37,227,202,64,18,221,87,191,220,12,148,0,3,41,97,164,16,157,84,48,175,124,67,107,139,121,153,228,35,175,203,176,121,103,230,224,28,164,211,108,108,185,75,163,253,56,127,70,12,142,188,139,75,251,74,249,121,118,1,200,115,53,123,23,179,106,76,
+99,167,10,220,65,163,175,100,6,27,235,205,205,97,38,58,91,235,188,136,101,166,134,186,114,146,191,234,234,233,232,176,60,150,125,208,214,106,148,245,0,84,216,185,248,40,254,4,15,130,223,156,43,46,156,144,213,34,197,139,243,113,214,221,133,72,20,79,97,230,161,234,185,138,75,148,29,212,5,40,200,242,85,192,223,14,163,3,127,186,175,226,38,176,11,187,188,107,95,100,31,53,87,147,134,40,61,218,56,223,12,143,235,100,113,157,124,156,219,70,174,252,148,102,5,34,77,67,188,77,72,52,238,193,188,184,144,32,31,22,230,231,66,226,56,201,57,176,132,196,91,8,4,149,137,33,211,81,0,13,75,123,107,180,69,14,152,47,126,244,83,56,144,82,2,11,147,162,97,49,167,27,9,196,64,163,184,60,44,214,66,225,87,135,104,81,238,209,36,183,121,97,116,109,175,178,86,249,26,155,180,86,172,144,236,142,61,249,229,203,168,7,24,51,124,205,151,61,145,70,163,245,235,89,89,173,90,227,91,190,75,240,59,215,78,143,22,55,134,91,129,70,120,93,187,182,
+70,154,77,30,158,54,29,191,15,194,114,168,175,35,216,157,148,106,110,202,73,90,23,105,240,219,132,142,135,10,36,193,70,235,85,198,135,196,93,31,124,29,77,214,118,121,170,112,78,169,69,21,27,116,59,212,42,67,195,45,167,22,83,107,27,153,204,96,222,90,180,212,94,75,188,178,133,197,221,37,61,120,199,22,48,79,226,103,143,29,97,126,37,28,120,194,82,251,3,81,58,51,120,102,38,251,205,68,210,239,196,151,197,170,126,225,211,209,229,64,11,126,109,137,103,2,39,54,207,193,80,152,73,116,126,124,40,76,54,228,226,100,95,84,219,96,123,249,238,101,192,45,40,197,97,71,125,166,225,156,225,247,231,161,67,186,159,249,47,241,230,91,129,42,83,38,118,239,148,51,15,234,48,234,173,14,189,19,0,7,180,234,175,208,87,16,25,148,166,81,135,193,42,130,85,171,179,90,160,236,46,147,81,1,82,183,249,51,127,75,198,187,201,237,243,182,223,250,247,254,250,179,4,133,86,108,231,137,229,12,165,83,218,145,252,142,70,159,139,97,145,179,187,217,131,87,
+159,126,117,245,224,122,118,144,67,216,52,164,72,191,130,134,123,207,188,103,110,246,13,240,158,9,131,96,120,68,211,243,67,180,107,137,5,224,23,79,105,182,120,117,170,136,155,22,251,179,68,185,184,10,185,219,52,166,2,227,36,161,11,203,123,31,189,243,239,35,175,75,13,120,253,120,57,112,96,251,43,48,186,191,42,234,152,220,146,139,126,95,68,230,243,38,188,164,222,53,154,83,136,252,233,67,228,247,47,49,226,46,78,237,107,96,5,3,45,245,153,159,38,210,129,164,211,30,105,113,50,18,34,13,176,22,161,118,70,189,159,128,112,58,79,209,70,69,76,4,6,94,6,241,56,241,0,181,130,26,111,74,13,128,11,4,12,6,157,243,134,58,246,196,18,59,47,101,32,82,19,166,3,209,185,45,52,227,77,187,93,2,133,114,37,0,235,10,157,50,0,182,231,140,19,109,76,59,15,71,128,182,119,100,84,56,157,16,120,90,178,241,88,61,249,199,151,30,142,243,97,168,55,29,159,123,116,108,31,105,126,235,35,15,16,249,50,80,178,42,224,9,78,151,222,217,
+221,41,90,148,50,111,13,143,101,52,111,173,59,227,140,118,112,97,202,209,150,250,214,88,173,119,236,166,188,217,239,172,215,5,254,124,77,94,175,234,235,97,125,163,94,220,130,48,65,130,72,245,238,102,75,35,28,4,121,34,161,44,97,226,70,37,33,169,70,197,149,160,92,82,93,101,156,170,55,250,72,193,89,152,132,220,14,58,141,234,12,197,130,51,35,44,46,68,201,101,6,128,196,179,168,183,17,228,56,145,110,62,85,52,165,39,42,168,38,200,94,222,21,112,6,120,239,192,8,88,127,158,12,232,68,60,94,250,21,144,190,14,196,22,77,156,10,53,0,12,10,144,15,158,240,156,84,43,147,169,84,74,10,210,225,140,222,178,134,3,58,195,156,254,190,238,94,26,133,159,3,227,153,48,43,164,189,225,54,34,98,205,76,11,225,208,174,190,39,6,220,250,5,246,180,245,98,136,210,67,137,65,110,96,202,108,15,225,227,115,17,181,238,119,195,73,7,83,137,152,135,227,230,34,93,108,17,103,86,189,40,51,174,113,16,167,26,86,22,20,203,250,84,157,237,221,
+220,166,164,68,200,245,144,40,163,230,99,36,42,113,156,136,5,103,143,50,43,245,57,38,93,125,248,17,70,88,87,250,205,236,67,219,92,101,67,197,209,112,158,150,27,231,1,82,64,130,23,47,21,101,128,158,158,18,231,103,237,69,233,251,182,229,250,82,122,247,192,102,37,121,166,143,153,109,171,9,232,79,14,159,155,201,138,126,107,95,95,193,39,90,145,116,60,215,187,206,117,120,158,217,39,111,245,146,154,11,219,105,56,164,86,107,117,146,85,133,65,113,250,61,118,102,159,167,48,198,78,84,185,148,106,243,247,76,245,146,205,12,182,244,201,20,228,82,77,96,128,238,232,162,129,184,152,8,88,208,76,192,45,197,172,6,43,238,212,97,222,52,105,16,168,169,39,11,1,122,5,53,200,64,190,172,117,21,113,62,38,230,65,114,210,147,254,45,140,6,105,147,37,184,165,66,218,164,205,114,127,68,81,111,121,20,254,144,58,31,30,61,154,96,170,233,244,18,166,171,68,217,88,130,92,69,14,232,47,0,40,28,5,216,23,100,239,135,162,199,84,7,120,145,99,3,
+239,185,104,241,159,159,160,242,195,252,121,99,107,189,15,135,167,211,202,135,46,48,0,157,71,21,157,99,150,85,188,20,77,60,161,10,90,249,52,3,153,241,17,174,224,206,158,137,60,83,94,224,17,47,93,244,128,75,202,95,218,234,112,227,164,17,231,236,226,28,3,97,165,118,109,218,207,111,210,84,53,46,8,238,103,156,200,35,156,236,121,6,156,68,25,226,209,209,113,175,254,254,125,241,10,214,161,63,248,39,226,184,206,33,27,219,104,172,142,136,212,189,190,8,83,60,130,24,41,234,80,237,112,137,161,172,196,141,200,52,82,181,34,215,132,154,38,210,202,236,52,125,66,109,107,100,140,198,22,21,0,126,35,50,127,160,199,133,26,146,120,118,123,33,123,67,252,91,250,114,169,249,158,232,121,195,227,56,109,192,128,245,64,29,177,72,207,183,98,70,125,37,133,40,132,105,191,194,51,56,175,143,205,104,152,101,63,77,157,213,214,176,218,123,119,95,132,246,162,31,192,44,251,218,6,233,218,3,61,7,48,228,1,39,220,185,160,171,151,13,191,16,0,151,185,89,
+114,240,70,182,28,13,177,159,196,153,167,66,67,165,171,178,204,85,218,54,85,92,234,201,11,159,212,234,37,132,168,183,225,242,147,75,248,152,24,79,34,170,129,248,129,229,197,97,212,172,77,216,79,85,202,135,251,89,20,214,176,85,236,199,181,6,254,252,132,34,86,75,212,187,12,99,229,230,57,203,171,81,241,228,46,63,214,83,63,12,107,94,0,125,188,194,88,240,30,23,180,201,213,227,219,109,111,103,219,31,23,172,107,105,169,206,44,119,126,67,114,243,156,112,219,104,70,131,7,126,94,223,159,159,156,24,138,236,37,56,155,167,163,72,61,233,248,92,33,115,211,243,197,54,46,42,104,247,174,15,243,121,234,16,115,38,153,205,89,82,171,145,95,60,245,50,220,70,248,170,174,73,94,65,188,22,136,103,232,124,37,117,96,224,9,70,221,79,36,153,14,10,184,63,131,81,23,138,198,134,36,18,46,4,56,29,142,211,156,24,226,19,243,126,51,179,85,123,6,127,173,183,199,39,149,183,155,1,94,244,34,113,2,10,39,192,161,132,59,200,163,240,93,184,132,201,
+208,176,196,193,115,141,149,108,113,145,131,43,31,94,216,210,244,122,58,207,4,154,19,207,186,177,124,100,234,18,137,66,209,207,204,195,122,82,204,219,106,12,0,104,160,127,233,165,138,115,19,129,154,76,176,74,238,163,20,73,19,186,104,114,216,254,42,175,95,227,120,109,36,160,178,112,188,231,68,34,239,136,171,84,42,239,145,107,158,189,211,87,222,61,233,14,162,173,1,159,100,171,188,155,184,242,156,242,149,206,150,199,184,154,232,229,80,148,112,155,9,43,228,182,250,81,225,190,247,245,178,205,146,170,99,60,81,87,161,67,215,243,14,243,81,33,211,158,178,184,54,57,192,13,93,58,145,5,133,83,30,102,95,242,15,170,114,98,106,243,236,43,0,192,94,80,30,10,222,27,159,33,200,124,54,14,93,74,58,57,9,193,224,22,54,215,225,238,48,66,125,209,180,209,196,147,108,228,29,47,89,246,250,99,156,217,83,29,115,117,99,97,148,223,115,116,198,72,138,192,120,68,164,41,42,177,209,21,210,118,33,123,88,126,72,45,239,118,103,46,166,176,57,46,69,246,
+228,150,107,13,80,53,54,23,222,114,214,47,246,80,101,66,31,25,100,115,30,89,215,214,150,149,225,169,28,226,229,104,27,198,151,251,203,7,132,42,0,201,166,14,183,164,21,63,62,118,24,58,114,45,6,152,175,210,78,232,61,10,104,2,33,167,43,61,9,117,35,239,23,36,212,166,77,178,82,244,145,251,26,124,222,116,32,251,105,196,87,239,134,122,71,247,144,188,188,182,107,239,207,139,175,229,65,49,180,227,106,131,7,81,34,93,28,252,199,151,12,125,41,93,17,42,27,191,249,113,29,37,93,181,109,16,55,183,157,186,1,54,48,214,170,41,45,150,90,127,177,208,147,86,198,134,173,122,139,59,207,232,224,140,4,238,163,72,210,152,217,231,172,196,182,72,3,105,188,181,69,239,231,114,141,162,152,203,80,251,205,252,92,6,146,230,88,176,126,126,153,84,4,96,189,100,153,252,124,191,158,33,202,90,8,34,82,250,235,72,187,159,76,253,226,108,254,153,232,245,24,71,13,200,55,64,111,66,134,30,207,210,248,126,22,69,204,157,170,216,194,245,154,123,102,100,
+82,141,109,122,226,121,22,157,104,59,40,188,186,86,45,207,235,227,54,129,63,134,47,218,222,187,94,188,160,164,187,90,91,146,69,101,74,117,21,150,248,148,45,130,67,38,233,148,215,28,0,14,102,76,108,35,212,210,21,138,185,205,76,41,238,65,179,29,235,177,219,206,166,164,163,81,229,208,200,74,92,245,190,142,206,205,174,212,4,115,53,50,200,61,29,100,75,29,146,120,54,9,247,72,64,43,87,222,13,91,77,188,37,129,88,105,238,118,87,103,157,187,175,157,6,167,96,12,113,198,108,166,131,244,241,12,47,110,182,235,194,43,190,241,185,134,8,246,198,122,206,119,77,48,34,117,14,215,80,201,148,133,242,138,162,85,225,94,90,57,78,174,198,134,111,181,232,176,18,31,84,249,96,131,202,71,47,102,125,44,17,122,134,136,153,6,212,132,190,24,170,204,98,97,43,27,185,49,163,241,91,39,103,34,164,119,17,106,180,133,130,181,64,85,17,235,60,232,152,5,43,204,152,80,101,137,84,94,39,194,204,10,229,121,78,65,189,17,25,107,201,116,48,71,69,20,
+107,199,251,94,164,66,113,177,223,243,107,134,195,166,92,166,24,105,148,182,252,81,228,122,218,28,142,222,197,164,8,30,87,205,155,94,255,217,26,110,130,37,11,151,134,115,39,85,105,181,129,234,151,206,67,242,209,16,218,184,31,8,135,41,106,116,247,49,135,89,210,199,195,168,171,142,180,162,129,56,112,222,154,182,7,205,224,230,119,136,164,24,98,227,195,24,148,215,188,197,228,38,68,185,97,51,172,125,50,113,153,65,94,117,59,135,61,191,155,81,218,173,170,51,38,218,198,252,190,168,230,198,193,73,218,187,230,169,111,195,45,108,177,178,20,140,49,46,205,115,209,18,99,5,127,221,103,116,75,159,213,36,62,250,67,195,6,50,158,147,164,51,15,20,110,12,215,242,47,169,208,70,76,180,26,144,248,34,153,220,69,166,231,70,96,136,241,37,229,82,60,221,112,11,79,44,202,227,8,248,13,22,64,47,52,180,155,242,254,122,64,44,1,6,74,54,0,63,215,195,231,109,236,35,194,1,127,228,138,53,2,53,132,92,39,216,107,102,227,0,47,92,5,108,108,48,
+124,121,229,221,230,36,176,136,149,15,184,10,126,16,188,32,20,230,187,36,4,23,49,161,91,5,201,46,96,178,44,166,124,143,221,250,145,43,117,42,31,130,221,150,73,83,99,168,239,189,166,102,126,41,126,108,37,2,249,226,240,113,237,115,14,35,9,242,51,51,32,45,10,162,133,129,102,239,23,145,181,9,116,161,104,217,22,251,57,245,35,127,27,216,221,216,23,5,127,34,122,87,243,227,67,193,106,231,134,146,220,23,73,200,189,71,156,167,180,186,126,213,173,186,206,80,65,183,124,205,100,182,247,169,70,10,5,172,40,152,16,3,16,70,143,115,144,219,200,188,190,34,63,155,151,251,197,149,123,96,87,10,54,247,81,211,4,73,21,36,186,61,198,128,33,70,3,55,67,208,87,250,184,23,202,50,12,133,89,40,105,78,229,213,112,12,164,71,15,204,4,102,238,96,145,203,16,208,156,90,237,106,140,38,149,229,163,178,122,27,234,187,43,134,230,140,201,85,28,218,140,199,130,44,144,16,61,32,72,237,219,157,48,146,63,172,206,214,133,11,97,137,205,1,154,75,
+194,72,41,80,146,247,126,52,217,143,126,51,40,72,236,138,81,83,231,94,182,193,69,241,109,69,237,189,81,228,254,233,181,102,117,165,163,49,48,193,145,126,33,140,84,2,231,7,171,123,119,246,64,55,45,201,47,204,18,54,8,95,148,188,87,202,100,124,49,0,37,139,166,84,137,93,192,210,142,177,203,73,227,195,239,195,243,199,216,154,174,15,228,247,233,178,197,141,194,239,98,54,249,183,136,127,145,188,220,187,140,112,15,41,35,196,167,228,33,158,65,183,138,145,22,51,144,154,119,48,222,1,177,152,84,20,161,229,95,5,219,161,31,94,240,133,100,171,180,196,105,133,46,172,163,78,131,73,206,214,195,67,195,233,105,139,130,230,185,52,152,191,75,249,162,149,150,92,3,185,5,64,0,81,87,73,94,200,222,241,11,18,33,149,72,111,79,130,5,115,143,37,227,241,24,225,219,22,138,38,171,185,73,138,18,252,117,210,74,86,16,133,179,125,34,132,229,238,110,52,154,250,211,84,46,113,218,211,18,94,221,56,215,12,47,118,236,177,213,251,144,83,83,165,204,168,
+97,87,112,190,116,43,146,96,84,47,49,119,147,22,94,170,104,137,48,151,8,93,131,204,88,216,77,225,125,2,197,130,246,201,116,41,3,24,125,29,25,13,13,172,145,114,26,83,216,173,210,108,34,56,87,82,178,130,191,53,56,31,120,163,179,95,4,14,141,180,50,114,224,44,171,165,104,112,126,30,235,27,97,97,64,31,97,126,66,111,138,144,205,162,105,142,55,16,147,1,146,190,224,162,209,126,30,184,131,136,66,204,106,115,208,224,118,243,56,31,84,204,107,158,11,153,165,4,148,253,155,168,21,232,227,158,146,254,87,135,145,144,201,238,16,217,147,148,27,206,248,186,27,167,170,140,194,31,36,68,74,1,73,82,95,248,208,216,184,13,111,207,78,82,98,122,174,4,146,232,14,50,221,116,162,199,47,43,218,103,211,108,154,152,118,73,146,225,206,183,224,131,138,213,80,22,157,3,114,79,253,107,144,176,133,206,230,132,90,211,244,201,192,135,26,61,144,1,2,82,175,67,81,60,1,73,133,40,99,234,237,128,101,186,98,54,27,178,190,167,159,31,98,114,213,253,
+113,155,190,18,221,126,162,217,78,12,178,55,6,1,230,4,92,76,27,140,86,181,188,238,158,148,31,231,73,252,132,61,227,134,22,99,173,50,111,39,23,102,190,68,149,113,5,65,110,136,207,205,239,187,209,17,133,27,151,191,177,11,252,181,179,190,236,0,184,245,87,77,18,142,155,251,222,113,227,193,242,26,107,161,47,49,220,69,214,228,111,10,28,204,151,100,161,11,156,84,249,133,23,108,156,55,210,186,33,59,62,128,179,116,29,104,179,149,145,236,192,30,137,153,226,243,13,244,189,25,22,222,54,232,183,139,68,8,82,0,80,123,204,218,132,72,31,116,48,135,45,100,27,57,194,39,104,248,18,240,4,192,189,118,71,70,120,18,38,132,168,19,254,202,35,6,111,38,189,142,159,87,139,84,216,26,19,182,229,162,133,216,136,4,119,19,245,177,145,145,19,78,139,157,33,114,177,184,72,203,230,167,21,136,98,190,207,163,152,107,40,80,197,21,10,227,178,104,119,75,44,47,253,235,226,94,138,223,152,1,134,5,219,195,156,160,46,144,216,179,105,42,216,63,44,55,
+180,106,221,7,109,164,183,204,25,212,231,140,33,139,59,163,253,238,165,133,132,247,73,108,186,135,45,62,248,119,235,67,185,200,178,235,131,75,114,101,143,207,235,17,234,162,52,60,74,117,142,253,167,161,118,52,84,141,184,243,162,234,52,99,30,7,24,85,211,32,181,212,236,24,197,52,101,153,63,226,69,152,89,49,163,25,30,9,216,135,40,52,201,94,134,239,51,21,89,170,17,246,165,42,209,138,27,6,198,31,104,112,10,154,216,63,176,208,7,22,255,164,50,68,123,140,204,200,52,41,244,184,60,59,52,174,164,123,135,225,198,49,98,34,28,192,84,231,152,38,73,166,183,216,251,137,132,82,236,241,252,189,169,94,81,216,110,199,19,244,88,163,232,244,143,238,142,23,97,138,116,37,58,203,219,164,103,233,123,209,199,212,208,181,104,184,75,52,26,105,121,111,198,211,169,148,8,32,108,251,8,29,62,91,215,225,143,215,235,46,190,255,238,22,216,149,250,142,217,142,252,96,178,223,63,241,164,42,1,179,192,141,69,232,80,111,21,17,143,90,168,244,137,72,186,110,
+101,238,181,72,135,230,8,138,1,129,73,155,215,176,10,136,67,255,125,58,44,251,17,20,186,5,144,9,221,32,153,11,179,118,251,20,104,54,247,76,148,150,180,180,162,171,81,177,90,81,187,149,154,73,171,245,28,157,185,115,207,201,137,48,125,96,71,194,217,195,0,248,68,71,92,157,184,104,98,126,251,228,188,29,233,243,238,94,106,176,191,35,94,27,211,164,26,19,62,208,196,194,2,169,34,18,134,166,217,30,120,250,126,239,237,229,59,187,169,76,102,87,89,233,197,97,18,211,57,14,229,133,221,25,165,54,150,35,245,82,178,198,122,95,189,174,170,138,8,189,109,220,188,79,118,96,73,105,160,206,83,156,15,196,183,176,68,47,172,213,219,151,214,67,219,1,234,149,13,12,115,241,45,239,55,30,248,161,101,250,60,72,11,129,33,148,186,44,194,24,108,21,90,172,176,184,156,114,157,87,187,4,26,210,49,45,106,125,76,28,208,71,191,72,29,213,102,156,228,54,241,153,246,229,73,156,89,186,255,194,179,37,95,106,125,255,43,98,246,64,175,71,239,200,199,226,
+82,155,7,119,165,149,5,182,58,238,27,82,135,106,162,116,148,57,5,88,22,148,152,39,197,166,174,72,116,20,227,175,93,11,188,212,139,90,186,122,251,50,50,108,225,98,247,24,189,172,39,21,77,164,249,225,172,182,246,248,206,229,209,252,121,169,7,14,184,10,182,35,98,226,138,77,142,71,224,230,14,211,239,121,91,66,89,100,65,47,246,243,70,180,187,212,192,228,57,167,219,20,38,242,193,19,174,151,240,134,211,141,22,48,218,170,245,148,200,160,3,98,173,155,102,84,64,100,88,136,76,62,50,177,253,76,82,188,158,113,6,7,16,80,247,189,81,116,239,237,163,220,48,119,188,211,217,83,229,167,112,81,79,127,164,37,242,134,5,197,147,199,192,75,197,36,91,166,137,45,5,17,9,195,250,4,67,66,2,216,92,141,73,227,24,119,71,130,82,19,134,23,221,226,224,115,182,181,155,16,149,70,117,174,94,44,77,22,172,164,198,54,60,86,132,134,121,86,112,111,53,20,67,119,64,197,35,137,204,104,232,170,211,95,63,215,54,118,144,238,234,59,161,87,153,159,
+212,158,43,175,248,201,219,251,37,166,151,213,101,116,35,152,81,137,79,184,241,14,32,87,172,88,130,31,38,251,237,118,138,196,233,57,34,254,25,115,207,207,17,21,26,169,17,42,227,51,245,8,195,209,244,181,39,37,150,203,141,117,181,175,115,192,214,193,20,235,125,172,143,122,75,194,42,239,63,62,195,72,168,46,217,249,146,32,217,33,77,90,216,189,207,53,187,119,156,161,159,113,236,140,154,221,126,34,82,12,45,162,162,146,110,33,57,252,213,202,32,95,44,219,222,237,96,95,59,103,27,123,9,129,183,2,189,149,64,237,113,220,137,37,179,202,148,140,41,209,64,135,189,70,90,25,247,41,70,193,4,245,210,210,77,195,33,157,103,215,25,100,49,195,2,29,226,246,22,65,59,163,44,50,97,204,103,84,7,120,193,82,237,121,212,3,181,243,186,175,60,41,192,198,58,251,123,219,214,0,88,48,188,193,13,68,168,29,28,86,182,147,33,72,179,25,44,172,19,211,164,137,199,47,203,187,170,245,33,140,45,114,247,83,138,181,108,181,186,170,3,128,5,60,126,88,
+59,13,192,147,189,44,113,76,103,197,117,86,255,114,157,178,140,232,139,152,118,77,145,148,189,27,106,62,36,163,106,251,40,186,113,1,77,178,232,73,167,205,220,37,139,204,93,244,166,102,132,21,64,150,158,126,20,104,178,10,219,144,218,59,13,1,35,154,16,253,227,72,202,164,222,131,73,254,177,51,138,36,196,220,155,57,227,177,154,182,19,203,100,122,115,20,167,2,54,44,213,217,188,178,176,10,102,96,96,40,43,146,170,176,124,118,69,73,193,89,224,154,101,206,130,214,10,32,85,141,124,138,225,77,9,201,20,23,3,5,21,67,177,84,241,234,152,136,112,91,83,56,181,168,68,171,198,99,136,136,165,18,182,133,38,119,120,6,175,239,79,239,192,131,72,190,210,119,240,177,114,74,191,144,68,189,78,21,135,143,219,60,128,50,244,150,107,80,211,102,192,166,51,80,186,55,162,163,85,177,35,126,209,97,137,176,103,33,195,120,117,40,68,225,253,44,195,26,106,255,150,189,50,192,59,154,249,7,192,67,109,169,124,171,34,196,16,156,17,217,235,162,142,162,6,223,
+210,91,199,232,51,213,180,7,9,55,75,12,231,221,103,236,231,246,141,147,166,141,201,37,33,222,126,232,112,115,243,89,76,207,127,139,69,5,33,72,89,89,41,179,6,111,139,23,61,21,110,162,194,169,122,2,82,75,196,154,48,5,184,161,132,58,30,132,216,181,147,118,188,224,43,185,34,255,110,140,191,204,102,106,150,6,28,2,38,34,211,158,234,69,95,231,175,154,240,115,150,105,156,214,105,155,222,54,183,224,155,19,66,176,10,23,222,105,60,183,237,170,49,219,208,90,158,59,235,254,249,134,145,30,165,253,139,188,193,86,129,210,189,245,73,89,199,114,35,208,11,15,203,193,165,122,250,243,77,207,96,70,58,155,161,244,174,212,160,146,199,2,58,94,226,190,226,154,5,152,130,155,135,45,115,204,165,144,168,184,200,160,169,196,243,84,13,245,245,147,241,130,133,3,190,34,70,209,87,102,113,121,176,112,31,105,80,247,115,197,7,3,181,42,192,195,13,203,156,42,46,35,203,86,190,190,150,114,162,16,76,63,134,93,176,194,0,166,38,138,23,193,238,161,87,188,
+40,157,219,32,118,177,229,63,177,28,125,192,226,168,109,206,96,55,216,157,19,246,48,226,87,216,189,163,106,238,52,47,81,65,149,1,26,54,83,38,44,102,59,0,8,69,35,190,212,37,75,144,249,101,22,95,90,5,193,209,90,72,132,225,183,248,49,94,95,152,199,203,22,232,79,210,0,95,243,55,116,35,108,151,245,217,234,44,204,163,114,172,215,204,200,219,105,41,33,173,157,18,92,56,210,45,37,48,4,50,13,47,75,9,10,216,26,81,140,76,52,126,123,239,139,63,70,95,151,18,149,86,87,43,167,58,229,98,62,153,143,231,180,217,106,70,183,219,215,220,103,113,157,112,224,36,177,136,196,237,188,120,158,147,165,225,60,85,220,23,102,75,149,185,50,142,184,144,9,174,153,95,57,43,194,165,45,176,96,11,204,219,186,164,206,224,81,143,189,44,210,241,122,78,161,191,202,240,139,155,193,201,159,124,49,41,7,21,191,32,95,201,250,14,193,53,220,114,223,123,159,230,237,32,229,128,242,241,124,6,180,115,11,28,196,100,213,122,79,208,82,185,35,61,147,126,
+4,197,40,37,140,21,14,196,136,241,141,235,59,242,204,118,156,26,83,0,185,191,164,49,36,137,123,219,37,153,221,112,233,67,45,123,39,40,47,184,188,232,132,131,28,30,89,110,209,186,187,0,162,213,91,150,211,0,232,61,25,54,173,98,217,21,192,197,134,10,16,100,42,182,35,219,117,242,185,107,83,13,237,135,34,221,126,49,180,195,195,93,123,184,203,171,212,49,124,26,71,7,182,66,119,62,0,170,211,46,142,136,192,17,125,146,147,173,207,152,132,211,228,12,149,24,232,161,137,216,217,188,235,189,39,13,215,122,161,51,78,48,204,74,160,182,159,41,28,134,23,12,139,117,194,130,62,159,55,192,33,33,27,157,114,182,29,58,80,168,10,26,106,64,81,162,18,50,190,164,150,68,13,153,138,174,81,157,157,213,220,83,46,125,12,30,185,158,3,148,224,238,142,234,228,200,172,234,27,237,89,67,109,66,87,161,203,93,20,169,20,140,170,212,35,81,81,45,166,106,156,146,250,43,34,253,100,88,88,143,24,237,90,52,57,58,136,94,255,213,150,177,193,90,201,86,
+54,10,73,225,18,195,231,6,142,29,74,218,72,234,164,32,25,15,103,24,91,131,113,59,169,63,128,107,202,234,61,215,63,142,65,11,15,186,146,111,245,76,35,220,197,16,112,120,211,227,123,35,231,116,171,150,26,179,166,153,25,57,172,174,170,0,60,19,64,64,111,48,118,60,205,165,74,34,137,172,71,149,88,21,59,199,201,50,87,51,193,182,239,5,104,58,230,66,23,110,52,128,220,66,71,94,217,104,239,157,14,185,19,208,76,34,252,197,133,122,113,227,128,47,105,72,160,9,9,188,139,253,162,214,75,212,21,198,66,27,216,60,51,216,101,88,68,181,190,117,122,105,179,15,36,246,81,82,179,79,59,78,116,254,214,156,19,193,44,98,224,43,39,59,190,87,105,127,58,71,51,80,254,30,73,79,41,228,81,27,107,156,229,115,99,51,83,254,240,0,33,236,52,4,228,18,143,67,45,219,40,14,62,17,225,116,19,173,142,162,153,18,125,100,196,245,106,24,111,2,181,109,167,34,85,226,134,34,86,93,137,233,174,205,81,146,86,226,199,83,10,162,192,231,147,246,
+106,127,108,90,99,199,96,164,132,37,224,210,47,141,23,56,122,197,61,219,91,213,92,33,34,209,104,207,55,175,44,114,214,245,122,179,187,191,194,96,208,227,165,92,199,50,217,94,205,181,157,29,184,104,31,158,20,6,230,145,193,159,1,3,23,55,72,187,87,76,147,98,45,245,56,162,159,100,160,62,11,234,130,163,51,96,237,242,126,118,77,63,110,238,118,100,65,236,124,44,62,70,245,143,202,180,145,103,219,120,20,12,173,139,181,80,174,108,217,167,210,118,137,88,172,161,9,147,188,173,235,47,130,162,249,138,208,206,176,198,153,131,170,221,189,240,174,152,130,100,39,11,29,3,68,69,117,118,26,48,125,83,101,201,255,137,166,217,82,206,163,8,67,133,14,67,200,50,207,137,149,156,24,159,226,107,229,237,204,9,31,79,182,55,200,133,231,15,6,178,4,56,153,8,165,35,19,1,161,62,27,107,139,164,201,143,238,148,130,239,223,142,68,62,78,154,56,18,13,48,146,33,2,38,234,185,34,170,51,131,114,174,213,178,61,86,10,102,233,48,202,174,208,244,84,64,
+57,21,191,183,196,50,104,41,201,114,55,78,236,47,187,229,203,254,117,54,33,61,167,76,238,27,133,198,209,101,92,189,229,152,82,127,124,246,145,69,226,110,116,70,171,187,159,206,115,197,184,30,68,128,8,65,235,84,111,189,114,61,220,61,218,47,146,81,166,85,39,182,189,82,197,87,179,134,111,241,209,59,52,110,61,167,71,94,154,45,86,182,227,253,2,189,174,142,249,11,123,237,89,134,143,209,27,231,176,228,142,95,120,15,46,246,41,111,165,167,222,244,177,244,169,110,102,26,108,130,130,48,233,202,175,233,168,243,200,85,190,243,80,125,149,133,142,224,227,178,120,218,222,20,173,13,63,1,254,241,19,50,21,158,26,189,113,28,124,36,125,226,66,83,241,231,37,214,216,82,228,250,79,178,194,165,105,18,24,135,253,227,113,214,184,220,178,61,194,62,217,36,30,37,38,28,90,230,189,89,218,187,205,99,185,121,32,31,58,126,71,215,201,173,163,86,59,3,136,66,44,210,193,240,32,36,76,24,4,57,147,46,150,210,37,94,211,229,185,87,185,212,22,89,29,229,
+203,73,75,20,247,8,250,221,71,221,247,184,249,101,152,66,224,238,111,241,187,26,124,193,201,144,33,62,250,101,34,32,94,198,170,222,122,58,34,224,168,195,95,197,175,147,157,81,117,221,236,188,58,135,165,37,91,73,74,43,77,243,130,86,89,23,24,236,248,85,168,11,206,238,216,7,192,233,174,194,142,247,67,104,109,186,23,23,155,215,129,8,53,173,71,197,139,92,24,32,176,189,68,118,79,80,165,143,64,60,224,21,8,45,202,62,206,248,9,96,115,113,205,235,56,161,211,147,154,49,48,156,143,212,18,160,174,205,166,234,226,225,222,151,1,239,92,230,33,18,143,30,24,121,83,148,192,240,240,155,181,12,135,236,166,139,96,114,83,185,62,228,234,14,130,129,57,94,67,200,182,76,217,214,177,86,33,48,210,44,150,53,122,192,82,58,82,204,72,226,8,171,113,49,39,31,238,218,230,233,79,235,235,36,37,45,118,249,159,182,45,59,106,186,197,70,135,181,110,59,86,239,228,4,143,251,9,126,28,210,181,8,207,178,220,91,90,246,181,147,207,228,18,200,120,234,
+6,156,12,8,16,209,242,83,57,62,249,199,144,45,248,53,120,233,231,103,228,144,24,70,216,170,228,11,242,39,249,193,1,237,185,1,194,67,32,62,186,197,35,56,90,13,178,26,116,124,83,114,110,18,217,246,86,96,67,11,142,95,227,87,229,233,189,114,224,63,45,205,253,46,163,104,21,235,144,149,100,98,225,102,8,31,230,103,58,113,102,31,240,235,136,233,13,234,187,246,214,80,65,106,235,89,141,250,7,76,201,72,55,30,43,47,121,147,228,173,183,132,198,50,35,121,126,175,248,92,51,62,32,11,15,3,116,104,98,142,10,107,70,245,224,126,30,215,32,138,73,224,121,41,131,114,237,119,38,222,210,34,247,27,231,123,181,206,187,95,177,150,12,169,32,137,9,23,165,46,152,145,29,150,113,227,141,102,10,87,215,86,3,220,114,128,93,110,132,45,151,182,96,62,82,83,236,116,86,55,85,128,124,7,65,220,97,170,87,93,245,140,47,16,123,216,200,54,227,122,255,25,159,143,232,160,220,80,144,51,135,5,155,161,160,98,174,57,43,102,86,197,172,132,210,95,
+195,73,226,2,107,66,26,192,188,148,40,64,93,152,58,35,21,177,238,91,104,177,83,72,196,86,239,174,84,140,44,184,161,151,26,96,103,53,247,194,192,239,35,54,165,5,243,52,30,239,201,9,44,57,131,90,230,91,75,117,251,156,207,247,123,102,105,165,230,214,185,214,199,189,67,188,142,202,247,66,180,18,75,69,31,131,241,112,146,89,236,137,14,250,160,215,166,211,184,195,146,39,70,82,48,21,11,201,123,227,40,52,97,149,71,156,134,132,118,190,129,43,237,237,132,106,72,244,84,234,109,118,84,178,182,196,182,12,170,153,189,174,114,211,43,120,76,255,64,109,206,43,22,104,125,204,64,14,66,67,150,237,228,131,83,180,180,235,214,129,1,145,230,189,215,184,79,196,116,185,80,220,208,124,223,229,183,22,49,46,217,7,117,183,20,42,82,245,14,125,196,50,208,218,91,108,1,142,195,33,141,101,43,189,212,196,178,59,96,14,238,45,62,240,231,230,1,139,46,224,52,129,101,105,216,168,197,74,135,198,231,161,145,94,96,26,74,190,139,213,41,221,89,57,97,221,
+17,113,159,143,123,219,17,187,227,134,177,121,24,78,221,112,187,62,101,135,246,46,161,114,132,145,166,171,193,104,97,230,223,19,36,178,193,39,60,190,65,39,2,103,213,116,171,83,216,233,216,166,194,144,53,209,57,107,128,107,66,237,186,59,98,175,105,238,7,98,100,160,185,15,2,246,89,252,62,202,8,124,243,103,145,75,56,26,97,120,129,50,19,77,24,67,1,43,115,80,239,27,45,220,99,51,44,22,232,174,216,16,7,194,70,233,16,79,104,34,132,17,236,88,49,112,86,103,196,179,142,166,90,104,238,89,131,204,158,234,102,205,247,167,187,228,56,157,52,172,154,149,100,232,113,182,132,28,110,165,210,20,131,216,80,46,45,211,71,85,188,183,92,68,68,108,237,165,120,14,149,139,123,173,113,63,25,248,112,95,149,207,217,90,212,10,201,144,20,141,184,147,158,70,106,49,133,101,139,64,223,254,128,84,55,137,248,5,108,35,152,230,124,243,104,6,216,46,253,186,71,210,111,249,20,206,252,24,158,96,228,65,20,93,207,101,23,80,134,73,46,2,100,219,100,215,
+85,109,187,113,166,194,126,97,38,84,22,179,173,191,96,238,97,30,36,53,253,100,75,215,238,212,121,15,142,77,102,205,207,74,34,191,72,208,222,101,135,46,227,61,156,10,163,62,169,83,218,114,154,73,135,77,207,101,91,145,113,111,98,0,211,30,126,141,224,140,142,97,144,107,233,187,45,186,129,115,211,119,110,163,67,247,78,236,94,191,98,153,122,250,220,204,90,5,157,55,195,60,147,241,225,56,67,52,251,48,169,158,62,100,118,232,134,81,177,229,170,178,206,84,138,191,155,164,158,5,127,25,247,52,177,91,236,167,86,107,142,64,113,139,72,179,164,146,19,208,33,18,118,1,137,89,117,170,116,198,233,43,122,137,19,56,242,227,2,131,50,0,126,52,47,204,127,193,243,192,81,128,138,144,212,82,228,254,162,222,226,123,224,38,125,172,40,63,17,237,105,11,244,23,75,133,250,34,114,191,18,61,195,15,49,227,194,54,37,227,44,38,124,149,249,172,91,208,180,11,138,199,198,54,13,26,24,140,178,84,171,105,190,18,233,186,242,28,102,97,23,31,65,136,28,195,
+45,247,197,179,217,76,152,19,26,183,74,5,64,174,91,212,33,53,129,85,79,111,247,125,21,170,90,161,115,238,96,117,108,141,187,222,113,167,118,63,190,132,137,28,152,14,231,113,166,28,17,84,249,141,64,229,102,112,81,232,147,1,191,238,212,157,123,221,190,199,230,108,213,9,31,198,149,140,36,214,34,235,165,13,139,250,31,239,140,35,6,69,190,90,180,140,173,14,102,105,167,95,231,49,75,149,58,83,103,155,83,201,33,70,168,211,191,52,228,1,250,249,146,246,93,219,90,14,196,8,183,188,152,241,188,171,9,20,91,190,164,7,218,148,239,33,246,117,172,187,235,50,138,157,178,111,152,220,182,203,190,82,174,17,121,9,87,119,237,187,105,149,240,161,74,68,94,18,184,19,174,110,205,211,93,30,173,173,247,108,132,59,200,132,159,160,119,54,117,105,190,150,247,161,113,108,198,196,240,141,95,127,119,163,219,55,154,60,139,154,104,30,132,177,106,56,176,247,6,183,9,244,116,92,51,45,225,123,242,193,30,65,149,211,197,67,159,17,26,199,92,161,113,25,145,226,
+44,47,11,43,93,47,212,232,131,42,73,212,148,120,18,35,48,46,239,163,200,141,81,168,158,143,33,247,240,22,62,98,182,25,19,80,69,188,191,28,213,93,91,74,37,176,52,160,238,136,89,3,121,109,194,181,50,29,202,118,212,249,36,111,91,153,214,168,146,147,95,183,117,134,79,158,72,43,40,81,141,66,174,86,105,46,19,185,114,37,151,186,215,205,162,225,166,251,92,106,66,47,48,17,6,23,207,171,61,210,9,75,110,31,220,76,158,142,206,2,188,18,63,222,182,177,138,106,151,68,83,169,50,4,148,233,72,198,93,193,184,186,221,123,35,171,249,6,201,51,144,247,156,58,77,251,74,192,97,3,61,218,67,146,238,21,31,242,229,58,231,227,146,79,150,52,158,52,54,168,90,125,116,214,26,107,29,26,146,213,101,184,70,31,204,44,164,231,170,0,3,73,74,138,244,76,229,155,126,46,218,178,31,60,104,58,43,48,100,203,93,75,153,32,217,235,98,154,121,14,48,239,104,107,117,40,190,162,95,67,213,121,171,63,20,21,229,207,144,109,110,143,245,143,157,108,
+104,78,30,210,49,100,161,13,67,36,93,160,224,8,59,141,136,37,139,180,92,69,210,20,15,212,104,163,238,124,151,79,15,37,111,213,54,41,165,221,236,47,49,120,64,170,109,140,55,62,64,135,221,105,182,228,157,101,92,183,36,222,49,101,147,77,45,76,118,20,95,156,243,179,40,56,126,24,216,111,97,208,91,154,251,18,197,69,230,92,28,188,64,15,114,46,1,191,115,243,186,59,189,218,106,150,70,70,21,47,216,42,209,134,237,88,255,36,14,192,245,234,36,75,53,28,231,176,199,251,246,154,214,44,243,175,115,0,10,109,214,184,88,128,222,188,45,74,176,172,129,37,249,10,250,84,174,138,254,241,231,186,91,119,83,185,36,106,130,0,213,68,99,154,76,38,46,205,196,151,169,12,125,145,210,56,233,77,52,233,212,215,117,39,189,250,57,118,170,198,10,70,189,205,50,249,40,88,25,20,103,157,196,206,198,163,227,143,81,223,184,89,151,94,129,175,137,253,158,46,20,47,184,12,206,67,244,186,167,135,81,142,14,199,184,129,96,207,199,91,48,19,158,197,22,182,
+173,28,230,201,197,59,27,110,157,57,202,109,158,71,26,96,52,28,41,117,39,39,7,149,249,58,79,15,210,74,241,226,183,25,233,247,58,90,200,208,0,117,85,70,23,139,141,27,32,157,69,251,13,114,133,231,128,126,187,164,158,90,3,69,54,95,129,239,108,91,185,82,31,45,130,220,193,8,160,193,198,232,219,150,241,20,114,219,49,120,199,83,140,107,118,215,106,181,235,226,48,120,164,142,194,217,194,94,58,129,72,84,25,136,115,3,152,200,94,199,210,178,216,245,51,182,121,25,71,193,21,93,231,42,188,153,132,210,251,7,193,141,68,0,19,218,132,44,206,101,30,57,155,203,113,125,49,13,183,246,207,35,121,28,188,236,229,16,166,87,145,6,212,228,233,40,133,251,66,33,112,94,26,107,192,192,97,139,18,51,95,146,47,31,77,108,236,16,251,8,2,248,212,125,41,58,222,92,249,25,166,39,196,21,249,10,211,183,101,37,142,226,184,92,80,160,86,97,123,61,161,208,61,232,29,9,28,193,199,190,69,75,121,217,27,12,49,201,160,67,129,118,55,123,50,98,
+185,22,34,48,66,125,235,200,11,58,200,11,90,167,162,91,202,76,178,238,245,245,208,119,184,175,203,110,186,192,13,214,75,99,103,198,11,84,118,229,214,9,198,184,239,146,192,39,40,212,67,74,250,234,221,96,189,220,195,70,107,72,94,234,98,35,186,207,221,150,237,173,231,90,71,95,19,105,87,250,184,154,212,229,145,104,103,104,128,250,95,192,190,214,114,230,113,105,131,143,72,195,127,7,245,79,222,200,135,14,226,197,73,223,130,141,152,118,113,0,245,94,48,15,164,77,78,88,245,225,97,102,92,196,0,238,114,67,98,172,88,35,130,231,65,98,38,46,182,35,0,217,52,47,88,146,78,170,31,140,133,154,219,158,243,185,35,217,235,74,117,68,111,169,129,115,84,24,184,145,137,160,247,44,208,33,143,173,85,100,184,139,42,131,7,202,111,185,169,76,89,65,198,177,184,173,197,27,225,188,133,25,98,129,16,43,10,178,224,40,102,209,15,137,82,130,138,27,134,186,188,86,85,145,145,211,77,187,166,152,21,151,103,54,141,55,139,243,64,138,188,14,181,106,218,9,
+205,253,246,65,68,154,124,160,142,178,19,163,230,225,227,157,180,10,98,173,240,216,80,121,142,179,223,205,206,112,131,95,44,232,22,201,88,43,50,165,105,18,49,172,93,57,42,4,27,203,209,129,128,182,220,47,254,226,8,11,240,247,42,120,154,219,99,243,148,93,185,44,145,64,131,39,99,40,100,26,21,232,246,198,164,2,41,159,207,6,97,228,160,179,159,12,229,163,113,182,253,16,119,154,33,50,179,74,200,240,224,241,1,70,184,95,143,244,227,78,240,200,29,34,39,97,17,170,74,92,44,20,76,51,186,236,144,236,79,121,225,27,221,37,192,125,177,183,42,252,75,173,166,154,103,42,235,217,205,63,123,253,2,174,143,100,38,242,100,229,22,162,240,114,193,177,193,198,243,172,201,167,210,197,253,185,89,30,131,123,126,85,33,191,172,65,140,25,141,19,241,46,224,25,171,97,174,176,132,100,239,167,87,85,126,42,16,209,231,110,232,64,111,226,55,131,200,5,159,221,254,68,96,45,192,72,45,96,236,166,19,97,54,49,100,96,65,121,117,62,97,169,211,174,143,19,
+171,164,94,123,101,230,223,104,211,55,145,133,225,47,9,227,25,128,65,28,85,240,231,71,142,191,236,14,70,133,227,88,31,177,87,18,196,233,40,136,212,99,48,70,175,35,186,214,194,191,183,22,5,100,160,229,192,233,53,85,118,191,209,138,112,235,150,148,93,236,104,168,175,224,167,224,2,77,187,76,47,93,199,179,66,129,145,242,54,90,47,191,9,123,1,35,21,161,199,35,244,252,82,40,192,238,22,202,202,237,222,154,167,187,225,27,208,165,116,65,192,51,195,1,31,213,222,12,215,240,59,157,175,197,109,41,40,159,249,153,151,153,124,87,249,100,189,15,86,53,177,55,175,8,252,182,22,186,188,181,87,105,216,182,115,156,207,13,17,156,230,88,109,186,110,50,157,214,210,2,1,28,120,98,158,186,120,173,211,241,117,46,190,145,103,160,38,200,180,77,207,33,153,137,64,15,215,135,125,130,50,79,38,93,180,83,137,199,34,119,63,10,45,164,195,69,101,135,163,78,227,229,18,84,205,229,49,55,24,182,221,13,61,24,18,2,160,27,61,222,50,42,240,26,200,227,
+166,96,97,1,161,142,210,253,96,139,77,159,78,140,7,225,184,125,246,252,56,194,196,111,108,197,73,46,66,12,171,85,115,175,107,157,152,166,122,131,57,59,99,148,108,251,110,103,87,12,97,23,41,196,184,75,207,103,121,75,150,52,16,157,178,81,176,55,55,243,101,139,55,252,39,239,52,33,196,224,145,236,43,201,26,219,43,149,39,150,210,251,150,82,71,3,252,114,192,204,89,10,201,19,33,11,142,9,30,0,122,113,16,70,129,188,171,210,238,147,219,214,27,183,161,189,140,113,134,75,239,151,34,160,121,217,31,62,150,41,215,204,201,111,176,106,14,105,190,116,124,44,27,7,15,49,47,177,21,20,210,92,214,32,74,186,227,133,226,115,66,182,139,220,200,146,93,39,123,117,169,114,18,153,89,144,129,135,38,49,48,132,139,199,233,0,80,49,29,112,75,71,161,175,185,104,152,161,8,87,165,164,182,178,191,75,75,111,229,235,105,112,158,25,242,250,243,71,190,181,104,150,73,224,8,205,57,132,21,42,39,174,189,248,186,58,179,65,131,102,85,222,78,229,246,0,
+65,14,166,169,42,59,98,134,185,173,183,98,80,10,35,174,69,107,93,157,236,199,254,182,107,164,54,56,203,50,213,112,172,13,135,197,126,90,109,24,191,62,159,174,205,122,255,216,131,204,15,206,45,121,25,30,118,250,29,61,20,27,173,161,115,128,212,159,141,82,48,132,157,149,235,89,23,97,165,224,76,215,60,215,129,208,244,21,115,126,200,108,43,100,234,229,54,110,183,220,137,97,237,105,142,211,29,47,39,183,111,40,199,103,6,79,132,208,205,71,147,142,195,242,235,92,174,171,95,2,229,202,28,164,178,150,165,203,160,231,45,62,249,232,204,14,243,218,194,101,204,98,31,237,2,229,78,250,120,58,150,180,113,61,157,59,187,227,217,85,72,102,122,237,29,247,237,15,59,188,41,119,209,229,165,221,135,58,130,52,134,21,199,100,216,56,231,206,29,206,198,252,216,125,84,17,213,212,78,168,172,93,173,129,171,196,38,132,157,143,184,45,112,197,26,96,185,85,96,24,233,42,222,51,211,227,71,67,154,159,38,178,30,238,235,27,1,251,238,135,158,102,193,147,236,196,
+130,38,202,101,25,199,4,176,236,172,137,227,37,106,182,107,252,106,22,204,204,161,205,93,66,117,131,82,237,5,21,150,182,196,195,80,78,110,218,228,32,71,78,179,19,99,149,68,234,82,102,120,93,94,186,127,89,157,132,182,149,102,223,172,232,224,214,135,225,190,127,127,87,220,14,49,119,91,220,142,68,153,180,109,83,21,217,140,32,32,251,19,19,11,81,244,37,154,1,142,13,227,108,130,187,197,89,1,142,57,164,20,73,159,179,249,115,40,107,93,237,31,175,248,79,215,123,9,97,121,5,190,204,83,198,171,41,9,190,24,14,36,204,129,93,245,186,188,153,123,4,138,222,39,50,201,205,227,170,8,165,72,27,183,45,227,20,46,217,40,162,90,184,131,122,124,195,29,210,124,204,142,189,247,244,110,97,116,247,80,52,228,167,132,125,85,52,159,205,132,174,34,190,24,120,55,95,107,34,217,196,185,182,252,7,21,105,38,41,246,239,197,217,71,37,197,112,177,204,188,96,45,197,190,150,99,236,122,200,165,83,161,44,78,154,34,239,171,53,199,185,116,148,208,20,149,
+55,15,240,61,45,36,186,30,133,64,211,208,107,249,32,244,182,9,115,92,164,98,75,8,251,160,78,156,45,179,112,166,134,163,96,234,213,167,233,116,4,37,94,150,236,101,73,6,136,11,53,97,147,169,190,22,169,199,17,136,70,14,179,40,170,147,209,71,100,59,147,201,53,231,243,251,155,171,175,52,67,61,187,39,212,138,34,234,184,196,242,97,109,187,102,243,151,154,27,106,108,84,130,42,28,142,16,199,249,201,171,191,252,221,17,58,213,56,3,138,254,142,246,18,23,18,116,18,138,62,61,165,188,93,184,214,215,173,82,197,140,117,151,27,91,166,241,25,221,178,209,113,146,28,243,97,97,43,90,225,10,82,161,57,163,87,126,14,47,37,109,3,114,177,86,143,139,174,213,158,200,197,226,66,227,90,220,170,141,25,5,216,59,98,135,51,105,116,112,89,103,53,127,230,52,187,209,157,110,10,59,84,225,105,91,183,97,170,121,213,85,205,73,215,71,54,230,43,166,194,131,125,250,36,228,114,54,142,45,1,186,24,222,219,36,65,136,105,132,206,189,39,93,178,142,233,
+31,87,3,235,145,171,209,86,200,183,118,255,107,211,103,212,73,76,220,157,33,166,48,217,141,122,148,41,128,120,102,113,93,102,191,158,117,228,201,205,90,220,84,236,219,101,208,29,87,160,228,164,197,128,177,146,27,91,165,211,244,62,206,223,235,238,212,177,16,1,174,192,145,138,4,134,145,192,148,110,36,166,118,179,13,60,135,107,106,57,176,12,238,9,209,37,48,136,92,118,184,168,105,196,86,240,57,170,40,200,105,248,204,62,186,45,160,210,234,178,74,217,170,254,90,101,245,170,214,93,238,7,126,53,104,25,180,219,165,132,146,149,180,237,119,183,222,226,242,9,45,110,45,1,80,201,181,99,161,43,252,112,221,216,55,1,132,221,66,96,52,194,62,185,105,41,23,141,4,38,67,125,175,207,76,135,84,214,199,35,135,235,191,170,93,101,145,83,154,36,90,49,30,17,251,90,236,170,90,179,85,101,157,27,200,163,1,197,152,233,118,39,105,252,252,218,113,144,199,254,143,174,222,163,85,154,52,77,211,252,43,31,204,178,135,130,158,69,195,208,204,31,152,213,108,134,
+89,85,81,81,217,49,85,81,149,21,145,68,102,146,100,66,131,107,113,142,107,173,253,184,214,90,107,63,174,181,214,90,107,125,92,203,254,178,155,174,238,25,48,12,211,143,241,242,218,125,223,207,198,174,83,205,192,61,22,55,78,230,236,113,232,148,78,97,106,191,45,105,37,166,233,167,64,163,212,168,187,57,91,67,141,227,243,191,187,55,194,156,222,1,197,218,103,61,95,1,110,122,228,220,101,30,79,152,156,154,120,35,170,113,82,129,107,219,73,82,90,59,129,194,35,74,85,62,169,112,84,147,154,160,160,16,213,113,74,119,218,118,106,103,68,9,254,148,76,91,148,69,99,235,177,157,42,151,155,190,212,215,182,26,97,88,238,219,233,235,118,130,125,93,143,174,68,57,245,102,119,242,186,56,107,148,180,86,148,42,132,1,208,17,211,194,134,108,8,201,233,136,83,109,49,210,45,25,43,156,35,5,120,204,86,132,196,203,240,168,241,204,39,49,4,3,77,96,34,111,124,198,45,31,195,10,67,39,55,69,99,166,26,141,60,75,96,228,168,65,168,248,182,26,198,86,
+146,55,210,99,40,131,199,239,121,244,91,94,249,165,19,143,119,185,212,88,84,145,17,9,201,92,15,43,225,240,142,97,200,60,4,11,79,124,174,189,223,89,68,129,157,3,23,123,224,227,38,63,233,37,173,126,30,68,234,153,75,234,66,40,123,91,6,251,190,203,49,139,91,56,16,81,10,171,48,82,176,39,6,246,114,113,214,126,54,229,173,186,217,253,100,185,71,198,20,223,82,219,93,173,196,176,158,45,81,187,84,159,215,6,142,109,210,167,230,67,170,125,54,184,173,53,72,171,73,29,172,80,5,13,231,44,247,152,35,240,229,235,46,163,10,158,49,59,143,143,99,151,175,226,232,86,185,238,208,28,154,158,142,206,170,191,223,238,171,56,184,140,229,62,175,187,241,104,254,142,253,74,75,164,20,137,91,237,100,242,11,158,179,201,184,219,203,22,235,133,108,104,182,117,213,48,147,158,218,40,5,23,178,153,96,244,61,152,156,103,50,25,185,16,200,105,200,210,69,21,119,47,83,214,251,155,1,33,161,184,62,253,165,150,105,237,1,169,30,214,55,9,105,25,0,214,
+5,47,230,235,253,213,78,205,191,235,137,24,30,91,181,47,134,22,221,251,181,39,190,73,167,135,133,69,68,71,136,24,200,186,164,226,211,30,59,206,16,152,212,129,196,79,120,103,244,68,76,238,33,195,197,245,211,240,24,232,31,133,174,13,168,159,126,234,155,83,222,110,202,139,157,17,25,145,207,170,119,251,224,120,68,229,211,55,27,175,3,171,40,194,65,67,34,75,233,180,89,216,75,9,241,90,204,52,42,201,125,16,148,196,62,170,199,223,1,124,118,60,112,134,167,61,29,56,206,46,235,246,197,16,31,232,147,196,196,7,60,84,52,65,116,32,244,71,244,58,105,16,130,135,232,128,18,134,143,64,75,124,108,67,56,171,224,56,49,226,23,144,45,38,150,137,63,54,121,24,94,122,188,118,75,55,223,114,65,138,223,141,43,49,183,85,179,82,66,76,250,16,164,21,115,247,228,49,236,193,250,176,45,83,135,134,130,186,254,114,126,84,228,57,236,170,64,234,103,89,1,92,134,129,210,36,223,27,10,145,152,44,30,147,84,67,18,121,88,166,144,243,69,114,123,97,
+171,100,43,249,218,197,37,156,73,137,214,209,42,250,56,111,177,77,3,168,86,14,162,57,220,221,28,152,91,171,163,138,167,205,176,53,41,168,80,118,53,148,158,52,145,193,54,76,78,8,53,38,50,104,86,139,163,28,22,42,220,41,37,185,12,185,182,73,88,226,15,167,8,176,130,9,235,28,236,152,0,13,244,116,178,185,47,89,67,177,82,72,99,99,215,59,175,32,79,174,214,197,230,253,217,188,3,179,108,110,236,72,182,2,114,217,176,89,60,89,162,7,6,28,214,0,12,50,48,81,190,242,115,82,207,68,123,209,72,142,62,225,7,12,194,40,84,172,79,240,87,29,97,154,22,99,18,41,29,193,247,254,142,138,159,107,184,212,15,136,84,171,75,128,201,124,34,13,233,214,216,118,27,130,47,130,37,142,201,164,49,117,64,152,19,25,227,119,140,86,31,14,51,62,124,88,103,8,62,11,92,21,4,51,190,30,207,21,190,136,97,211,247,110,141,165,28,218,145,234,24,82,204,4,162,194,120,141,197,84,90,143,234,70,183,21,132,227,17,6,86,158,180,2,96,201,
+248,240,183,12,248,198,92,201,206,52,41,132,38,213,92,25,82,74,63,61,124,218,21,197,203,210,78,239,61,71,203,177,179,223,28,144,221,95,182,195,52,186,53,133,124,28,31,166,67,88,146,240,19,38,126,98,34,18,187,9,144,99,4,12,65,70,226,0,129,0,34,34,105,44,157,74,50,5,239,117,236,10,158,28,200,134,99,19,241,232,112,197,125,173,58,59,184,78,10,61,229,223,57,18,82,212,147,82,51,98,106,182,62,169,104,241,10,121,61,148,65,163,171,18,61,5,229,189,28,72,201,71,1,53,153,224,215,83,64,136,113,251,174,227,58,179,26,114,35,155,102,225,79,223,29,1,30,230,60,71,59,97,144,121,188,120,212,107,61,94,5,193,237,162,121,24,244,136,27,71,160,179,190,137,178,233,112,215,226,17,102,125,93,141,198,58,22,245,226,152,221,7,25,106,136,41,64,125,102,189,32,18,221,219,83,242,116,7,115,78,39,17,225,36,122,111,196,144,17,18,141,85,95,85,188,83,42,119,42,231,222,168,112,230,154,102,96,151,71,155,202,72,158,174,10,177,
+169,3,81,244,66,8,182,198,188,123,0,52,184,135,193,220,58,103,188,24,14,106,68,97,71,78,12,140,27,121,47,176,100,241,220,50,229,177,82,114,118,141,103,189,201,94,8,199,4,2,4,23,72,222,208,248,69,155,113,244,45,165,70,142,212,118,232,191,8,155,123,190,177,253,158,28,195,150,32,187,2,32,108,23,239,141,245,156,122,70,38,179,215,58,161,146,16,229,84,34,13,203,69,89,35,116,156,219,89,11,127,29,215,60,98,111,149,140,0,21,21,38,146,91,235,144,225,80,208,238,196,197,221,54,228,221,30,56,205,196,217,50,14,23,188,130,160,143,137,247,67,250,211,239,218,100,121,50,239,118,43,67,210,80,111,10,18,72,237,21,82,122,155,220,119,107,96,18,117,22,87,212,202,68,66,62,113,198,169,148,247,104,45,94,215,188,117,17,157,128,184,213,51,97,56,120,155,53,106,104,98,198,27,83,142,170,104,77,39,52,192,111,252,6,42,24,217,118,206,242,237,11,207,99,15,142,82,44,244,181,51,46,83,174,167,161,179,147,6,128,165,243,119,213,51,66,
+157,204,157,128,157,134,37,34,53,198,75,177,35,153,14,9,120,131,30,90,221,89,87,213,235,1,102,174,143,195,77,52,48,156,82,219,99,61,209,242,28,65,188,36,79,68,63,167,129,26,155,91,148,9,24,109,30,82,125,28,88,152,3,249,244,166,227,97,171,28,66,176,197,97,54,191,175,17,26,130,154,3,191,115,16,236,112,118,136,117,80,152,196,246,80,158,92,226,99,81,75,76,86,198,128,27,124,63,63,146,116,152,165,167,192,122,86,142,163,185,153,222,243,135,129,140,78,52,18,129,142,35,37,102,134,187,0,213,250,148,57,254,86,10,101,202,7,184,189,77,154,184,222,74,15,51,87,177,35,240,118,168,186,122,15,81,239,113,106,224,94,234,27,242,115,75,161,62,246,16,228,250,239,215,92,255,75,89,147,156,231,203,47,118,196,180,162,78,97,40,107,171,37,234,184,148,35,83,155,55,162,141,13,76,27,71,83,195,117,20,105,141,214,99,209,117,190,235,210,148,104,164,131,199,233,208,173,166,33,135,135,98,94,174,135,139,162,116,200,168,78,22,221,46,191,127,
+58,23,228,196,151,159,12,248,66,49,136,94,216,209,145,75,108,98,153,4,246,53,254,173,128,119,59,111,113,189,247,143,4,124,170,117,14,3,58,149,65,140,194,215,83,40,53,84,20,30,228,253,134,50,16,20,125,127,78,185,119,164,78,243,208,105,238,218,75,154,45,88,179,246,42,250,45,70,65,211,222,130,107,71,236,2,242,36,80,136,77,64,32,107,92,217,213,154,161,190,30,199,205,247,250,234,6,246,244,200,176,178,194,104,93,58,46,7,215,237,12,190,89,203,142,227,118,181,24,55,172,213,0,195,233,46,60,238,156,71,179,187,229,187,202,31,81,71,77,183,51,109,209,185,33,30,215,179,42,1,146,138,88,82,16,43,188,9,49,147,87,198,73,64,21,138,178,30,206,204,170,241,44,83,94,179,180,38,187,253,44,179,121,98,132,162,75,226,250,172,12,94,242,121,229,44,122,128,75,208,155,166,115,42,6,148,220,8,186,240,121,94,123,177,251,252,113,91,48,207,13,4,9,76,170,83,3,216,143,3,30,160,176,236,136,158,7,69,101,166,105,248,46,72,61,25,
+117,226,18,10,115,69,109,108,58,213,134,51,75,183,150,205,106,253,145,52,231,209,16,123,150,185,80,221,233,214,182,163,3,140,155,173,113,232,166,251,23,99,232,246,221,228,130,84,35,101,108,187,240,253,235,57,119,102,191,115,114,138,186,41,191,193,222,40,226,176,180,93,104,233,198,158,116,202,181,186,28,55,173,206,171,200,133,213,70,124,80,28,130,232,65,237,54,62,172,105,38,67,229,97,62,83,144,206,178,55,129,231,121,231,204,76,118,174,76,97,220,226,5,44,27,101,26,17,117,78,7,89,95,34,42,222,21,160,193,193,54,22,73,232,108,238,189,205,13,57,227,233,22,102,224,106,27,178,30,237,218,248,234,211,202,209,90,94,3,120,155,240,74,237,178,237,161,108,149,222,57,197,20,204,45,167,242,66,189,128,32,202,68,136,235,177,69,240,89,75,189,161,97,190,150,190,67,26,191,23,163,38,126,205,72,65,95,177,20,155,162,93,30,160,129,8,139,199,70,116,24,223,29,121,35,214,177,199,221,110,102,233,252,136,60,74,129,181,249,130,54,126,34,75,66,240,
+227,216,39,30,13,28,69,233,157,232,44,99,234,160,114,10,68,77,37,242,240,163,194,146,148,212,243,135,117,129,59,85,213,36,109,146,42,239,207,72,9,169,156,144,111,210,110,154,205,138,103,217,117,199,46,28,181,35,85,143,133,8,231,207,145,3,187,187,66,79,141,100,73,229,22,69,75,87,76,109,71,169,37,103,242,250,132,255,21,44,53,221,45,63,239,13,167,98,222,117,134,94,202,86,100,27,45,253,105,235,154,237,171,32,156,185,1,222,14,211,216,118,46,208,178,14,178,139,209,109,62,10,63,53,153,220,85,142,131,24,158,108,207,198,124,230,205,148,75,139,117,53,230,73,94,27,221,82,236,198,125,168,250,22,181,251,161,62,143,147,113,42,113,125,104,191,238,214,219,182,127,74,140,211,239,154,86,106,136,242,220,246,167,123,254,132,118,172,175,240,182,105,129,73,21,143,79,233,68,117,111,228,204,141,70,104,162,90,140,7,39,237,151,218,110,155,170,88,62,50,46,21,51,185,120,123,158,89,127,83,172,107,5,91,178,32,184,225,116,243,211,11,182,98,106,42,
+243,34,50,233,169,216,101,242,161,199,170,52,153,46,167,116,48,235,133,63,39,125,134,9,79,251,140,241,51,165,58,63,68,111,12,144,75,51,22,138,14,248,57,226,15,69,18,71,106,141,229,179,4,121,245,202,232,250,171,185,107,100,9,161,47,238,82,19,154,106,190,63,68,183,178,154,91,117,30,22,247,75,129,118,79,51,220,247,215,190,231,202,183,83,235,186,211,49,178,181,112,51,103,161,159,105,237,135,66,243,233,124,160,180,8,65,66,23,159,146,74,128,83,154,250,186,126,235,13,202,13,68,168,224,197,0,54,105,19,247,68,182,60,199,80,165,246,187,182,224,188,203,243,198,124,121,69,204,57,87,40,194,247,11,27,202,124,131,159,207,217,222,38,188,26,137,209,91,201,144,102,92,128,14,78,242,85,228,174,4,11,255,228,154,210,123,251,30,188,218,99,110,188,182,87,228,210,93,22,69,178,134,109,189,32,33,101,193,148,83,134,235,157,216,49,132,97,6,138,249,31,181,71,15,183,243,202,196,74,22,23,83,166,67,61,133,74,198,91,175,101,235,173,155,40,237,
+118,217,166,179,175,248,75,69,57,234,40,169,176,66,213,212,48,110,45,115,245,240,156,44,110,141,250,233,161,210,127,241,132,236,103,35,23,77,204,63,70,189,147,102,116,210,229,234,96,250,153,50,234,145,77,72,222,158,140,79,98,4,240,196,69,242,220,164,238,242,1,150,101,66,91,63,167,214,205,156,44,169,77,59,74,249,52,160,187,135,223,95,84,96,6,251,124,209,83,206,185,76,100,181,41,174,31,129,92,215,155,218,68,8,104,81,94,21,64,1,231,140,49,68,101,21,99,109,19,85,125,168,65,52,169,242,60,14,51,191,189,65,14,129,168,41,200,140,154,69,17,147,68,22,52,119,73,181,124,81,125,233,20,212,146,165,52,92,149,181,99,121,101,44,127,147,123,103,228,254,145,132,20,178,213,33,58,9,199,75,124,69,37,95,155,177,84,15,124,167,118,216,132,184,128,10,104,115,137,70,130,35,150,118,228,234,162,105,32,169,43,17,27,68,147,40,106,27,121,221,219,107,71,116,107,31,80,75,14,111,108,246,163,133,25,220,149,48,121,200,206,143,104,116,226,66,
+86,192,209,138,244,177,181,2,11,52,33,80,152,241,138,51,145,124,180,30,48,36,10,178,132,249,188,190,97,140,88,203,29,229,8,245,145,71,74,70,219,114,57,154,81,33,42,182,117,127,238,13,201,4,202,24,193,156,98,22,128,99,20,184,141,132,85,200,88,34,48,108,3,128,70,175,213,10,85,87,128,227,242,184,154,143,62,239,233,82,246,160,236,241,214,206,247,126,117,152,214,131,212,238,148,230,21,148,18,185,190,178,178,55,155,0,3,161,235,72,2,199,113,101,104,180,35,241,217,188,15,248,95,19,94,245,157,251,132,164,159,178,181,139,64,224,216,66,237,175,128,31,5,233,134,110,43,55,183,243,236,84,159,169,57,147,143,73,239,181,43,76,157,26,109,177,21,177,141,52,192,37,99,93,102,83,116,133,144,198,2,242,232,247,121,150,173,233,15,36,48,100,130,16,216,253,17,190,26,151,192,70,204,212,154,48,12,103,205,177,201,18,154,144,66,65,70,80,85,108,0,139,143,32,10,170,8,174,192,249,78,184,140,192,24,205,218,133,3,225,42,151,224,245,148,156,
+12,114,249,233,173,226,50,101,201,102,146,167,157,21,249,138,148,168,219,248,35,212,15,23,2,176,140,120,230,67,90,7,202,0,205,170,97,142,235,152,20,40,1,76,248,8,142,105,105,200,5,49,204,203,94,118,137,232,137,255,236,88,34,8,46,29,226,177,213,130,159,81,175,243,50,7,63,224,251,79,247,53,231,254,158,136,220,87,2,80,34,140,241,49,235,248,177,180,154,250,42,119,119,108,144,140,120,90,68,92,117,206,223,20,151,119,241,99,174,64,56,216,212,109,21,65,37,52,58,211,92,229,2,234,55,184,52,180,36,16,82,244,123,249,77,84,104,140,36,204,234,131,143,241,220,231,228,58,36,49,75,95,147,170,68,150,139,70,75,185,24,180,199,7,111,13,249,30,219,23,119,188,205,214,229,171,100,20,78,73,225,97,148,210,17,117,139,137,118,121,129,99,37,252,36,241,156,36,143,245,49,233,54,200,163,135,233,205,83,190,177,245,205,89,137,108,255,0,33,16,124,4,196,76,114,116,62,51,50,25,255,195,5,217,231,162,82,159,28,201,59,77,223,40,111,57,
+18,31,180,199,163,167,31,8,0,232,13,116,231,71,52,192,125,135,41,134,159,110,207,49,251,192,61,62,27,227,186,7,123,158,83,60,4,50,153,121,236,114,232,243,17,199,86,31,129,21,138,53,230,225,98,43,100,104,230,93,12,245,116,41,244,114,179,214,204,163,3,182,118,70,255,134,162,25,169,138,170,184,3,129,249,3,170,139,78,47,43,159,66,236,199,187,100,92,105,111,198,3,241,77,136,114,104,96,30,169,109,113,26,50,185,135,99,53,119,16,17,216,250,234,241,179,218,142,162,23,66,103,236,88,237,142,197,169,215,174,49,29,155,136,147,172,40,5,153,226,238,70,94,4,199,214,39,176,40,73,125,188,158,199,142,174,148,239,147,113,35,166,136,41,132,36,2,249,130,36,66,83,150,134,206,121,2,226,19,21,29,150,85,160,251,165,71,227,58,187,144,225,116,105,42,82,24,106,225,4,143,199,58,194,82,151,14,248,64,248,28,222,95,35,177,213,95,52,54,125,88,141,108,84,81,8,205,173,42,167,35,34,116,234,34,198,74,64,234,75,78,140,245,71,110,37,
+175,90,1,165,181,127,38,177,191,203,133,231,73,25,214,216,48,148,93,100,72,17,132,246,120,192,65,74,78,14,34,0,66,121,163,78,135,61,202,79,185,71,229,70,178,98,163,238,214,136,74,2,163,31,89,36,240,25,123,118,11,177,166,254,194,226,92,4,73,14,46,195,6,161,165,94,93,187,235,181,170,16,43,135,210,122,134,227,205,32,20,43,132,110,52,67,97,13,145,56,186,68,34,182,243,192,232,59,109,104,214,14,46,68,97,9,225,175,132,154,126,153,50,235,203,171,145,114,194,157,178,108,118,126,191,185,102,248,196,39,133,48,7,50,103,29,39,1,221,76,66,123,192,171,100,75,166,146,153,56,59,91,218,126,24,235,30,173,234,9,9,185,45,244,175,21,51,126,236,29,239,100,40,104,105,34,116,25,111,71,70,79,31,42,145,167,10,8,220,46,3,109,10,159,118,114,20,200,132,53,130,228,254,144,199,163,182,211,108,64,101,189,68,85,176,240,71,19,59,201,151,73,8,132,59,22,98,230,241,97,146,117,35,16,234,163,217,139,48,122,122,34,171,53,142,1,
+68,133,139,76,112,68,169,205,98,72,77,203,82,186,206,37,74,153,111,229,44,204,49,171,181,242,42,173,251,148,31,112,170,230,182,111,5,196,164,246,117,235,231,30,242,89,48,54,167,131,4,143,94,17,44,233,147,190,108,227,79,83,22,77,236,64,85,106,71,217,129,219,16,87,63,32,110,157,190,205,117,26,22,120,229,150,139,164,50,105,35,1,176,175,170,236,4,30,65,171,206,46,36,219,16,1,80,235,92,153,104,111,95,241,237,103,254,6,137,78,63,63,183,137,209,76,137,100,173,195,54,236,67,226,246,101,118,25,227,158,111,20,128,146,74,40,194,80,239,42,213,144,177,20,64,54,194,48,116,126,32,144,56,7,159,221,0,233,129,180,89,40,37,35,161,154,53,187,54,135,238,62,43,101,181,8,198,3,73,41,25,98,125,54,54,180,180,178,185,30,249,92,191,58,91,203,46,224,14,225,1,214,32,62,86,68,144,26,115,252,74,45,111,199,243,99,124,28,164,100,230,179,96,107,20,152,181,38,63,106,144,90,37,151,177,129,34,121,142,123,186,107,165,153,175,145,
+127,40,147,100,124,153,220,181,144,194,157,163,28,17,62,84,238,42,52,206,32,182,196,25,41,68,163,190,218,21,163,107,223,101,214,247,218,99,16,45,38,94,182,112,106,171,179,49,36,116,197,151,139,56,180,26,115,201,218,218,237,135,48,91,104,180,246,144,211,110,114,142,190,120,152,253,35,136,191,126,110,141,96,187,15,59,159,139,135,51,201,249,144,243,98,228,149,122,227,121,167,44,23,234,30,174,166,184,54,92,239,178,44,52,191,185,249,205,43,9,221,29,224,51,200,94,20,199,49,162,11,237,180,144,131,225,221,177,177,218,133,209,247,100,27,137,78,212,14,153,31,51,250,13,184,194,102,80,112,223,7,241,164,62,246,201,45,220,139,242,126,45,42,186,227,239,221,38,77,186,126,174,199,85,162,77,169,82,107,80,168,100,222,51,231,206,167,52,249,110,53,209,60,182,110,233,107,247,32,238,220,141,183,143,116,122,230,166,186,25,47,197,226,251,45,204,249,153,221,228,208,135,233,45,6,162,216,89,197,68,196,85,152,131,114,206,75,137,135,124,183,7,51,40,36,63,
+176,9,51,19,77,211,57,115,189,133,105,139,112,115,116,135,206,189,12,168,21,81,239,167,166,92,226,90,101,41,88,151,183,8,183,102,162,153,185,237,137,87,169,116,232,235,131,99,123,155,237,138,207,15,145,136,119,211,211,28,68,68,121,182,173,176,179,210,34,104,35,156,25,107,2,78,92,69,143,101,174,129,188,247,194,24,100,200,203,202,11,39,47,159,206,153,50,112,188,75,114,8,102,78,142,96,102,81,77,92,226,110,207,193,157,56,61,147,142,150,46,177,87,113,19,80,157,182,103,112,98,44,28,111,231,5,84,132,70,11,51,48,126,166,106,150,180,90,102,171,201,239,145,158,199,93,234,54,34,217,45,175,85,140,24,171,148,216,196,164,42,133,68,190,66,200,150,9,65,167,130,229,98,173,154,190,252,36,198,249,166,44,85,223,30,203,37,173,251,86,251,72,70,49,218,48,187,146,238,31,141,5,58,40,100,10,81,2,233,103,47,84,168,231,107,119,175,108,61,151,108,17,22,62,37,21,23,178,20,204,80,136,122,11,2,63,192,56,233,98,149,81,52,94,233,98,
+249,168,8,188,76,218,203,27,192,25,109,11,189,61,241,73,40,206,77,229,21,187,65,206,160,51,72,198,189,138,234,113,49,176,113,166,72,36,76,240,65,110,43,193,145,81,242,52,81,96,90,17,106,25,55,34,143,113,149,17,194,40,52,196,206,175,207,22,252,30,40,115,253,194,232,238,195,172,105,105,30,114,234,246,59,217,243,12,46,24,14,141,131,194,31,123,53,122,18,133,25,125,159,37,32,7,177,111,81,22,243,97,2,16,12,32,224,219,34,43,51,149,104,97,227,79,44,242,65,199,33,158,218,56,167,71,44,153,122,132,28,167,26,196,178,201,88,71,220,125,174,101,206,45,12,149,49,191,72,185,139,223,71,87,29,53,70,253,31,253,64,63,244,169,245,8,96,235,206,138,191,176,128,132,115,236,82,95,111,126,178,183,169,164,106,152,197,119,85,193,236,132,50,197,5,226,245,185,146,48,116,130,46,75,37,127,164,212,143,156,71,125,15,197,223,179,64,213,211,165,136,11,114,210,240,47,135,75,185,111,166,3,115,130,210,36,88,205,205,144,70,133,190,248,222,11,
+228,252,70,76,143,243,246,50,37,120,53,50,228,178,45,8,243,76,131,160,21,36,13,247,102,15,115,21,121,152,108,57,151,231,33,157,30,46,48,77,7,76,36,178,152,228,126,123,90,246,148,134,50,122,192,216,253,180,9,170,112,134,119,69,189,232,145,193,173,87,97,213,246,17,237,199,72,108,91,23,123,177,232,130,81,57,178,230,45,150,155,117,101,248,158,139,192,51,115,130,86,79,85,149,6,47,63,58,5,142,123,55,118,88,134,73,40,154,97,48,56,236,31,170,131,208,44,143,15,52,198,188,7,240,165,50,135,235,235,232,203,220,102,13,249,231,66,173,110,131,41,90,129,250,171,24,42,46,48,165,21,33,157,229,220,181,99,235,241,182,174,244,253,26,232,14,62,142,39,70,113,12,57,81,100,87,164,46,75,181,189,153,202,179,87,103,124,181,219,136,130,235,79,71,148,130,50,196,132,196,252,37,43,49,248,85,171,79,120,85,2,169,7,245,122,21,120,50,158,90,251,53,161,80,22,10,227,70,149,21,224,43,11,183,203,145,231,219,95,255,66,84,133,204,181,140,
+219,172,70,10,116,64,166,242,209,230,198,209,31,61,98,110,241,238,8,220,169,21,89,18,23,255,82,117,190,84,171,48,204,226,160,43,172,236,178,204,108,40,27,92,50,228,218,197,167,98,156,120,76,205,26,219,86,146,135,26,136,186,56,10,9,119,117,0,54,37,71,246,9,94,234,210,26,159,71,193,172,152,19,134,187,110,184,90,159,192,110,86,11,59,254,163,55,108,198,41,226,81,217,178,100,115,29,215,80,176,245,160,93,61,198,175,198,234,252,108,70,122,229,71,230,30,247,198,222,213,130,34,129,210,90,53,99,207,80,50,6,142,217,132,233,158,109,114,39,175,40,40,150,240,43,115,26,119,103,93,98,107,145,78,145,214,171,185,116,164,248,32,96,181,5,134,133,123,1,122,187,65,195,187,199,10,242,202,9,209,75,15,233,17,201,62,240,155,24,126,119,191,19,47,131,246,100,44,176,104,149,79,164,190,100,71,27,242,24,187,8,231,89,139,105,3,209,6,215,87,179,48,229,199,68,49,230,32,243,231,64,33,242,20,175,19,226,69,130,39,156,14,179,167,113,102,
+47,201,203,236,178,194,99,192,99,172,244,69,15,249,73,208,210,159,70,204,83,31,83,123,229,160,37,55,161,62,14,50,106,93,148,138,124,108,36,155,77,159,213,172,0,134,162,247,125,57,39,182,202,157,221,89,58,232,182,218,114,107,237,165,158,16,58,115,52,84,205,218,255,74,21,155,53,68,107,106,106,143,119,192,116,79,113,251,44,125,95,184,98,183,37,141,243,154,7,188,39,135,254,61,60,208,115,112,238,149,121,107,89,157,200,83,237,196,90,161,170,220,33,233,205,242,30,117,247,25,179,167,184,18,189,237,180,9,51,100,105,39,204,224,239,194,110,207,67,127,110,129,13,7,111,162,59,9,214,162,86,178,18,79,220,25,180,28,133,176,247,152,101,46,157,108,42,48,241,190,14,62,65,158,67,11,131,117,85,191,128,87,53,240,46,113,94,216,230,220,220,63,3,64,146,148,207,229,50,36,163,169,16,185,209,197,165,155,133,44,146,65,192,191,252,70,246,206,34,112,71,57,168,34,133,91,117,27,69,214,132,134,3,38,26,202,213,179,103,16,202,29,186,93,70,226,
+227,85,163,4,180,239,65,252,64,94,77,223,132,2,207,133,221,128,133,60,46,242,174,251,254,24,230,74,215,34,84,172,122,99,196,63,201,143,184,173,153,169,34,231,124,210,96,169,102,45,68,172,153,0,193,128,100,187,190,34,24,240,49,3,106,209,230,134,137,8,174,146,17,25,204,213,59,135,117,142,134,141,8,94,13,228,149,61,104,79,252,228,19,95,116,208,198,150,244,114,194,159,152,224,135,243,212,115,158,240,126,39,137,179,59,120,40,51,214,216,194,64,206,80,81,216,91,146,27,102,232,212,15,211,186,81,176,56,171,18,139,177,226,111,115,96,16,216,174,52,42,93,10,121,126,87,223,17,0,201,204,15,100,97,5,30,30,125,28,148,167,117,123,163,221,30,105,62,188,75,135,223,102,55,229,62,44,182,155,217,189,248,214,73,83,77,30,236,229,23,19,202,254,26,220,124,213,115,34,244,81,229,250,177,3,131,140,15,2,19,193,182,42,183,129,243,1,58,132,212,103,224,125,20,96,11,244,42,36,254,11,198,200,167,191,144,151,64,148,38,22,197,212,122,238,206,
+183,43,245,124,250,50,152,179,123,12,137,101,29,222,128,248,8,101,185,128,39,53,196,61,190,139,210,244,60,104,168,40,149,247,169,59,131,2,35,151,82,2,171,11,17,170,153,55,225,106,96,48,191,152,156,105,138,70,157,212,28,6,144,80,171,177,160,244,109,236,227,125,45,14,124,113,145,99,115,239,149,126,128,92,82,148,78,159,11,214,21,151,118,70,44,172,62,125,187,74,106,236,22,117,78,117,224,192,165,12,216,13,224,129,252,61,221,52,110,87,181,10,0,187,68,5,184,104,29,208,235,67,235,50,125,22,52,7,1,219,35,94,238,237,243,198,9,10,48,253,1,94,178,193,229,9,150,78,73,120,12,79,27,110,203,231,120,20,79,142,230,226,164,56,79,22,179,177,103,204,0,62,213,227,29,104,175,122,86,42,23,214,111,14,78,163,171,2,82,211,236,215,204,8,144,25,244,9,95,157,154,62,148,243,33,48,230,107,177,39,56,156,232,119,41,229,187,5,102,46,199,65,150,18,160,18,110,103,28,139,136,6,174,82,65,239,84,170,132,176,227,60,130,173,176,123,
+19,6,61,152,68,92,28,205,27,34,74,31,193,209,7,69,46,188,112,196,138,244,30,141,22,42,91,239,69,188,51,131,161,52,111,213,31,103,117,241,9,13,50,172,20,64,202,30,80,203,112,190,99,206,139,32,114,14,207,50,165,217,229,117,152,36,114,199,1,151,131,75,249,222,80,118,249,229,219,2,103,226,201,200,32,80,21,43,171,114,128,43,243,202,65,29,56,101,170,39,40,252,145,103,114,141,141,162,18,54,39,159,39,243,112,187,29,210,223,191,235,96,215,16,218,49,111,35,2,255,169,215,175,133,69,209,192,52,148,54,38,139,34,239,232,232,96,204,114,68,125,150,169,207,62,181,14,134,150,122,32,169,198,41,148,196,28,90,18,44,159,125,77,105,238,17,196,194,136,119,87,7,110,107,198,195,171,247,131,199,117,86,118,39,222,47,226,155,34,57,234,149,242,79,75,252,83,22,243,175,148,50,255,56,123,35,78,175,242,61,201,220,88,150,151,160,27,90,65,61,141,134,241,64,236,179,188,150,209,165,216,198,33,182,5,237,85,90,153,228,68,103,207,60,30,248,
+252,131,56,153,250,73,104,71,29,191,83,216,36,52,71,153,24,227,22,21,156,149,82,161,138,241,156,92,50,37,194,203,101,55,40,2,143,228,125,115,248,112,61,237,83,38,125,139,153,53,46,200,231,13,2,27,147,124,147,34,110,17,18,208,182,140,192,170,2,134,63,64,208,7,80,7,79,126,240,197,31,93,51,49,211,249,108,103,212,225,149,139,35,49,181,97,135,80,73,114,233,181,116,235,226,24,173,56,25,70,120,45,158,203,70,178,41,113,53,246,93,113,11,232,119,220,97,11,23,239,198,242,215,123,174,252,121,63,168,183,43,40,23,148,94,36,237,235,175,83,108,13,125,2,213,91,184,148,136,158,37,136,78,72,73,104,224,19,154,41,224,220,4,205,13,77,208,235,129,26,25,152,160,27,180,8,199,246,188,89,192,114,11,248,45,125,22,191,165,85,38,196,144,40,110,4,217,75,117,41,6,147,195,187,71,209,88,183,143,17,48,238,164,222,194,188,31,128,237,237,177,117,31,9,61,95,1,247,2,92,237,124,9,150,180,105,136,140,135,97,233,146,155,111,3,19,
+210,48,203,130,63,236,159,90,216,46,180,188,50,55,2,60,188,151,35,220,4,207,180,230,221,23,126,79,9,165,37,166,144,251,30,224,89,89,52,72,171,128,253,50,96,146,112,118,76,84,45,27,3,103,147,139,127,42,102,196,137,61,37,129,182,112,148,168,3,102,127,58,49,141,230,34,169,236,190,59,11,44,42,43,141,60,7,18,232,148,4,230,244,39,12,138,140,113,102,116,65,56,212,76,234,237,238,207,97,231,111,241,105,58,89,99,38,101,92,229,140,89,120,58,156,78,243,7,59,87,163,96,210,155,250,141,83,126,155,81,86,238,214,108,36,84,123,253,97,22,48,242,40,127,28,168,171,181,196,51,125,201,159,203,124,45,232,97,26,18,118,191,211,109,206,135,72,229,1,195,3,156,102,176,79,183,169,179,79,103,169,150,202,216,190,80,1,100,206,143,225,60,37,164,39,198,98,122,114,196,120,37,13,53,102,204,90,35,207,26,100,210,96,207,127,122,167,196,197,231,88,23,26,158,16,216,146,132,110,30,178,192,243,148,71,95,185,28,211,252,105,207,87,103,182,234,
+0,213,102,47,30,20,204,159,215,104,106,147,154,157,120,195,123,38,138,164,124,193,195,241,30,118,8,225,179,109,212,141,148,177,88,209,58,14,56,160,133,230,239,202,64,219,220,102,127,72,29,117,5,17,97,198,120,195,201,53,128,215,121,171,170,188,70,245,76,214,68,45,16,167,193,75,198,84,197,177,252,166,25,99,115,30,62,122,41,94,229,182,54,68,165,138,41,201,231,176,53,2,83,144,224,46,23,56,47,85,48,38,88,27,175,219,150,199,236,122,59,29,22,241,70,194,227,243,245,102,119,253,38,178,10,90,227,196,132,166,134,16,95,124,85,211,182,192,106,235,165,4,21,146,94,30,159,9,72,232,115,253,178,126,44,193,154,171,41,25,107,197,91,174,156,176,85,89,237,188,53,194,135,121,68,32,232,23,137,211,210,13,156,185,7,7,35,41,38,155,204,239,202,233,165,28,76,189,166,196,140,136,224,110,155,245,215,245,132,34,12,157,157,222,163,242,156,104,203,196,76,193,36,108,129,214,158,4,251,82,117,127,137,115,253,50,118,57,140,64,71,114,106,141,233,101,
+63,178,53,30,55,143,18,115,99,135,205,202,158,31,124,183,72,83,102,55,204,182,226,68,198,28,61,166,212,212,234,243,169,213,92,217,221,25,231,208,241,184,94,35,113,170,130,147,139,31,170,84,119,140,152,30,5,56,143,12,238,33,51,5,228,28,231,67,150,104,179,48,150,42,239,99,127,247,206,220,0,14,227,131,186,212,216,218,56,240,36,215,129,223,239,219,163,39,189,241,124,226,86,240,77,192,88,114,6,19,1,54,71,246,78,66,38,77,104,151,12,19,20,54,222,109,67,198,228,233,149,66,22,120,204,1,145,254,116,52,69,23,137,254,130,148,241,80,40,107,164,220,184,157,222,12,187,183,215,23,151,66,45,144,168,74,83,185,184,47,148,209,50,231,132,165,158,223,106,213,186,61,95,183,103,170,15,123,37,103,188,15,134,216,156,64,126,9,23,223,71,50,114,28,73,118,70,182,61,242,74,141,101,184,219,40,52,29,10,123,110,93,3,148,237,124,170,116,253,53,141,175,157,241,49,18,252,220,247,89,243,186,11,187,162,119,17,1,239,5,219,11,156,145,76,170,
+19,146,76,244,163,100,209,255,98,190,2,238,189,193,131,190,164,247,134,58,72,213,34,251,148,100,254,146,220,32,174,100,98,171,76,172,187,73,61,62,249,160,187,41,190,71,103,208,103,44,152,174,204,210,96,227,27,202,234,120,7,29,201,176,247,233,119,63,25,125,237,59,6,219,117,10,180,159,36,149,27,17,148,232,129,0,169,192,151,146,95,181,96,125,82,204,231,192,33,62,149,64,32,189,223,127,164,241,238,40,47,231,134,151,170,107,251,52,219,214,48,248,225,13,162,86,192,96,179,145,163,215,106,42,10,121,111,118,167,140,120,204,155,73,33,219,82,35,57,176,185,50,12,57,229,153,84,191,183,172,119,130,119,19,106,13,207,236,1,104,175,129,128,217,32,94,43,250,121,62,91,61,60,80,253,19,213,131,135,32,225,100,48,32,12,4,134,1,118,144,28,12,80,195,146,181,7,97,107,211,136,45,33,126,251,90,14,174,94,194,164,166,181,60,226,155,232,241,62,105,197,6,207,94,45,64,220,110,48,144,11,93,44,14,109,241,188,125,188,147,162,90,0,110,66,125,
+143,113,120,48,240,187,239,209,32,182,244,33,227,208,122,136,166,195,81,226,20,43,187,8,162,161,148,152,164,114,117,234,104,112,104,93,123,117,63,102,74,187,117,239,85,38,102,35,226,180,210,70,132,95,198,148,245,203,48,245,81,52,177,97,210,56,103,78,240,230,55,101,152,12,144,68,139,94,75,177,163,49,21,58,154,34,110,205,254,4,185,103,159,25,180,122,49,144,48,229,116,68,59,105,3,205,224,222,67,69,202,122,152,83,56,168,229,187,72,39,30,200,177,20,34,52,12,26,50,254,21,162,5,94,104,224,250,248,253,105,7,28,51,130,171,52,227,65,154,206,204,254,145,100,76,180,185,202,209,151,53,40,208,195,46,88,21,216,253,226,223,1,76,219,112,248,162,110,70,198,247,217,208,97,41,38,61,44,229,215,65,11,82,176,230,86,66,60,68,29,133,90,0,231,141,20,3,233,120,195,99,98,163,130,21,222,233,200,0,180,115,167,67,248,102,34,139,227,197,162,87,29,177,190,82,85,122,59,190,218,70,102,114,190,153,9,207,152,198,25,212,224,239,104,94,15,
+128,115,9,67,9,150,68,244,37,69,200,156,187,24,75,221,141,48,240,186,46,209,185,226,69,233,135,225,193,145,57,216,155,72,244,98,80,194,142,128,151,146,155,99,241,139,214,118,233,178,135,73,97,149,225,7,47,254,204,170,7,221,34,34,141,148,164,143,67,120,40,87,91,244,171,239,221,222,48,90,123,155,181,196,193,180,181,70,100,110,37,228,71,90,32,59,215,228,4,141,148,149,89,144,34,101,114,20,112,124,19,222,160,175,176,158,28,91,22,245,68,70,123,138,97,112,29,176,16,203,79,236,139,160,208,41,185,235,173,5,180,24,164,84,121,66,92,207,92,48,229,185,241,87,6,93,227,231,12,129,217,34,224,181,99,122,159,67,30,242,202,65,82,199,80,235,214,233,152,141,64,84,166,131,19,104,115,155,177,221,70,105,237,33,200,243,30,47,183,139,4,90,123,4,118,198,103,69,207,90,172,67,102,104,49,121,48,203,134,13,236,34,233,87,63,207,194,101,247,20,9,16,249,38,238,240,105,209,124,25,136,111,254,201,243,57,105,131,130,4,111,72,31,61,171,149,
+92,93,3,75,194,10,12,205,112,254,43,99,244,201,73,95,54,86,22,218,145,155,124,224,90,71,169,198,73,199,0,194,29,74,161,217,161,88,38,44,160,156,93,225,9,48,8,238,234,85,214,174,9,219,253,73,98,203,46,92,135,91,93,122,176,201,70,75,26,94,22,163,154,60,247,49,236,26,32,1,210,19,179,136,180,190,74,250,130,180,18,160,30,6,162,64,179,38,168,193,10,213,243,135,194,119,147,73,86,122,188,41,196,98,106,220,37,42,239,73,29,243,16,134,10,10,230,148,116,110,159,192,165,95,214,185,69,129,75,1,24,101,204,250,26,229,192,103,77,198,99,21,112,152,174,124,247,1,63,150,0,93,251,212,215,60,249,26,19,99,150,83,155,96,155,28,26,142,163,41,183,80,170,10,174,47,72,195,166,192,112,118,175,32,96,158,66,185,203,84,120,141,226,154,169,206,62,0,159,232,162,27,77,235,250,40,55,75,22,101,113,93,227,178,83,117,70,231,165,62,41,200,13,73,92,39,1,76,150,99,34,218,57,23,87,1,76,152,131,38,60,179,186,81,113,227,
+78,31,95,202,188,55,135,145,165,25,113,93,20,100,120,56,169,121,133,53,58,147,57,85,134,214,137,212,157,69,164,155,99,130,112,15,153,149,6,124,160,156,134,157,138,145,161,249,183,46,105,199,93,236,208,1,15,112,209,158,79,146,147,83,239,8,152,84,192,153,212,7,164,190,11,35,174,92,122,246,132,21,206,242,76,236,187,97,164,224,211,139,221,178,100,60,92,200,135,163,28,105,240,254,240,130,114,81,164,244,169,78,99,132,237,103,219,193,185,99,195,48,198,217,25,204,85,107,229,147,63,73,50,204,176,234,167,201,197,81,91,137,66,1,65,86,87,204,107,154,21,196,68,48,179,26,75,107,251,126,184,100,203,81,88,144,46,92,226,176,208,222,244,144,148,42,150,155,184,225,173,85,38,59,149,228,156,183,92,116,14,122,10,244,108,168,25,61,242,208,243,61,142,95,241,17,86,188,192,187,47,143,62,78,101,161,246,72,10,176,39,3,165,145,185,178,27,74,139,203,213,20,189,203,207,199,200,205,5,134,118,175,57,188,208,53,160,113,124,226,224,120,132,38,43,226,
+111,53,50,185,218,147,181,179,119,176,209,221,166,158,29,177,236,195,111,112,4,14,142,7,16,115,19,52,27,24,209,133,19,239,86,46,101,49,223,193,133,162,104,135,145,6,229,170,213,75,116,252,219,88,164,231,44,6,77,78,238,141,90,126,63,247,243,95,174,135,192,167,98,131,69,154,235,142,28,187,233,227,173,17,41,115,244,200,175,212,106,195,70,45,219,246,139,98,228,218,79,15,210,155,220,32,11,234,68,63,70,81,207,93,245,86,14,143,3,26,171,7,16,76,33,26,34,138,239,174,12,123,225,243,107,225,97,179,44,198,201,146,223,183,142,27,95,153,23,193,131,12,180,133,62,118,209,86,66,131,63,195,236,151,34,212,163,58,203,146,96,121,207,126,159,222,222,130,162,16,223,238,143,242,242,110,252,135,152,127,109,228,179,126,124,177,28,158,187,41,236,123,65,235,17,187,154,31,188,170,69,60,121,158,130,172,99,176,217,108,106,122,167,130,100,142,180,140,25,7,151,137,89,85,217,92,95,181,158,73,115,146,119,154,197,233,237,174,248,12,67,167,53,34,192,5,
+13,43,114,216,33,15,202,77,116,88,157,142,242,176,197,53,221,171,219,185,193,62,181,173,230,91,231,41,207,243,171,148,113,237,163,231,9,96,20,131,137,201,25,23,219,214,67,112,35,135,222,186,57,88,143,155,5,51,199,121,183,15,106,0,167,224,192,204,1,138,196,51,151,50,86,68,53,151,243,176,24,45,221,84,189,14,170,228,69,177,30,143,52,49,82,212,22,205,70,228,196,163,52,107,210,182,44,116,62,175,138,26,35,161,231,83,212,193,205,176,255,158,179,189,193,230,171,49,217,162,114,198,164,92,108,170,41,150,224,18,60,129,27,60,121,244,44,217,37,245,193,33,134,124,113,74,160,135,215,206,197,119,120,126,134,92,140,153,52,139,186,78,68,244,21,43,40,33,249,242,217,181,183,186,116,104,62,247,231,170,224,42,150,132,164,216,96,188,99,172,223,171,203,156,25,82,126,66,94,25,40,168,74,220,59,30,251,61,12,177,151,34,106,122,24,65,207,18,22,82,214,201,160,75,18,120,40,199,65,48,85,232,47,93,8,89,102,21,226,90,44,227,170,40,226,93,
+51,142,31,203,223,163,91,144,74,158,115,88,82,148,229,38,197,93,237,176,97,138,71,99,230,113,55,237,71,243,5,129,99,28,2,138,161,220,228,192,177,86,126,246,107,17,162,68,62,208,135,120,152,172,196,189,2,250,158,190,146,229,128,28,137,192,222,158,56,184,201,171,72,151,14,118,124,23,151,41,37,16,110,97,119,113,158,141,89,216,120,116,198,167,67,162,183,10,197,250,151,89,199,83,169,92,150,250,237,17,89,123,7,109,75,103,151,161,189,250,180,252,203,63,126,174,113,158,101,223,229,121,162,53,78,247,208,100,197,83,79,187,156,204,117,215,169,39,80,63,211,21,75,85,125,208,157,6,224,23,179,166,235,13,123,195,222,221,71,73,161,148,201,174,2,173,84,211,64,188,13,83,4,72,124,89,228,188,8,27,180,215,216,202,9,48,31,197,239,113,166,77,151,152,183,66,141,44,212,46,71,247,251,156,122,95,146,133,20,78,179,174,224,240,25,97,237,222,9,37,158,62,146,220,28,59,89,230,42,117,96,134,218,234,172,127,221,95,71,209,37,161,200,27,194,232,
+177,132,169,244,120,178,218,115,123,103,215,173,75,149,168,223,111,67,194,35,250,94,74,20,172,181,124,104,211,219,176,141,222,75,44,194,11,71,236,223,87,116,31,108,200,109,149,185,171,150,136,186,206,62,227,39,240,147,170,178,187,118,101,26,154,119,207,3,232,234,149,178,246,134,43,194,23,237,156,189,217,121,170,135,133,185,123,232,172,187,253,132,181,49,144,26,108,249,225,2,221,239,254,233,171,128,0,116,34,31,149,23,109,83,128,84,18,131,151,208,23,24,232,133,55,153,134,192,53,11,199,251,150,104,180,15,141,49,141,96,146,249,118,55,114,232,66,7,243,48,80,235,39,48,222,174,154,59,3,61,27,105,56,144,234,242,248,130,113,183,155,207,148,36,198,83,140,43,224,21,57,194,102,12,61,103,208,241,62,4,128,14,5,102,182,204,139,14,148,13,129,48,229,170,189,49,143,10,119,182,15,131,99,139,95,78,151,72,155,153,124,63,191,170,184,212,106,107,200,8,35,21,25,164,149,193,24,30,109,206,90,78,154,240,210,184,153,128,133,41,199,90,1,197,160,87,
+220,61,172,71,167,120,157,16,77,50,163,252,113,152,59,138,166,153,163,24,103,90,19,12,135,158,20,206,191,99,21,176,44,6,170,79,65,156,57,141,33,82,158,6,32,76,253,136,5,188,144,150,203,62,98,167,223,28,183,25,248,141,17,10,251,230,18,177,103,35,106,159,10,201,8,96,158,241,88,183,107,47,140,52,18,238,224,210,100,187,98,50,57,6,166,28,14,79,5,184,107,254,237,241,3,216,188,235,121,43,163,16,5,20,116,13,17,22,69,197,138,78,81,163,221,74,7,222,209,105,188,225,62,35,191,86,206,42,19,159,206,122,178,97,132,34,246,157,38,214,3,30,235,119,18,201,4,242,245,228,230,46,18,63,113,193,145,116,136,14,222,108,210,214,172,72,51,229,135,148,39,165,254,229,81,149,152,46,103,130,103,111,154,207,249,135,206,49,213,188,246,129,107,110,0,163,244,81,199,158,1,180,107,237,72,200,221,176,153,79,75,203,122,105,5,78,233,37,203,202,164,137,185,238,26,88,233,93,105,98,127,207,117,109,82,109,179,136,175,180,102,11,156,29,190,86,
+126,30,179,29,80,17,253,232,50,158,218,229,219,44,0,135,181,195,192,53,241,244,101,18,243,176,68,223,35,185,137,124,177,122,25,26,172,167,44,107,3,168,165,198,151,23,154,65,154,163,251,4,13,232,223,240,155,218,139,248,170,58,233,124,194,7,232,171,76,41,123,204,37,151,135,154,196,12,175,190,136,150,134,87,1,37,231,92,4,130,251,80,234,222,226,49,95,70,104,208,161,238,40,1,141,156,60,99,186,238,128,182,207,196,3,215,29,165,197,139,72,121,248,19,82,172,206,134,192,210,96,144,39,119,213,135,92,147,199,10,73,74,165,95,165,107,162,81,175,62,198,151,33,146,116,6,215,23,251,94,244,22,240,172,62,110,39,204,78,142,143,64,124,197,106,24,203,46,110,133,167,141,115,106,154,200,150,218,175,245,27,238,171,254,208,200,199,60,141,180,179,44,100,61,229,98,230,56,115,91,158,167,143,181,244,214,170,194,129,118,3,120,59,134,35,115,201,252,10,152,105,149,110,56,142,221,205,140,140,208,75,23,22,220,26,39,231,75,192,222,236,5,172,79,254,207,
+16,169,55,52,132,109,188,118,184,253,86,131,16,123,209,93,200,158,128,36,194,79,25,131,194,89,13,192,222,26,72,55,104,243,201,97,90,43,215,109,36,78,227,113,183,15,7,69,180,21,15,232,61,9,198,30,130,97,193,70,27,69,248,96,36,18,252,33,38,129,100,34,14,105,16,211,188,236,150,87,217,191,50,170,177,87,11,130,91,156,39,103,80,173,93,172,3,170,178,216,150,155,116,51,213,60,58,179,134,65,208,196,160,59,45,124,168,60,93,224,24,22,58,62,247,189,224,109,54,173,207,195,197,202,64,138,63,119,160,159,135,179,124,152,71,52,170,145,131,238,97,21,141,247,23,199,13,244,190,196,197,151,45,170,153,118,169,47,191,204,217,253,216,195,31,93,150,146,48,192,148,212,212,85,26,56,72,149,81,153,184,146,131,143,59,102,103,168,104,169,72,33,14,36,225,171,11,14,128,245,48,125,187,71,243,106,93,245,189,115,93,224,28,125,222,145,64,159,210,168,203,52,133,205,138,30,127,147,232,77,207,235,224,37,169,211,162,184,27,133,219,225,74,111,48,109,
+74,173,82,171,158,156,215,171,182,53,123,248,230,254,61,186,205,187,18,48,7,244,196,16,16,218,65,97,196,24,146,88,194,174,137,50,113,109,16,235,217,54,186,166,205,237,86,163,9,96,116,200,242,235,96,41,44,58,60,119,147,124,114,101,201,202,157,31,132,99,251,245,98,1,30,96,56,3,194,248,28,174,178,31,20,60,66,8,210,77,186,160,217,224,112,59,132,86,13,130,140,48,130,192,217,222,79,43,247,123,66,179,175,171,114,123,69,222,214,177,242,91,151,108,116,141,159,242,115,140,46,22,102,197,33,54,82,104,123,193,245,98,74,105,250,252,82,119,174,207,85,70,60,68,10,134,149,40,68,152,96,110,121,73,126,245,213,218,113,183,115,195,151,68,118,209,11,220,11,165,156,242,212,74,6,196,117,166,29,101,122,162,230,213,7,80,197,2,90,36,250,53,56,67,2,88,0,164,143,45,153,245,46,220,149,135,107,112,144,104,213,163,221,22,239,10,32,108,151,68,128,200,132,204,131,81,196,177,110,88,52,73,235,145,128,171,70,245,94,122,105,92,18,232,230,38,
+56,165,148,176,142,157,14,217,105,181,118,190,222,96,245,184,191,14,246,201,253,171,77,77,63,154,253,246,85,34,113,39,35,154,103,181,155,124,135,8,21,204,188,159,0,24,196,252,199,38,151,223,33,53,234,98,234,235,128,34,100,209,223,173,61,106,137,202,185,32,226,75,83,221,156,105,76,207,60,247,186,156,40,107,112,4,240,136,60,205,86,26,64,115,107,63,203,238,247,253,205,240,162,62,188,222,8,169,243,136,63,110,0,82,35,0,168,193,159,98,50,55,127,60,38,143,107,123,247,21,145,191,6,158,29,247,146,132,94,214,97,114,1,250,183,255,249,63,255,149,48,248,191,253,199,255,227,223,32,133,255,21,213,248,255,63,248,63,145,11,255,248,187,223,253,253,223,252,254,151,63,254,250,155,31,255,223,95,126,253,199,31,255,254,111,126,254,241,15,127,247,63,3,30,255,238,239,190,253,95,191,254,242,143,191,254,240,175,223,254,244,231,127,249,229,215,191,252,249,247,127,248,227,63,255,248,237,15,63,254,230,159,126,249,249,151,223,254,242,143,63,5,232,223,254,246,
+191,51,15,255,239,223,254,225,167,127,253,225,15,63,254,253,191,251,251,127,247,223,129,145,255,86,248,223,192,135,255,203,111,255,247,255,240,31,127,253,247,255,254,127,224,20,255,63,76,201,255,231,247,127,249,241,183,255,242,211,143,223,126,247,235,15,127,250,225,219,95,126,248,253,31,126,253,203,143,65,231,47,63,255,248,55,223,254,207,31,190,159,249,151,95,126,251,167,239,235,111,191,254,242,151,223,253,242,167,239,151,255,230,159,126,254,233,175,220,198,255,245,219,191,252,242,187,159,126,249,211,95,183,191,253,246,143,255,240,237,143,65,231,159,255,219,222,63,252,248,151,111,127,250,33,232,252,249,199,127,254,246,219,159,126,243,87,80,229,79,223,254,249,199,223,255,225,123,129,127,248,245,151,159,127,250,254,248,111,191,252,250,195,95,190,253,143,114,223,126,254,225,219,191,254,242,155,63,127,251,229,63,125,175,243,211,143,255,233,231,159,126,243,79,223,254,248,251,63,252,240,167,255,250,114,63,255,249,55,255,244,55,127,251,125,224,255,246,191,0,53,156,161,31,
diff --git a/examples/HomeBudget/src.tpp/all.i b/examples/HomeBudget/src.tpp/all.i
new file mode 100644
index 000000000..7567bcc02
--- /dev/null
+++ b/examples/HomeBudget/src.tpp/all.i
@@ -0,0 +1,7 @@
+TOPIC("About$en-us")
+#include "About$en-us.tpp"
+END_TOPIC
+
+TOPIC("About$pl-pl")
+#include "About$pl-pl.tpp"
+END_TOPIC
diff --git a/examples/ImageView/ImageView.upp b/examples/ImageView/ImageView.upp
new file mode 100644
index 000000000..43f8eeb13
--- /dev/null
+++ b/examples/ImageView/ImageView.upp
@@ -0,0 +1,14 @@
+description "Simple image viewer";
+
+uses
+	CtrlLib,
+	plugin\tif,
+	plugin\jpg,
+	plugin\gif;
+
+file
+	main.cpp;
+
+mainconfig
+	"" = "GUI";
+
diff --git a/examples/ImageView/init b/examples/ImageView/init
new file mode 100644
index 000000000..25d3d16b1
--- /dev/null
+++ b/examples/ImageView/init
@@ -0,0 +1,8 @@
+#ifndef _ImageView_icpp_init_stub
+#define _ImageView_icpp_init_stub
+#include "CtrlLib/init"
+#include "plugin\tif/init"
+#include "plugin\jpg/init"
+#include "plugin\gif/init"
+#include "plugin\pcx/init"
+#endif
diff --git a/examples/ImageView/main.cpp b/examples/ImageView/main.cpp
new file mode 100644
index 000000000..d06174ed6
--- /dev/null
+++ b/examples/ImageView/main.cpp
@@ -0,0 +1,141 @@
+#include <CtrlLib/CtrlLib.h>
+
+using namespace Upp;
+
+class ImageView : public TopWindow {
+public:
+	virtual bool Key(dword key, int);
+
+private:
+	ImageCtrl             img;
+	FileList              files;
+	Splitter              splitter;
+	String                dir;
+	FrameTop<Button>      dirup;
+
+	void Load(const char *filename);
+	void Enter();
+	void DoDir();
+	void DirUp();
+
+public:
+	typedef ImageView CLASSNAME;
+
+	void Serialize(Stream& s);
+	void LoadDir(const char *d);
+	void LoadDir()                      { LoadDir(dir); }
+
+	ImageView();
+};
+
+void ImageView::Load(const char *filename)
+{
+	img.SetImage(Null);
+	FileIn in(filename);
+	One<StreamRaster> r = StreamRaster::OpenAny(in);
+	if(!r)
+		return;
+	Size rsz = img.GetSize();
+	Size isz = r->GetSize();
+	if(isz.cx >= rsz.cx || isz.cy >= rsz.cy) {
+		if(isz.cx * rsz.cx < rsz.cy * isz.cy)
+			rsz.cx = isz.cx * rsz.cy / isz.cy;
+		else
+			rsz.cy = isz.cy * rsz.cx / isz.cx;
+		ImageEncoder m;
+		Rescale(m, rsz, *r, isz);
+		img.SetImage(m);
+	}
+	else
+		img.SetImage(r->GetImage());
+}
+
+void ImageView::LoadDir(const char *d)
+{
+	files.Clear();
+	dir = d;
+	Title(dir);
+	::Load(files, dir, "*.*");
+	SortByExt(files);
+}
+
+void ImageView::DirUp()
+{
+	String n = DirectoryUp(dir);
+	LoadDir(dir);
+	files.FindSetCursor(n);
+}
+
+void ImageView::Enter()
+{
+	if(!files.IsCursor()) {
+		Title(dir);
+		return;
+	}
+	const FileList::File& f = files.Get(files.GetCursor());
+	if(f.name == "..") {
+		Title(dir);
+		return;
+	}
+	String p = AppendFileName(dir, f.name);
+	Title(p);
+	if(!f.isdir)
+		Load(p);
+}
+
+void ImageView::DoDir()
+{
+	if(!files.IsCursor())
+		return;
+	const FileList::File& f = files.Get(files.GetCursor());
+	if(!f.isdir)
+		return;
+	LoadDir(AppendFileName(dir, f.name));
+}
+
+bool ImageView::Key(dword key, int)
+{
+	if(key == K_ENTER) {
+		DoDir();
+		return true;
+	}
+	return false;
+}
+
+void ImageView::Serialize(Stream& s)
+{
+	int version = 0;
+	s / version;
+	SerializePlacement(s);
+	s % files;
+	s % dir;
+	s % splitter;
+}
+
+ImageView::ImageView()
+{
+	splitter.Horz(files, img);
+	splitter.SetPos(2700);
+	Add(splitter.SizePos());
+
+	files.WhenEnterItem = THISBACK(Enter);
+	files.WhenLeftDouble = THISBACK(DoDir);
+	dirup.Height(max(CtrlImg::DirUp().GetSize().cy, Draw::GetStdFontCy() + 6));
+	dirup.SetImage(CtrlImg::DirUp());
+	dirup.NormalStyle();
+	dirup <<= THISBACK(DirUp);
+	files.AddFrame(dirup);
+
+	Sizeable().Zoomable();
+
+	dir = GetCurrentDirectory();
+}
+
+GUI_APP_MAIN
+{
+	ImageView x;
+	LoadFromFile(x);
+	x.LoadDir();
+	x.Run();
+	StoreToFile(x);
+}
diff --git a/examples/OleCalc/OleCalc.upp b/examples/OleCalc/OleCalc.upp
new file mode 100644
index 000000000..f337c5e90
--- /dev/null
+++ b/examples/OleCalc/OleCalc.upp
@@ -0,0 +1,31 @@
+description "Simple example of ActiveX control";
+
+noblitz;
+
+uses
+	Ole\Ctrl,
+	CtrlLib,
+	Esc;
+
+target
+	calc.ocx;
+
+link
+	/def:calc.def;
+
+file
+	calc.idl,
+	calc_idl.h,
+	calc.cpp,
+	calc_idl.cpp,
+	calc.lay,
+	calc.def,
+	calc.rc
+		depends() calc.tlb;
+
+mainconfig
+	"" = "GUI DLL MT";
+
+custom() "post-link",
+	"regsvr32 /s /c $(OUTPATH)",
+	"";
diff --git a/examples/OleCalc/calc.cpp b/examples/OleCalc/calc.cpp
new file mode 100644
index 000000000..b9961ef83
--- /dev/null
+++ b/examples/OleCalc/calc.cpp
@@ -0,0 +1,76 @@
+#include <Ole/Ctrl/OleCtrl.h>
+#include <CtrlLib/CtrlLib.h>
+#include <Esc/Esc.h>
+
+#include "calc_idl.h"
+
+using namespace Upp;
+
+#define LAYOUTFILE "calc.lay"
+#include <CtrlCore/lay.h>
+
+class Calculator : public WithCalculatorLayout<OcxRunnableControl>, public DispatchInterface<ICalculator> {
+	void Eval();
+
+public:
+	virtual void Paint(UPP::Draw& w);
+
+	STDMETHOD(get_Input)(BSTR *result);
+	STDMETHOD(put_Input)(BSTR input);
+	STDMETHOD(Calculate)();
+	STDMETHOD(get_Output)(BSTR *result);
+
+	typedef Calculator CLASSNAME;
+	Calculator();
+};
+
+OCX_OBJECT(Calculator)
+
+void Calculator::Paint(UPP::Draw& w)
+{
+	w.DrawRect(GetSize(), SColorFace());
+}
+
+Calculator::Calculator()
+{
+	CtrlLayout(*this);
+	ok.Ok() <<= THISBACK(Eval);
+	ok.Tip("Evaluate given expression");
+	NoWantFocus();
+}
+
+void Calculator::Eval()
+{
+	ArrayMap<String, EscValue> global;
+	value <<= Evaluate((String)~expr, global).ToString();
+}
+
+HRESULT Calculator::get_Input(BSTR *result)
+{
+	ReturnString(result, ~expr);
+	return S_OK;
+}
+
+HRESULT Calculator::put_Input(BSTR input)
+{
+	expr <<= BSTRToString(input);
+	return S_OK;
+}
+
+HRESULT Calculator::Calculate()
+{
+	Eval();
+	return S_OK;
+}
+
+HRESULT Calculator::get_Output(BSTR *result)
+{
+	ReturnString(result, ~value);
+	return S_OK;
+}
+
+OCX_APP_MAIN
+{
+	SetLanguage(LNG_CZECH);
+	SetDefaultCharset(CHARSET_WIN1250);
+}
diff --git a/examples/OleCalc/calc.def b/examples/OleCalc/calc.def
new file mode 100644
index 000000000..e4cd4d9ba
--- /dev/null
+++ b/examples/OleCalc/calc.def
@@ -0,0 +1,7 @@
+LIBRARY	"calc.ocx"
+
+EXPORTS
+	DllCanUnloadNow     PRIVATE
+	DllGetClassObject   PRIVATE
+	DllRegisterServer   PRIVATE
+	DllUnregisterServer	PRIVATE
diff --git a/examples/OleCalc/calc.idl b/examples/OleCalc/calc.idl
new file mode 100644
index 000000000..ce1ef5ca1
--- /dev/null
+++ b/examples/OleCalc/calc.idl
@@ -0,0 +1,41 @@
+// calculator.idl: simple OCX expression evaluator.
+
+import "oaidl.idl";
+import "oleidl.idl";
+
+[
+	object,
+	uuid(2CFA5DB2-A740-11d3-981C-000000000000),
+	dual,
+	helpstring("ICalculator Interface")
+]
+interface ICalculator : IDispatch
+{
+	[id(1), propget, helpstring("Returns and sets calculator input field text (expression).")]
+	HRESULT Input([out, retval] BSTR *_value);
+	[propput, helpstring("Put")]
+	HRESULT Input([in] BSTR _value);
+	[id(2), helpstring("Calculate computes the result and places the it in the history list.")]
+	HRESULT Calculate();
+	[id(3), propget, helpstring("Value retrieves the result of the computation.")]
+	HRESULT Output([out, retval] BSTR *value);
+};
+
+[
+	uuid(2CFA5DB0-A740-11d3-981C-000000000000),
+	version(1.0),
+	helpstring("Ultimate Calculator 1.0 Type Library")
+]
+library Calculator_TypeLib
+{
+	importlib("stdole32.tlb");
+
+	[
+		uuid(2CFA5DB1-A740-11d3-981C-000000000000),
+		helpstring("Calculator Control")
+	]
+	coclass Calculator
+	{
+		[default] interface ICalculator;
+	};
+};
diff --git a/examples/OleCalc/calc.lay b/examples/OleCalc/calc.lay
new file mode 100644
index 000000000..101c47c3a
--- /dev/null
+++ b/examples/OleCalc/calc.lay
@@ -0,0 +1,7 @@
+LAYOUT(CalculatorLayout, 376, 56)
+	ITEM(Label, dv___0, SetLabel(t_("Expression")).LeftPosZ(4, 56).TopPosZ(4, 19))
+	ITEM(EditField, expr, HSizePosZ(64, 4).TopPosZ(4, 19))
+	ITEM(Label, dv___2, SetLabel(t_("Value:")).LeftPosZ(112, 56).TopPosZ(28, 16))
+	ITEM(EditField, value, HSizePosZ(168, 4).TopPosZ(26, 19))
+	ITEM(Button, ok, SetLabel(t_("Evaluate")).LeftPosZ(4, 80).TopPosZ(28, 22))
+END_LAYOUT
diff --git a/examples/OleCalc/calc.rc b/examples/OleCalc/calc.rc
new file mode 100644
index 000000000..c22428648
--- /dev/null
+++ b/examples/OleCalc/calc.rc
@@ -0,0 +1 @@
+1 TYPELIB "calc.idl"
diff --git a/examples/OleCalc/calc.tlb b/examples/OleCalc/calc.tlb
new file mode 100644
index 000000000..26f1be3d2
--- /dev/null
+++ b/examples/OleCalc/calc.tlb
@@ -0,0 +1 @@
+MSFT
\ No newline at end of file
diff --git a/examples/OleCalc/calc_idl.cpp b/examples/OleCalc/calc_idl.cpp
new file mode 100644
index 000000000..d9a34c5e6
--- /dev/null
+++ b/examples/OleCalc/calc_idl.cpp
@@ -0,0 +1,179 @@
+
+
+/* this ALWAYS GENERATED file contains the IIDs and CLSIDs */
+
+/* link this file in with the server and any clients */
+
+
+ /* File created by MIDL compiler version 6.00.0361 */
+/* at Thu Jan 24 22:09:58 2008
+ */
+/* Compiler settings for d:\examples\OleCalc\calc.idl:
+    Oicf, W1, Zp8, env=Win32 (32b run)
+    protocol : dce , ms_ext, c_ext, robust
+    error checks: allocation ref bounds_check enum stub_data
+    VC __declspec() decoration level:
+         __declspec(uuid()), __declspec(selectany), __declspec(novtable)
+         DECLSPEC_UUID(), MIDL_INTERFACE()
+*/
+//@@MIDL_FILE_HEADING(  )
+
+#if !defined(_M_IA64) && !defined(_M_AMD64)
+
+
+#pragma warning( disable: 4049 )  /* more than 64k source lines */
+
+
+#ifdef __cplusplus
+extern "C"{
+#endif
+
+
+#include <rpc.h>
+#include <rpcndr.h>
+
+#ifdef _MIDL_USE_GUIDDEF_
+
+#ifndef INITGUID
+#define INITGUID
+#include <guiddef.h>
+#undef INITGUID
+#else
+#include <guiddef.h>
+#endif
+
+#define MIDL_DEFINE_GUID(type,name,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) \
+        DEFINE_GUID(name,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8)
+
+#else // !_MIDL_USE_GUIDDEF_
+
+#ifndef __IID_DEFINED__
+#define __IID_DEFINED__
+
+typedef struct _IID
+{
+    unsigned long x;
+    unsigned short s1;
+    unsigned short s2;
+    unsigned char  c[8];
+} IID;
+
+#endif // __IID_DEFINED__
+
+#ifndef CLSID_DEFINED
+#define CLSID_DEFINED
+typedef IID CLSID;
+#endif // CLSID_DEFINED
+
+#define MIDL_DEFINE_GUID(type,name,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) \
+        const type name = {l,w1,w2,{b1,b2,b3,b4,b5,b6,b7,b8}}
+
+#endif !_MIDL_USE_GUIDDEF_
+
+MIDL_DEFINE_GUID(IID, IID_ICalculator,0x2CFA5DB2,0xA740,0x11d3,0x98,0x1C,0x00,0x00,0x00,0x00,0x00,0x00);
+
+
+MIDL_DEFINE_GUID(IID, LIBID_Calculator_TypeLib,0x2CFA5DB0,0xA740,0x11d3,0x98,0x1C,0x00,0x00,0x00,0x00,0x00,0x00);
+
+
+MIDL_DEFINE_GUID(CLSID, CLSID_Calculator,0x2CFA5DB1,0xA740,0x11d3,0x98,0x1C,0x00,0x00,0x00,0x00,0x00,0x00);
+
+#undef MIDL_DEFINE_GUID
+
+#ifdef __cplusplus
+}
+#endif
+
+
+
+#endif /* !defined(_M_IA64) && !defined(_M_AMD64)*/
+
+
+
+/* this ALWAYS GENERATED file contains the IIDs and CLSIDs */
+
+/* link this file in with the server and any clients */
+
+
+ /* File created by MIDL compiler version 6.00.0361 */
+/* at Thu Jan 24 22:09:58 2008
+ */
+/* Compiler settings for d:\examples\OleCalc\calc.idl:
+    Oicf, W1, Zp8, env=Win64 (32b run,appending)
+    protocol : dce , ms_ext, c_ext, robust
+    error checks: allocation ref bounds_check enum stub_data
+    VC __declspec() decoration level:
+         __declspec(uuid()), __declspec(selectany), __declspec(novtable)
+         DECLSPEC_UUID(), MIDL_INTERFACE()
+*/
+//@@MIDL_FILE_HEADING(  )
+
+#if defined(_M_IA64) || defined(_M_AMD64)
+
+
+#pragma warning( disable: 4049 )  /* more than 64k source lines */
+
+
+#ifdef __cplusplus
+extern "C"{
+#endif
+
+
+#include <rpc.h>
+#include <rpcndr.h>
+
+#ifdef _MIDL_USE_GUIDDEF_
+
+#ifndef INITGUID
+#define INITGUID
+#include <guiddef.h>
+#undef INITGUID
+#else
+#include <guiddef.h>
+#endif
+
+#define MIDL_DEFINE_GUID(type,name,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) \
+        DEFINE_GUID(name,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8)
+
+#else // !_MIDL_USE_GUIDDEF_
+
+#ifndef __IID_DEFINED__
+#define __IID_DEFINED__
+
+typedef struct _IID
+{
+    unsigned long x;
+    unsigned short s1;
+    unsigned short s2;
+    unsigned char  c[8];
+} IID;
+
+#endif // __IID_DEFINED__
+
+#ifndef CLSID_DEFINED
+#define CLSID_DEFINED
+typedef IID CLSID;
+#endif // CLSID_DEFINED
+
+#define MIDL_DEFINE_GUID(type,name,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) \
+        const type name = {l,w1,w2,{b1,b2,b3,b4,b5,b6,b7,b8}}
+
+#endif !_MIDL_USE_GUIDDEF_
+
+MIDL_DEFINE_GUID(IID, IID_ICalculator,0x2CFA5DB2,0xA740,0x11d3,0x98,0x1C,0x00,0x00,0x00,0x00,0x00,0x00);
+
+
+MIDL_DEFINE_GUID(IID, LIBID_Calculator_TypeLib,0x2CFA5DB0,0xA740,0x11d3,0x98,0x1C,0x00,0x00,0x00,0x00,0x00,0x00);
+
+
+MIDL_DEFINE_GUID(CLSID, CLSID_Calculator,0x2CFA5DB1,0xA740,0x11d3,0x98,0x1C,0x00,0x00,0x00,0x00,0x00,0x00);
+
+#undef MIDL_DEFINE_GUID
+
+#ifdef __cplusplus
+}
+#endif
+
+
+
+#endif /* defined(_M_IA64) || defined(_M_AMD64)*/
diff --git a/examples/OleCalc/calc_idl.h b/examples/OleCalc/calc_idl.h
new file mode 100644
index 000000000..c9bceed14
--- /dev/null
+++ b/examples/OleCalc/calc_idl.h
@@ -0,0 +1,304 @@
+
+
+/* this ALWAYS GENERATED file contains the definitions for the interfaces */
+
+
+ /* File created by MIDL compiler version 6.00.0366 */
+/* at Thu Jan 24 22:57:13 2008
+ */
+/* Compiler settings for C:\Upp.uvs\examples.uc\OleCalc\calc.idl:
+    Oicf, W1, Zp8, env=Win32 (32b run)
+    protocol : dce , ms_ext, c_ext, robust
+    error checks: allocation ref bounds_check enum stub_data
+    VC __declspec() decoration level:
+         __declspec(uuid()), __declspec(selectany), __declspec(novtable)
+         DECLSPEC_UUID(), MIDL_INTERFACE()
+*/
+//@@MIDL_FILE_HEADING(  )
+
+#pragma warning( disable: 4049 )  /* more than 64k source lines */
+
+
+/* verify that the <rpcndr.h> version is high enough to compile this file*/
+#ifndef __REQUIRED_RPCNDR_H_VERSION__
+#define __REQUIRED_RPCNDR_H_VERSION__ 475
+#endif
+
+#include "rpc.h"
+#include "rpcndr.h"
+
+#ifndef __RPCNDR_H_VERSION__
+#error this stub requires an updated version of <rpcndr.h>
+#endif // __RPCNDR_H_VERSION__
+
+#ifndef COM_NO_WINDOWS_H
+#include "windows.h"
+#include "ole2.h"
+#endif /*COM_NO_WINDOWS_H*/
+
+#ifndef __calc_idl_h__
+#define __calc_idl_h__
+
+#if defined(_MSC_VER) && (_MSC_VER >= 1020)
+#pragma once
+#endif
+
+/* Forward Declarations */
+
+#ifndef __ICalculator_FWD_DEFINED__
+#define __ICalculator_FWD_DEFINED__
+typedef interface ICalculator ICalculator;
+#endif 	/* __ICalculator_FWD_DEFINED__ */
+
+
+#ifndef __Calculator_FWD_DEFINED__
+#define __Calculator_FWD_DEFINED__
+
+#ifdef __cplusplus
+typedef class Calculator Calculator;
+#else
+typedef struct Calculator Calculator;
+#endif /* __cplusplus */
+
+#endif 	/* __Calculator_FWD_DEFINED__ */
+
+
+/* header files for imported files */
+#include "oaidl.h"
+#include "oleidl.h"
+
+#ifdef __cplusplus
+extern "C"{
+#endif
+
+void * __RPC_USER MIDL_user_allocate(size_t);
+void __RPC_USER MIDL_user_free( void * );
+
+#ifndef __ICalculator_INTERFACE_DEFINED__
+#define __ICalculator_INTERFACE_DEFINED__
+
+/* interface ICalculator */
+/* [helpstring][dual][uuid][object] */
+
+
+EXTERN_C const IID IID_ICalculator;
+
+#if defined(__cplusplus) && !defined(CINTERFACE)
+
+    MIDL_INTERFACE("2CFA5DB2-A740-11d3-981C-000000000000")
+    ICalculator : public IDispatch
+    {
+    public:
+        virtual /* [helpstring][propget][id] */ HRESULT STDMETHODCALLTYPE get_Input(
+            /* [retval][out] */ BSTR *_value) = 0;
+
+        virtual /* [helpstring][propput] */ HRESULT STDMETHODCALLTYPE put_Input(
+            /* [in] */ BSTR _value) = 0;
+
+        virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE Calculate( void) = 0;
+
+        virtual /* [helpstring][propget][id] */ HRESULT STDMETHODCALLTYPE get_Output(
+            /* [retval][out] */ BSTR *value) = 0;
+
+    };
+
+#else 	/* C style interface */
+
+    typedef struct ICalculatorVtbl
+    {
+        BEGIN_INTERFACE
+
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )(
+            ICalculator * This,
+            /* [in] */ REFIID riid,
+            /* [iid_is][out] */ void **ppvObject);
+
+        ULONG ( STDMETHODCALLTYPE *AddRef )(
+            ICalculator * This);
+
+        ULONG ( STDMETHODCALLTYPE *Release )(
+            ICalculator * This);
+
+        HRESULT ( STDMETHODCALLTYPE *GetTypeInfoCount )(
+            ICalculator * This,
+            /* [out] */ UINT *pctinfo);
+
+        HRESULT ( STDMETHODCALLTYPE *GetTypeInfo )(
+            ICalculator * This,
+            /* [in] */ UINT iTInfo,
+            /* [in] */ LCID lcid,
+            /* [out] */ ITypeInfo **ppTInfo);
+
+        HRESULT ( STDMETHODCALLTYPE *GetIDsOfNames )(
+            ICalculator * This,
+            /* [in] */ REFIID riid,
+            /* [size_is][in] */ LPOLESTR *rgszNames,
+            /* [in] */ UINT cNames,
+            /* [in] */ LCID lcid,
+            /* [size_is][out] */ DISPID *rgDispId);
+
+        /* [local] */ HRESULT ( STDMETHODCALLTYPE *Invoke )(
+            ICalculator * This,
+            /* [in] */ DISPID dispIdMember,
+            /* [in] */ REFIID riid,
+            /* [in] */ LCID lcid,
+            /* [in] */ WORD wFlags,
+            /* [out][in] */ DISPPARAMS *pDispParams,
+            /* [out] */ VARIANT *pVarResult,
+            /* [out] */ EXCEPINFO *pExcepInfo,
+            /* [out] */ UINT *puArgErr);
+
+        /* [helpstring][propget][id] */ HRESULT ( STDMETHODCALLTYPE *get_Input )(
+            ICalculator * This,
+            /* [retval][out] */ BSTR *_value);
+
+        /* [helpstring][propput] */ HRESULT ( STDMETHODCALLTYPE *put_Input )(
+            ICalculator * This,
+            /* [in] */ BSTR _value);
+
+        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE *Calculate )(
+            ICalculator * This);
+
+        /* [helpstring][propget][id] */ HRESULT ( STDMETHODCALLTYPE *get_Output )(
+            ICalculator * This,
+            /* [retval][out] */ BSTR *value);
+
+        END_INTERFACE
+    } ICalculatorVtbl;
+
+    interface ICalculator
+    {
+        CONST_VTBL struct ICalculatorVtbl *lpVtbl;
+    };
+
+
+
+#ifdef COBJMACROS
+
+
+#define ICalculator_QueryInterface(This,riid,ppvObject)	\
+    (This)->lpVtbl -> QueryInterface(This,riid,ppvObject)
+
+#define ICalculator_AddRef(This)	\
+    (This)->lpVtbl -> AddRef(This)
+
+#define ICalculator_Release(This)	\
+    (This)->lpVtbl -> Release(This)
+
+
+#define ICalculator_GetTypeInfoCount(This,pctinfo)	\
+    (This)->lpVtbl -> GetTypeInfoCount(This,pctinfo)
+
+#define ICalculator_GetTypeInfo(This,iTInfo,lcid,ppTInfo)	\
+    (This)->lpVtbl -> GetTypeInfo(This,iTInfo,lcid,ppTInfo)
+
+#define ICalculator_GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId)	\
+    (This)->lpVtbl -> GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId)
+
+#define ICalculator_Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr)	\
+    (This)->lpVtbl -> Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr)
+
+
+#define ICalculator_get_Input(This,_value)	\
+    (This)->lpVtbl -> get_Input(This,_value)
+
+#define ICalculator_put_Input(This,_value)	\
+    (This)->lpVtbl -> put_Input(This,_value)
+
+#define ICalculator_Calculate(This)	\
+    (This)->lpVtbl -> Calculate(This)
+
+#define ICalculator_get_Output(This,value)	\
+    (This)->lpVtbl -> get_Output(This,value)
+
+#endif /* COBJMACROS */
+
+
+#endif 	/* C style interface */
+
+
+
+/* [helpstring][propget][id] */ HRESULT STDMETHODCALLTYPE ICalculator_get_Input_Proxy(
+    ICalculator * This,
+    /* [retval][out] */ BSTR *_value);
+
+
+void __RPC_STUB ICalculator_get_Input_Stub(
+    IRpcStubBuffer *This,
+    IRpcChannelBuffer *_pRpcChannelBuffer,
+    PRPC_MESSAGE _pRpcMessage,
+    DWORD *_pdwStubPhase);
+
+
+/* [helpstring][propput] */ HRESULT STDMETHODCALLTYPE ICalculator_put_Input_Proxy(
+    ICalculator * This,
+    /* [in] */ BSTR _value);
+
+
+void __RPC_STUB ICalculator_put_Input_Stub(
+    IRpcStubBuffer *This,
+    IRpcChannelBuffer *_pRpcChannelBuffer,
+    PRPC_MESSAGE _pRpcMessage,
+    DWORD *_pdwStubPhase);
+
+
+/* [helpstring][id] */ HRESULT STDMETHODCALLTYPE ICalculator_Calculate_Proxy(
+    ICalculator * This);
+
+
+void __RPC_STUB ICalculator_Calculate_Stub(
+    IRpcStubBuffer *This,
+    IRpcChannelBuffer *_pRpcChannelBuffer,
+    PRPC_MESSAGE _pRpcMessage,
+    DWORD *_pdwStubPhase);
+
+
+/* [helpstring][propget][id] */ HRESULT STDMETHODCALLTYPE ICalculator_get_Output_Proxy(
+    ICalculator * This,
+    /* [retval][out] */ BSTR *value);
+
+
+void __RPC_STUB ICalculator_get_Output_Stub(
+    IRpcStubBuffer *This,
+    IRpcChannelBuffer *_pRpcChannelBuffer,
+    PRPC_MESSAGE _pRpcMessage,
+    DWORD *_pdwStubPhase);
+
+
+
+#endif 	/* __ICalculator_INTERFACE_DEFINED__ */
+
+
+
+#ifndef __Calculator_TypeLib_LIBRARY_DEFINED__
+#define __Calculator_TypeLib_LIBRARY_DEFINED__
+
+/* library Calculator_TypeLib */
+/* [helpstring][version][uuid] */
+
+
+EXTERN_C const IID LIBID_Calculator_TypeLib;
+
+EXTERN_C const CLSID CLSID_Calculator;
+
+#ifdef __cplusplus
+
+class DECLSPEC_UUID("2CFA5DB1-A740-11d3-981C-000000000000")
+Calculator;
+#endif
+#endif /* __Calculator_TypeLib_LIBRARY_DEFINED__ */
+
+/* Additional Prototypes for ALL interfaces */
+
+unsigned long             __RPC_USER  BSTR_UserSize(     unsigned long *, unsigned long            , BSTR * );
+unsigned char * __RPC_USER  BSTR_UserMarshal(  unsigned long *, unsigned char *, BSTR * );
+unsigned char * __RPC_USER  BSTR_UserUnmarshal(unsigned long *, unsigned char *, BSTR * );
+void                      __RPC_USER  BSTR_UserFree(     unsigned long *, BSTR * );
+
+/* end of Additional Prototypes */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/examples/OleCalc/calc_p.c b/examples/OleCalc/calc_p.c
new file mode 100644
index 000000000..79065be8a
--- /dev/null
+++ b/examples/OleCalc/calc_p.c
@@ -0,0 +1,889 @@
+
+
+/* this ALWAYS GENERATED file contains the proxy stub code */
+
+
+ /* File created by MIDL compiler version 6.00.0361 */
+/* at Thu Jan 24 22:09:58 2008
+ */
+/* Compiler settings for d:\examples\OleCalc\calc.idl:
+    Oicf, W1, Zp8, env=Win32 (32b run)
+    protocol : dce , ms_ext, c_ext, robust
+    error checks: allocation ref bounds_check enum stub_data
+    VC __declspec() decoration level:
+         __declspec(uuid()), __declspec(selectany), __declspec(novtable)
+         DECLSPEC_UUID(), MIDL_INTERFACE()
+*/
+//@@MIDL_FILE_HEADING(  )
+
+#if !defined(_M_IA64) && !defined(_M_AMD64)
+
+
+#pragma warning( disable: 4049 )  /* more than 64k source lines */
+#if _MSC_VER >= 1200
+#pragma warning(push)
+#endif
+#pragma warning( disable: 4100 ) /* unreferenced arguments in x86 call */
+#pragma warning( disable: 4211 )  /* redefine extent to static */
+#pragma warning( disable: 4232 )  /* dllimport identity*/
+#define USE_STUBLESS_PROXY
+
+
+/* verify that the <rpcproxy.h> version is high enough to compile this file*/
+#ifndef __REDQ_RPCPROXY_H_VERSION__
+#define __REQUIRED_RPCPROXY_H_VERSION__ 475
+#endif
+
+
+#include "rpcproxy.h"
+#ifndef __RPCPROXY_H_VERSION__
+#error this stub requires an updated version of <rpcproxy.h>
+#endif // __RPCPROXY_H_VERSION__
+
+
+#include "calc_idl.h"
+
+#define TYPE_FORMAT_STRING_SIZE   57
+#define PROC_FORMAT_STRING_SIZE   139
+#define TRANSMIT_AS_TABLE_SIZE    0
+#define WIRE_MARSHAL_TABLE_SIZE   1
+
+typedef struct _MIDL_TYPE_FORMAT_STRING
+    {
+    short          Pad;
+    unsigned char  Format[ TYPE_FORMAT_STRING_SIZE ];
+    } MIDL_TYPE_FORMAT_STRING;
+
+typedef struct _MIDL_PROC_FORMAT_STRING
+    {
+    short          Pad;
+    unsigned char  Format[ PROC_FORMAT_STRING_SIZE ];
+    } MIDL_PROC_FORMAT_STRING;
+
+
+static RPC_SYNTAX_IDENTIFIER  _RpcTransferSyntax =
+{{0x8A885D04,0x1CEB,0x11C9,{0x9F,0xE8,0x08,0x00,0x2B,0x10,0x48,0x60}},{2,0}};
+
+
+extern const MIDL_TYPE_FORMAT_STRING __MIDL_TypeFormatString;
+extern const MIDL_PROC_FORMAT_STRING __MIDL_ProcFormatString;
+
+
+extern const MIDL_STUB_DESC Object_StubDesc;
+
+
+extern const MIDL_SERVER_INFO ICalculator_ServerInfo;
+extern const MIDL_STUBLESS_PROXY_INFO ICalculator_ProxyInfo;
+
+
+extern const USER_MARSHAL_ROUTINE_QUADRUPLE UserMarshalRoutines[ WIRE_MARSHAL_TABLE_SIZE ];
+
+#if !defined(__RPC_WIN32__)
+#error  Invalid build platform for this stub.
+#endif
+
+#if !(TARGET_IS_NT50_OR_LATER)
+#error You need a Windows 2000 or later to run this stub because it uses these features:
+#error   /robust command line switch.
+#error However, your C/C++ compilation flags indicate you intend to run this app on earlier systems.
+#error This app will die there with the RPC_X_WRONG_STUB_VERSION error.
+#endif
+
+
+static const MIDL_PROC_FORMAT_STRING __MIDL_ProcFormatString =
+    {
+        0,
+        {
+
+	/* Procedure get_Input */
+
+			0x33,		/* FC_AUTO_HANDLE */
+			0x6c,		/* Old Flags:  object, Oi2 */
+/*  2 */	NdrFcLong( 0x0 ),	/* 0 */
+/*  6 */	NdrFcShort( 0x7 ),	/* 7 */
+/*  8 */	NdrFcShort( 0xc ),	/* x86 Stack size/offset = 12 */
+/* 10 */	NdrFcShort( 0x0 ),	/* 0 */
+/* 12 */	NdrFcShort( 0x8 ),	/* 8 */
+/* 14 */	0x45,		/* Oi2 Flags:  srv must size, has return, has ext, */
+			0x2,		/* 2 */
+/* 16 */	0x8,		/* 8 */
+			0x3,		/* Ext Flags:  new corr desc, clt corr check, */
+/* 18 */	NdrFcShort( 0x1 ),	/* 1 */
+/* 20 */	NdrFcShort( 0x0 ),	/* 0 */
+/* 22 */	NdrFcShort( 0x0 ),	/* 0 */
+
+	/* Parameter _value */
+
+/* 24 */	NdrFcShort( 0x2113 ),	/* Flags:  must size, must free, out, simple ref, srv alloc size=8 */
+/* 26 */	NdrFcShort( 0x4 ),	/* x86 Stack size/offset = 4 */
+/* 28 */	NdrFcShort( 0x20 ),	/* Type Offset=32 */
+
+	/* Return value */
+
+/* 30 */	NdrFcShort( 0x70 ),	/* Flags:  out, return, base type, */
+/* 32 */	NdrFcShort( 0x8 ),	/* x86 Stack size/offset = 8 */
+/* 34 */	0x8,		/* FC_LONG */
+			0x0,		/* 0 */
+
+	/* Procedure put_Input */
+
+/* 36 */	0x33,		/* FC_AUTO_HANDLE */
+			0x6c,		/* Old Flags:  object, Oi2 */
+/* 38 */	NdrFcLong( 0x0 ),	/* 0 */
+/* 42 */	NdrFcShort( 0x8 ),	/* 8 */
+/* 44 */	NdrFcShort( 0xc ),	/* x86 Stack size/offset = 12 */
+/* 46 */	NdrFcShort( 0x0 ),	/* 0 */
+/* 48 */	NdrFcShort( 0x8 ),	/* 8 */
+/* 50 */	0x46,		/* Oi2 Flags:  clt must size, has return, has ext, */
+			0x2,		/* 2 */
+/* 52 */	0x8,		/* 8 */
+			0x5,		/* Ext Flags:  new corr desc, srv corr check, */
+/* 54 */	NdrFcShort( 0x0 ),	/* 0 */
+/* 56 */	NdrFcShort( 0x1 ),	/* 1 */
+/* 58 */	NdrFcShort( 0x0 ),	/* 0 */
+
+	/* Parameter _value */
+
+/* 60 */	NdrFcShort( 0x8b ),	/* Flags:  must size, must free, in, by val, */
+/* 62 */	NdrFcShort( 0x4 ),	/* x86 Stack size/offset = 4 */
+/* 64 */	NdrFcShort( 0x2e ),	/* Type Offset=46 */
+
+	/* Return value */
+
+/* 66 */	NdrFcShort( 0x70 ),	/* Flags:  out, return, base type, */
+/* 68 */	NdrFcShort( 0x8 ),	/* x86 Stack size/offset = 8 */
+/* 70 */	0x8,		/* FC_LONG */
+			0x0,		/* 0 */
+
+	/* Procedure Calculate */
+
+/* 72 */	0x33,		/* FC_AUTO_HANDLE */
+			0x6c,		/* Old Flags:  object, Oi2 */
+/* 74 */	NdrFcLong( 0x0 ),	/* 0 */
+/* 78 */	NdrFcShort( 0x9 ),	/* 9 */
+/* 80 */	NdrFcShort( 0x8 ),	/* x86 Stack size/offset = 8 */
+/* 82 */	NdrFcShort( 0x0 ),	/* 0 */
+/* 84 */	NdrFcShort( 0x8 ),	/* 8 */
+/* 86 */	0x44,		/* Oi2 Flags:  has return, has ext, */
+			0x1,		/* 1 */
+/* 88 */	0x8,		/* 8 */
+			0x1,		/* Ext Flags:  new corr desc, */
+/* 90 */	NdrFcShort( 0x0 ),	/* 0 */
+/* 92 */	NdrFcShort( 0x0 ),	/* 0 */
+/* 94 */	NdrFcShort( 0x0 ),	/* 0 */
+
+	/* Return value */
+
+/* 96 */	NdrFcShort( 0x70 ),	/* Flags:  out, return, base type, */
+/* 98 */	NdrFcShort( 0x4 ),	/* x86 Stack size/offset = 4 */
+/* 100 */	0x8,		/* FC_LONG */
+			0x0,		/* 0 */
+
+	/* Procedure get_Output */
+
+/* 102 */	0x33,		/* FC_AUTO_HANDLE */
+			0x6c,		/* Old Flags:  object, Oi2 */
+/* 104 */	NdrFcLong( 0x0 ),	/* 0 */
+/* 108 */	NdrFcShort( 0xa ),	/* 10 */
+/* 110 */	NdrFcShort( 0xc ),	/* x86 Stack size/offset = 12 */
+/* 112 */	NdrFcShort( 0x0 ),	/* 0 */
+/* 114 */	NdrFcShort( 0x8 ),	/* 8 */
+/* 116 */	0x45,		/* Oi2 Flags:  srv must size, has return, has ext, */
+			0x2,		/* 2 */
+/* 118 */	0x8,		/* 8 */
+			0x3,		/* Ext Flags:  new corr desc, clt corr check, */
+/* 120 */	NdrFcShort( 0x1 ),	/* 1 */
+/* 122 */	NdrFcShort( 0x0 ),	/* 0 */
+/* 124 */	NdrFcShort( 0x0 ),	/* 0 */
+
+	/* Parameter value */
+
+/* 126 */	NdrFcShort( 0x2113 ),	/* Flags:  must size, must free, out, simple ref, srv alloc size=8 */
+/* 128 */	NdrFcShort( 0x4 ),	/* x86 Stack size/offset = 4 */
+/* 130 */	NdrFcShort( 0x20 ),	/* Type Offset=32 */
+
+	/* Return value */
+
+/* 132 */	NdrFcShort( 0x70 ),	/* Flags:  out, return, base type, */
+/* 134 */	NdrFcShort( 0x8 ),	/* x86 Stack size/offset = 8 */
+/* 136 */	0x8,		/* FC_LONG */
+			0x0,		/* 0 */
+
+			0x0
+        }
+    };
+
+static const MIDL_TYPE_FORMAT_STRING __MIDL_TypeFormatString =
+    {
+        0,
+        {
+			NdrFcShort( 0x0 ),	/* 0 */
+/*  2 */
+			0x11, 0x4,	/* FC_RP [alloced_on_stack] */
+/*  4 */	NdrFcShort( 0x1c ),	/* Offset= 28 (32) */
+/*  6 */
+			0x13, 0x0,	/* FC_OP */
+/*  8 */	NdrFcShort( 0xe ),	/* Offset= 14 (22) */
+/* 10 */
+			0x1b,		/* FC_CARRAY */
+			0x1,		/* 1 */
+/* 12 */	NdrFcShort( 0x2 ),	/* 2 */
+/* 14 */	0x9,		/* Corr desc: FC_ULONG */
+			0x0,		/*  */
+/* 16 */	NdrFcShort( 0xfffc ),	/* -4 */
+/* 18 */	NdrFcShort( 0x1 ),	/* Corr flags:  early, */
+/* 20 */	0x6,		/* FC_SHORT */
+			0x5b,		/* FC_END */
+/* 22 */
+			0x17,		/* FC_CSTRUCT */
+			0x3,		/* 3 */
+/* 24 */	NdrFcShort( 0x8 ),	/* 8 */
+/* 26 */	NdrFcShort( 0xfff0 ),	/* Offset= -16 (10) */
+/* 28 */	0x8,		/* FC_LONG */
+			0x8,		/* FC_LONG */
+/* 30 */	0x5c,		/* FC_PAD */
+			0x5b,		/* FC_END */
+/* 32 */	0xb4,		/* FC_USER_MARSHAL */
+			0x83,		/* 131 */
+/* 34 */	NdrFcShort( 0x0 ),	/* 0 */
+/* 36 */	NdrFcShort( 0x4 ),	/* 4 */
+/* 38 */	NdrFcShort( 0x0 ),	/* 0 */
+/* 40 */	NdrFcShort( 0xffde ),	/* Offset= -34 (6) */
+/* 42 */
+			0x12, 0x0,	/* FC_UP */
+/* 44 */	NdrFcShort( 0xffea ),	/* Offset= -22 (22) */
+/* 46 */	0xb4,		/* FC_USER_MARSHAL */
+			0x83,		/* 131 */
+/* 48 */	NdrFcShort( 0x0 ),	/* 0 */
+/* 50 */	NdrFcShort( 0x4 ),	/* 4 */
+/* 52 */	NdrFcShort( 0x0 ),	/* 0 */
+/* 54 */	NdrFcShort( 0xfff4 ),	/* Offset= -12 (42) */
+
+			0x0
+        }
+    };
+
+static const USER_MARSHAL_ROUTINE_QUADRUPLE UserMarshalRoutines[ WIRE_MARSHAL_TABLE_SIZE ] =
+        {
+
+            {
+            BSTR_UserSize
+            ,BSTR_UserMarshal
+            ,BSTR_UserUnmarshal
+            ,BSTR_UserFree
+            }
+
+        };
+
+
+
+/* Object interface: IUnknown, ver. 0.0,
+   GUID={0x00000000,0x0000,0x0000,{0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x46}} */
+
+
+/* Object interface: IDispatch, ver. 0.0,
+   GUID={0x00020400,0x0000,0x0000,{0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x46}} */
+
+
+/* Object interface: ICalculator, ver. 0.0,
+   GUID={0x2CFA5DB2,0xA740,0x11d3,{0x98,0x1C,0x00,0x00,0x00,0x00,0x00,0x00}} */
+
+#pragma code_seg(".orpc")
+static const unsigned short ICalculator_FormatStringOffsetTable[] =
+    {
+    (unsigned short) -1,
+    (unsigned short) -1,
+    (unsigned short) -1,
+    (unsigned short) -1,
+    0,
+    36,
+    72,
+    102
+    };
+
+static const MIDL_STUBLESS_PROXY_INFO ICalculator_ProxyInfo =
+    {
+    &Object_StubDesc,
+    __MIDL_ProcFormatString.Format,
+    &ICalculator_FormatStringOffsetTable[-3],
+    0,
+    0,
+    0
+    };
+
+
+static const MIDL_SERVER_INFO ICalculator_ServerInfo =
+    {
+    &Object_StubDesc,
+    0,
+    __MIDL_ProcFormatString.Format,
+    &ICalculator_FormatStringOffsetTable[-3],
+    0,
+    0,
+    0,
+    0};
+CINTERFACE_PROXY_VTABLE(11) _ICalculatorProxyVtbl =
+{
+    &ICalculator_ProxyInfo,
+    &IID_ICalculator,
+    IUnknown_QueryInterface_Proxy,
+    IUnknown_AddRef_Proxy,
+    IUnknown_Release_Proxy ,
+    0 /* (void *) (INT_PTR) -1 /* IDispatch::GetTypeInfoCount */ ,
+    0 /* (void *) (INT_PTR) -1 /* IDispatch::GetTypeInfo */ ,
+    0 /* (void *) (INT_PTR) -1 /* IDispatch::GetIDsOfNames */ ,
+    0 /* IDispatch_Invoke_Proxy */ ,
+    (void *) (INT_PTR) -1 /* ICalculator::get_Input */ ,
+    (void *) (INT_PTR) -1 /* ICalculator::put_Input */ ,
+    (void *) (INT_PTR) -1 /* ICalculator::Calculate */ ,
+    (void *) (INT_PTR) -1 /* ICalculator::get_Output */
+};
+
+
+static const PRPC_STUB_FUNCTION ICalculator_table[] =
+{
+    STUB_FORWARDING_FUNCTION,
+    STUB_FORWARDING_FUNCTION,
+    STUB_FORWARDING_FUNCTION,
+    STUB_FORWARDING_FUNCTION,
+    NdrStubCall2,
+    NdrStubCall2,
+    NdrStubCall2,
+    NdrStubCall2
+};
+
+CInterfaceStubVtbl _ICalculatorStubVtbl =
+{
+    &IID_ICalculator,
+    &ICalculator_ServerInfo,
+    11,
+    &ICalculator_table[-3],
+    CStdStubBuffer_DELEGATING_METHODS
+};
+
+static const MIDL_STUB_DESC Object_StubDesc =
+    {
+    0,
+    NdrOleAllocate,
+    NdrOleFree,
+    0,
+    0,
+    0,
+    0,
+    0,
+    __MIDL_TypeFormatString.Format,
+    1, /* -error bounds_check flag */
+    0x50002, /* Ndr library version */
+    0,
+    0x6000169, /* MIDL Version 6.0.361 */
+    0,
+    UserMarshalRoutines,
+    0,  /* notify & notify_flag routine table */
+    0x1, /* MIDL flag */
+    0, /* cs routines */
+    0,   /* proxy/server info */
+    0   /* Reserved5 */
+    };
+
+const CInterfaceProxyVtbl * _calc_ProxyVtblList[] =
+{
+    ( CInterfaceProxyVtbl *) &_ICalculatorProxyVtbl,
+    0
+};
+
+const CInterfaceStubVtbl * _calc_StubVtblList[] =
+{
+    ( CInterfaceStubVtbl *) &_ICalculatorStubVtbl,
+    0
+};
+
+PCInterfaceName const _calc_InterfaceNamesList[] =
+{
+    "ICalculator",
+    0
+};
+
+const IID *  _calc_BaseIIDList[] =
+{
+    &IID_IDispatch,
+    0
+};
+
+
+#define _calc_CHECK_IID(n)	IID_GENERIC_CHECK_IID( _calc, pIID, n)
+
+int __stdcall _calc_IID_Lookup( const IID * pIID, int * pIndex )
+{
+
+    if(!_calc_CHECK_IID(0))
+        {
+        *pIndex = 0;
+        return 1;
+        }
+
+    return 0;
+}
+
+const ExtendedProxyFileInfo calc_ProxyFileInfo =
+{
+    (PCInterfaceProxyVtblList *) & _calc_ProxyVtblList,
+    (PCInterfaceStubVtblList *) & _calc_StubVtblList,
+    (const PCInterfaceName * ) & _calc_InterfaceNamesList,
+    (const IID ** ) & _calc_BaseIIDList,
+    & _calc_IID_Lookup,
+    1,
+    2,
+    0, /* table of [async_uuid] interfaces */
+    0, /* Filler1 */
+    0, /* Filler2 */
+    0  /* Filler3 */
+};
+#if _MSC_VER >= 1200
+#pragma warning(pop)
+#endif
+
+
+#endif /* !defined(_M_IA64) && !defined(_M_AMD64)*/
+
+
+
+/* this ALWAYS GENERATED file contains the proxy stub code */
+
+
+ /* File created by MIDL compiler version 6.00.0361 */
+/* at Thu Jan 24 22:09:58 2008
+ */
+/* Compiler settings for d:\examples\OleCalc\calc.idl:
+    Oicf, W1, Zp8, env=Win64 (32b run,appending)
+    protocol : dce , ms_ext, c_ext, robust
+    error checks: allocation ref bounds_check enum stub_data
+    VC __declspec() decoration level:
+         __declspec(uuid()), __declspec(selectany), __declspec(novtable)
+         DECLSPEC_UUID(), MIDL_INTERFACE()
+*/
+//@@MIDL_FILE_HEADING(  )
+
+#if defined(_M_IA64) || defined(_M_AMD64)
+
+
+#pragma warning( disable: 4049 )  /* more than 64k source lines */
+#if _MSC_VER >= 1200
+#pragma warning(push)
+#endif
+
+#pragma warning( disable: 4211 )  /* redefine extent to static */
+#pragma warning( disable: 4232 )  /* dllimport identity*/
+#define USE_STUBLESS_PROXY
+
+
+/* verify that the <rpcproxy.h> version is high enough to compile this file*/
+#ifndef __REDQ_RPCPROXY_H_VERSION__
+#define __REQUIRED_RPCPROXY_H_VERSION__ 475
+#endif
+
+
+#include "rpcproxy.h"
+#ifndef __RPCPROXY_H_VERSION__
+#error this stub requires an updated version of <rpcproxy.h>
+#endif // __RPCPROXY_H_VERSION__
+
+
+#include "calc_idl.h"
+
+#define TYPE_FORMAT_STRING_SIZE   57
+#define PROC_FORMAT_STRING_SIZE   147
+#define TRANSMIT_AS_TABLE_SIZE    0
+#define WIRE_MARSHAL_TABLE_SIZE   1
+
+typedef struct _MIDL_TYPE_FORMAT_STRING
+    {
+    short          Pad;
+    unsigned char  Format[ TYPE_FORMAT_STRING_SIZE ];
+    } MIDL_TYPE_FORMAT_STRING;
+
+typedef struct _MIDL_PROC_FORMAT_STRING
+    {
+    short          Pad;
+    unsigned char  Format[ PROC_FORMAT_STRING_SIZE ];
+    } MIDL_PROC_FORMAT_STRING;
+
+
+static RPC_SYNTAX_IDENTIFIER  _RpcTransferSyntax =
+{{0x8A885D04,0x1CEB,0x11C9,{0x9F,0xE8,0x08,0x00,0x2B,0x10,0x48,0x60}},{2,0}};
+
+
+extern const MIDL_TYPE_FORMAT_STRING __MIDL_TypeFormatString;
+extern const MIDL_PROC_FORMAT_STRING __MIDL_ProcFormatString;
+
+
+extern const MIDL_STUB_DESC Object_StubDesc;
+
+
+extern const MIDL_SERVER_INFO ICalculator_ServerInfo;
+extern const MIDL_STUBLESS_PROXY_INFO ICalculator_ProxyInfo;
+
+
+extern const USER_MARSHAL_ROUTINE_QUADRUPLE UserMarshalRoutines[ WIRE_MARSHAL_TABLE_SIZE ];
+
+#if !defined(__RPC_WIN64__)
+#error  Invalid build platform for this stub.
+#endif
+
+static const MIDL_PROC_FORMAT_STRING __MIDL_ProcFormatString =
+    {
+        0,
+        {
+
+	/* Procedure get_Input */
+
+			0x33,		/* FC_AUTO_HANDLE */
+			0x6c,		/* Old Flags:  object, Oi2 */
+/*  2 */	NdrFcLong( 0x0 ),	/* 0 */
+/*  6 */	NdrFcShort( 0x7 ),	/* 7 */
+/*  8 */	NdrFcShort( 0x18 ),	/* ia64 Stack size/offset = 24 */
+/* 10 */	NdrFcShort( 0x0 ),	/* 0 */
+/* 12 */	NdrFcShort( 0x8 ),	/* 8 */
+/* 14 */	0x45,		/* Oi2 Flags:  srv must size, has return, has ext, */
+			0x2,		/* 2 */
+/* 16 */	0xa,		/* 10 */
+			0x3,		/* Ext Flags:  new corr desc, clt corr check, */
+/* 18 */	NdrFcShort( 0x1 ),	/* 1 */
+/* 20 */	NdrFcShort( 0x0 ),	/* 0 */
+/* 22 */	NdrFcShort( 0x0 ),	/* 0 */
+/* 24 */	NdrFcShort( 0x0 ),	/* 0 */
+
+	/* Parameter _value */
+
+/* 26 */	NdrFcShort( 0x2113 ),	/* Flags:  must size, must free, out, simple ref, srv alloc size=8 */
+/* 28 */	NdrFcShort( 0x8 ),	/* ia64 Stack size/offset = 8 */
+/* 30 */	NdrFcShort( 0x20 ),	/* Type Offset=32 */
+
+	/* Return value */
+
+/* 32 */	NdrFcShort( 0x70 ),	/* Flags:  out, return, base type, */
+/* 34 */	NdrFcShort( 0x10 ),	/* ia64 Stack size/offset = 16 */
+/* 36 */	0x8,		/* FC_LONG */
+			0x0,		/* 0 */
+
+	/* Procedure put_Input */
+
+/* 38 */	0x33,		/* FC_AUTO_HANDLE */
+			0x6c,		/* Old Flags:  object, Oi2 */
+/* 40 */	NdrFcLong( 0x0 ),	/* 0 */
+/* 44 */	NdrFcShort( 0x8 ),	/* 8 */
+/* 46 */	NdrFcShort( 0x18 ),	/* ia64 Stack size/offset = 24 */
+/* 48 */	NdrFcShort( 0x0 ),	/* 0 */
+/* 50 */	NdrFcShort( 0x8 ),	/* 8 */
+/* 52 */	0x46,		/* Oi2 Flags:  clt must size, has return, has ext, */
+			0x2,		/* 2 */
+/* 54 */	0xa,		/* 10 */
+			0x5,		/* Ext Flags:  new corr desc, srv corr check, */
+/* 56 */	NdrFcShort( 0x0 ),	/* 0 */
+/* 58 */	NdrFcShort( 0x1 ),	/* 1 */
+/* 60 */	NdrFcShort( 0x0 ),	/* 0 */
+/* 62 */	NdrFcShort( 0x0 ),	/* 0 */
+
+	/* Parameter _value */
+
+/* 64 */	NdrFcShort( 0x8b ),	/* Flags:  must size, must free, in, by val, */
+/* 66 */	NdrFcShort( 0x8 ),	/* ia64 Stack size/offset = 8 */
+/* 68 */	NdrFcShort( 0x2e ),	/* Type Offset=46 */
+
+	/* Return value */
+
+/* 70 */	NdrFcShort( 0x70 ),	/* Flags:  out, return, base type, */
+/* 72 */	NdrFcShort( 0x10 ),	/* ia64 Stack size/offset = 16 */
+/* 74 */	0x8,		/* FC_LONG */
+			0x0,		/* 0 */
+
+	/* Procedure Calculate */
+
+/* 76 */	0x33,		/* FC_AUTO_HANDLE */
+			0x6c,		/* Old Flags:  object, Oi2 */
+/* 78 */	NdrFcLong( 0x0 ),	/* 0 */
+/* 82 */	NdrFcShort( 0x9 ),	/* 9 */
+/* 84 */	NdrFcShort( 0x10 ),	/* ia64 Stack size/offset = 16 */
+/* 86 */	NdrFcShort( 0x0 ),	/* 0 */
+/* 88 */	NdrFcShort( 0x8 ),	/* 8 */
+/* 90 */	0x44,		/* Oi2 Flags:  has return, has ext, */
+			0x1,		/* 1 */
+/* 92 */	0xa,		/* 10 */
+			0x1,		/* Ext Flags:  new corr desc, */
+/* 94 */	NdrFcShort( 0x0 ),	/* 0 */
+/* 96 */	NdrFcShort( 0x0 ),	/* 0 */
+/* 98 */	NdrFcShort( 0x0 ),	/* 0 */
+/* 100 */	NdrFcShort( 0x0 ),	/* 0 */
+
+	/* Return value */
+
+/* 102 */	NdrFcShort( 0x70 ),	/* Flags:  out, return, base type, */
+/* 104 */	NdrFcShort( 0x8 ),	/* ia64 Stack size/offset = 8 */
+/* 106 */	0x8,		/* FC_LONG */
+			0x0,		/* 0 */
+
+	/* Procedure get_Output */
+
+/* 108 */	0x33,		/* FC_AUTO_HANDLE */
+			0x6c,		/* Old Flags:  object, Oi2 */
+/* 110 */	NdrFcLong( 0x0 ),	/* 0 */
+/* 114 */	NdrFcShort( 0xa ),	/* 10 */
+/* 116 */	NdrFcShort( 0x18 ),	/* ia64 Stack size/offset = 24 */
+/* 118 */	NdrFcShort( 0x0 ),	/* 0 */
+/* 120 */	NdrFcShort( 0x8 ),	/* 8 */
+/* 122 */	0x45,		/* Oi2 Flags:  srv must size, has return, has ext, */
+			0x2,		/* 2 */
+/* 124 */	0xa,		/* 10 */
+			0x3,		/* Ext Flags:  new corr desc, clt corr check, */
+/* 126 */	NdrFcShort( 0x1 ),	/* 1 */
+/* 128 */	NdrFcShort( 0x0 ),	/* 0 */
+/* 130 */	NdrFcShort( 0x0 ),	/* 0 */
+/* 132 */	NdrFcShort( 0x0 ),	/* 0 */
+
+	/* Parameter value */
+
+/* 134 */	NdrFcShort( 0x2113 ),	/* Flags:  must size, must free, out, simple ref, srv alloc size=8 */
+/* 136 */	NdrFcShort( 0x8 ),	/* ia64 Stack size/offset = 8 */
+/* 138 */	NdrFcShort( 0x20 ),	/* Type Offset=32 */
+
+	/* Return value */
+
+/* 140 */	NdrFcShort( 0x70 ),	/* Flags:  out, return, base type, */
+/* 142 */	NdrFcShort( 0x10 ),	/* ia64 Stack size/offset = 16 */
+/* 144 */	0x8,		/* FC_LONG */
+			0x0,		/* 0 */
+
+			0x0
+        }
+    };
+
+static const MIDL_TYPE_FORMAT_STRING __MIDL_TypeFormatString =
+    {
+        0,
+        {
+			NdrFcShort( 0x0 ),	/* 0 */
+/*  2 */
+			0x11, 0x4,	/* FC_RP [alloced_on_stack] */
+/*  4 */	NdrFcShort( 0x1c ),	/* Offset= 28 (32) */
+/*  6 */
+			0x13, 0x0,	/* FC_OP */
+/*  8 */	NdrFcShort( 0xe ),	/* Offset= 14 (22) */
+/* 10 */
+			0x1b,		/* FC_CARRAY */
+			0x1,		/* 1 */
+/* 12 */	NdrFcShort( 0x2 ),	/* 2 */
+/* 14 */	0x9,		/* Corr desc: FC_ULONG */
+			0x0,		/*  */
+/* 16 */	NdrFcShort( 0xfffc ),	/* -4 */
+/* 18 */	NdrFcShort( 0x1 ),	/* Corr flags:  early, */
+/* 20 */	0x6,		/* FC_SHORT */
+			0x5b,		/* FC_END */
+/* 22 */
+			0x17,		/* FC_CSTRUCT */
+			0x3,		/* 3 */
+/* 24 */	NdrFcShort( 0x8 ),	/* 8 */
+/* 26 */	NdrFcShort( 0xfff0 ),	/* Offset= -16 (10) */
+/* 28 */	0x8,		/* FC_LONG */
+			0x8,		/* FC_LONG */
+/* 30 */	0x5c,		/* FC_PAD */
+			0x5b,		/* FC_END */
+/* 32 */	0xb4,		/* FC_USER_MARSHAL */
+			0x83,		/* 131 */
+/* 34 */	NdrFcShort( 0x0 ),	/* 0 */
+/* 36 */	NdrFcShort( 0x8 ),	/* 8 */
+/* 38 */	NdrFcShort( 0x0 ),	/* 0 */
+/* 40 */	NdrFcShort( 0xffde ),	/* Offset= -34 (6) */
+/* 42 */
+			0x12, 0x0,	/* FC_UP */
+/* 44 */	NdrFcShort( 0xffea ),	/* Offset= -22 (22) */
+/* 46 */	0xb4,		/* FC_USER_MARSHAL */
+			0x83,		/* 131 */
+/* 48 */	NdrFcShort( 0x0 ),	/* 0 */
+/* 50 */	NdrFcShort( 0x8 ),	/* 8 */
+/* 52 */	NdrFcShort( 0x0 ),	/* 0 */
+/* 54 */	NdrFcShort( 0xfff4 ),	/* Offset= -12 (42) */
+
+			0x0
+        }
+    };
+
+static const USER_MARSHAL_ROUTINE_QUADRUPLE UserMarshalRoutines[ WIRE_MARSHAL_TABLE_SIZE ] =
+        {
+
+            {
+            BSTR_UserSize
+            ,BSTR_UserMarshal
+            ,BSTR_UserUnmarshal
+            ,BSTR_UserFree
+            }
+
+        };
+
+
+
+/* Object interface: IUnknown, ver. 0.0,
+   GUID={0x00000000,0x0000,0x0000,{0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x46}} */
+
+
+/* Object interface: IDispatch, ver. 0.0,
+   GUID={0x00020400,0x0000,0x0000,{0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x46}} */
+
+
+/* Object interface: ICalculator, ver. 0.0,
+   GUID={0x2CFA5DB2,0xA740,0x11d3,{0x98,0x1C,0x00,0x00,0x00,0x00,0x00,0x00}} */
+
+#pragma code_seg(".orpc")
+static const unsigned short ICalculator_FormatStringOffsetTable[] =
+    {
+    (unsigned short) -1,
+    (unsigned short) -1,
+    (unsigned short) -1,
+    (unsigned short) -1,
+    0,
+    38,
+    76,
+    108
+    };
+
+static const MIDL_STUBLESS_PROXY_INFO ICalculator_ProxyInfo =
+    {
+    &Object_StubDesc,
+    __MIDL_ProcFormatString.Format,
+    &ICalculator_FormatStringOffsetTable[-3],
+    0,
+    0,
+    0
+    };
+
+
+static const MIDL_SERVER_INFO ICalculator_ServerInfo =
+    {
+    &Object_StubDesc,
+    0,
+    __MIDL_ProcFormatString.Format,
+    &ICalculator_FormatStringOffsetTable[-3],
+    0,
+    0,
+    0,
+    0};
+CINTERFACE_PROXY_VTABLE(11) _ICalculatorProxyVtbl =
+{
+    &ICalculator_ProxyInfo,
+    &IID_ICalculator,
+    IUnknown_QueryInterface_Proxy,
+    IUnknown_AddRef_Proxy,
+    IUnknown_Release_Proxy ,
+    0 /* (void *) (INT_PTR) -1 /* IDispatch::GetTypeInfoCount */ ,
+    0 /* (void *) (INT_PTR) -1 /* IDispatch::GetTypeInfo */ ,
+    0 /* (void *) (INT_PTR) -1 /* IDispatch::GetIDsOfNames */ ,
+    0 /* IDispatch_Invoke_Proxy */ ,
+    (void *) (INT_PTR) -1 /* ICalculator::get_Input */ ,
+    (void *) (INT_PTR) -1 /* ICalculator::put_Input */ ,
+    (void *) (INT_PTR) -1 /* ICalculator::Calculate */ ,
+    (void *) (INT_PTR) -1 /* ICalculator::get_Output */
+};
+
+
+static const PRPC_STUB_FUNCTION ICalculator_table[] =
+{
+    STUB_FORWARDING_FUNCTION,
+    STUB_FORWARDING_FUNCTION,
+    STUB_FORWARDING_FUNCTION,
+    STUB_FORWARDING_FUNCTION,
+    NdrStubCall2,
+    NdrStubCall2,
+    NdrStubCall2,
+    NdrStubCall2
+};
+
+CInterfaceStubVtbl _ICalculatorStubVtbl =
+{
+    &IID_ICalculator,
+    &ICalculator_ServerInfo,
+    11,
+    &ICalculator_table[-3],
+    CStdStubBuffer_DELEGATING_METHODS
+};
+
+static const MIDL_STUB_DESC Object_StubDesc =
+    {
+    0,
+    NdrOleAllocate,
+    NdrOleFree,
+    0,
+    0,
+    0,
+    0,
+    0,
+    __MIDL_TypeFormatString.Format,
+    1, /* -error bounds_check flag */
+    0x50002, /* Ndr library version */
+    0,
+    0x6000169, /* MIDL Version 6.0.361 */
+    0,
+    UserMarshalRoutines,
+    0,  /* notify & notify_flag routine table */
+    0x1, /* MIDL flag */
+    0, /* cs routines */
+    0,   /* proxy/server info */
+    0   /* Reserved5 */
+    };
+
+const CInterfaceProxyVtbl * _calc_ProxyVtblList[] =
+{
+    ( CInterfaceProxyVtbl *) &_ICalculatorProxyVtbl,
+    0
+};
+
+const CInterfaceStubVtbl * _calc_StubVtblList[] =
+{
+    ( CInterfaceStubVtbl *) &_ICalculatorStubVtbl,
+    0
+};
+
+PCInterfaceName const _calc_InterfaceNamesList[] =
+{
+    "ICalculator",
+    0
+};
+
+const IID *  _calc_BaseIIDList[] =
+{
+    &IID_IDispatch,
+    0
+};
+
+
+#define _calc_CHECK_IID(n)	IID_GENERIC_CHECK_IID( _calc, pIID, n)
+
+int __stdcall _calc_IID_Lookup( const IID * pIID, int * pIndex )
+{
+
+    if(!_calc_CHECK_IID(0))
+        {
+        *pIndex = 0;
+        return 1;
+        }
+
+    return 0;
+}
+
+const ExtendedProxyFileInfo calc_ProxyFileInfo =
+{
+    (PCInterfaceProxyVtblList *) & _calc_ProxyVtblList,
+    (PCInterfaceStubVtblList *) & _calc_StubVtblList,
+    (const PCInterfaceName * ) & _calc_InterfaceNamesList,
+    (const IID ** ) & _calc_BaseIIDList,
+    & _calc_IID_Lookup,
+    1,
+    2,
+    0, /* table of [async_uuid] interfaces */
+    0, /* Filler1 */
+    0, /* Filler2 */
+    0  /* Filler3 */
+};
+#if _MSC_VER >= 1200
+#pragma warning(pop)
+#endif
+
+
+#endif /* defined(_M_IA64) || defined(_M_AMD64)*/
diff --git a/examples/OleCalc/dlldata.c b/examples/OleCalc/dlldata.c
new file mode 100644
index 000000000..b4b1678c0
--- /dev/null
+++ b/examples/OleCalc/dlldata.c
@@ -0,0 +1,38 @@
+/*********************************************************
+   DllData file -- generated by MIDL compiler
+
+        DO NOT ALTER THIS FILE
+
+   This file is regenerated by MIDL on every IDL file compile.
+
+   To completely reconstruct this file, delete it and rerun MIDL
+   on all the IDL files in this DLL, specifying this file for the
+   /dlldata command line option
+
+*********************************************************/
+
+#define PROXY_DELEGATION
+
+#include <rpcproxy.h>
+
+#ifdef __cplusplus
+extern "C"   {
+#endif
+
+EXTERN_PROXY_FILE( calc )
+
+
+PROXYFILE_LIST_START
+/* Start of list */
+  REFERENCE_PROXY_FILE( calc ),
+/* End of list */
+PROXYFILE_LIST_END
+
+
+DLLDATA_ROUTINES( aProxyFileList, GET_DLL_CLSID )
+
+#ifdef __cplusplus
+}  /*extern "C" */
+#endif
+
+/* end of generated dlldata file */
diff --git a/examples/Puzzle/Puzzle.cpp b/examples/Puzzle/Puzzle.cpp
new file mode 100644
index 000000000..da2f3560a
--- /dev/null
+++ b/examples/Puzzle/Puzzle.cpp
@@ -0,0 +1,222 @@
+#include "CtrlLib/CtrlLib.h"
+
+using namespace Upp;
+
+#define LAYOUTFILE <Puzzle/Puzzle.lay>
+#include <CtrlCore/lay.h>
+
+#define IMAGEFILE  <Puzzle/Puzzle.iml>
+#define IMAGECLASS PuzzleImg
+#include <Draw/iml.h>
+
+#define TFILE <Puzzle/Puzzle.t>
+#include <Core/t.h>
+
+class Puzzle : public TopWindow {
+public:
+	virtual void Paint(Draw& w);
+	virtual void LeftDown(Point p, dword);
+
+private:
+	Buffer<int>            box;
+	Size                   size;
+	Point                  hole;
+	int                    moves;
+	int                    lang;
+	VectorMap<String, int> score;
+
+	int& Get(int x, int y)           { return box[size.cx * y + x]; }
+
+	bool Move(int x, int y);
+	void ShowStatus();
+	void Init();
+
+	void About();
+	void Scores();
+	void Setup();
+	void New();
+
+	void GameMenu(Bar& bar);
+	void MainMenu(Bar& bar);
+
+	MenuBar   menu;
+	StatusBar status;
+
+	typedef Puzzle CLASSNAME;
+
+public:
+	void Xmlize(XmlIO xml);
+	void Generate();
+
+	Puzzle();
+};
+
+bool Puzzle::Move(int x, int y)
+{
+	if(x >= 0 && x < size.cx && y >= 0 && y < size.cy &&
+	   (y == hole.y && abs(x - hole.x) == 1 || x == hole.x && abs(y - hole.y) == 1)) {
+	       Swap(Get(x, y), Get(hole.x, hole.y));
+	    hole = Point(x, y);
+	    Refresh();
+		return true;
+	}
+	return false;
+}
+
+void Puzzle::ShowStatus()
+{
+	String txt = t_("Moves: ");
+	txt << moves;
+	status = txt;
+}
+
+void Puzzle::Generate()
+{
+	int n = size.cx * size.cy;
+	box.Alloc(n);
+	n--;
+	for(int i = 0; i < n; i++)
+		box[i] = i + 1;
+	box[n] = 0;
+	hole = size - 1;
+	n = 20 * size.cx * size.cy;
+	while(n > 0)
+		n -= Move(hole.x + (rand() % 3) - 1, hole.y + (rand() % 3) - 1);
+	moves = 0;
+	ShowStatus();
+	SetRect(GetWorkArea().CenterRect(AddFrameSize(size * 32)));
+}
+
+void Puzzle::Paint(Draw& w)
+{
+	w.DrawRect(GetSize(), WhiteGray);
+	for(int y = 0; y < size.cy; y++)
+		for(int x = 0; x < size.cx; x++) {
+			int b = Get(x, y);
+			Point p(x * 32, y * 32);
+			if(b) {
+				w.DrawImage(p.x, p.y, PuzzleImg::BoxImg());
+				String txt = AsString(b);
+				Size sz = GetTextSize(txt, Arial(20).Bold());
+				w.DrawText(p.x + (32 - sz.cx) / 2, p.y + (32 - sz.cy) / 2, txt,
+				           Arial(20).Bold(), SLtBlue);
+			}
+		}
+}
+
+void Puzzle::LeftDown(Point p, dword)
+{
+	if(Move(p.x / 32, p.y / 32)) {
+		moves++;
+		ShowStatus();
+		int n = size.cx * size.cy - 1;
+		for(int i = 0; i < n; i++)
+			if(box[i] != i + 1)
+				return;
+		String dim;
+		int& sm = score.GetAdd(String().Cat() << size.cx << "x" << size.cy);
+		if(moves < sm) {
+			sm = moves;
+			PromptOK(t_("You win with the new best score!"));
+		}
+		else
+			PromptOK(t_("You win!"));
+		Generate();
+	}
+	else
+		BeepExclamation();
+}
+
+void Puzzle::About()
+{
+	PromptOK("[A5 Puzzle]&Using [*^www://upp.sf.net^ Ultimate`+`+] technology.");
+}
+
+void Puzzle::Scores()
+{
+	WithScoreLayout<TopWindow> d;
+	CtrlLayoutOK(d, t_("Best scores"));
+	d.score.AddColumn(t_("Dimension"));
+	d.score.AddColumn(t_("Moves"));
+	d.score.ColumnWidths("71 48");
+	d.score.NoCursor().NoGrid();
+	Vector<int> o = GetSortOrder(score.GetKeys());
+	for(int i = 0; i < o.GetCount(); i++)
+		d.score.Add(score.GetKey(o[i]), score[o[i]]);
+	d.Run();
+}
+
+void Puzzle::Setup()
+{
+	WithSetupLayout<TopWindow> d;
+	CtrlLayoutOKCancel(d, t_("Puzzle setup"));
+	CtrlRetriever r;
+	Size sz = size;
+	r
+		(d.cx, size.cx)
+		(d.cy, size.cy)
+		(d.lang, lang)
+	;
+	if(d.Run() == IDOK) {
+		r.Retrieve();
+		Init();
+		if(sz != size)
+			Generate();
+	}
+}
+
+void Puzzle::New()
+{
+	if(PromptYesNo(t_("Start a new game?")))
+		Generate();
+}
+
+void Puzzle::GameMenu(Bar& bar)
+{
+	bar.Add(t_("New game"), THISBACK(New));
+	bar.Add(t_("Setup.."), THISBACK(Setup));
+	bar.Add(t_("Best scores.."), THISBACK(Scores));
+	bar.Separator();
+	bar.Add(t_("Exit"), Breaker());
+}
+
+void Puzzle::MainMenu(Bar& bar)
+{
+	bar.Add(t_("Game"), THISBACK(GameMenu));
+	bar.Add(t_("About"), THISBACK(About));
+}
+
+void Puzzle::Init()
+{
+	SetLanguage(lang);
+	SetDefaultCharset(CHARSET_UTF8);
+	menu.Set(THISBACK(MainMenu));
+	ShowStatus();
+}
+
+void Puzzle::Xmlize(XmlIO xml)
+{
+	XmlizeLangAttr(xml, lang);
+	xml("Scores", score)
+	   ("Dimension", size);
+	Init();
+}
+
+Puzzle::Puzzle()
+{
+	size = Size(4, 4);
+	AddFrame(menu);
+	AddFrame(status);
+	lang = LNG_ENGLISH;
+	Init();
+	BackPaint();
+}
+
+GUI_APP_MAIN
+{
+	Puzzle p;
+	LoadFromXMLFile(p);
+	p.Generate();
+	p.Run();
+	StoreAsXMLFile(p);
+}
diff --git a/examples/Puzzle/Puzzle.iml b/examples/Puzzle/Puzzle.iml
new file mode 100644
index 000000000..06dc191bc
--- /dev/null
+++ b/examples/Puzzle/Puzzle.iml
@@ -0,0 +1,34 @@
+IMAGE_BEGIN(BoxImg)
+	IMAGE_SCAN("����")
+	IMAGE_SCAN("‚���\2���Õ��ƛ�\1ȟ��ˣ�\1Ψ��Ϫ��ѯ��Ϫ�\1Ψ��ˣ�\1ȟ��ƛ�\1Õ������")
+	IMAGE_SCAN("�\6�����|���ė�ƛ�ȟ��ˣ�\2Ψ�Ϫ��ѯ�\1ү��Գ�\1ү��ѯ�\2Ϫ�Ψ��ˣ�\5ȟ�ƛ�ė��������")
+	IMAGE_SCAN("�\13������ė�ƛ�ȟ�ˣ�Ψ�Ϫ�ѯ�ү�Գ��ֶ�\12Գ�ү�ѯ�Ϫ�Ψ�ˣ�ȟ�ƛ�ė�����")
+	IMAGE_SCAN("\12������Õ�ƛ�ȟ�ˣ�Ψ�Ϫ�ѯ�Գ��ֶ�\2غ�ٽ��ۿ�\2ٽ�غ��ֶ�\10Գ�ѯ�Ϫ�Ψ�ˣ�ȟ�ƛ�Õ�\1���")
+	IMAGE_SCAN("\10���Õ�ƛ�ȟ�ˣ�Ψ�Ϫ�ү��ֶ�\1ٽ��ۿ�\1�ú��Ž\1�ú�ۿ�\1ٽ��ֶ�\6ү�Ϫ�Ψ�ˣ�ȟ�ƛ�\1���")
+	IMAGE_SCAN("\7���ė�ƛ�ˣ�Ψ�Ϫ�ү��ֶ�\2ٽ�ۿ���Ž���ń�Ž\2ۿ�ٽ��ֶ�\5ү�Ϫ�Ψ�ˣ�ƛ�\1���")
+	IMAGE_SCAN("\6���ƛ�ȟ�ˣ�Ϫ�ѯ��ֶ�\2ٽ�ۿ���Ž\1��Ň���\1��ł�Ž\2ۿ�ٽ��ֶ�\4ѯ�Ϫ�ˣ�ȟ�\1���")
+	IMAGE_SCAN("\11���ȟ�ˣ�Ψ�ѯ�Գ�ֶ�ٽ�ۿ���Ž\2�����ȇ���\2�����ł�Ž\7ۿ�ٽ�ֶ�Գ�ѯ�Ψ�ˣ�\1���")
+	IMAGE_SCAN("\10���ȟ�ˣ�Ϫ�ү�ֶ�ٽ�ۿ���Ž\1��Ȃ���\2�����׃���\2�����Ԃ���\1��Ȃ�Ž\6ۿ�ٽ�ֶ�ү�Ϫ�ˣ�\1���")
+	IMAGE_SCAN("\7���ˣ�Ψ�ѯ�Գ�ֶ�ۿ���Ž\1��ł���\2�����؅���\2�����Ԃ���\1��ł�Ž\5ۿ�ֶ�Գ�ѯ�Ψ�\1���")
+	IMAGE_SCAN("\17���ˣ�Ϫ�ү�ֶ�غ�ۿ��Ž������������������������\15����������������������Žۿ�غ�ֶ�ѯ�Ϫ�\1���")
+	IMAGE_SCAN("\37���ˣ�Ϫ�ү�ֶ�ٽ��ú�Ž����������������������������������������������������Ž�úٽ�ֶ�ү�Ϫ�\1���")
+	IMAGE_SCAN("\6���Ψ�Ϫ�Գ�ֶ�ۿ���Ž\6���������������������\1������\6�����������������Ȃ�Ž\4ۿ�ֶ�Գ�Ϫ�\1���")
+	IMAGE_SCAN("\17���Ψ�ѯ�Գ�ֶ�ۿ��Ž���������������������������\15�������������������������Žۿ�ֶ�Գ�ѯ�\1���")
+	IMAGE_SCAN("\37���Ψ�ѯ�Գ�ֶ�ۿ��Ž���������������������������\377\377\377����������������������������Žۿ�ֶ�Գ�ѯ�\1���")
+	IMAGE_SCAN("\17���Ψ�ѯ�Գ�ֶ�ۿ��Ž���������������������������\15�������������������������Žۿ�ֶ�Գ�ѯ�\1���")
+	IMAGE_SCAN("\6���Ψ�Ϫ�Գ�ֶ�ۿ���Ž\6���������������������\1������\6�����������������Ȃ�Ž\4ۿ�ֶ�Գ�Ϫ�\1���")
+	IMAGE_SCAN("\37���ˣ�Ϫ�ү�ֶ�ٽ��ú�Ž����������������������������������������������������Ž�úٽ�ֶ�ү�Ϫ�\1���")
+	IMAGE_SCAN("\17���ˣ�Ϫ�ү�ֶ�غ�ۿ��Ž������������������������\15����������������������Žۿ�غ�ֶ�ѯ�Ϫ�\1���")
+	IMAGE_SCAN("\7���ˣ�Ψ�ѯ�Գ�ֶ�ۿ���Ž\1��ł���\2�����؅���\2�����Ԃ���\1��ł�Ž\5ۿ�ֶ�Գ�ѯ�Ψ�\1���")
+	IMAGE_SCAN("\10���ȟ�ˣ�Ϫ�ү�ֶ�ٽ�ۿ���Ž\1��Ȃ���\2�����׃���\2�����Ԃ���\1��Ȃ�Ž\6ۿ�ٽ�ֶ�ү�Ϫ�ˣ�\1���")
+	IMAGE_SCAN("\11���ȟ�ˣ�Ψ�ѯ�Գ�ֶ�ٽ�ۿ���Ž\2�����ȇ���\2�����ł�Ž\7ۿ�ٽ�ֶ�Գ�ѯ�Ψ�ˣ�\1���")
+	IMAGE_SCAN("\6���ƛ�ȟ�ˣ�Ϫ�ү��ֶ�\2ٽ�ۿ���Ž\1��Ň���\1��ł�Ž\2ۿ�ٽ��ֶ�\4ѯ�Ϫ�ˣ�ȟ�\1���")
+	IMAGE_SCAN("\7���ė�ƛ�ˣ�Ψ�Ϫ�ү��ֶ�\2ٽ�ۿ���Ž���ń�Ž\2ۿ�ٽ��ֶ�\5ү�Ϫ�Ψ�ˣ�ƛ�\1���")
+	IMAGE_SCAN("\10���Õ�ƛ�ȟ�ˣ�Ψ�Ϫ�ү��ֶ�\1ٽ��ۿ�\1�ú��Ž\1�ú�ۿ�\1ٽ��ֶ�\6ү�Ϫ�Ψ�ˣ�ȟ�ƛ�\1���")
+	IMAGE_SCAN("\12������Õ�ƛ�ȟ�ˣ�Ψ�Ϫ�ү�Գ��ֶ�\2غ�ٽ��ۿ�\2ٽ�غ��ֶ�\10Գ�ѯ�Ϫ�Ψ�ˣ�ȟ�ƛ�Õ�\1���")
+	IMAGE_SCAN("\14�����|���ė�ƛ�ȟ�ˣ�Ψ�Ϫ�ѯ�ү�Գ��ֶ�\12Գ�ү�ѯ�Ϫ�Ψ�ˣ�ȟ�ƛ�ė����\1���")
+	IMAGE_SCAN("�\6�����|���ė�ƛ�ȟ��ˣ�\3Ψ�Ϫ�ѯ��ү��Գ��ү�\3ѯ�Ϫ�Ψ��ˣ�\5ȟ�ƛ�ė��������")
+	IMAGE_SCAN("�\1������|\2���Õ��ƛ�\1ȟ��ˣ�\1Ψ��Ϫ��ѯ��Ϫ�\1Ψ��ˣ�\1ȟ��ƛ�\4Õ������|����")
+	IMAGE_SCAN("‚���\5��|���Õ�ė�ƛ��ȟ��ˣ��Ψ��ˣ��ȟ�\4ƛ�ė�Õ���������")
+	IMAGE_SCAN("����")
+IMAGE_PACKED(BoxImg, "\2 \0\0\0 \0\0\0\0\0\0\0\0\0\0\0\0\0\0\0")
diff --git a/examples/Puzzle/Puzzle.lay b/examples/Puzzle/Puzzle.lay
new file mode 100644
index 000000000..caee43446
--- /dev/null
+++ b/examples/Puzzle/Puzzle.lay
@@ -0,0 +1,17 @@
+LAYOUT(SetupLayout, 152, 160)
+	ITEM(LabelBox, dv___0, SetLabel(t_("Dimension:")).LeftPosZ(8, 136).TopPosZ(4, 60))
+	ITEM(Label, dv___1, SetLabel(t_("Height:")).SetAlign(ALIGN_CENTER).LeftPosZ(80, 48).TopPosZ(20, 13))
+	ITEM(EditIntSpin, cx, Min(3).Max(15).NotNull(true).SetFrame(ThinInsetFrame()).LeftPosZ(16, 56).TopPosZ(36, 19))
+	ITEM(Label, dv___3, SetLabel(t_("Width:")).SetAlign(ALIGN_CENTER).LeftPosZ(16, 48).TopPosZ(20, 13))
+	ITEM(EditIntSpin, cy, Min(3).Max(15).NotNull(true).SetFrame(ThinInsetFrame()).LeftPosZ(80, 56).TopPosZ(36, 19))
+	ITEM(LabelBox, dv___5, SetLabel(t_("Language:")).LeftPosZ(8, 136).TopPosZ(72, 52))
+	ITEM(LNGCtrl, lang, LeftPosZ(32, 88).TopPosZ(92, 20))
+	ITEM(Button, ok, SetLabel(t_("OK")).HSizePosZ(80, 8).TopPosZ(132, 20))
+	ITEM(Button, cancel, SetLabel(t_("Cancel")).HSizePosZ(8, 80).TopPosZ(132, 20))
+END_LAYOUT
+
+LAYOUT(ScoreLayout, 156, 260)
+	ITEM(ArrayCtrl, score, LeftPosZ(8, 140).TopPosZ(44, 180))
+	ITEM(Button, ok, SetLabel(t_("OK")).LeftPosZ(84, 64).TopPosZ(232, 20))
+	ITEM(Label, dv___2, SetLabel(t_("Best scores")).SetAlign(ALIGN_CENTER).SetFont(Arial(20)).SetInk(Blue).LeftPosZ(8, 140).TopPosZ(8, 32))
+END_LAYOUT
diff --git a/examples/Puzzle/Puzzle.t b/examples/Puzzle/Puzzle.t
new file mode 100644
index 000000000..13ef86e29
--- /dev/null
+++ b/examples/Puzzle/Puzzle.t
@@ -0,0 +1,68 @@
+
+// Puzzle.cpp
+
+T_("Moves: ")
+csCZ("Počet tahů: ")
+
+T_("You win with the new best score!")
+csCZ("Vyřešeno s nejlepším počtem tahů!")
+
+T_("You win!")
+csCZ("Vyřešeno!")
+
+T_("Puzzle")
+csCZ("Hlavolam")
+
+T_("Best scores")
+csCZ("Nejlepší výsledky")
+
+T_("Dimension")
+csCZ("Rozměr")
+
+T_("Moves")
+csCZ("Tahy")
+
+T_("Puzzle setup")
+csCZ("Nastavení")
+
+T_("Start a new game?")
+csCZ("Začít znovu?")
+
+T_("New game")
+csCZ("Nová hra")
+
+T_("Setup..")
+csCZ("Nastavení")
+
+T_("Best scores..")
+csCZ("Nejlepší výsledky")
+
+T_("Exit")
+csCZ("Konec")
+
+T_("Game")
+csCZ("Hra")
+
+T_("About")
+csCZ("O aplikaci")
+
+
+// Puzzle.lay
+
+T_("Dimension:")
+csCZ("Rozměr")
+
+T_("Height:")
+csCZ("Výška:")
+
+T_("Width:")
+csCZ("Šířka")
+
+T_("Language:")
+csCZ("Jazyk:")
+
+T_("OK")
+csCZ("OK")
+
+T_("Cancel")
+csCZ("Storno")
diff --git a/examples/Puzzle/Puzzle.upp b/examples/Puzzle/Puzzle.upp
new file mode 100644
index 000000000..a36bf0d65
--- /dev/null
+++ b/examples/Puzzle/Puzzle.upp
@@ -0,0 +1,14 @@
+description "Puzzle game";
+
+uses
+	CtrlLib;
+
+file
+	Puzzle.cpp,
+	Puzzle.t charset "UTF-8",
+	Puzzle.iml,
+	Puzzle.lay;
+
+mainconfig
+	"" = "GUI";
+
diff --git a/examples/Puzzle/icon.ico b/examples/Puzzle/icon.ico
new file mode 100644
index 000000000..4012786aa
Binary files /dev/null and b/examples/Puzzle/icon.ico differ
diff --git a/examples/SDLExample/SDLExample.upp b/examples/SDLExample/SDLExample.upp
new file mode 100644
index 000000000..95ed082f4
--- /dev/null
+++ b/examples/SDLExample/SDLExample.upp
@@ -0,0 +1,19 @@
+description "SDL demo example";
+
+uses
+	Core;
+
+library(MSC) "SDL SDLmain";
+
+library(GCC WIN32) "SDL.dll SDLmain";
+
+library(LINUX) "SDL SDLmain";
+
+library(FREEBSD) "SDL SDLmain X11 Xext Xrandr Xrender vga vgl aa usbhid ncurses";
+
+file
+	main.cpp;
+
+mainconfig
+	"" = "";
+
diff --git a/examples/SDLExample/font.bmp b/examples/SDLExample/font.bmp
new file mode 100644
index 000000000..8eebb0781
Binary files /dev/null and b/examples/SDLExample/font.bmp differ
diff --git a/examples/SDLExample/main.cpp b/examples/SDLExample/main.cpp
new file mode 100644
index 000000000..a217dd3fc
--- /dev/null
+++ b/examples/SDLExample/main.cpp
@@ -0,0 +1,380 @@
+#include <Core/Core.h>
+
+using namespace Upp;
+
+#ifdef PLATFORM_WIN32
+#include <SDL.h>
+#else
+#include <SDL/SDL.h>
+#endif
+
+const int maxpoint  = 1000;
+const int maxscroll = 7;
+const int width  = 640;
+const int height = 480;
+const int bpp    = 8;
+
+struct ScreenPoint
+{
+	int x, y;
+	int sx, sy;
+	int col;
+};
+
+struct ScreenFont
+{
+int x0, y0;
+int x1, y1;
+};
+
+double sintab[width];
+
+SDL_Surface *fntbmp;
+
+const char * scroll[]=
+{
+	"ULTIMATE++",
+	"WHEN PROGRAMMING",
+	"IS FUN",
+	"THIS IS A SIMPLE",
+	"SDL DEMO",
+	"CODED BY UNO",
+	"ENJOY THE SCROLL"
+};
+
+const ScreenFont fntdef[50] =
+{
+	0,0,32,51, 35,0,65,51, 71,0,101,52, 107,0,137,51, 143,0,167,51, 171,0,192,51,
+	197,0,227,52, 233,0,264,51, 270,0,283,51, 288,0,305,51, 311,0,343,51,
+	346,0,367,51, 371,0,412,51, 0,58,30,109, 36,58,66,110, 72,58,100,109,
+	105,58,135,115, 141,58,170,109, 175,58,205,110, 208,58,237,109,
+	241,58,271,110, 274,58,308,109, 310,58,361,109, 362,58,393,109,
+	394,58,424,109, 426,58,449,109,
+	/* 0 */
+	0,120,29,172, 33,120,54,171, 60,120,86,171, 93,120,122,172,
+	126,120,157,171, 162,120,190,172, 196,120,226,172, 230,120,254,171,
+	258,120,287,172, 293,120,323,172,
+	/* ! */
+	0,177,15,231, 18,177,66,233, 69,177,107,231, 111,177,140,236,
+	146,177,188,232, 191,177,220,205, 223,177,259,232, 261,177,277,194,
+	281,177,297,231, 301,177,317,231, 322,177,339,215, 343,177,373,221,
+	378,177,392,231, 396,177,410,231
+};
+
+const int fntascii[96] =
+{
+	0,0,0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,0,0,
+	0,0,0,
+	36,0,38,39,40,42,0,44,45,43,47,0,46,0,0,
+	26,27,28,29,30,31,32,33,34,35,
+	0,0,0,0,0,0,37,
+	0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,
+	17,18,19,20,21,22,23,24,25,
+	48,0,49,41
+};
+
+void PutLetter(SDL_Surface * screen, int x, int y, int n, int col, double ampl)
+{
+	int dx = fntdef[n].x1 - fntdef[n].x0;
+	int dy = fntdef[n].y1 - fntdef[n].y0;
+
+	int sx = fntdef[n].x0;
+	int sy = fntdef[n].y0;
+
+	int w = screen->w;
+	int h = screen->h;
+
+	if(x + dx < 0 || y + dy < 0 ||  x > w || y > h)
+		return;
+
+	if(x < 0)
+	{
+		sx -= x;
+		dx += x;
+		x = 0;
+	}
+	if(y < 0)
+	{
+		sy -= y;
+		dy += y;
+		y = 0;
+	}
+
+	if(x + dx > w)
+	dx = w - x;
+	if(y + dy > h)
+	dy = h - y;
+
+	Uint8 * b = (Uint8 *) screen->pixels;
+	Uint8 * f = (Uint8 *) fntbmp->pixels;
+
+	for(int j = 0; j < dx; j++)
+	{
+		int ads = (y + (int) (sintab[x + j] * ampl)) * screen->w + x;
+		int adf = sy * fntbmp->w + sx;
+		for(int i = 0; i < dy; i++)
+		{
+			char c = f[adf + j];
+			if(c == 1)
+				b[ads + j] = col;
+			else if(c == 3)
+				b[ads + j] = 0;
+			ads += screen->w;
+			adf += fntbmp->w;
+		}
+	}
+}
+
+void WriteStr(SDL_Surface * screen, int x, int y, const char *str, int col, double ampl)
+{
+	while(*str)
+	{
+		int n = fntascii[*str];
+		if(*str != 32)
+		{
+			PutLetter(screen, x, y, n, col, ampl);
+			x += fntdef[n].x1 - fntdef[n].x0 + 2;
+		}
+		else
+			x += 20;
+		str++;
+	}
+}
+
+int LengthStr(const char *str)
+{
+	int l = 0, n;
+
+	while(*str)
+	{
+		n = fntascii[*str];
+		if(*str != 32)
+			l += fntdef[n].x1 - fntdef[n].x0 + 2;
+		else
+			l += 20;
+
+		str++;
+	}
+	return l;
+}
+
+void DrawPoints(SDL_Surface *screen, ScreenPoint *p)
+{
+	Uint8 * b = (Uint8 *) screen->pixels;
+
+	for(int i = 0; i < maxpoint; i++)
+		b[p[i].y * screen->w + p[i].x] = 255;
+}
+
+
+void MovePoints(ScreenPoint *p)
+{
+	int w = width - 1;
+	int h = height - 1;
+
+	for(int i = 0; i < maxpoint; i++)
+	{
+		p[i].x += p[i].sx;
+		p[i].y += p[i].sy;
+
+		if(p[i].x > w)
+		{
+			p[i].sx = -p[i].sx;
+			p[i].x = w;
+		}
+		if(p[i].x < 0)
+		{
+			p[i].sx = -p[i].sx;
+			p[i].x = 0;
+		}
+		if(p[i].y > h)
+		{
+			p[i].sy = -p[i].sy;
+			p[i].y = h;
+		}
+		if(p[i].y < 0)
+		{
+			p[i].sy = -p[i].sy;
+			p[i].y = 0;
+		}
+	}
+}
+
+void Blur(SDL_Surface *screen)
+{
+	Uint8 * b = (Uint8 *) screen->pixels;
+
+	int i = 0;
+	for(; i < width * (height - 1); i++)
+		b[i] = (b[i] + b[i + 1] + b[i + width - 1] + b[i + width + 2]) >> 2;
+
+	for(; i < width * height; i++)
+		b[i] = 0;
+
+}
+
+SDL_Surface *CreateScreen(int w, int h, int bpp, int flags)
+{
+	SDL_Surface * screen = SDL_SetVideoMode(w, h, bpp, flags);
+	if(!screen)
+	{
+		Cout() << Format("Couldn't set display mode: %s\n", SDL_GetError());
+		return NULL;
+	}
+	Cout() << Format("Screen is in %s mode\n", (screen->flags & SDL_FULLSCREEN) ? "fullscreen" : "windowed");
+	return screen;
+}
+
+void SetupPalette(SDL_Surface * screen)
+{
+	SDL_Color pal[256];
+
+	double d = 20;
+	double dx = 63.0 / 256.0;
+
+	for(int i = 0; i < 254; i++)
+	{
+		pal[i].r = (Uint8) d;
+		pal[i].g = (Uint8) d;
+		pal[i].b = 0;
+
+		d += dx;
+	}
+	pal[254].r = 0;
+	pal[254].g = 150;
+	pal[254].b = 255;
+
+	pal[255].r = 255;
+	pal[255].g = 255;
+	pal[255].b = 0;
+
+	SDL_SetColors(screen, pal, 0, 256);
+	SDL_Flip(screen);
+	SDL_SetColors(screen, pal, 0, 256);
+}
+
+CONSOLE_APP_MAIN
+{
+	if(SDL_Init(SDL_INIT_VIDEO) < 0)
+	{
+		Cout() << Format("Couldn't initialize SDL: %s\n", SDL_GetError());
+		return;
+	}
+
+	ScreenPoint points[maxpoint];
+
+	for(int i = 0; i < width; i++)
+		sintab[i] = sin(i * M_PI / 180.0);
+
+	for(int i = 0; i < maxpoint; i++)
+	{
+		points[i].x   = rand() % (width - 1);
+		points[i].y   = rand() % (height - 1);
+		points[i].sx  = (rand() & 1) + 1;
+		points[i].sy  = (rand() & 1) + 1;
+		points[i].col = (rand() % 255);
+	}
+
+	fntbmp = SDL_LoadBMP(GetDataFile("font.bmp"));
+	if(!fntbmp)
+	{
+		Cout() << Format("Error loading font.bmp : %s\n", SDL_GetError());
+		return;
+	}
+
+	int videoflags = SDL_HWSURFACE | SDL_HWACCEL | SDL_DOUBLEBUF | SDL_FULLSCREEN;
+
+	SDL_Surface * screen = CreateScreen(width, height, bpp, videoflags);
+	if(!screen)
+		return;
+
+	SDL_Surface * surface = SDL_CreateRGBSurface(SDL_SWSURFACE, width, height, bpp, 0, 0, 0, 0);
+	if(!surface)
+		return;
+
+	SetupPalette(surface);
+	SetupPalette(screen);
+
+	int j = 0;
+	int k = 0;
+	int len0 = LengthStr(scroll[j]);
+	int len1 = len0;
+	int xmax = (width - len1) / 2;
+	int x0 = width;
+	int x1 = -len0;
+
+	SDL_Event event;
+	bool done = false;
+
+	while(!done)
+	{
+		if(SDL_PollEvent(&event))
+			switch (event.type)
+			{
+				case SDL_KEYDOWN:
+					if(event.key.keysym.sym == SDLK_LALT || event.key.keysym.sym == SDLK_TAB)
+						break;
+
+					if(event.key.keysym.sym == SDLK_LALT && event.key.keysym.sym == SDLK_RETURN)
+					{
+						videoflags ^= SDL_FULLSCREEN;
+						screen = CreateScreen(screen->w, screen->h, screen->format->BitsPerPixel, videoflags);
+						if(!screen)
+						{
+							Cout() << "Couldn't toggle fullscreen mode\n";
+							done = true;
+						}
+						SetupPalette(surface);
+						SetupPalette(screen);
+						break;
+					}
+				case SDL_QUIT:
+					done = true;
+					break;
+				default:
+					break;
+			}
+			else
+			{
+				SDL_LockSurface(surface);
+
+				DrawPoints(surface, points);
+				Blur(surface);
+				MovePoints(points);
+
+				if(x0 > -len0)
+					WriteStr(surface, x0 + 5, height - 195, scroll[k], 254, 50);
+
+				if(x1 <= xmax)
+					WriteStr(surface, x1, height - 260, scroll[j], 255, 50);
+
+				x0 -= 1;
+				x1 += 1;
+
+				if(x0 < -len0)
+				{
+					if(++k > maxscroll - 1) k = 0;
+					len0 = LengthStr(scroll[k]);
+					x0 = width;
+				}
+
+				if(x1 > xmax)
+				{
+					if(++j > maxscroll - 1) j = 0;
+					len1 = LengthStr(scroll[j]);
+					xmax = (width - len1) / 2;
+					x1 = -len1;
+				}
+
+				SDL_UnlockSurface(surface);
+				SDL_BlitSurface(surface, NULL, screen, NULL);
+				SDL_Flip(screen);
+			}
+	}
+	SDL_FreeSurface(surface);
+	SDL_FreeSurface(screen);
+	SDL_FreeSurface(fntbmp);
+	SDL_Quit();
+}
diff --git a/examples/SQLApp/SQLApp.h b/examples/SQLApp/SQLApp.h
new file mode 100644
index 000000000..8cc5eacc4
--- /dev/null
+++ b/examples/SQLApp/SQLApp.h
@@ -0,0 +1,45 @@
+#ifndef _SQLApp_SQLApp_h
+#define _SQLApp_SQLApp_h
+
+#include <SqlCtrl/SqlCtrl.h>
+#include <plugin/sqlite3/Sqlite3.h>
+
+using namespace Upp;
+
+#define LAYOUTFILE <SQLApp/SQLApp.lay>
+#include <CtrlCore/lay.h>
+
+#define SCHEMADIALECT <plugin/sqlite3/Sqlite3Schema.h>
+#define MODEL <SQLApp/SQLApp.sch>
+#include "Sql/sch_header.h"
+
+Convert& DateIntConvert();
+
+struct SQLApp : public WithSQLAppLayout<TopWindow> {
+	WithQueryLayout<TopWindow> query;
+	void Serialize(Stream& s);
+
+	void Query();
+	void Query(int q);
+	void SetupQuery();
+	void ClearQuery();
+
+	void NewBook();
+	void EditBook();
+	void DeleteBook();
+	void BookMenu(Bar& bar);
+
+	void NewBorrow();
+	void EditBorrow();
+	void DeleteBorrow();
+	void ReturnedToday();
+	void BorrowMenu(Bar& bar);
+
+	void SetupMenu(Bar& bar);
+	void MainMenu(Bar& bar);
+
+	typedef SQLApp CLASSNAME;
+	SQLApp();
+};
+
+#endif
diff --git a/examples/SQLApp/SQLApp.lay b/examples/SQLApp/SQLApp.lay
new file mode 100644
index 000000000..0ce5ef313
--- /dev/null
+++ b/examples/SQLApp/SQLApp.lay
@@ -0,0 +1,37 @@
+LAYOUT(SQLAppLayout, 548, 440)
+	ITEM(SqlArray, book, LeftPosZ(4, 536).TopPosZ(28, 200))
+	ITEM(SqlArray, borrowed, LeftPosZ(4, 536).TopPosZ(232, 204))
+	ITEM(MenuBar, menu, LeftPosZ(4, 304).TopPosZ(4, 20))
+END_LAYOUT
+
+LAYOUT(BookLayout, 340, 88)
+	ITEM(Label, dv___0, SetLabel(t_("Author")).LeftPosZ(4, 40).TopPosZ(4, 19))
+	ITEM(EditString, author, LeftPosZ(48, 284).TopPosZ(4, 19))
+	ITEM(Label, dv___2, SetLabel(t_("Title")).LeftPosZ(4, 40).TopPosZ(28, 19))
+	ITEM(EditString, title, LeftPosZ(48, 284).TopPosZ(28, 19))
+	ITEM(Button, ok, SetLabel(t_("OK")).LeftPosZ(200, 64).TopPosZ(56, 24))
+	ITEM(Button, cancel, SetLabel(t_("Cancel")).LeftPosZ(268, 64).TopPosZ(56, 24))
+END_LAYOUT
+
+LAYOUT(BorrowLayout, 280, 88)
+	ITEM(Label, dv___0, SetLabel(t_("Borrowed")).LeftPosZ(4, 56).TopPosZ(4, 19))
+	ITEM(EditField, borrowed, LeftPosZ(60, 72).TopPosZ(4, 19))
+	ITEM(Label, dv___2, SetLabel(t_("Returned")).LeftPosZ(140, 56).TopPosZ(4, 19))
+	ITEM(EditField, returned, LeftPosZ(196, 76).TopPosZ(4, 19))
+	ITEM(Label, dv___4, SetLabel(t_("Person")).LeftPosZ(4, 56).TopPosZ(28, 19))
+	ITEM(EditString, person, LeftPosZ(60, 212).TopPosZ(28, 19))
+	ITEM(Button, ok, SetLabel(t_("OK")).LeftPosZ(140, 64).TopPosZ(56, 24))
+	ITEM(Button, cancel, SetLabel(t_("Cancel")).LeftPosZ(208, 64).TopPosZ(56, 24))
+END_LAYOUT
+
+LAYOUT(QueryLayout, 292, 112)
+	ITEM(LabelBox, dv___0, SetLabel(t_("Status")).LeftPosZ(8, 276).TopPosZ(8, 36))
+	ITEM(Switch, status, SetLabel(t_("Does not matter\nIn library\nBorrowed")).LeftPosZ(16, 256).TopPosZ(24, 16))
+	ITEM(Label, dv___2, SetLabel(t_("Borrow date between")).LeftPosZ(8, 108).TopPosZ(52, 19))
+	ITEM(EditDate, borrowed_from, LeftPosZ(116, 72).TopPosZ(52, 19))
+	ITEM(Label, dv___4, SetLabel(t_("and")).LeftPosZ(192, 20).TopPosZ(52, 19))
+	ITEM(EditDate, borrowed_to, LeftPosZ(212, 72).TopPosZ(52, 19))
+	ITEM(Button, clear, SetLabel(t_("Clear")).LeftPosZ(8, 64).TopPosZ(80, 24))
+	ITEM(Button, ok, SetLabel(t_("OK")).LeftPosZ(152, 64).TopPosZ(80, 24))
+	ITEM(Button, cancel, SetLabel(t_("Cancel")).LeftPosZ(220, 64).TopPosZ(80, 24))
+END_LAYOUT
diff --git a/examples/SQLApp/SQLApp.sch b/examples/SQLApp/SQLApp.sch
new file mode 100644
index 000000000..4a2eaca8a
--- /dev/null
+++ b/examples/SQLApp/SQLApp.sch
@@ -0,0 +1,13 @@
+TABLE_(BOOK)
+	INT_    (ID) PRIMARY_KEY AUTO_INCREMENT
+	STRING_ (AUTHOR, 2000)
+	STRING_ (TITLE, 2000)
+END_TABLE
+
+TABLE_(BORROW_RECORD)
+	INT     (ID) PRIMARY_KEY AUTO_INCREMENT
+	INT_    (BOOK_ID) REFERENCES(BOOK)
+	STRING_ (PERSON, 2000) INDEX
+	INT_    (BORROWED) INDEX
+	INT_    (RETURNED) INDEX
+END_TABLE
diff --git a/examples/SQLApp/SQLApp.upp b/examples/SQLApp/SQLApp.upp
new file mode 100644
index 000000000..0eae045a7
--- /dev/null
+++ b/examples/SQLApp/SQLApp.upp
@@ -0,0 +1,19 @@
+description "SQL application example";
+
+uses
+	CtrlLib,
+	plugin\sqlite3,
+	SqlCtrl;
+
+file
+	SQLApp.h,
+	SQLApp.sch,
+	query.cpp,
+	book.cpp,
+	borrow.cpp,
+	main.cpp,
+	SQLApp.lay;
+
+mainconfig
+	"" = "GUI";
+
diff --git a/examples/SQLApp/book.cpp b/examples/SQLApp/book.cpp
new file mode 100644
index 000000000..dcb73f18f
--- /dev/null
+++ b/examples/SQLApp/book.cpp
@@ -0,0 +1,56 @@
+#include "SQLApp.h"
+
+struct BookDlg : public WithBookLayout<TopWindow> {
+	SqlCtrls ctrls;
+
+	BookDlg() {
+		CtrlLayoutOKCancel(*this, "Book");
+		ctrls
+			(AUTHOR, author)
+			(TITLE, title)
+		;
+	}
+};
+
+void SQLApp::NewBook()
+{
+	BookDlg dlg;
+	if(dlg.Run() != IDOK)
+		return;
+	SQL * dlg.ctrls.Insert(BOOK);
+	Query(SQL.GetInsertedId());
+}
+
+void SQLApp::EditBook()
+{
+	if(!book.IsCursor())
+		return;
+	BookDlg dlg;
+	int q = book.GetKey();
+	SQL * Select(dlg.ctrls).From(BOOK).Where(ID == q);
+	if(!dlg.ctrls.Fetch(SQL))
+		return;
+	if(dlg.Run() != IDOK)
+		return;
+	SQL * dlg.ctrls.Update(BOOK).Where(ID == q);
+	Query(q);
+}
+
+void SQLApp::DeleteBook()
+{
+	if(book.IsCursor() && PromptYesNo("Delete the book?")) {
+		SQL * Delete(BORROW_RECORD).Where(BOOK_ID == book.GetKey());
+		SQL * Delete(BOOK).Where(ID == book.GetKey());
+		Query();
+	}
+}
+
+void SQLApp::BookMenu(Bar& bar)
+{
+	bar.Add("New book..", THISBACK(NewBook));
+	bar.Add(book.IsCursor(), "Edit book..", THISBACK(EditBook));
+	bar.Add(book.IsCursor(), "Delete book..", THISBACK(DeleteBook));
+	bar.Separator();
+	bar.Add("Query..", THISBACK(SetupQuery))
+	   .Key(K_CTRL_F);
+}
diff --git a/examples/SQLApp/borrow.cpp b/examples/SQLApp/borrow.cpp
new file mode 100644
index 000000000..29f698e65
--- /dev/null
+++ b/examples/SQLApp/borrow.cpp
@@ -0,0 +1,121 @@
+#include "SQLApp.h"
+
+struct DateIntConvertCls : Convert {
+	virtual Value Format(const Value& q) const;
+	virtual Value Scan(const Value& text) const;
+	virtual int Filter(int chr) const;
+};
+
+Value DateIntConvertCls::Format(const Value& q) const
+{
+	return IsNull(q) ? String() : ::Format(Date(1970, 1, 1) + (int)q);
+}
+
+Value DateIntConvertCls::Scan(const Value& text) const
+{
+	String txt = text;
+	if(IsNull(txt))
+		return Null;
+	Date d;
+	if(StrToDate(d, txt))
+		return d - Date(1970, 1, 1);
+	return ErrorValue("Invalid date!");
+}
+
+int DateIntConvertCls::Filter(int chr) const
+{
+	return CharFilterDate(chr);
+}
+
+Convert& DateIntConvert()
+{
+	return Single<DateIntConvertCls>();
+}
+
+class BorrowDlg : public WithBorrowLayout<TopWindow> {
+public:
+	SqlCtrls ctrls;
+
+	typedef BorrowDlg CLASSNAME;
+
+	BorrowDlg();
+};
+
+BorrowDlg::BorrowDlg()
+{
+	CtrlLayoutOKCancel(*this, "Book borrow record");
+	ctrls
+		(BORROWED, borrowed)
+		(RETURNED, returned)
+		(PERSON, person)
+	;
+	borrowed.SetConvert(DateIntConvert());
+	borrowed <<= GetSysDate() - Date(1970, 1, 1);
+	returned.SetConvert(DateIntConvert());
+}
+
+void SQLApp::NewBorrow()
+{
+	if(!book.IsCursor())
+		return;
+	SQL * Select(ID).From(BORROW_RECORD)
+	      .Where(BOOK_ID == book.GetKey() && IsNull(RETURNED));
+	if(SQL.Fetch() && !PromptYesNo("The book is still borrowed!&Continue?")) {
+		borrowed.FindSetCursor(SQL[0]);
+		return;
+	}
+	BorrowDlg dlg;
+	if(dlg.Run() != IDOK)
+		return;
+	SQL * dlg.ctrls.Insert(BORROW_RECORD)(BOOK_ID, book.GetKey());
+	borrowed.Query();
+	borrowed.FindSetCursor(SQL.GetInsertedId());
+}
+
+void SQLApp::EditBorrow()
+{
+	if(!book.IsCursor())
+		return;
+	int q = borrowed.GetKey();
+	BorrowDlg dlg;
+	SQL * Select(dlg.ctrls).From(BORROW_RECORD).Where(ID == q);
+	if(!dlg.ctrls.Fetch(SQL))
+		return;
+	if(dlg.Run() != IDOK)
+		return;
+	SQL * dlg.ctrls.Update(BORROW_RECORD).Where(ID == q);
+	borrowed.Query();
+	borrowed.FindSetCursor(q);
+}
+
+void SQLApp::DeleteBorrow()
+{
+	if(book.IsCursor() && PromptYesNo("Delete the borrow record?")) {
+		SQL * Delete(BORROW_RECORD).Where(ID == book.GetKey());
+		book.Query();
+	}
+}
+
+void SQLApp::ReturnedToday()
+{
+	if(borrowed.IsCursor() && IsNull(borrowed.Get(RETURNED)) && PromptYesNo("Mark as returned today?")) {
+		int q = borrowed.GetKey();
+		SQL * SqlUpdate(BORROW_RECORD)
+				(RETURNED, GetSysDate() - Date(1970, 1, 1))
+		      .Where(ID == q && IsNull(RETURNED));
+		borrowed.Query();
+		borrowed.FindSetCursor(q);
+	}
+}
+
+void SQLApp::BorrowMenu(Bar& bar)
+{
+	bar.Add(book.IsCursor(), "New borrow record..", THISBACK(NewBorrow))
+	   .Key(K_ENTER);
+	bar.Add(borrowed.IsCursor(), "Edit borrow record..", THISBACK(EditBorrow));
+	bar.Add(borrowed.IsCursor(), "Delete borrow record", THISBACK(DeleteBorrow))
+	   .Key(K_DELETE);
+	bar.Add(borrowed.IsCursor() && IsNull(borrowed.Get(RETURNED)), "Returned today",
+	        THISBACK(ReturnedToday))
+	   .Key(K_SPACE);
+}
diff --git a/examples/SQLApp/main.cpp b/examples/SQLApp/main.cpp
new file mode 100644
index 000000000..97454be6a
--- /dev/null
+++ b/examples/SQLApp/main.cpp
@@ -0,0 +1,85 @@
+#include "SQLApp.h"
+
+#define SCHEMADIALECT <plugin/sqlite3/Sqlite3Schema.h>
+#include "Sql/sch_source.h"
+
+void SQLApp::MainMenu(Bar& bar)
+{
+	bar.Add("Book", THISBACK(BookMenu));
+	bar.Add("Borrow record", THISBACK(BorrowMenu));
+#ifdef _DEBUG
+	bar.Add("SQL console", callback(SQLCommander));
+#endif
+}
+
+SQLApp::SQLApp()
+{
+	CtrlLayout(*this, "Window title");
+	menu.Set(THISBACK(MainMenu));
+
+	book.SetTable(BOOK);
+	book.AddKey(ID);
+	book.AddColumn(AUTHOR, "Author");
+	book.AddColumn(TITLE, "Title");
+	book.SetOrderBy(TITLE, AUTHOR);
+	book.WhenBar = THISBACK(BookMenu);
+	book.WhenLeftDouble = THISBACK(EditBook);
+
+	borrowed.SetTable(BORROW_RECORD);
+	borrowed.AddKey(ID);
+	borrowed.Join(BOOK_ID, book);
+	borrowed.AddColumn(BORROWED, "Borrowed").SetConvert(DateIntConvert());
+	borrowed.AddColumn(RETURNED, "Returned").SetConvert(DateIntConvert());
+	borrowed.AddColumn(PERSON, "Who borrowed");
+	borrowed.ColumnWidths("75 75 372");
+	borrowed.SetOrderBy(BORROWED);
+	borrowed.WhenBar = THISBACK(BorrowMenu);
+	borrowed.WhenLeftDouble = THISBACK(EditBorrow);
+	borrowed.GoEndPostQuery();
+
+	CtrlLayoutOKCancel(query, "Select");
+	query.status = 0;
+	query.borrowed_from.SetConvert(DateIntConvert());
+	query.borrowed_to.SetConvert(DateIntConvert());
+	query.clear <<= THISBACK(ClearQuery);
+}
+
+#ifdef _DEBUG
+#define SCHEMADIALECT <plugin/sqlite3/Sqlite3Schema.h>
+#include "Sql/sch_schema.h"
+#endif
+
+GUI_APP_MAIN
+{
+	SQL;
+
+	Sqlite3Session sqlite3;
+	if(!sqlite3.Open(ConfigFile("simple.db"))) {
+		Exclamation("Can't create or open database file\n");
+		return;
+	}
+
+	SQL = sqlite3;
+
+#ifdef _DEBUG
+	SqlSchema sch(SQLITE3);
+	sqlite3.SetTrace();
+	All_Tables(sch);
+	if(sch.ScriptChanged(SqlSchema::UPGRADE))
+		Sqlite3PerformScript(sch.Upgrade());
+	if(sch.ScriptChanged(SqlSchema::ATTRIBUTES))
+		Sqlite3PerformScript(sch.Attributes());
+	if(sch.ScriptChanged(SqlSchema::CONFIG)) {
+		Sqlite3PerformScript(sch.ConfigDrop());
+		Sqlite3PerformScript(sch.Config());
+	}
+	sch.SaveNormal();
+	sqlite3.SetTrace();
+#endif
+
+	SQLApp app;
+	LoadFromFile(app);
+	app.Query();
+	app.Run();
+	StoreToFile(app);
+}
diff --git a/examples/SQLApp/query.cpp b/examples/SQLApp/query.cpp
new file mode 100644
index 000000000..75a775cec
--- /dev/null
+++ b/examples/SQLApp/query.cpp
@@ -0,0 +1,50 @@
+#include "SQLApp.h"
+
+void SQLApp::Query()
+{
+	SqlBool where;
+	SqlSet borrowed = Select(BOOK_ID).From(BORROW_RECORD).Where(IsNull(RETURNED));
+	if(query.status == 1)
+		where = ID != borrowed;
+	if(query.status == 2)
+		where = ID == borrowed;
+	SqlBool bdate;
+	if(!IsNull(query.borrowed_from))
+		bdate = BORROWED >= ~query.borrowed_from;
+	if(!IsNull(query.borrowed_to))
+		bdate = bdate && BORROWED <= ~query.borrowed_to;
+	if(!bdate.IsEmpty())
+		where = where && ID == Select(BOOK_ID).From(BORROW_RECORD).Where(bdate);
+	book.Query(where);
+}
+
+void SQLApp::ClearQuery()
+{
+	query.status = 0;
+	query.borrowed_from <<= query.borrowed_to <<= Null;
+}
+
+void SQLApp::SetupQuery()
+{
+	if(query.Execute() == IDOK)
+		Query();
+}
+
+void SQLApp::Query(int q)
+{
+	book.Query();
+	if(book.FindSetCursor(q))
+		return;
+	ClearQuery();
+	book.Query();
+	book.FindSetCursor(q);
+}
+
+void SQLApp::Serialize(Stream& s)
+{
+	int version = 0;
+	s / version;
+	s % query.status
+	  % query.borrowed_from
+	  % query.borrowed_to;
+}
diff --git a/examples/Scribble/Scribble.cpp b/examples/Scribble/Scribble.cpp
new file mode 100644
index 000000000..b9aafa16b
--- /dev/null
+++ b/examples/Scribble/Scribble.cpp
@@ -0,0 +1,152 @@
+#include <CtrlLib/CtrlLib.h>
+
+using namespace Upp;
+
+#define LAYOUTFILE <Scribble/Scribble.lay>
+#include <CtrlCore/lay.h>
+
+class Scribble : public TopWindow {
+public:
+	virtual void   Paint(Draw& w);
+	virtual void   MouseMove(Point p, dword keyflags);
+	virtual void   LeftDown(Point p, dword keyflags);
+	virtual void   Layout();
+
+protected:
+	Vector< Vector<Point> > image;
+	Size       imagesize;
+
+	MenuBar    menu;
+	ScrollBars scroll;
+
+	void    Scroll();
+
+	void    SetupSize();
+	void    Exit();
+	void    About();
+
+	void    FileBar(Bar& bar);
+	void    EditBar(Bar& bar);
+	void    AboutBar(Bar& bar);
+	void    MainBar(Bar& bar);
+
+public:
+	typedef Scribble CLASSNAME;
+
+	Scribble();
+};
+
+void Scribble::Paint(Draw& w)
+{
+	Size sz = GetSize();
+	Point pos = scroll;
+	w.Clip(0, 0, imagesize.cx, imagesize.cy);
+	w.DrawRect(0, 0, imagesize.cx, imagesize.cy, White);
+	for(int i = 0; i < image.GetCount(); i++) {
+		const Vector<Point>& stroke = image[i];
+		Point p1 = stroke[0] - pos;
+		for(int j = 1; j < stroke.GetCount(); j++) {
+			Point p2 = stroke[j] - pos;
+			w.DrawLine(p1, p2, 0);
+			p1 = p2;
+		}
+		w.DrawRect(p1.x, p1.y, 1, 1, Black);
+	}
+	w.End();
+	w.DrawRect(imagesize.cx - pos.x, 0, sz.cx - imagesize.cx - pos.x, sz.cy, SLtGray);
+	w.DrawRect(0, imagesize.cy - pos.y, imagesize.cx - pos.x, sz.cy - imagesize.cy - pos.y, SLtGray);
+	w.DrawRect(-pos.x, -pos.y + imagesize.cy, imagesize.cx, 1, SBlack);
+	w.DrawRect(-pos.x + imagesize.cx, -pos.y, 1, imagesize.cy, SBlack);
+}
+
+void Scribble::MouseMove(Point p, dword keyflags)
+{
+	if(HasCapture()) {
+		image.Top().Add() = p;
+		Refresh();
+	}
+}
+
+void Scribble::LeftDown(Point p, dword keyflags)
+{
+	image.Add().Add() = p;
+	SetCapture();
+	Refresh();
+}
+
+void Scribble::SetupSize()
+{
+	WithSizeLayout<TopWindow> dlg;
+	CtrlLayoutOKCancel(dlg, "Drawing size");
+	dlg.cx.Min(1);
+	dlg.cy.Min(1);
+	dlg.cx <<= imagesize.cx;
+	dlg.cy <<= imagesize.cy;
+	if(dlg.Run() != IDOK) return;
+	imagesize = Size(~dlg.cx, ~dlg.cy);
+	scroll.SetTotal(imagesize);
+	Refresh();
+}
+
+void Scribble::Layout()
+{
+	scroll.SetPage(GetSize());
+	scroll.SetTotal(imagesize);
+}
+
+void Scribble::Scroll()
+{
+	SetFocus();
+	Refresh();
+}
+
+void Scribble::Exit()
+{
+	if(PromptOKCancel("Exit Scribble ?"))
+		Close();
+}
+
+void Scribble::About()
+{
+	PromptOK("[6R/ Scribble3]&ULTIMATE`+`+ tutorial sample");
+}
+
+void Scribble::FileBar(Bar& bar)
+{
+	bar.Add("Exit", THISBACK(Exit));
+}
+
+void Scribble::EditBar(Bar& bar)
+{
+	bar.Add("Drawing size..", THISBACK(SetupSize));
+}
+
+void Scribble::AboutBar(Bar& bar)
+{
+	bar.Add("About..", THISBACK(About));
+}
+
+void Scribble::MainBar(Bar& bar)
+{
+	bar.Add("File", THISBACK(FileBar));
+	bar.Add("Edit", THISBACK(EditBar));
+	bar.Add("Help", THISBACK(AboutBar));
+}
+
+Scribble::Scribble()
+{
+	imagesize = Size(200, 200);
+	Title("Scribble").Zoomable().Sizeable();
+	AddFrame(menu);
+	AddFrame(InsetFrame());
+	AddFrame(scroll);
+	menu.Set(THISBACK(MainBar));
+	scroll.WhenScroll = THISBACK(Scroll);
+	WhenClose = THISBACK(Exit);
+	BackPaint();
+}
+
+GUI_APP_MAIN
+{
+	Scribble().Run();
+}
diff --git a/examples/Scribble/Scribble.lay b/examples/Scribble/Scribble.lay
new file mode 100644
index 000000000..2255812fb
--- /dev/null
+++ b/examples/Scribble/Scribble.lay
@@ -0,0 +1,13 @@
+#ifdef LAYOUTFILE
+
+LAYOUT(SizeLayout, 132, 88)
+	ITEM(Label, dv___0, SetLabel("Width").LeftPosZ(8, 52).TopPosZ(8, 19))
+	ITEM(EditIntSpin, cx, LeftPosZ(68, 55).TopPosZ(8, 19))
+	ITEM(Label, dv___2, SetLabel("Height").LeftPosZ(8, 52).TopPosZ(28, 19))
+	ITEM(EditIntSpin, cy, LeftPosZ(68, 55).TopPosZ(28, 19))
+	ITEM(Button, ok, SetLabel("OK").LeftPosZ(8, 56).TopPosZ(56, 24))
+	ITEM(Button, cancel, SetLabel("Cancel").LeftPosZ(68, 56).TopPosZ(56, 24))
+END_LAYOUT
+
+#endif
+
diff --git a/examples/Scribble/Scribble.upp b/examples/Scribble/Scribble.upp
new file mode 100644
index 000000000..81c69da98
--- /dev/null
+++ b/examples/Scribble/Scribble.upp
@@ -0,0 +1,12 @@
+description "Simple drawing application";
+
+uses
+	CtrlLib;
+
+file
+	Scribble.cpp,
+	Scribble.lay;
+
+mainconfig
+	"" = "GUI";
+
diff --git a/examples/UWord/UWord.cpp b/examples/UWord/UWord.cpp
new file mode 100644
index 000000000..f3395ccb3
--- /dev/null
+++ b/examples/UWord/UWord.cpp
@@ -0,0 +1,272 @@
+#include <RichEdit/RichEdit.h>
+#include <PdfDraw/PdfDraw.h>
+
+using namespace Upp;
+
+#define IMAGECLASS UWordImg
+#define IMAGEFILE  <UWord/UWord.iml>
+#include <Draw/iml.h>
+
+FileSel& UWordFs()
+{
+	static FileSel fs;
+	return fs;
+}
+
+FileSel& PdfFs()
+{
+	static FileSel fs;
+	return fs;
+}
+
+class UWord : public TopWindow {
+public:
+	virtual void DragAndDrop(Point, PasteClip& d);
+	virtual void FrameDragAndDrop(Point, PasteClip& d);
+
+protected:
+	RichEdit   editor;
+	MenuBar    menubar;
+	ToolBar    toolbar;
+	StatusBar  statusbar;
+	String     filename;
+
+	static LRUList& lrufile() { static LRUList l; return l; }
+
+	void Load(const String& filename);
+	void OpenFile(const String& fn);
+	void New();
+	void Open();
+	void Save0();
+	void Save();
+	void SaveAs();
+	void Print();
+	void Pdf();
+	void About();
+	void Destroy();
+	void SetBar();
+	void FileBar(Bar& bar);
+	void AboutMenu(Bar& bar);
+	void MainMenu(Bar& bar);
+	void MainBar(Bar& bar);
+
+public:
+	typedef UWord CLASSNAME;
+
+	static void SerializeApp(Stream& s);
+
+	UWord();
+};
+
+void UWord::FileBar(Bar& bar)
+{
+	bar.Add("New", CtrlImg::new_doc(), THISBACK(New))
+	   .Key(K_CTRL_N)
+	   .Help("Open new window");
+	bar.Add("Open..", CtrlImg::open(), THISBACK(Open))
+	   .Key(K_CTRL_O)
+	   .Help("Open existing document");
+	bar.Add(editor.IsModified(), "Save", CtrlImg::save(), THISBACK(Save))
+	   .Key(K_CTRL_S)
+	   .Help("Save current document");
+	bar.Add("SaveAs", CtrlImg::save_as(), THISBACK(SaveAs))
+	   .Help("Save current document with a new name");
+	bar.ToolGap();
+	bar.MenuSeparator();
+	bar.Add("Print..", CtrlImg::print(), THISBACK(Print))
+	   .Key(K_CTRL_P)
+	   .Help("Print document");
+	bar.Add("Export to PDF..", UWordImg::pdf(), THISBACK(Pdf))
+	   .Help("Export document to PDF file");
+	if(bar.IsMenuBar()) {
+		if(lrufile().GetCount())
+			lrufile()(bar, THISBACK(OpenFile));
+		bar.Separator();
+		bar.Add("Exit", THISBACK(Destroy));
+	}
+}
+
+void UWord::AboutMenu(Bar& bar)
+{
+	bar.Add("About..", THISBACK(About));
+}
+
+void UWord::MainMenu(Bar& bar)
+{
+	bar.Add("File", THISBACK(FileBar));
+	bar.Add("Window", callback(WindowsMenu));
+	bar.Add("Help", THISBACK(AboutMenu));
+}
+
+void UWord::New()
+{
+	new UWord;
+}
+
+void UWord::Load(const String& name)
+{
+	lrufile().NewEntry(name);
+	editor.SetQTF(LoadFile(name));
+	filename = name;
+	editor.ClearModify();
+	Title(filename);
+}
+
+void UWord::OpenFile(const String& fn)
+{
+	if(filename.IsEmpty() && !editor.IsModified())
+		Load(fn);
+	else
+		(new UWord)->Load(fn);
+}
+
+void UWord::Open()
+{
+	FileSel& fs = UWordFs();
+	if(fs.ExecuteOpen())
+		OpenFile(fs);
+	else
+		statusbar.Temporary("Loading aborted.");
+}
+
+void UWord::DragAndDrop(Point, PasteClip& d)
+{
+	if(AcceptFiles(d)) {
+		Vector<String> fn = GetFiles(d);
+		for(int i = 0; i < fn.GetCount(); i++)
+			if(FileExists(fn[i]))
+				OpenFile(fn[i]);
+	}
+}
+
+void UWord::FrameDragAndDrop(Point p, PasteClip& d)
+{
+	DragAndDrop(p, d);
+}
+
+void UWord::Save0()
+{
+	lrufile().NewEntry(filename);
+	if(filename.IsEmpty())
+		SaveAs();
+	else
+		if(SaveFile(filename, editor.GetQTF())) {
+			statusbar.Temporary("File " + filename + " was saved.");
+			ClearModify();
+		}
+		else
+			Exclamation("Error saving the file [* " + DeQtf(filename) + "]!");
+}
+
+void UWord::Save()
+{
+	if(!editor.IsModified()) return;
+	Save0();
+}
+
+void UWord::SaveAs()
+{
+	FileSel& fs = UWordFs();
+	if(fs.ExecuteSaveAs()) {
+		filename = fs;
+		Title(filename);
+		Save0();
+	}
+}
+
+void UWord::Print()
+{
+	editor.Print();
+}
+
+void UWord::Pdf()
+{
+	FileSel& fs = PdfFs();
+	if(!fs.ExecuteSaveAs("Output PDF file"))
+		return;
+	Size page = Size(3968, 6074);
+	PdfDraw pdf;
+	UPP::Print(pdf, editor.Get(), page);
+	SaveFile(~fs, pdf.Finish());
+}
+
+void UWord::About()
+{
+	PromptOK("[A5 uWord]&Using [*^www://upp.sf.net^ Ultimate`+`+] technology.");
+}
+
+void UWord::Destroy()
+{
+	if(editor.IsModified()) {
+		switch(PromptYesNoCancel("Do you want to save the changes to the document?")) {
+		case 1:
+			Save();
+			break;
+		case -1:
+			return;
+		}
+	}
+	delete this;
+}
+
+void UWord::MainBar(Bar& bar)
+{
+	FileBar(bar);
+	bar.Separator();
+	editor.DefaultBar(bar);
+}
+
+void UWord::SetBar()
+{
+	toolbar.Set(THISBACK(MainBar));
+}
+
+UWord::UWord()
+{
+	AddFrame(menubar);
+	AddFrame(TopSeparatorFrame());
+	AddFrame(toolbar);
+	AddFrame(statusbar);
+	Add(editor.SizePos());
+	menubar.Set(THISBACK(MainMenu));
+	Sizeable().Zoomable();
+	WhenClose = THISBACK(Destroy);
+	menubar.WhenHelp = toolbar.WhenHelp = statusbar;
+	static int doc;
+	Title(Format("Document%d", ++doc));
+	Icon(CtrlImg::File());
+	editor.ClearModify();
+	editor <<= THISBACK(SetBar);
+	SetBar();
+	editor.WhenRefreshBar = THISBACK(SetBar);
+	OpenMain();
+	ActiveFocus(editor);
+}
+
+void UWord::SerializeApp(Stream& s)
+{
+	int version = 1;
+	s / version;
+	s % UWordFs()
+	  % PdfFs();
+	if(version >= 1)
+		s % lrufile();
+}
+
+GUI_APP_MAIN
+{
+	SetLanguage(LNG_ENGLISH);
+	SetDefaultCharset(CHARSET_UTF8);
+
+	UWordFs().Type("QTF files", "*.qtf")
+	         .AllFilesType()
+	         .DefaultExt("qtf");
+	PdfFs().Type("PDF files", "*.pdf")
+	       .AllFilesType()
+	       .DefaultExt("pdf");
+
+	LoadFromFile(callback(UWord::SerializeApp));
+	new UWord;
+	Ctrl::EventLoop();
+	StoreToFile(callback(UWord::SerializeApp));
+}
diff --git a/examples/UWord/UWord.iml b/examples/UWord/UWord.iml
new file mode 100644
index 000000000..1734dc231
--- /dev/null
+++ b/examples/UWord/UWord.iml
@@ -0,0 +1,10 @@
+PREMULTIPLIED
+IMAGE_ID(pdf)
+
+IMAGE_BEGIN_DATA
+IMAGE_DATA(120,156,157,146,129,13,192,32,8,4,29,193,1,216,67,23,113,16,55,112,186,14,226,34,212,198,154,98,85,16,63,33)
+IMAGE_DATA(132,196,227,5,53,214,88,195,8,149,49,240,184,25,75,190,41,198,122,118,81,179,188,247,237,80,205,0,125,173,245,255)
+IMAGE_DATA(231,222,31,6,158,206,42,251,103,210,99,206,79,238,67,120,36,61,242,193,254,145,244,240,111,214,254,131,22,151,115,206)
+IMAGE_DATA(227,134,86,254,185,232,128,255,230,223,208,99,193,238,95,96,161,188,39,251,254,2,27,66,144,255,31,195,166,148,150,188)
+IMAGE_DATA(38,110,182,2,234,21,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0)
+IMAGE_END_DATA(160, 1)
diff --git a/examples/UWord/UWord.upp b/examples/UWord/UWord.upp
new file mode 100644
index 000000000..dfc46a323
--- /dev/null
+++ b/examples/UWord/UWord.upp
@@ -0,0 +1,15 @@
+description "Wordprocessor application";
+
+uses
+	CtrlLib,
+	RichEdit,
+	PdfDraw,
+	plugin\jpg;
+
+file
+	UWord.cpp,
+	UWord.iml;
+
+mainconfig
+	"" = "GUI",
+	"" = "GUI .NOGTK";
diff --git a/examples/UWord/icon.ico b/examples/UWord/icon.ico
new file mode 100644
index 000000000..4012786aa
Binary files /dev/null and b/examples/UWord/icon.ico differ
diff --git a/examples/UWord/init b/examples/UWord/init
new file mode 100644
index 000000000..3538d93bf
--- /dev/null
+++ b/examples/UWord/init
@@ -0,0 +1,7 @@
+#ifndef _UWord_icpp_init_stub
+#define _UWord_icpp_init_stub
+#include "CtrlLib/init"
+#include "RichEdit/init"
+#include "PdfDraw/init"
+#include "plugin\jpg/init"
+#endif
diff --git a/examples/XmlView/XmlView.h b/examples/XmlView/XmlView.h
new file mode 100644
index 000000000..947b02d28
--- /dev/null
+++ b/examples/XmlView/XmlView.h
@@ -0,0 +1,40 @@
+#ifndef _XmlView_XmlView_h
+#define _XmlView_XmlView_h
+
+#include <CtrlLib/CtrlLib.h>
+
+using namespace Upp;
+
+#define IMAGEFILE  <XmlView/XmlView.iml>
+#define IMAGECLASS XmlImg
+#include <Draw/iml_header.h>
+
+class XmlView : public TopWindow {
+public:
+	virtual bool Key(dword key, int);
+private:
+	TreeCtrl              xml;
+	LineEdit              view;
+	FrameTop<StaticRect>  errorbg;
+	Label                 error;
+	FileList              files;
+	ParentCtrl            data;
+	Splitter              splitter;
+	String                dir;
+
+	void Load(int parent, XmlParser& p);
+	void Load(const char *filename);
+	void Enter();
+	void DoDir();
+
+public:
+	typedef XmlView CLASSNAME;
+
+	void Serialize(Stream& s);
+	void LoadDir(const char *d);
+	void LoadDir()                      { LoadDir(dir); }
+
+	XmlView();
+};
+
+#endif
diff --git a/examples/XmlView/XmlView.iml b/examples/XmlView/XmlView.iml
new file mode 100644
index 000000000..8417a38d1
--- /dev/null
+++ b/examples/XmlView/XmlView.iml
@@ -0,0 +1,99 @@
+IMAGE_META(icon_file, "icon.ico")
+IMAGE_META(icon_small, "Icon")
+IMAGE_META(icon_bpp, "8")
+IMAGE_BEGIN(Tag)
+	IMAGE_SCAN("")
+	IMAGE_SCAN("")
+	IMAGE_SCAN("")
+	IMAGE_SCAN("ņ\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377\377\377\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377\377\377\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377\377\377��\0\0�\377\377\377\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377\377\377\1�\0\0�\377\377\377\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\377\377\377��\0\0�\377\377\377\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377\377\377\1�\0\0�\377\377\377\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377\377\377��\0\0�\377\377\377\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377\377\377\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377\377\377\1\0\0\0")
+	IMAGE_SCAN("ņ\0\0\0")
+IMAGE_PACKED(Tag, "\2\21\0\0\0\20\0\0\0\0\0\0\0\1\0\0\0\0\0\0\0")
+IMAGE_BEGIN(Text)
+	IMAGE_SCAN("")
+	IMAGE_SCAN("")
+	IMAGE_SCAN("")
+	IMAGE_SCAN("�\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\377\377\377\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\377\377\377\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\377\377\377��\0\0\5\377\377\377�\0\0\377\377\377�\0\0\377\377\377��\0\0\2\377\377\377\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\377\377\377\1�\0\0�\377\377\377\3�\0\0\377\377\377�\0\0�\377\377\377\1�\0\0�\377\377\377\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\377\377\377\1�\0\0�\377\377\377\1�\0\0�\377\377\377\1�\0\0�\377\377\377\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\377\377\377\1�\0\0�\377\377\377\3�\0\0\377\377\377�\0\0�\377\377\377\1�\0\0�\377\377\377\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\377\377\377\1�\0\0�\377\377\377\3�\0\0\377\377\377�\0\0�\377\377\377\1�\0\0�\377\377\377\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\377\377\377\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\377\377\377\1\0\0\0")
+	IMAGE_SCAN("�\0\0\0")
+IMAGE_PACKED(Text, "\2\21\0\0\0\20\0\0\0\377\377\377\377\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(PI)
+	IMAGE_SCAN("")
+	IMAGE_SCAN("")
+	IMAGE_SCAN("")
+	IMAGE_SCAN("�\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\377\377\0\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377\377\0\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377\377\0��\0\0�\377\377\0\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377\377\0\1�\0\0�\377\377\0\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377\377\0\1�\0\0�\377\377\0\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377\377\0\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377\377\0\1�\0\0�\377\377\0\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377\377\0\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377\377\0\1\0\0\0")
+	IMAGE_SCAN("ŋ\0\0\0")
+IMAGE_PACKED(PI, "\2\21\0\0\0\20\0\0\0\0\0\0\0\1\0\0\0\0\0\0\0")
+IMAGE_BEGIN(Decl)
+	IMAGE_SCAN("")
+	IMAGE_SCAN("")
+	IMAGE_SCAN("")
+	IMAGE_SCAN("ŋ\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\377\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\377\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\377\1�\0\0�\0\377\377\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\377\1�\0\0�\0\377\377\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\377\1�\0\0�\0\377\377\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\377\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\377\1�\0\0�\0\377\377\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\377\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\0\377\377\1\0\0\0")
+	IMAGE_SCAN("�\0\0\0")
+IMAGE_PACKED(Decl, "\2\21\0\0\0\20\0\0\0\0\0\0\0\1\0\0\0\0\0\0\0")
+IMAGE_BEGIN(Comment)
+	IMAGE_SCAN("")
+	IMAGE_SCAN("")
+	IMAGE_SCAN("")
+	IMAGE_SCAN("ņ\0\0\0")
+	IMAGE_SCAN("Â\0\0\0�����\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0����\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0����\1�\0\0����\1�\0\0����\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0����\1�\0\0����\1�\0\0����\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0����\1�\0\0����\1�\0\0����\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0����\1�\0\0����\1�\0\0����\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0����\1�\0\0����\1�\0\0����\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0����\1\0\0\0")
+	IMAGE_SCAN("Â\0\0\0�����\0\0\0")
+	IMAGE_SCAN("ņ\0\0\0")
+IMAGE_PACKED(Comment, "\2\21\0\0\0\20\0\0\0\0\0\0\0\1\0\0\0\0\0\0\0")
+IMAGE_BEGIN(Icon)
+	IMAGE_SCAN("")
+	IMAGE_SCAN("")
+	IMAGE_SCAN("")
+	IMAGE_SCAN("Ĉ\0\0\0")
+	IMAGE_SCAN("‚\0\0\0�\377\377\377�\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377\377\377\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\377\377\377\11�\0\0\377\377\377�\0\0\377\377\377�\0\0\377\377\377�\0\0\377\377\377�\0\0�\377\377\377\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\377\377\377\4�\0\0\377\377\377�\0\0\377\377\377��\0\0\2\377\377\377�\0\0�\377\377\377\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\377\377\377\1�\0\0�\377\377\377\5�\0\0\377\377\377�\0\0\377\377\377�\0\0�\377\377\377\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\377\377\377\11�\0\0\377\377\377�\0\0\377\377\377�\0\0\377\377\377�\0\0\377\377\377�\0\0�\377\377\377\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\377\377\377\10�\0\0\377\377\377�\0\0\377\377\377�\0\0\377\377\377�\0\0\377\377\377��\0\0\2\377\377\377\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377\377\377\1\0\0\0")
+	IMAGE_SCAN("‚\0\0\0�\377\377\377�\0\0\0")
+	IMAGE_SCAN("Ĉ\0\0\0")
+IMAGE_PACKED(Icon, "\2\20\0\0\0\20\0\0\0\377\377\377\377\0\0\0\0\0\0\0\0")
diff --git a/examples/XmlView/XmlView.rc b/examples/XmlView/XmlView.rc
new file mode 100644
index 000000000..7d9626aed
--- /dev/null
+++ b/examples/XmlView/XmlView.rc
@@ -0,0 +1 @@
+5555 ICON "icon.ico"
\ No newline at end of file
diff --git a/examples/XmlView/XmlView.upp b/examples/XmlView/XmlView.upp
new file mode 100644
index 000000000..6a58731cc
--- /dev/null
+++ b/examples/XmlView/XmlView.upp
@@ -0,0 +1,14 @@
+description "XML viewer";
+
+uses
+	CtrlLib;
+
+file
+	XmlView.h,
+	main.cpp,
+	XmlView.iml,
+	XmlView.rc;
+
+mainconfig
+	"" = "GUI";
+
diff --git a/examples/XmlView/icon.ico b/examples/XmlView/icon.ico
new file mode 100644
index 000000000..bf49cd8a7
Binary files /dev/null and b/examples/XmlView/icon.ico differ
diff --git a/examples/XmlView/main.cpp b/examples/XmlView/main.cpp
new file mode 100644
index 000000000..a66a2699c
--- /dev/null
+++ b/examples/XmlView/main.cpp
@@ -0,0 +1,166 @@
+#include "XmlView.h"
+
+#define IMAGEFILE  <XmlView/XmlView.iml>
+#define IMAGECLASS XmlImg
+#include <Draw/iml_source.h>
+
+void XmlView::Load(int parent, XmlParser& p)
+{
+	if(p.IsTag()) {
+		String txt = p.ReadTag();
+		for(int i = 0; i < p.GetAttrCount(); i++)
+			txt << ' ' << p.GetAttr(i) << "=\"" << p[i] << "\"";
+		parent = xml.Add(parent, XmlImg::Tag(), txt);
+		while(!p.End()) {
+			if(p.IsEof())
+				throw XmlError("");
+			Load(parent, p);
+		}
+	}
+	else
+	if(p.IsText())
+		xml.Add(parent, XmlImg::Text(), NormalizeSpaces(p.ReadText()));
+	else
+	if(p.IsPI())
+		xml.Add(parent, XmlImg::PI(), NormalizeSpaces(p.ReadPI()));
+	else
+	if(p.IsDecl())
+		xml.Add(parent, XmlImg::Decl(), NormalizeSpaces(p.ReadDecl()));
+	else
+	if(p.IsComment())
+		xml.Add(parent, XmlImg::Comment(), NormalizeSpaces(p.ReadComment()));
+	else
+		NEVER();
+}
+
+void XmlView::Load(const char *filename)
+{
+	int64 l = GetFileLength(filename);
+	if(l < 0 || l > 16000000)
+		return;
+	String txt = LoadFile(filename);
+	XmlParser p(txt);
+	xml.Clear();
+	try {
+		while(!p.IsEof())
+			Load(0, p);
+	}
+	catch(XmlError e) {
+		error = "XML parsing error: " + e;
+		view.Show();
+		view <<= txt;
+		view.SetCursor(view.GetPos(p.GetLine() - 1, p.GetColumn() - 1));
+		view.SetFocus();
+		return;
+	}
+	xml.Show();
+	xml.SetFocus();
+}
+
+void XmlView::LoadDir(const char *d)
+{
+	files.Clear();
+	dir = d;
+	Title(dir);
+#ifdef PLATFORM_WIN32
+	if(dir.GetLength())
+#else
+	if(dir.GetLength() > 1)
+#endif
+		files.Add("..", CtrlImg::DirUp(), StdFont(), SColorText(), true);
+	::Load(files, dir, "*.*");
+	SortByExt(files);
+}
+
+void XmlView::Enter()
+{
+	if(!files.IsCursor()) {
+		Title(dir);
+		return;
+	}
+	const FileList::File& f = files.Get(files.GetCursor());
+	xml.Hide();
+	view.Hide();
+	if(f.name == "..") {
+		Title(dir);
+		return;
+	}
+	String p = AppendFileName(dir, f.name);
+	Title(p);
+	if(!f.isdir)
+		Load(p);
+}
+
+void XmlView::DoDir()
+{
+	if(!files.IsCursor())
+		return;
+	const FileList::File& f = files.Get(files.GetCursor());
+	if(!f.isdir)
+		return;
+	if(f.name == "..") {
+		String n = DirectoryUp(dir);
+		LoadDir(dir);
+		files.FindSetCursor(n);
+	}
+	else
+		LoadDir(AppendFileName(dir, f.name));
+}
+
+bool XmlView::Key(dword key, int)
+{
+	if(key == K_ENTER) {
+		DoDir();
+		return true;
+	}
+	return false;
+}
+
+void XmlView::Serialize(Stream& s)
+{
+	int version = 0;
+	s / version;
+	SerializePlacement(s);
+	s % files;
+	s % dir;
+	s % splitter;
+}
+
+XmlView::XmlView()
+{
+	xml.NoRoot();
+
+	error.SetFont(Arial(20)).SetInk(Red);
+	errorbg.Height(25).Add(error.SizePos());
+	view.AddFrame(errorbg);
+	view.SetReadOnly();
+	view.SetColor(LineEdit::PAPER_READONLY, SColorPaper());
+
+	xml.Hide();
+	view.Hide();
+
+	data.Add(xml.SizePos());
+	data.Add(view.SizePos());
+
+	splitter.Horz(files, data.SizePos());
+	splitter.SetPos(2700);
+	Add(splitter.SizePos());
+
+	files.WhenEnterItem = THISBACK(Enter);
+	files.WhenLeftDouble = THISBACK(DoDir);
+
+	Sizeable().Zoomable();
+
+	dir = GetCurrentDirectory();
+
+	Icon(XmlImg::Icon());
+}
+
+GUI_APP_MAIN
+{
+	XmlView x;
+	LoadFromFile(x);
+	x.LoadDir();
+	x.Run();
+	StoreToFile(x);
+}
diff --git a/examples/cmdsrv/cmdsrv.cpp b/examples/cmdsrv/cmdsrv.cpp
new file mode 100644
index 000000000..9f36f0a8f
--- /dev/null
+++ b/examples/cmdsrv/cmdsrv.cpp
@@ -0,0 +1,77 @@
+#include <Web/Web.h>
+
+using namespace Upp;
+
+#define APP_VERSION "1.0.r1"
+#define APP_DATE    Date(2005, 2, 22)
+
+CONSOLE_APP_MAIN
+{
+	HttpServer server;
+	int next_id = 0;
+	server.Logging();
+
+	Vector<String> cmd;
+	cmd <<= CommandLine();
+	int port = 1536;
+	if(cmd.GetCount() >= 1)
+		port = Nvl(ScanInt(cmd[0]), port);
+
+	if(!server.Open(port)) {
+		puts(Socket::GetErrorText());
+		return;
+	}
+
+	for(;;) {
+		server.Wait(1000);
+		if(server.IsError()) {
+			puts("Server error: " + Socket::GetErrorText());
+			puts("Reopening socket...");
+			fflush(stdout);
+			if(!server.Reopen())
+			{
+				puts("Reopen on server socket failed: " + Socket::GetErrorText());
+				return;
+			}
+		}
+		fputs(NFormat("\rserver(%d) running at %`", port, GetSysTime()), stdout);
+		fflush(stdout);
+		One<HttpRequest> request = server.GetRequest();
+		if(!request)
+			continue;
+		HttpQuery query = request->GetQuery();
+		String header, body;
+		int items = query.GetInt("ITEMS", 0, 100000, 10);
+		String svr = query.GetString("SVR");
+		Htmls image_page;
+		int i;
+		image_page <<
+		"CMDSRV, version " << APP_VERSION << ", release date: " << Format(APP_DATE) << "<br>\n"
+		"Copyright &copy; 2005 Tomas Rylek<p>\n"
+		"CMDSRV parameters: &lt;port number, default = 1536&gt;<p>\n"
+		"Current parameters: <b>cmdsrv " << port << "</b><p>\n"
+		"<b>items</b> (<b>" << FormatInt(items) << "</b>) = number of output lines to generate (default = 10)<br>\n"
+		"<b>svr</b> (" << (IsNull(svr) ? "<i>empty</i>" : "<b>" + svr + "</b>")
+		<< ") = identifier for generated output lines (default = test)<br>\n"
+		"Example: <b>http://localhost";
+		String wisapi = GetFileName(query.GetString("$$WISAPI"));
+		String sample_query;
+		sample_query << "items=" << minmax(2 * items, 10, 100000) << "&amp;svr=A";
+		if(!IsNull(wisapi))
+			image_page << "/dir/<a href=\"" << wisapi << "?" << sample_query << "\">" << wisapi << "?";
+		else
+			image_page << ':' << port << "/<a href=\"any?" << sample_query << "\">" << "any?";
+		image_page << sample_query << "</a><p>\n";
+		for(i = 0; i < items; i++)
+			image_page << "Line #" << (i + 1) << ", svr=" << UrlEncode(svr) << "<br>\n";
+		image_page << "<p>\n"
+			"Current request:<br>\n";
+		for(i = 0; i < query.GetCount(); i++)
+			image_page << ToHtml(query.GetKey(i)) << "=<b>" << ToHtml(query.GetValue(i)) << "</b><br>\n";
+
+		header = HttpContentType(HttpTextHtml(CHARSET_WIN1252));
+		body = HtmlTitlePage("Simple text HTTP server", image_page);
+		request->Write(header, body);
+		request.Clear();
+	}
+}
diff --git a/examples/cmdsrv/cmdsrv.upp b/examples/cmdsrv/cmdsrv.upp
new file mode 100644
index 000000000..bbd72fbab
--- /dev/null
+++ b/examples/cmdsrv/cmdsrv.upp
@@ -0,0 +1,11 @@
+description "Simple HTTP text server";
+
+uses
+	Web;
+
+file
+	cmdsrv.cpp;
+
+mainconfig
+	"" = "";
+
diff --git a/examples/httpcli/httpcli.upp b/examples/httpcli/httpcli.upp
new file mode 100644
index 000000000..46a0d0ea5
--- /dev/null
+++ b/examples/httpcli/httpcli.upp
@@ -0,0 +1,10 @@
+description "Command-line driven HTTP client";
+
+uses
+	Web;
+
+file
+	main.cpp;
+
+mainconfig
+	"" = "";
diff --git a/examples/httpcli/main.cpp b/examples/httpcli/main.cpp
new file mode 100644
index 000000000..a1828634c
--- /dev/null
+++ b/examples/httpcli/main.cpp
@@ -0,0 +1,46 @@
+#include <Web/Web.h>
+
+using namespace Upp;
+
+static String DumpSpecial(String s)
+{
+	String out;
+	for(const char *p = s.Begin(), *e = s.End(); p < e; p++)
+		if((byte)*p >= ' ' && *p != '\xFF')
+			out.Cat(*p);
+		else {
+			switch(*p) {
+				case '\a': out.Cat("[\\a]"); break;
+				case '\b': out.Cat("[\\b]"); break;
+				case '\f': out.Cat("[\\f]"); break;
+				case '\v': out.Cat("[\\v]"); break;
+				case '\t': out.Cat("[\\t]"); break;
+				case '\r': out.Cat("[\\r]"); break;
+				case '\n': out.Cat("[\\n]\n"); break;
+				default:   out.Cat(NFormat("[\\x%02x", (byte)*p)); break;
+			}
+		}
+	return out;
+}
+
+CONSOLE_APP_MAIN
+{
+	const Vector<String>& cmdline = CommandLine();
+	for(int i = 0; i < cmdline.GetCount(); i++) {
+		String proxy;
+		if(*cmdline[i] == ':' && i + 1 < cmdline.GetCount())
+			proxy = cmdline[i++].Mid(1);
+		String url = cmdline[i];
+		puts(url);
+		fflush(stdout);
+		HttpClient client;
+		client.URL(url);
+		client.Proxy(proxy);
+		String content = client.ExecuteRedirect();
+		puts("[error] " + Nvl(client.GetError(), "OK (no error)"));
+		puts(NFormat("[status %d] %s\n", client.GetStatusCode(), client.GetStatusLine()));
+		puts(NFormat("[headers] (%d bytes)\n%s", client.GetHeaders().GetLength(), DumpSpecial(client.GetHeaders())));
+		puts(NFormat("[content] (%d bytes)\n%s", content.GetLength(), DumpSpecial(content)));
+		fflush(stdout);
+	}
+}
diff --git a/examples/idmap/idmap.cpp b/examples/idmap/idmap.cpp
new file mode 100644
index 000000000..c2303b939
--- /dev/null
+++ b/examples/idmap/idmap.cpp
@@ -0,0 +1,46 @@
+#include <Core/Core.h>
+
+using namespace Upp;
+
+CONSOLE_APP_MAIN
+{
+	const Vector<String>& arg = CommandLine();
+	if(arg.GetCount() != 1) {
+		Cout() << "Usage: idmap file\n";
+		SetExitCode(1);
+		return;
+	}
+	FileIn in(arg[0]);
+	if(!in) {
+		SetExitCode(2);
+		return;
+	}
+	VectorMap< String, Vector<int> > map;
+	int line = 1;
+	while(!in.IsEof()) {
+		int c = in.Get();
+		if(isalpha(c) || c == '_') {
+			String id;
+			id.Cat(c);
+			c = in.Get();
+			while(c > 0 && (isalnum(c) || c == '_')) {
+				id.Cat(c);
+				c = in.Get();
+			}
+			map.GetAdd(id).Add(line);
+		}
+		else
+		if(c == '\n')
+			line++;
+	}
+	Vector<int> order = GetSortOrder(map.GetKeys());
+	for(int i = 0; i < order.GetCount(); i++) {
+		Cout() << Format("%-32s: ", ~map.GetKey(order[i]));
+		const Vector<int>& l = map[order[i]];
+		for(int i = 0; i < l.GetCount(); i++) {
+			if(i) Cout() << ", ";
+			Cout() << l[i];
+		}
+		Cout() << '\n';
+	}
+}
diff --git a/examples/idmap/idmap.upp b/examples/idmap/idmap.upp
new file mode 100644
index 000000000..5e51f30a2
--- /dev/null
+++ b/examples/idmap/idmap.upp
@@ -0,0 +1,12 @@
+description "U++ containers demonstration - prints the map of words in the file";
+
+optimize_speed;
+
+uses
+	Core;
+
+file
+	idmap.cpp;
+
+mainconfig
+	"" = "";
diff --git a/examples/idmapBench/idmapBench.upp b/examples/idmapBench/idmapBench.upp
new file mode 100644
index 000000000..6b4344641
--- /dev/null
+++ b/examples/idmapBench/idmapBench.upp
@@ -0,0 +1,16 @@
+description "C++ standard library vs. U++ Core benchmark";
+
+optimize_speed;
+
+uses
+	Core;
+
+file
+	main.cpp;
+
+mainconfig
+	"" = "",
+	"" = "USEMALLOC",
+	"" = "MT",
+	"" = "USEMALLOC MT";
+
diff --git a/examples/idmapBench/main.cpp b/examples/idmapBench/main.cpp
new file mode 100644
index 000000000..2f5cab0ad
--- /dev/null
+++ b/examples/idmapBench/main.cpp
@@ -0,0 +1,207 @@
+#define  NDEBUG
+#define  _SECURE_SCL 0
+
+#include <Core/Core.h>
+
+#include <stdio.h>
+#include <iostream>
+#include <fstream>
+#include <time.h>
+#include <vector>
+#include <algorithm>
+#include <map>
+#include <deque>
+#include <string>
+
+#define TEST_HASHMAP
+
+#ifdef TEST_HASHMAP
+
+#ifdef COMPILER_GCC
+#include <tr1/unordered_map>
+#else
+#include <hash_map>
+#endif
+
+#endif
+
+using namespace std;
+using namespace Upp;
+
+#define NO_OUTPUT // for benchmark purposes, output is omitted
+
+void BenchNTL(const char *file) {
+	FileIn in(file);
+	if (!in) {
+		std::cout << "Cannot open input file.\n";
+		return;
+	}
+
+	VectorMap<String, Vector<int> > map;
+	int line = 1;
+
+	for(;;) {
+		int c = in.Get();
+		if(c < 0) break;
+		if(IsAlpha(c) || c == '_') {
+			String id;
+			id.Cat(c);
+			c = in.Get();
+			while(c >= 0 && (IsAlNum(c) || c == '_')) {
+				id.Cat(c);
+				c = in.Get();
+			}
+			map.GetAdd(id).Add(line);
+		}
+		else
+		if(IsDigit(c))
+			do c = in.Get();
+			while(c >= 0 && (IsAlNum(c) || c == '.'));
+		if(c == '\n')
+			++line;
+	}
+
+	Vector<int> order = GetSortOrder(map.GetKeys());
+#ifndef NO_OUTPUT
+	for(int i = 0; i < order.GetCount(); i++) {
+		std::cout << ~map.GetKey(order[i]) << ": ";
+		const Vector<int>& l = map[order[i]];
+		for(int i = 0; i < l.GetCount(); i++) {
+			if(i) std::cout << ", ";
+			std::cout << l[i];
+		}
+		std::cout << '\n';
+	}
+#endif
+}
+
+template <class Container>
+void BenchSTL(Container& imap, const char *file) {
+	std::ifstream in(file);
+	if (!in) {
+		std::cout << "Cannot open input file.\n";
+		return;
+	}
+
+	int line = 1;
+
+	for(;;) {
+		int c = in.get();
+		if(c == EOF) break;
+		if(isalpha(c) || c == '_') {
+			string id;
+			id += c;
+			c = in.get();
+			while(c != EOF && (isalnum(c) || c == '_')) {
+				id += c;
+				c = in.get();
+			}
+			imap[id].push_back(line);
+		}
+		else
+		if(isdigit(c))
+			do c = in.get();
+			while(c != EOF && (isalnum(c) || c == '.'));
+		if(c == '\n')
+			++line;
+	}
+}
+
+void BenchMap(const char *file)
+{
+	map< string, vector<int> > imap;
+	BenchSTL(imap, file);
+#ifndef NO_OUTPUT
+	map< std::string, vector<int> >::const_iterator e = imap.end();
+	for(map< std::string, vector<int> >::const_iterator i = imap.begin(); i != e; i++) {
+		std::cout << i->first << ": ";
+		vector<int>::const_iterator e = i->second.end();
+		vector<int>::const_iterator b = i->second.begin();
+		for(vector<int>::const_iterator j = b; j != e; j++) {
+			if(j != b) std::cout << ", ";
+			std::cout << *j;
+		}
+		std::cout << '\n';
+	}
+#endif
+}
+
+#ifdef TEST_HASHMAP
+
+#ifdef COMPILER_GCC
+typedef std::tr1::unordered_map< string, vector<int> > HashMap;
+#else
+typedef stdext::hash_map< string, vector<int> > HashMap;
+#endif
+
+inline bool h_less(const HashMap::value_type *a, const HashMap::value_type *b)
+{
+	return a->first < b->first;
+}
+
+void BenchHashMap(const char *file)
+{
+	HashMap imap;
+	BenchSTL(imap, file);
+	vector< const HashMap::value_type * > order;
+	for(HashMap::const_iterator i = imap.begin(); i != imap.end(); i++)
+		order.push_back(&*i);
+	sort(order.begin(), order.end(), h_less);
+
+#ifndef NO_OUTPUT
+	vector< const HashMap::value_type * >::const_iterator e = order.end();
+	for(vector< const HashMap::value_type * >::const_iterator i = order.begin(); i != e; i++) {
+		std::cout << (*i)->first << ": ";
+		vector<int>::const_iterator e = (*i)->second.end();
+		vector<int>::const_iterator b = (*i)->second.begin();
+		for(vector<int>::const_iterator j = b; j != e; j++) {
+			if(j != b) std::cout << ", ";
+			std::cout << *j;
+		}
+		std::cout << '\n';
+	}
+#endif
+}
+
+#endif
+
+#define N 10000
+
+CONSOLE_APP_MAIN
+{
+	String fn;
+	int argc = CommandLine().GetCount();
+	const Vector<String>& argv = CommandLine();
+	if(argc < 1)
+		fn = GetDataFile("main.cpp");
+	else
+		fn = argv[0];
+
+	BenchNTL(fn); // first run to cache the file
+
+#ifdef TEST_HASHMAP
+	{
+		BenchHashMap(fn);
+		TimeStop tm;
+		for(int n = 0; n < N; n++)
+			BenchHashMap(fn);
+		cout << "STL hash_map time: " << tm.Elapsed() << " ms \n";
+	}
+#endif
+
+	{
+		BenchMap(fn);
+		TimeStop tm;
+		for(int n = 0; n < N; n++)
+			BenchMap(fn);
+		cout << "STL map time: " << tm.Elapsed() << " ms \n";
+	}
+
+	{
+		BenchNTL(fn);
+		TimeStop tm;
+		for(int n = 0; n < N; n++)
+			BenchNTL(fn);
+		cout << "NTL time: " << tm.Elapsed() << " ms\n";
+	}
+}
diff --git a/examples/imgsrv/imgsrv.cpp b/examples/imgsrv/imgsrv.cpp
new file mode 100644
index 000000000..d89a552f9
--- /dev/null
+++ b/examples/imgsrv/imgsrv.cpp
@@ -0,0 +1,157 @@
+#include <Web/Web.h>
+#include <Draw/Draw.h>
+//#include <plugin/png/png.h>
+#include <plugin/gif/gif.h>
+#ifdef PLATFORM_WIN32
+#include <wincon.h>
+#else
+#include <signal.h>
+#endif
+
+using namespace Upp;
+
+#define APP_VERSION "1.1"
+#define APP_DATE    Date(2006, 5, 19)
+
+static bool canceled = false;
+
+#ifdef PLATFORM_WIN32
+static BOOL WINAPI ControlBreak(DWORD reason)
+{
+	canceled = true;
+	return TRUE;
+}
+#endif
+#ifdef PLATFORM_POSIX
+static void SignalHandler(int signal)
+{
+	canceled = true;
+}
+#endif
+
+CONSOLE_APP_MAIN
+{
+#ifdef PLATFORM_WIN32
+	SetConsoleCtrlHandler(&ControlBreak, TRUE);
+#endif
+#ifdef PLATFORM_POSIX
+	signal(SIGPIPE, SIG_IGN);
+	signal(SIGKILL, &SignalHandler);
+	InitX11Draw();
+#endif
+
+	HttpServer server;
+	int next_id = 0;
+	server.Logging();
+
+	int color = 0xFFFF00;
+	Vector<String> cmd;
+	cmd <<= CommandLine();
+	int port = 1536;
+	if(cmd.GetCount() >= 1)
+		port = Nvl(ScanInt(cmd[0]), port);
+
+	if(cmd.GetCount() >= 2)
+		color = Nvl(ScanInt(cmd[1], NULL, 16), color);
+
+	Color bg((color >> 16) & 255, (color >> 8) & 255, color & 255);
+
+	if(!server.Open(port, 20)) {
+		puts(Socket::GetErrorText());
+		return;
+	}
+
+	int ticks = msecs();
+	while(!canceled) {
+		server.Wait(100);
+		if(server.IsError()) {
+			puts("Server error: " + Socket::GetErrorText());
+			puts("Reopening socket...");
+			fflush(stdout);
+			if(!server.Reopen()) {
+				puts("Reopen on server socket failed: " + Socket::GetErrorText());
+				return;
+			}
+		}
+		if(msecs(ticks) >= 1000) {
+			fputs(NFormat("\rserver(%d) running at %`", port, GetSysTime()), stdout);
+			fflush(stdout);
+			ticks = msecs();
+		}
+		One<HttpRequest> request = server.GetRequest();
+		if(!request)
+			continue;
+		HttpQuery query = request->GetQuery();
+		String svr = query.GetString("SVR", "test");
+		String img = query.GetString("IMG");
+		Size image_size;
+		image_size.cx = query.GetInt("WD", 1, 500, 50);
+		image_size.cy = query.GetInt("HT", 1, 200, 20);
+		fputs(NFormat("img = %s, svr = %s, wd = %d, ht = %d\n",
+			img, svr, image_size.cx, image_size.cy), stdout);
+		String header, body;
+		if(!IsNull(img)) {
+			ImageDraw draw(image_size);
+			draw.DrawRect(image_size, bg);
+			DrawFatFrame(draw, image_size, Black, 1);
+			Font font = Arial(10).Bold();
+			Size tsz = GetTextSize(img, font);
+			draw.DrawText((image_size.cx - tsz.cx) >> 1,
+				(image_size.cy - tsz.cy) >> 1, img, font, Black);
+			header = HttpContentType(HttpImageGif());
+			body = GIFEncoder().SaveString(draw);
+		}
+		else {
+			int items = query.GetInt("ITEMS", 0, 10000, 10);
+			Htmls image_page;
+			int i;
+			image_page <<
+			"IMGSRV, version " << APP_VERSION << ", release date: " << Format(APP_DATE) << "<br>\n"
+			"Copyright &copy; 2003-2006 Tomas Rylek, Miroslav Fidler<p>\n"
+			"Program uses the following third-party components:\n"
+			"<ul>\n"
+			"<li>libpng version 1.0.9, Copyright (c) 1998-2001 Glenn Randers-Pehrson "
+			"(Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger); "
+			"(Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.).<p>\n"
+			"<li>zlib version, version 1.1.4, Copyright (C) 1995-2002 Jean-loup Gailly and Mark Adler.<p>\n"
+			"</ul>\n"
+			"IMGSRV parameters: &lt;port number, default = 1536&gt; &lt;"
+			"rrggbb background color, default = ffff00&gt<br>\n"
+			"Current parameters: <b>imgsrv " << port << " " << FormatIntHex(color, 6) << "</b><p>\n"
+			"<b>items</b> (<b>" << FormatInt(items) << "</b>) = number of images to generate (default = 10)<br>\n"
+			"<b>svr</b> (" << (IsNull(svr) ? "<i>empty</i>" : "<b>" + svr + "</b>")
+			<< ") = identifier for generated image references in this page (default = test)<br>\n"
+			"<b>img</b> = image identifier (empty = generate this page)<br>\n"
+			"<b>wd</b> = image width (default = 50 pixels)<br>\n"
+			"<b>ht</b> = image height (default = 20 pixels)<br>\n"
+			"Example: <b>http://localhost";
+			String wisapi = GetFileName(query.GetString("$$WISAPI"));
+			String sample_query;
+			sample_query << "items=" << minmax(2 * items, 10, 10000) << "&amp;svr=A";
+			if(!IsNull(wisapi))
+				image_page << "/dir/<a href=\"" << wisapi << "?" << sample_query << "\">" << wisapi << "?";
+			else
+				image_page << ':' << port << "/<a href=\"any?" << sample_query << "\">" << "any?";
+			image_page << sample_query << "</a><p>\n"
+			"Current request:<br>\n";
+			for(i = 0; i < query.GetCount(); i++)
+				image_page << ToHtml(query.GetKey(i)) << "=<b>" << ToHtml(query.GetValue(i)) << "</b><br>\n";
+			for(i = 0; i < items; i++)
+				image_page << HtmlTag("img").Src(
+					String().Cat() << "?img=" << UrlEncode(svr) << "-" << i << "&svr="
+						<< UrlEncode(svr) << "&id=" << ++next_id
+						<< "&wd=" << image_size.cx << "&ht=" << image_size.cy)
+						.Alt(ToHtml(String().Cat() << svr << "-" << i))
+						.Width(image_size.cx).Height(image_size.cy)
+				<< "\n" << (i % 15 == 14 ? "<br>\n" : "");
+
+			header = HttpContentType(HttpTextHtml(CHARSET_WIN1252));
+			body = HtmlTitlePage("Simple image server", image_page,
+				Color(128 + (bg.GetR() >> 1), 128 + (bg.GetG() >> 1), 128 + (bg.GetB() >> 1)));
+		}
+		request->Write(header, body);
+		request.Clear();
+	}
+	puts("Server stopped.");
+	fflush(stdout);
+}
diff --git a/examples/imgsrv/imgsrv.upp b/examples/imgsrv/imgsrv.upp
new file mode 100644
index 000000000..0212aca24
--- /dev/null
+++ b/examples/imgsrv/imgsrv.upp
@@ -0,0 +1,13 @@
+description "Simple http image server";
+
+uses
+	Web,
+	Draw,
+	plugin\png,
+	plugin\gif;
+
+file
+	imgsrv.cpp;
+
+mainconfig
+	"" = "GUI";
diff --git a/examples/wc/wc.cpp b/examples/wc/wc.cpp
new file mode 100644
index 000000000..3c45dfdb8
--- /dev/null
+++ b/examples/wc/wc.cpp
@@ -0,0 +1,50 @@
+#include <Core/Core.h>
+
+// This is inspired by http://www.digitalmars.com/d/2.0/cppstrings.html
+
+using namespace Upp;
+
+#define NOOUTPUT
+
+int main(int argc, const char *argv[])
+{
+	int n;
+	VectorMap<String, int> map;
+	Cout() << "   lines   words   bytes file\n";
+	int total_lines = 0;
+	int total_words = 0;
+	int total_bytes = 0;
+	for(int i = 1; i < argc; i++) {
+		String f = LoadFile(argv[i]);
+		int lines = 0;
+		int words = 0;
+		const char *q = f;
+		for(;;) {
+			int c = *q;
+			if(IsAlpha(c)) {
+				const char *b = q++;
+				while(IsAlNum(*q)) q++;
+				map.GetAdd(String(b, q), 0)++;
+				words++;
+			}
+			else {
+				if(!c) break;
+				if(c == '\n')
+					++lines;
+				q++;
+			}
+		}
+		Cout() << Format("%8d%8d%8d %s\n", lines, words, f.GetCount(), argv[i]);
+		total_lines += lines;
+		total_words += words;
+		total_bytes += f.GetCount();
+	}
+	Vector<int> order = GetSortOrder(map.GetKeys());
+#ifndef NOOUTPUT
+	Cout() << Format("--------------------------------------%8d%8d%8d total\n", total_lines, total_words, total_bytes);
+
+	for(int i = 0; i < order.GetCount(); i++)
+		Cout() << map.GetKey(order[i]) << ": " << map[order[i]] << '\n';
+#endif
+	return 0;
+}
diff --git a/examples/wc/wc.upp b/examples/wc/wc.upp
new file mode 100644
index 000000000..7d5d2f150
--- /dev/null
+++ b/examples/wc/wc.upp
@@ -0,0 +1,14 @@
+description "Word-count utility";
+
+optimize_speed;
+
+uses
+	Core;
+
+file
+	wc.cpp;
+
+mainconfig
+	"" = "",
+	"" = "USEMALLOC",
+	"" = "MT";
diff --git a/linux_scripts/README b/linux_scripts/README
new file mode 100644
index 000000000..01c5e5245
--- /dev/null
+++ b/linux_scripts/README
@@ -0,0 +1,37 @@
+###################################################################
+SCRIPTS TO BUILD DEBIAN PACKAGES FROM VARIOUS UPP REPOSITORIES
+By Massimo Del Fedele (max@veneto.com)
+###################################################################
+
+User scripts are :
+
+dosvn		to build a debian from a local SVN repository
+dodev		to build a debian from a local upp development tree
+dobeta		to build a debian from a local upp beta tree
+dostable	to build a debian from a local upp stable tree
+
+Other scripts are just helpers for main scripts.
+
+USAGE :
+
+1)	Prepare local source repositories.
+	For svn, you'll need to do an 'svn checkout'. See svn user guide and/or sourceforge instructions
+	For beta/devel/stable packages, just download source tarball from upp site and unpack in a local folder
+
+2)	You MUST have Upp executables installed. It doesn't matter if from stable, beta or svn packages,
+	but a working IDE is needed. If you still don't have it, just install a debian svn package
+	downloadable from forum.
+
+3)	Edit doXXX scripts to adjust your local paths and personal data
+	(repositories, destination path, mantainer name and email)
+	Paths are set on scripts beginning -- see comments
+
+4)	Just run the requested script
+
+The debian package(s) are put in your selected destination folder.
+On errors, you'll get some error messages from scripts.
+
+Enjoy !
+
+Max
+
diff --git a/linux_scripts/dobeta b/linux_scripts/dobeta
new file mode 100755
index 000000000..b13f59780
--- /dev/null
+++ b/linux_scripts/dobeta
@@ -0,0 +1,52 @@
+#!/bin/bash
+# dobeta
+# quick go to create deb package from beta sources
+#
+#################################################################
+#		REPLACE VALUES WITH YOUR OWN			#
+# SVN repository full path
+BETA_PATH="/home/massimo/sources/uppbeta"
+#
+# Destination path for generated debian
+DEST_PATH="/home/massimo/sources/uppdeb"
+#
+# Mantainer name and email
+export MAINTAINER="Massimo Del Fedele"
+#
+export EMAIL="max@veneto.com"
+#################################################################
+#
+# checks if beta repo and destination path are ok
+if [ ! -d $BETA_PATH/uppsrc ]
+then
+	echo "ERROR - UPP path not found in '$BETA_PATH'"
+	echo "Please modify current script to fit your Upp beta repository path"
+	exit 1
+fi
+
+if [ ! -d $DEST_PATH ]
+then
+	echo "ERROR - Invalid destinatio path '$DEST_PATH'"
+	echo "Please modify current script to fit your destination path"
+	exit 1
+fi
+
+#locates 'uppbeta2deb' script - first try on path
+uppbeta2deb="`which uppbeta2deb`"
+if [ x$uppbeta2deb = x ]
+then
+	# couldn't find it on path, just try on this script's path
+	LSOF=$(lsof -p $$ 2>/dev/null | grep -E "/"$(basename $0)"$")
+	uppbeta2deb=$(echo $LSOF | sed -r s/'^([^\/]+)\/'/'\/'/1 2>/dev/null)
+	uppbeta2deb=$(dirname $uppbeta2deb)/uppbeta2deb
+fi
+if [ ! -f $uppbeta2deb ]
+then
+	echo "ERROR - Could not find 'uppbeta2deb' script"
+	echo "Please check if it's on current path"
+	exit 1
+fi
+
+#just run uppbeta2deb with my params
+$uppbeta2deb $BETA_PATH $DEST_PATH
+
diff --git a/linux_scripts/dodev b/linux_scripts/dodev
new file mode 100755
index 000000000..b65c00a76
--- /dev/null
+++ b/linux_scripts/dodev
@@ -0,0 +1,53 @@
+#!/bin/bash
+# dodev
+# quick go to create deb package from my dev repo
+#
+
+#################################################################
+#		REPLACE VALUES WITH YOUR OWN			#
+# SVN repository full path
+DEV_PATH="/home/massimo/sources/uppbeta"
+#
+# Destination path for generated debian
+DEST_PATH="/home/massimo/sources/uppdeb"
+#
+# Mantainer name and email
+export MAINTAINER="Massimo Del Fedele"
+#
+export EMAIL="max@veneto.com"
+#################################################################
+#
+# checks if dev repo and destination path are ok
+if [ ! -d $DEV_PATH/uppsrc ]
+then
+	echo "ERROR - UPP path not found in '$DEV_PATH'"
+	echo "Please modify current script to fit your Upp development path"
+	exit 1
+fi
+
+if [ ! -d $DEST_PATH ]
+then
+	echo "ERROR - Invalid destinatio path '$DEST_PATH'"
+	echo "Please modify current script to fit your destination path"
+	exit 1
+fi
+
+#locates 'uppdev2deb' script - first try on path
+uppdev2deb="`which uppdev2deb`"
+if [ x$uppdev2deb = x ]
+then
+	# couldn't find it on path, just try on this script's path
+	LSOF=$(lsof -p $$ 2>/dev/null | grep -E "/"$(basename $0)"$")
+	uppdev2deb=$(echo $LSOF | sed -r s/'^([^\/]+)\/'/'\/'/1 2>/dev/null)
+	uppdev2deb=$(dirname $uppdev2deb)/uppdev2deb
+fi
+if [ ! -f $uppdev2deb ]
+then
+	echo "ERROR - Could not find 'uppdev2deb' script"
+	echo "Please check if it's on current path"
+	exit 1
+fi
+
+#just run uppdev2deb with my params
+$uppdev2deb $DEV_PATH $DEST_PATH
+
diff --git a/linux_scripts/dostable b/linux_scripts/dostable
new file mode 100755
index 000000000..3f4d4803f
--- /dev/null
+++ b/linux_scripts/dostable
@@ -0,0 +1,52 @@
+#!/bin/bash
+# dostable
+# quick go to create deb package from my stable repo
+#
+#################################################################
+#		REPLACE VALUES WITH YOUR OWN			#
+# SVN repository full path
+STABLE_PATH="/home/massimo/sources/uppbeta"
+#
+# Destination path for generated debian
+DEST_PATH="/home/massimo/sources/uppdeb"
+#
+# Mantainer name and email
+export MAINTAINER="Massimo Del Fedele"
+#
+export EMAIL="max@veneto.com"
+#################################################################
+#
+# checks if stable repo and destination path are ok
+if [ ! -d $STABLE_PATH/uppsrc ]
+then
+	echo "ERROR - UPP path not found in '$STABLE_PATH'"
+	echo "Please modify current script to fit your Upp development path"
+	exit 1
+fi
+
+if [ ! -d $DEST_PATH ]
+then
+	echo "ERROR - Invalid destinatio path '$DEST_PATH'"
+	echo "Please modify current script to fit your destination path"
+	exit 1
+fi
+
+#locates 'uppstable2deb' script - first try on path
+uppstable2deb="`which uppstable2deb`"
+if [ x$uppstable2deb = x ]
+then
+	# couldn't find it on path, just try on this script's path
+	LSOF=$(lsof -p $$ 2>/dev/null | grep -E "/"$(basename $0)"$")
+	uppstable2deb=$(echo $LSOF | sed -r s/'^([^\/]+)\/'/'\/'/1 2>/dev/null)
+	uppstable2deb=$(dirname $uppstable2deb)/uppstable2deb
+fi
+if [ ! -f $uppstable2deb ]
+then
+	echo "ERROR - Could not find 'uppstable2deb' script"
+	echo "Please check if it's on current path"
+	exit 1
+fi
+
+#just run uppstable2deb with my params
+$uppstable2deb $STABLE_PATH $DEST_PATH
+
diff --git a/linux_scripts/dosvn b/linux_scripts/dosvn
new file mode 100755
index 000000000..c83b2a415
--- /dev/null
+++ b/linux_scripts/dosvn
@@ -0,0 +1,52 @@
+#!/bin/bash
+# dosvn
+# quick go to create deb package from local svn repo
+#
+#################################################################
+#		REPLACE VALUES WITH YOUR OWN			#
+# SVN repository full path
+SVN_REPO="/home/massimo/sources/uppsvn"
+#
+# Destination path for generated debian
+DEST_PATH="/home/massimo/sources/uppdeb"
+#
+# Mantainer name and email
+export MAINTAINER="Massimo Del Fedele"
+#
+export EMAIL="max@veneto.com"
+#################################################################
+#
+# checks if svn repo and destination path are ok
+if [ ! -d $SVN_REPO/.svn ]
+then
+	echo "ERROR - SVN repository not found in '$SVN_REPO'"
+	echo "Please modify current script to fit your Upp SVN repository path"
+	exit 1
+fi
+
+if [ ! -d $DEST_PATH ]
+then
+	echo "ERROR - Invalid destinatio path '$DEST_PATH'"
+	echo "Please modify current script to fit your destination path"
+	exit 1
+fi
+
+#locates 'uppsvn2deb' script - first try on path
+uppsvn2deb="`which uppsvn2deb`"
+if [ x$uppsvn2deb = x ]
+then
+	# couldn't find it on path, just try on this script's path
+	LSOF=$(lsof -p $$ 2>/dev/null | grep -E "/"$(basename $0)"$")
+	uppsvn2deb=$(echo $LSOF | sed -r s/'^([^\/]+)\/'/'\/'/1 2>/dev/null)
+	uppsvn2deb=$(dirname $uppsvn2deb)/uppsvn2deb
+fi
+if [ ! -f $uppsvn2deb ]
+then
+	echo "ERROR - Could not find 'uppsvn2deb' script"
+	echo "Please check if it's on current path"
+	exit 1
+fi
+
+#just run uppsvn2deb with my params
+$uppsvn2deb $SVN_REPO $DEST_PATH
+
diff --git a/linux_scripts/idebuild b/linux_scripts/idebuild
new file mode 100755
index 000000000..72b54fe28
--- /dev/null
+++ b/linux_scripts/idebuild
@@ -0,0 +1,177 @@
+#!/bin/bash
+# idebuild
+# Batch builds TheIDE in optimal mode
+#
+
+######################################################################
+#convert a path to absolute one
+rel2abs()
+{
+    # make sure file is specified
+    if [ -z "$1" ]
+    then
+       echo "$0 <path>"
+       return 1
+    fi
+
+    # already absolute case
+    if [ "${1:0:1}" = "/" ] || [ "$PWD" = "/" ]
+    then
+       ABS=""
+    else
+       ABS="$PWD"
+    fi
+
+    # loop thru path
+    IFS="/"
+    for DIR in $1
+    do
+       if [ -n "$DIR" ]
+       then
+          if [ "$DIR" = ".." ]
+          then
+             ABS="${ABS%/*}"
+
+          elif [ "$DIR" != "." ]
+          then
+             ABS="$ABS/$DIR"
+          fi
+       fi
+    done
+    IFS=":"
+
+    echo $ABS
+    return 0
+} 
+
+######################################################################
+echo
+echo "UPP ide BATCH BUILDER"
+echo "CopyRight(c) 2008 By Massimo Del Fedele"
+echo
+
+# checks for parameters
+if [ x"$1" = x -o x"$2" = x ]
+then
+	echo "idebuild <upp base folder> <out file full path>"
+	exit 1
+fi
+
+# sets up source and dest folder names
+src=$(rel2abs $1)
+dst=$(rel2abs $2)
+
+# checks if source folder exists
+if [ -d $src ]
+then
+	true
+else
+	echo "source folder '$src' does not exist"
+	exit 1
+fi
+
+# sets up subfolders
+uppsrc="uppsrc"
+#common="Common"
+
+#subfolders="$uppsrc $common"
+subfolders="$uppsrc"
+
+# checks if upp subfolder are in source folder
+for name in $subfolders
+do
+	if [ ! -d $src/$name ]
+	then
+		echo "bad source folder '$src'"
+		echo "missing '$src/$name' subfolder"
+		exit 1
+	fi
+done
+
+#trivial check of dest file name...
+if [ -d $dst ]
+then
+	echo "'dst' is a directory"
+	exit 1
+fi
+if [ -f $dst ]
+then
+	rm $dst
+	if [ -f $dst ]
+	then
+		echo "'dst' exists and can't be erased"
+		exit 1
+	fi
+fi
+touch $dst
+if [ -f $dst ]
+then
+	rm $dst
+else
+	echo "'dst' is not a valid executable name"
+	exit 1
+fi
+
+#now finds ide executable - prefers newest versions rather than 'theide' stable
+#as if it's possible uses latest devel to build stuffs
+#gathers also the ide cfg folder - new way, subfolder of ~/.Upp
+executables="theide-svn theide-dev theide ide"
+idecfgfolder=""
+for executable in $executables
+do
+	ideexec="`which $executable`"
+	if [ x$ideexec != x ]
+	then
+		idecfgfolder="$HOME/.upp/$executable"
+		break
+	fi
+done
+if [ x$idecfgfolder = x ]
+then		
+	echo "Error -- Ide executable not found"
+	exit 1
+fi
+
+# checks if ide cfg folder is ok
+if [ -d $idecfgfolder ]
+then
+	true
+else
+	echo "Error -- Ide configuration folder '$idecfgfolder' not found"
+	exit 1
+fi
+
+#creates a temporary folder for ide output stuffs
+outtmp="`mktemp -t -d idebuild.XXXXXXX`"
+
+#creates a temporary assembly on ide cfg folder, just to build ide
+tmpassembly="$idecfgfolder/idebuild.var"
+echo UPP = "$src/uppsrc" > $tmpassembly
+echo OUTPUT = "$outtmp" >> $tmpassembly
+echo COMMON = "$src/uppsrc/Common" >> $tmpassembly
+
+#forks ide to build release executable
+$ideexec idebuild ide GCC -abrs theide
+#$ideexec idebuild ide GCC -absl theide
+ideresult=$?
+
+#checks the result code
+if [ $ideresult = 0 ]
+then
+	echo "BUILD OK"
+	#moves the result to dest name
+#	mv "$outtmp/GCC.Gui.Shared/theide" $dst
+	mv "$outtmp/GCC.Blitz.Gui.Shared/theide" $dst
+#	mv "$outtmp/GCC.Debug_full.Gui.Shared/theide" $dst
+else
+	echo "ERROR - TheIDE returned '$ideresult' error code"
+fi
+
+#deletes the temporary assembly
+if [ -f $tmpassembly ]
+then
+	rm $tmpassembly
+fi
+
+#deletes temporary folder
+rm -rf $outtmp
diff --git a/linux_scripts/uppbeta2deb b/linux_scripts/uppbeta2deb
new file mode 100755
index 000000000..c540ff407
--- /dev/null
+++ b/linux_scripts/uppbeta2deb
@@ -0,0 +1,132 @@
+#!/bin/bash
+# uppbeta2deb
+# From a beta source tree, batch builds theide and creates .deb package
+#
+
+######################################################################
+#convert a path to absolute one
+rel2abs()
+{
+    # make sure file is specified
+    if [ -z "$1" ]
+    then
+       echo "$0 <path>"
+       return 1
+    fi
+
+    # already absolute case
+    if [ "${1:0:1}" = "/" ] || [ "$PWD" = "/" ]
+    then
+       ABS=""
+    else
+       ABS="$PWD"
+    fi
+
+    # loop thru path
+    IFS="/"
+    for DIR in $1
+    do
+       if [ -n "$DIR" ]
+       then
+          if [ "$DIR" = ".." ]
+          then
+             ABS="${ABS%/*}"
+
+          elif [ "$DIR" != "." ]
+          then
+             ABS="$ABS/$DIR"
+          fi
+       fi
+    done
+    IFS=":"
+
+    echo $ABS
+    return 0
+} 
+
+######################################################################
+echo
+echo "UPP BETA2DEB BUILDER"
+echo "CopyRight(c) 2008 By Massimo Del Fedele"
+echo
+
+# checks for parameters
+if [ x"$1" = x -o x"$2" = x ]
+then
+	echo "uppbeta2deb <upp root> <dest folder>"
+	exit 1
+fi
+
+#sets up source and dest folder names
+src=$(rel2abs $1)
+dst=$(rel2abs $2)
+
+#locates 'uppdeb' and 'idebuild' scripts
+uppdeb="`which uppdeb`"
+if [ x$uppdeb = x ]
+then
+	# couldn't find it on path, just try on this script's path
+	LSOF=$(lsof -p $$ 2>/dev/null | grep -E "/"$(basename $0)"$")
+	uppdeb=$(echo $LSOF | sed -r s/'^([^\/]+)\/'/'\/'/1 2>/dev/null)
+	uppdeb=$(dirname $uppdeb)/uppdeb
+fi
+if [ ! -f $uppdeb ]
+then
+	echo "ERROR - Could not find 'uppdeb' script"
+	echo "Please check if it's on current path"
+	exit 1
+fi
+idebuild="`which idebuild`"
+if [ x$idebuild = x ]
+then
+	# couldn't find it on path, just try on this script's path
+	LSOF=$(lsof -p $$ 2>/dev/null | grep -E "/"$(basename $0)"$")
+	idebuild=$(echo $LSOF | sed -r s/'^([^\/]+)\/'/'\/'/1 2>/dev/null)
+	idebuild=$(dirname $idebuild)/idebuild
+fi
+if [ ! -f $idebuild ]
+then
+	echo "ERROR - Could not find 'idebuild' script"
+	echo "Please check if it's on current path"
+	exit 1
+fi
+
+#checks if source folder is an upp folder
+for name in uppsrc Common examples tutorial reference bazaar
+do
+	if [ ! -d $src/$name ]
+	then
+		echo "bad source folder '$src'"
+		echo "missing '$src/$name' subfolder"
+		exit 1
+	fi
+done
+
+#gets release number from uppsrc/ide/version.h
+release="`cat $src/uppsrc/ide/version.h`"
+release=${release#*\"}
+release=${release%%\"*}
+echo "building .deb for release $release"
+
+#creates a temporary folder for executable file
+outtmp="`mktemp -t -d uppbeta2deb.XXXXXXX`"
+
+#build theide
+echo "building TheIDE......"
+$idebuild $src $outtmp/theide-beta
+if [ $? = 0 ]
+then
+	true
+else
+	echo "Error building TheIDE"
+	echo "Please check executables for errors"
+	exit 1
+fi
+
+#creates the deb package
+echo "Creating package......"
+$uppdeb $src $outtmp/theide-beta $dst $release
+result=$?
+
+#remove temporary folder
+rm -rf $outtmp
diff --git a/linux_scripts/uppdeb b/linux_scripts/uppdeb
new file mode 100755
index 000000000..f5e1f9ee7
--- /dev/null
+++ b/linux_scripts/uppdeb
@@ -0,0 +1,423 @@
+#!/bin/bash
+# uppdeb
+# Creates .deb packages for Ultimate++
+#
+
+######################################################################
+#convert a path to absolute one
+rel2abs()
+{
+    # make sure file is specified
+    if [ -z "$1" ]
+    then
+       echo "$0 <path>"
+       return 1
+    fi
+
+    # already absolute case
+    if [ "${1:0:1}" = "/" ] || [ "$PWD" = "/" ]
+    then
+       ABS=""
+    else
+       ABS="$PWD"
+    fi
+
+    # loop thru path
+    IFS="/"
+    for DIR in $1
+    do
+       if [ -n "$DIR" ]
+       then
+          if [ "$DIR" = ".." ]
+          then
+             ABS="${ABS%/*}"
+
+          elif [ "$DIR" != "." ]
+          then
+             ABS="$ABS/$DIR"
+          fi
+       fi
+    done
+    IFS=":"
+
+    echo $ABS
+    return 0
+} 
+
+######################################################################
+echo
+echo "UPP .deb PACKAGE GENERATOR"
+echo "CopyRight(c) 2008 By Massimo Del Fedele"
+echo
+
+# checks for parameters
+if [ x"$1" = x -o x"$2" = x -o x"$3" = x -o "$4"x = x ]
+then
+	echo "uppdeb <upp base folder> <executable full path> <dest folder> <version>"
+	exit 1
+fi
+
+#gets architecture (i386 or x86_64)
+architecture="`uname -m`"
+if [ "$architecture" = "x86_64" ]
+then
+	architecture="amd64"
+elif [ "$architecture" = "i386" -o "$architecture" = "i686" ]
+then
+	architecture="i386"
+else
+	echo "wrong architecture '$architecture'"
+	exit 1
+fi
+
+# sets up source and dest folder names
+src=$(rel2abs $1)
+executable=$(rel2abs $2)
+dst=$(rel2abs $3)
+ver="$4"
+
+# checks if source folder exists
+if [ -d $src ]
+then
+	true
+else
+	echo "source folder '$src' does not exist"
+	exit 1
+fi
+
+# checks if destination folder exists
+if [ -d $dst ]
+then
+	true
+else
+	echo "dest folder '$dst' does not exist"
+	exit 1
+fi
+
+# sets up subfolders
+uppsrc="uppsrc"
+examples="examples"
+tutorial="tutorial"
+reference="reference"
+bazaar="bazaar"
+
+subfolders="$uppsrc $examples $tutorial $reference $bazaar"
+
+# checks if upp subfolder are in source folder
+for name in $subfolders
+do
+	if [ ! -d $src/$name ]
+	then
+		echo "bad source folder '$src'"
+		echo "missing '$src/$name' subfolder"
+		exit 1
+	fi
+done
+
+# checks for executable
+if [ -f $executable ]
+then
+	true
+else
+	echo "missing executable file... please compile before packaging"
+	exit 1
+fi
+
+# removes dest file if exist
+if [ -f $dst ]
+then
+	rm $dst
+fi
+
+# gets basename from ide executable full path
+# it's used to set up proper ide exec name and launcher
+# in package
+file=${executable##*/}
+base=${file%%.*}
+
+# depending on base name, gets Icon name and Package name
+if [[ $base =~ [sS][vV][nN] ]]
+then
+	iconname="TheIDE-SVN"
+	packagename="upp-svn"
+elif [[ $base =~ [dD][eE][vV] ]]
+then
+	iconname="TheIDE-DEV"
+	packagename="upp-dev"
+elif [[ $base =~ [bB][eE][tT][aA] ]]
+then
+	iconname="TheIDE-BETA"
+	packagename="upp-beta"
+else
+	iconname="TheIDE"
+	packagename="upp"
+fi
+
+#tmp="/tmp/uppdeb"
+#rm -rf $tmp
+tmp="`mktemp -t -d uppdeb.XXXXXXX`"
+#mkdir $tmp
+
+echo "Building package '$packagename' from folder '$src'"
+echo "Dest package path is '$dst'"
+echo "IDE executable is '$executable'"
+
+#creates package tree
+mkdir $tmp/DEBIAN
+mkdir $tmp/usr
+mkdir $tmp/usr/bin
+mkdir $tmp/usr/sbin
+mkdir $tmp/usr/share
+mkdir $tmp/usr/share/applications
+mkdir $tmp/usr/share/doc
+mkdir $tmp/usr/share/doc/$packagename
+mkdir $tmp/usr/share/pixmaps
+mkdir $tmp/usr/share/$packagename
+
+#creates GCC.bm file
+cat > $tmp/usr/share/$packagename/GCC.bm << EOF
+BUILDER = "GCC";
+COMPILER = "g++-4.1";
+DEBUG_INFO = "2";
+DEBUG_BLITZ = "1";
+DEBUG_LINKMODE = "1";
+DEBUG_OPTIONS = "-O0";
+RELEASE_BLITZ = "0";
+RELEASE_LINKMODE = "1";
+RELEASE_OPTIONS = "-O3 -ffunction-sections";
+RELEASE_SIZE_OPTIONS = "-Os -finline-limit=20";
+DEBUGGER = "gdb";
+PATH = "";
+INCLUDE = "/usr/include/freetype2;/usr/include/gtk-2.0;/usr/include/glib-2.0;/usr/lib/glib-2.0/include;/usr/lib/gtk-2.0/include;/usr/include/cairo;/usr/include/pango-1.0;/usr/include/atk-1.0";
+LIB = "/usr/X11R6/lib";
+REMOTE_HOST = "";
+REMOTE_OS = "";
+REMOTE_TRANSFER = "";
+REMOTE_MAP = "";
+EOF
+
+#creates theide.png file (actually, $base.png)
+shopt -s xpg_echo
+echo "\
+\x89\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\
+\x00\x00\x00\x30\x00\x00\x00\x30\x08\x06\x00\x00\x00\x57\x02\xf9\
+\x87\x00\x00\x00\x06\x62\x4b\x47\x44\x00\xff\x00\xff\x00\xff\xa0\
+\xbd\xa7\x93\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0b\x13\x00\
+\x00\x0b\x13\x01\x00\x9a\x9c\x18\x00\x00\x00\x07\x74\x49\x4d\x45\
+\x07\xd6\x0b\x1a\x0b\x0d\x24\xc5\x3f\xa6\x05\x00\x00\x08\x51\x49\
+\x44\x41\x54\x68\xde\xed\x99\xcb\x6f\x1b\xd7\x15\xc6\x7f\x77\x1e\
+\xe4\x90\x94\x25\xd7\x2f\x24\x41\x51\x64\x23\xe4\x81\x28\x36\xe4\
+\x56\x90\x03\xa7\x28\x10\x08\x05\x02\x74\x91\x5d\xff\x84\x6e\xea\
+\xa0\x05\xb4\x6b\x37\x6d\xa5\xa5\xb3\xb1\x90\xbf\xa1\xf1\xc6\x8b\
+\xc6\x5d\x15\x30\xdc\x4d\xd0\xa2\x89\x8d\x00\x8e\x64\x14\x68\x1d\
+\x40\x76\x40\x3d\x39\x22\x39\x9c\xc7\x9d\xd3\xc5\x3c\x38\xa4\x86\
+\x12\x29\xa9\xc9\xa2\xbd\x02\x21\x72\xc8\x39\xf7\x9c\x7b\xbe\xfb\
+\x9d\xef\x9e\x81\xff\x8f\xef\x76\xa8\x33\xb2\x63\x00\x53\x40\xa5\
+\x70\x4d\x0a\xf6\x47\xbd\x07\x88\x81\x03\x20\x3c\xc9\xc4\xd6\x19\
+\x05\x30\x05\xfc\x06\x58\x4c\x1d\x91\x31\xef\xb3\x81\x3d\xe0\x77\
+\xc0\xe7\xdf\x65\x00\x26\xb0\x00\xbc\x7b\x7c\xce\x15\x88\xe4\xe9\
+\x17\xd8\x07\xce\x9f\x74\x62\xeb\x0c\x20\x11\x01\x17\xfa\xfe\x29\
+\x1c\xc7\xc1\x34\x4d\x24\x75\x14\x95\xfc\xd4\xf0\x3c\x0c\xad\x11\
+\xa0\x03\xe8\x3e\x84\xa6\x81\x99\xd4\x1f\x35\x09\xcc\x46\xed\x81\
+\xe9\x09\x20\xa1\x81\x2a\x30\x07\x5c\xa8\xd5\x6a\x2c\x2f\x2f\x33\
+\x3f\x3f\x8f\xeb\xba\x28\x11\xb4\xe3\x60\xf8\x3e\xaf\xac\xac\xf0\
+\xbd\x8d\x0d\xba\xc0\x2f\x81\x47\xc9\xfd\x21\xf0\x25\xb0\x95\x66\
+\x52\x9d\x05\xcc\x2e\x01\x0f\x53\xc7\x27\x79\xc5\x53\x53\x53\x72\
+\xef\xde\x3d\xe9\xb4\xdb\xf2\xec\xeb\xaf\xe5\xdf\xdf\x7c\x23\xff\
+\xec\x76\xe5\x5f\xcd\xa6\xe8\x1b\x37\x44\x40\x42\x90\xf7\xc6\xb4\
+\xa9\x94\x12\x12\x98\xfd\x74\xd2\x3d\x10\x66\x90\xa8\xd7\xeb\x58\
+\x96\x45\x1c\xc7\x25\x90\x4e\x16\xac\xd3\xe9\xa0\xb5\x56\x22\x82\
+\xeb\xba\x6c\xef\xee\xb2\xb3\xb3\x93\x64\xc0\x75\x31\x3c\x8f\x4b\
+\x41\xc0\x14\xe0\x01\x41\xe1\xfe\xcc\xbe\x88\xa0\xb5\xce\xaf\x7b\
+\x9e\x97\x7d\x8e\xfa\x88\x1b\x2f\x80\x6c\x05\xa8\xd7\xeb\xdc\xbe\
+\x7d\x9b\x85\x85\x05\x0e\x0e\x0e\x0e\xfd\xd0\x71\x1c\x7a\xbd\x1e\
+\xb7\x6e\xdd\xe2\xd1\xa3\x04\x14\x4a\x04\xa9\x54\x50\x22\x7c\x7f\
+\x65\x85\xfa\x93\x27\xc4\xf5\x3a\xb5\x8d\x8d\x43\x1b\x28\xb3\xbf\
+\xb8\xb8\x88\xeb\xba\xbc\x78\xf1\x82\x28\x8a\x88\xa2\x88\xd5\xd5\
+\x55\xd6\xd7\xd7\x07\xfc\x19\x37\x80\x1c\x87\x96\x65\xb1\xb0\xb0\
+\xc0\xb5\x6b\xd7\x46\xa6\x2a\x8a\x84\x8b\x17\xaf\xe4\x1b\x56\x3b\
+\x0e\xd1\xf4\x34\xda\x75\xa9\x3f\x79\x42\xfd\xab\xaf\x86\x4c\xf7\
+\x7d\xb1\x2c\x9b\x85\x85\x9b\xbc\xfd\xf6\x9b\x00\xec\xed\xb5\xd0\
+\x3a\x20\x0c\x23\xd6\xd6\xd6\x8a\x37\xa9\x13\xd1\x68\x1c\xc7\x85\
+\x95\x17\xa0\x9b\x66\x34\xb3\x57\xc5\xf3\x7c\x82\xa0\xd7\xa7\x30\
+\xdf\xc7\x6c\xb7\x31\x3c\x8f\xb8\x5e\xef\xbb\x50\x07\x6c\x49\x38\
+\x25\xa5\xa1\xc4\xfe\x0e\xa0\x89\xe3\x2e\xcd\xe6\x16\x5a\x87\x44\
+\x51\x48\x18\x86\x27\xa6\x51\x19\xc6\x78\x32\xba\xc0\xaf\x81\xbf\
+\xa5\x44\x95\x30\xae\x48\x8c\x52\x8f\x73\xaa\x7c\x65\x65\x85\x1f\
+\x7c\xfc\x31\x97\x82\x20\x87\x0d\x75\xe0\x36\x70\x13\xd8\x01\x6e\
+\x25\x34\xa4\x54\x07\xf8\x10\x98\x46\x6b\xcd\xd3\xa7\xef\xd3\x6c\
+\xbe\x86\x69\xba\xb4\xdb\xed\x43\x90\x3e\x65\x21\x8b\x52\xe7\x1f\
+\x8d\x2c\x1f\x4a\x6b\x6a\x1b\x1b\x79\x21\xc9\x97\x3f\x16\xf8\x21\
+\xf0\x66\x6a\xe6\x62\x96\x16\x0d\x7c\x91\x66\x5b\xd1\x6a\xbd\x41\
+\xb3\xf9\x12\xb6\xbd\x73\xaa\x0c\xe4\xcb\x9e\x17\xa3\xfc\xf2\xb9\
+\xa3\x00\x87\x14\xe9\x22\x83\x4d\x2c\x09\x9b\x67\x0b\x9a\xd3\x90\
+\x50\x34\xaf\x54\x05\xcb\x6a\x50\xa9\xd8\xd8\xb6\x8d\x61\x18\xa7\
+\xdf\x03\xa7\xd2\x7f\x75\xe0\x23\xe0\x7a\xea\xfc\xd5\x11\x72\xae\
+\x88\x5d\x91\xf4\x35\xb0\x78\x32\x69\x06\x72\xde\xcd\xa4\x41\xb6\
+\x61\x13\x95\x31\x38\xaa\x55\xc8\x16\x4b\x31\x24\x00\xae\x83\xcc\
+\x0f\x5e\x2f\x5a\x51\x0a\x32\xf3\x96\xa5\xa8\xd5\x2a\x38\x4e\x0d\
+\xdb\xae\x16\x33\x40\xa1\x74\x8c\x0c\x20\x83\xad\x99\x6a\x9b\x6a\
+\xf6\x45\xaf\xd7\x23\x8a\x04\xcf\xf3\x11\x89\x0f\x39\xdf\xeb\x41\
+\x5e\xe3\x72\xd8\x90\xc3\x46\x15\xf8\xcb\x48\x2b\x64\xd1\x4a\xaf\
+\x97\xe8\xbb\x6e\x17\x82\x20\x24\x0c\x7d\xe2\x38\x28\x66\xc0\x48\
+\x7d\x3a\x9f\xbe\xcf\x75\x91\x2a\xd1\x3f\x0b\xe9\xe7\x39\xe0\x82\
+\x69\x9a\xcc\xcd\xcd\x71\xf1\xe2\x15\x82\xa0\x97\xb2\x4d\xab\x1f\
+\xb5\x91\x38\xff\xf8\x31\xb4\x5a\x30\xdd\x80\x3f\x7d\x04\xef\x16\
+\x61\x33\x93\xb0\xe6\xaf\x52\x31\xd3\x70\xe1\xf1\xcf\xa0\xf5\x10\
+\x4c\x13\xe6\xe6\xe0\xf2\x65\xf0\x7d\x83\x66\xf3\x65\x7c\x7f\x0a\
+\xc3\x88\xd8\xdc\xdc\xa4\xd7\xeb\x15\xf5\xd2\x3e\xe0\x02\xbf\x2f\
+\xd3\x45\x65\xfa\x27\x9e\x4c\x0b\x29\x99\x9e\x41\x1e\x7e\x51\x80\
+\xb2\x20\x12\x23\x5d\x41\xae\x0b\xc9\x5f\x0b\xe1\xc7\x88\x09\xa2\
+\x26\xb0\x5f\xa6\x8b\xac\x51\xfa\x27\x95\xc4\x6a\x90\x85\x18\xa9\
+\x85\x72\xdd\x92\x09\xdf\x22\x6c\x54\x62\xb8\x71\x88\xb3\x92\x4d\
+\x50\x1b\x96\xdf\x47\xd9\x1f\xd2\x45\x56\x59\x01\x73\x1c\x67\x40\
+\x12\x1f\x35\x1c\xc7\xc1\xf7\x7d\x56\x56\x56\x58\x5f\x5f\x1f\xa0\
+\x8b\x6e\x11\x36\xc0\xe3\x92\xc9\x6a\xc7\xcc\x35\x6c\xff\xa8\x4d\
+\x9c\xcf\x6d\x9a\x26\xf3\xf3\xf3\x2c\x2d\x2d\xb1\xbd\xbd\x3d\x54\
+\x8d\x07\x29\xaf\xd1\x68\xe0\x79\x1e\x77\xee\xdc\xe9\xb3\x4a\x61\
+\xe7\x7d\x0e\xfc\x63\xa4\x12\x3a\x7a\xae\x32\xfb\xc3\x55\xd9\x1a\
+\x55\xbc\x5c\xd7\x65\x7b\x7b\x3b\x91\xc4\x47\x04\xd0\xeb\xf5\xe8\
+\xf5\x7a\x03\x55\xb3\x97\xce\x30\x08\x9b\x84\x9e\x04\x9b\xa2\x18\
+\x3a\x6a\xae\x11\xf6\x07\x8a\x5a\x69\x06\x8a\xf8\x1b\xe5\xfc\xa8\
+\xd1\x49\x65\xce\x95\x34\x90\xc7\x03\x55\xad\x44\x0c\x4d\x3e\xd7\
+\xc8\x0c\x9c\xc9\xd0\x25\x4a\x29\x81\x4d\x4c\x89\x18\x3a\xf5\xb0\
+\xce\xbc\x47\x24\xc3\xae\xd7\x53\xe7\x4b\xc5\xd0\x49\x7b\x59\xe3\
+\x41\x28\x23\xf2\x91\xbe\x1e\xf3\xfd\x24\x62\xa8\xcc\xd6\x08\xfb\
+\xc7\x43\x28\xab\x03\x8d\x46\x23\xab\x84\x23\x03\x98\x9a\x9a\xc2\
+\x34\xcd\xbe\x6e\x99\x50\x0c\x1d\x35\x57\xa9\xfd\x71\x21\xe4\xfb\
+\x3e\x9e\xe7\x1d\x19\x40\x46\x83\x9e\xe7\xf5\x57\x4a\x26\x17\x43\
+\x47\xcd\x75\xc8\xfe\x10\x84\x8a\x4e\x5f\x04\xfe\x08\xbc\x67\x9a\
+\x26\xb3\xb3\xb3\xcc\xcc\xcc\x1c\x7b\xa8\x30\x0c\x03\x11\x61\x63\
+\x63\x23\x39\x41\x4d\x28\x86\x8e\x9b\xeb\x90\x7d\xd8\x06\x7e\x0e\
+\xfc\xa5\x2c\x03\xb6\x52\x0a\xad\x75\x69\xd5\x1b\xa7\xc3\x1b\x63\
+\x01\x3f\x02\xae\x0d\xc2\xd6\x50\x87\xaa\x9a\x32\x21\x8e\xc7\x9f\
+\x4b\x29\x85\x88\x58\xa9\x62\x3e\x04\xa1\x18\xd8\x13\x91\xfd\xf4\
+\xfd\xb9\x2c\xa0\xa4\x6f\x63\xa7\x7d\xa1\xce\x40\x8b\x26\xa3\xee\
+\x4e\x07\x62\x5d\xec\x02\x1e\x2f\x86\x24\x4e\x56\xad\xd1\x00\xcb\
+\x4a\x24\x75\x10\x54\x10\x31\x51\x4a\x08\x82\x20\xeb\x45\xc5\x40\
+\x5b\x44\x34\xb0\x0b\xf8\x65\x01\x1c\xa4\xed\xbb\xf3\xa9\xb4\xfe\
+\x2d\x30\xdf\xef\x0b\xdd\x4c\xbb\x07\x1f\xe6\x67\xd8\x44\xab\x24\
+\x7a\xfe\xd6\x2d\x78\xf4\x28\xdb\x03\xe3\x8b\xa1\x7a\x03\x6e\xdf\
+\x86\x77\xde\x81\xfd\xfd\x0a\x0f\x1e\x7c\x40\xb3\xf9\x3a\xa6\xd9\
+\xe2\xee\xdd\xbb\x6c\x6e\x6e\x92\x62\xf1\x0f\xc0\xdf\xd3\x65\xf9\
+\xb2\x2c\x80\xb0\xa0\xb1\x67\x80\x5f\x64\x7d\xa1\xc5\xc5\xc5\xb4\
+\x6f\xa3\x0b\xdd\x88\x22\x5b\x24\x7a\x3e\x07\xe2\x51\x62\x28\xff\
+\x22\x3b\x85\x25\xce\xbf\xf5\x56\x12\x51\xa7\xf3\x2a\xcf\x9e\x5d\
+\xc7\xb2\x9a\xdc\xbf\x7f\xbf\x78\x1a\xfb\x0c\xf8\xeb\x70\x7d\xb4\
+\x8e\x28\x70\x56\x51\x17\x25\x5d\x83\x2e\x5a\x6b\xe2\x58\xa1\x54\
+\x25\x3f\x06\x76\xbb\xe0\xfb\x41\x9f\x5a\x4a\xc4\x50\x72\x74\xd4\
+\x58\x56\xb2\x29\x3d\x0f\xb4\x4e\x82\xdf\xdf\xaf\x00\x82\xef\x9b\
+\xec\xed\x79\x1c\x1c\xec\x63\x59\x6d\xa2\x28\x2a\xfa\x54\x29\x2b\
+\x99\xc7\x4a\x09\xad\x35\x2f\x5e\xbc\x60\x6f\xaf\x45\xb3\xb9\xc5\
+\xd3\xa7\xef\xd3\x6a\xbd\x81\x65\x35\x10\x11\x6a\xb5\x0a\x41\x10\
+\xd2\x6c\xde\x05\x36\x47\x8a\x21\xc7\x89\x59\x5e\xde\xe4\xc6\x0d\
+\xd8\xda\x0a\x59\x5d\xed\xb2\xbe\x9e\x60\xfe\xc1\x83\x0f\xe8\x74\
+\x5e\x65\x6f\xcf\x63\x7b\xfb\x65\xaa\xd5\x2e\x5a\x9f\xee\xf9\x80\
+\x1a\x6c\x1d\x46\x68\x1d\xa0\x75\x48\xb3\xf9\x1a\xcd\xe6\x4b\x54\
+\x2a\x36\x22\x82\xe3\xd4\x08\x43\x1f\xdf\xff\xf3\x68\x31\x44\x72\
+\xec\xbc\x7a\xb5\xc3\xd2\x52\xc0\xf3\xe7\x9a\xb5\xb5\x28\x85\x9f\
+\x49\xb3\xf9\x3a\xcf\x9e\x5d\xe7\xe0\x60\x9f\x6a\xb5\x4b\xa3\x61\
+\x11\x04\xd5\xb3\x69\xab\x28\xa5\x88\xa2\x88\x30\x8c\x88\xa2\x10\
+\xd3\x74\xb1\xed\x1d\x6c\xdb\x46\x04\x6c\xbb\x4a\x1c\x07\x18\x46\
+\x54\xfa\x30\xc6\x71\x62\xe2\x18\x2c\x4b\x70\x5d\x93\xbd\x3d\x9b\
+\xdd\x5d\x45\x18\x1a\xe9\x6f\x04\xcb\x6a\x61\x59\x4d\x2c\xab\x8d\
+\xd6\x10\x04\x55\x7c\x3f\xe0\xb8\xd3\xe0\x58\xad\x45\xcf\xf3\x58\
+\x5d\x5d\x65\x6d\x6d\x8d\x30\x0c\x69\xb7\xdb\x84\x61\x98\x17\x98\
+\xec\x7f\xca\x16\x03\x92\xca\x71\x34\xcb\xcb\x9b\x5c\xbd\xda\xc1\
+\x75\x4d\x66\x67\x3d\x5c\xb7\x4a\x51\x35\x07\x41\xc0\x27\x9f\xdc\
+\xe5\xd3\x4f\xef\xe7\x98\x3f\x6c\xf3\x64\xdd\xe9\x89\x8b\x5a\xf2\
+\xf8\xab\x4f\x43\x96\x65\x70\xe3\x06\x2c\x2d\x05\xec\xee\xda\x1c\
+\x1c\x54\xa9\x54\xce\x51\xaf\x7b\x39\x3c\xe2\x38\x2e\x3a\x3a\x56\
+\xf1\x1a\x27\x80\xac\xa8\xb5\x52\xf1\x7e\x9c\x80\x36\x80\x73\x92\
+\x1c\xb7\xd2\xdd\xab\x11\xe9\xb2\xb5\x15\xf2\xfc\xb9\x66\x77\x57\
+\xa1\x14\xd4\xeb\xde\xb0\xb6\x89\x53\x9e\x0f\xca\xf6\x9f\x88\x98\
+\xe9\x09\xc8\x9f\xa4\x4f\x68\xa7\x7d\xa1\xcb\xa3\x9e\x8c\x0c\x75\
+\xcc\x2e\x64\x85\x2f\x59\xa8\x39\xe0\x12\xa6\x19\x30\x3b\xdb\x65\
+\x66\x26\xca\x31\x5f\xa2\x6d\xdc\xb4\x48\x7d\x96\x52\xa5\x2a\x29\
+\x1a\x7e\x5a\xbc\x76\xff\x5b\x0f\xcc\xcf\x27\xe2\x4a\x15\x7a\x38\
+\x63\xf7\x79\x76\x81\x9f\x9c\xb4\x31\x7b\x56\x47\x4a\x23\x59\xc9\
+\x3e\xe4\xc6\x20\x90\x0c\x1e\xbb\x13\x3c\x18\x97\x53\xb4\x9a\x8f\
+\x7d\xe2\x3e\x2e\xe4\xbe\x75\x78\x7c\x5b\x43\xf1\xbf\x38\xfe\x03\
+\xb3\x05\xe4\x47\x8e\x1e\xd0\xe3\x00\x00\x00\x00\x49\x45\x4e\x44\
+\xae\x42\x60\x82" > $tmp/usr/share/pixmaps/$base.png
+
+#copies source files to tmp folder
+for name in $subfolders
+do
+#	rsync -av --exclude '.svn' $src/$name $tmp/usr/share/$packagename > /dev/null
+	rsync -rl --chmod=ugo+r,Dugo+x --exclude '.svn' $src/$name $tmp/usr/share/$packagename > /dev/null
+done
+
+#copies the executable file
+cp -a $executable $tmp/usr/bin/$base
+
+#creates launcher
+cat > $tmp/usr/share/applications/$base.desktop << EOF
+[Desktop Entry]
+Version=1.0
+Encoding=UTF-8
+EOF
+echo "Name=$iconname" >> $tmp/usr/share/applications/$base.desktop
+echo "GenericName=$iconname" >> $tmp/usr/share/applications/$base.desktop
+cat >> $tmp/usr/share/applications/$base.desktop << EOF
+Comment=IDE for cross-platform C++ development
+MimeType=application/x-upp;
+EOF
+echo "Exec=$base" >> $tmp/usr/share/applications/$base.desktop
+echo "Icon=$base.png" >> $tmp/usr/share/applications/$base.desktop
+cat >> $tmp/usr/share/applications/$base.desktop << EOF
+Terminal=false
+Type=Application
+Categories=Application;Development;C++
+StartupNotify=false
+EOF
+echo "GenericName[de_DE]=$iconname" >> $tmp/usr/share/applications/$base.desktop
+echo "GenericName[it_IT]=$iconname" >> $tmp/usr/share/applications/$base.desktop
+
+#creates md5sums file
+md5tmp="`mktemp -t -d uppdebMD5.XXXXXXX`"
+cd $tmp
+find ./ -type f -exec md5sum {} \; | sed s/.[/]// | sed /[.]svn/d >> $md5tmp/md5sums
+mv $md5tmp/md5sums $tmp/DEBIAN
+rmdir $md5tmp
+
+#gets the installed size (approx...)
+#sigh... there must be a nicer way
+szline="`du -s $tmp/`"
+for sz in $szline
+do
+	size=$sz
+	break
+done
+
+# removed... should not be necessary anymore
+#Conflicts: ultimate++, upp-dev
+
+#creates control file
+echo "Package: $packagename" > $tmp/DEBIAN/control 
+echo "Version: $ver" >> $tmp/DEBIAN/control 
+cat >> $tmp/DEBIAN/control << EOF
+Section: devel
+Priority: optional
+EOF
+echo "Architecture: $architecture" >> $tmp/DEBIAN/control
+cat >> $tmp/DEBIAN/control << EOF
+Depends: gcc (>= 3.4.0), g++ (>= 3.4.0), libc6-dev (>= 2.3.6), libstdc++6-dev (>= 3.4.6), libx11-dev (>= 1.0.0), libxft-dev (>= 2.1.8), zlib1g-dev (>= 1.2.3), libpng12-dev (>= 1.2.8), libfontconfig1-dev (>= 2.3.2), libxrender-dev (>= 0.9.0), libfreetype6-dev (>= 2.1.10), libexpat1-dev (>= 1.95.8), libxau-dev (>= 1.0.0), libxdmcp-dev (>= 1.0.0), libgtk2.0-dev (>= 2.8.17), libglib2.0-dev (>= 2.10.2), g++-4.1
+EOF
+echo "Installed-Size: $size" >> $tmp/DEBIAN/control 
+echo "Maintainer: $MAINTAINER <$EMAIL>" >> $tmp/DEBIAN/control 
+cat >> $tmp/DEBIAN/control << EOF
+Description: C++ library for cross-platform development with IDE
+ Ultimate++ is a radical and innovative GUI toolkit whose number one priority
+ is programmer productivity. C++ is a great programming language but
+ C++ programmers are sometimes hampered by the lack of effective libraries.
+ U++ libraries enable genuine productivity gains with shorter development
+ times and greatly reduced application source code size.
+EOF
+
+#creates final .deb package
+dpkg-deb -b $tmp $dst
+result=$?
+
+#wipes temporary folder
+rm -rf $tmp
diff --git a/linux_scripts/uppdev2deb b/linux_scripts/uppdev2deb
new file mode 100755
index 000000000..d54303a04
--- /dev/null
+++ b/linux_scripts/uppdev2deb
@@ -0,0 +1,132 @@
+#!/bin/bash
+# uppdev2deb
+# From a devel source tree, batch builds theide and creates .deb package
+#
+
+######################################################################
+#convert a path to absolute one
+rel2abs()
+{
+    # make sure file is specified
+    if [ -z "$1" ]
+    then
+       echo "$0 <path>"
+       return 1
+    fi
+
+    # already absolute case
+    if [ "${1:0:1}" = "/" ] || [ "$PWD" = "/" ]
+    then
+       ABS=""
+    else
+       ABS="$PWD"
+    fi
+
+    # loop thru path
+    IFS="/"
+    for DIR in $1
+    do
+       if [ -n "$DIR" ]
+       then
+          if [ "$DIR" = ".." ]
+          then
+             ABS="${ABS%/*}"
+
+          elif [ "$DIR" != "." ]
+          then
+             ABS="$ABS/$DIR"
+          fi
+       fi
+    done
+    IFS=":"
+
+    echo $ABS
+    return 0
+} 
+
+######################################################################
+echo
+echo "UPP STABLE2DEB BUILDER"
+echo "CopyRight(c) 2008 By Massimo Del Fedele"
+echo
+
+# checks for parameters
+if [ x"$1" = x -o x"$2" = x ]
+then
+	echo "uppstable2deb <upp root> <dest folder>"
+	exit 1
+fi
+
+#sets up source and dest folder names
+src=$(rel2abs $1)
+dst=$(rel2abs $2)
+
+#locates 'uppdeb' and 'idebuild' scripts
+uppdeb="`which uppdeb`"
+if [ x$uppdeb = x ]
+then
+	# couldn't find it on path, just try on this script's path
+	LSOF=$(lsof -p $$ 2>/dev/null | grep -E "/"$(basename $0)"$")
+	uppdeb=$(echo $LSOF | sed -r s/'^([^\/]+)\/'/'\/'/1 2>/dev/null)
+	uppdeb=$(dirname $uppdeb)/uppdeb
+fi
+if [ ! -f $uppdeb ]
+then
+	echo "ERROR - Could not find 'uppdeb' script"
+	echo "Please check if it's on current path"
+	exit 1
+fi
+idebuild="`which idebuild`"
+if [ x$idebuild = x ]
+then
+	# couldn't find it on path, just try on this script's path
+	LSOF=$(lsof -p $$ 2>/dev/null | grep -E "/"$(basename $0)"$")
+	idebuild=$(echo $LSOF | sed -r s/'^([^\/]+)\/'/'\/'/1 2>/dev/null)
+	idebuild=$(dirname $idebuild)/idebuild
+fi
+if [ ! -f $idebuild ]
+then
+	echo "ERROR - Could not find 'idebuild' script"
+	echo "Please check if it's on current path"
+	exit 1
+fi
+
+#checks if source folder is an upp folder
+for name in uppsrc Common examples tutorial reference bazaar
+do
+	if [ ! -d $src/$name ]
+	then
+		echo "bad source folder '$src'"
+		echo "missing '$src/$name' subfolder"
+		exit 1
+	fi
+done
+
+#gets release number from uppsrc/ide/version.h
+release="`cat $src/uppsrc/ide/version.h`"
+release=${release#*\"}
+release=${release%%\"*}
+echo "building .deb for release $release"
+
+#creates a temporary folder for executable file
+outtmp="`mktemp -t -d uppstable2deb.XXXXXXX`"
+
+#build theide
+echo "building TheIDE......"
+$idebuild $src $outtmp/theide
+if [ $? = 0 ]
+then
+	true
+else
+	echo "Error building TheIDE"
+	echo "Please check executables for errors"
+	exit 1
+fi
+
+#creates the deb package
+echo "Creating package......"
+$uppdeb $src $outtmp/theide-dev $dst $release
+result=$?
+
+#remove temporary folder
+rm -rf $outtmp
diff --git a/linux_scripts/uppstable2deb b/linux_scripts/uppstable2deb
new file mode 100755
index 000000000..355e2cd5f
--- /dev/null
+++ b/linux_scripts/uppstable2deb
@@ -0,0 +1,132 @@
+#!/bin/bash
+# uppstable2deb
+# From a 'stable' source tree, batch builds theide and creates .deb package
+#
+
+######################################################################
+#convert a path to absolute one
+rel2abs()
+{
+    # make sure file is specified
+    if [ -z "$1" ]
+    then
+       echo "$0 <path>"
+       return 1
+    fi
+
+    # already absolute case
+    if [ "${1:0:1}" = "/" ] || [ "$PWD" = "/" ]
+    then
+       ABS=""
+    else
+       ABS="$PWD"
+    fi
+
+    # loop thru path
+    IFS="/"
+    for DIR in $1
+    do
+       if [ -n "$DIR" ]
+       then
+          if [ "$DIR" = ".." ]
+          then
+             ABS="${ABS%/*}"
+
+          elif [ "$DIR" != "." ]
+          then
+             ABS="$ABS/$DIR"
+          fi
+       fi
+    done
+    IFS=":"
+
+    echo $ABS
+    return 0
+} 
+
+######################################################################
+echo
+echo "UPP STABLE2DEB BUILDER"
+echo "CopyRight(c) 2008 By Massimo Del Fedele"
+echo
+
+# checks for parameters
+if [ x"$1" = x -o x"$2" = x ]
+then
+	echo "uppstable2deb <upp root> <dest folder>"
+	exit 1
+fi
+
+#sets up source and dest folder names
+src=$(rel2abs $1)
+dst=$(rel2abs $2)
+
+#locates 'uppdeb' and 'idebuild' scripts
+uppdeb="`which uppdeb`"
+if [ x$uppdeb = x ]
+then
+	# couldn't find it on path, just try on this script's path
+	LSOF=$(lsof -p $$ 2>/dev/null | grep -E "/"$(basename $0)"$")
+	uppdeb=$(echo $LSOF | sed -r s/'^([^\/]+)\/'/'\/'/1 2>/dev/null)
+	uppdeb=$(dirname $uppdeb)/uppdeb
+fi
+if [ ! -f $uppdeb ]
+then
+	echo "ERROR - Could not find 'uppdeb' script"
+	echo "Please check if it's on current path"
+	exit 1
+fi
+idebuild="`which idebuild`"
+if [ x$idebuild = x ]
+then
+	# couldn't find it on path, just try on this script's path
+	LSOF=$(lsof -p $$ 2>/dev/null | grep -E "/"$(basename $0)"$")
+	idebuild=$(echo $LSOF | sed -r s/'^([^\/]+)\/'/'\/'/1 2>/dev/null)
+	idebuild=$(dirname $idebuild)/idebuild
+fi
+if [ ! -f $idebuild ]
+then
+	echo "ERROR - Could not find 'idebuild' script"
+	echo "Please check if it's on current path"
+	exit 1
+fi
+
+#checks if source folder is an upp folder
+for name in uppsrc Common examples tutorial reference bazaar
+do
+	if [ ! -d $src/$name ]
+	then
+		echo "bad source folder '$src'"
+		echo "missing '$src/$name' subfolder"
+		exit 1
+	fi
+done
+
+#gets release number from uppsrc/ide/version.h
+release="`cat $src/uppsrc/ide/version.h`"
+release=${release#*\"}
+release=${release%%\"*}
+echo "building .deb for release $release"
+
+#creates a temporary folder for executable file
+outtmp="`mktemp -t -d uppstable2deb.XXXXXXX`"
+
+#build theide
+echo "building TheIDE......"
+$idebuild $src $outtmp/theide
+if [ $? = 0 ]
+then
+	true
+else
+	echo "Error building TheIDE"
+	echo "Please check executables for errors"
+	exit 1
+fi
+
+#creates the deb package
+echo "Creating package......"
+$uppdeb $src $outtmp/theide $dst $release
+result=$?
+
+#remove temporary folder
+rm -rf $outtmp
diff --git a/linux_scripts/uppsvn2deb b/linux_scripts/uppsvn2deb
new file mode 100755
index 000000000..a453f25dc
--- /dev/null
+++ b/linux_scripts/uppsvn2deb
@@ -0,0 +1,162 @@
+#!/bin/bash
+# uppsvn2deb
+# Updates svn, batch builds theide and creates .deb package
+#
+
+######################################################################
+#convert a path to absolute one
+rel2abs()
+{
+    # make sure file is specified
+    if [ -z "$1" ]
+    then
+       echo "$0 <path>"
+       return 1
+    fi
+
+    # already absolute case
+    if [ "${1:0:1}" = "/" ] || [ "$PWD" = "/" ]
+    then
+       ABS=""
+    else
+       ABS="$PWD"
+    fi
+
+    # loop thru path
+    IFS="/"
+    for DIR in $1
+    do
+       if [ -n "$DIR" ]
+       then
+          if [ "$DIR" = ".." ]
+          then
+             ABS="${ABS%/*}"
+
+          elif [ "$DIR" != "." ]
+          then
+             ABS="$ABS/$DIR"
+          fi
+       fi
+    done
+    IFS=":"
+
+    echo $ABS
+    return 0
+} 
+
+######################################################################
+echo
+echo "UPP SVN2DEB BUILDER"
+echo "CopyRight(c) 2008 By Massimo Del Fedele"
+echo
+
+# checks for parameters
+if [ x"$1" = x -o x"$2" = x ]
+then
+	echo "uppsvn2deb <upp svn root> <dest folder>"
+	exit 1
+fi
+
+#sets up source and dest folder names
+src=$(rel2abs $1)
+dst=$(rel2abs $2)
+
+#locates 'uppdeb' and 'idebuild' scripts
+uppdeb="`which uppdeb`"
+if [ x$uppdeb = x ]
+then
+	# couldn't find it on path, just try on this script's path
+	LSOF=$(lsof -p $$ 2>/dev/null | grep -E "/"$(basename $0)"$")
+	uppdeb=$(echo $LSOF | sed -r s/'^([^\/]+)\/'/'\/'/1 2>/dev/null)
+	uppdeb=$(dirname $uppdeb)/uppdeb
+fi
+if [ ! -f $uppdeb ]
+then
+	echo "ERROR - Could not find 'uppdeb' script"
+	echo "Please check if it's on current path"
+	exit 1
+fi
+idebuild="`which idebuild`"
+if [ x$idebuild = x ]
+then
+	# couldn't find it on path, just try on this script's path
+	LSOF=$(lsof -p $$ 2>/dev/null | grep -E "/"$(basename $0)"$")
+	idebuild=$(echo $LSOF | sed -r s/'^([^\/]+)\/'/'\/'/1 2>/dev/null)
+	idebuild=$(dirname $idebuild)/idebuild
+fi
+if [ ! -f $idebuild ]
+then
+	echo "ERROR - Could not find 'idebuild' script"
+	echo "Please check if it's on current path"
+	exit 1
+fi
+
+#checks if source folder is an upp svn folder
+if [ -d $src/.svn ]
+then
+	true
+else
+	echo "Source folder is not an SVN one."
+	exit 1
+fi
+for name in uppsrc examples tutorial reference bazaar
+do
+	if [ ! -d $src/$name ]
+	then
+		echo "bad source folder '$src'"
+		echo "missing '$src/$name' subfolder"
+		exit 1
+	fi
+done
+
+#do an svn update in svn folder, just to be sure that's the latest
+cd $src
+
+#gets svn release
+if [ -e ./.svn/entries ]
+then
+    while read release
+    do
+        if [ "$release" = "dir" ]
+        then
+            read release
+            break
+        fi
+    done < ./.svn/entries
+else
+    echo "$0: error: file not found!"
+    exit 1
+fi
+
+echo "building .deb for SVN release $release"
+
+#now patch uppsrc/ide/version.h file to match current svn build
+mv $src/uppsrc/ide/version.h $src/uppsrc/ide/version.h.BACKUP
+echo "#define IDE_VERSION    \"SVN.$release\"" > $src/uppsrc/ide/version.h
+
+#creates a temporary folder for executable file
+outtmp="`mktemp -t -d uppsvn2deb.XXXXXXX`"
+
+#build theide
+echo "building TheIDE......"
+$idebuild $src $outtmp/theide-svn
+if [ $? = 0 ]
+then
+	true
+else
+	echo "Error building TheIDE"
+	echo "Please check executables for errors"
+	exit 1
+fi
+
+#creates the deb package
+echo "Creating package......"
+$uppdeb $src $outtmp/theide-svn $dst SVN.$release
+result=$?
+
+#resets uppsrc/ide/version.h file
+rm $src/uppsrc/ide/version.h
+mv $src/uppsrc/ide/version.h.BACKUP $src/uppsrc/ide/version.h
+
+#remove temporary folder
+rm -rf $outtmp
diff --git a/reference/AK/AK.h b/reference/AK/AK.h
new file mode 100644
index 000000000..afd4784c2
--- /dev/null
+++ b/reference/AK/AK.h
@@ -0,0 +1,32 @@
+#ifndef _AK_AK_h
+#define _AK_AK_h
+
+#include <CtrlLib/CtrlLib.h>
+
+using namespace Upp;
+
+#define KEYGROUPNAME "AK"
+#define KEYNAMESPACE AKKeys
+#define KEYFILE      <AK/AK.key>
+#include             <CtrlLib/key_header.h>
+
+#define KEYGROUPNAME "Setup"
+#define KEYFILE      <AK/Setup.key>
+#include             <CtrlLib/key_header.h>
+
+class App : public TopWindow {
+	MenuBar menubar;
+
+	void Fn(String text);
+	void AkMenu(Bar& menu);
+	void SetupMenu(Bar& menu);
+	void MainMenu(Bar& menu);
+	void SetBar();
+	void SetLang(int lang);
+
+public:
+	typedef App CLASSNAME;
+	App();
+};
+
+#endif
diff --git a/reference/AK/AK.key b/reference/AK/AK.key
new file mode 100644
index 000000000..f212be7c0
--- /dev/null
+++ b/reference/AK/AK.key
@@ -0,0 +1,3 @@
+KEY(FN1, "First function", K_CTRL_M)
+KEY(FN2, t_("Second function"), K_CTRL_W)
+KEY(EXIT, t_("Exit"), K_CTRL_Q)
diff --git a/reference/AK/AK.upp b/reference/AK/AK.upp
new file mode 100644
index 000000000..f44ecde59
--- /dev/null
+++ b/reference/AK/AK.upp
@@ -0,0 +1,17 @@
+description "The definition and use of redefinable key accelerators";
+
+uses
+	CtrlLib;
+
+file
+	AK.h,
+	AK.key,
+	Setup.key,
+	setup.cpp,
+	main.cpp,
+	ak.t charset "UTF-8",
+	ak.icpp;
+
+mainconfig
+	"" = "GUI";
+
diff --git a/reference/AK/Group1.key b/reference/AK/Group1.key
new file mode 100644
index 000000000..294c3cd76
--- /dev/null
+++ b/reference/AK/Group1.key
@@ -0,0 +1,2 @@
+KEY(UNTRANSLATED, "Untranslated", K_CTRL_U)
+KEY(TRANSLATED, t_("Translated"), K_CTRL_S)
diff --git a/reference/AK/Setup.key b/reference/AK/Setup.key
new file mode 100644
index 000000000..af54c3199
--- /dev/null
+++ b/reference/AK/Setup.key
@@ -0,0 +1,3 @@
+KEY(ENGLISH, t_("English"), K_CTRL_E)
+KEY(CZECH, t_("Czech"), K_CTRL_R)
+KEY(KEYS, t_("Setup keys"), K_CTRL_K)
diff --git a/reference/AK/ak.icpp b/reference/AK/ak.icpp
new file mode 100644
index 000000000..1b42aa600
--- /dev/null
+++ b/reference/AK/ak.icpp
@@ -0,0 +1,4 @@
+#include "AK.h"
+
+#define  TFILE <AK/ak.t>
+#include <Core/t.h>
diff --git a/reference/AK/ak.t b/reference/AK/ak.t
new file mode 100644
index 000000000..5121f00e9
--- /dev/null
+++ b/reference/AK/ak.t
@@ -0,0 +1,26 @@
+
+// AK.key
+
+T_("Second function")
+csCZ("Druhá funkce")
+
+T_("Exit")
+csCZ("Konec")
+
+
+// Setup.key
+
+T_("English")
+csCZ("Anglicky")
+
+T_("Czech")
+csCZ("Česky")
+
+T_("Setup keys")
+csCZ("Nastavit klávesy")
+
+
+// main.cpp
+
+T_("Setup")
+csCZ("Nastavení")
diff --git a/reference/AK/main.cpp b/reference/AK/main.cpp
new file mode 100644
index 000000000..153b5a2a5
--- /dev/null
+++ b/reference/AK/main.cpp
@@ -0,0 +1,42 @@
+#include "AK.h"
+
+#define KEYGROUPNAME "AK"
+#define KEYNAMESPACE AKKeys
+#define KEYFILE      <AK/AK.key>
+#include             <CtrlLib/key_source.h>
+
+using namespace AKKeys;
+
+void App::Fn(String text)
+{
+	PromptOK(text);
+}
+
+void App::AkMenu(Bar& menu)
+{
+	menu.Add(AK_FN1, THISBACK1(Fn, "1"));
+	menu.Add(AK_FN2, THISBACK1(Fn, "2"));
+	menu.Add(AK_EXIT, THISBACK(Close));
+}
+
+void App::MainMenu(Bar& menu)
+{
+	menu.Add("AK", THISBACK(AkMenu));
+	menu.Add(t_("Setup"), THISBACK(SetupMenu));
+}
+
+App::App()
+{
+	SetLang(LNGC_('E','N','U','S', CHARSET_UTF8));
+	AddFrame(menubar);
+	menubar.Set(THISBACK(MainMenu));
+	Sizeable();
+}
+
+GUI_APP_MAIN
+{
+	String keyfile = ConfigFile("keys.key");
+	RestoreKeys(LoadFile(keyfile));
+	App().Run();
+	SaveFile(keyfile, StoreKeys());
+}
diff --git a/reference/AK/setup.cpp b/reference/AK/setup.cpp
new file mode 100644
index 000000000..e157c9fd8
--- /dev/null
+++ b/reference/AK/setup.cpp
@@ -0,0 +1,21 @@
+#include "AK.h"
+
+#define KEYGROUPNAME "Setup"
+#define KEYFILE      <AK/Setup.key>
+#include             <CtrlLib/key_source.h>
+
+void App::SetLang(int lang)
+{
+	SetLanguage(lang);
+	menubar.Set(THISBACK(MainMenu));
+}
+
+void App::SetupMenu(Bar& menu)
+{
+	menu.Add(AK_ENGLISH, THISBACK1(SetLang, LNGC_('E','N','U','S', CHARSET_UTF8)))
+	    .Radio(GetCurrentLanguage() == LNGC_('E','N','U','S', CHARSET_UTF8));
+	menu.Add(AK_CZECH, THISBACK1(SetLang, LNGC_('C','S','C','Z', CHARSET_UTF8)))
+	    .Radio(GetCurrentLanguage() == LNGC_('C','S','C','Z', CHARSET_UTF8));
+	menu.Separator();
+	menu.Add(AK_KEYS, callback(EditKeys));
+}
diff --git a/reference/ArrayCtrl/ArrayCtrl.upp b/reference/ArrayCtrl/ArrayCtrl.upp
new file mode 100644
index 000000000..4ffc99a18
--- /dev/null
+++ b/reference/ArrayCtrl/ArrayCtrl.upp
@@ -0,0 +1,11 @@
+description "Basic usage of ArrayCtrl";
+
+uses
+	CtrlLib;
+
+file
+	main.cpp,
+	dlg.lay;
+
+mainconfig
+	"" = "GUI";
diff --git a/reference/ArrayCtrl/dlg.lay b/reference/ArrayCtrl/dlg.lay
new file mode 100644
index 000000000..433709d4f
--- /dev/null
+++ b/reference/ArrayCtrl/dlg.lay
@@ -0,0 +1,6 @@
+LAYOUT(DlgLayout, 424, 304)
+	ITEM(ArrayCtrl, array, LeftPosZ(4, 412).TopPosZ(4, 236))
+	ITEM(Label, dv___1, SetLabel(t_("Attached editor")).LeftPosZ(4, 88).TopPosZ(244, 19))
+	ITEM(EditString, editor, LeftPosZ(96, 320).TopPosZ(244, 19))
+	ITEM(Button, exit, SetLabel(t_("Close")).LeftPosZ(360, 56).TopPosZ(272, 24))
+END_LAYOUT
diff --git a/reference/ArrayCtrl/main.cpp b/reference/ArrayCtrl/main.cpp
new file mode 100644
index 000000000..6260d1ad8
--- /dev/null
+++ b/reference/ArrayCtrl/main.cpp
@@ -0,0 +1,65 @@
+#include <CtrlLib/CtrlLib.h>
+
+using namespace Upp;
+
+#define LAYOUTFILE <ArrayCtrl/dlg.lay>
+#include <CtrlCore/lay.h>
+
+struct ArrayCtrlExample : public WithDlgLayout<TopWindow> {
+	EditIntSpin myedit;
+
+	void DoubleClick();
+
+	typedef ArrayCtrlExample CLASSNAME;
+
+	ArrayCtrlExample();
+};
+
+Id ID1("ID1");
+Id ID2("ID2");
+Id ID3("ID3");
+
+struct MyConvert : public Convert {
+	Value Format(const Value& v) const {
+		ValueArray va = v;
+		return String().Cat() << va[0] << " - " << va[1] << " - " << va[2];
+	}
+};
+
+struct MyDisplay : public Display {
+	virtual void Paint(Draw& w, const Rect& r, const Value& q,
+	                   Color ink, Color paper, dword style) const {
+		w.DrawRect(r, paper);
+		w.DrawEllipse(r, q);
+	}
+};
+
+void ArrayCtrlExample::DoubleClick()
+{
+	if(array.IsCursor())
+		PromptOK(String().Cat() << "ID1: " << array.Get(ID1) << ", first column" << array.Get(0));
+}
+
+ArrayCtrlExample::ArrayCtrlExample()
+{
+	CtrlLayoutExit(*this, "ArrayCtrl example");
+
+	array.AddColumn("integer");
+	array.AddIndex(ID1);
+	array.AddColumn(ID2, "combined").Add(ID1).AddIndex(ID3).SetConvert(Single<MyConvert>());
+	array.AddColumn("editable").Edit(myedit);
+	array.AddColumn("with display").SetDisplay(Single<MyDisplay>());
+	array.AddCtrl(editor);
+	array.AddRowNumColumn("rownum");
+	array.WhenLeftDouble = THISBACK(DoubleClick);
+	array.ColumnWidths("51 120 60 102 62");
+
+	for(int i = 0; i < 20; i++)
+		array.Add(i, AsString(i * 10), GetSysDate(), i * 3, rand() % 1000,
+		          Color(byte(i * 77), byte(i * 200), byte(i * 135)), FormatIntRoman(i));
+}
+
+GUI_APP_MAIN
+{
+	ArrayCtrlExample().Run();
+}
diff --git a/reference/ArrayCtrlCtrls/ArrayCtrlCtrls.upp b/reference/ArrayCtrlCtrls/ArrayCtrlCtrls.upp
new file mode 100644
index 000000000..b92a9136d
--- /dev/null
+++ b/reference/ArrayCtrlCtrls/ArrayCtrlCtrls.upp
@@ -0,0 +1,11 @@
+description "Columns with widget class in ArrayCtrl";
+
+uses
+	CtrlLib;
+
+file
+	main.cpp;
+
+mainconfig
+	"" = "GUI";
+
diff --git a/reference/ArrayCtrlCtrls/main.cpp b/reference/ArrayCtrlCtrls/main.cpp
new file mode 100644
index 000000000..cc2963325
--- /dev/null
+++ b/reference/ArrayCtrlCtrls/main.cpp
@@ -0,0 +1,17 @@
+#include <CtrlLib/CtrlLib.h>
+
+using namespace Upp;
+
+GUI_APP_MAIN
+{
+	ArrayCtrl a;
+	a.AddColumn("Text").Ctrls<EditString>();
+	for(int i = 0; i < 300; i++)
+		a.Add(AsString(i));
+	a.SetLineCy(Draw::GetStdFontCy() + 8);
+
+	TopWindow app;
+	app.Add(a.SizePos());
+	app.Sizeable();
+	app.Run();
+}
diff --git a/reference/ArrayCtrlDnD/ArrayCtrlDnD.upp b/reference/ArrayCtrlDnD/ArrayCtrlDnD.upp
new file mode 100644
index 000000000..d8dc86e45
--- /dev/null
+++ b/reference/ArrayCtrlDnD/ArrayCtrlDnD.upp
@@ -0,0 +1,11 @@
+description "Drag&Drop with ArrayCtrl as target";
+
+uses
+	CtrlLib;
+
+file
+	main.cpp;
+
+mainconfig
+	"" = "GUI";
+
diff --git a/reference/ArrayCtrlDnD/main.cpp b/reference/ArrayCtrlDnD/main.cpp
new file mode 100644
index 000000000..bccf31b42
--- /dev/null
+++ b/reference/ArrayCtrlDnD/main.cpp
@@ -0,0 +1,85 @@
+#include <CtrlLib/CtrlLib.h>
+
+using namespace Upp;
+
+struct App : TopWindow {
+	ArrayCtrl a, b;
+	Splitter  s;
+
+	void DnD(PasteClip& d)
+	{
+		if(AcceptText(d)) {
+			a.Add(GetString(d), GetString(d));
+			a.SetFocus();
+		}
+	}
+
+	void DnDInsert(int line, PasteClip& d)
+	{
+		if(AcceptInternal<ArrayCtrl>(d, "array")) {
+			a.InsertDrop(line, d);
+			a.SetFocus();
+		}
+		if(AcceptText(d)) {
+			a.Insert(line);
+			a.Set(line, 0, GetString(d));
+			a.SetCursor(line);
+			a.SetFocus();
+		}
+	}
+
+	void DnDInsertB(int line, PasteClip& d)
+	{
+		if(AcceptInternal<ArrayCtrl>(d, "array")) {
+			const ArrayCtrl& src = GetInternal<ArrayCtrl>(d);
+			bool self = &src == &b;
+			Vector< Vector<Value> > data;
+			for(int i = 0; i < src.GetCount(); i++)
+				if(src.IsSel(i)) {
+					Value v = src.Get(i, 0);
+					data.Add().Add(IsNumber(v) ? FormatIntRoman((int)src.Get(i, 0)) : String(v));
+				}
+			b.InsertDrop(line, data, d, self);
+			b.SetFocus();
+		}
+	}
+
+	void Drag()
+	{
+		if(a.DoDragAndDrop(InternalClip(a, "array")) == DND_MOVE)
+			a.RemoveSelection();
+	}
+
+	void DragB()
+	{
+		if(b.DoDragAndDrop(InternalClip(b, "array"), b.GetDragSample()) == DND_MOVE)
+			b.RemoveSelection();
+	}
+
+	typedef App CLASSNAME;
+
+	App() {
+		a.AddColumn("You can paste the text here too");
+		a.MultiSelect();
+		a.WhenDropInsert = THISBACK(DnDInsert);
+		a.WhenDrop = THISBACK(DnD);
+		a.WhenDrag = THISBACK(Drag);
+
+		b.AddColumn("Roman numbers");
+		b.MultiSelect();
+		b.WhenDropInsert = THISBACK(DnDInsertB);
+		b.WhenDrag = THISBACK(DragB);
+
+		Add(s.Horz(a, b));
+		for(int i = 0; i < 200; i++) {
+			a.Add(i);
+			b.Add(FormatIntRoman(i, true));
+		}
+		Sizeable();
+	}
+};
+
+GUI_APP_MAIN
+{
+	App().Run();
+}
diff --git a/reference/ArrayCtrlEdits/ArrayCtrlEdits.lay b/reference/ArrayCtrlEdits/ArrayCtrlEdits.lay
new file mode 100644
index 000000000..4976d7c96
--- /dev/null
+++ b/reference/ArrayCtrlEdits/ArrayCtrlEdits.lay
@@ -0,0 +1,6 @@
+LAYOUT(AppLayout, 416, 132)
+	ITEM(ArrayCtrl, list, LeftPosZ(4, 300).TopPosZ(4, 124))
+	ITEM(EditInt, editor, LeftPosZ(308, 104).TopPosZ(4, 19))
+	ITEM(Option, option, SetLabel(t_("Option")).LeftPosZ(308, 104).TopPosZ(28, 15))
+END_LAYOUT
+
diff --git a/reference/ArrayCtrlEdits/ArrayCtrlEdits.upp b/reference/ArrayCtrlEdits/ArrayCtrlEdits.upp
new file mode 100644
index 000000000..dfed9ddb2
--- /dev/null
+++ b/reference/ArrayCtrlEdits/ArrayCtrlEdits.upp
@@ -0,0 +1,12 @@
+description "Embedded widgets in ArrayCtrl";
+
+uses
+	CtrlLib;
+
+file
+	main.cpp,
+	ArrayCtrlEdits.lay;
+
+mainconfig
+	"" = "GUI";
+
diff --git a/reference/ArrayCtrlEdits/main.cpp b/reference/ArrayCtrlEdits/main.cpp
new file mode 100644
index 000000000..f34da4e79
--- /dev/null
+++ b/reference/ArrayCtrlEdits/main.cpp
@@ -0,0 +1,43 @@
+#include <CtrlLib/CtrlLib.h>
+
+using namespace Upp;
+
+#define LAYOUTFILE <ArrayCtrlEdits/ArrayCtrlEdits.lay>
+#include <CtrlCore/lay.h>
+
+struct App : public WithAppLayout<TopWindow> {
+	EditDouble editdbl;
+
+	typedef App CLASSNAME;
+	App();
+};
+
+struct SqrNumberConvert : Convert {
+	virtual Value Format(const Value& q) const {
+		return IsNull(q) ? (double)Null : (double)q * (double)q;
+	}
+};
+
+void EditDblMinMaxFactory(One<Ctrl>& ctrl)
+{
+	ctrl.Create<EditDouble>().MinMax(0, 1);
+}
+
+App::App()
+{
+	CtrlLayout(*this);
+	list.AddColumn("Number").Edit(editdbl);
+	list.AddColumnAt(0, "Number^2").SetConvert(Single<SqrNumberConvert>());
+	list.AddColumn("Text").Ctrls<EditString>();
+	list.AddColumn("Limited number").Ctrls(EditDblMinMaxFactory);
+	list.AddCtrl(editor);
+	list.AddCtrl(option);
+	list.Appending().Removing();
+	list.SetLineCy(EditField::GetStdHeight());
+	list.ColumnWidths("49 63 74 96");
+}
+
+GUI_APP_MAIN
+{
+	App().Run();
+}
diff --git a/reference/ArrayCtrlSetCtrl/ArrayCtrlSetCtrl.upp b/reference/ArrayCtrlSetCtrl/ArrayCtrlSetCtrl.upp
new file mode 100644
index 000000000..7543eaf9a
--- /dev/null
+++ b/reference/ArrayCtrlSetCtrl/ArrayCtrlSetCtrl.upp
@@ -0,0 +1,11 @@
+description "Embedding non-owned widgets into ArrayCtrl";
+
+uses
+	CtrlLib;
+
+file
+	main.cpp;
+
+mainconfig
+	"" = "GUI";
+
diff --git a/reference/ArrayCtrlSetCtrl/main.cpp b/reference/ArrayCtrlSetCtrl/main.cpp
new file mode 100644
index 000000000..cacdc4a0f
--- /dev/null
+++ b/reference/ArrayCtrlSetCtrl/main.cpp
@@ -0,0 +1,34 @@
+#include <CtrlLib/CtrlLib.h>
+
+using namespace Upp;
+
+struct App : TopWindow {
+	Array<Option> option;
+	ArrayCtrl a;
+	
+	void Do(int ii)
+	{
+		option[ii].SetFocus();
+		for(int i = 0; i < option.GetCount(); i++)
+			option[i].Enable(i == ii || option[ii]);
+	}
+	
+	typedef App CLASSNAME;
+	
+	App() {
+		a.AddColumn("Option");
+		for(int i = 0; i < 300; i++) {
+			a.Add(bool(i & 4));
+			a.SetCtrl(i, 0, option.Add().SetLabel("Option " + AsString(i)));
+			option.Top() <<= THISBACK1(Do, i);
+		}
+		a.SetLineCy(Draw::GetStdFontCy() + 8);
+		Add(a.SizePos());
+		Sizeable();
+	}
+};
+
+GUI_APP_MAIN
+{
+	App().Run();
+}
diff --git a/reference/CParser/CParser.upp b/reference/CParser/CParser.upp
new file mode 100644
index 000000000..d16516b7f
--- /dev/null
+++ b/reference/CParser/CParser.upp
@@ -0,0 +1,11 @@
+description "Using CParser for simple expression evaluator";
+
+uses
+	Core;
+
+file
+	main.cpp;
+
+mainconfig
+	"" = "";
+
diff --git a/reference/CParser/main.cpp b/reference/CParser/main.cpp
new file mode 100644
index 000000000..16373b555
--- /dev/null
+++ b/reference/CParser/main.cpp
@@ -0,0 +1,85 @@
+#include <Core/Core.h>
+
+using namespace Upp;
+
+VectorMap<String, double> var;
+
+double Exp(CParser& p);
+
+double Term(CParser& p)
+{
+	if(p.Id("abs")) {
+		p.PassChar('(');
+		double x = Exp(p);
+		p.PassChar(')');
+		return fabs(x);
+	}
+	if(p.IsId())
+		return var.Get(p.ReadId(), 0);
+	if(p.Char('(')) {
+		double x = Exp(p);
+		p.PassChar(')');
+		return x;
+	}
+	return p.ReadDouble();
+}
+
+double Mul(CParser& p)
+{
+	double x = Term(p);
+	for(;;)
+		if(p.Char('*'))
+			x = x * Term(p);
+		else
+		if(p.Char('/')) {
+			double y = Term(p);
+			if(y == 0)
+				p.ThrowError("Divide by zero");
+			x = x / y;
+		}
+		else
+			return x;
+}
+
+double Exp(CParser& p)
+{
+	double x = Mul(p);
+	for(;;)
+		if(p.Char('+'))
+			x = x + Mul(p);
+		else
+		if(p.Char('-'))
+			x = x - Mul(p);
+		else
+			return x;
+}
+
+CONSOLE_APP_MAIN
+{
+	for(;;) {
+		Cout() << "Expresion: ";
+		String l = ReadStdIn();
+		if(l.IsEmpty())
+			break;
+		CParser p(l);
+		try {
+			String id;
+			if(p.IsId()) {
+				CParser::Pos pos = p.GetPos();
+				id = p.ReadId();
+				if(p.Char('=')) {
+					double x = Exp(p);
+					Cout() << id << " <- " << x << '\n';
+					var.GetAdd(id) = x;
+					goto done;
+				}
+				p.SetPos(pos);
+			}
+			Cout() << Exp(p) << '\n';
+		done:;
+		}
+		catch(CParser::Error e) {
+			Cout() << "ERROR: " << e << '\n';
+		}
+	}
+}
diff --git a/reference/Callback/Callback.upp b/reference/Callback/Callback.upp
new file mode 100644
index 000000000..1ff573a5e
--- /dev/null
+++ b/reference/Callback/Callback.upp
@@ -0,0 +1,11 @@
+description "Basic Callbacks";
+
+uses
+	Core;
+
+file
+	main.cpp;
+
+mainconfig
+	"" = "";
+
diff --git a/reference/Callback/main.cpp b/reference/Callback/main.cpp
new file mode 100644
index 000000000..ae447030b
--- /dev/null
+++ b/reference/Callback/main.cpp
@@ -0,0 +1,66 @@
+#include <Core/Core.h>
+
+using namespace Upp;
+
+struct Foo {
+	int x;
+
+	void Action()                { Cout() << "Action: " << x << '\n'; }
+	void ActionWithParam(int y)  { Cout() << "ActionWithParam: " << x + y << '\n'; }
+
+	Callback WhenDo;
+	void Do()                    { WhenDo(); }
+
+	Foo(int x = 0) : x(x) {}
+};
+
+void Fn()
+{
+	Cout() << "Fn!" << '\n';
+}
+
+struct Bar {
+	Foo foo;
+
+	void Action() { Cout() << "foo's Do called\n"; }
+
+	typedef Bar CLASSNAME;
+
+	Bar() { foo.WhenDo = THISBACK(Action); }
+};
+
+struct Safe : Pte<Safe> {
+	void Action() { Cout() << "safe action!\n"; }
+};
+
+CONSOLE_APP_MAIN
+{
+	Foo a(10);
+	Callback cb1 = callback(&a, &Foo::Action);
+	Callback cb2 = callback(Fn);
+	Callback1<int> cb3 = callback(&a, &Foo::ActionWithParam);
+	Callback cb4 = callback1(&a, &Foo::ActionWithParam, 30);
+
+	cb1();
+	cb2();
+	cb3(10);
+	cb4();
+
+	Cout() << "---------\n";
+	cb4 << cb2;
+	cb4();
+
+	Cout() << "---------\n";
+	Bar b;
+	b.foo.Do();
+
+	Cout() << "---------\n";
+	{
+		Safe f;
+		cb4 = pteback(&f, &Safe::Action);
+		Cout() << "callback valid: " << (bool)cb4 << '\n';
+		cb4();
+	}
+	Cout() << "callback valid: " << (bool)cb4 << '\n';
+	cb4();
+}
diff --git a/reference/CallbackArgTarget/CallbackArgTarget.upp b/reference/CallbackArgTarget/CallbackArgTarget.upp
new file mode 100644
index 000000000..c655da9e9
--- /dev/null
+++ b/reference/CallbackArgTarget/CallbackArgTarget.upp
@@ -0,0 +1,11 @@
+description "\"value\" return callback";
+
+uses
+	CtrlLib;
+
+file
+	main.cpp;
+
+mainconfig
+	"" = "GUI";
+
diff --git a/reference/CallbackArgTarget/main.cpp b/reference/CallbackArgTarget/main.cpp
new file mode 100644
index 000000000..e2338f00e
--- /dev/null
+++ b/reference/CallbackArgTarget/main.cpp
@@ -0,0 +1,16 @@
+#include <CtrlLib/CtrlLib.h>
+
+using namespace Upp;
+
+GUI_APP_MAIN
+{
+	CallbackArgTarget<int> result;
+	MenuBar menu;
+	for(int i = 0; i < 10; i++)
+		menu.Add(AsString(i), result[i]);
+	menu.Execute();
+	if(IsNull(result))
+		PromptOK("Menu was cancelled");
+	else
+		PromptOK("You have selected " + AsString((int)result));
+}
diff --git a/reference/CallbackProxy/CallbackProxy.cpp b/reference/CallbackProxy/CallbackProxy.cpp
new file mode 100644
index 000000000..026689334
--- /dev/null
+++ b/reference/CallbackProxy/CallbackProxy.cpp
@@ -0,0 +1,23 @@
+#include <Core/Core.h>
+
+using namespace Upp;
+
+void Foo()
+{
+	LOG("Foo");
+}
+
+void Bar()
+{
+	LOG("Bar");
+}
+
+CONSOLE_APP_MAIN
+{
+	Callback a, b;
+	a = Proxy(b);
+	b = callback(Foo);
+	a();
+	b = callback(Bar);
+	a();
+}
diff --git a/reference/CallbackProxy/CallbackProxy.upp b/reference/CallbackProxy/CallbackProxy.upp
new file mode 100644
index 000000000..81d301ef4
--- /dev/null
+++ b/reference/CallbackProxy/CallbackProxy.upp
@@ -0,0 +1,11 @@
+description "Callback to Callback";
+
+uses
+	Core;
+
+file
+	CallbackProxy.cpp;
+
+mainconfig
+	"" = "";
+
diff --git a/reference/Chameleon/Chameleon.iml b/reference/Chameleon/Chameleon.iml
new file mode 100644
index 000000000..b5ddc99e6
--- /dev/null
+++ b/reference/Chameleon/Chameleon.iml
@@ -0,0 +1,40 @@
+IMAGE_BEGIN(B)
+	IMAGE_SCAN("\1����\0\0\0\1���")
+	IMAGE_SCAN("\1\0\0\0�\0\377\377\1\0\0\0")
+	IMAGE_SCAN("\7\0\0\0\0\377\377�\0\0_EEKmmA��\0\377\377\1\0\0\0")
+	IMAGE_SCAN("\7\0\0\0\0\377\377_EEPccA��7��\0\377\377\1\0\0\0")
+	IMAGE_SCAN("\7\0\0\0\0\377\377KmmA��2��#��\0\377\377\1\0\0\0")
+	IMAGE_SCAN("\5\0\0\0\0\377\377A��7��#���\0\377\377\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\0\377\377\1\0\0\0")
+	IMAGE_SCAN("\1����\0\0\0\1���")
+IMAGE_PACKED(B, "\2\10\0\0\0\10\0\0\0\2\0\0\0\2\0\0\0\0\0\0\0")
+IMAGE_BEGIN(Bh)
+	IMAGE_SCAN("\1����\0\0\0\1���")
+	IMAGE_SCAN("\1\0\0\0���\0\1\0\0\0")
+	IMAGE_SCAN("\7\0\0\0��\0�\0\0_EEKmmA����\0\1\0\0\0")
+	IMAGE_SCAN("\7\0\0\0��\0_EEPccA��7����\0\1\0\0\0")
+	IMAGE_SCAN("\7\0\0\0��\0KmmA��2��#����\0\1\0\0\0")
+	IMAGE_SCAN("\7\0\0\0��\0A��7��#��\0\377\377��\0\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0���\0\1\0\0\0")
+	IMAGE_SCAN("\1����\0\0\0\1���")
+IMAGE_PACKED(Bh, "\2\10\0\0\0\10\0\0\0\2\0\0\0\2\0\0\0\0\0\0\0")
+IMAGE_BEGIN(Bp)
+	IMAGE_SCAN("\1����\0\0\0\1���")
+	IMAGE_SCAN("\1\0\0\0�\0\0\377\1\0\0\0")
+	IMAGE_SCAN("\2\0\0\0\0\0\377�\377\0\377\1\0\0\377\1\0\0\0")
+	IMAGE_SCAN("\2\0\0\0\0\0\377�\377\0\377\1\0\0\377\1\0\0\0")
+	IMAGE_SCAN("\2\0\0\0\0\0\377�\377\0\377\1\0\0\377\1\0\0\0")
+	IMAGE_SCAN("\2\0\0\0\0\0\377�\377\0\377\1\0\0\377\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\0\0\377\1\0\0\0")
+	IMAGE_SCAN("\1����\0\0\0\1���")
+IMAGE_PACKED(Bp, "\2\10\0\0\0\10\0\0\0\2\0\0\0\2\0\0\0\0\0\0\0")
+IMAGE_BEGIN(Bd)
+	IMAGE_SCAN("\1����\0\0\0\1���")
+	IMAGE_SCAN("\1\0\0\0����\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0����\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0����\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0����\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0����\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0����\1\0\0\0")
+	IMAGE_SCAN("\1����\0\0\0\1���")
+IMAGE_PACKED(Bd, "\2\10\0\0\0\10\0\0\0\2\0\0\0\2\0\0\0\0\0\0\0")
diff --git a/reference/Chameleon/Chameleon.lay b/reference/Chameleon/Chameleon.lay
new file mode 100644
index 000000000..29eaf43e3
--- /dev/null
+++ b/reference/Chameleon/Chameleon.lay
@@ -0,0 +1,8 @@
+LAYOUT(ChameleonLayout, 228, 68)
+	ITEM(Button, host, SetLabel(t_("Host")).LeftPosZ(8, 68).TopPosZ(8, 24))
+	ITEM(Button, std, SetLabel(t_("Standard")).LeftPosZ(80, 68).TopPosZ(8, 24))
+	ITEM(Button, classic, SetLabel(t_("Classic")).LeftPosZ(152, 68).TopPosZ(8, 24))
+	ITEM(Button, color, SetLabel(t_("Color")).LeftPosZ(8, 68).TopPosZ(36, 24))
+	ITEM(Button, img, SetLabel(t_("Image")).LeftPosZ(80, 68).TopPosZ(36, 24))
+	ITEM(Button, fn, SetLabel(t_("Function")).LeftPosZ(152, 68).TopPosZ(36, 24))
+END_LAYOUT
diff --git a/reference/Chameleon/Chameleon.upp b/reference/Chameleon/Chameleon.upp
new file mode 100644
index 000000000..51f5c4c52
--- /dev/null
+++ b/reference/Chameleon/Chameleon.upp
@@ -0,0 +1,13 @@
+description "Skinning Button using Chameleon";
+
+uses
+	CtrlLib;
+
+file
+	main.cpp,
+	Chameleon.lay,
+	Chameleon.iml;
+
+mainconfig
+	"" = "GUI";
+
diff --git a/reference/Chameleon/main.cpp b/reference/Chameleon/main.cpp
new file mode 100644
index 000000000..48ad35a2d
--- /dev/null
+++ b/reference/Chameleon/main.cpp
@@ -0,0 +1,126 @@
+#include <CtrlLib/CtrlLib.h>
+
+using namespace Upp;
+
+#define LAYOUTFILE <Chameleon/Chameleon.lay>
+#include <CtrlCore/lay.h>
+
+#define IMAGECLASS MyButtonImg
+#define IMAGEFILE <Chameleon/Chameleon.iml>
+#include <Draw/iml.h>
+
+struct ChEllipse {
+	int   width;
+	Color pen;
+	Color color;
+
+	ChEllipse() : width(width), pen(pen), color(color) {}
+};
+
+Value EllipseLook(int width, Color pen, Color color)
+{
+	ChEllipse e;
+	e.width = width;
+	e.pen = pen;
+	e.color = color;
+	return RawToValue(e);
+}
+
+Value MyLookFn(Draw& w, const Rect& rect, const Value& v, int op) {
+	if(IsTypeRaw<ChEllipse>(v)) {
+		const ChEllipse& e = ValueTo<ChEllipse>(v);
+		switch(op) {
+		case LOOK_MARGINS:
+			return Rect(e.width, e.width, e.width, e.width);
+		case LOOK_ISOPAQUE:
+			return false;
+		case LOOK_PAINT:
+			w.DrawEllipse(rect, e.color, e.width, e.pen);
+			return 1;
+		}
+	}
+	return Null;
+}
+
+INITBLOCK {
+	ChLookFn(MyLookFn);
+}
+
+Button::Style ColorStyle()
+{
+	Button::Style s = Button::StyleNormal();
+	s.look[0] = LtCyan();
+	s.look[1] = Yellow();
+	s.look[2] = Brown();
+	s.look[3] = Gray();
+	return s;
+}
+
+Button::Style ImageStyle()
+{
+	Button::Style s = Button::StyleNormal();
+	for(int i = 0; i < 4; i++)
+		s.look[i] = MyButtonImg::Get(i);
+	s.pressoffset = Point(1, -1);
+	return s;
+}
+
+Button::Style FnStyle()
+{
+	Button::Style s = Button::StyleNormal().Write();
+	s.look[0] = EllipseLook(2, Black, LtGray);
+	s.look[1] = EllipseLook(3, Red, WhiteGray);
+	s.look[2] = EllipseLook(4, Blue, White);
+	s.look[3] = EllipseLook(1, Black, Gray);
+	return s;
+}
+
+void ColorSkin()
+{
+	Button::StyleNormal().Write() = ColorStyle();
+}
+
+void ImageSkin()
+{
+	Button::StyleNormal().Write() = ImageStyle();
+}
+
+void FnSkin()
+{
+	Button::StyleNormal().Write() = FnStyle();
+}
+
+struct MyApp : WithChameleonLayout<TopWindow> {
+	void Set(void (*skin)());
+	Button::Style scolor, simage, sfn;
+
+	typedef MyApp CLASSNAME;
+	MyApp();
+};
+
+void MyApp::Set(void (*skin)())
+{
+	SetSkin(skin);
+}
+
+MyApp::MyApp()
+{
+	CtrlLayout(*this, "Chameleon example");
+	host <<= THISBACK1(Set, ChHostSkin);
+	std <<= THISBACK1(Set, ChStdSkin);
+	classic <<= THISBACK1(Set, ChClassicSkin);
+	color <<= THISBACK1(Set, ColorSkin);
+	scolor = ColorStyle();
+	color.SetStyle(scolor);
+	img <<= THISBACK1(Set, ImageSkin);
+	simage= ImageStyle();
+	img.SetStyle(simage);
+	fn <<= THISBACK1(Set, FnSkin);
+	sfn = FnStyle();
+	fn.SetStyle(sfn);
+}
+
+GUI_APP_MAIN
+{
+	MyApp().Run();
+}
diff --git a/reference/CoWork/CoWork.upp b/reference/CoWork/CoWork.upp
new file mode 100644
index 000000000..4f430e021
--- /dev/null
+++ b/reference/CoWork/CoWork.upp
@@ -0,0 +1,10 @@
+description "Using CoWork for loop parallelisation";
+
+uses
+	CtrlLib;
+
+file
+	main.cpp;
+
+mainconfig
+	"" = "GUI MT";
diff --git a/reference/CoWork/init b/reference/CoWork/init
new file mode 100644
index 000000000..fbf40794e
--- /dev/null
+++ b/reference/CoWork/init
@@ -0,0 +1,4 @@
+#ifndef _CoWork_icpp_init_stub
+#define _CoWork_icpp_init_stub
+#include "CtrlLib/init"
+#endif
diff --git a/reference/CoWork/main.cpp b/reference/CoWork/main.cpp
new file mode 100644
index 000000000..d61b92358
--- /dev/null
+++ b/reference/CoWork/main.cpp
@@ -0,0 +1,77 @@
+#include <CtrlLib/CtrlLib.h>
+
+using namespace Upp;
+
+class App : public TopWindow {
+public:
+	virtual void LeftDown(Point, dword);
+	virtual void Paint(Draw& w);
+
+private:
+	String text;
+	bool   cowork;
+	int    phase;
+
+	void   SyncTitle();
+
+public:
+	typedef App CLASSNAME;
+
+	App& Text(const String& t)     { text = t; Refresh(); return *this; }
+
+	App();
+};
+
+App::App()
+{
+	BackPaint();
+	Zoomable().Sizeable();
+	cowork = true;
+	phase = 0;
+	SyncTitle();
+}
+
+void App::SyncTitle()
+{
+	Title(cowork ? "Now using all CPU cores (click the image for single core)"
+	             : "Now using single CPU core (click the image to use all cores)");
+}
+
+void App::LeftDown(Point, dword)
+{
+	cowork = !cowork;
+	SyncTitle();
+}
+
+void DoLine(RGBA *line, int phase, int y, Size sz)
+{
+	Point c = sz / 2;
+	c = Point(int(sin((double)phase / 131) * c.x + c.x), int(sin((double)phase / 127) * c.y + c.y));
+	int yy = (y - c.y) * (y - c.y);
+	for(int x = 0; x < sz.cx; x++) {
+		double d = (x - c.x) * (x - c.x) + yy;
+		line[x] = GrayColor((int)(120 + 120 * sin(d / 1000 - (double)phase / 5)));
+	}
+}
+
+void App::Paint(Draw& w)
+{
+	Size sz = GetSize();
+	ImageBuffer ib(sz);
+	if(cowork) {
+		CoWork co;
+		for(int y = 0; y < sz.cy; y++)
+			co & callback4(DoLine, ib[y], phase, y, sz);
+	}
+	else
+		for(int y = 0; y < sz.cy; y++)
+			DoLine(ib[y], phase, y, sz);
+	w.DrawImage(0, 0, ib);
+	Refresh();
+	phase++;
+}
+
+GUI_APP_MAIN
+{
+	App().Run();
+}
diff --git a/reference/ColumnListDnD/ColumnListDnD.upp b/reference/ColumnListDnD/ColumnListDnD.upp
new file mode 100644
index 000000000..7daca6cdb
--- /dev/null
+++ b/reference/ColumnListDnD/ColumnListDnD.upp
@@ -0,0 +1,10 @@
+description "Drag&Drop with ColumnList";
+
+uses
+	CtrlLib;
+
+file
+	main.cpp;
+
+mainconfig
+	"" = "GUI";
diff --git a/reference/ColumnListDnD/main.cpp b/reference/ColumnListDnD/main.cpp
new file mode 100644
index 000000000..110b6d4df
--- /dev/null
+++ b/reference/ColumnListDnD/main.cpp
@@ -0,0 +1,60 @@
+#include <CtrlLib/CtrlLib.h>
+
+using namespace Upp;
+
+class MyApp : public TopWindow {
+public:
+	typedef MyApp CLASSNAME;
+
+	ColumnList list;
+
+	void DropInsert(int i, PasteClip& d)
+	{
+		if(AcceptText(d))
+			list.Insert(i, GetString(d));
+		if(AcceptInternal<ColumnList>(d, "mydrag"))
+			list.InsertDrop(i, d);
+	}
+
+	void DropSum(int ii, PasteClip& d) {
+		if(AcceptInternal<ColumnList>(d, "mydrag")) {
+			const ColumnList& src = GetInternal<ColumnList>(d);
+			int sum = 0;
+			for(int i = 0; i < src.GetCount(); i++)
+				if(src.IsSel(i))
+					sum += atoi(~String(src[i]));
+			list.Set(ii, AsString(sum));
+			d.SetAction(DND_COPY);
+			list.SetCursor(ii);
+		}
+	}
+	
+	void Drag()
+	{
+		if(list.DoDragAndDrop(InternalClip(list, "mydrag"), list.GetDragSample()) == DND_MOVE)
+			list.RemoveSelection();
+	}
+
+	MyApp()
+	{
+		SetRect(0, 0, 228, 356);
+		Add(list.SizePos());
+
+		list.Columns(3);
+		list.MultiSelect();
+		list.WhenDropInsert = THISBACK(DropInsert);
+		list.WhenDropItem = THISBACK(DropSum);
+		
+		list.WhenDrag = THISBACK(Drag);
+
+		for(int i = 0; i < 500; i++)
+			list.Add(AsString(i));
+	}
+};
+
+GUI_APP_MAIN
+{
+	MyApp w;
+
+	w.Run();
+}
diff --git a/reference/Common/Common.cpp b/reference/Common/Common.cpp
new file mode 100644
index 000000000..1465890da
--- /dev/null
+++ b/reference/Common/Common.cpp
@@ -0,0 +1,51 @@
+#include <Core/Core.h>
+
+using namespace Upp;
+
+struct Foo : Moveable< Foo, Comparable<Foo> > {
+	String a;
+	int    b;
+
+	String   ToString() const            { return String().Cat() << '(' << a << ", " << b << ')'; }
+	unsigned GetHashValue() const        { return CombineHash() << a << b; }
+	int      Compare(const Foo& x) const { return CombineCompare(a, x.a)(b, x.b); }
+	void     Serialize(Stream& s)        { s % a % b; }
+	void     Xmlize(XmlIO xml)           { xml("text", a)("number", b); }
+	bool     IsNullInstance() const      { return IsNull(a); }
+
+	Foo()                                {}
+};
+
+Foo RandFoo()
+{
+	Foo c;
+	c.a << (rand() & 3);
+	c.b = rand() & 3;
+	return c;
+}
+
+CONSOLE_APP_MAIN
+{
+	VectorMap<Foo, int> data;
+	for(int i = 0; i < 100; i++) {
+		Foo a = RandFoo();
+		Foo b = RandFoo();
+		LOG(a << " < " << b << " ... " << (a < b));
+		LOG(a << " == " << b << " ... " << (a == b));
+		DUMP(GetHashValue(a));
+		String x = StoreAsString(a);
+		LoadFromString(b, x);
+		DUMP(b);
+		LOG("--------------");
+		data.GetAdd(a, 0)++;
+	}
+	Vector<int> q = GetSortOrder(data.GetKeys());
+	for(int i = 0; i < data.GetCount(); i++)
+		LOG(data.GetKey(q[i]) << " ... " << data[q[i]]);
+	LOG("------");
+	LOG(StoreAsXML(data, "Foo"));
+	Foo a;
+	DUMP(IsNull(a));
+	a = RandFoo();
+	DUMP(IsNull(a));
+}
diff --git a/reference/Common/Common.upp b/reference/Common/Common.upp
new file mode 100644
index 000000000..c0e307977
--- /dev/null
+++ b/reference/Common/Common.upp
@@ -0,0 +1,11 @@
+description "Demonstration of common functions, methods and operators for concrete types";
+
+uses
+	Core;
+
+file
+	Common.cpp;
+
+mainconfig
+	"" = "";
+
diff --git a/reference/Convert/Convert.upp b/reference/Convert/Convert.upp
new file mode 100644
index 000000000..a59c8c2ac
--- /dev/null
+++ b/reference/Convert/Convert.upp
@@ -0,0 +1,11 @@
+description "Using Convert to alter EditField for editing binary numbers";
+
+uses
+	CtrlLib;
+
+file
+	main.cpp;
+
+mainconfig
+	"" = "GUI";
+
diff --git a/reference/Convert/main.cpp b/reference/Convert/main.cpp
new file mode 100644
index 000000000..21626749f
--- /dev/null
+++ b/reference/Convert/main.cpp
@@ -0,0 +1,53 @@
+#include <CtrlLib/CtrlLib.h>
+
+using namespace Upp;
+
+struct ConvertBin : Convert {
+	virtual Value  Format(const Value& q) const
+	{
+		return FormatIntBase(q, 2, 0, 0, 0);
+	}
+
+	virtual Value Scan(const Value& text) const
+	{
+		String txt = text;
+		int r = 0;
+		for(const char *s = txt; *s; s++)
+			if(*s == '1')
+				r = (r << 1) | 1;
+			else
+			if(*s == '0')
+				r <<= 1;
+		return r;
+	}
+
+	virtual int   Filter(int chr) const
+	{
+		return chr == '0' || chr == '1' ? chr : 0;
+	}
+};
+
+struct App : TopWindow {
+	EditField bin;
+	EditInt   dec;
+
+	void BinChanged()  { dec <<= ~bin; }
+	void DecChanged()  { bin <<= ~dec; }
+
+	typedef App CLASSNAME;
+
+	App()
+	{
+		SetRect(0, 0, 200, 50);
+		bin.SetConvert(Single<ConvertBin>());
+		Add(bin.HSizePos().TopPos(0, Ctrl::STDSIZE));
+		Add(dec.HSizePos().BottomPos(0, Ctrl::STDSIZE));
+		bin <<= THISBACK(BinChanged);
+		dec <<= THISBACK(DecChanged);
+	}
+};
+
+GUI_APP_MAIN
+{
+	App().Run();
+}
diff --git a/reference/Counter/Counter.cpp b/reference/Counter/Counter.cpp
new file mode 100644
index 000000000..de8760033
--- /dev/null
+++ b/reference/Counter/Counter.cpp
@@ -0,0 +1,38 @@
+#include "Counter.h"
+
+Value CounterCtrl::GetData() const
+{
+	return number;
+}
+
+void  CounterCtrl::SetData(const Value& v)
+{
+	number = v;
+	Refresh();
+}
+
+void  CounterCtrl::Paint(Draw& w)
+{
+	Size sz = GetSize();
+	w.DrawRect(sz, paper);
+	String txt = AsString(number);
+	sz = (sz - GetTextSize(txt, font)) / 2;
+	w.DrawText(sz.cx, sz.cy, txt, font, ink);
+}
+
+void  CounterCtrl::LeftDown(Point, dword)
+{
+	number++;
+	Refresh();
+}
+
+CounterCtrl::CounterCtrl()
+{
+	number = 0;
+	ink = SBlack;
+	paper = SWhite;
+	font = StdFont();
+	SetFrame(BlackFrame());
+}
+
+CounterCtrl::~CounterCtrl() {}
diff --git a/reference/Counter/Counter.h b/reference/Counter/Counter.h
new file mode 100644
index 000000000..ae519fd80
--- /dev/null
+++ b/reference/Counter/Counter.h
@@ -0,0 +1,29 @@
+#ifndef _T_Counter_Counter_h_
+#define _T_Counter_Counter_h_
+
+#include <CtrlLib/CtrlLib.h>
+
+using namespace Upp;
+
+class CounterCtrl : public Ctrl {
+public:
+	virtual Value GetData() const;
+	virtual void  SetData(const Value& v);
+	virtual void  Paint(Draw& w);
+	virtual void  LeftDown(Point, dword);
+
+private:
+	int   number;
+	Font  font;
+	Color ink, paper;
+
+public:
+	CounterCtrl& SetFont(Font f)   { font = f; Refresh(); return *this; }
+	CounterCtrl& Ink(Color c)      { ink = c; Refresh(); return *this; }
+	CounterCtrl& Paper(Color c)    { paper = c; Refresh(); return *this; }
+
+	CounterCtrl();
+	~CounterCtrl();
+};
+
+#endif
diff --git a/reference/Counter/Counter.upp b/reference/Counter/Counter.upp
new file mode 100644
index 000000000..ae5116d6d
--- /dev/null
+++ b/reference/Counter/Counter.upp
@@ -0,0 +1,10 @@
+description "Counter widget used in UscCtrl example";
+
+uses
+	CtrlLib;
+
+file
+	Counter.h,
+	Counter.cpp,
+	Counter.usc font 2;
+
diff --git a/reference/Counter/Counter.usc b/reference/Counter/Counter.usc
new file mode 100644
index 000000000..b8b6b87a1
--- /dev/null
+++ b/reference/Counter/Counter.usc
@@ -0,0 +1,20 @@
+ctrl CounterCtrl {
+	group "Example";
+
+	GetMinSize() { sz = GetTextSize("X"); sz.cy += 2; return sz; }
+	GetStdSize() { sz = GetMinSize(); sz.cx *= 7; return sz; }
+
+	Frame  SetFrame = BlackFrame() @2;
+	Font   SetFont = StdFont();
+	Color  Ink = :SBlack;
+	Color  Paper = :SWhite;
+
+	Paint(w) {
+		r = GetRect();
+		DrawCtrlFrame(w, r, .SetFrame);
+		w.DrawRect(r, .Paper);
+		textsize = GetTextSize("0", .SetFont);
+		w.DrawText((r.right + r.left - textsize.cx) / 2,
+		           (r.bottom + r.top - textsize.cy) / 2, "0", .SetFont, .Ink);
+	}
+};
diff --git a/reference/CtrlPos/CtrlPos.lay b/reference/CtrlPos/CtrlPos.lay
new file mode 100644
index 000000000..878f4ec49
--- /dev/null
+++ b/reference/CtrlPos/CtrlPos.lay
@@ -0,0 +1,4 @@
+#ifdef LAYOUTFILE
+
+#endif
+
diff --git a/reference/CtrlPos/CtrlPos.upp b/reference/CtrlPos/CtrlPos.upp
new file mode 100644
index 000000000..3a89e4111
--- /dev/null
+++ b/reference/CtrlPos/CtrlPos.upp
@@ -0,0 +1,11 @@
+description "Demonstration of logical positions system";
+
+uses
+	CtrlLib;
+
+file
+	main.cpp;
+
+mainconfig
+	"" = "GUI";
+
diff --git a/reference/CtrlPos/main.cpp b/reference/CtrlPos/main.cpp
new file mode 100644
index 000000000..534504b32
--- /dev/null
+++ b/reference/CtrlPos/main.cpp
@@ -0,0 +1,23 @@
+#include <CtrlLib/CtrlLib.h>
+
+using namespace Upp;
+
+GUI_APP_MAIN
+{
+	TopWindow w;
+	Array<LabelBox> l;
+	w.Add(l.Add().SetLabel("LeftPos(10, 180).TopPos(5, 20)").LeftPos(10, 180).TopPos(5, 20));
+	w.Add(l.Add().SetLabel("LeftPos(10, 180).BottomPos(5, 20)").LeftPos(10, 180).BottomPos(5, 20));
+	w.Add(l.Add().SetLabel("LeftPos(10, 180).VSizePos(50, 50)").LeftPos(10, 180).VSizePos(50, 50));
+	w.Add(l.Add().SetLabel("RightPos(10, 180).TopPos(5, 20)").RightPos(10, 180).TopPos(5, 20));
+	w.Add(l.Add().SetLabel("RightPos(10, 180).BottomPos(5, 20)").RightPos(10, 180).BottomPos(5, 20));
+	w.Add(l.Add().SetLabel("RightPos(10, 180).VSizePos(50, 50)").RightPos(10, 180).VSizePos(50, 50));
+	w.Add(l.Add().SetLabel("HSizePos(200, 200).TopPos(5, 20)").HSizePos(200, 200).TopPos(5, 20));
+	w.Add(l.Add().SetLabel("HSizePos(200, 200).BottomPos(5, 20)").HSizePos(200, 200).BottomPos(5, 20));
+	w.Add(l.Add().SetLabel("HSizePos(200, 200).VSizePos(50, 50)").HSizePos(200, 200).VSizePos(50, 50));
+	w.Add(l.Add().SetLabel("HCenterPos(180).TopPos(27, 20)").HCenterPos(180).TopPos(27, 20));
+	w.Add(l.Add().SetLabel("LeftPos(15, 170).VCenterPos(20)").LeftPos(15, 170).VCenterPos(20));
+	w.Add(l.Add().SetLabel("HCenterPos(180).VCenterPos(20)").HCenterPos(180).VCenterPos(20));
+	w.Sizeable().Zoomable();
+	w.Run();
+}
diff --git a/reference/CtrlRetriever/CtrlRetriever.lay b/reference/CtrlRetriever/CtrlRetriever.lay
new file mode 100644
index 000000000..303481c6d
--- /dev/null
+++ b/reference/CtrlRetriever/CtrlRetriever.lay
@@ -0,0 +1,11 @@
+#ifdef LAYOUTFILE
+
+LAYOUT(CtrlRetrieverLayout, 200, 88)
+	ITEM(Label, dv___0, SetLabel("Text").LeftPosZ(8, 32).TopPosZ(8, 19))
+	ITEM(EditString, text, LeftPosZ(44, 152).TopPosZ(8, 19))
+	ITEM(Option, option, SetLabel("Option").LeftPosZ(44, 108).TopPosZ(36, 15))
+	ITEM(Button, ok, SetLabel("OK").LeftPosZ(132, 64).TopPosZ(60, 24))
+END_LAYOUT
+
+#endif
+
diff --git a/reference/CtrlRetriever/CtrlRetriever.upp b/reference/CtrlRetriever/CtrlRetriever.upp
new file mode 100644
index 000000000..ded4adb9b
--- /dev/null
+++ b/reference/CtrlRetriever/CtrlRetriever.upp
@@ -0,0 +1,12 @@
+description "Using CtrlRetriever to edit C++ variables in dialog";
+
+uses
+	CtrlLib;
+
+file
+	main.cpp,
+	CtrlRetriever.lay;
+
+mainconfig
+	"" = "GUI";
+
diff --git a/reference/CtrlRetriever/main.cpp b/reference/CtrlRetriever/main.cpp
new file mode 100644
index 000000000..420e886a6
--- /dev/null
+++ b/reference/CtrlRetriever/main.cpp
@@ -0,0 +1,26 @@
+#include <CtrlLib/CtrlLib.h>
+
+using namespace Upp;
+
+#define LAYOUTFILE <CtrlRetriever/CtrlRetriever.lay>
+#include <CtrlCore/lay.h>
+
+GUI_APP_MAIN
+{
+	String text = "Some text";
+	bool   option = true;
+
+	WithCtrlRetrieverLayout<TopWindow> dlg;
+	CtrlLayoutOK(dlg, "CtrlRetriever example");
+	CtrlRetriever r;
+	r
+		(dlg.option, option)
+		(dlg.text, text)
+	;
+
+	dlg.Run();
+	r.Retrieve();
+
+	PromptOK(String().Cat() << "text: [* " << DeQtf(text) << "]&"
+	                        << "option: [* " << (option ? "true" : "false"));
+}
diff --git a/reference/CursorOverride/CursorOverride.upp b/reference/CursorOverride/CursorOverride.upp
new file mode 100644
index 000000000..dddc8f9dc
--- /dev/null
+++ b/reference/CursorOverride/CursorOverride.upp
@@ -0,0 +1,10 @@
+description "Temporarily overriding the mouse cursor shape";
+
+uses
+	CtrlLib;
+
+file
+	main.cpp;
+
+mainconfig
+	"" = "GUI";
diff --git a/reference/CursorOverride/main.cpp b/reference/CursorOverride/main.cpp
new file mode 100644
index 000000000..466dc7c3e
--- /dev/null
+++ b/reference/CursorOverride/main.cpp
@@ -0,0 +1,16 @@
+#include <CtrlLib/CtrlLib.h>
+
+using namespace Upp;
+
+struct App : TopWindow {
+	virtual void LeftDown(Point, dword) {
+		Image m = OverrideCursor(CtrlImg::exclamation());
+		Sleep(1000);
+		OverrideCursor(m);
+	}
+};
+
+GUI_APP_MAIN
+{
+	App().Run();
+}
diff --git a/reference/Display/Display.cpp b/reference/Display/Display.cpp
new file mode 100644
index 000000000..998fafa3b
--- /dev/null
+++ b/reference/Display/Display.cpp
@@ -0,0 +1,32 @@
+#include "CtrlLib/CtrlLib.h"
+
+using namespace Upp;
+
+struct FontFaceDisplay : Display {
+	virtual void Paint(Draw& w, const Rect& r, const Value& q,
+		               Color ink, Color paper, dword style) const
+	{
+		Font fnt = Font(q, r.Height() - 2);
+		String txt = Font::GetFaceName(q);
+		w.DrawRect(r, paper);
+		w.DrawText(r.left + 2, r.top + (r.Height() - GetTextSize(txt, fnt).cy) / 2, txt, fnt, ink);
+	}
+};
+
+struct MyApp : TopWindow {
+	DropList dl;
+
+	MyApp()
+	{
+		Add(dl.HSizePos().TopPos(5, Ctrl::STDSIZE));
+		dl.SetDisplay(Single<FontFaceDisplay>());
+		for(int i = 0; i < Font::GetFaceCount(); i++)
+			dl.Add(i);
+		SetRect(0, 0, 200, 70);
+	}
+};
+
+GUI_APP_MAIN
+{
+	MyApp().Run();
+}
diff --git a/reference/Display/Display.upp b/reference/Display/Display.upp
new file mode 100644
index 000000000..8055d32d6
--- /dev/null
+++ b/reference/Display/Display.upp
@@ -0,0 +1,11 @@
+description "Using Display to alter DropList to display fonts";
+
+uses
+	CtrlLib;
+
+file
+	Display.cpp;
+
+mainconfig
+	"" = "GUI";
+
diff --git a/reference/Drawing/Drawing.cpp b/reference/Drawing/Drawing.cpp
new file mode 100644
index 000000000..a2688fc48
--- /dev/null
+++ b/reference/Drawing/Drawing.cpp
@@ -0,0 +1,35 @@
+#include <CtrlLib/CtrlLib.h>
+
+using namespace Upp;
+
+struct App : public TopWindow {
+	Drawing dw;
+
+	void Paint(Draw& w) {
+		Size sz = GetSize();
+		w.DrawRect(sz, SWhite);
+		w.DrawDrawing(sz, dw);
+		w.DrawDrawing(0, 0, 200, 200, dw);
+		w.DrawDrawing(0, sz.cy - 100, 100, 100, dw);
+	}
+
+	App()
+	{
+		Sizeable();
+
+		DrawingDraw w(100, 100);
+		for(int i = 0; i < 10; i++)
+			w.DrawLine(50, 50,
+			           int(50 + 50 * sin(i * M_PI / 10)),
+			           int(50 + 50 * cos(i * M_PI / 10)),
+			           2, SLtGray);
+		Size sz = GetTextSize("DRAWING", Courier(16).Italic());
+		w.DrawText((100 - sz.cx) / 2, (100 - sz.cy) / 2, "DRAWING", Courier(16).Italic());
+		dw = w;
+	}
+};
+
+GUI_APP_MAIN
+{
+	App().Run();
+}
diff --git a/reference/Drawing/Drawing.upp b/reference/Drawing/Drawing.upp
new file mode 100644
index 000000000..9db928e6c
--- /dev/null
+++ b/reference/Drawing/Drawing.upp
@@ -0,0 +1,11 @@
+description "Using Drawing to store and paint pictures";
+
+uses
+	CtrlLib;
+
+file
+	Drawing.cpp;
+
+mainconfig
+	"" = "GUI";
+
diff --git a/reference/DropFiles/DropFiles.upp b/reference/DropFiles/DropFiles.upp
new file mode 100644
index 000000000..dfd44534b
--- /dev/null
+++ b/reference/DropFiles/DropFiles.upp
@@ -0,0 +1,10 @@
+description "Window that accepts drag&drop of files";
+
+uses
+	CtrlLib;
+
+file
+	main.cpp;
+
+mainconfig
+	"" = "GUI";
diff --git a/reference/DropFiles/main.cpp b/reference/DropFiles/main.cpp
new file mode 100644
index 000000000..69bb1d360
--- /dev/null
+++ b/reference/DropFiles/main.cpp
@@ -0,0 +1,40 @@
+#include <CtrlLib/CtrlLib.h>
+
+using namespace Upp;
+
+struct DndTest : public TopWindow {
+	virtual void Paint(Draw &w);
+	virtual void DragAndDrop(Point p, PasteClip& d);
+
+	Vector<String> files;
+
+	DndTest();
+};
+
+void DndTest::Paint(Draw &w)
+{
+	w.DrawRect(GetSize(), SColorPaper());
+	if(files.GetCount())
+		for(int i = 0; i < files.GetCount(); i++)
+			w.DrawText(2, 2 + i * Draw::GetStdFontCy(), files[i]);
+	else
+		w.DrawText(2, 2, "None");
+}
+
+void DndTest::DragAndDrop(Point p, PasteClip& d)
+{
+	if (AcceptFiles(d)) {
+		files = GetFiles(d);
+		Refresh();
+	}
+}
+
+DndTest::DndTest()
+{
+	Title("I need files!");
+}
+
+GUI_APP_MAIN
+{
+	DndTest().Run();
+}
diff --git a/reference/DynamicDlg/DynamicDlg.upp b/reference/DynamicDlg/DynamicDlg.upp
new file mode 100644
index 000000000..8c55c0096
--- /dev/null
+++ b/reference/DynamicDlg/DynamicDlg.upp
@@ -0,0 +1,12 @@
+description "Example of dynamic dialog creation (based on XML file)";
+
+uses
+	CtrlLib;
+
+file
+	dialog.xml,
+	main.cpp;
+
+mainconfig
+	"" = "GUI";
+
diff --git a/reference/DynamicDlg/dialog.xml b/reference/DynamicDlg/dialog.xml
new file mode 100644
index 000000000..a4d918e2f
--- /dev/null
+++ b/reference/DynamicDlg/dialog.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<dialog>
+	<option id="O1" label="Option"/>
+	<option id="O2" label="Another option"/>
+	<edit id="E1" label="Text"/>
+	<edit id="E2" label="Text2"/>
+</dialog>
\ No newline at end of file
diff --git a/reference/DynamicDlg/main.cpp b/reference/DynamicDlg/main.cpp
new file mode 100644
index 000000000..301731bbc
--- /dev/null
+++ b/reference/DynamicDlg/main.cpp
@@ -0,0 +1,52 @@
+#include <CtrlLib/CtrlLib.h>
+
+using namespace Upp;
+
+struct XmlDlg : public TopWindow {
+	Array<Label>           label;
+	ArrayMap<String, Ctrl> ctrl;
+
+	bool Load(const char *xml);
+};
+
+bool XmlDlg::Load(const char *xml)
+{
+	int y = 10;
+	try {
+		XmlParser p(xml);
+		while(!p.IsTag())
+			p.Skip();
+		p.PassTag("dialog");
+		int linecy = Draw::GetStdFontCy() + 4;
+		while(!p.End())
+			if(p.TagE("option")) {
+				Add(ctrl.Create<Option>(p["id"]).SetLabel(p["label"]).TopPos(y, linecy).LeftPos(10, 100));
+				y += linecy + 4;
+			}
+			else
+			if(p.TagE("edit")) {
+				Add(label.Add().SetLabel(p["label"]).TopPos(y, linecy).LeftPos(10, 30));
+				Add(ctrl.Create<EditString>(p["id"]).TopPos(y, linecy).LeftPos(40, 60));
+				y += linecy + 4;
+			}
+			else
+				p.Skip();
+	}
+	catch(XmlError e) {
+		Exclamation("XML error: " + e);
+		return false;
+	}
+	SetRect(0, 0, 110, y + 10);
+	return true;
+}
+
+GUI_APP_MAIN
+{
+	XmlDlg dlg;
+	if(!dlg.Load(LoadFile(GetDataFile("dialog.xml"))))
+		return;
+	dlg.Run();
+	int q = dlg.ctrl.Find("E1");
+	if(q >= 0)
+		PromptOK("E1 value: " + DeQtf(AsString(~dlg.ctrl[q])));
+}
diff --git a/reference/EscApp/EscApp.cpp b/reference/EscApp/EscApp.cpp
new file mode 100644
index 000000000..ba8c02d95
--- /dev/null
+++ b/reference/EscApp/EscApp.cpp
@@ -0,0 +1,41 @@
+#include <Esc/Esc.h>
+
+using namespace Upp;
+
+void SIC_Print(EscEscape& e)
+{
+	if(e[0].IsArray())
+		Cout() << (String) e[0];
+	else
+	if(e[0].IsNumber())
+		Cout() << e[0].GetNumber();
+	else
+	if(!e[0].IsVoid())
+		e.ThrowError("invalid argument to 'Print'");
+}
+
+void SIC_Input(EscEscape& e)
+{
+	e = ReadStdIn();
+}
+
+void SIC_InputNumber(EscEscape& e)
+{
+	e = atof(ReadStdIn());
+}
+
+CONSOLE_APP_MAIN
+{
+	ArrayMap<String, EscValue> global;
+	Escape(global, "Print(x)", SIC_Print);
+	Escape(global, "Input()", SIC_Input);
+	Escape(global, "InputNumber()", SIC_InputNumber);
+	StdLib(global);
+	try {
+		Scan(global, LoadFile(GetDataFile("script.esc")));
+		Execute(global, "main", INT_MAX);
+	}
+	catch(CParser::Error e) {
+		Cout() << "ERROR: " << e << "\n";
+	}
+}
diff --git a/reference/EscApp/EscApp.upp b/reference/EscApp/EscApp.upp
new file mode 100644
index 000000000..a0f3b0ab5
--- /dev/null
+++ b/reference/EscApp/EscApp.upp
@@ -0,0 +1,13 @@
+description "Using Esc scripting language in U++ application";
+
+uses
+	Core,
+	Esc;
+
+file
+	EscApp.cpp,
+	script.esc;
+
+mainconfig
+	"" = "";
+
diff --git a/reference/EscApp/script.esc b/reference/EscApp/script.esc
new file mode 100644
index 000000000..f111f5670
--- /dev/null
+++ b/reference/EscApp/script.esc
@@ -0,0 +1,36 @@
+getnumber()
+{
+	for(;;) {
+		h = InputNumber();
+		if(h > 0)
+			return h;
+		Print("Please enter a positive number!\n");
+	}
+}
+
+main() {
+	Print("What is your name?\n");
+	name = Input();
+	Print("Hi " + name + "!\n");
+	Print("How tall are you? (in cm please!)\n");
+	h = getnumber();
+	Print("What is your weight? (in kg please!)\n");
+	w = getnumber();
+	bmi = w / (h * h / 10000);
+	Print("Your body mass index is " + to_string(bmi) + "\n");
+	Print(name + ", ");
+	if(bmi >= 35)
+		Print("you are morbidly fat!!!");
+	else
+	if(bmi >= 30)
+		Print("you are fat!!!");
+	else
+	if(bmi >= 25)
+		Print("you are overweight!");
+	else
+	if(bmi >= 18.5)
+		Print("your weight is OK.");
+	else
+		Print("your are too slim!");
+	Print("\nThanks for a nice chat!\n");
+}
diff --git a/reference/Events/Events.cpp b/reference/Events/Events.cpp
new file mode 100644
index 000000000..edcfe1a86
--- /dev/null
+++ b/reference/Events/Events.cpp
@@ -0,0 +1,228 @@
+#include <CtrlLib/CtrlLib.h>
+
+using namespace Upp;
+
+struct App : TopWindow {
+	ArrayCtrl  log;
+
+	void Log(const String& s)
+	{
+		log.Add(s);
+		log.GoEnd();
+	}
+
+	virtual void   Activate()
+	{
+		Log("Activate");
+	}
+
+	virtual void   Deactivate()
+	{
+		Log("Deactivate");
+	}
+
+	virtual Image  FrameMouseEvent(int event, Point p, int zdelta, dword keyflags)
+	{
+		if(event != CURSORIMAGE)
+			Log(Format("FrameMouseEvent(%d, Point(%d, %d), %d, %x)",
+			           event, p.x, p.y, zdelta, (int)keyflags));
+		return TopWindow::FrameMouseEvent(event, p, zdelta, keyflags);
+	}
+
+	virtual Image  MouseEvent(int event, Point p, int zdelta, dword keyflags)
+	{
+		if(event != CURSORIMAGE)
+			Log(Format("MouseEvent(%d, Point(%d, %d), %d, %x)",
+			           event, p.x, p.y, zdelta, (int)keyflags));
+		return TopWindow::MouseEvent(event, p, zdelta, keyflags);
+	}
+
+	virtual void   MouseEnter(Point p, dword keyflags)
+	{
+		Log(Format("MouseEnter(Point(%d, %d), %x)", p.x, p.y, (int)keyflags));
+	}
+
+	virtual void   MouseMove(Point p, dword keyflags)
+	{
+		Log(Format("MouseMove(Point(%d, %d), %x)", p.x, p.y, (int)keyflags));
+	}
+
+	virtual void   LeftDown(Point p, dword keyflags)
+	{
+		Log(Format("LeftDown(Point(%d, %d), %x)", p.x, p.y, (int)keyflags));
+		SetFocus();
+	}
+
+	virtual void   LeftDouble(Point p, dword keyflags)
+	{
+		Log(Format("LeftDouble(Point(%d, %d), %x)", p.x, p.y, (int)keyflags));
+	}
+
+	virtual void LeftTriple(Point p, dword keyflags)
+	{
+		Log(Format("LeftTriple(Point(%d, %d), %x)", p.x, p.y, (int)keyflags));
+	}
+	
+	virtual void LeftDrag(Point p, dword keyflags) {
+		Log(Format("LeftDrag(Point(%d, %d), %x)", p.x, p.y, (int)keyflags));
+	}
+	
+	virtual void LeftHold(Point p, dword keyflags) {
+		Log(Format("LeftHold(Point(%d, %d), %x)", p.x, p.y, (int)keyflags));
+	}
+
+	virtual void   LeftRepeat(Point p, dword keyflags)
+	{
+		Log(Format("LeftRepeat(Point(%d, %d), %x)", p.x, p.y, (int)keyflags));
+	}
+
+	virtual void   LeftUp(Point p, dword keyflags)
+	{
+		Log(Format("LeftUp(Point(%d, %d), %x)", p.x, p.y, (int)keyflags));
+	}
+
+	virtual void   RightDown(Point p, dword keyflags)
+	{
+		Log(Format("RightDown(Point(%d, %d), %x)", p.x, p.y, (int)keyflags));
+	}
+
+	virtual void   RightDouble(Point p, dword keyflags)
+	{
+		Log(Format("RightDouble(Point(%d, %d), %x)", p.x, p.y, (int)keyflags));
+	}
+
+	virtual void RightTriple(Point p, dword keyflags)
+	{
+		Log(Format("RightTriple(Point(%d, %d), %x)", p.x, p.y, (int)keyflags));
+	}
+	
+	virtual void RightDrag(Point p, dword keyflags) {
+		Log(Format("RightDrag(Point(%d, %d), %x)", p.x, p.y, (int)keyflags));
+	}
+	
+	virtual void RightHold(Point p, dword keyflags) {
+		Log(Format("RightHold(Point(%d, %d), %x)", p.x, p.y, (int)keyflags));
+	}
+
+	virtual void   RightRepeat(Point p, dword keyflags)
+	{
+		Log(Format("RightRepeat(Point(%d, %d), %x)", p.x, p.y, (int)keyflags));
+	}
+
+	virtual void   RightUp(Point p, dword keyflags)
+	{
+		Log(Format("RightUp(Point(%d, %d), %x)", p.x, p.y, (int)keyflags));
+	}
+
+	virtual void   MiddleDown(Point p, dword keyflags)
+	{
+		Log(Format("MiddleDown(Point(%d, %d), %x)", p.x, p.y, (int)keyflags));
+	}
+
+	virtual void   MiddleDouble(Point p, dword keyflags)
+	{
+		Log(Format("MiddleDouble(Point(%d, %d), %x)", p.x, p.y, (int)keyflags));
+	}
+
+	virtual void MiddleTriple(Point p, dword keyflags)
+	{
+		Log(Format("MiddleTriple(Point(%d, %d), %x)", p.x, p.y, (int)keyflags));
+	}
+	
+	virtual void MiddleDrag(Point p, dword keyflags) {
+		Log(Format("MiddleDrag(Point(%d, %d), %x)", p.x, p.y, (int)keyflags));
+	}
+	
+	virtual void MiddleHold(Point p, dword keyflags) {
+		Log(Format("MiddleHold(Point(%d, %d), %x)", p.x, p.y, (int)keyflags));
+	}
+
+	virtual void   MiddleRepeat(Point p, dword keyflags)
+	{
+		Log(Format("MiddleRepeat(Point(%d, %d), %x)", p.x, p.y, (int)keyflags));
+	}
+
+	virtual void   MiddleUp(Point p, dword keyflags)
+	{
+		Log(Format("MiddleUp(Point(%d, %d), %x)", p.x, p.y, (int)keyflags));
+	}
+
+	virtual void   MouseWheel(Point p, int zdelta, dword keyflags)
+	{
+		Log(Format("MouseWheel(Point(%d, %d), %d, %x)", p.x, p.y, zdelta, (int)keyflags));
+	}
+
+	virtual void   MouseLeave()
+	{
+		Log("MouseLeave");
+	}
+
+	virtual Image  CursorImage(Point p, dword keyflags)
+	{
+		return keyflags & K_CTRL ? CtrlImg::swap_color_cursor() : Image::Arrow();
+	}
+
+	virtual bool   Key(dword key, int count)
+	{
+		Log(Format("Key(%x, %d) ", (int)key, count) + GetKeyDesc(key));
+		return false;
+	}
+
+	virtual bool   WKey(dword key, int count)
+	{
+		Log(Format("WKey(%x, %d) ", (int)key, count) + GetKeyDesc(key));
+		return false;
+	}
+
+	virtual void   GotFocus()
+	{
+		Log("GotFocus");
+	}
+
+	virtual void   LostFocus()
+	{
+		Log("LostFocus");
+	}
+
+	virtual bool   HotKey(dword key)
+	{
+		Log(Format("HotKey(%x) ", (int)key) + GetKeyDesc(key));
+		return false;
+	}
+
+	virtual void   ChildGotFocus()
+	{
+		Log("ChildGotFocus");
+	}
+
+	virtual void   ChildLostFocus()
+	{
+		Log("ChildLostFocus");
+	}
+
+	virtual void   Layout()
+	{
+		Log("Layout");
+	}
+
+	App()
+	{
+		SetFrame(InsetFrame());
+		AddFrame(InsetFrame());
+		AddFrame(InsetFrame());
+		AddFrame(InsetFrame());
+		log.AddColumn("");
+		log.NoHeader();
+		Add(log.HSizePos().BottomPos(0, 200));
+	}
+
+	~App()
+	{
+		Shutdown();
+	}
+};
+
+GUI_APP_MAIN
+{
+	App().Run();
+}
diff --git a/reference/Events/Events.upp b/reference/Events/Events.upp
new file mode 100644
index 000000000..9fc1112e2
--- /dev/null
+++ b/reference/Events/Events.upp
@@ -0,0 +1,11 @@
+description "Demonstration of basic input events";
+
+uses
+	CtrlLib;
+
+file
+	Events.cpp;
+
+mainconfig
+	"" = "GUI";
+
diff --git a/reference/Format/Format.cpp b/reference/Format/Format.cpp
new file mode 100644
index 000000000..2e83960e2
--- /dev/null
+++ b/reference/Format/Format.cpp
@@ -0,0 +1,79 @@
+#include <Core/Core.h>
+
+using namespace Upp;
+
+CONSOLE_APP_MAIN
+{
+	SetLanguage(LNG_ENGLISH);
+
+	DUMP(Format("%d, %s", 123, "TEXT"));
+	DUMP(Format("%2:s, %1:d", 123, "TEXT"));
+	DUMP(Format("%010d", 123));
+	DUMP(Format("%0*d", 11, 123));
+	DUMP(Format("|%20<d|", 123));
+	DUMP(Format("|%20>d|", 123));
+	DUMP(Format("|%20=d|", 123));
+	DUMP(Format("%d`pt", 123));
+	DUMP(Format("%[empty]~d, %[empty]~d", 123, Null));
+
+	DUMP(Format("%`", 123));
+
+	DUMP(Format("%c", 65));
+	DUMP(Format("%d", 123));
+	DUMP(Format("%i", 123));
+	DUMP(Format("%o", 123));
+	DUMP(Format("%x", 123));
+	DUMP(Format("%X", 123));
+
+	DUMP(Format("%e", 1.23));
+	DUMP(Format("%E", 1.23));
+	DUMP(Format("%f", 1.23));
+	DUMP(Format("%g", 1.23));
+	DUMP(Format("%G", 1.23));
+
+	DUMP(Format("%n", 1.23));
+	DUMP(Format("%n", 1.23));
+	DUMP(Format("%ne", 1.23));
+	DUMP(Format("%nf", 1.23e30));
+	DUMP(Format("%nl", 1.23));
+	DUMP(Format("%v", 1.23));
+	DUMP(Format("%ve", 1.23));
+	DUMP(Format("%vf", 1.23e30));
+	DUMP(Format("%vl", 1.23));
+
+
+	DUMP(Format("%[1:one;2:two;3:three;another]s", 2));
+	DUMP(Format("%[1:one;2:two;3:three;another]s", 20));
+	DUMP(Format("%[3%1:one;2:two;3:three;another]s", 20));
+
+	DUMP(Format("%month", 6));
+	DUMP(Format("%Month", 6));
+	DUMP(Format("%MONTH", 6));
+	DUMP(Format("%mon", 6));
+	DUMP(Format("%Mon", 6));
+	DUMP(Format("%MON", 6));
+	DUMP(Format("%day", 6));
+	DUMP(Format("%Day", 6));
+	DUMP(Format("%DAY", 6));
+	DUMP(Format("%dy", 6));
+	DUMP(Format("%Dy", 6));
+	DUMP(Format("%DY", 6));
+	DUMP(Format("%tw", 0));
+	DUMP(Format("%tw", 5));
+	DUMP(Format("%tw", 15));
+	DUMP(Format("%0tw", 15));
+
+	DUMP(Format("%a", 1));
+	DUMP(Format("%a", 123));
+	DUMP(Format("%A", 1));
+	DUMP(Format("%A", 123));
+	DUMP(Format("%r", 8));
+	DUMP(Format("%R", 1231));
+
+	DUMP(Format("%`", GetSysDate()));
+	DUMP(Format("%`", GetSysTime()));
+	DUMP(Format("%`", "text"));
+
+	SetLanguage(LNG_('C', 'S', 'C', 'Z'));
+	DUMP(Format("%`", GetSysDate()));
+}
diff --git a/reference/Format/Format.upp b/reference/Format/Format.upp
new file mode 100644
index 000000000..2c80b2c44
--- /dev/null
+++ b/reference/Format/Format.upp
@@ -0,0 +1,11 @@
+description "Formatting Strings";
+
+uses
+	Core;
+
+file
+	Format.cpp;
+
+mainconfig
+	"" = "";
+
diff --git a/reference/Frame/Frame.upp b/reference/Frame/Frame.upp
new file mode 100644
index 000000000..32f44a4a2
--- /dev/null
+++ b/reference/Frame/Frame.upp
@@ -0,0 +1,11 @@
+description "Demonstration of widget frames";
+
+uses
+	CtrlLib;
+
+file
+	main.cpp;
+
+mainconfig
+	"" = "GUI";
+
diff --git a/reference/Frame/main.cpp b/reference/Frame/main.cpp
new file mode 100644
index 000000000..a6c830f1a
--- /dev/null
+++ b/reference/Frame/main.cpp
@@ -0,0 +1,91 @@
+#include <CtrlLib/CtrlLib.h>
+
+using namespace Upp;
+
+struct Frame1 : CtrlFrame {
+	virtual void FrameLayout(Rect& r) {
+		r.left += 20;
+	}
+	virtual void FrameAddSize(Size& sz) {
+		sz.cx += 20;
+	}
+	virtual void FramePaint(Draw& w, const Rect& r) {
+		w.DrawRect(r.left, r.top, 20, r.Height(), SLtGreen);
+	}
+};
+
+struct Frame2 : Frame1 {
+	Button x;
+
+	virtual void FrameLayout(Rect& r) {
+		x.SetFrameRect(r.left, r.top, 16, 16);
+		r.left += 16;
+	}
+	virtual void FrameAddSize(Size& sz) {
+		sz.cx += 16;
+	}
+	virtual void FramePaint(Draw& w, const Rect& r) {
+		w.DrawRect(r.left, r.top + 16, 20, r.Height() - 16, SLtMagenta);
+	}
+	virtual void FrameAdd(Ctrl& parent) {
+		parent.Add(x);
+	}
+	virtual void FrameRemove() {
+		x.Remove();
+	}
+
+	Frame2() {
+		x.LeftPos(0, 16).TopPos(0, 16).NoWantFocus();
+	}
+};
+
+struct CtrlSelfFrame : Ctrl, CtrlFrame
+{
+    virtual void FrameLayout(Rect &r) {
+        r.left += 20;
+        r.top += 20;
+    }
+    virtual void FrameAddSize(Size &sz) {
+        sz += Size(20, 20);
+    }
+    virtual void FramePaint(Draw &w, const Rect &r) {
+        w.DrawRect(r.left, r.top, r.Width(), 20, SGreen);
+        w.DrawRect(r.left, r.top + 20, 20, r.Height() - 20, SBlue);
+    }
+	virtual void Paint(Draw& w) {
+		w.DrawRect(GetSize(), SYellow);
+	}
+	CtrlSelfFrame() {
+		SetFrame(*this);
+		AddFrame(InsetFrame());
+	}
+};
+
+GUI_APP_MAIN
+{
+	TopWindow  win;
+	StaticRect ctrl;
+	ctrl.Color(SLtCyan);
+	win.Add(ctrl.SizePos());
+	win.SetRect(0, 0, 100, 100);
+	win.Run();
+
+	ctrl.SetFrame(InsetFrame());
+	win.Run();
+
+	ctrl.AddFrame(BlackFrame());
+	win.Run();
+
+	Frame1 frame1;
+	ctrl.InsertFrame(0, frame1);
+	win.Run();
+
+	Frame2 frame2;
+	ctrl.AddFrame(frame2);
+	win.Run();
+
+	ctrl.Remove();
+	CtrlSelfFrame csf;
+	win.Add(csf.SizePos());
+	win.Run();
+}
diff --git a/reference/FullScreen/FullScreen.upp b/reference/FullScreen/FullScreen.upp
new file mode 100644
index 000000000..cbad8566e
--- /dev/null
+++ b/reference/FullScreen/FullScreen.upp
@@ -0,0 +1,10 @@
+description "Full screen TopWindow mode";
+
+uses
+	CtrlLib;
+
+file
+	main.cpp;
+
+mainconfig
+	"" = "GUI";
diff --git a/reference/FullScreen/main.cpp b/reference/FullScreen/main.cpp
new file mode 100644
index 000000000..7dd9c9ed1
--- /dev/null
+++ b/reference/FullScreen/main.cpp
@@ -0,0 +1,13 @@
+#include <CtrlLib/CtrlLib.h>
+
+using namespace Upp;
+
+GUI_APP_MAIN
+{
+	TopWindow win;
+	Button b;
+	b.SetLabel("CLOSE");
+	b <<= win.Breaker();
+	win.Add(b.LeftPos(10, 100).TopPos(10, 30));
+	win.FullScreen().Run();
+}
diff --git a/reference/GetDataFile/GetDataFile.cpp b/reference/GetDataFile/GetDataFile.cpp
new file mode 100644
index 000000000..f9d5b096f
--- /dev/null
+++ b/reference/GetDataFile/GetDataFile.cpp
@@ -0,0 +1,8 @@
+#include <Core/Core.h>
+
+using namespace Upp;
+
+CONSOLE_APP_MAIN
+{
+	puts(LoadFile(GetDataFile("data.txt")));
+}
diff --git a/reference/GetDataFile/GetDataFile.upp b/reference/GetDataFile/GetDataFile.upp
new file mode 100644
index 000000000..9314f352f
--- /dev/null
+++ b/reference/GetDataFile/GetDataFile.upp
@@ -0,0 +1,12 @@
+description "Demonstration of facility used to read application specific files";
+
+uses
+	Core;
+
+file
+	data.txt,
+	GetDataFile.cpp;
+
+mainconfig
+	"" = "";
+
diff --git a/reference/GetDataFile/data.txt b/reference/GetDataFile/data.txt
new file mode 100644
index 000000000..f24ee9363
--- /dev/null
+++ b/reference/GetDataFile/data.txt
@@ -0,0 +1 @@
+Data example....
\ No newline at end of file
diff --git a/reference/GuiMT/Divisors.lay b/reference/GuiMT/Divisors.lay
new file mode 100644
index 000000000..8e893f6f2
--- /dev/null
+++ b/reference/GuiMT/Divisors.lay
@@ -0,0 +1,6 @@
+LAYOUT(DivisorsLayout, 700, 440)
+	ITEM(ArrayCtrl, table, HSizePosZ(12, 12).VSizePosZ(12, 36))
+	ITEM(Button, push, SetLabel(t_("Test")).LeftPosZ(184, 84).BottomPosZ(9, 19))
+	ITEM(EditString, editor, LeftPosZ(12, 164).BottomPosZ(9, 19))
+END_LAYOUT
+
diff --git a/reference/GuiMT/GuiMT.upp b/reference/GuiMT/GuiMT.upp
new file mode 100644
index 000000000..cfad8977d
--- /dev/null
+++ b/reference/GuiMT/GuiMT.upp
@@ -0,0 +1,12 @@
+description "Using event queue for communication between worker threads and GUI";
+
+uses
+	CtrlLib;
+
+file
+	main.cpp,
+	Divisors.lay;
+
+mainconfig
+	"" = "GUI MT";
+
diff --git a/reference/GuiMT/main.cpp b/reference/GuiMT/main.cpp
new file mode 100644
index 000000000..861c69f4e
--- /dev/null
+++ b/reference/GuiMT/main.cpp
@@ -0,0 +1,103 @@
+#include "CtrlLib/CtrlLib.h"
+
+using namespace Upp;
+
+#define LAYOUTFILE <GuiMT/Divisors.lay>
+#include <CtrlCore/lay.h>
+
+struct Divisors : public WithDivisorsLayout<TopWindow> {
+	typedef Divisors CLASSNAME;
+
+	volatile Atomic terminated;
+	volatile Atomic threads;
+
+	void TestNumber();
+	void ShowResult(int line, String result);
+	void SetTitle();
+
+	Divisors();
+	~Divisors();
+};
+
+
+struct DivisorsInfo {
+	int       line;
+	uint64    number;
+	Divisors *gui;
+};
+
+void WorkerThread(DivisorsInfo f)
+{
+	String r1, r2;
+	int divisors = 0;
+	uint64 max = (uint64)sqrt((double)f.number) + 1;
+	for(uint64 i = 1; i < max; i++) {
+		if(f.gui->terminated)
+			break;
+		if(f.number % i == 0) {
+			r1 << ' ' << i;
+			divisors++;
+			uint64 j = f.number / i;
+			if (j != i) {
+				r2 = " " + AsString(j) + r2;
+				divisors++;
+			}
+			PostCallback(callback2(f.gui, &Divisors::ShowResult, f.line, "working..." + r1 + r2));
+		}
+	}
+	PostCallback(callback2(f.gui, &Divisors::ShowResult, f.line, AsString(divisors) + ": " + r1 + r2));
+	AtomicDec(f.gui->threads);
+}
+
+void Divisors::TestNumber()
+{
+	if(IsNull(editor))
+		return;
+	DivisorsInfo f;
+	f.number = stou64((String)~editor);
+	f.line = table.GetCount();
+	table.Add(AsString(f.number), "working...");
+	f.gui = this;
+	AtomicInc(threads);
+	Thread().Run(callback1(WorkerThread, f));
+	SetTitle();
+}
+
+void Divisors::ShowResult(int line, String result)
+{
+	table.Set(line, 1, result);
+	SetTitle();
+}
+
+void Divisors::SetTitle()
+{
+	int n = threads;
+	Title(AsString(n) + " threads");
+}
+
+Divisors::Divisors()
+{
+	CtrlLayout(*this, "Window title");
+	Sizeable().Zoomable();
+	push <<= THISBACK(TestNumber);
+	editor.SetFilter(CharFilterDigit);
+	table.AddColumn("Number");
+	table.AddColumn("Divisors");
+	table.ColumnWidths("135 527");
+	table.NoCursor();
+	terminated = 0;
+	threads = 0;
+	SetTitle();
+}
+
+Divisors::~Divisors()
+{
+	terminated = 1;
+	while(threads)
+		Sleep(10);
+}
+
+GUI_APP_MAIN
+{
+	Divisors().Run();
+}
diff --git a/reference/ImageDraw/ImageDraw.upp b/reference/ImageDraw/ImageDraw.upp
new file mode 100644
index 000000000..3dbe14cf5
--- /dev/null
+++ b/reference/ImageDraw/ImageDraw.upp
@@ -0,0 +1,11 @@
+description "Creating raster images in the code";
+
+uses
+	CtrlLib;
+
+file
+	main.cpp;
+
+mainconfig
+	"" = "GUI";
+
diff --git a/reference/ImageDraw/main.cpp b/reference/ImageDraw/main.cpp
new file mode 100644
index 000000000..275c7a0ca
--- /dev/null
+++ b/reference/ImageDraw/main.cpp
@@ -0,0 +1,26 @@
+#include <CtrlLib/CtrlLib.h>
+
+using namespace Upp;
+
+struct App : TopWindow {
+	Image img;
+
+	virtual void Paint(Draw& w) {
+		w.DrawRect(GetSize(), SWhite);
+		w.DrawImage(0, 0, img);
+	}
+
+	App() {
+		ImageDraw w(100, 100);
+		w.DrawRect(0, 0, 100, 100, SGray);
+		w.DrawEllipse(0, 0, 100, 100, SGreen);
+		w.DrawText(0, 0, "ImageDraw!", Arial(13).Bold(), SYellow);
+		img = w;
+		Sizeable();
+	}
+};
+
+GUI_APP_MAIN
+{
+	App().Run();
+}
diff --git a/reference/ImageEncoders/ImageEncoders.upp b/reference/ImageEncoders/ImageEncoders.upp
new file mode 100644
index 000000000..70575c09c
--- /dev/null
+++ b/reference/ImageEncoders/ImageEncoders.upp
@@ -0,0 +1,14 @@
+description "Storing raster images in various formats";
+
+uses
+	CtrlLib,
+	plugin\gif,
+	plugin\jpg,
+	plugin\tif;
+
+file
+	main.cpp;
+
+mainconfig
+	"" = "GUI";
+
diff --git a/reference/ImageEncoders/main.cpp b/reference/ImageEncoders/main.cpp
new file mode 100644
index 000000000..90c133670
--- /dev/null
+++ b/reference/ImageEncoders/main.cpp
@@ -0,0 +1,78 @@
+#include <CtrlLib/CtrlLib.h>
+
+#include <plugin/png/png.h>
+#include <plugin/bmp/bmp.h>
+#include <plugin/gif/gif.h>
+#include <plugin/jpg/jpg.h>
+#include <plugin/tif/tif.h>
+
+using namespace Upp;
+
+GUI_APP_MAIN
+{
+	ImageDraw iw(200, 50);
+	iw.DrawRect(0, 0, 200, 50, White);
+	iw.DrawText(10, 10, "ImageEncoder TEST", Arial(18), Red);
+	DrawFatFrame(iw, 0, 0, 200, 50, Blue, 2);
+	Image m = iw;
+
+	PNGEncoder png;
+	png.SaveFile(GetExeDirFile("default-32.png"), m);
+	png.Bpp(1);
+	png.SaveFile(GetExeDirFile("1.png"), m);
+	png.Bpp(2);
+	png.SaveFile(GetExeDirFile("2.png"), m);
+	png.Bpp(4);
+	png.SaveFile(GetExeDirFile("4.png"), m);
+	png.Bpp(8);
+	png.SaveFile(GetExeDirFile("8.png"), m);
+	png.Interlace();
+	png.SaveFile(GetExeDirFile("8i.png"), m);
+	png.Bpp(24);
+	png.SaveFile(GetExeDirFile("24.png"), m);
+	png.Bpp(32);
+	png.SaveFile(GetExeDirFile("32.png"), m);
+
+	BMPEncoder bmp;
+	bmp.SaveFile(GetExeDirFile("default-24.bmp"), m);
+	bmp.Bpp(1);
+	bmp.SaveFile(GetExeDirFile("1.bmp"), m);
+	bmp.Bpp(4);
+	bmp.SaveFile(GetExeDirFile("4.bmp"), m);
+	bmp.Bpp(8);
+	bmp.SaveFile(GetExeDirFile("8.bmp"), m);
+	bmp.Bpp(4).Mono();
+	bmp.SaveFile(GetExeDirFile("4m.bmp"), m);
+	bmp.Bpp(8).Mono();
+	bmp.SaveFile(GetExeDirFile("8m.bmp"), m);
+	bmp.Bpp(24);
+	bmp.SaveFile(GetExeDirFile("24.bmp"), m);
+	bmp.Bpp(32);
+	bmp.SaveFile(GetExeDirFile("32.bmp"), m);
+
+	GIFEncoder gif;
+	gif.SaveFile(GetExeDirFile("gif.gif"), m);
+
+	JPGEncoder jpg;
+	jpg.SaveFile(GetExeDirFile("default(50).jpg"), m);
+	jpg.Quality(20);
+	jpg.SaveFile(GetExeDirFile("(20).jpg"), m);
+	jpg.Quality(100);
+	jpg.SaveFile(GetExeDirFile("(100).jpg"), m);
+
+
+	TIFEncoder tif;
+	tif.SaveFile(GetExeDirFile("default-24.tif"), m);
+	tif.Bpp(1);
+	tif.SaveFile(GetExeDirFile("1.tif"), m);
+	tif.Bpp(2);
+	tif.SaveFile(GetExeDirFile("2.tif"), m);
+	tif.Bpp(4);
+	tif.SaveFile(GetExeDirFile("4.tif"), m);
+	tif.Bpp(8);
+	tif.SaveFile(GetExeDirFile("8.tif"), m);
+	tif.Bpp(24);
+	tif.SaveFile(GetExeDirFile("24.tif"), m);
+	tif.Bpp(32);
+	tif.SaveFile(GetExeDirFile("32.tif"), m);
+}
diff --git a/reference/Layout/Layout.cpp b/reference/Layout/Layout.cpp
new file mode 100644
index 000000000..7109d2dda
--- /dev/null
+++ b/reference/Layout/Layout.cpp
@@ -0,0 +1,21 @@
+#include <CtrlLib/CtrlLib.h>
+
+using namespace Upp;
+
+#define LAYOUTFILE <Layout/Layout.lay>
+#include <CtrlCore/lay.h>
+
+GUI_APP_MAIN
+{
+	WithDialogLayout<TopWindow> dlg;
+	CtrlLayoutOKCancel(dlg, "Enter a number");
+	dlg.number <<= 10;
+	for(;;)
+		switch(dlg.Execute()) {
+		case IDOK:
+			PromptOK(AsString(~dlg.number));
+			break;
+		case IDCANCEL:
+			return;
+		}
+}
diff --git a/reference/Layout/Layout.lay b/reference/Layout/Layout.lay
new file mode 100644
index 000000000..aed103ef4
--- /dev/null
+++ b/reference/Layout/Layout.lay
@@ -0,0 +1,6 @@
+LAYOUT(DialogLayout, 148, 68)
+	ITEM(Label, dv___0, SetLabel(t_("A number")).LeftPosZ(8, 56).TopPosZ(8, 19))
+	ITEM(EditIntSpin, number, LeftPosZ(64, 76).TopPosZ(8, 19))
+	ITEM(Button, cancel, SetLabel(t_("Cancel")).LeftPosZ(76, 64).TopPosZ(36, 24))
+	ITEM(Button, ok, SetLabel(t_("OK")).LeftPosZ(8, 64).TopPosZ(36, 24))
+END_LAYOUT
diff --git a/reference/Layout/Layout.upp b/reference/Layout/Layout.upp
new file mode 100644
index 000000000..7928d592d
--- /dev/null
+++ b/reference/Layout/Layout.upp
@@ -0,0 +1,11 @@
+description "Using layouts for dialogs";
+
+uses
+	CtrlLib;
+
+file
+	Layout.cpp,
+	Layout.lay;
+
+mainconfig
+	"" = "GUI";
diff --git a/reference/Log/Log.upp b/reference/Log/Log.upp
new file mode 100644
index 000000000..91bfbdc8b
--- /dev/null
+++ b/reference/Log/Log.upp
@@ -0,0 +1,11 @@
+description "Using diagnostic logs";
+
+uses
+	Core;
+
+file
+	log.cpp;
+
+mainconfig
+	"" = "";
+
diff --git a/reference/Log/log.cpp b/reference/Log/log.cpp
new file mode 100644
index 000000000..e8d30aa1a
--- /dev/null
+++ b/reference/Log/log.cpp
@@ -0,0 +1,31 @@
+#include <Core/Core.h>
+
+using namespace Upp;
+
+struct Foo {
+	int i;
+
+	String ToString() const { return "Foo: " + AsString(i); }
+
+	Foo() { i = 0; }
+	Foo(int i) : i(i) {}
+};
+
+CONSOLE_APP_MAIN
+{
+	LOG(123);
+	LOG("Loop:");
+	LOGBEGIN();
+	for(int i = 0; i < 4; i++)
+		DUMP(i);
+	LOGEND();
+	DUMP(Foo(1));
+	Vector<String> x;
+	x.Add("One");
+	x.Add("Two");
+	x.Add("Three");
+	DUMPC(x);
+	static char h[200] = "alsjkdfhlaksjdhfklajshdfklj";
+	LOGHEXDUMP(h, 200);
+	RLOG("This will appear even in the release mode");
+}
diff --git a/reference/Menu/Menu.upp b/reference/Menu/Menu.upp
new file mode 100644
index 000000000..402bd3f1e
--- /dev/null
+++ b/reference/Menu/Menu.upp
@@ -0,0 +1,11 @@
+description "Using MenuBar";
+
+uses
+	CtrlLib;
+
+file
+	menu.cpp;
+
+mainconfig
+	"" = "GUI";
+
diff --git a/reference/Menu/menu.cpp b/reference/Menu/menu.cpp
new file mode 100644
index 000000000..da00cb9ce
--- /dev/null
+++ b/reference/Menu/menu.cpp
@@ -0,0 +1,58 @@
+#include <CtrlLib/CtrlLib.h>
+
+using namespace Upp;
+
+struct App : public TopWindow {
+	bool numbers_enabled;
+
+	void Exit()
+	{
+		Close();
+	}
+
+	void EnableNumbers()
+	{
+		numbers_enabled = !numbers_enabled;
+	}
+
+	void ShowNumber(int n)
+	{
+		PromptOK(AsString(n));
+	}
+
+	void SubMenu(Bar& bar)
+	{
+		for(int i = 0; i < 10; i++)
+			bar.Add(AsString(i), THISBACK1(ShowNumber, i));
+	}
+
+	void Menu(Bar& bar)
+	{
+		bar.Add("Enable numbers", THISBACK(EnableNumbers))
+		   .Check(numbers_enabled);
+		bar.Add(numbers_enabled, "Numbers", THISBACK(SubMenu));
+		bar.Add("Exit", THISBACK(Exit))
+		   .Key(K_CTRL_E);
+	}
+
+	void MainBar(Bar& bar)
+	{
+		bar.Add("Menu", THISBACK(Menu));
+	}
+
+	MenuBar menu;
+
+	typedef App CLASSNAME;
+
+	App()
+	{
+		numbers_enabled = false;
+		AddFrame(menu);
+		menu.Set(THISBACK(MainBar));
+	}
+};
+
+GUI_APP_MAIN
+{
+	App().Run();
+}
diff --git a/reference/OpenGL/OpenGL.upp b/reference/OpenGL/OpenGL.upp
new file mode 100644
index 000000000..1ef8de388
--- /dev/null
+++ b/reference/OpenGL/OpenGL.upp
@@ -0,0 +1,11 @@
+description "GLCtrl widget example";
+
+uses
+	GLCtrl;
+
+file
+	main.cpp;
+
+mainconfig
+	"" = "GUI";
+
diff --git a/reference/OpenGL/main.cpp b/reference/OpenGL/main.cpp
new file mode 100644
index 000000000..8dacb2e01
--- /dev/null
+++ b/reference/OpenGL/main.cpp
@@ -0,0 +1,74 @@
+#include <GLCtrl/GLCtrl.h>
+
+using namespace Upp;
+
+struct OpenGLExample : GLCtrl {
+	Point point;
+
+	virtual void GLPaint() {
+		StdView();
+
+		double t = 13 * point.x;
+		glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+		glEnable(GL_BLEND);
+		glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+		glLoadIdentity();
+		glPushMatrix();
+			glTranslatef(0, 0, -6);
+			glRotated(t / 30.0, 0, 1, 0);
+			glRotated(t / 40.0, 1, 0, 0);
+			glRotated(t / 5.0, 0, 0, 1);
+			glBegin(GL_TRIANGLE_FAN);
+				glColor4d(0.8, 0.4, 0.2, 1);
+				glVertex3f(0.0f, 0.0f, 0.0f);
+				for(int i = 0; i < 50; i++) {
+					double u = M_2PI * i / 49;
+					glColor4d(i / 50.0, 0.5 + i / 100.0, 0.7 - i / 150.0, 1);
+					glVertex3d(sin(u), cos(u), 1.0f);
+				}
+			glEnd();
+			glBegin(GL_TRIANGLE_FAN);
+				glColor4d(0.8, 0.4, 0.2, 1);
+				glVertex3f(0.0f, 0.0f, 3.0f);
+				for(int i = 0; i < 50; i++) {
+					double u = M_2PI * i / 49;
+					glColor4d(0.7, 0.5 - i / 100.0, 0.7 + i / 150.0, 1);
+					glVertex3d(sin(u), cos(u), 1.0f);
+				}
+			glEnd();
+		glPopMatrix();
+		t = 13 * point.y;
+		float sn = (float)sin(t / 300);
+		float cs = (float)cos(t / 300);
+		glTranslatef(sn + cs, sn, -6 - cs);
+		glRotated(t / 12.0, 0, 0, 1);
+		glRotated(t / 15.0, 0, 1, 0);
+		glRotated(t / 17.0, 1, 0, 0);
+		glBegin(GL_TRIANGLE_STRIP);
+			glVertex3f(0.0f, 0.0f, 0.0f);
+			glColor4d(1, 0, 0, 0.5);
+			glVertex3d(-1, 0, 0);
+			glVertex3d(1, 0, 0);
+			glVertex3d(0, 0.87, 0);
+			glColor4d(0, 1, 0, 0.5);
+			glVertex3d(0, 0, 1.67);
+		glEnd();
+	}
+
+	virtual void MouseMove(Point p, dword) {
+		point = p;
+		Refresh();
+	}
+};
+
+GUI_APP_MAIN
+{
+	Ctrl::GlobalBackPaint();
+	TopWindow win;
+	OpenGLExample gl;
+	gl.SetFrame(InsetFrame());
+	win.Add(gl.HSizePos(10, 10).VSizePos(10, 10));
+	win.Sizeable().Zoomable();
+	win.Open();
+	win.Run();
+}
diff --git a/reference/Paint/Draw.cpp b/reference/Paint/Draw.cpp
new file mode 100644
index 000000000..dd1435ae4
--- /dev/null
+++ b/reference/Paint/Draw.cpp
@@ -0,0 +1,32 @@
+#include <CtrlLib/CtrlLib.h>
+
+using namespace Upp;
+
+struct App : public TopWindow {
+	void Paint(Draw& w)
+	{
+		Size sz = GetSize();
+		w.DrawRect(0, 0, sz.cx, sz.cy, SWhite);
+		w.DrawRect(10, 10, 30, 30, SRed);
+		w.DrawLine(45, 45, 80, 120, 4, Blue);
+		w.DrawLine(80, 90, 400, 0, PEN_DASHDOT);
+		w.DrawEllipse(200, 200, 50, 100, Green);
+		w.DrawImage(200, 10, CtrlImg::HandCursor());
+		const char *text = "This text is centered";
+		Size tsz = GetTextSize(text, Arial(25).Bold());
+		w.DrawText((sz.cx - tsz.cx) / 2, (sz.cy - tsz.cy) / 2, text, Arial(27).Bold(), SBlue);
+		w.Clipoff(200, 50, 95, 100);
+		w.DrawText(0, 80, "CLIPPED", Roman(25));
+		w.End();
+	}
+
+	App()
+	{
+		Sizeable();
+	}
+};
+
+GUI_APP_MAIN
+{
+	App().Run();
+}
diff --git a/reference/Paint/Paint.upp b/reference/Paint/Paint.upp
new file mode 100644
index 000000000..6009a21ca
--- /dev/null
+++ b/reference/Paint/Paint.upp
@@ -0,0 +1,11 @@
+description "Paint method and Draw example";
+
+uses
+	CtrlLib;
+
+file
+	Draw.cpp;
+
+mainconfig
+	"" = "GUI";
+
diff --git a/reference/PrinterJob/PrinterJob.upp b/reference/PrinterJob/PrinterJob.upp
new file mode 100644
index 000000000..b2b9d9ce9
--- /dev/null
+++ b/reference/PrinterJob/PrinterJob.upp
@@ -0,0 +1,11 @@
+description "Printing in U++";
+
+uses
+	CtrlLib;
+
+file
+	main.cpp;
+
+mainconfig
+	"" = "GUI";
+
diff --git a/reference/PrinterJob/main.cpp b/reference/PrinterJob/main.cpp
new file mode 100644
index 000000000..68df10d7a
--- /dev/null
+++ b/reference/PrinterJob/main.cpp
@@ -0,0 +1,20 @@
+#include <CtrlLib/CtrlLib.h>
+
+using namespace Upp;
+
+GUI_APP_MAIN
+{
+	PrinterJob pj;
+	if(PromptYesNo("Landscape?"))
+		pj.Landscape();
+	if(!PromptYesNo("Use default printer?"))
+		if(!pj.Execute())
+			return;
+	Draw& w = pj;
+	w.StartPage();
+	const char *text = "Hello world!";
+	Font font = Roman(300);
+	Point p = Rect(w.GetPagePixels()).CenterPos(GetTextSize(text, font));
+	w.DrawText(p.x, p.y, "Hello world!", font);
+	w.EndPage();
+}
diff --git a/reference/Ptr/Ptr.upp b/reference/Ptr/Ptr.upp
new file mode 100644
index 000000000..7b635d384
--- /dev/null
+++ b/reference/Ptr/Ptr.upp
@@ -0,0 +1,11 @@
+description "U++ smart pointer example";
+
+uses
+	Core;
+
+file
+	main.cpp;
+
+mainconfig
+	"" = "";
+
diff --git a/reference/Ptr/main.cpp b/reference/Ptr/main.cpp
new file mode 100644
index 000000000..3ff051075
--- /dev/null
+++ b/reference/Ptr/main.cpp
@@ -0,0 +1,20 @@
+#include <Core/Core.h>
+
+using namespace Upp;
+
+struct Foo : Pte<Foo> {
+	String text;
+};
+
+CONSOLE_APP_MAIN
+{
+	Ptr<Foo> ptr;
+	{
+		Foo foo;
+		foo.text = "Text";
+		ptr = &foo;
+		Cout() << (void*)~ptr << " -> " << ptr->text << "\n";
+	}
+	Cout() << "-------------\n";
+	Cout() << (void*)~ptr << "\n";
+}
diff --git a/reference/Qtf/Qtf.upp b/reference/Qtf/Qtf.upp
new file mode 100644
index 000000000..a916ea52a
--- /dev/null
+++ b/reference/Qtf/Qtf.upp
@@ -0,0 +1,12 @@
+description "QTF - default text representation of RichText";
+
+uses
+	CtrlLib,
+	RichEdit;
+
+file
+	main.cpp;
+
+mainconfig
+	"" = "GUI";
+
diff --git a/reference/Qtf/main.cpp b/reference/Qtf/main.cpp
new file mode 100644
index 000000000..0617c7a8a
--- /dev/null
+++ b/reference/Qtf/main.cpp
@@ -0,0 +1,55 @@
+#include <RichEdit/RichEdit.h>
+
+using namespace Upp;
+
+const char *examples[] = {
+	"Normal [* bold] [/ italic] [_ underline] [` superscript] [, subscript]",
+	"`[ `] \1[escaped]\1 [* bold]",
+	"[A Arial (Sans-Serif)] [R Times New Roman (Serif)] [C Courier (Monospace)]",
+	"[0 6pt ][1 8pt ][2 10pt ][3 12pt ][4 16pt ][5 20pt ][6 24pt ][7 28pt ][8 36pt ][9 48pt ]",
+	"[!Tahoma! Tahoma]",
+	"[+500 500dots]",
+	"[@4 Green text] [$(255.220.200) Pink background]",
+	"[%EN-US English language] [%CS-CZ Czech language]",
+	"[^upp.sf.net^ Hyperlink] [Icompiler, linker; Index entry]",
+	"[:label: Labeled paragraph]",
+	"[< Left paragraph alignment]",
+	"[= Center paragraph alignment]",
+	"[> Right paragraph alignment]",
+	"[# Justify alignment. Just some text to demosntrate it... "
+	"Just some text to demonstrate it... Just some text to demonstrate it...]",
+	"[l1000 Left margin 1000dots]",
+	"[i1000 Indent 1000 dots."
+	"Just some text to demonstrate it... Just some text to demonstrate it...]",
+	"[r1000 Right margin 1000 dots."
+	"Just some text to demonstrate it... Just some text to demonstrate it...]",
+	"Paragraph&[b200 Before 200dots]",
+	"[a200 After 200dots]&Paragraph",
+	"[i200 [O0 bullet&][O1 bullet&][O2 bullet&][O3 bullet]]",
+	"[O9i500 text bullet-|"
+	"Just some text to demonstrate it... Just some text to demonstrate it..."
+	"Just some text to demonstrate it... Just some text to demonstrate it...]",
+	"[O9i200 [N1m.; -|level 1&][N1a -|level 2&][N1a -|level 2&][N1 -|level 1&][N1a -|level 2]]",
+	"[~300~=.2000~>-3000 -|Normal tab-|Centered tab-|Right tab]",
+	"{{1:2 A1:: A2:: B1:: B2}}",
+	"{{2:1G4g100F5f50 A1:: A2:: B1:: B2}}",
+	"{{1:2 A1::l40/60R6@3 A2::! B1:: B2}}",
+	"{{1:1:1|2 A1::-2 A2:: A3:: B1:: B2:: B3}}",
+	"{{1:2 A1:: A2:: B1:: {{1:2 a1:: a2:: a1:: a2}}}}",
+	NULL
+};
+
+GUI_APP_MAIN
+{
+	SetLanguage(LNGFromText("RU-RU"));
+
+	String qtf = "&";
+	for(int i = 0; examples[i]; i++)
+		qtf << "{{1 [@3C1* " << DeQtf(AsCString(examples[i])) << "]:: " << examples[i] << "}}&&";
+	RichEditWithToolBar e;
+	e.SetQTF(qtf);
+	TopWindow w;
+	w.Sizeable().Zoomable();
+	w.Add(e.SizePos());
+	w.Run();
+}
diff --git a/reference/QtfDrawing/QtfDrawing.upp b/reference/QtfDrawing/QtfDrawing.upp
new file mode 100644
index 000000000..7d26c7be5
--- /dev/null
+++ b/reference/QtfDrawing/QtfDrawing.upp
@@ -0,0 +1,11 @@
+description "Placing code-generated graphics into Qtf";
+
+uses
+	CtrlLib;
+
+file
+	main.cpp;
+
+mainconfig
+	"" = "GUI";
+
diff --git a/reference/QtfDrawing/main.cpp b/reference/QtfDrawing/main.cpp
new file mode 100644
index 000000000..3dc3d889e
--- /dev/null
+++ b/reference/QtfDrawing/main.cpp
@@ -0,0 +1,16 @@
+#include <CtrlLib/CtrlLib.h>
+
+using namespace Upp;
+
+GUI_APP_MAIN
+{
+	DrawingDraw dw(100, 100);
+	dw.DrawRect(0, 0, 100, 100, White);
+	dw.DrawEllipse(10, 10, 80, 80, Red, 5, Blue);
+	dw.DrawRect(50, 50, 50, 50, Yellow);
+	QtfRichObject pict(CreateDrawingObject(dw.GetResult(), Size(500, 500), Size(500, 500)));
+	String qtf;
+	qtf << "[A6 This is some drawing in QTF: " << pict << "&";
+	qtf << "[C3*@B And now in the table: {{1:1 " << pict << ":: Another cell " << pict << "}}";
+	PromptOK(qtf);
+}
diff --git a/reference/RectTracker/RectTracker.upp b/reference/RectTracker/RectTracker.upp
new file mode 100644
index 000000000..ecb17e35d
--- /dev/null
+++ b/reference/RectTracker/RectTracker.upp
@@ -0,0 +1,11 @@
+description "Positioning loop example";
+
+uses
+	CtrlLib;
+
+file
+	main.cpp;
+
+mainconfig
+	"" = "GUI";
+
diff --git a/reference/RectTracker/main.cpp b/reference/RectTracker/main.cpp
new file mode 100644
index 000000000..fb3e12230
--- /dev/null
+++ b/reference/RectTracker/main.cpp
@@ -0,0 +1,52 @@
+#include <CtrlLib/CtrlLib.h>
+
+using namespace Upp;
+
+struct MyApp : TopWindow {
+	Rect rect;
+	int  hline, vline;
+
+	virtual void Paint(Draw& w)
+	{
+		Size sz = GetSize();
+		w.DrawRect(sz, SColorPaper());
+		DrawFrame(w, rect, Black());
+		w.DrawRect(0, hline, sz.cx, 1, SRed);
+		w.DrawRect(vline, 0, 1, sz.cy, SBlue);
+	}
+
+	virtual void LeftDown(Point p, dword keyflags) {
+		RectTracker tr(*this);
+		Size sz = GetSize();
+		if(keyflags & K_ALT) {
+			tr.Dashed().Animation();
+			rect = tr.Track(rect, ALIGN_CENTER, ALIGN_CENTER);
+		}
+		else
+		if(keyflags & K_SHIFT) {
+			tr.Solid();
+			hline = tr.TrackHorzLine(0, 0, sz.cx, hline);
+		}
+		else
+		if(keyflags & K_CTRL) {
+			tr.Solid();
+			vline = tr.TrackVertLine(0, 0, sz.cy, vline);
+		}
+		else {
+			tr.Dashed().Animation();
+			rect = tr.Track(rect, ALIGN_RIGHT, ALIGN_BOTTOM);
+		}
+		Refresh();
+	}
+
+	MyApp() {
+		rect = RectC(100, 100, 100, 100);
+		hline = 150;
+		vline = 150;
+	}
+};
+
+GUI_APP_MAIN
+{
+	MyApp().Run();
+}
diff --git a/reference/RegExp/RegExp.cpp b/reference/RegExp/RegExp.cpp
new file mode 100644
index 000000000..2bd18a241
--- /dev/null
+++ b/reference/RegExp/RegExp.cpp
@@ -0,0 +1,26 @@
+#include <plugin/pcre/Pcre.h>
+
+using namespace Upp;
+
+CONSOLE_APP_MAIN
+{
+	RegExp r0("(\\w+)\\s(\\w+)\\s(\\w+)");
+	if(r0.Match("one two three"))
+	{
+		for(int i = 0; i < r0.GetCount(); i++)
+		    Cout() << r0[i] << '\n';
+    } else if(r0.IsError())
+	    Cout() << r0.GetError() << '\n';
+
+	Cout() << "------------------------------\n";
+
+	RegExp r1("(\\w+)", RegExp::UNICODE);
+	int i = 0;
+	while(r1.GlobalMatch("hello 4 ho 55 uuu iii pp 99 baby too swistak"))
+	{
+		for(int i = 0; i < r1.GetCount(); i++)
+			Cout() << r1[i] << '\n';
+    }
+	if(r1.IsError())
+	    Cout() << r1.GetError() << '\n';
+}
diff --git a/reference/RegExp/RegExp.upp b/reference/RegExp/RegExp.upp
new file mode 100644
index 000000000..02070d525
--- /dev/null
+++ b/reference/RegExp/RegExp.upp
@@ -0,0 +1,11 @@
+description "PCRE regular expressions";
+
+uses
+	Core,
+	plugin\pcre;
+
+file
+	RegExp.cpp charset "UTF-8";
+
+mainconfig
+	"" = "CONSOLE";
diff --git a/reference/Reports/Reports.upp b/reference/Reports/Reports.upp
new file mode 100644
index 000000000..ac77356d9
--- /dev/null
+++ b/reference/Reports/Reports.upp
@@ -0,0 +1,12 @@
+description "Report example";
+
+uses
+	CtrlLib,
+	Report;
+
+file
+	main.cpp;
+
+mainconfig
+	"" = "GUI";
+
diff --git a/reference/Reports/main.cpp b/reference/Reports/main.cpp
new file mode 100644
index 000000000..dcca93c36
--- /dev/null
+++ b/reference/Reports/main.cpp
@@ -0,0 +1,24 @@
+#include <Report/Report.h>
+
+using namespace Upp;
+
+GUI_APP_MAIN
+{
+	Report r;
+	r.Header("[A2> Page $$P");
+	r << "This is some [* QTF text";
+	r << "&&Let's report some table:";
+	String tab;
+	tab << "{{1:1:1:1:1:1:2 A:: B:: C:: D:: E:: F:: G (wider)";
+	for(int row = 0; row < 20; row++)
+		for(int column = 0; column < 7; column++)
+			tab << ":: " << row << ":" << column;
+	r << tab;
+	r.NewPage();
+	int y = r.GetY();
+	r.DrawEllipse(300, y + 50, 3000, 2000, LtRed, 20);
+	r.DrawText(500, y + 50 + 950, "Some free drawing in this page!", Arial(100));
+	r.SetY(y + 50 + 3000);
+	r << "More of [/ QTF] [C6* text";
+	Perform(r);
+}
diff --git a/reference/SQL_MySql/SQL_MySql.upp b/reference/SQL_MySql/SQL_MySql.upp
new file mode 100644
index 000000000..76e6d28fc
--- /dev/null
+++ b/reference/SQL_MySql/SQL_MySql.upp
@@ -0,0 +1,11 @@
+description "Logging to MySql";
+
+uses
+	MySql;
+
+file
+	main.cpp;
+
+mainconfig
+	"" = "MT";
+
diff --git a/reference/SQL_MySql/main.cpp b/reference/SQL_MySql/main.cpp
new file mode 100644
index 000000000..d99c3861c
--- /dev/null
+++ b/reference/SQL_MySql/main.cpp
@@ -0,0 +1,18 @@
+#include <MySql/MySql.h>
+
+using namespace Upp;
+
+CONSOLE_APP_MAIN
+{
+	MySqlSession session;
+	// substitute your 'username' and 'password' here:
+	if(!session.Connect("username", "password", "mysql", "localhost")) {
+		printf("Can't connect with MySql\n");
+		return;
+	}
+	Sql sql(session);
+	sql.Execute("use mysql");
+	sql.Execute("show tables");
+	while(sql.Fetch())
+		Cout() << (String)sql[0] << '\n';
+}
diff --git a/reference/SQL_Oracle/SQL_Oracle.upp b/reference/SQL_Oracle/SQL_Oracle.upp
new file mode 100644
index 000000000..7a56a581d
--- /dev/null
+++ b/reference/SQL_Oracle/SQL_Oracle.upp
@@ -0,0 +1,11 @@
+description "Logging to Oracle";
+
+uses
+	Oracle;
+
+file
+	main.cpp;
+
+mainconfig
+	"" = "";
+
diff --git a/reference/SQL_Oracle/main.cpp b/reference/SQL_Oracle/main.cpp
new file mode 100644
index 000000000..0e4e6dc16
--- /dev/null
+++ b/reference/SQL_Oracle/main.cpp
@@ -0,0 +1,13 @@
+#include <Oracle/Oracle7.h>
+
+using namespace Upp;
+
+CONSOLE_APP_MAIN
+{
+	Oracle7 oracle;
+	oracle.Open("scott/tiger@cxl"); // adjust for your Oracle server
+	Sql sql(oracle);
+	sql.Execute("select ENAME, JOB from EMP");
+	while(sql.Fetch())
+		Cout() << sql[0] << ": " << sql[1];
+}
diff --git a/reference/SQL_PostgreSql/Postgres.cpp b/reference/SQL_PostgreSql/Postgres.cpp
new file mode 100644
index 000000000..cabc754a7
--- /dev/null
+++ b/reference/SQL_PostgreSql/Postgres.cpp
@@ -0,0 +1,92 @@
+#include "Postgres.h"
+
+#include <Sql/sch_schema.h>
+#include <Sql/sch_source.h>
+
+using namespace Upp;
+
+PostgreSQLTest::PostgreSQLTest()
+{
+	CtrlLayout(*this, "PostgreSQL Test");
+	m_refresh <<= THISBACK(ShowTestData);
+	m_array.SetTable(TESTPARTNER);
+	m_array.AddKey(TESTPARTNER_ID);
+	m_array.AddColumn(TESTPARTNER_NAME, "Name");
+	m_array.AddColumn(TESTPARTNER_ADDRESS, "Address");
+}
+
+bool PostgreSQLTest::OpenDB()
+{
+	if(!m_session.Open("host=localhost dbname=test user=test password=test"))
+	{
+		Exclamation(Format("Error in open: %s", DeQtf(m_session.GetLastError())));
+		return false;
+	}
+	m_array.SetSession(m_session);
+
+#ifdef _DEBUG
+	m_session.SetTrace();
+#endif
+
+	//schema
+	Progress p;
+	p.SetText(t_("Creating _DEBUG database"));
+	SqlSchema sch(PGSQL);
+	StdStatementExecutor se(m_session);
+	All_Tables(sch);
+	if(sch.ScriptChanged(SqlSchema::UPGRADE))
+		PostgreSQLPerformScript(sch.Upgrade(),se, p);
+	if(sch.ScriptChanged(SqlSchema::ATTRIBUTES)) {
+		PostgreSQLPerformScript(sch.Attributes(),se, p);
+	}
+	if(sch.ScriptChanged(SqlSchema::CONFIG)) {
+		PostgreSQLPerformScript(sch.ConfigDrop(),se, p);
+		PostgreSQLPerformScript(sch.Config(),se, p);
+	}
+	sch.SaveNormal();
+
+	return true;
+}
+
+bool PostgreSQLTest::InsertTestData()
+{
+	Sql sql(m_session);
+	sql.ClearError();
+	sql.Begin();
+	sql * Delete(TESTPARTNER);
+	sql * Insert(TESTPARTNER)
+		(TESTPARTNER_NAME, "First Partner")
+		(TESTPARTNER_ADDRESS, "First Street")
+	;
+	sql * Insert(TESTPARTNER)
+		(TESTPARTNER_NAME, "Second Partner")
+		(TESTPARTNER_ADDRESS, "Second Street")
+	;
+	sql * Insert(TESTPARTNER)
+		(TESTPARTNER_NAME, "Third Partner")
+		(TESTPARTNER_ADDRESS, "Third Street")
+	;
+	if(!OkCommit(m_session, "Unable to insert test data."))
+		return false;
+
+	return true;
+}
+
+void PostgreSQLTest::ShowTestData()
+{
+	m_array.SetOrderBy(TESTPARTNER_NAME);
+	m_array.Query();
+}
+
+
+
+
+GUI_APP_MAIN
+{
+	PostgreSQLTest dlg;
+	if(dlg.OpenDB() && dlg.InsertTestData())
+	{
+		dlg.ShowTestData();
+		dlg.Run();
+	}
+}
diff --git a/reference/SQL_PostgreSql/Postgres.h b/reference/SQL_PostgreSql/Postgres.h
new file mode 100644
index 000000000..208fab1fd
--- /dev/null
+++ b/reference/SQL_PostgreSql/Postgres.h
@@ -0,0 +1,28 @@
+#ifndef _Postgres_Postgres_h
+#define _Postgres_Postgres_h
+
+#include <CtrlLib/CtrlLib.h>
+#include <SqlCtrl/SqlCtrl.h>
+
+using namespace Upp;
+
+#define LAYOUTFILE <SQL_PostgreSql/Postgres.lay>
+#include <CtrlCore/lay.h>
+
+#include <PostgreSQL/PostgreSQL.h>
+#define SCHEMADIALECT <PostgreSQL/PostgreSQLSchema.h>
+#define MODEL <SQL_PostgreSql/database.sch>
+#include "Sql/sch_header.h"
+
+class PostgreSQLTest : public WithPostgreSQLTestLayout<TopWindow> {
+public:
+	typedef PostgreSQLTest CLASSNAME;
+	PostgreSQLTest();
+	bool OpenDB();
+	bool InsertTestData();
+	void ShowTestData();
+protected:
+	PostgreSQLSession m_session;
+};
+
+#endif
diff --git a/reference/SQL_PostgreSql/Postgres.lay b/reference/SQL_PostgreSql/Postgres.lay
new file mode 100644
index 000000000..20342e4c1
--- /dev/null
+++ b/reference/SQL_PostgreSql/Postgres.lay
@@ -0,0 +1,4 @@
+LAYOUT(PostgreSQLTestLayout, 416, 348)
+	ITEM(SqlArray, m_array, HSizePosZ(8, 88).VSizePosZ(8, 8))
+	ITEM(Button, m_refresh, SetLabel(t_("Refresh")).Tip(t_("Refresh data in array")).RightPosZ(8, 72).TopPosZ(8, 24))
+END_LAYOUT
diff --git a/reference/SQL_PostgreSql/SQL_PostgreSql.upp b/reference/SQL_PostgreSql/SQL_PostgreSql.upp
new file mode 100644
index 000000000..921138e58
--- /dev/null
+++ b/reference/SQL_PostgreSql/SQL_PostgreSql.upp
@@ -0,0 +1,16 @@
+description "Logging and using PostgreSQL";
+
+uses
+	CtrlLib,
+	PostgreSQL,
+	SqlCtrl;
+
+file
+	database.sch,
+	Postgres.h,
+	Postgres.cpp,
+	Postgres.lay;
+
+mainconfig
+	"" = "GUI";
+
diff --git a/reference/SQL_PostgreSql/database.sch b/reference/SQL_PostgreSql/database.sch
new file mode 100644
index 000000000..d47cb6ed5
--- /dev/null
+++ b/reference/SQL_PostgreSql/database.sch
@@ -0,0 +1,11 @@
+TABLE_(TESTPARTNER)
+   SERIAL_  (TESTPARTNER_ID) PRIMARY_KEY
+   STRING_  (TESTPARTNER_NAME, 200) INDEX
+   STRING_  (TESTPARTNER_ADDRESS, 200)
+END_TABLE
+
+TABLE_(TESTPRODUCT)
+   SERIAL_  (TESTPRODUCT_ID) PRIMARY_KEY
+   STRING_  (TESTPRODUCT_NAME, 200) INDEX
+   STRING_  (TESTPRODUCT_UNIT, 20)
+END_TABLE
diff --git a/reference/SQL_Sqlite3/SQL_Sqlite3.upp b/reference/SQL_Sqlite3/SQL_Sqlite3.upp
new file mode 100644
index 000000000..420eb4cbd
--- /dev/null
+++ b/reference/SQL_Sqlite3/SQL_Sqlite3.upp
@@ -0,0 +1,13 @@
+description "Connecting Sqlite3 database";
+
+uses
+	plugin\sqlite3;
+
+file
+	simple.h,
+	simple.cpp,
+	simple.sch;
+
+mainconfig
+	"" = "";
+
diff --git a/reference/SQL_Sqlite3/main.cpp b/reference/SQL_Sqlite3/main.cpp
new file mode 100644
index 000000000..989556fc9
--- /dev/null
+++ b/reference/SQL_Sqlite3/main.cpp
@@ -0,0 +1,40 @@
+#include <plugin/sqlite3/Sqlite3.h>
+
+SqlId all("*");
+SqlId name("name");
+SqlId date("date");
+SqlId list("list");
+
+CONSOLE_APP_MAIN
+{
+	Sqlite3Session session;
+	if(!session.Open("C:\\Research\\Sqlite3\\test.db")) {
+		printf("Can't connect to database file\n");
+		return;
+	}
+
+	// Get the list of tables	
+	Vector<String> table_list = session.EnumTables("");
+	LOG(Format("Tables: (%d)",table_list.GetCount()));
+	for (int i = 0; i < table_list.GetCount(); ++i)
+		LOG(Format("  #%d: %s",i+1,table_list[i]));
+	
+	Sql sql(session);
+
+	// Test to make sure it caches 
+	sql.Execute("select * from list");
+	sql*Select(all).From(list);
+	sql*Select(name).From(list);
+
+	// Test retrieving info from db
+	sql*Select(all).From(list);
+	LOG(sql.ToString());
+	while(sql.Fetch())
+		LOG(Format("%d: %s %d",sql[0],sql[1],sql[2]));
+	
+	// Test conditional retrieving info from db
+	sql*Select(name,date).From(list).Where(date<20040101);
+	LOG(sql.ToString());
+	while(sql.Fetch())
+		LOG(Format("?: %s %d",sql[0],sql[1]));
+}
diff --git a/reference/SQL_Sqlite3/simple.cpp b/reference/SQL_Sqlite3/simple.cpp
new file mode 100644
index 000000000..9d6793ed2
--- /dev/null
+++ b/reference/SQL_Sqlite3/simple.cpp
@@ -0,0 +1,100 @@
+#include "simple.h"
+
+#ifdef _DEBUG
+#include <Sql/sch_schema.h>
+#endif
+
+#include <Sql/sch_source.h>
+
+CONSOLE_APP_MAIN
+{
+	LOG("-- Starting new run of Sqlite3 simple test");
+#ifdef _DEBUG
+	LOG("Debug mode!");
+#endif
+
+	Sqlite3Session sqlite3;
+	sqlite3.LogErrors(true);
+	if(!sqlite3.Open(ConfigFile("simple.db"))) {
+		LOG("Can't create or open database file\n");
+		return;
+	}
+
+	SQL = sqlite3;
+
+	// Update the schema to match the schema described in "simple.sch"
+	#ifdef _DEBUG
+	SqlSchema sch(SQLITE3);
+	StdStatementExecutor se(sqlite3);
+	All_Tables(sch);
+	if(sch.ScriptChanged(SqlSchema::UPGRADE))
+		Sqlite3PerformScript(sch.Upgrade(),se);
+	if(sch.ScriptChanged(SqlSchema::ATTRIBUTES)) {
+		Sqlite3PerformScript(sch.Attributes(),se);
+	}
+	if(sch.ScriptChanged(SqlSchema::CONFIG)) {
+		Sqlite3PerformScript(sch.ConfigDrop(),se);
+		Sqlite3PerformScript(sch.Config(),se);
+	}
+	sch.SaveNormal();
+	#endif
+
+	// Now test out some functionality:
+	//--------------------------------------------------------------------
+	// Get the list of tables
+	Vector<String> table_list = sqlite3.EnumTables("");
+	LOG(Format("Tables: (%d)",table_list.GetCount()));
+	for (int i = 0; i < table_list.GetCount(); ++i)
+		LOG(Format("  #%d: %s",i+1,table_list[i]));
+
+
+	S_SIMPLE_TEST1 row;
+	Sql sql;
+
+	// Test basic insertion:
+	// (check buglog for errors about duplicate entries if you run this more
+	//  than once on the same db!)
+	sql*Insert(SIMPLE_TEST1)(ID,0)(NAME,"Joe")(LASTNAME,"Smith")(BDATE,20000101);
+	LOG(sql.ToString());
+	sql*Insert(SIMPLE_TEST1)(ID,1)(NAME,"Mike")(LASTNAME,"Smith")(BDATE,20000102);
+	LOG(sql.ToString());
+	sql*Insert(SIMPLE_TEST1)(ID,2)(NAME,"Jon")(LASTNAME,"Goober")(BDATE,20000103);
+	LOG(sql.ToString());
+
+	// Test deletion
+	sql*Delete(SIMPLE_TEST1).Where(ID > 3);
+	LOG(sql.ToString());
+
+	// Test insertion
+	sql*Insert(SIMPLE_TEST1)(ID,5)(NAME,"wrongname")(LASTNAME,"wronglastname")(BDATE,20010604);
+	LOG(sql.ToString());
+
+	// Test update
+	sql*SqlUpdate(SIMPLE_TEST1)(NAME,"rightname")(LASTNAME,"rightlastname")(BDATE,20010604).Where(ID==5);
+	LOG(sql.ToString());
+
+	// Test insertion with args
+	Sql insert("insert into SIMPLE_TEST1(name,bdate) values(?,?)",sqlite3);
+	insert.Run("joseph",19990101);
+	insert.Run(  "neel",19990102);
+	insert.Run(   "bob",19990103);
+	insert.Run(    "al",19990104);
+
+	// Test selection:
+	sql*Select(row).From(SIMPLE_TEST1);
+	LOG(sql.ToString());
+	while (sql.Fetch()) {
+		LOG(Format("%d %s %s %d",sql[0],sql[1],sql[2],sql[3]));
+		LOG(Format("%s %s %s %s",sql[ID],sql[NAME],sql[LASTNAME],sql[BDATE]));
+	}
+
+	// Test selection using *
+	sql*Select(SqlAll()).From(SIMPLE_TEST1);
+	LOG(sql.ToString());
+	while (sql.Fetch()) {
+		LOG(Format("%d %s %s %d",sql[0],sql[1],sql[2],sql[3]));
+		LOG(Format("blank: %s %s %s %s",sql[ID],sql[NAME],sql[LASTNAME],sql[BDATE]));
+	}
+
+	LOG("-- Normal exit of Sqlite3 simple test");
+}
diff --git a/reference/SQL_Sqlite3/simple.h b/reference/SQL_Sqlite3/simple.h
new file mode 100644
index 000000000..cd1743e7a
--- /dev/null
+++ b/reference/SQL_Sqlite3/simple.h
@@ -0,0 +1,12 @@
+#ifndef _SQL_Sqlite3_simple_h_
+#define _SQL_Sqlite3_simple_h_
+
+#include <plugin/sqlite3/Sqlite3.h>
+
+using namespace Upp;
+
+#define SCHEMADIALECT <plugin/sqlite3/Sqlite3Schema.h>
+#define MODEL <SQL_Sqlite3/simple.sch>
+#include "Sql/sch_header.h"
+
+#endif
diff --git a/reference/SQL_Sqlite3/simple.sch b/reference/SQL_Sqlite3/simple.sch
new file mode 100644
index 000000000..5a581c900
--- /dev/null
+++ b/reference/SQL_Sqlite3/simple.sch
@@ -0,0 +1,6 @@
+TABLE_(SIMPLE_TEST1)
+   INT_     (ID) PRIMARY_KEY
+   STRING_  (NAME, 200)
+   STRING_  (LASTNAME, 200)
+   INT_     (BDATE)
+END_TABLE
diff --git a/reference/ScrollBar/ScrollBar.upp b/reference/ScrollBar/ScrollBar.upp
new file mode 100644
index 000000000..2e5af8e01
--- /dev/null
+++ b/reference/ScrollBar/ScrollBar.upp
@@ -0,0 +1,11 @@
+description "Scrolling view using ScrollBar";
+
+uses
+	CtrlLib;
+
+file
+	main.cpp;
+
+mainconfig
+	"" = "GUI";
+
diff --git a/reference/ScrollBar/main.cpp b/reference/ScrollBar/main.cpp
new file mode 100644
index 000000000..f06f57d08
--- /dev/null
+++ b/reference/ScrollBar/main.cpp
@@ -0,0 +1,66 @@
+#include <CtrlLib/CtrlLib.h>
+
+using namespace Upp;
+
+struct App : TopWindow {
+	ScrollBar      sb;
+	int            count;
+
+	int GetLineHeight() { return Arial(20).Info().GetHeight(); }
+
+	virtual void Paint(Draw& w)
+	{
+		Size sz = GetSize();
+		w.DrawRect(sz, SWhite);
+		int fcy = GetLineHeight();
+		int i = sb / fcy;
+		int y = i * fcy - sb;
+		while(i < count && y < sz.cy) {
+			w.DrawText(0, y, AsString(i++, true), Arial(20));
+			y += fcy;
+		}
+	}
+
+	virtual void Layout()
+	{
+		sb.SetPage(GetSize().cy);
+	}
+
+	virtual void MouseWheel(Point, int zdelta, dword)
+	{
+		sb.Wheel(zdelta);
+	}
+
+	bool Key(dword key, int)
+	{
+		return sb.VertKey(key);
+	}
+
+	void SetCount(int n)
+	{
+		count = n;
+		sb.SetTotal(n * GetLineHeight());
+	}
+
+	void Scroll()
+	{
+		Refresh();
+	}
+
+	typedef App CLASSNAME;
+
+	App() {
+		Sizeable().Zoomable().BackPaint();
+		AddFrame(sb);
+		sb.WhenScroll = THISBACK(Scroll);
+		sb.SetLine(GetLineHeight());
+	}
+};
+
+GUI_APP_MAIN
+{
+	App app;
+	app.SetRect(0, 0, 100, 100);
+	app.SetCount(15);
+	app.Run();
+}
diff --git a/reference/ScrollView/ScrollView.upp b/reference/ScrollView/ScrollView.upp
new file mode 100644
index 000000000..02f45e011
--- /dev/null
+++ b/reference/ScrollView/ScrollView.upp
@@ -0,0 +1,11 @@
+description "Scrolling the view area";
+
+uses
+	CtrlLib;
+
+file
+	main.cpp;
+
+mainconfig
+	"" = "GUI";
+
diff --git a/reference/ScrollView/main.cpp b/reference/ScrollView/main.cpp
new file mode 100644
index 000000000..cc3dc0339
--- /dev/null
+++ b/reference/ScrollView/main.cpp
@@ -0,0 +1,38 @@
+#include <CtrlLib/CtrlLib.h>
+
+using namespace Upp;
+
+struct App : public TopWindow {
+	Point pos;
+
+	virtual void Paint(Draw &w)
+	{
+		Size sz = GetSize();
+		for(int i = pos.x / 50 - 50; (i * 50 - pos.y) < sz.cy; i++)
+			for(int j = pos.y / 50 - 50; (j * 50 - pos.x) < sz.cx; j++)
+				w.DrawRect(j * 50 - pos.x, i * 50 - pos.y, 50, 50,
+				           Color(33 * j % 255, 11 * i % 255, 100));
+	}
+
+	virtual bool Key(dword key, int count)
+	{
+		if(key == K_SPACE) {
+			Size sz = GetSize();
+			Size delta(rand() % 50, rand() % 50);
+			pos += delta;
+			ScrollView(-delta);
+		}
+		return true;
+	}
+
+	App()
+	{
+		pos = Point(0, 0);
+	}
+};
+
+GUI_APP_MAIN
+{
+//	Ctrl::ShowRepaint = 30;
+	App().Run();
+}
diff --git a/reference/Serialize/Serialize.upp b/reference/Serialize/Serialize.upp
new file mode 100644
index 000000000..a92d3d564
--- /dev/null
+++ b/reference/Serialize/Serialize.upp
@@ -0,0 +1,11 @@
+description "Persistency by binary serialization";
+
+uses
+	Core;
+
+file
+	main.cpp;
+
+mainconfig
+	"" = "";
+
diff --git a/reference/Serialize/main.cpp b/reference/Serialize/main.cpp
new file mode 100644
index 000000000..019762cd2
--- /dev/null
+++ b/reference/Serialize/main.cpp
@@ -0,0 +1,37 @@
+#include <Core/Core.h>
+
+using namespace Upp;
+
+struct Foo {
+	int         q;
+	String      text;
+	Vector<int> data;
+
+	void Serialize(Stream& s)
+	{
+		s % q % text % data;
+	}
+
+	String ToString() const
+	{
+		String s;
+		s << "q = " << q << ", text = \"" << text << "\", data:";
+		for(int i = 0; i < data.GetCount(); i++)
+			s << ' ' << data[i];
+		return s;
+	}
+
+	Foo() { q = 0; }
+};
+
+CONSOLE_APP_MAIN
+{
+	Foo foo;
+	LoadFromFile(foo, ConfigFile("data.bin"));
+	Cout() << "Loaded Foo: " << foo << '\n';
+	foo.text = FormatIntRoman(foo.q);
+	foo.q++;
+	foo.data.Add(foo.q);
+	StoreToFile(foo, ConfigFile("data.bin"));
+	Cout() << "Saved Foo: " << foo << '\n';
+}
diff --git a/reference/Slider/Slider.upp b/reference/Slider/Slider.upp
new file mode 100644
index 000000000..7125c2475
--- /dev/null
+++ b/reference/Slider/Slider.upp
@@ -0,0 +1,11 @@
+description "SliderCtrl example";
+
+uses
+	CtrlLib;
+
+file
+	main.cpp;
+
+mainconfig
+	"" = "GUI";
+
diff --git a/reference/Slider/main.cpp b/reference/Slider/main.cpp
new file mode 100644
index 000000000..931beb7aa
--- /dev/null
+++ b/reference/Slider/main.cpp
@@ -0,0 +1,36 @@
+#include <CtrlLib/CtrlLib.h>
+
+using namespace Upp;
+
+struct App : TopWindow {
+	StaticRect        dynarect;
+	SliderCtrl        slider;
+	Label             text;
+
+	void Slider() {
+		dynarect.SetRectX(50, ~slider);
+		text = "\1[C6*/@b " + AsString(~slider);
+	}
+
+	typedef App CLASSNAME;
+
+	App() {
+		Sizeable().Zoomable();
+
+		slider <<= THISBACK(Slider);
+		slider.Range(700);
+		slider <<= 250;
+		Add(slider.BottomPosZ(5, 30).HSizePos(10, 10));
+		Slider();
+
+		dynarect.Color(SRed);
+		Add(dynarect.VSizePos(40, 40));
+
+		Add(text.LeftPos(0, 200).TopPos(0, 40));
+	}
+};
+
+GUI_APP_MAIN
+{
+	App().Run();
+}
diff --git a/reference/SliderProgressInd/SliderProgressInd.lay b/reference/SliderProgressInd/SliderProgressInd.lay
new file mode 100644
index 000000000..654f4f53d
--- /dev/null
+++ b/reference/SliderProgressInd/SliderProgressInd.lay
@@ -0,0 +1,3 @@
+LAYOUT(SliderProgressIndLayout, 200, 100)
+END_LAYOUT
+
diff --git a/reference/SliderProgressInd/SliderProgressInd.upp b/reference/SliderProgressInd/SliderProgressInd.upp
new file mode 100644
index 000000000..aa9d3412a
--- /dev/null
+++ b/reference/SliderProgressInd/SliderProgressInd.upp
@@ -0,0 +1,11 @@
+description "Combined Slider and Progress example";
+
+uses
+	CtrlLib;
+
+file
+	main.cpp;
+
+mainconfig
+	"" = "GUI";
+
diff --git a/reference/SliderProgressInd/main.cpp b/reference/SliderProgressInd/main.cpp
new file mode 100644
index 000000000..ba98a82ba
--- /dev/null
+++ b/reference/SliderProgressInd/main.cpp
@@ -0,0 +1,32 @@
+#include <CtrlLib/CtrlLib.h>
+
+using namespace Upp;
+
+struct App : TopWindow {
+	ProgressIndicator progress;
+	SliderCtrl        slider;
+	Label             text;
+
+	void Slider() {
+		progress.Set(~slider, 100);
+		text = "\1[C6*/@b " + AsString(~slider);
+	}
+
+	typedef App CLASSNAME;
+
+	App() {
+		Add(slider.BottomPosZ(5, 30).HSizePos(10, 10));
+		Add(progress.VSizePos(10, 40).HCenterPos(40));
+		Add(text.LeftPos(5, 200).TopPos(5, 40));
+		slider <<= THISBACK(Slider);
+		slider.Range(100);
+		slider <<= 50;
+		Slider();
+		Sizeable().Zoomable();
+	}
+};
+
+GUI_APP_MAIN
+{
+	App().Run();
+}
diff --git a/reference/Splitter/Splitter.upp b/reference/Splitter/Splitter.upp
new file mode 100644
index 000000000..ea35ce7e3
--- /dev/null
+++ b/reference/Splitter/Splitter.upp
@@ -0,0 +1,11 @@
+description "Splitting window into resizable parts";
+
+uses
+	CtrlLib;
+
+file
+	main.cpp;
+
+mainconfig
+	"" = "GUI";
+
diff --git a/reference/Splitter/main.cpp b/reference/Splitter/main.cpp
new file mode 100644
index 000000000..499b9371c
--- /dev/null
+++ b/reference/Splitter/main.cpp
@@ -0,0 +1,38 @@
+#include <CtrlLib/CtrlLib.h>
+
+using namespace Upp;
+
+struct App : public TopWindow
+{
+	Button a, b, c, d;
+	Splitter v, h;
+
+	void Toggle();
+
+	App();
+};
+
+void App::Toggle()
+{
+	h.Zoom(h.GetZoom() == 1 ? -1 : 1);
+}
+
+App::App()
+{
+	a.SetLabel("A");
+	b.SetLabel("B");
+	c.SetLabel("C");
+	d.SetLabel("Toggle!");
+	h.Horz(a, v);
+	v << b << c << d;
+	v.Vert();
+	Add(h.SizePos());
+	Sizeable().Zoomable();
+	d <<= callback(this, &App::Toggle);
+}
+
+
+GUI_APP_MAIN
+{
+	App().Run();
+}
diff --git a/reference/SplitterFrame/SplitterFrame.upp b/reference/SplitterFrame/SplitterFrame.upp
new file mode 100644
index 000000000..bd1cecac6
--- /dev/null
+++ b/reference/SplitterFrame/SplitterFrame.upp
@@ -0,0 +1,11 @@
+description "Resizable frame Ctrls";
+
+uses
+	CtrlLib;
+
+file
+	main.cpp;
+
+mainconfig
+	"" = "GUI";
+
diff --git a/reference/SplitterFrame/main.cpp b/reference/SplitterFrame/main.cpp
new file mode 100644
index 000000000..e095665ef
--- /dev/null
+++ b/reference/SplitterFrame/main.cpp
@@ -0,0 +1,29 @@
+#include <CtrlLib/CtrlLib.h>
+
+using namespace Upp;
+
+struct MyApp : TopWindow {
+	SplitterFrame sf;
+	ArrayCtrl list;
+	TopWindow app;
+
+	virtual void Paint(Draw& w) {
+		w.DrawRect(GetSize(), SColorPaper());
+		w.DrawText(10, 10, "This is view area", Arial(30));
+	}
+
+	MyApp() {
+		AddFrame(sf.Left(list, 100));
+		list.AddColumn("List");
+		for(int i = 0; i < 100; i++)
+			list.Add(FormatIntRoman(i, true));
+		AddFrame(InsetFrame());
+		sf.SizeMin(40).MinSize(40);
+		Sizeable();
+	}
+};
+
+GUI_APP_MAIN
+{
+	MyApp().Run();
+}
diff --git a/reference/StatusBar/StatusBar.upp b/reference/StatusBar/StatusBar.upp
new file mode 100644
index 000000000..f8dc6080e
--- /dev/null
+++ b/reference/StatusBar/StatusBar.upp
@@ -0,0 +1,11 @@
+description "Using StatusBar to provide informations at the bottom of the window";
+
+uses
+	CtrlLib;
+
+file
+	main.cpp;
+
+mainconfig
+	"" = "GUI";
+
diff --git a/reference/StatusBar/main.cpp b/reference/StatusBar/main.cpp
new file mode 100644
index 000000000..a8a7e06f3
--- /dev/null
+++ b/reference/StatusBar/main.cpp
@@ -0,0 +1,60 @@
+#include <CtrlLib/CtrlLib.h>
+
+using namespace Upp;
+
+struct PosDisplay : Display {
+	Color color;
+
+	virtual void Paint(Draw& w, const Rect& r, const Value& q,
+	                   Color ink, Color paper, dword style) const {
+		int i = q;
+		w.DrawRect(0, 0, i, r.Height(), color);
+		w.DrawRect(i, 0, r.Width() - i, r.Height(), SWhite);
+	}
+};
+
+struct App : TopWindow {
+	StatusBar   status;
+	InfoCtrl    pos;
+	InfoCtrl    x, y;
+	PosDisplay  dx, dy;
+
+	virtual void MouseMove(Point p, dword)
+	{
+		pos.Set(0, AsString(p.x), 40);
+		pos.Set(1, AsString(p.y), 40);
+		x.Set(PaintRect(dx, 100 * p.x / GetSize().cx));
+		y.Set(PaintRect(dy, 100 * p.y / GetSize().cy));
+	}
+
+	virtual void LeftDown(Point, dword)
+	{
+		status.Temporary("Left mouse button pressed!");
+	}
+
+	virtual void RightDown(Point, dword)
+	{
+		ProgressInfo f(status);
+		f.Text("Progress:");
+		for(int i = 0; i < 50; i++) {
+			f.Set(i, 50);
+			Sleep(100);
+		}
+	}
+
+	App() {
+		Sizeable();
+		SetFrame(FieldFrame());
+		AddFrame(status);
+		status.AddFrame(pos.Right(100));
+		status.AddFrame(x.Left(100));
+		status.AddFrame(y.Left(100));
+		dx.color = LtRed;
+		dy.color = LtGreen;
+	}
+};
+
+GUI_APP_MAIN
+{
+	App().Run();
+}
diff --git a/reference/TabDlg/TabDlg.lay b/reference/TabDlg/TabDlg.lay
new file mode 100644
index 000000000..4be83a413
--- /dev/null
+++ b/reference/TabDlg/TabDlg.lay
@@ -0,0 +1,14 @@
+#ifdef LAYOUTFILE
+
+LAYOUT(Tab1Layout, 168, 72)
+	ITEM(Option, dv___0, SetLabel(t_("Some option")).LeftPosZ(8, 152).TopPosZ(12, 15))
+	ITEM(EditString, dv___1, LeftPosZ(104, 56).TopPosZ(44, 19))
+	ITEM(Label, dv___2, SetLabel(t_("Some input field")).LeftPosZ(12, 88).TopPosZ(44, 19))
+END_LAYOUT
+
+LAYOUT(Tab2Layout, 100, 96)
+	ITEM(Switch, dv___0, SetLabel(t_("Switch 1\nSwitch 2\nSwitch 3\nSwitch 4")).LeftPosZ(12, 84).TopPosZ(12, 80))
+END_LAYOUT
+
+#endif
+
diff --git a/reference/TabDlg/TabDlg.upp b/reference/TabDlg/TabDlg.upp
new file mode 100644
index 000000000..d0c01a698
--- /dev/null
+++ b/reference/TabDlg/TabDlg.upp
@@ -0,0 +1,12 @@
+description "Tabbed dialogs";
+
+uses
+	CtrlLib;
+
+file
+	main.cpp,
+	TabDlg.lay;
+
+mainconfig
+	"" = "GUI";
+
diff --git a/reference/TabDlg/main.cpp b/reference/TabDlg/main.cpp
new file mode 100644
index 000000000..ff78dbc6a
--- /dev/null
+++ b/reference/TabDlg/main.cpp
@@ -0,0 +1,17 @@
+#include <CtrlLib/CtrlLib.h>
+
+using namespace Upp;
+
+#define LAYOUTFILE <TabDlg/TabDlg.lay>
+#include <CtrlCore/lay.h>
+
+GUI_APP_MAIN
+{
+	TabDlg dlg;
+	WithTab1Layout<ParentCtrl> tab1;
+	WithTab2Layout<ParentCtrl> tab2;
+	dlg(tab1, "Tab1")(tab2, "Tab2")
+	   .OKCancel()
+	   .Title("Tab dialog");
+	dlg.Run();
+}
diff --git a/reference/Timing/Timing.upp b/reference/Timing/Timing.upp
new file mode 100644
index 000000000..8d37f431c
--- /dev/null
+++ b/reference/Timing/Timing.upp
@@ -0,0 +1,11 @@
+description "Timer events";
+
+uses
+	Core;
+
+file
+	main.cpp;
+
+mainconfig
+	"" = "";
+
diff --git a/reference/Timing/main.cpp b/reference/Timing/main.cpp
new file mode 100644
index 000000000..b66a19794
--- /dev/null
+++ b/reference/Timing/main.cpp
@@ -0,0 +1,27 @@
+#include <Core/Core.h>
+
+using namespace Upp;
+
+CONSOLE_APP_MAIN
+{
+	Index<String> index;
+	TimeStop tm;
+	for(int i = 0; i < 1000000; i++) {
+		int x;
+		String q;
+		{
+			RTIMING("rand");
+			x = rand();
+		}
+		{
+			RTIMING("AsString");
+			q = AsString(x);
+		}
+		{
+			RTIMING("Index::FindAdd");
+			index.FindAdd(q);
+		}
+	}
+	RDUMP(index.GetCount());
+	RDUMP(tm.Elapsed());
+}
diff --git a/reference/Topic/Topic.cpp b/reference/Topic/Topic.cpp
new file mode 100644
index 000000000..1cc36584c
--- /dev/null
+++ b/reference/Topic/Topic.cpp
@@ -0,0 +1,13 @@
+#include <CtrlLib/CtrlLib.h>
+
+using namespace Upp;
+
+#define TOPICFILE <Topic/app.tpp/all.i>
+#include <Core/topic_group.h>
+
+GUI_APP_MAIN
+{
+	HelpWindow help;
+	help.GoTo("topic://Topic/app/main$en-us");
+	help.Execute();
+}
diff --git a/reference/Topic/Topic.upp b/reference/Topic/Topic.upp
new file mode 100644
index 000000000..61b53e19b
--- /dev/null
+++ b/reference/Topic/Topic.upp
@@ -0,0 +1,12 @@
+description "Using TheIDE documentation editor (Topic++) to provide application help";
+
+uses
+	CtrlLib;
+
+file
+	Topic.cpp,
+	app.tpp;
+
+mainconfig
+	"" = "GUI";
+
diff --git a/reference/Topic/app.tpp/all.i b/reference/Topic/app.tpp/all.i
new file mode 100644
index 000000000..f405f76a0
--- /dev/null
+++ b/reference/Topic/app.tpp/all.i
@@ -0,0 +1,8 @@
+TOPIC("main$en-us")
+#include "main$en-us.tpp"
+END_TOPIC
+
+TOPIC("page2$en-us")
+#include "page2$en-us.tpp"
+END_TOPIC
+
diff --git a/reference/Topic/app.tpp/main$en-us.tpp b/reference/Topic/app.tpp/main$en-us.tpp
new file mode 100644
index 000000000..ea0e4348f
--- /dev/null
+++ b/reference/Topic/app.tpp/main$en-us.tpp
@@ -0,0 +1,11 @@
+TITLE("This is Topic++ example page")
+COMPRESSED
+120,156,139,86,80,81,49,208,49,80,54,32,0,172,92,82,
+211,18,75,115,74,98,163,171,227,107,85,93,253,116,67,131,
+21,162,139,13,172,109,181,204,20,66,50,50,139,21,128,40,
+36,191,32,51,57,65,59,65,91,33,181,34,49,183,32,39,
+85,161,32,49,61,85,45,22,164,78,1,74,193,212,38,42,
+68,199,149,128,213,91,37,232,39,232,67,180,234,39,22,20,
+36,232,131,52,25,37,168,164,230,37,232,150,22,199,41,228,
+100,230,101,43,148,228,43,36,230,229,151,100,164,22,129,205,
+140,213,131,26,23,11,0,249,110,57,237,
\ No newline at end of file
diff --git a/reference/Topic/app.tpp/page2$en-us.tpp b/reference/Topic/app.tpp/page2$en-us.tpp
new file mode 100644
index 000000000..685bf5b06
--- /dev/null
+++ b/reference/Topic/app.tpp/page2$en-us.tpp
@@ -0,0 +1,7 @@
+TITLE("This is Topic++ example page 2")
+COMPRESSED
+120,156,139,86,80,81,49,208,49,80,54,32,0,172,92,82,
+211,18,75,115,74,98,163,171,227,107,85,93,253,116,67,131,
+21,162,139,13,172,21,66,50,50,139,21,128,168,36,35,85,
+33,49,47,31,72,21,41,20,36,166,167,234,197,2,0,214,
+14,24,213,
\ No newline at end of file
diff --git a/reference/TrayIcon/TrayIcon.upp b/reference/TrayIcon/TrayIcon.upp
new file mode 100644
index 000000000..43e8ec385
--- /dev/null
+++ b/reference/TrayIcon/TrayIcon.upp
@@ -0,0 +1,12 @@
+description "Placing icon into platform tray area";
+
+uses
+	CtrlLib;
+
+file
+	main.cpp,
+	tray.iml;
+
+mainconfig
+	"" = "GUI";
+
diff --git a/reference/TrayIcon/icon.ico b/reference/TrayIcon/icon.ico
new file mode 100644
index 000000000..4012786aa
Binary files /dev/null and b/reference/TrayIcon/icon.ico differ
diff --git a/reference/TrayIcon/main.cpp b/reference/TrayIcon/main.cpp
new file mode 100644
index 000000000..89791d5df
--- /dev/null
+++ b/reference/TrayIcon/main.cpp
@@ -0,0 +1,37 @@
+#include <CtrlLib/CtrlLib.h>
+
+using namespace Upp;
+
+#define IMAGECLASS Tray
+#define IMAGEFILE  <TrayIcon/tray.iml>
+#include <Draw/iml.h>
+
+struct App : TrayIcon {
+	virtual void LeftDouble() {
+		Icon(Tray::Icon1());
+		PromptOK("TrayIcon launched this prompt!");
+		Icon(Tray::Icon());
+	}
+	
+	virtual void LeftDown() {
+		Info("TrayIcon", "You have clicked the TrayIcon!\n""TrayIcon is U++ reference example.");
+	}
+
+	virtual void Menu(Bar& bar) {
+		bar.Add("Info..", THISBACK(LeftDouble));
+		bar.Separator();
+		bar.Add("Exit", THISBACK(Break));
+	}
+
+	typedef App CLASSNAME;
+
+	App() {
+		Icon(Tray::Icon());
+		Tip("This is U++ TrayIcon");
+	}
+};
+
+GUI_APP_MAIN
+{
+	App().Run();
+}
diff --git a/reference/TrayIcon/tray.iml b/reference/TrayIcon/tray.iml
new file mode 100644
index 000000000..356cae742
--- /dev/null
+++ b/reference/TrayIcon/tray.iml
@@ -0,0 +1,36 @@
+IMAGE_BEGIN(Icon)
+	IMAGE_SCAN("Ņ\0\0\0�")
+	IMAGE_SCAN("Â\0\0\0\2\0\377\377\0��\0\377\377�\0\0\0�")
+	IMAGE_SCAN("�\3\0\0\0\0\377\377\0��\0\377\377\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\377\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\377��\0\0�\0\377\377��\0\0�\0\377\377\1\0\0\0�")
+	IMAGE_SCAN("\1\0\0\0�\0\377\377��\0\0�\0\377\377��\0\0�\0\377\377\1\0\0\0�")
+	IMAGE_SCAN("\1\0\0\0�\0\377\377\1\0���\0\377\377\1\0\0\0�")
+	IMAGE_SCAN("\1\0\0\0�\0\377\377\1\0���\0\377\377\1\0\0\0�")
+	IMAGE_SCAN("\1\0\0\0�\0\377\377\1\0���\0\377\377\1\0\0\0�")
+	IMAGE_SCAN("\1\0\0\0�\0\377\377\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\377\1\0\0��\0\377\377\1\0\0��\0\377\377\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\377�\0\0��\0\377\377\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\377\1\0\0\0�")
+	IMAGE_SCAN("Â\0\0\0�\0\377\377�\0\0\0�")
+	IMAGE_SCAN("Ņ\0\0\0�")
+	IMAGE_SCAN("�")
+IMAGE_PACKED(Icon, "\2\20\0\0\0\20\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(Icon1)
+	IMAGE_SCAN("Ņ\0\0\0�")
+	IMAGE_SCAN("Â\0\0\0�\0\377\377�\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\377\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\377\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\377��\0\0�\0\377\377��\0\0�\0\377\377\1\0\0\0�")
+	IMAGE_SCAN("\1\0\0\0�\0\377\377��\0\0\3\0\377\377\0��\0\377\377��\0\0�\0\377\377\1\0\0\0�")
+	IMAGE_SCAN("\1\0\0\0�\0\377\377\1\0���\0\377\377\1\0\0\0�")
+	IMAGE_SCAN("\1\0\0\0�\0\377\377\1\0���\0\377\377\1\0\0\0�")
+	IMAGE_SCAN("\3\0\0\0\0\377\377\0\0��\0\377\377\3\0\0�\0\377\377\0\0\0�")
+	IMAGE_SCAN("\1\0\0\0�\0\377\377�\0\0��\0\377\377\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\377\1\0\0��\377\377\377\1\0\0��\0\377\377\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\377�\0\0��\0\377\377\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\377\1\0\0\0�")
+	IMAGE_SCAN("Â\0\0\0�\0\377\377�\0\0\0�")
+	IMAGE_SCAN("Ņ\0\0\0�")
+	IMAGE_SCAN("�")
+IMAGE_PACKED(Icon1, "\2\20\0\0\0\20\0\0\0\0\0\0\0\377\377\377\377\0\0\0\0")
diff --git a/reference/TreeCtrl/TreeCtrl.upp b/reference/TreeCtrl/TreeCtrl.upp
new file mode 100644
index 000000000..ce23f82fb
--- /dev/null
+++ b/reference/TreeCtrl/TreeCtrl.upp
@@ -0,0 +1,11 @@
+description "TreeCtrl used to show file hierarchy, editors in TreeCtrl and OptionTree example";
+
+uses
+	CtrlLib;
+
+file
+	main.cpp;
+
+mainconfig
+	"" = "GUI";
+
diff --git a/reference/TreeCtrl/main.cpp b/reference/TreeCtrl/main.cpp
new file mode 100644
index 000000000..8b7f1705e
--- /dev/null
+++ b/reference/TreeCtrl/main.cpp
@@ -0,0 +1,91 @@
+#include "CtrlLib/CtrlLib.h"
+
+using namespace Upp;
+
+struct App : TopWindow {
+	Splitter   horz;
+	TreeCtrl   tree1;
+	TreeCtrl   tree2;
+	OptionTree optree;
+	Option     x[10];
+	StatusBar  info;
+	Array<EditString> edit;
+
+	typedef App CLASSNAME;
+
+	void OpenDir(int id) {
+		String path = tree1[id];
+		for(FindFile ff(AppendFileName(path, "*.*")); ff; ff.Next()) {
+			String n = ff.GetName();
+			if(n != "." && n != "..")
+				tree1.Add(id, ff.IsFolder() ? CtrlImg::error() : CtrlImg::File(),
+				          AppendFileName(path, n), n, ff.IsFolder());
+		}
+	}
+
+	void CloseDir(int id) {
+		tree1.RemoveChildren(id);
+	}
+
+	void LoadTree(int parent, const String& path, Progress& pi)
+	{
+		pi.SetText(DeFormat(path));
+		for(FindFile ff(AppendFileName(path, "*.*")); ff; ff.Next()) {
+			if(pi.StepCanceled())
+				return;
+			String n = ff.GetName();
+			if(n != "." && n != "..") {
+				edit.Add();
+				edit.Top() <<= n;
+				int q;
+				static int x;
+				if(++x & 1)
+					q = tree2.Add(parent, ff.IsFolder() ? CtrlImg::Dir() : CtrlImg::File(),
+				                  edit.Top(), 150);
+				else
+				 	q = tree2.Add(parent, ff.IsFolder() ? CtrlImg::Dir() : CtrlImg::File(), n);
+				if(ff.IsFolder())
+					LoadTree(q, AppendFileName(path, n), pi);
+			}
+		}
+	}
+
+	void ShowPath() {
+		info = ~tree1;
+	}
+
+
+	App() {
+		horz.Add(tree1);
+		horz.Add(tree2);
+		horz.Add(optree);
+		Add(horz.Horz().SizePos());
+		optree.SetRoot("everything");
+		for(int i = 0; i < 10; i++)
+			optree.Add(i ? rand() % i : 0, x[i], AsString(i));
+		tree1.MultiSelect();
+		tree1.WhenOpen = THISBACK(OpenDir);
+		tree1.WhenClose = THISBACK(CloseDir);
+	#ifdef PLATFORM_WIN32
+		String dir = String(GetExeFilePath()[0], 1) + ":\\";
+	#else
+		String dir = "/usr";
+	#endif
+		tree1.SetRoot(CtrlImg::Dir(), dir);
+		tree2.SetRoot(CtrlImg::Dir(), dir);
+		Progress pi;
+		pi.AlignText(ALIGN_LEFT);
+		LoadTree(0, dir, pi);
+		tree2.NoCursor().NoRoot();
+		tree2.SortDeep(0);
+		Sizeable();
+
+		tree1.WhenCursor = THISBACK(ShowPath);
+		tree1.AddFrame(info);
+	}
+};
+
+GUI_APP_MAIN
+{
+	App().Run();
+}
diff --git a/reference/TreeCtrlDnD/TreeCtrlDnD.upp b/reference/TreeCtrlDnD/TreeCtrlDnD.upp
new file mode 100644
index 000000000..6d4b1ace6
--- /dev/null
+++ b/reference/TreeCtrlDnD/TreeCtrlDnD.upp
@@ -0,0 +1,11 @@
+description "Drag & Drop with TreeCtrl as target";
+
+uses
+	CtrlLib;
+
+file
+	main.cpp;
+
+mainconfig
+	"" = "GUI";
+
diff --git a/reference/TreeCtrlDnD/main.cpp b/reference/TreeCtrlDnD/main.cpp
new file mode 100644
index 000000000..5a2d12432
--- /dev/null
+++ b/reference/TreeCtrlDnD/main.cpp
@@ -0,0 +1,54 @@
+#include "CtrlLib/CtrlLib.h"
+
+using namespace Upp;
+
+struct App : TopWindow {
+	TreeCtrl   tree;
+
+	typedef App CLASSNAME;
+
+	void DropInsert(int parent, int ii, PasteClip& d)
+	{
+		tree.AdjustAction(parent, d);
+		if(AcceptInternal<TreeCtrl>(d, "mytreedrag")) {
+			tree.InsertDrop(parent, ii, d);
+			tree.SetFocus();
+			return;
+		}
+		if(AcceptText(d)) {
+			tree.SetCursor(tree.Insert(parent, ii, Image(), GetString(d)));
+			tree.SetFocus();
+			return;
+		}
+	}
+
+	void Drag()
+	{
+		if(tree.DoDragAndDrop(InternalClip(tree, "mytreedrag"),
+		                       tree.GetDragSample()) == DND_MOVE)
+			tree.RemoveSelection();
+	}
+
+	App() {
+		Add(tree.SizePos());
+		Vector<int> parent, parent2;
+		parent.Add(0);
+		tree.SetRoot(Image(), "The Tree");
+		for(int i = 1; i < 10000; i++) {
+			parent.Add(tree.Add(parent[rand() % parent.GetCount()], Image(),
+			            FormatIntRoman(i, true)));
+			if((rand() & 3) == 0)
+				tree.Open(parent.Top());
+		}
+		tree.Open(0);
+		tree.WhenDropInsert = THISBACK(DropInsert);
+		tree.WhenDrag = THISBACK(Drag);
+		tree.MultiSelect();
+		Sizeable();
+	}
+};
+
+GUI_APP_MAIN
+{
+	App().Run();
+}
diff --git a/reference/UscCtrl/UscCtrl.upp b/reference/UscCtrl/UscCtrl.upp
new file mode 100644
index 000000000..f7971a09f
--- /dev/null
+++ b/reference/UscCtrl/UscCtrl.upp
@@ -0,0 +1,12 @@
+description "Creating .usc script to get custom widget represented in layout editor";
+
+uses
+	Counter;
+
+file
+	main.lay,
+	main.cpp;
+
+mainconfig
+	"" = "GUI";
+
diff --git a/reference/UscCtrl/main.cpp b/reference/UscCtrl/main.cpp
new file mode 100644
index 000000000..a1be4941e
--- /dev/null
+++ b/reference/UscCtrl/main.cpp
@@ -0,0 +1,13 @@
+#include <Counter/Counter.h>
+
+#define   LAYOUTFILE <UscCtrl/main.lay>
+#include  <CtrlCore/lay.h>
+
+GUI_APP_MAIN
+{
+	WithMainLayout<TopWindow> x;
+	x.counter <<= 10;
+	CtrlLayout(x);
+	x.Run();
+	PromptOK(AsString(~x.counter));
+}
diff --git a/reference/UscCtrl/main.lay b/reference/UscCtrl/main.lay
new file mode 100644
index 000000000..aa9d2fc5c
--- /dev/null
+++ b/reference/UscCtrl/main.lay
@@ -0,0 +1,5 @@
+LAYOUT(MainLayout, 404, 204)
+	ITEM(CounterCtrl, counter, SetFont(Roman(34)).Ink(Color(153, 0, 51)).Paper(Color(102, 204, 204)).LeftPosZ(128, 120).TopPosZ(56, 52))
+	ITEM(LabelBox, dv___1, SetLabel(t_("This is the CounterCtrl")).LeftPosZ(98, 184).TopPosZ(36, 80))
+END_LAYOUT
+
diff --git a/reference/Value/Value.cpp b/reference/Value/Value.cpp
new file mode 100644
index 000000000..f296b93d5
--- /dev/null
+++ b/reference/Value/Value.cpp
@@ -0,0 +1,87 @@
+#include <Core/Core.h>
+
+using namespace Upp;
+
+struct RawFoo {
+	String a;
+	int    b;
+};
+
+struct RichFoo : AssignValueTypeNo<RichFoo, 513, Comparable<RichFoo, Moveable<RichFoo> > > {
+	String a;
+	int    b;
+
+	int      Compare(const RichFoo& o) const { return CombineCompare(a, o.a)(b, o.b); }
+	void     Serialize(Stream& s)            { s % a % b; }
+	String   ToString() const                { return String().Cat() << a << ", " << b; }
+	unsigned GetHashValue() const            { return CombineHash(a, b); }
+	bool     IsNullInstance() const          { return IsNull(a); }
+
+	operator Value() const                   { return RichValue<RichFoo>(*this); }
+	RichFoo(const Value& v)                  { *this = ValueTo<RichFoo>(v); }
+
+	RichFoo()                                {}
+};
+
+INITBLOCK
+{
+	RichValue<RichFoo>::Register();
+}
+
+void Print(const Value& x)
+{
+	Cout() << "-------\n";
+	Cout() << "Value: " << x << '\n';
+	if(IsError(x))
+		Cout() << "Value is Error: " << GetErrorText(x) << '\n';
+	else
+	if(IsNull(x))
+		Cout() << "Value is Null\n";
+	else
+	if(IsString(x))
+		Cout() << "Value is String: " << (String)x << '\n';
+	else
+	if(IsNumber(x))
+		Cout() << "Value is a number: " << (double)x << '\n';
+	else
+	if(IsDateTime(x))
+		Cout() << "Value is either date or time: " << (Date)x << '\n';
+	else
+	if(IsType<RichFoo>(x))
+		Cout() << "Value is of RichFoo type: " << (RichFoo)x << '\n';
+	else
+	if(IsTypeRaw<RawFoo>(x)) {
+		const RawFoo& r = ValueTo<RawFoo>(x);
+		Cout() << "Value is of RawFoo type: " << r.a << ", " << r.b << '\n';
+	}
+	else
+		Cout() << "Value is of another type: " << x.GetType() << '\n';
+}
+
+CONSOLE_APP_MAIN
+{
+	Print(12);
+	Print(12.12);
+	Print((int)Null);
+	Print(Null);
+	Print("some text");
+	Print(GetSysDate());
+	Print(White());
+	Print(Rect(1, 2, 3, 4));
+	Print(Point(5, 6));
+	Print(ErrorValue("test error"));
+
+	RichFoo x;
+	x.a = "SOMETHING";
+	x.b = 123456;
+	Print(x);
+	String bindata = StoreAsString(x);
+	RichFoo xx;
+	LoadFromString(xx, bindata);
+	Print(xx);
+
+	RawFoo y;
+	y.a = "TEXT";
+	y.b = 321;
+	Print(RawToValue(y));
+}
diff --git a/reference/Value/Value.upp b/reference/Value/Value.upp
new file mode 100644
index 000000000..64496d50e
--- /dev/null
+++ b/reference/Value/Value.upp
@@ -0,0 +1,11 @@
+description "Using Value to store any data";
+
+uses
+	Core;
+
+file
+	Value.cpp;
+
+mainconfig
+	"" = "";
+
diff --git a/reference/VirtualArray/VirtualArray.upp b/reference/VirtualArray/VirtualArray.upp
new file mode 100644
index 000000000..aca90c7b5
--- /dev/null
+++ b/reference/VirtualArray/VirtualArray.upp
@@ -0,0 +1,11 @@
+description "Using ArrayCtrl without storing any real data to it";
+
+uses
+	CtrlLib;
+
+file
+	main.cpp;
+
+mainconfig
+	"" = "GUI";
+
diff --git a/reference/VirtualArray/main.cpp b/reference/VirtualArray/main.cpp
new file mode 100644
index 000000000..8e298c124
--- /dev/null
+++ b/reference/VirtualArray/main.cpp
@@ -0,0 +1,44 @@
+#include <CtrlLib/CtrlLib.h>
+
+using namespace Upp;
+
+static String sNumberAsText(int number)
+{
+	static const char * const digits[20] = {
+		"", "one", "two", "three", "four", "five", "six", "seven", "eight", "nine",
+		"ten", "eleven", "twelve", "thirteen", "fourteen", "fifteen", "sixteen",
+		"seventeen", "eighteen", "nineteen"
+	};
+	static const char * const tens[10] = {
+		"", "ten", "twenty", "thirty", "fourty", "fifty", "sixty", "seventy", "eighty", "ninety"
+	};
+
+	if(number < 20)
+		return digits[number];
+	if(number < 100)
+		return tens[number / 10] + String(" ") + sNumberAsText(number % 10);
+	if(number < 1000)
+		return digits[number / 100] + String(" hundred ") + sNumberAsText(number % 100);
+	if(number < 1000000)
+		return sNumberAsText(number / 1000) + " thousand, " + sNumberAsText(number % 1000);
+	return "";
+}
+
+struct NumberToText : public Convert {
+	virtual Value  Format(const Value& q) const {
+		int n = q;
+		return n == 0 ? String("zero") : sNumberAsText(n);
+	}
+};
+
+GUI_APP_MAIN
+{
+	ArrayCtrl array;
+	array.AddRowNumColumn("number", 20);
+	array.AddRowNumColumn("text", 80).SetConvert(Single<NumberToText>());
+	array.SetVirtualCount(900000);
+	TopWindow win;
+	win.Zoomable().Sizeable();
+	win.Add(array.SizePos());
+	win.Run();
+}
diff --git a/reference/XML/XML.cpp b/reference/XML/XML.cpp
new file mode 100644
index 000000000..cf87cecd1
--- /dev/null
+++ b/reference/XML/XML.cpp
@@ -0,0 +1,111 @@
+#include <Core/Core.h>
+
+using namespace Upp;
+
+struct Data {
+	Size                   sz;
+	int                    lang;
+	String                 text;
+	VectorMap<String, int> score;
+	double                 number;
+
+	void   Dump();
+	String ToXML();
+	void   LoadXML(XmlParser& p);
+};
+
+void   Data::Dump()
+{
+	DUMP(sz);
+	DUMP(text);
+	LOG("lang: " << LNGAsText(lang));
+	LOG("score: ");
+	for(int i = 0; i < score.GetCount(); i++)
+		LOG("   " << score.GetKey(i) << " ..... " << score[i]);
+	DUMP(number);
+}
+
+String Data::ToXML()
+{
+	String scores;
+	for(int i = 0; i < score.GetCount(); i++)
+		scores << XmlTag("Player")("name", score.GetKey(i))("score", score[i])();
+	return
+		XmlHeader() +
+		XmlTag("Configuration") (
+			XmlTag("Language")("id", LNGAsText(lang))() +
+			XmlTag("Dimension")("x", sz.cx)("y", sz.cy)() +
+			XmlTag("text").Text(text) +
+			XmlTag("Scores") (scores) +
+			XmlTag("Number")("value", number)()
+		);
+}
+
+void   Data::LoadXML(XmlParser& p)
+{
+	while(!p.IsTag())
+		p.Skip();
+	p.PassTag("Configuration");
+	while(!p.End())
+		if(p.TagE("Language"))
+			lang = LNGFromText(p["id"]);
+		else
+		if(p.TagE("Dimension")) {
+			sz.cx = minmax(p.Int("x"), 1, 32);
+			sz.cy = minmax(p.Int("y"), 1, 32);
+		}
+		else
+		if(p.Tag("Scores"))
+			while(!p.End()) {
+				if(p.TagE("Player")) {
+					int& x = score.GetAdd(p["name"]);
+					x = p.Int("score");
+				}
+				else
+					p.Skip();
+			}
+		else
+		if(p.Tag("text")) {
+			text = p.ReadText();
+			p.PassEnd();
+		}
+		else
+		if(p.TagE("Number")) {
+			number = p.Double("value");
+		}
+		else
+			p.Skip();
+}
+
+CONSOLE_APP_MAIN
+{
+	Data x;
+	x.sz.cx = 10;
+	x.sz.cy = 20;
+	x.lang = LNGFromText("CS-CZ");
+	x.text = "Some text";
+	x.score.Add("peter", 100);
+	x.score.Add("john", 10);
+	x.score.Add("frank", 20);
+	x.number = 1.2345e100;
+
+	x.Dump();
+	String xml = x.ToXML();
+	LOG("\n---- XmlTag (encoding) -----------------");
+	LOG(xml);
+
+	LOG("\n---- XmlParser -----------------");
+	Data y;
+	XmlParser p(xml);
+	y.LoadXML(p);
+	y.Dump();
+
+	LOG("\n---- XmlNode -----------------");
+	XmlNode xn = ParseXML(xml);
+	LOG("Dimension x: " << xn["Configuration"]["Dimension"].Attr("x"));
+	xn("Configuration").Remove("Scores");
+	XmlNode& n = xn("Configuration")("TEST");
+	n.SetAttr("test_attr", "23");
+	LOG(AsXML(xn));
+	LOG("Missing tag: " << xn["Configuration"]["MISSING_TAG"].Attr("doesnotmatter"));
+}
diff --git a/reference/XML/XML.upp b/reference/XML/XML.upp
new file mode 100644
index 000000000..5beb6ca54
--- /dev/null
+++ b/reference/XML/XML.upp
@@ -0,0 +1,11 @@
+description "Creating and parsing XML files";
+
+uses
+	Core;
+
+file
+	XML.cpp;
+
+mainconfig
+	"" = "";
+
diff --git a/reference/Xmlize/Xmlize.cpp b/reference/Xmlize/Xmlize.cpp
new file mode 100644
index 000000000..7ad0ce332
--- /dev/null
+++ b/reference/Xmlize/Xmlize.cpp
@@ -0,0 +1,78 @@
+#include <Core/Core.h>
+
+using namespace Upp;
+
+struct Data {
+	Size                      sz;
+	int                       lang;
+	String                    text;
+	Vector<Size>              vector;
+	VectorMap<String, int>    score;
+	VectorMap<String, String> map;
+	ArrayMap<int, Size>       sizemap;
+	double                    number;
+	bool                      option;
+
+	void Dump();
+	void Xmlize(XmlIO xml);
+};
+
+void Data::Xmlize(XmlIO xml)
+{
+	xml
+		("Dimension", sz)
+		("text", text)
+		("vector", vector)
+		("Scores", score)
+		("map", map)
+		("sizemap", sizemap)
+		("number", number)
+		("option", option)
+	;
+	XmlizeLang(xml, "Language", lang);
+}
+
+void   Data::Dump()
+{
+	DUMP(sz);
+	DUMP(text);
+	LOG("lang: " << LNGAsText(lang));
+	DUMPC(vector);
+	LOG("score: ");
+	for(int i = 0; i < score.GetCount(); i++)
+		LOG("   " << score.GetKey(i) << " ..... " << score[i]);
+	LOG("map: ");
+	for(int i = 0; i < map.GetCount(); i++)
+		LOG("   " << map.GetKey(i) << " ..... " << map[i]);
+	LOG("sizemap: ");
+	for(int i = 0; i < sizemap.GetCount(); i++)
+		LOG("   " << sizemap.GetKey(i) << " ..... " << sizemap[i]);
+	DUMP(number);
+	DUMP(option);
+}
+
+CONSOLE_APP_MAIN
+{
+	Data x;
+	x.sz.cx = 10;
+	x.sz.cy = 20;
+	x.lang = LNGFromText("CS-CZ");
+	x.text = "Some text";
+	x.vector.Add(Size(1, 2));
+	x.vector.Add(Size(3, 4));
+	x.score.Add("peter", 100);
+	x.score.Add("john", 10);
+	x.score.Add("frank", 20);
+	x.map.Add("keytext", "valuetext");
+	x.map.Add("key1text", "value1text");
+	x.sizemap.Add(1, Size(2, 3));
+	x.sizemap.Add(10, Size(20, 30));
+	x.number = -1.235e-30;
+	x.option = true;
+
+	StoreAsXMLFile(x);
+
+	Data y;
+	LoadFromXMLFile(y);
+	y.Dump();
+}
diff --git a/reference/Xmlize/Xmlize.upp b/reference/Xmlize/Xmlize.upp
new file mode 100644
index 000000000..7743e5b0c
--- /dev/null
+++ b/reference/Xmlize/Xmlize.upp
@@ -0,0 +1,11 @@
+description "Persistency using XML";
+
+uses
+	Core;
+
+file
+	Xmlize.cpp;
+
+mainconfig
+	"" = "";
+
diff --git a/reference/brc/bin.brc b/reference/brc/bin.brc
new file mode 100644
index 000000000..7ace759ae
--- /dev/null
+++ b/reference/brc/bin.brc
@@ -0,0 +1,3 @@
+BINARY(bin_cpp, "bin.cpp" BZ2)
+BINARY(bin_brc, "bin.brc" BZ2)
+BINARY_MASK(bin_all, "bin.*" BZ2)
diff --git a/reference/brc/bin.cpp b/reference/brc/bin.cpp
new file mode 100644
index 000000000..a8a9f5177
--- /dev/null
+++ b/reference/brc/bin.cpp
@@ -0,0 +1,34 @@
+#include <Core/Core.h>
+#include "bin.brc"
+#include <plugin/bz2/bz2.h>
+
+using namespace Upp;
+
+//**
+
+CONSOLE_APP_MAIN
+{
+	puts(String().Cat() << "brc length: " << bin_brc_length);
+	fflush(stdout);
+	puts(String().Cat() << "cpp length: " << bin_cpp_length);
+	fflush(stdout);
+	puts(String().Cat() << "all count:  " << bin_all_count);
+	fflush(stdout);
+//	puts(String().Cat() << "cpp: <<<\n" << (const char *)bin_cpp << "\n>>>");
+	MemReadStream in1(bin_cpp, bin_cpp_length);
+	puts(String().Cat() << "cpp: <<<\n" << BZ2Decompress(in1) << "\n>>>");
+	fflush(stdout);
+//	puts(String().Cat() << "brc: <<<\n" << (const char *)bin_brc << "\n>>>");
+	MemReadStream in2(bin_brc, bin_brc_length);
+	puts(String().Cat() << "brc: <<<\n" << BZ2Decompress(in2) << "\n>>>");
+	fflush(stdout);
+	for(int i = 0; i < bin_all_count; i++) {
+		puts(String().Cat() << "all length[" << i << "]: " << bin_all_length[i]);
+		fflush(stdout);
+		puts(String().Cat() << "all files[" << i << "]: " << bin_all_files[i]);
+		fflush(stdout);
+		MemReadStream in3(bin_all[i], bin_all_length[i]);
+		puts(String().Cat() << "all[" << i << "]: <<<\n" << BZ2Decompress(in3) << "\n>>>");
+		fflush(stdout);
+	}
+}
diff --git a/reference/brc/brc.upp b/reference/brc/brc.upp
new file mode 100644
index 000000000..37272dd78
--- /dev/null
+++ b/reference/brc/brc.upp
@@ -0,0 +1,15 @@
+description "Including binary data into application";
+
+uses
+	Core,
+	plugin\bz2;
+
+file
+	ship.usc,
+	bin.cpp,
+	bin.brc
+		depends() bin.cpp;
+
+mainconfig
+	"" = "";
+
diff --git a/reference/brc/ship.usc b/reference/brc/ship.usc
new file mode 100644
index 000000000..14e97703c
--- /dev/null
+++ b/reference/brc/ship.usc
@@ -0,0 +1,13 @@
+macro "Ship" Ctrl+Shift+W {
+	ClearConsole();
+	cout("Building BRC...");
+	if(!Build(""))
+		cout("Error building BRC.");
+	else {
+		cout("Shipping BRC...");
+		if(!BuildProject("BRC/ship", ""))
+			cout("Error shipping BRC.");
+		else
+			cout("Build finished successfully.");
+	}
+}
diff --git a/reference/brc/ship/ship.brc b/reference/brc/ship/ship.brc
new file mode 100644
index 000000000..4fc96e584
--- /dev/null
+++ b/reference/brc/ship/ship.brc
@@ -0,0 +1 @@
+BINARY(BRC, "d:/temp/brc.exe" BZ2)
diff --git a/reference/brc/ship/ship.cpp b/reference/brc/ship/ship.cpp
new file mode 100644
index 000000000..cb0fa53c3
--- /dev/null
+++ b/reference/brc/ship/ship.cpp
@@ -0,0 +1,13 @@
+#include <Core/Core.h>
+#include <plugin/bz2/bz2.h>
+
+using namespace Upp;
+
+#include "ship.brc"
+
+CONSOLE_APP_MAIN
+{
+	puts("Unpacking BRC.exe...");
+	if(!SaveFile("BRC.exe", BZ2Decompress(MemReadStream(BRC, BRC_length))))
+		puts("Error unpacking file!");
+}
diff --git a/reference/brc/ship/ship.upp b/reference/brc/ship/ship.upp
new file mode 100644
index 000000000..5568e3392
--- /dev/null
+++ b/reference/brc/ship/ship.upp
@@ -0,0 +1,12 @@
+description "Using binary data for installation";
+
+uses
+	plugin\bz2;
+
+file
+	ship.cpp,
+	ship.brc;
+
+mainconfig
+	"" = "";
+
diff --git a/reference/brc/simplebin.brc b/reference/brc/simplebin.brc
new file mode 100644
index 000000000..03cf96a9e
--- /dev/null
+++ b/reference/brc/simplebin.brc
@@ -0,0 +1,5 @@
+BINARY(source, "simplebin.cpp")
+BINARY(binsrc, "simplebin.brc")
+BINARY_ARRAY(array, 0, "simplebin.cpp")
+BINARY_ARRAY(array, 1, "simplebin.brc")
+BINARY_ARRAY(array, 2, "simplebin.upp")
diff --git a/reference/brc/simplebin.cpp b/reference/brc/simplebin.cpp
new file mode 100644
index 000000000..028c78c57
--- /dev/null
+++ b/reference/brc/simplebin.cpp
@@ -0,0 +1,12 @@
+#include <Core/Core.h>
+
+#include "simplebin.brc"
+
+CONSOLE_APP_MAIN
+{
+	puts(NFormat("source (%d) = %s...%s", source_length, String(source, 20), String(source + source_length - 20, 20)));
+	puts(NFormat("binsrc (%d) = %s...%s", binsrc_length, String(binsrc, 20), String(binsrc + binsrc_length - 20, 20)));
+	puts(NFormat("array_count = %d", array_count));
+	for(int i = 0; i < array_count; i++)
+		puts(NFormat("array[%d] (%d) = %s...%s", i, array_length[i], String(array[i], 20), String(array[i] + array_length[i] - 20, 20)));
+}
diff --git a/reference/iml/icon.ico b/reference/iml/icon.ico
new file mode 100644
index 000000000..4012786aa
Binary files /dev/null and b/reference/iml/icon.ico differ
diff --git a/reference/iml/image.cpp b/reference/iml/image.cpp
new file mode 100644
index 000000000..7fa65d2b5
--- /dev/null
+++ b/reference/iml/image.cpp
@@ -0,0 +1,28 @@
+#include <CtrlLib/CtrlLib.h>
+
+using namespace Upp;
+
+#define  IMAGEFILE  <iml/image.iml>
+#define  IMAGECLASS MyImg
+#include <Draw/iml.h>
+
+struct App : TopWindow {
+	void Paint(Draw& w)
+	{
+		Size sz = GetSize();
+		w.DrawRect(sz, SGray);
+		Size isz = MyImg::Smiley().GetSize();
+		w.DrawImage((sz.cx - isz.cx) / 2, (sz.cy - isz.cy) / 2, MyImg::Smiley());
+	}
+
+	App()
+	{
+		Sizeable();
+		BackPaint();
+	}
+};
+
+GUI_APP_MAIN
+{
+	App().Run();
+}
diff --git a/reference/iml/image.iml b/reference/iml/image.iml
new file mode 100644
index 000000000..08c03cf9c
--- /dev/null
+++ b/reference/iml/image.iml
@@ -0,0 +1,167 @@
+IMAGE_BEGIN(Smiley)
+	IMAGE_SCAN("\377�\1JJJ�:::�\"\"\"�\20\22\22�\"\"\"�:::\1JJJ\377�")
+	IMAGE_SCAN("�\3RRR***\20\22\22�\2\2\2\3\20\22\22BBB:::�")
+	IMAGE_SCAN("�\2:::\20\22\22�\2\2\2\2\20\22\22:::�")
+	IMAGE_SCAN("�\2RRR\20\22\22�\2\2\2\2***:::�")
+	IMAGE_SCAN("�\1\20\22\22�\2\2\2\1:::�")
+	IMAGE_SCAN("�\1***�\2\2\2\1\20\22\22�\2\2\2\4\2\32\32\2::\2RR\2rr�\2��\2\2��\2���\2��\1\2���\2��\2\2��\2rr�\2RR\1\2\32\32�\2\2\2\1:::�")
+	IMAGE_SCAN("�\1\20\22\22�\2\2\2�\20\22\22�\2\2\2\4\2\32\32\2RR\2��\2�Ƃ\2�ޓ\2��\4\2��\2��\2��\2RR�\2\2\2\1\"\"\"�")
+	IMAGE_SCAN("�\1\20\22\22�\2\2\2\3\20\22\22\"\"\"\20\22\22�\2\2\2\3\2::\2��\2�ޞ\2���\2��\1\2RR�\2\2\2\1\20\22\22�")
+	IMAGE_SCAN("�\1\20\22\22�\2\2\2\3***:::\20\22\22�\2\2\2\4\2\32\32\2RR\2��\2�ޥ\2��\2\2��\2RR�\2\2\2�")
+	IMAGE_SCAN("�\1\32\32\32�\2\2\2\3:::JJJ\32\32\32�\2\2\2\2\2RR\2���\2��\2\2��\2RR�\2\2\2\1\"\"\"�")
+	IMAGE_SCAN("�\1:::�\2\2\2\3BBBZZZ\20\22\22�\2\2\2\3\2\32\32\2RR\2�ް\2��\2\2��\2RR�\2\2\2\1:::�")
+	IMAGE_SCAN("�\2\2\2\3\32\32\32bbb\"\"\"�\2\2\2\3\2\32\32\2��\2�޵\2��\2\2��\2\32\32�\2\2\2�")
+	IMAGE_SCAN("�\5\20\22\22\2\2\2\20\22\22rrrJJJ�\2\2\2\2\2\32\32\2���\2��\2\2��\2::�\2\2\2\1\"\"\"�")
+	IMAGE_SCAN("ނ\2\2\2\2BBBZZZ�\2\2\2\2\2\32\32\2���\2��\2\2��\2\32\32�\2\2\2�")
+	IMAGE_SCAN("�\1:::�\2\2\2\2jjj\"\"\"�\2\2\2\2\2RR\2�޿\2���\2��\1\2RR�\2\2\2\1:::�")
+	IMAGE_SCAN("�\5\32\32\32\2\2\2\32\32\32bbb\20\22\22�\2\2\2\2\2\32\32\2�ƿ\2���\2��\2\2��\2::�\2\2\2\1\"\"\"�")
+	IMAGE_SCAN("ڂ\2\2\2�BBB�\2\2\2\1\2���\2���\2��\1\2���\2\2\2�")
+	IMAGE_SCAN("ق\2\2\2\2JJJ\"\"\"�\2\2\2\2\2::\2�޿\2���\2��\2\2��\2::�\2\2\2�")
+	IMAGE_SCAN("�\1RRR�\2\2\2\1:::�\2\2\2\1\2rr�\2���\2��\1\2jj�\2\2\2\1RRR�")
+	IMAGE_SCAN("�\4RRR\2\2\2\20\22\22***�\2\2\2\1\2���\2���\2��\1\2���\2\2\2\1RRR�")
+	IMAGE_SCAN("�\4:::\2\2\2\20\22\22\32\32\32�\2\2\2\2\2\32\32\2�ƿ\2���\2��\2\2��\2\32\32�\2\2\2\1:::�")
+	IMAGE_SCAN("�\1:::�\2\2\2\1\20\22\22�\2\2\2\2\2\32\32\2�ޔ\2��\3\22��\2��\22���\2��\2\2��\2::�\2\2\2\1:::�")
+	IMAGE_SCAN("�\1RRR�\2\2\2\2\2::\2�ޑ\2��\1\22���$���\22���\2��\2\2��\2::�\2\2\2\1RRR�")
+	IMAGE_SCAN("�\1ZZZ�\2\2\2\1\2rr�\2��\2\22��$���6���G��\0016���$��\1\22���\2��\2\2��\2bb�\2\2\2\1JJJ�")
+	IMAGE_SCAN("҂\2\2\2\1\20\22\22�\2\2\2\1\2rr�\2��\6\22��$��6��G��f��w������\5w��f��Z��G��6���$���\2��\2\2��\2bb�\2\2\2�")
+	IMAGE_SCAN("т\2\2\2\1\20\22\22�\2\2\2\1\2::�\2���$��\4G��f������������\5������w��f��G���$���\2��\2\2��\2::�\2\2\2�")
+	IMAGE_SCAN("І\2\2\2\1\2::�\2��\5$��6��f������������\7������f��G��6��$��\22���\2���\2��\1\2**�\2\2\2�")
+	IMAGE_SCAN("�\1***�\2\2\2\2\2\32\32\2�ގ\2��\5\22��$��G��w���������\4������Z��6���$���\2��\3\2��\2��\2\32\32�\2\2\2\1\20\22\22�")
+	IMAGE_SCAN("�\1:::�\2\2\2\2\2\32\32\2�ގ\2��\5\22��$��G������������\6���w��Z��6��$��\22���\2��\3\2��\2��\2\32\32�\2\2\2\1:::�")
+	IMAGE_SCAN("Ά\2\2\2\1\2�Ə\2��\4$��6��w���������\4������w��G���$��\1\22���\2��\2\2��\2���\2\2\2�")
+	IMAGE_SCAN("͆\2\2\2\1\2���\2��\4\22��6��Z���������\12�����Ǝ����������������Z��6���$���\2��\2\2��\2�Ƃ\2��\1\2�ޖ\2���\2��\1\2���\2\2\2�")
+	IMAGE_SCAN("�\1***�\2\2\2\1\2RR�\2��\5\22��$��6��w���������\2���\32\32\32�\2\2\2\6Brrw��G��6��$��\22���\2��\3\2��\2RR\2\32\32�\2\2\2\1\2���\2���\2��\1\2JJ�\2\2\2\1\20\22\22�")
+	IMAGE_SCAN("̅\2\2\2\1\2\32\32�\2��\10\22��$��G��������������\32\32\32�\2\2\2\2\2\32\32\"���$���\2��\2\2��\2\32\32�\2\2\2\2\2::\2���\2���\2��\2\2��\2\32\32�\2\2\2�")
+	IMAGE_SCAN("ˆ\2\2\2\1\2���\2���$��\4Z��w���������\2\2\2\2\2jj\22���\2��\1\2jj�\2\2\2\1\2���\2���\2��\1\2���\2\2\2�")
+	IMAGE_SCAN("�\1:::�\2\2\2\1\2rr�\2��\5$��6��Z��w��Z���\2\2\2\1\2jj�\2��\1\2jj�\2\2\2\1\2���\2��\3\2��\2��\2ZZ�\2\2\2\1:::�")
+	IMAGE_SCAN("ʅ\2\2\2\1\2::�\2���$��\2G��B���\2\2\2\1\2���\2��\1\2���\2\2\2\1\2���\2���\2��\2\2��\2\32\32�\2\2\2�")
+	IMAGE_SCAN("�\1***�\2\2\2\1\2���\2���$��\0016���\2\2\2\1\2�Ɯ\2��\1\2���\2\2\2\2\2\32\32\2�ޑ\2���\2��\2\2��\2���\2\2\2\1\20\22\22�")
+	IMAGE_SCAN("Ʌ\2\2\2\1\2jj�\2��\3\22��$��\2rr�\2\2\2\1\2JJ�\2��\1\2RR�\2\2\2\1\2RR�\2��\3\2��\2��\2BB�\2\2\2�")
+	IMAGE_SCAN("Ȇ\2\2\2�\2��\2\22��\22��\2\2\2\1\2���\2��\1\2���\2\2\2\1\2�ސ\2���\2��\2\2��\2\32\32�\2\2\2\1\20\22\22�")
+	IMAGE_SCAN("ȅ\2\2\2\1\2���\2��\1\2RR�\2\2\2\1\2\32\32�\2��\1\2RR�\2\2\2\1\2RR�\2���\2��\1\2���\2\2\2�")
+	IMAGE_SCAN("�\1\20\22\22�\2\2\2�\2���\2\2\2\2BBB:::�\2\2\2\1\2�Ƙ\2��\1\2���\2\2\2\2:::\32\32\32�\2\2\2\1\2�ސ\2���\2��\3\2��\2��\2\32\32�\2\2\2\1\20\22\22�")
+	IMAGE_SCAN("Dž\2\2\2\1\2���\2��\1\2���\2\2\2\4\20\22\22��ή��\20\22\22�\2\2\2\1\2jj�\2��\1\2RR�\2\2\2\3\20\22\22���zzz�\2\2\2\1\2���\2���\2��\2\2��\2���\2\2\2�")
+	IMAGE_SCAN("�\1\"\"\"�\2\2\2�\2��\1\2RR�\2\2\2\3\32\32\32����\2\2\2\1\2\32\32�\2��\1\2RR�\2\2\2\3***�������\2\2\2\1\2RR�\2���\2��\3\2��\2��\2\32\32�\2\2\2\1\20\22\22�")
+	IMAGE_SCAN("ƅ\2\2\2\1\2���\2���\2\2\2\3\20\22\22���JJJ�\2\2\2\1\2�ޗ\2���\2\2\2\3\32\32\32���JJJ�\2\2\2\1\2\32\32�\2��\1\2��\2��\1\2zz�\2\2\2�")
+	IMAGE_SCAN("�\1:::�\2\2\2�\2��\1\2���\2\2\2�\20\22\22�\2\2\2\1\2���\2��\1\2���\2\2\2\3\12\12\12\"\"\"\12\12\12�\2\2\2\1\2�Ə\2��\2\2��\2���\2��\3\2��\2��\2\32\32�\2\2\2\1***�")
+	IMAGE_SCAN("Ņ\2\2\2\1\2���\2��\1\2���\2\2\2\1\2jj�\2��\1\2rr�\2\2\2\1\2���\2��\2\2��\2���\2��\3\2��\2��\2bb�\2\2\2�")
+	IMAGE_SCAN("Ņ\2\2\2\1\2���\2��\1\2���\2\2\2\1\2rr�\2��\1\2RR�\2\2\2\1\2���\2���\2��\2��\1\2���\2\2\2�")
+	IMAGE_SCAN("�\1BBB�\2\2\2\1\2RR�\2��\1\2rr�\2\2\2\1\2RR�\2��\1\2RR�\2\2\2\1\2jj�\2��\2\2��\2���\2��\3\2��\2��\2**�\2\2\2\1\20\22\22�")
+	IMAGE_SCAN("ą\2\2\2\1\2���\2��\1\2RR�\2\2\2\1\2::�\2��\1\2RR�\2\2\2\1\2rr�\2���\2��\3\2��\2��\2bb�\2\2\2�")
+	IMAGE_SCAN("�\1BBB�\2\2\2�\2��\1\2RR�\2\2\2\1\2\32\32�\2��\1\2::�\2\2\2\1\2::�\2��\2\2��\2���\2��\3\2��\2��\2���\2\2\2\1JJJ�")
+	IMAGE_SCAN("�\1\"\"\"�\2\2\2\1\2RR�\2��\1\2::�\2\2\2\1\2RR�\2��\1\2::�\2\2\2\1\2RR�\2��\2\2��\2���\2��\2��\2\2��\2**�\2\2\2\1\20\22\22�")
+	IMAGE_SCAN("Å\2\2\2\1\2���\2��\1\2jj�\2\2\2\1\2RR�\2��\1\2RR�\2\2\2\1\2RR�\2���\2��\3\2��\2��\2zz�\2\2\2�")
+	IMAGE_SCAN("Å\2\2\2�\2��\1\2���\2\2\2\1\2rr�\2��\1\2jj�\2\2\2\1\2���\2��\4\2��\2��\2��\2���\2��\3\2��\2��\2���\2\2\2�")
+	IMAGE_SCAN("�\1BBB�\2\2\2\1\2RR�\2��\1\2���\2\2\2\1\2���\2��\1\2���\2\2\2\1\2���\2���\2��\4\2��\2��\2��\2**�\2\2\2\1:::�")
+	IMAGE_SCAN("�\1\20\22\22�\2\2\2\1\2rr�\2��\1\2�ƙ\2\2\2\1\2���\2��\1\2�ƙ\2\2\2\1\2���\2��\5\2��\2��\2��\2��\2��\2��\2\2��\2JJ�\2\2\2\1\20\22\22�")
+	IMAGE_SCAN("…\2\2\2\1\2���\2��\1\2�ޙ\2\2\2�\2��\1\2�ޙ\2\2\2�\2��\2\2��\2���\2��\2��\2\2��\2���\2\2\2�")
+	IMAGE_SCAN("…\2\2\2�\2��\1\2::�\2\2\2\1\2RR�\2��\1\2\32\32�\2\2\2\1\2RR�\2��\2\2��\2���\2��\3\2��\2��\2���\2\2\2�")
+	IMAGE_SCAN("�\1:::�\2\2\2\1\2\32\32�\2��\1\2rr�\2\2\2\1\2jj�\2��\1\2rr�\2\2\2\1\2jj�\2��\1\2��\2���\2��\2��\3\2��\2��\2\32\32�\2\2\2\1JJJ�")
+	IMAGE_SCAN("�\1:::�\2\2\2\1\2RR�\2��\1\2�Ɨ\2\2\2\1\2���\2��\1\2�Ɨ\2\2\2\1\2���\2���\2��\1\2���\2��\2��\3\2��\2��\2::�\2\2\2\1***�")
+	IMAGE_SCAN("�\1\20\22\22�\2\2\2\1\2���\2��\1\2\32\32�\2\2\2\1\2\32\32�\2��\1\2\32\32�\2\2\2\1\2\32\32�\2���\2��\6\2��\2��\2��\2��\2��\2ZZ�\2\2\2\1\20\22\22�")
+	IMAGE_SCAN("��\2\2\2\1\2���\2��\1\2���\2\2\2\1\2���\2��\1\2���\2\2\2\1\2���\2��\4\2��\2��\2��\2���\2��\2��\3\2��\2��\2���\2\2\2�")
+	IMAGE_SCAN("��\2\2\2\1\2�ޝ\2��\1\2\32\32�\2\2\2\1\2RR�\2��\1\2\32\32�\2\2\2\1\2::�\2��\2\2��\2���\2��\4\2��\2��\2��\2���\2\2\2�")
+	IMAGE_SCAN("�\2\2\2�\2��\1\2���\2\2\2\1\2���\2��\1\2���\2\2\2\1\2���\2��\4\2��\2��\2��\2���\2��\2��\3\2��\2��\20\22\22�\2\2\2�")
+	IMAGE_SCAN("�\2\2\2\1\2::�\2��\1\2::�\2\2\2\1\2RR�\2��\1\2RR�\2\2\2\1\2RR�\2��\2\2��\2���\2��\2��\3\2��\2��\2\32\32�\2\2\2�")
+	IMAGE_SCAN("�\2\2\2\1\2RR�\2��\2\2��\2::�\2\2\2\1\2::�\2��\1\2::�\2\2\2\2\2::\2�ސ\2��\6\2��\2��\2��\2��\2��\2���\2��\2��\4\2��\2��\2��\2**�\2\2\2\1RRR")
+	IMAGE_SCAN("�\2\2\2\1\2RR�\2��\2\2��\2\32\32�\2\2\2\2\2::\2�ޠ\2��\2\2��\2::�\2\2\2\2\2\32\32\2�ޔ\2��\2\2��\2���\2��\2��\3\2��\2��\2::�\2\2\2\1:::")
+	IMAGE_SCAN("�\2\2\2\1\2RR�\2��\2\2��\2::�\2\2\2\2\2\32\32\2�ޢ\2��\2\2��\2RR�\2\2\2\2\2\32\32\2�Ɠ\2��\1\2��\2��\2\2��\2���\2��\2��\3\2��\2��\2BB�\2\2\2\1BBB")
+	IMAGE_SCAN("\1BBB�\2\2\2\1\2rr�\2��\1\2���\2\2\2\2\2\32\32\2���\2��\2\2��\2\32\32�\2\2\2\2\2\32\32\2���\2��\1\2��\2��\2\2��\2���\2��\2��\4\2��\2��\2��\2BB�\2\2\2\1\"\"\"")
+	IMAGE_SCAN("\1\"\"\"�\2\2\2\1\2jj�\2��\5\2��\2rr\2RR\2::\2\32\32�\2::\2\2rr\2�ީ\2��\3\2��\2RR\2::�\2\32\32\3\2::\2rr\2�ޖ\2��\4\2��\2��\2��\2���\2��\7\2��\2��\2��\2��\2��\2��\2BB�\2\2\2\1***")
+	IMAGE_SCAN("\1***�\2\2\2\1\2���\2���\2��\2\2��\2���\2��\2��\3\2��\2��\2RR�\2\2\2\1\20\22\22")
+	IMAGE_SCAN("\1\20\22\22�\2\2\2\1\2���\2���\2��\10\2��\2��\2��\2��\2��\2��\2��\2���\2��\2��\4\2��\2��\2��\2RR�\2\2\2\1\20\22\22")
+	IMAGE_SCAN("\1\20\22\22�\2\2\2\1\2���\2���\2��\2\2��\2���\2��\2��\4\2��\2��\2��\2jj�\2\2\2\1\20\22\22")
+	IMAGE_SCAN("\1\20\22\22�\2\2\2\1\2���\2���\2��\6\2��\2��\2��\2��\2��\2���\2��\2\2��\2��\2��\4\2��\2��\2��\2RR�\2\2\2\1***")
+	IMAGE_SCAN("\1***�\2\2\2\1\2jj�\2���\2��\1\2��\2��\2\2��\2���\2��\2�ނ\2��\2\2��\2BB�\2\2\2\1\"\"\"")
+	IMAGE_SCAN("\1\"\"\"�\2\2\2\1\2rr�\2���\2��\10\2��\2��\2��\2��\2��\2��\2��\2���\2��\2��\4\2��\2��\2��\2::�\2\2\2\1:::")
+	IMAGE_SCAN("\1:::�\2\2\2\1\2jj�\2���\2��\2\2��\2���\2��\2��\4\2��\2��\2��\2::�\2\2\2\1:::")
+	IMAGE_SCAN("\1:::�\2\2\2\1\2RR�\2���\2��\10\2��\2��\2��\2��\2��\2��\2��\2���\2��\2��\1\2�ւ\2��\2\2��\2**�\2\2\2\1:::")
+	IMAGE_SCAN("\1RRR�\2\2\2\1\2::�\2���\2��\1\2��\2��\4\2��\2��\2��\2���\2��\2��\4\2��\2��\2��\2**�\2\2\2\1RRR")
+	IMAGE_SCAN("��\2\2\2\1\2\32\32�\2��\3\2��\2RR\2�ƿ\2���\2��\5\2��\2RR\2��\2��\2��\2��\2\2��\2���\2��\2��\5\2��\2��\2��\2��\2\32\32�\2\2\2�")
+	IMAGE_SCAN("��\2\2\2\1\2\32\32�\2��\2\2��\2\32\32�\2\2\2\1\2jj�\2���\2��\1\2::�\2\2\2\7\2JJ\2��\2��\2��\2��\2��\2���\2��\2��\4\2��\2��\2��\2���\2\2\2�")
+	IMAGE_SCAN("��\2\2\2\1\2�ގ\2��\2\2��\2RR�\2\2\2\1\2���\2���\2��\1\2���\2\2\2\1\2jj�\2��\2\2��\2��\2��\1\2�ւ\2��\2\2��\2���\2\2\2�")
+	IMAGE_SCAN("��\2\2\2\1\2���\2��\3\2��\2RR\2\32\32�\2\2\2\1\2jj�\2���\2��\1\2��\2��\1\2RR�\2\2\2\2\2jj\2���\2��\2�ނ\2��\2\2��\2bb�\2\2\2�")
+	IMAGE_SCAN("�\1\20\22\22�\2\2\2\1\2���\2��\4\2��\2��\2RR\2\32\32�\2\2\2\1\2RR�\2���\2��\3\2��\2��\2::�\2\2\2\4\2\32\32\2RR\2��\2��\2�ރ\2��\2\2��\2JJ�\2\2\2\1\20\22\22�")
+	IMAGE_SCAN("�\1***�\2\2\2\1\2JJ�\2��\1\2���\2\2\2\1\2�ƿ\2���\2��\1\2��\2��\1\2���\2\2\2\2\2��\2��\2�ނ\2��\4\2��\2��\2��\2**�\2\2\2\1:::�")
+	IMAGE_SCAN("�\1JJJ�\2\2\2\1\2\32\32�\2��\1\2���\2\2\2�\2���\2���\2��\1\2�ފ\2\2\2\1\2���\2��\1\2�ւ\2��\3\2��\2��\2\32\32�\2\2\2\1BBB�")
+	IMAGE_SCAN("�\1\0\0\0�\2\2\2\1\2�އ\2��\3\2��\2RR\2::�\2\2\2\1\2�޿\2���\2��\1\2��\2��\1\2��\2��\1\2���\2\2\2\5\2\32\32\2::\2JJ\2��\2��\2��\6\2��\2��\2��\2��\2��\2���\2\2\2�")
+	IMAGE_SCAN("…\2\2\2\1\2���\2��\2\2��\2::�\2\2\2\1\2RR�\2���\2��\1\2��\2��\1\2��\2��\2\2��\2RR�\2\2\2\5\2RR\2��\2��\2��\2��\2�ރ\2��\2\2��\2ZZ�\2\2\2�")
+	IMAGE_SCAN("�\1\20\22\22�\2\2\2\2\2jj\2��\2��\1\2rr�\2\2\2\1\2�޿\2���\2��\1\2��\2��\2\2��\2���\2\2\2\1\2���\2��\2\2��\2��\2�ނ\2��\4\2��\2��\2��\2::�\2\2\2\1\20\22\22�")
+	IMAGE_SCAN("�\1:::�\2\2\2\1\2::�\2��\1\2RR�\2\2\2\1\2::�\2���\2��\1\2��\2��\5\2��\2��\2��\2��\2\32\32�\2\2\2\1\2jj�\2��\1\2�ނ\2��\2�ރ\2��\3\2��\2��\2**�\2\2\2\1:::�")
+	IMAGE_SCAN("Å\2\2\2\1\2�֎\2��\1\2::�\2\2\2\1\2JJ�\2���\2��\1\2��\2��\3\2��\2��\2::�\2\2\2\1\2RR�\2��\2�ނ\2��\4\2��\2��\2��\2���\2\2\2�")
+	IMAGE_SCAN("Å\2\2\2\2\2��\2��\2��\2\2��\2\32\32�\2\2\2\1\2jj�\2���\2��\3\2��\2��\2��\2��\3\2��\2��\2::�\2\2\2\1\2::�\2��\2\2��\2��\2��\2\2��\2�ނ\2�ւ\2��\3\2��\2��\2RR�\2\2\2�")
+	IMAGE_SCAN("�\1\20\22\22�\2\2\2\2\2::\2��\2��\2\2��\2\32\32�\2\2\2\1\2jj�\2���\2��\1\2��\2��\10\2��\2��\2::\2\2\2\20\22\22\2\2\2\2\32\32\2�օ\2��\2\2��\2��\2�ނ\2��\5\2��\2��\2��\2��\2**�\2\2\2\1***�")
+	IMAGE_SCAN("�\1JJJ�\2\2\2\1\2�֏\2��\2\2��\2\32\32�\2\2\2\2\2RR\2�޿\2���\2��\1\2��\2��\13\2��\2��\2��\2��\2��\2::\2\2\2\32\32\32\2\2\2\2\32\32\2�փ\2��\4\2��\2��\2��\2��\2�ނ\2�ւ\2��\3\2��\2��\2���\2\2\2\1BBB"
+	"�")
+	IMAGE_SCAN("ą\2\2\2\2\2��\2��\2��\2\2��\2\32\32�\2\2\2\2\2::\2�ƿ\2���\2��\1\2��\2��\1\2��\2��\7\2��\2\32\32\32\32\32:::\2\2\2\2::\2�އ\2��\2�ނ\2��\5\2��\2��\2��\2��\2RR�\2\2\2�")
+	IMAGE_SCAN("�\1\20\22\22�\2\2\2\2\2::\2��\2��\2\2��\2\32\32�\2\2\2\1\2���\2��\2\2��\2��\2��\6\2��\2��\2��\2��\2\2\2\32\32\32�\2\2\2\2\2::\2�օ\2��\2��\1\2��\2�ނ\2�ւ\2��\4\2��\2��\2��\2**�\2\2\2\1:::�")
+	IMAGE_SCAN("�\1\0\0\0�\2\2\2\2\2��\2��\2��\2\2��\2::�\2\2\2\1\2jj�\2���\2��\1\2��\2��\6\2��\2��\2��\2RR\2\2\2\"\"\"�\2\2\2\1\2RR�\2��\1\2�ނ\2��\2�ނ\2�ւ\2��\3\2��\2��\2ZZ�\2\2\2�")
+	IMAGE_SCAN("Ņ\2\2\2\2\2zz\2��\2��\1\2rr�\2\2\2\2\2::\2�ƻ\2��\1\2��\2��\6\2��\2��\2��\2\32\32\20\22\22***�\2\2\2\1\2jj�\2��\2��\1\2��\2�ނ\2�ւ\2��\4\2��\2��\2��\2BB�\2\2\2�")
+	IMAGE_SCAN("�\1***�\2\2\2\3\2\32\32\2��\2��\2��\1\2���\2\2\2\1\2jj�\2��\1\2��\2��\12\2��\2��\2��\2RR\2\2\2\32\32\32:::\2\2\2\2\32\32\2���\2��\4\2��\2��\2��\2��\2�ނ\2�ւ\2��\3\2��\2��\2���\2\2\2\1BBB�")
+	IMAGE_SCAN("�\1\0\0\0�\2\2\2\2\2��\2��\2��\2\2��\2\32\32�\2\2\2\2\2::\2���\2��\3\2��\2��\2��\2��\10\2��\2\32\32\2\2\2:::\32\32\32\2\2\2\2::\2�ނ\2��\1\2���\2��\2\2��\2��\2��\1\2�փ\2��\4\2��\2��\2��\2BB�\2\2\2"
+	"�")
+	IMAGE_SCAN("�\1\20\22\22�\2\2\2\2\2\32\32\2�Ƃ\2��\2��\2\2��\2RR�\2\2\2\2\2RR\2�޹\2��\5\2��\2RR\2\2\2\"\"\":::�\2\2\2\1\2jj�\2��\2\2��\2��\2�ރ\2��\5\2��\2��\2��\2��\2���\2\2\2\1\"\"\"�")
+	IMAGE_SCAN("Dž\2\2\2\2\2��\2��\2��\1\2���\2\2\2\1\2jj�\2��\1\2��\2��\16\2��\2��\2��\2��\2��\2��\2RR\2\2\2\20\22\22\"\"\"\20\22\22\2\2\2\2\32\32\2���\2��\4\2��\2��\2��\2��\2��\1\2�փ\2��\4\2��\2��\2��\2BB�\2\2\2"
+	"�")
+	IMAGE_SCAN("�\1\20\22\22�\2\2\2\5\2\32\32\2��\2��\2��\2��\2��\2\2��\2RR�\2\2\2\1\2jj�\2��\2\2��\2RR�\2\2\2\1\20\22\22�\2\2\2\2\2JJ\2�ނ\2��\1\2���\2��\2\2��\2��\2�ރ\2��\5\2��\2��\2��\2��\2���\2\2\2\1\20\22\22�")
+	IMAGE_SCAN("�\1\0\0\0�\2\2\2\3\2��\2��\2��\2��\2\2��\2\32\32�\2\2\2\2\2RR\2���\2��\1\2��\2��\5\2��\2��\2��\2��\2JJ�\2\2\2\1\20\22\22�\2\2\2\2\2\32\32\2���\2��\4\2��\2��\2��\2��\2��\1\2�փ\2��\4\2��\2��\2��\2BB"
+	"�\2\2\2�")
+	IMAGE_SCAN("�\1\20\22\22�\2\2\2\2\2\32\32\2�Ƃ\2��\2\2��\2��\2��\1\2���\2\2\2\2\2RR\2���\2��\5\2��\2��\2��\2��\2\32\32�\2\2\2\1\20\22\22�\2\2\2\2\2\32\32\2���\2��\3\2��\2��\2���\2��\2\2��\2��\2�ރ\2�ւ\2��\4\2�"
+	"�\2��\2��\2zz�\2\2\2�")
+	IMAGE_SCAN("Ʌ\2\2\2\2\2JJ\2�ނ\2��\2��\1\2rr�\2\2\2\2\2RR\2���\2��\1\2��\2��\5\2��\2��\2��\2��\2::�\2\2\2\5\2\32\32\2��\2��\2��\2���\2��\4\2��\2��\2��\2��\2��\11\2��\2��\2��\2��\2��\2��\2��\2��\2::�\2\2\2�")
+	IMAGE_SCAN("�\1\20\22\22�\2\2\2\1\2���\2��\2\2��\2��\2��\1\2���\2\2\2\3\2RR\2jj\2���\2��\1\2��\2��\4\2��\2��\2rr\2\32\32�\2\2\2\5\2\32\32\2��\2��\2��\2���\2��\2\2��\2��\2�ރ\2��\1\2�Ƃ\2��\3\2��\2��\2RR�\2\2\2"
+	"\1\"\"\"�")
+	IMAGE_SCAN("ʅ\2\2\2\2\2\32\32\2�ւ\2��\2��\2\2��\2RR�\2\2\2\1\2\32\32�\2RR\2\2jj\2���\2���\2��\1\2���\2��\1\2���\2��\3\2��\2��\2���\2��\4\2rr\2RR\2::\2\32\32�\2\2\2\4\2RR\2��\2��\2���\2��\1\2���\2��\4\2��\2��\2"
+	"��\2��\2�ނ\2�փ\2��\5\2��\2��\2��\2��\2\32\32�\2\2\2�")
+	IMAGE_SCAN("�\1BBB�\2\2\2\2\2ZZ\2�ބ\2��\2\2��\2��\2��\2\2��\2RR�\2\2\2\3\2::\2��\2�ނ\2��\1\2���\2��\1\2���\2��\1\2�ނ\2��\2\2��\2��\2�ރ\2�ւ\2��\5\2��\2��\2��\2��\2::�\2\2\2\1:::�")
+	IMAGE_SCAN("ˆ\2\2\2\2\2��\2�ނ\2��\2\2��\2��\2��\3\2��\2RR\2\32\32�\2\2\2\10\2\32\32\2jj\2��\2��\2��\2��\2��\2���\2��\1\2���\2��\2\2��\2��\2��\1\2�ք\2��\4\2��\2��\2��\2RR�\2\2\2�")
+	IMAGE_SCAN("̅\2\2\2\3\2\32\32\2��\2�ނ\2��\6\2��\2��\2��\2��\2��\2��\2��\3\2��\2��\2���\2RR\1\2\32\32�\2\2\2\6\2\32\32\2::\2rr\2��\2��\2�ނ\2��\2\2��\2���\2��\1\2���\2��\1\2���\2��\4\2��\2��\2��\2��\2��\1\2��"
+	"\2�ނ\2��\11\2��\2��\2��\2��\2��\2��\2��\2zz\20\22\22�\2\2\2�")
+	IMAGE_SCAN("�\1\20\22\22�\2\2\2\3\2BB\2��\2�ރ\2��\2��\1\2�ތ\2�Ƃ\2��\7\2��\2��\2��\2��\2��\2��\2���\2��\3\2��\2��\2���\2��\1\2���\2��\4\2��\2��\2��\2��\2�ނ\2��\2\2��\2�ւ\2��\5\2��\2��\2��\2��\2**�\2\2\2\1**"
+	"*�")
+	IMAGE_SCAN("͆\2\2\2\1\2���\2�ބ\2��\6\2��\2��\2��\2��\2��\2��\2��\1\2��\2��\1\2��\2��\1\2��\2��\6\2��\2��\2��\2��\2��\2���\2��\1\2���\2��\4\2��\2��\2��\2��\2�ނ\2�փ\2�Ƃ\2��\3\2��\2��\2JJ�\2\2\2�")
+	IMAGE_SCAN("Ά\2\2\2\1\2���\2�ބ\2��\2��\1\2��\2��\1\2��\2��\1\2��\2��\1\2��\2��\1\2��\2���\2��\7\2��\2��\2��\2��\2��\2��\2���\2��\6\2��\2��\2��\2��\2��\2��\2�ނ\2��\2\2��\2�ւ\2��\5\2��\2��\2��\2��\2ZZ�\2"
+	"\2\2�")
+	IMAGE_SCAN("�\1:::�\2\2\2\2\2\32\32\2���\2�ކ\2��\2\2��\2��\2��\1\2��\2��\1\2��\2��\1\2��\2��\1\2��\2��\1\2��\2��\1\2��\2��\1\2��\2��\5\2��\2��\2��\2��\2��\2��\2\2��\2���\2��\1\2���\2��\1\2���\2��\2\2��\2"
+	"��\2�ރ\2�փ\2�Ƃ\2��\4\2��\2��\2bb\20\22\22�\2\2\2\1:::�")
+	IMAGE_SCAN("�\1\20\22\22�\2\2\2\2\2\32\32\2���\2�ރ\2��\1\2���\2��\2\2��\2��\2��\1\2��\2��\1\2��\2��\1\2��\2��\1\2��\2��\1\2��\2��\1\2��\2��\3\2��\2��\2��\2��\1\2��\2��\1\2��\2��\1\2��\2��\4\2��\2��\2�"
+	"�\2���\2��\3\2��\2��\2���\2��\1\2���\2��\2\2��\2��\2��\1\2��\2��\3\2��\2��\2�փ\2��\6\2��\2��\2��\2��\2rr\20\22\22�\2\2\2\1***�")
+	IMAGE_SCAN("І\2\2\2\2\2**\2�ƃ\2�ޅ\2��\4\2��\2��\2��\2��\2��\3\2��\2��\2��\2��\1\2��\2��\1\2��\2��\3\2��\2��\2��\2��\14\2��\2��\2��\2��\2��\2��\2��\2��\2��\2��\2��\2���\2��\1\2���\2��\1\2�ނ\2��\4\2��\2��\2"
+	"��\2��\2�ބ\2�փ\2��\1\2���\2��\4\2��\2rr\2\32\32\12\12\12�\2\2\2�")
+	IMAGE_SCAN("ц\2\2\2\6\2**\2��\2��\2��\2��\2�ޅ\2��\4\2��\2��\2��\2��\2��\3\2��\2��\2��\2��\3\2��\2��\2��\2��\11\2��\2��\2��\2��\2��\2��\2��\2��\2��\2��\14\2��\2��\2��\2��\2��\2��\2��\2��\2��\2��\2��\2���\2��"
+	"\1\2���\2��\1\2���\2��\1\2�ނ\2��\2��\1\2��\2�ނ\2��\2\2��\2�փ\2��\7\2��\2��\2��\2��\2��\2\32\32\20\22\22�\2\2\2�")
+	IMAGE_SCAN("҆\2\2\2\3\2JJ\2��\2�ւ\2�ރ\2��\1\2���\2��\1\2���\2��\6\2��\2��\2��\2��\2��\2��\2��\11\2��\2��\2��\2��\2��\2��\2��\2��\2��\2��\1\2��\2��\5\2��\2��\2��\2��\2��\2��\4\2��\2��\2��\2���\2��\1\2���\2�"
+	"�\1\2���\2��\2\2��\2��\2��\1\2��\2�ބ\2�ւ\2��\10\2��\2��\2��\2��\2��\2zz\2**\20\22\22�\2\2\2�")
+	IMAGE_SCAN("�\1RRR�\2\2\2\3\2RR\2��\2�ւ\2��\2\2��\2�ކ\2��\1\2���\2��\14\2��\2��\2��\2��\2��\2��\2��\2��\2��\2��\2��\2��\2��\14\2��\2��\2��\2��\2��\2��\2��\2��\2��\2��\2��\2���\2��\1\2���\2��\3\2��\2��\2���\2��"
+	"\6\2��\2��\2��\2��\2��\2��\2�ރ\2�ք\2�Ƃ\2��\6\2��\2��\2��\2zz\2**\20\22\22�\2\2\2\1RRR�")
+	IMAGE_SCAN("�\1RRR�\2\2\2\3\2**\2��\2�ƃ\2�މ\2��\1\2���\2��\21\2��\2��\2��\2��\2��\2��\2��\2��\2��\2��\2��\2��\2��\2��\2��\2��\2���\2��\3\2��\2��\2���\2��\1\2���\2��\1\2���\2��\1\2�ނ\2��\4\2��\2��\2��\2��\2��\1"
+	"\2��\2�ރ\2��\2\2��\2�ւ\2��\10\2��\2��\2��\2��\2��\2rr\2\32\32\"\"\"�\2\2\2\1RRR�")
+	IMAGE_SCAN("�\1:::�\2\2\2\4\2**\2��\2��\2�փ\2�ޏ\2��\1\2���\2��\1\2���\2��\1\2���\2��\1\2���\2��\1\2���\2��\1\2���\2��\1\2�ނ\2��\4\2��\2��\2��\2��\2�ރ\2�օ\2��\11\2��\2��\2��\2��\2��\2bb\20\22\22:::\20\22\22�"
+	"\2\2\2\1BBB�")
+	IMAGE_SCAN("�\1BBB�\2\2\2\2\2\32\32\2���\2�ƅ\2�ފ\2��\1\2���\2��\1\2���\2��\1\2���\2��\1\2���\2��\1\2���\2��\6\2��\2��\2��\2��\2��\2��\2�ބ\2��\2\2��\2�ւ\2��\12\2��\2��\2��\2��\2��\2��\2RR\20\22\22BBB\20\22\22"
+	"�\2\2\2\1:::�")
+	IMAGE_SCAN("�\1JJJ�\2\2\2\4\2bb\2��\2��\2�ք\2��\2\2��\2�ޑ\2��\1\2���\2��\1\2���\2��\10\2��\2��\2��\2��\2��\2��\2��\2��\2��\1\2��\2�ރ\2�օ\2��\12\2��\2��\2��\2��\2��\2��\2::\20\22\22RRR\12\12\12�\2\2\2\1RRR�")
+	IMAGE_SCAN("�\1RRR�\2\2\2\2\2JJ\2���\2�Ɔ\2��\2\2��\2�ޣ\2��\10\2��\2��\2��\2��\2��\2��\2��\2��\2�ރ\2��\2\2��\2�փ\2��\2\2��\2���\2��\6\2��\2��\2zz\2**:::ZZZ�\2\2\2\1RRR�")
+	IMAGE_SCAN("ه\2\2\2\2\2**\2���\2��\1\2�օ\2��\6\2��\2��\2��\2��\2��\2�ޗ\2��\12\2��\2��\2��\2��\2��\2��\2��\2��\2��\2��\2�ބ\2��\2\2��\2�ք\2��\12\2��\2��\2��\2��\2��\2��\2bb\2\32\32RRRBBB�\2\2\2�")
+	IMAGE_SCAN("ڈ\2\2\2\2\2ZZ\2���\2�Ƈ\2��\10\2��\2��\2��\2��\2��\2��\2��\2�ރ\2��\1\2�ނ\2��\1\2�ނ\2��\1\2�ނ\2��\5\2��\2��\2��\2��\2�ރ\2��\4\2��\2��\2��\2��\2��\1\2��\2��\1\2��\2�ރ\2��\2\2��\2�օ\2��\2\2��\2"
+	"���\2��\7\2��\2��\2zz\2::\32\32\32jjj\32\32\32�\2\2\2�")
+	IMAGE_SCAN("�\1***�\2\2\2\3\2**\2jj\2���\2��\1\2�ֈ\2��\25\2��\2��\2��\2��\2��\2��\2��\2��\2��\2��\2��\2��\2��\2��\2��\2��\2��\2��\2��\2��\2��\2�ރ\2��\2\2��\2�օ\2��\2\2��\2���\2��\7\2��\2��\2��\2RR\20\22\22RRR"
+	"bbb�\2\2\2\1\20\22\22�")
+	IMAGE_SCAN("�\1BBB�\2\2\2\3\2::\2��\2���\2��\1\2�֌\2��\1\2��\2��\1\2��\2��\1\2��\2��\1\2��\2��\1\2��\2��\1\2��\2�ރ\2��\4\2��\2��\2��\2�ք\2��\2\2��\2���\2��\1\2���\2��\5\2bb\2**\"\"\"bbb\"\"\"�\2\2\2\1:::"
+	"�")
+	IMAGE_SCAN("ވ\2\2\2\4\20\22\22\2jj\2��\2���\2�Ƃ\2�֑\2��\1\2��\2�ބ\2��\4\2��\2��\2��\2�ֆ\2��\1\2���\2��\2\2��\2���\2��\5\2zz\2JJ\2\32\32ZZZJJJ�\2\2\2�")
+	IMAGE_SCAN("�\1***�\2\2\2\4\2\32\32\2jj\2��\2���\2��\2\2��\2�Ƃ\2�֗\2��\2\2��\2�ޅ\2��\4\2��\2��\2��\2�օ\2�Ƃ\2��\1\2���\2��\1\2���\2��\6\2zz\2JJ\20\22\22JJJjjj\20\22\22�\2\2\2\1\20\22\22�")
+	IMAGE_SCAN("�\2\2\2\4\20\22\22\2RR\2��\2���\2���\2��\3\2��\2��\2�ރ\2�փ\2��\1\2�ւ\2�ނ\2��\3\2��\2��\2�ކ\2��\6\2��\2��\2��\2��\2��\2�ֆ\2�Ƃ\2��\1\2���\2��\12\2��\2��\2��\2��\2jj\2BB\20\22\22BBBbbb\"\"\"�\2\2"
+	"\2�")
+	IMAGE_SCAN("�\1BBB�\2\2\2\6\2::\2��\2��\2��\2��\2���\2��\1\2�ւ\2��\13\2��\2��\2��\2��\2��\2��\2��\2��\2��\2��\2�փ\2��\1\2�ֈ\2��\1\2���\2���\2���\2���\2��\7\2zz\2bb\2**\20\22\22:::BBB\32\32\32�\2\2\2\1:::�")
+	IMAGE_SCAN("�\1***�\2\2\2\5\2**\2bb\2��\2��\2���\2���\2��\1\2�֎\2�Ƃ\2���\2���\2��\1\2���\2��\11\2��\2��\2zz\2JJ\2**\12\12\12\"\"\"***\12\12\12�\2\2\2\1\20\22\22�")
+	IMAGE_SCAN("�\2\2\2\5\2**\2bb\2��\2��\2���\2���\2���\2���\2��\1\2���\2��\2\2��\2�Ƃ\2���\2���\2���\2��\1\2���\2��\10\2��\2jj\2JJ\2**\2\2\2\20\22\22\32\32\32\20\22\22�\2\2\2\1\20\22\22�")
+	IMAGE_SCAN("�\1\20\22\22�\2\2\2\4\2**\2RR\2bb\2���\2���\2���\2��\1\2���\2���\2���\2���\2��\5\2��\2zz\2bb\2::\2\32\32�\2\2\2\2\12\12\12\20\22\22�\2\2\2\1\20\22\22�")
+	IMAGE_SCAN("�\1***�\2\2\2\4\2**\2BB\2ZZ\2zz�\2��\2\2��\2���\2���\2��\1\2���\2rr\4\2ZZ\2BB\2\32\32\20\22\22�\2\2\2\1\20\22\22�")
+	IMAGE_SCAN("�\1BBB�\2\2\2\1\20\22\22�\2**\2\2::\2BB�\2RR\1\2JJ�\2BB\4\2::\2**\2\32\32\20\22\22�\2\2\2\1***�")
+	IMAGE_SCAN("�\1BBB�\2\2\2\1\20\22\22�")
+	IMAGE_SCAN("�\2:::***�\2\2\2\2\20\22\22RRR�")
+	IMAGE_SCAN("�\2BBB\20\22\22�\2\2\2\2\20\22\22BBB�")
+	IMAGE_SCAN("�\3BBB:::\20\22\22�\2\2\2\3\20\22\22***RRR�")
+	IMAGE_SCAN("\377�\4RRRBBB:::BBB�***\1\32\32\32�\20\22\22�***\3:::BBBRRR\377�")
+IMAGE_PACKED(Smiley, "\2�\0\0\0�\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0")
diff --git a/reference/iml/iml.upp b/reference/iml/iml.upp
new file mode 100644
index 000000000..0f2b9a90b
--- /dev/null
+++ b/reference/iml/iml.upp
@@ -0,0 +1,12 @@
+description "Demonstration of image list resources";
+
+uses
+	CtrlLib;
+
+file
+	image.iml,
+	image.cpp;
+
+mainconfig
+	"" = "GUI";
+
diff --git a/tutorial/Core01/Core01.upp b/tutorial/Core01/Core01.upp
new file mode 100644
index 000000000..672e0cddf
--- /dev/null
+++ b/tutorial/Core01/Core01.upp
@@ -0,0 +1,8 @@
+uses
+	Core;
+
+file
+	main.cpp;
+
+mainconfig
+	"" = "";
diff --git a/tutorial/Core01/main.cpp b/tutorial/Core01/main.cpp
new file mode 100644
index 000000000..1778bd652
--- /dev/null
+++ b/tutorial/Core01/main.cpp
@@ -0,0 +1,39 @@
+#include <Core/Core.h>
+
+using namespace Upp;
+
+CONSOLE_APP_MAIN
+{
+	String a;
+	a = "Hello";
+	DUMP(a);
+	a = a + " world";
+	DUMP(a);
+	a.Cat('!');
+	DUMP(a);
+	a.Cat("ABCDEFGHIJKLM", 3);
+	DUMP(a);
+	a.Clear();
+	for(int i = 0; i < 10; i++)
+		a << i << ", ";
+	DUMP(a);
+	DUMP(String().Cat() << "Number is " << 123 << ".");
+	a = "0123456789";
+	DUMP(a.GetLength());
+	a.Insert(6, "<inserted>");
+	DUMP(a);
+	a.Remove(2, 2);
+	DUMP(a);
+	DUMP(a.Find('e'));
+	DUMP(a.ReverseFind('e'));
+	DUMP(a.StartsWith("ABC"));
+	DUMP(a.EndsWith("KLM"));
+	DUMP(a.Find("ted"));
+	DUMP(a.Mid(3, 3));
+	DUMP(a.Mid(3));
+	a.Trim(4);
+	DUMP(a);
+	DUMP(a[0]);
+	DUMP(*a);
+	DUMP(a);
+}
diff --git a/tutorial/Core02/Core02.upp b/tutorial/Core02/Core02.upp
new file mode 100644
index 000000000..672e0cddf
--- /dev/null
+++ b/tutorial/Core02/Core02.upp
@@ -0,0 +1,8 @@
+uses
+	Core;
+
+file
+	main.cpp;
+
+mainconfig
+	"" = "";
diff --git a/tutorial/Core02/main.cpp b/tutorial/Core02/main.cpp
new file mode 100644
index 000000000..ef409c7e3
--- /dev/null
+++ b/tutorial/Core02/main.cpp
@@ -0,0 +1,28 @@
+#include <Core/Core.h>
+
+using namespace Upp;
+
+void CApiFunction(char *c)
+{
+	strcpy(c, "Hello");
+}
+
+CONSOLE_APP_MAIN
+{
+	StringBuffer b;
+	b.SetLength(200);
+	CApiFunction(b);
+	b.Strlen();
+	String x = b;
+	DUMP(x);
+
+	b = x;
+	b[1] = 'a';
+	x = b;
+	DUMP(x);
+
+	b = x;
+	b.Cat('!');
+	x = b;
+	DUMP(x);
+}
diff --git a/tutorial/Core03/Core03.upp b/tutorial/Core03/Core03.upp
new file mode 100644
index 000000000..672e0cddf
--- /dev/null
+++ b/tutorial/Core03/Core03.upp
@@ -0,0 +1,8 @@
+uses
+	Core;
+
+file
+	main.cpp;
+
+mainconfig
+	"" = "";
diff --git a/tutorial/Core03/main.cpp b/tutorial/Core03/main.cpp
new file mode 100644
index 000000000..cdc9774da
--- /dev/null
+++ b/tutorial/Core03/main.cpp
@@ -0,0 +1,20 @@
+#include <Core/Core.h>
+
+using namespace Upp;
+
+CONSOLE_APP_MAIN
+{
+	SetDefaultCharset(CHARSET_UTF8);
+
+	WString x = "characters 280-300: ";
+	for(int i = 280; i < 300; i++)
+		x.Cat(i);
+	DUMP(x);
+
+	String y = x.ToString();
+	DUMP(y);
+	y.Cat(" (appended)");
+	x = y.ToWString();
+
+	DUMP(x);
+}
diff --git a/tutorial/Core04/Core04.cpp b/tutorial/Core04/Core04.cpp
new file mode 100644
index 000000000..0cb94a8d2
--- /dev/null
+++ b/tutorial/Core04/Core04.cpp
@@ -0,0 +1,33 @@
+#include <Core/Core.h>
+
+using namespace Upp;
+
+CONSOLE_APP_MAIN
+{
+	Date date = GetSysDate();
+	DUMP(date);
+	DUMP((int)date.year);
+	DUMP((int)date.month);
+	DUMP((int)date.day);
+	DUMP(date > Date(1970, 1, 1));
+	DUMP(date + 1);
+	DUMP(date - Date(1970, 1, 1));
+	DUMP(Date::Low());
+	DUMP(Date::High());
+
+	Time time = GetSysTime();
+	DUMP(time);
+	DUMP((Date&)time);
+	DUMP((int)time.hour);
+	DUMP((int)time.minute);
+	DUMP((int)time.second);
+	DUMP(time > Time(1970, 0, 0));
+	DUMP(time > date);
+	DUMP(time > ToTime(date));
+	DUMP(time + 1);
+	DUMP(time + 24 * 3600);
+	DUMP(time - date);
+	DUMP(time - ToTime(date));
+	DUMP(Time::Low());
+	DUMP(Time::High());
+}
diff --git a/tutorial/Core04/Core04.upp b/tutorial/Core04/Core04.upp
new file mode 100644
index 000000000..3166128fe
--- /dev/null
+++ b/tutorial/Core04/Core04.upp
@@ -0,0 +1,8 @@
+uses
+	Core;
+
+file
+	Core04.cpp;
+
+mainconfig
+	"" = "";
diff --git a/tutorial/Core05/Core05.cpp b/tutorial/Core05/Core05.cpp
new file mode 100644
index 000000000..30b4bf1f0
--- /dev/null
+++ b/tutorial/Core05/Core05.cpp
@@ -0,0 +1,40 @@
+#include <Core/Core.h>
+
+using namespace Upp;
+
+struct BinFoo {
+	int x;
+
+	String ToString() const   { return FormatIntBase(x, 2); }
+
+	BinFoo(int x) : x(x) {}
+};
+
+struct RomanFoo {
+	int x;
+
+	RomanFoo(int x) : x(x) {}
+};
+
+namespace Upp {
+template <> String AsString(const RomanFoo& a) { return FormatIntRoman(a.x); }
+};
+
+CONSOLE_APP_MAIN
+{
+	FileOut fout(ConfigFile("test.txt"));
+	String  sout;
+
+	fout << 1.23 << ' ' << GetSysDate() << ' ' << GetSysTime();
+	sout << 1.23 << ' ' << GetSysDate() << ' ' << GetSysTime();
+
+	DUMP(sout);
+
+	sout.Clear();
+	fout << '\n';
+
+	sout << BinFoo(30) << ' ' << RomanFoo(30);
+	fout << BinFoo(30) << ' ' << RomanFoo(30);
+
+	DUMP(sout);
+}
diff --git a/tutorial/Core05/Core05.upp b/tutorial/Core05/Core05.upp
new file mode 100644
index 000000000..84b92b314
--- /dev/null
+++ b/tutorial/Core05/Core05.upp
@@ -0,0 +1,8 @@
+uses
+	Core;
+
+file
+	Core05.cpp;
+
+mainconfig
+	"" = "";
diff --git a/tutorial/Core06/Core06.cpp b/tutorial/Core06/Core06.cpp
new file mode 100644
index 000000000..b81ddac94
--- /dev/null
+++ b/tutorial/Core06/Core06.cpp
@@ -0,0 +1,40 @@
+#include <Core/Core.h>
+
+using namespace Upp;
+
+CONSOLE_APP_MAIN
+{
+	Value a = 1;
+	Value b = 2.34;
+	Value c = GetSysDate();
+	Value d = "hello";
+
+	int x = a;
+	DUMP(x);
+	double y = b;
+	DUMP(y);
+	Date z = c;
+	DUMP(z);
+	String s = d;
+	DUMP(s);
+
+	double i = a;
+	DUMP(i);
+	int j = b;
+	DUMP(j);
+	Time k = c;
+	DUMP(k);
+	WString t = d;
+	DUMP(t);
+
+	DUMP(a.Is<int>());
+	DUMP(a.Is<double>());
+	DUMP(b.Is<double>());
+	DUMP(c.Is<int>());
+	DUMP(c.Is<Date>());
+	DUMP(d.Is<String>());
+
+	DUMP(IsNumber(a));
+	DUMP(IsNumber(b));
+	DUMP(IsDateTime(c));
+}
diff --git a/tutorial/Core06/Core06.upp b/tutorial/Core06/Core06.upp
new file mode 100644
index 000000000..be8fc8036
--- /dev/null
+++ b/tutorial/Core06/Core06.upp
@@ -0,0 +1,8 @@
+uses
+	Core;
+
+file
+	Core06.cpp;
+
+mainconfig
+	"" = "";
diff --git a/tutorial/Core07/Core07.cpp b/tutorial/Core07/Core07.cpp
new file mode 100644
index 000000000..481c66f42
--- /dev/null
+++ b/tutorial/Core07/Core07.cpp
@@ -0,0 +1,20 @@
+#include <Core/Core.h>
+
+using namespace Upp;
+
+CONSOLE_APP_MAIN
+{
+	int x = Null;
+	int y = 120;
+	Date d = Null;
+	Date e = GetSysDate();
+
+	DUMP(IsNull(x));
+	DUMP(IsNull(y));
+	DUMP(IsNull(d));
+	DUMP(e > d);
+
+	Value v = x;
+	e = v;
+	DUMP(IsNull(e));
+}
diff --git a/tutorial/Core07/Core07.upp b/tutorial/Core07/Core07.upp
new file mode 100644
index 000000000..3465296b1
--- /dev/null
+++ b/tutorial/Core07/Core07.upp
@@ -0,0 +1,8 @@
+uses
+	Core;
+
+file
+	Core07.cpp;
+
+mainconfig
+	"" = "";
diff --git a/tutorial/Core08/Core08.cpp b/tutorial/Core08/Core08.cpp
new file mode 100644
index 000000000..117f5b470
--- /dev/null
+++ b/tutorial/Core08/Core08.cpp
@@ -0,0 +1,42 @@
+#include <Core/Core.h>
+
+using namespace Upp;
+
+struct Foo : AssignValueTypeNo<Foo, 10010> {
+	int x;
+	
+	Foo(int x) : x(x) {}
+	Foo() {}
+
+	String ToString() const             { return AsString(x); }
+	unsigned GetHashValue() const       { return x; }
+	void Serialize(Stream& s)           { s % x; }
+	bool operator==(const Foo& b) const { return x == b.x; }
+	bool IsNullInstance() const         { return IsNull(x); }
+	
+	operator Value()    { return RichToValue(*this); }
+	Foo(const Value& v) { *this = ValueTo<Foo>(v); }
+};
+
+INITBLOCK {
+	RichValue<Foo>::Register();
+}
+
+CONSOLE_APP_MAIN
+{
+	Value v = RawToValue(Foo(12345));
+	DUMP(v.Is<Foo>());
+	DUMP(ValueTo<Foo>(v).x);
+	
+	Value a = RichToValue(Foo(54321));
+	Value b = RichToValue(Foo(54321));
+	DUMP(a == b);
+	DUMP(IsNull(a));
+	String s = StoreAsString(a);
+	LoadFromString(v, s);
+	DUMP(ValueTo<Foo>(v));
+	
+	Value c = Foo(321);
+	Foo x = c;
+	DUMP(x);
+}
diff --git a/tutorial/Core08/Core08.upp b/tutorial/Core08/Core08.upp
new file mode 100644
index 000000000..630c0dce5
--- /dev/null
+++ b/tutorial/Core08/Core08.upp
@@ -0,0 +1,9 @@
+uses
+	Core;
+
+file
+	Core08.cpp;
+
+mainconfig
+	"" = "";
+
diff --git a/tutorial/Draw01/Draw01.upp b/tutorial/Draw01/Draw01.upp
new file mode 100644
index 000000000..631cab217
--- /dev/null
+++ b/tutorial/Draw01/Draw01.upp
@@ -0,0 +1,9 @@
+uses
+	CtrlLib;
+
+file
+	
+	"main.cpp";
+
+mainconfig
+	"" = "GUI";
diff --git a/tutorial/Draw01/main.cpp b/tutorial/Draw01/main.cpp
new file mode 100644
index 000000000..dc9ba797a
--- /dev/null
+++ b/tutorial/Draw01/main.cpp
@@ -0,0 +1,55 @@
+#include <CtrlLib/CtrlLib.h>
+
+using namespace Upp;
+
+struct MyApp : TopWindow {
+	virtual void Paint(Draw& w) {
+		w.DrawRect(GetSize(), White());
+
+		w.DrawRect(10, 10, 60, 80, Green());
+
+		w.DrawLine(100, 10, 160, 80, 0, Black());
+		w.DrawLine(160, 10, 100, 80, 4, Red());
+		w.DrawLine(160, 40, 100, 50, PEN_DOT, Red());
+
+		w.DrawEllipse(210, 20, 80, 60, Blue());
+
+		w.DrawEllipse(310, 20, 80, 60, LtBlue(), 5, Red());
+
+		w.DrawArc(RectC(410, 20, 80, 60), Point(10, 10), Point(450, 80), 3, Cyan);
+
+		Vector<Point> p;
+		p << Point(30, 110) << Point(60, 180) << Point(10, 150) << Point(70, 150);
+		w.DrawPolyline(p, 4, Black);
+
+		p.Clear();
+		p << Point(130, 110) << Point(160, 180) << Point(110, 150) << Point(170, 120)
+		  << Point(130, 110);
+		w.DrawPolygon(p, Blue);
+
+		p.Clear();
+		p << Point(230, 110) << Point(260, 180) << Point(210, 150) << Point(270, 120)
+		  << Point(230, 110);
+		w.DrawPolygon(p, Cyan, 5, Magenta);
+
+		p.Clear();
+		p << Point(330, 110) << Point(360, 180) << Point(310, 150) << Point(370, 120)
+		  << Point(330, 110);
+		w.DrawPolygon(p, Cyan, 5, Magenta, INT64(0xaa55aa55aa55aa55ULL));
+
+		w.DrawImage(40, 240, CtrlImg::save());
+		w.DrawImage(110, 210, 80, 80, CtrlImg::save());
+		w.DrawImage(240, 240, CtrlImg::save(), Blue);
+		w.DrawImage(310, 210, 80, 80, CtrlImg::save(), Blue);
+
+		w.DrawText(20, 330, "Hello world!");
+		w.DrawText(120, 330, "Hello world!", Arial(15).Bold());
+		w.DrawText(220, 330, "Hello world!", Roman(15).Italic(), Red);
+		w.DrawText(320, 380, 400, "Hello world!", Courier(15).Underline());
+	}
+};
+
+GUI_APP_MAIN
+{
+	MyApp().Sizeable().Run();
+}
diff --git a/tutorial/Draw02/Draw02.upp b/tutorial/Draw02/Draw02.upp
new file mode 100644
index 000000000..631cab217
--- /dev/null
+++ b/tutorial/Draw02/Draw02.upp
@@ -0,0 +1,9 @@
+uses
+	CtrlLib;
+
+file
+	
+	"main.cpp";
+
+mainconfig
+	"" = "GUI";
diff --git a/tutorial/Draw02/main.cpp b/tutorial/Draw02/main.cpp
new file mode 100644
index 000000000..ff19eeef7
--- /dev/null
+++ b/tutorial/Draw02/main.cpp
@@ -0,0 +1,30 @@
+#include <CtrlLib/CtrlLib.h>
+
+using namespace Upp;
+
+struct MyApp : TopWindow {
+	void DoPainting(Draw& w) {
+		w.DrawEllipse(0, 0, 100, 30, WhiteGray(), 1, Cyan);
+		w.DrawText(0, 0, "Hello world", Roman(30).Bold());
+	}
+	virtual void Paint(Draw& w) {
+		w.DrawRect(GetSize(), White());
+		DoPainting(w);
+		w.Offset(30, 50);
+		DoPainting(w);
+		w.End();
+		w.Offset(20, 100);
+		w.Clip(5, 5, 40, 20);
+		DoPainting(w);
+		w.End();
+		w.End();
+		w.Clipoff(10, 150, 60, 20);
+		DoPainting(w);
+		w.End();
+	}
+};
+
+GUI_APP_MAIN
+{
+	MyApp().Sizeable().Run();
+}
diff --git a/tutorial/Draw03/Draw03.upp b/tutorial/Draw03/Draw03.upp
new file mode 100644
index 000000000..631cab217
--- /dev/null
+++ b/tutorial/Draw03/Draw03.upp
@@ -0,0 +1,9 @@
+uses
+	CtrlLib;
+
+file
+	
+	"main.cpp";
+
+mainconfig
+	"" = "GUI";
diff --git a/tutorial/Draw03/main.cpp b/tutorial/Draw03/main.cpp
new file mode 100644
index 000000000..a638d3d82
--- /dev/null
+++ b/tutorial/Draw03/main.cpp
@@ -0,0 +1,48 @@
+#include <CtrlLib/CtrlLib.h>
+
+using namespace Upp;
+
+struct MyApp : TopWindow {
+	DropList fontlist;
+
+	void Paint(Draw& w) {
+		w.DrawRect(GetSize(), White);
+		w.Offset(50, 50);
+		const char *text = "Programming is fun";
+		Font fnt(~fontlist, 60);
+		FontInfo fi = fnt.Info();
+		int x = 0;
+		Vector<int> dx;
+		for(const char *s = text; *s; s++) {
+			int width = fi[*s];
+			w.DrawRect(x, 0, width - 1, fi.GetAscent(), Color(255, 255, 200));
+			w.DrawRect(x, fi.GetAscent(), width - 1, fi.GetDescent(), Color(255, 200, 255));
+			w.DrawRect(x + width - 1, 0, 1, fi.GetHeight(), Black());
+			dx.Add(width + 4);
+			x += width;
+		}
+		w.DrawRect(0, 0, 4, 4, Black());
+		w.DrawText(0, 0, text, fnt);
+		w.DrawText(0, 70, text, fnt, Blue(), dx.GetCount(), dx.Begin());
+		w.End();
+	}
+
+	void NewFont() {
+		Refresh();
+	}
+
+	typedef MyApp CLASSNAME;
+
+	MyApp() {
+		for(int i = 0; i < Font::GetFaceCount(); i++)
+			fontlist.Add(i, Font::GetFaceName(i));
+		Add(fontlist.TopPos(0, MINSIZE).LeftPosZ(0, 200));
+		fontlist <<= 0;
+		fontlist <<= THISBACK(NewFont);
+	}
+};
+
+GUI_APP_MAIN
+{
+	MyApp().Sizeable().Run();
+}
diff --git a/tutorial/Draw04/Draw04.upp b/tutorial/Draw04/Draw04.upp
new file mode 100644
index 000000000..631cab217
--- /dev/null
+++ b/tutorial/Draw04/Draw04.upp
@@ -0,0 +1,9 @@
+uses
+	CtrlLib;
+
+file
+	
+	"main.cpp";
+
+mainconfig
+	"" = "GUI";
diff --git a/tutorial/Draw04/main.cpp b/tutorial/Draw04/main.cpp
new file mode 100644
index 000000000..6d8fcc7b8
--- /dev/null
+++ b/tutorial/Draw04/main.cpp
@@ -0,0 +1,27 @@
+#include <CtrlLib/CtrlLib.h>
+
+using namespace Upp;
+
+struct MyApp : TopWindow {
+	Drawing drawing;
+
+	void Paint(Draw& w) {
+		w.DrawRect(GetSize(), White());
+		w.DrawDrawing(10, 10, 50, 60, drawing);
+		w.DrawDrawing(100, 10, 150, 100, drawing);
+		w.DrawDrawing(10, 110, 300, 300, drawing);
+	}
+
+	MyApp() {
+		DrawingDraw iw(200, 200);
+		iw.DrawEllipse(10, 10, 180, 100, Cyan());
+		iw.DrawImage(100, 100, CtrlImg::exclamation());
+		iw.DrawRect(20, 100, 30, 30, Blue);
+		drawing = iw;
+	}
+};
+
+GUI_APP_MAIN
+{
+	MyApp().Sizeable().Run();
+}
diff --git a/tutorial/Draw05/Draw05.upp b/tutorial/Draw05/Draw05.upp
new file mode 100644
index 000000000..631cab217
--- /dev/null
+++ b/tutorial/Draw05/Draw05.upp
@@ -0,0 +1,9 @@
+uses
+	CtrlLib;
+
+file
+	
+	"main.cpp";
+
+mainconfig
+	"" = "GUI";
diff --git a/tutorial/Draw05/main.cpp b/tutorial/Draw05/main.cpp
new file mode 100644
index 000000000..6c28b9017
--- /dev/null
+++ b/tutorial/Draw05/main.cpp
@@ -0,0 +1,26 @@
+#include <CtrlLib/CtrlLib.h>
+
+using namespace Upp;
+
+struct MyApp : TopWindow {
+	Image image;
+
+	void Paint(Draw& w) {
+		w.DrawRect(GetSize(), Cyan());
+		w.DrawImage(10, 10, image);
+	}
+
+	MyApp() {
+		ImageDraw iw(100, 40);
+		iw.Alpha().DrawRect(0, 0, 100, 40, GrayColor(0));
+		iw.Alpha().DrawEllipse(0, 0, 100, 40, GrayColor(255));
+		iw.DrawEllipse(0, 0, 100, 40, Yellow());
+		iw.DrawText(26, 10, "Image", Arial(16).Bold());
+		image = iw;
+	}
+};
+
+GUI_APP_MAIN
+{
+	MyApp().Sizeable().Run();
+}
diff --git a/tutorial/Draw06/Draw06.upp b/tutorial/Draw06/Draw06.upp
new file mode 100644
index 000000000..631cab217
--- /dev/null
+++ b/tutorial/Draw06/Draw06.upp
@@ -0,0 +1,9 @@
+uses
+	CtrlLib;
+
+file
+	
+	"main.cpp";
+
+mainconfig
+	"" = "GUI";
diff --git a/tutorial/Draw06/main.cpp b/tutorial/Draw06/main.cpp
new file mode 100644
index 000000000..7dbe6fb72
--- /dev/null
+++ b/tutorial/Draw06/main.cpp
@@ -0,0 +1,19 @@
+#include <CtrlLib/CtrlLib.h>
+
+using namespace Upp;
+
+GUI_APP_MAIN
+{
+	PrinterJob pd("My printer job");
+	pd.CurrentPage(0);
+	pd.MinMaxPage(0, 1);
+	if(pd.Execute()) {
+		Draw& w = pd.GetDraw();
+		w.StartPage();
+		w.DrawText(200, 1200, "Helo world!", Arial(600));
+		w.EndPage();
+		w.StartPage();
+		w.DrawText(200, 1200, "Second page", Roman(600));
+		w.EndPage();
+	}
+}
diff --git a/tutorial/Grid01/Grid01.upp b/tutorial/Grid01/Grid01.upp
new file mode 100644
index 000000000..523917b86
--- /dev/null
+++ b/tutorial/Grid01/Grid01.upp
@@ -0,0 +1,9 @@
+uses
+	CtrlLib,
+	GridCtrl;
+
+file
+	main.cpp;
+
+mainconfig
+	"" = "GUI";
diff --git a/tutorial/Grid01/main.cpp b/tutorial/Grid01/main.cpp
new file mode 100644
index 000000000..055999448
--- /dev/null
+++ b/tutorial/Grid01/main.cpp
@@ -0,0 +1,56 @@
+#include <CtrlLib/CtrlLib.h>
+#include <GridCtrl/GridCtrl.h>
+
+using namespace Upp;
+
+struct App : TopWindow
+{
+	typedef App CLASSNAME;
+
+	GridCtrl grid;
+	EditString name;
+	EditInt age;
+
+	App()
+	{
+		Sizeable().Zoomable();
+
+		Add(grid.SizePos());
+
+		grid.AddColumn("Name").Edit(name);
+		grid.AddColumn("Age").Edit(age);
+
+		grid.Add("Ann", 21)
+		    .Add("Jack", 34)
+		    .Add("David", 15);
+
+		grid.Set(0, 0, "Daniel");
+		grid.SetFixed(0, 1, "Age of person");
+
+		grid.Indicator();
+		grid.WhenLeftDouble = THISBACK(ShowInfo);
+
+		/* uncomment this to get random color of rows */
+		//grid.WhenChangeRow = THISBACK(SetRandomColor);
+
+		grid.ColorRows();
+		grid.EditCell();
+		grid.EnterLikeTab();
+		grid.GoBegin();
+	}
+
+	void ShowInfo()
+	{
+		PromptOK(Format("%s is %d years old", grid(0), grid(1)));
+	}
+
+	void SetRandomColor()
+	{
+		grid.GetRow().Bg(Color(rand() % 255, rand() % 255, rand() % 255));
+	}
+};
+
+GUI_APP_MAIN
+{
+	App().Run();
+}
diff --git a/tutorial/Gui01/Gui01.upp b/tutorial/Gui01/Gui01.upp
new file mode 100644
index 000000000..5872304d3
--- /dev/null
+++ b/tutorial/Gui01/Gui01.upp
@@ -0,0 +1,9 @@
+uses
+	CtrlLib;
+
+file
+	main.cpp;
+
+mainconfig
+	"" = "GUI";
+
diff --git a/tutorial/Gui01/main.cpp b/tutorial/Gui01/main.cpp
new file mode 100644
index 000000000..65cbd4d19
--- /dev/null
+++ b/tutorial/Gui01/main.cpp
@@ -0,0 +1,7 @@
+#include <CtrlLib/CtrlLib.h>
+
+using namespace Upp;
+
+GUI_APP_MAIN {
+	PromptOK("Hello world");
+}
diff --git a/tutorial/Gui02/Gui02.upp b/tutorial/Gui02/Gui02.upp
new file mode 100644
index 000000000..5872304d3
--- /dev/null
+++ b/tutorial/Gui02/Gui02.upp
@@ -0,0 +1,9 @@
+uses
+	CtrlLib;
+
+file
+	main.cpp;
+
+mainconfig
+	"" = "GUI";
+
diff --git a/tutorial/Gui02/main.cpp b/tutorial/Gui02/main.cpp
new file mode 100644
index 000000000..84ed73ab9
--- /dev/null
+++ b/tutorial/Gui02/main.cpp
@@ -0,0 +1,8 @@
+#include <CtrlLib/CtrlLib.h>
+
+using namespace Upp;
+
+GUI_APP_MAIN {
+	TopWindow w;
+	w.Run();
+}
diff --git a/tutorial/Gui03/Gui03.upp b/tutorial/Gui03/Gui03.upp
new file mode 100644
index 000000000..5872304d3
--- /dev/null
+++ b/tutorial/Gui03/Gui03.upp
@@ -0,0 +1,9 @@
+uses
+	CtrlLib;
+
+file
+	main.cpp;
+
+mainconfig
+	"" = "GUI";
+
diff --git a/tutorial/Gui03/main.cpp b/tutorial/Gui03/main.cpp
new file mode 100644
index 000000000..aa04800ef
--- /dev/null
+++ b/tutorial/Gui03/main.cpp
@@ -0,0 +1,11 @@
+#include <CtrlLib/CtrlLib.h>
+
+using namespace Upp;
+
+GUI_APP_MAIN
+{
+	TopWindow w;
+	w.Title("My application").MinimizeBox().Sizeable();
+	w.SetRect(0, 0, 200, 300);
+	w.Run();
+}
diff --git a/tutorial/Gui04/Gui04.upp b/tutorial/Gui04/Gui04.upp
new file mode 100644
index 000000000..5872304d3
--- /dev/null
+++ b/tutorial/Gui04/Gui04.upp
@@ -0,0 +1,9 @@
+uses
+	CtrlLib;
+
+file
+	main.cpp;
+
+mainconfig
+	"" = "GUI";
+
diff --git a/tutorial/Gui04/main.cpp b/tutorial/Gui04/main.cpp
new file mode 100644
index 000000000..4cda881e8
--- /dev/null
+++ b/tutorial/Gui04/main.cpp
@@ -0,0 +1,21 @@
+#include <CtrlLib/CtrlLib.h>
+
+using namespace Upp;
+
+struct MyAppWindow : TopWindow {
+	virtual void Paint(Draw& w) {
+		w.DrawRect(GetSize(), SWhite);
+		w.DrawText(20, 20, "Hello world!", Arial(30), Magenta);
+	}
+
+	MyAppWindow() {
+		Title("My application").Zoomable().Sizeable();
+	}
+};
+
+GUI_APP_MAIN
+{
+	MyAppWindow app;
+	app.SetRect(0, 0, 200, 100);
+	app.Run();
+}
diff --git a/tutorial/Gui05/Gui05.upp b/tutorial/Gui05/Gui05.upp
new file mode 100644
index 000000000..5872304d3
--- /dev/null
+++ b/tutorial/Gui05/Gui05.upp
@@ -0,0 +1,9 @@
+uses
+	CtrlLib;
+
+file
+	main.cpp;
+
+mainconfig
+	"" = "GUI";
+
diff --git a/tutorial/Gui05/main.cpp b/tutorial/Gui05/main.cpp
new file mode 100644
index 000000000..4b10f6fe1
--- /dev/null
+++ b/tutorial/Gui05/main.cpp
@@ -0,0 +1,34 @@
+#include <CtrlLib/CtrlLib.h>
+
+using namespace Upp;
+
+struct MyAppWindow : TopWindow {
+	Point  p;
+	String text;
+
+	virtual void LeftDown(Point pos, dword flags) {
+		p = pos;
+		Refresh();
+	}
+
+	virtual void MouseMove(Point pos, dword flags) {
+		text = Format("[%d:%d]", pos.x, pos.y);
+		Refresh();
+	}
+
+	virtual void Paint(Draw& w) {
+		w.DrawRect(GetSize(), SWhite);
+		w.DrawText(p.x, p.y, text, Arial(20), Magenta);
+	}
+
+	MyAppWindow() {
+		Title("My application").Zoomable().Sizeable();
+		p.x = p.y = 0;
+	}
+};
+
+GUI_APP_MAIN
+{
+	MyAppWindow app;
+	app.Run();
+}
diff --git a/tutorial/Gui06/Gui06.upp b/tutorial/Gui06/Gui06.upp
new file mode 100644
index 000000000..5872304d3
--- /dev/null
+++ b/tutorial/Gui06/Gui06.upp
@@ -0,0 +1,9 @@
+uses
+	CtrlLib;
+
+file
+	main.cpp;
+
+mainconfig
+	"" = "GUI";
+
diff --git a/tutorial/Gui06/main.cpp b/tutorial/Gui06/main.cpp
new file mode 100644
index 000000000..0eaa99e6e
--- /dev/null
+++ b/tutorial/Gui06/main.cpp
@@ -0,0 +1,28 @@
+#include <CtrlLib/CtrlLib.h>
+
+using namespace Upp;
+
+struct MyAppWindow : TopWindow {
+	virtual void Close() {
+		delete this;
+	}
+
+	virtual void LeftDown(Point pos, dword flags) {
+		(new MyAppWindow)->OpenMain();
+	}
+
+	virtual void Paint(Draw& w) {
+		w.DrawRect(GetSize(), SWhite);
+		w.DrawText(0, 0, "Click the view area to open next window!", Arial(20));
+	}
+
+	MyAppWindow() {
+		Title("My multiwindowed application").Zoomable().Sizeable();
+	}
+};
+
+GUI_APP_MAIN
+{
+	(new MyAppWindow)->OpenMain();
+	Ctrl::EventLoop();
+}
diff --git a/tutorial/Gui07/Gui07.upp b/tutorial/Gui07/Gui07.upp
new file mode 100644
index 000000000..5872304d3
--- /dev/null
+++ b/tutorial/Gui07/Gui07.upp
@@ -0,0 +1,9 @@
+uses
+	CtrlLib;
+
+file
+	main.cpp;
+
+mainconfig
+	"" = "GUI";
+
diff --git a/tutorial/Gui07/main.cpp b/tutorial/Gui07/main.cpp
new file mode 100644
index 000000000..9bc12007e
--- /dev/null
+++ b/tutorial/Gui07/main.cpp
@@ -0,0 +1,34 @@
+#include <CtrlLib/CtrlLib.h>
+
+using namespace Upp;
+
+struct MyAppWindow : TopWindow {
+	MenuBar menu;
+
+	void Exit() {
+		if(PromptOKCancel("Exit MyApp?"))
+			Break();
+	}
+
+	void SubMenu(Bar& bar) {
+		bar.Add("Exit", THISBACK(Exit));
+	}
+
+	void MainMenu(Bar& bar) {
+		bar.Add("Menu", THISBACK(SubMenu));
+	}
+
+	typedef MyAppWindow CLASSNAME;
+
+	MyAppWindow() {
+		Title("My application with menu").Sizeable();
+		AddFrame(menu);
+		menu.Set(THISBACK(MainMenu));
+	}
+};
+
+GUI_APP_MAIN
+{
+	MyAppWindow app;
+	app.Run();
+}
diff --git a/tutorial/Gui08/Gui08.upp b/tutorial/Gui08/Gui08.upp
new file mode 100644
index 000000000..5872304d3
--- /dev/null
+++ b/tutorial/Gui08/Gui08.upp
@@ -0,0 +1,9 @@
+uses
+	CtrlLib;
+
+file
+	main.cpp;
+
+mainconfig
+	"" = "GUI";
+
diff --git a/tutorial/Gui08/main.cpp b/tutorial/Gui08/main.cpp
new file mode 100644
index 000000000..a004a1103
--- /dev/null
+++ b/tutorial/Gui08/main.cpp
@@ -0,0 +1,30 @@
+#include <CtrlLib/CtrlLib.h>
+
+using namespace Upp;
+
+struct MyAppWindow : TopWindow {
+	void Exit() {
+		if(PromptOKCancel("Exit MyApp?"))
+			Break();
+	}
+
+	void LocalMenu(Bar& bar) {
+		bar.Add("Exit", THISBACK(Exit));
+	}
+
+	void RightDown(Point, dword) {
+		MenuBar::Execute(THISBACK(LocalMenu));
+	}
+
+	typedef MyAppWindow CLASSNAME;
+
+	MyAppWindow() {
+		Title("My application with local menu").Sizeable();
+	}
+};
+
+GUI_APP_MAIN
+{
+	MyAppWindow app;
+	app.Run();
+}
diff --git a/tutorial/Gui09/Gui09.upp b/tutorial/Gui09/Gui09.upp
new file mode 100644
index 000000000..5872304d3
--- /dev/null
+++ b/tutorial/Gui09/Gui09.upp
@@ -0,0 +1,9 @@
+uses
+	CtrlLib;
+
+file
+	main.cpp;
+
+mainconfig
+	"" = "GUI";
+
diff --git a/tutorial/Gui09/main.cpp b/tutorial/Gui09/main.cpp
new file mode 100644
index 000000000..438dca50b
--- /dev/null
+++ b/tutorial/Gui09/main.cpp
@@ -0,0 +1,34 @@
+#include <CtrlLib/CtrlLib.h>
+
+using namespace Upp;
+
+struct MyAppWindow : TopWindow {
+	void Exit() {
+		if(PromptOKCancel("Exit MyApp?"))
+			Break();
+	}
+
+	void RightDown(Point, dword) {
+		CallbackArgTarget<int> result;
+		MenuBar menu;
+		for(int i = 0; i < 10; i++)
+			menu.Add(AsString(i), result[i]);
+		menu.Separator();
+		menu.Add("Exit", THISBACK(Exit));
+		menu.Execute();
+		if(!IsNull(result))
+			PromptOK("You have selected " + AsString((int)result));
+	}
+
+	typedef MyAppWindow CLASSNAME;
+
+	MyAppWindow() {
+		Title("My application with context menu").Sizeable();
+	}
+};
+
+GUI_APP_MAIN
+{
+	MyAppWindow app;
+	app.Run();
+}
diff --git a/tutorial/Gui10/Gui10.upp b/tutorial/Gui10/Gui10.upp
new file mode 100644
index 000000000..5ac778ea1
--- /dev/null
+++ b/tutorial/Gui10/Gui10.upp
@@ -0,0 +1,9 @@
+uses
+	CtrlLib;
+
+file
+	main.cpp,
+	images.iml;
+
+mainconfig
+	"" = "GUI";
diff --git a/tutorial/Gui10/icon.ico b/tutorial/Gui10/icon.ico
new file mode 100644
index 000000000..4012786aa
Binary files /dev/null and b/tutorial/Gui10/icon.ico differ
diff --git a/tutorial/Gui10/images.iml b/tutorial/Gui10/images.iml
new file mode 100644
index 000000000..da71cb614
--- /dev/null
+++ b/tutorial/Gui10/images.iml
@@ -0,0 +1,54 @@
+IMAGE_BEGIN(Exit)
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("ʼn\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\0��\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\0��\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\0��\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\0��\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\0���\0\0\0\2\0��\0\0\0�")
+	IMAGE_SCAN("�\3\0\0\0\0���\0\0�\0��\1\0\0\0�")
+	IMAGE_SCAN("�\2\0\0\0\0����\0\0�\0��\1\0\0\0�")
+	IMAGE_SCAN("ˆ�\0\0�\0��\1\0\0\0�")
+	IMAGE_SCAN("�\2\0\0\0\0����\0\0�\0��\1\0\0\0�")
+	IMAGE_SCAN("�\3\0\0\0\0���\0\0�\0��\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\0��\1\0\0\0�")
+	IMAGE_SCAN("ʼn\0\0\0�")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�")
+IMAGE_PACKED(Exit, "\2\20\0\0\0\20\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(Fn)
+	IMAGE_SCAN("ņ\0\0\0�")
+	IMAGE_SCAN("Â\0\0\0�\377\0\0�\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\377\0\0\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\377\0\0\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\377\0\0\1\0\0\0�")
+	IMAGE_SCAN("\1\0\0\0�\377\0\0\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\377\0\0\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\377\0\0\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\377\0\0\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\377\0\0\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\377\0\0\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377\0\0\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\377\0\0\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\377\0\0\1\0\0\0�")
+	IMAGE_SCAN("Â\0\0\0�\377\0\0�\0\0\0�")
+	IMAGE_SCAN("ņ\0\0\0�")
+IMAGE_PACKED(Fn, "\2\20\0\0\0\20\0\0\0\377\377\377\377\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(Fn2)
+	IMAGE_SCAN("ņ\0\0\0�")
+	IMAGE_SCAN("Â\0\0\0�\377\0\0�\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\377\0\0\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\377\0\0�\0\377\377�\377\0\0\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\377\0\0\1\0\377\377�\377\0\0\1\0\377\377�\377\0\0\1\0\0\0�")
+	IMAGE_SCAN("\1\0\0\0�\377\0\0\1\0\377\377�\377\0\0\1\0\377\377�\377\0\0\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\377\0\0\1\0\377\377�\377\0\0\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\377\0\0\1\0\377\377�\377\0\0\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\377\0\0\1\0\377\377�\377\0\0\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\377\0\0\1\0\377\377�\377\0\0\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\377\0\0\1\0\377\377�\377\0\0\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377\0\0�\0\377\377�\377\0\0\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\377\0\0\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\377\0\0\1\0\0\0�")
+	IMAGE_SCAN("Â\0\0\0�\377\0\0�\0\0\0�")
+	IMAGE_SCAN("ņ\0\0\0�")
+IMAGE_PACKED(Fn2, "\2\20\0\0\0\20\0\0\0\377\377\377\377\0\0\0\0\0\0\0\0")
diff --git a/tutorial/Gui10/main.cpp b/tutorial/Gui10/main.cpp
new file mode 100644
index 000000000..710240f02
--- /dev/null
+++ b/tutorial/Gui10/main.cpp
@@ -0,0 +1,38 @@
+#include <CtrlLib/CtrlLib.h>
+
+using namespace Upp;
+
+#define IMAGECLASS TutorialImg
+#define IMAGEFILE <Gui10/images.iml>
+#include <Draw/iml.h>
+
+struct MyAppWindow : TopWindow {
+	MenuBar menu;
+
+	void Exit() {
+		if(PromptOKCancel("Exit MyApp?"))
+			Break();
+	}
+
+	void SubMenu(Bar& bar) {
+		bar.Add("Exit", TutorialImg::Exit(), THISBACK(Exit));
+	}
+
+	void MainMenu(Bar& bar) {
+		bar.Add("Menu", THISBACK(SubMenu));
+	}
+
+	typedef MyAppWindow CLASSNAME;
+
+	MyAppWindow() {
+		Title("My application with menu and images").Sizeable();
+		AddFrame(menu);
+		menu.Set(THISBACK(MainMenu));
+	}
+};
+
+GUI_APP_MAIN
+{
+	MyAppWindow app;
+	app.Run();
+}
diff --git a/tutorial/Gui11/Gui11.upp b/tutorial/Gui11/Gui11.upp
new file mode 100644
index 000000000..5ac778ea1
--- /dev/null
+++ b/tutorial/Gui11/Gui11.upp
@@ -0,0 +1,9 @@
+uses
+	CtrlLib;
+
+file
+	main.cpp,
+	images.iml;
+
+mainconfig
+	"" = "GUI";
diff --git a/tutorial/Gui11/icon.ico b/tutorial/Gui11/icon.ico
new file mode 100644
index 000000000..4012786aa
Binary files /dev/null and b/tutorial/Gui11/icon.ico differ
diff --git a/tutorial/Gui11/images.iml b/tutorial/Gui11/images.iml
new file mode 100644
index 000000000..da71cb614
--- /dev/null
+++ b/tutorial/Gui11/images.iml
@@ -0,0 +1,54 @@
+IMAGE_BEGIN(Exit)
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("ʼn\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\0��\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\0��\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\0��\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\0��\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\0���\0\0\0\2\0��\0\0\0�")
+	IMAGE_SCAN("�\3\0\0\0\0���\0\0�\0��\1\0\0\0�")
+	IMAGE_SCAN("�\2\0\0\0\0����\0\0�\0��\1\0\0\0�")
+	IMAGE_SCAN("ˆ�\0\0�\0��\1\0\0\0�")
+	IMAGE_SCAN("�\2\0\0\0\0����\0\0�\0��\1\0\0\0�")
+	IMAGE_SCAN("�\3\0\0\0\0���\0\0�\0��\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\0��\1\0\0\0�")
+	IMAGE_SCAN("ʼn\0\0\0�")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�")
+IMAGE_PACKED(Exit, "\2\20\0\0\0\20\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(Fn)
+	IMAGE_SCAN("ņ\0\0\0�")
+	IMAGE_SCAN("Â\0\0\0�\377\0\0�\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\377\0\0\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\377\0\0\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\377\0\0\1\0\0\0�")
+	IMAGE_SCAN("\1\0\0\0�\377\0\0\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\377\0\0\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\377\0\0\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\377\0\0\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\377\0\0\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\377\0\0\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377\0\0\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\377\0\0\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\377\0\0\1\0\0\0�")
+	IMAGE_SCAN("Â\0\0\0�\377\0\0�\0\0\0�")
+	IMAGE_SCAN("ņ\0\0\0�")
+IMAGE_PACKED(Fn, "\2\20\0\0\0\20\0\0\0\377\377\377\377\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(Fn2)
+	IMAGE_SCAN("ņ\0\0\0�")
+	IMAGE_SCAN("Â\0\0\0�\377\0\0�\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\377\0\0\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\377\0\0�\0\377\377�\377\0\0\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\377\0\0\1\0\377\377�\377\0\0\1\0\377\377�\377\0\0\1\0\0\0�")
+	IMAGE_SCAN("\1\0\0\0�\377\0\0\1\0\377\377�\377\0\0\1\0\377\377�\377\0\0\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\377\0\0\1\0\377\377�\377\0\0\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\377\0\0\1\0\377\377�\377\0\0\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\377\0\0\1\0\377\377�\377\0\0\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\377\0\0\1\0\377\377�\377\0\0\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\377\0\0\1\0\377\377�\377\0\0\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377\0\0�\0\377\377�\377\0\0\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\377\0\0\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\377\0\0\1\0\0\0�")
+	IMAGE_SCAN("Â\0\0\0�\377\0\0�\0\0\0�")
+	IMAGE_SCAN("ņ\0\0\0�")
+IMAGE_PACKED(Fn2, "\2\20\0\0\0\20\0\0\0\377\377\377\377\0\0\0\0\0\0\0\0")
diff --git a/tutorial/Gui11/main.cpp b/tutorial/Gui11/main.cpp
new file mode 100644
index 000000000..16752b002
--- /dev/null
+++ b/tutorial/Gui11/main.cpp
@@ -0,0 +1,51 @@
+#include <CtrlLib/CtrlLib.h>
+
+using namespace Upp;
+
+#define IMAGECLASS TutorialImg
+#define IMAGEFILE <Gui11/images.iml>
+#include <Draw/iml.h>
+
+struct MyAppWindow : TopWindow {
+	MenuBar menu;
+	ToolBar tool;
+
+	void MenuFn() {
+		PromptOK("Fn activated!");
+	}
+
+	void BarFn() {
+		PromptOK("Fn2 activated!");
+	}
+
+	void Exit() {
+		if(PromptOKCancel("Exit MyApp?"))
+			Break();
+	}
+
+	void SubBar(Bar& bar) {
+		bar.AddMenu("Function", TutorialImg::Fn(), THISBACK(MenuFn));
+		bar.Add(TutorialImg::Fn2(), THISBACK(BarFn));
+		bar.Add("Exit", TutorialImg::Exit(), THISBACK(Exit));
+	}
+
+	void MainMenu(Bar& bar) {
+		bar.Add("Menu", THISBACK(SubBar));
+	}
+
+	typedef MyAppWindow CLASSNAME;
+
+	MyAppWindow() {
+		Title("My application with bars").Sizeable();
+		AddFrame(menu);
+		AddFrame(tool);
+		menu.Set(THISBACK(MainMenu));
+		tool.Set(THISBACK(SubBar));
+	}
+};
+
+GUI_APP_MAIN
+{
+	MyAppWindow app;
+	app.Run();
+}
diff --git a/tutorial/Gui12/Gui12.upp b/tutorial/Gui12/Gui12.upp
new file mode 100644
index 000000000..5ac778ea1
--- /dev/null
+++ b/tutorial/Gui12/Gui12.upp
@@ -0,0 +1,9 @@
+uses
+	CtrlLib;
+
+file
+	main.cpp,
+	images.iml;
+
+mainconfig
+	"" = "GUI";
diff --git a/tutorial/Gui12/icon.ico b/tutorial/Gui12/icon.ico
new file mode 100644
index 000000000..4012786aa
Binary files /dev/null and b/tutorial/Gui12/icon.ico differ
diff --git a/tutorial/Gui12/images.iml b/tutorial/Gui12/images.iml
new file mode 100644
index 000000000..da71cb614
--- /dev/null
+++ b/tutorial/Gui12/images.iml
@@ -0,0 +1,54 @@
+IMAGE_BEGIN(Exit)
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("ʼn\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\0��\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\0��\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\0��\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\0��\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\0���\0\0\0\2\0��\0\0\0�")
+	IMAGE_SCAN("�\3\0\0\0\0���\0\0�\0��\1\0\0\0�")
+	IMAGE_SCAN("�\2\0\0\0\0����\0\0�\0��\1\0\0\0�")
+	IMAGE_SCAN("ˆ�\0\0�\0��\1\0\0\0�")
+	IMAGE_SCAN("�\2\0\0\0\0����\0\0�\0��\1\0\0\0�")
+	IMAGE_SCAN("�\3\0\0\0\0���\0\0�\0��\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\0��\1\0\0\0�")
+	IMAGE_SCAN("ʼn\0\0\0�")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�")
+IMAGE_PACKED(Exit, "\2\20\0\0\0\20\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(Fn)
+	IMAGE_SCAN("ņ\0\0\0�")
+	IMAGE_SCAN("Â\0\0\0�\377\0\0�\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\377\0\0\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\377\0\0\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\377\0\0\1\0\0\0�")
+	IMAGE_SCAN("\1\0\0\0�\377\0\0\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\377\0\0\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\377\0\0\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\377\0\0\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\377\0\0\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\377\0\0\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377\0\0\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\377\0\0\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\377\0\0\1\0\0\0�")
+	IMAGE_SCAN("Â\0\0\0�\377\0\0�\0\0\0�")
+	IMAGE_SCAN("ņ\0\0\0�")
+IMAGE_PACKED(Fn, "\2\20\0\0\0\20\0\0\0\377\377\377\377\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(Fn2)
+	IMAGE_SCAN("ņ\0\0\0�")
+	IMAGE_SCAN("Â\0\0\0�\377\0\0�\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\377\0\0\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\377\0\0�\0\377\377�\377\0\0\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\377\0\0\1\0\377\377�\377\0\0\1\0\377\377�\377\0\0\1\0\0\0�")
+	IMAGE_SCAN("\1\0\0\0�\377\0\0\1\0\377\377�\377\0\0\1\0\377\377�\377\0\0\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\377\0\0\1\0\377\377�\377\0\0\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\377\0\0\1\0\377\377�\377\0\0\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\377\0\0\1\0\377\377�\377\0\0\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\377\0\0\1\0\377\377�\377\0\0\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\377\0\0\1\0\377\377�\377\0\0\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377\0\0�\0\377\377�\377\0\0\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\377\0\0\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\377\0\0\1\0\0\0�")
+	IMAGE_SCAN("Â\0\0\0�\377\0\0�\0\0\0�")
+	IMAGE_SCAN("ņ\0\0\0�")
+IMAGE_PACKED(Fn2, "\2\20\0\0\0\20\0\0\0\377\377\377\377\0\0\0\0\0\0\0\0")
diff --git a/tutorial/Gui12/main.cpp b/tutorial/Gui12/main.cpp
new file mode 100644
index 000000000..c8d97ade4
--- /dev/null
+++ b/tutorial/Gui12/main.cpp
@@ -0,0 +1,59 @@
+#include <CtrlLib/CtrlLib.h>
+
+using namespace Upp;
+
+#define IMAGECLASS TutorialImg
+#define IMAGEFILE <Gui12/images.iml>
+#include <Draw/iml.h>
+
+struct MyAppWindow : TopWindow {
+	MenuBar   menu;
+	ToolBar   tool;
+	StatusBar status;
+
+	void MenuFn() {
+		PromptOK("Fn activated!");
+	}
+
+	void BarFn() {
+		PromptOK("Fn2 activated!");
+	}
+
+	void Exit() {
+		if(PromptOKCancel("Exit MyApp?"))
+			Break();
+	}
+
+	void SubBar(Bar& bar) {
+		bar.AddMenu("Function", TutorialImg::Fn(), THISBACK(MenuFn))
+		   .Help("This invokes MenuFn method of tutorial example");
+		bar.Add(TutorialImg::Fn2(), THISBACK(BarFn))
+		   .Help("This invokes BarFn method of tutorial example");
+		bar.Add("Exit", TutorialImg::Exit(), THISBACK(Exit));
+	}
+
+	void MainMenu(Bar& bar) {
+		bar.Add("Menu", THISBACK(SubBar));
+	}
+
+	typedef MyAppWindow CLASSNAME;
+
+	MyAppWindow() {
+		Title("My application with bars").Sizeable();
+		AddFrame(menu);
+		AddFrame(TopSeparatorFrame());
+		AddFrame(tool);
+		AddFrame(status);
+		AddFrame(InsetFrame());
+		menu.Set(THISBACK(MainMenu));
+		menu.WhenHelp = status;
+		tool.Set(THISBACK(SubBar));
+		tool.WhenHelp = status;
+	}
+};
+
+GUI_APP_MAIN
+{
+	MyAppWindow app;
+	app.Run();
+}
diff --git a/tutorial/Gui13/Gui13.upp b/tutorial/Gui13/Gui13.upp
new file mode 100644
index 000000000..5872304d3
--- /dev/null
+++ b/tutorial/Gui13/Gui13.upp
@@ -0,0 +1,9 @@
+uses
+	CtrlLib;
+
+file
+	main.cpp;
+
+mainconfig
+	"" = "GUI";
+
diff --git a/tutorial/Gui13/main.cpp b/tutorial/Gui13/main.cpp
new file mode 100644
index 000000000..e6d0920ea
--- /dev/null
+++ b/tutorial/Gui13/main.cpp
@@ -0,0 +1,24 @@
+#include <CtrlLib/CtrlLib.h>
+
+using namespace Upp;
+
+struct MyAppWindow : TopWindow {
+	Button button;
+
+	void Click() { PromptOK("You have clicked the button!"); }
+
+	typedef MyAppWindow CLASSNAME;
+
+	MyAppWindow() {
+		Title("My application with button");
+		Add(button.LeftPos(10, 100).TopPos(10, 30));
+		button.SetLabel("Click me!");
+		button <<= THISBACK(Click);
+	}
+};
+
+GUI_APP_MAIN
+{
+	MyAppWindow app;
+	app.Run();
+}
diff --git a/tutorial/Gui14/Gui14.upp b/tutorial/Gui14/Gui14.upp
new file mode 100644
index 000000000..5872304d3
--- /dev/null
+++ b/tutorial/Gui14/Gui14.upp
@@ -0,0 +1,9 @@
+uses
+	CtrlLib;
+
+file
+	main.cpp;
+
+mainconfig
+	"" = "GUI";
+
diff --git a/tutorial/Gui14/main.cpp b/tutorial/Gui14/main.cpp
new file mode 100644
index 000000000..03ebade53
--- /dev/null
+++ b/tutorial/Gui14/main.cpp
@@ -0,0 +1,28 @@
+#include <CtrlLib/CtrlLib.h>
+
+using namespace Upp;
+
+struct MyAppWindow : TopWindow {
+	Button lt, rt, lb, rb, lv, ht, hv, cb, rc;
+
+	MyAppWindow() {
+		Title("My application with button").Sizeable();
+		*this
+			<< lt.SetLabel("left-top").LeftPos(10, 100).TopPos(10, 20)
+			<< rt.SetLabel("right-top").RightPos(10, 100).TopPos(10, 20)
+			<< lb.SetLabel("left-bottom").LeftPos(10, 100).BottomPos(10, 20)
+			<< rb.SetLabel("right-bottom").RightPos(10, 100).BottomPos(10, 20)
+			<< lv.SetLabel("left-vsize").LeftPos(10, 100).VSizePos(40, 40)
+			<< ht.SetLabel("hsize-pos").HSizePos(120, 120).TopPos(10, 20)
+			<< hv.SetLabel("hsize-vsize").HSizePos(120, 120).VSizePos(40, 40)
+			<< cb.SetLabel("hcenter-bottom").HCenterPos(90).BottomPos(10, 20)
+			<< rc.SetLabel("right-vcenter").RightPos(10, 100).VCenterPos(40)
+		;
+	}
+};
+
+GUI_APP_MAIN
+{
+	MyAppWindow app;
+	app.Run();
+}
diff --git a/tutorial/Gui15/Gui15.upp b/tutorial/Gui15/Gui15.upp
new file mode 100644
index 000000000..5872304d3
--- /dev/null
+++ b/tutorial/Gui15/Gui15.upp
@@ -0,0 +1,9 @@
+uses
+	CtrlLib;
+
+file
+	main.cpp;
+
+mainconfig
+	"" = "GUI";
+
diff --git a/tutorial/Gui15/main.cpp b/tutorial/Gui15/main.cpp
new file mode 100644
index 000000000..3ec3dd42c
--- /dev/null
+++ b/tutorial/Gui15/main.cpp
@@ -0,0 +1,18 @@
+#include <CtrlLib/CtrlLib.h>
+
+using namespace Upp;
+
+struct MyAppWindow : TopWindow {
+	Button button;
+
+	MyAppWindow() {
+		Title("My application with font-zoomed button").Sizeable();
+		*this << button.SetLabel("Button").LeftPosZ(10, 64).TopPosZ(10, 24);
+	}
+};
+
+GUI_APP_MAIN
+{
+	MyAppWindow app;
+	app.Run();
+}
diff --git a/tutorial/Gui16/Gui16.upp b/tutorial/Gui16/Gui16.upp
new file mode 100644
index 000000000..d954a4bdd
--- /dev/null
+++ b/tutorial/Gui16/Gui16.upp
@@ -0,0 +1,10 @@
+uses
+	CtrlLib;
+
+file
+	main.cpp,
+	dlg.lay;
+
+mainconfig
+	"" = "GUI";
+
diff --git a/tutorial/Gui16/dlg.lay b/tutorial/Gui16/dlg.lay
new file mode 100644
index 000000000..ad7f93533
--- /dev/null
+++ b/tutorial/Gui16/dlg.lay
@@ -0,0 +1,6 @@
+LAYOUT(DlgLayout, 208, 64)
+	ITEM(Label, dv___0, SetLabel(t_("Label")).LeftPosZ(8, 36).TopPosZ(8, 19))
+	ITEM(EditString, text, LeftPosZ(48, 92).TopPosZ(8, 19))
+	ITEM(Option, option, SetLabel(t_("Option")).LeftPosZ(8, 108).TopPosZ(32, 15))
+END_LAYOUT
+
diff --git a/tutorial/Gui16/main.cpp b/tutorial/Gui16/main.cpp
new file mode 100644
index 000000000..400e3b779
--- /dev/null
+++ b/tutorial/Gui16/main.cpp
@@ -0,0 +1,17 @@
+#include <CtrlLib/CtrlLib.h>
+
+using namespace Upp;
+
+#define LAYOUTFILE <Gui16/dlg.lay>
+#include <CtrlCore/lay.h>
+
+struct MyApp : public WithDlgLayout<TopWindow> {
+	MyApp() {
+		CtrlLayout(*this, "MyDialog");
+	}
+};
+
+GUI_APP_MAIN
+{
+	MyApp().Run();
+}
diff --git a/tutorial/Gui17a/Gui17a.upp b/tutorial/Gui17a/Gui17a.upp
new file mode 100644
index 000000000..932bd458b
--- /dev/null
+++ b/tutorial/Gui17a/Gui17a.upp
@@ -0,0 +1,8 @@
+uses
+	CtrlLib;
+
+file
+	main.cpp;
+
+mainconfig
+	"" = "GUI";
diff --git a/tutorial/Gui17a/main.cpp b/tutorial/Gui17a/main.cpp
new file mode 100644
index 000000000..d8b8cc7af
--- /dev/null
+++ b/tutorial/Gui17a/main.cpp
@@ -0,0 +1,15 @@
+#include <CtrlLib/CtrlLib.h>
+
+using namespace Upp;
+
+GUI_APP_MAIN
+{
+	TopWindow  app;
+	app.SetRect(0, 0, 200, 20);
+	EditString text;
+	app.Add(text.TopPosZ(0, 20).HSizePos());
+
+	text.SetData("Some text");
+	app.Run();
+	PromptOK((String)text.GetData());
+}
diff --git a/tutorial/Gui17b/Gui17b.upp b/tutorial/Gui17b/Gui17b.upp
new file mode 100644
index 000000000..932bd458b
--- /dev/null
+++ b/tutorial/Gui17b/Gui17b.upp
@@ -0,0 +1,8 @@
+uses
+	CtrlLib;
+
+file
+	main.cpp;
+
+mainconfig
+	"" = "GUI";
diff --git a/tutorial/Gui17b/main.cpp b/tutorial/Gui17b/main.cpp
new file mode 100644
index 000000000..9707c6826
--- /dev/null
+++ b/tutorial/Gui17b/main.cpp
@@ -0,0 +1,15 @@
+#include <CtrlLib/CtrlLib.h>
+
+using namespace Upp;
+
+GUI_APP_MAIN
+{
+	TopWindow  app;
+	app.SetRect(0, 0, 200, 20);
+	EditString text;
+	app.Add(text.TopPosZ(0, 20).HSizePos());
+
+	text <<= "Some text - operator version";
+	app.Run();
+	PromptOK((String)~text);
+}
diff --git a/tutorial/Gui18/Gui18.upp b/tutorial/Gui18/Gui18.upp
new file mode 100644
index 000000000..8fb7d2f21
--- /dev/null
+++ b/tutorial/Gui18/Gui18.upp
@@ -0,0 +1,9 @@
+uses
+	CtrlLib;
+
+file
+
+	"main.cpp";
+
+mainconfig
+	"" = "GUI";
diff --git a/tutorial/Gui18/main.cpp b/tutorial/Gui18/main.cpp
new file mode 100644
index 000000000..6b04ac5eb
--- /dev/null
+++ b/tutorial/Gui18/main.cpp
@@ -0,0 +1,14 @@
+#include <CtrlLib/CtrlLib.h>
+
+using namespace Upp;
+
+GUI_APP_MAIN
+{
+	TopWindow  app;
+	app.SetRect(0, 0, 200, 20);
+	EditDate  date;
+	app.Add(date.TopPosZ(0, 20).HSizePos());
+	app.Run();
+	if(app.Accept())
+		PromptOK("Correct date.&[* " + AsString(~date));
+}
diff --git a/tutorial/Gui19/Gui19.upp b/tutorial/Gui19/Gui19.upp
new file mode 100644
index 000000000..8fb7d2f21
--- /dev/null
+++ b/tutorial/Gui19/Gui19.upp
@@ -0,0 +1,9 @@
+uses
+	CtrlLib;
+
+file
+
+	"main.cpp";
+
+mainconfig
+	"" = "GUI";
diff --git a/tutorial/Gui19/main.cpp b/tutorial/Gui19/main.cpp
new file mode 100644
index 000000000..9a8232b96
--- /dev/null
+++ b/tutorial/Gui19/main.cpp
@@ -0,0 +1,20 @@
+#include <CtrlLib/CtrlLib.h>
+
+using namespace Upp;
+
+GUI_APP_MAIN
+{
+	TopWindow  app;
+	app.SetRect(0, 0, 200, 60);
+	EditDate  date1, date2, date3;
+	date1 <<= date2 <<= date3 <<= GetSysDate();
+	date1.ClearModify();
+	app.Add(date1.TopPosZ(0, 20).HSizePos());
+	date2.Disable();
+	app.Add(date2.TopPosZ(20, 20).HSizePos());
+	date3.SetReadOnly();
+	app.Add(date3.TopPosZ(40, 20).HSizePos());
+	app.Run();
+	if(date1.IsModified())
+		PromptOK("Date was modified!");
+}
diff --git a/tutorial/Gui20a/Gui20a.upp b/tutorial/Gui20a/Gui20a.upp
new file mode 100644
index 000000000..8fb7d2f21
--- /dev/null
+++ b/tutorial/Gui20a/Gui20a.upp
@@ -0,0 +1,9 @@
+uses
+	CtrlLib;
+
+file
+
+	"main.cpp";
+
+mainconfig
+	"" = "GUI";
diff --git a/tutorial/Gui20a/main.cpp b/tutorial/Gui20a/main.cpp
new file mode 100644
index 000000000..53194000f
--- /dev/null
+++ b/tutorial/Gui20a/main.cpp
@@ -0,0 +1,24 @@
+#include <CtrlLib/CtrlLib.h>
+
+using namespace Upp;
+
+struct MyApp : TopWindow {
+	Button exit;
+
+	void Exit() {
+		Break(999);
+	}
+
+	typedef MyApp CLASSNAME;
+
+	MyApp() {
+		SetRect(0, 0, 100, 100);
+		Add(exit.SetLabel("exit").LeftPosZ(10, 64).TopPosZ(10, 24));
+		exit <<= THISBACK(Exit);
+	}
+};
+
+GUI_APP_MAIN
+{
+	MyApp().Run();
+}
diff --git a/tutorial/Gui20b/Gui20b.upp b/tutorial/Gui20b/Gui20b.upp
new file mode 100644
index 000000000..8fb7d2f21
--- /dev/null
+++ b/tutorial/Gui20b/Gui20b.upp
@@ -0,0 +1,9 @@
+uses
+	CtrlLib;
+
+file
+
+	"main.cpp";
+
+mainconfig
+	"" = "GUI";
diff --git a/tutorial/Gui20b/main.cpp b/tutorial/Gui20b/main.cpp
new file mode 100644
index 000000000..1eba4f45c
--- /dev/null
+++ b/tutorial/Gui20b/main.cpp
@@ -0,0 +1,18 @@
+#include <CtrlLib/CtrlLib.h>
+
+using namespace Upp;
+
+struct MyApp : TopWindow {
+	Button exit;
+
+	MyApp() {
+		SetRect(0, 0, 100, 100);
+		Add(exit.SetLabel("exit").LeftPosZ(10, 64).TopPosZ(10, 24));
+		exit <<= Breaker(999);
+	}
+};
+
+GUI_APP_MAIN
+{
+	MyApp().Run();
+}
diff --git a/tutorial/Gui20c/Gui20c.upp b/tutorial/Gui20c/Gui20c.upp
new file mode 100644
index 000000000..8fb7d2f21
--- /dev/null
+++ b/tutorial/Gui20c/Gui20c.upp
@@ -0,0 +1,9 @@
+uses
+	CtrlLib;
+
+file
+
+	"main.cpp";
+
+mainconfig
+	"" = "GUI";
diff --git a/tutorial/Gui20c/main.cpp b/tutorial/Gui20c/main.cpp
new file mode 100644
index 000000000..fafb41ec3
--- /dev/null
+++ b/tutorial/Gui20c/main.cpp
@@ -0,0 +1,30 @@
+#include <CtrlLib/CtrlLib.h>
+
+using namespace Upp;
+
+struct MyApp : TopWindow {
+	Button ok, cancel;
+	EditDate date;
+
+	MyApp() {
+		SetRect(0, 0, 200, 90);
+		Add(date.LeftPosZ(10, 80).TopPosZ(10, 20));
+		Add(ok.SetLabel("OK").LeftPosZ(10, 64).TopPosZ(40, 24));
+		Add(cancel.SetLabel("Cancel").LeftPosZ(100, 64).TopPosZ(40, 24));
+
+		ok <<= Acceptor(IDOK);
+		cancel <<= Rejector(IDCANCEL);
+	}
+};
+
+GUI_APP_MAIN
+{
+	MyApp app;
+	switch(app.Run()) {
+	case IDOK:
+		PromptOK(String().Cat() << "OK: " << ~app.date);
+		break;
+	case IDCANCEL:
+		Exclamation("Canceled");
+	}
+}
diff --git a/tutorial/Gui20d/Gui20d.lay b/tutorial/Gui20d/Gui20d.lay
new file mode 100644
index 000000000..e44260edd
--- /dev/null
+++ b/tutorial/Gui20d/Gui20d.lay
@@ -0,0 +1,5 @@
+LAYOUT(MyAppLayout, 148, 64)
+	ITEM(EditDate, date, LeftPosZ(4, 88).TopPosZ(4, 19))
+	ITEM(Button, ok, SetLabel(t_("OK")).LeftPosZ(4, 64).TopPosZ(32, 24))
+	ITEM(Button, cancel, SetLabel(t_("Cancel")).LeftPosZ(76, 64).TopPosZ(32, 24))
+END_LAYOUT
diff --git a/tutorial/Gui20d/Gui20d.upp b/tutorial/Gui20d/Gui20d.upp
new file mode 100644
index 000000000..5705a18c9
--- /dev/null
+++ b/tutorial/Gui20d/Gui20d.upp
@@ -0,0 +1,9 @@
+uses
+	CtrlLib;
+
+file
+	main.cpp,
+	myapp.lay;
+
+mainconfig
+	"" = "GUI";
diff --git a/tutorial/Gui20d/main.cpp b/tutorial/Gui20d/main.cpp
new file mode 100644
index 000000000..abd92d211
--- /dev/null
+++ b/tutorial/Gui20d/main.cpp
@@ -0,0 +1,19 @@
+#include <CtrlLib/CtrlLib.h>
+
+using namespace Upp;
+
+#define LAYOUTFILE <Gui20d/myapp.lay>
+#include <CtrlCore/lay.h>
+
+GUI_APP_MAIN
+{
+	WithMyAppLayout<TopWindow> app;
+	CtrlLayoutOKCancel(app, "MyApp");
+	switch(app.Run()) {
+	case IDOK:
+		PromptOK(String().Cat() << "OK: " << ~app.date);
+		break;
+	case IDCANCEL:
+		Exclamation("Canceled");
+	}
+}
diff --git a/tutorial/Gui20d/myapp.lay b/tutorial/Gui20d/myapp.lay
new file mode 100644
index 000000000..e44260edd
--- /dev/null
+++ b/tutorial/Gui20d/myapp.lay
@@ -0,0 +1,5 @@
+LAYOUT(MyAppLayout, 148, 64)
+	ITEM(EditDate, date, LeftPosZ(4, 88).TopPosZ(4, 19))
+	ITEM(Button, ok, SetLabel(t_("OK")).LeftPosZ(4, 64).TopPosZ(32, 24))
+	ITEM(Button, cancel, SetLabel(t_("Cancel")).LeftPosZ(76, 64).TopPosZ(32, 24))
+END_LAYOUT
diff --git a/tutorial/Gui21/Gui21.lay b/tutorial/Gui21/Gui21.lay
new file mode 100644
index 000000000..0ff85f02d
--- /dev/null
+++ b/tutorial/Gui21/Gui21.lay
@@ -0,0 +1,3 @@
+LAYOUT(Gui21Layout, 200, 100)
+	ITEM(MyCtrl, myctrl, LeftPosZ(44, 120).TopPosZ(36, 28))
+END_LAYOUT
diff --git a/tutorial/Gui21/Gui21.upp b/tutorial/Gui21/Gui21.upp
new file mode 100644
index 000000000..adf195594
--- /dev/null
+++ b/tutorial/Gui21/Gui21.upp
@@ -0,0 +1,10 @@
+uses
+	CtrlLib;
+
+file
+	main.cpp,
+	gui21.usc,
+	Gui21.lay;
+
+mainconfig
+	"" = "GUI";
diff --git a/tutorial/Gui21/gui21.usc b/tutorial/Gui21/gui21.usc
new file mode 100644
index 000000000..dba1f8edb
--- /dev/null
+++ b/tutorial/Gui21/gui21.usc
@@ -0,0 +1,12 @@
+ctrl MyCtrl {
+	group "Example";
+
+	GetMinSize() { sz = GetTextSize("X"); sz.cy += 2; return sz; }
+	GetStdSize() { sz = GetMinSize(); sz.cx *= 7; return sz; }
+
+	Paint(w) {
+		r = GetRect();
+		w.DrawRect(r, :White);
+		w.DrawText(2, 2, "0", StdFont(), :Black);
+	}
+};
diff --git a/tutorial/Gui21/main.cpp b/tutorial/Gui21/main.cpp
new file mode 100644
index 000000000..3fa8b686a
--- /dev/null
+++ b/tutorial/Gui21/main.cpp
@@ -0,0 +1,37 @@
+#include <CtrlLib/CtrlLib.h>
+
+using namespace Upp;
+
+struct MyCtrl : public Ctrl {
+	int count;
+
+	virtual void Paint(Draw& w) {
+		w.DrawRect(GetSize(), White());
+		w.DrawText(2, 2, AsString(count));
+	}
+
+	virtual void LeftDown(Point, dword) {
+		count++;
+		Refresh();
+	}
+
+	MyCtrl() { count = 0; }
+};
+
+#define LAYOUTFILE <Gui21/Gui21.lay>
+#include <CtrlCore/lay.h>
+
+struct Gui21 : public WithGui21Layout<TopWindow> {
+	typedef Gui21 CLASSNAME;
+	Gui21();
+};
+
+Gui21::Gui21()
+{
+	CtrlLayout(*this, "Window title");
+}
+
+GUI_APP_MAIN
+{
+	Gui21().Run();
+}
diff --git a/tutorial/Gui22/Gui22.upp b/tutorial/Gui22/Gui22.upp
new file mode 100644
index 000000000..8fb7d2f21
--- /dev/null
+++ b/tutorial/Gui22/Gui22.upp
@@ -0,0 +1,9 @@
+uses
+	CtrlLib;
+
+file
+
+	"main.cpp";
+
+mainconfig
+	"" = "GUI";
diff --git a/tutorial/Gui22/main.cpp b/tutorial/Gui22/main.cpp
new file mode 100644
index 000000000..6ad845b5d
--- /dev/null
+++ b/tutorial/Gui22/main.cpp
@@ -0,0 +1,45 @@
+#include <CtrlLib/CtrlLib.h>
+
+using namespace Upp;
+
+struct NonModalDialog : public TopWindow {
+	Button b;
+
+	void DoClose() {
+		Close();
+	}
+
+	typedef NonModalDialog CLASSNAME;
+
+	NonModalDialog() {
+		SetRect(0, 0, 200, 50);
+		Add(b.SetLabel("Close non-modal dialog").SizePos());
+		b <<= THISBACK(DoClose);
+	}
+};
+
+struct MainWindow : public TopWindow {
+	NonModalDialog dlg;
+	Button b;
+
+	void DoOpen() {
+		if(dlg.IsOpen())
+			dlg.Close();
+		else
+			dlg.Open(this);
+	}
+
+	typedef MainWindow CLASSNAME;
+
+	MainWindow() {
+		SetRect(0, 0, 400, 100);
+		Add(b.SetLabel("Open/close non-modal dialog").SizePos());
+		b <<= THISBACK(DoOpen);
+	}
+};
+
+GUI_APP_MAIN
+{
+	MainWindow win;
+	win.Run();
+}
diff --git a/tutorial/Image01/Image01.upp b/tutorial/Image01/Image01.upp
new file mode 100644
index 000000000..9f21e854a
--- /dev/null
+++ b/tutorial/Image01/Image01.upp
@@ -0,0 +1,10 @@
+uses
+	CtrlLib;
+
+file
+	main.cpp,
+	images.iml;
+
+mainconfig
+	"" = "GUI";
+
diff --git a/tutorial/Image01/images.iml b/tutorial/Image01/images.iml
new file mode 100644
index 000000000..8cf6b5cce
--- /dev/null
+++ b/tutorial/Image01/images.iml
@@ -0,0 +1,18 @@
+IMAGE_BEGIN(MyImage)
+	IMAGE_SCAN("����")
+	IMAGE_SCAN("\1����\0\0\0\1���")
+	IMAGE_SCAN("\2���\0\0\0�\0\0\377\2@\0�\0\0\0\1���")
+	IMAGE_SCAN("\17���\0\0\0\0\0\377\3\0�\5\0�\10\0�\12\0�\15\0�\20\0�\25\0�\33\0�\'\0�@\0��\0\0\0\0\0\1���")
+	IMAGE_SCAN("\17���\0\0\0\0\0\377\5\0�\12\0�\17\0�\24\0�\31\0�\37\0�\'\0�1\0�A\0�Z\0N�\0\0\0\0\0\1���")
+	IMAGE_SCAN("\17���\0\0\0\0\0\377\10\0�\17\0�\26\0�\35\0�$\0�,\0�6\0�B\0�R\0ag\0006�\0\0\0\0\0\1���")
+	IMAGE_SCAN("\17���\0\0\0\0\0\377\12\0�\24\0�\35\0�&\0�/\0�8\0�C\0�O\0j]\0Ln\0)�\0\0\0\0\0\1���")
+	IMAGE_SCAN("\17���\0\0\0\0\0\377\15\0�\31\0�$\0�/\0�9\0�C\0�N\0nY\0We\0=r\0 �\0\0\0\0\0\1���")
+	IMAGE_SCAN("\17���\0\0\0\0\0\377\20\0�\37\0�,\0�8\0�C\0�N\0pX\0\\b\0Gl\0001v\0\31�\0\0\0\0\0\1���")
+	IMAGE_SCAN("\17���\0\0\0\0\0\377\25\0�\'\0�6\0�C\0�N\0nX\0\\a\0Jj\0008r\0&y\0\23�\0\0\0\0\0\1���")
+	IMAGE_SCAN("\17���\0\0\0\0\0\377\33\0�1\0�B\0�O\0jY\0Wb\0Gj\0008q\0*w\0\34|\0\16�\0\0\0\0\0\1���")
+	IMAGE_SCAN("\17���\0\0\0\0\0\377\'\0�A\0�R\0a]\0Le\0=l\0001r\0&w\0\34{\0\23~\0\12�\0\0\0\0\0\1���")
+	IMAGE_SCAN("\17���\0\0\0\0\0\377@\0�Z\0Ng\0006n\0)r\0 v\0\31y\0\23|\0\16~\0\12\177\0\5�\0\0\0\0\0\1���")
+	IMAGE_SCAN("\3���\0\0\0@\0���\0\0\1\0\0\0\1���")
+	IMAGE_SCAN("\1����\0\0\0\1���")
+	IMAGE_SCAN("����")
+IMAGE_PACKED(MyImage, "\2\20\0\0\0\20\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0")
diff --git a/tutorial/Image01/main.cpp b/tutorial/Image01/main.cpp
new file mode 100644
index 000000000..dc926b81d
--- /dev/null
+++ b/tutorial/Image01/main.cpp
@@ -0,0 +1,23 @@
+#include <CtrlLib/CtrlLib.h>
+
+using namespace Upp;
+
+#define IMAGECLASS MyImages
+#define IMAGEFILE  <Image01/images.iml>
+#include <Draw/iml.h>
+
+class MyApp : public TopWindow {
+public:
+	virtual void Paint(Draw& draw);
+};
+
+void MyApp::Paint(Draw& w)
+{
+	w.DrawRect(GetSize(), SColorFace());
+	w.DrawImage(50, 50, MyImages::MyImage());
+}
+
+GUI_APP_MAIN
+{
+	MyApp().Sizeable().Run();
+}
diff --git a/tutorial/Image02a/Image02a.upp b/tutorial/Image02a/Image02a.upp
new file mode 100644
index 000000000..5ac778ea1
--- /dev/null
+++ b/tutorial/Image02a/Image02a.upp
@@ -0,0 +1,9 @@
+uses
+	CtrlLib;
+
+file
+	main.cpp,
+	images.iml;
+
+mainconfig
+	"" = "GUI";
diff --git a/tutorial/Image02a/icon.ico b/tutorial/Image02a/icon.ico
new file mode 100644
index 000000000..4012786aa
Binary files /dev/null and b/tutorial/Image02a/icon.ico differ
diff --git a/tutorial/Image02a/images.iml b/tutorial/Image02a/images.iml
new file mode 100644
index 000000000..c295e573f
--- /dev/null
+++ b/tutorial/Image02a/images.iml
@@ -0,0 +1,54 @@
+IMAGE_BEGIN(Rectangle)
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("��\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\377\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\377\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\377\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\377\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\377\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\377\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\377\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\377\1\0\0\0�")
+	IMAGE_SCAN("��\0\0\0�")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�")
+IMAGE_PACKED(Rectangle, "\2\20\0\0\0\20\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(Circle)
+	IMAGE_SCAN("ņ\0\0\0�")
+	IMAGE_SCAN("Â\0\0\0�\377\0\0�\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\377\0\0\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\377\0\0\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\377\0\0\1\0\0\0�")
+	IMAGE_SCAN("\1\0\0\0�\377\0\0\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\377\0\0\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\377\0\0\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\377\0\0\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\377\0\0\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\377\0\0\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377\0\0\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\377\0\0\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\377\0\0\1\0\0\0�")
+	IMAGE_SCAN("Â\0\0\0�\377\0\0�\0\0\0�")
+	IMAGE_SCAN("ņ\0\0\0�")
+IMAGE_PACKED(Circle, "\2\20\0\0\0\20\0\0\0\0\0\0\0\377\377\377\377\0\0\0\0")
+IMAGE_BEGIN(Triangle)
+	IMAGE_SCAN("�\1\0\0\0�")
+	IMAGE_SCAN("̂\0\0\0�")
+	IMAGE_SCAN("ʂ\0\0\0\2\0\377\0\0\0\0�")
+	IMAGE_SCAN("Ȃ\0\0\0�\0\377\0\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\0\1\0\0\0�")
+	IMAGE_SCAN("ł\0\0\0�\0\377\0\1\0\0\0�")
+	IMAGE_SCAN("Â\0\0\0�\0\377\0\1\0\0\0�")
+	IMAGE_SCAN("��\0\0\0�\0\377\0\1\0\0\0�")
+	IMAGE_SCAN("‚\0\0\0�\0\377\0\1\0\0\0�")
+	IMAGE_SCAN("Ă\0\0\0�\0\377\0\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\0\1\0\0\0�")
+	IMAGE_SCAN("ǂ\0\0\0�\0\377\0\1\0\0\0�")
+	IMAGE_SCAN("ɂ\0\0\0�\0\377\0\1\0\0\0�")
+	IMAGE_SCAN("�\3\0\0\0\0\377\0\0\0\0�")
+	IMAGE_SCAN("̂\0\0\0�")
+	IMAGE_SCAN("�")
+IMAGE_PACKED(Triangle, "\2\20\0\0\0\20\0\0\0\0\0\0\0\377\377\377\377\0\0\0\0")
diff --git a/tutorial/Image02a/main.cpp b/tutorial/Image02a/main.cpp
new file mode 100644
index 000000000..9bb41f272
--- /dev/null
+++ b/tutorial/Image02a/main.cpp
@@ -0,0 +1,32 @@
+#include <CtrlLib/CtrlLib.h>
+
+using namespace Upp;
+
+#define IMAGECLASS MyImages
+#define IMAGEFILE  <Image02a/images.iml>
+#include <Draw/iml.h>
+
+class MyApp : public TopWindow {
+public:
+	virtual void Paint(Draw& draw);
+};
+
+void MyApp::Paint(Draw& w)
+{
+	w.DrawRect(GetSize(), SColorPaper());
+	for(int i = 0; i < MyImages::GetCount(); i++) {
+		w.DrawImage(50, 80 + 20 * i, MyImages::Get(i));
+		w.DrawText(80, 80 + 20 * i, MyImages::GetId(i));
+	}
+	w.DrawImage(20, 0, 50, 50, MyImages::Get(MyImages::I_Circle));
+	w.DrawText(80, 0, AsString(MyImages::Find("Circle")));
+}
+
+GUI_APP_MAIN
+{
+	MyApp().Sizeable().Run();
+	Image m = MyImages::Circle();
+	MyImages::Set(MyImages::I_Circle, MyImages::Triangle());
+	MyImages::Set(MyImages::I_Triangle, m);
+	MyApp().Sizeable().Run();
+}
diff --git a/tutorial/Image02b/Image02b.upp b/tutorial/Image02b/Image02b.upp
new file mode 100644
index 000000000..5ac778ea1
--- /dev/null
+++ b/tutorial/Image02b/Image02b.upp
@@ -0,0 +1,9 @@
+uses
+	CtrlLib;
+
+file
+	main.cpp,
+	images.iml;
+
+mainconfig
+	"" = "GUI";
diff --git a/tutorial/Image02b/icon.ico b/tutorial/Image02b/icon.ico
new file mode 100644
index 000000000..4012786aa
Binary files /dev/null and b/tutorial/Image02b/icon.ico differ
diff --git a/tutorial/Image02b/images.iml b/tutorial/Image02b/images.iml
new file mode 100644
index 000000000..c295e573f
--- /dev/null
+++ b/tutorial/Image02b/images.iml
@@ -0,0 +1,54 @@
+IMAGE_BEGIN(Rectangle)
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("��\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\377\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\377\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\377\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\377\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\377\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\377\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\377\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\377\1\0\0\0�")
+	IMAGE_SCAN("��\0\0\0�")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�")
+IMAGE_PACKED(Rectangle, "\2\20\0\0\0\20\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(Circle)
+	IMAGE_SCAN("ņ\0\0\0�")
+	IMAGE_SCAN("Â\0\0\0�\377\0\0�\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\377\0\0\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\377\0\0\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\377\0\0\1\0\0\0�")
+	IMAGE_SCAN("\1\0\0\0�\377\0\0\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\377\0\0\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\377\0\0\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\377\0\0\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\377\0\0\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\377\0\0\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377\0\0\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\377\0\0\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\377\0\0\1\0\0\0�")
+	IMAGE_SCAN("Â\0\0\0�\377\0\0�\0\0\0�")
+	IMAGE_SCAN("ņ\0\0\0�")
+IMAGE_PACKED(Circle, "\2\20\0\0\0\20\0\0\0\0\0\0\0\377\377\377\377\0\0\0\0")
+IMAGE_BEGIN(Triangle)
+	IMAGE_SCAN("�\1\0\0\0�")
+	IMAGE_SCAN("̂\0\0\0�")
+	IMAGE_SCAN("ʂ\0\0\0\2\0\377\0\0\0\0�")
+	IMAGE_SCAN("Ȃ\0\0\0�\0\377\0\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\0\1\0\0\0�")
+	IMAGE_SCAN("ł\0\0\0�\0\377\0\1\0\0\0�")
+	IMAGE_SCAN("Â\0\0\0�\0\377\0\1\0\0\0�")
+	IMAGE_SCAN("��\0\0\0�\0\377\0\1\0\0\0�")
+	IMAGE_SCAN("‚\0\0\0�\0\377\0\1\0\0\0�")
+	IMAGE_SCAN("Ă\0\0\0�\0\377\0\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\0\1\0\0\0�")
+	IMAGE_SCAN("ǂ\0\0\0�\0\377\0\1\0\0\0�")
+	IMAGE_SCAN("ɂ\0\0\0�\0\377\0\1\0\0\0�")
+	IMAGE_SCAN("�\3\0\0\0\0\377\0\0\0\0�")
+	IMAGE_SCAN("̂\0\0\0�")
+	IMAGE_SCAN("�")
+IMAGE_PACKED(Triangle, "\2\20\0\0\0\20\0\0\0\0\0\0\0\377\377\377\377\0\0\0\0")
diff --git a/tutorial/Image02b/main.cpp b/tutorial/Image02b/main.cpp
new file mode 100644
index 000000000..6b7c5801a
--- /dev/null
+++ b/tutorial/Image02b/main.cpp
@@ -0,0 +1,30 @@
+#include <CtrlLib/CtrlLib.h>
+
+using namespace Upp;
+
+#define IMAGECLASS MyImages
+#define IMAGEFILE  <Image02b/images.iml>
+#include <Draw/iml.h>
+
+class MyApp : public TopWindow {
+	Iml& iml;
+
+public:
+	virtual void Paint(Draw& draw);
+
+	MyApp(Iml& _iml) : iml(_iml) {}
+};
+
+void MyApp::Paint(Draw& w)
+{
+	w.DrawRect(GetSize(), SColorPaper());
+	for(int i = 0; i < iml.GetCount(); i++) {
+		w.DrawImage(50, 80 + 20 * i, iml.Get(i));
+		w.DrawText(80, 80 + 20 * i, iml.GetId(i));
+	}
+}
+
+GUI_APP_MAIN
+{
+	MyApp(MyImages::Iml()).Sizeable().Run();
+}
diff --git a/tutorial/Image03/Image03.upp b/tutorial/Image03/Image03.upp
new file mode 100644
index 000000000..932bd458b
--- /dev/null
+++ b/tutorial/Image03/Image03.upp
@@ -0,0 +1,8 @@
+uses
+	CtrlLib;
+
+file
+	main.cpp;
+
+mainconfig
+	"" = "GUI";
diff --git a/tutorial/Image03/main.cpp b/tutorial/Image03/main.cpp
new file mode 100644
index 000000000..0e5c5e993
--- /dev/null
+++ b/tutorial/Image03/main.cpp
@@ -0,0 +1,58 @@
+#include <CtrlLib/CtrlLib.h>
+
+using namespace Upp;
+
+struct MyApp : public TopWindow {
+	Image img;
+
+	virtual void Paint(Draw& w);
+	virtual void LeftDown(Point p, dword keyflags);
+
+	typedef MyApp CLASSNAME;
+	MyApp();
+};
+
+MyApp::MyApp()
+{
+	ImageBuffer ib(50, 50);
+	for(int y = 0; y < 50; y++) {
+		RGBA *l = ib[y];
+		for(int x = 0; x < 50; x++) {
+			if(y == 0 || y == 49 || x == 0 || x == 49)
+				*l++ = Black();
+			else {
+				l->a = 2 * (x + y);
+				l->r = 4 * x;
+				l->g = 4 * y;
+				l->b = 200;
+				l++;
+			}
+		}
+	}
+	Premultiply(ib);
+	img = ib;
+}
+
+void MyApp::Paint(Draw& w)
+{
+	w.DrawRect(GetSize(), White);
+	w.DrawImage(10, 5, img);
+	w.DrawImage(40, 25, img);
+}
+
+void MyApp::LeftDown(Point p, dword keyflags)
+{
+	ImageBuffer ib(img);
+	for(int y = 15; y < 35; y++) {
+		RGBA *l = ib[y];
+		for(int x = 15; x < 35; x++)
+			l[x] = 100 * Red();
+	}
+	img = ib;
+	Refresh();
+}
+
+GUI_APP_MAIN
+{
+	MyApp().Sizeable().Run();
+}
diff --git a/tutorial/Image04/Image04.upp b/tutorial/Image04/Image04.upp
new file mode 100644
index 000000000..3fbcf71ba
--- /dev/null
+++ b/tutorial/Image04/Image04.upp
@@ -0,0 +1,11 @@
+uses
+	CtrlLib,
+	plugin\jpg,
+	plugin\gif,
+	plugin\tif;
+
+file
+	main.cpp;
+
+mainconfig
+	"" = "GUI";
diff --git a/tutorial/Image04/main.cpp b/tutorial/Image04/main.cpp
new file mode 100644
index 000000000..77982c8fc
--- /dev/null
+++ b/tutorial/Image04/main.cpp
@@ -0,0 +1,46 @@
+#include <CtrlLib/CtrlLib.h>
+
+using namespace Upp;
+
+struct MyApp : public TopWindow {
+	Image   img;
+	FileSel fs;
+
+	void Open();
+
+	virtual void Paint(Draw& w);
+	virtual void LeftDown(Point, dword) { Open(); }
+
+	typedef MyApp CLASSNAME;
+	MyApp();
+};
+
+MyApp::MyApp()
+{
+	fs.Type("Image file", "*.bmp;*.png;*.tif;*.tiff;*.jpg;*.jpeg;*.gif");
+	Sizeable();
+}
+
+void MyApp::Paint(Draw& w)
+{
+	w.DrawRect(GetSize(), White);
+	if(img)
+		w.DrawImage(0, 0, img);
+	else
+		w.DrawText(0, 0, "No image loaded!", Arial(30).Italic());
+}
+
+void MyApp::Open()
+{
+	if(fs.ExecuteOpen("Choose the image file to open")) {
+		img = StreamRaster::LoadFileAny(~fs);
+		Refresh();
+	}
+}
+
+GUI_APP_MAIN
+{
+	MyApp app;
+	app.Open();
+	app.Run();
+}
diff --git a/tutorial/Image05/Image05.upp b/tutorial/Image05/Image05.upp
new file mode 100644
index 000000000..7803725f6
--- /dev/null
+++ b/tutorial/Image05/Image05.upp
@@ -0,0 +1,9 @@
+uses
+	CtrlLib,
+	plugin\jpg;
+
+file
+	main.cpp;
+
+mainconfig
+	"" = "GUI";
diff --git a/tutorial/Image05/main.cpp b/tutorial/Image05/main.cpp
new file mode 100644
index 000000000..38edf1ac0
--- /dev/null
+++ b/tutorial/Image05/main.cpp
@@ -0,0 +1,32 @@
+#include <CtrlLib/CtrlLib.h>
+#include <plugin/jpg/jpg.h>
+
+using namespace Upp;
+
+GUI_APP_MAIN
+{
+	FileSel fs;
+	fs.Type("Image file", "*.bmp;*.png;*.tif;*.tiff;*.jpg;*.jpeg;*.gif");
+	if(!fs.ExecuteOpen("Choose the image file to convert"))
+		return;
+	String fn = ~fs;
+	JPGEncoder jpg(20);
+	FileIn in(fn);
+	One<StreamRaster> raster = StreamRaster::OpenAny(in);
+	if(!raster) {
+		Exclamation("Invalid input");
+		return;
+	}
+	FileOut out(fn + ".out.png");
+	jpg.SetStream(out);
+	jpg.Create(raster->GetSize());
+	for(int i = 0; i < raster->GetHeight(); i++) {
+		RasterLine l = raster->GetLine(i);
+		Buffer<RGBA> out(raster->GetWidth());
+		for(int j = 0; j < raster->GetWidth(); j++) {
+			out[j].g = out[j].b = out[j].r = l[j].g;
+			out[j].a = 255;
+		}
+		jpg.WriteLine(out);
+	}
+}
diff --git a/tutorial/Image06/Image06.upp b/tutorial/Image06/Image06.upp
new file mode 100644
index 000000000..8fb7d2f21
--- /dev/null
+++ b/tutorial/Image06/Image06.upp
@@ -0,0 +1,9 @@
+uses
+	CtrlLib;
+
+file
+
+	"main.cpp";
+
+mainconfig
+	"" = "GUI";
diff --git a/tutorial/Image06/main.cpp b/tutorial/Image06/main.cpp
new file mode 100644
index 000000000..dac061a63
--- /dev/null
+++ b/tutorial/Image06/main.cpp
@@ -0,0 +1,80 @@
+#include <CtrlLib/CtrlLib.h>
+
+using namespace Upp;
+
+Image CreateBall(int r, Color color)
+{
+	int rr = 2 * r;
+	int r2 = r * r;
+	ImageBuffer b(rr, rr);
+	for(int y = 0; y < rr; y++)
+		for(int x = 0; x < rr; x++) {
+			RGBA& a = b[y][x];
+			a.r = color.GetR();
+			a.g = color.GetG();
+			a.b = color.GetB();
+			int q = ((x - r) * (x - r) + (y - r) * (y - r)) * 256 / r2;
+			a.a = q <= 255 ? q : 0;
+		}
+	return b;
+}
+
+struct BallMaker : ImageMaker {
+	Color color;
+	int   r;
+
+	virtual String Key() const;
+	virtual Image Make() const;
+};
+
+String BallMaker::Key() const
+{
+	char h[sizeof(int) + 3];
+	*(int *)h = r;
+	h[sizeof(int)] = color.GetR();
+	h[sizeof(int) + 1] = color.GetG();
+	h[sizeof(int) + 2] = color.GetB();
+	return String(h, sizeof(int) + 3);
+}
+
+Image BallMaker::Make() const
+{
+	return CreateBall(r, color);
+}
+
+Image CreateBallCached(int r, Color color)
+{
+	BallMaker m;
+	m.r = r;
+	m.color = color;
+	return MakeImage(m);
+}
+
+struct MyApp : public TopWindow {
+	bool cached;
+
+	virtual void Paint(Draw& w) {
+		w.DrawRect(GetSize(), White);
+		for(int y = 0; y < 300; y += 30)
+			for(int i = 10; i < 500; i += i / 3) {
+				Color c = Color((200 * i) & 255, (150 * i) & 255, (300 * i) & 255);
+				w.DrawImage(i, y + i / 5, (cached ? CreateBallCached : CreateBall)(i / 2, c));
+			}
+	}
+
+	virtual void LeftDown(Point, dword) {
+		cached = true;
+		Title("Now cached - try to resize the window to see the speed");
+	}
+
+	MyApp() {
+		cached = false;
+		Title("Not cached - try to resize the window to see the speed, click to activate the cache");
+		Sizeable().Zoomable();
+	}
+};
+
+GUI_APP_MAIN
+{
+	MyApp().Run();
+}
diff --git a/tutorial/Ntl01/Ntl01.cpp b/tutorial/Ntl01/Ntl01.cpp
new file mode 100644
index 000000000..8629a9a1a
--- /dev/null
+++ b/tutorial/Ntl01/Ntl01.cpp
@@ -0,0 +1,16 @@
+#include <Core/Core.h>
+
+using namespace Upp;
+
+CONSOLE_APP_MAIN
+{
+	Vector<int> v;
+	v.Add(1);
+	v.Add(2);
+	v.Add(3);
+	for(int i = 0; i < v.GetCount(); i++)
+		LOG(v[i]);
+	LOG("..and now iterators..");
+	for(Vector<int>::Iterator q = v.Begin(), e = v.End(); q != e; q++)
+		LOG(*q);
+}
diff --git a/tutorial/Ntl01/Ntl01.upp b/tutorial/Ntl01/Ntl01.upp
new file mode 100644
index 000000000..4b443f3d9
--- /dev/null
+++ b/tutorial/Ntl01/Ntl01.upp
@@ -0,0 +1,8 @@
+uses
+	Core;
+
+file
+	Ntl01.cpp;
+
+mainconfig
+	"" = "";
diff --git a/tutorial/Ntl02/Ntl02.cpp b/tutorial/Ntl02/Ntl02.cpp
new file mode 100644
index 000000000..0734380fc
--- /dev/null
+++ b/tutorial/Ntl02/Ntl02.cpp
@@ -0,0 +1,26 @@
+#include <Core/Core.h>
+
+using namespace Upp;
+
+int RandomValue()
+{
+	return rand() % 10;
+}
+
+CONSOLE_APP_MAIN
+{
+	Vector<int> v;
+	v.Add(1);
+	v.Add(2);
+
+	v.Insert(1, 10);
+	DUMPC(v);
+	v.Remove(0);
+	DUMPC(v);
+	v.Clear();
+	for(int i = 0; i < 10000; i++)
+		v.At(RandomValue(), 0)++;
+	DUMPC(v);
+	Sort(v);
+	DUMPC(v);
+}
diff --git a/tutorial/Ntl02/Ntl02.upp b/tutorial/Ntl02/Ntl02.upp
new file mode 100644
index 000000000..88180cbd9
--- /dev/null
+++ b/tutorial/Ntl02/Ntl02.upp
@@ -0,0 +1,7 @@
+uses Core;
+
+file
+	"Ntl02.cpp";
+
+mainconfig
+	"" = "";
diff --git a/tutorial/Ntl03/Ntl03.cpp b/tutorial/Ntl03/Ntl03.cpp
new file mode 100644
index 000000000..dd8f22a55
--- /dev/null
+++ b/tutorial/Ntl03/Ntl03.cpp
@@ -0,0 +1,23 @@
+#include <Core/Core.h>
+
+using namespace Upp;
+
+CONSOLE_APP_MAIN
+{
+	Vector<int> v;
+	v.Add(1);
+	v.Add(2);
+	DUMPC(v);
+
+	Vector<int> v1 = v;
+	DUMPC(v1);
+//	DUMPC(v); -> v is picked, this would crash with runtime error
+
+	v <<= v1;
+	DUMPC(v1);
+	DUMPC(v);
+
+	Vector<int> v2(v, 0);
+	DUMPC(v2);
+	DUMPC(v);
+}
diff --git a/tutorial/Ntl03/Ntl03.upp b/tutorial/Ntl03/Ntl03.upp
new file mode 100644
index 000000000..3d9583d25
--- /dev/null
+++ b/tutorial/Ntl03/Ntl03.upp
@@ -0,0 +1,7 @@
+uses Core;
+
+file
+	"Ntl03.cpp";
+
+mainconfig
+	"" = "";
diff --git a/tutorial/Ntl04/Ntl04.cpp b/tutorial/Ntl04/Ntl04.cpp
new file mode 100644
index 000000000..aedec992d
--- /dev/null
+++ b/tutorial/Ntl04/Ntl04.cpp
@@ -0,0 +1,47 @@
+#include <Core/Core.h>
+
+using namespace Upp;
+
+struct Distribution : Moveable<Distribution> {
+	String      text;
+	Vector<int> data;
+};
+
+Distribution CreateDist(int n)
+{
+	Distribution d;
+	d.text << "Test (create) " << n;
+	for(int i = 0; i < 10000; i++)
+		d.data.At(rand() % n, 0)++;
+	return d;
+}
+
+void Dump(const Vector<Distribution>& dist)
+{
+	for(int i = 0; i < dist.GetCount(); i++) {
+		DUMP(dist[i].text);
+		DUMPC(dist[i].data);
+	}
+}
+
+CONSOLE_APP_MAIN
+{
+	Vector<Distribution> dist;
+	for(int n = 5; n <= 10; n++) {
+		Distribution& d = dist.Add();
+		d.text << "Test " << n;
+		for(int i = 0; i < 10000; i++)
+			d.data.At(rand() % n, 0)++;
+	}
+	Dump(dist);
+
+	dist.Clear();
+	for(int n = 5; n <= 10; n++)
+		dist.AddPick(CreateDist(n));
+	Dump(dist);
+
+	dist.Clear();
+	for(int n = 5; n <= 10; n++)
+		dist.Add() = CreateDist(n);
+	Dump(dist);
+}
diff --git a/tutorial/Ntl04/Ntl04.upp b/tutorial/Ntl04/Ntl04.upp
new file mode 100644
index 000000000..b284e984e
--- /dev/null
+++ b/tutorial/Ntl04/Ntl04.upp
@@ -0,0 +1,7 @@
+uses Core;
+
+file
+	"Ntl04.cpp";
+
+mainconfig
+	"" = "";
diff --git a/tutorial/Ntl05/Ntl05.cpp b/tutorial/Ntl05/Ntl05.cpp
new file mode 100644
index 000000000..67af733bc
--- /dev/null
+++ b/tutorial/Ntl05/Ntl05.cpp
@@ -0,0 +1,21 @@
+#include <Core/Core.h>
+#include <list>
+
+using namespace Upp;
+
+CONSOLE_APP_MAIN
+{
+	Array< std::list<int> > al;
+	for(int i = 0; i < 4; i++) {
+		std::list<int>& l = al.Add();
+		for(int q = 0; q < i; q++)
+			l.push_back(q);
+	}
+
+	for(int i = 0; i < al.GetCount(); i++) {
+		const std::list<int>& l = al[i];
+		for(std::list<int>::const_iterator it = l.begin(); it != l.end(); it++)
+			LOG(*it);
+		LOG("------");
+	}
+}
diff --git a/tutorial/Ntl05/Ntl05.upp b/tutorial/Ntl05/Ntl05.upp
new file mode 100644
index 000000000..0dcc9047a
--- /dev/null
+++ b/tutorial/Ntl05/Ntl05.upp
@@ -0,0 +1,7 @@
+uses Core;
+
+file
+	"Ntl05.cpp";
+
+mainconfig
+	"" = "";
diff --git a/tutorial/Ntl06/Ntl06.cpp b/tutorial/Ntl06/Ntl06.cpp
new file mode 100644
index 000000000..54d682f2e
--- /dev/null
+++ b/tutorial/Ntl06/Ntl06.cpp
@@ -0,0 +1,42 @@
+#include <Core/Core.h>
+
+using namespace Upp;
+
+struct Number {
+	virtual double Get() const = 0;
+
+	String ToString() const { return AsString(Get()); }
+};
+
+struct Integer : public Number {
+	int n;
+	virtual double Get() const { return n; }
+
+	Integer(int n) : n(n) {}
+};
+
+struct Double : public Number {
+	double n;
+	virtual double Get() const { return n; }
+
+	Double(double n) : n(n) {}
+};
+
+bool operator<(const Number& a, const Number& b)
+{
+	return a.Get() < b.Get();
+}
+
+CONSOLE_APP_MAIN
+{
+	Array<Number> num;
+	num.Add(new Integer(3));
+	num.Add(new Double(15.5));
+	num.Add(new Double(2.23));
+	num.Add(new Integer(2));
+	num.Add(new Integer(20));
+	num.Add(new Double(-2.333));
+	DUMPC(num);
+	Sort(num);
+	DUMPC(num);
+}
diff --git a/tutorial/Ntl06/Ntl06.upp b/tutorial/Ntl06/Ntl06.upp
new file mode 100644
index 000000000..97ea0641b
--- /dev/null
+++ b/tutorial/Ntl06/Ntl06.upp
@@ -0,0 +1,7 @@
+uses Core;
+
+file
+	"Ntl06.cpp";
+
+mainconfig
+	"" = "";
diff --git a/tutorial/Ntl07/Ntl07.cpp b/tutorial/Ntl07/Ntl07.cpp
new file mode 100644
index 000000000..a3e52f174
--- /dev/null
+++ b/tutorial/Ntl07/Ntl07.cpp
@@ -0,0 +1,48 @@
+#include <Core/Core.h>
+
+using namespace Upp;
+
+struct Number {
+	virtual double Get() const = 0;
+
+	String ToString() const { return AsString(Get()); }
+};
+
+struct Integer : public Number {
+	int n;
+	virtual double Get() const { return n; }
+
+	Integer(int n) : n(n) {}
+};
+
+struct Double : public Number {
+	double n;
+	virtual double Get() const { return n; }
+
+	Double(double n) : n(n) {}
+};
+
+CONSOLE_APP_MAIN
+{
+	BiVector<int> n;
+	n.AddHead(1);
+	n.AddTail(2);
+	n.AddHead(3);
+	n.AddTail(4);
+	DUMPC(n);
+
+	n.DropHead();
+	DUMPC(n);
+
+	n.DropTail();
+	DUMPC(n);
+
+	BiArray<Number> num;
+	num.AddHead(new Integer(3));
+	num.AddTail(new Double(15.5));
+	num.AddHead(new Double(2.23));
+	num.AddTail(new Integer(2));
+	num.AddHead(new Integer(20));
+	num.AddTail(new Double(-2.333));
+	DUMPC(num);
+}
diff --git a/tutorial/Ntl07/Ntl07.upp b/tutorial/Ntl07/Ntl07.upp
new file mode 100644
index 000000000..e9a323f55
--- /dev/null
+++ b/tutorial/Ntl07/Ntl07.upp
@@ -0,0 +1,7 @@
+uses Core;
+
+file
+	"Ntl07.cpp";
+
+mainconfig
+	"" = "";
diff --git a/tutorial/Ntl08/Ntl08.cpp b/tutorial/Ntl08/Ntl08.cpp
new file mode 100644
index 000000000..f7aa13af2
--- /dev/null
+++ b/tutorial/Ntl08/Ntl08.cpp
@@ -0,0 +1,60 @@
+#include <Core/Core.h>
+
+using namespace Upp;
+
+CONSOLE_APP_MAIN
+{
+	Index<String> ndx;
+	ndx.Add("alfa");
+	ndx.Add("beta");
+	ndx.Add("gamma");
+	ndx.Add("delta");
+	ndx.Add("kappa");
+	DUMPC(ndx);
+
+	DUMP(ndx.Find("beta"));
+	DUMP(ndx.Find("something"));
+
+	ndx.Set(0, "delta");
+	DUMPC(ndx);
+
+	int fi = ndx.Find("delta");
+	while(fi >= 0) {
+		DUMP(fi);
+		fi = ndx.FindNext(fi);
+	}
+
+	DUMP(ndx.FindAdd("one"));
+	DUMP(ndx.FindAdd("two"));
+	DUMP(ndx.FindAdd("three"));
+	DUMP(ndx.FindAdd("two"));
+	DUMP(ndx.FindAdd("three"));
+	DUMP(ndx.FindAdd("one"));
+
+	ndx.Unlink(2);
+	ndx.UnlinkKey("kappa");
+	DUMP(ndx.Find(ndx[2]));
+	DUMP(ndx.Find("kappa"));
+
+	DUMP(ndx.IsUnlinked(1));
+	DUMP(ndx.IsUnlinked(2));
+
+	ndx.Put("foo");
+	DUMP(ndx.Find("foo"));
+
+	ndx.Sweep();
+	DUMPC(ndx);
+
+	ndx.Remove(1);
+	DUMPC(ndx);
+
+	ndx.RemoveKey("two");
+	DUMPC(ndx);
+
+	ndx.Insert(0, "insert");
+	DUMPC(ndx);
+
+	Vector<String> d = ndx.PickKeys();
+	Sort(d);
+	DUMPC(d);
+}
diff --git a/tutorial/Ntl08/Ntl08.upp b/tutorial/Ntl08/Ntl08.upp
new file mode 100644
index 000000000..2c30a51b5
--- /dev/null
+++ b/tutorial/Ntl08/Ntl08.upp
@@ -0,0 +1,7 @@
+uses Core;
+
+file
+	"Ntl08.cpp";
+
+mainconfig
+	"" = "";
diff --git a/tutorial/Ntl09/Ntl09.cpp b/tutorial/Ntl09/Ntl09.cpp
new file mode 100644
index 000000000..9e71eebc7
--- /dev/null
+++ b/tutorial/Ntl09/Ntl09.cpp
@@ -0,0 +1,69 @@
+#include <Core/Core.h>
+
+using namespace Upp;
+
+struct Person : Moveable<Person> {
+	String name;
+	String surname;
+
+	Person(String name, String surname) : name(name), surname(surname) {}
+	Person() {}
+};
+
+unsigned GetHashValue(const Person& p)
+{
+	return CombineHash(p.name, p.surname);
+}
+
+bool operator==(const Person& a, const Person& b)
+{
+	return a.name == b.name && a.surname == b.surname;
+}
+
+struct Number {
+	virtual double Get() const = 0;
+
+	String ToString() const { return AsString(Get()); }
+};
+
+struct Integer : public Number {
+	int n;
+	virtual double Get() const { return n; }
+
+	Integer(int n) : n(n) {}
+};
+
+struct Double : public Number {
+	double n;
+	virtual double Get() const { return n; }
+
+	Double(double n) : n(n) {}
+};
+
+unsigned GetHashValue(const Number& n)
+{
+	return GetHashValue(n.Get());
+}
+
+bool operator==(const Number& a, const Number& b)
+{
+	return a.Get() == b.Get();
+}
+
+CONSOLE_APP_MAIN
+{
+	Index<Person> p;
+	p.Add(Person("John", "Smith"));
+	p.Add(Person("Paul", "Carpenter"));
+	p.Add(Person("Carl", "Engles"));
+
+	DUMP(p.Find(Person("Paul", "Carpenter")));
+
+	ArrayIndex<Number> n;
+	n.Add(new Integer(100));
+	n.Add(new Double(10.5));
+	n.Add(new Integer(200));
+	n.Add(new Double(20.5));
+
+	DUMP(n.Find(Double(10.5)));
+}
diff --git a/tutorial/Ntl09/Ntl09.upp b/tutorial/Ntl09/Ntl09.upp
new file mode 100644
index 000000000..967225d2f
--- /dev/null
+++ b/tutorial/Ntl09/Ntl09.upp
@@ -0,0 +1,7 @@
+uses Core;
+
+file
+	"Ntl09.cpp";
+
+mainconfig
+	"" = "";
diff --git a/tutorial/Ntl10/Ntl10.cpp b/tutorial/Ntl10/Ntl10.cpp
new file mode 100644
index 000000000..5fe2f70ca
--- /dev/null
+++ b/tutorial/Ntl10/Ntl10.cpp
@@ -0,0 +1,99 @@
+#include <Core/Core.h>
+
+using namespace Upp;
+
+struct Person : Moveable<Person> {
+	String name;
+	String surname;
+
+	String ToString() const { return name + ' ' + surname; }
+
+	Person(String name, String surname) : name(name), surname(surname) {}
+	Person() {}
+};
+
+bool operator<(const Person& a, const Person& b)
+{
+	return a.surname == b.surname ? a.name < b.name : a.surname < b.surname;
+}
+
+struct Number {
+	virtual double Get() const = 0;
+
+	String ToString() const { return AsString(Get()); }
+};
+
+struct Integer : public Number {
+	int n;
+	virtual double Get() const { return n; }
+
+	Integer(int n) : n(n) {}
+};
+
+struct Double : public Number {
+	double n;
+	virtual double Get() const { return n; }
+
+	Double(double n) : n(n) {}
+};
+
+CONSOLE_APP_MAIN
+{
+	VectorMap<String, Person> m;
+
+	m.Add("1", Person("John", "Smith"));
+	m.Add("2", Person("Carl", "Engles"));
+
+	Person& p = m.Add("3");
+	p.name = "Paul";
+	p.surname = "Carpenter";
+
+	DUMPC(m.GetKeys());
+	DUMPC(m.GetValues());
+
+	for(int i = 0; i < m.GetCount(); i++)
+		LOG(m.GetKey(i) << ": " << m[i]);
+
+	DUMP(m.Find("2"));
+	DUMP(m.Get("2"));
+
+	DUMP(m.Get("33", Person("unknown", "person")));
+
+	m.Unlink(1);
+	DUMP(m.Find("2"));
+
+	m.SetKey(1, "33");
+	DUMP(m.Get("33", Person("unknown", "person")));
+
+	m.Add("33", Person("Peter", "Pan"));
+	int q = m.Find("33");
+	while(q >= 0) {
+		LOG(m[q]);
+		q = m.FindNext(q);
+	}
+
+	m.UnlinkKey("33");
+	m.Put("22", Person("Ali", "Baba"));
+	m.Put("44", Person("Ivan", "Wilks"));
+
+	DUMPC(m.GetKeys());
+	DUMPC(m.GetValues());
+
+	Vector<int> order = GetSortOrder(m.GetValues());
+	DUMPC(order);
+
+	for(int i = 0; i < order.GetCount(); i++)
+		LOG(m.GetKey(order[i]) << ": " << m[order[i]]);
+
+	Vector<Person> ps = m.PickValues();
+	DUMPC(ps);
+
+	ArrayMap<String, Number> am;
+	am.Add("A", new Integer(1));
+	am.Add("B", new Double(2.0));
+	DUMPC(am.GetKeys());
+	DUMPC(am.GetValues());
+
+	DUMP(am.Get("A"));
+	DUMP(am.Find("B"));
+}
diff --git a/tutorial/Ntl10/Ntl10.upp b/tutorial/Ntl10/Ntl10.upp
new file mode 100644
index 000000000..1b4e11684
--- /dev/null
+++ b/tutorial/Ntl10/Ntl10.upp
@@ -0,0 +1,7 @@
+uses Core;
+
+file
+	"Ntl10.cpp";
+
+mainconfig
+	"" = "";
diff --git a/uppsrc/AllForI18n/AllForI18n.upp b/uppsrc/AllForI18n/AllForI18n.upp
new file mode 100644
index 000000000..28f629980
--- /dev/null
+++ b/uppsrc/AllForI18n/AllForI18n.upp
@@ -0,0 +1,20 @@
+description "This package is only useful for translating U++ to other languages";
+
+uses
+	CtrlLib,
+	Web,
+	ide,
+	PostgreSQL,
+	RichEdit,
+	MySql,
+	Ole,
+	GridCtrl,
+	Web,
+	Oracle;
+
+file
+	main.cpp;
+
+mainconfig
+	"" = "GUI";
+
diff --git a/uppsrc/AllForI18n/init b/uppsrc/AllForI18n/init
new file mode 100644
index 000000000..be96b6a13
--- /dev/null
+++ b/uppsrc/AllForI18n/init
@@ -0,0 +1,12 @@
+#ifndef _AllForI18n_icpp_init_stub
+#define _AllForI18n_icpp_init_stub
+#include "CtrlLib/init"
+#include "Web/init"
+#include "ide/init"
+#include "PostgreSQL/init"
+#include "RichEdit/init"
+#include "MySql/init"
+#include "Ole/init"
+#include "GridCtrl/init"
+#include "Oracle/init"
+#endif
diff --git a/uppsrc/AllForI18n/main.cpp b/uppsrc/AllForI18n/main.cpp
new file mode 100644
index 000000000..1c680bd4c
--- /dev/null
+++ b/uppsrc/AllForI18n/main.cpp
@@ -0,0 +1,8 @@
+#include <CtrlLib/CtrlLib.h>
+
+using namespace Upp;
+
+GUI_APP_MAIN
+{
+}
+
diff --git a/uppsrc/AnalyzeMap/AUTHORS b/uppsrc/AnalyzeMap/AUTHORS
new file mode 100644
index 000000000..f782e5b62
--- /dev/null
+++ b/uppsrc/AnalyzeMap/AUTHORS
@@ -0,0 +1,2 @@
+Mirek Fidler <cxl@ntllib.org>
+Tomas Rylek  <rylek@volny.cz>
\ No newline at end of file
diff --git a/uppsrc/AnalyzeMap/Analyze.cpp b/uppsrc/AnalyzeMap/Analyze.cpp
new file mode 100644
index 000000000..e889dbcc5
--- /dev/null
+++ b/uppsrc/AnalyzeMap/Analyze.cpp
@@ -0,0 +1,118 @@
+#include <CtrlLib/CtrlLib.h>
+#include <winver.h>
+#include <imagehlp.h>
+
+using namespace Upp;
+
+#define DLLFILENAME "imagehlp.dll"
+#define DLIHEADER   "imagehlp.dli"
+#define DLIMODULE   Imagehlp
+#include <Core/dli.h>
+
+String AnalyzeMap(String fn)
+{
+	Vector<unsigned>  len;
+	Vector<String>    name;
+	String map = LoadFile(fn);
+	if(IsNull(map))
+		return "can't open " + fn;
+	const char *p = map;
+	while(*p)
+		if(*p++ == '\n' && !memcmp(p, " 0001:", 6)) {
+			p += 5;
+			while(IsXDigit(*++p))
+				;
+			while(*p == ' ')
+				p++;
+			const char *b = p;
+			while((byte)*p > ' ')
+				p++;
+			const char *e = p;
+			while(*p == ' ')
+				p++;
+			if(e > b && IsXDigit(*p)) {
+				unsigned addr = strtoul(p, 0, 16);
+				if(len.GetCount())
+					len.Top() = addr - len.Top();
+				len.Add(addr);
+				name.Add(String(b, e));
+			}
+
+		}
+//	if(len.GetCount())
+//		len.Top() -= addr;
+	IndexSort(len, name, StdGreater<unsigned>());
+	String r;
+	for(int i = 0; i < len.GetCount(); i++) {
+		r << Sprintf("%5d: ", len[i]);
+		if(Imagehlp()) {
+			char nm[1024];
+			Imagehlp().UnDecorateSymbolName(name[i], nm, 1024, UNDNAME_NO_ACCESS_SPECIFIERS|
+				                            UNDNAME_NO_MEMBER_TYPE|UNDNAME_NO_MS_KEYWORDS);
+			r << nm;
+		}
+		else
+			r << name[i];
+		r << '\n';
+	}
+	return r;
+}
+
+class MapAnalyzer : public TopWindow {
+public:
+	typedef MapAnalyzer CLASSNAME;
+	MapAnalyzer();
+
+	void Run();
+
+	bool OpenFile();
+
+	virtual bool Key(dword key, int repcnt);
+
+	void LoadCrashFile();
+
+private:
+	LineEdit map;
+};
+
+MapAnalyzer::MapAnalyzer()
+{
+	Sizeable().Zoomable();
+	Add(map.SizePos());
+}
+
+void MapAnalyzer::Run()
+{
+	if(!OpenFile())
+		return;
+	TopWindow::Run();
+}
+
+bool MapAnalyzer::Key(dword key, int repcnt)
+{
+	if(key == K_CTRL_O) {
+		OpenFile();
+		return true;
+	}
+	return TopWindow::Key(key, repcnt);
+}
+
+bool MapAnalyzer::OpenFile()
+{
+	FileSel fs;
+	LoadFromFile(fs);
+	fs.Type("Map file", "*.map");
+	fs.DefaultExt("map");
+	fs.Multi();
+	if(!fs.ExecuteOpen()) return false;
+	StoreToFile(fs);
+	map <<= AnalyzeMap(~fs);
+	return true;
+}
+
+GUI_APP_MAIN
+{
+	SetDefaultCharset(CHARSET_WIN1250);
+	MapAnalyzer viewer;
+	viewer.Run();
+}
diff --git a/uppsrc/AnalyzeMap/AnalyzeMap.upp b/uppsrc/AnalyzeMap/AnalyzeMap.upp
new file mode 100644
index 000000000..2a2033663
--- /dev/null
+++ b/uppsrc/AnalyzeMap/AnalyzeMap.upp
@@ -0,0 +1,13 @@
+uses
+	CtrlLib;
+
+file
+	imagehlp.dli,
+	Analyze.cpp,
+	Info readonly separator,
+	COPYING,
+	COPYING-PLAIN,
+	AUTHORS;
+
+mainconfig
+	"" = "GUI";
diff --git a/uppsrc/AnalyzeMap/COPYING b/uppsrc/AnalyzeMap/COPYING
new file mode 100644
index 000000000..33aa39102
--- /dev/null
+++ b/uppsrc/AnalyzeMap/COPYING
@@ -0,0 +1,30 @@
+Copyright (C) 2005 Mirek Fidler, Tomas Rylek and various contributors (see AUTHORS)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to
+deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies of the Software and its Copyright notices. In addition publicly
+documented acknowledgment must be given that this software has been used if no
+source code of this software is made available publicly. This includes
+acknowledgments in either Copyright notices, Manuals, Publicity and Marketing
+documents or any documentation provided with any product containing this
+software. This License does not apply to any software that links to the
+libraries provided by this software (statically or dynamically), but only to
+the software provided.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+-----------
+
+Please see the COPYING.PLAIN for a plain-english explanation of this notice
+and it's intent.
diff --git a/uppsrc/AnalyzeMap/COPYING-PLAIN b/uppsrc/AnalyzeMap/COPYING-PLAIN
new file mode 100644
index 000000000..770a8132f
--- /dev/null
+++ b/uppsrc/AnalyzeMap/COPYING-PLAIN
@@ -0,0 +1,33 @@
+Plain English Copyright Notice
+
+This file is not intended to be the actual License. The reason this file
+exists is that we here are programmers and engineers. We aren't lawyers. We
+provide licenses that we THINK say the right things, but we have our own
+intentions at heart. This is a plain-english explanation of what those
+intentions are, and if you follow them you will be within the "spirit" of
+the license.
+
+The intent is for us to enjoy writing software that is useful to us (the
+AUTHORS) and allow others to use it freely and also benefit from the work we
+put into making it. We don't want to restrict others using it. They should
+not *HAVE* to make the source code of the applications they write that
+simply link to these libraries (be that statically or dynamically), or for
+them to be limited as to what license they choose to use (be it open, closed
+or anything else). But we would like to know you are using these libraries.
+We simply would like to know that it has been useful to someone. This is why
+we ask for acknowledgement of some sort.
+
+You can do what you want with the source of this software - it doesn't
+matter. We still have it here for ourselves and it is open and free to use
+and download and play with. It can't be taken away. We don't really mind what
+you do with the source to your software. We would simply like to know that
+you are using it - especially if it makes it to a commerical product. If you
+simply e-mail all the AUTHORS (see COPYING and AUTHORS files) telling us, and
+then make sure you include a paragraph or page in the manual or in the "About.."
+box for the product with the copyright notice and state that you used this
+software, we will be very happy. If you want to contribute back modifications
+and fixes you may have made we will welcome those too with open arms (generally).
+If you want help with changes needed, ports needed or features to be added,
+arrangements can be easily made with some dialogue.
+
+Mirek Fidler <cxl@ntllib.org>
diff --git a/uppsrc/AnalyzeMap/crash.ico b/uppsrc/AnalyzeMap/crash.ico
new file mode 100644
index 000000000..d27561707
Binary files /dev/null and b/uppsrc/AnalyzeMap/crash.ico differ
diff --git a/uppsrc/AnalyzeMap/crash.mak b/uppsrc/AnalyzeMap/crash.mak
new file mode 100644
index 000000000..54a32b03d
--- /dev/null
+++ b/uppsrc/AnalyzeMap/crash.mak
@@ -0,0 +1,313 @@
+# Microsoft Developer Studio Generated NMAKE File, Based on crash.dsp
+!IF "$(CFG)" == ""
+CFG=crash - Win32 Debug
+!MESSAGE No configuration specified. Defaulting to crash - Win32 Debug.
+!ENDIF
+
+!IF "$(CFG)" != "crash - Win32 Release" && "$(CFG)" != "crash - Win32 Debug"
+!MESSAGE Invalid configuration "$(CFG)" specified.
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "crash.mak" CFG="crash - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "crash - Win32 Release" (based on "Win32 (x86) Application")
+!MESSAGE "crash - Win32 Debug" (based on "Win32 (x86) Application")
+!MESSAGE
+!ERROR An invalid configuration is specified.
+!ENDIF
+
+!IF "$(OS)" == "Windows_NT"
+NULL=
+!ELSE
+NULL=nul
+!ENDIF
+
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "crash - Win32 Release"
+
+OUTDIR=.\Release
+INTDIR=.\Release
+
+!IF "$(RECURSE)" == "0"
+
+ALL : "c:\tools\crash.exe"
+
+!ELSE
+
+ALL : "VLib - Win32 Release" "tlib - Win32 Release" "tgui - Win32 Release" "CtrlLib - Win32 Release" "c:\tools\crash.exe"
+
+!ENDIF
+
+!IF "$(RECURSE)" == "1"
+CLEAN :"CtrlLib - Win32 ReleaseCLEAN" "tgui - Win32 ReleaseCLEAN" "tlib - Win32 ReleaseCLEAN" "VLib - Win32 ReleaseCLEAN"
+!ELSE
+CLEAN :
+!ENDIF
+	-@erase "$(INTDIR)\crash.obj"
+	-@erase "$(INTDIR)\crash.res"
+	-@erase "$(INTDIR)\vc60.idb"
+	-@erase "c:\tools\crash.exe"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP_PROJ=/nologo /MT /W3 /GR /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /Fp"$(INTDIR)\crash.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
+MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32
+RSC_PROJ=/l 0x405 /fo"$(INTDIR)\crash.res" /d "NDEBUG"
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\crash.bsc"
+BSC32_SBRS= \
+
+LINK32=link.exe
+LINK32_FLAGS=/nologo /subsystem:windows /incremental:no /pdb:"$(OUTDIR)\crash.pdb" /machine:I386 /out:"c:/tools/crash.exe"
+LINK32_OBJS= \
+	"$(INTDIR)\crash.obj" \
+	"$(INTDIR)\crash.res" \
+	"..\CtrlLib\Release\CtrlLib.lib" \
+	"E:\build\tgui\Release\tgui.lib" \
+	"E:\build\tlib\Release\tlib.lib" \
+	"..\VLib\Release\VLib.lib"
+
+"c:\tools\crash.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+!ELSEIF  "$(CFG)" == "crash - Win32 Debug"
+
+OUTDIR=.\Debug
+INTDIR=.\Debug
+# Begin Custom Macros
+OutDir=.\Debug
+# End Custom Macros
+
+!IF "$(RECURSE)" == "0"
+
+ALL : "$(OUTDIR)\crash.exe"
+
+!ELSE
+
+ALL : "VLib - Win32 Debug" "tlib - Win32 Debug" "tgui - Win32 Debug" "CtrlLib - Win32 Debug" "$(OUTDIR)\crash.exe"
+
+!ENDIF
+
+!IF "$(RECURSE)" == "1"
+CLEAN :"CtrlLib - Win32 DebugCLEAN" "tgui - Win32 DebugCLEAN" "tlib - Win32 DebugCLEAN" "VLib - Win32 DebugCLEAN"
+!ELSE
+CLEAN :
+!ENDIF
+	-@erase "$(INTDIR)\crash.obj"
+	-@erase "$(INTDIR)\crash.res"
+	-@erase "$(INTDIR)\vc60.idb"
+	-@erase "$(INTDIR)\vc60.pdb"
+	-@erase "$(OUTDIR)\crash.exe"
+	-@erase "$(OUTDIR)\crash.ilk"
+	-@erase "$(OUTDIR)\crash.pdb"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP_PROJ=/nologo /MTd /W3 /Gm /GR /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /Fp"$(INTDIR)\crash.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c
+MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32
+RSC_PROJ=/l 0x405 /fo"$(INTDIR)\crash.res" /d "_DEBUG"
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\crash.bsc"
+BSC32_SBRS= \
+
+LINK32=link.exe
+LINK32_FLAGS=/nologo /subsystem:windows /incremental:yes /pdb:"$(OUTDIR)\crash.pdb" /debug /machine:I386 /out:"$(OUTDIR)\crash.exe" /pdbtype:sept
+LINK32_OBJS= \
+	"$(INTDIR)\crash.obj" \
+	"$(INTDIR)\crash.res" \
+	"..\CtrlLib\Debug\CtrlLib.lib" \
+	"E:\build\tgui\Debug\tgui.lib" \
+	"E:\build\tlib\Debug\tlib.lib" \
+	"..\VLib\Debug\VLib.lib"
+
+"$(OUTDIR)\crash.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+!ENDIF
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $<
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $<
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $<
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $<
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $<
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $<
+<<
+
+
+!IF "$(NO_EXTERNAL_DEPS)" != "1"
+!IF EXISTS("crash.dep")
+!INCLUDE "crash.dep"
+!ELSE
+!MESSAGE Warning: cannot find "crash.dep"
+!ENDIF
+!ENDIF
+
+
+!IF "$(CFG)" == "crash - Win32 Release" || "$(CFG)" == "crash - Win32 Debug"
+SOURCE=.\crash.cpp
+
+"$(INTDIR)\crash.obj" : $(SOURCE) "$(INTDIR)"
+
+
+SOURCE=.\crash.rc
+
+"$(INTDIR)\crash.res" : $(SOURCE) "$(INTDIR)"
+	$(RSC) $(RSC_PROJ) $(SOURCE)
+
+
+!IF  "$(CFG)" == "crash - Win32 Release"
+
+"CtrlLib - Win32 Release" :
+   cd "\SOURCE\CtrlLib"
+   $(MAKE) /$(MAKEFLAGS) /F .\CtrlLib.mak CFG="CtrlLib - Win32 Release"
+   cd "..\crash"
+
+"CtrlLib - Win32 ReleaseCLEAN" :
+   cd "\SOURCE\CtrlLib"
+   $(MAKE) /$(MAKEFLAGS) /F .\CtrlLib.mak CFG="CtrlLib - Win32 Release" RECURSE=1 CLEAN
+   cd "..\crash"
+
+!ELSEIF  "$(CFG)" == "crash - Win32 Debug"
+
+"CtrlLib - Win32 Debug" :
+   cd "\SOURCE\CtrlLib"
+   $(MAKE) /$(MAKEFLAGS) /F .\CtrlLib.mak CFG="CtrlLib - Win32 Debug"
+   cd "..\crash"
+
+"CtrlLib - Win32 DebugCLEAN" :
+   cd "\SOURCE\CtrlLib"
+   $(MAKE) /$(MAKEFLAGS) /F .\CtrlLib.mak CFG="CtrlLib - Win32 Debug" RECURSE=1 CLEAN
+   cd "..\crash"
+
+!ENDIF
+
+!IF  "$(CFG)" == "crash - Win32 Release"
+
+"tgui - Win32 Release" :
+   E:
+   cd "E:\V\TLIB"
+   $(MAKE) /$(MAKEFLAGS) /F .\tgui.mak CFG="tgui - Win32 Release"
+   F:
+   cd "F:\SOURCE\crash"
+
+"tgui - Win32 ReleaseCLEAN" :
+   E:
+   cd "E:\V\TLIB"
+   $(MAKE) /$(MAKEFLAGS) /F .\tgui.mak CFG="tgui - Win32 Release" RECURSE=1 CLEAN
+   F:
+   cd "F:\SOURCE\crash"
+
+!ELSEIF  "$(CFG)" == "crash - Win32 Debug"
+
+"tgui - Win32 Debug" :
+   E:
+   cd "E:\V\TLIB"
+   $(MAKE) /$(MAKEFLAGS) /F .\tgui.mak CFG="tgui - Win32 Debug"
+   F:
+   cd "F:\SOURCE\crash"
+
+"tgui - Win32 DebugCLEAN" :
+   E:
+   cd "E:\V\TLIB"
+   $(MAKE) /$(MAKEFLAGS) /F .\tgui.mak CFG="tgui - Win32 Debug" RECURSE=1 CLEAN
+   F:
+   cd "F:\SOURCE\crash"
+
+!ENDIF
+
+!IF  "$(CFG)" == "crash - Win32 Release"
+
+"tlib - Win32 Release" :
+   E:
+   cd "E:\V\TLIB"
+   $(MAKE) /$(MAKEFLAGS) /F .\tlib.mak CFG="tlib - Win32 Release"
+   F:
+   cd "F:\SOURCE\crash"
+
+"tlib - Win32 ReleaseCLEAN" :
+   E:
+   cd "E:\V\TLIB"
+   $(MAKE) /$(MAKEFLAGS) /F .\tlib.mak CFG="tlib - Win32 Release" RECURSE=1 CLEAN
+   F:
+   cd "F:\SOURCE\crash"
+
+!ELSEIF  "$(CFG)" == "crash - Win32 Debug"
+
+"tlib - Win32 Debug" :
+   E:
+   cd "E:\V\TLIB"
+   $(MAKE) /$(MAKEFLAGS) /F .\tlib.mak CFG="tlib - Win32 Debug"
+   F:
+   cd "F:\SOURCE\crash"
+
+"tlib - Win32 DebugCLEAN" :
+   E:
+   cd "E:\V\TLIB"
+   $(MAKE) /$(MAKEFLAGS) /F .\tlib.mak CFG="tlib - Win32 Debug" RECURSE=1 CLEAN
+   F:
+   cd "F:\SOURCE\crash"
+
+!ENDIF
+
+!IF  "$(CFG)" == "crash - Win32 Release"
+
+"VLib - Win32 Release" :
+   cd "\SOURCE\VLib"
+   $(MAKE) /$(MAKEFLAGS) /F .\VLib.mak CFG="VLib - Win32 Release"
+   cd "..\crash"
+
+"VLib - Win32 ReleaseCLEAN" :
+   cd "\SOURCE\VLib"
+   $(MAKE) /$(MAKEFLAGS) /F .\VLib.mak CFG="VLib - Win32 Release" RECURSE=1 CLEAN
+   cd "..\crash"
+
+!ELSEIF  "$(CFG)" == "crash - Win32 Debug"
+
+"VLib - Win32 Debug" :
+   cd "\SOURCE\VLib"
+   $(MAKE) /$(MAKEFLAGS) /F .\VLib.mak CFG="VLib - Win32 Debug"
+   cd "..\crash"
+
+"VLib - Win32 DebugCLEAN" :
+   cd "\SOURCE\VLib"
+   $(MAKE) /$(MAKEFLAGS) /F .\VLib.mak CFG="VLib - Win32 Debug" RECURSE=1 CLEAN
+   cd "..\crash"
+
+!ENDIF
+
+
+!ENDIF
diff --git a/uppsrc/AnalyzeMap/imagehlp.dli b/uppsrc/AnalyzeMap/imagehlp.dli
new file mode 100644
index 000000000..2320a0229
--- /dev/null
+++ b/uppsrc/AnalyzeMap/imagehlp.dli
@@ -0,0 +1 @@
+FN_C(DWORD, __stdcall, UnDecorateSymbolName, (PCSTR dn,  PSTR udn, DWORD len, DWORD Flags))
diff --git a/uppsrc/AnalyzeMap/prj.aux b/uppsrc/AnalyzeMap/prj.aux
new file mode 100644
index 000000000..6d70d4a73
--- /dev/null
+++ b/uppsrc/AnalyzeMap/prj.aux
@@ -0,0 +1,2 @@
+file
+	g:\temp\ce-crash\cybexpo.map;
diff --git a/uppsrc/BuildAll/BuildAll.cpp b/uppsrc/BuildAll/BuildAll.cpp
new file mode 100644
index 000000000..8446bd8f0
--- /dev/null
+++ b/uppsrc/BuildAll/BuildAll.cpp
@@ -0,0 +1,85 @@
+#include <Core/Core.h>
+
+using namespace Upp;
+
+// This is diagnostic package:
+// It compiles all U++ examples using MSC8 and MINGW build methods
+// or methods listed on commandline
+
+String input = "d:\\";
+String output = "e:\\all";
+String umk = "d:\\theide\\umk.exe ";
+Vector<String> bm;
+
+Vector<String> failed;
+
+void Build(const char *nest, const char *bm, bool release)
+{
+	String flags = release ? "r" : "b";
+	String mn = release ? "R" : "D";
+	String n = String().Cat() << nest << '-' << bm << '-' << mn;
+	Cout() << n << '\n';
+	String outdir = AppendFileName(output, n);
+	DeleteFolderDeep(outdir);
+	RealizeDirectory(outdir);
+	FindFile ff(AppendFileName(AppendFileName(input, nest), "*.*"));
+	bool first = true;
+	while(ff) {
+		if(ff.IsFolder()) {
+			String txt;
+			txt << ff.GetName() << ' ' << bm << ' ' << mn;
+			Cout() << "  Building " << txt;
+			String c;
+			c << umk << nest << ' ' << ff.GetName() << ' ' << bm << " -l" << flags;
+			if(first)
+				c << 'a';
+			c << ' ' << outdir;
+			if(system(c)) {
+				Cout() << " *** FAILED *** !\n";
+				failed.Add() << txt;
+			}
+			else {
+				Cout() << " ok\n";
+				first = false;
+			}
+		}
+		DeleteFile(AppendFileName(outdir, ff.GetName() + ".ilk"));
+		DeleteFile(AppendFileName(outdir, ff.GetName() + ".pdb"));
+		ff.Next();
+	}
+}
+
+void Build(const char *nest, bool release)
+{
+	for(int i = 0; i < bm.GetCount(); i++)
+		Build(nest, bm[i], release);
+}
+
+void Build(const char *nest)
+{
+	Build(nest, false);
+//	Build(nest, true);
+}
+
+CONSOLE_APP_MAIN
+{
+	const Vector<String>& arg = CommandLine();
+	input = GetDataFile("BuildAll.cpp")[0] + String(":\\");
+	output = "C:\\out";
+	for(int i = 0; i < arg.GetCount(); i++)
+		bm.Add(arg[i]);
+	if(bm.GetCount() == 0) {
+		bm.Add("MSC71cdb");
+		bm.Add("MSC8");
+		bm.Add("MINGWI2");
+	}
+	Build("examples");
+	Build("reference");
+	Build("tutorial");
+	if(failed.GetCount()) {
+		Cout() << "***** Failed builds: \n";
+		for(int i = 0; i < failed.GetCount(); i++)
+			Cout() << "  " << failed[i] << '\n';
+	}
+	RDUMPC(failed);
+}
diff --git a/uppsrc/BuildAll/BuildAll.upp b/uppsrc/BuildAll/BuildAll.upp
new file mode 100644
index 000000000..6372e3f28
--- /dev/null
+++ b/uppsrc/BuildAll/BuildAll.upp
@@ -0,0 +1,11 @@
+description "Utility that builds all U++ examples";
+
+uses
+	Core;
+
+file
+	BuildAll.cpp;
+
+mainconfig
+	"" = "";
+
diff --git a/uppsrc/CbGen/AUTHORS b/uppsrc/CbGen/AUTHORS
new file mode 100644
index 000000000..f782e5b62
--- /dev/null
+++ b/uppsrc/CbGen/AUTHORS
@@ -0,0 +1,2 @@
+Mirek Fidler <cxl@ntllib.org>
+Tomas Rylek  <rylek@volny.cz>
\ No newline at end of file
diff --git a/uppsrc/CbGen/COPYING b/uppsrc/CbGen/COPYING
new file mode 100644
index 000000000..33aa39102
--- /dev/null
+++ b/uppsrc/CbGen/COPYING
@@ -0,0 +1,30 @@
+Copyright (C) 2005 Mirek Fidler, Tomas Rylek and various contributors (see AUTHORS)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to
+deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies of the Software and its Copyright notices. In addition publicly
+documented acknowledgment must be given that this software has been used if no
+source code of this software is made available publicly. This includes
+acknowledgments in either Copyright notices, Manuals, Publicity and Marketing
+documents or any documentation provided with any product containing this
+software. This License does not apply to any software that links to the
+libraries provided by this software (statically or dynamically), but only to
+the software provided.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+-----------
+
+Please see the COPYING.PLAIN for a plain-english explanation of this notice
+and it's intent.
diff --git a/uppsrc/CbGen/COPYING-PLAIN b/uppsrc/CbGen/COPYING-PLAIN
new file mode 100644
index 000000000..770a8132f
--- /dev/null
+++ b/uppsrc/CbGen/COPYING-PLAIN
@@ -0,0 +1,33 @@
+Plain English Copyright Notice
+
+This file is not intended to be the actual License. The reason this file
+exists is that we here are programmers and engineers. We aren't lawyers. We
+provide licenses that we THINK say the right things, but we have our own
+intentions at heart. This is a plain-english explanation of what those
+intentions are, and if you follow them you will be within the "spirit" of
+the license.
+
+The intent is for us to enjoy writing software that is useful to us (the
+AUTHORS) and allow others to use it freely and also benefit from the work we
+put into making it. We don't want to restrict others using it. They should
+not *HAVE* to make the source code of the applications they write that
+simply link to these libraries (be that statically or dynamically), or for
+them to be limited as to what license they choose to use (be it open, closed
+or anything else). But we would like to know you are using these libraries.
+We simply would like to know that it has been useful to someone. This is why
+we ask for acknowledgement of some sort.
+
+You can do what you want with the source of this software - it doesn't
+matter. We still have it here for ourselves and it is open and free to use
+and download and play with. It can't be taken away. We don't really mind what
+you do with the source to your software. We would simply like to know that
+you are using it - especially if it makes it to a commerical product. If you
+simply e-mail all the AUTHORS (see COPYING and AUTHORS files) telling us, and
+then make sure you include a paragraph or page in the manual or in the "About.."
+box for the product with the copyright notice and state that you used this
+software, we will be very happy. If you want to contribute back modifications
+and fixes you may have made we will welcome those too with open arms (generally).
+If you want help with changes needed, ports needed or features to be added,
+arrangements can be easily made with some dialogue.
+
+Mirek Fidler <cxl@ntllib.org>
diff --git a/uppsrc/CbGen/CbGen.upp b/uppsrc/CbGen/CbGen.upp
new file mode 100644
index 000000000..5b0d64315
--- /dev/null
+++ b/uppsrc/CbGen/CbGen.upp
@@ -0,0 +1,14 @@
+description "Utility to generate (long and repetitive) callback C++ source files";
+
+uses
+	Core;
+
+file
+	CppGen.cpp,
+	Info readonly separator,
+	COPYING,
+	COPYING-PLAIN,
+	AUTHORS;
+
+mainconfig
+	"Normal" = "";
diff --git a/uppsrc/CbGen/CppGen.cpp b/uppsrc/CbGen/CppGen.cpp
new file mode 100644
index 000000000..654a9353b
--- /dev/null
+++ b/uppsrc/CbGen/CppGen.cpp
@@ -0,0 +1,373 @@
+#include <Core/Core.h>
+
+using namespace Upp;
+
+String If(String s, String txt)
+{
+	return IsNull(s) ? String() : txt;
+}
+
+void CallbackGen(String name, String rettype, int n, String extension, String atest = Null)
+{
+	LOG("// -----------------------------------------------------------");
+	String classdef, classlist, paramdef, paramlist;
+	for(int i = 1; i <= n; i++) {
+		if(i > 1) {
+			classdef << ", ";
+			classlist << ", ";
+			paramdef << ", ";
+			paramlist << ", ";
+		}
+		classdef << Format("class P%d", i);
+		classlist << Format("P%d", i);
+		paramdef << Format("P%d p%d", i, i);
+		paramlist << Format("p%d", i);
+	}
+	String cl_list = If(classlist, "<" + classlist + ">");
+	String cl_temp = String("template <class OBJECT, class METHOD") << If(classdef, ", " + classdef) << ">";
+	String return_ = rettype == "void" ? "" : "return ";
+	String name_cl = name + cl_list;
+	LOG("");
+	if(!IsNull(classdef))
+		LOG("template <" << classdef << ">");
+	LOG("struct " << name << "Action {");
+	LOGBEGIN();
+		LOG("Atomic  count;");
+		LOG("");
+		LOG("virtual " << rettype << " Execute(" + paramdef + ") = 0;");
+		LOG("virtual bool IsValid() const { return true; }");
+//		LOG("virtual bool IsEqual(const " << name << "Action *other) const = 0;");
+//		LOG("virtual unsigned GetHashValue() const = 0;");
+	  	LOG("");
+		LOG(name << "Action()          { count = 1; }");
+		LOG("virtual ~" << name << "Action() {}");
+	LOGEND();
+	LOG("};");
+	LOG("");
+
+	LOG(cl_temp);
+	LOG("struct " << name << "MethodActionPte : public " << name << "Action" << cl_list + " {");
+	LOGBEGIN();
+		LOG("Ptr<OBJECT>  object;");
+		LOG("METHOD       method;");
+		LOG("");
+		if(rettype == "void")
+			LOG(rettype << " Execute(" << paramdef << ") { if(object) (object->*method)(" << paramlist << "); }");
+		else
+			LOG(rettype << " Execute(" << paramdef << ") { return object ? (object->*method)(" << paramlist << ") : false; }");
+		LOG("bool IsValid() const { return object; }");
+//		LOG("bool IsEqual(const " << name << "Action" << cl_list << "  *other) const {");
+//		LOGBEGIN();
+//			LOG("const " << name << "MethodActionPte *q = dynamic_cast<const " << name <<
+//			    "MethodActionPte *>(other);");
+//			LOG("return q ? q->object == object && q->method == method : false;");
+//		LOGEND();
+//		LOG("}");
+//		LOG("unsigned GetHashValue() const {");
+//		LOG("\treturn (unsigned)(uintptr_t)~object ^ (unsigned)brutal_cast<uintptr_t>(method);");
+//		LOG("}");
+		LOG("");
+		LOG(name << "MethodActionPte(OBJECT *object, METHOD method) "
+		    ": object(object), method(method) {}");
+	LOGEND();
+	LOG("};");
+	LOG("");
+
+	LOG(cl_temp);
+	LOG("struct " << name << "MethodAction : public " << name << "Action" << cl_list + " {");
+	LOGBEGIN();
+		LOG("OBJECT  *object;");
+		LOG("METHOD   method;");
+		LOG("");
+		LOG(rettype << " Execute(" << paramdef << ") { " <<
+		    return_ << "(object->*method)(" << paramlist << "); }");
+/*		LOG("bool IsEqual(const " << name << "Action" << cl_list << "  *other) const {");
+		LOGBEGIN();
+			LOG("const " << name << "MethodAction *q = dynamic_cast<const " << name <<
+			    "MethodAction *>(other);");
+			LOG("return q ? q->object == object && q->method == method : false;");
+		LOGEND();
+		LOG("}");
+		LOG("unsigned GetHashValue() const {");
+		LOG("\treturn (unsigned)(uintptr_t)object ^ (unsigned)brutal_cast<uintptr_t>(method);");
+		LOG("}");
+*/		LOG("");
+		LOG(name << "MethodAction(OBJECT *object, METHOD method) "
+		    ": object(object), method(method) {}");
+	LOGEND();
+	LOG("};");
+	LOG("");
+
+	if(!IsNull(classdef))
+		LOG("template <" << classdef << ">");
+	LOG("struct " << name << "FnAction : public " << name << "Action" << cl_list << " {");
+	LOGBEGIN();
+		LOG(rettype << " (*fn)(" << paramdef << ");");
+		LOG("");
+		LOG(rettype << " Execute(" << paramdef << ") { " << return_ << "(*fn)(" <<
+		    paramlist << "); }");
+/*		LOG("bool IsEqual(const " << name << "Action" << cl_list << " *other) const {");
+		LOGBEGIN();
+			LOG("const " << name << "FnAction *q = dynamic_cast<const " << name <<
+		    	"FnAction *>(other);");
+			LOG("return q ? q->fn == fn : false;");
+		LOGEND();
+		LOG("}");
+		LOG("unsigned GetHashValue() const {");
+		LOG("\treturn (unsigned)(uintptr_t)fn;");
+		LOG("}");
+*/		LOG("");
+		LOG(name << "FnAction(" << rettype << " (*fn)(" << paramdef << ")) : fn(fn) {}");
+	LOGEND();
+	LOG("};");
+	LOG("");
+
+	if(!IsNull(classdef))
+		LOG("template <" << classdef << ">");
+	LOG("class " << name << " : Moveable< " << name_cl << " > {");
+	LOGBEGIN();
+		LOG(name << "Action" << cl_list << " *action;");
+ 		LOG("");
+		LOG("void Retain() const { if(action " << atest << ") AtomicInc(action->count); }");
+		LOG("void Release()      { if(action " << atest << " && AtomicDec(action->count) == 0) delete action; }");
+  		LOG("");
+		LOG("bool operator==(const " << name << "&);");
+		LOG("bool operator!=(const " << name << "&);");
+  		LOG("");
+  	LOGEND();
+	LOG("public:");
+	LOGBEGIN();
+		LOG("typedef " << name << " CLASSNAME;");
+		LOG("");
+		LOG(name << "& operator=(const " << name << "& c);");
+		LOG(name << "(const " << name << "& c);");
+		LOG("void Clear()        { Release(); action = NULL; }");
+		LOG("");
+//		LOG("unsigned GetHashValue() const            { return action->GetHashValue(); }");
+		LOG("");
+		LOG(extension);
+		LOG("");
+		LOG("explicit " << name << "(" << name << "Action " << cl_list <<
+		    " *newaction) { action = newaction; }");
+//		LOG(name << "& operator=(" << name << "Action" << cl_list <<
+//		    " *newaction) { action = newaction; return *this; }");
+		LOG(name << "() { action = NULL; }");
+		LOG(name << "(_CNULL) { action = NULL; }");
+		LOG("~" << name << "();");
+		LOG("");
+		LOG("static " << name << " Empty() { return CNULL; }");
+		LOG("");
+//		LOG("friend bool operator==(const " << name << "& a, const " << name << "& b)");
+//		LOG("\t{ return a.action ? a.action->IsEqual(b.action) : !b.action; }");
+//		LOG("friend bool operator!=(const " << name << "& a, const " << name << " & b)");
+//		LOG("\t{ return !(a == b); }");
+	LOGEND();
+	LOG("};");
+	LOG("");
+
+	LOG(cl_temp);
+	LOG(name_cl << " pteback(OBJECT *object, " << rettype <<
+	    " (METHOD::*method)(" << paramdef << ")) {");
+	LOG("\treturn " << name_cl <<
+		"(new " << name << "MethodActionPte<OBJECT, " << rettype << " (METHOD::*)(" <<
+		paramdef << ")" << If(classlist, ", " + classlist) << ">(object, method));");
+	LOG("}");
+	LOG("");
+
+	LOG(cl_temp);
+	LOG(name_cl << " callback(OBJECT *object, " << rettype <<
+	    " (METHOD::*method)(" << paramdef << ")) {");
+	LOG("\treturn " << name_cl <<
+		"(new " << name << "MethodAction<OBJECT, " << rettype << " (METHOD::*)(" <<
+		paramdef << ")" << If(classlist, ", " + classlist) << ">(object, method));");
+	LOG("}");
+	LOG("");
+
+	LOG(cl_temp);
+	LOG(name_cl << " callback(const OBJECT *object, " << rettype <<
+	    " (METHOD::*method)(" << paramdef << ") const) {");
+	LOG("\treturn " << name_cl <<
+		"(new " << name << "MethodAction<const OBJECT, " << rettype << " (METHOD::*)("
+		<< paramdef << ") const" << If(classlist, ", " + classlist) << ">(object, method));");
+	LOG("}");
+	LOG("");
+
+	if(!IsNull(classdef))
+		LOG("template <" << classdef << ">");
+	LOG("inline " << name_cl << " callback(" << rettype << " (*fn)(" << paramdef << ")) {");
+	LOG("\treturn " << name_cl << "(new " << name << "FnAction " << cl_list << "(fn));");
+	LOG("}");
+	LOG("");
+
+
+	if(!IsNull(classdef))
+		LOG("template <" << classdef << ">");
+	LOG("struct " << name << "ForkAction : public " << name << "Action" << cl_list << " {");
+	LOGBEGIN();
+		LOG(name_cl << " cb1, cb2;");
+		LOG("");
+		LOG(rettype << " Execute(" << paramdef << ") { cb1(" << paramlist <<
+		    "); " << return_ << "cb2(" << paramlist << "); }");
+//		LOG("bool IsEqual(const " << name << "Action " << cl_list << " *other) const {");
+//		LOG("\tconst " << name << "ForkAction *q = dynamic_cast<const " << name
+//		    << "ForkAction *>(other);");
+//		LOG("\treturn q ? q->cb1 == cb1 && q->cb2 == cb2 : false;");
+//		LOG("}");
+//		LOG("unsigned GetHashValue() const {");
+//		LOG("\treturn ::GetHashValue(cb1) ^ ::GetHashValue(cb2);");
+//		LOG("}");
+		LOG("");
+		LOG(name << "ForkAction(" << name_cl << " cb1, " << name_cl << " cb2)"
+		    "\n\t : cb1(cb1), cb2(cb2) {}");
+	LOGEND();
+	LOG("};");
+	LOG("");
+
+	if(!IsNull(classdef))
+		LOG("template <" << classdef << ">");
+	LOG("inline " << name_cl << " Proxy(" << name_cl << "& cb)");
+	LOG("{");
+	LOG("\treturn callback(&cb, &" << name_cl << "::Execute);");
+	LOG("}");
+	LOG("");
+
+	if(IsNull(classdef)) {
+		LOG(name_cl << " callback(" << name_cl << " cb1, " << name_cl << " cb2);");
+		LOG(name_cl << "& operator<<(" << name_cl << "& a, " << name_cl << " b);");
+		LOG("");
+		LOG("#endif");
+		LOG("#ifdef CPP_PART__");
+		LOG("");
+	}
+
+	if(!IsNull(classdef))
+		LOG("template <" << classdef << ">");
+	LOG(name_cl << " callback(" << name_cl << " cb1, " << name_cl << " cb2)");
+	LOG("{");
+	LOG("\treturn " << name_cl << "(new " << name << "ForkAction " << cl_list << "(cb1, cb2));");
+	LOG("}");
+	LOG("");
+
+	if(!IsNull(classdef))
+		LOG("template <" << classdef << ">");
+	LOG(name_cl << "& operator<<(" << name_cl << "& a, " << name_cl << " b)");
+	LOG("{");
+	LOG("\tif(a)");
+	LOG("\t\ta = callback(a, b);");
+	LOG("\telse");
+	LOG("\t\ta = b;");
+	LOG("\treturn a;");
+	LOG("}");
+	LOG("");
+
+	if(!IsNull(classdef))
+		LOG("template <" << classdef << ">");
+	LOG(name_cl << "& " << name_cl << "::operator=(const " << name << "& c)");
+	LOG("{");
+	LOG("\tc.Retain();");
+	LOG("\tRelease();");
+	LOG("\taction = c.action;");
+	LOG("\treturn *this;");
+	LOG("}");
+	LOG("");
+	if(!IsNull(classdef))
+		LOG("template <" << classdef << ">");
+	LOG(name_cl << "::" << name << "(const " << name << "& c)");
+	LOG("{");
+	LOG("\taction = c.action;");
+	LOG("\tRetain();");
+	LOG("}");
+	LOG("");
+	if(!IsNull(classdef))
+		LOG("template <" << classdef << ">");
+	LOG(name_cl << "::~" << name << "()");
+	LOG("{");
+	LOG("\tRelease();");
+	LOG("}");
+	LOG("");
+	if(IsNull(classdef)) {
+		LOG("#endif");
+		LOG("#ifndef CPP_PART__");
+		LOG("");
+	}
+};
+
+CONSOLE_APP_MAIN
+{
+	LOG("#ifndef CPP_PART__");
+	LOG("");
+	
+	CallbackGen("Callback", "void", 0,
+		"operator bool() const   { return action && action->IsValid(); }\n"
+		"void Execute() const;\n"
+	    "void operator()() const { Execute(); }"
+	);
+	CallbackGen("Callback1", "void", 1,
+		"operator bool() const          { return action && action->IsValid(); }\n"
+		"void Execute(P1 p1) const      { if(action) action->Execute(p1); }\n"
+		"void operator()(P1 p1) const   { Execute(p1); }"
+	);
+	CallbackGen("Callback2", "void", 2,
+		"operator bool() const                { return action && action->IsValid(); }\n"
+		"void Execute(P1 p1, P2 p2) const     { if(action) action->Execute(p1, p2); }\n"
+		"void operator()(P1 p1, P2 p2) const  { Execute(p1, p2); }"
+	);
+	CallbackGen("Callback3", "void", 3,
+		"operator bool() const                       { return action && action->IsValid(); }\n"
+		"void Execute(P1 p1, P2 p2, P3 p3) const     { if(action) action->Execute(p1, p2, p3); }\n"
+		"void operator()(P1 p1, P2 p2, P3 p3) const  { Execute(p1, p2, p3); }"
+	);
+	CallbackGen("Callback4", "void", 4,
+		"operator bool() const                              { return action && action->IsValid(); }\n"
+		"void Execute(P1 p1, P2 p2, P3 p3, P4 p4) const     { if(action) action->Execute(p1, p2, p3, p4); }\n"
+		"void operator()(P1 p1, P2 p2, P3 p3, P4 p4) const  { Execute(p1, p2, p3, p4); }"
+	);
+
+	CallbackGen("Gate", "bool", 0,
+	    "operator bool() const        { return (void *)action != (void *)1 && action && action->IsValid(); }\n"
+		"bool Execute() const;\n"
+		"bool operator()() const      { return Execute(); }\n"
+		"void ClearTrue()             { Clear(); action = (GateAction *)1; }\n"
+		"void ClearFalse()            { Clear(); }\n\n"
+		"Gate(bool b)                 { action = (GateAction *)(int)b; }",
+		"&& (void *)action != (void *)1"
+	);
+	CallbackGen("Gate1", "bool", 1,
+	    "operator bool() const        { return (void *)action != (void *)1 && action && action->IsValid(); }\n"
+		"bool Execute(P1 p1) const;\n"
+		"bool operator()(P1 p1) const { return Execute(p1); }\n"
+		"void ClearTrue()             { Clear(); action = (Gate1Action<P1> *)1; }\n"
+		"void ClearFalse()            { Clear(); }\n\n"
+		"Gate1(bool b)                { action = (Gate1Action<P1> *)(uintptr_t)b; }",
+		"&& (void *)action != (void *)1"
+	);
+	CallbackGen("Gate2", "bool", 2,
+	    "operator bool() const        { return (void *)action != (void *)1 && action && action->IsValid(); }\n"
+		"bool Execute(P1 p1, P2 p2) const;\n"
+		"bool operator()(P1 p1, P2 p2) const { return Execute(p1, p2); }\n"
+		"void ClearTrue()             { Clear(); action = (Gate2Action<P1, P2> *)1; }\n"
+		"void ClearFalse()            { Clear(); }\n\n"
+		"Gate2(bool b)                { action = (Gate2Action<P1, P2> *)(uintptr_t)b; }",
+		"&& (void *)action != (void *)1"
+	);
+	CallbackGen("Gate3", "bool", 3,
+	    "operator bool() const        { return (void *)action != (void *)1 && action && action->IsValid(); }\n"
+		"bool Execute(P1 p1, P2 p2, P3 p3) const;\n"
+		"bool operator()(P1 p1, P2 p2, P3 p3) const { return Execute(p1, p2, p3); }\n"
+		"void ClearTrue()             { Clear(); action = (Gate3Action<P1, P2, P3> *)1; }\n"
+		"void ClearFalse()            { Clear(); }\n\n"
+		"Gate3(bool b)                { action = (Gate3Action<P1, P2, P3> *)(uintptr_t)b; }",
+		"&& (void *)action != (void *)1"
+	);
+	CallbackGen("Gate4", "bool", 4,
+	    "operator bool() const        { return (void *)action != (void *)1 && action && action->IsValid(); }\n"
+		"bool Execute(P1 p1, P2 p2, P3 p3, P4 p4) const;\n"
+		"bool operator()(P1 p1, P2 p2, P3 p3, P4 p4) const { return Execute(p1, p2, p3, p4); }\n"
+		"void ClearTrue()             { Clear(); action = (Gate4Action<P1, P2, P3, P4> *)1; }\n"
+		"void ClearFalse()            { Clear(); }\n\n"
+		"Gate4(bool b)                { action = (Gate4Action<P1, P2, P3, P4> *)(uintptr_t)b; }",
+		"&& (void *)action != (void *)1"
+	);
+	LOG("");
+	LOG("#endif");
+}
diff --git a/uppsrc/CbGen/prj.aux b/uppsrc/CbGen/prj.aux
new file mode 100644
index 000000000..711e6d53e
--- /dev/null
+++ b/uppsrc/CbGen/prj.aux
@@ -0,0 +1,2 @@
+file
+	e:\out\upp/CppGen/CONSOLE-DEBUG-IA32-MAIN-MSC-ST-WIN32\CppGen.log;
diff --git a/uppsrc/CodeEditor/CodeEditor.cpp b/uppsrc/CodeEditor/CodeEditor.cpp
new file mode 100644
index 000000000..7a44ed189
--- /dev/null
+++ b/uppsrc/CodeEditor/CodeEditor.cpp
@@ -0,0 +1,1036 @@
+#include "CodeEditor.h"
+
+NAMESPACE_UPP
+
+#define LLOG(x) // RLOG(x)
+#define LTIMING(x) // RTIMING(x)
+
+#define IMAGEVECTOR Vector
+#define IMAGECLASS  CodeEditorImg
+#define IMAGEFILE   <CodeEditor/CodeEditor.iml>
+#include <Draw/iml_source.h>
+
+void CodeEditor::DirtyFrom(int line) {
+	for(int i = 0; i < 4; i++)
+		if(scache[i].line >= line)
+			scache[i].Clear();
+
+	if(check_edited) {
+		bar.ClearErrors(line);
+		bar.Refresh();
+	}
+}
+
+inline bool IsComment(int a, int b) {
+	return a == '/' && b == '*' || a == '*' && b == '/' || a == '/' && b == '/';
+}
+
+void CodeEditor::PreInsert(int pos, const WString& text) {
+	if(IsFullRefresh()) return;
+	rm_ins = ScanSyntax(GetLine(pos) + 1);
+}
+
+inline bool RBR(int c) {
+	return isbrkt(c);
+}
+
+void CodeEditor::PostInsert(int pos, const WString& text) {
+	if(check_edited)
+		bar.SetEdited(GetLine(pos));
+	if(IsFullRefresh()) return;
+	if(!ScanSyntax(GetLine(pos + text.GetLength()) + 1).MatchHilite(rm_ins)) {
+		if(text.GetLength() == 1 && *text == '(' || *text == '[' || *text == ']' || *text == ')')
+			RefreshChars(RBR);
+		else
+			Refresh();
+		bar.Refresh();
+	}
+}
+
+void CodeEditor::PreRemove(int pos, int size) {
+	if(IsFullRefresh()) return;
+	if(size == 1)
+		rmb = Get(pos, size)[0];
+	else
+		rmb = 0;
+	rm_ins = ScanSyntax(GetLine(pos + size) + 1);
+}
+
+void CodeEditor::PostRemove(int pos, int size) {
+	if(check_edited)
+		bar.SetEdited(GetLine(pos));
+	if(IsFullRefresh()) return;
+	if(!ScanSyntax(GetLine(pos) + 1).MatchHilite(rm_ins)) {
+		if(rmb == '(' || rmb == '[' || rmb == ']' || rmb == ')')
+			RefreshChars(RBR);
+		else
+			Refresh();
+		bar.Refresh();
+	}
+	CheckBrackets();
+}
+
+void CodeEditor::ClearLines() {
+	bar.ClearLines();
+}
+
+void CodeEditor::InsertLines(int line, int count) {
+	bar.InsertLines(line, count);
+	if(line <= line2.GetCount())
+		line2.Insert(line, GetLine2(line), count);
+}
+
+void CodeEditor::RemoveLines(int line, int count) {
+	bar.RemoveLines(line, count);
+	if(line + count <= line2.GetCount())
+		line2.Remove(line, count);
+}
+
+void CodeEditor::Renumber2()
+{
+	line2.SetCount(GetLineCount());
+	for(int i = 0; i < GetLineCount(); i++)
+		line2[i] = i;
+}
+
+int CodeEditor::GetLine2(int i) const
+{
+	return line2.GetCount() ? line2[min(line2.GetCount() - 1, i)] : 0;
+}
+
+void CodeEditor::NewScrollPos() {
+	bar.Scroll();
+}
+
+bool NotEscape(int pos, const WString& s)
+{
+	return pos == 0 || s[pos - 1] != '\\' ? true : !NotEscape(pos - 1, s);
+}
+
+void CodeEditor::CheckBracket(int li, int pos, int ppos, int pos0, WString ln, int d, int limit)
+{
+	int li0 = li;
+	int lvl = 1;
+	pos += d;
+	ppos += d;
+	for(;;) {
+		int c;
+		for(;;) {
+			while(pos < 0 || pos >= ln.GetLength()) {
+				li += d;
+				if(d * li >= d * limit)
+					return;
+				ln = GetWLine(li);
+				pos = d < 0 ? ln.GetLength() - 1 : 0;
+				ppos += d;
+			}
+			c = ln[pos];
+			if((c == '\"' || c == '\'') && (NotEscape(pos, ln) && ln[pos - 1] != '\'')) {
+				pos += d;
+				ppos += d;
+				int lc = c;
+				while(pos < ln.GetLength() && pos > 0) {
+					if(ln[pos] == lc && NotEscape(pos, ln)) {
+						pos += d;
+						ppos += d;
+						break;
+					}
+					pos += d;
+					ppos += d;
+				}
+			}
+			else
+				break;
+		}
+		if(islbrkt(c))
+			lvl += d;
+		if(isrbrkt(c))
+			lvl -= d;
+		if(lvl <= 0) {
+			highlight_bracket_pos0 = pos0;
+			highlight_bracket_pos = ppos;
+			RefreshLine(li);
+			RefreshLine(li0);
+			bracket_start = GetTimeClick();
+			return;
+		}
+		pos += d;
+		ppos += d;
+	}
+}
+
+void CodeEditor::CopyWord() {
+	int p = GetCursor();
+	if(iscid(GetChar(p)) || (p > 0 && iscid(GetChar(--p)))) {
+		int e = GetLength();
+		int f = p;
+		while(--p >= 0 && iscid(GetChar(p)));
+			++p;
+		while(++f < e && iscid(GetChar(f)));
+		WString txt = GetW(p, f - p);
+		WriteClipboardUnicodeText(txt);
+		AppendClipboardText(txt.ToString());
+	}
+}
+
+void CodeEditor::SwapChars() {
+	if(IsReadOnly()) return;
+	int i = GetLine(cursor);
+	int j = GetPos(i);
+	if (j < cursor && (cursor-j) < line[i].GetLength()) {
+		int p = cursor;
+		WString txt(GetChar(p-1),1);
+		Remove(p-1,1);
+		Insert(p, txt, true);
+		PlaceCaret(p);
+	}
+}
+
+void CodeEditor::CheckLeftBracket(int pos)
+{
+	LTIMING("CheckLeftBracket");
+	if(pos < 0 || pos >= GetLength())
+		return;
+	int ppos = pos;
+	int li = GetLinePos(pos);
+	WString ln = GetWLine(li);
+	if(islbrkt(ln[pos]))
+		CheckBracket(li, pos, ppos, ppos, ln, 1, min(li + 3000, GetLineCount()));
+}
+
+void CodeEditor::CheckRightBracket(int pos)
+{
+	LTIMING("CheckRightBracket");
+	if(pos < 0 || pos >= GetLength())
+		return;
+	int ppos = pos;
+	int li = GetLinePos(pos);
+	WString ln = GetWLine(li);
+	int c = ln[pos];
+	if(c == ')' || c == '}' || c == ']')
+		CheckBracket(li, pos, ppos, ppos, ln, -1, max(li - 3000, 0));
+}
+
+void CodeEditor::CancelBracketHighlight(int& pos)
+{
+	if(pos >= 0) {
+		RefreshLine(GetLine(pos));
+		pos = -1;
+	}
+}
+
+void CodeEditor::Periodic()
+{
+	bool b = (((GetTimeClick() - bracket_start) >> 8) & 1) == 0;
+	if(b != bracket_flash && hilite_bracket == 2) {
+		bracket_flash = b;
+		if(highlight_bracket_pos0 >= 0)
+			RefreshLine(GetLine(highlight_bracket_pos0));
+		if(highlight_bracket_pos >= 0)
+			RefreshLine(GetLine(highlight_bracket_pos));
+	}
+}
+
+void CodeEditor::SelectionChanged()
+{
+	if(!foundsel) {
+		CloseFindReplace();
+		found = false;
+		notfoundfw = notfoundbk = false;
+		findreplace.amend.Disable();
+	}
+	CheckBrackets();
+}
+
+void CodeEditor::CheckBrackets()
+{
+	CancelBracketHighlight(highlight_bracket_pos0);
+	CancelBracketHighlight(highlight_bracket_pos);
+	if(!IsSelection()) {
+		CheckLeftBracket(GetCursor());
+		if(highlight_bracket_pos < 0)
+			CheckRightBracket(GetCursor());
+		if(highlight_bracket_pos < 0)
+			CheckLeftBracket(GetCursor() - 1);
+		if(highlight_bracket_pos < 0)
+			CheckRightBracket(GetCursor() - 1);
+	}
+	WhenSelection();
+}
+
+bool CodeEditor::InsertRS(int chr, int count) {
+	if(IsReadOnly()) return true;
+	if(IsSelection()) {
+		InsertChar(chr, count);
+		return true;
+	}
+	return false;
+}
+
+void CodeEditor::IndentEnter(int count) {
+	if(InsertRS('\n', count)) return;
+	while(count--) {
+		int pp = GetCursor();
+		int cl = GetLinePos(pp);
+		WString pl = GetWLine(cl);
+		InsertChar('\n', 1);
+		SyntaxState st;
+		int p = GetCursor();
+		int l = GetLinePos(p);
+		if(highlight >= 0 && GetLineLength(l) == p)
+			st = ScanSyntax(GetCursorLine());
+		if(st.par.GetCount() && st.par.Top().line == cl && !no_parenthesis_indent) {
+			for(int i = 0; i < st.par.Top().pos && i < pl.GetLength(); i++)
+				InsertChar(pl[i] == '\t' ? '\t' : ' ', 1);
+			return;
+		}
+		if(st.endstmtline == cl && st.seline >= 0 && st.seline < GetLineCount())
+			pl = GetWLine(st.seline);
+		else {
+			int i;
+			for(i = 0; i < pl.GetLength(); i++) {
+				if(pl[i] != ' ' && pl[i] != '\t')
+					break;
+			}
+			if(pp < i)
+				return;
+		}
+		const wchar *s = pl;
+		while(*s == '\t' || *s == ' ')
+			InsertChar(*s++, 1);
+		if(st.stmtline == cl || st.blk.GetCount() && st.blk.Top() == cl)
+			if(indent_spaces || (s > pl && s[-1] == ' '))
+				InsertChar(' ', indent_amount);
+			else
+				InsertChar('\t', 1);
+	}
+}
+
+void CodeEditor::IndentInsert(int chr) {
+	if(InsertRS(chr)) return;
+	int cl = GetCursorLine();
+	WString l = GetWLine(cl);
+	if(chr != '{' && chr != '}') {
+		InsertChar(chr, 1, true);
+		return;
+	}
+	const wchar *s;
+	for(s = l; s < l.End(); s++)
+		if(*s != ' ' && *s != '\t') {
+			InsertChar(chr, 1);
+			return;
+		}
+	int len = l.GetLength();
+	SyntaxState st = ScanSyntax(cl);
+	WString tl;
+	int pos = GetPos(cl);
+	if(chr == '{' && cl > 0 && st.stmtline == cl - 1 && highlight >= 0)
+		tl = GetWLine(cl - 1);
+	else
+	if(chr == '}' && st.blk.GetCount() && highlight >= 0)
+		tl = GetWLine(st.blk.Top());
+	else {
+		InsertChar(chr, 1);
+		return;
+	}
+	SetCursor(pos);
+	Remove(pos, len);
+	s = tl;
+	while(*s == '\t' || *s == ' ')
+		InsertChar(*s++, 1);
+	InsertChar(chr, 1);
+}
+
+void CodeEditor::MakeTabsOrSpaces(bool maketabs) {
+	Point cursor = GetColumnLine(GetCursor());
+	Point scroll = GetScrollPos();
+	int l, h;
+	bool is_sel = GetSelection(l, h);
+	if(!is_sel) { l = 0; h = GetLength(); }
+	if(h <= l)
+	{
+		BeepExclamation();
+		return;
+	}
+	l = GetPos(GetLine(l));
+	h = GetPos(GetLine(h - 1) + 1);
+	String substring = Get(l, h - l);
+	String out;
+	int tab = GetTabSize();
+	if(tab <= 0) tab = 8;
+	for(const char *p = substring.Begin(), *e = substring.End(); p < e;)
+	{
+		int pos = 0;
+		for(; p < e; p++)
+			if(*p == '\t')
+				pos = (pos / tab + 1) * tab;
+			else if(*p == ' ')
+				pos++;
+			else
+				break;
+		if(maketabs)
+		{
+			out.Cat('\t', pos / tab);
+			const char *b = p;
+			while(p < e && *p++ != '\n')
+				;
+			out.Cat(b, int(p - b));
+		}
+		else
+		{
+			out.Cat(' ', pos);
+			for(; p < e && *p != '\n'; p++)
+				if(*p == '\t')
+				{
+					int npos = (pos / tab + 1) * tab;
+					out.Cat(' ', npos - pos);
+					pos = npos;
+				}
+				else
+				{
+					out.Cat(*p);
+					pos++;
+				}
+			if(p < e)
+				out.Cat(*p++);
+		}
+	}
+	if(out == substring)
+	{
+		BeepInformation();
+		return;
+	}
+	Remove(l, h - l);
+	Insert(l, out.ToWString());
+	if(is_sel)
+		SetSelection(l, l + out.GetLength());
+	SetCursor(GetGPos(cursor.y, cursor.x));
+	SetScrollPos(scroll);
+}
+
+void CodeEditor::MoveNextWord(bool sel) {
+	int p = GetCursor();
+	int e = GetLength();
+	if(iscid(GetChar(p)))
+		while(p < e && iscid(GetChar(p))) p++;
+	else
+		while(p < e && !iscid(GetChar(p))) p++;
+	PlaceCaret(p, sel);
+}
+
+void CodeEditor::MovePrevWord(bool sel) {
+	int p = GetCursor();
+	if(p == 0) return;
+	if(iscid(GetChar(p - 1)))
+		while(p > 0 && iscid(GetChar(p - 1))) p--;
+	else
+		while(p > 0 && !iscid(GetChar(p - 1))) p--;
+	PlaceCaret(p, sel);
+}
+
+void CodeEditor::MoveNextBrk(bool sel) {
+	int p = GetCursor();
+	int e = GetLength();
+	if(!islbrkt(GetChar(p)))
+		while(p < e && !islbrkt(GetChar(p))) p++;
+	else {
+		int lvl = 1;
+		p++;
+		for(;;) {
+			if(p >= e) break;
+			int c = GetChar(p++);
+			if(islbrkt(c)) lvl++;
+			if(isrbrkt(c) && --lvl == 0) break;
+		}
+	}
+	PlaceCaret(p, sel);
+}
+
+void CodeEditor::MovePrevBrk(bool sel) {
+	int p = GetCursor();
+	if(p < 2) return;
+	if(!isrbrkt(GetChar(p - 1)))
+		while(p > 0 && !isrbrkt(GetChar(p - 1))) p--;
+	else {
+		int lvl = 1;
+		p -= 2;
+		for(;;) {
+			if(p <= 1) break;
+			int c = GetChar(p);
+			if(isrbrkt(c)) lvl++;
+			if(islbrkt(c) && --lvl == 0) break;
+			p--;
+		}
+	}
+	PlaceCaret(p, sel);
+}
+
+bool isspctab(int c) {
+	return c == ' ' || c == '\t';
+}
+
+void CodeEditor::DeleteWord() {
+	if(IsReadOnly() || RemoveSelection()) return;
+	int p = GetCursor();
+	int e = GetLength();
+	int c = GetChar(p);
+	if(iscid(c))
+		while(p < e && iscid(GetChar(p))) p++;
+	else
+	if(isspctab(c))
+		while(p < e && isspctab(GetChar(p))) p++;
+	else {
+		DeleteChar();
+		return;
+	}
+	Remove(GetCursor(), p - GetCursor());
+}
+
+void CodeEditor::DeleteWordBack() {
+	if(IsReadOnly() || RemoveSelection()) return;
+	int p = GetCursor();
+	if(p < 1) return;
+	int c = GetChar(p - 1);
+	if(iscid(GetChar(p - 1)))
+		while(p > 1 && iscid(GetChar(p - 1))) p--;
+	else
+	if(isspctab(c))
+		while(p > 1 && isspctab(GetChar(p - 1))) p--;
+	else {
+		Backspace();
+		return;
+	}
+	Remove(p, GetCursor() - p);
+	PlaceCaret(p);
+}
+
+void CodeEditor::SetLineSelection(int l, int h) {
+	SetSelection(GetPos(l), GetPos(h));
+}
+
+bool CodeEditor::GetLineSelection(int& l, int& h) {
+	if(!GetSelection(l, h)) return false;
+	l = GetLine(l);
+	int pos = h;
+	h = GetLinePos(pos);
+	if(pos && h < GetLineCount()) h++;
+	SetLineSelection(l, h);
+	return true;
+}
+
+void CodeEditor::TabRight() {
+	int l, h;
+	if(!GetLineSelection(l, h)) return;
+	int ll = l;
+	while(l < h)
+		Insert(GetPos(l++), "\t");
+	SetLineSelection(ll, h);
+}
+
+void CodeEditor::TabLeft() {
+	int l, h;
+	if(!GetLineSelection(l, h)) return;
+	int ll = l;
+	while(l < h) {
+		WString ln = GetWLine(l);
+		int spc = 0;
+		while(spc < tabsize && ln[spc] == ' ') spc++;
+		if(spc < tabsize && ln[spc] == '\t') spc++;
+		Remove(GetPos(l++), spc);
+	}
+	SetLineSelection(ll, h);
+}
+
+bool CodeEditor::GetWordPos(int pos, int& l, int& h) {
+	l = h = pos;
+	if(!iscid(GetChar(pos))) return false;
+	while(l > 0 && iscid(GetChar(l - 1))) l--;
+	while(iscid(GetChar(h))) h++;
+	return true;
+}
+
+String CodeEditor::GetWord()
+{
+	int l, h;
+	GetWordPos(cursor, l, h);
+	return Get(l, h - l);
+}
+
+void CodeEditor::LeftDouble(Point p, dword keyflags) {
+	int l, h;
+	int pos = GetMousePos(p);
+	if(GetWordPos(pos, l, h))
+		SetSelection(l, h);
+	else
+		SetSelection(pos, pos + 1);
+}
+
+void CodeEditor::LeftDown(Point p, dword keyflags) {
+	LineEdit::LeftDown(p, keyflags);
+	WhenLeftDown();
+}
+
+void CodeEditor::MouseMove(Point p, dword f) {
+	LineEdit::MouseMove(p, f);
+	if(IsSelection()) return;
+	int pos = GetMousePos(p);
+	int l, h;
+	if(GetWordPos(pos, l, h) || pos > 0 && GetWordPos(pos - 1, l, h))
+		WhenDbgView(Get(l, h - l));
+}
+
+WString CodeEditor::GetI()
+{
+	int l, h;
+	WString ft;
+	if(GetSelection(l, h) || GetWordPos(GetCursor(), l, h)) {
+		while(l < h) {
+			int c = GetChar(l++);
+			if(c == '\n')
+				break;
+			ft.Cat(c);
+		}
+	}
+	return ft;
+}
+
+void CodeEditor::FindWord(bool back) {
+	WString I = GetI();
+	if(!IsNull(I))
+		Find(back, I, true, false, false, false);
+}
+
+void CodeEditor::SetI(Ctrl *edit)
+{
+	*edit <<= GetI();
+}
+
+void CodeEditor::Goto() {
+	String line = AsString(GetCursorLine());
+	if(EditText(line, "Go to", "Line:"))
+		SetCursor(GetPos(atoi(line) - 1));
+}
+
+bool CodeEditor::ToggleSimpleComment(int &start_line, int &end_line, bool usestars)
+{
+	int l, h;
+	if(!GetSelection(l, h))
+		return true;
+
+	int pos = h;
+	start_line = GetLine(l);
+	end_line = GetLinePos(pos);
+
+	if(usestars && start_line == end_line) {
+		Enclose("/*", "*/", l, h);
+		return true;
+	}
+
+	if(pos && end_line < GetLineCount()) end_line++;
+	SetLineSelection(start_line, end_line);
+
+	return false;
+}
+
+void CodeEditor::ToggleLineComments(bool usestars)
+{
+	int start_line, end_line;
+	if(ToggleSimpleComment(start_line, end_line))
+		return;
+
+	int us = static_cast<int>(usestars);
+
+	bool is_commented = true;
+
+	if(usestars) {
+
+		is_commented &= GetChar(GetPos(start_line) + 0) == '/' &&
+						GetChar(GetPos(start_line) + 1) == '*';
+
+		is_commented &= GetChar(GetPos(end_line - 1) + 1) == '*' &&
+						GetChar(GetPos(end_line - 1) + 2) == '/';
+	}
+
+	for(int line = start_line + us; is_commented && (line < end_line - us * 2); ++line)
+		is_commented &= GetChar(GetPos(line)) == (usestars ? ' ' : '/') &&
+						GetChar(GetPos(line)+1) == (usestars ? '*' : '/');
+
+	if(!is_commented) {
+
+		if(usestars) {
+			Insert(GetPos(end_line)," */\n");
+			Insert(GetPos(start_line),"/*\n");
+		}
+
+		for(int line = start_line + us; line < end_line + us; ++line)
+			Insert(GetPos(line), usestars ? " * " : "//");
+	}
+	else
+	{
+		int line = start_line;
+		if(usestars)
+			Remove(GetPos(start_line), 3);
+		for(; line < end_line - us * 2; ++line)
+			Remove(GetPos(line), 2 + us);
+		if(usestars)
+			Remove(GetPos(line), 4);
+	}
+
+	if(usestars)
+		SetLineSelection(start_line, end_line + (is_commented ? -2 : 2));
+	else
+		SetLineSelection(start_line, end_line);
+}
+
+void CodeEditor::ToggleStarComments()
+{
+	int start_line, end_line;
+	if(ToggleSimpleComment(start_line, end_line))
+		return;
+
+	bool is_commented =
+		GetChar(GetPos(start_line)) == '/' &&
+		GetChar(GetPos(start_line)+1) == '*' &&
+		GetChar(GetPos(start_line)+2) == '\n' &&
+		GetChar(GetPos(end_line-1)) == '*' &&
+		GetChar(GetPos(end_line-1)+1) == '/' &&
+		GetChar(GetPos(end_line-1)+2) == '\n';
+
+	if(!is_commented) {
+		// Backwards because inserting changes the end line #
+		Insert(GetPos(end_line),"*/\n");
+		Insert(GetPos(start_line),"/*\n");
+		SetLineSelection(start_line, end_line+2);
+	} else {
+		// Backwards because inserting changes the end line #
+		Remove(GetPos(end_line-1),3);
+		Remove(GetPos(start_line),3);
+		SetLineSelection(start_line, end_line-2);
+	}
+}
+
+void CodeEditor::Enclose(const char *c1, const char *c2, int l, int h)
+{
+	if((l < 0 || h < 0) && !GetSelection(l, h))
+		return;
+	Insert(l, WString(c1));
+	Insert(h + (int)strlen(c1), WString(c2));
+	ClearSelection();
+	SetCursor(h + (int)strlen(c1) + (int)strlen(c2));
+}
+
+bool CodeEditor::Key(dword code, int count) {
+	Time key_time = GetSysTime();
+	double diff;
+	if(!IsNull(last_key_time) && (diff = int(key_time - last_key_time)) <= 3)
+		stat_edit_time += diff;
+	last_key_time = key_time;
+
+	NextUndo();
+	switch(code) {
+	case K_CTRL_DELETE:
+		DeleteWord();
+		return true;
+	case K_CTRL_BACKSPACE:
+		DeleteWordBack();
+		return true;
+	case K_ENTER:
+		IndentEnter(count);
+		return true;
+	}
+	bool sel = code & K_SHIFT;
+	switch(code & ~K_SHIFT) {
+	case K_F3:
+		Find(sel);
+		return true;
+	case K_CTRL_F3:
+		FindWord(sel);
+		return true;
+	case K_CTRL_RIGHT:
+		MoveNextWord(sel);
+		return true;
+	case K_CTRL_LEFT:
+		MovePrevWord(sel);
+		return true;
+	case K_CTRL_RBRACKET:
+		MoveNextBrk(sel);
+		return true;
+	case K_CTRL_LBRACKET:
+		MovePrevBrk(sel);
+		return true;
+	case K_TAB:
+		if(IsSelection()) {
+			if(sel)
+				TabLeft();
+			else
+				TabRight();
+			return true;
+		}
+	default:
+		if(IsSelection() && auto_enclose) {
+			if(code == '(') {
+				Enclose("(", ")");
+				return true;
+			}
+			if(code == '{') {
+				Enclose("{", "}");
+				return true;
+			}
+			if(code == '\"') {
+				Enclose("\"", "\"");
+				return true;
+			}
+			if(code == '[') {
+				Enclose("[", "]");
+				return true;
+			}
+			if(code == '/') {
+				//Enclose("/*", "*/");
+				ToggleLineComments(false);
+				return true;
+			}
+			if(code == K_CTRL_SLASH)
+			{
+				ToggleLineComments(true);
+				return true;
+			}
+			if(code == '*') {
+				//Enclose("/*", "*/");
+				ToggleStarComments();
+				return true;
+			}
+		}
+		if(code >= 32 && code < 128 && count == 1) {
+			IndentInsert(code);
+			return true;
+		}
+		if(code == 9 && IsSelection())
+			return true;
+	}
+	if(GetCharset() != CHARSET_UTF8)
+		if(code >= 128 && code < 65536 && FromUnicode((wchar)code, GetCharset()) == DEFAULTCHAR)
+			return true;
+	return LineEdit::Key(code, count);
+}
+
+void CodeEditor::ForwardWhenBreakpoint(int i) {
+	WhenBreakpoint(i);
+}
+
+void CodeEditor::GotoLine(int line)
+{
+	SetCursor(GetPos(GetLineNo(line)));
+}
+
+void CodeEditor::Serialize(Stream& s) {
+	int version = 0;
+	s / version;
+	SerializeFind(s);
+}
+
+void CodeEditor::SetLineInfo(const LineInfo& lf)
+{
+	bar.SetLineInfo(lf, GetLineCount());
+}
+
+void CodeEditor::DefaultHlStyles()
+{
+	SetHlStyle(INK_COMMENT, Green, false, true);
+	SetHlStyle(INK_CONST_STRING, Red);
+
+	SetHlStyle(INK_CONST_STRINGOP, Green);
+	SetHlStyle(INK_CONST_INT, Red);
+	SetHlStyle(INK_CONST_FLOAT, Magenta);
+	SetHlStyle(INK_CONST_HEX, Blue);
+	SetHlStyle(INK_CONST_OCT, Blue);
+
+	SetHlStyle(INK_OPERATOR, LtBlue);
+	SetHlStyle(INK_KEYWORD, LtBlue, true);
+	SetHlStyle(INK_UPP, Cyan);
+	SetHlStyle(PAPER_LNG, Color(255, 255, 224));
+	SetHlStyle(INK_ERROR, LtRed);
+	SetHlStyle(INK_PAR0, Black);
+	SetHlStyle(INK_PAR1, Green);
+	SetHlStyle(INK_PAR2, Magenta);
+	SetHlStyle(INK_PAR3, Brown);
+
+	SetHlStyle(INK_UPPER, Black);
+	SetHlStyle(INK_SQLBASE, Black);
+	SetHlStyle(INK_SQLFUNC, Black);
+	SetHlStyle(INK_SQLBOOL, Black);
+	SetHlStyle(INK_UPPMACROS, Black);
+
+	SetHlStyle(PAPER_BLOCK1, Blend(LtBlue, White, 240));
+	SetHlStyle(PAPER_BLOCK2, Blend(LtGreen, White, 240));
+	SetHlStyle(PAPER_BLOCK3, Blend(LtYellow, White, 240));
+	SetHlStyle(PAPER_BLOCK4, Blend(LtMagenta, White, 240));
+
+	SetHlStyle(INK_MACRO, Magenta);
+	SetHlStyle(PAPER_MACRO, Color(255, 255, 230));
+	SetHlStyle(PAPER_IFDEF, Color(230, 255, 255));
+	SetHlStyle(INK_IFDEF, Color(170, 170, 170));
+
+	SetHlStyle(PAPER_BRACKET0, LtYellow);
+	SetHlStyle(PAPER_BRACKET, Yellow);
+
+	SetHlStyle(INK_NORMAL, SColorText);
+	SetHlStyle(INK_DISABLED, SColorDisabled);
+	SetHlStyle(INK_SELECTED, SColorHighlightText);
+	SetHlStyle(PAPER_NORMAL, SColorPaper);
+	SetHlStyle(PAPER_READONLY, SColorFace);
+	SetHlStyle(PAPER_SELECTED, SColorHighlight);
+}
+
+
+#define HL_COLOR(x, a, b)    #x,
+static const char *s_hl_color[] = {
+#include "hl_color.i"
+};
+#undef  HL_COLOR
+
+#define HL_COLOR(a, x, b)    x,
+static const char *s_hl_name[] = {
+#include "hl_color.i"
+};
+#undef  HL_COLOR
+
+#define HL_COLOR(a, b, x)    x,
+static bool s_hl_font[] = {
+#include "hl_color.i"
+};
+#undef  HL_COLOR
+
+const CodeEditor::HlStyle& CodeEditor::GetHlStyle(int i)
+{
+	return hl_style[i];
+}
+
+const char *CodeEditor::GetHlName(int i)
+{
+	return s_hl_name[i];
+}
+
+bool CodeEditor::HasHlFont(int i)
+{
+	return s_hl_font[i];
+}
+
+void  CodeEditor::SetHlStyle(int i, Color c, bool bold, bool italic, bool underline)
+{
+	HlStyle& st = hl_style[i];
+	st.color = c;
+	st.bold = bold;
+	st.italic = italic;
+	st.underline = underline;
+	SetColor(LineEdit::INK_NORMAL, hl_style[INK_NORMAL].color);
+	SetColor(LineEdit::INK_DISABLED, hl_style[INK_DISABLED].color);
+	SetColor(LineEdit::INK_SELECTED, hl_style[INK_SELECTED].color);
+	SetColor(LineEdit::PAPER_NORMAL, hl_style[PAPER_NORMAL].color);
+	SetColor(LineEdit::PAPER_READONLY, hl_style[PAPER_READONLY].color);
+	SetColor(LineEdit::PAPER_SELECTED, hl_style[PAPER_SELECTED].color);
+}
+
+void CodeEditor::LoadHlStyles(const char *s)
+{
+	CParser p(s);
+	try {
+		while(!p.IsEof()) {
+			String id = p.ReadId();
+			Color c = ReadColor(p);
+			bool bold = false;
+			bool italic = false;
+			bool underline = false;
+			for(;;)
+				if(p.Id("bold"))
+					bold = true;
+				else
+				if(p.Id("italic"))
+					italic = true;
+				else
+				if(p.Id("underline"))
+					underline = true;
+				else
+					break;
+			for(int i = 0; i < HL_COUNT; i++)
+				if(id == s_hl_color[i]) {
+					SetHlStyle(i, c, bold, italic, underline);
+					break;
+				}
+			p.PassChar(';');
+		}
+	}
+	catch(CParser::Error) {
+		DefaultHlStyles();
+	}
+}
+
+String CodeEditor::StoreHlStyles()
+{
+	String r;
+	for(int i = 0; i < HL_COUNT; i++) {
+		const HlStyle& s = GetHlStyle(i);
+		r << Format("%-25s", s_hl_color[i]) << ' ' << FormatColor(s.color);
+		if(s.bold)
+			r << " bold";
+		if(s.italic)
+			r << " italic";
+		if(s.underline)
+			r << " underline";
+		r << ";\r\n";
+	}
+	return r;
+}
+
+void CodeEditor::PutI(WithDropChoice<EditString>& edit)
+{
+	edit.AddButton().SetMonoImage(CodeEditorImg::I()).Tip("Set word/selection (Ctrl+I)")
+	    <<= THISBACK1(SetI, &edit);
+}
+
+CodeEditor::CodeEditor() {
+	bracket_flash = true;
+	highlight_bracket_pos0 = 0;
+	bracket_start = 0;
+	stat_edit_time = 0;
+	last_key_time = Null;
+	CtrlLayout(findreplace);
+	AddFrame(bar);
+	bar.SetEditor(this);
+	UndoSteps(10000);
+	SetFont(Courier(16));
+	findreplace.find.AddButton().SetMonoImage(CtrlImg::smallright())
+		<<= THISBACK(FindWildcard);
+	findreplace.replace.AddButton().SetMonoImage(CtrlImg::smallright())
+		<<= THISBACK(ReplaceWildcard);
+	PutI(findreplace.find);
+	PutI(findreplace.replace);
+	findreplace.amend <<= THISBACK(Replace);
+	findreplace.cancel.Cancel();
+	findreplace.ok.Ok();
+	findreplace.findback <<= THISBACK(DoFindBack);
+	found = notfoundfw = notfoundbk = foundsel = false;
+	bar.WhenBreakpoint = THISBACK(ForwardWhenBreakpoint);
+	highlight = HIGHLIGHT_NONE;
+	hilite_scope = 0;
+	hilite_bracket = 2;
+	hilite_ifdef = 1;
+	indent_spaces = false;
+	indent_amount = GetTabSize();
+	no_parenthesis_indent = false;
+	sb.WithSizeGrip();
+	DefaultHlStyles();
+	sb.y.NoAutoHide();
+	sb.y.AddFrame(topsbbutton);
+	sb.y.AddFrame(topsbbutton1);
+	topsbbutton.Hide();
+	topsbbutton1.Hide();
+	highlight_bracket_pos = 10;
+	SetTimeCallback(-20, THISBACK(Periodic), TIMEID_PERIODIC);
+	auto_enclose = false;
+	mark_lines = true;
+	check_edited = false;
+}
+
+CodeEditor::~CodeEditor() {}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/CodeEditor/CodeEditor.h b/uppsrc/CodeEditor/CodeEditor.h
new file mode 100644
index 000000000..a118d684b
--- /dev/null
+++ b/uppsrc/CodeEditor/CodeEditor.h
@@ -0,0 +1,472 @@
+#ifndef IDEEDITOR_H
+#define IDEEDITOR_H
+
+//#include <ide/Common/Common.h>
+#include <CtrlLib/CtrlLib.h>
+
+
+NAMESPACE_UPP
+
+#define  LAYOUTFILE <CodeEditor/CodeEditor.lay>
+#include <CtrlCore/lay.h>
+
+#define IMAGEVECTOR Vector
+#define IMAGECLASS  CodeEditorImg
+#define IMAGEFILE   <CodeEditor/CodeEditor.iml>
+#include <Draw/iml_header.h>
+
+void FindWildcardMenu(Callback1<int> cb, Point p, bool tablf, Ctrl *owner = NULL);
+
+struct LineInfoRecord {
+	int    lineno;
+	String breakpoint;
+	int    count;
+	int    error;
+	int    firstedited;
+	int    edited;
+
+	LineInfoRecord() { error = 0; edited = 0; }
+};
+
+typedef Array<LineInfoRecord> LineInfo;
+
+void ClearErrors(LineInfo& li);
+
+struct LineInfoRemRecord : Moveable<LineInfoRemRecord> {
+	int    firstedited;
+	int    edited;
+};
+typedef Vector<LineInfoRemRecord> LineInfoRem;
+
+void Renumber(LineInfo& lf);
+void ClearBreakpoints(LineInfo& lf);
+void ValidateBreakpoints(LineInfo& lf);
+
+class CodeEditor;
+
+class EditorBar : public FrameLeft<Ctrl> {
+public:
+	virtual void Paint(Draw& w);
+	virtual void MouseMove(Point p, dword flags);
+	virtual void LeftDown(Point p, dword flags);
+	virtual void LeftDouble(Point p, dword flags);
+	virtual void RightDown(Point p, dword flags);
+
+private:
+	struct LnInfo : Moveable<LnInfo> {
+		int    lineno;
+		String breakpoint;
+		int    error;
+		int    firstedited;
+		int    edited;
+
+		LnInfo() { lineno = -1; error = 0; firstedited = 0; edited = 0; }
+	};
+	Vector<LnInfo>   li;
+	LineInfoRem      li_removed;
+
+	int              sy;
+	CodeEditor       *editor;
+	int              ptrline[2];
+	Image            ptrimg[2];
+	bool             bingenabled;
+	bool             hilite_if_endif;
+	bool             line_numbers;
+	bool             ignored_next_edit;
+	int              next_age;
+
+	String& PointBreak(int& y);
+	void    sPaintImage(Draw& w, int y, int fy, const Image& img);
+
+public:
+	Callback1<int> WhenBreakpoint;
+
+	void InsertLines(int i, int count);
+	void RemoveLines(int i, int count);
+	void ClearLines();
+
+	void Scroll()                          { Refresh(); }
+
+	void Renumber(int linecount);
+	void ClearBreakpoints();
+	void ValidateBreakpoints();
+
+	String  GetBreakpoint(int ln);
+	void    SetBreakpoint(int ln, const String& s);
+	void    SetEdited(int ln, int count = 1);
+	void    ClearEdited();
+	void    SetError(int ln, int err);
+	void    ClearErrors(int ln);
+
+	void SetEditor(CodeEditor *e)           { editor = e; }
+
+	LineInfo GetLineInfo() const;
+	void     SetLineInfo(const LineInfo& li, int total);
+	LineInfoRem & GetLineInfoRem()                   { return li_removed; }
+	void     SetLineInfoRem(pick_ LineInfoRem& li)   { li_removed = li; }
+
+	int      GetLineNo(int lineno) const;
+	int      GetNoLine(int line) const;
+
+	void     SetPtr(int line, const Image& img, int i);
+	void     HidePtr();
+
+	void     EnableBreakpointing(bool b)   { bingenabled = b; }
+	void     HiliteIfEndif(bool b)         { hilite_if_endif = b; Refresh(); }
+	void     LineNumbers(bool b);
+
+	bool     IsHiliteIfEndif() const       { return hilite_if_endif; }
+
+	EditorBar();
+	virtual ~EditorBar();
+};
+
+struct IdentPos {
+	int    begin;
+	int    end;
+	String ident;
+};
+
+Array<IdentPos> GetLineIdent(const char *line);
+Vector<Point>   GetLineString(const wchar *wline, bool& is_begin, bool& is_end);
+
+inline int  CharFilterCIdent(int i)  { return IsAlNum(i) || i == '_' ? i : 0; }
+inline bool islbrkt(int c)           { return c == '{' || c == '[' || c == '('; }
+inline bool isrbrkt(int c)           { return c == '}' || c == ']' || c == ')'; }
+inline bool isbrkt(int c)            { return islbrkt(c) || isrbrkt(c); }
+
+class CodeEditor : public LineEdit {
+	friend class EditorBar;
+
+public:
+	virtual bool Key(dword code, int count);
+	virtual void LeftDown(Point p, dword keyflags);
+	virtual void LeftDouble(Point p, dword keyflags);
+	virtual void MouseMove(Point p, dword keyflags);
+	virtual void Serialize(Stream& s);
+	void         CheckEdited(bool e = true) { check_edited = e; }
+	bool         GetCheckEdited()           { return check_edited; }
+
+	enum {
+		HIGHLIGHT_NONE = -1, HIGHLIGHT_CPP = 0, HIGHLIGHT_USC, HIGHLIGHT_JAVA, HIGHLIGHT_T, HIGHLIGHT_CALC,
+		HIGHLIGHT_COUNT
+	};
+
+protected:
+	virtual void HighlightLine(int line, Vector<Highlight>& h, int pos);
+	virtual void PreInsert(int pos, const WString& s);
+	virtual void PostInsert(int pos, const WString& s);
+	virtual void PreRemove(int pos, int size);
+	virtual void PostRemove(int pos, int size);
+	virtual void DirtyFrom(int line);
+	virtual void SelectionChanged();
+
+	virtual void ClearLines();
+	virtual void InsertLines(int line, int count);
+	virtual void RemoveLines(int line, int count);
+
+	virtual void NewScrollPos();
+
+	EditorBar   bar;
+	Vector<int> line2;
+
+	static Index<String> keyword[HIGHLIGHT_COUNT];
+	static Index<String> name[HIGHLIGHT_COUNT];
+	static Index<String> kw_upp_macros;
+	static Index<String> kw_sql_base;
+	static Index<String> kw_sql_bool;
+	static Index<String> kw_sql_func;
+
+	struct Isx : Moveable<Isx> {
+		int    line;
+		int    pos;
+
+		friend bool operator==(Isx a, Isx b) { return a.line == b.line && a.pos == b.pos; }
+		friend bool operator!=(Isx a, Isx b) { return !(a == b); }
+	};
+
+	struct IfState : Moveable<IfState> {
+		enum        { IF = '0', ELIF, ELSE, ELSE_ERROR, ENDIF_ERROR };
+		WString iftext;
+		short   ifline;
+		char    state;
+
+		bool operator==(const IfState& b) const {
+			return iftext == b.iftext && state == b.state && ifline == b.ifline;
+		}
+
+		IfState()                         { ifline = state = 0; }
+	};
+
+	struct SyntaxState {
+		int         line;
+
+		bool        comment;
+		bool        linecomment;
+		bool        string;
+		bool        linecont;
+		char        macro;
+		enum        { MACRO_OFF, MACRO_CONT, MACRO_END };
+
+		int         cl, bl, pl;
+
+		WithDeepCopy< Vector<int> > brk;
+		WithDeepCopy< Vector<int> > blk;
+		WithDeepCopy< Vector<int> > bid;
+		WithDeepCopy< Vector<Isx> > par;
+		WithDeepCopy< Vector<IfState> > ifstack;
+
+		int         stmtline;
+		int         endstmtline;
+		int         seline;
+		int         spar;
+		Color       uvscolor;
+
+		void  DropItem(int type);
+		bool  Drop(int type);
+		void  Clear();
+		bool  MatchHilite(const SyntaxState& st) const;
+		void  ScanSyntax(const wchar *ln, const wchar *e);
+
+		static Color IfColor(char ifstate);
+
+		SyntaxState()                         { Clear(); }
+	};
+
+	friend struct SyntaxState;
+
+	SyntaxState scache[4];
+	SyntaxState rm_ins;
+	char        rmb;
+	byte        hilite_bracket;
+	int         highlight_bracket_pos0;
+	int         highlight_bracket_pos;
+	bool        bracket_flash;
+	int         bracket_start;
+
+	byte    hilite_scope;
+	byte    hilite_ifdef;
+	bool    indent_spaces : 1;
+	bool    no_parenthesis_indent : 1;
+	int     indent_amount;
+	double  stat_edit_time;
+	Time    last_key_time;
+
+	bool    auto_enclose;
+	bool    mark_lines;
+	bool    check_edited;
+
+	struct FindReplace : WithIDEFindReplaceLayout<TopWindow> {
+		WString itext;
+		virtual bool Key(dword key, int count);
+	} findreplace;
+	
+	enum {
+		WILDANY = 16,
+		WILDONE,
+		WILDSPACE,
+		WILDNUMBER,
+		WILDID,
+	};
+
+	struct Found {
+		int     type;
+		WString text;
+	};
+
+	Array<Found> foundwild;
+	bool   foundsel;
+	bool   found, notfoundfw, notfoundbk;
+
+	int    iwc;
+
+	int    highlight;
+
+	struct HlSt;
+	
+	static void InitKeywords();
+
+	const wchar *HlString(HlSt& hls, const wchar *p);
+
+	SyntaxState ScanSyntax(int line);
+
+	void   CancelBracketHighlight(int& pos);
+	void   CheckBracket(int li, int pos, int ppos, int pos0, WString ln, int d, int limit);
+	void   CheckLeftBracket(int pos);
+	void   CheckRightBracket(int pos);
+	void   CheckBrackets();
+	void   OpenNormalFindReplace();
+	void   FindReplaceAddHistory();
+	void   FindWildcard();
+	void   ReplaceWildcard();
+	void   InsertWildcard(int c);
+
+	void   SetFound(int fi, int type, const WString& text);
+
+	int     Match(const wchar *f, const wchar *s, int line, bool we, bool icase, int fi = 0);
+	WString GetWild(int type, int& i);
+	WString GetReplaceText();
+	WString GetReplaceText(WString replace, bool wildcards);
+
+	bool   InsertRS(int chr, int count = 1);
+	void   IndentEnter(int count = 1);
+	void   SyntaxIndent(const SyntaxState& st, bool ndnt);
+	void   IndentInsert(int chr);
+
+	void   ForwardWhenBreakpoint(int i);
+
+	Color  BlockColor(int level);
+	void   Bracket(int pos, HlSt& hls);
+
+	bool   ToggleSimpleComment(int &start_line, int &end_line, bool usestars = true);
+	void   ToggleLineComments(bool usestars = false);
+	void   ToggleStarComments();
+	void   Enclose(const char *c1, const char *c2, int l = -1, int h = -1);
+
+	enum {
+		TIMEID_PERIODIC = Ctrl::TIMEID_COUNT,
+		TIMEID_COUNT,
+	};
+
+	void   Periodic();
+
+public:
+#define HL_COLOR(x, a, b)      x,
+	enum {
+#include "hl_color.i"
+		HL_COUNT
+	};
+#undef HL_COLOR
+
+	struct HlStyle {
+		Color color;
+		bool  bold;
+		bool  italic;
+		bool  underline;
+	};
+
+private:
+	HlStyle  hl_style[HL_COUNT];
+
+public:
+	Callback WhenSelection;
+	Callback1<const String&> WhenDbgView;
+	Callback WhenLeftDown;
+
+	FrameTop<Button>    topsbbutton;
+	FrameTop<Button>    topsbbutton1;
+
+	void   Clear()                    { LineEdit::Clear(); found = notfoundfw = notfoundbk = false; }
+
+	void   Highlight(int h)           { highlight = h; Refresh(); }
+	int    GetHighlight() const       { return highlight; }
+
+	const HlStyle& GetHlStyle(int i);
+	void           SetHlStyle(int i, Color c, bool bold = false, bool italic = false, bool underline = false);
+
+	void   CloseFindReplace();
+	void   FindReplace(bool pick_text);
+	bool   Find(bool back, const wchar *text, bool wholeword, bool ignorecase, bool wildcards,
+	            bool block);
+	bool   Find(bool back = false, bool blockreplace = false);
+	bool   GetStringRange(int cursor, int& b, int &e) const;
+	bool   GetStringRange(int& b, int &e) const { return GetStringRange(GetCursor(), b, e); }
+	bool   FindString(bool back);
+	bool   FindLangString(bool back);
+	void   Replace();
+	void   BlockReplace();
+	int    BlockReplace(WString find, WString replace, bool wholeword, bool ignorecase, bool wildcards);
+	void   MakeTabs();
+	void   MakeTabsOrSpaces(bool tabs);
+
+	void   CopyWord();
+	void   SwapChars();
+
+	void   SerializeFind(Stream& s);
+	bool   IsFindOpen() const                       { return findreplace.IsOpen(); }
+	void   FindClose()                              { findreplace.Close(); }
+
+	void   Goto();
+
+	void   DoFind();
+	void   DoFindBack();
+
+	void    FindWord(bool back);
+	WString GetI();
+	void    SetI(Ctrl *edit);
+	void    PutI(WithDropChoice<EditString>& edit);
+
+	void   MoveNextWord(bool sel);
+	void   MovePrevWord(bool sel);
+	void   MoveNextBrk(bool sel);
+	void   MovePrevBrk(bool sel);
+
+	String GetWord();
+
+	bool   GetWordPos(int pos, int& l, int& h);
+
+	void   DeleteWord();
+	void   DeleteWordBack();
+	void   SetLineSelection(int l, int h);
+	bool   GetLineSelection(int& l, int& h);
+	void   TabRight();
+	void   TabLeft();
+
+	Callback1<int> WhenBreakpoint;
+
+	LineInfo GetLineInfo() const                      { return bar.GetLineInfo(); }
+	void     SetLineInfo(const LineInfo& lf);
+	LineInfoRem GetLineInfoRem()                      { return LineInfoRem(bar.GetLineInfoRem(), 0); }
+	void     SetLineInfoRem(pick_ LineInfoRem& lf)    { bar.SetLineInfoRem(LineInfoRem(lf, 0)); }
+	double   GetStatEditTime() const                  { return stat_edit_time; }
+	void     Renumber()                               { bar.Renumber(GetLineCount()); }
+	void     ClearBreakpoints()                       { bar.ClearBreakpoints(); }
+	void     ValidateBreakpoints()                    { bar.ValidateBreakpoints(); }
+	int      GetLineNo(int line) const                { return bar.GetLineNo(line); }
+	int      GetNoLine(int line) const                { return bar.GetNoLine(line); }
+	void     SetPtr(int line, const Image& img, int i){ bar.SetPtr(line, img, i); }
+	void     HidePtr()                                { bar.HidePtr(); }
+	String   GetBreakpoint(int line)                  { return bar.GetBreakpoint(line); }
+	void     SetBreakpoint(int line, const String& b) { bar.SetBreakpoint(line, b); }
+	void     SetError(int line, int err)              { bar.SetError(line, err); }
+	void     ClearErrors(int line = -1)               { bar.ClearErrors(line); }
+	void     ClearEdited()                            { bar.ClearEdited(); }
+	int		 GetUndoCount()                           { return undo.GetCount(); }
+	void     GotoLine(int line);
+	void     EnableBreakpointing()                    { bar.EnableBreakpointing(true); }
+	void     DisableBreakpointing()                   { bar.EnableBreakpointing(false); }
+	void     Renumber2();
+	int      GetLine2(int i) const;
+
+	void     HiliteScope(byte b)                      { hilite_scope = b; Refresh(); }
+	void     HiliteBracket(byte b)                    { hilite_bracket = b; Refresh(); }
+	void     HiliteIfDef(byte b)                      { hilite_ifdef = b; Refresh(); }
+	void     HiliteIfEndif(bool b)                    { bar.HiliteIfEndif(b); }
+	void     IndentSpaces(bool is)                    { indent_spaces = is; }
+	void     IndentAmount(int ia)                     { indent_amount = ia; }
+	void     NoParenthesisIndent(bool b)              { no_parenthesis_indent = b; }
+	void     LineNumbers(bool b)                      { bar.LineNumbers(b); }
+	void     MarkLines(bool b)                        { mark_lines = b; }
+	bool     GetMarkLines()                           { return mark_lines; }
+	void     AutoEnclose(bool b)                      { auto_enclose = b; }
+
+	void     HideBar()                                { bar.Hide(); }
+
+	void     DefaultHlStyles();
+	void     LoadHlStyles(const char *s);
+	String   StoreHlStyles();
+
+	const char *GetHlName(int i);
+	bool        HasHlFont(int i);
+
+	typedef CodeEditor CLASSNAME;
+
+	CodeEditor();
+	virtual ~CodeEditor();
+
+	static const Index<String>& CppKeywords();
+};
+
+END_UPP_NAMESPACE
+
+#endif
diff --git a/uppsrc/CodeEditor/CodeEditor.iml b/uppsrc/CodeEditor/CodeEditor.iml
new file mode 100644
index 000000000..4189f437d
--- /dev/null
+++ b/uppsrc/CodeEditor/CodeEditor.iml
@@ -0,0 +1,27 @@
+IMAGE_ID(Breakpoint)
+IMAGE_ID(InvalidBreakpoint)
+IMAGE_ID(CondBreakpoint)
+IMAGE_ID(N0)
+IMAGE_ID(N1)
+IMAGE_ID(N2)
+IMAGE_ID(N3)
+IMAGE_ID(N4)
+IMAGE_ID(N5)
+IMAGE_ID(N6)
+IMAGE_ID(N7)
+IMAGE_ID(N8)
+IMAGE_ID(N9)
+IMAGE_ID(I)
+
+IMAGE_BEGIN_DATA
+IMAGE_DATA(120,156,237,149,219,14,131,32,12,134,123,99,150,109,62,52,143,230,155,177,72,4,177,252,109,193,225,97,201,154,52,42)
+IMAGE_DATA(124,244,64,11,210,72,35,121,79,146,120,166,42,55,77,83,80,191,188,11,235,188,115,46,113,92,231,57,182,70,100,163)
+IMAGE_DATA(102,188,201,6,31,89,78,53,124,230,163,138,109,181,159,241,100,249,96,108,218,79,137,5,124,170,151,195,156,89,103,145)
+IMAGE_DATA(59,162,153,162,10,235,214,102,2,34,54,147,34,25,191,97,195,38,163,119,94,108,230,63,103,153,143,42,94,178,95,17)
+IMAGE_DATA(79,200,65,19,87,238,41,140,55,178,128,79,245,114,75,124,140,235,214,76,28,54,149,55,16,82,79,172,24,243,126,41)
+IMAGE_DATA(90,20,227,207,119,227,227,183,165,123,122,129,6,122,107,55,19,106,50,202,158,124,254,138,49,20,95,41,149,137,230,70)
+IMAGE_DATA(45,195,119,26,91,229,224,138,90,193,124,251,205,99,147,171,218,49,81,180,70,27,211,90,77,75,8,113,93,91,23,5)
+IMAGE_DATA(80,252,201,0,199,199,90,120,173,82,109,237,59,208,203,74,84,186,201,106,156,216,45,213,110,11,113,91,31,7,158,71)
+IMAGE_DATA(43,184,94,55,54,138,175,148,138,68,247,84,238,76,70,26,219,202,5,255,204,51,236,149,114,131,68,251,159,71,36,15)
+IMAGE_DATA(122,242,68,247,94,50,191,50,7,243,251,0,237,34,20,21,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0)
+IMAGE_END_DATA(320, 14)
diff --git a/uppsrc/CodeEditor/CodeEditor.lay b/uppsrc/CodeEditor/CodeEditor.lay
new file mode 100644
index 000000000..e21dfd925
--- /dev/null
+++ b/uppsrc/CodeEditor/CodeEditor.lay
@@ -0,0 +1,14 @@
+LAYOUT(IDEFindReplaceLayout, 266, 118)
+	ITEM(Label, dv___0, SetLabel(t_("&Find:")).LeftPosZ(4, 46).TopPosZ(4, 19))
+	ITEM(WithDropChoice<EditString>, find, HSizePosZ(50, 4).TopPosZ(4, 19))
+	ITEM(Label, dv___2, SetLabel(t_("&Replace:")).LeftPosZ(4, 46).TopPosZ(28, 19))
+	ITEM(WithDropChoice<EditString>, replace, HSizePosZ(50, 4).TopPosZ(28, 19))
+	ITEM(Option, wholeword, SetLabel(t_("&Whole word")).LeftPosZ(8, 76).TopPosZ(58, 18))
+	ITEM(Option, ignorecase, SetLabel(t_("&Ignore case")).LeftPosZ(100, 76).TopPosZ(58, 18))
+	ITEM(Option, wildcards, SetLabel(t_("Wild&cards")).LeftPosZ(192, 68).TopPosZ(58, 18))
+	ITEM(Button, amend, SetLabel(t_("R&eplace")).LeftPosZ(4, 60).BottomPosZ(4, 24))
+	ITEM(Button, findback, SetLabel(t_("Find &Prev.")).LeftPosZ(70, 60).BottomPosZ(4, 24))
+	ITEM(Button, ok, SetLabel(t_("Find")).RightPosZ(70, 60).BottomPosZ(4, 24))
+	ITEM(Button, cancel, SetLabel(t_("Cancel")).RightPosZ(4, 60).BottomPosZ(4, 24))
+END_LAYOUT
+
diff --git a/uppsrc/CodeEditor/CodeEditor.upp b/uppsrc/CodeEditor/CodeEditor.upp
new file mode 100644
index 000000000..e24dad974
--- /dev/null
+++ b/uppsrc/CodeEditor/CodeEditor.upp
@@ -0,0 +1,19 @@
+description "The source files edit, derived from CtrlLib's LineEdit";
+
+optimize_speed;
+
+uses
+	CtrlLib;
+
+file
+	CodeEditor.h,
+	hl_color.i,
+	EditorBar.cpp,
+	Syntax.cpp,
+	Highlight.cpp,
+	FindReplace.cpp,
+	Lang.cpp,
+	CodeEditor.cpp,
+	CodeEditor.lay,
+	CodeEditor.iml;
+
diff --git a/uppsrc/CodeEditor/EditorBar.cpp b/uppsrc/CodeEditor/EditorBar.cpp
new file mode 100644
index 000000000..fa05787f9
--- /dev/null
+++ b/uppsrc/CodeEditor/EditorBar.cpp
@@ -0,0 +1,440 @@
+#include "CodeEditor.h"
+
+NAMESPACE_UPP
+
+void Renumber(LineInfo& lf) {
+	LineInfo tf;
+	int l = 0;
+	if(lf.GetCount()) {
+		LineInfoRecord& t = tf.Add();
+		t.breakpoint = lf[0].breakpoint;
+		t.lineno = 0;
+		t.count = lf[0].count;
+		t.error = lf[0].error;
+		t.firstedited = lf[0].firstedited;
+		t.edited = lf[0].edited;
+		l += t.count;
+	}
+	for(int i = 1; i < lf.GetCount(); i++) {
+		LineInfoRecord& r = lf[i];
+		if(r.breakpoint.IsEmpty() && r.error == 0 && r.edited == 0 &&
+			tf.Top().breakpoint.IsEmpty() && tf.Top().error == 0 && tf.Top().edited == 0)
+			tf.Top().count += r.count;
+		else {
+			LineInfoRecord& t = tf.Add();
+			t.breakpoint = r.breakpoint;
+			t.error = r.error;
+			t.firstedited = r.firstedited;
+			t.edited = r.edited;
+			t.count = r.count;
+			t.lineno = l;
+		}
+		l += r.count;
+	}
+	lf = tf;
+}
+
+void ClearBreakpoints(LineInfo& lf) {
+	for(int i = 0; i < lf.GetCount(); i++)
+		lf[i].breakpoint.Clear();
+}
+
+void ValidateBreakpoints(LineInfo& lf) {
+	for(int i = 0; i < lf.GetCount(); i++)
+		if(lf[i].breakpoint[0] == 0xe)
+			lf[i].breakpoint = "1";
+}
+
+void EditorBar::sPaintImage(Draw& w, int y, int fy, const Image& img)
+{
+	w.DrawImage(0, y + (fy - img.GetSize().cy) / 2, img);
+}
+
+void EditorBar::Paint(Draw& w) {
+	static Image (*numeri[])() = {
+		CodeEditorImg::N0, CodeEditorImg::N1, CodeEditorImg::N2, CodeEditorImg::N3, CodeEditorImg::N4,
+		CodeEditorImg::N5, CodeEditorImg::N6, CodeEditorImg::N7, CodeEditorImg::N8, CodeEditorImg::N9,
+	};
+	Size sz = GetSize();
+	w.DrawRect(0, 0, sz.cx, sz.cy, SColorLtFace);
+	if(!editor) return;
+	int fy = editor->GetFontSize().cy;
+	int hy = fy >> 1;
+	int y = 0;
+	int i = editor->GetScrollPos().y;
+	int cy = GetSize().cy;
+	bool hi_if = (hilite_if_endif && (editor->highlight == CodeEditor::HIGHLIGHT_CPP
+		|| editor->highlight == CodeEditor::HIGHLIGHT_JAVA));
+	Vector<CodeEditor::IfState> previf;
+	if(hi_if)
+		previf <<= editor->ScanSyntax(i).ifstack;
+	int ptri[2];
+	for(int q = 0; q < 2; q++)
+		ptri[q] = ptrline[q] >= 0 ? GetLineNo(ptrline[q]) : -1;
+	while(y < cy) {
+		String b;
+		int err = 0;
+		int edit = 0;
+		if(i < li.GetCount()) {
+			const LnInfo& l = li[i];
+			b = l.breakpoint;
+			err = l.error;
+			edit = l.edited;
+		}
+		if(line_numbers && i < editor->GetLineCount()) {
+			String n = AsString(i + 1);
+			for(int q = 0; q < 4 && q < n.GetLength(); q++) {
+				w.DrawImage(sz.cx - 8 - q * 6,
+					y + (fy - CodeEditorImg::N0().GetSize().cy) / 2,
+					numeri[n[n.GetLength() - 1 - q] - '0'],
+					// CodeEditorImg::Vector[n[n.GetLength() - 1 - q] - '0' + CodeEditorImg::I_N0],
+					Brown);
+			}
+		}
+		if(hi_if) {
+			Vector<CodeEditor::IfState> nextif;
+			if(i < li.GetCount())
+				nextif <<= editor->ScanSyntax(i + 1).ifstack;
+			int pifl = previf.GetCount(), nifl = nextif.GetCount();
+			int dif = max(pifl, nifl);
+			if(--dif >= 0) {
+				char p = (dif < pifl ? previf[dif].state : 0);
+				char n = (dif < nifl ? nextif[dif].state : 0);
+				int wd = min(2 * (dif + 1), sz.cx);
+				int x = sz.cx - wd;
+				Color cn = CodeEditor::SyntaxState::IfColor(n);
+				if(p == n)
+					w.DrawRect(x, y, 1, fy, cn);
+				else {
+					Color cp = CodeEditor::SyntaxState::IfColor(p);
+					w.DrawRect(x, y, 1, hy, cp);
+					w.DrawRect(x, y + hy, wd, 1, Nvl(cn, cp));
+					w.DrawRect(x, y + hy, 1, fy - hy, cn);
+					if(--dif >= 0) {
+						x = sz.cx - min(2 * (dif + 1), sz.cx);
+						if(!p)
+							w.DrawRect(x, y, 1, hy, CodeEditor::SyntaxState::IfColor(dif < pifl ? previf[dif].state : 0));
+						if(!n)
+							w.DrawRect(x, y + hy, 1, fy - hy, CodeEditor::SyntaxState::IfColor(dif < nifl ? nextif[dif].state : 0));
+					}
+				}
+			}
+			previf = nextif;
+		}
+		if(editor->GetMarkLines()) {
+			int width = CodeEditorImg::Breakpoint().GetWidth() >> 1;
+			if(edit)
+			{
+				int age = (int)(log((double)(editor->GetUndoCount() + 1 - edit)) * 30);
+				w.DrawRect(0, y, width, fy, Blend(LtBlue, SColorLtFace(), min(220, age)));
+			}
+			if(err)
+				w.DrawRect(width, y, width, fy, err == 1 ? LtRed : (err == 2 ? Color(255, 175, 0) : Green));
+		}
+
+		if(!b.IsEmpty())
+			sPaintImage(w, y, fy, b == "1"   ? CodeEditorImg::Breakpoint() :
+			                      b == "\xe" ? CodeEditorImg::InvalidBreakpoint() :
+			                                   CodeEditorImg::CondBreakpoint());
+		for(int q = 0; q < 2; q++)
+			if(ptri[q] == i)
+				sPaintImage(w, y, fy, ptrimg[q]);
+		y += fy;
+		i++;
+	}
+}
+
+void EditorBar::MouseMove(Point p, dword flags) {
+	if(editor)
+		editor->MouseMove(Point(0, p.y), flags);
+}
+
+void EditorBar::LeftDown(Point p, dword flags) {
+	if(editor)
+		editor->LeftDown(Point(0, p.y), flags);
+}
+
+String& EditorBar::PointBreak(int& y) {
+	y = minmax(y / editor->GetFont().Info().GetHeight()
+		+ editor->GetScrollPos().y, 0, editor->GetLineCount());
+	return li.At(y).breakpoint;
+}
+
+void EditorBar::LeftDouble(Point p, dword flags) {
+	if(!editor || !bingenabled) return;
+	String& b = PointBreak(p.y);
+	if(b.IsEmpty())
+		b = "1";
+	else
+		b.Clear();
+	WhenBreakpoint(p.y);
+	Refresh();
+}
+
+void EditorBar::RightDown(Point p, dword flags) {
+	return;
+	if(!editor || !bingenabled) return;
+	String& b = PointBreak(p.y);
+	EditText(b, "Conditional breakpoint", "Condition");
+	WhenBreakpoint(p.y);
+	Refresh();
+}
+
+void EditorBar::InsertLines(int i, int count) {
+	li.InsertN(minmax(i, 0, li.GetCount()), max(count, 0));
+	if(editor->GetCheckEdited()) {
+		if(editor->IsUndoOp() && li_removed.GetCount() >= count) {
+			for(int t = 0; t < count; t++) {
+				li.At(i + t).firstedited = li_removed[li_removed.GetCount() - count + t].firstedited;
+				li[i + t].edited = li_removed[li_removed.GetCount() - count + t].edited;
+			}
+			li_removed.Drop(count);
+			SetEdited(i + count, 1);
+			ignored_next_edit = true;
+		}
+		else {
+			if (li[i].firstedited == 0) {
+				bool fe = li[i].firstedited;
+				li.At(i + count).firstedited = fe;
+			}
+			SetEdited(i + 1, count);
+		}
+	}
+	Refresh();
+}
+
+void EditorBar::RemoveLines(int i, int count) {
+	if(editor->GetCheckEdited() && !editor->IsUndoOp()) {
+		for(int t = i - 1; t < i + count - 1; t++) {
+			LineInfoRemRecord& rm = li_removed.Add();
+			rm.firstedited = li[t].firstedited;
+			rm.edited = li[t].edited;
+		}
+		if(li.At(i + count - 1).firstedited)
+			next_age = li[i + count - 1].firstedited;
+		else
+			next_age = editor->GetUndoCount();
+	}
+	i = minmax(i, 0, li.GetCount());
+	li.Remove(i, minmax(count, 0, li.GetCount() - i));
+	Refresh();
+}
+
+void EditorBar::ClearLines() {
+	li.Clear();
+	li.Shrink();
+	li_removed.Clear();
+	li_removed.Shrink();
+	Refresh();
+}
+
+LineInfo EditorBar::GetLineInfo() const {
+	LineInfo lf;
+	int l = -2;
+	for(int i = 0; i < li.GetCount(); i++) {
+		const LnInfo& ln = li[i];
+		if(!ln.breakpoint.IsEmpty() || ln.error || ln.edited) {
+			LineInfoRecord& r = lf.Add();
+			r.lineno = ln.lineno;
+			r.count = 1;
+			r.breakpoint = ln.breakpoint;
+			r.error = ln.error;
+			r.firstedited = ln.firstedited;
+			r.edited = ln.edited;
+			l = -2;
+		}
+		else
+		if(ln.lineno != l) {
+			LineInfoRecord& r = lf.Add();
+			r.lineno = l = ln.lineno;
+			r.count = 1;
+		}
+		else
+			lf.Top().count++;
+		if(l >= 0) l++;
+	}
+	return lf;
+}
+
+void EditorBar::SetLineInfo(const LineInfo& lf, int total) {
+	li.Clear();
+	if(lf.GetCount() == 0) {
+		for(int i = 0; i < total; i++)
+			li.Add().lineno = i;
+	}
+	else {
+		for(int i = 0; i < lf.GetCount() && (total < 0 || li.GetCount() < total); i++) {
+			const LineInfoRecord& r = lf[i];
+			int l = r.lineno;
+			for(int j = r.count; j-- && li.GetCount() < total;) {
+				LnInfo& ln = li.Add();
+				ln.lineno = l;
+				ln.breakpoint = r.breakpoint;
+				ln.error = r.error;
+				ln.firstedited = r.firstedited;
+				ln.edited = r.edited;
+				if(l >= 0) l++;
+			}
+		}
+		while(li.GetCount() < total)
+			li.Add().lineno = -1;
+	}
+}
+
+void EditorBar::Renumber(int linecount) {
+	li.SetCount(linecount);
+	for(int i = 0; i < linecount; i++)
+		li[i].lineno = i;
+}
+
+void EditorBar::ClearBreakpoints() {
+	for(int i = 0; i < li.GetCount(); i++)
+		li[i].breakpoint.Clear();
+	Refresh();
+}
+
+void EditorBar::ValidateBreakpoints()
+{
+	for(int i = 0; i < li.GetCount(); i++)
+		if(li[i].breakpoint[0] == 0xe)
+			li[i].breakpoint = "1";
+	Refresh();
+}
+
+String EditorBar::GetBreakpoint(int ln)
+{
+	return ln < li.GetCount() ? li[ln].breakpoint : Null;
+}
+
+void EditorBar::SetBreakpoint(int ln, const String& s)
+{
+	li.At(ln).breakpoint = s;
+	WhenBreakpoint(ln);
+}
+
+void EditorBar::SetEdited(int ln, int count)
+{
+	if(ignored_next_edit) {
+		ignored_next_edit = false;
+		return;
+	}
+	int age = editor->GetUndoCount() + 1;
+	bool undo = editor->IsUndoOp();
+	for(int i = 0; i < count; i++) {
+		if(undo) {
+			if (li.At(ln + i).firstedited >= age - 1) {
+				li[ln + i].firstedited = 0;
+				li[ln + i].edited = 0;
+			}
+		}
+		else {
+			if(next_age) {
+				li[ln + i].firstedited = next_age;
+				li[ln + i].edited = age;
+				next_age = 0;
+			}
+			else {
+				if(li.At(ln + i).firstedited == 0)
+					li[ln + i].firstedited = age;
+				li[ln + i].edited = age;
+			}
+		}
+	}
+	Refresh();
+}
+
+void EditorBar::ClearEdited()
+{
+	for(int i = 0; i < li.GetCount(); i++) {
+		li.At(i).firstedited = 0;
+		li[i].edited = 0;
+	}
+	li_removed.Clear();
+	li_removed.Shrink();
+	Refresh();
+}
+
+void EditorBar::SetError(int ln, int err)
+{
+	li.At(ln).error = err;
+}
+
+void EditorBar::ClearErrors(int line)
+{
+	int count;
+	if(line < 0) {
+		line = 0;
+		count = li.GetCount();
+	}
+	else
+		count = line + 1;
+
+	for(int i = line; i < count; i++)
+		li[i].error = 0;
+}
+
+int  EditorBar::GetLineNo(int lineno) const {
+	for(int i = 0; i < li.GetCount(); i++) {
+		if(lineno <= li[i].lineno)
+			return i;
+	}
+	return lineno;
+}
+
+int  EditorBar::GetNoLine(int line) const {
+	int n = 0;
+	for(int i = 0; i < li.GetCount(); i++) {
+		if(li[i].lineno >= 0)
+			n = li[i].lineno;
+		if(i == line) return n;
+	}
+	return n;
+}
+
+void EditorBar::SetPtr(int line, const Image& img, int i)
+{
+	ASSERT(i >= 0 && i < 2);
+	ptrline[i] = line;
+	ptrimg[i] = img;
+	Refresh();
+}
+
+void EditorBar::HidePtr()
+{
+	ptrline[0] = ptrline[1] = -1;
+	Refresh();
+}
+
+void EditorBar::LineNumbers(bool b)
+{
+	line_numbers = b;
+	Width(b ? 27 : 12);
+	Refresh();
+}
+
+EditorBar::EditorBar() {
+	LineNumbers(false);
+	editor = NULL;
+	bingenabled = true;
+	hilite_if_endif = true;
+	line_numbers = false;
+	ignored_next_edit = false;
+	next_age = 0;
+}
+
+EditorBar::~EditorBar()
+{
+}
+
+void ClearErrors(LineInfo& li)
+{
+	for(int i = 0; i < li.GetCount(); i++)
+		li[i].error = 0;
+}
+
+void SetError(LineInfo& li, int line, int err)
+{
+	li.At(line).error = err;
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/CodeEditor/FindReplace.cpp b/uppsrc/CodeEditor/FindReplace.cpp
new file mode 100644
index 000000000..477eb5339
--- /dev/null
+++ b/uppsrc/CodeEditor/FindReplace.cpp
@@ -0,0 +1,520 @@
+#include "CodeEditor.h"
+
+NAMESPACE_UPP
+
+bool CodeEditor::FindReplace::Key(dword key, int cnt) {
+	if(key == K_CTRL_I) {
+		if(find.HasFocus()) {
+			find <<= itext;
+			return true;
+		}
+		if(replace.HasFocus()) {
+			replace <<= itext;
+			return true;
+		}
+	}
+	return TopWindow::Key(key, cnt);
+}
+
+
+void CodeEditor::SetFound(int fi, int type, const WString& text)
+{
+	Found& f = foundwild.At(fi);
+	f.type = type;
+	f.text = text;
+}
+
+int CodeEditor::Match(const wchar *f, const wchar *s, int line, bool we, bool ignorecase, int fi)
+{
+	const wchar *b = s;
+	int n = 0;
+	WString ln;
+	while(*f) {
+		if(*f == WILDANY) {
+			f++;
+			WString wild;
+			for(;;) {
+				int nn = Match(f, s, line, we, ignorecase, fi + 1);
+				if(nn >= 0) {
+					SetFound(fi, WILDANY, wild);
+					return int(s - b) + n + nn;
+				}
+				wild.Cat(*s ? *s : '\n');
+				if(!*s++) return -1;
+			}
+			return -1;
+		}
+		else
+		if(*f == WILDONE) {
+			if(!*s) return -1;
+			SetFound(fi++, WILDONE, WString(*s, 1));
+			s++;
+		}
+		else
+		if(*f == WILDSPACE) {
+			const wchar *wb = s;
+			if(*s != ' ' && *s != '\t') return -1;
+			s++;
+			while(*s == ' ' || *s == '\t')
+				s++;
+			SetFound(fi++, WILDSPACE, WString(wb, s));
+		}
+		else
+		if(*f == WILDNUMBER) {
+			const wchar *wb = s;
+			if(*s < '0' || *s > '9') return -1;
+			s++;
+			while(*s >= '0' && *s <= '9')
+				s++;
+			SetFound(fi++, WILDNUMBER, WString(wb, s));
+		}
+		else
+		if(*f == WILDID) {
+			const wchar *wb = s;
+			if(!iscib(*s)) return -1;
+			s++;
+			while(iscid(*s)) s++;
+			SetFound(fi++, WILDID, WString(wb, s));
+		}
+		else
+		if(*f == '\n') {
+			if(*s != '\0' || ++line >= GetLineCount()) return -1;
+			n += int(s - b) + 1;
+			ln = GetWLine(line);
+			s = b = ln;
+		}
+		else {
+			if(ignorecase ? ToUpper(*s) != ToUpper(*f) : *s != *f) return -1;
+			s++;
+		}
+		f++;
+	}
+	return we && iscid(*s) ? -1 : int(s - b) + n;
+}
+
+bool CodeEditor::Find(bool back, const wchar *text, bool wholeword, bool ignorecase,
+                     bool wildcards, bool block)
+{
+	WString ft;
+	const wchar *s = text;
+	while(*s) {
+		int c = *s++;
+		if(c == '\\') {
+			c = *s++;
+			if(c == '\0') break;
+			if(c == 'n')
+				ft.Cat('\n');
+			else
+			if(c == 't')
+				ft.Cat('\t');
+			else
+			if(c >= ' ')
+				ft.Cat(c);
+		}
+		else
+		if(c >= ' ')
+			if(wildcards)
+				ft.Cat(c == '*' ? WILDANY :
+					   c == '?' ? WILDONE :
+					   c == '%' ? WILDSPACE :
+					   c == '#' ? WILDNUMBER :
+					   c == '$' ? WILDID :
+								  c
+				);
+			else
+				ft.Cat(c);
+	}
+	foundwild.Clear();
+	if(ft.IsEmpty()) return false;
+	if(notfoundfw) MoveTextBegin();
+	if(notfoundbk) MoveTextEnd();
+	bool wb = wholeword ? iscid(*ft) : false;
+	bool we = wholeword ? iscid(*ft.Last()) : false;
+	int cursor = GetCursor();
+	int pos = cursor;
+	int line = GetLinePos(pos);
+	int linecount = GetLineCount();
+	WString ln = GetWLine(line);
+	const wchar *l = ln;
+	s = l + pos;
+	for(;;) {
+		for(;;) {
+			if(!wb || (s == l || !iscid(s[-1]))) {
+				int n = Match(ft, s, line, we, ignorecase);
+				if(n >= 0) {
+					int pos = GetPos(line, int(s - l));
+					if(!back || pos + n < cursor) {
+						foundsel = true;
+						SetSelection(pos, pos + n);
+						foundsel = false;
+						if(!block)
+							CenterCursor();
+						found = true;
+						return true;
+					}
+				}
+			}
+			if(back) {
+				if(s-- == l) break;
+			}
+			else
+				if(!*s++) break;
+		}
+		if(back) {
+			if(--line < 0) break;
+			ln = GetWLine(line);
+			l = ln;
+			s = ln.End();
+		}
+		else {
+			if(++line >= linecount) break;
+			ln = GetWLine(line);
+			l = s = ln;
+		}
+	}
+	if(back)
+		notfoundbk = true;
+	else
+		notfoundfw = true;
+	ClearSelection();
+	return false;
+}
+
+void CodeEditor::FindReplaceAddHistory()
+{
+	if(!IsNull(findreplace.find))
+		findreplace.find.AddHistory();
+	if(!IsNull(findreplace.replace))
+		findreplace.replace.AddHistory();
+}
+
+bool CodeEditor::Find(bool back, bool blockreplace)
+{
+	FindReplaceAddHistory();
+	if(Find(back, (WString)~findreplace.find, findreplace.wholeword,
+		    findreplace.ignorecase, findreplace.wildcards, blockreplace)) {
+		if(!blockreplace) {
+			Rect lr = GetLineScreenRect(GetLine(GetCursor()));
+			Size fsz = findreplace.GetRect().Size();
+			Rect r = GetTopCtrl()->GetRect();
+			int y = r.bottom - fsz.cy;
+			if(lr.bottom > y) y = r.top;
+			Rect wa = Ctrl::GetWorkArea();
+			findreplace.SetRect(RectC(wa.left + (wa.Width() - fsz.cx) / 2, y, fsz.cx, fsz.cy));
+			findreplace.amend.Enable();
+			if(!findreplace.IsOpen()) {
+				findreplace.NoCenter();
+				OpenNormalFindReplace();
+			}
+			SetFocus();
+		}
+		return true;
+	}
+	else {
+		CloseFindReplace();
+		return false;
+	}
+}
+
+WString CodeEditor::GetWild(int type, int& i)
+{
+	for(;;) {
+		if(i >= foundwild.GetCount()) return WString();
+		Found& f = foundwild[i++];
+		if(f.type == type) return f.text;
+	}
+}
+
+WString CodeEditor::GetReplaceText()
+{
+	return GetReplaceText(findreplace.replace.GetText(), findreplace.wildcards);
+}
+
+WString CodeEditor::GetReplaceText(WString rs, bool wildcards)
+{
+	int anyi = 0, onei = 0, spacei = 0, numberi = 0, idi = 0;
+	WString rt;
+	const wchar *s = rs;
+	while(*s) {
+		int c = *s++;
+		if(c == '\\') {
+			c = *s++;
+			if(c == '\0') break;
+			if(c == 'n')
+				rt.Cat('\n');
+			else
+			if(c == 't')
+				rt.Cat('\t');
+			else
+			if(c >= ' ')
+				rt.Cat(c);
+		}
+		else
+		if(c >= ' ') {
+			if(wildcards) {
+				if(c == '*')
+					rt.Cat(GetWild(WILDANY, anyi));
+				else
+				if(c == '?')
+					rt.Cat(GetWild(WILDONE, onei));
+				else
+				if(c == '%')
+					rt.Cat(GetWild(WILDSPACE, spacei));
+				else
+				if(c == '#')
+					rt.Cat(GetWild(WILDNUMBER, numberi));
+				else
+				if(c == '$')
+					rt.Cat(GetWild(WILDID, idi));
+				else
+				if(c == '@') {
+					c = *s++;
+					if(c == '\0') break;
+					if(c >= '1' && c <= '9') {
+						c -= '1';
+						rt.Cat(c < foundwild.GetCount() ? foundwild[c].text : WString());
+					}
+					else {
+						rt.Cat('@');
+						if(c >= ' ' && c < 255) rt.Cat(c);
+					}
+				}
+				else
+					rt.Cat(c);
+			}
+			else
+				rt.Cat(c);
+		}
+	}
+	return rt;
+}
+
+void CodeEditor::Replace()
+{
+	NextUndo();
+	FindReplaceAddHistory();
+	if(!found) return;
+	if(RemoveSelection()) {
+		Paste(GetReplaceText());
+		Find();
+	}
+}
+
+int CodeEditor::BlockReplace(WString find, WString replace, bool wholeword, bool ignorecase, bool wildcards)
+{
+	NextUndo();
+	int l, h;
+	if(!GetSelection(l, h)) return 0;
+	PlaceCaret(l);
+	int count = 0;
+	for(;;) {
+		if(!Find(false, find, wholeword, ignorecase, wildcards, true) || cursor >= h) break;
+		int hh, ll;
+		GetSelection(ll, hh);
+		CachePos(ll);
+		h = h - (hh - ll) + Paste(GetReplaceText(replace, wildcards));
+		count++;
+	}
+	SetSelection(l, h);
+	Refresh();
+	return count;
+}
+
+void CodeEditor::BlockReplace()
+{
+	BlockReplace(~findreplace.find, ~findreplace.replace, findreplace.wholeword,
+		findreplace.ignorecase, findreplace.wildcards);
+/*
+	NextUndo();
+	int l, h;
+	if(!GetSelection(l, h)) return;
+	PlaceCaret(l);
+	for(;;) {
+		if(!Find(false, true) || cursor >= h) break;
+		Refresh();
+		int hh, ll;
+		GetSelection(ll, hh);
+		CachePos(ll);
+		h = h - (hh - ll) + Paste(GetReplaceText());
+	}
+	SetSelection(l, h);
+*/
+}
+
+void CodeEditor::OpenNormalFindReplace()
+{
+	findreplace.itext = GetI();
+	findreplace.Title("Find / Replace");
+	findreplace.amend.Show();
+	findreplace.findback.Show();
+	findreplace.ok.SetLabel("Find");
+	findreplace.ok <<= THISBACK(DoFind);
+	findreplace.cancel <<= findreplace.WhenClose = THISBACK(CloseFindReplace);
+	findreplace.Open();
+}
+
+void CodeEditor::FindReplace(bool pick_text)
+{
+	CloseFindReplace();
+	findreplace.CenterOwner();
+	WString find_text;
+	int find_pos = -1;
+	if(pick_text)
+	{
+		WString s = GetSelection().ToWString();
+		if(!IsNull(s)) {
+			if(s.Find('\n') >= 0)
+				BeepExclamation();
+			else {
+				find_text = s;
+				int l;
+				GetSelection(l, find_pos);
+			}
+		}
+		else { // pick identifier / number at cursor
+			int l, h;
+			l = h = GetCursor();
+			while(l > 0 && CharFilterCIdent(GetChar(l - 1)))
+				l--;
+			while(h < GetLength() && CharFilterCIdent(GetChar(h)))
+				h++;
+			find_text = Get(l, h - l).ToWString();
+			find_pos = h;
+		}
+		findreplace.find <<= find_text;
+	}
+	if(IsSelection()) {
+		findreplace.itext = GetI();
+		findreplace.Title("Replace in selection");
+		findreplace.amend.Hide();
+		findreplace.findback.Hide();
+		findreplace.ok.SetLabel("Replace");
+		findreplace.ok <<= findreplace.Breaker(IDOK);
+		findreplace.cancel <<= findreplace.Breaker(IDCANCEL);
+		if(findreplace.Execute() == IDOK)
+		{
+			BlockReplace();
+		}
+	}
+	else {
+		if(find_pos >= 0)
+			SetCursor(find_pos);
+		OpenNormalFindReplace();
+		findreplace.find.SetWantFocus();
+	}
+}
+
+void CodeEditor::InsertWildcard(int c)
+{
+	iwc = c;
+}
+
+void FindWildcardMenu(Callback1<int> cb, Point p, bool tablf, Ctrl *owner)
+{
+	MenuBar menu;
+	menu.Add("One or more spaces", callback1(cb, '%'));
+	menu.Add("One or more any characters", callback1(cb, '*'));
+	menu.Add("C++ identifier", callback1(cb, '$'));
+	menu.Add("Number", callback1(cb, '#'));
+	menu.Add("Any character", callback1(cb, '?'));
+	if(tablf) {
+		menu.Separator();
+		menu.Add("Tab", callback1(cb, '\t'));
+		menu.Add("Line feed", callback1(cb, '\n'));
+	}
+	menu.Execute(owner, p);
+}
+
+void CodeEditor::FindWildcard()
+{
+	int l, h;
+	findreplace.find.GetSelection(l, h);
+	iwc = 0;
+	FindWildcardMenu(THISBACK(InsertWildcard), findreplace.find.GetPushScreenRect().TopRight(), true,
+	                 &findreplace);
+	if(iwc) {
+		findreplace.wildcards = true;
+		findreplace.find.SetFocus();
+		findreplace.find.SetSelection(l, h);
+		findreplace.find.RemoveSelection();
+		if(iwc == '\t') {
+			findreplace.find.Insert('\\');
+			findreplace.find.Insert('t');
+		}
+		else
+		if(iwc == '\n') {
+			findreplace.find.Insert('\\');
+			findreplace.find.Insert('n');
+		}
+		else
+			findreplace.find.Insert(iwc);
+	}
+}
+
+void CodeEditor::ReplaceWildcard()
+{
+	MenuBar menu;
+	menu.Add("Matched spaces", THISBACK1(InsertWildcard, '%'));
+	menu.Add("Matched one or more any characters", THISBACK1(InsertWildcard, '*'));
+	menu.Add("Matched C++ identifier", THISBACK1(InsertWildcard, '$'));
+	menu.Add("Matched number", THISBACK1(InsertWildcard, '#'));
+	menu.Add("Matched any character", THISBACK1(InsertWildcard, '?'));
+	menu.Separator();
+	for(int i = 1; i <= 9; i++)
+		menu.Add(Format("Matched wildcard %d", i), THISBACK1(InsertWildcard, i));
+	menu.Separator();
+	menu.Add("Tab", THISBACK1(InsertWildcard, 20));
+	menu.Add("Line feed", THISBACK1(InsertWildcard, 21));
+	int l, h;
+	findreplace.replace.GetSelection(l, h);
+	iwc = 0;
+	menu.Execute(&findreplace, findreplace.replace.GetPushScreenRect().TopRight());
+	if(iwc) {
+		findreplace.wildcards = true;
+		findreplace.replace.SetFocus();
+		findreplace.replace.SetSelection(l, h);
+		findreplace.replace.RemoveSelection();
+		if(iwc == 20) {
+			findreplace.replace.Insert('\\');
+			findreplace.replace.Insert('t');
+		}
+		else
+		if(iwc == 21) {
+			findreplace.replace.Insert('\\');
+			findreplace.replace.Insert('n');
+		}
+		else
+		if(iwc >= 1 && iwc <= 9) {
+			findreplace.replace.Insert('@');
+			findreplace.replace.Insert(iwc + '0');
+		}
+		else
+			findreplace.replace.Insert(iwc);
+	}
+}
+
+void CodeEditor::CloseFindReplace()
+{
+	findreplace.Close();
+}
+
+void CodeEditor::DoFind()
+{
+	Find();
+}
+
+void CodeEditor::DoFindBack()
+{
+	Find(true);
+}
+
+void CodeEditor::SerializeFind(Stream& s)
+{
+	s % findreplace.find;
+	findreplace.find.SerializeList(s);
+	s % findreplace.wholeword % findreplace.ignorecase % findreplace.wildcards;
+	s % findreplace.replace;
+	findreplace.replace.SerializeList(s);
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/CodeEditor/Highlight.cpp b/uppsrc/CodeEditor/Highlight.cpp
new file mode 100644
index 000000000..5fb59b8df
--- /dev/null
+++ b/uppsrc/CodeEditor/Highlight.cpp
@@ -0,0 +1,600 @@
+#include "CodeEditor.h"
+
+NAMESPACE_UPP
+
+#define LTIMING(x)  // RTIMING(x)
+
+bool cmps(const wchar *q, const char *s, int& n) {
+	const wchar *t = q;
+	while(*q)
+		if(*q++ != *s++)
+			return false;
+	n += int(q - t);
+	return *q == *s;
+}
+
+bool IsUpperString(const char *q)
+{
+	while(*q)
+	{
+		if(*q != '_' && (*q < '0' || *q > '9') && !IsUpper(*q))
+			return false;
+		q++;
+    }
+	return true;
+}
+
+#define UVSALERT      Color(255, 240, 240)
+#define UVSREPINSERT  Color(240, 240, 255)
+#define UVSYOUINSERT  Color(240, 255, 240)
+#define UVSDELETE     Color(240, 240, 240)
+
+Color GetUvsHighlight(const wchar *text, int& n) {
+	n = 0;
+	if(text[0] != '$' || text[1] != 'u' || text[2] != 'v' || text[3] != 's' || text[4] != ':' || text[5] != ' ')
+		return Null;
+	n = 6;
+	const wchar *q = text + 6;
+	if(cmps(q, "PENDING CONFLICT", n))
+		return Null;
+	if(cmps(q, "YOUR DELETE (REPOSITORY DELETE)", n))
+		return UVSALERT;
+	if(cmps(q, "END YOUR DELETE (REPOSITORY DELETE)", n))
+		return UVSDELETE;
+	if(cmps(q, "YOUR INSERT (REPOSITORY DELETE)", n))
+		return UVSALERT;
+	if(cmps(q, "END YOUR INSERT (REPOSITORY DELETE)", n))
+		return UVSDELETE;
+	if(cmps(q, "REPOSITORY DELETE (YOUR DELETE)", n))
+		return UVSALERT;
+	if(cmps(q, "END REPOSITORY DELETE (YOUR DELETE)", n))
+		return UVSDELETE;
+	if(cmps(q, "REPOSITORY INSERT (YOUR DELETE)", n))
+		return UVSALERT;
+	if(cmps(q, "END REPOSITORY INSERT (YOUR DELETE)", n))
+		return UVSDELETE;
+	if(cmps(q, "YOUR INSERT", n))
+		return UVSYOUINSERT;
+	if(cmps(q, "END YOUR INSERT", n))
+		return Null;
+	if(cmps(q, "YOUR DELETE", n))
+		return UVSDELETE;
+	if(cmps(q, "END YOUR DELETE", n))
+		return Null;
+	if(cmps(q, "REPOSITORY DELETE", n))
+		return UVSDELETE;
+	if(cmps(q, "END REPOSITORY DELETE", n))
+		return Null;
+	if(cmps(q, "REPOSITORY INSERT", n))
+		return UVSREPINSERT;
+	if(cmps(q, "END REPOSITORY INSERT", n))
+		return Null;
+	n = 0;
+	return Null;
+}
+
+struct CodeEditor::HlSt {
+	Vector<LineEdit::Highlight>& v;
+	LineEdit::Highlight          def;
+	int                          pos;
+
+	void Set(int pos, int count, const HlStyle& ink);
+	void SetPaper(int pos, int count, Color paper);
+	void SetInk(int pos, int count, Color ink);
+	void Put(int count, const HlStyle& ink)                  { Set(pos, count, ink); pos += count; }
+	void Put(const HlStyle& ink)                             { Put(1, ink); }
+
+	HlSt(Vector<LineEdit::Highlight>& v) : v(v) {
+		pos = 0;
+		def = v[0];
+		def.chr = '\t';
+		v.Top().chr = '\t';
+	}
+
+	~HlSt() {
+		for(int i = 0; i < v.GetCount(); i++)
+			if(v[i].chr == '_') {
+				v[i].font.NoBold();
+				v[i].font.NoItalic();
+			}
+	}
+};
+
+void CodeEditor::HlSt::Set(int pos, int count, const HlStyle& ink)
+{
+	if(pos + count > v.GetCount())
+		v.At(pos + count - 1, def);
+	while(count-- > 0) {
+		LineEdit::Highlight& x = v[pos++];
+		x.ink = ink.color;
+		if(ink.bold)
+			x.font.Bold();
+		if(ink.italic)
+			x.font.Italic();
+		if(ink.underline)
+			x.font.Underline();
+	}
+}
+
+void CodeEditor::HlSt::SetPaper(int pos, int count, Color paper)
+{
+	if(pos + count > v.GetCount())
+		v.At(pos + count - 1, def);
+	while(count-- > 0)
+		v[pos++].paper = paper;
+}
+
+void CodeEditor::HlSt::SetInk(int pos, int count, Color ink)
+{
+	if(pos + count > v.GetCount())
+		v.At(pos + count - 1, def);
+	while(count-- > 0)
+		v[pos++].ink = ink;
+}
+
+const wchar *CodeEditor::HlString(HlSt& hls, const wchar *p)
+{
+	hls.Put(hl_style[INK_CONST_STRING]);
+	const wchar delim = *p;
+	p++;
+	while(*p && *p != delim)
+		if(*p == '\\') {
+			const wchar *t = p++;
+			if(*p == 'x' || *p == 'X') {
+				p++;
+				if(IsXDigit(*p))
+					p++;
+				if(IsXDigit(*p))
+					p++;
+				hls.Put(int(p - t), hl_style[INK_CONST_STRINGOP]);
+			}
+			else
+			if(*p >= '0' && *p <= '7') {
+				p++;
+				if(*p >= '0' && *p <= '7') p++;
+				if(*p >= '0' && *p <= '7') p++;
+				hls.Put(int(p - t), hl_style[INK_CONST_STRINGOP]);
+			}
+			else {
+				hls.Put(hl_style[INK_CONST_STRINGOP]);
+				if(*p) {
+					hls.Put(hl_style[INK_CONST_STRINGOP]);
+					p++;
+				}
+			}
+		}
+		else
+		if(*p == '%')
+			if(p[1] == '%') {
+				hls.Put(2, hl_style[INK_CONST_STRING]);
+				p += 2;
+			}
+			else {
+				const wchar *t = p++;
+				while(!IsAlpha(*p) && *p && *p != '`' && *p != '\"' && *p != '\'' && *p != '\\')
+					p++;
+				while(IsAlpha(*p) && *p)
+					p++;
+				hls.Put(int(p - t), hl_style[INK_CONST_STRINGOP]);
+			}
+		else {
+			hls.Put(hl_style[INK_CONST_STRING]);
+			p++;
+		}
+	if(*p == delim)	{
+		hls.Put(hl_style[INK_CONST_STRING]);
+		p++;
+	}
+	return p;
+}
+
+Color CodeEditor::BlockColor(int level)
+{
+	if(hilite_scope == 1)
+		return  GetHlStyle(level & 1 ? PAPER_BLOCK1 : PAPER_NORMAL).color;
+	if(hilite_scope == 2) {
+		int q = level % 5;
+		return  GetHlStyle(q ? PAPER_BLOCK1 + q - 1 : PAPER_NORMAL).color;
+	}
+	return GetHlStyle(PAPER_NORMAL).color;
+}
+
+void CodeEditor::Bracket(int pos, HlSt& hls)
+{
+	if(pos == highlight_bracket_pos0 && hilite_bracket
+	   || pos == highlight_bracket_pos && (hilite_bracket == 1 || hilite_bracket == 2 && bracket_flash))
+			hls.SetPaper(hls.pos, 1,
+			             hl_style[pos == highlight_bracket_pos0 ? PAPER_BRACKET0 : PAPER_BRACKET].color);
+}
+
+Index<String> CodeEditor::keyword[HIGHLIGHT_COUNT];
+Index<String> CodeEditor::name[HIGHLIGHT_COUNT];
+Index<String> CodeEditor::kw_upp_macros;
+Index<String> CodeEditor::kw_sql_base;
+Index<String> CodeEditor::kw_sql_bool;
+Index<String> CodeEditor::kw_sql_func;
+
+const Index<String>& CodeEditor::CppKeywords()
+{
+	InitKeywords();
+	return keyword[0];
+}
+
+void CodeEditor::InitKeywords()
+{
+	if(keyword[0].GetCount() == 0)
+	{
+		static const char *cpp[] = {
+			"__asm", "else", "struct",
+			"enum", "switch", "auto", "__except", "template",
+			"explicit", "this",
+			"bool", "extern", "mutable", "thread",
+			"break", "false", "throw",
+			"case", "__fastcall", "namespace", "true",
+			"catch", "__finally", "new", "try",
+			"__cdecl", "float", "__try",
+			"char", "for", "operator", "typedef",
+			"class", "friend", "private", "typeid",
+			"const", "goto", "protected", "typename",
+			"const_cast", "if", "public", "union",
+			"continue", "inline", "register", "unsigned",
+			"__declspec", "__inline", "reinterpret_cast", "using",
+			"using", "default", "int", "return",
+			"delete", "__int8", "short", "__uuidof",
+			"dllexport", "__int16", "signed", "virtual",
+			"dllimport", "__int32", "sizeof", "void",
+			"do", "__int64", "static", "volatile",
+			"double", "__leave", "static_cast",
+			"dynamic_cast", "long", "__stdcall", "while",
+			NULL
+		};
+		static const char *upp[] = {
+			"byte", "word", "dword", "__countof", "pick_", "wchar", "NULL",
+			"int8", "uint8", "int16", "uint16", "int32", "uint32", "int64", "uint64", "qword",
+			"INTERLOCKED_", "INTERLOCKED", "ONCELOCK", "ONCELOCK_", "INITBLOCK", "EXITBLOCK",
+			NULL
+		};
+		static const char *usc[] = {
+			"void", "self", "if", "else", "while", "do", "case",
+			"default", "break", "return", "switch", "operator", "for",
+			"fn", "group", "ctrl", "subctrl", "template", "enum_property",
+			"raw", "int", "double", "String", "bool",
+			"Text", "Qtf", "Doc", "Font", "Color", "macro",
+			NULL
+		};
+		static const char *usclib[] = {
+			"Color", "Point", "Size", "Rect", "RectC",
+			"StdFont", "Arial", "Roman", "Courier", "GetImageSize",
+			"GetTextSize", "print", "Black", "Gray", "LtGray",
+			"WhiteGray", "White", "Red", "Green", "Brown", "Blue",
+			"Magenta", "Cyan", "Yellow", "LtRed", "LtGreen", "LtYellow",
+			"LtBlue", "LtMagenta", "LtCyan", "SBlack", "SGray", "SLtGray",
+			"SWhiteGray", "SWhite", "SRed", "SGreen", "SBrown", "SBlue",
+			"SMagenta", "SCyan", "SYellow", "SLtRed", "SLtGreen", "SLtYellow",
+			"SLtBlue", "SLtMagenta", "SLtCyan", "IntNull", "DblNullLim",
+			"DrawRect", "DrawText", "DrawSmartText", "DrawImage", "is_number",
+			"GetSmartTextSize", "GetQtfHeight", "DrawQtf",
+			"is_array", "is_map", "is_void", "int", "to_string", "count",
+			"len", "remove", "insert", "mid", "keys", "values", "exists",
+			"erase", "rand", "OpenFileOut", "OpenFileAppend", "OpenFileIn",
+			"GetMinSize", "GetStdSize",
+			NULL
+		};
+		static const char *java[] = {
+			"abstract", "boolean", "break", "byte", "case",
+			"catch", "char", "class", "const", "continue",
+			"default", "do", "double", "else", "extends",
+			"false", "final", "finally", "float", "for",
+			"goto", "if", "implements", "import", "instanceof",
+			"int", "interface", "long", "native", "new",
+			"null", "package", "private", "protected", "public",
+			"return", "short", "static", "super", "switch",
+			"synchronized", "this", "throw", "throws", "transient",
+			"true", "try", "void", "volatile", "while",
+			NULL
+		};
+		static const char *upp_macros[] = {
+			"CLASSNAME", "THISBACK", "THISBACK1", "THISBACK2",
+			"LOG", "LOGF", "DUMP", "DUMPC", "DUMPCC", "DUMPCCC",
+			"LOGBEGIN", "LOGEND", "LOGBLOCK", "LOGHEXDUMP",
+			"QUOTE", "XASSERT", "NEVER", "XNEVER", "CHECK", "XCHECK", "ASSERT",
+			"RLOG", "RLOGBEGIN", "RLOGEND", "RLOGBLOCK", "RLOGHEXDUMP", "RQUOTE",
+			"RLOGSRCPOS", "RDUMP", "RDUMPC",
+			"NAMESPACE_UPP", "END_UPP_NAMESPACE",
+			NULL
+		};
+		static const char *sql_base[] = {
+			"Select", "Update", "Insert", "Delete", "From",
+			"Join", "InnerJoin", "LeftJoin", "RightJoin", "FullJoin", "OuterJoin",
+			"Where", "On", "OrderBy", "GroupBy",
+			"Of", "As", "StartWith", "ConnectBy", "Having", "ForUpdate", "NoWait", "Limit",
+			"Offset", "Hint", "SQL",
+			NULL
+		};
+		static const char *sql_func[] = {
+			"Decode", "Distinct", "All", "SqlAll", "Count", "Descending",
+			"SqlMax", "SqlMin", "SqlSum", "Avg", "Stddev", "Variance",
+			"Greatest", "Least", "ConvertCharset", "ConvertAscii",
+			"Upper", "Lower", "Substr", "Instr", "Wild", "SqlDate", "AddMonths", "LastDay",
+			"MonthsBetween", "NextDay", "SqlNvl", "Prior", "NextVal", "CurrVal", "SqlArg",
+			NULL
+		};
+		static const char *sql_bool[] = {
+			"SqlIsNull", "NotNull", "Like", "LikeUpperAscii", "NotLike", "Between",
+			"NotBetween", "In", "NotIn", "Exists", "NotExists",
+			NULL
+		};
+		static const char *tfile[] = {
+			"T_",
+			NULL,
+		};
+		static const char *javan[] = {
+			NULL
+		};
+		static const char **kw[HIGHLIGHT_COUNT] = {
+			cpp, usc, java, tfile, usc
+		};
+		static const char **nm[HIGHLIGHT_COUNT] = {
+			upp, usclib, javan, javan, usclib
+		};
+		const char **q = NULL;
+		for(int i = 0; i < HIGHLIGHT_COUNT; i++) {
+			q = kw[i];
+			while(*q)
+				keyword[i].Add(*q++);
+			q = nm[i];
+			while(*q)
+				name[i].Add(*q++);
+		}
+		q = upp_macros;
+		while(*q)
+			kw_upp_macros.Add(*q++);
+		q = sql_base;
+		while(*q)
+			kw_sql_base.Add(*q++);
+		q = sql_func;
+		while(*q)
+			kw_sql_func.Add(*q++);
+		q = sql_bool;
+		while(*q)
+			kw_sql_bool.Add(*q++);
+	}
+}
+
+void CodeEditor::HighlightLine(int line, Vector<LineEdit::Highlight>& hl, int pos)
+{
+	LTIMING("HighlightLine");
+	if(highlight < 0 || highlight >= HIGHLIGHT_COUNT)
+		return;
+	InitKeywords();
+	WString text = GetWLine(line);
+	SyntaxState ss = ScanSyntax(line);
+	SyntaxState sm = ScanSyntax(line + 1);
+	HlSt hls(hl);
+	const wchar *p = text;
+	const wchar *e = text.End();
+	int uvsn;
+	Color c = GetUvsHighlight(text, uvsn);
+	if(uvsn) {
+		hls.SetInk(0, text.GetLength() + 1, Yellow);
+		hls.SetPaper(0, text.GetLength() + 1, Gray);
+		hls.pos += uvsn;
+		p += uvsn;
+		return;
+	}
+	else
+	if(highlight == HIGHLIGHT_CALC) {
+		if(line == GetLineCount() - 1 || *p == '$')
+			hls.SetPaper(0, text.GetLength() + 1, hl_style[PAPER_BLOCK1].color);
+	}
+	else
+		hls.SetPaper(0, text.GetLength() + 1,
+		             Nvl(ss.uvscolor, sm.macro ? hl_style[PAPER_MACRO].color : hl_style[PAPER_NORMAL].color));
+	int block_level = ss.bid.GetCount() - 1;
+	String cppid;
+	if(IsNull(ss.uvscolor) && !uvsn && !ss.comment && highlight != HIGHLIGHT_CALC) {
+		if(!sm.macro) {
+			int i = 0;
+			while(i < ss.bid.GetCount() - 1 && (i >= text.GetLength() || text[i] == '\t')) {
+				hls.SetPaper(ss.bid[i], ss.bid[i + 1] - ss.bid[i], BlockColor(i));
+				i++;
+			}
+			int t = ss.bid.GetCount() ? ss.bid[i] : 0;
+			hls.SetPaper(t, 1 + max(0, text.GetLength() - t), BlockColor(ss.bid.GetCount() - 1));
+		}
+		while(*p == ' ' || *p == '\t') {
+			p++;
+			hls.Put(hl_style[INK_NORMAL]);
+		}
+		if(*p == '#') {
+			static const char *pd[] = {
+				"define", "error", "if", "elif", "else", "endif",
+				"ifdef", "ifndef", "include", "line", "undef", "pragma"
+			};
+			static Index<String> macro;
+			if(macro.GetCount() == 0)
+				for(int i = 0; i < __countof(pd); i++)
+					macro.Add(pd[i]);
+			const wchar *q = p + 1;
+			while(*q == ' ' || *q == '\t')
+				q++;
+			StringBuffer id;
+			while(IsAlpha(*q))
+				id.Cat(*q++);
+			cppid = id;
+			hls.Put(macro.Find(cppid) < 0 ? 1 : int(q - p), hl_style[INK_MACRO]);
+			p = q;
+		}
+	}
+	int lindent = int(p - ~text);
+	int lbrace = -1;
+	int lbclose = -1;
+	Color lbcolor = Null;
+	bool is_comment = false;
+	while(p < e) {
+		int pair = MAKELONG(p[0], p[1]);
+		if(ss.linecomment && ss.linecont || pair == MAKELONG('/', '/')) {
+			hls.Put(text.GetLength() + 1 - hls.pos, hl_style[INK_COMMENT]);
+			is_comment = true;
+			break;
+		}
+		else
+		if(ss.comment)
+			if(pair == MAKELONG('*', '/')) {
+				hls.Put(2, hl_style[INK_COMMENT]);
+				p += 2;
+				ss.comment = false;
+			}
+			else {
+				hls.Put(hl_style[INK_COMMENT]);
+				p++;
+			}
+		else
+		if(pair == MAKELONG('/', '*')) {
+			hls.Put(2, hl_style[INK_COMMENT]);
+			p += 2;
+			ss.comment = true;
+			is_comment = true;
+		}
+		else
+		if(*p == '(') {
+			ss.brk.Add(')');
+			Bracket(int(p - text) + pos, hls);
+			hls.Put(hl_style[INK_PAR0 + max(ss.pl++, 0) % 4]);
+			p++;
+		}
+		else
+		if(*p == '{') {
+			ss.brk.Add('}');
+			Bracket(int(p - text) + pos, hls);
+			hls.Put(hl_style[INK_PAR0 + max(ss.cl++, 0) % 4]);
+			++block_level;
+			if(hls.pos < text.GetCount())
+				hls.SetPaper(hls.pos, text.GetCount() - hls.pos + 1, BlockColor(block_level));
+			p++;
+		}
+		else
+		if(*p == '[') {
+			ss.brk.Add(']');
+			Bracket(int(p - text) + pos, hls);
+			hls.Put(hl_style[INK_PAR0 + max(ss.bl++, 0) % 4]);
+			p++;
+		}
+		else
+		if(*p == ')' || *p == '}' || *p == ']') {
+			if(*p == '}' && hilite_scope)
+				hls.SetPaper(hls.pos, text.GetLength() + 1 - hls.pos, BlockColor(--block_level));
+			Bracket(int(p - text) + pos, hls);
+			int& l = *p == ')' ? ss.pl : *p == '}' ? ss.cl : ss.bl;
+			if(ss.brk.IsEmpty() || ss.brk.Pop() != *p || l <= 0) {
+				hls.Put(hl_style[INK_ERROR]);
+				ss.brk.Clear();
+				ss.cl = ss.bl = ss.pl = 0;
+			}
+			else
+				hls.Put(1, hl_style[INK_PAR0 + --l % 4]);
+			p++;
+		}
+		else
+		if(pair == MAKELONG('0', 'x') || pair == MAKELONG('0', 'X')) {
+			hls.Put(2, hl_style[INK_CONST_HEX]);
+			p += 2;
+			const wchar *t = p;
+			while(IsXDigit(*p))
+				p++;
+			hls.Put(int(p - t), hl_style[INK_CONST_HEX]);
+		}
+		else
+		if(IsDigit(*p)) {
+			const wchar *t = p;
+			int c = INK_CONST_INT;
+			if(*p == '0') c = INK_CONST_OCT;
+			while(IsDigit(*p)) p++;
+			if(*p == '.' || *p == 'e' || *p == 'E') {
+				c = INK_CONST_FLOAT;
+				p++;
+				if(*p == '-')
+					p++;
+			}
+			while(IsDigit(*p)) p++;
+			if(c == INK_CONST_OCT && p - t == 1)
+				c = INK_CONST_INT;
+			if(p - t > 0)
+				hls.Put(int(p - t), hl_style[c]);
+		}
+		else
+		if(*p == '\"' || *p == '\'')
+			p = HlString(hls, p);
+		else
+		if(pair == MAKELONG('t', '_') && p[2] == '(' && p[3] == '\"') {
+			int pos0 = hls.pos;
+			hls.Put(3, hl_style[INK_UPP]);
+			p = HlString(hls, p + 3);
+			if(*p == ')') {
+				hls.Put(hl_style[INK_UPP]);
+				p++;
+			}
+			hls.SetPaper(pos0, hls.pos - pos0, hl_style[PAPER_LNG].color);
+		}
+		else
+		if(pair == MAKELONG('t', 't') && p[3] == '(' && p[4] == '\"') {
+			int pos0 = hls.pos;
+			hls.Put(4, hl_style[INK_UPP]);
+			p = HlString(hls, p + 4);
+			if(*p == ')') {
+				hls.Put(hl_style[INK_UPP]);
+				p++;
+			}
+			hls.SetPaper(pos0, hls.pos - pos0, hl_style[PAPER_LNG].color);
+		}
+		else
+		if(iscib(*p)) {
+			const wchar *q = p;
+			StringBuffer id;
+			while(iscid(*q) && q < e)
+				id.Cat(*q++);
+			String iid = id;
+			hls.Put(int(q - p), keyword[highlight].Find(iid) >= 0 ? hl_style[INK_KEYWORD] :
+			                    name[highlight].Find(iid) >= 0 ? hl_style[INK_UPP] :
+			                    kw_upp_macros.Find(iid) >= 0 ? hl_style[INK_UPPMACROS] :
+			                    kw_sql_base.Find(iid) >= 0 ? hl_style[INK_SQLBASE] :
+			                    kw_sql_func.Find(iid) >= 0 ? hl_style[INK_SQLFUNC] :
+			                    kw_sql_bool.Find(iid) >= 0 ? hl_style[INK_SQLBOOL] :
+			                    IsUpperString(iid) && !sm.macro ? hl_style[INK_UPPER] :
+			                    hl_style[INK_NORMAL]);
+			p = q;
+		}
+		else {
+			hls.Put(strchr("!+-*^/%~&|=[]:?<>.", *p) ? hl_style[INK_OPERATOR] : hl_style[INK_NORMAL]);
+			p++;
+		}
+	}
+	if(hilite_ifdef && !IsNull(cppid) && !is_comment) {
+		if((cppid == "else" || cppid == "elif" || cppid == "endif") && !ss.ifstack.IsEmpty()) {
+			WStringBuffer ifln;
+			ifln.Cat(" // ");
+			ifln.Cat(ss.ifstack.Top().iftext);
+			if(ss.ifstack.Top().ifline && hilite_ifdef == 2) {
+				ifln.Cat(", line ");
+				ifln.Cat(FormatInt(ss.ifstack.Top().ifline));
+			}
+			ifln.Cat('\t');
+			int start = text.GetLength();
+			WString ifs(ifln);
+			hls.Set(start, ifs.GetLength(), hl_style[INK_IFDEF]);
+			for(int i = 0; i < ifs.GetCount(); i++)
+				hl[start + i].chr = ifs[i];
+		}
+	}
+	if(hilite_scope) {
+		if(lbrace >= 0 && lbclose < 0 && lbrace > lindent)
+			hls.SetPaper(lindent, lbrace - lindent, lbcolor);
+		if(lbrace < 0 && lbclose >= 0)
+			hls.SetPaper(lbclose, text.GetLength() + 1 - lbclose, lbcolor);
+	}
+	if(!IsNull(cppid) && (cppid == "else" || cppid == "elif" || cppid == "endif" || cppid == "if"
+	                      || cppid == "ifdef" || cppid == "ifndef"))
+	   hls.SetPaper(0, hls.v.GetCount(), hl_style[PAPER_IFDEF].color);
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/CodeEditor/Lang.cpp b/uppsrc/CodeEditor/Lang.cpp
new file mode 100644
index 000000000..c0c47293e
--- /dev/null
+++ b/uppsrc/CodeEditor/Lang.cpp
@@ -0,0 +1,204 @@
+#include "CodeEditor.h"
+
+NAMESPACE_UPP
+
+Array<IdentPos> GetLineIdent(const char *line)
+{
+	Array<IdentPos> out;
+	const char *p = line;
+	while(*p && *p != '\n')
+		if(*p == '\"' || *p == '\'')
+		{
+			char term = *p++;
+			while(*p && *p != term)
+				if(*p++ == '\\' && *p)
+					p++;
+			if(*p == term)
+				p++;
+		}
+		else if(*p == 's' && p[1] == '_' && p[2] == '(' && (IsAlpha(p[3]) || p[3] == '_'))
+		{
+			IdentPos& pos = out.Add();
+			pos.begin = int(p - line);
+			const char *b = (p += 3);
+			while(IsAlNum(*++p) || *p == '_')
+				;
+			pos.ident = String(b, p);
+			if(*p == ')')
+				p++;
+			pos.end = int(p - line);
+		}
+		else if(IsAlpha(*p) || *p == '_')
+		{
+			while(IsAlNum(*++p) || *p == '_')
+				;
+		}
+		else
+			p++;
+	return out;
+}
+
+Vector<Point> GetLineString(const wchar *wline, bool& is_begin, bool& is_end)
+{
+	Vector<Point> out;
+	const wchar *p = wline;
+	while(*p <= ' ' && *p && *p != '\n')
+		p++;
+	is_begin = (*p == '\"');
+	is_end = false;
+	while(*p && *p != '\n')
+	{
+		wchar term = *p;
+		if(term == '\"' || term == '\'')
+		{
+			int begin = int(p++ - wline);
+			while(*p && *p != '\n')
+				if(*p == term)
+				{
+					const wchar *lim = ++p;
+					while((byte)*p <= ' ' && *p && *p != '\n')
+						p++;
+					if(*p != term)
+					{
+						is_end = (*p == '\n' || *p == 0);
+						p = lim;
+						break;
+					}
+					p++;
+				}
+				else if(*p++ == '\\' && *p && *p != '\n')
+					p++;
+			if(term == '\"')
+				out.Add(Point(begin, int(p - wline)));
+		}
+		else
+			p++;
+	}
+	return out;
+}
+
+bool CodeEditor::GetStringRange(int cursor, int& b, int &e) const
+{
+	int cl = GetLine(cursor);
+	cursor -= GetPos(cl);
+	bool is_begin, is_end; //@@@@@@
+	Vector<Point> list = GetLineString(GetWLine(cl), is_begin, is_end);
+	int i = list.GetCount();
+	while(--i >= 0 && (list[i].x > cursor || list[i].y < cursor))
+		;
+	if(i < 0)
+		return false;
+	int bl = cl, bp = list[i].x;
+	int el = cl, ep = list[i].y;
+	while(is_begin && bl > 0)
+	{
+		list = GetLineString(GetWLine(bl - 1), is_begin, is_end);
+		if(list.IsEmpty() || !is_end)
+			break;
+		bl--;
+		bp = list.Top().x;
+	}
+	while(el + 1 < GetLineCount() && ep >= GetLineLength(el))
+	{
+		list = GetLineString(GetWLine(el + 1), is_begin, is_end);
+		if(list.IsEmpty() || !is_begin)
+			break;
+		el++;
+		ep = list[0].y;
+	}
+	b = GetPos(bl, bp);
+	e = GetPos(el, ep);
+	return b < e;
+}
+
+bool CodeEditor::FindString(bool back)
+{
+	int l, h;
+	if(!GetSelection(l, h)) h = GetCursor();
+	else h = (back ? l : h);
+	h -= GetPos(l = GetLine(h));
+	while(l >= 0 && l < GetLineCount())
+	{
+		bool is_begin, is_end;
+		Vector<Point> list = GetLineString(GetWLine(l), is_begin, is_end);
+		if(back)
+		{
+			int i = list.GetCount();
+			while(--i >= 0 && list[i].x >= h)
+				;
+			if(i >= 0)
+			{
+				h = list[i].x;
+				break;
+			}
+			h = 1000000;
+			--l;
+		}
+		else
+		{
+			int i = 0;
+			while(i < list.GetCount() && list[i].y <= h)
+				i++;
+			if(i < list.GetCount())
+			{
+				h = list[i].x;
+				break;
+			}
+			h = 0;
+			++l;
+		}
+	}
+	int b, e;
+	if(l < 0 || l >= GetLineCount() || !GetStringRange(GetPos(l, h), b, e))
+		return false;
+	SetSelection(b, e);
+	return true;
+}
+
+bool CodeEditor::FindLangString(bool back)
+{
+	int l, h;
+	if(!GetSelection(l, h)) h = GetCursor();
+	else h = (back ? l : h);
+	h -= GetPos(l = GetLine(h));
+	for(;;)
+	{
+		Array<IdentPos> list = GetLineIdent(GetUtf8Line(l));
+		int b, e;
+		if(back)
+		{
+			int i = list.GetCount();
+			while(--i >= 0 && list[i].begin >= h)
+				;
+			if(i < 0)
+			{
+				h = 1000000;
+				if(--l < 0)
+					break;
+				continue;
+			}
+			b = GetPos(l, list[i].begin);
+			e = GetPos(l, list[i].end);
+		}
+		else
+		{
+			int i = 0;
+			while(i < list.GetCount() && list[i].end <= h)
+				i++;
+			if(i >= list.GetCount())
+			{
+				h = 0;
+				if(++l >= GetLineCount())
+					break;
+				continue;
+			}
+			b = GetPos(l, list[i].begin);
+			e = GetPos(l, list[i].end);
+		}
+		SetSelection(b, e);
+		return true;
+	}
+	return false;
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/CodeEditor/Syntax.cpp b/uppsrc/CodeEditor/Syntax.cpp
new file mode 100644
index 000000000..fe3fdcdea
--- /dev/null
+++ b/uppsrc/CodeEditor/Syntax.cpp
@@ -0,0 +1,342 @@
+#include "CodeEditor.h"
+
+NAMESPACE_UPP
+
+Color GetUvsHighlight(const wchar *text, int& n);
+
+const wchar *eatstring(const wchar *s) {
+	int delim = *s++;
+	while(*s)
+		if(*s == '\\' && s[1])
+			s += 2;
+		else
+		if(*s == delim)
+			return s + 1;
+		else
+			s++;
+	return s;
+}
+
+inline const wchar *strnext(const wchar *p, const wchar *end, int ch) {
+	while(p < end) {
+		if(*p == ch) return p;
+		p++;
+	}
+	return NULL;
+}
+
+void CodeEditor::SyntaxState::Clear() {
+	spar = 0;
+	line = cl = bl = pl = 0;
+	linecont = linecomment = comment = string = false;
+	macro = MACRO_OFF;
+	brk.Clear();
+	blk.Clear();
+	bid.Clear();
+	bid.Add(0);
+	par.Clear();
+	stmtline = endstmtline = seline = -1;
+	uvscolor = Null;
+	ifstack.Clear();
+}
+
+const wchar *isstmt(const wchar *p) {
+	static const char *stmt[] = {
+		"if", "else", "while", "do", "for"
+	};
+	for(const char **q = stmt; q < stmt + __countof(stmt); q++) {
+		const char *k = *q;
+		const wchar *s = p;
+		for(;;) {
+			if(*k== '\0') {
+				if(!iscid(*s)) return s;
+				break;
+			}
+			if(*s != *k)
+				break;
+			s++;
+			k++;
+		}
+	}
+	return NULL;
+}
+
+Color CodeEditor::SyntaxState::IfColor(char c)
+{
+	switch(c)
+	{
+	case CodeEditor::IfState::IF:          return LtBlue();
+	case CodeEditor::IfState::ELIF:        return Gray();
+	case CodeEditor::IfState::ELSE:        return Green();
+	case CodeEditor::IfState::ELSE_ERROR:  return LtRed();
+	case CodeEditor::IfState::ENDIF_ERROR: return LtMagenta();
+	default:                               return Null;
+	}
+}
+
+static WString sReadLn(const wchar *p)
+{
+	WStringBuffer wbuf;
+	while(*p && *p <= ' ')
+		p++;
+	while(*p && !(*p == '/' && (p[1] == '/' || p[1] == '*'))) {
+		if(*p <= ' ') {
+			while(*++p && *p <= ' ')
+				;
+			if(*p && !(*p == '/' && (p[1] == '/' || p[1] == '*')))
+				wbuf.Cat(' ');
+		}
+		else
+			wbuf.Cat(*p++);
+	}
+	return wbuf;
+}
+
+void CodeEditor::SyntaxState::ScanSyntax(const wchar *ln, const wchar *e)
+{
+	string = false;
+	if(!linecont)
+		linecomment = false;
+	linecont = e > ln && e[-1] == '\\';
+	const wchar *p = ln;
+	int lindent = 0;
+	while(p < e && *p == '\t') {
+		p++;
+		lindent++;
+	}
+	while(p < e && (*p == ' ' || *p == '\t'))
+		p++;
+	int n;
+	Color c = GetUvsHighlight(p, n);
+	if(n) {
+		uvscolor = c;
+		p += n;
+	}
+	if(!comment && *p == '#') {
+		while(++p < e && (*p == ' ' || *p == '\t'))
+			p++;
+		const wchar *id = p;
+		while(p < e && iscid(*p))
+			p++;
+		int idlen = int(p - id);
+		if(id[0] == 'i' && id[1] == 'f'
+		&& (idlen == 2 || idlen == 5 && id[2] == 'd' && id[3] == 'e' && id[4] == 'f'
+		|| idlen == 6 && id[2] == 'n' && id[3] == 'd' && id[4] == 'e' && id[5] == 'f')) {
+			IfState& ifstate = ifstack.Add();
+			ifstate.state = IfState::IF;
+			ifstate.iftext = sReadLn(ln);
+			ifstate.ifline = line + 1;
+		}
+		switch(idlen)
+		{
+		case 6:
+			if(id[0] == 'd' && id[1] == 'e' && id[2] == 'f' && id[3] == 'i' && id[4] == 'n' && id[5] == 'e')
+				macro = SyntaxState::MACRO_CONT;
+			break;
+
+		case 4:
+			if(id[0] == 'e' && id[1] == 'l')
+				if(id[2] == 'i' && id[3] == 'f')
+					if(ifstack.GetCount() == 0) {
+						IfState& ifstate = ifstack.Add();
+						ifstate.ifline = 0;
+						ifstate.state = IfState::ELSE_ERROR;
+					}
+					else {
+						IfState& ifstate = ifstack.Top();
+						if(ifstate.state == IfState::IF || ifstate.state == IfState::ELIF) {
+							ifstate.state = IfState::ELIF;
+							ifstate.iftext = WString().Cat() << sReadLn(ln) << ", " << ifstate.iftext;
+						}
+						else
+							ifstate.state = IfState::ELSE_ERROR;
+					}
+				else
+				if(id[2] == 's' && id[3] == 'e')
+					if(ifstack.GetCount() == 0) {
+						IfState& ifstate = ifstack.Add();
+						ifstate.ifline = 0;
+						ifstate.state = IfState::ELSE_ERROR;
+					}
+					else {
+						IfState& ifstate = ifstack.Top();
+						if(ifstate.state == IfState::IF || ifstate.state == IfState::ELIF) {
+							ifstate.state = IfState::ELSE;
+							ifstate.iftext = "#else, " + ifstate.iftext;
+						}
+						else
+							ifstate.state = IfState::ELSE_ERROR;
+					}
+			break;
+
+		case 5:
+			if(id[0] == 'e' && id[1] == 'n' && id[2] == 'd' && id[3] == 'i' && id[4] == 'f')
+			{
+				int itop = ifstack.GetCount() - 1;
+				if(itop < 0) {
+					IfState& ifstate = ifstack.Add();
+					ifstate.ifline = 0;
+					ifstate.state = IfState::ENDIF_ERROR;
+				}
+				else if(ifstack[itop].state != IfState::ENDIF_ERROR)
+					ifstack.Trim(itop);
+			}
+			break;
+		}
+	}
+	if(macro == SyntaxState::MACRO_CONT && !(p < e && e[-1] == '\\'))
+		macro = SyntaxState::MACRO_END;
+	for(;;) {
+		if(comment) {
+			p = strnext(p, e, '*');
+			if(!p) break;
+			if(*++p == '/') {
+				comment = false;
+				p++;
+			}
+		}
+		else {
+			int pc = 0;
+			for(;;) {
+				if(p >= e) return;
+				const wchar *pp;
+				if(!iscid(pc) && (pp = isstmt(p)) != NULL) {
+					stmtline = line;
+					spar = 0;
+					pc = 0;
+					p = pp;
+				}
+				else {
+					int c = *p++;
+					if(c == '/') break;
+					if(c == '\'' || c == '\"') {
+						p = eatstring(p - 1);
+						if(p >= e) {
+							string = true;
+							return;
+						}
+					}
+					else
+					if(c == ';' && spar == 0) {
+						seline = stmtline;
+						endstmtline = line;
+						stmtline = -1;
+					}
+					else
+					if(c == '{') {
+						cl++;
+						brk.Add('}');
+						blk.Add() = line;
+						bid.Add(lindent + 1);
+						stmtline = -1;
+						par.Clear();
+					}
+					else
+					if(c == '}') {
+						if(brk.GetCount()) {
+							cl--;
+							brk.Drop();
+						}
+						if(blk.GetCount())
+							blk.Drop();
+						if(bid.GetCount())
+							bid.Drop();
+						stmtline = -1;
+						par.Clear();
+					}
+					else
+					if(c == '(') {
+						pl++;
+						brk.Add(')');
+						Isx& m = par.Add();
+						m.line = line;
+						m.pos = int(p - ln);
+						spar++;
+					}
+					else
+					if(c == '[') {
+						bl++;
+						brk.Add(']');
+						Isx& m = par.Add();
+						m.line = line;
+						m.pos = int(p - ln);
+						spar++;
+					}
+					else
+					if(c == ')') {
+						if(brk.GetCount()) {
+							pl--;
+							brk.Drop();
+						}
+						if(par.GetCount())
+							par.Drop();
+						spar--;
+					}
+					else
+					if(c == ']') {
+						if(brk.GetCount()) {
+							bl--;
+							brk.Drop();
+						}
+						if(par.GetCount())
+							par.Drop();
+						spar--;
+					}
+					pc = c;
+				}
+			}
+			if(*p == '/') {
+				linecomment = true;
+				return;
+			}
+			if(*p == '*') {
+				comment = true;
+				p++;
+			}
+		}
+	}
+}
+
+CodeEditor::SyntaxState CodeEditor::ScanSyntax(int line) {
+	SyntaxState st;
+	for(int i = 0; i < 4; i++)
+		if(line >= scache[i].line) {
+			st = scache[i];
+			break;
+		}
+	if(st.macro != SyntaxState::MACRO_CONT)
+		st.macro = SyntaxState::MACRO_OFF;
+	line = min(line, GetLineCount());
+	while(st.line < line) {
+		if(st.macro != SyntaxState::MACRO_CONT)
+			st.macro = SyntaxState::MACRO_OFF;
+		WString l = GetWLine(st.line);
+		st.ScanSyntax(l, l.End());
+		st.line++;
+		static int d[] = { 0, 100, 2000 };
+		for(int i = 0; i < 3; i++)
+			if(st.line == cline - d[i])
+				scache[i] = st;
+	}
+	scache[3] = st;
+	return st;
+}
+
+bool CodeEditor::SyntaxState::MatchHilite(const SyntaxState& st) const
+{
+	return comment == st.comment
+	    && linecont == st.linecont
+	    && linecomment == st.linecomment
+		&& macro == st.macro
+		&& cl == st.cl && bl == st.bl && pl == st.pl
+		&& IsEqual(brk, st.brk)
+		&& IsEqual(blk, st.blk)
+		&& IsEqual(bid, st.bid)
+		&& IsEqual(par, st.par)
+		&& IsEqual(ifstack, st.ifstack)
+		&& uvscolor == st.uvscolor
+		&& seline == st.seline
+		&& spar == st.spar;
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/CodeEditor/hl_color.i b/uppsrc/CodeEditor/hl_color.i
new file mode 100644
index 000000000..3912c8bce
--- /dev/null
+++ b/uppsrc/CodeEditor/hl_color.i
@@ -0,0 +1,43 @@
+//#BLITZ_APPROVE
+
+HL_COLOR(INK_NORMAL, "Normal text", 1)
+HL_COLOR(PAPER_NORMAL, "Normal background", 0)
+HL_COLOR(INK_SELECTED, "Selected text", 1)
+HL_COLOR(PAPER_SELECTED, "Selected background", 0)
+HL_COLOR(INK_DISABLED, "Disabled text", 1)
+HL_COLOR(PAPER_READONLY, "Read only background", 0)
+
+HL_COLOR(INK_COMMENT, "Comment text", 1)
+HL_COLOR(INK_CONST_STRING, "String constant text", 1)
+HL_COLOR(INK_OPERATOR, "Operator text", 1)
+HL_COLOR(INK_KEYWORD, "Keyword text", 1)
+HL_COLOR(INK_UPP, "U++ identifier text", 1)
+HL_COLOR(PAPER_LNG, "t_/t__ background", 0)
+HL_COLOR(INK_ERROR, "Umatched bracket", 1)
+HL_COLOR(INK_PAR0, "Brackets level 1", 1)
+HL_COLOR(INK_PAR1, "Brackets level 2", 1)
+HL_COLOR(INK_PAR2, "Brackets level 3", 1)
+HL_COLOR(INK_PAR3, "Brackets level 4", 1)
+HL_COLOR(INK_CONST_INT, "Decimal constant", 1)
+HL_COLOR(INK_CONST_FLOAT, "FP constant", 1)
+HL_COLOR(INK_CONST_HEX, "Hexadecimal constant", 1)
+HL_COLOR(INK_CONST_OCT, "Octal constant", 1)
+HL_COLOR(INK_CONST_STRINGOP, "Format field", 1)
+HL_COLOR(PAPER_BRACKET0, "Cursor bracket", 0)
+HL_COLOR(PAPER_BRACKET, "Matching bracket", 0)
+
+HL_COLOR(PAPER_BLOCK1, "Block level 1", 0)
+HL_COLOR(PAPER_BLOCK2, "Block level 2", 0)
+HL_COLOR(PAPER_BLOCK3, "Block level 3", 0)
+HL_COLOR(PAPER_BLOCK4, "Block level 4", 0)
+
+HL_COLOR(INK_MACRO, "#preprocesor text", 1)
+HL_COLOR(PAPER_MACRO, "#define background", 0)
+HL_COLOR(PAPER_IFDEF, "#if/#else/#endif background", 0)
+HL_COLOR(INK_IFDEF, "#if/#else/#endif comment", 1)
+
+HL_COLOR(INK_UPPER, "Upper text", 0)
+HL_COLOR(INK_SQLBASE, "Sql keywords", 1)
+HL_COLOR(INK_SQLFUNC, "Sql functions", 1)
+HL_COLOR(INK_SQLBOOL, "Sql boolean expressions", 1)
+HL_COLOR(INK_UPPMACROS, "U++ macros", 0)
diff --git a/uppsrc/CodeEditor/init b/uppsrc/CodeEditor/init
new file mode 100644
index 000000000..281e97fbc
--- /dev/null
+++ b/uppsrc/CodeEditor/init
@@ -0,0 +1,4 @@
+#ifndef _CodeEditor_icpp_init_stub
+#define _CodeEditor_icpp_init_stub
+#include "CtrlLib/init"
+#endif
diff --git a/uppsrc/CodeIndex/CodeIndex.upp b/uppsrc/CodeIndex/CodeIndex.upp
new file mode 100644
index 000000000..ac5475e01
--- /dev/null
+++ b/uppsrc/CodeIndex/CodeIndex.upp
@@ -0,0 +1,9 @@
+uses
+	CtrlLib,
+	CodeEditor;
+
+file
+	main.cpp;
+
+mainconfig
+	"" = "GUI";
diff --git a/uppsrc/CodeIndex/main.cpp b/uppsrc/CodeIndex/main.cpp
new file mode 100644
index 000000000..3ff1ecb14
--- /dev/null
+++ b/uppsrc/CodeIndex/main.cpp
@@ -0,0 +1,145 @@
+#include <CodeEditor/CodeEditor.h>
+
+using namespace Upp;
+
+struct CodeIndex : public TopWindow {
+	virtual bool Key(dword key, int count);
+
+	FileList   files;
+	CodeEditor view;
+	ToolBar    toolbar;
+	Splitter   split;
+	EditString search;
+
+	Index<String>                   exts;
+	Index<String>                   file;
+	VectorMap<String, Vector<int> > index;
+
+	void ScanFile(const String& f);
+	void Scan(const String& dir, Progress& pi, int64& amount);
+	void Scan();
+	void Serialize(Stream& s);
+	void ToolBar(Bar& bar);
+	void File();
+
+public:
+	typedef CodeIndex CLASSNAME;
+
+	CodeIndex();
+};
+
+void CodeIndex::ScanFile(const String& fn) {
+	DUMP(fn);
+	int fi = file.GetCount();
+	file.Add(fn);
+	String f = LoadFile(fn);
+	const char *q = f;
+	for(;;) {
+		int c = *q;
+		if(IsAlpha(c) || c == '_') {
+			const char *b = q++;
+			while(IsAlNum(*q) || *q == '_') q++;
+			Vector<int>& mf = index.GetAdd(String(b, q));
+			if(mf.GetCount() == 0 || mf.Top() != fi)
+				mf.Add(fi);
+		}
+		else {
+			if(!c) break;
+			q++;
+		}
+	}
+}
+
+int NoP(int c)
+{
+	return c == '%' ? 0 : c;
+}
+
+void CodeIndex::Scan(const String& dir, Progress& pi, int64& amount)
+{
+	FindFile ff(AppendFileName(dir, "*.*"));
+	while(ff) {
+		String p = AppendFileName(dir, ff.GetName());
+		if(ff.IsFile()) {
+			String ext = ToUpper(GetFileExt(ff.GetName()));
+			if(pi.StepCanceled())
+				throw Exc();
+			if(ext.GetCount() && exts.Find(ext.Mid(1)) >= 0)
+				ScanFile(p);
+			amount += ff.GetLength();
+		}
+		if(ff.IsFolder()) {
+			pi.SetText(AsString(amount >> 20) + " MB: " + Filter(p, NoP));
+			Scan(p, pi, amount);
+		}
+		ff.Next();
+	}
+}
+
+void CodeIndex::Scan()
+{
+	try {
+		Progress pi;
+		int64 amount = 0;
+		pi.AlignText(ALIGN_LEFT);
+		Scan("f:/exsrc", pi, amount);
+	}
+	catch(Exc) {}
+}
+
+void CodeIndex::ToolBar(Bar& bar)
+{
+	bar.Add(search, INT_MAX);
+}
+
+bool CodeIndex::Key(dword key, int count)
+{
+	if(key == K_ENTER) {
+		files.Clear();
+		int q = index.Find(~search);
+		if(q >= 0) {
+			Vector<int>& f = index[q];
+			for(int i = 0; i < f.GetCount(); i++)
+				files.Add(file[f[i]]);
+		}
+		return true;
+	}
+	return false;
+}
+
+void CodeIndex::File()
+{
+	view.Clear();
+	if(files.IsCursor())
+		view <<= LoadFile(files.GetCurrentName());
+}
+
+CodeIndex::CodeIndex()
+{
+	Add(split.Horz(files, view));
+	split.SetPos(2000);
+	files.AddFrame(toolbar);
+	view.SetReadOnly();
+	toolbar.Set(THISBACK(ToolBar));
+	exts = Split("C;CPP;H;HPP", ';');
+	files.WhenSel = THISBACK(File);
+}
+
+void CodeIndex::Serialize(Stream& s)
+{
+	s.Magic(0x76129812);
+	s % file;
+	s % index;
+}
+
+GUI_APP_MAIN
+{
+	CodeIndex app;
+	LoadFromFile(app);
+	if(app.index.GetCount() == 0)
+		app.Scan();
+	app.Run();
+	StoreToFile(app);
+//	Progress pi;
+//	b.Scan("f:/exsrc", &pi);
+}
diff --git a/uppsrc/Common/Common.upp b/uppsrc/Common/Common.upp
new file mode 100644
index 000000000..9a498b5a4
--- /dev/null
+++ b/uppsrc/Common/Common.upp
@@ -0,0 +1,2 @@
+file
+	TreeTypes.txt;
diff --git a/uppsrc/Common/Common.usc b/uppsrc/Common/Common.usc
new file mode 100644
index 000000000..e69de29bb
diff --git a/uppsrc/Common/TreeTypes.txt b/uppsrc/Common/TreeTypes.txt
new file mode 100644
index 000000000..e69de29bb
diff --git a/uppsrc/Common/dppignore.txt b/uppsrc/Common/dppignore.txt
new file mode 100644
index 000000000..8d8eb0bc3
--- /dev/null
+++ b/uppsrc/Common/dppignore.txt
@@ -0,0 +1,35 @@
+init_
+pick_
+WINAPI
+CALLBACK
+_CRTIMP2
+_CRTIMP
+__cdecl
+__fastcall
+WINOLEAPI
+FAR
+NEAR
+__CLR_OR_THIS_CALL
+__inline
+__CRTDECL
+_CRT_INSECURE_DEPRECATE_GLOBALS
+_CRT_INSECURE_DEPRECATE
+_STDEXT
+ISOLATION_AWARE_INLINE
+WINUSERAPI
+WINAPIV
+__in
+__out
+__inout
+_STD
+_MRTIMP2
+FARPROC
+APIENTRY
+_SCL_INSECURE_DEPRECATE
+__thiscall
+_CRTIMP_PURE
+_CRT_JIT_INTRINSIC
+__CLRCALL_OR_CDECL
+_CRTIMP2_PURE_DEBUG_IT
+_CRTIMP2_PURE
+__declspec
diff --git a/uppsrc/Common/ntl.style b/uppsrc/Common/ntl.style
new file mode 100644
index 000000000..b130d8bb8
--- /dev/null
+++ b/uppsrc/Common/ntl.style
@@ -0,0 +1 @@
+[2 $$0,0#00000000000000000000000000000000:Default][i448;a25;kKO9;*@(64) $$1,0#37138531426314131252341829483380:class][l288;2 $$2,0#27521748481378242620020725143825:desc][a83;*R6 $$3,0#31310162474203024125188417583966:caption][l288;i1121;b17;O9;~~~.1408;2 $$4,0#10431211400427159095818037425705:param][i448;a25;kKO9;*@(64)2 $$5,0#37138531426314131252341829483370:item][*+117 $$6,6#14700283458701402223321329925657:header][l288;a17;*1 $$7,7#70004532496200323422659154056402:requirement]
\ No newline at end of file
diff --git a/uppsrc/Common/src.style b/uppsrc/Common/src.style
new file mode 100644
index 000000000..96863f96d
--- /dev/null
+++ b/uppsrc/Common/src.style
@@ -0,0 +1 @@
+[2 $$0,0#00000000000000000000000000000000:Default][i448;a25;kKO9;*@(64)2 $$1,0#37138531426314131252341829483380:class][l288;2 $$2,2#27521748481378242620020725143825:desc][a83;*R6 $$3,0#31310162474203024125188417583966:caption][l288;i1121;b17;O9;~~~.1408;2 $$4,0#10431211400427159095818037425705:param][i448;a25;kKO9;*@(64)2 $$5,0#37138531426314131252341829483370:item][*+117 $$6,6#14700283458701402223321329925657:header][l416;2 $$7,7#5FF4870E4F78EC3AAAE34AB6EB9549FC:nested`-desc][l288;i448;a25;kO9;*2 $$8,8#6469BC754974A96B7D7F83BF1E6DEC95:nested`-class]
\ No newline at end of file
diff --git a/uppsrc/Common/tutorial.style b/uppsrc/Common/tutorial.style
new file mode 100644
index 000000000..2ead4140a
--- /dev/null
+++ b/uppsrc/Common/tutorial.style
@@ -0,0 +1 @@
+[2 $$0,0#00000000000000000000000000000000:Default][l288;i1120;a17;O9;~~~.1408;2 $$1,0#10431211400427159095818037425705:param][a83;*R6 $$2,5#31310162474203024125188417583966:caption][b83;*4 $$3,5#07864147445237544204411237157677:title][i288;O9;C2 $$4,6#40027414424643823182269349404212:item][b42;a42;2 $$5,5#45413000475342174754091244180557:text][l288;b17;a17;2 $$6,6#27521748481378242620020725143825:desc][l321;t246;C@5;1 $$7,7#20902679421464641399138805415013:code][b2503; $$8,0#65142375456100023862071332075487:separator][*@(0.0.255)2 $$9,0#83433469410354161042741608181528:base][t4167;C $$10,0#37138531426314131251341829483380:class][l288;a17;*1 $$11,11#70004532496200323422659154056402:requirement][i417;b42;a42;O9;~~~.416;2 $$12,12#10566046415157235020018451313112:tparam][b167;C2 $$13,13#92430459443460461911108080531343:item1][i288;a42;O9;C2 $$14,14#77422149456609303542238260500223:item2][*@2$(0.128.128) $$15,15#34511555403152284025741354420178:NewsDate][l321;*C$7;2 $$16,16#03451589433145915344929335295360:result][l321;b83;a83;*C$7;2 $$17,17#07531550463529505371228428965313:result`-line][l160;t4167;*C+117 $$18,5#88603949442205825958800053222425:package`-title][ $$19,0#53580023442335529039900623488521:gap][t4167;C2 $$20,20#70211524482531209251820423858195:class`-nested][b50;2 $$21,21#03324558446220344731010354752573:Par]
\ No newline at end of file
diff --git a/uppsrc/Core/AString.hpp b/uppsrc/Core/AString.hpp
new file mode 100644
index 000000000..4b18ef8c8
--- /dev/null
+++ b/uppsrc/Core/AString.hpp
@@ -0,0 +1,149 @@
+template <class B>
+void AString<B>::Cat(int c, int count)
+{
+	tchar *s = B::Insert(GetLength(), count, NULL);
+	while(count--)
+		*s++ = c;
+}
+
+template <class B>
+int AString<B>::Compare(const tchar *b) const
+{
+	const tchar *a = B::Begin();
+	const tchar *ae = End();
+	for(;;) {
+		if(a >= ae)
+			return *b == 0 ? 0 : -1;
+		if(*b == 0)
+			return 1;
+		int q = cmpval__(*a++) - cmpval__(*b++);
+		if(q)
+			return q;
+	}
+}
+
+template <class B>
+typename AString<B>::String AString<B>::Mid(int from, int count) const
+{
+	int l = GetLength();
+	if(from > l) from = l;
+	if(from < 0) from = 0;
+	if(count < 0)
+		count = 0;
+	if(from + count > l)
+		count = l - from;
+	return String(B::Begin() + from, count);
+}
+
+template <class B>
+int AString<B>::Find(int chr, int from) const
+{
+	ASSERT(from >= 0 && from <= GetLength());
+	const tchar *e = End();
+	const tchar *ptr = B::Begin();
+	for(const tchar *s = ptr + from; s < e; s++)
+		if(*s == chr)
+			return (int)(s - ptr);
+	return -1;
+}
+
+template <class B>
+int AString<B>::ReverseFind(int chr, int from) const
+{
+	ASSERT(from >= 0 && from <= GetLength());
+	if(from < GetLength()) {
+		const tchar *ptr = B::Begin();
+		for(const tchar *s = ptr + from; s >= ptr; s--)
+			if(*s == chr)
+				return (int)(s - ptr);
+	}
+	return -1;
+}
+
+template <class B>
+int AString<B>::ReverseFind(int chr) const
+{
+	return B::GetCount() ? ReverseFind(chr, B::GetCount() - 1) : -1;
+}
+
+template <class B>
+int AString<B>::Find(int len, const tchar *s, int from) const
+{
+	ASSERT(from >= 0 && from <= GetLength());
+	const tchar *ptr = B::Begin();
+	const tchar *p = ptr + from;
+	int l = GetLength() - len - from;
+	if(l < 0)
+		return -1;
+	const tchar *e = p + l;
+	len *= sizeof(tchar);
+	while(p <= e) {
+		if(memcmp(s, p, len) == 0)
+			return (int)(p - ptr);
+		p++;
+	}
+	return -1;
+}
+
+template <class B>
+bool AString<B>::StartsWith(const tchar *s, int len) const
+{
+	if(len > GetLength()) return false;
+	return memcmp(s, B::Begin(), len * sizeof(tchar)) == 0;
+}
+
+template <class B>
+bool AString<B>::EndsWith(const tchar *s, int len) const
+{
+	int l = GetLength();
+	if(len > l) return false;
+	return memcmp(s, B::Begin() + l - len, len * sizeof(tchar)) == 0;
+}
+
+template <class B>
+int AString<B>::Find(const tchar *s, int from) const
+{
+	return Find(strlen__(s), s, from);
+}
+
+inline int String0::Compare(const String0& s) const
+{
+#ifdef FAST_STRING_COMPARE
+	if((chr[KIND] | s.chr[KIND]) == 0) {
+	#ifdef CPU_64
+		uint64 a64 = SwapEndian64(q[0]);
+		uint64 b64 = SwapEndian64(s.q[0]);
+		if(a64 != b64)
+			return a64 < b64 ? -1 : 1;
+		uint32 a32 = SwapEndian32(w[2]);
+		uint32 b32 = SwapEndian32(s.w[2]);
+		if(a32 != b32)
+			return a32 < b32 ? -1 : 1;
+	#else
+		uint32 a32 = SwapEndian32(w[0]);
+		uint32 b32 = SwapEndian32(s.w[0]);
+		if(a32 != b32)
+			return a32 < b32 ? -1 : 1;
+		a32 = SwapEndian32(w[1]);
+		b32 = SwapEndian32(s.w[1]);
+		if(a32 != b32)
+			return a32 < b32 ? -1 : 1;
+		a32 = SwapEndian32(w[2]);
+		b32 = SwapEndian32(s.w[2]);
+		if(a32 != b32)
+			return a32 < b32 ? -1 : 1;
+	#endif
+		uint16 a16 = SwapEndian16(v[6]);
+		uint16 b16 = SwapEndian16(s.v[6]);
+		if(a16 != b16)
+			return a16 < b16 ? -1 : 1;
+		return 0;
+	}
+#endif
+/*	int l1 = GetLength();
+	int l2 = s.GetLength();
+	int q = memcmp(Begin(), s.Begin(), min(l1, l2));
+	int q = MemCmp_aligned__(Begin(), s.Begin(), min(l1, l2));
+	return q ? q : l1 - l2;*/
+	return LCompare(s);
+}
diff --git a/uppsrc/Core/AUTHORS b/uppsrc/Core/AUTHORS
new file mode 100644
index 000000000..f782e5b62
--- /dev/null
+++ b/uppsrc/Core/AUTHORS
@@ -0,0 +1,2 @@
+Mirek Fidler <cxl@ntllib.org>
+Tomas Rylek  <rylek@volny.cz>
\ No newline at end of file
diff --git a/uppsrc/Core/Algo.h b/uppsrc/Core/Algo.h
new file mode 100644
index 000000000..85a79e127
--- /dev/null
+++ b/uppsrc/Core/Algo.h
@@ -0,0 +1,1567 @@
+template <class T>
+inline int sgn(T a) { return a > 0 ? 1 : a < 0 ? -1 : 0; }
+
+template <class T>
+inline T tabs(T a) { return (a >= 0 ? a : -a); }
+
+template <class T>
+inline int cmp(const T& a, const T& b) { return a > b ? 1 : a < b ? -1 : 0; }
+
+template <class I>
+void Reverse(I start, I end)
+{
+	if(start != end && --end != start)
+		do
+			IterSwap(start, end);
+		while(++start != end && --end != start);
+}
+
+template <class C>
+void Reverse(C& container)
+{
+	Reverse(container.Begin(), container.End());
+}
+
+template <class T, class V>
+void Sum(V& sum, T ptr, T end)
+
+{
+	while(ptr != end)
+		sum += *ptr++;
+}
+
+template <class T>
+typename T::ValueType Sum(const T& c, const typename T::ValueType& init = typename T::ValueType())
+{
+	typename T::ValueType sum = init;
+	Sum(sum, c.Begin(), c.End());
+	return sum;
+}
+
+template <class T>
+typename T::ValueType Sum0(const T& c)
+{
+	typename T::ValueType sum = 0;
+	Sum(sum, c.Begin(), c.End());
+	return sum;
+}
+
+template <class T>
+T MinElement(T ptr, T end)
+{
+	ASSERT(ptr != end);
+	T min = ptr;
+	while(++ptr != end)
+		if(*ptr < *min) min = ptr;
+	return min;
+}
+
+template <class C>
+int MinIndex(const C& c)
+{
+	if(c.GetCount() == 0)
+		return -1;
+	typename C::ValueType m = c[0];
+	int mi = 0;
+	for(int i = 1; i < c.GetCount(); i++)
+		if(c[i] < m) {
+			m = c[i];
+			mi = i;
+		}
+	return mi;
+}
+
+template <class C>
+int MaxIndex(const C& c)
+{
+	if(c.GetCount() == 0)
+		return -1;
+	typename C::ValueType m = c[0];
+	int mi = 0;
+	for(int i = 1; i < c.GetCount(); i++)
+		if(c[i] > m) {
+			m = c[i];
+			mi = i;
+		}
+	return mi;
+}
+
+template <class T>
+const typename T::ValueType& Min(const T& c)
+{
+	return *MinElement(c.Begin(), c.End());
+}
+
+template <class T>
+T MaxElement(T ptr, T end)
+{
+	ASSERT(ptr != end);
+	T max = ptr;
+	while(++ptr != end)
+		if(*max < *ptr) max = ptr;
+	return max;
+}
+
+template <class T>
+const typename T::ValueType& Max(const T& c)
+{
+	return *MaxElement(c.Begin(), c.End());
+}
+
+template<class T>
+struct StdEqual
+{
+	bool operator () (const T& a, const T& b) const { return a == b; }
+};
+
+template<class T>
+struct StdLess {
+	bool operator () (const T& a, const T& b) const { return a < b; }
+};
+
+template<class T>
+struct StdGreater
+{
+	bool operator () (const T& a, const T& b) const { return a > b; }
+};
+
+/*
+template <class T, class C>
+bool Compare(T ptr1, T end1, T ptr2, T end2, const C& compare)
+{
+	for(; ptr1 != end1 && ptr2 != end2; ++ptr1, ++ptr2)
+		if(!compare(*ptr1, *ptr2)) return false;
+	return ptr1 == end1 && ptr2 == end2;
+}
+
+template <class T, class C>
+bool Compare(const T& c1, const T& c2, const C& compare)
+{
+	return Compare(c1.Begin(), c1.End(), c2.Begin(), c2.End(), compare);
+}
+
+template <class T>
+bool Compare(const T& c1, const T& c2)
+{
+	typedef typename T::ValueType VT;
+	return Compare(c1, c2, StdEqual<VT>());
+}
+*/
+
+template <class T, class C>
+bool IsEqual(T ptr1, T end1, T ptr2, T end2, const C& equal)
+{
+	for(; ptr1 != end1 && ptr2 != end2; ++ptr1, ++ptr2)
+		if(!equal(*ptr1, *ptr2)) return false;
+	return ptr1 == end1 && ptr2 == end2;
+}
+
+template <class T, class C>
+bool IsEqual(const T& c1, const T& c2, const C& equal)
+{
+	return IsEqual(c1.Begin(), c1.End(), c2.Begin(), c2.End(), equal);
+}
+
+template <class T>
+bool IsEqual(const T& c1, const T& c2)
+{
+	typedef typename T::ValueType VT;
+	return IsEqual(c1, c2, StdEqual<VT>());
+}
+
+template <class T, class V, class C>
+T Find(T ptr, T end, const V& value, const C& equal)
+{
+	while(ptr != end) {
+		if(equal(*ptr, value)) return ptr;
+		ptr++;
+	}
+	return NULL;
+}
+
+template <class T, class V>
+T Find(T ptr, T end, const V& value)
+{
+	return Find(ptr, end, value, StdEqual<T>());
+}
+
+template <class T, class V, class C>
+int FindIndex(const T& cont, const V& value, const C& equal)
+{
+	for(int i = 0; i < cont.GetCount(); i++)
+		if(equal(cont[i], value)) return i;
+	return -1;
+}
+
+template <class T, class V>
+int FindIndex(const T& cont, const V& value)
+{
+	for(int i = 0; i < cont.GetCount(); i++)
+		if(cont[i] == value) return i;
+	return -1;
+}
+
+template <class I, class K, class L>
+int BinFindIndex(I begin, I end, const K& key, const L& less)
+{
+	if(begin == end)
+		return 0;
+	int min = 0;
+	int max = end - begin;
+
+	while(min < max)
+	{
+		int mid = (max + min) >> 1;
+		if(less(*(begin + mid), key))
+			min = mid + 1;
+		else
+			max = mid;
+	}
+	return min;
+}
+
+template <class C, class K, class L>
+inline int BinFindIndex(const C& container, const K& key, const L& less)
+{
+	return BinFindIndex(container.Begin(), container.End(), key, less);
+}
+
+template <class C, class K>
+inline int BinFindIndex(const C& container, const K& key)
+{
+	typedef typename C::ValueType VT;
+	return BinFindIndex(container, key, StdLess<VT>());
+}
+
+template <class I, class K, class L>
+inline I BinFind(I begin, I end, const K& key, const L& less)
+{
+	return begin + BinFindIndex(begin, end, key, less);
+}
+
+template <class C, class K, class L>
+inline typename C::ConstIterator BinFind(const C& container, const K& key, const L& less)
+{
+	return BinFind(container.Begin(), container.End(), key, less);
+}
+
+template <class C, class K>
+inline typename C::ConstIterator BinFind(const C& container, const K& key)
+{
+	typedef typename C::ValueType VT;
+	return BinFind(container, key, StdLess<VT>());
+}
+
+// -------------------------------------------------------------------
+
+template <class I, class C>
+int IterCompare(I a, I a_end, I b, I b_end, const C& compare)
+{
+	for(;;) {
+		if(a >= a_end)
+			return b < b_end ? -1 : 0;
+		if(b >= b_end)
+			return a < a_end ? 1 : 0;
+		int q = compare(*a++, *b++);
+		if(q)
+			return q;
+	}
+}
+
+template <class C, class T, class L>
+int FindLowerBound(const C& v, int pos, int count, const T& val, const L& less)
+{
+	while(count > 0) {
+		int half = count >> 1;
+		int m = pos + half;
+		if(less(v[m], val)) {
+			pos = m + 1;
+			count = count - half - 1;
+		}
+		else
+			count = half;
+	}
+	return pos;
+}
+
+template <class I, class T, class L>
+I FindLowerBoundIter(I begin, I end, const T& val, const L& less)
+{
+	return begin + FindLowerBound(begin, 0, end - begin, val, less);
+}
+
+template <class I, class T>
+I FindLowerBoundIter(I begin, I end, const T& val)
+{
+	return begin + FindLowerBound(begin, 0, end - begin, val, StdLess<T>());
+}
+
+template <class C, class T, class L>
+int FindLowerBound(const C& v, const T& val, const L& less)
+{
+	return FindLowerBound(v, 0, v.GetCount(), val, less);
+}
+
+template <class C, class T>
+int FindLowerBound(const C& v, const T& val)
+{
+	return FindLowerBound(v, val, StdLess<typename C::ValueType>());
+}
+
+template <class C, class T, class L>
+int FindUpperBound(const C& v, int pos, int count, const T& val, const L& less)
+{
+	while(count > 0) {
+		int half = count >> 1;
+		int m = pos + half;
+		if(less(val, v[m]))
+			count = half;
+		else {
+			pos = m + 1;
+			count = count - half - 1;
+		}
+	}
+	return pos;
+}
+
+template <class I, class T, class L>
+I FindUpperBoundIter(I begin, I end, const T& val, const L& less)
+{
+	return begin + FindUpperBound(begin, 0, end - begin, val, less);
+}
+
+template <class I, class T>
+I FindUpperBoundIter(I begin, I end, const T& val)
+{
+	return begin + FindUpperBound(begin, 0, (int)(end - begin), val, StdLess<T>());
+}
+
+template <class C, class T, class L>
+int FindUpperBound(const C& v, const T& val, const L& less)
+{
+	return FindUpperBound(v, 0, v.GetCount(), val, less);
+}
+
+template <class C, class T>
+int FindUpperBound(const C& v, const T& val)
+{
+	return FindUpperBound(v, val, StdLess<typename C::ValueType>());
+}
+
+template <class C, class T, class L>
+int FindBinary(const C& v, const T& val, int pos, int count, const L& less)
+{
+	int i = FindLowerBound(v, pos, count, val, less);
+	return i < count && !less(val, v[i]) ? i : -1;
+}
+
+template <class I, class T, class L>
+I FindBinaryIter(I begin, I end, const T& val, const L& less)
+{
+	int q = FindUpperBound(begin, begin, end, val, less);
+	return q < 0 ? NULL : begin + q;
+}
+
+template <class I, class T>
+I FindBinaryIter(I begin, I end, const T& val)
+{
+	return FindBinaryIter(begin, end, val, StdLess<T>());
+}
+
+template <class C, class T, class L>
+int FindBinary(const C& v, const T& val, const L& less)
+{
+	return FindBinary(v, val, 0, v.GetCount(), less);
+}
+
+template <class C, class T>
+int FindBinary(const C& v, const T& val)
+{
+	return FindBinary(v, val, StdLess<typename C::ValueType>());
+}
+
+template <class I, class K, class X>
+int BinFindCompIndex(I begin, I end, const K& key, const X& comp)
+{
+	if(begin == end) // empty array
+		return 0;
+	int min = 0;
+	int max = end - begin;
+	while(min < max)
+	{
+		int mid = (max + min) >> 1;
+		if(comp.Compare(key, *(begin + mid)) > 0)
+			min = mid + 1;
+		else
+			max = mid;
+	}
+	return min;
+}
+
+template <class C, class K, class X>
+inline int BinFindCompIndex(const C& container, const K& key, const X& comp)
+{
+	return BinFindCompIndex(container.Begin(), container.End(), key, comp);
+}
+
+template <class I, class K, class X>
+inline I BinFindComp(I begin, I end, const K& key, const X& comp)
+{
+	return begin + BinFindCompIndex(begin, end, key, comp);
+}
+
+template <class C, class K, class X>
+inline typename C::ConstIterator BinFindComp(const C& container, const K& key, const X& comp)
+{
+	return BinFindComp(container.Begin(), container.End(), key, comp);
+}
+
+template <class T, class V>
+void Append(T& dst, V ptr, V end)
+{
+	for(; ptr != end; ++ptr)
+		dst.Add(*ptr);
+}
+
+template <class T, class V>
+void Append(T& dst, V ptr, int n)
+{
+	for(; n--; ++ptr)
+		dst.Add(*ptr);
+}
+
+template <class T, class V>
+void Append(T& dst, const V& src)
+{
+	Append(dst, src.Begin(), src.End());
+}
+
+template <class C, class I>
+C& FindAppend(C& dest, I begin, I end)
+{
+	for(; begin != end; ++begin)
+		dest.FindAdd(*begin);
+	return dest;
+}
+
+template <class C, class S>
+inline C& FindAppend(C& dest, const S& source)
+{
+	return FindAppend(dest, source.Begin(), source.End());
+}
+
+template <class C, class L>
+C& AppendSorted(C& dest, const C& src, const L& less)
+{
+	if(src.IsEmpty())
+		return dest;
+	if(dest.IsEmpty())
+	{
+		dest <<= src;
+		return dest;
+	}
+	if(!less(*src, dest.Top()))
+	{
+		dest.Append(src);
+		return dest;
+	}
+	if(!less(*dest, src.Top()))
+	{
+		dest.Insert(0, src);
+		return dest;
+	}
+	int dc = dest.GetCount();
+	int sc = src.GetCount();
+	dest.SetCount(dc + sc);
+	typename C::Iterator de = dest.End();
+	typename C::ConstIterator se = src.End(), pe = dest.GetIter(dc);
+	--se;
+	--pe;
+	for(;;)
+	{
+		if(less(*se, *pe))
+		{
+			*--de = *pe;
+			if(pe == dest.Begin())
+			{ // dest items are finished
+				*--de = *se;
+				while(se != src.Begin())
+					*--de = *--se;
+				return dest;
+			}
+			--pe;
+		}
+		else
+		{
+			*--de = *se;
+			if(se == src.Begin())
+				return dest; // src items are finished, dest items are in place
+			--se;
+		}
+	}
+	return dest;
+}
+
+template <class C>
+C& AppendSorted(C& dest, const C& src)
+{
+	typedef typename C::ValueType VT;
+	return AppendSorted(dest, src, StdLess<VT>());
+}
+
+template <class C, class L>
+C& UnionSorted(C& dest, const C& src, const L& less)
+{
+	if(src.IsEmpty())
+		return dest;
+	if(dest.IsEmpty())
+	{
+		dest <<= src;
+		return dest;
+	}
+	if(less(dest.Top(), *src))
+	{
+		dest.Append(src);
+		return dest;
+	}
+	if(less(src.Top(), *dest))
+	{
+		dest.Insert(0, src);
+		return dest;
+	}
+	int dc = dest.GetCount();
+	int sc = src.GetCount();
+	dest.SetCount(dc + sc);
+	typename C::Iterator de = dest.End();
+	typename C::ConstIterator se = src.End(), pe = dest.GetIter(dc);
+	--se;
+	--pe;
+	for(;;)
+	{
+		if(less(*se, *pe))
+		{
+			*--de = *pe;
+			if(pe == dest.Begin())
+			{ // dest items are finished
+				*--de = *se;
+				while(se != src.Begin())
+					*--de = *--se;
+				dest.Remove(0, dest.GetIndex(*de));
+				return dest;
+			}
+			--pe;
+		}
+		else
+		{
+			*--de = *se;
+			if(!less(*pe, *se))
+			{
+				if(pe == dest.Begin())
+				{
+					while(se != src.Begin())
+						*--de = *--se;
+					dest.Remove(0, dest.GetIndex(*de));
+					return dest;
+				}
+				--pe;
+			}
+			if(se == src.Begin())
+			{
+				int pi = (pe - dest.Begin()) + 1;
+				dest.Remove(pi, (de - dest.Begin()) - pi);
+				return dest; // src items are finished, dest items are in place
+			}
+			--se;
+		}
+	}
+	return dest;
+}
+
+template <class C>
+C& UnionSorted(C& dest, const C& src)
+{
+	typedef typename C::ValueType VT;
+	return UnionSorted(dest, src, StdLess<VT>());
+}
+
+template <class C, class L>
+C& RemoveSorted(C& from, const C& what, const L& less)
+{
+	if(from.IsEmpty() || what.IsEmpty() ||
+	   less(from.Top(), *what.Begin()) || less(what.Top(), *from.Begin()))
+		return from;
+	typename C::ConstIterator we = what.End(), wp = BinFind(what, from[0], less);
+	if(wp == we)
+		return from;
+	typename C::Iterator fp = from.Begin() + BinFindIndex(from, *wp), fe = from.End(), fd = fp;
+	if(fp == fe)
+	{
+		from.Clear();
+		return from;
+	}
+	for(;;)
+	{
+		while(less(*fp, *wp))
+		{
+			*fd = *fp;
+			++fd;
+			if(++fp == fe)
+			{
+				from.SetCount(fd - from.Begin());
+				return from;
+			}
+		}
+		if(less(*wp, *fp))
+		{
+			do
+				if(++wp == we)
+				{
+					Copy(fd, fp, fe);
+					fd += (fe - fp);
+					from.SetCount(fd - from.Begin());
+					return from;
+				}
+			while(less(*wp, *fp));
+		}
+		else
+		{
+			const typename C::ValueType& value = *fp;
+			while(!less(value, *fp))
+				if(++fp == fe)
+				{
+					from.SetCount(fd - from.Begin());
+					return from;
+				}
+			do
+				if(++wp == we)
+				{
+					Copy(fd, fp, fe);
+					fd += (fe - fp);
+					from.SetCount(fd - from.Begin());
+					return from;
+				}
+			while(!less(value, *wp));
+		}
+	}
+}
+
+template <class C>
+C& RemoveSorted(C& from, const C& what)
+{
+	typedef typename C::ValueType VT;
+	return RemoveSorted(from, what, StdLess<VT>());
+}
+
+template <class D, class S, class L>
+D& IntersectSorted(D& dest, const S& src, const L& less)
+{
+	if(dest.IsEmpty())
+		return dest;
+	if(src.IsEmpty() || less(dest.Top(), src[0]) || less(src.Top(), dest[0]))
+	{ // empty source set or disjunct intervals
+		dest.Clear();
+		return dest;
+	}
+	typename S::ConstIterator ss = BinFind(src, dest[0], less), se = src.End();
+	if(ss == se)
+	{
+		dest.Clear();
+		return dest;
+	}
+	typename D::ConstIterator ds = BinFind(dest, src[0], less), de = dest.End();
+	if(ds == de)
+	{
+		dest.Clear();
+		return dest;
+	}
+	typename D::Iterator d = dest.Begin();
+	int count = 0;
+	for(;;)
+	{
+		if(less(*ss, *ds))
+		{
+			if(++ss == se)
+				break;
+		}
+		else
+		{
+			if(!less(*ds, *ss))
+			{
+				*d = *ds;
+				++d;
+				count++;
+			}
+			if(++ds == de)
+				break;
+		}
+	}
+	dest.SetCount(count);
+	return dest;
+}
+
+template <class D, class S>
+D& IntersectSorted(D& dest, const S& src)
+{
+	typedef typename D::ValueType VT;
+	return IntersectSorted(dest, src, StdLess<VT>());
+}
+
+#ifdef UPP
+template <class T>
+void StreamContainer(Stream& s, T& cont)
+{
+	int n = cont.GetCount();
+	s / n;
+	if(n < 0) {
+		s.LoadError();
+		return;
+	}
+	if(s.IsLoading())
+	{
+		cont.Clear();
+		while(n--)
+			s % cont.Add();
+	}
+	else
+	{
+		for(typename T::Iterator ptr = cont.Begin(); n--; ++ptr)
+			s % *ptr;
+	}
+}
+#endif
+
+template <class I, class Less>
+void ForwardSort(I begin, I end, const Less& less)
+{
+	if(begin == end)
+		return;
+	I limit = end;
+	--limit;
+	while(!(begin == limit))
+	{
+		for(I best = limit, next = limit, ptr = limit;; best = ptr)
+			if(!less(*best, *--ptr))
+			{
+				if(ptr == begin)
+				{
+					begin = next;
+					break;
+				}
+			}
+			else
+			{
+				do
+				{
+					if(ptr == begin)
+					{
+						IterSwap(begin, best);
+						++begin;
+						goto NEXT_ITEM;
+					}
+				}
+				while(less(*best, *--ptr));
+				if(ptr == begin)
+				{
+					IterSwap(++begin, best);
+					++begin;
+					break;
+				}
+				next = ptr;
+				++next;
+			}
+	NEXT_ITEM:
+		;
+	}
+}
+
+template <class T, class Less>
+void ForwardSort(T& c, const Less& less)
+{
+	ForwardSort(c.Begin(), c.End(), less);
+}
+
+template <class T>
+void ForwardSort(T& c)
+{
+	typedef typename T::ValueType VT;
+	ForwardSort(c.Begin(), c.End(), StdLess<VT>());
+}
+
+enum
+{
+	__SORT_THRESHOLD = 16,
+	__SORT_MEDIAN_PASSES = 2,
+};
+
+template <class I, class Less>
+void Sort(I begin, I end, const Less& less)
+{
+	int count;
+	while((count = (int)(end - begin)) > __SORT_THRESHOLD) {
+		int expected = count >> 1, deviation = expected - (expected >> 8);
+		I b = begin, e = end, m = b + expected;
+		for(int pass = 1;; pass++) {
+			for(;; ++b) {
+				while(less(*m, *--e))
+					;
+				while(less(*b, *m))
+					++b;
+				if(!(b < e))
+					break;
+				if(m == b) m = e;
+				else if(m == e) m = b;
+				IterSwap(b, e);
+			}
+			if(pass >= __SORT_MEDIAN_PASSES)
+				break;
+			int pos = (int)(b - begin);
+			if(pos <= expected - deviation)
+				e = end;
+			else if(pos >= expected + deviation) {
+				e = b;
+				b = begin;
+			}
+			else
+				break;
+			m = b + 1 + (int)((unsigned)rand() % (e - b - 2));
+		}
+		if(b - begin < end - e) {
+			Sort(begin, b, less);
+			begin = b;
+		}
+		else {
+			Sort(b, end, less);
+			end = b;
+		}
+	}
+	if(count >= 2)
+		ForwardSort(begin, end, less);
+}
+
+template <class T, class Less>
+void Sort(T& c, const Less& less)
+{
+	Sort(c.Begin(), c.End(), less);
+}
+
+template <class T>
+void Sort(T& c)
+{
+	typedef typename T::ValueType VT;
+	Sort(c.Begin(), c.End(), StdLess<VT>());
+}
+
+template <class T>
+struct StableSortItem {
+	const T& value;
+	int      index;
+	
+	StableSortItem(const T& value, int index) : value(value), index(index) {}
+};
+
+template <class II, class T>
+struct StableSortIterator {
+	II          ii;
+	int        *vi;
+	
+	typedef StableSortIterator<II, T> Iter;
+
+	Iter&       operator ++ ()               { ++ii; ++vi; return *this; }
+	Iter&       operator -- ()               { --ii; --vi; return *this; }
+	Iter        operator +  (int i) const    { return Iter(ii + i, vi + i); }
+	Iter        operator -  (int i) const    { return Iter(ii - i, vi - i); }
+	int         operator -  (Iter b) const   { return (int)(ii - b.ii); }
+	bool        operator == (Iter b) const   { return ii == b.ii; }
+	bool        operator != (Iter b) const   { return ii != b.ii; }
+	bool        operator <  (Iter b) const   { return ii <  b.ii; }
+
+	StableSortItem<T> operator*() const      { return StableSortItem<T>(*ii, *vi); }
+
+	friend void IterSwap(Iter a, Iter b)     { IterSwap(a.ii, b.ii); IterSwap(a.vi, b.vi); }
+
+	StableSortIterator(II ii, int *vi) : ii(ii), vi(vi) {}
+};
+
+template <class T, class Less>
+struct StableSortLess_ {
+	const Less& less;
+
+	bool operator()(const StableSortItem<T>& a, const StableSortItem<T>& b) const {
+		if(less(a.value, b.value)) return true;
+		return less(b.value, a.value) ? false : a.index < b.index;
+	}
+	
+	StableSortLess_(const Less& less) : less(less) {}
+};
+
+template <class I, class Less, class T>
+void StableSort_(I begin, I end, const Less& less, const T *)
+{
+	int count = end - begin;
+	Buffer<int> h(count);
+	for(int i = 0; i < count; i++)
+		h[i] = i;
+	Sort(StableSortIterator<I, T>(begin, ~h),
+	     StableSortIterator<I, T>(end, ~h + count),
+	     StableSortLess_<T, Less>(less));
+}
+
+template <class I, class Less>
+void StableSort(I begin, I end, const Less& less)
+{
+	if(begin != end)
+		StableSort_(begin, end, less, &*begin);
+}
+
+template <class T, class Less>
+void StableSort(T& c, const Less& less)
+{
+	StableSort(c.Begin(), c.End(), less);
+}
+
+template <class T>
+void StableSort(T& c)
+{
+	StableSort(c.Begin(), c.End(), StdLess<typename T::ValueType>());
+}
+
+template <class T, class Cmp>
+struct StableSortLessCmp_ {
+	const Cmp& cmp;
+	bool operator()(const StableSortItem<T>& a, const StableSortItem<T>& b) const {
+		int q = SgnCompare(a.value, b.value);
+		return q ? q < 0 : a.index < b.index;
+	}
+	
+	StableSortLessCmp_(const Cmp& cmp) : cmp(cmp) {}
+};
+
+template <class I, class Cmp, class T>
+void StableSortCmp_(I begin, I end, const Cmp& cmp, const T *)
+{
+	int count = end - begin;
+	Buffer<int> h(count);
+	for(int i = 0; i < count; i++)
+		h[i] = i;
+	Sort(StableSortIterator<I, T>(begin, ~h),
+	     StableSortIterator<I, T>(end, ~h + count),
+	     StableSortLessCmp_<T, Cmp>(cmp));
+}
+
+template <class I, class Cmp>
+void StableSortCmp(I begin, I end, const Cmp& cmp)
+{
+	if(begin != end)
+		StableSortCmp_(begin, end, cmp, &*begin);
+}
+
+template <class T, class Cmp>
+void StableSortCmp(T& c, const Cmp& cmp)
+{
+	StableSortCmp(c.Begin(), c.End(), cmp);
+}
+
+template <class T>
+struct StdCmp {
+	int operator()(const T& a, const T& b) const {
+		return SgnCompare(a, b);
+	}
+};
+
+template <class T>
+void StableSortCmp(T& c)
+{
+	StableSort(c.Begin(), c.End(), StdCmp<typename T::ValueType>());
+}
+
+template <class II, class VI, class K>
+struct IndexSortIterator
+{
+	typedef IndexSortIterator<II, VI, K> Iter;
+
+	IndexSortIterator(II ii, VI vi) : ii(ii), vi(vi) {}
+
+	Iter&       operator ++ ()               { ++ii; ++vi; return *this; }
+	Iter&       operator -- ()               { --ii; --vi; return *this; }
+	const K&    operator *  () const         { return *ii; }
+	Iter        operator +  (int i) const    { return Iter(ii + i, vi + i); }
+	Iter        operator -  (int i) const    { return Iter(ii - i, vi - i); }
+	int         operator -  (Iter b) const   { return (int)(ii - b.ii); }
+	bool        operator == (Iter b) const   { return ii == b.ii; }
+	bool        operator != (Iter b) const   { return ii != b.ii; }
+	bool        operator <  (Iter b) const   { return ii <  b.ii; }
+	friend void IterSwap    (Iter a, Iter b) { IterSwap(a.ii, b.ii); IterSwap(a.vi, b.vi); }
+
+	II          ii;
+	VI          vi;
+};
+
+template <class II, class VI, class K, class Less>
+inline void __IndexSort(II begin, II end, VI pair, const Less& less, const K *)
+{
+	Sort(IndexSortIterator<II, VI, K>(begin, pair),
+		IndexSortIterator<II, VI, K>(end, pair + (end - begin)),
+		less);
+}
+
+template <class II, class VI, class Less>
+inline void IndexSort(II begin, II end, VI pair, const Less& less)
+{
+	if(begin != end)
+		__IndexSort(begin, end, pair, less, &*begin);
+}
+
+template <class KC, class VC, class Less>
+inline void IndexSort(KC& keys, VC& values, const Less& less)
+{
+	typedef typename KC::ValueType KT;
+	ASSERT(keys.GetCount() == values.GetCount());
+	if(keys.GetCount() >= 2)
+		__IndexSort(keys.Begin(), keys.End(), values.Begin(), less, (KT *)0);
+}
+
+template <class KC, class VC>
+inline void IndexSort(KC& keys, VC& values)
+{
+	typedef typename KC::ValueType KT;
+	if(keys.GetCount() >= 2)
+		__IndexSort(keys.Begin(), keys.End(), values.Begin(), StdLess<KT>(), (KT *)0);
+}
+
+template <class II, class VI, class K, class Less>
+inline void __StableIndexSort(II begin, II end, VI pair, const Less& less, const K *)
+{
+	StableSort(IndexSortIterator<II, VI, K>(begin, pair),
+		IndexSortIterator<II, VI, K>(end, pair + (end - begin)),
+		less);
+}
+
+template <class II, class VI, class Less>
+inline void StableIndexSort(II begin, II end, VI pair, const Less& less)
+{
+	if(begin != end)
+		__StableIndexSort(begin, end, pair, less, &*begin);
+}
+
+template <class KC, class VC, class Less>
+inline void StableIndexSort(KC& keys, VC& values, const Less& less)
+{
+	typedef typename KC::ValueType KT;
+	ASSERT(keys.GetCount() == values.GetCount());
+	if(keys.GetCount() >= 2)
+		__StableIndexSort(keys.Begin(), keys.End(), values.Begin(), less, (KT *)0);
+}
+
+template <class KC, class VC>
+inline void StableIndexSort(KC& keys, VC& values)
+{
+	typedef typename KC::ValueType KT;
+	if(keys.GetCount() >= 2)
+		__StableIndexSort(keys.Begin(), keys.End(), values.Begin(), StdLess<KT>(), (KT *)0);
+}
+
+template <class II, class VI, class K, class Cmp>
+inline void __StableIndexSortCmp(II begin, II end, VI pair, const Cmp& cmp, const K *)
+{
+	StableSortCmp(IndexSortIterator<II, VI, K>(begin, pair),
+	              IndexSortIterator<II, VI, K>(end, pair + (end - begin)),
+	              cmp);
+}
+
+template <class II, class VI, class Cmp>
+inline void StableIndexSortCmp(II begin, II end, VI pair, const Cmp& cmp)
+{
+	if(begin != end)
+		__StableIndexSortCmp(begin, end, pair, cmp, &*begin);
+}
+
+template <class KC, class VC, class Cmp>
+inline void StableIndexSortCmp(KC& keys, VC& values, const Cmp& cmp)
+{
+	typedef typename KC::ValueType KT;
+	ASSERT(keys.GetCount() == values.GetCount());
+	if(keys.GetCount() >= 2)
+		__StableIndexSortCmp(keys.Begin(), keys.End(), values.Begin(), cmp, (KT *)0);
+}
+
+template <class KC, class VC>
+inline void StableIndexSortCmp(KC& keys, VC& values)
+{
+	typedef typename KC::ValueType KT;
+	if(keys.GetCount() >= 2)
+		__StableIndexSortCmp(keys.Begin(), keys.End(), values.Begin(), StdCmp<KT>(), (KT *)0);
+}
+
+template <class II, class VI, class WI, class K>
+struct IndexSort2Iterator
+{
+	typedef IndexSort2Iterator<II, VI, WI, K> Iter;
+
+	IndexSort2Iterator(II ii, VI vi, WI wi) : ii(ii), vi(vi), wi(wi) {}
+
+	Iter&       operator ++ ()               { ++ii; ++vi; ++wi; return *this; }
+	Iter&       operator -- ()               { --ii; --vi; --wi; return *this; }
+	const K&    operator *  () const         { return *ii; }
+	Iter        operator +  (int i) const    { return Iter(ii + i, vi + i, wi + i); }
+	Iter        operator -  (int i) const    { return Iter(ii - i, vi - i, wi - i); }
+	int         operator -  (Iter b) const   { return (int)(ii - b.ii); }
+	bool        operator == (Iter b) const   { return ii == b.ii; }
+	bool        operator != (Iter b) const   { return ii != b.ii; }
+	bool        operator <  (Iter b) const   { return ii <  b.ii; }
+	friend void IterSwap    (Iter a, Iter b) { IterSwap(a.ii, b.ii); IterSwap(a.vi, b.vi); IterSwap(a.wi, b.wi); }
+
+	II          ii;
+	VI          vi;
+	WI          wi;
+};
+
+template <class II, class VI, class WI, class K, class Less>
+inline void __IndexSort2(II begin, II end, VI pair1, WI pair2, const Less& less, const K *)
+{
+	int count = end - begin;
+	Sort(IndexSort2Iterator<II, VI, WI, K>(begin, pair1, pair2),
+	     IndexSort2Iterator<II, VI, WI, K>(end, pair1 + count, pair2 + count),
+	     less);
+}
+
+template <class II, class VI, class WI, class Less>
+inline void IndexSort2(II begin, II end, VI pair1, WI pair2, const Less& less)
+{
+	if(begin != end)
+		__IndexSort2(begin, end, pair1, pair2, less, &*begin);
+}
+
+template <class KC, class VC, class WC, class Less>
+inline void IndexSort2(KC& keys, VC& values1, WC& values2, const Less& less)
+{
+	typedef typename KC::ValueType KT;
+	ASSERT(keys.GetCount() == values1.GetCount() && keys.GetCount() == values2.GetCount());
+	if(keys.GetCount() >= 2)
+		__IndexSort2(keys.Begin(), keys.End(), values1.Begin(), values2.Begin(), less, (KT *)0);
+}
+
+template <class KC, class VC, class WC>
+inline void IndexSort2(KC& keys, VC& values1, WC& values2)
+{
+	typedef typename KC::ValueType KT;
+	if(keys.GetCount() >= 2)
+		__IndexSort2(keys.Begin(), keys.End(), values1.Begin(), values2.Begin(), StdLess<KT>(), (KT *)0);
+}
+
+template <class II, class VI, class WI, class K, class Less>
+inline void __StableIndexSort2(II begin, II end, VI pair1, WI pair2, const Less& less, const K *)
+{
+	int count = end - begin;
+	StableSort(IndexSort2Iterator<II, VI, WI, K>(begin, pair1, pair2),
+	           IndexSort2Iterator<II, VI, WI, K>(end, pair1 + count, pair2 + count),
+	           less);
+}
+
+template <class II, class VI, class WI, class Less>
+inline void StableIndexSort2(II begin, II end, VI pair1, WI pair2, const Less& less)
+{
+	if(begin != end)
+		__StableIndexSort2(begin, end, pair1, pair2, less, &*begin);
+}
+
+template <class KC, class VC, class WC, class Less>
+inline void StableIndexSort2(KC& keys, VC& values1, WC& values2, const Less& less)
+{
+	typedef typename KC::ValueType KT;
+	ASSERT(keys.GetCount() == values1.GetCount() && keys.GetCount() == values2.GetCount());
+	if(keys.GetCount() >= 2)
+		__StableIndexSort2(keys.Begin(), keys.End(), values1.Begin(), values2.Begin(), less, (KT *)0);
+}
+
+template <class KC, class VC, class WC>
+inline void StableIndexSort2(KC& keys, VC& values1, WC& values2)
+{
+	typedef typename KC::ValueType KT;
+	if(keys.GetCount() >= 2)
+		__StableIndexSort2(keys.Begin(), keys.End(), values1.Begin(), values2.Begin(), StdLess<KT>(), (KT *)0);
+}
+
+template <class II, class VI, class WI, class K, class Cmp>
+inline void __StableIndexSort2Cmp(II begin, II end, VI pair1, WI pair2, const Cmp& cmp, const K *)
+{
+	int count = end - begin;
+	StableSortCmp(IndexSort2Iterator<II, VI, WI, K>(begin, pair1, pair2),
+	              IndexSort2Iterator<II, VI, WI, K>(end, pair1 + count, pair2 + count),
+	              cmp);
+}
+
+template <class II, class VI, class WI, class Cmp>
+inline void StableIndexSort2Cmp(II begin, II end, VI pair1, WI pair2, const Cmp& cmp)
+{
+	if(begin != end)
+		__StableIndexSort2Cmp(begin, end, pair1, pair2, cmp, &*begin);
+}
+
+template <class KC, class VC, class WC, class Cmp>
+inline void StableIndexSort2Cmp(KC& keys, VC& values1, WC& values2, const Cmp& cmp)
+{
+	typedef typename KC::ValueType KT;
+	ASSERT(keys.GetCount() == values1.GetCount() && keys.GetCount() == values2.GetCount());
+	if(keys.GetCount() >= 2)
+		__StableIndexSort2Cmp(keys.Begin(), keys.End(), values1.Begin(), values2.Begin(), cmp, (KT *)0);
+}
+
+template <class KC, class VC, class WC>
+inline void StableIndexSort2Cmp(KC& keys, VC& values1, WC& values2)
+{
+	typedef typename KC::ValueType KT;
+	if(keys.GetCount() >= 2)
+		__StableIndexSort2Cmp(keys.Begin(), keys.End(), values1.Begin(), values2.Begin(), StdCmp<KT>(), (KT *)0);
+}
+
+template <class II, class VI, class WI, class XI, class K>
+struct IndexSort3Iterator
+{
+	typedef IndexSort3Iterator<II, VI, WI, XI, K> Iter;
+
+	IndexSort3Iterator(II ii, VI vi, WI wi, XI xi) : ii(ii), vi(vi), wi(wi), xi(xi) {}
+
+	Iter&       operator ++ ()               { ++ii; ++vi; ++wi; ++xi; return *this; }
+	Iter&       operator -- ()               { --ii; --vi; --wi; --xi; return *this; }
+	const K&    operator *  () const         { return *ii; }
+	Iter        operator +  (int i) const    { return Iter(ii + i, vi + i, wi + i, xi + i); }
+	Iter        operator -  (int i) const    { return Iter(ii - i, vi - i, wi - i, xi - i); }
+	int         operator -  (Iter b) const   { return (int)(ii - b.ii); }
+	bool        operator == (Iter b) const   { return ii == b.ii; }
+	bool        operator != (Iter b) const   { return ii != b.ii; }
+	bool        operator <  (Iter b) const   { return ii <  b.ii; }
+	friend void IterSwap    (Iter a, Iter b) { IterSwap(a.ii, b.ii); IterSwap(a.vi, b.vi); IterSwap(a.wi, b.wi); IterSwap(a.xi, b.xi); }
+
+	II          ii;
+	VI          vi;
+	WI          wi;
+	XI          xi;
+};
+
+template <class II, class VI, class WI, class XI, class K, class Less>
+inline void __IndexSort3(II begin, II end, VI pair1, WI pair2, XI pair3, const Less& less, const K *)
+{
+	int count = end - begin;
+	Sort(IndexSort3Iterator<II, VI, WI, XI, K>(begin, pair1, pair2, pair3),
+		IndexSort3Iterator<II, VI, WI, XI, K>(end, pair1 + count, pair2 + count, pair3 + count),
+		less);
+}
+
+template <class II, class VI, class WI, class XI, class Less>
+inline void IndexSort3(II begin, II end, VI pair1, WI pair2, XI pair3, const Less& less)
+{
+	if(begin != end)
+		__IndexSort3(begin, end, pair1, pair2, pair3, less, &*begin);
+}
+
+template <class KC, class VC, class WC, class XC, class Less>
+inline void IndexSort3(KC& keys, VC& values1, WC& values2, XC& values3, const Less& less)
+{
+	typedef typename KC::ValueType KT;
+	ASSERT(keys.GetCount() == values1.GetCount() && keys.GetCount() == values2.GetCount()
+		&& keys.GetCount() == values3.GetCount());
+	if(keys.GetCount() >= 2)
+		__IndexSort3(keys.Begin(), keys.End(), values1.Begin(), values2.Begin(), values3.Begin(), less, (KT *)0);
+}
+
+template <class KC, class VC, class WC, class XC>
+inline void IndexSort3(KC& keys, VC& values1, WC& values2, XC& values3)
+{
+	typedef typename KC::ValueType KT;
+	if(keys.GetCount() >= 2)
+		__IndexSort3(keys.Begin(), keys.End(), values1.Begin(), values2.Begin(), values3.Begin(), StdLess<KT>(), (KT *)0);
+}
+
+template <class II, class VI, class WI, class XI, class K, class Less>
+inline void __StableIndexSort3(II begin, II end, VI pair1, WI pair2, XI pair3, const Less& less, const K *)
+{
+	int count = end - begin;
+	StableSort(IndexSort3Iterator<II, VI, WI, XI, K>(begin, pair1, pair2, pair3),
+	           IndexSort3Iterator<II, VI, WI, XI, K>(end, pair1 + count, pair2 + count, pair3 + count),
+	           less);
+}
+
+template <class II, class VI, class WI, class XI, class Less>
+inline void StableIndexSort3(II begin, II end, VI pair1, WI pair2, XI pair3, const Less& less)
+{
+	if(begin != end)
+		__StableIndexSort3(begin, end, pair1, pair2, pair3, less, &*begin);
+}
+
+template <class KC, class VC, class WC, class XC, class Less>
+inline void StableIndexSort3(KC& keys, VC& values1, WC& values2, XC& values3, const Less& less)
+{
+	typedef typename KC::ValueType KT;
+	ASSERT(keys.GetCount() == values1.GetCount() && keys.GetCount() == values2.GetCount()
+		&& keys.GetCount() == values3.GetCount());
+	if(keys.GetCount() >= 2)
+		__StableIndexSort3(keys.Begin(), keys.End(), values1.Begin(), values2.Begin(), values3.Begin(), less, (KT *)0);
+}
+
+template <class KC, class VC, class WC, class XC>
+inline void StableIndexSort3(KC& keys, VC& values1, WC& values2, XC& values3)
+{
+	typedef typename KC::ValueType KT;
+	if(keys.GetCount() >= 2)
+		__StableIndexSort3(keys.Begin(), keys.End(), values1.Begin(), values2.Begin(), values3.Begin(), StdLess<KT>(), (KT *)0);
+}
+
+template <class II, class VI, class WI, class XI, class K, class Cmp>
+inline void __StableIndexSort3Cmp(II begin, II end, VI pair1, WI pair2, XI pair3, const Cmp& cmp, const K *)
+{
+	int count = end - begin;
+	StableSortCmp(IndexSort3Iterator<II, VI, WI, XI, K>(begin, pair1, pair2, pair3),
+	              IndexSort3Iterator<II, VI, WI, XI, K>(end, pair1 + count, pair2 + count, pair3 + count),
+	              cmp);
+}
+
+template <class II, class VI, class WI, class XI, class Cmp>
+inline void StableIndexSort3Cmp(II begin, II end, VI pair1, WI pair2, XI pair3, const Cmp& cmp)
+{
+	if(begin != end)
+		__StableIndexSort3Cmp(begin, end, pair1, pair2, pair3, cmp, &*begin);
+}
+
+template <class KC, class VC, class WC, class XC, class Cmp>
+inline void StableIndexSort3Cmp(KC& keys, VC& values1, WC& values2, XC& values3, const Cmp& cmp)
+{
+	typedef typename KC::ValueType KT;
+	ASSERT(keys.GetCount() == values1.GetCount() && keys.GetCount() == values2.GetCount()
+		&& keys.GetCount() == values3.GetCount());
+	if(keys.GetCount() >= 2)
+		__StableIndexSort3Cmp(keys.Begin(), keys.End(), values1.Begin(), values2.Begin(), values3.Begin(), cmp, (KT *)0);
+}
+
+template <class KC, class VC, class WC, class XC>
+inline void StableIndexSort3Cmp(KC& keys, VC& values1, WC& values2, XC& values3)
+{
+	typedef typename KC::ValueType KT;
+	if(keys.GetCount() >= 2)
+		__StableIndexSort3Cmp(keys.Begin(), keys.End(), values1.Begin(), values2.Begin(), values3.Begin(), StdCmp<KT>(), (KT *)0);
+}
+
+
+template <class I, class V>
+struct SortOrderIterator : PostfixOps< SortOrderIterator<I, V> >
+{
+	typedef SortOrderIterator<I, V> Iter;
+
+	SortOrderIterator(int *ii, I vi) : ii(ii), vi(vi) {}
+
+	Iter&       operator ++ ()               { ++ii; return *this; }
+	Iter&       operator -- ()               { --ii; return *this; }
+	const V&    operator *  () const         { return *(vi + *ii); }
+	Iter        operator +  (int i) const    { return Iter(ii + i, vi); }
+	Iter        operator -  (int i) const    { return Iter(ii - i, vi); }
+	int         operator -  (Iter b) const   { return int(ii - b.ii); }
+	bool        operator == (Iter b) const   { return ii == b.ii; }
+	bool        operator != (Iter b) const   { return ii != b.ii; }
+	bool        operator <  (Iter b) const   { return ii < b.ii; }
+	friend void IterSwap    (Iter a, Iter b) { IterSwap(a.ii, b.ii); }
+
+	int        *ii;
+	I           vi;
+};
+
+template <class I, class V, class Less>
+inline void __SortOrder(int *begin, int *end, I data, const Less& less, const V *)
+{
+	Sort(SortOrderIterator<I, V>(begin, data), SortOrderIterator<I, V>(end, data), less);
+}
+
+template <class I, class Less>
+inline Vector<int> GetSortOrder(I begin, I end, const Less& less)
+{
+	Vector<int> index;
+	index.SetCount((int)(end - begin));
+	for(int i = index.GetCount(); --i >= 0; index[i] = i)
+		;
+	if(begin != end)
+		__SortOrder(index.Begin(), index.End(), begin, less, &*begin);
+	return index;
+}
+
+template <class C, class Less>
+inline Vector<int> GetSortOrder(const C& container, const Less& less)
+{
+	return GetSortOrder(container.Begin(), container.End(), less);
+}
+
+template <class C>
+inline Vector<int> GetSortOrder(const C& container)
+{
+	typedef typename C::ValueType V;
+	return GetSortOrder(container.Begin(), container.End(), StdLess<V>());
+}
+
+template <class I, class T>
+struct StableSortOrderIterator : PostfixOps< StableSortOrderIterator<I, T> >
+{
+	typedef StableSortOrderIterator<I, T> Iter;
+
+	StableSortOrderIterator(int *ii, I vi) : ii(ii), vi(vi) {}
+
+	Iter&       operator ++ ()               { ++ii; return *this; }
+	Iter&       operator -- ()               { --ii; return *this; }
+	Iter        operator +  (int i) const    { return Iter(ii + i, vi); }
+	Iter        operator -  (int i) const    { return Iter(ii - i, vi); }
+	int         operator -  (Iter b) const   { return int(ii - b.ii); }
+	bool        operator == (Iter b) const   { return ii == b.ii; }
+	bool        operator != (Iter b) const   { return ii != b.ii; }
+	bool        operator <  (Iter b) const   { return ii < b.ii; }
+	friend void IterSwap    (Iter a, Iter b) { IterSwap(a.ii, b.ii); }
+
+	StableSortItem<T> operator*() const      { return StableSortItem<T>(*(vi + *ii), *ii); }
+
+	int        *ii;
+	I           vi;
+};
+
+template <class I, class T, class Less>
+inline void __StableSortOrder(int *ibegin, int *iend, I data, const Less& less, const T *)
+{
+	Sort(StableSortOrderIterator<I, T>(ibegin, data),
+	     StableSortOrderIterator<I, T>(iend, data),
+	     StableSortLess_<T, Less>(less));
+}
+
+template <class I, class Less>
+inline Vector<int> GetStableSortOrder(I begin, I end, const Less& less)
+{
+	Vector<int> index;
+	index.SetCount((int)(end - begin));
+	for(int i = index.GetCount(); --i >= 0; index[i] = i)
+		;
+	if(begin != end)
+		__StableSortOrder(index.Begin(), index.End(), begin, less, &*begin);
+	return index;
+}
+
+template <class C, class Less>
+inline Vector<int> GetStableSortOrder(const C& container, const Less& less)
+{
+	return GetStableSortOrder(container.Begin(), container.End(), less);
+}
+
+template <class C>
+inline Vector<int> GetStableSortOrder(const C& container)
+{
+	typedef typename C::ValueType V;
+	return GetStableSortOrder(container.Begin(), container.End(), StdLess<V>());
+}
+
+template <class I, class T, class Cmp>
+inline void __StableSortOrderCmp(int *ibegin, int *iend, I data, const Cmp& cmp, const T *)
+{
+	Sort(StableSortOrderIterator<I, T>(ibegin, data),
+	     StableSortOrderIterator<I, T>(iend, data),
+	     StableSortLessCmp_<T, Cmp>(cmp));
+}
+
+template <class I, class Cmp>
+inline Vector<int> GetStableSortOrderCmp(I begin, I end, const Cmp& cmp)
+{
+	Vector<int> index;
+	index.SetCount((int)(end - begin));
+	for(int i = index.GetCount(); --i >= 0; index[i] = i)
+		;
+	if(begin != end)
+		__StableSortOrderCmp(index.Begin(), index.End(), begin, cmp, &*begin);
+	return index;
+}
+
+template <class C, class Cmp>
+inline Vector<int> GetStableSortOrderCmp(const C& container, const Cmp& cmp)
+{
+	return GetStableSortOrderCmp(container.Begin(), container.End(), cmp);
+}
+
+template <class C>
+inline Vector<int> GetStableSortOrderCmp(const C& container)
+{
+	typedef typename C::ValueType V;
+	return GetStableSortOrderCmp(container.Begin(), container.End(), StdCmp<V>());
+}
+
+template <class DC, class I, class F>
+void GetFieldContainer(DC& dest, I begin, I end, F field)
+{
+	for(; begin != end; ++begin)
+		dest.Add((*begin).*field);
+}
+
+template <class DC, class SC, class F>
+void GetFieldContainer(DC& dest, const SC& src, F field)
+{ GetFieldContainer<DC, typename SC::ConstIterator, F>(dest, src.Begin(), src.End(), field); }
+
+template <class I, class F, class O, class E>
+I FindField(I begin, I end, F field, const O& object, const E& equal)
+{
+	for(; begin != end && !equal((*begin).*field, object); ++begin)
+		;
+	return begin;
+}
+
+template <class I, class F, class O>
+I FindField(I begin, I end, F field, const O& object)
+{ return FindField(begin, end, field, object, StdEqual<O>()); }
+
+template <class C, class F, class O, class E>
+int FindFieldIndex(const C& container, F field, const O& object, const E& equal)
+{
+	int i = 0;
+	for(typename C::ConstIterator b = container.Begin(), e = container.End(); b != e; ++b, ++i)
+		if(equal((*b).*field, object))
+			return i;
+	return -1;
+}
+
+template <class C, class F, class O>
+int FindFieldIndex(const C& container, F field, const O& object)
+{ return FindFieldIndex(container, field, object, StdEqual<O>()); }
+
+template <class O, class T, class R>
+class FieldRelationCls {
+	O        T::*member;
+	const R& relation;
+
+public:
+	FieldRelationCls(O (T::*member), const R& relation) : member(member), relation(relation) {}
+	bool operator () (const T& t1, const T& t2) const { return relation(t1.*member, t2.*member); }
+};
+
+template <class O, class T, class R>
+inline FieldRelationCls<O, T, R> FieldRelation(O (T::*member), const R& relation)
+{ return FieldRelationCls<O, T, R>(member, relation); }
+
+template <class M, class T, class R>
+class MethodRelationCls {
+	M        method;
+	const R& relation;
+
+public:
+	MethodRelationCls(M method, const R& relation) : method(method), relation(relation) {}
+	bool operator () (const T& t1, const T& t2) const {
+		return relation((t1.*method)(), (t2.*method)());
+	}
+};
+
+template <class O, class T, class R>
+inline MethodRelationCls<O (T::*)(), T, R>
+	MethodRelation(O (T::*method)(), const R& relation)
+{ return MethodRelationCls<O (T::*)(), T, R>(method, relation); }
+
+template <class O, class T, class R>
+inline MethodRelationCls<O (T::*)() const, T, R>
+	MethodRelation(O (T::*method)() const, const R& relation)
+{ return MethodRelationCls<O (T::*)() const, T, R>(method, relation); }
+
+template <class C, class T>
+void LruAdd(C& lru, T value, int limit = 10) {
+	int q = FindIndex(lru, value);
+	if(q >= 0)
+		lru.Remove(q);
+	lru.Insert(0, value);
+	if(lru.GetCount() > limit)
+		lru.SetCount(limit);
+}
diff --git a/uppsrc/Core/App.cpp b/uppsrc/Core/App.cpp
new file mode 100644
index 000000000..46b5b689f
--- /dev/null
+++ b/uppsrc/Core/App.cpp
@@ -0,0 +1,366 @@
+#include "Core.h"
+
+#ifdef PLATFORM_WIN32
+#include <shellapi.h>
+#endif
+
+NAMESPACE_UPP
+
+#ifdef PLATFORM_WIN32
+
+String GetExeFilePath()
+{
+	return GetModuleFileName();
+}
+
+String  GetHomeDirectory() {
+	return FromSystemCharset(getenv("HOMEDRIVE")) +
+	       FromSystemCharset(getenv("HOMEPATH"));
+}
+
+#endif
+
+#ifdef PLATFORM_POSIX
+
+char Argv0__[_MAX_PATH + 1];
+
+static void sSetArgv0__(const char *title)
+{
+	strcpy(Argv0__, title);
+}
+
+extern char Argv0__[];
+
+const char *procexepath_() {
+	static char h[_MAX_PATH + 1];
+	ONCELOCK {
+		char link[100];
+#ifdef PLATFORM_FREEBSD
+		sprintf(link, "/proc/%d/file", getpid());
+#else
+		sprintf(link, "/proc/%d/exe", getpid());
+#endif
+		int ret = readlink(link, h, _MAX_PATH);
+		if(ret > 0 && ret < _MAX_PATH)
+			h[ret] = '\0';
+		else
+			*h = '\0';
+	}
+	return h;
+}
+
+String GetExeFilePath()
+{
+	static String exepath;
+	ONCELOCK {
+		const char *exe = procexepath_();
+		if(*exe)
+			exepath = exe;
+		else {
+			String x = Argv0__;
+			if(IsFullPath(x) && FileExists(x))
+				exepath = x;
+			else {
+				exepath = GetHomeDirFile("upp");
+				Vector<String> p = Split(FromSystemCharset(Environment().Get("PATH")), ':');
+				if(x.Find('/') >= 0)
+					p.Add(GetCurrentDirectory());
+				for(int i = 0; i < p.GetCount(); i++) {
+					String ep = NormalizePath(AppendFileName(p[i], x));
+					if(FileExists(ep))
+						exepath = ep;
+				}
+			}
+		}
+	}
+	return exepath;
+}
+
+#endif
+
+String GetExeDirFile(const char *filename)
+{
+	return AppendFileName(GetFileFolder(GetExeFilePath()), filename);
+}
+
+String GetExeTitle()
+{
+	return GetFileTitle(GetExeFilePath());
+}
+
+#ifdef PLATFORM_POSIX
+
+static StaticCriticalSection sHlock;
+
+String& sHomeDir() {
+	static String s;
+	return s;
+}
+
+String  GetHomeDirectory() {
+	String r;
+	INTERLOCKED_(sHlock) {
+		String& s = sHomeDir();
+		if(s.IsEmpty()) {
+			const char *home = getenv("HOME");
+			s = FromSystemCharset(home ? home : "/root");
+		}
+		r = s;
+	}
+	return r;
+}
+
+void    SetHomeDirectory(const char *dir)
+{
+	INTERLOCKED_(sHlock) {
+		sHomeDir() = dir;
+	}
+}
+
+#endif//PLATFORM_POSIX
+
+String  GetHomeDirFile(const char *fp) {
+	return AppendFileName(GetHomeDirectory(), fp);
+}
+
+static bool sHomecfg;
+
+void    UseHomeDirectoryConfig(bool b)
+{
+	sHomecfg = b;
+}
+
+String  ConfigFile(const char *file) {
+#if defined(PLATFORM_WIN32)
+	if(sHomecfg) {
+		String p = GetHomeDirFile(GetExeTitle());
+		ONCELOCK
+			RealizeDirectory(p);
+		return AppendFileName(p, file);
+	}
+	return GetExeDirFile(file);
+#elif defined(PLATFORM_POSIX)
+	String p = GetHomeDirFile(".upp/" + GetExeTitle());
+	ONCELOCK
+		RealizeDirectory(p);
+	return AppendFileName(p, file);
+#else
+#error ConfigFile not implemented for this platform, comment this line to get input string back
+	return file;
+#endif//PLATFORM
+}
+
+String  ConfigFile() {
+	return ConfigFile(GetExeTitle() + ".cfg");
+}
+
+GLOBAL_VAR(Vector<String>, coreCmdLine__)
+
+const Vector<String>& CommandLine()
+{
+	return coreCmdLine__();
+}
+
+typedef VectorMap<String, String> StringMap;
+GLOBAL_VAR(StringMap, coreEnvPtr__)
+const VectorMap<String, String>& Environment()
+{
+	return coreEnvPtr__();
+}
+
+static int exitcode;
+static bool sMainRunning;
+
+void  SetExitCode(int code) { exitcode = code; }
+int   GetExitCode()         { return exitcode; }
+
+bool  IsMainRunning()
+{
+	return sMainRunning;
+}
+
+void LoadLangFiles(const char *dir)
+{
+	FindFile ff(AppendFileName(dir, "*.tr"));
+	while(ff) {
+		LoadLngFile(AppendFileName(dir, ff.GetName()));
+		ff.Next();
+	}
+}
+
+void CommonInit()
+{
+#ifdef PLATFORM_WIN32
+	LoadLangFiles(GetFileFolder(GetExeFilePath()));
+#else
+	LoadLangFiles(GetHomeDirectory());
+#endif
+
+	Vector<String>& cmd = coreCmdLine__();
+	for(int i = 0; i < cmd.GetCount();) {
+		if(cmd[i] == "--export-tr") {
+			{
+				i++;
+				int lang = 0;
+				byte charset = CHARSET_UTF8;
+				String fn = "all";
+				if(i < cmd.GetCount())
+					if(cmd[i].GetLength() != 4 && cmd[i].GetLength() != 5)
+						lang = 0;
+					else {
+						lang = LNGFromText(cmd[i]);
+						fn = cmd[i];
+						int c = cmd[i][4];
+						if(c >= '0' && c <= '8')
+							charset = c - '0' + CHARSET_WIN1250;
+						if(c >= 'A' && c <= 'J')
+							charset = c - 'A' + CHARSET_ISO8859_1;
+					}
+				fn << ".tr";
+			#ifdef PLATFORM_WIN32
+				FileOut out(GetExeDirFile(fn));
+			#else
+				FileOut out(GetHomeDirFile(fn));
+			#endif
+				if(lang)
+					SaveLngFile(out, SetLNGCharset(lang, charset));
+				else {
+					Index<int> l = GetLngSet();
+					for(int i = 0; i < l.GetCount(); i++)
+						SaveLngFile(out, SetLNGCharset(l[i], charset));
+				}
+			}
+			exit(0);
+		}
+	#if defined(_DEBUG) && defined(UPP_HEAP)
+		if(cmd[i] == "--memory-breakpoint__" && i + 1 < cmd.GetCount()) {
+			MemoryBreakpoint(atoi(cmd[i + 1]));
+			cmd.Remove(i, 2);
+		}
+		else
+			i++;
+	#else
+		i++;
+	#endif
+	}
+	sMainRunning = true;
+}
+
+#ifdef PLATFORM_POSIX
+
+void s_ill_handler(int)
+{
+	Panic("Illegal instruction!");
+}
+
+void s_segv_handler(int)
+{
+	Panic("Invalid memory access!");
+}
+
+void s_fpe_handler(int)
+{
+	Panic("Invalid arithmetic operation!");
+}
+
+void AppInit__(int argc, const char **argv, const char **envptr)
+{
+	SetLanguage(LNG_ENGLISH);
+	sSetArgv0__(argv[0]);
+	for(const char *var; (var = *envptr) != 0; envptr++)
+	{
+		const char *b = var;
+		while(*var && *var != '=')
+			var++;
+		String varname(b, var);
+		if(*var == '=')
+			var++;
+		coreEnvPtr__().Add(varname, var);
+	}
+	Vector<String>& cmd = coreCmdLine__();
+	for(int i = 1; i < argc; i++)
+		cmd.Add(argv[i]);
+	CommonInit();
+	signal(SIGILL, s_ill_handler);
+	signal(SIGSEGV, s_segv_handler);
+	signal(SIGBUS, s_segv_handler);
+	signal(SIGFPE, s_fpe_handler);
+}
+#endif
+
+#if defined(PLATFORM_WIN32)
+
+void AppInitEnvironment__()
+{
+#ifndef PLATFORM_WINCE
+	char *env = GetEnvironmentStrings();
+	for(char *ptr = env; *ptr; ptr++)
+	{
+		const char *b = ptr;
+		if(*ptr)
+			ptr++;
+		while(*ptr && *ptr != '=')
+			ptr++;
+		String varname(b, ptr);
+		if(*ptr)
+			ptr++;
+		b = ptr;
+		while(*ptr)
+			ptr++;
+		coreEnvPtr__().GetAdd(ToUpper(varname)) = String(b, ptr);
+	}
+	FreeEnvironmentStrings(env);
+#endif
+	CommonInit();
+}
+
+void AppInit__(int argc, const char **argv)
+{
+	SetLanguage(LNG_ENGLISH);
+	Vector<String>& cmd = coreCmdLine__();
+	for(int i = 1; i < argc; i++)
+		cmd.Add(argv[i]);
+	AppInitEnvironment__();
+}
+#endif
+
+void AppExit__()
+{
+	sMainRunning = false;
+#ifdef PLATFORM_POSIX
+	MemoryIgnoreLeaksBegin(); // Qt leaks on app exit...
+#endif
+}
+
+void    LaunchWebBrowser(const String& url)
+{
+#if defined(PLATFORM_WIN32) && !defined(PLATFORM_WINCE)
+	ShellExecute(NULL, "open", url, NULL, ".", SW_SHOWDEFAULT);
+#endif
+#ifdef PLATFORM_POSIX
+	const char * browser[] = {
+		"htmlview", "xdg-open", "x-www-browser", "firefox", "konqueror", "opera", "epiphany", "galeon", "netscape"
+	};
+	for(int i = 0; i < __countof(browser); i++)
+		if(system("which " + String(browser[i])) == 0) {
+			system(String(browser[i]) + " " + url + " &");
+			break;
+		}
+#endif
+}
+
+String GetDataFile(const char *filename)
+{
+	String s = Environment().Get("UPP_MAIN__",
+#ifdef PLATFORM_WIN32
+	                             GetFileFolder(GetExeFilePath())
+#endif
+#ifdef PLATFORM_POSIX
+	                             GetHomeDirectory()
+#endif
+	);
+
+	return AppendFileName(s, filename);
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/Core/App.h b/uppsrc/Core/App.h
new file mode 100644
index 000000000..5d61a2c95
--- /dev/null
+++ b/uppsrc/Core/App.h
@@ -0,0 +1,75 @@
+String  GetExeFilePath();
+String  GetExeDirFile(const char *fp);
+
+String  GetHomeDirFile(const char *fp);
+String  GetHomeDirectory();
+
+#ifdef PLATFORM_POSIX
+
+void    SetHomeDirectory(const char *dir);
+
+#endif
+
+String  GetExeTitle();
+
+void    UseHomeDirectoryConfig(bool b = true);
+
+String  ConfigFile(const char *file);
+String  ConfigFile();
+
+const Vector<String>& CommandLine();
+const VectorMap<String, String>& Environment();
+
+void    SetExitCode(int code);
+int     GetExitCode();
+
+bool    IsMainRunning();
+
+#ifndef flagSO
+//void    Main(); // By console application
+#endif
+
+void AppExit__();
+
+#ifdef PLATFORM_WIN32
+
+void AppInit__(int argc, const char **argv);
+void AppInitEnvironment__();
+
+#define CONSOLE_APP_MAIN \
+void ConsoleMainFn_(); \
+ \
+int main(int argc, char *argv[]) { \
+	UPP::AppInit__(argc, (const char **)argv); \
+	ConsoleMainFn_(); \
+	UPP::DeleteUsrLog(); \
+	UPP::AppExit__(); \
+	return UPP::GetExitCode(); \
+} \
+ \
+void ConsoleMainFn_()
+
+#endif
+
+#ifdef PLATFORM_POSIX
+
+void AppInit__(int argc, const char **argv, const char **envptr);
+
+#define CONSOLE_APP_MAIN \
+void ConsoleMainFn_(); \
+ \
+int main(int argc, const char **argv, const char **envptr) { \
+	UPP::AppInit__(argc, argv, envptr); \
+	ConsoleMainFn_(); \
+	UPP::DeleteUsrLog(); \
+	UPP::AppExit__(); \
+	return UPP::GetExitCode(); \
+} \
+ \
+void ConsoleMainFn_()
+
+#endif
+
+String  GetDataFile(const char *filename);
+
+void    LaunchWebBrowser(const String& url);
diff --git a/uppsrc/Core/BiCont.h b/uppsrc/Core/BiCont.h
new file mode 100644
index 000000000..f98194c8d
--- /dev/null
+++ b/uppsrc/Core/BiCont.h
@@ -0,0 +1,146 @@
+template <class T>
+class BiVector : MoveableAndDeepCopyOption< BiVector<T> > {
+protected:
+	T       *vector;
+	int      start;
+	int      items;
+	int      alloc;
+
+	int      Ix(int i) const         { return i + start < alloc ? i + start : i + start - alloc; }
+
+	int      EI() const              { return Ix(items - 1); }
+	void     ReAlloc(int newalloc);
+	void     Add0();
+	void     DeepCopy0(const BiVector& src);
+	T       *AddHead0()              { AssertMoveable<T>(); Add0(); return &vector[start = Ix(alloc - 1)/*(start + alloc - 1) % alloc*/]; }
+	T       *AddTail0()              { AssertMoveable<T>(); Add0(); return &vector[EI()]; }
+	void     Free();
+	void     Pick(pick_ BiVector& x) { vector = x.vector; start = x.start; items = x.items;
+	                                   alloc = x.alloc; ((BiVector&)x).items = -1; }
+	void     Copy(T *dst, int start, int count) const;
+
+public:
+	int      GetCount() const        { return items; }
+	bool     IsEmpty() const         { return items == 0; }
+	void     Clear();
+
+	T&       AddHead()               { return *new(AddHead0()) T; }
+	T&       AddTail()               { return *new(AddTail0()) T; }
+	void     AddHead(const T& x)     { new(AddHead0()) T(x); }
+	void     AddTail(const T& x)     { new(AddTail0()) T(x); }
+	void     AddHeadPick(pick_ T& x) { new(AddHead0()) T(x); }
+	void     AddTailPick(pick_ T& x) { new(AddTail0()) T(x); }
+	T&       Head()                  { ASSERT(items > 0); return vector[start]; }
+	T&       Tail()                  { ASSERT(items > 0); return vector[EI()]; }
+	const T& Head() const            { ASSERT(items > 0); return vector[start]; }
+	const T& Tail() const            { ASSERT(items > 0); return vector[EI()]; }
+	void     DropHead()              { (&Head())->T::~T(); items--; start = Ix(1); }
+	void     DropTail()              { (&Tail())->T::~T(); items--; }
+	void     DropHead(int n)         { while(n-- > 0) BiVector<T>::DropHead(); }
+	void     DropTail(int n)         { while(n-- > 0) BiVector<T>::DropTail(); }
+	const T& operator[](int i) const { ASSERT(i >= 0 && i < items); return vector[Ix(i)]; }
+	T&       operator[](int i)       { ASSERT(i >= 0 && i < items); return vector[Ix(i)]; }
+	void     Shrink();
+	void     Reserve(int n);
+	int      GetAlloc() const        { return alloc; }
+
+#ifdef UPP
+	void     Serialize(Stream& s);
+#endif
+
+	bool     IsPicked()                         { return items < 0; }
+
+	BiVector(const BiVector& src, int)          { DeepCopy0(src); }
+	BiVector(pick_ BiVector& src)               { Pick(src); }
+	void operator=(pick_ BiVector& src)         { Free(); Pick(src); }
+	BiVector()                                  { start = items = alloc = 0; vector = NULL; }
+	~BiVector()                                 { Free(); } // gcc4.0 workaround!!
+
+	typedef ConstIIterator<BiVector> ConstIterator;
+	typedef IIterator<BiVector>      Iterator;
+
+	typedef T        ValueType;
+
+	ConstIterator    Begin() const              { return ConstIterator(*this, 0); }
+	ConstIterator    End() const                { return ConstIterator(*this, GetCount()); }
+	ConstIterator    GetIter(int pos) const     { return ConstIterator(*this, pos); }
+	Iterator         Begin()                    { return Iterator(*this, 0); }
+	Iterator         End()                      { return Iterator(*this, GetCount()); }
+	Iterator         GetIter(int pos)           { return Iterator(*this, pos); }
+
+	friend void Swap(BiVector& a, BiVector& b)  { UPP::Swap(a.vector, b.vector);
+	                                              UPP::Swap(a.start, b.start);
+	                                              UPP::Swap(a.items, b.items);
+	                                              UPP::Swap(a.alloc, b.alloc); }
+
+	STL_BI_COMPATIBILITY(BiVector<T>)
+};
+
+template <class T>
+class BiArray : MoveableAndDeepCopyOption< BiArray<T> > {
+protected:
+	BiVector<void *> bv;
+
+	void     Free();
+	void     DeepCopy0(const BiArray<T>& v);
+
+public:
+	int      GetCount() const              { return bv.GetCount(); }
+	bool     IsEmpty() const               { return GetCount() == 0; }
+	void     Clear()                       { Free(); bv.Clear(); }
+
+	T&       AddHead()                     { T *q = new T; bv.AddHead(q); return *q; }
+	T&       AddTail()                     { T *q = new T; bv.AddTail(q); return *q; }
+	void     AddHead(const T& x)           { bv.AddHead(new T(x)); }
+	void     AddTail(const T& x)           { bv.AddTail(new T(x)); }
+	void     AddHeadPick(pick_ T& x)       { bv.AddHead(new T(x)); }
+	void     AddTailPick(pick_ T& x)       { bv.AddTail(new T(x)); }
+	T&       AddHead(T *newt)              { bv.AddHead(newt); return *newt; }
+	T&       AddTail(T *newt)              { bv.AddTail(newt); return *newt; }
+	template <class TT> TT& CreateHead()   { TT *q = new TT; bv.AddHead(q); return *q; }
+	template <class TT> TT& CreateTail()   { TT *q = new TT; bv.AddTail(q); return *q; }
+	T&       Head()                        { return *(T *) bv.Head(); }
+	T&       Tail()                        { return *(T *) bv.Tail(); }
+	const T& Head() const                  { return *(const T *) bv.Head(); }
+	const T& Tail() const                  { return *(const T *) bv.Tail(); }
+	void     DropHead()                    { delete (T*) bv.Head(); bv.DropHead(); }
+	void     DropTail()                    { delete (T*) bv.Tail(); bv.DropTail(); }
+	T       *DetachHead()                  { T *q = (T*) bv.Head(); bv.DropHead(); return q; }
+	T       *DetachTail()                  { T *q = (T*) bv.Tail(); bv.DropTail(); return q; }
+
+	T&       operator[](int i)             { return *(T *) bv[i]; }
+	const T& operator[](int i) const       { return *(const T *) bv[i]; }
+
+	void     Shrink()                      { bv.Shrink(); }
+	void     Reserve(int n)                { bv.Reserve(n); }
+	int      GetAlloc() const              { return bv.GetAlloc(); }
+
+#ifdef UPP
+	void     Serialize(Stream& s);
+#endif
+
+	bool     IsPicked() const                { return bv.IsPicked(); }
+
+	BiArray(const BiArray& v, int)           { DeepCopy0(v); }
+
+	BiArray(pick_ BiArray& src) : bv(src.bv) {}
+	void operator=(pick_ BiArray& src)       { Free(); bv = src.bv; }
+	BiArray()                                {}
+	~BiArray()                               { Free(); }
+
+	typedef ConstIIterator<BiArray> ConstIterator;
+	typedef IIterator<BiArray>      Iterator;
+
+	typedef T        ValueType;
+
+	ConstIterator    Begin() const              { return ConstIterator(*this, 0); }
+	ConstIterator    End() const                { return ConstIterator(*this, GetCount()); }
+	ConstIterator    GetIter(int pos) const     { return ConstIterator(*this, pos); }
+	Iterator         Begin()                    { return Iterator(*this, 0); }
+	Iterator         End()                      { return Iterator(*this, GetCount()); }
+	Iterator         GetIter(int pos)           { return Iterator(*this, pos); }
+
+	friend void Swap(BiArray& a, BiArray& b)    { UPP::Swap(a.bv, b.bv); }
+
+	STL_BI_COMPATIBILITY(BiArray<T>)
+};
diff --git a/uppsrc/Core/BlockStream.cpp b/uppsrc/Core/BlockStream.cpp
new file mode 100644
index 000000000..d12e709ef
--- /dev/null
+++ b/uppsrc/Core/BlockStream.cpp
@@ -0,0 +1,512 @@
+#include "Core.h"
+
+NAMESPACE_UPP
+
+#define LLOG(x)           // LOG(x)
+#define LDUMP(x)          // DUMP(x)
+#define LLOGHEXDUMP(x, s) // LOGHEXDUMP(x, s)
+
+void BlockStream::SetBufferSize(dword size) {
+	int64 p;
+	if(IsOpen()) {
+		p = GetPos();
+		Flush();
+	}
+	int n = 1;
+	while(size >> (n + 1))
+		n++;
+	pagesize = 1 << n;
+	pagemask = (int64)-1 << n;
+	if(buffer)
+		delete[] buffer;
+	buffer = new byte[pagesize];
+	pos = 0;
+	ptr = rdlim = wrlim = buffer;
+	pagepos = -1;
+	if(IsOpen())
+		Seek(p);
+}
+
+BlockStream::BlockStream()
+{
+	buffer = NULL;
+}
+
+BlockStream::~BlockStream()
+{
+	if(buffer)
+		delete[] buffer;
+}
+
+int64 BlockStream::GetSize() const {
+	if(IsError()) return 0;
+	return max(streamsize, ptr - buffer + pos);
+}
+
+void BlockStream::SyncSize()
+{
+	streamsize = max(streamsize, ptr - buffer + pos);
+}
+
+void BlockStream::Flush() {
+	if(!IsOpen() || IsError()) return;
+	if(pagedirty && pagepos >= 0) {
+		SyncSize();
+		int size = (int)min<int64>(streamsize - pagepos, pagesize);
+		LLOG("Write: " << pagepos << ", " << size);
+		Write(pagepos, buffer, size);
+		streamsize = max(streamsize, pagepos + size);
+	}
+	wrlim = buffer;
+	pagedirty = false;
+}
+
+void BlockStream::SetPos(int64 p)
+{
+	SyncSize();
+	pos = p & pagemask;
+	ptr = p - pos + buffer;
+	rdlim = wrlim = buffer;
+}
+
+void BlockStream::Seek(int64 apos) {
+	if(IsError()) return;
+	LLOG("Seek " << apos);
+	if(style & STRM_WRITE) {
+		SetPos(apos);
+		if(apos > streamsize) {
+			SetStreamSize(apos);
+			streamsize = apos;
+		}
+	}
+	else {
+		if(apos > streamsize)
+			apos = streamsize;
+		SetPos(apos);
+	}
+}
+
+bool BlockStream::SyncPage()
+{
+	if(pagepos != pos) {
+		int n = (int)min<int64>(streamsize - pos, pagesize);
+		Flush();
+		pagepos = pos;
+		LLOG("Read:" << pagepos << ", " << n);
+		if(n > 0 && (int)Read(pagepos, buffer, n) != n) {
+			SetLastError();
+			return false;
+		}
+	}
+	rdlim = wrlim = buffer;
+	return true;
+}
+
+bool BlockStream::SyncPos()
+{
+	if(IsError())
+		return false;
+	SetPos(GetPos());
+	return SyncPage();
+}
+
+int BlockStream::_Term() {
+	if(IsError() || !IsOpen()) return -1;
+	if(ptr < rdlim)
+		return *ptr;
+	if(SyncPos())
+		rdlim = buffer + (int)min<int64>(streamsize - pos, pagesize);
+	else {
+		rdlim = buffer;
+		return -1;
+	}
+	return ptr < rdlim ? *ptr : -1;
+}
+
+void BlockStream::_Put(int c) {
+	if(!IsOpen()) return;
+	if(IsError() || !SyncPos())
+		ptr = buffer;
+	wrlim = buffer + pagesize;
+	pagedirty = true;
+	*ptr++ = c;
+}
+
+int  BlockStream::_Get() {
+	if(IsError() || !IsOpen()) return -1;
+	int c = _Term();
+	if(c >= 0) ptr++;
+	return c;
+}
+
+void BlockStream::_Put(const void *data, dword size) {
+	if(IsError() || !IsOpen()) return;
+	LLOG("Put " << size);
+	if(!size)
+		return;
+	const byte *s = (const byte *)data;
+	if(!SyncPos())
+		return;
+	int64 pos0 = GetPos();
+	int64 pg0 = pos0 & pagemask;
+	int64 pos1 = pos0 + size;
+	int64 pg1 = pos1 & pagemask;
+	wrlim = buffer + pagesize;
+	pagedirty = true;
+	if(pg0 == pg1) {
+		memcpy(buffer + pos0 - pos, data, size);
+		ptr = buffer + pos1 - pos;
+	}
+	else {
+		int n = int(pos + pagesize - pos0);
+		memcpy(buffer + pos0 - pos, s, n);
+		s += n;
+		n = dword(pg1 - pg0) - pagesize;
+		Write(pos + pagesize, s, n);
+		streamsize = max(pos + pagesize + n, streamsize);
+		s += n;
+		SetPos(pos0 + size);
+		SyncPage();
+		if(pos1 > pg1) {
+			wrlim = buffer + pagesize;
+			pagedirty = true;
+			memcpy(buffer, s, int(pos1 - pg1));
+		}
+	}
+}
+
+dword BlockStream::_Get(void *data, dword size) {
+	if(IsError() || !IsOpen()) return 0;
+	LLOG("Get " << size);
+	if(size == 0) return 0;
+	_Term();
+	byte *t = (byte *)data;
+	int64 pos0 = GetPos();
+	int64 pg0 = pos0 & pagemask;
+	size = (int)min<int64>(GetSize() - pos0, size);
+	int64 pos1 = pos0 + size;
+	int64 pg1 = pos1 & pagemask;
+	if(pg0 == pg1) {
+		SyncPage();
+		memcpy(data, buffer + pos0 - pos, size);
+		ptr = buffer + pos1 - pos;
+		_Term();
+	}
+	else {
+		int last = int(pos1 - pg1);
+		if(pagepos == pg1) {
+			memcpy(t + size - last, buffer, last);
+			last = 0;
+		}
+		SyncPage();
+		int n = int(pos + pagesize - pos0);
+		memcpy(t, buffer + pos0 - pos, n);
+		dword q = dword(pg1 - pg0) - pagesize;
+		if(Read(pos + pagesize, t + n, q) != q) {
+			SetError();
+			return 0;
+		}
+		SetPos(pos0 + size);
+		if(last) {
+			SyncPage();
+			memcpy(t + size - last, buffer, last);
+		}
+	}
+	return size;
+}
+
+void BlockStream::SetSize(int64 size)
+{
+	if(IsError() || !IsOpen()) return;
+	int64 pos = GetPos();
+	Flush();
+	Seek(0);
+	SetStreamSize(/*mediasize = streamsize =*/ size); // 06-08-29 TRC
+	// during call to SetStreamSize, mediasize must still contain the old file size
+	streamsize = size;
+	Seek(pos < size ? pos : size);
+}
+
+dword BlockStream::Read(int64 at, void *ptr, dword size) {
+	NEVER();
+	return 0;
+}
+
+void  BlockStream::Write(int64 at, const void *data, dword size) {
+	NEVER();
+}
+
+void  BlockStream::SetStreamSize(int64 pos) {
+	NEVER();
+}
+
+void BlockStream::OpenInit(dword mode, int64 _filesize) {
+	streamsize = _filesize;
+	style = STRM_READ|STRM_SEEK;
+	SetLoading();
+	mode &= ~SHAREMASK;
+	if(mode != READ) {
+		style |= STRM_WRITE;
+		SetStoring();
+	}
+	rdlim = wrlim = ptr = buffer;
+	pos = 0;
+	pagepos = -1;
+	pagedirty = false;
+	if(!buffer)
+		SetBufferSize(4096);
+	if(mode == APPEND) SeekEnd();
+}
+
+// ---------------------------- File stream -----------------------------
+
+#ifdef PLATFORM_WIN32
+
+void FileStream::SetStreamSize(int64 pos) {
+	long lo = (dword)pos, hi = (dword)(pos >> 32);
+	if(SetFilePointer(handle, lo, &hi, FILE_BEGIN) == 0xffffffff && GetLastError() != NO_ERROR ||
+	   !SetEndOfFile(handle)) {
+		SetLastError();
+	}
+}
+
+void FileStream::SetPos(int64 pos) {
+	ASSERT(IsOpen());
+	long lo = (dword)pos, hi = (dword)(pos >> 32);
+	if(SetFilePointer(handle, lo, &hi, FILE_BEGIN) == 0xffffffff && GetLastError() != NO_ERROR)
+		SetLastError();
+}
+
+dword FileStream::Read(int64 at, void *ptr, dword size) {
+	ASSERT(IsOpen() && (style & STRM_READ));
+	dword n;
+	SetPos(at);
+	if(IsError()) return 0;
+	if(!ReadFile(handle, ptr, size, (DWORD *)&n, NULL)) {
+		SetLastError();
+		return 0;
+	}
+	return n;
+}
+
+void FileStream::Write(int64 at, const void *ptr, dword size) {
+	ASSERT(IsOpen() && (style & STRM_WRITE));
+	dword n;
+	SetPos(at);
+	if(IsError()) return;
+	if(!WriteFile(handle, ptr, size, &n, NULL)) {
+		SetLastError();
+		return;
+	}
+	if(n != size)
+		SetError(ERROR_NOT_ENOUGH_SPACE);
+}
+
+FileTime FileStream::GetTime() const {
+	ASSERT(IsOpen());
+	FileTime tm;
+	GetFileTime(handle, NULL, NULL, &tm);
+	return tm;
+}
+
+void     FileStream::SetTime(const FileTime& tm) {
+	ASSERT(IsOpen());
+	Flush();
+	if(!SetFileTime(handle, NULL, NULL, &tm))
+		SetLastError();
+}
+
+bool FileStream::Open(const char *name, dword mode) {
+	LLOG("Open " << name << " mode: " << mode);
+	Close();
+	int iomode = mode & ~SHAREMASK;
+	if(IsWinNT())
+		handle = UnicodeWin32().CreateFileW(ToSystemCharsetW(name),
+			iomode == READ ? GENERIC_READ : GENERIC_READ|GENERIC_WRITE,
+			(mode & NOREADSHARE ? 0 : FILE_SHARE_READ)
+			| (mode & NOWRITESHARE ? 0 : FILE_SHARE_WRITE)
+			| (mode & DELETESHARE ? FILE_SHARE_DELETE : 0),
+			NULL,
+			iomode == READ ? OPEN_EXISTING : iomode == CREATE ? CREATE_ALWAYS : OPEN_ALWAYS,
+			FILE_ATTRIBUTE_NORMAL|FILE_FLAG_SEQUENTIAL_SCAN,
+			NULL
+		);
+	else
+		handle = CreateFile(ToSystemCharset(name),
+			iomode == READ ? GENERIC_READ : GENERIC_READ|GENERIC_WRITE,
+			(mode & NOREADSHARE ? 0 : FILE_SHARE_READ)
+			| (mode & NOWRITESHARE ? 0 : FILE_SHARE_WRITE)
+			| (mode & DELETESHARE ? FILE_SHARE_DELETE : 0),
+			NULL,
+			iomode == READ ? OPEN_EXISTING : iomode == CREATE ? CREATE_ALWAYS : OPEN_ALWAYS,
+			FILE_ATTRIBUTE_NORMAL|FILE_FLAG_SEQUENTIAL_SCAN,
+			NULL
+		);
+	if(handle == INVALID_HANDLE_VALUE) {
+		SetError();
+		return FALSE;
+	}
+	dword fsz_lo, fsz_hi;
+	fsz_lo = ::GetFileSize(handle, &fsz_hi);
+	int64 fsz;
+	if(fsz_lo == 0xffffffff && GetLastError() != NO_ERROR)
+		fsz = 0;
+	else
+		fsz = fsz_lo | (int64(fsz_hi) << 32);
+	OpenInit(iomode, fsz);
+	LLOG("OPEN " << handle);
+	return TRUE;
+}
+
+void FileStream::Close() {
+	if(!IsOpen()) return;
+	Flush();
+	LLOG("CLOSE " << handle);
+	if(!CloseHandle(handle)) {
+		LLOG("CLOSE ERROR");
+		LDUMP(GetLastErrorMessage());
+		SetLastError();
+	}
+	handle = INVALID_HANDLE_VALUE;
+}
+
+bool FileStream::IsOpen() const {
+	return handle != INVALID_HANDLE_VALUE;
+}
+
+FileStream::FileStream(const char *filename, dword mode) {
+	handle = INVALID_HANDLE_VALUE;
+	Open(filename, mode);
+}
+
+FileStream::FileStream() {
+	handle = INVALID_HANDLE_VALUE;
+}
+
+FileStream::~FileStream() {
+	Close();
+}
+
+#endif
+
+#ifdef PLATFORM_POSIX
+
+void FileStream::SetStreamSize(int64 pos)
+{
+	if(handle < 0) return;
+	LOFF_T_ cur = LSEEK64_(handle, 0, SEEK_CUR);
+	if(cur < 0) {
+		SetLastError();
+		return;
+	}
+	LOFF_T_ len = LSEEK64_(handle, 0, SEEK_END);
+	if(len < 0) {
+		SetLastError();
+		LSEEK64_(handle, cur, SEEK_SET);
+		return;
+	}
+	while(pos > len) {
+		static char buffer[1024];
+		int64 diff = pos - len;
+		int chunk = (diff > sizeof(buffer) ? sizeof(buffer) : (int)diff);
+		if(write(handle, buffer, chunk) != chunk) {
+			SetLastError();
+			LSEEK64_(handle, cur, SEEK_SET);
+			return;
+		}
+		len += chunk;
+	}
+	if(pos < len) {
+		if(cur > pos)
+			LSEEK64_(handle, cur = pos, SEEK_SET);
+		if(FTRUNCATE64_(handle, pos) < 0)
+			SetLastError();
+	}
+	if(LSEEK64_(handle, cur, SEEK_SET) < 0)
+		SetLastError();
+}
+
+void FileStream::SetPos(int64 pos) {
+	ASSERT(IsOpen());
+	if(LSEEK64_(handle, pos, SEEK_SET) < 0)
+		SetLastError();
+}
+
+dword FileStream::Read(int64 at, void *ptr, dword size) {
+	ASSERT(IsOpen() && (style & STRM_READ));
+	SetPos(at);
+	if(IsError()) return 0;
+	int n = read(handle, ptr, size);
+	if(n < 0) {
+		SetLastError();
+		return 0;
+	}
+	return n;
+}
+
+void FileStream::Write(int64 at, const void *ptr, dword size) {
+	ASSERT(IsOpen() && (style & STRM_WRITE));
+	SetPos(at);
+	if(IsError()) return;
+	int n = write(handle, ptr, size);
+	if(n < 0) {
+		SetLastError();
+		return;
+	}
+	if((dword)n != size)
+		SetError(ERROR_NOT_ENOUGH_SPACE);
+}
+
+FileTime FileStream::GetTime() const {
+	ASSERT(IsOpen());
+	struct stat fst;
+	fstat(handle, &fst);
+	return fst.st_mtime;
+}
+
+bool FileStream::Open(const char *name, dword mode, mode_t tmode) {
+	Close();
+	int iomode = mode & ~SHAREMASK;
+	handle = open(ToSystemCharset(name), iomode == READ ? O_RDONLY :
+	                    iomode == CREATE ? O_CREAT|O_RDWR|O_TRUNC :
+	                    O_RDWR,
+	              tmode);
+	if(handle >= 0) {
+		int64 fsz = LSEEK64_(handle, 0, SEEK_END);
+		if(fsz >= 0) {
+			OpenInit(mode, fsz);
+			return true;
+		}
+	}
+	SetLastError();
+	return false;
+}
+
+void FileStream::Close() {
+	if(!IsOpen()) return;
+	Flush();
+	if(close(handle) < 0)
+		SetLastError();
+	handle = -1;
+}
+
+bool FileStream::IsOpen() const {
+	return handle != -1;
+}
+
+FileStream::FileStream(const char *filename, dword mode, mode_t acm) {
+	handle = -1;
+	Open(filename, mode, acm);
+}
+
+FileStream::FileStream() {
+	handle = -1;
+}
+
+FileStream::~FileStream() {
+	Close();
+}
+
+#endif
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/Core/COPYING b/uppsrc/Core/COPYING
new file mode 100644
index 000000000..33aa39102
--- /dev/null
+++ b/uppsrc/Core/COPYING
@@ -0,0 +1,30 @@
+Copyright (C) 2005 Mirek Fidler, Tomas Rylek and various contributors (see AUTHORS)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to
+deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies of the Software and its Copyright notices. In addition publicly
+documented acknowledgment must be given that this software has been used if no
+source code of this software is made available publicly. This includes
+acknowledgments in either Copyright notices, Manuals, Publicity and Marketing
+documents or any documentation provided with any product containing this
+software. This License does not apply to any software that links to the
+libraries provided by this software (statically or dynamically), but only to
+the software provided.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+-----------
+
+Please see the COPYING.PLAIN for a plain-english explanation of this notice
+and it's intent.
diff --git a/uppsrc/Core/COPYING-PLAIN b/uppsrc/Core/COPYING-PLAIN
new file mode 100644
index 000000000..770a8132f
--- /dev/null
+++ b/uppsrc/Core/COPYING-PLAIN
@@ -0,0 +1,33 @@
+Plain English Copyright Notice
+
+This file is not intended to be the actual License. The reason this file
+exists is that we here are programmers and engineers. We aren't lawyers. We
+provide licenses that we THINK say the right things, but we have our own
+intentions at heart. This is a plain-english explanation of what those
+intentions are, and if you follow them you will be within the "spirit" of
+the license.
+
+The intent is for us to enjoy writing software that is useful to us (the
+AUTHORS) and allow others to use it freely and also benefit from the work we
+put into making it. We don't want to restrict others using it. They should
+not *HAVE* to make the source code of the applications they write that
+simply link to these libraries (be that statically or dynamically), or for
+them to be limited as to what license they choose to use (be it open, closed
+or anything else). But we would like to know you are using these libraries.
+We simply would like to know that it has been useful to someone. This is why
+we ask for acknowledgement of some sort.
+
+You can do what you want with the source of this software - it doesn't
+matter. We still have it here for ourselves and it is open and free to use
+and download and play with. It can't be taken away. We don't really mind what
+you do with the source to your software. We would simply like to know that
+you are using it - especially if it makes it to a commerical product. If you
+simply e-mail all the AUTHORS (see COPYING and AUTHORS files) telling us, and
+then make sure you include a paragraph or page in the manual or in the "About.."
+box for the product with the copyright notice and state that you used this
+software, we will be very happy. If you want to contribute back modifications
+and fixes you may have made we will welcome those too with open arms (generally).
+If you want help with changes needed, ports needed or features to be added,
+arrangements can be easily made with some dialogue.
+
+Mirek Fidler <cxl@ntllib.org>
diff --git a/uppsrc/Core/Callback.cpp b/uppsrc/Core/Callback.cpp
new file mode 100644
index 000000000..16d2bf2f9
--- /dev/null
+++ b/uppsrc/Core/Callback.cpp
@@ -0,0 +1,19 @@
+#include "Core.h"
+
+NAMESPACE_UPP
+
+//#BLITZ_APPROVE
+#define CPP_PART__
+#include "Cbgen.h"
+
+void Callback::Execute() const
+{
+	if(action) action->Execute();
+}
+
+bool Gate::Execute() const
+{
+	return (void *)action == (void *)1 ? true : action ? action->Execute() : false;
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/Core/Callback.h b/uppsrc/Core/Callback.h
new file mode 100644
index 000000000..3a2c84541
--- /dev/null
+++ b/uppsrc/Core/Callback.h
@@ -0,0 +1,379 @@
+enum _CNULL { CNULL };
+
+template <class D, class S>
+inline D brutal_cast(const S& source) { return *(D *)&source; }
+
+#include "Cbgen.h"
+
+template <class OBJECT_, class METHOD_, class T>
+struct CallbackMethodActionArgPte : public CallbackAction {
+	Ptr<OBJECT_>  object;
+	METHOD_       method;
+	T             arg;
+
+	void    Execute() { if(object) (object->*method)(arg); }
+
+	CallbackMethodActionArgPte(OBJECT_ *object, METHOD_ method, T arg)
+	: object(object), method(method), arg(arg) {}
+};
+
+template <class Object, class M, class P, class T>
+Callback pteback1(Object *object, void (M::*method)(P), T arg) {
+	return Callback(new CallbackMethodActionArgPte<Object, void (M::*)(P), T>(object, method, arg));
+}
+
+template <class OBJECT_, class METHOD_, class T>
+struct CallbackMethodActionArg : public CallbackAction {
+	OBJECT_  *object;
+	METHOD_   method;
+	T         arg;
+
+	void    Execute() { (object->*method)(arg); }
+
+	CallbackMethodActionArg(OBJECT_ *object, METHOD_ method, T arg)
+	: object(object), method(method), arg(arg) {}
+};
+
+template <class Object, class M, class P, class T>
+Callback callback1(Object *object, void (M::*method)(P), T arg) {
+	return Callback(new CallbackMethodActionArg<Object, void (M::*)(P), T>
+	                    (object, method, arg));
+}
+
+template <class Object, class M, class P, class T>
+Callback callback1(const Object *object, void (M::*method)(P) const, T arg) {
+	return Callback(new CallbackMethodActionArg<const Object, void (M::*)(P) const, T>
+	                    (object, method, arg));
+}
+
+template <class F, class T, class HC = F>
+struct CallbackActionCallArg : public CallbackAction {
+	F         fn;
+	T         arg;
+	void    Execute() { fn(arg); }
+
+	CallbackActionCallArg(F fn, T arg) : fn(fn), arg(arg) {}
+};
+
+template <class T, class P>
+Callback callback1(void (*fn)(P), T arg)
+{
+	return Callback(new CallbackActionCallArg<void (*)(P), T, uintptr_t>(fn, arg));
+}
+
+template <class OBJECT_, class METHOD_, class P1, class T>
+struct CallbackMethodActionArg1Pte : public Callback1Action<P1> {
+	Ptr<OBJECT_>  object;
+	METHOD_       method;
+	T             arg;
+	void    Execute(P1 p1) { if(object) (object->*method)(p1, arg); }
+
+	CallbackMethodActionArg1Pte(OBJECT_ *object, METHOD_ method, T arg)
+	: object(object), method(method), arg(arg) {}
+};
+
+template <class Object, class M, class P1, class P, class T>
+Callback1<P1> pteback1(Object *object, void (M::*method)(P1, P), T arg) {
+	return Callback1<P1>(new CallbackMethodActionArg1Pte<Object, void (M::*)(P1, P), P1, T> (object, method, arg));
+}
+
+template <class OBJECT_, class METHOD_, class P1, class T>
+struct CallbackMethodActionArg1 : public Callback1Action<P1> {
+	OBJECT_  *object;
+	METHOD_   method;
+	T         arg;
+	void    Execute(P1 p1) { (object->*method)(p1, arg); }
+
+	CallbackMethodActionArg1(OBJECT_ *object, METHOD_ method, T arg)
+	: object(object), method(method), arg(arg) {}
+};
+
+template <class Object, class M, class P1, class P, class T>
+Callback1<P1> callback1(Object *object, void (M::*method)(P1, P), T arg) {
+	return Callback1<P1>(new CallbackMethodActionArg1<Object, void (M::*)(P1, P), P1, T>
+	                         (object, method, arg));
+}
+
+template <class Object, class M, class P1, class P, class T>
+Callback1<P1> callback1(const Object *object, void (M::*method)(P1, P) const, T arg) {
+	return Callback1<P1>(new CallbackMethodActionArg1<const Object, void (M::*)(P1, P) const, P1, T>
+	                         (object, method, arg));
+}
+
+template <class F, class P1, class T, class HC = F>
+struct CallbackActionCallArg1 : Callback1Action<P1> {
+	F         fn;
+	T         arg;
+	void    Execute(P1 p1) { fn(p1, arg); }
+
+	CallbackActionCallArg1(F fn, T arg) : fn(fn), arg(arg) {}
+};
+
+template <class T, class P1, class P>
+Callback1<P1> callback1(void (*fn)(P1, P), T arg)
+{
+	return Callback1<P1>(new CallbackActionCallArg1<void (*)(P1, P), P1, T, uintptr_t>(fn, arg));
+}
+
+template <class T, class P>
+Callback callback1(Callback1<P> cb, T arg)
+{
+	return Callback(new CallbackActionCallArg<Callback1<P>, T>(cb, arg));
+}
+
+template <class T, class P1, class P>
+Callback1<P1> callback1(Callback2<P1, P> cb, T arg) {
+	return Callback1<P1>(new CallbackActionCallArg1<Callback2<P1, P>, P1, T>(cb, arg));
+}
+
+template <class P1>
+bool Gate1<P1>::Execute(P1 p1) const {
+	return (void *)action == (void *)1 ? true : action ? action->Execute(p1) : false;
+}
+
+template <class P1, class P2>
+bool Gate2<P1, P2>::Execute(P1 p1, P2 p2) const {
+	return (void *)action == (void *)1 ? true : action ? action->Execute(p1, p2) : false;
+}
+
+template <class P1, class P2, class P3>
+bool Gate3<P1, P2, P3>::Execute(P1 p1, P2 p2, P3 p3) const {
+	return (void *)action == (void *)1 ? true : action ? action->Execute(p1, p2, p3) : false;
+}
+
+template <class OBJECT_, class METHOD_, class T1, class T2>
+struct CallbackMethodActionArg2Pte : public CallbackAction {
+	Ptr<OBJECT_>  object;
+	METHOD_       method;
+	T1            arg1;
+	T2            arg2;
+	void    Execute() { if(object) (object->*method)(arg1, arg2); }
+
+	CallbackMethodActionArg2Pte(OBJECT_ *object, METHOD_ method, T1 arg1, T2 arg2)
+	: object(object), method(method), arg1(arg1), arg2(arg2) {}
+};
+
+template <class Object, class R, class O, class A, class B, class T1, class T2>
+Callback pteback2(Object *object, R (O::*method)(A, B), T1 arg1, T2 arg2) {
+	return Callback(new CallbackMethodActionArg2Pte<Object, R (O::*)(A, B), T1, T2>
+	                    (object, method, arg1, arg2));
+}
+
+template <class OBJECT_, class METHOD_, class T1, class T2>
+struct CallbackMethodActionArg2 : public CallbackAction {
+	OBJECT_  *object;
+	METHOD_   method;
+	T1        arg1;
+	T2        arg2;
+	void    Execute() { (object->*method)(arg1, arg2); }
+
+	CallbackMethodActionArg2(OBJECT_ *object, METHOD_ method, T1 arg1, T2 arg2)
+	: object(object), method(method), arg1(arg1), arg2(arg2) {}
+};
+
+template <class Object, class R, class O, class A, class B, class T1, class T2>
+Callback callback2(Object *object, R (O::*method)(A, B), T1 arg1, T2 arg2) {
+	return Callback(new CallbackMethodActionArg2<Object, R (O::*)(A, B), T1, T2>
+	                    (object, method, arg1, arg2));
+}
+
+template <class Object, class R, class O, class A, class B, class T1, class T2>
+Callback callback2(const Object *object, R (O::*method)(A, B) const, T1 arg1, T2 arg2) {
+	return Callback(new CallbackMethodActionArg2<Object, R (O::*)(A, B) const, T1, T2>
+	                    (object, method, arg1, arg2));
+}
+
+template <class X, class T1, class T2, class HC = X>
+struct CallbackActionCallArg2 : public CallbackAction {
+	X         x;
+	T1        arg1;
+	T2        arg2;
+	void    Execute() { x(arg1, arg2); }
+
+	CallbackActionCallArg2(X x, T1 arg1, T2 arg2) : x(x), arg1(arg1), arg2(arg2) {}
+};
+
+template <class R, class A, class B, class T1, class T2>
+Callback callback2(R (*fn)(A, B), T1 arg1, T2 arg2) {
+	return Callback(new CallbackActionCallArg2<R (*)(A, B), T1, T2, uintptr_t>(fn, arg1, arg2));
+}
+
+template <class A, class B, class T1, class T2>
+Callback callback2(Callback2<A, B> cb, T1 arg1, T2 arg2) {
+	return Callback(new CallbackActionCallArg2<Callback2<A, B>, T1, T2>(cb, arg1, arg2));
+}
+
+template <class OBJECT_, class METHOD_, class T1, class T2, class T3>
+struct CallbackMethodActionArg3Pte : public CallbackAction {
+	Ptr<OBJECT_>  object;
+	METHOD_       method;
+	T1            arg1;
+	T2            arg2;
+	T3            arg3;
+	void    Execute() { if(object) (object->*method)(arg1, arg2, arg3); }
+
+	CallbackMethodActionArg3Pte(OBJECT_ *object, METHOD_ method, T1 arg1, T2 arg2, T3 arg3)
+	: object(object), method(method), arg1(arg1), arg2(arg2), arg3(arg3) {}
+};
+
+template <class Object, class R, class O, class A, class B,class C, class T1, class T2, class T3>
+Callback pteback3(Object *object, R (O::*method)(A, B, C), T1 arg1, T2 arg2, T3 arg3) {
+	return Callback(new CallbackMethodActionArg3Pte<Object, R (O::*)(A,B,C), T1, T2, T3>
+	                    (object, method, arg1, arg2, arg3));
+}
+
+template <class OBJECT_, class METHOD_, class T1, class T2, class T3>
+struct CallbackMethodActionArg3 : public CallbackAction
+{
+	OBJECT_  *object;
+	METHOD_   method;
+	T1        arg1;
+	T2        arg2;
+	T3        arg3;
+
+	void    Execute() { (object->*method)(arg1, arg2, arg3); }
+
+	CallbackMethodActionArg3(OBJECT_ *object, METHOD_ method, T1 arg1, T2 arg2, T3 arg3)
+	: object(object), method(method), arg1(arg1), arg2(arg2), arg3(arg3) {}
+};
+
+template <class Object, class R, class O, class A, class B, class C, class T1, class T2, class T3>
+Callback callback3(Object *object, R (O::*method)(A, B, C), T1 arg1, T2 arg2, T3 arg3)
+{
+	return Callback(
+		new CallbackMethodActionArg3<Object, R (O::*)(A, B, C), T1, T2, T3>(object, method, arg1, arg2, arg3));
+}
+
+template <class Object, class R, class O, class A, class B, class C, class T1, class T2, class T3>
+Callback callback3(const Object *object, R (O::*method)(A, B, C) const, T1 arg1, T2 arg2, T3 arg3) {
+	return Callback(new CallbackMethodActionArg3<Object, R (O::*)(A, B, C) const, T1, T2, T3>
+	                    (object, method, arg1, arg2, arg3));
+}
+
+template <class X, class T1, class T2, class T3, class HC = X>
+struct CallbackActionCallArg3 : public CallbackAction {
+	X         x;
+	T1        arg1;
+	T2        arg2;
+	T3        arg3;
+	void    Execute() { x(arg1, arg2, arg3); }
+
+	CallbackActionCallArg3(X x, T1 arg1, T2 arg2, T3 arg3)
+		: x(x), arg1(arg1), arg2(arg2), arg3(arg3) {}
+};
+
+template <class R, class A, class B, class C, class T1, class T2, class T3>
+Callback callback3(R (*fn)(A, B, C), T1 arg1, T2 arg2, T3 arg3) {
+	return Callback(
+		new CallbackActionCallArg3<R (*)(A, B, C), T1, T2, T3, uintptr_t>(fn, arg1, arg2, arg3));
+}
+
+template <class A, class B, class C, class T1, class T2, class T3>
+Callback callback3(Callback3<A, B, C> cb, T1 arg1, T2 arg2, T3 arg3) {
+	return Callback(
+		new CallbackActionCallArg3<Callback3<A, B, C>, T1, T2, T3>(cb, arg1, arg2, arg3));
+}
+
+template <class OBJECT_, class METHOD_, class T1, class T2, class T3, class T4>
+struct CallbackMethodActionArg4Pte : public CallbackAction {
+	Ptr<OBJECT_>  object;
+	METHOD_       method;
+	T1            arg1;
+	T2            arg2;
+	T3            arg3;
+	T4            arg4;
+	void    Execute() { if(object) (object->*method)(arg1, arg2, arg3, arg4); }
+
+	CallbackMethodActionArg4Pte(OBJECT_ *object, METHOD_ method, T1 arg1, T2 arg2, T3 arg3, T4 arg4)
+	: object(object), method(method), arg1(arg1), arg2(arg2), arg3(arg3), arg4(arg4) {}
+};
+
+template <class Object, class R, class O, class A, class B,class C, class D, class T1, class T2, class T3, class T4>
+Callback pteback4(Object *object, R (O::*method)(A, B,C,D), T1 arg1, T2 arg2, T3 arg3, T4 arg4) {
+	return Callback(new CallbackMethodActionArg4Pte<Object, R (O::*)(A, B,C,D), T1, T2, T3, T4>
+	                    (object, method, arg1, arg2, arg3, arg4));
+}
+
+template <class OBJECT_, class METHOD_, class T1, class T2, class T3, class T4>
+struct CallbackMethodActionArg4 : public CallbackAction
+{
+	OBJECT_  *object;
+	METHOD_   method;
+	T1        arg1;
+	T2        arg2;
+	T3        arg3;
+	T4        arg4;
+
+	void    Execute() { (object->*method)(arg1, arg2, arg3, arg4); }
+
+	CallbackMethodActionArg4(OBJECT_ *object, METHOD_ method, T1 arg1, T2 arg2, T3 arg3, T4 arg4)
+	: object(object), method(method), arg1(arg1), arg2(arg2), arg3(arg3), arg4(arg4) {}
+};
+
+template <class Object, class R, class O, class A, class B, class C, class D, class T1, class T2, class T3, class T4>
+Callback callback4(Object *object, R (O::*method)(A, B, C, D), T1 arg1, T2 arg2, T3 arg3, T4 arg4)
+{
+	return Callback(
+		new CallbackMethodActionArg4<Object, R (O::*)(A, B, C, D), T1, T2, T3, T4>(object, method, arg1, arg2, arg3, arg4));
+}
+
+template <class Object, class R, class O, class A, class B, class C, class D, class T1, class T2, class T3, class T4>
+Callback callback4(const Object *object, R (O::*method)(A, B, C, D) const, T1 arg1, T2 arg2, T3 arg3, T4 arg4) {
+	return Callback(new CallbackMethodActionArg4<Object, R (O::*)(A, B,C,D) const, T1, T2, T3, T4>
+	                    (object, method, arg1, arg2, arg3, arg4));
+}
+
+template <class X, class T1, class T2, class T3, class T4, class HC = X>
+struct CallbackActionCallArg4 : public CallbackAction {
+	X         x;
+	T1        arg1;
+	T2        arg2;
+	T3        arg3;
+	T4        arg4;
+	void    Execute() { x(arg1, arg2, arg3, arg4); }
+
+	CallbackActionCallArg4(X x, T1 arg1, T2 arg2, T3 arg3, T4 arg4)
+		: x(x), arg1(arg1), arg2(arg2), arg3(arg3), arg4(arg4) {}
+};
+
+template <class R, class A, class B,class C, class D, class T1, class T2, class T3, class T4>
+Callback callback4(R (*fn)(A, B, C, D), T1 arg1, T2 arg2, T3 arg3, T4 arg4) {
+	return Callback(
+		new CallbackActionCallArg4<R (*)(A, B,C,D), T1, T2, T3, T4, uintptr_t>(fn, arg1, arg2, arg3, arg4));
+}
+
+template <class A, class B, class C, class D, class T1, class T2, class T3, class T4>
+Callback callback4(Callback4<A, B, C, D> cb, T1 arg1, T2 arg2, T3 arg3, T4 arg4) {
+	return Callback(
+		new CallbackActionCallArg4<Callback4<A, B,C,D>, T1, T2, T3, T4>(cb, arg1, arg2, arg3, arg4));
+}
+
+#define THISBACK(x)               callback(this, &CLASSNAME::x)
+#define THISBACK1(x, arg)         callback1(this, &CLASSNAME::x, arg)
+#define THISBACK2(m, a, b)        callback2(this, &CLASSNAME::m, a, b)
+#define THISBACK3(m, a, b, c)     callback3(this, &CLASSNAME::m, a, b, c)
+#define THISBACK4(m, a, b, c, d)  callback4(this, &CLASSNAME::m, a, b, c, d)
+
+#define PTEBACK(x)                pteback(this, &CLASSNAME::x)
+#define PTEBACK1(x, arg)          pteback1(this, &CLASSNAME::x, arg)
+#define PTEBACK2(m, a, b)         pteback2(this, &CLASSNAME::m, a, b)
+#define PTEBACK3(m, a, b, c)      pteback3(this, &CLASSNAME::m, a, b, c)
+#define PTEBACK4(m, a, b, c, d)   pteback4(this, &CLASSNAME::m, a, b, c, d)
+
+template <class T>
+class CallbackArgTarget
+{
+	T result;
+
+	void SetResult(const T& value)      { result = value; }
+
+public:
+	typedef CallbackArgTarget CLASSNAME;
+
+	operator const T&()                 { return result; }
+	bool IsNullInstance() const         { return IsNull(result); }
+
+	Callback operator[](const T& value) { return THISBACK1(SetResult, value); }
+
+	CallbackArgTarget()                 { result = Null; }
+};
diff --git a/uppsrc/Core/CallbackN.h b/uppsrc/Core/CallbackN.h
new file mode 100644
index 000000000..cfda9f5aa
--- /dev/null
+++ b/uppsrc/Core/CallbackN.h
@@ -0,0 +1,180 @@
+#define CallbackTemplate(name, rettype, template_, template__, _template, _tsep_, classdef, \
+                         classlist, paramdef, paramlist, return_, extension) \
+  \
+template_ classdef _template  \
+struct name##Action {  \
+	int     count;  \
+	virtual rettype  Execute(paramdef) = 0;  \
+	virtual bool     IsEqual(const name##Action *other) const = 0; \
+	virtual unsigned GetHashValue() const = 0; \
+  \
+	name##Action()          { count = 1; }  \
+	virtual ~name##Action() {}  \
+};  \
+  \
+template <class OBJECT_, class METHOD_ _tsep_ classdef>  \
+struct name##MethodAction : public name##Action template__ classlist _template {  \
+	OBJECT_  *object;  \
+	METHOD_   method; \
+	rettype Execute(paramdef) { return_ (object->*method)(paramlist); }  \
+	bool    IsEqual(const name##Action template__ classlist _template *other) const { \
+		const name##MethodAction *q = dynamic_cast<const name##MethodAction *>(other); \
+		return q ? q->object == object && q->method == method : false; \
+	} \
+	unsigned GetHashValue() const { \
+		return (unsigned)object ^ brutal_cast<unsigned>(method); \
+	} \
+   \
+	name##MethodAction(OBJECT_ *object, METHOD_ method) \
+	: object(object), method(method) {}  \
+};  \
+  \
+template_ classdef _template  \
+struct name##FnAction : public name##Action template__ classlist _template {  \
+	rettype (*fn)(paramdef);  \
+	rettype Execute(paramdef) { return_ (*fn)(paramlist); }  \
+	bool    IsEqual(const name##Action template__ classlist _template *other) const { \
+		const name##FnAction *q = dynamic_cast<const name##FnAction *>(other); \
+		return q ? q->fn == fn : false; \
+	} \
+	unsigned GetHashValue() const { \
+		return (unsigned)fn; \
+	} \
+  \
+	name##FnAction(rettype (*fn)(paramdef)) : fn(fn) {}  \
+};  \
+ \
+template_ classdef _template  \
+class name : Moveable< name template__ classlist _template > {  \
+	name##Action template__ classlist _template *action;  \
+  \
+	void Retain() const                      { if(*this) action->count++; }  \
+	void Release()                           { if(*this && --action->count == 0) delete action; }  \
+  \
+public:  \
+	typedef name CLASSNAME; \
+	name& operator=(const name& c); \
+	name(const name& c); \
+	void Clear()                             { Release(); action = NULL; } \
+	extension \
+\
+	unsigned GetHashValue() const            { return action->GetHashValue(); } \
+\
+	explicit name(name##Action template__ classlist _template *newaction) { action = newaction; } \
+	name& operator=(name##Action template__ classlist _template *newaction) { action = newaction; return *this; } \
+	name()                                   { action = NULL; }  \
+	name(_CNULL)                             { action = NULL; } \
+	~name(); \
+\
+	static name Empty()                      { return CNULL; } \
+\
+	friend bool operator==(const name& a, const name& b) { return a.action ? a.action->IsEqual(b.action) : !b.action; } \
+	friend bool operator!=(const name& a, const name& b) { return !(a == b); } \
+	/*friend unsigned GetHashValue(const name& m)          { return m.action->GetHashValue(); }*/ \
+}; \
+ \
+template <class Object, class M  _tsep_ classdef>  \
+name template__ classlist _template callback(Object *object, rettype (M::*method)(paramdef)) {  \
+	return name template__ classlist _template \
+		(new name##MethodAction<M, rettype (M::*)(paramdef) _tsep_ classlist>(object, method)); \
+} \
+ \
+template <class Object, class M  _tsep_ classdef>  \
+name template__ classlist _template callback(const Object *object, rettype (M::*method)(paramdef) const) { \
+	return name template__ classlist _template \
+		(new name##MethodAction<const M, rettype (M::*)(paramdef) const _tsep_ classlist>(object, method)); \
+} \
+ \
+template_ classdef _template  \
+inline name template__ classlist _template callback(rettype (*fn)(paramdef)) {  \
+	return name template__ classlist _template \
+		(new name##FnAction template__ classlist _template(fn)); \
+} \
+template_ classdef _template  \
+struct name##ForkAction : public name##Action template__ classlist _template {  \
+	name template__ classlist _template cb1, cb2;  \
+	rettype Execute(paramdef) { cb1(paramlist); return_ cb2(paramlist); }  \
+	bool    IsEqual(const name##Action template__ classlist _template *other) const { \
+		const name##ForkAction *q = dynamic_cast<const name##ForkAction *>(other); \
+		return q ? q->cb1 == cb1 && q->cb2 == cb2 : false; \
+	} \
+	unsigned GetHashValue() const { \
+		return ::GetHashValue(cb1) ^ ::GetHashValue(cb2); \
+	} \
+  \
+	name##ForkAction(name template__ classlist _template cb1, \
+	                 name template__ classlist _template cb2) : cb1(cb1), cb2(cb2) {}  \
+};  \
+ \
+template_ classdef _template  \
+inline \
+name template__ classlist _template callback( \
+                           name template__ classlist _template cb1, \
+                           name template__ classlist _template cb2) {  \
+	return name template__ classlist _template \
+		(new name##ForkAction template__ classlist _template(cb1, cb2)); \
+} \
+ \
+template_ classdef _template  \
+inline \
+name template__ classlist _template& operator<<( \
+                          name template__ classlist _template& a, \
+                          name template__ classlist _template b) { \
+	if(a) \
+		a = callback(a, b); \
+	else \
+		a = b; \
+	return a; \
+}
+
+#define CallbackBodyTemplate(name, template_, tlist) \
+template_ \
+name tlist& name tlist::operator=(const name& c)  { \
+	c.Retain(); Release(); action = c.action; return *this; \
+} \
+\
+template_ \
+name tlist::name(const name& c) { action = c.action; Retain(); } \
+\
+template_ \
+name tlist::~name()             { Release(); }
+
+#define _empty_
+
+//$ struct Callback;
+
+//$-
+
+CallbackTemplate(
+	/* name */       Callback,
+	/* rettype */    void,
+	/* template_ */  _empty_,
+	/* template__ */ _empty_,
+	/* _template */  _empty_,
+	/* tsep */       _empty_,
+	/* classdef */   _empty_,
+	/* classlist */  _empty_,
+	/* paramdef */   _empty_,
+	/* paramlist */  _empty_,
+	/* return_ */    _empty_,
+	operator bool() const  { return action; }
+	void operator()() const;
+)
+
+CallbackTemplate(
+	/* name */       Callback1,
+	/* rettype */    void,
+	/* template_ */  template<,
+	/* template__ */ <,
+	/* _template */  >,
+	/* tsep */       _cm_,
+	/* classdef */   class P1,
+	/* classlist */  P1,
+	/* paramdef */   P1 p1,
+	/* paramlist */  p1,
+	/* return_ */    _empty_,
+	operator bool() const          { return action; }
+	void operator()(P1 p1) const   { if(action) action->Execute(p1); }
+)
+
+CallbackBodyTemplate(Callback1, template<class P1>, <P1>)
diff --git a/uppsrc/Core/Cbgen.h b/uppsrc/Core/Cbgen.h
new file mode 100644
index 000000000..36bae5476
--- /dev/null
+++ b/uppsrc/Core/Cbgen.h
@@ -0,0 +1,1500 @@
+#ifndef CPP_PART__
+
+// -----------------------------------------------------------
+
+struct CallbackAction {
+	Atomic  count;
+
+	virtual void Execute() = 0;
+	virtual bool IsValid() const { return true; }
+
+	CallbackAction()          { count = 1; }
+	virtual ~CallbackAction() {}
+};
+
+template <class OBJECT, class METHOD>
+struct CallbackMethodActionPte : public CallbackAction {
+	Ptr<OBJECT>  object;
+	METHOD       method;
+
+	void Execute() { if(object) (object->*method)(); }
+	bool IsValid() const { return object; }
+
+	CallbackMethodActionPte(OBJECT *object, METHOD method) : object(object), method(method) {}
+};
+
+template <class OBJECT, class METHOD>
+struct CallbackMethodAction : public CallbackAction {
+	OBJECT  *object;
+	METHOD   method;
+
+	void Execute() { (object->*method)(); }
+
+	CallbackMethodAction(OBJECT *object, METHOD method) : object(object), method(method) {}
+};
+
+struct CallbackFnAction : public CallbackAction {
+	void (*fn)();
+
+	void Execute() { (*fn)(); }
+
+	CallbackFnAction(void (*fn)()) : fn(fn) {}
+};
+
+class Callback : Moveable< Callback > {
+	CallbackAction *action;
+
+	void Retain() const { if(action ) AtomicInc(action->count); }
+	void Release()      { if(action  && AtomicDec(action->count) == 0) delete action; }
+
+	bool operator==(const Callback&);
+	bool operator!=(const Callback&);
+
+public:
+	typedef Callback CLASSNAME;
+
+	Callback& operator=(const Callback& c);
+	Callback(const Callback& c);
+	void Clear()        { Release(); action = NULL; }
+
+
+	operator bool() const   { return action && action->IsValid(); }
+	void Execute() const;
+	void operator()() const { Execute(); }
+
+	explicit Callback(CallbackAction  *newaction) { action = newaction; }
+	Callback() { action = NULL; }
+	Callback(_CNULL) { action = NULL; }
+	~Callback();
+
+	static Callback Empty() { return CNULL; }
+
+};
+
+template <class OBJECT, class METHOD>
+Callback pteback(OBJECT *object, void (METHOD::*method)()) {
+	return Callback(new CallbackMethodActionPte<OBJECT, void (METHOD::*)()>(object, method));
+}
+
+template <class OBJECT, class METHOD>
+Callback callback(OBJECT *object, void (METHOD::*method)()) {
+	return Callback(new CallbackMethodAction<OBJECT, void (METHOD::*)()>(object, method));
+}
+
+template <class OBJECT, class METHOD>
+Callback callback(const OBJECT *object, void (METHOD::*method)() const) {
+	return Callback(new CallbackMethodAction<const OBJECT, void (METHOD::*)() const>(object, method));
+}
+
+inline Callback callback(void (*fn)()) {
+	return Callback(new CallbackFnAction (fn));
+}
+
+struct CallbackForkAction : public CallbackAction {
+	Callback cb1, cb2;
+
+	void Execute() { cb1(); cb2(); }
+
+	CallbackForkAction(Callback cb1, Callback cb2)
+		 : cb1(cb1), cb2(cb2) {}
+};
+
+inline Callback Proxy(Callback& cb)
+{
+	return callback(&cb, &Callback::Execute);
+}
+
+Callback callback(Callback cb1, Callback cb2);
+Callback& operator<<(Callback& a, Callback b);
+
+#endif
+#ifdef CPP_PART__
+
+Callback callback(Callback cb1, Callback cb2)
+{
+	return Callback(new CallbackForkAction (cb1, cb2));
+}
+
+Callback& operator<<(Callback& a, Callback b)
+{
+	if(a)
+		a = callback(a, b);
+	else
+		a = b;
+	return a;
+}
+
+Callback& Callback::operator=(const Callback& c)
+{
+	c.Retain();
+	Release();
+	action = c.action;
+	return *this;
+}
+
+Callback::Callback(const Callback& c)
+{
+	action = c.action;
+	Retain();
+}
+
+Callback::~Callback()
+{
+	Release();
+}
+
+#endif
+#ifndef CPP_PART__
+
+// -----------------------------------------------------------
+
+template <class P1>
+struct Callback1Action {
+	Atomic  count;
+
+	virtual void Execute(P1 p1) = 0;
+	virtual bool IsValid() const { return true; }
+
+	Callback1Action()          { count = 1; }
+	virtual ~Callback1Action() {}
+};
+
+template <class OBJECT, class METHOD, class P1>
+struct Callback1MethodActionPte : public Callback1Action<P1> {
+	Ptr<OBJECT>  object;
+	METHOD       method;
+
+	void Execute(P1 p1) { if(object) (object->*method)(p1); }
+	bool IsValid() const { return object; }
+
+	Callback1MethodActionPte(OBJECT *object, METHOD method) : object(object), method(method) {}
+};
+
+template <class OBJECT, class METHOD, class P1>
+struct Callback1MethodAction : public Callback1Action<P1> {
+	OBJECT  *object;
+	METHOD   method;
+
+	void Execute(P1 p1) { (object->*method)(p1); }
+
+	Callback1MethodAction(OBJECT *object, METHOD method) : object(object), method(method) {}
+};
+
+template <class P1>
+struct Callback1FnAction : public Callback1Action<P1> {
+	void (*fn)(P1 p1);
+
+	void Execute(P1 p1) { (*fn)(p1); }
+
+	Callback1FnAction(void (*fn)(P1 p1)) : fn(fn) {}
+};
+
+template <class P1>
+class Callback1 : Moveable< Callback1<P1> > {
+	Callback1Action<P1> *action;
+
+	void Retain() const { if(action ) AtomicInc(action->count); }
+	void Release()      { if(action  && AtomicDec(action->count) == 0) delete action; }
+
+	bool operator==(const Callback1&);
+	bool operator!=(const Callback1&);
+
+public:
+	typedef Callback1 CLASSNAME;
+
+	Callback1& operator=(const Callback1& c);
+	Callback1(const Callback1& c);
+	void Clear()        { Release(); action = NULL; }
+
+
+	operator bool() const          { return action && action->IsValid(); }
+	void Execute(P1 p1) const      { if(action) action->Execute(p1); }
+	void operator()(P1 p1) const   { Execute(p1); }
+
+	explicit Callback1(Callback1Action <P1> *newaction) { action = newaction; }
+	Callback1() { action = NULL; }
+	Callback1(_CNULL) { action = NULL; }
+	~Callback1();
+
+	static Callback1 Empty() { return CNULL; }
+
+};
+
+template <class OBJECT, class METHOD, class P1>
+Callback1<P1> pteback(OBJECT *object, void (METHOD::*method)(P1 p1)) {
+	return Callback1<P1>(new Callback1MethodActionPte<OBJECT, void (METHOD::*)(P1 p1), P1>(object, method));
+}
+
+template <class OBJECT, class METHOD, class P1>
+Callback1<P1> callback(OBJECT *object, void (METHOD::*method)(P1 p1)) {
+	return Callback1<P1>(new Callback1MethodAction<OBJECT, void (METHOD::*)(P1 p1), P1>(object, method));
+}
+
+template <class OBJECT, class METHOD, class P1>
+Callback1<P1> callback(const OBJECT *object, void (METHOD::*method)(P1 p1) const) {
+	return Callback1<P1>(new Callback1MethodAction<const OBJECT, void (METHOD::*)(P1 p1) const, P1>(object, method));
+}
+
+template <class P1>
+inline Callback1<P1> callback(void (*fn)(P1 p1)) {
+	return Callback1<P1>(new Callback1FnAction <P1>(fn));
+}
+
+template <class P1>
+struct Callback1ForkAction : public Callback1Action<P1> {
+	Callback1<P1> cb1, cb2;
+
+	void Execute(P1 p1) { cb1(p1); cb2(p1); }
+
+	Callback1ForkAction(Callback1<P1> cb1, Callback1<P1> cb2)
+		 : cb1(cb1), cb2(cb2) {}
+};
+
+template <class P1>
+inline Callback1<P1> Proxy(Callback1<P1>& cb)
+{
+	return callback(&cb, &Callback1<P1>::Execute);
+}
+
+template <class P1>
+Callback1<P1> callback(Callback1<P1> cb1, Callback1<P1> cb2)
+{
+	return Callback1<P1>(new Callback1ForkAction <P1>(cb1, cb2));
+}
+
+template <class P1>
+Callback1<P1>& operator<<(Callback1<P1>& a, Callback1<P1> b)
+{
+	if(a)
+		a = callback(a, b);
+	else
+		a = b;
+	return a;
+}
+
+template <class P1>
+Callback1<P1>& Callback1<P1>::operator=(const Callback1& c)
+{
+	c.Retain();
+	Release();
+	action = c.action;
+	return *this;
+}
+
+template <class P1>
+Callback1<P1>::Callback1(const Callback1& c)
+{
+	action = c.action;
+	Retain();
+}
+
+template <class P1>
+Callback1<P1>::~Callback1()
+{
+	Release();
+}
+
+// -----------------------------------------------------------
+
+template <class P1, class P2>
+struct Callback2Action {
+	Atomic  count;
+
+	virtual void Execute(P1 p1, P2 p2) = 0;
+	virtual bool IsValid() const { return true; }
+
+	Callback2Action()          { count = 1; }
+	virtual ~Callback2Action() {}
+};
+
+template <class OBJECT, class METHOD, class P1, class P2>
+struct Callback2MethodActionPte : public Callback2Action<P1, P2> {
+	Ptr<OBJECT>  object;
+	METHOD       method;
+
+	void Execute(P1 p1, P2 p2) { if(object) (object->*method)(p1, p2); }
+	bool IsValid() const { return object; }
+
+	Callback2MethodActionPte(OBJECT *object, METHOD method) : object(object), method(method) {}
+};
+
+template <class OBJECT, class METHOD, class P1, class P2>
+struct Callback2MethodAction : public Callback2Action<P1, P2> {
+	OBJECT  *object;
+	METHOD   method;
+
+	void Execute(P1 p1, P2 p2) { (object->*method)(p1, p2); }
+
+	Callback2MethodAction(OBJECT *object, METHOD method) : object(object), method(method) {}
+};
+
+template <class P1, class P2>
+struct Callback2FnAction : public Callback2Action<P1, P2> {
+	void (*fn)(P1 p1, P2 p2);
+
+	void Execute(P1 p1, P2 p2) { (*fn)(p1, p2); }
+
+	Callback2FnAction(void (*fn)(P1 p1, P2 p2)) : fn(fn) {}
+};
+
+template <class P1, class P2>
+class Callback2 : Moveable< Callback2<P1, P2> > {
+	Callback2Action<P1, P2> *action;
+
+	void Retain() const { if(action ) AtomicInc(action->count); }
+	void Release()      { if(action  && AtomicDec(action->count) == 0) delete action; }
+
+	bool operator==(const Callback2&);
+	bool operator!=(const Callback2&);
+
+public:
+	typedef Callback2 CLASSNAME;
+
+	Callback2& operator=(const Callback2& c);
+	Callback2(const Callback2& c);
+	void Clear()        { Release(); action = NULL; }
+
+
+	operator bool() const                { return action && action->IsValid(); }
+	void Execute(P1 p1, P2 p2) const     { if(action) action->Execute(p1, p2); }
+	void operator()(P1 p1, P2 p2) const  { Execute(p1, p2); }
+
+	explicit Callback2(Callback2Action <P1, P2> *newaction) { action = newaction; }
+	Callback2() { action = NULL; }
+	Callback2(_CNULL) { action = NULL; }
+	~Callback2();
+
+	static Callback2 Empty() { return CNULL; }
+
+};
+
+template <class OBJECT, class METHOD, class P1, class P2>
+Callback2<P1, P2> pteback(OBJECT *object, void (METHOD::*method)(P1 p1, P2 p2)) {
+	return Callback2<P1, P2>(new Callback2MethodActionPte<OBJECT, void (METHOD::*)(P1 p1, P2 p2), P1, P2>(object, method));
+}
+
+template <class OBJECT, class METHOD, class P1, class P2>
+Callback2<P1, P2> callback(OBJECT *object, void (METHOD::*method)(P1 p1, P2 p2)) {
+	return Callback2<P1, P2>(new Callback2MethodAction<OBJECT, void (METHOD::*)(P1 p1, P2 p2), P1, P2>(object, method));
+}
+
+template <class OBJECT, class METHOD, class P1, class P2>
+Callback2<P1, P2> callback(const OBJECT *object, void (METHOD::*method)(P1 p1, P2 p2) const) {
+	return Callback2<P1, P2>(new Callback2MethodAction<const OBJECT, void (METHOD::*)(P1 p1, P2 p2) const, P1, P2>(object, method));
+}
+
+template <class P1, class P2>
+inline Callback2<P1, P2> callback(void (*fn)(P1 p1, P2 p2)) {
+	return Callback2<P1, P2>(new Callback2FnAction <P1, P2>(fn));
+}
+
+template <class P1, class P2>
+struct Callback2ForkAction : public Callback2Action<P1, P2> {
+	Callback2<P1, P2> cb1, cb2;
+
+	void Execute(P1 p1, P2 p2) { cb1(p1, p2); cb2(p1, p2); }
+
+	Callback2ForkAction(Callback2<P1, P2> cb1, Callback2<P1, P2> cb2)
+		 : cb1(cb1), cb2(cb2) {}
+};
+
+template <class P1, class P2>
+inline Callback2<P1, P2> Proxy(Callback2<P1, P2>& cb)
+{
+	return callback(&cb, &Callback2<P1, P2>::Execute);
+}
+
+template <class P1, class P2>
+Callback2<P1, P2> callback(Callback2<P1, P2> cb1, Callback2<P1, P2> cb2)
+{
+	return Callback2<P1, P2>(new Callback2ForkAction <P1, P2>(cb1, cb2));
+}
+
+template <class P1, class P2>
+Callback2<P1, P2>& operator<<(Callback2<P1, P2>& a, Callback2<P1, P2> b)
+{
+	if(a)
+		a = callback(a, b);
+	else
+		a = b;
+	return a;
+}
+
+template <class P1, class P2>
+Callback2<P1, P2>& Callback2<P1, P2>::operator=(const Callback2& c)
+{
+	c.Retain();
+	Release();
+	action = c.action;
+	return *this;
+}
+
+template <class P1, class P2>
+Callback2<P1, P2>::Callback2(const Callback2& c)
+{
+	action = c.action;
+	Retain();
+}
+
+template <class P1, class P2>
+Callback2<P1, P2>::~Callback2()
+{
+	Release();
+}
+
+// -----------------------------------------------------------
+
+template <class P1, class P2, class P3>
+struct Callback3Action {
+	Atomic  count;
+
+	virtual void Execute(P1 p1, P2 p2, P3 p3) = 0;
+	virtual bool IsValid() const { return true; }
+
+	Callback3Action()          { count = 1; }
+	virtual ~Callback3Action() {}
+};
+
+template <class OBJECT, class METHOD, class P1, class P2, class P3>
+struct Callback3MethodActionPte : public Callback3Action<P1, P2, P3> {
+	Ptr<OBJECT>  object;
+	METHOD       method;
+
+	void Execute(P1 p1, P2 p2, P3 p3) { if(object) (object->*method)(p1, p2, p3); }
+	bool IsValid() const { return object; }
+
+	Callback3MethodActionPte(OBJECT *object, METHOD method) : object(object), method(method) {}
+};
+
+template <class OBJECT, class METHOD, class P1, class P2, class P3>
+struct Callback3MethodAction : public Callback3Action<P1, P2, P3> {
+	OBJECT  *object;
+	METHOD   method;
+
+	void Execute(P1 p1, P2 p2, P3 p3) { (object->*method)(p1, p2, p3); }
+
+	Callback3MethodAction(OBJECT *object, METHOD method) : object(object), method(method) {}
+};
+
+template <class P1, class P2, class P3>
+struct Callback3FnAction : public Callback3Action<P1, P2, P3> {
+	void (*fn)(P1 p1, P2 p2, P3 p3);
+
+	void Execute(P1 p1, P2 p2, P3 p3) { (*fn)(p1, p2, p3); }
+
+	Callback3FnAction(void (*fn)(P1 p1, P2 p2, P3 p3)) : fn(fn) {}
+};
+
+template <class P1, class P2, class P3>
+class Callback3 : Moveable< Callback3<P1, P2, P3> > {
+	Callback3Action<P1, P2, P3> *action;
+
+	void Retain() const { if(action ) AtomicInc(action->count); }
+	void Release()      { if(action  && AtomicDec(action->count) == 0) delete action; }
+
+	bool operator==(const Callback3&);
+	bool operator!=(const Callback3&);
+
+public:
+	typedef Callback3 CLASSNAME;
+
+	Callback3& operator=(const Callback3& c);
+	Callback3(const Callback3& c);
+	void Clear()        { Release(); action = NULL; }
+
+
+	operator bool() const                       { return action && action->IsValid(); }
+	void Execute(P1 p1, P2 p2, P3 p3) const     { if(action) action->Execute(p1, p2, p3); }
+	void operator()(P1 p1, P2 p2, P3 p3) const  { Execute(p1, p2, p3); }
+
+	explicit Callback3(Callback3Action <P1, P2, P3> *newaction) { action = newaction; }
+	Callback3() { action = NULL; }
+	Callback3(_CNULL) { action = NULL; }
+	~Callback3();
+
+	static Callback3 Empty() { return CNULL; }
+
+};
+
+template <class OBJECT, class METHOD, class P1, class P2, class P3>
+Callback3<P1, P2, P3> pteback(OBJECT *object, void (METHOD::*method)(P1 p1, P2 p2, P3 p3)) {
+	return Callback3<P1, P2, P3>(new Callback3MethodActionPte<OBJECT, void (METHOD::*)(P1 p1, P2 p2, P3 p3), P1, P2, P3>(object, method));
+}
+
+template <class OBJECT, class METHOD, class P1, class P2, class P3>
+Callback3<P1, P2, P3> callback(OBJECT *object, void (METHOD::*method)(P1 p1, P2 p2, P3 p3)) {
+	return Callback3<P1, P2, P3>(new Callback3MethodAction<OBJECT, void (METHOD::*)(P1 p1, P2 p2, P3 p3), P1, P2, P3>(object, method));
+}
+
+template <class OBJECT, class METHOD, class P1, class P2, class P3>
+Callback3<P1, P2, P3> callback(const OBJECT *object, void (METHOD::*method)(P1 p1, P2 p2, P3 p3) const) {
+	return Callback3<P1, P2, P3>(new Callback3MethodAction<const OBJECT, void (METHOD::*)(P1 p1, P2 p2, P3 p3) const, P1, P2, P3>(object, method));
+}
+
+template <class P1, class P2, class P3>
+inline Callback3<P1, P2, P3> callback(void (*fn)(P1 p1, P2 p2, P3 p3)) {
+	return Callback3<P1, P2, P3>(new Callback3FnAction <P1, P2, P3>(fn));
+}
+
+template <class P1, class P2, class P3>
+struct Callback3ForkAction : public Callback3Action<P1, P2, P3> {
+	Callback3<P1, P2, P3> cb1, cb2;
+
+	void Execute(P1 p1, P2 p2, P3 p3) { cb1(p1, p2, p3); cb2(p1, p2, p3); }
+
+	Callback3ForkAction(Callback3<P1, P2, P3> cb1, Callback3<P1, P2, P3> cb2)
+		 : cb1(cb1), cb2(cb2) {}
+};
+
+template <class P1, class P2, class P3>
+inline Callback3<P1, P2, P3> Proxy(Callback3<P1, P2, P3>& cb)
+{
+	return callback(&cb, &Callback3<P1, P2, P3>::Execute);
+}
+
+template <class P1, class P2, class P3>
+Callback3<P1, P2, P3> callback(Callback3<P1, P2, P3> cb1, Callback3<P1, P2, P3> cb2)
+{
+	return Callback3<P1, P2, P3>(new Callback3ForkAction <P1, P2, P3>(cb1, cb2));
+}
+
+template <class P1, class P2, class P3>
+Callback3<P1, P2, P3>& operator<<(Callback3<P1, P2, P3>& a, Callback3<P1, P2, P3> b)
+{
+	if(a)
+		a = callback(a, b);
+	else
+		a = b;
+	return a;
+}
+
+template <class P1, class P2, class P3>
+Callback3<P1, P2, P3>& Callback3<P1, P2, P3>::operator=(const Callback3& c)
+{
+	c.Retain();
+	Release();
+	action = c.action;
+	return *this;
+}
+
+template <class P1, class P2, class P3>
+Callback3<P1, P2, P3>::Callback3(const Callback3& c)
+{
+	action = c.action;
+	Retain();
+}
+
+template <class P1, class P2, class P3>
+Callback3<P1, P2, P3>::~Callback3()
+{
+	Release();
+}
+
+// -----------------------------------------------------------
+
+template <class P1, class P2, class P3, class P4>
+struct Callback4Action {
+	Atomic  count;
+
+	virtual void Execute(P1 p1, P2 p2, P3 p3, P4 p4) = 0;
+	virtual bool IsValid() const { return true; }
+
+	Callback4Action()          { count = 1; }
+	virtual ~Callback4Action() {}
+};
+
+template <class OBJECT, class METHOD, class P1, class P2, class P3, class P4>
+struct Callback4MethodActionPte : public Callback4Action<P1, P2, P3, P4> {
+	Ptr<OBJECT>  object;
+	METHOD       method;
+
+	void Execute(P1 p1, P2 p2, P3 p3, P4 p4) { if(object) (object->*method)(p1, p2, p3, p4); }
+	bool IsValid() const { return object; }
+
+	Callback4MethodActionPte(OBJECT *object, METHOD method) : object(object), method(method) {}
+};
+
+template <class OBJECT, class METHOD, class P1, class P2, class P3, class P4>
+struct Callback4MethodAction : public Callback4Action<P1, P2, P3, P4> {
+	OBJECT  *object;
+	METHOD   method;
+
+	void Execute(P1 p1, P2 p2, P3 p3, P4 p4) { (object->*method)(p1, p2, p3, p4); }
+
+	Callback4MethodAction(OBJECT *object, METHOD method) : object(object), method(method) {}
+};
+
+template <class P1, class P2, class P3, class P4>
+struct Callback4FnAction : public Callback4Action<P1, P2, P3, P4> {
+	void (*fn)(P1 p1, P2 p2, P3 p3, P4 p4);
+
+	void Execute(P1 p1, P2 p2, P3 p3, P4 p4) { (*fn)(p1, p2, p3, p4); }
+
+	Callback4FnAction(void (*fn)(P1 p1, P2 p2, P3 p3, P4 p4)) : fn(fn) {}
+};
+
+template <class P1, class P2, class P3, class P4>
+class Callback4 : Moveable< Callback4<P1, P2, P3, P4> > {
+	Callback4Action<P1, P2, P3, P4> *action;
+
+	void Retain() const { if(action ) AtomicInc(action->count); }
+	void Release()      { if(action  && AtomicDec(action->count) == 0) delete action; }
+
+	bool operator==(const Callback4&);
+	bool operator!=(const Callback4&);
+
+public:
+	typedef Callback4 CLASSNAME;
+
+	Callback4& operator=(const Callback4& c);
+	Callback4(const Callback4& c);
+	void Clear()        { Release(); action = NULL; }
+
+
+	operator bool() const                              { return action && action->IsValid(); }
+	void Execute(P1 p1, P2 p2, P3 p3, P4 p4) const     { if(action) action->Execute(p1, p2, p3, p4); }
+	void operator()(P1 p1, P2 p2, P3 p3, P4 p4) const  { Execute(p1, p2, p3, p4); }
+
+	explicit Callback4(Callback4Action <P1, P2, P3, P4> *newaction) { action = newaction; }
+	Callback4() { action = NULL; }
+	Callback4(_CNULL) { action = NULL; }
+	~Callback4();
+
+	static Callback4 Empty() { return CNULL; }
+
+};
+
+template <class OBJECT, class METHOD, class P1, class P2, class P3, class P4>
+Callback4<P1, P2, P3, P4> pteback(OBJECT *object, void (METHOD::*method)(P1 p1, P2 p2, P3 p3, P4 p4)) {
+	return Callback4<P1, P2, P3, P4>(new Callback4MethodActionPte<OBJECT, void (METHOD::*)(P1 p1, P2 p2, P3 p3, P4 p4), P1, P2, P3, P4>(object, method));
+}
+
+template <class OBJECT, class METHOD, class P1, class P2, class P3, class P4>
+Callback4<P1, P2, P3, P4> callback(OBJECT *object, void (METHOD::*method)(P1 p1, P2 p2, P3 p3, P4 p4)) {
+	return Callback4<P1, P2, P3, P4>(new Callback4MethodAction<OBJECT, void (METHOD::*)(P1 p1, P2 p2, P3 p3, P4 p4), P1, P2, P3, P4>(object, method));
+}
+
+template <class OBJECT, class METHOD, class P1, class P2, class P3, class P4>
+Callback4<P1, P2, P3, P4> callback(const OBJECT *object, void (METHOD::*method)(P1 p1, P2 p2, P3 p3, P4 p4) const) {
+	return Callback4<P1, P2, P3, P4>(new Callback4MethodAction<const OBJECT, void (METHOD::*)(P1 p1, P2 p2, P3 p3, P4 p4) const, P1, P2, P3, P4>(object, method));
+}
+
+template <class P1, class P2, class P3, class P4>
+inline Callback4<P1, P2, P3, P4> callback(void (*fn)(P1 p1, P2 p2, P3 p3, P4 p4)) {
+	return Callback4<P1, P2, P3, P4>(new Callback4FnAction <P1, P2, P3, P4>(fn));
+}
+
+template <class P1, class P2, class P3, class P4>
+struct Callback4ForkAction : public Callback4Action<P1, P2, P3, P4> {
+	Callback4<P1, P2, P3, P4> cb1, cb2;
+
+	void Execute(P1 p1, P2 p2, P3 p3, P4 p4) { cb1(p1, p2, p3, p4); cb2(p1, p2, p3, p4); }
+
+	Callback4ForkAction(Callback4<P1, P2, P3, P4> cb1, Callback4<P1, P2, P3, P4> cb2)
+		 : cb1(cb1), cb2(cb2) {}
+};
+
+template <class P1, class P2, class P3, class P4>
+inline Callback4<P1, P2, P3, P4> Proxy(Callback4<P1, P2, P3, P4>& cb)
+{
+	return callback(&cb, &Callback4<P1, P2, P3, P4>::Execute);
+}
+
+template <class P1, class P2, class P3, class P4>
+Callback4<P1, P2, P3, P4> callback(Callback4<P1, P2, P3, P4> cb1, Callback4<P1, P2, P3, P4> cb2)
+{
+	return Callback4<P1, P2, P3, P4>(new Callback4ForkAction <P1, P2, P3, P4>(cb1, cb2));
+}
+
+template <class P1, class P2, class P3, class P4>
+Callback4<P1, P2, P3, P4>& operator<<(Callback4<P1, P2, P3, P4>& a, Callback4<P1, P2, P3, P4> b)
+{
+	if(a)
+		a = callback(a, b);
+	else
+		a = b;
+	return a;
+}
+
+template <class P1, class P2, class P3, class P4>
+Callback4<P1, P2, P3, P4>& Callback4<P1, P2, P3, P4>::operator=(const Callback4& c)
+{
+	c.Retain();
+	Release();
+	action = c.action;
+	return *this;
+}
+
+template <class P1, class P2, class P3, class P4>
+Callback4<P1, P2, P3, P4>::Callback4(const Callback4& c)
+{
+	action = c.action;
+	Retain();
+}
+
+template <class P1, class P2, class P3, class P4>
+Callback4<P1, P2, P3, P4>::~Callback4()
+{
+	Release();
+}
+
+// -----------------------------------------------------------
+
+struct GateAction {
+	Atomic  count;
+
+	virtual bool Execute() = 0;
+	virtual bool IsValid() const { return true; }
+
+	GateAction()          { count = 1; }
+	virtual ~GateAction() {}
+};
+
+template <class OBJECT, class METHOD>
+struct GateMethodActionPte : public GateAction {
+	Ptr<OBJECT>  object;
+	METHOD       method;
+
+	bool Execute() { return object ? (object->*method)() : false; }
+	bool IsValid() const { return object; }
+
+	GateMethodActionPte(OBJECT *object, METHOD method) : object(object), method(method) {}
+};
+
+template <class OBJECT, class METHOD>
+struct GateMethodAction : public GateAction {
+	OBJECT  *object;
+	METHOD   method;
+
+	bool Execute() { return (object->*method)(); }
+
+	GateMethodAction(OBJECT *object, METHOD method) : object(object), method(method) {}
+};
+
+struct GateFnAction : public GateAction {
+	bool (*fn)();
+
+	bool Execute() { return (*fn)(); }
+
+	GateFnAction(bool (*fn)()) : fn(fn) {}
+};
+
+class Gate : Moveable< Gate > {
+	GateAction *action;
+
+	void Retain() const { if(action && (void *)action != (void *)1) AtomicInc(action->count); }
+	void Release()      { if(action && (void *)action != (void *)1 && AtomicDec(action->count) == 0) delete action; }
+
+	bool operator==(const Gate&);
+	bool operator!=(const Gate&);
+
+public:
+	typedef Gate CLASSNAME;
+
+	Gate& operator=(const Gate& c);
+	Gate(const Gate& c);
+	void Clear()        { Release(); action = NULL; }
+
+
+	operator bool() const        { return (void *)action != (void *)1 && action && action->IsValid(); }
+	bool Execute() const;
+	bool operator()() const      { return Execute(); }
+	void ClearTrue()             { Clear(); action = (GateAction *)(uintptr_t)1; }
+	void ClearFalse()            { Clear(); }
+
+	Gate(bool b)                 { action = (GateAction *)(uintptr_t)b; }
+
+	explicit Gate(GateAction  *newaction) { action = newaction; }
+	Gate() { action = NULL; }
+	Gate(_CNULL) { action = NULL; }
+	~Gate();
+
+	static Gate Empty() { return CNULL; }
+
+};
+
+template <class OBJECT, class METHOD>
+Gate pteback(OBJECT *object, bool (METHOD::*method)()) {
+	return Gate(new GateMethodActionPte<OBJECT, bool (METHOD::*)()>(object, method));
+}
+
+template <class OBJECT, class METHOD>
+Gate callback(OBJECT *object, bool (METHOD::*method)()) {
+	return Gate(new GateMethodAction<OBJECT, bool (METHOD::*)()>(object, method));
+}
+
+template <class OBJECT, class METHOD>
+Gate callback(const OBJECT *object, bool (METHOD::*method)() const) {
+	return Gate(new GateMethodAction<const OBJECT, bool (METHOD::*)() const>(object, method));
+}
+
+inline Gate callback(bool (*fn)()) {
+	return Gate(new GateFnAction (fn));
+}
+
+struct GateForkAction : public GateAction {
+	Gate cb1, cb2;
+
+	bool Execute() { cb1(); return cb2(); }
+
+	GateForkAction(Gate cb1, Gate cb2)
+		 : cb1(cb1), cb2(cb2) {}
+};
+
+inline Gate Proxy(Gate& cb)
+{
+	return callback(&cb, &Gate::Execute);
+}
+
+Gate callback(Gate cb1, Gate cb2);
+Gate& operator<<(Gate& a, Gate b);
+
+#endif
+#ifdef CPP_PART__
+
+Gate callback(Gate cb1, Gate cb2)
+{
+	return Gate(new GateForkAction (cb1, cb2));
+}
+
+Gate& operator<<(Gate& a, Gate b)
+{
+	if(a)
+		a = callback(a, b);
+	else
+		a = b;
+	return a;
+}
+
+Gate& Gate::operator=(const Gate& c)
+{
+	c.Retain();
+	Release();
+	action = c.action;
+	return *this;
+}
+
+Gate::Gate(const Gate& c)
+{
+	action = c.action;
+	Retain();
+}
+
+Gate::~Gate()
+{
+	Release();
+}
+
+#endif
+#ifndef CPP_PART__
+
+// -----------------------------------------------------------
+
+template <class P1>
+struct Gate1Action {
+	Atomic  count;
+
+	virtual bool Execute(P1 p1) = 0;
+	virtual bool IsValid() const { return true; }
+
+	Gate1Action()          { count = 1; }
+	virtual ~Gate1Action() {}
+};
+
+template <class OBJECT, class METHOD, class P1>
+struct Gate1MethodActionPte : public Gate1Action<P1> {
+	Ptr<OBJECT>  object;
+	METHOD       method;
+
+	bool Execute(P1 p1) { return object ? (object->*method)(p1) : false; }
+	bool IsValid() const { return object; }
+
+	Gate1MethodActionPte(OBJECT *object, METHOD method) : object(object), method(method) {}
+};
+
+template <class OBJECT, class METHOD, class P1>
+struct Gate1MethodAction : public Gate1Action<P1> {
+	OBJECT  *object;
+	METHOD   method;
+
+	bool Execute(P1 p1) { return (object->*method)(p1); }
+
+	Gate1MethodAction(OBJECT *object, METHOD method) : object(object), method(method) {}
+};
+
+template <class P1>
+struct Gate1FnAction : public Gate1Action<P1> {
+	bool (*fn)(P1 p1);
+
+	bool Execute(P1 p1) { return (*fn)(p1); }
+
+	Gate1FnAction(bool (*fn)(P1 p1)) : fn(fn) {}
+};
+
+template <class P1>
+class Gate1 : Moveable< Gate1<P1> > {
+	Gate1Action<P1> *action;
+
+	void Retain() const { if(action && (void *)action != (void *)1) AtomicInc(action->count); }
+	void Release()      { if(action && (void *)action != (void *)1 && AtomicDec(action->count) == 0) delete action; }
+
+	bool operator==(const Gate1&);
+	bool operator!=(const Gate1&);
+
+public:
+	typedef Gate1 CLASSNAME;
+
+	Gate1& operator=(const Gate1& c);
+	Gate1(const Gate1& c);
+	void Clear()        { Release(); action = NULL; }
+
+
+	operator bool() const        { return (void *)action != (void *)1 && action && action->IsValid(); }
+	bool Execute(P1 p1) const;
+	bool operator()(P1 p1) const { return Execute(p1); }
+	void ClearTrue()             { Clear(); action = (Gate1Action<P1> *)1; }
+	void ClearFalse()            { Clear(); }
+
+	Gate1(bool b)                { action = (Gate1Action<P1> *)(uintptr_t)b; }
+
+	explicit Gate1(Gate1Action <P1> *newaction) { action = newaction; }
+	Gate1() { action = NULL; }
+	Gate1(_CNULL) { action = NULL; }
+	~Gate1();
+
+	static Gate1 Empty() { return CNULL; }
+
+};
+
+template <class OBJECT, class METHOD, class P1>
+Gate1<P1> pteback(OBJECT *object, bool (METHOD::*method)(P1 p1)) {
+	return Gate1<P1>(new Gate1MethodActionPte<OBJECT, bool (METHOD::*)(P1 p1), P1>(object, method));
+}
+
+template <class OBJECT, class METHOD, class P1>
+Gate1<P1> callback(OBJECT *object, bool (METHOD::*method)(P1 p1)) {
+	return Gate1<P1>(new Gate1MethodAction<OBJECT, bool (METHOD::*)(P1 p1), P1>(object, method));
+}
+
+template <class OBJECT, class METHOD, class P1>
+Gate1<P1> callback(const OBJECT *object, bool (METHOD::*method)(P1 p1) const) {
+	return Gate1<P1>(new Gate1MethodAction<const OBJECT, bool (METHOD::*)(P1 p1) const, P1>(object, method));
+}
+
+template <class P1>
+inline Gate1<P1> callback(bool (*fn)(P1 p1)) {
+	return Gate1<P1>(new Gate1FnAction <P1>(fn));
+}
+
+template <class P1>
+struct Gate1ForkAction : public Gate1Action<P1> {
+	Gate1<P1> cb1, cb2;
+
+	bool Execute(P1 p1) { cb1(p1); return cb2(p1); }
+
+	Gate1ForkAction(Gate1<P1> cb1, Gate1<P1> cb2)
+		 : cb1(cb1), cb2(cb2) {}
+};
+
+template <class P1>
+inline Gate1<P1> Proxy(Gate1<P1>& cb)
+{
+	return callback(&cb, &Gate1<P1>::Execute);
+}
+
+template <class P1>
+Gate1<P1> callback(Gate1<P1> cb1, Gate1<P1> cb2)
+{
+	return Gate1<P1>(new Gate1ForkAction <P1>(cb1, cb2));
+}
+
+template <class P1>
+Gate1<P1>& operator<<(Gate1<P1>& a, Gate1<P1> b)
+{
+	if(a)
+		a = callback(a, b);
+	else
+		a = b;
+	return a;
+}
+
+template <class P1>
+Gate1<P1>& Gate1<P1>::operator=(const Gate1& c)
+{
+	c.Retain();
+	Release();
+	action = c.action;
+	return *this;
+}
+
+template <class P1>
+Gate1<P1>::Gate1(const Gate1& c)
+{
+	action = c.action;
+	Retain();
+}
+
+template <class P1>
+Gate1<P1>::~Gate1()
+{
+	Release();
+}
+
+// -----------------------------------------------------------
+
+template <class P1, class P2>
+struct Gate2Action {
+	Atomic  count;
+
+	virtual bool Execute(P1 p1, P2 p2) = 0;
+	virtual bool IsValid() const { return true; }
+
+	Gate2Action()          { count = 1; }
+	virtual ~Gate2Action() {}
+};
+
+template <class OBJECT, class METHOD, class P1, class P2>
+struct Gate2MethodActionPte : public Gate2Action<P1, P2> {
+	Ptr<OBJECT>  object;
+	METHOD       method;
+
+	bool Execute(P1 p1, P2 p2) { return object ? (object->*method)(p1, p2) : false; }
+	bool IsValid() const { return object; }
+
+	Gate2MethodActionPte(OBJECT *object, METHOD method) : object(object), method(method) {}
+};
+
+template <class OBJECT, class METHOD, class P1, class P2>
+struct Gate2MethodAction : public Gate2Action<P1, P2> {
+	OBJECT  *object;
+	METHOD   method;
+
+	bool Execute(P1 p1, P2 p2) { return (object->*method)(p1, p2); }
+
+	Gate2MethodAction(OBJECT *object, METHOD method) : object(object), method(method) {}
+};
+
+template <class P1, class P2>
+struct Gate2FnAction : public Gate2Action<P1, P2> {
+	bool (*fn)(P1 p1, P2 p2);
+
+	bool Execute(P1 p1, P2 p2) { return (*fn)(p1, p2); }
+
+	Gate2FnAction(bool (*fn)(P1 p1, P2 p2)) : fn(fn) {}
+};
+
+template <class P1, class P2>
+class Gate2 : Moveable< Gate2<P1, P2> > {
+	Gate2Action<P1, P2> *action;
+
+	void Retain() const { if(action && (void *)action != (void *)1) AtomicInc(action->count); }
+	void Release()      { if(action && (void *)action != (void *)1 && AtomicDec(action->count) == 0) delete action; }
+
+	bool operator==(const Gate2&);
+	bool operator!=(const Gate2&);
+
+public:
+	typedef Gate2 CLASSNAME;
+
+	Gate2& operator=(const Gate2& c);
+	Gate2(const Gate2& c);
+	void Clear()        { Release(); action = NULL; }
+
+
+	operator bool() const        { return (void *)action != (void *)1 && action && action->IsValid(); }
+	bool Execute(P1 p1, P2 p2) const;
+	bool operator()(P1 p1, P2 p2) const { return Execute(p1, p2); }
+	void ClearTrue()             { Clear(); action = (Gate2Action<P1, P2> *)1; }
+	void ClearFalse()            { Clear(); }
+
+	Gate2(bool b)                { action = (Gate2Action<P1, P2> *)(uintptr_t)b; }
+
+	explicit Gate2(Gate2Action <P1, P2> *newaction) { action = newaction; }
+	Gate2() { action = NULL; }
+	Gate2(_CNULL) { action = NULL; }
+	~Gate2();
+
+	static Gate2 Empty() { return CNULL; }
+
+};
+
+template <class OBJECT, class METHOD, class P1, class P2>
+Gate2<P1, P2> pteback(OBJECT *object, bool (METHOD::*method)(P1 p1, P2 p2)) {
+	return Gate2<P1, P2>(new Gate2MethodActionPte<OBJECT, bool (METHOD::*)(P1 p1, P2 p2), P1, P2>(object, method));
+}
+
+template <class OBJECT, class METHOD, class P1, class P2>
+Gate2<P1, P2> callback(OBJECT *object, bool (METHOD::*method)(P1 p1, P2 p2)) {
+	return Gate2<P1, P2>(new Gate2MethodAction<OBJECT, bool (METHOD::*)(P1 p1, P2 p2), P1, P2>(object, method));
+}
+
+template <class OBJECT, class METHOD, class P1, class P2>
+Gate2<P1, P2> callback(const OBJECT *object, bool (METHOD::*method)(P1 p1, P2 p2) const) {
+	return Gate2<P1, P2>(new Gate2MethodAction<const OBJECT, bool (METHOD::*)(P1 p1, P2 p2) const, P1, P2>(object, method));
+}
+
+template <class P1, class P2>
+inline Gate2<P1, P2> callback(bool (*fn)(P1 p1, P2 p2)) {
+	return Gate2<P1, P2>(new Gate2FnAction <P1, P2>(fn));
+}
+
+template <class P1, class P2>
+struct Gate2ForkAction : public Gate2Action<P1, P2> {
+	Gate2<P1, P2> cb1, cb2;
+
+	bool Execute(P1 p1, P2 p2) { cb1(p1, p2); return cb2(p1, p2); }
+
+	Gate2ForkAction(Gate2<P1, P2> cb1, Gate2<P1, P2> cb2)
+		 : cb1(cb1), cb2(cb2) {}
+};
+
+template <class P1, class P2>
+inline Gate2<P1, P2> Proxy(Gate2<P1, P2>& cb)
+{
+	return callback(&cb, &Gate2<P1, P2>::Execute);
+}
+
+template <class P1, class P2>
+Gate2<P1, P2> callback(Gate2<P1, P2> cb1, Gate2<P1, P2> cb2)
+{
+	return Gate2<P1, P2>(new Gate2ForkAction <P1, P2>(cb1, cb2));
+}
+
+template <class P1, class P2>
+Gate2<P1, P2>& operator<<(Gate2<P1, P2>& a, Gate2<P1, P2> b)
+{
+	if(a)
+		a = callback(a, b);
+	else
+		a = b;
+	return a;
+}
+
+template <class P1, class P2>
+Gate2<P1, P2>& Gate2<P1, P2>::operator=(const Gate2& c)
+{
+	c.Retain();
+	Release();
+	action = c.action;
+	return *this;
+}
+
+template <class P1, class P2>
+Gate2<P1, P2>::Gate2(const Gate2& c)
+{
+	action = c.action;
+	Retain();
+}
+
+template <class P1, class P2>
+Gate2<P1, P2>::~Gate2()
+{
+	Release();
+}
+
+// -----------------------------------------------------------
+
+template <class P1, class P2, class P3>
+struct Gate3Action {
+	Atomic  count;
+
+	virtual bool Execute(P1 p1, P2 p2, P3 p3) = 0;
+	virtual bool IsValid() const { return true; }
+
+	Gate3Action()          { count = 1; }
+	virtual ~Gate3Action() {}
+};
+
+template <class OBJECT, class METHOD, class P1, class P2, class P3>
+struct Gate3MethodActionPte : public Gate3Action<P1, P2, P3> {
+	Ptr<OBJECT>  object;
+	METHOD       method;
+
+	bool Execute(P1 p1, P2 p2, P3 p3) { return object ? (object->*method)(p1, p2, p3) : false; }
+	bool IsValid() const { return object; }
+
+	Gate3MethodActionPte(OBJECT *object, METHOD method) : object(object), method(method) {}
+};
+
+template <class OBJECT, class METHOD, class P1, class P2, class P3>
+struct Gate3MethodAction : public Gate3Action<P1, P2, P3> {
+	OBJECT  *object;
+	METHOD   method;
+
+	bool Execute(P1 p1, P2 p2, P3 p3) { return (object->*method)(p1, p2, p3); }
+
+	Gate3MethodAction(OBJECT *object, METHOD method) : object(object), method(method) {}
+};
+
+template <class P1, class P2, class P3>
+struct Gate3FnAction : public Gate3Action<P1, P2, P3> {
+	bool (*fn)(P1 p1, P2 p2, P3 p3);
+
+	bool Execute(P1 p1, P2 p2, P3 p3) { return (*fn)(p1, p2, p3); }
+
+	Gate3FnAction(bool (*fn)(P1 p1, P2 p2, P3 p3)) : fn(fn) {}
+};
+
+template <class P1, class P2, class P3>
+class Gate3 : Moveable< Gate3<P1, P2, P3> > {
+	Gate3Action<P1, P2, P3> *action;
+
+	void Retain() const { if(action && (void *)action != (void *)1) AtomicInc(action->count); }
+	void Release()      { if(action && (void *)action != (void *)1 && AtomicDec(action->count) == 0) delete action; }
+
+	bool operator==(const Gate3&);
+	bool operator!=(const Gate3&);
+
+public:
+	typedef Gate3 CLASSNAME;
+
+	Gate3& operator=(const Gate3& c);
+	Gate3(const Gate3& c);
+	void Clear()        { Release(); action = NULL; }
+
+
+	operator bool() const        { return (void *)action != (void *)1 && action && action->IsValid(); }
+	bool Execute(P1 p1, P2 p2, P3 p3) const;
+	bool operator()(P1 p1, P2 p2, P3 p3) const { return Execute(p1, p2, p3); }
+	void ClearTrue()             { Clear(); action = (Gate3Action<P1, P2, P3> *)1; }
+	void ClearFalse()            { Clear(); }
+
+	Gate3(bool b)                { action = (Gate3Action<P1, P2, P3> *)(uintptr_t)b; }
+
+	explicit Gate3(Gate3Action <P1, P2, P3> *newaction) { action = newaction; }
+	Gate3() { action = NULL; }
+	Gate3(_CNULL) { action = NULL; }
+	~Gate3();
+
+	static Gate3 Empty() { return CNULL; }
+
+};
+
+template <class OBJECT, class METHOD, class P1, class P2, class P3>
+Gate3<P1, P2, P3> pteback(OBJECT *object, bool (METHOD::*method)(P1 p1, P2 p2, P3 p3)) {
+	return Gate3<P1, P2, P3>(new Gate3MethodActionPte<OBJECT, bool (METHOD::*)(P1 p1, P2 p2, P3 p3), P1, P2, P3>(object, method));
+}
+
+template <class OBJECT, class METHOD, class P1, class P2, class P3>
+Gate3<P1, P2, P3> callback(OBJECT *object, bool (METHOD::*method)(P1 p1, P2 p2, P3 p3)) {
+	return Gate3<P1, P2, P3>(new Gate3MethodAction<OBJECT, bool (METHOD::*)(P1 p1, P2 p2, P3 p3), P1, P2, P3>(object, method));
+}
+
+template <class OBJECT, class METHOD, class P1, class P2, class P3>
+Gate3<P1, P2, P3> callback(const OBJECT *object, bool (METHOD::*method)(P1 p1, P2 p2, P3 p3) const) {
+	return Gate3<P1, P2, P3>(new Gate3MethodAction<const OBJECT, bool (METHOD::*)(P1 p1, P2 p2, P3 p3) const, P1, P2, P3>(object, method));
+}
+
+template <class P1, class P2, class P3>
+inline Gate3<P1, P2, P3> callback(bool (*fn)(P1 p1, P2 p2, P3 p3)) {
+	return Gate3<P1, P2, P3>(new Gate3FnAction <P1, P2, P3>(fn));
+}
+
+template <class P1, class P2, class P3>
+struct Gate3ForkAction : public Gate3Action<P1, P2, P3> {
+	Gate3<P1, P2, P3> cb1, cb2;
+
+	bool Execute(P1 p1, P2 p2, P3 p3) { cb1(p1, p2, p3); return cb2(p1, p2, p3); }
+
+	Gate3ForkAction(Gate3<P1, P2, P3> cb1, Gate3<P1, P2, P3> cb2)
+		 : cb1(cb1), cb2(cb2) {}
+};
+
+template <class P1, class P2, class P3>
+inline Gate3<P1, P2, P3> Proxy(Gate3<P1, P2, P3>& cb)
+{
+	return callback(&cb, &Gate3<P1, P2, P3>::Execute);
+}
+
+template <class P1, class P2, class P3>
+Gate3<P1, P2, P3> callback(Gate3<P1, P2, P3> cb1, Gate3<P1, P2, P3> cb2)
+{
+	return Gate3<P1, P2, P3>(new Gate3ForkAction <P1, P2, P3>(cb1, cb2));
+}
+
+template <class P1, class P2, class P3>
+Gate3<P1, P2, P3>& operator<<(Gate3<P1, P2, P3>& a, Gate3<P1, P2, P3> b)
+{
+	if(a)
+		a = callback(a, b);
+	else
+		a = b;
+	return a;
+}
+
+template <class P1, class P2, class P3>
+Gate3<P1, P2, P3>& Gate3<P1, P2, P3>::operator=(const Gate3& c)
+{
+	c.Retain();
+	Release();
+	action = c.action;
+	return *this;
+}
+
+template <class P1, class P2, class P3>
+Gate3<P1, P2, P3>::Gate3(const Gate3& c)
+{
+	action = c.action;
+	Retain();
+}
+
+template <class P1, class P2, class P3>
+Gate3<P1, P2, P3>::~Gate3()
+{
+	Release();
+}
+
+// -----------------------------------------------------------
+
+template <class P1, class P2, class P3, class P4>
+struct Gate4Action {
+	Atomic  count;
+
+	virtual bool Execute(P1 p1, P2 p2, P3 p3, P4 p4) = 0;
+	virtual bool IsValid() const { return true; }
+
+	Gate4Action()          { count = 1; }
+	virtual ~Gate4Action() {}
+};
+
+template <class OBJECT, class METHOD, class P1, class P2, class P3, class P4>
+struct Gate4MethodActionPte : public Gate4Action<P1, P2, P3, P4> {
+	Ptr<OBJECT>  object;
+	METHOD       method;
+
+	bool Execute(P1 p1, P2 p2, P3 p3, P4 p4) { return object ? (object->*method)(p1, p2, p3, p4) : false; }
+	bool IsValid() const { return object; }
+
+	Gate4MethodActionPte(OBJECT *object, METHOD method) : object(object), method(method) {}
+};
+
+template <class OBJECT, class METHOD, class P1, class P2, class P3, class P4>
+struct Gate4MethodAction : public Gate4Action<P1, P2, P3, P4> {
+	OBJECT  *object;
+	METHOD   method;
+
+	bool Execute(P1 p1, P2 p2, P3 p3, P4 p4) { return (object->*method)(p1, p2, p3, p4); }
+
+	Gate4MethodAction(OBJECT *object, METHOD method) : object(object), method(method) {}
+};
+
+template <class P1, class P2, class P3, class P4>
+struct Gate4FnAction : public Gate4Action<P1, P2, P3, P4> {
+	bool (*fn)(P1 p1, P2 p2, P3 p3, P4 p4);
+
+	bool Execute(P1 p1, P2 p2, P3 p3, P4 p4) { return (*fn)(p1, p2, p3, p4); }
+
+	Gate4FnAction(bool (*fn)(P1 p1, P2 p2, P3 p3, P4 p4)) : fn(fn) {}
+};
+
+template <class P1, class P2, class P3, class P4>
+class Gate4 : Moveable< Gate4<P1, P2, P3, P4> > {
+	Gate4Action<P1, P2, P3, P4> *action;
+
+	void Retain() const { if(action && (void *)action != (void *)1) AtomicInc(action->count); }
+	void Release()      { if(action && (void *)action != (void *)1 && AtomicDec(action->count) == 0) delete action; }
+
+	bool operator==(const Gate4&);
+	bool operator!=(const Gate4&);
+
+public:
+	typedef Gate4 CLASSNAME;
+
+	Gate4& operator=(const Gate4& c);
+	Gate4(const Gate4& c);
+	void Clear()        { Release(); action = NULL; }
+
+
+	operator bool() const        { return (void *)action != (void *)1 && action && action->IsValid(); }
+	bool Execute(P1 p1, P2 p2, P3 p3, P4 p4) const;
+	bool operator()(P1 p1, P2 p2, P3 p3, P4 p4) const { return Execute(p1, p2, p3, p4); }
+	void ClearTrue()             { Clear(); action = (Gate4Action<P1, P2, P3, P4> *)1; }
+	void ClearFalse()            { Clear(); }
+
+	Gate4(bool b)                { action = (Gate4Action<P1, P2, P3, P4> *)(uintptr_t)b; }
+
+	explicit Gate4(Gate4Action <P1, P2, P3, P4> *newaction) { action = newaction; }
+	Gate4() { action = NULL; }
+	Gate4(_CNULL) { action = NULL; }
+	~Gate4();
+
+	static Gate4 Empty() { return CNULL; }
+
+};
+
+template <class OBJECT, class METHOD, class P1, class P2, class P3, class P4>
+Gate4<P1, P2, P3, P4> pteback(OBJECT *object, bool (METHOD::*method)(P1 p1, P2 p2, P3 p3, P4 p4)) {
+	return Gate4<P1, P2, P3, P4>(new Gate4MethodActionPte<OBJECT, bool (METHOD::*)(P1 p1, P2 p2, P3 p3, P4 p4), P1, P2, P3, P4>(object, method));
+}
+
+template <class OBJECT, class METHOD, class P1, class P2, class P3, class P4>
+Gate4<P1, P2, P3, P4> callback(OBJECT *object, bool (METHOD::*method)(P1 p1, P2 p2, P3 p3, P4 p4)) {
+	return Gate4<P1, P2, P3, P4>(new Gate4MethodAction<OBJECT, bool (METHOD::*)(P1 p1, P2 p2, P3 p3, P4 p4), P1, P2, P3, P4>(object, method));
+}
+
+template <class OBJECT, class METHOD, class P1, class P2, class P3, class P4>
+Gate4<P1, P2, P3, P4> callback(const OBJECT *object, bool (METHOD::*method)(P1 p1, P2 p2, P3 p3, P4 p4) const) {
+	return Gate4<P1, P2, P3, P4>(new Gate4MethodAction<const OBJECT, bool (METHOD::*)(P1 p1, P2 p2, P3 p3, P4 p4) const, P1, P2, P3, P4>(object, method));
+}
+
+template <class P1, class P2, class P3, class P4>
+inline Gate4<P1, P2, P3, P4> callback(bool (*fn)(P1 p1, P2 p2, P3 p3, P4 p4)) {
+	return Gate4<P1, P2, P3, P4>(new Gate4FnAction <P1, P2, P3, P4>(fn));
+}
+
+template <class P1, class P2, class P3, class P4>
+struct Gate4ForkAction : public Gate4Action<P1, P2, P3, P4> {
+	Gate4<P1, P2, P3, P4> cb1, cb2;
+
+	bool Execute(P1 p1, P2 p2, P3 p3, P4 p4) { cb1(p1, p2, p3, p4); return cb2(p1, p2, p3, p4); }
+
+	Gate4ForkAction(Gate4<P1, P2, P3, P4> cb1, Gate4<P1, P2, P3, P4> cb2)
+		 : cb1(cb1), cb2(cb2) {}
+};
+
+template <class P1, class P2, class P3, class P4>
+inline Gate4<P1, P2, P3, P4> Proxy(Gate4<P1, P2, P3, P4>& cb)
+{
+	return callback(&cb, &Gate4<P1, P2, P3, P4>::Execute);
+}
+
+template <class P1, class P2, class P3, class P4>
+Gate4<P1, P2, P3, P4> callback(Gate4<P1, P2, P3, P4> cb1, Gate4<P1, P2, P3, P4> cb2)
+{
+	return Gate4<P1, P2, P3, P4>(new Gate4ForkAction <P1, P2, P3, P4>(cb1, cb2));
+}
+
+template <class P1, class P2, class P3, class P4>
+Gate4<P1, P2, P3, P4>& operator<<(Gate4<P1, P2, P3, P4>& a, Gate4<P1, P2, P3, P4> b)
+{
+	if(a)
+		a = callback(a, b);
+	else
+		a = b;
+	return a;
+}
+
+template <class P1, class P2, class P3, class P4>
+Gate4<P1, P2, P3, P4>& Gate4<P1, P2, P3, P4>::operator=(const Gate4& c)
+{
+	c.Retain();
+	Release();
+	action = c.action;
+	return *this;
+}
+
+template <class P1, class P2, class P3, class P4>
+Gate4<P1, P2, P3, P4>::Gate4(const Gate4& c)
+{
+	action = c.action;
+	Retain();
+}
+
+template <class P1, class P2, class P3, class P4>
+Gate4<P1, P2, P3, P4>::~Gate4()
+{
+	Release();
+}
+
+
+#endif
diff --git a/uppsrc/Core/CharSet.cpp b/uppsrc/Core/CharSet.cpp
new file mode 100644
index 000000000..40e7f4c74
--- /dev/null
+++ b/uppsrc/Core/CharSet.cpp
@@ -0,0 +1,1734 @@
+#include <Core/Core.h>
+
+NAMESPACE_UPP
+
+#define LLOG(x) // LOG(x)
+
+#define CUNDEF DEFAULTCHAR
+
+word CHRTAB_ISO8859_1[128] = {
+	0x0080, 0x0081, 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087,
+	0x0088, 0x0089, 0x008A, 0x008B, 0x008C, 0x008D, 0x008E, 0x008F,
+	0x0090, 0x0091, 0x0092, 0x0093, 0x0094, 0x0095, 0x0096, 0x0097,
+	0x0098, 0x0099, 0x009A, 0x009B, 0x009C, 0x009D, 0x009E, 0x009F,
+	0x00A0, 0x00A1, 0x00A2, 0x00A3, 0x00A4, 0x00A5, 0x00A6, 0x00A7,
+	0x00A8, 0x00A9, 0x00AA, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x00AF,
+	0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x00B4, 0x00B5, 0x00B6, 0x00B7,
+	0x00B8, 0x00B9, 0x00BA, 0x00BB, 0x00BC, 0x00BD, 0x00BE, 0x00BF,
+	0x00C0, 0x00C1, 0x00C2, 0x00C3, 0x00C4, 0x00C5, 0x00C6, 0x00C7,
+	0x00C8, 0x00C9, 0x00CA, 0x00CB, 0x00CC, 0x00CD, 0x00CE, 0x00CF,
+	0x00D0, 0x00D1, 0x00D2, 0x00D3, 0x00D4, 0x00D5, 0x00D6, 0x00D7,
+	0x00D8, 0x00D9, 0x00DA, 0x00DB, 0x00DC, 0x00DD, 0x00DE, 0x00DF,
+	0x00E0, 0x00E1, 0x00E2, 0x00E3, 0x00E4, 0x00E5, 0x00E6, 0x00E7,
+	0x00E8, 0x00E9, 0x00EA, 0x00EB, 0x00EC, 0x00ED, 0x00EE, 0x00EF,
+	0x00F0, 0x00F1, 0x00F2, 0x00F3, 0x00F4, 0x00F5, 0x00F6, 0x00F7,
+	0x00F8, 0x00F9, 0x00FA, 0x00FB, 0x00FC, 0x00FD, 0x00FE, 0x00FF,
+};
+
+word CHRTAB_ISO8859_2[128] = {
+	0x0080, 0x0081, 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087,
+	0x0088, 0x0089, 0x008A, 0x008B, 0x008C, 0x008D, 0x008E, 0x008F,
+	0x0090, 0x0091, 0x0092, 0x0093, 0x0094, 0x0095, 0x0096, 0x0097,
+	0x0098, 0x0099, 0x009A, 0x009B, 0x009C, 0x009D, 0x009E, 0x009F,
+	0x00A0, 0x0104, 0x02D8, 0x0141, 0x00A4, 0x013D, 0x015A, 0x00A7,
+	0x00A8, 0x0160, 0x015E, 0x0164, 0x0179, 0x00AD, 0x017D, 0x017B,
+	0x00B0, 0x0105, 0x02DB, 0x0142, 0x00B4, 0x013E, 0x015B, 0x02C7,
+	0x00B8, 0x0161, 0x015F, 0x0165, 0x017A, 0x02DD, 0x017E, 0x017C,
+	0x0154, 0x00C1, 0x00C2, 0x0102, 0x00C4, 0x0139, 0x0106, 0x00C7,
+	0x010C, 0x00C9, 0x0118, 0x00CB, 0x011A, 0x00CD, 0x00CE, 0x010E,
+	0x0110, 0x0143, 0x0147, 0x00D3, 0x00D4, 0x0150, 0x00D6, 0x00D7,
+	0x0158, 0x016E, 0x00DA, 0x0170, 0x00DC, 0x00DD, 0x0162, 0x00DF,
+	0x0155, 0x00E1, 0x00E2, 0x0103, 0x00E4, 0x013A, 0x0107, 0x00E7,
+	0x010D, 0x00E9, 0x0119, 0x00EB, 0x011B, 0x00ED, 0x00EE, 0x010F,
+	0x0111, 0x0144, 0x0148, 0x00F3, 0x00F4, 0x0151, 0x00F6, 0x00F7,
+	0x0159, 0x016F, 0x00FA, 0x0171, 0x00FC, 0x00FD, 0x0163, 0x02D9,
+};
+
+word CHRTAB_ISO8859_3[128] = {
+	0x0080, 0x0081, 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087,
+	0x0088, 0x0089, 0x008A, 0x008B, 0x008C, 0x008D, 0x008E, 0x008F,
+	0x0090, 0x0091, 0x0092, 0x0093, 0x0094, 0x0095, 0x0096, 0x0097,
+	0x0098, 0x0099, 0x009A, 0x009B, 0x009C, 0x009D, 0x009E, 0x009F,
+	0x00A0, 0x0126, 0x02D8, 0x00A3, 0x00A4, CUNDEF, 0x0124, 0x00A7,
+	0x00A8, 0x0130, 0x015E, 0x011E, 0x0134, 0x00AD, CUNDEF, 0x017B,
+	0x00B0, 0x0127, 0x00B2, 0x00B3, 0x00B4, 0x00B5, 0x0125, 0x00B7,
+	0x00B8, 0x0131, 0x015F, 0x011F, 0x0135, 0x00BD, CUNDEF, 0x017C,
+	0x00C0, 0x00C1, 0x00C2, CUNDEF, 0x00C4, 0x010A, 0x0108, 0x00C7,
+	0x00C8, 0x00C9, 0x00CA, 0x00CB, 0x00CC, 0x00CD, 0x00CE, 0x00CF,
+	CUNDEF, 0x00D1, 0x00D2, 0x00D3, 0x00D4, 0x0120, 0x00D6, 0x00D7,
+	0x011C, 0x00D9, 0x00DA, 0x00DB, 0x00DC, 0x016C, 0x015C, 0x00DF,
+	0x00E0, 0x00E1, 0x00E2, CUNDEF, 0x00E4, 0x010B, 0x0109, 0x00E7,
+	0x00E8, 0x00E9, 0x00EA, 0x00EB, 0x00EC, 0x00ED, 0x00EE, 0x00EF,
+	CUNDEF, 0x00F1, 0x00F2, 0x00F3, 0x00F4, 0x0121, 0x00F6, 0x00F7,
+	0x011D, 0x00F9, 0x00FA, 0x00FB, 0x00FC, 0x016D, 0x015D, 0x02D9,
+};
+
+word CHRTAB_ISO8859_4[128] = {
+	0x0080, 0x0081, 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087,
+	0x0088, 0x0089, 0x008A, 0x008B, 0x008C, 0x008D, 0x008E, 0x008F,
+	0x0090, 0x0091, 0x0092, 0x0093, 0x0094, 0x0095, 0x0096, 0x0097,
+	0x0098, 0x0099, 0x009A, 0x009B, 0x009C, 0x009D, 0x009E, 0x009F,
+	0x00A0, 0x0104, 0x0138, 0x0156, 0x00A4, 0x0128, 0x013B, 0x00A7,
+	0x00A8, 0x0160, 0x0112, 0x0122, 0x0166, 0x00AD, 0x017D, 0x00AF,
+	0x00B0, 0x0105, 0x02DB, 0x0157, 0x00B4, 0x0129, 0x013C, 0x02C7,
+	0x00B8, 0x0161, 0x0113, 0x0123, 0x0167, 0x014A, 0x017E, 0x014B,
+	0x0100, 0x00C1, 0x00C2, 0x00C3, 0x00C4, 0x00C5, 0x00C6, 0x012E,
+	0x010C, 0x00C9, 0x0118, 0x00CB, 0x0116, 0x00CD, 0x00CE, 0x012A,
+	0x0110, 0x0145, 0x014C, 0x0136, 0x00D4, 0x00D5, 0x00D6, 0x00D7,
+	0x00D8, 0x0172, 0x00DA, 0x00DB, 0x00DC, 0x0168, 0x016A, 0x00DF,
+	0x0101, 0x00E1, 0x00E2, 0x00E3, 0x00E4, 0x00E5, 0x00E6, 0x012F,
+	0x010D, 0x00E9, 0x0119, 0x00EB, 0x0117, 0x00ED, 0x00EE, 0x012B,
+	0x0111, 0x0146, 0x014D, 0x0137, 0x00F4, 0x00F5, 0x00F6, 0x00F7,
+	0x00F8, 0x0173, 0x00FA, 0x00FB, 0x00FC, 0x0169, 0x016B, 0x02D9,
+};
+
+word CHRTAB_ISO8859_5[128] = {
+	0x0080, 0x0081, 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087,
+	0x0088, 0x0089, 0x008A, 0x008B, 0x008C, 0x008D, 0x008E, 0x008F,
+	0x0090, 0x0091, 0x0092, 0x0093, 0x0094, 0x0095, 0x0096, 0x0097,
+	0x0098, 0x0099, 0x009A, 0x009B, 0x009C, 0x009D, 0x009E, 0x009F,
+	0x00A0, 0x0401, 0x0402, 0x0403, 0x0404, 0x0405, 0x0406, 0x0407,
+	0x0408, 0x0409, 0x040A, 0x040B, 0x040C, 0x00AD, 0x040E, 0x040F,
+	0x0410, 0x0411, 0x0412, 0x0413, 0x0414, 0x0415, 0x0416, 0x0417,
+	0x0418, 0x0419, 0x041A, 0x041B, 0x041C, 0x041D, 0x041E, 0x041F,
+	0x0420, 0x0421, 0x0422, 0x0423, 0x0424, 0x0425, 0x0426, 0x0427,
+	0x0428, 0x0429, 0x042A, 0x042B, 0x042C, 0x042D, 0x042E, 0x042F,
+	0x0430, 0x0431, 0x0432, 0x0433, 0x0434, 0x0435, 0x0436, 0x0437,
+	0x0438, 0x0439, 0x043A, 0x043B, 0x043C, 0x043D, 0x043E, 0x043F,
+	0x0440, 0x0441, 0x0442, 0x0443, 0x0444, 0x0445, 0x0446, 0x0447,
+	0x0448, 0x0449, 0x044A, 0x044B, 0x044C, 0x044D, 0x044E, 0x044F,
+	0x2116, 0x0451, 0x0452, 0x0453, 0x0454, 0x0455, 0x0456, 0x0457,
+	0x0458, 0x0459, 0x045A, 0x045B, 0x045C, 0x00A7, 0x045E, 0x045F,
+};
+
+word CHRTAB_ISO8859_6[128] = {
+	0x0080, 0x0081, 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087,
+	0x0088, 0x0089, 0x008A, 0x008B, 0x008C, 0x008D, 0x008E, 0x008F,
+	0x0090, 0x0091, 0x0092, 0x0093, 0x0094, 0x0095, 0x0096, 0x0097,
+	0x0098, 0x0099, 0x009A, 0x009B, 0x009C, 0x009D, 0x009E, 0x009F,
+	0x00A0, CUNDEF, CUNDEF, CUNDEF, 0x00A4, CUNDEF, CUNDEF, CUNDEF,
+	CUNDEF, CUNDEF, CUNDEF, CUNDEF, 0x060C, 0x00AD, CUNDEF, CUNDEF,
+	CUNDEF, CUNDEF, CUNDEF, CUNDEF, CUNDEF, CUNDEF, CUNDEF, CUNDEF,
+	CUNDEF, CUNDEF, CUNDEF, 0x061B, CUNDEF, CUNDEF, CUNDEF, 0x061F,
+	CUNDEF, 0x0621, 0x0622, 0x0623, 0x0624, 0x0625, 0x0626, 0x0627,
+	0x0628, 0x0629, 0x062A, 0x062B, 0x062C, 0x062D, 0x062E, 0x062F,
+	0x0630, 0x0631, 0x0632, 0x0633, 0x0634, 0x0635, 0x0636, 0x0637,
+	0x0638, 0x0639, 0x063A, CUNDEF, CUNDEF, CUNDEF, CUNDEF, CUNDEF,
+	0x0640, 0x0641, 0x0642, 0x0643, 0x0644, 0x0645, 0x0646, 0x0647,
+	0x0648, 0x0649, 0x064A, 0x064B, 0x064C, 0x064D, 0x064E, 0x064F,
+	0x0650, 0x0651, 0x0652, CUNDEF, CUNDEF, CUNDEF, CUNDEF, CUNDEF,
+	CUNDEF, CUNDEF, CUNDEF, CUNDEF, CUNDEF, CUNDEF, CUNDEF, CUNDEF,
+};
+
+word CHRTAB_ISO8859_7[128] = {
+	0x0080, 0x0081, 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087,
+	0x0088, 0x0089, 0x008A, 0x008B, 0x008C, 0x008D, 0x008E, 0x008F,
+	0x0090, 0x0091, 0x0092, 0x0093, 0x0094, 0x0095, 0x0096, 0x0097,
+	0x0098, 0x0099, 0x009A, 0x009B, 0x009C, 0x009D, 0x009E, 0x009F,
+	0x00A0, 0x2018, 0x2019, 0x00A3, CUNDEF, CUNDEF, 0x00A6, 0x00A7,
+	0x00A8, 0x00A9, CUNDEF, 0x00AB, 0x00AC, 0x00AD, CUNDEF, 0x2015,
+	0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x0384, 0x0385, 0x0386, 0x00B7,
+	0x0388, 0x0389, 0x038A, 0x00BB, 0x038C, 0x00BD, 0x038E, 0x038F,
+	0x0390, 0x0391, 0x0392, 0x0393, 0x0394, 0x0395, 0x0396, 0x0397,
+	0x0398, 0x0399, 0x039A, 0x039B, 0x039C, 0x039D, 0x039E, 0x039F,
+	0x03A0, 0x03A1, CUNDEF, 0x03A3, 0x03A4, 0x03A5, 0x03A6, 0x03A7,
+	0x03A8, 0x03A9, 0x03AA, 0x03AB, 0x03AC, 0x03AD, 0x03AE, 0x03AF,
+	0x03B0, 0x03B1, 0x03B2, 0x03B3, 0x03B4, 0x03B5, 0x03B6, 0x03B7,
+	0x03B8, 0x03B9, 0x03BA, 0x03BB, 0x03BC, 0x03BD, 0x03BE, 0x03BF,
+	0x03C0, 0x03C1, 0x03C2, 0x03C3, 0x03C4, 0x03C5, 0x03C6, 0x03C7,
+	0x03C8, 0x03C9, 0x03CA, 0x03CB, 0x03CC, 0x03CD, 0x03CE, CUNDEF,
+};
+
+word CHRTAB_ISO8859_8[128] = {
+	0x0080, 0x0081, 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087,
+	0x0088, 0x0089, 0x008A, 0x008B, 0x008C, 0x008D, 0x008E, 0x008F,
+	0x0090, 0x0091, 0x0092, 0x0093, 0x0094, 0x0095, 0x0096, 0x0097,
+	0x0098, 0x0099, 0x009A, 0x009B, 0x009C, 0x009D, 0x009E, 0x009F,
+	0x00A0, CUNDEF, 0x00A2, 0x00A3, 0x00A4, 0x00A5, 0x00A6, 0x00A7,
+	0x00A8, 0x00A9, 0x00D7, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x00AF,
+	0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x00B4, 0x00B5, 0x00B6, 0x00B7,
+	0x00B8, 0x00B9, 0x00F7, 0x00BB, 0x00BC, 0x00BD, 0x00BE, CUNDEF,
+	CUNDEF, CUNDEF, CUNDEF, CUNDEF, CUNDEF, CUNDEF, CUNDEF, CUNDEF,
+	CUNDEF, CUNDEF, CUNDEF, CUNDEF, CUNDEF, CUNDEF, CUNDEF, CUNDEF,
+	CUNDEF, CUNDEF, CUNDEF, CUNDEF, CUNDEF, CUNDEF, CUNDEF, CUNDEF,
+	CUNDEF, CUNDEF, CUNDEF, CUNDEF, CUNDEF, CUNDEF, CUNDEF, 0x2017,
+	0x05D0, 0x05D1, 0x05D2, 0x05D3, 0x05D4, 0x05D5, 0x05D6, 0x05D7,
+	0x05D8, 0x05D9, 0x05DA, 0x05DB, 0x05DC, 0x05DD, 0x05DE, 0x05DF,
+	0x05E0, 0x05E1, 0x05E2, 0x05E3, 0x05E4, 0x05E5, 0x05E6, 0x05E7,
+	0x05E8, 0x05E9, 0x05EA, CUNDEF, CUNDEF, 0x200E, 0x200F, CUNDEF,
+};
+
+word CHRTAB_ISO8859_9[128] = {
+	0x0080, 0x0081, 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087,
+	0x0088, 0x0089, 0x008A, 0x008B, 0x008C, 0x008D, 0x008E, 0x008F,
+	0x0090, 0x0091, 0x0092, 0x0093, 0x0094, 0x0095, 0x0096, 0x0097,
+	0x0098, 0x0099, 0x009A, 0x009B, 0x009C, 0x009D, 0x009E, 0x009F,
+	0x00A0, 0x00A1, 0x00A2, 0x00A3, 0x00A4, 0x00A5, 0x00A6, 0x00A7,
+	0x00A8, 0x00A9, 0x00AA, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x00AF,
+	0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x00B4, 0x00B5, 0x00B6, 0x00B7,
+	0x00B8, 0x00B9, 0x00BA, 0x00BB, 0x00BC, 0x00BD, 0x00BE, 0x00BF,
+	0x00C0, 0x00C1, 0x00C2, 0x00C3, 0x00C4, 0x00C5, 0x00C6, 0x00C7,
+	0x00C8, 0x00C9, 0x00CA, 0x00CB, 0x00CC, 0x00CD, 0x00CE, 0x00CF,
+	0x011E, 0x00D1, 0x00D2, 0x00D3, 0x00D4, 0x00D5, 0x00D6, 0x00D7,
+	0x00D8, 0x00D9, 0x00DA, 0x00DB, 0x00DC, 0x0130, 0x015E, 0x00DF,
+	0x00E0, 0x00E1, 0x00E2, 0x00E3, 0x00E4, 0x00E5, 0x00E6, 0x00E7,
+	0x00E8, 0x00E9, 0x00EA, 0x00EB, 0x00EC, 0x00ED, 0x00EE, 0x00EF,
+	0x011F, 0x00F1, 0x00F2, 0x00F3, 0x00F4, 0x00F5, 0x00F6, 0x00F7,
+	0x00F8, 0x00F9, 0x00FA, 0x00FB, 0x00FC, 0x0131, 0x015F, 0x00FF,
+};
+
+word CHRTAB_ISO8859_10[128] = {
+	0x0080, 0x0081, 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087,
+	0x0088, 0x0089, 0x008A, 0x008B, 0x008C, 0x008D, 0x008E, 0x008F,
+	0x0090, 0x0091, 0x0092, 0x0093, 0x0094, 0x0095, 0x0096, 0x0097,
+	0x0098, 0x0099, 0x009A, 0x009B, 0x009C, 0x009D, 0x009E, 0x009F,
+	0x00A0, 0x0104, 0x0112, 0x0122, 0x012A, 0x0128, 0x0136, 0x00A7,
+	0x013B, 0x0110, 0x0160, 0x0166, 0x017D, 0x00AD, 0x016A, 0x014A,
+	0x00B0, 0x0105, 0x0113, 0x0123, 0x012B, 0x0129, 0x0137, 0x00B7,
+	0x013C, 0x0111, 0x0161, 0x0167, 0x017E, 0x2015, 0x016B, 0x014B,
+	0x0100, 0x00C1, 0x00C2, 0x00C3, 0x00C4, 0x00C5, 0x00C6, 0x012E,
+	0x010C, 0x00C9, 0x0118, 0x00CB, 0x0116, 0x00CD, 0x00CE, 0x00CF,
+	0x00D0, 0x0145, 0x014C, 0x00D3, 0x00D4, 0x00D5, 0x00D6, 0x0168,
+	0x00D8, 0x0172, 0x00DA, 0x00DB, 0x00DC, 0x00DD, 0x00DE, 0x00DF,
+	0x0101, 0x00E1, 0x00E2, 0x00E3, 0x00E4, 0x00E5, 0x00E6, 0x012F,
+	0x010D, 0x00E9, 0x0119, 0x00EB, 0x0117, 0x00ED, 0x00EE, 0x00EF,
+	0x00F0, 0x0146, 0x014D, 0x00F3, 0x00F4, 0x00F5, 0x00F6, 0x0169,
+	0x00F8, 0x0173, 0x00FA, 0x00FB, 0x00FC, 0x00FD, 0x00FE, 0x0138,
+};
+
+word CHRTAB_ISO8859_13[128] = {
+	0x0080, 0x0081, 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087,
+	0x0088, 0x0089, 0x008A, 0x008B, 0x008C, 0x008D, 0x008E, 0x008F,
+	0x0090, 0x0091, 0x0092, 0x0093, 0x0094, 0x0095, 0x0096, 0x0097,
+	0x0098, 0x0099, 0x009A, 0x009B, 0x009C, 0x009D, 0x009E, 0x009F,
+	0x00A0, 0x201D, 0x00A2, 0x00A3, 0x00A4, 0x201E, 0x00A6, 0x00A7,
+	0x00D8, 0x00A9, 0x0156, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x00C6,
+	0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x201C, 0x00B5, 0x00B6, 0x00B7,
+	0x00F8, 0x00B9, 0x0157, 0x00BB, 0x00BC, 0x00BD, 0x00BE, 0x00E6,
+	0x0104, 0x012E, 0x0100, 0x0106, 0x00C4, 0x00C5, 0x0118, 0x0112,
+	0x010C, 0x00C9, 0x0179, 0x0116, 0x0122, 0x0136, 0x012A, 0x013B,
+	0x0160, 0x0143, 0x0145, 0x00D3, 0x014C, 0x00D5, 0x00D6, 0x00D7,
+	0x0172, 0x0141, 0x015A, 0x016A, 0x00DC, 0x017B, 0x017D, 0x00DF,
+	0x0105, 0x012F, 0x0101, 0x0107, 0x00E4, 0x00E5, 0x0119, 0x0113,
+	0x010D, 0x00E9, 0x017A, 0x0117, 0x0123, 0x0137, 0x012B, 0x013C,
+	0x0161, 0x0144, 0x0146, 0x00F3, 0x014D, 0x00F5, 0x00F6, 0x00F7,
+	0x0173, 0x0142, 0x015B, 0x016B, 0x00FC, 0x017C, 0x017E, 0x2019,
+};
+
+word CHRTAB_ISO8859_14[128] = {
+	0x0080, 0x0081, 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087,
+	0x0088, 0x0089, 0x008A, 0x008B, 0x008C, 0x008D, 0x008E, 0x008F,
+	0x0090, 0x0091, 0x0092, 0x0093, 0x0094, 0x0095, 0x0096, 0x0097,
+	0x0098, 0x0099, 0x009A, 0x009B, 0x009C, 0x009D, 0x009E, 0x009F,
+	0x00A0, 0x1E02, 0x1E03, 0x00A3, 0x010A, 0x010B, 0x1E0A, 0x00A7,
+	0x1E80, 0x00A9, 0x1E82, 0x1E0B, 0x1EF2, 0x00AD, 0x00AE, 0x0178,
+	0x1E1E, 0x1E1F, 0x0120, 0x0121, 0x1E40, 0x1E41, 0x00B6, 0x1E56,
+	0x1E81, 0x1E57, 0x1E83, 0x1E60, 0x1EF3, 0x1E84, 0x1E85, 0x1E61,
+	0x00C0, 0x00C1, 0x00C2, 0x00C3, 0x00C4, 0x00C5, 0x00C6, 0x00C7,
+	0x00C8, 0x00C9, 0x00CA, 0x00CB, 0x00CC, 0x00CD, 0x00CE, 0x00CF,
+	0x0174, 0x00D1, 0x00D2, 0x00D3, 0x00D4, 0x00D5, 0x00D6, 0x1E6A,
+	0x00D8, 0x00D9, 0x00DA, 0x00DB, 0x00DC, 0x00DD, 0x0176, 0x00DF,
+	0x00E0, 0x00E1, 0x00E2, 0x00E3, 0x00E4, 0x00E5, 0x00E6, 0x00E7,
+	0x00E8, 0x00E9, 0x00EA, 0x00EB, 0x00EC, 0x00ED, 0x00EE, 0x00EF,
+	0x0175, 0x00F1, 0x00F2, 0x00F3, 0x00F4, 0x00F5, 0x00F6, 0x1E6B,
+	0x00F8, 0x00F9, 0x00FA, 0x00FB, 0x00FC, 0x00FD, 0x0177, 0x00FF,
+};
+
+word CHRTAB_ISO8859_15[128] = {
+	0x0080, 0x0081, 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087,
+	0x0088, 0x0089, 0x008A, 0x008B, 0x008C, 0x008D, 0x008E, 0x008F,
+	0x0090, 0x0091, 0x0092, 0x0093, 0x0094, 0x0095, 0x0096, 0x0097,
+	0x0098, 0x0099, 0x009A, 0x009B, 0x009C, 0x009D, 0x009E, 0x009F,
+	0x00A0, 0x00A1, 0x00A2, 0x00A3, 0x20AC, 0x00A5, 0x0160, 0x00A7,
+	0x0161, 0x00A9, 0x00AA, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x00AF,
+	0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x017D, 0x00B5, 0x00B6, 0x00B7,
+	0x017E, 0x00B9, 0x00BA, 0x00BB, 0x0152, 0x0153, 0x0178, 0x00BF,
+	0x00C0, 0x00C1, 0x00C2, 0x00C3, 0x00C4, 0x00C5, 0x00C6, 0x00C7,
+	0x00C8, 0x00C9, 0x00CA, 0x00CB, 0x00CC, 0x00CD, 0x00CE, 0x00CF,
+	0x00D0, 0x00D1, 0x00D2, 0x00D3, 0x00D4, 0x00D5, 0x00D6, 0x00D7,
+	0x00D8, 0x00D9, 0x00DA, 0x00DB, 0x00DC, 0x00DD, 0x00DE, 0x00DF,
+	0x00E0, 0x00E1, 0x00E2, 0x00E3, 0x00E4, 0x00E5, 0x00E6, 0x00E7,
+	0x00E8, 0x00E9, 0x00EA, 0x00EB, 0x00EC, 0x00ED, 0x00EE, 0x00EF,
+	0x00F0, 0x00F1, 0x00F2, 0x00F3, 0x00F4, 0x00F5, 0x00F6, 0x00F7,
+	0x00F8, 0x00F9, 0x00FA, 0x00FB, 0x00FC, 0x00FD, 0x00FE, 0x00FF,
+};
+
+word CHRTAB_ISO8859_16[128] = {
+	0x0080, 0x0081, 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087,
+	0x0088, 0x0089, 0x008A, 0x008B, 0x008C, 0x008D, 0x008E, 0x008F,
+	0x0090, 0x0091, 0x0092, 0x0093, 0x0094, 0x0095, 0x0096, 0x0097,
+	0x0098, 0x0099, 0x009A, 0x009B, 0x009C, 0x009D, 0x009E, 0x009F,
+	0x00A0, 0x0104, 0x0105, 0x0141, 0x20AC, 0x201E, 0x0160, 0x00A7,
+	0x0161, 0x00A9, 0x0218, 0x00AB, 0x0179, 0x00AD, 0x017A, 0x017B,
+	0x00B0, 0x00B1, 0x010C, 0x0142, 0x017D, 0x201D, 0x00B6, 0x00B7,
+	0x017E, 0x010D, 0x0219, 0x00BB, 0x0152, 0x0153, 0x0178, 0x017C,
+	0x00C0, 0x00C1, 0x00C2, 0x0102, 0x00C4, 0x0106, 0x00C6, 0x00C7,
+	0x00C8, 0x00C9, 0x00CA, 0x00CB, 0x00CC, 0x00CD, 0x00CE, 0x00CF,
+	0x0110, 0x0143, 0x00D2, 0x00D3, 0x00D4, 0x0150, 0x00D6, 0x015A,
+	0x0170, 0x00D9, 0x00DA, 0x00DB, 0x00DC, 0x0118, 0x021A, 0x00DF,
+	0x00E0, 0x00E1, 0x00E2, 0x0103, 0x00E4, 0x0107, 0x00E6, 0x00E7,
+	0x00E8, 0x00E9, 0x00EA, 0x00EB, 0x00EC, 0x00ED, 0x00EE, 0x00EF,
+	0x0111, 0x0144, 0x00F2, 0x00F3, 0x00F4, 0x0151, 0x00F6, 0x015B,
+	0x0171, 0x00F9, 0x00FA, 0x00FB, 0x00FC, 0x0119, 0x021B, 0x00FF,
+};
+
+word CHRTAB_WIN1250[128] = {
+	0x20AC, CUNDEF, 0x201A, CUNDEF, 0x201E, 0x2026, 0x2020, 0x2021,
+	CUNDEF, 0x2030, 0x0160, 0x2039, 0x015A, 0x0164, 0x017D, 0x0179,
+	CUNDEF, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014,
+	CUNDEF, 0x2122, 0x0161, 0x203A, 0x015B, 0x0165, 0x017E, 0x017A,
+	0x00A0, 0x02C7, 0x02D8, 0x0141, 0x00A4, 0x0104, 0x00A6, 0x00A7,
+	0x00A8, 0x00A9, 0x015E, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x017B,
+	0x00B0, 0x00B1, 0x02DB, 0x0142, 0x00B4, 0x00B5, 0x00B6, 0x00B7,
+	0x00B8, 0x0105, 0x015F, 0x00BB, 0x013D, 0x02DD, 0x013E, 0x017C,
+	0x0154, 0x00C1, 0x00C2, 0x0102, 0x00C4, 0x0139, 0x0106, 0x00C7,
+	0x010C, 0x00C9, 0x0118, 0x00CB, 0x011A, 0x00CD, 0x00CE, 0x010E,
+	0x0110, 0x0143, 0x0147, 0x00D3, 0x00D4, 0x0150, 0x00D6, 0x00D7,
+	0x0158, 0x016E, 0x00DA, 0x0170, 0x00DC, 0x00DD, 0x0162, 0x00DF,
+	0x0155, 0x00E1, 0x00E2, 0x0103, 0x00E4, 0x013A, 0x0107, 0x00E7,
+	0x010D, 0x00E9, 0x0119, 0x00EB, 0x011B, 0x00ED, 0x00EE, 0x010F,
+	0x0111, 0x0144, 0x0148, 0x00F3, 0x00F4, 0x0151, 0x00F6, 0x00F7,
+	0x0159, 0x016F, 0x00FA, 0x0171, 0x00FC, 0x00FD, 0x0163, 0x02D9,
+};
+
+word CHRTAB_WIN1251[128] = {
+	0x0402, 0x0403, 0x201A, 0x0453, 0x201E, 0x2026, 0x2020, 0x2021,
+	0x20AC, 0x2030, 0x0409, 0x2039, 0x040A, 0x040C, 0x040B, 0x040F,
+	0x0452, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014,
+	CUNDEF, 0x2122, 0x0459, 0x203A, 0x045A, 0x045C, 0x045B, 0x045F,
+	0x00A0, 0x040E, 0x045E, 0x0408, 0x00A4, 0x0490, 0x00A6, 0x00A7,
+	0x0401, 0x00A9, 0x0404, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x0407,
+	0x00B0, 0x00B1, 0x0406, 0x0456, 0x0491, 0x00B5, 0x00B6, 0x00B7,
+	0x0451, 0x2116, 0x0454, 0x00BB, 0x0458, 0x0405, 0x0455, 0x0457,
+	0x0410, 0x0411, 0x0412, 0x0413, 0x0414, 0x0415, 0x0416, 0x0417,
+	0x0418, 0x0419, 0x041A, 0x041B, 0x041C, 0x041D, 0x041E, 0x041F,
+	0x0420, 0x0421, 0x0422, 0x0423, 0x0424, 0x0425, 0x0426, 0x0427,
+	0x0428, 0x0429, 0x042A, 0x042B, 0x042C, 0x042D, 0x042E, 0x042F,
+	0x0430, 0x0431, 0x0432, 0x0433, 0x0434, 0x0435, 0x0436, 0x0437,
+	0x0438, 0x0439, 0x043A, 0x043B, 0x043C, 0x043D, 0x043E, 0x043F,
+	0x0440, 0x0441, 0x0442, 0x0443, 0x0444, 0x0445, 0x0446, 0x0447,
+	0x0448, 0x0449, 0x044A, 0x044B, 0x044C, 0x044D, 0x044E, 0x044F,
+};
+
+word CHRTAB_WIN1252[128] = {
+	0x20AC, CUNDEF, 0x201A, 0x0192, 0x201E, 0x2026, 0x2020, 0x2021,
+	0x02C6, 0x2030, 0x0160, 0x2039, 0x0152, CUNDEF, 0x017D, CUNDEF,
+	CUNDEF, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014,
+	0x02DC, 0x2122, 0x0161, 0x203A, 0x0153, CUNDEF, 0x017E, 0x0178,
+	0x00A0, 0x00A1, 0x00A2, 0x00A3, 0x00A4, 0x00A5, 0x00A6, 0x00A7,
+	0x00A8, 0x00A9, 0x00AA, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x00AF,
+	0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x00B4, 0x00B5, 0x00B6, 0x00B7,
+	0x00B8, 0x00B9, 0x00BA, 0x00BB, 0x00BC, 0x00BD, 0x00BE, 0x00BF,
+	0x00C0, 0x00C1, 0x00C2, 0x00C3, 0x00C4, 0x00C5, 0x00C6, 0x00C7,
+	0x00C8, 0x00C9, 0x00CA, 0x00CB, 0x00CC, 0x00CD, 0x00CE, 0x00CF,
+	0x00D0, 0x00D1, 0x00D2, 0x00D3, 0x00D4, 0x00D5, 0x00D6, 0x00D7,
+	0x00D8, 0x00D9, 0x00DA, 0x00DB, 0x00DC, 0x00DD, 0x00DE, 0x00DF,
+	0x00E0, 0x00E1, 0x00E2, 0x00E3, 0x00E4, 0x00E5, 0x00E6, 0x00E7,
+	0x00E8, 0x00E9, 0x00EA, 0x00EB, 0x00EC, 0x00ED, 0x00EE, 0x00EF,
+	0x00F0, 0x00F1, 0x00F2, 0x00F3, 0x00F4, 0x00F5, 0x00F6, 0x00F7,
+	0x00F8, 0x00F9, 0x00FA, 0x00FB, 0x00FC, 0x00FD, 0x00FE, 0x00FF,
+};
+
+word CHRTAB_WIN1253[128] = {
+	0x20AC, CUNDEF, 0x201A, 0x0192, 0x201E, 0x2026, 0x2020, 0x2021,
+	CUNDEF, 0x2030, CUNDEF, 0x2039, CUNDEF, CUNDEF, CUNDEF, CUNDEF,
+	CUNDEF, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014,
+	CUNDEF, 0x2122, CUNDEF, 0x203A, CUNDEF, CUNDEF, CUNDEF, CUNDEF,
+	0x00A0, 0x0385, 0x0386, 0x00A3, 0x00A4, 0x00A5, 0x00A6, 0x00A7,
+	0x00A8, 0x00A9, CUNDEF, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x2015,
+	0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x0384, 0x00B5, 0x00B6, 0x00B7,
+	0x0388, 0x0389, 0x038A, 0x00BB, 0x038C, 0x00BD, 0x038E, 0x038F,
+	0x0390, 0x0391, 0x0392, 0x0393, 0x0394, 0x0395, 0x0396, 0x0397,
+	0x0398, 0x0399, 0x039A, 0x039B, 0x039C, 0x039D, 0x039E, 0x039F,
+	0x03A0, 0x03A1, CUNDEF, 0x03A3, 0x03A4, 0x03A5, 0x03A6, 0x03A7,
+	0x03A8, 0x03A9, 0x03AA, 0x03AB, 0x03AC, 0x03AD, 0x03AE, 0x03AF,
+	0x03B0, 0x03B1, 0x03B2, 0x03B3, 0x03B4, 0x03B5, 0x03B6, 0x03B7,
+	0x03B8, 0x03B9, 0x03BA, 0x03BB, 0x03BC, 0x03BD, 0x03BE, 0x03BF,
+	0x03C0, 0x03C1, 0x03C2, 0x03C3, 0x03C4, 0x03C5, 0x03C6, 0x03C7,
+	0x03C8, 0x03C9, 0x03CA, 0x03CB, 0x03CC, 0x03CD, 0x03CE, CUNDEF,
+};
+
+word CHRTAB_WIN1254[128] = {
+	0x20AC, CUNDEF, 0x201A, 0x0192, 0x201E, 0x2026, 0x2020, 0x2021,
+	0x02C6, 0x2030, 0x0160, 0x2039, 0x0152, CUNDEF, CUNDEF, CUNDEF,
+	CUNDEF, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014,
+	0x02DC, 0x2122, 0x0161, 0x203A, 0x0153, CUNDEF, CUNDEF, 0x0178,
+	0x00A0, 0x00A1, 0x00A2, 0x00A3, 0x00A4, 0x00A5, 0x00A6, 0x00A7,
+	0x00A8, 0x00A9, 0x00AA, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x00AF,
+	0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x00B4, 0x00B5, 0x00B6, 0x00B7,
+	0x00B8, 0x00B9, 0x00BA, 0x00BB, 0x00BC, 0x00BD, 0x00BE, 0x00BF,
+	0x00C0, 0x00C1, 0x00C2, 0x00C3, 0x00C4, 0x00C5, 0x00C6, 0x00C7,
+	0x00C8, 0x00C9, 0x00CA, 0x00CB, 0x00CC, 0x00CD, 0x00CE, 0x00CF,
+	0x011E, 0x00D1, 0x00D2, 0x00D3, 0x00D4, 0x00D5, 0x00D6, 0x00D7,
+	0x00D8, 0x00D9, 0x00DA, 0x00DB, 0x00DC, 0x0130, 0x015E, 0x00DF,
+	0x00E0, 0x00E1, 0x00E2, 0x00E3, 0x00E4, 0x00E5, 0x00E6, 0x00E7,
+	0x00E8, 0x00E9, 0x00EA, 0x00EB, 0x00EC, 0x00ED, 0x00EE, 0x00EF,
+	0x011F, 0x00F1, 0x00F2, 0x00F3, 0x00F4, 0x00F5, 0x00F6, 0x00F7,
+	0x00F8, 0x00F9, 0x00FA, 0x00FB, 0x00FC, 0x0131, 0x015F, 0x00FF,
+};
+
+word CHRTAB_WIN1255[128] = {
+	0x20AC, CUNDEF, 0x201A, 0x0192, 0x201E, 0x2026, 0x2020, 0x2021,
+	0x02C6, 0x2030, CUNDEF, 0x2039, CUNDEF, CUNDEF, CUNDEF, CUNDEF,
+	CUNDEF, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014,
+	0x02DC, 0x2122, CUNDEF, 0x203A, CUNDEF, CUNDEF, CUNDEF, CUNDEF,
+	0x00A0, 0x00A1, 0x00A2, 0x00A3, 0x20AA, 0x00A5, 0x00A6, 0x00A7,
+	0x00A8, 0x00A9, 0x00D7, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x00AF,
+	0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x00B4, 0x00B5, 0x00B6, 0x00B7,
+	0x00B8, 0x00B9, 0x00F7, 0x00BB, 0x00BC, 0x00BD, 0x00BE, 0x00BF,
+	0x05B0, 0x05B1, 0x05B2, 0x05B3, 0x05B4, 0x05B5, 0x05B6, 0x05B7,
+	0x05B8, 0x05B9, CUNDEF, 0x05BB, 0x05BC, 0x05BD, 0x05BE, 0x05BF,
+	0x05C0, 0x05C1, 0x05C2, 0x05C3, 0x05F0, 0x05F1, 0x05F2, 0x05F3,
+	0x05F4, CUNDEF, CUNDEF, CUNDEF, CUNDEF, CUNDEF, CUNDEF, CUNDEF,
+	0x05D0, 0x05D1, 0x05D2, 0x05D3, 0x05D4, 0x05D5, 0x05D6, 0x05D7,
+	0x05D8, 0x05D9, 0x05DA, 0x05DB, 0x05DC, 0x05DD, 0x05DE, 0x05DF,
+	0x05E0, 0x05E1, 0x05E2, 0x05E3, 0x05E4, 0x05E5, 0x05E6, 0x05E7,
+	0x05E8, 0x05E9, 0x05EA, CUNDEF, CUNDEF, 0x200E, 0x200F, CUNDEF,
+};
+
+word CHRTAB_WIN1256[128] = {
+	0x20AC, 0x067E, 0x201A, 0x0192, 0x201E, 0x2026, 0x2020, 0x2021,
+	0x02C6, 0x2030, 0x0679, 0x2039, 0x0152, 0x0686, 0x0698, 0x0688,
+	0x06AF, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014,
+	0x06A9, 0x2122, 0x0691, 0x203A, 0x0153, 0x200C, 0x200D, 0x06BA,
+	0x00A0, 0x060C, 0x00A2, 0x00A3, 0x00A4, 0x00A5, 0x00A6, 0x00A7,
+	0x00A8, 0x00A9, 0x06BE, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x00AF,
+	0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x00B4, 0x00B5, 0x00B6, 0x00B7,
+	0x00B8, 0x00B9, 0x061B, 0x00BB, 0x00BC, 0x00BD, 0x00BE, 0x061F,
+	0x06C1, 0x0621, 0x0622, 0x0623, 0x0624, 0x0625, 0x0626, 0x0627,
+	0x0628, 0x0629, 0x062A, 0x062B, 0x062C, 0x062D, 0x062E, 0x062F,
+	0x0630, 0x0631, 0x0632, 0x0633, 0x0634, 0x0635, 0x0636, 0x00D7,
+	0x0637, 0x0638, 0x0639, 0x063A, 0x0640, 0x0641, 0x0642, 0x0643,
+	0x00E0, 0x0644, 0x00E2, 0x0645, 0x0646, 0x0647, 0x0648, 0x00E7,
+	0x00E8, 0x00E9, 0x00EA, 0x00EB, 0x0649, 0x064A, 0x00EE, 0x00EF,
+	0x064B, 0x064C, 0x064D, 0x064E, 0x00F4, 0x064F, 0x0650, 0x00F7,
+	0x0651, 0x00F9, 0x0652, 0x00FB, 0x00FC, 0x200E, 0x200F, 0x06D2,
+};
+
+word CHRTAB_WIN1257[128] = {
+	0x20AC, CUNDEF, 0x201A, CUNDEF, 0x201E, 0x2026, 0x2020, 0x2021,
+	CUNDEF, 0x2030, CUNDEF, 0x2039, CUNDEF, 0x00A8, 0x02C7, 0x00B8,
+	CUNDEF, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014,
+	CUNDEF, 0x2122, CUNDEF, 0x203A, CUNDEF, 0x00AF, 0x02DB, CUNDEF,
+	0x00A0, CUNDEF, 0x00A2, 0x00A3, 0x00A4, CUNDEF, 0x00A6, 0x00A7,
+	0x00D8, 0x00A9, 0x0156, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x00C6,
+	0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x00B4, 0x00B5, 0x00B6, 0x00B7,
+	0x00F8, 0x00B9, 0x0157, 0x00BB, 0x00BC, 0x00BD, 0x00BE, 0x00E6,
+	0x0104, 0x012E, 0x0100, 0x0106, 0x00C4, 0x00C5, 0x0118, 0x0112,
+	0x010C, 0x00C9, 0x0179, 0x0116, 0x0122, 0x0136, 0x012A, 0x013B,
+	0x0160, 0x0143, 0x0145, 0x00D3, 0x014C, 0x00D5, 0x00D6, 0x00D7,
+	0x0172, 0x0141, 0x015A, 0x016A, 0x00DC, 0x017B, 0x017D, 0x00DF,
+	0x0105, 0x012F, 0x0101, 0x0107, 0x00E4, 0x00E5, 0x0119, 0x0113,
+	0x010D, 0x00E9, 0x017A, 0x0117, 0x0123, 0x0137, 0x012B, 0x013C,
+	0x0161, 0x0144, 0x0146, 0x00F3, 0x014D, 0x00F5, 0x00F6, 0x00F7,
+	0x0173, 0x0142, 0x015B, 0x016B, 0x00FC, 0x017C, 0x017E, 0x02D9,
+};
+
+word CHRTAB_WIN1258[128] = {
+	0x20AC, CUNDEF, 0x201A, 0x0192, 0x201E, 0x2026, 0x2020, 0x2021,
+	0x02C6, 0x2030, CUNDEF, 0x2039, 0x0152, CUNDEF, CUNDEF, CUNDEF,
+	CUNDEF, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014,
+	0x02DC, 0x2122, CUNDEF, 0x203A, 0x0153, CUNDEF, CUNDEF, 0x0178,
+	0x00A0, 0x00A1, 0x00A2, 0x00A3, 0x00A4, 0x00A5, 0x00A6, 0x00A7,
+	0x00A8, 0x00A9, 0x00AA, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x00AF,
+	0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x00B4, 0x00B5, 0x00B6, 0x00B7,
+	0x00B8, 0x00B9, 0x00BA, 0x00BB, 0x00BC, 0x00BD, 0x00BE, 0x00BF,
+	0x00C0, 0x00C1, 0x00C2, 0x0102, 0x00C4, 0x00C5, 0x00C6, 0x00C7,
+	0x00C8, 0x00C9, 0x00CA, 0x00CB, 0x0300, 0x00CD, 0x00CE, 0x00CF,
+	0x0110, 0x00D1, 0x0309, 0x00D3, 0x00D4, 0x01A0, 0x00D6, 0x00D7,
+	0x00D8, 0x00D9, 0x00DA, 0x00DB, 0x00DC, 0x01AF, 0x0303, 0x00DF,
+	0x00E0, 0x00E1, 0x00E2, 0x0103, 0x00E4, 0x00E5, 0x00E6, 0x00E7,
+	0x00E8, 0x00E9, 0x00EA, 0x00EB, 0x0301, 0x00ED, 0x00EE, 0x00EF,
+	0x0111, 0x00F1, 0x0323, 0x00F3, 0x00F4, 0x01A1, 0x00F6, 0x00F7,
+	0x00F8, 0x00F9, 0x00FA, 0x00FB, 0x00FC, 0x01B0, 0x20AB, 0x00FF,
+};
+
+word CHRTAB_KOI8_R[128] = {
+	0x2500, 0x2502, 0x250C, 0x2510, 0x2514, 0x2518, 0x251C, 0x2524,
+	0x252C, 0x2534, 0x253C, 0x2580, 0x2584, 0x2588, 0x258C, 0x2590,
+	0x2591, 0x2592, 0x2593, 0x2320, 0x25A0, 0x2219, 0x221A, 0x2248,
+	0x2264, 0x2265, CUNDEF, 0x2321, 0x00B0, 0x00B2, 0x00B7, 0x00F7,
+	0x2550, 0x2551, 0x2552, 0x0451, 0x2553, 0x2554, 0x2555, 0x2556,
+	0x2557, 0x2558, 0x2559, 0x255A, 0x255B, 0x255C, 0x255D, 0x255E,
+	0x255F, 0x2560, 0x2561, 0x0401, 0x2562, 0x2563, 0x2564, 0x2565,
+	0x2566, 0x2567, 0x2568, 0x2569, 0x256A, 0x256B, 0x256C, 0x00A9,
+	0x044E, 0x0430, 0x0431, 0x0446, 0x0434, 0x0435, 0x0444, 0x0433,
+	0x0445, 0x0438, 0x0439, 0x043A, 0x043B, 0x043C, 0x043D, 0x043E,
+	0x043F, 0x044F, 0x0440, 0x0441, 0x0442, 0x0443, 0x0436, 0x0432,
+	0x044C, 0x044B, 0x0437, 0x0448, 0x044D, 0x0449, 0x0447, 0x044A,
+	0x042E, 0x0410, 0x0411, 0x0426, 0x0414, 0x0415, 0x0424, 0x0413,
+	0x0425, 0x0418, 0x0419, 0x041A, 0x041B, 0x041C, 0x041D, 0x041E,
+	0x041F, 0x042F, 0x0420, 0x0421, 0x0422, 0x0423, 0x0416, 0x0412,
+	0x042C, 0x042B, 0x0417, 0x0428, 0x042D, 0x0429, 0x0427, 0x042A,
+};
+
+word CHRTAB_CP850[128] = {
+	0x00C7, 0x00FC, 0x00E9, 0x00E2, 0x00E4, 0x00E0, 0x00E5, 0x00E7,
+	0x00EA, 0x00EB, 0x00E8, 0x00EF, 0x00EE, 0x00EC, 0x00C4, 0x00C5,
+	0x00C9, 0x00E6, 0x00C6, 0x00F4, 0x00F6, 0x00F2, 0x00FB, 0x00F9,
+	0x00FF, 0x00D6, 0x00DC, 0x00F8, 0x00A3, 0x00D8, 0x00D7, 0x0192,
+	0x00E1, 0x00ED, 0x00F3, 0x00FA, 0x00F1, 0x00D1, 0x00AA, 0x00BA,
+	0x00BF, 0x00AE, 0x00AC, 0x00BD, 0x00BC, 0x00A1, 0x00AB, 0x00BB,
+	0x2591, 0x2592, 0x2593, 0x2502, 0x2524, 0x00C1, 0x00C2, 0x00C0,
+	0x00A9, 0x2563, 0x2551, 0x2557, 0x255D, 0x00A2, 0x00A5, 0x2510,
+	0x2514, 0x2534, 0x252C, 0x251C, 0x2500, 0x253C, 0x00E3, 0x00C3,
+	0x255A, 0x2554, 0x2569, 0x2566, 0x2560, 0x2550, 0x256C, 0x00A4,
+	0x00F0, 0x00D0, 0x00CA, 0x00CB, 0x00C8, 0x0131, 0x00CD, 0x00CE,
+	0x00CF, 0x2518, 0x250C, 0x2588, 0x2584, 0x00A6, 0x00CC, 0x2580,
+	0x00D3, 0x00DF, 0x00D4, 0x00D2, 0x00F5, 0x00D5, 0x00B5, 0x00FE,
+	0x00DE, 0x00DA, 0x00DB, 0x00D9, 0x00FD, 0x00DD, 0x00AF, 0x00B4,
+	0x00AD, 0x00B1, 0x2017, 0x00BE, 0x00B6, 0x00A7, 0x00F7, 0x00B8,
+	0x00B0, 0x00A8, 0x00B7, 0x00B9, 0x00B3, 0x00B2, 0x25A0, 0x00A0
+};
+
+word CHRTAB_CP852[128] = {
+	0x00C7, 0x00FC, 0x00E9, 0x00E2, 0x00E4, 0x016F, 0x0107, 0x00E7,
+	0x0142, 0x00EB, 0x0150, 0x0151, 0x00EE, 0x0179, 0x00C4, 0x0106,
+	0x00C9, 0x0139, 0x013A, 0x00F4, 0x00F6, 0x013D, 0x013E, 0x015A,
+	0x015B, 0x00D6, 0x00DC, 0x0164, 0x0165, 0x0141, 0x00D7, 0x010D,
+	0x00E1, 0x00ED, 0x00F3, 0x00FA, 0x0104, 0x0105, 0x017D, 0x017E,
+	0x0118, 0x0119, 0x00AC, 0x017A, 0x010C, 0x015F, 0x00AB, 0x00BB,
+	0x2591, 0x2592, 0x2593, 0x2502, 0x2524, 0x00C1, 0x00C2, 0x011A,
+	0x015E, 0x2563, 0x2551, 0x2557, 0x255D, 0x017B, 0x017C, 0x2510,
+	0x2514, 0x2534, 0x252C, 0x251C, 0x2500, 0x253C, 0x0102, 0x0103,
+	0x255A, 0x2554, 0x2569, 0x2566, 0x2560, 0x2550, 0x256C, 0x00A4,
+	0x0111, 0x0110, 0x010E, 0x00CB, 0x010F, 0x0147, 0x00CD, 0x00CE,
+	0x011B, 0x2518, 0x250C, 0x2588, 0x2584, 0x0162, 0x016E, 0x2580,
+	0x00D3, 0x00DF, 0x00D4, 0x0143, 0x0144, 0x0148, 0x0160, 0x0161,
+	0x0154, 0x00DA, 0x0155, 0x0170, 0x00FD, 0x00DD, 0x0163, 0x00B4,
+	0x00AD, 0x02DD, 0x02DB, 0x02C7, 0x02D8, 0x00A7, 0x00F7, 0x00B8,
+	0x00B0, 0x00A8, 0x02D9, 0x0171, 0x0158, 0x0159, 0x25A0, 0x00A0,
+};
+
+word CHRTAB_MJK[128] = {
+	0x010c, 0x00fc, 0x00e9, 0x010f, 0x00e4, 0x010e, 0x0164, 0x010d,
+	0x011b, 0x011a, 0x0139, 0x00cd, 0x013e, 0x013a, 0x00c4, 0x00c1,
+	0x00c9, 0x017e, 0x017d, 0x00f4, 0x00f6, 0x00d3, 0x016f, 0x00da,
+	0x00fd, 0x00d6, 0x00dc, 0x0160, 0x013d, 0x00dd, 0x0158, 0x0165,
+	0x00e1, 0x00ed, 0x00f3, 0x00fa, 0x0148, 0x0147, 0x016e, 0x00d4,
+	0x0161, 0x0159, 0x0155, 0x0154, 0x00ac, 0x00a7, 0x00bb, 0x00ab,
+	CUNDEF, CUNDEF, CUNDEF, CUNDEF, CUNDEF, CUNDEF, CUNDEF, CUNDEF,
+	CUNDEF, CUNDEF, CUNDEF, CUNDEF, CUNDEF, CUNDEF, CUNDEF, CUNDEF,
+	CUNDEF, CUNDEF, CUNDEF, CUNDEF, CUNDEF, CUNDEF, CUNDEF, CUNDEF,
+	CUNDEF, CUNDEF, CUNDEF, CUNDEF, CUNDEF, CUNDEF, CUNDEF, CUNDEF,
+	CUNDEF, CUNDEF, CUNDEF, CUNDEF, CUNDEF, CUNDEF, CUNDEF, CUNDEF,
+	CUNDEF, CUNDEF, CUNDEF, CUNDEF, CUNDEF, CUNDEF, CUNDEF, CUNDEF,
+	CUNDEF, CUNDEF, CUNDEF, CUNDEF, CUNDEF, CUNDEF, CUNDEF, CUNDEF,
+	CUNDEF, CUNDEF, CUNDEF, CUNDEF, CUNDEF, CUNDEF, CUNDEF, CUNDEF,
+	CUNDEF, CUNDEF, CUNDEF, CUNDEF, CUNDEF, CUNDEF, CUNDEF, CUNDEF,
+	CUNDEF, CUNDEF, CUNDEF, CUNDEF, CUNDEF, CUNDEF, CUNDEF, CUNDEF,
+};
+
+dword uni__info[2048] = {
+	0x00000000,0x00400801,0x00801002,0x00c01803,0x01002004,0x01402805,0x01803006,0x01c03807,
+	0x02004008,0x02404809,0x0280500a,0x02c0580b,0x0300600c,0x0340680d,0x0380700e,0x03c0780f,
+	0x04008010,0x04408811,0x04809012,0x04c09813,0x0500a014,0x0540a815,0x0580b016,0x05c0b817,
+	0x0600c018,0x0640c819,0x0680d01a,0x06c0d81b,0x0700e01c,0x0740e81d,0x0780f01e,0x07c0f81f,
+	0x08010020,0x08410821,0x08811022,0x08c11823,0x09012024,0x09412825,0x09813026,0x09c13827,
+	0x0a014028,0x0a414829,0x0a81502a,0x0ac1582b,0x0b01602c,0x0b41682d,0x0b81702e,0x0bc1782f,
+	0x0c018030,0x0c418831,0x0c819032,0x0cc19833,0x0d01a034,0x0d41a835,0x0d81b036,0x0dc1b837,
+	0x0e01c038,0x0e41c839,0x0e81d03a,0x0ec1d83b,0x0f01e03c,0x0f41e83d,0x0f81f03e,0x0fc1f83f,
+	0x10020040,0x50420861,0x50821062,0x50c21863,0x51022064,0x51422865,0x51823066,0x51c23867,
+	0x52024068,0x52424869,0x5282506a,0x52c2586b,0x5302606c,0x5342686d,0x5382706e,0x53c2786f,
+	0x54028070,0x54428871,0x54829072,0x54c29873,0x5502a074,0x5542a875,0x5582b076,0x55c2b877,
+	0x5602c078,0x5642c879,0x5682d07a,0x16c2d85b,0x1702e05c,0x1742e85d,0x1782f05e,0x17c2f85f,
+	0x18030060,0x98420861,0x98821062,0x98c21863,0x99022064,0x99422865,0x99823066,0x99c23867,
+	0x9a024068,0x9a424869,0x9a82506a,0x9ac2586b,0x9b02606c,0x9b42686d,0x9b82706e,0x9bc2786f,
+	0x9c028070,0x9c428871,0x9c829072,0x9cc29873,0x9d02a074,0x9d42a875,0x9d82b076,0x9dc2b877,
+	0x9e02c078,0x9e42c879,0x9e82d07a,0x1ec3d87b,0x1f03e07c,0x1f43e87d,0x1f83f07e,0x1fc3f87f,
+	0x00040080,0x00040881,0x00041082,0x00041883,0x00042084,0x00042885,0x00043086,0x00043887,
+	0x00044088,0x00044889,0x0004508a,0x0004588b,0x0004608c,0x0004688d,0x0004708e,0x0004788f,
+	0x00048090,0x00048891,0x00049092,0x00049893,0x0004a094,0x0004a895,0x0004b096,0x0004b897,
+	0x0004c098,0x0004c899,0x0004d09a,0x0004d89b,0x0004e09c,0x0004e89d,0x0004f09e,0x0004f89f,
+	0x000500a0,0x000508a1,0x000510a2,0x000518a3,0x000520a4,0x000528a5,0x000530a6,0x000538a7,
+	0x000540a8,0x000548a9,0x800550aa,0x000558ab,0x000560ac,0x000568ad,0x000570ae,0x000578af,
+	0x000580b0,0x000588b1,0x000590b2,0x000598b3,0x0005a0b4,0x801ce0b5,0x0005b0b6,0x0005b8b7,
+	0x0005c0b8,0x0005c8b9,0x8005d0ba,0x0005d8bb,0x0005e0bc,0x0005e8bd,0x0005f0be,0x0005f8bf,
+	0x504600e0,0x504608e1,0x504610e2,0x504618e3,0x504620e4,0x504628e5,0x504630e6,0x50c638e7,
+	0x514640e8,0x514648e9,0x514650ea,0x514658eb,0x524660ec,0x524668ed,0x524670ee,0x524678ef,
+	0x514680f0,0x538688f1,0x53c690f2,0x53c698f3,0x53c6a0f4,0x53c6a8f5,0x53c6b0f6,0x0006b8d7,
+	0x53c6c0f8,0x5546c8f9,0x5546d0fa,0x5546d8fb,0x5546e0fc,0x5646e8fd,0x5506f0fe,0x9cc6f8df,
+	0x984600e0,0x984608e1,0x984610e2,0x984618e3,0x984620e4,0x984628e5,0x984630e6,0x98c638e7,
+	0x994640e8,0x994648e9,0x994650ea,0x994658eb,0x9a4660ec,0x9a4668ed,0x9a4670ee,0x9a4678ef,
+	0x994680f0,0x9b8688f1,0x9bc690f2,0x9bc698f3,0x9bc6a0f4,0x9bc6a8f5,0x9bc6b0f6,0x0007b8f7,
+	0x9bc6c0f8,0x9d46c8f9,0x9d46d0fa,0x9d46d8fb,0x9d46e0fc,0x9e46e8fd,0x9d06f0fe,0x9e4bc0ff,
+	0x50480101,0x98480101,0x50481103,0x98481103,0x50482105,0x98482105,0x50c83107,0x98c83107,
+	0x50c84109,0x98c84109,0x50c8510b,0x98c8510b,0x50c8610d,0x98c8610d,0x5108710f,0x9908710f,
+	0x51088111,0x99088111,0x51489113,0x99489113,0x5148a115,0x9948a115,0x5148b117,0x9948b117,
+	0x5148c119,0x9948c119,0x5148d11b,0x9948d11b,0x51c8e11d,0x99c8e11d,0x51c8f11f,0x99c8f11f,
+	0x51c90121,0x99c90121,0x51c91123,0x99c91123,0x52092125,0x9a092125,0x52093127,0x9a093127,
+	0x52494129,0x9a494129,0x5249512b,0x9a49512b,0x5249612d,0x9a49612d,0x5249712f,0x9a49712f,
+	0x52498069,0x99024931,0x40099133,0x80099133,0x5289a135,0x9a89a135,0x52c9b137,0x9ac9b137,
+	0x9ac9c138,0x5309c93a,0x9b09c93a,0x5309d93c,0x9b09d93c,0x5309e93e,0x9b09e93e,0x5309f940,
+	0x9b09f940,0x530a0942,0x9b0a0942,0x538a1944,0x9b8a1944,0x538a2946,0x9b8a2946,0x538a3948,
+	0x9b8a3948,0x9b8a4949,0x514a514b,0x994a514b,0x53ca614d,0x9bca614d,0x53ca714f,0x9bca714f,
+	0x53ca8151,0x9bca8151,0x400a9153,0x800a9153,0x548aa155,0x9c8aa155,0x548ab157,0x9c8ab157,
+	0x548ac159,0x9c8ac159,0x54cad15b,0x9ccad15b,0x54cae15d,0x9ccae15d,0x54caf15f,0x9ccaf15f,
+	0x54cb0161,0x9ccb0161,0x550b1163,0x9d0b1163,0x550b2165,0x9d0b2165,0x550b3167,0x9d0b3167,
+	0x554b4169,0x9d4b4169,0x554b516b,0x9d4b516b,0x554b616d,0x9d4b616d,0x554b716f,0x9d4b716f,
+	0x554b8171,0x9d4b8171,0x554b9173,0x9d4b9173,0x55cba175,0x9dcba175,0x564bb177,0x9e4bb177,
+	0x564bc0ff,0x568bc97a,0x9e8bc97a,0x568bd97c,0x9e8bd97c,0x568be97e,0x9e8be97e,0x9b02997f,
+	0x988c0180,0x508c0a53,0x508c1183,0x988c1183,0x550c2185,0x9d0c2185,0x53cc3254,0x50cc3988,
+	0x98cc3988,0x504c4a56,0x510c5257,0x510c598c,0x990c598c,0x9d0c698d,0x548c71dd,0x54cc7a59,
+	0x53cc825b,0x518c8992,0x998c8992,0x51cc9a60,0x51cca263,0x9a0fb195,0x524cb269,0x524cba68,
+	0x52ccc199,0x9accc199,0x9b0cd19a,0x9b0cd99b,0x550ce26f,0x538cea72,0x9b91019e,0x53ccfa75,
+	0x53cd01a1,0x9bcd01a1,0x53cd11a3,0x9bcd11a3,0x540d21a5,0x9c0d21a5,0x400d3280,0x550d39a8,
+	0x9d0d39a8,0x514d4a83,0x800d51aa,0x9d0d59ab,0x550d61ad,0x9d0d61ad,0x550d7288,0x554d79b0,
+	0x9d4d79b0,0x554d8a8a,0x558d928b,0x564d99b4,0x9e4d99b4,0x568da9b6,0x9e8da9b6,0x514dba92,
+	0x514dc1b9,0x994dc1b9,0x994dd1ba,0x000dd9bb,0x550de1bd,0x9d0de1bd,0x800df1be,0x800fb9bf,
+	0x000e01c0,0x000e09c1,0x000e11c2,0x000e19c3,0x510e21c6,0x110e29c5,0x990e21c6,0x530e39c9,
+	0x130e41c8,0x9b0e39c9,0x538e51cc,0x138e59cb,0x9b8e51cc,0x504e69ce,0x984e69ce,0x524e79d0,
+	0x9a4e79d0,0x53ce89d2,0x9bce89d2,0x554e99d4,0x9d4e99d4,0x554ea9d6,0x9d4ea9d6,0x554eb9d8,
+	0x9d4eb9d8,0x554ec9da,0x9d4ec9da,0x554ed9dc,0x9d4ed9dc,0x9d0c71dd,0x504ef1df,0x984ef1df,
+	0x504f01e1,0x984f01e1,0x504f11e3,0x984f11e3,0x51cf21e5,0x99cf21e5,0x51cf31e7,0x99cf31e7,
+	0x52cf41e9,0x9acf41e9,0x53cf51eb,0x9bcf51eb,0x53cf61ed,0x9bcf61ed,0x514f71ef,0x994f71ef,
+	0x9a8f81f0,0x510f89f3,0x110f91f2,0x990f89f3,0x51cfa1f5,0x99cfa1f5,0x520fb195,0x55cfb9bf,
+	0x538fc1f9,0x9b8fc1f9,0x504fd1fb,0x984fd1fb,0x504fe1fd,0x984fe1fd,0x53cff1ff,0x9bcff1ff,
+	0x50500201,0x98500201,0x50501203,0x98501203,0x51502205,0x99502205,0x51503207,0x99503207,
+	0x52504209,0x9a504209,0x5250520b,0x9a50520b,0x53d0620d,0x9bd0620d,0x53d0720f,0x9bd0720f,
+	0x54908211,0x9c908211,0x54909213,0x9c909213,0x5550a215,0x9d50a215,0x5550b217,0x9d50b217,
+	0x54d0c219,0x9cd0c219,0x5510d21b,0x9d10d21b,0x5650e21d,0x9e50e21d,0x5210f21f,0x9a10f21f,
+	0x5391019e,0x00110a21,0x53d11223,0x9bd11223,0x56912225,0x9e912225,0x50513227,0x98513227,
+	0x51514229,0x99514229,0x53d1522b,0x9bd1522b,0x53d1622d,0x9bd1622d,0x53d1722f,0x9bd1722f,
+	0x53d18231,0x9bd18231,0x56519233,0x9e519233,0x0011a234,0x0011aa35,0x0011b236,0x0011ba37,
+	0x0011c238,0x0011ca39,0x0011d23a,0x0011da3b,0x0011e23c,0x0011ea3d,0x0011f23e,0x0011fa3f,
+	0x00120240,0x00120a41,0x00121242,0x00121a43,0x00122244,0x00122a45,0x00123246,0x00123a47,
+	0x00124248,0x00124a49,0x0012524a,0x00125a4b,0x0012624c,0x00126a4d,0x0012724e,0x00127a4f,
+	0x9d128250,0x98528a51,0x9d129252,0x988c0a53,0x9bcc3254,0x98d2aa55,0x990c4a56,0x990c5257,
+	0x9c92c258,0x9ccc7a59,0x9cd2d25a,0x9bcc825b,0x9c92e25c,0x9c92ea5d,0x98d2f25e,0x9912fa5f,
+	0x99cc9a60,0x9cd30a61,0x80131262,0x99cca263,0x9c932264,0x9d132a65,0x9a133266,0x9a133a67,
+	0x9a4cba68,0x9a4cb269,0x8013526a,0x9b135a6b,0x9b13626c,0x9b136a6d,0x9b13726e,0x9d0ce26f,
+	0x9d138270,0x9b538a71,0x9b8cea72,0x9b939a73,0x8013a274,0x988cfa75,0x8013b276,0x98d3ba77,
+	0x9c13c278,0x9d13ca79,0x9d13d27a,0x9d13da7b,0x9c93e27c,0x9c93ea7d,0x9c93f27e,0x9c93fa7f,
+	0x800d3280,0x80140a81,0x9cd41282,0x994d4a83,0x99142284,0x9cd42a85,0x99543286,0x9d143a87,
+	0x9d0d7288,0x9d544a89,0x9d4d8a8a,0x9d8d928b,0x9d14628c,0x9d146a8d,0x9d14728e,0x80147a8f,
+	0x9e948290,0x9e948a91,0x994dba92,0x99549a93,0x8014a294,0x8014aa95,0x8014b296,0x8014ba97,
+	0x8014c298,0x8014ca99,0x98d4d29a,0x8014da9b,0x8014e29c,0x9a94ea9d,0x9d14f29e,0x8014fa9f,
+	0x9c5502a0,0x80150aa1,0x801512a2,0x99151aa3,0x991522a4,0x99152aa5,0x9d1532a6,0x9d153aa7,
+	0x9d1542a8,0x99954aa9,0x9b1552aa,0x9b155aab,0x801562ac,0x80156aad,0x001572ae,0x00157aaf,
+	0x001582b0,0x00158ab1,0x001592b2,0x00159ab3,0x0015a2b4,0x0015aab5,0x0015b2b6,0x0015bab7,
+	0x0015c2b8,0x0015cab9,0x0015d2ba,0x0015dabb,0x0015e2bc,0x0015eabd,0x0015f2be,0x0015fabf,
+	0x001602c0,0x00160ac1,0x001612c2,0x00161ac3,0x001622c4,0x00162ac5,0x001632c6,0x00163ac7,
+	0x001642c8,0x00164ac9,0x001652ca,0x00165acb,0x001662cc,0x00166acd,0x001672ce,0x00167acf,
+	0x001682d0,0x00168ad1,0x001692d2,0x00169ad3,0x0016a2d4,0x0016aad5,0x0016b2d6,0x0016bad7,
+	0x0016c2d8,0x0016cad9,0x0016d2da,0x0016dadb,0x0016e2dc,0x0016eadd,0x0016f2de,0x0016fadf,
+	0x001702e0,0x00170ae1,0x001712e2,0x00171ae3,0x001722e4,0x00172ae5,0x001732e6,0x00173ae7,
+	0x001742e8,0x00174ae9,0x001752ea,0x00175aeb,0x001762ec,0x00176aed,0x001772ee,0x00177aef,
+	0x001782f0,0x00178af1,0x001792f2,0x00179af3,0x0017a2f4,0x0017aaf5,0x0017b2f6,0x0017baf7,
+	0x0017c2f8,0x0017caf9,0x0017d2fa,0x0017dafb,0x0017e2fc,0x0017eafd,0x0017f2fe,0x0017faff,
+	0x00180300,0x00180b01,0x00181302,0x00181b03,0x00182304,0x00182b05,0x00183306,0x00183b07,
+	0x00184308,0x00184b09,0x0018530a,0x00185b0b,0x0018630c,0x00186b0d,0x0018730e,0x00187b0f,
+	0x00188310,0x00188b11,0x00189312,0x00189b13,0x0018a314,0x0018ab15,0x0018b316,0x0018bb17,
+	0x0018c318,0x0018cb19,0x0018d31a,0x0018db1b,0x0018e31c,0x0018eb1d,0x0018f31e,0x0018fb1f,
+	0x00190320,0x00190b21,0x00191322,0x00191b23,0x00192324,0x00192b25,0x00193326,0x00193b27,
+	0x00194328,0x00194b29,0x0019532a,0x00195b2b,0x0019632c,0x00196b2d,0x0019732e,0x00197b2f,
+	0x00198330,0x00198b31,0x00199332,0x00199b33,0x0019a334,0x0019ab35,0x0019b336,0x0019bb37,
+	0x0019c338,0x0019cb39,0x0019d33a,0x0019db3b,0x0019e33c,0x0019eb3d,0x0019f33e,0x0019fb3f,
+	0x001a0340,0x001a0b41,0x001a1342,0x001a1b43,0x001a2344,0x001a2b45,0x001a3346,0x001a3b47,
+	0x001a4348,0x001a4b49,0x001a534a,0x001a5b4b,0x001a634c,0x001a6b4d,0x001a734e,0x001a7b4f,
+	0x001a8350,0x001a8b51,0x001a9352,0x001a9b53,0x001aa354,0x001aab55,0x001ab356,0x001abb57,
+	0x001ac358,0x001acb59,0x001ad35a,0x001adb5b,0x001ae35c,0x001aeb5d,0x001af35e,0x001afb5f,
+	0x001b0360,0x001b0b61,0x001b1362,0x001b1b63,0x001b2364,0x001b2b65,0x001b3366,0x001b3b67,
+	0x001b4368,0x001b4b69,0x001b536a,0x001b5b6b,0x001b636c,0x001b6b6d,0x001b736e,0x001b7b6f,
+	0x001b8370,0x001b8b71,0x001b9372,0x001b9b73,0x001ba374,0x001bab75,0x001bb376,0x001bbb77,
+	0x001bc378,0x001bcb79,0x001bd37a,0x001bdb7b,0x001be37c,0x001beb7d,0x001bf37e,0x001bfb7f,
+	0x001c0380,0x001c0b81,0x001c1382,0x001c1b83,0x001c2384,0x001c2b85,0x401c33ac,0x001c3b87,
+	0x401c43ad,0x401c4bae,0x401c53af,0x001c5b8b,0x401c63cc,0x001c6b8d,0x401c73cd,0x401c7bce,
+	0x801c8390,0x401c8bb1,0x401c93b2,0x401c9bb3,0x401ca3b4,0x401cabb5,0x401cb3b6,0x401cbbb7,
+	0x401cc3b8,0x401ccbb9,0x401cd3ba,0x401cdbbb,0x401ce3bc,0x401cebbd,0x401cf3be,0x401cfbbf,
+	0x401d03c0,0x401d0bc1,0x001d13a2,0x401d1bc3,0x401d23c4,0x401d2bc5,0x401d33c6,0x401d3bc7,
+	0x401d43c8,0x401d4bc9,0x401d53ca,0x401d5bcb,0x801c33ac,0x801c43ad,0x801c4bae,0x801c53af,
+	0x801d83b0,0x801c8bb1,0x801c93b2,0x801c9bb3,0x801ca3b4,0x801cabb5,0x801cb3b6,0x801cbbb7,
+	0x801cc3b8,0x801ccbb9,0x801cd3ba,0x801cdbbb,0x801ce3bc,0x801cebbd,0x801cf3be,0x801cfbbf,
+	0x801d03c0,0x801d0bc1,0x801d1bc2,0x801d1bc3,0x801d23c4,0x801d2bc5,0x801d33c6,0x801d3bc7,
+	0x801d43c8,0x801d4bc9,0x801d53ca,0x801d5bcb,0x801c63cc,0x801c73cd,0x801c7bce,0x001e7bcf,
+	0x801c93d0,0x801cc3d1,0x401e93d2,0x401e9bd3,0x401ea3d4,0x801d33d5,0x801d03d6,0x801ebbd7,
+	0x401ec3d9,0x801ec3d9,0x401ed3db,0x801ed3db,0x401ee3dd,0x801ee3dd,0x401ef3df,0x801ef3df,
+	0x401f03e1,0x801f03e1,0x401f13e3,0x801f13e3,0x401f23e5,0x801f23e5,0x401f33e7,0x801f33e7,
+	0x401f43e9,0x801f43e9,0x401f53eb,0x801f53eb,0x401f63ed,0x801f63ed,0x401f73ef,0x801f73ef,
+	0x801cd3f0,0x801d0bf1,0x801d1bf2,0x801f9bf3,0x401fa3b8,0x801cabf5,0x001fb3f6,0x001fbbf7,
+	0x001fc3f8,0x001fcbf9,0x001fd3fa,0x001fdbfb,0x001fe3fc,0x001febfd,0x001ff3fe,0x001ffbff,
+	0x40200450,0x40200c51,0x40201452,0x40201c53,0x40202454,0x40202c55,0x40203456,0x40203c57,
+	0x40204458,0x40204c59,0x4020545a,0x40205c5b,0x4020645c,0x40206c5d,0x4020745e,0x40207c5f,
+	0x40208430,0x40208c31,0x40209432,0x40209c33,0x4020a434,0x4020ac35,0x4020b436,0x4020bc37,
+	0x4020c438,0x4020cc39,0x4020d43a,0x4020dc3b,0x4020e43c,0x4020ec3d,0x4020f43e,0x4020fc3f,
+	0x40210440,0x40210c41,0x40211442,0x40211c43,0x40212444,0x40212c45,0x40213446,0x40213c47,
+	0x40214448,0x40214c49,0x4021544a,0x40215c4b,0x4021644c,0x40216c4d,0x4021744e,0x40217c4f,
+	0x80208430,0x80208c31,0x80209432,0x80209c33,0x8020a434,0x8020ac35,0x8020b436,0x8020bc37,
+	0x8020c438,0x8020cc39,0x8020d43a,0x8020dc3b,0x8020e43c,0x8020ec3d,0x8020f43e,0x8020fc3f,
+	0x80210440,0x80210c41,0x80211442,0x80211c43,0x80212444,0x80212c45,0x80213446,0x80213c47,
+	0x80214448,0x80214c49,0x8021544a,0x80215c4b,0x8021644c,0x80216c4d,0x8021744e,0x80217c4f,
+	0x80200450,0x80200c51,0x80201452,0x80201c53,0x80202454,0x80202c55,0x80203456,0x80203c57,
+	0x80204458,0x80204c59,0x8020545a,0x80205c5b,0x8020645c,0x80206c5d,0x8020745e,0x80207c5f,
+	0x40230461,0x80230461,0x40231463,0x80231463,0x40232465,0x80232465,0x40233467,0x80233467,
+	0x40234469,0x80234469,0x4023546b,0x8023546b,0x4023646d,0x8023646d,0x4023746f,0x8023746f,
+	0x40238471,0x80238471,0x40239473,0x80239473,0x4023a475,0x8023a475,0x4023b477,0x8023b477,
+	0x4023c479,0x8023c479,0x4023d47b,0x8023d47b,0x4023e47d,0x8023e47d,0x4023f47f,0x8023f47f,
+	0x40240481,0x80240481,0x00241482,0x00241c83,0x00242484,0x00242c85,0x00243486,0x00243c87,
+	0x00244488,0x00244c89,0x4024548b,0x8024548b,0x4024648d,0x8024648d,0x4024748f,0x8024748f,
+	0x40248491,0x80248491,0x40249493,0x80249493,0x4024a495,0x8024a495,0x4024b497,0x8024b497,
+	0x4024c499,0x8024c499,0x4024d49b,0x8024d49b,0x4024e49d,0x8024e49d,0x4024f49f,0x8024f49f,
+	0x402504a1,0x802504a1,0x402514a3,0x802514a3,0x402524a5,0x802524a5,0x402534a7,0x802534a7,
+	0x402544a9,0x802544a9,0x402554ab,0x802554ab,0x402564ad,0x802564ad,0x402574af,0x802574af,
+	0x402584b1,0x802584b1,0x402594b3,0x802594b3,0x4025a4b5,0x8025a4b5,0x4025b4b7,0x8025b4b7,
+	0x4025c4b9,0x8025c4b9,0x4025d4bb,0x8025d4bb,0x4025e4bd,0x8025e4bd,0x4025f4bf,0x8025f4bf,
+	0x402604c0,0x40260cc2,0x80260cc2,0x40261cc4,0x80261cc4,0x40262cc6,0x80262cc6,0x40263cc8,
+	0x80263cc8,0x40264cca,0x80264cca,0x40265ccc,0x80265ccc,0x40266cce,0x80266cce,0x00267ccf,
+	0x402684d1,0x802684d1,0x402694d3,0x802694d3,0x4026a4d5,0x8026a4d5,0x4026b4d7,0x8026b4d7,
+	0x4026c4d9,0x8026c4d9,0x4026d4db,0x8026d4db,0x4026e4dd,0x8026e4dd,0x4026f4df,0x8026f4df,
+	0x402704e1,0x802704e1,0x402714e3,0x802714e3,0x402724e5,0x802724e5,0x402734e7,0x802734e7,
+	0x402744e9,0x802744e9,0x402754eb,0x802754eb,0x402764ed,0x802764ed,0x402774ef,0x802774ef,
+	0x402784f1,0x802784f1,0x402794f3,0x802794f3,0x4027a4f5,0x8027a4f5,0x0027b4f6,0x0027bcf7,
+	0x4027c4f9,0x8027c4f9,0x0027d4fa,0x0027dcfb,0x0027e4fc,0x0027ecfd,0x0027f4fe,0x0027fcff,
+	0x40280501,0x80280501,0x40281503,0x80281503,0x40282505,0x80282505,0x40283507,0x80283507,
+	0x40284509,0x80284509,0x4028550b,0x8028550b,0x4028650d,0x8028650d,0x4028750f,0x8028750f,
+	0x00288510,0x00288d11,0x00289512,0x00289d13,0x0028a514,0x0028ad15,0x0028b516,0x0028bd17,
+	0x0028c518,0x0028cd19,0x0028d51a,0x0028dd1b,0x0028e51c,0x0028ed1d,0x0028f51e,0x0028fd1f,
+	0x00290520,0x00290d21,0x00291522,0x00291d23,0x00292524,0x00292d25,0x00293526,0x00293d27,
+	0x00294528,0x00294d29,0x0029552a,0x00295d2b,0x0029652c,0x00296d2d,0x0029752e,0x00297d2f,
+	0x00298530,0x40298d61,0x40299562,0x40299d63,0x4029a564,0x4029ad65,0x4029b566,0x4029bd67,
+	0x4029c568,0x4029cd69,0x4029d56a,0x4029dd6b,0x4029e56c,0x4029ed6d,0x4029f56e,0x4029fd6f,
+	0x402a0570,0x402a0d71,0x402a1572,0x402a1d73,0x402a2574,0x402a2d75,0x402a3576,0x402a3d77,
+	0x402a4578,0x402a4d79,0x402a557a,0x402a5d7b,0x402a657c,0x402a6d7d,0x402a757e,0x402a7d7f,
+	0x402a8580,0x402a8d81,0x402a9582,0x402a9d83,0x402aa584,0x402aad85,0x402ab586,0x002abd57,
+	0x002ac558,0x002acd59,0x002ad55a,0x002add5b,0x002ae55c,0x002aed5d,0x002af55e,0x002afd5f,
+	0x002b0560,0x80298d61,0x80299562,0x80299d63,0x8029a564,0x8029ad65,0x8029b566,0x8029bd67,
+	0x8029c568,0x8029cd69,0x8029d56a,0x8029dd6b,0x8029e56c,0x8029ed6d,0x8029f56e,0x8029fd6f,
+	0x802a0570,0x802a0d71,0x802a1572,0x802a1d73,0x802a2574,0x802a2d75,0x802a3576,0x802a3d77,
+	0x802a4578,0x802a4d79,0x802a557a,0x802a5d7b,0x802a657c,0x802a6d7d,0x802a757e,0x802a7d7f,
+	0x802a8580,0x802a8d81,0x802a9582,0x802a9d83,0x802aa584,0x802aad85,0x802ab586,0x802c3d87,
+	0x002c4588,0x002c4d89,0x002c558a,0x002c5d8b,0x002c658c,0x002c6d8d,0x002c758e,0x002c7d8f,
+	0x002c8590,0x002c8d91,0x002c9592,0x002c9d93,0x002ca594,0x002cad95,0x002cb596,0x002cbd97,
+	0x002cc598,0x002ccd99,0x002cd59a,0x002cdd9b,0x002ce59c,0x002ced9d,0x002cf59e,0x002cfd9f,
+	0x002d05a0,0x002d0da1,0x002d15a2,0x002d1da3,0x002d25a4,0x002d2da5,0x002d35a6,0x002d3da7,
+	0x002d45a8,0x002d4da9,0x002d55aa,0x002d5dab,0x002d65ac,0x002d6dad,0x002d75ae,0x002d7daf,
+	0x002d85b0,0x002d8db1,0x002d95b2,0x002d9db3,0x002da5b4,0x002dadb5,0x002db5b6,0x002dbdb7,
+	0x002dc5b8,0x002dcdb9,0x002dd5ba,0x002dddbb,0x002de5bc,0x002dedbd,0x002df5be,0x002dfdbf,
+	0x002e05c0,0x002e0dc1,0x002e15c2,0x002e1dc3,0x002e25c4,0x002e2dc5,0x002e35c6,0x002e3dc7,
+	0x002e45c8,0x002e4dc9,0x002e55ca,0x002e5dcb,0x002e65cc,0x002e6dcd,0x002e75ce,0x002e7dcf,
+	0x002e85d0,0x002e8dd1,0x002e95d2,0x002e9dd3,0x002ea5d4,0x002eadd5,0x002eb5d6,0x002ebdd7,
+	0x002ec5d8,0x002ecdd9,0x002ed5da,0x002edddb,0x002ee5dc,0x002eeddd,0x002ef5de,0x002efddf,
+	0x002f05e0,0x002f0de1,0x002f15e2,0x002f1de3,0x002f25e4,0x002f2de5,0x002f35e6,0x002f3de7,
+	0x002f45e8,0x002f4de9,0x002f55ea,0x002f5deb,0x002f65ec,0x002f6ded,0x002f75ee,0x002f7def,
+	0x002f85f0,0x002f8df1,0x002f95f2,0x002f9df3,0x002fa5f4,0x002fadf5,0x002fb5f6,0x002fbdf7,
+	0x002fc5f8,0x002fcdf9,0x002fd5fa,0x002fddfb,0x002fe5fc,0x002fedfd,0x002ff5fe,0x002ffdff,
+	0x00300600,0x00300e01,0x00301602,0x00301e03,0x00302604,0x00302e05,0x00303606,0x00303e07,
+	0x00304608,0x00304e09,0x0030560a,0x00305e0b,0x0030660c,0x00306e0d,0x0030760e,0x00307e0f,
+	0x00308610,0x00308e11,0x00309612,0x00309e13,0x0030a614,0x0030ae15,0x0030b616,0x0030be17,
+	0x0030c618,0x0030ce19,0x0030d61a,0x0030de1b,0x0030e61c,0x0030ee1d,0x0030f61e,0x0030fe1f,
+	0x00310620,0x00310e21,0x00311622,0x00311e23,0x00312624,0x00312e25,0x00313626,0x00313e27,
+	0x00314628,0x00314e29,0x0031562a,0x00315e2b,0x0031662c,0x00316e2d,0x0031762e,0x00317e2f,
+	0x00318630,0x00318e31,0x00319632,0x00319e33,0x0031a634,0x0031ae35,0x0031b636,0x0031be37,
+	0x0031c638,0x0031ce39,0x0031d63a,0x0031de3b,0x0031e63c,0x0031ee3d,0x0031f63e,0x0031fe3f,
+	0x00320640,0x00320e41,0x00321642,0x00321e43,0x00322644,0x00322e45,0x00323646,0x00323e47,
+	0x00324648,0x00324e49,0x0032564a,0x00325e4b,0x0032664c,0x00326e4d,0x0032764e,0x00327e4f,
+	0x00328650,0x00328e51,0x00329652,0x00329e53,0x0032a654,0x0032ae55,0x0032b656,0x0032be57,
+	0x0032c658,0x0032ce59,0x0032d65a,0x0032de5b,0x0032e65c,0x0032ee5d,0x0032f65e,0x0032fe5f,
+	0x00330660,0x00330e61,0x00331662,0x00331e63,0x00332664,0x00332e65,0x00333666,0x00333e67,
+	0x00334668,0x00334e69,0x0033566a,0x00335e6b,0x0033666c,0x00336e6d,0x0033766e,0x00337e6f,
+	0x00338670,0x00338e71,0x00339672,0x00339e73,0x0033a674,0x0033ae75,0x0033b676,0x0033be77,
+	0x0033c678,0x0033ce79,0x0033d67a,0x0033de7b,0x0033e67c,0x0033ee7d,0x0033f67e,0x0033fe7f,
+	0x00340680,0x00340e81,0x00341682,0x00341e83,0x00342684,0x00342e85,0x00343686,0x00343e87,
+	0x00344688,0x00344e89,0x0034568a,0x00345e8b,0x0034668c,0x00346e8d,0x0034768e,0x00347e8f,
+	0x00348690,0x00348e91,0x00349692,0x00349e93,0x0034a694,0x0034ae95,0x0034b696,0x0034be97,
+	0x0034c698,0x0034ce99,0x0034d69a,0x0034de9b,0x0034e69c,0x0034ee9d,0x0034f69e,0x0034fe9f,
+	0x003506a0,0x00350ea1,0x003516a2,0x00351ea3,0x003526a4,0x00352ea5,0x003536a6,0x00353ea7,
+	0x003546a8,0x00354ea9,0x003556aa,0x00355eab,0x003566ac,0x00356ead,0x003576ae,0x00357eaf,
+	0x003586b0,0x00358eb1,0x003596b2,0x00359eb3,0x0035a6b4,0x0035aeb5,0x0035b6b6,0x0035beb7,
+	0x0035c6b8,0x0035ceb9,0x0035d6ba,0x0035debb,0x0035e6bc,0x0035eebd,0x0035f6be,0x0035febf,
+	0x003606c0,0x00360ec1,0x003616c2,0x00361ec3,0x003626c4,0x00362ec5,0x003636c6,0x00363ec7,
+	0x003646c8,0x00364ec9,0x003656ca,0x00365ecb,0x003666cc,0x00366ecd,0x003676ce,0x00367ecf,
+	0x003686d0,0x00368ed1,0x003696d2,0x00369ed3,0x0036a6d4,0x0036aed5,0x0036b6d6,0x0036bed7,
+	0x0036c6d8,0x0036ced9,0x0036d6da,0x0036dedb,0x0036e6dc,0x0036eedd,0x0036f6de,0x0036fedf,
+	0x003706e0,0x00370ee1,0x003716e2,0x00371ee3,0x003726e4,0x00372ee5,0x003736e6,0x00373ee7,
+	0x003746e8,0x00374ee9,0x003756ea,0x00375eeb,0x003766ec,0x00376eed,0x003776ee,0x00377eef,
+	0x003786f0,0x00378ef1,0x003796f2,0x00379ef3,0x0037a6f4,0x0037aef5,0x0037b6f6,0x0037bef7,
+	0x0037c6f8,0x0037cef9,0x0037d6fa,0x0037defb,0x0037e6fc,0x0037eefd,0x0037f6fe,0x0037feff,
+	0x00380700,0x00380f01,0x00381702,0x00381f03,0x00382704,0x00382f05,0x00383706,0x00383f07,
+	0x00384708,0x00384f09,0x0038570a,0x00385f0b,0x0038670c,0x00386f0d,0x0038770e,0x00387f0f,
+	0x00388710,0x00388f11,0x00389712,0x00389f13,0x0038a714,0x0038af15,0x0038b716,0x0038bf17,
+	0x0038c718,0x0038cf19,0x0038d71a,0x0038df1b,0x0038e71c,0x0038ef1d,0x0038f71e,0x0038ff1f,
+	0x00390720,0x00390f21,0x00391722,0x00391f23,0x00392724,0x00392f25,0x00393726,0x00393f27,
+	0x00394728,0x00394f29,0x0039572a,0x00395f2b,0x0039672c,0x00396f2d,0x0039772e,0x00397f2f,
+	0x00398730,0x00398f31,0x00399732,0x00399f33,0x0039a734,0x0039af35,0x0039b736,0x0039bf37,
+	0x0039c738,0x0039cf39,0x0039d73a,0x0039df3b,0x0039e73c,0x0039ef3d,0x0039f73e,0x0039ff3f,
+	0x003a0740,0x003a0f41,0x003a1742,0x003a1f43,0x003a2744,0x003a2f45,0x003a3746,0x003a3f47,
+	0x003a4748,0x003a4f49,0x003a574a,0x003a5f4b,0x003a674c,0x003a6f4d,0x003a774e,0x003a7f4f,
+	0x003a8750,0x003a8f51,0x003a9752,0x003a9f53,0x003aa754,0x003aaf55,0x003ab756,0x003abf57,
+	0x003ac758,0x003acf59,0x003ad75a,0x003adf5b,0x003ae75c,0x003aef5d,0x003af75e,0x003aff5f,
+	0x003b0760,0x003b0f61,0x003b1762,0x003b1f63,0x003b2764,0x003b2f65,0x003b3766,0x003b3f67,
+	0x003b4768,0x003b4f69,0x003b576a,0x003b5f6b,0x003b676c,0x003b6f6d,0x003b776e,0x003b7f6f,
+	0x003b8770,0x003b8f71,0x003b9772,0x003b9f73,0x003ba774,0x003baf75,0x003bb776,0x003bbf77,
+	0x003bc778,0x003bcf79,0x003bd77a,0x003bdf7b,0x003be77c,0x003bef7d,0x003bf77e,0x003bff7f,
+	0x003c0780,0x003c0f81,0x003c1782,0x003c1f83,0x003c2784,0x003c2f85,0x003c3786,0x003c3f87,
+	0x003c4788,0x003c4f89,0x003c578a,0x003c5f8b,0x003c678c,0x003c6f8d,0x003c778e,0x003c7f8f,
+	0x003c8790,0x003c8f91,0x003c9792,0x003c9f93,0x003ca794,0x003caf95,0x003cb796,0x003cbf97,
+	0x003cc798,0x003ccf99,0x003cd79a,0x003cdf9b,0x003ce79c,0x003cef9d,0x003cf79e,0x003cff9f,
+	0x003d07a0,0x003d0fa1,0x003d17a2,0x003d1fa3,0x003d27a4,0x003d2fa5,0x003d37a6,0x003d3fa7,
+	0x003d47a8,0x003d4fa9,0x003d57aa,0x003d5fab,0x003d67ac,0x003d6fad,0x003d77ae,0x003d7faf,
+	0x003d87b0,0x003d8fb1,0x003d97b2,0x003d9fb3,0x003da7b4,0x003dafb5,0x003db7b6,0x003dbfb7,
+	0x003dc7b8,0x003dcfb9,0x003dd7ba,0x003ddfbb,0x003de7bc,0x003defbd,0x003df7be,0x003dffbf,
+	0x003e07c0,0x003e0fc1,0x003e17c2,0x003e1fc3,0x003e27c4,0x003e2fc5,0x003e37c6,0x003e3fc7,
+	0x003e47c8,0x003e4fc9,0x003e57ca,0x003e5fcb,0x003e67cc,0x003e6fcd,0x003e77ce,0x003e7fcf,
+	0x003e87d0,0x003e8fd1,0x003e97d2,0x003e9fd3,0x003ea7d4,0x003eafd5,0x003eb7d6,0x003ebfd7,
+	0x003ec7d8,0x003ecfd9,0x003ed7da,0x003edfdb,0x003ee7dc,0x003eefdd,0x003ef7de,0x003effdf,
+	0x003f07e0,0x003f0fe1,0x003f17e2,0x003f1fe3,0x003f27e4,0x003f2fe5,0x003f37e6,0x003f3fe7,
+	0x003f47e8,0x003f4fe9,0x003f57ea,0x003f5feb,0x003f67ec,0x003f6fed,0x003f77ee,0x003f7fef,
+	0x003f87f0,0x003f8ff1,0x003f97f2,0x003f9ff3,0x003fa7f4,0x003faff5,0x003fb7f6,0x003fbff7,
+	0x003fc7f8,0x003fcff9,0x003fd7fa,0x003fdffb,0x003fe7fc,0x003feffd,0x003ff7fe,0x003fffff,
+};
+
+byte DefaultCharset = 255;
+
+void SetDefaultCharset(byte charset)
+{
+	DefaultCharset = charset;
+}
+
+byte GetDefaultCharset()
+{
+	return DefaultCharset;
+}
+
+struct CharSetData {
+	const word           *table;
+	static byte           undef[128];
+	byte                 *line[16];
+	VectorMap<int, byte>  map;
+	byte                  system;
+
+	void Gen();
+
+	int  ToUnicode(int chr)  { return (byte)chr < 128 ? (byte)chr : table[(byte)chr - 128]; }
+	int  FromUnicode(int chr, int def = DEFAULTCHAR);
+	void FromUnicode(char *t, const wchar *s, const wchar *end, int def = DEFAULTCHAR);
+
+	CharSetData();
+	~CharSetData();
+};
+
+byte CharSetData::undef[] = {
+	CUNDEF, CUNDEF, CUNDEF, CUNDEF, CUNDEF, CUNDEF, CUNDEF, CUNDEF,
+	CUNDEF, CUNDEF, CUNDEF, CUNDEF, CUNDEF, CUNDEF, CUNDEF, CUNDEF,
+	CUNDEF, CUNDEF, CUNDEF, CUNDEF, CUNDEF, CUNDEF, CUNDEF, CUNDEF,
+	CUNDEF, CUNDEF, CUNDEF, CUNDEF, CUNDEF, CUNDEF, CUNDEF, CUNDEF,
+
+	CUNDEF, CUNDEF, CUNDEF, CUNDEF, CUNDEF, CUNDEF, CUNDEF, CUNDEF,
+	CUNDEF, CUNDEF, CUNDEF, CUNDEF, CUNDEF, CUNDEF, CUNDEF, CUNDEF,
+	CUNDEF, CUNDEF, CUNDEF, CUNDEF, CUNDEF, CUNDEF, CUNDEF, CUNDEF,
+	CUNDEF, CUNDEF, CUNDEF, CUNDEF, CUNDEF, CUNDEF, CUNDEF, CUNDEF,
+
+	CUNDEF, CUNDEF, CUNDEF, CUNDEF, CUNDEF, CUNDEF, CUNDEF, CUNDEF,
+	CUNDEF, CUNDEF, CUNDEF, CUNDEF, CUNDEF, CUNDEF, CUNDEF, CUNDEF,
+	CUNDEF, CUNDEF, CUNDEF, CUNDEF, CUNDEF, CUNDEF, CUNDEF, CUNDEF,
+	CUNDEF, CUNDEF, CUNDEF, CUNDEF, CUNDEF, CUNDEF, CUNDEF, CUNDEF,
+
+	CUNDEF, CUNDEF, CUNDEF, CUNDEF, CUNDEF, CUNDEF, CUNDEF, CUNDEF,
+	CUNDEF, CUNDEF, CUNDEF, CUNDEF, CUNDEF, CUNDEF, CUNDEF, CUNDEF,
+	CUNDEF, CUNDEF, CUNDEF, CUNDEF, CUNDEF, CUNDEF, CUNDEF, CUNDEF,
+	CUNDEF, CUNDEF, CUNDEF, CUNDEF, CUNDEF, CUNDEF, CUNDEF, CUNDEF,
+};
+
+void CharSetData::Gen()
+{
+	int c;
+	line[0] = new byte[128];
+	for(c = 0; c < 128; c++)
+		line[0][c] = c;
+	for(c = 0; c < 128; c++) {
+		int q = table[c];
+		if(q < 16 * 128) {
+			int i = q >> 7;
+			if(!line[i]) {
+				line[i] = new byte[128];
+				memset(line[i], CUNDEF, 128);
+			}
+			line[i][q & 0x7f] = c + 128;
+		}
+		else
+		if((q & 0xFF00) != 0xEE00)
+			map.Add(q, c + 128);
+	}
+	for(c = 0; c < 16; c++)
+		if(!line[c])
+			line[c] = undef;
+}
+
+inline int CharSetData::FromUnicode(int chr, int def)
+{
+	if(!line[0]) Gen();
+	int c = chr < 16 * 128 ? line[chr >> 7][chr & 0x7f]
+	                       : (chr & 0xFF00) == 0xEE00 ? (chr & 255)
+	                                                  : map.Get(chr, CUNDEF);
+	return c == DEFAULTCHAR ? def : c;
+}
+
+inline void CharSetData::FromUnicode(char *t, const wchar *s, const wchar *end, int def)
+{
+	if(!line[0]) Gen();
+	if(def == DEFAULTCHAR)
+		while(s < end) {
+			int chr = *s++;
+			*t++ = chr < 16 * 128 ? line[chr >> 7][chr & 0x7f]
+			                      : (chr & 0xFF00) == 0xEE00 ? (chr & 255)
+			                                                 : map.Get(chr, CUNDEF);
+		}
+	else
+		while(s < end) {
+			int chr = *s++;
+			int c = chr < 16 * 128 ? line[chr >> 7][chr & 0x7f]
+			                       : (chr & 0xFF00) == 0xEE00 ? (chr & 255)
+			                                                  : map.Get(chr, CUNDEF);
+			*t++ = c == DEFAULTCHAR ? def : c;
+		}
+}
+
+CharSetData::CharSetData()
+{
+	for(int i = 0; i < 16; i++)
+		line[i] = 0;
+}
+
+CharSetData::~CharSetData()
+{
+	for(int i = 0; i < 16; i++)
+		if(line[i] && line[i] != undef)
+			delete[] line[i];
+}
+
+static void sInit()
+{
+#ifdef PLATFORM_WIN32
+	AddCharSetE("NONE"     ,   CHRTAB_ISO8859_1,  CHARSET_WIN1252);
+	AddCharSetE("iso8859-1",   CHRTAB_ISO8859_1,  CHARSET_WIN1252);
+	AddCharSetE("iso8859-2",   CHRTAB_ISO8859_2,  CHARSET_WIN1250); //??
+	AddCharSetE("iso8859-3",   CHRTAB_ISO8859_3,  CHARSET_WIN1254); //??
+	AddCharSetE("iso8859-4",   CHRTAB_ISO8859_4,  CHARSET_WIN1257); //??
+	AddCharSetE("iso8859-5",   CHRTAB_ISO8859_5,  CHARSET_WIN1251);
+	AddCharSetE("iso8859-6",   CHRTAB_ISO8859_6,  CHARSET_WIN1256);
+	AddCharSetE("iso8859-7",   CHRTAB_ISO8859_7,  CHARSET_WIN1253);
+	AddCharSetE("iso8859-8",   CHRTAB_ISO8859_8,  CHARSET_WIN1255); //??
+	AddCharSetE("iso8859-9",   CHRTAB_ISO8859_9,  CHARSET_WIN1254);
+	AddCharSetE("iso8859-10",  CHRTAB_ISO8859_10, CHARSET_WIN1257); //??
+	AddCharSetE("iso8859-13",  CHRTAB_ISO8859_13, CHARSET_WIN1257);
+	AddCharSetE("iso8859-14",  CHRTAB_ISO8859_14, CHARSET_WIN1252); //??
+	AddCharSetE("iso8859-15",  CHRTAB_ISO8859_15, CHARSET_WIN1252); //??
+	AddCharSetE("iso8859-16",  CHRTAB_ISO8859_16, CHARSET_WIN1250); //??
+	AddCharSetE("windows-1250",CHRTAB_WIN1250,    CHARSET_WIN1250);
+	AddCharSetE("windows-1251",CHRTAB_WIN1251,    CHARSET_WIN1251);
+	AddCharSetE("windows-1252",CHRTAB_WIN1252,    CHARSET_WIN1252);
+	AddCharSetE("windows-1253",CHRTAB_WIN1253,    CHARSET_WIN1253);
+	AddCharSetE("windows-1254",CHRTAB_WIN1254,    CHARSET_WIN1254);
+	AddCharSetE("windows-1255",CHRTAB_WIN1255,    CHARSET_WIN1255);
+	AddCharSetE("windows-1256",CHRTAB_WIN1256,    CHARSET_WIN1256);
+	AddCharSetE("windows-1257",CHRTAB_WIN1257,    CHARSET_WIN1257);
+	AddCharSetE("windows-1258",CHRTAB_WIN1258,    CHARSET_WIN1258);
+	AddCharSetE("koi8-r",      CHRTAB_KOI8_R,     CHARSET_WIN1251);
+	AddCharSetE("cp852",       CHRTAB_CP852,      CHARSET_WIN1250);
+	AddCharSetE("mjk",         CHRTAB_MJK,        CHARSET_WIN1250);
+	AddCharSetE("cp850",       CHRTAB_CP850,      CHARSET_WIN1252);
+#else
+	AddCharSetE("NONE"     ,   CHRTAB_ISO8859_1,   CHARSET_ISO8859_1);
+	AddCharSetE("iso8859-1",   CHRTAB_ISO8859_1,   CHARSET_ISO8859_1);
+	AddCharSetE("iso8859-2",   CHRTAB_ISO8859_2,   CHARSET_ISO8859_2);
+	AddCharSetE("iso8859-3",   CHRTAB_ISO8859_3,   CHARSET_ISO8859_3);
+	AddCharSetE("iso8859-4",   CHRTAB_ISO8859_4,   CHARSET_ISO8859_4);
+	AddCharSetE("iso8859-5",   CHRTAB_ISO8859_5,   CHARSET_ISO8859_5);
+	AddCharSetE("iso8859-6",   CHRTAB_ISO8859_6,   CHARSET_ISO8859_6);
+	AddCharSetE("iso8859-7",   CHRTAB_ISO8859_7,   CHARSET_ISO8859_7);
+	AddCharSetE("iso8859-8",   CHRTAB_ISO8859_8,   CHARSET_ISO8859_8);
+	AddCharSetE("iso8859-9",   CHRTAB_ISO8859_9,   CHARSET_ISO8859_9);
+	AddCharSetE("iso8859-10",  CHRTAB_ISO8859_10,  CHARSET_ISO8859_10);
+	AddCharSetE("iso8859-13",  CHRTAB_ISO8859_13,  CHARSET_ISO8859_13);
+	AddCharSetE("iso8859-14",  CHRTAB_ISO8859_14,  CHARSET_ISO8859_14);
+	AddCharSetE("iso8859-15",  CHRTAB_ISO8859_15,  CHARSET_ISO8859_15);
+	AddCharSetE("iso8859-16",  CHRTAB_ISO8859_16,  CHARSET_ISO8859_16);
+	AddCharSetE("windows-1250",CHRTAB_WIN1250,     CHARSET_ISO8859_2);
+	AddCharSetE("windows-1251",CHRTAB_WIN1251,     CHARSET_ISO8859_5);
+	AddCharSetE("windows-1252",CHRTAB_WIN1252,     CHARSET_ISO8859_1);
+	AddCharSetE("windows-1253",CHRTAB_WIN1253,     CHARSET_ISO8859_7);
+	AddCharSetE("windows-1254",CHRTAB_WIN1254,     CHARSET_ISO8859_9);
+	AddCharSetE("windows-1255",CHRTAB_WIN1255,     CHARSET_ISO8859_8);
+	AddCharSetE("windows-1256",CHRTAB_WIN1256,     CHARSET_ISO8859_6);
+	AddCharSetE("windows-1257",CHRTAB_WIN1257,     CHARSET_ISO8859_13);
+	AddCharSetE("windows-1258",CHRTAB_WIN1258,     CHARSET_ISO8859_9);
+	AddCharSetE("koi8-r",      CHRTAB_KOI8_R,      CHARSET_ISO8859_5);
+	AddCharSetE("cp852",       CHRTAB_CP852,       CHARSET_ISO8859_2);
+	AddCharSetE("mjk",         CHRTAB_MJK,         CHARSET_ISO8859_2);
+	AddCharSetE("cp850",       CHRTAB_CP850,       CHARSET_ISO8859_1);
+#endif
+}
+
+static ArrayMap<String, CharSetData>& s_map()
+{
+	static bool init;
+	if(!init)
+		ONCELOCK {
+			init = true;
+			sInit();
+		}
+	return Single< ArrayMap<String, CharSetData> >();
+}
+
+byte AddCharSet(const char *name, const word *table, byte systemcharset)
+{
+#ifdef _DEBUG
+	Index<int> chk;
+	for(int i = 0; i < 128; i++) {
+		ASSERT(table[i] >= 128);
+		ASSERT(chk.Find(table[i]) < 0);
+		chk.Add(table[i]);
+	}
+#endif
+	LLOG("Adding " << name << " charset");
+	int q = s_map().GetCount();
+	CharSetData& m = s_map().Add(name);
+	m.table = table;
+	m.system = systemcharset;
+	return q;
+}
+
+byte AddCharSetE(const char *name, word *table, byte systemcharset)
+{
+	for(int i = 0; i < 128; i++)
+		if(table[i] == CUNDEF)
+			table[i] = i + 0xEE80;
+	return AddCharSet(name, table, systemcharset);
+}
+
+const char *CharsetName(byte charset)
+{
+	if(charset == CHARSET_DEFAULT)
+		charset = GetDefaultCharset();
+	if(charset == CHARSET_UTF8)
+		return "UTF-8";
+	if(charset >= CharsetCount())
+		return "";
+	return s_map().GetKey(charset);
+}
+
+int CharsetCount()
+{
+	return s_map().GetCount();
+}
+
+int cs_filter(int c)
+{
+	return IsDigit(c) ? c : IsAlpha(c) ? ToLower(c) : 0;
+}
+
+int CharsetByName(const char *name)
+{
+	String nm = Filter(name, cs_filter);
+	if(nm == "utf8" || nm == "utf-8")
+		return CHARSET_UTF8;
+	for(int i = 1; i < CharsetCount(); i++)
+		if(nm == Filter(CharsetName(i), cs_filter))
+			return i;
+	return 0;
+}
+
+byte  ResolveCharset(byte charset)
+{
+	return charset ? charset : DefaultCharset;
+}
+
+inline
+static CharSetData& s_cset(byte charset)
+{
+	return s_map()[ResolveCharset(charset)];
+}
+
+byte SystemCharset(byte charset)
+{
+	return s_cset(charset).system;
+}
+
+int ToUnicode(int chr, byte charset)
+{
+	return s_cset(charset).ToUnicode(chr);
+}
+
+int FromUnicode(wchar wchr, byte charset, int def)
+{
+	return s_cset(charset).FromUnicode(wchr, def);
+}
+
+void ToUnicode(wchar *ws, const char *s, int n, byte charset)
+{
+	CharSetData& cs = s_cset(charset);
+	const char *lim = s + n;
+	while(s < lim)
+		*ws++ = cs.ToUnicode(*s++);
+}
+
+void FromUnicode(char *s, const wchar *ws, int n, byte charset, int def)
+{
+	s_cset(charset).FromUnicode(s, ws, ws + n, def);
+}
+
+void ConvertCharset(char *t, byte tcharset, const char *s, byte scharset, int n)
+{
+	CharSetData& cs = s_cset(scharset);
+	const char *lim = s + n;
+	if(tcharset == CHARSET_TOASCII)
+		while(s < lim)
+			*t++ = ToAscii(cs.ToUnicode(*s++));
+	else {
+		CharSetData& ct = s_cset(tcharset);
+		while(s < lim)
+			*t++ = ct.FromUnicode(cs.ToUnicode(*s++));
+	}
+}
+
+bool utf8check(const char *_s, int len)
+{
+	const byte *s = (const byte *)_s;
+	const byte *lim = s + len;
+	int codePoint = 0;
+	while(s < lim) {
+		word code = (byte)*s++;
+		if(code >= 0x80) {
+			if(code < 0xC2)
+				return false;
+			else
+			if(code < 0xE0) {
+				if(s >= lim || *s < 0x80 || *s >= 0xc0)
+					return false;
+				codePoint = ((code - 0xC0) << 6) + *s - 0x80;
+				if(codePoint < 0x80 || codePoint > 0x07FF)
+					return false;
+				s++;
+			}
+			else
+			if(code < 0xF0) {
+				if(s + 1 >= lim ||
+				   s[0] < 0x80 || s[0] >= 0xc0 ||
+				   s[1] < 0x80 || s[1] >= 0xc0)
+				   	return false;
+				codePoint = ((code - 0xE0) << 12) + ((s[0] - 0x80) << 6) + s[1] - 0x80;
+				if(codePoint < 0x0800 || codePoint > 0xFFFF)
+					return false;
+				s += 2;
+			}
+			else
+			if(code < 0xF5) {
+				if(s + 2 >= lim ||
+				   s[0] < 0x80 || s[0] >= 0xc0 ||
+				   s[1] < 0x80 || s[1] >= 0xc0 ||
+				   s[2] < 0x80 || s[2] >= 0xc0)
+				   	return false;
+				codePoint = ((code - 0xf0) << 18) + ((s[0] - 0x80) << 12) +
+				            ((s[1] - 0x80) << 6) + s[2] - 0x80;
+				if(codePoint < 0x010000 || codePoint > 0x10FFFF)
+					return false;
+				s += 3;
+			}
+			else
+				return false;
+		}
+	}
+	return true;
+}
+
+int utf8len(const char *_s, int _len)
+{
+	const byte *s = (const byte *)_s;
+	const byte *lim = s + _len;
+	int len = 0;
+	if(_len > 4)
+		while(s < lim - 4) {
+			word code = (byte)*s++;
+			if(code < 0x80)
+				len++;
+			else
+			if(code < 0xC2)
+				len++;
+			else
+			if(code < 0xE0) {
+				word c = ((code - 0xC0) << 6) + s[0] - 0x80;
+				if(s[0] >= 0x80 && s[0] < 0xc0 && c >= 0x80 && c < 0x800)
+					len++;
+				else
+					len += 2;
+				s += 1;
+			}
+			else
+			if(code < 0xF0) {
+				word c = ((code - 0xE0) << 12) + ((s[0] - 0x80) << 6) + s[1] - 0x80;
+				if(s[0] >= 0x80 && s[0] < 0xc0 && s[1] >= 0x80 && s[1] < 0xc0 && c >= 0x800
+				   && !(c >= 0xEE00 && c <= 0xEEFF))
+					len++;
+				else
+					len += 3;
+				s += 2;
+			}
+			else
+				len++;
+		}
+	while(s < lim) {
+		word code = (byte)*s++;
+		if(code < 0x80)
+			len++;
+		else
+		if(code < 0xC2)
+			len++;
+		else
+		if(code < 0xE0) {
+			if(s > lim - 1) {
+				len++;
+				break;
+			}
+			word c = ((code - 0xC0) << 6) + s[0] - 0x80;
+			if(s[0] >= 0x80 && s[0] < 0xc0 && c >= 0x80 && c < 0x800)
+				len++;
+			else
+				len += 2;
+			s += 1;
+		}
+		else
+		if(code < 0xF0) {
+			if(s > lim - 2) {
+				len += 1 + (int)(lim - s);
+				break;
+			}
+			word c = ((code - 0xE0) << 12) + ((s[0] - 0x80) << 6) + s[1] - 0x80;
+			if(s[0] >= 0x80 && s[0] < 0xc0 && s[1] >= 0x80 && s[1] < 0xc0 && c >= 0x800
+			   && !(c >= 0xEE00 && c <= 0xEEFF))
+			   len++;
+			else
+				len += 3;
+			s += 2;
+		}
+		else
+			len++;
+	}
+	return len;
+}
+
+WString FromUtf8(const char *_s, int len)
+{
+	const byte *s = (const byte *)_s;
+	const byte *lim = s + len;
+	int tlen = utf8len(_s, len);
+	WStringBuffer result(tlen);
+	wchar *t = result;
+	if(len > 4)
+		while(s < lim - 4) {
+			word code = (byte)*s++;
+			if(code < 0x80)
+				*t++ = code;
+			else
+			if(code < 0xC2)
+				*t++ = 0xEE00 + code;
+			else
+			if(code < 0xE0) {
+				word c = ((code - 0xC0) << 6) + s[0] - 0x80;
+				if(s[0] >= 0x80 && s[0] < 0xc0 && c >= 0x80 && c < 0x800)
+					*t++ = c;
+				else {
+					*t++ = 0xEE00 + code;
+					*t++ = 0xEE00 + s[0];
+				}
+				s += 1;
+			}
+			else
+			if(code < 0xF0) {
+				word c = ((code - 0xE0) << 12) + ((s[0] - 0x80) << 6) + s[1] - 0x80;
+				if(s[0] >= 0x80 && s[0] < 0xc0 && s[1] >= 0x80 && s[1] < 0xc0 && c >= 0x800
+				   && !(c >= 0xEE00 && c <= 0xEEFF))
+					*t++ = c;
+				else {
+					*t++ = 0xEE00 + code;
+					*t++ = 0xEE00 + s[0];
+					*t++ = 0xEE00 + s[1];
+				}
+				s += 2;
+			}
+			else
+				*t++ = 0xEE00 + code;
+		}
+	while(s < lim) {
+		word code = (byte)*s++;
+		if(code < 0x80)
+			*t++ = code;
+		else
+		if(code < 0xC0)
+			*t++ = 0xEE00 + code;
+		else
+		if(code < 0xE0) {
+			if(s > lim - 1) {
+				*t++ = 0xEE00 + code;
+				break;
+			}
+			word c = ((code - 0xC0) << 6) + s[0] - 0x80;
+			if(s[0] >= 0x80 && s[0] < 0xc0 && c >= 0x80 && c < 0x800)
+				*t++ = c;
+			else {
+				*t++ = 0xEE00 + code;
+				*t++ = 0xEE00 + s[0];
+			}
+			s += 1;
+		}
+		else
+		if(code < 0xF0) {
+			if(s > lim - 2) {
+				*t++ = 0xEE00 + code;
+				while(s < lim)
+					*t++ = 0xEE00 + *s++;
+				break;
+			}
+			word c = ((code - 0xE0) << 12) + ((s[0] - 0x80) << 6) + s[1] - 0x80;
+			if(s[0] >= 0x80 && s[0] < 0xc0 && s[1] >= 0x80 && s[1] < 0xc0 && c >= 0x800
+			   && !(c >= 0xEE00 && c <= 0xEEFF))
+				*t++ = c;
+			else {
+				*t++ = 0xEE00 + code;
+				*t++ = 0xEE00 + s[0];
+				*t++ = 0xEE00 + s[1];
+			}
+			s += 2;
+		}
+		else
+			*t++ = 0xEE00 + code;
+	}
+	ASSERT(t - ~result == tlen);
+	return result;
+}
+
+int lenAsUtf8(const wchar *s, int len)
+{
+	const wchar *lim = s + len;
+	len = 0;
+	while(s < lim) {
+		word code = *s++;
+		if(code < 0x80)
+			len++;
+		else
+		if(code < 0x800)
+			len += 2;
+		else
+		if((code & 0xFF00) == 0xEE00)
+			len++;
+		else
+			len += 3;
+	}
+	return len;
+}
+
+String ToUtf8(const wchar *s, int len)
+{
+	const wchar *lim = s + len;
+	int tlen = lenAsUtf8(s, len);
+	StringBuffer result(tlen);
+	char *t = result;
+	while(s < lim) {
+		word code = *s++;
+		if(code < 0x80)
+			*t++ = (char)code;
+		else
+		if(code < 0x800) {
+			*t++ = 0xc0 | (code >> 6);
+			*t++ = 0x80 | (code & 0x3f);
+		}
+		else
+		if((code & 0xFF00) == 0xEE00)
+			*t++ = (char) code;
+		else {
+			*t++ = 0xe0 | (code >> 12);
+			*t++ = 0x80 | ((code >> 6) & 0x3f);
+			*t++ = 0x80 | (code & 0x3f);
+		}
+	}
+	ASSERT(t - ~result == tlen);
+	return result;
+}
+
+int utf8len(const char *s)
+{
+	return utf8len(s, (int)strlen(s));
+}
+
+int lenAsUtf8(const wchar *s)
+{
+	return lenAsUtf8(s, wstrlen(s));
+}
+
+String ToUtf8(wchar code)
+{
+	return ToUtf8(&code, 1);
+}
+
+String ToUtf8(const WString& w)
+{
+	return ToUtf8(w, w.GetLength());
+}
+
+String ToUtf8(const wchar *s)
+{
+	return ToUtf8(s, wstrlen(s));
+}
+
+bool  CheckUtf8(const String& src)
+{
+	return utf8check(~src, src.GetLength());
+}
+
+WString FromUtf8(const char *s)
+{
+	return FromUtf8(s, (int)strlen(s));
+}
+
+WString FromUtf8(const String& s)
+{
+	return FromUtf8(s, s.GetLength());
+}
+
+#ifdef flagSO
+bool IsLetter(int c)        { return (dword)c < 2048 ? uni__info[c] & 0xc0000000 : 0; }
+bool IsUpper(int c)         { return (dword)c < 2048 ? uni__info[c] & 0x40000000 : 0; }
+bool IsLower(int c)         { return (dword)c < 2048 ? uni__info[c] & 0x80000000 : 0; }
+int  ToUpper(int c)         { return (dword)c < 2048 ? (uni__info[c] >> 11) & 2047 : c; }
+int  ToLower(int c)         { return (dword)c < 2048 ? uni__info[c] & 2047 : c; }
+int  ToAscii(int c)         { return (dword)c < 2048 ? (uni__info[c] >> 22) & 0x7f : 0; }
+#endif
+
+void ToUpper(wchar *t, const wchar *s, int len)
+{
+	const wchar *lim = s + len;
+	while(s < lim)
+		*t++ = ToUpper(*s++);
+}
+
+void ToLower(wchar *t, const wchar *s, int len)
+{
+	const wchar *lim = s + len;
+	while(s < lim)
+		*t++ = ToLower(*s++);
+}
+
+void ToAscii(wchar *t, const wchar *s, int len)
+{
+	const wchar *lim = s + len;
+	while(s < lim)
+		*t++ = ToAscii(*s++);
+}
+
+void ToUpper(wchar *s, int len) { ToUpper(s, s, len); }
+void ToLower(wchar *s, int len) { ToLower(s, s, len); }
+void ToAscii(wchar *s, int len) { ToAscii(s, s, len); }
+
+bool IsLetter(int c, byte charset)
+{
+	if((charset ? charset : DefaultCharset) == CHARSET_UTF8)
+		return IsLetter(c);
+	CharSetData& cs = s_cset(charset);
+	return IsLetter(cs.ToUnicode(c));
+}
+
+bool IsUpper(int c, byte charset)
+{
+	if((charset ? charset : DefaultCharset) == CHARSET_UTF8)
+		return IsUpper(c);
+	CharSetData& cs = s_cset(charset);
+	return IsUpper(cs.ToUnicode(c));
+}
+
+bool IsLower(int c, byte charset)
+{
+	if((charset ? charset : DefaultCharset) == CHARSET_UTF8)
+		return IsLower(c);
+	CharSetData& cs = s_cset(charset);
+	return IsLower(cs.ToUnicode(c));
+}
+
+int  ToUpper(int c, byte charset)
+{
+	if((charset ? charset : DefaultCharset) == CHARSET_UTF8)
+		return ToUpper(c);
+	CharSetData& cs = s_cset(charset);
+	return cs.FromUnicode(ToUpper(cs.ToUnicode(c)));
+}
+
+int  ToLower(int c, byte charset)
+{
+	if((charset ? charset : DefaultCharset) == CHARSET_UTF8)
+		return ToLower(c);
+	CharSetData& cs = s_cset(charset);
+	return cs.FromUnicode(ToLower(cs.ToUnicode(c)));
+}
+
+int  ToAscii(int c, byte charset)
+{
+	if((charset ? charset : DefaultCharset) == CHARSET_UTF8)
+		return ToAscii(c);
+	CharSetData& cs = s_cset(charset);
+	return cs.FromUnicode(ToAscii(cs.ToUnicode(c)));
+}
+
+static word sComb(const word *s, word chr)
+{
+	while(*s) {
+		if(*s == chr)
+			return s[1];
+		s += 2;
+	}
+	return 0;
+}
+
+word UnicodeCombine(word chr, word combine)
+{
+	static word comb300[] = { 0x41, 0xC0, 0x45, 0xC8, 0x49, 0xCC, 0x4F, 0xD2, 0x55, 0xD9, 0x61, 0xE0, 0x65, 0xE8, 0x69, 0xEC, 0x6F, 0xF2, 0x75, 0xF9, 0xDC, 0x1DB, 0xFC, 0x1DC, 0x4E, 0x1F8, 0x6E, 0x1F9, 0x415, 0x400, 0x418, 0x40D, 0x435, 0x450, 0x438, 0x45D, 0 };
+	static word comb301[] = { 0x41, 0xC1, 0x45, 0xC9, 0x49, 0xCD, 0x4F, 0xD3, 0x55, 0xDA, 0x59, 0xDD, 0x61, 0xE1, 0x65, 0xE9, 0x69, 0xED, 0x6F, 0xF3, 0x75, 0xFA, 0x79, 0xFD, 0x43, 0x106, 0x63, 0x107, 0x4C, 0x139, 0x6C, 0x13A, 0x4E, 0x143, 0x6E, 0x144, 0x52, 0x154, 0x72, 0x155, 0x53, 0x15A, 0x73, 0x15B, 0x5A, 0x179, 0x7A, 0x17A, 0xDC, 0x1D7, 0xFC, 0x1D8, 0x47, 0x1F4, 0x67, 0x1F5, 0xC5, 0x1FA, 0xE5, 0x1FB, 0xC6, 0x1FC, 0xE6, 0x1FD, 0xD8, 0x1FE, 0xF8, 0x1FF, 0x308, 0x344, 0xA8, 0x385, 0x391, 0x386, 0x395, 0x388, 0x397, 0x389, 0x399, 0x38A, 0x39F, 0x38C, 0x3A5, 0x38E, 0x3A9, 0x38F, 0x3CA, 0x390, 0x3B1, 0x3AC, 0x3B5, 0x3AD, 0x3B7, 0x3AE, 0x3B9, 0x3AF, 0x3CB, 0x3B0, 0x3BF, 0x3CC, 0x3C5, 0x3CD, 0x3C9, 0x3CE, 0x3D2, 0x3D3, 0x413, 0x403, 0x41A, 0x40C, 0x433, 0x453, 0x43A, 0x45C, 0 };
+	static word comb302[] = { 0x41, 0xC2, 0x45, 0xCA, 0x49, 0xCE, 0x4F, 0xD4, 0x55, 0xDB, 0x61, 0xE2, 0x65, 0xEA, 0x69, 0xEE, 0x6F, 0xF4, 0x75, 0xFB, 0x43, 0x108, 0x63, 0x109, 0x47, 0x11C, 0x67, 0x11D, 0x48, 0x124, 0x68, 0x125, 0x4A, 0x134, 0x6A, 0x135, 0x53, 0x15C, 0x73, 0x15D, 0x57, 0x174, 0x77, 0x175, 0x59, 0x176, 0x79, 0x177, 0 };
+	static word comb303[] = { 0x41, 0xC3, 0x4E, 0xD1, 0x4F, 0xD5, 0x61, 0xE3, 0x6E, 0xF1, 0x6F, 0xF5, 0x49, 0x128, 0x69, 0x129, 0x55, 0x168, 0x75, 0x169, 0 };
+	static word comb304[] = { 0x41, 0x100, 0x61, 0x101, 0x45, 0x112, 0x65, 0x113, 0x49, 0x12A, 0x69, 0x12B, 0x4F, 0x14C, 0x6F, 0x14D, 0x55, 0x16A, 0x75, 0x16B, 0xDC, 0x1D5, 0xFC, 0x1D6, 0xC4, 0x1DE, 0xE4, 0x1DF, 0x226, 0x1E0, 0x227, 0x1E1, 0xC6, 0x1E2, 0xE6, 0x1E3, 0x1EA, 0x1EC, 0x1EB, 0x1ED, 0xD6, 0x22A, 0xF6, 0x22B, 0xD5, 0x22C, 0xF5, 0x22D, 0x22E, 0x230, 0x22F, 0x231, 0x59, 0x232, 0x79, 0x233, 0x418, 0x4E2, 0x438, 0x4E3, 0x423, 0x4EE, 0x443, 0x4EF, 0 };
+	static word comb305[] = { 0 };
+	static word comb306[] = { 0x41, 0x102, 0x61, 0x103, 0x45, 0x114, 0x65, 0x115, 0x47, 0x11E, 0x67, 0x11F, 0x49, 0x12C, 0x69, 0x12D, 0x4F, 0x14E, 0x6F, 0x14F, 0x55, 0x16C, 0x75, 0x16D, 0x423, 0x40E, 0x418, 0x419, 0x438, 0x439, 0x443, 0x45E, 0x416, 0x4C1, 0x436, 0x4C2, 0x410, 0x4D0, 0x430, 0x4D1, 0x415, 0x4D6, 0x435, 0x4D7, 0 };
+	static word comb307[] = { 0x43, 0x10A, 0x63, 0x10B, 0x45, 0x116, 0x65, 0x117, 0x47, 0x120, 0x67, 0x121, 0x49, 0x130, 0x5A, 0x17B, 0x7A, 0x17C, 0x41, 0x226, 0x61, 0x227, 0x4F, 0x22E, 0x6F, 0x22F, 0 };
+	static word comb308[] = { 0x41, 0xC4, 0x45, 0xCB, 0x49, 0xCF, 0x4F, 0xD6, 0x55, 0xDC, 0x61, 0xE4, 0x65, 0xEB, 0x69, 0xEF, 0x6F, 0xF6, 0x75, 0xFC, 0x79, 0xFF, 0x59, 0x178, 0x399, 0x3AA, 0x3A5, 0x3AB, 0x3B9, 0x3CA, 0x3C5, 0x3CB, 0x3D2, 0x3D4, 0x415, 0x401, 0x406, 0x407, 0x435, 0x451, 0x456, 0x457, 0x410, 0x4D2, 0x430, 0x4D3, 0x4D8, 0x4DA, 0x4D9, 0x4DB, 0x416, 0x4DC, 0x436, 0x4DD, 0x417, 0x4DE, 0x437, 0x4DF, 0x418, 0x4E4, 0x438, 0x4E5, 0x41E, 0x4E6, 0x43E, 0x4E7, 0x4E8, 0x4EA, 0x4E9, 0x4EB, 0x42D, 0x4EC, 0x44D, 0x4ED, 0x423, 0x4F0, 0x443, 0x4F1, 0x427, 0x4F4, 0x447, 0x4F5, 0x42B, 0x4F8, 0x44B, 0x4F9, 0 };
+	static word comb309[] = { 0 };
+	static word comb30A[] = { 0x41, 0xC5, 0x61, 0xE5, 0x55, 0x16E, 0x75, 0x16F, 0 };
+	static word comb30B[] = { 0x4F, 0x150, 0x6F, 0x151, 0x55, 0x170, 0x75, 0x171, 0x423, 0x4F2, 0x443, 0x4F3, 0 };
+	static word comb30C[] = { 0x43, 0x10C, 0x63, 0x10D, 0x44, 0x10E, 0x64, 0x10F, 0x45, 0x11A, 0x65, 0x11B, 0x4C, 0x13D, 0x6C, 0x13E, 0x4E, 0x147, 0x6E, 0x148, 0x52, 0x158, 0x72, 0x159, 0x53, 0x160, 0x73, 0x161, 0x54, 0x164, 0x74, 0x165, 0x5A, 0x17D, 0x7A, 0x17E, 0x41, 0x1CD, 0x61, 0x1CE, 0x49, 0x1CF, 0x69, 0x1D0, 0x4F, 0x1D1, 0x6F, 0x1D2, 0x55, 0x1D3, 0x75, 0x1D4, 0xDC, 0x1D9, 0xFC, 0x1DA, 0x47, 0x1E6, 0x67, 0x1E7, 0x4B, 0x1E8, 0x6B, 0x1E9, 0x1B7, 0x1EE, 0x292, 0x1EF, 0x6A, 0x1F0, 0x48, 0x21E, 0x68, 0x21F, 0 };
+	static word comb30D[] = { 0 };
+	static word comb30E[] = { 0 };
+	static word comb30F[] = { 0x41, 0x200, 0x61, 0x201, 0x45, 0x204, 0x65, 0x205, 0x49, 0x208, 0x69, 0x209, 0x4F, 0x20C, 0x6F, 0x20D, 0x52, 0x210, 0x72, 0x211, 0x55, 0x214, 0x75, 0x215, 0x474, 0x476, 0x475, 0x477, 0 };
+	static const word *comb[] = {
+		comb300, comb301, comb302, comb303, comb304, comb305, comb306, comb307,
+		comb308, comb309, comb30A, comb30B, comb30C, comb30D, comb30E, comb30F,
+	};
+	if(combine >= 0x300 && combine <= 0x30F)
+		return sComb(comb[combine - 0x300], chr);
+
+	static word comb311[] = { 0x41, 0x202, 0x61, 0x203, 0x45, 0x206, 0x65, 0x207, 0x49, 0x20A, 0x69, 0x20B, 0x4F, 0x20E, 0x6F, 0x20F, 0x52, 0x212, 0x72, 0x213, 0x55, 0x216, 0x75, 0x217, 0 };
+	static word comb31B[] = { 0x4F, 0x1A0, 0x6F, 0x1A1, 0x55, 0x1AF, 0x75, 0x1B0, 0 };
+	static word comb326[] = { 0x53, 0x218, 0x73, 0x219, 0x54, 0x21A, 0x74, 0x21B, 0 };
+	static word comb327[] = { 0x43, 0xC7, 0x63, 0xE7, 0x47, 0x122, 0x67, 0x123, 0x4B, 0x136, 0x6B, 0x137, 0x4C, 0x13B, 0x6C, 0x13C, 0x4E, 0x145, 0x6E, 0x146, 0x52, 0x156, 0x72, 0x157, 0x53, 0x15E, 0x73, 0x15F, 0x54, 0x162, 0x74, 0x163, 0x45, 0x228, 0x65, 0x229, 0 };
+	static word comb328[] = { 0x41, 0x104, 0x61, 0x105, 0x45, 0x118, 0x65, 0x119, 0x49, 0x12E, 0x69, 0x12F, 0x55, 0x172, 0x75, 0x173, 0x4F, 0x1EA, 0x6F, 0x1EB, 0 };
+	static word comb653[] = { 0x627, 0x622, 0 };
+	static word comb654[] = { 0x627, 0x623, 0x648, 0x624, 0x64A, 0x626, 0x6D5, 0x6C0, 0x6C1, 0x6C2, 0x6D2, 0x6D3, 0 };
+	static word comb655[] = { 0x627, 0x625, 0 };
+
+	switch(combine) {
+	case 0x311: return sComb(comb311, chr);
+	case 0x31B: return sComb(comb31B, chr);
+	case 0x326: return sComb(comb326, chr);
+	case 0x327: return sComb(comb327, chr);
+	case 0x328: return sComb(comb328, chr);
+	case 0x653: return sComb(comb653, chr);
+	case 0x654: return sComb(comb654, chr);
+	case 0x655: return sComb(comb655, chr);
+	}
+	return 0;
+}
+
+void ToUpper(char *t, const char *s, int len, byte charset)
+{
+	charset = ResolveCharset(charset);
+	CharSetData& cs = s_cset(charset);
+	const char *lim = s + len;
+	while(s < lim)
+		*t++ = cs.FromUnicode(UPP::ToUpper(cs.ToUnicode(*s++)));
+}
+
+void ToLower(char *t, const char *s, int len, byte charset)
+{
+	charset = ResolveCharset(charset);
+	CharSetData& cs = s_cset(charset);
+	const char *lim = s + len;
+	while(s < lim)
+		*t++ = cs.FromUnicode(UPP::ToLower(cs.ToUnicode(*s++)));
+}
+
+void ToAscii(char *t, const char *s, int len, byte charset)
+{
+	charset = ResolveCharset(charset);
+	CharSetData& cs = s_cset(charset);
+	const char *lim = s + len;
+	while(s < lim)
+		*t++ = cs.FromUnicode(UPP::ToAscii(cs.ToUnicode(*s++)));
+}
+
+void ToUpper(char *s, int len, byte charset)
+{
+	ToUpper(s, s, len, charset);
+}
+
+void ToLower(char *s, int len, byte charset)
+{
+	ToLower(s, s, len, charset);
+}
+
+void ToAscii(char *s, int len, byte charset)
+{
+	ToAscii(s, s, len, charset);
+}
+
+
+WString ToUnicode(const char *src, int l, byte charset)
+{
+	charset = ResolveCharset(charset);
+	if(charset == CHARSET_UTF8)
+		return FromUtf8(src, l);
+	WStringBuffer result(l);
+	ToUnicode(result, src, l, charset);
+	return result;
+}
+
+WString ToUnicode(const String& src, byte charset)
+{
+	return ToUnicode(src, src.GetLength(), charset);
+}
+
+String  FromUnicode(const WString& src, byte charset, int def)
+{
+	charset = ResolveCharset(charset);
+	if(charset == CHARSET_UTF8)
+		return ToUtf8(src);
+	int l = src.GetLength();
+	StringBuffer result(l);
+	FromUnicode(result, src, l, charset, def);
+	return result;
+}
+
+String ToCharset(byte charset, const String& src, byte scharset, int def)
+{
+	charset = ResolveCharset(charset);
+	scharset = ResolveCharset(scharset);
+	if(charset == scharset)
+		return src;
+	int slen = src.GetLength();
+	if(scharset == CHARSET_UTF8)
+		return FromUnicode(FromUtf8(src, slen), charset, def);
+	if(charset == CHARSET_UTF8)
+		return ToUtf8(ToUnicode(src, scharset));
+	StringBuffer result(slen);
+	ConvertCharset(result, charset, src, scharset, slen);
+	return result;
+}
+
+WString InitCaps(const wchar *s)
+{
+	WString r;
+	bool spc = true;
+	while(*s) {
+		if(spc)
+			r.Cat(ToUpper(*s));
+		else
+			r.Cat(ToLower(*s));
+		spc = IsSpace(*s);
+		s++;
+	}
+	return r;
+}
+
+WString ToUpper(const WString& w)
+{
+	int l = w.GetLength();
+	WStringBuffer r(l);
+	ToUpper(r, w, l);
+	return r;
+}
+
+WString ToLower(const WString& w)
+{
+	int l = w.GetLength();
+	WStringBuffer r(l);
+	ToLower(r, w, l);
+	return r;
+}
+
+WString ToAscii(const WString& w)
+{
+	int l = w.GetLength();
+	WStringBuffer r(l);
+	ToAscii(r, w, l);
+	return r;
+}
+
+String InitCaps(const char *s, byte charset)
+{
+	charset = ResolveCharset(charset);
+	if(charset == CHARSET_UTF8)
+		return ToUtf8(InitCaps(FromUtf8(s)));
+	StringBuffer r;
+	bool spc = true;
+	while(*s) {
+		if(spc)
+			r.Cat(ToUpper(*s, charset));
+		else
+			r.Cat(ToLower(*s, charset));
+		spc = IsSpace(*s);
+		s++;
+	}
+	return r;
+}
+
+String ToUpper(const char *s, byte charset)
+{
+	charset = ResolveCharset(charset);
+	if(charset == CHARSET_UTF8)
+		return ToUtf8(ToUpper(FromUtf8(s)));
+	int l = (int)strlen(s);
+	StringBuffer r(l);
+	ToUpper(r, s, l, charset);
+	return r;
+}
+
+String ToLower(const char *s, byte charset)
+{
+	charset = ResolveCharset(charset);
+	if(charset == CHARSET_UTF8)
+		return ToUtf8(ToLower(FromUtf8(s)));
+	int l = (int)strlen(s);
+	StringBuffer r(l);
+	ToLower(r, s, l, charset);
+	return r;
+}
+
+String ToAscii(const char *s, byte charset)
+{
+	charset = ResolveCharset(charset);
+	if(charset == CHARSET_UTF8)
+		return ToUtf8(ToAscii(FromUtf8(s)));
+	int l = (int)strlen(s);
+	StringBuffer r(l);
+	ToAscii(r, s, l, charset);
+	return r;
+}
+
+String ToUpper(const String& s, byte charset)
+{
+	charset = ResolveCharset(charset);
+	if(charset == CHARSET_UTF8)
+		return ToUtf8(ToUpper(FromUtf8(s)));
+	int l = s.GetLength();
+	StringBuffer r(l);
+	ToUpper(r, s, l, charset);
+	return r;
+}
+
+String ToLower(const String& s, byte charset)
+{
+	charset = ResolveCharset(charset);
+	if(charset == CHARSET_UTF8)
+		return ToUtf8(ToLower(FromUtf8(s)));
+	int l = s.GetLength();
+	StringBuffer r(l);
+	ToLower(r, s, l, charset);
+	return r;
+}
+
+String ToAscii(const String& s, byte charset)
+{
+	charset = ResolveCharset(charset);
+	if(charset == CHARSET_UTF8)
+		return ToUtf8(ToAscii(FromUtf8(s)));
+	int l = s.GetLength();
+	StringBuffer r(l);
+	ToAscii(r, s, l, charset);
+	return r;
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/Core/CharSet.h b/uppsrc/Core/CharSet.h
new file mode 100644
index 000000000..8d92b6944
--- /dev/null
+++ b/uppsrc/Core/CharSet.h
@@ -0,0 +1,206 @@
+#define  CHARSET_DEFAULT      0
+
+#define  CHARSET_ISO8859_1    1
+#define  CHARSET_ISO8859_2    2
+#define  CHARSET_ISO8859_3    3
+#define  CHARSET_ISO8859_4    4
+#define  CHARSET_ISO8859_5    5
+#define  CHARSET_ISO8859_6    6
+#define  CHARSET_ISO8859_7    7
+#define  CHARSET_ISO8859_8    8
+#define  CHARSET_ISO8859_9    9
+#define  CHARSET_ISO8859_10   10
+#define  CHARSET_ISO8859_13   11
+#define  CHARSET_ISO8859_14   12
+#define  CHARSET_ISO8859_15   13
+#define  CHARSET_ISO8859_16   14
+#define  CHARSET_WIN1250      15
+#define  CHARSET_WIN1251      16
+#define  CHARSET_WIN1252      17
+#define  CHARSET_WIN1253      18
+#define  CHARSET_WIN1254      19
+#define  CHARSET_WIN1255      20
+#define  CHARSET_WIN1256      21
+#define  CHARSET_WIN1257      22
+#define  CHARSET_WIN1258      23
+#define  CHARSET_KOI8_R       24
+#define  CHARSET_CP852        25
+#define  CHARSET_MJK          26
+#define  CHARSET_CP850        27
+
+#define  CHARSET_TOASCII      253
+#define  CHARSET_UTF8         255
+#define  CHARSET_UNICODE      255
+
+enum {
+	DEFAULTCHAR = 0x1f
+};
+
+#ifndef flagSO
+
+extern word CHRTAB_ISO8859_1[128];
+extern word CHRTAB_ISO8859_2[128];
+extern word CHRTAB_ISO8859_3[128];
+extern word CHRTAB_ISO8859_4[128];
+extern word CHRTAB_ISO8859_5[128];
+extern word CHRTAB_ISO8859_6[128];
+extern word CHRTAB_ISO8859_7[128];
+extern word CHRTAB_ISO8859_8[128];
+extern word CHRTAB_ISO8859_9[128];
+extern word CHRTAB_ISO8859_10[128];
+extern word CHRTAB_ISO8859_13[128];
+extern word CHRTAB_ISO8859_14[128];
+extern word CHRTAB_ISO8859_15[128];
+extern word CHRTAB_ISO8859_16[128];
+extern word CHRTAB_WIN1250[128];
+extern word CHRTAB_WIN1251[128];
+extern word CHRTAB_WIN1252[128];
+extern word CHRTAB_WIN1253[128];
+extern word CHRTAB_WIN1254[128];
+extern word CHRTAB_WIN1255[128];
+extern word CHRTAB_WIN1256[128];
+extern word CHRTAB_WIN1257[128];
+extern word CHRTAB_WIN1258[128];
+extern word CHRTAB_KOI8_R[128];
+extern word CHRTAB_CP852[128];
+extern word CHRTAB_MJK[128];
+
+#endif
+
+void  SetDefaultCharset(byte charset);
+byte  GetDefaultCharset();
+
+byte  ResolveCharset(byte charset);
+
+byte  AddCharSet(const char *name, const word *table, byte systemcharset = CHARSET_DEFAULT);
+byte  AddCharSetE(const char *name, word *table, byte systemcharset = CHARSET_DEFAULT);
+
+const char *CharsetName(byte charset);
+int CharsetCount();
+int CharsetByName(const char *name);
+
+byte SystemCharset(byte charset);
+
+int  ToUnicode(int chr, byte charset);
+int  FromUnicode(wchar wchr, byte charset, int defchar = DEFAULTCHAR);
+
+void ToUnicode(wchar *ws, const char *s, int n, byte charset);
+void FromUnicode(char *s, const wchar *ws, int n, byte charset, int defchar = DEFAULTCHAR);
+
+void ConvertCharset(char *t, byte tcharset, const char *s, byte scharset, int n);
+
+inline bool IsUtf8Lead(int c)
+{
+	return (c & 0xc0) != 0x80;
+}
+
+String  ToUtf8(wchar code);
+String  ToUtf8(const wchar *s, int len);
+String  ToUtf8(const wchar *s);
+String  ToUtf8(const WString& w);
+
+WString FromUtf8(const char *_s, int len);
+WString FromUtf8(const char *_s);
+WString FromUtf8(const String& s);
+
+bool utf8check(const char *_s, int len);
+
+int utf8len(const char *s, int len);
+int utf8len(const char *s);
+int lenAsUtf8(const wchar *s, int len);
+int lenAsUtf8(const wchar *s);
+
+bool    CheckUtf8(const String& src);
+
+WString ToUnicode(const String& src, byte charset);
+WString ToUnicode(const char *src, int n, byte charset);
+String  FromUnicode(const WString& src, byte charset = CHARSET_DEFAULT, int defchar = DEFAULTCHAR);
+
+String  ToCharset(byte charset, const String& s, byte scharset = CHARSET_DEFAULT, int defchar = DEFAULTCHAR);
+
+#ifndef flagSO
+extern dword uni__info[2048];
+
+inline bool IsLetter(int c)        { return (dword)c < 2048 ? uni__info[c] & 0xc0000000 : 0; }
+inline bool IsUpper(int c)         { return (dword)c < 2048 ? uni__info[c] & 0x40000000 : 0; }
+inline bool IsLower(int c)         { return (dword)c < 2048 ? uni__info[c] & 0x80000000 : 0; }
+inline int  ToUpper(int c)         { return (dword)c < 2048 ? (uni__info[c] >> 11) & 2047 : c; }
+inline int  ToLower(int c)         { return (dword)c < 2048 ? uni__info[c] & 2047 : c; }
+inline int  ToAscii(int c)         { return (dword)c < 2048 ? (uni__info[c] >> 22) & 0x7f : 0; }
+#else
+bool        IsLetter(int c);
+bool        IsUpper(int c);
+bool        IsLower(int c);
+int         ToUpper(int c);
+int         ToLower(int c);
+int         ToAscii(int c);
+#endif
+
+inline bool IsLetter(char c)       { return IsLetter((byte) c); }//?????
+inline bool IsUpper(char c)        { return IsUpper((byte) c); }
+inline bool IsLower(char c)        { return IsLower((byte) c); }
+inline int  ToUpper(char c)        { return ToUpper((byte) c); }
+inline int  ToLower(char c)        { return ToLower((byte) c); }
+inline int  ToAscii(char c)        { return ToAscii((byte) c); }
+
+inline bool IsLetter(signed char c) { return IsLetter((byte) c); }
+inline bool IsUpper(signed char c)  { return IsUpper((byte) c); }
+inline bool IsLower(signed char c)  { return IsLower((byte) c); }
+inline int  ToUpper(signed char c)  { return ToUpper((byte) c); }
+inline int  ToLower(signed char c)  { return ToLower((byte) c); }
+inline int  ToAscii(signed char c)  { return ToAscii((byte) c); }
+
+inline bool IsLetter(wchar c)      { return IsLetter((int) c); }
+inline bool IsUpper(wchar c)       { return IsUpper((int) c); }
+inline bool IsLower(wchar c)       { return IsLower((int) c); }
+inline int  ToUpper(wchar c)       { return ToUpper((int) c); }
+inline int  ToLower(wchar c)       { return ToLower((int) c); }
+inline int  ToAscii(wchar c)       { return ToAscii((int) c); }
+
+inline bool IsDigit(int c)         { return c >= '0' && c <= '9'; }
+inline bool IsAlpha(int c)         { return c >= 'A' && c <= 'Z' || c >= 'a' && c <= 'z'; }
+inline bool IsAlNum(int c)         { return IsDigit(c) || IsAlpha(c); }
+inline bool IsLeNum(int c)         { return IsDigit(c) || IsLetter(c); }
+inline bool IsPunct(int c)         { return c != ' ' && !IsAlNum(c); }
+inline bool IsSpace(int c)         { return c == ' ' || c == '\f' || c == '\n' || c == '\r' || c == '\v' || c == '\t'; }
+inline bool IsXDigit(int c)        { return IsDigit(c) || c >= 'A' && c <= 'F' || c >= 'a' && c <= 'f'; }
+
+inline bool IsCJKIdeograph(int c)  { return c >= 0x2e80 && c <= 0xdfaf || c >= 0xf900 && c <= 0xfaff; }
+
+word UnicodeCombine(word chr, word combine);
+
+void ToUpper(wchar *t, const char *s, int len);
+void ToLower(wchar *t, const char *s, int len);
+void ToAscii(wchar *t, const char *s, int len);
+
+void ToUpper(wchar *s, int len);
+void ToLower(wchar *s, int len);
+void ToAscii(wchar *s, int len);
+
+bool IsLetter(int c, byte charset);
+bool IsUpper(int c, byte charset);
+bool IsLower(int c, byte charset);
+int  ToUpper(int c, byte charset);
+int  ToLower(int c, byte charset);
+int  ToAscii(int c, byte charset);
+
+void ToUpper(char *t, const char *s, int len, byte charset = CHARSET_DEFAULT);
+void ToLower(char *t, const char *s, int len, byte charset = CHARSET_DEFAULT);
+void ToAscii(char *t, const char *s, int len, byte charset = CHARSET_DEFAULT);
+
+void ToUpper(char *s, int len, byte charset = CHARSET_DEFAULT);
+void ToLower(char *s, int len, byte charset = CHARSET_DEFAULT);
+void ToAscii(char *s, int len, byte charset = CHARSET_DEFAULT);
+
+WString InitCaps(const wchar *s);
+WString ToUpper(const WString& w);
+WString ToLower(const WString& w);
+WString ToAscii(const WString& w);
+
+String  InitCaps(const char *s, byte charset = CHARSET_DEFAULT);
+String  ToUpper(const String& s, byte charset = CHARSET_DEFAULT);
+String  ToLower(const String& s, byte charset = CHARSET_DEFAULT);
+String  ToAscii(const String& s, byte charset = CHARSET_DEFAULT);
+String  ToUpper(const char *s, byte charset = CHARSET_DEFAULT);
+String  ToLower(const char *s, byte charset = CHARSET_DEFAULT);
+String  ToAscii(const char *s, byte charset = CHARSET_DEFAULT);
diff --git a/uppsrc/Core/CoWork.cpp b/uppsrc/Core/CoWork.cpp
new file mode 100644
index 000000000..24a74f6dc
--- /dev/null
+++ b/uppsrc/Core/CoWork.cpp
@@ -0,0 +1,143 @@
+#include "Core.h"
+
+NAMESPACE_UPP
+
+#ifdef _MULTITHREADED
+
+#define LLOG(x)   //  LOG(x)
+#define LDUMP(x)  //  DUMP(x)
+
+CoWork::Pool& CoWork::pool()
+{
+	static Pool pool;
+	return pool;
+}
+
+CoWork::Pool::Pool()
+{
+	LLOG("CoWork INIT");
+	for(int i = 0; i < CPU_Cores() + 2; i++)
+		threads.Add().Run(callback1(&ThreadRun, i));
+}
+
+CoWork::Pool::~Pool()
+{
+	LLOG("Quit");
+	MJob job;
+	job.work = NULL;
+	lock.Enter();
+	jobs.Clear();
+	jobs.Add(job);
+	lock.Leave();
+	for(int i = 0; i < threads.GetCount(); i++)
+		waitforjob.Release();
+	for(int i = 0; i < threads.GetCount(); i++)
+		threads[i].Wait();
+	LLOG("Quit ended");
+}
+
+bool CoWork::Pool::DoJob()
+{
+	Pool& p = pool();
+	if(p.jobs.Top().work == NULL) {
+		LLOG("Quit thread");
+		return true;
+	}
+	MJob job = p.jobs.Pop();
+	p.lock.Leave();
+	job.cb();
+	p.lock.Enter();
+	if(--job.work->todo == 0) {
+		LLOG("Releasing waitforfinish of (CoWork " << FormatIntHex(job.work) << ")");
+		job.work->waitforfinish.Release();
+	}
+	LLOG("Finished, remaining todo " << job.work->todo << " (CoWork " << FormatIntHex(job.work) << ")");
+	return false;
+}
+
+void CoWork::Pool::ThreadRun(int tno)
+{
+	LLOG("CoWork thread #" << tno << " started");
+	Pool& p = pool();
+	p.lock.Enter();
+	for(;;) {
+		while(p.jobs.GetCount() == 0) {
+			p.waiting_threads++;
+			p.lock.Leave();
+			LLOG("#" << tno << " Waiting for job");
+			p.waitforjob.Wait();
+			LLOG("#" << tno << " Waiting ended");
+			p.lock.Enter();
+		}
+		LLOG("#" << tno << " Job acquired");
+		if(DoJob())
+			break;
+		LLOG("#" << tno << " Job finished");
+	}
+	p.lock.Leave();
+	LLOG("CoWork thread #" << tno << " finished");
+}
+
+void CoWork::Do(Callback cb) {
+#ifdef _MULTITHREADED
+	Pool& p = pool();
+	p.lock.Enter();
+	if(p.jobs.GetCount() > 128) {
+		LLOG("Stack full: running in the main thread");
+		p.lock.Leave();
+		cb();
+		return;
+	}
+	MJob job;
+	job.cb = cb;
+	job.work = this;
+	p.jobs.Add(job);
+	todo++;
+	LLOG("Adding job; todo: " << todo << " (CoWork " << FormatIntHex(this) << ")");
+	if(p.waiting_threads) {
+		LLOG("Releasing thread waiting for job: " << p.waiting_threads);
+		p.waiting_threads--;
+		p.waitforjob.Release();
+	}
+	p.lock.Leave();
+#else
+	cb();
+#endif
+}
+
+void CoWork::Finish() {
+#ifdef _MULTITHREADED
+	Pool &p = pool();
+	p.lock.Enter();
+	while(todo) {
+		LLOG("Finish: todo: " << todo << " (CoWork " << FormatIntHex(this) << ")");
+		if(todo == 0)
+			break;
+		if(p.jobs.GetCount())
+			Pool::DoJob();
+		else {
+			p.lock.Leave();
+			LLOG("WaitForFinish (CoWork " << FormatIntHex(this) << ")");
+			waitforfinish.Wait();
+			p.lock.Enter();
+		}
+	}
+	p.lock.Leave();
+	LLOG("CoWork finished");
+#endif
+}
+
+CoWork::CoWork()
+{
+	LLOG("CoWork constructed " << FormatHex(this));
+	todo = 0;
+}
+
+CoWork::~CoWork()
+{
+	Finish();
+}
+
+#endif
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/Core/CoWork.h b/uppsrc/Core/CoWork.h
new file mode 100644
index 000000000..28a53cc82
--- /dev/null
+++ b/uppsrc/Core/CoWork.h
@@ -0,0 +1,54 @@
+#ifdef _MULTITHREADED
+
+class CoWork : NoCopy {
+	typedef StaticCriticalSection Lock;
+
+	struct MJob : Moveable<MJob> {
+		Callback cb;
+		CoWork  *work;
+	};
+
+	struct Pool {
+		Vector<MJob>    jobs;
+		int             waiting_threads;
+		Array<Thread>   threads;
+
+		CriticalSection lock;
+		Semaphore       waitforjob;
+
+		Pool();
+		~Pool();
+
+		static bool DoJob();
+		static void ThreadRun(int tno);
+	};
+	
+	friend struct Pool;
+
+	static Pool& pool();
+
+	Semaphore waitforfinish;
+	int       todo;
+
+public:
+	void     Do(Callback cb);
+	CoWork&  operator&(Callback cb) { Do(cb); return *this; }
+
+	void Finish();
+
+	CoWork();
+	~CoWork();
+
+	static void Quit();
+};
+
+#else
+
+class CoWork : NoCopy {
+public:
+	void     Do(Callback cb)        { cb(); }
+	CoWork&  operator&(Callback cb) { cb(); return *this; }
+	void Finish()                   {}
+};
+
+#endif
diff --git a/uppsrc/Core/Color.cpp b/uppsrc/Core/Color.cpp
new file mode 100644
index 000000000..89f470b7b
--- /dev/null
+++ b/uppsrc/Core/Color.cpp
@@ -0,0 +1,132 @@
+#include "Core.h"
+
+NAMESPACE_UPP
+
+void RGBtoHSV(double r, double g, double b, double& h, double& s, double& v)
+{
+	double delta;
+	if((v = max(r, max(g, b))) == 0 || (delta = v - min(r, min(g, b))) == 0)
+	{
+		h = s = 0;
+		return;
+	}
+	s = delta / v;
+	delta *= 6;
+	if(g == v)
+		h = 1 / 3.0 + (b - r) / delta;
+	else if(b == v)
+		h = 2 / 3.0 + (r - g) / delta;
+	else
+		if((h = (g - b) / delta) < 0)
+			h += 1;
+}
+
+void HSVtoRGB(double h, double s, double v, double& r, double& g, double& b)
+{
+	if(s == 0)
+	{
+		r = g = b = v;
+		return;
+	}
+	double rem = fmod(h *= 6, 1);
+	double p = v * (1 - s);
+	double q = v * (1 - s * rem);
+	double t = v * (1 - s * (1 - rem));
+	switch(ffloor(h))
+	{
+	default: NEVER(); // invalid color!
+	case 6:
+	case 0: r = v; g = t; b = p; break;
+	case 1: r = q; g = v; b = p; break;
+	case 2: r = p; g = v; b = t; break;
+	case 3: r = p; g = q; b = v; break;
+	case 4: r = t; g = p; b = v; break;
+	case -1:
+	case 5: r = v; g = p; b = q; break;
+	}
+}
+
+Color HsvColorf(double h, double s, double v)
+{
+	double r, g, b;
+	HSVtoRGB(h, s, v, r, g, b);
+	return Color(min(int(r * 255), 255), min(int(g * 255), 255), min(int(b * 255), 255));
+}
+
+dword Color::Get() const
+{
+	if(IsNullInstance()) return 0;
+	dword c = color;
+	return c & 0xffffff;
+}
+
+Color::operator RGBA() const
+{
+	RGBA color;
+	if(IsNullInstance())
+		Zero(color);
+	else {
+		color.r = GetR();
+		color.g = GetG();
+		color.b = GetB();
+		color.a = 255;
+	}
+	return color;
+}
+
+Color::Color(RGBA rgba)
+{
+	if(rgba.a == 0)
+		color = 0xffffffff;
+	else {
+		if(rgba.a == 255)
+			color = RGB(rgba.r, rgba.g, rgba.b);
+		else {
+			int alpha = 65536 / rgba.a;
+			color = RGB((alpha * rgba.r) >> 8, (alpha * rgba.g) >> 8, (alpha * rgba.b) >> 8);
+		}
+	}
+}
+
+RGBA operator*(int alpha, Color c)
+{
+	RGBA r;
+	r.a = alpha;
+	alpha += (alpha >> 7);
+	r.r = (alpha * c.GetR()) >> 8;
+	r.g = (alpha * c.GetG()) >> 8;
+	r.b = (alpha * c.GetB()) >> 8;
+	return r;
+}
+
+template<>
+String AsString(const Color& c) {
+	if(IsNull(c))
+		return "Color(Null)";
+	return Format("Color(%d, %d, %d)", c.GetR(), c.GetG(), c.GetB());
+}
+
+String ColorToHtml(Color color)
+{
+	return Format("#%02X%02X%02X",  color.GetR(), color.GetG(), color.GetB());
+}
+
+Color Blend(Color c1, Color c2, int alpha)
+{
+	int a = (alpha >> 7) + alpha;
+	return Color(min(((a * (c2.GetR() - c1.GetR())) >> 8) + c1.GetR(), 255),
+	             min(((a * (c2.GetG() - c1.GetG())) >> 8) + c1.GetG(), 255),
+	             min(((a * (c2.GetB() - c1.GetB())) >> 8) + c1.GetB(), 255));
+}
+
+
+INITBLOCK {
+	RichValue<Color>::Register();
+}
+
+int  Grayscale(const Color& c)
+{
+	return (77 * c.GetR() + 151 * c.GetG() + 28 * c.GetB()) >> 8;
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/Core/Color.h b/uppsrc/Core/Color.h
new file mode 100644
index 000000000..48681cbe9
--- /dev/null
+++ b/uppsrc/Core/Color.h
@@ -0,0 +1,132 @@
+#ifdef PLATFORM_WIN32
+struct RGBA : Moveable<RGBA> {
+        byte b, g, r, a;
+};
+#endif
+
+#ifdef PLATFORM_POSIX
+#ifdef CPU_BE
+struct RGBA : Moveable<RGBA> {
+        byte a, r, g, b;
+};
+#else
+struct RGBA : Moveable<RGBA> {
+        byte b, g, r, a;
+};
+#endif
+#endif
+
+#ifndef PLATFORM_WIN32
+inline int        GetRValue(dword c)             { return (byte)(c >> 0); }
+inline int        GetGValue(dword c)             { return (byte)(c >> 8); }
+inline int        GetBValue(dword c)             { return (byte)(c >> 16); }
+inline dword      RGB(byte r, byte g, byte b)    { return r | (g << 8) | (b << 16); }
+#endif
+
+const int COLOR_V = 39;
+
+class Color : AssignValueTypeNo<Color, COLOR_V, Moveable<Color> > {
+protected:
+	dword    color;
+
+	dword Get() const;
+
+public:
+	dword    GetRaw() const            { return color; }
+
+	int      GetR() const              { return GetRValue(Get()); }
+	int      GetG() const              { return GetGValue(Get()); }
+	int      GetB() const              { return GetBValue(Get()); }
+
+	bool     IsNullInstance() const    { return color == 0xffffffff; }
+	unsigned GetHashValue() const      { return color; }
+	bool     operator==(Color c) const { return color == c.color; }
+	bool     operator!=(Color c) const { return color != c.color; }
+
+	void     Serialize(Stream& s)      { s % color; }
+
+	Color()                            { color = 0xffffffff; }
+	Color(int r, int g, int b)         { color = RGB(r, g, b); }
+	Color(int n, int)                  { color = 0x80000000 | n; }
+
+	Color(const Nuller&)               { color = 0xffffffff; }
+
+	operator Value() const             { return RichValue<Color>(*this); }
+	Color(const Value& q)              { color = RichValue<Color>::Extract(q).color; }
+
+	operator RGBA() const;
+	Color(RGBA rgba);
+
+	Color(Color (*fn)())               { color = (*fn)().color; }
+
+	static Color FromRaw(dword co)     { Color c; c.color = co; return c; }
+
+#ifdef PLATFORM_WIN32
+	operator COLORREF() const          { return (COLORREF) Get(); }
+	static  Color FromCR(COLORREF cr)  { Color c; c.color = (dword)cr; return c; }
+#else
+	operator dword() const             { return Get(); }
+#endif
+};
+
+RGBA operator*(int alpha, Color c);
+
+inline Color StraightColor(RGBA rgba)  { return Color(rgba.r, rgba.g, rgba.b); }
+
+typedef Color (*ColorF)();
+
+inline unsigned GetHashValue(Color c)  { return c.GetHashValue(); }
+inline Color    Nvl(Color a, Color b)  { return IsNull(a) ? b : a; }
+
+template<>
+String AsString(const Color& c);
+
+
+inline Color GrayColor(int a = 128)    { return Color(a, a, a); }
+
+inline Color Black()     { return Color(0, 0, 0); }
+inline Color Gray()      { return Color(128, 128, 128); }
+inline Color LtGray()    { return Color(192, 192, 192); }
+inline Color WhiteGray() { return Color(224, 224, 224); }
+inline Color White()     { return Color(255, 255, 255); }
+
+inline Color Red()       { return Color(128, 0, 0); }
+inline Color Green()     { return Color(0, 128, 0); }
+inline Color Brown()     { return Color(128, 128, 0); }
+inline Color Blue()      { return Color(0, 0, 128); }
+inline Color Magenta()   { return Color(128, 0, 255); }
+inline Color Cyan()      { return Color(0, 128, 128); }
+inline Color Yellow()    { return Color(255, 255, 0); }
+inline Color LtRed()     { return Color(255, 0, 0); }
+inline Color LtGreen()   { return Color(0, 255, 0); }
+inline Color LtYellow()  { return Color(255, 255, 192); }
+inline Color LtBlue()    { return Color(0, 0, 255); }
+inline Color LtMagenta() { return Color(255, 0, 255); }
+inline Color LtCyan()    { return Color(0, 255, 255); }
+
+void   RGBtoHSV(double r, double g, double b, double& h, double& s, double& v);
+void   HSVtoRGB(double h, double s, double v, double& r, double& g, double& b);
+
+Color  HsvColorf(double h, double s, double v);
+
+Color  Blend(Color c1, Color c2, int alpha = 128);
+
+String ColorToHtml(Color color);
+
+int  Grayscale(const Color& c);
+
+
+inline bool operator==(const Value& v, Color x)        { return v == x.operator Value(); }
+inline bool operator==(Color x, const Value& v)        { return v == x.operator Value(); }
+inline bool operator!=(const Value& v, Color x)        { return v != x.operator Value(); }
+inline bool operator!=(Color x, const Value& v)        { return v != x.operator Value(); }
+
+inline bool operator==(const Value& v, Color (*x)())   { return v == (*x)(); }
+inline bool operator==(Color (*x)(), const Value& v)   { return v == (*x)(); }
+inline bool operator!=(const Value& v, Color (*x)())   { return v != (*x)(); }
+inline bool operator!=(Color (*x)(), const Value& v)   { return v != (*x)(); }
+
+inline bool operator==(Color c, Color (*x)())          { return c == (*x)(); }
+inline bool operator==(Color (*x)(), Color c)          { return c == (*x)(); }
+inline bool operator!=(Color c, Color (*x)())          { return c != (*x)(); }
+inline bool operator!=(Color (*x)(), Color c)          { return c != (*x)(); }
diff --git a/uppsrc/Core/Convert.cpp b/uppsrc/Core/Convert.cpp
new file mode 100644
index 000000000..41cabc404
--- /dev/null
+++ b/uppsrc/Core/Convert.cpp
@@ -0,0 +1,528 @@
+#include "Core.h"
+
+NAMESPACE_UPP
+
+unsigned stou(const char *s, void *endptr, unsigned base)
+{
+	ASSERT(base >= 2 && base <= 36);
+	unsigned digit = ctoi(*s);
+	if(digit >= base)
+	{ // error
+		if(endptr)
+			*(const char **)endptr = s;
+		return ~0;
+	}
+	unsigned value = digit;
+	while((digit = ctoi(*++s)) < base)
+		value = value * base + digit;
+	if(endptr)
+		*(const char **)endptr = s;
+	return value;
+}
+
+unsigned stou(const wchar *s, void *endptr, unsigned base)
+{
+	ASSERT(base >= 2 && base <= 36);
+	unsigned digit = ctoi(*s);
+	if(digit >= base)
+	{ // error
+		if(endptr)
+			*(const wchar **)endptr = s;
+		return ~0;
+	}
+	unsigned value = digit;
+	while((digit = ctoi(*++s)) < base)
+		value = value * base + digit;
+	if(endptr)
+		*(const wchar **)endptr = s;
+	return value;
+}
+
+
+uint64 stou64(const char *s, void *endptr, unsigned base)
+{
+	ASSERT(base >= 2 && base <= 36);
+	unsigned digit = ctoi(*s);
+	if(digit >= base)
+	{ // error
+		if(endptr)
+			*(const char **)endptr = s;
+		return ~0;
+	}
+	uint64 value = digit;
+	while((digit = ctoi(*++s)) < base)
+		value = value * base + digit;
+	if(endptr)
+		*(const char **)endptr = s;
+	return value;
+}
+
+int ScanInt(const char *ptr, const char **endptr, int base)
+{
+	const char *s = ptr;
+	bool minus = false;
+	while(*s && (byte)*s <= ' ')
+		s++;
+	if(*s == '+' || *s == '-')
+		minus = (*s++ == '-');
+	unsigned u = stou(s, endptr, base);
+	if(~u)
+		return (minus ? -(int)u : (int)u);
+	else
+		return Null;
+}
+
+int ScanInt(const wchar *ptr, const wchar **endptr, int base)
+{
+	const wchar *s = ptr;
+	bool minus = false;
+	while(*s && *s <= ' ')
+		s++;
+	if(*s == '+' || *s == '-')
+		minus = (*s++ == '-');
+	unsigned u = stou(s, endptr, base);
+	if(~u)
+		return (minus ? -(int)u : (int)u);
+	else
+		return Null;
+}
+
+int64 ScanInt64(const char *ptr, const char **endptr, int base)
+{
+	const char *s = ptr;
+	bool minus = false;
+	while(*s && *s <= ' ')
+		s++;
+	if(*s == '+' || *s == '-')
+		minus = (*s++ == '-');
+	uint64 u = stou64(s, endptr, base);
+	if(~u)
+		return (minus ? -(int64)u : (int64)u);
+	else
+		return Null;
+}
+
+double ScanDouble(const char *p, const char **endptr, bool accept_comma)
+{
+	const char *begin = p;
+	while(*p && (byte)*p <= ' ')
+		p++;
+	bool neg = false;
+	if(*p == '+' || *p == '-')
+		neg = (*p++ == '-');
+	if((byte)(*p - '0') >= 10 && !((*p == '.' || accept_comma && *p == ',') && (byte)(p[1] - '0') < 10)) {
+		if(endptr) *endptr = begin;
+		return Null;
+	}
+	double mantissa = 0;
+	char c;
+	int exp = 0;
+	while((byte)(*p - '0') < 10)
+		if((c = *p++) != '0') {
+			if(exp) { mantissa *= ipow10(exp); exp = 0; }
+			mantissa = 10 * mantissa + c - '0';
+		}
+		else
+			exp++;
+	int raise = exp;
+	if(*p == '.' || accept_comma && *p == ',') // decimal part
+		while((byte)((c = *++p) - '0') < 10)
+			if(c != '0') {
+				if(raise) { mantissa *= ipow10(raise); exp -= raise; raise = 0; }
+				exp--;
+				mantissa = 10 * mantissa + c - '0';
+			}
+			else
+				raise++;
+	if(*p == 'E' || *p == 'e') { // exponent
+		int vexp = ScanInt(p + 1, endptr);
+		if(!IsNull(vexp))
+			exp += vexp;
+	}
+	else
+		if(endptr) *endptr = p;
+	if(exp) {
+		double e = ipow10(tabs(exp));
+		mantissa = (exp > 0 ? mantissa * e : mantissa / e);
+	}
+	return neg ? -mantissa : mantissa;
+}
+
+double ScanDouble(const wchar *p, const wchar **endptr, bool accept_comma)
+{
+	const wchar *begin = p;
+	while(*p && *p <= ' ')
+		p++;
+	bool neg = false;
+	if(*p == '+' || *p == '-')
+		neg = (*p++ == '-');
+	if((unsigned)(*p - '0') >= 10) {
+		if(endptr) *endptr = begin;
+		return Null;
+	}
+	double mantissa = 0;
+	wchar c;
+	int exp = 0;
+	while((unsigned)(*p - '0') < 10)
+		if((c = *p++) != '0') {
+			if(exp) { mantissa *= ipow10(exp); exp = 0; }
+			mantissa = 10 * mantissa + c - '0';
+		}
+		else
+			exp++;
+	int raise = exp;
+	if(*p == '.' || accept_comma && *p == ',') // decimal part
+		while((unsigned)((c = *++p) - '0') < 10)
+			if(c != '0') {
+				if(raise) { mantissa *= ipow10(raise); exp -= raise; raise = 0; }
+				exp--;
+				mantissa = 10 * mantissa + c - '0';
+			}
+			else
+				raise++;
+	if(*p == 'E' || *p == 'e') { // exponent
+		int vexp = ScanInt(p + 1, endptr);
+		if(!IsNull(vexp))
+			exp += vexp;
+	}
+	else
+		if(endptr) *endptr = p;
+	if(exp) {
+		double e = ipow10(tabs(exp));
+		mantissa = (exp > 0 ? mantissa * e : mantissa / e);
+	}
+	return neg ? -mantissa : mantissa;
+}
+
+Value StrIntValue(const char *s)
+{
+	if(s && *s) {
+		int64 q = ScanInt64(s);
+		return IsNull(q) ? ErrorValue(t_("Invalid number !")) : Value(q);
+	}
+	return Null;
+}
+
+Value StrDblValue(const char *s)
+{
+	if(s && *s) {
+		double q = ScanDouble(s);
+		return IsNull(q) ? ErrorValue(t_("Invalid number !")) : Value(q);
+	}
+	return Null;
+}
+
+Value Scan(dword qtype, const String& text) {
+	Date date;
+	const char *s;
+	switch(qtype) {
+	case INT64_V:
+	case INT_V:
+	case BOOL_V:
+		return StrIntValue(text);
+	case DATE_V:
+		if(text.IsEmpty()) return (Date) Null;
+		s = StrToDate(date, text);
+		if(s)
+			for(;;) {
+				if(IsDigit(*s))
+					break;
+				if(*s == '\0')
+					return date;
+				s++;
+			}
+		return ErrorValue(t_("Invalid date !"));
+	case TIME_V: {
+		if(text.IsEmpty()) return (Time) Null;
+		s = StrToDate(date, text);
+		if(s)
+			try {
+				CParser p(s);
+				Time tm = ToTime(date);
+				if(p.IsEof())
+					return tm;
+				int q = p.ReadInt();
+				if(q < 0 || q > 23)
+					throw CParser::Error("");
+				tm.hour = q;
+				if(p.IsEof())
+					return tm;
+				p.PassChar(':');
+				q = p.ReadInt();
+				if(q < 0 || q > 59)
+					throw CParser::Error("");
+				tm.minute = q;
+				if(p.IsEof())
+					return tm;
+				p.PassChar(':');
+				q = p.ReadInt();
+				if(q < 0 || q > 59)
+					throw CParser::Error("");
+				tm.second = q;
+				if(p.IsEof())
+					return tm;
+			}
+			catch(CParser::Error) {}
+		return ErrorValue(t_("Invalid time !"));
+	}
+	case STRING_V:
+	case WSTRING_V:
+		return text;
+	case DOUBLE_V:
+		return StrDblValue(text);
+	default:
+		ASSERT(0);
+		break;
+	}
+	return Null;
+}
+
+#ifdef flagSO
+Convert::Convert() {}
+Convert::~Convert() {}
+#endif
+
+Value  Convert::Format(const Value& q) const {
+	if(IsVoid(q) || q.IsNull()) return String();
+	switch(q.GetType()) {
+	case INT64_V:
+		return IntStr64((int64)q);
+	case INT_V:
+	case BOOL_V:
+		return IntStr((int)q);
+	case DOUBLE_V:
+		return DblStr((double)q);
+	case DATE_V:
+		return UPP::Format(Date(q));
+	case TIME_V:
+		return UPP::Format(Time(q));
+	case STRING_V:
+	case WSTRING_V:
+		return q;
+	}
+	return q.ToString();
+}
+
+Value  Convert::Scan(const Value& text) const {
+	return text;
+};
+
+int    Convert::Filter(int chr) const {
+	return chr;
+}
+
+GLOBAL_VAR_INIT(const Convert, StdConvert);
+
+String StdFormat(const Value& q) {
+	return StdConvert().Format(q);
+}
+
+Value NotNullError() {
+	return ErrorValue(t_("Null value not allowed."));
+}
+
+#ifdef flagSO
+ConvertInt::ConvertInt(int minval, int maxval, bool notnull)
+: minval(minval), maxval(maxval), notnull(notnull) {}
+ConvertInt::~ConvertInt() {}
+
+ConvertInt64::ConvertInt64(int64 minval, int64 maxval, bool notnull) {
+	MinMax(minval, maxval); NotNull(notnull);
+}
+ConvertInt64::~ConvertInt64() {}
+#endif
+
+Value ConvertInt::Scan(const Value& text) const {
+	Value v = UPP::Scan(INT_V, text);
+	if(IsError(v)) return v;
+	if(IsNull(v)) return notnull ? NotNullError() : v;
+	int64 m = v;
+	if(m >= minval && m <= maxval) return v;
+	return ErrorValue(UPP::Format(t_("Number must be between %d and %d."), minval, maxval));
+}
+
+int   ConvertInt::Filter(int chr) const {
+	return minval >= 0 ? CharFilterDigit(chr) : CharFilterInt(chr);
+}
+
+Value ConvertDouble::Format(const Value& q) const
+{
+	if(IsNull(q))
+		return Null;
+	return UPP::NFormat(pattern, (double)q);
+}
+
+Value ConvertDouble::Scan(const Value& text) const {
+	Value v = UPP::Scan(DOUBLE_V, text);
+	if(IsError(v)) return v;
+	if(IsNull(v)) return notnull ? NotNullError() : v;
+	double m = v;
+	if(m >= minval && m <= maxval) return v;
+	return ErrorValue(UPP::Format(t_("Number must be between %g and %g."), minval, maxval));
+}
+
+int   ConvertDouble::Filter(int chr) const {
+	return CharFilterDouble(chr);
+}
+
+ConvertDouble::ConvertDouble(double minval, double maxval, bool notnull)
+  : minval(minval), maxval(maxval), notnull(notnull)
+{
+	pattern = "%.10g";
+}
+
+#ifdef flagSO
+ConvertDouble::~ConvertDouble() {}
+#endif
+
+ConvertDate::ConvertDate(Date minval, Date maxval, bool notnull)
+: minval(minval), maxval(maxval), notnull(notnull) {}
+
+ConvertDate::~ConvertDate()
+{
+}
+
+Value ConvertDate::Scan(const Value& text) const {
+	Value v = UPP::Scan(DATE_V, text);
+	if(IsError(v)) return v;
+	if(IsNull(v)) return notnull ? NotNullError() : v;
+	Date m = v;
+	if(m >= minval && m <= maxval) return v;
+	return ErrorValue(t_("Date must be between ") + UPP::Format(minval) + t_("range\v and ") + UPP::Format(maxval) + ".");
+}
+
+int   ConvertDate::Filter(int chr) const {
+	return CharFilterDate(chr);
+}
+
+ConvertTime::ConvertTime(Time minval, Time maxval, bool notnull)
+: minval(minval), maxval(maxval), notnull(notnull), seconds(true) {}
+
+ConvertTime::~ConvertTime()
+{
+}
+
+Value ConvertTime::Scan(const Value& text) const
+{
+	Value v = UPP::Scan(TIME_V, text);
+	if(IsError(v)) return v;
+	if(IsNull(v)) return notnull ? NotNullError() : v;
+	Time m = v;
+	if(m >= minval && m <= maxval) return v;
+	return ErrorValue(t_("Time must be between ") + UPP::Format(minval) + t_("range\v and ") + UPP::Format(maxval) + ".");
+}
+
+int ConvertTime::Filter(int chr) const
+{
+	if(IsDigit(chr) || chr == ' ' || chr == '.' || chr == ':')
+		return chr;
+	if(chr == ',')
+		return '.';
+	return 0;
+}
+
+Value ConvertTime::Format(const Value& q) const
+{
+	if(IsVoid(q) || q.IsNull())
+		return String();
+	else if(q.GetType() == TIME_V)
+		return UPP::Format(Time(q), seconds);
+	else
+		return Convert::Format(q);
+}
+
+#ifdef flagSO
+ConvertString::ConvertString(int maxlen, bool notnull) : maxlen(maxlen), notnull(notnull) {}
+ConvertString::~ConvertString() {}
+#endif
+
+Value ConvertString::Scan(const Value& text) const {
+	if(IsError(text)) return text;
+	if(IsNull(text)) return notnull ? NotNullError() : Value(text);
+	if(text.GetType() == STRING_V && String(text).GetLength() <= maxlen ||
+	   text.GetType() == WSTRING_V && WString(text).GetLength() <= maxlen) return text;
+	return ErrorValue(UPP::Format(t_("Please enter no more than %d characters."), maxlen));
+}
+
+GLOBAL_VAR_INIT(const ConvertInt, StdConvertInt)
+GLOBAL_VARP_INIT(const ConvertInt, StdConvertIntNotNull, (-INT_MAX, INT_MAX, true))
+GLOBAL_VAR_INIT(const ConvertDouble, StdConvertDouble)
+GLOBAL_VARP_INIT(const ConvertDouble, StdConvertDoubleNotNull,
+            (-DOUBLE_NULL_LIM, DOUBLE_NULL_LIM, true))
+GLOBAL_VAR_INIT(const ConvertDate, StdConvertDate)
+GLOBAL_VARP_INIT(const ConvertDate, StdConvertDateNotNull, (Date(0, 0, 0), Date(3000, 12, 31), true))
+GLOBAL_VAR_INIT(const ConvertTime, StdConvertTime)
+GLOBAL_VARP_INIT(const ConvertTime, StdConvertTimeNotNull, (Null, Null, true))
+GLOBAL_VAR_INIT(const ConvertString, StdConvertString);
+GLOBAL_VARP_INIT(const ConvertString, StdConvertStringNotNull, (INT_MAX, true))
+
+Value  MapConvert::Format(const Value& q) const {
+	return map.Get(q, Null);
+}
+
+Value NoConvertClass::Format(const Value& q) const {
+	return q;
+}
+
+GLOBAL_VAR_INIT(const NoConvertClass, NoConvert)
+
+Value JoinConvert::Format(const Value& v) const {
+	String r;
+	ValueArray a = v;
+	for(int i = 0; i < item.GetCount(); i++) {
+		const Item& m = item[i];
+		if(m.pos < 0)
+			r << m.text;
+		else
+			r << (String) StdConvert().Format(m.convert->Format(a[m.pos]));
+	}
+	return r;
+}
+
+int JoinConvert::NextPos() const {
+	for(int i = item.GetCount() - 1; i >= 0; i--)
+		if(item[i].pos >= 0) return item[i].pos + 1;
+	return 0;
+}
+
+JoinConvert& JoinConvert::Add(const char *text) {
+	Item& m = item.Add();
+	m.pos = -1;
+	m.text = text;
+	return *this;
+}
+
+JoinConvert& JoinConvert::Add(int pos, const Convert& cv) {
+	ASSERT(pos >= 0);
+	Item& m = item.Add();
+	m.pos = pos;
+	m.convert = &cv;
+	return *this;
+}
+
+JoinConvert& JoinConvert::Add(int pos) {
+	Add(pos, StdConvert());
+	return *this;
+}
+
+JoinConvert& JoinConvert::Add(const Convert& cv) {
+	Add(NextPos(), cv);
+	return *this;
+}
+
+JoinConvert& JoinConvert::Add() {
+	Add(NextPos());
+	return *this;
+}
+
+Value FormatConvert::Format(const Value& v) const
+{
+	ValueArray va;
+	if(IsValueArray(v))
+		va = v;
+	else
+		va.Add(v);
+	return UPP::Format(format, va.Get());
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/Core/Convert.h b/uppsrc/Core/Convert.h
new file mode 100644
index 000000000..64824d7dc
--- /dev/null
+++ b/uppsrc/Core/Convert.h
@@ -0,0 +1,264 @@
+unsigned      stou(const char *ptr, void *endptr = NULL, unsigned base = 10);
+inline unsigned stou(const byte *ptr, void *endptr = NULL, unsigned base = 10) { return stou((const char *)ptr, endptr, base); }
+unsigned      stou(const wchar *ptr, void *endptr = NULL, unsigned base = 10);
+
+uint64        stou64(const char *s, void *endptr = NULL, unsigned base = 10);
+uint64        stou64(const wchar *s, void *endptr = NULL, unsigned base = 10);
+
+int           ScanInt(const char *ptr, const char **endptr = NULL, int radix = 10);
+int           ScanInt(const wchar *ptr, const wchar **endptr = NULL, int radix = 10);
+
+int64         ScanInt64(const char *ptr, const char **endptr = NULL, int base = 10);
+
+double        ScanDouble(const char *ptr, const char **endptr = NULL, bool accept_comma = true);
+double        ScanDouble(const wchar *ptr, const wchar **endptr = NULL, bool accept_comma = true);
+
+Value         StrIntValue(const char *s);
+inline int    StrInt(const char* s) { return ScanInt(s); }
+inline double IntDbl(int i)         { return IsNull(i) ? double(Null) : double(i); }
+inline int    DblInt(double d)      { return IsNull(d) ? int(Null) : fround(d); }
+Value         StrDblValue(const char* s);
+inline double StrDbl(const char* s) { return ScanDouble(s); }
+
+Value NotNullError();
+
+class Convert {
+public:
+#ifdef flagSO
+	Convert();
+	virtual ~Convert();
+#else
+	virtual ~Convert() {}
+#endif
+
+	virtual Value  Format(const Value& q) const;
+	virtual Value  Scan(const Value& text) const;
+	virtual int    Filter(int chr) const;
+
+	Value operator()(const Value& q) const              { return Format(q); }
+};
+
+const Convert& StdConvert();
+
+String StdFormat(const Value& q);
+
+class ConvertInt : public Convert {
+public:
+	virtual Value Scan(const Value& text) const;
+	virtual int   Filter(int chr) const;
+
+protected:
+	int64 minval, maxval;
+	bool  notnull;
+
+public:
+	ConvertInt& MinMax(int _min, int _max)        { minval = _min; maxval = _max; return *this; }
+	ConvertInt& Min(int _min)                     { minval = _min; return *this; }
+	ConvertInt& Max(int _max)                     { maxval = _max; return *this; }
+	ConvertInt& NotNull(bool b = true)            { notnull = b; return *this; }
+	ConvertInt& NoNotNull()                       { return NotNull(false); }
+	int         GetMin() const                    { return (int)minval; }
+	int         GetMax() const                    { return (int)maxval; }
+	bool        IsNotNull() const                 { return notnull; }
+
+#ifdef flagSO
+	ConvertInt(int minval = -INT_MAX, int maxval = INT_MAX, bool notnull = false);
+	virtual ~ConvertInt();
+#else
+	ConvertInt(int minval = -INT_MAX, int maxval = INT_MAX, bool notnull = false)
+		: minval(minval), maxval(maxval), notnull(notnull) {}
+#endif
+};
+
+const ConvertInt& StdConvertInt();
+const ConvertInt& StdConvertIntNotNull();
+
+struct ConvertInt64 : public ConvertInt {
+	ConvertInt& MinMax(int64 _min, int64 _max)    { minval = _min; maxval = _max; return *this; }
+	ConvertInt& Min(int64 _min)                   { minval = _min; return *this; }
+	ConvertInt& Max(int64 _max)                   { maxval = _max; return *this; }
+	int64       GetMin() const                    { return minval; }
+	int64       GetMax() const                    { return maxval; }
+
+#ifdef flagSO
+	ConvertInt64(int64 minval = -INT64_MAX, int64 maxval = INT64_MAX, bool notnull = false);
+	virtual ~ConvertInt64();
+#else
+	ConvertInt64(int64 minval = -INT64_MAX, int64 maxval = INT64_MAX, bool notnull = false) {
+		MinMax(minval, maxval); NotNull(notnull);
+	}
+#endif
+};
+
+class ConvertDouble : public Convert {
+public:
+	virtual Value Format(const Value& q) const;
+	virtual Value Scan(const Value& text) const;
+	virtual int   Filter(int chr) const;
+
+protected:
+	double      minval, maxval;
+	bool        notnull;
+	String      pattern;
+
+public:
+	ConvertDouble& Pattern(const char *p)            { pattern = p; return *this; }
+	ConvertDouble& MinMax(double _min, double _max)  { minval = _min; maxval = _max; return *this; }
+	ConvertDouble& Min(double _min)                  { minval = _min; return *this; }
+	ConvertDouble& Max(double _max)                  { maxval = _max; return *this; }
+	ConvertDouble& NotNull(bool b = true)            { notnull = b; return *this; }
+	ConvertDouble& NoNotNull()                       { return NotNull(false); }
+	double         GetMin() const                    { return minval; }
+	double         GetMax() const                    { return maxval; }
+	bool           IsNotNull() const                 { return notnull; }
+
+	ConvertDouble(double minval = DOUBLE_NULL_LIM, double maxval = -DOUBLE_NULL_LIM,
+		          bool notnull = false);
+#ifdef flagSO
+	virtual ~ConvertDouble();
+#endif
+};
+
+const ConvertDouble& StdConvertDouble();
+const ConvertDouble& StdConvertDoubleNotNull();
+
+class ConvertDate : public Convert {
+public:
+	virtual Value Scan(const Value& text) const;
+	virtual int   Filter(int chr) const;
+
+protected:
+	Date minval, maxval;
+	bool notnull;
+
+public:
+	ConvertDate& MinMax(Date _min, Date _max)      { minval = _min; maxval = _max; return *this; }
+	ConvertDate& Min(Date _min)                    { minval = _min; return *this; }
+	ConvertDate& Max(Date _max)                    { maxval = _max; return *this; }
+	ConvertDate& NotNull(bool b = true)            { notnull = b; return *this; }
+	ConvertDate& NoNotNull()                       { return NotNull(false); }
+	Date         GetMin() const                    { return minval; }
+	Date         GetMax() const                    { return maxval; }
+	bool         IsNotNull() const                 { return notnull; }
+
+	ConvertDate(Date minval = Date::Low(), Date maxval = Date::High(), bool notnull = false);
+	virtual ~ConvertDate();
+};
+
+const ConvertDate& StdConvertDate();
+const ConvertDate& StdConvertDateNotNull();
+
+class ConvertTime : public Convert {
+public:
+	virtual Value Scan(const Value& text) const;
+	virtual int   Filter(int chr) const;
+	virtual Value Format(const Value& q) const;
+
+protected:
+	Time minval, maxval;
+	bool notnull;
+	bool seconds;
+
+public:
+	ConvertTime& MinMax(Time _min, Time _max)      { minval = _min; maxval = _max; return *this; }
+	ConvertTime& NotNull(bool b = true)            { notnull = b; return *this; }
+	ConvertTime& NoNotNull()                       { return NotNull(false); }
+	ConvertTime& Seconds(bool b = true)            { seconds = b; return *this; }
+	ConvertTime& NoSeconds()                       { return Seconds(false); }
+	Time         GetMin() const                    { return minval; }
+	Time         GetMax() const                    { return maxval; }
+	bool         IsNotNull() const                 { return notnull; }
+
+	ConvertTime(Time minval = ToTime(Date::Low()), Time maxval = ToTime(Date::High()), bool notnull = false);
+	virtual ~ConvertTime();
+};
+
+const ConvertTime& StdConvertTime();
+const ConvertTime& StdConvertTimeNotNull();
+
+class ConvertString : public Convert {
+public:
+	virtual Value Scan(const Value& text) const;
+
+protected:
+	int  maxlen;
+	bool notnull;
+
+public:
+	ConvertString& MaxLen(int _maxlen)             { maxlen = _maxlen; return *this; }
+	int            GetMaxLength() const            { return maxlen; }
+	ConvertString& NotNull(bool b = true)          { notnull = b; return *this; }
+	ConvertString& NoNotNull()                     { return NotNull(false); }
+	bool           IsNotNull() const               { return notnull; }
+
+#ifdef flagSO
+	ConvertString(int maxlen = INT_MAX, bool notnull = false);
+	virtual ~ConvertString();
+#else
+	ConvertString(int maxlen = INT_MAX, bool notnull = false)
+		: maxlen(maxlen), notnull(notnull) {}
+#endif
+};
+
+const ConvertString& StdConvertString();
+const ConvertString& StdConvertStringNotNull();
+
+class NoConvertClass : public Convert {
+public:
+	virtual Value  Format(const Value& q) const;
+};
+
+const NoConvertClass& NoConvert();
+
+class MapConvert : public Convert {
+public:
+	virtual Value  Format(const Value& q) const;
+
+protected:
+	VectorMap<Value, Value> map;
+
+public:
+	void         Clear()                                 { map.Clear(); }
+	MapConvert&  Add(const Value& a, const Value& b)     { map.Add(a, b); return *this; }
+
+	int          GetCount() const                        { return map.GetCount(); }
+	int          Find(const Value& v) const              { return map.Find(v); }
+	const Value& GetKey(int i) const                     { return map.GetKey(i); }
+	const Value& GetValue(int i) const                   { return map[i]; }
+	const Value& operator[](int i) const                 { return map[i]; }
+
+	virtual ~MapConvert() {}
+};
+
+class JoinConvert : public Convert {
+public:
+	virtual Value Format(const Value& v) const;
+
+protected:
+	struct Item {
+		int            pos;
+		const Convert *convert;
+		String         text;
+	};
+	Array<Item> item;
+
+	int NextPos() const;
+
+public:
+	JoinConvert& Add(const char *text);
+	JoinConvert& Add(int pos, const Convert& cv);
+	JoinConvert& Add(int pos);
+	JoinConvert& Add(const Convert& cv);
+	JoinConvert& Add();
+};
+
+class FormatConvert : public Convert {
+public:
+	virtual Value Format(const Value& v) const;
+
+private:
+	String format;
+
+public:
+	void   SetFormat(const char *fmt)           { format = fmt; }
+};
diff --git a/uppsrc/Core/Core.h b/uppsrc/Core/Core.h
new file mode 100644
index 000000000..4f6615b5d
--- /dev/null
+++ b/uppsrc/Core/Core.h
@@ -0,0 +1,510 @@
+#ifndef CORE_H
+#define CORE_H
+
+#define QLIB3
+
+#if defined(flagMT)
+	#define _MULTITHREADED
+	#ifdef flagDLL
+		#define flagUSEMALLOC
+	#endif
+#endif
+
+#ifdef flagMSC8ARM
+	#define PLATFORM_WIN32
+	#define PLATFORM_PDA
+	#define PLATFORM_WINCE
+	#define CPU_ARM
+	#define COMPILER_MSC
+	#define COMPILER_MSC8
+
+	#ifndef _WIN32_WCE
+		#define ARM
+		#define _ARM_
+		#define _WIN32_WCE 0x420
+		#define WIN32_PLATFORM_PSPC
+		#define _UNICODE
+		#define UNICODE
+		#define UNDER_CE
+	#endif
+
+	#define CPU_32
+	#define CPU_ARM
+	#define CPU_LE
+	#define CPU_LITTLE_ENDIAN // is it really?
+	#define CPU_ALIGNED
+
+	#ifndef _CPPRTTI
+		#error RTTI must be enabled !!!
+	#endif // _CPPRTTI
+	#pragma warning(disable: 4786)
+
+	#define NO_ERRNO_H
+#endif
+
+#ifdef flagLINUX
+	#define PLATFORM_LINUX
+	#define PLATFORM_POSIX
+	#ifdef flagGUI
+		#define PLATFORM_X11
+	#endif
+
+	#ifdef flagTESTLEAKS
+		#define TESTLEAKS
+	#endif
+
+#endif
+
+#ifdef flagSOLARIS
+	#define PLATFORM_SOLARIS
+	#define PLATFORM_POSIX
+	#ifdef flagGUI
+		#define PLATFORM_X11
+	#endif
+
+	#ifdef flagTESTLEAKS
+		#define TESTLEAKS
+	#endif
+#endif
+
+#ifdef flagFREEBSD
+	#define PLATFORM_FREEBSD
+	#define PLATFORM_POSIX
+	#ifdef flagGUI
+		#define PLATFORM_X11
+	#endif
+
+	#ifdef flagTESTLEAKS
+		#define TESTLEAKS
+	#endif
+#endif
+
+#ifdef flagOSX11
+	#define PLATFORM_OSX11
+	#define PLATFORM_POSIX
+
+	#define flagUSEMALLOC // A bug in carbon?! - MacOS X seems to crash when custom allocator is used
+
+	#ifdef flagGUI
+		#define PLATFORM_X11
+		#ifndef flagNOGTK
+			#define flagNOGTK
+		#endif
+	#endif
+
+	#ifdef flagTESTLEAKS
+		#define TESTLEAKS
+	#endif
+
+     // defines set by OsX for us.
+    #ifdef __POWERPC__
+        #define flagPOWERPC
+    #endif
+
+    #ifdef __i386__
+        #define flagX86
+    #endif
+
+#endif
+
+#if defined(flagWIN) || defined(flagWIN32)
+	#define PLATFORM_WIN32
+	#ifdef __CYGWIN__
+		#define PLATFORM_CYGWIN
+	#endif
+#endif
+
+#ifdef _MSC_VER
+	#define COMPILER_MSC
+	#ifndef _CPPRTTI
+		#error  RTTI must be enabled !!!
+	#endif  //_CPPRTTI
+	#if _MSC_VER <= 1300
+		#error  MSC 6.0 not supported anymore
+	#endif
+	#pragma warning(disable: 4786)
+	#define _CRT_SECURE_NO_DEPRECATE // we really need strcpy etc. to work with MSC 8.0
+#endif
+
+#ifdef flagGNU
+	#define COMPILER_GCC
+	#define COMPILER_GNU
+	#define COMPILER_GNU2
+#endif
+
+#ifdef flagGNU3
+	#define COMPILER_GCC
+	#define COMPILER_GNU
+	#define COMPILER_GNU3
+#endif
+
+#if defined(flagGCC) || defined(flagGCC32)
+	#define COMPILER_GCC
+	#define COMPILER_GNU
+	#define COMPILER_GNU3
+	#define __NOASSEMBLY__
+#endif
+
+#ifdef flagDM
+	#define COMPILER_DM
+#endif
+
+#ifdef flagOSTRING
+	#define OSTRING
+#endif
+
+#ifdef flagHEAPDBG
+	#define HEAPDBG
+#endif
+
+#if defined(flagDEBUG)
+	#ifndef _DEBUG
+		#define _DEBUG
+	#endif
+	#ifndef TESTLEAKS
+		#define TESTLEAKS
+	#endif
+	#ifndef HEAPDBG
+		#define HEAPDBG
+	#endif
+#else
+	#ifndef _RELEASE
+		#define _RELEASE
+	#endif
+#endif
+
+#ifdef flagDLL
+	#define _USRDLL
+#endif
+
+#ifdef flagEXPERIMENTAL
+	#define EXPERIMENTAL
+#endif
+
+#ifdef flagNEWSTRING
+	#define NEWSTRING
+#endif
+
+#if defined(flagSPARC)
+	#define CPU_32
+	#define CPU_SPARC
+	#define CPU_BE
+	#define CPU_BIG_ENDIAN
+	#define CPU_ALIGNED
+#elif defined(flagARM) || defined(ARM)
+	#define CPU_32
+	#define CPU_ARM
+	#define CPU_LE
+	#define CPU_LITTLE_ENDIAN // is it really?
+	#define CPU_ALIGNED
+#elif defined(flagPOWERPC)
+	#define CPU_32
+	#define CPU_POWERPC
+	#define CPU_BE
+	#define CPU_BIG_ENDIAN
+	#define CPU_ALIGNED
+#else
+	#define CPU_X86
+	#if defined(__amd64) || defined(_WIN64)
+		#define CPU_AMD64
+		#define CPU_64
+		#define __NOASSEMBLY__
+		#define CPU_SSE2
+	#else
+		#define CPU_IA32
+		#define CPU_32
+		#ifdef flagSSE2
+			#define CPU_SSE2
+		#endif
+	#endif
+	#define CPU_LE
+	#define CPU_LITTLE_ENDIAN
+	#define CPU_UNALIGNED
+#endif
+
+#include <typeinfo>
+#include <math.h>
+#include <limits.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <stdarg.h>
+#include <math.h>
+#include <ctype.h>
+
+#if defined(PLATFORM_POSIX)
+	#define DIR_SEP  '/'
+	#define DIR_SEPS "/"
+	#define PLATFORM_PATH_HAS_CASE 1
+
+	#include <errno.h>
+	#include <sys/types.h>
+	#include <sys/stat.h>
+	#include <sys/time.h>
+	#include <time.h>
+	#include <fcntl.h>
+	#include <unistd.h>
+	#include <pthread.h>
+	#include <semaphore.h>
+	#include <memory.h>
+	#include <dirent.h>
+	#include <signal.h>
+	#ifdef PLATFORM_SOLARIS
+		#include <inttypes.h>
+	#else
+		#include <stdint.h>
+	#endif
+#endif //PLATFORM_POSIX
+
+#ifdef PLATFORM_POSIX
+#define	LOFF_T_      off_t
+#define LSEEK64_     lseek
+#define FTRUNCATE64_ ftruncate
+#endif
+
+#ifdef PLATFORM_LINUX
+#undef  LOFF_T_
+#define LOFF_T_      loff_t
+#undef  LSEEK64_
+#define LSEEK64_     lseek64
+#undef  FTRUNCATE64_
+#define FTRUNCATE64_ ftruncate64
+#endif
+
+#ifdef PLATFORM_WIN32
+
+	#if defined(COMPILER_MSC) && defined(CPU_X86)
+		#pragma warning(disable: 4035)
+	#else
+		#ifndef __NOASSEMBLY__
+			#define __NOASSEMBLY__
+		#endif
+	#endif
+
+	#define DIR_SEP  '\\'
+	#define DIR_SEPS "\\"
+	#define PLATFORM_PATH_HAS_CASE 0
+	#ifndef PLATFORM_WINCE
+		#include <io.h>
+	#endif
+	#ifndef PLATFORM_MFC // just mini Windows headers
+		#ifdef COMPILER_MSC
+			#ifndef CPU_ARM
+				#ifndef CPU_AMD64
+					#ifndef _X86_
+						#define _X86_
+					#endif
+				#else
+					#ifndef _AMD64_
+						#define _AMD64_
+					#endif
+					#ifndef __NOASSEMBLY__
+						#define __NOASSEMBLY__
+					#endif
+					#ifndef WIN64
+						#define WIN64
+					#endif
+				#endif
+			#endif
+			#ifndef _WINDOWS_
+				#define _WINDOWS_
+			#endif
+			#ifndef _INC_WINDOWS
+				#define _INC_WINDOWS
+			#endif
+			#ifndef _STRUCT_NAME
+				#define _STRUCT_NAME(x)
+				#define DUMMYSTRUCTNAME
+				#define DUMMYSTRUCTNAME2
+				#define DUMMYSTRUCTNAME3
+			#endif
+			#ifndef NO_STRICT
+				#ifndef STRICT
+					#define STRICT 1
+				#endif
+			#endif
+			#include <stdarg.h>
+			#include <windef.h>
+			#include <winbase.h>
+			#include <wingdi.h>
+			#include <winuser.h>
+		#define byte win32_byte_ // RpcNdr defines byte -> class with Upp::byte
+		#define CY win32_CY_
+			#include <objidl.h>
+			#include <winnetwk.h>
+		#undef byte
+		#undef CY
+			typedef DWORD LCTYPE;
+		#else
+			#define _WINSOCKAPI_   /* Prevent inclusion of winsock.h in windows.h */
+			#include <windows.h>
+			#include <stdint.h>
+		#endif
+		#include <process.h>
+	#endif
+
+	#ifdef RGBA
+		#undef RGBA
+	#endif
+#endif
+
+#include <algorithm>
+#include <string>
+
+// fix MSC8 beta problem....
+#ifdef COMPILER_MSC
+#ifndef PLATFORM_WINCE
+namespace std {
+	inline void __cdecl _Debug_message(const wchar_t *, const wchar_t *, unsigned int line) {}
+};
+#endif
+#endif
+
+namespace Upp {};
+
+#ifdef flagNONAMESPACE
+#define NAMESPACE_UPP
+#define END_UPP_NAMESPACE
+#define UPP
+#else
+#define NAMESPACE_UPP     namespace Upp {
+#define END_UPP_NAMESPACE };
+#define UPP               Upp
+#endif
+
+NAMESPACE_UPP
+
+#include <Core/Defs.h>
+
+END_UPP_NAMESPACE
+
+#ifdef UPP_HEAP
+#include <new>
+
+inline void *operator new(size_t size) throw(std::bad_alloc) { void *ptr = UPP::MemoryAlloc(size); return ptr; }
+inline void operator  delete(void *ptr) throw()              { UPP::MemoryFree(ptr); }
+
+inline void *operator new[](size_t size) throw(std::bad_alloc) { void *ptr = UPP::MemoryAlloc(size); return ptr; }
+inline void operator  delete[](void *ptr) throw()              { UPP::MemoryFree(ptr); }
+
+inline void *operator new(size_t size, const std::nothrow_t&) throw() { void *ptr = UPP::MemoryAlloc(size); return ptr; }
+inline void operator  delete(void *ptr, const std::nothrow_t&) throw() { UPP::MemoryFree(ptr); }
+
+inline void *operator new[](size_t size, const std::nothrow_t&) throw() { void *ptr = UPP::MemoryAlloc(size); return ptr; }
+inline void operator  delete[](void *ptr, const std::nothrow_t&) throw() { UPP::MemoryFree(ptr); }
+
+#endif
+
+NAMESPACE_UPP
+
+#include <Core/Mt.h>
+#include <Core/Global.h>
+#include <Core/Topt.h>
+#include <Core/Profile.h>
+#include <Core/String.h>
+
+#include <Core/CharSet.h>
+#include <Core/TimeDate.h>
+#include <Core/Path.h>
+#include <Core/Stream.h>
+#include <Core/Diag.h>
+
+#include <Core/Vcont.h>
+#include <Core/BiCont.h>
+#include <Core/Index.h>
+#include <Core/Map.h>
+#include <Core/Other.h>
+#include <Core/Algo.h>
+#include <Core/Vcont.hpp>
+#include <Core/Index.hpp>
+
+#include <Core/Value.h>
+#include <Core/Gtypes.h>
+#include <Core/Color.h>
+
+#include <Core/Uuid.h>
+#include <Core/Ptr.h>
+
+#include <Core/Callback.h>
+#include <Core/Util.h>
+
+#include <Core/Format.h>
+#include <Core/Convert.h>
+
+#include <Core/z.h>
+
+#include <Core/Parser.h>
+#include <Core/XML.h>
+#include <Core/Lang.h>
+#include <Core/i18n.h>
+#include <Core/Topic.h>
+
+#include <Core/App.h>
+
+#include <Core/Xmlize.h>
+
+#include <Core/CoWork.h>
+
+#include <Core/Win32Util.h>
+
+#if (defined(HEAPDBG) || defined(TESTLEAKS)) && defined(PLATFORM_POSIX)
+extern int sMemDiagInitCount;
+#endif
+
+#ifdef PLATFORM_WIN32
+NTL_MOVEABLE(POINT)
+NTL_MOVEABLE(SIZE)
+NTL_MOVEABLE(RECT)
+#endif
+
+END_UPP_NAMESPACE
+
+#if (defined(TESTLEAKS) || defined(HEAPDBG)) && defined(PLATFORM_POSIX) && !defined(PLATFORM_OSX11) && defined(UPP_HEAP)
+
+//Place it to the begining of each file to be the first function called in whole executable...
+
+//$-
+struct MemDiagCls {
+	MemDiagCls() { if(!UPP::sMemDiagInitCount++) UPP::MemoryInitDiagnostics(); }
+	~MemDiagCls() { if(!--UPP::sMemDiagInitCount) UPP::MemoryDumpLeaks(); }
+};
+static const MemDiagCls sMemDiagHelper__upp__;
+//$+
+
+
+#endif
+
+//some global definitions
+
+#ifndef STLPORT
+inline UPP::int64  abs(UPP::int64 x)          { return x < 0 ? -x : x; }
+#endif
+
+void      RegisterTopic__(const char *topicfile, const char *topic, const char *title, const UPP::byte *data, int len);
+
+#ifdef PLATFORM_WIN32
+typedef HMODULE DLLHANDLE;
+#else
+typedef void   *DLLHANDLE;
+#endif
+
+DLLHANDLE LoadDll__(UPP::String& fn, const char *const *names, void *const *procs);
+void      FreeDll__(DLLHANDLE dllhandle);
+
+#ifndef flagNONAMESPACE
+using Upp::byte; // Dirty solution to Windows.h typedef byte...
+#endif
+
+#ifdef PLATFORM_WIN32
+#define DLLFILENAME "Kernel32.dll"
+#define DLIMODULE   UnicodeWin32
+#define DLIHEADER   <Core/Kernel32W.dli>
+#include <Core/dli_header.h>
+
+#define DLLFILENAME "Mpr.dll"
+#define DLIMODULE   UnicodeWin32Net
+#define DLIHEADER   <Core/Mpr32W.dli>
+#include <Core/dli_header.h>
+#endif
+
+#endif //CORE_H
diff --git a/uppsrc/Core/Core.t b/uppsrc/Core/Core.t
new file mode 100644
index 000000000..c31126b09
--- /dev/null
+++ b/uppsrc/Core/Core.t
@@ -0,0 +1,1017 @@
+#ifdef _MSC_VER
+#pragma setlocale("C")
+#endif
+// Util.cpp
+
+T_("Aborted by user.")
+csCZ("Operace byla přerušena uživatelem.")
+deDE("Vom Benutzer abgebrochen")
+esES("Abortado por el usuario.")
+fiFI("Käyttäjän peruuttama.")
+frFR("Annulé par l'utilisateur.")
+huHU("Megszakította a felhasználó")
+itIT("Annullato dall'utente")
+plPL("Anulowany przez użytkownika")
+roRO("Anulat de către utilizator.")
+ruRU("Прервано пользователем")
+srSP("Prekinuto od strane korisnika.")
+trTR("Kullanıcı tarafından iptal edildi.")
+zhCN("用户放弃")
+
+
+// TimeDate.cpp
+
+T_("date\vSunday")
+csCZ("Neděle")
+deDE("Sonntag")
+esES("date\vDomingo")
+fiFI("Sunnuntai")
+frFR("Dimanche")
+huHU("Vasárnap")
+itIT("Domenica")
+plPL("Niedziela")
+roRO("Duminică")
+ruRU("Суббота")
+srSP("Nedelja")
+trTR("Pazar")
+zhCN("星期日")
+
+T_("date\vMonday")
+csCZ("Pondělí")
+deDE("Montag")
+esES("date\vLunes")
+fiFI("Maanantai")
+frFR("Lundi")
+huHU("Hétfő")
+itIT("Lunedì")
+plPL("Poniedziałek")
+roRO("Luni")
+ruRU("Понедельник")
+srSP("Ponedeljak")
+trTR("Pazartesi")
+zhCN("星期一")
+
+T_("date\vTuesday")
+csCZ("Úterý")
+deDE("Dienstag")
+esES("date\vMartes")
+fiFI("Tiistai")
+frFR("Mardi")
+huHU("Kedd")
+itIT("Martedì")
+plPL("Wtorek")
+roRO("Marţi")
+ruRU("Вторник")
+srSP("Utorak")
+trTR("Salı")
+zhCN("星期二")
+
+T_("date\vWednesday")
+csCZ("Středa")
+deDE("Mittwoch")
+esES("date\vMiercoles")
+fiFI("Keskiviikko")
+frFR("Mercredi")
+huHU("Szerda")
+itIT("Mercoledì")
+plPL("Środa")
+roRO("Miercuri")
+ruRU("Среда")
+srSP("Sreda")
+trTR("Çarşamba")
+zhCN("星期三")
+
+T_("date\vThursday")
+csCZ("Čtvrtek")
+deDE("Donnerstag")
+esES("date\vJueves")
+fiFI("Torstai")
+frFR("Jeudi")
+huHU("Csütörtök")
+itIT("Giovedì")
+plPL("Czwartek")
+roRO("Joi")
+ruRU("Четверг")
+srSP("Četvrtak")
+trTR("Perşembe")
+zhCN("星期四")
+
+T_("date\vFriday")
+csCZ("Pátek")
+deDE("Freitag")
+esES("date\vViernes")
+fiFI("Perjantai")
+frFR("Vendredi")
+huHU("Péntek")
+itIT("Venerdì")
+plPL("Piątek")
+roRO("Vineri")
+ruRU("Пятница")
+srSP("Petak")
+trTR("Cuma")
+zhCN("星期五")
+
+T_("date\vSaturday")
+csCZ("Sobota")
+deDE("Samstag")
+esES("date\vSábado")
+fiFI("Lauantai")
+frFR("Samedi")
+huHU("Szombat")
+itIT("Sabato")
+plPL("Sobota")
+roRO("Sâmbătă")
+ruRU("Воскресенье")
+srSP("Subota")
+trTR("Cumartesi")
+zhCN("星期六")
+
+T_("date\vSu")
+csCZ("Ne")
+deDE("Sa")
+esES("date\vDo")
+fiFI("Su")
+frFR("Sam")
+huHU("Vas")
+itIT("Do")
+plPL("So")
+roRO("Du")
+ruRU("Вс")
+srSP("Ne")
+trTR("Pz")
+zhCN("Fri")
+
+T_("date\vMo")
+csCZ("Po")
+deDE("Mo")
+esES("date\vLu")
+fiFI("Ma")
+frFR("Lun")
+huHU("Hé")
+itIT("Lu")
+plPL("Po")
+roRO("Lu")
+ruRU("Пн")
+srSP("Po")
+trTR("Pts")
+zhCN("Mon")
+
+T_("date\vTu")
+csCZ("Út")
+deDE("Di")
+esES("date\vMa")
+fiFI("Ti")
+frFR("Mar")
+huHU("Ke")
+itIT("Ma")
+plPL("Wt")
+roRO("Ma")
+ruRU("Вт")
+srSP("Ut")
+trTR("Sl")
+zhCN("Tue")
+
+T_("date\vWe")
+csCZ("St")
+deDE("Mi")
+esES("date\vMi")
+fiFI("Ke")
+frFR("Mer")
+huHU("Sze")
+itIT("Me")
+plPL("Śr")
+roRO("Mi")
+ruRU("Ср")
+srSP("Sr")
+trTR("Çrş")
+zhCN("Wed")
+
+T_("date\vTh")
+csCZ("Čt")
+deDE("Do")
+esES("date\vJu")
+fiFI("To")
+frFR("Jeu")
+huHU("Csüt")
+itIT("Gi")
+plPL("Cz")
+roRO("Jo")
+ruRU("Чт")
+srSP("Če")
+trTR("Prş")
+zhCN("Thu")
+
+T_("date\vFr")
+csCZ("Pa")
+deDE("Fr")
+esES("date\vVi")
+fiFI("Pe")
+frFR("Ven")
+huHU("Pé")
+itIT("Ve")
+plPL("Pt")
+roRO("Vi")
+ruRU("Пт")
+srSP("Pe")
+trTR("Cu")
+zhCN("")
+
+T_("date\vSa")
+csCZ("So")
+deDE("So")
+esES("")
+fiFI("La")
+frFR("Dim")
+huHU("Szo")
+itIT("Sa")
+plPL("Nd")
+roRO("Sâ")
+ruRU("Сб")
+srSP("Su")
+trTR("Cts")
+zhCN("Sun")
+
+T_("date\vJanuary")
+csCZ("Leden")
+deDE("Januar")
+esES("date\vEnero")
+fiFI("Tammikuu")
+frFR("Janvier")
+huHU("Január")
+itIT("Gennaio")
+plPL("Styczeń")
+roRO("Ianuarie")
+ruRU("Январь")
+srSP("Januar")
+trTR("Ocak")
+zhCN("一月")
+
+T_("date\vFebruary")
+csCZ("Únor")
+deDE("Februar")
+esES("date\vFebrero")
+fiFI("Helmikuu")
+frFR("Février")
+huHU("Február")
+itIT("Febbraio")
+plPL("Luty")
+roRO("Februarie")
+ruRU("Февраль")
+srSP("Februar")
+trTR("Şubat")
+zhCN("二月")
+
+T_("date\vMarch")
+csCZ("Březen")
+deDE("März")
+esES("date\vMarzo")
+fiFI("Maaliskuu")
+frFR("Mars")
+huHU("Március")
+itIT("Marzo")
+plPL("Marzec")
+roRO("Martie")
+ruRU("Март")
+srSP("Mart")
+trTR("Mart")
+zhCN("三月")
+
+T_("date\vApril")
+csCZ("Duben")
+deDE("April")
+esES("date\vAbril")
+fiFI("Huhtikuu")
+frFR("Avril")
+huHU("Április")
+itIT("Aprile")
+plPL("Kwiecień")
+roRO("Aprilie")
+ruRU("Апрель")
+srSP("April")
+trTR("Nisan")
+zhCN("四月")
+
+T_("date\vMay")
+csCZ("Květen")
+deDE("Mai")
+esES("date\vMayo")
+fiFI("Toukokuu")
+frFR("Mai")
+huHU("Május")
+itIT("Maggio")
+plPL("Maj")
+roRO("Mai")
+ruRU("Май")
+srSP("Maj")
+trTR("Mayıs")
+zhCN("五月")
+
+T_("date\vJune")
+csCZ("Červen")
+deDE("Juni")
+esES("date\vJunio")
+fiFI("Kesäkuu")
+frFR("Juin")
+huHU("Június")
+itIT("Giugno")
+plPL("Czerwiec")
+roRO("Iunie")
+ruRU("Июнь")
+srSP("Jun")
+trTR("Haziran")
+zhCN("六月")
+
+T_("date\vJuly")
+csCZ("Červenec")
+deDE("Juli")
+esES("date\vJulio")
+fiFI("Heinäkuu")
+frFR("Juillet")
+huHU("Július")
+itIT("Luglio")
+plPL("Lipiec")
+roRO("Iulie")
+ruRU("Июль")
+srSP("Jul")
+trTR("Temmuz")
+zhCN("七月")
+
+T_("date\vAugust")
+csCZ("Srpen")
+deDE("August")
+esES("date\vAgosto")
+fiFI("Elokuu")
+frFR("Août")
+huHU("Augusztus")
+itIT("Agosto")
+plPL("Sierpień")
+roRO("August")
+ruRU("Август")
+srSP("Avgust")
+trTR("Ağustos")
+zhCN("八月")
+
+T_("date\vSeptember")
+csCZ("Září")
+deDE("September")
+esES("date\vSeptiembre")
+fiFI("Syyskuu")
+frFR("Septembre")
+huHU("Szeptember")
+itIT("Settembre")
+plPL("Wrzesień")
+roRO("Septembrie")
+ruRU("Сентябрь")
+srSP("Septembar")
+trTR("Eylül")
+zhCN("九月")
+
+T_("date\vOctober")
+csCZ("Říjen")
+deDE("Oktober")
+esES("date\vOctubre")
+fiFI("Lokakuu")
+frFR("Octobre")
+huHU("Október")
+itIT("Ottobre")
+plPL("Październik")
+roRO("Octombrie")
+ruRU("Октябрь")
+srSP("Oktobar")
+trTR("Ekim")
+zhCN("十月")
+
+T_("date\vNovember")
+csCZ("Listopad")
+deDE("November")
+esES("date\vNoviembre")
+fiFI("Marraskuu")
+frFR("Novembre")
+huHU("November")
+itIT("Novembre")
+plPL("Listopad")
+roRO("Noiembrie")
+ruRU("Ноябрь")
+srSP("Novembar")
+trTR("Kasım")
+zhCN("十一月")
+
+T_("date\vDecember")
+csCZ("Prosinec")
+deDE("Dezember")
+esES("date\vDiciembre")
+fiFI("Joulukuu")
+frFR("Décembre")
+huHU("December")
+itIT("Dicembre")
+plPL("Grudzień")
+roRO("Decembrie")
+ruRU("Декабрь")
+srSP("Decembar")
+trTR("Aralık")
+zhCN("十二月")
+
+T_("sdate\vJan")
+csCZ("Led")
+deDE("Jan")
+esES("sdate\vEne")
+fiFI("Tam")
+frFR("Jan")
+huHU("Jan")
+itIT("Gen")
+plPL("Sty")
+roRO("Ian")
+ruRU("Янв")
+srSP("Jan")
+trTR("Ock")
+zhCN("Jan")
+
+T_("sdate\vFeb")
+csCZ("Úno")
+deDE("Feb")
+esES("")
+fiFI("Hel")
+frFR("Fév")
+huHU("Feb")
+itIT("Feb")
+plPL("Lut")
+roRO("Feb")
+ruRU("Фев")
+srSP("Feb")
+trTR("Şub")
+zhCN("Feb")
+
+T_("sdate\vMar")
+csCZ("Bře")
+deDE("Mär")
+esES("")
+fiFI("Maa")
+frFR("Mar")
+huHU("Márc")
+itIT("Mar")
+plPL("Mar")
+roRO("Mar")
+ruRU("Мрт")
+srSP("Mar")
+trTR("Mar")
+zhCN("Mar")
+
+T_("sdate\vApr")
+csCZ("Dub")
+deDE("Apr")
+esES("sdate\vAbr")
+fiFI("Huh")
+frFR("Avr")
+huHU("Ápr")
+itIT("Apr")
+plPL("Kwi")
+roRO("Apr")
+ruRU("Апр")
+srSP("Apr")
+trTR("Nis")
+zhCN("Apr")
+
+T_("sdate\vMay")
+csCZ("Kvě")
+deDE("Mai")
+esES("")
+fiFI("Tou")
+frFR("Mai")
+huHU("Máj")
+itIT("Mag")
+plPL("Maj")
+roRO("Mai")
+ruRU("Май")
+srSP("Maj")
+trTR("May")
+zhCN("May")
+
+T_("sdate\vJun")
+csCZ("Čer")
+deDE("Jun")
+esES("")
+fiFI("Kes")
+frFR("Jun")
+huHU("Jún")
+itIT("Giu")
+plPL("Cze")
+roRO("Iun")
+ruRU("Инь")
+srSP("Jun")
+trTR("Haz")
+zhCN("Jun")
+
+T_("sdate\vJul")
+csCZ("Čec")
+deDE("Jul")
+esES("")
+fiFI("Hei")
+frFR("Jui")
+huHU("Júl")
+itIT("Lug")
+plPL("Lip")
+roRO("Iul")
+ruRU("Иль")
+srSP("Jul")
+trTR("Tem")
+zhCN("Jul")
+
+T_("sdate\vAug")
+csCZ("Srp")
+deDE("Aug")
+esES("sdate\vAgo")
+fiFI("Elo")
+frFR("Aou")
+huHU("Aug")
+itIT("Ago")
+plPL("Sie")
+roRO("Aug")
+ruRU("Авг")
+srSP("Avg")
+trTR("Ağu")
+zhCN("Aug")
+
+T_("sdate\vSep")
+csCZ("Zář")
+deDE("Sep")
+esES("")
+fiFI("Syy")
+frFR("Sep")
+huHU("Szept")
+itIT("Set")
+plPL("Wrz")
+roRO("Sep")
+ruRU("Сен")
+srSP("Sep")
+trTR("Eyl")
+zhCN("Sep")
+
+T_("sdate\vOct")
+csCZ("Říj")
+deDE("Okt")
+esES("")
+fiFI("Lok")
+frFR("Oct")
+huHU("Okt")
+itIT("Ott")
+plPL("Paź")
+roRO("Oct")
+ruRU("Окт")
+srSP("Okt")
+trTR("Ekm")
+zhCN("Oct")
+
+T_("sdate\vNov")
+csCZ("Lis")
+deDE("Nov")
+esES("")
+fiFI("Mar")
+frFR("Nov")
+huHU("Nov")
+itIT("Nov")
+plPL("Lis")
+roRO("Nov")
+ruRU("Ноя")
+srSP("Nov")
+trTR("Kas")
+zhCN("Nov")
+
+T_("sdate\vDec")
+csCZ("Pro")
+deDE("Dez")
+esES("sdate\vDic")
+fiFI("Jou")
+frFR("Déc")
+huHU("Dec")
+itIT("Dic")
+plPL("Gru")
+roRO("Dec")
+ruRU("Дек")
+srSP("Dec")
+trTR("Arl")
+zhCN("Dec")
+
+
+// Convert.cpp
+
+T_("Invalid number !")
+csCZ("Chybný zápis čísla !")
+deDE("Ungültige Zahl!")
+esES("Número invalido !")
+fiFI("Virheellinen numero!")
+frFR("Nombre invalide !")
+huHU("Érvénytelen szám")
+itIT("Numero non valido !")
+plPL("Niepoprawny numer !")
+roRO("Număr invalid !")
+ruRU("Неправильное число!")
+srSP("Pogrešan broj!")
+trTR("Geçersiz sayı !")
+zhCN("无效数字!")
+
+T_("Invalid date !")
+csCZ("Chybný zápis data !")
+deDE("Ungültiges Datum!")
+esES("Fecha invalida !")
+fiFI("Virheellinen päivämäärä!")
+frFR("Date invalide !")
+huHU("Érvénytelen dátum")
+itIT("Data non valida !")
+plPL("Niepoprawna data !")
+roRO("Dată invalidă !")
+ruRU("Неправильная дата!")
+srSP("Pogrešan datum!")
+trTR("Geçersiz tarih !")
+zhCN("无效日期")
+
+T_("Invalid time !")
+csCZ("Chybný čas")
+deDE("Ungültige Zeitangabe!")
+esES("Hora invalida !")
+fiFI("Virheellinen aika!")
+frFR("")
+huHU("Érvénytelen időpont")
+itIT("")
+plPL("")
+roRO("Oră invalidă !")
+ruRU("Неправильное время !")
+srSP("")
+trTR("Geçersiz Zaman !")
+zhCN("")
+
+T_("Null value not allowed.")
+csCZ("Hodnota nesmí být prázdná.")
+deDE("Null nicht erlaubt.")
+esES("No se permite valor nulo.")
+fiFI("Arvon puuttuminen ei ole sallittua.")
+frFR("Valeur nulle non autorisée.")
+huHU("Nullérték nem megengedett")
+itIT("Lo zero non è ammesso")
+plPL("Pusta wartość jest niedozwolona.")
+roRO("Valoare nulă nu este permisă.")
+ruRU("Нулевое значение не разрешено.")
+srSP("Bez vrednosti nisu dopuštene.")
+trTR("Bu alan boş bırakılamaz.")
+zhCN("不允许空值.")
+
+T_("Number must be between %d and %d.")
+csCZ("Číslo musí být v rozsahu %d až %d.")
+deDE("Zahl muss zwischen %d und %d liegen.")
+esES("El número debe estar entre %d y %d.")
+fiFI("Arvon täytyy olla välillä %d.. %d.")
+frFR("Le nombre doit être compris entre %d et %d.")
+huHU("A számnak %d és %d közé kell esnie")
+itIT("Il numero deve essere compreso tra %d e %d.")
+plPL("Numer musi być z przedziału %d i %d.")
+roRO("Numărul trebuie să fie între %d și %d.")
+ruRU("Число должно быть в пределах между %d и "
+     "%d")
+srSP("Broj mora biti između %d i %d.")
+trTR("Girilen sayı %d ile %d aralığında olmaldır.")
+zhCN("数字必须在%d和%d之间.")
+
+T_("Number must be between %g and %g.")
+csCZ("Číslo musí být v rozsahu %g až %g.")
+deDE("Zahl muss zwischen %g und %g liegen.")
+esES("El número debe estar entre %g y %g.")
+fiFI("Arvon täytyy olla välillä %g.. %g.")
+frFR("Le nombre doit être compris entre %g et %g.")
+huHU("A számnak %g és %g közé kell esnie")
+itIT("Il numero deve essere compreso tra %g e %g.")
+plPL("Numer musi być z przedziału %g i %g.")
+roRO("Numărul trebuie să fie între %g și %g.")
+ruRU("Число должно быть в пределах между %g и "
+     "%g")
+srSP("Broj mora biti između %g i %g.")
+trTR("Girilen sayı %g ile %g aralığında olmaldır.")
+zhCN("数字必须在%g和%g之间.")
+
+T_("Date must be between ")
+csCZ("Datum musí být v rozsahu ")
+deDE("Datum muss liegen zwischen ")
+esES("La fecha debe estar entre ")
+fiFI("Päivämäärän täytyy olla välillä ")
+frFR("La date doit comprise entre")
+huHU("A dátum érvényes határai ")
+itIT("La data deve essere compre tra ")
+plPL("Data musi być z zakresu ")
+roRO("Data trebuie să fie în intervalul ")
+ruRU("Дата должна быть в пределах ")
+srSP("Datum mora biti između ")
+trTR("Girilen tarih")
+zhCN("日期必须介入")
+
+T_("range\v and ")
+csCZ(" až ")
+deDE(" und ")
+esES("rango\v y ")
+fiFI(" ja ")
+frFR(" et ")
+huHU(" és ")
+itIT(" e ")
+plPL(" i ")
+roRO(" și ")
+ruRU(" и ")
+srSP(" i ")
+trTR(" and ")
+zhCN(" 和 ")
+
+T_("Time must be between ")
+csCZ("Čas musí být od")
+deDE("Zeitangabe muss liegen zwischen ")
+esES("La fecha debe estar entre ")
+fiFI("Ajan täytyy olla välillä ")
+frFR("")
+huHU("Az időpont a köv. kettő között legyen: ")
+itIT("")
+plPL("")
+roRO("Ora trebuie să fie în intervalul ")
+ruRU("Время должно быть в интервале")
+srSP("")
+trTR("Time must be between ")
+zhCN("")
+
+T_("Please enter no more than %d characters.")
+csCZ("Text nesmí být delší než %d znaků.")
+deDE("Bitte geben Sie nicht mehr als %d Zeichen ein.")
+esES("Ingrese no más de %d caracteres.")
+fiFI("Syötä enintään %d merkkiä.")
+frFR("Veuillez ne pas saisir plus de %d caractères.")
+huHU("Ne adjon be többet %d karakternél.")
+itIT("Non scrivere più di %d caratteri.")
+plPL("Proszę wprowadzić nie więcej niż %d znaków.")
+roRO("Introduceți până la %d caractere")
+ruRU("Пожайлуста, введите не более чем %d символов.")
+srSP("Molim vas unesite najviše %d slova.")
+trTR("Lütfen en fazla %d karakter girin.")
+zhCN("输入请不要超过%d字符")
+
+
+// t.cpp
+
+T_("date-format\a%2:02d/%3:02d/%1:4d")
+csCZ("%3:02d.%2:02d.%1:04d")
+deDE("%3:02d.%2:02d.%1:4d")
+esES("")
+fiFI("%3:02d.%2:02d.%1:04d")
+frFR("%3:02d/%2:02d/%1:04d")
+huHU("%1:04d.%2:02d.%3:02d.")
+itIT("%3:02d/%2:02d/%1:04d")
+plPL("%3:02d.%2:02d.%1:04d")
+roRO("format-dată\a%2:02d/%3:02d/%1:4d")
+ruRU("%3:02d.%2:02d.%1:04d")
+srSP("%3:02d.%2:02d.%1:04d")
+trTR("%3:02d.%2:02d.%1:04d")
+zhCN("%2:02d/%3:02d/%1:4d")
+
+T_("date-scan\amdy")
+csCZ("dmy")
+deDE("dmy")
+esES("")
+fiFI("dmy")
+frFR("dmy")
+huHU("ymd")
+itIT("dmy")
+plPL("dmy")
+roRO("")
+ruRU("dmy")
+srSP("dmy")
+trTR("dmy")
+zhCN("mdy")
+
+T_("date-filter\aA/\a .-")
+csCZ(".\a /,")
+deDE("A/\a .-")
+esES("")
+fiFI(".\a ,-/")
+frFR("/\a .,")
+huHU("A.\a .-")
+itIT("/\a .,")
+plPL("\a .,-/")
+roRO("")
+ruRU(".\a /,")
+srSP(".\a /,")
+trTR(".\a /,")
+zhCN("A/\a .-")
+
+
+// Lang.cpp
+
+T_("Invalid language specification.")
+csCZ("Chybná specifikace jazyka.")
+deDE("Ungültige Sprachenbezeichnung")
+esES("Especificación de lenguaje no válida")
+fiFI("Virheellinen kielimääritys.")
+frFR("Langue spécifiée invalide.")
+huHU("Érvénytelen nyelvbeállítás")
+itIT("Lingua specificata non valida.")
+plPL("Niepoprawna specyfikacja języka.")
+roRO("Specificare de limbă invalidă")
+ruRU("Неправильная спецификация языка.")
+srSP("Nevalidna specifikacija jezika.")
+trTR("Geçersiz dil.")
+zhCN("无效语言指示")
+
+
+// Obsolete
+
+T_("invalid day number.")
+csCZ("neplatné číslo dne.")
+deDE("Ungültige Tageszahl")
+esES("")
+fiFI("virheellinen päivä.")
+frFR("jour invalide.")
+huHU("érvénytelen nap.")
+itIT("giorno non valido.")
+plPL("niepoprawny numer dnia.")
+roRO("număr de zi invalid.")
+ruRU("неправильное число дня месяца.")
+srSP("nevalidan dan.")
+trTR("geçersiz gün.")
+zhCN("无效天数")
+
+T_("invalid month number.")
+csCZ("neplatné číslo měsíce.")
+deDE("Ungültige Monatszahl")
+esES("")
+fiFI("virheellinen kuukausi.")
+frFR("mois invalide.")
+huHU("érvénytelen hónap.")
+itIT("mese non valido.")
+plPL("niepoprawny numer miesiąca.")
+roRO("număr de lună invalid")
+ruRU("неправильное число месяца.")
+srSP("nevalidan mesec.")
+trTR("geçersiz ay.")
+zhCN("无效月数")
+
+T_("invalid year number.")
+csCZ("neplatné číslo roku.")
+deDE("Ungültige Jahreszahl")
+esES("")
+fiFI("virheellinen vuosi.")
+frFR("année invalide.")
+huHU("érvénytelen év.")
+itIT("anno non valido.")
+plPL("niepoprawny numer roku.")
+roRO("an invalid")
+ruRU("неправильное число года.")
+srSP("nevalidana godina.")
+trTR("geçersiz yıl.")
+zhCN("无效年数")
+
+T_("invalid hour number.")
+csCZ("chybné číslo hodiny.")
+deDE("Ungültige Stundenzahl")
+esES("")
+fiFI("virheellinen tunti.")
+frFR("heure invalide.")
+huHU("érvénytelen óra.")
+itIT("ora non valida.")
+plPL("niepoprawna wartość godziny.")
+roRO("oră invalidă")
+ruRU("неправильное число часа.")
+srSP("nevalidan sat.")
+trTR("geçersiz saat.")
+zhCN("无效小时")
+
+T_("invalid minute number.")
+csCZ("chybné číslo minuty.")
+deDE("Ungültige Minutenzahl")
+esES("")
+fiFI("virheellinen minuutti.")
+frFR("minute invalide.")
+huHU("érvénytelen perc.")
+itIT("minuti non valido.")
+plPL("niepoprawna wartość minuty.")
+roRO("minut invalid")
+ruRU("неправильное число минуты.")
+srSP("nevalidna minuta.")
+trTR("geçersiz dakika.")
+zhCN("无效分")
+
+T_("invalid second number.")
+csCZ("chybné číslo sekundy.")
+deDE("Ungültige Sekundenzahl")
+esES("")
+fiFI("virheellinen sekunti.")
+frFR("seconde invalide.")
+huHU("érvénytelen másodperc.")
+itIT("secondi non valido.")
+plPL("niepoprawna druga wartość.")
+roRO("secundă invalidă")
+ruRU("неправильное число секунды.")
+srSP("nevalidna sekunda.")
+trTR("geçersiz saniye.")
+zhCN("无效秒")
+
+T_("invalid character '%c' following date/time.")
+csCZ("neplatný znak '%c' za koncem data.")
+deDE("Ungültiges Zeichen '%c' folgt Datum/Zeit.")
+esES("")
+fiFI("virheellinen merkki '%c' seuraa päivämäärää/kellonaikaa.")
+frFR("caractère invalide '%c' suivant la date.")
+huHU("érvénytelen karakter '%c' a dátum/idő mellett.")
+itIT("carattere non valido '%c' dopo la data.")
+plPL("niepoprawny znak '%c' na końcu daty/czasu.")
+roRO("data/ora este urmată de caracterul invalid '%c'")
+ruRU("неправильный символ '%c' идущий за датой/временем.")
+srSP("nevalidni karakter '%c' posle datuma/vremena.")
+trTR("girilen tarih/zaman bilgisi içindeki '%c' geçersiz bir karakterdir.")
+zhCN("日期/时间后跟字符 '%c' 无效")
+
+T_("invalid day number %d - February in year %d has only %d days.")
+csCZ("neplatné číslo dne %d - únor v roce %d má pouze %d dní.")
+deDE("Ungültige Tagesnummer %d - Februar im Jahr %d hat nur %d Tage.")
+esES("")
+fiFI("virheellinen päivä %d - Helmikuussa %d on vain %d päivää.")
+frFR("jour %d invalide pour Février qui n'a que %d jours.")
+huHU("érvénytelen nap %d - a február a(z) %d évben csak %d napos.")
+itIT("Febbraio ha solo %d giorni.")
+plPL("niepoprawny numer dnia %d - Luty w roku %d ma tylko %d dni.")
+roRO("ziua %d invalidă - februarie are doar %d zile în anul %d")
+ruRU("неправильное число месяца %d - В феврале "
+     "%d года только %d дней.")
+srSP("nevalidan dan %d - Februar u godini %d ima %d dana.")
+trTR("%d geçersiz bir gün sayısıdır - %d yılında Şubat ayı %d gün "
+     "çeker.")
+zhCN("无效天数 %d -  %d年二月只有%d天.")
+
+T_("invalid day number %d - %month has only %d days.")
+csCZ("neplatné číslo dne %d - %month má pouze %d dní.")
+deDE("Ungültige Tagesnummer %d - %month hat nur %d Tage.")
+esES("")
+fiFI("virheellinen päivä %d - %monthssa on vain %d päivää.")
+frFR("jour %d invalide pour %month qui n'a que %d jours.")
+huHU("érvénytelen nap %d - %month csak % napos.")
+itIT("Giorno non valido %d - %month ha solo %d giorni.")
+plPL("niepoprawny numer dnia - %month ma tylko %d dni.")
+roRO("ziua %d invalidă - %month are numai %d zile")
+ruRU("неправильное число месяца %d - В %month только "
+     "%d дней.")
+srSP("nevalidan dan %d - %month ima %d dana.")
+trTR("%d geçersiz bir gün sayısıdır - %month ayı %d gün çeker.")
+zhCN("无效天数 %d - %month月只有 %d 天.")
+
+T_("exceeded valid range (lower bound: %`).")
+csCZ("překročení povoleného rozsahu (dolní mez: %`).")
+deDE("Gültigkeitsbereich unterschritten (untere Grenze: %`).")
+esES("")
+fiFI("sallitun alueen ulkopuolella (alaraja: %`).")
+frFR("validité de l'intervalle dépassée (limite inférieure : %d`).")
+huHU("érvényes tartomány alatt (alsó határ: %`).")
+itIT("range valido superato (limite inferiore: %`).")
+plPL("przekroczono dopuszczalny zakres (dolna granica: %`).")
+roRO("interval depășit (margine inferioară: %`).")
+ruRU("превышен допустимый предел (нижний предел: "
+     "%`).")
+srSP("prekoračena validna granica (donja granica: %`).")
+trTR("Geçerli aralık aşıldı (alt sınır: %`).")
+zhCN("超出有效范围(下限:%`).")
+
+T_("exceeded valid range (upper bound: %`).")
+csCZ("překročení povoleného rozsahu (horní mez: %`).")
+deDE("Gültigkeitsbereich überschritten (obere Grenze: %`).")
+esES("")
+fiFI("sallitun alueen ulkopuolella (yläraja: %`).")
+frFR("validité de l'intervalle dépassée (limite supérieure : %d`).")
+huHU("érvényes tartomány fölött (felső határ: %`)")
+itIT("range valido superato (limite superiore: %`).")
+plPL("przekroczono dopuszczalny zakres (górna granica: %`).")
+roRO("interval depășit (margine superioară: %`).")
+ruRU("превышен допустимый предел (верхний предел: "
+     "%`).")
+srSP("prekoračena validna granica (gornja granica: %`).")
+trTR("Geçerli aralık aşıldı (üst sınır: %`).")
+zhCN("超出有效范围(上限:%`).")
+
+T_("Invalid date/time: digit expected, found character")
+csCZ("Chybné datum/čas: očekávána číslice, nalezen znak")
+deDE("Ungültige(s) Datum/Zeit: Ziffer erwartet, Zeichen vorgefunden")
+esES("")
+fiFI("Virheellinen pvm/aika: Käytä numeroita kirjaimien sijaan.")
+frFR("Date/heure invalide : chiffre attendu, caractère détecté")
+huHU("érvénytelen dátum/idő: számjegy helyett más karakter áll")
+itIT("Data/ora non valida")
+plPL("Niepoprawna data/czas: oczekiwano cyfry, znaleziono znak")
+roRO("Dată/oră invalidă: se așteaptă cifră, caracter găsit")
+ruRU("Неправильные дата/время: ожидается цифра, "
+     "а найден символ")
+srSP("Nevalidan datum/vreme: očekuje se cifra, pronađen karakter")
+trTR("Geçersiz tarih/zaman: sayı olması gereken yerde harf var")
+zhCN("无效日期/时间:只能是数字,不能为字符")
+
+T_("Invalid date/time:")
+csCZ("Chybné datum/čas:")
+deDE("Ungültige(s) Datum/Zeit:")
+esES("")
+fiFI("Virheellinen pvm/aika:")
+frFR("Date/heure invalide :")
+huHU("érvénytelen dátum/idő")
+itIT("Data/ora non valida:")
+plPL("Niepoprawna data/czas:")
+roRO("Dată/oră invalidă:")
+ruRU("Неправильные дата/время:")
+srSP("Nevalidan datum/vreme:")
+trTR("Geçersiz tarih/zaman:")
+zhCN("无效日期/时间:")
diff --git a/uppsrc/Core/Core.upp b/uppsrc/Core/Core.upp
new file mode 100644
index 000000000..ae8d44b83
--- /dev/null
+++ b/uppsrc/Core/Core.upp
@@ -0,0 +1,146 @@
+description "Non-GUI code. Streams, NTL containers, concrete types, Value, XML, C parsing etc...";
+
+acceptflags
+	USEMALLOC;
+
+uses(WIN32) plugin\z;
+
+library(MSC !MSC8ARM) "kernel32 user32";
+
+library(WIN32 !GUI !GNU !GCC) "ole32 oleaut32 oldnames";
+
+library(LINUX) "pthread dl";
+
+library(FREEBSD) pthread;
+
+library(WIN32 !MSC8ARM) "advapi32 shell32 winmm mpr";
+
+library(SOLARIS) "posix4 dl";
+
+library(WIN32 GCC) "ole32 oleaut32 uuid";
+
+library(MSC8ARM WIN32) "coredll.lib corelibc.lib ole32.lib oleaut32.lib uuid.lib commctrl.lib ccrtrtti.lib";
+
+library(!WIN32) z;
+
+options(XGNU) -O0;
+
+options(XGNU) -ffunction-sections;
+
+link(SOLARIS) "-Wl,-R -Wl,/usr/local/lib";
+
+file
+	Core.h,
+	Defs.h,
+	Cpu.cpp optimize_speed,
+	Mt.h,
+	Mt.cpp,
+	OL_Set.cpp,
+	Global.h,
+	HeapImp.h,
+	heaputil.cpp optimize_speed,
+	sheap.cpp optimize_speed,
+	lheap.cpp optimize_speed,
+	heap.cpp optimize_speed,
+	heapdbg.cpp optimize_speed,
+	String.h,
+	AString.hpp,
+	String.cpp optimize_speed,
+	WString.cpp optimize_speed,
+	StrUtil.cpp optimize_speed,
+	CharSet.h,
+	CharSet.cpp optimize_speed,
+	Kernel32W.dli,
+	Mpr32W.dli,
+	Path.h,
+	Path.cpp,
+	NetNode.cpp,
+	App.h,
+	App.cpp,
+	Stream.h,
+	Stream.cpp optimize_speed,
+	BlockStream.cpp optimize_speed,
+	Profile.h,
+	Diag.h,
+	Log.cpp,
+	Debug.cpp,
+	Util.h,
+	Util.cpp optimize_speed,
+	mathutil.cpp optimize_speed,
+	Containers readonly separator,
+	Algo.h,
+	Topt.h,
+	Vcont.h,
+	BiCont.h,
+	Vcont.hpp,
+	Vcont.cpp optimize_speed,
+	Index.h,
+	Map.h,
+	Index.hpp,
+	Other.h,
+	Hash.cpp optimize_speed,
+	Concretes readonly separator,
+	Cbgen.h,
+	Callback.h,
+	Callback.cpp optimize_speed,
+	TimeDate.h,
+	TimeDate.cpp optimize_speed,
+	Value.h,
+	Value.cpp optimize_speed,
+	Format.h,
+	Format.cpp optimize_speed,
+	Convert.h,
+	Convert.cpp optimize_speed,
+	Color.h,
+	Color.cpp optimize_speed,
+	Gtypes.h,
+	Gtypes.cpp optimize_speed,
+	Language readonly separator,
+	i18n.h,
+	t.cpp optimize_speed,
+	Core.t charset "UTF-8",
+	t.h,
+	Lang.h,
+	Lang.cpp,
+	lcid.txt,
+	"Other files" readonly separator,
+	Parser.h,
+	parser.cpp optimize_speed,
+	XML.h,
+	XML.cpp optimize_speed,
+	Xmlize.h,
+	Xmlize.cpp optimize_speed,
+	Uuid.h,
+	Uuid.cpp optimize_speed,
+	Ptr.h,
+	Ptr.cpp optimize_speed,
+	z.h,
+	z.cpp,
+	Topic.h,
+	topic_group.h,
+	Topic.cpp,
+	CoWork.h,
+	CoWork.cpp,
+	"Runtime linking" readonly separator,
+	dli.h,
+	dli_header.h,
+	dli_source.h,
+	Dli.cpp,
+	"Win32 support" readonly separator,
+	Win32Util.h,
+	Win32Util.cpp,
+	Meta readonly separator,
+	sub.upt,
+	core.upt,
+	Info readonly separator,
+	src.tpp,
+	srcdoc.tpp,
+	srcimp.tpp,
+	COPYING,
+	COPYING-PLAIN,
+	AUTHORS;
+
+mainconfig
+	"Normal" = "",
+	"Remote shared" = "SHARED";
+
diff --git a/uppsrc/Core/Core_init.icpp b/uppsrc/Core/Core_init.icpp
new file mode 100644
index 000000000..5b7f53fd3
--- /dev/null
+++ b/uppsrc/Core/Core_init.icpp
@@ -0,0 +1,4 @@
+#include "Core.h"
+
+#define TFILE <Core/Core.t>
+#include <Core/t.h>
diff --git a/uppsrc/Core/Cpu.cpp b/uppsrc/Core/Cpu.cpp
new file mode 100644
index 000000000..52707b2fb
--- /dev/null
+++ b/uppsrc/Core/Cpu.cpp
@@ -0,0 +1,146 @@
+#include "Core.h"
+
+NAMESPACE_UPP
+
+#ifdef CPU_X86
+
+static bool sHasMMX;
+static bool sHasSSE;
+static bool sHasSSE2;
+static bool sHasSSE3;
+
+static void sCheckCPU()
+{
+	static bool done;
+	if(done) return;
+	done = true;
+#ifdef PLATFORM_OSX11
+//	__asm__("pushl %%ebx\n\tmovl $1, %%eax\n\tcpuid\n\tpopl %%ebx" : "=d" (info1), "=c" (info2) : : "%eax");
+	sHasMMX = true;
+	sHasSSE = true;
+	sHasSSE2 = true;
+#else
+#ifdef CPU_AMD64
+	sHasMMX = true;
+	sHasSSE = true;
+	sHasSSE2 = true;
+#else
+#ifdef COMPILER_MSC
+	dword info1;
+	dword info2;
+	__asm {
+		mov eax, 1
+		cpuid
+		mov info1, edx
+		mov info2, ecx
+	}
+#else
+	dword info1;
+	dword info2;
+	__asm__("movl $1, %%eax\n\tcpuid" : "=d" (info1), "=c" (info2) : : "%eax", "%ebx");
+#endif
+	sHasMMX = ((info1 >> 23) & 0x1);
+	sHasSSE = ((info1 >> 25) & 0x1);
+	sHasSSE2 = ((info1 >> 26) & 0x1);
+	sHasSSE3 = ((info2) & 0x1);
+#endif
+#endif
+}
+
+INITBLOCK {
+//	sCheckCPU();
+}
+
+bool CpuMMX()  { sCheckCPU(); return sHasMMX; }
+bool CpuSSE()  { sCheckCPU(); return sHasSSE; }
+bool CpuSSE2() { sCheckCPU(); return sHasSSE2; }
+bool CpuSSE3() { sCheckCPU(); return sHasSSE3; }
+
+#ifdef PLATFORM_POSIX
+#ifdef PLATFORM_FREEBSD
+#include <unistd.h>
+#else
+#include <sys/sysinfo.h>
+#endif
+#endif
+
+int CPU_Cores()
+{
+	static int n;
+	ONCELOCK {
+#ifdef PLATFORM_WIN32
+#ifdef CPU_64
+		uint64 pa, sa;
+		GetProcessAffinityMask(GetCurrentProcess(), &pa, &sa);
+		for(int i = 0; i < 64; i++)
+			n += !!(sa & ((uint64)1 << i));
+#else
+		DWORD pa, sa;
+		GetProcessAffinityMask(GetCurrentProcess(), &pa, &sa);
+		for(int i = 0; i < 32; i++)
+			n += !!(sa & (1 << i));
+#endif
+#elif defined(PLATFORM_POSIX)
+#ifdef PLATFORM_FREEBSD
+		n = minmax((int)sysconf(_SC_NPROCESSORS_ONLN), 1, 256);
+#else
+		n = minmax(get_nprocs(), 1, 256);
+#endif
+#else
+		n = 1;
+#endif
+	}
+	return n;
+}
+
+#endif
+
+#ifdef PLATFORM_WIN32
+bool IsDecentMachine()
+{
+	if(!IsWin2K())
+		return false;
+	MEMORYSTATUS m;
+	GlobalMemoryStatus(&m);
+	return m.dwTotalPhys > 500 * 1024 * 1024;
+
+}
+#else
+bool IsDecentMachine()
+{
+	return true;
+}
+#endif
+
+#ifndef CPU_X86
+int64 PeekI64(const void *ptr) {
+	const byte *p = (const byte *)ptr;
+	dword a = p[0] | (p[1] << 8) | (p[2] << 16) | (p[3] << 24);
+	dword b = p[4] | (p[5] << 8) | (p[6] << 16) | (p[7] << 24);
+	return (int64)a | ((int64)b << 32);
+}
+#endif
+
+#ifndef CPU_X86
+void PokeI64(void *ptr, int64 value) {
+	byte *p = (byte *)ptr;
+	p[0] = (byte)(value >> 8 * 0);
+	p[1] = (byte)(value >> 8 * 1);
+	p[2] = (byte)(value >> 8 * 2);
+	p[3] = (byte)(value >> 8 * 3);
+	p[4] = (byte)(value >> 8 * 4);
+	p[5] = (byte)(value >> 8 * 5);
+	p[6] = (byte)(value >> 8 * 6);
+	p[7] = (byte)(value >> 8 * 7);
+}
+#endif
+#define ENDIAN_SWAP { while(count--) { EndianSwap(*v++); } }
+
+void EndianSwap(word *v, int count) ENDIAN_SWAP
+void EndianSwap(int16 *v, int count) ENDIAN_SWAP
+void EndianSwap(dword *v, int count) ENDIAN_SWAP
+void EndianSwap(int *v, int count) ENDIAN_SWAP
+void EndianSwap(int64 *v, int count) ENDIAN_SWAP
+void EndianSwap(uint64 *v, int count) ENDIAN_SWAP
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/Core/Debug.cpp b/uppsrc/Core/Debug.cpp
new file mode 100644
index 000000000..b3482bf38
--- /dev/null
+++ b/uppsrc/Core/Debug.cpp
@@ -0,0 +1,478 @@
+#include "Core.h"
+
+NAMESPACE_UPP
+
+#define LTIMING(x) // TIMING(x)
+
+int msecs(int from) { return (int)GetTickCount() - from; }
+
+#ifdef PLATFORM_WIN32
+#include <mmsystem.h>
+#endif
+
+#ifdef PLATFORM_WIN32
+static void sLogFile(char *fn, const char *app = ".log")
+{
+#ifdef PLATFORM_WINCE
+	wchar wfn[256];
+	::GetModuleFileName(NULL, wfn, 512);
+	strcpy(fn, FromSysChrSet(wfn));
+#else
+	::GetModuleFileName(NULL, fn, 512);
+#endif
+	char *e = fn + strlen(fn), *s = e;
+	while(s > fn && *--s != '\\' && *s != '.')
+		;
+	strcpy(*s == '.' ? s : e, app);
+}
+#endif
+
+#ifdef PLATFORM_POSIX
+const char *procexepath_();
+extern char Argv0__[_MAX_PATH + 1];
+
+static void sLogFile(char *fn, const char *app = ".log")
+{
+	char *path = fn;
+	const char *ehome = getenv("HOME");
+	strcpy(fn, ehome ? ehome : "/root");
+	if(!*fn || (fn += strlen(fn))[-1] != '/')
+		*fn++ = '/';
+	*fn = '\0';
+	strcat(path, ".upp/");
+	const char *exe = procexepath_();
+	if(!exe) {
+		exe = Argv0__;
+	}
+	const char *q = strrchr(exe, '/');
+	if(q)
+		exe = q + 1;
+	if(!exe)
+		exe = "upp";
+	strcat(path, exe);
+	mkdir(path, 0755);
+	strcat(path, "/");
+	strcat(path, exe);
+	strcat(path, app);
+}
+#endif
+
+static Stream *__logstream;
+static char    __logfilename[512];
+static int     __logfilesizelimit = 10000000;
+static bool    __logfilenodeleteonstartup = false;
+
+void SetVppLogSizeLimit(int limit) { __logfilesizelimit = limit; }
+void SetVppLogNoDeleteOnStartup()  { __logfilenodeleteonstartup = true; }
+
+static void sOpenVppLog(LogStream *s)
+{
+	if(!*__logfilename)
+		sLogFile(__logfilename);
+	s->Create(__logfilename, __logfilenodeleteonstartup);
+	s->SetLimit(__logfilesizelimit);
+}
+
+LogStream& StdLogStream()
+{
+	static LogStream *s;
+	ReadMemoryBarrier();
+	if(!s) {
+		static StaticCriticalSection lock;
+		lock.Enter();
+		if(!s) {
+			static byte lb[sizeof(LogStream)];
+			LogStream *strm = new(lb) LogStream;
+			sOpenVppLog(strm);
+			WriteMemoryBarrier();
+			s = strm;
+		}
+		lock.Leave();
+	}
+	return *s;
+}
+
+void StdLogSetup(dword options)
+{
+	StdLogStream().SetOptions(options);
+}
+
+Stream& StdLog()
+{
+	return StdLogStream();
+}
+
+void SetVppLog(Stream& log) {
+	__logstream = &log;
+}
+
+Stream& VppLog() {
+	if(!__logstream) __logstream = &StdLog();
+	return *__logstream;
+}
+
+void SetVppLogName(const String& file) {
+	strcpy(__logfilename, file);
+	sOpenVppLog(&StdLogStream());
+}
+
+void sTime(char *h, const char *ext)
+{
+	Time t = GetSysTime();
+	char th[200];
+	sprintf(th, ".%d-%02d-%02d-%02d-%02d-%02d", t.year, t.month, t.day, t.hour, t.minute, t.second);
+	strcat(th, ext);
+	sLogFile(h, th);
+}
+
+bool snobuglog;
+
+void DeactivateBugLog()
+{
+	snobuglog = true;
+}
+
+Stream&  BugLog()
+{
+	if(snobuglog)
+		return NilStream();
+	static LogStream *s;
+	if(!s) {
+		INTERLOCKED
+			if(!s) {
+				static byte lb[sizeof(LogStream)];
+				s = new(lb) LogStream;
+				char h[200];
+				sTime(h, ".buglog");
+				s->Create(h, false);
+			}
+	}
+	return *s;
+}
+
+LogStream&  UsrLogStream()
+{
+	static LogStream *s;
+	if(!s) {
+		INTERLOCKED
+			if(!s) {
+				static byte lb[sizeof(LogStream)];
+				s = new(lb) LogStream;
+				char h[200];
+				sTime(h, ".usrlog");
+				s->Create(h, false);
+			}
+	}
+	return *s;
+}
+
+bool susrlog;
+bool susrlogpersistent;
+
+void ActivateUsrLog()
+{
+	UsrLogStream();
+	susrlog = true;
+}
+
+void ActivatePersistentUsrLog()
+{
+	ActivateUsrLog();
+	susrlogpersistent = true;
+}
+
+Stream& UsrLog()
+{
+	return susrlog ? (Stream&)UsrLogStream() : NilStream();
+}
+
+Stream&  UsrLog(const char *line)
+{
+	if(!susrlog)
+		return NilStream();
+	return UsrLogStream() << line << "\r\n";
+}
+
+Stream&  UsrLogT(int indent, const char *line)
+{
+	if(!susrlog)
+		return NilStream();
+	Time tm = GetSysTime();
+	char h[256];
+	sprintf(h, "%02d:%02d:%02d ", tm.hour, tm.minute, tm.second);
+	Stream& s = UsrLogStream() << h;
+	while(indent--)
+		s << " ";
+	s << line << "\r\n";
+	return s;
+}
+
+Stream&  UsrLogT(const char *line)
+{
+	return UsrLogT(0, line);
+}
+
+bool IsUsrLog()
+{
+	return susrlog;
+}
+
+void DeleteUsrLog()
+{
+	if(susrlogpersistent) {
+		if(susrlog)
+			UsrLogStream() << "log is persistent";
+	}
+	else {
+		if(!UsrLogStream().Delete())
+			RLOG("Unable to delete UsrLog, " << GetLastErrorMessage());
+		susrlog = false;
+	}
+}
+
+void __LOGF__(const char *fmt, ...) {
+	char buffer[1024];
+	va_list argptr;
+	va_start(argptr, fmt);
+	vsprintf(buffer, fmt, argptr);
+	va_end(argptr);
+	VppLog().Put(buffer);
+}
+
+String GetTypeName(const char *s)
+{
+	static const char _struct[] = "struct ", _class[] = "class ";
+	enum { LEN_S = sizeof(_struct) - 1, LEN_C = sizeof(_class) - 1 };
+	int len = (dword)strlen(s);
+	if(len > LEN_C && !memcmp(s, _class, LEN_C))
+		s += LEN_C;
+	else if(len > LEN_S && !memcmp(s, _struct, LEN_S))
+		s += LEN_S;
+	return s;
+}
+
+bool TimingInspector::active = true;
+
+#if defined(PLATFORM_POSIX) || defined(PLATFORM_WINCE)
+inline int tmGetTime() {
+	return GetTickCount();
+}
+#else
+inline int tmGetTime() {
+	return timeGetTime();
+}
+#endif
+
+static TimingInspector& s_zero()
+{
+	static TimingInspector *s_zero = NULL;
+	static bool init = false;
+	if(!init) {
+		init = true;
+		static TimingInspector s_zero_;
+		s_zero = &s_zero_;
+		int w = GetTickCount();
+		while(GetTickCount() - w < 200)
+			TimingInspector::Routine __(*s_zero);
+	}
+	return *s_zero;
+}
+
+TimingInspector::TimingInspector(const char *_name) {
+	s_zero(); //!! atexit
+	name = _name ? _name : "";
+	start_time = 0;
+	all_count = call_count = max_nesting = nesting_depth = min_time = max_time = total_time = 0;
+	static bool init;
+	if(!init) {
+#if defined(PLATFORM_WIN32) && !defined(PLATFORM_WINCE)
+		timeBeginPeriod(1);
+#endif
+		init = true;
+	}
+}
+
+TimingInspector::~TimingInspector() {
+	Mutex::Lock __(mutex);
+	if(this == &s_zero()) return;
+	StdLog() << Dump() << "\r\n";
+}
+
+void TimingInspector::Start() {
+	Mutex::Lock __(mutex);
+	if(!active) return;
+	if(!nesting_depth++)
+		start_time = tmGetTime();
+	if(nesting_depth > max_nesting)
+		max_nesting = nesting_depth;
+}
+
+void TimingInspector::End() {
+	Mutex::Lock __(mutex);
+	if(!active) return;
+	all_count++;
+	if(!--nesting_depth) {
+		dword time = tmGetTime() - start_time;
+		total_time += time;
+		if(call_count++ == 0)
+			min_time = max_time = time;
+		else {
+			if(time < min_time)
+				min_time = time;
+			if(time > max_time)
+				max_time = time;
+		}
+	}
+}
+
+String TimingInspector::Dump() {
+	Mutex::Lock __(mutex);
+	String s = Sprintf("TIMING %-15s: ", name);
+	if(call_count == 0)
+		return s + "No active hit";
+	double tm = max(0.0, double(total_time) / call_count / 1000 -
+		                 double(s_zero().total_time) / s_zero().call_count / 1000);
+	return s
+	       + timeFormat(tm * call_count)
+	       + " - " + timeFormat(tm)
+	       + " (" + timeFormat((double)total_time  / 1000) + " / "
+	       + Sprintf("%d )", call_count)
+		   + ", min: " + timeFormat((double)min_time / 1000)
+		   + ", max: " + timeFormat((double)max_time / 1000)
+		   + Sprintf(", nesting: %d - %d", max_nesting, all_count);
+}
+
+HitCountInspector::~HitCountInspector()
+{
+	Mutex::Lock __(mutex);
+	RLOG("HITCOUNT " << name << ": hit count = " << hitcount);
+}
+
+void  HexDump(Stream& s, const void *ptr, int size, int maxsize) {
+	char h[256];
+	sprintf(h, "Memory at %p, size 0x%X = %d\n", ptr, size, size);
+	s.Put(h);
+#ifdef PLATFORM_WIN32
+	if(IsBadReadPtr(ptr, size)) {
+		s.Put("   <MEMORY ACCESS VIOLATION>\n");
+		return;
+	}
+#endif
+	int a, b;
+	byte *q = (byte *)ptr;
+	a = 0;
+	if(size > maxsize) size = maxsize;
+	while(a < size) {
+	#ifdef CPU_64
+		uint64 aa = a + (uint64)ptr;
+		sprintf(h, "%+6d 0x%08X%08X ", a, (int)(aa >> 32), (int)aa);
+		s.Put(h);
+	#else
+		sprintf(h, "%+6d 0x%08X ", a, a + dword(ptr));
+		s.Put(h);
+	#endif
+		for(b = 0; b < 16; b++)
+			if(a + b < size) {
+				sprintf(h, "%02X ", q[a + b]);
+				s.Put(h);
+			}
+			else
+				s.Put("   ");
+		s.Put("    ");
+		for(b = 0; b < 16; b++)
+			if(a + b < size)
+				s.Put(q[a + b] < ' ' ? '.' : q[a + b]);
+			else
+				s.Put(' ');
+		a += 16;
+		s << '\n';
+	}
+}
+
+#if defined(PLATFORM_WIN32) && !defined(PLATFORM_WINCE)
+
+template <class T>
+void Put(HANDLE file, T& data) {
+	dword dummy;
+	WriteFile(file, &data, sizeof(data), &dummy, NULL);
+}
+
+static LPTOP_LEVEL_EXCEPTION_FILTER sPrev;
+static dword sESP;
+static char  appInfo[20];
+static char  crashfilename[MAX_PATH];
+
+void SetCrashFileName(const char *cfile)
+{
+	ASSERT(strlen(cfile) < MAX_PATH);
+	strcpy(crashfilename, cfile);
+}
+
+LONG __stdcall sDumpHandler(LPEXCEPTION_POINTERS ep) {
+	SYSTEMTIME st;
+	GetLocalTime(&st);
+	if(!*crashfilename) {
+		::GetModuleFileName(NULL, crashfilename, 512);
+		wsprintf(crashfilename + strlen(crashfilename), ".%d-%02d-%02d-%02d-%02d-%02d%s.crash",
+			st.wYear, st.wMonth, st.wDay, st.wHour, st.wMinute, st.wSecond, appInfo);
+	}
+	HANDLE file = CreateFile(crashfilename, GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL,
+		CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL|FILE_FLAG_SEQUENTIAL_SCAN, NULL);
+	dword v = 1;
+	Put(file, v);
+	EXCEPTION_RECORD *er = ep->ExceptionRecord;
+	Put(file, er->ExceptionCode);
+	Put(file, er->ExceptionAddress);
+	Put(file, er->NumberParameters);
+	for(int i = 0; i < (int)er->NumberParameters; i++)
+		Put(file, er->ExceptionInformation[i]);
+
+#ifdef CPU_AMD64
+	qword esp = ep->ContextRecord->Rsp;
+#else
+	dword esp = ep->ContextRecord->Esp;
+#endif
+
+	WriteFile(file, (void *) esp, (dword)(sESP - esp), &v, NULL);
+	/*	dword base = ep->ContextRecord->Ebp;
+	for(;;) {
+		dword new_base = *(dword *)base;
+		dword caller = *(dword *)(base + 4);
+		Put(file, caller);
+		if(new_base < base)
+			break;
+		base = new_base;
+	}*/
+	CloseHandle(file);
+	char h[200];
+	sprintf(h, "CRASH: %d-%02d-%02d %02d:%02d:%02d code: 0x%X  address: 0x%p",
+	        st.wYear, st.wMonth, st.wDay, st.wHour, st.wMinute, st.wSecond,
+	        er->ExceptionCode, er->ExceptionAddress);
+	UsrLogT("============ CRASH ================================================");
+	UsrLogT(h);
+	BugLog() << h << "\r\n";
+	return sPrev ? (*sPrev)(ep) : 0 /*EXCEPTION_CONTINUE_SEARCH*/;
+}
+
+void InstallCrashDump(const char *info) {
+	memset(appInfo, 0, sizeof(appInfo));
+	if(info && *info) {
+		appInfo[0] = '.';
+		strncpy(appInfo + 1, info, sizeof(appInfo) - 1);
+		appInfo[sizeof(appInfo) - 1] = '\0';
+	}
+	if(!sPrev) {
+		sPrev = SetUnhandledExceptionFilter(sDumpHandler);
+#ifndef CPU_AMD64
+#ifdef COMPILER_MSC
+		__asm mov sESP, esp
+#else
+	//todo
+#endif
+#endif
+	}
+}
+
+#endif
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/Core/Defs.h b/uppsrc/Core/Defs.h
new file mode 100644
index 000000000..7f3010f58
--- /dev/null
+++ b/uppsrc/Core/Defs.h
@@ -0,0 +1,540 @@
+#ifdef PLATFORM_WIN32
+#define __BREAK__        (*(int *)0 = 0)
+#else
+#define __BREAK__        (*(int *)0 = 0) // kill(getpid(), SIGTRAP)
+#endif
+
+#ifdef COMPILER_MSC
+	#pragma warning(disable : 4800)
+	#pragma warning(disable : 4129)
+	#pragma warning(disable : 4290)
+	#pragma warning(disable : 4068)
+	#pragma warning(disable : 4005)
+	#pragma warning(disable : 4675)
+	#pragma warning(disable : 4996)
+
+	#pragma setlocale("C")
+#endif
+
+bool    IsPanicMode();
+
+void    Panic(const char *msg);
+
+void    AssertFailed(const char *file, int line, const char *cond);
+
+void    InstallPanicMessageBox(void (*mb)(const char *title, const char *text));
+void    PanicMessageBox(const char *title, const char *text);
+
+#define VERIFY(x)        ((x) ? (void)0 : UPP::AssertFailed(__FILE__, __LINE__, #x))
+
+#ifdef _DEBUG
+
+#define ASSERT_(x, msg)  ((x) ? (void)0 : UPP::AssertFailed(__FILE__, __LINE__, msg))
+#define ASSERT(x)        ASSERT_(x, #x)
+
+#else
+
+#define ASSERT_(x, msg)
+#define ASSERT(x)
+
+#endif
+
+#define _cm_  ,
+
+#define __countof(a)          int(sizeof(a) / sizeof(a[0]))
+
+#define __Expand1(x) x(1)
+#define __Expand2(x)  __Expand1(x) x(2)
+#define __Expand3(x)  __Expand2(x) x(3)
+#define __Expand4(x)  __Expand3(x) x(4)
+#define __Expand5(x)  __Expand4(x) x(5)
+#define __Expand6(x)  __Expand5(x) x(6)
+#define __Expand7(x)  __Expand6(x) x(7)
+#define __Expand8(x)  __Expand7(x) x(8)
+#define __Expand9(x)  __Expand8(x) x(9)
+#define __Expand10(x) __Expand9(x) x(10)
+#define __Expand11(x) __Expand10(x) x(11)
+#define __Expand12(x) __Expand11(x) x(12)
+#define __Expand13(x) __Expand12(x) x(13)
+#define __Expand14(x) __Expand13(x) x(14)
+#define __Expand15(x) __Expand14(x) x(15)
+#define __Expand16(x) __Expand15(x) x(16)
+#define __Expand17(x) __Expand16(x) x(17)
+#define __Expand18(x) __Expand17(x) x(18)
+#define __Expand19(x) __Expand18(x) x(19)
+#define __Expand20(x) __Expand19(x) x(20)
+#define __Expand21(x) __Expand20(x) x(21)
+#define __Expand22(x) __Expand21(x) x(22)
+#define __Expand23(x) __Expand22(x) x(23)
+#define __Expand24(x) __Expand23(x) x(24)
+#define __Expand25(x) __Expand24(x) x(25)
+#define __Expand26(x) __Expand25(x) x(26)
+#define __Expand27(x) __Expand26(x) x(27)
+#define __Expand28(x) __Expand27(x) x(28)
+#define __Expand29(x) __Expand28(x) x(29)
+#define __Expand30(x) __Expand29(x) x(30)
+#define __Expand31(x) __Expand30(x) x(31)
+#define __Expand32(x) __Expand31(x) x(32)
+#define __Expand33(x) __Expand32(x) x(33)
+#define __Expand34(x) __Expand33(x) x(34)
+#define __Expand35(x) __Expand34(x) x(35)
+#define __Expand36(x) __Expand35(x) x(36)
+#define __Expand37(x) __Expand36(x) x(37)
+#define __Expand38(x) __Expand37(x) x(38)
+#define __Expand39(x) __Expand38(x) x(39)
+#define __Expand40(x) __Expand39(x) x(40)
+
+#define __Expand(x)   __Expand40(x)
+
+#define __List1(x) x(1)
+#define __List2(x)  __List1(x), x(2)
+#define __List3(x)  __List2(x), x(3)
+#define __List4(x)  __List3(x), x(4)
+#define __List5(x)  __List4(x), x(5)
+#define __List6(x)  __List5(x), x(6)
+#define __List7(x)  __List6(x), x(7)
+#define __List8(x)  __List7(x), x(8)
+#define __List9(x)  __List8(x), x(9)
+#define __List10(x) __List9(x), x(10)
+#define __List11(x) __List10(x), x(11)
+#define __List12(x) __List11(x), x(12)
+#define __List13(x) __List12(x), x(13)
+#define __List14(x) __List13(x), x(14)
+#define __List15(x) __List14(x), x(15)
+#define __List16(x) __List15(x), x(16)
+#define __List17(x) __List16(x), x(17)
+#define __List18(x) __List17(x), x(18)
+#define __List19(x) __List18(x), x(19)
+#define __List20(x) __List19(x), x(20)
+#define __List21(x) __List20(x), x(21)
+#define __List22(x) __List21(x), x(22)
+#define __List23(x) __List22(x), x(23)
+#define __List24(x) __List23(x), x(24)
+#define __List25(x) __List24(x), x(25)
+#define __List26(x) __List25(x), x(26)
+#define __List27(x) __List26(x), x(27)
+#define __List28(x) __List27(x), x(28)
+#define __List29(x) __List28(x), x(29)
+#define __List30(x) __List29(x), x(30)
+#define __List31(x) __List30(x), x(31)
+#define __List32(x) __List31(x), x(32)
+#define __List33(x) __List32(x), x(33)
+#define __List34(x) __List33(x), x(34)
+#define __List35(x) __List34(x), x(35)
+#define __List36(x) __List35(x), x(36)
+#define __List37(x) __List36(x), x(37)
+#define __List38(x) __List37(x), x(38)
+#define __List39(x) __List38(x), x(39)
+#define __List40(x) __List39(x), x(40)
+
+#define E__p(I)       p##I
+
+#define ASSTRING_(x)  #x
+#define ASSTRING(x)   ASSTRING_(x)
+
+#define COMBINE__(a, b)            a##b
+#define COMBINE(a, b)              COMBINE__(a, b)
+
+#define COMBINE3__(a, b, c)        a##b##c
+#define COMBINE3(a, b, c)          COMBINE3__(a, b, c)
+
+#define COMBINE4__(a, b, c, d)     a##b##c##d
+#define COMBINE4(a, b, c, d)       COMBINE4__(a, b, c, d)
+
+#define COMBINE5__(a, b, c, d, e)  a##b##c##d##e
+#define COMBINE5(a, b, c, d, e)    COMBINE5__(a, b, c, d, e)
+
+#define MK__s__(x)       s__s##x
+#define MK__s_(x)        MK__s__(x)
+
+#ifdef  flagBLITZ
+#define MK__s            MK__s_(COMBINE3(BLITZ_INDEX__, _, __LINE__))
+#else
+#define MK__s            MK__s_(__LINE__)
+#endif
+
+#ifdef flagCHECKINIT
+void InitBlockBegin__(const char *fn, int line);
+void InitBlockEnd__(const char *fn, int line);
+#else
+inline void InitBlockBegin__(const char *, int) {}
+inline void InitBlockEnd__(const char *, int) {}
+#endif
+
+struct Callinit {
+	Callinit(void (*fn)(), const char *cpp, int line) { InitBlockBegin__(cpp, line); fn(); InitBlockEnd__(cpp, line); }
+};
+
+struct Callexit {
+	Callexit(void (*fn)()) { atexit(fn); }
+};
+
+
+// deprecated, use INITBLOCK
+#define INITCODE(x) \
+static void COMBINE(MK__s, _fn)() { x } static UPP::Callinit MK__s(COMBINE(MK__s, _fn), __FILE__, __LINE__);
+
+
+#define INITBLOCK \
+static void COMBINE(MK__s, _fn)(); static UPP::Callinit MK__s(COMBINE(MK__s, _fn), __FILE__, __LINE__); \
+static void COMBINE(MK__s, _fn)()
+
+#define INITBLOCK_(x) \
+static void COMBINE(x, _fn)(); static UPP::Callinit x(COMBINE(x, _fn), __FILE__, __LINE__); \
+static void COMBINE(x, _fn)()
+
+
+// deprecated, use EXITBLOCK
+#define EXITCODE(x) \
+static void COMBINE(MK__s, _fn)() { x } static UPP::Callexit MK__s(COMBINE(MK__s, _fn));
+
+
+#define EXITBLOCK \
+static void COMBINE(MK__s, _fn)(); static UPP::Callexit MK__s(COMBINE(MK__s, _fn)); \
+static void COMBINE(MK__s, _fn)()
+
+#define EXITBLOCK_(x) \
+static void COMBINE(x, _fn)(); static UPP::Callexit x(COMBINE(x, _fn)); \
+static void COMBINE(x, _fn)()
+
+#ifdef min
+#undef min
+#endif
+
+#ifdef max
+#undef max
+#endif
+
+template <class T> inline const T& min(const T& a, const T& b) { return a < b ? a : b; }
+template <class T> inline const T& max(const T& a, const T& b) { return a > b ? a : b; }
+
+template <class T>
+inline T minmax(T x, T _min, T _max)                           { return min(max(x, _min), _max); }
+
+typedef unsigned char      byte;
+typedef signed char        int8;
+typedef unsigned char      uint8;
+
+typedef short unsigned     word;
+typedef short int          int16;
+typedef short unsigned     uint16;
+
+#ifdef PLATFORM_WIN32
+typedef unsigned long      dword;
+typedef long               int32;
+typedef unsigned long      uint32;
+typedef WCHAR              wchar;
+#else
+typedef unsigned int       dword;
+typedef int                int32;
+typedef unsigned int       uint32;
+typedef word               wchar;
+#endif
+
+
+#ifdef COMPILER_MSC
+typedef __int64            int64;
+typedef unsigned __int64   uint64;
+#else
+typedef long long int      int64;
+typedef long long unsigned uint64;
+#endif
+
+typedef uint64             qword;
+
+#ifdef COMPILER_MSC
+	#define I64(c) ((int64)COMBINE(c, i64))
+#else
+	#define I64(c) ((int64)COMBINE(c, LL))
+#endif
+
+#ifndef INT64_MIN
+#define INT64_MIN          I64(-0x8000000000000000)
+#endif
+#ifndef INT64_MAX
+#define INT64_MAX          I64(+0x7FFFFFFFFFFFFFFF)
+#endif
+
+#if !defined(PLATFORM_WIN32)
+
+#define HIBYTE(a)        (byte)((a) >> 8)
+#define LOBYTE(a)        byte(a)
+#define HIWORD(a)        (word)((a) >> 16)
+#define LOWORD(a)        word(a)
+
+#define MAKEWORD(a, b)   ((word)  (((byte) (a)) | ((word) ((byte) (b))) << 8))
+#define MAKELONG(a, b)   ((dword) (((word) (a)) | ((dword) ((word) (b))) << 16))
+
+#endif
+
+#define MAKEQWORD(a, b)  ((qword) (((dword) (a)) | ((qword) ((dword) (b))) << 32))
+#define HIDWORD(a)       (dword)((a) >> 32)
+#define LODWORD(a)       dword(a)
+
+#define OFFSETOF(clss, mbr) ((int)(uintptr_t)&(((clss *)1)->mbr) - 1)
+
+#ifdef COMPILER_MSC
+#define pick_
+#else
+#define pick_ const
+#endif
+
+#define init_
+
+#define BINARY(i, f) \
+extern "C" byte *i; \
+extern "C" int COMBINE(i, _length);
+
+#define BINARY_ARRAY(i, x, f) \
+extern "C" byte *i[]; \
+extern "C" int COMBINE(i, _length)[]; \
+extern "C" int COMBINE(i, _count);
+
+#define BINARY_MASK(i, m) \
+extern "C" byte *i[]; \
+extern "C" int COMBINE(i, _length)[]; \
+extern "C" int COMBINE(i, _count); \
+extern "C" char *COMBINE(i, _files)[];
+
+int RegisterTypeNo__(const char *type);
+
+template <class T>
+int RegisterTypeNo___()
+{
+	return RegisterTypeNo__(typeid(T).name());
+}
+
+template <class T>
+inline int StaticTypeNo() {
+	static int typeno = -1;
+	if(typeno < 0)
+		typeno = RegisterTypeNo___<T>();
+	return typeno;
+}
+
+#if defined(flagMT)
+	#if defined(PLATFORM_WIN32) && defined(COMPILER_GCC)
+		#define flagUSEMALLOC //MINGW does not support
+	#endif
+#endif
+
+#ifndef  flagUSEMALLOC
+#define UPP_HEAP
+#endif
+
+#ifdef UPP_HEAP
+
+void *MemoryAllocPermanent(size_t size);
+
+void *MemoryAllocSz(size_t& size);
+void *MemoryAlloc(size_t size);
+void  MemoryFree(void *ptr);
+void *MemoryAlloc32();
+void  MemoryFree32(void *ptr);
+void *MemoryAlloc48();
+void  MemoryFree48(void *ptr);
+void  MemoryFreeThread();
+void  MemoryCheck();
+int   MemoryUsedKb();
+
+
+void  MemoryBreakpoint(dword serial);
+
+void  MemoryInitDiagnostics();
+void  MemoryDumpLeaks();
+
+enum MemoryProbeFlags {
+	MEMORY_PROBE_FULL    = 1,
+	MEMORY_PROBE_FREE    = 2,
+	MEMORY_PROBE_MIXED   = 4,
+	MEMORY_PROBE_LARGE   = 8,
+	MEMORY_PROBE_SUMMARY = 16,
+};
+
+#ifdef HEAPDBG
+void  MemoryIgnoreLeaksBegin();
+void  MemoryIgnoreLeaksEnd();
+
+void  MemoryCheckDebug();
+#else
+inline void  MemoryIgnoreLeaksBegin() {}
+inline void  MemoryIgnoreLeaksEnd() {}
+
+inline void  MemoryCheckDebug() {}
+#endif
+
+struct MemoryProfile {
+	int allocated[1024];
+	int fragmented[1024];
+	int freepages;
+	int large_count;
+	int large_size[1024];
+	int large_total;
+	int large_free_count;
+	int large_free_size[1024];
+	int large_free_total;
+
+	MemoryProfile();
+};
+
+MemoryProfile *PeakMemoryProfile();
+
+#else
+
+inline void  *MemoryAllocPermanent(size_t size)                { return malloc(size); }
+inline void  *MemoryAlloc(size_t size)     { return new byte[size]; }
+inline void  *MemoryAllocSz(size_t &size)  { return new byte[size]; }
+inline void   MemoryFree(void *p)          { delete[] (byte *) p; }
+inline void  *MemoryAlloc32()              { return new byte[32]; }
+inline void  *MemoryAlloc48()              { return new byte[48]; }
+inline void   MemoryFree32(void *ptr)      { delete[] (byte *)ptr; }
+inline void   MemoryFree48(void *ptr)      { delete[] (byte *)ptr; }
+inline void   MemoryInitDiagnostics()      {}
+inline void   MemoryCheck() {}
+inline void   MemoryCheckDebug() {}
+inline int    MemoryUsedKb() { return 0; }
+
+inline void  MemoryIgnoreLeaksBegin() {}
+inline void  MemoryIgnoreLeaksEnd() {}
+
+struct MemoryProfile {
+	int allocated[1024];
+	int fragmented[1024];
+	int freepages;
+	int large_count;
+	int large_size[4096];
+	int large_total;
+	int large_free_count;
+	int large_free_size[4096];
+	int large_free_total;
+
+	MemoryProfile() { memset(this, 0, sizeof(MemoryProfile)); }
+};
+
+inline MemoryProfile *PeakMemoryProfile() { return NULL; }
+
+#endif
+
+struct MemoryIgnoreLeaksBlock {
+	MemoryIgnoreLeaksBlock()  { MemoryIgnoreLeaksBegin(); }
+	~MemoryIgnoreLeaksBlock() { MemoryIgnoreLeaksEnd(); }
+};
+
+#ifdef CPU_X86
+bool CpuMMX();
+bool CpuSSE();
+bool CpuSSE2();
+bool CpuSSE3();
+#endif
+
+int  CPU_Cores();
+
+bool IsDecentMachine();
+
+template <class T>
+inline void Swap(T& a, T& b) { T tmp = a; a = b; b = tmp; }
+
+#if defined(CPU_UNALIGNED) && defined(CPU_LE)
+inline int    Peek16le(const void *ptr)  { return *(const word *)ptr; }
+inline int    Peek32le(const void *ptr)  { return *(const dword *)ptr; }
+inline int64  Peek64le(const void *ptr)  { return *(const int64 *)ptr; }
+
+inline void   Poke16le(const void *ptr, int val)    { *(word *)ptr = val; }
+inline void   Poke32le(const void *ptr, int val)    { *(dword *)ptr = val; }
+inline void   Poke64le(const void *ptr, int64 val)  { *(int64 *)ptr = val; }
+#else
+inline int    Peek16le(const void *ptr)  { return MAKEWORD(((byte *)ptr)[0], ((byte *)ptr)[1]); }
+inline int    Peek32le(const void *ptr)  { return MAKELONG(Peek16le(ptr), Peek16le((byte *)ptr + 2)); }
+inline int64  Peek64le(const void *ptr)  { return MAKEQWORD(Peek32le(ptr), Peek32le((byte *)ptr + 4)); }
+
+inline void   Poke16le(const void *ptr, int val)    { ((byte *)ptr)[0] = LOBYTE(val); ((byte *)ptr)[1] = HIBYTE(val); }
+inline void   Poke32le(const void *ptr, int val)    { Poke16le(ptr, LOWORD(val)); Poke16le((byte *)ptr + 2, HIWORD(val)); }
+inline void   Poke64le(const void *ptr, int64 val)  { Poke32le(ptr, LODWORD(val)); Poke32le((byte *)ptr + 4, HIDWORD(val)); }
+#endif
+
+inline int    Peek16be(const void *ptr)  { return MAKEWORD(((byte *)ptr)[1], ((byte *)ptr)[0]); }
+inline int    Peek32be(const void *ptr)  { return MAKELONG(Peek16be((byte *)ptr + 2), Peek16be(ptr)); }
+inline int64  Peek64be(const void *ptr)  { return MAKEQWORD(Peek32be((byte *)ptr + 4), Peek32be(ptr)); }
+
+inline void   Poke16be(const void *ptr, int val)    { ((byte *)ptr)[1] = LOBYTE(val); ((byte *)ptr)[0] = HIBYTE(val); }
+inline void   Poke32be(const void *ptr, int val)    { Poke16be(ptr, HIWORD(val)); Poke16be((byte *)ptr + 2, LOWORD(val)); }
+inline void   Poke64be(const void *ptr, int64 val)  { Poke32be(ptr, HIDWORD(val)); Poke32be((byte *)ptr + 4, LODWORD(val)); }
+
+#if defined(CPU_X86) && (defined(COMPILER_GCC) || defined(COMPILER_MSC))
+#ifdef COMPILER_GCC
+#ifdef CPU_64
+inline word   SwapEndian16(word v)    { __asm__("xchgb %b0,%h0" : "=Q" (v) :  "0" (v)); return v; }
+inline int16  SwapEndian16(int16 v)   { __asm__("xchgb %b0,%h0" : "=Q" (v) :  "0" (v)); return v; }
+#else
+inline word   SwapEndian16(word v)    { __asm__("xchgb %b0,%h0" : "=q" (v) :  "0" (v)); return v; }
+inline int16  SwapEndian16(int16 v)   { __asm__("xchgb %b0,%h0" : "=q" (v) :  "0" (v)); return v; }
+#endif
+inline dword  SwapEndian32(dword v)   { __asm__("bswap %0" : "=r" (v) : "0" (v)); return v; }
+inline int    SwapEndian32(int v)     { __asm__("bswap %0" : "=r" (v) : "0" (v)); return v; }
+#endif
+
+#ifdef COMPILER_MSC
+inline word   SwapEndian16(word v)    { return _byteswap_ushort(v); }
+inline int16  SwapEndian16(int16 v)   { return _byteswap_ushort(v); }
+inline dword  SwapEndian32(dword v)   { return _byteswap_ulong(v); }
+inline int    SwapEndian32(int v)     { return _byteswap_ulong(v); }
+#endif
+
+inline void   EndianSwap(word& v)     { v = SwapEndian16(v); }
+inline void   EndianSwap(int16& v)    { v = SwapEndian16(v); }
+inline void   EndianSwap(dword& v)    { v = SwapEndian32(v); }
+inline void   EndianSwap(int& v)      { v = SwapEndian32(v); }
+
+#else
+inline void   EndianSwap(word& v)     { byte *x = (byte *)(&v); Swap(x[0], x[1]); }
+inline void   EndianSwap(int16& v)    { EndianSwap(*(word *)&v); }
+inline void   EndianSwap(dword& v)    { byte *x = (byte *)&v; Swap(x[0], x[3]); Swap(x[1], x[2]); }
+inline void   EndianSwap(int& v)      { EndianSwap(*(dword *)&v); }
+inline word   SwapEndian16(word v)    { EndianSwap(v); return v; }
+inline int16  SwapEndian16(int16 v)   { EndianSwap(v); return v; }
+inline dword  SwapEndian32(dword v)   { EndianSwap(v); return v; }
+inline int    SwapEndian32(int v)     { EndianSwap(v); return v; }
+#endif
+
+#if defined(CPU_AMD64) && (defined(COMPILER_GCC) || defined(COMPILER_MSC))
+#ifdef COMPILER_GCC
+inline uint64  SwapEndian64(uint64 v) { __asm__("bswap %0" : "=r" (v) : "0" (v)); return v; }
+inline int64   SwapEndian64(int64 v)  { __asm__("bswap %0" : "=r" (v) : "0" (v)); return v; }
+#endif
+#ifdef COMPILER_MSC
+inline uint64  SwapEndian64(uint64 v) { return _byteswap_uint64(v); }
+inline int64   SwapEndian64(int64 v)  { return _byteswap_uint64(v); }
+#endif
+
+inline void   EndianSwap(int64& v)    { v = SwapEndian64(v); }
+inline void   EndianSwap(uint64& v)   { v = SwapEndian64(v); }
+
+#else
+inline void   EndianSwap(int64& v)    { byte *x = (byte *)&v; Swap(x[0], x[7]); Swap(x[1], x[6]); Swap(x[2], x[5]); Swap(x[3], x[4]); }
+inline void   EndianSwap(uint64& v)   { EndianSwap(*(int64 *)&v); }
+inline int64  SwapEndian64(int64 v)   { EndianSwap(v); return v; }
+inline uint64 SwapEndian64(uint64 v)  { EndianSwap(v); return v; }
+#endif
+
+void EndianSwap(word *v, int count);
+void EndianSwap(int16 *v, int count);
+void EndianSwap(dword *v, int count);
+void EndianSwap(int *v, int count);
+void EndianSwap(int64 *v, int count);
+void EndianSwap(uint64 *v, int count);
+
+//Quick fix....
+#ifdef PLATFORM_WINCE
+const char *FromSysChrSet(const wchar *s);
+const wchar *ToSysChrSet(const char *s);
+#else
+inline const char *FromSysChrSet(const char *s) { return s; }
+inline const char *ToSysChrSet(const char *s) { return s; }
+#endif
+
+#ifdef _DEBUG
+void __LOGF__(const char *format, ...);
+#define LOGF             UPP::__LOGF__
+#else
+inline void __LOGF__(const char *format, ...);
+#endif
diff --git a/uppsrc/Core/Diag.h b/uppsrc/Core/Diag.h
new file mode 100644
index 000000000..a42d489d2
--- /dev/null
+++ b/uppsrc/Core/Diag.h
@@ -0,0 +1,231 @@
+
+const char LOG_BEGIN = '\1';
+const char LOG_END = '\2';
+
+class LogStream : public Stream {
+#ifdef PLATFORM_WIN32
+	HANDLE hfile;
+#endif
+#ifdef PLATFORM_POSIX
+	enum { INVALID_HANDLE_VALUE = -1 };
+	int   hfile;
+#endif
+
+	CriticalSection cs;
+	char  filename[512];
+	char  backup[512];
+	byte  buffer[512];
+	int   filesize;
+	byte *p;
+
+	int   sizelimit;
+	int   part;
+	dword options;
+	int16 depth;
+	bool  bol;
+
+	void  Flush();
+	void  Put0(int w);
+
+protected:
+	virtual void    _Put(int w);
+	virtual void    _Put(const void *data, dword size);
+	virtual int64   GetSize() const { return filesize; }
+
+public:
+	virtual   bool  IsOpen() const;
+	void            Create(const char *path, bool append);
+	void            SetLimit(int maxsize)                    { sizelimit = maxsize; }
+
+	void            SetOptions(dword _options)               { options = _options; }
+
+	bool            Delete();
+	void            Close();
+
+	LogStream();
+	~LogStream();
+};
+
+void     ActivateUsrLog();
+void     ActivatePersistentUsrLog();
+bool     IsUsrLog();
+Stream&  UsrLog();
+Stream&  UsrLog(const char *line);
+Stream&  UsrLogT(const char *line);
+Stream&  UsrLogT(int indent, const char *line);
+void     DeleteUsrLog();
+
+Stream&  BugLog();
+void     DeactivateBugLog();
+
+Stream&  StdLog();
+enum LogOptions {
+	LOG_FILE = 1, LOG_COUT = 2, LOG_CERR = 4, LOG_DBG = 8
+};
+void     StdLogSetup(dword options);
+
+Stream&  VppLog();
+void     SetVppLog(Stream& log);
+void     SetVppLogName(const String& file);
+void     SetVppLogSizeLimit(int filesize);
+void     SetVppLogNoDeleteOnStartup();
+
+void     HexDump(Stream& s, const void *ptr, int size, int maxsize = INT_MAX);
+
+int      msecs(int from = 0);
+
+String        GetTypeName(const char *type_name);
+inline String GetTypeName(const ::std::type_info& tinfo)   { return GetTypeName(tinfo.name()); }
+
+void __LOGF__(const char *format, ...);
+
+#ifdef _MULTITHREADED
+void LockLog();
+void UnlockLog();
+#else
+inline void LockLog() {}
+inline void UnlockLog() {}
+#endif
+
+#ifdef _DEBUG
+
+#define _DBG_
+
+#define DEBUGCODE(x)     x
+
+#define LOG(a)           UPP::LockLog(), UPP::VppLog() << a << EOL, UPP::UnlockLog()
+#define LOGF             UPP::__LOGF__
+#define LOGBEGIN()       UPP::LockLog(), UPP::VppLog() << LOG_BEGIN
+#define LOGEND()         UPP::VppLog() << LOG_END, UPP::UnlockLog()
+#define LOGBLOCK(n)      RLOGBLOCK(n)
+#define LOGHEXDUMP(s, a) UPP::HexDump(VppLog(), s, a)
+#define QUOTE(a)         { LOG(#a); a; }
+#define LOGSRCPOS()      UPP::LockLog(), UPP::VppLog() << __FILE__ << '#' << __LINE__ << EOL, UPP::UnlockLog()
+#define DUMP(a)          UPP::LockLog(), UPP::VppLog() << #a << " = " << (a) << EOL, UPP::UnlockLog()
+#define DUMPC(c)         UPP::LockLog(), UPP::DumpContainer(VppLog() << #c << ':' << EOL, (c)), UPP::UnlockLog()
+#define DUMPCC(c)        UPP::LockLog(), UPP::DumpContainer2(VppLog() << #c << ':' << EOL, (c)), UPP::UnlockLog()
+#define DUMPCCC(c)       UPP::LockLog(), UPP::DumpContainer3(VppLog() << #c << ':' << EOL, (c)), UPP::UnlockLog()
+#define XASSERT(c, d)    if(!bool(c)) { LOG("XASSERT failed"); LOGSRCPOS(); LOG(d); ASSERT(0); } else
+#define NEVER()          ASSERT(0)
+#define XNEVER(d)        if(1) { LOG("NEVER failed"); LOGSRCPOS(); LOG(d); ASSERT(0); } else
+#define CHECK(c)         if(!bool(c)) { ASSERT(0); } else
+#define XCHECK(c, d)     if(!bool(c)) { LOG("XCHECK failed"); LOGSRCPOS(); LOG(d); ASSERT(0); } else
+
+#define TIMING(x)        RTIMING(x)
+#define HITCOUNT(x)      RHITCOUNT(x)
+#define ACTIVATE_TIMING()    UPP::TimingInspector::Activate(true);
+#define DEACTIVATE_TIMING()  UPP::TimingInspector::Activate(false);
+
+#define DLOG(x)          LOG(x)
+#define DDUMP(x)         DUMP(x)
+#define DDUMPC(x)        DUMPC(x)
+
+#else
+
+#define DLOG(x)          @ // To clean logs after debugging, this produces error in release mode
+#define DDUMP(x)         @
+#define DDUMPC(x)        @
+
+#define ASSERT(x)
+
+#define DEBUGCODE(x)
+
+inline void LOGF(const char *format, ...) {}
+
+#define LOG(a)
+#define LOGBEGIN()
+#define LOGEND()
+#define LOGBLOCK(n)
+#define LOGHEXDUMP(s, a)
+#define QUOTE(a)         a
+#define LOGSRCPOS()
+#define DUMP(a)
+#define DUMPC(a)
+#define DUMPCC(a)
+#define DUMPCCC(a)
+#define XASSERT(c, d)
+#define NEVER()
+#define XNEVER(d)
+#define CHECK(c)         (c)
+#define XCHECK(c, d)     (c)
+
+#define TIMING(x)
+#define HITCOUNT(x)
+#define ACTIVATE_TIMING()
+#define DEACTIVATE_TIMING()
+
+#endif
+
+struct DebugLogBlock
+{
+	DebugLogBlock(const char *name) : name(name) { VppLog() << name << EOL << LOG_BEGIN; }
+	~DebugLogBlock()                             { VppLog() << LOG_END << "//" << name << EOL; }
+	const char *name;
+};
+
+#define RLOG(a)           UPP::LockLog(), UPP::VppLog() << a << EOL, UPP::UnlockLog()
+#define RLOGBEGIN()       UPP::LockLog(), UPP::VppLog() << LOG_BEGIN
+#define RLOGEND()         UPP::VppLog() << LOG_END, UPP::UnlockLog()
+#define RLOGBLOCK(n)      UPP::DebugLogBlock MK__s(n)
+#define RLOGHEXDUMP(s, a) UPP::HexDump(UPP::VppLog(), s, a)
+#define RQUOTE(a)         { LOG(#a); a; }
+#define RLOGSRCPOS()      UPP::LockLog(), UPP::VppLog() << __FILE__ << '#' << __LINE__ << EOL
+#define RDUMP(a)          UPP::LockLog(), UPP::VppLog() << #a << " = " << (a) << EOL, UPP::UnlockLog()
+#define RDUMPC(c)         UPP::LockLog(), UPP::DumpContainer(UPP::VppLog() << #c << ':' << EOL, (c)), UPP::UnlockLog()
+
+// Crash support
+
+void InstallCrashDump(const char *app_info = NULL);
+void SetCrashFileName(const char *cfile);
+
+// Dumping templates
+
+template <class T>
+void DumpContainer(Stream& s, T ptr, T end) {
+	int i = 0;
+	s << LOG_BEGIN;
+	while(ptr != end)
+		s << '[' << i++ << "] = " << *ptr++ << EOL;
+	s << LOG_END;
+}
+
+template <class C>
+void DumpContainer(Stream& s, const C& c) {
+	DumpContainer(s, c.Begin(), c.End());
+}
+
+template <class T>
+void DumpContainer2(Stream& s, T ptr, T end) {
+	int i = 0;
+	s << LOG_BEGIN;
+	while(ptr != end) {
+		s << '[' << i++ << "] =" << EOL;
+		DumpContainer(s, (*ptr).Begin(), (*ptr).End());
+		ptr++;
+	}
+	s << LOG_END;
+}
+
+template <class C>
+void DumpContainer2(Stream& s, const C& c) {
+	DumpContainer2(s, c.Begin(), c.End());
+}
+
+template <class T>
+void DumpContainer3(Stream& s, T ptr, T end) {
+	int i = 0;
+	s << LOG_BEGIN;
+	while(ptr != end) {
+		s << '[' << i++ << "] =" << EOL;
+		DumpContainer2(s, (*ptr).Begin(), (*ptr).End());
+		ptr++;
+	}
+	s << LOG_END;
+}
+
+template <class C>
+void DumpContainer3(Stream& s, const C& c) {
+	DumpContainer3(s, c.Begin(), c.End());
+}
+
+String AsString(MemoryProfile& mem);
diff --git a/uppsrc/Core/Dli.cpp b/uppsrc/Core/Dli.cpp
new file mode 100644
index 000000000..f64fd933e
--- /dev/null
+++ b/uppsrc/Core/Dli.cpp
@@ -0,0 +1,232 @@
+#include "Core.h"
+
+#ifdef PLATFORM_WIN32
+typedef HMODULE DLLHANDLE;
+#else
+typedef void   *DLLHANDLE;
+#endif
+
+#define LLOG(x)
+
+#ifdef PLATFORM_WIN32
+
+#include <winnt.h>
+
+NAMESPACE_UPP
+
+class PeFile
+{
+public:
+	PeFile(const char *data = 0) { Open(data); }
+
+	bool                        Open(const char *data);
+
+	int                         GetExportCount() const;
+	const char                 *GetExport(int index) const;
+	const char                 *FindExportRaw(const char *name, bool case_sensitive = true) const;
+
+	int                         GetSectionIndex(const char *name) const;
+
+private:
+	const char                 *data;
+	const IMAGE_NT_HEADERS     *headers;
+	const IMAGE_SECTION_HEADER *sections;
+	const IMAGE_EXPORT_DIRECTORY *exports;
+};
+
+bool PeFile::Open(const char *_data)
+{
+	data = _data;
+	if(!data || data[0] != 'M' || data[1] != 'Z')
+		return false;
+	int pe = Peek32le(data + 0x3C);
+	if(IsBadReadPtr(data + pe, sizeof(IMAGE_NT_HEADERS)))
+		return false;
+	if(memcmp(data + pe, "PE\0\0", 4))
+		return false;
+	headers = (const IMAGE_NT_HEADERS *)(data + pe);
+	sections = (const IMAGE_SECTION_HEADER *)(headers + 1);
+	exports = (const IMAGE_EXPORT_DIRECTORY *)(data
+		+ headers->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_EXPORT].VirtualAddress);
+	return true;
+}
+
+int PeFile::GetSectionIndex(const char *name) const
+{
+	for(int i = 0, n = headers->FileHeader.NumberOfSections; i < n; i++)
+		if(!strcmp((const char *)sections[i].Name, name))
+			return i;
+	return -1;
+}
+
+int PeFile::GetExportCount() const
+{
+	return exports ? exports->NumberOfNames : 0;
+}
+
+const char *PeFile::GetExport(int index) const
+{
+	if(!exports || index < 0 || index >= (int) exports->NumberOfNames)
+		return 0;
+	return data + ((const dword *)(data + (dword)exports->AddressOfNames))[index];
+}
+
+static bool EqualMem(const char *a, const char *b, int len, bool case_sensitive)
+{
+	if(case_sensitive)
+		return !memcmp(a, b, len);
+	else
+		return !MemICmp(a, b, len);
+}
+
+const char *PeFile::FindExportRaw(const char *name, bool case_sensitive) const
+{
+	if(!exports || !name || !*name)
+		return 0;
+	int len = (int)strlen(name);
+	const dword *pnames = (const dword *)(data + (dword)exports->AddressOfNames);
+	for(int i = 0; i < (int) exports->NumberOfNames; i++) {
+		const char *exp = data + pnames[i];
+		int elen = (int)strlen(exp);
+		if(elen < len)
+			continue;
+		if(elen == len && EqualMem(exp, name, len, case_sensitive))
+			return exp;
+		if(EqualMem(exp, name, len, case_sensitive) && exp[len] == '@')
+			return exp;
+		if(exp[0] == '_' && EqualMem(exp + 1, name, len, case_sensitive)
+			&& (exp[len + 1] == '@' || exp[len + 1] == 0))
+			return exp;
+	}
+	return 0;
+}
+
+END_UPP_NAMESPACE
+
+HMODULE CheckDll__(const char *fn, const char *const *names, UPP::Vector<void *>& plist)
+{
+#ifdef PLATFORM_WINCE
+	HMODULE hmod = LoadLibrary(UPP::ToSysChrSet(fn));
+#else
+	HMODULE hmod = LoadLibrary(fn);
+#endif
+	if(!hmod)
+		return 0;
+
+	UPP::PeFile pe;
+	if(!pe.Open((const char *)hmod)) {
+		FreeLibrary(hmod);
+		return 0;
+	}
+
+	int missing = 0;
+	for(const char *const *p = names; *p; p++) {
+		const char *exp = *p;
+		bool optional = (*exp == '?');
+		if(optional) exp++;
+		const char *name = pe.FindExportRaw(exp);
+		void *proc = 0;
+#ifdef PLATFORM_WINCE
+		if(!name || !(proc = (void *)GetProcAddress(hmod, UPP::ToSysChrSet(name))))
+#else
+		if(!name || !(proc = (void *)GetProcAddress(hmod, name)))
+#endif
+			if(!optional) {
+				if(!missing) {
+					LLOG(fn << " missing exports:");
+				}
+				LLOG(exp);
+				missing++;
+			}
+		plist.Add(proc);
+	}
+	if(missing) {
+		LLOG(missing << " total");
+		FreeLibrary(hmod);
+		return 0;
+	}
+	return hmod;
+}
+
+void FreeDll__(HMODULE hmod)
+{
+	FreeLibrary(hmod);
+}
+
+#endif
+
+#ifdef PLATFORM_POSIX
+
+#include <dlfcn.h>
+
+void *CheckDll__(const char *fn, const char *const *names, UPP::Vector<void *>& plist)
+{
+
+	void *hmod = dlopen(fn, RTLD_LAZY | RTLD_GLOBAL);
+	if(!hmod) {
+		LLOG("Error loading library " << fn << ": " << dlerror());
+/*
+		for(int i = 0; i < 100; i++) {
+			hmod = dlopen(fn + ("." + UPP::AsString(i)), RTLD_LAZY | RTLD_GLOBAL);
+			if(hmod)
+				break;
+		}
+		if(!hmod)
+*/			return 0;
+	}
+
+	int missing = 0;
+	for(const char *const *p = names; *p; p++) {
+		const char *exp = *p;
+		bool optional = (*exp == '?');
+		if(optional) exp++;
+		void *proc = dlsym(hmod, exp);
+		if(!proc && !optional) {
+			if(!missing)
+				LLOG(fn << " missing exports:");
+			LLOG(exp);
+		}
+		plist.Add(proc);
+	}
+
+	if(missing) {
+		LLOG(missing << " missing symbols total");
+		dlclose(hmod);
+		return 0;
+	}
+
+	return hmod;
+}
+
+void FreeDll__(void *hmod)
+{
+	if(hmod)
+		dlclose(hmod);
+}
+
+#endif//PLATFORM_POSIX
+
+DLLHANDLE LoadDll__(UPP::String& inoutfn, const char *const *names, void *const *procs)
+{
+	const char *fn = inoutfn;
+	while(*fn) {
+		const char *b = fn;
+		while(*fn && *fn != ';'
+#ifndef PLATFORM_WIN32
+			&& *fn != ':'
+#endif
+		)
+			fn++;
+		UPP::String libname(b, fn);
+		if(*fn)
+			fn++;
+		UPP::Vector<void *> plist;
+		if(DLLHANDLE hmod = CheckDll__(libname, names, plist)) {
+			for(int i = 0; i < plist.GetCount(); i++)
+				*(void **)*procs++ = plist[i];
+			inoutfn = libname;
+			return hmod;
+		}
+	}
+	return 0;
+}
diff --git a/uppsrc/Core/Format.cpp b/uppsrc/Core/Format.cpp
new file mode 100644
index 000000000..8eb4c0cbd
--- /dev/null
+++ b/uppsrc/Core/Format.cpp
@@ -0,0 +1,1142 @@
+#include "Core.h"
+//#BLITZ_APPROVE
+#include <float.h>
+
+NAMESPACE_UPP
+
+// Old format ---------------------------
+
+String  VFormat(const char *fmt, va_list ptr) {
+	int limit = 2 * (int)strlen(fmt) + 1024;
+	Buffer<char> buffer(limit);
+	vsprintf(buffer, fmt, ptr);
+	va_end(ptr);
+	int len = (int)strlen(buffer);
+	ASSERT(len <= limit);
+	return String(buffer, len);
+}
+
+// Formatting routines ---------------------------
+
+String FormatIntBase(int i, int base, int width, char lpad, int sign)
+{
+	enum { BUFFER = sizeof(int) * 8 + 1 };
+	ASSERT(base >= 2 && base <= 36);
+	char buffer[BUFFER];
+	char *const e = buffer + (int)BUFFER;
+	char *p = e;
+	static const char itoc[] = "0123456789abcdefghijklmnopqrstuvwxyz";
+	ASSERT(__countof(itoc) == 37);
+	if(sign < 0 || !IsNull(i))
+	{
+		unsigned x = i;
+		if(sign >= 0 && i < 0)
+			x = -i;
+		do
+			*--p = itoc[x % base];
+		while(x /= base);
+	}
+	bool minus = (sign >= 0 && i < 0 && !IsNull(i));
+	bool do_sign = (sign > 0 || sign >= 0 && minus);
+	if(do_sign && lpad != '0')
+		*--p = (minus ? '-' : '+');
+	if(width > e - p)
+	{
+		char *b = e - min<int>(width, BUFFER);
+		while(p > b)
+			*--p = lpad;
+	}
+	if(do_sign && lpad == '0')
+		*--p = (minus ? '-' : '+');
+	int dwd = (int)(e - p);
+	int pad = (width = max(width, dwd)) - dwd;
+	StringBuffer out(width);
+	char *o = out;
+	if(dwd < width)
+		memset(o, lpad, pad);
+	memcpy(o + pad, p, dwd);
+	return out;
+}
+
+String FormatInt(int i)
+{
+	return FormatIntBase(i, 10, 0, ' ', 0);
+}
+
+String FormatIntDec(int i, int width, char lpad, bool always_sign)
+{
+	return FormatIntBase(i, 10, width, lpad, always_sign ? 1 : 0);
+}
+
+String FormatIntHex(int i, int width, char lpad)
+{
+	return FormatIntBase(i, 16, width, lpad, -1);
+}
+
+String FormatIntOct(int i, int width, char lpad)
+{
+	return FormatIntBase(i, 8, width, lpad, -1);
+}
+
+String FormatIntAlpha(int i, bool upper)
+{
+	if(IsNull(i) || i == 0)
+		return Null;
+	String out;
+	if(i < 0)
+	{
+		out << '-';
+		i = -i;
+	}
+	char temp[10], *p = temp;
+	i--;
+	char start = (upper ? 'A' : 'a');
+	do
+		*p++ = start + (i % 26);
+	while(i /= 26);
+	while(p > temp)
+		out << *--p;
+	return out;
+}
+
+String FormatIntRoman(int i, bool upper)
+{
+	if(IsNull(i) || i == 0)
+		return Null;
+
+	String out;
+	if(i < 0)
+	{
+		out << '-';
+		i = -i;
+	}
+	int m = i / 1000;
+	if(m)
+	{
+		out.Cat('M', m);
+		i -= 1000 * m;
+	}
+
+	char shift = upper ? 0 : 'a' - 'A';
+	static const int  value[] =  { 1000, 500, 100, 50,  10,  5,   1 };
+	static const char letter[] = { 'M',  'D', 'C', 'L', 'X', 'V', 'I' };
+	for(int n = 0; i && n < __countof(value); n++)
+	{
+		int v = value[n];
+		while(i >= v)
+		{
+			out << (char)(letter[n] + shift);
+			i -= v;
+		}
+		if(n < __countof(value) - 1)
+			for(int j = n + (value[n + 1] * 2 >= v ? 2 : 1); j < __countof(value); j++)
+				if(i >= v - value[j])
+				{ // subtraction scheme
+					out << (char)(letter[j] + shift) << (char)(letter[n] + shift);
+					i -= v - value[j];
+					break;
+				}
+	}
+	return out;
+}
+
+String Format64(uint64 a)
+{
+	char b[50];
+	char *p = b + 50;
+	do {
+		*--p = char(a % 10 + '0');
+		a /= 10;
+	}
+	while(a);
+	return String(p, b + 50);
+}
+
+String Format64Hex(uint64 a)
+{
+	char b[50];
+	char *p = b + 50;
+	do {
+		*--p = "0123456789abcdef"[a & 15];
+		a >>= 4;
+	}
+	while(a);
+	return String(p, b + 50);
+}
+
+String FormatInteger(int a)            { return IsNull(a) ? String() : FormatInt(a); }
+String FormatUnsigned(unsigned long a) { return Sprintf("%u", a); }
+String FormatDouble(double a)          { return IsNull(a) ? String() : FormatDouble(a, 10, FD_REL); }
+String FormatBool(bool a)              { return a ? "true" : "false"; }
+String FormatPtr(const void *p)        { return "0x" + FormatHex(p); }
+
+String FormatInt64(int64 a)
+{
+	return IsNull(a) ? String() : a < 0 ? "-" + Format64(-a) : Format64(a);
+}
+
+static char *PutDigits(char *out, unsigned number, int count)
+{
+	char temp[10];
+	char *t = temp;
+	do
+		*t++ = number % 10 + '0';
+	while(number /= 10);
+	ASSERT(t - temp <= __countof(temp));
+	if((count -= (int)(t - temp)) > 0)
+	{
+		char *e = out + count;
+		while(out < e)
+			*out++ = '0';
+	}
+	while(t > temp)
+		*out++ = *--t;
+	return out;
+}
+
+enum { DBL_DIGITS = (int)(DBL_MANT_DIG * M_LN2 / M_LN10) + 2 };
+
+String FormatDoubleDigits(double d, int raw_digits, int flags, int& exponent)
+{
+	if(IsNull(d))
+	{
+		exponent = Null;
+		return Null;
+	}
+	d = fabs(normalize(d, exponent));
+	if(IsNull(exponent))
+		return "0";
+	int digits = raw_digits + (flags & FD_REL ? 0 : exponent + 1);
+	int count = minmax<int>(digits, 1, DBL_DIGITS - 2);
+	Buffer<char> buffer(max(digits, 0) + 10);
+	char *p = buffer;
+	if(count == 0)
+		d /= 10;
+	else
+	{
+		static double powtbl[] = { 1e0, 1e1, 1e2, 1e3, 1e4 };
+		int part1 = min(count, 5);
+		unsigned i = (unsigned)(d * powtbl[part1 - 1]);
+		p = PutDigits(p, i, 0);
+		d = double((long double)d * (long double)powtbl[part1 - 1] - i);
+		count -= part1;
+		while(count >= 4)
+		{
+			i = minmax<unsigned>(0, (unsigned)(d * 10000), 9999);
+			p = PutDigits(p, i, 4);
+			d = double((long double)d * (long double)10000 - i);
+			count -= 4;
+		}
+		if(count > 0)
+		{
+			i = (unsigned)(d * powtbl[count]);
+			p = PutDigits(p, i, count);
+			d = d * powtbl[count] - i;
+		}
+	}
+	if(p - ~buffer < DBL_DIGITS && d >= 0.5)
+	{ // round
+		while(p > ~buffer && p[-1] == '9')
+			p--;
+		if(p == ~buffer)
+		{
+			*p++ = '1';
+			exponent++;
+			if(!(flags & FD_REL))
+				digits++;
+		}
+		else
+			p[-1]++;
+	}
+	if(flags & FD_ZERO)
+	{
+		char *e = p;
+		while(e > ~buffer && e[-1] == '0')
+			e--;
+		if(e == buffer)
+			exponent = Null;
+		e = ~buffer + digits;
+		while(p < e)
+			*p++ = '0';
+	}
+	else
+	{
+		while(p > ~buffer && p[-1] == '0')
+			p--;
+		if(p == ~buffer)
+		{
+			exponent = Null;
+			*p++ = '0';
+		}
+	}
+	return String(~buffer, (int)(p - ~buffer));
+}
+
+String FormatDouble(double d, int digits, int flags, int pad_exp)
+{
+	if(IsNull(d))
+		return Null;
+
+	double ad = fabs(d);
+	bool is_exp = (flags & FD_EXP);
+	if(!(flags & FD_FIX))
+	{
+		is_exp = ad && (ad <= 1e-15 || ad >= 1e15);
+		if(flags & FD_REL)
+		{
+			double bd = ipow10(2 * digits);
+			if(ad && (ad * bd <= 1 || ad >= bd))
+				is_exp = true;
+		}
+	}
+	if(is_exp)
+		return FormatDoubleExp(d, digits, flags, pad_exp);
+	else
+		return FormatDoubleFix(d, digits, flags);
+}
+
+String FormatDoubleFix(double d, int digits, int flags)
+{
+	if(IsNull(d))
+		return Null;
+	int exp;
+	String dig = FormatDoubleDigits(d, digits, flags, exp);
+	if(flags & FD_REL)
+		digits = max(0, digits - Nvl(exp, 0) - 1);
+	String out;
+	if(flags & FD_SIGN || d < 0 && !IsNull(exp))
+		out.Cat(d >= 0 ? '+' : '-');
+	if(IsNull(exp) || exp < -digits)
+	{
+		out.Cat('0');
+		if(flags & FD_ZERO)
+		{
+			out.Cat('.');
+			out.Cat('0', digits);
+		}
+	}
+	else if(exp < 0)
+	{
+		out.Cat("0.");
+		out.Cat('0', -1 - exp);
+		int fill = digits + exp + 1;
+		if(!(flags & FD_ZERO) || dig.GetLength() >= fill)
+			out.Cat(dig, min(fill, dig.GetLength()));
+		else
+		{
+			out.Cat(dig);
+			out.Cat('0', fill - dig.GetLength());
+		}
+	}
+	else if(exp < dig.GetLength())
+	{
+		out.Cat(dig, ++exp);
+		if(digits > 0 && ((flags & FD_ZERO) || dig.GetLength() > exp))
+		{
+			out.Cat('.');
+			if(!(flags & FD_ZERO) || dig.GetLength() - exp >= digits)
+				out.Cat(dig.Begin() + exp, min(dig.GetLength() - exp, digits));
+			else
+			{
+				out.Cat(dig.Begin() + exp, dig.GetLength() - exp);
+				out.Cat('0', digits - (dig.GetLength() - exp));
+			}
+		}
+	}
+	else
+	{
+		out.Cat(dig);
+		out.Cat('0', exp - dig.GetLength() + 1);
+		if(digits > 0 && (flags & FD_ZERO))
+		{
+			out.Cat('.');
+			out.Cat('0', digits);
+		}
+	}
+	return out;
+}
+
+String FormatDoubleExp(double d, int digits, int flags, int fill_exp)
+{
+	if(IsNull(d))
+		return Null;
+	int exp;
+	String dig = FormatDoubleDigits(d, digits, flags | FD_REL, exp);
+	exp = Nvl(exp, 0);
+	String out;
+	if(flags & FD_SIGN || d < 0 && !IsNull(exp))
+		out.Cat(d >= 0 ? '+' : '-');
+	out.Cat(dig[0]);
+	if(dig.GetLength() > 1)
+	{
+		out.Cat('.');
+		out.Cat(dig.Begin() + 1, dig.GetLength() - 1);
+	}
+	out.Cat(flags & FD_CAP_E ? 'E' : 'e');
+	out.Cat(FormatIntDec(exp, fill_exp, '0', flags & FD_SIGN_EXP));
+	return out;
+}
+
+String FormatDate(Date date, const char *format, int language)
+{
+	if(IsNull(date))
+		return Null;
+	if(!format || !*format)
+		return Format(date);
+	return FormatTime(ToTime(date), format, language);
+}
+
+String FormatTime(Time t, const char *s, int language)
+{
+	if(IsNull(t))
+		return Null;
+	String result;
+	if(!s || !*s)
+		return Format(t);
+	while(*s) {
+		int q = 0;
+		if(*s == 'M') {
+			while(*s == 'M') { s++; q++; }
+			if(q == 1)
+				result.Cat(Format("%d", t.month));
+			else
+				result.Cat(Format("%02d", t.month));
+		}
+		else
+		if(*s == 'D') {
+			while(*s == 'D') { s++; q++; }
+			if(q == 1)
+				result.Cat(Format("%d", t.day));
+			else
+				result.Cat(Format("%02d", t.day));
+		}
+		else
+		if(*s == 'Y') {
+			while(*s == 'Y') { s++; q++; }
+			if(q == 1)
+				result.Cat(Format("%d", t.year % 100));
+			else
+			if(q == 2)
+				result.Cat(Format("%02d", t.year % 100));
+			else
+				result.Cat(Format("%d", t.year));
+		}
+		else
+		if(*s == 'h') {
+			while(*s == 'h') { s++; q++; }
+			if(q == 1)
+				result.Cat(Format("%d", t.hour));
+			else
+				result.Cat(Format("%02d", t.hour));
+		}
+		else
+		if(*s == 'H') {
+			while(*s == 'H') { s++; q++; }
+			int h = ((t.hour + 11) % 12 + 1);
+			if(q == 1)
+				result.Cat(Format("%d", h));
+			else
+				result.Cat(Format("%02d", h));
+		}
+		else
+		if(*s == '<') {
+			s++;
+			while(*s && *s != '/') {
+				if(t.hour <= 12)
+					result.Cat(*s);
+				s++;
+			}
+			if(!*s) break;
+			s++;
+			while(*s && *s != '>') {
+				if(t.hour > 12)
+					result.Cat(*s);
+				s++;
+			}
+			if(!*s) break;
+			s++;
+		}
+		else
+		if(*s == 'm') {
+			while(*s == 'm') { s++; q++; }
+			if(q == 1)
+				result.Cat(Format("%d", t.minute));
+			else
+				result.Cat(Format("%02d", t.minute));
+		}
+		else
+		if(*s == 's') {
+			while(*s == 's') { s++; q++; }
+			if(q == 1)
+				result.Cat(Format("%d", t.second));
+			else
+				result.Cat(Format("%02d", t.second));
+		}
+		else
+		if(*s == '`' && s[1]) {
+			s++;
+			result.Cat(*s++);
+		}
+		else
+			result.Cat(*s++);
+	}
+	return result;
+}
+
+// New format ----------------------------
+
+struct FormId : Moveable<FormId> {
+	FormId(String id, int type) : id(id), type(type) {}
+	String id;
+	int    type;
+};
+
+unsigned GetHashValue(const FormId& fid)
+{
+	return CombineHash(fid.type, GetHashValue(fid.id));
+}
+
+bool operator==(const FormId& a, const FormId& b)
+{
+	return a.type == b.type && a.id == b.id;
+}
+
+VectorMap<FormId, Formatter>& formatmap()
+{
+	return Single< VectorMap<FormId, Formatter> > ();
+}
+
+void RegisterFormatter(int type, const char *id, Formatter f)
+{
+	AssertST();
+	INTERLOCKED {
+		FormId fid(id, type);
+		formatmap().FindAdd(fid, f);
+		formatmap().Find(fid);
+	}
+}
+
+void RegisterValueFormatter(const char *id, Formatter f)
+{
+	RegisterFormatter(VALUE_V, id, f);
+}
+
+void RegisterNullFormatter(const char *id, Formatter f)
+{
+	RegisterFormatter(VOID_V, id, f);
+	RegisterFormatter(ERROR_V, id, f);
+}
+
+void RegisterNumberFormatter(const char *id, Formatter f)
+{
+	RegisterFormatter(DOUBLE_V, id, f);
+	RegisterFormatter(INT64_V, id, f);
+	RegisterFormatter(INT_V, id, f);
+	RegisterFormatter(BOOL_V, id, f);
+	RegisterNullFormatter(id, f);
+}
+
+void RegisterStringFormatter(const char *id, Formatter f)
+{
+	RegisterFormatter(WSTRING_V, id, f);
+	RegisterFormatter(STRING_V, id, f);
+	RegisterNullFormatter(id, f);
+}
+
+void RegisterDateTimeFormatter(const char *id, Formatter f)
+{
+	RegisterFormatter(TIME_V, id, f);
+	RegisterFormatter(DATE_V, id, f);
+	RegisterNullFormatter(id, f);
+}
+
+String IntFormatter(const Formatting& f)
+{
+	StringBuffer q;
+	q.SetLength(1000);
+	q.SetLength(sprintf(q, '%' + f.format + f.id, (int)f.arg));
+	return q;
+}
+
+String IntLowerAlphaFormatter(const Formatting& f)
+{
+	return FormatIntAlpha(f.arg, false);
+}
+
+String IntUpperAlphaFormatter(const Formatting& f)
+{
+	return FormatIntAlpha(f.arg, true);
+}
+
+String IntLowerRomanFormatter(const Formatting& f)
+{
+	return FormatIntRoman(f.arg, false);
+}
+
+String IntUpperRomanFormatter(const Formatting& f)
+{
+	return FormatIntRoman(f.arg, true);
+}
+
+String FloatFormatter(const Formatting& f)
+{
+	StringBuffer q;
+	q.SetLength(1000);
+	q.SetLength(sprintf(q, '%' + f.format + f.id, (double)f.arg));
+	return q;
+}
+
+String RealFormatter(const Formatting& f)
+{
+	if(IsNull(f.arg))
+		return Null;
+	double value = f.arg;
+	const char *s = f.format;
+	int digits = 6, fill_exp = 0;
+	const char *id = f.id;
+	int flags = (*id++ == 'v' ? FD_REL : 0);
+	if(*s == '+') {
+		flags |= FD_SIGN;
+		s++;
+	}
+	if(IsDigit(*s) || *s == '-' && IsDigit(s[1])) {
+		digits = (int)strtol(s, NULL, 10);
+		while(IsDigit(*++s))
+			;
+	}
+	if(*s == '!') { s++; flags |= FD_ZERO; }
+	if(*s == '^') {
+		if(*++s == '+') {
+			flags |= FD_SIGN_EXP;
+			s++;
+		}
+		if(IsDigit(*s)) {
+			fill_exp = (int)strtol(s, NULL, 10);
+			while(IsDigit(*++s))
+				;
+		}
+	}
+	bool lng = false;
+	if(*id == 'l') {
+		lng = true;
+		id++;
+	}
+	if(*id == 'e') flags |= FD_EXP;
+	else if(*id == 'f') flags |= FD_FIX;
+	if(lng)
+		return GetLanguageInfo(f.language).FormatDouble(value, digits, flags, fill_exp);
+	else
+		return FormatDouble(value, digits, flags, fill_exp);
+}
+
+String StringFormatter(const Formatting& f)
+{
+	String s = f.arg;
+	Buffer<char> h(max(f.maxn, s.GetLength()) + 16);
+	int n = sprintf(h, '%' + f.format + f.id, ~s);
+	return String(h, n);
+}
+
+String DateFormatter(const Formatting& f)
+{
+	return GetLanguageInfo(f.language).FormatDate(f.arg);
+}
+
+String TimeFormatter(const Formatting& f)
+{
+	return GetLanguageInfo(f.language).FormatTime(f.arg);
+}
+
+String SwitchFormatter(const Formatting& f)
+{
+	const char *s = f.format;
+	int i = f.arg;
+	int o = i;
+	for(;;) {
+		int n = 0;
+		while(IsDigit(*s))
+			n = 10 * n + *s++ - '0';
+		if(!*s) return Null;
+		if(*s == '%') {
+			o = i % max(n, 1);
+			s++;
+		}
+		else
+		if(*s == ',' || *s == ':') {
+			if(o == n) {
+				while(*s && *s != ':')
+					s++;
+				if(!*s) return Null;
+				++s;
+				const char *b = s;
+				while(*s && *s != ';')
+					s++;
+				return String(b, s);
+			}
+			if(*s == ':')
+				while(*s && *s != ';')
+					s++;
+			if(!*s) return Null;
+			s++;
+		}
+		else
+			return s;
+	}
+	return String();
+}
+
+String StdFormatFormatter(const Formatting& f)
+{
+	String out = StdFormat(f.arg);
+	if(!IsNull(out))
+		return out;
+	return f.format;
+}
+
+String MonthFormatter(const Formatting& f)
+{
+	return MonthName((int)f.arg - 1, f.language);
+}
+
+String MONTHFormatter(const Formatting& f)
+{
+	return ToUpper(MonthFormatter(f), GetLNGCharset(f.language));
+}
+
+String monthFormatter(const Formatting& f)
+{
+	return ToLower(MonthFormatter(f), GetLNGCharset(f.language));
+}
+
+String MonFormatter(const Formatting& f)
+{
+	return MonName((int)f.arg - 1, f.language);
+}
+
+String MONFormatter(const Formatting& f)
+{
+	return ToUpper(MonFormatter(f), GetLNGCharset(f.language));
+}
+
+String monFormatter(const Formatting& f)
+{
+	return ToLower(MonFormatter(f), GetLNGCharset(f.language));
+}
+
+String DayFormatter(const Formatting& f)
+{
+	return DayName((int)f.arg, f.language);
+}
+
+String DAYFormatter(const Formatting& f)
+{
+	return ToUpper(DayFormatter(f), GetLNGCharset(f.language));
+}
+
+String dayFormatter(const Formatting& f)
+{
+	return ToLower(DayFormatter(f), GetLNGCharset(f.language));
+}
+
+String DyFormatter(const Formatting& f)
+{
+	return DyName((int)f.arg, f.language);
+}
+
+String DYFormatter(const Formatting& f)
+{
+	return ToUpper(DyFormatter(f), GetLNGCharset(f.language));
+}
+
+String dyFormatter(const Formatting& f)
+{
+	return ToLower(DyFormatter(f), GetLNGCharset(f.language));
+}
+
+String twFormatter(const Formatting& f)
+{
+	int q = f.arg;
+	return Sprintf(*f.format == '0' ? "%02d" : "%d", q ? q % 12 : 12);
+}
+
+String NumberFormatter(const Formatting& f)
+{
+	int q = f.arg;
+	return AsString(q);
+}
+
+void IntDoubleRegister(int type)
+{
+	RegisterFormatter(type, "", &NumberFormatter);
+
+	RegisterFormatter(type, "c", &IntFormatter);
+	RegisterFormatter(type, "d", &IntFormatter);
+	RegisterFormatter(type, "i", &IntFormatter);
+	RegisterFormatter(type, "o", &IntFormatter);
+	RegisterFormatter(type, "x", &IntFormatter);
+	RegisterFormatter(type, "X", &IntFormatter);
+	RegisterFormatter(type, "ld", &IntFormatter);
+	RegisterFormatter(type, "li", &IntFormatter);
+	RegisterFormatter(type, "lo", &IntFormatter);
+	RegisterFormatter(type, "lx", &IntFormatter);
+	RegisterFormatter(type, "lX", &IntFormatter);
+
+	RegisterFormatter(type, "e", &FloatFormatter);
+	RegisterFormatter(type, "E", &FloatFormatter);
+	RegisterFormatter(type, "f", &FloatFormatter);
+	RegisterFormatter(type, "g", &FloatFormatter);
+	RegisterFormatter(type, "G", &FloatFormatter);
+
+	RegisterFormatter(type, "s", &SwitchFormatter);
+
+	RegisterFormatter(type, "month", &monthFormatter);
+	RegisterFormatter(type, "Month", &MonthFormatter);
+	RegisterFormatter(type, "MONTH", &MONTHFormatter);
+	RegisterFormatter(type, "mon", &monFormatter);
+	RegisterFormatter(type, "Mon", &MonFormatter);
+	RegisterFormatter(type, "MON", &MONFormatter);
+	RegisterFormatter(type, "Day", &DayFormatter);
+	RegisterFormatter(type, "DAY", &DAYFormatter);
+	RegisterFormatter(type, "day", &dayFormatter);
+	RegisterFormatter(type, "Dy", &DyFormatter);
+	RegisterFormatter(type, "DY", &DYFormatter);
+	RegisterFormatter(type, "dy", &dyFormatter);
+	RegisterFormatter(type, "tw", &twFormatter);
+}
+
+static void sRegisterFormatters()
+{
+	ONCELOCK {
+		IntDoubleRegister(BOOL_V);
+		IntDoubleRegister(INT_V);
+		IntDoubleRegister(INT64_V);
+		IntDoubleRegister(DOUBLE_V);
+
+		RegisterStringFormatter("s", &StringFormatter);
+		RegisterNullFormatter("", &DateFormatter);
+		RegisterFormatter(DATE_V, "", &DateFormatter);
+		RegisterFormatter(TIME_V, "", &TimeFormatter);
+
+		RegisterNumberFormatter("n",  &RealFormatter);
+		RegisterNumberFormatter("ne", &RealFormatter);
+		RegisterNumberFormatter("nf", &RealFormatter);
+		RegisterNumberFormatter("nl", &RealFormatter);
+		RegisterNumberFormatter("nle", &RealFormatter);
+		RegisterNumberFormatter("nlf", &RealFormatter);
+		RegisterNumberFormatter("v",  &RealFormatter);
+		RegisterNumberFormatter("ve", &RealFormatter);
+		RegisterNumberFormatter("vf", &RealFormatter);
+		RegisterNumberFormatter("vl", &RealFormatter);
+		RegisterNumberFormatter("vle", &RealFormatter);
+		RegisterNumberFormatter("vlf", &RealFormatter);
+
+		// real number formats (n = fixed decimals, v = valid decimals)
+		// ne, ve - force exponential notation; nf, vf - force fixed notation; nl, vl - language-based formatting
+		// Options: [+][[-]<digits>][!][^[+]<expdig>]
+		// + .. always prepend sign
+		// [-]<digits> .. number of decimals to print (negative = left of decimal point, default = 6)
+		// ! .. keep insignificant zeros
+		// ^ .. exponent options:
+		// + .. always prepend sign to exponent
+		// <expdig> exponent padding width
+
+		RegisterNumberFormatter("a", &IntLowerAlphaFormatter);
+		RegisterNumberFormatter("A", &IntUpperAlphaFormatter);
+		RegisterNumberFormatter("r", &IntLowerRomanFormatter);
+		RegisterNumberFormatter("R", &IntUpperRomanFormatter);
+
+		RegisterValueFormatter("vt", &StdFormatFormatter);
+		RegisterValueFormatter("", &StdFormatFormatter);
+	}
+}
+
+INITBLOCK {
+	sRegisterFormatters();
+}
+
+String NFormat0(int language, const char *s, const Value **v, int count)
+{
+	sRegisterFormatters();
+	Formatting f;
+	f.language = language;
+	String result;
+	int pos = 0;
+	const char *b;
+	for(;;) {
+		int n = 0;
+		b = s;
+		for(;;) {
+			while(*s && *s != '%')
+				++s;
+			result.Cat(b, (int)(s - b));
+			if(*s == '\0')
+				return result;
+			++s;
+			if(*s == '%') {
+				result.Cat('%');
+				++s;
+			}
+			else
+				break;
+			b = s;
+		}
+		f.format.Clear();
+		f.id.Clear();
+		f.maxn = 0;
+		b = s;
+		int pad = -1;
+		int padn;
+		String nvl_value = String::GetVoid();
+		for(;;) {
+			if(*s == '$') {
+				pos = n - 1;
+				b = ++s;
+				n = 0;
+			}
+			else
+			if(*s == ':') {
+				pos = n - 1;
+				b = ++s;
+				n = 0;
+			}
+			else
+			if(*s == '*') {
+				f.format.Cat(b, (int)(s - b));
+				f.format.Cat(FormatInt(*v[pos++]));
+				b = ++s;
+			}
+			else
+			if(*s == '<') {
+				padn = n;
+				pad = ALIGN_LEFT;
+				b = ++s;
+				n = 0;
+			}
+			else
+			if(*s == '>') {
+				padn = n;
+				pad = ALIGN_RIGHT;
+				b = ++s;
+				n = 0;
+			}
+			else
+			if(*s == '=') {
+				padn = n;
+				pad = ALIGN_CENTER;
+				b = ++s;
+				n = 0;
+			}
+			else
+			if(*s == '[') {
+				f.format.Cat(b, (int)(s - b));
+				s++;
+				b = s;
+				while(*s && *s != ']')
+					s++;
+				f.format.Cat(b, (int)(s - b));
+				if(*s) s++;
+				b = s;
+				if(!IsAlpha(*s) && *s != '~') break;
+			}
+			else if(*s == '~') {
+				nvl_value = f.format;
+				f.format = Null;
+				b = ++s;
+			}
+			else
+			if(!*s || *s == '`' || IsAlpha(*s))
+				break;
+			else {
+				ASSERT(*s);
+				if(IsDigit(*s))
+					n = 10 * n + *s - '0';
+				else {
+					if(n > f.maxn)
+						f.maxn = n;
+					n = 0;
+				}
+				s++;
+			}
+		}
+		f.format.Cat(b, (int)(s - b));
+		b = s;
+		while(IsAlpha(*s))
+			s++;
+		f.id = String(b, s);
+#ifndef _DEBUG
+		if(pos < 0 || pos >= count)
+		{
+			result << "!!ARGPOS=" << pos;
+			if(*s == '`')
+				s++;
+			continue;
+		}
+#endif
+		f.arg = *v[pos++];
+		if(n > f.maxn)
+			f.maxn = n;
+		String r;
+		if(!nvl_value.IsVoid() && IsNull(f.arg))
+			r = nvl_value;
+		else
+		{
+			Formatter ft = NULL;
+#ifdef _DEBUG
+			int fi = formatmap().Find(FormId(f.id, f.arg.GetType()));
+			if(fi < 0) fi = formatmap().Find(FormId(f.id, VALUE_V));
+			if(fi < 0)
+			{
+				LOG("Missing formatter '" << f.id << "' for type " << f.arg.GetType());
+				String fmt_types;
+				for(int fm = 0; fm < formatmap().GetCount(); fm++)
+					if(formatmap().GetKey(fm).id == f.id)
+						fmt_types << ' ' << formatmap().GetKey(fm).type;
+				LOG("Formatter available for type(s): " << fmt_types);
+				NEVER();
+			}
+			ft = formatmap()[fi];
+#else
+			for(;;) {
+				int fi = formatmap().Find(FormId(f.id, f.arg.GetType()));
+				if(fi < 0) fi = formatmap().Find(FormId(f.id, VALUE_V));
+				if(fi >= 0)
+				{
+					ft = formatmap()[fi];
+					break;
+				}
+				if(f.id.GetLength() == 0) break;
+				f.id.Trim(f.id.GetLength() - 1);
+				s--;
+			}
+#endif
+			if(ft)
+				r = (*ft)(f);
+			else
+				r << "<N/A '" << f.id << "' for type " << (int)f.arg.GetType() << ">";
+		}
+		switch(pad)
+		{
+		case ALIGN_LEFT:
+			ASSERT(padn >= 0);
+			if(r.GetLength() < padn)
+				r.Cat(' ', padn - r.GetLength());
+			else
+				r.Trim(padn);
+			break;
+		case ALIGN_RIGHT:
+			ASSERT(padn >= 0);
+			if(r.GetLength() < padn) {
+				String fill(' ', padn - r.GetLength());
+				r = fill + r;
+			}
+			else
+				r.Trim(padn);
+			break;
+		case ALIGN_CENTER:
+			ASSERT(padn >= 0);
+			if(r.GetLength() < padn) {
+				String fill(' ', (padn - r.GetLength()) / 2);
+				r = fill + r;
+				r.Cat(' ', padn - r.GetLength());
+			}
+			else
+				r.Trim(padn);
+			break;
+		}
+		result.Cat(r);
+		if(*s == '`')
+			s++;
+	}
+}
+
+String NFormat0(const char *s, const Value **v, int count)
+{
+	return NFormat0(GetCurrentLanguage(), s, v, count);
+}
+
+String NFormat(int language, const char *s, const Vector<Value>& v)
+{
+	Buffer<const Value *> bv(v.GetCount());
+	for(int i = 0; i < v.GetCount(); i++)
+		bv[i] = &v[i];
+	return NFormat0(language, s, bv, v.GetCount());
+}
+
+String NFormat(const char *s, const Vector<Value>& v) { return NFormat(GetCurrentLanguage(), s, v); }
+
+//$-
+#define E__NFSetArg(I) arg[I - 1] = &COMBINE(p, I)
+#define E__NFValue(I)  const Value& COMBINE(p, I)
+
+#define E__NFBody(I) \
+String NFormat(const char *fmt, __List##I(E__NFValue)) \
+{ \
+	const Value *arg[I]; \
+	__List##I(E__NFSetArg); \
+	return NFormat0(fmt, arg, I); \
+} \
+String NFormat(int language, const char *fmt, __List##I(E__NFValue)) \
+{ \
+	const Value *arg[I]; \
+	__List##I(E__NFSetArg); \
+	return NFormat0(language, fmt, arg, I); \
+}
+
+__Expand10(E__NFBody)
+
+#if 1
+
+#define E__FBody(I) \
+String Format(const char *fmt, __List##I(E__NFValue)) \
+{\
+	const Value *arg[I]; \
+	__List##I(E__NFSetArg); \
+	return NFormat0(fmt, arg, I); \
+} \
+String Format(int language, const char *fmt, __List##I(E__NFValue)) \
+{ \
+	const Value *arg[I]; \
+	__List##I(E__NFSetArg); \
+	return NFormat0(language, fmt, arg, I); \
+}
+
+__Expand20(E__FBody)
+//$+
+String Format(const char *s, const Vector<Value>& v)
+{
+	return NFormat(s, v);
+}
+
+String Format(int language, const char *s, const Vector<Value>& v)
+{
+	return NFormat(language, s, v);
+}
+
+#else
+
+String  Format(const char *fmt, ...) {
+	va_list argptr;
+	va_start(argptr, fmt);
+	return VFormat(fmt, argptr);
+}
+
+#endif
+
+String Sprintf(const char *fmt, ...) {
+	va_list argptr;
+	va_start(argptr, fmt);
+	return VFormat(fmt, argptr);
+}
+
+String DeFormat(const char *text)
+{
+	StringBuffer x;
+	while(*text) {
+		if(*text == '%')
+			x.Cat('%');
+		x.Cat(*text++);
+	}
+	return x;
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/Core/Format.h b/uppsrc/Core/Format.h
new file mode 100644
index 000000000..d395609ac
--- /dev/null
+++ b/uppsrc/Core/Format.h
@@ -0,0 +1,124 @@
+String         FormatIntBase(int i, int base, int width = 0, char lpad = ' ', int sign = 0);
+String         FormatInt(int i);
+String         FormatIntDec(int i, int width, char lpad = ' ', bool always_sign = false);
+String         FormatIntHex(int i, int width = 8, char lpad = '0');
+String         FormatIntOct(int i, int width = 12, char lpad = '0');
+String         FormatIntRoman(int i, bool upper = false);
+String         FormatIntAlpha(int i, bool upper = true);
+String         Format64(uint64 a);
+String         Format64Hex(uint64 a);
+
+#ifdef CPU_64
+inline String  FormatIntHex(const void *ptr) { return Format64Hex((int64)(uintptr_t)ptr); }
+inline String  FormatHex(const void *ptr)    { return Format64Hex((int64)(uintptr_t)ptr); }
+#else
+inline String  FormatIntHex(const void *ptr) { return FormatIntHex((int)(uintptr_t)ptr); }
+inline String  FormatHex(const void *ptr)    { return FormatIntHex((int)(uintptr_t)ptr); }
+#endif
+
+String         FormatInteger(int a);
+String         FormatUnsigned(unsigned long a);
+String         FormatDouble(double a);
+String         FormatBool(bool a);
+String         FormatInt64(int64 a);
+
+template<> inline String AsString(const short& a)           { return FormatInteger(a); }
+template<> inline String AsString(const unsigned short& a)  { return FormatUnsigned(a); }
+template<> inline String AsString(const int& a)             { return FormatInteger(a); }
+template<> inline String AsString(const unsigned int& a)    { return FormatUnsigned(a); }
+template<> inline String AsString(const long& a)            { return FormatInteger(a); }
+template<> inline String AsString(const unsigned long& a)   { return FormatUnsigned(a); }
+template<> inline String AsString(const double& a)          { return FormatDouble(a); }
+template<> inline String AsString(const float& a)           { return FormatDouble(a); }
+//template<> inline String AsString(const bool& a)            { return FormatBool(a); } // TRC: moved to String.h by CXL
+template<> inline String AsString(const int64& a)           { return FormatInt64(a); }
+template<> inline String AsString(const uint64& a)          { return Format64(a); }
+
+enum
+{
+	FD_SIGN     = 0x01, // always prepend sign (+10)
+	FD_REL      = 0x02, // relative decimal places (valid digits)
+	FD_SIGN_EXP = 0x04, // always prepend sign to exponent (1e+2)
+	FD_CAP_E    = 0x08, // capital E for exponent (1E10)
+	FD_ZERO     = 0x10, // keep trailing zeros (1.25000)
+	FD_FIX      = 0x20, // always use fixed notation (FormatDouble)
+	FD_EXP      = 0x40, // always use exponential notation (FormatDouble)
+};
+String         FormatDoubleDigits(double d, int digits, int flags, int& exponent);
+String         FormatDouble(double d, int digits, int flags = 0, int fill_exp = 0);
+String         FormatDoubleFix(double d, int digits, int flags = 0);
+String         FormatDoubleExp(double d, int digits, int flags = 0, int fill_exp = 0);
+
+String         FormatDate(Date date, const char *format, int language = 0);
+String         FormatTime(Time time, const char *format, int language = 0);
+
+inline String  IntStr(int i)         { return FormatInt(i); }
+inline String  IntStr64(int64 i)     { return FormatInt64(i); }
+inline String  DblStr(double d)      { return FormatDouble(d, 10); }
+
+/*
+Date        ScanDate(const char *text, const char **endptr, const char *format, int language, Date base_date);
+Time        ScanTime(const char *text, const char **endptr, const char *format, int language, Time base_time);
+*/
+
+struct Formatting
+{
+	int    language;
+	int    maxn;
+	Value  arg;
+	String format;
+	String id;
+};
+
+typedef String (*Formatter)(const Formatting& fmt);
+
+void RegisterFormatter(int type, const char *id, Formatter f) init_;
+void RegisterNullFormatter(const char *id, Formatter f) init_;
+void RegisterNumberFormatter(const char *id, Formatter f) init_;
+void RegisterStringFormatter(const char *id, Formatter f) init_;
+void RegisterDateTimeFormatter(const char *id, Formatter f) init_;
+void RegisterValueFormatter(const char *id, Formatter f) init_;
+
+#define E__NFValue(I)  const Value& COMBINE(p, I)
+#define E__NFBody(I) \
+String NFormat(const char *fmt, __List##I(E__NFValue)); \
+String NFormat(int language, const char *fmt, __List##I(E__NFValue));
+
+//$-String NFormat(const char *fmt, Value p1, ...);
+//$ String NFormat(int language, const char *fmt, Value p1, ...);
+__Expand20(E__NFBody)
+//$+
+
+#undef E__NFBody
+#undef E__NFValue
+
+String NFormat(const char *s, const Vector<Value>& v);
+String NFormat(int language, const char *s, const Vector<Value>& v);
+
+String VFormat(const char *fmt, va_list args);
+String Sprintf(const char *fmt, ...);
+
+//$-
+
+#if 1
+
+#define E__NFValue(I)  const Value& COMBINE(p, I)
+#define E__NFBody(I) \
+String Format(const char *fmt, __List##I(E__NFValue)); \
+String Format(int language, const char *fmt, __List##I(E__NFValue));
+
+__Expand20(E__NFBody)
+
+#undef E__NFBody
+#undef E__NFValue
+
+String Format(const char *s, const Vector<Value>& v);
+String Format(int language, const char *s, const Vector<Value>& v);
+
+#else
+
+String Format(const char *fmt, ...);
+
+#endif
+
+String DeFormat(const char *text);
diff --git a/uppsrc/Core/Global.h b/uppsrc/Core/Global.h
new file mode 100644
index 000000000..7dbc384cb
--- /dev/null
+++ b/uppsrc/Core/Global.h
@@ -0,0 +1,43 @@
+#define GLOBAL_VP(type, name, param) \
+name() \
+{ \
+	static type x param; \
+	return x; \
+}
+
+#define GLOBAL_VARP(type, name, param) \
+type& GLOBAL_VP(type, name, param)
+
+#define GLOBAL_V(type, name)   GLOBAL_VP(type, name, init_)
+#define GLOBAL_VAR(type, name) type& GLOBAL_V(type, name)
+
+#define GLOBAL_VP_INIT(type, name, param) \
+name() \
+{ \
+	static type x param; \
+	return x; \
+} \
+INITBLOCK { name(); }
+
+#define GLOBAL_VARP_INIT(type, name, param) \
+type& GLOBAL_VP_INIT(type, name, param)
+
+#define GLOBAL_V_INIT(type, name)   GLOBAL_VP_INIT(type, name, init_)
+#define GLOBAL_VAR_INIT(type, name) type& GLOBAL_V_INIT(type, name)
+
+
+// DEPRECATED! (USE ONCELOCK_)
+#define INIT_LOCKV(init, code) \
+if(!init) { \
+	static StaticCriticalSection cs; \
+	CriticalSection::Lock __(cs); \
+	if(!init) { \
+		init = true; \
+		code \
+	} \
+}
+
+// DEPRECATED! (USE ONCELOCK)
+#define INIT_LOCK(code) \
+static bool init; \
+INIT_LOCKV(init, code)
diff --git a/uppsrc/Core/Gtypes.cpp b/uppsrc/Core/Gtypes.cpp
new file mode 100644
index 000000000..d872d37c6
--- /dev/null
+++ b/uppsrc/Core/Gtypes.cpp
@@ -0,0 +1,117 @@
+#include "Core.h"
+
+NAMESPACE_UPP
+
+INITBLOCK {
+	Point p;
+	RichValue<Point>::Register();
+	RichValue<Point64>::Register();
+	RichValue<Pointf>::Register();
+	RichValue<Size>::Register();
+	RichValue<Size64>::Register();
+	RichValue<Sizef>::Register();
+	RichValue<Rect>::Register();
+	RichValue<Rect64>::Register();
+	RichValue<Rectf>::Register();
+}
+
+//template <>
+//void Rect_<double>::Union(const Rect_<double>& r) {
+void Rect_double_Union(Rect_<double>& self, const Rect_<double>& r) {
+	if(IsNull(r)) return;
+	if(IsNull(self)) {
+		self.Set(r);
+		return;
+	}
+	if(r.left   < self.left)   self.left   = r.left;
+	if(r.top    < self.top)    self.top    = r.top;
+	if(r.right  > self.right)  self.right  = r.right;
+	if(r.bottom > self.bottom) self.bottom = r.bottom;
+}
+
+//bool Rect_double_Contains(const Rect_<double>& self, const Point_<double>& p) {
+//	return p.x >= self.left && p.x <= self.right && p.y >= self.top && p.y <= self.bottom;
+//}
+
+//template <>
+//bool Rect_<double>::Intersects(const Rect_<double>& r) const {
+bool Rect_double_Intersects(const Rect_<double>& self, const Rect_<double>& r) {
+	if(IsNull(self) || IsNull(r)) return false;
+	return r.right >= self.left && r.bottom >= self.top && r.left <= self.right && r.top <= self.bottom;
+}
+
+//template <>
+//Point_<double> Rect_<double>::Bind(Point_<double> pt) const
+Point_<double> Rect_double_Bind(const Rect_<double>& self, Point_<double> pt) {
+	return Point_<double>(pt.x < self.left ? self.left : pt.x > self.right ? self.right : pt.x,
+		pt.y < self.top ? self.top : pt.y > self.bottom ? self.bottom : pt.y);
+}
+
+Size iscale(Size a, int b, int c)
+{
+	return Size(iscale(a.cx, b, c), iscale(a.cy, b, c));
+}
+
+Size iscalefloor(Size a, int b, int c)
+{
+	return Size(iscalefloor(a.cx, b, c), iscalefloor(a.cy, b, c));
+}
+
+Size iscaleceil(Size a, int b, int c)
+{
+	return Size(iscaleceil(a.cx, b, c), iscaleceil(a.cy, b, c));
+}
+
+Size idivfloor(Size a, int b)
+{
+	return Size(idivfloor(a.cx, b), idivfloor(a.cy, b));
+}
+
+Size idivceil(Size a, int b)
+{
+	return Size(idivceil(a.cx, b), idivceil(a.cy, b));
+}
+
+Size iscale(Size a, Size b, Size c)
+{
+	return Size(iscale(a.cx, b.cx, c.cx), iscale(a.cy, b.cy, c.cy));
+}
+
+Size iscalefloor(Size a, Size b, Size c)
+{
+	return Size(iscalefloor(a.cx, b.cx, c.cx), iscalefloor(a.cy, b.cy, c.cy));
+}
+
+Size iscaleceil(Size a, Size b, Size c)
+{
+	return Size(iscaleceil(a.cx, b.cx, c.cx), iscaleceil(a.cy, b.cy, c.cy));
+}
+
+Size idivfloor(Size a, Size b)
+{
+	return Size(idivfloor(a.cx, b.cx), idivfloor(a.cy, b.cy));
+}
+
+Size idivceil(Size a, Size b)
+{
+	return Size(idivceil(a.cx, b.cx), idivceil(a.cy, b.cy));
+}
+
+Size  GetRatioSize(Size sz, int cx, int cy)
+{
+	return cx == 0 ? cy == 0 ? sz : sz.cy ? Size(sz.cx * cy / sz.cy, cy) : Size(0, 0)
+		       : cy == 0 ? sz.cx ? Size(cx, sz.cy * cx / sz.cx) : Size(0, 0)
+				         : Size(cx, cy);
+}
+
+Size  GetFitSize(Size sz, int cx, int cy)
+{
+	if(cx <= 0 || cy <= 0 || sz.cx <= 0 || sz.cy <= 0)
+		return Size(0, 0);
+	if(cx * sz.cy >= cy * sz.cx) // too high
+		return iscale(sz, cy, sz.cy);
+	else
+		return iscale(sz, cx, sz.cx);
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/Core/Gtypes.h b/uppsrc/Core/Gtypes.h
new file mode 100644
index 000000000..3a04ed717
--- /dev/null
+++ b/uppsrc/Core/Gtypes.h
@@ -0,0 +1,699 @@
+template <class T> struct Point_;
+template <class T> struct Size_;
+template <class T> struct Rect_;
+
+template <class T>
+struct Size_ : Moveable< Size_<T> > {
+	T             cx, cy;
+
+	void          Clear()                      { cx = cy = 0; }
+	bool          IsEmpty() const              { return cx == 0 || cy == 0; }
+
+	void          SetNull()                    { cx = Null; }
+	bool          IsNullInstance() const       { return UPP::IsNull(cx); }
+
+	Size_&        operator+=(Size_ p)          { cx  += p.cx; cy  += p.cy; return *this; }
+	Size_&        operator+=(T t)              { cx  += t;    cy  += t;    return *this; }
+	Size_&        operator-=(Size_ p)          { cx  -= p.cx; cy  -= p.cy; return *this; }
+	Size_&        operator-=(T t)              { cx  -= t;    cy  -= t;    return *this; }
+	Size_&        operator*=(Size_ p)          { cx  *= p.cx; cy  *= p.cy; return *this; }
+	Size_&        operator*=(T t)              { cx  *= t;    cy  *= t;    return *this; }
+	Size_&        operator/=(Size_ p)          { cx  /= p.cx; cy  /= p.cy; return *this; }
+	Size_&        operator/=(T t)              { cx  /= t;    cy  /= t;    return *this; }
+	Size_&        operator<<=(int sh)          { cx <<= sh;   cy <<= sh;   return *this; }
+	Size_&        operator>>=(int sh)          { cx >>= sh;   cy >>= sh;   return *this; }
+
+	Size_&        operator++()                 { ++cx; ++cy; return *this; }
+	Size_&        operator--()                 { --cx; --cy; return *this; }
+
+	friend Size_  operator+(Size_ s)           { return s; }
+	friend Size_  operator-(Size_ s)           { return Size_(-s.cx, -s.cy); }
+
+	friend Size_  operator+(Size_ a, Size_ b)  { return a += b; }
+	friend Size_  operator+(Size_ a, T t)      { return a += t; }
+	friend Size_  operator+(T t, Size_ b)      { return b += t; }
+	friend Size_  operator-(Size_ a, Size_ b)  { return a -= b; }
+	friend Size_  operator-(Size_ a, T t)      { return a -= t; }
+	friend Size_  operator-(T t, Size_ b)      { b = -b; return b += t; }
+	friend Size_  operator*(Size_ a, Size_ b)  { return a *= b; }
+	friend Size_  operator*(Size_ a, T b)      { return a *= b; }
+	friend Size_  operator*(T a, Size_ b)      { return b *= a; }
+	friend Size_  operator/(Size_ a, Size_ b)  { return a /= b; }
+	friend Size_  operator/(Size_ a, T b)      { return a /= b; }
+	friend Size_  operator<<(Size_ a, int sh)  { return a <<= sh; }
+	friend Size_  operator>>(Size_ a, int sh)  { return a >>= sh; }
+
+	friend bool   operator==(Size_ a, Size_ b) { return a.cx == b.cx && a.cy == b.cy; }
+	friend bool   operator!=(Size_ a, Size_ b) { return !(a == b); }
+
+	friend Size_  min(Size_ a, Size_ b)        { return Size_(min(a.cx, b.cx), min(a.cy, b.cy)); }
+	friend Size_  max(Size_ a, Size_ b)        { return Size_(max(a.cx, b.cx), max(a.cy, b.cy)); }
+
+	friend Size_  Nvl(Size_ a, Size_ b)        { return IsNull(a) ? b : a; }
+
+	friend T      ScalarProduct(Size_ a, Size_ b) { return a.cx * b.cx + a.cy * b.cy; }
+	friend T      VectorProduct(Size_ a, Size_ b) { return a.cx * b.cy - a.cy * b.cx; }
+	friend T      Squared(Size_ a)             { return a.cx * a.cx + a.cy * a.cy; }
+	friend double Length(Size_ a)              { return hypot(a.cx, a.cy); }
+
+	unsigned      GetHashValue() const         { return UPP::GetHashValue(cx) ^ UPP::GetHashValue(cy); }
+
+	String        ToString() const;
+
+	Size_() {}
+	Size_(T cx, T cy) : cx(cx), cy(cy) {}
+
+	Size_(const Size_<int>& sz)  : cx((T)sz.cx), cy((T)sz.cy) {}
+	Size_(const Size_<short>& sz)  : cx((T)sz.cx), cy((T)sz.cy) {}
+	Size_(const Size_<double>& sz)  : cx((T)sz.cx), cy((T)sz.cy) {}
+	Size_(const Size_<int64>& sz) : cx((T)sz.cx), cy((T)sz.cy) {}
+
+	Size_(const Point_<T>& pt) : cx(pt.x), cy(pt.y) {}
+
+	Size_(const Nuller&)                       { cx = cy = Null; }
+
+	operator Value() const                     { return RichValue<Size_>(*this); }
+	Size_(const Value& src)                    { *this = RichValue<Size_>::Extract(src); }
+
+	void Serialize(Stream& s)                  { s % cx % cy; }
+
+#ifdef PLATFORM_WIN32
+	operator SIZE*()                           { ASSERT(sizeof(*this) == sizeof(SIZE)); return (SIZE*)this; }
+	operator const SIZE*() const               { ASSERT(sizeof(*this) == sizeof(SIZE)); return (SIZE*)this; }
+	operator SIZE() const                      { SIZE sz; sz.cx = cx; sz.cy = cy; return sz; }
+	LONG     GetLONG() const                   { return MAKELONG(cx, cy); }
+
+	Size_(POINT pt) : cx((T)pt.x), cy((T)pt.y)  {}
+	Size_(SIZE sz) : cx((T)sz.cx), cy((T)sz.cy) {}
+	explicit Size_(LONG lParam) { cx = (T)(int16)LOWORD(lParam); cy = (T)(int16)HIWORD(lParam); }
+#endif
+};
+
+template <class T>
+String Size_<T>::ToString() const {
+	String ss;
+	return ss << '(' << cx << ", " << cy << ')';
+}
+
+template <class T>
+struct Point_ : Moveable< Point_<T> > {
+	T             x, y;
+
+	typedef       Size_<T> Sz;
+
+	void          Clear()                           { x = y = 0; }
+	bool          IsZero() const                    { return x == 0 && y == 0; }
+
+	void          SetNull()                         { x = y = Null; }
+	bool          IsNullInstance() const            { return UPP::IsNull(x); }
+
+	void          Offset(T dx, T dy)                { x += dx; y += dy; }
+
+	Point_&       operator+=(Sz p)                  { x  += p.cx; y  += p.cy; return *this; }
+	Point_&       operator+=(Point_ p)              { x  += p.x;  y  += p.y; return *this; }
+	Point_&       operator+=(T t)                   { x  += t;    y  += t;    return *this; }
+	Point_&       operator-=(Sz p)                  { x  -= p.cx; y  -= p.cy; return *this; }
+	Point_&       operator-=(Point_ p)              { x  -= p.x;  y  -= p.y; return *this; }
+	Point_&       operator-=(T t)                   { x  -= t;    y  -= t;    return *this; }
+	Point_&       operator*=(Sz p)                  { x  *= p.cx; y  *= p.cy; return *this; }
+	Point_&       operator*=(Point_ p)              { x  *= p.x;  y  *= p.y; return *this; }
+	Point_&       operator*=(T t)                   { x  *= t;    y  *= t;    return *this; }
+	Point_&       operator/=(Sz p)                  { x  /= p.cx; y  /= p.cy; return *this; }
+	Point_&       operator/=(Point_ p)              { x  /= p.x;  y  /= p.y; return *this; }
+	Point_&       operator/=(T t)                   { x  /= t;    y  /= t;    return *this; }
+	Point_&       operator<<=(int sh)               { x <<= sh;   y <<= sh;   return *this; }
+	Point_&       operator>>=(int sh)               { x >>= sh;   y >>= sh;   return *this; }
+
+	Point_&       operator++()                      { ++x; ++y; return *this; }
+	Point_&       operator--()                      { --x; --y; return *this; }
+
+	friend Point_ operator+(Point_ p)               { return p; }
+	friend Point_ operator-(Point_ p)               { return Point_(-p.x, -p.y); }
+
+	friend Point_ operator+(Point_ a, Sz b)         { return a += b; }
+	friend Point_ operator+(Point_ a, Point_ b)     { return a += b; }
+	friend Point_ operator+(Point_ a, T t)          { return a += t; }
+	friend Point_ operator+(T t, Point_ b)          { return b += t; }
+	friend Sz     operator+(Sz a, Point_ b)         { return Point_(a) + b; }
+	friend Sz&    operator+=(Sz& a, Point_ b)       { return a = a + b; }
+	friend Point_ operator-(Point_ a, Sz b)         { return a -= b; }
+	friend Point_ operator-(Point_ a, T t)          { return a -= t; }
+	friend Sz     operator-(Point_ a, Point_ b)     { return a -= b; }
+	friend Sz     operator-(Sz a, Point_ b)         { return Point_(a) - b; }
+	friend Sz&    operator-=(Sz& a, Point_ b)       { return a = a - b; }
+	friend Point_ operator*(Point_ a, Point_ b)     { return a *= b; }
+	friend Point_ operator*(Point_ a, T b)          { return a *= b; }
+	friend Point_ operator*(T a, Point_ b)          { return b *= a; }
+	friend Point_ operator/(Point_ a, Sz b)         { return a /= b; }
+	friend Point_ operator/(Point_ a, T b)          { return a /= b; }
+	friend Point_ operator<<(Point_ a, int sh)      { return a <<= sh; }
+	friend Point_ operator>>(Point_ a, int sh)      { return a >>= sh; }
+
+
+	friend bool   operator==(Point_ a, Point_ b)    { return a.x == b.x && a.y == b.y; }
+	friend bool   operator!=(Point_ a, Point_ b)    { return a.x != b.x || a.y != b.y; }
+
+	friend Point_ min(Point_ a, Point_ b)           { return Point_(min(a.x, b.x), min(a.y, b.y)); }
+	friend Point_ max(Point_ a, Point_ b)           { return Point_(max(a.x, b.x), max(a.y, b.y)); }
+
+	friend Point_ Nvl(Point_ a, Point_ b)           { return IsNull(a) ? b : a; }
+
+	unsigned      GetHashValue() const              { return UPP::GetHashValue(x) ^ UPP::GetHashValue(y); }
+
+	String        ToString() const;
+
+	Point_() {}
+	Point_(T x, T y) : x(x), y(y) {}
+
+	Point_(const Point_<int>& pt) : x((T)pt.x), y((T)pt.y) {}
+	Point_(const Point_<short>& pt) : x((T)pt.x), y((T)pt.y) {}
+	Point_(const Point_<double>& pt) : x((T)pt.x), y((T)pt.y) {}
+	Point_(const Point_<int64>& pt) : x((T)pt.x), y((T)pt.y) {}
+
+	Point_(const Size_<T>& sz)  : x(sz.cx), y(sz.cy) {}
+
+	Point_(const Nuller&)                           { x = y = Null; }
+
+	operator Value() const                          { return RichValue<Point_>(*this); }
+	/*explicit */Point_(const Value& src)               { *this = RichValue<Point_>::Extract(src); }
+
+	void Serialize(Stream& s)                       { s % x % y; }
+
+#ifdef PLATFORM_WIN32
+	operator POINT*()                               { ASSERT(sizeof(*this) == sizeof(POINT)); return (POINT*)this; }
+	operator const POINT*() const                   { ASSERT(sizeof(*this) == sizeof(POINT)); return (POINT*)this; }
+	operator POINT() const                          { POINT p; p.x = x; p.y = y; return p; }
+	LONG     GetLONG() const                        { return MAKELONG(x, y); }
+
+	Point_(POINT pt) : x((T)pt.x), y((T)pt.y)       {}
+	Point_(SIZE sz) : x((T)sz.cx), y((T)sz.cy)      {}
+	explicit Point_(LONG lParam)                    { x = (T)(int16)LOWORD(lParam); y = (T)(int16)HIWORD(lParam); }
+#endif
+};
+
+template <class T>
+String Point_<T>::ToString() const {
+	String ss;
+	return ss << '[' << x << ", " << y << ']';
+}
+
+template <class T>
+T GHalf_(T t) { return t >> 1; }
+
+template <>
+inline double GHalf_(double d) { return d / 2; }
+
+template <class T>
+struct Rect_ : Moveable< Rect_<T> > {
+	T      left, top, right, bottom;
+
+	typedef Point_<T>  Pt;
+	typedef Size_<T>   Sz;
+
+	void   Clear()                          { left = top = right = bottom = 0; }
+
+	bool   IsEmpty() const                  { return right <= left || bottom <= top; }
+	bool   IsNullInstance() const;
+
+	Pt     TopLeft() const                  { return Pt(left, top); }
+	Pt     TopCenter() const                { return Pt(GHalf_(left + right), top); }
+	Pt     TopRight() const                 { return Pt(right, top); }
+	Pt     CenterLeft() const               { return Pt(left, GHalf_(top + bottom)); }
+	Pt     CenterPoint() const              { return Pt(GHalf_(left + right), GHalf_(top + bottom)); }
+	Pt     CenterRight() const              { return Pt(right, GHalf_(top + bottom)); }
+	Pt     BottomLeft() const               { return Pt(left, bottom); }
+	Pt     BottomCenter() const             { return Pt(GHalf_(left + right), bottom); }
+	Pt     BottomRight() const              { return Pt(right, bottom); }
+	T      Width() const                    { return right - left; }
+	T      Height() const                   { return bottom - top; }
+	Sz     Size() const                     { return Sz(right - left, bottom - top); }
+
+	T      GetWidth() const                 { return right - left; }
+	T      GetHeight() const                { return bottom - top; }
+	Sz     GetSize() const                  { return Sz(right - left, bottom - top); }
+
+	Pt     CenterPos(T cx, T cy) const;
+	Pt     CenterPos(Sz sz) const           { return CenterPos(sz.cx, sz.cy); }
+	Rect_  CenterRect(Sz sz) const          { return Rect_(CenterPos(sz), sz); }
+	Rect_  CenterRect(T cx, T cy) const     { return CenterRect(Sz(cx, cy)); }
+
+	void   Set(T l, T t, T r, T b)          { left = l; top = t; right = r; bottom = b; }
+	void   Set(Pt a, Pt b)                  { left = a.x; top = a.y; right = b.x; bottom = b.y; }
+	void   Set(Pt a, Sz sz)                 { Set(a, a + sz); }
+	void   Set(const Rect_& r)              { Set(r.left, r.top, r.right, r.bottom); }
+
+	void   SetSize(int cx, int cy)              { right = left + cx; bottom = top + cy; }
+	void   SetSize(Sz sz)                       { SetSize(sz.cx, sz.cy); }
+
+	void   InflateHorz(T dx)                    { left -= dx; right += dx; }
+	void   InflateVert(T dy)                    { top -= dy; bottom += dy; }
+	void   Inflate(T dx, T dy)                  { InflateHorz(dx); InflateVert(dy); }
+	void   Inflate(Sz sz)                       { Inflate(sz.cx, sz.cy); }
+	void   Inflate(T dxy)                       { Inflate(dxy, dxy); }
+	void   Inflate(T l, T t, T r, T b)          { left -= l; top -= t; right += r; bottom += b; }
+	void   Inflate(const Rect_& r)              { Inflate(r.left, r.top, r.right, r.bottom); }
+
+	void   DeflateHorz(T dx)                    { InflateHorz(-dx); }
+	void   DeflateVert(T dy)                    { InflateVert(-dy); }
+	void   Deflate(T dx, T dy)                  { Inflate(-dx, -dy); }
+	void   Deflate(Sz sz)                       { Inflate(-sz); }
+	void   Deflate(T dxy)                       { Inflate(-dxy); }
+	void   Deflate(T l, T t, T r, T b)          { Inflate(-l, -t, -r, -b); }
+	void   Deflate(const Rect_& r)              { Deflate(r.left, r.top, r.right, r.bottom); }
+
+	Rect_  InflatedHorz(T dx) const             { Rect_ r = *this; r.InflateHorz(dx); return r; }
+	Rect_  InflatedVert(T dy) const             { Rect_ r = *this; r.InflateVert(dy); return r; }
+	Rect_  Inflated(T dx, T dy) const           { Rect_ r = *this; r.Inflate(dx, dy); return r; }
+	Rect_  Inflated(Sz sz) const                { Rect_ r = *this; r.Inflate(sz); return r; }
+	Rect_  Inflated(T dxy) const                { Rect_ r = *this; r.Inflate(dxy); return r; }
+	Rect_  Inflated(T l, T t, T r, T b) const   { Rect_ m = *this; m.Inflate(l, t, r, b); return m; }
+	Rect_  Inflated(const Rect_& q) const       { Rect_ r = *this; r.Inflate(q); return r; }
+
+	Rect_  DeflatedHorz(T dx) const             { Rect_ r = *this; r.DeflateHorz(dx); return r; }
+	Rect_  DeflatedVert(T dy) const             { Rect_ r = *this; r.DeflateVert(dy); return r; }
+	Rect_  Deflated(T dx, T dy) const           { Rect_ r = *this; r.Deflate(dx, dy); return r; }
+	Rect_  Deflated(Sz sz) const                { Rect_ r = *this; r.Deflate(sz); return r; }
+	Rect_  Deflated(T dxy) const                { Rect_ r = *this; r.Deflate(dxy); return r; }
+	Rect_  Deflated(T l, T t, T r, T b) const   { Rect_ m = *this; m.Deflate(l, t, r, b); return m; }
+	Rect_  Deflated(const Rect_& q) const       { Rect_ r = *this; r.Deflate(q); return r; }
+
+	void   OffsetHorz(T dx)                     { left += dx; right += dx; }
+	void   OffsetVert(T dy)                     { top += dy; bottom += dy; }
+	void   Offset(T dx, T dy)                   { OffsetHorz(dx); OffsetVert(dy); }
+	void   Offset(Sz sz)                        { Offset(sz.cx, sz.cy); }
+	void   Offset(Pt p)                         { Offset(p.x, p.y); }
+
+	Rect_  OffsetedHorz(T dx) const             { Rect_ r = *this; r.OffsetHorz(dx); return r; }
+	Rect_  OffsetedVert(T dy) const             { Rect_ r = *this; r.OffsetVert(dy); return r; }
+	Rect_  Offseted(T dx, T dy) const           { Rect_ r = *this; r.Offset(dx, dy); return r; }
+	Rect_  Offseted(Sz sz) const                { Rect_ r = *this; r.Offset(sz); return r; }
+	Rect_  Offseted(Pt p) const                 { Rect_ r = *this; r.Offset(p); return r; }
+
+	void   Normalize();
+	Rect_  Normalized() const                   { Rect_ r = *this; r.Normalize(); return r; }
+
+	void   Union(Pt p);
+	void   Union(const Rect_& rc);
+	void   Intersect(const Rect_& rc);
+
+	bool   Contains(T x, T y) const;
+	bool   Contains(Pt p) const                 { return Contains(p.x, p.y); }
+	bool   Contains(const Rect_& rc) const;
+	bool   Intersects(const Rect_& rc) const;
+
+	Pt     Bind(Pt pt) const;
+
+	Rect_& operator+=(Sz sz)                                { Offset(sz); return *this; }
+	Rect_& operator+=(Pt p)                                 { Offset(p); return *this; }
+	Rect_& operator+=(const Rect_& b);
+	Rect_& operator-=(Sz sz)                                { Offset(-sz); return *this; }
+	Rect_& operator-=(Pt p)                                 { Offset(-p); return *this; }
+	Rect_& operator-=(const Rect_& b);
+
+	Rect_& operator|=(Pt p)                                 { Union(p); return *this; }
+	Rect_& operator|=(const Rect_& rc)                      { Union(rc); return *this; }
+	Rect_& operator&=(const Rect_& rc)                      { Intersect(rc); return *this; }
+
+	bool   operator==(const Rect_& b) const;
+	bool   operator!=(const Rect_& b) const                 { return !operator==(b); }
+
+	friend Rect_ operator+(Rect_ a, Sz b)                   { return a += b; }
+	friend Rect_ operator+(Sz a, Rect_ b)                   { return b += a; }
+	friend Rect_ operator+(Rect_ a, Pt b)                   { return a += b; }
+	friend Rect_ operator+(Pt a, Rect_ b)                   { return b += a; }
+	friend Rect_ operator+(Rect_ a, const Rect_& b)         { return a += b; }
+	friend Rect_ operator-(Rect_ a, Sz b)                   { return a -= b; }
+	friend Rect_ operator-(Rect_ a, Pt b)                   { return a -= b; }
+	friend Rect_ operator-(Rect_ a, const Rect_& b)         { return a -= b; }
+	friend Rect_ operator|(Rect_ a, Rect_ b)                { a.Union(b); return a; }
+	friend Rect_ operator&(Rect_ a, Rect_ b)                { a.Intersect(b); return a; }
+	friend bool  operator&&(const Rect_& a, const Rect_& b) { return a.Intersects(b); }
+	friend bool  operator>=(const Rect_& a, Pt b)           { return a.Contains(b); }
+	friend bool  operator<=(Pt a, const Rect_& b)           { return b.Contains(a); }
+	friend bool  operator<=(const Rect_& a, const Rect_& b) { return b.Contains(a); }
+	friend bool  operator>=(const Rect_& b, const Rect_& a) { return a.Contains(b); }
+
+	friend const Rect_& Nvl(const Rect_& a, const Rect_& b) { return IsNull(a) ? b : a; }
+
+	unsigned     GetHashValue() const           { return UPP::GetHashValue(left) ^ UPP::GetHashValue(top) ^ UPP::GetHashValue(right) ^ UPP::GetHashValue(bottom); }
+
+	String ToString() const;
+
+	Rect_()                                     {}
+	Rect_(T l, T t, T r, T b)                   { Set(l, t, r, b); }
+	Rect_(Pt a, Pt b)                           { Set(a, b); }
+	Rect_(Pt a, Sz sz)                          { Set(a, sz); }
+	Rect_(Sz sz)                                { Set(0, 0, sz.cx, sz.cy); }
+
+	Rect_(const Rect_<int>& r) { Set((T)r.left, (T)r.top, (T)r.right, (T)r.bottom); }
+	Rect_(const Rect_<short>& r) { Set((T)r.left, (T)r.top, (T)r.right, (T)r.bottom); }
+	Rect_(const Rect_<double>& r) { Set((T)r.left, (T)r.top, (T)r.right, (T)r.bottom); }
+	Rect_(const Rect_<int64>& r) { Set((T)r.left, (T)r.top, (T)r.right, (T)r.bottom); }
+
+	Rect_(const Nuller&);
+
+	operator Value() const           { return RichValue<Rect_>(*this); }
+	/*explicit */Rect_(const Value& src) { *this = RichValue<Rect_>::Extract(src); }
+
+	void     Serialize(Stream& s)    { s % left % top % right % bottom; }
+
+#ifdef PLATFORM_WIN32
+	operator const RECT*() const { ASSERT(sizeof(*this) == sizeof(RECT)); return (RECT*)this; }
+	operator RECT*()             { ASSERT(sizeof(*this) == sizeof(RECT)); return (RECT*)this; }
+	operator RECT&()             { ASSERT(sizeof(*this) == sizeof(RECT)); return *(RECT*)this; }
+	operator RECT() const        { RECT r; r.top = top; r.bottom = bottom;
+									       r.left = left; r.right = right; return r; }
+	Rect_(const RECT& rc)        { Set((T)rc.left, (T)rc.top, (T)rc.right, (T)rc.bottom); }
+#endif
+};
+
+template <class T>
+inline Rect_<T>::Rect_(const Nuller&) {
+	left = top = right = bottom = Null;
+}
+
+template <>
+inline Rect_<double>::Rect_(const Nuller&) {
+	left = top = 0;
+	right = bottom = -1;
+}
+
+template <class T>
+bool Rect_<T>::IsNullInstance() const {
+	return IsNull(left);
+}
+
+template <>
+inline bool Rect_<double>::IsNullInstance() const {
+	return left > right || top > bottom;
+}
+
+template <class T>
+Point_<T> Rect_<T>::CenterPos(T cx, T cy) const {
+	return Point_<T>(left + GHalf_(Width() - cx), top + GHalf_(Height() - cy));
+}
+
+template <class T>
+void Rect_<T>::Normalize() {
+	if(left > right) Swap(left, right);
+	if(top > bottom) Swap(top, bottom);
+}
+
+template <class T>
+void Rect_<T>::Union(Pt p) {
+	if(IsNull(p)) return;
+	if(IsNullInstance()) {
+		right = 1 + (left = p.x);
+		bottom = 1 + (top = p.y);
+	}
+	else
+	{
+		if(p.x >= right) right = p.x + 1;
+		else if(p.x <  left) left = p.x;
+		if(p.y >= bottom) bottom = p.y + 1;
+		else if(p.y < top) top = p.y;
+	}
+}
+
+template <>
+inline void Rect_<double>::Union(Point_<double> p) {
+	if(IsNull(p)) return;
+	if(IsNullInstance())
+	{
+		left = right = p.x;
+		top = bottom = p.y;
+	}
+	else
+	{
+		if(p.x < left) left = p.x;
+		else if(p.x > right) right = p.x;
+		if(p.y < top) top = p.y;
+		else if(p.y > bottom) bottom = p.y;
+	}
+}
+
+template <class T>
+void Rect_<T>::Union(const Rect_<T>& r) {
+	if(IsNull(r)) return;
+	if(IsNullInstance()) {
+		Set(r);
+		return;
+	}
+	if(r.left < left) left = r.left;
+	if(r.top < top) top = r.top;
+	if(r.right > right) right = r.right;
+	if(r.bottom > bottom) bottom = r.bottom;
+}
+
+void Rect_double_Union(Rect_<double>& self, const Rect_<double>& r);
+
+template <>
+inline void Rect_<double>::Union(const Rect_<double>& r) {
+	Rect_double_Union(*this, r);
+}
+
+template <class T>
+void Rect_<T>::Intersect(const Rect_<T>& r) {
+	if(r.left > left) left = r.left;
+	if(r.top > top) top = r.top;
+	if(right < left) right = left;
+	if(r.right < right) right = r.right;
+	if(r.bottom < bottom) bottom = r.bottom;
+	if(bottom < top) bottom = top;
+}
+
+template <class T>
+bool Rect_<T>::Contains(T x, T y) const {
+	return x >= left && x < right && y >= top && y < bottom;
+}
+
+template <>
+inline bool Rect_<double>::Contains(double x, double y) const {
+	return x >= left && x <= right && y >= top && y <= bottom;
+}
+
+template <class T>
+bool Rect_<T>::Contains(const Rect_<T>& r) const {
+	return r.left >= left && r.top >= top && r.right <= right && r.bottom <= bottom;
+}
+
+template <class T>
+bool Rect_<T>::Intersects(const Rect_<T>& r) const {
+	if(IsEmpty() || r.IsEmpty()) return false;
+	return r.right > left && r.bottom > top && r.left < right && r.top < bottom;
+}
+
+bool Rect_double_Intersects(const Rect_<double>& self, const Rect_<double>& r);
+
+template <>
+inline bool Rect_<double>::Intersects(const Rect_<double>& r) const {
+	return Rect_double_Intersects(*this, r);
+}
+
+template <class T>
+Point_<T> Rect_<T>::Bind(Point_<T> pt) const {
+	return Point_<T>(pt.x < left ? left : pt.x >= right ? right - 1 : pt.x,
+		             pt.y < top ? top : pt.y >= bottom ? bottom - 1 : pt.y);
+}
+
+Point_<double> Rect_double_Bind(const Rect_<double>& self, Point_<double> pt);
+
+template <>
+inline Point_<double> Rect_<double>::Bind(Point_<double> pt) const {
+	return Rect_double_Bind(*this, pt);
+}
+
+template <class T>
+Rect_<T>& Rect_<T>::operator-=(const Rect_<T>& b) {
+	left -= b.left;
+	top -= b.top;
+	right -= b.right;
+	bottom -= b.bottom;
+	return *this;
+}
+
+template <class T>
+Rect_<T>& Rect_<T>::operator+=(const Rect_<T>& b) {
+	left += b.left;
+	top += b.top;
+	right += b.right;
+	bottom += b.bottom;
+	return *this;
+}
+
+template <class T>
+bool Rect_<T>::operator==(const Rect_& b) const {
+	return top == b.top && bottom == b.bottom && left == b.left && right == b.right;
+}
+
+template <class T>
+String Rect_<T>::ToString() const
+{
+	String str;
+	return str << AsString(TopLeft()) << " - " << AsString(BottomRight())
+	           << " : " << AsString(Size());
+}
+
+typedef Size_<int>     Size;
+typedef Point_<int>    Point;
+typedef Rect_<int>     Rect;
+
+typedef Size_<int16>   Size16;
+typedef Point_<int16>  Point16;
+typedef Rect_<int16>   Rect16;
+
+typedef Size_<double>  Sizef;
+typedef Point_<double> Pointf;
+typedef Rect_<double>  Rectf;
+
+typedef Size_<int64>   Size64;
+typedef Point_<int64>  Point64;
+typedef Rect_<int64>   Rect64;
+
+const int SIZE_V   = 70;
+const int SIZE16_V = 71;
+const int SIZEF_V  = 72;
+const int SIZE64_V = 79;
+
+template<> inline dword ValueTypeNo(const Size&)   { return SIZE_V; }
+template<> inline dword ValueTypeNo(const Size16&) { return SIZE16_V; }
+template<> inline dword ValueTypeNo(const Size64&) { return SIZE64_V; }
+template<> inline dword ValueTypeNo(const Sizef&)  { return SIZEF_V; }
+
+const int POINT_V   = 73;
+const int POINT16_V = 74;
+const int POINTF_V  = 75;
+const int POINT64_V = 80;
+
+template<> inline dword ValueTypeNo(const Point&)   { return POINT_V; }
+template<> inline dword ValueTypeNo(const Point16&) { return POINT16_V; }
+template<> inline dword ValueTypeNo(const Point64&) { return POINT64_V; }
+template<> inline dword ValueTypeNo(const Pointf&)  { return POINTF_V; }
+
+const int RECT_V   = 76;
+const int RECT16_V = 77;
+const int RECTF_V  = 78;
+const int RECT64_V = 81;
+
+template<> inline dword ValueTypeNo(const Rect&)   { return RECT_V; }
+template<> inline dword ValueTypeNo(const Rect16&) { return RECT16_V; }
+template<> inline dword ValueTypeNo(const Rect64&) { return RECT64_V; }
+template<> inline dword ValueTypeNo(const Rectf&)  { return RECTF_V; }
+
+Rect    RectC(int x, int y, int cx, int cy);
+Rect16  Rect16C(int16 x, int16 y, int16 cx, int16 cy);
+Rectf   RectfC(double x, double y, double cx, double cy);
+
+inline Size& operator*=(Size& sz, double a)
+{
+	sz.cx = int(sz.cx * a);
+	sz.cy = int(sz.cy * a);
+	return sz;
+}
+
+inline Size& operator/=(Size& sz, double a)
+{
+	sz.cx = int(sz.cx / a);
+	sz.cy = int(sz.cy / a);
+	return sz;
+}
+
+inline Size& operator*=(Size& sz, Sizef a)
+{
+	sz.cx = int(sz.cx * a.cx);
+	sz.cy = int(sz.cy * a.cy);
+	return sz;
+}
+
+inline Size& operator/=(Size& sz, Sizef a)
+{
+	sz.cx = int(sz.cx / a.cx);
+	sz.cy = int(sz.cy / a.cy);
+	return sz;
+}
+
+inline Sizef operator*(Size sz, double a)   { return Sizef(sz.cx * a, sz.cy * a); }
+inline Sizef operator*(double a, Size sz)   { return Sizef(sz.cx * a, sz.cy * a); }
+inline Sizef operator/(Size sz, double a)   { return Sizef(sz.cx / a, sz.cy / a); }
+inline Sizef operator*(Size sz, Sizef a)    { return Sizef(sz.cx * a.cx, sz.cy * a.cy); }
+inline Sizef operator*(Sizef a, Size sz)    { return Sizef(sz.cx * a.cx, sz.cy * a.cy); }
+inline Sizef operator/(Size sz, Sizef a)    { return Sizef(sz.cx / a.cx, sz.cy / a.cy); }
+
+inline Size16& operator*=(Size16& sz, double a)
+{
+	sz.cx = int16(sz.cx * a);
+	sz.cy = int16(sz.cy * a);
+	return sz;
+}
+
+inline Size16& operator/=(Size16& sz, double a)
+{
+	sz.cx = int16(sz.cx / a);
+	sz.cy = int16(sz.cy / a);
+	return sz;
+}
+
+inline Size16& operator*=(Size16& sz, Sizef a)
+{
+	sz.cx = int16(sz.cx * a.cx);
+	sz.cy = int16(sz.cy * a.cy);
+	return sz;
+}
+
+inline Size16& operator/=(Size16& sz, Sizef a)
+{
+	sz.cx = int16(sz.cx / a.cx);
+	sz.cy = int16(sz.cy / a.cy);
+	return sz;
+}
+
+inline Sizef operator*(Size16 sz, double a)   { return Sizef(sz.cx * a, sz.cy * a); }
+inline Sizef operator*(double a, Size16 sz)   { return Sizef(sz.cx * a, sz.cy * a); }
+inline Sizef operator/(Size16 sz, double a)   { return Sizef(sz.cx / a, sz.cy / a); }
+inline Sizef operator*(Size16 sz, Sizef a)  { return Sizef(sz.cx * a.cx, sz.cy * a.cy); }
+inline Sizef operator*(Sizef a, Size16 sz)  { return Sizef(sz.cx * a.cx, sz.cy * a.cy); }
+inline Sizef operator/(Size16 sz, Sizef a)  { return Sizef(sz.cx / a.cx, sz.cy / a.cy); }
+
+inline Rect RectC(int x, int y, int cx, int cy) {
+	return Rect(x, y, x + cx, y + cy);
+}
+
+inline Rect16  Rect16C(int16 x, int16 y, int16 cx, int16 cy) {
+	return Rect16(x, y, x + cx, y + cy);
+}
+
+inline Rectf   RectfC(double x, double y, double cx, double cy) {
+	return Rectf(x, y, x + cx, y + cy);
+}
+
+inline Rect  RectSort(Point a, Point b)    { return Rect(min(a, b), max(a, b) + 1); }
+inline Rectf RectfSort(Pointf a, Pointf b) { return Rectf(min(a, b), max(a, b)); }
+
+Stream& Pack16(Stream& s, Point& p);
+Stream& Pack16(Stream& s, Size& sz);
+Stream& Pack16(Stream& s, Rect& r);
+
+Size iscale(Size a,  int b, int c);
+Size iscalefloor(Size a,  int b, int c);
+Size iscaleceil(Size a,  int b, int c);
+Size idivfloor(Size a,  int b);
+Size idivceil(Size a,  int b);
+Size iscale(Size a,  Size b, Size c);
+Size iscalefloor(Size a,  Size b, Size c);
+Size iscaleceil(Size a,  Size b, Size c);
+Size idivfloor(Size a,  Size b);
+Size idivceil(Size a,  Size b);
+
+enum Alignment {
+	ALIGN_NULL,
+	ALIGN_LEFT,
+	ALIGN_TOP = ALIGN_LEFT,
+	ALIGN_RIGHT,
+	ALIGN_BOTTOM = ALIGN_RIGHT,
+	ALIGN_CENTER,
+	ALIGN_JUSTIFY,
+};
+
+Size        GetRatioSize(Size stdsize, int cx, int cy);
+Size        GetFitSize(Size objsize, int cx, int cy);
+inline Size GetFitSize(Size objsize, Size intosize) { return GetFitSize(objsize, intosize.cx, intosize.cy); }
diff --git a/uppsrc/Core/Hash.cpp b/uppsrc/Core/Hash.cpp
new file mode 100644
index 000000000..12020679c
--- /dev/null
+++ b/uppsrc/Core/Hash.cpp
@@ -0,0 +1,369 @@
+#include <Core/Core.h>
+
+NAMESPACE_UPP
+
+#ifdef _MSC_VER
+#pragma inline_depth(255)
+#pragma optimize("t", on)
+#endif
+
+unsigned Pow2Bound(unsigned i)
+{
+	unsigned n = 1;
+	while(n < i) {
+		n <<= 1;
+		if(n == 0)
+			return 1 << 31;
+	}
+	return n;
+}
+
+unsigned PrimeBound(unsigned n)
+{
+	static unsigned prime_tab[] = {
+		17, 29, 61, 127, 257, 509, 1021, 2053, 4093, 8191, 16381,
+		32771, 65537, 131071, 262147, 524287, 1048573, 2097143,
+		4194301, 8388617, 16777213, 33554467, 67108859, 134217757,
+		268435459, 536870909, 1073741827, 2147483647u, 4294967291u
+	};
+	return *FindUpperBoundIter(prime_tab, prime_tab + __countof(prime_tab), n);
+}
+
+#ifdef FOLDHASH
+inline unsigned HashBound(unsigned i) { return Pow2Bound(i); }
+#else
+inline unsigned HashBound(unsigned i) { return PrimeBound(i); }
+#endif
+
+void HashBase::Free()
+{
+	if(map)
+		delete [](byte *)map;
+	map = NULL;
+	mcount = 0;
+}
+
+void HashBase::ClearIndex()
+{
+	link.Clear();
+	unlinked = -1;
+	Free();
+}
+
+HashBase::HashBase()
+{
+	unlinked = -1;
+	map = NULL;
+	mcount = 0;
+}
+
+HashBase::HashBase(pick_ HashBase& b)
+: hash(b.hash),
+  link(b.link)
+{
+	map = b.map;
+	mcount = b.mcount;
+	unlinked = b.unlinked;
+	const_cast<HashBase &>(b).map = NULL;
+}
+
+void HashBase::operator=(pick_ HashBase& b)
+{
+	hash = b.hash;
+	link = b.link;
+	Free();
+	map = b.map;
+	mcount = b.mcount;
+	unlinked = b.unlinked;
+	const_cast<HashBase &>(b).map = NULL;
+}
+
+HashBase::HashBase(const HashBase& b, int)
+: hash(b.hash, 0)
+{
+	unlinked = -1;
+	mcount = 0;
+	map = NULL;
+	Reindex();
+}
+
+void HashBase::operator<<=(const HashBase& b)
+{
+	ClearIndex();
+	hash <<= b.hash;
+	Reindex();
+}
+
+HashBase::~HashBase()
+{
+	Free();
+}
+
+inline void HashBase::LinkBefore(int i, Link& l, int bi)
+{
+	Link& bl = link[bi];
+	l.next = bi;
+	l.prev = bl.prev;
+	bl.prev = i;
+	link[l.prev].next = i;
+}
+
+void HashBase::Trim(int count)
+{
+	ASSERT(count <= hash.GetCount() && count >= 0);
+	for(int i = count; i < link.GetCount(); i++)
+		Unlink(i, link[i]);
+	link.Trim(count);
+	hash.SetCount(count);
+}
+
+void HashBase::Drop(int n)
+{
+	Trim(hash.GetCount() - n);
+}
+
+void HashBase::FinishIndex()
+{
+	int q = link.GetCount();
+	link.Reserve(hash.GetAlloc());
+	link.AddN(hash.GetCount() - q);
+	for(int i = q; i < hash.GetCount(); i++)
+		LinkTo(i, link[i], hash[i] & UNSIGNED_HIBIT ? unlinked : Mapi(i));
+}
+
+void HashBase::Reindex(int n)
+{
+	ClearIndex();
+	Free();
+	mcount = n = HashBound(n);
+	map = (int *)new byte[n * sizeof(int)];
+	Fill(map, map + n, -1);
+	FinishIndex();
+}
+
+void HashBase::Reindex()
+{
+	Reindex(hash.GetCount());
+}
+
+void HashBase::Add(unsigned _hash)
+{
+	hash.Add(_hash & ~UNSIGNED_HIBIT);
+	DoIndex();
+}
+
+void  HashBase::SetUn(int i, unsigned _hash)
+{
+	if(map) {
+		Link& lnk = link[i];
+		Unlink(i, lnk);
+		LinkTo(i, lnk, Maph(_hash & ~UNSIGNED_HIBIT));
+	}
+	hash[i] = _hash & ~UNSIGNED_HIBIT;
+}
+
+Vector<int> HashBase::GetUnlinked() const
+{
+	Vector<int> r;
+	int q = unlinked;
+	if(q >= 0) {
+		do {
+			r.Add(q);
+			q = link[q].next;
+		}
+		while(q != unlinked);
+	}
+	return r;
+}
+
+int HashBase::Put(unsigned _hash)
+{
+	if(unlinked < 0) return -1;
+	Link& l = link[unlinked];
+	int i = unlinked;
+	unlinked = link[unlinked].next;
+	if(i == unlinked)
+		unlinked = -1;
+	else {
+		link[l.next].prev = l.prev;
+		link[l.prev].next = l.next;
+	}
+	LinkTo(i, l, Maph(_hash & ~UNSIGNED_HIBIT));
+	hash[i] = _hash & ~UNSIGNED_HIBIT;
+	return i;
+}
+
+void HashBase::Set(int i, unsigned _hash) {
+	if(map) {
+		Link& lnk = link[i];
+		Unlink(i, lnk);
+		int& mi = Maph(_hash & ~UNSIGNED_HIBIT);
+		int ii = mi;
+		if(ii < 0)
+			mi = lnk.prev = lnk.next = i;
+		else
+		if(i < ii) {
+			LinkBefore(i, lnk, ii);
+			mi = i;
+		}
+		else {
+			int l = ii;
+			int h = link[ii].prev;
+			if(h - i < i - l) {
+				while(i < h) {
+					h = link[h].prev;
+				}
+				LinkBefore(i, lnk, link[h].next);
+			}
+			else {
+				l = link[l].next;
+				while(i > l && l != ii) {
+					l = link[l].next;
+				}
+				LinkBefore(i, lnk, l);
+			}
+		}
+	}
+	hash[i] = _hash & ~UNSIGNED_HIBIT;
+}
+
+void HashBase::Shrink() {
+	hash.Shrink();
+	if((int)HashBound(hash.GetCount()) < mcount) {
+		ClearIndex();
+		DoIndex();
+	}
+	else
+		link.Shrink();
+}
+
+void HashBase::Reserve(int n)
+{
+	hash.Reserve(n);
+	link.Reserve(n);
+	if((int)HashBound(n) > mcount)
+		Reindex(n);
+}
+
+void HashBase::Remove(int i)
+{
+	hash.Remove(i);
+	ClearIndex();
+	Reindex();
+}
+
+void HashBase::Remove(int i, int count)
+{
+	hash.Remove(i, count);
+	ClearIndex();
+	Reindex();
+}
+
+void HashBase::Remove(const int *sorted_list, int count)
+{
+	hash.Remove(sorted_list, count);
+	ClearIndex();
+	Reindex();
+}
+
+void HashBase::Insert(int i, unsigned _hash) {
+	hash.Insert(i, _hash & ~UNSIGNED_HIBIT);
+	ClearIndex();
+	Reindex();
+}
+
+#ifdef UPP
+void HashBase::Serialize(Stream& s) {
+	int version = 0;
+	s / version;
+	if(s.IsLoading())
+		ClearIndex();
+	hash.Serialize(s);
+	Reindex();
+}
+#endif
+
+void HashBase::Swap(HashBase& b) {
+	UPP::Swap(hash, b.hash);
+	UPP::Swap(link, b.link);
+	UPP::Swap(map, b.map);
+	UPP::Swap(mcount, b.mcount);
+	UPP::Swap(unlinked, b.unlinked);
+}
+
+
+#ifdef CPU_X86
+
+unsigned memhash(const void *ptr, size_t count)
+{
+	unsigned hash = 1234567890U;
+
+	const unsigned *ds = (unsigned *)ptr;
+	const unsigned *de = ds + (count >> 2);
+	while(ds < de)
+		hash = ((hash << 5) - hash) ^ *ds++;
+
+	const byte *s = (byte *)ds;
+	const byte *e = s + (count & 3);
+	while(s < e)
+		hash = ((hash << 5) - hash) ^ *s++;
+
+	return hash;
+}
+
+#else
+
+unsigned memhash(const void *ptr, size_t count)
+{
+	unsigned hash = 1234567890U;
+
+	const byte *s = (byte *)ptr;
+	const byte *e = s + count;
+	while(s < e)
+		hash = ((hash << 5) - hash) ^ *s++;
+
+	return hash;
+}
+
+#endif
+
+unsigned GetHashValue0(const double& d)
+{
+	return memhash(&d, sizeof(double));
+}
+
+void Bits::Clear()
+{
+	if(bp && alloc >= 0)
+		delete[] bp;
+	alloc = 0;
+	bp = NULL;
+}
+
+void Bits::Set(int i, bool b)
+{
+	ASSERT(i >= 0 && alloc >= 0);
+	int q = i >> 5;
+	if(q >= alloc) {
+		int nalloc = 2 * q + 1;
+		dword *nbp = new dword[nalloc];
+		if(bp) {
+			Copy(nbp, bp, bp + alloc);
+			delete[] bp;
+		}
+		Fill(nbp + alloc, nbp + nalloc, (dword)0);
+		bp = nbp;
+		alloc = nalloc;
+	}
+	i &= 31;
+	ASSERT(q < alloc);
+	bp[q] = (bp[q] & ~(1 << i)) | (b << i);
+}
+
+void Bits::Set(int i, bool b, int count)
+{ //! Optimize !!!
+	while(count--)
+		Set(i++, b);
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/Core/HeapImp.h b/uppsrc/Core/HeapImp.h
new file mode 100644
index 000000000..34b8970a2
--- /dev/null
+++ b/uppsrc/Core/HeapImp.h
@@ -0,0 +1,164 @@
+void *SysAllocRaw(size_t size);
+void  SysFreeRaw(void *ptr, size_t size);
+
+void *AllocRaw4KB();
+void *AllocRaw64KB();
+void *LAlloc(size_t& size);
+void  LFree(void *ptr);
+
+struct Heap {
+	enum { CACHE = 16 };
+
+	static int Ksz(int k) {
+		return k < 14 ? (k + 1) << 4 : k == 17 ? 576 : k == 16 ? 448 : k == 15 ? 368 : 288;
+	}
+
+	struct FreeLink {
+		FreeLink *next;
+	};
+
+	struct Page {
+		byte         klass;
+		byte         active;
+		Heap        *heap;
+		FreeLink    *freelist;
+		Page        *next;
+		Page        *prev;
+
+		void         LinkSelf()            { Dbl_Self(this); }
+		void         Unlink()              { Dbl_Unlink(this); }
+		void         Link(Page *lnk)       { Dbl_LinkAfter(this, lnk);  }
+
+		void         Format(int k);
+
+		byte *Begin()                      { return (byte *)this + sizeof(Page); }
+		byte *End()                        { return (byte *)this + 4096; }
+		int   Count()                      { return (End() - Begin()) / Ksz(klass); }
+	};
+
+	struct Header;
+
+	struct DLink {
+		DLink       *next;
+		DLink       *prev;
+
+		void         LinkSelf()            { Dbl_Self(this); }
+		void         Unlink()              { Dbl_Unlink(this); }
+		void         Link(DLink *lnk)      { Dbl_LinkAfter(this, lnk);  }
+
+		Header      *GetHeader()           { return (Header *)this - 1; }
+	};
+
+	struct Header {
+		byte    free;
+		byte    filler1, filler2, filler3;
+		word    size;
+		word    prev;
+		Heap   *heap;
+	#ifdef CPU_32
+		dword   filler4;
+	#endif
+
+		DLink      *GetBlock()             { return (DLink *)(this + 1); }
+		Header     *Next()                 { return (Header *)((byte *)this + size) + 1; }
+		Header     *Prev()                 { return (Header *)((byte *)this - prev) - 1; }
+	};
+
+	struct BigHdr : DLink {
+		size_t       size;
+	};
+
+	enum {
+		NKLASS = 18,
+		LBINS = 113,
+		LARGEHDRSZ = 24,
+		MAXBLOCK = 65536 - 2 * sizeof(Header) - LARGEHDRSZ,
+		BIGHDRSZ = 56,
+	};
+	static StaticMutex mutex;
+
+	Page      work[NKLASS][1];
+	Page      full[NKLASS][1];
+	Page     *empty[NKLASS];
+	FreeLink *cache[NKLASS];
+	int       cachen[NKLASS];
+	
+	bool      initialized;
+
+	static word  BinSz[LBINS];
+	static byte  SzBin[MAXBLOCK / 8 + 1];
+	static byte  BlBin[MAXBLOCK / 8 + 1];
+
+	DLink  large[1];
+	int    lcount;
+	DLink  freebin[LBINS][1];
+	static DLink lempty[1];
+
+	FreeLink *remote_free;
+
+	static DLink big[1];
+	static Heap  aux;
+	
+#ifdef HEAPDBG
+	static void  DbgFreeFill(void *ptr, int size);
+	static void  DbgFreeCheck(void *ptr, int size);
+	static void  DbgFreeFillK(void *ptr, int k);
+	static void *DbgFreeCheckK(void *p, int k);
+#else
+	static void  DbgFreeFill(void *ptr, int size) {}
+	static void  DbgFreeCheck(void *ptr, int size) {}
+	static void  DbgFreeFillK(void *ptr, int k) {}
+	static void *DbgFreeCheckK(void *p, int k) { return p; }
+#endif
+
+#ifdef flagHEAPSTAT
+	static void  Stat(size_t sz);
+#else
+	static void  Stat(size_t sz) {}
+#endif
+
+	void  FreeRemoteRaw();
+	void  FreeRemote();
+
+	void  Init();
+
+	static int   CheckPageFree(FreeLink *l, int k);
+	void  Check();
+	static void  Assert(bool b);
+	static void  DblCheck(Page *p);
+	static void  AssertLeaks(bool b);
+
+	Page *WorkPage(int k);
+	void *AllocK(int k);
+	void  FreeK(void *ptr, Page *page, int k);
+	void *Allok(int k);
+	void  Freek(void *ptr, int k);
+	void  FreeDirect(void *ptr);
+	void  MoveLarge(Heap *dest, DLink *l);
+	void  MoveToEmpty(DLink *l, Header *bh);
+
+	static void GlobalLInit();
+	static int  SizeToBin(int n) { return SzBin[(n - 1) >> 3]; }
+
+	void   LinkFree(DLink *b, int size);
+	DLink *AddChunk();
+	void  *DivideBlock(DLink *b, int size, int ii);
+	void  *TryLAlloc(int ii, int size);
+	void  *LAlloc(size_t& size);
+	void   LFree(void *ptr);
+	void   Make(MemoryProfile& f);
+
+	void RemoteFree(void *ptr);
+	void Shutdown();
+	static void AuxFinalCheck();
+
+	void *Alloc(size_t sz);
+	void *AllocSz(size_t& sz);
+	void  Free(void *ptr);
+	void *Alloc32();
+	void  Free32(void *ptr);
+	void *Alloc48();
+	void  Free48(void *ptr);
+};
+
+extern thread__ Heap heap;
diff --git a/uppsrc/Core/Index.h b/uppsrc/Core/Index.h
new file mode 100644
index 000000000..4fb6dace4
--- /dev/null
+++ b/uppsrc/Core/Index.h
@@ -0,0 +1,240 @@
+#define FOLDHASH
+
+enum { UNSIGNED_HIBIT = 0x80000000 };
+
+class HashBase : Moveable<HashBase> {
+	struct Link : Moveable<Link> {
+		int   next;
+		int   prev;
+	};
+	Vector<unsigned> hash;
+	Vector<Link>     link;
+	int             *map;
+	int              mcount;
+	int              unlinked;
+
+	void  LinkBefore(int i, Link& l, int bi);
+	void  LinkTo(int i, Link& l, int& m);
+	void  Unlink(int i, Link& l, int& mi);
+	void  Unlink(int i, Link& l);
+	int&  Maph(unsigned _hash) const;
+	int&  Mapi(int i) const;
+	void  FinishIndex();
+	void  DoIndex();
+	void  Free();
+
+public:
+	void  ClearIndex();
+	void  Reindex(int n);
+	void  Reindex();
+
+	void  Add(unsigned hash);
+	void  Set(int i, unsigned hash);
+	void  SetUn(int i, unsigned hash);
+	unsigned operator [] (int i) const      { return hash[i]; }
+	int   Find(unsigned hash) const;
+	int   FindNext(int i) const;
+	int   FindLast(unsigned hash) const;
+	int   FindPrev(int i) const;
+	int   Put(unsigned hash);
+
+	bool  IsUnlinked(int i) const           { return hash[i] & UNSIGNED_HIBIT; }
+	void  Unlink(int i);
+	Vector<int> GetUnlinked() const;
+
+	void  Remove(int i);
+	void  Remove(int i, int count);
+	void  Remove(const int *sorted_list, int count);
+	void  Insert(int i, unsigned hash);
+
+	int   GetCount() const                  { return hash.GetCount(); }
+	void  Trim(int count);
+	void  Drop(int n);
+	void  Clear()                           { hash.Clear(); ClearIndex(); }
+
+	void  Reserve(int n);
+	void  Shrink();
+
+#ifdef UPP
+	void  Serialize(Stream& s);
+#endif
+
+	HashBase();
+	~HashBase();
+
+	HashBase(pick_ HashBase& b);
+	void operator=(pick_ HashBase& b);
+	HashBase(const HashBase& b, int);
+	void operator<<=(const HashBase& b);
+
+	bool  IsPicked() const                  { return hash.IsPicked(); }
+
+	const unsigned *Begin() const           { return hash.Begin(); }
+	const unsigned *End() const             { return hash.End(); }
+
+	void Swap(HashBase& b);
+};
+
+template <class T>
+struct StdHash {
+	unsigned operator()(const T& x) const { return GetHashValue(x); }
+};
+
+struct PtrHash {
+	unsigned operator()(const void *x) const { return GetHashValue((unsigned)(uintptr_t)x); }
+};
+
+template <class T, class V, class HashFn>
+class AIndex {
+protected:
+	V         key;
+	HashBase  hash;
+
+	int      Find0(const T& x, int i) const {
+		while(i >= 0 && !(x == key[i])) i = hash.FindNext(i);
+		return i;
+	}
+	int      FindB(const T& x, int i) const {
+		while(i >= 0 && !(x == key[i])) i = hash.FindPrev(i);
+		return i;
+	}
+	void     Hash();
+
+public:
+	HashFn   hashfn;
+
+	void     Add(const T& x, unsigned _hash);
+	void     Add(const T& x);
+	int      FindAdd(const T& key, unsigned _hash);
+	int      FindAdd(const T& key);
+	AIndex&  operator<<(const T& x)          { Add(x); return *this; }
+
+	int      Put(const T& x, unsigned _hash);
+	int      Put(const T& x);
+	int      FindPut(const T& key, unsigned _hash);
+	int      FindPut(const T& key);
+
+	int      Find(const T& x, unsigned _hash) const;
+	int      Find(const T& x) const;
+	int      FindNext(int i) const;
+	int      FindLast(const T& x, unsigned _hash) const;
+	int      FindLast(const T& x) const;
+	int      FindPrev(int i) const;
+
+	void     Set(int i, const T& x, unsigned _hash);
+	void     Set(int i, const T& x);
+
+	const T& operator[](int i) const         { return key[i]; }
+	int      GetCount() const                { return key.GetCount(); }
+	bool     IsEmpty() const                 { return key.IsEmpty(); }
+
+	void     Clear()                         { hash.Clear(); key.Clear(); }
+
+	void     ClearIndex()                    { hash.ClearIndex(); }
+	void     Reindex(int n)                  { hash.Reindex(n); }
+	void     Reindex()                       { hash.Reindex(); }
+
+	void     Unlink(int i)                   { hash.Unlink(i); }
+	int      UnlinkKey(const T& k, unsigned h);
+	int      UnlinkKey(const T& k);
+	bool     IsUnlinked(int i) const         { return hash.IsUnlinked(i); }
+	Vector<int> GetUnlinked() const          { return hash.GetUnlinked(); }
+	void     Sweep();
+
+	void     Insert(int i, const T& k, unsigned h);
+	void     Insert(int i, const T& k);
+	void     Remove(int i);
+	void     Remove(int i, int count);
+	void     Remove(const int *sorted_list, int count);
+	void     Remove(const Vector<int>& sorted_list);
+	int      RemoveKey(const T& k, unsigned h);
+	int      RemoveKey(const T& k);
+
+	void     Trim(int n)                     { key.SetCount(n); hash.Trim(n); }
+	void     Drop(int n = 1)                 { key.Drop(n); hash.Drop(n); }
+	const T& Top() const                     { return key.Top(); }
+
+	void     Reserve(int n)                  { key.Reserve(n); hash.Reserve(n); }
+	void     Shrink()                        { key.Shrink(); hash.Shrink(); }
+	int      GetAlloc() const                { return key.GetAlloc(); }
+
+#ifdef UPP
+	void     Serialize(Stream& s);
+#endif
+
+	V        PickKeys() pick_                 { return key; }
+	const V& GetKeys() const                  { return key; }
+
+// Pick assignment & copy. Picked source can only Clear(), ~AIndex(), operator=, operator<<=
+
+	AIndex& operator=(pick_ V& s);
+	AIndex& operator<<=(const V& s);
+
+// Standard container interface
+	typedef T                ValueType;
+	typedef typename V::ConstIterator ConstIterator;
+	ConstIterator  Begin() const                          { return key.Begin(); }
+	ConstIterator  End() const                            { return key.End(); }
+	ConstIterator  GetIter(int pos) const                 { return key.GetIter(pos); }
+
+	void Swap(AIndex& b)                                  { UPP::Swap(hash, b.hash);
+	                                                        UPP::Swap(key, b.key); }
+// Optimalizations
+	friend int  GetCount(const AIndex& v)                 { return v.GetCount(); }
+
+protected:
+	AIndex(pick_ V& s);
+	AIndex(const V& s, int);
+	AIndex() {}
+	AIndex(const AIndex& s, int);
+};
+
+template <class T, class HashFn = StdHash<T> >
+class Index : MoveableAndDeepCopyOption< Index<T, HashFn > >,
+              public AIndex<T, Vector<T>, HashFn> {
+	typedef AIndex< T, Vector<T>, HashFn > B;
+public:
+	T        Pop()                           { T x = B::Top(); B::Drop(); return x; }
+
+	Index() {}
+	Index(pick_ Index& s) : B(s)             {}
+	Index(const Index& s, int) : B(s, 1)     {}
+	Index(pick_ Vector<T>& s) : B(s)         {}
+	Index(const Vector<T>& s, int) : B(s, 1) {}
+
+	Index& operator=(pick_ Vector<T>& x)     { B::operator=(x); return *this; }
+
+	friend void Swap(Index& a, Index& b)     { a.B::Swap(b); }
+
+	typedef typename B::ConstIterator ConstIterator; // GCC bug (?)
+	STL_INDEX_COMPATIBILITY(Index<T _cm_ HashFn>)
+};
+
+template <class T, class HashFn = StdHash<T> >
+class ArrayIndex : MoveableAndDeepCopyOption< ArrayIndex<T, HashFn > >,
+                   public AIndex<T, Array<T>, HashFn> {
+	typedef AIndex< T, Array<T>, HashFn > B;
+public:
+	void     Add(const T& x, unsigned _hash)        { B::Add(x, _hash); }
+	void     Add(const T& x)                        { B::Add(x); }
+	void     Set(int i, const T& x, unsigned _hash) { B::Set(i, x, _hash); }
+	void     Set(int i, const T& x)                 { B::Set(i, x); }
+
+	void     Add(T *newt, unsigned _hash);
+	void     Add(T *newt);
+	void     Set(int i, T *newt, unsigned _hash);
+	void     Set(int i, T *newt);
+
+	ArrayIndex() {}
+	ArrayIndex(pick_ ArrayIndex& s) : B(s)          {}
+	ArrayIndex(const ArrayIndex& s, int) : B(s, 1)  {}
+	ArrayIndex(pick_ Array<T>& s) : B(s)            {}
+	ArrayIndex(const Array<T>& s, int) : B(s, 1)    {}
+
+	ArrayIndex& operator=(pick_ Array<T>& x)        { B::operator=(x); return *this; }
+
+	friend void Swap(ArrayIndex& a, ArrayIndex& b)  { a.B::Swap(b); }
+
+	typedef typename B::ConstIterator ConstIterator; // GCC bug (?)
+	STL_INDEX_COMPATIBILITY(ArrayIndex<T _cm_ HashFn>)
+};
diff --git a/uppsrc/Core/Index.hpp b/uppsrc/Core/Index.hpp
new file mode 100644
index 000000000..572e32b3d
--- /dev/null
+++ b/uppsrc/Core/Index.hpp
@@ -0,0 +1,539 @@
+inline void HashBase::LinkTo(int i, Link& l, int& m)
+{
+	if(m >= 0) {
+		Link& bl = link[m];
+		l.next = m;
+		l.prev = bl.prev;
+		bl.prev = i;
+		link[l.prev].next = i;
+	}
+	else
+		m = l.prev = l.next = i;
+}
+
+inline void HashBase::Unlink(int i, Link& l, int& m)
+{
+	if(i == m) {
+		if(l.next == i) {
+			m = -1;
+			return;
+		}
+		m = l.next;
+	}
+	link[l.next].prev = l.prev;
+	link[l.prev].next = l.next;
+}
+
+inline void HashBase::Unlink(int i, Link& l)
+{
+	Unlink(i, l, hash[i] & UNSIGNED_HIBIT ? unlinked : Mapi(i));
+}
+
+inline int& HashBase::Mapi(int i) const
+{
+	return Maph(hash[i]);
+}
+
+inline int& HashBase::Maph(unsigned _hash) const
+{
+	unsigned h = _hash & ~UNSIGNED_HIBIT;
+#ifdef FOLDHASH
+	return map[(mcount - 1) & (((h >> 23) - (h >> 15) - (h >> 7) - h))];
+#else
+	return map[h % mcount];
+#endif
+}
+
+inline void HashBase::DoIndex()
+{
+	if(hash.GetCount() < mcount)
+		FinishIndex();
+	else
+		Reindex();
+}
+
+inline int HashBase::Find(unsigned _hash) const
+{
+	if(hash.GetCount() == 0) return -1;
+	return Maph(_hash);
+}
+
+inline int HashBase::FindNext(int i) const
+{
+	int q = link[i].next;
+	return q == Mapi(i) ? -1 : q;
+}
+
+inline int HashBase::FindLast(unsigned _hash) const
+{
+	if(hash.GetCount() == 0) return - 1;
+	int i = Find(_hash & ~UNSIGNED_HIBIT);
+	return i >= 0 ? link[i].prev : -1;
+}
+
+inline int HashBase::FindPrev(int i) const
+{
+	int q = link[i].prev;
+	return q == link[Mapi(i)].prev ? -1 : q;
+}
+
+inline void HashBase::Unlink(int i)
+{
+	ASSERT(!IsUnlinked(i));
+	hash[i] |= UNSIGNED_HIBIT;
+	if(i < link.GetCount()) {
+		Link& lnk = link[i];
+		Unlink(i, lnk, Mapi(i));
+		LinkTo(i, lnk, unlinked);
+	}
+}
+
+template <class T, class V, class HashFn>
+AIndex<T, V, HashFn>::AIndex(const AIndex& s, int)
+:	key(s.key, 0),
+	hash(s.hash, 0) {}
+
+template <class T, class V, class HashFn>
+void AIndex<T, V, HashFn>::Hash() {
+	for(int i = 0; i < key.GetCount(); i++)
+		hash.Add(hashfn(key[i]));
+}
+
+template <class T, class V, class HashFn>
+AIndex<T, V, HashFn>& AIndex<T, V, HashFn>::operator=(pick_ V& s) {
+	key = s;
+	hash.Clear();
+	Hash();
+	return *this;
+}
+
+template <class T, class V, class HashFn>
+AIndex<T, V, HashFn>& AIndex<T, V, HashFn>::operator<<=(const V& s) {
+	key <<= s;
+	hash.Clear();
+	Hash();
+	return *this;
+}
+
+template <class T, class V, class HashFn>
+AIndex<T, V, HashFn>::AIndex(pick_ V& s) : key(s) {
+	Hash();
+}
+
+template <class T, class V, class HashFn>
+AIndex<T, V, HashFn>::AIndex(const V& s, int) : key(s, 1) {
+	Hash();
+}
+
+template <class T, class V, class HashFn>
+void AIndex<T, V, HashFn>::Add(const T& x, unsigned _hash) {
+	key.Add(x);
+	hash.Add(_hash);
+}
+
+template <class T, class V, class HashFn>
+void AIndex<T, V, HashFn>::Add(const T& x) {
+	Add(x, hashfn(x));
+}
+
+template <class T, class V, class HashFn>
+int  AIndex<T, V, HashFn>::FindAdd(const T& _key, unsigned _hash) {
+	int i = Find(_key, _hash);
+	if(i >= 0) return i;
+	i = key.GetCount();
+	Add(_key, _hash);
+	return i;
+}
+
+template <class T, class V, class HashFn>
+int AIndex<T, V, HashFn>::Put(const T& x, unsigned _hash)
+{
+	int q = hash.Put(_hash);
+	if(q < 0) {
+		q = key.GetCount();
+		Add(x, _hash);
+	}
+	else
+		key[q] = x;
+	return q;
+}
+
+template <class T, class V, class HashFn>
+int AIndex<T, V, HashFn>::Put(const T& x)
+{
+	return Put(x, hashfn(x));
+}
+
+template <class T, class V, class HashFn>
+int  AIndex<T, V, HashFn>::FindPut(const T& _key, unsigned _hash)
+{
+	int i = Find(_key, _hash);
+	if(i >= 0) return i;
+	return Put(_key, _hash);
+}
+
+template <class T, class V, class HashFn>
+int  AIndex<T, V, HashFn>::FindPut(const T& key)
+{
+	return FindPut(key, hashfn(key));
+}
+
+template <class T, class V, class HashFn>
+inline int AIndex<T, V, HashFn>::Find(const T& x, unsigned _hash) const {
+	return Find0(x, hash.Find(_hash));
+}
+
+template <class T, class V, class HashFn>
+int AIndex<T, V, HashFn>::Find(const T& x) const {
+	return Find(x, hashfn(x));
+}
+
+template <class T, class V, class HashFn>
+int AIndex<T, V, HashFn>::FindNext(int i) const {
+	return Find0(key[i], hash.FindNext(i));
+}
+
+template <class T, class V, class HashFn>
+inline int AIndex<T, V, HashFn>::FindLast(const T& x, unsigned _hash) const {
+	return FindB(x, hash.FindLast(_hash));
+}
+
+template <class T, class V, class HashFn>
+int AIndex<T, V, HashFn>::FindLast(const T& x) const {
+	return FindLast(x, hashfn(x));
+}
+
+template <class T, class V, class HashFn>
+int AIndex<T, V, HashFn>::FindPrev(int i) const {
+	return FindB(key[i], hash.FindPrev(i));
+}
+
+template <class T, class V, class HashFn>
+int  AIndex<T, V, HashFn>::FindAdd(const T& key) {
+	return FindAdd(key, hashfn(key));
+}
+
+template <class T, class V, class HashFn>
+void  AIndex<T, V, HashFn>::Set(int i, const T& x, unsigned _hash) {
+	key[i] = x;
+	hash.Set(i, _hash);
+}
+
+template <class T, class V, class HashFn>
+void  AIndex<T, V, HashFn>::Set(int i, const T& x) {
+	Set(i, x, hashfn(x));
+}
+
+#ifdef UPP
+template <class T, class V, class HashFn>
+void AIndex<T, V, HashFn>::Serialize(Stream& s) {
+	if(s.IsLoading()) ClearIndex();
+	key.Serialize(s);
+	hash.Serialize(s);
+}
+#endif
+
+template <class T, class V, class HashFn>
+int AIndex<T, V, HashFn>::UnlinkKey(const T& k, unsigned h)
+{
+	int n = 0;
+	int q = hash.Find(h);
+	while(q >= 0) {
+		int w = q;
+		q = hash.FindNext(q);
+		if(k == key[w]) {
+			hash.Unlink(w);
+			n++;
+		}
+	}
+	return n;
+}
+
+template <class T, class V, class HashFn>
+int AIndex<T, V, HashFn>::UnlinkKey(const T& k)
+{
+	return UnlinkKey(k, hashfn(k));
+}
+
+template <class T, class V, class HashFn>
+void AIndex<T, V, HashFn>::Sweep()
+{
+	Vector<int> b = hash.GetUnlinked();
+	Sort(b);
+	Remove(b);
+}
+
+template <class T, class V, class HashFn>
+void AIndex<T, V, HashFn>::Insert(int i, const T& k, unsigned h) {
+	key.Insert(i, k);
+	hash.Insert(i, h);
+}
+
+template <class T, class V, class HashFn>
+void AIndex<T, V, HashFn>::Insert(int i, const T& k) {
+	key.Insert(i, k);
+	hash.Insert(i, hashfn(k));
+}
+
+template <class T, class V, class HashFn>
+void AIndex<T, V, HashFn>::Remove(int i)
+{
+	key.Remove(i);
+	hash.Remove(i);
+}
+
+template <class T, class V, class HashFn>
+void AIndex<T, V, HashFn>::Remove(int i, int count)
+{
+	key.Remove(i, count);
+	hash.Remove(i, count);
+}
+
+template <class T, class V, class HashFn>
+void AIndex<T, V, HashFn>::Remove(const int *sorted_list, int count)
+{
+	key.Remove(sorted_list, count);
+	hash.Remove(sorted_list, count);
+}
+
+template <class T, class V, class HashFn>
+void AIndex<T, V, HashFn>::Remove(const Vector<int>& sl)
+{
+	Remove(sl, sl.GetCount());
+}
+
+template <class T, class V, class HashFn>
+int AIndex<T, V, HashFn>::RemoveKey(const T& k, unsigned h)
+{
+	Vector<int> rk;
+	int q = Find(k, h);
+	while(q >= 0) {
+		rk.Add(q);
+		q = FindNext(q);
+	}
+	Remove(rk);
+	return rk.GetCount();
+}
+
+template <class T, class V, class HashFn>
+int AIndex<T, V, HashFn>::RemoveKey(const T& k)
+{
+	return RemoveKey(k, hashfn(k));
+}
+
+// ------------------
+
+template <class T, class HashFn>
+void ArrayIndex<T, HashFn>::Add(T *newt, unsigned _hash) {
+	B::key.Add(newt);
+	B::hash.Add(_hash);
+}
+
+template <class T, class HashFn>
+void ArrayIndex<T, HashFn>::Add(T *newt) {
+	Add(newt, B::hashfn(*newt));
+}
+
+template <class T, class HashFn>
+void ArrayIndex<T, HashFn>::Set(int i, T *newt, unsigned _hash) {
+	B::key.Set(i, newt);
+	B::hash.Set(i, _hash);
+}
+
+template <class T, class HashFn>
+void ArrayIndex<T, HashFn>::Set(int i, T *newt) {
+	Set(i, newt, B::hashfn(*newt));
+}
+
+// --------------------
+
+template <class K, class T, class V, class HashFn>
+int AMap<K, T, V, HashFn>::FindAdd(const K& k) {
+	unsigned hash = key.hashfn(k);
+	int i = Find(k, hash);
+	if(i < 0) {
+		i = GetCount();
+		key.Add(k, hash);
+		value.Add();
+	}
+	return i;
+}
+
+template <class K, class T, class V, class HashFn>
+int AMap<K, T, V, HashFn>::FindAdd(const K& k, const T& x) {
+	unsigned hash = key.hashfn(k);
+	int i = Find(k, hash);
+	if(i < 0) {
+		i = GetCount();
+		key.Add(k, hash);
+		value.Add(x);
+	}
+	return i;
+}
+
+template <class K, class T, class V, class HashFn>
+int AMap<K, T, V, HashFn>::FindAddPick(const K& k, pick_ T& x) {
+	unsigned hash = key.hashfn(k);
+	int i = Find(k, hash);
+	if(i < 0) {
+		i = GetCount();
+		key.Add(k, hash);
+		value.Add(x);
+	}
+	return i;
+}
+
+template <class K, class T, class V, class HashFn>
+int AMap<K, T, V, HashFn>::Put(const K& k, const T& x)
+{
+	int i = key.Put(k);
+	if(i < value.GetCount())
+		value[i] = x;
+	else {
+		ASSERT(i == value.GetCount());
+		value.Add(x);
+	}
+	return i;
+}
+
+template <class K, class T, class V, class HashFn>
+int AMap<K, T, V, HashFn>::PutPick(const K& k, pick_ T& x)
+{
+	int i = key.Put(k);
+	if(i < value.GetCount())
+		value[i] = x;
+	else {
+		ASSERT(i == value.GetCount());
+		value.AddPick(x);
+	}
+	return i;
+}
+
+template <class K, class T, class V, class HashFn>
+T&  AMap<K, T, V, HashFn>::Put(const K& k)
+{
+	int i = key.Put(k);
+	if(i < value.GetCount())
+		return value[i];
+	else {
+		ASSERT(i == value.GetCount());
+		return value.Add();
+	}
+}
+
+template <class K, class T, class V, class HashFn>
+int AMap<K, T, V, HashFn>::FindPut(const K& k)
+{
+	unsigned hash = key.hashfn(k);
+	int i = Find(k, hash);
+	if(i < 0) {
+		i = key.Put(k, hash);
+		value.At(i);
+	}
+	return i;
+}
+
+template <class K, class T, class V, class HashFn>
+int AMap<K, T, V, HashFn>::FindPut(const K& k, const T& init)
+{
+	unsigned hash = key.hashfn(k);
+	int i = Find(k, hash);
+	if(i < 0) {
+		i = key.Put(k, hash);
+		if(i >= value.GetCount()) {
+			ASSERT(i == value.GetCount());
+			i = value.GetCount();
+			value.Add(init);
+		}
+		else
+			value[i] = init;
+	}
+	return i;
+}
+
+template <class K, class T, class V, class HashFn>
+int AMap<K, T, V, HashFn>::FindPutPick(const K& k, pick_ T& init)
+{
+	unsigned hash = key.hashfn(k);
+	int i = Find(k, hash);
+	if(i < 0) {
+		i = key.Put(k, hash);
+		value.At(i) = init;
+	}
+	return i;
+}
+
+template <class K, class T, class V, class HashFn>
+T&  AMap<K, T, V, HashFn>::GetAdd(const K& k) {
+	unsigned hash = key.hashfn(k);
+	int i = key.Find(k, hash);
+	if(i >= 0)
+		return value[i];
+	key.Add(k, hash);
+	return value.Add();
+}
+
+template <class K, class T, class V, class HashFn>
+T&  AMap<K, T, V, HashFn>::GetAdd(const K& k, const T& x) {
+	unsigned hash = key.hashfn(k);
+	int i = Find(k, hash);
+	if(i >= 0) return value[i];
+	key.Add(k, hash);
+	value.Add(x);
+	return value.Top();
+}
+
+template <class K, class T, class V, class HashFn>
+T&  AMap<K, T, V, HashFn>::GetAddPick(const K& k, pick_ T& x) {
+	unsigned hash = key.hashfn(k);
+	int i = Find(k, hash);
+	if(i >= 0) return value[i];
+	key.Add(k, hash);
+	value.AddPick(x);
+	return value.Top();
+}
+
+template <class K, class T, class V, class HashFn>
+T&  AMap<K, T, V, HashFn>::GetPut(const K& k) {
+	return value[FindAdd(k)];
+}
+
+template <class K, class T, class V, class HashFn>
+T&  AMap<K, T, V, HashFn>::GetPut(const K& k, const T& x) {
+	return value[FindAdd(k, x)];
+}
+
+template <class K, class T, class V, class HashFn>
+T&  AMap<K, T, V, HashFn>::GetPutPick(const K& k, pick_ T& x) {
+	return value[FindAddPick(k, x)];
+}
+
+#ifdef UPP
+template <class K, class T, class V, class HashFn>
+void AMap<K, T, V, HashFn>::Serialize(Stream& s) {
+	int version = 0;
+	s / version % key % value;
+}
+#endif
+
+template <class K, class T, class V, class HashFn>
+int AMap<K, T, V, HashFn>::RemoveKey(const K& k)
+{
+	Vector<int> rk;
+	int q = Find(k);
+	while(q >= 0) {
+		rk.Add(q);
+		q = FindNext(q);
+	}
+	Remove(rk);
+	return rk.GetCount();
+}
+
+template <class K, class T, class V, class HashFn>
+void AMap<K, T, V, HashFn>::Sweep()
+{
+	Vector<int> b = key.GetUnlinked();
+	Sort(b);
+	key.Remove(b);
+	value.Remove(b);
+}
diff --git a/uppsrc/Core/Kernel32W.dli b/uppsrc/Core/Kernel32W.dli
new file mode 100644
index 000000000..22f07c82c
--- /dev/null
+++ b/uppsrc/Core/Kernel32W.dli
@@ -0,0 +1,16 @@
+FN_C(UINT, WINAPI, GetSystemDirectoryW, (LPWSTR lpBuffer, UINT uSize))
+FN_C(DWORD, WINAPI, GetTempPathW, (DWORD nBufferLength, LPWSTR lpBuffer))
+FN_C(UINT , WINAPI,  GetWindowsDirectoryW, (LPWSTR lpBuffer, UINT uSize))
+FN_C(DWORD , WINAPI,  GetModuleFileNameW, (HMODULE hModule, LPWSTR lpFilename, DWORD nSize))
+FN_C(int , WINAPI,  GetLocaleInfoW, (LCID Locale, LCTYPE LCType, LPWSTR lpLCData, int cchData))
+FN_C(DWORD , WINAPI,  GetCurrentDirectoryW, (DWORD nBufferLength, LPWSTR lpBuffer))
+FN_C(DWORD , WINAPI,  GetFullPathNameW, (LPCWSTR lpFileName, DWORD nBufferLength, LPWSTR lpBuffer, LPWSTR *lpFilePart))
+FN_C(HANDLE , WINAPI,  FindFirstFileW, (LPCWSTR lpFileName, LPWIN32_FIND_DATAW lpFindFileData))
+FN_C(BOOL, WINAPI, FindNextFileW, (HANDLE hFindFile, LPWIN32_FIND_DATAW lpFindFileData))
+FN_C(BOOL , WINAPI,  GetVolumeInformationA, (LPCSTR lpRootPathName, LPSTR lpVolumeNameBuffer, DWORD nVolumeNameSize, LPDWORD lpVolumeSerialNumber, LPDWORD lpMaximumComponentLength, LPDWORD lpFileSystemFlags, LPSTR lpFileSystemNameBuffer, DWORD nFileSystemNameSize))
+FN_C(HANDLE , WINAPI,  CreateFileW, (LPCWSTR lpFileName, DWORD dwDesiredAccess, DWORD dwShareMode, LPSECURITY_ATTRIBUTES lpSecurityAttributes, DWORD dwCreationDisposition, DWORD dwFlagsAndAttributes, HANDLE hTemplateFile))
+FN_C(BOOL , WINAPI,  CopyFileW, (LPCWSTR lpExistingFileName, LPCWSTR lpNewFileName, BOOL bFailIfExists))
+FN_C(BOOL , WINAPI,  MoveFileW, (LPCWSTR lpExistingFileName, LPCWSTR lpNewFileName))
+FN_C(BOOL , WINAPI,  DeleteFileW, (LPCWSTR lpFileName))
+FN_C(BOOL , WINAPI,  RemoveDirectoryW, (LPCWSTR lpPathName))
+FN_C(BOOL , WINAPI,  CreateDirectoryW, (LPCWSTR lpPathName, LPSECURITY_ATTRIBUTES lpSecurityAttributes))
diff --git a/uppsrc/Core/Lang.cpp b/uppsrc/Core/Lang.cpp
new file mode 100644
index 000000000..61c00db19
--- /dev/null
+++ b/uppsrc/Core/Lang.cpp
@@ -0,0 +1,1097 @@
+#include "Core.h"
+
+#ifdef PLATFORM_WIN32
+#include <wingdi.h>
+#include <winnls.h>
+#endif
+#ifdef PLATFORM_POSIX
+#include <locale.h>
+#include <langinfo.h>
+#endif
+
+NAMESPACE_UPP
+
+#define LLOG(x) // LOG(x)
+
+String LNGAsText(int d)
+{
+	String result;
+	int c = (d >> 15) & 31;
+	if(c) {
+		result.Cat(c + 'A' - 1);
+		c = (d >> 10) & 31;
+		if(c) {
+			result.Cat(c + 'A' - 1);
+			c = (d >> 5) & 31;
+			if(c) {
+				result.Cat('-');
+				result.Cat(c + 'A' - 1);
+				c = d & 31;
+				if(c) result.Cat(c + 'A' - 1);
+			}
+		}
+	}
+	c = (d >> 20) & 255;
+	if(c)
+		result << ' ' << CharsetName(c);
+	return result;
+}
+
+byte GetLNGCharset(int d)
+{
+	byte cs = byte(d >> 20);
+	return cs ? cs : CHARSET_UTF8;
+}
+
+int  SetLNGCharset(int lng, byte chrset)
+{
+	return (lng & ~(0xffffffff << 20)) | (chrset << 20);
+}
+
+int LNGFromText(const char *s)
+{
+	int l = 0;
+	if(IsAlpha(*s)) {
+		l = (ToUpper(*s++) - 'A' + 1) << 15;
+		if(IsAlpha(*s)) {
+			l |= (ToUpper(*s++) - 'A' + 1) << 10;
+			if(*s && !IsAlpha(*s))
+				s++;
+			if(IsAlpha(*s)) {
+				l |= (ToUpper(*s++) - 'A' + 1) << 5;
+				if(IsAlpha(*s)) {
+					l |= (ToUpper(*s++) - 'A' + 1);
+					while(*s && *s != ' ')
+						s++;
+					if(*s == ' ') {
+						s++;
+						int cs = CharsetByName(s);
+						if(cs > 0)
+							l |= (cs << 20);
+						else
+							return 0;
+					}
+					return l;
+				}
+			}
+		}
+	}
+	return 0;
+}
+
+#ifdef PLATFORM_WIN32
+
+String GetUserLocale(dword type)
+{
+#ifdef PLATFORM_WINCE
+	wchar h[256];
+	int n = ::GetLocaleInfo(GetUserDefaultLCID(), type, h, 256);
+	return n ? WString(h, n - 1).ToString() : String();
+#else
+	char h[256];
+	int n =:: GetLocaleInfo(GetUserDefaultLCID(), type, h, 256);
+	return n ? String(h, n - 1) : String();
+#endif
+}
+
+int GetSystemLNG()
+{
+	static int lang;
+	ONCELOCK {
+		lang = LNGFromText(GetUserLocale(LOCALE_SISO639LANGNAME) + GetUserLocale(LOCALE_SISO3166CTRYNAME));
+		if(!lang)
+			lang = LNG_ENGLISH;
+		int cs = atoi(GetUserLocale(LOCALE_IDEFAULTANSICODEPAGE));
+		if(cs >= 1250 && cs <= 1258)
+			lang = SetLNGCharset(lang, CHARSET_WIN1250 + cs - 1250);
+	}
+	return lang;
+}
+#endif
+
+#ifdef PLATFORM_POSIX
+int GetSystemLNG() {
+	static int lang;
+	ONCELOCK {
+		String s = Environment().Get("LANG", Null);
+		lang = LNGFromText(s);
+		if(!lang)
+			lang = LNG_ENGLISH;
+		const char *q = strchr(s, '.');
+		if(q)
+			lang = SetLNGCharset(lang, CharsetByName(q + 1));
+	};
+	return lang;
+};
+
+#endif
+
+class LangConvertClass : public Convert {
+	virtual Value  Format(const Value& q) const {
+		return LNGAsText((int)q);
+	}
+
+	virtual Value  Scan(const Value& text) const {
+		if(IsNull(text)) return 0;
+		int q = LNGFromText((String)text);
+		if(!q) return ErrorValue(t_("Invalid language specification."));
+		return (int) q;
+	}
+
+	virtual int    Filter(int chr) const {
+		return chr == ' ' || chr == '-' || IsDigit(chr) ? chr : IsAlpha(chr) ? ToUpper(chr) : 0;
+	}
+};
+
+Convert& LNGConvert()
+{
+	return Single<LangConvertClass>();
+}
+
+static int sCurrentLanguage = -1;
+
+int  GetCurrentLanguage() {
+	return sCurrentLanguage;
+}
+
+#ifdef PLATFORM_WIN32
+
+typedef VectorMap<int, LCID> LCIDMap;
+GLOBAL_VAR(LCIDMap, GetLCIDMap)
+
+#ifdef PLATFORM_WINCE //TODO?
+String GetLocaleInfoA(LCID lcid, LCTYPE lctype)
+{
+	wchar cbuf[1000];
+	::GetLocaleInfoW(lcid, lctype, cbuf, __countof(cbuf));
+	return FromSystemCharset(cbuf);
+}
+#else
+String GetLocaleInfoA(LCID lcid, LCTYPE lctype)
+{
+	if(IsWinNT()) {
+		wchar cbuf[1000];
+		UnicodeWin32().GetLocaleInfoW(lcid, lctype, cbuf, __countof(cbuf));
+		return FromSystemCharsetW(cbuf);
+	}
+	else {
+		char cbuf[1000];
+		::GetLocaleInfoA(lcid, lctype, cbuf, __countof(cbuf));
+		return FromSystemCharset(cbuf);
+	}
+}
+#endif
+
+WString GetLocaleInfoW(LCID lcid, LCTYPE lctype)
+{
+	union {
+		wchar wbuf[1000];
+		char abuf[1000];
+	};
+	Zero(wbuf);
+	if(::GetLocaleInfoW(lcid, lctype, (WCHAR *)wbuf, __countof(wbuf)))
+		return wbuf;
+#ifdef PLATFORM_WINCE
+	return Null;
+#else
+	::GetLocaleInfoA(lcid, lctype, abuf, __countof(abuf));
+	return ToUnicode(abuf, CHARSET_DEFAULT);
+#endif
+}
+
+#ifdef PLATFORM_WINCE
+static BOOL CALLBACK sEnumLocale(wchar *locale_string)
+#else
+static BOOL CALLBACK sEnumLocale(char *locale_string)
+#endif
+{
+	LLOG(locale_string);
+	LCID lcid = stou(locale_string, NULL, 16);
+#ifdef PLATFORM_WINCE
+	wchar buffer[10];
+#else
+	char buffer[10];
+#endif
+	::GetLocaleInfo(lcid, LOCALE_SISO639LANGNAME, buffer, 10);
+	int language = (ToUpper(buffer[0]) << 24) + (ToUpper(buffer[1]) << 16);
+	::GetLocaleInfo(lcid, LOCALE_SISO3166CTRYNAME, buffer, 10);
+	language += (ToUpper(buffer[0]) << 8) + (ToUpper(buffer[1]) << 0);
+	LLOG(FormatIntHex(language, 8) << ", " << LNGAsText(language) << "->" << FormatIntHex(lcid, 8));
+	GetLCIDMap().GetAdd(language, lcid);
+	return TRUE;
+}
+
+LCID GetLanguageLCID(int language)
+{
+	if(language == 0)
+		return 0x400;
+	ONCELOCK {
+		EnumSystemLocales(&sEnumLocale, LCID_SUPPORTED);
+	}
+	return GetLCIDMap().Get(language, MAKELCID(MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL), SORT_DEFAULT));
+}
+#endif
+
+void SetLanguage(int lang) {
+	if(lang != LNG_CURRENT) {
+		sCurrentLanguage = lang;
+		SetDefaultCharset(GetLNGCharset(lang));
+	}
+	SetCurrentLanguage(lang);
+}
+
+const int *GetAllLanguages() {
+	static int all_langs[] = {
+		LNG_('E', 'N', 'U', 'S'),
+		LNG_('E', 'N', 'G', 'B'),
+		LNG_('E', 'N', 'A', 'U'),
+		LNG_('E', 'N', 'C', 'A'),
+		LNG_('E', 'N', 'N', 'Z'),
+		LNG_('E', 'N', 'I', 'E'),
+		LNG_('E', 'N', 'Z', 'A'),
+		LNG_('E', 'N', 'J', 'M'),
+		LNG_('E', 'N', 'C', 'B'),
+		LNG_('E', 'N', 'B', 'Z'),
+		LNG_('E', 'N', 'T', 'T'),
+		LNG_('B', 'G', 'B', 'G'),
+		LNG_('C', 'S', 'C', 'Z'),
+		LNG_('D', 'A', 'D', 'K'),
+		LNG_('D', 'E', 'D', 'E'),
+		LNG_('D', 'E', 'C', 'H'),
+		LNG_('D', 'E', 'A', 'T'),
+		LNG_('D', 'E', 'L', 'U'),
+		LNG_('D', 'E', 'L', 'I'),
+		LNG_('E', 'L', 'G', 'R'),
+		LNG_('E', 'S', 'E', 'S'),
+		LNG_('E', 'S', 'M', 'X'),
+		LNG_('E', 'S', 'E', 'S'),
+		LNG_('E', 'S', 'G', 'T'),
+		LNG_('E', 'S', 'C', 'R'),
+		LNG_('E', 'S', 'P', 'A'),
+		LNG_('E', 'S', 'D', 'O'),
+		LNG_('E', 'S', 'V', 'E'),
+		LNG_('E', 'S', 'C', 'O'),
+		LNG_('E', 'S', 'P', 'E'),
+		LNG_('E', 'S', 'A', 'R'),
+		LNG_('E', 'S', 'E', 'C'),
+		LNG_('E', 'S', 'C', 'L'),
+		LNG_('E', 'S', 'U', 'Y'),
+		LNG_('E', 'S', 'P', 'Y'),
+		LNG_('E', 'S', 'B', 'O'),
+		LNG_('E', 'S', 'S', 'V'),
+		LNG_('E', 'S', 'H', 'N'),
+		LNG_('E', 'S', 'N', 'I'),
+		LNG_('E', 'S', 'P', 'R'),
+		LNG_('F', 'I', 'F', 'I'),
+		LNG_('F', 'R', 'F', 'R'),
+		LNG_('F', 'R', 'B', 'E'),
+		LNG_('F', 'R', 'C', 'A'),
+		LNG_('F', 'R', 'C', 'H'),
+		LNG_('F', 'R', 'L', 'U'),
+		LNG_('H', 'U', 'H', 'U'),
+		LNG_('I', 'S', 'I', 'S'),
+		LNG_('I', 'T', 'I', 'T'),
+		LNG_('I', 'T', 'C', 'H'),
+		LNG_('N', 'L', 'N', 'L'),
+		LNG_('N', 'L', 'B', 'E'),
+		LNG_('N', 'O', 'N', 'O'),
+		LNG_('N', 'O', 'N', 'O'),
+		LNG_('P', 'L', 'P', 'L'),
+		LNG_('P', 'T', 'B', 'R'),
+		LNG_('P', 'T', 'P', 'T'),
+		LNG_('R', 'O', 'R', 'O'),
+		LNG_('R', 'U', 'R', 'U'),
+		LNG_('H', 'R', 'H', 'R'),
+		LNG_('S', 'R', 'S', 'P'),
+		LNG_('S', 'R', 'S', 'P'),
+		LNG_('S', 'K', 'S', 'K'),
+		LNG_('S', 'V', 'S', 'E'),
+		LNG_('S', 'V', 'F', 'I'),
+		LNG_('T', 'R', 'T', 'R'),
+		LNG_('S', 'L', 'S', 'I'),
+		LNG_('A', 'F', 'Z', 'A'),
+		LNG_('S', 'Q', 'A', 'L'),
+		LNG_('E', 'U', 'E', 'S'),
+		LNG_('B', 'E', 'B', 'Y'),
+		LNG_('C', 'A', 'E', 'S'),
+		LNG_('E', 'T', 'E', 'E'),
+		LNG_('F', 'O', 'F', 'O'),
+		LNG_('I', 'D', 'I', 'D'),
+		LNG_('L', 'V', 'L', 'V'),
+		LNG_('L', 'T', 'L', 'T'),
+		LNG_('U', 'K', 'U', 'A'),
+		LNG_('Z', 'H', 'C', 'N'),
+		LNG_('K', 'O', 'K', 'R'),
+		LNG_('J', 'A', 'J', 'P'),
+		0
+	};
+	return all_langs;
+}
+
+String GetLangName(int language)
+{
+	return GetLanguageInfo(language).english_name;
+}
+
+/*
+	char buffer[200];
+	if(language & 0x1000000) {
+		language &= 15;
+		static char *name[] = {
+			"ANSI",
+			"RUSSIAN",
+			"EASTEUROPE",
+			"GREEK",
+			"TURKISH",
+			"BALTIC",
+			"HEBREW",
+			"ARABIC"
+		};
+		return String(name[language & 7]) + (language < 8 ? " I" : " II");
+	}
+	return GetLocaleInfo(MAKELCID(language, SORT_DEFAULT), LOCALE_SENGLANGUAGE, buffer, 200)
+	       ? buffer : "";
+*/
+
+String GetNativeLangName(int language) {
+	return GetLanguageInfo(language).native_name.ToString();
+/*
+	char buffer[200];
+	return GetLocaleInfo(MAKELCID(language, SORT_DEFAULT), LOCALE_SNATIVELANGNAME, buffer, 200)
+	       ? buffer : ~GetLangName(language);
+*/
+}
+
+byte GetLangCharset(int language) {
+	return GetLanguageInfo(language).charset;
+/*
+	static struct { byte charset; dword codepage; } tab[] = {
+		{ CHARSET_WIN1252,    1252 },
+		{ CHARSET_WIN1251,    1251 },
+		{ CHARSET_WIN1250,    1250 },
+		{ CHARSET_WIN1253,    1253 },
+		{ CHARSET_WIN1254,    1254 },
+		{ CHARSET_WIN1257,    1257 },
+		{ CHARSET_WIN1255,    1255 },
+		{ CHARSET_WIN1256,    1256 },
+//		{ SHIFTJIS_CHARSET,    932 },
+//		{ HANGEUL_CHARSET,     949 },
+//		{ GB2312_CHARSET,      936 },
+//		{ CHINESEBIG5_CHARSET, 950 },
+	};
+	if(language & 0x1000000)
+		return tab[language & 7].charset;
+	char buffer[20];
+	GetLocaleInfo(MAKELCID(language, SORT_DEFAULT), LOCALE_IDEFAULTANSICODEPAGE, buffer, 20);
+	int codepage = atoi(buffer);
+	for(int i = 0; i < __countof(tab); i++)
+		if(tab[i].codepage == codepage)
+			return tab[i].charset;
+	return CHARSET_DEFAULT;
+*/
+}
+LanguageInfo::LanguageInfo(int lang_)
+: language(lang_)
+{
+	charset = CHARSET_DEFAULT;
+
+#ifdef PLATFORM_WIN32
+	LCID lcid = GetLanguageLCID(lang_);
+	english_name = GetLocaleInfoA(lcid, LOCALE_SENGLANGUAGE);
+	native_name = GetLocaleInfoW(lcid, LOCALE_SNATIVELANGNAME);
+	thousand_separator = GetLocaleInfoA(lcid, LOCALE_STHOUSAND);
+	decimal_point = GetLocaleInfoA(lcid, LOCALE_SDECIMAL);
+	static const LCTYPE months[] =
+	{
+		LOCALE_SMONTHNAME1,  LOCALE_SMONTHNAME2,  LOCALE_SMONTHNAME3,
+		LOCALE_SMONTHNAME4,  LOCALE_SMONTHNAME5,  LOCALE_SMONTHNAME6,
+		LOCALE_SMONTHNAME7,  LOCALE_SMONTHNAME8,  LOCALE_SMONTHNAME9,
+		LOCALE_SMONTHNAME10, LOCALE_SMONTHNAME11, LOCALE_SMONTHNAME12,
+	};
+	static const LCTYPE smonths[] =
+	{
+		LOCALE_SABBREVMONTHNAME1,  LOCALE_SABBREVMONTHNAME2,  LOCALE_SABBREVMONTHNAME3,
+		LOCALE_SABBREVMONTHNAME4,  LOCALE_SABBREVMONTHNAME5,  LOCALE_SABBREVMONTHNAME6,
+		LOCALE_SABBREVMONTHNAME7,  LOCALE_SABBREVMONTHNAME8,  LOCALE_SABBREVMONTHNAME9,
+		LOCALE_SABBREVMONTHNAME10, LOCALE_SABBREVMONTHNAME11, LOCALE_SABBREVMONTHNAME12,
+	};
+	ASSERT(__countof(months) == __countof(month_names));
+	int i;
+	for(i = 0; i < __countof(months); i++)
+	{
+		month_names[i] = GetLocaleInfoW(lcid, months[i]);
+		short_month_names[i] = GetLocaleInfoW(lcid, smonths[i]);
+	}
+	static const LCTYPE days[] =
+	{
+		LOCALE_SDAYNAME1, LOCALE_SDAYNAME2, LOCALE_SDAYNAME3, LOCALE_SDAYNAME4,
+		LOCALE_SDAYNAME5, LOCALE_SDAYNAME6, LOCALE_SDAYNAME7,
+	};
+	static const LCTYPE sdays[] =
+	{
+		LOCALE_SABBREVDAYNAME1, LOCALE_SABBREVDAYNAME2, LOCALE_SABBREVDAYNAME3, LOCALE_SABBREVDAYNAME4,
+		LOCALE_SABBREVDAYNAME5, LOCALE_SABBREVDAYNAME6, LOCALE_SABBREVDAYNAME7,
+	};
+	ASSERT(__countof(days) == __countof(day_names));
+	for(i = 0; i < __countof(days); i++)
+	{
+		day_names[i] = GetLocaleInfoW(lcid, days[i]);
+		short_day_names[i] = GetLocaleInfoW(lcid, sdays[i]);
+	}
+
+	static struct { byte charset; dword codepage; } tab[] =
+	{
+		{ CHARSET_WIN1252,    1252 },
+		{ CHARSET_WIN1251,    1251 },
+		{ CHARSET_WIN1250,    1250 },
+		{ CHARSET_WIN1253,    1253 },
+		{ CHARSET_WIN1254,    1254 },
+		{ CHARSET_WIN1257,    1257 },
+		{ CHARSET_WIN1255,    1255 },
+		{ CHARSET_WIN1256,    1256 },
+//		{ SHIFTJIS_CHARSET,    932 },
+//		{ HANGEUL_CHARSET,     949 },
+//		{ GB2312_CHARSET,      936 },
+//		{ CHINESEBIG5_CHARSET, 950 },
+	};
+	int codepage = atoi(GetLocaleInfoA(lcid, LOCALE_IDEFAULTANSICODEPAGE));
+	for(i = 0; i < __countof(tab); i++)
+		if(tab[i].codepage == codepage)
+		{
+			charset = tab[i].charset;
+			break;
+		}
+#endif
+
+#ifdef PLATFORM_POSIX
+	String langtext = LNGAsText(language);
+	char ltext[6];
+	ltext[0] = ToLower(langtext[0]);
+	ltext[1] = ToLower(langtext[1]);
+	ltext[2] = '_';
+	ltext[3] = ToUpper(langtext[3]);
+	ltext[4] = ToUpper(langtext[4]);
+	ltext[5] = 0;
+	String oldloc = setlocale(LC_ALL, NULL);
+//	puts(String() << "setting locale " << ltext << ", old locale = " << oldloc);
+	if(setlocale(LC_ALL, ltext))
+	{
+//		puts(String() << "set locale " << ltext << " succeeded");
+		const struct lconv *lc = localeconv();
+		decimal_point = lc->decimal_point;
+		thousand_separator = lc->thousands_sep;
+		//lc->grouping - controls thousands grouping
+		static const int months[] =
+		{
+			MON_1, MON_2, MON_3, MON_4, MON_5, MON_6, MON_7, MON_8, MON_9, MON_10, MON_11, MON_12,
+		};
+		static const int smonths[] =
+		{
+			ABMON_1, ABMON_2, ABMON_3, ABMON_4, ABMON_5, ABMON_6, ABMON_7, ABMON_8, ABMON_9, ABMON_10, ABMON_11, ABMON_12,
+		};
+		ASSERT(__countof(months) == __countof(month_names) && __countof(smonths) == __countof(month_names));
+		int i;
+		for(i = 0; i < __countof(months); i++)
+		{
+			month_names[i] = nl_langinfo(months[i]);
+			short_month_names[i] = nl_langinfo(smonths[i]);
+		}
+		static const int days[] =
+		{ // Linux locale starts with Sunday
+			DAY_2, DAY_3, DAY_4, DAY_5, DAY_6, DAY_7, DAY_1,
+		};
+		static const int sdays[] =
+		{
+			ABDAY_2, ABDAY_3, ABDAY_4, ABDAY_5, ABDAY_6, ABDAY_7, ABDAY_1,
+		};
+		ASSERT(__countof(days) == __countof(day_names) && __countof(sdays) == __countof(day_names));
+		for(i = 0; i < __countof(days); i++)
+		{
+			day_names[i] = nl_langinfo(days[i]);
+			short_day_names[i] = nl_langinfo(sdays[i]);
+		}
+
+		setlocale(LC_ALL, oldloc);
+	}
+#endif
+}
+
+String LanguageInfo::ToString() const
+{
+	String out;
+	out << "LANGUAGE={" << LNGAsText(language) << "}\n"
+#ifdef PLATFORM_WIN32
+		<< NFormat("LCID={%08x}\n", (int)GetLanguageLCID(language))
+#endif
+		<< "ENGLISH_NAME={" << english_name << "}\n"
+		"NATIVE_NAME={" << FromUnicode(native_name) << "}\n"
+		"CHARSET={" << charset << "}\n"
+		"THOUSAND_SEPARATOR={" << thousand_separator << "}\n"
+		"DECIMAL_POINT={" << decimal_point << "}\n"
+		"MONTH_NAMES={\n";
+	int i;
+	for(i = 0; i < __countof(month_names); i++)
+		out << "    {" << FromUnicode(month_names[i]) << "} / {" << FromUnicode(short_month_names[i]) << "}\n";
+	out << "}\n"
+		"DAY_NAMES={\n";
+	for(i = 0; i < __countof(day_names); i++)
+		out << "    {" << FromUnicode(day_names[i]) << "} / {" << FromUnicode(short_day_names[i]) << "}\n";
+	out << "}\n";
+	return out;
+}
+
+static const char *NlsFindDigits(const char *src, String& dest)
+{
+	if(*src && !IsDigit(*src))
+	{
+		const char *start = src;
+		while(*++src && !IsDigit(*src))
+			;
+		dest.Cat(start, (int)(src - start));
+	}
+	return src;
+}
+
+static const char *NlsCopyDigits(const char *src, String& dest, String thousands)
+{
+	if(IsDigit(*(src = NlsFindDigits(src, dest))))
+	{
+		const char *p = src;
+		while(IsDigit(*++src))
+			;
+		int first = ((int)(src - p) + 2) % 3 + 1;
+		while(p < src)
+		{
+			dest.Cat(p, first);
+			if((p += first) < src)
+			{
+				dest.Cat(thousands);
+				first = 3;
+			}
+		}
+	}
+	return src;
+}
+
+static String NlsFormatRaw(const char *n, String thousands, String decimals)
+{
+	if(*n == 0)
+		return Null;
+//	puts(String() << "NlsFormatRaw, n = <" << n << ">, thousands <" << thousands << ">, decimal <" << decimals << ">");
+	String result;
+	n = NlsCopyDigits(n, result, thousands);
+	if(*n == (wchar)'.')
+	{ // decimal separator
+		n++;
+		result.Cat(decimals);
+		const char *s = n;
+		while(IsDigit(*n))
+			n++;
+		result.Cat(s, (int)(n - s));
+	}
+	if(*(n = NlsCopyDigits(n, result, thousands)))
+		result.Cat(n);
+	return result;
+}
+
+String LanguageInfo::FormatInt(int value) const
+{
+	if(IsNull(value))
+		return Null;
+	String dest;
+	String is = UPP::FormatInt(value);
+	const char *p = NlsCopyDigits(is, dest, thousand_separator);
+	if(*p)
+		dest.Cat(p);
+	return dest;
+}
+
+String LanguageInfo::FormatDouble(double value, int digits, int FD_flags, int fill_exp) const
+{
+	if(IsNull(value))
+		return Null;
+//	puts(String() << "LanguageInfo(" << LNGAsText(language) << "): thousands <" << thousand_separator << ">, decimal <" << decimal_point << ">");
+	return NlsFormatRaw(UPP::FormatDouble(value, digits, FD_flags, fill_exp), thousand_separator, decimal_point);
+}
+
+String LanguageInfo::FormatDate(Date date) const
+{
+	return UPP::FormatDate(date, date_format, language);
+}
+
+String LanguageInfo::FormatTime(Time time) const
+{
+	return UPP::FormatTime(time, time_format, language);
+}
+
+/*
+int LanguageInfo::ScanInt(const char *text, const char **endptr) const
+{
+	return ScanInt(text, endptr); //!! todo
+}
+*/
+
+/*
+double LanguageInfo::ScanDouble(const char *text, const char **endptr) const
+{
+	return ScanDouble(text, endptr); //!! todo
+}
+*/
+
+/*
+Date LanguageInfo::ScanDate(const char *text, const char **endptr, Date base_date) const
+{
+	return UPP::ScanDate(text, endptr, date_format, language, base_date);
+}
+*/
+
+/*
+Time LanguageInfo::ScanTime(const char *text, const char **endptr, Time base_time) const
+{
+	return UPP::ScanTime(text, endptr, time_format, language, base_time);
+}
+*/
+
+WString LanguageInfo::GetIndexLetter(const wchar *text) const
+{
+	return IsLetter(*text) ? WString(text, 1) : WString(Null);
+}
+
+static int LangCompareDigits(const wchar *&a, const wchar *&b, const wchar *e1, const wchar *e2)
+{
+	const wchar *p1 = a, *p2 = b;
+	while(p1 < e1 && *p1 == '0')
+		p1++;
+	while(p2 < e2 && *p2 == '0')
+		p2++;
+	const wchar *x1 = p1, *x2 = p2;
+	while(p1 < e1 && IsDigit(*p1))
+		p1++;
+	while(p2 < e2 && IsDigit(*p2))
+		p2++;
+	if(p1 - x1 != p2 - x2)
+		return cmp(p1 - x1, p2 - x2);
+	for(; x1 != p1; x1++, x2++)
+		if(*x1 != *x2)
+			return *x1 > *x2 ? 1 : -1;
+	a = p1;
+	b = p2;
+	return 0;
+}
+
+int LanguageInfo::Compare(const wchar *a, const wchar *b, int a_length, int b_length) const
+{
+	ASSERT(language != LNG_CZECH); // use RegisterLanguageInfoCS to register true czech compare
+
+	int  little = 0, middle = 0;
+	const wchar *p1 = a, *e1 = a + a_length, *p2 = b, *e2 = b + b_length;
+
+	while(p1 < e1 && p2 < e2)
+	{
+		wchar c1 = *p1++;
+		wchar c2 = *p2++;
+
+		int level1 = (IsLetter(c1) ? 3 : IsDigit(c1) ? 2 : c1 == ' ' ? 0 : 1);
+		int level2 = (IsLetter(c2) ? 3 : IsDigit(c2) ? 2 : c2 == ' ' ? 0 : 1);
+		if(level1 != level2)
+			return cmp(level1, level2);
+		if(level1 <= 1)
+		{
+			if(c1 != c2)
+				return cmp(c1, c2);
+			continue;
+		}
+		if(level1 == 2)
+		{ // digits
+			const wchar *dp1 = --p1, *dp2 = --p2;
+			int res = LangCompareDigits(dp1, dp2, e1, e2);
+			if(res)
+				return res;
+			p1 = dp1;
+			p2 = dp2;
+			continue;
+		}
+
+		int u1, u2, i1, i2;
+
+		i1 = ToAscii(u1 = ToUpper(c1));
+		i2 = ToAscii(u2 = ToUpper(c2));
+
+		if(i1 != i2)
+			return i1 >= i2 ? 1 : -1;
+
+		if(u1 != u2) // different diacritics
+			if(middle == 0)
+				middle = u1 - u2;
+
+		if(c1 != c2) // different case
+		{
+			if(little == 0)
+				little = (u1 != c1) - (u2 != c2);
+		}
+	}
+	little += 4 * middle;
+	if(little == 0)
+		little = a_length - b_length;
+	return sgn(little);
+}
+
+/*
+static bool ContainsAccents(const wchar *s)
+{
+	for(; *s; s++)
+		if(*s != ToAscii(*s))
+			return true;
+	return false;
+}
+*/
+
+class DefaultWildcardCompare : public LanguageInfo::WildcardCompare
+{
+public:
+	DefaultWildcardCompare(const wchar *templ)
+	{
+		raw_templ = 0;
+//		cvt_ascii = true;
+		if(*templ == 0)
+			return;
+//		if((*templ == '.' && templ[1] != 0 && *++templ != '.') || ContainsAccents(templ))
+//			cvt_ascii = true;
+		raw_templ = templ;
+//		if(cvt_ascii)
+//			cvt_templ = ToUpper(ToAscii(raw_templ));
+//		else
+			cvt_templ = ToUpper(raw_templ);
+	}
+
+	virtual bool Matches(const wchar *s) const
+	{
+		return !raw_templ || RawMatches(s, cvt_templ);
+	}
+
+private:
+	bool RawMatches(const wchar *s, const wchar *templ) const
+	{
+		for(;;)
+			switch(*templ++)
+			{
+			case 0: return true;
+			case '.': if(*templ == 0) return *s == 0; // force end of string
+			case '?': if(*s++ == 0) return false; break;
+			case '*':
+				do
+					if(RawMatches(s, templ))
+						return true;
+				while(*s++);
+				return false;
+			case '\\':
+				if(*templ == 0 || *s++ != *templ++)
+					return false;
+				break;
+
+			default:
+//				if(templ[-1] != ToUpper(cvt_ascii ? ToAscii(*s) : *s))
+				if(templ[-1] != ToUpper(*s))
+					return false;
+				s++;
+				break;
+			}
+		return true;
+	}
+
+private:
+	const wchar *raw_templ;
+//	bool         cvt_ascii;
+	WString      cvt_templ;
+};
+
+One<LanguageInfo::WildcardCompare> LanguageInfo::GetWildcardCompare(const wchar *wildcard_text) const
+{
+	return new DefaultWildcardCompare(wildcard_text);
+}
+
+typedef ArrayMap<int, LanguageInfo> LanguageInfoMap;
+GLOBAL_VAR(LanguageInfoMap, LanguageInfo::Map)
+static StaticMutex sMapMutex;
+
+void LanguageInfo::Register(One<LanguageInfo> info)
+{
+	INTERLOCKED_(sMapMutex) {
+		int lang = info->language;
+		int f = Map().Find(lang);
+		if(f >= 0)
+			Map().Set(f, -info);
+		else
+			Map().Add(lang, -info);
+	}
+}
+
+class LanguageInfoCS : public LanguageInfo
+{
+public:
+	LanguageInfoCS();
+
+	virtual WString GetIndexLetter(const wchar *text) const;
+
+	virtual int     Compare(const wchar *a, const wchar *b, int a_length, int b_length) const;
+	virtual One<WildcardCompare> GetWildcardCompare(const wchar *wildcard_text) const;
+
+public:
+};
+
+LanguageInfoCS::LanguageInfoCS()
+: LanguageInfo(LNG_CZECH)
+{
+	english_name = "Czech";
+	native_name = ToUnicode("�esky", CHARSET_WIN1250); // __FILE__CHARSET__
+//	charset = CHARSET_WIN1250;
+//	thousand_separator = L" ";
+//	decimal_point = L",";
+}
+
+WString LanguageInfoCS::GetIndexLetter(const wchar *s) const
+{
+	wchar temp[3];
+	temp[0] = temp[1] = temp[2] = 0;
+	if(*s <= 2047 && IsLetter(*s)) // IsLetter
+	{
+		temp[0] = ToUpper(*s);
+		if(s[1] <= 2047 && IsLetter(s[1]))
+			temp[1] = ToLower(s[1]);
+		if(temp[0] != 'C' || temp[1] != 'h')
+			temp[1] = 0;
+		switch(ToUpper(ToAscii(*s)))
+		{
+		case 'A': case 'E': case 'I': case 'N':
+		case 'O': case 'T': case 'U': case 'Y':
+			temp[0] = ToAscii(temp[0]);
+			break;
+		}
+	}
+	return temp;
+}
+
+int LanguageInfoCS::Compare(const wchar *a, const wchar *b, int a_length, int b_length) const
+{
+	int  little = 0, middle = 0;
+	const wchar *p1 = a, *e1 = a + a_length, *p2 = b, *e2 = b + b_length;
+
+	while(p1 < e1 && p2 < e2)
+	{
+		wchar c1 = *p1++;
+		wchar c2 = *p2++;
+
+		int level1 = (IsLetter(c1) ? 3 : IsDigit(c1) ? 2 : c1 == ' ' ? 0 : 1);
+		int level2 = (IsLetter(c2) ? 3 : IsDigit(c2) ? 2 : c2 == ' ' ? 0 : 1);
+		if(level1 != level2)
+			return cmp(level1, level2);
+		if(level1 <= 1)
+		{
+			if(c1 != c2)
+				return cmp(c1, c2);
+			continue;
+		}
+		if(level1 == 2)
+		{ // digits
+			const wchar *dp1 = --p1, *dp2 = --p2;
+			int res = LangCompareDigits(dp1, dp2, e1, e2);
+			if(res)
+				return res;
+			p1 = dp1;
+			p2 = dp2;
+			continue;
+		}
+
+		int u1, u2, i1, i2;
+
+		if((c1 == 'C' || c1 == 'c') && (p1 < e1 && (*p1 == 'H' || *p1 == 'h')))
+		{ // CH
+			i1 = 'H';
+			u1 = 65535;
+			p1++;
+		}
+		else
+			i1 = ToAscii(u1 = ToUpper(c1));
+		if((c2 == 'C' || c2 == 'c') && (p2 < e2 && (*p2 == 'H' || *p2 == 'h')))
+		{ // CH
+			i2 = 'H';
+			u2 = 65535;
+			p2++;
+		}
+		else
+			i2 = ToAscii(u2 = ToUpper(c2));
+
+		if(i1 != i2)
+			return i1 >= i2 ? 1 : -1;
+
+		if(u1 != u2) // different diacritics
+			switch(i1)
+			{
+			case 'A': case 'E': case 'I': case 'N':
+			case 'O': case 'T': case 'U': case 'Y':
+				if(middle == 0)
+					middle = u1 - u2;
+				continue;
+			default:
+				return u1 >= u2 ? 1 : -1;
+			}
+		if(c1 != c2) // different case
+		{
+			if(little == 0)
+
+				little = (u1 != c1) - (u2 != c2);
+		}
+	}
+	little += 4 * middle;
+	if(little == 0)
+		little = a_length - b_length;
+	return sgn(little);
+}
+
+class WildcardCompareCS : public LanguageInfo::WildcardCompare
+{
+public:
+	WildcardCompareCS(const wchar *templ)
+	{
+		raw_templ = 0;
+//		cvt_ascii = false;
+		if(*templ == 0)
+			return;
+//		if((*templ == '.' && templ[1] != 0 && *++templ != '.') || ContainsAccents(templ))
+//		{
+//			exclude_ch = (ToUpper(*templ) == 'C' && templ[1] == 0);
+//			cvt_ascii = false;
+//		}
+		raw_templ = templ;
+//		if(cvt_ascii)
+//			cvt_templ = ToUpper(ToAscii(raw_templ));
+//		else
+			cvt_templ = ToUpper(raw_templ);
+	}
+
+	virtual bool Matches(const wchar *s) const
+	{
+//		if(exclude_ch && *s && (s[1] == 'h' || s[1] == 'H'))
+//			return false;
+		return !raw_templ || RawMatches(s, cvt_templ);
+	}
+
+private:
+	bool RawMatches(const wchar *s, const wchar *templ) const
+	{
+		for(;;)
+			switch(*templ++)
+			{
+			case 0: return true;
+			case '.': if(*templ == 0) return *s == 0; // force end of string
+			case '?': if(*s++ == 0) return false; break;
+			case '*':
+				do
+					if(RawMatches(s, templ))
+						return true;
+				while(*s++);
+				return false;
+			case '\\': if(*templ == 0 || *templ++ != *s++) return false; break;
+			default: if(templ[-1] != ToUpper(*s++)) return false;
+				break;
+			}
+		return true;
+	}
+
+private:
+	const wchar *raw_templ;
+//	bool         exclude_ch;
+//	bool         cvt_ascii;
+	WString      cvt_templ;
+};
+
+One<LanguageInfo::WildcardCompare> LanguageInfoCS::GetWildcardCompare(const wchar *wildcard_text) const
+{
+	return new WildcardCompareCS(wildcard_text);
+}
+
+class LanguageInfoEN : public LanguageInfo
+{
+public:
+	LanguageInfoEN()
+		: LanguageInfo(LNG_('E', 'N', 'U', 'S'))
+	{
+		english_name = "English";
+		native_name = ToUnicode("English", CHARSET_DEFAULT);
+//		thousand_separator = " ";
+//		decimal_point = ".";
+	}
+};
+
+class LanguageInfoGE : public LanguageInfo
+{
+public:
+	LanguageInfoGE()
+		: LanguageInfo(LNG_('D', 'E', 'D', 'E'))
+	{
+		english_name = "German";
+		native_name = ToUnicode("Deutsch", CHARSET_WIN1250);
+	}
+};
+
+class LanguageInfoFR : public LanguageInfo
+{
+public:
+	LanguageInfoFR()
+		: LanguageInfo(LNG_('F', 'R', 'F', 'R'))
+	{
+		english_name = "Franch";
+		native_name = ToUnicode("Francaise", CHARSET_WIN1250);
+	}
+};
+
+class LanguageInfoES : public LanguageInfo
+{
+public:
+	LanguageInfoES()
+		: LanguageInfo(LNG_('E', 'S', 'E', 'S'))
+	{
+		english_name = "Spanish";
+		native_name = ToUnicode("Espagnnol", CHARSET_WIN1250);
+	}
+};
+
+const LanguageInfo& GetLanguageInfo(int lcode)
+{
+	static bool init_std = false;
+	if(!init_std)
+	{
+		init_std = true;
+		LanguageInfo::Register(new LanguageInfoCS);
+		LanguageInfo::Register(new LanguageInfoEN);
+		LanguageInfo::Register(new LanguageInfoGE);
+		LanguageInfo::Register(new LanguageInfoFR);
+		LanguageInfo::Register(new LanguageInfoES);
+	}
+
+	static int recent = 0;
+	LanguageInfo *rinfo = 0;
+	if(rinfo && lcode == recent)
+		return *rinfo;
+	if(lcode == 0)
+		lcode = GetCurrentLanguage(); //!! todo - decide on default / neutral language code
+	INTERLOCKED_(sMapMutex) {
+		LanguageInfoMap& map = LanguageInfo::Map();
+		int f = map.Find(lcode);
+		if(f < 0)
+		{
+			f  = map.GetCount();
+			map.Add(lcode, new LanguageInfo(lcode));
+		}
+		recent = lcode;
+		return *(rinfo = &map[f]);
+	}
+	return *rinfo;
+}
+
+const LanguageInfo& GetLanguageInfo()
+{
+	return GetLanguageInfo(GetCurrentLanguage());
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/Core/Lang.h b/uppsrc/Core/Lang.h
new file mode 100644
index 000000000..ebcd67abf
--- /dev/null
+++ b/uppsrc/Core/Lang.h
@@ -0,0 +1,120 @@
+#define LNG_(a, b, c, d)   ( (((a - 'A' + 1) & 31) << 15) | (((b - 'A' + 1) & 31) << 10) | \
+                             (((c - 'A' + 1) & 31) << 5) | (((d - 'A' + 1) & 31) << 0) )
+
+#define LNGC_(a, b, c, d, cs) ( (((a - 'A' + 1) & 31) << 15) | (((b - 'A' + 1) & 31) << 10) | \
+                                (((c - 'A' + 1) & 31) << 5) | (((d - 'A' + 1) & 31) << 0) | \
+                                ((cs & 255) << 20) )
+
+int     LNGFromText(const char *s);
+String  LNGAsText(int d);
+
+Convert& LNGConvert();
+
+byte    GetLNGCharset(int d);
+int     SetLNGCharset(int lng, byte chrset);
+
+#define LNG_CZECH         0xF1CC7A // Deprecated, corresponds to CS-CZ windows-1250
+#define LNG_ENGLISH       0x2BAB3  // LNG_('E', 'N', 'U', 'S')
+
+#define LNG_CURRENT       -1
+#define LNG_MASTER        -2
+
+void                      SetLanguage(int lang);
+int                       GetCurrentLanguage();
+
+int                       GetSystemLNG();
+
+VectorMap<String, String> GetLanguage(int lang);//rename...
+Vector<int>               GetLanguages();
+const int                *GetAllLanguages();
+
+String                    GetLangName(int language);
+String                    GetNativeLangName(int language);
+byte                      GetLangCharset(int language);
+
+String                    txtGet(const char *id, int language = LNG_CURRENT);
+
+void                      ExportLNGtoT();
+
+#ifdef PLATFORM_WIN32
+LCID                      GetLanguageLCID(int language);
+String                    GetLocaleInfoA(LCID lcid, LCTYPE lctype);
+WString                   GetLocaleInfoW(LCID lcid, LCTYPE lctype);
+#endif
+
+class LanguageInfo
+{
+public:
+	LanguageInfo(int language);
+	virtual ~LanguageInfo() {}
+
+	String          ToString() const;
+
+	virtual String  FormatInt(int value) const;
+	virtual String  FormatDouble(double value, int digits, int FD_flags = 0, int fill_exp = 0) const;
+	virtual String  FormatDate(Date date) const;
+	virtual String  FormatTime(Time time) const;
+
+//	virtual int     ScanInt(const char *text, const char **endptr) const;
+//	virtual double  ScanDouble(const char *text, const char **endptr) const;
+//	virtual Date    ScanDate(const char *text, const char **endptr, Date base_date = GetSysDate()) const;
+//	virtual Time    ScanTime(const char *text, const char **endptr, Time base_time = GetSysTime()) const;
+
+	virtual WString GetIndexLetter(const wchar *text) const;
+
+	virtual int     Compare(const wchar *a, const wchar *b, int a_length, int b_length) const;
+	int             Compare(const wchar *a, const wchar *b) const     { return Compare(a, b, wstrlen(a), wstrlen(b)); }
+	int             Compare(WString a, WString b) const               { return Compare(a, b, a.GetLength(), b.GetLength()); }
+	int             Compare(const char *a, const char *b) const       { return Compare(ToUnicode(a, CHARSET_DEFAULT), ToUnicode(b, CHARSET_DEFAULT)); }
+	int             Compare(String a, String b) const                 { return Compare(a.ToWString(), b.ToWString()); }
+
+	bool            operator () (const wchar *a, const wchar *b) const { return Compare(a, b) < 0; }
+	bool            operator () (WString a, WString b) const           { return Compare(a, b) < 0; }
+	bool            operator () (const char *a, const char *b) const   { return Compare(a, b) < 0; }
+	bool            operator () (String a, String b) const             { return Compare(a, b) < 0; }
+
+	struct WildcardCompare
+	{
+		virtual ~WildcardCompare() {}
+		virtual bool Matches(const wchar *s) const = 0;
+	};
+
+	virtual One<WildcardCompare> GetWildcardCompare(const wchar *wildcard_text) const;
+
+	static ArrayMap<int, LanguageInfo>& Map();
+	static void     Register(One<LanguageInfo> info);
+
+public:
+	int             language;
+	String          english_name;
+	WString         native_name;
+	byte            charset;
+
+	String          thousand_separator;
+	String          decimal_point;
+	String          date_format;
+	String          time_format;
+
+	WString         month_names[12], short_month_names[12];
+	WString         day_names[7], short_day_names[7];
+};
+
+const LanguageInfo&       GetLanguageInfo(int lcode);
+const LanguageInfo&       GetLanguageInfo();
+
+// ------ Language internals ----------------
+
+#include "Lang_s.h"
+
+struct LangModuleRecord {
+	const char *id;
+	const char **ptr;
+};
+
+struct LangTextRecord {
+	const char **ptr;
+	const char *text;
+};
+
+void AddLangModule(const char *file, const char *modulename, int masterlang, const LangModuleRecord *module);
+void AddLanguage(const char *modulename, int lang, const LangTextRecord *langtext);
diff --git a/uppsrc/Core/Lang_s.h b/uppsrc/Core/Lang_s.h
new file mode 100644
index 000000000..cf42eadf5
--- /dev/null
+++ b/uppsrc/Core/Lang_s.h
@@ -0,0 +1,6 @@
+#ifndef __temp_aux__Lang_s_h_
+#define __temp_aux__Lang_s_h_
+
+#define s_(x) txt##x
+
+#endif
diff --git a/uppsrc/Core/Log.cpp b/uppsrc/Core/Log.cpp
new file mode 100644
index 000000000..bb655d9bf
--- /dev/null
+++ b/uppsrc/Core/Log.cpp
@@ -0,0 +1,331 @@
+#include "Core.h"
+
+NAMESPACE_UPP
+
+#ifdef PLATFORM_WINCE
+const char *FromSysChrSet(const wchar *s)
+{
+	static char out[256];
+	FromUnicode(out, s, wstrlen(s), CHARSET_DEFAULT);
+	return out;
+}
+
+const wchar *ToSysChrSet(const char *s)
+{
+	static wchar out[1024];
+	ToUnicode(out, s, strlen(s), CHARSET_DEFAULT);
+	return out;
+}
+#endif
+
+LogStream::LogStream()
+{
+#ifdef PLATFORM_POSIX
+	hfile = -1;
+#else
+	hfile = INVALID_HANDLE_VALUE;
+#endif
+	part = 0;
+	sizelimit = 0;
+	*filename = 0;
+	options = LOG_FILE;
+	depth = 0;
+	bol = false;
+}
+
+LogStream::~LogStream() {}
+
+void LogStream::Close()
+{
+#ifdef PLATFORM_POSIX
+	if(hfile >= 0)
+		close(hfile);
+	hfile = -1;
+#else
+	if(hfile != INVALID_HANDLE_VALUE)
+		CloseHandle(hfile);
+	hfile = INVALID_HANDLE_VALUE;
+#endif
+}
+
+bool LogStream::Delete()
+{
+	Close();
+	if(*filename) {
+		if(!FileDelete(filename)) {
+			BugLog() << "Error deleting " << filename << ": " << GetLastErrorMessage();
+			return false;
+		}
+		*filename = 0;
+	}
+	return true;
+}
+
+void LogStream::Create(const char *path, bool append)
+{
+	Close();
+
+	strcpy(filename, path);
+	strcpy(backup, filename);
+	strcat(backup, ".old");
+
+#if defined(PLATFORM_WIN32)
+
+	#if defined(PLATFORM_WINCE)
+		wchar_t pwcs[512];
+		mbstowcs(pwcs, backup, strlen(backup));
+		DeleteFile(pwcs);
+	#else
+		DeleteFile(backup);
+	#endif
+
+#elif defined(PLATFORM_POSIX)
+	unlink(backup);
+#else
+	#error
+#endif
+
+#if defined(PLATFORM_WIN32)
+	#if defined(PLATFORM_WINCE)
+		wchar_t wfilename[512];
+		mbstowcs(wfilename, filename, strlen(filename));
+		MoveFile(wfilename, pwcs);
+	#else
+		MoveFile(filename, backup);
+	#endif
+#elif defined(PLATFORM_POSIX)
+	rename(filename, backup);
+#else
+	#error
+#endif
+
+	filesize = 0;
+
+#ifdef PLATFORM_WIN32
+	hfile = CreateFile(ToSysChrSet(filename),
+		GENERIC_READ|GENERIC_WRITE,
+		FILE_SHARE_READ|FILE_SHARE_WRITE,
+		NULL,
+		append ? OPEN_ALWAYS : CREATE_ALWAYS,
+		FILE_ATTRIBUTE_NORMAL,
+		NULL
+	);
+	if(append)
+		filesize = (int)SetFilePointer(hfile, 0, NULL, FILE_END);
+#else
+	hfile = open(filename, append ? O_CREAT|O_RDWR : O_CREAT|O_RDWR|O_TRUNC, 0644);
+	if(append)
+		filesize = (int)lseek(hfile, 0, SEEK_END);
+#endif
+	wrlim = ptr = (byte *)this;
+	p = buffer;
+
+	Time t = GetSysTime();
+#ifdef PLATFORM_WINCE
+	wchar exe[512];
+#else
+	char exe[512];
+#endif
+	char user[500];
+	*user = 0;
+
+#ifdef PLATFORM_WIN32
+	GetModuleFileName(AppGetHandle(), exe, 512);
+#ifndef PLATFORM_WINCE
+	dword w = 2048;
+	GetUserName(user, &w);
+#endif
+#else //#
+	const char *procexepath_();
+	strcpy(exe, procexepath_());
+	const char *uenv = getenv("USER");
+	strcpy(user, uenv ? uenv : "boot");
+#endif
+
+	char h[1000];
+	sprintf(h, "* %s %02d.%02d.%04d %02d:%02d:%02d, user: %s\n",
+	           FromSysChrSet(exe),
+	           t.day, t.month, t.year, t.hour, t.minute, t.second, user);
+#ifdef PLATFORM_WIN32
+	dword n;
+	WriteFile(hfile, h, (dword)strlen(h), &n, NULL);
+	if(part) {
+		sprintf(h, ", #%d", part);
+		WriteFile(hfile, h, (dword)strlen(h) , &n, NULL);
+	}
+	WriteFile(hfile, "\r\n", 2, &n, NULL);
+#else
+	write(hfile, h, strlen(h));
+	if(part) {
+		sprintf(h, ", #%d", part);
+		write(hfile, h, strlen(h));
+	}
+	write(hfile, "\r\n", 2);
+#endif
+}
+
+void LogStream::Flush()
+{
+	int count = (int)(p - buffer);
+	if(count == 0) return;
+	if(options & LOG_COUT)
+		Cout().Put(buffer, count);
+	if(options & LOG_CERR)
+		Cerr().Put(buffer, count);
+#ifdef PLATFORM_WIN32
+	if(options & LOG_FILE)
+		if(hfile != INVALID_HANDLE_VALUE) {
+			dword n;
+			WriteFile(hfile, buffer, count, &n, NULL);
+		}
+	if(options & LOG_DBG) {
+		*p = 0;
+		::OutputDebugString((LPCSTR)buffer);
+	}
+#else
+	if(options & LOG_FILE)
+		if(hfile >= 0)
+			write(hfile, buffer, count);
+	if(options & LOG_DBG)
+		Cerr().Put(buffer, count);
+#endif
+	filesize += count;
+	p = buffer;
+	if(sizelimit > 0 && filesize > sizelimit)
+		Create(filename, false);
+}
+
+void LogStream::Put0(int w)
+{
+	if(w == LOG_BEGIN)
+		depth++;
+	else
+	if(w == LOG_END)
+		depth--;
+	else {
+		if(bol) {
+			bol = false;
+			for(int q = depth; q--;)
+				Put0('\t');
+		}
+		*p++ = w;
+		if(w == '\n') {
+			Flush();
+			bol = true;
+		}
+		else
+		if(p == buffer + 512)
+			Flush();
+	}
+}
+
+void LogStream::_Put(int w)
+{
+	CriticalSection::Lock __(cs);
+	Put0(w);
+}
+
+void  LogStream::_Put(const void *data, dword size)
+{
+	CriticalSection::Lock __(cs);
+	const byte *q = (byte *)data;
+	while(size--)
+		Put0(*q++);
+}
+
+bool LogStream::IsOpen() const
+{
+#ifdef PLATFORM_POSIX
+	return hfile >= 0;
+#else
+	return hfile != INVALID_HANDLE_VALUE;
+#endif
+}
+
+static void sLarge(String& text, int *large, int count, const char *txt)
+{
+	int n = min(1024, count);
+	Sort(large, large + n, StdLess<int>());
+	int i = 0;
+	while(i < n) {
+		int q = large[i];
+		int nn = i++;
+		while(i < n && large[i] == q) i++;
+		nn = i - nn;
+		if(q < 10000)
+			text << Format("%4d B, %5d %s (%6d KB)\r\n", q, nn, txt, (nn * q) >> 10);
+		else
+			text << Format("%4d`KB, %5d %s (%6d KB)\r\n", q >> 10, nn, txt, (nn * q) >> 10);
+	}
+}
+
+String AsString(MemoryProfile& mem)
+{
+	String text;
+	int acount = 0;
+	size_t asize = 0;
+	int fcount = 0;
+	size_t fsize = 0;
+	for(int i = 0; i < 1024; i++)
+		if(mem.allocated[i]) {
+			int sz = 4 * i;
+			text << Format("%4d B, %6d allocated (%5d KB), %6d fragmented (%5d KB)\n",
+			              sz, mem.allocated[i], (mem.allocated[i] * sz) >> 10,
+			              mem.fragmented[i], (mem.fragmented[i] * sz) >> 10);
+			acount += mem.allocated[i];
+			asize += mem.allocated[i] * sz;
+			fcount += mem.fragmented[i];
+			fsize += mem.fragmented[i] * sz;
+		}
+	text << Format(" TOTAL, %6d allocated (%5d KB), %6d fragmented (%5d KB)\n",
+	              acount, int(asize >> 10), fcount, int(fsize >> 10));
+	text << "Free pages " << mem.freepages << " (" << mem.freepages * 4 << " KB)\n";
+	text << "Large block count " << mem.large_count
+	    << ", total size " << (mem.large_total >> 10) << " KB\n";
+	sLarge(text, mem.large_size, mem.large_count, "allocated");
+	text << "Large fragments count " << mem.large_free_count
+	    << ", total size " << (mem.large_free_total >> 10) << " KB\n";
+	sLarge(text, mem.large_free_size, mem.large_free_count, "fragments");
+	return text;
+}
+
+
+#ifdef _MULTITHREADED
+
+StaticCriticalSection sLogLock;
+
+void LockLog()
+{
+	sLogLock.Enter();
+}
+
+void UnlockLog()
+{
+	sLogLock.Leave();
+}
+
+#endif
+
+#ifdef flagCHECKINIT
+
+void InitBlockBegin__(const char *fn, int line) {
+	RLOG(fn << " " << line << " init block");
+#ifdef HEAPDBG
+	MemoryCheckDebug();
+#else
+	MemoryCheck();
+#endif
+}
+
+void InitBlockEnd__(const char *fn, int line) {
+	RLOG(fn << " " << line << " init block finished");
+#ifdef HEAPDBG
+	MemoryCheckDebug();
+#else
+	MemoryCheck();
+#endif
+}
+
+#endif
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/Core/Map.h b/uppsrc/Core/Map.h
new file mode 100644
index 000000000..cadf90625
--- /dev/null
+++ b/uppsrc/Core/Map.h
@@ -0,0 +1,188 @@
+template <class K, class T, class V, class HashFn>
+class AMap {
+protected:
+	Index<K, HashFn> key;
+	V                value;
+
+public:
+	void     Add(const K& k, const T& x)            { key.Add(k); value.Add(x); }
+	void     AddPick(const K& k, pick_ T& x)        { key.Add(k); value.AddPick(x); }
+	T&       Add(const K& k)                        { key.Add(k); return value.Add(); }
+
+	int      Find(const K& k, unsigned h) const     { return key.Find(k, h); }
+	int      Find(const K& k) const                 { return key.Find(k); }
+	int      FindNext(int i) const                  { return key.FindNext(i); }
+	int      FindLast(const K& k, unsigned h) const { return key.FindLast(k, h); }
+	int      FindLast(const K& k) const             { return key.FindLast(k); }
+	int      FindPrev(int i) const                  { return key.FindPrev(i); }
+
+	int      FindAdd(const K& k);
+	int      FindAdd(const K& k, const T& init);
+	int      FindAddPick(const K& k, pick_ T& init);
+
+	int      Put(const K& k, const T& x);
+	int      PutPick(const K& k, pick_ T& x);
+	T&       Put(const K& k);
+
+	int      FindPut(const K& k);
+	int      FindPut(const K& k, const T& init);
+	int      FindPutPick(const K& k, pick_ T& init);
+
+	T&       Get(const K& k)                     { return value[Find(k)]; }
+	const T& Get(const K& k) const               { return value[Find(k)]; }
+	const T& Get(const K& k, const T& d) const   { int i = Find(k); return i >= 0 ? value[i] : d; }
+
+	T&       GetAdd(const K& k);
+
+	T&       GetAdd(const K& k, const T& x);
+	T&       GetAddPick(const K& k, pick_ T& x);
+
+	T&       GetPut(const K& k);
+
+	T&       GetPut(const K& k, const T& x);
+	T&       GetPutPick(const K& k, pick_ T& x);
+
+	void     SetKey(int i, const K& k)           { key.Set(i, k); }
+
+	T       *FindPtr(const K& k)       { int i = Find(k); return i >= 0 ? &value[i] : NULL; }
+	const T *FindPtr(const K& k) const { int i = Find(k); return i >= 0 ? &value[i] : NULL; }
+
+//  PRECHANGE VACATION :)
+//	T&       operator()(const K& k)                   { return Get(k); }
+//	const T& operator()(const K& k) const             { return Get(k); }
+//	const T& operator()(const K& k, const T& d) const { return Get(k, d); }
+
+	void     Unlink(int i)                            { key.Unlink(i); }
+	int      UnlinkKey(const K& k, unsigned h)        { return key.UnlinkKey(k, h); }
+	int      UnlinkKey(const K& k)                    { return key.UnlinkKey(k); }
+	bool     IsUnlinked(int i) const                  { return key.IsUnlinked(i); }
+	void     Sweep();
+
+	T&       Insert(int i, const K& k)             { key.Insert(i, k); return value.Insert(i); }
+	void     Insert(int i, const K& k, const T& x) { key.Insert(i, k); value.Insert(i, x); }
+	void     Remove(int i)                         { key.Remove(i); value.Remove(i); }
+	void     Remove(int i, int count)              { key.Remove(i, count); value.Remove(i, count); }
+	void     Remove(const int *sl, int n)          { key.Remove(sl, n); value.Remove(sl, n); }
+	void     Remove(const Vector<int>& sl)         { Remove(sl, sl.GetCount()); }
+	int      RemoveKey(const K& k);
+
+	const T& operator[](int i) const               { return value[i]; }
+	T&       operator[](int i)                     { return value[i]; }
+	int      GetCount() const                      { return value.GetCount(); }
+	bool     IsEmpty() const                       { return value.IsEmpty(); }
+	void     Clear()                               { key.Clear(); value.Clear(); }
+	void     Shrink()                              { value.Shrink(); key.Shrink(); }
+	void     Reserve(int xtra)                     { value.Reserve(xtra); key.Reserve(xtra); }
+	int      GetAlloc() const                      { return value.GetAlloc(); }
+
+	void     Drop(int n = 1)                       { key.Drop(n); value.Drop(n); }
+	T&       Top()                                 { return value.Top(); }
+	const T& Top() const                           { return value.Top(); }
+	const K& TopKey() const                        { return key.Top(); }
+//	T        Pop()                                 { T h = Top(); Drop(); return h; }
+	K        PopKey()                              { K h = TopKey(); Drop(); return h; }
+	void     Trim(int n)                           { key.Trim(n); value.SetCount(n); }
+
+	const K& GetKey(int i) const                   { return key[i]; }
+
+#ifdef UPP
+	void     Serialize(Stream& s);
+#endif
+
+	void     Swap(AMap& x)                         { UPP::Swap(value, x.value);
+	                                                 UPP::Swap(key, x.key); }
+	const Index<K, HashFn>&  GetIndex() const      { return key; }
+	Index<K, HashFn>         PickIndex() pick_     { return key; }
+
+	const Vector<K>& GetKeys() const               { return key.GetKeys(); }
+	Vector<K>        PickKeys() pick_              { return key.PickKeys(); }
+
+	const V&         GetValues() const             { return value; }
+	V                PickValues() pick_            { return value; }
+
+	AMap()                                         {}
+	AMap(const AMap& s, int) : key(s.key, 0), value(s.value, 0) {}
+	AMap(pick_ Index<K, HashFn>& ndx, pick_ V& val) : value(val), key(ndx) {}
+	AMap(pick_ Vector<K>& ndx, pick_ V& val) : value(val), key(ndx) {}
+
+	typedef K        KeyType;
+	typedef typename Index<K, HashFn>::ConstIterator KeyConstIterator;
+
+	KeyConstIterator KeyBegin() const                             { return key.Begin(); }
+	KeyConstIterator KeyEnd() const                               { return key.End(); }
+	KeyConstIterator KeyGetIter(int pos) const                    { return key.GetIter(pos); }
+
+	typedef T                          ValueType;
+	typedef typename V::ConstIterator  ConstIterator;
+	typedef typename V::Iterator       Iterator;
+
+	Iterator         Begin()                                      { return value.Begin(); }
+	Iterator         End()                                        { return value.End(); }
+	Iterator         GetIter(int pos)                             { return value.GetIter(pos); }
+	ConstIterator    Begin() const                                { return value.Begin(); }
+	ConstIterator    End() const                                  { return value.End(); }
+	ConstIterator    GetIter(int pos) const                       { return value.GetIter(pos); }
+
+	friend int     GetCount(const AMap& v)                        { return v.GetCount(); }
+};
+
+template <class K, class T, class HashFn = StdHash<K> >
+class VectorMap : public MoveableAndDeepCopyOption<VectorMap<K, T, HashFn> >,
+                  public AMap< K, T, Vector<T>, HashFn > {
+    typedef AMap< K, T, Vector<T>, HashFn > B;
+public:
+	T        Pop()                            { T h = B::Top(); B::Drop(); return h; }
+
+	VectorMap(const VectorMap& s, int) : AMap<K, T, Vector<T>, HashFn>(s, 1) {}
+	VectorMap(pick_ Index<K, HashFn>& ndx, pick_ Vector<T>& val) : AMap<K, T, Vector<T>, HashFn>(ndx, val) {}
+	VectorMap(pick_ Vector<K>& ndx, pick_ Vector<T>& val) : AMap<K, T, Vector<T>, HashFn>(ndx, val) {}
+	VectorMap()                                                       {}
+
+	friend void    Swap(VectorMap& a, VectorMap& b)      { a.B::Swap(b); }
+
+	typedef typename AMap< K, T, Vector<T>, HashFn >::ConstIterator ConstIterator; // GCC bug (?)
+	typedef typename AMap< K, T, Vector<T>, HashFn >::Iterator      Iterator; // GCC bug (?)
+	STL_MAP_COMPATIBILITY(VectorMap<K _cm_ T _cm_ HashFn>)
+};
+
+template <class K, class T, class HashFn = StdHash<K> >
+class ArrayMap : public MoveableAndDeepCopyOption< ArrayMap<K, T, HashFn> >,
+                 public AMap< K, T, Array<T>, HashFn > {
+	typedef AMap< K, T, Array<T>, HashFn > B;
+public:
+	void      Add(const K& k, const T& x)          { B::Add(k, x); }
+	T&        Add(const K& k)                      { return B::Add(k); }
+	T&        Add(const K& k, T *newt)             { B::key.Add(k); B::value.Add(newt); return *newt; }
+	template <class TT> TT& Create(const K& k)     { TT *q = new TT; B::key.Add(k); B::value.Add(q); return *q; }
+
+	void      Set(int i, T *ptr)                   { B::value.Set(i, ptr); }
+	T        *PopDetach()                          { B::key.Drop(); return B::value.PopDetach(); }
+
+	ArrayMap(const ArrayMap& s, int) : AMap<K, T, Array<T>, HashFn>(s, 1) {}
+	ArrayMap(pick_ Index<K, HashFn>& ndx, pick_ Array<T>& val) : AMap<K, T, Array<T>, HashFn>(ndx, val) {}
+	ArrayMap(pick_ Vector<K>& ndx, pick_ Array<T>& val) : AMap<K, T, Array<T>, HashFn>(ndx, val) {}
+	ArrayMap() {}
+
+	friend void    Swap(ArrayMap& a, ArrayMap& b)        { a.B::Swap(b); }
+
+	typedef typename AMap< K, T, Array<T>, HashFn >::ConstIterator ConstIterator; // GCC bug (?)
+	typedef typename AMap< K, T, Array<T>, HashFn >::Iterator      Iterator; // GCC bug (?)
+	STL_MAP_COMPATIBILITY(ArrayMap<K _cm_ T _cm_ HashFn>)
+};
+
+template <class K, class T, int NBLK = 16, class HashFn = StdHash<K> >
+class SegtorMap : public MoveableAndDeepCopyOption< SegtorMap<K, T, NBLK, HashFn > >,
+                  public AMap< K, T, Segtor<T, NBLK>, HashFn > {
+	typedef AMap< K, T, Segtor<T, NBLK>, HashFn > B;
+public:
+	SegtorMap(const SegtorMap& s, int) : AMap<K, T, Segtor<T, NBLK>, HashFn>(s, 1) {}
+	SegtorMap(pick_ Index<K, HashFn>& ndx, pick_ Segtor<T>& val) : AMap<K, T, Segtor<T, NBLK>, HashFn>(ndx, val) {}
+	SegtorMap(pick_ Vector<K>& ndx, pick_ Segtor<T>& val) : AMap<K, T, Segtor<T, NBLK>, HashFn>(ndx, val) {}
+	SegtorMap()                                              {}
+
+	friend void Swap(SegtorMap& a, SegtorMap& b)             { a.B::Swap(b); }
+
+	typedef typename B::ConstIterator ConstIterator; // GCC bug (?)
+	typedef typename B::Iterator      Iterator; // GCC bug (?)
+	STL_MAP_COMPATIBILITY(SegtorMap<K _cm_ T _cm_ NBLK _cm_ HashFn>)
+};
diff --git a/uppsrc/Core/Mpr32W.dli b/uppsrc/Core/Mpr32W.dli
new file mode 100644
index 000000000..cebfea569
--- /dev/null
+++ b/uppsrc/Core/Mpr32W.dli
@@ -0,0 +1 @@
+FN_C(DWORD, APIENTRY, WNetEnumResourceW, (HANDLE hEnum, LPDWORD lpcCount, LPVOID lpBuffer, LPDWORD lpBufferSize))
diff --git a/uppsrc/Core/Mt.cpp b/uppsrc/Core/Mt.cpp
new file mode 100644
index 000000000..d16028ea4
--- /dev/null
+++ b/uppsrc/Core/Mt.cpp
@@ -0,0 +1,447 @@
+#include "Core.h"
+
+NAMESPACE_UPP
+
+#ifdef _MULTITHREADED
+
+static Mutex& sMutexLock()
+{
+	static Mutex *section;
+	if(!section) {
+		static byte b[sizeof(Mutex)];
+		section = new(b) Mutex;
+	}
+	return *section;
+}
+
+INITBLOCK {
+	sMutexLock();
+}
+
+Thread::Thread()
+{
+	sMutexLock();
+#ifdef PLATFORM_WIN32
+	handle = 0;
+#endif
+#ifdef PLATFORM_POSIX
+	handle = 0;
+#endif
+}
+
+void Thread::Detach()
+{
+#if defined(PLATFORM_WIN32)
+	if(handle) {
+		CloseHandle(handle);
+		handle = 0;
+	}
+#elif defined(PLATFORM_POSIX)
+	if(handle) {
+		CHECK(!pthread_detach(handle));
+		handle = 0;
+	}
+#endif
+}
+
+static Atomic sThreadCount;
+
+#if defined(PLATFORM_WIN32) || defined(PLATFORM_POSIX)
+static
+#ifdef PLATFORM_WIN32
+#ifdef CPU_64
+unsigned int
+#else
+uintptr_t __stdcall
+#endif
+#else
+void *
+#endif
+sThreadRoutine(void *arg)
+{
+	Callback *cb = (Callback *)arg;
+	(*cb)();
+	AtomicDec(sThreadCount);
+	delete cb;
+#ifdef UPP_HEAP
+	MemoryFreeThread();
+#endif
+	return 0;
+}
+#endif
+
+static bool threadr;
+
+bool Thread::IsST()
+{
+	return !threadr;
+}
+
+bool Thread::Run(Callback _cb)
+{
+	AtomicInc(sThreadCount);
+	threadr = true;
+	Detach();
+	Callback *cb = new Callback(_cb);
+#ifdef PLATFORM_WIN32
+	unsigned thread_id;
+	handle = (HANDLE)_beginthreadex(0, 0, sThreadRoutine, cb, 0, &thread_id);
+#endif
+#ifdef PLATFORM_POSIX
+	if(pthread_create(&handle, 0, sThreadRoutine, cb))
+		handle = 0;
+#endif
+	return handle;
+}
+
+int Thread::GetCount()
+{
+	return ReadWithBarrier(sThreadCount);
+}
+
+static Atomic  sShutdown;
+
+void Thread::ShutdownThreads()
+{
+	AtomicInc(sShutdown);
+	while(sThreadCount)
+		Sleep(100);
+	AtomicDec(sShutdown);
+}
+
+bool Thread::IsShutdownThreads()
+{
+	return sShutdown;
+}
+
+int Thread::Wait()
+{
+	if(!IsOpen())
+		return -1;
+	int out;
+#ifdef PLATFORM_WIN32
+	dword exit;
+	if(!GetExitCodeThread(handle, &exit))
+		return -1;
+	if(exit != STILL_ACTIVE)
+		out = (int)exit;
+	else
+	{
+		if(WaitForSingleObject(handle, INFINITE) != WAIT_OBJECT_0)
+			return Null;
+		out = GetExitCodeThread(handle, &exit) ? int(exit) : int(Null);
+	}
+	Detach();
+#endif
+#ifdef PLATFORM_POSIX
+	void *thread_return;
+	if(pthread_join(handle, &thread_return))
+		out = Null;
+	else
+		out = (int)(intptr_t)thread_return;
+	handle = 0;
+#endif
+	return out;
+}
+
+void Thread::Priority(int percent)
+{
+	ASSERT(IsOpen());
+#ifdef PLATFORM_WIN32
+	int prior;
+	if(percent <= 25)
+		prior = THREAD_PRIORITY_LOWEST;
+	else if(percent <= 75)
+		prior = THREAD_PRIORITY_BELOW_NORMAL;
+	else if(percent <= 125)
+		prior = THREAD_PRIORITY_NORMAL;
+	else if(percent <= 175)
+		prior = THREAD_PRIORITY_ABOVE_NORMAL;
+	else
+		prior = THREAD_PRIORITY_HIGHEST;
+	SetThreadPriority(handle, prior);
+#endif
+#ifdef PLATFORM_POSIX
+	//!! todo
+#endif
+}
+
+void Thread::Start(Callback cb)
+{
+	Thread t;
+	t.Run(cb);
+	t.Detach();
+}
+
+void Thread::Sleep(int msec)
+{
+#ifdef PLATFORM_WIN32
+	::Sleep(msec);
+#endif
+#ifdef PLATFORM_POSIX
+	timespec tval;
+	tval.tv_sec = msec / 1000;
+	tval.tv_nsec = (msec % 1000) * 1000000;
+	nanosleep(&tval, NULL);
+#endif
+}
+
+#ifdef CPU_X86
+
+#ifndef CPU_SSE2
+
+static bool sSSE2 = false; //CPU_SSE2();
+
+inline void ReadMemoryBarrier()
+{
+#ifdef CPU_AMD64
+	#ifdef COMPILER_MSC
+		_mm_lfence();
+	#else
+		__asm__("lfence");
+	#endif
+#else
+	if(sSSE2)
+	#ifdef COMPILER_MSC
+		__asm lfence;
+	#else
+		__asm__("lfence");
+	#endif
+	else {
+		static Atomic x;
+		AtomicInc(x);
+	}
+#endif
+}
+
+void WriteMemoryBarrier() {
+#ifdef CPU_AMD64
+	#ifdef COMPILER_MSC
+		_mm_sfence();
+	#else
+		__asm__("sfence");
+	#endif
+#else
+	if(sSSE2)
+	#ifdef COMPILER_MSC
+		__asm sfence;
+	#else
+		__asm__("sfence");
+	#endif
+	else {
+		static Atomic x;
+		AtomicInc(x);
+	}
+#endif
+}
+#endif
+
+#endif
+
+#ifdef flagPROFILEMT
+MtInspector *MtInspector::Dumi()
+{
+	static MtInspector h(NULL);
+	return &h;
+}
+
+MtInspector::~MtInspector()
+{
+	if(name)
+		RLOG("Mutex " << name << '(' << number << ") " << blocked << "/" << locked <<
+		     " = " << Sprintf("%.4f", locked ? (double)blocked / locked : 0) << " blocked/locked times");
+}
+#endif
+
+#ifdef PLATFORM_WIN32
+
+void Semaphore::Release()
+{
+	ReleaseSemaphore(handle, 1, NULL);
+}
+
+void Semaphore::Wait()
+{
+	WaitForSingleObject(handle, INFINITE);
+}
+
+Semaphore::Semaphore()
+{
+	handle = CreateSemaphore(NULL, 0, INT_MAX, NULL);
+}
+
+Semaphore::~Semaphore()
+{
+	CloseHandle(handle);
+}
+
+Mutex& sMutexLock();
+
+
+typedef BOOL (WINAPI *TEC)(LPCRITICAL_SECTION lpCriticalSection);
+
+static TEC sTec;
+
+bool Mutex::TryEnter()
+{
+	if(!sTec) {
+		if(HMODULE hDLL = LoadLibrary("Kernel32"))
+			sTec = (TEC) GetProcAddress(hDLL, "TryEnterCriticalSection");
+	}
+/* TODO! TryEntery0
+#ifdef flagPROFILEMT
+	bool b = (*sTec)(&section);
+	mti->blocked += b;
+	return b;
+#else
+*/
+	return (*sTec)(&section);
+//#endif
+}
+
+/* Win32 RWMutex implementation by Chris Thomasson, cristom@comcast.net */
+
+void RWMutex::EnterWrite()
+{
+	EnterCriticalSection ( &m_wrlock );
+	LONG count = InterlockedExchangeAdd(&m_count, -LONG_MAX);
+	if(count < LONG_MAX)
+		if(InterlockedExchangeAdd ( &m_rdwake, LONG_MAX - count ) + LONG_MAX - count )
+			WaitForSingleObject ( m_wrwset, INFINITE );
+}
+
+void RWMutex::LeaveWrite()
+{
+	LONG count = InterlockedExchangeAdd ( &m_count, LONG_MAX );
+	if (count < 0)
+	    ReleaseSemaphore ( m_rdwset, count * -1, 0 );
+	LeaveCriticalSection ( &m_wrlock );
+}
+
+void RWMutex::EnterRead()
+{
+	LONG count = InterlockedDecrement ( &m_count );
+	if(count < 0)
+		WaitForSingleObject ( m_rdwset, INFINITE );
+}
+
+void RWMutex::LeaveRead()
+{
+	LONG count = InterlockedIncrement ( &m_count );
+	if ( count < 1 )
+		if ( ! InterlockedDecrement ( &m_rdwake ) )
+			SetEvent ( m_wrwset );
+}
+
+RWMutex::RWMutex()
+:	m_count ( LONG_MAX ),
+	m_rdwake ( 0 ),
+	m_wrwset ( CreateEvent ( 0, FALSE, FALSE, 0 ) ),
+	m_rdwset ( CreateSemaphore ( 0, 0, LONG_MAX, 0 ) )
+{
+	InitializeCriticalSection ( &m_wrlock );
+}
+
+RWMutex::~RWMutex()
+{
+	DeleteCriticalSection ( &m_wrlock );
+	CloseHandle ( m_rdwset );
+	CloseHandle ( m_wrwset );
+}
+
+#endif
+
+#ifdef PLATFORM_POSIX
+
+Mutex::Mutex()
+{
+	pthread_mutexattr_t mutex_attr[1];
+	pthread_mutexattr_init(mutex_attr);
+	pthread_mutexattr_settype(mutex_attr, PTHREAD_MUTEX_RECURSIVE);
+	pthread_mutex_init(mutex, mutex_attr);
+#ifdef flagPROFILEMT
+	mti = MtInspector::Dumi();
+#endif
+}
+
+RWMutex::RWMutex()
+{
+	pthread_rwlock_init(rwlock, NULL);
+}
+
+RWMutex::~RWMutex()
+{
+	pthread_rwlock_destroy(rwlock);
+}
+
+/*
+Event::Event()
+{
+	pthread_mutex_init(mutex, NULL);
+	pthread_cond_init(cond, NULL);
+}
+
+Event::~Event()
+{
+	pthread_mutex_destroy(mutex);
+	pthread_cond_destroy(cond);
+}
+
+void Event::Wait()
+{
+	pthread_mutex_lock(mutex);
+    pthread_cond_wait(cond, mutex);
+	pthread_mutex_unlock(mutex);
+}
+
+void Event::Go()
+{
+	pthread_cond_signal(cond);
+}
+*/
+void Semaphore::Release()
+{
+	sem_post(&sem);
+}
+
+void Semaphore::Wait()
+{
+	sem_wait(&sem);
+}
+
+Semaphore::Semaphore()
+{
+	sem_init(&sem, 0, 0);
+}
+
+Semaphore::~Semaphore()
+{
+	sem_destroy(&sem);
+}
+
+#endif
+
+void StaticMutex::Initialize()
+{
+	Mutex::Lock __(sMutexLock());
+	if(!ReadWithBarrier(section))
+		BarrierWrite(section, new(buffer) Mutex);
+}
+
+void StaticRWMutex::Initialize()
+{
+	Mutex::Lock __(sMutexLock());
+	if(!ReadWithBarrier(rw))
+		BarrierWrite(rw, new(buffer) RWMutex);
+}
+
+void StaticSemaphore::Initialize()
+{
+	Mutex::Lock __(sMutexLock());
+	if(!ReadWithBarrier(semaphore))
+		BarrierWrite(semaphore, new(buffer) Semaphore);
+}
+
+#endif
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/Core/Mt.h b/uppsrc/Core/Mt.h
new file mode 100644
index 000000000..59ff2580f
--- /dev/null
+++ b/uppsrc/Core/Mt.h
@@ -0,0 +1,443 @@
+#ifndef _DEBUG
+inline void AssertST() {}
+#endif
+
+#ifdef _MULTITHREADED
+
+#ifdef COMPILER_MSC
+#define thread__ __declspec(thread)
+#else
+#define thread__ __thread
+#endif
+
+#ifdef flagPROFILEMT
+class Mutex;
+class StaticMutex;
+
+struct MtInspector {
+	const char *name;
+	int   number;
+	int   locked;
+	int   blocked;
+	
+	static MtInspector *Dumi();
+
+	MtInspector(const char *s, int n = -1) { name = s; number = n; locked = blocked = 0; }
+	~MtInspector();
+};
+
+#define PROFILEMT(mutex) \
+	{ static MtInspector MK__s(__FILE__, __LINE__); mutex.Set(MK__s); }
+
+#define PROFILEMT_(mutex, id) \
+	{ static MtInspector MK__s(id); mutex.Set(MK__s); }
+
+#else
+
+#define PROFILEMT(mutex)
+#define PROFILEMT_(mutex, id)
+
+#endif
+
+class Callback;
+
+class Thread {
+#ifdef PLATFORM_WIN32
+	HANDLE     handle;
+#endif
+#ifdef PLATFORM_POSIX
+	pthread_t  handle;
+#endif
+
+public:
+	bool       Run(Callback cb);
+
+	void       Detach();
+	int        Wait();
+
+	bool       IsOpen() const     { return handle; }
+
+#ifdef PLATFORM_WIN32
+	HANDLE      GetHandle() const { return handle; }
+#endif
+#ifdef PLATFORM_POSIX
+	pthread_t   GetHandle() const { return handle; }
+#endif
+
+	void        Priority(int percent); // 0 = lowest, 100 = normal
+
+	static void Start(Callback cb);
+
+	static void Sleep(int ms);
+
+	static bool IsST();
+	static int  GetCount();
+	static void ShutdownThreads();
+	static bool IsShutdownThreads();
+
+
+	Thread();
+	~Thread()   { Detach(); }
+
+private:
+	void operator=(const Thread&);
+	Thread(const Thread&);
+};
+
+#ifdef _DEBUG
+inline void AssertST() { ASSERT(Thread::IsST()); }
+#endif
+
+void ReadMemoryBarrier();
+void WriteMemoryBarrier();
+
+#ifdef CPU_SSE2
+inline void ReadMemoryBarrier()
+{
+#ifdef CPU_AMD64
+	#ifdef COMPILER_MSC
+		_mm_lfence();
+	#else
+		__asm__("lfence");
+	#endif
+#else	
+	#ifdef COMPILER_MSC
+		__asm lfence;
+	#else
+		__asm__("lfence");
+	#endif
+#endif
+}
+
+inline void WriteMemoryBarrier() {
+#ifdef CPU_AMD64
+	#ifdef COMPILER_MSC
+		_mm_sfence();
+	#else
+		__asm__("sfence");
+	#endif
+#else	
+	#ifdef COMPILER_MSC
+		__asm sfence;
+	#else
+		__asm__("sfence");
+	#endif
+#endif
+}
+#endif
+
+template <class U>
+inline U ReadWithBarrier(const volatile U& b)
+{
+	/*volatile*/ U tmp = b;
+	ReadMemoryBarrier();
+	return tmp;
+}
+
+template <class U, class V>
+inline void BarrierWrite(volatile U& ptr, V data)
+{
+	WriteMemoryBarrier();
+	ptr = data;
+}
+
+class Semaphore {
+#ifdef PLATFORM_WIN32
+	HANDLE     handle;
+#else
+	sem_t      sem;
+#endif
+
+public:
+	void       Wait();
+	void       Release();
+
+	Semaphore();
+	~Semaphore();
+};
+
+class StaticSemaphore {
+	volatile Semaphore *semaphore;
+	byte                buffer[sizeof(Semaphore)];
+
+	void Initialize();
+
+public:
+	Semaphore& Get()             { if(!ReadWithBarrier(semaphore)) Initialize(); return *const_cast<Semaphore *>(semaphore); }
+	operator Semaphore&()        { return Get(); }
+	void Wait()                  { Get().Wait(); }
+	void Release()               { Get().Release(); }
+};
+
+struct MtInspector;
+
+#ifdef PLATFORM_WIN32
+
+typedef LONG Atomic;
+
+inline int  AtomicInc(volatile Atomic& t)             { return InterlockedIncrement((Atomic *)&t); }
+inline int  AtomicDec(volatile Atomic& t)             { return InterlockedDecrement((Atomic *)&t); }
+inline int  AtomicXAdd(volatile Atomic& t, int incr)  { return InterlockedExchangeAdd((Atomic *)&t, incr); }
+
+class Mutex {
+protected:
+	CRITICAL_SECTION section;
+	MtInspector        *mti;
+
+	Mutex(int)         {}
+
+public:
+	bool  TryEnter();
+	void  Leave()                { LeaveCriticalSection(&section); }
+
+#ifdef flagPROFILEMT
+	void  Enter()                { if(!TryEnter()) { mti->blocked++; EnterCriticalSection(&section); }; mti->locked++; }
+	void  Set(MtInspector& m)    { mti = &m; }
+
+	Mutex()                      { mti = MtInspector::Dumi(); InitializeCriticalSection(&section); }
+#else
+	void  Enter()                { EnterCriticalSection(&section); }
+
+	Mutex()                      { InitializeCriticalSection(&section); }
+#endif
+
+	~Mutex()                     { DeleteCriticalSection(&section); }
+
+	struct Lock;
+};
+
+/* Win32 RWMutex implementation by Chris Thomasson, cristom@comcast.net */
+
+class RWMutex {
+    LONG   m_count, m_rdwake;
+    HANDLE m_wrwset, m_rdwset;
+    CRITICAL_SECTION m_wrlock;
+
+public:
+	void EnterWrite();
+	void LeaveWrite();
+
+	void EnterRead();
+	void LeaveRead();
+
+	RWMutex();
+	~RWMutex();
+
+	struct ReadLock;
+	struct WriteLock;
+};
+
+#endif
+
+#ifdef PLATFORM_POSIX
+
+typedef _Atomic_word Atomic;
+
+inline int  AtomicXAdd(volatile Atomic& t, int incr)  { using namespace __gnu_cxx; return __exchange_and_add(&t, incr); }
+
+inline int  AtomicInc(volatile Atomic& t)             { return AtomicXAdd(t, +1) + 1; }
+inline int  AtomicDec(volatile Atomic& t)             { return AtomicXAdd(t, -1) - 1; }
+
+class Mutex {
+protected:
+	pthread_mutex_t  mutex[1];
+	MtInspector     *mti;
+
+public:
+#ifdef flagPROFILEMT
+	bool  TryEnter()          { bool b = pthread_mutex_trylock(mutex) == 0; mti->locked += b; return b; }
+	void  Enter()             { if(pthread_mutex_trylock(mutex) != 0) { mti->blocked++; pthread_mutex_lock(mutex); } mti->locked++; }
+	void  Set(MtInspector& m) { mti = &m; }
+#else
+	bool  TryEnter()          { return pthread_mutex_trylock(mutex) == 0; }
+	void  Enter()             { pthread_mutex_lock(mutex); }
+#endif
+	void  Leave()             { pthread_mutex_unlock(mutex); }
+
+	struct Lock;
+
+	Mutex();
+	~Mutex()           { pthread_mutex_destroy(mutex); }
+};
+
+class RWMutex {
+	pthread_rwlock_t rwlock[1];
+
+public:
+	void EnterWrite()  { pthread_rwlock_wrlock(rwlock); }
+	void LeaveWrite()  { pthread_rwlock_unlock(rwlock); }
+	void EnterRead()   { pthread_rwlock_rdlock(rwlock); }
+	void LeaveRead()   { pthread_rwlock_unlock(rwlock); }
+
+	RWMutex();
+	~RWMutex();
+
+	struct ReadLock;
+	struct WriteLock;
+};
+
+#endif
+
+inline int  AtomicRead(const volatile Atomic& t)      { return ReadWithBarrier(t); }
+inline void AtomicWrite(volatile Atomic& t, int val)  { BarrierWrite(t, val); }
+
+struct Mutex::Lock {
+	Mutex& s;
+	Lock(Mutex& s) : s(s) { s.Enter(); }
+	~Lock()               { s.Leave(); }
+};
+
+struct RWMutex::ReadLock {
+	RWMutex& s;
+	ReadLock(RWMutex& s) : s(s) { s.EnterRead(); }
+	~ReadLock()                 { s.LeaveRead(); }
+};
+
+struct RWMutex::WriteLock {
+	RWMutex& s;
+	WriteLock(RWMutex& s) : s(s) { s.EnterWrite(); }
+	~WriteLock()                 { s.LeaveWrite(); }
+};
+
+class StaticMutex {
+	volatile Mutex *section;
+	byte            buffer[sizeof(Mutex)];
+
+	void Initialize();
+
+public:
+	Mutex& Get()               { if(!ReadWithBarrier(section)) Initialize(); return *const_cast<Mutex *>(section); }
+	operator Mutex&()          { return Get(); }
+	bool TryEnter()            { return Get().TryEnter();}
+	void Enter()               { Get().Enter();}
+	void Leave()               { Get().Leave(); }
+#ifdef flagPROFILEMT
+	void Set(MtInspector& mti) { Get().Set(mti); }
+#endif
+};
+
+class StaticRWMutex {
+	volatile RWMutex *rw;
+	byte              buffer[sizeof(RWMutex)];
+
+	void Initialize();
+
+public:
+	RWMutex& Get()       { if(!ReadWithBarrier(rw)) Initialize(); return *const_cast<RWMutex *>(rw); }
+	operator RWMutex&()  { return Get(); }
+	void EnterRead()     { Get().EnterRead();}
+	void LeaveRead()     { Get().LeaveRead(); }
+	void EnterWrite()    { Get().EnterWrite();}
+	void LeaveWrite()    { Get().LeaveWrite(); }
+};
+
+#define INTERLOCKED \
+for(bool i_b_ = true; i_b_;) \
+	for(static UPP::StaticMutex i_ss_; i_b_;) \
+		for(UPP::Mutex::Lock i_ss_lock__(i_ss_); i_b_; i_b_ = false)
+
+struct H_l_ : Mutex::Lock {
+	bool b;
+	H_l_(Mutex& cs) : Mutex::Lock(cs) { b = true; }
+};
+
+#define INTERLOCKED_(cs) \
+for(UPP::H_l_ i_ss_lock__(cs); i_ss_lock__.b; i_ss_lock__.b = false)
+
+void Set__(volatile bool& b);
+
+#define ONCELOCK \
+for(static volatile bool o_b_; !ReadWithBarrier(o_b_);) \
+	for(static StaticMutex o_ss_; !o_b_;) \
+		for(Mutex::Lock o_ss_lock__(o_ss_); !o_b_; BarrierWrite(o_b_, true))
+
+#define ONCELOCK_(o_b_) \
+for(static StaticMutex o_ss_; !ReadWithBarrier(o_b_);) \
+	for(Mutex::Lock o_ss_lock__(o_ss_); !o_b_; BarrierWrite(o_b_, true))
+
+#define ONCELOCK_PTR(ptr, init) \
+if(!ReadWithBarrier(ptr)) { \
+	static StaticMutex cs; \
+	cs.Enter(); \
+	if(!ptr) \
+		BarrierWrite(ptr, init); \
+	cs.Leave(); \
+}
+
+#else
+
+#define thread__
+
+#define PROFILEMT(mutex)
+#define PROFILEMT_(mutex, id)
+
+typedef int Atomic;
+
+inline int  AtomicRead(const volatile Atomic& t)      { return t; }
+inline void AtomicWrite(volatile Atomic& t, int data) { t = data; }
+
+inline int  AtomicInc(volatile Atomic& t)             { ++t; return t; }
+inline int  AtomicDec(volatile Atomic& t)             { --t; return t; }
+inline int  AtomicXAdd(volatile Atomic& t, int incr)  { Atomic x = t; t += incr; return x; }
+
+struct Mutex {
+	bool  TryEnter()             { return true; }
+	void  Enter()                {}
+	void  Leave()                {}
+
+	struct Lock;
+};
+
+typedef Mutex StaticMutex;
+
+struct Mutex::Lock {
+	Lock(Mutex&) {}
+	~Lock()                {}
+};
+
+struct RWMutex {
+	void EnterWrite() {}
+	void LeaveWrite() {}
+
+	void EnterRead() {}
+	void LeaveRead() {}
+
+	struct ReadLock;
+	struct WriteLock;
+};
+
+struct RWMutex::ReadLock {
+	ReadLock(RWMutex&) {}
+	~ReadLock()        {}
+};
+
+struct RWMutex::WriteLock {
+	WriteLock(RWMutex&) {}
+	~WriteLock()        {}
+};
+
+typedef RWMutex StaticRWMutex;
+
+#define INTERLOCKED
+#define INTERLOCKED_(x) { x.Enter(); }
+
+#define ONCELOCK \
+for(static bool o_b_; !o_b_; o_b_ = true)
+
+#define ONCELOCK_(o_b_) \
+for(; !o_b_; o_b_ = true) \
+
+#define ONCELOCK_PTR(ptr, init) \
+if(!ptr) ptr = init;
+
+inline void ReadMemoryBarrier() {}
+inline void WriteMemoryBarrier() {}
+
+#ifdef _DEBUG
+inline void AssertST() {}
+#endif
+
+#endif
+
+typedef Mutex CriticalSection; // deprecated
+typedef StaticMutex StaticCriticalSection; // deprecated
diff --git a/uppsrc/Core/NetNode.cpp b/uppsrc/Core/NetNode.cpp
new file mode 100644
index 000000000..ea56674fc
--- /dev/null
+++ b/uppsrc/Core/NetNode.cpp
@@ -0,0 +1,108 @@
+#include "Core.h"
+
+#ifdef PLATFORM_WIN32
+
+NAMESPACE_UPP
+
+NetNode::NetNode()
+{
+	memset(&net, 0, sizeof(NETRESOURCE));
+}
+
+NetNode& NetNode::operator=(const NetNode& s)
+{
+	net = s.net;
+	local = s.local;
+	remote = s.remote;
+	comment = s.comment;
+	provider = s.provider;
+	name = s.name;
+	path = s.path;
+	SetPtrs();
+	return *this;
+}
+
+String DosInitCaps(const char *name)
+{
+	for(const char *s = name; *s; s++)
+		if(IsLetter(*s) && IsLower(*s))
+			return name;
+	return InitCaps(name);
+}
+
+void NetNode::SetPtr(String& s, char *& ptr)
+{
+	if(ptr) ptr = (char *)~s;
+}
+
+void NetNode::SetPtrs()
+{
+	SetPtr(local, net.lpLocalName);
+	SetPtr(remote, net.lpRemoteName);
+	SetPtr(comment, net.lpComment);
+	SetPtr(provider, net.lpProvider);
+}
+
+void NetNode::Serialize(Stream& s)
+{
+	s % net.dwScope % net.dwType % net.dwDisplayType % net.dwUsage;
+	s % local % remote % comment % provider % name % path;
+	SetPtrs();
+}
+
+Array<NetNode> NetNode::Enum() const
+{
+	HANDLE hEnum;
+	if(::WNetOpenEnum(RESOURCE_GLOBALNET, RESOURCETYPE_DISK, 0, (NETRESOURCE *)&net, &hEnum))
+		return Array<NetNode>();
+	return Enum0(hEnum);
+}
+
+Array<NetNode> NetNode::EnumRoot()
+{
+	HANDLE hEnum;
+	if(::WNetOpenEnum(RESOURCE_CONTEXT, RESOURCETYPE_DISK, 0, NULL, &hEnum))
+		return Array<NetNode>();
+	return Enum0(hEnum);
+}
+
+Array<NetNode> NetNode::Enum0(HANDLE hEnum)
+{
+	Array<NetNode> r;
+	DWORD cEntries = (DWORD)-1, cbBuffer = 0x4000;
+	Buffer<NETRESOURCE> lpnr(cbBuffer);
+	while(::WNetEnumResource(hEnum, &cEntries, lpnr, &cbBuffer) == 0) {
+		for(int i = 0; i < (int)cEntries; i++) {
+			NETRESOURCE& sn = lpnr[i];
+			const char *s = sn.lpRemoteName;
+			NetNode& nn = r.Add();
+			NETRESOURCE& n = nn.net;
+			n = sn;
+			nn.local = n.lpLocalName;
+			nn.remote = n.lpRemoteName;
+			nn.comment = n.lpComment;
+			nn.provider = n.lpProvider;
+			nn.SetPtrs();
+			if(s) {
+				if(s[0] == '\\' && s[1] == '\\')
+					nn.name = FromSystemCharset(DosInitCaps(GetFileName(s)));
+				else
+					nn.name = FromSystemCharset(s);
+			}
+			if(n.lpComment && *n.lpComment)
+				if(nn.name.GetCount())
+					nn.name = String().Cat() << FromSystemCharset(n.lpComment)
+					                         << " (" << nn.name << ")";
+				else
+					nn.name = FromSystemCharset(n.lpComment);
+			if(!(n.dwUsage & RESOURCEUSAGE_CONTAINER))
+				nn.path = FromSystemCharset(n.lpRemoteName);
+		}
+	}
+	::WNetCloseEnum(hEnum);
+	return r;
+}
+
+END_UPP_NAMESPACE
+
+#endif
diff --git a/uppsrc/Core/OL_Set.cpp b/uppsrc/Core/OL_Set.cpp
new file mode 100644
index 000000000..bf768b166
--- /dev/null
+++ b/uppsrc/Core/OL_Set.cpp
@@ -0,0 +1,15 @@
+//#BLITZ_PROHIBIT
+
+#ifndef flagNONAMESPACE
+namespace Upp {
+#endif
+
+void Set__(volatile bool& b)
+{
+	//WriteMemoryBarrier should be here
+	b = true;
+}
+
+#ifndef flagNONAMESPACE
+};
+#endif
diff --git a/uppsrc/Core/Other.h b/uppsrc/Core/Other.h
new file mode 100644
index 000000000..55e62f164
--- /dev/null
+++ b/uppsrc/Core/Other.h
@@ -0,0 +1,423 @@
+template <class T>
+T& Single() {
+	static T *p;
+	ONCELOCK {
+		static T o;
+		p = &o;
+	}
+	return *p;
+}
+
+template <class T>
+class One : MoveableAndDeepCopyOption< One<T> > {
+	mutable T  *ptr;
+
+	void        Free()                     { if(ptr && ptr != (T*)1) delete ptr; }
+	void        Chk() const                { ASSERT(ptr != (T*)1); }
+	void        ChkP() const               { Chk(); ASSERT(ptr); }
+	void        Pick(pick_ One<T>& data)   { T *p = data.ptr; data.ptr = (T*)1; ptr = p; }
+
+public:
+	void        Attach(T *data)            { Free(); ptr = data; }
+	T          *Detach() pick_             { ChkP(); T *t = ptr; ptr = NULL; return t; }
+	T          *operator-() pick_          { return Detach(); }
+	void        Clear()                    { Free(); ptr = NULL; }
+
+	void        operator=(T *data)         { Attach(data); }
+	void        operator=(pick_ One<T>& d) { Free(); Pick(d); }
+
+	const T    *operator->() const         { ChkP(); return ptr; }
+	T          *operator->()               { ChkP(); return ptr; }
+	const T    *operator~() const          { Chk(); return ptr; }
+	T          *operator~()                { Chk(); return ptr; }
+	const T&    operator*() const          { ChkP(); return *ptr; }
+	T&          operator*()                { ChkP(); return *ptr; }
+
+	template <class TT>
+	TT&         Create()                   { TT *q = new TT; Attach(q); return *q; }
+	T&          Create()                   { T *q = new T; Attach(q); return *q; }
+
+	bool        IsPicked() const           { return ptr == (T*)1; }
+	bool        IsEmpty() const            { Chk(); return !ptr; }
+
+	operator bool() const                  { return ptr; }
+
+	One()                                  { ptr = NULL; }
+	One(T *newt)                           { ptr = newt; }
+	One(pick_ One<T>& p)                   { Pick(p); }
+	One(const One<T>& p, int)              { ptr = p.IsEmpty() ? NULL : DeepCopyNew(*p); }
+	~One()                                 { Free(); }
+};
+
+class Any : Moveable<Any> {
+	struct BaseData {
+		int      typeno;
+		
+		virtual ~BaseData() {}
+	};
+
+	template <class T>
+	struct Data : BaseData {
+		T        data;
+
+		Data()                                    { typeno = StaticTypeNo<T>(); }
+	};
+
+	BaseData *ptr;
+
+	void Chk() const                              { ASSERT(ptr != (void *)1); }
+	void Pick(pick_ Any& s)                       { ptr = s.ptr; const_cast<Any&>(s).ptr = (BaseData *)1; }
+
+public:
+	template <class T> T& Create()                { Clear(); Data<T> *x = new Data<T>; ptr = x; return x->data; }
+	template <class T> bool Is() const            { return ptr && ptr->typeno == StaticTypeNo<T>(); }
+	template <class T> T& Get()                   { ASSERT(Is<T>()); Chk(); return ((Data<T>*)ptr)->data; }
+	template <class T> const T& Get() const       { ASSERT(Is<T>()); Chk(); return ((Data<T>*)ptr)->data; }
+
+	void Clear()                                  { if(ptr) delete ptr; ptr = NULL; }
+
+	bool IsEmpty() const                          { return ptr == NULL; }
+	bool IsPicked() const                         { return ptr == (void *)1; }
+
+	void operator=(pick_ Any& s)                  { Clear(); Pick(s); }
+	Any(pick_ Any& s)                             { Pick(s); }
+
+	Any()                                         { ptr = NULL; }
+	~Any()                                        { Clear(); }
+};
+
+template <class T>
+class Buffer : Moveable< Buffer<T> > {
+	mutable T *ptr;
+
+public:
+	operator T*()                     { return ptr; }
+	operator const T*() const         { return ptr; }
+	T *operator~()                    { return ptr; }
+	const T *operator~() const        { return ptr; }
+
+	void Alloc(int size)              { Clear(); ptr = new T[size]; }
+	void Alloc(int size, const T& in) { Clear(); ptr = new T[size];
+	                                    Fill(ptr, ptr + size, in); }
+
+	void Clear()                      { if(ptr) delete[] ptr; ptr = NULL; }
+
+	Buffer()                          { ptr = NULL; }
+	Buffer(int size)                  { ptr = new T[size]; }
+	Buffer(int size, const T& init)   { ptr = new T[size]; Fill(ptr, ptr + size, init); }
+	~Buffer()                         { if(ptr) delete[] ptr; }
+
+	void operator=(pick_ Buffer& v)   { if(ptr) delete[] ptr; ptr = v.ptr; v.ptr = NULL; }
+	Buffer(pick_ Buffer& v)           { ptr = v.ptr; v.ptr = NULL; }
+};
+
+class Bits : Moveable<Bits> {
+	mutable int alloc;
+	dword      *bp;
+
+public:
+	void   Clear();
+	void   Set(int i, bool b = true);
+	void   Set(int i, bool b, int count);
+	bool   Get(int i) const        { ASSERT(i >= 0 && alloc >= 0); int q = i >> 5;
+	                                 return q < alloc ? bp[q] & (1 << (i & 31)) : false; }
+	bool   operator[](int i) const { return Get(i); }
+
+	Bits()                         { bp = NULL; alloc = 0; }
+	~Bits()                        { Clear(); }
+
+	Bits(pick_ Bits& b)            { alloc = b.alloc; bp = b.bp; b.alloc = -1; }
+	void operator=(pick_ Bits& b)  { Clear(); alloc = b.alloc; bp = b.bp; b.alloc = -1; }
+};
+
+//# System dependent
+template <class T>
+class Mitor : Moveable< Mitor<T> > {
+	union {
+		mutable unsigned   count;
+		mutable Vector<T> *vector;
+	};
+	byte elem0[sizeof(T)];
+
+	T&        Get(int i) const;
+	void      Pick(pick_ Mitor& m);
+	void      Copy(const Mitor& m);
+	void      Chk() const               { ASSERT(count != 2); }
+
+public:
+	T&        operator[](int i)         { return Get(i); }
+	const T&  operator[](int i) const   { return Get(i); }
+	int       GetCount() const;
+	T&        Add();
+	void      Add(const T& x);
+	void      Clear();
+	void      Shrink();
+
+	Mitor(pick_ Mitor& m)               { Pick(m); }
+	void operator=(pick_ Mitor& m)      { Clear(); Pick(m); }
+
+	Mitor(Mitor& m, int)                { Copy(m); }
+	void operator<<=(const Mitor& m)    { Clear(); Copy(m); }
+
+	Mitor()                             { count = 0; }
+	~Mitor()                            { Clear(); }
+};
+
+template <class T>
+T& Mitor<T>::Get(int i) const
+{
+	ASSERT(i >= 0 && i < GetCount());
+	return i == 0 ? *(T*)elem0 : (*const_cast<Vector<T>*>(vector))[i - 1];
+}
+
+template <class T>
+void Mitor<T>::Pick(pick_ Mitor& m)
+{
+	m.Chk();
+	vector = m.vector;
+	memcpy(&elem0, &m.elem0, sizeof(T));
+	m.count = 2;
+}
+
+template <class T>
+void Mitor<T>::Copy(const Mitor& m)
+{
+	m.Chk();
+	if(m.count > 0)
+		DeepCopyConstruct((T*)elem0, m.elem0);
+	if(m.count > 1)
+		vector = new Vector<T>(m.vector, 1);
+}
+
+template <class T>
+int Mitor<T>::GetCount() const
+{
+	Chk();
+	return count > 1 ? vector->GetCount() + 1 : count;
+}
+
+template <class T>
+T& Mitor<T>::Add()
+{
+	Chk();
+	if(count == 0) {
+		count = 1;
+		return *new(elem0) T;
+	}
+	if(count == 1)
+		vector = new Vector<T>;
+	return vector->Add();
+}
+
+template <class T>
+void Mitor<T>::Add(const T& x)
+{
+	Chk();
+	if(count == 0) {
+		count = 1;
+		new((T*) elem0) T(x);
+	}
+	else {
+		if(count == 1)
+			vector = new Vector<T>;
+		vector->Add(x);
+	}
+}
+
+template <class T>
+void Mitor<T>::Clear()
+{
+	if(count > 2)
+		delete vector;
+	if(count && count != 2)
+		((T*)elem0)->T::~T();
+	count = 0;
+}
+
+template <class T>
+void Mitor<T>::Shrink()
+{
+	if(count > 2)
+		vector->Shrink();
+}
+
+//#
+template <class T, int N = 1>
+class Link {
+protected:
+	T *prev[N];
+	T *next[N];
+
+	void LPN(int i)                      { prev[i]->next[i] = next[i]->prev[i] = (T *)this; }
+
+public:
+	T       *GetPtr()                    { return (T *) this; }
+	const T *GetPtr() const              { return (const T *) this; }
+	T       *GetNext(int i = 0)          { return next[i]; }
+	T       *GetPrev(int i = 0)          { return prev[i]; }
+	const T *GetNext(int i = 0) const    { return next[i]; }
+	const T *GetPrev(int i = 0) const    { return prev[i]; }
+
+	void LinkSelf(int i = 0)             { next[i] = prev[i] = (T *)this; }
+	void LinkSelfAll()                   { for(int i = 0; i < N; i++) LinkSelf(i); }
+	void Unlink(int i = 0)               { next[i]->prev[i] = prev[i]; prev[i]->next[i] = next[i];
+	                                       LinkSelf(i); }
+	void UnlinkAll()                     { for(int i = 0; i < N; i++) Unlink(i); }
+	void LinkBefore(Link *n, int i = 0)  { next[i] = (T *)n; prev[i] = next[i]->prev[i]; LPN(i); }
+	void LinkAfter(Link *p, int i = 0)   { prev[i] = (T *)p; next[i] = prev[i]->next[i]; LPN(i); }
+
+	T   *InsertNext(int i = 0)           { T *x = new T; x->LinkAfter(this, i); return x; }
+	T   *InsertPrev(int i = 0)           { T *x = new T; x->LinkBefore(this, i); return x; }
+
+	void DeleteList(int i = 0)           { while(next[i] != GetPtr()) delete next[i]; }
+
+	bool InList(int i = 0) const         { return next[i] != GetPtr(); }
+	bool IsEmpty(int i = 0) const        { return !InList(i); }
+
+	Link()                               { LinkSelfAll(); }
+	~Link()                              { UnlinkAll(); }
+
+private:
+	Link(const Link&);
+	void operator=(const Link&);
+
+public:
+#ifdef _DEBUG
+	void Dump() {
+		for(T *t = GetNext(); t != this; t = t->GetNext())
+			LOG(t);
+		LOG("-------------------------------------");
+	}
+#endif
+};
+
+template <class T, int N = 1>
+class LinkOwner : public Link<T, N> {
+public:
+	~LinkOwner()                         { Link<T, N>::DeleteList(); }
+};
+
+template <class T>
+struct LRUCache {
+	struct Maker {
+		virtual String Key() const = 0;
+		virtual int    Make(T& object) const = 0;
+		virtual ~Maker() {}
+	};
+
+private:
+	struct Item : Moveable<Item> {
+		int16  prev, next;
+		int    size;
+		One<T> data;
+		bool   flag;
+	};
+
+	Index<String> key;
+	Vector<Item>  data;
+	int  head;
+
+	int  size;
+	int  count;
+
+	int  foundsize;
+	int  newsize;
+	bool flag;
+
+
+	void Unlink(int i);
+	void LinkHead(int i);
+
+public:
+	int  GetSize() const            { return size; }
+
+	void Shrink(int maxsize);
+
+	const T& Get(const Maker& m);
+
+	void ClearCounters();
+	int  GetFoundSize() const       { return foundsize; }
+	int  GetNewSize() const         { return newsize; }
+
+	LRUCache() { head = -1; size = 0; count = 0; ClearCounters(); }
+};
+
+template <class T>
+void LRUCache<T>::LinkHead(int i)
+{
+	Item& m = data[i];
+	if(head >= 0) {
+		int tail = data[head].prev;
+		m.next = head;
+		m.prev = tail;
+		data[head].prev = i;
+		data[tail].next = i;
+	}
+	else
+		m.prev = m.next = i;
+	head = i;
+	count++;
+}
+
+
+template <class T>
+void LRUCache<T>::Unlink(int i)
+{
+	Item& m = data[i];
+	if(m.prev == i)
+		head = -1;
+	else {
+		if(head == i)
+			head = m.next;
+		data[(int)m.next].prev = m.prev;
+		data[(int)m.prev].next = m.next;
+	}
+	count--;
+}
+
+template <class T>
+void LRUCache<T>::Shrink(int maxsize)
+{
+	if(maxsize < 0)
+		return;
+	while((count > 30000 || size > maxsize) && head >= 0) {
+		int tail = data[head].prev;
+		size -= data[tail].size;
+		data[tail].data.Clear();
+		Unlink(tail);
+		key.Unlink(tail);
+	}
+}
+
+template <class T>
+void LRUCache<T>::ClearCounters()
+{
+	flag = !flag;
+	newsize = foundsize = 0;
+}
+
+template <class T>
+const T& LRUCache<T>::Get(const Maker& m)
+{
+	String k = m.Key();
+	k.Cat((const char *)&typeid(m), sizeof(void *));
+	int q = key.Find(k);
+	if(q < 0) {
+		q = key.Put(k);
+		Item& t = data.At(q);
+		t.size = m.Make(t.data.Create());
+		size += t.size;
+		newsize += t.size;
+		t.flag = flag;
+	}
+	else {
+		Item& t = data[q];
+		Unlink(q);
+		if(t.flag != flag) {
+			t.flag = flag;
+			foundsize += t.size;
+		}
+	}
+	LinkHead(q);
+	return *data[q].data;
+}
diff --git a/uppsrc/Core/Parser.h b/uppsrc/Core/Parser.h
new file mode 100644
index 000000000..c4341e0d4
--- /dev/null
+++ b/uppsrc/Core/Parser.h
@@ -0,0 +1,129 @@
+inline bool iscib(int c) {
+	return c >= 'a' && c <= 'z' || c >= 'A' && c <= 'Z' || c == '_';
+}
+
+inline bool iscid(int c) {
+	return iscib(c) || c >= '0' && c <= '9';
+}
+
+class CParser {
+protected:
+	const char *term;
+	int         line;
+	String      fn;
+	bool        skipspaces;
+
+	bool        Spaces0();
+	bool        Id0(const char *id);
+	void        DoSpaces()                    { if(skipspaces) Spaces(); }
+
+public:
+	struct Error : public Exc                 { Error(const char *s) : Exc(s) {} };
+
+	void   ThrowError(const char *s);
+
+	void   NoSkipSpaces()                     { skipspaces = false; }
+	void   SkipSpaces()                       { skipspaces = true; }
+
+	bool   Spaces()                           { return (byte)*term <= ' ' || *term == '/' ? Spaces0() : false; }
+	char   PeekChar()                         { return *term; }
+	char   GetChar();
+
+	bool   IsChar(char c)                     { return *term == c; }
+	bool   IsChar2(char c1, char c2)          { return term[0] == c1 && term[1] == c2; }
+	bool   IsChar3(char c1, char c2, char c3) { return term[0] == c1 && term[1] == c2 && term[2] == c3; }
+	bool   Char(char c);
+	bool   Char2(char c1, char c2);
+	bool   Char3(char c1, char c2, char c3);
+	void   PassChar(char c) throw(Error);
+	void   PassChar2(char c1, char c2) throw(Error);
+	void   PassChar3(char c1, char c2, char c3) throw(Error);
+	bool   Id(const char *s)                  { return term[0] == s[0] && (s[1] == 0 || term[1] == s[1]) && Id0(s); }
+	void   PassId(const char *s) throw(Error);
+	bool   IsId()                             { return iscib(*term); }
+	String ReadId() throw(Error);
+	String ReadIdt() throw(Error);
+	bool   IsInt();
+	int    ReadInt() throw(Error);
+	bool   IsNumber()                         { return IsDigit(*term); }
+	bool   IsNumber(int base);
+	uint32 ReadNumber(int base = 10) throw(Error);
+	uint64 ReadNumber64(int base = 10) throw(Error);
+	bool   IsDouble()                         { return IsInt(); }
+	double ReadDouble() throw(Error);
+	bool   IsString()                         { return IsChar('\"'); };
+	String ReadOneString(bool chkend = false) throw(Error);
+	String ReadString(bool chkend = false) throw(Error);
+	String ReadOneString(int delim, bool chkend = false) throw(Error);
+	String ReadString(int delim, bool chkend = false) throw(Error);
+
+	void   SkipTerm();
+
+	struct Pos {
+		const char *ptr;
+		int         line;
+		String      fn;
+
+		Pos(const char *ptr = NULL, int line = 1, String fn = Null) : ptr(ptr), line(line), fn(fn) {}
+	};
+
+	const char *GetPtr()                      { return (const char *)term; }
+
+	Pos         GetPos();
+	void        SetPos(const Pos& pos);
+
+	bool   IsEof() const                      { return *term == '\0'; }
+	operator bool() const                     { return *term; }
+
+	int    GetLine() const                    { return line; }
+	String GetFileName() const                { return fn; }
+	
+	void   Set(const char *ptr, const char *fn, int line = 1);
+	void   Set(const char *ptr);
+
+	CParser(const char *ptr);
+	CParser(const char *ptr, const char *fn, int line = 1);
+	CParser();
+};
+
+inline bool CParser::Char(char c)
+{
+	if(IsChar(c)) {
+		term++;
+		DoSpaces();
+		return true;
+	}
+	return false;
+}
+
+inline bool CParser::Char2(char c1, char c2)
+{
+	if(IsChar2(c1, c2)) {
+		term += 2;
+		DoSpaces();
+		return true;
+	}
+	return false;
+}
+
+inline bool CParser::Char3(char c1, char c2, char c3)
+{
+	if(IsChar3(c1, c2, c3)) {
+		term += 3;
+		DoSpaces();
+		return true;
+	}
+	return false;
+}
+
+enum {
+	ASCSTRING_SMART     = 0x01,
+	ASCSTRING_OCTALHI   = 0x02,
+};
+
+String AsCString(const char *s, const char *end, int linemax = INT_MAX, const char *linepfx = NULL,
+                 dword flags = 0);
+String AsCString(const char *s, int linemax = INT_MAX, const char *linepfx = NULL,
+                 dword flags = 0);
+String AsCString(const String& s, int linemax = INT_MAX, const char *linepfx = NULL,
+                 dword flags = 0);
diff --git a/uppsrc/Core/Path.cpp b/uppsrc/Core/Path.cpp
new file mode 100644
index 000000000..8b167f06a
--- /dev/null
+++ b/uppsrc/Core/Path.cpp
@@ -0,0 +1,1044 @@
+#include "Core.h"
+//#BLITZ_APPROVE
+
+#ifdef PLATFORM_POSIX
+#include <sys/types.h>
+#include <utime.h>
+#endif//PLATFORM_POSIX
+
+#ifdef PLATFORM_WIN32
+#define DLLFILENAME "Kernel32.dll"
+#define DLIMODULE   UnicodeWin32
+#define DLIHEADER   <Core/Kernel32W.dli>
+#include <Core/dli_source.h>
+
+#define DLLFILENAME "Mpr.dll"
+#define DLIMODULE   UnicodeWin32Net
+#define DLIHEADER   <Core/Mpr32W.dli>
+#include <Core/dli_source.h>
+#endif
+
+NAMESPACE_UPP
+
+static int sDirSep(int c) {
+	return c == '/' || c == '\\' ? c : 0;
+}
+
+static bool strecmp0(const char *p, const char *s) {
+	while(*p) {
+		if(*p == '*') {
+			while(*p == '*') p++;
+			do
+				if(*p == *s && strecmp0(p, s)) return true;
+			while(*s++);
+			return false;
+		}
+		if(*p == '?') {
+			if(*s == '\0') return false;
+		}
+		else
+			if(ToUpper(*p) != ToUpper(*s)) return false;
+		s++;
+		p++;
+	}
+	return *s == '\0';
+}
+
+bool PatternMatch(const char *p, const char *s) {
+	const char *q;
+	q = strchr(p, '.');
+	if(q) {
+		if(q[1] == '\0') {
+			if(strchr(s, '.')) return false;
+			String h(p, q);
+			return strecmp0(h, s);
+		}
+		else
+		if(q[1] == '*' && q[2] == '\0') {
+			String h(p, q);
+			return strecmp0(h, s) || strecmp0(p, s);
+		}
+	}
+	return strecmp0(p, s);
+}
+
+bool PatternMatchMulti(const char *p, const char *s) {
+	String pt;
+	while(*p) {
+		if(*p == ';' || *p == ',' || *p == ' ') {
+			if(PatternMatch(pt, s)) return true;
+			p++;
+			while(*p == ';' || *p == ',' || *p == ' ') p++;
+			pt.Clear();
+		}
+		else
+			pt.Cat(*p++);
+	}
+	return pt.IsEmpty() ? false : PatternMatch(pt, s);
+}
+
+const char *GetFileNamePos(const char *fileName) {
+	const char *s = fileName;
+	const char *fname = s;
+	char c;
+	while((c = *s++) != '\0')
+	#ifdef PLATFORM_WIN32
+		if(c == '\\' || c == ':' || c == '/')
+	#else
+		if(c == '/')
+	#endif
+			fname = s;
+	return fname;
+}
+
+const char *GetFileExtPos(const char *fileName) {
+	fileName = GetFileNamePos(fileName);
+	const char *ext = strrchr(fileName, '.');
+	return ext ? ext : fileName + strlen(fileName);
+}
+
+bool HasFileName(const char *fileName) {
+	return *GetFileNamePos(fileName);
+}
+
+bool HasFileExt(const char *fileName) {
+	return *GetFileExtPos(fileName);
+}
+
+bool HasWildcards(const char *fileName) {
+	return strchr(fileName, '*') || strchr(fileName, '?');
+}
+
+bool IsFullPath(const char *r) {
+#ifdef PLATFORM_WIN32
+	return *r && r[1] && (r[1] == ':' || r[0] == '\\' && r[1] == '\\' || r[0] == '/' && r[1] == '/');
+#endif
+#ifdef PLATFORM_POSIX
+	return *r == '/';
+#endif
+}
+
+String GetFileDirectory(const char *fileName) {
+	return String(fileName, (int)(GetFileNamePos(fileName) - fileName));
+}
+
+String GetFileFolder(const char *fileName) {
+	const char *s = GetFileNamePos(fileName);
+#ifdef PLATFORM_WIN32
+	if(s - fileName == 3 && fileName[1] == ':')
+		return String(fileName, 3);
+#endif
+#ifdef PLATFORM_POSIX
+	if(s - fileName == 1 && s[0] == '/')
+		return "/";
+#endif
+	if(s > fileName)
+		return String(fileName, (int)(s - fileName) - 1);
+	return Null;
+}
+
+String GetFileTitle(const char *fileName) {
+	fileName = GetFileNamePos(fileName);
+	const char *ext = GetFileExtPos(fileName);
+	if(*ext)
+		return String(fileName, (int)(ext - fileName));
+	else
+		return fileName;
+}
+
+String GetFileExt(const char *fileName) {
+	return GetFileExtPos(fileName);
+}
+
+String GetFileName(const char *fileName) {
+	return GetFileNamePos(fileName);
+}
+
+String AppendFileName(const String& path, const char *fileName) {
+	String result = path;
+	if(result.GetLength() && *result.Last() != DIR_SEP)
+		result += DIR_SEP;
+	result += fileName;
+	return result;
+}
+
+#ifdef PLATFORM_WIN32
+bool   PathIsEqual(const char *p1, const char *p2)
+{
+	return ToLower(NormalizePath(p1)) == ToLower(NormalizePath(p2));
+}
+#endif
+
+#ifdef PLATFORM_POSIX
+bool   PathIsEqual(const char *p1, const char *p2)
+{
+	return NormalizePath(p1) == NormalizePath(p2);
+}
+#endif
+
+int ComparePath(const char *a, const char *b, int length) {
+	ASSERT(length >= 0);
+	if(length <= 0)
+		return 0;
+#if PLATFORM_PATH_HAS_CASE
+	return memcmp(a, b, length);
+#else
+	return MemICmp(a, b, length);
+#endif
+}
+
+int ComparePath(String fa, String fb) {
+	int la = fa.GetLength(), lb = fb.GetLength();
+	int r = ComparePath(fa, fb, min(la, lb));
+	return r ? r : cmp(la, lb);
+}
+
+#ifndef PLATFORM_WINCE
+String GetCurrentDirectory() {
+#if defined(PLATFORM_WIN32)
+	if(IsWinNT()) {
+		wchar h[MAX_PATH];
+		UnicodeWin32().GetCurrentDirectoryW(MAX_PATH, h);
+		return FromSystemCharsetW(h);
+	}
+	else {
+		char h[MAX_PATH];
+		::GetCurrentDirectory(MAX_PATH, h);
+		return FromSystemCharset(h);
+	}
+#elif defined(PLATFORM_POSIX)
+	char h[1024];
+	getcwd(h, 1024);
+	return FromSystemCharset(h);
+#else
+#error GetCurrentDirectory not implemented for this platform, comment this line to get Null
+	return Null;
+#endif//PLATFORM
+}
+#endif
+
+#if defined(PLATFORM_WIN32) && !defined(PLATFORM_WINCE)
+
+String GetTempPath()
+{
+	if(IsWinNT()) {
+		wchar h[MAX_PATH];
+		UnicodeWin32().GetTempPathW(MAX_PATH, h);
+		return FromSystemCharsetW(h);
+	}
+	else {
+		char h[MAX_PATH];
+		::GetTempPath(MAX_PATH, h);
+		return FromSystemCharset(h);
+	}
+}
+
+#endif
+
+#ifdef PLATFORM_POSIX
+
+String GetTempPath()
+{
+	return FromSystemCharset(P_tmpdir);
+}
+
+#endif
+
+#ifndef PLATFORM_WINCE
+String GetTempFileName(const char *prefix) {
+	Uuid id = Uuid::Create();
+	return AppendFileName(GetTempPath(), String(prefix) + Format(id) + ".tmp");
+}
+#endif
+
+String FromUnixName(const char* fn, const char* stop = NULL) {
+	String s;
+	char c;
+	while(fn != stop && (c = *fn++))
+		s += (c == '/' ? '\\' : c);
+	return s;
+}
+
+String ToUnixName(const char* fn, const char* stop = NULL) {
+	String s;
+	char c;
+	while(fn != stop && (c = *fn++))
+		s += (c == '\\' ? '/' : c);
+	return s;
+}
+
+#ifndef PLATFORM_WINCE
+String GetFullPath(const char *file) {
+#ifdef PLATFORM_WIN32
+	if(IsWinNT()) {
+		String ufn = FromUnixName(file);
+		wchar h[MAX_PATH];
+		UnicodeWin32().GetFullPathNameW(ToSystemCharsetW(ufn), MAX_PATH, h, 0);
+		return FromSystemCharsetW(h);
+	}
+	else {
+		String ufn = FromUnixName(file);
+		char h[MAX_PATH];
+		GetFullPathName(ToSystemCharset(ufn), MAX_PATH, h, 0);
+		return FromSystemCharset(h);
+	}
+#else
+	return NormalizePath(file);
+#endif
+}
+#endif
+
+String GetFileOnPath(const char* file, const char* paths, bool current, const char *curdir) {
+	String ufn = NativePath(file);
+	if(IsFullPath(ufn))
+		return ufn;
+	String fn;
+#ifdef PLATFORM_WINCE
+	if(current && curdir && FileExists(fn = NormalizePath(ufn, curdir)))
+		;
+#else
+	String cd = curdir;
+	if(!curdir)
+		cd = GetCurrentDirectory();
+	if(current && FileExists(fn = NormalizePath(ufn, cd)))
+		;
+#endif
+	else if(paths)
+	{
+		fn = Null;
+		while(*paths) {
+			const char* start = paths;
+#ifdef PLATFORM_WIN32
+			while(*paths && *paths != ';')
+				paths++;
+#else
+			while(*paths && *paths != ';' && *paths != ':')
+				paths++;
+#endif
+			String dir(start, (int)(paths - start));
+			if(!dir.IsEmpty()) {
+#ifdef PLATFORM_WINCE
+				dir = NormalizePath(AppendFileName(NativePath(dir), ufn));
+#else
+				dir = NormalizePath(AppendFileName(NativePath(dir), ufn), cd);
+#endif
+				if(FileExists(dir)) {
+					fn = dir;
+					break;
+				}
+			}
+			if(*paths)
+				paths++;
+		}
+	}
+	return fn;
+}
+
+String WinPath(const char *p) {
+	String r;
+	while(*p) {
+		r.Cat(*p == '/' ? '\\' : *p);
+		p++;
+	}
+	return r;
+}
+
+String UnixPath(const char *p) {
+	String r;
+	while(*p) {
+		r.Cat(*p == '\\' ? '/' : *p);
+		p++;
+	}
+	return r;
+}
+
+String AppendExt(const char* fn, const char* ext) {
+	String result = NativePath(fn);
+	if(!HasFileExt(fn))
+		result += ext;
+	return result;
+}
+
+String ForceExt(const char* fn, const char* ext) {
+	return NativePath(String(fn, GetFileExtPos(fn))) + ext;
+}
+
+#ifdef PLATFORM_WIN32
+
+void FindFile::Init()
+{
+	if(IsWinNT()) {
+		w = new WIN32_FIND_DATAW;
+		a = NULL;
+	}
+	else {
+		a = new WIN32_FIND_DATA;
+		w = NULL;
+	}
+}
+
+FindFile::~FindFile()
+{
+	Close();
+	delete a;
+	delete w;
+}
+
+FindFile::FindFile()
+{
+	Init();
+	handle = INVALID_HANDLE_VALUE;
+}
+
+FindFile::FindFile(const char *name) {
+	Init();
+	handle = INVALID_HANDLE_VALUE;
+	Search(name);
+}
+
+bool FindFile::Search(const char *name) {
+	Close();
+	if(w)
+		handle = UnicodeWin32().FindFirstFileW(ToSystemCharsetW(name), w);
+	else
+		handle = FindFirstFile(ToSystemCharset(name), a);
+	return handle != INVALID_HANDLE_VALUE;
+}
+
+void FindFile::Close() {
+	if(handle != INVALID_HANDLE_VALUE) FindClose(handle);
+	handle = INVALID_HANDLE_VALUE;
+}
+
+bool FindFile::Next() {
+	if(w) {
+		if(!UnicodeWin32().FindNextFileW(handle, w)) {
+			Close();
+			return false;
+		}
+	}
+	else {
+		if(!FindNextFile(handle, a)) {
+			Close();
+			return false;
+		}
+	}
+	return true;
+}
+
+dword FindFile::GetAttributes() const
+{
+	return w ? w->dwFileAttributes : a->dwFileAttributes;
+}
+
+String FindFile::GetName() const
+{
+	return w ? FromSystemCharsetW(w->cFileName) : FromSystemCharset(a->cFileName);
+}
+
+int64 FindFile::GetLength() const
+{
+	if(w)
+		return (int64)w->nFileSizeLow | ((int64)w->nFileSizeHigh << 32);
+	else
+		return (int64)a->nFileSizeLow | ((int64)a->nFileSizeHigh << 32);
+}
+
+FileTime FindFile::GetCreationTime() const
+{
+	return w ? w->ftCreationTime : a->ftCreationTime;
+}
+
+FileTime FindFile::GetLastAccessTime() const
+{
+	return w ? w->ftLastAccessTime : a->ftLastAccessTime;
+}
+
+FileTime FindFile::GetLastWriteTime() const
+{
+	return w ? w->ftLastWriteTime : a->ftLastWriteTime;
+}
+
+bool FindFile::IsDirectory() const
+{
+	return w ? w->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY
+	         : a->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY;
+}
+
+
+bool FindFile::IsFolder() const {
+	if(w)
+		return IsDirectory()
+			&& !(w->cFileName[0] == '.' && w->cFileName[1] == 0)
+			&& !(w->cFileName[0] == '.' && w->cFileName[1] == '.' && w->cFileName[2] == 0);
+	else
+		return IsDirectory()
+			&& !(a->cFileName[0] == '.' && a->cFileName[1] == 0)
+			&& !(a->cFileName[0] == '.' && a->cFileName[1] == '.' && a->cFileName[2] == 0);
+}
+
+bool FindFile::IsArchive() const
+{
+	return w ? w->dwFileAttributes & FILE_ATTRIBUTE_ARCHIVE
+	         : a->dwFileAttributes & FILE_ATTRIBUTE_ARCHIVE;
+}
+
+bool FindFile::IsCompressed() const
+{
+	return w ? w->dwFileAttributes & FILE_ATTRIBUTE_COMPRESSED
+	         : a->dwFileAttributes & FILE_ATTRIBUTE_COMPRESSED;
+}
+
+bool FindFile::IsHidden() const
+{
+	return w ? w->dwFileAttributes & FILE_ATTRIBUTE_HIDDEN
+	         : a->dwFileAttributes & FILE_ATTRIBUTE_HIDDEN;
+}
+
+bool FindFile::IsReadOnly() const
+{
+	return w ? w->dwFileAttributes & FILE_ATTRIBUTE_READONLY
+	         : a->dwFileAttributes & FILE_ATTRIBUTE_READONLY;
+}
+
+bool FindFile::IsSystem() const
+{
+	return w ? w->dwFileAttributes & FILE_ATTRIBUTE_SYSTEM
+	         : a->dwFileAttributes & FILE_ATTRIBUTE_SYSTEM;
+}
+
+bool FindFile::IsTemporary() const
+{
+	return w ? w->dwFileAttributes & FILE_ATTRIBUTE_TEMPORARY
+	         : a->dwFileAttributes & FILE_ATTRIBUTE_TEMPORARY;
+}
+
+String NormalizePath(const char *path, const char *currdir)
+{
+	String join_path;
+	if(!IsFullPath(path))
+		path = join_path = AppendFileName(currdir, path);
+	String out;
+	if(*path && path[1] == ':') {
+		out << path[0] << ":\\";
+		path += 3;
+	}
+	else
+	if(path[0] == '\\' && path[1] == '\\') {
+		out = "\\\\";
+		path += 2;
+	}
+	else
+	if(sDirSep(*path)) {
+		if(*currdir)
+			out << *currdir << ':';
+		out.Cat(DIR_SEP);
+		path++;
+	}
+	int outstart = out.GetLength();
+	while(*path) {
+		if(sDirSep(*path)) {
+			while(sDirSep(*path))
+				path++;
+			if(*path == '\0')
+				break;
+			if(out.IsEmpty() || *out.Last() != DIR_SEP)
+				out.Cat(DIR_SEP);
+		}
+		const char *b = path;
+		while(*path && !sDirSep(*path))
+			path++;
+		if(path - b == 1 && *b == '.')
+			; //no-op
+		else if(path - b == 2 && *b == '.' && b[1] == '.') {
+			const char *ob = ~out + outstart, *oe = out.End();
+			if(oe - 1 > ob && oe[-1] == DIR_SEP)
+				oe--;
+			while(oe > ob && oe[-1] != DIR_SEP)
+				oe--;
+			out.Trim((int)(oe - out.Begin()));
+		}
+		else
+			out.Cat(b, (int)(path - b));
+	}
+	return out;
+}
+
+#endif
+
+#ifdef PLATFORM_POSIX
+
+void FindFile::Close() {
+	if(dir) {
+		closedir(dir);
+	    dir = NULL;
+	 }
+}
+
+bool FindFile::IsFolder() const {
+	return IsDirectory()
+		&& !(name[0] == '.' && name[1] == '\0')
+		&& !(name[0] == '.' && name[1] == '.' && name[2] == '\0');
+}
+
+struct stat& FindFile::Stat() const {
+	if(!statis) {
+		statis = true;
+		if(file)
+			stat(AppendFileName(path, name), &statf);
+	}
+	return statf;
+}
+
+bool FindFile::Next() {
+	if(!dir) return false;
+	statis = false;
+	for(;;) {
+	  	struct dirent *e = readdir(dir);
+  		if(!e) {
+	  		name.Clear();
+	  		file = false;
+	  		Close();
+	  		return false;
+	  	}
+	  	name = FromSystemCharset(e->d_name);
+	  	if(PatternMatch(pattern, name)) {
+	  		file = true;
+	  		return true;
+	  	}
+	}
+}
+
+bool FindFile::Search(const char *fn) {
+	Close();
+	path = GetFileDirectory(fn);
+	statis = false;
+	file = false;
+	if(HasWildcards(fn)) {
+		pattern = GetFileName(fn);
+		dir = opendir(ToSystemCharset(path));
+		return Next();
+	}
+	else {
+		name = GetFileName(fn);
+		if(stat(ToSystemCharset(fn), &statf)) return false;
+		statis = true;
+		file = true;
+		return true;
+	}
+}
+
+FindFile::FindFile(const char *fn) {
+	dir = NULL;
+	Search(fn);
+}
+
+String NormalizePath(const char *path, const char *currdir) {
+	Vector<String> si = Split(path, CharFilterTextTest(sDirSep));
+	Vector<String> p;
+	int i = 0;
+	String out;
+	if(path[0] == '~') {
+		out = GetHomeDirectory();
+		i++;
+	}
+	else
+	if(sDirSep(path[0]))
+		out = (sDirSep(path[1]) ? "//" : "/");
+	else {
+		out = (sDirSep(currdir[0]) && sDirSep(currdir[1]) ? "//" : "/");
+		p = Split(currdir, CharFilterTextTest(sDirSep));
+	}
+	bool quote = false;
+	for(; i < si.GetCount(); i++) {
+		String s = si[i];
+		if(s != "." && !s.IsEmpty())
+			if(s[0] == '.' && s[1] == '.') {
+				if(!p.IsEmpty()) p.Drop();
+			}
+			else {
+				p.Add(s);
+				if(s.Find(' ') >= 0)
+					quote = true;
+			}
+	}
+	out.Cat(Join(p, DIR_SEPS));
+//	if(quote)
+//		return '\"' + out + '\"';
+//	else
+		return out;
+}
+
+#endif//PLATFORM_POSIX
+
+bool FileExists(const char *name) {
+	FindFile ff(name);
+	return ff && ff.IsFile();
+}
+
+int64 GetFileLength(const char *name) {
+	FindFile ff(name);
+	return ff ? ff.GetLength() : -1;
+}
+
+bool DirectoryExists(const char *name) {
+	FindFile ff(name);
+	return ff && ff.IsDirectory();
+}
+
+bool IsFolder(String path)
+{
+	if(IsNull(path) || *path.Last() == '\\' || *path.Last() == '/' || *path.Last() == ':')
+		return true;
+	if(path.Find('?') >= 0 || path.Find('*') >= 0)
+		return false;
+	FindFile ff(path);
+	return ff && ff.IsDirectory();
+}
+
+String NormalizePath(const char *path) {
+#ifdef PLATFORM_WINCE
+	return NormalizePath(path, "");
+#else
+	return NormalizePath(path, GetCurrentDirectory());
+#endif
+}
+
+bool FileCopy(const char *oldname, const char *newname)
+{
+#if defined(PLATFORM_WIN32)
+	if(IsWinNT())
+		return UnicodeWin32().CopyFileW(ToSystemCharsetW(oldname), ToSystemCharsetW(newname), false);
+	else
+		return CopyFile(ToSystemCharset(oldname), ToSystemCharset(newname), false);
+#elif defined(PLATFORM_POSIX)
+	FileIn fi(oldname);
+	if(!fi.IsOpen())
+		return false;
+	FileOut fo(newname);
+	if(!fo.IsOpen())
+		return false;
+	CopyStream(fo, fi, fi.GetLeft());
+	fi.Close();
+	fo.Close();
+	if(fo.IsError())
+	{
+		unlink(newname);
+		return false;
+	}
+	FileSetTime(newname, FileGetTime(oldname));
+	return true;
+#else
+	#error
+#endif//PLATFORM
+}
+
+bool FileMove(const char *oldname, const char *newname)
+{
+#if defined(PLATFORM_WIN32)
+	if(IsWinNT())
+		return !!UnicodeWin32().MoveFileW(ToSystemCharsetW(oldname), ToSystemCharsetW(newname));
+	else
+		return !!MoveFile(ToSystemCharset(oldname), ToSystemCharset(newname));
+#elif defined(PLATFORM_POSIX)
+	return !rename(ToSystemCharset(oldname), ToSystemCharset(newname));
+#else
+	#error
+#endif//PLATFORM
+}
+
+bool FileDelete(const char *filename)
+{
+#if defined(PLATFORM_WIN32)
+	if(IsWinNT())
+		return !!UnicodeWin32().DeleteFileW(ToSystemCharsetW(filename));
+	else
+		return !!DeleteFile(ToSystemCharset(filename));
+#elif defined(PLATFORM_POSIX)
+	return !unlink(ToSystemCharset(filename));
+#else
+	#error
+#endif//PLATFORM
+}
+
+bool DirectoryDelete(const char *dirname)
+{
+#if defined(PLATFORM_WIN32)
+	if(IsWinNT())
+		return !!UnicodeWin32().RemoveDirectoryW(ToSystemCharsetW(dirname));
+	else
+		return !!RemoveDirectory(ToSystemCharset(dirname));
+#elif defined(PLATFORM_POSIX)
+	return !rmdir(ToSystemCharset(dirname));
+#else
+	#error
+#endif//PLATFORM
+}
+
+#ifdef PLATFORM_WIN32
+int Compare_FileTime(const FileTime& fa, const FileTime& fb)
+{
+	return CompareFileTime(&fa, &fb);
+}
+#endif
+
+Time FileGetTime(const char *filename)
+{
+#if defined(PLATFORM_WIN32)
+	HANDLE handle;
+	if(IsWinNT())
+		handle = UnicodeWin32().CreateFileW(ToSystemCharsetW(filename), GENERIC_READ,
+		                    FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, NULL);
+	else
+		handle = CreateFile(ToSystemCharset(filename), GENERIC_READ,
+		                    FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, NULL);
+	if(handle == INVALID_HANDLE_VALUE)
+		return Null;
+	FileTime ft;
+	bool res = GetFileTime(handle, 0, 0, &ft);
+	CloseHandle(handle);
+	return res ? Time(ft) : Time(Null);
+#elif defined(PLATFORM_POSIX)
+	struct stat st;
+	if(stat(ToSystemCharset(filename), &st))
+		return Null;
+	return Time(st.st_mtime);
+#else
+	#error
+#endif//PLATFORM
+}
+
+bool SetFileTime(const char *filename, FileTime ft)
+{
+#if defined(PLATFORM_WIN32)
+	HANDLE handle;
+	if(IsWinNT())
+		handle = UnicodeWin32().CreateFileW(ToSystemCharsetW(filename), GENERIC_READ | GENERIC_WRITE,
+			FILE_SHARE_READ | FILE_SHARE_WRITE, NULL,
+			OPEN_EXISTING, 0, NULL);
+	else
+		handle = CreateFile(ToSystemCharset(filename), GENERIC_READ | GENERIC_WRITE,
+			FILE_SHARE_READ | FILE_SHARE_WRITE, NULL,
+			OPEN_EXISTING, 0, NULL);
+	if(handle == INVALID_HANDLE_VALUE)
+		return false;
+	bool res = SetFileTime(handle, 0, 0, &ft);
+	CloseHandle(handle);
+	return res;
+#elif defined(PLATFORM_POSIX)
+	struct utimbuf ub;
+	ub.actime = ub.modtime = ft;
+	return !utime(ToSystemCharset(filename), &ub);
+#else
+	#error
+#endif//PLATFORM
+}
+
+bool FileSetTime(const char *filename, Time time)
+{
+	return SetFileTime(filename, TimeToFileTime(time));
+}
+
+FileTime TimeToFileTime(Time time)
+{
+#ifdef PLATFORM_WIN32
+	SYSTEMTIME tm;
+	Zero(tm);
+	tm.wYear   = time.year;
+	tm.wMonth  = time.month;
+	tm.wDay    = time.day;
+	tm.wHour   = time.hour;
+	tm.wMinute = time.minute;
+	tm.wSecond = time.second;
+	FileTime ftl, ftg;
+	SystemTimeToFileTime(&tm, &ftl);
+	LocalFileTimeToFileTime(&ftl, &ftg);
+	return ftg;
+#endif
+#ifdef PLATFORM_POSIX
+	struct tm t;
+	t.tm_sec  = time.second;
+	t.tm_min  = time.minute;
+	t.tm_hour = time.hour;
+	t.tm_mday = time.day;
+	t.tm_mon  = time.month - 1;
+	t.tm_year = time.year - 1900;
+	return mktime(&t);
+#endif
+}
+
+#ifdef PLATFORM_POSIX
+bool DirectoryCreate(const char *path, int mode)
+{
+	return ::mkdir(ToSystemCharset(path), mode) == 0;
+}
+#else
+bool DirectoryCreate(const char *path)
+{
+	if(IsWinNT())
+		return !!UnicodeWin32().CreateDirectoryW(ToSystemCharsetW(path), 0);
+	else
+		return !!CreateDirectory(ToSystemCharset(path), 0);
+}
+#endif
+
+#ifdef PLATFORM_WIN32
+#define DIR_MIN 3 //!! wrong! what about \a\b\c ?
+#endif
+
+#ifdef PLATFORM_POSIX
+#define DIR_MIN 1
+#endif
+
+void RealizeDirectory(String dir)
+{
+	if(dir.GetLength() > DIR_MIN) {
+		RealizeDirectory(GetFileFolder(dir));
+		if(!DirectoryExists(dir))
+			DirectoryCreate(dir);
+	}
+}
+
+void RealizePath(String file)
+{
+	RealizeDirectory(GetFileFolder(file));
+}
+
+bool DeleteFolderDeep(const char *dir)
+{
+	{
+		FindFile ff(String(dir) + "/*.*");
+		while(ff) {
+			String name = ff.GetName();
+			String p = AppendFileName(dir, name);
+			if(ff.IsFile())
+				FileDelete(p);
+			else
+			if(ff.IsFolder())
+				DeleteFolderDeep(p);
+			ff.Next();
+		}
+	}
+	return DirectoryDelete(dir);
+}
+
+FileSystemInfo::FileInfo::FileInfo()
+: length(Null), read_only(false), is_directory(false)
+	, is_folder(false), is_file(false), is_symlink(false), is_archive(false)
+	, is_compressed(false), is_hidden(false), is_read_only(false), is_system(false)
+	, is_temporary(false), root_style(ROOT_NO_ROOT_DIR)
+{}
+
+GLOBAL_VAR(FileSystemInfo, StdFileSystemInfo)
+
+int FileSystemInfo::GetStyle() const
+{
+#ifdef PLATFORM_WIN32
+	return STYLE_WIN32;
+#endif
+#ifdef PLATFORM_POSIX
+	return STYLE_POSIX;
+#endif
+}
+
+Array<FileSystemInfo::FileInfo> FileSystemInfo::Find(String mask, int max_count) const
+{
+	Array<FileInfo> fi;
+	if(IsNull(mask))
+	{ // root
+#ifdef PLATFORM_WINCE
+		FileInfo& f = fi.Add();
+		f.filename = "\\";
+		f.root_style = ROOT_FIXED;
+#elif defined(PLATFORM_WIN32)
+		char drive[4] = "?:\\";
+		for(int c = 'A'; c <= 'Z'; c++) {
+			*drive = c;
+			int n = GetDriveType(drive);
+			if(n == DRIVE_NO_ROOT_DIR/* || IsWin32() && *drive == 'B'*/) continue;
+			FileInfo& f = fi.Add();
+			f.filename = drive;
+			char name[256], system[256];
+			DWORD d;
+			if(c != 'A' && c != 'B' && n != DRIVE_REMOTE && n != DRIVE_UNKNOWN &&
+			   GetVolumeInformation(drive, name, 256, &d, &d, &d, system, 256)) {
+			   	if(*name) f.root_desc << " " << FromSystemCharset(name);
+			   	if(*system) f.root_desc << " [ " << FromSystemCharset(system) << " ]";
+			}
+			switch(n)
+			{
+			default:
+			case DRIVE_UNKNOWN:     f.root_style = ROOT_UNKNOWN; break;
+			case DRIVE_NO_ROOT_DIR: f.root_style = ROOT_NO_ROOT_DIR; break;
+			case DRIVE_REMOVABLE:   f.root_style = ROOT_REMOVABLE; break;
+			case DRIVE_FIXED:       f.root_style = ROOT_FIXED; break;
+			case DRIVE_REMOTE:      f.root_style = ROOT_REMOTE; break;
+			case DRIVE_CDROM:       f.root_style = ROOT_CDROM; break;
+			case DRIVE_RAMDISK:     f.root_style = ROOT_RAMDISK; break;
+			}
+		}
+#elif defined(PLATFORM_POSIX)
+		FileInfo& f = fi.Add();
+		f.filename = "/";
+		f.root_style = ROOT_FIXED;
+#endif
+	}
+	else
+	{
+		FindFile ff;
+		if(ff.Search(mask))
+			do
+			{
+				FileInfo& f = fi.Add();
+				f.filename = ff.GetName();
+#ifndef PLATFORM_POSIX
+				f.is_archive = ff.IsArchive();
+				f.is_compressed = ff.IsCompressed();
+				f.is_hidden = ff.IsHidden();
+				f.is_system = ff.IsSystem();
+				f.is_temporary = ff.IsTemporary();
+#endif
+				f.is_read_only = ff.IsReadOnly();
+				f.length = ff.GetLength();
+#ifdef PLATFORM_POSIX
+				f.creation_time = ff.GetLastChangeTime();
+				f.unix_mode = ff.GetMode();
+#endif
+				f.last_access_time = ff.GetLastAccessTime();
+				f.last_write_time = ff.GetLastWriteTime();
+#ifdef PLATFORM_WIN32
+				f.creation_time = ff.GetCreationTime();
+				f.unix_mode = 0;
+#endif
+				f.read_only = ff.IsReadOnly();
+				f.is_directory = ff.IsDirectory();
+				f.is_folder = ff.IsFolder();
+				f.is_file = ff.IsFile();
+#ifdef PLATFORM_POSIX
+				f.is_symlink = ff.IsSymLink();
+#endif
+			}
+			while(ff.Next() && fi.GetCount() < max_count);
+	}
+	return fi;
+}
+
+bool FileSystemInfo::CreateFolder(String path, String& error) const
+{
+	if(UPP::DirectoryCreate(path))
+		return true;
+	error = GetErrorMessage(GetLastError());
+	return false;
+}
+
+bool FileSystemInfo::FolderExists(String path) const
+{
+	if(IsNull(path))
+		return true;
+	if(path.Find('*') >= 0 || path.Find('?') >= 0)
+		return false;
+	Array<FileInfo> fi = Find(path, 1);
+	return !fi.IsEmpty() && fi[0].is_directory;
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/Core/Path.h b/uppsrc/Core/Path.h
new file mode 100644
index 000000000..f4ec5913a
--- /dev/null
+++ b/uppsrc/Core/Path.h
@@ -0,0 +1,296 @@
+
+bool PatternMatch(const char *p, const char *s);
+bool PatternMatchMulti(const char *p, const char *s);
+
+const char  *GetFileNamePos(const char *fileName);
+const char  *GetFileExtPos(const char *fileName);
+
+bool    HasFileName(const char *fp);
+bool    HasFileExt(const char *fp);
+bool    HasWildcards(const char *fp);
+bool    IsFullPath(const char *fp);
+
+String  GetFileDirectory(const char *fp); // with DIR_SEP at the end
+String  GetFileFolder(const char *fileName); // without DIR_SEP at the end, if not Win32 root
+String  GetFileTitle(const char *fp);
+String  GetFileExt(const char *fp);
+String  GetFileName(const char *fp);
+
+String  AppendFileName(const String& path, const char *fp);
+
+bool PathIsEqual(const char *p1, const char *p2);
+
+int     ComparePath(const char *a, const char *b, int length);
+int     ComparePath(String fa, String fb);
+
+inline bool LessPath(String fa, String fb) { return ComparePath(fa, fb) < 0; }
+
+String WinPath(const char *path);
+String UnixPath(const char *path);
+
+#ifdef  PLATFORM_WIN32
+inline String  NativePath(const char *path) { return WinPath(path); }
+#endif
+
+#ifdef  PLATFORM_POSIX
+inline String  NativePath(const char *path) { return UnixPath(path); }
+#endif
+
+String  AppendExt(const char *fn, const char *ext);
+String  ForceExt(const char *fn, const char *ext);
+
+String  GetFileOnPath(const char *file, const char *paths, bool current = true, const char *curdir = NULL);
+
+#ifndef PLATFORM_WINCE
+String  GetFullPath(const char *path);
+String  GetCurrentDirectory();
+#endif
+
+struct FileTime;
+
+int Compare_FileTime(const FileTime& fa, const FileTime& fb);
+
+#ifdef PLATFORM_WIN32
+
+struct FileTime : FILETIME, CompareRelOps<const FileTime&, &Compare_FileTime> {
+	FileTime()                          {}
+	FileTime(const FILETIME& ft)        { dwLowDateTime = ft.dwLowDateTime;
+	                                      dwHighDateTime = ft.dwHighDateTime; }
+};
+
+class  FindFile {
+	WIN32_FIND_DATA  *a;
+	WIN32_FIND_DATAW *w;
+	HANDLE            handle;
+
+	void              Init();
+
+public:
+	bool        Search(const char *name);
+	bool        Next();
+	void        Close();
+
+	dword       GetAttributes() const;
+	String      GetName() const;
+	int64       GetLength() const;
+	FileTime    GetCreationTime() const;
+	FileTime    GetLastAccessTime() const;
+	FileTime    GetLastWriteTime() const;
+
+	bool        IsDirectory() const;
+	bool        IsFolder() const;
+	bool        IsFile() const           { return !IsDirectory(); }
+
+	bool        IsArchive() const;
+	bool        IsCompressed() const;
+	bool        IsHidden() const;
+	bool        IsReadOnly() const;
+	bool        IsSystem() const;
+	bool        IsTemporary() const;
+
+	operator    bool() const             { return handle != INVALID_HANDLE_VALUE; }
+
+	FindFile();
+	FindFile(const char *name);
+	~FindFile();
+};
+
+#endif
+
+#ifdef PLATFORM_POSIX
+
+struct FileTime : CompareRelOps<const FileTime&, &Compare_FileTime>
+{
+	FileTime() {}
+	FileTime(time_t ft) : ft(ft) {}
+
+	operator time_t () const { return ft; }
+
+	time_t ft;
+};
+
+inline int Compare_FileTime(const FileTime& f, const FileTime& g) { return f.ft < g.ft ? -1 : f.ft > g.ft ? 1 : 0; }
+
+class FindFile {
+	bool           file;
+	DIR           *dir;
+	mutable bool   statis;
+	mutable struct stat statf;
+	String         path;
+	String         name;
+	String         pattern;
+
+	struct stat &Stat() const;
+
+public:
+	bool        Search(const char *name);
+	bool        Next();
+	void        Close();
+
+	dword       GetMode() const           { return Stat().st_mode; }
+	String      GetName() const           { return name; }
+	int64       GetLength() const         { return Stat().st_size; }
+	FileTime    GetLastChangeTime() const { return Stat().st_ctime; }
+	FileTime    GetLastAccessTime() const { return Stat().st_atime; }
+	FileTime    GetLastWriteTime() const  { return Stat().st_mtime; }
+
+	bool        IsReadOnly() const        { return !(GetMode() & (S_IWUSR|S_IWGRP|S_IWOTH)); }
+
+	bool        IsDirectory() const       { return S_ISDIR(GetMode()); }
+	bool        IsFolder() const;
+
+	bool        IsFile() const            { return S_ISREG(GetMode()); }
+	bool        IsSymLink() const         { return S_ISLNK(GetMode()); }
+
+	operator    bool() const              { return file; }
+
+	FindFile()                            { file = false; dir = NULL; }
+	FindFile(const char *name);
+	~FindFile()                           { Close(); }
+};
+
+// POSIX FileTime is unfortunately long int and clashes with Date::operator int()
+inline bool operator==(Time a, FileTime b) { return a == Time(b); }
+inline bool operator!=(Time a, FileTime b) { return a != Time(b); }
+
+inline bool operator==(FileTime a, Time b) { return Time(a) == b; }
+inline bool operator!=(FileTime a, Time b) { return Time(a) != b; }
+
+#endif
+
+int64       GetFileLength(const char *name);
+bool        FileExists(const char *name);
+bool        IsFolder(String path);
+
+String      NormalizePath(const char *path);
+String      NormalizePath(const char *path, const char *currdir);
+
+bool        FileCopy(const char *oldname, const char *newname);
+bool        FileMove(const char *oldname, const char *newname);
+bool        FileDelete(const char *filename);
+
+bool        DirectoryExists(const char *name);
+#ifdef PLATFORM_POSIX
+bool        DirectoryCreate(const char *dirname, int mode = 0755);
+#else
+bool        DirectoryCreate(const char *dirname);
+#endif
+bool        DirectoryDelete(const char *dirname);
+void        RealizeDirectory(String dir);
+void        RealizePath(String file);
+
+struct Time;
+Time        FileGetTime(const char *filename);
+bool        SetFileTime(const char *filename, FileTime ft);
+bool        FileSetTime(const char *filename, Time time);
+FileTime    TimeToFileTime(Time time);
+
+#ifdef PLATFORM_POSIX
+inline bool DeleteFile(const char *fn)      { return unlink(fn) == 0; }
+#endif
+
+bool    DeleteFolderDeep(const char *dir);
+
+#ifndef PLATFORM_WINCE
+String  GetTempPath();
+String  GetTempFileName(const char *prefix = NULL);
+#endif
+
+template <class T>
+class Array;
+
+class FileSystemInfo
+{
+public:
+	enum
+	{
+		ROOT_UNKNOWN     = 0,
+		ROOT_NO_ROOT_DIR = 1,
+		ROOT_REMOVABLE   = 2,
+		ROOT_FIXED       = 3,
+		ROOT_REMOTE      = 4,
+		ROOT_CDROM       = 5,
+		ROOT_RAMDISK     = 6,
+		ROOT_NETWORK     = 7,
+		ROOT_COMPUTER    = 8,
+	};
+
+	enum
+	{
+		STYLE_WIN32      = 0x0001,
+		STYLE_POSIX      = 0x0002,
+	};
+
+	struct FileInfo
+	{
+		FileInfo();
+
+		operator bool () const { return !IsNull(filename); }
+
+		String filename;
+		String msdos_name;
+		String root_desc;
+		int64  length;
+		Time   last_access_time;
+		Time   last_write_time;
+		Time   creation_time;
+		bool   read_only;
+		bool   is_directory;
+		bool   is_folder;
+		bool   is_file;
+		bool   is_symlink;
+		bool   is_archive;
+		bool   is_compressed;
+		bool   is_hidden;
+		bool   is_read_only;
+		bool   is_system;
+		bool   is_temporary;
+		char   root_style;
+		dword  unix_mode;
+	};
+
+	virtual int             GetStyle() const;
+	bool                    IsWin32() const { return GetStyle() & STYLE_WIN32; }
+	bool                    IsPosix() const { return GetStyle() & STYLE_POSIX; }
+
+	virtual Array<FileInfo> Find(String mask, int max_count = 1000000) const; // mask = Null -> root
+	virtual bool            CreateFolder(String path, String& error) const;
+
+	bool                    FolderExists(String path) const;
+	
+	virtual ~FileSystemInfo() {}
+};
+
+FileSystemInfo& StdFileSystemInfo();
+
+#ifdef PLATFORM_WIN32
+
+class NetNode : Moveable<NetNode> {
+	NETRESOURCE net;
+	String      local, remote, comment, provider;
+
+	String      name;
+	String      path;
+
+	static void           Copy(String& t, char *s);
+	static Array<NetNode> Enum0(HANDLE hEnum);
+	static void           SetPtr(String& s, char *& ptr);
+
+	void SetPtrs();
+
+public:
+	String         GetName() const    { return name; }
+	String         GetPath() const    { return path; }
+	Array<NetNode> Enum() const;
+
+	void           Serialize(Stream& s);
+
+	static Array<NetNode> EnumRoot();
+
+	NetNode();
+	NetNode(const NetNode& s)         { *this = s; }
+
+	NetNode& operator=(const NetNode& s);
+};
+
+#endif
diff --git a/uppsrc/Core/Profile.h b/uppsrc/Core/Profile.h
new file mode 100644
index 000000000..1ef93faca
--- /dev/null
+++ b/uppsrc/Core/Profile.h
@@ -0,0 +1,64 @@
+class String;
+
+class TimingInspector {
+protected:
+	static bool active;
+
+	const char *name;
+	int         call_count;
+	dword       total_time;
+	dword       min_time;
+	dword       max_time;
+	int         nesting_depth;
+	int         max_nesting;
+	int         all_count;
+	dword       start_time;
+	StaticMutex mutex;
+
+public:
+	TimingInspector(const char *name = NULL); // Not String !!!
+	~TimingInspector();
+
+	void   Start();
+	void   End();
+
+	String Dump();
+
+	class Routine {
+	public:
+		Routine(TimingInspector& stat) : stat(stat) { stat.Start(); }
+		~Routine()                                  { stat.End(); }
+
+	protected:
+		TimingInspector& stat;
+	};
+
+	static void Activate(bool b)                    { active = b; }
+};
+
+class HitCountInspector
+{
+public:
+	HitCountInspector(const char *name, int hitcount = 0) : name(name), hitcount(hitcount) {}
+	~HitCountInspector();
+
+	void Step()              { Mutex::Lock __(mutex); hitcount++; }
+	void Add(int i)          { 	Mutex::Lock __(mutex); hitcount += i; }
+	void operator ++ ()      { Step(); }
+	void operator += (int i) { Add(i); }
+
+private:
+	const char *name;
+	int         hitcount;
+	Mutex       mutex;
+};
+
+#define RTIMING(x) \
+	static TimingInspector COMBINE(sTmStat, __LINE__)(x); \
+	TimingInspector::Routine COMBINE(sTmStatR, __LINE__)(COMBINE(sTmStat, __LINE__));
+
+#define RACTIVATE_TIMING()    TimingInspector::Activate(true);
+#define RDEACTIVATE_TIMING()  TimingInspector::Activate(false);
+
+#define RHITCOUNT(n) \
+	{ static HitCountInspector hitcount(n); hitcount.Step(); }
diff --git a/uppsrc/Core/Ptr.cpp b/uppsrc/Core/Ptr.cpp
new file mode 100644
index 000000000..d50d35125
--- /dev/null
+++ b/uppsrc/Core/Ptr.cpp
@@ -0,0 +1,87 @@
+#include "Core.h"
+
+NAMESPACE_UPP
+
+/* Faster, but consuming more memory....
+PteBase::Prec *PteBase::PtrAdd()
+{
+	AtomicInc(prec->n);
+	return prec;
+}
+
+void PteBase::PtrRelease(Prec *prec)
+{
+	if(prec && AtomicDec(prec->n) == 0)
+		delete prec;
+}
+
+PteBase::PteBase()
+{
+	prec = new Prec;
+	prec->n = 1;
+	prec->ptr = this;
+}
+*/
+
+static StaticCriticalSection sPteLock;
+
+PteBase::Prec *PteBase::PtrAdd()
+{
+	sPteLock.Enter();
+	if(prec) {
+		++prec->n;
+		sPteLock.Leave();
+	}
+	else {
+		sPteLock.Leave();
+		prec = new Prec;
+		prec->n = 1;
+		prec->ptr = this;
+	}
+	return const_cast<Prec *>(prec);
+}
+
+void PteBase::PtrRelease(Prec *prec)
+{
+	CriticalSection::Lock __(sPteLock);
+	if(prec && --prec->n == 0) {
+		if(prec->ptr)
+			prec->ptr->prec = NULL;
+		delete prec;
+	}
+}
+
+PteBase::PteBase()
+{
+	prec = NULL;
+}
+
+PteBase::~PteBase()
+{
+	CriticalSection::Lock __(sPteLock);
+	if(prec)
+		prec->ptr = NULL;
+}
+
+void PtrBase::Release()
+{
+	PteBase::PtrRelease(prec);
+}
+
+void PtrBase::Set(PteBase *p)
+{
+	prec = p ? p->PtrAdd() : NULL;
+}
+
+void PtrBase::Assign(PteBase *p)
+{
+	Release();
+	Set(p);
+}
+
+PtrBase::~PtrBase()
+{
+	Release();
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/Core/Ptr.h b/uppsrc/Core/Ptr.h
new file mode 100644
index 000000000..34ce16578
--- /dev/null
+++ b/uppsrc/Core/Ptr.h
@@ -0,0 +1,75 @@
+template <class T> class Ptr;
+
+class PteBase {
+protected:
+	struct Prec {
+		PteBase *ptr;
+		Atomic   n;
+	};
+
+	volatile Prec  *prec;
+
+	Prec           *PtrAdd();
+	static void     PtrRelease(Prec *prec);
+	static Prec    *PtrAdd(const Uuid& uuid);
+
+	PteBase();
+	~PteBase();
+
+	friend class PtrBase;
+};
+
+class PtrBase {
+protected:
+	PteBase::Prec *prec;
+	void Set(PteBase *p);
+	void Release();
+	void Assign(PteBase *p);
+
+public:
+	~PtrBase();
+};
+
+template <class T>
+class Pte : public PteBase {
+	friend class Ptr<T>;
+};
+
+template <class T>
+class Ptr : public PtrBase, Moveable< Ptr<T> > {
+	T   *Get() const                          { return prec ? static_cast<T *>(prec->ptr) : NULL; }
+
+public:
+	T       *operator->() const               { return Get(); }
+	T       *operator~() const                { return Get(); }
+	operator T*() const                       { return Get(); }
+
+	Ptr& operator=(T *ptr)                    { Assign(ptr); return *this; }
+	Ptr& operator=(const Ptr& ptr)            { Assign(ptr.Get()); return *this; }
+
+	Ptr()                                     { prec = NULL; }
+	Ptr(T *ptr)                               { Set(ptr); }
+	Ptr(const Ptr& ptr)                       { Set(ptr.Get()); }
+
+	String ToString() const;
+
+	friend bool operator==(const Ptr& a, const T *b)   { return a.Get() == b; }
+	friend bool operator==(const T *a, const Ptr& b)   { return a == b.Get(); }
+	friend bool operator==(const Ptr& a, const Ptr& b) { return a.prec == b.prec; }
+
+	friend bool operator==(const Ptr& a, T *b)         { return a.Get() == b; }
+	friend bool operator==(T *a, const Ptr& b)         { return a == b.Get(); }
+
+	friend bool operator!=(const Ptr& a, const T *b)   { return a.Get() != b; }
+	friend bool operator!=(const T *a, const Ptr& b)   { return a != b.Get(); }
+	friend bool operator!=(const Ptr& a, const Ptr& b) { return a.prec != b.prec; }
+
+	friend bool operator!=(const Ptr& a, T *b)         { return a.Get() != b; }
+	friend bool operator!=(T *a, const Ptr& b)         { return a != b.Get(); }
+};
+
+template <class T>
+String Ptr<T>::ToString() const
+{
+	return prec ? FormatPtr(Get()) : String("0x0");
+}
diff --git a/uppsrc/Core/StrUtil.cpp b/uppsrc/Core/StrUtil.cpp
new file mode 100644
index 000000000..a80f91857
--- /dev/null
+++ b/uppsrc/Core/StrUtil.cpp
@@ -0,0 +1,102 @@
+#include <Core/Core.h>
+
+NAMESPACE_UPP
+
+int wstrlen(const wchar *s)
+{
+	const wchar *q = s;
+	while(*q) q++;
+	return (int)(q - s);
+}
+
+unsigned ctoi(int c)
+{
+	if(c >= '0' && c <= '9')
+		return c - '0';
+	if(c >= 'A' && c <= 'Z')
+		return c - 'A' + 10;
+	if(c >= 'a' && c <= 'z')
+		return c - 'a' + 10;
+	return (unsigned)-1;
+}
+
+int CharFilterAscii(int c)
+{
+	return c >= 32 && c < 256 ? c : 0;
+}
+
+int CharFilterAscii128(int c)
+{
+	return c >= 32 && c < 128 ? c : 0;
+}
+
+int CharFilterUnicode(int c)
+{
+	return c >= 32 && c < 65536 ? c : 0;
+}
+
+int CharFilterDigit(int c)
+{
+	return IsDigit(c) ? c : 0;
+}
+
+int CharFilterInt(int c)
+{
+	if(c == '+' || c == '-') return c;
+	return CharFilterDigit(c);
+}
+
+int CharFilterDouble(int c)
+{
+	if(c == ',' || c == '.') return '.';
+	if(c == 'e' || c == 'E') return 'E';
+	return CharFilterInt(c);
+}
+
+int CharFilterWhitespace(int c)
+{
+	return IsSpace(c) ? c : 0;
+}
+
+int CharFilterAlpha(int c)
+{
+	return IsAlpha(c) ? c : 0;
+}
+
+int CharFilterAlphaToUpper(int c)
+{
+	return IsAlpha(c) ? IsUpper(c) ? c : ToUpper(c) : 0;
+}
+
+int CharFilterAlphaToLower(int c)
+{
+	return IsAlpha(c) ? IsLower(c) ? c : ToLower(c) : 0;
+}
+
+int CharFilterDefaultToUpperAscii(int c)
+{
+	return ToUpper(ToAscii(c, CHARSET_DEFAULT));
+}
+
+String Filter(const char *s, int (*filter)(int))
+{
+	String result;
+	while(*s) {
+		int c = (*filter)((byte)*s++);
+		if(c) result.Cat(c);
+	}
+	return result;
+}
+
+String FilterWhile(const char *s, int (*filter)(int))
+{
+	String result;
+	while(*s) {
+		int c = (*filter)((byte)*s++);
+		if(!c) break;
+		result.Cat(c);
+	}
+	return result;
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/Core/Stream.cpp b/uppsrc/Core/Stream.cpp
new file mode 100644
index 000000000..a261048d5
--- /dev/null
+++ b/uppsrc/Core/Stream.cpp
@@ -0,0 +1,1652 @@
+#include "Core.h"
+
+#ifdef PLATFORM_POSIX
+#include <sys/mman.h>
+#endif
+
+NAMESPACE_UPP
+
+#define LLOG(x) // RLOG(x)
+#define LDUMP(x) // RDUMP(x)
+#define LLOGHEXDUMP(x, y) // RLOGHEXDUMP(x, y)
+
+void Stream::_Put(const void *data, dword size) {
+	const byte *s = (const byte *) data;
+	while(size--)
+		Put(*s++);
+}
+
+dword Stream::_Get(void *data, dword size) {
+	int c;
+	byte *s = (byte *) data;
+	dword sz;
+	for(sz = 0; sz < size && (c = Get()) >= 0; sz++)
+		*s++ = c;
+	return sz;
+}
+
+void Stream::_Put(int w) {
+	SetError(ERROR_NOT_ENOUGH_SPACE);
+}
+
+int  Stream::_Get() {
+	return -1;
+}
+
+int  Stream::_Term() {
+	return -1;
+}
+
+void Stream::Seek(int64) {
+	NEVER();
+}
+
+int64 Stream::GetSize() const {
+	return 0;
+}
+
+void Stream::SetSize(int64) {
+	NEVER();
+}
+
+bool Stream::IsOpen() const { return false; }
+
+void Stream::Close() {}
+
+void Stream::Flush() {}
+
+Stream::Stream() {
+	pos = style = 0;
+	buffer = NULL;
+	ptr = rdlim = wrlim = NULL;
+}
+
+Stream::~Stream() {}
+
+bool Stream::_IsEof() const
+{
+	return GetPos() >= GetSize();
+}
+
+void Stream::LoadError() {
+	SetError(ERROR_LOADING_FAILED);
+	if(style & STRM_THROW)
+		throw LoadingError();
+}
+
+bool Stream::GetAll(void *data, dword size) {
+	if(Get(data, size) != size) {
+		LoadError();
+		return false;
+	}
+	return true;
+}
+
+String Stream::Get(dword size)
+{
+	StringBuffer b(size);
+	int n = Get(~b, size);
+	b.SetCount(n);
+	String s = b;
+	s.Trim(n);
+	return s;
+}
+
+int  Stream::_Get8()
+{
+	int c = Get();
+	if(c < 0) {
+		LoadError();
+		return -1;
+	}
+	return c;
+}
+
+int  Stream::_Get16() {
+	word w;
+	return GetAll(&w, 2) ? w : -1;
+}
+
+int  Stream::_Get32() {
+	int l;
+	return GetAll(&l, 4) ? l : -1;
+}
+
+int64  Stream::_Get64() {
+	int64 l;
+	return GetAll(&l, 8) ? l : -1;
+}
+
+#ifdef CPU_LE
+int  Stream::Get16be() {
+	byte h[2];
+	int q;
+	h[1] = Get();
+	h[0] = q = Get();
+	if(q < 0) {
+		LoadError();
+		return -1;
+	}
+	return *(word *)h;
+}
+
+int Stream::Get32be() {
+	byte h[4];
+	int q;
+	h[3] = Get();
+	h[2] = Get();
+	h[1] = Get();
+	h[0] = q = Get();
+	if(q < 0) {
+		LoadError();
+		return -1;
+	}
+	return *(int32 *)h;
+}
+
+int64 Stream::Get64be() {
+	byte h[8];
+	int q;
+	h[7] = Get();
+	h[6] = Get();
+	h[5] = Get();
+	h[4] = Get();
+	h[3] = Get();
+	h[2] = Get();
+	h[1] = Get();
+	h[0] = q = Get();
+	if(q < 0) {
+		LoadError();
+		return -1;
+	}
+	return *(int64 *)h;
+}
+#else
+int  Stream::Get16le() {
+	byte h[2];
+	int q;
+	h[0] = Get();
+	h[1] = q = Get();
+	return q < 0 ? -1 : *(word *)h;
+}
+
+int Stream::Get32le() {
+	byte h[4];
+	int q;
+	h[0] = Get();
+	h[1] = Get();
+	h[2] = Get();
+	h[3] = q = Get();
+	return q < 0 ? -1 : *(int32 *)h;
+}
+
+int64 Stream::Get64le() {
+	byte h[8];
+	int q;
+	h[0] = Get();
+	h[1] = Get();
+	h[2] = Get();
+	h[3] = Get();
+	h[4] = Get();
+	h[5] = Get();
+	h[6] = Get();
+	h[7] = q = Get();
+	return q < 0 ? -1 : *(int64 *)h;
+}
+#endif
+
+int Stream::GetUtf8()
+{
+	int code = Get();
+	if(code <= 0) {
+		LoadError();
+		return -1;
+	}
+	if(code < 0x80)
+		return code;
+	else
+	if(code < 0xC2)
+		return -1;
+	else
+	if(code < 0xE0) {
+		if(IsEof()) {
+			LoadError();
+			return -1;
+		}
+		return ((code - 0xC0) << 6) + Get() - 0x80;
+	}
+	else
+	if(code < 0xF0) {
+		int c0 = Get();
+		int c1 = Get();
+		if(c1 < 0) {
+			LoadError();
+			return -1;
+		}
+		return ((code - 0xE0) << 12) + ((c0 - 0x80) << 6) + c1 - 0x80;
+	}
+	else
+	if(code < 0xF8) {
+		int c0 = Get();
+		int c1 = Get();
+		int c2 = Get();
+		if(c2 < 0) {
+			LoadError();
+			return -1;
+		}
+		return ((code - 0xf0) << 18) + ((c0 - 0x80) << 12) + ((c1 - 0x80) << 6) + c2 - 0x80;
+	}
+	else
+	if(code < 0xFC) {
+		int c0 = Get();
+		int c1 = Get();
+		int c2 = Get();
+		int c3 = Get();
+		if(c3 < 0) {
+			LoadError();
+			return -1;
+		}
+		return ((code - 0xF8) << 24) + ((c0 - 0x80) << 18) + ((c1 - 0x80) << 12) +
+		       ((c2 - 0x80) << 6) + c3 - 0x80;
+	}
+	else
+	if(code < 0xFE) {
+		int c0 = Get();
+		int c1 = Get();
+		int c2 = Get();
+		int c3 = Get();
+		int c4 = Get();
+		if(c4 < 0) {
+			LoadError();
+			return -1;
+		}
+		return ((code - 0xFC) << 30) + ((c0 - 0x80) << 24) + ((c1 - 0x80) << 18) +
+		       ((c2 - 0x80) << 12) + ((c3 - 0x80) << 6) + c4 - 0x80;
+
+	}
+	else {
+		LoadError();
+		return -1;
+	}
+}
+
+String Stream::GetLine() {
+	byte *q = ptr;
+	while(q < rdlim)
+		if(*q == '\n') {
+			String result((const char *)ptr, q - ptr - (q > ptr && q[-1] == '\r'));
+			ptr = q + 1;
+			return result;
+		}
+		else
+			q++;
+	String result((const char *)ptr, q - ptr);
+	ptr = q;
+	for(;;) {
+		byte *q = ptr;
+		while(q < rdlim && *q != '\n')
+			q++;
+		result.Cat(ptr, q - ptr);
+		ptr = q;
+		int c = Get();
+		if(c == '\n')
+			break;
+		if(c < 0) {
+			if(result.GetCount() == 0)
+				return String::GetVoid();
+			break;
+		}
+		result.Cat(c);
+	}
+	if(*result.Last() == '\r')
+		result.Trim(result.GetLength() - 1);
+	return result;
+}
+
+#ifdef CPU_LE
+void Stream::Put16be(word q) {
+	byte *h = (byte *) &q;
+	Put(h[1]);
+	Put(h[0]);
+}
+
+void Stream::Put32be(dword q) {
+	byte *h = (byte *) &q;
+	Put(h[3]);
+	Put(h[2]);
+	Put(h[1]);
+	Put(h[0]);
+}
+
+void Stream::Put64be(int64 q) {
+	byte *h = (byte *) &q;
+	Put(h[7]);
+	Put(h[6]);
+	Put(h[5]);
+	Put(h[4]);
+	Put(h[3]);
+	Put(h[2]);
+	Put(h[1]);
+	Put(h[0]);
+}
+#else
+void Stream::Put16le(word q) {
+	byte *h = (byte *) &q;
+	Put(h[0]);
+	Put(h[1]);
+}
+
+void Stream::Put32le(dword q) {
+	byte *h = (byte *) &q;
+	Put(h[0]);
+	Put(h[1]);
+	Put(h[2]);
+	Put(h[3]);
+}
+
+void Stream::Put64le(int64 q) {
+	byte *h = (byte *) &q;
+	Put(h[0]);
+	Put(h[1]);
+	Put(h[2]);
+	Put(h[3]);
+	Put(h[4]);
+	Put(h[5]);
+	Put(h[6]);
+	Put(h[7]);
+}
+#endif
+
+void Stream::PutUtf8(int c)
+{
+	word code = c;
+	if(code < 0x80)
+		Put(code);
+	else
+	if(code < 0x800) {
+		Put(0xc0 | (code >> 6));
+		Put(0x80 | (code & 0x3f));
+	}
+	else
+	if((code & 0xFF00) == 0xEE00)
+		Put(code);
+	else {
+		Put(0xe0 | (code >> 12));
+		Put(0x80 | ((code >> 6) & 0x3f));
+		Put(0x80 | (code & 0x3f));
+	}
+}
+
+void Stream::Put(const char *s)
+{
+	while(*s) Put(*s++);
+}
+
+void Stream::Put(int c, int count) {
+
+	while(count) {
+		int n = min(count, (int)(intptr_t)(wrlim - ptr));
+		if(n > 0) {
+			memset(ptr, c, n);
+			ptr += n;
+			count -= n;
+		}
+		else {
+			Put(c);
+			count--;
+		}
+	}
+}
+
+void Stream::PutLine(const char *s) {
+	Put(s);
+	PutEol();
+}
+
+void Stream::PutLine(const String& s) {
+	Put(s);
+	PutEol();
+}
+
+void  Stream::Put(Stream& s, int64 size, dword click) {
+	Buffer<byte> buffer(click);
+	while(size) {
+		dword n = s.Get(buffer, (int)min<int64>(click, size));
+		Put(buffer.operator const byte *(), click);
+		size -= n;
+	}
+}
+
+void Stream::SerializeRLE(byte *data, dword size)
+{
+	if(IsError()) return;
+	byte *s =   (byte *)data;
+	byte *lim = s + size;
+	if(IsLoading())
+		while(s != lim) {
+			if(IsEof() || s > lim) {
+				LoadError();
+				return;
+			}
+			byte c = Get();
+			if(c == 0xcb) {
+				c = Get();
+				int n = Get();
+				if(s + n > lim) {
+					LoadError();
+					return;
+				}
+				memset(s, c, n);
+				s += n;
+			}
+			else
+				*s++ = c;
+		}
+	else
+		while(s < lim) {
+			byte  c = *s;
+			byte *t = s + 1;
+			byte *lm = min(s + 250, lim);
+			while(*t == c && t < lm)
+				t++;
+			if(t >= s + 3 || c == 0xcb) {
+				Put(0xcb);
+				Put(c);
+				Put(byte(t - s));
+			}
+			else {
+				Put(*s);
+
+				if(t == s + 2)
+					Put(*s);
+			}
+			if(IsError()) break;
+			s = t;
+		}
+}
+
+void Stream::SerializeRaw(byte *data, dword size) {
+	if(IsError()) return;
+	if(IsLoading())
+		GetAll(data, size);
+	else
+		Put(data, size);
+}
+
+void Stream::SerializeRaw(word *data, dword count) {
+#ifdef CPU_BE
+	EndianSwap(data, count);
+#endif
+	SerializeRaw((byte *)data, 2 * count);
+#ifdef CPU_BE
+	EndianSwap(data, count);
+#endif
+}
+
+void Stream::SerializeRaw(dword *data, dword count) {
+#ifdef CPU_BE
+	EndianSwap(data, count);
+#endif
+	SerializeRaw((byte *)data, 4 * count);
+#ifdef CPU_BE
+	EndianSwap(data, count);
+#endif
+}
+
+void Stream::SerializeRaw(uint64 *data, dword count) {
+#ifdef CPU_BE
+	EndianSwap(data, count);
+#endif
+	SerializeRaw((byte *)data, 8 * count);
+#ifdef CPU_BE
+	EndianSwap(data, count);
+#endif
+}
+
+void Stream::Pack(dword& w) {
+	if(IsError()) return;
+	if(IsLoading()) {
+		int q = Get();
+		if(q < 0)
+			LoadError();
+		else {
+			if(q != 255)
+				w = q;
+			else
+				SerializeRaw(&w, 1);
+		}
+	}
+	else {
+		if(w < 255)
+			Put(w);
+		else {
+			Put(255);
+			SerializeRaw(&w, 1);
+		}
+	}
+}
+
+void    Stream::Pack(bool& a, bool& b, bool& c, bool& d, bool& e, bool& f, bool& g, bool& h) {
+	if(IsError()) return;
+	if(IsLoading()) {
+		int f = Get();
+		if(f < 0) LoadError();
+		else {
+			a = !!(f & 0x80);
+			b = !!(f & 0x40);
+			c = !!(f & 0x20);
+			d = !!(f & 0x10);
+			e = !!(f & 0x08);
+			f = !!(f & 0x04);
+			g = !!(f & 0x02);
+			h = !!(f & 0x01);
+		}
+	}
+	else {
+		int f = 0;
+		if(a) f |= 0x80;
+		if(b) f |= 0x40;
+		if(c) f |= 0x20;
+		if(d) f |= 0x10;
+		if(e) f |= 0x08;
+		if(f) f |= 0x04;
+		if(g) f |= 0x02;
+		if(h) f |= 0x01;
+		Put(f);
+	}
+}
+
+void  Stream::Pack(bool& a, bool& b, bool& c, bool& d, bool& e, bool& f, bool& g) {
+	bool h = false; Pack(a, b, c, d, e, f, g, h);
+}
+
+void  Stream::Pack(bool& a, bool& b, bool& c, bool& d, bool& e, bool& f) {
+	bool h = false; Pack(a, b, c, d, e, f, h, h);
+}
+
+void  Stream::Pack(bool& a, bool& b, bool& c, bool& d, bool& e) {
+	bool h = false; Pack(a, b, c, d, e, h, h, h);
+}
+
+void  Stream::Pack(bool& a, bool& b, bool& c, bool& d) {
+	bool h = false; Pack(a, b, c, d, h, h, h, h);
+}
+
+void  Stream::Pack(bool& a, bool& b, bool& c) {
+	bool h = false; Pack(a, b, c, h, h, h, h, h);
+}
+
+void  Stream::Pack(bool& a, bool& b) {
+	bool h = false; Pack(a, b, h, h, h, h, h, h);
+}
+
+#if 1
+Stream& Stream::operator%(bool& d)
+{
+	SerializeRaw((byte *)&d, 1);
+	return *this;
+}
+
+Stream& Stream::operator%(char& d)
+{
+	SerializeRaw((byte *)&d, 1);
+	return *this;
+}
+
+Stream& Stream::operator%(signed char& d)
+{
+	SerializeRaw((byte *)&d, 1);
+	return *this;
+}
+
+Stream& Stream::operator%(unsigned char& d)
+{
+	SerializeRaw((byte *)&d, 1);
+	return *this;
+}
+
+Stream& Stream::operator%(short& d)
+{
+	SerializeRaw((word *)&d, 1);
+	return *this;
+}
+
+Stream& Stream::operator%(unsigned short& d)
+{
+	SerializeRaw((word *)&d, 1);
+	return *this;
+}
+
+Stream& Stream::operator%(int& d)
+{
+	SerializeRaw((dword *)&d, 1);
+	return *this;
+}
+
+Stream& Stream::operator%(unsigned int& d)
+{
+	SerializeRaw((dword *)&d, 1);
+	return *this;
+}
+
+Stream& Stream::operator%(long& d)
+{
+	SerializeRaw((dword *)&d, 1);
+	return *this;
+}
+
+Stream& Stream::operator%(unsigned long& d)
+{
+	SerializeRaw((dword *)&d, 1);
+	return *this;
+}
+
+Stream& Stream::operator%(float& d)
+{
+	SerializeRaw((dword *)&d, 1);
+	return *this;
+}
+
+Stream& Stream::operator%(double& d)
+{
+	SerializeRaw((uint64 *)&d, 1);
+	return *this;
+}
+
+Stream& Stream::operator%(int64& d)
+{
+	SerializeRaw((uint64 *)&d, 1);
+	return *this;
+}
+
+Stream& Stream::operator%(uint64& d)
+{
+	SerializeRaw((uint64 *)&d, 1);
+	return *this;
+}
+
+#else
+
+Stream& Stream::operator%(bool& d)
+{
+	SerializeRaw((byte *)&d, sizeof(d));
+	return *this;
+}
+
+Stream& Stream::operator%(char& d)
+{
+	SerializeRaw((byte *)&d, sizeof(d));
+	return *this;
+}
+
+Stream& Stream::operator%(signed char& d)
+{
+	SerializeRaw((byte *)&d, sizeof(d));
+	return *this;
+}
+
+Stream& Stream::operator%(unsigned char& d)
+{
+	SerializeRaw((byte *)&d, sizeof(d));
+	return *this;
+}
+
+Stream& Stream::operator%(short& d)
+{
+	SerializeRaw((byte *)&d, sizeof(d));
+	return *this;
+}
+
+Stream& Stream::operator%(unsigned short& d)
+{
+	SerializeRaw((byte *)&d, sizeof(d));
+	return *this;
+}
+
+Stream& Stream::operator%(int& d)
+{
+	SerializeRaw((byte *)&d, sizeof(d));
+	return *this;
+}
+
+Stream& Stream::operator%(unsigned int& d)
+{
+	SerializeRaw((byte *)&d, sizeof(d));
+	return *this;
+}
+
+Stream& Stream::operator%(long& d)
+{
+	SerializeRaw((byte *)&d, sizeof(d));
+	return *this;
+}
+
+Stream& Stream::operator%(unsigned long& d)
+{
+	SerializeRaw((byte *)&d, sizeof(d));
+	return *this;
+}
+
+Stream& Stream::operator%(float& d)
+{
+	SerializeRaw((byte *)&d, sizeof(d));
+	return *this;
+}
+
+Stream& Stream::operator%(double& d)
+{
+	SerializeRaw((byte *)&d, sizeof(d));
+	return *this;
+}
+
+Stream& Stream::operator%(int64& d)
+{
+	SerializeRaw((byte *)&d, sizeof(d));
+	return *this;
+}
+
+Stream& Stream::operator%(uint64& d)
+{
+	SerializeRaw((byte *)&d, sizeof(d));
+	return *this;
+}
+#endif
+
+
+Stream& Stream::operator%(String& s) {
+	if(IsError()) return *this;
+	if(IsLoading()) {
+		dword len;
+		len = Get();
+		if(len != 0xff) {
+			if(len & 0x80) {
+				len &= 0x7f;
+				Get(); // reserved for future use... or removal
+			}
+		}
+		else {
+			len = Get32le();
+			if(len & 0x80000000) {
+				len &= 0x7fffffff;
+				Get(); // reserved for future use... or removal
+			}
+		}
+		if(IsError() || len + GetPos() > GetSize())
+			LoadError();
+		else {
+			StringBuffer sb(len);
+			SerializeRaw((byte*)~sb, len);
+			s = sb;
+		}
+	}
+	else {
+		dword len = s.GetLength();
+		if(len < 127)
+			Put(len);
+		else {
+			Put(0xff);
+			Put32le(len);
+		}
+		SerializeRaw((byte *)~s, len);
+	}
+	return *this;
+}
+
+Stream& Stream::operator/(String& s) {
+	if(IsError()) return *this;
+	dword len = s.GetLength();
+	Pack(len);
+	if(IsLoading()) {
+		StringBuffer b(len);
+		SerializeRLE((byte *)~b, len);
+		s = b;
+	}
+	else
+		SerializeRLE((byte *)~s, len);
+	return *this;
+}
+
+Stream& Stream::operator%(WString& s) {
+	if(IsError()) return *this;
+	if(IsLoading()) {
+		dword len;
+		Pack(len);
+		if(IsError() || len + GetPos() > GetSize())
+			LoadError();
+		else {
+			WStringBuffer sb(len);
+			SerializeRaw((byte*)~sb, len * sizeof(wchar));
+			s = sb;
+		}
+	}
+	else {
+		dword len = s.GetLength();
+		if(len < 0xff)
+			Put(len);
+		else {
+			Put(0xff);
+			Put32le(len);
+		}
+		SerializeRaw((byte*)~s, len * sizeof(wchar));
+	}
+	return *this;
+}
+
+Stream& Stream::operator/(WString& s) {
+	if(IsError()) return *this;
+	String h = ToUtf8(s);
+	*this / h;
+	s = FromUtf8(h);
+	return *this;
+}
+
+void Stream::Magic(dword magic) {
+	dword a = magic;
+	*this % a;
+	if(magic != a) LoadError();
+}
+
+// -------------------------- String stream -----------------------------
+
+void StringStream::SetWriteBuffer()
+{
+	buffer = (byte *)wdata.Begin();
+	rdlim = buffer;
+	wrlim = (byte *)wdata.End();
+}
+
+void StringStream::SetWriteMode()
+{
+	if(writemode) return;
+	intptr_t p = ptr - buffer;
+	size = data.GetLength();
+	wdata = data;
+	SetWriteBuffer();
+	ptr = buffer + p;
+	writemode = true;
+}
+
+void   StringStream::SetReadMode()
+{
+	if(!writemode) return;
+	wdata.SetLength((dword)GetSize());
+	dword p = (dword)(uintptr_t)(ptr - buffer);
+	data = wdata;
+	buffer = (byte *) ~data;
+	ptr = buffer + p;
+	wrlim = buffer;
+	rdlim = buffer + data.GetCount();
+	writemode = false;
+}
+
+void  StringStream::Open(const String& adata)
+{
+	pos = 0;
+	data = adata;
+	style = STRM_READ|STRM_WRITE|STRM_SEEK|STRM_LOADING;
+	wdata.Clear();
+	buffer = (byte *) ~data;
+	ptr = wrlim = buffer;
+	rdlim = buffer + data.GetCount();
+	writemode = false;
+	ClearError();
+}
+
+void  StringStream::Create()
+{
+	Open(String());
+	SetStoring();
+	SetWriteMode();
+	ClearError();
+}
+
+int64 StringStream::GetSize() const
+{
+	return writemode ? max<int64>(GetPos(), size) : data.GetLength();
+}
+
+String StringStream::GetResult()
+{
+	SetReadMode();
+	return data;
+}
+
+void  StringStream::_Put(const void *d, dword sz)
+{
+	SetWriteMode();
+	if(ptr + sz >= wrlim) {
+		intptr_t p = ptr - buffer;
+	#ifdef _DEBUG
+		wdata.SetLength(max(1, max(2 * (int)GetSize(), (int)GetSize() + (int)sz)));
+	#else
+		wdata.SetLength(max(128, max(2 * (int)GetSize(), (int)GetSize() + (int)sz)));
+	#endif
+		SetWriteBuffer();
+		ptr = buffer + p;
+	}
+	memcpy(ptr, d, sz);
+	ptr += sz;
+}
+
+void  StringStream::_Put(int w)
+{
+	byte h = w;
+	_Put(&h, 1);
+}
+
+dword StringStream::_Get(void *data, dword sz)
+{
+	SetReadMode();
+	dword read = min((dword)(uintptr_t)(rdlim - ptr), sz);
+	memcpy(data, ptr, read);
+	ptr += read;
+	return read;
+}
+
+int  StringStream::_Get()
+{
+	SetReadMode();
+	return ptr < rdlim ? *ptr++ : -1;
+}
+
+int  StringStream::_Term() {
+	SetReadMode();
+	return ptr < rdlim ? *ptr : -1;
+}
+
+void  StringStream::Seek(int64 pos) {
+	size = (dword)GetSize();
+	if(pos > size) {
+		SetWriteMode();
+		size = (dword)pos;
+		wdata.SetLength((dword)pos + 100);
+		SetWriteBuffer();
+	}
+	ptr = buffer + min(GetSize(), pos);
+}
+
+void  StringStream::SetSize(int64 asize) {
+	SetWriteMode();
+	dword p = (dword)(uintptr_t)GetPos();
+	Seek(asize);
+	size = (dword)asize;
+	Seek(min(p, size));
+}
+
+bool  StringStream::IsOpen() const {
+	return true;
+}
+
+// -------------------- Memory read-write stream ------------------------
+
+void MemStream::Seek(int64 pos) {
+	ptr = buffer + min(pos, int64(rdlim - buffer));
+}
+
+int64 MemStream::GetSize() const {
+	return rdlim - buffer;
+}
+
+dword MemStream::_Get(void *data, dword size) {
+	if(size > (dword)(intptr_t)(rdlim - ptr))
+		size = (dword)(intptr_t)(rdlim - ptr);
+	memcpy(data, ptr, size);
+	ptr += size;
+	return size;
+}
+
+void  MemStream::_Put(const void *data, dword size) {
+	if(size > (dword)(uintptr_t)(wrlim - ptr)) {
+		SetError(ERROR_NOT_ENOUGH_SPACE);
+		return;
+	}
+	memcpy(ptr, data, size);
+	ptr += size;
+}
+
+bool  MemStream::IsOpen() const {
+	return true;
+}
+
+void MemStream::Create(void *data, int size)
+{
+	style = STRM_WRITE|STRM_READ|STRM_SEEK|STRM_LOADING;
+	ptr = buffer = (byte *) data;
+	wrlim = rdlim = buffer + size;
+	pos = 0;
+}
+
+MemStream::MemStream(void *data, int size) {
+	Create(data, size);
+}
+
+MemStream::MemStream() {}
+
+#ifdef flagSO
+MemStream::~MemStream() {}
+#endif
+
+// ----------------------- Memory read streamer -------------------------
+
+void MemReadStream::Create(const void *data, int size)
+{
+	MemStream::Create((void *)data, size);
+	style = STRM_READ|STRM_SEEK|STRM_LOADING;
+	wrlim = buffer;
+}
+
+MemReadStream::MemReadStream(const void *data, int size)
+{
+	Create(data, size);
+}
+
+MemReadStream::MemReadStream() {}
+
+// --------------------------- Size stream -----------------------
+
+void SizeStream::Seek(int64 apos) {
+	if(ptr - buffer + pos > size)
+		size = ptr - buffer + pos;
+	pos = apos;
+	if(pos > GetSize())
+		pos = GetSize();
+	ptr = buffer;
+}
+
+int64 SizeStream::GetSize() const {
+	return max(int64(ptr - buffer + pos), size);
+}
+
+void SizeStream::SetSize(int64 asize) {
+	size = asize;
+	if(ptr - buffer + pos > size) {
+		ptr = buffer;
+		pos = size;
+	}
+}
+
+void SizeStream::_Put(const void *, dword sz) {
+	wrlim = buffer + 128;
+	pos += ptr - buffer + sz;
+	ptr = buffer;
+}
+
+void SizeStream::_Put(int w) {
+	_Put(NULL, 1);
+}
+
+bool SizeStream::IsOpen() const {
+	return true;
+}
+
+SizeStream::SizeStream() {
+	size = 0;
+	style = STRM_WRITE|STRM_SEEK;
+	buffer = h;
+}
+
+// ------------------------------ Compare stream ----------------------------
+
+CompareStream::CompareStream() {
+	stream = NULL;
+	equal = false;
+	size = 0;
+	buffer = h;
+}
+
+CompareStream::CompareStream(Stream& astream) {
+	stream = NULL;
+	buffer = h;
+	Open(astream);
+}
+
+void CompareStream::Open(Stream& astream) {
+	ASSERT(astream.IsOpen());
+	Close();
+	style = STRM_WRITE|STRM_SEEK;
+	stream = &astream;
+	size = pos = 0;
+	wrlim = buffer + 128;
+	ptr = buffer;
+	equal = true;
+}
+
+bool CompareStream::IsOpen() const {
+	return !!stream;
+}
+
+int64 CompareStream::GetSize() const {
+	return max(int64(ptr - buffer + pos), size);
+}
+
+void CompareStream::Close() {
+	if(!stream) return;
+	if(GetPos() > size)
+		size = GetPos();
+	Flush();
+	if(stream->GetSize() != GetSize())
+		equal = false;
+	stream = NULL;
+}
+
+void CompareStream::SetSize(int64 asize) {
+	Flush();
+	pos += ptr - buffer;
+	ptr = buffer;
+	size = asize;
+	if(pos > size)
+		pos = size;
+}
+
+void CompareStream::Seek(int64 apos) {
+	Flush();
+	int64 sz = ptr - buffer + pos;
+	if(sz > size)
+		size = sz;
+	pos = apos;
+	ptr = buffer;
+}
+
+void CompareStream::Compare(int64 pos, const void *data, dword size) {
+	ASSERT(stream);
+	if(!size) return;
+	Buffer<byte> b(size);
+	if(stream->GetPos() != pos)
+		stream->Seek(pos);
+	if(stream->Get(b, size) != size || memcmp(b.operator const byte *(), data, size))
+		equal = false;
+}
+
+void CompareStream::Flush() {
+	Compare(pos, buffer, (int)(ptr - buffer));
+}
+
+void CompareStream::_Put(const void *data, dword size) {
+	wrlim = buffer + 128;
+	ASSERT(ptr <= wrlim);
+	Flush();
+	pos += ptr - buffer;
+	ptr = buffer;
+	byte *b = (byte *) data;
+	while(size && equal) {
+		int sz = min<int>(size, 128);
+		Compare(pos, b, sz);
+		pos += sz;
+		b += sz;
+		size -= sz;
+	}
+}
+
+void CompareStream::_Put(int w) {
+	byte b = w;
+	_Put(&b, 1);
+}
+
+struct NilStreamClass : public Stream {
+	virtual void    _Put(int w)    {}
+	virtual bool    IsOpen() const { return true; }
+	virtual   int   _Term()        { return -1; }
+	virtual   int   _Get()         { return -1; }
+};
+
+Stream& NilStream()
+{
+	return Single<NilStreamClass>();
+}
+
+#ifndef PLATFORM_WINCE
+class CoutStream : public Stream {
+	void Put0(int w) {
+#ifdef PLATFORM_WIN32
+		static HANDLE h = GetStdHandle(STD_OUTPUT_HANDLE);
+		char s[1];
+		s[0] = w;
+		dword dummy;
+		WriteFile(h, s, 1, &dummy, NULL);
+#else
+		putchar(w);
+#endif
+	}
+	virtual void    _Put(int w) {
+		if(w == '\n') {
+#ifdef PLATFORM_WIN32
+			Put0('\r');
+#endif
+			Put0('\n');
+		}
+		else
+		if(w != '\r')
+			Put0(w);
+	}
+	virtual   bool  IsOpen() const { return true; }
+};
+
+Stream& Cout()
+{
+	return Single<CoutStream>();
+}
+
+class CerrStream : public Stream {
+	virtual void    _Put(int w) {
+	#ifdef PLATFORM_WIN32
+		static HANDLE h = GetStdHandle(STD_ERROR_HANDLE);
+		char s[1];
+		s[0] = w;
+		dword dummy;
+		WriteFile(h, s, 1, &dummy, NULL);
+	#else
+		putc(w, stderr);
+	#endif
+	}
+	virtual   bool  IsOpen() const { return true; }
+};
+
+Stream& Cerr()
+{
+	return Single<CerrStream>();
+}
+#endif
+
+static int sMappingGranularity_()
+{
+#ifdef PLATFORM_WIN32
+	static int mg = 0;
+	if(!mg) {
+		SYSTEM_INFO info;
+		GetSystemInfo(&info);
+		mg = info.dwAllocationGranularity;
+	}
+#else
+	static int mg = 4096;
+#endif
+	return mg;
+}
+
+FileMapping::FileMapping(const char *file_, bool delete_share_)
+{
+#ifdef PLATFORM_WIN32
+	hfile = INVALID_HANDLE_VALUE;
+	hmap = NULL;
+#endif
+#ifdef PLATFORM_POSIX
+	hfile = -1;
+	Zero(hfstat);
+#endif
+	base = rawbase = NULL;
+	size = rawsize = 0;
+	offset = rawoffset = 0;
+	filesize = -1;
+	write = false;
+	if(file_)
+		Open(file_, delete_share_);
+
+}
+
+bool FileMapping::Open(const char *file, bool delete_share)
+{
+	Close();
+	write = false;
+#ifdef PLATFORM_WIN32
+	if(IsWinNT())
+		hfile = UnicodeWin32().CreateFileW(ToSystemCharsetW(file), GENERIC_READ,
+			FILE_SHARE_READ | FILE_SHARE_WRITE | (delete_share && IsWinNT() ? FILE_SHARE_DELETE : 0),
+			NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0);
+	else
+		hfile = CreateFile(ToSystemCharset(file), GENERIC_READ,
+			FILE_SHARE_READ | FILE_SHARE_WRITE | (delete_share && IsWinNT() ? FILE_SHARE_DELETE : 0),
+			NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0);
+	if(hfile == INVALID_HANDLE_VALUE)
+		return false;
+	filesize = ::GetFileSize(hfile, NULL);
+	hmap = CreateFileMapping(hfile, NULL, PAGE_READONLY, 0, 0, NULL);
+	if(!hmap) {
+		Close();
+		return false;
+	}
+#endif
+#ifdef PLATFORM_POSIX
+	hfile = open(ToSystemCharset(file), O_RDONLY);
+	if(hfile == -1)
+		return false;
+	if(fstat(hfile, &hfstat) == -1) {
+		Close();
+		return false;
+	}
+	filesize = hfstat.st_size;
+#endif
+	return true;
+}
+
+bool FileMapping::Create(const char *file, int64 filesize_, bool delete_share)
+{
+	Close();
+	write = true;
+#ifdef PLATFORM_WIN32
+	if(IsWinNT())
+		hfile = UnicodeWin32().CreateFileW(ToSystemCharsetW(file), GENERIC_READ | GENERIC_WRITE,
+			FILE_SHARE_READ | FILE_SHARE_WRITE | (delete_share ? FILE_SHARE_DELETE : 0),
+			NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, 0);
+	else
+		hfile = CreateFile(ToSystemCharset(file), GENERIC_READ | GENERIC_WRITE,
+			FILE_SHARE_READ | FILE_SHARE_WRITE | (delete_share ? FILE_SHARE_DELETE : 0),
+			NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, 0);
+	if(hfile == INVALID_HANDLE_VALUE)
+		return false;
+	hmap = CreateFileMapping(hfile, NULL, PAGE_READWRITE, 0, 0, NULL);
+	if(!hmap) {
+		Close();
+		return false;
+	}
+#endif
+#ifdef PLATFORM_POSIX
+	hfile = open(ToSystemCharset(file), O_RDWR | O_CREAT);
+	if(hfile == -1)
+		return false;
+#endif
+	filesize = filesize_;
+	return true;
+}
+
+bool FileMapping::Map(int64 mapoffset, dword maplen)
+{
+	ASSERT(IsOpen());
+	if(maplen == 0)
+		return Unmap();
+	mapoffset = minmax<int64>(mapoffset, 0, filesize);
+	int gran = sMappingGranularity_();
+	int64 rawoff = mapoffset & -gran;
+	maplen = (dword)min<int64>(maplen, filesize - mapoffset);
+	dword rawsz = (dword)min<int64>((maplen + (dword)(mapoffset - rawoff) + gran - 1) & -gran, filesize - rawoff);
+	if(rawbase && (mapoffset < rawoffset || mapoffset + maplen > rawoffset + rawsize))
+		Unmap();
+	if(!rawbase) {
+		rawoffset = rawoff;
+		rawsize = rawsz;
+#ifdef PLATFORM_WIN32
+		rawbase = (byte *)MapViewOfFile(hmap, /*write ? FILE_MAP_WRITE :*/ FILE_MAP_READ,
+			(dword)(rawoffset >> 32), (dword)(rawoffset >> 0), rawsize);
+#else
+		rawbase = (byte *)mmap(0, rawsize, PROT_READ | PROT_WRITE,
+#ifdef PLATFORM_FREEBSD
+			MAP_NOSYNC,
+#else
+			MAP_SHARED,
+#endif
+			hfile, (dword)rawoffset);
+#endif
+		if(!rawbase)
+			return false;
+	}
+	offset = mapoffset;
+	size = maplen;
+	base = rawbase + (int)(offset - rawoffset);
+	return true;
+}
+
+bool FileMapping::Unmap()
+{
+	bool ok = true;
+	if(rawbase) {
+#ifdef PLATFORM_WIN32
+		ok = !!UnmapViewOfFile(rawbase);
+#endif
+#ifdef PLATFORM_POSIX
+		ok = (munmap((void *)rawbase, rawsize) == 0);
+#endif
+	}
+	base = rawbase = NULL;
+	size = 0;
+	return ok;
+}
+
+bool FileMapping::Expand(int64 new_filesize)
+{
+	ASSERT(IsOpen());
+	if(new_filesize > filesize) {
+		if(!Unmap())
+			return false;
+#ifdef PLATFORM_WIN32
+		if(!CloseHandle(hmap)) {
+			hmap = NULL;
+			return false;
+		}
+		hmap = NULL;
+#endif
+#ifdef PLATFORM_POSIX
+		if(FTRUNCATE64_(hfile, (dword)(new_filesize - filesize)) != 0) {
+			Close();
+			return false;
+		}
+#endif
+		filesize = new_filesize;
+	}
+	return true;
+}
+
+bool FileMapping::Close()
+{
+	bool ok = Unmap();
+#ifdef PLATFORM_WIN32
+	if(hmap) {
+		if(!CloseHandle(hmap)) ok = false;
+		hmap = NULL;
+	}
+	if(IsOpen()) {
+		if(!CloseHandle(hfile)) ok = false;
+		hfile = INVALID_HANDLE_VALUE;
+	}
+#endif
+#ifdef PLATFORM_POSIX
+	if(IsOpen()) {
+		if(close(hfile) != 0) ok = false;
+		Zero(hfstat);
+		hfile = -1;
+	}
+#endif
+	filesize = -1;
+	offset = 0;
+	size = 0;
+	write = false;
+	return ok;
+}
+
+Time FileMapping::GetTime() const
+{
+	ASSERT(IsOpen());
+#ifdef PLATFORM_WIN32
+	FileTime ft;
+	GetFileTime(hfile, NULL, NULL, &ft);
+	return ft;
+#endif
+#ifdef PLATFORM_POSIX
+	return Time(hfstat.st_mtime);
+#endif
+}
+
+String FileMapping::GetData(int64 offset, dword len)
+{
+	if(IsOpen() && Map(offset, len))
+		return String(base, len);
+	else {
+		NEVER();
+		return String::GetVoid();
+	}
+}
+
+String ReadStdIn()
+{
+	String r;
+	for(;;) {
+		int c = getchar();
+		if(c < 0 || c == '\n')
+			return r;
+		r.Cat(c);
+	}
+}
+
+// ---------------------------------------------------------------------------
+
+String LoadStream(Stream& in) {
+	if(in.IsOpen()) {
+		in.ClearError();
+		int size = (int)in.GetLeft();
+		StringBuffer s(size);
+		if((dword)size != 0xffffffff)
+			in.Get(s, size);
+		if(!in.IsError())
+			return s;
+	}
+	return String::GetVoid();
+}
+
+String LoadFile(const char *filename) {
+	FileIn in(filename);
+	return LoadStream(in);
+}
+
+bool SaveStream(Stream& out, const String& data) {
+	if(!out.IsOpen() || out.IsError()) return false;
+	out.Put((const char *)data, data.GetLength());
+	out.Close();
+	return out.IsOK();
+}
+
+bool SaveFile(const char *filename, const String& data) {
+	FileOut out(filename);
+	return SaveStream(out, data);
+}
+
+int64 CopyStream(Stream& dest, Stream& src, int64 count) {
+	int block = (int)min<int64>(count, 65536);
+	Buffer<byte> temp(block);
+	int loaded;
+	int64 done = 0;
+	while(count > 0 && (loaded = src.Get(temp, (int)min<int64>(count, block))) > 0) {
+		dest.Put(temp.operator const byte *(), loaded);
+		count -= loaded;
+		done += loaded;
+	}
+	return done;
+}
+
+void CheckedSerialize(const Callback1<Stream&> serialize, Stream& stream)
+{
+	int pos = (int)stream.GetPos();
+	stream.Magic(0x61746164);
+	serialize(stream);
+	stream.Magic(0x00646e65);
+	pos = int(stream.GetPos() - pos);
+	stream.Magic(pos);
+}
+
+bool Load(Callback1<Stream&> serialize, Stream& stream) {
+	StringStream backup;
+	backup.SetStoring();
+	serialize(backup);
+	ASSERT(!backup.IsError());
+	stream.SetLoading();
+	stream.LoadThrowing();
+	try {
+		CheckedSerialize(serialize, stream);
+	}
+	catch(LoadingError) {
+		backup.Seek(0);
+		backup.SetLoading();
+		serialize(backup);
+		ASSERT(!backup.IsError());
+		return false;
+	}
+	return true;
+}
+
+bool Store(Callback1<Stream&> serialize, Stream& stream) {
+	stream.SetStoring();
+	CheckedSerialize(serialize, stream);
+	return !stream.IsError();
+}
+
+String Cfgname(const char *file) {
+	return file ? String(file) : ConfigFile();
+}
+
+bool LoadFromFile(Callback1<Stream&> serialize, const char *file) {
+	FileIn f(Cfgname(file));
+	return f ? Load(serialize, f) : false;
+}
+
+bool StoreToFile(Callback1<Stream&> serialize, const char *file) {
+	FileOut f(Cfgname(file));
+	return f ? Store(serialize, f) : false;
+}
+
+Stream& Pack16(Stream& s, int& i) {
+	if(s.IsLoading()) {
+		i = (int16) s.Get16le();
+		if(i == -32768)
+			i = s.Get32le();
+	}
+	else
+		if(i < -32767 || i > 32767) {
+			s.Put16le((word)-32768);
+			s.Put32le(i);
+		}
+		else
+			s.Put16le((word)i);
+	return s;
+}
+
+Stream& Pack16(Stream& s, int& i1, int& i2) {
+	Pack16(s, i1);
+	Pack16(s, i2);
+	return s;
+}
+
+Stream& Pack16(Stream& s, int& i1, int& i2, int& i3) {
+	Pack16(s, i1, i2);
+	Pack16(s, i3);
+	return s;
+}
+
+Stream& Pack16(Stream& s, int& i1, int& i2, int& i3, int& i4) {
+	Pack16(s, i1, i2, i3);
+	Pack16(s, i4);
+	return s;
+}
+
+Stream& Pack16(Stream& s, int& i1, int& i2, int& i3, int& i4, int& i5) {
+	Pack16(s, i1, i2, i3, i4);
+	Pack16(s, i5);
+	return s;
+}
+
+int StreamHeading(Stream& stream, int ver, int minver, int maxver, const char* tag)
+{
+	if(stream.IsLoading() && stream.IsEof() || stream.IsError())
+		return Null;
+	String text = tag;
+	dword len = text.GetLength();
+	stream.Pack(len);
+	if(stream.IsLoading()) {
+		if(stream.IsError() || (int)len != text.GetLength()) {
+			stream.SetError();
+			return Null;
+		}
+		StringBuffer b(len);
+		stream.SerializeRaw((byte *)~b, len);
+		String in = b;
+		if(stream.IsError() || in != text) {
+			stream.SetError();
+			return Null;
+		}
+	}
+	else
+		stream.SerializeRaw((byte *)(const char*)text, len);
+	stream / ver;
+	if(ver < minver || ver > maxver) {
+		stream.SetError();
+		return Null;
+	}
+	return ver;
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/Core/Stream.h b/uppsrc/Core/Stream.h
new file mode 100644
index 000000000..07f62a35f
--- /dev/null
+++ b/uppsrc/Core/Stream.h
@@ -0,0 +1,631 @@
+#ifdef  _DEBUG
+#define NEWBLOCKSTREAM
+#endif
+
+enum {
+	STRM_ERROR   =  0x20,
+	STRM_READ    =  0x10,
+	STRM_WRITE   =  0x08,
+	STRM_SEEK    =  0x04,
+	STRM_LOADING =  0x02,
+	STRM_THROW   =  0x01,
+
+	ERROR_NOT_ENOUGH_SPACE = -1,
+	ERROR_LOADING_FAILED   = -2
+};
+
+struct StreamError {};
+struct LoadingError : StreamError {};
+
+enum EOLenum { EOL };
+
+class Stream {
+protected:
+	int64  pos;
+	byte  *buffer;
+	byte  *ptr;
+	byte  *rdlim;
+	byte  *wrlim;
+
+	unsigned style:6;
+	unsigned errorcode:16;
+
+	enum {
+		BEGINOFLINE = 0x02,
+	};
+
+	virtual   void  _Put(int w);
+	virtual   int   _Term();
+	virtual   int   _Get();
+	virtual   void  _Put(const void *data, dword size);
+	virtual   dword _Get(void *data, dword size);
+
+private:
+	int       _Get8();
+	int       _Get16();
+	int       _Get32();
+	int64     _Get64();
+	bool      _IsEof() const;
+
+public:
+	virtual   void  Seek(int64 pos);
+	virtual   int64 GetSize() const;
+	virtual   void  SetSize(int64 size);
+	virtual   void  Flush();
+	virtual   void  Close();
+	virtual   bool  IsOpen() const = 0;
+
+	Stream();
+	virtual  ~Stream();
+
+	word      GetStyle() const       { return style; }
+
+	bool      IsError() const        { return style & STRM_ERROR; }
+	bool      IsOK() const           { return !IsError(); }
+	void      SetError(int c = 0)    { style |= STRM_ERROR; errorcode = c; }
+#ifdef PLATFORM_WIN32
+	void      SetLastError()         { SetError(GetLastError()); }
+#endif
+#ifdef PLATFORM_POSIX
+	void      SetLastError()         { SetError(errno); }
+#endif
+	int       GetError() const       { return errorcode; }
+	void      ClearError()           { style &= ~STRM_ERROR; errorcode = 0; }
+
+	int64     GetPos() const         { return dword(ptr - buffer) + pos; }
+	bool      IsEof() const          { return ptr >= rdlim && _IsEof(); }
+	int64     GetLeft() const        { return GetSize() - GetPos(); }
+	void      SeekEnd(int64 rel = 0) { Seek(GetSize() + rel); }
+	void      SeekCur(int64 rel)     { Seek(GetPos() + rel); }
+
+	void      Put(int c)             { if(ptr < wrlim) *ptr++ = c; else _Put(c); }
+	int       Term()                 { return ptr < rdlim ? *ptr : _Term(); }
+	int       Get()                  { return ptr < rdlim ? *ptr++ : _Get(); }
+
+	void      Put(const void *data, dword size)  { if(ptr + size <= wrlim) { memcpy(ptr, data, size); ptr += size; } else _Put(data, size); }
+	dword     Get(void *data, dword size)        { if(ptr + size <= rdlim) { memcpy(data, ptr, size); ptr += size; return size; } return _Get(data, size); }
+
+	void      Put(const String& s)               { Put((const char *) s, s.GetLength()); }
+	String    Get(dword size);
+
+	void      LoadThrowing()         { style |= STRM_THROW; }
+	void      LoadError();
+
+	bool      GetAll(void *data, dword size);
+
+	int       Get8()                 { return ptr < rdlim ? *ptr++ : _Get8(); }
+#ifdef CPU_X86
+	int       Get16()                { if(ptr + 1 >= rdlim) return _Get16(); int q = *(word *)ptr; ptr += 2; return q; }
+	int       Get32()                { if(ptr + 3 >= rdlim) return _Get32(); int q = *(dword *)ptr; ptr += 4; return q; }
+	int64     Get64()                { if(ptr + 7 >= rdlim) return _Get64(); int64 q = *(int64 *)ptr; ptr += 8; return q; }
+#else
+	int       Get16()                { return _Get16(); }
+	int       Get32()                { return _Get32(); }
+	int       Get64()                { return _Get32(); }
+#endif
+
+#ifdef CPU_LE
+	int       Get16le()              { return Get16(); }
+	int       Get32le()              { return Get32(); }
+	int64     Get64le()              { return Get64(); }
+	int       Get16be();
+	int       Get32be();
+	int64     Get64be();
+#else
+	int       Get16le();
+	int       Get32le();
+	int64     Get64le();
+	int       Get16be()              { return Get16(); }
+	int       Get32be()              { return Get32(); }
+	int64     Get64be()              { return Get64(); }
+#endif
+
+	int       GetUtf8();
+
+	String    GetLine();
+
+#ifdef CPU_X86
+	void      Put16(word q)          { if(ptr + 1 < wrlim) { *(word *)ptr = q; ptr += 2; } else Put(&q, 2); }
+	void      Put32(dword q)         { if(ptr + 3 < wrlim) { *(dword *)ptr = q; ptr += 4; } else Put(&q, 4); }
+	void      Put64(int64 q)         { if(ptr + 7 < wrlim) { *(int64 *)ptr = q; ptr += 8; } else Put(&q, 8); }
+#else
+	void      Put16(word q)          { Put(&q, 2); }
+	void      Put32(dword q)         { Put(&q, 4); }
+	void      Put64(int64 q)         { Put(&q, 8); }
+#endif
+
+#ifdef CPU_LE
+	void      Put16le(word q)        { Put(&q, 2); }
+	void      Put32le(dword q)       { Put(&q, 4); }
+	void      Put64le(int64 q)       { Put(&q, 8); }
+	void      Put16be(word q);
+	void      Put32be(dword q);
+	void      Put64be(int64 q);
+#else
+	void      Put16le(word q);
+	void      Put32le(dword q);
+	void      Put64le(int64 q);
+	void      Put16be(word q)        { Put(&q, 2); }
+	void      Put32be(dword q)       { Put(&q, 4); }
+	void      Put64be(int64 q)       { Put(&q, 8); }
+#endif
+
+	void      PutUtf8(int c);
+
+	void      Put(const char *s);
+	void      Put(int c, int count);
+	void      Put0(int count)        { Put(0, count); }
+
+	void      PutCrLf()              { Put16(MAKEWORD('\r', '\n')); }
+#ifdef PLATFORM_WIN32
+	void      PutEol()               { PutCrLf(); }
+#else
+	void      PutEol()               { Put('\n'); }
+#endif
+
+	Stream&   operator<<(EOLenum)    { PutEol(); return *this; }
+
+	void      PutLine(const char *s);
+	void      PutLine(const String& s);
+
+	void      PutW(const wchar *s, int count)       { Put(s, count * 2); }
+	dword     GetW(wchar *s, int count)             { return Get(s, count * 2) / 2; }
+	bool      GetAllW(wchar *s, int count)          { return GetAll(s, count * 2); }
+
+	void      Put(Stream& s, int64 size = INT64_MAX, dword click = 4096);
+
+//  Stream as serialization streamer
+	void      SetLoading()                 { ASSERT(style & STRM_READ); style |= STRM_LOADING; }
+	void      SetStoring()                 { ASSERT(style & STRM_WRITE); style &= ~STRM_LOADING; }
+	bool      IsLoading()                  { return style & STRM_LOADING; }
+	bool      IsStoring()                  { return !IsLoading(); }
+
+	void      SerializeRaw(byte *data, dword count);
+	void      SerializeRaw(word *data, dword count);
+	void      SerializeRaw(dword *data, dword count);
+	void      SerializeRaw(uint64 *data, dword count);
+
+	void      SerializeRLE(byte *data, dword count);
+
+	Stream&   operator%(bool& d);
+	Stream&   operator%(char& d);
+	Stream&   operator%(signed char& d);
+	Stream&   operator%(unsigned char& d);
+	Stream&   operator%(short& d);
+	Stream&   operator%(unsigned short& d);
+	Stream&   operator%(int& d);
+	Stream&   operator%(unsigned int& d);
+	Stream&   operator%(long& d);
+	Stream&   operator%(unsigned long& d);
+	Stream&   operator%(float& d);
+	Stream&   operator%(double& d);
+	Stream&   operator%(int64& d);
+	Stream&   operator%(uint64& d);
+
+	Stream&   operator%(String& s);
+	Stream&   operator/(String& s);
+
+	Stream&   operator%(WString& s);
+	Stream&   operator/(WString& s);
+
+	void      Pack(dword& i);
+	Stream&   operator/(int& i)            { dword w = i + 1; Pack(w); i = w - 1; return *this; }
+	Stream&   operator/(unsigned int& i)   { Pack(*(dword *)&i); return *this; }
+	Stream&   operator/(long& i)           { dword w = i + 1; Pack(w); i = w - 1; return *this; }
+	Stream&   operator/(unsigned long& i)  { dword w = i + 1; Pack(w); i = w - 1; return *this; }
+
+	void      Magic(dword magic = 0x7d674d7b);
+
+	void      Pack(bool& a, bool& b, bool& c, bool& d, bool& e, bool& f, bool& g, bool& h);
+	void      Pack(bool& a, bool& b, bool& c, bool& d, bool& e, bool& f, bool& g);
+	void      Pack(bool& a, bool& b, bool& c, bool& d, bool& e, bool& f);
+	void      Pack(bool& a, bool& b, bool& c, bool& d, bool& e);
+	void      Pack(bool& a, bool& b, bool& c, bool& d);
+	void      Pack(bool& a, bool& b, bool& c);
+	void      Pack(bool& a, bool& b);
+
+//* deprecated
+	int       GetW()                 { return Get16(); }
+	int       GetL()                 { return Get32(); }
+	int       GetIW()                { return Get16le(); }
+	int       GetIL()                { return Get32le(); }
+	int       GetMW()                { return Get16be(); }
+	int       GetML()                { return Get32be(); }
+	void      PutW(int c)            { Put16(c); }
+	void      PutL(int c)            { Put32(c); }
+	void      PutIW(int c)           { Put16le(c); }
+	void      PutIL(int c)           { Put32le(c); }
+	void      PutMW(int c)           { Put16be(c); }
+	void      PutML(int c)           { Put32be(c); }
+//*/
+private: // No copy
+	Stream(const Stream& s);
+	void operator=(const Stream& s);
+};
+
+class StringStream : public Stream {
+protected:
+	virtual  void  _Put(int w);
+	virtual  int   _Term();
+	virtual  int   _Get();
+	virtual  void  _Put(const void *data, dword size);
+	virtual  dword _Get(void *data, dword size);
+
+public:
+	virtual  void  Seek(int64 pos);
+	virtual  int64 GetSize() const;
+	virtual  void  SetSize(int64 size);
+	virtual  bool  IsOpen() const;
+
+protected:
+	bool           writemode;
+	String         data;
+	StringBuffer   wdata;
+	dword          size;
+
+	void           InitReadMode();
+	void           SetWriteBuffer();
+	void           SetReadMode();
+	void           SetWriteMode();
+
+public:
+	void        Open(const String& data);
+	void        Create();
+
+	String      GetResult();
+	operator    String()                     { return GetResult(); }
+
+	StringStream()                           { Create(); }
+	StringStream(const String& data)         { Open(data); }
+};
+
+class MemStream : public Stream {
+protected:
+	virtual   void  _Put(const void *data, dword size);
+	virtual   dword _Get(void *data, dword size);
+
+public:
+	virtual   void  Seek(int64 pos);
+	virtual   int64 GetSize() const;
+	virtual   bool  IsOpen() const;
+
+public:
+	void Create(void *data, int size);
+
+	MemStream();
+	MemStream(void *data, int size);
+#ifdef flagSO
+	virtual ~MemStream();
+#endif
+};
+
+class MemReadStream : public MemStream {
+public:
+	void Create(const void *data, int size);
+
+	MemReadStream(const void *data, int size);
+	MemReadStream();
+};
+
+class BlockStream : public Stream {
+protected:
+	virtual  void  _Put(int w);
+	virtual  int   _Term();
+	virtual  int   _Get();
+	virtual  void  _Put(const void *data, dword size);
+	virtual  dword _Get(void *data, dword size);
+
+public:
+	virtual  void  Seek(int64 pos);
+	virtual  int64 GetSize() const;
+	virtual  void  SetSize(int64 size);
+	virtual  void  Flush();
+
+private:
+	int           pagesize;
+	int64         pagemask;
+	int64         pagepos;
+	bool          pagedirty;
+
+	int64         streamsize;
+
+	void          SetPos(int64 p);
+	void          SyncSize();
+	bool          SyncPage();
+	bool          SyncPos();
+	void          ReadData(void *data, int64 at, int size);
+
+protected:
+	virtual  dword Read(int64 at, void *ptr, dword size);
+	virtual  void  Write(int64 at, const void *data, dword size);
+	virtual  void  SetStreamSize(int64 size);
+
+public:
+	enum {
+		READ, CREATE, APPEND, READWRITE,
+
+		NOWRITESHARE = 0x10,
+		DELETESHARE = 0x20,
+		NOREADSHARE = 0x40,
+		SHAREMASK = 0x70,
+	};
+//	typedef int OpenMode; // obsolete, use dword
+
+	dword     GetBufferSize() const           { return pagesize; }
+	void      SetBufferSize(dword newsize);
+	int64     GetStreamSize() const           { return streamsize; }
+
+	BlockStream();
+	virtual ~BlockStream();
+
+protected:
+	void     OpenInit(dword mode, int64 file_size);
+};
+
+class FileStream : public BlockStream {
+protected:
+	virtual  void  SetStreamSize(int64 size);
+	virtual  dword Read(int64 at, void *ptr, dword size);
+	virtual  void  Write(int64 at, const void *data, dword size);
+
+public:
+	virtual  void  Close();
+	virtual  bool  IsOpen() const;
+
+protected:
+#ifdef PLATFORM_WIN32
+	HANDLE    handle;
+#endif
+#ifdef PLATFORM_POSIX
+	int       handle;
+#endif
+
+	void      SetPos(int64 pos);
+	void      Init(int64 size);
+
+public:
+	operator  bool() const                 { return IsOpen(); }
+	FileTime  GetTime() const;
+
+#ifdef PLATFORM_WIN32
+	void      SetTime(const FileTime& tm);
+	bool      Open(const char *filename, dword mode);
+
+	FileStream(const char *filename, dword mode);
+#endif
+
+#ifdef PLATFORM_POSIX
+	bool      Open(const char *filename, dword mode, mode_t acm = 0644);
+	FileStream(const char *filename, dword mode, mode_t acm = 0644);
+	FileStream(int std_handle);
+#endif
+
+	FileStream();
+	~FileStream();
+
+#ifdef PLATFORM_WIN32
+	HANDLE    GetHandle() const            { return handle; }
+#endif
+#ifdef PLATFORM_POSIX
+	int       GetHandle() const            { return handle; }
+#endif
+};
+
+class FileOut : public FileStream {
+public:
+#ifdef PLATFORM_POSIX
+	bool Open(const char *fn, mode_t acm = 0644)
+	{ return FileStream::Open(fn, FileStream::CREATE, acm); }
+#endif
+#ifdef PLATFORM_WIN32
+	bool Open(const char *fn)              { return FileStream::Open(fn, FileStream::CREATE); }
+#endif
+
+
+	FileOut(const char *fn)                { Open(fn); }
+	FileOut()                              {}
+};
+
+class FileAppend : public FileStream {
+public:
+	bool Open(const char *fn)         { return FileStream::Open(fn, FileStream::APPEND); }
+
+	FileAppend(const char *fn)        { Open(fn); }
+	FileAppend()                      {}
+};
+
+class FileIn : public FileStream {
+public:
+	bool Open(const char *fn)         { return FileStream::Open(fn, FileStream::READ); }
+
+	FileIn(const char *fn)            { Open(fn); }
+	FileIn()                          {}
+};
+
+class SizeStream : public Stream {
+protected:
+	virtual void  _Put(int w);
+	virtual void  _Put(const void *data, dword size);
+
+public:
+	virtual void  Seek(int64 pos);
+	virtual int64 GetSize() const;
+	virtual void  SetSize(int64 size);
+	virtual bool  IsOpen() const;
+
+protected:
+	int64   size;
+	byte    h[128];
+
+public:
+	operator int64() const            { return GetSize(); }
+
+	void     Open()                   { ptr = buffer; size = 0; }
+
+	SizeStream();
+};
+
+class CompareStream : public Stream {
+protected:
+	virtual  void  _Put(int w);
+	virtual  void  _Put(const void *data, dword size);
+
+public:
+	virtual  void  Seek(int64 pos);
+	virtual  int64 GetSize() const;
+	virtual  void  SetSize(int64 size);
+	virtual  void  Close();
+	virtual  bool  IsOpen() const;
+	virtual  void  Flush();
+
+private:
+	Stream  *stream;
+	bool     equal;
+	int64    size;
+	byte     h[128];
+
+	void     Compare(int64 pos, const void *data, dword size);
+
+public:
+	void     Open(Stream& aStream);
+
+	bool     IsEqual()                         { Flush(); return equal; }
+	operator bool()                            { Flush(); return equal; }
+
+	CompareStream();
+	CompareStream(Stream& aStream);
+};
+
+class FileMapping
+{
+public:
+	FileMapping(const char *file = NULL, bool delete_share = false);
+	~FileMapping() { Close(); }
+
+	bool        Open(const char *file, bool delete_share = false);
+	bool        Create(const char *file, int64 filesize, bool delete_share = false);
+	bool        Expand(int64 filesize);
+	bool        Map(int64 offset, dword len);
+	bool        Unmap();
+	bool        Close();
+
+	bool        IsOpen() const            { return hfile != INVALID_HANDLE_VALUE; }
+
+	int64       GetFileSize() const       { return filesize; }
+	Time        GetTime() const;
+	String      GetData(int64 offset, dword len);
+
+	int64       GetOffset() const         { return offset; }
+	dword       GetCount() const          { return size; }
+
+	int64       GetRawOffset() const      { return rawoffset; }
+	dword       GetRawCount() const       { return rawsize; }
+
+	const byte *operator ~ () const       { ASSERT(IsOpen()); return base; }
+	const byte *Begin() const             { ASSERT(IsOpen()); return base; }
+	const byte *End() const               { ASSERT(IsOpen()); return base + size; }
+	const byte *GetIter(int i) const      { ASSERT(IsOpen() && i >= 0 && (dword)i <= size); return base + i; }
+	const byte& operator [] (int i) const { ASSERT(IsOpen() && i >= 0 && (dword)i < size); return base[i]; }
+
+	byte       *operator ~ ()             { ASSERT(IsOpen()); return base; }
+	byte       *Begin()                   { ASSERT(IsOpen()); return base; }
+	byte       *End()                     { ASSERT(IsOpen()); return base + size; }
+	byte       *GetIter(int i)            { ASSERT(IsOpen() && i >= 0 && (dword)i <= size); return base + i; }
+	byte&       operator [] (int i)       { ASSERT(IsOpen() && i >= 0 && (dword)i < size); return base[i]; }
+
+private:
+#ifdef PLATFORM_WIN32
+	HANDLE      hfile;
+	HANDLE      hmap;
+#endif
+#ifdef PLATFORM_POSIX
+	enum { INVALID_HANDLE_VALUE = -1 };
+	int	        hfile;
+	struct stat hfstat;
+#endif
+	byte       *base;
+	byte       *rawbase;
+	int64       filesize;
+	int64       offset;
+	int64       rawoffset;
+	dword       size;
+	dword       rawsize;
+	bool        write;
+};
+
+
+String LoadStream(Stream& in);
+bool   SaveStream(Stream& out, const String& data);
+
+int64        CopyStream(Stream& dest, Stream& src, int64 count);
+inline int64 CopyStream(Stream& dest, Stream& src) { return CopyStream(dest, src, src.GetLeft()); }
+
+#ifndef PLATFORM_WINCE
+Stream& Cout();
+Stream& Cerr();
+String  ReadStdIn();
+#endif
+
+Stream& NilStream();
+
+String LoadFile(const char *filename);
+bool   SaveFile(const char *filename, const String& data);
+
+template <class T>
+inline Stream& operator%(Stream& s, T& x)
+{
+	x.Serialize(s);
+	return s;
+}
+
+inline Stream& operator<<(Stream& s, const char *x)
+{
+	s.Put(x);
+	return s;
+}
+
+inline Stream& operator<<(Stream& s, char *x)
+{
+	s.Put(x);
+	return s;
+}
+
+inline Stream& operator<<(Stream& s, const String &x)
+{
+	s.Put(x);
+	return s;
+}
+
+inline Stream& operator<<(Stream& s, char x)
+{
+	s.Put((int) x);
+	return s;
+}
+
+inline Stream& operator<<(Stream& s, const void *x)
+{
+	s << FormatPtr(x);
+	return s;
+}
+
+inline Stream& operator<<(Stream& s, void *x)
+{
+	s << FormatPtr(x);
+	return s;
+}
+
+template <class T>
+inline Stream& operator<<(Stream& s, const T& x) {
+	s << AsString(x);
+	return s;
+}
+
+// ------
+
+Stream& Pack16(Stream& s, int& i);
+Stream& Pack16(Stream& s, int& i1, int& i2);
+Stream& Pack16(Stream& s, int& i1, int& i2, int& i3);
+Stream& Pack16(Stream& s, int& i1, int& i2, int& i3, int& i4);
+Stream& Pack16(Stream& s, int& i1, int& i2, int& i3, int& i4, int& i5);
+
+int     StreamHeading(Stream& stream, int ver, int minver, int maxver, const char* tag);
diff --git a/uppsrc/Core/String.cpp b/uppsrc/Core/String.cpp
new file mode 100644
index 000000000..dad8c654d
--- /dev/null
+++ b/uppsrc/Core/String.cpp
@@ -0,0 +1,466 @@
+#include "Core.h"
+
+NAMESPACE_UPP
+
+#ifdef _DEBUG
+void String0::Dsyn()
+{
+	String *d_str = static_cast<String *>(this);
+	d_str->s = Begin();
+	d_str->len = GetCount();
+}
+#endif
+
+String0::Rc String0::voidptr[2] = { { 2, 0 }, { 0, 0 } };
+
+void String0::LSet(const String0& s)
+{
+	w[2] = s.w[2];
+	w[3] = s.w[3];
+	if(s.IsRef()) {
+		ptr = s.ptr;
+		if(ptr != (char *)(voidptr + 1))
+			AtomicInc(s.Ref()->refcount);
+	}
+	else {
+		ptr = (char *)MemoryAlloc32();
+		qword *d = qptr;
+		const qword *q = s.qptr;
+		d[0] = q[0]; d[1] = q[1]; d[2] = q[2]; d[3] = q[3];
+	}
+}
+
+void String0::LFree()
+{
+	if(IsRef()) {
+		if(ptr != (char *)(voidptr + 1)) {
+			Rc *rc = Ref();
+			ASSERT(rc->refcount > 0);
+			if(AtomicDec(rc->refcount) == 0) MemoryFree(rc);
+		}
+	}
+	else
+		MemoryFree32(ptr);
+}
+
+dword String0::LEqual(const String0& s) const
+{
+	int l = GetCount();
+	if(s.GetCount() != l) return 1;
+#ifdef CPU_64
+	const qword *qa = (const qword *)Begin();
+	const qword *qb = (const qword *)s.Begin();
+	while(l >= 8) {
+		if(*qa++ != *qb++) return 1;
+		l -= 8;
+	}
+	const dword *da = (const dword *)qa;
+	const dword *db = (const dword *)qb;
+	if((l & 4) && *da++ != *db++) return 1;
+#else
+	const dword *da = (const dword *)Begin();
+	const dword *db = (const dword *)s.Begin();
+	while(l >= 4) {
+		if(*da++ != *db++) return 1;
+		l -= 4;
+	}
+#endif
+	const word *wa = (const word *)da;
+	const word *wb = (const word *)db;
+	if((l & 2) && *wa++ != *wb++) return 1;
+	return (l & 1) ? *(const char *)wa != *(const char *)wb : 0;
+}
+
+unsigned String0::LHashValue() const
+{
+	int l = LLen();
+	if(l < 15) {
+		dword w[4];
+		w[0] = w[1] = w[2] = w[3] = 0;
+		memcpy(w, ptr, l);
+		((byte *)w)[SLEN] = l;
+		return CombineHash(w[0], w[1], w[2], w[3]);
+	}
+	return memhash(ptr, l);
+}
+
+int String0::LCompare(const String0& s) const
+{
+	const char *a = Begin();
+	int la = GetLength();
+	const char *b = s.Begin();
+	int lb = s.GetLength();
+	int l = min(la, lb);
+	for(int i = 0; i < l; i++) {
+		int q = (byte)a[i] - (byte)b[i];
+		if(q) return q;
+	}
+	return la - lb;
+}
+
+char *String0::Alloc(int count, char& kind)
+{
+	if(count < 32) {
+		kind = MEDIUM;
+		return (char *)MemoryAlloc32();
+	}
+	size_t sz = sizeof(Rc) + count + 1;
+	Rc *rc = (Rc *)MemoryAlloc(sz);
+	rc->alloc = (int)sz - sizeof(Rc) - 1;
+	rc->refcount = 1;
+	kind = min(rc->alloc, 255);
+	return (char *)(rc + 1);
+}
+
+char *String0::Insert(int pos, int count, const char *s)
+{
+	ASSERT(pos >= 0 && count >= 0 && pos <= GetCount());
+	int len = GetCount();
+	int newlen = len + count;
+	char *str = (char *)Begin();
+	if(newlen < GetAlloc() && !IsSharedRef() && (!s || s < str || s > str + len)) {
+		if(pos < len)
+			memmove(str + pos + count, str + pos, len - pos);
+		if(IsSmall())
+			SLen() = newlen;
+		else
+			LLen() = newlen;
+		str[newlen] = 0;
+		if(s)
+			memcpy(str + pos, s, count);
+		Dsyn();
+		return str + pos;
+	}
+	char kind;
+	char *p = Alloc(max(2 * len, newlen), kind);
+	if(pos > 0)
+		memcpy(p, str, pos);
+	if(pos < len)
+		memcpy(p + pos + count, str + pos, len - pos);
+	if(s)
+		memcpy(p + pos, s, count);
+	p[newlen] = 0;
+	Free();
+	ptr = p;
+	LLen() = newlen;
+	SLen() = 15;
+	chr[KIND] = kind;
+	Dsyn();
+	return ptr + pos;
+}
+
+void String0::UnShare()
+{
+	if(IsSharedRef()) {
+		int len = LLen();
+		char kind;
+		char *p = Alloc(len, kind);
+		memcpy(p, ptr, len + 1);
+		Free();
+		chr[KIND] = kind;
+		ptr = p;
+	}
+}
+
+void String0::SetSLen(int l)
+{
+	SLen() = l;
+	memset(chr + l, 0, 15 - l);
+}
+
+void String0::Remove(int pos, int count)
+{
+	ASSERT(pos >= 0 && count >= 0 && pos + count <= GetCount());
+	UnShare();
+	char *s = (char *)Begin();
+	memmove(s + pos, s + pos + count, GetCount() - pos - count + 1);
+	if(IsSmall())
+		SetSLen(SLen() - count);
+	else
+		LLen() -= count;
+	Dsyn();
+}
+
+void String0::Set(int pos, int chr)
+{
+	ASSERT(pos >= 0 && pos < GetCount());
+	UnShare();
+	Ptr()[pos] = chr;
+}
+
+void String0::Trim(int pos)
+{
+	ASSERT(pos >= 0 && pos <= GetCount());
+	if(IsSmall()) {
+		chr[pos] = 0;
+		SetSLen(pos);
+	}
+	else {
+		UnShare();
+		ptr[pos] = 0;
+		LLen() = pos;
+	}
+	Dsyn();
+}
+
+void String0::LCat(int c)
+{
+	if(IsSmall()) {
+		qword *x = (qword *)MemoryAlloc32();
+		x[0] = q[0];
+		x[1] = q[1];
+		LLen() = SLen();
+		SLen() = 15;
+		chr[KIND] = MEDIUM;
+		qptr = x;
+	}
+	int l = LLen();
+	if(IsRef() ? !IsShared() && l < (int)Ref()->alloc : l < 31) {
+		ptr[l] = c;
+		ptr[LLen() = l + 1] = 0;
+	}
+	else {
+		char *s = Insert(l, 1, NULL);
+		s[0] = c;
+		s[1] = 0;
+	}
+}
+
+void String0::Cat(const char *s, int len)
+{
+	if(IsSmall()) {
+		if(SLen() + len < 14) {
+			memcpy(chr + SLen(), s, len);
+			SLen() += len;
+			chr[(int)SLen()] = 0;
+			Dsyn();
+			return;
+		}
+	}
+	else
+		if((int)LLen() + len < LAlloc() && !IsSharedRef()) {
+			memcpy(ptr + LLen(), s, len);
+			LLen() += len;
+			ptr[LLen()] = 0;
+			Dsyn();
+			return;
+		}
+	Insert(GetCount(), len, s);
+}
+
+void String0::Reserve(int r)
+{
+	int l = GetCount();
+	Insert(GetCount(), r, NULL);
+	Trim(l);
+}
+
+void String0::Set(const char *s, int len)
+{
+	w[0] = w[1] = w[2] = w[3] = 0;
+	switch(len) {
+	#define MOV(x) case x: chr[x - 1] = s[x - 1];
+		MOV(14) MOV(13) MOV(12) MOV(11) MOV(10) MOV(9) MOV(8)
+		MOV(7) MOV(6) MOV(5) MOV(4) MOV(3) MOV(2) MOV(1)
+	case 0:
+		SLen() = len;
+		break;
+	default:
+		char *p = Alloc(len, chr[KIND]);
+		memcpy(p, s, len);
+		p[len] = 0;
+		ptr = p;
+		LLen() = len;
+		SLen() = 15;
+	};
+	Dsyn();
+}
+
+String& String::operator=(const char *s)
+{
+	int  len = GetCount();
+	char *str = (char *)Begin();
+	if(s >= str && s <= str + len)
+		return *this = String(s, strlen__(s));
+	String0::Free();
+	String0::Set(s, strlen__(s));
+	return *this;
+}
+
+String String::GetVoid()
+{
+	String s;
+	s.ptr = (char *)(voidptr + 1);
+	s.LLen() = 0;
+	s.SLen() = 15;
+	s.chr[KIND] = 50;
+	return s;
+}
+
+bool String::IsVoid() const
+{
+	return IsRef() && ptr == (char *)(voidptr + 1);
+}
+
+WString String::ToWString() const
+{
+	return WString(Begin(), GetCount());
+}
+
+String::String(StringBuffer& b)
+{
+	if(b.begin == b.buffer) {
+		String0::Set(b.begin, b.end - b.begin);
+		return;
+	}
+	int l = b.GetLength();
+	if(l <= 14) {
+		Zero();
+		memcpy(chr, b.begin, l);
+		SLen() = l;
+		b.Free();
+	}
+	else {
+		ptr = b.begin;
+		ptr[l] = 0;
+		SLen() = 15;
+		LLen() = l;
+		chr[KIND] = min(b.GetAlloc(), 255);
+	}
+	b.Zero();
+	Dsyn();
+}
+
+char *StringBuffer::Alloc(int count, int& alloc)
+{
+	if(count <= 31) {
+		char *s = (char *)MemoryAlloc32();
+		alloc = 31;
+		return s;
+	}
+	else {
+		size_t sz = sizeof(Rc) + count + 1;
+		Rc *rc = (Rc *)MemoryAlloc(sz);
+		alloc = rc->alloc = (int)sz - sizeof(Rc) - 1;
+		rc->refcount = 1;
+		return (char *)(rc + 1);
+	}
+}
+
+void StringBuffer::Free()
+{
+	if(begin == buffer)
+		return;
+	int all = (int)(limit - begin);
+	if(all == 31)
+		MemoryFree32(begin);
+	if(all > 31)
+		MemoryFree((Rc *)begin - 1);
+}
+
+void StringBuffer::Realloc(int n, const char *cat, int l)
+{
+	int al;
+	int ep = (int)(end - begin);
+	char *p = Alloc(n, al);
+	memcpy(p, begin, min(GetLength(), n));
+	if(cat) {
+		memcpy(p + ep, cat, l);
+		ep += l;
+	}
+	Free();
+	begin = p;
+	end = begin + ep;
+	limit = begin + al;
+}
+
+void StringBuffer::Expand()
+{
+	Realloc(GetLength() * 2);
+}
+
+void StringBuffer::SetLength(int l)
+{
+	Realloc(l);
+	end = begin + l;
+}
+
+void StringBuffer::Cat(const char *s, int l)
+{
+	if(end + l > limit)
+		Realloc(max(GetLength(), l) + GetLength(), s, l);
+	else {
+		memcpy(end, s, l);
+		end += l;
+	}
+}
+
+void StringBuffer::Cat(int c, int l)
+{
+	if(end + l > limit)
+		Realloc(max(GetLength(), l) + GetLength(), NULL, l);
+	memset(end, c, l);
+	end += l;
+}
+
+void StringBuffer::Set(String& s)
+{
+	s.UnShare();
+	int l = s.GetLength();
+	if(s.GetAlloc() == 14) {
+		begin = (char *)MemoryAlloc32();
+		limit = begin + 31;
+		memcpy(begin, s.Begin(), l);
+		end = begin + l;
+	}
+	else {
+		begin = s.ptr;
+		end = begin + l;
+		limit = begin + s.GetAlloc();
+	}
+	s.Zero();
+}
+
+String TrimLeft(const String& str)
+{
+	const char *s = str;
+	if(!IsSpace(*s))
+		return str;
+	while(IsSpace((byte)*s)) s++;
+	return String(s, str.End());
+}
+
+String TrimRight(const String& str)
+{
+	if(str.IsEmpty())
+		return str;
+	const char *s = str.Last();
+	if(!IsSpace(*s))
+		return str;
+	while(s >= ~str && IsSpace((byte)*s)) s--;
+	return String(~str, s + 1);
+}
+
+struct StringICompare__
+{
+	int encoding;
+	int operator()(char a, char b) const { return ToUpper(a, encoding) - ToUpper(b, encoding); }
+
+	StringICompare__(int e) : encoding(e) {}
+};
+
+int CompareNoCase(const String& a, const String& b, byte encoding)
+{
+	if(encoding == CHARSET_DEFAULT) encoding = GetDefaultCharset();
+	if(encoding == CHARSET_UTF8) return CompareNoCase(FromUtf8(a), FromUtf8(b));
+	return IterCompare(a.Begin(), a.End(), b.Begin(), b.End(), StringICompare__(encoding));
+}
+
+int CompareNoCase(const String& a, const char *b, byte encoding)
+{
+	if(encoding == CHARSET_DEFAULT) encoding = GetDefaultCharset();
+	if(encoding == CHARSET_UTF8) return CompareNoCase(FromUtf8(a), FromUtf8(b, (int)strlen(b)));
+	return IterCompare(a.Begin(), a.End(), b, b + strlen(b), StringICompare__(encoding));
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/Core/String.h b/uppsrc/Core/String.h
new file mode 100644
index 000000000..1f8ad1bea
--- /dev/null
+++ b/uppsrc/Core/String.h
@@ -0,0 +1,779 @@
+class Nuller;
+
+#if defined(CPU_X86) && (defined(COMPILER_MSC) || defined(COMPILER_GCC))
+#define FAST_STRING_COMPARE
+#endif
+
+
+int wstrlen(const wchar *s);
+
+#ifdef PLATFORM_POSIX
+inline int stricmp(const char *a, const char *b)         { return strcasecmp(a, b); }
+inline int strnicmp(const char *a, const char *b, int n) { return strncasecmp(a, b, n); }
+#endif
+
+#ifdef PLATFORM_WINCE
+inline int stricmp(const char *a, const char *b)         { return _stricmp(a, b); }
+inline int strnicmp(const char *a, const char *b, int n) { return _strnicmp(a, b, n); }
+#endif
+
+inline int strlen__(const char *s)  { return s ? (int)strlen(s) : 0; }
+inline int strlen__(const wchar *s) { return s ? (int)wstrlen(s) : 0; }
+
+inline int cmpval__(char x)         { return (byte)x; }
+inline int cmpval__(wchar x)        { return (word)x; }
+
+class String;
+class WString;
+class StringBuffer;
+class WStringBuffer;
+
+template <class B>
+class AString : public B {
+	typedef typename B::tchar  tchar;
+	typedef typename B::bchar  bchar;
+	typedef typename B::Buffer buffer;
+	typedef typename B::String String;
+
+public:
+	void Clear()                                              { B::Free(); B::Zero(); }
+	int  GetLength() const                                    { return B::GetCount(); }
+	bool IsEmpty() const                                      { return B::GetCount() == 0; }
+
+	const tchar *End() const                                  { return B::Begin() + GetLength(); }
+	const tchar *Last() const                                 { return End() - !!B::GetCount(); }
+	const tchar *GetIter(int i) const                         { ASSERT(i >= 0 && i <= B::GetCount()); return B::Begin() + i; }
+
+	int operator*() const                                     { return *B::Begin(); }
+	int operator[](int i) const                               { ASSERT(i >= 0 && i <= B::GetCount()); return B::Begin()[i]; }
+
+	operator const tchar *() const                            { return B::Begin(); }
+	const tchar *operator~() const                            { return B::Begin(); }
+	operator const bchar *() const                            { return (bchar *)B::Begin(); }
+	operator const void *() const                             { return B::Begin(); }
+
+	void Insert(int pos, int c)                               { *B::Insert(pos, 1, NULL) = c; }
+	void Insert(int pos, const tchar *s, int count)           { B::Insert(pos, count, s); }
+	void Insert(int pos, const String& s)                     { Insert(pos, s, s.GetCount()); }
+	void Insert(int pos, const char *s)                       { Insert(pos, s, strlen__(s)); }
+
+	void  Cat(int c)                                          { B::Cat(c); }
+	void  Cat(const tchar *s, int len)                        { B::Cat(s, len); }
+	void  Cat(const tchar *s)                                 { Cat(s, strlen__(s)); }
+	void  Cat(const String& s)                                { Cat(~s, s.GetLength()); }
+	void  Cat(int c, int count);
+	void  Cat(const tchar *s, const tchar *lim)               { ASSERT(s <= lim); Cat(s, int(lim - s)); }
+	void  Cat(const String& s, int len)                       { B::Cat(~s, len); }
+	void  Cat(const bchar *s, int len)                        { Cat((const tchar *) s, len); }
+
+	String& Cat()                                             { return *(String *)this; }
+
+	int    Compare(const String& s) const                     { return B::Compare(s); }
+	int    Compare(const tchar *s) const;
+
+	bool   IsEqual(const String& s) const                     { return B::IsEqual(s); }
+	bool   IsEqual(const tchar *s) const                      { return Compare(s) == 0; }
+
+	String Mid(int pos, int length) const;
+	String Mid(int pos) const                                 { return Mid(pos, GetLength() - pos); }
+	String Right(int count) const                             { return Mid(GetLength() - count); }
+	String Left(int count) const                              { return Mid(0, count); }
+
+	int    Find(int chr, int from = 0) const;
+	int    ReverseFind(int chr, int from) const;
+	int    ReverseFind(int chr) const;
+
+	int    Find(int len, const tchar *s, int from) const;
+	int    Find(const tchar *s, int from = 0) const;
+	int    Find(const String& s, int from = 0) const          { return Find(s.GetCount(), ~s, from); }
+
+	bool   StartsWith(const tchar *s, int len) const;
+	bool   StartsWith(const tchar *s) const                   { return StartsWith(s, strlen__(s)); }
+	bool   StartsWith(const String& s) const                  { return StartsWith(~s, s.GetLength()); }
+
+	bool   EndsWith(const tchar *s, int len) const;
+	bool   EndsWith(const tchar *s) const                     { return EndsWith(s, strlen__(s)); }
+	bool   EndsWith(const String& s) const                    { return EndsWith(~s, s.GetLength()); }
+
+	friend bool operator<(const String& a, const String& b)   { return a.Compare(b) < 0; }
+	friend bool operator<(const String& a, const tchar *b)    { return a.Compare(b) < 0; }
+	friend bool operator<(const tchar *a, const String& b)    { return b.Compare(a) > 0; }
+
+	friend bool operator<=(const String& a, const String& b)  { return a.Compare(b) <= 0; }
+	friend bool operator<=(const String& a, const tchar *b)   { return a.Compare(b) <= 0; }
+	friend bool operator<=(const tchar *a, const String& b)   { return b.Compare(a) >= 0; }
+
+	friend bool operator>(const String& a, const String& b)   { return a.Compare(b) > 0; }
+	friend bool operator>(const String& a, const tchar *b)    { return a.Compare(b) > 0; }
+	friend bool operator>(const tchar *a, const String& b)    { return b.Compare(a) < 0; }
+
+	friend bool operator>=(const String& a, const String& b)   { return a.Compare(b) >= 0; }
+	friend bool operator>=(const String& a, const tchar *b)    { return a.Compare(b) >= 0; }
+	friend bool operator>=(const tchar *a, const String& b)    { return b.Compare(a) <= 0; }
+
+	friend bool operator==(const String& a, const String& b)   { return a.IsEqual(b); }
+	friend bool operator!=(const String& a, const String& b)   { return !a.IsEqual(b); }
+	friend bool operator==(const String& a, const tchar *b)    { return a.Compare(b) == 0; }
+	friend bool operator==(const tchar *a, const String& b)    { return b.Compare(a) == 0; }
+	friend bool operator!=(const String& a, const tchar *b)    { return a.Compare(b) != 0; }
+	friend bool operator!=(const tchar *a, const String& b)    { return b.Compare(a) != 0; }
+
+	friend String operator+(const String& a, const String& b)  { String c(a); c += b; return c; }
+	friend String operator+(const String& a, const tchar *b)   { String c(a); c += b; return c; }
+	friend String operator+(const tchar *a, const String& b)   { String c(a); c += b; return c; }
+	friend String operator+(const String& a, int b)            { String c(a); c += b; return c; }
+	friend String operator+(int a, const String& b)            { String c(a, 1); c += b; return c; }
+	friend String operator+(const String& a, tchar b)          { String c(a); c += b; return c; }
+	friend String operator+(tchar a, const String& b)          { String c(a, 1); c += b; return c; }
+};
+
+class String0 : Moveable<String0> {
+	enum { SMALL, MEDIUM = 31 };
+	enum { KIND = 14, SLEN = 15, LLEN = 2 };
+
+#if defined(_DEBUG) && defined(COMPILER_GCC)
+	int          len;
+	const char  *s;
+#endif
+
+	struct Rc {
+		Atomic refcount;
+		int    alloc;
+
+		char *GetPtr() const  { return (char*)(this + 1); }
+		void  Release();
+		void  Retain();
+	};
+
+	union {
+		char   chr[16];
+		char  *ptr;
+		dword *wptr;
+		qword *qptr;
+		word   v[8];
+		dword  w[4];
+		qword  q[2];
+	};
+
+#ifdef _DEBUG
+	void Dsyn();
+#else
+	void Dsyn() {}
+#endif
+
+	char&  SLen()                { return chr[SLEN]; }
+	char   SLen() const          { return chr[SLEN]; }
+	dword& LLen()                { return w[LLEN]; }
+	dword  LLen() const          { return w[LLEN]; }
+	bool   IsSmall() const       { return chr[KIND] == SMALL; }
+	bool   IsLarge() const       { return chr[KIND] != SMALL; }
+	bool   IsMedium() const      { return chr[KIND] == MEDIUM; }
+	bool   IsRef() const         { return (byte)chr[KIND] > MEDIUM; }
+	Rc    *Ref() const           { return (Rc *)ptr - 1; }
+	bool   IsShared() const      { return Ref()->refcount != 1; }
+	bool   IsSharedRef() const   { return IsRef() && IsShared(); }
+	int    LAlloc() const        { int b = (byte)chr[KIND]; return b == 255 ? Ref()->alloc : b; }
+	dword  LEqual(const String0& s) const;
+	int    LCompare(const String0& s) const;
+
+	void LSet(const String0& s);
+	void LFree();
+	void LCat(int c);
+	unsigned LHashValue() const;
+
+	void UnShare();
+	void SetSLen(int l);
+
+	char *Ptr() { return IsSmall() ? chr : ptr; }
+	char *Alloc(int count, char& kind);
+
+	static String0::Rc voidptr[2];
+
+	void Swap(String0& b)                           { UPP::Swap(q[0], b.q[0]); UPP::Swap(q[1], b.q[1]); Dsyn(); b.Dsyn(); }
+
+	friend class String;
+	friend class StringBuffer;
+
+protected:
+	void Zero()                  { q[0] = q[1] = 0; Dsyn(); }
+	void Free()                  { if(IsLarge()) LFree(); }
+	void Set(const String0& s) {
+		if(s.IsSmall()) { q[0] = s.q[0]; q[1] = s.q[1]; }
+		else LSet(s);
+		Dsyn();
+	}
+	void Assign(const String0& s) {
+		if(s.IsSmall()) {
+			if(IsLarge()) LFree();
+			q[0] = s.q[0]; q[1] = s.q[1];
+		}
+		else
+			if(this != &s) {
+				Free();
+				LSet(s);
+			}
+		Dsyn();
+	}
+	void  Set(const char *s, int len);
+	char *Insert(int pos, int count, const char *str);
+
+public: // should be protected, bug in gcc 3.4
+	typedef char         tchar;
+	typedef byte         bchar;
+	typedef StringBuffer Buffer;
+	typedef Upp::String  String;
+
+public:
+	bool IsEqual(const String0& s) const {
+		return (chr[KIND] | s.chr[KIND] ? LEqual(s) :
+		#ifdef CPU_64
+		        ((q[0] ^ s.q[0]) | (q[1] ^ s.q[1]))
+		#else
+		        ((w[0] ^ s.w[0]) | (w[1] ^ s.w[1]) | (w[2] ^ s.w[2]) | (w[3] ^ s.w[3]))
+		#endif
+		       ) == 0;
+	}
+
+	int    Compare(const String0& s) const;
+
+	unsigned GetHashValue() const {
+		return chr[KIND] ? LHashValue() : (unsigned)CombineHash(w[0], w[1], w[2], w[3]);
+	}
+
+	void Cat(int c) {
+		if(SLen() < 14)
+			chr[int(SLen()++)] = c;
+		else
+			LCat(c);
+		Dsyn();
+	}
+
+	void Cat(const char *s, int len);
+
+	void Set(int i, int chr);
+	void Trim(int pos);
+
+	const char *Begin() const   { return IsSmall() ? chr : ptr; }
+
+	int operator[](int i) const { ASSERT(i >= 0 && i <= GetCount()); return Begin()[i]; }
+
+	operator const char *() const   { return Begin(); }
+	const char *operator~() const   { return Begin(); }
+
+	void Remove(int pos, int count = 1);
+	void Clear()                { Free(); Zero(); }
+
+	int GetCount() const        { return IsSmall() ? chr[SLEN] : w[LLEN]; }
+	int GetLength() const       { return GetCount(); }
+	int GetAlloc() const        { return IsSmall() ? 14 : LAlloc(); }
+
+	void Reserve(int r);
+
+	String0& operator=(const String0& s) { Free(); Set(s); return *this; }
+
+	String0()                       { Zero(); }
+	~String0()                      { Free(); }
+};
+
+class String : public Moveable<String, AString<String0> > {
+	void Swap(String& b)                                   { String0::Swap(b); }
+
+#ifdef _DEBUG
+#ifndef COMPILER_GCC
+	int          len;
+	const char  *s;
+#endif
+	friend class String0;
+#endif
+
+public:
+	const String& operator+=(char c)                       { Cat(c); return *this; }
+	const String& operator+=(const char *s)                { Cat(s); return *this; }
+	const String& operator+=(const String& s)              { Cat(s); return *this; }
+
+	String& operator=(const char *s);
+	String& operator=(const String& s)                     { String0::Assign(s); return *this; }
+	String& operator=(StringBuffer& b)                     { *this = String(b); return *this; }
+	String& operator<<=(const String& s)                   { if(this != &s) { String0::Free(); String0::Set(s, s.GetCount()); } return *this; }
+
+	void   Shrink()                                        { *this = String(Begin(), GetLength()); }
+
+	String()                                               {}
+	String(const Nuller&)                                  {}
+	String(const String& s)                                { String0::Set(s); }
+	String(const char *s)                                  { String0::Set(s, strlen__(s)); }
+	String(const String& s, int n)                         { ASSERT(n >= 0 && n <= s.GetLength()); String0::Set(~s, n); }
+	String(const char *s, int n)                           { String0::Set(s, n); }
+	String(const byte *s, int n)                           { String0::Set((const char *)s, n); }
+	String(const char *s, const char *lim)                 { String0::Set(s, (int)(lim - s)); }
+	String(int chr, int count)                             { String0::Zero(); Cat(chr, count); }
+	String(StringBuffer& b);
+
+	WString ToWString() const;
+	const String& ToString() const                         { return *this; }
+
+	static String GetVoid();
+	bool   IsVoid() const;
+
+	friend void Swap(String& a, String& b)                 { a.Swap(b); }
+
+	String(const std::string& s)                           { String0::Set(s.c_str(), (int)s.length()); }
+	operator std::string() const                           { return std::string(Begin(), End()); }
+};
+
+inline std::string to_string(const String& s)              { return std::string(s.Begin(), s.End()); }
+
+class StringBuffer : NoCopy {
+	char   *begin;
+	char   *end;
+	char   *limit;
+	char    buffer[256];
+
+	friend class String;
+
+	typedef String0::Rc Rc;
+
+	char *Alloc(int len, int& alloc);
+	void  Realloc(int n, const char *cat = NULL, int l = 0);
+	void  Expand();
+	void  Zero()                    { begin = end = buffer; limit = begin + 255; }
+	void  Free();
+	void  Set(String& s);
+
+public:
+	char *Begin()                   { *end = '\0'; return begin; }
+	char *End()                     { *end = '\0'; return end; }
+
+	operator char*()                { return Begin(); }
+	char *operator~()               { return Begin(); }
+
+	void SetLength(int l);
+	void SetCount(int l)            { SetLength(l); }
+	int  GetLength() const          { return (int)(end - begin); }
+	int  GetCount() const           { return GetLength(); }
+	void Strlen()                   { SetLength((int)strlen(begin)); }
+	void Clear()                    { Free(); Zero(); }
+	void Reserve(int r)             { int l = GetLength(); SetLength(l + r); SetLength(l); }
+
+	void Cat(int c)                 { if(end >= limit) Expand(); *end++ = c; }
+	void Cat(int c, int count);
+	void Cat(const char *s, int l);
+	void Cat(const char *s)         { Cat(s, (int)strlen(s)); }
+	void Cat(const String& s)       { Cat(s, s.GetLength()); }
+
+	int  GetAlloc() const           { return (int)(limit - begin); }
+
+	void operator=(String& s)       { Free(); Set(s); }
+
+	StringBuffer()                  { Zero(); }
+	StringBuffer(String& s)         { Set(s); }
+	StringBuffer(int len)           { Zero(); SetLength(len); }
+	~StringBuffer()                 { if(begin != buffer) Free(); }
+};
+
+inline bool  IsEmpty(const String& s)      { return s.IsEmpty(); }
+
+template <class T> bool IsNull(const T& x) { return x.IsNullInstance(); }
+
+String FormatPtr(const void *p);
+
+template <class T>
+inline String AsString(const T& x)
+{
+	return x.ToString();
+}
+
+/*
+template <class T>
+inline String AsString(T *x)
+{
+	return FormatPtr(x);
+}
+*/
+
+#ifdef PLATFORM_MSC
+inline String AsString(const void *x)
+{
+	return FormatPtr(x);
+}
+#endif
+
+inline String& operator<<(String& s, const char *x)
+{
+	s.Cat(x);
+	return s;
+}
+
+inline String& operator<<(String& s, char *x)
+{
+	s.Cat(x);
+	return s;
+}
+
+inline String& operator<<(String& s, const String &x)
+{
+	s.Cat(x);
+	return s;
+}
+
+inline String& operator<<(String& s, char x)
+{
+	s.Cat((int) x);
+	return s;
+}
+
+inline String& operator<<(String& s, const void *x)
+{
+	s << FormatPtr(x);
+	return s;
+}
+
+inline String& operator<<(String& s, void *x)
+{
+	s << FormatPtr(x);
+	return s;
+}
+
+template <class T>
+inline String& operator<<(String& s, const T& x)
+{
+	s.Cat(AsString(x));
+	return s;
+}
+
+template<>
+inline String& operator<<(String& s, const char * const &x)
+{
+	s.Cat(x);
+	return s;
+}
+
+template<>
+inline String& operator<<(String& s, const String &x)
+{
+	s.Cat(x);
+	return s;
+}
+
+template<>
+inline String& operator<<(String& s, const char& x)
+{
+	s.Cat(x);
+	return s;
+}
+
+template<>
+inline bool  IsNull(const String& s)       { return s.IsEmpty(); }
+
+template<>
+inline String AsString(const String& s)     { return s; }
+
+template<>
+inline unsigned GetHashValue(const String& s) { return memhash(~s, s.GetLength()); }
+
+int CompareNoCase(const String& a, const String& b, byte encoding = 0);
+int CompareNoCase(const String& a, const char *b, byte encoding = 0);
+
+inline
+int CompareNoCase(const char *a, const String& b, byte encoding = 0) {
+	return -CompareNoCase(b, a, encoding);
+}
+
+String TrimLeft(const String& s);
+String TrimRight(const String& s);
+
+inline StringBuffer& operator<<(StringBuffer& s, const char *x)
+{
+	s.Cat(x);
+	return s;
+}
+
+inline StringBuffer& operator<<(StringBuffer& s, char *x)
+{
+	s.Cat(x);
+	return s;
+}
+
+inline StringBuffer& operator<<(StringBuffer& s, const String &x)
+{
+	s.Cat(x);
+	return s;
+}
+
+inline StringBuffer& operator<<(StringBuffer& s, char x)
+{
+	s.Cat((int) x);
+	return s;
+}
+
+inline StringBuffer& operator<<(StringBuffer& s, const void *x)
+{
+	s << FormatPtr(x);
+	return s;
+}
+
+inline StringBuffer& operator<<(StringBuffer& s, void *x)
+{
+	s << FormatPtr(x);
+	return s;
+}
+
+template <class T>
+inline StringBuffer& operator<<(StringBuffer& s, const T& x)
+{
+	s.Cat(AsString(x));
+	return s;
+}
+
+template<>
+inline StringBuffer& operator<<(StringBuffer& s, const char * const &x)
+{
+	s.Cat(x);
+	return s;
+}
+
+template<>
+inline StringBuffer& operator<<(StringBuffer& s, const String &x)
+{
+	s.Cat(x);
+	return s;
+}
+
+template<>
+inline StringBuffer& operator<<(StringBuffer& s, const char& x)
+{
+	s.Cat(x);
+	return s;
+}
+
+template <class T>
+void RawCat(String& s, const T& x)
+{
+	s.Cat((const char *)&x, sizeof(x));
+}
+
+template <class T>
+void RawCat(StringBuffer& s, const T& x)
+{
+	s.Cat((const char *)&x, sizeof(x));
+}
+
+class WString0 {
+	enum { SMALL = 23 };
+
+	wchar *ptr;
+	int    length;
+	int    alloc;
+
+#ifdef _DEBUG
+	void Dsyn();
+#else
+	void Dsyn() {}
+#endif
+
+	static Atomic voidptr[2];
+
+	bool    IsRc() const  { return alloc > SMALL; }
+	Atomic& Rc()          { return *((Atomic *)ptr - 1); }
+	bool    IsShared()    { return IsRc() && Rc() > 1; }
+
+	wchar  *Alloc(int& count);
+	void    LCat(int c);
+	void    UnShare();
+
+	friend class WStringBuffer;
+	friend class WString;
+
+public: // should be protected, bug in GCC 3.4
+	typedef wchar         tchar;
+	typedef int16         bchar;
+	typedef WStringBuffer Buffer;
+	typedef WString       String;
+
+protected:
+	void    Zero()                       { static wchar e[2]; length = alloc = 0; ptr = e; Dsyn(); ASSERT(*ptr == 0); }
+	void    Set(const wchar *s, int length);
+	void    Set(const WString0& s);
+	void    Free();
+	void    Swap(WString0& b)            { Upp::Swap(ptr, b.ptr); Upp::Swap(length, b.length); Upp::Swap(alloc, b.alloc); Dsyn(); b.Dsyn(); }
+	wchar  *Insert(int pos, int count, const wchar *data);
+
+public:
+	const wchar *Begin() const           { return ptr; }
+	int   operator[](int i) const        { return ptr[i]; }
+
+	operator const wchar *() const       { return Begin(); }
+	const wchar *operator~() const       { return Begin(); }
+
+	void Cat(int c)                      { if(!IsRc() && length < alloc) { ptr[length++] = c; ptr[length] = 0; } else LCat(c); Dsyn(); }
+	void Cat(const wchar *s, int length);
+
+	int  GetCount() const                { return length; }
+	int  GetLength() const               { return length; }
+	int  GetAlloc() const                { return alloc; }
+
+	unsigned GetHashValue() const             { return memhash(ptr, length * sizeof(wchar)); }
+	bool     IsEqual(const WString0& s) const { return s.length == length && memcmp(ptr, s.ptr, length * sizeof(wchar)) == 0; }
+	int      Compare(const WString0& s) const;
+
+	void Remove(int pos, int count = 1);
+	void Insert(int pos, const wchar *s, int count);
+	void Clear()                         { Free(); Zero(); }
+
+	void Set(int pos, int ch);
+	void Trim(int pos);
+
+	WString0()                           { Zero(); }
+	~WString0()                          { Free(); }
+};
+
+class WString : public Moveable<WString, AString<WString0> >
+{
+	void Swap(WString& b)                                   { WString0::Swap(b); }
+
+#ifdef _DEBUG
+	int          len;
+	const wchar *s;
+	friend class WString0;
+#endif
+
+public:
+	UPP::String ToString() const;
+
+	const WString& operator+=(wchar c)                      { Cat(c); return *this; }
+	const WString& operator+=(const wchar *s)               { Cat(s); return *this; }
+	const WString& operator+=(const WString& s)             { Cat(s); return *this; }
+
+	WString& operator<<(wchar c)                            { Cat(c); return *this; }
+	WString& operator<<(const WString& s)                   { Cat(s); return *this; }
+	WString& operator<<(const wchar *s)                     { Cat(s); return *this; }
+
+	WString& operator=(const wchar *s);
+	WString& operator=(const WString& s)                    { if(this != &s) { WString0::Free(); WString0::Set(s); } return *this; }
+	WString& operator=(WStringBuffer& b)                    { *this = WString(b); return *this; }
+	WString& operator<<=(const WString& s)                  { if(this != &s) { WString0::Free(); WString0::Set(s, s.GetCount()); } return *this; }
+
+	void   Shrink()                                         { *this = WString(Begin(), GetLength()); }
+
+	WString()                                               {}
+	WString(const Nuller&)                                  {}
+	WString(const WString& s)                               { WString0::Set(s); }
+	WString(const wchar *s)                                 { WString0::Set(s, strlen__(s)); }
+	WString(const WString& s, int n)                        { ASSERT(n >= 0 && n <= s.GetLength()); WString0::Set(~s, n); }
+	WString(const wchar *s, int n)                          { WString0::Set(s, n); }
+	WString(const wchar *s, const wchar *lim)               { WString0::Set(s, (int)(lim - s)); }
+	WString(int chr, int count)                             { WString0::Zero(); Cat(chr, count); }
+	WString(WStringBuffer& b);
+
+	WString(const char *s);
+	WString(const char *s, int n);
+	WString(const char *s, const char *lim);
+
+	static WString GetVoid();
+	bool   IsVoid() const                                   { return alloc < 0; }
+
+	friend void Swap(WString& a, WString& b)                { a.Swap(b); }
+	friend WString operator+(const WString& a, char b)      { WString c(a); c += b; return c; }
+	friend WString operator+(char a, const WString& b)      { WString c(a, 1); c += b; return c; }
+
+	WString(const std::wstring& s);
+	operator std::wstring() const;
+};
+
+inline std::wstring to_string(const WString& s)             { return std::wstring(s.Begin(), s.End()); }
+
+class WStringBuffer : NoCopy {
+	wchar   *begin;
+	wchar   *end;
+	wchar   *limit;
+
+	friend class WString;
+
+	wchar *Alloc(int len, int& alloc);
+	void   Expand(int n, const wchar *cat = NULL, int l = 0);
+	void   Expand();
+	void   Zero();
+	void   Free();
+	void   Set(WString& s);
+
+public:
+	wchar *Begin()                   { *end = '\0'; return begin; }
+	wchar *End()                     { *end = '\0'; return end; }
+
+	operator wchar*()                { return Begin(); }
+	wchar *operator~()               { return Begin(); }
+
+	void  SetLength(int l);
+	void  SetCount(int l)            { SetLength(l); }
+	int   GetLength() const          { return (int)(end - begin); }
+	int   GetCount() const           { return GetLength(); }
+	void  Strlen()                   { SetLength(wstrlen(begin)); }
+	void  Clear()                    { Free(); Zero(); }
+	void  Reserve(int r)             { int l = GetLength(); SetLength(l + r); SetLength(l); }
+
+	void  Cat(int c)                 { if(end >= limit) Expand(); *end++ = c; }
+	void  Cat(int c, int count);
+	void  Cat(const wchar *s, int l);
+	void  Cat(const wchar *s)        { Cat(s, wstrlen(s)); }
+	void  Cat(const WString& s)      { Cat(s, s.GetLength()); }
+	void  Cat(const char *s)         { Cat(WString(s)); }
+
+	int   GetAlloc() const           { return (int)(limit - begin); }
+
+	void operator=(WString& s)       { Free(); Set(s); }
+
+	WStringBuffer()                  { Zero(); }
+	WStringBuffer(WString& s)        { Set(s); }
+	WStringBuffer(int len)           { Zero(); SetLength(len); }
+	~WStringBuffer()                 { Free(); }
+};
+
+inline bool  IsEmpty(const WString& s)      { return s.IsEmpty(); }
+
+template<>
+inline bool  IsNull(const WString& s)       { return s.IsEmpty(); }
+
+//template<>
+//inline String AsString(const WString& s)     { return s; }
+
+template<>
+inline unsigned GetHashValue(const WString& s) { return memhash(~s, 2 * s.GetLength()); }
+
+WString TrimLeft(const WString& str);
+WString TrimRight(const WString& s);
+
+int CompareNoCase(const WString& a, const WString& b);
+int CompareNoCase(const WString& a, const wchar *b);
+
+inline
+int CompareNoCase(const wchar *a, const WString& b) {
+	return -CompareNoCase(b, a);
+}
+
+template<> inline String AsString(const char * const &s)    { return s; }
+template<> inline String AsString(char * const &s)          { return s; }
+template<> inline String AsString(const char& a)            { return String(a, 1); }
+template<> inline String AsString(const signed char& a)     { return String(a, 1); }
+template<> inline String AsString(const unsigned char& a)   { return String(a, 1); }
+template<> inline String AsString(const bool& a)            { return a ? "true" : "false"; }
+
+unsigned ctoi(int c);
+
+typedef int (*CharFilter)(int);
+
+int CharFilterAscii(int c);
+int CharFilterAscii128(int c);
+int CharFilterUnicode(int c);
+int CharFilterDigit(int c);
+int CharFilterWhitespace(int c);
+int CharFilterAlpha(int c);
+int CharFilterAlphaToUpper(int c);
+int CharFilterAlphaToLower(int c);
+int CharFilterInt(int c);
+int CharFilterDouble(int c);
+int CharFilterDefaultToUpperAscii(int c);
+
+String Filter(const char *s, int (*filter)(int));
+String FilterWhile(const char *s, int (*filter)(int));
+
+#include "AString.hpp"
diff --git a/uppsrc/Core/TimeDate.cpp b/uppsrc/Core/TimeDate.cpp
new file mode 100644
index 000000000..5278e06ef
--- /dev/null
+++ b/uppsrc/Core/TimeDate.cpp
@@ -0,0 +1,420 @@
+#include "Core.h"
+
+NAMESPACE_UPP
+
+static int s_month[] = {
+	31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31
+};
+
+static int s_month_off[] = {
+	  0,  31,  59,  90, 120, 151,
+	181, 212, 243, 273, 304, 334
+};
+
+bool IsLeapYear(int year)
+{
+	return ((year % 4 == 0 && year % 100 != 0) || year % 400 == 0);
+}
+
+void Date::Serialize(Stream& s)
+{
+	s % day % month % year;
+}
+
+int  GetDaysOfMonth(int m, int y) {
+	return s_month[m - 1] + (m == 2) * IsLeapYear(y);
+}
+
+bool Date::IsValid() const {
+	return year == -32768 /* TRC fix 2007/06/17:was == 0 */ || month >= 1 && month <= 12 &&
+		                day >= 1 && day <= GetDaysOfMonth(month, year);
+}
+
+String DayName(int i, int lang)
+{
+	static const char *day[] = {
+		tt_("date\vSunday"), tt_("date\vMonday"), tt_("date\vTuesday"),
+		tt_("date\vWednesday"), tt_("date\vThursday"), tt_("date\vFriday"), tt_("date\vSaturday")
+	};
+	return i >= 0 && i < 7 ? Nvl(GetLngString(lang, day[i]), GetENUS(day[i])) : String();
+}
+
+String DyName(int i, int lang)
+{
+	static const char *day[] = {
+		tt_("date\vSu"), tt_("date\vMo"), tt_("date\vTu"),
+		tt_("date\vWe"), tt_("date\vTh"), tt_("date\vFr"), tt_("date\vSa")
+	};
+	return i >= 0 && i < 7 ? Nvl(GetLngString(lang, day[i]), GetENUS(day[i])) : String();
+}
+
+String MonthName(int i, int lang)
+{
+	static const char *month[] = {
+		tt_("date\vJanuary"), tt_("date\vFebruary"), tt_("date\vMarch"), tt_("date\vApril"), tt_("date\vMay"),
+		tt_("date\vJune"), tt_("date\vJuly"), tt_("date\vAugust"), tt_("date\vSeptember"), tt_("date\vOctober"),
+		tt_("date\vNovember"), tt_("date\vDecember")
+	};
+	return i >= 0 && i < 12 ? Nvl(GetLngString(lang, month[i]), GetENUS(month[i])) : String();
+}
+
+String MonName(int i, int lang)
+{
+	static const char *month[] = {
+		tt_("sdate\vJan"), tt_("sdate\vFeb"), tt_("sdate\vMar"), tt_("sdate\vApr"), tt_("sdate\vMay"),
+		tt_("sdate\vJun"), tt_("sdate\vJul"), tt_("sdate\vAug"), tt_("sdate\vSep"), tt_("sdate\vOct"),
+		tt_("sdate\vNov"), tt_("sdate\vDec")
+	};
+	return i >= 0 && i < 12 ? Nvl(GetLngString(lang, month[i]), GetENUS(month[i])) : String();
+}
+
+static char s_date_format[64] = "%2:02d/%3:02d/%1:4d";
+
+void   SetDateFormat(const char *fmt)
+{
+	strncpy(s_date_format, fmt, 63);
+}
+
+String   Format(Date date) {
+	String  s;
+	if(IsNull(date))
+		return String();
+	return Format(s_date_format, date.year, date.month, date.day, DayOfWeek(date));
+}
+
+static char s_date_scan[64] = "mdy";
+
+void   SetDateScan(const char *scan)
+{
+	strncpy(s_date_scan, scan, 63);
+}
+
+const char *StrToDate(Date& d, const char *s)
+{
+	const char *fmt = s_date_scan;
+	if(*s == 0) {
+		d = Null;
+		return s;
+	}
+	d = GetSysDate();
+	while(*fmt) {
+		while(*s && !IsDigit(*s) && !IsAlpha(*s) && (byte)*s < 128)
+			s++;
+		int n;
+		if(IsDigit(*s)) {
+			char *q;
+			n = strtoul(s, &q, 10);
+			s = q;
+		}
+		else
+		if(IsAlpha(*s) || (byte)*s >= 128) {
+			if(*fmt != 'm')
+				return NULL;
+			String m;
+			while(IsAlpha(*s) || (byte)*s >= 128)
+				m.Cat(*s++);
+			m = ToUpper(m);
+			for(int i = 0; i < 12; i++)
+				if(m == ToUpper(MonthName(i)) || m == ToUpper(MonName(i))) {
+					n = i + 1;
+					goto found;
+				}
+			return NULL;
+		found:
+			;
+		}
+		else
+			break;
+
+		switch(*fmt) {
+		case 'd':
+			if(n < 1 || n > 31)
+				return NULL;
+			d.day = n;
+			break;
+		case 'm':
+			if(n < 1 || n > 12)
+				return NULL;
+			d.month = n;
+			break;
+		case 'y':
+			d.year = n;
+			if(d.year < 20) d.year += 2000; // Check again in 2015....
+			else
+			if(d.year < 100) d.year += 1900;
+			break;
+		default:
+			NEVER();
+		}
+		fmt++;
+	}
+	return d.IsValid() ? s : NULL;
+}
+
+static bool s_date_letters = true, s_date_upper = true;
+static char s_date_seps[64] = "A/\a .-";
+
+void   SetDateFilter(const char *seps)
+{
+	s_date_letters = false;
+	s_date_upper = false;
+	if(*seps == 'a') {
+		s_date_letters = true;
+		seps++;
+	}
+	else
+	if(*seps == 'A') {
+		s_date_letters = true;
+		s_date_upper = true;
+		seps++;
+	}
+	strncpy(s_date_seps, seps, 63);
+}
+
+int  CharFilterDate(int c)
+{
+	if(IsDigit(c))
+		return c;
+	if(s_date_letters && IsLetter(c))
+		return s_date_upper ? ToUpper(c) : c;
+	;
+	int a = 0;
+	for(const char *s = s_date_seps; *s; s++) {
+		if(c == (byte)*s)
+			return a ? a : *s;
+		if(s[1] == '\a')
+			a = *s++;
+	}
+	return 0;
+}
+
+int Date::Get() const {
+	return year * 365 + s_month_off[month - 1] + (day - 1) +
+	       (year - 1) / 4 - (year - 1) / 100 + (year - 1) / 400 + 1 +
+	       (month > 2) * IsLeapYear(year);
+}
+
+void Date::Set(int d) {
+	int q, leap;
+	year = 0;
+	q = d / (400 * 365 + 100 - 3);
+	year += 400 * q;
+	d -= q * (400 * 365 + 100 - 3);
+	leap = 1;
+	if(d >= 100 * 365 + 24 + 1) {
+		d--;
+		q = d / (100 * 365 + 24);
+		year += 100 * q;
+		d -= q * (100 * 365 + 24);
+		leap = 0;
+	}
+	if(d >= 365 * 4 + leap) {
+		q = (d + 1 - leap) / (365 * 4 + 1);
+		year += 4 * q;
+		d -= q * (365 * 4 + 1) - 1 + leap;
+		leap = 1;
+	}
+	if(d >= 365 + leap) {
+		q = (d - leap) / 365;
+		year += q;
+		d -= q * 365 + leap;
+		leap = 0;
+	}
+	int i;
+	for(i = 0; i < 12; i++) {
+		int q = s_month[i] + (i == 1) * leap;
+		if(q > d) break;
+		d -= q;
+	}
+	month = i + 1;
+	day = d + 1;
+}
+
+bool operator<(Date a, Date b) {
+	if(a.year < b.year) return true;
+	if(a.year > b.year) return false;
+	if(a.month < b.month) return true;
+	if(a.month > b.month) return false;
+	return a.day < b.day;
+}
+
+int   operator-(Date a, Date b)    { return a.Get() - b.Get(); }
+Date  operator+(Date a, int b)     { Date q; q.Set(a.Get() + b); return q; }
+Date  operator+(int a, Date b)     { Date q; q.Set(b.Get() + a); return q; }
+Date  operator-(Date a, int b)     { Date q; q.Set(a.Get() - b); return q; }
+Date& operator+=(Date& a, int b)   { a.Set(a.Get() + b); return a; }
+Date& operator-=(Date& a, int b)   { a.Set(a.Get() - b); return a; }
+
+int DayOfWeek(Date date) {
+	return (date.Get() + 6) % 7;
+}
+
+Date LastDayOfMonth(Date d) {
+	d.day = GetDaysOfMonth(d.month, d.year);
+	return d;
+}
+
+Date FirstDayOfMonth(Date d) {
+	d.day = 1;
+	return d;
+}
+
+Date LastDayOfYear(Date d)
+{
+	d.day = 31;
+	d.month = 12;
+	return d;
+}
+
+Date FirstDayOfYear(Date d)
+{
+	d.day = 1;
+	d.month = 1;
+	return d;
+}
+
+Date AddMonths(Date date, int months) {
+	months += date.month - 1;
+	int year = idivfloor(months, 12);
+	months -= 12 * year;
+	year += date.year;
+	date.year = year;
+	date.month = months + 1;
+	date.day = min(date.day, LastDayOfMonth(date).day);
+	return date;
+}
+
+Date AddYears(Date date, int years) {
+	date.year += years;
+	date.day = min(date.day, LastDayOfMonth(date).day);
+	return date;
+}
+
+void Time::Serialize(Stream& s)
+{
+	s % day % month % year % hour % minute % second;
+}
+
+#ifdef PLATFORM_WIN32
+Time::Time(FileTime filetime) {
+	SYSTEMTIME tm;
+	FileTime ft;
+	FileTimeToLocalFileTime(&filetime, &ft);
+	FileTimeToSystemTime(&ft, &tm);
+	*this = Time(tm.wYear, tm.wMonth, tm.wDay, tm.wHour, tm.wMinute, tm.wSecond);
+}
+
+FileTime Time::AsFileTime() const {
+	SYSTEMTIME tm;
+	tm.wYear = year;
+	tm.wMonth = month;
+	tm.wDay = day;
+	tm.wHour = hour;
+	tm.wMinute = minute;
+	tm.wSecond = second;
+	tm.wMilliseconds = 0;
+	FileTime ft, filetime;
+	SystemTimeToFileTime(&tm, &ft);
+	LocalFileTimeToFileTime(&ft, &filetime);
+	return filetime;
+}
+#endif
+
+#ifdef PLATFORM_POSIX
+Time::Time(FileTime filetime) {
+	struct tm *time = localtime(&filetime.ft);
+	*this = Time(time->tm_year + 1900, time->tm_mon + 1, time->tm_mday,
+                 time->tm_hour, time->tm_min, time->tm_sec);
+}
+
+FileTime Time::AsFileTime() const {
+	struct tm time;
+	time.tm_year = year - 1900;
+	time.tm_mon = month - 1;
+	time.tm_mday = day;
+	time.tm_hour = hour;
+	time.tm_min = minute;
+	time.tm_sec = second;
+	time.tm_isdst = -1;
+	return mktime(&time);
+}
+#endif
+
+bool operator==(Time a, Time b) {
+	return a.day == b.day && a.month == b.month && a.year == b.year &&
+		   a.hour == b.hour && a.minute == b.minute && a.second == b.second;
+}
+
+bool operator<(Time a, Time b) {
+	if(a.year < b.year) return true;
+	if(a.year > b.year) return false;
+	if(a.month < b.month) return true;
+	if(a.month > b.month) return false;
+	if(a.day < b.day) return true;
+	if(a.day > b.day) return false;
+	if(a.hour < b.hour) return true;
+	if(a.hour > b.hour) return false;
+	if(a.minute < b.minute) return true;
+	if(a.minute > b.minute) return false;
+	return a.second < b.second;
+}
+
+void Time::Set(int64 scalar)
+{
+	int q = (int)(scalar / (24 * 3600));
+	Date::Set(q);
+	int n = int(scalar - (int64)q * 24 * 3600);
+	hour = n / 3600;
+	n %= 3600;
+	minute = n / 60;
+	second = n % 60;
+}
+
+int64 Time::Get() const
+{
+	return Date::Get() * (int64)24 * 3600 + hour * 3600 + minute * 60 + second;
+}
+
+int64 operator-(Time a, Time b) {
+	return a.Get() - b.Get();
+}
+
+Time operator+(Time time, int64 secs) {
+	time.Set(time.Get() + secs);
+	return time;
+}
+
+Time  operator+(int64 seconds, Time a)          { return a + seconds; }
+Time  operator-(Time a, int64 secs)             { return a + (-secs); }
+Time& operator+=(Time& a, int64 secs)           { a = a + secs; return a; }
+Time& operator-=(Time& a, int64 secs)           { a = a - secs; return a; }
+
+String Format(Time time, bool seconds) {
+	if(IsNull(time)) return String();
+	String s = Format(Date(time));
+	if(time.hour == 0 && time.minute == 0 && time.second == 0)
+		return s;
+	else
+		return s + (seconds ? Format(" %02d:%02d:%02d", time.hour, time.minute, time.second)
+	                        : Format(" %02d:%02d", time.hour, time.minute));
+}
+
+#ifdef PLATFORM_WIN32
+Time GetSysTime() {
+	SYSTEMTIME st;
+	GetLocalTime(&st);
+	return Time(st.wYear, st.wMonth, st.wDay, st.wHour, st.wMinute, st.wSecond);
+}
+#endif
+
+#ifdef PLATFORM_POSIX
+Time GetSysTime() {
+	return Time(time(NULL));
+}
+#endif
+
+Date GetSysDate() {
+	return GetSysTime();
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/Core/TimeDate.h b/uppsrc/Core/TimeDate.h
new file mode 100644
index 000000000..4b5931678
--- /dev/null
+++ b/uppsrc/Core/TimeDate.h
@@ -0,0 +1,128 @@
+class Nuller;
+class Stream;
+struct FileTime;
+
+struct Date : RelOps< Date, Moveable<Date> > {
+	byte   day;
+	byte   month;
+	int16  year;
+
+	void     Serialize(Stream& s);
+
+	bool     IsValid() const;
+	void     Set(int scalar);
+	int      Get() const;
+
+	static Date Low()                    { return Date(-4000, 1, 1); }
+	static Date High()                   { return Date(4000, 1, 1); }
+
+	Date()                               { year = -32768; day = month = 0; }
+	Date(const Nuller&)                  { year = -32768; day = month = 0; }
+	Date(int y, int m, int d)            { day = d; month = m; year = y; }
+};
+
+inline unsigned GetHashValue(Date t) {
+	return 512 * t.year + 32 * t.month + t.day;
+}
+
+inline bool operator==(Date a, Date b) {
+	return a.day == b.day && a.month == b.month && a.year == b.year;
+}
+
+bool operator<(Date a, Date b);
+
+int  operator-(Date a, Date b);
+Date operator+(Date a, int b);
+Date operator+(int a, Date b);
+Date operator-(Date a, int b);
+Date& operator+=(Date& a, int b);
+Date& operator-=(Date& a, int b);
+
+bool IsLeapYear(int year);
+
+int  GetDaysOfMonth(int m, int y);
+
+int  DayOfWeek(Date date);
+Date LastDayOfMonth(Date d);
+Date FirstDayOfMonth(Date d);
+Date LastDayOfYear(Date d);
+Date FirstDayOfYear(Date d);
+
+Date AddMonths(Date date, int months);
+Date AddYears(Date date, int years);
+
+Date GetSysDate();
+
+String DayName(int i, int lang = 0);
+String DyName(int i, int lang = 0);
+String MonthName(int i, int lang = 0);
+String MonName(int i, int lang = 0);
+
+void   SetDateFormat(const char *fmt);
+void   SetDateScan(const char *scan);
+void   SetDateFilter(const char *seps);
+
+const char *StrToDate(Date& d, const char *s);
+String      Format(Date date);
+int         CharFilterDate(int c);
+
+template<>
+inline String AsString(const Date& date) { return Format(date); }
+
+struct Time : Date, RelOps< Time, Moveable<Time> > {
+	byte   hour;
+	byte   minute;
+	byte   second;
+
+	void     Serialize(Stream& s);
+
+	static Time High()       { return Time(4000, 1, 1); }
+	static Time Low()        { return Time(-4000, 1, 1); }
+
+	void   Set(int64 scalar);
+	int64  Get() const;
+
+	Time()                   { hour = minute = second = 0; }
+	Time(const Nuller&)      { hour = minute = second = 0; }
+	Time(int y, int m, int d, int h = 0, int n = 0, int s = 0)
+		{ day = d; month = m; year = y; hour = h; minute = n; second = s; }
+
+	Time(FileTime filetime);
+	FileTime AsFileTime() const;
+};
+
+inline Time ToTime(const Date& d) {
+	return Time(d.year, d.month, d.day);
+}
+
+inline unsigned GetHashValue(Time t) {
+	return t.second +
+		   32 * (t.minute + 32 * (t.hour + 16 * (t.day + 32 * (t.month + 8 * t.year))));
+}
+
+bool operator==(Time a, Time b);
+bool operator<(Time a, Time b);
+
+int64  operator-(Time a, Time b);
+Time   operator+(Time a, int64 seconds);
+Time   operator+(int64 seconds, Time a);
+Time   operator-(Time a, int64 secs);
+Time&  operator+=(Time& a, int64 secs);
+Time&  operator-=(Time& a, int64 secs);
+
+inline Time   operator+(Time a, int i)   { return a +  int64(i); }
+inline Time   operator-(Time a, int i)   { return a -  int64(i); }
+inline Time&  operator+=(Time& a, int i) { return a += int64(i); }
+inline Time&  operator-=(Time& a, int i) { return a -= int64(i); }
+
+inline Time   operator+(Time a, double i)   { return a +  int64(i); }
+inline Time   operator-(Time a, double i)   { return a -  int64(i); }
+inline Time&  operator+=(Time& a, double i) { return a += int64(i); }
+inline Time&  operator-=(Time& a, double i) { return a -= int64(i); }
+
+Time  GetSysTime();
+
+String Format(Time time, bool seconds = true);
+
+template<>
+inline String AsString(const Time& time) { return Format(time); }
diff --git a/uppsrc/Core/Topic.cpp b/uppsrc/Core/Topic.cpp
new file mode 100644
index 000000000..60f93e294
--- /dev/null
+++ b/uppsrc/Core/Topic.cpp
@@ -0,0 +1,106 @@
+#include "Core.h"
+
+NAMESPACE_UPP
+
+struct TopicData__ : Moveable<TopicData__> {
+	String      title;
+	const byte *data;
+	int         len;
+};
+
+VectorMap<String, VectorMap<String, VectorMap<String, TopicData__ > > >& Topics__()
+{
+	static VectorMap<String, VectorMap<String, VectorMap<String, TopicData__ > > > x;
+	return x;
+}
+
+VectorMap<String, VectorMap<String, Vector<String> > >& TopicBase()
+{
+	static VectorMap<String, VectorMap<String, Vector<String> > > tb;
+	return tb;
+}
+
+String TopicLinkString(const TopicLink& tl)
+{
+	String s;
+	s << "topic://" << tl.package << '/' << tl.group << '/' << tl.topic;
+	if(tl.label.GetCount())
+		s << '#' << tl.label;
+	return s;
+}
+
+TopicLink ParseTopicLink(const char *link)
+{
+	TopicLink tl;
+	const char *end = link + strlen(link);
+	const char *lbl = strchr(link, '#');
+	if(lbl) {
+		end = lbl;
+		tl.label = lbl + 1;
+	}
+	if(memcmp(link, "topic://", 8) == 0)
+		link += 8;
+	do {
+		if(!IsNull(tl.package))
+			tl.package << '/';
+		tl.package.Cat(tl.group);
+		tl.group = tl.topic;
+		const char *b = link;
+		while(link < end && *link != '/')
+			link++;
+		tl.topic = String(b, link);
+	}
+	while(link++ < end);
+	return tl;
+}
+
+static StaticCriticalSection sTopicLock;
+
+Topic GetTopic(const String& package, const String& group, const String& topic)
+{
+	INTERLOCKED_(sTopicLock) {
+		VectorMap<String, VectorMap<String, TopicData__> > *p = Topics__().FindPtr(package);
+		if(p) {
+			VectorMap<String, TopicData__> *g = p->FindPtr(group);
+			if(g) {
+				const TopicData__ *d = g->FindPtr(topic);
+				if(d) {
+					Topic t;
+					t.title = d->title;
+					t.text = ZDecompress(d->data, d->len);
+					return t;
+				}
+			}
+		}
+	}
+	return Topic();
+}
+
+Topic GetTopic(const char *path)
+{
+	TopicLink tl = ParseTopicLink(path);
+	Topic t = GetTopic(tl.package, tl.group, tl.topic);
+	t.label = tl.label;
+	tl.label.Clear();
+	t.link = TopicLinkString(tl);
+	return t;
+}
+
+END_UPP_NAMESPACE
+
+void RegisterTopic__(const char *topicfile, const char *topic, const char *title,
+                     const UPP::byte *data, int len)
+{
+	INTERLOCKED_(UPP::sTopicLock) {
+		ASSERT(*topicfile == '<');
+		ASSERT(*UPP::GetFileName(topicfile).Last() == '>');
+		UPP::String q = UPP::GetFileFolder(topicfile + 1);
+		UPP::String group = UPP::GetFileTitle(q);
+		UPP::String package = UPP::UnixPath(UPP::GetFileFolder(q));
+		UPP::TopicData__& d = UPP::Topics__().GetAdd(package).GetAdd(group).GetAdd(topic);
+		d.title = title;
+		d.data = data;
+		d.len = len;
+		UPP::TopicBase().GetAdd(package).GetAdd(group).Add(topic);
+	}
+}
diff --git a/uppsrc/Core/Topic.h b/uppsrc/Core/Topic.h
new file mode 100644
index 000000000..d351edc05
--- /dev/null
+++ b/uppsrc/Core/Topic.h
@@ -0,0 +1,31 @@
+#ifndef _Core_Topic_h_
+#define _Core_Topic_h_
+
+struct Topic : Moveable<Topic> {
+	String title;
+	String text;
+	String link;
+	String label;
+
+	operator const String&() const { return text; }
+	operator const char *() const  { return text; }
+};
+
+struct TopicLink {
+	String package;
+	String group;
+	String topic;
+	String label;
+
+	operator bool() const { return !IsNull(topic); }
+};
+
+String     TopicLinkString(const TopicLink& tl);
+TopicLink  ParseTopicLink(const char *link);
+
+Topic      GetTopic(const String& package, const String& group, const String& topic);
+Topic      GetTopic(const char *path);
+
+VectorMap<String, VectorMap<String, Vector<String> > >& TopicBase();
+
+#endif
diff --git a/uppsrc/Core/Topt.h b/uppsrc/Core/Topt.h
new file mode 100644
index 000000000..51ccb43e1
--- /dev/null
+++ b/uppsrc/Core/Topt.h
@@ -0,0 +1,493 @@
+class NoCopy {
+private:
+	NoCopy(const NoCopy&);
+	void operator=(const NoCopy&);
+public:
+	NoCopy() {}
+};
+
+template <class I>
+inline void IterSwap(I a, I b) { if(a != b) Swap(*a, *b); }
+
+class EmptyClass
+{
+};
+
+template <class T, class B = EmptyClass>
+class RelOps : public B
+{
+public:
+	friend bool operator >  (const T& a, const T& b)  { return b < a; }
+	friend bool operator != (const T& a, const T& b)  { return !(a == b); }
+	friend bool operator <= (const T& a, const T& b)  { return !(b < a); }
+	friend bool operator >= (const T& a, const T& b)  { return !(a < b); }
+};
+
+template <class U, class V, class B = EmptyClass>
+class AddOps : public B
+{
+public:
+	friend U& operator -= (U& a, const V& b)          { a += -b; return a; }
+	friend U  operator +  (const U& a, const V& b)    { U x(a); x += b; return x; }
+	friend U  operator -  (const U& a, const V& b)    { U x(a); x += -b; return x; }
+};
+
+template <class T, class B = EmptyClass>
+class PostfixOps : public B
+{
+public:
+	friend T operator ++ (T& i, int)                  { T x = i; ++i; return x; }
+	friend T operator -- (T& i, int)                  { T x = i; --i; return x; }
+};
+
+template <class T, int (*compare)(T a, T b), class B = EmptyClass>
+class CompareRelOps : public B
+{
+public:
+	friend bool operator <  (T a, T b) { return (*compare)(a, b) <  0; }
+	friend bool operator >  (T a, T b) { return (*compare)(a, b) >  0; }
+	friend bool operator == (T a, T b) { return (*compare)(a, b) == 0; }
+	friend bool operator != (T a, T b) { return (*compare)(a, b) != 0; }
+	friend bool operator <= (T a, T b) { return (*compare)(a, b) <= 0; }
+	friend bool operator >= (T a, T b) { return (*compare)(a, b) >= 0; }
+};
+
+template <class T, class B = EmptyClass>
+struct Comparable : public B
+{
+public:
+	friend bool operator <  (const T& a, const T& b) { return a.Compare(b) < 0; }
+	friend bool operator >  (const T& a, const T& b) { return a.Compare(b) > 0; }
+	friend bool operator == (const T& a, const T& b) { return a.Compare(b) == 0; }
+	friend bool operator != (const T& a, const T& b) { return a.Compare(b) != 0; }
+	friend bool operator <= (const T& a, const T& b) { return a.Compare(b) <= 0; }
+	friend bool operator >= (const T& a, const T& b) { return a.Compare(b) >= 0; }
+	friend int  SgnCompare(const T& a, const T& b)   { return a.Compare(b); }
+};
+
+template <class T>
+int NumberCompare__(const T& a, const T& b)
+{
+	if(a < b) return -1;
+	if(a > b) return 1;
+	return 0;
+}
+
+inline int SgnCompare(const char& a, const char& b)                     { return NumberCompare__(a, b); }
+inline int SgnCompare(const signed char& a, const signed char& b)       { return NumberCompare__(a, b); }
+inline int SgnCompare(const unsigned char& a, const unsigned char& b)   { return NumberCompare__(a, b); }
+inline int SgnCompare(const short& a, const short& b)                   { return NumberCompare__(a, b); }
+inline int SgnCompare(const unsigned short& a, const unsigned short& b) { return NumberCompare__(a, b); }
+inline int SgnCompare(const int& a, const int& b)                       { return NumberCompare__(a, b); }
+inline int SgnCompare(const unsigned int& a, const unsigned int& b)     { return NumberCompare__(a, b); }
+inline int SgnCompare(const long& a, const long& b)                     { return NumberCompare__(a, b); }
+inline int SgnCompare(const unsigned long& a, const unsigned long& b)   { return NumberCompare__(a, b); }
+inline int SgnCompare(const bool& a, const bool& b)                     { return NumberCompare__(a, b); }
+inline int SgnCompare(const int64& a, const int64& b)                   { return NumberCompare__(a, b); }
+inline int SgnCompare(const uint64& a, const uint64& b)                 { return NumberCompare__(a, b); }
+inline int SgnCompare(const float& a, const float& b)                   { return NumberCompare__(a, b); }
+inline int SgnCompare(const double& a, const double& b)                 { return NumberCompare__(a, b); }
+
+template<class T>
+inline int SgnCompare(const T& a, const T& b)
+{
+	return a.Compare(b);
+}
+
+struct CombineCompare {
+	int result;
+
+	template <class T>
+	CombineCompare& operator()(const T& a, const T& b) { if(!result) result = SgnCompare(a, b); return *this; }
+
+	operator int() const                               { return result; }
+
+	CombineCompare()                                   { result = 0; }
+
+	template <class T>
+	CombineCompare(const T& a, const T& b)             { result = 0; operator()(a, b); }
+};
+
+template <class T>
+inline void Fill(T *dst, const T *lim, const T& x) {
+	while(dst < lim)
+		*dst++ = x;
+}
+
+template <class T>
+inline void Copy(T *dst, const T *src, const T *lim) {
+	while(src < lim)
+		*dst++ = *src++;
+}
+
+template <class T>
+inline void Copy(T *dst, const T *src, int n) {
+	Copy(dst, src, src + n);
+}
+
+inline void Fill(char *t, const char *lim, const char& x)
+{ memset(t, x, size_t(lim - t)); }
+inline void Copy(char *dst, const char *src, const char *lim)
+{ memcpy(dst, src, size_t((byte *)lim - (byte *)src)); }
+
+inline void Fill(signed char *t, const signed char *lim, const signed char& x)
+{ memset(t, x, size_t(lim - t)); }
+inline void Copy(signed char *dst, const signed char *src, const signed char *lim)
+{ memcpy(dst, src, size_t((byte *)lim - (byte *)src)); }
+
+inline void Fill(unsigned char *t, const unsigned char *lim, const unsigned char& x)
+{ memset(t, x, size_t(lim - t)); }
+inline void Copy(unsigned char *dst, const unsigned char *src, const unsigned char *lim)
+{ memcpy(dst, src, size_t((byte *)lim - (byte *)src)); }
+
+template <class T>
+inline void DeepCopyConstruct(void *p, const T& x) {
+	::new(p) T(x);
+}
+
+template <class T>
+inline T *DeepCopyNew(const T& x) {
+	return new T(x);
+}
+
+template <class T>
+inline void ConstructArray(T *t, const T *lim) {
+	while(t < lim)
+		::new(t++) T;
+}
+
+template <class T>
+inline void DestroyArray(T *t, const T *lim) {
+	while(t < lim) {
+		t->T::~T();
+		t++;
+	}
+}
+
+template <class T>
+inline void DeepCopyConstructArray(T *t, const T *s, const T *lim) {
+	while(s < lim)
+		DeepCopyConstruct(t++, *s++);
+}
+
+template <class T>
+inline void DeepCopyConstructFill(T *t, const T *lim, const T& x) {
+	while(t < lim)
+		DeepCopyConstruct(t++, x);
+}
+
+#ifdef NO_MOVEABLE_CHECK
+
+template <class T>
+inline void AssertMoveable() {}
+
+#define MoveableTemplate(T)
+
+template <class T, class B = EmptyClass>
+class Moveable : public B
+{
+public:
+//	void operator=(const Moveable& b) { B::operator = (b); } // MSC 6.0 empty base class bug fix
+};
+
+#define NTL_MOVEABLE(T)
+
+#else
+
+template <class T>
+inline void AssertMoveablePtr(T, T) {}
+
+template <class T>
+inline void AssertMoveable0(T *t) { AssertMoveablePtr(&**t, *t); }
+// COMPILATION ERROR HERE MEANS TYPE T WAS NOT MARKED AS Moveable
+
+template <class T, class B = EmptyClass>
+struct Moveable : public B {
+	friend void AssertMoveable0(T *) {}
+//	void operator=(const Moveable& b) { B::operator = (b); } // MSC 6.0 empty base class bug fix
+};
+
+template <class T>
+inline void AssertMoveable(T *t = 0) { if(t) AssertMoveable0(t); }
+
+#if defined(COMPILER_MSC) || defined(COMPILER_GCC) && (__GNUC__ < 4 || __GNUC_MINOR__ < 1)
+	#define NTL_MOVEABLE(T) inline void AssertMoveable0(T *) {}
+#else
+	#define NTL_MOVEABLE(T) template<> inline void AssertMoveable<T>(T *) {}
+#endif
+
+#endif
+
+NTL_MOVEABLE(bool);
+NTL_MOVEABLE(char);
+NTL_MOVEABLE(signed char);
+NTL_MOVEABLE(unsigned char);
+NTL_MOVEABLE(short);
+NTL_MOVEABLE(unsigned short);
+NTL_MOVEABLE(int);
+NTL_MOVEABLE(unsigned int);
+NTL_MOVEABLE(long);
+NTL_MOVEABLE(unsigned long);
+NTL_MOVEABLE(int64);
+NTL_MOVEABLE(uint64);
+NTL_MOVEABLE(float);
+NTL_MOVEABLE(double);
+NTL_MOVEABLE(void *);
+NTL_MOVEABLE(const void *);
+
+#if defined(_NATIVE_WCHAR_T_DEFINED) || defined(COMPILER_GCC)
+NTL_MOVEABLE(wchar_t);
+#endif
+
+template <class T, class B = EmptyClass>
+class DeepCopyOption : public B {
+public:
+	friend T& operator<<=(T& dest, const T& src)
+	{ if(&dest != &src) { (&dest)->T::~T(); ::new(&dest) T(src, 1); } return dest; }
+	friend void DeepCopyConstruct(void *dest, const T& src)
+	{ ::new (dest) T(src, 0); }
+	friend T *DeepCopyNew(const T& src)
+	{ return ::new T(src, 0); }
+//	void operator=(const DeepCopyOption& b) { B::operator = (b); } // MSC 6.0 empty base class bug fix
+};
+
+template <class T, class B = EmptyClass>
+class MoveableAndDeepCopyOption : public Moveable< T, DeepCopyOption<T, B> > {
+public:
+//	void operator=(const MoveableAndDeepCopyOption& b) { B::operator = (b); } // MSC 6.0 empty base class bug fix
+};
+
+template <class T, class B = EmptyClass>
+class PolyDeepCopyNew : public B
+{
+public:
+	friend T *DeepCopyNew(const T& t)              { return t.Copy(); }
+//	void operator=(const PolyDeepCopyNew& b)       { B::operator = (b); } // MSC 6.0 empty base class bug fix
+};
+
+template <class T>
+class WithDeepCopy : public T {
+public:
+	WithDeepCopy(const T& a) : T(a, 1)             {}
+	WithDeepCopy(const WithDeepCopy& a) : T(a, 1)  {}
+	WithDeepCopy& operator=(const WithDeepCopy& a) { (T&)*this <<= a; return *this; }
+	WithDeepCopy(int, pick_ T& a) : T(a)           {}
+	WithDeepCopy& operator^=(pick_ T& a)           { (T&)*this = a; return *this; }
+	WithDeepCopy()                                 {}
+};
+
+template <class V>
+class ConstIIterator {
+protected:
+	const V       *cont;
+	int            ii;
+	typedef        typename V::ValueType T;
+	struct NP { int dummy; };
+
+public:
+	const T&       operator*() const       { return (*cont)[ii]; }
+	const T       *operator->() const      { return &(*cont)[ii]; }
+	const T&       operator[](int i) const { return (*cont)[ii + i]; }
+
+	ConstIIterator& operator++()           { ++ii; return *this; }
+	ConstIIterator& operator--()           { --ii; return *this; }
+	ConstIIterator  operator++(int)        { ConstIIterator t = *this; ++ii; return t; }
+	ConstIIterator  operator--(int)        { ConstIIterator t = *this; --ii; return t; }
+
+	ConstIIterator& operator+=(int d)      { ii += d; return *this; }
+	ConstIIterator& operator-=(int d)      { ii -= d; return *this; }
+
+	ConstIIterator  operator+(int d) const { return ConstIIterator(cont, ii + d); }
+	ConstIIterator  operator-(int d) const { return ConstIIterator(cont, ii - d); }
+
+	int  operator-(const ConstIIterator& b) const   { return ii - b.ii; }
+
+	bool operator==(const ConstIIterator& b) const  { return ii == b.ii; }
+	bool operator!=(const ConstIIterator& b) const  { return ii != b.ii; }
+	bool operator<(const ConstIIterator& b) const   { return ii < b.ii; }
+	bool operator>(const ConstIIterator& b) const   { return ii > b.ii; }
+	bool operator<=(const ConstIIterator& b) const  { return ii <= b.ii; }
+	bool operator>=(const ConstIIterator& b) const  { return ii >= b.ii; }
+
+	operator bool() const     { return ii < 0; }
+
+	ConstIIterator()          {}
+	ConstIIterator(NP *null)  { ASSERT(null == NULL); ii = -1; }
+	ConstIIterator(const V& _cont, int ii) : cont(&_cont), ii(ii) {}
+};
+
+template <class V>
+class IIterator {
+protected:
+	V             *cont;
+	int            ii;
+	typedef        typename V::ValueType T;
+	struct NP { int dummy; };
+
+public:
+	T&       operator*()              { return (*cont)[ii]; }
+	T       *operator->()             { return &(*cont)[ii]; }
+	T&       operator[](int i)        { return (*cont)[ii + i]; }
+
+	const T& operator*() const        { return (*cont)[ii]; }
+	const T *operator->() const       { return &(*cont)[ii]; }
+	const T& operator[](int i) const  { return (*cont)[ii + i]; }
+
+	IIterator& operator++()           { ++ii; return *this; }
+	IIterator& operator--()           { --ii; return *this; }
+	IIterator  operator++(int)        { IIterator t = *this; ++ii; return t; }
+	IIterator  operator--(int)        { IIterator t = *this; --ii; return t; }
+
+	IIterator& operator+=(int d)      { ii += d; return *this; }
+	IIterator& operator-=(int d)      { ii -= d; return *this; }
+
+	IIterator  operator+(int d) const { return IIterator(*cont, ii + d); }
+	IIterator  operator-(int d) const { return IIterator(*cont, ii - d); }
+
+	int  operator-(const IIterator& b) const   { return ii - b.ii; }
+
+	bool operator==(const IIterator& b) const  { return ii == b.ii; }
+	bool operator!=(const IIterator& b) const  { return ii != b.ii; }
+	bool operator<(const IIterator& b) const   { return ii < b.ii; }
+	bool operator>(const IIterator& b) const   { return ii > b.ii; }
+	bool operator<=(const IIterator& b) const  { return ii <= b.ii; }
+	bool operator>=(const IIterator& b) const  { return ii >= b.ii; }
+
+	operator bool() const                      { return ii < 0; }
+
+	IIterator()          {}
+	IIterator(NP *null)  { ASSERT(null == NULL); ii = -1; }
+	IIterator(V& _cont, int ii) : cont(&_cont), ii(ii) {}
+};
+
+unsigned Pow2Bound(unsigned i);
+unsigned PrimeBound(unsigned i);
+
+unsigned memhash(const void *ptr, size_t size);
+
+template <class T>
+inline unsigned GetHashValue(const T& x)                            { return x.GetHashValue(); }
+
+struct CombineHash {
+	unsigned hash;
+
+	enum { INIT = 1234567890 };
+
+	template <class T> CombineHash& Do(const T& x)                  { Put(GetHashValue(x)); return *this; }
+
+public:
+	CombineHash& Put(unsigned h) { hash = ((hash << 4) + hash) ^ h; return *this; }
+
+	operator unsigned() const                                       { return hash; }
+
+	CombineHash()                                                   { hash = INIT; }
+	template <class T>
+	CombineHash(const T& h1)                                        { hash = INIT; Do(h1); }
+	template <class T, class U>
+	CombineHash(const T& h1, const U& h2)                           { hash = INIT; Do(h1); Do(h2); }
+	template <class T, class U, class V>
+	CombineHash(const T& h1, const U& h2, const V& h3)              { hash = INIT; Do(h1); Do(h2); Do(h3); }
+	template <class T, class U, class V, class W>
+	CombineHash(const T& h1, const U& h2, const V& h3, const W& h4)	{ hash = INIT; Do(h1); Do(h2); Do(h3); Do(h4); }
+
+	template <class T> CombineHash& operator<<(const T& x)          { Do(x); return *this; }
+};
+
+template<> inline unsigned GetHashValue(const char& a)           { return (unsigned)a; }
+template<> inline unsigned GetHashValue(const signed char& a)    { return (const unsigned)a; }
+template<> inline unsigned GetHashValue(const unsigned char& a)  { return (const unsigned)a; }
+template<> inline unsigned GetHashValue(const short& a)          { return (const unsigned)a; }
+template<> inline unsigned GetHashValue(const unsigned short& a) { return (const unsigned)a; }
+template<> inline unsigned GetHashValue(const int& a)            { return (const unsigned)a; }
+template<> inline unsigned GetHashValue(const unsigned int& a)   { return (const unsigned)a; }
+template<> inline unsigned GetHashValue(const long& a)           { return (const unsigned)a; }
+template<> inline unsigned GetHashValue(const unsigned long& a)  { return (const unsigned)a; }
+template<> inline unsigned GetHashValue(const bool& a)           { return (const unsigned)a; }
+template<> inline unsigned GetHashValue(const wchar_t& a)        { return (const unsigned)a; }
+
+template<> inline unsigned GetHashValue(const int64& a)          { return CombineHash((unsigned)a, (unsigned)(a >> 32)); }
+template<> inline unsigned GetHashValue(const uint64& a)         { return GetHashValue((int64)a); }
+
+unsigned GetHashValue0(const double& a);
+
+template<> inline unsigned GetHashValue(const double& a)         { return GetHashValue0(a); }
+template<> inline unsigned GetHashValue(const float& a)          { double x = a; return GetHashValue0(x); }
+
+#ifdef CPU_32
+inline unsigned GetPtrHashValue(const void *a)                   { return (int)a; }
+#else
+inline unsigned GetPtrHashValue(const void *a)                   { return CombineHash((unsigned)(uintptr_t)a); }
+#endif
+
+/* Is it time to activate this?
+template <class T>
+inline unsigned GetHashValue(T *ptr)                             { return GetPtrHashValue(ptr); }
+*/
+
+// workaround for broken standard libraries...
+
+template <class T> inline const T& ntl_max(const T& a, const T& b) { return a > b ? a : b; }
+
+// STL compatibility hacks
+
+#define STL_INDEX_COMPATIBILITY(C) \
+	typedef T             value_type; \
+	typedef ConstIterator const_iterator; \
+	typedef const T&      const_reference; \
+	typedef int           size_type; \
+	typedef int           difference_type; \
+	const_iterator        begin() const          { return B::Begin(); } \
+	const_iterator        end() const            { return B::End(); } \
+	void                  clear()                { B::Clear(); } \
+	size_type             size()                 { return B::GetCount(); } \
+
+#define STL_BI_COMPATIBILITY(C) \
+	typedef T             value_type; \
+	typedef ConstIterator const_iterator; \
+	typedef const T&      const_reference; \
+	typedef int           size_type; \
+	typedef int           difference_type; \
+	const_iterator        begin() const          { return Begin(); } \
+	const_iterator        end() const            { return End(); } \
+	void                  clear()                { Clear(); } \
+	size_type             size()                 { return GetCount(); } \
+	typedef Iterator      iterator; \
+	typedef T&            reference; \
+	iterator              begin()                { return Begin(); } \
+	iterator              end()                  { return End(); } \
+
+#define STL_MAP_COMPATIBILITY(C) \
+	typedef T             value_type; \
+	typedef ConstIterator const_iterator; \
+	typedef const T&      const_reference; \
+	typedef int           size_type; \
+	typedef int           difference_type; \
+	const_iterator        begin() const          { return B::Begin(); } \
+	const_iterator        end() const            { return B::End(); } \
+	void                  clear()                { B::Clear(); } \
+	size_type             size()                 { return B::GetCount(); } \
+	typedef Iterator      iterator; \
+	typedef T&            reference; \
+	iterator              begin()                { return B::Begin(); } \
+	iterator              end()                  { return B::End(); } \
+
+#define STL_VECTOR_COMPATIBILITY(C) \
+	typedef T             value_type; \
+	typedef ConstIterator const_iterator; \
+	typedef const T&      const_reference; \
+	typedef int           size_type; \
+	typedef int           difference_type; \
+	const_iterator        begin() const          { return Begin(); } \
+	const_iterator        end() const            { return End(); } \
+	void                  clear()                { Clear(); } \
+	size_type             size()                 { return GetCount(); } \
+	typedef Iterator      iterator; \
+	typedef T&            reference; \
+	iterator              begin()                { return Begin(); } \
+	iterator              end()                  { return End(); } \
+	reference             front()                { return (*this)[0]; } \
+	const_reference       front() const          { return (*this)[0]; } \
+	reference             back()                 { return Top(); } \
+	const_reference       back() const           { return Top(); } \
+	void                  push_back(const T& x)  { Add(x); } \
+	void                  pop_back()             { Drop(); }
diff --git a/uppsrc/Core/Util.cpp b/uppsrc/Core/Util.cpp
new file mode 100644
index 000000000..d039d45af
--- /dev/null
+++ b/uppsrc/Core/Util.cpp
@@ -0,0 +1,800 @@
+#include "Core.h"
+
+#ifdef PLATFORM_WIN32
+#	include <winnls.h>
+#endif
+
+NAMESPACE_UPP
+
+bool PanicMode;
+
+bool    IsPanicMode() { return PanicMode; }
+
+static  void (*sPanicMessageBox)(const char *title, const char *text);
+
+void InstallPanicMessageBox(void (*mb)(const char *title, const char *text))
+{
+	sPanicMessageBox = mb;
+}
+
+void PanicMessageBox(const char *title, const char *text)
+{
+#ifdef PLATFORM_WIN32
+#	ifdef PLATFORM_WINCE
+	MessageBox(::GetActiveWindow(), ToSysChrSet(text), ToSysChrSet(title), MB_ICONSTOP | MB_OK | MB_APPLMODAL);
+#	else
+	MessageBox(::GetActiveWindow(), text, title, MB_ICONSTOP | MB_OK | MB_APPLMODAL);
+#	endif
+#else
+	if(sPanicMessageBox)
+		(*sPanicMessageBox)(title, text);
+	write(2, text, strlen(text));
+	write(2, "\n", 1);
+#endif
+}
+
+void    Panic(const char *msg)
+{
+	if(PanicMode)
+		return;
+	PanicMode = true;
+	LOG(msg);
+	LOG(GetLastErrorMessage());
+	BugLog() << "PANIC: " << msg << "\n";
+	UsrLogT("===== PANIC ================================================");
+	UsrLogT(msg);
+	PanicMessageBox("Fatal error", msg);
+
+#ifdef PLATFORM_WIN32
+#	ifdef __NOASSEMBLY__
+#		if defined(PLATFORM_WINCE) || defined(WIN64)
+			DebugBreak();
+#		endif
+#	else
+#		if defined(_DEBUG) && defined(CPU_X86)
+#			ifdef COMPILER_MSC
+				_asm int 3
+#			endif
+#			ifdef COMPILER_GCC
+				asm("int $3");
+#			endif
+#		endif
+#	endif
+#else
+#endif
+	__BREAK__;
+	abort();
+}
+
+static void (*s_assert_hook)(const char *);
+
+void    SetAssertFailedHook(void (*h)(const char *))
+{
+	s_assert_hook = h;
+}
+
+void    AssertFailed(const char *file, int line, const char *cond)
+{
+	if(PanicMode)
+		return;
+	PanicMode = true;
+	char s[2048];
+	sprintf(s, "Assertion failed in %s, line %d\n%s\n", file, line, cond);
+	LOG(s);
+	LOG(GetLastErrorMessage());
+	if(s_assert_hook)
+		(*s_assert_hook)(s);
+	BugLog() << "ASSERT FAILED: " << s << "\n";
+	UsrLogT("===== ASSERT FAILED ================================================");
+	UsrLogT(s);
+
+	PanicMessageBox("Fatal error", s);
+
+#ifdef PLATFORM_WIN32
+#	ifdef __NOASSEMBLY__
+#		if defined(PLATFORM_WINCE) || defined(WIN64)
+			DebugBreak();
+#		endif
+#	else
+#		if defined(_DEBUG) && defined(CPU_X86)
+#			ifdef COMPILER_MSC
+				_asm int 3
+#			endif
+#			ifdef COMPILER_GCC
+				asm("int $3");
+#			endif
+#		endif
+#	endif
+#else
+#endif
+	__BREAK__;
+	abort();
+}
+
+#ifdef PLATFORM_POSIX
+int GetTickCount() {
+	struct timeval tv[1];
+	struct timezone tz[1];
+	memset(tz, 0, sizeof(tz));
+	gettimeofday(tv, tz);
+	return tv->tv_sec % 1000000 * 1000 + tv->tv_usec / 1000;
+}
+#endif
+
+void TimeStop::Reset()
+{
+	starttime = GetTickCount();
+}
+
+TimeStop::TimeStop()
+{
+	Reset();
+}
+
+String TimeStop::ToString() const
+{
+	dword time = Elapsed();
+	return Format("%d.%03d", int(time / 1000), int(time % 1000));
+}
+
+int RegisterTypeNo__(const char *type)
+{
+	INTERLOCKED {
+		static Index<String> types;
+		return types.FindAdd(type);
+	}
+	return -1;
+}
+
+char *PermanentCopy(const char *s)
+{
+	char *t = (char *)MemoryAllocPermanent(strlen(s) + 1);
+	strcpy(t, s);
+	return t;
+}
+
+#ifndef PLATFORM_WIN32
+void Sleep(int msec)
+{
+	timespec tval;
+	tval.tv_sec = msec / 1000;
+	tval.tv_nsec = (msec % 1000) * 1000000;
+	nanosleep(&tval, NULL);
+}
+#endif
+
+int MemICmp(const void *dest, const void *src, int count)
+{
+
+	const byte *a = (const byte *)dest;
+	const byte *b = (const byte *)src;
+	const byte *l = a + count;
+	while(a < l) {
+		if(ToUpper(*a) != ToUpper(*b))
+			return ToUpper(*a) - ToUpper(*b);
+		a++;
+		b++;
+	}
+	return 0;
+}
+
+Stream& Pack16(Stream& s, Point& p) {
+	return Pack16(s, p.x, p.y);
+}
+
+Stream& Pack16(Stream& s, Size& sz) {
+	return Pack16(s, sz.cx, sz.cy);
+}
+
+Stream& Pack16(Stream& s, Rect& r) {
+	return Pack16(s, r.left, r.top, r.right, r.bottom);
+}
+
+int InScListIndex(const char *s, const char *list)
+{
+	int ii = 0;
+	for(;;) {
+		const char *q = s;
+		for(;;) {
+			if(*q == '\0' && *list == '\0') return ii;
+			if(*q != *list) {
+				if(*q == '\0' && *list == ';') return ii;
+				if(*list == '\0') return -1;
+				break;
+			}
+			q++;
+			list++;
+		}
+		while(*list && *list != ';') list++;
+		if(*list == '\0') return -1;
+		list++;
+		ii++;
+	}
+}
+
+bool InScList(const char *s, const char *list)
+{
+	return InScListIndex(s, list) >= 0;
+}
+
+void StringC::Free() {
+	if(IsString()) delete (String *) bap.GetPtr();
+}
+
+StringC::~StringC() {
+	Free();
+}
+
+StringC::operator const char *() const {
+	if(IsEmpty()) return NULL;
+	if(IsString()) return *(String *) bap.GetPtr();
+	return (const char *)bap.GetPtr();
+}
+
+StringC::operator String() const {
+	if(IsEmpty()) return (const char *)NULL;
+	if(IsString()) return *(String *) bap.GetPtr();
+	return (const char *)bap.GetPtr();
+}
+
+bool StringC::IsEmpty() const {
+	if(IsString()) return (*(String *) bap.GetPtr()).IsEmpty();
+	if(!bap.GetPtr()) return true;
+	return !*(const char *)bap.GetPtr();
+}
+
+void StringC::SetString(const String& s) {
+	Free();
+	String *ptr = new String;
+	*ptr = s;
+	bap.Set1(ptr);
+}
+
+void StringC::SetCharPtr(const char *s) {
+	Free();
+	bap.Set0((void *)s);
+}
+
+CharFilterTextTest::CharFilterTextTest(int (*filter)(int)) : filter(filter) {}
+CharFilterTextTest::~CharFilterTextTest() {}
+
+const char *CharFilterTextTest::Accept(const char *s) const {
+	if(!(*filter)((byte)*s++)) return NULL;
+	return s;
+}
+
+Vector<String> Split(const char *s, const TextTest& delim, bool ignoreempty) {
+	Vector<String> r;
+	const char *t = s;
+	while(*t) {
+		const char *q = delim.Accept(t);
+		if(q) {
+			if(!ignoreempty || t > s)
+				r.Add(String(s, t));
+			t = s = q;
+		}
+		else
+			t++;
+	}
+	if(!ignoreempty || t > s)
+		r.Add(String(s, t));
+	return r;
+}
+
+Vector<String> Split(const char *s, int (*filter)(int), bool ignoreempty) {
+	return Split(s, CharFilterTextTest(filter), ignoreempty);
+}
+
+struct chrTextTest : public TextTest {
+	int chr;
+	virtual const char *Accept(const char *s) const { return chr == *s ? s + 1 : NULL; }
+};
+
+Vector<String> Split(const char *s, int chr, bool ignoreempty) {
+	chrTextTest ct;
+	ct.chr = chr;
+	return Split(s, ct, ignoreempty);
+}
+
+String Join(const Vector<String>& im, const String& delim) {
+	String r;
+	for(int i = 0; i < im.GetCount(); i++) {
+		if(i) r.Cat(delim);
+		r.Cat(im[i]);
+	}
+	return r;
+}
+
+WString Join(const Vector<WString>& im, const WString& delim) {
+	WString r;
+	for(int i = 0; i < im.GetCount(); i++) {
+		if(i) r.Cat(delim);
+		r.Cat(im[i]);
+	}
+	return r;
+}
+// ---------------------------
+
+VectorMap<String, String> LoadIniFile(const char *filename) {
+	VectorMap<String, String> key;
+	FileIn in(filename);
+	if(!in) return key;
+	int c;
+	if((c = in.Get()) < 0) return key;
+	for(;;) {
+		String k, v;
+		for(;;) {
+			if(IsAlNum(c) || c == '_')
+				k.Cat(c);
+			else
+				break;
+			if((c = in.Get()) < 0) return key;
+		}
+		for(;;) {
+			if(c != '=' && c != ' ') break;
+			if((c = in.Get()) < 0) return key;
+		}
+		for(;;) {
+			if(c < ' ') break;
+			v.Cat(c);
+			if((c = in.Get()) < 0) break;
+		}
+		if(!k.IsEmpty())
+			key.Add(k, v);
+		if(k == "LINK") {
+			in.Close();
+			if(!in.Open(v) || (c = in.Get()) < 0) return key;
+		}
+		else
+			for(;;) {
+				if(IsAlNum(c)) break;
+				if((c = in.Get()) < 0) return key;
+			}
+	}
+}
+
+const char *sIniFile;
+
+void SetIniFile(const char *name) {
+	sIniFile = name;
+}
+
+String GetIniKey(const char *name) {
+	static bool loaded;
+	static VectorMap<String, String> key;
+	if(!loaded) {
+		loaded = true;
+		key = LoadIniFile(sIniFile ? sIniFile : ~ConfigFile("q.ini"));
+	#ifdef PLATFORM_WIN32
+		if(key.GetCount() == 0)
+			key = LoadIniFile("C:\\Q.INI");
+	#endif
+	#ifdef PLATFORM_POSIX
+		if(key.GetCount() == 0)
+			key = LoadIniFile(GetHomeDirFile("q.ini"));
+	#endif
+	}
+	int i = key.Find(name);
+	if(i < 0) return String();
+	return key[i];
+}
+
+void TextSettings::Load(const char *filename)
+{
+	FileIn in(filename);
+	int themei = 0;
+	settings.Add("");
+	while(!in.IsEof()) {
+		String ln = in.GetLine();
+		const char *s = ln;
+		if(*s == '[') {
+			s++;
+			String theme;
+			while(*s && *s != ']')
+				theme.Cat(*s++);
+			themei = settings.FindAdd(theme);
+		}
+		else {
+			if(themei >= 0) {
+				String key;
+				while(*s && *s != '=') {
+					key.Cat(*s++);
+				}
+				if(*s == '=') s++;
+				String value;
+				while(*s) {
+					value.Cat(*s++);
+				}
+				if(!IsEmpty(key))
+					settings[themei].GetAdd(key) = value;
+			}
+		}
+	}
+}
+
+String TextSettings::Get(const char *group, const char *key) const
+{
+	int itemi = settings.Find(group);
+	return itemi < 0 ? Null : settings.Get(group).Get(key, Null);
+
+}
+
+// --------------------------------------------------------------
+
+String timeFormat(double s) {
+	if(s < 0.001) return Sprintf("%5.2f us", s * 1.0e6);
+	if(s < 1) return Sprintf("%5.2f ms", s * 1.0e3);
+	return Sprintf("%5.2f s ", s);
+}
+
+String Garble(const char *s, const char *e)
+{
+	int c = 0xAA;
+	String result;
+	if(!e)
+		e = s + strlen(s);
+	while(s != e)
+	{
+		result.Cat(*s++ ^ (char)c);
+		if((c <<= 1) & 0x100)
+			c ^= 0x137;
+	}
+	return result;
+}
+
+String Garble(const String& s)
+{
+	return Garble(~s, ~s + s.GetLength());
+}
+
+String Encode64(const String& s)
+{
+	String enc;
+	int l = s.GetLength();
+	enc << l << ':';
+	for(int i = 0; i < l;)
+	{
+		char a = 0, b = 0, c = 0;
+		if(i < l) a = s[i++];
+		if(i < l) b = s[i++];
+		if(i < l) c = s[i++];
+		enc.Cat(' ' + 1 + ((a >> 2) & 0x3F));
+		enc.Cat(' ' + 1 + ((a << 4) & 0x30) + ((b >> 4) & 0x0F));
+		enc.Cat(' ' + 1 + ((b << 2) & 0x3C) + ((c >> 6) & 0x03));
+		enc.Cat(' ' + 1 + (c & 0x3F));
+	}
+	return enc;
+}
+
+String Decode64(const String& s)
+{
+	if(!IsDigit(*s))
+		return s;
+	const char *p = s;
+	char *h;
+	int len = strtol(p, &h, 10);
+	p = h;
+	if(*p++ != ':' || len < 0 || (len + 2) / 3 * 4 > (s.End() - p))
+		return s; // invalid encoding
+	if(len == 0)
+		return Null;
+	String dec;
+	for(;;)
+	{
+		byte ea = *p++ - ' ' - 1, eb = *p++ - ' ' - 1, ec = *p++ - ' ' - 1, ed = *p++ - ' ' - 1;
+		byte out[3] = { (ea << 2) | (eb >> 4), (eb << 4) | (ec >> 2), (ec << 6) | (ed >> 0) };
+		switch(len)
+		{
+		case 1:  dec.Cat(out[0]); return dec;
+		case 2:  dec.Cat(out, 2); return dec;
+		case 3:  dec.Cat(out, 3); return dec;
+		default: dec.Cat(out, 3); len -= 3; break;
+		}
+	}
+}
+
+String NormalizeSpaces(const char *s)
+{
+	StringBuffer r;
+	while(*s && (byte)*s <= ' ')
+		s++;
+	while(*s) {
+		if((byte)*s <= ' ') {
+			while(*s && (byte)*s <= ' ')
+				s++;
+			if(*s)
+				r.Cat(' ');
+		}
+		else
+			r.Cat(*s++);
+	}
+	return r;
+}
+
+String NormalizeSpaces(const char *s, const char *end)
+{
+	StringBuffer r;
+	while(*s && (byte)*s <= ' ')
+		s++;
+	while(s < end) {
+		if((byte)*s <= ' ') {
+			while(s < end && (byte)*s <= ' ')
+				s++;
+			if(*s)
+				r.Cat(' ');
+		}
+		else
+			r.Cat(*s++);
+	}
+	return r;
+}
+
+int ChNoInvalid(int c)
+{
+	return c == DEFAULTCHAR ? '_' : c;
+}
+
+#ifdef PLATFORM_WINCE
+WString ToSystemCharset(const String& src)
+{
+	return src.ToWString();
+}
+
+String FromSystemCharset(const WString& src)
+{
+	return src.ToString();
+}
+#else
+
+#ifdef PLATFORM_WIN32
+String ToSystemCharset(const String& src)
+{
+	WString s = src.ToWString();
+	int l = s.GetLength() * 5;
+	StringBuffer b(l);
+	int q = WideCharToMultiByte(CP_ACP, 0, (const WCHAR *)~s, s.GetLength(), b, l, NULL, NULL);
+	if(q <= 0)
+		return src;
+	b.SetCount(q);
+	return b;
+}
+
+String FromSystemCharset(const String& src)
+{
+	WStringBuffer b(src.GetLength());
+	int q = MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, ~src, src.GetLength(), (WCHAR*)~b, src.GetLength());
+	if(q <= 0)
+		return src;
+	b.SetCount(q);
+	return WString(b).ToString();
+}
+
+WString ToSystemCharsetW(const char *src)
+{
+	return String(src).ToWString();
+}
+
+String FromSystemCharsetW(const wchar *src)
+{
+	return WString(src).ToString();
+}
+
+#else
+String ToSystemCharset(const String& src)
+{
+	return IsMainRunning() ? Filter(ToCharset(GetLNGCharset(GetSystemLNG()), src), ChNoInvalid)
+	                       : src;
+}
+
+String FromSystemCharset(const String& src)
+{
+	return IsMainRunning() ? Filter(ToCharset(CHARSET_DEFAULT, src, GetLNGCharset(GetSystemLNG())), ChNoInvalid) : src;
+}
+#endif
+#endif
+
+static VectorMap<String, String>& sGCfg()
+{
+	static VectorMap<String, String> m;
+	return m;
+}
+
+static StaticCriticalSection sGCfgLock;
+
+static Vector<Callback>& sGFlush()
+{
+	static Vector<Callback> m;
+	return m;
+}
+
+static StaticCriticalSection sGFlushLock;
+
+void    RegisterGlobalConfig(const char *name)
+{
+	INTERLOCKED_(sGCfgLock) {
+		ASSERT(sGCfg().Find(name) < 0);
+		sGCfg().Add(name);
+	}
+}
+
+void    RegisterGlobalConfig(const char *name, Callback WhenFlush)
+{
+	RegisterGlobalConfig(name);
+	INTERLOCKED_(sGFlushLock) {
+		sGFlush().Add(WhenFlush);
+	}
+}
+
+String GetGlobalConfigData(const char *name)
+{
+	INTERLOCKED_(sGCfgLock) {
+		return sGCfg().GetAdd(name);
+	}
+	return String();
+}
+
+void SetGlobalConfigData(const char *name, const String& data)
+{
+	INTERLOCKED_(sGCfgLock) {
+		sGCfg().GetAdd(name) = data;
+	}
+}
+
+void  SerializeGlobalConfigs(Stream& s)
+{
+	INTERLOCKED_(sGFlushLock) {
+		for(int i = 0; i < sGFlush().GetCount(); i++)
+			sGFlush()[i]();
+	}
+	INTERLOCKED_(sGCfgLock) {
+		VectorMap<String, String>& cfg = sGCfg();
+		int version = 0;
+		s / version;
+		int count = cfg.GetCount();
+		s / count;
+		for(int i = 0; i < count; i++) {
+			String name;
+			if(s.IsStoring())
+				name = cfg.GetKey(i);
+			s % name;
+			int q = cfg.Find(name);
+			if(q >= 0)
+				s % cfg[q];
+			else
+			{
+				String dummy;
+				s % dummy;
+			}
+		}
+		s.Magic();
+	}
+}
+
+Exc::Exc() : String(GetLastErrorMessage()) {}
+/*
+#ifdef PLATFORM_WIN32
+void Exc::Show() const {
+	if(IsEmpty()) return;
+	MessageBox(GetActiveWindow(), *this, "Chyba", MB_OK);
+}
+#endif
+
+#ifdef PLATFORM_POSIX
+void Exc::Show() const {
+	printf(*this);
+}
+#endif
+*/
+AbortExc::AbortExc() :
+	Exc(t_("Aborted by user.")) {}
+
+#ifdef PLATFORM_WIN32
+
+String GetErrorMessage(DWORD dwError) {
+	char h[2048];
+	sprintf(h, "%08x", dwError);
+#ifdef PLATFORM_WINCE //TODO
+	return h;
+#else
+	FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
+		          NULL, dwError, 0, h, 2048, NULL);
+	String result = h;
+	String modf;
+	const char* s = result;
+	BYTE c;
+	while((c = *s++) != 0)
+		if(c <= ' ') {
+			if(!modf.IsEmpty() && modf[modf.GetLength() - 1] != ' ')
+				modf += ' ';
+		}
+		else if(c == '%' && *s >= '0' && *s <= '9') {
+			s++;
+			modf += "<###>";
+		}
+		else
+			modf += (char)c;
+	const char* p = modf;
+	for(s = p + modf.GetLength(); s > p && s[-1] == ' '; s--);
+	return FromSystemCharset(modf.Left((int)(s - p)));
+#endif
+}
+
+String GetLastErrorMessage() {
+	return GetErrorMessage(GetLastError());
+}
+
+#endif
+
+#ifdef PLATFORM_POSIX
+
+String GetErrorMessage(int errorno) {
+	enum { MAX_ERROR_LEN = 1000000 };
+	int len = 1024;
+	Buffer<char> buffer(len);
+	while(strerror_r(errorno, buffer, len))
+		if(errno == ERANGE && len < MAX_ERROR_LEN)
+			buffer.Alloc(len <<= 1);
+		else
+			return NFormat("strerror_r(%d, %d) -> errno = %d", errorno, len, errno);
+	return FromSystemCharset(~buffer);
+}
+
+String GetLastErrorMessage() {
+	return GetErrorMessage(errno);
+}
+
+#endif
+
+#ifdef PLATFORM_POSIX
+static void LinuxBeep(const char *fn)
+{
+	return;
+	// This is not the right way to do that... (causes zombies, ignores Gnome settings)
+	char h[100];
+	strcpy(h, "aplay /usr/share/sounds/");
+	strcat(h, fn);
+	if(fork()) return;
+	system(h);
+	_exit(EXIT_SUCCESS);
+}
+#endif
+
+void BeepInformation()
+{
+#ifdef PLATFORM_WIN32
+	MessageBeep(MB_ICONINFORMATION);
+#else
+	LinuxBeep("info.wav");
+#endif
+}
+
+void BeepExclamation()
+{
+#ifdef PLATFORM_WIN32
+	MessageBeep(MB_ICONEXCLAMATION);
+#else
+	LinuxBeep("warning.wav");
+#endif
+}
+
+void BeepQuestion()
+{
+#ifdef PLATFORM_WIN32
+	MessageBeep(MB_ICONQUESTION);
+#else
+	LinuxBeep("question.wav");
+//	write(1, "\a", 1); //??
+#endif
+}
+
+#if defined(COMPILER_MSC) && (_MSC_VER < 1300)
+//hack for linking libraries built using VC7 with VC6 standard lib's
+extern "C" long _ftol( double );
+extern "C" long _ftol2( double dblSource ) { return _ftol( dblSource ); }
+#endif
+
+#ifdef PLATFORM_WINCE
+int errno; // missing and zlib needs it
+#endif
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/Core/Util.h b/uppsrc/Core/Util.h
new file mode 100644
index 000000000..4b7510331
--- /dev/null
+++ b/uppsrc/Core/Util.h
@@ -0,0 +1,370 @@
+#ifdef PLATFORM_WIN32
+#ifndef _MAX_PATH
+static const int _MAX_PATH = MAX_PATH;
+#endif
+#endif
+
+#ifdef PLATFORM_POSIX
+static const int _MAX_PATH = PATH_MAX;
+int      GetTickCount();
+#endif
+
+class TimeStop : Moveable<TimeStop> {
+	dword starttime;
+
+public:
+	int    Elapsed() const           { return GetTickCount() - starttime; }
+	String ToString() const;
+	void   Reset();
+
+	TimeStop();
+};
+
+void   SetAssertFailedHook(void (*h)(const char *));
+
+void   SetIniFile(const char *name);
+String GetIniKey(const char *name);
+VectorMap<String, String> LoadIniFile(const char *filename);
+
+String timeFormat(double second);
+
+String Garble(const char *s, const char *e);
+String Garble(const String& s);
+
+String Encode64(const String& s);
+String Decode64(const String& s);
+
+#ifdef PLATFORM_WINCE
+WString ToSystemCharset(const String& src);
+String  FromSystemCharset(const WString& src);
+#else
+String  ToSystemCharset(const String& src);
+String  FromSystemCharset(const String& src);
+WString ToSystemCharsetW(const char *src);
+String  FromSystemCharsetW(const wchar *src);
+#endif
+
+#ifdef PLATFORM_WIN32
+String GetErrorMessage(dword dwError);
+#endif
+
+#ifdef PLATFORM_POSIX
+inline int GetLastError() { return errno; }
+String GetErrorMessage(int errorno);
+#endif
+
+String GetLastErrorMessage();
+
+void   BeepInformation();
+void   BeepExclamation();
+void   BeepQuestion();
+
+inline
+void memsetw(void *t, word value, int count)
+{
+	word *w = (word *)t;
+	word *lim = w + count;
+	while(w < lim)
+		*w++ = value;
+}
+
+inline
+void memsetd(void *t, dword value, int count)
+{
+	dword *w = (dword *)t;
+	dword *lim = w + count;
+	while(w < lim)
+		*w++ = value;
+}
+
+inline
+void memsetex(void *t, const void *item, int item_size, int count) {
+	ASSERT(count >= 0);
+	byte *q = (byte *)t;
+	while(count--) {
+		memcpy(q, item, item_size);
+		q += item_size;
+	}
+}
+
+char *PermanentCopy(const char *s);
+
+int MemICmp(const void *dest, const void *src, int count);
+
+String NormalizeSpaces(const char *s);
+String NormalizeSpaces(const char *begin, const char *end);
+
+#ifndef PLATFORM_WIN32
+void Sleep(int msec);
+#endif
+
+template <class T>
+void Zero(T& obj)
+{
+	::memset(&obj, 0, sizeof(obj));
+}
+
+template <class T>
+T& Reconstruct(T& object)
+{
+	object.~T();
+	::new(&object) T;
+	return object;
+}
+
+template <class T>
+inline void Dbl_Unlink(T *x)
+{
+	x->prev->next = x->next; x->next->prev = x->prev;
+}
+
+template <class T>
+inline void Dbl_LinkAfter(T *x, T *lnk)
+{
+	x->prev = lnk; x->next = lnk->next; x->next->prev = x; lnk->next = x;
+}
+
+template <class T>
+inline void Dbl_Self(T *x)
+{
+	x->prev = x->next = x;
+}
+
+#define ZeroArray(x)       memset((x), 0, sizeof(x))
+
+// Math utils
+
+inline double  sqr          (double a)                      { return a * a; }
+inline double  argsinh      (double s)                      { return log(s + sqrt(s * s + 1)); }
+inline double  argcosh      (double c)                      { ASSERT(c >= 1); return log(c + sqrt(c * c - 1)); }
+inline double  argtanh      (double t)                      { ASSERT(fabs(t) < 1); return log((1 + t) / (1 - t)) / 2; }
+
+int            iscale(int x, int y, int z);
+int            iscalefloor(int x, int y, int z);
+int            iscaleceil(int x, int y, int z);
+int            idivfloor(int x, int y);
+int            idivceil(int x, int y);
+int            itimesfloor(int x, int y);
+int            itimesceil(int x, int y);
+
+int            fround(double x);
+int            ffloor(double x);
+int            fceil(double x);
+
+int64          fround64(double x);
+int64          ffloor64(double x);
+int64          fceil64(double x);
+
+String         AsString(double x, int nDigits);
+double         modulo(double x, double y);
+
+int            ilog10       (double d);
+double         ipow10       (int i);
+double         normalize    (double d, int& exponent);
+
+double         roundr       (double d, int digits);
+double         floorr       (double d, int digits);
+double         ceilr        (double d, int digits);
+
+//BW - use max<double>
+//inline double fmax(double x, double y)            { return x >= y ? x : y; }
+//BW - use min<double>
+//inline double fmin(double x, double y)            { return x <= y ? x : y; }
+//BW - use minmax<double>
+//inline double fbind(double l, double x, double h) { return x >= h ? h : x <= l ? l : x; }
+//BW - use sgn<double>
+//inline int    fsgn(double x)                      { return x > 0 ? +1 : x < 0 ? -1 : 0; }
+
+// Constants rounded for 21 decimals.
+
+#ifndef M_E
+
+#define M_E         2.71828182845904523536
+#define M_LOG2E     1.44269504088896340736
+#define M_LOG10E    0.434294481903251827651
+#define M_LN2       0.693147180559945309417
+#define M_LN10      2.30258509299404568402
+#define M_PI        3.14159265358979323846
+#define M_PI_2      1.57079632679489661923
+#define M_PI_4      0.785398163397448309616
+#define M_1_PI      0.318309886183790671538
+#define M_2_PI      0.636619772367581343076
+#define M_1_SQRTPI  0.564189583547756286948
+#define M_2_SQRTPI  1.12837916709551257390
+#define M_SQRT2     1.41421356237309504880
+#define M_SQRT_2    0.707106781186547524401
+
+#endif
+
+#define M_2PI       (2 * M_PI)
+
+// ------
+
+//# System dependent !
+class BitAndPtr {
+	uintptr_t bap;
+
+public:
+	void  SetBit(bool b)  { bap = (~1 & bap) | (uintptr_t)b; }
+	void  SetPtr(void *p) { bap = (1 & bap) | (uintptr_t)p; }
+
+	bool  GetBit() const  { return bap & 1; }
+	void *GetPtr() const  { return (void *) (bap & ~1); }
+
+	void  Set0(void *ptr) { bap = (uintptr_t)ptr; }
+	void  Set1(void *ptr) { bap = (uintptr_t)ptr | 1; }
+
+	BitAndPtr()           { bap = 0; }
+};
+
+class Exc : public String {
+public:
+	Exc(); // throw exception according to GetLastError()
+	Exc(const String& desc) : String(desc) {}
+
+//	void Show() const;
+};
+
+class AbortExc : public Exc {
+public:
+	AbortExc();
+};
+
+// --------------
+
+/*
+template <class T>
+va_list va_ptr(const T& obj)
+{
+	va_list temp;
+	va_start(temp, obj);
+	return temp;
+}
+*/
+
+// ---------------
+
+int  InScListIndex(const char *s, const char *list);
+bool InScList(const char *s, const char *list);
+
+struct TextTest {
+	virtual const char *Accept(const char *s) const = 0;
+	virtual ~TextTest() {}
+};
+
+class CharFilterTextTest : public TextTest {
+	int (*filter)(int);
+
+public:
+	virtual const char *Accept(const char *s) const;
+	CharFilterTextTest(int (*filter)(int));
+	virtual ~CharFilterTextTest();
+};
+
+Vector<String> Split(const char *s, const TextTest& delim, bool ignoreempty = true);
+Vector<String> Split(const char *s, int (*filter)(int), bool ignoreempty = true);
+Vector<String> Split(const char *s, int chr, bool ignoreempty = true);
+String Join(const Vector<String>& im, const String& delim);
+
+WString Join(const Vector<WString>& im, const WString& delim);
+
+class StringC {
+	BitAndPtr bap;
+
+	bool     IsString() const                  { return bap.GetBit(); }
+	void     Free();
+
+public:
+	void     SetString(const String& s);
+	void     SetCharPtr(const char *s);
+
+	bool     IsEmpty() const;
+
+	operator const char *() const;
+	operator String() const;
+
+	~StringC();
+};
+
+// ------------------- Linux style text settings -------------
+
+class TextSettings {
+	VectorMap< String, VectorMap< String, String > > settings;
+
+public:
+	String Get(const char *group, const char *key) const;
+	String Get(const char *key) const                            { return Get("", key); }
+
+	String operator()(const char *group, const char *key) const  { return Get(group, key); }
+	String operator()(const char *key) const                     { return Get(key); }
+
+	void Clear()                                                 { settings.Clear(); }
+	void Load(const char *filename);
+};
+
+// ------------------- Advanced streaming --------------------
+
+bool Load(Callback1<Stream&> serialize, Stream& stream);
+bool Store(Callback1<Stream&> serialize, Stream& stream);
+bool LoadFromFile(Callback1<Stream&> serialize, const char *file = NULL);
+bool StoreToFile(Callback1<Stream&> serialize, const char *file = NULL);
+
+template <class T>
+bool Load(T& x, Stream& s) {
+	return Load(callback(&x, &T::Serialize), s);
+}
+
+template <class T>
+bool Store(T& x, Stream& s) {
+	return Store(callback(&x, &T::Serialize), s);
+}
+
+template <class T>
+bool LoadFromFile(T& x, const char *name = NULL) {
+	return LoadFromFile(callback(&x, &T::Serialize), name);
+}
+
+template <class T>
+bool StoreToFile(T& x, const char *name = NULL) {
+	return StoreToFile(callback(&x, &T::Serialize), name);
+}
+
+template <class T>
+String StoreAsString(T& x) {
+	StringStream ss;
+	Store(x, ss);
+	return ss;
+}
+
+template <class T>
+bool LoadFromString(T& x, const String& s) {
+	StringStream ss(s);
+	return Load(x, ss);
+}
+
+void             RegisterGlobalConfig(const char *name) init_;
+void             RegisterGlobalConfig(const char *name, Callback WhenFlush) init_;
+
+String           GetGlobalConfigData(const char *name);
+void             SetGlobalConfigData(const char *name, const String& data);
+
+template <class T>
+bool LoadFromGlobal(T& x, const char *name)
+{
+	StringStream ss(GetGlobalConfigData(name));
+	return ss.IsEof() || Load(x, ss);
+}
+
+template <class T>
+void StoreToGlobal(T& x, const char *name)
+{
+	StringStream ss;
+	Store(x, ss);
+	SetGlobalConfigData(name, ss);
+}
+
+void SerializeGlobalConfigs(Stream& s);
+
+#ifdef PLATFORM_WINCE
+inline void abort() { TerminateProcess(NULL, -1); }
+#endif
diff --git a/uppsrc/Core/Uuid.cpp b/uppsrc/Core/Uuid.cpp
new file mode 100644
index 000000000..d6db0c603
--- /dev/null
+++ b/uppsrc/Core/Uuid.cpp
@@ -0,0 +1,69 @@
+#include "Core.h"
+
+#ifdef PLATFORM_WIN32
+
+#define Ptr Ptr_
+#include <objbase.h>
+#undef Ptr
+
+#pragma comment(lib, "ole32.lib")
+
+#endif
+
+NAMESPACE_UPP
+
+//#BLITZ_APPROVE
+
+void Uuid::Serialize(Stream& s) {
+	int version = 0;
+	s / version % a % b %c % d;
+}
+
+#ifdef PLATFORM_WIN32
+
+Uuid Uuid::Create() {
+	Uuid uuid;
+	CoCreateGuid((GUID *)&uuid);
+	return uuid;
+}
+#endif
+
+#if defined(PLATFORM_POSIX)
+
+static StaticCriticalSection sUuidLock;
+
+Uuid Uuid::Create() {
+	CriticalSection::Lock _(sUuidLock);
+	static int fd;
+	ONCELOCK {
+		fd = open("/dev/urandom", O_RDONLY);
+		ASSERT(fd > 0);
+	}
+	static byte uuid[sizeof(Uuid)];
+	read(fd, uuid, sizeof(Uuid));
+	return *(Uuid *)uuid;
+}
+
+#endif
+
+String Format(const Uuid& id) {
+	return Sprintf("%08X%08X%08X%08X", id.a, id.b, id.c, id.d);
+}
+
+String Dump(const Uuid& id) {
+	return "UUID: " + Format(id);
+}
+
+struct UuidValueGenClass : ValueGen
+{
+	virtual Value Get() {
+		return Format(Uuid::Create());
+	}
+};
+
+ValueGen& UuidValueGen()
+{
+	return Single<UuidValueGenClass>();
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/Core/Uuid.h b/uppsrc/Core/Uuid.h
new file mode 100644
index 000000000..ef246c22d
--- /dev/null
+++ b/uppsrc/Core/Uuid.h
@@ -0,0 +1,34 @@
+struct Uuid : AssignValueTypeNo<Uuid, 50, Moveable<Uuid> > {
+	dword a, b, c, d;
+
+	void Serialize(Stream& s);
+	bool IsNull() const           { return a == 0 && b == 0 && c == 0 && d == 0; }
+	void SetNull()                { a = b = c = d = 0; }
+
+	operator Value() const        { return RichValue<Uuid>(*this); }
+	Uuid(const Value& q)          { *this = RichValue<Uuid>::Extract(q); }
+	Uuid(const Nuller&)           { SetNull(); }
+	Uuid()                        {}
+
+	unsigned GetHashValue() const { return CombineHash(a, b, c, d); }
+
+	static Uuid Create();
+};
+
+String Format(const Uuid& id);
+
+inline bool  operator==(const Uuid& u, const Uuid& w) {
+	return ((u.a ^ w.a) | (u.b ^ w.b) | (u.c ^ w.c) | (u.d ^ w.d)) == 0;
+}
+
+inline bool  operator!=(const Uuid& u, const Uuid& w) {
+	return !(u == w);
+}
+
+template<>
+inline bool IsNull(const Uuid& id) { return id.IsNull(); }
+
+template<>
+inline String AsString(const Uuid& id) { return Format(id); }
+
+ValueGen& UuidValueGen();
diff --git a/uppsrc/Core/Value.cpp b/uppsrc/Core/Value.cpp
new file mode 100644
index 000000000..94b05cc9e
--- /dev/null
+++ b/uppsrc/Core/Value.cpp
@@ -0,0 +1,651 @@
+#include "Core.h"
+
+NAMESPACE_UPP
+
+#ifndef flagSO
+const Nuller Null;
+#endif
+
+#define LTIMING(x) // RTIMING(x)
+
+unsigned Value::GetHashValue() const {
+	return IsNull() ? 0 : ptr->GetHashValue();
+}
+
+Value& Value::operator=(const Value& v) {
+	if(this == &v) return *this;
+	ptr->Release();
+	ptr = v.ptr;
+	ptr->Retain();
+	return *this;
+}
+
+Value::Value(const Value& v) {
+	ptr = v.ptr;
+	ptr->Retain();
+}
+
+void Value::SetVoidVal()
+{
+	ptr = &Single<Void>();
+	ptr->Retain();
+}
+
+Value::Value() {
+	SetVoidVal();
+}
+
+Value::~Value() {
+	ptr->Release();
+}
+
+bool Value::operator==(const Value& v) const {
+	if(ptr == v.ptr) return true;
+	bool an = IsNull();
+	bool bn = v.IsNull();
+	if(an || bn) return an && bn;
+	if(GetType() == v.GetType())
+		return ptr->IsEqual(v.ptr);
+	return ptr->IsPolyEqual(v) || v.ptr->IsPolyEqual(*this);
+}
+
+Value::Value(const String& s)  { ptr = new RichValueRep<String>(s); }
+Value::Value(const WString& s) { ptr = new RichValueRep<WString>(s); }
+Value::Value(const char *s)    { ptr = new RichValueRep<String>(s); }
+Value::Value(int i)            { ptr = new RichValueRep<int>(i); }
+Value::Value(int64 i)          { ptr = new RichValueRep<int64>(i); }
+Value::Value(double d)         { ptr = new RichValueRep<double>(d); }
+Value::Value(bool b)           { ptr = new RichValueRep<bool>(b); }
+Value::Value(Date d)           { ptr = new RichValueRep<Date>(d); }
+Value::Value(Time t)           { ptr = new RichValueRep<Time>(t); }
+Value::Value(const Nuller&)    { ptr = new RichValueRep<int>(Null); }
+
+Value::operator String() const
+{
+	if(IsNull()) return Null;
+	return GetType() == WSTRING_V ? RichValue<WString>::Extract(*this).ToString()
+		                          : RichValue<String>::Extract(*this);
+}
+
+Value::operator WString() const
+{
+	if(IsNull()) return Null;
+	return GetType() == WSTRING_V ? RichValue<WString>::Extract(*this)
+		                          : RichValue<String>::Extract(*this).ToWString();
+}
+
+Value::operator Date() const
+{
+	if(IsNull()) return Null;
+	return GetType() == DATE_V ? RichValue<Date>::Extract(*this)
+		                       : Date(RichValue<Time>::Extract(*this));
+}
+
+Value::operator Time() const
+{
+	if(IsNull()) return Null;
+	return GetType() == DATE_V ? ToTime(RichValue<Date>::Extract(*this))
+		                       : RichValue<Time>::Extract(*this);
+}
+
+Value::operator double() const
+{
+	if(IsNull()) return Null;
+	return GetType() == INT_V   ? double(RichValue<int>::Extract(*this))
+	     : GetType() == BOOL_V ? double(RichValue<bool>::Extract(*this))
+	     : GetType() == INT64_V ? double(RichValue<int64>::Extract(*this))
+		                        : RichValue<double>::Extract(*this);
+}
+
+Value::operator int() const
+{
+	if(IsNull()) return Null;
+	return GetType() == INT_V   ? RichValue<int>::Extract(*this)
+	     : GetType() == BOOL_V ? int(RichValue<bool>::Extract(*this))
+	     : GetType() == INT64_V ? int(RichValue<int64>::Extract(*this))
+		                        : int(RichValue<double>::Extract(*this));
+}
+
+Value::operator int64() const
+{
+	if(IsNull()) return Null;
+	return GetType() == INT_V   ? int64(RichValue<int>::Extract(*this))
+	     : GetType() == BOOL_V ? int64(RichValue<bool>::Extract(*this))
+	     : GetType() == INT64_V ? RichValue<int64>::Extract(*this)
+		                        : int64(RichValue<double>::Extract(*this));
+}
+
+Value::operator bool() const
+{
+	if(IsNull()) return false;
+	return operator int();
+}
+
+VectorMap<dword, Value::Void *(*)(Stream& s)>& Value::Typemap()
+{
+	static VectorMap<dword, Value::Void *(*)(Stream& s)> x;
+	return x;
+}
+
+static void sRegisterStd()
+{
+	ONCELOCK {
+		RichValue<int>::Register();
+		RichValue<int64>::Register();
+		RichValue<double>::Register();
+		RichValue<String>::Register();
+		RichValue<WString>::Register();
+		RichValue<Date>::Register();
+		RichValue<Time>::Register();
+	};
+}
+
+INITBLOCK {
+	sRegisterStd();
+}
+
+
+void Value::Serialize(Stream& s) {
+	sRegisterStd();
+	dword type;
+	if(s.IsLoading()) {
+		s / type;
+		ptr->Release();
+		typedef Void* (*vp)(Stream& s);
+		vp *cr = Typemap().FindPtr(type);
+		if(cr)
+			ptr = (**cr)(s);
+		else {
+			SetVoidVal();
+			if(type != VOID_V && type != ERROR_V)
+				s.LoadError();
+		}
+	}
+	else {
+		type = GetType();
+		s / type;
+		ptr->Serialize(s);
+	}
+}
+
+void Value::Register(dword w, Void* (*c)(Stream& s)) init_ {
+#ifdef flagCHECKINIT
+	RLOG("Register valuetype " << w);
+#endif
+	AssertST();
+	ASSERT(w != UNKNOWN_V);
+	ASSERT(w < 0x8000000);
+	CHECK(Typemap().GetAdd(w, c) == c);
+}
+
+String  Value::ToString() const {
+	return ptr->AsString();
+}
+
+class ValueErrorCls : public RichValueRep<String> {
+public:
+	virtual dword      GetType() const             { return ERROR_V; }
+	virtual bool       IsNull() const              { return true; }
+	virtual void       Serialize(Stream& s)        {}
+	virtual String     AsString() const            { return "<error: \'" + v + "\'>"; }
+
+	ValueErrorCls(const String& s) : RichValueRep<String>(s)  {}
+};
+
+Value ErrorValue(const String& s) {
+	return Value(new ValueErrorCls(s));
+}
+
+Value ErrorValue(const char *s) {
+	return ErrorValue(String(s));
+}
+
+Value ErrorValue() {
+	return ErrorValue(String());
+}
+
+String GetErrorText(const Value& v) {
+	ASSERT(IsError(v));
+	return ((RichValueRep<String> *)v.GetVoidPtr())->Get();
+}
+
+// ----------------------------------
+
+struct Ref::ValueRef : public RefManager {
+	virtual int   GetType()                            { return VALUE_V; }
+	virtual Value GetValue(const void *ptr)            { return *(Value *) ptr; }
+	virtual bool  IsNull(const void *ptr)              { return UPP::IsNull(*(Value *) ptr); }
+	virtual void  SetValue(void *ptr, const Value& v)  { *(Value *) ptr = v; }
+	virtual void  SetNull(void *ptr)                   { *(Value *) ptr = Null; }
+};
+
+
+Ref::Ref(String& s)  { ptr = &s; m = &Single< RichRef<String> >(); }
+Ref::Ref(WString& s) { ptr = &s; m = &Single< RichRef<WString> >(); }
+Ref::Ref(int& i)     { ptr = &i; m = &Single< RichRef<int> >(); }
+Ref::Ref(int64& i)   { ptr = &i; m = &Single< RichRef<int64> >(); }
+Ref::Ref(double& d)  { ptr = &d; m = &Single< RichRef<double> >(); }
+Ref::Ref(Date& d)    { ptr = &d; m = &Single< RichRef<Date> >(); }
+Ref::Ref(Time& t)    { ptr = &t; m = &Single< RichRef<Time> >(); }
+
+Ref::Ref(Value& v)   { ptr = &v; m = &Single< ValueRef >(); }
+
+// ----------------------------------
+
+bool ValueArray::Data::IsNull() const
+{
+	return this == &Single<ValueArray::NullData>();
+}
+
+void ValueArray::Data::Serialize(Stream& s)
+{
+	s % data;
+}
+
+unsigned ValueArray::Data::GetHashValue() const
+{
+	CombineHash w(data.GetCount());
+	for(int i = 0; i < data.GetCount(); i++)
+		w.Put(data[i].GetHashValue());
+	return w;
+}
+
+static bool sCmp(const Vector<Value>& a, const Vector<Value>& b)
+{
+	if(&a == &b) return true;
+	if(a.GetCount() != b.GetCount()) return false;
+	for(int i = 0; i < a.GetCount(); i++)
+		if(a[i] != b[i]) return false;
+	return true;
+}
+
+bool ValueArray::Data::IsEqual(const Value::Void *p)
+{
+	return sCmp(((Data *)p)->data, data);
+}
+
+bool ValueArray::operator==(const ValueArray& v) const
+{
+	return sCmp(data->data, v.data->data);
+}
+
+static String sAsString(const Vector<Value>& v)
+{
+	String s;
+	s << "{ ";
+	for(int i = 0; i < v.GetCount(); i++) {
+		if(i) s << ", ";
+		s << v[i];
+	}
+	s << " }";
+	return s;
+}
+
+String ValueArray::Data::AsString() const
+{
+	return sAsString(data);
+}
+
+Vector<Value>& ValueArray::Create()
+{
+	data = new Data;
+	return data->data;
+}
+
+Vector<Value>& ValueArray::Clone() {
+	if(data->GetRefCount() != 1) {
+		Data *d = new Data;
+		d->data <<= data->data;
+		data->Release();
+		data = d;
+	}
+	return data->data;
+}
+
+ValueArray::ValueArray() {
+	data = &Single<NullData>();
+	data->Retain();
+}
+
+ValueArray::ValueArray(const ValueArray& v) {
+	data = v.data;
+	data->Retain();
+}
+
+ValueArray::ValueArray(const Nuller&) {
+	data = &Single<NullData>();
+	data->Retain();
+}
+
+ValueArray::ValueArray(pick_ Vector<Value>& v)
+{
+	Create() = v;
+}
+
+ValueArray::ValueArray(const Vector<Value>& v, int deep)
+{
+	Create() <<= v;
+}
+
+ValueArray::operator Value() const {
+	data->Retain();
+	return Value(data);
+}
+
+ValueArray::ValueArray(const Value& src)
+{
+	if(!UPP::IsNull(src)) {
+		if(IsType<ValueMap>(src)) {
+			ValueArray v = ValueMap(src);
+			data = v.data;
+			data->Retain();
+			return;
+		}
+		else {
+			ASSERT(dynamic_cast<const ValueArray::Data *>(src.GetVoidPtr()));
+			data = (ValueArray::Data *)src.GetVoidPtr();
+		}
+	}
+	else
+		data = &Single<NullData>();
+	data->Retain();
+}
+
+void ValueArray::Serialize(Stream& s) {
+	if(s.IsStoring())
+		Clone();
+	data->Serialize(s);
+}
+
+ValueArray::~ValueArray() {
+	ASSERT(data->GetRefCount() > 0);
+	data->Release();
+}
+
+ValueArray& ValueArray::operator=(const ValueArray& v) {
+	v.data->Retain();
+	data->Release();
+	data = v.data;
+	return *this;
+}
+
+void ValueArray::SetCount(int n) {
+	Clone().SetCount(n);
+}
+
+void ValueArray::SetCount(int n, const Value& v)
+{
+	Clone().SetCount(n, v);
+}
+
+void ValueArray::Clear() {
+	Clone().Clear();
+}
+
+void ValueArray::Add(const Value& v) {
+	Clone().Add(v);
+}
+
+void ValueArray::Set(int i, const Value& v) {
+	ASSERT(i >= 0);
+	Clone().DoIndex(i) = v;
+}
+
+void ValueArray::Remove(int i)
+{
+	Clone().Remove(i);
+}
+
+const Value& ValueArray::Get(int i) const {
+	ASSERT(i >= 0 && i < GetCount());
+	return data->data[i];
+}
+
+template<>
+String AsString(const ValueArray& v) {
+	return sAsString(v.Get());
+}
+
+INITBLOCK {
+	RichValue<ValueArray>::Register();
+}
+
+bool ValueMap::Data::IsNull() const {
+	return this == &Single<ValueMap::NullData>();
+}
+
+void ValueMap::Data::Serialize(Stream& s) {
+	s % key % value;
+}
+
+unsigned ValueMap::Data::GetHashValue() const {
+	CombineHash w(key.GetCount());
+	for(int i = 0; i < key.GetCount(); i++)
+		w.Put(key[i].GetHashValue());
+	w.Put(value.GetHashValue());
+	return w;
+}
+
+static bool sIsEqual(const Index<Value>& a, const Index<Value>& b) {
+	if(&a == &b) return true;
+	if(a.GetCount() != b.GetCount()) return false;
+	for(int i = 0; i < a.GetCount(); i++) {
+		if(a[i] != b[i]) return false;
+	}
+	return true;
+}
+
+bool ValueMap::Data::IsEqual(const Value::Void *p) {
+	return sIsEqual(((Data *)p)->key, key) && ((Data *)p)->value == value;
+}
+
+bool ValueMap::operator==(const ValueMap& v) const {
+	return sIsEqual(data->key, v.data->key) && data->value == v.data->value;
+}
+
+String ValueMap::Data::AsString() const
+{
+	String s;
+	s << "{ ";
+	for(int i = 0; i < key.GetCount(); i++) {
+		if(i) s << ", ";
+		s << "(" << key[i] << ", " << value[i] << ")";
+	}
+	s << " }";
+	return s;
+}
+
+ValueMap::Data& ValueMap::Create()
+{
+	data = new Data;
+	return *data;
+}
+
+ValueMap::Data& ValueMap::Clone() {
+	if(data->GetRefCount() != 1) {
+		Data *d = new Data;
+		d->key <<= data->key;
+		d->value = data->value;
+		data->Release();
+		data = d;
+	}
+	return *data;
+}
+
+void ValueMap::Init0()
+{
+	data = &Single<NullData>();
+	data->Retain();
+}
+
+ValueMap::ValueMap(const ValueMap& v)
+{
+	data = v.data;
+	data->Retain();
+}
+
+ValueMap::operator Value() const {
+	data->Retain();
+	return Value(data);
+}
+
+ValueMap::ValueMap(const Value& src)
+{
+	if(!IsNull(src)) {
+		if(IsType<ValueArray>(src)) {
+			ValueArray va = src;
+			Init0();
+			for(int i = 0; i < va.GetCount(); i++)
+				Add(i, va[i]);
+			return;
+		}
+		else {
+			ASSERT(dynamic_cast<const ValueMap::Data *>(src.GetVoidPtr()));
+			data = (ValueMap::Data *)src.GetVoidPtr();
+		}
+	}
+	else
+		data = &Single<NullData>();
+	data->Retain();
+}
+
+void ValueMap::Serialize(Stream& s) {
+	if(s.IsLoading()) {
+		data->Release();
+		Create();
+	}
+	data->Serialize(s);
+}
+
+ValueMap::~ValueMap() {
+	ASSERT(data->GetRefCount() > 0);
+	data->Release();
+}
+
+ValueMap& ValueMap::operator=(const ValueMap& v) {
+	v.data->Retain();
+	data->Release();
+	data = v.data;
+	return *this;
+}
+
+void ValueMap::Clear() {
+	data->Release();
+	Init0();
+}
+
+void ValueMap::Add(const Value& key, const Value& value) {
+	Data& d = Clone();
+	d.key.Add(key);
+	d.value.Add(value);
+}
+
+Value ValueMap::operator[](const Value& key) const
+{
+	int q = data->key.Find(key);
+	return q >= 0 ? data->value[q] : ErrorValue();
+}
+
+INITBLOCK {
+	RichValue<Color>::Register();
+}
+
+// ----------------------------------
+
+struct IdList : public Index<String> {
+	IdList()  { Add(String()); }
+};
+
+Index<String>& Id::Ids() {
+	return Single<IdList>();
+}
+
+static StaticCriticalSection s_ids;
+
+void Id::Set(const String& s) {
+	CriticalSection::Lock __(s_ids);
+	ndx = Ids().FindAdd(s);
+}
+
+String Id::ToString() const {
+	CriticalSection::Lock __(s_ids);
+	return Ids()[ndx];
+}
+
+const String& Id::AsString(int n) {
+	CriticalSection::Lock __(s_ids);
+	return Ids()[n];
+}
+
+Id Id::Find(const String& s) {
+	CriticalSection::Lock __(s_ids);
+	int i = Ids().Find(s);
+	if(i < 0) return Id();
+	return Id(i);
+}
+
+Id::Id(const IdConst& cnst) {
+	if(cnst.ndx > 0) {
+		ASSERT(cnst.ndx >= 0 && cnst.ndx < Ids().GetCount());
+		ndx = cnst.ndx;
+	}
+	else {
+		Set(cnst.text);
+		cnst.ndx = ndx;
+	}
+}
+
+int StdValueCompare(const Value& a, const Value& b, int language)
+{
+	LTIMING("StdValueCompare");
+
+	bool na = IsNull(a), nb = IsNull(b);
+	if(na || nb)
+		return !na ? 1 : !nb ? -1 : 0;
+	dword ta = a.GetType(), tb = b.GetType();
+	if((ta == INT_V || ta == BOOL_V) && (tb == INT_V || tb == BOOL_V))
+		return cmp<int>(a, b);
+	if((ta == BOOL_V || ta == INT_V || ta == INT64_V || ta == DOUBLE_V)
+	&& (tb == BOOL_V || tb == INT_V || tb == INT64_V || tb == DOUBLE_V))
+		return cmp<double>(a, b);
+	if(ta == DATE_V && tb == DATE_V)
+		return cmp<Date>(a, b);
+	if((ta == DATE_V || ta == TIME_V) && (tb == DATE_V || tb == TIME_V))
+		return cmp<Time>(a, b);
+	if((ta == STRING_V || ta == WSTRING_V) && (tb == STRING_V || tb == WSTRING_V))
+		return GetLanguageInfo(language).Compare(WString(a), WString(b));
+	return cmp<int>(ta, tb);
+}
+
+int StdValueCompare(const Value& a, const Value& b)
+{
+	return StdValueCompare(a, b, 0);
+}
+
+int StdValueCompareDesc(const Value& a, const Value& b, int language)
+{
+	return -StdValueCompare(a, b, language);
+}
+
+int StdValueCompareDesc(const Value& a, const Value& b)
+{
+	return -StdValueCompare(a, b);
+}
+
+StdValueOrder::StdValueOrder(int l) : language(l) {}
+StdValueOrder::~StdValueOrder() {}
+
+bool StdValueOrder::operator()(const Value& a, const Value& b) const
+{
+	return StdValueCompare(a, b, language) < 0;
+}
+
+FnValueOrder::FnValueOrder(int (*fn)(const Value& a, const Value& b)) : fn(fn) {}
+FnValueOrder::~FnValueOrder() {}
+
+bool FnValueOrder::operator()(const Value& a, const Value& b) const
+{
+	return (*fn)(a, b) < 0;
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/Core/Value.h b/uppsrc/Core/Value.h
new file mode 100644
index 000000000..c0c947948
--- /dev/null
+++ b/uppsrc/Core/Value.h
@@ -0,0 +1,707 @@
+
+struct IdConst {
+	const char *text;
+	mutable int ndx;
+};
+
+class Value;
+
+class Id : Moveable<Id> {
+protected:
+	int ndx;
+	static Index<String>& Ids();
+	void           Set(const String& s);
+
+public:
+	int            AsNdx() const              { return ndx; }
+	String         ToString() const;
+	dword          GetHashValue() const       { return ndx; }
+	bool           IsNull() const             { return ndx == 0; }
+
+	void           Serialize(Stream& s);
+
+	operator       String() const             { return ToString(); }
+	String         operator~() const          { return ToString(); }
+	bool           operator==(Id b) const     { return ndx == b.ndx; }
+	bool           operator!=(Id b) const     { return ndx != b.ndx; }
+
+	static Id            Find(const String& s);
+	static const String& AsString(int n);
+
+	operator bool() const                     { return ndx; }
+
+	Id()                                      { ndx = 0; }
+	Id(const String& s)                       { Set(s); }
+	Id(const char *s)                         { Set(s); }
+	explicit Id(int n)                        { ASSERT(n >= 0 && n < Ids().GetCount()); ndx = n; }
+	Id(const IdConst& cnst);
+};
+
+const int    INT_NULL           =    INT_MIN;
+const int64  INT64_NULL         =    INT64_MIN;
+
+const double DOUBLE_NULL        =    -1.0E+308;
+const double DOUBLE_NULL_LIM    =    -1.0E+307;
+
+class Nuller {
+public:
+	operator int() const                { return INT_NULL; }
+	operator int64() const              { return INT64_NULL; }
+	operator double() const             { return DOUBLE_NULL; }
+	operator bool() const               { return false; }
+
+	Nuller() {}
+};
+
+#ifdef flagSO
+static const Nuller Null;
+#else
+extern const Nuller Null;
+#endif
+
+template<> inline bool  IsNull(const int& i)     { return i == INT_NULL; }
+template<> inline bool  IsNull(const int64& i)   { return i == INT64_NULL; }
+template<> inline bool  IsNull(const double& r)  { return r < DOUBLE_NULL_LIM; }
+template<> inline bool  IsNull(const bool& r  )  { return false; }
+template<> inline bool  IsNull(const Date& d)    { return d.year == -32768; }
+template<> inline bool  IsNull(const Time& t)    { return t.year == -32768; }
+
+inline const String&  Nvl(const String& a, const String& b)    { return IsNull(a) ? b : a; }
+inline int            Nvl(int a, int b)                        { return IsNull(a) ? b : a; }
+inline int64          Nvl(int64 a, int64 b)                    { return IsNull(a) ? b : a; }
+inline double         Nvl(double a, double b)                  { return IsNull(a) ? b : a; }
+inline Date           Nvl(Date a, Date b)                      { return IsNull(a) ? b : a; }
+inline Time           Nvl(Time a, Time b)                      { return IsNull(a) ? b : a; }
+
+inline int            Nvl(int a)                               { return Nvl(a, 0); }
+inline int64          Nvl(int64 a)                             { return Nvl(a, (int64)0); }
+inline double         Nvl(double a)                            { return Nvl(a, 0.0); }
+
+const dword VOID_V    = 0;
+
+const dword INT_V     = 1;
+const dword DOUBLE_V  = 2;
+const dword STRING_V  = 3;
+const dword DATE_V    = 4;
+const dword TIME_V    = 5;
+
+const dword ERROR_V   = 6;
+
+const dword VALUE_V   = 7;
+
+const dword WSTRING_V = 8;
+
+const dword VALUEARRAY_V = 9;
+
+const dword INT64_V  = 10;
+const dword BOOL_V   = 11;
+
+const dword VALUEMAP_V   = 12;
+
+const dword UNKNOWN_V = (dword)0xffffffff;
+
+class Value : Moveable<Value> {
+public:
+	class Void {
+	protected:
+		Atomic  refcount;
+
+	public:
+		void               Retain()                    { AtomicInc(refcount); }
+		void               Release()                   { if(AtomicDec(refcount) == 0) delete this; }
+
+		virtual dword      GetType() const             { return VOID_V; }
+		virtual bool       IsNull() const              { return true; }
+		virtual void       Serialize(Stream& s)        {}
+		virtual unsigned   GetHashValue() const        { return 0; }
+		virtual bool       IsEqual(const Void *p)      { return false; }
+		virtual bool       IsPolyEqual(const Value& v) { return false; }
+		virtual String     AsString() const            { return ""; }
+
+		Void()                                         { AtomicWrite(refcount, 1); }
+		virtual ~Void()                                {}
+
+		friend class Value;
+	};
+
+protected:
+	static VectorMap<dword, Void* (*)(Stream& s) >& Typemap();
+
+	Void    *ptr;
+
+	void     SetVoidVal();
+
+public:
+	static  void Register(dword w, Void* (*c)(Stream& s)) init_;
+
+	dword    GetType() const         { return ptr->GetType(); }
+	bool     IsError() const         { return GetType() == ERROR_V; }
+	bool     IsVoid() const          { return GetType() == VOID_V || IsError(); }
+	bool     IsNull() const          { return ptr->IsNull(); }
+
+	template <class T>
+	bool     Is() const;
+
+	operator String() const;
+	operator WString() const;
+	operator Date() const;
+	operator Time() const;
+	operator double() const;
+	operator int() const;
+	operator int64() const;
+	operator bool() const;
+
+	Value(const String& s);
+	Value(const WString& s);
+	Value(const char *s);
+	Value(int i);
+	Value(int64 i);
+	Value(double d);
+	Value(bool b);
+	Value(Date d);
+	Value(Time t);
+	Value(const Nuller&);
+
+	bool operator==(const Value& v) const;
+	bool operator!=(const Value& v) const { return !operator==(v); }
+
+	String ToString() const;
+
+	void  Serialize(Stream& s);
+
+	unsigned GetHashValue() const;
+
+	Value& operator=(const Value& v);
+	Value(const Value& v);
+
+	Value();
+	~Value();
+
+	Value(Void *p)                        { ptr = p; }
+	const Void *GetVoidPtr() const        { return ptr; }
+};
+
+#define VALUE_COMPARE(T) \
+inline bool operator==(const Value& v, T x)   { return (T)v == x; } \
+inline bool operator==(T x, const Value& v)   { return (T)v == x; } \
+inline bool operator!=(const Value& v, T x)   { return (T)v != x; } \
+inline bool operator!=(T x, const Value& v)   { return (T)v != x; } \
+
+VALUE_COMPARE(int)
+VALUE_COMPARE(int64)
+VALUE_COMPARE(double)
+VALUE_COMPARE(bool)
+VALUE_COMPARE(Date)
+VALUE_COMPARE(Time)
+VALUE_COMPARE(String)
+VALUE_COMPARE(WString)
+
+inline bool operator==(const Value& v, const char *x)   { return (String)v == x; }
+inline bool operator==(const char *x, const Value& v)   { return (String)v == x; }
+inline bool operator!=(const Value& v, const char *x)   { return (String)v != x; }
+inline bool operator!=(const char *x, const Value& v)   { return (String)v != x; }
+
+inline bool operator==(const Value& v, const wchar *x)  { return (WString)v == x; }
+inline bool operator==(const wchar *x, const Value& v)  { return (WString)v == x; }
+inline bool operator!=(const Value& v, const wchar *x)  { return (WString)v != x; }
+inline bool operator!=(const wchar *x, const Value& v)  { return (WString)v != x; }
+
+inline bool IsVoid(const Value& v)     { return v.GetType() == VOID_V; }
+inline bool IsError(const Value& v)    { return v.GetType() == ERROR_V; }
+inline bool IsString(const Value& v)   { return v.GetType() == STRING_V || v.GetType() == WSTRING_V; }
+inline bool IsNumber(const Value& v)   { return v.GetType() == DOUBLE_V || v.GetType() == INT_V
+                                                || v.GetType() == INT64_V || v.GetType() == BOOL_V; }
+inline bool IsDateTime(const Value& v) { return v.GetType() == DATE_V || v.GetType() == TIME_V; }
+
+int StdValueCompare(const Value& a, const Value& b, int language);
+int StdValueCompare(const Value& a, const Value& b);
+
+int StdValueCompareDesc(const Value& a, const Value& b, int language);
+int StdValueCompareDesc(const Value& a, const Value& b);
+
+struct ValueOrder {
+	virtual bool operator()(const Value& a, const Value& b) const = 0;
+	virtual ~ValueOrder() {}
+};
+
+struct StdValueOrder : ValueOrder {
+	int language;
+
+	virtual bool operator()(const Value& a, const Value& b) const;
+
+	StdValueOrder(int l = -1);
+	virtual ~StdValueOrder();
+};
+
+struct FnValueOrder : ValueOrder {
+	int (*fn)(const Value& a, const Value& b);
+
+	virtual bool operator()(const Value& a, const Value& b) const;
+
+	FnValueOrder(int (*fn)(const Value& a, const Value& b));
+	virtual ~FnValueOrder();
+};
+
+template <class T>
+inline dword ValueTypeNo(const T&)       { return StaticTypeNo<T>() + 0x8000000;; }
+
+template<> inline dword ValueTypeNo(const int&)     { return INT_V; }
+template<> inline dword ValueTypeNo(const int64&)   { return INT64_V; }
+template<> inline dword ValueTypeNo(const double&)  { return DOUBLE_V; }
+template<> inline dword ValueTypeNo(const bool&)    { return BOOL_V; }
+template<> inline dword ValueTypeNo(const String&)  { return STRING_V; }
+template<> inline dword ValueTypeNo(const WString&) { return WSTRING_V; }
+template<> inline dword ValueTypeNo(const Date&)    { return DATE_V; }
+template<> inline dword ValueTypeNo(const Time&)    { return TIME_V; }
+
+template <class T, dword type, class B = EmptyClass>
+class AssignValueTypeNo : public B {
+public:
+	friend dword ValueTypeNo(const T&)                  { return type; }
+
+	void operator=(const AssignValueTypeNo&) {} // MSC 6.0 empty base class bug fix
+};
+
+template <class T>
+bool IsType(const Value& x, T* = 0)           { return ValueTypeNo(*(T *)NULL) == x.GetType(); }
+
+template <class T>
+inline bool Value::Is() const
+{
+	return IsType<T>(*this);
+}
+
+template <class T>
+class RawValueRep : public Value::Void {
+protected:
+	T v;
+
+public:
+	virtual dword GetType() const             { return ValueTypeNo(v); }
+	virtual bool  IsNull() const              { return false; }
+
+	const T& Get() const                      { return v; }
+	RawValueRep(const T& v) : v(v)            {}
+	RawValueRep()                             {}
+	static const RawValueRep *Cast(const Value::Void *p) {
+		ASSERT_(dynamic_cast<const RawValueRep *>(p),
+		        String().Cat() << "Invalid value conversion: "
+		                       << typeid(*p).name() << " -> " << typeid(T).name());
+		return (const RawValueRep *) p;
+	}
+};
+
+template <class T>
+bool IsTypeRaw(const Value& value, T * = 0) {
+	return !IsVoid(value) && dynamic_cast<const RawValueRep<T> *>(value.GetVoidPtr());
+}
+
+template <class T>
+class RawValue : public Value {
+protected:
+	typedef RawValueRep<T> Rep;
+
+	RawValue(Rep *rep) : Value(rep) {}
+
+public:
+	RawValue(const T& x) : Value(new Rep(x)) {}
+	static const T& Extract(const Value& v) {
+		return Rep::Cast(v.GetVoidPtr())->Get();
+	}
+	static const T& Extract(const Value& v, const T& dflt) {
+		return IsTypeRaw<T>(v) ? Rep::Cast(v.GetVoidPtr())->Get() : dflt;
+	}
+};
+
+template <class T>
+class RawPickValueRep : public RawValueRep<T> {
+public:
+	RawPickValueRep(pick_ T& _v)      { this->v = _v; }
+	RawPickValueRep(const T& _v, int) { this->v <<= _v; }
+	RawPickValueRep()                 {}
+};
+
+template <class T>
+class RawPickValue : public RawValue<T> {
+protected:
+	typedef RawPickValueRep<T> PickRep;
+
+public:
+	RawPickValue(pick_ T& x) : RawValue<T>(new PickRep(x)) {}
+	RawPickValue(const T& x, int) : RawValue<T>(new PickRep(x, 0)) {}
+};
+
+template <class T>
+class RawValueCreateRep : public RawValueRep<T> {
+public:
+	T& Get()                        { return this->v; }
+};
+
+template <class T>
+class RawValueCreate : public RawValue<T> {
+protected:
+	typedef RawValueCreateRep<T> Rep;
+
+public:
+	RawValueCreate() : RawValue<T>(new Rep()) {}
+	T& Get()                                     { return ((Rep *)this->GetVoidPtr())->Get(); }
+};
+
+template <class T>
+inline Value RawToValue(const T& data)           { return RawValue<T>(data); }
+
+template <class T>
+inline Value RawPickToValue(pick_ T& data)       { return RawPickValue<T>(data); }
+
+template <class T>
+inline Value RawDeepToValue(const T& data)       { return RawPickValue<T>(data, 0); }
+
+template <class T>
+inline T& CreateRawValue(Value& v) {
+	RawValueCreate<T> x;
+	v = x;
+	return x.Get();
+}
+
+template <class T>
+inline const T& ValueTo(const Value& v, T * = 0)       { return RawValue<T>::Extract(v); }
+
+template <class T>
+inline const T& ValueTo(const Value& v, const T& dflt) { return RawValue<T>::Extract(v, dflt); }
+
+template <class T>
+inline bool IsPolyEqual(const T& x, const Value& v) {
+	return false;
+}
+
+template <class T>
+inline unsigned ValueGetHashValue(const T& x) {
+	return UPP::GetHashValue(x);
+}
+
+inline bool IsPolyEqual(const bool& x, const Value& v) {
+	return v.GetType() == DOUBLE_V && int(x) == double(v)
+	    || v.GetType() == INT64_V && int(x) == int64(v)
+	    || v.GetType() == INT_V && int(x) == int(v);
+}
+
+inline bool IsPolyEqual(const int& x, const Value& v) {
+	return v.GetType() == DOUBLE_V && x == double(v)
+	    || v.GetType() == INT64_V && x == int64(v);
+}
+
+inline bool IsPolyEqual(const int64& x, const Value& v) {
+	return v.GetType() == DOUBLE_V && double(x) == double(v);
+}
+
+inline bool IsPolyEqual(const Date& x, const Value& v) {
+	return v.GetType() == TIME_V && ToTime(x) == Time(v);
+}
+
+inline bool IsPolyEqual(const WString& x, const Value& v) {
+	return v.GetType() == STRING_V && WString(v) == x;
+}
+
+inline unsigned ValueGetHashValue(const bool& x) {
+	return UPP::GetHashValue((double)x);
+}
+
+inline unsigned ValueGetHashValue(const int& x) {
+	return UPP::GetHashValue((double)x);
+}
+
+inline unsigned ValueGetHashValue(const int64& x) {
+	return UPP::GetHashValue((double)x);
+}
+
+inline unsigned ValueGetHashValue(const Date& x) {
+	return UPP::GetHashValue(ToTime(x));
+}
+
+inline unsigned ValueGetHashValue(const String& x) { // Improve by specialized routines !!!
+	return UPP::GetHashValue((WString)x);
+}
+
+template <class T>
+class RichValueRep : public RawValueRep<T> {
+public:
+	virtual bool       IsNull() const                { return UPP::IsNull(this->v); }
+	virtual void       Serialize(Stream& s)          { s % this->v; }
+	virtual unsigned   GetHashValue() const          { return UPP::ValueGetHashValue(this->v); }
+	virtual bool       IsEqual(const Value::Void *p) { return Cast(p)->Get() == this->v; }
+	virtual bool       IsPolyEqual(const Value& b)   { return UPP::IsPolyEqual(this->v, b); }
+	virtual String     AsString() const              { return UPP::AsString(this->v); }
+
+	RichValueRep(const T& v) : RawValueRep<T>(v)     {}
+	RichValueRep(Stream& s)                          { Serialize(s); }
+
+	static Value::Void *Create(Stream& s)            { return new RichValueRep(s); }
+	static const RichValueRep *Cast(const Value::Void *p) {
+		ASSERT_(dynamic_cast<const RichValueRep *>(p),
+		        String().Cat() << "Invalid value conversion: "
+		                       << typeid(*p).name() << " -> " << typeid(T).name());
+		return (const RichValueRep *) p;
+	}
+};
+
+template <class T>
+class RichValue : public Value {
+protected:
+	typedef RichValueRep<T> Rep;
+
+	static const T& GetNull() {
+		static T *q;
+		ONCELOCK {
+			static T x(Null);
+			q = &x;
+		}
+		return *q;
+	}
+
+public:
+	RichValue(const T& x) : Value(new Rep(x)) {}
+	const T& Get(const Value& v) {
+		if(IsNull(v)) return GetNull();
+		return Rep::Cast(v.GetVoidPtr())->Get();
+	}
+	static void Register() init_ {
+		Value::Register(ValueTypeNo(*(T *)NULL), Rep::Create);
+	}
+	static const T& Extract(const Value& v) {
+		if(v.IsNull()) return GetNull();
+		return Rep::Cast(v.GetVoidPtr())->Get();
+	}
+};
+
+template <class T>
+inline Value RichToValue(const T& data)                   { return RichValue<T>(data); }
+
+Value ErrorValue(const char *s);
+Value ErrorValue(const String& s);
+Value ErrorValue();
+
+String GetErrorText(const Value& v);
+
+inline bool          IsNull(const Value& v)               { return v.IsNull(); }
+inline const Value&  Nvl(const Value& a, const Value& b)  { return IsNull(a) ? b : a; }
+
+Value Scan(dword stdtype, const String& text);
+
+// ----------------------- Ref
+
+struct RefManager {
+	virtual int   GetType() = 0;
+	virtual Value GetValue(const void *)            { return Null; }
+	virtual bool  IsNull(const void *)              { return false; }
+	virtual void  SetValue(void *, const Value& v)  { NEVER(); }
+	virtual void  SetNull(void *)                   { NEVER(); }
+	virtual ~RefManager() {}
+};
+
+
+template <class T>
+struct RawRef : public RefManager {
+	virtual void  SetValue(void *p, const Value& v) { *(T *) p = RawValue<T>::Extract(v); }
+	virtual Value GetValue(const void *p)           { return RawValue<T>(*(const T *) p); }
+	virtual int   GetType()                         { return ValueTypeNo(*(T *)NULL); }
+	virtual ~RawRef() {}
+};
+
+template <class T>
+struct RichRef : public RawRef<T> {
+	virtual Value GetValue(const void *p)           { return RichValue<T>(*(T *) p); }
+	virtual bool  IsNull(const void *p)             { return UPP::IsNull(*(T *) p); }
+	virtual void  SetValue(void *p, const Value& v) { *(T *) p = T(v); }
+	virtual void  SetNull(void *p)                  { *(T *) p = T(Null); }
+};
+
+class Ref : Moveable<Ref> {
+protected:
+	RefManager *m;
+	void       *ptr;
+	struct      ValueRef;
+
+public:
+	dword    GetType() const           { return m ? m->GetType() : VOID_V; }
+	operator Value() const             { return m ? m->GetValue(ptr) : Value(); }
+	bool     IsNull() const            { return m ? m->IsNull(ptr) : true; }
+
+	void    *GetVoidPtr() const        { return ptr; }
+
+	void     SetNull()                 { if(m) m->SetNull(ptr); }
+	void     SetValue(const Value& v)  { ASSERT(m); m->SetValue(ptr, v); }
+
+	Ref&     operator=(const Value& v) { SetValue(v); return *this; }
+
+	Ref(String& s);
+	Ref(WString& s);
+	Ref(int& i);
+	Ref(int64& i);
+	Ref(double& d);
+	Ref(Date& d);
+	Ref(Time& t);
+	Ref(Value& v);
+	Ref(void *_ptr, RefManager *_m)    { ptr = _ptr, m = _m; }
+	Ref()                              { ptr = m = NULL; }
+};
+
+template <class T>
+T& GetRef(Ref r, T *x = NULL) {
+	ASSERT(ValueTypeNo(*x) == r.GetType());
+	return *(T *) r.GetVoidPtr();
+}
+
+inline String&  RefString(Ref f)  { return GetRef<String>(f); }
+inline WString& RefWString(Ref f) { return GetRef<WString>(f); }
+inline int&     RefInt(Ref f)     { return GetRef<int>(f); }
+inline int64&   RefInt64(Ref f)   { return GetRef<int64>(f); }
+inline double&  RefDouble(Ref f)  { return GetRef<double>(f); }
+inline Date&    RefDate(Ref f)    { return GetRef<Date>(f); }
+inline Time&    RefTime(Ref f)    { return GetRef<Time>(f); }
+inline Value&   RefValue(Ref f)   { ASSERT(f.GetType() == VALUE_V);
+                                    return *(Value *)f.GetVoidPtr(); }
+
+template <class T>
+Ref RawAsRef(T& x) {
+	return Ref(&x, &Single< RawRef<T> >());
+}
+
+template <class T>
+Ref RichAsRef(T& x) {
+	return Ref(&x, &Single< RichRef<T> >());
+}
+
+#define E__Value(I)   Value p##I
+#define E__Ref(I)     Ref p##I
+
+// ---------------------- Value Array
+
+class ValueArray : AssignValueTypeNo<ValueArray, VALUEARRAY_V, Moveable<ValueArray> > {
+	struct Data : Value::Void {
+		virtual dword      GetType() const             { return VALUEARRAY_V; }
+		virtual bool       IsNull() const;
+		virtual void       Serialize(Stream& s);
+		virtual unsigned   GetHashValue() const;
+		virtual bool       IsEqual(const Value::Void *p);
+		virtual String     AsString() const;
+
+		int GetRefCount() const     { return AtomicRead(refcount); }
+
+		Vector<Value> data;
+	};
+	struct NullData : Data {};
+	Data *data;
+
+	Vector<Value>& Create();
+	Vector<Value>& Clone();
+
+public:
+	ValueArray();
+	ValueArray(const ValueArray& v);
+	explicit ValueArray(pick_ Vector<Value>& values);
+	explicit ValueArray(const Vector<Value>& values, int deep);
+	~ValueArray();
+
+	ValueArray& operator=(const ValueArray& v);
+
+	operator Value() const;
+	ValueArray(const Value& src);
+
+	ValueArray(const Nuller&);
+	bool IsNull() const                       { return data->IsNull(); }
+
+	void Clear();
+	void SetCount(int n);
+	void SetCount(int n, const Value& v);
+	int  GetCount() const                     { return data->data.GetCount(); }
+	bool IsEmpty() const                      { return data->data.IsEmpty(); }
+
+	void Add(const Value& v);
+	void Set(int i, const Value& v);
+	void Remove(int i);
+	const Value& Get(int i) const;
+	const Vector<Value>& Get() const          { return data->data; }
+
+	const Value& operator[](int i) const      { return Get(i); }
+
+	unsigned GetHashValue() const             { return data->GetHashValue(); }
+	void  Serialize(Stream& s);
+
+	bool operator==(const ValueArray& v) const;
+	bool operator!=(const ValueArray& v) const  { return !operator==(v); }
+};
+
+template<> inline unsigned GetHashValue(const ValueArray& v) { return v.GetHashValue(); }
+template<> inline bool     IsNull(const ValueArray& v)       { return v.IsNull(); }
+
+template<>
+String AsString(const ValueArray& v);
+
+class ValueMap : AssignValueTypeNo<ValueMap, VALUEMAP_V, Moveable<ValueMap> >{
+	struct Data : Value::Void {
+		virtual dword      GetType() const             { return VALUEMAP_V; }
+		virtual bool       IsNull() const;
+		virtual void       Serialize(Stream& s);
+		virtual unsigned   GetHashValue() const;
+		virtual bool       IsEqual(const Value::Void *p);
+		virtual String     AsString() const;
+
+		int GetRefCount() const     { return AtomicRead(refcount); }
+
+		Index<Value> key;
+		ValueArray   value;
+	};
+
+	struct NullData : Data {};
+	Data *data;
+
+	Data& Create();
+	Data& Clone();
+	void  Init0();
+
+public:
+	ValueMap()                               { Init0(); }
+	ValueMap(const ValueMap& v);
+	~ValueMap();
+
+	ValueMap& operator=(const ValueMap& v);
+
+	operator Value() const;
+	ValueMap(const Value& src);
+
+	ValueMap(const Nuller&)                  { Init0(); }
+	bool IsNullInstance() const              { return data->IsNull(); }
+
+	void Clear();
+
+	void Add(const Value& key, const Value& value);
+	void Add(const char *s, const Value& value) { Add(Value(s), value); }
+	void Add(Id id, const Value& value)       { Add(Value(id.ToString()), value); }
+
+	const Index<Value>& GetKeys() const       { return data->key; }
+	ValueArray GetValues() const              { return data->value; }
+
+	operator ValueArray() const               { return GetValues(); }
+
+	Value operator[](const Value& k) const;
+	Value operator[](const char *s) const     { return operator[](Value(s)); }
+	Value operator[](const Id& k) const       { return operator[](Value(k.ToString())); }
+
+	unsigned GetHashValue() const             { return data->GetHashValue(); }
+	void     Serialize(Stream& s);
+	String   ToString() const                 { return data->AsString(); }
+
+	bool operator==(const ValueMap& v) const;
+	bool operator!=(const ValueMap& v) const  { return !operator==(v); }
+};
+
+inline bool IsValueArray(const Value& v) { return v.GetType() == VALUEARRAY_V || v.GetType() == VALUEMAP_V; }
+inline bool IsValueMap(const Value& v)   { return IsValueArray(v); }
+
+
+class ValueGen {
+public:
+	virtual Value  Get() = 0;
+	Value operator++()                           { return Get(); }
+	virtual ~ValueGen() {}
+};
diff --git a/uppsrc/Core/Vcont.cpp b/uppsrc/Core/Vcont.cpp
new file mode 100644
index 000000000..9fc228e2d
--- /dev/null
+++ b/uppsrc/Core/Vcont.cpp
@@ -0,0 +1,54 @@
+#include "Core.h"
+
+NAMESPACE_UPP
+
+struct Vector_ {
+	void *vector;
+	int   items;
+	int   alloc;
+};
+
+void VectorReAlloc_(void *v_, int newalloc, int sizeofT)
+{
+	Vector_ *v = (Vector_*)v_;
+	ASSERT(newalloc >= v->items);
+	ASSERT(v->items >= 0); // Pick semantics broken
+	size_t sz0 = newalloc * sizeofT;
+	size_t sz = sz0;
+	void *newvector = newalloc ? MemoryAllocSz(sz) : NULL;
+//	v->alloc = /*(sz - sz0) / sizeofT + */newalloc; //Benchmark...
+	v->alloc = (int)((sz - sz0) / sizeofT + newalloc); //Benchmark...
+	if(v->vector)
+		memcpy(newvector, v->vector, v->items * sizeofT);
+	v->vector = newvector;
+}
+
+void VectorReAllocF_(void *v_, int newalloc, int sizeofT)
+{
+	Vector_ *v = (Vector_*)v_;
+	void *prev = v->vector;
+	VectorReAlloc_(v, newalloc, sizeofT);
+	MemoryFree(prev);
+}
+
+void VectorGrow_(void *v_, int sizeofT)
+{
+	Vector_ *v = (Vector_*)v_;
+#ifdef _DEBUG
+	VectorReAlloc_(v, max(v->alloc + 1, 2 * v->alloc), sizeofT);
+#else
+	VectorReAlloc_(v, max(v->alloc + 1, int(v->alloc + ((unsigned)v->alloc >> 1))), sizeofT);
+//	VectorReAlloc_(v, max(v->alloc + 1, max(2 * v->alloc, 16 / sizeofT)), sizeofT);
+//	VectorReAlloc_(v, max(v->alloc + 1, 2 * v->alloc), sizeofT);
+#endif
+}
+
+void VectorGrowF_(void *v_, int sizeofT)
+{
+	Vector_ *v = (Vector_*)v_;
+	void *prev = v->vector;
+	VectorGrow_(v, sizeofT);
+	MemoryFree(prev);
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/Core/Vcont.h b/uppsrc/Core/Vcont.h
new file mode 100644
index 000000000..28210c43c
--- /dev/null
+++ b/uppsrc/Core/Vcont.h
@@ -0,0 +1,398 @@
+template <class T>
+class Vector : public MoveableAndDeepCopyOption< Vector<T> > {
+	T       *vector;
+	int      items;
+	int      alloc;
+
+	static void    RawFree(T *ptr)            { if(ptr) MemoryFree(ptr); }
+	static T      *RawAlloc(int& n);
+	static Vector& SetPicked(pick_ Vector& v) { Vector& p = (Vector&)(v); p.items = -1; p.vector = NULL; return p; }
+
+	void     Pick(pick_ Vector<T>& v);
+
+	T       *Rdd()                           { return vector + items++; }
+
+	void     Free();
+	void     __DeepCopy(const Vector& src);
+	T&       Get(int i) const        { ASSERT(i >= 0 && i < items); return vector[i]; }
+	void     Chk() const             { ASSERT_(items >= 0, "Broken pick semantics"); }
+	void     ReAlloc(int alloc);
+	void     ReAllocF(int alloc);
+	void     Grow();
+	void     GrowF();
+	void     GrowAdd(const T& x);
+	void     GrowAddPick(pick_ T& x);
+	void     RawInsert(int q, int count);
+
+public:
+	T&       Add()                   { Chk(); if(items >= alloc) GrowF(); return *(::new(vector + items++) T); }
+	void     Add(const T& x)         { Chk(); if(items < alloc) DeepCopyConstruct(Rdd(), x); else GrowAdd(x); }
+	void     AddPick(pick_ T& x)     { Chk(); if(items < alloc) ::new(Rdd()) T(x); else GrowAddPick(x); }
+	void     AddN(int n);
+	const T& operator[](int i) const { return Get(i); }
+	T&       operator[](int i)       { return Get(i); }
+	int      GetCount() const        { Chk(); return items; }
+	bool     IsEmpty() const         { Chk(); return items == 0; }
+	void     Trim(int n);
+	void     SetCount(int n);
+	void     SetCount(int n, const T& init);
+	void     SetCountR(int n);
+	void     SetCountR(int n, const T& init);
+	void     Clear();
+
+	T&       At(int i)                  { if(i >= items) SetCountR(i + 1); return (*this)[i]; }
+	T&       At(int i, const T& x)      { if(i >= items) SetCountR(i + 1, x); return (*this)[i]; }
+
+	void     Shrink()                   { if(items != alloc) ReAllocF(items); }
+	void     Reserve(int n);
+	int      GetAlloc() const           { return alloc; }
+
+	void     Set(int i, const T& x, int count = 1);
+	void     Remove(int i, int count = 1);
+	void     Remove(const int *sorted_list, int n);
+	void     Remove(const Vector<int>& sorted_list);
+	void     InsertN(int i, int count = 1);
+	T&       Insert(int i)           { InsertN(i); return Get(i); }
+	void     Insert(int i, const T& x, int count = 1);
+	void     Insert(int i, const Vector& x);
+	void     Insert(int i, const Vector& x, int offset, int count);
+	void     InsertPick(int i, pick_ Vector& x);
+	void     Append(const Vector& x)               { Insert(GetCount(), x); }
+	void     Append(const Vector& x, int o, int c) { Insert(GetCount(), x, o, c); }
+	void     AppendPick(pick_ Vector& x)           { InsertPick(GetCount(), x); }
+	int      GetIndex(const T& item) const; //deprecated
+	void     Swap(int i1, int i2)    { UPP::Swap(Get(i1), Get(i2)); }
+
+	void     Drop(int n = 1)         { ASSERT(n <= GetCount()); Trim(items - n); }
+	T&       Top()                   { ASSERT(GetCount()); return Get(items - 1); }
+	const T& Top() const             { ASSERT(GetCount()); return Get(items - 1); }
+	T        Pop()                   { T h = Top(); Drop(); return h; }
+
+	operator T*()                    { return (T*)vector; }
+	operator const T*() const        { return (T*)vector; }
+
+	Vector&  operator<<(const T& x)  { Add(x); return *this; }
+	Vector&  operator|(pick_ T& x)   { AddPick(x); return *this; }
+
+#ifdef UPP
+	void     Serialize(Stream& s)    { StreamContainer(s, *this); }
+#endif
+
+	Vector()                         { vector = NULL; items = alloc = 0; }
+	~Vector() {
+//		if(items >= 0 && (alloc - items) * sizeof(T) > 16)
+//			RLOG("~Vector, waste: " << (alloc - items) * sizeof(T)
+//			    << ", items: " << items << ", alloc: " << alloc << ", sizeof(T): " << sizeof(T)
+//			    << ", " << typeid(T).name()); //TODO remove
+		Free();
+		return; // Constraints:
+		T t(*vector);        // T must have transfer constructor (also GCC 4.0 bug workaround)
+		AssertMoveable(&t);  // T must be moveable
+	}
+
+// Pick assignment & copy. Picked source can only do Clear(), ~Vector(), operator=, operator <<=
+	Vector(pick_ Vector& v)          { Pick(v); }
+	void operator=(pick_ Vector& v)  { Free(); Pick(v); }
+	bool IsPicked() const            { return items < 0; }
+
+// Deep copy
+	Vector(const Vector& v, int)     { __DeepCopy(v); }
+
+// Standard container interface
+	typedef T        ValueType;
+	typedef T       *Iterator;
+	typedef const T *ConstIterator;
+
+	ConstIterator    Begin() const          { return (T*)vector; }
+	ConstIterator    End() const            { return (T*)vector + items; }
+	ConstIterator    GetIter(int i) const   { ASSERT(i >= 0 && i <= items); return Begin() + i; }
+	Iterator         Begin()                { return (T*)vector; }
+	Iterator         End()                  { return (T*)vector + items; }
+	Iterator         GetIter(int i)         { ASSERT(i >= 0 && i <= items); return Begin() + i; }
+
+// Optimizations
+	friend void Swap(Vector& a, Vector& b)  { UPP::Swap(a.items, b.items); UPP::Swap(a.alloc, b.alloc); UPP::Swap(a.vector, b.vector); }
+	friend void Append(Vector& dst, const Vector& src)         { dst.Append(src); }
+
+//obsolete names
+	T&       DoIndex(int i)             { return At(i); }
+	T&       DoIndex(int i, const T& x) { return At(i, x); }
+
+	STL_VECTOR_COMPATIBILITY(Vector<T>)
+};
+
+template <class T>
+class Array : public MoveableAndDeepCopyOption< Array<T> > {
+protected:
+	Vector<void *> vector;
+
+	void     Free();
+	void     __DeepCopy(const Array& v);
+	T&       Get(int i) const                           { return *(T *)vector[i]; }
+	void     Del(void **ptr, void **lim)                { while(ptr < lim) delete (T *) *ptr++; }
+	void     Init(void **ptr, void **lim)               { while(ptr < lim) *ptr++ = new T; }
+	void     Init(void **ptr, void **lim, const T& x)   { while(ptr < lim) *ptr++ = DeepCopyNew(x); }
+
+public:
+	T&       Add()                      { T *q = new T; vector.Add(q); return *q; }
+	void     Add(const T& x)            { vector.Add(DeepCopyNew(x)); }
+	void     AddPick(pick_ T& x)        { vector.Add(new T(x)); }
+	T&       Add(T *newt)               { vector.Add(newt); return *newt; }
+	template<class TT> TT& Create()     { TT *q = new TT; Add(q); return *q; }
+	const T& operator[](int i) const    { return Get(i); }
+	T&       operator[](int i)          { return Get(i); }
+	int      GetCount() const           { return vector.GetCount(); }
+	bool     IsEmpty() const            { return vector.IsEmpty(); }
+	void     Trim(int n);
+	void     SetCount(int n);
+	void     SetCount(int n, const T& init);
+	void     SetCountR(int n);
+	void     SetCountR(int n, const T& init);
+	void     Clear()                    { Free(); vector.Clear(); }
+
+	T&       At(int i)                  { if(i >= GetCount()) SetCountR(i + 1); return Get(i); }
+	T&       At(int i, const T& x)      { if(i >= GetCount()) SetCountR(i + 1, x); return Get(i); }
+
+	void     Shrink()                   { vector.Shrink(); }
+	void     Reserve(int xtra)          { vector.Reserve(xtra); }
+	int      GetAlloc() const           { return vector.GetAlloc(); }
+
+	void     Set(int i, const T& x, int count = 1);
+	void     Remove(int i, int count = 1);
+	void     Remove(const int *sorted_list, int n);
+	void     Remove(const Vector<int>& sorted_list);
+	void     InsertN(int i, int count = 1);
+	T&       Insert(int i)              { InsertN(i); return Get(i); }
+	void     Insert(int i, const T& x, int count = 1);
+	void     Insert(int i, const Array& x);
+	void     Insert(int i, const Array& x, int offset, int count);
+	void     Append(const Array& x)               { Insert(GetCount(), x); }
+	void     Append(const Array& x, int o, int c) { Insert(GetCount(), x, o, c); }
+	void     InsertPick(int i, pick_ Array& x)    { vector.InsertPick(i, x.vector); }
+	void     AppendPick(pick_ Array& x)           { Insert(GetCount(), x); }
+	int      GetIndex(const T& item) const;
+	void     Swap(int i1, int i2)       { UPP::Swap(vector[i1], vector[i2]); }
+	void     Move(int i1, int i2);
+
+	T       *Detach(int i)              { T *t = &Get(i); vector.Remove(i); return t; }
+	T&       Set(int i, T *newt)        { delete (T *)vector[i]; vector[i] = newt; return *newt; }
+	void     Insert(int i, T *newt);
+
+	void     Drop(int n = 1)            { Trim(GetCount() - n); }
+	T&       Top()                      { return Get(GetCount() - 1); }
+	const T& Top() const                { return Get(GetCount() - 1); }
+//	T        Pop()                      { T h = Top(); Drop(); return h; } // msvc bug
+	T       *PopDetach()                { return (T *) vector.Pop(); }
+
+	void     Swap(Array& b)             { Swap(vector, b.vector); }
+
+	Array& operator<<(const T& x)       { Add(x); return *this; }
+	Array& operator<<(T *newt)          { Add(newt); return *this; }
+	Array& operator|(pick_ T& x)        { AddPick(x); return *this; }
+
+	bool     IsPicked() const           { return vector.IsPicked(); }
+
+#ifdef UPP
+	void     Serialize(Stream& s)       { StreamContainer(s, *this); }
+#endif
+
+	Array()                             {}
+	~Array()                            { Free(); }
+
+// Pick assignment & copy. Picked source can only Clear(), ~Vector(), operator=, operator<<=
+	Array(pick_ Array& v) : vector(v.vector)  {}
+	void operator=(pick_ Array& v)            { Free(); vector = v.vector; }
+
+// Deep copy
+	Array(const Array& v, int)          { __DeepCopy(v); }
+
+	class Iterator;
+
+	class ConstIterator {
+	protected:
+		T **ptr;
+		ConstIterator(T **p)                    { ptr = p; }
+
+		friend class Array<T>;
+		struct NP { int dummy; };
+
+	public:
+		const T& operator*() const              { return **ptr; }
+		const T *operator->() const             { return *ptr; }
+		const T& operator[](int i) const        { return *ptr[i]; }
+
+		ConstIterator& operator++()             { ptr++; return *this; }
+		ConstIterator& operator--()             { ptr--; return *this; }
+		ConstIterator  operator++(int)          { ConstIterator t = *this; ++*this; return t; }
+		ConstIterator  operator--(int)          { ConstIterator t = *this; --*this; return t; }
+
+		ConstIterator& operator+=(int i)        { ptr += i; return *this; }
+		ConstIterator& operator-=(int i)        { ptr -= i; return *this; }
+
+		ConstIterator operator+(int i) const    { return ptr + i; }
+		ConstIterator operator-(int i) const    { return ptr - i; }
+
+		int  operator-(ConstIterator x) const   { return (int)(ptr - x.ptr); }
+
+		bool operator==(ConstIterator x) const  { return ptr == x.ptr; }
+		bool operator!=(ConstIterator x) const  { return ptr != x.ptr; }
+		bool operator<(ConstIterator x) const   { return ptr < x.ptr; }
+		bool operator>(ConstIterator x) const   { return ptr > x.ptr; }
+		bool operator<=(ConstIterator x) const  { return ptr <= x.ptr; }
+		bool operator>=(ConstIterator x) const  { return ptr >= x.ptr; }
+
+		operator bool() const                   { return ptr; }
+
+		ConstIterator()                         {}
+		ConstIterator(NP *null)                 { ASSERT(null == NULL); ptr = NULL; }
+	};
+
+	class Iterator : public ConstIterator {
+		friend class Array<T>;
+		Iterator(T **p) : ConstIterator(p)      {}
+		typedef ConstIterator B;
+		struct NP { int dummy; };
+
+	public:
+		T& operator*()                          { return **B::ptr; }
+		T *operator->()                         { return *B::ptr; }
+		T& operator[](int i)                    { return *B::ptr[i]; }
+
+		const T& operator*() const              { return **B::ptr; }
+		const T *operator->() const             { return *B::ptr; }
+		const T& operator[](int i) const        { return *B::ptr[i]; }
+
+		Iterator& operator++()                  { B::ptr++; return *this; }
+		Iterator& operator--()                  { B::ptr--; return *this; }
+		Iterator  operator++(int)               { Iterator t = *this; ++*this; return t; }
+		Iterator  operator--(int)               { Iterator t = *this; --*this; return t; }
+
+		Iterator& operator+=(int i)             { B::ptr += i; return *this; }
+		Iterator& operator-=(int i)             { B::ptr -= i; return *this; }
+
+		Iterator operator+(int i) const         { return B::ptr + i; }
+		Iterator operator-(int i) const         { return B::ptr - i; }
+
+		int      operator-(Iterator x) const    { return B::operator-(x); }
+
+		Iterator()                               {}
+		Iterator(NP *null) : ConstIterator(null) {}
+
+	//G++
+	//	friend void IterSwap(Iterator a, Iterator b) { UPP::Swap(*a.ptr, *b.ptr); }
+	};
+
+// Standard container interface
+	typedef T        ValueType;
+	Iterator         Begin()                    { return (T **)vector.Begin(); }
+	Iterator         End()                      { return (T **)vector.End(); }
+	Iterator         GetIter(int pos)           { return (T **)vector.GetIter(pos); }
+	ConstIterator    Begin() const              { return (T **)vector.Begin(); }
+	ConstIterator    End() const                { return (T **)vector.End(); }
+	ConstIterator    GetIter(int pos) const     { return (T **)vector.GetIter(pos); }
+
+// Optimalization
+	friend void Swap(Array& a, Array& b)                   { UPP::Swap(a.vector, b.vector); }
+	//GCC forced move from Iterator, ugly workaround
+private:
+	static void IterSwap0(Iterator a, Iterator b)          { UPP::Swap(*a.ptr, *b.ptr); }
+public:
+	friend void IterSwap(Iterator a, Iterator b)           { Array<T>::IterSwap0(a, b); }
+
+//obsolete names
+	T&       DoIndex(int i)             { return At(i); }
+	T&       DoIndex(int i, const T& x) { return At(i, x); }
+
+	STL_VECTOR_COMPATIBILITY(Array<T>)
+};
+
+template<class T, int NBLK = 16>
+class Segtor : public MoveableAndDeepCopyOption< Segtor<T, NBLK> > {
+protected:
+	struct Block {
+		byte item[NBLK][sizeof(T)];
+	};
+
+	Array<Block> block;
+	int          items;
+
+	void  DoRange(unsigned beg, unsigned end, void (*fn)(T*, const T*));
+	void  Fill(unsigned beg, unsigned end, const T& x);
+	T&    Get(int i) const {
+		ASSERT(i >= 0 && i < items);
+		return *(T*) block[unsigned(i) / NBLK].item[unsigned(i) % NBLK];
+	}
+	void *Add0()				     {
+		int blk = unsigned(items) / NBLK, ndx = unsigned(items) % NBLK;
+		if(ndx == 0) block.Add(); items++;
+		return block[blk].item[ndx];
+	}
+	void  Del(int n)              { if(n < items) DoRange(n, items, DestroyArray); }
+	void  Init(int n)             { if(n > items) DoRange(items, n, ConstructArray); items = n; }
+	void  Init(int n, const T& x) { if(n > items) Fill(items, n, x); items = n; }
+	void  Free();
+
+public:
+	T&       Add()                          { return *::new(Add0()) T; }
+	void     Add(const T& x)                { DeepCopyConstruct(Add0(), x); }
+	void     AddPick(pick_ T& x)            { ::new(Add0()) T; }
+	T&       operator[](int i)              { return Get(i); }
+	const T& operator[](int i) const        { return Get(i); }
+	int      GetCount() const               { return items; }
+	bool     IsEmpty() const                { return items == 0; }
+	void     SetCount(int n);
+	void     SetCount(int n, const T& init);
+	void     Clear();
+	T&       At(int i)                      { if(i >= items) SetCount(i + 1); return Get(i); }
+	T&       At(int i, const T& x)          { if(i >= items) SetCount(i + 1, x); return Get(i); }
+	void     Shrink()                       { block.Shrink(); }
+	void     Reserve(int xtra)              { block.Reserve((xtra + NBLK - 1) / NBLK); }
+	int      GetAlloc() const               { return block.GetAlloc() * NBLK; }
+
+	void     Set(int i, const T& x, int count = 1);
+	int      GetIndex(const T& item) const;
+
+	void     Drop(int n = 1)                { ASSERT(n <= GetCount()); SetCount(GetCount() - n); }
+	T&       Top()                          { ASSERT(GetCount()); return Get(GetCount() - 1); }
+	const T& Top() const                    { ASSERT(GetCount()); return Get(GetCount() - 1); }
+	T        Pop()                          { T h = Top(); Drop(); return h; }
+
+	void     Swap(Segtor& b)                { block.Swap(b.block); Swap(items, b.items); }
+
+	Segtor& operator<<(const T& x)          { Add(x); return *this; }
+	Segtor& operator|(pick_ T& x)           { AddPick(x); return *this; }
+
+	bool     IsPicked() const               { return block.IsPicked(); }
+
+#ifdef UPP
+	void     Serialize(Stream& s)           { StreamContainer(s, *this); }
+#endif
+
+	Segtor()                                { items = 0; }
+	Segtor(pick_ Segtor& s) : block(s.block), items(s.items) {}
+	Segtor(const Segtor& s, int);
+	~Segtor();
+
+// Standard iterators
+	typedef ConstIIterator<Segtor> ConstIterator;
+	typedef IIterator<Segtor>      Iterator;
+
+// Standard container interface
+	typedef T        ValueType;
+	ConstIterator    Begin() const              { return ConstIterator(*this, 0); }
+	ConstIterator    End() const                { return ConstIterator(*this, items); }
+	ConstIterator    GetIter(int pos) const     { return ConstIterator(*this, pos); }
+	Iterator         Begin()                    { return Iterator(*this, 0); }
+	Iterator         End()                      { return Iterator(*this, items); }
+	Iterator         GetIter(int pos)           { return Iterator(*this, pos); }
+
+// Optimizations
+	friend void Swap(Segtor& a, Segtor& b)      { a.Swap(b); }
+
+//obsolete names
+	T&       DoIndex(int i)             { return At(i); }
+	T&       DoIndex(int i, const T& x) { return At(i, x); }
+
+// traits
+	STL_VECTOR_COMPATIBILITY(Segtor<T _cm_ NBLK>)
+};
diff --git a/uppsrc/Core/Vcont.hpp b/uppsrc/Core/Vcont.hpp
new file mode 100644
index 000000000..0c34fec9a
--- /dev/null
+++ b/uppsrc/Core/Vcont.hpp
@@ -0,0 +1,720 @@
+void VectorReAlloc_(void *vector_, int newalloc, int sizeofT);
+void VectorReAllocF_(void *vector_, int newalloc, int sizeofT);
+void VectorGrow_(void *vector_, int sizeofT);
+void VectorGrowF_(void *vector_, int sizeofT);
+
+template <class T>
+T * Vector<T>::RawAlloc(int& n)
+{
+	size_t sz0 = n * sizeof(T);
+	size_t sz = sz0;
+	void *q = MemoryAllocSz(sz);
+	n += (int)((sz - sz0) / sizeof(T));
+	return (T *)q;
+}
+
+template <class T>
+void Vector<T>::ReAlloc(int newalloc)
+{
+	VectorReAlloc_(this, newalloc, sizeof(T));
+}
+
+template <class T>
+void Vector<T>::ReAllocF(int newalloc)
+{
+	VectorReAllocF_(this, newalloc, sizeof(T));
+}
+
+template <class T>
+void Vector<T>::Grow()
+{
+	VectorGrow_(this, sizeof(T));
+}
+
+template <class T>
+void Vector<T>::GrowF()
+{
+	VectorGrowF_(this, sizeof(T));
+}
+
+template <class T>
+void Vector<T>::Pick(pick_ Vector<T>& v)
+{
+	vector = v.vector;
+	items = v.items;
+	alloc = v.alloc;
+	SetPicked(v);
+}
+
+template <class T>
+int  Vector<T>::GetIndex(const T& item) const
+{
+	Chk();
+	if(vector == NULL) return -1;
+	int n = &item - vector;
+	return n >= 0 && n < items ? n : -1;
+}
+
+template <class T>
+void Vector<T>::Reserve(int n)
+{
+	if(n > alloc)
+		ReAllocF(n);
+}
+
+template <class T>
+void Vector<T>::Free() {
+	if(vector && items >= 0)
+		DestroyArray((T *)vector, (T *)vector + items);
+	RawFree(vector);
+}
+
+template <class T>
+void Vector<T>::Clear() {
+	if(vector && items >= 0)
+		SetCount(0);
+	else {
+		alloc = items = 0;
+		vector = NULL;
+	}
+}
+
+template <class T>
+void Vector<T>::__DeepCopy(const Vector& src) {
+	src.Chk();
+	items = alloc = src.items;
+	if(src.vector) {
+		vector = RawAlloc(alloc);
+		DeepCopyConstructArray(vector, src.vector, src.vector + items);
+	}
+	else
+		vector = NULL;
+}
+
+template <class T>
+void Vector<T>::GrowAdd(const T& x) {
+	T *prev = vector;
+	Grow();
+	DeepCopyConstruct(Rdd(), x);
+	RawFree(prev);
+}
+
+template <class T>
+void Vector<T>::GrowAddPick(pick_ T& x) {
+	T *prev = vector;
+	Grow();
+	::new(Rdd()) T(x);
+	RawFree(prev);
+}
+
+template <class T> inline
+void Vector<T>::AddN(int n)
+{
+	Chk();
+	ASSERT(n >= 0);
+	if(items + n <= alloc) {
+		ConstructArray(vector + items, vector + items + n);
+		items += n;
+	}
+	else
+		SetCountR(items + n);
+}
+
+template <class T>
+void Vector<T>::Trim(int n)
+{
+	ASSERT(n >= 0 && n <= items);
+	DestroyArray(vector + n, vector + items);
+	items = n;
+}
+
+template <class T>
+void Vector<T>::SetCount(int n) {
+	Chk();
+	ASSERT(n >= 0);
+	if(n == items) return;
+	if(n < items)
+		Trim(n);
+	else {
+		if(n > alloc) ReAllocF(n);
+		ConstructArray(vector + items, vector + n);
+		items = n;
+	}
+}
+
+template <class T>
+void Vector<T>::SetCount(int n, const T& init) {
+	Chk();
+	ASSERT(n >= 0);
+	if(n == items) return;
+	if(n < items)
+		DestroyArray(vector + n, vector + items);
+	else {
+		if(n > alloc) {
+			T *prev = vector;
+			ReAlloc(n);
+			DeepCopyConstructFill(vector + items, vector + n, init);
+			RawFree(prev);
+		}
+		else
+			DeepCopyConstructFill(vector + items, vector + n, init);
+	}
+	items = n;
+}
+
+template <class T>
+void Vector<T>::SetCountR(int n) {
+	Chk();
+	if(n + items > alloc)
+		ReAllocF(alloc + ntl_max(alloc, n - items));
+	SetCount(n);
+}
+
+template <class T>
+void Vector<T>::SetCountR(int n, const T& init) {
+	Chk();
+	ASSERT(n >= 0);
+	if(n == items) return;
+	if(n < items)
+		DestroyArray(vector + n, vector + items);
+	else
+		if(n > alloc) {
+			T *prev = vector;
+			ReAlloc(alloc + ntl_max(alloc, n - items));
+			DeepCopyConstructFill(vector + items, vector + n, init);
+			RawFree(prev);
+		}
+		else
+			DeepCopyConstructFill(vector + items, vector + n, init);
+	items = n;
+}
+
+template <class T>
+void Vector<T>::Remove(int q, int count) {
+	Chk();
+	ASSERT(q >= 0 && q <= items - count && count >= 0);
+	if(count == 0) return;
+	DestroyArray(vector + q, vector + q + count);
+	memmove(vector + q, vector + q + count, (items - q - count) * sizeof(T));
+	items -= count;
+}
+
+template <int size>
+class Data_S_ {
+	byte filler[size];
+};
+
+template <class T>
+void Vector<T>::Remove(const int *sorted_list, int n)
+{
+	Chk();
+	if(!n) return;
+	int pos = *sorted_list;
+	int npos = pos;
+	for(;;) {
+		ASSERT(pos < items);
+		if(pos == *sorted_list) {
+			(vector + pos)->T::~T();
+			pos++;
+			sorted_list++;
+			if(--n == 0) break;
+			ASSERT(*sorted_list >= pos);
+		}
+		else
+			*((Data_S_<sizeof(T)>*)vector + npos++)
+				= *((Data_S_<sizeof(T)>*)vector + pos++);
+	}
+	while(pos < items)
+		*((Data_S_<sizeof(T)>*)vector + npos++) = *((Data_S_<sizeof(T)>*)vector + pos++);
+	items = npos;
+}
+
+template <class T>
+void Vector<T>::Remove(const Vector<int>& v)
+{
+	Remove(v, v.GetCount());
+}
+
+template <class T>
+void Vector<T>::RawInsert(int q, int count)
+{
+	ASSERT(count >= 0);
+	ASSERT(q >= 0 && q <= items);
+	if(!count) return;
+	if(items + count > alloc) {
+		T *newvector = RawAlloc(alloc = alloc + ntl_max(alloc, count));
+		if(vector) {
+			memcpy(newvector, vector, q * sizeof(T));
+			memcpy(newvector + q + count, vector + q, (items - q) * sizeof(T));
+			RawFree(vector);
+		}
+		vector = newvector;
+	}
+	else
+		memmove(vector + q + count, vector + q, (items - q) * sizeof(T));
+	items += count;
+}
+
+template <class T>
+void Vector<T>::InsertN(int q, int count) {
+	ASSERT(count >= 0);
+	ASSERT(q >= 0 && q <= items);
+	RawInsert(q, count);
+	ConstructArray(vector + q, vector + q + count);
+}
+
+template <class T>
+void Vector<T>::Insert(int q, const T& x, int count) {
+	if(!count) return;
+	ASSERT(&x < vector || &x > vector + items);
+	RawInsert(q, count);
+	DeepCopyConstructFill(vector + q, vector + q + count, x);
+}
+
+template <class T>
+void Vector<T>::Insert(int q, const Vector& x, int offset, int count) {
+	ASSERT(offset >= 0 && count >= 0 && offset + count <= x.GetCount());
+	ASSERT(!vector || x.vector != vector);
+	RawInsert(q, count);
+	DeepCopyConstructArray(vector + q, x.vector + offset, x.vector + offset + count);
+}
+
+template <class T>
+void Vector<T>::Insert(int q, const Vector& x) {
+	if(!x.GetCount()) return;
+	Insert(q, x, 0, x.GetCount());
+}
+
+template <class T>
+void Vector<T>::InsertPick(int i, pick_ Vector<T>& v) {
+	Chk();
+	v.Chk();
+	ASSERT(!vector || v.vector != vector);
+	if(v.items) {
+		RawInsert(i, v.items);
+		memcpy(vector + i, v.vector, sizeof(T) * v.items);
+	}
+	RawFree(v.vector);
+	SetPicked(v);
+}
+
+template <class T>
+void Vector<T>::Set(int i, const T& x, int count) {
+	Chk();
+	ASSERT(i >= 0 && count >= 0);
+	if(count == 0) return;
+	if(&x >= vector && &x < vector + items) {
+		T copy = x;
+		At(i + count - 1);
+		Fill(vector + i, vector + i + count, copy);
+	}
+	else {
+		At(i + count - 1);
+		Fill(vector + i, vector + i + count, x);
+	}
+}
+
+// ------------------
+
+template <class T>
+void Array<T>::Free() {
+	if(IsPicked()) return;
+	for(int i = 0; i < vector.GetCount(); i++)
+		delete (T *) vector[i];
+}
+
+template <class T>
+void Array<T>::__DeepCopy(const Array<T>& v) {
+	int n = v.GetCount();
+	vector.SetCount(n);
+	for(int i = 0; i < n; i++)
+		vector[i] = DeepCopyNew(v[i]);
+}
+
+template <class T>
+void  Array<T>::Trim(int n)
+{
+	ASSERT(n >= 0 && n <= GetCount());
+	Del(vector.Begin() + n, vector.End());
+	vector.Trim(n);
+}
+
+template <class T>
+void Array<T>::SetCount(int n) {
+	ASSERT(n >= 0);
+	int  lc = vector.GetCount();
+	Del(vector.Begin() + n, vector.End());
+	vector.SetCount(n);
+	Init(vector.Begin() + lc, vector.Begin() + n);
+}
+
+template <class T>
+void Array<T>::SetCount(int n, const T& init) {
+	ASSERT(n >= 0);
+	int  lc = vector.GetCount();
+	Del(vector.Begin() + n, vector.End());
+	vector.SetCount(n);
+	Init(vector.Begin() + lc, vector.Begin() + n, init);
+}
+
+template <class T>
+void Array<T>::SetCountR(int n) {
+	ASSERT(n >= 0);
+	int  lc = vector.GetCount();
+	Del(vector.Begin() + n, vector.End());
+	vector.SetCountR(n);
+	Init(vector.Begin() + lc, vector.Begin() + n);
+}
+
+template <class T>
+void Array<T>::SetCountR(int n, const T& init) {
+	ASSERT(n >= 0);
+	int  lc = vector.GetCount();
+	Del(vector.Begin() + n, vector.End());
+	vector.SetCountR(n);
+	Init(vector.Begin() + lc, vector.Begin() + n, init);
+}
+
+template <class T>
+int  Array<T>::GetIndex(const T& item) const {
+	for(void * const *ptr = vector.Begin(); ptr < vector.End(); ptr++)
+		if(*ptr == (void *)&item) return (int)(ptr - vector.Begin());
+	return -1;
+}
+
+template <class T>
+void Array<T>::Move(int i1, int i2) {
+	void *q = vector[i1];
+	vector.Remove(i1);
+	vector.Insert(i2 - (i2 > i1)) = q;
+}
+
+template <class T>
+void Array<T>::Remove(int i, int count) {
+	ASSERT(i + count <= GetCount() && count >= 0 && i >= 0);
+	Del(vector.Begin() + i, vector.Begin() + i + count);
+	vector.Remove(i, count);
+}
+
+template <class T>
+void Array<T>::Remove(const int *sorted_list, int n)
+{
+	const int *q = sorted_list;
+	const int *e = sorted_list + n;
+	while(q < e) {
+		ASSERT(*q >= 0 && *q < GetCount());
+		delete (T *)vector[*q++];
+	}
+	vector.Remove(sorted_list, n);
+}
+
+template <class T>
+void Array<T>::Remove(const Vector<int>& sorted_list)
+{
+	Remove(sorted_list, sorted_list.GetCount());
+}
+
+template <class T>
+void Array<T>::Set(int i, const T& x, int count) {
+	ASSERT(i >= 0 && count >= 0);
+	if(i + count >= GetCount())
+		SetCountR(i + count);
+	for(void **ptr = vector.Begin() + i; ptr < vector.Begin() + i + count; ptr++) {
+		delete (T *) *ptr;
+		*ptr = new T(x);
+	}
+}
+
+template <class T>
+void Array<T>::InsertN(int i, int count) {
+	ASSERT(i >= 0 && count >= 0);
+	vector.InsertN(i, count);
+	Init(vector.Begin() + i, vector.Begin() + i + count);
+}
+
+template <class T>
+void Array<T>::Insert(int i, const T& x, int count) {
+	vector.InsertN(i, count);
+	Init(vector.Begin() + i, vector.Begin() + i + count, x);
+}
+
+template <class T>
+void Array<T>::Insert(int i, T *newt) {
+	vector.InsertN(i, 1);
+	vector[i] = newt;
+}
+
+template <class T>
+void Array<T>::Insert(int i, const Array& x) {
+	Insert(i, x, 0, x.GetCount());
+}
+
+template <class T>
+void Array<T>::Insert(int i, const Array& x, int offset, int count) {
+	vector.InsertN(i, count);
+	for(int q = 0; q < count; q++)
+		vector[q + i] = DeepCopyNew(x[q + offset]);
+}
+
+// ------------------
+
+template <class T, int NBLK>
+Segtor<T, NBLK>::Segtor(const Segtor& s, int) {
+	items = s.items;
+	block.SetCount((items + NBLK - 1) / NBLK);
+	int q = items / NBLK;
+	int r = items % NBLK;
+	int i;
+	for(i = 0; i < q; i++) {
+		T *a = (T *) s.block[i].item;
+		DeepCopyConstructArray((T *) block[i].item, a, a + NBLK);
+	}
+	if(r) {
+		T *a = (T *) s.block[q].item;
+		DeepCopyConstructArray((T *) block[i].item, a, a + r);
+	}
+}
+
+template <class T, int NBLK>
+void Segtor<T, NBLK>::Free() {
+	int q = items / NBLK;
+	int r = items % NBLK;
+	int i;
+	for(i = 0; i < q; i++) {
+		T *a = (T *) block[i].item;
+		DestroyArray(a, a + NBLK);
+	}
+	if(r) {
+		T *a = (T *) block[i].item;
+		DestroyArray(a, a + r);
+	}
+}
+
+template <class T, int NBLK>
+Segtor<T, NBLK>::~Segtor() {
+	if(IsPicked()) return;
+	Free();
+}
+
+template <class T, int NBLK>
+void Segtor<T, NBLK>::DoRange(unsigned beg, unsigned end, void (*fn)(T*, const T*)) {
+	ASSERT(beg <= end);
+	int bblk = beg / NBLK, bidx = beg % NBLK;
+	int eblk = end / NBLK, eidx = end % NBLK;
+	if(eblk == block.GetCount()) {
+		ASSERT(eidx == 0);
+		eblk--;
+		eidx = NBLK;
+	}
+	ASSERT(eblk < block.GetCount());
+	T *tp = (T *)block[bblk].item;
+	if(bblk != eblk) {
+		(*fn)(tp + bidx, tp + NBLK);
+		while(++bblk < eblk) {
+			tp = (T *)block[bblk].item;
+			(*fn)(tp, tp + NBLK);
+		}
+		tp = (T *)block[bblk].item;
+		(*fn)(tp, tp + eidx);
+	}
+	else
+		(*fn)(tp + bidx, tp + eidx);
+}
+
+template <class T, int NBLK>
+void Segtor<T, NBLK>::Fill(unsigned beg, unsigned end, const T& x) {
+	ASSERT(beg <= end);
+	int bblk = beg / NBLK, bidx = beg % NBLK;
+	int eblk = end / NBLK, eidx = end % NBLK;
+	if(eblk == block.GetCount()) {
+		ASSERT(eidx == 0);
+		eblk--;
+		eidx = NBLK;
+	}
+	ASSERT(eblk < block.GetCount());
+	T *tp = (T *)block[bblk].item;
+	if(bblk != eblk) {
+		DeepCopyConstructFill(tp + bidx, tp + NBLK, x);
+		while(++bblk < eblk) {
+			tp = (T *)block[bblk].item;
+			DeepCopyConstructFill(tp, tp + NBLK, x);
+		}
+		tp = (T *)block[bblk].item;
+		DeepCopyConstructFill(tp, tp + eidx, x);
+	}
+	else
+		DeepCopyConstructFill(tp + bidx, tp + eidx, x);
+}
+
+template <class T, int NBLK>
+void Segtor<T, NBLK>::SetCount(int n) {
+	Del(n);
+	block.SetCount((n + NBLK - 1) / NBLK);
+	Init(n);
+}
+
+template <class T, int NBLK>
+void Segtor<T, NBLK>::SetCount(int n, const T& init) {
+	Del(n);
+	block.SetCount((n + NBLK - 1) / NBLK);
+	Init(n, init);
+}
+
+template <class T, int NBLK>
+void Segtor<T, NBLK>::Clear() {
+	if(!IsPicked())
+		Free();
+	items = 0;
+	block.Clear();
+}
+
+template <class T, int NBLK>
+void Segtor<T, NBLK>::Set(int i, const T& x, int count) {
+	ASSERT(i >= 0 && count >= 0);
+	DoIndex(i + count - 1);
+	Iterator q(*this, i);
+	while(count--)
+		*q++ = x;
+}
+
+template <class T, int NBLK>
+int Segtor<T, NBLK>::GetIndex(const T& item) const {
+	for(int i = 0; i < block.GetCount(); i++) {
+		T *q = (T *) block[i].item;
+		if(&item >= q && &item < q + NBLK)
+			return &item - q + NBLK * i;
+	}
+	return -1;
+}
+
+// ------------------
+
+template <class T>
+void BiVector<T>::ReAlloc(int newalloc) {
+	ASSERT(items <= newalloc && items >= 0);
+	T *newvector = newalloc ? (T *) new byte[newalloc * sizeof(T)] : NULL;
+	if(items) {
+		int end = start + items;
+		if(end <= alloc)
+			memcpy(newvector, vector + start, (end - start) * sizeof(T));
+		else {
+			memcpy(newvector, vector + start, (alloc - start) * sizeof(T));
+			memcpy(newvector + alloc - start, vector, (end - alloc) * sizeof(T));
+		}
+		delete[] (byte *)vector;
+	}
+	vector = newvector;
+	alloc = newalloc;
+	start = 0;
+}
+
+template <class T>
+void BiVector<T>::DeepCopy0(const BiVector& src) {
+	alloc = items = src.items;
+	vector = alloc ? (T *) new byte[alloc * sizeof(T)] : NULL;
+	if(items) {
+		int end = src.start + src.items;
+		if(end <= src.alloc)
+			DeepCopyConstructArray(vector, src.vector + src.start, src.vector + end);
+		else {
+			DeepCopyConstructArray(vector, src.vector + src.start, src.vector + src.alloc);
+			DeepCopyConstructArray(vector + src.alloc - src.start, src.vector,
+				                   src.vector + end - src.alloc);
+		}
+	}
+	start = 0;
+}
+
+template <class T>
+void BiVector<T>::Clear() {
+	Free();
+	start = items = alloc = 0;
+	vector = NULL;
+}
+
+template <class T>
+void BiVector<T>::Add0() {
+	ASSERT(items >= 0);
+	if(items >= alloc)
+		ReAlloc(ntl_max(2 * items, 4));
+	items++;
+}
+
+template <class T>
+void BiVector<T>::Shrink() {
+	ASSERT(items >= 0);
+	if(items < alloc)
+		ReAlloc(items);
+}
+
+template <class T>
+void BiVector<T>::Reserve(int n) {
+	ASSERT(items >= 0);
+	n += items;
+	if(n > alloc)
+		ReAlloc(n);
+}
+
+template <class T>
+void BiVector<T>::Free() {
+	if(vector && items >= 0) {
+		int end = start + items;
+		if(end <= alloc)
+			DestroyArray(vector + start, vector + end);
+		else {
+			DestroyArray(vector + start, vector + alloc);
+			DestroyArray(vector, vector + end - alloc);
+		}
+		delete[] (byte *)vector;
+	}
+}
+
+#ifdef UPP
+template <class T>
+void BiVector<T>::Serialize(Stream& s) {
+	int n = items;
+	s / n;
+	if(s.IsLoading()) {
+		Clear();
+		while(n--)
+			s % AddTail();
+	}
+	else
+		for(int i = 0; i < items; i++)
+			s % operator[](i);
+}
+#endif
+
+// ------------------
+
+template <class T>
+void BiArray<T>::Free() {
+	if(!bv.IsPicked())
+		for(int i = 0; i < GetCount(); i++)
+			delete (T *) bv[i];
+}
+
+template <class T>
+void BiArray<T>::DeepCopy0(const BiArray<T>& v) {
+	int n = v.GetCount();
+	bv.Clear();
+	bv.Reserve(v.GetCount());
+	for(int i = 0; i < n; i++)
+		bv.AddTail() = DeepCopyNew(v[i]);
+}
+
+#ifdef UPP
+template <class T>
+void BiArray<T>::Serialize(Stream& s) {
+	int n = bv.GetCount();
+	s / n;
+	if(s.IsLoading()) {
+		Clear();
+		while(n--)
+			s % AddTail();
+	}
+	else
+		for(int i = 0; i < bv.GetCount(); i++)
+			s % operator[](i);
+}
+#endif
diff --git a/uppsrc/Core/WString.cpp b/uppsrc/Core/WString.cpp
new file mode 100644
index 000000000..d764ecfbd
--- /dev/null
+++ b/uppsrc/Core/WString.cpp
@@ -0,0 +1,388 @@
+#include "Core.h"
+
+NAMESPACE_UPP
+
+wchar *WString0::Alloc(int& count)
+{
+	if(count <= SMALL) {
+		count = SMALL;
+		wchar *p = (wchar *)MemoryAlloc48();
+		return p;
+	}
+	size_t sz = sizeof(Atomic) + (count + 1) * sizeof(wchar);
+	Atomic *rc = (Atomic *)MemoryAlloc(sz);
+	count = ((int)(sz - sizeof(Atomic)) >> 1) - 1;
+	*rc = 1;
+	return (wchar *)(rc + 1);
+}
+
+void WString0::Free()
+{
+	if(alloc > 0)
+		if(IsRc()) {
+			Atomic& rc = Rc();
+			if(AtomicDec(rc) == 0)
+				MemoryFree(&rc);
+		}
+		else
+			MemoryFree48(ptr);
+}
+
+#ifdef _DEBUG
+void WString0::Dsyn()
+{
+	WString *d_str = static_cast<WString *>(this);
+	d_str->s = Begin();
+	d_str->len = GetCount();
+}
+#endif
+
+wchar *WString0::Insert(int pos, int count, const wchar *s)
+{
+	ASSERT(pos >= 0 && count >= 0 && pos <= GetCount());
+	int newlen = length + count;
+	if(newlen < alloc && !IsShared() && (!s || s < ptr || s > ptr + length)) {
+		if(pos < length)
+			memmove(ptr + pos + count, ptr + pos, (length - pos) * sizeof(wchar));
+		length = newlen;
+		ptr[newlen] = 0;
+		if(s)
+			memcpy(ptr + pos, s, count * sizeof(wchar));
+		Dsyn();
+		return ptr + pos;
+	}
+	int all = max(2 * length, newlen);
+	wchar *p = Alloc(all);
+	if(pos > 0)
+		memcpy(p, ptr, pos * sizeof(wchar));
+	if(pos < length)
+		memcpy(p + pos + count, ptr + pos, (length - pos) * sizeof(wchar));
+	if(s)
+		memcpy(p + pos, s, count * sizeof(wchar));
+	ASSERT(pos + count <= all);
+	p[newlen] = 0;
+	Free();
+	ptr = p;
+	length = newlen;
+	alloc = all;
+	Dsyn();
+	return ptr + pos;
+}
+
+void WString0::Set(const WString0& src)
+{
+	if(src.alloc <= 0) {
+		static wchar h[2];
+		ptr = h;
+		length = 0;
+		alloc = src.alloc;
+		Dsyn();
+		return;
+	}
+	if(src.length == 0) {
+		Zero();
+		return;
+	}
+	length = src.length;
+	alloc = src.alloc;
+	if(src.IsRc()) {
+		ptr = src.ptr;
+		AtomicInc(Rc());
+	}
+	else {
+		ptr = (wchar *)MemoryAlloc48();
+		qword *t = (qword *)ptr;
+		qword *s = (qword *)src.ptr;
+		t[0] = s[0];
+		t[1] = s[1];
+		t[2] = s[2];
+		t[3] = s[3];
+		t[4] = s[4];
+		t[5] = s[5];
+	}
+	Dsyn();
+}
+
+void WString0::Cat(const wchar *s, int l)
+{
+	if(length + l >= alloc || IsShared())
+		Insert(length, l, s);
+	else {
+		memcpy(ptr + length, s, l * sizeof(wchar));
+		ptr[length += l] = 0;
+	}
+	Dsyn();
+}
+
+void WString0::LCat(int c)
+{
+	*Insert(length, 1, NULL) = c;
+}
+
+void WString0::Set(const wchar *s, int l)
+{
+	alloc = length = l;
+	memcpy(ptr = Alloc(alloc), s, l * sizeof(wchar));
+	ptr[l] = 0;
+	Dsyn();
+}
+
+void WString0::UnShare()
+{
+	if(!IsShared()) return;
+	int al = length;
+	wchar *p = Alloc(al);
+	memcpy(p, ptr, (length + 1) * sizeof(wchar));
+	Free();
+	ptr = p;
+	alloc = al;
+}
+
+void WString0::Set(int pos, int ch)
+{
+	ASSERT(pos >= 0 && pos < GetCount());
+	UnShare();
+	ptr[pos] = ch;
+}
+
+void WString0::Trim(int pos)
+{
+	ASSERT(pos >= 0 && pos <= GetCount());
+	UnShare();
+	length = pos;
+	ptr[pos] = 0;
+	Dsyn();
+}
+
+void WString0::Remove(int pos, int count)
+{
+	ASSERT(pos >= 0 && count >= 0 && pos + count <= GetCount());
+	UnShare();
+	memmove(ptr + pos, ptr + pos + count, (GetCount() - pos - count + 1) * sizeof(wchar));
+	length -= count;
+	Dsyn();
+}
+
+void WString0::Insert(int pos, const wchar *s, int count)
+{
+	Insert(pos, count, s);
+	Dsyn();
+}
+
+int WString0::Compare(const WString0& s) const
+{
+	const wchar *a = Begin();
+	const wchar *ae = a + GetLength();
+	const wchar *b = s.Begin();
+	const wchar *be = b + s.GetLength();
+	for(;;) {
+		if(a >= ae)
+			return b >= be ? 0 : -1;
+		if(b >= be)
+			return 1;
+		int q = cmpval__(*a++) - cmpval__(*b++);
+		if(q)
+			return q;
+	}
+}
+
+WString& WString::operator=(const wchar *s)
+{
+	int  len = GetCount();
+	wchar *str = (wchar *)Begin();
+	if(s >= str && s <= str + len)
+		return *this = WString(s, strlen__(s));
+	WString0::Free();
+	WString0::Set(s, strlen__(s));
+	return *this;
+}
+
+WString::WString(WStringBuffer& b)
+{
+	length = b.GetLength();
+	ptr = b.begin;
+	ptr[length] = 0;
+	alloc = b.GetAlloc();
+	b.Zero();
+	Dsyn();
+}
+
+WString::WString(const char *s) {
+	Zero();
+	*this = ToUnicode(s, s ? (int)strlen(s) : 0, CHARSET_DEFAULT);
+}
+
+WString::WString(const char *s, int n) {
+	Zero();
+	*this = ToUnicode(s, n, CHARSET_DEFAULT);
+}
+
+WString::WString(const char *s, const char *lim) {
+	Zero();
+	*this = ToUnicode(s, s ? (int)(lim - s) : 0, CHARSET_DEFAULT);
+}
+
+String WString::ToString() const
+{
+	return FromUnicode(*this, CHARSET_DEFAULT);
+}
+
+Atomic WString0::voidptr[2] = { 0, 0 };
+
+WString WString::GetVoid()
+{
+	WString b;
+	b.alloc = -1;
+	return b;
+}
+
+WString::WString(const std::wstring& s)
+{
+	if(sizeof(std::wstring::value_type) == sizeof(wchar)) {
+		WString0::Set((wchar *)s.c_str(), (int)s.length());
+	}
+	else {
+		WString0::Zero();
+		std::wstring::const_iterator i = s.begin();
+		while(i < s.end())
+			Cat(*i++);
+	}
+}
+
+WString::operator std::wstring() const
+{
+	if(sizeof(std::wstring::value_type) == sizeof(wchar))
+		return std::wstring((std::wstring::value_type *)Begin(),
+		                    (std::wstring::value_type *)End());
+	else {
+		std::wstring r;
+		const wchar *s = Begin();
+		while(s < End())
+			r += *s++;
+		return r;
+	}
+}
+
+void WStringBuffer::Zero()
+{
+	static wchar h[2];
+	begin = end = limit = h;
+}
+
+wchar *WStringBuffer::Alloc(int count, int& alloc)
+{
+	if(count <= 23) {
+		wchar *s = (wchar *)MemoryAlloc48();
+		alloc = WString0::SMALL;
+		return s;
+	}
+	else {
+		size_t sz = sizeof(Atomic) + (count + 1) * sizeof(wchar);
+		Atomic *rc = (Atomic *)MemoryAlloc(sz);
+		alloc = ((int)(sz - sizeof(Atomic)) >> 1) - 1;
+		*rc = 1;
+		return (wchar *)(rc + 1);
+	}
+}
+
+void WStringBuffer::Free()
+{
+	int all = (int)(limit - begin);
+	if(all == WString0::SMALL)
+		MemoryFree48(begin);
+	if(all > WString0::SMALL)
+		MemoryFree((Atomic *)begin - 1);
+}
+
+void WStringBuffer::Expand(int n, const wchar *cat, int l)
+{
+	int al;
+	int ep = (int)(end - begin);
+	wchar *p = Alloc(n, al);
+	memcpy(p, begin, GetLength() * sizeof(wchar));
+	if(cat) {
+		memcpy(p + ep, cat, l * sizeof(wchar));
+		ep += l;
+	}
+	Free();
+	begin = p;
+	end = begin + ep;
+	limit = begin + al;
+}
+
+void WStringBuffer::Expand()
+{
+	Expand(GetLength() * 2);
+}
+
+void WStringBuffer::SetLength(int l)
+{
+	if(l > (limit - begin))
+		Expand(l);
+	end = begin + l;
+}
+
+void WStringBuffer::Cat(const wchar *s, int l)
+{
+	if(end + l > limit)
+		Expand(max(GetLength(), l) + GetLength(), s, l);
+	else {
+		memcpy(end, s, l * sizeof(wchar));
+		end += l;
+	}
+}
+
+void WStringBuffer::Cat(int c, int l)
+{
+	if(end + l > limit)
+		Expand(max(GetLength(), l) + GetLength(), NULL, l);
+	memsetw(end, c, l);
+	end += l;
+}
+
+void WStringBuffer::Set(WString& s)
+{
+	s.UnShare();
+	int l = s.GetLength();
+	begin = s.ptr;
+	end = begin + l;
+	limit = begin + s.GetAlloc();
+	s.Zero();
+}
+
+WString TrimLeft(const WString& str)
+{
+	const wchar *s = str;
+	if(!IsSpace(*s))
+		return s;
+	while(IsSpace(*s)) s++;
+	return WString(s, str.End());
+}
+
+WString TrimRight(const WString& str)
+{
+	if(str.IsEmpty())
+		return str;
+	const wchar *s = str.Last();
+	if(!IsSpace(*s))
+		return str;
+	while(s >= ~str && IsSpace(*s)) s--;
+	return WString(~str, s + 1);
+}
+
+struct WStringICompare__
+{
+	int operator()(wchar a, wchar b) const { return ToUpper(a) - ToUpper(b); }
+};
+
+int CompareNoCase(const WString& a, const WString& b)
+{
+	return IterCompare(a.Begin(), a.End(), b.Begin(), b.End(), WStringICompare__());
+}
+
+int CompareNoCase(const WString& a, const wchar *b)
+{
+	return IterCompare(a.Begin(), a.End(), b, b + wstrlen(b), WStringICompare__());
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/Core/Win32Util.cpp b/uppsrc/Core/Win32Util.cpp
new file mode 100644
index 000000000..a668e9273
--- /dev/null
+++ b/uppsrc/Core/Win32Util.cpp
@@ -0,0 +1,220 @@
+#include "Core.h"
+
+NAMESPACE_UPP
+
+#ifdef PLATFORM_WIN32
+
+static HINSTANCE app_instance;
+
+HINSTANCE AppGetHandle()
+{
+	if(!app_instance)
+		app_instance = GetModuleHandle(NULL);
+	return app_instance;
+}
+
+void AppSetHandle(HINSTANCE dll_instance) { app_instance = dll_instance; }
+
+#ifndef PLATFORM_WINCE
+bool IsWin2K()
+{
+	OSVERSIONINFO of;
+	of.dwOSVersionInfoSize = sizeof(of);
+	GetVersionEx(&of);
+	return of.dwMajorVersion >= 5;
+}
+
+bool IsWinXP()
+{
+	OSVERSIONINFO of;
+	of.dwOSVersionInfoSize = sizeof(of);
+	GetVersionEx(&of);
+	return of.dwMajorVersion > 5 || of.dwMajorVersion == 5 && of.dwMinorVersion >= 1;
+}
+
+bool IsWinVista()
+{
+	OSVERSIONINFO of;
+	of.dwOSVersionInfoSize = sizeof(of);
+	GetVersionEx(&of);
+	return of.dwMajorVersion >= 6;
+}
+#endif
+
+String AsString(const wchar_t *buffer) {
+	if(!buffer)
+		return Null;
+	return AsString(buffer, (int)wcslen(buffer));
+}
+
+String AsString(const wchar_t *buffer, int count) { // Convert with code page...
+	if(!buffer)
+		return Null;
+	StringBuffer temp(count);
+	for(char *p = temp, *e = p + count; p < e;)
+		*p++ = (char)*buffer++;
+	return temp;
+}
+
+String AsString(const wchar_t *buffer, const wchar_t *end) {
+	if(!buffer)
+		return Null;
+	return AsString(buffer, (int)(end - buffer));
+}
+
+#ifndef PLATFORM_WINCE
+String GetWinRegString(const char *value, const char *path, HKEY base_key) {
+	HKEY key = 0;
+	if(RegOpenKeyEx(base_key, path, 0, KEY_READ, &key) != ERROR_SUCCESS)
+		return String::GetVoid();
+	dword type, data;
+	if(RegQueryValueEx(key, value, 0, &type, NULL, &data) != ERROR_SUCCESS)
+	{
+		RegCloseKey(key);
+		return String::GetVoid();
+	}
+	StringBuffer raw_data(data);
+	if(RegQueryValueEx(key, value, 0, 0, (byte *)~raw_data, &data) != ERROR_SUCCESS)
+	{
+		RegCloseKey(key);
+		return String::GetVoid();
+	}
+	if(data > 0 && (type == REG_SZ || type == REG_EXPAND_SZ))
+		data--;
+	raw_data.SetLength(data);
+	RegCloseKey(key);
+	return raw_data;
+}
+
+int GetWinRegInt(const char *value, const char *path, HKEY base_key) {
+	HKEY key = 0;
+	if(RegOpenKeyEx(base_key, path, 0, KEY_READ, &key) != ERROR_SUCCESS)
+		return Null;
+	int data;
+	dword type, length = sizeof(data);
+	if(RegQueryValueEx(key, value, 0, &type, (byte *)&data, &length) != ERROR_SUCCESS)
+		data = Null;
+	RegCloseKey(key);
+	return data;
+}
+
+bool SetWinRegString(const String& string, const char *value, const char *path, HKEY base_key) {
+	HKEY key = 0;
+	if(RegCreateKeyEx(base_key, path, 0, NULL, REG_OPTION_NON_VOLATILE,
+		KEY_ALL_ACCESS, NULL, &key, NULL) != ERROR_SUCCESS)
+		return false;
+	bool ok = (RegSetValueEx(key, value, 0,	REG_SZ, string, string.GetLength() + 1) == ERROR_SUCCESS);
+	RegCloseKey(key);
+	return ok;
+}
+
+bool SetWinRegExpandString(const String& string, const char *value, const char *path, HKEY base_key) {
+	HKEY key = 0;
+	if(RegCreateKeyEx(base_key, path, 0, NULL, REG_OPTION_NON_VOLATILE,
+		KEY_ALL_ACCESS, NULL, &key, NULL) != ERROR_SUCCESS)
+		return false;
+	bool ok = (RegSetValueEx(key, value, 0,	REG_EXPAND_SZ, string, string.GetLength() + 1) == ERROR_SUCCESS);
+	RegCloseKey(key);
+	return ok;
+}
+
+bool SetWinRegInt(int data, const char *value, const char *path, HKEY base_key)
+{
+	HKEY key = 0;
+	if(RegCreateKeyEx(base_key, path, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, &key, NULL) != ERROR_SUCCESS)
+		return false;
+	bool ok = (RegSetValueEx(key, value, 0, REG_DWORD, (const byte *)&data, sizeof(data)) == ERROR_SUCCESS);
+	RegCloseKey(key);
+	return ok;
+}
+
+void DeleteWinReg(const String& key, HKEY base) {
+	HKEY hkey;
+	if(RegOpenKeyEx(base, key, 0, KEY_READ, &hkey) != ERROR_SUCCESS)
+		return;
+	Vector<String> subkeys;
+	char temp[_MAX_PATH];
+	dword len;
+	for(dword dw = 0; len = sizeof(temp), RegEnumKeyEx(hkey, dw, temp, &len, 0, 0, 0, 0) == ERROR_SUCCESS; dw++)
+		subkeys.Add(temp);
+	RegCloseKey(hkey);
+	while(!subkeys.IsEmpty())
+		DeleteWinReg(key + '\\' + subkeys.Pop(), base);
+	RegDeleteKey(base, key);
+}
+
+String GetSystemDirectory() {
+	char temp[MAX_PATH];
+	*temp = 0;
+	::GetSystemDirectory(temp, sizeof(temp));
+	return FromSystemCharset(temp);
+}
+
+String GetWindowsDirectory() {
+	if(IsWinNT()) {
+		wchar temp[MAX_PATH];
+		*temp = 0;
+		UnicodeWin32().GetWindowsDirectoryW(temp, sizeof(temp));
+		return FromSystemCharsetW(temp);
+	}
+	else {
+		char temp[MAX_PATH];
+		*temp = 0;
+		::GetWindowsDirectory(temp, sizeof(temp));
+		return FromSystemCharset(temp);
+	}
+}
+#endif
+
+String GetModuleFileName(HINSTANCE instance) {
+#ifdef PLATFORM_WINCE
+	wchar h[_MAX_PATH];
+	GetModuleFileName(instance, h, _MAX_PATH);
+	return FromSystemCharset(h);
+#else
+	if(IsWinNT()) {
+		wchar h[_MAX_PATH];
+		UnicodeWin32().GetModuleFileNameW(instance, h, _MAX_PATH);
+		return FromSystemCharsetW(h);
+	}
+	else {
+		char h[_MAX_PATH];
+		GetModuleFileName(instance, h, _MAX_PATH);
+		return FromSystemCharset(h);
+	}
+#endif
+}
+
+bool SyncObject::Wait(int ms)
+{
+	return WaitForSingleObject(handle, ms);
+}
+
+bool SyncObject::Wait()
+{
+	return Wait(INFINITE);
+}
+
+SyncObject::SyncObject()
+{
+	handle = NULL;
+}
+
+SyncObject::~SyncObject()
+{
+	if(handle) CloseHandle(handle);
+}
+
+Event::Event()
+{
+	handle = CreateEvent(NULL, FALSE, FALSE, NULL);
+}
+
+void Event::Set()
+{
+	SetEvent(handle);
+}
+
+#endif
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/Core/Win32Util.h b/uppsrc/Core/Win32Util.h
new file mode 100644
index 000000000..0ea50dd58
--- /dev/null
+++ b/uppsrc/Core/Win32Util.h
@@ -0,0 +1,60 @@
+#ifdef PLATFORM_WIN32
+
+#include <winreg.h>
+
+#ifdef PLATFORM_WINCE
+inline bool IsWinNT() { return false; }
+inline bool IsWinXP() { return false; }
+inline bool IsWin2K() { return false; }
+inline bool IsWinVista() { return false; }
+#else
+inline bool IsWinNT() { return GetVersion() < 0x80000000; }
+bool IsWin2K();
+bool IsWinXP();
+bool IsWinVista();
+#endif
+
+HINSTANCE AppGetHandle();
+void      AppSetHandle(HINSTANCE dll_instance);
+
+String AsString(const wchar_t *buffer);
+String AsString(const wchar_t *buffer, int count);
+String AsString(const wchar_t *buffer, const wchar_t *end);
+
+String GetWinRegString(const char *value, const char *path, HKEY base_key = HKEY_LOCAL_MACHINE);
+int    GetWinRegInt(const char *value, const char *path, HKEY base_key = HKEY_LOCAL_MACHINE);
+bool   SetWinRegString(const String& string, const char *value, const char *path, HKEY base_key = HKEY_LOCAL_MACHINE);
+bool   SetWinRegExpandString(const String& string, const char *value, const char *path, HKEY base_key);
+bool   SetWinRegInt(int data, const char *value, const char *path, HKEY base_key = HKEY_LOCAL_MACHINE);
+void   DeleteWinReg(const String& key, HKEY base = HKEY_LOCAL_MACHINE);
+
+#ifndef PLATFORM_WINCE
+String GetSystemDirectory();
+String GetWindowsDirectory();
+#endif
+String GetModuleFileName(HINSTANCE instance = AppGetHandle());
+
+//deprecated
+class SyncObject {
+protected:
+	HANDLE     handle;
+
+public:
+	bool       Wait(int time_ms);
+	bool       Wait();
+
+	HANDLE     GetHandle() const { return handle; }
+
+	SyncObject();
+	~SyncObject();
+};
+
+//deprecated
+class Event : public SyncObject {
+public:
+	void       Set();
+
+	Event();
+};
+
+#endif
diff --git a/uppsrc/Core/XML.cpp b/uppsrc/Core/XML.cpp
new file mode 100644
index 000000000..f6275a391
--- /dev/null
+++ b/uppsrc/Core/XML.cpp
@@ -0,0 +1,782 @@
+#include "Core.h"
+
+NAMESPACE_UPP
+
+#define LLOG(x) // LOG(x);
+
+String DeXml(const char *s, byte charset)
+{
+	if(charset == CHARSET_DEFAULT)
+		charset = GetDefaultCharset();
+	StringBuffer result;
+	for(; *s; s++)
+		/**/ if(*s == '<')  result.Cat("&lt;");
+		else if(*s == '>')  result.Cat("&gt;");
+		else if(*s == '&')  result.Cat("&amp;");
+		else if(*s == '\'') result.Cat("&apos;");
+		else if(*s == '\"') result.Cat("&quot;");
+		else if((byte)*s < ' ' && *s != '\n') result.Cat(NFormat("&#x%02x;", (byte)*s));
+		else if(!(*s & 0x80) || charset == CHARSET_UTF8) result.Cat(*s);
+		else result.Cat(ToUtf8(ToUnicode(*s, charset)));
+	return result;
+}
+
+String XmlHeader(const char *encoding, const char *version, const char *standalone)
+{
+	StringBuffer r;
+	r << "<?xml version=\"" << version << "\" encoding=\"" << encoding << "\" standalone=\""
+	  << standalone << "\" ?>\n";
+	return r;
+}
+
+String XmlPI(const char *text)
+{
+	StringBuffer r;
+	r << "<?" << text << "?>\n";
+	return r;
+}
+
+String XmlDecl(const char *text)
+{
+	StringBuffer r;
+	r << "<!" << text << ">\n";
+	return r;
+}
+
+String XmlDocType(const char *text)
+{
+	return XmlDecl("DOCTYPE " + String(text));
+}
+
+String XmlDoc(const char *name, const char *xmlbody)
+{
+	return XmlHeader() + XmlDocType(name) + XmlTag(name)(xmlbody);
+}
+
+String XmlComment(const char *text)
+{
+	StringBuffer out;
+	out << "<!-- " << text << " -->\n";
+	return out;
+}
+
+XmlTag& XmlTag::Tag(const char *s)
+{
+	tag.Clear();
+	end.Clear();
+	tag << '<' << s;
+	end << "</" << s << ">\n";
+	return *this;
+}
+
+String  XmlTag::operator()()
+{
+	return tag + "/>\n";
+}
+
+String  XmlTag::operator()(const char* text)
+{
+	StringBuffer r;
+	r << tag << '>';
+	if(strchr(text, '\n')) {
+		r << '\n';
+		bool tab = true;
+		while(*text) {
+			if(tab)
+				r << '\t';
+			tab = *text == '\n';
+			r.Cat(*text++);
+		}
+	}
+	else
+		r << text;
+	r << end;
+	return r;
+}
+
+String  XmlTag::Text(const char *text, byte charset)
+{
+	StringBuffer r;
+	return r << tag << '>' << DeXml(text, charset) << end;
+}
+
+XmlTag& XmlTag::operator()(const char *attr, const char *val)
+{
+	tag << ' ' << attr << "=\"" << DeXml(val) << "\"";
+	return *this;
+}
+
+XmlTag& XmlTag::operator()(const char *attr, int q)
+{
+	return operator()(attr, AsString(q));
+}
+
+XmlTag& XmlTag::operator()(const char *attr, double q)
+{
+	return operator()(attr, AsString(q));
+}
+
+void XmlParser::Ent(StringBuffer& out)
+{
+	int outconst = 0;
+	const char *t = ++term;
+	if(*t == '#') {
+		if(*++t == 'X' || *t == 'x') {
+			for(byte c; (c = ctoi(*++t)) < 16; outconst = 16 * outconst + c)
+				;
+		}
+		else {
+			while(IsDigit(*t))
+				outconst = 10 * outconst + *t++ - '0';
+		}
+		out.Cat(ToUtf8(outconst));
+		if(*t == ';')
+			t++;
+		term = t;
+		return;
+	}
+	if(t[0] == 'l' && t[1] == 't' && t[2] == ';') {
+		t += 3;
+		out.Cat('<');
+	}
+	else
+	if(t[0] == 'g' && t[1] == 't' && t[2] == ';') {
+		t += 3;
+		out.Cat('>');
+	}
+	else
+	if(t[0] == 'a')
+		if(t[1] == 'm' && t[2] == 'p' && t[3] == ';') {
+			t += 4;
+			out.Cat('&');
+		}
+		else
+		if(t[1] == 'p' && t[2] == 'o' && t[3] == 's' && t[4] == ';') {
+			t += 5;
+			out.Cat('\'');
+		}
+		else
+			out.Cat('&');
+	else
+	if(t[0] == 'q' && t[1] == 'u' && t[2] == 'o' && t[3] == 't' && t[4] == ';') {
+		t += 5;
+		out.Cat('\"');
+	}
+	else
+		out.Cat('&');
+	term = t;
+}
+
+inline static bool IsXmlNameChar(int c)
+{
+	return IsAlNum(c) || c == '.' || c == '-' || c == '_' || c == ':';
+}
+
+void XmlParser::SkipWhites()
+{
+	while(*term && (byte)*term <= ' ') {
+		if(*term == '\n')
+			line++;
+		term++;
+	}
+}
+
+void XmlParser::Next()
+{
+	nattr.Clear();
+	nattr1 = nattrval1 = Null;
+	if(empty_tag) {
+		empty_tag = false;
+		type = XML_END;
+		return;
+	}
+	text.Clear();
+	type = XML_EOF;
+	if(!npreserve)
+		SkipWhites();
+	if(*term == '<') {
+		term++;
+		if(*term == '!') {
+			type = XML_DECL;
+			term++;
+			if(term[0] == '-' && term[1] == '-') {
+				type = XML_COMMENT;
+				term += 2;
+				for(;;) {
+					if(term[0] == '-' && term[1] == '-' && term[2] == '>')
+						break;
+					if(*term == '\0') {
+						throw XmlError("Unterminated comment");
+						type = XML_EOF;
+						return;
+					}
+					if(*term == '\n')
+						line++;
+					text.Cat(*term++);
+				}
+				term += 3;
+				return;
+			}
+			bool intdt = false;
+			for(;;) {
+				if (*term == '[')
+					intdt = true;
+				if(*term == '>' && intdt == false) {
+					term++;
+					break;
+				}
+				if(intdt == true && term[0] == ']' && term[1] == '>') {
+					text.Cat(*term++);
+					term++;
+					break;
+				}
+				if(*term == '\0')
+					throw XmlError("Unterminated declaration");
+				if(*term == '\n')
+					line++;
+				text.Cat(*term++);
+			}
+		}
+		else
+		if(*term == '?') {
+			type = XML_PI;
+			term++;
+			for(;;) {
+				if(term[0] == '?' && term[1] == '>') {
+					term += 2;
+					return;
+				}
+				if(*term == '\0')
+					throw XmlError("Unterminated processing info");
+				if(*term == '\n')
+					line++;
+				text.Cat(*term++);
+			}
+		}
+		else
+		if(*term == '/') {
+			type = XML_END;
+			term++;
+			const char *t = term;
+			while(IsXmlNameChar(*term))
+				term++;
+			text = String(t, term);
+			if(*term != '>')
+				throw XmlError("Unterminated end-tag");
+			term++;
+		}
+		else {
+			type = XML_TAG;
+			const char *t = term;
+			while(IsXmlNameChar(*term))
+				term++;
+			text = String(t, term);
+			for(;;) {
+				SkipWhites();
+				if(*term == '>') {
+					term++;
+					break;
+				}
+				if(term[0] == '/' && term[1] == '>') {
+					empty_tag = true;
+					term += 2;
+					break;
+				}
+				if(*term == '\0')
+					throw XmlError("Unterminated tag");
+				const char *t = term++;
+				while((byte)*term > ' ' && *term != '=' && *term != '>')
+					term++;
+				String attr(t, term);
+				SkipWhites();
+				if(*term == '=') {
+					term++;
+					SkipWhites();
+					StringBuffer attrval;
+					if(*term == '\"') {
+						term++;
+						while(*term && *term != '\"')
+							if(*term == '&')
+								Ent(attrval);
+							else {
+								const char *e = term;
+								while(*++e && *e != '&' && *e != '\"')
+									;
+								attrval.Cat(term, (int)(e - term));
+								term = e;
+							}
+						if(*term == '\"')
+							term++;
+					}
+					else {
+						while((byte)*term > ' ' && *term != '>')
+							if(*term == '&')
+								Ent(attrval);
+							else {
+								const char *e = term;
+								while((byte)*++e > ' ' && *e != '>' && *e != '&')
+									;
+								attrval.Cat(term,(int) (e - term));
+								term = e;
+							}
+					}
+					if(attr == "xml:space" && attrval.GetLength() == 8 && !memcmp(~attrval, "preserve", 8))
+						npreserve = true;
+					String aval = FromUtf8(~attrval, attrval.GetLength()).ToString();
+					if(IsNull(nattr1)) {
+						nattr1 = attr;
+						nattrval1 = aval;
+					}
+					else
+						nattr.Add(attr, aval);
+				}
+			}
+		}
+	}
+	else if(*term == 0)
+		type = XML_EOF;
+	else {
+		StringBuffer raw_text;
+		while(*term != '<' && *term) {
+			if(*term == '\n')
+				line++;
+			if(*term == '&')
+				Ent(raw_text);
+			else {
+				const char *e = term;
+				while(*++e && *e != '&' && *e != '<')
+					;
+				raw_text.Cat(term, (int)(e - term));
+				term = e;
+			}
+		}
+		const char *re = raw_text.End();
+		if(!npreserve) {
+			while(re > raw_text.Begin() && (byte)re[-1] <= ' ')
+				re--;
+		}
+		text = FromUtf8(~raw_text, (int)(re - ~raw_text)).ToString();
+		type = XML_TEXT;
+	}
+}
+
+bool   XmlParser::IsEof()
+{
+	return type == XML_EOF;
+}
+
+bool   XmlParser::IsTag()
+{
+	return type == XML_TAG;
+}
+
+String XmlParser::ReadTag()
+{
+	if(type != XML_TAG)
+		throw XmlError("Expected tag");
+	LLOG("ReadTag " << text);
+	String h = text;
+	stack.Add(Nesting(h, npreserve));
+	attr = nattr;
+	attr1 = nattr1;
+	attrval1 = nattrval1;
+	Next();
+	return h;
+}
+
+bool  XmlParser::Tag(const char *tag)
+{
+	if(IsTag() && text == tag) {
+		LLOG("Tag " << text);
+		stack.Add(Nesting(text, npreserve));
+		attr = nattr;
+		attr1 = nattr1;
+		attrval1 = nattrval1;
+		Next();
+		return true;
+	}
+	return false;
+}
+
+bool  XmlParser::Tag(const String& tag)
+{
+	if(IsTag() && text == tag) {
+		LLOG("Tag " << text);
+		stack.Add(Nesting(text, npreserve));
+		attr = nattr;
+		attr1 = nattr1;
+		attrval1 = nattrval1;
+		Next();
+		return true;
+	}
+	return false;
+}
+
+void  XmlParser::PassTag(const char *tag)
+{
+	if(!Tag(tag))
+		throw XmlError(String().Cat() << '\'' << tag << "'\' tag expected");
+}
+
+void  XmlParser::PassTag(const String& tag)
+{
+	if(!Tag(tag))
+		throw XmlError(String().Cat() << '\'' << tag << "'\' tag expected");
+}
+
+bool  XmlParser::IsEnd()
+{
+	return type == XML_END;
+}
+
+bool  XmlParser::End()
+{
+	if(IsEof())
+		throw XmlError("Unexpected end of file");
+	if(IsEnd()) {
+		LLOG("EndTag " << text);
+		if(stack.IsEmpty())
+			throw XmlError(NFormat("Unexpected end-tag: </%s>", text));
+		if(stack.Top().tag != text && !relaxed) {
+			LLOG("Tag/end-tag mismatch: <" << stack.Top().tag << "> </" << text << ">");
+			throw XmlError(NFormat("Tag/end-tag mismatch: <%s> </%s>", stack.Top().tag, text));
+		}
+		stack.Drop();
+		npreserve = (!stack.IsEmpty() && stack.Top().preserve_blanks);
+		Next();
+		return true;
+	}
+	return false;
+}
+
+void  XmlParser::PassEnd()
+{
+	if(!End())
+		throw XmlError(String().Cat() << "Expected \'" << (stack.GetCount() ? stack.Top().tag : String()) << "\' end-tag");
+}
+
+bool  XmlParser::TagE(const char *tag)
+{
+	if(Tag(tag)) {
+		PassEnd();
+		return true;
+	}
+	return false;
+}
+
+void  XmlParser::PassTagE(const char *tag)
+{
+	PassTag(tag);
+	PassEnd();
+}
+
+VectorMap<String, String> XmlParser::PickAttrs() pick_
+{
+	if(!IsNull(attr1))
+		const_cast<VectorMap<String, String>&>(attr).Insert(0, attr1, attrval1);
+	return attr;
+}
+
+int   XmlParser::Int(const char *id, int def) const
+{
+	if(id == attr1) return ScanInt(attrval1);
+	int q = attr.Find(id);
+	return q < 0 ? def : ScanInt(attr[q]);
+}
+
+double XmlParser::Double(const char *id, double def) const
+{
+	if(id == attr1) return ScanDouble(attrval1);
+	int q = attr.Find(id);
+	return q < 0 ? def : ScanDouble(attr[q]);
+}
+
+bool  XmlParser::IsText()
+{
+	return type == XML_TEXT;
+}
+
+String XmlParser::ReadText()
+{
+	if(!IsText())
+		throw XmlError("Character data expected");
+	String h = text;
+	Next();
+	return h;
+}
+
+String XmlParser::ReadTextE()
+{
+	String out;
+	while(!IsEnd())
+		if(IsText())
+			out.Cat(ReadText());
+		else
+			Skip();
+	PassEnd();
+	return out;
+}
+
+bool   XmlParser::IsDecl()
+{
+	return type == XML_DECL;
+}
+
+String XmlParser::ReadDecl()
+{
+	if(!IsDecl())
+		throw XmlError("Declaration expected");
+	String h = text;
+	Next();
+	return h;
+}
+
+bool   XmlParser::IsPI()
+{
+	return type == XML_PI;
+}
+
+String XmlParser::ReadPI()
+{
+	if(!IsPI())
+		throw XmlError("Processing info expected");
+	String h = text;
+	Next();
+	return h;
+}
+
+bool   XmlParser::IsComment()
+{
+	return type == XML_COMMENT;
+}
+
+String XmlParser::ReadComment()
+{
+	if(!IsComment())
+		throw XmlError("Comment expected");
+	String h = text;
+	Next();
+	return h;
+}
+
+void XmlParser::Skip()
+{
+	if(IsEof())
+		throw XmlError("Unexpected end of file");
+	if(IsTag()) {
+		String n = ReadTag();
+		while(!End()) {
+			if(IsEof())
+				throw XmlError("Unexpected end of file expected when skipping tag \'" + n + "\'");
+			Skip();
+		}
+	}
+	else
+		Next();
+}
+
+void XmlParser::SkipEnd()
+{
+	while(!IsEnd()) Skip();
+	PassEnd();
+}
+
+int XmlParser::GetColumn() const
+{
+	const char *s = term;
+	int n = 1;
+	while(s > begin && *(s - 1) != '\n') {
+		s--;
+		n++;
+	}
+	return n;
+}
+
+XmlParser::XmlParser(const char *s)
+{
+	relaxed = false;
+	empty_tag = false;
+	npreserve = false;
+	begin = term = s;
+	line = 1;
+	Next();
+}
+
+int XmlNode::FindTag(const char *_tag) const
+{
+	String tag = _tag;
+	for(int i = 0; i < node.GetCount(); i++)
+		if(node[i].type == XML_TAG && node[i].text == tag)
+			return i;
+	return -1;
+}
+
+XmlNode& XmlNode::Add(const char *tag)
+{
+	XmlNode& m = node.Add();
+	m.CreateTag(tag);
+	return m;
+}
+
+XmlNode& XmlNode::GetAdd(const char *tag)
+{
+	int q = FindTag(tag);
+	return q >= 0 ? node[q] : Add(tag);
+}
+
+const XmlNode& XmlNode::Void()
+{
+	static XmlNode *h;
+	ONCELOCK {
+		static XmlNode empty;
+		h = &empty;
+	}
+	return *h;
+}
+
+const XmlNode& XmlNode::operator[](const char *tag) const
+{
+	int q = FindTag(tag);
+	return q < 0 ? Void() : node[q];
+}
+
+void XmlNode::Remove(const char *tag)
+{
+	int q = FindTag(tag);
+	if(q >= 0)
+		node.Remove(q);
+}
+
+String XmlNode::GatherText() const
+{
+	String r;
+	for(int i = 0; i < GetCount(); i++)
+		if(node[i].IsText())
+			r << node[i].GetText();
+	return r;
+}
+
+int  XmlNode::AttrInt(const char *id, int def) const
+{
+	String x = Attr(id);
+	CParser p(x);
+	return p.IsInt() ? p.ReadInt() : def;
+}
+
+XmlNode& XmlNode::SetAttr(const char *id, int i)
+{
+	SetAttr(id, AsString(i));
+	return *this;
+}
+
+XmlNode& XmlNode::SetAttr(const char *id, const String& text)
+{
+	attr.GetAdd(id) = text;
+	return *this;
+}
+
+bool Ignore(XmlParser& p, dword style)
+{
+	if((XML_IGNORE_DECLS & style) && p.IsDecl() ||
+	   (XML_IGNORE_PIS & style) && p.IsPI() ||
+	   (XML_IGNORE_COMMENTS & style) && p.IsComment()) {
+		p.Skip();
+		return true;
+	}
+	return false;
+}
+
+static XmlNode sReadXmlNode(XmlParser& p, dword style)
+{
+	XmlNode m;
+	if(p.IsTag()) {
+		m.CreateTag(p.ReadTag());
+		m.SetAttrsPick(p.PickAttrs());
+		while(!p.End())
+			if(!Ignore(p, style))
+				m.Add() = sReadXmlNode(p, style);
+		return m;
+	}
+	if(p.IsText()) {
+		m.CreateText(p.ReadText());
+		return m;
+	}
+	if(p.IsPI()) {
+		m.CreatePI(p.ReadPI());
+		return m;
+	}
+	if(p.IsDecl()) {
+		m.CreateDecl(p.ReadDecl());
+		return m;
+	}
+	if(p.IsComment()) {
+		m.CreateComment(p.ReadComment());
+		return m;
+	}
+	NEVER();
+	return m;
+}
+
+XmlNode ParseXML(XmlParser& p, dword style)
+{
+	XmlNode r;
+	while(!p.IsEof())
+		if(!Ignore(p, style))
+			r.Add() = sReadXmlNode(p, style);
+	return r;
+}
+
+XmlNode ParseXML(const char *s, dword style)
+{
+	XmlParser p(s);
+	return ParseXML(p, style);
+}
+
+String AsXML(const XmlNode& node, dword style)
+{
+	StringBuffer r;
+	if(style & XML_HEADER)
+		r << XmlHeader();
+	if(style & XML_DOCTYPE)
+		for(int i = 0; i < node.GetCount(); i++) {
+			const XmlNode& m = node.Node(i);
+			if(m.GetType() == XML_TAG) {
+				r << XmlDocType(m.GetText());
+				break;
+			}
+		}
+	style &= ~(XML_HEADER|XML_DOCTYPE);
+	switch(node.GetType()) {
+	case XML_PI:
+		r << "<?" << node.GetText() << "?>\n";
+		break;
+	case XML_DECL:
+		r << "<!" << node.GetText() << ">\n";
+		break;
+	case XML_COMMENT:
+		r << "<!--" << node.GetText() << "-->\n";
+		break;
+	case XML_DOC:
+		for(int i = 0; i < node.GetCount(); i++)
+			r << AsXML(node.Node(i), style);
+		break;
+	case XML_TEXT:
+		r << DeXml(node.GetText());
+		break;
+	case XML_TAG:
+		XmlTag tag(node.GetText());
+		for(int i = 0; i < node.GetAttrCount(); i++)
+			tag(node.AttrId(i), node.Attr(i));
+		if(node.GetCount()) {
+			StringBuffer body;
+			for(int i = 0; i < node.GetCount(); i++)
+				body << AsXML(node.Node(i), style);
+			r << tag(~body);
+		}
+		else
+			r << tag();
+	}
+	return r;
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/Core/XML.h b/uppsrc/Core/XML.h
new file mode 100644
index 000000000..81581b663
--- /dev/null
+++ b/uppsrc/Core/XML.h
@@ -0,0 +1,184 @@
+String DeXml(const char *s, byte charset = CHARSET_DEFAULT);
+String XmlPI(const char *text);
+String XmlHeader(const char *encoding = "UTF-8", const char *version = "1.0", const char *standalone = "yes");
+String XmlDecl(const char *text);
+String XmlDocType(const char *text);
+String XmlDoc(const char *name, const char *xmlbody);
+String XmlComment(const char *text);
+
+
+class XmlTag : Moveable<XmlTag> {
+	String tag;
+	String end;
+
+public:
+	XmlTag& Tag(const char *s);
+
+	String  operator()();
+	String  operator()(const char *text);
+	String  operator()(const String& text)                        { return operator()(~text); }
+	String  Text(const char *s, byte charset = CHARSET_DEFAULT);
+	String  Text(const String& s, byte charset = CHARSET_DEFAULT) { return Text(~s, charset); }
+
+	XmlTag& operator()(const char *attr, const char *val);
+	XmlTag& operator()(const char *attr, int q);
+	XmlTag& operator()(const char *attr, double q);
+
+	XmlTag() {}
+	XmlTag(const char *tag)                                       { Tag(tag); }
+};
+
+enum { XML_DOC, XML_TAG, XML_END, XML_TEXT, XML_DECL, XML_PI, XML_COMMENT, XML_EOF };
+
+struct XmlError : public Exc
+{
+	XmlError(const char *s) : Exc(s) {}
+};
+
+class XmlParser {
+	struct Nesting {
+		Nesting(String tag = Null, bool blanks = false) : tag(tag), preserve_blanks(blanks) {}
+		String tag;
+		bool   preserve_blanks;
+	};
+
+	const char               *begin;
+	const char               *term;
+	String                    attr1, attrval1;
+	VectorMap<String, String> attr;
+	Array<Nesting>            stack;
+
+	int                       type;
+	String                    nattr1, nattrval1;
+	VectorMap<String, String> nattr;
+	String                    text;
+	bool                      empty_tag;
+	bool                      npreserve;
+	bool                      relaxed;
+
+	int                       line;
+
+	void                      Ent(StringBuffer& out);
+	void                      Next();
+
+public:
+	void   SkipWhites();
+
+	bool   IsEof();
+
+	bool   IsTag();
+	String ReadTag();
+	bool   Tag(const char *tag);
+	bool   Tag(const String& tag);
+	void   PassTag(const char *tag);
+	void   PassTag(const String& tag);
+	bool   IsEnd();
+	bool   End();
+	void   PassEnd();
+	bool   TagE(const char *tag);
+	void   PassTagE(const char *tag);
+
+	int    GetAttrCount() const                               { return attr.GetCount() + !IsNull(attr1); }
+	String GetAttr(int i) const                               { return i ? attr.GetKey(i - 1) : attr1; }
+	String operator[](int i) const                            { return i ? attr[i - 1] : attrval1; }
+	String operator[](const char *id) const                   { return attr1 == id ? attrval1 : attr.Get(id, Null); }
+	int    Int(const char *id, int def = Null) const;
+	double Double(const char *id, double def = Null) const;
+
+	bool   IsText();
+	String ReadText();
+	String ReadTextE();
+
+	bool   IsDecl();
+	String ReadDecl();
+
+	bool   IsPI();
+	String ReadPI();
+
+	bool   IsComment();
+	String ReadComment();
+
+	void   Skip();
+	void   SkipEnd();
+
+	VectorMap<String, String> PickAttrs() pick_;
+
+	int    GetLine() const                                    { return line; }
+	int    GetColumn() const;
+
+	void   Relaxed(bool b)                                    { relaxed = b; }
+
+	XmlParser(const char *s);
+};
+
+class XmlNode {
+	int                       type;
+	String                    text;
+	VectorMap<String, String> attr;
+	Array<XmlNode>            node;
+
+public:
+	static const XmlNode& Void();
+	bool           IsVoid() const                             { return this == &Void(); }
+
+	int            GetType() const                            { return type; }
+	String         GetText() const                            { return text; }
+	String         GetTag() const                             { return text; }
+	bool           IsTag() const                              { return type == XML_TAG; }
+	bool           IsTag(const char *tag) const               { return IsTag() && text == tag; }
+	bool           IsText() const                             { return type == XML_TEXT; }
+
+	void           Clear()                                    { text.Clear(); attr.Clear(); node.Clear(); type = -1; }
+	void           CreateTag(const char *tag)                 { type = XML_TAG; text = tag; }
+	void           CreateText(const String& txt)              { type = XML_TEXT; text = txt; }
+	void           CreatePI(const String& pi)                 { type = XML_PI; text = pi; }
+	void           CreateDecl(const String& decl)             { type = XML_DECL; text = decl; }
+	void           CreateComment(const String& comment)       { type = XML_COMMENT; text = comment; }
+	void           CreateDocument()                           { Clear(); }
+	bool           IsEmpty() const                            { return type == XML_DOC && node.GetCount() == 0; }
+	operator bool() const                                     { return !IsEmpty(); }
+
+	int            GetCount() const                           { return node.GetCount(); }
+	XmlNode&       At(int i)                                  { return node.At(i); }
+	const XmlNode& Node(int i) const                          { return node[i]; }
+	const XmlNode& operator[](int i) const                    { return i >= 0 && i < node.GetCount() ? node[i] : Void(); }
+	const XmlNode& operator[](const char *tag) const;
+	XmlNode&       Add()                                      { return node.Add(); }
+	void           AddText(const String& txt)                 { Add().CreateText(txt); }
+	int            FindTag(const char *tag) const;
+	XmlNode&       Add(const char *tag);
+	XmlNode&       GetAdd(const char *tag);
+	XmlNode&       operator()(const char *tag)                { return GetAdd(tag); }
+	void           Remove(const char *tag);
+
+	String         GatherText() const;
+	String         operator~() const                          { return GatherText(); }
+
+	int            GetAttrCount() const                       { return attr.GetCount(); }
+	String         AttrId(int i) const                        { return attr.GetKey(i); }
+	String         Attr(int i) const                          { return attr[i]; }
+	String         Attr(const char *id) const                 { return attr.Get(id, Null); }
+	XmlNode&       SetAttr(const char *id, const String& val);
+	int            AttrInt(const char *id, int def = Null) const;
+	XmlNode&       SetAttr(const char *id, int val);
+
+	void           SetAttrsPick(pick_ VectorMap<String, String>& a) { attr = a; }
+
+	XmlNode()      { type = XML_DOC; }
+};
+
+enum {
+	XML_IGNORE_DECLS    = 0x01,
+	XML_IGNORE_PIS      = 0x02,
+	XML_IGNORE_COMMENTS = 0x04,
+};
+
+XmlNode ParseXML(XmlParser& p, dword style = XML_IGNORE_DECLS|XML_IGNORE_PIS|XML_IGNORE_COMMENTS);
+XmlNode ParseXML(const char *s, dword style = XML_IGNORE_DECLS|XML_IGNORE_PIS|XML_IGNORE_COMMENTS);
+
+enum {
+	XML_HEADER  = 0x01,
+	XML_DOCTYPE = 0x02,
+};
+
+String  AsXML(const XmlNode& n, dword style = XML_HEADER|XML_DOCTYPE);
diff --git a/uppsrc/Core/Xmlize.cpp b/uppsrc/Core/Xmlize.cpp
new file mode 100644
index 000000000..e8a3dd782
--- /dev/null
+++ b/uppsrc/Core/Xmlize.cpp
@@ -0,0 +1,189 @@
+#include "Core.h"
+
+NAMESPACE_UPP
+
+template<>
+void Xmlize(XmlIO xml, String& var)
+{
+	if(xml.IsLoading()) {
+		for(int i = 0; i < xml->GetCount(); i++)
+			if(xml->Node(i).IsText()) {
+				var = xml->Node(i).GetText();
+				return;
+			}
+	}
+	else {
+		for(int i = 0; i < xml->GetCount(); i++)
+			if(xml->Node(i).IsText()) {
+				xml->At(i).CreateText(var);
+				return;
+			}
+		xml->Add().CreateText(var);
+	}
+}
+
+template<> void XmlAttrLoad(int& var, const String& text)
+{
+	var = ScanInt(text);
+}
+
+template<> String XmlAttrStore(const int& var)
+{
+	return AsString(var);
+}
+
+template<> void   XmlAttrLoad(dword& var, const String& text)
+{
+	CParser p(text);
+	var = p.IsNumber() ? p.ReadNumber() : 0;
+}
+
+template<> String XmlAttrStore(const double& var)
+{
+	return AsString(var);
+}
+
+template<> void XmlAttrLoad(double& var, const String& text)
+{
+	var = ScanDouble(text);
+}
+
+template<> String XmlAttrStore(const dword& var)
+{
+	return AsString(var);
+}
+
+template<> void XmlAttrLoad(bool& var, const String& text)
+{
+	var = text == "1";
+}
+
+template<> String XmlAttrStore(const bool& var)
+{
+	return var ? "1" : "0";
+}
+
+template<>
+void Xmlize(XmlIO xml, int& var)
+{
+	xml.Attr("value", var);
+}
+
+template<>
+void Xmlize(XmlIO xml, dword& var)
+{
+	xml.Attr("value", var);
+}
+
+template<>
+void Xmlize(XmlIO xml, double& var)
+{
+	xml.Attr("value", var);
+}
+
+template<>
+void Xmlize(XmlIO xml, bool& var)
+{
+	xml.Attr("value", var);
+}
+
+template<>
+void Xmlize(XmlIO xml, Point& p)
+{
+	xml
+		.Attr("x", p.x)
+		.Attr("y", p.y)
+	;
+}
+
+template<>
+void Xmlize(XmlIO xml, Size& sz)
+{
+	xml
+		.Attr("cx", sz.cx)
+		.Attr("cy", sz.cy)
+	;
+}
+
+template<>
+void Xmlize(XmlIO xml, Rect& r)
+{
+	xml
+		.Attr("left", r.left)
+		.Attr("top", r.top)
+		.Attr("right", r.right)
+		.Attr("bottom", r.bottom)
+	;
+}
+
+template<>
+void Xmlize(XmlIO xml, Color& c)
+{
+	int r = c.GetR();
+	int g = c.GetG();
+	int b = c.GetB();
+	xml
+		.Attr("red", r)
+		.Attr("green", g)
+		.Attr("blue", b)
+	;
+	c = Color(r, g, b);
+}
+
+void XmlizeLangAttr(XmlIO xml, int& lang, const char *id)
+{
+	String l;
+	if(xml.IsStoring())
+		l = LNGAsText(lang);
+	xml.Attr(id, l);
+	if(xml.IsLoading() && !IsNull(l))
+		lang = LNGFromText(l);
+}
+
+void XmlizeLang(XmlIO xml, const char *tag, int& lang, const char *id)
+{
+	XmlIO n(xml, tag);
+	XmlizeLangAttr(n, lang, id);
+}
+
+String StoreAsXML(Callback1<XmlIO> xmlize, const char *name)
+{
+	XmlNode node;
+	xmlize(XmlIO(node(name), false));
+	return AsXML(node);
+}
+
+bool LoadFromXML(Callback1<XmlIO> xmlize, const String& xml)
+{
+	try {
+		XmlNode node = ParseXML(xml);
+		for(int i = 0; i < node.GetCount(); i++)
+			if(node.Node(i).IsTag()) {
+				xmlize(XmlIO(node.At(i), true));
+				break;
+			}
+		return true;
+	}
+	catch(XmlError) {}
+	return false;
+}
+
+static String sXMLFile(const char *file)
+{
+	if(file)
+		return IsFullPath(file) ? String(file) : ConfigFile(file);
+	else
+		return ConfigFile(GetExeTitle() + ".xml");
+}
+
+bool StoreAsXMLFile(Callback1<XmlIO> xmlize, const char *name, const char *file)
+{
+	return SaveFile(sXMLFile(file), StoreAsXML(xmlize, name ? (String)name : GetExeTitle()));
+}
+
+bool LoadFromXMLFile(Callback1<XmlIO> xmlize, const char *file)
+{
+	return LoadFromXML(xmlize, LoadFile(sXMLFile(file)));
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/Core/Xmlize.h b/uppsrc/Core/Xmlize.h
new file mode 100644
index 000000000..46495759d
--- /dev/null
+++ b/uppsrc/Core/Xmlize.h
@@ -0,0 +1,208 @@
+class XmlIO;
+
+template <class T>
+void XmlAttrLoad(T& var, const String& text)
+{
+	var.XmlAttrLoad(text);
+}
+
+template <class T>
+String XmlAttrStore(const T& var)
+{
+	return var.XmlAttrStore();
+}
+
+class XmlIO {
+	XmlNode& node;
+	bool     loading;
+
+public:
+	bool IsLoading() const { return loading; }
+	bool IsStoring() const { return !loading; }
+
+	XmlNode *operator->()  { return &node; }
+
+	template <class T> XmlIO operator()(const char *tag, T& var);
+
+	template <class T> XmlIO Attr(const char *id, T& var) {
+		if(IsLoading())
+			XmlAttrLoad(var, node.Attr(id));
+		else
+			node.SetAttr(id, XmlAttrStore(var));
+		return *this;
+	}
+
+	template <class T> XmlIO Attr(const char *id, T& var, T def) {
+		if(IsLoading())
+		    if(IsNull(node.Attr(id)))
+				var = def;
+		    else
+				XmlAttrLoad(var, node.Attr(id));
+		else
+		if(var != def)
+			node.SetAttr(id, XmlAttrStore(var));
+		return *this;
+	}
+
+	XmlIO At(int i)                                    { XmlIO m(node.At(i), IsLoading()); return m; }
+	XmlIO Add()                                        { XmlIO m(node.Add(), IsLoading()); return m; }
+	XmlIO Add(const char *id)                          { XmlIO m(node.Add(id), IsLoading()); return m; }
+	XmlIO GetAdd(const char *id)                       { XmlIO m(node.GetAdd(id), IsLoading()); return m; }
+
+	XmlIO(XmlNode& xml, bool loading) : node(xml), loading(loading) {}
+	XmlIO(XmlIO xml, const char *tag) : node(xml.node.GetAdd(tag)), loading(xml.loading) {}
+};
+
+template <class T>
+void Xmlize(XmlIO xml, T& var)
+{
+	var.Xmlize(xml);
+}
+
+template <class T> XmlIO XmlIO::operator()(const char *tag, T& var) {
+	XmlIO n(*this, tag);
+	Xmlize(n, var);
+	return *this;
+}
+
+template<> void XmlAttrLoad(int& var, const String& text);
+template<> String XmlAttrStore(const int& var);
+template<> void XmlAttrLoad(dword& var, const String& text);
+template<> String XmlAttrStore(const dword& var);
+template<> void XmlAttrLoad(double& var, const String& text);
+template<> String XmlAttrStore(const double& var);
+template<> void XmlAttrLoad(bool& var, const String& text);
+template<> String XmlAttrStore(const bool& var);
+
+template<> inline void XmlAttrLoad(String& var, const String& text)
+{
+	var = text;
+}
+
+template<> inline String XmlAttrStore(const String& var)
+{
+	return var;
+}
+
+template<> void Xmlize(XmlIO xml, String& var);
+
+template<> void Xmlize(XmlIO xml, int& var);
+template<> void Xmlize(XmlIO xml, dword& var);
+template<> void Xmlize(XmlIO xml, double& var);
+template<> void Xmlize(XmlIO xml, bool& var);
+template<> void Xmlize(XmlIO xml, Point& p);
+template<> void Xmlize(XmlIO xml, Size& sz);
+template<> void Xmlize(XmlIO xml, Rect& r);
+template<> void Xmlize(XmlIO xml, Color& c);
+
+void XmlizeLangAttr(XmlIO xml, int& lang, const char *id = "lang");
+void XmlizeLang(XmlIO xml, const char *tag, int& lang, const char *id = "id");
+
+template<class T>
+void XmlizeContainer(XmlIO xml, const char *tag, T& data)
+{
+	if(xml.IsStoring())
+		for(int i = 0; i < data.GetCount(); i++)
+			Xmlize(xml.Add(tag), data[i]);
+	else {
+		data.Clear();
+		for(int i = 0; i < xml->GetCount(); i++)
+			if(xml->Node(i).IsTag(tag))
+				Xmlize(xml.At(i), data.Add());
+	}
+}
+
+template<class T>
+void Xmlize(XmlIO xml, Vector<T>& data)
+{
+	XmlizeContainer(xml, "item", data);
+}
+
+template<class T>
+void Xmlize(XmlIO xml, Array<T>& data)
+{
+	XmlizeContainer(xml, "item", data);
+}
+
+template<class T>
+void XmlizeStore(XmlIO xml, const T& data)
+{
+	ASSERT(xml.IsStoring());
+	Xmlize(xml, const_cast<T&>(data));
+}
+
+template<class K, class V, class T>
+void XmlizeMap(XmlIO xml, const char *keytag, const char *valuetag, T& data)
+{
+	if(xml.IsStoring()) {
+		for(int i = 0; i < data.GetCount(); i++)
+			if(!data.IsUnlinked(i)) {
+				XmlizeStore(xml.Add(keytag), data.GetKey(i));
+				XmlizeStore(xml.Add(valuetag), data[i]);
+			}
+	}
+	else {
+		int i = 0;
+		while(i < xml->GetCount() - 1 && xml->Node(i).IsTag(keytag) && xml->Node(i + 1).IsTag(valuetag)) {
+			K key;
+			Xmlize(xml.At(i++), key);
+			Xmlize(xml.At(i++), data.Add(key));
+		}
+	}
+}
+
+template<class K, class V, class H>
+void Xmlize(XmlIO xml, VectorMap<K, V, H>& data)
+{
+	XmlizeMap<K, V>(xml, "key", "value", data);
+}
+
+template<class K, class V, class H>
+void Xmlize(XmlIO xml, ArrayMap<K, V, H>& data)
+{
+	XmlizeMap<K, V>(xml, "key", "value", data);
+}
+
+template <class T>
+struct ParamHelper__ {
+	T&   data;
+	void Invoke(XmlIO xml) {
+		Xmlize(xml, data);
+	}
+
+	ParamHelper__(T& data) : data(data) {}
+};
+
+String StoreAsXML(Callback1<XmlIO> xmlize, const char *name);
+bool   LoadFromXML(Callback1<XmlIO> xmlize, const String& xml);
+
+template <class T>
+String StoreAsXML(T& data, const char *name)
+{
+	ParamHelper__<T> p(data);
+	return StoreAsXML(callback(&p, &ParamHelper__<T>::Invoke), name);
+}
+
+template <class T>
+bool LoadFromXML(T& data, const String& xml)
+{
+	ParamHelper__<T> p(data);
+	return LoadFromXML(callback(&p, &ParamHelper__<T>::Invoke), xml);
+}
+
+bool StoreAsXMLFile(Callback1<XmlIO> xmlize, const char *name = NULL, const char *file = NULL);
+bool LoadFromXMLFile(Callback1<XmlIO> xmlize, const char *file = NULL);
+
+template <class T>
+bool StoreAsXMLFile(T& data, const char *name = NULL, const char *file = NULL)
+{
+	ParamHelper__<T> p(data);
+	return StoreAsXMLFile(callback(&p, &ParamHelper__<T>::Invoke), name, file);
+}
+
+template <class T>
+bool LoadFromXMLFile(T& data, const char *file = NULL)
+{
+	ParamHelper__<T> p(data);
+	return LoadFromXMLFile(callback(&p, &ParamHelper__<T>::Invoke), file);
+}
diff --git a/uppsrc/Core/core.upt b/uppsrc/Core/core.upt
new file mode 100644
index 000000000..73855ecbd
--- /dev/null
+++ b/uppsrc/Core/core.upt
@@ -0,0 +1,34 @@
+template "Core console project" main;
+
+option "Create header" header;
+option "Commandline loop" cmdline;
+option "Multithreaded" mt;
+
+@@<:PACKAGE:>.h
+??header
+#ifndef _<:PACKAGE:>_<:PACKAGE:>_h
+#define _<:PACKAGE:>_<:PACKAGE:>_h
+
+#include <Core/Core.h>
+
+using namespace Upp;
+
+#endif
+@@<:PACKAGE:>.cpp
+#include <:?header:>"<:PACKAGE:>.h"<:/:><Core/Core.h><:.:>
+
+CONSOLE_APP_MAIN
+{
+	<:?cmdline:>const Vector<String>& cmdline = CommandLine();
+	for(int i = 0; i < cmdline.GetCount(); i++) {
+	}<:.:>
+}
+
+@@<:PACKAGE:>.upp
+uses Core;
+
+file <:?header:>"<:PACKAGE:>.h",<:.:>
+	"<:PACKAGE:>.cpp";
+
+mainconfig
+	"" = <:?mt:>"MT"<:/:>""<:.:>;
diff --git a/uppsrc/Core/dli.h b/uppsrc/Core/dli.h
new file mode 100644
index 000000000..2608bd64a
--- /dev/null
+++ b/uppsrc/Core/dli.h
@@ -0,0 +1,194 @@
+#pragma BLITZ_APPROVE
+
+#define DLISTR__(s) #s
+#define DLISTR_(s)  DLISTR__(s)
+#define DLISTR(s)   DLISTR_(s)
+
+#define FN(retval, fn, args)           FN_CN(retval, DLLCALL, fn, args, DLISTR(fn))
+#define FN_C(retval, call, fn, args)   FN_CN(retval, call, fn, args, DLISTR(fn))
+#define FN_N(retval, fn, args, name)   FN_CN(retval, DLLCALL, fn, args, name)
+
+#define FN0(retval, fn, args)          FN0_CN(retval, DLLCALL, fn, args, DLISTR(fn))
+#define FN0_C(retval, call, fn, args)  FN0_CN(retval, call, fn, args, DLISTR(fn))
+#define FN0_N(retval, fn, args, name)  FN0_CN(retval, DLLCALL, fn, args, name)
+
+#ifndef DLLTYPE
+#define DLLTYPE   COMBINE(T_, DLIMODULE)
+#endif
+
+#ifndef DLLCALL
+#ifdef PLATFORM_WIN32
+#define DLLCALL //__cdecl
+#else
+#define DLLCALL
+#endif
+#endif
+
+#ifndef DLLSTRUCT
+#define DLLSTRUCT DLIMODULE
+#endif
+
+// ---------
+
+#if !defined(DLI_HEADER) && !defined(DLI_SOURCE)
+#define DLI_HEADER
+#define DLI_SOURCE
+#endif
+
+#ifdef DLI_HEADER
+#undef DLI_HEADER
+
+#define FN_CN(retval, call, fn, args, name)\
+	typedef retval (call fn##_type) args; fn##_type *fn;
+#define FN0_CN FN_CN
+
+struct DLLTYPE{
+	DLLTYPE();
+
+	UPP::String       GetLibName() const        { return libname; }
+	void              SetLibName(const char *n) { if(handle) Free(); libname = n; checked = false; }
+
+	bool              Load();
+	bool              Load(const char *n)       { SetLibName(n); return Load(); }
+	void              Force();
+	void              Free();
+
+	operator          bool ()      { return handle; }
+
+#include DLIHEADER
+private:
+	UPP::String       libname;
+	DLLHANDLE         handle;
+	bool              checked;
+};
+
+#undef FN_CN
+#undef FN0_CN
+
+// ---------
+
+DLLTYPE& DLIMODULE();
+DLLTYPE& COMBINE(DLIMODULE, _)();
+
+#endif
+
+#ifdef DLI_SOURCE
+#undef DLI_SOURCE
+
+DLLTYPE& COMBINE(DLIMODULE, _)()
+{
+	static DLLTYPE out;
+	return out;
+}
+
+DLLTYPE& DLIMODULE()
+{
+	DLLTYPE& out = COMBINE(DLIMODULE, _)();
+	out.Load();
+	return out;
+}
+
+DLLTYPE::DLLTYPE()
+{
+	checked = false;
+	handle = 0;
+	libname =
+#ifdef DLLFILENAME
+		DLLFILENAME;
+#else
+		DLISTR(DLLSTRUCT);
+#endif
+}
+
+bool DLLTYPE::Load()
+{
+	if(!checked)
+	{
+		checked = true;
+
+#define FN_CN(retval, call, fn, args, name)  name,
+#define FN0_CN(retval, call, fn, args, name) "?" name,
+
+		const char *name[] =
+		{
+		#include DLIHEADER
+			0
+		};
+
+#undef FN_CN
+#undef FN0_CN
+
+// --- FnPtr map
+
+
+#define FN_CN(retval, call, fn, args, name)  &fn,
+#define FN0_CN FN_CN
+
+		void *proc[] =
+		{
+		#include DLIHEADER
+			0
+		};
+
+#undef FN_CN
+#undef FN0_CN
+
+		// --- Proc pointers
+
+
+//		if(handle = LoadDll(file, name, proc))
+//			atexit(&Free);
+		handle = LoadDll__(libname, name, proc);
+	}
+	return handle;
+}
+
+void DLLTYPE::Force()
+{
+	if(!DLLTYPE::Load()) {
+//		RLOG("Failed to load required dynamic library '" << LibName() << "'");
+		exit(1);
+	}
+}
+
+void DLLTYPE::Free() {
+	if(handle) {
+		FreeDll__(handle);
+		handle = 0;
+	}
+	checked = false;
+}
+#endif
+
+#undef FN
+#undef FN_C
+#undef FN_N
+
+#undef FN0
+#undef FN0_C
+#undef FN0_N
+
+#undef DLISTR__
+#undef DLISTR_
+#undef DLISTR
+
+#ifdef DLLFILENAME
+#undef DLLFILENAME
+#endif
+
+#ifdef DLLAUTOLOAD
+#undef DLLAUTOLOAD
+#endif
+
+#undef DLLTYPE
+#undef DLIMODULE
+#undef DLIHEADER
+#undef DLLCALL
+
+#ifdef DLLFILENAME
+#undef DLLFILENAME
+#endif
+
+#ifdef DLLAUTOLOAD
+#undef DLLAUTOLOAD
+#endif
diff --git a/uppsrc/Core/dli_header.h b/uppsrc/Core/dli_header.h
new file mode 100644
index 000000000..f2585af91
--- /dev/null
+++ b/uppsrc/Core/dli_header.h
@@ -0,0 +1,2 @@
+#define DLI_HEADER
+#include <Core/dli.h>
diff --git a/uppsrc/Core/dli_source.h b/uppsrc/Core/dli_source.h
new file mode 100644
index 000000000..d6470b813
--- /dev/null
+++ b/uppsrc/Core/dli_source.h
@@ -0,0 +1,2 @@
+#define DLI_SOURCE
+#include <Core/dli.h>
diff --git a/uppsrc/Core/heap.cpp b/uppsrc/Core/heap.cpp
new file mode 100644
index 000000000..4d3701285
--- /dev/null
+++ b/uppsrc/Core/heap.cpp
@@ -0,0 +1,250 @@
+#include "Core.h"
+
+NAMESPACE_UPP
+
+#ifdef UPP_HEAP
+
+#include "HeapImp.h"
+
+#define LLOG(x) //  LOG((void *)this << ' ' << x)
+
+Heap::DLink Heap::big[1];
+Heap        Heap::aux;
+StaticMutex Heap::mutex;
+
+void Heap::Init()
+{
+	if(initialized)
+		return;
+	LLOG("Init heap " << (void *)this);
+	for(int i = 0; i < NKLASS; i++) {
+		int sz = Ksz(i);
+		empty[i] = NULL;
+		full[i]->LinkSelf();
+		work[i]->LinkSelf();
+		work[i]->freelist = NULL;
+		work[i]->klass = i;
+		cachen[i] = 3500 / Ksz(i);
+	}
+	ASSERT(sizeof(Header) == 16);
+	ASSERT(sizeof(DLink) <= 16);
+	ASSERT(sizeof(BigHdr) + sizeof(Header) < BIGHDRSZ);
+	GlobalLInit();
+	for(int i = 0; i < LBINS; i++)
+		freebin[i]->LinkSelf();
+	large->LinkSelf();
+	lcount = 0;
+	if(this != &aux && !aux.work[0]->next) {
+		Mutex::Lock __(mutex);
+		aux.Init();
+	}
+	initialized = true;
+	PROFILEMT(mutex);
+}
+
+void Heap::RemoteFree(void *ptr)
+{
+	LLOG("RemoteFree " << ptr);
+	Mutex::Lock __(mutex);
+	FreeLink *f = (FreeLink *)ptr;
+	f->next = remote_free;
+	remote_free = f;
+}
+
+void Heap::FreeRemoteRaw()
+{
+	while(remote_free) {
+		FreeLink *f = remote_free;
+		remote_free = remote_free->next;
+		LLOG("FreeRemote " << (void *)f);
+		FreeDirect(f);
+	}
+}
+
+void Heap::FreeRemote()
+{
+	LLOG("FreeRemote");
+	Mutex::Lock __(mutex);
+	FreeRemoteRaw();
+}
+
+void Heap::Shutdown()
+{
+	LLOG("Shutdown");
+	Mutex::Lock __(mutex);
+	Init();
+	FreeRemoteRaw();
+	for(int i = 0; i < NKLASS; i++) {
+		LLOG("Free cache " << i);
+		FreeLink *l = cache[i];
+		while(l) {
+			FreeLink *h = l;
+			l = l->next;
+			FreeDirect(h);
+		}
+		while(full[i]->next != full[i]) {
+			Page *p = full[i]->next;
+			p->Unlink();
+			p->heap = &aux;
+			p->Link(aux.full[i]);
+			LLOG("Orphan full " << (void *)p);
+		}
+		while(work[i]->next != work[i]) {
+			Page *p = work[i]->next;
+			p->Unlink();
+			p->heap = &aux;
+			p->Link(p->freelist ? aux.work[i] : aux.full[i]);
+			LLOG("Orphan work " << (void *)p);
+		}
+		if(empty[i]) {
+			ASSERT(empty[i]->freelist);
+			ASSERT(empty[i]->active == 0);
+			empty[i]->heap = &aux;
+			empty[i]->next = aux.empty[i];
+			aux.empty[i] = empty[i];
+			LLOG("Orphan empty " << (void *)empty[i]);
+		}
+	}
+	while(large != large->next) {
+		Header *bh = (Header *)((byte *)large->next + LARGEHDRSZ);
+		LLOG("Orphan large block " << (void *)large->next << " size: " << bh->size);
+		if(bh->size == MAXBLOCK && bh->free)
+			MoveToEmpty(large->next, bh);
+		else
+			MoveLarge(&aux, large->next);
+	}
+	memset(this, 0, sizeof(Heap));
+}
+
+void Heap::Assert(bool b)
+{
+	if(!b)
+		Panic("Heap is corrupted!");
+}
+
+void Heap::DblCheck(Page *p)
+{
+	Page *l = p;
+	do {
+		Assert(l->next->prev == l && l->prev->next == l);
+		l = l->next;
+	}
+	while(p != l);
+}
+
+int Heap::CheckPageFree(FreeLink *l, int k)
+{
+	int n = 0;
+	while(l) {
+		DbgFreeCheckK(l, k);
+		l = l->next;
+		n++;
+	}
+	return n;
+}
+
+void Heap::Check() {
+	Mutex::Lock __(mutex);
+	Init();
+	if(!work[0]->next)
+		Init();
+	for(int i = 0; i < NKLASS; i++) {
+		DblCheck(work[i]);
+		DblCheck(full[i]);
+		Page *p = work[i]->next;
+		while(p != work[i]) {
+			Assert(p->heap == this);
+			Assert(CheckPageFree(p->freelist, p->klass) == p->Count() - p->active);
+			p = p->next;
+		}
+		p = full[i]->next;
+		while(p != full[i]) {
+			Assert(p->heap == this);
+			Assert(p->klass == i);
+			Assert(p->active == p->Count());
+			p = p->next;
+		}
+		p = empty[i];
+		if(p) {
+			for(;;) {
+				Assert(p->heap == this);
+				Assert(p->active == 0);
+				Assert(p->klass == i);
+				Assert(CheckPageFree(p->freelist, i) == p->Count());
+				if(this != &aux)
+					break;
+				p = p->next;
+				if(!p)
+					break;
+			}
+		}
+		FreeLink *l = cache[i];
+		while(l) {
+			DbgFreeCheckK(l, i);
+			l = l->next;
+		}
+	}
+	DLink *l = large->next;
+	while(l != large) {
+		Header *bh = (Header *)((byte *)l + LARGEHDRSZ);
+		while(bh->size) {
+			Assert((byte *)bh >= (byte *)l + LARGEHDRSZ && (byte *)bh < (byte *)l + 65536);
+			if(bh->free)
+				DbgFreeCheck(bh->GetBlock() + 1, bh->size - sizeof(DLink));
+			bh = bh->Next();
+		}
+		l = l->next;
+	}
+	if(this != &aux)
+		aux.Check();
+}
+
+void Heap::AssertLeaks(bool b)
+{
+	if(!b)
+		Panic("Memory leaks detected! (final check)");
+}
+
+void Heap::AuxFinalCheck()
+{
+	Mutex::Lock __(mutex);
+	aux.Init();
+	aux.FreeRemoteRaw();
+	aux.Check();
+	if(!aux.work[0]->next)
+		aux.Init();
+	for(int i = 0; i < NKLASS; i++) {
+		Assert(!aux.cache[i]);
+		DblCheck(aux.work[i]);
+		DblCheck(aux.full[i]);
+		AssertLeaks(aux.work[i] == aux.work[i]->next);
+		AssertLeaks(aux.full[i] == aux.full[i]->next);
+		Page *p = aux.empty[i];
+		if(p) {
+			for(;;) {
+				Assert(p->heap == &aux);
+				Assert(p->active == 0);
+				Assert(CheckPageFree(p->freelist, p->klass) == p->Count());
+				p = p->next;
+				if(!p)
+					break;
+			}
+		}
+	}
+	AssertLeaks(aux.large == aux.large->next);
+	AssertLeaks(big == big->next);
+}
+
+void MemoryFreeThread()
+{
+	heap.Shutdown();
+}
+
+void MemoryCheck()
+{
+	heap.Check();
+}
+
+#endif
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/Core/heapdbg.cpp b/uppsrc/Core/heapdbg.cpp
new file mode 100644
index 000000000..b52b09ca5
--- /dev/null
+++ b/uppsrc/Core/heapdbg.cpp
@@ -0,0 +1,229 @@
+#include "Core.h"
+
+// #define LOGAF
+
+NAMESPACE_UPP
+
+#include "HeapImp.h"
+
+int sMemDiagInitCount = 0;
+
+#if defined(HEAPDBG) && defined(UPP_HEAP)
+
+extern bool PanicMode;
+void HeapPanic(const char *text, void *pos, int size);
+
+static StaticCriticalSection sHeapLock2;
+
+struct DbgBlkHeader {
+	size_t        size;
+	DbgBlkHeader *prev;
+	DbgBlkHeader *next;
+	dword         serial;
+
+	void LinkSelf() {
+		next = prev = this;
+	}
+	void Unlink() {
+		prev->next = next;
+		next->prev = prev;
+	}
+	void Insert(DbgBlkHeader *lnk) {
+		lnk->prev = this;
+		lnk->next = next;
+		next->prev = lnk;
+		next = lnk;
+	}
+};
+
+static const char *DbgFormat(char *b, DbgBlkHeader *p)
+{
+	sprintf(b, "--memory-breakpoint__ %u ", (dword)~(p->serial ^ (uintptr_t)p));
+	return b;
+}
+
+static void DbgHeapPanic(const char *text, DbgBlkHeader *p)
+{
+	char h[256];
+	char b[100];
+	strcpy(h, text);
+	strcat(h, DbgFormat(b, p));
+	HeapPanic(h, p + 1, p->size);
+}
+
+static DbgBlkHeader dbg_live = { 0, &dbg_live, &dbg_live, 0 };
+
+static dword s_allocbreakpoint;
+
+static
+#ifdef flagMT
+#ifdef COMPILER_MSC
+__declspec(thread)
+#else
+__thread
+#endif
+#endif
+dword s_ignoreleaks;
+
+void MemoryIgnoreLeaksBegin()
+{
+	CriticalSection::Lock __(sHeapLock2);
+	s_ignoreleaks++;
+}
+
+void MemoryIgnoreLeaksEnd()
+{
+	CriticalSection::Lock __(sHeapLock2);
+	s_ignoreleaks--;
+}
+
+void MemoryBreakpoint(dword serial)
+{
+	s_allocbreakpoint = serial;
+}
+
+void *MemoryAlloc_(size_t size);
+
+void *MemoryAlloc(size_t size)
+{
+	if(PanicMode)
+		return malloc(size);
+#ifdef _MULTITHREADED
+	sHeapLock2.Enter();
+#endif
+	static dword serial_number = 0;
+	DbgBlkHeader *p = (DbgBlkHeader *)MemoryAlloc_(sizeof(DbgBlkHeader) + size + sizeof(dword));
+	p->serial = s_ignoreleaks ? 0 : ~ ++serial_number ^ (uintptr_t) p;
+	p->size = size;
+	if(s_allocbreakpoint && s_allocbreakpoint == serial_number)
+		__BREAK__;
+	dbg_live.Insert(p);
+	Poke32le((byte *)(p + 1) + p->size, p->serial);
+#ifdef _MULTITHREADED
+	sHeapLock2.Leave();
+#endif
+#ifdef LOGAF
+	char h[200];
+	sprintf(h, "ALLOCATED %d at %p - %p", size, p + 1, (byte *)(p + 1) + size);
+	DLOG(h);
+#endif
+	return p + 1;
+}
+
+void *MemoryAllocSz(size_t& size)
+{
+	size = (size + 15) & ~((size_t)15);
+	return MemoryAlloc(size);
+}
+
+void MemoryFree_(void *ptr);
+
+void MemoryFree(void *ptr)
+{
+#ifdef LOGAF
+	char h[200];
+	sprintf(h, "FREE %p", ptr);
+	DLOG(h);
+#endif
+	if(PanicMode)
+		return;
+	if(!ptr) return;
+#ifdef _MULTITHREADED
+	CriticalSection::Lock __(sHeapLock2);
+#endif
+	DbgBlkHeader *p = (DbgBlkHeader *)ptr - 1;
+	if((dword)Peek32le((byte *)(p + 1) + p->size) != p->serial) {
+		sHeapLock2.Leave();
+		DbgHeapPanic("Heap is corrupted ", p);
+	}
+	p->Unlink();
+	MemoryFree_(p);
+}
+
+void *MemoryAlloc32()             { return MemoryAlloc(32); }
+void  MemoryFree32(void *ptr)     { return MemoryFree(ptr); }
+void *MemoryAlloc48()             { return MemoryAlloc(48); }
+void  MemoryFree48(void *ptr)     { return MemoryFree(ptr); }
+
+void MemoryCheckDebug()
+{
+	MemoryCheck();
+	CriticalSection::Lock __(sHeapLock2);
+	DbgBlkHeader *p = dbg_live.next;
+	while(p != &dbg_live) {
+		if((dword)Peek32le((byte *)(p + 1) + p->size) != p->serial) {
+			sHeapLock2.Leave();
+			DbgHeapPanic("HEAP CHECK: Heap is corrupted ", p);
+		}
+		p = p->next;
+	}
+	while(p != &dbg_live);
+}
+
+void MemoryDumpLeaks()
+{
+	if(PanicMode)
+		return;
+#ifndef PLATFORM_POSIX
+	if(s_ignoreleaks)
+		Panic("Ignore leaks Begin/End mismatch!");
+#endif
+	MemoryCheckDebug();
+	DbgBlkHeader *p = dbg_live.next;
+	bool leaks = false;
+	while(p != &dbg_live) {
+		if(p->serial) {
+			if(!leaks) {
+				BugLog() << "\n\nHeap leaks detected:\n";
+				VppLog() << "\n\nHeap leaks detected:\n";
+			}
+			leaks = true;
+			char b[100];
+			DbgFormat(b, p);
+			BugLog() << '\n' << b;
+			VppLog() << '\n' << b << ": ";
+			HexDump(VppLog(), p + 1, p->size, 64);
+		}
+		p = p->next;
+	}
+	if(!leaks)
+		return;
+#ifdef PLATFORM_WIN32
+#ifdef PLATFORM_WINCE
+	MessageBox(::GetActiveWindow(),
+	           L"Heap leaks detected !",
+	           L"Warning",
+	           MB_ICONSTOP|MB_OK|MB_APPLMODAL);
+#else
+	MessageBox(::GetActiveWindow(),
+	           "Heap leaks detected !",
+	           "Warning",
+	           MB_ICONSTOP|MB_OK|MB_APPLMODAL);
+#endif
+#else
+	if(!IsPanicMode())
+		PanicMessageBox("Warning", "Heap leaks detected!");
+#endif
+	Heap::AuxFinalCheck();
+}
+
+#ifdef COMPILER_MSC
+
+#pragma warning(disable: 4074)
+#pragma init_seg(compiler)
+
+EXITBLOCK { MemoryDumpLeaks(); }
+
+#endif
+
+#ifdef COMPILER_GCC
+
+void MemoryInitDiagnostics()
+{
+}
+
+#endif
+
+#endif
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/Core/heaputil.cpp b/uppsrc/Core/heaputil.cpp
new file mode 100644
index 000000000..70a4a6013
--- /dev/null
+++ b/uppsrc/Core/heaputil.cpp
@@ -0,0 +1,261 @@
+#include "Core.h"
+
+#ifdef UPP_HEAP
+
+#ifdef PLATFORM_POSIX
+#include <sys/mman.h>
+#endif
+
+NAMESPACE_UPP
+
+#include "HeapImp.h"
+
+static MemoryProfile *sPeak;
+
+void *MemoryAllocPermanentRaw(size_t size)
+{
+	if(size >= 256)
+		return malloc(size);
+	static byte *ptr = NULL;
+	static byte *limit = NULL;
+	if(ptr + size >= limit) {
+		ptr = (byte *)AllocRaw4KB();
+		limit = ptr + 4096;
+	}
+	void *p = ptr;
+	ptr += size;
+	return p;
+}
+
+void *MemoryAllocPermanent(size_t size)
+{
+	Mutex::Lock __(Heap::mutex);
+	return MemoryAllocPermanentRaw(size);
+}
+
+MemoryProfile *PeakMemoryProfile()
+{
+	if(sPeak)
+		return sPeak;
+	sPeak = (MemoryProfile *)MemoryAllocPermanent(sizeof(MemoryProfile));
+	memset(sPeak, 0, sizeof(MemoryProfile));
+	return NULL;
+}
+
+void DoPeakProfile()
+{
+	if(sPeak)
+		heap.Make(*sPeak);
+}
+
+int sKB;
+
+int   MemoryUsedKb() { return sKB; }
+
+void *SysAllocRaw(size_t size)
+{
+	sKB += int(((size + 4095) & ~4095) >> 10);
+#ifdef PLATFORM_WIN32
+	void *ptr = VirtualAlloc(NULL, size, MEM_RESERVE|MEM_COMMIT, PAGE_READWRITE);
+#else
+#ifdef PLATFORM_LINUX
+	void *ptr =  mmap(0, size, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0);
+#else
+	void *ptr =  mmap(0, size, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANON, -1, 0);
+#endif
+	if(ptr == MAP_FAILED)
+		ptr = NULL;
+#endif
+	if(!ptr)
+		Panic("Out of memory!");
+	DoPeakProfile();
+	return ptr;
+}
+
+void  SysFreeRaw(void *ptr, size_t size)
+{
+	sKB -= int(((size + 4095) & ~4095) >> 10);
+#ifdef PLATFORM_WIN32
+	VirtualFree(ptr, 0, MEM_RELEASE);
+#else
+	munmap(ptr, size);
+#endif
+}
+
+int s4kb__;
+int s64kb__;
+
+void *AllocRaw4KB()
+{
+	static int   left;
+	static byte *ptr;
+	static int   n = 32;
+	if(left == 0) {
+		left = n >> 5;
+		ptr = (byte *)SysAllocRaw(left * 4096);
+	}
+	n = n + 1;
+	if(n > 4096) n = 4096;
+	void *p = ptr;
+	ptr += 4096;
+	left--;
+	s4kb__++;
+	DoPeakProfile();
+	return p;
+}
+
+void *AllocRaw64KB()
+{
+	static int   left;
+	static byte *ptr;
+	static int   n = 32;
+	if(left == 0) {
+		left = n >> 5;
+		ptr = (byte *)SysAllocRaw(left * 65536);
+	}
+	n = n + 1;
+	if(n > 256) n = 256;
+	void *p = ptr;
+	ptr += 65536;
+	left--;
+	s64kb__++;
+	DoPeakProfile();
+	return p;
+}
+
+void HeapPanic(const char *text, void *pos, int size)
+{
+	RLOG("\n\n" << text << "\n");
+	HexDump(VppLog(), pos, size, 64);
+	Panic(text);
+}
+
+#ifdef HEAPDBG
+
+void Heap::DbgFreeFill(void *p, int size)
+{
+	int count = size >> 2;
+	dword *ptr = (dword *)p;
+	while(count--)
+		*ptr++ = 0x65657246;
+}
+
+void Heap::DbgFreeCheck(void *p, int size)
+{
+	int count = size >> 2;
+	dword *ptr = (dword *)p;
+	while(count--)
+		if(*ptr++ != 0x65657246)
+			HeapPanic("Writes to freed blocks detected", p, size);
+}
+
+void *Heap::DbgFreeCheckK(void *p, int k)
+{
+	Page *page = (Page *)((uintptr_t)p & ~(uintptr_t)4095);
+	ASSERT((byte *)page + sizeof(Page) <= (byte *)p && (byte *)p < (byte *)page + 4096);
+	ASSERT((4096 - ((uintptr_t)p & (uintptr_t)4095)) % Ksz(k) == 0);
+	ASSERT(page->klass == k);
+	DbgFreeCheck((FreeLink *)p + 1, Ksz(k) - sizeof(FreeLink));
+	return p;
+}
+
+void Heap::DbgFreeFillK(void *p, int k)
+{
+	DbgFreeFill((FreeLink *)p + 1, Ksz(k) - sizeof(FreeLink));
+}
+
+#endif
+
+
+void Heap::Make(MemoryProfile& f)
+{
+	Mutex::Lock __(mutex);
+	memset(&f, 0, sizeof(MemoryProfile));
+	for(int i = 0; i < NKLASS; i++) {
+		int qq = Ksz(i) / 4;
+		Page *p = work[i]->next;
+		while(p != work[i]) {
+			f.allocated[qq] += p->active;
+			f.fragmented[qq] += p->Count() - p->active;
+			p = p->next;
+		}
+		p = full[i]->next;
+		while(p != full[i]) {
+			f.allocated[qq] += p->active;
+			p = p->next;
+		}
+	}
+	int ii = 0;
+	int fi = 0;
+	DLink *m = big->next;
+	while(m != big) {
+		size_t sz = ((BigHdr *)((byte *)m + BIGHDRSZ - sizeof(Header)))->size;
+		f.large_count++;
+		f.large_total += sz;
+		if(ii < 4096)
+			f.large_size[ii++] = sz;
+		m = m->next;
+	}
+	m = large->next;
+	while(m != large) {
+		Header *h = (Header *)((byte *)m + LARGEHDRSZ);
+		while(h->size) {
+			if(h->free) {
+				f.large_free_count++;
+				f.large_free_total += h->size;
+				if(fi < 4096)
+					f.large_free_size[fi++] = h->size;
+			}
+			else {
+				f.large_count++;
+				f.large_total += h->size;
+				if(ii < 4096)
+					f.large_size[ii++] = h->size;
+			}
+			h = h->Next();
+		}
+		m = m->next;
+	}
+}
+
+MemoryProfile::MemoryProfile()
+{
+	heap.Make(*this);
+}
+
+#ifdef flagHEAPSTAT
+int stat[65536];
+int bigstat;
+
+void Heap::Stat(size_t sz)
+{
+	if(sz < 65536)
+		stat[sz]++;
+	else
+		bigstat++;
+}
+
+EXITBLOCK {
+	int sum = 0;
+	for(int i = 0; i < 65536; i++)
+		sum += stat[i];
+	sum += bigstat;
+	int total = 0;
+	VppLog() << Sprintf("Allocation statistics: (total allocations: %d)\n", sum);
+	for(int i = 0; i < 65536; i++)
+		if(stat[i]) {
+			total += stat[i];
+			VppLog() << Sprintf("%5d %8dx %2d%%, total %8dx %2d%%\n",
+			                    i, stat[i], 100 * stat[i] / sum, total, 100 * total / sum);
+		}
+	if(bigstat) {
+		total += bigstat;
+		VppLog() << Sprintf(">64KB %8dx %2d%%, total %8dx %2d%%\n",
+		 	                bigstat, 100 * bigstat / sum, total, 100 * total / sum);
+	}
+}
+#endif
+
+END_UPP_NAMESPACE
+
+#endif
diff --git a/uppsrc/Core/i18n.h b/uppsrc/Core/i18n.h
new file mode 100644
index 000000000..a5dd2cc12
--- /dev/null
+++ b/uppsrc/Core/i18n.h
@@ -0,0 +1,55 @@
+struct LngEntry__ {
+	int         lang;
+	const char *text;
+};
+
+void    AddModule(const LngEntry__ *entry, const char *modulename = NULL);
+
+
+const char *t_GetLngString(const char *id);
+
+#define     LNG_enUS LNG_('E','N','U','S')
+
+const char *GetENUS(const char *id);
+
+// t_ and tt_ would cause translation files sync to report error, so that
+// has to be included from file that is not part of package...
+#include "t_.h"
+
+/* t_.h:
+#ifdef t_
+#undef t_
+#endif
+
+#ifdef tt_
+#undef tt_
+#endif
+
+#define t_(x)          t_GetLngString(x)
+#define tt_(x)         x
+*/
+
+/* lt_.h:
+#ifdef t_
+#undef t_
+#endif
+
+#ifdef tt_
+#undef tt_
+#endif
+
+#define t_(x)          x
+#define tt_(x)         x
+*/
+
+String     GetLngString(const char *id);
+
+String     GetLngString(int lang, const char *id);
+
+Index<int> GetLngSet();
+void       SaveLngFile(FileOut& out, int lang);
+bool       LoadLngFile(const char *file);
+
+void       SetCurrentLanguage(int lang);
+
+void       LngSetAdd(const char *id, int lang, const char *txt, bool addid);
diff --git a/uppsrc/Core/init b/uppsrc/Core/init
new file mode 100644
index 000000000..16c5bbb3f
--- /dev/null
+++ b/uppsrc/Core/init
@@ -0,0 +1,4 @@
+#ifndef _Core_icpp_init_stub
+#define _Core_icpp_init_stub
+#include "plugin\z/init"
+#endif
diff --git a/uppsrc/Core/lcid.txt b/uppsrc/Core/lcid.txt
new file mode 100644
index 000000000..e87c04eff
--- /dev/null
+++ b/uppsrc/Core/lcid.txt
@@ -0,0 +1,78 @@
+454e5553, EN-US -> 00000409
+454e4742, EN-GB -> 00000809
+454e4155, EN-AU -> 00000c09
+454e4341, EN-CA -> 00001009
+454e4e5a, EN-NZ -> 00001409
+454e4945, EN-IE -> 00001809
+454e5a41, EN-ZA -> 00001c09
+454e4a4d, EN-JM -> 00002009
+454e4342, EN-CB -> 00002409
+454e425a, EN-BZ -> 00002809
+454e5454, EN-TT -> 00002c09
+42474247, BG-BG -> 00000402
+4353435a, CS-CZ -> 00000405
+4441444b, DA-DK -> 00000406
+44454445, DE-DE -> 00000407
+44454348, DE-CH -> 00000807
+44454154, DE-AT -> 00000c07
+44454c55, DE-LU -> 00001007
+44454c49, DE-LI -> 00001407
+454c4752, EL-GR -> 00000408
+45534553, ES-ES -> 0000040a
+45534d58, ES-MX -> 0000080a
+45534553, ES-ES -> 00000c0a
+45534754, ES-GT -> 0000100a
+45534352, ES-CR -> 0000140a
+45535041, ES-PA -> 0000180a
+4553444f, ES-DO -> 00001c0a
+45535645, ES-VE -> 0000200a
+4553434f, ES-CO -> 0000240a
+45535045, ES-PE -> 0000280a
+45534152, ES-AR -> 00002c0a
+45534543, ES-EC -> 0000300a
+4553434c, ES-CL -> 0000340a
+45535559, ES-UY -> 0000380a
+45535059, ES-PY -> 00003c0a
+4553424f, ES-BO -> 0000400a
+45535356, ES-SV -> 0000440a
+4553484e, ES-HN -> 0000480a
+45534e49, ES-NI -> 00004c0a
+45535052, ES-PR -> 0000500a
+46494649, FI-FI -> 0000040b
+46524652, FR-FR -> 0000040c
+46524245, FR-BE -> 0000080c
+46524341, FR-CA -> 00000c0c
+46524348, FR-CH -> 0000100c
+46524c55, FR-LU -> 0000140c
+48554855, HU-HU -> 0000040e
+49534953, IS-IS -> 0000040f
+49544954, IT-IT -> 00000410
+49544348, IT-CH -> 00000810
+4e4c4e4c, NL-NL -> 00000413
+4e4c4245, NL-BE -> 00000813
+4e4f4e4f, NO-NO -> 00000414
+4e4f4e4f, NO-NO -> 00000814
+504c504c, PL-PL -> 00000415
+50544252, PT-BR -> 00000416
+50545054, PT-PT -> 00000816
+524f524f, RO-RO -> 00000418
+52555255, RU-RU -> 00000419
+48524852, HR-HR -> 0000041a
+53525350, SR-SP -> 0000081a
+53525350, SR-SP -> 00000c1a
+534b534b, SK-SK -> 0000041b
+53565345, SV-SE -> 0000041d
+53564649, SV-FI -> 0000081d
+54525452, TR-TR -> 0000041f
+534c5349, SL-SI -> 00000424
+41465a41, AF-ZA -> 00000436
+5351414c, SQ-AL -> 0000041c
+45554553, EU-ES -> 0000042d
+42454259, BE-BY -> 00000423
+43414553, CA-ES -> 00000403
+45544545, ET-EE -> 00000425
+464f464f, FO-FO -> 00000438
+49444944, ID-ID -> 00000421
+4c564c56, LV-LV -> 00000426
+4c544c54, LT-LT -> 00000427
+554b5541, UK-UA -> 00000422
diff --git a/uppsrc/Core/lheap.cpp b/uppsrc/Core/lheap.cpp
new file mode 100644
index 000000000..875674901
--- /dev/null
+++ b/uppsrc/Core/lheap.cpp
@@ -0,0 +1,247 @@
+#include "Core.h"
+
+NAMESPACE_UPP
+
+#ifdef UPP_HEAP
+
+#define LLOG(x) //  LOG((void *)this << ' ' << x)
+
+#include "HeapImp.h"
+
+word  Heap::BinSz[LBINS];
+byte  Heap::SzBin[MAXBLOCK / 8 + 1];
+byte  Heap::BlBin[MAXBLOCK / 8 + 1];
+
+Heap::DLink Heap::lempty[1];
+
+void Heap::GlobalLInit()
+{
+	ONCELOCK {
+		int p = 32;
+		int bi = 0;
+		while(p < MAXBLOCK) {
+			BinSz[bi++] = p;
+			int add = minmax(6 * p / 100 / 32 * 32, 32, 2048);
+			p += add;
+		}
+		ASSERT(bi == LBINS - 1);
+		BinSz[LBINS - 1] = MAXBLOCK;
+		int k = 0;
+		for(int i = 0; i < MAXBLOCK / 8; i++) {
+			while(i * 8 + 7 > BinSz[k])
+				k++;
+			SzBin[i] = k;
+		}
+		k = LBINS - 1;
+		for(int i = MAXBLOCK / 8; i >= 0; i--) {
+			while(i * 8 < BinSz[k]) k--;
+			BlBin[i] = k;
+		}
+		BlBin[0] = 0;
+		big->LinkSelf();
+		lempty->LinkSelf();
+	}
+}
+
+inline
+void Heap::LinkFree(DLink *b, int size)
+{
+	int q = BlBin[size >> 4];
+	b->Link(freebin[q]);
+}
+
+Heap::DLink *Heap::AddChunk()
+{
+	DLink *ml;
+	if(lempty->next != lempty) {
+		ml = lempty->next;
+		ml->Unlink();
+		LLOG("Retrieved empty large " << (void *)ml);
+	}
+	else {
+		ml = (DLink *)AllocRaw64KB();
+		LLOG("AllocRaw64KB " << (void *)ml);
+	}
+	lcount++;
+	LLOG("lcount = " << lcount);
+	if(!ml) return NULL;
+	ml->Link(large);
+	Header *bh = (Header *)((byte *)ml + LARGEHDRSZ);
+	bh->size = MAXBLOCK;
+	bh->prev = 0;
+	bh->free = true;
+	bh->heap = this;
+	DLink *b = bh->GetBlock();
+	LinkFree(b, MAXBLOCK);
+	DbgFreeFill(b + 1, MAXBLOCK - sizeof(DLink));
+	bh = bh->Next();
+	bh->prev = MAXBLOCK;
+	bh->size = 0;
+	bh->free = false;
+	bh->heap = this;
+	return b;
+}
+
+inline
+void *Heap::DivideBlock(DLink *b, int size, int ii)
+{
+	b->Unlink();
+	Header *bh = b->GetHeader();
+	ASSERT(bh->size >= size && size > 0);
+	bh->free = false;
+	int sz2 = bh->size - size - sizeof(Header);
+	if(sz2 >= 32) {
+		Header *bh2 = (Header *)((byte *)b + size);
+		bh2->prev = size;
+		bh2->free = true;
+		bh2->heap = this;
+		LinkFree(bh2->GetBlock(), sz2);
+		bh->Next()->prev = bh2->size = sz2;
+		bh->size = size;
+	}
+	DbgFreeCheck(b + 1, size - sizeof(DLink));
+	return b;
+}
+
+void Heap::MoveLarge(Heap *dest, DLink *l)
+{
+	dest->lcount++;
+	LLOG("Moving large " << (void *)l << " to " << (void *)dest << " lcount " << dest->lcount);
+	Mutex::Lock __(mutex);
+	l->Unlink();
+	l->Link(dest->large);
+	Header *h = (Header *)((byte *)l + LARGEHDRSZ);
+	while(h->size) {
+		h->heap = dest;
+		if(h->free) {
+			DLink *b = h->GetBlock();
+			b->Unlink();
+			dest->LinkFree(b, h->size);
+		}
+		h = h->Next();
+	}
+	aux.lcount = 10000;
+}
+
+void Heap::MoveToEmpty(DLink *l, Header *bh)
+{
+	LLOG("Moving empty large " << (void *)l << " to global empty storage, lcount " << lcount);
+	bh->GetBlock()->Unlink();
+	l->Unlink();
+	Mutex::Lock __(mutex);
+	l->Link(lempty);
+	aux.lcount = 10000;
+}
+
+inline
+void *Heap::TryLAlloc(int ii, int size)
+{
+	while(ii < LBINS) {
+		if(freebin[ii] != freebin[ii]->next) {
+			void *ptr = DivideBlock(freebin[ii]->next, (int)size, ii);
+			LLOG("TryLAlloc succeeded " << (void *)ptr);
+			ASSERT((size_t)ptr & 8);
+			return ptr;
+		}
+		ii++;
+	}
+	return NULL;
+}
+
+int sBig__;
+
+void *Heap::LAlloc(size_t& size) {
+	LLOG("LAlloc " << size);
+	ASSERT(size > 256);
+	if(!initialized)
+		Init();
+	if(size > MAXBLOCK) {
+		Mutex::Lock __(mutex);
+		BigHdr *h = (BigHdr *)SysAllocRaw(size + BIGHDRSZ);
+		if(!h)
+			Panic("Out of memory!");
+		h->Link(big);
+		h->size = size = ((size + BIGHDRSZ + 4095) & ~4095) - BIGHDRSZ;
+		Header *b = (Header *)((byte *)h + BIGHDRSZ - sizeof(Header));
+		b->size = 0;
+		b->free = false;
+		sBig__++;
+		LLOG("Big alloc " << (void *)b->GetBlock());
+		return b->GetBlock();
+	}
+	int bini = SizeToBin((int)size);
+	size = BinSz[bini];
+	void *ptr = TryLAlloc(bini, size);
+	if(ptr)
+		return ptr;
+	Mutex::Lock __(mutex);
+	if(remote_free) {
+		FreeRemoteRaw();
+		ptr = TryLAlloc(bini, size);
+		if(ptr) return ptr;
+	}
+	aux.FreeRemoteRaw();
+	while(aux.large->next != aux.large) {
+		LLOG("Adopting large block " << (void *)aux.large->next);
+		MoveLarge(this, aux.large->next);
+		lcount++;
+		ptr = TryLAlloc(bini, size);
+		if(ptr) return ptr;
+	}
+	DLink *n = AddChunk();
+	if(!n)
+		Panic("Out of memory!");
+	ptr = DivideBlock(n, (int)size, LBINS - 1);
+	LLOG("LAlloc via AddChunk " << (void *)ptr);
+	ASSERT((size_t)ptr & 8);
+	return ptr;
+}
+
+void Heap::LFree(void *ptr) {
+	DLink  *b = (DLink *)ptr;
+	Header *bh = b->GetHeader();
+	if(bh->size == 0) {
+		Mutex::Lock __(mutex);
+		ASSERT(((dword)(uintptr_t)bh & 4095) == BIGHDRSZ - sizeof(Header));
+		BigHdr *h = (BigHdr *)((byte *)ptr - BIGHDRSZ);
+		h->Unlink();
+		LLOG("Big free " << (void *) ptr << " size " << h->size);
+		SysFreeRaw(h, h->size);
+		sBig__--;
+		return;
+	}
+	if(bh->heap != this) {
+		LLOG("Remote large, heap " << (void *)bh->heap);
+		bh->heap->RemoteFree(ptr);
+		return;
+	}
+	if(bh->prev) {
+		Header *p = bh->Prev();
+		if(p->free) {
+			b = p->GetBlock();
+			b->Unlink();
+			p->size += bh->size + sizeof(Header);
+			p->Next()->prev = p->size;
+			bh = p;
+		}
+	}
+	Header *n = bh->Next();
+	if(n->free) {
+		n->GetBlock()->Unlink();
+		bh->size += n->size + sizeof(Header);
+		n->Next()->prev = bh->size;
+	}
+	bh->free = true;
+	LinkFree(b, bh->size);
+	DbgFreeFill(b + 1, bh->size - sizeof(DLink));
+	LLOG("Freed, joined size " << bh->size << " lcount " << lcount);
+	if(bh->size == MAXBLOCK && lcount > 1) {
+		DLink *l = (DLink *)((byte *)bh - LARGEHDRSZ);
+		lcount--;
+		MoveToEmpty(l, bh);
+	}
+}
+
+#endif
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/Core/lt_.h b/uppsrc/Core/lt_.h
new file mode 100644
index 000000000..1a3b72eba
--- /dev/null
+++ b/uppsrc/Core/lt_.h
@@ -0,0 +1,10 @@
+#ifdef t_
+#undef t_
+#endif
+
+#ifdef tt_
+#undef tt_
+#endif
+
+#define t_(x)          x
+#define tt_(x)         x
diff --git a/uppsrc/Core/mathutil.cpp b/uppsrc/Core/mathutil.cpp
new file mode 100644
index 000000000..80b83e9bd
--- /dev/null
+++ b/uppsrc/Core/mathutil.cpp
@@ -0,0 +1,259 @@
+#include "Core.h"
+
+NAMESPACE_UPP
+
+// iscale: computes x * y / z.
+
+int iscale(int x, int y, int z)
+{
+#ifdef __NOASSEMBLY__
+	int64 res = x;
+	res *= y;
+	res /= z;
+	return (int)res;
+#else
+	__asm
+	{
+		mov		eax, [x]
+		imul	[y]
+		idiv	[z]
+	}
+#endif
+}
+
+// iscalefloor: computes x * y / z, rounded towards -infty.
+
+int iscalefloor(int x, int y, int z)
+{
+#ifdef __NOASSEMBLY__
+	int64 res = x;
+	int64 mulres = res * y;
+	res = mulres / z;
+	if(res * z != mulres)
+		res--;
+	return (int)res;
+#else
+	__asm
+	{
+		mov		eax, [x]
+		imul	[y]
+		idiv	[z]
+		and		edx, edx
+		jge		__1
+		dec		eax
+	__1:
+	}
+#endif
+}
+
+// iscaleceil: computes x * y / z, rounded towards +infty.
+
+int iscaleceil(int x, int y, int z)
+{
+#ifdef __NOASSEMBLY__
+	int64 res = x;
+	int64 mulres = res * y;
+	res = mulres / z;
+	if(res * z != mulres)
+		res++;
+	return (int)res;
+#else
+	__asm
+	{
+		mov		eax, [x]
+		imul	[y]
+		idiv	[z]
+		and		edx, edx
+		jle		__1
+		inc		eax
+	__1:
+	}
+#endif
+}
+
+#ifdef PLATFORM_WIN32
+#pragma warning(default: 4035)
+#endif
+
+// idivfloor: returns x / y, truncated towards -infinity.
+
+int idivfloor(int x, int y)
+{
+	return x / y - (x % y < 0);
+}
+
+// idivceil: returns x / y, truncated towards +infinity.
+
+int idivceil(int x, int y)
+{
+	return x / y + (x % y > 0);
+}
+
+// itimesfloor: moves x to nearest lower multiple of y.
+
+int itimesfloor(int x, int y)
+{
+	return y * idivfloor(x, y);
+}
+
+// itimesceil: moves x to nearest higher multiple of y.
+
+int itimesceil(int x, int y)
+{
+	return y * idivceil(x, y);
+}
+
+// fround: converts double to nearest integer. Checks integer limits.
+
+int fround(double value)
+{
+	return value >= INT_MAX ? INT_MAX : value <= INT_MIN ? INT_MIN
+		: (int)floor(value + 0.5);
+}
+
+// ffloor: converts double to integer rounding towards -infinity. Checks integer limits.
+
+int ffloor(double value)
+{
+	return value >= INT_MAX ? INT_MAX : value <= INT_MIN ? INT_MIN
+		: (int)floor(value);
+}
+
+// fceil: converts double to integer rounding towards +infinity. Checks integer limits.
+
+int fceil(double value)
+{
+	return value >= INT_MAX ? INT_MAX : value <= INT_MIN ? INT_MIN
+		: (int)ceil(value);
+}
+
+// fround: converts double to nearest integer. Checks integer limits.
+
+int64 fround64(double value)
+{
+	return value >= INT64_MAX ? INT64_MAX : value <= INT64_MIN ? INT64_MIN
+		: (int64)floor(value + 0.5);
+}
+
+// ffloor: converts double to integer rounding towards -infinity. Checks integer limits.
+
+int64 ffloor64(double value)
+{
+	return value >= INT64_MAX ? INT64_MAX : value <= INT64_MIN ? INT64_MIN
+		: (int64)floor(value);
+}
+
+// fceil: converts double to integer rounding towards +infinity. Checks integer limits.
+
+int64 fceil64(double value)
+{
+	return value >= INT64_MAX ? INT64_MAX : value <= INT64_MIN ? INT64_MIN
+		: (int64)ceil(value);
+}
+
+// asString: converts double numbers to strings.
+
+String AsString(double x, int digits)
+{
+	if(IsNull(x))
+		return Null;
+
+	if(fabs(x) >= 1e15)
+		return Format("%g", x);
+
+	char h[64];
+	strcpy(h, Format("%.*f", abs(digits), x));
+	if(digits <= 0)
+		return h;
+	char* s = h;
+	char* e = s + strlen(s);
+
+	if(digits > 0)
+	{
+		while(e[-1] == '0')
+			e--;
+		if(e[-1] == '.')
+			e--;
+		*e = 0;
+		if(!strcmp(s, "-0"))
+			s++;
+	}
+	return s;
+}
+
+// modulo: working version of math function `fmod'.
+
+double modulo(double x, double y)
+{
+	return y ? (x - y * floor(x / y)) : x;
+}
+
+int ilog10(double d)
+{
+	if(IsNull(d) || d == 0)
+		return Null;
+	return fceil(log10(fabs(d)));
+}
+
+double ipow10(int i)
+{
+	static const double pow_tbl[] =
+	{
+		1e00,
+		1e01, 1e02, 1e03, 1e04, 1e05, 1e06, 1e07, 1e08, 1e09, 1e10,
+		1e11, 1e12, 1e13, 1e14, 1e15, 1e16, 1e17, 1e18, 1e19, 1e20,
+		1e21, 1e22, 1e23, 1e24, 1e25, 1e26, 1e27, 1e28, 1e29, 1e30,
+		1e31, 1e32, 1e33, 1e34, 1e35, 1e36, 1e37, 1e38, 1e39, 1e40,
+		1e41, 1e42, 1e43, 1e44, 1e45, 1e46, 1e47, 1e48, 1e49, 1e50,
+	};
+	if(i >= 0 && i < __countof(pow_tbl))
+		return pow_tbl[i];
+	else if(i < 0 && i > -__countof(pow_tbl))
+		return 1 / pow_tbl[-i];
+	return pow(10.0, (double)i);
+}
+
+double normalize(double d, int& exp)
+{
+	if(IsNull(d) || d == 0)
+	{
+		exp = Null;
+		return d;
+	}
+	bool sign = (d < 0);
+	if(sign) d = -d;
+	exp = minmax<int>(ilog10(d), -300, +300); // 8-byte double!
+	d /= ipow10(exp);
+	if(d >= 10) { d /= 10; exp++; }
+	if(d < 1)   { d *= 10; exp--; }
+	return sign ? -d : d;
+}
+
+double roundr(double d, int digits)
+{
+	int i = ilog10(d);
+	if(IsNull(i))
+		return d;
+	double fac = ipow10(i - digits);
+	return floor(d / fac + 0.5) * fac;
+}
+
+double floorr(double d, int digits)
+{
+	int i = ilog10(d);
+	if(IsNull(i))
+		return d;
+	double fac = ipow10(i - digits);
+	return floor(d / fac) * fac;
+}
+
+double ceilr(double d, int digits)
+{
+	int i = ilog10(d);
+	if(IsNull(i))
+		return d;
+	double fac = ipow10(i - digits);
+	return ceil(d / fac) * fac;
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/Core/parser.cpp b/uppsrc/Core/parser.cpp
new file mode 100644
index 000000000..1bf1d6bb7
--- /dev/null
+++ b/uppsrc/Core/parser.cpp
@@ -0,0 +1,450 @@
+#include "Core.h"
+
+NAMESPACE_UPP
+
+#define LLOG(x)    // LOG(x)
+#define LTIMING(x) // RTIMING(x)
+
+void CParser::ThrowError(const char *s) {
+	LLOG("CParser::Error: " << s);
+	LLOG(~String(term, min(strlen((const char *)term), 512U)));
+	Error err(fn + Format("(%d): ", line) + s);
+//	err.term = (const char *)term;
+	throw err;
+}
+
+bool CParser::Spaces0() {
+	LTIMING("Spaces");
+	if(*term > ' ' &&
+	   !(term[0] == '/' && term[1] == '/') &&
+	   !(term[0] == '/' && term[1] == '*'))
+		return false;
+	for(;;) {
+		if(term[0] == '/' && term[1] == '/') {
+			term += 2;
+			while(*term && *term != '\n')
+				term++;
+		}
+		else
+		if(term[0] == '/' && term[1] == '*') {
+			term += 2;
+			while(*term) {
+				if(term[0] == '*' && term[1] == '/') {
+					term += 2;
+					break;
+				}
+				if(*term++ == '\n') line++;
+			}
+		}
+		if(!*term) break;
+		if(*term > ' ') break;
+		if(*term == '\n') line++;
+		term++;
+	}
+	return true;
+}
+
+bool CParser::Id0(const char *s) {
+	LTIMING("Id");
+	const char *t = term + 1;
+	s++;
+	while(*s) {
+		if(*t != *s)
+			return false;
+		t++;
+		s++;
+	}
+	if(IsAlNum(*t) || *t == '_')
+		return false;
+	term = t;
+	DoSpaces();
+	return true;
+}
+
+void CParser::PassId(const char *s) throw(Error) {
+	LTIMING("PassId");
+	if(!Id(s))
+		ThrowError(String("missing '") + s + "\'");
+}
+
+void CParser::PassChar(char c) throw(Error) {
+	LTIMING("PassChar");
+	if(!Char(c))
+		ThrowError(String("missing '") + c + "\'");
+}
+
+void CParser::PassChar2(char c1, char c2) throw(Error) {
+	LTIMING("PassChar2");
+	if(!Char2(c1, c2))
+		ThrowError(String("missing '") + c1 + c2 + "\'");
+}
+
+void CParser::PassChar3(char c1, char c2, char c3) throw(Error) {
+	LTIMING("PassChar3");
+	if(!Char3(c1, c2, c3))
+		ThrowError(String("missing '") + c1 + c2 + c3 + "\'");
+}
+
+String CParser::ReadId() throw(Error) {
+	LTIMING("ReadId");
+	if(!IsId())
+		ThrowError("missing id");
+	String result;
+	const char *b = term;
+	const char *p = b;
+	while(iscid(*p))
+		p++;
+	term = p;
+	DoSpaces();
+	return String(b, p - b);
+}
+
+String CParser::ReadIdt() throw(Error) {
+	if(!IsId())
+		ThrowError("missing id");
+	StringBuffer result;
+	int lvl = 0;
+	while(IsAlNum(*term) || *term == '_' || *term == '<' || *term == '>' ||
+	      *term == ':' || (*term == ',' || *term == ' ' ) && lvl > 0 ) {
+		if(*term == '<') lvl++;
+		if(*term == '>') lvl--;
+		result.Cat(*term++);
+	}
+	DoSpaces();
+	return result;
+}
+
+bool CParser::IsInt() {
+	LTIMING("IsInt");
+	const char *t = term;
+	if(*t == '-' || *t == '+') {
+		t++;
+		while(*t <= ' ')
+			t++;
+	}
+	return IsDigit(*t);
+}
+
+int  CParser::ReadInt() throw(Error) {
+	LTIMING("ReadInt");
+	int sign = 1;
+	if(*term == '-') {
+		sign = -1;
+		term++;
+	}
+	else
+	if(*term == '+')
+		term++;
+	Spaces();
+	if(!IsDigit(*term))
+		ThrowError("missing number");
+	int n = 0;
+	while(IsDigit(*term))
+		n = 10 * n + *term++ - '0';
+	DoSpaces();
+	return sign * n;
+}
+
+bool CParser::IsNumber(int base)
+{
+	if(IsDigit(*term))
+		return true;
+	int q = ToUpper(*term) - 'A';
+	return q >= 0 && q < base - 10;
+}
+
+uint32  CParser::ReadNumber(int base) throw(Error)
+{
+	LTIMING("ReadNumber");
+	uint32 n = 0;
+	int q = ctoi(*term);
+	if(q < 0 || q >= base)
+		ThrowError("missing number");
+	for(;;) {
+		int c = ctoi(*term);
+		if(c < 0 || c >= base)
+			break;
+		n = base * n + c;
+		term++;
+	}
+	DoSpaces();
+	return n;
+}
+
+uint64  CParser::ReadNumber64(int base) throw(Error)
+{
+	LTIMING("ReadNumber");
+	uint64 n = 0;
+	int q = ctoi(*term);
+	if(q < 0 || q >= base)
+		ThrowError("missing number");
+	for(;;) {
+		int c = ctoi(*term);
+		if(c < 0 || c >= base)
+			break;
+		n = base * n + c;
+		term++;
+	}
+	DoSpaces();
+	return n;
+}
+
+double CParser::ReadDouble() throw(Error)
+{
+	LTIMING("ReadDouble");
+	int sign = 1;
+	if(*term == '-') {
+		sign = -1;
+		term++;
+	}
+	else
+	if(*term == '+')
+		term++;
+	Spaces();
+	if(!IsDigit(*term))
+		ThrowError("missing number");
+	double n = 0;
+	while(IsDigit(*term))
+		n = 10 * n + *term++ - '0';
+	if(Char('.')) {
+		double q = 1;
+		while(IsDigit(*term)) {
+			q = q / 10;
+			n += q * (*term++ - '0');
+		}
+	}
+	if(Char('e') || Char('E'))
+		n *= pow(10.0, ReadInt());
+	DoSpaces();
+	return sign * n;
+}
+
+String CParser::ReadOneString(int delim, bool chkend) throw(Error) {
+	if(!IsChar(delim))
+		ThrowError("missing string");
+	term++;
+	StringBuffer result;
+	for(;;) {
+		if(*term == delim) {
+			term++;
+			DoSpaces();
+			return result;
+		}
+		else
+		if(*term == '\\') {
+			switch(*++term) {
+			case 'a': result.Cat('\a'); term++; break;
+			case 'b': result.Cat('\b'); term++; break;
+			case 't': result.Cat('\t'); term++; break;
+			case 'v': result.Cat('\v'); term++; break;
+			case 'n': result.Cat('\n'); term++; break;
+			case 'r': result.Cat('\r'); term++; break;
+			case 'f': result.Cat('\f'); term++; break;
+			case 'x': {
+				int hex = 0;
+				if(IsXDigit(*++term)) {
+					hex = ctoi(*term);
+					if(IsXDigit(*++term)) {
+						hex = 16 * hex + (*term >= 'A' ? ToUpper(*term) - 'A' + 10 : *term - '0');
+						if(IsXDigit(*++term)) {
+							hex = 16 * hex + (*term >= 'A' ? ToUpper(*term) - 'A' + 10 : *term - '0');
+							term++;
+						}
+					}
+				}
+				result.Cat(hex);
+				break;
+			}
+			default:
+				if(*term >= '0' && *term <= '7') {
+					int oct = *term++ - '0';
+					if(*term >= '0' && *term <= '7')
+						oct = 8 * oct + *term++ - '0';
+					if(*term >= '0' && *term <= '7')
+						oct = 8 * oct + *term++ - '0';
+					result.Cat(oct);
+				}
+				else
+					result.Cat(*term++);
+				break;
+			}
+		}
+		else {
+			if(*term < ' ') {
+				if(chkend) {
+					ThrowError("Unterminated string");
+					return result;
+				}
+				if(*term == '\0')
+					return result;
+			}
+			result.Cat(*term++);
+		}
+	}
+	DoSpaces();
+	return result;
+}
+
+String CParser::ReadOneString(bool chkend) throw(Error)
+{
+	return ReadOneString('\"', chkend);
+}
+
+String CParser::ReadString(int delim, bool chkend) throw(Error) {
+	LTIMING("ReadString");
+	String result;
+	do
+		result.Cat(ReadOneString(delim, chkend));
+	while(IsChar(delim));
+	return result;
+}
+
+String CParser::ReadString(bool chkend) throw(Error)
+{
+	return ReadString('\"', chkend);
+}
+
+char CParser::GetChar()
+{
+	char c = *term++;
+	if(c == '\n')
+		line++;
+	return c;
+}
+
+void CParser::SkipTerm()
+{
+	LTIMING("SkipTerm");
+	if(IsId())
+		while(IsAlNum(*term) || *term == '_')
+			term++;
+	else
+	if(IsNumber())
+		while(IsDigit(*term))
+			term++;
+	else
+	if(IsString())
+		ReadString();
+	else
+	if(IsChar('\''))
+		ReadString('\'', false);
+	else
+	if(*term)
+		term++;
+	DoSpaces();
+}
+
+CParser::Pos  CParser::GetPos()
+{
+	Pos p;
+	p.line = line;
+	p.fn = fn;
+	p.ptr = (const char *)term;
+	return p;
+}
+
+void CParser::SetPos(const CParser::Pos& p)
+{
+	line = p.line;
+	fn = p.fn;
+	term = p.ptr;
+	DoSpaces();
+}
+
+CParser::CParser(const char *ptr)
+: term(ptr)
+{
+	line = 1;
+	skipspaces = true;
+	Spaces();
+}
+
+CParser::CParser(const char *ptr, const char *fn, int line)
+: term(ptr), line(line), fn(fn)
+{
+	skipspaces = true;
+	Spaces();
+}
+
+CParser::CParser()
+{
+	term = NULL;
+	line = 0;
+	skipspaces = true;
+}
+
+void CParser::Set(const char *_ptr, const char *_fn, int _line)
+{
+	term = _ptr;
+	fn = _fn;
+	line = _line;
+	skipspaces = true;
+	Spaces();
+}
+
+void CParser::Set(const char *_ptr)
+{
+	Set(_ptr, "", 1);
+}
+
+
+inline void NextCStringLine(String& t, const char *linepfx, int& pl)
+{
+	t << "\"\r\n" << (linepfx ? linepfx : "") << "\"";
+	pl = t.GetLength();
+}
+
+String AsCString(const char *s, const char *lim, int linemax, const char *linepfx, dword flags)
+{
+	String t;
+	t.Cat('\"');
+	int pl = 0;
+	bool wasspace = false;
+	while(s < lim) {
+		if(t.GetLength() - pl > linemax && (!(flags & ASCSTRING_SMART) || wasspace))
+			NextCStringLine(t, linepfx, pl);
+		wasspace = false;
+		switch(*s) {
+		case '\a': t.Cat("\\a"); break;
+		case '\b': t.Cat("\\b"); break;
+		case '\f': t.Cat("\\f"); break;
+		case '\t': t.Cat("\\t"); break;
+		case '\v': t.Cat("\\v"); break;
+		case '\r': t.Cat("\\r"); break;
+		case '\"': t.Cat("\\\""); break;
+		case '\\': t.Cat("\\\\"); break;
+		case '\n': t.Cat("\\n"); wasspace = true; break;
+		default:
+			if(byte(*s) < 32 || (byte)*s >= 0x7f && (flags & ASCSTRING_OCTALHI) || (byte)*s == 0xff) {
+				char h[4];
+				int q = (byte)*s;
+				h[0] = '\\';
+				h[1] = (3 & (q >> 6)) + '0';
+				h[2] = (7 & (q >> 3)) + '0';
+				h[3] = (7 & q) + '0';
+				t.Cat(h, 4);
+			}
+			else {
+				t.Cat(*s);
+				if(*s == ' ')
+					wasspace = true;
+			}
+			break;
+		}
+		s++;
+	}
+	t.Cat('\"');
+	return t;
+}
+
+String AsCString(const char *s, int linemax, const char *linepfx, dword flags)
+{
+	return AsCString(s, s + strlen(s), linemax, linepfx, flags);
+}
+
+String AsCString(const String& s, int linemax, const char *linepfx, dword flags)
+{
+	return AsCString(s, s.End(), linemax, linepfx, flags);
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/Core/prj.aux b/uppsrc/Core/prj.aux
new file mode 100644
index 000000000..2845bf082
--- /dev/null
+++ b/uppsrc/Core/prj.aux
@@ -0,0 +1,13 @@
+file
+	e:\out\upp\Core\CONSOLE-MAIN-MSC-RELEASE-WIN32\Core.log,
+	G:\upp2out\Core\Console-main-msc-release-win32\Core.log,
+	G:\upp2out\Core\Console-debug-main-msc-win32\Core.log,
+	E:\test.txt,
+	F:\uppsrc\Platform\platform.h,
+	F:\Source\helpfile,
+	G:\upp2out\Core\Console-main-msc-release-win32\Core.map,
+	win32.h,
+	H:\keysymdef.h,
+	G:\XDoc\Unicode\UnicodeData.txt,
+	e:\out\upp\Core\CONSOLE-MAIN-MSC-RELEASE-WIN32\Core.log,
+	e:\out\upp\Core\CONSOLE-DEBUG-MAIN-MSC-WIN32\Core.log;
diff --git a/uppsrc/Core/sheap.cpp b/uppsrc/Core/sheap.cpp
new file mode 100644
index 000000000..fd90255d2
--- /dev/null
+++ b/uppsrc/Core/sheap.cpp
@@ -0,0 +1,364 @@
+#include <Core/Core.h>
+//#BLITZ_APPROVE
+
+NAMESPACE_UPP
+
+#ifdef UPP_HEAP
+
+#include "HeapImp.h"
+
+#define LLOG(x) //  LOG((void *)this << ' ' << x)
+
+inline void Heap::Page::Format(int k)
+{
+	DbgFreeFill(Begin(), End() - Begin());
+	klass = k;
+	active = 0;
+	int sz = Ksz(k);
+	byte *ptr = End() - sz;
+	byte *b = Begin();
+	FreeLink *l = NULL;
+	while(ptr >= b) {
+		((FreeLink *)ptr)->next = l;
+		l = (FreeLink *)ptr;
+		ptr -= sz;
+	}
+	freelist = l;
+}
+
+Heap::Page *Heap::WorkPage(int k)
+{
+	LLOG("AllocK - next work not available " << k << " empty: " << (void *)empty[k]);
+	Page *page = empty[k];
+	empty[k] = NULL;
+	if(!page) {
+		LLOG("AllocK - trying FreeRemote");
+		FreeRemote();
+		if(work[k]->freelist) {
+			LLOG("AllocK - work available after FreeRemote " << k);
+			return work[k];
+		}
+		page = empty[k];
+		empty[k] = NULL;
+	}
+	if(!page)
+		for(int i = 0; i < NKLASS; i++)
+			if(empty[i]) {
+				LLOG("AllocK - free page available for reformatting " << k);
+				page = empty[i];
+				empty[i] = NULL;
+				page->Format(k);
+				break;
+			}
+	if(!page) {
+		Mutex::Lock __(mutex);
+		aux.FreeRemoteRaw();
+		if(aux.work[k]->next != aux.work[k]) {
+			page = aux.work[k]->next;
+			page->Unlink();
+			page->heap = this;
+			LLOG("AllocK - adopting aux page " << k << " page: " << (void *)page << ", free " << (void *)page->freelist);
+		}
+		if(!page && aux.empty[k]) {
+			page = aux.empty[k];
+			aux.empty[k] = page->next;
+			LLOG("AllocK - empty aux page available of the same format " << k << " page: " << (void *)page << ", free " << (void *)page->freelist);
+		}
+		if(!page)
+			for(int i = 0; i < NKLASS; i++)
+				if(aux.empty[i]) {
+					page = aux.empty[i];
+					aux.empty[i] = page->next;
+					page->Format(k);
+					LLOG("AllocK - empty aux page available for reformatting " << k << " page: " << (void *)page << ", free " << (void *)page->freelist);
+					break;
+				}
+		if(!page) {
+			page = (Page *)AllocRaw4KB();
+			LLOG("AllocK - allocated new system page " << (void *)page << " " << k);
+			page->Format(k);
+		}
+		page->heap = this;
+	}
+	page->Link(work[k]);
+	ASSERT(page->klass == k);
+	return page;
+}
+
+void *Heap::AllocK(int k)
+{
+	LLOG("AllocK " << k);
+	if(!initialized)
+		Init();
+	Page *page = work[k]->next;
+	for(;;) {
+		ASSERT(page->klass == k);
+		FreeLink *p = page->freelist;
+		if(p) {
+			LLOG("AllocK allocating from " << (void *)page << " " << (void *)p);
+			page->freelist = p->next;
+			++page->active;
+			return p;
+		}
+		LLOG("AllocK - page exhausted " << k << " page: " << (void *)page);
+		if(page->next != page) {
+			LLOG("Moving " << (void *)page << " to full");
+			page->Unlink();
+			page->Link(full[k]);
+			page = work[k]->next;
+		}
+		if(page->next == page)
+			page = WorkPage(k);
+	}
+}
+
+
+inline
+void *Heap::Allok(int k)
+{
+	FreeLink *ptr = cache[k];
+	if(ptr) {
+		cachen[k]++;
+		cache[k] = ptr->next;
+		return DbgFreeCheckK(ptr, k);
+	}
+	return DbgFreeCheckK(AllocK(k), k);
+}
+
+inline
+void *Heap::Alloc(size_t sz)
+{
+	Stat(sz);
+	if(sz <= 224) {
+		if(sz == 0) sz = 1;
+		return Allok(((int)sz - 1) >> 4);
+	}
+	if(sz <= 576)
+		return Allok(sz <= 368 ? sz <= 288 ? 14 : 15 : sz <= 448 ? 16 : 17);
+	return LAlloc(sz);
+}
+
+inline
+void *Heap::AllocSz(size_t& sz)
+{
+	Stat(sz);
+	if(sz <= 224) {
+		if(sz == 0) sz = 1;
+		int k = ((int)sz - 1) >> 4;
+		sz = (k + 1) << 4;
+		return Allok(k);
+	}
+	if(sz <= 576) {
+		int k;
+		if(sz <= 368)
+			if(sz <= 288)
+				sz = 288, k = 14;
+			else
+				sz = 368, k = 15;
+		else
+			if(sz <= 448)
+				sz = 448, k = 16;
+			else
+				sz = 576, k = 17;
+		return Allok(k);
+	}
+	return LAlloc(sz);
+}
+
+inline
+void Heap::FreeK(void *ptr, Page *page, int k)
+{
+	if(page->freelist) {
+		LLOG("Free next in work page " << k);
+		((FreeLink *)ptr)->next = page->freelist;
+	}
+	else {
+		LLOG("Free full to work " << k << " heap: " << (void *)page->heap);
+		page->Unlink();
+		page->Link(work[k]);
+		((FreeLink *)ptr)->next = NULL;
+	}
+	page->freelist = (FreeLink *)ptr;
+	if(--page->active == 0) {
+		LLOG("Free page is empty" << " " << (void *)page);
+		page->Unlink();
+		if(this == &aux) {
+			LLOG("...is aux");
+			page->next = empty[k];
+			empty[k] = page;
+		}
+		else {
+			if(empty[k]) {
+				LLOG("Global free " << k << " " << (void *)empty[k]);
+				Mutex::Lock __(mutex);
+				empty[k]->heap = &aux;
+				empty[k]->next = aux.empty[k];
+				aux.empty[k] = empty[k];
+			}
+			empty[k] = page;
+		}
+	}
+}
+
+void Heap::Free(void *ptr)
+{
+	if(!ptr) return;
+	LLOG("Free " << ptr);
+	if((((dword)(uintptr_t)ptr) & 8) == 0) {
+		Page *page = (Page *)((uintptr_t)ptr & ~(uintptr_t)4095);
+		int k = page->klass;
+		LLOG("Small free page: " << (void *)page << ", k: " << k << ", ksz: " << Ksz(k));
+		ASSERT((4096 - ((uintptr_t)ptr & (uintptr_t)4095)) % Ksz(k) == 0);
+#ifdef _MULTITHREADED
+		if(page->heap != this) {
+			page->heap->RemoteFree(ptr);
+			return;
+		}
+#endif
+		DbgFreeFillK(ptr, k);
+		if(cachen[k]) {
+			cachen[k]--;
+			FreeLink *l = (FreeLink *)ptr;
+			l->next = cache[k];
+			cache[k] = l;
+			return;
+		}
+		FreeK(ptr, page, k);
+	}
+	else
+		LFree(ptr);
+}
+
+void Heap::FreeDirect(void *ptr)
+{
+	LLOG("Free Direct " << ptr);
+	if((((dword)(uintptr_t)ptr) & 8) == 0) {
+		Page *page = (Page *)((uintptr_t)ptr & ~(uintptr_t)4095);
+		int k = page->klass;
+		LLOG("Small free page: " << (void *)page << ", k: " << k << ", ksz: " << Ksz(k));
+		ASSERT((4096 - ((uintptr_t)ptr & (uintptr_t)4095)) % Ksz(k) == 0);
+		DbgFreeFillK(ptr, k);
+		FreeK(ptr, page, k);
+	}
+	else
+		LFree(ptr);
+}
+
+inline
+void *Heap::Alloc32()
+{
+	Stat(32);
+	return Allok(1);
+}
+
+inline
+void Heap::Free32(void *ptr)
+{
+	Page *page = (Page *)((uintptr_t)ptr & ~(uintptr_t)4095);
+	LLOG("Small free page: " << (void *)page << ", k: " << k << ", ksz: " << Ksz(k));
+	ASSERT((4096 - ((uintptr_t)ptr & (uintptr_t)4095)) % Ksz(1) == 0);
+#ifdef _MULTITHREADED
+	if(page->heap != this) {
+		page->heap->RemoteFree(ptr);
+		return;
+	}
+#endif
+	DbgFreeFillK(ptr, 1);
+	if(cachen[1]) {
+		cachen[1]--;
+		FreeLink *l = (FreeLink *)ptr;
+		l->next = cache[1];
+		cache[1] = l;
+		return;
+	}
+	FreeK(ptr, page, 1);
+}
+
+inline
+void *Heap::Alloc48()
+{
+	Stat(48);
+	return Allok(2);
+}
+
+inline
+void Heap::Free48(void *ptr)
+{
+	Page *page = (Page *)((uintptr_t)ptr & ~(uintptr_t)4095);
+	LLOG("Small free page: " << (void *)page << ", k: " << k << ", ksz: " << Ksz(k));
+	ASSERT((4096 - ((uintptr_t)ptr & (uintptr_t)4095)) % Ksz(2) == 0);
+#ifdef _MULTITHREADED
+	if(page->heap != this) {
+		page->heap->RemoteFree(ptr);
+		return;
+	}
+#endif
+	DbgFreeFillK(ptr, 2);
+	if(cachen[2]) {
+		cachen[2]--;
+		FreeLink *l = (FreeLink *)ptr;
+		l->next = cache[2];
+		cache[2] = l;
+		return;
+	}
+	FreeK(ptr, page, 2);
+}
+
+Heap::Page    dummy;
+#define DI    { 0, 0, 0, 0, &dummy, &dummy }
+
+thread__ Heap heap = {
+	{ DI, DI, DI, DI, DI, DI, DI, DI, DI, DI, DI, DI, DI, DI, DI, DI, DI, DI }
+};
+
+#if defined(HEAPDBG)
+void *MemoryAlloc_(size_t sz)
+{
+	return heap.Alloc(sz);
+}
+
+void  MemoryFree_(void *ptr)
+{
+	heap.Free(ptr);
+}
+#else
+void *MemoryAlloc(size_t sz)
+{
+	return heap.Alloc(sz);
+}
+
+void *MemoryAllocSz(size_t& sz)
+{
+	return heap.AllocSz(sz);
+}
+
+void  MemoryFree(void *ptr)
+{
+	heap.Free(ptr);
+}
+
+void *MemoryAlloc32()
+{
+	return heap.Alloc32();
+}
+
+void  MemoryFree32(void *ptr)
+{
+	heap.Free32(ptr);
+}
+
+void *MemoryAlloc48()
+{
+	return heap.Alloc48();
+}
+
+void  MemoryFree48(void *ptr)
+{
+	heap.Free48(ptr);
+}
+
+#endif
+
+#endif
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/Core/src.tpp/AIndex$en-us.tpp b/uppsrc/Core/src.tpp/AIndex$en-us.tpp
new file mode 100644
index 000000000..2cf719726
--- /dev/null
+++ b/uppsrc/Core/src.tpp/AIndex$en-us.tpp
@@ -0,0 +1,21 @@
+TITLE("AIndex")
+COMPRESSED
+120,156,237,93,89,115,219,70,18,254,43,83,149,163,68,133,162,64,144,20,41,201,73,197,231,174,43,137,157,178,21,229,65,69,137,16,56,20,39,2,1,46,6,144,204,108,54,191,125,187,231,0,6,23,111,41,148,203,126,176,37,96,208,51,211,253,245,57,135,47,108,242,245,215,86,221,250,202,90,240,231,228,21,29,57,177,23,245,47,88,187,221,59,117,236,206,233,237,79,239,143,79,247,127,220,59,106,215,144,74,19,168,180,186,205,86,175,211,106,182,237,35,248,171,217,106,218,29,187,213,110,246,236,227,118,175,213,234,89,39,174,231,112,222,191,240,236,94,239,20,63,178,225,35,187,219,177,155,221,118,175,221,107,182,186,61,27,190,181,45,203,182,186,118,167,217,110,245,236,206,201,144,114,183,127,225,244,90,167,251,31,142,224,163,22,246,4,196,173,230,145,221,238,182,109,171,101,217,109,232,170,217,235,181,155,221,78,175,117,124,116,116,226,58,211,136,5,190,234,139,53,155,118,243,244,186,217,61,133,49,255,253,247,223,141,102,219,146,35,104,3,177,166,213,134,161,
+54,225,153,213,182,187,205,206,177,117,220,233,53,123,86,11,136,119,186,86,231,100,234,132,206,164,122,234,157,133,83,239,90,39,44,162,64,98,255,187,102,179,11,159,28,213,143,190,106,182,187,48,209,94,171,221,233,117,45,232,220,182,237,86,203,110,182,236,227,99,187,115,212,233,158,140,169,51,164,161,154,130,3,131,223,111,194,167,221,122,247,43,248,208,106,119,90,118,251,24,153,213,130,158,108,251,168,115,220,236,180,173,206,17,80,58,9,233,127,98,22,210,9,245,65,100,255,189,250,223,55,175,223,29,252,246,145,92,240,206,233,79,63,90,228,226,27,203,58,176,44,49,3,2,3,155,122,78,68,175,158,245,147,231,86,195,106,216,157,78,141,40,137,153,237,175,146,95,219,228,44,251,170,78,86,39,113,190,57,137,127,59,124,252,198,207,190,255,225,234,106,69,66,228,249,91,127,72,63,245,191,237,127,97,211,146,108,178,78,35,251,216,62,221,39,23,251,242,27,210,151,111,229,75,162,254,185,216,127,41,152,112,240,215,217,108,74,73,48,34,212,19,216,228,36,10,
+8,143,130,144,54,200,25,153,196,60,34,220,137,24,31,205,136,129,96,78,70,65,72,220,192,143,28,230,211,144,140,60,231,14,30,176,33,188,99,35,70,135,228,122,70,132,142,210,8,94,159,19,199,31,74,98,99,231,142,98,239,36,152,210,208,129,126,6,223,15,190,239,147,33,29,1,161,97,35,51,188,115,24,222,11,135,51,151,132,240,125,48,33,142,235,82,152,81,210,111,182,185,98,230,193,95,248,3,243,111,228,252,27,228,151,164,95,213,139,232,63,246,57,187,193,95,244,64,246,106,123,64,24,154,158,13,190,37,159,106,125,2,99,31,7,67,152,118,20,135,62,210,27,3,93,114,231,120,49,21,211,215,28,211,163,56,27,51,158,96,82,49,223,25,14,225,47,206,3,151,1,23,97,8,96,5,157,107,230,177,136,81,193,234,235,121,243,227,117,236,104,130,125,75,14,115,148,148,16,103,131,188,141,8,244,23,115,152,130,195,145,142,238,83,137,198,133,129,83,194,176,177,254,186,142,168,144,88,17,18,129,223,158,135,161,51,147,143,244,60,128,176,227,121,193,189,
+24,61,246,157,64,195,137,72,52,166,132,194,167,48,14,14,120,160,190,139,125,16,193,57,199,135,47,39,65,24,177,63,97,80,17,155,80,226,177,91,154,157,99,42,60,242,28,200,163,75,128,222,102,117,194,176,91,30,232,190,71,14,136,2,166,16,50,10,44,199,254,28,50,13,184,248,0,127,19,3,145,3,35,247,44,26,19,62,165,174,196,158,16,81,131,104,24,104,46,33,95,34,148,145,148,56,208,105,40,205,145,128,231,66,192,131,3,241,57,55,117,162,78,96,92,12,65,196,137,15,234,65,125,96,54,8,207,117,92,24,5,140,100,66,232,39,0,186,152,137,102,227,139,152,121,130,125,64,136,249,242,173,132,208,196,153,10,242,170,115,24,145,227,221,59,51,142,248,164,97,40,120,231,121,208,141,19,186,99,115,180,2,97,116,52,162,46,98,201,155,17,144,42,3,128,197,190,79,233,144,34,86,129,246,84,76,122,68,60,39,188,161,196,143,39,215,160,130,166,134,51,33,217,84,219,62,208,73,112,151,17,244,40,68,52,250,122,132,174,3,12,228,248,64,76,132,
+242,8,91,79,195,224,26,62,104,144,223,199,204,163,200,31,32,12,34,226,12,30,11,51,194,64,23,208,110,0,121,74,246,208,64,0,227,194,168,134,148,180,236,0,83,142,33,59,45,98,96,121,108,78,94,240,30,104,10,82,14,241,130,40,51,37,68,179,64,15,119,161,61,72,133,151,240,28,25,24,115,57,158,204,116,5,42,64,2,56,1,14,232,171,19,42,70,132,226,36,247,99,138,248,158,92,11,211,33,161,38,36,3,36,82,213,167,0,17,47,22,35,77,112,166,24,132,84,47,246,15,65,74,30,243,111,225,171,190,57,244,6,249,77,60,7,218,233,108,66,144,91,16,41,206,13,165,56,132,38,215,201,117,44,148,112,38,26,33,89,176,98,0,222,97,255,226,144,144,62,152,221,60,108,146,30,148,46,56,82,46,180,158,42,45,170,106,93,106,156,129,182,55,113,8,29,133,245,18,201,130,137,3,189,207,74,17,21,114,196,66,160,225,220,57,204,115,176,105,172,167,150,104,238,30,80,7,162,208,26,190,6,74,37,246,164,6,234,138,99,197,87,96,161,126,141,
+35,109,139,235,192,17,249,174,72,24,140,16,31,131,237,201,206,202,20,80,224,131,52,181,76,160,191,216,228,10,140,39,194,137,94,135,212,185,229,162,111,30,12,14,92,128,128,112,24,224,189,188,136,13,14,110,129,243,65,8,65,32,202,177,161,109,126,56,129,17,58,190,38,35,172,19,136,7,69,4,246,144,166,146,21,240,17,196,193,53,42,95,2,35,199,39,210,82,35,144,19,241,66,132,10,236,66,123,48,14,131,248,102,108,48,230,13,52,127,7,70,39,225,12,60,100,97,194,14,78,246,110,0,64,142,156,9,104,44,140,30,231,140,159,137,62,120,124,45,249,29,229,73,241,154,236,219,135,175,93,16,141,48,97,56,227,134,224,162,1,106,205,51,248,17,16,101,192,67,224,75,224,2,129,146,119,33,5,217,241,84,120,194,105,220,11,123,50,133,81,211,240,78,78,24,173,182,226,122,131,188,151,12,11,4,144,0,71,48,251,152,59,96,235,112,188,78,200,2,233,3,5,67,193,16,0,229,123,57,86,180,146,226,85,42,250,140,5,41,145,177,180,206,147,0,97,
+173,140,52,227,127,196,190,27,129,130,8,69,23,236,141,180,75,114,193,15,115,173,50,234,11,147,53,216,22,17,145,208,7,141,85,64,255,64,153,116,205,138,44,60,250,120,79,233,84,163,95,99,249,103,244,169,142,63,83,12,120,119,246,115,234,84,235,134,83,1,227,112,25,5,83,230,14,78,6,135,131,195,151,208,237,224,144,135,238,48,112,7,135,191,128,97,65,21,29,124,77,253,193,65,204,47,133,101,197,39,125,52,42,164,31,97,92,40,224,186,34,29,104,120,43,184,25,76,165,115,7,183,70,167,48,196,233,172,79,34,136,2,56,56,57,80,246,9,232,40,115,129,87,142,7,179,67,116,195,116,192,175,142,168,3,1,23,229,169,246,32,184,66,161,210,128,19,100,27,218,196,242,8,71,243,232,23,138,94,143,203,223,90,68,37,16,164,24,87,163,3,77,226,232,52,240,182,48,56,73,158,239,149,5,228,104,102,74,190,52,82,11,50,248,54,125,222,34,159,146,231,165,169,130,14,72,75,104,182,200,224,10,189,88,242,170,38,98,125,251,20,71,137,22,221,167,
+247,217,96,200,65,245,1,167,53,141,209,124,164,129,107,67,170,112,217,43,25,159,95,211,212,60,41,235,97,52,17,90,116,31,196,222,80,55,76,77,139,12,191,165,145,184,166,62,132,218,74,41,0,138,119,160,149,66,126,202,104,240,0,32,13,170,206,201,44,136,65,103,132,131,197,1,153,33,152,238,31,242,8,65,9,90,73,196,131,9,194,56,185,46,163,203,17,141,132,47,134,32,14,21,42,13,94,152,15,20,241,41,117,38,2,23,93,12,117,68,14,195,33,183,1,101,84,73,129,66,167,20,105,24,187,160,160,186,253,91,31,134,194,134,96,132,185,178,198,24,132,195,167,82,205,202,154,133,24,196,161,31,19,237,210,102,109,153,167,32,14,14,254,122,173,132,5,45,32,20,203,190,87,178,62,248,235,215,114,17,238,40,168,231,97,178,192,176,29,150,131,193,90,131,51,122,150,204,143,170,210,121,75,120,210,236,219,132,201,89,214,46,172,71,84,48,57,95,105,40,24,141,60,225,188,229,144,239,107,87,185,97,41,201,125,144,233,22,85,122,151,203,182,100,112,151,
+49,51,194,84,100,243,46,180,209,82,40,117,21,174,84,218,34,178,77,99,84,52,68,111,71,85,14,29,99,235,235,48,184,133,192,94,184,125,116,50,34,32,13,124,90,50,193,52,84,163,159,24,143,184,57,69,108,0,25,3,70,0,105,40,202,117,226,10,57,22,14,163,140,77,195,128,202,129,8,154,38,73,84,157,27,89,45,80,201,155,36,24,135,88,33,169,72,23,84,22,48,23,225,35,128,231,234,166,70,52,62,68,108,192,0,228,115,252,160,34,21,135,216,37,25,189,194,195,72,255,32,231,155,204,244,137,104,219,227,40,203,35,193,245,105,66,117,87,209,135,89,83,21,2,231,124,220,34,108,27,16,243,49,103,155,39,126,101,50,141,28,189,88,103,217,22,238,128,248,42,38,242,6,130,178,72,151,1,210,81,33,97,19,146,162,240,150,166,137,26,89,152,52,25,9,44,38,233,194,201,39,153,108,85,2,251,59,214,114,210,220,220,15,170,210,115,85,235,86,26,176,77,160,179,106,248,174,0,248,162,236,83,185,111,3,217,63,59,121,243,249,57,69,50,158,147,
+183,205,59,18,196,148,103,84,143,22,200,72,173,124,122,254,225,225,67,25,61,250,135,244,38,143,164,115,15,174,50,187,5,88,77,244,11,72,183,2,82,24,248,221,63,23,242,128,157,189,99,65,204,87,12,123,178,70,235,145,67,159,34,70,49,24,90,24,250,144,61,30,72,226,105,252,131,37,253,37,67,31,220,162,99,198,62,181,37,131,159,124,224,179,91,97,79,185,252,171,67,159,146,218,152,1,210,2,184,183,95,30,3,92,61,64,213,55,85,18,83,65,74,82,206,13,194,154,114,11,149,132,52,58,156,121,146,245,152,197,62,65,173,223,224,42,121,90,101,20,131,203,154,36,28,60,189,199,149,120,209,84,19,94,87,75,16,46,5,23,130,54,126,173,34,241,114,58,53,10,226,164,143,116,144,59,173,73,91,84,132,93,169,187,60,113,72,110,25,101,151,131,147,193,137,156,225,165,222,221,86,6,11,43,217,189,245,236,217,42,120,59,91,184,136,241,94,209,5,166,137,205,14,50,216,26,225,162,44,174,174,224,34,71,118,187,88,131,188,152,25,123,197,146,213,7,
+67,86,44,191,177,74,224,110,234,25,62,24,139,22,4,45,51,62,252,132,75,224,92,108,134,137,112,227,10,109,220,52,36,5,177,40,30,164,11,37,240,17,110,60,11,66,39,156,17,5,12,110,46,156,165,180,228,162,217,155,32,216,219,19,13,159,129,26,255,176,87,35,207,158,145,38,254,101,215,106,187,180,72,3,80,142,178,248,3,223,146,238,94,42,7,223,135,34,243,55,89,53,147,218,50,23,95,229,182,208,136,122,83,100,73,106,75,199,168,88,94,72,118,76,224,150,101,194,35,220,84,144,88,6,177,35,8,183,96,72,237,197,0,17,55,7,136,157,30,233,110,158,185,193,152,32,11,172,146,253,108,96,250,113,175,206,67,173,47,110,47,124,122,107,238,207,65,94,197,5,115,104,216,93,52,246,210,136,77,164,17,21,246,64,214,32,243,91,14,51,148,253,160,72,184,94,220,183,88,186,44,0,38,98,58,133,248,93,218,122,99,147,148,146,185,140,222,112,255,38,56,218,138,26,20,31,235,88,204,172,61,149,47,216,23,18,45,57,199,50,231,81,162,197,37,254,
+115,151,108,72,46,45,199,93,1,0,224,12,201,109,198,85,247,2,1,25,57,163,49,22,28,221,81,221,250,220,85,227,41,161,123,101,216,46,66,162,49,205,141,65,40,74,64,91,7,226,67,103,201,79,111,55,67,229,66,192,114,245,119,108,149,205,27,20,228,35,177,143,61,81,17,16,165,25,197,214,211,83,17,146,169,181,70,191,84,129,146,104,126,161,38,225,209,174,227,99,251,73,249,139,202,148,7,228,250,224,89,120,150,163,59,173,170,15,164,105,9,206,171,115,226,53,241,189,57,156,191,192,248,161,96,92,153,125,125,164,243,49,188,56,245,42,63,153,183,19,169,200,7,25,50,45,153,13,234,189,189,133,237,190,37,250,84,237,175,212,246,218,6,249,56,197,253,240,186,104,148,30,181,25,82,140,175,224,137,84,180,40,136,28,175,236,28,209,156,197,151,204,186,198,46,41,197,82,235,16,58,250,58,151,158,25,79,124,173,161,49,159,15,222,31,1,174,203,161,113,69,36,166,125,124,198,152,156,191,160,91,182,113,224,172,188,132,58,184,24,244,31,120,105,23,92,
+199,178,133,175,45,172,30,190,212,39,193,50,197,216,10,151,180,234,98,248,191,104,244,18,156,93,126,199,198,162,201,151,29,199,244,23,167,116,207,221,40,46,133,254,18,211,184,14,2,175,122,30,111,249,235,201,52,154,45,57,141,51,138,11,27,144,87,138,131,24,233,89,35,138,52,64,135,85,110,163,153,179,87,35,120,190,155,88,115,166,6,10,38,182,105,230,136,225,121,68,143,171,83,94,247,140,111,100,83,95,122,212,9,83,171,106,216,51,60,245,132,7,181,188,220,225,215,205,171,198,162,207,236,210,133,217,177,58,114,92,21,67,174,23,243,203,218,242,79,70,140,190,165,168,127,131,208,167,36,234,209,37,240,12,219,75,215,233,100,12,83,25,193,20,215,177,176,56,158,171,141,27,75,91,229,197,113,254,16,171,221,217,80,60,49,220,185,155,22,140,138,123,210,120,173,64,252,93,209,174,232,10,219,78,227,105,117,76,148,73,29,207,189,51,63,155,25,46,43,251,245,4,181,137,0,214,176,209,122,202,15,233,159,179,182,125,185,8,143,229,102,89,234,177,151,48,
+254,70,198,189,2,108,171,99,104,113,110,118,190,189,47,86,182,77,195,79,94,6,120,136,249,19,139,102,58,224,168,76,144,230,249,244,186,40,92,20,26,22,58,111,144,231,120,125,65,184,153,95,168,100,200,91,113,241,194,110,228,21,91,118,38,114,106,220,188,141,160,178,198,84,9,228,93,168,238,138,187,4,228,5,13,94,112,159,194,109,209,109,20,104,212,138,151,62,236,88,126,35,165,84,17,222,223,102,235,84,242,150,144,149,156,226,103,165,22,219,133,246,23,96,149,1,107,77,192,72,7,178,33,96,10,238,104,233,173,32,15,32,199,71,46,104,200,59,48,112,218,15,44,134,42,5,172,16,212,96,223,16,21,15,66,176,49,131,43,143,25,36,74,213,188,74,216,174,89,26,40,10,188,184,241,43,19,123,156,225,45,40,192,183,52,226,16,119,215,112,143,221,140,35,248,161,50,254,208,23,6,165,81,197,147,193,76,134,231,8,31,113,127,147,56,152,143,87,148,225,236,210,141,240,9,136,234,101,199,252,50,116,165,36,74,227,243,127,24,138,98,147,227,57,69,35,
+121,73,228,191,73,163,100,55,227,37,176,225,50,3,179,31,178,110,163,20,171,171,2,78,215,109,100,243,61,147,102,61,211,67,35,173,236,212,30,17,13,31,197,175,138,73,21,80,216,32,205,149,211,222,249,178,73,105,181,170,50,32,88,184,252,243,20,35,218,242,68,221,240,47,121,64,108,39,128,252,231,128,179,158,240,119,130,245,107,26,212,179,144,77,214,10,176,252,50,166,13,99,189,92,53,47,75,215,59,201,82,54,202,214,13,17,230,66,78,158,60,73,84,195,195,155,58,229,105,128,144,64,35,199,19,190,170,170,78,95,86,229,23,251,155,197,118,229,92,31,115,234,251,171,112,242,85,24,76,55,228,228,213,224,123,243,69,179,200,98,236,36,191,230,91,50,125,225,110,140,205,122,70,157,110,79,91,24,148,252,158,185,116,112,64,124,229,102,50,252,42,186,242,237,44,132,157,165,236,90,114,53,199,201,46,45,21,14,202,102,10,146,75,109,88,23,172,9,23,81,89,59,86,193,27,245,214,75,95,74,181,75,144,227,226,82,91,151,225,2,144,218,185,19,38,136,
+214,175,208,22,101,46,125,112,227,48,148,39,24,101,131,122,166,41,195,203,221,28,158,238,241,76,41,230,42,225,69,37,74,70,179,73,1,113,28,102,182,252,39,115,254,133,249,108,194,254,84,54,101,2,214,46,148,233,110,60,153,234,116,71,215,159,49,80,23,211,208,151,54,38,51,84,147,90,107,57,111,209,170,228,115,207,11,220,21,113,44,6,151,19,72,58,147,121,75,172,229,141,215,222,250,16,130,99,2,238,22,17,42,130,229,143,226,46,183,75,34,255,173,240,157,188,8,212,132,174,188,91,89,29,229,73,76,255,161,48,78,146,104,131,252,30,132,183,92,38,92,108,36,110,87,52,174,89,214,71,106,126,251,245,215,57,133,16,174,250,83,185,155,62,74,100,94,114,157,70,186,120,7,55,222,212,27,29,242,32,14,193,4,24,55,214,149,240,145,156,103,54,133,51,23,151,103,184,129,212,43,188,128,113,112,85,52,85,115,175,154,206,94,73,251,10,52,41,12,102,220,128,50,82,213,69,232,114,44,204,189,170,123,142,47,92,221,110,159,103,237,54,128,222,228,193,
+210,182,219,45,221,31,176,60,155,86,221,121,176,138,8,42,164,191,250,193,184,193,247,41,54,36,50,204,0,244,124,121,37,122,206,49,91,225,11,230,144,166,125,224,206,229,93,159,250,54,93,1,238,180,101,249,133,189,242,130,227,161,198,31,139,74,177,167,21,231,99,142,232,54,207,19,154,140,91,41,168,95,131,167,200,160,37,249,90,47,187,30,87,239,121,82,129,85,158,215,171,214,108,49,164,45,222,222,186,34,251,173,211,147,148,235,198,79,10,133,4,148,120,80,59,17,7,53,164,64,140,23,240,84,116,81,83,124,66,51,55,56,72,70,152,216,37,121,213,231,124,214,61,38,16,231,15,100,41,238,200,237,202,200,156,58,120,250,28,135,146,151,154,65,88,255,138,52,151,94,129,164,144,75,166,48,179,172,90,60,190,141,81,82,168,253,151,241,169,194,250,231,255,127,143,217,148,130,207,188,58,75,45,185,200,59,241,191,172,72,22,173,101,27,68,254,153,188,218,153,203,27,181,213,255,195,128,215,194,223,4,33,164,182,147,98,112,85,209,31,254,235,67,78,146,86,
+234,206,81,66,194,168,191,85,5,174,75,249,9,188,200,62,175,8,205,72,182,145,26,124,226,38,116,217,76,12,97,177,83,188,204,66,167,108,96,203,12,10,230,255,130,222,48,127,125,199,153,142,59,40,217,234,191,204,198,54,61,196,199,156,244,235,194,189,145,27,76,57,217,10,241,135,44,12,204,2,121,131,123,33,133,219,73,86,64,232,132,141,114,236,72,152,49,119,91,9,204,60,251,114,3,46,46,184,163,80,215,167,193,20,10,196,98,113,224,59,194,250,229,183,77,171,255,184,69,95,54,13,31,225,80,197,105,14,199,191,1,211,63,166,174,56,77,141,59,57,174,227,27,50,9,134,185,140,18,63,144,57,165,184,12,167,184,186,184,156,244,42,173,124,206,174,215,76,131,160,108,103,250,139,92,0,198,77,145,101,134,115,190,39,49,30,204,241,40,233,131,10,215,242,126,177,157,127,40,207,81,233,55,72,255,255,106,226,218,163,
+
diff --git a/uppsrc/Core/src.tpp/AMap$en-us.tpp b/uppsrc/Core/src.tpp/AMap$en-us.tpp
new file mode 100644
index 000000000..e3f0c5dee
--- /dev/null
+++ b/uppsrc/Core/src.tpp/AMap$en-us.tpp
@@ -0,0 +1,288 @@
+TITLE("AMap")
+COMPRESSED
+120,156,237,93,109,115,218,72,18,254,43,83,181,187,41,59,
+139,109,33,192,96,59,155,186,188,237,94,202,73,54,101,19,
+239,7,23,54,50,26,140,206,66,210,105,132,109,238,246,246,
+183,95,247,140,222,223,65,194,134,44,249,16,3,26,245,76,
+119,63,221,211,211,211,26,93,202,228,199,31,165,134,244,131,
+84,240,239,248,61,29,43,51,221,25,92,106,237,118,239,68,
+145,59,39,119,167,191,31,157,188,252,199,206,97,123,23,136,
+52,129,72,171,219,108,245,58,173,102,91,62,132,255,154,173,
+166,220,145,91,237,102,79,62,106,247,90,173,158,116,60,210,
+21,198,6,151,186,220,235,157,96,207,50,220,36,119,59,114,
+179,219,238,181,123,205,86,183,39,195,189,178,36,201,82,87,
+238,52,219,173,158,220,57,86,41,27,13,46,149,94,235,228,
+229,217,33,220,212,194,158,128,184,212,60,148,219,221,182,44,
+181,36,185,13,93,53,123,189,118,179,219,233,181,142,14,15,
+143,71,138,229,104,166,225,246,165,53,155,114,243,228,166,217,
+61,129,33,255,245,215,95,251,205,182,36,70,208,6,98,77,
+169,13,67,109,194,111,82,91,238,54,59,71,210,81,167,215,
+236,73,45,32,222,233,74,157,99,75,177,149,105,58,231,72,
+163,83,200,122,87,58,214,28,10,36,94,254,220,108,118,225,
+150,195,198,225,15,205,118,23,24,237,181,218,157,94,87,130,
+206,101,89,110,181,228,102,75,62,58,146,59,135,157,238,241,
+132,42,42,181,93,22,20,24,252,203,38,220,218,109,116,127,
+128,27,165,118,167,37,183,143,80,88,45,232,73,150,15,59,
+71,205,78,91,234,28,2,165,99,155,254,123,166,217,116,74,
+13,208,216,127,175,255,247,211,135,47,123,223,206,201,37,235,
+156,156,254,67,34,151,63,73,210,158,36,9,221,193,192,44,
+93,113,232,245,171,129,255,187,180,47,237,203,157,206,46,113,
+53,22,110,127,237,127,109,147,211,232,165,6,89,156,68,191,
+58,137,139,234,36,254,169,176,201,175,70,244,250,235,235,235,
+5,9,145,55,159,21,107,240,98,112,201,36,132,217,97,251,
+196,151,46,121,197,111,36,151,47,185,216,26,36,244,181,31,
+253,122,17,253,234,14,237,181,32,219,34,248,119,171,198,167,
+82,35,113,255,92,190,124,199,5,181,247,103,127,110,81,98,
+142,201,29,157,179,125,114,74,166,51,230,144,137,114,79,137,
+74,169,69,70,166,53,135,255,12,230,216,179,145,99,218,13,
+114,67,225,238,131,43,213,178,134,199,195,131,225,193,185,57,
+179,71,244,189,57,26,30,188,51,13,71,209,12,106,179,225,
+193,103,243,158,42,55,58,189,34,83,247,211,128,40,134,26,
+162,15,99,32,166,69,109,5,200,14,127,25,254,50,128,30,
+199,112,183,186,31,25,100,63,52,200,123,69,159,81,24,102,
+95,144,97,138,163,177,241,156,132,252,3,35,99,211,198,1,
+139,129,144,177,174,220,195,15,154,10,215,180,177,70,85,114,
+51,39,220,3,82,7,46,95,68,251,186,8,245,117,163,48,
+109,68,108,24,179,57,37,202,104,68,1,193,62,221,232,109,
+174,158,246,254,196,15,154,113,43,212,177,79,62,135,100,201,
+57,227,60,207,12,166,221,226,23,143,249,157,221,29,46,97,
+114,58,124,65,30,119,7,4,198,54,49,85,96,203,153,217,
+6,210,155,0,93,193,60,103,143,234,130,215,125,223,54,247,
+219,205,195,19,174,104,162,49,162,184,6,231,76,20,7,198,
+60,189,129,190,25,249,104,168,244,209,83,53,121,208,156,73,
+62,143,129,192,27,216,235,20,7,50,133,14,132,72,129,189,
+143,14,118,54,99,192,138,194,144,22,117,251,117,85,48,2,
+6,104,248,150,6,240,79,46,40,226,8,33,201,191,190,177,
+109,101,142,223,56,58,224,135,115,122,235,94,143,179,247,73,
+187,163,208,106,78,76,103,2,195,251,210,255,20,12,182,225,
+51,143,224,116,76,75,27,9,120,190,51,109,58,60,96,246,
+72,69,132,122,168,28,254,72,141,225,222,140,133,208,9,247,
+17,50,112,80,251,92,54,185,116,224,231,187,225,117,64,5,
+191,115,6,76,62,81,43,122,96,61,3,226,128,128,217,24,
+70,204,232,84,1,24,142,64,16,138,14,42,158,221,78,64,
+71,20,228,54,166,10,232,26,148,164,216,32,49,232,138,104,
+83,203,180,29,104,78,52,3,136,217,218,61,136,217,23,170,
+198,117,233,105,194,5,227,103,58,189,1,219,139,121,86,146,
+244,22,247,166,166,250,222,33,112,39,224,41,212,224,247,157,
+52,55,131,48,13,238,4,188,6,119,183,200,157,127,37,221,
+217,69,111,238,71,111,126,244,175,236,114,95,37,159,224,104,
+16,203,0,87,46,90,129,127,75,209,108,226,152,40,55,174,
+114,206,124,247,4,208,13,215,53,21,166,12,70,32,58,225,
+134,197,176,225,27,142,123,175,89,191,200,193,21,211,203,232,
+212,166,160,98,106,128,13,97,43,238,78,11,91,249,182,224,
+121,54,188,163,45,220,10,202,115,239,207,83,58,143,254,248,
+8,63,94,96,227,253,106,122,254,10,136,173,73,215,194,24,
+106,83,40,225,236,161,41,123,134,227,122,109,180,177,144,166,
+208,48,116,243,65,252,132,134,226,104,83,10,243,211,204,225,
+180,24,159,151,220,78,128,24,4,222,142,109,206,221,233,37,
+6,133,56,237,77,64,65,1,14,72,68,31,245,217,118,154,
+54,67,234,227,154,21,51,23,94,245,57,245,218,140,76,27,
+252,156,101,26,42,206,39,170,88,135,5,162,167,46,44,210,
+237,53,214,120,189,245,116,64,206,184,24,68,107,184,122,22,
+150,197,125,73,27,214,12,39,213,132,127,133,41,96,65,149,
+166,133,200,164,80,205,192,132,173,209,123,20,1,168,207,50,
+153,134,51,28,6,7,99,205,6,213,184,193,136,152,52,185,
+225,89,116,36,66,45,132,6,24,41,234,160,1,113,2,42,
+92,33,150,77,33,36,177,102,168,234,32,174,129,152,14,169,
+167,94,19,16,128,184,147,83,135,200,13,195,13,252,28,106,
+194,67,157,7,115,166,171,94,67,64,25,130,5,198,41,194,
+51,136,87,198,64,73,119,180,225,30,14,204,180,113,86,133,
+33,129,111,48,76,160,111,155,119,212,16,49,42,78,192,64,
+17,184,52,104,10,131,56,4,209,45,125,212,24,196,156,62,
+147,120,25,124,18,184,154,64,82,26,226,72,200,80,229,131,
+192,70,30,81,213,164,162,123,78,41,32,164,16,131,222,66,
+120,11,176,55,102,56,173,187,100,0,79,72,229,155,161,107,
+198,29,72,201,11,5,121,224,0,97,37,140,92,77,186,138,
+83,97,163,16,131,198,46,78,224,226,215,116,133,100,227,248,
+107,8,3,30,31,224,142,67,67,118,157,110,112,217,149,177,
+203,94,28,246,33,200,122,240,11,193,62,190,46,18,216,143,
+94,245,209,31,197,188,123,107,150,47,19,151,119,175,99,55,
+215,10,252,45,236,98,176,251,222,225,20,196,190,254,74,47,
+171,107,180,191,138,80,52,232,99,26,18,17,42,60,204,98,
+254,69,197,137,129,212,35,83,23,66,161,131,242,232,188,181,
+97,197,3,240,226,196,130,49,33,217,48,112,201,14,51,5,
+105,239,78,70,110,113,76,115,194,102,55,12,214,253,56,128,
+145,162,235,124,134,70,77,126,65,137,112,88,194,152,217,136,
+138,64,131,51,181,187,79,254,152,0,43,184,124,164,188,141,
+97,10,158,124,60,115,94,220,124,2,183,227,70,109,22,161,
+165,99,189,164,101,36,21,29,248,131,58,12,224,147,18,199,
+249,250,26,65,216,0,116,101,27,131,36,205,77,152,87,238,
+116,176,6,83,193,102,71,32,245,90,204,226,174,127,1,228,
+175,26,119,60,197,178,166,200,251,224,246,182,33,129,8,216,
+194,125,22,170,114,110,198,233,165,34,158,192,241,221,107,230,
+140,109,66,56,145,68,25,6,24,171,14,39,112,239,182,122,
+60,81,31,188,171,69,20,233,250,206,142,42,190,223,228,196,
+147,76,203,245,172,207,48,231,102,208,135,212,196,89,204,52,
+41,110,71,140,147,73,57,205,97,33,99,45,134,219,38,102,
+225,150,244,246,59,84,227,91,75,99,115,134,194,179,81,222,
+84,221,93,99,75,40,179,211,146,182,175,29,35,168,25,154,
+179,209,214,85,156,1,201,7,250,194,6,232,54,108,164,237,
+34,65,39,99,219,156,114,212,113,201,54,22,178,201,205,221,
+170,74,15,241,185,8,220,221,10,108,1,50,196,24,138,67,
+36,18,63,145,57,45,59,121,173,214,98,191,206,156,69,247,
+199,22,180,90,119,207,108,107,154,171,52,205,232,174,94,253,
+86,185,254,187,134,155,100,144,153,187,213,2,30,185,198,152,
+110,204,161,69,81,96,57,130,90,169,133,140,143,75,44,119,
+36,204,81,230,62,172,249,54,51,8,203,5,41,174,32,176,
+50,5,157,135,91,215,227,97,166,40,90,71,5,204,120,71,
+21,156,22,56,172,117,15,49,82,234,1,132,97,187,75,39,
+20,223,44,225,8,124,235,70,175,99,242,246,83,225,61,44,
+93,25,9,193,39,220,219,65,80,89,176,31,116,162,9,183,
+146,232,67,120,168,232,109,188,49,2,215,219,182,246,92,132,
+40,162,18,121,68,172,94,130,208,46,189,96,65,52,201,157,
+183,151,154,224,83,188,245,250,185,157,229,75,86,114,0,190,
+54,51,242,58,32,217,64,42,241,78,242,145,28,155,236,22,
+68,114,214,92,183,232,124,248,93,226,55,11,43,171,117,204,
+73,244,161,174,83,192,23,96,79,115,10,33,231,70,64,177,
+178,29,191,140,42,72,84,149,128,163,27,81,148,196,31,25,
+96,215,177,154,161,226,122,161,139,196,208,150,207,90,108,24,
+58,243,75,140,146,229,86,117,228,245,158,4,209,117,45,111,
+234,89,89,88,51,167,56,235,6,50,19,88,8,48,141,162,
+202,73,189,109,147,107,245,44,213,215,61,242,93,237,10,190,
+102,136,151,203,107,121,11,232,74,80,223,166,180,182,41,173,
+13,50,136,172,108,210,214,22,214,198,22,226,53,239,191,209,
+133,38,135,226,154,247,0,163,41,165,237,101,96,250,108,25,
+215,80,197,66,249,204,235,89,104,227,218,175,128,10,22,178,
+168,154,7,141,81,119,89,161,155,183,218,136,80,219,6,61,
+237,40,140,81,27,173,132,239,155,223,204,110,129,31,149,238,
+46,27,80,156,101,175,9,202,150,192,165,213,228,100,227,229,
+41,42,122,148,224,217,149,16,152,38,116,139,166,45,154,114,
+42,42,11,187,110,17,181,22,40,10,60,136,92,213,119,136,
+71,55,18,8,87,231,132,102,44,239,129,166,70,170,145,154,
+49,230,19,249,17,32,193,28,170,168,11,76,164,106,120,22,
+189,161,33,82,145,217,148,207,133,101,193,45,38,206,80,53,
+27,155,89,150,238,143,120,137,140,22,160,250,137,75,123,254,
+166,216,44,196,101,29,197,64,177,48,70,115,190,231,146,159,
+69,221,254,243,91,195,234,246,222,138,162,144,239,53,164,93,
+200,176,74,38,67,30,7,13,248,159,12,234,177,181,13,94,
+10,62,150,90,7,62,135,133,174,77,238,99,107,138,21,77,
+49,51,13,83,167,21,110,106,101,207,154,26,224,19,239,25,
+109,3,198,116,99,42,191,143,229,221,147,147,212,220,70,142,
+107,109,22,207,22,57,174,167,157,61,189,141,45,24,59,214,
+108,118,219,32,114,5,198,186,193,65,228,214,42,23,8,35,
+235,157,3,183,177,228,162,118,88,162,38,252,156,58,48,240,
+92,99,44,174,9,47,51,71,150,217,19,228,213,116,140,11,
+39,180,119,153,93,88,30,221,62,45,122,136,211,83,212,23,
+128,47,118,145,43,59,210,191,30,190,140,111,253,59,246,234,
+118,65,45,19,228,76,109,255,72,171,13,125,4,165,100,85,
+192,151,111,159,62,249,44,47,251,216,238,34,101,84,113,225,
+218,177,33,84,120,20,61,117,27,41,23,61,79,188,39,186,
+133,214,70,64,107,129,66,36,193,73,145,227,174,116,202,104,
+252,184,153,244,147,102,146,143,3,41,186,30,123,106,63,137,
+43,183,18,62,118,90,201,112,79,120,228,20,61,225,35,67,
+193,1,25,252,153,161,144,234,210,31,26,98,79,113,12,77,
+22,104,66,15,34,85,59,161,229,139,56,217,32,152,207,152,
+95,30,190,54,248,89,6,3,245,105,185,172,10,170,136,54,
+197,235,223,152,166,30,115,217,33,1,127,100,30,123,89,62,
+191,142,51,72,250,20,93,232,195,132,242,218,174,194,120,137,
+159,50,29,230,48,53,118,202,145,24,4,222,241,83,91,138,
+192,24,175,36,251,104,96,1,202,90,196,155,98,40,248,164,
+71,209,60,136,51,91,230,9,171,121,15,62,246,39,248,104,
+35,78,198,12,79,216,245,81,219,32,148,55,7,67,153,163,
+254,12,239,116,113,85,12,1,113,206,168,98,143,38,113,164,
+119,79,188,242,31,6,139,35,128,249,6,164,7,17,93,66,
+216,25,161,123,200,106,53,222,174,202,138,230,249,17,86,207,
+169,221,139,193,83,64,49,251,248,132,199,193,122,224,116,189,
+243,105,75,34,53,125,169,95,29,202,103,20,79,213,175,8,
+229,208,106,19,169,177,72,16,253,212,152,88,19,29,103,60,
+62,110,115,9,173,88,99,89,185,205,12,157,134,214,145,45,
+208,68,190,147,201,66,131,145,141,6,35,25,5,113,167,33,
+22,126,125,109,202,151,139,190,38,97,93,7,106,103,186,118,
+59,113,224,131,74,45,106,168,12,126,229,56,10,136,9,81,
+6,193,221,223,29,79,126,115,80,97,100,209,168,224,123,59,
+188,132,114,112,154,154,127,119,35,229,252,213,40,69,35,61,
+150,13,250,39,207,2,232,171,225,241,240,88,136,238,202,21,
+161,223,200,127,25,209,21,200,225,42,2,219,215,209,137,49,
+132,248,5,161,123,238,174,234,68,235,29,102,98,221,243,240,
+90,215,152,211,32,225,111,251,191,81,231,157,57,51,156,157,
+221,221,53,194,21,7,202,57,31,167,219,146,31,54,151,68,
+72,133,117,160,144,205,130,235,192,133,118,99,18,74,43,90,
+27,222,123,39,200,214,237,45,210,230,240,116,1,46,87,165,
+238,191,130,233,114,56,88,229,162,239,204,223,51,201,174,113,
+170,144,58,207,89,254,189,171,216,95,137,229,97,154,16,171,
+199,61,153,47,209,88,123,57,45,122,242,169,231,202,98,0,
+44,194,82,116,238,142,31,181,145,195,234,155,145,51,83,244,
+148,123,107,200,160,124,152,90,206,188,36,35,209,76,136,247,
+10,43,138,20,130,153,32,240,243,4,223,147,70,164,18,169,
+142,8,169,6,25,43,58,163,193,35,54,85,66,197,119,58,
+184,169,0,227,249,142,50,152,215,170,236,245,77,236,200,249,
+79,126,151,159,53,67,155,106,255,193,115,27,160,115,91,172,
+206,102,83,203,11,105,196,65,77,24,237,141,108,170,240,228,
+45,63,19,65,177,148,145,230,248,175,173,41,70,193,98,145,
+7,44,159,150,92,253,60,58,182,146,230,8,56,69,230,15,
+60,249,232,138,207,18,168,60,114,180,254,104,102,219,226,76,
+91,209,160,17,105,170,25,92,48,193,49,71,62,193,88,126,
+215,139,215,206,226,29,214,96,248,111,116,221,28,45,97,248,
+113,214,184,198,49,42,205,115,113,169,109,151,212,244,123,219,
+180,150,82,115,176,172,185,30,254,18,190,208,76,42,31,59,
+97,49,175,155,226,242,162,69,175,94,233,66,153,128,187,236,
+20,215,15,51,91,102,146,138,148,156,68,14,43,119,77,179,
+108,233,64,46,177,186,134,159,29,148,60,15,31,37,131,185,
+211,4,151,161,168,184,164,49,229,49,239,214,52,212,193,122,
+6,169,76,5,158,70,206,81,138,48,22,210,96,96,31,105,
+227,139,84,235,196,6,161,194,157,86,176,212,207,97,229,52,
+184,201,223,197,117,111,78,22,155,215,163,200,223,34,245,45,
+207,21,143,87,175,104,89,42,220,188,163,149,252,242,57,181,
+97,157,5,113,65,210,57,243,197,253,185,3,147,222,244,138,
+136,191,25,75,65,150,116,197,62,93,119,254,49,13,39,12,
+53,199,60,224,225,142,32,187,79,254,48,237,59,38,242,78,
+16,144,225,219,74,67,111,75,181,20,155,223,249,237,235,87,
+151,213,180,188,51,115,123,116,83,88,238,34,35,242,158,220,
+96,221,141,239,174,85,236,91,234,28,184,175,62,100,98,32,
+203,225,49,34,49,190,177,121,37,174,240,207,209,198,65,90,
+228,212,109,148,249,10,230,43,177,3,237,54,75,125,193,113,
+194,16,82,122,172,228,211,120,14,11,223,209,26,121,35,238,
+82,72,77,82,72,193,108,72,132,81,233,69,4,23,74,74,
+36,197,21,147,20,121,29,241,141,218,232,46,74,23,196,35,
+138,73,227,98,137,142,151,188,23,239,196,100,126,164,140,119,
+121,103,158,165,203,34,151,227,101,176,229,166,218,196,165,104,
+190,173,36,186,146,136,1,215,201,106,4,76,144,198,90,26,
+40,41,36,178,144,82,152,123,140,96,37,129,132,48,239,217,
+64,136,141,103,25,36,228,179,84,18,10,23,9,221,241,125,
+168,58,181,87,242,37,215,97,25,184,133,28,101,164,144,173,
+242,178,253,102,197,63,23,113,205,70,37,147,173,219,213,50,
+252,118,9,182,164,147,99,68,54,98,203,255,187,51,220,61,
+230,7,63,194,151,193,206,174,203,195,187,208,254,106,240,69,
+236,38,99,42,35,25,98,165,210,230,104,240,191,190,24,54,
+192,231,71,250,227,13,252,175,195,23,240,145,207,161,188,246,
+219,27,204,239,137,151,121,167,237,255,150,221,47,198,10,187,
+228,235,193,19,20,197,132,206,167,243,115,49,143,151,99,217,
+125,37,185,55,213,12,95,157,14,27,98,214,24,190,70,9,
+136,235,4,12,46,34,8,247,103,126,207,171,211,215,158,36,
+12,21,235,224,131,123,196,175,160,218,129,39,28,158,233,198,
+247,194,163,206,67,76,0,26,196,203,121,226,174,36,246,2,
+122,140,204,75,35,245,173,233,76,130,43,44,84,93,207,139,
+224,50,50,56,193,202,87,117,223,65,22,251,29,249,113,119,
+190,75,0,54,144,176,112,125,40,226,18,162,21,141,87,44,
+219,168,51,94,111,225,226,236,32,145,136,131,119,230,176,152,
+162,227,235,96,205,71,128,96,31,126,245,51,165,162,5,14,
+227,20,69,131,145,52,127,198,3,220,130,174,224,102,147,162,
+223,154,182,230,76,166,165,123,195,191,6,176,248,156,193,238,
+241,49,247,114,31,221,205,186,8,255,145,43,158,32,112,49,
+234,109,237,113,78,138,103,222,171,48,150,227,116,61,38,226,
+221,101,166,236,160,229,91,122,171,25,203,79,209,193,240,195,
+143,182,135,43,183,75,204,183,119,33,57,60,131,8,62,36,
+222,25,91,65,0,200,203,191,68,101,239,220,4,211,245,211,
+25,155,37,19,92,171,65,187,165,178,22,150,25,139,249,42,
+138,51,167,66,200,219,87,1,71,237,97,25,183,86,126,38,
+218,64,212,94,223,80,3,86,216,142,200,249,104,184,187,224,
+76,76,149,31,139,142,181,213,112,31,142,150,23,233,43,198,
+45,37,163,9,29,221,197,15,39,139,21,89,107,225,236,121,
+50,111,178,164,78,51,28,91,63,144,29,247,191,25,142,180,
+191,58,71,122,129,152,74,3,212,69,220,227,101,64,130,164,
+58,63,95,42,34,143,154,239,7,23,27,108,202,56,139,134,
+24,31,221,69,241,160,82,109,207,239,154,196,123,140,88,88,
+196,235,166,37,177,141,12,207,234,10,171,208,143,68,199,95,
+231,208,67,222,50,63,251,30,103,64,12,189,130,111,92,29,
+79,49,111,183,208,14,80,200,219,165,108,248,39,245,88,88,
+177,29,242,105,43,115,104,149,252,89,190,30,10,38,167,52,
+71,82,114,90,90,73,168,82,214,160,50,220,213,211,113,95,
+107,148,146,99,139,27,35,144,117,9,81,42,24,244,219,84,
+99,102,190,53,71,140,54,211,182,171,89,115,190,30,221,37,
+52,25,219,26,110,140,225,70,13,142,227,252,1,87,197,34,
+35,35,214,188,10,172,131,195,223,111,252,21,240,185,40,150,
+243,183,62,196,238,219,45,176,110,195,162,214,35,198,227,23,
+183,108,18,190,51,183,42,21,36,192,52,136,102,104,32,127,
+135,23,4,167,191,152,75,1,134,126,229,118,237,238,227,16,
+246,16,223,59,191,193,116,12,29,33,232,35,141,6,255,7,
+77,177,185,80,
\ No newline at end of file
diff --git a/uppsrc/Core/src.tpp/Any$en-us.tpp b/uppsrc/Core/src.tpp/Any$en-us.tpp
new file mode 100644
index 000000000..55d74acae
--- /dev/null
+++ b/uppsrc/Core/src.tpp/Any$en-us.tpp
@@ -0,0 +1,69 @@
+TITLE("Any")
+COMPRESSED
+120,156,213,86,109,111,218,72,16,254,43,43,165,141,66,46,
+161,251,106,27,59,87,229,148,86,85,85,181,119,74,185,79,
+8,194,198,44,101,85,99,211,93,67,132,174,151,223,222,89,
+27,99,211,152,146,92,117,58,93,62,4,216,217,121,123,230,
+153,217,25,80,244,236,25,62,195,71,248,192,95,248,74,77,
+229,50,201,135,3,205,121,16,73,42,162,207,239,126,239,69,
+167,151,39,30,239,128,17,2,70,152,79,88,32,24,225,212,
+131,127,132,17,42,40,227,36,160,61,30,48,22,224,48,78,
+164,181,195,65,66,131,32,114,158,41,40,81,95,80,226,243,
+128,7,132,249,1,5,93,138,49,197,62,21,132,179,128,138,
+112,162,108,60,28,200,128,69,167,215,30,40,49,231,9,140,
+99,226,81,238,115,138,25,166,28,92,145,32,224,196,23,1,
+235,121,94,24,203,69,174,179,116,227,75,19,66,73,116,75,
+252,8,66,190,191,191,239,18,142,203,8,56,24,35,152,67,
+168,4,206,48,167,62,17,61,220,19,1,9,48,3,227,194,
+199,34,92,72,35,231,237,153,59,27,226,96,234,62,14,117,
+174,192,196,233,47,132,248,160,226,157,121,71,132,251,144,104,
+192,184,8,124,12,206,41,165,140,81,194,104,175,71,133,39,
+252,112,166,228,68,153,77,10,18,130,63,37,160,234,159,249,
+71,160,136,185,96,148,247,28,88,12,60,81,234,137,30,17,
+28,11,15,44,133,70,125,89,106,163,230,42,133,138,253,117,
+243,247,243,215,31,206,255,252,136,6,150,69,232,183,116,125,
+60,28,88,28,49,228,62,69,244,14,13,158,99,124,142,241,
+229,9,238,226,46,21,162,131,54,149,42,207,209,77,245,237,
+18,59,245,250,60,172,37,181,238,194,232,149,204,213,67,237,
+209,56,28,135,239,179,149,146,183,137,26,161,234,219,246,226,
+197,30,55,47,111,134,46,82,26,161,50,112,39,68,218,34,
+137,236,66,197,90,38,40,95,47,20,202,166,40,206,210,92,
+234,84,25,4,4,112,182,27,135,58,253,132,210,44,133,35,
+131,44,252,0,161,74,10,136,220,165,193,11,36,193,101,97,
+169,139,222,230,72,38,54,131,84,178,149,6,2,162,185,202,
+103,217,196,162,41,40,127,89,42,179,118,214,242,153,42,61,
+219,60,51,106,2,6,38,200,168,220,104,181,170,196,206,247,
+198,67,17,235,84,199,165,139,70,38,51,105,209,66,199,159,
+145,85,115,153,230,58,182,149,244,189,154,223,42,99,155,229,
+194,81,232,80,4,189,234,227,196,233,142,111,170,159,199,227,
+78,88,21,244,116,7,198,205,197,109,57,118,165,227,227,90,
+112,201,80,93,252,78,5,254,31,46,70,72,200,230,102,25,
+67,198,93,212,55,50,181,83,136,112,39,207,108,105,98,85,
+100,118,55,211,128,50,224,151,155,172,64,76,231,245,213,219,
+117,145,53,28,23,233,242,104,27,245,85,225,255,252,235,199,
+173,165,238,1,8,246,231,188,141,254,170,10,28,120,147,34,
+53,95,228,235,3,150,199,247,223,219,70,227,251,118,240,106,
+55,175,212,22,158,61,93,134,96,18,44,18,104,144,155,139,
+150,230,217,211,120,163,254,8,245,27,13,177,71,208,40,34,
+244,208,149,81,205,62,108,96,81,8,118,170,86,240,184,143,
+116,106,129,239,91,96,92,81,160,28,28,92,156,127,237,55,
+154,12,180,234,11,47,208,181,202,151,38,69,43,153,44,21,
+220,188,86,64,10,149,66,237,242,172,104,131,84,221,37,107,
+20,23,110,39,59,6,26,0,53,80,216,226,226,30,151,135,
+120,237,162,84,222,170,19,231,53,32,165,168,1,23,186,205,
+178,100,159,34,70,111,191,51,122,210,169,53,11,230,87,8,
+246,161,204,22,248,13,99,1,134,141,227,250,102,202,180,128,
+250,16,201,235,114,60,79,234,81,208,142,35,48,73,33,61,
+117,16,26,229,38,94,101,251,78,231,179,186,100,15,120,252,
+159,176,237,141,202,91,168,86,102,100,97,46,54,40,81,17,
+0,240,190,232,191,68,243,165,133,113,0,18,72,247,12,101,
+46,219,59,109,225,247,12,82,206,22,202,72,247,150,187,252,
+117,146,168,79,50,249,231,136,94,183,133,241,239,240,16,176,
+42,79,126,192,198,146,83,79,211,223,139,250,1,202,86,149,
+40,14,225,157,249,63,149,164,101,67,89,101,122,210,186,160,
+92,37,74,154,86,38,206,97,225,176,232,196,61,211,155,55,
+201,118,30,79,130,131,163,227,181,123,83,30,83,140,71,54,
+123,250,4,134,30,12,206,61,222,106,242,243,209,109,86,175,
+69,97,238,103,202,84,146,40,51,227,95,247,46,40,163,205,
+99,60,218,183,168,252,96,79,169,204,183,45,41,15,214,146,
+114,101,121,194,26,50,252,6,35,106,206,93,
\ No newline at end of file
diff --git a/uppsrc/Core/src.tpp/Array$en-us.tpp b/uppsrc/Core/src.tpp/Array$en-us.tpp
new file mode 100644
index 000000000..470efa9a4
--- /dev/null
+++ b/uppsrc/Core/src.tpp/Array$en-us.tpp
@@ -0,0 +1,323 @@
+TITLE("Array")
+COMPRESSED
+120,156,237,61,11,115,26,71,210,127,101,170,146,203,129,140,
+16,79,129,30,113,197,145,146,43,213,37,182,203,34,247,213,
+87,42,36,86,48,136,61,195,46,183,179,72,38,231,207,191,
+253,235,238,121,236,236,11,22,132,20,43,119,169,138,44,177,
+179,61,61,253,238,158,153,230,170,193,190,253,182,86,169,125,
+83,91,243,223,241,57,31,59,139,105,216,191,114,91,173,238,
+137,211,104,159,124,252,251,187,163,147,189,31,74,135,173,50,
+0,169,3,144,102,167,222,236,182,155,245,86,227,16,126,212,
+155,245,70,187,209,108,213,187,141,163,86,183,217,236,214,142,
+135,83,71,136,254,213,180,209,237,158,224,204,13,120,169,209,
+105,55,234,157,86,183,213,173,55,59,221,6,188,219,168,213,
+26,181,78,163,93,111,53,187,141,246,241,136,139,97,255,202,
+233,54,79,246,62,28,194,75,77,156,9,128,215,234,135,141,
+86,167,213,168,53,107,141,22,76,85,239,118,91,245,78,187,
+219,60,58,60,60,30,58,243,208,245,61,53,151,91,175,55,
+234,39,183,245,206,9,160,252,229,203,151,106,189,85,147,24,
+180,0,88,189,214,2,84,235,240,89,173,213,232,212,219,71,
+181,163,118,183,222,173,53,1,120,187,83,107,31,207,157,192,
+153,101,175,28,97,180,215,46,189,83,59,118,67,14,32,246,
+94,213,235,29,120,229,176,114,248,77,189,213,129,133,118,155,
+173,118,183,83,131,201,27,141,70,179,217,168,55,27,71,71,
+141,246,97,187,115,60,225,206,136,7,106,9,14,32,191,87,
+135,87,59,149,206,55,240,98,173,213,110,54,90,71,72,172,
+38,204,212,104,28,182,143,234,237,86,173,125,8,144,142,3,
+254,175,133,27,240,25,247,128,99,255,190,249,191,191,252,244,
+118,255,183,75,118,37,154,184,252,195,214,9,123,19,4,206,
+242,187,254,149,168,233,79,0,193,249,212,9,57,59,37,54,
+177,171,189,31,90,172,215,127,45,7,53,25,254,219,62,249,
+59,187,250,75,173,182,95,171,153,241,55,167,125,245,209,15,
+165,90,181,86,109,180,219,101,166,56,173,134,222,152,17,8,
+81,127,250,250,230,102,131,55,107,18,229,232,201,113,214,219,
+243,197,237,212,29,166,95,191,30,28,15,142,127,245,239,185,
+115,59,229,111,188,209,57,231,243,51,127,190,124,71,98,114,
+205,114,31,25,80,167,249,168,156,230,44,239,245,77,95,18,
+143,169,127,174,246,206,104,200,254,231,222,114,206,153,31,176,
+91,71,112,185,100,230,143,25,159,18,203,4,19,161,31,240,
+17,115,61,22,78,184,156,173,202,122,19,30,112,230,10,230,
+249,108,232,207,102,190,199,44,62,179,49,128,235,85,213,76,
+48,150,205,124,17,178,133,231,222,243,64,56,83,124,62,195,
+73,96,74,119,200,2,199,27,249,51,230,12,135,28,230,30,
+250,94,232,184,30,15,170,236,2,166,31,115,39,92,4,92,
+48,7,38,4,25,4,16,35,54,14,96,252,216,25,134,128,
+147,3,63,150,115,119,232,76,167,75,230,134,136,20,115,65,
+28,8,19,24,187,16,174,119,7,232,143,0,57,120,193,128,
+199,249,231,190,11,99,2,193,66,159,245,216,212,253,200,217,
+63,96,144,31,156,246,6,123,175,171,236,45,7,132,97,217,
+83,68,12,96,139,197,124,238,7,161,208,107,6,96,67,62,
+135,191,29,160,217,3,0,21,19,119,142,128,245,44,35,67,
+199,10,16,104,12,68,131,23,88,201,243,67,61,119,89,175,
+27,80,48,52,7,130,48,225,51,223,211,52,188,128,241,129,
+127,239,142,144,16,83,162,38,172,151,249,115,30,56,40,26,
+196,50,137,58,123,112,195,9,241,74,56,51,248,193,103,142,
+23,186,67,9,84,191,235,45,245,232,161,227,177,91,160,44,
+81,7,40,24,112,208,164,33,32,126,187,212,204,126,39,89,
+239,195,143,128,77,0,76,5,105,97,240,17,62,78,51,231,
+67,215,137,97,4,76,240,133,112,65,146,73,30,212,124,136,
+5,225,128,143,131,16,112,35,104,30,82,26,184,116,239,76,
+221,17,104,178,136,200,37,88,137,184,60,227,14,64,61,27,
+188,26,188,178,31,34,64,205,199,114,140,138,37,128,235,143,
+67,238,197,224,130,245,3,12,253,0,56,18,78,252,197,221,
+164,172,137,76,203,213,4,113,166,192,128,133,0,66,0,72,
+210,1,152,101,186,156,249,193,124,2,50,107,38,25,236,107,
+13,49,31,13,253,197,116,68,68,181,197,181,7,90,163,33,
+137,197,112,98,73,198,210,95,176,57,234,157,163,87,130,147,
+2,30,106,8,208,154,223,187,254,66,0,127,134,1,40,4,
+192,244,37,83,192,48,207,171,236,50,116,167,211,138,90,64,
+232,124,132,101,250,72,207,152,76,218,147,18,109,120,245,174,
+10,56,78,185,36,11,123,152,0,169,156,57,48,118,30,184,
+48,73,185,202,254,23,48,67,130,104,106,192,156,160,95,51,
+14,148,35,194,72,108,16,85,57,183,109,56,136,105,35,159,
+161,176,79,156,123,206,184,75,18,4,186,250,177,2,243,242,
+57,80,106,190,68,93,17,97,176,32,233,240,224,255,145,116,
+239,246,231,150,41,1,234,161,37,32,132,44,97,163,201,64,
+37,252,7,120,63,116,134,19,84,122,139,130,196,2,141,38,
+234,226,12,164,23,237,66,200,110,23,33,225,8,178,28,6,
+254,18,62,173,178,247,17,27,98,100,115,81,46,193,30,121,
+154,171,68,15,131,7,9,163,49,147,236,14,184,47,216,98,
+30,241,65,47,228,220,21,206,232,30,132,223,185,227,72,52,
+69,61,228,153,210,19,0,11,80,209,80,58,104,50,64,204,
+72,107,172,37,35,25,132,123,231,185,99,48,126,30,234,174,
+128,229,35,210,160,163,210,10,72,88,160,9,160,204,104,46,
+1,46,96,3,139,234,146,210,141,248,156,123,35,161,101,9,
+116,24,5,107,204,102,72,200,225,193,56,224,40,3,74,184,
+72,205,173,233,103,238,221,36,68,41,7,205,245,0,186,0,
+122,85,164,76,93,120,2,204,38,17,227,3,18,58,246,222,
+66,44,200,84,211,231,51,36,46,89,215,25,12,12,150,70,
+21,5,217,12,249,97,133,126,23,136,21,44,248,119,110,75,
+153,22,122,57,146,100,102,49,35,111,137,20,140,147,103,2,
+24,107,242,104,235,23,141,175,226,164,68,6,53,5,254,110,
+132,249,46,240,31,244,92,34,116,208,7,0,25,97,245,183,
+60,12,227,64,171,38,148,169,118,106,45,180,221,202,224,224,
+27,10,2,208,66,140,151,100,195,165,65,3,152,222,200,9,
+70,224,132,110,3,39,88,218,238,84,210,34,238,37,181,21,
+99,243,233,130,208,94,42,233,7,51,2,139,150,58,142,12,
+72,170,88,89,202,40,200,58,138,63,2,174,41,251,10,244,
+122,251,219,47,191,148,181,13,210,188,248,5,221,34,122,12,
+233,0,222,246,126,137,156,168,38,137,139,182,235,106,239,224,
+58,244,65,189,33,192,57,24,28,156,129,165,27,28,136,96,
+56,242,135,131,3,29,213,12,190,229,222,96,127,33,174,73,
+0,240,19,8,69,15,24,235,135,24,134,144,212,174,132,131,
+214,99,112,19,65,193,191,105,73,62,113,17,92,144,177,44,
+125,22,2,209,4,120,138,200,11,86,217,25,208,9,151,46,
+141,24,57,78,135,160,128,236,155,197,76,253,59,52,242,65,
+96,251,83,254,9,157,189,242,182,146,56,103,175,58,109,118,
+239,187,35,64,90,9,185,31,12,190,239,151,36,154,18,224,
+224,59,12,96,155,236,190,95,150,111,29,224,91,87,7,103,
+242,77,92,255,153,121,249,244,20,94,199,103,37,98,154,129,
+64,163,8,8,62,44,195,79,160,89,9,108,37,69,25,50,
+200,137,135,139,61,21,20,151,51,80,61,155,114,39,232,151,
+236,71,183,190,63,197,71,23,226,61,17,3,158,74,185,81,
+98,240,46,69,95,36,148,29,105,133,147,0,253,105,14,26,
+96,85,134,129,175,133,234,87,62,187,5,147,152,23,208,247,
+6,223,197,98,220,209,200,196,178,165,50,69,178,141,19,252,
+20,197,206,227,15,105,159,17,249,99,212,186,40,114,197,87,
+59,39,96,150,72,187,4,68,125,240,152,188,83,158,219,129,
+209,23,89,225,67,26,110,11,163,234,3,128,141,14,130,193,
+43,11,14,225,245,7,19,246,193,11,128,43,24,34,103,52,
+2,252,86,224,92,205,161,139,149,93,32,39,179,83,19,155,
+86,89,73,13,78,23,189,25,163,116,147,125,50,79,178,200,
+172,73,74,42,65,33,223,216,5,172,105,169,197,233,156,225,
+248,183,161,244,25,161,11,249,11,60,82,24,40,51,6,208,
+93,25,184,73,122,235,152,105,55,212,69,245,136,40,44,21,
+189,40,25,109,34,218,171,146,81,44,128,18,106,41,152,156,
+96,170,207,85,20,226,134,85,150,79,83,50,130,59,34,231,
+165,191,8,64,88,93,15,93,210,144,48,233,25,202,74,159,
+39,173,101,30,25,87,42,111,239,102,176,103,209,9,232,17,
+22,146,184,24,206,236,167,40,28,139,164,16,98,156,120,244,
+236,223,254,147,50,62,197,125,105,35,181,157,69,232,213,53,
+17,179,12,238,8,10,166,188,46,50,7,34,99,79,69,154,
+50,92,192,168,24,125,136,14,129,29,25,198,71,169,130,229,
+44,111,249,208,145,81,52,103,228,239,84,152,33,13,130,94,
+171,202,64,84,184,220,195,220,220,145,195,147,9,197,91,63,
+22,61,163,23,158,207,167,64,12,41,44,134,175,68,230,253,
+207,239,36,65,36,19,105,206,162,118,11,145,180,217,17,133,
+12,224,49,6,123,4,223,228,81,186,194,32,217,186,103,170,
+51,170,152,211,235,189,214,44,199,178,14,252,109,36,192,18,
+28,240,81,196,183,12,187,47,31,168,132,118,141,168,108,110,
+239,91,166,54,18,21,71,198,73,2,108,72,183,245,54,200,
+178,61,122,193,49,67,45,107,155,55,9,213,50,17,199,213,
+160,31,31,105,44,63,40,114,18,136,165,127,110,252,81,217,
+60,83,179,43,138,203,37,34,161,131,228,234,52,213,177,12,
+51,225,150,58,66,242,239,82,92,29,147,68,23,40,244,94,
+61,73,4,217,43,104,122,230,147,53,10,115,167,47,106,139,
+178,8,150,233,37,45,170,101,19,44,178,86,79,71,156,45,
+132,173,184,120,173,144,139,26,251,27,15,207,252,69,114,68,
+105,181,124,72,105,95,96,96,23,43,4,196,74,135,249,107,
+121,51,12,33,51,204,0,80,96,49,24,188,230,175,230,66,
+252,4,57,222,178,224,98,122,144,27,9,44,134,144,249,53,
+41,1,71,16,144,13,99,81,13,108,188,166,16,68,201,131,
+239,7,223,179,218,138,149,129,121,1,135,58,78,192,130,180,
+214,153,10,85,87,123,112,5,127,76,92,210,11,220,217,86,
+2,237,101,9,244,104,129,149,181,2,236,212,98,23,73,182,
+124,161,170,45,174,254,0,50,125,65,213,2,74,246,41,91,
+6,135,5,99,128,227,10,134,147,199,255,28,1,34,199,70,
+58,16,159,105,133,228,108,66,209,203,132,10,60,150,170,103,
+176,230,59,69,213,33,2,222,128,168,36,72,85,118,33,237,
+101,144,191,96,20,174,59,242,52,170,36,17,35,106,197,242,
+71,177,144,67,87,215,83,9,137,153,83,166,161,127,133,216,
+218,153,59,67,55,92,130,19,213,225,160,235,161,115,19,124,
+100,224,71,163,30,220,233,20,18,103,135,106,203,51,39,28,
+78,214,46,161,180,240,168,18,15,145,133,230,193,7,21,92,
+60,105,230,246,50,228,169,194,214,231,116,153,123,64,241,4,
+197,245,220,140,192,251,143,145,209,148,242,175,145,83,196,221,
+5,182,254,46,115,188,12,52,84,172,159,202,50,95,134,52,
+239,48,63,46,34,207,81,248,129,50,177,255,249,66,147,87,
+150,180,77,62,154,199,147,93,40,197,135,151,109,101,55,149,
+224,39,179,180,48,38,133,216,134,210,217,167,77,52,85,76,
+30,141,40,103,166,72,200,188,132,213,31,127,17,178,241,34,
+160,7,10,43,210,56,133,205,159,198,90,63,86,48,255,107,
+174,159,207,92,191,92,141,248,15,178,248,114,231,33,93,212,
+145,27,133,130,182,196,12,93,213,22,171,169,251,157,105,214,
+98,165,11,119,128,135,8,77,202,213,239,92,237,46,20,39,
+90,145,226,229,118,241,90,70,153,64,201,114,186,6,32,247,
+155,30,108,1,93,151,117,149,64,58,93,118,106,37,161,253,
+114,69,237,76,111,89,136,96,239,116,26,106,84,170,112,6,
+72,216,12,94,177,122,31,143,204,124,237,62,239,165,120,183,
+172,82,153,89,215,22,165,161,204,119,159,67,5,138,248,192,
+245,251,39,32,42,107,117,231,207,168,55,113,199,160,139,255,
+240,234,167,254,159,82,127,118,232,11,55,211,32,189,1,150,
+231,13,115,61,225,142,245,175,80,120,58,9,92,239,99,134,
+27,253,21,92,250,12,66,45,145,117,34,198,183,164,5,183,
+203,70,220,176,134,66,72,45,22,122,227,98,167,17,245,7,
+46,120,112,207,183,178,37,159,194,192,201,170,83,18,196,72,
+234,73,31,12,153,135,86,176,144,18,240,225,34,8,228,94,
+155,28,84,137,13,55,58,147,226,157,12,155,227,50,131,200,
+89,65,87,76,202,31,87,131,127,131,231,176,54,170,193,139,
+212,202,98,92,95,181,199,146,59,126,251,20,234,25,28,71,
+129,228,233,211,106,128,121,120,12,99,213,186,155,193,247,246,
+195,122,90,28,97,189,194,8,11,23,97,182,245,164,195,99,
+116,56,81,186,20,227,201,208,25,244,31,147,167,225,241,36,
+62,194,127,93,121,184,203,60,137,233,125,136,167,60,99,30,
+70,154,180,63,226,248,6,26,232,75,77,144,236,61,49,180,
+200,255,72,43,157,100,206,254,231,183,59,182,81,152,132,60,
+133,212,238,74,200,116,154,180,74,198,118,225,46,139,82,27,
+193,209,97,218,71,237,94,21,160,123,158,218,231,144,56,118,
+202,68,248,1,80,106,112,51,117,45,16,27,177,41,115,151,
+76,114,34,67,19,147,105,107,207,157,81,4,97,157,19,150,
+231,240,71,62,2,240,245,73,92,60,136,187,59,118,198,86,
+141,156,53,103,99,34,99,64,119,32,36,199,109,86,226,125,
+3,189,97,39,193,200,53,97,168,45,232,132,133,116,168,240,
+123,134,67,244,190,74,73,161,107,55,242,132,238,181,58,169,
+107,6,153,91,51,215,64,163,235,152,20,188,142,251,146,76,
+81,218,70,38,244,62,50,152,125,249,86,201,6,93,137,77,
+84,141,242,149,114,127,71,226,112,41,217,170,206,65,231,200,
+193,35,24,37,207,128,191,253,154,109,169,68,17,243,190,228,
+246,53,210,99,197,241,76,177,230,64,199,179,150,6,54,177,
+212,46,173,184,104,226,47,233,179,179,250,151,162,182,239,101,
+214,130,10,159,149,217,171,63,55,113,31,165,1,255,81,33,
+240,106,141,138,238,108,8,30,134,42,235,156,81,61,33,21,
+240,74,222,225,29,138,163,163,198,243,86,10,114,226,79,29,
+69,75,29,202,172,1,60,86,1,191,74,169,34,191,73,36,
+187,78,220,53,93,95,178,211,226,144,170,233,59,158,31,157,
+174,250,186,152,173,206,63,63,58,253,125,1,140,218,200,22,
+248,227,177,224,91,134,207,113,59,146,97,46,2,220,200,76,
+199,75,127,184,152,72,12,49,98,207,207,78,83,2,99,158,
+42,146,197,139,144,99,55,128,176,217,92,40,244,32,48,139,
+222,55,53,91,105,99,158,215,180,188,153,99,18,178,117,108,
+189,157,141,144,147,38,108,4,222,86,77,82,245,25,57,191,
+75,51,240,156,68,221,76,159,183,84,229,21,44,204,83,227,
+175,142,151,145,134,102,236,16,60,66,65,159,220,239,199,239,
+30,109,233,82,212,149,165,29,58,120,10,216,109,42,229,6,
+241,234,168,7,93,88,202,186,157,121,65,151,74,228,109,98,
+89,173,183,174,27,210,108,149,168,106,130,87,105,178,239,145,
+83,3,138,10,93,237,86,215,186,51,144,196,11,67,128,7,
+94,248,126,110,23,241,40,99,146,121,1,109,135,166,56,70,
+164,63,21,191,118,201,139,203,7,103,190,157,42,214,183,179,
+188,110,35,205,50,68,66,164,247,94,115,206,83,109,43,229,
+245,117,86,50,49,190,145,49,94,112,192,100,39,123,159,191,
+110,93,162,223,33,225,117,165,207,170,90,196,118,114,234,125,
+186,158,230,42,3,233,210,8,124,208,232,87,214,176,137,110,
+92,238,148,87,214,205,56,83,214,139,115,171,231,4,119,60,
+140,91,176,204,10,145,93,88,175,177,115,106,181,177,171,10,
+145,166,105,226,224,69,124,135,172,130,93,53,144,108,177,182,
+26,236,108,234,154,254,28,98,14,196,52,125,103,168,193,73,
+206,109,179,29,157,41,176,232,107,21,78,179,183,89,19,101,
+120,179,78,220,233,77,53,118,41,88,168,219,197,78,107,161,
+139,185,31,100,115,32,177,190,88,135,198,122,131,6,54,235,
+238,225,102,92,18,92,157,201,171,27,175,111,173,123,161,249,
+36,46,118,113,127,23,182,107,215,69,1,187,226,87,132,129,
+38,227,46,202,154,85,39,159,86,51,109,7,122,182,46,180,
+218,136,201,91,114,236,60,240,183,115,243,158,197,152,117,117,
+83,156,68,100,214,76,167,78,228,101,147,135,217,132,218,66,
+194,187,127,37,251,62,226,62,243,202,101,93,46,95,185,41,
+87,212,194,244,108,34,164,110,190,166,142,205,217,88,23,189,
+254,25,169,91,98,217,105,0,143,190,55,109,45,167,232,169,
+154,220,27,200,207,183,214,60,47,252,222,159,39,29,113,66,
+178,86,226,153,233,81,35,233,146,160,19,242,85,7,249,42,
+232,115,227,86,243,113,189,84,44,231,249,100,10,159,29,215,
+23,77,171,110,243,98,116,236,2,193,229,13,13,169,190,212,
+67,69,23,56,29,121,51,216,139,228,44,116,237,118,91,113,
+187,119,27,69,108,206,42,65,41,134,116,205,234,61,180,73,
+157,106,253,145,221,119,186,215,134,106,42,56,83,4,128,64,
+142,26,17,189,25,141,84,151,35,128,245,169,220,175,178,31,
+151,234,52,46,157,144,74,43,155,186,65,109,26,112,168,35,
+168,51,108,170,103,91,73,135,97,104,61,197,158,77,224,223,
+132,0,18,226,241,215,133,144,13,202,232,109,218,128,178,26,
+104,96,147,13,142,77,9,177,253,150,233,229,49,119,130,80,
+245,247,136,96,201,86,145,63,251,126,169,68,3,79,65,44,
+95,131,102,156,158,178,58,254,104,224,143,86,249,217,174,249,
+109,223,6,167,224,217,85,229,113,6,123,216,18,165,252,20,
+242,86,40,254,44,34,80,61,54,216,123,209,178,244,163,19,
+40,89,194,160,19,254,210,191,158,203,238,47,63,7,254,12,
+62,141,164,107,227,43,66,187,232,6,147,41,17,170,245,203,
+177,110,90,102,218,109,124,30,232,142,104,160,233,236,211,160,
+124,108,181,70,179,134,245,237,97,212,52,237,147,108,154,86,
+140,249,88,25,179,32,188,36,49,88,97,42,254,184,238,78,
+5,100,97,181,101,216,162,85,135,234,62,183,89,120,6,50,
+128,77,54,250,216,101,195,98,42,49,78,245,246,131,5,135,
+171,18,243,162,32,42,56,25,117,238,232,239,166,117,199,37,
+168,53,93,143,204,137,58,46,67,176,219,179,107,38,255,205,
+137,59,68,70,220,161,225,234,11,162,38,0,177,47,161,28,
+152,131,105,18,126,149,253,143,31,124,196,99,58,216,78,121,
+76,237,30,93,33,59,225,90,178,251,219,251,247,85,118,174,
+11,187,15,240,138,12,104,236,198,87,52,5,117,239,245,5,
+167,206,183,116,93,132,204,142,72,244,178,90,229,42,133,90,
+136,60,58,105,26,120,169,222,135,137,83,110,38,52,58,80,
+181,99,33,151,101,51,8,44,148,241,84,209,47,37,180,74,
+192,91,233,185,74,218,236,156,103,156,44,98,103,250,15,153,
+74,99,59,151,140,152,61,57,207,224,139,53,211,224,75,214,
+92,214,221,87,239,222,255,168,120,55,226,118,113,16,91,37,
+47,215,103,12,57,171,84,13,52,205,7,223,197,151,189,162,
+113,37,32,248,62,105,138,32,249,148,155,2,25,245,122,192,
+12,175,9,197,66,218,68,141,31,219,239,70,85,253,120,211,
+178,251,29,22,235,173,214,156,143,221,56,185,79,107,26,81,
+69,79,177,91,146,20,167,72,14,187,105,42,155,219,21,136,
+85,227,44,143,55,26,85,28,175,96,97,35,114,189,169,222,
+159,25,254,168,104,148,139,157,127,210,221,90,227,157,236,108,
+35,69,61,179,149,69,210,214,3,173,24,182,102,235,165,38,
+183,45,144,181,23,149,1,80,246,144,78,0,76,180,216,219,
+74,34,225,101,200,140,71,121,221,218,100,139,87,19,248,198,
+197,11,229,96,245,54,197,234,52,76,4,25,59,244,25,252,
+139,196,245,124,69,15,89,235,75,1,118,196,229,151,201,89,
+224,94,44,32,65,128,224,127,110,122,81,92,66,135,4,177,
+93,160,233,35,38,199,200,16,11,171,34,11,186,35,106,218,
+33,98,55,254,59,240,137,225,100,150,170,195,93,199,84,153,
+188,141,110,35,125,109,178,173,235,188,175,170,184,190,182,78,
+145,92,99,84,165,222,181,7,28,219,67,242,190,181,194,134,
+196,98,104,152,138,178,110,68,141,36,89,69,182,108,84,19,
+17,96,246,28,166,253,159,187,106,178,116,22,138,191,68,100,
+75,18,33,230,32,126,228,119,110,84,177,77,151,56,29,136,
+115,188,193,254,48,141,137,159,125,104,196,58,234,159,31,115,
+106,148,118,186,148,159,236,227,70,27,47,196,108,224,252,83,
+222,255,88,250,170,165,125,178,126,184,174,86,247,36,107,251,
+27,39,225,216,170,32,15,43,203,218,209,42,70,150,2,23,
+193,173,27,29,36,77,88,41,125,69,179,210,247,165,0,45,
+61,176,180,161,105,44,171,190,69,193,85,95,94,0,175,225,
+88,42,167,210,49,170,225,132,83,214,225,226,153,138,219,5,
+166,164,163,196,222,45,190,96,221,60,77,239,146,20,230,74,
+58,81,91,101,130,164,214,198,117,53,55,165,139,169,86,193,
+124,206,97,197,53,109,107,45,123,194,53,91,58,248,248,21,
+239,94,37,247,63,63,31,41,18,42,187,81,123,90,75,101,
+139,54,168,253,250,53,248,169,84,56,25,125,102,152,198,39,
+218,244,136,238,230,71,1,235,99,54,76,228,119,9,153,132,
+95,6,120,119,64,252,0,34,63,108,204,132,216,82,72,165,
+47,211,209,22,11,142,114,100,205,1,79,109,210,87,19,20,
+219,80,193,251,251,63,147,93,49,135,60,197,131,125,56,64,
+239,186,92,202,83,76,233,81,59,226,3,242,118,29,47,10,
+187,203,117,140,217,0,208,54,92,50,107,201,230,84,172,182,
+170,155,167,235,147,81,248,117,35,169,111,64,233,165,153,118,
+97,41,249,138,19,105,183,137,161,57,135,209,250,255,15,220,
+93,175,7,
\ No newline at end of file
diff --git a/uppsrc/Core/src.tpp/ArrayIndex$en-us.tpp b/uppsrc/Core/src.tpp/ArrayIndex$en-us.tpp
new file mode 100644
index 000000000..70ebf119a
--- /dev/null
+++ b/uppsrc/Core/src.tpp/ArrayIndex$en-us.tpp
@@ -0,0 +1,12 @@
+TITLE("ArrayIndex")
+COMPRESSED
+120,156,237,89,91,115,219,54,22,254,43,152,73,154,145,92,89,230,85,164,37,71,19,175,219,221,102,218,38,157,88,155,23,141,44,66,36,20,161,161,8,46,47,178,53,155,230,183,247,28,128,20,73,139,178,157,52,77,178,179,241,131,37,129,7,231,250,157,11,192,169,65,30,63,214,122,218,35,237,158,191,225,15,108,73,243,48,155,77,185,101,185,35,106,216,163,183,63,191,60,29,29,61,235,12,172,46,114,209,129,139,233,232,166,107,155,186,101,12,224,159,110,234,134,109,152,150,238,26,167,150,107,154,174,54,244,67,154,166,179,105,104,184,238,8,55,25,176,201,112,108,67,119,44,215,114,117,211,113,13,216,107,104,154,161,57,134,173,91,166,107,216,195,128,165,254,108,74,93,115,116,244,106,0,155,76,148,4,204,53,125,96,88,142,101,104,166,102,88,32,74,119,93,75,119,108,215,60,29,12,134,62,141,51,46,162,66,22,215,117,67,31,45,116,103,4,58,191,127,255,190,175,91,154,210,192,2,102,186,102,129,170,58,172,105,150,225,232,246,169,118,106,187,186,171,153,
+192,220,118,52,123,24,211,132,174,15,155,110,223,107,186,163,13,121,198,128,197,209,247,186,238,192,150,65,111,240,72,183,28,48,212,53,45,219,117,52,16,110,24,134,105,26,186,105,156,158,26,246,192,118,134,43,70,3,150,20,38,80,80,254,72,135,173,78,207,121,4,27,53,203,54,13,235,20,157,101,130,36,195,24,216,167,186,109,105,246,0,56,13,19,246,159,156,39,108,205,34,8,217,127,231,127,124,247,227,139,227,127,95,146,105,106,143,126,38,211,239,52,237,88,211,8,104,20,135,52,99,243,179,89,177,244,172,163,245,181,190,97,219,93,82,132,170,32,157,239,40,44,50,217,173,246,200,7,109,252,137,166,171,127,70,213,35,239,233,252,50,11,112,245,172,149,253,120,62,158,207,63,64,130,70,206,147,132,110,159,71,1,187,169,30,15,219,88,196,9,223,128,229,251,76,174,188,161,55,252,85,108,24,93,132,236,60,10,126,96,44,190,16,241,246,165,132,211,21,57,248,104,199,234,236,30,133,218,109,173,185,114,223,81,224,136,86,87,199,249,34,228,254,1,35,206,
+165,216,43,114,254,97,226,213,94,84,251,74,105,127,207,206,241,93,154,143,231,179,39,179,105,170,97,206,13,172,209,14,113,228,76,198,144,76,143,36,175,30,169,253,44,88,16,239,41,41,209,81,144,141,201,88,113,51,9,126,126,131,242,55,40,127,1,40,19,245,193,45,87,194,186,143,159,128,220,11,201,234,248,221,100,27,51,34,18,178,160,41,43,96,45,150,132,133,178,22,167,36,205,68,194,2,194,35,165,81,159,76,86,44,97,132,167,36,18,196,23,235,181,136,72,173,120,147,37,176,154,244,15,139,44,180,60,126,135,95,120,244,70,137,236,147,95,243,52,35,43,186,97,36,96,75,30,129,72,160,39,121,148,242,55,248,67,196,44,161,160,74,167,219,241,69,4,164,19,239,9,185,233,206,200,154,101,43,17,128,10,89,158,68,200,111,5,124,201,134,134,57,147,186,148,134,244,73,49,17,164,36,19,211,35,2,158,3,254,101,14,76,198,51,114,189,226,254,170,180,37,109,138,255,23,203,144,238,53,178,173,20,232,206,166,23,192,104,153,71,62,194,176,93,137,186,
+51,51,65,22,59,3,11,39,145,127,236,28,175,22,174,50,17,115,31,160,112,226,157,92,128,243,189,147,52,241,189,19,133,37,239,49,139,188,227,60,45,177,117,54,233,169,192,128,9,189,194,185,227,70,220,213,99,178,12,233,6,220,1,218,112,220,215,39,207,35,8,36,7,165,214,2,172,193,117,248,94,154,66,67,158,193,158,68,172,201,244,131,244,153,17,26,5,132,6,1,160,40,10,183,16,158,245,130,37,0,163,152,249,124,201,125,25,19,41,73,234,83,250,224,23,254,150,193,206,45,17,25,104,69,94,76,126,1,108,69,25,5,63,37,189,90,38,35,238,40,132,230,164,85,169,64,128,94,101,149,168,52,91,23,43,16,241,19,8,87,134,128,191,230,217,234,110,62,176,252,214,155,87,92,240,183,52,78,196,202,67,16,71,22,131,154,241,118,70,178,132,70,233,18,52,79,217,154,70,25,247,1,111,23,52,12,17,11,10,161,50,171,168,228,2,120,106,90,20,138,55,224,25,150,36,224,27,169,24,56,129,176,27,159,73,73,184,83,185,233,228,123,199,38,211,147,
+11,178,17,60,64,0,195,215,50,49,188,167,51,124,210,81,106,215,4,64,158,72,202,103,38,217,72,146,46,153,117,202,28,91,108,49,135,99,145,114,148,212,189,95,204,217,89,41,72,101,193,249,1,25,240,159,212,228,96,249,144,148,133,136,11,20,33,217,67,42,94,132,140,38,179,78,253,209,66,136,16,31,61,79,127,147,14,131,167,68,10,44,240,242,114,47,6,59,13,209,161,92,97,27,4,75,8,43,209,101,165,65,142,77,106,104,197,220,231,25,192,181,221,47,253,3,93,188,214,14,208,150,246,182,24,84,235,157,182,134,138,86,85,59,161,170,84,187,77,114,211,214,164,170,205,101,125,106,145,108,18,111,142,85,104,247,168,43,219,129,49,66,141,48,137,34,118,93,22,38,5,58,0,103,194,208,234,28,29,87,85,48,89,242,15,60,35,107,44,219,80,211,16,177,41,93,67,18,167,242,123,141,36,91,81,144,32,242,48,40,9,161,188,66,33,198,132,80,5,75,73,88,176,8,188,47,151,243,20,19,231,144,66,24,51,201,52,21,144,91,124,13,197,122,43,114,
+226,211,136,20,212,146,216,59,86,212,133,70,112,38,146,188,129,74,21,153,56,17,62,75,211,30,9,177,248,44,89,230,175,148,212,52,75,240,139,132,14,80,243,8,88,226,34,163,107,212,20,164,23,77,103,69,203,146,158,48,4,145,116,102,173,89,42,216,117,148,53,169,164,192,250,119,77,147,0,86,186,36,64,239,8,2,229,41,9,5,197,53,84,16,96,143,160,65,46,74,81,216,178,78,37,6,157,17,121,85,246,167,9,110,45,26,102,153,3,18,76,73,238,103,69,101,5,250,231,17,120,129,7,48,112,1,208,51,5,122,169,53,250,164,210,82,146,91,170,73,35,236,142,223,253,88,96,3,72,161,156,55,159,23,208,58,126,247,91,59,98,190,130,124,185,11,238,96,146,50,250,255,58,154,31,25,160,75,150,221,25,32,30,101,173,229,136,223,115,116,249,236,117,240,21,131,19,24,84,0,213,109,11,255,64,85,145,165,76,141,43,16,253,178,7,148,53,114,175,108,54,201,37,254,123,7,11,88,81,147,250,228,50,102,56,213,46,97,59,32,80,117,35,148,18,176,
+152,69,114,120,146,140,51,145,65,147,139,114,28,162,26,147,100,37,26,139,110,163,208,85,202,136,136,53,209,251,215,1,15,103,1,192,171,156,17,239,64,60,98,228,75,34,158,99,105,42,3,87,185,109,63,45,94,171,14,37,96,110,203,62,91,137,251,194,25,180,159,0,53,240,31,2,254,30,236,111,65,254,27,162,191,86,68,127,210,62,92,191,125,152,123,71,53,124,1,64,178,191,161,72,183,116,111,31,6,177,76,98,65,77,154,140,198,251,222,187,103,132,84,19,103,201,145,167,53,136,193,232,15,187,4,36,33,4,186,224,43,22,191,3,66,250,117,254,25,125,11,241,67,160,16,113,13,167,212,116,197,99,133,126,86,236,14,118,65,82,24,221,208,132,83,204,178,48,20,215,10,216,121,202,138,145,180,198,153,166,82,129,112,187,22,73,188,130,131,97,237,36,188,96,62,197,77,50,147,228,197,141,146,8,61,189,146,39,39,97,200,1,198,37,88,39,120,187,67,21,121,0,199,162,77,121,44,154,244,201,11,81,71,168,60,93,199,112,24,98,65,159,52,144,37,163,
+91,77,17,45,33,248,98,88,187,103,208,187,149,84,223,226,254,49,113,127,41,253,80,148,86,41,243,171,233,127,159,189,34,29,44,203,253,54,207,189,104,47,92,187,140,217,159,55,126,218,21,169,255,49,23,127,236,96,141,137,23,237,232,160,94,111,184,200,211,112,219,90,101,30,154,138,245,254,168,253,45,65,59,1,59,241,186,87,197,10,118,213,195,165,141,134,187,187,124,117,67,214,252,213,241,186,67,121,52,172,222,81,168,251,47,112,223,69,109,100,168,126,164,210,73,235,56,219,222,158,17,30,44,179,184,209,108,174,62,105,209,164,184,67,108,174,122,79,240,117,151,73,210,89,169,168,188,72,171,15,56,100,82,92,131,66,93,21,121,226,51,82,92,113,70,4,74,159,34,197,74,136,119,54,80,211,242,12,234,18,108,22,91,28,132,16,7,40,24,218,118,51,40,41,248,246,82,177,251,88,203,165,228,61,195,123,144,5,45,214,171,139,205,67,198,247,48,119,74,15,180,92,67,182,12,124,15,29,16,177,94,239,95,46,239,113,252,148,142,185,5,9,239,108,226,141,
+31,2,137,217,217,100,220,14,8,239,216,175,32,91,75,214,242,54,173,124,139,116,27,41,187,102,247,137,209,242,87,128,82,186,227,65,64,105,186,164,1,19,124,91,137,126,169,7,115,223,57,149,186,159,7,51,175,217,238,113,75,151,185,106,186,230,170,237,117,106,253,132,169,53,222,68,148,173,71,193,230,214,203,209,59,95,112,94,77,174,234,111,56,239,61,196,54,110,243,91,112,165,222,126,237,13,130,15,7,212,205,109,64,205,254,4,238,58,98,250,
+
diff --git a/uppsrc/Core/src.tpp/ArrayMap$en-us.tpp b/uppsrc/Core/src.tpp/ArrayMap$en-us.tpp
new file mode 100644
index 000000000..fd859b6af
--- /dev/null
+++ b/uppsrc/Core/src.tpp/ArrayMap$en-us.tpp
@@ -0,0 +1,11 @@
+TITLE("ArrayMap")
+COMPRESSED
+120,156,213,87,107,143,219,184,21,253,43,23,72,186,240,120,61,182,158,150,252,200,32,169,179,69,131,217,100,23,137,155,47,134,50,162,37,78,204,142,44,170,162,236,153,65,211,252,246,222,75,74,178,53,113,50,105,128,69,219,4,240,72,20,121,31,231,156,123,73,174,28,120,250,212,26,88,79,172,71,254,77,95,242,107,182,203,170,104,37,60,47,156,49,199,159,221,92,254,54,153,245,159,247,198,222,25,89,177,209,138,27,216,110,232,187,182,231,140,241,199,118,109,199,119,92,207,14,157,137,23,186,110,104,77,147,140,41,21,173,50,39,12,103,180,200,193,69,78,224,59,118,224,133,94,104,187,65,232,224,90,199,178,28,43,112,124,219,115,67,199,159,166,92,37,209,138,133,238,172,255,118,140,139,92,242,132,198,45,123,236,120,129,231,88,174,229,120,232,202,14,67,207,14,252,208,157,140,199,211,132,21,149,144,121,237,75,216,182,99,207,214,118,48,195,152,63,127,254,60,180,61,203,68,224,161,49,219,242,48,84,27,199,44,207,9,108,127,98,77,252,208,14,45,23,141,
+251,129,229,79,11,86,178,237,215,83,247,31,77,61,176,166,162,226,104,162,255,179,109,7,184,100,60,24,63,177,189,0,19,13,93,207,15,3,11,157,59,142,227,186,142,237,58,147,137,227,143,253,96,186,225,44,229,101,157,2,195,224,251,54,46,13,6,193,19,92,104,121,190,235,120,19,2,203,69,79,142,51,246,39,182,239,89,254,24,45,77,75,254,143,157,40,249,150,231,72,217,63,175,254,245,167,95,222,156,255,237,29,172,148,59,155,198,248,255,69,89,178,251,215,172,160,103,77,202,20,154,161,159,162,149,178,102,80,255,193,168,139,140,85,28,230,122,26,172,250,207,61,184,140,6,112,244,186,236,190,254,149,169,205,95,242,8,226,103,240,174,74,233,109,94,175,186,128,11,99,214,173,205,127,37,150,62,26,170,45,70,167,195,90,245,23,218,226,249,167,229,125,193,65,94,195,13,191,87,67,184,132,237,78,85,176,97,123,14,41,231,5,36,178,184,199,159,92,85,229,46,169,100,57,128,53,199,213,163,15,105,65,14,71,241,232,157,220,149,9,127,41,147,120,180,144,
+121,197,68,206,75,21,143,94,203,61,103,235,140,127,128,109,253,20,1,203,211,35,251,24,3,200,130,151,12,205,198,207,226,103,17,122,188,198,213,233,176,19,228,178,13,178,132,53,83,188,78,12,67,174,54,28,246,44,219,113,5,10,109,240,20,68,222,210,48,132,229,134,151,28,132,130,92,98,6,219,173,204,225,136,86,184,70,123,203,174,171,26,249,243,79,244,32,242,143,198,213,16,94,31,97,162,35,212,177,239,114,37,62,210,75,147,68,239,172,167,145,130,203,248,39,184,59,139,96,203,171,141,76,209,107,181,43,115,178,183,65,187,38,100,237,158,103,58,20,85,71,65,133,229,217,227,25,252,185,77,147,43,243,233,67,37,11,145,24,192,23,152,106,60,82,37,2,254,66,211,254,203,155,24,197,249,1,232,109,14,151,3,88,14,12,12,243,229,197,160,78,170,81,14,60,112,165,231,193,117,198,246,24,15,98,186,37,228,94,229,8,157,168,20,82,135,217,224,40,61,95,239,242,132,90,2,203,68,133,43,74,185,133,213,183,194,122,202,243,248,124,167,76,88,134,123,
+150,166,72,92,158,221,35,50,219,53,202,4,84,193,19,113,45,18,13,135,246,162,35,121,8,200,175,226,134,163,133,123,144,200,121,9,111,150,191,146,38,141,214,6,45,229,196,53,211,226,60,21,86,74,10,109,84,121,136,174,85,39,174,3,136,42,82,218,173,168,54,223,182,131,195,55,241,213,193,10,189,235,20,101,97,48,58,84,79,4,85,201,114,117,141,113,43,190,101,121,37,18,148,212,130,101,25,41,194,72,68,203,153,105,43,168,167,247,156,42,173,78,40,147,31,17,30,94,150,8,144,142,139,84,207,239,18,174,29,209,66,131,213,232,231,192,135,213,104,1,123,41,82,160,108,142,171,43,162,47,61,19,117,139,23,170,84,207,123,238,194,94,79,56,131,168,215,40,124,77,101,191,45,164,18,228,231,236,113,39,243,121,227,198,20,193,139,147,30,240,23,142,188,80,193,226,188,218,252,130,204,107,211,216,191,22,25,103,101,212,59,254,180,150,50,163,79,175,212,239,26,41,252,106,122,83,173,237,223,190,0,191,141,142,160,20,70,214,232,86,171,151,28,55,21,78,
+246,186,115,177,109,139,68,84,168,213,211,136,52,157,227,181,81,242,35,125,249,69,154,198,135,230,16,15,204,227,18,31,207,166,109,198,56,41,58,234,32,216,244,93,184,161,189,161,153,108,134,238,34,141,137,51,163,5,164,120,108,221,90,123,166,177,20,76,148,80,73,173,147,227,102,136,73,213,253,8,187,16,77,192,70,94,114,202,83,55,161,110,247,132,222,78,145,60,149,254,78,213,121,203,202,20,71,206,32,69,31,184,26,203,166,204,36,163,49,18,111,29,62,217,48,53,138,75,182,166,177,5,51,88,62,182,173,52,19,95,229,152,132,72,113,195,68,10,42,67,135,250,34,155,19,147,75,142,5,198,243,132,235,217,122,51,163,89,158,105,237,132,227,249,167,75,126,223,29,188,195,193,247,4,218,240,63,163,15,57,51,108,124,133,178,19,252,60,72,65,243,101,246,5,154,209,70,223,204,75,100,89,114,85,200,92,227,155,154,195,227,1,48,94,147,253,191,197,235,131,32,255,27,172,142,224,173,6,213,192,131,95,223,30,35,187,255,1,174,7,203,184,255,61,69,186,
+132,184,175,95,138,170,60,33,128,248,252,219,213,89,159,100,168,245,212,123,162,233,56,184,41,72,129,44,182,139,228,250,239,184,61,12,15,140,86,236,6,225,33,218,64,222,210,217,107,35,10,115,58,66,91,205,108,45,147,61,43,5,238,63,128,91,143,188,85,176,83,250,224,119,144,164,66,95,217,253,86,150,197,6,183,156,163,13,118,205,19,70,179,171,250,172,136,251,56,70,87,159,94,32,97,57,105,142,101,74,162,8,74,177,111,26,236,146,76,222,242,44,27,194,27,121,172,11,189,81,23,216,96,235,179,222,183,171,148,0,253,206,58,125,199,171,184,135,112,117,88,187,66,214,240,67,68,31,174,52,69,130,248,186,58,193,23,78,83,53,17,172,58,34,66,228,41,191,27,194,251,63,144,162,78,202,2,19,126,165,125,254,40,18,191,203,226,37,175,88,178,137,123,186,93,233,108,161,29,173,247,85,76,249,101,41,11,60,101,48,212,115,67,40,214,250,177,60,7,240,81,236,169,29,236,138,110,248,117,11,90,32,143,180,138,202,149,90,150,18,107,211,90,80,13,25,
+167,189,178,57,172,215,14,30,109,11,157,150,160,179,127,88,214,223,215,181,155,103,83,175,157,33,44,108,210,9,66,67,53,93,143,54,133,125,116,64,210,18,81,168,23,156,221,64,118,226,152,241,176,233,57,116,215,124,107,110,27,10,11,1,147,250,250,230,71,55,155,47,207,141,221,130,169,235,212,92,116,234,67,180,81,142,185,10,81,101,46,27,96,91,199,199,245,124,48,220,26,211,37,219,88,124,96,172,91,201,93,29,42,100,192,92,251,186,84,125,23,23,245,209,25,199,180,194,227,249,101,60,48,119,148,248,130,104,57,124,215,107,226,249,82,143,63,100,170,62,203,106,27,243,203,139,134,170,60,189,67,178,142,15,186,120,9,106,62,162,122,218,82,167,19,95,124,222,98,172,14,213,170,51,214,118,155,123,177,222,173,13,100,141,236,149,105,218,202,160,208,246,74,108,13,27,185,203,82,195,54,210,128,140,230,59,58,33,210,202,206,125,175,69,147,66,110,241,60,81,245,20,117,23,239,31,1,219,92,42,8,237,31,64,217,44,254,3,96,54,134,255,255,113,254,2,
+184,182,189,158,56,21,193,162,228,186,233,241,109,129,87,233,182,132,162,127,3,103,137,173,224,
+
diff --git a/uppsrc/Core/src.tpp/BiArray$en-us.tpp b/uppsrc/Core/src.tpp/BiArray$en-us.tpp
new file mode 100644
index 000000000..c20707a01
--- /dev/null
+++ b/uppsrc/Core/src.tpp/BiArray$en-us.tpp
@@ -0,0 +1,233 @@
+TITLE("BiArray")
+COMPRESSED
+120,156,229,27,13,115,218,70,246,175,236,76,219,12,56,24,
+75,2,12,254,168,167,169,147,246,60,77,147,76,66,123,115,
+227,33,102,145,22,80,45,180,186,93,97,135,92,47,191,253,
+222,219,93,73,43,16,24,108,167,237,165,201,12,182,165,221,
+247,253,185,251,184,244,200,215,95,59,13,231,43,231,142,127,
+199,207,217,152,206,163,116,112,25,182,219,189,19,234,117,78,
+174,127,122,125,116,178,247,93,237,176,93,7,32,46,0,105,
+117,221,86,175,211,114,219,222,33,124,184,45,215,235,120,173,
+182,219,243,142,218,189,86,171,231,28,251,17,149,114,112,25,
+121,189,222,9,98,246,96,147,215,237,120,110,183,221,107,247,
+220,86,183,231,193,94,207,113,60,167,235,117,220,118,171,231,
+117,142,3,38,253,193,37,237,181,78,246,222,30,194,166,22,
+98,2,224,142,123,232,181,187,109,207,105,57,94,27,80,185,
+189,94,219,237,118,122,173,163,195,195,99,159,38,105,200,99,
+131,43,116,93,207,61,25,185,221,19,32,249,211,167,79,77,
+183,237,104,10,218,0,204,117,218,64,170,11,207,156,182,215,
+117,59,71,206,81,167,231,246,156,22,0,239,116,157,206,113,
+66,5,157,85,115,142,48,58,119,178,222,117,142,195,148,1,
+136,189,167,174,219,133,45,135,141,195,175,220,118,23,24,237,
+181,218,157,94,215,1,228,158,231,181,90,158,219,242,142,142,
+188,206,97,167,123,60,101,52,96,194,176,64,129,248,61,23,
+182,118,27,221,175,96,163,211,238,180,188,246,17,10,171,5,
+152,60,239,176,115,228,118,218,78,231,16,32,29,11,246,239,
+121,40,216,140,197,160,177,255,92,253,247,155,23,175,246,127,
+121,71,46,101,11,217,63,108,159,144,239,195,103,66,208,197,
+147,193,165,116,178,103,64,98,18,209,148,145,83,165,40,114,
+185,247,93,155,244,7,103,122,81,139,224,207,206,201,79,228,
+242,27,199,217,119,156,124,253,213,233,192,60,250,174,230,52,
+157,166,215,233,212,137,209,181,89,122,149,175,64,136,217,211,
+179,171,171,29,118,58,25,209,197,187,227,170,253,137,8,111,
+128,170,85,8,239,135,199,195,227,159,249,13,163,163,136,61,
+139,131,231,140,37,231,60,89,188,86,182,242,158,172,125,149,
+131,58,221,68,205,233,26,30,207,174,6,90,130,196,252,184,
+220,59,87,75,246,127,239,47,18,70,184,32,35,42,153,230,
+155,240,49,97,145,210,156,36,50,229,130,5,36,140,73,58,
+101,25,190,38,233,79,153,96,36,148,36,230,196,231,179,25,
+143,137,165,112,50,6,128,253,166,193,5,107,201,60,14,111,
+152,144,52,194,87,51,196,48,10,3,88,237,35,111,240,84,
+208,56,224,51,66,125,159,1,1,62,143,83,26,198,76,52,
+201,5,208,48,102,52,157,11,38,9,5,156,96,143,0,42,
+32,99,1,235,145,166,49,245,83,248,133,166,36,76,145,162,
+116,145,132,62,141,162,5,9,193,54,20,61,176,124,46,195,
+120,66,104,12,156,104,188,5,18,164,38,225,33,44,19,176,
+155,147,62,137,194,107,228,245,87,88,198,197,105,127,184,119,
+214,36,175,24,48,0,248,34,36,16,48,201,121,146,112,145,
+202,140,125,0,231,179,4,254,166,32,192,91,0,43,167,97,
+130,160,51,60,65,46,212,6,200,106,12,242,131,13,164,22,
+243,52,195,94,207,248,7,34,114,5,128,96,136,228,132,199,
+153,56,47,96,189,224,55,97,128,2,137,102,92,166,240,35,
+34,60,97,130,162,52,149,254,50,226,201,109,152,78,149,152,
+36,157,193,7,155,209,56,13,125,13,54,219,29,47,138,245,
+62,136,104,4,82,86,50,2,25,10,6,254,229,3,241,163,
+69,161,253,215,218,26,56,124,8,50,5,80,13,148,72,78,
+149,228,136,42,97,126,72,75,116,129,62,184,148,33,152,183,
+50,144,28,39,210,162,40,193,5,34,5,10,21,188,24,37,
+14,250,186,161,81,24,128,55,201,66,108,146,212,148,198,103,
+140,2,220,243,225,211,225,83,251,37,2,204,52,90,47,73,
+179,6,112,249,56,101,113,9,46,68,70,160,145,11,208,76,
+58,229,243,201,180,158,9,219,176,172,196,66,35,208,3,200,
+102,46,65,28,0,84,185,6,224,137,22,51,46,146,105,232,
+23,104,134,251,153,227,228,143,124,62,143,2,37,90,219,128,
+251,224,74,25,36,57,247,167,150,141,44,248,156,36,232,142,
+134,19,139,15,16,53,187,9,249,92,130,130,124,1,222,1,
+224,184,214,9,68,236,164,73,222,165,97,20,53,114,234,83,
+122,13,92,114,20,103,201,52,109,140,74,52,172,57,105,2,
+129,17,211,82,33,183,83,144,20,77,64,179,16,209,0,77,
+189,73,254,5,100,229,210,0,81,0,86,112,186,25,3,193,
+41,169,104,122,114,212,118,44,81,42,11,56,65,147,159,210,
+27,144,93,232,95,195,95,2,80,178,4,36,148,44,208,91,
+100,42,230,104,23,86,252,0,233,160,239,43,156,150,65,41,
+128,96,252,252,22,32,164,212,159,26,31,207,88,82,34,54,
+148,160,211,205,192,64,97,5,48,54,154,167,138,12,48,215,
+84,240,5,60,109,146,55,133,156,75,130,9,209,240,32,0,
+197,86,212,1,190,45,58,208,222,50,134,39,160,92,73,230,
+73,33,233,140,143,231,161,164,193,13,88,55,157,48,237,163,
+70,68,168,151,220,25,0,27,0,198,40,73,49,62,128,37,
+41,215,176,177,161,173,132,147,56,28,67,156,139,209,73,37,
+72,0,9,7,87,212,14,159,65,3,131,7,191,197,8,9,
+144,129,38,96,173,167,124,43,96,9,139,3,137,86,3,142,
+138,230,51,38,51,148,164,127,48,22,140,229,246,255,76,42,
+87,157,129,232,4,136,16,127,151,184,14,8,248,88,138,104,
+25,51,122,165,82,227,124,166,50,23,114,84,38,119,26,78,
+166,25,185,69,224,41,118,52,17,173,138,89,128,4,41,195,
+223,115,43,154,8,126,91,224,147,41,197,32,156,42,207,28,
+177,52,93,6,220,204,235,139,102,215,105,99,248,52,190,142,
+123,114,40,32,90,57,94,168,64,170,163,9,192,141,3,42,
+2,200,5,35,65,197,194,78,111,90,38,229,148,149,133,16,
+146,68,115,69,252,194,24,38,120,48,48,175,61,12,237,100,
+217,202,235,202,122,192,223,82,52,77,4,236,152,224,6,114,
+123,245,203,203,151,245,44,0,100,58,121,137,217,9,131,182,
+142,191,175,250,47,139,92,86,8,6,118,83,72,243,7,239,
+83,14,110,6,101,199,193,240,224,28,194,204,240,64,10,63,
+224,254,240,32,171,53,134,95,179,120,184,63,151,239,193,210,
+244,19,168,18,15,8,25,164,88,26,40,123,218,8,7,189,
+120,120,85,64,81,94,141,76,241,196,100,247,220,189,7,36,
+5,177,73,8,212,69,42,106,146,115,144,20,50,175,131,136,
+202,95,8,131,5,54,51,17,159,96,132,21,194,78,106,236,
+3,230,92,147,244,180,120,206,159,118,59,228,134,135,1,16,
+109,188,134,139,225,183,131,154,38,51,3,57,124,130,181,101,
+139,220,12,234,122,223,1,238,187,60,56,215,123,81,2,231,
+249,246,211,83,0,128,239,106,74,113,22,12,181,78,129,193,
+215,117,248,4,185,213,2,54,86,9,95,23,29,229,66,174,
+111,42,214,122,5,185,231,17,163,98,80,179,95,141,56,143,
+240,213,133,124,163,68,2,111,181,245,24,99,120,189,34,99,
+20,150,93,249,164,83,129,41,109,13,25,224,245,190,224,153,
+105,253,204,102,35,8,90,235,170,237,254,240,137,93,125,62,
+11,130,127,64,131,144,215,153,181,186,170,50,189,19,124,131,
+230,23,51,12,204,170,107,43,76,190,8,27,132,166,89,206,
+10,50,55,183,43,76,181,63,91,123,11,25,13,125,156,98,
+185,36,67,21,89,28,69,119,247,132,188,213,206,41,161,118,
+3,175,86,185,101,5,175,9,5,176,250,162,42,245,227,70,
+155,0,92,219,198,66,249,0,160,99,244,39,176,105,206,160,
+98,126,155,23,111,102,11,144,9,81,141,6,1,176,182,129,
+221,230,246,98,237,211,48,122,176,88,33,34,68,86,158,217,
+78,164,63,178,244,156,207,227,20,204,12,82,143,251,69,8,
+216,106,204,208,211,42,251,186,21,91,174,234,10,17,101,177,
+187,164,182,22,249,144,191,169,210,87,33,243,172,30,199,250,
+120,28,2,245,138,237,101,95,120,68,63,88,87,90,237,172,
+168,115,197,37,180,140,240,82,19,157,229,41,128,31,234,162,
+184,80,87,86,152,62,142,114,202,30,241,39,41,231,179,123,
+212,23,161,42,244,35,76,86,133,186,116,234,189,159,78,170,
+253,66,183,120,0,86,26,246,76,250,80,231,100,12,139,165,
+7,59,142,42,99,30,77,17,239,248,92,64,64,11,99,44,
+44,125,69,111,63,215,137,174,94,117,205,243,8,126,242,232,
+194,95,178,123,75,248,105,110,95,247,83,192,246,206,241,23,
+83,199,157,181,80,255,106,184,103,201,27,4,145,62,192,222,
+155,228,69,209,141,22,209,9,154,59,106,159,15,168,83,153,
+209,111,208,248,52,239,108,254,237,181,125,236,225,111,40,244,
+248,177,105,168,165,234,237,109,157,203,210,81,135,213,113,140,
+152,79,245,65,0,35,170,101,128,93,58,87,103,60,217,167,
+39,229,227,15,4,123,203,162,168,73,94,113,91,187,170,125,
+73,146,8,152,220,209,147,119,183,7,165,26,29,42,181,60,
+140,1,40,30,118,41,83,204,238,225,183,88,176,15,247,20,
+220,123,23,125,219,219,207,221,14,251,89,172,7,29,5,63,
+190,28,27,90,19,140,254,2,22,181,127,15,139,90,211,154,
+105,148,214,89,106,134,171,178,11,123,135,167,198,120,162,157,
+53,210,151,195,65,205,169,239,194,195,114,36,219,146,252,53,
+45,208,90,242,51,147,191,155,252,37,53,239,196,204,178,99,
+45,49,99,37,233,140,244,82,93,170,175,42,175,54,104,74,
+175,168,213,243,247,6,192,31,164,189,115,174,50,98,186,30,
+193,163,114,110,43,249,190,156,127,22,197,175,151,195,29,22,
+176,75,185,246,92,240,100,173,151,226,89,156,220,230,164,100,
+215,40,245,0,98,215,250,100,37,177,85,138,121,4,98,73,
+41,51,2,97,234,228,255,193,114,108,224,201,61,30,215,149,
+142,238,201,57,164,143,236,14,64,38,96,21,249,245,149,186,
+38,193,180,81,62,160,126,164,51,144,55,229,180,156,211,143,
+71,244,43,247,61,59,73,234,193,74,252,34,37,85,142,75,
+118,216,216,120,234,16,198,105,133,183,180,72,184,90,171,101,
+1,140,174,198,148,37,153,23,21,90,86,154,148,203,139,80,
+113,109,138,150,10,153,110,153,203,214,116,251,247,139,228,85,
+18,51,17,61,23,133,37,44,3,164,74,98,250,213,93,105,
+224,207,146,226,250,196,176,189,56,55,200,193,201,139,208,29,
+211,162,58,204,153,227,233,125,233,202,117,105,110,99,61,95,
+207,252,116,78,163,10,16,91,240,131,119,20,235,25,186,144,
+47,102,73,186,216,146,159,62,147,64,246,237,148,165,250,138,
+176,184,73,134,192,194,16,80,145,220,237,124,254,45,116,93,
+206,6,254,160,39,128,118,127,76,138,91,86,5,172,65,198,
+208,84,152,81,134,219,80,178,135,164,72,125,125,179,62,180,
+226,237,98,174,153,124,126,229,17,114,243,187,169,8,227,235,
+10,204,63,135,113,56,11,63,50,89,117,47,91,142,234,216,
+13,206,244,114,140,237,62,77,168,31,166,15,34,235,45,147,
+76,220,176,123,5,208,184,42,128,42,112,178,160,141,92,140,
+179,123,217,32,127,138,186,157,168,3,77,115,19,140,76,250,
+115,33,116,23,169,23,53,74,203,195,24,79,64,101,113,44,
+154,3,85,230,179,212,220,169,88,186,132,244,17,188,254,25,
+38,172,29,189,126,153,173,229,194,116,77,12,179,86,175,90,
+160,25,17,59,30,11,200,231,249,21,236,240,73,17,226,79,
+225,127,173,120,62,26,54,52,117,152,69,201,135,97,253,152,
+172,236,181,238,98,7,167,167,53,251,5,136,116,52,176,33,
+168,71,31,244,189,172,135,55,156,230,102,221,140,34,169,24,
+15,148,3,72,117,111,106,78,78,106,57,128,15,245,65,147,
+124,191,48,67,27,106,36,100,53,90,231,81,37,63,171,128,
+230,92,93,66,227,40,142,29,63,41,193,91,220,8,47,155,
+19,168,108,36,184,14,142,9,205,165,158,150,81,187,113,99,
+106,29,62,192,38,156,76,228,106,114,192,62,253,160,66,209,
+142,51,42,57,52,61,110,246,3,231,153,88,78,193,84,206,
+32,168,157,158,18,23,63,60,252,104,215,255,95,110,14,182,
+44,63,50,177,228,195,14,195,61,60,79,170,111,109,134,103,
+240,191,102,27,94,131,216,70,121,151,25,158,157,213,86,108,
+174,65,86,44,115,7,51,196,30,228,75,48,67,151,156,157,
+145,154,135,159,101,139,172,255,205,108,240,126,201,152,137,16,
+120,253,88,145,247,212,244,239,187,20,232,157,189,39,250,103,
+190,168,124,61,35,87,211,95,14,87,23,123,120,120,106,76,
+208,230,36,229,7,170,178,160,6,126,147,252,147,139,107,28,
+244,194,129,216,177,154,22,10,165,158,97,180,44,225,151,55,
+111,54,168,86,26,212,84,215,13,153,39,152,49,151,178,222,
+36,234,141,138,9,75,15,164,190,100,145,154,144,135,215,145,
+102,2,102,183,20,9,254,137,181,223,0,153,183,74,73,240,
+40,51,99,4,229,124,202,54,24,205,118,0,26,136,72,213,
+146,131,53,197,36,196,50,84,127,22,96,172,95,117,204,176,
+159,60,25,54,192,227,48,132,1,212,108,200,219,132,22,235,
+73,49,196,212,192,242,162,8,85,43,51,65,21,46,185,173,
+11,227,112,248,234,36,87,249,160,125,76,178,105,60,142,16,
+149,177,233,179,107,53,205,165,78,244,251,43,136,237,187,0,
+107,124,105,9,152,30,250,92,2,182,52,68,91,178,192,155,
+226,126,111,181,178,222,160,5,51,199,86,82,195,146,6,204,
+12,89,133,10,164,240,243,84,241,102,249,170,146,244,205,212,
+27,206,70,43,194,114,67,130,176,203,111,245,98,236,42,211,
+112,6,166,132,211,169,102,50,85,141,225,66,105,142,152,213,
+148,234,58,86,31,161,141,176,166,229,150,111,143,75,17,204,
+160,122,191,242,245,131,165,24,38,252,213,40,166,100,147,33,
+170,16,204,61,197,242,40,6,176,172,237,76,159,207,43,38,
+157,200,121,246,135,233,36,43,21,176,138,108,248,169,132,110,
+248,169,26,97,129,7,50,39,191,54,49,63,96,133,83,66,
+135,126,195,32,173,231,83,202,171,157,190,29,109,29,82,10,
+155,232,68,16,190,175,250,69,244,252,21,227,29,126,27,36,
+111,197,245,26,125,55,142,231,120,120,65,135,104,204,232,32,
+126,129,96,194,69,152,78,103,171,167,4,107,240,149,236,232,
+34,155,197,125,175,23,229,127,151,67,252,105,165,241,233,119,
+75,22,168,31,158,21,76,229,16,13,79,217,223,138,160,123,
+17,173,244,190,76,121,249,225,227,145,175,225,46,241,144,31,
+65,133,155,152,33,21,88,149,208,51,202,201,50,185,229,239,
+57,177,73,88,244,224,171,247,111,148,196,60,30,238,251,171,
+180,108,184,143,90,159,100,51,90,30,153,139,23,241,166,43,
+208,187,120,200,47,134,127,155,67,222,29,177,5,199,73,237,
+13,55,27,127,40,111,63,50,101,25,247,58,93,1,206,54,
+29,80,111,22,203,221,231,172,249,9,29,6,55,52,36,60,
+161,123,170,176,234,155,248,17,139,161,118,76,243,65,2,243,
+245,145,208,124,165,3,182,225,90,117,151,64,227,9,20,187,
+83,166,74,45,136,62,1,27,205,177,61,10,150,142,101,112,
+131,117,48,179,122,230,187,181,94,86,43,211,101,13,149,220,
+178,20,2,42,35,192,90,191,218,178,132,165,228,115,187,217,
+103,101,217,114,194,135,51,188,149,79,110,237,145,251,191,255,
+145,130,88,242,216,157,174,71,44,143,221,246,130,228,111,235,
+192,121,67,169,207,127,170,190,160,187,190,123,191,165,201,154,
+198,125,203,178,151,230,207,27,228,62,251,71,21,173,191,254,
+46,101,222,128,107,43,159,128,14,4,180,78,32,108,69,181,
+249,82,165,130,45,155,234,153,220,216,104,20,95,42,43,107,
+130,130,108,127,8,69,241,69,23,245,149,184,91,115,125,154,
+47,27,97,153,205,124,110,125,249,45,91,55,248,31,8,5,
+134,124,
\ No newline at end of file
diff --git a/uppsrc/Core/src.tpp/BiVector$en-us.tpp b/uppsrc/Core/src.tpp/BiVector$en-us.tpp
new file mode 100644
index 000000000..3365bfbe5
--- /dev/null
+++ b/uppsrc/Core/src.tpp/BiVector$en-us.tpp
@@ -0,0 +1,169 @@
+TITLE("BiVector")
+COMPRESSED
+120,156,221,90,123,115,218,72,18,255,42,83,149,108,10,28,
+140,245,4,12,142,43,9,201,238,186,118,179,73,37,222,189,
+63,92,178,25,196,96,230,44,36,78,35,236,56,123,151,207,
+126,221,51,122,35,97,140,137,239,146,164,10,151,52,51,61,
+221,191,126,76,119,143,206,12,242,244,169,214,210,158,104,119,
+252,235,191,97,83,186,244,34,231,140,91,86,111,64,13,123,
+112,245,219,251,195,193,222,203,70,199,106,2,17,29,136,152,
+93,221,236,217,166,110,25,29,248,209,77,221,176,13,211,210,
+123,198,161,213,51,205,158,214,119,61,42,132,115,230,25,189,
+222,0,119,54,96,145,209,181,13,189,107,245,172,158,110,118,
+123,6,172,53,52,205,208,186,134,173,91,102,207,176,251,19,
+38,92,231,140,246,204,193,222,199,14,44,50,113,39,32,174,
+233,29,195,234,90,134,102,106,134,5,91,233,189,158,165,119,
+237,158,121,216,233,244,93,186,136,120,224,199,123,113,93,55,
+244,193,88,239,14,128,229,175,95,191,182,117,75,83,28,88,
+64,76,215,44,96,85,135,119,154,101,116,117,251,80,59,180,
+123,122,79,51,129,184,221,213,236,254,130,134,116,94,45,57,
+210,176,239,20,189,171,245,121,196,128,196,222,115,93,239,194,
+146,78,171,243,68,183,186,32,104,207,180,236,94,87,131,205,
+13,195,48,77,67,55,141,195,67,195,238,216,221,254,140,209,
+9,11,99,17,40,48,191,167,195,210,110,171,251,4,22,106,
+150,109,26,214,33,130,101,194,78,134,209,177,15,117,219,210,
+236,14,80,234,135,236,95,75,30,178,57,243,65,99,127,95,
+252,231,167,183,127,236,255,249,137,156,9,19,197,239,88,3,
+242,154,255,197,220,40,8,159,57,103,66,75,94,2,143,11,
+143,70,140,28,73,77,145,179,189,151,22,57,117,142,243,147,
+246,224,45,81,195,78,145,8,193,63,214,192,147,51,219,93,
+13,8,158,237,13,37,133,253,127,159,222,46,24,9,166,132,
+121,146,43,65,4,172,99,19,194,125,18,205,88,202,78,155,
+156,18,46,72,204,255,132,68,1,25,51,32,115,112,30,5,
+11,238,142,250,163,131,209,193,16,86,142,14,68,232,78,2,
+119,116,240,46,184,102,116,236,177,209,83,230,143,246,151,226,
+156,204,227,55,128,247,1,33,14,245,39,100,190,20,17,153,
+209,107,70,24,135,253,66,36,73,38,140,45,136,27,44,110,
+225,199,23,81,184,68,14,156,150,28,131,205,174,10,175,73,
+144,44,146,142,80,24,107,199,0,40,25,200,212,163,215,240,
+7,164,29,243,9,136,225,162,41,82,15,151,68,148,251,12,
+164,124,229,121,193,141,32,116,50,225,254,101,6,10,141,200,
+56,136,102,68,112,176,122,36,32,0,8,230,187,12,113,146,
+59,82,63,34,116,30,132,17,255,130,240,240,57,75,54,255,
+157,95,49,66,253,91,18,72,1,255,56,253,61,219,176,149,
+2,140,232,210,237,1,69,60,35,84,229,13,192,184,158,12,
+34,56,186,200,136,72,68,81,23,193,34,198,35,197,223,33,
+81,72,125,49,5,182,5,155,131,136,220,21,109,50,164,158,
+135,232,204,89,52,11,38,18,14,164,1,98,211,130,56,94,
+112,201,93,194,194,16,30,37,91,104,80,236,179,203,228,62,
+184,78,33,52,124,222,181,201,117,192,39,104,193,193,130,133,
+20,8,140,94,56,13,197,105,172,189,209,51,52,123,147,92,
+59,77,181,236,0,151,157,29,12,213,82,180,169,97,186,250,
+232,8,214,227,88,67,42,39,35,33,167,73,42,56,218,84,
+192,53,192,118,64,27,19,178,20,40,215,27,16,127,8,210,
+191,151,124,158,198,190,215,172,96,118,232,49,26,58,141,252,
+208,56,8,60,28,58,17,31,36,38,48,170,12,36,182,134,
+247,43,32,35,84,28,246,144,166,134,182,51,11,131,229,229,
+172,134,13,50,167,110,24,36,182,245,142,205,199,44,20,234,
+201,148,142,110,15,126,35,103,63,105,218,190,166,145,211,209,
+179,11,39,126,120,169,145,87,147,201,175,16,187,146,55,164,
+209,116,112,133,49,192,17,52,63,159,221,172,250,17,176,20,
+251,1,186,1,234,16,3,32,106,189,20,32,224,9,9,36,
+147,111,184,231,97,144,128,69,139,64,112,20,130,104,146,241,
+238,128,124,84,129,68,64,88,129,80,34,3,64,133,3,39,
+179,79,252,107,234,241,9,136,15,80,69,74,197,66,218,108,
+200,192,56,209,17,5,210,41,48,164,162,158,140,13,31,89,
+180,12,125,2,68,150,12,98,222,199,100,81,178,6,216,246,
+110,209,233,65,214,53,242,183,55,199,249,148,114,239,193,56,
+67,140,240,182,195,249,23,22,13,131,165,31,129,241,141,246,
+137,254,67,162,254,178,161,181,181,182,97,219,77,233,143,41,
+218,107,45,222,89,93,44,183,204,86,23,116,105,146,207,233,
+72,149,18,51,29,196,225,77,44,152,203,167,28,184,151,98,
+127,107,143,169,56,39,119,163,189,161,20,29,210,3,24,85,
+146,68,51,96,11,66,21,236,199,85,2,144,233,208,13,25,
+221,157,198,138,190,243,63,210,216,227,248,222,15,169,63,244,
+56,60,252,50,29,170,131,124,59,69,173,241,32,137,6,210,
+22,177,140,241,184,172,11,88,196,118,224,98,229,116,115,183,
+218,249,20,44,67,153,67,98,254,232,74,254,79,83,69,169,
+20,91,101,86,59,240,168,157,107,164,202,67,118,164,145,205,
+93,232,255,92,63,229,204,160,38,253,82,39,37,226,28,150,
+15,201,234,147,227,19,160,73,168,200,178,229,179,145,211,208,
+154,247,57,125,43,9,111,40,70,77,118,179,70,140,234,112,
+90,41,70,73,249,247,18,170,114,155,146,80,57,159,73,68,
+40,28,40,170,115,114,177,70,115,106,70,163,153,142,199,4,
+30,79,155,195,164,228,220,108,135,157,32,144,87,250,246,8,
+124,27,67,168,199,99,19,139,184,79,52,125,19,6,139,90,
+47,198,122,92,168,50,119,131,138,233,161,161,234,1,18,212,
+58,112,173,4,181,56,238,88,130,114,168,201,91,196,218,164,
+144,251,81,133,184,38,225,171,103,218,26,243,44,73,157,37,
+135,201,217,84,60,36,56,216,222,135,228,212,138,209,201,39,
+81,27,134,173,154,188,107,59,63,173,66,44,246,215,20,138,
+28,88,49,145,42,196,212,208,22,78,254,40,40,214,251,252,
+230,112,174,193,65,75,179,144,123,6,61,153,86,47,177,47,
+83,232,171,150,27,170,245,130,189,114,163,37,245,42,104,108,
+32,16,182,159,234,37,58,17,111,231,139,232,118,67,129,78,
+153,0,190,111,102,76,246,45,11,105,30,164,63,12,41,101,
+145,59,31,172,95,140,94,196,73,117,181,128,144,171,65,82,
+53,37,37,98,45,50,165,158,96,170,79,122,195,5,123,72,
+148,83,173,185,250,16,71,33,235,76,117,51,13,131,249,206,
+226,235,167,89,200,253,171,138,173,223,113,159,207,249,23,216,
+124,14,76,132,170,234,91,206,23,121,179,79,17,30,223,146,
+185,154,143,45,73,151,46,168,203,1,239,7,240,245,145,9,
+22,94,179,173,130,168,95,21,68,37,57,145,241,70,78,166,
+217,5,65,242,22,181,123,41,203,75,52,33,170,156,192,93,
+134,33,198,135,100,82,171,48,157,251,88,143,138,172,72,77,
+137,74,3,42,198,14,95,198,211,210,166,59,240,124,188,8,
+112,239,233,249,101,177,42,207,203,154,96,182,110,73,124,133,
+163,13,250,211,144,51,56,86,147,209,209,179,44,218,31,193,
+255,70,110,96,60,106,41,46,241,68,37,159,71,205,62,89,
+93,157,107,184,59,71,71,141,194,8,128,59,118,242,52,228,
+171,207,170,253,110,96,39,91,45,4,245,44,60,234,170,136,
+15,236,3,77,217,31,143,235,206,70,74,224,115,211,105,147,
+215,183,48,31,69,71,179,174,56,58,178,16,19,161,143,230,
+46,99,192,101,88,33,156,82,130,237,122,15,239,20,22,80,
+21,10,112,163,22,208,88,66,56,105,95,182,213,106,92,8,
+148,211,10,17,22,225,101,90,16,82,240,191,172,106,21,88,
+161,74,238,193,66,51,114,196,195,187,155,159,131,32,69,230,
+8,236,230,24,98,220,209,17,209,241,199,192,31,171,249,189,
+54,121,54,204,79,82,160,26,201,6,163,189,104,198,69,115,
+115,243,60,134,255,141,188,61,182,72,193,88,239,52,207,227,
+227,198,138,41,182,200,170,197,222,195,60,49,143,255,49,204,
+83,39,199,199,164,97,224,111,201,82,155,63,178,109,222,101,
+151,219,157,223,44,228,32,248,151,138,147,242,124,212,31,245,
+63,69,192,236,252,156,168,191,233,164,98,39,77,172,30,152,
+41,93,33,239,127,99,115,44,24,85,20,28,164,169,136,34,
+223,38,255,8,194,43,40,140,125,64,9,82,38,188,61,6,
+49,151,120,58,230,204,226,207,15,31,214,168,89,196,59,83,
+149,105,36,142,17,223,122,22,117,38,80,103,52,188,100,209,
+129,80,221,47,161,24,185,27,209,124,238,89,74,59,227,187,
+208,213,156,232,77,197,245,19,25,38,15,66,218,59,230,134,
+213,153,25,132,28,212,72,26,4,240,233,107,250,212,192,160,
+50,250,10,14,159,188,138,175,106,229,190,217,118,96,232,193,
+85,92,245,78,210,247,50,241,190,102,224,135,73,53,83,149,
+193,175,225,36,227,35,190,113,207,191,123,134,188,21,56,139,
+47,187,203,1,77,132,110,26,210,62,148,155,157,228,52,190,
+158,23,36,86,86,22,159,32,58,4,55,217,183,9,248,69,
+66,139,140,151,145,18,49,184,69,167,198,44,19,247,133,48,
+84,178,2,216,53,109,127,238,34,41,206,93,235,151,123,208,
+5,231,74,246,58,207,144,169,113,176,208,93,117,49,9,80,
+178,213,183,67,231,122,43,108,182,113,143,36,179,4,75,193,
+162,201,193,16,144,47,194,64,142,248,211,11,144,35,98,107,
+226,230,134,20,240,35,27,85,134,57,53,117,216,90,75,151,
+128,150,12,189,5,7,209,138,181,171,83,183,202,216,91,152,
+154,103,135,248,202,215,18,21,39,213,166,39,27,126,42,180,
+250,145,203,10,197,251,232,25,212,87,168,17,240,27,28,136,
+171,23,167,89,169,240,23,106,0,63,179,74,235,106,53,71,
+221,38,76,129,39,136,230,50,184,196,159,120,64,100,247,46,
+131,144,71,179,249,106,201,95,179,95,193,137,78,78,226,227,
+250,92,77,74,159,139,245,204,81,181,231,169,193,178,251,169,
+183,199,153,88,41,205,88,170,228,89,178,180,21,219,50,236,
+151,121,47,190,220,165,0,138,114,73,138,180,169,196,215,138,
+179,82,79,158,151,125,162,64,189,32,75,165,40,249,120,240,
+154,93,114,191,56,188,65,167,221,93,229,92,101,88,83,30,
+130,171,173,59,196,170,35,70,194,232,227,10,255,214,191,255,
+53,75,173,232,233,133,226,63,241,51,195,49,187,13,252,137,
+28,240,232,119,4,201,47,76,78,218,170,151,11,8,220,183,
+155,91,139,230,221,93,221,180,27,136,177,30,173,24,187,129,
+207,9,119,212,181,239,152,249,144,114,198,105,47,23,241,7,
+132,242,46,21,211,119,88,132,236,202,239,76,169,127,201,136,
+59,99,242,100,2,5,77,216,120,137,53,214,164,212,254,225,
+249,246,207,106,119,121,99,13,214,234,45,85,25,41,43,170,
+222,103,43,175,68,253,192,31,237,63,154,147,62,84,158,156,
+27,86,72,179,94,150,199,242,186,135,202,88,242,171,123,53,
+68,115,126,85,117,175,180,30,160,173,29,9,119,253,110,92,
+41,238,231,92,84,160,90,95,123,223,208,69,77,217,189,113,
+101,64,211,247,45,178,29,133,113,69,241,142,58,202,213,208,
+170,112,191,4,45,132,220,69,184,37,231,50,155,75,136,139,
+182,124,41,178,23,149,101,71,92,175,172,92,138,81,128,248,
+103,25,21,114,237,1,34,128,98,113,222,24,147,84,230,6,
+185,206,89,97,34,106,198,249,47,18,157,241,21,
\ No newline at end of file
diff --git a/uppsrc/Core/src.tpp/Buffer$en-us.tpp b/uppsrc/Core/src.tpp/Buffer$en-us.tpp
new file mode 100644
index 000000000..8d29071d7
--- /dev/null
+++ b/uppsrc/Core/src.tpp/Buffer$en-us.tpp
@@ -0,0 +1,84 @@
+TITLE("Buffer")
+COMPRESSED
+120,156,205,87,91,115,218,70,20,254,43,103,198,78,6,8,
+151,221,149,132,132,112,61,110,73,31,58,73,221,78,66,158,
+24,1,107,177,152,157,8,137,74,2,135,212,245,111,239,89,
+93,1,203,224,164,151,196,15,88,218,61,123,206,119,190,115,
+91,141,24,156,159,147,38,57,35,39,254,236,215,98,206,215,
+94,236,140,164,174,91,125,206,140,254,199,55,191,245,250,141,
+171,90,87,175,163,18,138,74,52,147,106,150,161,81,157,117,
+241,135,106,148,25,76,211,169,197,122,186,165,105,22,177,93,
+143,71,145,51,242,152,101,245,149,101,134,135,152,105,48,106,
+234,150,110,81,205,180,24,158,101,132,48,98,50,131,234,154,
+197,12,123,38,34,215,25,113,75,235,55,222,117,241,144,166,
+44,161,114,66,187,76,55,117,70,52,194,116,52,69,45,75,
+167,166,97,105,189,110,215,118,249,42,150,129,159,217,146,148,
+50,218,191,161,102,31,33,63,60,60,180,169,78,82,4,58,
+42,163,68,71,168,20,215,136,206,76,106,244,72,207,176,168,
+69,52,84,110,152,196,176,87,60,228,203,106,207,149,14,227,
+164,235,38,177,101,44,80,69,227,21,165,38,30,233,54,187,
+103,84,55,209,81,75,211,13,203,36,104,156,49,166,105,140,
+106,172,215,99,70,215,48,237,133,224,51,17,102,46,112,4,
+223,160,120,212,108,154,103,120,144,232,134,198,244,158,34,75,
+67,75,140,117,141,30,53,116,98,116,81,147,29,138,63,214,
+50,20,75,225,99,196,254,156,252,245,226,231,235,214,135,247,
+48,138,180,62,252,180,158,207,69,248,210,25,69,70,255,13,
+140,94,16,210,34,4,16,222,202,227,177,152,92,56,217,210,
+85,141,180,73,155,25,70,29,178,184,101,162,147,66,66,135,
+97,177,122,57,153,124,193,73,146,193,40,183,236,170,227,171,
+80,110,16,212,99,5,227,169,61,181,127,13,54,130,223,120,
+98,12,249,83,33,120,113,196,212,197,19,248,47,39,142,98,
+133,244,27,48,106,164,200,39,78,201,22,235,67,186,157,115,
+214,24,36,10,90,247,195,237,74,64,48,7,225,37,140,71,
+16,197,65,40,102,32,253,204,116,59,59,152,253,75,23,65,
+70,192,33,146,200,187,72,173,193,58,194,83,113,0,75,238,
+243,91,129,187,115,249,9,87,34,249,89,0,70,7,245,5,
+222,12,6,48,219,250,124,41,93,238,121,91,192,159,192,69,
+142,102,176,17,46,218,221,3,130,207,104,98,37,92,57,151,
+74,53,2,109,195,112,33,82,149,184,27,227,243,77,1,167,
+148,228,10,155,27,248,81,28,174,19,173,73,13,136,24,229,
+184,143,158,197,224,114,31,110,16,163,23,5,16,138,18,197,
+157,140,23,224,139,187,196,68,19,238,22,18,221,243,130,32,
+146,254,173,2,11,238,58,12,17,28,204,120,204,219,21,140,
+140,26,157,113,28,172,164,139,33,238,76,59,3,164,114,218,
+137,66,119,22,184,211,78,30,232,233,185,240,167,173,117,52,
+134,101,17,250,70,7,192,81,46,166,24,142,234,193,229,143,
+211,73,169,69,189,59,80,11,124,111,91,135,56,228,126,164,
+240,68,2,35,17,75,55,106,195,0,161,43,15,144,131,69,
+48,75,152,85,103,208,225,18,187,23,220,74,23,68,24,34,
+95,9,4,197,174,248,228,138,164,23,169,51,169,187,131,87,
+166,1,155,64,206,224,71,69,91,77,34,27,138,173,122,255,
+248,126,51,141,8,12,167,47,49,183,30,75,15,60,193,195,
+218,227,245,96,37,66,142,65,156,254,80,75,253,206,48,163,
+154,77,46,157,36,115,158,223,29,120,45,176,242,208,185,121,
+24,44,157,162,73,228,236,95,100,10,46,134,151,112,9,89,
+213,104,217,113,91,149,102,102,160,124,170,77,235,118,81,56,
+135,21,89,171,59,89,133,13,242,148,195,76,240,1,123,82,
+188,205,242,179,253,44,43,72,213,81,67,184,95,116,134,198,
+149,150,208,90,236,86,161,80,33,220,41,98,19,217,73,170,
+30,150,107,140,196,130,111,4,204,210,209,184,91,46,137,172,
+190,219,41,50,83,173,251,235,245,242,70,236,85,233,243,61,
+107,22,241,255,122,39,179,36,154,160,146,61,33,233,203,248,
+153,76,36,178,146,123,242,179,170,136,36,201,243,134,131,205,
+75,189,151,141,100,195,189,181,56,66,157,88,33,158,213,246,
+159,145,119,32,156,184,210,186,255,37,71,201,85,249,237,32,
+57,201,117,214,29,202,149,227,124,167,226,37,155,135,2,7,
+76,111,30,211,252,59,106,56,69,193,6,93,122,31,172,67,
+87,236,79,149,212,151,157,89,190,51,63,85,249,87,78,223,
+178,37,60,233,198,184,244,127,124,196,163,35,14,229,70,78,
+120,147,205,31,76,29,156,39,105,83,125,202,181,66,37,166,
+111,35,235,26,74,49,182,254,119,34,94,135,89,148,81,119,
+250,170,230,201,42,192,122,72,245,171,212,156,203,16,179,47,
+75,159,124,4,102,121,141,125,251,250,195,219,183,32,247,86,
+177,179,39,141,232,16,212,14,207,5,243,234,50,92,96,44,
+104,73,34,235,236,9,165,14,28,138,124,83,127,10,146,135,
+147,105,163,42,87,30,14,27,246,119,68,125,53,199,167,28,
+73,229,190,211,56,60,167,142,147,11,66,25,150,138,43,180,
+244,227,138,147,79,78,62,117,133,136,118,175,133,234,186,151,
+223,238,34,117,241,43,110,54,249,37,175,173,80,20,215,186,
+98,20,240,80,221,251,162,248,255,153,155,223,134,183,38,84,
+125,243,236,102,34,236,13,218,100,56,253,59,172,55,241,107,
+33,31,191,178,106,210,125,117,84,254,155,145,252,156,129,252,
+133,65,76,104,171,186,68,62,162,51,191,150,224,39,12,126,
+156,33,167,234,3,167,42,255,158,38,109,38,80,40,216,226,
+108,114,254,6,36,222,47,158,
\ No newline at end of file
diff --git a/uppsrc/Core/src.tpp/CParser$en-us.tpp b/uppsrc/Core/src.tpp/CParser$en-us.tpp
new file mode 100644
index 000000000..3513628fe
--- /dev/null
+++ b/uppsrc/Core/src.tpp/CParser$en-us.tpp
@@ -0,0 +1,232 @@
+TITLE("CParser")
+COMPRESSED
+120,156,237,92,11,115,219,54,18,254,43,184,166,173,37,71,
+82,248,144,44,89,158,155,73,234,164,29,79,19,55,83,167,
+115,55,231,218,38,68,66,50,106,138,228,17,164,31,57,95,
+127,251,237,2,164,8,210,164,94,118,174,233,163,147,90,22,
+9,44,246,249,97,1,44,124,106,145,47,191,52,58,198,51,
+99,197,127,227,215,108,74,83,63,57,59,229,253,254,232,128,
+90,131,131,171,239,127,216,63,216,125,217,218,235,183,129,136,
+9,68,236,161,105,143,6,182,217,183,246,224,135,105,155,214,
+192,178,251,230,200,218,239,143,108,123,100,140,93,159,10,113,
+118,234,91,163,209,1,142,108,65,39,107,56,176,204,97,127,
+212,31,153,246,112,100,65,95,203,48,44,99,104,13,204,190,
+61,178,6,99,143,9,247,236,148,142,236,131,221,31,247,160,
+147,141,35,1,113,195,220,179,250,195,190,101,216,134,213,135,
+161,204,209,168,111,14,7,35,123,127,111,111,236,210,40,225,
+97,144,141,197,77,211,50,15,38,230,240,0,88,254,245,215,
+95,123,102,223,80,28,244,129,152,105,244,129,85,19,158,25,
+125,107,104,14,246,141,253,193,200,28,25,54,16,31,12,141,
+193,56,162,49,157,215,75,142,52,6,43,69,31,26,99,158,
+48,32,177,251,220,52,135,208,101,175,179,247,204,236,15,65,
+208,145,221,31,140,134,6,12,110,89,150,109,91,166,109,237,
+239,91,131,189,193,112,124,201,168,199,226,76,4,10,204,239,
+154,208,117,216,25,62,131,142,70,127,96,91,253,125,84,150,
+13,35,89,214,222,96,223,28,244,141,193,30,80,26,199,236,
+223,41,143,217,156,5,96,177,255,92,252,247,171,55,199,221,
+159,78,200,169,24,28,124,255,210,32,167,95,25,70,215,48,
+94,182,140,158,209,179,6,131,54,201,44,147,63,71,155,94,
+228,95,201,225,123,26,11,224,228,235,179,83,97,28,16,252,
+176,14,242,167,132,11,34,248,60,242,25,185,99,9,185,102,
+241,29,73,5,155,166,62,241,217,45,119,169,79,104,64,253,
+187,143,208,84,164,60,161,19,104,57,13,99,50,73,185,239,
+241,96,70,208,192,192,40,137,36,61,65,194,41,241,105,48,
+75,233,140,9,114,195,147,75,114,232,116,125,126,197,136,184,
+11,18,122,219,171,48,112,19,198,87,208,43,32,206,142,243,
+179,225,236,144,132,197,115,30,208,132,121,240,235,109,66,120,
+64,230,108,30,2,99,173,32,76,200,73,18,51,58,111,119,
+136,8,73,18,170,97,73,114,9,92,113,20,34,76,201,37,
+189,102,248,202,15,169,71,56,18,128,47,216,34,35,51,229,
+177,72,122,228,3,18,191,164,2,155,130,168,34,33,94,26,
+163,68,216,52,225,115,38,251,10,18,197,161,203,132,0,118,
+38,119,11,174,129,21,226,134,209,29,54,152,131,161,219,185,
+88,239,104,80,180,154,179,228,50,244,4,113,105,0,84,227,
+240,38,127,227,140,199,111,226,24,212,200,110,93,38,125,29,
+185,224,129,7,26,79,50,113,40,247,211,152,21,50,102,94,
+225,129,30,231,147,208,239,145,127,92,178,0,140,133,44,231,
+3,66,99,105,24,224,45,112,99,6,164,148,89,58,153,44,
+110,56,159,171,177,82,169,53,120,84,112,208,138,98,54,101,
+49,152,248,142,92,115,74,62,32,199,138,77,37,72,187,196,
+36,195,55,130,128,2,111,152,239,87,205,26,78,126,97,110,
+34,69,71,171,77,96,180,152,6,2,232,131,4,45,80,29,
+103,222,66,105,202,53,109,249,9,62,126,238,140,157,241,155,
+91,247,60,119,245,243,115,205,217,69,18,167,110,114,182,120,
+85,184,58,52,51,136,100,88,127,59,214,223,23,100,162,116,
+226,115,183,142,12,129,161,179,104,217,205,195,229,195,93,196,
+80,103,30,202,155,203,184,80,93,143,28,134,224,219,60,192,
+96,10,102,224,135,224,165,104,23,233,255,82,81,50,78,98,
+174,154,151,196,150,0,113,158,128,70,92,144,251,133,243,226,
+48,140,153,243,66,196,174,243,34,77,184,239,124,201,2,167,
+155,10,231,89,166,22,252,144,17,79,148,142,94,0,243,175,
+89,204,175,129,187,105,28,2,80,193,3,82,35,141,173,143,
+56,70,50,11,119,116,148,63,22,191,128,137,2,8,9,247,
+146,198,206,174,211,30,231,166,216,45,43,152,168,118,23,216,
+238,194,217,205,31,239,190,180,201,2,144,72,251,76,9,236,
+35,4,163,170,148,9,195,88,42,162,159,61,207,187,30,202,
+190,221,251,220,243,132,0,40,105,240,148,90,52,44,59,72,
+21,14,223,135,226,76,35,6,31,240,132,203,0,0,164,145,
+225,162,128,167,183,134,210,160,107,254,81,86,88,7,64,199,
+233,224,59,229,9,37,13,34,11,171,245,23,37,133,150,47,
+156,191,95,28,255,244,246,109,7,193,236,66,111,229,243,128,
+149,154,45,228,182,137,185,120,209,201,28,178,212,117,26,148,
+233,167,190,95,88,106,100,212,91,10,159,235,150,66,46,187,
+247,239,67,224,75,225,15,98,87,164,105,20,191,243,32,74,
+19,133,230,77,116,164,28,221,251,183,240,65,130,116,62,97,
+205,67,2,223,221,251,111,1,237,3,58,103,189,178,71,72,
+43,53,76,146,40,77,131,87,232,205,192,18,149,86,133,93,
+164,184,186,138,54,19,124,45,62,121,208,232,187,82,73,250,
+240,85,117,53,15,112,94,248,226,185,34,171,190,52,13,5,
+74,214,7,42,169,187,18,135,198,131,176,200,127,109,6,145,
+60,41,217,44,12,114,247,44,60,83,72,53,103,212,50,143,
+89,237,159,133,89,122,219,8,210,121,24,234,143,151,173,67,
+26,155,105,129,186,45,0,172,208,92,71,205,84,212,243,164,
+251,66,214,199,3,200,242,230,84,58,51,230,123,50,41,66,
+133,65,90,192,170,13,101,130,51,201,38,200,27,76,75,98,
+22,133,113,130,83,160,156,253,182,181,76,191,38,242,113,124,
+116,69,204,52,101,206,215,130,96,155,82,55,233,228,108,64,
+10,6,169,77,48,235,144,107,234,167,12,19,159,95,82,48,
+152,0,32,203,179,142,126,45,252,124,139,169,161,252,82,23,
+85,75,252,99,185,3,172,242,91,114,84,224,68,150,145,162,
+24,66,240,89,0,26,85,57,30,118,56,97,9,76,30,89,
+58,86,137,248,239,107,176,228,58,228,94,225,28,11,207,48,
+180,220,174,224,178,14,12,117,204,92,9,151,58,82,214,38,
+0,106,88,81,205,130,235,12,82,159,1,108,41,237,113,120,
+114,197,163,147,136,66,34,95,99,21,208,170,208,83,104,185,
+86,8,61,134,174,28,227,79,88,254,57,93,33,187,19,10,
+79,48,163,165,105,18,98,124,192,18,9,242,101,1,244,35,
+230,117,32,253,78,22,11,16,176,97,246,28,151,14,106,248,
+39,176,221,211,202,82,43,71,143,168,72,192,175,114,13,196,
+98,132,131,60,186,245,105,78,155,226,184,40,124,22,23,16,
+110,145,63,16,248,167,156,183,131,44,169,217,241,33,117,58,
+69,44,192,37,84,182,200,89,173,166,73,24,250,245,106,106,
+84,17,12,43,202,154,88,120,224,238,11,242,35,75,210,56,
+80,208,1,78,8,2,0,130,76,145,97,212,95,85,137,168,
+99,148,99,13,78,203,161,162,113,250,158,177,171,67,253,101,
+193,171,98,70,161,133,155,198,49,174,180,179,37,6,146,3,
+212,211,166,189,135,204,31,102,93,202,109,183,100,243,59,150,
+52,112,249,202,187,166,1,58,212,138,28,8,162,32,12,214,
+228,60,111,67,104,82,144,156,48,112,20,156,126,112,60,4,
+69,158,60,198,69,142,68,89,160,149,248,166,161,155,91,131,
+110,76,36,232,88,12,125,37,115,24,140,9,34,34,230,242,
+41,119,11,201,81,42,221,166,185,132,117,80,232,150,212,129,
+49,13,227,172,242,88,80,22,68,181,123,249,120,245,88,91,
+234,71,95,125,108,212,209,122,156,102,35,202,55,83,175,185,
+152,248,11,34,144,91,32,157,218,246,22,180,63,97,0,110,
+222,146,14,159,220,44,246,111,103,150,13,59,218,245,246,148,
+105,101,173,5,97,97,18,249,44,121,10,35,102,164,54,178,
+227,178,62,182,76,64,121,188,162,203,39,180,254,39,64,172,
+204,16,149,105,165,81,253,228,104,90,132,160,148,167,163,129,
+190,200,208,153,121,159,21,150,125,94,72,166,52,190,38,102,
+173,171,111,156,94,147,155,176,32,43,254,16,112,247,135,0,
+187,135,38,95,5,114,27,89,253,50,102,108,75,187,127,214,
+8,169,169,124,139,133,210,123,88,141,60,9,92,94,200,195,
+155,150,92,143,22,107,121,88,48,9,233,157,45,183,45,205,
+197,19,18,103,249,250,148,250,130,117,212,161,143,104,222,3,
+105,134,195,45,215,134,185,200,191,37,212,173,208,150,213,114,
+205,14,116,216,90,103,79,14,96,143,212,245,239,18,156,214,
+52,18,252,111,175,48,20,162,87,227,54,206,103,132,58,205,
+187,120,71,94,227,78,181,156,150,138,253,86,114,84,184,194,
+38,39,95,218,28,48,227,215,44,88,156,137,115,15,64,31,
+210,95,185,9,248,16,240,105,190,176,46,86,192,119,120,190,
+229,179,160,37,218,43,16,31,183,208,142,10,250,79,55,85,
+47,141,8,93,67,159,112,71,177,214,127,143,130,235,240,42,
+219,134,56,242,178,173,54,181,181,45,15,170,101,41,8,75,
+50,101,111,231,209,53,90,221,122,29,167,235,106,229,90,23,
+235,10,30,120,205,202,53,210,170,13,45,160,204,87,74,163,
+31,30,85,206,141,74,18,253,200,168,87,146,169,214,74,216,
+74,212,201,130,135,215,107,36,67,65,24,128,173,104,160,108,
+132,79,228,40,203,100,94,109,176,205,68,76,86,201,120,130,
+171,90,234,3,3,49,167,32,9,96,145,234,9,188,130,201,
+48,10,64,240,88,16,143,79,177,38,2,154,128,88,78,151,
+250,209,37,13,210,57,139,245,21,113,126,34,32,183,215,104,
+44,201,233,62,32,136,31,6,51,252,132,22,119,8,51,115,
+208,239,115,231,57,16,141,231,192,6,30,224,176,121,228,99,
+221,198,132,202,19,238,187,136,61,74,97,107,122,120,144,52,
+184,184,4,67,60,251,153,41,47,174,218,156,56,221,204,228,
+140,203,72,152,227,17,14,40,193,227,51,158,116,80,36,103,
+7,100,220,201,126,235,194,111,184,247,12,116,125,63,188,81,
+137,49,6,141,58,200,65,149,229,187,222,48,177,72,34,27,
+5,137,226,116,13,109,104,231,183,15,61,39,88,233,57,42,
+58,212,198,169,82,206,242,176,144,58,70,14,203,24,150,135,
+199,50,27,175,45,210,18,3,31,75,237,54,194,24,26,25,
+173,2,193,206,132,200,109,177,212,220,37,59,215,53,221,196,
+108,181,103,227,143,20,177,102,206,170,183,185,45,99,109,89,
+50,240,80,53,114,178,82,57,2,118,110,82,11,244,133,188,
+6,179,28,103,231,21,120,62,52,115,118,254,149,7,3,205,
+159,124,116,118,58,217,201,79,76,131,153,84,137,207,231,92,
+110,197,83,55,77,0,27,228,48,45,214,155,245,84,97,31,
+126,53,173,140,188,200,169,169,81,118,38,242,231,55,240,83,
+158,29,169,72,171,61,81,149,162,119,239,143,51,44,195,175,
+155,27,78,87,71,80,165,212,132,226,41,88,195,182,206,137,
+250,108,140,197,167,50,107,245,204,221,88,145,164,168,0,167,
+37,9,49,186,107,164,84,241,173,24,109,225,147,246,26,129,
+190,181,13,142,159,32,86,94,135,233,196,103,203,32,127,234,
+135,84,22,6,68,120,242,191,22,34,124,22,19,128,172,201,
+172,227,125,13,133,121,101,173,84,61,241,129,210,150,250,77,
+189,2,85,165,109,54,185,231,165,187,113,234,47,61,219,252,
+118,75,121,150,56,64,37,117,170,155,15,22,245,192,170,70,
+210,231,128,51,88,103,220,180,17,118,130,197,30,144,219,168,
+115,143,22,214,9,59,95,56,59,237,131,21,214,187,201,206,
+153,149,253,202,163,61,69,26,248,67,192,170,210,214,96,72,
+131,174,96,205,122,121,197,2,175,4,35,50,178,215,73,154,
+43,170,147,25,194,131,248,105,169,64,0,175,40,249,3,150,
+16,185,126,42,139,183,153,112,105,4,58,15,61,38,96,153,
+255,86,209,147,229,216,69,98,138,229,48,69,221,3,86,22,
+67,26,169,10,180,91,105,32,249,57,172,157,2,50,9,187,
+247,178,82,57,131,173,146,230,228,82,23,79,116,35,44,250,
+22,2,32,16,45,141,243,62,178,46,72,26,104,229,224,101,
+169,5,2,132,88,144,145,85,5,240,52,36,30,147,83,156,
+2,0,96,64,150,164,99,73,143,204,130,111,151,69,253,201,
+147,59,201,159,204,67,202,222,129,166,12,254,114,142,71,34,
+72,83,22,34,69,89,190,21,248,251,113,45,53,129,21,46,
+149,219,9,119,64,168,186,28,130,160,255,228,24,165,148,216,
+189,127,157,143,247,151,175,110,13,100,127,10,71,237,61,153,
+167,174,143,149,127,106,39,93,183,36,242,3,176,94,147,119,
+170,106,191,69,121,67,126,121,234,53,115,57,238,140,169,156,
+23,205,189,216,241,82,11,132,170,248,104,177,188,154,19,239,
+60,93,134,11,106,208,59,196,60,243,134,139,188,220,173,233,
+164,214,220,172,20,111,251,205,114,89,174,247,62,169,219,153,
+249,14,75,68,169,202,249,139,34,209,13,118,89,180,154,237,
+218,94,77,72,83,190,56,115,94,186,7,83,41,52,44,93,
+145,41,115,94,199,108,103,141,26,72,109,215,76,206,16,234,
+190,150,170,88,84,242,100,87,217,178,125,84,189,12,92,122,
+68,126,201,176,230,218,201,102,206,90,17,111,253,83,146,90,
+45,22,197,212,58,85,231,107,29,69,163,135,155,80,39,77,
+186,172,173,213,15,241,216,227,152,221,212,44,207,14,85,209,
+61,215,65,78,86,123,74,56,140,98,118,205,195,84,248,119,
+234,118,0,98,156,118,91,67,191,203,85,136,159,51,171,207,
+10,213,27,59,184,216,124,19,78,203,175,97,233,188,144,84,
+233,176,186,253,128,18,103,40,85,115,215,96,217,74,242,193,
+204,33,11,16,107,233,145,86,126,153,117,17,237,237,213,226,
+42,17,66,0,103,154,132,113,33,200,67,45,212,139,89,47,
+192,223,164,154,90,249,248,75,180,221,124,241,72,197,228,91,
+237,166,201,230,124,228,97,136,81,181,90,23,27,94,87,82,
+12,226,37,165,99,8,206,237,153,124,229,38,41,102,10,229,
+40,39,203,62,154,146,13,121,123,6,55,87,202,205,95,137,
+195,108,218,139,195,52,145,185,64,20,135,94,234,178,5,165,
+197,148,211,114,195,121,68,19,142,119,174,213,254,142,138,156,
+118,150,202,44,78,186,61,154,208,113,205,25,247,98,176,213,
+23,152,42,143,208,231,244,99,240,234,245,193,66,142,141,206,
+195,151,92,114,210,179,188,250,91,78,115,122,91,202,3,143,
+142,63,56,23,239,94,253,115,9,81,236,22,77,203,221,212,
+61,202,242,185,62,50,57,167,113,82,106,168,242,204,69,109,
+68,204,32,45,18,85,43,53,29,17,235,115,228,210,83,122,
+149,179,189,81,16,162,157,248,209,56,166,119,53,64,34,244,
+157,119,208,19,158,35,74,7,104,188,215,132,122,235,222,191,
+163,183,50,225,1,207,158,129,43,101,89,90,118,178,138,7,
+92,234,42,56,243,240,22,11,48,133,46,10,121,44,230,178,
+63,7,206,23,114,6,60,213,84,170,14,197,192,27,49,245,
+195,151,185,231,227,212,202,131,148,201,188,23,225,49,128,105,
+99,17,245,53,252,33,181,146,194,62,178,56,116,186,213,191,
+3,160,142,64,139,33,213,118,225,132,205,120,16,32,179,225,
+180,152,181,243,173,63,245,45,19,89,147,176,214,106,210,1,
+50,196,7,85,243,107,105,111,249,24,248,154,128,253,175,100,
+246,139,127,78,64,101,241,144,18,203,199,2,185,209,238,212,
+168,139,244,177,54,78,13,30,214,248,209,186,225,251,255,12,
+216,223,77,36,42,80,68,223,209,255,132,68,25,36,139,205,
+228,133,58,90,167,82,224,14,81,159,196,121,158,23,216,168,
+7,237,206,194,237,81,236,78,41,8,178,94,146,225,246,58,
+38,212,110,132,127,253,196,118,204,201,94,252,65,44,169,228,
+233,229,127,74,1,239,118,102,89,187,50,178,6,171,141,86,
+237,125,131,240,208,106,231,214,237,1,206,182,182,176,232,217,
+255,0,38,28,219,147,
\ No newline at end of file
diff --git a/uppsrc/Core/src.tpp/Callbacks$en-us.tpp b/uppsrc/Core/src.tpp/Callbacks$en-us.tpp
new file mode 100644
index 000000000..3fd19b96d
--- /dev/null
+++ b/uppsrc/Core/src.tpp/Callbacks$en-us.tpp
@@ -0,0 +1,20 @@
+TITLE("Callbacks")
+COMPRESSED
+120,156,237,93,123,119,218,70,22,255,42,115,154,54,199,166,152,32,1,6,227,108,142,29,199,217,102,187,73,124,98,154,127,56,212,18,48,24,53,66,98,245,240,99,155,230,179,239,189,243,208,115,36,132,141,95,221,180,199,54,72,243,184,247,206,239,62,71,154,12,117,242,227,143,205,122,243,89,115,197,127,253,55,116,102,134,118,48,26,90,237,118,111,223,212,59,251,95,126,253,184,183,95,59,216,218,109,111,227,40,26,140,210,234,106,173,94,167,165,181,245,93,248,165,181,52,189,163,183,218,90,79,223,107,247,90,173,94,179,63,177,77,223,31,13,109,189,215,219,199,78,58,116,210,187,29,93,235,182,123,237,158,214,234,246,116,232,171,55,155,122,179,171,119,180,118,171,167,119,250,83,234,79,70,67,179,215,218,175,125,218,133,78,45,156,9,6,111,106,187,122,187,219,214,155,173,166,222,134,169,180,94,175,173,117,59,189,214,222,238,110,127,98,46,3,203,117,196,92,150,166,233,218,254,88,235,238,3,205,223,190,125,107,104,237,38,167,160,13,131,105,205,54,144,170,193,
+181,102,91,239,106,157,189,230,94,167,167,245,154,45,24,188,211,109,118,250,75,211,51,23,197,172,119,86,178,222,109,246,173,128,194,16,181,159,53,173,11,93,118,235,187,207,180,118,23,24,237,181,218,157,94,183,9,147,235,186,222,106,233,90,75,223,219,211,59,187,157,110,127,78,205,41,245,4,11,38,16,95,211,160,107,183,222,125,6,29,155,237,78,75,111,239,161,176,90,48,147,174,239,118,246,180,78,187,217,217,133,145,250,30,253,79,104,121,116,65,29,88,178,63,207,254,250,233,248,195,206,111,167,100,232,183,246,201,145,105,219,99,115,242,197,127,62,26,250,205,196,119,50,49,29,50,166,4,5,238,89,99,58,37,166,79,76,114,65,189,107,114,78,29,234,153,182,245,95,184,58,115,189,5,113,103,100,22,58,19,20,50,89,186,150,19,80,207,111,144,99,115,50,143,6,36,30,93,122,212,7,26,124,226,187,11,74,190,88,206,20,59,154,188,219,86,232,135,208,244,26,230,181,109,203,57,135,185,38,212,11,76,203,137,135,118,189,196,85,119,252,7,157,4,100,65,
+131,185,59,221,38,193,220,12,36,205,150,115,225,126,65,138,3,98,58,215,36,176,22,180,33,248,27,204,169,71,137,9,63,62,189,64,38,200,216,244,173,9,155,149,145,25,92,47,169,95,7,182,151,212,153,34,29,48,175,19,46,198,212,67,98,217,226,83,100,15,62,250,62,206,1,92,120,52,8,61,135,92,152,118,72,27,228,29,18,10,107,69,2,151,124,161,116,41,68,184,228,44,204,162,169,64,14,115,215,11,234,4,190,3,249,32,27,62,57,163,46,22,59,176,106,18,31,40,177,41,49,126,16,4,120,40,123,227,135,228,208,117,114,105,5,243,36,133,195,218,139,131,45,77,239,53,154,13,189,211,217,38,115,235,124,110,195,79,64,167,163,70,102,189,249,212,120,81,223,39,240,135,252,249,167,6,58,215,7,69,234,244,181,189,86,171,175,181,118,123,115,109,63,120,161,117,199,240,115,176,165,55,219,219,4,7,73,79,163,145,225,79,205,230,78,179,25,141,61,128,161,71,163,126,191,180,113,76,247,202,166,166,119,30,34,152,87,183,228,11,99,156,5,130,130,3,
+157,55,63,250,185,219,201,145,153,24,237,232,96,171,41,6,75,182,116,92,135,174,223,42,121,239,194,181,166,241,61,37,25,90,81,95,102,47,201,73,225,253,226,59,138,89,229,108,122,166,139,156,164,46,63,101,27,224,173,220,69,54,129,114,252,214,202,241,163,79,217,166,124,166,122,254,70,241,108,237,53,102,139,62,101,59,197,243,214,243,55,243,115,255,211,12,104,33,38,24,22,42,222,196,75,99,215,181,243,195,107,5,108,229,8,175,52,218,102,150,92,61,246,93,44,55,155,233,175,191,132,193,74,255,49,134,4,92,233,210,134,169,207,94,102,237,93,194,164,188,34,198,136,119,201,180,17,42,2,87,133,130,157,141,146,102,43,54,136,248,39,101,44,27,9,95,137,22,123,225,94,80,115,108,75,35,206,140,241,204,244,3,176,209,224,3,38,238,242,26,125,28,122,20,143,206,192,9,57,19,10,87,67,39,128,75,219,141,196,68,49,119,82,127,233,213,210,182,38,86,112,54,202,178,152,50,177,178,249,86,181,102,135,204,169,190,204,53,142,204,235,171,168,233,153,81,
+147,159,107,7,45,226,208,75,238,181,163,6,219,35,41,34,215,241,3,47,156,4,126,236,82,193,195,98,160,224,185,11,236,41,28,62,227,184,29,241,88,59,74,141,187,243,149,83,215,32,239,67,16,33,248,244,137,71,97,145,167,132,139,112,88,195,198,35,226,46,193,135,7,174,215,72,172,141,249,5,196,15,139,225,17,11,168,112,47,33,86,241,231,214,178,145,146,109,223,128,255,35,147,155,254,178,101,108,247,115,206,83,45,233,152,111,70,30,32,193,33,128,199,224,58,226,190,145,89,210,74,195,78,80,138,21,87,219,120,126,150,92,155,137,106,77,0,123,19,185,48,40,44,133,236,39,32,243,83,55,244,16,149,74,210,243,18,51,190,101,101,38,73,250,86,17,168,17,137,111,104,68,220,170,101,178,169,233,165,167,67,155,28,203,128,176,22,138,57,142,97,93,44,88,34,8,181,202,88,68,51,22,77,52,240,66,186,122,50,108,149,157,16,6,253,232,64,56,11,225,27,142,24,71,125,82,213,89,79,159,221,108,144,195,89,128,1,227,220,242,69,64,75,224,147,8,
+99,235,140,98,54,8,160,29,227,109,31,92,135,80,35,159,140,195,64,196,57,192,26,16,178,138,165,183,166,237,87,224,137,53,123,48,166,226,168,218,7,35,10,148,52,32,114,199,222,124,249,124,176,235,152,143,176,233,86,33,70,218,8,230,72,144,113,166,10,17,247,181,200,136,156,49,79,19,179,124,198,26,142,164,178,212,94,144,79,137,64,31,244,5,215,157,88,179,20,162,144,68,184,111,77,49,17,0,86,121,42,195,174,36,218,48,33,48,107,145,176,134,37,60,28,95,209,73,8,139,184,117,162,229,232,79,43,90,42,228,141,236,119,188,184,98,164,18,103,17,135,215,145,37,73,72,2,21,137,15,145,214,36,238,240,206,173,11,234,64,106,21,176,204,78,14,84,117,133,112,113,210,44,174,201,156,28,8,224,122,11,254,78,5,186,144,61,193,171,0,240,202,101,66,211,207,116,43,51,103,198,161,167,194,150,145,122,33,19,209,139,236,134,81,140,12,99,98,248,114,203,25,73,161,178,231,151,236,38,21,203,28,195,104,0,73,230,179,69,164,6,202,25,175,178,200,
+214,45,32,158,21,20,76,166,175,9,247,59,119,237,169,159,13,113,192,111,139,178,0,38,197,22,200,218,196,123,152,12,179,41,32,91,6,224,136,24,129,25,12,118,189,68,220,109,206,131,234,82,210,180,85,240,66,53,41,14,133,83,79,250,204,67,223,183,206,193,28,105,200,2,202,42,195,99,53,98,99,159,169,34,151,121,206,77,80,254,217,242,130,208,180,177,62,176,218,175,38,200,75,218,153,250,137,14,63,45,248,105,3,137,16,34,136,105,32,82,190,16,195,231,116,75,165,160,7,73,21,133,47,25,11,116,192,116,84,201,116,78,83,15,80,87,141,127,68,195,145,166,100,248,68,58,17,134,98,14,82,102,145,252,37,157,88,51,11,192,85,110,149,98,103,40,120,67,103,144,48,45,239,252,207,104,195,215,113,15,65,194,61,28,10,189,137,156,131,168,161,102,52,169,196,147,39,52,254,48,112,23,214,36,150,2,195,159,148,196,123,202,138,85,23,166,103,177,116,36,244,121,237,174,20,174,0,245,197,194,141,75,109,62,143,183,209,121,69,62,62,129,28,121,205,216,
+250,248,250,95,199,71,3,163,102,212,49,136,48,182,222,31,15,126,249,248,134,33,189,198,141,57,89,130,61,71,140,199,22,143,43,253,176,118,208,38,188,255,72,102,133,236,26,31,3,176,149,2,67,125,196,110,230,49,151,76,243,210,107,89,37,6,45,50,191,121,47,241,138,196,104,144,2,72,186,25,137,240,136,169,130,236,137,23,46,163,187,117,30,126,165,6,144,18,144,86,161,223,79,15,193,189,81,236,191,42,57,185,124,174,146,168,122,98,245,84,70,37,44,194,138,212,70,132,110,238,44,115,157,179,161,74,227,4,131,59,95,79,98,155,143,125,139,123,8,126,114,61,18,94,87,173,98,71,34,43,44,137,231,191,99,53,135,85,102,184,200,227,71,44,79,90,211,238,216,116,2,110,219,156,32,89,76,199,252,32,46,18,68,209,136,216,36,136,226,109,62,34,246,77,195,250,62,192,156,157,154,69,66,72,215,237,240,189,12,232,218,240,94,191,108,86,5,166,185,145,226,37,125,21,59,47,65,239,19,183,156,89,132,93,206,173,201,28,221,187,111,45,44,219,140,97,
+226,196,168,28,199,85,161,58,75,219,121,39,177,105,229,155,51,202,82,107,190,119,69,49,145,50,89,6,45,131,56,177,127,52,140,37,65,182,60,234,67,20,129,105,53,166,207,60,255,129,118,219,55,128,114,84,106,195,172,20,226,4,31,115,102,161,31,195,223,3,119,105,77,0,74,47,140,23,71,174,71,141,23,190,55,49,94,156,4,244,36,240,140,31,169,99,236,132,190,241,12,209,118,194,139,13,18,96,196,16,54,116,96,188,146,181,223,128,254,142,191,70,137,48,255,65,60,2,87,148,71,165,30,121,107,205,65,158,134,241,204,217,60,132,83,49,128,137,187,19,198,206,130,7,147,50,44,84,173,212,204,201,175,82,174,253,186,235,244,0,75,32,69,149,240,156,39,158,123,117,173,48,84,183,156,33,91,177,29,43,74,182,21,87,201,113,65,220,94,182,81,131,252,230,211,89,104,167,83,119,207,13,89,64,191,69,27,231,13,176,61,88,168,193,141,120,144,38,208,71,142,2,207,38,151,38,238,207,195,42,122,20,155,83,222,2,140,0,150,210,39,115,203,158,38,182,
+175,47,44,147,93,103,75,63,51,39,116,187,65,62,184,208,137,209,200,210,248,104,235,30,141,9,227,39,78,67,4,86,2,144,16,13,146,181,49,238,45,51,248,32,198,14,27,36,149,146,240,153,112,247,69,102,57,108,201,196,152,204,42,126,166,152,253,146,153,109,94,112,115,6,110,24,159,31,192,13,114,11,107,142,208,159,156,187,88,156,156,82,83,5,112,88,159,157,175,131,52,149,247,11,236,187,176,42,229,21,250,42,163,146,12,138,181,132,99,222,252,232,250,141,149,36,184,4,199,200,212,36,46,87,223,30,167,254,45,129,42,33,202,158,71,89,31,167,228,45,180,74,215,224,235,162,42,133,1,1,247,219,208,47,138,8,100,133,15,203,26,212,20,112,21,229,6,30,155,12,165,160,213,74,160,1,182,223,90,30,132,8,65,129,46,164,154,235,184,159,68,129,137,105,97,251,71,173,59,42,99,29,213,151,95,190,220,168,34,101,28,130,185,17,69,82,234,145,194,213,124,148,219,35,137,172,10,129,178,244,232,133,229,134,177,110,52,200,161,109,187,151,232,7,0,151,
+8,239,96,14,183,33,222,13,210,149,34,44,240,82,175,40,94,48,35,28,197,185,219,187,192,23,128,180,176,80,5,43,60,225,152,204,150,40,240,155,15,24,14,230,60,206,96,227,224,102,17,171,77,112,184,149,225,114,28,163,178,2,28,63,101,109,192,44,77,55,199,88,75,194,243,20,107,35,166,93,161,136,166,138,70,53,200,224,152,245,74,100,112,137,228,13,126,213,7,201,82,113,166,68,113,150,74,163,178,137,82,190,201,251,210,187,39,165,119,227,4,237,213,104,3,156,72,72,39,20,45,26,170,32,77,76,243,119,131,52,113,173,12,81,37,151,237,58,81,139,36,173,202,222,121,94,227,62,137,26,47,198,216,198,78,100,183,98,168,207,216,131,142,162,76,64,175,0,86,1,223,70,20,143,1,70,93,120,213,35,30,1,243,207,112,185,180,45,238,99,134,130,2,166,33,204,179,77,165,215,58,42,81,146,40,79,252,184,186,198,241,158,19,41,118,119,148,250,14,4,236,124,61,20,134,105,35,137,27,0,140,151,176,202,97,198,218,60,37,173,185,41,83,213,20,72,
+62,84,242,184,212,136,239,162,220,92,153,84,69,193,148,251,138,36,33,18,32,250,232,33,15,99,180,21,21,190,167,239,32,110,200,136,2,222,114,164,239,238,161,220,61,156,220,198,53,148,150,212,87,86,45,227,202,98,188,225,111,249,81,49,147,78,171,232,97,81,77,242,142,234,145,143,210,213,165,138,148,107,105,249,160,162,10,23,249,163,242,153,171,121,157,10,213,203,135,209,31,85,125,243,46,181,169,168,116,250,182,164,182,154,6,212,102,170,222,43,172,47,62,247,113,207,174,68,171,8,211,205,167,34,74,102,163,39,186,94,22,80,249,234,41,36,42,233,106,220,157,169,24,87,146,117,220,20,150,227,226,90,77,131,28,78,167,22,226,31,18,231,167,144,200,136,234,129,44,180,220,197,190,84,165,76,128,67,247,254,83,156,187,85,214,219,240,125,91,189,125,76,249,81,5,237,189,183,196,233,111,160,89,213,18,143,191,135,235,187,5,175,107,105,208,99,77,193,254,239,28,159,58,77,251,158,159,221,220,206,84,75,197,214,54,23,43,210,177,170,182,160,82,182,118,39,
+145,237,122,185,220,99,81,196,21,137,222,61,198,163,21,243,189,2,32,175,189,93,186,1,76,230,64,183,102,246,95,128,56,21,224,210,79,194,220,38,174,89,140,45,135,174,128,6,46,28,218,44,105,4,64,212,110,97,197,160,240,169,144,211,194,9,238,48,155,127,8,91,179,49,19,34,251,235,69,253,139,108,197,221,34,101,234,134,227,245,144,146,173,14,173,6,203,155,194,57,238,171,244,163,39,99,194,79,240,37,14,8,15,141,250,107,230,47,192,113,12,244,13,6,192,159,74,239,126,44,189,123,88,122,247,117,121,116,92,14,241,129,158,195,248,237,69,85,98,19,227,233,110,19,38,171,5,155,14,156,99,145,174,23,56,31,22,204,19,139,57,235,174,99,9,103,117,173,72,157,19,82,207,118,81,60,223,181,222,70,72,96,126,81,185,243,168,102,203,79,105,80,120,113,141,187,113,241,77,111,144,17,4,212,215,188,117,202,181,231,158,244,170,240,214,192,166,242,227,248,233,43,51,107,18,210,13,245,124,132,187,49,227,145,173,206,168,244,66,86,102,190,219,145,141,72,
+173,154,73,185,117,233,234,129,13,139,178,150,117,215,230,37,46,128,129,113,16,239,86,220,97,1,236,17,40,118,123,159,13,150,47,22,125,15,12,86,42,244,109,36,85,252,0,195,247,176,224,161,195,130,141,71,5,15,90,143,123,154,113,70,65,184,241,73,86,179,110,102,131,202,13,204,195,198,4,21,88,91,63,153,72,170,126,197,34,221,147,213,110,101,81,239,254,117,125,85,145,239,81,106,91,21,229,185,95,245,88,19,244,234,34,210,106,44,87,173,33,221,125,228,25,21,158,0,171,133,85,39,196,113,244,66,199,13,43,148,3,245,248,143,2,143,137,96,52,246,147,11,115,226,185,233,215,36,178,55,9,104,100,8,222,17,226,246,177,235,91,193,53,123,65,81,250,76,225,247,19,239,122,49,101,230,5,127,114,244,239,195,211,211,15,135,239,143,113,219,103,204,15,107,156,210,153,177,35,222,202,154,243,75,236,5,172,208,99,47,70,242,61,168,196,57,191,217,25,200,216,13,157,169,220,71,194,163,32,228,41,159,236,29,172,81,202,8,164,189,221,224,151,119,167,175,
+15,143,126,53,182,174,146,167,22,17,121,93,101,232,91,228,42,15,169,227,171,37,80,200,94,221,148,116,109,225,228,117,98,60,143,120,134,200,111,200,186,43,95,15,191,130,149,250,96,242,215,61,11,55,195,36,97,26,82,92,199,197,87,210,173,220,21,78,18,158,84,159,130,242,172,130,37,173,132,167,122,180,43,179,14,119,234,170,171,98,11,168,68,22,224,207,23,40,11,248,25,43,165,161,244,215,16,153,21,73,163,224,186,226,229,45,133,140,244,213,50,26,213,241,15,140,167,148,212,162,154,164,98,83,81,36,173,226,119,175,10,187,164,5,124,50,56,86,41,135,184,124,19,221,16,105,215,157,168,134,32,171,64,51,228,221,205,42,134,124,8,227,81,233,133,96,181,80,45,228,253,251,208,10,153,103,63,101,165,40,60,23,88,250,197,67,239,156,191,159,62,82,183,171,182,81,40,131,177,196,65,99,233,230,5,243,201,35,4,231,212,94,98,136,193,220,37,124,15,249,25,4,226,252,250,32,228,175,33,179,115,7,76,121,24,91,236,67,193,9,67,72,36,206,27,8,
+131,101,24,200,243,244,143,175,76,60,35,13,135,92,186,75,99,39,92,194,10,56,33,127,33,116,233,185,23,22,228,200,48,160,77,163,35,82,216,169,43,115,19,79,50,4,138,140,29,30,191,179,247,71,125,90,207,243,33,179,115,246,114,54,70,18,212,100,71,3,77,233,212,154,176,208,37,62,179,199,29,179,127,126,32,126,207,26,58,121,241,244,141,180,236,217,187,60,3,12,196,68,84,145,230,45,122,124,134,29,28,205,34,18,147,157,51,8,83,126,8,109,59,189,254,169,83,251,34,226,213,23,83,167,32,42,86,46,210,189,242,211,14,145,136,232,156,152,36,233,21,9,139,14,95,229,85,240,129,241,60,67,89,116,248,42,175,97,67,131,44,105,5,103,175,70,239,186,55,200,187,25,30,126,147,95,213,75,51,113,222,172,60,89,47,18,171,250,48,196,20,245,239,124,108,253,78,132,150,249,179,99,243,135,4,38,219,39,24,89,231,40,89,143,202,23,254,153,240,241,159,186,200,10,190,2,233,209,153,170,67,99,36,247,32,80,250,229,21,134,100,175,152,252,104,105,
+82,185,13,39,189,36,129,143,194,118,84,189,58,215,252,104,57,76,1,176,97,52,82,33,204,50,38,83,138,236,115,170,129,34,235,200,100,191,163,255,1,102,27,119,128,
+
diff --git a/uppsrc/Core/src.tpp/Color$en-us.tpp b/uppsrc/Core/src.tpp/Color$en-us.tpp
new file mode 100644
index 000000000..c5fcde878
--- /dev/null
+++ b/uppsrc/Core/src.tpp/Color$en-us.tpp
@@ -0,0 +1,210 @@
+TITLE("Color")
+COMPRESSED
+120,156,237,26,139,114,226,70,242,87,230,178,73,10,28,76,
+36,1,6,227,236,86,214,123,137,157,202,62,82,216,217,212,
+149,203,54,131,24,96,110,133,196,206,12,216,228,114,251,237,
+215,61,163,55,146,120,120,47,85,185,58,87,45,176,154,238,
+158,126,79,119,143,110,28,242,229,151,86,195,122,102,109,249,
+235,255,157,77,232,210,83,183,55,188,221,238,157,81,167,115,
+246,225,231,119,167,103,71,223,215,78,218,117,32,98,3,145,
+86,215,110,245,58,45,187,237,156,192,135,221,178,157,142,211,
+106,219,61,231,180,221,107,181,122,86,223,245,168,148,183,55,
+158,211,235,157,225,206,14,32,57,221,142,99,119,219,189,118,
+207,110,117,123,14,224,58,150,229,88,93,167,99,183,91,61,
+167,211,31,51,233,222,222,208,94,235,236,104,112,2,72,45,
+220,9,136,91,246,137,211,238,182,29,171,101,57,109,216,202,
+238,245,218,118,183,211,107,157,158,156,244,93,186,80,60,240,
+195,189,184,109,59,246,217,200,238,158,1,203,159,62,125,106,
+218,109,203,112,208,6,98,182,213,6,86,109,120,102,181,157,
+174,221,57,181,78,59,61,187,103,181,128,120,167,107,117,250,
+11,42,232,188,88,114,164,209,217,42,122,215,234,115,197,128,
+196,209,55,182,221,5,148,147,198,201,51,187,221,5,65,123,
+173,118,167,215,181,96,115,199,113,90,45,199,110,57,167,167,
+78,231,164,211,237,207,24,29,51,17,138,64,129,249,35,27,
+80,187,141,238,51,64,180,218,157,150,211,62,69,101,181,96,
+39,199,57,233,156,218,157,182,213,57,1,74,125,193,62,46,
+185,96,115,230,131,197,254,117,255,239,175,126,120,123,252,235,
+21,185,145,157,179,159,201,205,87,150,117,108,89,223,215,172,
+166,213,116,58,157,58,9,237,98,158,147,251,232,215,247,22,
+121,21,120,129,72,86,250,201,90,130,189,16,124,69,21,219,
+196,191,27,246,135,253,151,82,242,169,255,158,122,75,118,189,
+94,176,183,193,29,217,120,20,163,126,87,186,117,131,196,84,
+95,189,123,253,110,48,188,127,127,71,162,95,69,80,184,247,
+155,96,197,232,200,99,119,36,250,181,195,78,47,238,95,220,
+223,126,125,251,127,93,237,163,43,231,140,32,123,68,176,133,
+96,18,220,142,251,83,50,184,56,39,46,194,55,201,75,207,
+131,159,243,69,224,195,154,36,84,48,194,125,162,102,128,65,
+253,41,35,22,252,22,193,114,58,35,160,166,38,121,187,4,
+248,21,10,77,184,36,99,54,225,62,27,147,73,32,204,254,
+77,243,133,107,90,51,154,52,85,28,152,38,20,168,147,1,
+119,103,195,99,179,166,144,175,154,92,46,22,129,80,25,4,
+193,101,224,55,136,100,130,83,143,255,78,49,99,16,166,220,
+102,189,137,50,89,103,223,146,208,15,82,22,76,235,108,252,
+16,136,241,157,73,129,250,119,98,113,124,148,118,142,11,166,
+6,244,33,187,94,171,199,16,192,144,47,149,86,101,251,140,
+220,28,125,75,6,76,45,133,111,148,112,123,252,199,47,30,
+85,32,255,156,200,5,115,249,132,187,102,195,172,194,81,159,
+70,225,134,255,114,246,65,251,170,154,217,195,89,189,70,171,
+130,185,98,123,63,157,155,139,167,113,51,21,140,249,159,147,
+159,243,167,241,51,138,92,112,71,118,70,65,224,149,243,243,
+147,196,112,249,9,182,165,190,203,158,192,153,192,112,155,36,
+177,133,100,155,228,87,9,182,84,1,225,243,133,167,79,148,
+112,195,84,56,110,21,96,233,99,22,99,213,241,113,73,229,
+76,71,231,225,34,32,137,225,177,73,28,123,176,87,173,223,
+96,193,4,85,129,24,62,31,62,207,177,150,201,160,122,179,
+48,27,100,210,100,158,100,139,184,217,165,82,9,205,195,163,
+87,26,229,248,15,99,25,176,133,73,95,140,60,112,53,107,
+238,97,81,40,11,168,135,4,110,52,197,207,165,153,191,253,
+143,43,166,160,12,88,5,60,246,230,140,78,174,194,211,36,
+57,62,179,202,184,82,130,209,249,29,49,223,49,208,240,235,
+180,26,146,2,163,30,29,175,87,233,83,170,89,160,7,9,
+114,25,162,105,238,173,179,126,108,130,228,71,109,88,239,199,
+200,185,51,189,22,111,25,214,252,70,245,98,233,42,60,121,
+95,51,186,98,50,201,94,70,167,18,66,156,251,92,25,209,
+199,59,112,0,41,118,216,136,63,42,216,129,229,88,53,71,
+32,103,186,206,201,175,77,43,214,70,155,58,125,149,18,172,
+64,163,2,52,58,192,131,108,70,125,159,121,69,32,83,0,
+185,48,167,75,57,208,8,128,206,117,202,79,193,84,107,71,
+171,28,255,143,153,150,137,225,215,85,26,210,192,247,17,100,
+44,157,78,210,110,78,196,170,104,55,49,23,5,245,189,206,
+197,197,217,215,232,110,197,132,196,146,9,194,70,195,86,4,
+92,178,190,163,220,26,97,23,177,67,192,140,169,63,22,154,
+58,98,119,34,130,121,142,225,148,177,62,238,193,109,250,231,
+209,176,142,97,85,197,240,109,201,194,61,96,167,217,159,248,
+9,255,181,122,44,194,245,140,203,180,61,9,245,188,224,1,
+34,79,98,237,71,201,34,0,151,103,58,13,82,50,89,250,
+174,174,103,133,54,4,66,232,77,37,196,133,84,208,89,146,
+96,146,60,33,115,234,175,201,194,163,46,147,77,114,225,5,
+35,200,134,17,9,153,167,161,203,119,159,177,49,196,70,138,
+218,212,160,25,16,205,39,197,90,63,72,168,235,10,86,54,
+200,136,185,116,41,25,32,41,136,156,16,111,5,245,56,182,
+29,166,59,240,3,101,228,131,61,30,102,0,101,164,28,175,
+125,58,135,226,215,227,35,1,240,192,109,129,9,65,127,80,
+48,239,162,141,146,60,79,128,117,5,187,20,156,98,121,211,
+165,50,255,143,224,87,169,26,63,151,247,77,175,144,109,19,
+178,71,95,80,224,181,144,206,21,106,36,212,234,136,98,49,
+6,114,208,88,157,73,67,32,232,67,216,20,172,202,156,27,
+246,128,148,86,2,183,25,181,187,149,79,185,180,161,27,205,
+193,15,63,22,103,14,43,102,136,252,198,253,150,19,179,223,
+140,100,14,121,136,200,228,234,184,18,70,67,224,207,110,207,
+87,131,2,115,70,187,221,197,76,22,27,84,228,12,10,140,
+229,100,206,153,217,24,89,231,167,140,68,121,43,138,188,200,
+159,209,124,218,51,246,169,185,77,103,91,139,122,230,22,201,
+126,235,196,121,33,232,58,78,158,38,127,245,143,146,60,105,
+158,36,91,198,224,145,79,164,51,160,212,141,8,89,42,238,
+113,181,54,243,24,178,16,193,138,143,89,54,63,170,25,85,
+208,221,227,188,33,59,126,128,156,128,173,178,164,115,22,78,
+25,0,127,188,116,163,30,122,10,251,167,26,105,39,58,4,
+200,205,183,80,20,9,190,194,97,4,88,233,54,118,176,132,
+219,236,137,145,17,60,249,79,45,95,243,36,18,151,214,61,
+30,91,49,111,239,26,198,96,97,145,2,34,97,70,132,78,
+76,173,179,103,91,139,252,26,42,51,78,249,229,133,111,170,
+53,222,152,25,100,186,183,189,243,223,102,180,164,218,241,68,
+21,69,59,105,170,25,109,229,169,197,137,69,102,103,19,38,
+218,138,210,105,121,18,45,28,199,108,203,165,131,138,137,200,
+126,106,190,248,172,106,78,41,38,55,38,249,211,84,115,81,
+57,158,217,79,57,231,255,45,229,100,103,54,127,154,110,206,
+171,70,69,5,195,200,82,225,44,28,199,150,232,101,180,86,
+236,142,224,103,161,86,10,39,203,59,224,77,15,196,43,234,
+212,168,231,46,61,125,72,150,168,220,88,36,73,242,149,13,
+93,70,159,229,45,93,21,216,168,216,56,187,78,111,87,249,
+22,163,216,211,243,131,179,173,51,179,194,209,75,105,145,83,
+233,241,148,204,128,122,164,93,125,158,166,199,203,101,99,152,
+10,53,92,198,244,170,28,121,107,97,246,118,229,29,42,46,
+45,115,201,173,152,5,78,25,41,106,194,133,84,68,223,18,
+50,108,57,248,132,112,133,83,37,108,98,176,11,199,59,6,
+40,76,160,114,7,21,138,7,46,11,19,4,221,208,96,206,
+221,182,169,151,226,206,201,158,163,220,118,5,117,177,98,115,
+12,39,118,255,221,139,251,236,85,212,149,18,80,13,233,49,
+21,124,23,154,225,165,204,45,198,182,72,95,151,233,234,113,
+3,189,92,231,217,65,88,222,61,255,210,204,199,99,8,21,
+149,250,88,136,178,71,133,179,71,76,15,135,198,213,117,158,
+198,97,163,75,56,32,84,112,121,245,190,82,39,227,96,153,
+190,27,220,118,78,236,134,89,116,82,236,134,57,218,11,51,
+107,159,217,19,112,229,19,112,87,155,126,113,45,168,47,245,
+116,132,80,159,12,111,6,141,139,198,249,240,214,164,91,2,
+158,10,45,143,34,53,70,221,25,142,90,76,38,142,251,25,
+236,138,240,126,51,188,169,25,229,46,87,135,55,86,179,105,
+15,111,117,225,20,152,13,46,27,87,141,247,176,65,76,154,
+78,41,32,209,45,247,180,49,169,166,105,198,216,100,194,160,
+99,128,30,99,13,164,98,25,16,65,223,254,46,129,23,61,
+129,129,80,210,164,30,102,28,68,48,98,73,230,49,51,150,
+153,7,122,35,181,228,33,173,57,85,238,12,14,251,96,41,
+244,191,21,151,232,224,208,164,186,76,191,217,65,106,208,139,
+205,192,251,129,150,16,76,2,199,227,184,177,83,64,42,81,
+19,108,213,192,206,77,82,8,26,61,62,191,141,0,5,48,
+227,51,232,31,211,192,72,22,148,52,70,28,19,97,249,61,
+188,229,156,251,120,217,70,112,38,35,248,116,166,144,10,40,
+37,223,175,50,148,100,198,230,56,126,8,3,20,202,24,178,
+12,45,229,154,116,0,22,83,15,88,113,104,230,31,130,72,
+63,11,156,199,161,17,250,89,186,43,50,124,14,132,31,107,
+32,216,20,18,125,61,124,46,241,185,77,134,199,4,248,139,
+23,9,136,17,2,204,16,160,246,152,135,64,144,90,154,222,
+6,64,118,255,7,56,86,24,170,231,241,22,125,47,209,92,
+82,31,27,59,227,25,200,56,158,66,72,142,207,151,115,56,
+159,4,178,142,191,209,135,144,16,122,153,228,143,136,61,2,
+189,154,153,163,41,56,184,196,65,62,129,38,86,172,241,211,
+39,154,168,162,31,152,159,90,9,198,99,98,15,143,103,154,
+226,38,173,196,124,168,116,92,214,179,82,61,155,76,152,7,
+169,152,49,81,52,7,192,113,91,228,26,144,23,141,19,131,
+106,22,75,161,175,184,27,100,205,112,70,217,48,173,83,131,
+184,107,10,159,216,42,52,180,7,205,233,20,148,65,13,91,
+121,21,233,136,194,217,68,16,93,221,115,225,46,231,19,80,
+9,186,22,106,5,159,78,2,220,2,89,170,185,116,193,21,
+184,17,4,44,212,25,248,98,4,156,246,44,82,103,254,78,
+166,129,58,95,74,168,155,89,140,17,90,161,222,39,131,233,
+8,68,121,1,97,106,190,69,252,125,110,190,167,230,123,48,
+61,111,102,173,255,18,180,78,229,154,60,208,53,170,211,132,
+38,255,157,197,106,138,19,65,50,175,204,36,4,46,251,132,
+131,106,56,104,147,18,233,97,252,224,75,30,128,97,222,193,
+136,162,17,129,141,175,153,168,94,36,113,234,179,162,192,31,
+121,212,253,64,6,231,23,6,23,99,139,61,54,244,82,128,
+249,145,131,182,106,224,154,138,213,19,118,12,84,17,57,151,
+233,17,114,184,169,246,6,180,145,183,233,20,104,108,157,80,
+32,212,185,158,47,163,151,101,182,224,24,203,83,72,181,11,
+17,252,19,242,94,162,152,172,221,211,34,234,45,41,164,217,
+71,168,116,244,59,48,97,54,94,8,230,178,49,238,131,101,
+231,84,208,197,44,109,165,130,190,135,251,139,165,202,205,62,
+162,108,94,210,5,25,148,252,84,160,2,105,20,35,229,186,
+229,10,156,25,224,4,75,133,72,152,119,35,72,8,238,38,
+107,70,231,31,4,107,201,141,103,136,154,228,246,152,66,147,
+188,9,227,34,181,88,179,235,69,134,30,126,129,33,45,213,
+240,11,84,57,180,103,102,223,26,218,32,180,7,216,179,222,
+48,222,72,227,56,202,144,182,234,152,154,244,236,80,103,19,
+240,178,162,130,110,149,112,157,28,29,9,215,153,201,220,33,
+85,28,248,164,10,10,123,253,221,42,170,253,170,162,195,107,
+162,226,138,104,255,106,106,191,170,51,139,187,95,221,153,197,
+45,104,8,227,42,142,233,50,206,228,194,189,74,55,143,199,
+5,151,190,190,130,68,94,80,190,97,94,201,21,110,248,194,
+195,230,217,146,47,215,194,212,35,179,201,171,86,157,97,164,
+41,210,234,16,26,144,92,3,63,140,153,40,185,21,249,248,
+44,78,4,51,60,135,114,161,92,149,14,100,140,153,132,86,
+134,128,14,85,174,214,16,170,21,100,48,200,204,224,2,142,
+235,146,114,173,10,95,36,65,186,87,202,12,113,246,204,153,
+81,58,40,79,154,135,142,74,46,229,74,47,78,254,154,217,
+96,179,111,14,195,42,219,23,153,184,128,206,56,212,4,9,
+70,232,230,166,236,186,108,144,43,83,141,189,207,183,54,187,
+52,77,91,221,123,95,111,222,230,182,6,222,56,47,253,64,
+171,28,118,115,18,128,252,231,213,96,114,131,190,215,226,88,
+65,27,253,69,138,120,138,119,157,123,204,31,111,122,214,142,
+147,71,251,224,89,156,235,84,251,86,241,253,64,11,74,237,
+197,44,153,0,222,15,159,167,23,109,167,183,233,119,90,66,
+153,244,100,133,99,101,144,228,248,143,31,245,16,176,124,60,
+234,224,235,89,102,10,88,10,100,248,195,185,50,236,138,169,
+119,66,245,69,102,246,85,233,38,10,89,121,101,0,216,108,
+28,229,203,99,82,3,120,252,214,228,177,215,67,124,56,206,
+142,128,115,50,252,198,60,207,60,118,170,230,179,59,76,215,
+180,233,174,131,75,53,63,120,82,235,102,86,170,6,104,216,
+26,164,6,96,84,153,246,26,148,118,121,253,230,181,190,72,
+13,200,140,61,210,49,115,161,237,48,80,112,210,126,96,228,
+217,68,255,233,102,211,180,5,197,111,77,32,43,59,140,183,
+113,59,100,37,127,189,26,125,231,94,141,9,161,126,129,19,
+38,124,195,221,248,152,206,77,241,139,221,240,120,148,186,153,
+53,183,218,230,61,150,232,160,206,160,167,6,236,7,4,52,
+28,241,137,197,54,102,174,187,81,193,187,230,60,145,212,109,
+174,70,76,221,231,190,86,123,34,252,134,150,58,4,103,15,
+248,65,234,206,101,59,180,190,47,218,3,254,92,4,15,123,
+193,103,110,120,182,130,191,49,99,135,61,48,94,173,233,6,
+63,123,219,253,31,122,24,242,100,50,175,85,129,242,15,160,
+82,104,148,3,232,124,54,177,138,172,120,0,153,18,235,30,
+64,169,200,234,152,167,110,255,3,209,236,148,132,
\ No newline at end of file
diff --git a/uppsrc/Core/src.tpp/Convert$en-us.tpp b/uppsrc/Core/src.tpp/Convert$en-us.tpp
new file mode 100644
index 000000000..c03575ecf
--- /dev/null
+++ b/uppsrc/Core/src.tpp/Convert$en-us.tpp
@@ -0,0 +1,190 @@
+TITLE("Convert")
+COMPRESSED
+120,156,237,92,13,115,218,60,18,254,43,154,246,237,91,200,
+1,245,7,95,129,185,153,246,154,246,46,247,166,237,77,63,
+110,110,46,3,193,193,34,113,107,108,215,178,185,100,250,241,
+219,111,87,146,141,108,4,129,4,104,218,187,78,39,4,89,
+90,173,30,173,118,159,149,165,156,90,228,183,223,140,154,241,
+208,184,225,95,239,136,78,156,212,79,6,167,94,179,217,237,
+59,86,171,255,233,143,55,135,253,131,167,149,118,179,10,66,
+76,16,98,119,76,187,219,178,205,166,213,134,31,166,109,90,
+45,203,110,154,93,235,176,217,181,237,174,209,27,251,14,99,
+131,83,223,234,118,251,216,179,5,141,172,78,203,50,59,205,
+110,179,107,218,157,174,5,109,45,195,176,140,142,213,50,155,
+118,215,106,245,92,202,198,131,83,167,107,247,15,222,182,161,
+145,141,61,129,112,195,108,91,205,78,211,50,108,195,106,66,
+87,102,183,219,52,59,173,174,125,216,110,247,198,78,148,120,
+97,32,251,242,76,211,50,251,231,102,167,15,42,127,255,254,
+189,97,54,13,161,65,19,132,153,70,19,84,53,161,204,104,
+90,29,179,117,104,28,182,186,102,215,176,65,120,171,99,180,
+122,145,19,59,83,253,200,81,70,235,198,161,119,140,158,151,
+80,16,113,240,39,211,236,64,147,118,173,253,208,108,118,96,
+160,93,187,217,234,118,12,232,220,178,44,219,182,76,219,58,
+60,180,90,237,86,167,119,73,29,151,198,114,8,14,40,127,
+96,66,211,78,173,243,16,26,26,205,150,109,53,15,17,44,
+27,122,178,172,118,235,208,108,53,141,86,27,36,245,98,250,
+57,245,98,58,165,1,204,216,151,179,111,143,94,188,174,127,
+120,71,78,153,221,39,207,195,96,70,227,228,247,193,41,107,
+245,255,120,106,144,211,71,134,81,55,140,167,21,163,97,52,
+172,86,171,74,228,60,101,229,56,195,103,217,215,172,253,0,
+5,88,185,184,81,29,116,245,102,212,21,141,41,35,140,198,
+51,74,28,70,206,61,23,116,25,227,124,56,62,249,167,227,
+167,116,84,231,31,100,44,26,211,152,53,200,155,128,146,188,
+34,241,24,137,105,20,83,6,67,0,161,231,215,228,101,24,
+79,157,132,76,105,114,25,186,196,9,92,146,178,212,241,253,
+235,76,10,35,201,37,21,242,73,18,242,47,9,189,74,160,
+206,92,148,131,194,27,228,45,133,6,108,117,127,216,254,221,
+216,9,100,143,13,57,222,227,9,127,34,250,100,178,105,16,
+38,36,10,25,243,206,125,74,42,180,113,209,32,174,208,194,
+11,102,142,239,185,75,52,169,214,50,229,101,47,0,219,101,
+152,250,46,212,75,210,56,32,163,7,47,226,56,140,5,104,
+15,132,64,215,27,59,9,229,90,68,113,8,61,78,185,110,
+70,159,100,115,58,159,201,194,28,206,188,152,235,144,77,229,
+112,212,27,245,184,232,161,168,192,127,95,50,239,96,40,98,
+6,138,207,43,185,93,192,64,88,178,164,241,58,61,141,126,
+159,247,101,147,207,197,135,213,179,82,63,114,54,74,70,169,
+152,64,131,72,151,69,6,222,52,242,249,90,224,152,131,217,
+128,117,10,68,123,189,247,225,187,36,246,130,11,132,54,155,
+138,185,12,236,165,153,247,114,240,156,43,86,255,90,124,120,
+240,4,236,137,207,214,140,143,170,254,85,106,3,118,52,175,
+185,251,233,65,99,221,207,228,160,49,175,55,63,139,243,2,
+6,12,198,93,90,126,243,201,42,205,149,88,6,140,156,102,
+189,146,74,16,150,22,95,68,227,9,88,38,117,171,186,249,
+226,173,246,53,101,48,184,101,40,227,250,241,252,4,29,186,
+126,138,86,52,181,201,248,50,94,15,240,103,238,199,148,1,
+222,227,75,8,90,99,244,172,4,124,100,248,31,24,24,0,
+175,247,66,36,156,44,183,119,236,25,224,201,196,225,58,113,
+120,31,43,192,20,74,96,44,200,154,53,200,191,105,60,119,
+94,104,15,224,203,243,199,194,253,126,4,99,160,110,67,226,
+132,101,153,234,216,41,47,67,51,242,130,40,85,219,10,127,
+11,30,59,141,192,20,70,245,177,195,112,65,123,73,13,43,
+5,23,248,101,244,184,54,122,140,98,70,143,27,240,11,77,
+198,141,70,245,70,171,75,3,222,43,40,112,42,145,184,209,
+46,54,93,180,33,168,236,36,97,92,169,222,43,191,122,28,
+204,194,79,84,44,219,66,224,109,144,191,81,31,116,38,147,
+52,24,131,222,163,186,239,125,162,132,93,3,118,87,59,240,
+151,70,223,206,192,230,131,149,85,135,57,222,195,101,188,101,
+56,84,112,26,62,205,99,196,17,216,159,90,167,167,214,154,
+203,138,210,115,223,27,235,132,149,25,16,10,204,202,208,210,
+223,203,69,230,98,249,68,128,231,210,136,6,16,221,193,184,
+192,104,197,18,188,16,132,136,209,36,1,19,101,217,168,79,
+159,128,89,10,42,53,137,195,233,160,28,227,6,255,187,209,
+228,29,149,145,36,134,101,77,209,109,29,113,103,34,221,132,
+206,252,70,103,83,47,0,19,123,229,5,222,20,224,192,6,
+75,234,57,87,88,207,185,90,172,183,104,177,163,131,228,210,
+99,37,111,80,240,1,138,181,13,117,166,87,0,193,32,160,
+95,254,164,82,192,82,72,40,52,85,209,19,3,204,158,84,
+11,80,77,229,160,51,55,186,98,240,203,65,218,199,224,1,
+250,219,14,94,105,90,26,188,156,201,53,6,255,67,103,254,
+117,152,188,78,125,127,17,0,101,101,159,135,161,175,5,224,
+124,94,58,250,243,89,18,167,52,7,225,25,142,155,61,113,
+61,198,17,96,4,123,225,78,9,146,173,202,252,11,113,98,
+170,203,125,232,52,74,174,249,226,212,242,170,115,192,2,251,
+195,160,154,245,161,118,177,87,4,23,48,156,155,130,51,229,
+73,168,172,81,153,56,62,163,213,245,194,56,239,95,120,36,
+181,247,69,95,249,87,154,40,235,87,122,75,173,19,211,35,
+242,170,180,78,221,204,4,183,171,226,124,169,220,66,197,210,
+106,90,75,197,130,221,46,234,116,204,74,243,182,185,90,220,
+2,61,97,219,194,146,51,91,148,225,96,209,194,244,76,96,
+51,191,51,229,105,125,97,237,221,212,188,162,52,55,242,210,
+26,217,164,184,90,35,27,105,233,92,221,69,203,67,248,167,
+215,200,180,244,229,182,169,83,117,29,63,22,132,73,160,46,
+96,212,85,44,85,37,147,100,48,219,200,57,117,238,72,206,
+136,92,75,233,84,176,178,21,196,64,130,35,45,123,141,6,
+153,138,245,175,71,170,187,99,59,102,171,33,240,208,237,242,
+213,151,126,232,32,227,36,81,8,57,39,9,210,233,57,240,
+249,124,43,46,219,232,186,29,29,213,250,113,62,134,161,126,
+72,37,95,254,15,39,1,29,52,92,72,5,78,165,159,138,
+25,41,53,32,57,84,108,233,64,177,180,104,145,46,136,4,
+135,67,146,56,23,184,63,228,34,111,87,183,25,112,63,81,
+159,59,87,188,96,236,167,46,110,120,38,78,224,58,177,75,
+162,24,112,157,72,234,159,137,101,53,96,250,121,50,197,179,
+39,108,142,253,224,14,119,236,241,13,107,37,39,69,85,60,
+220,249,104,146,71,13,211,184,24,232,140,50,2,115,148,144,
+109,37,226,110,48,83,176,208,180,188,77,153,6,183,216,126,
+57,109,213,58,139,213,173,151,243,190,44,152,6,238,2,7,
+20,182,206,86,113,224,19,168,24,19,223,155,122,201,42,182,
+248,1,247,26,74,213,246,7,252,118,80,95,157,44,8,172,
+54,133,106,95,24,220,201,242,214,206,25,86,98,240,163,237,
+96,175,137,67,150,51,108,51,93,216,63,96,203,243,132,23,
+159,83,15,58,135,33,161,134,27,102,11,37,115,219,126,130,
+80,94,105,119,86,230,46,169,64,217,228,127,230,12,160,104,
+46,27,122,18,77,22,112,244,230,195,95,78,94,140,206,94,
+127,56,57,25,157,157,28,191,218,52,178,105,56,251,168,190,
+158,212,61,144,107,197,14,201,168,14,196,69,80,21,62,23,
+100,74,157,128,111,207,197,84,188,19,93,30,69,115,242,173,
+216,210,157,4,206,201,57,190,159,5,147,168,41,6,129,111,
+103,53,22,81,252,216,30,101,63,158,191,200,217,10,95,7,
+121,244,98,183,12,29,186,24,106,212,223,156,241,41,47,177,
+54,165,123,43,154,254,90,92,111,109,176,183,128,244,61,163,
+120,107,14,253,246,70,118,127,153,221,122,67,255,63,167,219,
+0,170,59,176,185,13,52,212,144,154,149,111,249,247,202,245,
+110,212,228,87,35,122,19,130,113,126,85,88,215,18,61,213,
+140,54,113,41,26,138,55,170,31,191,126,63,58,123,245,236,
+95,27,133,49,13,177,91,41,103,191,108,110,190,237,36,168,
+23,120,2,248,194,240,204,200,166,60,238,150,162,238,19,131,
+19,71,194,182,74,226,228,41,179,209,131,156,197,141,30,52,
+200,155,9,152,125,26,51,24,172,172,224,248,49,117,220,107,
+228,187,203,15,235,120,9,163,254,164,38,94,133,83,168,18,
+165,113,20,50,254,70,28,61,152,24,37,151,129,103,110,146,
+56,116,211,49,21,43,44,118,160,128,97,77,217,227,44,63,
+114,177,85,74,41,164,15,245,144,46,6,252,19,122,107,186,
+227,92,249,116,41,227,145,155,251,80,227,34,185,84,70,189,
+250,200,128,16,9,43,132,55,219,71,196,224,8,64,95,183,
+247,143,175,214,25,234,246,230,108,87,76,229,40,167,40,130,
+125,8,37,180,52,126,87,252,99,51,24,182,254,238,121,79,
+161,20,179,235,34,198,27,71,213,18,50,27,5,214,226,170,
+253,145,225,48,91,236,165,5,164,108,71,120,120,20,144,71,
+174,155,94,13,230,177,75,0,203,110,6,118,87,49,236,189,
+55,221,238,107,67,20,184,203,61,8,148,63,212,105,191,230,
+46,4,151,37,132,20,90,175,179,13,177,102,91,93,118,153,
+21,112,120,192,70,40,4,231,198,64,31,86,126,224,166,195,
+186,232,254,194,110,125,125,8,118,115,156,136,247,47,156,181,
+218,251,143,205,32,55,215,236,23,203,40,197,38,243,173,222,
+30,20,108,104,35,63,164,73,43,81,131,205,28,146,38,163,
+44,10,217,78,248,84,60,121,30,70,117,254,109,117,90,121,
+199,151,3,183,18,52,15,203,124,166,203,155,95,187,12,194,
+226,152,71,22,252,182,26,134,47,57,27,41,220,169,147,85,
+100,218,87,9,3,63,191,46,167,220,112,203,238,56,80,183,
+58,191,50,135,87,37,252,236,106,78,24,139,95,158,197,177,
+115,77,82,126,141,162,124,96,5,183,218,89,68,199,222,196,
+19,199,100,166,252,248,9,137,148,83,40,183,39,4,10,36,
+179,208,115,53,38,107,96,98,87,188,137,182,253,67,66,147,
+233,188,105,49,161,84,14,245,68,165,115,55,138,229,97,251,
+250,215,247,120,67,175,8,139,248,176,183,125,88,236,239,161,
+23,220,47,99,99,75,236,109,193,190,28,188,0,129,217,106,
+136,107,58,151,238,5,120,156,106,140,103,149,223,242,13,36,
+126,140,74,191,35,130,27,30,49,117,228,198,245,71,192,162,
+32,24,88,188,23,192,51,42,212,97,200,236,89,56,149,187,
+37,116,138,7,183,18,111,204,165,179,154,208,3,175,35,77,
+104,156,221,12,204,155,226,230,11,191,126,52,31,71,126,133,
+147,186,114,72,243,229,33,71,179,69,178,172,204,244,80,55,
+237,37,46,243,204,117,119,183,74,212,139,27,243,101,2,93,
+50,21,210,236,46,174,239,49,62,29,25,150,43,46,235,225,
+13,154,59,49,190,45,163,180,44,137,141,194,124,73,234,223,
+105,46,129,183,184,220,87,233,102,147,241,76,11,113,6,99,
+209,78,133,109,114,156,106,248,253,156,174,105,156,229,99,133,
+48,48,72,102,3,151,94,233,76,62,235,92,123,95,112,54,
+191,208,245,179,205,225,86,0,206,54,13,182,8,239,61,128,
+239,167,176,100,82,130,52,147,236,49,121,113,84,62,133,232,
+49,243,194,148,149,170,69,62,20,153,247,214,168,119,98,157,
+219,133,236,6,72,108,45,255,193,207,119,217,217,105,169,23,
+147,24,230,229,57,129,192,28,141,113,110,65,46,252,240,28,
+216,64,70,77,153,188,183,43,130,63,55,88,39,67,136,2,
+149,200,2,145,164,188,178,245,204,137,61,7,255,108,67,78,
+42,56,152,156,186,197,16,195,82,223,137,139,156,167,1,116,
+7,243,8,113,176,27,155,98,104,131,84,196,153,82,38,73,
+5,163,138,90,72,153,65,116,132,220,104,150,189,134,225,137,
+20,175,94,16,14,18,248,249,115,252,115,4,156,211,148,245,
+84,144,35,95,190,216,182,105,244,218,237,67,227,210,236,63,
+173,88,6,100,192,248,216,36,47,51,190,142,90,13,122,61,
+89,124,132,92,200,227,127,26,165,215,123,106,241,210,131,231,
+38,224,236,102,150,40,235,66,97,169,164,88,15,223,168,46,
+84,85,10,23,106,103,233,186,174,81,69,125,169,58,255,77,
+236,32,105,5,202,147,123,11,194,138,229,186,54,75,245,16,
+143,43,218,227,118,154,162,85,202,225,149,154,69,249,74,233,
+98,253,229,106,193,195,10,255,97,212,8,254,175,214,248,93,
+149,138,109,24,240,213,180,106,196,54,171,43,245,225,91,8,
+11,130,213,210,197,250,75,245,193,135,21,177,209,32,126,174,
+232,88,190,32,88,144,81,44,215,181,89,218,189,120,92,41,
+27,201,183,111,217,194,24,252,23,29,226,198,34,
\ No newline at end of file
diff --git a/uppsrc/Core/src.tpp/DateFmt$en-us.tpp b/uppsrc/Core/src.tpp/DateFmt$en-us.tpp
new file mode 100644
index 000000000..abd41586f
--- /dev/null
+++ b/uppsrc/Core/src.tpp/DateFmt$en-us.tpp
@@ -0,0 +1,8 @@
+TITLE("Date formatting and scanning")
+COMPRESSED
+120,156,181,86,219,110,219,70,16,253,149,133,157,4,177,42,185,123,163,72,73,47,9,146,26,8,18,36,64,220,60,169,178,185,162,86,210,162,20,169,238,46,237,26,77,253,237,157,89,82,148,236,176,114,208,139,31,36,107,57,115,230,118,230,44,167,156,60,123,70,251,244,148,62,241,55,126,171,151,170,202,253,108,106,164,76,38,138,71,147,95,223,127,26,77,122,175,94,14,229,25,162,48,64,17,49,19,73,36,152,228,67,248,96,130,241,136,11,201,18,62,146,137,16,9,29,103,185,114,110,54,205,121,146,76,208,137,131,19,143,35,206,98,153,200,132,137,56,225,224,203,41,229,52,230,17,147,34,225,209,120,161,93,54,155,170,68,76,122,159,135,224,36,48,18,128,83,54,228,50,150,156,10,202,37,132,98,73,34,89,28,37,98,52,28,142,51,181,245,166,44,154,88,134,49,206,38,115,22,79,32,231,251,251,251,115,38,105,157,129,4,48,70,37,164,202,224,140,74,30,179,104,68,71,81,194,18,42,0,60,138,105,52,222,42,171,54,127,95,122,244,100,233,49,29,27,
+175,1,162,247,3,99,49,184,12,251,195,83,38,99,40,52,17,50,74,98,10,193,57,231,66,112,38,248,104,196,163,97,20,143,215,90,45,180,109,74,80,144,124,143,129,107,220,143,79,193,145,202,72,112,57,194,102,9,136,196,249,48,26,177,72,210,104,8,72,99,171,127,171,140,213,27,93,192,200,254,184,254,243,249,79,31,7,95,46,201,212,137,9,153,62,167,116,64,41,121,171,188,38,203,210,110,148,247,166,88,17,85,44,136,203,84,81,192,143,217,139,217,212,209,137,32,248,29,77,222,239,156,94,189,164,231,244,156,71,209,25,201,202,194,1,120,3,118,61,235,176,88,43,187,55,72,123,173,9,37,151,222,254,92,98,2,237,243,151,187,255,174,210,113,58,198,71,87,228,129,65,250,98,31,67,144,69,123,222,39,93,161,255,121,114,130,184,246,252,44,244,129,79,200,37,244,197,17,69,156,183,216,42,232,26,252,192,244,206,201,39,11,67,34,229,146,44,212,93,159,108,202,194,175,67,43,239,180,178,196,56,226,182,58,51,75,163,23,164,114,232,123,169,61,58,34,
+226,57,121,87,144,109,174,50,141,254,181,235,188,132,143,162,218,204,1,20,97,188,254,221,35,140,202,50,189,245,128,146,14,234,179,77,229,224,67,249,12,194,205,231,86,223,24,133,143,33,179,101,149,231,164,80,155,61,234,57,150,33,219,209,247,222,132,14,14,190,94,148,21,132,88,96,29,29,22,14,44,46,235,130,125,25,168,209,90,245,126,36,159,181,175,108,65,110,84,94,105,48,252,248,229,195,7,98,150,164,40,3,30,166,188,12,232,166,32,14,179,218,150,206,224,74,18,107,86,107,79,212,210,67,133,126,173,247,225,59,248,22,200,80,231,112,69,234,239,142,169,82,114,17,104,252,253,100,122,64,165,195,7,237,196,107,68,87,103,87,239,74,40,9,79,219,89,98,250,206,195,152,148,93,52,30,208,253,34,195,58,251,228,118,173,173,110,108,66,23,157,246,100,126,183,99,64,99,15,168,149,3,68,181,67,15,150,193,161,95,51,96,141,32,86,3,76,181,221,230,200,36,83,120,189,130,246,133,230,19,101,87,21,110,58,144,4,226,33,239,14,121,8,180,236,28,
+63,86,61,248,26,10,131,233,214,161,143,204,183,206,22,75,63,54,175,131,5,51,69,215,2,82,242,6,22,239,194,228,48,253,238,253,127,18,66,144,236,219,113,33,170,202,144,82,203,128,29,86,20,51,117,176,100,208,153,185,94,171,27,83,86,143,86,242,96,26,141,91,51,189,174,150,101,208,134,125,28,108,90,240,57,214,180,96,0,113,178,157,91,211,56,210,124,237,234,184,41,205,162,173,176,247,144,33,251,22,5,85,187,70,172,3,193,234,65,102,203,141,239,208,44,237,191,165,212,65,95,58,42,68,156,221,168,247,62,223,49,108,204,191,115,218,7,106,119,116,212,255,78,176,15,209,31,214,31,180,8,159,239,234,71,249,92,35,7,234,159,86,111,173,118,97,121,202,99,66,142,109,107,47,173,163,44,9,201,52,139,117,16,248,63,104,98,205,166,255,177,141,122,219,117,245,53,203,226,30,109,238,126,165,64,30,205,202,52,242,163,242,91,117,7,255,230,121,121,27,148,234,145,27,172,227,18,37,205,6,61,77,79,84,122,66,64,5,81,228,230,122,101,194,219,7,
+14,1,147,105,101,48,215,160,60,118,23,32,32,63,198,121,157,158,116,218,133,17,66,91,110,180,69,241,130,173,5,17,213,54,29,100,202,65,50,175,155,107,8,48,202,240,198,168,242,253,178,2,160,129,75,22,178,105,143,246,149,129,94,67,142,112,236,241,202,45,241,20,180,38,61,73,127,9,37,5,220,214,141,192,75,172,89,21,184,119,88,51,168,245,2,140,246,143,129,149,112,119,226,61,208,199,0,135,241,170,45,38,93,224,149,223,229,137,165,2,137,241,37,34,200,153,241,157,164,196,209,238,244,40,29,116,80,18,196,104,246,23,142,252,149,38,
+
diff --git a/uppsrc/Core/src.tpp/Format$en-us.tpp b/uppsrc/Core/src.tpp/Format$en-us.tpp
new file mode 100644
index 000000000..248cc90ae
--- /dev/null
+++ b/uppsrc/Core/src.tpp/Format$en-us.tpp
@@ -0,0 +1,18 @@
+TITLE("Text formatting")
+COMPRESSED
+120,156,221,91,11,147,211,70,18,254,43,19,18,18,123,177,141,30,150,237,149,129,98,15,246,114,185,132,229,10,150,132,148,75,139,180,214,216,214,33,75,58,73,222,71,178,225,183,95,247,140,30,35,89,178,103,97,73,42,0,133,109,105,250,235,119,79,207,104,52,211,200,55,223,40,61,229,107,101,207,31,243,57,93,56,27,63,181,102,222,112,56,153,58,154,49,125,255,227,203,195,233,193,211,206,104,216,69,20,21,80,244,177,170,79,12,93,29,106,35,248,79,213,85,205,208,244,161,58,209,14,135,19,93,159,40,230,220,119,146,196,154,249,218,100,50,69,34,173,167,125,173,141,13,77,29,15,39,195,137,170,143,39,26,208,106,138,162,41,99,205,80,135,250,68,51,76,151,38,115,107,230,76,244,233,193,171,17,16,233,200,9,192,21,117,164,13,199,67,77,209,21,109,8,172,212,201,100,168,142,141,137,126,56,26,153,115,39,74,189,48,200,120,121,170,170,169,211,115,117,60,5,153,63,124,248,48,80,135,10,151,96,8,96,170,50,4,81,85,184,166,12,181,177,106,28,
+42,135,198,68,157,40,58,128,27,99,197,48,35,39,118,214,237,170,27,123,85,31,43,166,151,82,128,56,120,160,170,99,32,25,245,70,95,171,195,49,40,58,209,135,198,100,172,0,115,77,211,116,93,83,117,237,240,80,51,70,198,216,92,81,199,165,177,53,251,253,221,31,247,143,79,250,111,94,147,89,162,79,201,41,189,74,201,34,140,215,78,154,122,193,242,91,107,150,24,211,31,77,27,254,254,147,93,181,59,243,48,72,82,50,95,57,177,125,96,247,216,47,188,253,51,157,167,97,108,63,98,223,29,127,67,237,39,246,183,118,215,36,179,251,138,210,87,148,51,188,241,58,141,1,245,140,240,79,43,187,69,222,229,223,158,42,132,179,41,110,117,138,91,29,101,160,12,52,195,232,18,198,179,129,88,24,1,210,149,3,236,131,98,136,158,41,87,220,236,17,121,6,103,165,158,103,132,127,22,131,30,85,7,161,1,96,12,126,20,67,192,30,239,4,65,156,120,153,20,247,186,22,55,245,223,198,90,237,106,214,116,204,127,245,224,167,42,220,42,237,62,36,246,76,80,233,
+19,121,4,34,174,53,24,12,4,104,178,101,239,106,104,123,65,154,69,244,95,26,223,32,70,163,166,190,19,44,55,206,146,54,184,227,174,252,157,124,20,246,221,38,198,197,159,145,21,127,161,141,191,236,156,210,166,4,63,148,105,230,5,166,110,66,194,77,26,109,82,146,226,252,114,238,36,212,37,97,64,102,7,165,57,122,224,146,132,198,56,235,16,103,158,110,28,31,165,216,172,105,144,38,36,13,73,228,59,115,186,10,125,152,181,146,1,57,202,110,145,11,212,33,129,161,20,157,114,1,0,0,13,195,25,163,77,130,104,217,116,198,232,222,216,15,236,7,36,137,232,220,91,120,64,151,208,148,132,11,146,164,78,224,58,177,43,140,157,18,39,138,124,111,238,224,84,79,230,78,64,22,49,165,254,53,137,233,210,75,96,4,73,87,212,139,73,120,25,8,84,248,53,135,159,115,3,147,244,58,162,168,66,56,200,12,147,125,156,132,41,220,92,129,137,0,9,20,137,61,231,220,167,36,216,172,207,1,29,164,226,228,165,21,60,248,183,142,124,138,191,64,203,243,107,18,
+130,194,126,232,184,168,38,130,100,38,223,68,104,2,77,33,172,185,160,76,245,42,239,255,8,214,68,237,227,148,92,122,233,10,60,66,238,91,4,140,65,86,206,5,205,20,51,43,180,7,16,4,51,112,252,125,203,158,205,42,57,177,94,3,97,98,217,181,27,33,235,150,182,175,23,86,179,251,158,187,117,215,134,11,86,85,104,8,151,6,118,204,247,144,206,52,142,98,154,217,37,179,67,12,81,231,5,148,116,130,48,45,189,82,240,237,14,200,177,51,95,229,80,16,12,255,219,208,96,78,9,5,92,110,15,76,99,136,70,154,59,245,58,183,244,123,15,8,192,71,25,109,15,46,130,123,92,234,123,107,15,93,5,113,31,135,235,92,119,180,232,67,136,140,130,117,205,29,71,23,142,231,51,239,231,106,9,54,39,191,255,174,142,39,134,57,209,84,227,140,48,23,144,217,67,193,20,81,152,120,172,33,53,45,211,124,204,70,144,215,148,190,103,121,3,129,155,71,16,1,147,204,14,26,41,33,163,124,63,188,100,20,246,189,152,134,241,210,9,188,223,168,125,143,132,49,
+4,9,170,13,218,22,177,216,131,220,162,139,141,207,173,148,198,78,144,248,44,83,146,1,200,208,40,229,165,231,166,43,235,81,41,34,139,193,164,180,9,100,86,2,203,0,244,101,72,32,59,125,55,143,201,109,152,210,49,32,138,227,123,75,176,177,79,23,233,30,238,79,62,31,247,216,91,174,246,177,183,31,127,62,254,64,53,199,186,16,139,50,64,74,137,212,88,20,49,209,62,148,98,252,80,58,21,235,11,228,255,201,198,247,45,230,223,164,198,156,145,99,153,78,97,241,128,225,80,23,126,96,253,241,199,142,148,173,38,60,176,34,214,122,131,189,22,132,13,148,84,22,96,126,180,114,4,245,96,150,240,175,65,152,192,247,222,83,242,140,120,46,8,138,165,27,53,119,189,37,230,26,228,149,253,157,253,206,254,142,85,2,76,117,7,99,153,186,144,222,80,31,175,33,51,33,122,207,105,122,73,105,208,90,68,32,157,119,8,139,182,97,98,66,46,240,9,230,156,86,199,231,85,142,33,69,176,20,229,195,202,140,23,234,253,30,70,229,180,81,22,45,187,207,202,78,
+2,229,156,4,248,31,206,72,89,77,2,67,44,22,32,87,144,10,30,113,105,4,101,140,229,109,32,32,14,246,106,9,147,179,221,79,104,128,149,225,130,214,10,213,179,162,30,130,251,160,171,129,104,104,49,67,2,109,32,206,156,0,25,83,54,121,179,202,92,4,91,57,91,243,89,250,40,225,13,93,141,33,196,103,139,153,193,215,24,243,97,144,58,32,68,61,112,176,32,211,107,18,208,194,91,176,210,119,162,130,29,138,63,131,102,198,194,187,46,68,31,92,220,120,201,170,168,216,172,124,87,204,211,62,133,50,103,128,181,9,133,140,133,159,160,103,16,6,118,191,38,20,70,42,220,66,214,208,69,85,193,25,4,72,137,69,140,208,117,148,94,79,209,182,44,92,208,37,197,212,142,105,153,219,42,51,0,218,49,119,113,214,249,116,92,186,128,153,207,69,140,87,222,124,197,239,178,89,114,1,98,119,243,120,90,135,144,119,128,117,225,65,191,37,180,88,232,54,84,133,130,144,148,117,5,40,114,213,0,191,172,60,191,144,171,104,76,18,204,62,54,51,226,126,12,68,
+110,4,146,166,66,173,232,1,31,138,26,65,166,122,48,217,166,151,33,8,6,153,24,193,4,114,238,249,16,118,52,169,182,28,158,106,40,211,151,56,79,250,98,87,8,76,50,238,172,140,156,23,45,160,135,51,105,7,19,177,210,23,118,209,60,204,18,3,242,50,96,250,243,9,16,58,29,204,236,94,102,196,8,140,196,154,214,192,73,55,49,24,134,35,36,44,46,88,33,114,195,13,178,176,251,79,208,166,61,146,132,56,227,131,205,0,47,97,220,129,19,29,44,7,232,47,114,159,245,149,57,17,235,88,7,205,250,85,67,194,190,71,157,52,129,41,24,45,90,15,240,1,57,197,142,3,254,57,96,226,16,144,215,228,114,5,5,142,69,158,232,202,122,20,122,9,47,76,88,36,69,159,247,184,196,247,221,40,229,225,1,3,87,78,146,165,207,101,236,129,96,144,104,9,140,176,109,24,211,177,237,178,225,65,99,86,164,239,214,162,37,107,30,31,234,176,112,219,106,182,171,99,0,149,109,8,150,3,182,106,66,213,80,32,40,75,153,220,129,188,88,55,150,23,210,17,
+91,232,150,236,104,22,125,43,146,171,98,147,23,152,75,91,99,88,8,38,155,40,10,81,154,90,43,77,230,4,132,32,33,185,34,111,9,204,248,190,71,252,144,248,87,196,127,75,40,57,38,11,178,36,223,147,164,94,120,88,250,64,110,226,34,36,204,89,186,225,156,229,5,95,176,96,192,161,79,112,131,51,246,88,77,107,209,42,129,54,3,154,224,22,91,231,65,198,166,26,72,133,108,117,82,206,51,157,124,61,68,197,40,199,213,92,202,166,66,248,28,13,179,101,90,119,208,82,204,113,9,86,19,163,172,236,96,21,222,28,228,107,61,64,133,126,35,194,9,6,50,23,235,93,130,1,235,240,210,135,66,212,22,144,44,51,209,74,216,19,236,153,255,160,214,37,245,74,119,90,4,183,32,105,179,38,94,45,150,217,74,92,92,215,172,67,119,227,135,86,182,130,170,175,161,192,177,236,150,105,205,234,141,23,240,83,200,212,98,235,239,42,85,150,46,149,245,18,46,26,244,67,88,52,140,20,131,55,131,219,50,152,102,209,3,178,100,231,74,224,68,128,235,65,102,51,
+10,141,0,212,55,78,32,174,0,240,246,38,201,124,158,89,4,165,103,253,255,22,67,166,87,206,238,4,0,98,152,24,240,98,227,104,166,110,62,58,223,145,38,75,112,118,128,241,183,155,56,55,70,78,159,61,92,224,177,145,21,72,62,163,130,6,224,209,249,10,130,98,171,111,45,123,53,44,128,124,47,1,34,10,150,255,89,88,226,114,35,229,141,198,37,148,79,154,219,32,111,31,132,246,199,241,217,44,235,248,151,206,117,210,212,134,88,236,195,170,71,93,145,160,172,98,177,242,180,20,83,47,217,10,210,132,214,11,207,45,146,115,80,13,158,161,54,50,39,198,120,184,82,167,79,59,154,50,236,110,89,186,154,59,165,189,139,130,3,215,158,106,249,106,40,219,36,90,131,249,86,86,62,250,25,249,9,26,117,0,96,14,97,247,88,119,91,122,182,32,124,81,35,124,81,12,230,235,164,133,23,131,145,185,83,8,148,219,28,181,135,181,2,110,148,124,154,192,95,158,156,254,75,0,127,83,210,239,150,10,110,10,100,71,231,231,49,133,86,10,167,22,255,22,138,181,
+64,148,100,189,79,86,175,133,197,70,86,81,215,185,110,241,26,220,105,35,122,94,33,122,158,13,188,3,127,61,63,250,181,197,91,59,164,113,175,37,92,181,75,155,54,250,156,230,19,189,244,252,87,9,39,237,144,47,189,20,232,85,205,238,175,194,77,156,151,110,158,172,13,84,142,232,86,46,56,31,219,35,170,73,156,30,209,76,114,222,35,48,233,16,168,8,228,55,184,48,134,235,14,187,180,13,119,116,183,112,113,75,208,193,226,204,9,178,102,36,105,160,123,213,18,30,53,186,122,217,207,75,174,227,131,224,208,253,99,1,109,104,122,170,149,55,123,236,171,27,26,238,119,144,192,234,223,44,188,43,140,11,104,153,214,142,159,52,14,187,128,97,80,120,189,61,195,2,106,245,216,112,138,176,97,140,187,147,87,81,24,224,54,8,74,22,242,126,175,153,118,145,209,46,10,90,46,216,110,42,63,163,242,129,42,127,28,98,247,249,166,125,245,209,112,91,135,116,171,214,72,33,246,3,214,8,101,63,250,240,163,210,221,176,93,158,172,85,82,200,87,197,55,251,204,18,
+232,69,18,176,16,80,213,247,143,51,61,141,241,104,10,36,253,155,108,66,134,38,7,119,74,96,154,93,6,219,3,103,7,217,179,148,3,148,140,255,178,172,138,130,153,128,162,0,253,27,171,220,198,207,253,91,244,234,164,19,208,165,195,154,87,251,49,95,241,151,195,96,9,201,150,148,249,26,8,70,140,186,77,114,129,37,250,55,239,41,141,112,71,14,100,199,109,34,7,192,127,163,113,152,52,18,128,193,250,55,121,244,228,126,201,86,36,190,58,42,198,143,134,10,31,255,192,106,180,18,91,220,102,48,173,212,219,238,168,25,168,16,36,114,92,182,79,197,246,54,155,242,81,88,59,230,249,125,124,229,96,83,148,180,60,188,169,54,194,134,174,170,230,112,52,57,228,29,74,142,193,247,14,58,246,189,252,9,214,1,172,108,27,30,203,193,229,242,177,168,125,15,10,153,166,247,224,203,233,241,219,83,251,94,87,168,52,249,32,54,0,111,23,247,118,50,213,204,166,199,174,112,67,53,221,219,49,198,59,108,152,28,99,69,85,182,24,52,193,102,7,117,228,113,237,131,
+26,174,186,15,123,15,184,125,35,218,75,121,36,192,223,236,16,220,190,129,27,164,254,7,192,164,57,61,145,230,180,197,6,70,222,134,147,253,248,214,172,68,229,118,178,18,35,220,182,11,54,81,186,131,13,92,142,82,57,76,123,198,182,95,240,201,66,75,2,53,142,40,66,26,31,57,180,230,17,35,148,148,195,150,137,102,233,48,158,87,208,70,70,19,216,145,164,213,239,84,48,239,78,209,66,41,180,177,36,218,149,12,218,248,92,14,236,173,20,216,63,228,192,104,21,108,208,162,40,92,199,122,68,237,7,240,191,28,242,241,173,144,143,111,129,188,184,21,178,28,230,82,26,83,14,239,251,59,198,11,238,24,79,221,5,248,48,39,125,248,12,239,148,167,89,58,208,159,248,222,220,75,201,118,39,215,149,99,172,127,117,11,206,186,34,240,230,205,122,67,95,39,201,57,144,143,117,42,25,53,154,125,102,63,208,119,2,215,52,226,25,84,181,40,239,248,202,85,132,172,62,219,121,64,117,165,165,234,237,58,107,44,201,206,151,51,95,79,54,4,47,238,56,164,181,93,
+128,237,33,173,145,108,197,201,86,44,146,182,175,243,106,101,165,41,159,202,234,226,238,195,246,226,207,141,156,139,187,142,28,123,166,154,144,52,83,205,76,47,195,169,110,166,171,152,210,169,3,43,248,21,141,109,171,186,48,209,154,120,1,221,231,96,213,104,195,108,176,44,63,253,254,39,115,148,214,142,111,60,87,26,186,38,188,255,110,160,196,73,1,190,144,3,252,183,60,32,219,132,222,15,248,230,228,88,90,101,41,133,165,245,149,210,86,90,89,41,85,37,219,107,231,122,63,90,130,79,243,197,125,236,157,144,207,101,32,95,223,14,242,232,87,9,200,163,211,55,175,196,253,237,221,138,75,233,45,41,158,148,194,146,88,82,154,202,97,165,151,21,172,150,226,253,81,88,141,75,58,227,163,160,212,70,44,217,13,19,41,48,69,18,205,169,98,53,22,234,143,66,106,158,204,104,34,7,118,180,95,44,201,136,56,146,17,235,248,181,28,88,92,1,155,52,65,93,120,158,39,7,246,170,46,89,163,154,47,158,61,123,251,246,237,15,31,181,169,241,61,77,95,95,39,207,
+157,148,118,186,141,65,50,121,168,25,15,53,69,25,125,2,252,169,183,222,11,15,19,178,169,143,77,229,240,163,248,216,247,240,169,122,243,46,38,123,254,255,57,108,163,25,3,101,50,224,182,169,60,250,25,149,108,94,101,79,204,113,71,122,190,73,82,241,20,160,184,175,92,123,121,8,31,131,195,15,60,98,233,210,133,89,234,194,47,84,95,149,105,123,133,165,99,31,20,104,221,91,188,203,117,38,200,193,128,203,239,165,125,190,125,183,88,167,197,59,26,5,159,252,136,87,113,222,159,29,236,221,4,252,248,2,123,84,139,39,21,124,74,102,187,216,20,7,67,196,67,12,106,213,68,48,14,127,37,105,188,153,167,230,83,133,108,43,200,239,149,154,143,134,221,82,77,145,95,166,6,59,158,196,137,54,49,229,231,110,249,9,68,47,224,110,99,167,49,138,131,184,181,119,42,216,121,73,241,228,218,160,221,193,153,244,249,19,177,102,249,133,215,138,234,194,23,111,22,101,162,255,148,253,70,123,243,227,211,236,68,39,196,254,126,33,64,126,129,191,240,78,15,103,90,121,
+177,167,46,7,190,219,147,137,112,84,61,38,181,159,47,183,83,157,117,22,206,156,81,53,166,235,204,57,64,45,8,249,65,152,134,71,134,251,5,242,220,79,16,198,115,183,178,161,225,156,175,200,60,47,14,229,248,166,119,6,171,85,161,124,69,80,208,240,34,244,220,237,60,126,90,150,159,130,190,92,82,55,212,131,182,183,216,176,234,20,55,238,254,13,54,175,105,151,255,172,162,246,25,217,214,64,148,176,92,150,23,37,41,87,93,124,41,98,177,253,58,85,94,253,115,53,7,236,140,120,237,34,59,70,127,244,211,155,99,251,221,207,61,1,15,143,99,225,107,93,252,84,56,214,9,241,29,45,111,129,135,195,90,184,179,243,248,249,73,200,5,32,52,69,103,174,195,9,219,51,20,194,228,238,35,164,198,98,103,156,252,141,188,205,31,126,243,163,210,229,17,53,230,159,93,6,231,153,254,89,13,94,99,241,165,24,60,59,23,141,182,254,37,127,173,96,159,181,177,197,194,30,241,179,218,123,139,201,151,98,113,84,140,217,27,181,219,111,108,86,161,62,171,165,171,28,
+190,4,51,243,119,22,242,82,159,31,251,189,109,101,183,254,15,50,34,202,48,
diff --git a/uppsrc/Core/src.tpp/Indext$en-us.tpp b/uppsrc/Core/src.tpp/Indext$en-us.tpp
new file mode 100644
index 000000000..3de979da9
--- /dev/null
+++ b/uppsrc/Core/src.tpp/Indext$en-us.tpp
@@ -0,0 +1,9 @@
+TITLE("Index")
+COMPRESSED
+120,156,189,87,105,143,218,72,16,253,43,37,37,25,1,225,104,183,109,108,142,160,153,37,123,68,57,149,176,249,130,12,54,166,9,173,24,219,107,27,50,163,205,230,183,111,117,183,109,204,12,44,97,55,218,40,194,71,119,213,171,122,245,170,218,51,165,240,248,49,105,146,71,228,204,191,254,115,182,242,182,65,230,76,185,97,216,3,143,154,131,207,47,223,246,6,141,235,90,215,168,11,47,26,122,209,45,77,183,77,93,51,104,23,127,52,93,163,38,213,13,205,166,61,195,214,117,155,244,253,192,75,83,103,26,80,219,30,8,35,138,70,212,50,169,102,25,182,97,107,186,101,83,180,165,132,80,98,81,83,51,116,155,154,253,37,75,125,103,234,217,250,160,241,190,139,70,186,64,66,231,68,235,82,195,50,40,209,9,53,16,74,179,109,67,179,76,91,239,117,187,125,223,139,51,30,133,57,22,215,52,170,13,22,154,53,192,152,191,125,251,214,214,12,162,34,48,208,153,70,12,12,85,195,119,196,160,150,102,246,72,207,180,53,155,232,232,220,180,136,217,143,189,196,219,156,
+78,221,60,155,186,69,250,60,99,232,162,241,84,211,44,52,233,54,187,143,52,195,194,68,109,221,48,109,139,32,56,165,84,215,169,166,211,94,143,154,93,211,234,175,153,183,100,73,158,130,135,193,55,52,52,181,154,214,35,52,36,134,169,83,163,39,200,210,17,137,210,174,217,211,76,131,152,93,244,212,79,216,31,91,158,176,13,11,177,100,127,206,255,122,242,243,155,214,239,31,96,154,234,34,253,174,49,128,23,225,146,221,94,57,211,148,20,111,48,192,56,240,50,6,67,89,38,152,54,174,13,152,56,77,168,60,254,230,165,235,95,66,7,220,103,240,33,91,138,167,97,190,109,4,35,229,77,7,113,53,7,47,97,250,132,144,22,33,165,227,249,208,201,95,93,215,72,155,180,169,105,214,33,151,68,190,117,94,238,16,62,139,183,77,184,200,48,15,178,92,114,159,205,139,96,143,186,31,205,71,243,249,5,8,68,145,183,95,233,31,179,142,19,190,195,164,31,218,207,220,190,219,127,29,237,152,183,8,216,77,184,124,206,88,60,142,226,187,183,82,177,51,56,185,84,186,
+26,158,142,229,120,134,21,2,31,210,131,233,31,37,56,222,46,2,238,159,136,255,70,194,206,224,230,50,120,105,251,145,249,89,148,204,64,93,207,216,142,254,41,246,209,220,81,162,131,252,50,109,140,165,117,235,235,228,46,102,16,173,128,5,178,11,82,72,17,139,45,129,135,138,177,54,76,128,167,144,55,202,18,178,8,22,12,237,59,179,44,138,185,143,113,118,220,206,24,77,220,78,154,248,203,200,119,59,69,97,220,199,44,116,91,219,116,6,155,252,13,54,118,7,192,241,194,37,108,182,105,6,107,111,119,198,23,190,254,236,206,247,158,150,88,105,240,177,212,248,19,166,89,178,149,212,128,240,184,95,66,57,242,79,161,72,167,125,144,111,206,74,235,171,184,225,225,39,165,220,54,188,174,196,50,134,109,40,172,49,213,40,102,137,135,238,107,245,154,4,131,137,123,5,183,117,7,54,44,91,71,2,112,197,113,95,19,201,201,182,73,40,28,174,209,49,236,188,96,203,96,21,37,37,169,109,200,207,133,20,249,155,54,144,2,1,84,52,219,100,228,192,151,53,247,215,
+5,203,233,97,28,191,178,76,236,251,40,220,238,35,169,59,211,49,58,90,109,67,95,136,254,120,16,213,194,170,202,229,65,23,196,252,228,165,76,209,80,48,117,180,22,110,71,9,120,95,8,245,60,156,52,115,121,98,22,205,156,224,17,56,112,40,55,181,5,86,129,183,195,11,6,197,149,180,94,132,107,150,112,140,109,19,97,82,226,61,222,23,25,121,1,207,238,96,149,68,155,11,131,82,114,240,150,203,20,162,48,184,195,114,109,22,44,65,101,199,204,231,43,238,203,210,72,36,25,79,65,197,43,254,153,161,229,29,68,25,70,5,111,38,175,132,198,50,15,233,74,154,170,25,68,39,120,255,81,252,153,104,184,47,60,91,95,38,124,241,44,243,138,98,69,206,94,239,14,100,137,23,166,43,12,58,101,27,47,204,184,143,138,27,123,65,32,212,160,196,154,10,118,133,15,212,83,153,74,16,125,66,54,88,146,32,31,50,34,118,235,51,233,30,119,43,86,58,79,45,19,166,157,49,236,34,190,20,178,197,219,162,47,220,103,142,88,169,169,80,149,91,236,16,185,233,
+90,135,157,92,173,131,83,203,53,7,11,209,181,155,56,74,185,192,168,159,71,24,14,11,12,37,251,155,19,24,248,11,21,28,156,93,106,103,14,49,22,16,210,61,246,222,56,96,94,226,212,170,75,139,40,10,196,210,139,244,157,100,8,87,213,120,201,149,241,246,1,229,101,132,130,70,174,84,140,192,82,172,10,186,152,45,194,227,225,110,60,228,185,207,51,20,230,113,94,10,61,190,86,178,61,245,181,48,169,30,110,239,162,184,28,246,181,186,28,246,116,0,207,147,40,198,42,123,200,92,62,5,132,10,80,221,185,4,132,156,212,216,72,101,63,200,153,33,225,173,1,188,47,102,209,68,76,14,57,29,143,14,95,185,223,16,35,182,131,54,194,153,242,131,99,246,99,49,131,4,228,18,131,137,49,217,60,146,118,53,47,50,232,139,3,79,85,183,188,169,185,245,190,44,139,108,106,85,49,204,106,92,96,167,128,31,76,56,34,212,57,245,29,254,242,158,42,95,92,29,2,220,211,49,126,176,233,144,58,5,172,44,100,53,111,152,228,93,135,147,37,218,38,126,193,42,
+170,47,136,190,168,173,216,140,144,241,13,107,194,98,155,33,127,104,28,221,9,178,69,205,5,30,118,232,158,192,177,4,108,125,253,80,113,215,62,81,255,89,153,198,236,222,167,141,123,85,85,70,181,89,11,129,168,68,231,23,125,108,204,38,179,234,215,70,21,68,135,61,120,169,189,3,221,31,225,42,63,18,80,90,63,130,181,219,61,107,202,241,247,200,65,98,85,213,208,228,97,118,40,9,53,118,238,41,162,137,193,102,133,44,142,204,134,251,205,113,65,51,129,248,127,222,227,247,169,229,108,23,40,170,220,225,196,29,157,232,133,242,108,63,222,15,110,203,223,55,163,170,163,28,129,121,13,30,86,189,60,80,127,92,151,252,139,122,31,230,125,170,234,71,114,63,168,188,248,163,67,16,80,173,207,49,22,242,113,254,63,72,224,16,208,249,27,205,221,59,249,
+
diff --git a/uppsrc/Core/src.tpp/NetNode$en-us.tpp b/uppsrc/Core/src.tpp/NetNode$en-us.tpp
new file mode 100644
index 000000000..654b5f905
--- /dev/null
+++ b/uppsrc/Core/src.tpp/NetNode$en-us.tpp
@@ -0,0 +1,7 @@
+TITLE("NetNode")
+COMPRESSED
+120,156,173,86,127,111,219,54,16,253,42,4,210,6,118,230,24,252,41,81,82,87,36,64,211,34,40,150,13,73,187,127,28,39,98,44,58,22,98,139,134,72,103,200,134,229,179,239,40,201,178,156,164,117,90,204,6,44,138,188,123,239,222,59,138,242,136,162,55,111,240,0,239,225,29,159,248,131,158,170,213,220,141,71,57,231,50,81,84,36,119,159,127,143,146,131,163,94,192,251,30,133,0,10,11,9,147,130,17,78,3,248,33,140,80,65,25,39,146,70,92,50,38,113,60,153,43,107,199,163,57,149,50,241,73,116,64,247,104,40,40,9,185,228,146,176,80,82,200,165,24,83,28,82,65,56,147,84,196,153,182,147,241,72,73,150,28,156,7,144,196,60,19,128,99,18,80,30,114,138,25,166,28,168,136,148,156,132,66,178,40,8,226,137,90,186,220,20,13,87,78,8,37,201,13,9,19,168,249,241,241,113,72,56,174,43,224,0,70,48,135,82,9,204,97,78,67,34,34,28,9,73,36,102,0,46,66,44,226,165,42,213,226,219,210,197,78,233,33,142,115,167,1,226,224,23,
+66,66,72,9,6,193,30,225,33,8,149,140,11,25,98,32,167,148,50,70,9,163,81,68,69,32,194,120,166,85,166,75,144,192,73,80,21,27,14,194,61,33,4,135,120,206,69,40,57,101,208,27,206,56,88,193,73,36,120,36,104,92,104,235,116,150,30,214,182,213,242,219,194,125,221,30,73,14,228,94,192,131,136,128,251,60,10,57,142,2,18,50,111,30,1,219,3,198,105,36,90,164,166,107,255,92,255,251,246,228,236,240,235,5,26,89,150,160,209,91,140,15,49,70,103,218,157,153,76,143,247,199,35,75,146,207,71,61,60,196,67,42,68,31,53,51,113,10,223,38,202,15,43,184,120,157,223,137,111,120,26,220,235,245,232,104,195,209,174,197,155,213,77,254,178,204,239,149,211,207,17,174,60,237,111,230,94,171,155,185,190,66,235,81,27,248,238,59,84,239,175,43,101,52,65,95,102,185,173,107,68,165,94,150,218,234,194,89,100,243,226,118,174,81,161,221,95,166,188,67,5,228,162,222,250,14,130,204,170,156,232,254,16,157,58,180,104,120,145,42,50,52,83,22,101,90,
+47,209,196,44,31,134,158,2,39,149,99,226,185,99,159,96,168,22,58,237,165,253,137,41,172,139,59,162,187,18,47,92,9,213,92,85,27,19,213,55,27,155,252,92,215,211,6,116,59,160,215,111,67,80,69,181,22,127,174,221,170,44,44,114,51,208,10,105,200,76,159,104,214,195,219,33,154,154,18,101,185,93,206,213,3,144,163,188,64,159,190,158,246,119,203,251,67,185,217,255,46,207,131,190,82,222,233,180,86,209,105,172,242,66,238,144,157,169,82,15,80,238,96,173,182,64,161,37,0,35,103,192,12,216,17,85,0,234,205,243,59,141,210,203,244,242,226,228,252,207,147,243,244,242,195,241,151,99,232,251,199,188,200,62,230,208,244,137,42,208,141,70,43,171,51,159,11,104,101,174,239,117,229,232,60,183,206,59,58,133,64,139,76,81,35,87,52,189,7,179,130,205,226,3,13,82,89,6,244,62,10,45,148,189,243,219,106,90,199,46,180,155,153,172,173,81,47,150,238,161,241,104,80,75,131,160,194,184,45,89,59,250,114,82,172,22,59,155,114,92,150,234,161,233,73,53,
+222,118,252,221,214,51,216,128,55,225,79,30,181,122,242,125,183,137,190,130,159,216,160,202,215,225,253,180,171,27,175,221,238,16,122,161,203,92,205,243,191,253,19,86,239,51,173,22,233,126,218,127,233,148,186,55,121,246,226,33,213,162,180,171,189,241,147,237,11,176,87,168,190,182,65,233,254,6,132,161,205,249,215,95,43,107,113,107,113,190,232,87,52,238,220,24,231,155,215,74,64,214,41,151,79,208,248,121,247,182,27,247,141,158,189,116,50,110,119,202,83,110,180,183,245,251,37,93,194,193,12,231,38,68,160,215,116,164,123,219,21,241,194,1,189,33,106,254,163,212,251,162,92,77,156,41,127,132,166,74,235,206,236,239,32,126,225,21,84,111,201,215,188,194,118,182,253,195,250,229,240,3,122,204,210,27,109,202,244,215,29,114,190,223,217,110,109,24,109,64,127,70,250,235,153,118,184,0,239,221,252,182,88,192,217,220,53,1,46,227,255,0,33,64,19,168,
+
diff --git a/uppsrc/Core/src.tpp/One$en-us.tpp b/uppsrc/Core/src.tpp/One$en-us.tpp
new file mode 100644
index 000000000..7a2645f94
--- /dev/null
+++ b/uppsrc/Core/src.tpp/One$en-us.tpp
@@ -0,0 +1,9 @@
+TITLE("One")
+COMPRESSED
+120,156,181,88,89,111,219,56,16,254,43,4,122,192,118,125,72,148,100,201,199,6,45,220,62,20,61,82,164,222,39,195,182,104,137,142,181,149,37,173,72,59,27,108,215,191,125,135,212,233,67,137,115,229,33,137,68,206,204,55,223,92,20,39,24,189,126,173,52,149,87,202,61,63,253,143,116,73,54,62,159,78,60,93,183,6,4,27,131,95,95,46,123,131,198,251,90,87,175,11,45,42,104,209,76,85,179,12,77,213,113,23,126,169,154,138,13,172,233,170,133,123,186,165,105,150,210,119,124,194,216,116,226,99,203,26,8,33,12,66,216,52,176,106,234,150,110,169,154,105,97,144,197,138,130,21,19,27,170,174,89,216,232,187,148,57,211,9,177,180,65,227,170,11,66,154,176,4,202,21,181,139,117,83,199,138,166,96,29,76,169,150,165,171,166,97,105,189,110,183,239,144,136,123,97,144,218,242,84,21,171,131,133,106,14,0,243,110,183,107,171,186,146,32,208,65,153,170,232,0,85,133,119,138,142,77,213,232,41,61,195,82,45,69,3,229,134,169,24,253,136,196,100,93,237,186,
+113,175,235,166,210,247,56,5,21,141,119,170,106,130,72,183,217,125,165,234,38,56,106,105,186,97,153,10,24,199,24,107,26,86,53,220,235,97,163,107,152,253,21,37,46,141,83,23,8,128,111,168,32,106,54,205,87,32,168,232,134,134,245,158,32,75,3,75,24,119,141,158,106,232,138,209,5,77,253,152,254,189,241,98,186,166,1,132,236,223,249,127,111,62,125,111,253,249,19,77,152,54,64,147,55,138,210,82,20,116,25,208,233,219,233,132,25,131,47,249,59,0,25,249,132,211,249,112,154,190,122,95,83,218,74,27,27,70,29,165,209,75,183,206,243,29,58,26,231,111,47,230,243,7,72,38,32,242,247,253,83,178,81,236,109,1,209,177,244,204,238,219,253,111,225,150,146,133,79,63,4,238,71,74,163,81,24,221,94,202,200,207,80,229,82,174,106,88,133,100,88,225,219,197,92,50,134,7,72,252,81,114,46,27,35,185,177,245,123,124,27,81,20,198,104,65,24,77,188,70,225,18,81,95,70,2,49,30,198,212,69,94,32,140,181,83,21,240,47,242,24,34,200,9,3,78,
+188,128,198,8,146,87,0,23,162,233,75,47,184,70,65,24,72,221,12,30,96,49,83,10,155,184,176,202,34,234,120,75,15,244,19,150,199,17,145,248,122,147,108,139,17,36,147,183,133,245,101,28,174,145,199,15,0,76,26,157,25,15,35,207,1,90,59,118,103,4,80,237,14,139,29,55,116,236,78,198,165,253,154,6,118,107,195,102,104,157,190,129,156,238,32,52,149,16,110,60,190,186,91,15,188,254,101,207,11,45,226,25,145,192,69,161,140,12,241,1,36,141,192,235,232,118,138,120,76,2,182,4,62,24,93,147,128,123,14,107,163,17,241,125,65,198,154,242,85,232,74,118,133,14,240,42,117,195,15,175,61,7,209,56,6,135,37,30,250,143,67,165,114,216,155,120,60,122,103,26,104,27,122,46,96,5,195,52,38,16,23,251,143,105,45,65,39,52,217,111,97,237,189,134,182,211,122,34,211,17,50,147,206,40,145,19,78,143,114,209,225,16,132,197,90,13,162,197,120,42,47,247,72,21,98,169,14,191,129,166,154,75,151,16,98,23,109,68,20,209,126,94,22,81,43,210,
+167,126,2,242,200,167,36,158,214,202,75,139,48,244,197,210,103,246,67,178,1,171,72,130,73,99,252,141,174,23,52,102,201,147,150,102,111,95,20,144,0,155,254,169,217,245,126,158,209,123,245,80,171,103,121,63,18,74,227,141,3,110,183,139,7,134,0,57,191,45,165,117,165,141,177,221,168,54,51,158,219,141,236,73,208,31,208,27,158,175,30,99,96,50,232,50,202,162,78,32,205,37,38,241,143,72,133,162,34,22,183,40,10,61,88,136,17,15,81,184,248,139,58,28,57,49,5,174,179,80,100,193,20,54,219,82,47,39,191,40,36,216,22,132,194,27,40,75,182,242,34,89,109,43,208,45,127,37,138,218,210,85,29,154,65,99,148,97,110,253,190,76,140,128,185,5,84,161,235,82,247,62,102,210,218,72,31,135,99,251,194,126,91,77,85,178,59,111,96,251,171,195,49,200,206,203,76,70,199,52,138,76,73,146,36,139,231,56,45,56,160,46,220,196,14,77,106,42,128,154,186,73,54,66,21,34,238,173,105,19,45,54,28,74,21,68,195,91,6,189,68,50,12,250,128,201,
+3,58,34,224,226,103,174,237,62,14,164,149,3,10,154,16,184,106,30,164,196,35,104,104,130,99,60,231,226,242,168,253,236,49,35,118,153,3,116,149,76,85,134,198,34,174,43,178,165,167,247,139,102,123,220,208,142,52,62,156,35,123,119,88,167,200,222,157,246,189,40,217,143,116,207,106,166,25,198,126,89,245,7,206,137,179,58,172,207,210,28,22,221,231,228,8,79,36,79,23,49,56,231,18,78,142,147,239,3,99,222,117,192,242,41,6,124,10,215,81,237,123,200,105,31,121,162,204,104,44,59,186,147,85,116,144,148,251,202,131,233,231,164,115,64,214,225,114,19,56,130,237,166,200,68,120,78,19,147,186,245,156,231,124,78,167,128,90,191,127,20,13,1,76,137,178,205,193,220,209,25,14,24,204,195,176,231,180,2,156,239,115,82,159,39,245,154,185,127,69,197,252,44,124,187,246,182,194,212,38,42,90,13,180,50,223,75,59,25,228,92,4,201,227,137,67,193,82,78,114,159,166,35,45,239,124,121,70,117,64,59,223,196,1,218,18,127,67,143,61,205,108,2,131,161,35,
+253,20,163,7,22,224,188,25,157,235,96,62,54,91,213,78,254,36,107,42,14,35,9,25,48,145,106,57,149,208,84,25,224,175,191,48,234,115,210,55,153,166,199,101,147,133,72,156,78,242,78,87,38,251,145,246,74,7,142,135,149,76,70,103,82,111,53,177,233,78,74,95,56,229,31,235,235,193,224,154,165,61,104,118,250,0,62,27,207,202,39,240,82,59,23,110,85,12,181,204,236,115,77,180,83,140,86,183,108,224,168,196,77,134,80,90,43,62,111,224,211,17,205,43,107,234,98,127,35,84,214,116,95,79,249,36,36,92,200,171,195,113,168,248,230,200,9,248,236,251,244,26,166,80,185,161,6,225,25,77,35,121,100,5,75,165,3,212,61,85,80,221,43,46,78,212,217,232,197,160,223,143,248,137,113,218,61,54,76,25,178,196,231,167,69,65,28,54,190,255,249,245,43,12,70,26,84,50,245,144,48,237,238,136,210,131,145,63,3,224,115,163,84,110,14,37,119,26,231,71,73,194,203,185,142,41,116,14,26,64,137,167,222,62,62,37,71,199,58,207,169,163,251,60,58,17,
+160,103,4,125,85,141,245,240,254,163,248,116,29,38,183,30,197,161,91,71,227,188,129,55,208,69,121,161,180,130,202,7,117,52,146,211,232,148,151,114,225,240,76,248,114,199,198,228,98,167,184,217,41,142,91,232,219,6,62,245,225,219,14,190,9,128,92,96,104,92,117,199,114,6,187,196,225,66,75,134,185,150,93,234,140,199,245,51,170,65,124,253,31,20,67,41,109,242,59,129,51,202,224,52,84,248,124,160,130,219,244,138,37,185,112,121,6,92,159,196,165,193,211,97,61,170,133,36,230,178,146,42,140,30,99,126,18,164,131,178,153,254,15,118,223,31,246,
diff --git a/uppsrc/Core/src.tpp/PtePtr$en-us.tpp b/uppsrc/Core/src.tpp/PtePtr$en-us.tpp
new file mode 100644
index 000000000..37ff65e07
--- /dev/null
+++ b/uppsrc/Core/src.tpp/PtePtr$en-us.tpp
@@ -0,0 +1,91 @@
+TITLE("Ptr and Pte")
+COMPRESSED
+120,156,237,88,109,119,218,54,20,254,43,218,210,246,0,13,
+68,146,109,108,76,150,211,45,221,190,180,107,123,90,122,246,
+129,3,88,24,17,180,26,139,73,118,50,78,187,252,246,93,
+249,5,12,49,77,211,179,174,233,217,242,33,216,210,213,189,
+247,121,238,163,43,193,144,162,7,15,240,49,62,194,183,252,
+249,79,249,156,165,81,50,26,10,219,246,250,140,58,253,119,
+207,94,246,250,173,39,141,174,221,4,39,4,156,88,46,177,
+60,199,34,54,237,194,63,98,17,234,80,203,38,30,237,217,
+158,101,121,216,15,35,166,245,104,24,81,207,235,155,200,20,
+22,81,215,161,196,181,61,219,35,150,235,81,88,75,49,166,
+216,165,14,177,45,143,58,254,140,235,112,52,100,158,213,111,
+189,238,194,34,203,68,2,231,152,116,169,237,218,20,91,152,
+218,16,138,120,158,77,92,199,179,122,221,174,31,178,85,34,
+100,92,196,18,132,80,210,159,18,183,15,41,95,95,95,119,
+136,141,243,12,108,112,70,176,13,169,18,24,195,54,117,137,
+211,195,61,199,35,30,182,192,185,227,98,199,95,49,197,150,
+245,200,141,15,231,86,232,46,246,69,194,193,69,235,49,33,
+46,44,233,30,119,143,136,237,2,80,207,178,29,207,197,16,
+156,82,106,89,148,88,180,215,163,78,215,113,253,5,103,51,
+174,10,8,12,146,111,17,88,234,30,187,71,176,16,219,142,
+69,237,158,33,203,130,72,148,118,157,30,113,108,236,116,193,
+147,175,248,31,169,80,124,201,99,168,216,251,201,95,15,127,
+126,209,126,251,6,13,181,213,71,175,18,133,88,60,131,79,
+254,104,52,212,120,103,4,101,37,66,144,236,42,98,9,215,
+104,165,228,165,152,113,196,144,94,50,149,160,149,20,113,194,
+21,210,107,13,70,40,89,176,4,214,112,166,248,12,53,96,
+169,184,136,225,233,197,219,231,207,155,232,106,193,227,98,193,
+12,201,233,239,60,76,144,208,8,10,154,168,52,132,193,14,
+26,152,245,75,246,14,34,137,4,165,154,207,211,8,137,24,
+105,145,164,204,84,80,27,47,138,163,72,204,121,208,78,196,
+146,35,57,47,157,133,44,142,101,130,166,28,210,228,161,208,
+60,90,131,119,72,111,41,32,139,78,1,239,183,133,136,120,
+6,114,23,92,137,77,239,66,211,199,25,17,144,104,178,40,
+249,184,90,136,112,129,216,108,166,81,204,67,174,53,83,107,
+52,79,227,208,164,200,34,145,172,81,34,247,160,234,78,30,
+83,166,17,12,197,144,90,54,111,12,11,3,131,4,66,5,
+109,40,179,184,132,133,201,122,197,59,232,141,52,54,134,20,
+96,61,143,31,124,15,174,130,54,155,70,60,248,30,173,101,
+138,244,34,243,11,41,101,217,50,112,22,103,212,228,11,166,
+76,115,0,114,37,146,69,6,163,140,144,207,50,195,54,212,
+214,232,218,208,117,140,120,231,162,227,23,124,229,213,65,191,
+72,137,124,227,252,20,158,206,80,240,190,3,127,133,137,249,
+112,250,207,198,129,31,248,96,241,19,68,27,163,225,67,140,
+219,24,143,199,27,134,39,167,163,205,224,147,6,238,224,14,
+117,156,38,42,218,192,198,124,82,177,178,209,160,50,115,54,
+153,220,217,3,54,57,87,231,252,122,31,171,116,26,137,176,
+206,9,42,32,141,114,180,45,52,108,229,17,39,163,205,166,
+177,80,57,105,62,105,31,148,44,42,210,202,121,22,240,150,
+109,194,92,75,187,130,137,57,159,65,69,64,236,102,110,87,
+59,29,84,184,135,208,231,25,39,237,15,3,16,135,41,240,
+158,101,110,55,78,228,74,132,80,142,147,224,228,92,42,30,
+156,104,21,6,39,144,174,17,206,3,30,7,237,84,7,71,
+149,122,153,199,60,203,109,1,79,128,133,167,133,82,230,74,
+66,195,130,1,52,42,12,42,181,223,74,160,172,122,77,205,
+15,213,107,75,116,181,218,213,90,127,194,74,83,36,181,29,
+247,235,214,238,86,184,34,146,156,6,149,163,46,30,54,102,
+199,168,206,21,144,194,182,178,218,243,245,171,188,228,102,111,
+142,81,249,180,49,60,61,148,242,233,1,18,206,38,181,178,
+83,135,100,103,84,161,87,208,253,230,34,44,91,88,231,83,
+197,131,6,133,82,151,169,206,250,232,172,82,253,108,239,15,
+206,62,71,97,170,84,88,249,216,8,154,31,211,151,218,234,
+171,68,232,23,203,203,15,240,224,27,70,12,135,141,102,129,
+190,184,149,64,147,141,243,174,37,75,236,7,221,12,130,86,
+213,211,96,18,180,134,173,39,22,90,193,91,233,246,188,116,
+167,179,22,158,145,38,226,11,211,150,11,170,119,247,159,157,
+83,157,59,105,127,56,15,30,7,143,55,39,229,141,131,225,
+182,12,51,48,229,219,163,106,178,217,204,164,120,11,30,77,
+238,146,184,105,50,154,153,227,51,63,59,205,137,1,99,202,
+24,214,129,120,185,51,89,166,11,59,190,178,43,54,251,196,
+220,1,13,147,21,173,203,21,87,12,234,17,180,207,70,59,
+118,141,230,182,209,102,128,70,155,232,39,232,53,79,82,21,
+163,75,22,165,252,118,38,145,84,217,85,3,137,121,134,119,
+38,225,48,55,55,130,205,73,203,226,117,29,235,159,1,227,
+250,155,66,81,166,61,1,185,223,147,84,209,94,247,29,239,
+180,67,80,115,29,235,63,108,12,26,59,133,201,85,90,206,
+53,71,133,254,127,204,46,160,230,146,118,181,211,11,247,180,
+253,106,127,234,6,15,65,43,129,243,252,159,134,80,119,190,
+101,5,57,120,68,29,142,112,11,3,31,221,219,135,113,31,
+0,12,221,90,240,120,86,119,200,78,165,140,106,207,231,45,
+1,95,142,2,246,241,83,123,207,243,158,130,166,123,236,125,
+37,188,123,89,221,13,210,93,200,186,39,120,191,92,125,255,
+67,100,124,13,41,127,235,66,253,238,190,232,244,223,41,222,
+29,225,254,95,221,123,208,133,178,43,252,114,197,148,208,50,
+222,64,187,113,15,185,121,235,203,130,189,73,20,92,246,199,
+249,13,48,127,217,166,107,198,170,188,13,100,157,69,253,93,
+49,255,102,113,201,21,124,175,96,145,249,129,110,46,213,50,
+251,125,46,251,78,148,57,66,48,134,102,130,93,196,82,39,
+230,187,104,170,86,82,115,125,248,178,49,224,127,110,111,137,
+163,191,1,237,13,110,211,
\ No newline at end of file
diff --git a/uppsrc/Core/src.tpp/Segtor$en-us.tpp b/uppsrc/Core/src.tpp/Segtor$en-us.tpp
new file mode 100644
index 000000000..ead40804b
--- /dev/null
+++ b/uppsrc/Core/src.tpp/Segtor$en-us.tpp
@@ -0,0 +1,16 @@
+TITLE("Segtor")
+COMPRESSED
+120,156,221,91,233,110,27,57,18,126,21,2,201,4,82,34,203,125,233,176,164,4,73,148,204,192,200,137,196,153,253,97,200,86,171,155,146,56,110,117,107,201,150,143,217,108,158,125,171,200,190,15,73,62,54,27,236,2,235,140,155,100,177,206,175,170,72,250,212,32,143,31,107,45,237,145,182,227,127,131,55,116,110,111,188,112,114,202,44,171,63,180,141,206,240,226,221,167,163,225,211,151,141,174,213,68,42,58,80,49,123,186,217,239,152,186,101,116,225,135,110,234,70,199,48,45,189,111,28,89,125,211,236,107,3,199,179,133,152,156,122,70,191,63,196,69,6,44,50,122,29,67,239,89,125,171,175,155,189,190,1,107,13,77,51,180,158,209,209,45,179,111,116,6,46,21,206,228,212,238,155,195,167,95,186,176,200,196,157,128,184,166,119,13,171,103,25,154,169,25,22,108,165,247,251,150,222,235,244,205,163,110,119,224,216,235,144,5,126,180,23,211,117,67,31,206,244,222,16,120,254,241,227,71,91,183,52,197,129,5,196,116,205,2,86,117,248,166,89,70,79,239,28,105,71,157,
+190,222,215,76,32,222,233,105,157,193,218,230,246,170,94,244,206,78,209,123,218,128,133,20,72,60,125,166,235,61,88,210,109,117,31,233,86,15,4,237,155,86,167,223,211,96,115,195,48,76,211,208,77,227,232,200,232,116,59,189,193,146,218,46,229,145,8,54,48,255,84,135,165,189,86,239,17,44,212,172,142,105,88,71,168,44,19,118,50,140,110,231,72,239,88,90,167,11,148,6,156,254,115,195,56,93,81,31,76,246,175,243,127,255,246,246,227,193,183,175,228,84,152,40,126,215,26,146,175,116,17,6,252,201,228,84,104,241,39,224,112,237,217,33,37,35,105,39,114,250,244,165,69,78,38,45,194,252,80,253,242,241,245,251,119,19,50,125,78,244,238,11,181,212,36,248,111,103,248,142,156,254,166,105,7,154,150,80,57,31,77,162,79,47,27,90,91,107,27,157,78,147,68,14,16,77,61,79,102,224,62,241,215,22,169,88,200,80,144,138,101,146,163,100,96,250,60,29,51,129,201,100,228,197,249,249,45,184,209,34,237,164,67,131,170,229,235,205,204,99,78,121,253,217,116,48,
+29,124,8,46,169,61,243,232,43,223,125,67,233,122,28,172,111,62,73,151,60,35,181,67,9,169,209,22,94,70,59,148,118,134,42,57,203,43,230,197,249,139,243,137,50,24,24,114,44,87,30,124,63,185,89,83,18,204,9,245,164,163,8,34,96,31,234,130,174,163,61,219,228,132,144,213,70,132,100,105,95,82,66,89,184,164,28,8,28,18,23,248,38,14,48,14,63,124,17,242,141,131,44,182,228,216,154,57,23,185,207,36,136,23,73,12,201,141,181,115,92,73,166,15,190,127,101,127,75,198,4,93,72,198,218,137,155,182,45,189,27,251,46,97,192,241,154,58,204,246,200,220,179,47,225,11,172,225,182,239,6,43,98,59,14,5,23,134,173,66,155,249,192,117,184,180,97,103,219,39,51,74,68,176,162,33,91,81,65,54,2,228,13,3,194,86,107,14,86,33,43,186,10,184,18,106,179,146,54,105,147,227,144,248,244,18,72,48,255,210,246,152,11,190,45,8,132,51,183,129,9,65,124,216,151,211,57,229,212,135,45,145,88,172,207,22,153,109,66,152,73,108,79,4,196,179,
+157,11,65,130,53,174,3,186,114,38,243,5,229,48,238,187,64,98,133,12,36,182,176,241,243,13,89,7,130,41,54,82,161,1,16,217,194,87,140,131,52,82,6,176,25,76,220,68,164,175,192,78,32,102,164,70,106,59,203,152,176,84,218,202,246,188,132,57,248,16,25,214,15,252,233,193,42,114,78,82,43,150,242,8,216,184,168,21,183,104,39,112,48,230,128,117,64,187,106,173,100,79,185,153,72,233,33,239,145,165,145,221,57,187,6,129,144,121,240,191,37,176,151,126,80,210,131,234,87,12,229,159,221,164,152,37,49,26,135,164,19,21,57,57,78,204,5,130,68,154,20,192,141,152,223,128,117,60,50,158,62,155,62,3,198,192,18,54,119,137,199,102,220,6,63,200,192,40,176,129,26,201,121,87,236,4,100,237,109,128,242,146,74,98,193,21,1,88,1,11,73,125,55,208,184,197,72,105,74,147,131,31,133,204,95,72,194,26,105,72,15,5,1,63,126,123,255,30,192,37,0,200,163,60,142,143,247,236,130,74,135,8,164,169,62,158,188,79,125,187,149,241,13,136,179,179,
+48,0,181,3,6,29,78,15,199,160,233,233,161,224,142,27,56,211,195,24,120,166,143,41,88,122,35,206,72,108,237,9,198,39,153,132,136,8,87,224,13,219,233,96,132,79,207,83,42,50,226,81,162,64,134,12,88,60,193,135,9,9,65,103,2,252,8,108,188,178,253,144,57,162,77,198,160,38,148,28,12,182,12,92,105,117,164,1,38,77,37,241,130,5,115,8,229,28,126,149,44,209,107,135,74,250,48,93,105,101,252,172,215,33,151,1,115,129,221,40,178,2,62,125,62,105,40,6,201,43,206,237,155,233,19,204,93,38,185,156,52,213,170,67,92,117,122,56,86,43,81,242,113,178,120,52,130,229,56,214,144,214,74,40,200,89,146,8,14,54,225,39,104,171,1,128,38,253,112,35,80,152,60,150,159,68,142,217,172,96,117,236,81,155,79,26,217,161,89,16,120,56,116,44,62,75,69,192,168,114,24,53,103,102,25,67,27,254,79,62,149,52,140,186,74,2,12,65,97,201,131,205,98,89,195,14,89,217,14,15,98,175,250,64,87,51,202,69,93,42,63,153,62,201,38,162,
+87,174,155,100,148,70,83,230,19,224,8,190,2,90,1,24,92,149,1,30,216,137,113,39,137,59,185,119,111,72,190,168,216,18,144,99,96,76,38,152,138,4,33,103,91,67,153,63,190,208,112,195,125,2,112,179,161,144,37,190,196,232,132,235,33,42,144,5,15,34,208,117,97,219,45,172,180,107,196,205,100,118,52,84,101,93,144,83,65,85,69,129,219,165,43,115,10,52,201,117,50,82,165,189,88,83,210,217,81,30,153,220,230,12,56,151,34,239,169,194,138,196,156,42,113,44,185,128,212,15,228,35,162,17,234,192,26,166,82,74,170,74,135,83,251,225,20,135,142,157,42,79,133,232,221,52,148,98,56,130,14,82,18,145,52,8,36,73,34,184,110,147,122,69,21,171,148,178,142,190,6,27,14,206,5,57,26,210,130,35,105,159,36,234,82,169,87,129,86,157,94,138,241,147,32,212,233,116,178,213,139,170,139,93,147,176,178,118,84,76,160,130,120,49,28,98,109,1,195,121,111,74,106,138,156,200,12,68,254,28,141,160,172,25,18,183,9,194,26,95,201,72,23,203,144,139,
+21,217,76,21,2,166,90,99,106,102,162,182,172,178,34,34,85,26,83,67,205,100,44,218,253,23,209,226,56,144,78,22,214,110,191,135,58,183,232,65,35,127,208,112,28,108,138,51,26,219,245,161,144,96,131,41,34,215,38,164,253,65,189,68,175,28,40,70,189,138,213,123,72,130,185,176,94,148,99,241,22,42,243,155,61,37,57,129,26,75,214,195,178,108,74,171,11,138,52,160,168,6,168,128,106,45,209,15,100,221,233,115,232,111,181,45,162,1,96,0,42,204,139,196,90,100,14,117,62,85,5,218,21,19,244,62,112,249,181,96,175,91,193,132,95,134,137,241,210,246,23,20,81,30,136,86,27,19,61,174,144,113,160,247,153,199,53,176,91,233,9,130,44,100,142,144,253,149,15,117,113,198,234,173,92,66,78,27,27,94,145,232,35,16,189,67,89,48,150,2,35,16,213,178,249,11,24,162,242,76,163,80,44,84,246,245,249,244,200,124,22,254,242,198,69,38,161,39,135,118,45,41,39,138,149,140,42,152,43,203,148,59,151,53,251,56,65,10,211,168,200,131,239,199,49,171,
+170,49,77,106,136,42,217,238,227,69,170,224,47,215,206,95,100,211,47,100,11,154,232,112,206,161,195,140,15,96,198,246,218,118,88,40,171,124,121,140,224,32,41,165,217,191,105,82,201,239,174,221,239,230,193,21,21,7,120,77,57,9,170,134,237,42,118,149,109,73,131,52,160,205,97,100,148,193,220,73,179,5,158,168,82,112,46,3,102,146,111,69,226,37,159,98,168,5,234,88,171,10,80,229,214,173,129,164,220,28,122,125,125,210,38,31,111,131,79,91,106,201,157,0,85,172,10,146,176,187,101,129,85,185,238,103,88,127,31,252,218,93,202,31,207,107,106,168,255,59,247,161,235,233,65,30,174,96,142,12,108,32,112,61,185,31,210,85,213,152,245,30,21,183,51,117,88,87,236,156,203,128,185,187,232,223,215,47,247,202,184,75,206,252,139,10,176,252,0,160,189,130,172,34,42,78,105,81,144,157,53,233,61,152,250,66,5,229,151,244,78,81,116,29,114,187,170,113,147,20,33,107,71,8,223,142,195,35,81,166,147,193,254,92,38,198,89,206,134,115,244,237,120,82,43,55,
+61,118,104,183,100,33,149,251,243,222,129,12,102,146,103,194,209,253,155,142,87,158,23,56,249,25,59,154,14,81,146,108,47,219,142,171,39,223,189,234,251,9,128,185,71,193,119,189,157,96,29,31,78,174,100,45,94,139,149,157,17,228,21,210,69,160,91,170,46,6,161,61,229,242,176,58,234,131,19,228,70,64,156,212,212,121,59,75,76,60,210,165,46,254,203,212,81,120,50,146,152,17,233,250,121,120,85,56,245,64,167,97,8,166,95,99,225,170,123,122,68,207,63,203,97,163,148,124,240,253,227,131,54,28,111,120,176,190,103,179,177,219,222,184,137,200,88,43,53,141,103,139,48,151,250,208,172,197,232,139,203,237,253,37,47,22,36,39,89,33,75,135,89,165,83,144,44,87,117,76,109,201,82,5,185,42,40,220,251,164,42,35,208,158,48,103,171,207,149,167,62,63,83,222,212,68,89,121,62,87,26,72,249,77,137,195,168,138,200,156,201,198,229,24,11,69,38,227,220,41,72,75,114,254,153,173,92,92,224,104,189,187,240,144,87,242,138,191,179,226,133,122,245,145,227,104,
+180,53,10,111,93,251,126,138,232,130,24,156,217,74,105,128,157,242,74,232,149,235,70,247,77,64,231,186,9,165,165,18,89,226,109,217,59,34,61,83,31,111,238,4,194,161,188,75,11,56,205,69,174,77,176,203,246,224,227,245,26,52,46,0,215,90,176,126,3,112,219,94,180,213,77,37,46,4,170,137,226,97,17,222,168,6,242,246,51,182,167,192,51,117,201,48,212,30,41,49,226,225,157,228,239,65,208,104,168,153,35,128,166,23,141,38,25,141,136,142,63,12,252,97,53,155,255,203,235,138,61,10,216,184,175,152,62,13,151,76,52,31,206,133,166,223,239,112,221,145,248,9,167,107,207,118,146,0,203,248,10,94,164,196,87,156,177,195,188,190,137,98,14,45,154,247,152,244,178,4,45,94,239,47,119,240,150,109,190,146,210,217,98,255,135,190,133,121,56,115,239,87,38,114,117,208,85,134,10,229,45,33,120,228,10,188,69,254,91,83,226,137,178,15,36,116,21,214,226,69,127,25,102,195,224,80,54,148,242,147,220,160,77,254,17,112,124,99,226,67,48,176,185,124,36,192,
+162,55,46,25,195,124,251,252,121,139,69,68,180,183,234,18,99,87,38,209,85,119,222,62,2,67,211,230,11,26,30,10,101,38,161,24,185,255,25,127,116,11,126,187,148,10,49,130,135,243,147,252,233,60,184,118,244,184,0,92,40,164,91,252,100,175,245,248,200,73,29,245,79,106,206,250,181,225,32,197,138,204,127,53,166,205,1,46,142,192,67,221,255,99,86,173,56,62,34,227,248,23,33,81,23,111,24,170,18,120,237,94,209,27,141,244,203,147,194,238,17,128,164,95,226,135,18,98,18,51,246,185,24,157,228,36,122,204,1,197,163,50,120,172,38,31,207,111,210,138,6,95,87,169,23,70,46,180,20,60,184,193,82,0,223,235,224,174,0,35,121,63,186,76,227,252,54,34,202,221,114,18,182,32,3,21,196,84,121,181,74,74,249,174,177,153,192,110,233,93,197,61,78,166,241,241,84,249,45,76,61,208,101,20,96,227,139,147,237,242,79,127,100,29,106,250,163,210,165,82,155,29,251,151,193,69,4,37,46,77,89,156,231,143,157,183,23,197,26,201,133,34,62,20,2,72,
+56,79,107,70,34,203,50,124,82,152,92,189,169,57,10,177,241,141,211,70,158,180,37,79,182,0,148,188,69,192,89,184,92,149,111,5,107,246,203,193,235,113,252,170,235,76,77,74,126,207,195,198,104,82,145,193,213,80,62,141,171,111,47,82,145,18,122,241,249,101,252,222,11,217,185,19,203,50,170,139,124,231,63,62,20,243,138,106,65,130,228,162,153,109,21,165,132,215,103,121,15,204,209,206,73,81,41,68,22,218,95,211,5,243,111,137,235,153,86,41,229,91,85,126,115,198,243,141,206,206,54,41,102,241,103,10,253,214,191,109,42,219,34,114,114,244,242,151,122,135,121,19,224,91,194,138,174,241,151,84,197,31,84,78,42,168,35,81,198,214,215,28,32,121,126,240,30,90,220,253,174,35,121,28,0,248,42,189,22,31,7,60,147,76,224,195,84,10,170,247,161,42,138,234,50,38,162,215,140,178,46,149,245,169,15,112,59,219,96,165,237,82,36,130,43,113,148,227,117,45,113,150,52,95,182,198,167,81,201,57,108,249,52,106,111,11,214,216,45,49,25,41,26,170,62,70,
+43,206,103,108,245,84,248,39,4,229,253,228,200,132,221,29,164,248,239,199,217,253,164,43,68,210,173,14,11,51,145,84,245,150,108,187,98,118,92,171,221,45,108,196,47,21,55,100,206,25,245,221,170,191,250,168,239,6,175,236,138,147,219,125,143,13,76,146,94,18,101,254,152,99,239,213,179,138,54,82,253,113,68,210,203,205,201,2,84,207,153,35,203,97,228,86,150,101,241,83,3,252,34,84,253,169,142,3,240,81,113,190,164,79,255,124,33,175,126,188,62,250,93,6,125,230,185,9,144,203,207,154,97,149,75,29,12,163,194,180,201,127,0,35,30,29,73,
+
diff --git a/uppsrc/Core/src.tpp/SerializationUtils$en-us.tpp b/uppsrc/Core/src.tpp/SerializationUtils$en-us.tpp
new file mode 100644
index 000000000..61b2e3b1e
--- /dev/null
+++ b/uppsrc/Core/src.tpp/SerializationUtils$en-us.tpp
@@ -0,0 +1,121 @@
+TITLE("Serialization utilities")
+COMPRESSED
+120,156,237,90,91,83,219,70,20,254,43,59,67,146,1,215,
+54,210,74,178,100,59,205,164,67,66,39,147,52,237,112,153,
+62,120,12,90,203,107,123,27,89,114,119,37,192,41,205,111,
+239,89,173,36,75,88,6,140,3,133,36,60,96,161,189,156,
+219,183,231,124,62,75,15,163,103,207,180,186,182,165,221,240,
+211,121,67,71,36,246,163,126,143,153,166,211,37,216,234,126,
+122,255,123,187,91,123,189,221,50,119,96,19,29,54,49,108,
+221,112,44,67,55,113,11,126,233,134,142,45,108,152,186,131,
+219,166,99,24,142,214,241,124,34,68,191,231,99,199,233,74,
+201,24,22,97,219,194,186,109,58,166,163,27,182,131,97,45,
+214,52,172,217,216,210,77,195,193,86,103,72,133,215,239,17,
+199,232,214,14,90,176,200,144,146,96,115,77,111,97,211,54,
+177,102,104,216,4,81,186,227,152,186,109,57,70,187,213,234,
+120,100,22,177,48,72,101,49,93,199,122,119,160,219,93,80,
+249,203,151,47,77,221,212,148,6,38,108,166,107,38,168,170,
+195,59,205,196,182,110,181,181,182,229,232,142,102,192,230,150,
+173,89,157,25,225,100,90,109,185,220,195,186,209,116,91,235,
+176,136,194,22,181,159,116,221,134,37,173,122,107,75,55,109,
+48,212,49,76,203,177,53,16,142,49,54,12,172,27,184,221,
+198,86,203,178,59,19,74,134,148,167,38,16,80,190,166,195,
+82,187,110,111,193,66,205,180,12,108,182,165,179,12,144,132,
+113,203,106,235,150,169,89,45,216,169,195,233,223,49,227,116,
+74,3,136,216,63,167,255,62,127,251,177,113,124,136,122,194,
+232,162,67,202,25,241,217,103,34,29,132,226,136,249,44,98,
+84,188,232,247,132,214,53,144,252,180,186,239,81,239,185,166,
+53,52,237,196,237,184,157,195,136,83,50,61,65,234,179,159,
+14,33,247,197,105,246,252,90,67,127,16,239,147,222,202,7,
+183,251,107,238,96,32,145,191,175,163,252,245,182,214,212,154,
+216,178,118,16,147,198,84,46,100,249,251,157,190,212,31,47,
+172,164,2,25,216,109,12,88,132,134,36,34,117,20,2,48,
+166,236,51,11,198,8,222,141,66,142,244,150,26,63,35,126,
+76,69,19,189,27,169,71,196,4,200,68,110,195,192,118,203,
+78,63,16,39,193,152,214,229,90,24,22,153,148,33,34,2,
+97,52,152,71,84,128,140,104,66,249,57,19,20,181,212,43,
+68,56,69,177,160,195,166,84,207,236,102,222,173,237,37,102,
+55,46,149,95,170,70,25,140,190,1,205,81,20,46,196,229,
+19,107,187,232,128,70,49,15,148,202,48,87,36,54,121,19,
+194,2,176,177,249,164,195,170,223,121,37,190,130,136,239,210,
+244,117,87,26,63,156,182,137,211,214,93,105,254,112,247,255,
+227,238,117,87,90,203,229,101,143,248,190,72,157,159,36,92,
+74,188,9,10,71,176,205,144,157,177,97,76,252,188,238,192,
+206,116,76,57,74,104,4,141,40,23,171,178,114,65,157,65,
+24,250,185,216,98,192,63,132,100,184,34,220,82,169,129,84,
+233,4,229,143,249,212,151,183,67,198,171,18,52,178,122,83,
+225,186,53,0,86,30,92,148,232,41,225,81,46,67,209,17,
+78,69,20,114,218,68,75,37,47,41,161,156,206,96,6,176,
+26,40,184,131,121,110,101,19,237,51,46,162,58,146,127,196,
+51,25,7,47,230,28,230,129,112,18,81,249,66,86,127,89,
+178,103,148,67,188,166,178,98,7,67,148,72,27,202,50,63,
+165,211,144,207,155,232,104,66,3,53,89,10,244,193,219,48,
+62,226,225,20,65,81,71,98,70,61,54,98,116,152,90,149,
+176,5,165,180,100,20,5,57,34,246,60,42,196,40,246,209,
+118,16,38,97,131,25,111,57,151,96,185,240,104,194,79,229,
+196,104,194,195,243,96,167,158,76,129,189,100,53,135,183,60,
+166,201,230,165,133,249,244,140,128,120,36,30,79,34,233,11,
+57,175,190,80,60,117,100,170,122,234,23,47,156,205,19,179,
+75,162,70,196,23,180,146,152,228,225,111,92,102,174,150,49,
+73,28,81,10,219,40,14,60,249,80,185,139,10,255,18,199,
+89,166,46,210,230,228,0,121,68,114,166,212,131,155,28,150,
+67,233,131,111,228,180,148,28,46,200,217,218,135,228,209,68,
+56,61,36,231,20,148,157,241,16,78,164,63,207,78,98,38,
+124,177,211,6,121,114,31,176,191,207,252,187,33,64,25,179,
+70,140,11,90,121,97,32,162,10,181,10,51,38,132,47,38,
+184,181,130,140,81,81,227,83,247,231,211,143,199,31,62,228,
+56,56,22,50,209,244,78,162,112,198,60,176,98,215,221,221,
+3,207,185,187,130,123,238,110,9,37,199,240,221,78,184,207,
+104,224,54,98,225,110,73,147,165,87,220,237,220,90,55,183,
+210,125,229,214,243,231,157,19,85,102,86,230,19,25,34,169,
+230,253,97,42,113,66,227,82,70,47,128,170,249,240,89,227,
+40,252,129,156,34,114,18,167,220,10,58,42,233,46,160,35,
+115,85,126,176,159,38,106,80,68,167,51,31,102,158,190,172,
+138,136,106,107,45,197,204,68,71,249,219,87,167,85,177,92,
+151,229,29,157,20,182,44,215,141,139,205,170,206,42,138,251,
+48,137,6,157,179,104,2,100,70,205,222,118,95,244,18,139,
+234,160,229,145,219,233,228,205,156,29,217,102,41,195,193,203,
+57,224,187,64,53,94,208,121,200,135,162,142,212,30,146,37,
+229,201,43,22,170,239,35,22,253,33,32,126,209,36,92,52,
+102,0,71,50,110,141,203,163,249,44,33,142,225,224,47,234,
+69,18,139,25,57,173,0,222,5,44,56,160,35,168,104,129,
+71,51,220,170,149,183,108,249,60,57,136,174,226,86,79,7,
+163,105,74,59,2,32,86,37,176,251,197,228,15,68,222,75,
+210,188,134,242,173,9,204,175,85,148,101,33,90,93,148,55,
+207,178,153,197,43,179,109,162,125,162,161,91,203,50,110,238,
+166,135,202,188,37,218,248,104,80,159,196,230,91,224,11,215,
+83,214,111,16,249,5,131,111,13,252,162,147,30,38,187,23,
+72,239,134,152,255,174,16,159,113,2,112,88,194,9,224,115,
+53,234,127,17,87,102,172,137,251,69,135,69,238,38,178,32,
+174,14,87,210,65,83,50,175,86,204,123,138,223,114,112,148,
+120,121,60,35,117,209,87,188,138,84,22,60,154,220,148,213,
+155,205,194,180,78,122,186,14,63,55,114,202,3,85,93,74,
+151,187,201,119,217,188,132,165,206,223,166,205,113,19,205,56,
+61,99,97,44,22,45,172,193,188,12,204,157,175,93,211,110,
+100,113,183,130,198,29,78,61,42,124,180,186,232,87,63,28,
+16,31,77,195,97,236,19,126,37,75,138,120,54,11,121,148,
+174,248,173,114,14,36,74,130,206,24,25,64,122,12,85,67,
+92,222,165,100,221,116,48,97,196,198,49,87,147,193,93,100,
+54,243,165,98,240,167,72,98,207,68,148,182,221,167,36,152,
+43,77,146,43,252,8,65,146,14,207,69,241,62,38,221,118,
+215,87,29,245,52,168,32,111,204,206,104,128,198,202,154,178,
+208,79,84,53,204,137,47,194,43,202,75,125,124,95,122,104,
+146,246,51,101,69,145,89,195,95,163,127,121,22,178,97,229,
+169,57,160,99,176,142,114,229,228,189,68,171,229,179,115,47,
+165,186,112,20,148,14,34,25,151,149,112,149,147,174,41,53,
+239,211,209,167,231,135,43,95,82,51,150,177,232,249,85,72,
+49,208,159,19,26,236,251,177,152,108,226,207,186,66,211,72,
+238,179,32,28,55,59,249,202,232,66,23,200,57,147,228,190,
+40,109,173,165,207,50,93,81,56,3,20,21,174,176,36,172,
+151,52,18,229,203,51,153,228,178,180,82,12,141,64,110,3,
+146,36,75,166,199,130,202,251,175,115,121,165,150,146,175,52,
+103,76,192,118,200,100,3,138,232,133,60,211,44,130,252,9,
+137,107,60,166,124,89,167,146,50,143,174,174,41,147,30,41,
+237,206,177,39,181,205,201,77,82,202,86,99,79,113,31,145,
+220,207,166,87,135,138,250,8,121,95,3,233,84,1,224,97,
+122,131,171,171,103,161,174,173,46,137,75,213,243,86,171,210,
+99,181,183,50,207,61,42,190,124,155,60,90,58,127,143,29,
+172,101,42,14,65,187,177,238,60,26,112,220,177,204,85,39,
+211,138,56,109,210,46,45,252,83,164,204,241,149,78,205,169,
+238,174,116,199,18,155,185,190,109,40,141,239,255,7,34,217,
+24,27,
\ No newline at end of file
diff --git a/uppsrc/Core/src.tpp/Stream$en-us.tpp b/uppsrc/Core/src.tpp/Stream$en-us.tpp
new file mode 100644
index 000000000..faffaec39
--- /dev/null
+++ b/uppsrc/Core/src.tpp/Stream$en-us.tpp
@@ -0,0 +1,33 @@
+TITLE("Streams")
+COMPRESSED
+120,156,237,93,11,119,219,54,178,254,43,184,219,110,87,118,45,89,79,219,177,187,247,198,117,156,174,79,157,56,199,78,55,123,110,174,109,210,20,100,113,67,145,42,73,217,201,54,237,111,191,51,3,144,4,72,144,122,250,145,212,187,167,142,36,18,192,204,55,15,12,6,175,247,109,246,237,183,205,141,230,55,205,41,255,219,125,193,7,246,196,139,207,223,187,221,238,206,158,221,238,237,125,248,249,228,217,222,250,243,218,86,119,13,107,105,65,45,157,237,86,103,167,215,105,117,219,91,240,167,213,105,181,123,237,78,183,181,211,126,214,221,233,116,118,154,187,142,103,71,209,249,123,175,189,179,179,135,133,218,80,168,189,221,107,183,182,187,59,221,157,86,103,123,167,13,101,219,205,102,187,185,221,238,181,186,157,157,118,111,183,207,35,231,252,189,189,211,217,91,63,221,130,66,29,108,9,42,111,182,182,218,221,237,110,187,217,105,182,187,208,84,107,103,167,219,218,238,237,116,158,109,109,237,58,246,56,118,3,95,182,229,182,90,237,214,222,85,107,123,15,104,254,227,143,63,
+26,173,110,83,80,208,133,202,90,205,46,144,218,130,223,154,221,246,118,171,247,172,249,172,183,211,218,105,118,160,242,222,118,179,183,59,182,67,123,84,206,122,111,42,235,219,205,93,55,230,80,197,250,247,173,214,54,20,217,218,216,250,166,213,221,6,70,119,58,221,222,206,118,19,26,111,183,219,157,78,187,213,105,63,123,214,238,109,245,182,119,135,220,238,243,80,178,96,3,241,235,45,40,186,189,177,253,13,20,108,118,123,157,118,247,25,130,213,129,150,218,237,173,222,179,86,175,219,236,109,65,77,187,33,255,117,226,134,124,196,125,16,217,111,151,191,255,245,240,117,253,151,51,246,62,234,236,177,179,56,228,246,40,250,238,252,61,251,237,183,103,207,58,187,250,127,61,248,111,107,247,217,206,246,46,32,220,193,63,91,240,167,221,26,52,247,174,59,157,189,159,94,123,173,237,205,118,47,132,191,221,24,254,52,175,240,207,243,237,122,27,170,111,238,93,196,193,216,117,172,93,107,211,218,60,8,66,110,109,70,161,99,109,138,70,173,111,185,111,213,39,145,245,13,188,176,
+43,127,131,79,164,23,146,176,139,150,252,112,190,187,235,53,177,37,252,19,55,55,91,189,43,252,243,188,93,111,81,75,12,94,72,63,132,64,12,144,178,217,164,95,90,233,179,165,63,173,146,91,215,191,54,240,156,254,42,56,79,191,62,36,255,43,227,250,21,31,229,89,78,127,2,126,211,207,95,153,176,129,175,83,176,94,3,235,217,207,130,253,236,251,253,67,176,50,118,127,156,12,6,60,204,115,171,254,10,204,170,95,191,50,113,255,232,5,206,135,2,251,217,143,200,125,246,237,43,99,254,165,235,241,60,239,217,111,192,122,246,229,43,228,252,200,215,185,62,242,37,199,71,254,87,225,192,145,149,147,73,172,51,9,63,72,46,225,211,87,195,230,254,120,204,253,190,206,169,248,77,50,43,190,220,23,191,171,139,60,220,255,20,12,52,251,13,163,142,244,203,87,33,203,131,96,4,17,123,129,101,237,103,224,90,251,126,63,140,255,254,59,68,221,88,137,248,167,67,255,246,246,126,126,14,53,253,181,217,172,55,155,207,107,205,70,179,209,238,245,214,152,28,44,37,191,
+195,96,131,93,38,95,147,16,25,203,183,69,117,237,36,178,103,110,196,226,33,103,87,118,196,69,37,44,24,48,219,243,216,47,214,247,214,247,44,18,241,127,67,22,210,126,100,215,220,231,33,188,251,137,69,60,188,225,204,245,89,124,27,176,190,139,125,55,140,38,88,24,120,60,218,21,101,221,86,175,185,119,2,236,236,71,216,154,235,176,208,190,101,87,174,111,135,159,146,26,55,216,237,208,117,134,80,145,227,77,96,40,199,98,254,49,134,111,227,73,204,108,191,207,130,73,12,31,27,134,10,101,53,60,116,109,207,253,143,141,195,57,22,219,225,53,143,55,163,96,18,58,188,193,222,14,129,215,145,237,250,64,175,207,121,31,106,15,160,97,80,15,54,240,236,107,104,166,239,58,80,210,191,206,213,211,135,193,145,131,159,18,20,142,124,22,132,48,218,194,10,108,103,232,114,224,61,128,33,228,200,246,216,152,135,131,32,28,217,190,195,17,201,43,138,99,120,95,114,8,175,1,98,88,23,240,138,184,143,130,40,102,3,28,129,33,94,217,83,54,180,161,82,155,121,110,
+28,123,32,30,55,134,87,129,82,7,244,208,67,50,161,74,23,62,210,168,77,178,59,180,99,214,231,208,52,176,54,14,177,46,248,58,112,125,151,30,3,49,55,110,24,79,128,198,17,143,135,65,31,40,176,73,248,159,216,104,2,84,56,65,136,124,2,58,118,255,223,248,67,20,140,56,86,20,195,175,208,92,223,142,109,40,58,186,226,33,41,137,80,32,196,21,24,28,32,113,200,80,142,40,120,143,170,17,77,50,199,246,217,21,114,225,71,110,159,112,177,25,216,85,140,239,185,126,12,216,217,128,91,70,245,174,102,2,235,7,207,123,236,38,112,251,140,37,246,186,251,102,18,215,160,36,115,214,148,119,172,223,148,47,245,207,238,160,54,142,67,246,3,187,13,61,119,180,166,61,171,127,182,214,225,33,233,181,245,119,230,236,105,79,185,23,241,252,235,151,216,164,179,166,190,104,253,174,124,81,62,34,97,25,169,111,121,56,170,85,144,25,242,120,18,250,76,144,26,246,129,84,246,63,140,168,99,187,204,186,20,197,231,111,246,39,30,47,214,42,97,130,45,83,13,51,
+54,188,213,213,90,126,19,68,181,53,146,119,60,149,132,254,45,88,21,73,202,170,75,195,89,99,64,194,56,136,76,141,107,126,17,190,38,222,238,77,170,177,137,178,130,114,166,238,78,83,207,115,165,38,205,179,94,96,79,64,220,92,8,103,74,159,203,252,43,16,120,94,70,68,35,113,187,128,68,106,136,130,57,242,151,96,50,194,53,52,74,221,60,17,115,245,41,230,146,22,252,152,35,197,90,79,137,17,117,39,244,100,116,164,100,144,157,161,235,186,226,215,174,239,163,191,75,73,90,21,17,32,196,89,40,112,38,33,245,19,228,225,55,133,119,167,154,87,69,7,233,115,41,37,56,156,6,15,59,114,227,6,123,191,206,64,93,207,19,71,37,84,50,98,55,182,55,129,126,104,16,6,163,68,106,224,52,189,0,64,131,127,161,144,98,55,231,171,162,154,220,84,41,213,239,66,55,230,10,217,224,142,22,37,91,52,148,39,59,85,226,164,191,56,47,198,27,232,133,83,122,83,75,0,134,201,61,166,79,106,134,162,174,31,27,74,118,216,109,250,235,90,98,51,7,16,
+92,128,29,95,125,202,243,9,150,227,96,196,66,125,158,162,55,216,193,248,65,140,125,12,245,236,248,38,106,186,128,160,38,25,255,111,112,244,130,245,181,6,59,74,122,50,118,107,251,49,5,5,19,168,89,20,1,227,192,126,26,3,7,209,112,52,12,38,94,63,233,33,161,62,105,110,27,18,212,115,138,83,224,179,2,109,55,117,11,224,191,144,207,250,231,31,145,214,36,252,88,4,127,51,136,77,217,77,100,248,155,161,164,119,140,88,138,88,139,160,4,166,17,74,120,108,128,79,40,252,221,193,167,24,20,194,183,190,9,198,74,157,4,105,54,32,248,79,252,151,1,197,137,15,25,39,254,85,247,170,236,160,240,92,240,101,247,111,48,72,235,175,22,125,244,33,83,192,87,221,204,151,140,125,136,222,147,60,76,121,39,118,199,174,132,226,10,67,217,178,202,51,31,11,118,136,241,108,250,104,35,165,140,92,53,133,34,23,34,34,49,58,171,8,70,193,69,127,245,194,149,17,180,83,226,184,26,194,123,71,16,246,94,97,142,143,122,94,49,118,65,114,76,238,130,200,
+172,127,86,122,205,178,55,137,166,250,103,28,160,207,44,135,89,184,45,232,245,35,197,89,49,172,6,43,71,178,28,185,114,141,87,134,206,208,37,159,194,192,85,232,251,42,213,253,140,243,15,69,140,149,72,84,15,66,53,152,48,2,45,160,132,21,146,83,184,118,111,184,159,58,64,147,234,96,121,212,49,229,13,53,142,201,168,215,98,22,163,50,205,26,53,3,199,32,176,51,69,190,226,133,218,90,22,88,11,251,46,23,11,150,166,33,230,234,157,207,153,78,219,188,2,49,235,237,190,23,227,120,132,252,165,36,61,231,59,205,138,249,154,223,210,199,149,114,248,210,155,68,67,67,103,117,148,224,201,134,16,43,218,254,39,49,50,247,161,122,209,99,68,172,230,185,31,184,146,170,95,219,128,120,135,252,26,176,35,122,32,226,51,96,39,103,43,165,249,192,11,34,110,160,153,126,143,202,70,82,157,106,181,85,26,190,10,2,175,92,95,143,162,147,49,247,75,213,181,172,99,74,2,252,191,103,138,221,172,80,234,56,132,206,213,77,133,0,29,120,0,173,78,183,201,169,
+196,31,134,97,16,46,110,108,9,93,28,171,129,136,35,98,220,119,130,9,234,6,102,135,38,33,101,206,242,105,46,208,91,74,133,1,11,248,220,133,112,61,100,158,13,17,200,129,199,237,144,104,34,55,142,131,126,81,181,19,244,101,4,228,91,245,255,240,48,88,1,239,39,63,47,206,248,127,73,232,106,107,101,186,60,163,67,209,4,48,215,216,200,81,250,214,191,171,15,154,38,183,31,39,150,160,0,106,242,46,14,48,119,168,191,177,56,115,199,32,211,28,131,21,36,129,107,32,37,56,57,179,234,209,152,59,238,192,117,228,163,90,112,21,219,174,15,58,197,27,215,13,236,219,127,82,106,23,186,2,129,241,59,215,239,180,81,153,224,51,20,244,3,252,128,61,216,199,53,153,235,149,204,139,148,35,249,176,49,140,143,69,184,240,147,148,198,43,30,69,246,53,103,131,137,239,204,214,245,169,50,50,118,105,75,154,89,50,94,33,234,173,58,73,134,253,47,88,65,146,160,230,104,25,226,241,50,34,203,204,207,232,79,225,97,148,87,159,74,92,22,232,252,223,4,209,
+242,56,149,140,251,86,224,46,131,193,226,212,81,82,156,217,240,31,200,138,50,247,87,114,200,127,85,50,114,130,22,153,237,69,1,19,126,86,14,12,131,129,89,210,43,193,255,152,15,226,197,89,196,28,70,4,236,196,183,28,162,203,194,48,28,7,147,200,30,199,121,155,180,55,67,39,255,235,196,133,58,240,101,128,67,198,128,181,53,124,148,36,140,151,115,69,252,195,161,223,47,186,217,217,2,183,144,123,243,250,218,234,12,4,214,8,93,225,13,9,191,0,72,131,157,217,35,142,73,57,164,187,166,160,241,61,22,92,51,185,109,36,49,11,214,17,55,57,180,7,213,242,56,206,224,133,8,50,68,56,208,162,169,255,156,23,78,48,181,85,192,185,20,106,249,215,139,192,137,169,134,169,184,157,38,21,7,131,65,196,227,101,176,89,52,211,233,20,33,129,170,40,84,186,246,164,167,160,188,37,50,46,179,155,229,99,4,71,218,226,12,156,148,229,173,74,114,134,111,104,0,73,228,144,183,18,9,42,41,160,44,135,134,113,93,81,60,71,52,182,49,56,193,8,37,173,
+85,133,250,74,61,77,224,80,61,253,13,230,243,107,33,37,242,54,24,13,138,212,182,204,215,149,123,164,25,82,130,139,227,100,206,238,225,52,130,46,188,2,90,27,143,18,170,172,31,82,219,184,75,139,120,108,9,187,98,54,78,89,148,64,19,222,179,90,225,220,105,186,215,19,156,156,164,4,32,73,26,74,208,24,186,12,254,217,50,117,143,43,79,39,44,163,2,221,52,8,42,40,224,84,120,101,98,28,62,133,220,225,212,83,64,61,243,131,142,70,80,97,40,249,18,182,131,185,3,239,147,48,158,154,23,220,226,83,165,195,69,42,104,61,71,132,67,141,247,235,73,227,133,160,102,87,95,214,14,146,179,106,41,214,214,218,174,38,120,177,214,251,66,174,249,158,93,244,15,32,61,92,16,194,252,28,108,132,150,92,107,4,161,223,117,60,148,75,72,128,155,134,62,11,63,143,191,57,14,236,254,219,97,24,220,170,160,152,199,157,105,135,58,194,244,2,77,184,196,88,50,162,74,160,188,24,94,242,143,14,167,221,32,236,118,8,97,45,62,19,15,92,116,198,55,193,
+7,112,171,114,41,145,76,83,196,159,198,48,44,243,104,149,129,190,112,104,66,67,203,169,249,201,89,25,45,27,172,189,17,75,142,162,52,197,80,59,60,61,61,57,181,46,143,79,246,95,28,189,254,201,186,124,185,127,116,124,248,66,155,49,130,208,39,209,86,21,68,193,85,13,70,200,234,175,16,87,137,188,250,218,70,25,90,36,91,120,187,48,130,54,112,169,142,188,242,42,188,239,121,95,164,3,75,71,113,73,95,46,167,240,184,31,76,174,135,226,101,45,12,217,48,234,22,171,201,169,64,70,94,104,228,94,15,165,158,194,128,42,131,219,24,223,62,152,143,76,50,131,114,35,81,191,96,253,152,44,76,235,88,56,244,218,41,141,189,236,98,244,245,0,50,193,145,24,77,184,74,63,151,172,131,116,36,73,180,140,42,153,160,154,18,154,81,129,44,230,179,234,173,229,176,107,109,149,130,215,218,178,234,184,190,80,132,143,57,240,144,235,49,12,152,208,193,176,52,81,71,43,28,99,86,227,46,226,42,23,41,90,117,24,217,186,54,174,141,4,19,185,78,190,174,221,
+191,77,20,49,213,120,92,14,201,78,187,20,201,78,251,235,71,82,227,177,50,86,157,146,27,32,48,149,39,121,48,183,186,95,63,152,26,143,203,26,184,103,154,24,155,209,196,41,44,211,225,26,81,226,249,225,49,90,169,233,86,96,52,213,120,31,49,70,171,54,202,10,152,166,154,229,35,134,105,165,230,118,181,164,185,41,190,232,209,0,180,82,91,171,0,104,38,91,123,140,0,173,218,208,190,70,140,102,178,178,57,146,26,199,174,95,142,146,140,251,61,120,167,24,247,99,73,228,173,207,105,181,180,152,249,181,254,102,253,159,111,253,141,57,67,59,180,157,88,100,111,148,121,153,129,11,245,213,146,60,43,132,9,88,32,84,11,68,148,167,117,175,125,92,96,92,1,196,177,137,168,165,140,234,151,120,80,62,8,146,80,76,226,129,85,223,161,181,25,125,224,216,168,62,21,68,255,34,138,207,234,1,170,50,193,234,152,35,29,140,139,113,120,233,48,252,215,210,28,173,238,84,87,16,255,25,70,192,191,166,139,91,167,101,99,103,132,64,29,44,204,49,65,84,142,130,
+238,21,190,16,20,212,40,127,190,233,195,114,32,244,56,228,11,1,66,15,210,239,192,38,76,129,215,253,232,185,137,177,213,106,250,67,241,166,135,195,119,166,191,15,197,158,30,201,222,129,78,22,98,148,251,81,72,19,87,171,85,200,7,97,76,143,25,239,76,27,31,132,55,61,188,153,67,104,101,11,42,236,92,80,116,147,80,91,189,234,218,73,24,83,103,166,30,108,70,28,227,206,146,25,15,195,162,127,41,80,92,246,195,32,86,29,185,62,237,21,143,40,196,214,89,103,53,122,75,14,20,80,128,49,55,119,132,184,57,224,44,173,97,21,162,94,4,147,170,49,131,245,221,229,76,184,156,105,56,168,131,5,249,4,151,139,66,251,184,2,85,128,152,133,253,143,0,153,233,6,176,49,251,126,53,40,134,203,183,75,177,82,231,84,116,197,201,230,183,179,153,158,216,29,113,35,68,201,250,36,29,160,252,75,68,9,174,206,26,115,92,193,131,95,151,4,178,185,24,146,149,144,144,70,204,5,136,152,43,190,177,67,215,78,230,73,229,25,20,227,48,184,113,113,136,118,
+197,29,27,247,237,225,185,2,205,13,65,1,24,1,254,6,46,108,4,174,120,226,198,159,112,169,91,19,139,171,135,39,68,236,245,47,199,199,108,156,78,249,5,141,198,156,240,46,233,220,222,45,108,201,183,104,89,16,98,204,228,223,86,168,214,118,50,66,208,164,69,100,68,172,150,132,47,89,122,64,236,165,94,203,73,188,114,196,49,255,80,163,204,143,148,200,241,56,93,66,17,169,75,40,22,95,52,100,16,227,195,8,41,157,208,93,72,70,115,76,19,149,73,161,114,250,92,80,80,37,153,215,57,106,103,90,90,36,25,211,214,22,45,191,142,226,79,40,211,135,92,126,17,153,247,150,38,138,81,174,7,203,57,224,131,240,120,144,9,58,239,236,14,78,173,250,241,75,54,182,221,48,23,247,46,233,247,15,21,213,43,180,90,148,143,245,23,153,94,197,76,173,245,151,60,45,71,49,10,65,37,54,72,118,248,164,117,225,242,42,17,145,192,59,129,220,235,147,62,158,178,186,78,108,72,11,66,235,7,248,127,237,240,4,28,232,100,100,88,100,135,167,125,37,231,101,
+153,98,203,38,75,106,250,225,7,131,121,201,138,47,152,252,80,180,133,183,202,2,145,72,174,96,23,112,54,146,66,73,252,153,70,96,164,40,27,248,184,145,150,79,200,192,179,186,112,17,155,60,29,202,191,225,190,139,171,139,111,237,79,8,50,255,56,14,113,75,128,104,34,49,1,48,50,151,14,162,249,225,135,180,162,104,201,112,75,79,211,223,223,72,199,22,201,127,58,76,195,176,197,4,152,196,184,42,90,219,147,24,200,147,140,12,198,139,155,172,172,122,97,208,244,64,184,172,98,180,179,58,108,206,86,1,69,73,127,52,131,217,153,123,164,5,182,98,227,150,158,163,215,111,183,186,214,229,171,253,127,205,187,72,208,241,92,231,131,86,151,242,176,219,124,182,85,33,9,52,106,9,122,214,15,74,177,76,205,72,160,8,142,166,44,145,150,203,247,94,217,31,221,17,56,145,252,26,188,52,172,100,242,120,118,153,13,201,208,96,35,110,131,211,185,29,6,158,190,164,87,116,193,133,93,21,202,126,38,112,72,50,127,96,140,141,8,182,108,187,190,140,171,96,124,211,
+167,85,179,78,48,254,164,172,3,126,73,125,57,79,142,251,83,117,174,137,107,122,213,37,182,209,100,60,14,194,120,119,9,197,196,189,171,98,77,171,161,67,163,21,196,90,240,33,185,246,68,145,44,57,182,120,235,103,224,125,231,108,61,18,69,102,109,189,52,80,60,138,74,88,159,117,107,58,38,174,231,67,162,130,150,18,32,230,160,101,78,92,42,164,34,148,140,159,218,183,37,94,139,78,243,210,14,242,90,229,114,228,146,72,58,165,43,162,149,200,59,34,102,166,5,189,236,21,5,171,34,144,85,131,219,138,136,24,119,97,7,202,210,94,197,102,205,251,89,178,35,51,113,76,91,24,30,97,101,242,164,200,217,198,72,169,107,194,146,155,149,167,97,173,64,108,166,57,141,251,22,89,50,206,249,114,101,38,207,150,187,47,161,149,99,127,223,162,75,38,128,158,68,55,135,232,38,50,62,155,228,2,180,251,22,94,50,195,245,231,16,222,252,195,217,191,86,142,81,180,78,91,15,204,251,149,208,99,65,145,253,190,242,248,202,113,167,121,58,81,55,161,157,180,91,145,
+116,179,214,105,139,6,133,157,56,10,158,150,60,93,33,136,218,240,118,30,16,177,224,19,136,2,196,200,189,246,185,201,17,172,0,103,81,247,19,220,10,150,19,255,46,1,79,106,127,130,92,213,240,33,12,104,23,211,95,44,249,4,227,28,154,187,56,214,169,234,62,129,94,50,49,52,15,154,120,98,253,19,132,179,235,237,162,56,167,90,251,4,120,138,37,158,138,190,16,152,116,156,250,19,136,179,107,237,194,72,167,106,251,4,121,134,230,0,248,88,204,11,80,201,39,24,5,140,253,96,114,165,44,240,158,7,71,81,244,79,13,100,249,20,220,156,221,255,86,247,9,199,146,92,217,92,158,242,9,202,165,38,206,21,40,229,114,188,85,64,41,142,169,197,9,85,250,149,182,15,250,128,143,251,101,128,188,121,111,32,179,9,46,121,97,167,199,135,116,211,25,46,93,73,206,18,29,219,206,7,49,95,140,75,44,145,81,113,142,212,253,201,37,122,108,114,41,83,254,119,137,96,222,45,33,153,119,79,250,63,77,255,87,130,243,147,5,204,183,140,200,118,202,110,201,48,
+206,20,233,162,112,171,227,57,44,41,151,197,8,49,72,172,233,114,71,120,69,44,87,73,22,25,68,35,60,138,92,76,203,52,216,63,197,244,76,179,1,12,116,9,72,121,3,149,29,101,56,69,244,45,219,87,177,193,2,218,155,42,231,118,64,218,184,48,199,245,89,79,76,141,223,159,104,221,74,209,222,149,25,205,148,210,168,22,154,200,100,44,36,178,199,129,237,227,112,104,171,203,64,85,139,43,151,129,250,51,203,109,22,119,247,202,190,118,157,121,252,157,42,137,145,86,184,244,52,243,143,219,253,173,237,110,127,251,202,36,47,235,47,84,139,224,79,44,220,230,126,52,9,213,53,105,252,58,116,227,79,13,246,14,79,204,148,203,193,228,221,99,233,153,196,114,186,27,251,49,103,200,169,35,179,234,108,228,130,100,99,103,40,61,159,60,239,24,228,138,66,79,37,107,146,141,224,13,151,59,166,212,173,190,91,153,109,6,220,180,116,97,182,146,87,11,151,156,178,225,111,166,249,250,121,75,242,133,75,14,22,46,121,189,112,201,236,106,35,147,90,219,116,0,42,174,
+64,131,26,184,237,39,61,112,18,115,37,55,71,42,125,245,147,122,125,205,234,245,164,36,127,26,37,121,18,245,23,38,234,39,129,61,136,192,158,96,95,2,246,39,240,238,4,130,230,94,110,99,167,252,84,163,189,156,235,201,240,183,182,38,155,62,192,205,117,225,196,129,113,100,163,120,29,128,220,252,146,59,182,159,142,192,199,129,10,157,246,224,241,27,142,27,39,251,220,143,109,113,95,203,62,140,69,199,201,181,236,105,230,78,28,11,40,207,213,111,178,77,58,154,161,154,120,235,15,149,124,235,15,3,3,47,120,74,191,94,149,249,95,80,17,45,29,32,101,113,113,161,46,215,243,236,40,205,73,94,92,40,91,14,47,112,77,55,229,35,245,52,2,190,180,171,190,150,85,54,158,92,121,217,32,83,173,45,97,69,144,183,206,18,101,80,234,199,129,97,178,5,14,247,93,211,137,23,50,33,138,137,50,224,26,111,80,24,241,190,59,17,123,222,210,75,120,47,226,96,236,58,192,234,166,181,121,16,132,220,218,140,66,199,218,148,120,126,203,125,171,62,137,172,111,116,
+188,137,115,150,98,179,9,228,190,0,209,223,112,113,13,206,249,123,248,129,153,233,95,200,2,213,235,66,239,102,239,167,182,114,62,53,184,148,131,100,255,152,186,249,48,221,114,152,109,67,76,32,7,157,143,176,136,27,103,91,205,202,109,164,145,238,206,18,205,169,107,225,15,242,13,46,227,200,14,160,130,216,116,6,168,120,16,49,62,26,199,159,116,205,42,240,114,150,164,146,138,124,76,201,171,205,112,70,233,41,165,47,12,20,138,236,80,146,217,197,246,149,157,180,230,12,146,168,171,140,168,52,135,119,41,42,170,220,35,151,82,150,187,82,47,115,68,41,96,133,239,53,101,119,252,186,209,43,168,130,0,61,70,47,149,136,34,154,91,8,242,78,97,240,128,82,218,11,80,76,214,148,253,108,125,55,3,11,84,230,50,41,144,138,117,189,212,182,210,30,37,117,93,183,110,60,84,140,41,177,181,2,243,21,189,77,202,60,121,140,170,219,61,170,13,235,238,186,133,87,124,180,226,62,65,186,114,209,37,164,93,0,244,8,34,31,140,155,118,70,124,20,132,116,242,145,
+27,71,9,176,143,161,31,144,234,152,130,162,127,169,161,39,179,214,173,13,16,187,166,130,5,16,25,189,170,108,134,42,232,221,6,234,142,166,150,230,155,106,20,181,124,175,54,132,247,225,101,186,41,1,21,187,145,102,219,202,164,108,63,86,5,96,222,124,126,150,159,48,154,166,144,41,161,11,234,36,30,45,179,10,189,204,0,211,85,19,235,183,234,1,158,215,37,65,48,105,231,178,154,169,233,145,80,78,21,152,41,250,169,211,94,84,209,12,163,226,15,194,255,177,10,133,45,34,156,56,205,63,185,234,46,174,183,63,226,109,82,119,230,77,149,218,153,59,26,123,124,4,140,71,234,149,236,62,231,56,23,3,8,141,108,31,3,108,1,82,36,60,48,142,98,146,25,175,144,139,57,51,58,57,66,189,7,75,76,159,197,96,7,126,63,24,137,51,33,112,104,164,54,46,15,184,139,164,204,112,104,151,144,35,186,62,236,195,38,206,80,59,5,40,35,152,102,252,220,16,143,196,146,151,38,69,242,206,56,58,190,137,122,221,236,254,49,120,2,202,115,20,81,7,74,125,
+47,134,18,94,16,241,243,13,105,179,62,191,45,84,8,47,161,130,195,59,240,137,206,234,72,11,211,201,12,216,22,106,198,249,194,182,253,35,49,159,55,111,245,215,233,22,174,190,157,51,242,52,46,196,147,131,46,173,223,52,123,59,61,220,127,97,24,200,227,163,3,120,246,246,176,228,225,254,155,55,135,175,203,74,98,165,239,78,143,74,11,191,62,161,167,103,255,216,63,45,123,229,197,225,241,97,245,27,175,79,176,153,170,55,232,217,171,253,179,159,179,152,220,250,93,59,101,137,206,82,234,243,129,235,163,14,218,145,235,100,70,64,97,23,233,147,170,177,53,58,146,196,9,70,87,116,255,60,169,152,188,237,13,175,2,16,206,131,220,170,82,10,191,34,177,187,154,87,33,232,49,152,7,3,82,14,208,53,21,22,162,208,139,75,241,212,63,147,78,78,171,65,200,75,175,65,202,176,254,121,127,60,198,35,90,40,206,196,41,87,58,228,69,30,115,230,198,16,137,150,93,193,12,16,210,37,137,233,213,8,110,60,5,2,18,124,17,7,161,45,245,207,135,190,200,147,
+68,147,171,8,15,204,244,227,212,243,12,38,96,237,182,227,224,89,85,233,113,69,21,173,169,74,166,55,168,169,95,253,243,11,55,42,109,52,57,18,199,120,254,142,169,85,69,111,245,70,85,133,174,228,19,247,134,115,143,199,124,182,6,21,51,200,115,153,217,199,84,38,201,139,79,191,131,34,117,142,90,26,98,234,233,145,228,63,11,73,142,217,206,102,82,54,48,24,243,140,21,183,61,142,227,208,80,118,225,203,30,21,79,250,38,73,237,53,18,119,114,84,232,183,196,226,6,173,51,65,235,233,75,31,46,156,188,188,150,157,224,55,244,157,89,108,163,26,32,38,187,140,39,2,216,177,122,235,123,213,155,8,205,148,131,44,167,220,1,121,154,158,103,27,201,51,155,180,2,197,76,195,153,242,90,229,241,149,5,37,155,37,1,36,58,230,59,210,177,71,117,39,53,168,97,166,126,139,106,159,252,69,170,95,105,236,118,103,250,87,140,196,167,233,219,89,94,203,86,165,57,122,16,183,160,6,221,149,156,52,47,97,247,255,61,137,68,119,155,216,92,41,192,5,43,197,
+208,182,88,74,1,81,193,170,200,250,243,218,86,119,77,231,95,252,148,203,114,22,145,20,175,213,214,178,33,137,176,166,50,136,146,116,104,114,150,28,209,74,148,55,216,235,32,78,239,101,198,83,178,105,145,223,85,118,141,106,172,31,67,135,244,64,185,218,154,8,106,146,122,36,142,40,6,58,203,29,43,224,114,248,1,138,56,240,38,209,144,78,89,198,219,179,244,177,100,209,171,29,20,201,92,114,54,224,8,66,174,18,53,156,190,156,15,34,184,50,95,51,85,135,241,90,43,235,114,86,77,22,129,33,205,216,33,80,106,140,172,77,28,164,83,101,226,232,226,60,80,249,53,123,200,64,253,243,171,146,251,36,20,18,33,106,53,86,184,248,33,123,114,8,85,238,5,166,194,15,54,102,206,95,208,44,139,173,217,32,57,62,31,232,47,79,87,36,213,213,63,211,125,233,74,97,165,204,116,11,22,100,11,59,212,104,55,90,112,17,133,42,11,174,238,234,13,100,78,75,153,40,122,180,72,222,228,37,40,200,42,210,38,106,254,69,207,157,28,96,251,226,54,119,188,6,
+78,137,151,23,26,250,235,193,188,28,249,107,24,76,27,248,231,40,205,37,247,50,64,114,223,100,90,15,143,85,193,180,94,170,40,90,114,175,8,103,146,217,195,114,185,204,30,226,225,219,35,213,1,81,141,90,190,65,243,80,169,125,160,223,139,84,64,233,164,70,221,135,212,236,72,14,213,169,135,84,248,54,78,134,164,212,72,235,193,131,148,169,191,229,244,168,194,249,32,49,197,89,191,133,241,220,192,170,172,203,248,62,129,221,96,178,81,237,21,219,201,90,203,47,245,222,234,118,139,94,63,29,238,208,57,218,201,73,221,141,21,73,77,76,127,37,199,127,191,57,57,59,250,87,50,190,15,177,103,55,30,162,191,42,177,230,35,87,128,6,123,148,124,235,51,75,63,159,22,55,9,184,144,235,142,251,214,229,16,80,240,76,61,174,142,185,132,124,63,194,189,17,17,227,31,221,136,230,138,9,125,81,7,246,187,89,179,198,160,80,105,176,254,249,165,82,20,32,12,16,31,194,80,169,133,197,246,7,76,130,221,250,60,132,168,104,156,134,172,162,220,124,24,77,5,168,
+100,214,126,226,35,109,160,64,57,238,42,187,62,209,107,165,83,225,105,35,234,186,164,249,123,182,183,133,35,101,145,180,25,59,98,36,255,173,59,226,178,47,78,190,86,118,199,197,23,204,228,42,145,51,244,33,177,85,151,105,43,87,216,71,164,235,132,129,49,120,113,201,248,73,37,117,238,165,44,41,54,5,88,114,203,89,98,195,137,249,15,212,125,180,231,232,62,230,60,233,120,209,101,65,179,29,149,111,232,80,86,51,206,144,189,206,69,210,253,152,179,45,79,221,80,170,30,237,249,186,33,179,111,249,199,254,235,23,199,135,210,171,136,47,149,62,229,31,90,151,51,101,128,46,174,216,208,250,33,179,7,81,186,147,135,166,217,208,119,206,71,243,180,81,74,214,17,45,58,72,57,242,213,199,243,15,80,148,238,83,31,159,156,209,252,40,27,114,15,186,62,153,63,162,148,73,200,113,249,44,205,155,42,253,59,24,67,168,77,64,45,50,138,209,187,124,209,166,6,209,148,49,76,142,25,67,64,113,228,43,159,244,80,59,31,84,28,41,142,179,60,164,246,115,110,70,
+247,35,184,55,19,97,81,151,225,169,214,239,39,186,131,134,95,22,4,233,52,87,210,105,90,232,32,98,159,242,144,231,17,117,39,171,6,179,58,246,162,64,245,22,23,255,78,200,81,14,38,222,61,27,239,73,118,81,201,131,91,239,173,62,251,251,56,205,23,0,83,63,86,27,240,137,122,13,204,50,22,140,208,44,101,193,121,178,171,73,45,172,173,86,140,217,15,0,239,226,40,102,134,149,227,15,111,211,119,27,223,45,43,182,199,238,43,196,218,138,71,227,46,108,125,169,71,114,151,221,192,118,98,185,238,67,243,41,98,129,75,225,94,31,125,209,71,126,80,148,132,237,155,186,211,96,37,236,24,12,79,128,150,251,86,237,53,116,156,23,119,28,58,70,139,251,14,51,11,83,201,254,170,35,129,133,176,173,184,219,231,22,79,147,56,89,210,196,23,55,111,156,230,184,187,21,239,56,122,177,61,121,195,149,182,7,42,177,215,126,192,197,49,38,242,14,9,241,38,78,144,111,48,90,143,76,55,68,136,249,185,56,136,161,178,252,141,95,234,141,92,143,112,229,162,216,
+208,145,162,156,251,150,219,126,82,16,134,201,152,160,123,1,175,231,4,37,22,180,208,2,2,235,114,209,59,185,111,115,214,82,61,197,92,37,188,149,236,62,83,182,36,5,100,180,180,12,4,240,194,174,36,221,38,54,161,21,27,152,48,22,250,38,78,161,186,31,139,59,8,70,99,59,124,32,163,139,98,90,234,60,72,143,28,34,120,160,227,197,115,137,8,29,55,164,93,170,118,232,70,217,229,119,244,22,148,178,125,113,144,215,178,51,134,247,96,114,26,204,197,31,116,195,51,202,196,220,145,57,184,216,186,175,151,48,245,159,83,219,207,182,234,124,55,11,45,201,187,250,108,88,238,45,147,179,136,244,26,153,140,224,197,141,132,169,160,115,187,187,114,185,118,165,119,75,154,164,203,50,229,74,9,81,143,8,180,86,186,174,105,117,110,41,237,196,117,48,76,40,208,218,164,59,68,98,182,91,2,15,127,5,176,242,170,88,125,71,32,110,37,208,220,42,139,2,232,101,67,38,14,159,138,135,160,185,216,241,42,12,79,89,42,91,152,122,42,163,189,146,62,201,76,186,
+59,147,157,255,63,212,16,186,157,
+
diff --git a/uppsrc/Core/src.tpp/StreamFn$en-us.tpp b/uppsrc/Core/src.tpp/StreamFn$en-us.tpp
new file mode 100644
index 000000000..aa1fbcbb5
--- /dev/null
+++ b/uppsrc/Core/src.tpp/StreamFn$en-us.tpp
@@ -0,0 +1,9 @@
+TITLE("Stream utilities")
+COMPRESSED
+120,156,237,88,237,115,218,54,24,255,87,116,125,59,194,2,147,100,27,27,220,219,117,75,187,93,175,187,118,215,100,219,7,142,4,97,139,162,139,177,169,36,39,100,203,250,183,239,145,108,94,2,230,165,163,107,239,210,242,1,3,210,243,250,123,94,233,82,244,232,17,62,198,15,241,142,87,231,57,31,178,60,209,189,174,112,221,32,100,212,11,47,95,189,105,135,245,103,181,150,123,100,184,16,224,226,248,196,9,60,135,184,180,5,111,196,33,212,163,142,75,2,218,118,3,199,9,112,39,74,152,82,189,110,66,131,32,52,68,20,136,168,239,81,226,187,129,27,16,199,15,40,208,82,140,41,246,169,71,92,39,160,94,39,230,42,234,117,89,224,132,245,183,45,32,114,140,36,96,142,73,139,186,190,75,177,131,169,11,162,72,16,184,196,247,2,167,221,106,117,34,54,209,34,75,75,89,130,16,74,194,1,241,67,208,249,195,135,15,77,226,226,66,3,23,152,17,236,130,170,4,126,195,46,245,137,215,198,109,47,32,1,118,128,185,231,99,175,51,97,146,141,55,155,238,237,
+52,221,199,29,161,57,176,168,127,71,136,15,36,173,227,214,67,226,250,96,104,224,184,94,224,99,16,78,41,117,28,74,28,218,110,83,175,229,249,157,17,103,49,151,165,9,12,148,175,19,32,245,143,253,135,64,136,93,207,161,110,219,56,203,1,73,148,182,188,54,241,92,236,181,128,83,71,242,247,185,144,124,204,83,128,236,239,139,127,30,191,120,221,248,253,20,117,149,19,162,83,45,57,27,163,92,139,68,104,193,213,147,94,87,225,208,65,230,233,133,175,80,247,49,198,13,140,207,251,157,126,7,238,138,244,221,57,42,158,189,242,8,93,204,62,61,195,232,215,140,197,5,203,249,113,173,183,194,3,14,207,209,202,165,254,147,5,23,7,137,116,126,112,212,51,154,208,16,189,5,251,21,210,35,142,84,161,178,210,76,106,208,3,93,11,61,178,7,81,46,37,216,136,38,153,18,6,111,4,70,37,246,132,167,49,18,10,1,93,52,226,49,98,240,85,114,157,203,84,161,152,105,6,2,75,163,154,70,154,27,206,204,174,159,20,218,52,110,11,125,231,199,245,239,65,33,
+195,0,93,177,36,231,112,225,36,75,181,17,158,13,75,5,155,27,92,249,172,134,155,184,73,61,239,8,13,178,44,169,116,227,41,187,226,135,187,49,203,245,252,228,24,245,214,229,71,89,170,244,186,2,219,192,190,43,193,56,111,29,170,63,37,196,119,233,89,157,45,187,99,197,179,70,193,198,237,155,92,79,114,189,229,154,149,210,184,125,94,242,187,54,236,183,32,113,38,115,142,196,16,49,0,223,234,112,205,37,68,77,30,69,92,169,97,158,36,55,150,5,160,101,184,45,34,106,19,96,214,29,34,213,45,247,28,217,71,37,100,39,217,228,230,112,200,160,188,85,97,182,63,3,37,163,77,244,59,76,112,32,28,242,84,175,195,9,150,137,25,156,67,153,65,230,101,185,140,184,113,158,81,87,164,204,38,219,22,252,140,81,128,223,94,151,141,1,144,110,133,136,205,215,10,93,27,183,175,243,241,128,75,147,117,131,27,19,116,160,84,4,72,108,9,143,85,10,22,233,156,153,160,136,172,157,247,46,10,86,113,156,167,197,50,150,149,53,117,189,158,22,233,242,153,81,
+223,13,161,69,46,222,138,220,30,110,51,232,45,85,204,218,82,235,41,90,133,154,240,72,176,196,148,173,69,193,130,70,50,145,92,129,159,140,223,76,69,205,18,94,94,105,34,91,179,238,84,27,104,67,37,33,131,170,20,11,53,73,216,141,233,73,96,198,8,70,139,72,115,169,76,67,42,89,109,111,57,86,216,30,229,107,143,214,109,26,236,169,142,95,166,149,30,48,205,55,75,57,74,4,188,129,227,69,106,92,176,136,35,219,127,247,214,216,82,31,142,215,107,145,172,38,219,70,208,74,167,235,17,211,102,20,96,201,53,187,177,126,126,169,94,216,158,205,52,183,131,129,18,227,9,84,3,64,38,98,50,94,202,151,37,24,133,222,98,100,255,193,79,9,139,46,209,8,44,237,63,248,68,232,152,193,234,103,145,240,245,178,178,187,159,47,223,128,16,91,92,232,215,151,106,198,16,184,167,108,204,215,11,135,145,173,102,8,207,135,28,227,215,33,164,157,37,172,202,233,57,195,198,173,209,28,153,207,251,13,80,115,142,7,140,79,159,217,89,159,115,190,50,230,149,253,
+152,21,184,24,117,80,45,187,226,242,186,152,189,248,84,152,178,251,238,232,163,129,249,239,115,151,46,231,46,171,204,53,104,86,53,114,109,130,21,193,70,4,149,80,243,139,167,85,142,44,86,197,53,172,92,116,54,255,245,135,139,53,7,239,174,32,217,132,75,166,51,249,248,144,118,173,42,162,224,252,236,124,73,183,187,247,167,21,144,114,9,69,74,252,85,244,201,153,86,77,116,90,20,35,145,94,101,151,0,235,180,57,187,200,107,234,40,156,99,113,98,61,1,163,239,205,196,86,231,43,6,183,6,137,157,209,6,208,32,102,68,113,101,239,93,95,111,150,78,167,112,250,199,78,118,235,209,160,208,48,147,38,133,68,58,219,171,14,170,245,51,159,60,125,250,169,161,250,84,53,161,2,214,55,144,145,9,84,207,197,86,8,80,130,251,238,160,108,188,250,142,235,162,241,64,141,101,10,210,39,147,151,77,244,114,253,110,174,184,245,236,152,65,54,197,51,166,229,68,82,251,45,215,195,202,148,87,251,236,89,211,213,100,71,253,134,109,127,75,131,137,25,90,54,111,79,
+247,41,20,190,1,253,149,0,253,241,77,250,162,255,228,91,56,220,215,112,184,147,247,247,30,102,97,183,161,25,178,102,104,3,168,140,154,51,232,239,29,190,59,91,252,85,38,226,175,170,242,79,50,1,171,151,52,129,176,16,11,161,48,226,83,22,195,150,55,134,245,217,98,126,223,98,225,27,210,255,27,210,95,120,159,251,34,19,195,199,173,124,191,36,217,96,241,191,212,122,36,53,209,9,244,96,133,126,84,197,244,97,221,62,45,254,162,130,99,94,108,254,240,204,19,189,210,146,103,188,231,164,16,185,202,240,22,208,188,13,150,145,229,124,150,149,199,99,174,71,153,141,235,233,2,248,213,157,50,190,19,76,213,51,192,193,65,186,127,220,245,254,5,95,252,57,124,
+
diff --git a/uppsrc/Core/src.tpp/String$en-us.tpp b/uppsrc/Core/src.tpp/String$en-us.tpp
new file mode 100644
index 000000000..657f5f8f4
--- /dev/null
+++ b/uppsrc/Core/src.tpp/String$en-us.tpp
@@ -0,0 +1,19 @@
+TITLE("[W]String and [W]StringBuffer")
+COMPRESSED
+120,156,221,92,11,115,219,54,18,254,43,152,164,205,73,142,162,35,37,202,146,237,100,38,169,155,118,58,77,219,155,216,173,103,206,163,68,52,9,89,152,80,164,74,80,114,156,155,203,111,191,93,128,15,240,77,74,242,35,215,76,109,89,36,128,221,111,23,139,197,238,2,151,3,242,221,119,90,79,123,170,213,252,119,252,35,157,155,107,39,152,94,50,195,152,156,152,131,209,201,167,95,255,56,58,57,120,221,57,52,186,216,139,14,189,12,199,250,112,50,26,234,198,224,16,126,232,67,125,48,26,12,13,125,50,56,50,38,195,225,68,59,182,28,147,243,233,165,51,152,76,78,176,209,160,55,120,58,24,143,6,250,216,152,24,19,125,56,158,12,160,237,64,211,6,218,120,48,210,141,225,100,48,58,182,41,183,166,151,230,100,120,114,240,254,16,26,13,113,36,232,92,211,15,7,198,216,24,104,67,109,96,192,80,250,100,98,232,227,209,100,120,116,120,120,108,153,171,128,121,110,56,22,211,245,129,126,114,165,143,79,128,230,175,95,191,246,117,67,147,20,24,208,153,174,25,
+64,170,14,223,105,198,96,172,143,142,180,163,209,68,159,104,67,232,124,52,214,70,199,43,211,55,151,229,172,143,106,89,31,107,199,44,160,208,197,193,115,93,31,67,147,195,222,225,83,221,24,3,163,147,161,49,154,140,53,24,124,48,24,12,135,3,125,56,56,58,26,140,14,71,227,227,5,53,109,234,3,11,134,126,40,136,29,247,198,79,71,163,145,1,239,27,198,104,60,49,6,67,144,141,49,52,0,10,67,63,26,25,71,163,193,177,75,121,64,237,217,11,9,155,100,63,38,28,233,198,158,38,189,201,211,67,227,240,72,7,244,141,163,177,161,29,29,234,227,33,130,167,3,236,135,67,99,112,52,138,123,10,165,246,159,143,255,253,254,237,239,47,254,60,35,151,124,120,66,102,151,23,179,233,89,224,51,247,154,152,174,173,254,253,195,122,62,167,254,179,233,37,215,210,239,49,78,76,178,49,157,53,37,162,83,18,44,204,128,88,158,27,152,204,133,103,46,49,125,223,188,37,222,156,88,11,0,221,10,168,207,73,199,243,201,213,109,64,57,97,46,177,76,78,241,185,
+236,177,219,39,191,4,216,45,112,203,174,93,106,147,192,35,11,115,67,201,220,228,216,243,10,58,91,81,223,68,101,224,125,114,190,160,133,67,64,15,95,168,239,17,248,99,201,92,19,216,238,135,35,144,149,239,109,24,116,79,92,207,157,189,88,174,3,243,202,129,78,44,139,34,253,208,164,184,203,184,253,198,244,153,233,6,132,7,158,15,189,76,200,21,11,10,185,235,246,200,205,130,250,212,228,228,34,193,11,155,225,71,253,80,52,92,187,204,242,108,170,14,20,226,28,254,82,37,32,241,150,72,251,212,65,182,144,226,176,115,129,61,167,254,6,168,130,49,35,206,174,68,211,176,215,215,29,173,175,245,7,163,81,151,148,124,33,53,250,242,123,77,123,161,105,41,97,91,222,114,233,185,100,73,131,133,103,243,105,97,251,209,201,175,199,51,248,247,70,182,193,143,239,233,210,219,208,89,135,185,193,172,135,63,186,199,81,247,74,227,141,199,236,105,52,234,199,232,211,107,141,200,230,241,163,206,52,223,22,58,45,104,58,36,102,242,117,143,180,104,103,121,107,245,201,236,
+149,250,80,143,31,116,5,4,131,147,144,68,30,113,117,16,119,65,168,67,151,84,232,138,233,7,98,98,5,100,229,113,134,218,171,190,14,148,170,98,47,64,241,140,6,91,67,8,109,239,23,191,133,95,4,210,202,49,45,69,209,43,176,32,55,44,88,164,224,132,30,107,0,58,247,217,82,34,212,14,28,108,183,43,58,49,147,128,52,23,6,196,93,47,175,128,197,140,221,115,168,123,29,44,186,56,103,91,9,255,103,26,188,19,77,103,157,89,23,172,43,15,142,21,2,35,42,20,66,197,82,150,98,51,238,34,253,74,167,27,191,68,68,199,211,114,18,78,81,167,119,162,224,84,157,88,85,4,8,125,9,214,190,91,142,102,13,100,191,240,183,203,85,112,91,73,238,149,231,57,229,244,134,61,52,36,247,204,92,82,180,186,17,151,157,46,153,189,154,189,34,90,13,157,63,49,215,86,39,246,118,216,98,47,25,66,167,13,26,166,166,170,124,152,76,244,234,134,115,223,91,102,158,166,237,164,150,126,90,39,102,51,177,5,170,152,9,253,123,109,58,153,9,131,68,147,
+107,88,88,241,5,175,248,29,65,95,15,159,206,94,232,132,205,97,181,15,200,28,36,99,215,8,228,61,221,128,118,209,253,200,69,233,236,161,197,211,78,0,151,255,36,224,101,128,37,110,32,9,199,187,185,15,57,60,22,17,220,25,144,219,160,164,168,169,32,134,156,207,14,30,198,146,192,218,86,170,170,130,148,143,179,203,155,217,20,97,200,218,141,3,165,27,254,48,250,206,215,87,92,122,185,40,179,68,46,200,149,186,132,43,143,248,221,217,32,41,213,187,23,168,4,166,184,41,185,95,113,109,183,122,68,171,46,50,217,1,1,130,184,58,184,239,226,61,49,68,183,5,206,103,179,103,15,130,243,235,212,38,43,253,210,236,217,199,199,138,117,63,118,40,59,42,222,164,102,23,131,251,32,126,193,208,147,109,172,222,213,110,90,210,229,163,211,242,156,73,172,245,117,253,53,69,59,17,154,34,88,59,196,198,145,231,55,68,149,118,169,110,43,89,40,132,111,8,255,58,13,77,72,234,128,98,198,102,161,206,26,228,113,65,155,240,48,184,108,109,21,90,98,163,78,227,
+58,124,222,186,246,126,167,110,212,225,255,227,196,165,192,219,126,167,109,17,252,223,12,242,117,106,25,17,212,106,194,102,17,217,101,186,238,130,200,157,77,214,20,42,109,166,234,169,67,77,31,99,31,173,66,97,162,85,252,164,19,71,181,48,14,194,168,12,197,72,13,175,179,164,11,248,244,169,245,248,178,89,1,1,239,169,189,182,128,128,37,93,122,254,45,89,115,106,147,171,219,104,182,129,211,189,100,46,91,174,151,164,195,217,23,74,60,32,119,201,190,136,28,65,29,82,239,169,136,152,111,19,57,12,155,38,244,78,243,141,203,130,135,138,133,73,162,135,255,130,237,132,227,120,150,137,169,17,234,122,235,235,69,196,50,102,65,60,199,206,217,146,14,95,81,0,163,13,199,63,208,107,230,86,198,197,118,157,253,26,17,99,100,166,82,147,13,25,192,5,219,169,48,9,51,103,62,87,50,43,245,198,224,142,153,122,155,115,240,91,179,4,171,2,106,44,166,166,106,216,121,103,242,234,88,235,238,252,224,16,187,50,228,152,170,136,112,171,155,231,20,23,198,0,19,97,
+196,132,255,93,47,149,167,115,43,44,138,98,207,204,96,155,25,122,170,196,232,219,204,78,43,51,55,243,4,201,28,164,231,207,158,207,94,193,242,3,12,21,147,150,146,82,50,198,135,164,183,15,36,189,108,164,86,12,141,168,3,85,242,146,19,121,37,71,32,211,55,171,21,58,41,132,195,224,142,146,151,193,164,42,227,74,150,149,44,96,41,18,140,96,218,211,4,123,20,128,149,181,9,152,28,74,64,42,196,67,233,146,27,207,183,97,157,18,234,225,154,14,225,43,76,247,68,182,154,45,87,50,23,38,250,36,215,190,119,3,54,238,243,202,115,225,59,6,102,239,182,71,28,246,137,74,151,233,47,106,1,207,168,78,60,176,103,199,199,27,241,119,161,101,203,40,137,244,4,132,64,14,246,172,45,37,178,172,150,65,177,83,212,84,175,106,153,105,162,95,5,190,201,182,74,182,127,8,20,69,52,179,41,251,230,166,65,208,165,124,255,236,126,68,223,10,230,45,197,95,207,213,227,208,129,29,177,80,245,192,149,6,69,74,191,48,209,87,176,50,108,145,23,223,125,121,
+216,161,172,32,199,118,178,138,42,78,158,53,45,168,42,64,195,219,4,150,148,249,184,3,124,234,173,65,35,67,208,10,196,66,199,57,94,202,194,237,119,130,88,201,30,188,79,58,231,194,35,177,76,151,92,81,97,120,132,51,146,106,218,122,189,233,125,35,171,79,33,226,187,15,224,40,149,20,221,236,94,22,248,235,164,208,237,165,132,2,77,201,236,197,150,248,167,108,228,253,41,250,214,38,111,127,26,159,209,107,213,181,198,128,124,125,128,41,3,167,2,92,203,245,35,133,97,55,187,113,152,29,4,224,84,134,174,229,134,194,142,22,54,174,22,155,51,139,204,215,174,37,253,76,120,36,220,69,216,66,88,34,179,22,45,1,100,246,4,182,172,47,68,1,209,236,9,86,213,97,221,160,227,136,124,157,88,43,226,78,122,132,246,175,251,228,39,207,235,72,114,59,221,62,170,94,151,188,124,9,30,6,252,128,14,102,175,240,39,124,190,234,246,201,239,30,12,36,107,231,132,147,154,106,91,210,138,216,158,40,32,12,208,235,253,36,77,12,186,199,182,233,219,228,20,150,
+208,231,168,242,183,222,26,13,12,190,182,18,197,145,116,185,242,124,19,152,55,195,234,67,105,47,68,57,42,13,100,133,203,236,201,203,151,179,39,213,162,138,215,234,114,31,113,219,213,255,33,252,63,142,165,158,185,130,205,70,222,95,14,137,18,119,233,94,225,216,131,43,20,66,146,118,133,242,59,51,22,214,129,178,13,117,110,101,137,44,150,238,198,218,105,83,52,19,4,54,92,98,179,46,162,135,34,221,221,18,218,244,19,89,140,90,142,239,214,208,126,40,26,231,67,190,18,185,4,200,171,114,32,145,125,44,75,198,98,76,156,100,217,30,251,228,205,92,132,53,22,52,193,183,71,184,183,246,49,240,8,56,83,44,6,107,136,216,75,248,215,70,33,27,1,6,102,97,119,109,108,171,136,179,39,63,82,186,2,179,103,10,32,113,3,31,85,104,211,191,215,108,99,58,33,162,177,245,75,94,36,115,207,193,218,32,177,255,151,177,221,4,219,138,192,129,44,88,38,215,88,75,153,68,68,237,56,178,244,25,22,56,34,3,189,243,80,66,53,158,194,47,46,167,254,246,
+251,4,217,124,171,173,194,214,37,180,121,81,72,42,74,183,9,237,42,139,75,176,217,117,31,125,135,72,213,107,119,206,100,236,101,6,84,193,206,247,9,251,14,27,181,251,135,125,127,219,142,82,183,183,76,20,60,76,12,168,174,111,202,241,77,87,112,221,137,140,254,47,197,147,195,57,235,144,237,9,214,223,88,163,202,218,226,153,29,102,85,203,166,183,124,92,148,136,85,5,242,27,219,174,198,17,216,77,63,108,81,80,144,43,189,111,82,248,158,148,37,170,39,72,20,176,145,162,124,201,34,142,85,83,42,95,32,142,111,90,18,101,104,70,186,108,54,196,50,96,142,19,37,176,154,122,202,239,217,245,34,120,56,12,197,240,91,161,104,229,207,99,212,105,165,72,248,169,158,135,12,73,54,85,182,119,116,254,128,72,225,232,247,5,20,46,82,149,64,145,14,15,67,99,48,9,58,90,47,255,114,113,153,71,234,140,11,86,29,23,110,52,182,63,244,130,93,150,129,84,149,116,222,179,220,182,42,156,57,79,213,97,113,145,112,22,149,217,109,128,140,23,249,251,199,112,
+175,181,85,229,96,16,181,175,162,179,178,213,129,66,111,185,130,190,218,169,93,101,237,116,216,227,183,170,117,239,232,103,102,121,215,190,185,90,48,11,143,201,2,51,140,99,252,192,23,198,32,42,255,199,16,104,148,163,128,79,226,220,76,143,104,176,79,14,207,15,176,224,182,71,138,94,13,15,26,192,214,219,181,217,134,217,120,214,64,177,36,40,89,57,44,197,13,56,89,187,225,225,105,220,83,95,195,158,69,28,209,174,75,25,165,196,90,63,9,238,74,162,123,157,3,101,162,145,33,219,172,131,155,242,111,27,198,122,190,222,113,149,78,50,80,6,204,202,147,155,121,66,73,74,172,21,52,43,99,150,17,190,13,87,179,131,154,234,34,112,209,216,50,58,180,174,148,25,229,194,194,48,85,168,107,209,204,225,218,48,6,47,216,254,7,143,131,125,157,84,201,210,89,56,163,210,161,166,110,24,88,141,94,196,24,171,235,220,226,172,97,54,76,38,240,9,137,75,63,7,100,233,217,108,126,43,178,14,113,28,203,139,42,152,72,199,166,240,105,45,42,87,152,107,57,107,
+155,218,53,43,120,44,220,74,137,84,79,181,164,143,38,10,146,241,80,82,197,91,113,253,50,48,160,41,229,204,45,163,159,151,179,233,78,39,246,212,142,182,242,214,88,59,79,77,153,245,108,90,132,71,157,243,240,151,199,170,107,15,235,252,133,191,188,220,54,168,105,197,249,89,44,34,145,80,3,157,150,215,113,200,149,71,198,94,127,166,1,142,80,199,198,191,97,162,37,108,196,196,115,44,217,178,226,141,238,174,1,55,149,243,144,176,36,50,146,203,27,70,76,225,107,146,179,40,135,40,184,68,182,67,39,90,104,104,40,176,30,76,236,32,196,53,188,175,34,4,36,4,14,87,92,38,35,217,97,5,128,72,60,98,53,98,56,32,183,168,11,75,133,199,229,29,30,196,114,24,154,19,113,87,135,75,169,45,174,10,177,25,199,125,228,154,241,5,244,17,220,80,234,146,224,198,11,105,145,139,46,158,250,15,160,123,32,244,86,178,193,48,159,185,244,208,27,19,71,212,159,244,251,253,46,166,44,125,140,109,99,10,178,71,222,121,166,253,19,115,104,76,182,104,25,205,
+199,57,204,93,7,175,68,129,159,34,46,238,192,235,146,105,215,243,151,64,190,138,6,190,207,130,134,179,248,220,11,63,111,187,170,221,161,67,166,145,136,186,150,147,37,202,62,255,201,233,124,13,86,159,90,38,200,59,238,77,94,203,18,230,47,66,117,193,28,180,231,110,68,232,215,115,45,16,3,37,193,237,138,138,44,4,172,5,189,184,178,241,13,15,123,193,244,46,222,201,2,107,142,107,203,138,215,57,74,249,234,54,54,105,34,157,12,42,69,29,167,102,101,80,254,74,149,209,23,30,53,80,38,206,41,242,143,139,80,52,35,148,215,155,143,24,123,246,191,175,29,39,147,234,43,35,161,32,246,88,21,179,151,61,127,32,242,119,226,61,60,107,198,74,100,5,228,93,60,240,145,97,110,93,84,168,130,132,48,105,116,19,166,162,80,52,56,136,178,254,119,110,192,27,92,168,214,35,121,85,196,126,196,112,242,229,22,114,170,204,158,236,140,90,73,15,181,9,140,83,188,51,201,138,176,244,10,235,232,43,248,41,8,121,239,206,202,78,225,233,211,132,23,52,228,203,
+173,10,7,170,229,150,205,193,220,183,240,90,101,74,10,202,131,148,169,99,70,171,64,124,66,61,151,62,113,43,211,39,91,234,203,254,33,188,243,148,211,35,5,242,113,77,195,251,172,29,108,135,126,97,13,225,126,4,82,84,56,208,28,254,38,247,100,237,163,146,184,8,46,148,140,244,82,145,253,234,128,180,250,176,228,194,173,18,7,165,192,229,107,181,250,237,191,240,167,8,139,108,69,228,213,180,159,254,51,242,145,153,244,236,130,84,181,85,53,28,103,55,230,42,5,4,44,34,37,174,0,208,1,123,9,187,104,150,148,31,141,132,238,43,97,171,41,108,48,11,20,173,121,235,2,124,255,144,39,14,113,181,5,210,154,162,148,55,114,226,124,207,236,152,23,122,76,59,184,152,169,126,63,132,199,136,120,107,215,41,241,52,208,171,180,22,140,110,168,60,109,10,70,232,236,252,157,12,41,6,236,138,97,240,54,115,117,163,252,37,47,84,12,61,207,184,234,53,188,69,177,69,129,51,222,41,121,175,117,252,31,162,81,63,136,251,44,247,187,214,182,170,106,150,151,133,
+150,164,109,49,105,27,121,246,253,16,72,65,250,69,164,219,141,2,163,136,222,221,6,70,55,185,40,79,89,76,180,142,88,69,29,246,79,175,236,248,14,130,181,82,138,143,59,78,91,114,157,169,26,31,185,168,15,144,164,212,79,194,122,81,151,155,142,59,110,24,219,56,13,163,19,81,240,193,139,47,153,93,115,177,240,175,125,31,129,181,229,69,207,98,157,231,52,216,98,87,84,98,120,118,50,207,119,105,90,170,221,248,38,78,188,212,212,42,119,49,99,221,47,42,205,251,65,10,237,11,85,153,26,234,82,109,152,108,135,32,89,168,72,201,37,197,201,252,171,214,36,242,198,225,158,114,225,112,28,66,195,248,88,24,61,227,162,212,23,195,173,113,152,12,131,99,73,77,115,28,53,227,221,66,124,139,208,206,185,133,5,171,105,241,201,250,208,53,85,13,234,185,52,162,199,21,86,179,225,134,6,141,102,209,245,169,5,131,38,139,77,235,113,83,171,124,243,33,101,158,178,200,109,168,58,56,142,35,228,19,144,164,110,208,248,138,137,100,60,131,156,43,189,194,60,79,
+93,17,81,16,249,207,93,53,16,150,133,103,46,229,254,109,141,233,9,213,210,227,57,62,177,34,152,226,92,79,178,94,84,220,184,144,144,30,94,35,145,56,235,231,165,151,64,20,16,45,152,194,171,95,159,43,23,193,238,159,200,7,190,14,161,234,242,128,86,228,127,243,103,118,27,111,167,171,46,119,202,0,35,221,209,243,251,61,178,171,76,207,7,240,239,91,198,104,114,184,61,240,253,216,41,66,30,215,45,217,152,210,76,140,103,35,48,207,18,48,51,250,87,166,36,226,134,249,52,122,59,94,134,84,69,92,8,112,27,218,82,136,238,126,79,19,201,41,240,227,88,187,246,123,235,151,248,62,119,114,78,29,179,17,81,15,116,193,150,56,54,150,23,93,234,138,173,236,137,179,142,137,164,224,161,51,206,190,132,17,211,236,59,235,149,114,201,111,60,142,34,214,154,124,161,162,202,226,154,187,246,151,164,137,102,5,242,138,111,120,140,28,15,46,239,209,11,125,146,110,55,206,127,207,101,28,1,189,126,228,242,52,174,16,141,139,70,68,164,148,223,114,112,206,51,193,
+149,6,140,149,28,28,109,123,150,172,225,25,220,253,157,244,138,206,138,42,218,158,90,138,18,36,162,51,163,225,20,169,93,176,138,80,42,252,62,179,33,200,4,189,43,178,252,229,246,189,249,216,185,253,125,118,248,118,118,83,93,13,138,8,79,108,98,218,154,182,58,188,82,139,103,137,254,53,98,110,75,213,194,237,239,35,213,174,84,122,98,27,121,239,3,146,182,126,100,161,34,181,133,83,132,29,224,239,37,87,142,194,87,99,60,253,31,217,51,163,235,
diff --git a/uppsrc/Core/src.tpp/Thread$en-us.tpp b/uppsrc/Core/src.tpp/Thread$en-us.tpp
new file mode 100644
index 000000000..7c2aff14e
--- /dev/null
+++ b/uppsrc/Core/src.tpp/Thread$en-us.tpp
@@ -0,0 +1,7 @@
+TITLE("class Thread")
+COMPRESSED
+120,156,181,85,107,111,219,54,20,253,43,68,210,14,118,230,24,124,74,148,252,37,64,27,12,67,183,22,168,51,236,131,225,86,180,77,39,92,101,202,16,169,100,193,176,252,246,93,202,150,26,215,178,157,173,152,13,88,52,197,123,238,185,231,62,56,161,232,213,43,60,192,231,248,196,39,125,171,151,170,202,253,116,98,56,151,35,69,197,232,203,187,15,201,232,226,170,23,241,126,64,33,128,194,98,194,164,96,132,211,8,126,8,35,84,80,198,137,164,9,151,140,73,156,206,115,229,220,116,146,83,41,71,193,136,14,232,57,141,5,37,49,151,92,18,22,75,10,182,20,99,138,99,42,8,103,146,138,116,161,221,124,58,81,146,141,46,62,70,96,196,130,39,0,199,36,162,60,230,20,51,76,57,184,34,82,114,18,11,201,146,40,74,231,106,237,77,97,183,190,12,33,148,140,102,36,30,1,231,167,167,167,33,225,120,195,128,3,24,193,28,168,18,216,195,156,198,68,36,56,17,146,72,204,0,92,196,88,164,107,85,170,213,225,208,197,201,208,99,156,26,175,1,226,226,71,
+66,98,48,137,6,209,57,225,49,4,42,25,23,50,198,224,156,82,202,24,37,140,38,9,21,145,136,211,59,173,22,186,132,16,56,137,106,178,241,32,62,23,66,112,56,207,185,136,37,167,12,114,195,25,7,41,56,73,4,79,4,77,173,118,94,47,178,203,141,108,155,240,91,226,129,119,64,146,3,121,30,241,40,33,160,62,79,98,142,147,136,196,44,136,71,64,246,136,113,154,136,22,105,155,181,191,62,255,253,250,250,253,229,111,99,52,113,100,244,46,205,224,123,115,87,2,201,176,170,15,165,87,24,77,94,99,124,137,241,85,15,15,241,144,10,209,71,91,251,102,31,84,67,159,155,191,104,131,48,253,97,58,113,116,132,174,45,36,206,85,185,10,201,67,197,18,249,250,245,16,161,112,0,143,234,135,216,115,254,177,178,89,47,44,222,168,60,159,169,249,151,172,159,118,16,153,21,69,222,58,110,41,0,103,176,111,247,123,205,234,211,115,192,79,168,89,117,0,48,52,159,181,219,253,38,150,177,87,165,119,72,33,171,31,154,56,142,70,241,187,50,30,194,232,164,110,
+172,239,100,30,108,190,82,111,125,135,109,135,150,69,137,92,96,161,23,91,2,200,23,104,105,172,113,119,67,212,203,206,254,40,140,205,206,250,199,105,253,236,62,172,117,208,183,63,47,172,243,233,51,86,141,227,231,194,126,147,96,224,184,1,216,125,223,235,127,45,129,26,182,97,190,241,139,74,189,46,181,211,182,22,176,172,172,53,246,246,69,34,214,170,31,44,134,32,135,55,115,52,221,87,248,190,48,139,78,137,107,196,255,177,60,182,153,81,54,68,237,171,210,58,100,86,43,189,48,202,235,252,17,245,30,139,10,205,149,181,133,175,211,90,103,213,223,233,189,140,66,141,192,158,113,112,216,233,19,57,29,231,90,175,179,30,84,213,247,138,19,128,246,197,57,89,185,12,173,92,135,38,1,173,14,80,161,91,115,175,45,178,213,106,166,203,48,9,86,38,207,141,211,80,44,11,119,170,96,199,55,59,125,116,36,176,131,35,33,128,116,52,214,77,89,105,4,26,219,162,209,255,65,185,182,201,30,181,63,78,237,39,237,223,20,149,245,47,165,119,168,237,27,156,14,134,
+239,91,197,118,219,230,132,104,227,187,202,47,138,7,187,217,113,47,37,120,184,48,118,241,58,136,142,53,148,127,40,228,236,172,57,156,157,161,101,174,110,81,97,79,102,248,191,209,61,150,238,147,132,55,185,95,126,27,90,93,1,115,104,127,125,98,52,101,79,207,254,239,16,206,158,158,81,217,222,136,251,254,223,194,125,92,86,115,95,148,195,102,76,66,55,120,99,43,237,218,100,247,194,28,129,41,97,194,20,89,23,206,153,89,174,195,144,104,103,199,102,90,236,12,136,221,71,115,185,255,90,121,253,231,247,220,237,53,64,195,190,243,10,111,93,92,91,175,203,67,151,223,193,34,171,173,58,148,58,238,235,23,173,238,245,191,246,85,91,157,242,5,143,233,63,157,88,44,124,
+
diff --git a/uppsrc/Core/src.tpp/Vector$en-us.tpp b/uppsrc/Core/src.tpp/Vector$en-us.tpp
new file mode 100644
index 000000000..9dd93b9ec
--- /dev/null
+++ b/uppsrc/Core/src.tpp/Vector$en-us.tpp
@@ -0,0 +1,240 @@
+TITLE("Vector")
+COMPRESSED
+120,156,237,92,235,83,219,198,22,255,87,118,38,109,198,38,
+198,72,178,141,13,38,153,166,78,218,97,218,36,12,208,220,
+15,140,65,66,90,227,189,145,37,95,173,12,161,55,55,127,
+251,61,103,87,239,151,229,7,129,180,205,7,2,146,118,247,
+60,126,231,181,175,11,141,252,240,131,210,82,158,41,75,254,
+29,190,161,19,99,97,251,227,11,214,237,14,134,134,214,27,
+126,250,237,195,193,112,231,167,198,126,183,9,157,168,208,73,
+167,175,118,6,189,142,218,213,246,225,135,218,81,181,158,214,
+233,170,3,237,160,59,232,116,6,202,161,105,27,156,143,47,
+108,109,48,24,226,200,26,52,210,250,61,77,237,119,7,221,
+129,218,233,15,52,104,171,41,138,166,244,181,158,218,237,12,
+180,222,161,69,185,57,190,48,6,157,225,206,233,62,52,234,
+224,72,208,185,162,238,107,221,126,87,83,58,138,214,133,161,
+212,193,160,171,246,123,131,206,193,254,254,161,105,204,125,230,
+58,193,88,76,85,53,117,120,173,246,135,64,242,215,175,95,
+219,106,87,145,20,116,161,51,85,233,2,169,42,60,83,186,
+90,95,237,29,40,7,189,129,58,80,58,208,121,175,175,244,
+14,231,134,103,204,138,57,199,62,122,75,89,239,43,135,204,
+167,208,197,206,11,85,237,67,147,253,214,254,51,181,219,7,
+70,7,157,110,111,208,87,96,112,77,211,58,29,77,237,104,
+7,7,90,111,191,215,63,156,82,195,162,94,192,130,1,196,
+239,168,208,180,223,234,63,131,134,74,183,215,209,186,7,40,
+172,14,140,164,105,251,189,3,181,215,85,122,251,208,211,161,
+71,255,179,96,30,157,81,7,52,246,223,171,255,253,248,246,
+253,238,31,103,228,130,119,144,253,253,238,144,124,164,166,239,
+122,207,199,23,188,55,252,141,92,252,168,40,187,138,66,128,
+200,185,109,248,244,234,104,28,60,250,169,161,180,149,182,214,
+235,53,73,160,189,224,211,171,232,139,46,57,143,158,190,186,
+186,90,161,165,18,144,17,191,58,44,106,62,95,92,219,204,
+204,183,191,212,15,245,195,119,238,45,53,174,109,250,218,177,
+222,80,58,31,185,243,251,15,66,247,151,164,244,85,212,213,
+81,5,45,71,37,12,190,186,26,163,216,148,33,9,254,187,
+216,25,137,79,118,191,156,223,207,41,113,39,132,218,66,244,
+156,112,232,144,90,132,57,65,231,109,114,78,24,39,129,122,
+44,226,187,228,154,66,7,123,151,190,59,103,38,240,179,167,
+239,141,160,141,190,199,61,211,114,77,125,47,100,66,255,129,
+58,250,238,130,95,146,89,240,4,224,180,71,200,216,112,44,
+50,91,112,159,76,141,91,74,40,243,167,212,171,238,18,30,
+127,210,175,226,14,45,16,14,49,65,58,240,195,225,190,183,
+16,114,104,173,214,9,254,157,106,79,92,65,6,244,46,60,
+71,234,93,59,16,221,249,148,2,59,64,59,157,76,64,64,
+12,24,152,216,198,45,180,4,41,94,27,156,153,196,3,254,
+220,25,49,76,147,114,142,157,248,6,115,40,72,242,24,228,
+59,161,134,191,240,40,39,134,71,97,32,15,58,176,200,196,
+131,239,39,134,233,19,127,106,248,132,249,40,114,6,192,22,
+74,129,15,12,80,140,248,155,140,244,93,155,125,162,228,86,
+104,39,169,186,144,194,55,140,27,214,173,1,163,222,8,213,
+74,61,98,143,166,59,155,185,14,73,152,26,153,192,155,72,
+247,82,183,49,2,128,14,125,23,72,162,247,82,93,82,241,
+177,54,219,228,181,227,10,229,89,201,49,97,164,152,151,153,
+225,220,19,119,78,61,3,97,12,92,57,183,134,205,44,176,
+88,160,99,66,61,234,128,148,72,67,126,75,13,248,98,164,
+191,208,95,36,95,34,92,230,46,3,65,120,188,137,68,102,
+57,254,29,5,34,198,17,196,188,63,255,61,150,122,43,193,
+255,102,168,245,209,84,238,0,172,107,160,12,89,112,133,33,
+27,118,12,222,49,241,1,43,28,24,37,156,130,160,124,102,
+242,54,25,25,182,205,156,27,144,134,63,117,45,142,42,196,
+62,64,37,49,39,182,123,3,64,163,158,7,127,10,146,232,
+103,147,138,254,225,115,41,149,209,139,126,143,220,186,204,2,
+114,3,5,184,158,254,114,220,144,4,6,157,233,207,225,245,
+79,29,114,59,110,202,102,123,216,236,98,111,36,155,34,235,
+163,168,245,209,17,180,199,119,13,97,25,113,23,226,51,209,
+11,190,109,194,79,144,87,3,204,8,52,96,145,5,71,118,
+210,254,236,60,112,219,205,2,98,71,54,53,188,113,35,249,
+234,218,117,109,124,117,204,79,132,40,224,173,180,206,0,1,
+31,114,178,205,90,144,63,245,220,197,205,180,132,12,128,169,
+233,185,33,158,222,209,217,53,96,77,254,213,33,217,144,115,
+174,63,79,58,225,215,150,21,249,218,70,83,120,90,109,136,
+79,57,113,232,93,222,153,0,49,1,128,17,203,129,151,197,
+86,253,33,57,149,166,201,193,233,194,59,225,30,11,156,81,
+248,245,113,100,75,192,171,47,117,36,205,37,97,61,233,49,
+186,67,97,194,167,20,156,144,67,160,249,130,66,20,56,13,
+63,199,175,129,104,251,158,24,150,5,132,86,16,223,46,17,
+79,34,10,162,66,11,99,104,74,100,69,209,23,135,139,91,
+166,4,222,33,159,163,55,121,105,135,146,21,70,193,231,212,
+100,19,6,52,11,70,107,138,187,32,178,108,42,240,145,160,
+26,162,45,4,143,128,20,225,231,209,37,207,153,140,170,82,
+236,166,7,241,97,107,66,70,99,137,5,45,13,127,29,105,
+70,44,73,95,12,253,240,128,15,116,78,152,107,82,144,6,
+126,198,252,54,41,23,110,54,226,110,75,174,103,238,194,3,
+240,50,232,216,64,20,3,85,231,145,136,101,84,147,46,116,
+67,121,190,175,68,45,115,252,130,134,29,226,148,72,56,134,
+167,179,64,135,131,100,87,24,92,86,2,223,204,93,140,4,
+15,187,95,222,71,84,38,41,2,71,145,17,106,66,36,33,
+227,41,131,150,5,216,85,198,141,70,33,234,66,31,167,191,
+140,100,157,148,112,208,73,66,204,44,253,170,25,189,11,70,
+15,68,47,93,31,240,29,115,141,108,64,230,16,193,29,112,
+19,235,102,238,114,134,161,34,45,15,6,242,56,9,222,36,
+36,82,225,99,71,174,64,167,95,58,108,25,54,179,241,166,
+72,80,43,225,145,229,241,248,88,66,57,173,41,139,2,72,
+85,96,65,33,191,82,127,228,46,178,95,52,170,49,33,8,
+112,242,32,143,107,161,114,70,94,155,254,2,210,143,124,235,
+26,156,96,114,83,206,202,49,127,59,155,251,247,53,57,57,
+167,28,40,190,155,82,145,9,7,78,27,189,32,197,78,218,
+228,12,92,53,86,19,161,128,32,143,210,95,234,47,137,82,
+193,27,184,17,240,173,201,66,66,116,214,130,44,223,230,84,
+38,221,119,140,211,77,156,235,185,199,102,219,114,174,167,212,
+90,160,43,171,82,37,226,45,235,127,219,161,63,141,28,114,
+88,245,216,88,200,65,60,113,176,66,132,111,64,211,232,249,
+202,116,158,65,76,169,235,173,240,181,89,74,42,16,181,138,
+152,207,50,118,177,169,168,71,32,147,27,138,105,12,116,90,
+71,210,2,83,80,9,79,226,25,133,34,249,113,114,35,18,
+33,79,74,61,37,233,86,42,67,141,218,200,122,58,23,61,
+197,88,1,37,83,67,200,156,57,152,101,1,114,77,99,110,
+152,12,145,44,44,31,18,158,240,9,228,143,182,13,69,21,
+12,12,35,205,12,223,156,86,18,220,88,56,162,42,135,18,
+37,20,241,233,184,249,56,97,250,105,67,167,69,150,231,251,
+133,211,88,233,172,149,57,204,127,242,112,68,34,25,232,242,
+79,153,225,103,203,17,89,23,231,106,141,167,10,216,7,170,
+139,234,64,54,206,48,80,237,187,95,142,67,193,138,73,165,
+184,20,41,210,196,54,48,127,250,143,191,172,3,63,136,148,
+41,50,86,4,224,88,76,238,25,182,237,222,33,177,104,28,
+114,66,47,106,132,85,189,187,240,201,100,225,137,23,1,101,
+194,140,2,74,254,146,62,119,83,252,253,227,116,31,208,233,
+62,121,212,255,13,29,183,156,66,206,207,202,158,82,156,212,
+231,40,238,88,190,98,245,37,92,237,26,133,186,101,248,21,
+119,137,137,93,73,44,253,73,131,57,226,245,36,87,103,46,
+121,189,244,170,160,162,7,60,231,203,117,185,116,112,23,34,
+181,178,64,106,0,70,25,57,74,84,138,227,102,11,152,147,
+19,5,169,105,130,234,41,2,242,33,44,16,35,155,90,94,
+155,137,193,245,23,68,29,183,201,251,39,24,190,190,199,64,
+149,157,158,137,248,91,113,158,166,176,221,183,0,119,157,48,
+182,124,118,251,239,96,25,105,127,31,174,48,67,211,207,227,
+191,136,133,60,80,80,171,111,35,225,218,195,202,33,109,139,
+22,86,43,135,156,122,204,249,84,16,11,223,65,76,158,65,
+154,196,201,12,162,162,39,69,185,152,133,171,200,33,70,174,
+239,65,218,57,221,136,21,171,173,230,186,167,148,83,239,150,
+110,111,18,80,116,199,99,52,165,18,78,51,17,230,83,144,
+54,23,158,135,22,27,155,66,242,211,208,82,172,112,190,58,
+234,80,38,181,105,116,248,158,145,204,145,82,184,222,108,114,
+251,53,88,150,153,254,98,201,228,54,207,113,22,235,184,106,
+213,162,248,227,245,235,153,111,16,2,106,84,50,159,171,59,
+44,163,195,76,77,128,93,233,47,147,47,213,60,8,129,95,
+185,117,138,114,191,216,75,114,223,240,124,52,44,195,23,120,
+138,226,17,186,249,113,136,178,85,107,39,220,13,66,45,252,
+159,113,209,123,244,38,182,107,232,215,73,7,13,233,171,30,
+117,145,28,221,239,89,40,146,226,69,38,244,185,31,243,198,
+38,85,83,180,72,185,153,83,194,122,225,33,48,187,45,136,
+133,21,77,21,202,182,29,24,235,74,94,134,50,164,239,129,
+117,80,230,0,74,196,173,239,36,100,202,93,15,164,166,95,
+217,44,209,197,74,42,43,140,62,82,43,5,182,153,170,54,
+207,217,76,36,11,209,6,57,200,153,196,238,66,203,197,214,
+46,252,66,231,20,55,143,21,229,164,219,208,107,138,125,84,
+177,216,103,39,178,55,207,51,132,223,15,237,48,169,79,114,
+236,71,171,99,178,11,201,24,230,208,92,108,24,145,81,21,
+126,47,136,140,229,187,9,30,19,46,98,115,174,148,209,101,
+233,214,218,75,144,207,101,10,10,175,210,161,165,16,79,181,
+128,225,122,49,48,194,117,90,8,3,178,73,35,217,111,43,
+53,74,59,46,68,154,227,7,192,196,153,212,239,199,104,199,
+105,17,32,54,208,216,177,3,169,154,191,222,222,154,111,228,
+101,37,137,184,63,98,229,77,59,16,216,141,178,157,19,143,
+86,254,175,226,193,153,224,189,110,145,47,37,181,181,89,172,
+64,238,174,83,56,219,147,172,175,211,121,82,38,119,216,81,
+31,83,208,27,217,197,223,42,97,174,182,179,16,149,224,254,
+168,47,82,68,80,250,76,196,170,92,138,44,245,136,39,103,
+14,14,180,199,155,67,40,201,93,145,27,105,87,133,179,3,
+155,26,229,147,68,87,85,120,93,62,105,23,2,35,55,113,
+111,4,71,16,82,69,203,19,212,123,176,71,117,243,34,250,
+187,80,220,74,94,194,157,76,56,93,51,249,78,123,152,2,
+71,226,225,234,100,62,3,127,90,176,145,228,98,254,95,94,
+244,230,1,20,189,14,4,152,158,186,156,48,15,143,41,5,
+17,146,57,144,214,37,58,8,182,69,135,78,232,49,124,79,
+122,119,250,154,48,14,54,181,111,213,201,164,5,85,56,119,
+31,172,35,139,13,237,69,135,120,142,125,121,12,138,71,19,
+139,137,147,41,98,152,86,92,227,45,120,9,188,196,241,172,
+243,22,185,94,96,33,8,79,221,251,12,117,143,11,192,117,
+119,210,207,177,166,221,118,137,182,252,88,131,24,54,19,67,
+0,219,69,2,125,20,79,240,29,11,121,53,127,191,166,171,
+175,80,105,153,155,127,226,186,141,61,248,22,157,247,3,58,
+110,41,239,194,99,69,91,53,209,52,183,79,196,215,226,82,
+24,18,1,196,60,57,107,127,227,185,243,181,98,105,60,121,
+185,188,58,195,65,138,143,45,217,70,140,86,177,94,141,213,
+120,184,92,206,131,185,44,220,227,223,72,30,60,216,37,78,
+179,89,103,102,176,238,228,195,121,82,8,185,195,45,185,163,
+45,73,170,211,68,215,90,168,205,240,93,208,195,198,135,162,
+18,12,213,93,229,43,61,102,244,45,185,141,21,148,228,230,
+164,80,61,18,85,169,190,227,85,42,105,74,146,53,230,243,
+84,113,191,154,255,46,230,47,170,198,45,160,98,94,99,79,
+75,120,250,10,52,181,147,135,152,227,58,250,110,164,130,121,
+60,153,94,99,7,192,73,201,215,149,32,146,168,136,136,26,
+87,99,107,167,62,124,182,78,59,89,49,62,40,137,99,231,
+171,100,49,203,55,0,125,8,250,5,96,205,109,195,140,32,
+119,177,35,143,160,191,182,172,224,128,59,244,245,185,57,110,
+147,159,239,3,16,98,28,74,27,86,124,50,22,55,187,240,
+112,183,203,204,245,104,202,33,98,8,179,225,209,231,57,0,
+150,67,148,199,61,54,11,78,104,251,166,45,219,138,249,44,
+55,198,173,184,218,196,245,12,239,62,26,130,227,97,91,185,
+199,54,234,135,136,13,165,191,184,110,163,33,63,59,2,85,
+188,2,247,122,116,68,84,252,161,225,143,110,243,81,54,247,
+175,127,232,185,198,46,153,48,190,232,59,254,148,241,230,246,
+0,167,127,201,101,55,91,65,21,230,77,225,245,11,223,3,
+180,42,16,243,52,78,114,111,15,36,245,118,175,120,114,99,
+121,222,29,9,140,157,249,128,227,217,37,145,255,151,36,189,
+60,143,156,168,95,121,89,76,58,0,250,238,158,40,100,100,
+167,109,242,47,215,251,132,235,33,96,54,108,34,174,58,1,
+193,44,184,188,35,38,84,225,31,39,39,21,186,227,193,120,
+114,193,57,4,61,9,174,235,200,44,5,162,1,27,222,13,
+245,247,130,92,152,75,66,146,114,84,134,135,177,141,37,126,
+107,232,205,67,196,127,96,116,242,70,15,140,248,5,235,46,
+100,20,254,17,28,47,45,202,44,114,3,233,95,147,67,233,
+95,11,7,75,140,1,214,192,101,118,47,158,136,242,63,53,
+29,144,62,185,185,148,193,224,178,151,248,201,243,12,203,85,
+151,173,0,113,39,89,51,130,36,89,22,56,217,218,3,8,
+195,205,148,81,124,246,217,140,102,138,21,230,103,43,148,72,
+141,183,219,172,53,18,151,201,108,94,4,222,230,237,65,8,
+37,28,228,209,36,178,198,65,237,224,110,154,213,18,118,0,
+11,30,176,30,167,79,88,3,115,193,165,63,192,156,79,43,
+188,93,173,246,120,51,150,60,174,61,46,57,175,93,10,113,
+65,116,10,225,45,72,48,50,48,151,233,82,252,32,70,122,
+11,43,207,102,20,35,115,215,244,20,196,144,186,9,10,30,
+198,206,95,170,84,156,248,175,100,4,100,226,49,234,88,101,
+55,84,200,107,144,66,228,103,50,3,196,222,74,171,44,153,
+246,220,43,152,230,42,144,91,108,31,111,106,92,179,84,75,
+180,81,36,40,150,107,52,226,138,118,164,164,107,21,188,70,
+11,66,205,85,92,25,18,81,132,225,77,116,209,45,6,242,
+27,25,253,39,98,6,136,138,130,51,96,7,130,157,125,227,
+122,204,159,206,242,53,82,233,120,241,182,47,114,28,164,38,
+209,204,127,240,183,248,186,29,255,137,187,131,23,6,56,32,
+159,70,119,223,33,81,250,142,252,178,230,216,203,80,16,22,
+104,73,18,69,60,204,210,25,93,34,194,86,35,56,44,103,
+74,200,206,185,186,203,180,47,72,209,114,41,169,77,211,87,
+234,21,127,166,55,204,89,209,37,154,121,46,229,20,70,110,
+86,116,233,252,69,72,224,183,100,249,173,179,106,12,40,101,
+56,90,110,250,183,220,107,119,239,58,86,225,100,206,147,20,
+196,175,84,124,148,17,70,36,138,109,222,230,83,42,193,37,
+39,112,18,251,236,4,82,113,90,242,5,12,14,133,25,117,
+192,177,138,116,26,43,135,232,58,62,198,131,122,4,167,153,
+175,23,88,143,89,226,64,39,116,58,22,87,101,138,149,8,
+115,74,211,101,74,184,210,22,29,7,200,47,180,213,86,90,
+137,170,34,45,145,172,110,202,77,178,96,158,52,61,137,245,
+112,54,184,25,23,111,157,162,107,247,234,241,240,240,102,181,
+25,111,25,195,217,214,237,78,213,66,89,203,82,16,244,223,
+135,173,132,73,93,129,40,203,43,254,59,163,96,85,165,126,
+113,99,20,100,130,245,91,95,23,76,21,160,98,18,181,251,
+132,220,128,232,61,102,138,19,229,72,173,72,151,162,93,196,
+240,132,39,234,165,224,14,217,84,201,20,239,61,79,203,31,
+143,46,253,34,108,61,113,134,31,250,75,127,117,141,233,31,
+53,209,126,50,159,141,255,15,17,187,235,173,
\ No newline at end of file
diff --git a/uppsrc/Core/src.tpp/VectorMap$en-us.tpp b/uppsrc/Core/src.tpp/VectorMap$en-us.tpp
new file mode 100644
index 000000000..854b2d210
--- /dev/null
+++ b/uppsrc/Core/src.tpp/VectorMap$en-us.tpp
@@ -0,0 +1,87 @@
+TITLE("VectorMap")
+COMPRESSED
+120,156,197,87,107,111,219,54,20,253,43,23,232,3,182,235,
+7,73,73,150,108,185,65,219,116,195,10,55,109,209,122,253,
+98,168,22,35,209,181,16,89,210,68,57,75,176,174,191,125,
+151,148,100,73,77,186,32,45,134,229,131,109,241,146,231,30,
+158,123,120,169,172,25,60,124,72,134,228,1,185,227,111,254,
+82,108,249,33,46,188,117,100,154,142,203,153,229,94,44,223,
+206,220,193,179,222,212,236,35,8,69,16,195,166,134,99,25,
+212,100,83,252,160,6,101,22,51,76,234,176,153,233,24,134,
+67,230,65,204,165,244,214,49,115,28,87,101,102,184,136,217,
+22,163,182,233,152,14,53,108,135,225,90,70,8,35,54,179,
+168,105,56,204,154,135,66,6,222,154,59,134,59,120,63,197,
+69,134,202,132,224,132,78,153,105,155,140,24,132,153,152,138,
+58,142,73,109,203,49,102,211,233,60,224,89,17,165,73,149,
+43,162,148,81,247,156,218,46,82,254,250,245,235,152,154,164,
+100,96,34,24,37,38,82,165,56,70,76,102,83,107,70,102,
+150,67,29,98,32,184,101,19,107,158,241,156,239,111,223,185,
+194,176,238,220,186,77,230,81,33,16,98,240,132,82,27,151,
+76,135,211,7,212,180,113,163,142,97,90,142,77,48,57,99,
+204,48,24,53,216,108,198,172,169,101,207,119,130,135,34,175,
+182,192,145,252,128,226,82,123,104,63,192,133,196,180,12,102,
+206,148,88,6,102,98,108,106,205,168,101,18,107,138,72,243,
+92,252,113,136,114,177,23,9,86,236,175,205,223,143,126,121,
+51,250,253,3,172,165,225,194,250,17,33,35,66,224,163,8,
+138,52,63,227,153,247,216,91,75,203,93,62,35,117,172,44,
+42,50,206,98,94,136,205,194,59,142,147,49,25,51,203,234,
+67,85,202,246,252,205,241,209,132,101,55,52,132,251,67,172,
+126,30,226,55,46,119,191,38,223,196,253,167,155,15,69,168,
+66,139,239,19,62,217,156,108,54,247,76,216,40,10,90,82,
+226,66,245,181,30,156,234,20,163,47,171,235,76,64,186,133,
+11,113,45,199,176,132,253,65,22,176,227,151,2,66,33,50,
+8,210,236,26,63,18,89,228,7,133,53,132,115,129,171,39,
+159,138,52,139,2,127,238,79,252,201,105,154,11,127,34,243,
+32,76,3,127,114,150,94,10,126,30,11,255,161,72,252,209,
+65,126,130,125,53,226,1,79,194,86,2,36,1,105,38,114,
+142,184,254,83,255,169,135,41,183,81,34,194,113,135,229,170,
+197,82,196,218,66,18,36,174,17,33,68,73,181,199,49,172,
+32,146,80,217,44,132,34,253,25,162,184,14,192,235,178,21,
+81,177,19,249,191,67,226,240,133,191,105,0,111,149,208,27,
+222,15,68,61,119,214,67,170,105,40,181,84,7,236,196,186,
+210,85,118,27,125,81,63,162,228,115,233,150,49,156,181,138,
+172,21,215,181,56,36,50,250,172,30,234,162,244,250,61,141,
+13,75,255,49,92,245,61,216,139,98,151,134,168,114,113,200,
+19,133,183,67,92,184,228,241,65,192,22,89,213,229,169,89,
+188,224,82,148,57,133,172,134,158,163,27,23,176,28,194,106,
+88,149,110,177,58,25,86,76,225,4,160,107,212,114,10,108,
+99,126,137,95,232,128,61,207,198,240,42,193,82,68,104,131,
+125,138,236,112,84,253,222,30,146,64,181,88,30,71,197,53,
+108,243,116,15,235,91,85,246,39,138,68,35,176,122,42,189,
+201,195,80,66,154,196,215,184,211,253,185,200,209,103,153,8,
+162,109,20,232,237,233,44,154,73,189,193,215,209,133,192,149,
+215,144,106,115,188,89,189,86,213,40,56,106,154,15,91,199,
+15,173,249,115,94,44,212,1,248,19,45,248,3,222,81,59,
+75,179,82,154,198,146,30,20,57,79,228,22,105,75,177,231,
+73,17,5,232,140,83,30,199,170,176,101,165,165,210,86,97,
+160,41,58,155,137,211,207,168,137,200,115,84,69,179,18,87,
+129,208,41,112,69,169,205,228,137,109,193,122,114,10,151,105,
+20,130,218,70,251,180,123,42,210,43,233,54,208,104,51,61,
+241,153,1,151,122,70,31,188,94,109,209,115,117,138,246,89,
+42,35,149,167,127,119,150,197,162,206,83,186,248,249,173,25,
+240,19,90,89,176,163,168,121,21,252,169,130,215,208,235,1,
+156,198,130,231,94,175,29,58,79,211,88,133,94,201,119,90,
+37,140,150,199,177,242,199,219,27,178,31,217,41,25,163,210,
+199,152,86,219,85,37,174,143,168,194,235,206,197,187,47,10,
+162,2,205,121,187,34,181,39,207,74,235,150,79,6,84,119,
+233,241,150,93,53,183,8,129,119,105,118,188,44,122,125,125,
+73,48,23,94,230,105,134,53,230,168,89,117,162,149,15,26,
+3,40,67,149,61,64,234,51,161,27,128,78,111,186,186,51,
+189,215,193,114,28,187,207,71,221,32,16,34,68,224,12,137,
+87,168,227,54,71,226,206,209,209,243,198,11,157,135,178,132,
+221,177,199,254,48,74,10,191,63,87,21,104,94,30,170,106,
+183,77,181,30,96,189,37,54,94,156,223,175,54,121,75,105,
+90,141,116,92,206,194,23,156,247,229,149,34,241,130,193,75,
+229,251,55,163,234,202,55,79,217,13,76,179,236,205,138,206,
+232,203,135,244,144,7,162,161,122,31,65,170,163,142,131,175,
+146,80,92,249,139,165,63,44,187,168,127,162,164,105,226,229,
+34,127,177,210,129,27,114,85,135,80,163,44,150,39,181,92,
+73,120,133,130,117,78,40,118,234,58,138,165,245,106,37,149,
+85,253,209,113,163,178,229,20,109,107,141,92,191,99,104,243,
+84,93,29,135,180,69,208,238,47,176,129,130,44,229,56,118,
+80,108,191,187,244,16,135,165,234,216,97,65,242,189,128,228,
+160,12,222,126,29,232,42,171,152,31,181,213,201,187,113,197,
+253,27,237,127,76,248,90,216,229,143,41,94,137,250,95,72,
+222,8,252,127,104,222,205,126,167,248,45,78,247,40,195,77,
+89,107,113,94,222,124,47,194,139,173,209,10,255,139,192,23,
+132,230,208,121,255,0,69,237,149,200,
diff --git a/uppsrc/Core/src.tpp/algo$en-us.tpp b/uppsrc/Core/src.tpp/algo$en-us.tpp
new file mode 100644
index 000000000..8eebcc231
--- /dev/null
+++ b/uppsrc/Core/src.tpp/algo$en-us.tpp
@@ -0,0 +1,12 @@
+TITLE("Algorithms")
+COMPRESSED
+120,156,237,92,251,115,218,56,16,254,87,52,211,199,36,185,64,253,196,6,58,157,166,228,122,195,36,109,111,2,205,47,12,4,99,139,196,83,176,169,101,146,230,142,235,223,126,43,249,129,141,109,18,158,225,149,233,36,69,94,173,118,181,223,183,43,217,50,13,1,189,126,205,157,114,175,184,39,126,74,231,184,171,13,123,110,179,97,74,146,90,214,4,185,252,227,226,91,177,124,242,241,168,32,29,83,45,60,104,17,21,94,84,101,145,151,132,2,252,226,69,94,144,5,81,226,85,161,40,169,162,168,114,37,189,167,17,210,108,244,4,85,45,211,78,194,169,242,74,80,100,129,87,36,85,82,121,81,81,5,232,43,112,156,192,41,130,204,75,162,42,200,37,3,19,189,217,208,84,177,124,114,85,128,78,34,29,9,148,115,124,65,144,20,73,224,68,78,144,96,40,94,85,37,94,145,85,177,88,40,148,116,109,224,154,182,229,143,101,242,188,192,151,59,188,82,6,155,127,255,254,157,231,37,206,179,64,2,101,60,39,129,169,60,180,113,146,160,240,114,145,43,202,42,175,114,
+34,40,151,21,78,46,13,52,71,235,103,187,46,63,233,186,194,149,76,23,131,138,147,63,120,94,129,46,133,211,194,43,94,82,192,81,85,148,100,85,225,96,112,65,16,68,81,224,69,161,88,20,228,130,172,148,238,176,102,96,199,119,65,3,227,79,120,232,170,192,156,65,71,78,146,69,65,42,210,201,18,97,36,65,40,200,69,94,150,56,185,0,154,74,14,254,57,52,29,220,199,22,132,236,223,155,255,222,252,249,53,247,189,134,26,68,44,163,179,222,173,237,152,238,93,159,188,109,54,8,87,70,244,143,92,190,64,141,55,28,151,227,56,4,150,14,122,154,139,111,222,55,253,166,143,71,92,158,203,11,178,124,140,252,16,250,162,55,161,132,132,234,97,235,135,155,155,148,158,247,182,105,164,116,228,80,237,65,27,132,23,142,130,255,181,234,173,136,202,246,219,113,15,17,105,97,251,41,122,142,124,39,108,63,110,82,111,133,50,27,148,160,123,173,55,196,36,143,106,3,172,155,93,83,71,238,227,0,19,212,55,111,239,92,68,104,163,214,51,255,193,168,113,226,89,137,
+30,96,226,80,223,118,48,194,221,46,214,93,243,30,131,18,199,212,44,151,228,169,106,165,140,234,168,63,36,46,186,211,224,26,6,121,236,32,3,227,1,210,237,193,35,178,7,216,209,92,219,65,240,111,96,234,63,194,6,214,91,42,195,80,21,54,153,185,81,29,108,65,118,55,48,50,114,157,206,64,110,244,217,116,96,24,118,21,185,54,34,96,96,92,168,3,66,53,172,219,150,145,34,181,188,192,87,231,13,124,213,197,78,70,240,171,173,136,218,39,67,159,41,253,68,224,209,192,54,45,23,27,116,98,58,143,8,56,202,66,241,60,64,132,214,63,11,20,84,210,195,69,7,3,28,186,166,5,195,118,1,4,116,128,9,59,170,113,44,84,33,140,85,223,52,38,158,132,66,120,153,41,50,173,91,170,169,59,198,71,18,23,169,61,72,4,44,75,6,73,37,37,110,51,166,149,25,59,94,62,1,75,147,230,198,20,84,126,54,45,227,210,126,192,206,39,123,104,25,73,108,70,7,183,45,146,162,164,85,105,69,252,141,167,162,251,233,238,164,27,37,66,148,200,124,29,
+117,112,194,125,98,10,51,188,152,146,80,1,33,243,233,188,108,69,226,18,215,217,195,145,64,134,116,165,209,32,62,148,97,18,76,90,213,193,89,228,104,214,45,203,142,48,146,171,1,155,28,68,108,135,114,8,8,4,236,100,218,208,192,193,134,169,3,90,209,3,164,97,70,91,106,58,210,53,139,242,208,180,8,102,125,40,131,237,33,112,211,193,218,15,70,134,59,80,238,64,249,133,15,113,54,86,34,153,57,28,251,137,228,29,167,223,61,92,174,164,245,244,194,156,27,125,194,183,166,101,81,51,64,1,115,52,46,229,197,52,55,250,58,236,119,192,111,16,194,61,86,235,73,56,51,19,35,130,207,185,209,117,80,3,32,249,24,113,1,54,91,185,209,55,223,227,241,188,141,197,222,161,43,236,14,29,203,243,8,132,255,142,68,35,62,17,135,172,177,230,172,177,149,12,222,1,186,238,51,175,246,135,30,51,33,249,93,184,160,127,191,99,120,222,86,160,174,177,0,124,31,12,14,203,198,13,42,58,16,228,195,170,241,176,106,60,36,141,157,33,240,14,176,117,237,180,
+42,5,52,106,191,103,8,70,149,246,169,135,101,84,111,127,160,216,156,192,97,251,136,133,17,228,222,162,123,42,203,62,213,233,39,173,215,62,46,109,16,79,247,135,110,179,48,227,176,8,221,227,122,242,201,180,52,231,113,187,192,189,241,139,218,57,235,87,72,208,241,106,203,123,90,64,188,231,11,56,120,50,3,232,213,102,93,157,230,81,181,139,44,27,145,161,126,23,106,199,191,76,226,146,83,208,102,225,91,205,127,20,193,70,32,200,97,212,193,198,97,105,122,72,37,251,149,74,94,144,214,180,138,238,14,159,247,153,120,251,193,159,149,64,61,125,65,186,245,128,159,9,201,244,220,81,177,40,44,7,209,113,124,44,163,36,100,35,142,67,103,176,103,178,140,26,11,104,18,205,211,176,106,96,50,231,138,107,138,82,226,232,107,74,247,95,176,115,139,9,64,121,232,232,24,125,173,95,70,240,13,104,160,222,1,197,89,196,99,23,243,232,147,13,28,9,63,147,240,232,135,207,10,186,222,35,58,76,42,91,20,209,100,153,71,103,93,151,170,165,187,46,70,22,208,122,
+26,27,98,60,182,73,178,21,33,205,50,2,209,240,160,75,215,177,251,168,19,183,41,143,206,135,131,158,183,53,244,197,52,216,31,2,61,97,71,120,15,44,67,201,44,78,71,54,48,216,217,103,7,88,34,117,108,70,78,250,208,200,141,206,211,28,140,75,210,120,231,70,53,47,8,25,50,79,213,157,10,165,235,89,156,175,141,51,148,53,126,51,32,165,127,203,164,113,194,156,250,176,114,42,111,63,35,3,242,132,147,116,32,145,7,201,20,234,68,235,226,75,17,104,169,204,216,194,226,246,221,2,7,55,146,73,59,83,219,24,155,124,118,4,194,67,203,252,9,235,176,213,16,214,83,62,157,183,211,120,185,21,37,45,109,1,154,61,244,74,184,185,245,20,155,100,3,197,97,22,35,232,181,189,102,197,38,84,171,13,0,253,170,11,210,21,238,219,247,120,30,186,208,144,46,157,46,15,119,218,186,110,154,123,158,147,241,221,95,128,19,153,192,129,135,219,84,42,44,153,131,43,40,16,44,64,207,34,1,155,245,253,169,16,155,140,249,45,132,231,66,153,122,137,32,125,
+1,244,157,183,208,249,188,169,186,182,220,28,31,51,37,142,247,170,5,1,35,88,119,51,33,159,217,121,145,85,81,173,21,241,241,165,54,30,9,26,101,83,6,86,64,154,203,54,212,150,237,134,205,134,119,222,97,2,116,47,155,252,207,35,188,74,103,127,76,188,22,17,79,120,178,250,61,197,182,208,112,39,216,180,59,192,207,46,43,91,0,255,245,215,162,133,30,219,71,83,231,172,47,84,67,220,83,56,48,229,1,224,188,169,31,140,108,197,77,125,78,1,160,246,145,40,128,159,153,108,149,114,248,210,109,234,171,180,245,118,169,20,188,215,154,253,252,47,3,62,122,246,51,192,233,203,236,77,120,131,126,129,128,207,23,149,68,38,16,232,183,19,172,51,58,203,155,246,139,185,183,246,215,243,223,20,88,128,222,85,203,192,191,50,66,126,1,155,154,139,172,93,205,15,252,152,118,114,174,117,13,157,174,179,58,121,101,226,5,242,195,64,51,157,24,34,72,70,165,99,95,180,64,180,62,212,202,240,252,24,253,186,13,144,191,194,100,216,115,199,117,47,129,100,122,135,
+13,114,12,155,153,57,50,82,8,225,139,232,190,138,106,203,170,124,215,81,193,180,111,118,96,166,68,192,30,40,76,28,75,160,81,153,144,75,211,183,174,228,181,20,22,109,19,19,182,5,174,217,139,182,69,64,155,149,168,151,4,223,13,56,248,149,149,162,91,237,82,187,116,13,155,13,219,1,176,176,191,161,88,104,90,203,180,220,86,236,108,216,135,40,112,255,194,108,171,194,194,150,196,238,98,247,174,194,192,172,53,103,87,28,12,177,33,137,157,198,24,48,177,35,81,171,184,185,58,118,124,21,247,77,189,72,211,225,131,35,113,233,247,255,198,175,98,120,39,18,86,133,230,173,70,228,74,96,179,208,77,207,231,129,103,19,81,209,250,214,66,223,230,74,114,241,13,194,76,61,175,90,232,42,19,138,159,77,220,51,174,112,143,109,173,43,61,72,39,147,45,41,240,204,240,34,203,198,73,11,34,80,142,13,150,178,50,136,141,116,115,68,247,37,237,147,8,92,251,152,150,229,49,86,103,74,159,49,179,226,52,112,38,77,74,176,192,78,36,36,182,115,130,140,88,111,
+162,142,70,40,124,188,99,182,222,145,88,64,154,103,172,247,117,83,157,30,109,2,105,16,207,222,97,249,119,159,226,240,247,125,206,141,190,36,244,161,122,92,52,116,35,146,64,131,182,192,92,95,221,20,226,172,124,61,186,89,148,248,130,221,59,59,206,137,68,83,146,20,49,55,2,164,30,31,29,47,68,143,248,184,115,241,131,42,24,163,248,104,131,25,18,156,24,167,21,194,178,173,118,142,89,229,187,64,193,205,122,206,76,22,54,1,148,44,129,154,89,57,146,180,206,83,122,96,204,106,24,147,182,173,140,3,116,211,56,53,139,197,155,204,186,93,36,92,243,127,35,201,112,73,
+
diff --git a/uppsrc/Core/src.tpp/all.i b/uppsrc/Core/src.tpp/all.i
new file mode 100644
index 000000000..63e337bee
--- /dev/null
+++ b/uppsrc/Core/src.tpp/all.i
@@ -0,0 +1,116 @@
+TOPIC("VectorMap$en-us")
+#include "VectorMap$en-us.tpp"
+END_TOPIC
+
+TOPIC("Vector$en-us")
+#include "Vector$en-us.tpp"
+END_TOPIC
+
+TOPIC("Convert$en-us")
+#include "Convert$en-us.tpp"
+END_TOPIC
+
+TOPIC("Format$en-us")
+#include "Format$en-us.tpp"
+END_TOPIC
+
+TOPIC("Segtor$en-us")
+#include "Segtor$en-us.tpp"
+END_TOPIC
+
+TOPIC("String$en-us")
+#include "String$en-us.tpp"
+END_TOPIC
+
+TOPIC("Indext$en-us")
+#include "Indext$en-us.tpp"
+END_TOPIC
+
+TOPIC("BiVector$en-us")
+#include "BiVector$en-us.tpp"
+END_TOPIC
+
+TOPIC("BiArray$en-us")
+#include "BiArray$en-us.tpp"
+END_TOPIC
+
+TOPIC("ArrayMap$en-us")
+#include "ArrayMap$en-us.tpp"
+END_TOPIC
+
+TOPIC("ArrayIndex$en-us")
+#include "ArrayIndex$en-us.tpp"
+END_TOPIC
+
+TOPIC("Array$en-us")
+#include "Array$en-us.tpp"
+END_TOPIC
+
+TOPIC("algo$en-us")
+#include "algo$en-us.tpp"
+END_TOPIC
+
+TOPIC("AIndex$en-us")
+#include "AIndex$en-us.tpp"
+END_TOPIC
+
+TOPIC("AMap$en-us")
+#include "AMap$en-us.tpp"
+END_TOPIC
+
+TOPIC("PtePtr$en-us")
+#include "PtePtr$en-us.tpp"
+END_TOPIC
+
+TOPIC("DateFmt$en-us")
+#include "DateFmt$en-us.tpp"
+END_TOPIC
+
+TOPIC("One$en-us")
+#include "One$en-us.tpp"
+END_TOPIC
+
+TOPIC("Any$en-us")
+#include "Any$en-us.tpp"
+END_TOPIC
+
+TOPIC("Stream$en-us")
+#include "Stream$en-us.tpp"
+END_TOPIC
+
+TOPIC("StreamFn$en-us")
+#include "StreamFn$en-us.tpp"
+END_TOPIC
+
+TOPIC("Buffer$en-us")
+#include "Buffer$en-us.tpp"
+END_TOPIC
+
+TOPIC("SerializationUtils$en-us")
+#include "SerializationUtils$en-us.tpp"
+END_TOPIC
+
+TOPIC("CParser$en-us")
+#include "CParser$en-us.tpp"
+END_TOPIC
+
+TOPIC("util$en-us")
+#include "util$en-us.tpp"
+END_TOPIC
+
+TOPIC("Callbacks$en-us")
+#include "Callbacks$en-us.tpp"
+END_TOPIC
+
+TOPIC("Color$en-us")
+#include "Color$en-us.tpp"
+END_TOPIC
+
+TOPIC("Thread$en-us")
+#include "Thread$en-us.tpp"
+END_TOPIC
+
+TOPIC("NetNode$en-us")
+#include "NetNode$en-us.tpp"
+END_TOPIC
+
diff --git a/uppsrc/Core/src.tpp/util$en-us.tpp b/uppsrc/Core/src.tpp/util$en-us.tpp
new file mode 100644
index 000000000..800d815ff
--- /dev/null
+++ b/uppsrc/Core/src.tpp/util$en-us.tpp
@@ -0,0 +1,42 @@
+TITLE("Miscellaneous")
+COMPRESSED
+120,156,133,83,91,111,155,48,20,254,43,71,234,69,109,154,
+102,190,98,3,47,149,218,62,76,211,54,105,93,159,16,106,
+28,112,26,171,4,50,155,76,169,182,245,183,239,0,33,221,
+195,182,38,81,44,224,187,158,35,50,6,199,199,100,74,142,
+200,27,159,228,198,46,205,182,106,243,204,9,161,83,195,100,
+250,244,225,115,156,78,174,206,34,113,142,34,20,69,184,162,
+92,75,78,5,139,240,143,114,202,36,227,130,106,22,11,205,
+185,38,73,81,153,16,242,172,98,90,167,157,51,67,18,83,
+146,81,37,180,208,148,43,205,144,203,8,97,68,49,73,5,
+215,76,38,165,13,69,158,25,205,211,201,151,8,73,188,115,
+66,113,66,35,38,148,96,132,19,38,208,138,106,45,168,146,
+154,199,81,148,20,102,211,186,166,222,123,57,74,25,77,23,
+84,165,24,249,229,229,101,70,5,25,18,8,20,163,68,96,
+84,138,247,136,96,138,202,152,196,82,83,77,56,138,75,69,
+100,178,49,222,172,255,222,188,211,144,111,86,87,36,113,173,
+69,137,201,5,165,10,41,209,52,58,162,66,97,81,205,133,
+212,138,160,57,99,140,115,70,57,139,99,38,35,169,146,149,
+53,165,245,251,10,6,195,79,40,82,213,84,29,33,145,8,
+201,153,136,187,97,113,116,98,44,146,49,149,130,200,8,149,
+18,111,191,109,157,183,107,91,227,198,126,60,252,58,185,253,
+116,121,127,7,89,224,41,124,116,161,176,85,101,106,219,108,
+195,105,158,5,146,194,112,76,32,59,33,228,146,144,9,244,
+155,122,200,247,215,112,187,43,242,14,195,6,40,30,95,87,
+46,0,254,218,149,133,141,183,75,235,189,45,193,55,77,59,
+112,161,89,194,253,252,98,126,1,118,87,216,126,25,51,120,
+223,118,148,133,9,174,48,85,245,12,6,238,90,239,234,199,
+25,202,89,112,165,53,131,164,105,1,159,195,147,171,203,94,
+232,32,1,133,169,97,97,193,58,244,245,176,54,181,121,68,
+219,197,51,132,141,45,220,210,21,176,50,117,89,89,31,166,
+208,120,8,110,189,169,108,23,127,188,63,42,108,131,45,167,
+80,186,176,169,204,51,70,128,214,238,218,173,169,192,213,203,
+198,175,77,239,214,54,125,63,196,250,217,31,245,113,96,217,
+59,184,177,222,125,71,243,165,111,214,249,56,185,125,161,124,
+128,241,61,60,153,227,23,67,140,199,217,252,60,121,157,117,
+55,220,145,126,118,62,206,121,255,194,65,209,212,161,245,219,
+162,109,134,12,255,81,237,161,221,213,16,98,126,250,111,155,
+30,250,48,226,14,139,158,92,113,24,222,183,61,240,16,231,
+250,53,70,223,120,220,92,247,88,164,7,151,235,81,224,242,
+231,13,30,222,13,107,235,118,232,253,161,1,140,69,242,223,
+77,207,70,247,
\ No newline at end of file
diff --git a/uppsrc/Core/srcdoc.tpp/BRC$en-us.tpp b/uppsrc/Core/srcdoc.tpp/BRC$en-us.tpp
new file mode 100644
index 000000000..26297dfb8
--- /dev/null
+++ b/uppsrc/Core/srcdoc.tpp/BRC$en-us.tpp
@@ -0,0 +1,12 @@
+TITLE("Including binary data using .brc files")
+COMPRESSED
+120,156,149,87,139,114,219,184,21,253,21,76,156,182,182,67,171,4,64,240,33,117,58,235,60,102,214,219,212,187,147,109,166,221,117,61,17,68,65,50,55,124,168,4,101,71,105,155,111,239,185,0,169,151,189,217,105,156,68,30,10,184,247,220,115,207,61,0,111,4,123,254,60,12,194,147,240,55,254,140,95,155,133,94,151,221,237,77,41,210,116,82,112,46,194,137,230,201,228,251,108,242,229,203,151,17,143,194,116,66,193,56,130,241,48,146,92,112,60,11,35,145,112,149,133,153,74,121,26,202,36,18,42,9,213,120,165,91,93,221,222,232,84,78,206,223,197,216,37,2,117,34,185,228,33,143,69,132,85,161,12,69,196,133,226,105,26,241,68,165,50,139,227,113,174,87,93,209,212,183,55,51,218,23,97,155,196,182,48,73,227,136,99,83,164,132,76,84,132,205,81,4,120,18,137,147,56,73,198,93,209,149,230,246,166,32,220,64,251,138,80,70,65,124,2,116,34,193,206,72,68,113,36,83,33,121,42,68,156,201,40,139,0,155,139,113,209,25,128,156,69,98,162,241,143,182,
+41,228,139,84,196,37,24,137,18,37,177,44,193,103,20,102,92,32,105,26,42,133,124,230,211,64,211,12,4,17,73,180,55,70,74,145,40,218,145,70,41,151,73,42,34,17,11,128,8,19,20,74,8,212,120,110,108,142,189,82,240,73,7,88,147,87,223,168,9,199,230,36,72,78,68,152,133,34,78,50,36,5,96,212,44,179,140,203,20,73,35,174,66,46,199,121,51,71,157,51,161,66,233,50,166,104,69,140,200,142,22,21,115,128,22,50,69,202,132,75,137,255,85,148,38,99,107,168,25,93,211,222,222,156,127,115,26,142,194,145,80,234,140,182,103,216,158,202,72,202,40,206,34,30,74,164,65,140,136,56,139,67,180,147,43,145,142,103,218,34,103,135,71,137,103,150,147,154,192,189,76,149,68,234,24,255,161,175,40,80,130,31,145,69,169,148,105,56,206,75,109,109,79,18,17,116,78,69,114,30,112,126,146,16,183,74,138,40,35,114,164,0,201,34,86,25,7,203,42,142,66,49,110,205,191,214,69,107,42,83,131,230,2,242,152,12,45,234,181,8,48,94,138,34,224,2,
+98,84,113,28,18,95,10,130,16,82,129,240,144,167,17,16,225,7,109,238,122,53,206,118,53,200,128,203,147,76,68,18,72,178,40,2,3,8,192,51,206,121,152,226,7,149,129,23,167,15,222,11,171,79,239,183,71,1,143,78,18,200,24,157,202,34,74,159,73,226,79,128,126,17,135,10,125,16,126,187,32,214,197,115,240,206,69,74,255,28,243,92,5,28,243,0,136,92,41,212,45,65,181,72,81,187,2,247,210,73,156,39,233,248,218,60,216,215,186,51,189,96,206,95,61,247,74,227,113,192,227,147,144,246,171,52,67,3,121,68,252,201,40,202,68,38,165,18,153,146,113,8,30,173,31,104,218,76,35,229,198,113,27,36,9,120,130,225,66,173,74,161,122,183,13,149,39,156,160,136,52,139,137,133,62,200,244,162,44,106,194,1,101,76,188,24,206,95,189,224,60,161,64,41,134,38,77,227,80,102,32,3,28,132,10,74,135,33,164,104,52,250,44,48,6,228,8,249,71,189,52,211,139,126,90,29,4,82,160,146,42,37,221,98,39,160,3,4,226,100,97,24,227,73,154,98,
+154,198,75,189,58,16,160,8,3,17,66,69,240,31,133,161,68,46,200,47,204,200,75,224,12,232,0,172,40,83,94,129,211,139,218,216,206,204,209,124,21,186,178,5,15,4,7,119,208,159,82,105,20,197,192,139,220,9,89,19,181,16,3,172,18,57,254,65,99,94,254,253,225,191,191,123,115,125,241,254,71,118,99,197,132,93,213,121,185,158,23,245,146,205,138,90,183,27,54,215,157,102,107,75,79,70,179,54,103,139,162,52,246,247,183,55,54,164,197,236,125,217,21,21,218,55,125,49,125,17,244,235,254,118,103,174,94,191,9,88,209,177,194,178,123,131,40,70,219,13,235,26,102,170,153,153,31,132,46,106,182,105,214,45,211,171,85,89,228,154,188,209,246,113,40,221,105,191,22,45,194,170,220,156,49,255,233,113,140,216,119,107,139,44,181,53,109,199,180,123,200,30,138,238,142,117,119,134,193,194,76,109,17,144,77,159,17,246,233,51,172,4,8,205,250,70,49,93,207,89,183,89,25,255,188,232,198,125,97,244,145,76,216,203,171,235,203,119,63,157,218,110,62,253,208,85,
+171,114,250,225,126,241,49,64,52,124,140,30,186,114,250,236,108,111,3,62,80,57,48,180,128,164,219,229,154,134,155,157,222,252,145,29,6,184,165,154,9,159,158,53,247,132,82,227,27,20,6,174,232,233,106,61,3,17,172,152,99,119,177,40,76,203,154,133,7,137,72,179,77,103,216,244,252,150,61,220,21,249,29,91,53,0,110,153,238,220,206,153,89,22,117,77,204,209,14,122,176,199,243,172,108,242,143,35,118,89,218,38,64,221,13,190,111,135,92,247,186,45,244,12,212,1,130,94,119,13,26,138,86,148,229,134,45,77,109,96,172,102,30,16,69,236,81,45,211,15,165,169,151,221,221,109,208,35,202,155,186,211,232,135,207,79,57,153,95,49,98,211,127,134,143,19,160,237,166,158,67,19,122,209,1,144,107,27,154,50,20,224,65,191,209,136,236,131,81,128,178,88,214,216,225,58,89,97,112,11,208,71,59,34,71,143,101,167,61,191,249,186,109,169,5,80,32,169,96,16,36,106,7,113,214,22,84,49,5,153,255,66,34,114,29,161,208,174,109,69,61,47,238,139,249,154,
+64,158,141,92,99,173,65,113,115,230,140,214,16,216,190,97,36,186,26,143,216,105,107,74,20,118,239,162,210,55,64,236,4,189,45,167,159,159,179,225,129,211,235,118,44,180,221,239,154,175,253,80,95,151,142,164,121,67,61,238,238,10,27,48,15,157,212,97,155,202,60,160,169,102,59,82,253,164,208,137,122,36,236,147,194,141,57,164,244,172,218,16,8,63,30,135,201,174,155,7,138,195,114,93,99,32,141,195,246,132,152,105,134,126,93,23,91,109,89,71,117,158,27,107,31,105,115,122,209,123,6,155,173,139,114,78,194,52,237,162,105,43,191,180,54,180,139,86,195,230,86,46,208,210,184,134,85,126,112,93,181,230,147,201,215,29,165,58,34,237,167,189,26,180,183,35,91,84,69,169,91,86,153,252,78,215,133,173,124,76,175,245,3,104,186,109,245,198,146,0,208,109,252,181,235,21,180,227,213,55,51,12,187,231,112,183,209,114,196,128,23,92,144,25,58,11,67,19,150,16,133,101,120,236,35,147,220,105,209,170,109,168,30,234,161,102,64,1,31,170,215,16,128,27,244,253,
+230,187,32,218,225,160,27,10,157,79,31,13,171,116,141,104,94,146,142,92,168,181,151,147,55,148,74,231,109,227,6,133,232,91,219,39,77,109,250,225,242,221,187,203,199,222,198,191,102,111,223,146,186,124,71,30,88,85,204,231,80,239,206,232,248,214,194,48,60,230,19,185,146,247,4,80,181,90,119,251,93,119,186,31,92,144,24,238,39,172,248,108,182,181,208,227,199,126,97,169,241,13,106,252,84,84,235,170,95,108,137,137,114,13,178,167,47,24,247,177,118,251,157,230,208,177,251,66,187,200,131,34,15,105,233,157,245,72,198,55,211,219,201,99,139,247,177,73,83,51,215,15,28,37,243,221,177,115,103,202,21,1,219,154,172,46,92,107,183,147,112,212,16,50,214,71,137,251,249,217,2,232,215,29,175,202,155,117,221,61,129,208,31,66,67,198,128,6,244,79,238,68,249,243,158,99,19,57,117,95,12,73,111,207,173,161,248,171,133,155,254,166,130,107,230,56,94,225,234,125,99,189,90,237,208,192,193,213,2,223,183,21,244,189,66,94,208,233,142,167,189,149,135,232,251,204,
+186,53,67,87,175,223,191,125,235,207,228,163,64,30,20,51,165,187,48,111,227,125,197,118,30,197,158,94,244,194,240,77,57,160,230,73,86,65,208,18,94,110,247,134,243,55,243,255,166,27,246,118,114,228,234,245,30,38,52,185,52,72,65,220,211,212,108,15,56,119,225,129,218,186,252,206,91,199,208,20,55,76,149,182,31,135,99,231,232,202,52,62,200,246,138,179,139,255,12,30,240,215,203,31,255,210,91,128,1,88,80,109,105,254,167,231,191,122,187,57,138,61,152,38,108,205,29,118,134,142,231,242,24,43,129,34,46,107,15,243,209,57,57,40,136,205,241,74,148,35,216,230,204,17,137,250,173,183,249,126,225,54,237,96,32,199,126,238,188,145,57,159,116,243,120,96,118,211,63,64,214,151,75,112,230,165,186,104,202,178,121,32,128,187,67,138,20,147,183,134,174,60,227,175,24,196,192,214,241,124,62,250,254,171,115,188,91,245,212,28,127,219,60,24,84,23,120,181,97,88,115,28,2,187,187,219,246,210,182,36,185,152,79,171,166,5,104,182,104,155,106,95,5,205,236,23,
+80,122,84,11,78,189,246,9,172,174,109,79,122,158,63,252,182,110,113,234,200,221,234,252,168,142,219,97,80,220,61,103,107,2,232,225,103,211,54,120,59,50,109,5,112,132,214,118,45,248,183,236,174,41,231,131,82,118,87,47,223,230,218,29,163,46,101,131,129,88,233,238,238,108,184,200,206,12,78,84,186,51,119,221,176,221,107,175,23,140,110,161,192,123,111,77,27,119,107,176,158,166,217,134,30,193,152,119,41,142,166,18,47,55,36,101,175,160,158,70,76,199,254,141,232,229,207,130,142,247,159,175,126,216,187,190,110,175,131,190,54,66,98,87,38,47,22,148,177,191,169,211,154,83,139,119,25,84,84,206,233,20,249,92,224,34,60,167,104,51,252,42,166,23,132,241,81,113,213,81,93,35,66,185,167,141,222,148,142,173,126,95,223,120,205,218,108,239,167,222,86,251,19,55,111,170,85,235,143,74,111,231,116,81,166,47,154,182,192,139,69,223,142,17,123,75,211,69,73,255,239,183,37,34,236,200,83,94,249,59,122,185,9,6,83,253,251,213,181,20,187,59,187,166,83,7,
+220,82,254,221,117,173,160,119,68,127,11,219,94,219,142,15,141,239,95,126,215,187,202,186,29,196,113,240,230,89,209,200,140,216,251,154,110,156,111,175,174,223,255,35,32,91,221,127,195,220,157,234,7,59,237,238,197,104,139,14,180,250,235,142,191,4,213,160,175,173,220,227,149,182,61,86,103,132,121,238,168,70,244,214,245,111,134,121,118,253,179,190,129,30,23,133,65,2,154,244,133,166,23,74,58,23,232,23,104,34,96,86,111,8,235,130,238,97,102,169,253,123,15,250,232,247,34,25,225,28,4,125,251,63,70,167,205,3,
diff --git a/uppsrc/Core/srcdoc.tpp/Caveats$en-us.tpp b/uppsrc/Core/srcdoc.tpp/Caveats$en-us.tpp
new file mode 100644
index 000000000..5daaf32ec
--- /dev/null
+++ b/uppsrc/Core/srcdoc.tpp/Caveats$en-us.tpp
@@ -0,0 +1,7 @@
+TITLE("U++ traps and pitfalls")
+COMPRESSED
+120,156,165,84,93,111,219,54,20,253,43,23,77,86,216,137,99,139,95,250,220,134,22,217,250,50,44,27,186,54,47,134,91,209,18,29,19,145,69,149,164,157,24,65,242,219,119,41,11,73,11,44,201,195,4,83,182,232,123,207,189,231,220,67,205,41,28,31,71,147,232,40,122,229,202,127,83,43,185,109,252,98,174,57,79,11,73,69,113,253,199,95,89,113,242,110,20,243,113,64,33,136,194,18,194,82,193,8,167,49,222,8,35,84,80,198,73,74,51,158,50,150,70,121,213,72,231,22,243,134,166,105,17,146,232,132,30,209,68,80,146,240,148,167,132,37,41,197,92,26,69,52,74,168,32,156,165,84,228,181,114,213,98,46,83,86,156,124,140,49,137,133,74,8,30,145,152,242,132,211,136,69,148,99,41,146,166,156,36,34,101,89,28,231,149,236,188,54,237,80,75,19,66,73,177,36,73,129,61,63,60,60,76,9,143,14,29,112,4,35,17,199,86,9,238,69,156,38,68,100,81,38,82,146,70,12,193,69,18,137,188,147,86,110,158,167,46,94,165,158,68,185,246,10,33,78,
+78,9,73,48,37,158,196,71,132,39,72,52,101,92,164,73,132,197,41,165,140,81,194,104,150,81,17,139,36,95,43,89,43,139,20,56,137,251,102,147,73,114,36,132,224,24,207,185,72,82,78,25,206,134,51,142,82,112,146,9,158,9,154,183,202,121,85,151,103,7,217,14,244,31,27,15,125,7,164,116,146,30,197,60,206,8,170,207,179,132,71,89,76,18,22,196,35,40,123,204,56,205,196,35,210,48,181,187,175,247,63,253,126,113,246,249,31,152,59,86,192,231,242,180,60,5,111,101,231,64,182,53,116,218,175,100,211,184,183,139,185,139,10,192,47,184,187,19,193,59,225,214,204,24,179,184,60,174,37,46,8,65,231,239,4,92,170,202,27,251,243,7,99,126,133,219,226,144,28,246,167,120,61,61,221,78,223,251,145,30,67,249,11,220,150,243,111,229,162,88,228,121,51,163,194,226,242,51,34,150,184,122,76,248,219,154,101,163,54,57,188,247,160,219,157,108,116,45,189,114,96,213,74,89,213,86,248,211,155,161,108,1,122,53,0,194,149,242,14,20,198,111,49,188,134,149,
+182,206,79,192,175,213,83,38,84,178,133,165,130,6,35,236,119,224,53,44,247,88,110,10,163,11,227,21,86,182,86,238,161,54,88,170,53,30,214,114,167,122,32,39,55,10,186,67,127,227,105,207,224,127,169,82,153,214,121,192,160,242,45,184,94,155,233,39,211,141,198,189,250,79,202,213,245,168,87,206,189,36,47,6,13,217,227,215,194,202,121,84,46,198,207,79,224,82,217,61,56,189,209,141,180,65,107,185,52,187,71,222,19,48,109,179,135,141,177,10,212,109,215,232,74,251,23,165,216,25,93,195,159,251,15,237,168,151,117,208,228,133,242,159,214,218,65,248,180,88,5,245,169,164,195,65,72,88,110,175,160,60,27,124,139,210,121,169,91,101,221,97,60,229,155,249,23,111,58,93,149,121,57,43,103,231,216,94,57,115,182,170,77,85,206,112,251,186,252,90,30,171,182,60,219,186,47,16,158,131,243,91,135,198,0,167,54,178,245,186,114,139,242,205,4,54,10,183,113,218,210,131,219,86,107,88,109,219,42,188,137,0,207,163,183,102,239,6,75,201,6,250,215,138,66,43,
+161,113,62,74,171,154,253,4,214,230,70,237,148,13,198,67,10,131,223,48,187,219,218,206,56,245,178,107,116,235,225,54,76,250,98,219,52,223,77,177,54,91,148,30,246,189,69,158,23,238,188,87,230,186,53,55,189,111,215,186,189,10,179,219,250,65,179,128,26,132,171,84,135,39,99,15,55,26,159,131,193,177,69,217,255,59,133,112,0,14,236,47,241,36,169,48,7,121,131,220,6,160,192,61,4,78,192,153,129,162,169,85,254,244,206,120,133,201,1,116,119,32,242,223,4,119,197,15,104,216,92,24,48,182,225,130,223,240,92,169,122,186,184,191,255,49,104,241,47,157,23,10,78,
+
diff --git a/uppsrc/Core/srcdoc.tpp/Charset$en-us.tpp b/uppsrc/Core/srcdoc.tpp/Charset$en-us.tpp
new file mode 100644
index 000000000..718313b1d
--- /dev/null
+++ b/uppsrc/Core/srcdoc.tpp/Charset$en-us.tpp
@@ -0,0 +1,93 @@
+TITLE("Charset and encoding issues")
+COMPRESSED
+120,156,133,85,93,111,219,70,16,252,43,7,203,45,108,135,
+18,238,155,71,241,37,128,162,0,125,73,128,38,126,18,132,
+234,36,157,44,162,20,169,240,72,127,160,104,126,123,103,73,
+74,241,91,45,152,164,169,219,221,217,153,217,245,74,178,219,
+91,158,240,9,255,159,159,249,167,112,240,93,217,174,87,165,
+116,46,47,132,144,60,247,34,205,191,102,249,207,159,63,103,
+66,115,151,83,50,129,100,130,107,37,164,192,59,174,101,42,
+76,198,51,227,132,227,42,213,210,164,220,204,207,190,241,167,
+245,202,59,149,63,252,105,17,37,19,51,81,66,9,46,172,
+212,56,197,21,151,90,72,35,156,211,34,53,78,101,214,206,
+119,254,220,22,117,181,94,109,41,142,138,41,132,241,212,89,
+45,16,164,141,84,169,209,8,214,26,240,20,10,167,54,77,
+231,109,209,150,97,189,42,8,247,86,216,52,247,90,18,236,
+5,101,208,137,157,0,166,76,145,66,75,109,181,114,82,9,
+39,165,205,148,206,52,240,11,57,47,218,0,180,91,132,81,
+40,133,25,20,214,70,11,5,106,116,106,20,142,165,184,107,
+158,9,137,234,142,27,131,194,225,245,194,23,49,69,113,22,
+229,100,106,232,180,211,78,168,212,73,45,173,4,0,158,162,
+91,170,110,230,251,16,119,136,83,82,228,45,32,229,139,143,
+38,23,8,78,147,116,34,121,198,165,77,51,20,4,88,52,
+174,178,76,40,135,130,90,24,46,212,124,87,239,209,236,86,
+26,174,114,196,56,200,97,145,184,167,198,88,1,188,82,57,
+84,76,133,82,184,26,237,210,121,12,36,72,91,55,235,213,
+195,199,59,62,227,51,105,204,61,225,205,16,238,148,86,74,
+219,76,11,174,80,5,57,52,209,101,57,36,21,70,186,249,
+214,71,148,108,53,113,187,32,11,144,161,64,191,114,70,161,
+178,197,5,210,162,61,5,102,100,166,157,82,142,207,119,165,
+143,241,29,61,15,212,162,16,137,16,147,148,88,53,74,234,
+140,168,81,18,244,74,107,50,1,126,141,213,92,206,155,240,
+163,43,154,112,10,21,8,46,224,144,252,34,206,104,71,96,
+25,220,40,19,33,225,71,99,45,39,182,12,60,33,149,1,
+221,92,56,13,68,248,64,224,118,52,100,111,143,222,23,66,
+37,66,77,50,169,21,144,100,90,131,0,36,16,153,16,130,
+59,124,208,25,104,233,157,33,70,111,189,183,149,208,137,208,
+147,20,78,134,78,153,166,242,153,34,250,36,216,151,150,27,
+200,32,135,112,73,164,203,91,208,46,164,163,223,123,138,55,
+137,192,68,0,161,48,6,109,43,16,45,29,90,55,96,94,
+245,38,23,169,155,127,9,47,241,147,111,195,232,150,135,197,
+237,96,51,97,19,97,39,156,226,141,203,32,159,208,68,159,
+210,58,147,153,82,70,102,70,89,14,26,227,48,210,20,76,
+67,213,15,228,53,73,154,136,20,227,133,86,141,65,243,125,
+24,26,79,5,65,145,46,179,68,194,152,100,51,45,139,138,
+112,192,23,249,96,133,135,197,7,33,82,74,228,48,45,206,
+89,174,50,112,1,10,184,129,205,177,18,28,116,134,204,18,
+51,64,59,97,247,183,127,10,155,233,56,175,20,72,246,51,
+202,56,50,45,2,129,28,24,144,38,227,220,226,141,115,152,
+164,249,147,63,95,221,71,184,37,79,36,135,135,176,128,12,
+134,17,165,96,62,158,209,50,193,106,0,255,216,69,153,25,
+252,183,153,86,33,182,97,191,94,253,243,215,191,191,45,191,
+76,31,191,177,85,148,57,91,28,125,19,67,203,124,181,103,
+161,194,80,21,213,19,43,98,236,66,252,125,189,138,42,87,
+236,241,251,231,205,212,45,151,244,183,201,217,227,230,195,230,
+3,142,176,170,110,89,23,233,252,185,107,194,120,44,97,219,
+174,101,117,215,48,44,133,80,69,236,49,214,30,125,203,94,
+2,59,250,231,192,42,127,10,123,182,185,185,100,221,220,48,
+31,217,161,110,240,110,217,52,184,47,35,22,96,216,111,110,
+102,99,197,239,199,128,28,3,176,33,25,149,14,207,161,121,
+99,17,19,2,220,129,213,7,182,125,107,67,164,51,207,190,
+44,246,35,160,25,251,82,191,32,42,140,93,209,247,71,122,
+83,179,38,248,93,75,15,72,30,217,185,169,183,101,56,177,
+151,99,168,88,89,251,158,137,67,81,34,176,194,25,128,248,
+227,211,146,221,1,96,141,108,232,111,95,96,147,220,207,216,
+215,3,219,161,225,24,18,22,250,6,78,33,70,40,76,149,
+234,42,176,88,151,29,237,243,129,154,23,122,113,10,109,129,
+83,3,35,72,142,218,59,4,49,218,164,125,205,177,207,254,
+251,72,157,250,18,247,29,165,97,47,69,123,100,251,226,112,
+8,13,246,194,85,181,152,140,29,179,109,32,232,84,26,164,
+0,235,105,198,254,104,123,52,23,164,184,213,37,21,238,11,
+12,157,48,176,238,193,0,157,218,7,48,136,28,125,41,98,
+231,34,197,183,154,149,129,100,39,82,154,122,223,237,194,213,
+31,179,94,168,2,177,131,78,184,108,166,3,157,69,53,72,
+82,84,103,80,112,213,12,39,8,125,87,181,104,101,159,176,
+162,71,185,185,9,23,7,12,212,147,120,93,85,208,198,7,
+83,197,51,22,1,243,16,143,221,241,215,128,209,162,50,252,
+245,224,14,135,123,122,244,101,57,90,1,135,216,152,139,76,
+198,95,151,203,213,175,189,207,94,95,215,215,188,59,204,1,
+220,16,154,200,238,124,53,40,28,193,213,110,36,17,98,192,
+159,203,30,82,15,136,124,12,241,63,131,184,193,62,93,115,
+174,201,3,67,167,93,123,112,215,70,71,53,95,234,174,220,
+179,183,34,224,10,228,128,190,153,210,253,112,160,160,110,4,
+236,203,88,67,31,140,206,158,88,121,199,93,159,52,132,97,
+86,199,182,238,200,83,232,109,160,238,61,59,9,166,132,44,
+94,190,239,109,231,43,216,131,26,104,8,61,141,70,47,208,
+133,134,222,128,72,132,250,48,29,22,6,219,98,93,145,83,
+80,187,31,239,246,136,46,175,229,127,241,28,139,211,185,124,
+35,193,66,115,110,2,133,142,238,9,5,70,166,41,158,138,
+10,88,250,70,201,41,40,130,255,167,197,14,106,189,97,98,
+124,53,146,228,171,183,1,197,8,245,23,146,67,83,159,174,
+102,35,72,194,110,209,246,5,250,221,227,226,155,188,239,201,
+233,49,211,3,9,53,236,237,222,107,63,58,95,178,209,80,
+87,68,84,172,183,55,199,174,91,255,7,234,162,241,160,
\ No newline at end of file
diff --git a/uppsrc/Core/srcdoc.tpp/Configuration$en-us.tpp b/uppsrc/Core/srcdoc.tpp/Configuration$en-us.tpp
new file mode 100644
index 000000000..017ed7b0c
--- /dev/null
+++ b/uppsrc/Core/srcdoc.tpp/Configuration$en-us.tpp
@@ -0,0 +1,170 @@
+TITLE("About storing configuration")
+COMPRESSED
+120,156,189,88,105,119,219,198,21,253,43,99,203,142,69,7,
+162,49,131,157,76,122,226,210,178,173,83,91,201,177,236,166,
+57,170,142,49,36,135,20,34,44,44,22,83,108,154,252,246,
+222,55,3,146,0,165,198,137,63,20,62,22,183,121,219,125,
+247,45,192,165,96,143,30,217,150,125,100,127,230,26,189,80,
+11,217,164,245,213,101,42,194,112,156,4,182,59,150,60,24,
+127,31,141,127,251,237,183,97,20,137,49,169,226,80,197,109,
+215,225,130,115,215,182,93,17,112,47,178,35,47,228,161,237,
+4,174,240,2,219,27,173,100,41,179,171,75,25,58,227,167,
+239,124,72,9,203,59,114,184,195,109,238,11,23,167,108,199,
+22,46,23,30,15,67,151,7,94,232,68,190,63,154,201,85,
+157,20,249,213,229,148,228,32,229,64,202,14,66,223,229,144,
+113,61,225,4,158,11,89,215,229,28,239,185,23,248,65,48,
+170,147,58,85,144,225,126,48,150,174,24,79,200,75,215,242,
+143,224,157,8,32,234,10,215,119,157,80,56,60,20,194,143,
+28,55,114,225,54,23,163,164,86,112,114,10,25,146,35,49,
+15,6,93,207,229,14,240,112,3,207,193,177,0,175,174,29,
+113,1,171,161,237,121,48,168,110,183,32,17,62,36,231,195,
+156,8,60,58,29,186,33,119,130,80,184,194,23,112,192,14,
+16,36,89,247,70,115,85,205,32,231,8,62,174,225,210,120,
+242,157,55,230,16,14,172,224,72,216,145,45,252,32,130,65,
+56,139,128,157,40,226,78,8,131,46,247,108,238,140,102,197,
+156,130,20,158,237,140,33,19,34,11,62,20,107,72,60,159,
+195,95,225,132,176,24,112,199,193,95,207,13,131,81,165,40,
+15,117,81,94,93,62,253,238,216,30,218,67,225,121,3,242,
+55,130,120,232,184,142,227,250,145,203,109,7,86,160,195,37,
+184,124,27,153,228,158,8,71,83,89,193,100,237,18,176,19,
+202,60,177,8,176,59,161,231,192,178,143,63,200,40,194,115,
+128,140,136,220,208,113,66,123,52,75,101,85,117,224,121,74,
+33,114,110,113,126,20,16,170,158,35,220,136,160,113,4,224,
+21,190,23,113,224,235,249,174,45,70,165,250,87,147,148,42,
+83,57,0,78,64,140,241,54,57,45,9,225,139,33,161,176,
+184,0,13,61,223,183,9,45,15,92,16,142,7,184,109,30,
+186,240,8,255,144,224,186,229,161,230,134,230,5,119,44,238,
+28,69,194,117,224,73,228,186,0,0,10,120,196,57,183,67,
+252,67,100,128,69,51,131,195,5,29,132,49,111,196,93,139,
+187,71,1,8,140,60,69,46,153,143,28,130,79,0,125,225,
+219,30,210,32,140,184,32,208,197,35,192,206,69,72,255,7,
+36,239,89,28,133,0,15,185,231,33,108,7,64,139,16,161,
+123,64,222,209,228,230,65,56,58,87,235,234,133,172,85,203,
+150,167,147,71,134,102,220,183,184,127,100,147,188,23,70,72,
+31,119,9,62,199,117,35,17,57,142,39,34,207,241,109,192,
+88,153,58,38,97,170,37,93,135,59,37,129,197,3,148,21,
+66,245,60,4,175,197,16,120,192,201,21,17,70,62,129,208,
+42,137,79,210,36,39,63,192,139,177,161,194,211,201,215,156,
+7,164,40,68,181,132,161,111,59,17,176,0,4,182,7,154,
+163,19,132,200,51,210,44,80,3,212,10,102,55,114,169,226,
+147,182,78,127,249,248,235,227,211,243,147,15,23,236,178,18,
+227,175,145,46,246,124,90,52,53,171,64,212,36,95,178,89,
+145,47,146,101,3,226,162,23,124,117,117,89,217,99,118,182,
+96,155,162,97,107,153,215,172,46,216,178,96,69,206,154,138,
+142,151,106,153,84,117,185,97,139,38,159,145,72,197,142,215,
+138,205,139,60,126,82,179,52,185,81,172,190,86,25,251,164,
+112,38,107,102,215,22,187,46,114,85,213,233,102,96,145,214,
+248,73,154,178,69,146,207,233,92,82,178,117,41,87,43,85,
+86,44,201,217,164,40,213,179,31,147,220,17,147,34,27,94,
+143,90,119,232,37,24,179,203,199,182,125,98,219,236,162,214,
+142,191,82,53,142,190,83,75,243,249,24,129,84,53,155,93,
+203,146,197,79,63,201,180,81,22,235,125,183,146,53,188,121,
+253,183,211,159,24,213,90,252,241,70,109,88,252,237,213,129,
+122,58,16,127,124,243,253,228,249,155,248,227,219,231,147,215,
+103,231,167,131,241,225,169,4,208,224,218,57,113,150,215,255,
+103,15,166,69,145,194,131,139,123,97,48,31,226,175,144,102,
+122,115,224,199,29,223,14,117,255,79,87,191,208,55,66,135,
+16,155,203,90,126,206,151,158,241,59,138,255,188,47,159,138,
+100,14,95,94,168,84,213,202,184,115,8,18,244,117,98,253,
+140,234,150,144,120,121,93,172,21,120,206,146,126,185,52,80,
+129,207,37,43,214,121,191,188,192,251,84,85,186,12,216,181,
+252,164,200,92,50,147,105,186,97,245,186,96,171,162,170,146,
+105,146,38,117,162,170,81,223,22,31,48,26,132,241,9,170,
+22,253,90,205,15,52,31,87,69,166,234,107,42,12,93,132,
+8,41,254,86,99,203,86,50,41,97,180,40,25,234,236,90,
+174,42,70,103,217,109,150,14,90,229,98,192,166,73,46,81,
+177,247,117,131,246,229,253,239,153,79,140,210,245,181,172,89,
+252,100,150,42,153,171,50,126,66,69,141,50,103,149,202,43,
+106,12,248,149,98,63,134,47,50,223,160,47,48,149,86,106,
+192,102,50,103,105,81,220,80,89,21,90,130,144,194,153,121,
+11,10,16,210,61,131,58,151,54,178,134,23,232,29,5,113,
+91,206,231,20,93,86,204,147,197,134,37,117,69,206,213,56,
+80,181,77,75,178,42,201,86,80,72,16,50,53,79,208,251,
+134,236,130,16,75,50,85,193,32,252,79,232,180,90,52,169,
+165,67,233,255,162,110,229,12,45,108,107,155,81,7,132,167,
+146,200,53,100,103,96,182,90,169,124,94,81,163,212,185,215,
+30,220,214,67,246,215,123,128,181,232,24,69,89,224,79,9,
+42,228,115,139,172,80,191,108,93,45,117,227,85,64,17,131,
+137,61,67,18,203,10,101,50,85,51,217,104,40,149,46,38,
+141,220,28,67,92,123,183,72,139,53,142,212,107,165,140,254,
+126,146,164,105,186,108,85,22,75,12,106,86,76,127,134,220,
+22,36,147,167,50,145,105,242,239,150,173,219,22,63,236,48,
+193,209,92,36,50,252,30,89,186,19,164,197,254,46,35,233,
+196,172,104,210,57,219,134,180,181,216,111,252,127,135,151,69,
+249,86,174,190,185,104,187,153,121,253,11,123,83,200,249,89,
+158,188,4,89,250,221,151,232,147,203,76,13,198,125,191,230,
+10,52,2,123,183,195,230,67,157,164,195,217,106,53,100,47,
+193,32,93,23,232,152,50,95,42,76,58,89,17,179,1,208,
+92,97,205,218,51,61,75,42,141,88,79,201,53,155,130,155,
+103,237,120,187,53,100,79,178,12,108,67,6,211,205,144,189,
+39,46,109,35,52,9,173,64,205,101,242,73,229,123,190,215,
+77,137,153,154,212,166,20,164,134,237,196,192,150,73,248,121,
+70,121,100,152,153,41,58,135,33,147,198,81,234,140,231,168,
+9,172,67,76,13,151,195,209,31,69,113,182,88,82,207,235,
+130,25,63,204,54,176,49,196,79,241,67,3,34,84,180,147,
+23,108,67,113,129,117,36,133,19,67,76,65,72,188,59,157,
+156,158,191,127,113,246,46,126,104,177,243,38,77,119,114,212,
+250,209,132,113,250,2,126,234,81,185,147,58,123,177,59,190,
+75,150,170,103,195,126,222,126,218,118,76,96,98,34,172,168,
+86,52,106,153,204,27,234,161,150,206,64,82,199,79,42,150,
+23,232,104,75,98,250,52,85,153,197,126,110,192,141,121,193,
+250,93,178,15,80,27,29,92,219,250,77,192,124,243,13,235,
+134,246,109,252,144,190,2,54,168,158,225,30,9,125,44,254,
+103,30,63,108,101,79,254,163,99,235,159,7,8,251,131,59,
+116,22,199,15,46,16,219,93,224,45,242,96,48,216,105,60,
+189,5,15,51,157,117,28,60,45,75,226,172,252,116,103,141,
+123,176,205,217,30,192,239,23,84,106,101,91,103,85,82,55,
+134,206,107,93,127,75,85,155,230,147,129,207,56,152,25,118,
+81,161,236,11,25,159,128,62,237,141,120,183,63,168,110,77,
+39,74,238,105,57,104,127,187,9,183,233,164,80,147,127,223,
+231,167,250,87,124,149,46,76,18,183,140,206,36,70,25,53,
+135,98,65,105,222,152,6,78,210,20,115,83,183,179,18,121,
+86,21,13,4,248,208,172,86,85,57,99,199,122,10,78,126,
+32,67,37,77,135,127,188,125,99,62,12,14,168,133,225,119,
+95,143,238,31,162,238,160,129,35,135,224,140,238,105,201,44,
+169,55,12,107,5,49,46,201,225,138,14,20,55,100,77,166,
+87,0,20,175,90,105,185,245,117,145,30,182,99,56,75,131,
+41,95,226,23,211,138,41,221,120,71,6,234,205,74,177,231,
+171,213,68,139,12,169,0,48,225,100,210,43,253,125,55,49,
+109,84,55,0,61,71,251,60,63,232,4,175,62,156,197,31,
+159,255,240,3,109,54,103,231,237,151,241,47,237,27,186,246,
+165,160,243,131,194,53,126,104,138,238,202,154,174,157,139,173,
+239,221,223,64,108,18,56,189,197,29,67,117,220,42,27,176,
+248,43,172,92,15,168,219,188,44,139,204,244,110,45,107,109,
+13,238,40,191,189,238,35,126,10,5,119,152,175,249,244,160,
+211,178,232,122,215,228,111,55,112,180,53,51,56,240,241,193,
+5,81,250,125,241,197,158,52,43,20,192,231,93,137,127,237,
+115,234,188,168,251,83,175,98,93,80,244,52,232,184,102,129,
+68,9,74,116,59,43,119,200,199,163,209,69,59,183,209,12,
+145,246,66,23,42,141,177,106,161,202,253,174,208,221,12,90,
+194,145,13,154,112,116,219,137,193,121,140,225,167,100,54,64,
+139,111,75,170,45,227,110,255,213,227,156,30,26,152,237,104,
+199,65,210,85,21,237,136,197,93,223,186,107,8,7,33,58,
+85,173,37,184,58,55,51,23,155,21,233,59,160,40,252,104,
+32,181,103,87,143,158,187,175,193,69,246,236,153,46,181,166,
+210,67,96,183,133,183,245,72,152,104,0,204,211,182,187,53,
+14,149,216,193,84,251,182,99,68,223,55,236,128,61,190,208,
+200,152,59,42,130,104,124,87,226,112,60,246,120,166,71,224,
+158,10,7,226,218,216,189,25,189,99,248,190,122,53,63,177,
+199,157,209,252,184,103,174,99,141,86,249,118,171,173,154,197,
+2,77,76,25,196,116,179,37,172,244,93,9,51,237,99,93,
+148,55,120,29,118,55,58,51,8,230,200,202,28,253,141,110,
+128,204,214,158,84,157,93,196,44,200,53,233,148,166,39,201,
+218,176,189,72,177,166,66,231,193,29,142,196,86,73,153,96,
+178,84,166,217,155,254,222,125,212,176,160,129,215,221,81,177,
+171,43,179,237,116,87,49,171,35,162,231,0,213,149,101,138,
+201,218,21,89,155,174,103,204,84,87,91,106,189,111,15,70,
+197,116,160,111,26,128,27,198,121,169,73,189,157,60,139,237,
+128,40,24,141,59,64,20,63,156,211,147,146,4,243,236,240,
+118,9,59,193,90,135,138,27,22,84,40,201,99,166,161,12,
+169,241,67,73,183,197,155,7,46,166,140,147,251,238,41,219,
+45,222,194,206,83,179,28,249,175,42,212,23,42,225,38,215,
+48,51,169,159,247,220,43,132,130,76,113,11,165,215,255,226,
+15,120,131,155,38,192,125,63,210,253,2,110,239,186,247,215,
+187,54,142,87,105,49,149,105,91,190,189,157,125,191,175,127,
+185,188,197,38,64,127,42,103,55,236,71,12,195,151,105,83,
+93,31,172,175,168,164,221,213,85,246,2,45,242,119,28,154,
+96,235,164,77,230,66,233,112,161,165,43,252,166,152,221,236,
+7,163,126,252,177,165,153,57,118,252,30,18,183,7,207,57,
+238,70,220,146,240,207,201,108,91,69,215,161,170,211,55,182,
+187,160,195,182,175,87,255,5,12,24,224,58,
\ No newline at end of file
diff --git a/uppsrc/Core/srcdoc.tpp/CoreTutorial$en-us.tpp b/uppsrc/Core/srcdoc.tpp/CoreTutorial$en-us.tpp
new file mode 100644
index 000000000..718eb0f28
--- /dev/null
+++ b/uppsrc/Core/srcdoc.tpp/CoreTutorial$en-us.tpp
@@ -0,0 +1,26 @@
+TITLE("U++ Core value types tutorial")
+COMPRESSED
+120,156,181,91,137,114,219,70,154,126,149,142,157,153,144,14,4,227,36,65,202,113,141,173,196,19,237,56,78,202,86,54,181,165,98,13,65,2,20,49,6,9,46,0,74,98,198,201,115,236,125,223,251,26,122,176,253,254,191,187,113,17,178,147,154,172,44,139,36,186,251,239,255,190,186,121,233,136,143,63,182,12,235,161,245,129,159,233,231,241,42,220,167,229,236,50,117,130,224,52,177,109,199,58,13,237,241,233,215,147,211,31,127,252,209,180,61,43,56,37,96,54,128,217,150,231,218,142,141,103,150,231,140,109,127,98,77,252,192,14,44,119,236,57,254,216,242,167,187,48,15,55,179,203,48,112,79,31,189,30,97,149,99,248,15,93,219,181,45,123,228,120,152,101,185,150,227,217,142,111,7,129,103,143,253,192,157,140,70,211,101,184,43,147,108,59,187,92,208,58,15,203,92,44,179,198,193,200,179,177,200,243,29,119,236,123,88,236,121,64,207,197,198,227,209,120,60,45,147,50,141,103,151,9,225,13,108,207,8,75,207,24,61,4,118,206,24,43,61,199,27,121,110,224,184,118,
+224,56,163,137,235,77,60,160,109,59,211,164,140,129,228,194,115,78,67,252,167,101,62,246,243,124,207,118,193,17,111,236,187,152,54,198,171,103,77,108,7,155,6,150,239,99,191,248,86,179,105,1,6,17,147,104,237,8,91,58,99,159,86,4,94,96,187,227,192,241,156,145,3,36,172,49,8,37,12,252,105,20,23,75,172,117,29,251,180,4,90,167,103,191,241,79,109,44,30,27,227,135,142,53,177,156,209,120,130,77,129,48,104,118,39,19,219,13,176,169,103,251,150,237,78,151,89,4,58,23,142,111,185,188,99,0,81,140,0,153,217,226,143,108,32,237,184,1,182,28,219,174,139,191,190,23,140,167,69,76,194,40,179,124,118,249,232,55,3,203,180,76,199,247,135,180,124,130,229,129,235,185,174,55,154,120,182,229,98,27,192,240,136,103,35,11,226,180,125,39,152,46,194,2,123,150,120,52,150,156,181,73,155,192,123,55,240,93,108,61,194,31,200,21,4,186,224,143,51,241,2,215,13,172,233,50,13,139,66,49,137,24,244,136,136,180,109,195,182,31,142,137,183,190,235,120,
+19,98,142,235,128,201,206,200,159,216,224,178,63,242,44,103,154,199,127,185,79,242,120,19,111,193,230,4,234,113,170,69,164,116,17,200,72,85,116,12,219,129,50,250,163,145,69,252,242,161,16,142,235,131,225,150,29,120,192,8,255,32,230,82,105,227,162,166,193,53,108,247,225,196,241,92,96,50,241,60,112,0,0,236,137,109,219,86,128,127,160,12,124,97,253,176,149,98,169,237,229,114,207,176,189,135,99,168,49,36,53,241,104,251,137,75,252,115,192,126,103,100,249,144,131,35,151,59,196,117,231,99,240,221,118,2,250,207,156,183,125,195,134,61,0,69,219,247,65,183,11,86,59,1,104,247,193,123,151,85,220,30,7,211,87,241,77,241,121,88,198,74,97,30,157,125,44,53,205,30,145,65,211,114,63,152,64,126,182,71,236,115,61,111,226,76,92,215,119,38,190,59,178,192,198,66,218,51,173,37,139,98,107,172,96,140,13,123,12,219,2,169,190,15,226,121,25,8,31,219,132,137,19,76,70,196,4,5,100,126,146,38,91,66,3,138,113,42,117,225,209,217,167,182,61,38,
+64,1,108,38,8,70,150,59,1,47,192,2,203,135,162,195,31,4,144,51,196,236,192,10,200,33,44,223,134,87,241,252,68,25,43,163,64,10,232,187,126,64,106,139,149,64,29,72,0,206,196,178,70,120,18,4,48,166,233,85,184,107,233,159,99,25,142,5,37,130,251,241,97,147,216,11,218,103,77,200,149,192,49,64,0,240,68,19,95,42,224,252,100,27,23,101,28,65,246,190,197,100,59,182,225,216,224,29,212,207,247,3,207,27,1,95,236,61,38,207,68,18,132,253,250,99,119,250,77,8,115,249,227,239,127,248,213,23,175,78,190,125,35,46,11,231,84,124,59,255,116,254,169,56,203,242,88,92,135,233,62,22,229,97,23,23,162,220,195,182,146,48,253,245,236,178,112,79,133,109,138,55,101,158,108,175,232,179,127,170,62,136,164,16,97,99,153,216,23,241,106,159,138,85,150,139,130,214,99,10,185,21,129,207,139,100,27,230,7,17,133,101,104,98,187,109,9,59,16,217,74,67,90,134,91,177,136,69,152,22,153,200,22,101,8,193,68,34,217,18,168,141,248,62,206,51,
+0,202,55,128,1,186,197,50,219,22,165,88,174,195,92,204,31,237,202,92,12,128,67,18,137,50,73,83,81,174,99,177,165,77,55,251,50,44,9,118,182,139,225,42,224,130,69,182,77,15,166,34,225,47,178,61,239,10,134,38,87,120,17,103,192,153,113,73,161,226,121,8,72,89,131,232,241,169,80,47,10,227,240,84,125,14,197,252,51,49,127,240,101,156,166,217,252,193,105,99,50,12,90,142,242,88,27,138,194,2,164,44,65,19,209,37,110,146,114,45,194,109,6,10,114,189,11,56,167,208,105,47,103,176,248,243,41,118,22,55,89,158,70,239,219,90,206,232,69,128,68,133,141,210,152,249,25,46,177,23,63,219,197,203,100,149,128,217,219,253,102,65,207,86,245,132,66,172,242,108,243,147,81,53,207,194,114,48,255,228,163,249,39,195,15,161,248,81,239,210,7,207,158,159,125,254,197,139,223,126,121,254,103,191,123,249,213,252,129,33,220,15,67,194,154,94,130,207,210,24,122,179,137,203,117,22,137,120,131,216,76,234,14,165,233,147,53,16,160,233,131,214,118,53,44,173,
+67,208,123,165,101,89,254,228,9,41,78,184,219,197,219,136,222,197,183,73,193,106,40,225,155,226,85,6,89,151,235,176,196,31,24,16,126,55,100,125,241,106,149,44,19,178,10,214,121,76,216,86,48,33,230,176,104,24,29,24,47,84,60,225,61,200,114,88,141,241,49,132,165,108,118,89,14,107,51,197,51,216,147,161,108,124,151,103,215,9,34,53,48,130,194,21,201,2,50,95,33,132,196,224,215,91,182,89,40,227,117,156,51,178,108,212,197,125,38,128,201,131,4,152,38,196,116,235,20,175,79,132,77,175,180,209,80,77,58,121,23,10,48,35,161,63,36,179,123,20,212,50,132,109,8,7,50,53,132,103,8,223,16,35,67,140,13,17,24,98,98,84,83,155,175,228,127,50,8,48,217,196,204,62,252,42,199,3,116,143,69,1,186,163,253,50,110,50,70,179,82,186,174,65,108,66,44,96,112,30,195,234,195,252,106,79,65,154,150,174,246,219,37,59,142,101,152,166,67,179,137,68,229,8,6,67,86,210,161,36,243,149,180,22,160,4,187,196,19,36,116,114,192,156,63,104,
+235,14,169,193,84,92,144,10,192,239,132,219,171,88,26,29,80,0,60,173,160,36,236,56,142,32,215,69,188,12,137,184,51,22,102,148,197,82,13,128,88,118,131,119,219,249,9,196,71,106,177,138,243,120,187,148,194,171,41,206,22,127,136,151,101,97,118,68,80,227,11,76,205,94,37,87,188,170,212,71,98,86,176,198,72,87,205,14,188,242,30,203,108,191,45,13,56,239,66,233,82,195,111,64,105,178,134,191,64,58,4,160,20,37,214,241,166,199,193,205,31,88,64,11,169,200,56,152,244,168,143,249,219,184,124,25,111,175,202,53,216,143,233,182,213,181,222,115,70,98,48,34,237,123,34,49,138,163,167,243,7,253,238,67,110,86,207,163,109,187,16,95,19,202,241,0,250,234,220,7,228,253,32,20,87,161,110,55,240,86,244,26,18,203,118,176,70,248,216,2,222,102,185,230,248,178,165,64,183,65,150,71,159,20,211,187,216,188,72,182,17,92,107,12,215,122,196,156,198,24,225,21,28,83,2,99,47,226,247,129,56,158,194,108,182,59,134,16,154,111,202,48,47,139,239,16,
+192,164,183,6,135,143,128,245,204,33,104,43,196,252,184,139,219,23,219,72,207,100,143,127,12,237,104,198,189,176,36,246,15,32,141,62,56,173,209,62,37,234,184,250,171,184,20,69,154,44,227,70,242,178,167,8,42,190,66,6,34,197,116,42,67,185,138,171,156,167,199,100,25,73,89,91,145,132,65,38,138,208,67,161,162,2,215,197,31,112,7,46,133,188,35,220,171,17,194,27,74,215,187,242,158,101,122,205,7,21,181,202,147,40,53,139,226,37,156,100,17,51,214,41,155,222,17,31,46,242,164,107,203,38,61,27,120,247,27,204,123,119,150,78,134,124,135,14,75,216,18,98,75,192,201,61,220,101,195,191,72,12,170,176,121,57,159,117,48,153,95,90,173,103,140,5,63,36,84,188,160,23,17,120,42,162,87,70,11,236,189,74,114,149,127,74,143,215,217,245,145,24,108,171,24,159,172,132,246,82,236,164,100,196,227,200,127,67,233,106,30,151,251,124,219,78,113,179,124,216,198,227,228,221,231,223,126,245,205,96,254,40,60,98,33,158,29,97,110,201,23,228,237,142,206,219,
+159,239,87,136,11,138,158,243,149,56,128,183,20,88,32,130,8,89,196,178,20,55,57,146,55,17,46,17,57,26,113,127,254,73,129,136,115,162,50,227,154,228,5,195,51,24,142,206,128,200,91,165,92,224,214,33,86,238,43,184,110,49,197,215,91,230,31,169,16,82,120,218,37,202,4,212,138,152,177,142,183,12,109,29,94,179,93,68,20,140,165,29,33,216,19,18,207,190,57,175,34,178,246,132,215,25,172,238,236,217,46,121,161,6,6,170,44,88,106,22,206,255,88,49,17,84,44,119,135,193,210,168,211,245,138,159,243,31,218,44,55,171,159,246,243,203,71,0,212,164,109,38,22,167,213,14,11,19,227,111,116,84,154,13,80,179,15,235,209,22,158,139,97,119,89,153,195,162,102,131,198,115,101,87,183,180,235,252,179,198,78,90,250,183,125,213,5,73,120,43,85,108,9,91,53,106,132,4,89,111,25,23,92,237,132,121,30,30,72,28,64,178,97,67,102,101,119,37,137,132,50,159,46,243,77,241,50,36,37,32,113,21,113,201,198,193,185,147,242,8,210,30,36,61,98,126,
+34,81,169,114,41,152,9,101,184,156,246,208,4,96,32,181,137,67,30,224,21,77,239,2,133,204,242,136,60,233,161,181,109,2,93,59,232,226,173,78,223,149,190,85,250,219,76,183,41,97,81,155,135,72,144,180,26,42,107,172,171,196,37,165,252,197,49,208,165,170,90,7,245,84,162,43,132,47,32,204,171,148,44,138,57,247,207,36,94,125,245,211,80,23,161,207,84,9,181,47,66,202,255,150,40,4,243,36,171,93,170,218,153,234,236,69,182,167,108,15,203,137,185,157,170,162,214,36,82,136,219,134,102,205,47,109,233,219,230,159,132,243,79,234,1,214,156,123,244,41,84,250,212,76,184,147,77,146,134,204,88,201,243,122,239,46,203,141,163,25,245,88,229,14,42,14,23,217,62,95,106,70,107,182,180,38,115,224,169,226,166,44,172,90,101,125,49,189,159,252,158,218,243,195,180,127,212,33,190,86,161,162,170,59,216,95,177,57,17,46,236,162,20,177,178,54,22,105,198,253,141,110,113,13,117,171,204,163,166,113,165,66,76,75,179,144,34,92,173,75,104,57,169,88,156,75,
+123,108,46,86,174,187,238,105,40,175,239,154,226,187,190,118,13,21,122,133,244,169,129,88,36,101,203,234,95,0,5,123,52,63,105,61,71,102,178,204,34,25,219,99,13,212,20,207,51,242,37,228,211,73,34,40,94,151,105,86,196,192,52,143,83,238,208,176,37,175,105,100,147,21,165,140,215,0,183,10,33,106,149,202,154,170,44,109,139,87,150,160,5,73,21,21,79,121,19,131,100,221,112,1,204,239,26,239,15,205,196,132,208,147,52,181,155,56,138,220,10,243,179,10,62,113,56,223,167,84,89,29,196,114,159,231,100,218,151,143,30,195,124,249,200,160,193,4,248,164,217,229,99,97,138,153,58,78,168,83,129,222,201,4,250,236,203,103,175,223,124,113,49,255,253,183,23,47,130,78,12,57,121,247,93,229,217,185,202,105,100,48,78,96,205,79,92,203,154,54,234,229,147,119,173,130,27,83,100,201,141,105,71,53,55,180,155,117,62,57,202,20,120,175,222,157,238,254,234,238,175,239,254,230,238,111,239,254,238,238,239,239,254,225,238,31,239,254,233,238,159,239,254,229,238,95,
+239,254,237,238,223,239,254,227,238,63,239,254,235,238,191,239,254,231,238,127,187,84,40,34,14,108,116,230,69,166,11,226,26,111,78,91,14,71,168,28,126,113,84,14,170,83,36,6,210,65,196,209,176,17,220,149,201,31,128,227,119,93,36,127,57,246,52,246,62,121,215,138,199,143,197,64,150,251,135,42,136,64,69,162,164,216,165,225,129,204,133,122,15,212,146,230,48,81,171,40,187,146,125,185,154,159,4,210,18,49,151,58,168,195,182,189,123,166,160,134,58,91,197,5,188,147,26,189,200,0,117,7,192,180,95,164,39,144,251,58,106,9,181,150,115,83,18,121,169,234,5,31,41,47,79,102,120,224,24,146,219,55,7,238,231,43,150,90,53,75,245,28,203,126,236,224,215,178,198,141,9,120,121,134,212,130,200,129,75,160,24,201,121,61,3,135,13,239,151,200,139,99,118,46,187,253,2,197,210,180,7,184,121,160,94,30,153,132,130,93,13,108,192,230,53,151,115,173,199,81,200,170,231,216,109,68,62,231,164,72,245,160,101,209,29,71,125,27,138,167,60,119,96,79,198,178,
+111,101,115,29,5,116,227,14,105,17,123,205,80,135,127,68,64,201,227,40,42,234,167,228,64,194,3,39,194,73,217,187,31,132,100,107,22,58,61,44,124,179,95,148,164,177,220,221,94,241,154,66,28,146,56,237,219,70,59,84,234,182,244,239,118,210,75,158,237,250,174,215,222,87,234,15,188,95,178,85,237,211,69,124,149,108,183,218,57,55,170,90,184,97,67,134,129,48,189,202,80,101,172,55,146,215,69,184,138,101,14,183,223,168,248,10,67,64,5,148,108,168,15,135,213,155,240,150,223,171,178,143,57,72,43,43,181,238,82,65,51,230,211,233,203,236,70,118,132,192,54,252,206,79,60,203,178,58,115,190,68,112,109,78,210,83,44,82,241,54,177,108,20,48,216,75,10,14,121,114,29,71,51,105,154,4,202,32,153,202,22,141,84,226,178,105,118,100,109,77,36,217,128,24,30,141,212,6,68,143,142,13,72,207,169,13,72,56,238,212,9,166,254,68,79,25,48,57,191,30,30,79,173,102,32,112,240,176,185,70,174,197,234,239,30,143,129,237,123,105,173,78,112,60,90,196,
+240,9,17,183,12,38,199,188,249,160,233,48,114,79,121,174,210,45,250,189,199,116,190,11,115,82,163,169,120,86,84,156,87,108,151,92,39,221,146,156,151,201,69,149,7,138,112,95,102,27,188,167,162,229,160,219,217,18,200,34,92,190,213,86,40,75,28,93,104,82,234,112,145,105,199,87,185,94,93,174,96,134,6,196,250,135,207,23,29,161,54,72,212,46,175,234,68,53,201,231,77,6,52,165,69,186,206,52,107,22,188,76,222,106,18,25,175,98,191,219,101,57,10,35,168,154,204,173,148,217,55,136,55,80,69,149,202,226,139,134,6,74,209,21,98,32,51,71,136,116,228,177,215,37,231,62,236,37,163,233,116,26,106,55,153,214,70,164,231,57,30,106,109,225,142,80,66,182,188,212,145,158,202,5,39,117,76,232,14,116,185,19,120,190,219,163,107,186,15,37,29,15,136,71,166,183,73,202,162,75,8,205,189,207,19,8,68,117,254,237,76,238,115,9,173,185,20,201,85,204,245,77,232,167,46,120,116,234,195,178,169,79,31,84,28,110,28,177,214,237,63,170,95,99,113,64,
+178,24,163,2,128,170,93,83,216,195,250,48,135,120,151,240,208,225,253,103,50,58,235,164,195,85,234,128,81,73,91,213,78,7,20,11,27,50,26,186,228,80,149,161,48,77,58,130,213,129,130,14,6,40,85,175,27,42,228,221,6,171,140,142,19,184,213,131,100,131,128,192,158,57,43,145,68,172,227,48,162,250,117,166,75,46,245,82,129,123,194,85,129,184,120,170,6,146,45,157,177,235,20,94,115,108,32,79,112,47,230,191,22,183,61,125,26,213,19,235,75,41,187,109,154,159,176,113,28,110,176,79,45,149,65,245,12,54,243,126,68,10,58,187,169,144,190,109,228,147,10,197,226,79,192,139,186,107,93,188,228,179,15,227,197,217,110,3,177,159,129,153,82,147,179,148,207,26,229,105,191,118,133,113,194,221,8,105,93,90,104,84,19,105,65,204,244,185,20,188,201,158,157,44,159,93,178,146,110,9,224,176,58,60,14,211,228,251,152,23,107,60,103,21,87,76,228,45,203,181,218,92,31,253,171,220,89,53,11,32,161,130,96,201,165,186,179,75,224,106,142,205,76,241,53,229,
+203,251,188,168,82,218,230,37,6,178,198,93,78,238,129,172,171,65,106,117,118,74,151,89,160,227,120,203,36,115,45,200,112,58,250,125,242,238,69,146,198,95,239,169,137,180,47,7,168,34,87,201,21,61,226,163,131,162,52,203,219,18,245,198,113,235,142,250,27,101,253,180,81,208,1,22,157,15,154,234,128,240,19,250,197,155,102,62,221,51,208,200,19,164,38,252,34,112,180,31,100,104,148,240,17,180,134,51,111,188,181,199,83,31,126,61,104,184,91,104,19,128,202,163,190,166,86,37,219,235,44,189,230,123,28,124,206,65,45,13,233,216,212,17,118,153,193,149,37,116,238,77,206,108,16,223,134,236,20,139,117,118,3,239,69,61,6,213,43,24,118,196,33,235,3,241,60,217,190,0,136,134,97,80,141,124,219,195,238,74,149,107,77,6,91,164,145,9,0,208,109,248,23,212,27,44,207,183,229,115,248,206,193,45,31,242,213,22,212,0,40,183,230,154,252,118,40,166,226,22,70,8,56,213,212,249,15,167,189,40,191,70,126,242,83,145,214,115,127,198,46,219,16,217,216,142,
+186,44,223,238,118,245,30,181,55,210,110,72,49,4,179,16,247,192,150,202,70,149,107,214,123,195,1,133,195,62,6,241,132,65,104,222,54,25,84,227,211,219,59,175,213,85,177,207,181,218,186,89,81,236,90,125,55,46,90,42,74,183,218,196,237,237,109,187,20,30,153,226,207,201,3,180,66,111,21,117,179,109,125,200,94,59,10,67,46,49,100,9,162,220,209,190,144,174,136,238,49,201,210,24,28,200,147,24,222,67,182,108,101,52,62,162,144,65,201,131,45,251,180,243,148,187,147,142,233,122,221,129,101,111,37,221,152,16,201,62,209,250,248,142,17,17,41,93,177,209,242,125,202,135,211,135,101,88,101,201,25,87,162,10,199,173,186,73,69,138,137,1,206,173,21,39,138,76,157,94,81,215,78,149,151,73,81,181,41,57,239,230,204,160,128,159,78,227,162,56,242,151,172,179,124,73,169,166,37,202,246,116,233,228,208,106,191,170,126,194,247,220,126,57,242,159,5,61,142,122,123,53,85,101,127,208,108,213,15,190,215,185,168,215,42,132,24,214,90,31,150,52,106,117,73,88,
+39,82,40,173,168,40,68,172,107,244,79,97,50,160,112,102,168,55,35,79,190,93,100,89,58,99,206,226,131,36,119,102,182,119,59,11,101,227,94,66,167,126,186,188,59,39,249,93,214,199,8,212,41,162,115,79,190,246,65,189,202,45,167,202,113,158,103,57,29,165,201,134,49,235,226,26,59,26,205,234,69,87,250,186,31,171,28,50,66,93,86,240,205,159,78,77,218,21,81,210,145,28,73,243,15,29,177,113,54,254,182,35,54,221,216,44,123,229,150,180,228,198,0,29,253,233,109,191,208,202,123,132,118,65,89,176,60,48,85,151,15,145,164,74,3,96,147,229,219,131,74,155,155,135,148,144,203,121,161,211,152,110,209,16,154,231,197,19,208,250,116,112,84,160,241,144,228,142,26,109,149,120,139,163,225,230,226,101,27,110,107,37,143,145,9,244,172,139,104,76,114,180,51,90,51,162,62,156,56,71,109,128,92,68,106,115,184,40,178,116,175,122,120,2,62,123,185,54,88,173,100,81,129,58,189,228,27,96,178,197,199,221,127,6,34,15,197,12,158,118,3,167,9,181,103,87,
+216,93,34,246,101,146,38,229,161,81,64,80,175,78,229,81,93,198,234,215,243,66,94,56,26,132,71,180,86,67,139,158,33,226,15,167,44,203,158,65,149,5,71,173,161,58,36,140,77,241,106,159,166,173,136,160,235,199,176,10,7,52,69,186,195,80,222,253,170,43,104,104,14,221,19,60,72,245,50,229,157,173,106,106,82,84,53,26,51,39,3,179,183,135,150,47,78,182,203,116,31,201,75,84,237,108,84,106,140,193,119,27,200,107,200,234,124,160,179,209,176,16,40,199,32,211,170,141,184,86,2,109,117,193,134,38,29,233,243,243,170,83,144,229,145,60,41,28,60,49,196,211,161,65,23,197,26,215,39,42,64,36,180,43,62,21,206,229,157,67,102,132,166,52,99,141,162,195,46,246,51,250,178,47,104,102,142,24,108,82,36,57,172,169,78,135,239,13,5,52,173,237,83,216,117,211,119,50,218,193,32,58,158,205,207,251,59,206,227,182,126,165,41,103,73,199,218,133,129,195,177,253,169,145,232,104,9,183,115,250,109,78,222,193,75,195,237,213,158,206,109,183,220,219,103,38,
+36,178,25,74,23,141,233,6,92,201,7,205,224,55,13,18,135,193,114,106,28,232,243,81,94,195,119,20,219,122,65,7,190,203,53,101,27,242,120,170,25,193,139,26,158,161,252,127,93,72,69,212,73,86,197,210,81,112,151,139,58,241,232,89,211,10,228,125,129,100,165,162,147,10,65,5,175,52,8,242,177,182,183,149,189,206,161,116,248,162,165,247,69,27,185,203,117,231,208,150,165,124,125,143,104,227,123,172,60,48,219,37,45,89,147,114,255,175,195,27,253,46,89,174,155,233,225,5,152,39,77,160,188,201,42,154,165,163,147,222,45,133,8,210,130,108,62,214,61,27,36,145,6,23,162,26,46,66,255,154,44,53,41,203,180,170,45,233,26,76,157,48,233,219,241,17,117,186,88,57,150,217,238,208,146,16,33,44,15,206,249,246,105,149,175,17,118,186,94,237,47,131,126,98,57,241,222,74,66,14,191,167,184,176,100,59,184,121,173,164,58,251,252,57,164,168,92,92,170,53,88,141,26,58,31,222,147,69,179,98,128,203,23,25,127,30,16,138,124,69,115,120,100,248,215,20,
+41,49,222,19,68,121,237,69,38,71,175,135,166,76,30,9,76,155,60,22,169,86,144,153,148,188,92,92,104,172,101,183,163,209,112,38,249,74,92,33,87,8,41,100,165,33,159,105,104,183,40,63,64,65,214,220,42,108,36,105,124,63,247,182,84,215,94,114,238,152,132,242,126,205,249,86,58,112,25,78,222,198,237,113,78,68,13,21,217,247,124,176,130,132,157,59,27,245,53,112,190,48,23,95,209,237,145,72,12,90,133,57,10,236,125,26,177,239,78,34,10,79,66,222,63,166,175,90,89,166,233,208,11,98,202,133,14,52,154,122,190,175,33,3,140,214,236,162,197,142,235,68,94,178,78,227,70,103,177,110,7,169,89,88,57,192,154,117,184,43,142,219,71,210,117,233,0,168,234,255,251,245,126,42,184,120,37,162,165,156,129,243,171,108,70,194,54,136,30,219,122,250,255,97,27,63,177,177,80,255,212,21,116,179,157,216,108,45,236,183,74,114,128,133,16,247,37,20,70,106,98,7,94,13,233,182,181,158,111,194,241,237,51,169,41,88,88,55,58,135,109,84,10,241,171,206,
+106,42,92,104,117,117,137,241,179,249,103,186,23,32,219,0,11,141,70,3,1,121,159,113,97,246,195,146,6,112,174,162,224,49,95,106,64,85,216,238,237,37,180,95,206,95,157,95,60,127,249,245,217,239,154,114,173,236,150,173,92,182,52,94,199,87,9,221,155,161,27,117,226,241,99,236,37,63,23,181,71,230,47,42,53,45,171,218,187,189,231,61,221,140,70,173,79,251,1,7,229,169,102,236,170,124,207,117,236,225,81,45,207,93,128,198,228,190,185,218,119,13,66,197,226,251,18,154,240,56,161,233,248,59,62,180,35,232,247,168,46,87,197,111,168,100,170,52,51,108,224,252,50,11,163,23,72,30,212,208,181,1,101,234,98,249,190,29,91,21,91,200,74,218,160,189,14,211,24,165,83,59,190,141,23,55,251,136,245,29,31,237,134,250,155,22,178,159,209,219,234,232,164,31,45,247,113,228,59,126,158,235,104,41,70,195,161,84,56,72,17,15,219,250,222,148,254,252,17,133,212,182,47,32,141,144,182,194,115,96,125,215,220,132,147,115,137,191,29,150,191,207,110,222,167,187,
+220,120,226,134,27,180,239,180,185,191,186,15,211,223,121,145,7,200,117,242,53,161,139,85,116,190,20,147,219,210,201,85,38,51,166,100,117,80,162,227,91,123,43,177,78,174,214,66,199,74,10,140,124,216,84,84,149,105,86,36,101,213,132,233,116,240,26,219,84,21,168,186,92,44,203,50,62,109,225,134,73,211,137,182,142,115,175,66,213,52,169,118,6,82,141,242,72,125,243,98,161,175,54,108,212,183,136,88,249,16,151,144,39,243,90,153,245,30,99,253,147,178,180,238,183,8,165,130,225,103,209,19,158,62,28,27,106,221,194,148,6,147,102,131,208,128,247,184,87,63,90,13,132,22,199,146,66,52,202,208,154,127,186,149,172,18,125,152,108,123,157,58,32,162,43,127,116,96,173,190,77,197,102,157,199,171,76,247,8,136,248,190,117,186,50,191,79,122,217,145,38,179,178,54,110,122,153,234,171,67,157,111,69,210,136,108,192,58,93,165,110,238,165,106,71,219,114,236,113,224,122,227,73,119,59,130,207,61,235,143,234,235,180,239,1,228,140,38,190,99,217,174,229,181,185,222,
+247,242,88,12,228,151,249,168,118,74,182,251,56,26,206,254,15,26,72,176,184,
diff --git a/uppsrc/Core/srcdoc.tpp/DLI$en-us.tpp b/uppsrc/Core/srcdoc.tpp/DLI$en-us.tpp
new file mode 100644
index 000000000..b1e3deee9
--- /dev/null
+++ b/uppsrc/Core/srcdoc.tpp/DLI$en-us.tpp
@@ -0,0 +1,108 @@
+TITLE("Runtime dynamic linking using .dli files")
+COMPRESSED
+120,156,221,86,219,114,219,200,17,253,149,41,211,73,81,50,
+164,157,43,48,32,182,182,86,38,233,88,85,20,229,210,165,
+242,192,82,45,135,192,80,196,26,4,24,96,40,217,185,248,
+219,115,6,0,101,105,229,84,158,19,82,36,133,193,116,247,
+233,211,167,123,176,224,228,237,91,26,208,1,253,47,175,209,
+196,174,205,190,112,119,139,130,107,157,228,140,113,154,24,22,
+37,151,113,242,237,219,183,83,38,169,78,188,51,6,103,140,
+74,193,56,195,26,149,60,98,42,166,177,210,76,83,17,73,
+174,34,170,70,59,83,155,237,221,194,104,145,28,95,133,176,
+226,129,26,8,38,24,101,33,151,216,69,5,229,146,113,197,
+180,150,44,82,90,196,97,56,74,205,206,229,85,121,183,88,
+121,59,9,51,1,51,26,233,80,50,24,73,197,69,164,36,
+140,165,4,60,129,192,81,24,69,35,151,187,194,222,45,114,
+143,27,104,199,30,165,12,194,1,208,241,8,150,146,203,80,
+10,205,5,211,156,135,177,144,177,4,108,198,71,185,179,0,
+185,146,60,49,248,120,51,133,120,82,73,38,192,136,140,148,
+192,182,8,191,146,198,140,35,168,166,74,33,158,253,114,160,
+105,5,130,60,73,222,54,68,72,30,41,111,161,165,102,34,
+210,92,242,144,3,4,141,144,168,71,160,70,153,109,82,216,
+10,206,18,7,88,201,248,87,149,48,24,71,65,52,224,52,
+166,60,140,98,4,5,96,228,44,226,152,9,141,160,146,41,
+202,196,40,173,50,228,185,226,138,138,4,54,26,149,8,225,
+184,101,69,133,12,152,185,208,136,24,49,33,240,173,164,142,
+70,141,245,181,112,85,125,183,56,254,117,72,79,233,41,87,
+234,200,227,141,97,174,133,20,66,134,177,100,84,32,10,124,
+72,79,89,72,81,77,166,184,30,173,76,131,144,14,75,81,
+50,246,213,247,90,2,243,66,43,129,200,33,190,80,85,164,
+39,192,14,143,165,22,66,211,81,90,152,166,233,41,242,244,
+28,251,20,25,11,24,27,68,158,89,37,184,140,61,53,130,
+131,98,30,170,152,129,99,21,74,202,71,181,253,219,62,175,
+237,214,150,32,57,135,56,146,67,129,122,37,2,75,39,68,
+30,48,14,41,170,48,164,158,45,5,57,112,161,64,55,101,
+90,2,17,222,40,178,235,181,184,106,83,104,13,69,192,196,
+32,230,82,0,73,44,37,8,128,3,22,51,198,168,198,27,
+153,129,150,86,29,172,151,85,31,190,51,151,1,147,131,8,
+34,70,157,98,233,195,199,194,211,199,193,62,15,169,66,25,
+120,103,206,61,233,252,45,104,103,92,251,207,145,183,87,1,
+67,51,0,33,83,10,105,11,16,205,53,82,87,96,94,180,
+250,102,145,30,205,237,99,51,49,206,246,106,57,30,191,237,
+100,198,194,128,133,3,234,237,149,142,81,62,38,61,125,66,
+202,152,199,66,40,30,43,17,82,208,216,116,221,236,141,125,
+63,181,189,248,228,36,10,88,132,206,66,170,74,33,249,214,
+12,137,71,204,67,225,58,14,61,9,189,147,229,73,145,151,
+30,7,116,145,116,82,56,30,191,99,44,242,142,52,58,70,
+235,144,138,24,92,128,2,170,32,115,76,3,141,58,163,204,
+28,61,224,199,65,250,217,220,219,229,73,223,170,222,208,203,
+79,9,165,189,104,97,8,228,192,0,55,49,165,33,86,180,
+70,39,141,238,205,238,73,125,30,55,167,1,167,208,16,102,
+143,66,67,34,20,196,71,99,63,71,48,21,192,63,198,80,
+172,58,253,45,79,74,219,56,155,161,244,138,182,89,115,22,
+112,6,234,160,62,165,180,148,33,224,34,118,228,199,146,47,
+32,154,87,69,98,244,201,160,89,254,241,219,191,254,52,157,
+159,220,94,147,69,195,19,114,181,47,93,190,181,36,251,90,
+154,109,158,18,48,242,57,47,239,201,190,241,223,167,89,145,
+147,117,94,216,230,207,119,139,134,38,228,188,36,183,5,12,
+80,191,229,187,229,59,242,181,218,147,212,148,216,110,191,111,
+38,174,34,102,239,42,236,202,255,110,201,189,45,45,58,181,
+247,87,144,199,218,236,118,182,38,213,234,119,155,186,230,148,
+220,84,36,173,45,92,146,102,159,110,250,245,214,245,198,60,
+180,222,118,117,245,144,103,150,44,223,248,32,203,55,93,152,
+199,220,109,72,90,149,14,45,5,224,159,45,25,154,212,237,
+77,65,236,23,179,221,97,71,222,144,117,85,147,89,229,246,
+13,153,87,206,54,36,45,114,191,221,35,57,26,245,89,249,
+159,40,33,31,230,195,191,94,94,77,2,66,200,229,245,172,
+50,217,181,171,129,58,32,195,143,23,151,147,219,217,148,108,
+46,170,108,95,216,128,92,223,156,221,128,194,110,195,24,227,
+43,32,233,198,212,100,121,92,91,247,126,191,94,219,58,32,
+222,25,233,46,102,182,188,119,155,163,163,31,69,186,169,77,
+217,20,72,31,129,90,147,167,133,139,239,142,215,173,243,243,
+178,247,122,94,118,30,95,220,189,220,187,254,54,254,123,29,
+177,195,28,116,60,156,151,185,155,126,1,115,153,205,16,55,
+7,37,166,190,79,123,127,112,182,60,198,245,195,143,236,47,
+175,63,25,183,153,91,55,174,202,198,213,251,20,81,135,125,
+246,159,170,218,205,205,246,59,29,215,182,126,176,245,179,165,
+14,234,7,212,239,197,62,208,214,122,197,218,15,49,95,127,
+152,172,46,119,22,249,247,177,58,63,7,155,128,76,222,127,
+60,155,79,80,163,245,193,223,102,242,254,63,186,26,23,85,
+99,189,175,39,179,231,187,79,191,191,158,41,4,63,203,19,
+130,131,35,79,77,81,124,13,136,219,64,95,248,107,170,173,
+125,220,24,7,121,214,254,84,106,108,6,137,110,172,201,160,
+242,86,169,94,132,94,113,208,250,198,150,100,87,152,212,190,
+212,222,32,179,107,12,35,50,153,205,62,156,207,166,243,179,
+139,41,220,149,165,175,149,183,92,190,121,181,241,188,23,37,
+33,243,203,155,233,245,235,251,31,167,103,147,233,21,238,255,
+220,186,249,233,224,44,255,229,117,208,241,217,108,70,252,107,
+54,255,116,251,126,118,62,62,108,201,203,180,216,163,245,126,
+30,87,181,253,201,119,223,111,93,102,167,155,95,94,146,131,
+62,77,171,237,182,42,95,164,110,202,236,255,49,83,95,115,
+114,154,238,118,93,150,21,218,61,95,183,51,171,180,54,131,
+52,76,55,99,200,239,251,198,145,188,36,126,158,22,207,76,
+130,231,179,243,127,149,161,87,204,32,209,54,195,225,161,55,
+252,67,207,131,41,252,200,173,214,173,240,253,57,176,170,48,
+185,205,170,194,116,127,48,117,110,74,215,120,82,189,233,209,
+31,90,238,198,59,234,142,135,134,220,23,213,10,227,125,189,
+47,83,255,64,221,37,59,60,34,232,246,125,93,122,207,110,
+99,15,7,72,142,233,100,202,212,118,197,216,152,134,160,109,
+187,162,28,28,52,196,63,183,214,249,10,37,243,208,159,78,
+176,142,140,140,192,40,7,182,45,166,73,149,225,168,186,64,
+226,64,237,171,221,185,172,118,182,125,10,69,74,85,209,69,
+242,53,93,89,95,214,204,39,5,220,142,60,110,224,193,118,
+67,192,211,178,195,19,8,56,249,195,1,212,14,182,205,114,
+193,85,184,188,75,250,197,124,61,236,211,60,140,167,147,127,
+246,11,167,207,143,169,225,95,172,235,142,167,143,232,185,194,
+14,231,183,179,217,81,64,166,87,87,195,114,90,215,85,141,
+11,28,24,254,49,57,121,193,177,32,119,255,6,217,45,206,
+87,
\ No newline at end of file
diff --git a/uppsrc/Core/srcdoc.tpp/Decisions$en-us.tpp b/uppsrc/Core/srcdoc.tpp/Decisions$en-us.tpp
new file mode 100644
index 000000000..8b47f1f80
--- /dev/null
+++ b/uppsrc/Core/srcdoc.tpp/Decisions$en-us.tpp
@@ -0,0 +1,11 @@
+TITLE("Design decisions and tradeoffs")
+COMPRESSED
+120,156,133,86,107,111,27,199,21,253,43,131,200,9,36,121,73,236,188,246,65,162,69,12,41,40,130,198,177,17,215,205,7,65,40,135,187,67,114,234,125,48,51,187,146,153,162,254,237,61,119,118,169,8,181,138,90,48,41,174,230,190,206,227,14,239,4,123,245,42,77,210,139,244,255,252,91,221,218,157,25,155,225,254,174,17,69,177,118,121,170,214,134,231,235,119,229,250,203,151,47,203,178,20,107,74,197,145,138,167,74,114,193,185,74,83,37,114,174,203,180,212,5,47,82,153,43,161,243,84,175,142,198,155,246,254,206,20,114,125,253,75,134,40,145,232,11,201,37,79,121,38,20,78,165,50,21,138,11,205,139,66,241,92,23,178,204,178,85,101,142,131,235,187,251,187,45,197,81,49,137,176,52,47,50,197,17,164,180,144,185,86,8,86,138,115,252,206,117,158,229,249,106,112,67,99,239,239,28,117,189,229,89,190,54,74,80,215,55,148,65,37,217,5,218,20,57,82,40,161,50,37,11,33,121,33,68,86,74,85,42,244,207,197,202,13,22,221,110,17,70,161,20,166,81,88,
+105,197,37,128,81,185,150,56,150,227,93,165,37,23,168,94,164,90,163,176,253,124,70,139,128,162,184,12,229,68,174,233,116,161,10,46,243,66,40,145,9,52,144,230,152,150,170,235,85,109,67,133,56,41,248,122,64,75,235,155,239,245,154,35,56,79,242,11,145,150,169,200,242,18,5,209,44,6,151,101,201,101,129,130,138,235,148,203,85,213,215,24,118,43,116,42,99,197,2,124,100,200,28,177,209,25,71,195,66,22,40,153,115,41,241,170,85,145,175,130,37,70,134,222,223,223,93,127,127,153,46,211,165,208,250,138,194,75,132,23,82,73,169,178,82,241,84,162,12,114,40,194,43,75,193,41,215,162,88,109,77,64,205,65,17,184,17,85,78,130,2,1,178,208,18,165,51,188,128,92,12,40,129,141,40,85,33,101,145,174,170,198,132,240,12,160,107,26,146,243,132,243,139,156,112,213,82,168,146,192,145,2,0,139,76,151,28,8,235,76,165,98,229,237,111,163,243,182,181,29,32,118,208,200,250,76,207,172,71,52,51,233,81,36,92,64,145,58,203,82,194,75,67,21,66,106,
+0,158,242,66,161,35,252,128,226,97,150,228,246,143,25,100,194,229,69,41,148,68,39,165,82,64,0,9,120,201,57,79,11,252,96,50,224,18,181,193,103,117,61,23,22,87,9,87,23,57,180,12,166,74,69,229,75,73,248,9,192,47,178,84,131,7,49,133,11,66,93,188,2,238,92,20,244,63,34,207,117,194,97,10,180,200,181,198,220,18,80,139,2,179,107,96,47,163,206,121,94,172,126,182,143,225,214,12,118,22,204,245,205,171,73,105,60,75,120,118,145,82,188,46,74,16,200,21,225,39,149,42,69,41,165,22,165,150,89,10,28,195,228,105,10,38,95,69,79,62,37,201,19,158,195,97,152,85,107,76,31,195,48,121,206,169,21,81,148,25,161,48,39,217,44,26,215,81,31,80,198,122,18,195,245,205,107,206,115,74,84,192,48,69,145,165,178,4,24,192,32,213,80,58,182,66,1,162,193,179,128,13,104,45,84,159,204,222,110,22,179,101,255,245,143,127,127,251,195,207,139,143,31,216,93,16,107,118,107,131,219,119,172,182,149,11,216,3,129,153,174,102,131,55,53,34,
+250,221,46,124,119,127,23,210,181,131,15,214,91,41,215,239,210,53,123,51,176,225,96,89,219,147,80,18,246,104,89,24,124,223,237,155,19,219,153,135,222,227,163,25,92,197,208,249,39,215,237,89,191,99,31,55,175,55,175,217,220,74,88,178,31,119,172,235,135,3,253,213,54,193,38,204,13,172,53,159,108,152,79,154,227,49,176,96,155,221,102,81,245,221,96,128,65,205,46,135,126,111,81,217,179,71,55,28,88,56,5,240,76,217,151,141,57,197,190,151,174,109,216,206,53,54,92,197,207,166,9,61,107,199,234,128,198,112,216,179,161,103,77,111,106,230,58,246,147,235,198,207,236,242,159,99,24,88,213,183,144,42,205,97,60,134,115,45,26,161,174,127,237,125,61,23,195,176,236,175,183,63,48,178,37,158,225,15,155,197,209,247,149,13,161,247,87,75,246,225,128,4,53,219,142,174,169,3,48,65,54,215,30,155,104,38,60,111,49,2,240,65,125,60,245,253,131,157,78,206,181,28,17,176,29,247,192,180,182,203,23,32,191,121,255,145,29,76,160,248,173,101,214,69,20,26,
+55,128,209,205,194,118,181,51,29,3,240,91,183,127,250,120,105,63,247,196,130,241,213,1,134,168,134,17,138,98,52,37,144,103,97,60,30,123,143,206,174,18,170,190,107,204,192,164,216,44,182,68,4,154,160,108,120,158,169,103,143,38,32,220,239,182,223,93,186,110,184,98,127,222,252,137,41,208,114,64,176,11,12,203,99,136,24,118,181,241,53,48,185,25,189,199,248,52,183,13,132,2,141,241,117,63,14,171,51,97,111,222,222,102,10,111,191,188,141,212,189,239,129,225,251,155,255,5,6,29,33,214,192,181,143,73,226,64,68,13,32,154,135,99,111,129,179,217,54,22,45,250,209,178,29,102,50,221,137,237,171,138,29,49,48,62,183,49,209,219,15,127,191,153,100,71,204,53,205,213,75,85,127,181,209,36,245,84,2,158,233,81,21,37,131,219,58,48,113,34,193,108,190,233,199,129,124,179,89,180,182,237,253,105,243,13,179,159,43,27,175,216,201,90,222,86,232,202,159,162,7,158,196,222,184,202,208,25,182,239,73,122,227,64,217,166,20,209,27,129,180,116,98,71,15,220,
+67,116,159,245,30,227,64,60,1,142,154,76,107,125,235,58,108,45,248,235,111,7,240,241,68,201,209,155,125,27,45,9,200,251,102,140,149,54,11,212,241,104,239,104,189,179,93,101,233,252,68,229,51,54,161,234,122,178,82,215,245,39,242,43,134,55,96,208,66,194,190,223,194,61,29,122,96,7,18,60,157,67,112,69,103,7,18,170,183,141,3,1,103,254,151,236,13,12,153,64,77,240,220,153,129,48,233,234,193,249,97,52,205,60,52,158,53,13,236,27,79,238,188,181,191,91,24,23,213,183,118,71,184,255,23,204,152,176,7,207,45,171,65,51,177,3,207,117,193,161,197,35,161,19,30,1,49,122,135,34,251,174,131,244,192,161,11,1,103,1,66,61,125,3,155,21,117,60,225,165,195,62,27,43,220,220,127,248,197,52,13,4,25,169,31,14,190,127,124,78,43,124,50,17,121,73,196,64,149,45,224,245,214,4,188,125,125,126,130,234,209,132,175,134,64,225,218,209,145,171,153,192,198,181,110,152,116,17,241,136,136,182,144,79,92,96,187,145,44,68,24,163,20,72,127,65,
+179,111,205,103,215,142,45,235,198,118,11,159,64,83,118,218,72,177,105,242,194,211,110,62,175,89,204,12,115,87,205,88,19,217,127,249,248,227,83,72,130,126,62,217,103,185,48,86,204,115,235,251,227,79,46,96,33,160,103,113,183,97,146,179,123,32,203,25,246,195,221,183,105,186,72,83,134,111,12,42,79,240,37,37,201,84,190,188,127,161,89,170,133,4,1,117,97,89,160,102,113,9,213,4,5,52,89,147,47,136,136,214,98,183,157,250,241,172,178,154,22,124,51,56,220,111,115,68,76,20,47,16,244,16,215,251,24,160,24,90,191,125,119,78,76,196,64,248,113,5,196,243,211,62,105,199,142,156,56,239,186,158,214,108,128,52,77,220,211,30,158,176,16,205,37,86,193,126,36,213,15,196,82,139,59,169,39,65,225,146,193,221,103,118,54,174,153,71,115,122,113,143,76,112,63,205,67,189,189,251,176,89,192,184,164,215,71,87,227,142,139,14,182,241,210,56,11,137,150,215,48,187,250,153,5,167,243,81,240,126,103,42,27,55,117,195,122,72,173,133,155,40,202,155,163,171,
+33,243,7,219,244,71,98,114,74,222,208,0,88,43,88,148,166,27,206,101,206,59,32,150,194,8,243,50,136,119,40,78,184,233,14,165,171,250,172,27,143,21,136,171,112,118,243,146,189,235,226,126,138,216,97,125,116,117,194,110,14,166,133,138,144,62,224,11,65,71,194,154,47,239,121,12,64,49,141,223,244,253,167,205,119,59,107,155,4,87,46,37,242,113,47,153,249,178,35,206,42,235,30,226,86,175,221,14,88,199,213,69,115,226,222,35,52,125,4,29,223,108,238,255,3,174,207,47,212,
+
diff --git a/uppsrc/Core/srcdoc.tpp/Moveable$en-us.tpp b/uppsrc/Core/srcdoc.tpp/Moveable$en-us.tpp
new file mode 100644
index 000000000..c7a744325
--- /dev/null
+++ b/uppsrc/Core/srcdoc.tpp/Moveable$en-us.tpp
@@ -0,0 +1,18 @@
+TITLE("Moveable")
+COMPRESSED
+120,156,237,90,107,115,219,54,22,253,43,152,113,182,149,29,90,33,248,16,41,169,77,155,56,201,76,102,242,232,108,220,246,131,71,83,65,36,100,177,166,72,45,31,146,189,109,243,219,247,92,0,124,72,150,147,204,108,183,253,178,73,155,68,36,238,197,125,158,123,0,249,202,97,143,30,217,150,125,98,127,230,215,228,133,92,138,58,173,102,87,169,19,134,211,36,176,189,169,224,193,244,253,120,250,241,227,199,225,120,236,76,73,21,135,42,110,123,46,119,56,247,108,219,115,2,238,143,237,177,31,242,208,118,3,207,241,3,219,159,108,68,33,214,179,43,17,186,211,179,127,142,32,229,88,254,137,203,93,110,243,145,227,97,149,237,218,142,199,29,159,135,161,199,3,63,116,199,163,209,36,18,155,42,201,179,217,213,130,228,104,51,23,98,118,16,142,60,14,33,207,119,220,192,247,32,236,121,156,227,223,220,15,70,65,48,169,146,42,149,16,226,163,96,42,60,103,122,65,146,158,53,58,129,121,78,0,81,207,241,70,158,27,58,46,15,29,103,52,118,189,177,7,187,185,51,
+73,42,9,43,23,144,33,57,18,243,177,161,231,123,220,69,64,188,192,119,177,44,192,223,158,61,230,14,118,13,109,223,199,134,242,182,137,18,5,136,228,70,216,206,9,124,90,29,122,33,119,131,208,241,156,145,3,3,236,0,94,210,238,254,36,150,101,4,57,215,225,211,10,38,77,47,190,247,167,28,194,129,21,156,56,246,216,118,70,193,24,27,194,88,56,236,142,199,220,13,177,161,199,125,155,187,147,40,143,201,73,199,183,93,181,99,136,60,140,160,89,197,196,31,113,24,236,184,33,182,12,184,235,226,79,223,11,131,73,41,41,19,85,94,204,174,206,190,31,216,67,123,232,248,254,41,137,143,33,30,186,158,235,122,163,177,199,109,23,219,64,135,71,241,26,217,200,37,247,157,112,178,16,37,246,172,60,138,172,138,42,167,66,66,224,221,208,119,177,245,8,127,32,169,112,208,69,108,156,177,23,186,110,104,79,162,84,148,101,47,64,103,228,36,231,22,231,39,1,197,213,119,29,111,76,193,113,29,4,216,25,249,99,142,8,251,35,207,118,38,133,252,87,157,20,114,
+45,51,132,56,65,109,76,155,244,152,58,132,49,186,14,29,139,59,168,68,127,52,178,41,94,62,170,193,113,125,4,220,230,161,7,139,240,27,41,174,76,41,46,58,31,92,139,187,39,99,199,115,97,201,216,243,16,1,40,224,99,206,185,29,226,55,60,67,92,84,109,112,152,160,156,208,219,107,113,207,226,222,73,128,26,70,166,198,30,109,63,118,41,126,14,194,239,140,108,31,121,112,180,184,67,81,119,30,33,238,220,9,233,127,21,121,238,91,28,205,0,19,185,239,195,111,23,161,118,66,248,238,35,246,174,170,111,30,132,147,119,114,87,190,16,149,52,5,115,118,241,72,87,26,31,89,124,116,98,147,188,31,142,145,64,238,81,252,92,207,27,59,99,215,245,157,177,239,142,108,196,177,212,189,76,194,212,79,170,23,91,37,129,197,3,116,22,124,245,125,120,175,196,224,121,192,201,20,39,28,143,40,10,70,201,252,60,77,50,178,3,149,49,213,197,112,118,241,152,243,128,20,133,104,152,48,28,217,238,24,193,64,12,108,31,149,14,52,8,145,104,228,217,65,27,16,
+28,68,55,226,90,206,207,77,171,254,246,203,31,255,120,249,238,252,199,15,236,170,116,166,236,109,190,149,98,145,202,175,102,87,165,223,125,100,81,158,69,114,83,177,66,110,96,9,42,162,100,168,200,36,98,189,34,97,203,188,96,213,221,70,150,172,68,157,203,152,37,25,251,73,70,248,55,91,166,98,139,191,242,37,105,170,4,156,40,74,54,200,196,90,166,119,102,141,197,158,39,205,191,94,103,177,188,101,34,139,205,187,183,98,115,58,100,151,57,147,183,155,20,210,108,183,18,21,75,240,95,169,86,237,86,119,230,83,153,179,100,189,201,139,74,192,160,84,86,172,46,217,50,41,202,138,69,133,68,14,153,96,91,89,220,177,77,145,172,147,42,217,74,179,3,69,246,70,118,214,49,20,13,182,170,84,36,130,105,251,145,125,163,90,138,93,62,53,47,244,199,15,216,52,149,198,217,249,111,230,221,249,239,151,140,205,207,182,234,241,180,125,152,192,52,0,172,136,146,234,110,255,41,149,106,217,60,106,223,108,243,36,102,87,103,236,229,237,6,206,14,78,103,253,29,206,
+127,111,84,177,249,183,108,45,110,7,220,98,14,118,109,183,56,157,246,22,95,226,77,38,119,91,99,233,183,108,64,79,78,25,158,177,104,37,138,249,85,167,238,140,149,201,191,101,190,28,92,158,206,103,125,37,72,244,64,153,75,10,236,41,254,254,198,152,206,146,249,227,249,227,211,125,3,207,127,135,241,216,96,208,110,60,191,74,230,179,83,118,57,232,127,108,182,56,35,95,181,220,172,247,126,120,57,159,76,230,31,47,7,123,254,204,255,232,125,136,37,50,46,231,87,243,25,27,144,51,202,179,195,232,35,158,173,243,173,65,221,235,86,225,166,94,164,73,52,217,207,194,179,56,30,160,70,80,78,151,243,175,216,237,129,163,201,114,160,194,192,158,66,119,27,254,189,212,245,237,160,144,180,14,146,28,197,78,199,229,246,244,136,69,200,30,54,205,55,82,205,17,114,83,103,129,172,64,35,86,117,145,177,94,192,166,172,39,217,47,208,193,129,217,93,60,222,253,248,230,205,244,129,210,210,158,169,132,31,51,109,254,241,83,91,124,182,98,246,202,229,179,89,63,150,232,
+7,19,57,255,99,106,224,236,114,5,132,64,54,250,150,206,52,88,1,71,226,24,144,5,197,107,5,111,0,153,106,37,105,245,214,172,91,203,245,2,192,176,76,100,26,15,217,235,37,189,47,36,129,78,150,179,53,116,48,96,4,98,69,250,0,177,172,68,236,36,48,104,89,145,178,78,145,117,196,4,250,116,199,226,28,53,7,83,18,236,223,134,190,46,147,236,186,171,33,178,163,90,229,176,64,121,163,63,144,17,26,18,179,10,54,149,144,7,238,205,207,217,66,70,162,46,101,39,206,102,6,177,73,84,100,37,171,114,128,222,230,142,109,69,90,227,33,16,186,13,193,178,200,215,42,8,121,145,92,39,153,72,41,4,57,192,83,0,74,73,144,222,161,136,97,185,72,211,60,2,60,198,44,207,36,153,38,9,102,75,80,72,38,22,24,34,48,7,202,129,160,145,30,21,4,55,100,141,218,90,53,84,81,235,65,65,51,132,28,219,212,197,38,47,165,113,83,164,0,118,99,48,249,121,47,130,173,87,151,100,216,74,108,229,125,221,168,64,36,7,219,138,34,102,23,84,
+118,44,77,22,133,128,71,136,218,186,156,208,12,89,215,104,238,5,34,246,68,41,152,159,183,26,18,228,102,134,49,244,46,223,53,147,165,157,41,24,123,73,132,0,153,216,105,35,35,145,145,166,110,24,150,117,180,234,70,204,145,1,242,161,42,40,217,189,214,49,213,77,60,119,250,0,48,245,69,13,56,53,82,183,213,65,31,146,30,3,124,6,238,225,91,42,179,1,45,157,63,230,251,56,143,119,209,230,110,64,66,22,163,21,71,59,255,200,254,253,71,128,172,242,75,173,40,135,244,234,51,134,152,69,71,109,81,32,221,34,228,183,95,102,78,15,77,250,113,254,243,44,165,23,159,194,76,19,187,47,53,235,8,178,81,47,149,82,106,16,88,137,205,70,102,132,8,50,187,223,41,232,240,246,153,222,120,86,18,126,72,133,15,50,158,176,87,196,151,44,42,255,68,35,2,186,187,67,5,52,191,169,251,216,210,117,174,251,210,64,0,213,47,69,171,65,65,106,104,236,167,14,106,13,132,66,37,45,105,154,165,1,2,18,45,243,186,136,100,39,129,102,78,170,14,3,
+117,120,103,67,246,12,136,171,132,137,148,21,86,31,31,147,108,155,223,192,112,156,241,250,168,98,118,35,155,107,122,137,224,146,82,242,173,217,173,69,253,22,240,26,175,135,236,69,46,9,232,21,235,68,164,215,108,39,85,40,118,162,212,122,88,138,151,240,236,226,135,31,89,116,23,17,142,255,74,88,2,15,214,66,81,203,38,156,192,183,236,218,0,25,180,84,171,2,136,34,118,2,48,186,231,21,2,115,135,167,223,177,159,21,180,47,97,93,89,73,17,147,14,168,164,93,141,210,29,169,175,211,24,195,9,177,20,140,116,17,62,23,72,204,146,2,126,232,207,252,235,195,164,168,73,208,203,138,38,214,37,204,89,193,186,56,41,41,191,59,146,58,168,75,10,120,47,214,223,177,15,168,67,146,233,40,118,210,96,97,3,90,127,59,155,110,248,216,223,200,164,91,154,59,67,2,8,51,90,101,22,107,254,54,156,171,39,254,0,13,122,144,5,253,245,108,183,9,237,127,199,116,255,207,87,129,234,175,20,25,146,13,40,192,90,1,46,151,92,103,68,54,151,34,50,60,
+99,209,144,68,93,72,10,113,136,115,101,121,54,63,255,225,253,11,115,40,55,128,181,77,242,84,195,180,166,64,45,35,26,96,193,46,1,28,162,217,163,186,36,26,170,113,72,115,30,75,15,23,44,186,6,249,105,168,175,188,133,25,32,128,205,187,29,206,221,32,59,160,158,61,176,18,64,204,194,128,223,62,43,83,4,17,56,211,224,7,125,134,22,195,135,213,218,66,236,216,2,224,5,150,22,139,170,207,59,153,30,56,121,102,72,34,161,94,39,220,130,159,2,116,96,163,98,184,61,94,175,102,251,172,27,73,61,234,223,219,163,25,139,61,2,63,100,63,211,59,60,163,233,164,166,13,62,38,116,28,184,79,58,145,171,254,36,82,51,89,235,164,20,104,141,20,223,138,162,132,71,169,236,38,8,5,56,205,203,106,168,235,225,236,9,140,120,162,200,181,206,104,159,101,82,198,21,201,52,28,125,175,34,212,204,6,128,99,197,108,109,238,116,140,82,118,129,170,42,16,47,154,109,52,12,181,106,146,104,87,178,231,82,41,107,110,131,86,162,52,243,14,1,136,115,84,
+77,181,34,194,12,21,250,56,69,171,11,137,224,203,44,146,101,147,178,124,241,43,220,165,211,141,76,151,140,106,155,134,251,252,107,144,125,81,208,140,125,57,188,30,154,38,208,1,99,111,146,236,166,223,153,250,243,217,166,144,219,135,232,48,45,65,59,155,95,56,25,211,226,22,44,250,103,98,181,178,209,120,218,95,186,233,173,235,218,81,31,30,149,147,77,40,172,246,132,165,35,61,63,39,215,225,151,216,43,80,182,83,211,121,1,218,116,163,66,33,111,19,77,27,82,108,15,207,159,33,240,138,25,16,97,162,65,171,35,216,222,173,149,172,92,105,21,88,80,167,233,50,81,201,36,94,211,102,69,37,110,162,109,77,184,111,79,223,3,184,94,87,72,144,97,46,234,84,4,78,1,8,40,170,90,29,231,212,225,145,74,180,121,68,247,204,122,10,15,15,52,61,111,223,64,221,0,108,4,154,78,85,243,146,74,234,118,129,100,55,20,111,43,138,68,168,195,236,94,37,29,232,124,151,247,203,4,102,108,114,117,130,213,82,230,224,244,137,234,41,235,133,126,220,50,55,
+237,82,217,4,147,98,98,233,134,238,44,82,109,163,50,192,196,178,50,8,97,98,1,2,149,148,43,73,192,38,163,90,131,75,131,198,53,112,146,146,33,154,38,65,38,40,17,164,81,34,56,251,249,82,86,223,29,115,31,35,82,208,232,153,236,215,250,171,60,63,32,43,120,130,210,188,78,243,133,72,231,191,44,205,123,187,125,223,9,246,123,132,230,150,232,230,138,86,178,236,148,235,21,40,249,170,120,168,135,212,244,255,32,171,129,22,102,203,123,227,49,167,54,89,62,124,6,123,127,195,15,103,170,214,117,75,130,116,194,239,100,159,60,81,141,146,182,41,210,99,136,74,86,103,41,175,171,50,137,155,28,245,229,230,231,79,187,250,166,238,165,57,73,27,169,187,139,197,30,108,125,194,86,231,208,86,84,113,9,247,231,95,9,139,217,86,67,191,16,183,62,1,195,254,166,94,255,98,131,159,139,248,94,116,77,74,238,69,246,160,31,25,173,83,70,150,159,177,146,14,45,165,50,77,241,136,47,49,234,94,24,81,98,100,20,194,120,52,106,253,14,54,221,110,49,146,
+249,95,25,232,30,26,216,235,173,163,209,107,44,237,160,72,75,180,241,252,19,140,242,168,203,192,175,5,74,2,20,226,192,66,243,116,72,221,72,230,29,175,191,246,142,41,6,0,41,66,6,60,52,129,237,193,221,159,20,208,254,141,234,125,224,195,196,43,151,196,246,150,34,33,98,145,138,226,26,4,169,110,120,150,194,78,2,229,8,166,16,154,98,205,58,47,171,62,102,151,236,46,175,25,186,163,104,24,37,213,10,57,73,142,137,222,247,52,125,226,166,169,166,38,81,164,229,128,197,188,165,77,218,111,135,44,197,118,222,93,190,233,127,37,133,249,78,50,247,72,18,221,249,237,100,51,65,153,92,46,17,89,58,218,154,177,65,231,93,88,152,23,215,34,3,86,40,63,26,34,180,79,45,123,187,41,30,169,84,18,141,146,168,42,69,164,20,9,232,200,253,62,245,74,52,89,82,174,54,25,38,6,165,202,0,82,152,118,234,11,49,217,16,6,153,149,117,33,181,174,60,83,161,222,42,77,123,23,58,109,253,192,146,253,144,12,205,41,36,81,7,8,197,122,219,251,
+133,88,130,15,64,154,88,104,190,222,36,20,246,100,109,54,67,146,100,65,74,116,42,232,174,186,113,66,145,6,186,209,109,53,69,43,25,221,96,182,55,241,190,196,187,104,149,72,138,13,109,125,157,139,212,82,53,65,116,119,45,138,155,3,222,67,135,160,24,135,140,173,226,95,43,185,238,110,175,145,211,230,123,204,89,119,243,160,111,26,36,24,103,51,246,142,92,196,78,90,201,111,250,207,159,18,87,28,14,135,134,36,194,222,103,41,194,159,9,42,9,58,122,232,93,17,200,249,47,111,223,255,244,242,217,243,55,47,81,83,34,42,242,134,174,131,50,198,250,106,8,174,24,202,221,139,80,162,91,65,155,212,230,86,9,211,224,128,2,28,35,179,107,194,75,117,169,44,104,85,227,200,222,190,131,178,138,113,36,45,149,225,167,211,94,61,55,247,79,109,68,239,153,97,221,79,185,78,148,208,57,37,250,185,95,159,230,36,134,255,226,60,147,148,20,17,199,38,37,196,117,91,206,243,12,52,178,168,218,232,94,62,29,156,26,211,168,141,32,106,192,160,199,231,68,151,
+60,101,58,142,161,101,83,119,154,10,19,17,109,215,0,117,106,117,108,198,89,148,52,245,14,97,73,105,142,213,4,58,11,28,136,107,243,221,132,254,230,162,181,77,15,204,58,211,231,82,114,74,130,31,170,47,57,8,97,213,69,234,229,76,149,54,226,71,97,234,199,174,84,87,151,250,139,123,211,249,100,171,62,16,200,162,48,247,146,123,88,75,95,95,80,22,154,62,120,69,183,118,233,157,165,251,138,206,93,80,114,4,47,246,143,242,67,118,81,23,5,249,174,159,107,179,203,230,52,168,172,167,173,219,187,1,237,247,250,254,183,253,237,87,69,90,112,121,120,167,0,67,22,178,9,203,144,189,206,20,114,89,44,78,150,134,214,227,125,181,147,56,244,146,16,53,126,187,203,129,42,147,20,53,168,148,160,254,97,129,38,105,250,62,82,201,52,103,149,46,163,234,103,3,232,90,194,92,173,238,242,226,70,227,123,83,192,137,161,253,180,133,78,137,186,69,237,29,218,246,204,81,153,101,51,250,129,2,80,126,149,215,254,249,14,74,104,37,45,226,108,166,4,118,171,4,
+125,72,8,165,207,122,100,13,202,31,83,49,111,48,169,95,130,228,140,234,240,190,135,10,178,84,77,97,52,172,20,156,82,55,233,239,51,76,9,226,216,8,183,112,20,49,165,136,61,84,146,45,243,3,16,56,98,210,64,93,209,141,14,157,175,215,226,26,235,212,176,216,160,136,16,54,93,19,10,206,212,105,70,105,214,96,176,119,74,37,101,53,181,52,253,52,6,33,13,197,51,50,133,117,32,222,204,70,180,43,213,253,82,128,146,212,27,154,180,93,190,75,185,198,216,77,162,246,172,102,238,107,148,96,227,14,221,43,13,217,15,192,187,188,88,171,3,37,69,74,81,32,118,141,97,162,29,196,136,141,187,107,175,234,88,237,210,92,170,64,101,22,137,58,143,235,75,179,225,236,63,52,159,23,164,
+
diff --git a/uppsrc/Core/srcdoc.tpp/NTL$en-us.tpp b/uppsrc/Core/srcdoc.tpp/NTL$en-us.tpp
new file mode 100644
index 000000000..c0cf2339b
--- /dev/null
+++ b/uppsrc/Core/srcdoc.tpp/NTL$en-us.tpp
@@ -0,0 +1,15 @@
+TITLE("Overview of U++ containers - NTL")
+COMPRESSED
+120,156,173,88,13,111,219,70,18,253,43,11,56,119,72,28,89,230,242,155,82,81,52,113,26,92,128,54,1,154,244,128,131,161,84,20,181,178,246,76,145,42,151,180,163,59,92,127,251,189,153,93,82,148,221,184,61,224,26,212,150,41,238,124,188,121,243,102,200,107,95,60,123,230,77,188,51,239,15,254,155,189,81,155,188,43,219,197,117,233,167,233,92,39,94,56,207,101,50,255,144,205,127,251,237,183,105,150,249,115,50,37,97,74,122,97,32,125,41,67,207,11,253,68,70,153,151,69,169,76,189,32,9,253,40,241,162,217,62,111,242,221,226,58,79,131,249,249,79,49,78,249,147,232,44,144,129,244,100,236,135,184,203,11,60,63,148,126,36,211,52,148,73,148,6,89,28,207,138,124,223,234,186,90,92,175,232,28,57,11,112,204,75,210,56,148,56,20,70,126,144,68,33,14,135,161,148,248,44,163,36,78,146,89,171,219,82,225,144,140,147,121,30,250,243,43,58,25,78,226,51,132,231,39,56,26,250,97,28,6,169,31,200,212,247,227,44,8,179,16,113,75,127,166,91,133,
+40,87,56,67,231,232,88,4,135,97,20,202,0,128,132,73,20,224,182,4,191,67,47,147,62,188,166,94,20,193,161,250,210,163,68,0,209,185,24,238,252,36,162,187,211,48,149,65,146,250,161,31,251,8,192,75,144,37,121,143,102,107,101,10,156,11,124,57,111,17,210,252,234,187,104,46,113,56,153,36,103,190,151,121,126,156,100,112,136,96,145,112,144,101,50,72,225,48,148,145,39,131,89,81,175,41,73,63,242,2,246,152,162,14,49,44,51,38,81,44,17,176,31,164,112,153,200,32,192,207,40,76,147,153,81,84,137,182,110,22,215,231,223,61,247,166,222,212,143,162,23,116,60,195,241,52,8,131,32,140,179,80,122,1,220,192,70,72,120,197,30,106,41,35,63,157,173,114,3,159,109,72,200,50,170,146,136,4,224,131,52,10,224,58,198,15,20,21,9,6,192,198,207,194,52,8,82,111,86,148,185,49,35,128,206,41,73,41,39,82,158,37,132,107,20,248,97,70,224,4,62,0,246,227,40,147,64,56,138,67,207,159,53,234,215,78,55,106,167,42,64,172,193,141,121,95,
+30,199,67,4,99,121,232,79,164,15,38,70,113,236,17,94,17,216,224,7,17,0,247,100,26,34,34,252,67,137,91,71,197,213,49,135,96,34,131,179,204,15,3,68,146,133,33,16,128,1,153,73,41,189,20,255,144,25,112,97,110,72,132,192,73,88,247,246,120,56,145,225,89,2,14,163,82,89,72,238,179,128,240,243,1,191,31,123,17,234,224,219,227,62,161,238,63,3,238,210,79,233,127,70,94,70,19,137,102,64,136,50,138,144,119,0,168,253,20,185,71,192,62,96,126,203,36,157,189,87,247,230,77,222,42,71,152,243,171,103,150,105,50,158,200,248,204,163,243,81,154,161,128,50,36,252,130,48,204,252,44,8,34,63,139,130,216,3,142,198,246,50,29,166,126,226,94,28,140,36,19,153,160,179,144,107,20,33,123,62,134,204,19,73,161,248,105,22,19,10,206,200,242,162,212,21,197,1,102,204,45,25,206,175,94,74,153,144,161,20,13,147,166,177,23,100,0,3,24,120,17,152,14,53,72,81,104,212,217,71,27,144,28,20,183,249,141,90,94,184,86,253,247,47,255,249,
+203,247,239,47,126,254,40,174,141,63,23,31,238,84,115,167,213,189,168,55,226,231,229,203,229,75,81,212,85,155,195,105,99,196,242,66,188,255,244,195,95,23,215,38,154,211,39,161,141,200,69,169,87,77,222,28,232,196,112,175,200,171,181,200,203,155,186,209,237,118,39,80,128,125,9,0,205,84,188,107,233,20,218,79,223,84,106,45,218,90,152,186,188,83,248,185,83,98,223,212,171,82,237,140,184,199,5,165,132,174,68,209,53,13,8,40,174,56,24,211,194,112,222,172,7,167,31,63,253,48,165,128,130,185,248,9,95,213,59,145,23,133,50,198,5,249,125,94,108,133,209,213,77,169,56,224,99,128,125,72,162,221,230,173,40,242,10,182,235,70,137,29,253,192,181,74,212,149,18,170,100,250,139,109,110,68,51,182,63,21,159,182,250,193,53,134,195,136,77,110,90,250,237,46,118,228,94,128,131,220,252,6,137,138,77,221,184,11,244,149,243,97,196,161,238,56,144,206,80,230,107,141,227,112,208,110,41,90,10,232,104,131,208,5,68,141,42,234,29,206,2,70,10,38,223,3,
+63,36,60,0,114,236,223,30,143,87,176,178,219,215,13,96,108,197,70,229,109,135,108,81,56,194,38,111,200,226,241,8,135,201,160,172,135,24,167,226,231,170,212,183,138,112,159,136,251,173,6,188,132,141,131,248,250,18,8,239,15,203,11,224,108,218,166,43,90,141,122,46,56,94,124,7,41,66,213,115,190,52,242,196,142,238,183,53,12,184,178,78,56,160,93,126,75,8,140,67,170,43,177,7,28,167,60,83,119,202,94,222,169,118,91,175,5,164,82,247,5,186,207,15,54,185,178,172,239,13,5,177,134,177,162,93,112,102,4,63,178,167,208,170,195,66,180,135,61,163,113,204,150,142,2,212,59,13,194,138,246,190,22,136,148,221,181,219,6,252,220,148,249,29,213,131,18,80,68,53,114,93,136,87,111,62,137,91,84,240,180,37,26,5,190,105,80,29,156,127,132,243,224,210,213,238,173,181,236,202,118,125,126,41,254,142,168,49,60,156,207,19,211,3,72,134,83,48,228,97,165,232,212,231,245,126,191,156,45,47,151,151,31,235,174,41,212,155,186,88,94,94,13,231,150,151,
+63,214,119,138,10,242,25,196,183,159,108,181,182,57,2,85,154,201,247,103,236,236,117,113,187,252,229,51,26,91,237,153,3,98,160,0,77,188,63,125,94,44,200,123,189,183,76,159,252,79,190,233,247,137,91,49,182,69,165,91,219,181,106,124,211,84,28,77,17,168,220,73,14,99,6,225,190,134,220,92,159,15,248,107,42,190,210,141,251,89,229,59,101,208,10,128,138,174,8,245,165,80,188,58,49,177,206,197,187,106,173,190,44,92,171,80,147,150,16,128,83,63,142,170,131,83,195,134,86,10,50,210,116,85,171,33,140,197,22,163,179,64,255,107,211,234,194,178,196,241,226,85,211,228,135,175,208,130,108,209,61,85,189,0,199,197,130,228,2,145,125,149,125,19,177,234,88,159,75,82,46,181,217,232,66,227,250,84,252,99,44,77,45,171,54,171,165,109,189,186,60,64,54,247,72,209,242,15,9,185,78,122,32,31,98,93,131,157,85,221,218,131,140,175,229,42,42,163,105,30,64,139,41,249,125,173,161,11,48,160,43,146,252,86,231,4,233,132,196,115,172,146,156,123,159,58,
+12,21,141,34,73,71,131,119,141,161,86,91,231,109,46,108,169,161,116,8,236,21,156,19,167,71,218,55,174,184,54,118,30,52,106,163,48,118,10,219,75,67,248,36,145,21,66,199,141,213,93,94,106,152,87,235,63,100,16,88,224,138,52,112,135,88,211,183,250,232,52,77,25,133,184,42,1,235,157,114,237,127,73,2,53,18,177,81,129,45,120,128,98,253,232,236,132,188,57,93,102,190,147,228,51,153,108,71,0,207,126,26,179,93,152,88,29,108,29,72,22,205,94,21,26,245,23,88,156,62,183,53,122,203,246,224,21,10,186,188,52,77,209,247,221,242,153,170,150,23,157,249,44,90,76,67,3,220,48,186,119,84,179,194,44,250,28,95,179,46,158,78,203,99,26,142,205,220,5,143,116,211,244,105,231,235,53,2,187,4,111,161,199,227,185,233,56,163,236,65,250,104,64,112,170,30,65,144,131,154,173,254,23,210,59,65,1,84,224,62,51,234,196,21,10,108,53,124,213,233,146,252,137,85,89,23,183,182,77,222,211,208,27,181,61,223,206,254,240,23,21,192,94,165,91,17,
+243,233,140,152,142,53,196,177,195,37,102,39,82,15,11,74,218,65,51,154,242,64,222,175,196,29,159,57,29,75,35,83,60,90,207,79,85,192,65,38,6,168,232,38,116,146,106,90,55,241,198,216,97,244,161,223,140,102,209,122,206,66,6,157,216,151,234,139,110,15,132,6,160,195,55,85,183,91,169,147,56,120,100,172,95,12,53,214,54,17,152,201,203,255,95,117,219,250,114,211,128,53,43,52,46,200,126,163,171,170,79,201,85,124,92,237,161,198,199,178,219,106,91,166,223,43,212,197,116,216,164,214,92,166,183,239,222,126,56,246,131,69,246,181,126,128,237,107,237,208,229,114,99,9,232,81,134,239,213,87,146,238,65,97,249,239,27,217,182,1,18,62,76,172,74,60,94,18,134,101,227,180,87,134,20,89,157,78,32,251,90,31,252,9,84,196,243,93,135,169,196,11,221,234,201,14,125,97,7,28,173,196,93,165,97,184,23,208,25,141,3,23,15,47,190,208,160,70,43,72,16,197,48,208,234,200,26,107,104,80,23,214,170,169,248,91,110,182,188,38,27,43,102,84,27,70,
+104,172,85,22,74,120,216,67,202,201,20,128,130,159,190,83,151,23,163,86,37,82,99,221,172,11,109,119,174,7,53,118,83,121,220,60,124,9,235,199,227,26,107,235,216,13,221,115,62,97,44,31,249,171,99,215,145,122,32,154,150,250,5,154,73,135,1,37,22,8,22,146,39,17,102,97,57,244,245,71,146,249,122,121,81,87,229,161,191,181,223,60,121,203,57,166,67,122,193,72,13,166,104,157,0,21,118,10,106,60,76,75,211,237,247,176,53,234,42,177,224,140,145,12,233,62,89,165,32,23,150,251,148,35,120,115,188,101,180,49,81,36,55,170,237,111,165,111,199,162,128,207,199,99,176,65,66,116,58,127,78,51,152,138,143,164,158,52,121,27,226,21,172,47,184,32,116,158,10,180,56,150,167,223,123,94,97,137,154,144,224,238,106,195,107,194,166,171,92,15,146,102,161,49,236,163,229,211,144,147,79,86,110,242,201,229,124,130,25,139,201,224,108,4,62,85,220,96,55,83,107,219,102,188,94,13,143,150,252,242,133,205,244,38,236,26,56,48,216,56,2,29,251,159,186,163,
+238,120,67,197,50,211,170,97,69,124,42,52,14,3,35,3,68,71,235,144,88,50,35,198,142,157,86,108,232,201,254,24,254,208,134,182,223,104,176,245,227,202,233,215,143,249,254,119,196,107,135,171,236,244,159,29,32,49,154,166,5,15,13,215,239,204,2,219,80,20,237,147,101,56,46,147,253,222,210,110,59,67,12,227,97,197,24,146,95,114,234,222,27,144,22,136,141,30,150,123,94,13,199,90,115,139,78,66,61,108,4,218,244,162,68,91,18,14,177,31,139,147,141,236,81,72,78,73,153,28,131,93,221,47,88,180,242,241,52,179,209,216,149,190,215,100,54,197,237,78,132,66,32,230,232,115,120,25,96,31,238,167,194,33,139,108,10,140,89,138,156,144,157,184,99,128,36,47,241,0,107,250,53,26,41,13,52,152,216,81,96,187,156,63,30,87,216,225,73,147,245,131,4,194,173,227,46,138,231,20,17,251,216,81,253,86,106,120,248,123,49,218,45,80,250,197,100,96,26,253,213,83,239,163,186,113,223,115,144,35,169,164,240,121,179,98,149,63,9,86,245,237,49,226,223,131,
+109,153,140,49,151,72,73,108,190,67,47,209,30,50,106,40,114,62,117,58,208,107,215,200,112,63,2,246,121,211,246,113,89,64,239,114,93,82,166,61,193,63,84,106,120,152,162,63,22,246,165,214,136,158,253,251,161,109,93,174,121,2,194,118,53,122,57,100,134,173,211,118,19,73,15,227,141,16,236,167,147,214,212,45,45,35,102,36,89,168,145,123,205,83,148,181,81,182,33,30,188,231,202,187,182,94,254,178,111,27,126,66,99,116,129,20,134,133,11,1,80,13,139,136,123,161,51,177,131,253,241,86,62,25,202,205,50,131,199,85,241,252,64,141,71,195,130,94,225,228,213,194,62,185,88,34,124,67,184,124,243,233,91,241,237,11,251,68,77,177,26,139,62,141,127,0,54,122,169,68,57,58,179,29,186,150,94,38,226,177,82,21,185,123,118,164,187,91,43,247,244,176,182,182,81,142,17,31,191,243,202,237,163,32,166,26,85,201,155,11,251,11,12,168,14,238,202,53,255,241,245,186,89,113,169,92,229,220,19,81,191,141,60,120,251,51,122,150,59,174,98,239,12,37,239,94,
+46,161,56,107,232,114,179,195,61,92,245,246,119,31,117,25,168,43,206,240,244,176,123,68,229,69,205,221,106,23,52,55,188,31,164,249,186,219,160,118,199,76,237,223,46,89,39,188,95,19,214,126,150,220,52,245,61,245,7,18,218,211,35,128,91,101,6,47,98,241,95,234,220,243,194,
+
diff --git a/uppsrc/Core/srcdoc.tpp/NTLvsSTL$en-us.tpp b/uppsrc/Core/srcdoc.tpp/NTLvsSTL$en-us.tpp
new file mode 100644
index 000000000..dbcc25a96
--- /dev/null
+++ b/uppsrc/Core/srcdoc.tpp/NTLvsSTL$en-us.tpp
@@ -0,0 +1,11 @@
+TITLE("NTL vs STL")
+COMPRESSED
+120,156,133,87,105,143,219,70,18,253,43,13,140,119,55,25,115,52,236,139,135,244,37,179,147,44,16,192,235,0,62,178,31,6,74,68,81,173,81,195,20,91,97,183,70,86,130,248,183,239,171,38,117,110,140,245,120,14,181,186,142,247,234,85,21,245,36,216,171,87,105,146,222,164,255,231,223,248,123,179,172,182,77,152,62,53,162,40,38,54,79,213,164,226,249,228,167,114,242,229,203,151,81,89,138,9,185,226,112,197,83,37,185,224,92,165,169,18,57,215,101,90,234,130,23,169,204,149,208,121,170,199,155,170,171,214,211,167,170,144,147,219,119,25,172,68,162,111,36,151,60,229,153,80,184,149,202,84,40,46,52,47,10,197,115,93,200,50,203,198,117,181,9,214,181,211,167,57,217,81,48,9,179,52,47,50,197,97,164,180,144,185,86,48,86,138,115,252,205,117,158,229,249,56,216,208,24,24,241,44,159,84,74,76,30,201,82,37,217,13,210,19,57,76,149,80,153,146,133,144,188,16,34,43,165,42,21,242,230,98,108,131,65,150,115,216,144,29,153,105,4,84,90,113,9,66,
+84,174,37,174,229,248,173,210,146,11,68,45,82,173,17,208,124,62,176,68,4,145,93,134,112,34,215,116,187,80,5,151,121,33,148,200,4,18,72,115,160,164,232,122,188,48,190,134,157,20,124,18,144,210,228,241,59,61,225,48,206,147,252,70,164,101,42,178,188,68,64,36,11,192,178,44,185,44,16,80,113,157,114,57,174,221,130,64,10,157,202,24,177,64,29,50,120,142,156,232,140,35,97,33,11,132,204,185,148,248,169,85,145,143,189,161,74,4,215,77,159,110,191,251,38,29,165,35,161,245,183,100,94,194,188,144,74,74,149,149,138,167,18,97,224,67,17,95,89,138,90,114,45,138,241,188,242,136,25,20,49,27,89,229,36,36,16,47,11,45,17,58,195,15,20,21,0,37,184,17,165,42,164,44,210,113,221,84,222,159,17,116,75,32,57,79,56,191,201,137,87,45,133,42,137,28,41,64,176,200,116,201,193,176,206,84,42,198,157,249,109,107,59,179,54,45,40,182,208,198,228,80,158,65,135,72,166,215,161,72,184,128,18,117,150,165,196,151,134,26,132,212,32,60,229,133,
+66,70,248,66,137,195,32,197,249,9,131,76,184,188,41,133,146,200,164,84,10,12,192,1,47,57,231,105,129,47,32,3,47,81,27,28,41,68,16,125,248,222,92,37,92,221,228,208,48,42,85,42,10,95,74,226,79,128,126,145,165,26,117,16,189,185,32,214,197,43,240,206,69,65,223,145,121,174,19,142,102,64,138,92,107,224,150,160,90,20,192,174,193,189,140,250,230,121,49,126,107,118,254,251,42,152,65,48,183,143,175,122,165,241,44,225,217,77,74,246,186,40,81,64,174,136,63,169,84,41,74,41,181,40,181,204,82,240,232,251,94,38,99,234,167,216,139,71,39,121,194,115,116,22,176,106,13,244,209,12,200,115,78,169,136,162,204,136,133,193,201,236,174,177,45,229,1,101,76,122,49,220,62,190,230,60,39,71,5,26,166,40,178,84,150,32,3,28,164,26,74,199,52,40,80,104,212,89,160,13,104,28,212,159,170,103,51,187,27,90,245,143,95,255,252,219,15,111,239,62,190,103,79,94,76,216,219,15,111,216,236,142,189,199,175,71,183,70,193,172,119,237,223,167,79,94,
+247,239,237,42,207,234,206,128,140,5,11,142,121,215,188,24,182,116,77,227,118,182,125,102,155,206,205,27,179,246,108,103,216,214,247,119,76,91,187,109,27,76,199,118,43,211,226,152,46,34,192,152,145,95,57,65,160,205,126,118,87,187,214,135,110,91,7,11,15,236,76,123,126,8,79,57,13,199,158,133,149,97,166,233,223,103,30,93,133,88,182,101,112,18,42,48,212,121,138,188,54,38,196,155,231,222,152,91,226,218,255,70,172,218,5,67,175,216,231,182,162,151,97,191,49,126,196,62,172,44,0,87,192,2,143,59,119,4,56,238,147,178,24,8,147,159,192,219,15,135,92,194,170,10,108,225,88,235,2,243,85,176,126,185,167,20,252,85,18,117,213,210,141,185,97,11,156,213,161,217,159,161,32,164,39,36,163,171,80,255,114,29,91,87,237,190,79,145,224,28,136,72,96,92,55,219,197,64,240,5,27,43,36,109,80,44,92,186,66,15,119,39,236,204,109,76,156,82,12,184,43,246,98,186,61,51,159,55,166,245,22,133,238,223,196,94,72,122,156,184,179,91,237,145,66,64,
+97,17,98,127,134,235,107,112,152,89,46,1,24,238,154,253,232,76,89,213,98,129,194,70,158,137,243,129,104,54,223,195,69,232,220,98,91,19,172,167,95,130,219,216,122,54,158,221,207,238,31,17,97,118,239,187,122,118,255,179,33,32,179,87,166,157,221,109,253,47,172,127,61,141,200,190,102,243,208,117,213,254,100,18,95,78,217,178,169,94,92,55,200,228,162,6,144,234,207,85,179,133,54,186,170,245,75,211,13,217,63,226,26,232,39,139,43,168,96,131,168,56,220,7,29,174,69,165,251,22,56,209,186,48,102,67,5,217,236,217,89,85,238,99,69,214,209,243,80,148,75,61,226,112,233,58,72,161,54,167,198,51,126,99,106,91,53,8,115,217,110,231,121,161,137,151,219,182,166,74,66,150,97,219,181,236,133,144,65,28,243,109,96,13,102,4,161,153,155,64,109,123,184,90,53,54,236,169,230,107,235,123,4,141,55,8,210,1,161,115,163,88,69,228,241,98,177,92,191,66,250,194,129,119,28,127,154,253,122,34,254,64,15,243,6,96,130,173,253,148,146,173,205,38,196,54,
+94,152,170,97,59,27,86,23,202,56,148,228,29,74,236,214,172,170,107,168,39,214,187,187,56,129,28,163,100,207,166,72,100,15,91,33,114,26,217,160,33,177,233,12,146,160,34,237,170,61,91,185,29,197,62,115,11,88,72,14,237,124,156,59,23,3,103,196,254,179,178,52,56,40,71,252,127,54,56,141,117,32,231,107,231,67,127,100,107,242,159,128,247,170,161,113,190,60,43,94,223,72,195,160,96,212,152,40,134,169,60,53,84,107,150,54,176,101,7,100,151,0,251,10,219,118,97,107,154,88,23,85,88,146,237,229,117,2,213,52,236,19,12,174,68,30,81,146,185,165,105,189,172,106,210,88,36,229,72,226,117,176,7,26,18,30,161,134,174,78,162,61,248,237,162,246,107,172,144,198,4,116,58,67,83,217,197,193,252,72,61,24,92,82,187,81,34,131,211,4,186,181,245,42,146,187,69,57,32,255,199,217,235,217,107,214,111,192,104,179,222,226,130,183,228,188,31,94,13,33,195,176,154,59,12,90,191,7,162,207,236,155,62,216,26,15,107,29,205,181,96,215,246,119,58,161,
+172,80,169,126,42,130,103,75,34,193,28,94,82,139,82,51,33,194,89,111,125,123,80,218,143,237,194,124,30,100,244,112,142,173,53,187,56,140,9,5,154,214,161,255,104,190,157,168,77,190,58,131,162,207,112,234,133,248,122,154,80,78,135,177,103,22,9,73,20,116,218,216,9,243,173,109,226,136,159,55,14,125,186,36,153,156,23,244,60,131,227,192,62,78,176,135,230,217,117,232,165,245,95,173,216,119,87,123,146,154,165,58,24,32,5,144,21,55,66,227,192,51,128,47,160,201,214,44,122,209,133,206,154,40,175,65,125,96,30,247,227,56,90,66,244,23,235,47,46,156,198,99,69,219,214,174,1,202,181,199,109,91,209,195,4,6,217,232,121,52,44,71,60,102,116,129,16,35,165,56,165,233,143,141,107,246,136,176,129,88,142,29,121,0,249,111,219,210,6,91,83,38,23,0,63,196,130,19,142,24,221,187,181,161,20,174,46,95,47,247,127,26,223,207,180,91,18,161,233,94,204,148,26,195,147,54,251,253,150,92,182,93,116,142,219,239,87,157,109,63,77,241,32,18,86,46,
+62,12,69,188,246,119,196,63,169,99,246,15,140,84,3,44,253,248,223,174,227,71,175,235,181,255,227,177,105,134,173,210,47,108,140,171,138,189,253,248,230,77,63,193,175,173,30,254,74,142,125,37,233,19,5,45,36,182,170,252,138,216,61,43,221,48,249,207,186,96,196,62,6,27,23,64,252,72,97,250,26,30,86,67,239,113,176,238,159,12,183,155,13,170,118,82,107,237,186,88,203,67,180,163,233,104,250,95,242,99,223,20,
+
diff --git a/uppsrc/Core/srcdoc.tpp/Packages$en-us.tpp b/uppsrc/Core/srcdoc.tpp/Packages$en-us.tpp
new file mode 100644
index 000000000..c5abc3daa
--- /dev/null
+++ b/uppsrc/Core/srcdoc.tpp/Packages$en-us.tpp
@@ -0,0 +1,99 @@
+TITLE("Standard Ultimate++  packages")
+COMPRESSED
+120,156,141,86,13,111,219,54,20,252,43,68,157,13,77,234,
+56,252,148,40,9,24,138,58,105,17,160,107,179,166,65,7,
+4,198,76,75,180,195,85,150,92,74,78,22,20,237,111,223,
+209,118,36,167,45,214,37,136,99,210,188,247,238,221,187,71,
+249,154,147,131,3,58,164,3,250,147,159,244,212,206,205,186,
+108,39,215,37,215,58,115,140,113,154,25,22,103,111,147,236,
+235,215,175,35,38,169,206,66,48,134,96,140,74,193,56,195,
+30,149,60,102,42,161,137,210,76,83,17,75,174,98,170,210,
+149,241,102,57,185,54,90,100,71,239,34,160,248,80,13,4,
+19,140,178,136,75,156,162,130,114,201,184,98,90,75,22,43,
+45,146,40,74,115,179,106,93,93,77,174,103,1,39,1,19,
+128,209,88,71,146,1,36,21,23,177,146,0,75,9,122,2,
+137,227,40,142,211,214,181,165,157,92,187,192,27,108,199,129,
+165,28,70,3,176,227,49,144,146,203,72,10,205,5,211,156,
+71,137,144,137,4,109,198,83,215,90,144,156,73,158,25,252,
+5,152,66,62,169,36,19,80,68,198,74,224,88,140,255,146,
+38,140,35,169,166,74,33,159,253,231,65,166,25,4,10,34,
+5,108,132,148,60,86,1,161,165,102,34,214,92,242,136,131,
+4,141,81,104,96,160,210,194,54,57,176,130,179,172,5,173,
+108,252,92,101,12,224,120,24,15,56,77,40,143,226,4,73,
+65,24,53,139,36,97,66,35,169,100,138,50,145,230,117,129,
+58,103,92,81,145,1,163,209,137,8,129,55,170,168,136,129,
+51,23,26,25,99,38,4,94,149,212,113,218,216,208,139,182,
+246,147,235,163,231,79,233,136,142,184,82,135,129,111,2,184,
+22,82,8,25,37,146,81,129,44,136,33,131,100,17,69,55,
+153,226,58,157,153,6,41,91,108,197,217,56,116,63,120,9,
+202,11,173,4,50,71,120,65,87,81,158,128,58,60,145,90,
+8,77,211,188,52,77,179,147,40,200,115,20,74,100,108,200,
+216,32,14,202,42,193,101,18,164,17,28,18,243,72,37,12,
+26,171,72,82,158,122,251,105,237,188,93,218,10,34,59,152,
+35,123,104,208,206,137,224,178,53,34,31,50,14,43,170,40,
+162,65,45,5,59,112,161,32,55,101,90,130,17,126,209,228,
+118,231,197,217,166,132,13,80,12,153,24,36,92,10,48,73,
+164,132,0,8,192,18,198,24,213,248,69,101,144,101,227,14,
+182,179,213,46,253,22,46,135,76,14,98,152,24,125,74,100,
+72,159,136,32,31,135,250,60,162,10,109,224,91,56,15,162,
+243,3,200,206,184,14,127,135,1,175,134,12,195,0,134,76,
+41,148,45,32,52,215,40,93,65,121,177,241,55,139,117,250,
+198,222,53,167,166,181,59,183,28,141,15,182,54,99,209,144,
+69,3,26,240,74,39,104,31,147,65,62,33,101,194,19,33,
+20,79,148,136,40,100,108,182,211,28,192,97,158,54,179,216,
+5,137,135,44,198,100,161,84,165,80,252,6,134,194,99,22,
+168,112,157,68,65,132,93,144,233,113,233,170,192,3,190,200,
+182,86,56,26,63,99,44,14,129,52,38,70,235,136,138,4,
+90,64,2,170,96,115,220,6,26,125,70,155,57,102,32,92,
+7,249,71,179,176,211,227,221,168,6,96,176,159,18,74,7,
+211,2,8,230,224,128,48,9,165,17,118,180,198,36,165,11,
+179,234,220,23,120,115,58,228,20,30,194,221,163,48,144,72,
+5,243,209,36,220,35,184,21,160,63,174,161,68,109,253,55,
+61,174,108,211,218,2,173,87,116,83,53,103,67,206,32,29,
+220,167,148,150,50,2,93,228,142,195,181,20,26,136,225,85,
+177,72,47,12,134,229,243,95,95,126,57,123,115,124,117,73,
+174,27,158,145,203,214,84,133,241,5,185,42,91,183,68,91,
+166,207,166,207,8,217,21,214,252,138,154,62,127,102,90,177,
+84,195,20,192,208,140,140,107,111,39,105,186,93,228,88,224,
+101,185,170,43,56,187,25,146,210,125,180,164,105,189,53,75,
+172,240,198,85,139,33,78,84,173,129,218,30,123,185,41,203,
+25,18,52,163,209,168,139,115,234,205,93,183,40,176,0,140,
+248,122,221,2,4,204,159,140,157,124,112,149,224,196,85,173,
+245,115,147,219,166,59,62,110,125,249,136,20,166,219,229,228,
+213,213,57,185,115,197,194,182,13,65,149,63,143,241,218,205,
+186,117,243,32,76,233,102,222,248,123,82,207,247,3,118,231,
+222,185,252,230,125,184,56,31,54,230,181,135,142,232,15,105,
+247,183,195,185,179,194,245,27,119,181,47,166,199,43,95,131,
+69,131,107,236,97,255,242,83,185,39,238,114,89,87,228,242,
+143,215,100,190,174,242,240,16,49,165,107,239,187,3,111,189,
+201,75,251,205,178,47,175,251,224,247,251,253,176,155,213,15,
+78,189,45,237,233,139,126,245,250,140,156,190,248,193,49,128,
+131,90,253,26,244,32,77,183,62,95,194,58,221,202,20,183,
+166,202,33,135,55,112,173,39,245,202,226,222,70,37,189,134,
+175,108,189,252,254,252,203,11,178,192,7,182,133,248,161,125,
+11,111,86,55,46,239,97,103,120,228,116,239,47,199,164,201,
+189,195,131,22,190,41,77,181,88,131,196,150,252,202,219,144,
+248,233,217,114,102,139,2,145,47,199,223,30,60,236,2,125,
+176,189,7,222,143,47,78,206,47,136,183,165,9,253,108,218,
+245,124,190,47,86,15,218,184,42,8,246,131,234,222,217,85,
+237,251,190,175,124,32,5,57,54,219,205,195,168,245,159,151,
+235,133,171,78,166,71,221,206,244,9,140,100,61,90,63,125,
+66,154,122,237,225,24,200,132,47,21,193,100,117,112,210,71,
+248,178,189,33,87,97,122,39,95,190,96,108,3,48,252,19,
+123,51,110,86,171,210,229,91,122,228,233,18,243,216,13,250,
+97,15,249,126,224,93,209,211,123,127,99,207,79,207,72,97,
+111,109,89,175,194,211,140,216,234,214,249,186,10,239,251,121,
+190,186,109,120,191,216,220,42,183,152,126,164,14,186,55,247,
+240,194,114,239,244,170,128,196,123,67,176,196,29,241,152,111,
+101,109,177,173,215,175,49,18,182,156,111,65,4,3,178,209,
+127,244,200,160,152,28,84,189,31,114,235,210,112,19,53,117,
+105,251,211,227,217,43,91,245,76,90,23,38,44,228,89,216,
+42,52,211,118,23,22,9,95,84,70,123,211,57,159,159,172,
+203,162,219,120,9,135,111,172,106,231,115,139,105,189,181,100,
+137,106,239,208,193,178,64,239,240,184,249,8,35,162,243,37,
+230,233,177,94,219,96,198,255,159,96,198,111,130,133,123,201,
+153,234,63,226,205,92,85,207,254,238,246,94,184,42,220,100,
+115,135,59,98,122,252,27,193,103,136,188,93,67,150,93,127,
+246,148,193,200,222,236,173,214,205,205,244,184,88,47,87,228,
+214,217,59,235,71,143,173,70,51,65,38,255,2,179,137,80,
+31,
\ No newline at end of file
diff --git a/uppsrc/Core/srcdoc.tpp/PickTypes$en-us.tpp b/uppsrc/Core/srcdoc.tpp/PickTypes$en-us.tpp
new file mode 100644
index 000000000..416be5960
--- /dev/null
+++ b/uppsrc/Core/srcdoc.tpp/PickTypes$en-us.tpp
@@ -0,0 +1,194 @@
+TITLE("Pick Behaviour Explained")
+COMPRESSED
+120,156,133,88,107,115,219,198,21,253,43,59,146,155,146,14,
+205,98,241,6,233,122,146,42,105,155,153,52,201,196,78,243,
+65,227,9,151,224,146,220,24,4,24,44,32,154,205,36,191,
+189,231,222,5,64,80,82,38,178,245,32,176,247,117,238,123,
+239,125,241,226,133,55,243,110,189,63,249,90,124,161,183,170,
+45,154,247,247,133,159,166,75,147,120,225,82,201,100,249,109,
+182,252,253,247,223,231,89,230,47,137,149,4,43,233,133,129,
+244,165,12,61,47,244,19,25,101,94,22,165,50,245,130,36,
+244,163,196,139,22,71,85,171,195,251,123,149,6,203,151,223,
+199,160,242,103,209,109,32,3,233,201,216,15,113,202,11,60,
+63,148,126,36,211,52,148,73,148,6,89,28,47,114,117,108,
+76,85,190,191,95,19,29,168,2,80,121,73,26,135,18,52,
+97,228,7,73,20,130,54,12,165,196,223,50,74,226,36,89,
+52,166,41,52,104,100,156,44,85,232,47,239,72,203,112,22,
+223,66,59,63,1,105,232,135,113,24,164,126,32,83,223,143,
+179,32,204,66,168,45,253,133,105,52,148,92,131,134,232,136,
+44,130,192,48,10,101,0,60,194,36,10,112,44,193,239,208,
+203,164,15,169,169,23,69,16,168,63,246,32,17,62,68,23,
+67,156,159,68,116,58,13,83,25,36,169,31,250,177,15,5,
+188,4,70,146,244,104,177,209,54,7,93,224,203,101,3,149,
+150,119,159,69,75,9,226,100,150,220,250,94,230,249,113,146,
+65,32,148,133,193,65,150,201,32,133,192,80,70,158,12,22,
+121,181,33,35,253,200,11,150,160,73,225,133,24,140,25,146,
+40,150,208,215,15,82,72,76,100,16,224,103,20,166,201,194,
+106,242,67,83,213,239,239,95,126,54,241,230,222,220,143,162,
+41,233,155,129,60,13,194,32,8,227,44,148,94,0,41,224,
+17,18,92,177,7,79,202,200,79,23,107,101,33,178,9,9,
+216,59,242,60,69,17,96,15,210,40,128,228,24,63,224,81,
+152,23,0,25,63,11,211,32,72,189,69,94,40,107,71,240,
+188,36,19,165,156,73,121,155,16,170,81,224,135,25,65,19,
+248,128,215,143,163,76,2,223,40,14,61,127,81,235,95,90,
+83,235,131,46,1,176,65,96,44,123,231,116,65,8,93,92,
+16,250,51,233,35,12,163,56,246,8,173,8,177,224,7,17,
+224,246,100,26,66,35,252,131,131,155,46,14,57,54,56,46,
+100,48,147,193,109,230,135,1,52,201,194,16,0,128,129,204,
+164,148,94,138,127,176,12,176,112,100,72,168,192,70,56,241,
+142,60,156,201,240,54,65,0,195,79,89,72,226,179,128,224,
+243,129,190,31,123,17,220,224,59,114,159,64,247,95,0,118,
+233,167,244,61,37,250,104,38,145,8,208,80,70,17,204,14,
+0,180,159,194,244,8,200,7,28,220,50,73,23,223,232,147,
+253,66,53,186,139,150,151,119,47,92,152,201,120,38,227,91,
+143,232,163,52,131,251,100,72,240,5,97,152,249,89,16,68,
+126,22,5,177,7,24,173,203,99,34,166,92,226,60,28,152,
+36,51,153,32,173,96,106,20,193,120,38,131,225,137,36,85,
+252,52,139,9,132,142,201,234,85,97,74,210,3,113,177,116,
+161,240,242,238,83,41,19,98,148,34,91,210,52,246,130,12,
+88,0,2,47,66,152,163,18,164,240,51,220,236,35,7,168,
+20,228,31,212,78,175,94,117,121,250,235,79,191,253,229,203,
+111,94,253,240,86,220,91,127,41,190,51,249,7,241,15,189,
+87,15,166,106,107,241,229,199,99,161,32,113,243,201,251,123,
+235,117,175,215,195,107,99,69,173,85,81,156,69,179,215,226,
+80,217,70,172,110,78,218,212,155,213,141,128,179,27,81,109,
+197,15,171,79,87,159,10,85,110,68,85,106,113,218,155,124,
+63,34,220,85,213,70,52,149,104,203,141,174,109,131,99,243,
+78,86,247,235,171,82,188,125,247,245,12,132,186,20,231,170,
+21,136,103,179,43,133,18,15,58,71,50,137,7,85,27,181,
+46,244,140,149,216,104,125,20,121,117,60,147,140,163,174,183,
+85,125,208,155,153,48,115,61,231,3,167,125,85,104,49,57,
+86,13,194,218,176,14,15,186,62,131,230,112,44,244,199,169,
+168,214,63,131,49,145,111,218,99,97,114,56,126,51,23,111,
+205,193,20,170,46,206,35,77,0,131,134,30,219,182,204,169,
+80,194,164,166,173,75,83,238,6,229,70,135,39,205,249,8,
+102,144,55,133,172,210,54,117,11,41,74,20,21,30,14,70,
+16,96,164,101,103,27,104,160,177,105,246,166,228,199,189,168,
+153,216,154,162,16,6,106,150,12,173,106,248,189,198,159,78,
+11,122,167,236,21,17,132,20,45,96,82,59,69,84,131,121,
+244,170,19,235,192,233,160,232,145,216,19,159,74,52,234,131,
+22,8,135,92,59,103,9,246,150,170,55,226,142,61,108,245,
+65,1,209,220,206,197,143,123,3,54,44,155,224,175,69,142,
+218,37,38,206,115,84,78,166,4,239,47,173,182,36,220,57,
+207,48,228,121,161,21,204,222,43,182,12,12,207,76,235,12,
+113,110,117,72,20,170,105,122,198,160,83,157,210,13,108,80,
+182,113,56,154,131,238,49,112,40,95,92,187,171,200,77,176,
+106,77,33,3,103,84,103,189,17,230,128,88,49,112,56,130,
+66,109,193,255,4,243,96,207,187,189,174,193,170,166,24,127,
+224,122,104,133,109,119,59,210,159,216,144,186,20,7,0,30,
+224,28,55,170,25,28,217,97,211,67,117,48,187,125,227,160,
+204,137,31,159,130,62,235,179,56,104,85,90,122,160,68,169,
+79,72,36,84,173,99,85,43,196,102,173,183,80,160,204,53,
+210,234,80,109,204,214,104,132,214,190,58,233,7,194,160,173,
+241,178,233,68,17,14,64,191,70,248,86,229,234,175,77,23,
+165,37,9,200,247,170,52,246,64,118,3,75,23,89,78,254,
+177,174,224,133,195,163,220,251,124,235,48,134,252,182,224,168,
+53,112,188,139,152,19,1,151,227,51,167,239,174,98,107,247,
+100,227,73,33,73,14,234,3,65,3,175,34,9,247,234,72,
+46,42,76,131,154,3,11,96,120,83,163,148,156,41,62,152,
+16,242,119,232,13,20,43,235,182,233,21,67,64,111,183,228,
+49,160,242,0,183,58,151,254,77,216,35,69,161,69,21,42,
+119,206,61,156,41,182,171,46,4,44,101,26,84,91,221,32,
+233,62,0,54,70,1,200,49,144,141,75,5,40,1,200,241,
+228,2,205,162,43,34,46,61,205,67,23,116,19,85,216,170,
+231,201,250,82,33,164,87,211,185,248,6,165,164,11,217,6,
+160,107,123,129,29,200,108,42,2,159,50,120,231,204,234,153,
+87,112,145,162,56,202,247,11,28,233,131,115,40,144,189,114,
+53,68,182,214,197,217,72,48,167,22,151,47,248,5,97,216,
+106,206,82,253,209,0,167,137,230,154,214,177,92,235,162,2,
+80,194,86,7,125,162,80,158,225,79,230,214,203,164,98,130,
+76,80,121,211,50,203,75,74,80,113,49,8,247,139,214,61,
+12,92,217,96,49,2,14,162,171,150,189,100,41,174,166,51,
+118,162,203,104,91,185,54,176,186,65,174,194,38,84,211,213,
+77,87,143,153,177,106,144,188,176,191,172,4,169,73,17,160,
+135,88,131,28,184,202,160,0,163,15,144,254,194,26,232,72,
+17,232,160,235,76,32,5,183,104,84,136,50,171,89,222,65,
+55,251,106,211,135,4,9,0,219,214,130,33,176,41,93,25,
+129,122,87,106,137,9,171,229,130,134,30,76,41,115,27,189,
+36,176,44,7,153,43,225,200,72,83,26,106,31,230,127,122,
+140,100,67,222,22,221,59,71,12,141,185,117,112,13,165,147,
+164,37,39,214,4,9,222,140,219,1,172,162,104,134,90,248,
+175,231,59,215,177,184,198,193,162,255,114,79,88,45,22,119,
+92,36,185,236,139,45,74,5,37,212,227,204,45,207,156,134,
+166,71,237,136,92,221,154,188,171,166,212,144,92,41,42,181,
+75,224,174,85,194,246,161,131,2,15,56,179,238,192,102,212,
+92,94,114,170,113,192,187,172,114,139,202,37,215,70,157,224,
+29,167,5,121,225,76,21,131,207,155,18,177,181,105,115,78,
+207,138,119,12,96,117,105,220,204,31,108,86,175,88,79,114,
+221,14,62,237,15,24,205,85,146,157,239,84,153,156,92,190,
+143,159,57,101,250,140,235,89,59,105,93,124,14,45,156,198,
+15,59,174,14,23,179,93,61,24,129,114,113,22,92,113,35,
+222,77,248,179,120,183,250,132,192,70,99,35,183,60,166,113,
+252,28,193,234,19,241,250,245,234,239,226,66,136,18,242,57,
+148,255,161,43,223,101,67,19,23,21,135,90,247,102,116,213,
+141,140,121,10,216,234,102,92,131,248,199,234,6,186,184,25,
+76,33,17,16,107,8,132,199,234,115,223,236,51,190,172,26,
+151,29,164,191,213,245,3,161,92,210,100,135,18,102,184,207,
+181,198,238,29,251,17,147,199,211,26,181,44,52,187,134,24,
+34,206,215,84,23,168,37,85,200,91,232,189,16,95,109,93,
+244,81,11,84,200,210,195,90,215,87,227,143,18,131,201,253,
+232,163,192,12,117,171,75,178,89,215,112,175,30,178,201,248,
+136,146,2,187,135,74,201,92,80,219,107,24,138,151,176,35,
+95,94,53,219,71,67,76,199,67,161,215,94,154,130,157,113,
+165,154,244,103,167,79,161,228,100,28,198,155,193,225,84,253,
+175,170,246,188,183,255,68,24,1,91,67,83,75,71,243,36,
+19,134,68,226,62,121,166,145,155,13,66,219,56,233,162,152,
+13,249,193,98,128,201,250,220,91,208,53,223,194,124,208,35,
+15,37,75,193,11,161,248,207,249,91,7,219,66,124,1,113,
+119,144,246,45,203,127,221,191,121,115,237,216,9,87,75,26,
+73,10,170,105,174,218,186,217,138,195,185,183,216,37,192,197,
+42,82,220,52,143,70,243,113,252,136,175,117,179,250,43,181,
+187,51,29,172,104,50,181,76,143,94,166,232,247,226,57,3,
+222,82,105,253,170,220,86,79,45,24,94,189,17,171,95,59,
+162,99,187,198,172,187,232,62,209,215,112,106,50,197,177,213,
+111,207,190,114,57,58,124,70,238,90,78,115,182,101,58,34,
+161,175,133,171,247,171,159,74,228,156,157,216,249,248,227,236,
+89,146,153,56,86,199,182,112,181,6,20,163,79,127,68,144,
+171,35,226,179,160,211,253,159,221,209,177,25,127,104,182,107,
+34,192,168,70,132,188,185,210,120,249,244,216,166,2,3,253,
+102,172,229,51,167,122,102,189,62,253,145,213,111,203,235,32,
+122,71,35,195,176,17,157,16,166,90,140,210,251,178,221,88,
+244,174,107,175,95,252,253,79,83,32,149,191,27,52,122,206,
+73,6,144,176,234,168,51,31,87,63,93,212,239,241,28,2,
+227,202,223,2,168,130,212,155,142,141,68,4,79,200,229,70,
+32,204,175,92,52,255,151,110,238,170,182,108,38,83,112,124,
+181,122,101,150,143,253,101,182,215,94,93,221,155,213,123,241,
+230,137,90,215,10,245,95,215,33,52,255,94,211,250,49,49,
+87,234,93,206,142,53,251,147,163,189,167,254,248,220,85,66,
+116,43,229,200,177,215,126,237,186,15,190,79,213,168,141,186,
+174,197,179,251,120,218,94,244,59,220,90,239,76,73,251,242,
+140,182,209,103,23,119,170,59,110,130,40,117,174,173,165,109,
+8,212,85,77,11,40,245,44,106,79,234,160,118,186,219,16,
+75,203,221,71,213,187,150,23,205,185,91,98,120,145,115,27,
+41,135,15,151,199,177,156,126,193,134,179,167,152,67,171,35,
+215,49,20,185,225,122,195,17,242,64,218,53,43,235,238,49,
+8,27,60,222,214,213,225,122,223,126,110,106,31,207,122,232,
+40,110,244,190,26,125,169,11,243,128,78,61,135,198,1,94,
+55,169,202,91,181,213,124,101,66,86,239,209,0,166,243,199,
+126,56,33,189,128,23,117,87,235,6,92,154,244,121,215,90,
+116,3,57,44,165,171,25,154,79,137,123,77,123,21,79,22,
+125,123,179,110,92,63,86,216,215,104,227,28,221,247,148,174,
+77,242,181,6,166,19,202,226,178,95,67,244,199,35,79,192,
+52,251,92,250,1,169,250,115,11,17,238,194,162,236,182,219,
+203,165,77,231,196,147,65,95,163,97,161,31,145,43,231,144,
+154,167,84,218,5,46,195,36,243,59,185,249,243,120,212,165,
+189,212,20,72,238,230,7,55,22,116,187,251,182,234,180,61,
+16,41,93,105,242,216,225,118,131,106,235,90,107,191,73,116,
+123,249,101,126,160,72,112,11,21,239,159,163,75,40,104,120,
+152,185,33,236,213,229,82,135,158,34,68,1,179,181,238,3,
+12,236,163,194,206,46,138,184,5,154,180,231,250,215,205,161,
+67,192,184,21,70,116,43,50,39,136,123,244,244,138,236,72,
+3,142,201,181,243,57,165,75,197,247,63,188,144,227,183,161,
+152,192,64,129,106,133,224,90,235,92,181,87,251,204,8,50,
+7,0,22,150,157,158,61,186,10,178,164,75,255,39,175,20,
+76,76,147,203,1,139,208,134,187,125,151,83,52,66,205,24,
+186,193,57,253,185,167,199,232,109,107,221,36,202,247,34,110,
+112,36,31,211,108,224,110,107,16,17,155,182,238,82,202,212,
+116,59,100,250,138,71,59,54,22,158,185,248,183,187,20,225,
+205,39,215,53,205,210,163,157,167,159,186,200,248,241,156,57,
+236,193,64,183,229,181,166,187,30,26,41,211,187,197,114,253,
+226,85,99,180,139,246,147,88,239,192,31,193,170,159,75,94,
+191,25,221,218,184,152,59,213,238,74,228,89,21,158,44,44,
+131,64,69,151,43,228,76,228,106,221,88,119,129,229,46,120,
+92,117,67,97,68,201,26,86,127,219,243,115,27,218,51,147,
+229,252,253,255,1,236,5,202,98,
\ No newline at end of file
diff --git a/uppsrc/Core/srcdoc.tpp/Translating$en-us.tpp b/uppsrc/Core/srcdoc.tpp/Translating$en-us.tpp
new file mode 100644
index 000000000..e47650116
--- /dev/null
+++ b/uppsrc/Core/srcdoc.tpp/Translating$en-us.tpp
@@ -0,0 +1,36 @@
+TITLE("Translating U++")
+COMPRESSED
+120,156,133,122,249,83,98,121,150,239,191,194,171,158,55,209,75,117,77,106,154,75,101,197,139,152,126,221,61,51,29,221,111,250,197,76,87,116,188,215,211,49,105,101,210,85,78,103,106,134,154,93,93,111,233,16,100,19,144,69,54,5,101,17,149,77,64,65,68,224,178,200,34,130,11,178,203,46,8,168,160,108,42,200,254,46,153,89,213,85,53,51,111,248,225,114,249,126,207,249,156,245,123,184,55,206,249,77,63,228,47,254,226,222,251,247,190,115,239,63,248,60,249,9,244,119,131,175,95,140,255,246,55,67,3,3,143,63,26,236,127,240,209,239,127,254,203,15,63,250,254,95,127,247,225,192,247,122,40,125,32,202,253,71,125,247,31,63,184,223,55,208,255,16,188,244,221,239,235,127,208,127,127,160,239,113,255,135,3,143,239,223,127,124,239,201,179,23,131,99,99,191,253,205,139,254,199,143,63,234,49,245,191,223,255,157,254,71,15,250,251,30,13,60,30,120,220,119,255,209,227,126,144,183,255,222,189,254,123,143,250,31,244,13,220,127,220,255,224,201,115,232,216,179,223,254,
+102,240,241,253,143,190,255,15,15,65,166,251,61,73,32,248,189,190,135,253,3,143,6,250,239,221,191,215,63,0,138,234,123,252,120,160,239,209,131,199,247,63,124,248,240,201,179,193,87,227,67,35,195,239,100,13,245,245,245,247,125,244,73,223,163,143,64,157,255,244,167,63,125,208,55,112,239,173,6,3,32,88,223,189,1,80,213,62,112,237,222,64,255,163,190,7,31,222,251,240,193,227,190,199,247,238,131,224,15,30,221,123,240,228,213,224,232,224,203,127,223,244,7,255,161,233,143,238,61,25,26,135,130,16,223,255,65,95,223,35,144,229,225,251,15,191,211,55,240,8,52,244,241,253,129,7,143,31,221,3,133,247,247,247,223,191,223,223,119,191,255,195,15,251,31,60,124,240,232,201,103,208,193,231,208,81,208,132,129,190,135,111,148,125,244,254,163,239,60,120,240,96,0,164,31,24,120,240,232,241,64,255,125,48,54,3,247,7,64,87,12,244,125,248,96,224,195,7,253,79,134,161,99,227,208,231,79,127,248,214,109,111,205,255,74,241,158,222,61,164,199,239,63,254,206,195,
+129,135,31,246,129,222,31,248,240,209,192,189,15,31,246,61,186,223,115,94,31,232,246,135,247,7,250,63,124,240,21,210,187,168,253,239,127,254,191,255,249,167,127,255,195,143,255,17,242,155,177,123,31,253,195,15,250,30,220,131,252,221,47,127,253,171,95,66,198,94,127,242,114,104,28,50,62,58,56,60,246,98,176,231,247,49,200,248,8,100,252,51,40,228,227,23,227,67,47,7,199,161,79,127,240,244,7,144,87,163,35,255,2,125,54,254,151,191,237,1,64,222,125,253,87,232,239,70,70,161,144,177,241,193,209,241,161,225,79,223,112,125,13,9,242,249,200,232,239,223,135,124,10,29,239,65,254,126,120,228,115,200,175,62,131,254,236,39,63,133,12,14,63,135,188,26,252,2,50,56,62,14,29,126,67,250,78,230,179,145,225,113,232,31,199,33,35,191,123,11,6,29,125,57,52,60,242,98,228,211,47,32,175,199,160,207,63,128,64,126,53,250,69,143,24,252,5,25,124,49,10,186,249,11,8,104,235,224,39,47,134,198,62,131,62,7,1,94,190,122,13,178,125,131,117,104,
+24,242,197,200,235,81,200,139,193,225,79,95,15,126,10,5,23,64,247,12,62,239,137,25,26,254,67,79,5,80,251,97,232,231,111,184,198,62,248,166,149,125,31,64,254,225,245,240,27,125,64,187,64,97,189,219,161,231,208,55,86,188,24,1,97,122,91,175,95,189,26,27,125,6,249,209,139,23,127,51,50,250,179,190,199,195,31,128,198,14,141,129,102,62,251,125,79,36,168,240,24,168,241,11,200,8,72,61,250,37,249,187,93,208,231,159,13,142,131,26,128,22,124,229,192,225,79,191,165,200,143,63,27,25,1,205,254,239,111,67,1,249,43,200,79,255,248,106,100,116,28,50,250,26,52,224,229,55,93,255,187,161,23,80,200,119,159,126,255,131,241,209,239,61,249,6,204,127,129,252,245,95,131,113,253,20,250,164,191,239,222,195,191,124,244,232,193,196,164,27,214,154,248,234,115,135,158,191,90,152,186,161,218,78,227,38,93,122,121,173,169,190,137,208,98,108,25,87,186,184,136,177,207,0,36,58,126,113,126,6,142,192,192,73,176,210,57,157,78,46,209,211,196,91,125,224,
+44,126,173,175,94,200,58,169,133,219,246,154,172,41,149,248,130,92,18,201,76,150,89,16,81,53,108,166,114,144,88,104,50,17,115,83,215,215,109,73,222,227,245,122,155,222,57,201,254,173,188,118,210,180,28,28,28,8,196,23,218,78,204,175,143,33,235,161,75,202,214,57,176,54,83,71,78,168,155,240,100,182,128,68,34,85,209,197,74,184,160,65,50,184,43,73,121,50,127,19,133,211,91,205,195,3,233,209,204,46,18,107,160,171,184,213,13,31,63,149,82,97,166,83,120,194,105,4,153,18,57,167,43,76,105,150,239,52,204,195,139,117,234,121,163,64,161,195,39,200,149,192,193,149,231,236,98,75,128,59,40,17,224,170,118,73,123,232,194,72,245,150,184,170,155,168,184,16,186,184,138,24,105,31,207,215,201,154,202,142,242,58,237,154,114,115,8,20,118,203,204,219,152,220,95,180,174,104,204,116,78,189,72,53,90,13,83,66,122,249,210,79,182,30,69,146,166,232,132,149,13,184,181,136,192,53,249,236,178,237,225,108,120,112,6,98,88,122,76,95,191,98,166,211,249,0,
+177,195,153,72,37,44,181,41,218,22,252,8,49,61,133,129,111,77,11,119,58,100,195,114,214,67,102,48,152,187,19,214,100,36,103,150,76,138,241,214,203,130,7,185,149,89,136,82,243,225,146,75,79,59,144,10,97,167,244,24,118,239,114,130,188,117,123,64,61,50,182,16,222,224,93,118,114,30,161,219,98,52,45,106,38,12,203,68,7,233,187,252,141,157,114,137,158,95,115,112,239,52,100,43,106,109,58,72,37,241,54,14,132,94,223,141,208,121,140,178,112,173,65,73,50,175,179,80,34,101,115,160,86,150,132,53,221,179,187,96,230,170,20,48,206,40,180,33,51,118,135,87,193,138,202,218,189,185,6,108,105,2,151,215,92,156,47,71,125,203,254,250,249,14,80,208,228,36,37,179,200,16,216,187,69,151,69,66,107,23,77,114,241,118,45,120,235,38,98,27,200,232,235,59,102,38,106,77,85,213,206,34,38,211,158,208,132,130,198,59,188,128,69,151,87,86,197,203,171,66,88,221,156,18,107,52,180,244,210,204,188,110,17,109,48,202,233,150,88,101,178,220,166,166,80,117,
+42,53,113,115,230,128,155,26,43,6,228,117,98,35,146,156,202,51,173,187,236,100,25,69,230,7,108,164,14,140,111,43,237,86,137,46,161,241,110,37,182,236,77,228,207,205,243,25,254,68,130,105,144,99,154,56,231,178,97,242,194,100,146,87,143,23,93,25,138,68,114,67,160,158,97,54,86,5,34,18,44,174,117,209,73,212,57,54,134,132,224,150,217,155,113,28,186,184,184,117,26,63,154,204,50,77,57,9,203,208,10,53,175,194,185,91,250,150,31,37,155,205,200,207,132,1,64,36,189,235,160,82,126,159,159,219,177,81,185,5,135,217,130,176,81,114,169,157,138,255,112,222,191,117,158,196,209,177,169,59,25,163,190,78,216,50,24,144,186,51,188,218,221,41,116,29,34,156,156,228,99,95,200,214,170,177,131,238,165,96,147,172,92,56,208,146,220,151,56,19,249,192,74,110,30,55,207,74,6,203,234,194,78,94,183,67,4,115,44,38,48,74,187,141,213,186,164,6,176,12,157,133,130,254,160,166,85,7,243,137,150,170,92,117,229,85,242,85,143,28,152,225,214,99,64,227,
+42,63,227,95,65,58,111,97,46,97,192,24,162,168,85,235,165,64,12,205,23,24,77,81,211,98,107,193,46,193,92,170,245,4,111,211,93,217,20,215,142,246,215,67,21,107,110,45,178,121,212,177,226,138,102,17,166,189,190,141,221,78,151,52,161,82,7,163,161,200,243,148,174,158,176,48,59,89,9,159,168,41,145,90,219,189,25,108,74,178,197,68,177,85,187,241,163,136,234,92,124,181,237,104,86,27,7,172,216,212,137,190,170,82,49,233,198,85,223,37,46,120,149,141,11,163,107,174,114,171,123,19,190,179,99,207,8,123,77,151,197,200,21,20,107,220,86,59,84,117,82,14,188,173,172,238,106,203,17,70,43,133,126,119,58,238,63,179,136,57,169,107,227,66,139,196,105,102,138,199,152,13,134,199,98,163,152,118,34,7,155,25,110,115,239,236,144,200,50,116,149,73,228,164,84,91,219,60,79,92,118,183,175,237,136,219,61,87,57,119,128,243,203,109,10,113,208,46,9,186,150,171,222,182,223,21,144,207,198,163,202,116,50,85,63,157,168,25,27,56,55,251,240,54,189,93,
+215,41,86,157,82,203,246,137,35,181,39,205,85,215,228,166,4,65,41,232,32,236,18,98,247,232,34,195,67,198,195,84,245,34,39,211,150,49,224,8,143,112,221,201,74,156,230,240,83,109,167,68,45,191,52,182,110,104,59,198,238,212,78,171,120,168,183,121,54,41,59,146,68,120,41,202,17,241,239,146,244,148,223,27,185,221,19,4,237,46,184,250,134,192,111,230,82,139,110,9,227,64,56,215,237,234,216,14,254,148,153,72,223,137,80,209,215,245,163,206,25,227,34,205,93,91,158,93,137,170,209,150,233,214,197,164,164,50,95,4,236,109,151,218,122,16,141,20,245,251,72,114,94,142,130,103,74,54,6,190,157,192,203,50,148,128,111,122,217,37,114,3,216,242,221,50,153,153,143,251,146,149,122,25,142,68,31,91,97,190,106,36,153,241,179,82,204,120,4,237,43,109,23,147,173,179,66,167,108,112,5,86,153,89,148,33,40,173,207,46,95,4,165,45,110,35,57,57,187,188,94,117,122,221,108,6,21,77,189,104,17,235,28,92,93,130,44,51,167,138,153,3,143,147,146,151,
+110,169,167,34,212,110,89,90,47,174,161,132,22,64,77,145,235,61,87,55,133,195,163,147,102,88,64,237,122,234,230,246,81,5,163,235,82,89,45,151,52,96,70,44,26,22,253,44,109,74,110,49,48,144,83,206,52,13,31,92,57,132,43,107,138,117,78,151,239,190,70,35,114,89,117,234,224,198,230,220,19,54,50,196,112,155,211,48,110,22,182,239,152,199,115,205,189,212,78,177,222,66,34,108,245,38,238,106,167,82,95,105,173,118,5,87,44,184,173,86,118,0,140,51,131,130,108,206,222,1,7,183,251,117,88,1,100,67,163,240,13,43,78,179,22,202,10,187,199,243,139,42,38,220,128,163,25,9,37,191,197,204,228,85,220,169,77,103,62,30,147,214,165,222,112,69,123,165,105,168,188,169,236,214,188,38,82,104,19,53,58,89,227,144,175,157,93,87,225,10,210,133,133,90,49,110,47,242,221,78,163,135,39,5,230,101,6,83,122,158,147,114,205,98,225,126,118,222,27,175,207,202,142,12,228,104,216,112,198,7,8,138,252,170,123,78,224,234,234,144,41,119,9,91,222,133,
+109,29,132,167,78,229,192,10,237,214,184,214,138,120,111,110,248,77,204,154,149,110,38,6,61,218,200,53,122,1,95,141,106,108,172,25,199,106,125,215,22,86,57,204,139,152,18,227,228,180,189,193,156,98,186,128,120,29,145,141,104,1,205,106,183,73,43,21,232,242,48,176,91,79,41,90,202,171,35,43,193,127,12,52,131,109,64,151,219,57,45,172,182,171,251,161,219,232,122,147,173,243,47,70,129,133,115,187,128,148,81,110,183,29,180,244,156,206,160,176,94,215,50,97,17,94,14,204,129,37,228,246,148,181,219,96,229,27,108,123,83,34,206,23,11,238,110,2,88,91,19,241,213,57,79,104,58,128,55,116,209,156,125,238,116,23,192,218,201,242,110,27,86,49,236,169,141,184,212,94,151,113,163,81,23,116,24,160,155,54,50,206,233,231,217,76,74,222,90,107,198,118,72,36,157,33,41,162,95,163,121,33,116,208,166,185,82,243,252,197,172,187,213,116,171,83,205,134,241,204,99,54,116,84,58,113,23,125,118,216,142,147,73,38,222,230,197,54,93,113,78,201,156,222,112,188,
+70,170,36,164,21,251,174,43,64,99,207,99,4,171,79,26,53,127,171,83,206,21,156,203,53,201,10,35,198,143,150,4,138,122,182,154,217,23,106,235,53,254,30,103,78,95,36,19,147,86,171,131,33,157,148,233,241,21,139,97,195,173,102,199,17,114,41,16,58,9,215,217,5,141,198,177,204,137,4,86,125,40,117,25,9,204,233,203,68,105,108,245,132,232,10,173,167,109,4,23,82,115,49,79,152,157,82,91,11,176,83,120,233,0,223,213,70,102,238,60,187,138,53,229,18,145,121,25,91,106,104,129,197,121,74,149,85,89,81,174,21,58,210,180,207,187,154,54,164,186,173,249,41,120,42,124,176,138,177,162,11,1,117,245,110,177,162,118,231,18,107,178,64,49,180,88,191,82,205,55,174,205,254,157,217,152,91,40,39,232,236,122,103,105,35,215,193,248,247,189,152,70,157,239,60,155,150,31,119,143,14,172,117,17,160,178,214,117,78,135,112,147,232,36,138,179,139,98,229,84,165,28,200,44,0,245,57,98,130,47,32,217,23,235,108,254,241,2,15,125,5,51,108,10,72,121,
+99,178,110,151,105,14,8,34,24,130,154,60,100,114,180,182,84,219,97,117,103,177,23,124,99,154,40,20,180,182,24,25,133,114,43,36,211,28,153,23,101,235,171,147,206,50,198,223,10,76,52,10,199,87,202,154,136,205,41,243,26,101,195,174,44,78,3,118,85,162,64,174,225,75,81,167,163,249,156,119,105,149,45,13,149,88,218,233,44,221,22,141,200,0,167,190,101,74,119,201,25,137,192,63,147,231,172,46,161,157,221,84,209,90,191,11,236,81,131,228,68,80,181,79,185,148,31,227,92,217,118,136,214,44,221,166,231,156,134,202,49,199,212,202,94,34,219,171,196,202,217,230,134,44,0,172,95,123,207,121,139,107,130,5,9,114,114,93,184,230,174,40,103,186,71,187,51,238,195,186,220,105,74,103,203,129,93,94,5,149,225,218,45,136,50,61,30,41,243,140,126,43,241,86,228,194,120,100,44,126,40,188,149,184,245,192,37,246,98,158,19,16,24,120,212,80,94,159,146,199,74,42,73,54,94,178,93,38,55,104,174,206,198,5,140,115,72,153,230,120,74,222,220,217,170,211,
+82,114,81,207,118,93,139,119,9,7,35,211,16,148,138,101,88,158,101,15,121,29,192,222,60,160,114,35,2,202,178,37,62,207,61,70,219,252,193,185,60,45,28,63,74,87,246,219,242,237,164,56,183,178,102,90,14,239,166,53,148,46,50,120,146,21,76,88,236,138,86,41,174,208,48,209,13,65,120,163,204,55,46,148,97,214,100,118,243,96,69,69,200,87,187,152,153,235,139,101,70,137,234,85,32,216,120,183,192,172,190,212,41,141,9,27,182,30,214,145,47,142,118,119,17,138,61,110,1,187,29,61,69,78,156,172,116,162,130,137,182,148,222,200,94,221,238,177,253,115,171,237,176,166,48,151,189,85,231,218,251,183,90,193,156,79,190,239,94,109,91,141,140,210,132,191,161,49,118,188,7,91,101,51,149,131,93,138,169,103,133,196,106,202,155,23,100,143,105,68,79,128,18,210,23,117,120,74,176,170,108,230,235,237,66,2,115,28,101,25,28,86,224,220,162,226,94,78,230,96,39,51,54,98,109,219,186,125,210,116,80,172,169,146,122,158,169,173,76,110,233,136,187,183,69,185,
+81,126,146,69,163,183,224,166,188,34,232,96,30,93,160,236,55,68,83,35,216,204,159,179,237,197,46,103,102,233,112,86,179,8,204,28,77,226,216,164,26,18,214,158,34,23,52,126,189,102,89,139,169,175,39,28,217,141,4,149,77,234,217,169,52,52,20,38,94,222,198,160,20,120,29,103,85,140,161,232,43,18,93,113,161,181,76,149,46,165,102,162,57,10,38,133,187,77,164,175,17,93,76,49,73,39,39,128,43,217,190,110,121,179,186,221,110,208,40,219,13,25,190,99,177,214,172,23,98,235,186,192,39,183,138,130,135,68,207,42,91,24,91,143,159,51,186,234,165,154,160,96,247,29,106,28,154,171,243,41,164,189,120,108,172,146,76,238,78,21,231,238,204,212,8,81,210,233,220,113,208,69,166,149,233,42,111,134,92,95,222,194,39,229,76,39,76,81,162,95,113,243,170,228,229,213,2,144,97,50,145,171,232,115,5,219,135,234,186,241,12,15,202,101,112,162,118,137,89,134,217,55,31,119,208,154,14,199,245,254,10,175,214,89,88,33,30,201,149,173,165,117,241,213,194,178,
+66,186,126,190,66,176,78,81,49,229,196,100,157,80,209,54,232,105,65,209,172,78,226,36,73,147,229,150,127,86,225,117,44,44,188,151,36,200,16,19,20,127,250,60,143,225,159,132,38,76,243,102,194,36,176,126,151,46,213,83,103,107,167,106,121,108,62,100,108,237,150,109,102,106,202,79,165,46,38,177,138,100,57,115,101,62,21,211,40,254,61,74,49,184,186,192,143,1,84,108,246,118,205,154,207,242,90,86,242,173,165,110,65,79,86,99,148,172,155,77,66,53,142,12,149,121,183,165,195,64,238,215,181,214,69,101,6,93,220,52,29,105,15,253,168,131,139,84,112,5,143,171,92,94,240,15,14,3,243,161,211,253,58,199,81,211,35,202,156,37,91,9,237,21,179,117,23,149,185,27,178,255,122,39,22,74,220,73,114,91,232,28,157,107,136,82,24,33,229,210,129,162,234,152,188,45,159,174,208,112,59,66,58,222,195,63,212,249,53,103,179,21,87,99,26,43,34,171,40,0,138,214,198,54,93,49,101,122,113,94,45,159,60,238,16,157,222,41,189,180,50,229,107,52,102,8,
+22,224,50,38,33,222,21,4,64,2,184,109,155,169,181,11,124,4,134,117,233,102,102,26,166,227,72,66,84,60,56,110,102,163,133,165,164,70,232,45,74,102,215,181,39,137,234,44,60,84,163,238,239,105,117,165,106,204,166,140,238,48,92,128,254,50,203,189,202,184,136,114,206,102,123,117,53,183,82,177,163,23,232,250,10,127,113,42,57,41,216,185,54,2,235,78,245,106,107,141,136,116,94,159,237,69,66,38,151,189,17,219,102,201,176,54,198,190,59,183,220,174,25,114,149,9,202,37,98,106,123,233,76,122,135,118,109,108,48,24,57,54,115,189,144,168,197,174,182,154,102,87,7,3,24,234,65,43,167,200,44,113,174,11,83,150,234,254,252,244,166,186,34,112,80,10,108,160,116,66,164,112,102,203,51,27,157,146,103,171,164,76,175,39,155,197,108,117,194,184,238,12,134,77,1,150,141,124,100,64,137,92,173,132,180,118,76,74,26,214,189,139,134,12,248,132,37,113,221,216,142,20,222,57,0,190,104,173,157,161,118,201,220,147,107,145,171,66,206,22,239,152,213,181,224,229,
+74,106,66,3,11,53,11,43,23,202,219,104,124,169,149,195,27,75,176,204,50,78,140,218,212,202,110,245,7,210,36,115,51,63,125,35,94,215,147,132,165,132,237,88,102,69,184,228,168,38,175,98,72,136,58,59,88,137,132,158,191,45,235,233,9,249,57,61,167,201,196,16,215,24,235,109,101,125,129,126,28,100,38,173,155,149,107,113,120,87,210,166,238,220,236,104,87,113,36,145,17,185,150,232,242,197,12,86,156,74,218,228,151,142,246,225,196,102,66,4,190,210,136,86,211,211,211,179,141,188,247,180,85,221,171,99,56,77,146,133,52,151,245,115,55,207,72,232,236,252,198,222,77,214,89,57,97,145,252,246,182,111,143,174,246,54,184,88,81,73,91,95,76,122,212,200,76,160,129,49,73,162,24,153,168,117,3,95,52,1,69,61,37,49,195,172,193,76,21,156,1,131,177,113,167,113,152,41,203,101,110,214,132,18,168,163,149,153,224,37,159,109,216,104,177,45,215,164,45,241,206,149,19,9,231,110,99,213,25,238,140,186,193,80,95,242,39,124,236,109,51,204,199,158,221,54,
+99,87,90,71,62,46,248,115,162,34,45,194,210,132,222,14,226,164,119,5,119,228,164,93,156,16,128,35,194,250,222,149,10,147,75,90,172,4,187,204,107,119,188,168,19,139,90,202,101,110,108,229,226,43,173,115,107,218,102,18,21,115,182,107,100,28,91,196,82,29,181,250,28,156,200,217,220,204,29,33,58,84,163,94,233,163,5,85,44,108,46,220,80,74,100,108,209,69,218,224,62,158,156,223,43,86,15,247,174,246,15,220,130,173,116,13,134,86,104,137,190,108,245,74,23,9,137,214,181,57,246,108,38,38,99,91,74,48,103,4,45,159,168,18,125,108,248,70,182,38,45,132,151,253,42,207,74,216,179,102,74,210,68,245,110,165,88,181,197,87,143,177,252,210,102,244,70,108,183,82,217,197,173,138,33,100,1,214,156,186,24,234,224,100,146,166,38,198,47,225,108,33,128,216,186,51,183,78,3,62,22,86,118,131,55,43,61,116,32,145,52,105,35,89,109,196,60,225,222,1,226,187,97,10,65,45,201,194,220,241,43,197,42,130,35,4,218,165,148,191,102,202,240,76,233,169,
+13,54,112,45,99,113,231,78,68,161,204,206,185,133,127,93,215,227,207,93,55,209,43,24,19,212,114,210,216,222,46,207,119,47,67,220,141,169,248,37,187,226,108,122,13,77,20,33,176,126,185,222,177,47,40,113,107,120,75,229,106,234,108,39,205,212,250,108,46,138,115,26,143,58,183,108,0,148,210,82,200,181,203,39,80,25,109,197,84,53,224,91,131,9,25,147,103,40,236,100,112,115,250,60,233,34,23,253,246,105,93,196,119,120,184,217,76,114,17,242,42,113,165,229,38,153,2,113,159,65,182,43,238,174,26,89,4,54,235,230,110,78,153,141,53,8,24,228,14,34,139,224,122,150,145,69,143,105,57,163,136,229,138,5,198,182,164,140,106,144,229,132,10,1,78,88,82,148,207,12,211,9,235,137,173,176,125,32,181,165,119,10,55,241,186,155,84,226,106,76,152,25,155,137,227,40,216,43,222,74,193,66,4,42,217,8,47,21,48,232,189,215,55,71,145,137,16,77,127,116,67,77,226,103,248,165,173,196,110,218,115,78,209,106,25,181,249,104,93,189,119,114,107,233,102,106,
+34,138,142,168,15,104,149,124,119,189,51,105,96,232,208,18,39,206,80,84,4,67,115,212,218,38,156,239,93,63,62,17,101,249,106,42,67,37,194,89,186,22,45,15,8,209,46,112,203,145,76,41,90,111,30,44,100,170,200,61,93,204,56,29,203,177,43,51,237,154,201,65,39,98,78,108,140,194,54,181,86,137,198,245,149,147,2,10,56,188,20,218,59,91,231,53,170,122,95,167,15,175,164,107,235,101,10,63,169,84,236,108,220,76,80,4,243,193,195,76,58,227,1,252,40,23,141,204,112,76,81,51,153,240,165,110,107,181,150,170,157,36,22,197,91,145,5,127,124,81,191,173,119,149,69,167,176,217,88,208,160,217,115,137,59,151,36,19,243,250,152,53,85,62,158,90,214,19,221,153,57,130,230,46,22,71,93,247,194,41,230,56,177,206,230,122,19,129,144,86,10,196,74,86,183,103,174,207,240,68,222,174,88,111,189,217,140,58,47,20,19,10,240,189,80,181,32,180,174,41,102,42,120,180,82,167,221,159,228,3,145,12,220,148,177,108,215,229,213,67,226,10,0,38,137,219,
+239,11,83,23,53,232,38,163,77,151,136,218,85,124,43,185,166,147,181,216,94,98,227,20,153,206,162,204,161,57,218,185,139,58,99,190,218,94,244,26,128,83,67,117,222,2,91,69,171,83,56,140,147,59,167,32,101,234,160,147,24,85,17,63,29,227,107,200,2,29,122,142,175,151,120,81,209,238,190,71,151,168,192,200,128,251,88,143,112,121,234,221,227,192,188,189,233,147,36,148,149,212,52,235,136,125,193,174,167,179,203,248,84,229,164,56,137,92,217,59,154,177,163,113,248,137,121,35,143,173,175,205,27,153,55,5,63,183,96,43,235,240,176,91,156,210,121,202,221,198,185,99,150,120,189,201,51,101,28,177,11,79,167,102,32,102,108,132,178,101,231,140,238,60,244,243,235,59,149,228,181,135,99,199,238,218,146,164,73,96,45,1,223,73,68,89,126,125,247,82,231,171,159,80,107,58,60,123,179,121,22,143,87,91,242,84,28,173,103,109,108,227,244,49,62,151,195,168,5,246,155,113,89,209,161,9,234,233,13,67,123,183,78,32,160,0,164,119,17,187,31,164,159,156,76,77,
+215,215,215,226,197,111,156,243,203,42,113,59,86,227,73,34,128,4,198,97,16,3,39,32,26,239,152,86,107,240,222,22,156,109,233,155,130,147,159,56,85,81,38,247,235,136,248,118,116,162,75,38,208,60,118,210,17,140,102,39,157,146,224,34,35,201,184,71,229,99,82,197,93,163,252,130,200,221,37,145,183,156,234,102,11,43,132,223,73,215,15,133,156,210,89,165,136,78,201,213,179,107,187,200,99,31,123,18,101,154,22,35,178,222,195,101,75,54,212,117,137,82,5,10,50,166,183,227,180,96,254,95,212,53,177,155,122,195,114,102,188,117,204,53,38,231,98,30,244,97,40,176,166,230,111,87,102,215,16,149,137,68,73,46,222,207,168,86,22,55,37,43,112,167,162,21,211,31,218,20,165,152,70,193,242,134,60,167,115,158,211,205,157,169,11,43,249,226,174,204,203,148,241,74,175,83,134,78,105,128,98,13,185,129,194,7,121,166,187,184,48,112,38,22,111,102,18,169,205,76,92,145,185,54,204,156,209,89,74,236,129,96,10,183,47,56,231,223,34,35,43,55,173,83,119,244,
+236,154,202,9,139,174,1,32,107,156,116,158,98,144,36,133,219,23,187,179,81,131,44,199,94,103,123,183,28,213,6,52,228,157,218,77,107,219,235,238,208,242,59,218,42,120,222,90,43,158,233,185,51,9,58,69,222,247,153,216,22,33,98,171,238,170,201,17,222,122,167,43,174,157,208,208,37,173,117,246,44,160,198,222,138,187,206,38,93,185,169,227,2,86,163,6,64,175,240,43,179,91,107,119,179,158,107,109,114,222,224,114,37,92,137,181,246,58,111,214,201,54,83,18,206,211,134,213,192,201,44,132,34,14,26,97,73,176,53,185,106,187,17,181,35,254,230,116,181,201,53,101,42,235,8,243,214,12,223,53,179,178,23,138,116,188,98,126,210,202,74,27,247,45,110,155,139,117,151,177,29,214,194,103,23,181,205,147,125,247,202,81,29,207,155,223,21,87,2,12,252,154,225,44,65,163,72,110,2,110,54,42,97,102,202,210,7,101,117,21,171,7,95,197,207,29,62,58,33,47,19,21,137,231,114,110,101,214,12,108,204,107,19,183,178,125,204,197,188,84,201,150,169,230,39,247,
+56,194,117,182,104,41,180,68,61,102,40,15,29,69,131,204,137,83,227,156,132,83,211,201,116,137,235,93,234,238,172,181,244,154,234,68,48,171,13,229,156,18,248,230,10,125,142,72,155,245,82,174,167,208,215,120,135,188,21,222,204,194,182,90,6,129,28,0,229,41,237,6,208,120,243,210,165,217,40,48,198,114,240,124,92,36,168,171,86,183,235,73,223,204,105,197,157,168,200,111,235,59,75,192,94,69,31,200,18,105,12,64,182,36,16,169,218,155,205,189,153,42,193,96,206,172,159,204,145,240,77,215,185,139,158,97,29,210,102,93,229,174,166,152,222,153,154,138,22,48,193,28,34,67,100,176,50,20,220,180,3,185,211,142,212,119,218,26,212,228,220,82,252,40,46,216,58,213,45,138,137,60,43,188,237,154,144,28,210,231,92,116,214,150,139,58,231,208,171,108,147,59,55,169,83,231,122,104,207,192,22,114,92,129,181,124,130,149,231,74,142,89,109,189,218,25,33,158,10,77,0,10,63,185,80,229,32,115,90,102,17,136,159,79,0,238,243,173,248,9,176,133,162,50,137,149,
+110,44,98,227,153,79,183,225,22,114,7,152,196,151,155,215,38,252,13,178,121,61,65,56,168,28,194,123,137,20,53,5,214,92,138,208,118,138,157,18,133,22,2,153,139,188,82,135,0,241,39,220,117,252,172,121,21,177,183,94,193,192,119,103,168,34,39,120,160,80,66,32,15,62,4,244,158,4,80,212,168,79,92,88,18,47,19,185,60,184,152,200,197,240,144,224,149,135,244,26,163,203,189,27,4,252,237,79,170,1,14,158,74,210,196,1,205,14,192,3,177,149,174,240,80,46,117,202,68,37,192,72,242,209,57,149,13,250,37,235,40,172,149,76,104,142,46,133,173,82,112,215,142,17,19,239,144,231,135,23,226,176,57,104,236,18,107,179,203,197,146,235,178,133,195,160,236,192,122,97,87,174,219,192,166,184,91,34,9,31,209,131,212,224,229,220,221,227,217,154,253,218,159,157,128,99,91,156,240,153,238,18,109,11,23,23,182,130,221,178,130,187,231,12,186,28,91,44,231,186,88,117,116,226,200,97,56,73,240,15,129,172,59,194,214,173,22,19,121,150,100,243,238,221,194,208,
+84,221,174,163,230,80,104,5,21,143,68,142,244,156,235,201,136,110,72,161,53,31,213,165,86,137,105,106,105,95,42,245,58,181,30,231,205,10,106,6,223,113,133,215,69,81,41,85,183,44,10,43,118,180,122,253,10,247,72,124,119,186,193,188,89,184,154,153,246,147,225,78,126,28,150,65,217,206,47,69,200,5,149,200,182,128,178,248,77,87,92,129,74,40,81,173,17,112,216,88,56,202,15,157,44,76,78,25,228,2,165,221,127,145,187,44,94,5,184,142,128,29,3,190,59,81,125,236,50,53,183,91,49,196,237,188,22,129,205,238,234,187,222,88,140,54,143,113,57,37,252,150,203,69,84,187,246,46,90,183,90,116,152,201,186,17,251,216,110,141,225,200,62,83,9,119,96,122,131,165,123,145,19,46,218,14,156,87,12,55,59,46,47,166,203,25,141,83,67,184,86,104,175,164,214,233,105,240,217,131,173,57,7,201,171,105,85,33,230,184,244,230,35,122,116,69,10,22,48,50,94,119,103,15,6,35,236,253,64,34,54,39,85,56,189,188,104,84,166,60,179,93,171,14,86,142,
+22,54,3,177,201,230,202,102,55,227,184,174,168,132,64,74,228,35,199,124,103,145,78,91,70,211,94,115,208,38,163,154,24,153,183,3,60,165,146,230,76,225,118,197,68,177,74,119,236,206,202,83,233,44,79,161,149,74,195,11,90,212,45,205,46,35,250,200,197,128,146,217,169,139,167,180,100,142,192,36,96,236,147,147,134,198,161,221,190,87,11,10,88,70,163,127,149,47,3,148,142,105,133,242,230,152,105,45,34,235,11,25,59,57,161,104,223,134,153,36,85,152,38,38,70,5,14,33,95,71,80,195,143,200,109,0,166,213,164,177,5,218,182,101,90,25,142,184,89,53,118,49,92,7,72,238,157,122,150,194,202,96,170,62,228,28,245,76,33,221,245,9,52,14,169,123,41,160,227,181,104,241,182,27,125,71,16,23,133,11,243,72,1,141,81,199,138,35,196,187,158,90,4,101,206,112,80,60,63,63,151,86,17,6,202,222,18,166,149,208,11,244,250,139,200,50,127,58,49,127,69,242,107,12,200,146,124,127,209,234,109,154,247,2,118,119,204,187,32,58,188,166,56,249,70,32,
+5,84,238,0,160,157,154,242,145,175,68,90,220,149,40,124,222,97,195,79,219,81,67,129,83,70,212,54,55,119,228,117,143,179,34,116,93,86,84,251,132,253,28,143,147,218,71,205,173,231,54,84,98,63,86,156,16,80,207,138,6,75,230,146,236,226,18,90,244,213,110,253,146,187,34,149,58,232,215,199,233,192,236,226,92,167,70,12,4,118,92,20,130,106,2,95,89,139,160,200,81,161,82,194,22,218,22,20,88,130,33,229,57,64,242,180,211,211,78,191,222,211,115,142,144,207,73,173,136,140,7,158,109,76,241,180,187,177,185,121,228,225,57,197,197,57,83,155,51,37,60,60,157,52,251,19,193,11,160,66,38,211,132,13,32,181,233,35,27,11,57,111,251,86,62,163,229,24,187,94,207,34,210,211,185,0,92,34,176,12,58,106,93,88,110,227,60,71,51,220,50,22,182,154,4,61,93,78,116,242,11,150,5,91,189,68,132,159,95,249,167,234,70,233,1,211,19,54,226,42,170,25,127,242,74,83,105,187,23,86,9,135,4,175,68,168,19,134,22,196,60,48,81,104,66,190,
+165,88,116,79,128,26,210,119,224,206,34,108,38,71,80,169,54,54,210,27,69,134,140,178,74,56,152,19,170,252,224,31,153,88,36,22,208,86,9,164,104,146,158,41,99,111,131,21,180,61,9,108,47,99,87,185,199,119,11,87,98,71,110,126,87,189,47,147,200,228,26,15,34,220,92,198,47,118,112,29,170,92,171,184,171,32,137,128,197,78,0,207,206,12,70,14,196,13,22,96,203,22,138,148,242,181,234,53,126,186,174,206,222,226,5,137,150,70,115,52,1,95,41,222,149,56,177,133,233,238,140,127,78,151,41,38,146,87,7,50,57,144,63,179,81,105,108,145,100,107,97,142,90,185,59,92,113,45,93,188,171,43,199,1,63,86,46,239,214,249,28,83,152,83,57,181,23,187,151,151,190,219,60,75,57,169,211,154,103,43,100,33,197,93,183,182,153,55,87,140,48,83,172,11,251,236,13,217,74,161,189,71,228,24,84,130,8,107,22,127,222,40,242,142,47,155,254,46,187,202,46,108,210,87,82,146,237,216,2,47,189,46,99,118,186,75,150,12,121,119,137,106,202,144,151,150,
+10,39,206,83,13,88,79,17,240,187,58,1,124,227,122,243,94,134,245,177,49,224,117,17,48,56,120,104,46,111,18,44,165,91,96,45,101,235,84,19,186,85,99,157,55,131,229,76,150,87,15,103,10,135,172,91,56,23,134,189,235,152,58,101,92,197,82,155,161,116,26,230,67,3,70,114,41,187,153,200,179,152,23,90,155,172,224,76,94,212,180,203,215,52,116,183,45,216,160,21,54,248,251,176,152,149,34,203,44,180,109,211,45,98,24,9,104,68,106,237,222,154,68,90,140,227,116,183,235,224,63,32,57,98,40,172,56,187,173,189,10,246,152,187,123,94,234,34,125,176,188,254,223,108,44,191,237,112,191,107,145,247,154,219,208,94,107,252,245,224,139,23,95,188,217,131,14,63,27,121,62,52,252,233,251,144,103,127,102,24,121,61,254,234,245,56,228,249,208,40,244,217,248,200,232,23,111,24,63,27,26,135,252,242,231,223,106,95,255,104,12,50,8,25,133,142,189,126,49,254,62,120,247,245,110,245,56,244,229,171,94,111,253,93,219,26,250,193,167,31,128,183,191,27,234,239,
+181,175,33,159,15,189,120,1,249,4,10,121,54,10,5,105,158,247,218,249,255,174,228,145,87,208,225,175,72,134,158,67,191,165,67,255,7,144,95,189,147,251,86,253,183,250,244,218,255,111,68,191,30,123,55,199,208,235,239,143,140,246,212,236,141,35,64,159,15,129,18,222,54,233,199,94,191,234,117,221,199,222,206,43,124,54,56,58,248,172,55,111,48,6,29,239,13,25,64,254,229,245,24,72,3,125,1,234,244,102,94,225,127,128,107,99,67,160,121,95,188,107,239,143,244,36,189,248,210,8,232,31,95,129,42,140,189,153,187,248,87,99,10,207,70,70,193,205,87,35,195,207,223,104,245,118,68,226,167,195,159,246,102,29,190,206,9,138,249,59,232,40,20,50,212,243,240,179,23,67,175,190,156,159,248,210,135,111,141,251,4,250,6,230,75,251,159,127,115,46,0,242,139,31,253,253,223,126,252,163,191,253,41,228,233,123,127,243,179,167,63,252,155,159,129,142,31,126,62,242,249,216,211,31,246,70,98,158,190,247,209,59,194,191,250,171,47,89,158,190,247,221,231,111,167,139,
+190,247,244,189,247,223,45,254,240,255,128,203,35,47,160,227,175,199,190,247,103,166,175,56,62,6,49,191,73,252,243,215,47,71,6,255,13,202,31,191,30,255,38,225,47,160,67,255,22,217,200,171,47,254,76,247,229,231,233,123,255,138,244,215,189,112,63,27,121,249,18,10,38,202,187,152,140,65,7,71,159,125,246,38,254,96,128,193,52,28,7,215,198,71,123,11,79,127,248,6,228,91,25,244,235,193,209,97,112,247,201,215,66,255,244,159,254,0,121,57,56,250,251,49,8,24,145,223,13,253,177,199,217,75,133,65,48,36,195,35,239,50,102,236,109,236,191,242,62,228,243,94,50,129,17,251,228,237,16,13,40,253,25,104,72,15,236,91,18,127,245,217,235,177,111,133,234,87,79,255,249,187,79,223,123,222,27,206,249,167,63,252,183,65,208,252,239,125,147,0,12,209,179,177,31,255,207,183,68,175,95,130,84,63,255,131,149,53,14,29,6,41,33,144,95,143,142,244,44,248,201,200,27,245,254,172,210,59,200,247,222,217,241,159,190,137,249,14,240,107,64,160,148,31,247,82,
+244,219,115,65,247,63,128,252,227,187,185,162,175,77,4,129,14,248,42,21,255,63,35,70,189,64,188,126,249,38,28,175,160,160,119,71,161,127,24,130,126,254,230,112,131,92,96,25,120,9,29,253,244,237,17,31,3,79,203,51,40,152,253,31,143,65,159,244,82,235,235,112,111,96,158,64,254,110,228,37,20,98,214,65,62,126,179,248,139,161,79,70,7,193,82,241,238,16,127,123,99,168,55,163,3,10,122,59,166,244,4,50,212,247,120,248,125,200,199,195,67,96,225,123,91,18,127,54,12,70,124,248,77,213,26,124,49,244,191,222,220,252,57,71,126,251,255,0,169,222,145,9,
diff --git a/uppsrc/Core/srcdoc.tpp/Tutorial$en-us.tpp b/uppsrc/Core/srcdoc.tpp/Tutorial$en-us.tpp
new file mode 100644
index 000000000..5835573a3
--- /dev/null
+++ b/uppsrc/Core/srcdoc.tpp/Tutorial$en-us.tpp
@@ -0,0 +1,28 @@
+TITLE("NTL Tutorial")
+COMPRESSED
+120,156,189,91,9,115,219,70,150,254,43,189,118,38,67,57,52,141,147,167,38,51,182,114,76,118,19,219,21,59,51,181,165,98,66,144,132,72,172,64,128,6,64,201,218,28,191,125,191,247,250,64,3,4,37,59,153,29,167,34,81,64,191,215,239,190,186,121,233,137,79,62,113,250,206,99,231,129,127,211,47,226,171,232,144,86,243,203,212,27,143,103,201,200,9,102,145,59,154,189,154,204,126,251,237,183,193,100,226,205,8,149,11,84,174,19,248,174,231,186,129,227,4,222,200,13,39,206,36,28,187,99,199,31,5,94,56,114,194,233,62,42,162,221,252,50,26,251,179,39,223,15,1,229,245,195,199,190,235,187,142,59,244,2,172,114,124,199,11,92,47,116,199,227,192,29,133,99,127,50,28,78,87,209,190,74,242,108,126,185,36,56,218,204,7,152,51,26,15,3,23,64,65,232,249,163,48,0,112,16,184,46,62,187,225,104,56,26,77,171,164,74,99,0,185,195,209,44,10,188,217,5,65,6,253,225,99,144,231,141,0,26,120,193,48,240,199,158,239,142,61,111,56,241,131,73,
+0,186,93,111,154,84,49,168,92,2,134,224,8,44,196,134,65,24,184,62,4,18,140,66,31,203,70,248,29,56,19,215,195,174,99,39,12,177,97,252,94,75,137,4,68,112,67,108,231,141,66,90,61,14,198,174,63,26,123,129,55,244,64,128,51,2,151,180,123,56,93,199,229,10,112,190,231,206,42,144,52,187,248,91,56,115,1,60,234,143,30,123,206,196,241,134,163,9,54,4,177,96,216,159,76,92,127,140,13,3,55,116,92,127,186,202,215,196,164,23,58,62,239,56,134,30,134,192,204,50,9,135,46,8,246,252,49,182,28,185,190,143,159,97,48,30,77,203,152,52,81,229,197,252,242,201,223,122,206,192,25,120,97,120,70,224,19,128,143,253,192,247,131,225,36,112,29,31,219,0,71,64,242,26,58,208,165,27,122,227,233,50,42,177,103,21,144,100,89,170,46,25,18,4,239,143,67,31,91,15,241,3,74,5,131,62,100,227,77,130,177,239,143,157,233,42,141,202,210,18,208,19,98,210,117,251,174,251,120,68,114,13,125,47,152,144,112,124,15,2,246,134,225,196,133,132,
+195,97,224,120,211,34,126,119,72,138,120,23,103,16,113,2,219,152,105,245,40,59,4,49,210,14,189,190,235,193,18,195,225,208,33,121,133,176,6,207,15,33,112,199,29,7,160,8,255,65,197,149,50,197,101,205,131,223,119,253,199,19,47,240,65,201,36,8,32,1,32,112,39,174,235,58,99,252,7,206,32,23,182,13,23,36,48,19,114,123,9,30,244,221,224,241,8,54,12,77,77,2,218,126,226,147,252,60,136,223,27,58,33,244,224,73,112,143,164,238,125,2,185,187,222,152,254,103,201,187,97,223,133,51,128,68,55,12,193,183,15,81,123,99,240,30,66,246,62,219,183,59,26,79,95,198,183,229,23,81,21,43,131,121,114,241,137,180,52,119,216,119,135,143,29,130,15,199,19,40,208,13,72,126,126,16,76,188,137,239,135,222,36,244,135,14,228,88,74,95,38,96,242,39,246,69,131,100,212,119,71,240,44,240,26,134,224,158,193,192,249,200,37,82,188,241,100,72,82,80,72,22,79,211,36,35,58,96,25,51,105,12,79,46,62,115,221,17,33,26,195,97,198,227,161,227,
+79,32,12,200,192,9,97,233,136,6,99,40,26,122,246,224,6,20,14,86,215,209,38,94,60,85,174,250,243,79,191,254,233,203,151,79,127,120,35,46,75,111,38,94,190,253,86,188,61,192,74,147,40,253,116,126,89,250,51,225,14,196,63,226,21,30,9,216,96,178,42,233,113,56,19,223,198,149,56,148,162,172,162,162,18,183,73,181,21,145,40,147,221,62,141,197,229,19,5,49,23,249,149,72,178,138,97,70,51,241,244,23,243,234,28,143,63,159,139,155,153,66,247,223,249,65,172,162,76,68,235,181,136,83,54,186,82,84,185,168,182,177,222,62,42,5,91,80,92,197,69,73,152,233,29,16,62,95,175,231,2,79,183,249,218,236,115,51,80,47,122,238,217,204,122,138,71,61,239,232,137,127,166,201,120,155,11,152,11,252,212,236,122,167,8,59,148,49,88,89,39,171,184,230,230,42,47,122,224,67,36,98,241,23,225,204,240,251,92,240,206,95,199,213,69,126,128,223,244,206,240,116,241,217,226,179,51,3,244,244,151,111,95,125,221,187,193,170,197,229,60,161,95,243,185,220,
+31,238,36,132,107,62,121,230,147,175,168,123,158,130,182,44,170,146,155,184,47,126,32,180,34,74,203,92,236,139,252,38,65,72,83,180,231,69,147,68,75,226,139,233,20,59,126,163,150,205,197,59,162,156,73,126,17,111,146,12,244,246,69,108,158,125,153,173,153,131,119,226,63,240,40,198,135,46,86,136,133,39,243,119,31,200,195,54,191,141,111,226,130,149,71,50,37,11,209,84,139,164,196,179,67,148,166,119,2,6,31,23,55,241,90,128,3,81,238,227,21,44,82,228,251,125,94,84,135,44,169,18,226,54,83,66,232,165,201,53,180,67,198,71,134,147,100,27,200,101,3,35,174,182,59,65,209,250,76,68,217,90,108,226,12,27,17,242,117,188,47,226,21,180,188,30,136,127,198,162,60,108,54,113,89,177,174,97,115,150,170,197,33,75,227,178,228,55,219,232,38,134,145,23,49,163,216,228,249,154,62,151,121,70,48,235,92,228,96,169,184,77,202,120,32,89,125,38,94,230,85,60,21,144,17,49,182,78,162,77,150,151,21,92,72,236,162,85,65,182,29,85,34,63,84,251,
+67,69,170,43,69,84,108,14,196,128,54,252,65,154,111,196,85,146,18,57,160,121,121,216,136,29,184,25,136,231,25,111,70,14,151,164,81,33,241,149,226,54,134,39,166,169,98,0,40,176,109,165,188,25,200,99,241,197,15,223,189,22,61,13,165,118,1,125,125,177,60,84,98,125,216,237,75,126,84,230,135,98,21,139,248,61,196,84,150,9,179,152,75,33,18,138,11,209,171,215,174,242,172,34,154,149,67,210,159,17,130,84,113,54,80,1,196,51,1,36,223,147,162,129,174,108,121,61,217,100,6,125,87,136,24,5,253,245,125,188,203,111,226,121,29,10,32,169,2,219,231,59,177,207,203,132,113,208,142,18,177,49,72,203,210,85,104,177,188,252,254,72,208,12,29,138,154,158,219,23,174,163,44,27,111,197,13,249,198,226,103,193,207,251,194,19,139,95,155,128,138,240,94,39,144,5,1,230,41,66,85,58,114,193,148,170,67,1,166,20,199,196,48,91,253,85,2,31,208,60,139,56,43,15,5,217,55,219,78,121,88,81,216,173,223,190,79,202,170,28,136,111,88,21,208,55,
+244,15,75,1,84,126,216,108,107,97,194,54,164,164,250,66,37,249,181,200,14,187,37,44,10,50,173,151,149,20,142,201,71,128,176,140,161,217,117,29,129,105,229,243,138,214,144,141,96,125,95,100,241,45,28,131,65,44,197,17,25,228,176,81,154,252,47,94,176,209,1,234,38,74,15,100,201,88,65,132,71,228,188,125,99,193,43,120,22,98,240,26,252,20,9,108,147,184,195,134,223,179,9,252,131,64,101,206,57,100,215,89,126,155,193,1,222,39,59,24,57,99,85,26,177,20,115,145,198,81,209,179,180,221,21,185,169,110,115,58,194,181,204,37,48,6,107,119,138,147,206,25,173,60,86,51,82,110,95,76,38,244,99,236,147,157,160,62,162,159,252,57,116,232,241,68,45,192,150,35,250,88,91,197,19,50,11,147,12,247,123,18,168,14,101,176,248,172,246,175,18,145,122,176,25,136,249,27,132,68,59,193,210,223,243,222,77,135,1,74,202,136,40,69,130,167,9,173,137,105,147,171,40,131,31,251,3,241,22,62,88,94,65,249,73,89,30,98,237,197,175,174,16,0,56,68,
+102,177,212,240,30,85,167,29,24,242,204,10,12,180,32,82,1,76,5,141,18,54,37,170,187,61,12,130,42,144,154,71,68,255,52,205,111,197,229,143,85,190,79,86,139,233,226,217,226,217,69,94,196,139,103,101,177,90,231,171,197,51,60,190,94,252,180,248,36,206,22,79,15,229,143,136,147,220,59,9,122,14,171,221,69,25,133,220,121,95,186,204,46,6,7,202,123,100,144,171,233,162,32,141,52,80,228,119,241,250,143,135,148,110,12,46,233,119,241,23,171,242,129,253,106,82,84,152,188,188,16,55,243,6,53,98,241,148,249,145,159,40,12,235,178,36,203,69,154,103,27,80,31,173,86,148,169,40,143,40,201,67,95,91,246,225,93,82,33,213,193,148,128,46,194,98,177,140,145,204,18,108,138,164,70,217,40,35,183,189,129,164,80,26,34,126,124,149,20,37,252,57,97,247,6,178,18,110,8,124,64,112,21,33,77,210,254,8,33,59,36,51,208,80,198,176,196,74,27,6,20,202,62,136,5,128,137,214,244,224,234,64,30,157,239,239,8,29,92,125,69,152,110,73,5,218,
+102,6,226,13,135,151,126,91,253,196,98,9,153,196,86,81,72,128,41,202,88,137,210,228,20,146,12,39,189,72,82,213,151,22,80,213,38,203,166,150,103,41,1,49,4,248,190,141,238,84,186,254,112,11,187,252,241,71,138,136,68,188,42,6,140,221,171,170,69,201,0,188,43,205,246,72,102,134,133,242,192,117,12,244,27,239,91,92,32,174,216,21,231,92,82,138,200,214,94,75,233,180,96,229,84,197,161,145,4,111,200,196,206,207,217,200,92,109,101,47,97,101,75,248,156,45,92,46,104,140,251,25,163,185,168,113,82,241,181,99,54,104,69,45,106,46,103,74,42,180,14,73,185,5,239,203,59,33,139,247,68,145,75,193,213,228,138,110,87,240,184,8,70,28,85,229,47,66,76,128,221,211,132,43,32,4,3,29,95,222,228,176,187,130,115,3,37,181,67,73,9,144,54,128,237,210,58,59,105,33,87,33,83,20,107,25,102,164,233,172,36,74,4,6,240,189,150,168,9,190,209,93,176,134,172,191,187,35,206,226,217,43,20,175,55,73,124,91,155,195,85,26,221,160,150,62,
+99,104,166,103,119,128,103,148,16,85,121,117,119,18,209,119,168,19,162,101,26,215,136,118,234,201,92,88,173,183,50,235,114,11,131,97,151,100,228,148,213,149,38,209,150,193,60,159,238,115,112,68,90,205,64,252,77,130,42,25,90,144,181,5,132,242,214,144,181,196,239,168,160,72,66,158,175,118,164,29,140,208,164,156,4,163,187,138,84,132,44,224,181,82,242,70,153,210,72,196,23,118,142,158,146,237,105,206,230,231,246,187,207,145,129,172,172,250,166,226,58,134,255,209,20,103,102,189,179,205,100,29,85,81,253,110,241,171,109,208,148,72,208,47,54,40,48,78,166,220,136,36,69,158,132,224,44,75,6,99,149,40,122,209,3,112,173,92,105,137,151,141,230,147,29,68,231,19,114,192,197,83,246,64,203,235,116,60,110,208,176,206,99,89,120,49,2,36,191,62,9,219,230,138,194,174,157,168,8,177,193,217,71,212,104,34,68,80,143,211,43,134,58,90,13,139,71,3,158,31,210,53,37,131,37,181,40,220,155,160,33,140,68,156,80,154,173,57,181,152,144,32,73,118,147,167,
+32,146,106,125,20,151,232,44,57,200,144,106,184,119,167,188,40,9,87,97,146,74,99,10,236,125,211,122,147,84,209,197,216,205,57,17,90,49,49,216,148,115,86,82,25,126,13,237,165,232,113,180,166,36,179,141,163,253,153,41,126,77,129,202,178,213,165,113,17,35,142,199,25,44,178,162,54,189,29,85,154,198,70,241,233,184,222,203,168,18,162,164,43,16,31,81,223,224,19,151,123,77,219,180,49,45,62,21,107,2,34,124,102,168,112,102,91,235,122,64,246,139,136,43,22,143,222,82,27,185,120,68,127,100,246,154,143,169,55,9,35,89,253,224,121,213,163,158,167,119,38,254,36,178,70,189,169,124,193,170,52,184,199,230,221,195,41,149,122,158,227,82,73,199,37,158,231,120,33,125,30,243,147,209,72,149,116,53,200,144,65,220,225,8,197,169,59,28,83,253,55,28,210,226,97,200,63,131,33,253,28,13,143,0,71,18,48,8,2,44,8,28,90,22,184,19,250,57,161,242,209,103,132,1,83,18,152,82,178,6,31,75,112,207,39,64,208,138,159,94,64,164,122,35,159,127,
+210,19,223,33,122,60,42,156,93,207,61,166,97,34,145,184,46,1,226,31,253,116,104,177,235,121,140,150,127,50,18,135,170,94,215,25,6,252,36,60,66,229,58,140,107,50,164,226,56,28,114,73,204,112,30,23,195,196,223,100,18,48,10,126,73,27,76,60,198,233,251,117,99,167,187,115,244,101,101,178,76,210,164,226,202,71,77,22,96,64,175,169,48,145,177,25,45,207,54,65,23,135,55,29,190,109,87,81,221,241,103,32,190,164,38,160,59,4,238,146,205,150,35,190,156,124,84,50,81,151,57,114,249,213,33,91,241,98,99,78,13,20,23,220,127,209,35,233,54,102,64,70,254,72,19,21,30,203,80,190,71,160,224,54,212,142,155,202,119,33,132,12,213,105,126,93,10,26,208,52,156,241,148,35,218,126,85,123,28,9,108,222,179,136,202,206,106,138,234,161,88,122,215,172,158,84,196,177,68,10,9,220,68,69,18,241,140,37,111,111,70,5,252,25,17,102,237,116,54,19,207,158,217,155,168,82,37,68,239,90,20,209,157,74,255,58,56,90,237,243,58,231,28,160,235,0,
+43,167,151,44,61,37,37,9,79,237,73,124,167,234,93,234,128,161,53,174,94,184,212,182,119,170,167,63,106,250,68,184,100,77,36,151,81,211,31,171,193,153,14,153,244,214,16,134,112,108,35,196,106,26,200,33,19,160,69,71,224,137,173,72,91,82,145,105,74,11,89,49,237,116,38,248,82,118,237,141,153,129,42,191,57,237,54,88,104,112,203,83,129,55,205,82,191,71,127,155,204,41,103,31,119,92,83,81,79,160,224,136,167,124,73,173,75,169,216,47,207,166,118,243,203,140,205,207,177,241,122,49,157,166,208,160,76,184,159,67,133,247,183,255,129,14,197,205,92,208,66,132,116,144,18,80,148,74,107,233,10,242,239,20,214,119,192,154,116,12,77,159,254,146,14,246,135,114,187,248,137,74,183,222,187,179,118,76,135,121,13,7,226,117,158,222,237,242,98,143,248,32,217,210,225,133,117,71,150,2,189,101,38,201,242,156,148,102,125,80,245,222,2,53,170,105,23,110,47,229,196,167,193,173,46,28,215,249,129,202,194,175,99,56,128,12,55,146,167,118,111,107,234,184,183,185,
+252,80,47,255,89,229,109,241,188,84,175,24,27,252,201,154,153,169,122,206,70,169,168,251,6,38,71,109,237,84,236,65,10,248,232,34,151,99,211,236,3,233,55,4,101,13,18,44,104,181,167,10,121,216,58,67,160,1,224,7,17,252,133,220,242,94,122,21,89,255,66,146,229,174,61,141,248,94,162,185,120,147,211,55,217,32,55,134,116,114,110,167,2,137,41,150,165,235,115,49,7,16,83,160,113,155,99,10,62,228,31,25,235,150,220,44,92,177,61,46,169,45,190,229,132,161,176,244,149,233,86,209,53,5,150,91,114,251,109,178,167,248,65,3,35,192,228,203,255,65,152,96,24,57,163,136,101,234,176,134,52,88,204,148,48,5,154,1,195,41,111,112,46,69,255,57,205,52,107,73,227,15,83,191,225,55,104,155,107,35,235,249,103,103,205,133,228,219,68,189,18,175,27,14,194,7,150,120,3,239,36,22,189,141,247,224,2,231,129,93,22,79,189,129,239,235,141,120,184,135,85,106,188,71,69,10,8,69,193,55,160,130,133,43,191,190,80,32,117,121,242,118,27,101,215,28,
+204,111,227,52,53,109,113,125,98,98,103,170,58,161,242,176,113,141,231,60,190,145,163,73,26,53,210,80,146,43,0,19,163,152,248,101,158,167,102,84,113,222,147,6,45,21,131,24,26,245,69,235,201,178,142,144,13,151,81,14,16,13,164,99,156,139,165,252,116,162,14,198,175,129,252,215,118,83,162,181,7,97,117,138,78,9,73,10,141,165,87,11,211,26,129,142,6,226,69,34,101,32,199,28,117,254,82,194,181,218,22,21,167,235,12,23,241,40,83,142,208,100,229,36,187,27,116,225,141,252,140,12,74,105,47,206,184,238,43,161,13,74,197,3,72,27,222,150,236,104,222,198,243,24,149,232,73,119,228,122,155,36,179,215,83,129,35,122,250,56,141,134,33,106,234,244,213,55,95,189,146,94,85,159,199,156,241,220,132,213,40,67,195,139,196,226,228,69,34,121,41,183,220,51,170,140,99,36,171,215,202,76,107,5,183,76,57,220,223,81,194,54,79,98,245,155,183,81,146,206,27,231,48,217,64,1,232,83,217,250,41,45,238,5,182,254,44,195,103,213,5,118,148,228,61,190,
+40,242,189,220,190,3,238,62,32,73,217,9,32,27,66,9,231,116,208,209,252,216,142,222,21,42,152,189,135,131,142,193,117,127,224,49,216,238,11,62,71,116,117,6,160,54,97,247,6,33,10,57,109,15,106,7,33,120,210,152,12,110,29,191,55,121,9,159,249,192,201,10,245,168,74,239,68,235,176,114,159,70,117,49,217,147,19,106,117,48,168,6,224,17,155,170,93,147,114,38,51,110,39,39,191,198,197,206,228,107,58,161,56,100,9,92,71,92,161,246,63,32,33,202,169,5,209,68,169,181,202,37,10,196,163,34,65,225,85,159,186,213,91,73,84,230,72,77,14,129,101,70,133,85,125,149,100,199,23,21,248,172,17,188,207,207,101,145,4,251,89,191,183,52,176,126,111,146,214,226,81,148,94,69,139,71,103,205,215,148,33,22,143,150,113,117,234,213,38,218,237,78,189,91,199,233,73,184,107,196,120,243,78,106,121,253,94,105,153,40,161,169,82,133,159,140,191,47,24,85,95,48,148,237,31,116,96,220,83,124,176,8,106,106,155,168,7,244,182,126,73,59,185,71,109,149,
+62,210,84,135,142,212,89,176,252,250,140,219,140,138,34,68,198,13,183,107,141,35,65,139,26,181,25,53,195,168,136,178,205,73,114,236,21,204,253,83,77,213,243,236,206,144,69,25,18,113,177,136,97,160,43,83,71,209,105,92,92,29,41,93,73,131,94,245,40,67,55,213,208,18,181,146,235,67,178,150,82,146,199,190,84,206,237,26,135,38,108,152,102,212,207,34,177,58,206,101,172,111,189,172,155,230,250,146,174,215,181,169,167,234,248,138,59,39,75,74,199,134,116,187,77,16,43,176,240,115,234,28,218,19,54,82,195,85,210,108,159,12,78,123,247,230,42,203,174,86,52,115,164,161,219,159,179,197,159,107,193,57,194,151,5,178,60,97,39,60,214,5,33,227,190,101,167,255,114,86,36,16,121,33,34,249,0,179,83,33,130,138,231,147,38,175,220,23,49,198,88,217,177,49,74,167,171,110,243,135,215,108,139,248,223,137,169,69,183,153,153,117,173,226,177,206,137,21,146,34,90,49,60,181,66,209,67,107,70,255,175,88,90,212,194,88,190,63,170,195,174,10,100,149,102,114,
+49,197,21,233,60,189,141,238,202,122,112,174,78,152,241,230,118,123,7,56,158,209,224,81,38,75,60,188,151,89,78,213,97,37,153,231,15,89,154,100,215,115,174,178,204,159,255,5,183,156,215,181,153,30,17,166,49,157,38,88,35,114,137,142,12,117,23,93,243,41,70,146,221,36,101,66,233,138,166,1,28,17,13,158,118,244,81,91,55,139,47,251,21,200,152,183,211,128,93,80,55,67,41,62,44,46,189,197,252,164,45,89,168,78,155,82,141,198,10,181,205,21,53,154,102,52,214,151,38,42,154,228,222,110,99,22,191,117,155,102,147,208,180,196,120,125,194,119,187,192,166,29,243,190,41,127,80,207,142,162,158,237,211,214,50,84,181,93,12,215,43,236,186,171,193,140,181,196,101,86,156,83,175,189,70,46,212,143,173,139,80,38,249,232,198,27,52,190,62,156,204,59,244,10,98,188,202,243,15,73,57,88,214,76,56,125,121,162,5,63,36,139,135,171,117,102,123,165,43,185,73,119,102,149,239,104,79,175,165,67,190,213,40,189,134,186,166,90,83,77,223,148,14,80,167,218,
+219,56,222,119,50,205,111,122,31,199,107,55,147,148,246,249,162,93,25,37,200,18,181,151,214,173,177,105,232,228,252,62,46,170,70,84,65,186,145,116,83,150,230,18,215,138,32,228,204,165,110,243,228,168,70,14,241,41,249,236,162,138,167,40,101,46,83,55,79,109,110,80,156,171,2,53,111,43,90,95,70,115,239,227,252,97,158,143,81,170,208,32,67,241,71,225,62,129,86,223,183,227,106,72,10,237,4,102,249,178,255,65,59,64,89,48,53,234,127,249,180,146,78,17,64,121,57,183,110,50,112,79,94,234,155,159,249,178,178,218,11,187,135,48,90,75,232,72,227,86,78,47,248,24,33,105,220,140,232,113,217,163,111,238,240,233,136,188,1,194,208,245,140,67,117,204,186,232,95,91,165,143,33,211,30,114,240,244,98,109,73,100,221,148,180,45,14,45,162,35,121,160,239,154,12,180,245,209,65,206,241,93,139,227,219,19,246,193,142,170,121,216,250,204,109,2,125,135,160,103,31,189,232,81,188,108,110,56,29,201,123,23,156,35,201,114,97,209,242,70,105,141,77,159,183,203,
+107,26,219,216,204,143,22,127,161,145,59,214,70,245,193,21,200,89,229,187,253,161,138,233,184,121,171,47,20,190,204,171,100,69,93,87,180,225,147,9,16,114,145,239,150,64,249,119,172,154,43,48,250,219,2,147,215,201,153,190,40,45,208,20,223,9,121,175,16,171,229,21,99,190,46,114,69,198,36,228,85,252,246,248,247,117,92,148,124,1,66,223,126,56,151,79,186,175,61,100,40,195,103,199,143,75,52,47,141,55,214,18,137,174,103,33,232,139,38,152,125,198,48,229,21,61,126,220,215,11,122,122,97,115,60,108,112,63,60,235,62,32,78,109,72,59,242,146,59,137,148,239,67,206,213,128,79,34,90,124,42,246,247,143,243,90,90,233,237,7,146,161,253,64,147,120,122,190,215,154,45,146,109,180,119,55,227,69,243,228,193,241,34,109,42,216,206,150,234,243,167,132,72,211,163,95,29,105,232,3,167,143,236,7,198,36,246,53,252,158,187,109,165,128,197,163,255,204,183,217,226,17,69,193,55,59,244,108,205,218,188,181,246,117,116,72,229,218,139,168,64,10,65,114,184,119,
+61,86,169,245,95,102,155,52,46,155,139,229,85,156,102,34,223,203,84,253,208,142,86,88,250,64,136,86,115,207,195,252,174,83,67,25,171,40,145,94,217,135,146,240,197,198,217,133,30,185,244,219,113,71,85,70,141,113,165,177,97,219,128,219,3,234,236,126,123,105,128,102,3,117,178,245,59,76,246,143,79,196,149,97,254,190,161,120,83,92,245,12,179,53,121,109,204,8,93,167,57,36,60,58,44,113,90,115,203,142,99,142,251,49,120,53,134,230,232,149,239,117,56,114,42,79,115,70,124,60,46,62,165,5,54,136,177,113,117,188,54,214,72,95,119,114,244,215,21,190,139,246,202,66,205,223,106,12,64,211,32,57,96,225,246,206,124,241,137,242,145,53,85,168,19,173,186,65,101,234,91,157,33,235,193,4,219,52,146,153,125,73,191,113,65,81,81,163,181,102,30,234,193,97,95,232,224,178,235,72,31,59,107,138,232,146,63,126,88,192,217,169,81,160,215,0,185,47,142,24,208,58,19,144,116,237,253,253,198,152,104,175,35,175,208,193,194,126,87,71,223,102,4,153,29,105,
+198,124,7,202,84,102,170,101,231,187,98,212,236,161,170,73,185,34,107,235,165,105,63,59,245,5,46,85,130,181,187,59,253,154,93,191,177,64,183,111,187,129,130,150,119,73,204,57,131,111,221,55,226,53,18,133,89,69,154,16,172,132,190,32,17,11,41,93,8,30,98,17,134,121,209,112,109,171,105,178,191,182,84,213,223,99,219,69,123,125,183,247,254,111,174,49,77,252,181,181,147,223,90,179,100,51,239,37,103,242,206,219,84,93,120,219,117,124,165,205,18,139,59,181,56,212,15,189,169,205,170,126,234,79,91,60,159,102,184,53,87,39,198,63,98,66,127,29,223,117,104,87,79,169,189,70,231,186,211,109,171,215,26,78,203,111,44,125,93,207,121,27,68,172,242,2,5,227,62,207,248,192,175,99,24,173,101,218,181,35,5,245,122,195,150,164,176,245,235,168,228,230,23,124,180,199,147,181,103,68,37,161,183,190,185,195,199,44,105,190,161,203,33,69,65,119,143,168,237,148,163,99,249,21,34,234,1,45,0,116,169,242,75,96,84,187,235,17,251,209,23,130,144,162,137,14,
+53,41,181,73,104,51,44,217,242,253,70,84,81,95,229,145,129,101,47,163,71,163,182,248,56,56,18,152,254,118,144,124,106,181,239,100,4,170,151,105,53,45,122,32,7,21,242,80,205,10,199,167,71,107,165,21,48,37,130,198,97,167,226,218,50,159,123,172,234,120,160,165,40,123,35,221,206,178,177,213,150,191,204,65,57,130,4,175,190,75,163,40,110,134,126,5,76,223,103,147,2,60,38,239,223,165,148,99,43,254,224,115,11,54,47,203,174,106,237,233,96,71,215,211,62,224,8,67,231,181,22,213,175,99,78,46,125,78,69,89,215,160,178,51,182,251,242,176,211,255,23,5,120,34,136,252,9,36,136,227,66,210,92,48,51,150,211,82,167,60,119,121,215,121,236,162,207,76,118,139,203,119,139,121,243,244,68,45,121,103,210,117,125,4,115,124,67,205,84,23,196,107,71,4,55,28,116,71,110,158,84,214,83,189,122,146,105,84,215,53,190,220,29,205,166,91,172,239,172,233,166,215,172,89,158,167,137,84,236,139,104,25,181,139,28,128,96,73,16,52,32,190,185,137,148,253,
+254,51,73,175,143,138,156,211,153,222,99,107,8,130,143,176,6,80,39,136,176,99,83,32,42,4,19,112,148,247,101,218,160,193,208,43,154,216,204,27,55,120,100,140,150,163,28,123,142,213,250,30,130,57,108,111,214,166,9,127,5,89,66,91,95,227,171,115,138,190,243,31,173,42,121,191,68,141,60,169,210,58,186,148,213,121,21,232,143,244,234,221,61,185,248,171,110,227,207,85,15,223,234,109,79,253,155,90,40,207,255,64,143,111,11,86,202,14,228,181,181,212,107,216,66,29,72,13,128,169,23,157,186,100,60,89,179,49,212,253,117,155,241,121,101,172,61,134,89,92,38,116,200,210,44,224,22,151,245,187,142,240,96,138,54,84,109,218,98,239,45,217,78,150,125,65,48,181,44,187,59,70,108,80,179,212,131,88,61,166,43,40,9,216,113,34,89,93,171,82,156,6,115,251,65,115,208,171,155,171,174,169,45,159,171,53,103,181,150,173,55,190,146,105,215,48,74,203,102,148,83,154,128,105,209,98,157,53,200,5,191,223,225,173,9,73,45,135,250,158,244,3,183,203,235,1,
+246,67,51,20,121,149,236,168,32,226,241,0,245,153,250,187,8,71,179,131,70,19,170,39,8,145,213,133,70,58,221,62,167,120,218,24,37,216,113,216,44,123,161,151,153,27,78,206,113,236,141,142,131,239,243,190,120,97,5,221,168,43,234,54,111,111,53,107,160,72,23,51,207,59,142,196,35,147,111,95,116,165,130,6,172,233,14,212,27,11,176,241,138,126,195,145,231,255,7,17,77,156,51,
+
diff --git a/uppsrc/Core/srcdoc.tpp/UserValue$en-us.tpp b/uppsrc/Core/srcdoc.tpp/UserValue$en-us.tpp
new file mode 100644
index 000000000..bb966470e
--- /dev/null
+++ b/uppsrc/Core/srcdoc.tpp/UserValue$en-us.tpp
@@ -0,0 +1,134 @@
+TITLE("Storing custom data types in Values")
+COMPRESSED
+120,156,141,87,105,115,219,200,17,253,43,83,150,179,43,105,
+33,22,230,194,65,38,155,77,201,73,202,31,162,77,217,138,
+83,41,149,202,28,130,67,17,43,16,67,99,0,113,153,195,
+191,61,175,103,64,209,148,55,135,85,22,8,2,125,189,247,
+186,123,116,39,216,235,215,105,146,158,165,255,227,223,244,141,
+93,153,161,233,239,239,26,81,20,179,58,79,213,204,240,124,
+246,99,57,251,252,249,243,164,44,197,140,92,113,184,226,169,
+146,92,112,174,210,84,137,156,235,50,45,117,193,139,84,230,
+74,232,60,213,211,173,233,204,230,254,206,20,114,118,249,46,
+131,149,72,244,153,228,146,167,60,19,10,111,165,50,21,138,
+11,205,139,66,241,92,23,178,204,178,105,101,182,125,237,218,
+251,187,5,217,193,74,194,42,205,139,76,113,216,40,45,100,
+174,21,108,149,226,28,159,185,206,179,60,159,246,117,223,88,
+216,240,44,159,25,37,102,215,148,165,74,178,51,100,39,114,
+152,42,161,50,37,11,33,121,33,68,86,74,85,42,164,205,
+197,180,238,45,146,92,192,134,236,200,76,35,160,210,138,75,
+224,161,114,45,241,90,142,171,74,75,46,16,181,72,181,70,
+64,251,243,1,36,194,135,236,50,132,19,185,166,183,11,85,
+112,153,23,66,137,76,32,129,52,71,145,20,93,79,151,214,
+87,176,147,130,207,122,164,52,187,254,65,207,56,140,243,36,
+63,19,105,153,138,44,47,17,16,201,162,96,89,150,92,22,
+8,168,184,78,185,156,86,110,73,69,10,157,202,25,108,10,
+176,144,193,113,128,68,103,28,249,10,89,32,98,206,165,196,
+111,173,138,124,234,45,241,208,187,238,254,238,242,135,243,116,
+146,78,132,214,23,148,111,9,243,66,42,41,85,86,42,158,
+74,68,129,15,69,112,101,41,152,228,90,20,211,133,241,8,
+217,43,2,246,154,152,39,21,1,118,89,104,137,200,25,126,
+129,81,148,39,129,140,40,85,33,101,145,78,171,198,120,255,
+5,60,151,84,34,231,9,231,103,57,161,170,165,80,37,65,
+35,5,224,21,153,46,57,240,213,153,74,197,180,179,159,134,
+186,179,27,219,2,224,26,194,152,29,200,25,69,136,92,162,
+8,69,194,5,100,168,179,44,37,180,52,180,32,164,6,220,
+41,47,20,50,194,15,8,238,71,29,6,109,4,93,112,153,
+112,121,86,10,37,145,73,169,20,0,128,3,94,114,206,211,
+2,63,168,12,176,4,101,112,164,16,138,136,225,163,185,74,
+184,58,203,33,96,240,84,42,10,95,74,130,79,0,125,145,
+165,26,52,136,104,46,8,116,241,26,176,115,81,208,255,11,
+178,215,9,71,35,32,67,174,53,202,150,0,90,20,40,93,
+3,121,25,196,205,243,98,122,99,119,254,141,233,237,168,150,
+203,235,215,81,102,60,75,120,118,150,146,189,46,74,208,199,
+21,193,39,149,42,69,41,165,22,165,150,89,10,24,125,236,
+99,50,166,94,10,125,248,236,36,79,120,142,182,66,169,90,
+163,248,96,134,194,115,78,169,136,162,204,8,132,209,201,252,
+170,169,91,202,3,186,152,69,41,92,94,127,199,121,78,142,
+10,116,75,81,100,169,44,129,5,32,72,53,100,142,73,80,
+128,103,208,44,208,3,52,10,170,71,243,96,231,87,99,159,
+254,227,227,191,126,245,251,155,171,191,188,103,119,94,204,216,
+123,200,179,110,31,88,53,248,222,109,216,210,244,134,245,251,
+173,245,172,110,217,7,211,12,214,127,115,127,231,211,25,251,
+113,197,42,55,116,222,178,186,103,181,103,91,231,125,189,104,
+44,235,29,131,109,103,255,155,143,132,245,107,211,207,191,245,
+108,135,43,110,236,126,254,45,76,86,174,155,176,183,45,91,
+153,170,79,152,125,178,45,61,99,243,87,190,55,237,210,116,
+203,249,43,246,68,30,70,135,77,253,104,217,219,155,219,249,
+199,15,204,117,236,253,237,187,183,55,127,164,155,181,121,178,
+236,201,118,123,188,210,163,80,230,183,182,170,77,195,252,176,
+221,186,174,127,78,37,161,79,27,231,123,102,232,149,222,83,
+192,186,99,182,197,248,3,228,134,70,224,243,219,84,104,189,
+217,54,161,39,236,146,190,255,9,85,134,36,189,217,88,182,
+51,123,56,162,58,152,105,247,204,225,65,23,115,157,140,184,
+141,151,91,88,108,12,236,63,1,142,24,195,79,217,218,237,
+80,108,87,87,107,20,122,154,194,222,13,240,222,246,191,13,
+166,62,100,65,89,63,153,186,49,132,187,219,142,110,88,101,
+154,6,201,193,145,217,125,1,215,252,213,36,216,186,182,217,
+179,126,231,144,53,168,246,196,223,136,138,39,235,93,103,182,
+91,210,128,105,153,91,252,4,76,80,38,72,53,35,4,32,
+130,61,216,190,167,87,96,186,128,160,224,23,222,134,174,125,
+105,51,130,70,44,146,103,179,79,216,0,197,216,201,195,100,
+250,5,30,249,140,253,105,127,139,20,89,63,27,239,163,229,
+211,225,118,188,60,177,249,111,216,59,179,187,117,225,249,121,
+127,49,59,133,245,15,0,126,91,87,143,17,115,144,59,177,
+147,192,70,212,203,174,238,215,192,5,163,191,239,134,170,175,
+33,146,202,109,247,0,27,164,45,227,194,77,2,212,21,42,
+65,170,167,73,34,242,159,225,252,24,253,52,184,235,16,112,
+21,66,65,128,158,153,166,183,93,107,66,152,165,181,219,16,
+107,228,233,43,199,111,240,194,127,114,188,180,91,219,46,9,
+112,16,188,91,219,168,42,80,25,201,117,136,201,252,218,13,
+205,146,45,108,168,31,244,159,135,42,221,222,46,47,38,236,
+175,107,180,82,125,120,139,88,32,111,167,245,124,225,98,101,
+60,82,127,33,217,224,131,176,105,45,220,31,195,147,2,146,
+175,193,170,92,11,125,70,94,231,223,32,67,80,23,226,220,
+186,95,199,111,191,63,127,122,201,223,141,235,109,152,13,193,
+255,106,104,171,32,234,209,142,117,150,84,6,100,163,119,180,
+3,190,90,217,14,173,98,73,220,117,80,48,61,171,81,0,
+158,6,194,71,98,71,77,45,44,134,67,141,209,149,48,83,
+85,174,11,184,66,171,187,53,218,46,78,43,7,119,108,59,
+156,136,120,4,167,197,80,234,88,181,54,237,3,90,97,5,
+148,118,24,75,254,24,188,181,149,245,222,96,242,44,108,101,
+128,10,160,217,162,4,226,30,145,18,182,65,42,53,154,23,
+232,117,53,117,174,15,4,146,104,98,36,146,222,218,53,203,
+227,84,9,73,205,95,209,236,182,61,137,21,45,24,82,136,
+61,24,42,166,114,33,240,144,164,89,173,168,5,49,6,200,
+135,15,34,175,169,29,98,141,148,165,235,54,120,188,103,67,
+11,153,212,29,229,129,201,187,10,252,46,58,107,30,67,244,
+128,242,252,170,69,69,163,100,12,242,239,195,188,217,216,205,
+2,80,160,183,22,251,3,33,243,143,21,148,19,59,232,0,
+152,235,169,1,49,49,2,175,47,52,245,188,69,142,93,183,
+49,143,118,236,148,213,168,176,103,142,151,20,43,204,146,175,
+249,167,22,222,217,166,57,85,225,213,63,15,147,229,255,210,
+223,2,164,47,136,2,184,29,26,102,22,14,95,244,157,105,
+61,162,48,111,55,8,89,87,129,177,209,239,249,210,5,1,
+133,1,71,106,11,76,6,9,211,12,8,195,232,32,192,95,
+112,4,43,219,117,174,187,120,1,204,239,216,186,126,160,54,
+111,32,184,134,226,157,174,3,184,196,73,128,58,97,101,119,
+88,96,29,45,0,219,133,135,158,198,132,31,192,244,184,130,
+63,28,87,230,116,92,215,227,142,136,219,149,22,206,201,162,
+8,10,195,27,110,231,163,163,184,182,169,77,8,29,183,193,
+73,142,70,12,77,86,28,18,13,150,236,158,118,58,152,8,
+206,135,14,148,244,144,87,235,176,43,90,228,213,132,213,8,
+251,152,56,100,179,180,225,164,65,46,190,78,243,2,222,112,
+174,159,95,173,72,168,61,118,109,2,208,208,47,77,253,119,
+4,142,13,96,195,156,35,7,55,67,211,68,153,78,216,223,
+70,29,217,58,140,73,218,55,239,80,223,97,200,157,111,168,
+158,112,112,56,46,18,132,131,151,243,231,246,64,133,27,96,
+72,174,227,58,27,185,37,78,70,70,162,183,19,82,46,14,
+197,133,110,192,156,240,196,84,164,5,158,200,67,29,15,52,
+227,142,12,135,243,201,179,42,191,167,208,207,77,111,60,27,
+223,166,53,142,190,66,143,16,207,142,6,80,36,113,240,67,
+104,98,140,130,229,151,224,142,221,72,43,14,113,87,29,176,
+61,108,111,66,59,12,230,112,139,185,28,150,35,137,119,59,
+116,56,195,217,35,128,212,178,85,216,248,161,11,214,33,185,
+56,228,150,14,81,208,138,246,103,179,169,91,162,145,86,58,
+187,118,13,249,167,170,24,253,133,244,11,103,158,160,106,132,
+63,74,228,249,224,120,42,240,136,242,8,200,11,129,178,249,
+119,241,218,217,7,12,250,168,250,195,116,27,101,75,102,227,
+228,62,232,166,35,136,58,91,185,135,22,119,113,192,69,229,
+141,167,3,90,112,141,51,97,35,132,153,59,66,135,16,214,
+108,162,234,240,169,143,182,199,73,127,162,223,145,91,215,226,
+140,189,198,65,123,213,236,35,166,134,14,28,209,24,101,61,
+175,33,194,49,240,22,199,107,20,3,242,185,113,199,253,23,
+218,17,48,61,180,113,214,80,240,93,132,128,206,41,109,253,
+137,246,198,17,113,201,238,255,13,38,126,64,0,
\ No newline at end of file
diff --git a/uppsrc/Core/srcdoc.tpp/all.i b/uppsrc/Core/srcdoc.tpp/all.i
new file mode 100644
index 000000000..c5ef6af36
--- /dev/null
+++ b/uppsrc/Core/srcdoc.tpp/all.i
@@ -0,0 +1,72 @@
+TOPIC("Configuration$en-us")
+#include "Configuration$en-us.tpp"
+END_TOPIC
+
+TOPIC("i18n$en-us")
+#include "i18n$en-us.tpp"
+END_TOPIC
+
+TOPIC("Moveable$en-us")
+#include "Moveable$en-us.tpp"
+END_TOPIC
+
+TOPIC("NTL$en-us")
+#include "NTL$en-us.tpp"
+END_TOPIC
+
+TOPIC("NTLvsSTL$en-us")
+#include "NTLvsSTL$en-us.tpp"
+END_TOPIC
+
+TOPIC("pick_$en-us")
+#include "pick_$en-us.tpp"
+END_TOPIC
+
+TOPIC("std$en-us")
+#include "std$en-us.tpp"
+END_TOPIC
+
+TOPIC("UserValue$en-us")
+#include "UserValue$en-us.tpp"
+END_TOPIC
+
+TOPIC("PickTypes$en-us")
+#include "PickTypes$en-us.tpp"
+END_TOPIC
+
+TOPIC("Decisions$en-us")
+#include "Decisions$en-us.tpp"
+END_TOPIC
+
+TOPIC("Charset$en-us")
+#include "Charset$en-us.tpp"
+END_TOPIC
+
+TOPIC("BRC$en-us")
+#include "BRC$en-us.tpp"
+END_TOPIC
+
+TOPIC("DLI$en-us")
+#include "DLI$en-us.tpp"
+END_TOPIC
+
+TOPIC("Packages$en-us")
+#include "Packages$en-us.tpp"
+END_TOPIC
+
+TOPIC("Tutorial$en-us")
+#include "Tutorial$en-us.tpp"
+END_TOPIC
+
+TOPIC("CoreTutorial$en-us")
+#include "CoreTutorial$en-us.tpp"
+END_TOPIC
+
+TOPIC("Caveats$en-us")
+#include "Caveats$en-us.tpp"
+END_TOPIC
+
+TOPIC("Translating$en-us")
+#include "Translating$en-us.tpp"
+END_TOPIC
+
diff --git a/uppsrc/Core/srcdoc.tpp/i18n$en-us.tpp b/uppsrc/Core/srcdoc.tpp/i18n$en-us.tpp
new file mode 100644
index 000000000..6257be4eb
--- /dev/null
+++ b/uppsrc/Core/srcdoc.tpp/i18n$en-us.tpp
@@ -0,0 +1,14 @@
+TITLE("Internationalization and translation files")
+COMPRESSED
+120,156,133,88,235,118,219,198,17,126,149,109,228,214,146,67,49,216,11,110,100,154,147,68,182,19,183,174,147,198,206,241,105,85,29,19,2,150,34,34,16,96,176,128,100,53,39,126,143,254,236,3,244,41,122,242,94,253,102,23,32,9,144,77,172,99,137,36,102,231,242,205,204,55,179,188,20,236,209,35,111,226,157,120,191,241,111,246,84,47,147,182,104,174,46,11,17,69,243,60,244,212,60,225,225,252,155,120,254,225,195,135,105,28,139,57,169,226,80,197,61,37,185,224,92,121,158,18,33,247,99,47,246,35,30,121,50,84,194,15,61,127,182,73,234,100,125,117,153,68,114,254,228,187,0,167,196,196,63,145,92,114,143,7,66,65,202,147,158,80,92,248,60,138,20,15,253,72,198,65,48,75,147,77,147,87,229,213,229,53,157,35,99,18,199,188,48,10,20,199,33,229,11,25,250,10,135,149,226,28,175,185,31,6,97,56,107,242,166,208,56,196,131,112,158,40,49,191,160,147,106,18,156,192,61,17,226,168,18,42,80,50,18,146,71,66,4,177,84,177,130,223,92,204,242,70,
+195,203,107,156,161,115,116,204,135,65,229,43,46,1,136,10,125,9,177,16,127,149,23,115,1,171,145,231,251,48,168,223,247,40,17,64,116,46,128,57,17,250,36,29,169,136,203,48,18,74,4,2,14,120,33,162,36,235,254,44,211,38,197,57,41,248,188,129,75,243,139,207,253,57,199,225,112,18,158,8,47,246,68,16,198,48,8,103,17,176,140,99,46,35,24,84,220,247,184,156,165,85,70,65,10,223,147,214,98,132,60,4,208,108,49,241,3,14,135,133,140,96,50,228,82,226,183,175,162,112,102,52,101,162,169,234,171,203,39,159,159,122,83,111,42,124,255,140,142,199,56,30,73,37,165,10,98,197,61,9,51,208,161,8,175,192,67,46,185,47,162,217,117,98,96,179,81,132,172,69,149,83,33,1,120,25,249,18,166,3,252,66,82,17,160,4,54,34,86,145,148,145,55,75,139,196,152,61,128,158,80,144,156,79,56,63,9,9,87,95,10,21,19,56,82,0,96,17,248,49,7,194,126,160,60,49,171,245,143,109,94,235,181,46,1,113,142,218,152,247,233,233,234,16,206,184,
+58,20,19,46,80,137,126,16,120,132,151,143,106,16,210,7,224,30,143,20,60,194,15,82,220,116,165,120,189,139,65,78,184,60,137,133,146,240,36,86,10,8,64,1,143,57,231,94,132,31,68,6,92,108,109,112,184,96,131,112,230,221,113,53,225,234,36,68,13,35,83,177,34,243,177,36,252,4,224,23,129,231,35,15,194,29,23,132,186,120,4,220,185,136,232,191,69,158,251,19,142,102,128,139,220,247,17,183,4,212,34,66,236,62,176,151,182,190,121,24,205,94,233,123,243,52,105,116,87,48,79,46,30,185,74,227,193,132,7,39,30,157,247,163,24,9,228,138,240,147,74,197,34,150,210,23,177,47,3,15,56,26,215,203,116,152,250,201,246,226,86,73,56,225,33,58,11,177,250,62,162,183,199,16,121,200,201,21,17,197,1,161,208,41,89,156,23,121,73,126,160,50,230,174,24,158,92,124,204,121,72,138,34,52,76,20,5,158,140,1,6,48,240,124,84,58,216,32,66,162,145,103,129,54,32,58,72,111,147,27,189,56,239,90,245,243,83,2,100,87,140,60,182,197,28,133,
+104,189,16,201,132,43,136,197,15,225,90,164,130,80,160,60,124,53,251,235,155,231,236,98,133,82,254,233,221,207,191,127,246,234,252,251,215,236,210,136,57,123,81,54,186,46,19,162,142,164,200,255,105,95,176,164,204,88,83,39,165,41,220,251,101,94,104,243,135,171,75,227,205,217,155,138,229,195,51,154,61,84,109,205,146,205,166,200,83,251,233,132,62,97,165,214,80,83,177,77,93,221,229,153,102,119,186,54,120,104,88,181,100,166,169,243,242,134,21,200,116,157,20,6,42,89,82,20,172,43,224,140,21,73,121,211,34,106,51,133,135,236,251,197,199,139,143,157,210,52,41,89,86,177,102,149,27,214,26,210,113,224,232,180,243,116,231,240,58,169,111,15,76,46,171,122,112,22,46,24,196,145,106,227,44,173,146,59,77,238,55,9,108,172,244,154,221,231,205,138,53,139,119,80,151,214,213,4,154,110,245,158,169,112,142,72,1,205,242,20,50,167,139,143,190,214,69,81,177,251,170,46,178,223,45,62,58,59,155,143,220,162,8,172,38,134,23,250,253,6,160,59,188,150,109,153,
+90,143,154,85,210,244,232,153,129,175,64,240,89,121,83,228,102,197,78,215,85,173,153,217,232,52,95,2,254,162,120,96,186,92,32,191,103,140,168,150,20,102,110,54,109,65,101,70,55,236,250,129,189,214,205,203,254,163,222,232,148,189,30,224,196,86,26,234,225,97,138,204,193,143,218,249,120,173,9,19,118,171,31,14,112,44,170,234,182,221,76,93,210,152,105,55,155,170,110,224,254,170,214,154,132,215,182,0,112,210,88,221,179,1,44,57,248,122,254,13,222,110,138,4,9,177,82,9,28,248,161,53,77,23,151,13,11,117,241,236,125,178,222,20,122,198,142,194,61,82,7,239,45,26,86,161,13,5,250,224,70,255,57,85,252,158,122,214,113,63,130,5,78,139,127,220,77,216,189,5,226,186,66,13,144,67,120,220,244,129,28,248,130,174,184,41,113,234,77,181,129,43,83,151,107,91,176,122,217,22,84,105,41,134,131,33,157,229,214,5,60,167,142,25,246,204,30,176,211,81,72,121,118,16,13,62,250,141,64,146,9,187,110,33,91,162,76,32,237,124,194,41,99,83,9,199,
+142,101,114,20,221,69,83,23,23,40,186,239,52,101,22,58,187,23,20,233,176,198,95,172,233,65,82,54,246,168,237,36,234,95,20,143,181,106,27,106,220,150,228,218,168,131,183,61,215,181,137,25,116,9,213,252,175,183,202,77,126,7,156,59,11,83,246,214,102,178,233,114,82,86,200,126,154,234,77,147,92,23,154,157,82,87,91,58,170,235,228,193,102,184,119,237,108,194,154,99,97,44,206,89,222,140,155,184,111,159,164,168,74,237,8,149,92,236,206,193,55,93,83,230,192,137,148,27,199,100,95,161,31,203,155,174,255,108,192,99,42,219,197,229,218,194,96,59,193,113,184,59,109,28,249,145,195,181,190,105,139,164,102,221,228,64,175,60,71,219,37,182,68,108,216,36,73,14,163,48,128,5,51,57,165,119,23,7,209,67,223,162,203,10,109,117,239,202,103,4,171,125,142,80,143,145,246,159,169,154,136,214,155,186,202,218,212,157,127,179,120,55,217,87,50,120,227,2,26,30,128,119,121,189,163,45,218,226,64,206,122,122,51,198,197,214,229,107,228,254,30,57,219,118,63,75,
+205,197,223,241,224,85,194,126,249,247,127,255,243,203,191,110,219,221,179,238,207,203,129,114,75,102,149,5,101,27,12,50,241,64,57,91,86,109,105,161,166,218,159,216,226,165,126,1,11,22,105,158,77,155,247,46,3,236,116,43,72,207,94,110,213,24,109,235,245,108,236,251,74,191,120,250,108,87,187,107,13,72,172,31,235,164,204,55,45,161,131,114,216,230,151,178,84,178,183,85,125,107,144,95,13,249,178,37,75,142,165,129,194,67,153,174,234,170,164,185,124,48,26,23,31,177,106,131,186,116,76,111,105,105,251,158,153,148,44,83,55,185,57,184,43,168,180,173,107,236,148,228,228,15,136,194,150,243,117,155,23,25,129,179,177,101,229,250,226,6,121,27,55,180,171,125,75,116,235,107,236,66,166,107,189,114,105,139,146,44,91,34,72,202,7,118,7,230,204,118,177,230,244,2,253,126,224,42,244,86,228,105,117,15,253,89,70,246,74,125,191,151,51,148,101,175,101,76,38,211,78,57,149,91,82,80,193,16,160,223,191,121,30,129,56,81,5,80,54,101,180,53,164,43,168,115,
+115,174,127,96,243,98,183,29,210,177,219,72,234,252,102,133,85,47,197,2,116,203,42,151,121,215,100,101,151,224,137,197,193,232,130,240,91,60,190,112,173,79,126,110,141,78,167,139,199,176,252,170,106,180,35,139,124,105,13,128,100,216,91,192,64,193,210,195,77,98,25,198,216,253,164,55,4,6,71,8,139,243,200,57,69,53,219,239,95,148,16,36,9,180,79,210,95,126,243,23,167,189,87,73,162,118,215,201,203,180,104,65,95,19,230,130,180,79,192,105,186,206,225,35,117,200,122,147,23,132,130,174,235,170,62,216,179,92,33,219,212,172,49,188,27,252,31,82,113,141,57,97,114,80,214,67,199,53,150,190,12,251,226,229,203,33,19,184,232,27,212,182,110,44,137,84,59,222,194,56,74,82,236,97,249,90,247,41,182,156,181,43,123,4,208,249,130,192,93,45,208,22,130,137,71,181,189,206,205,120,109,132,226,186,90,239,187,71,185,114,53,150,101,174,37,246,227,208,239,49,111,73,199,142,119,217,53,184,214,145,97,175,100,55,246,137,176,216,77,173,17,148,157,248,166,130,
+239,93,143,209,18,88,221,185,68,37,165,163,158,142,183,71,248,186,125,202,122,181,93,170,234,182,164,123,193,90,15,195,57,77,168,89,172,35,118,133,117,153,211,157,104,223,24,24,215,127,235,234,151,74,108,113,190,56,71,182,105,146,159,55,181,29,129,232,200,206,234,110,183,183,179,183,34,215,83,138,168,155,5,112,100,236,70,199,134,182,183,167,80,136,109,68,151,198,50,32,251,150,238,149,26,4,97,118,51,169,192,88,197,95,197,10,221,52,122,68,251,174,123,128,57,84,118,207,209,158,117,146,210,43,154,87,219,14,197,44,175,106,251,202,170,181,83,125,184,99,210,31,246,211,79,184,232,122,179,8,215,178,79,165,244,230,159,241,208,15,231,75,53,95,241,57,110,70,60,158,255,241,130,45,222,93,205,102,204,158,105,155,37,154,203,189,117,15,189,237,179,123,215,73,139,115,92,230,189,125,17,126,84,132,239,139,136,163,34,98,95,68,30,21,145,251,34,234,168,136,218,23,241,143,138,248,251,34,193,81,145,96,95,36,60,42,18,238,139,124,177,21,201,77,5,204,
+34,63,134,208,190,196,151,199,36,6,33,95,28,147,24,68,252,244,152,196,32,224,103,199,36,6,241,62,63,38,49,8,247,171,99,18,131,104,191,62,38,49,168,147,23,199,36,226,125,137,63,29,69,204,187,250,249,231,97,221,234,110,15,31,94,58,105,73,202,14,218,23,60,174,197,240,248,125,14,30,179,77,171,221,99,234,74,215,164,57,145,26,62,197,26,151,90,2,68,251,98,62,72,97,251,110,241,225,147,105,103,5,159,127,11,90,121,127,6,162,75,178,195,203,159,189,109,130,121,243,114,88,207,184,198,47,15,183,189,164,112,90,54,152,2,216,47,38,20,203,131,91,108,137,176,115,59,139,136,18,239,115,163,217,214,93,186,49,217,225,162,215,155,230,161,91,56,236,20,199,173,17,196,84,13,77,141,120,212,142,143,67,90,195,152,115,151,83,163,147,26,18,20,89,111,17,222,210,176,194,149,175,221,88,68,90,99,215,24,189,182,3,156,136,45,235,191,21,25,142,10,75,63,99,15,118,106,187,235,128,37,245,220,94,150,220,36,216,110,64,238,98,224,198,217,226,
+49,237,119,238,78,117,140,112,177,220,109,47,69,128,96,184,34,78,247,246,10,199,183,189,104,86,233,238,22,148,101,255,127,139,162,137,109,47,225,118,34,14,167,117,181,119,4,143,17,2,86,215,150,190,138,24,5,254,150,166,223,120,206,152,221,101,144,118,148,77,63,26,38,180,1,56,65,55,130,135,83,108,239,178,49,186,94,187,221,217,45,32,9,45,46,155,182,198,44,60,72,3,13,63,219,19,253,162,212,45,64,110,169,178,247,158,110,200,211,21,174,90,186,197,175,243,34,235,96,57,181,200,177,21,234,88,215,103,163,214,60,201,52,246,87,205,62,133,169,250,91,183,60,127,66,175,247,47,114,211,230,179,94,188,119,224,83,186,98,124,210,76,87,159,141,58,216,174,249,139,199,191,174,110,241,152,221,87,109,145,217,202,2,158,244,173,85,229,156,31,46,61,180,77,29,124,87,70,195,116,252,125,30,85,222,118,28,219,101,204,94,125,107,250,124,252,229,210,196,214,209,16,66,90,120,156,239,232,173,194,126,207,112,204,4,40,40,109,233,205,8,198,197,108,182,247,
+85,213,41,189,199,85,249,245,131,105,244,250,229,171,175,78,207,216,248,203,181,171,255,1,18,9,70,95,
diff --git a/uppsrc/Core/srcdoc.tpp/pick_$en-us.tpp b/uppsrc/Core/srcdoc.tpp/pick_$en-us.tpp
new file mode 100644
index 000000000..cc34c666f
--- /dev/null
+++ b/uppsrc/Core/srcdoc.tpp/pick_$en-us.tpp
@@ -0,0 +1,22 @@
+TITLE("Transfer semantics")
+COMPRESSED
+120,156,237,91,249,115,227,198,177,254,87,38,165,125,94,138,166,40,156,60,215,126,94,107,157,196,85,206,218,21,107,147,74,169,96,3,4,71,34,178,32,192,224,16,69,95,127,251,251,186,103,6,0,15,201,90,199,63,189,68,182,119,41,98,166,239,233,175,187,7,190,113,196,139,23,214,192,58,179,126,229,103,246,70,222,70,117,90,5,55,169,51,153,204,147,177,229,205,35,123,60,255,122,58,255,229,151,95,134,211,169,51,39,82,54,72,217,150,231,218,142,109,123,150,229,57,99,219,159,90,83,127,98,79,44,119,236,57,254,216,242,103,155,168,136,214,193,77,52,113,231,253,191,142,176,203,25,248,103,174,237,218,150,61,114,60,172,178,92,203,241,108,199,183,39,19,207,30,251,19,119,58,26,205,226,104,83,37,121,22,220,44,104,31,49,115,177,205,26,79,70,158,141,77,158,239,184,99,223,195,102,207,179,109,124,182,253,241,104,60,158,85,73,149,74,108,178,71,227,121,228,57,243,43,218,233,13,70,103,16,207,25,99,171,231,120,35,207,157,56,174,61,113,156,209,212,
+245,166,30,228,182,157,89,82,73,72,185,192,30,218,71,219,124,48,244,124,207,118,97,16,111,236,187,88,54,198,223,158,53,181,29,112,157,88,190,15,134,242,193,88,137,12,68,251,70,96,231,140,125,90,61,241,38,182,59,158,56,158,51,114,32,128,53,134,150,196,221,159,45,101,25,99,159,235,216,243,10,34,205,175,62,243,231,54,54,143,7,227,51,199,154,90,206,104,60,5,67,8,11,133,221,233,212,118,39,96,232,217,190,101,187,179,56,95,146,146,142,111,185,204,113,2,63,140,64,153,109,226,143,108,8,236,184,19,176,28,219,174,139,63,125,111,50,158,149,146,60,81,229,69,112,211,255,172,103,13,173,161,227,251,231,180,125,138,237,19,215,115,93,111,52,245,108,203,5,27,208,240,200,94,35,11,190,180,125,103,50,91,68,37,120,86,30,89,150,173,106,83,32,193,240,238,196,119,193,122,132,63,224,84,40,232,194,54,206,212,155,184,238,196,154,197,105,84,150,29,3,245,73,73,219,30,216,246,217,152,236,234,187,142,55,37,227,184,14,12,236,140,252,169,13,11,
+251,35,207,114,102,133,252,87,157,20,114,45,51,152,56,65,108,204,141,123,116,28,66,24,21,135,206,192,118,16,137,254,104,100,145,189,124,68,131,227,250,48,184,101,79,60,72,132,127,224,226,74,135,226,162,213,193,29,216,238,217,212,241,92,72,50,245,60,88,0,4,236,169,109,219,214,4,255,64,51,216,133,99,195,134,8,172,132,98,175,182,123,3,219,59,27,35,134,225,169,169,71,236,167,46,217,207,129,249,157,145,229,195,15,142,218,238,144,213,157,23,176,187,237,76,232,63,182,188,237,15,108,28,6,136,104,251,62,244,118,97,106,103,2,221,125,216,222,229,248,182,199,147,217,91,185,45,223,68,149,212,1,211,191,122,161,34,205,30,13,236,209,153,69,251,253,201,20,14,180,61,178,159,235,121,83,103,234,186,190,51,245,221,145,5,59,150,234,44,211,102,58,79,124,22,27,34,227,129,61,198,201,130,174,190,15,237,121,27,52,31,219,36,138,51,153,142,200,10,154,72,120,145,38,25,201,129,200,152,171,96,232,95,125,108,219,99,34,52,193,129,153,76,70,150,59,
+133,49,96,3,203,71,164,35,27,76,224,104,248,217,193,49,160,116,16,191,143,238,100,120,161,143,234,143,223,255,252,63,95,188,189,120,247,173,184,41,157,185,184,46,162,172,188,149,133,40,229,58,202,170,36,46,63,10,110,74,127,126,249,93,149,111,146,56,156,133,151,225,229,85,94,200,240,178,44,226,101,30,135,151,223,36,241,251,235,221,70,150,225,11,153,133,23,117,249,157,184,249,238,59,241,173,148,34,74,203,124,38,2,90,33,62,151,171,232,62,201,235,66,124,241,176,73,35,168,177,36,210,238,92,188,145,114,35,226,124,179,59,100,42,174,163,244,125,146,221,137,104,145,215,149,168,142,100,27,136,45,152,20,82,36,89,37,97,161,74,46,241,81,108,16,243,180,237,62,74,107,89,138,219,34,95,139,60,147,2,108,99,41,170,92,68,89,94,173,100,49,16,114,120,71,172,198,115,248,198,154,19,25,17,13,196,98,222,253,50,18,225,39,250,43,136,244,103,240,33,174,141,48,32,164,24,137,252,22,31,138,36,90,164,82,220,244,197,34,32,86,221,111,162,96,40,
+254,46,197,50,199,166,164,20,139,157,168,89,78,34,145,172,55,105,18,39,224,15,217,239,50,58,116,34,223,72,206,24,68,185,130,133,137,6,68,28,6,226,154,246,159,90,73,170,67,229,70,160,18,6,87,58,87,81,113,39,43,177,93,37,16,102,3,99,201,226,190,49,82,187,116,168,104,195,236,75,102,123,100,115,82,62,142,210,20,194,92,138,165,113,29,52,251,35,216,167,196,68,100,245,122,33,27,169,225,165,102,153,0,233,187,60,95,138,120,149,39,144,43,42,241,140,161,238,4,167,161,248,115,190,149,247,202,198,133,114,52,19,132,18,244,123,71,9,173,38,168,195,179,88,30,85,100,208,188,168,34,242,40,84,89,22,249,102,163,108,141,69,183,50,170,106,80,88,129,127,180,188,199,34,28,9,240,187,202,179,50,89,50,67,172,42,201,39,82,132,47,227,28,11,16,176,69,248,82,5,134,224,180,42,190,204,170,215,69,17,237,68,248,163,254,254,226,39,10,161,56,175,179,106,190,247,85,216,143,104,101,251,229,125,158,44,193,111,179,235,129,122,89,53,180,194,
+143,4,14,214,121,151,228,197,79,145,226,242,137,200,228,150,34,32,188,97,22,244,13,22,15,249,151,48,152,119,118,172,229,58,6,109,222,56,224,69,250,163,222,216,135,118,63,200,252,182,7,106,231,231,237,206,240,103,253,113,83,47,16,143,179,174,18,16,205,196,89,120,19,6,180,85,36,231,66,255,132,63,138,66,194,170,153,96,78,225,77,2,137,68,67,79,153,65,252,73,86,87,36,65,239,92,40,189,143,183,43,235,117,119,26,219,48,199,172,225,216,238,108,172,145,205,197,177,173,178,3,65,26,114,143,89,94,249,133,126,57,185,175,107,135,79,78,19,105,246,136,39,127,192,106,41,83,89,73,178,167,146,124,222,50,239,242,14,127,105,164,62,212,255,81,66,205,246,240,103,157,189,250,148,65,248,124,151,171,124,91,210,105,74,112,150,57,249,48,206,71,84,244,209,193,109,66,94,135,250,54,169,86,157,99,124,234,176,190,205,183,236,83,62,64,72,18,91,58,123,72,60,72,251,56,187,226,182,206,98,166,142,12,20,175,180,179,113,252,50,17,24,213,180,184,205,
+177,250,75,244,94,238,57,190,115,40,154,69,81,47,235,196,239,109,94,168,184,164,8,160,140,46,94,81,80,36,225,199,225,199,231,221,19,197,241,73,139,146,118,179,137,223,121,99,55,157,244,41,131,148,192,179,45,37,150,85,180,217,72,72,158,220,146,150,117,41,117,78,209,250,29,42,193,177,216,106,66,197,225,185,1,147,111,138,28,208,176,22,156,206,64,131,19,23,92,100,54,7,202,218,28,98,69,29,83,130,223,38,72,189,11,66,188,251,252,61,224,14,6,86,107,10,228,52,252,190,183,155,210,190,164,60,24,21,59,145,47,254,41,99,149,13,205,38,22,252,104,69,11,22,32,70,153,189,247,109,190,150,240,24,178,254,78,165,239,43,178,39,104,172,55,64,147,162,20,235,228,110,85,9,153,194,247,148,172,97,147,67,193,75,2,230,110,90,141,81,208,2,106,9,215,155,236,206,168,204,79,76,142,231,29,58,173,111,114,0,30,236,117,62,20,175,161,4,97,144,226,101,226,50,193,54,34,179,142,150,12,121,26,32,228,62,70,211,47,26,47,140,194,140,23,4,
+69,144,54,223,193,138,255,172,113,166,169,100,64,73,177,1,170,161,186,128,225,118,219,104,55,20,186,106,225,162,230,176,96,249,146,99,98,153,103,225,75,4,172,84,254,217,19,67,115,86,210,16,148,230,117,186,84,54,217,25,167,168,98,65,185,16,137,220,96,233,177,220,57,127,169,157,197,65,10,71,225,100,139,101,82,194,60,244,129,179,2,217,30,36,219,36,18,156,36,168,236,138,181,183,81,92,113,109,133,176,144,144,139,53,233,90,185,155,33,74,93,50,36,228,179,29,237,226,19,143,83,88,228,203,58,230,152,188,20,72,52,239,131,155,75,33,130,83,185,227,43,200,95,151,8,177,109,129,106,125,63,136,57,245,36,213,111,65,94,208,89,215,21,149,95,129,56,70,225,190,129,97,114,101,143,4,12,191,127,20,135,251,156,54,142,97,119,222,125,220,96,79,3,184,123,143,155,111,105,201,219,119,95,125,213,121,250,31,5,188,240,139,50,119,112,10,125,241,148,60,18,60,23,129,31,167,246,124,24,166,202,250,86,149,75,231,34,56,194,210,103,18,18,42,148,62,
+28,188,187,236,131,103,65,185,248,59,29,139,205,94,18,26,32,77,138,58,203,100,44,203,146,18,58,229,19,42,122,113,52,57,39,82,138,208,29,211,109,33,57,71,18,126,149,53,0,185,69,252,168,52,17,193,89,10,61,139,130,189,146,214,3,122,164,233,223,26,220,10,95,182,62,8,95,82,62,160,234,92,97,155,129,53,5,25,38,49,161,251,65,135,193,5,185,134,31,74,43,160,159,33,119,94,168,8,45,36,178,132,204,160,140,8,47,20,110,233,68,93,103,192,249,170,206,144,151,145,157,56,89,115,34,92,17,65,40,104,50,47,58,45,18,113,64,42,117,190,142,87,81,118,183,151,142,91,12,84,154,99,29,119,141,109,217,50,212,10,104,233,243,12,140,185,167,100,80,74,210,164,218,9,8,213,161,164,140,197,13,217,146,20,184,79,34,113,160,216,80,124,94,87,186,9,60,120,68,105,152,187,218,91,234,89,183,140,18,11,238,121,42,112,90,39,229,93,157,176,253,90,5,201,56,140,62,100,162,127,213,148,72,209,244,228,37,125,0,127,2,27,165,56,207,97,
+16,97,5,121,74,89,84,103,238,165,140,1,225,100,36,29,111,103,104,207,18,82,83,101,71,22,82,7,224,63,168,179,99,124,166,232,45,3,250,11,205,26,154,218,187,116,23,40,104,223,119,148,1,243,133,36,116,229,1,163,114,41,121,34,174,139,130,90,89,101,102,68,207,61,36,97,108,49,213,129,188,37,98,28,37,13,184,40,193,46,128,82,92,253,40,5,185,214,32,215,113,147,7,153,74,93,213,50,109,37,25,249,42,3,64,26,184,2,209,52,193,223,140,54,36,232,176,139,243,49,150,68,149,65,121,170,116,83,133,88,105,158,191,231,145,195,222,65,4,169,170,66,141,179,64,63,79,176,73,150,254,58,51,1,74,173,251,6,62,32,109,225,23,212,145,145,106,239,87,157,118,152,9,158,154,120,80,208,181,103,49,142,106,152,177,230,114,41,107,34,233,160,102,164,127,155,116,121,88,159,70,71,245,105,83,78,55,107,22,180,38,154,139,203,75,241,250,250,250,139,183,215,95,126,253,118,134,157,92,152,109,89,86,24,255,15,122,27,106,107,87,213,214,182,69,123,
+80,177,202,59,116,25,127,48,83,29,10,3,249,16,113,25,168,26,17,82,170,211,176,151,27,42,111,224,176,3,179,86,58,196,85,209,93,228,245,221,138,6,67,52,84,162,153,44,68,186,165,74,109,33,201,12,74,170,65,103,26,161,140,128,88,208,148,98,52,31,116,166,112,200,242,98,13,13,16,37,237,36,33,77,214,56,57,203,33,204,32,214,121,89,169,186,116,160,142,62,167,1,218,209,146,108,171,216,198,214,106,244,32,141,35,134,226,175,168,161,59,149,147,136,150,170,102,3,3,108,236,81,215,68,245,189,142,126,42,176,215,144,41,77,74,182,198,9,166,92,154,158,171,144,238,124,29,197,4,1,100,5,248,158,15,5,125,94,70,85,100,172,74,100,116,67,64,98,167,40,109,203,38,59,67,107,83,208,118,138,193,85,132,162,219,76,110,88,91,74,203,41,4,192,249,166,179,131,168,46,242,136,177,68,167,43,4,169,46,109,169,6,174,246,82,110,174,52,55,1,95,162,249,100,138,140,70,17,159,225,178,90,134,179,25,66,60,15,191,223,84,69,59,16,42,233,
+79,152,114,39,163,130,171,209,77,1,41,19,149,54,213,41,56,12,157,168,166,22,165,214,174,127,194,64,250,52,183,6,162,243,154,114,4,104,51,201,162,200,11,246,109,93,214,220,20,173,162,130,145,165,220,228,220,55,12,197,183,57,153,76,117,34,43,130,65,125,8,58,16,76,211,81,240,150,49,207,56,41,33,177,234,105,126,151,196,138,7,27,97,41,23,245,29,2,100,41,77,74,250,154,83,39,136,53,13,121,39,49,153,132,134,108,153,196,9,229,24,200,220,29,229,21,157,209,40,101,59,58,65,166,80,224,73,100,198,30,77,149,53,116,118,222,20,100,92,80,65,223,25,161,205,131,195,245,242,131,14,130,0,141,145,72,181,199,10,184,210,228,253,126,67,102,78,89,166,98,128,79,214,255,66,124,83,53,12,212,148,49,51,209,67,231,164,27,105,64,175,85,190,44,21,226,114,191,116,169,1,165,107,21,180,174,239,50,230,157,225,124,119,159,176,27,14,139,39,213,113,210,76,149,167,131,28,87,134,17,249,107,153,196,21,163,204,98,167,81,170,167,11,146,193,225,
+153,63,76,193,56,161,43,61,56,38,173,112,134,114,164,176,12,40,188,199,5,86,41,101,122,79,176,247,154,187,205,1,26,31,142,63,213,118,35,39,68,28,102,72,147,75,132,92,242,131,138,46,30,43,99,39,60,0,241,122,108,21,2,148,107,83,1,95,235,49,213,117,248,209,128,28,124,174,3,70,129,8,187,209,168,109,58,195,211,38,237,42,165,166,217,6,61,145,59,40,38,234,164,164,110,77,149,79,108,225,46,18,221,244,63,243,33,140,174,38,32,13,170,93,125,34,200,46,84,186,84,42,193,46,216,233,60,252,239,214,43,95,86,109,114,65,67,206,128,170,178,31,181,40,20,76,28,124,20,103,107,4,82,137,175,210,154,11,13,50,10,138,161,234,54,121,104,189,5,39,178,18,124,20,185,60,60,161,114,59,103,31,128,28,201,154,35,251,164,121,180,52,214,237,244,35,175,94,53,51,65,82,207,12,144,202,167,108,106,246,6,67,115,130,201,24,136,124,192,128,100,116,51,51,147,131,169,28,87,66,113,90,47,229,41,178,123,195,137,15,109,157,117,223,124,162,
+109,254,144,174,249,233,166,249,233,158,249,201,150,185,211,49,243,80,243,226,167,224,185,19,245,131,86,253,57,35,245,254,111,159,169,255,199,245,246,143,70,68,219,27,63,163,167,63,77,229,249,253,124,219,204,255,158,189,124,255,215,110,15,84,114,125,228,10,161,127,90,219,78,198,56,169,110,255,119,209,247,215,169,136,189,155,135,139,159,62,96,124,241,4,247,71,71,23,39,18,150,41,93,110,235,84,85,201,69,158,118,43,151,223,212,186,244,162,129,176,207,185,119,217,43,151,78,52,42,92,161,233,103,11,65,126,209,77,207,225,198,134,122,220,139,20,105,138,87,67,85,221,23,155,111,169,164,165,38,105,65,56,110,122,146,72,85,9,38,161,31,40,161,203,188,119,89,66,125,137,174,85,25,99,15,234,61,46,182,244,92,3,21,113,198,109,196,225,53,166,233,180,184,179,165,33,190,120,123,253,85,7,74,76,58,250,155,36,136,126,213,42,247,169,120,24,136,230,188,12,241,163,63,146,102,181,66,91,213,209,66,180,221,241,178,7,101,194,221,225,213,57,215,82,208,132,
+230,60,13,188,234,17,136,150,201,180,126,219,163,72,209,155,212,61,112,123,149,223,238,29,138,55,117,209,220,244,54,61,81,99,167,131,49,182,164,126,133,70,81,104,184,80,203,11,169,46,194,232,145,190,253,56,53,204,106,134,73,106,86,175,76,23,116,20,128,100,219,188,208,10,44,32,226,113,9,170,84,224,234,231,73,45,185,64,97,110,40,10,106,29,19,84,211,51,250,211,45,16,139,209,217,182,119,95,180,146,108,159,68,77,240,232,254,175,83,158,4,130,139,178,227,250,48,104,11,66,101,129,166,142,74,74,85,201,171,14,181,218,230,92,167,105,217,205,180,204,148,28,140,201,244,126,7,165,150,43,35,86,143,191,14,251,155,129,104,216,138,135,230,236,94,83,82,233,155,93,111,229,182,119,180,10,209,4,169,143,8,7,173,234,84,51,19,88,117,170,44,246,232,67,96,90,154,187,132,79,140,196,153,225,90,179,160,67,214,91,115,11,70,61,3,191,45,178,255,118,5,19,204,101,137,114,190,195,30,18,62,143,49,143,187,168,117,142,54,162,215,237,75,176,254,124,
+175,246,51,230,53,205,177,158,97,149,186,56,47,101,107,105,29,144,250,90,176,166,97,163,169,255,155,107,91,69,164,149,72,27,154,102,149,52,64,16,175,84,105,120,253,169,126,144,100,244,154,209,135,121,175,91,243,161,105,135,74,189,205,57,2,171,245,107,131,4,207,100,127,253,68,20,116,185,233,18,135,140,126,204,14,145,242,199,125,115,156,6,30,221,104,26,195,211,4,42,65,163,251,3,204,169,141,255,97,33,221,129,242,199,108,211,160,234,3,35,212,35,86,106,235,245,19,198,120,148,75,199,38,79,177,1,202,0,122,116,182,204,238,0,22,81,217,29,38,168,171,89,249,128,222,142,226,154,178,14,93,47,118,161,72,119,254,28,154,156,232,76,184,81,102,123,170,43,105,123,92,206,212,234,10,185,148,200,178,122,200,29,101,89,206,83,9,32,232,46,175,155,78,179,121,91,129,179,79,211,161,211,253,0,126,191,75,243,69,55,19,209,14,186,30,125,74,20,206,213,224,196,47,49,153,113,181,233,189,205,181,51,163,77,93,229,107,224,201,15,250,102,154,115,124,243,
+30,87,39,39,168,17,141,8,232,181,205,211,237,215,236,96,237,43,243,228,211,255,55,157,217,127,95,115,122,178,35,195,247,255,237,200,254,253,219,213,223,222,144,253,238,189,141,206,218,72,158,239,78,39,132,160,5,61,122,125,133,178,218,154,110,47,13,236,112,197,250,212,204,173,185,9,53,100,238,100,70,46,146,116,103,171,110,9,186,9,177,205,130,38,115,209,171,155,59,51,72,190,106,6,223,102,8,127,252,62,11,207,165,245,251,63,37,82,26,201,204,213,104,231,94,237,166,29,107,5,7,21,174,194,220,155,75,195,162,243,124,192,180,168,220,1,229,36,53,239,48,81,218,85,155,250,220,41,26,11,138,192,40,253,1,125,96,151,64,39,195,46,76,223,182,224,222,76,93,188,61,54,55,123,186,77,124,180,73,60,232,3,205,134,240,198,211,196,248,145,190,23,48,151,141,121,186,67,61,186,89,37,241,97,179,199,99,174,22,147,19,117,105,6,76,169,148,157,79,190,172,75,247,16,107,185,255,186,142,186,70,18,37,162,137,239,73,58,44,117,243,131,109,95,12,1,
+134,218,186,234,198,219,172,215,151,34,230,149,100,180,153,168,163,245,117,57,208,174,165,194,207,245,187,65,113,84,211,59,93,148,171,116,43,165,238,119,146,170,214,221,25,93,95,118,94,26,212,161,176,87,68,31,188,166,64,87,218,221,94,140,161,250,132,249,184,203,107,20,251,166,237,228,208,210,220,171,105,126,148,130,221,114,215,125,103,41,232,20,91,123,0,254,57,16,29,224,77,158,234,44,121,69,95,239,33,119,167,17,62,4,153,206,35,32,100,130,138,3,199,157,233,2,177,56,79,117,96,163,69,12,178,30,173,234,133,125,42,62,206,31,205,63,141,172,111,180,115,102,138,250,191,45,221,177,124,251,210,105,126,207,17,240,120,92,192,209,166,237,216,188,130,25,13,95,47,151,61,163,249,249,241,215,154,101,243,164,75,229,228,236,71,215,106,156,81,212,203,117,38,217,209,123,71,251,94,13,110,232,255,141,248,211,231,125,33,204,71,138,113,169,205,171,130,180,84,247,158,155,34,161,136,13,246,27,67,17,52,157,132,10,116,218,206,23,205,88,71,107,2,97,76,172,
+242,54,119,251,177,122,183,145,90,109,115,164,213,83,245,42,221,169,40,15,216,140,200,79,193,255,1,181,139,222,232,
+
diff --git a/uppsrc/Core/srcdoc.tpp/std$en-us.tpp b/uppsrc/Core/srcdoc.tpp/std$en-us.tpp
new file mode 100644
index 000000000..5f8848dec
--- /dev/null
+++ b/uppsrc/Core/srcdoc.tpp/std$en-us.tpp
@@ -0,0 +1,75 @@
+TITLE("NTL and standard library")
+COMPRESSED
+120,156,133,84,93,111,219,54,20,253,43,68,157,13,77,234,
+24,188,252,166,245,210,34,237,128,2,91,10,172,221,246,96,
+4,53,173,48,177,22,89,242,68,58,169,49,44,191,125,135,
+178,147,118,232,195,108,88,17,20,158,123,62,238,189,90,8,
+118,114,194,167,124,194,255,231,51,127,27,111,194,174,205,87,
+139,86,56,87,53,150,171,42,144,173,62,248,234,241,241,113,
+230,189,168,74,41,66,41,226,74,146,32,82,156,43,97,73,
+123,238,181,35,199,165,85,66,91,174,231,219,48,132,205,213,
+34,56,89,157,253,106,128,18,83,61,145,36,137,147,17,10,
+167,184,228,66,145,208,228,156,34,171,157,244,198,204,235,176,
+205,77,223,93,45,86,5,7,148,4,138,91,103,20,1,163,
+180,144,86,43,96,149,34,194,61,105,107,172,157,231,38,183,
+17,24,50,182,10,74,84,23,69,165,154,154,9,212,9,11,
+168,18,202,40,233,132,36,39,132,241,82,121,5,217,36,230,
+77,142,16,185,2,166,224,10,76,131,80,105,69,18,121,40,
+171,37,142,89,252,85,220,147,0,171,227,90,131,48,126,121,
+10,169,228,83,112,6,116,194,234,114,218,41,71,210,58,161,
+132,17,16,192,45,76,22,118,61,191,142,169,6,78,10,170,
+50,36,85,23,175,117,69,0,219,169,157,8,238,185,48,214,
+131,16,98,97,88,122,79,210,129,80,145,230,36,231,117,127,
+93,76,10,205,101,5,140,67,23,12,10,143,145,104,67,208,
+43,164,3,163,37,41,113,213,202,217,121,138,165,15,185,31,
+174,22,103,175,95,242,25,159,9,173,79,139,94,15,184,147,
+74,74,101,188,34,46,193,130,26,170,196,101,56,58,73,90,
+184,249,42,36,80,102,85,130,189,40,157,47,83,132,216,165,
+211,18,204,6,23,116,20,246,36,146,17,94,57,41,29,159,
+215,109,72,233,155,120,206,138,69,162,41,209,196,150,84,181,
+20,202,151,104,164,64,188,194,104,79,200,87,27,197,197,124,
+136,127,237,154,33,110,98,135,128,27,12,70,245,212,156,227,
+16,66,203,97,8,197,148,4,198,80,27,195,75,90,26,179,
+32,164,70,220,156,156,130,34,124,209,224,124,156,195,113,54,
+198,185,32,57,37,57,241,66,73,40,241,74,33,0,20,32,
+79,68,220,225,11,103,136,101,156,12,130,132,209,196,129,254,
+0,87,83,82,19,139,1,70,159,188,42,244,94,150,248,4,
+210,23,134,107,180,65,28,224,162,132,46,78,16,59,9,87,
+126,167,5,175,167,132,69,128,66,210,26,182,37,130,22,14,
+214,53,146,151,227,112,147,117,243,203,248,144,222,134,28,143,
+211,114,118,113,114,24,51,50,83,50,19,94,240,218,121,180,
+143,84,137,79,42,229,133,151,82,11,175,165,225,136,49,29,
+246,184,128,203,46,141,123,248,92,196,78,201,98,173,96,85,
+107,152,31,97,48,110,169,72,17,206,155,18,194,177,200,242,
+188,109,186,162,3,115,81,29,70,225,236,226,21,145,45,133,
+28,182,197,57,195,165,71,22,136,128,107,140,57,222,4,14,
+125,70,155,5,118,160,188,10,234,187,112,27,151,231,199,61,
+253,251,243,63,63,188,187,60,255,237,35,91,36,81,177,203,
+79,63,179,208,93,179,148,113,13,195,53,107,155,213,16,134,
+253,143,87,139,164,43,246,199,186,105,227,120,168,73,236,174,
+193,193,254,134,45,95,132,182,137,29,203,177,94,119,125,219,
+223,238,151,47,216,67,147,215,12,162,183,177,206,44,247,236,
+98,249,106,249,234,187,178,83,214,116,236,38,224,72,147,75,
+201,54,12,183,177,221,227,105,142,195,242,188,223,198,33,172,
+192,56,86,107,242,172,200,192,194,189,199,127,203,34,165,163,
+172,119,161,94,143,170,234,190,203,1,9,13,236,229,8,137,
+95,234,56,190,196,138,206,15,93,60,101,219,161,191,111,176,
+250,168,118,168,193,66,93,199,148,102,236,77,219,62,63,76,
+44,133,220,164,155,61,251,136,170,223,236,65,98,55,128,12,
+112,209,111,142,200,175,160,25,251,180,134,137,208,166,158,109,
+98,232,18,203,235,144,217,166,79,185,240,151,82,47,75,184,
+229,166,108,243,245,41,206,222,246,3,148,110,18,171,67,199,
+86,145,237,240,252,224,247,63,134,210,147,247,176,203,253,242,
+243,54,15,71,239,63,237,186,110,207,176,89,153,133,85,191,
+203,223,101,60,246,243,114,180,209,134,146,69,90,55,219,18,
+246,40,46,0,124,215,245,15,221,65,90,179,9,183,77,87,
+50,63,197,253,182,29,77,135,167,4,159,185,11,124,211,223,
+199,177,57,203,115,6,195,251,126,55,90,72,72,34,142,237,
+236,208,246,82,254,166,13,247,8,13,248,111,220,140,113,23,
+76,23,225,23,39,175,251,81,19,146,11,195,29,112,192,23,
+39,185,57,176,143,137,228,117,100,191,60,209,98,169,183,48,
+20,103,79,67,112,31,75,128,25,221,120,118,87,8,80,184,
+235,243,129,231,119,76,227,65,202,87,43,144,191,138,117,64,
+238,236,205,48,132,103,189,15,13,20,2,92,72,83,216,68,
+246,103,191,130,105,152,171,251,13,166,32,67,197,126,36,231,
+149,100,87,255,2,65,196,57,120,
\ No newline at end of file
diff --git a/uppsrc/Core/srcimp.tpp/Heap$en-us.tpp b/uppsrc/Core/srcimp.tpp/Heap$en-us.tpp
new file mode 100644
index 000000000..f4c5ea925
--- /dev/null
+++ b/uppsrc/Core/srcimp.tpp/Heap$en-us.tpp
@@ -0,0 +1,12 @@
+TITLE("Heap implementation")
+COMPRESSED
+120,156,149,88,107,143,219,54,22,253,43,4,210,166,158,68,51,213,211,150,199,221,96,147,110,131,45,138,164,64,211,162,31,6,193,154,150,105,155,59,146,232,21,169,113,156,197,230,183,239,185,36,245,242,78,18,108,48,200,140,68,242,62,206,125,29,234,46,102,223,124,19,6,225,147,240,43,255,110,255,38,118,188,45,205,251,59,153,166,249,138,199,217,234,254,151,95,151,171,103,127,157,205,211,43,146,18,65,74,178,136,146,60,75,162,52,158,227,191,40,137,226,44,78,210,40,143,151,105,158,36,121,120,91,148,92,235,247,119,101,156,231,43,58,20,7,241,147,120,145,197,209,34,205,211,60,74,22,121,140,179,113,24,198,225,34,206,162,52,201,227,236,118,43,116,241,254,142,231,201,234,217,111,115,28,74,72,19,132,135,209,60,78,23,105,28,38,97,156,66,85,148,231,105,180,200,242,100,57,159,223,22,252,104,164,170,189,46,25,69,113,180,218,68,139,21,108,254,244,233,211,77,148,134,206,130,20,194,162,48,133,169,17,222,133,105,188,136,178,101,184,204,242,40,15,19,
+8,207,22,97,118,123,228,13,175,62,239,122,246,85,215,23,225,173,52,2,34,158,61,143,162,5,142,204,131,249,147,40,93,192,209,60,73,179,124,17,66,121,28,199,73,18,71,73,188,92,198,217,60,91,220,30,4,223,138,6,46,164,209,220,26,187,8,22,79,178,44,75,177,63,77,179,69,158,198,9,98,147,38,41,160,72,163,101,150,46,179,248,182,22,218,136,237,250,218,193,230,220,239,13,39,187,73,82,30,228,79,230,233,124,25,1,253,116,185,72,195,229,60,90,36,4,94,4,216,231,73,26,47,179,94,146,143,218,191,255,241,159,111,127,122,123,253,199,59,118,167,147,21,251,187,224,71,38,171,99,41,42,81,27,78,104,63,125,127,167,195,21,251,99,253,124,253,156,29,236,186,102,91,249,32,183,98,203,100,109,20,75,88,193,141,216,171,70,10,205,54,92,227,189,170,153,57,8,182,41,85,113,207,180,252,40,216,250,154,233,138,151,101,192,42,177,149,109,197,120,189,101,27,185,191,241,242,233,215,124,197,222,209,30,119,78,251,149,87,246,129,253,176,254,11,3,
+132,108,115,54,66,223,176,119,109,113,240,251,24,111,4,139,252,10,107,84,91,195,180,128,105,69,54,96,9,246,98,245,168,180,150,155,82,88,115,180,91,186,97,47,139,66,53,91,89,239,25,28,81,109,195,26,161,5,111,138,67,208,9,239,244,54,226,72,107,181,177,158,85,252,159,240,215,156,153,218,117,27,91,109,1,97,63,18,82,223,59,188,248,241,88,202,194,226,168,217,236,197,50,255,150,14,12,46,94,141,221,15,167,238,91,183,240,168,8,93,43,57,253,229,21,59,242,61,185,239,197,151,39,126,214,76,124,56,138,194,104,114,97,47,12,144,61,3,228,74,53,103,182,107,84,101,237,213,103,132,189,178,18,120,41,247,53,4,206,204,1,200,224,231,216,40,23,205,205,153,29,75,110,118,170,169,152,134,72,185,147,5,123,119,214,47,201,136,223,248,201,198,12,207,175,27,33,232,113,215,214,133,117,237,210,141,159,56,130,211,91,107,19,6,65,119,126,192,72,13,188,203,113,118,220,176,223,41,28,80,44,134,152,213,138,213,194,31,48,180,66,126,29,69,179,190,
+118,7,101,77,134,90,108,87,120,128,127,124,59,126,9,0,55,170,117,225,58,29,84,175,16,162,173,60,11,41,45,38,177,79,29,87,155,140,187,51,27,177,151,117,77,169,129,144,117,206,144,165,178,223,105,229,0,64,133,58,192,163,177,25,199,74,169,13,157,217,1,166,46,150,94,21,137,8,216,86,181,72,196,245,117,41,235,251,238,176,102,48,124,92,52,36,11,150,72,131,234,170,97,204,200,104,159,20,138,12,104,218,194,180,48,34,128,118,195,75,86,183,213,6,166,12,105,233,53,119,14,216,24,14,155,46,108,236,221,156,198,243,101,175,240,94,136,163,158,120,217,11,150,218,89,76,105,91,40,234,33,70,148,103,87,22,51,4,115,164,234,138,116,161,38,133,235,51,108,166,106,209,63,32,196,163,212,184,98,250,117,139,154,224,77,195,109,181,145,94,120,219,82,18,77,144,132,154,14,203,27,246,179,233,131,195,27,35,129,152,183,196,103,100,205,244,159,170,185,31,25,161,199,42,140,54,22,168,182,190,56,68,169,111,77,248,44,66,188,68,232,112,74,187,92,53,
+135,134,242,178,64,69,8,146,173,71,21,14,51,41,56,0,206,46,195,169,35,229,16,229,163,139,8,165,132,160,90,194,65,106,112,61,42,182,166,236,33,96,235,156,191,98,39,105,14,148,240,27,65,208,64,45,57,189,21,67,11,153,245,15,40,15,108,248,87,43,9,161,66,105,131,157,90,52,192,73,126,116,171,14,223,2,61,14,117,91,98,209,86,250,21,76,222,77,74,212,217,196,31,184,44,57,117,87,159,110,206,223,157,197,163,211,24,244,62,92,246,54,130,250,8,203,237,56,25,142,35,153,84,93,8,54,171,4,175,125,118,77,173,132,13,170,238,66,107,247,82,246,64,205,160,181,175,128,147,106,52,21,147,22,206,139,190,27,140,33,34,75,122,247,120,73,177,59,143,2,50,246,110,236,78,223,103,189,225,56,63,150,74,145,161,236,113,125,111,234,130,120,176,21,240,255,187,56,14,230,163,78,78,51,244,173,58,57,11,187,144,78,199,60,196,25,196,144,212,29,212,41,96,123,9,187,92,207,154,118,183,174,249,218,7,42,135,192,254,229,59,226,184,33,56,44,
+225,16,134,148,27,66,68,4,212,4,249,130,6,207,13,123,67,253,189,27,57,148,183,1,89,97,91,245,80,47,100,162,104,42,89,211,116,223,136,130,3,18,38,119,236,36,216,125,141,221,248,125,224,15,98,124,36,160,151,212,63,75,165,238,187,198,174,13,90,194,101,83,199,224,105,164,179,202,218,92,242,102,79,78,31,112,184,167,29,93,182,219,228,181,163,23,243,178,160,180,113,146,249,118,139,130,242,18,68,189,213,54,242,44,39,184,14,226,3,155,65,122,238,69,117,99,152,80,234,201,75,37,181,127,127,5,211,15,178,156,120,163,199,154,251,51,254,0,57,1,173,21,191,39,118,3,150,7,184,41,194,196,188,252,105,76,65,61,24,185,126,74,134,81,17,215,31,69,163,172,236,23,112,53,32,76,215,79,237,154,93,120,4,87,107,245,37,174,143,14,204,142,148,84,20,97,154,206,23,105,249,243,110,84,171,223,79,27,84,139,188,166,134,6,113,190,226,72,13,53,54,202,243,123,88,101,57,15,102,227,22,3,228,118,42,248,207,131,232,39,37,217,52,201,138,157,
+164,50,113,35,192,14,50,106,167,7,81,208,16,153,204,97,219,41,208,230,250,6,23,140,102,192,248,148,119,115,24,114,22,70,225,138,136,219,173,162,58,26,36,118,45,78,67,5,168,13,170,142,210,224,146,169,205,92,3,30,177,47,116,173,183,202,8,63,100,31,153,200,159,157,234,67,125,194,157,199,170,254,214,247,60,74,1,115,82,158,43,75,204,65,162,244,84,137,99,137,158,143,52,130,168,243,64,163,156,79,157,158,215,132,112,48,234,165,190,251,245,179,250,17,150,4,86,15,153,53,170,155,98,224,181,245,156,66,214,210,15,114,123,100,182,87,198,161,230,2,66,108,200,66,135,202,57,170,198,122,247,56,20,99,198,82,138,157,233,114,108,215,199,149,178,187,226,53,246,88,82,188,254,142,150,214,223,17,171,38,132,81,81,198,78,243,157,22,246,36,238,82,200,38,186,145,12,234,72,155,107,46,118,98,82,172,221,126,252,245,34,137,131,201,214,81,34,184,184,131,246,205,116,187,49,13,47,108,246,78,111,83,87,158,134,74,127,235,48,148,160,74,110,93,26,120,
+210,108,217,37,229,252,103,120,40,218,1,146,19,73,107,21,80,86,218,141,143,208,63,91,74,180,136,141,193,215,201,35,153,37,235,162,177,105,70,141,9,0,72,227,90,205,137,69,1,61,184,113,231,83,166,47,227,74,61,116,165,224,88,31,113,127,42,210,78,6,9,0,109,1,199,178,110,124,158,242,58,162,221,91,68,130,173,18,155,43,23,238,249,171,231,27,119,47,245,50,166,151,79,234,139,54,43,126,96,243,44,11,211,238,22,250,242,136,203,211,7,137,11,7,181,63,109,214,215,59,57,46,206,46,64,190,167,232,33,211,223,184,11,26,69,190,217,243,26,65,181,133,52,39,147,139,67,91,67,233,236,34,39,166,189,192,222,177,6,138,49,64,233,39,177,157,60,32,178,110,234,122,94,211,143,96,220,101,31,164,106,125,8,190,66,247,81,239,83,250,125,25,124,18,72,52,187,104,49,54,29,65,69,45,147,170,45,182,55,114,211,118,84,166,114,92,19,55,86,116,236,154,234,185,191,104,151,234,212,15,220,48,205,109,205,251,203,252,136,24,19,238,52,253,205,73,
+136,110,35,124,115,87,189,36,11,195,48,112,167,8,177,145,26,40,221,55,234,164,189,168,254,160,161,220,6,35,192,68,181,99,12,54,62,240,178,21,30,96,91,212,22,52,130,150,224,148,48,232,67,87,71,61,44,227,46,246,197,57,20,116,2,122,246,51,253,100,210,71,203,137,38,6,100,191,71,96,135,229,45,228,150,13,173,155,42,86,22,125,186,176,169,226,36,208,160,163,249,63,106,48,179,62,57,175,0,131,224,166,67,218,95,2,182,254,26,254,74,238,247,162,25,179,13,255,165,231,139,29,97,200,247,74,52,123,247,113,197,174,118,105,105,13,238,83,14,251,106,241,97,98,31,70,37,110,247,255,195,88,187,105,87,161,191,194,172,129,99,218,50,233,172,36,176,208,43,20,120,113,119,241,183,252,91,59,130,213,221,164,65,122,218,210,226,215,95,185,105,223,219,95,127,239,184,212,240,105,68,11,43,0,92,249,216,13,146,49,15,187,228,214,190,131,0,189,233,167,171,215,195,24,219,56,100,45,232,163,22,50,6,207,242,181,179,187,59,142,191,186,32,188,91,196,
+168,160,194,241,113,126,144,141,65,23,244,159,121,198,215,221,209,7,144,209,247,143,9,105,255,194,103,14,207,92,236,29,150,152,36,189,118,103,163,249,250,218,241,205,182,238,96,234,134,73,163,10,16,202,27,123,27,112,5,213,8,211,54,8,196,212,78,100,58,36,249,123,132,27,214,29,144,239,255,11,93,173,175,92,
diff --git a/uppsrc/Core/srcimp.tpp/String$en-us.tpp b/uppsrc/Core/srcimp.tpp/String$en-us.tpp
new file mode 100644
index 000000000..f39be2b42
--- /dev/null
+++ b/uppsrc/Core/srcimp.tpp/String$en-us.tpp
@@ -0,0 +1,9 @@
+TITLE("String and WString")
+COMPRESSED
+120,156,133,85,93,111,219,70,16,252,43,7,59,45,164,84,22,120,199,227,135,164,151,166,77,10,4,109,82,160,65,144,7,195,168,78,228,202,34,76,242,88,222,201,142,82,52,191,189,115,119,148,44,201,110,227,7,193,162,118,103,103,103,103,151,215,130,189,120,17,77,162,203,232,27,127,243,215,180,86,219,218,222,92,87,82,230,11,37,146,197,221,175,191,207,22,47,127,28,165,114,236,80,56,80,226,140,199,121,18,115,41,82,124,240,152,139,68,196,146,231,98,38,243,56,206,163,121,81,43,99,110,174,107,145,231,11,151,36,38,226,82,100,137,224,153,204,101,206,227,44,23,200,21,81,36,162,76,36,92,198,185,72,230,37,153,226,230,90,229,241,226,229,31,41,146,98,87,9,224,17,79,133,204,164,136,226,72,72,148,226,121,46,121,150,228,241,44,77,231,133,234,108,165,219,161,86,197,185,224,139,21,207,22,224,252,245,235,215,41,151,81,96,32,1,198,35,9,170,28,207,34,41,50,158,204,162,89,146,243,60,138,1,158,100,81,50,239,84,175,154,255,110,61,249,102,
+235,89,52,175,44,1,226,229,15,156,103,72,73,39,233,37,151,25,26,205,99,153,228,89,132,226,66,136,56,22,60,22,179,153,72,210,36,155,111,72,149,212,163,5,201,83,79,54,155,100,151,73,146,72,196,75,153,100,185,20,49,102,35,99,9,41,36,159,37,114,150,136,121,75,198,82,185,188,10,178,133,246,15,196,29,111,135,148,79,242,203,84,166,51,14,245,229,44,147,209,44,229,89,236,196,227,144,61,141,165,152,37,7,164,97,106,127,255,249,207,119,111,222,95,125,252,192,174,77,188,96,31,108,95,181,183,76,181,37,251,20,254,255,254,230,218,68,11,246,179,238,137,85,77,87,83,67,173,85,110,12,76,175,159,137,103,149,97,86,91,85,215,59,86,181,37,117,132,143,214,78,7,156,255,129,67,98,79,93,79,6,79,168,100,171,221,128,30,29,195,71,204,19,39,51,5,70,211,32,173,33,187,209,165,97,102,163,250,144,182,210,118,195,240,133,217,13,181,76,149,37,30,111,141,227,246,106,224,136,177,117,181,178,196,70,15,155,170,216,128,232,134,250,202,26,70,
+21,114,250,67,97,221,31,234,142,167,236,237,19,190,190,192,186,106,85,93,125,65,145,170,125,78,16,255,251,129,246,145,14,233,94,239,225,217,16,191,69,24,144,123,34,134,81,117,231,50,89,205,26,245,185,106,80,145,117,212,175,117,223,168,182,160,51,129,3,150,97,219,206,37,112,201,10,200,163,10,75,189,97,163,213,206,146,25,179,66,181,108,229,138,232,254,160,144,105,48,185,229,149,9,84,52,246,13,133,134,126,91,83,149,180,103,121,175,234,45,77,153,1,13,189,30,133,135,99,167,9,108,141,150,123,99,93,85,95,137,141,162,229,21,227,241,216,9,100,55,136,41,148,33,63,161,3,43,86,42,171,38,62,222,229,121,47,24,234,239,65,12,29,178,47,212,107,76,173,111,160,37,232,178,145,19,24,65,170,126,80,59,19,126,118,113,30,253,14,190,27,239,177,146,97,78,108,104,169,166,118,202,94,213,70,79,30,19,2,93,151,230,60,29,2,39,192,174,143,85,67,34,155,78,167,142,157,99,238,162,10,11,147,223,81,103,3,1,52,233,225,144,168,31,12,187,
+167,126,199,214,10,200,79,247,134,254,218,194,51,118,199,10,221,224,16,85,70,183,103,3,252,5,228,204,201,16,99,126,68,103,50,72,11,101,51,207,7,174,9,82,117,186,106,157,160,200,56,85,23,27,115,242,221,167,57,174,133,114,251,166,12,139,197,128,186,194,195,59,54,210,45,5,21,159,25,193,248,224,215,167,107,92,86,61,121,109,10,221,182,248,15,232,15,88,44,134,219,215,237,43,106,207,112,181,235,176,22,222,69,172,235,117,65,198,187,16,59,72,126,135,84,177,169,232,158,130,227,183,205,137,225,217,111,212,222,2,245,241,12,161,244,96,102,111,52,26,186,201,151,87,156,79,217,79,123,111,29,155,16,162,142,150,23,239,222,188,126,251,241,221,242,98,236,102,88,217,189,101,246,85,219,109,179,130,104,126,174,0,119,188,233,188,210,118,189,166,126,202,222,107,235,238,142,178,172,213,237,242,202,139,230,87,197,5,238,221,109,170,91,156,4,19,226,204,129,123,171,45,91,94,132,13,188,56,183,131,59,34,245,110,194,170,117,80,139,62,23,68,56,123,103,174,
+56,190,33,61,129,18,65,42,204,97,219,90,60,135,102,106,167,183,190,65,131,205,174,149,159,194,163,0,176,21,126,109,168,209,240,110,112,1,66,161,240,61,76,170,86,53,185,53,112,162,187,225,224,86,23,84,238,135,123,86,205,71,248,189,115,108,129,48,120,106,121,225,13,48,104,125,166,48,194,142,54,206,235,234,179,220,165,242,122,31,11,12,195,226,241,241,137,10,43,237,83,76,184,100,110,15,54,136,18,73,114,34,147,55,192,80,212,111,172,209,71,3,221,207,201,161,185,5,70,80,79,16,150,48,73,188,6,214,143,202,64,192,91,234,39,30,31,95,143,114,247,237,31,250,13,66,108,148,25,252,51,32,186,173,237,117,19,252,118,164,251,217,139,226,244,109,252,233,249,213,43,53,5,23,97,252,161,127,246,236,33,63,4,149,147,225,246,133,23,141,97,34,102,15,78,167,227,69,146,249,176,71,39,182,112,51,119,78,122,106,178,48,133,160,204,161,190,11,80,183,10,112,79,19,252,4,186,174,174,168,156,178,15,80,201,12,167,9,67,57,156,146,71,62,203,11,
+28,56,232,9,58,110,124,123,103,30,94,173,55,255,2,186,186,158,238,
+
diff --git a/uppsrc/Core/srcimp.tpp/all.i b/uppsrc/Core/srcimp.tpp/all.i
new file mode 100644
index 000000000..d79d6f359
--- /dev/null
+++ b/uppsrc/Core/srcimp.tpp/all.i
@@ -0,0 +1,8 @@
+TOPIC("Heap$en-us")
+#include "Heap$en-us.tpp"
+END_TOPIC
+
+TOPIC("String$en-us")
+#include "String$en-us.tpp"
+END_TOPIC
+
diff --git a/uppsrc/Core/sub.upt b/uppsrc/Core/sub.upt
new file mode 100644
index 000000000..12e050ee5
--- /dev/null
+++ b/uppsrc/Core/sub.upt
@@ -0,0 +1,10 @@
+template "Plain package with header" sub;
+
+@@<:PACKAGE:>.h
+#ifndef _<:PACKAGE:>_<:PACKAGE:>_h
+#define _<:PACKAGE:>_<:PACKAGE:>_h
+
+#endif
+
+@@<:PACKAGE:>.upp
+file "<:PACKAGE:>.h";
diff --git a/uppsrc/Core/t.cpp b/uppsrc/Core/t.cpp
new file mode 100644
index 000000000..0f9a2dbc3
--- /dev/null
+++ b/uppsrc/Core/t.cpp
@@ -0,0 +1,380 @@
+#include "Core.h"
+
+NAMESPACE_UPP
+
+#define TFILE <Core/Core.t>
+#include <Core/t.h>
+
+static StaticCriticalSection slng;
+
+static int sIdLen(const char *txt)
+{
+	const char *s;
+	for(s = txt; *s; s++)
+		if(*s == '\a' && s[1] != '\a')
+			break;
+	return (int)(s - txt);
+}
+
+static bool sIdEq(const char *a, const char *b)
+{
+	for(;;) {
+		if((*a == '\0' || *a == '\a' && a[1] != '\a') &&
+		   (*b == '\0' || *b == '\a' && b[1] != '\a'))
+			return true;
+		if(*a != *b)
+			return false;
+		a++;
+		b++;
+	}
+}
+
+struct CharS : Moveable<CharS> {
+	const char *s;
+
+	unsigned GetHashValue() const           { return memhash(s, sIdLen(s)); }
+	bool operator==(const CharS& b) const   { return sIdEq(s, b.s); }
+};
+
+struct LngRec : Moveable<LngRec> {
+	int         lang;
+	const char *text;
+};
+
+struct LngModule {
+	String                            name;
+	VectorMap<CharS, Vector<LngRec> > map;
+};
+
+static Array<LngModule>& sMod()
+{
+	static Array<LngModule> m;
+	return m;
+}
+
+const char *GetENUS(const char *txt)
+{
+	for(const char *s = txt; *s; s++) {
+		if(*s == '\v') {
+			if(s[1] == '\v')
+				s++;
+			else
+				return s + 1;
+		}
+		if(*s == '\a') {
+			if(s[1] == '\a')
+				s++;
+			else
+				return s + 1;
+		}
+	}
+	return txt;
+}
+
+const char *GetENUSc(const char *txt)
+{
+	txt = GetENUS(txt);
+	String r;
+	bool cv = false;
+	for(const char *s = txt; *s; s++)
+		if(s[0] == '\v' && s[1] == '\v') {
+			r.Cat('\v');
+			s++;
+			cv = true;
+		}
+		else
+		if(s[0] == '\a' && s[1] == '\a') {
+			r.Cat('\a');
+			s++;
+			cv = true;
+		}
+		else
+			r.Cat(*s);
+	return cv ? PermanentCopy(r) : txt;
+}
+
+void AddModule(const LngEntry__* l, const char *name)
+{
+	CriticalSection::Lock __(slng);
+	Array<LngModule>& ma = sMod();
+	LngModule& m = ma.Add();
+	m.name = name;
+	Vector<LngRec> *lr = NULL;
+	while(l->lang) {
+		if(l->lang == 1) {
+			CharS ids;
+			ids.s = l->text;
+			lr = &m.map.GetAdd(ids);
+			LngRec& r = lr->Add();
+			r.lang = LNG_('E','N','U','S');
+			r.text = GetENUSc(l->text);
+		}
+		else
+		if(l->text && *l->text) {
+			LngRec& r = lr->Add();
+			r.lang = l->lang;
+			r.text = l->text;
+		}
+		l++;
+	}
+}
+
+// ----------------------------------------------------
+
+static const LngRec *sFindLngRec(const char *id, int lang, dword mask)
+{
+	CharS ids;
+	ids.s = id;
+	lang &= mask;
+	Array<LngModule>& ma = sMod();
+	for(int i = 0; i < ma.GetCount(); i++) {
+		LngModule& m = ma[i];
+		int q = m.map.Find(ids);
+		if(q >= 0) {
+			const Vector<LngRec>& r = m.map[q];
+			for(int i = 0; i < r.GetCount(); i++)
+				if(int(r[i].lang & mask) == lang)
+					return &r[i];
+		}
+	}
+	return NULL;
+}
+
+static const LngRec *sFindLngRec(const char *id, int lang)
+{
+	const LngRec *r;
+	r = sFindLngRec(id, lang, LNGC_(0xff, 0xff, 0xff, 0xff, 0));
+	if(r)
+		return r;
+	r = sFindLngRec(id, lang, LNGC_(0xff, 0xff, 0x00, 0x00, 0));
+	return r;
+}
+
+struct ZoneAlloc {
+	Vector<char *> zsmall, zbig;
+	char *ptr, *lim;
+
+	char *Alloc(int sz);
+	void  Clear();
+
+	ZoneAlloc()  { ptr = lim = NULL; }
+	~ZoneAlloc() { Clear(); }
+};
+
+void ZoneAlloc::Clear()
+{
+	for(int i = 0; i < zsmall.GetCount(); i++)
+		delete[] zsmall[i];
+	for(int i = 0; i < zbig.GetCount(); i++)
+		delete[] zbig[i];
+	zsmall.Clear();
+	zbig.Clear();
+	ptr = lim = NULL;
+}
+
+char *ZoneAlloc::Alloc(int sz)
+{
+	if(sz >= 1024)
+		return zbig.Add() = new char[sz];
+	if(ptr + sz >= lim) {
+		zsmall.Add() = ptr = new char[4096];
+		lim = ptr + 4096;
+	}
+	char *s = ptr;
+	ptr += sz;
+	return s;
+}
+
+int current_lang;
+
+template<>
+inline unsigned GetHashValue(const char * const &s)
+{
+	return GetPtrHashValue(s);
+}
+
+static VectorMap<const char *, const char *>& sCurrentLangMap()
+{
+	static VectorMap<const char *, const char *> m;
+	return m;
+}
+
+static VectorMap<String, String>& sCurrentSLangMap()
+{
+	static VectorMap<String, String> m;
+	return m;
+}
+
+void SetCurrentLanguage(int lang)
+{
+	{
+		CriticalSection::Lock __(slng);
+		current_lang = lang;
+		Single<ZoneAlloc>().Clear();
+		sCurrentLangMap().Clear();
+		sCurrentSLangMap().Clear();
+	}
+	SetDateFormat(t_("date-format\a%2:02d/%3:02d/%1:4d"));
+	SetDateScan(t_("date-scan\amdy"));
+	SetDateFilter(t_("date-filter\aA/\a .-"));
+}
+
+const char *t_GetLngString_(const char *id)
+{
+	VectorMap<const char *, const char *>& map = sCurrentLangMap();
+	int q = map.Find(id);
+	if(q >= 0)
+		return map[q];
+	const LngRec *r = sFindLngRec(id, current_lang);
+	if(r) {
+		int dch = GetLNGCharset(current_lang);
+		if(dch == CHARSET_UTF8) {
+			map.Add(id, r->text);
+			return r->text;
+		}
+		String text = ToCharset(dch, r->text, CHARSET_UTF8);
+		char *q = Single<ZoneAlloc>().Alloc(text.GetLength() + 1);
+		strcpy(q, ~text);
+		map.Add(id, q);
+		return q;
+	}
+
+	const char *txt = GetENUSc(id);
+	map.Add(id, txt);
+	return txt;
+}
+
+const char *t_GetLngString(const char *id)
+{
+	CriticalSection::Lock __(slng);
+	return t_GetLngString_(id);
+}
+
+String GetLngString_(int lang, const char *id)
+{
+	if(!lang)
+		lang = current_lang;
+	const LngRec *r = sFindLngRec(id, lang);
+	if(r) {
+		int dch = GetLNGCharset(lang);
+		if(dch == CHARSET_UTF8)
+			return r->text;
+		else
+			return ToCharset(dch, r->text, CHARSET_UTF8);
+	}
+	return GetENUSc(id);
+}
+
+String GetLngString(int lang, const char *id)
+{
+	CriticalSection::Lock __(slng);
+	return GetLngString_(lang, id);
+}
+
+String GetLngString(const char *id)
+{
+	CriticalSection::Lock __(slng);
+	VectorMap<String, String>& map = sCurrentSLangMap();
+	int q = map.Find(id);
+	if(q >= 0)
+		return map[q];
+	String s = GetLngString_(current_lang, id);
+	map.Add(id, s);
+	return s;
+}
+
+Index<int> GetLngSet()
+{
+	CriticalSection::Lock __(slng);
+	Index<int> ndx;
+	Array<LngModule>& ma = sMod();
+	for(int i = 0; i < ma.GetCount(); i++) {
+		LngModule& m = ma[i];
+		for(int j = 0; j < m.map.GetCount(); j++) {
+			Vector<LngRec>& lr = m.map[j];
+			for(int k = 0; k < lr.GetCount(); k++)
+				ndx.FindAdd(lr[k].lang);
+		}
+	}
+	return ndx;
+}
+
+void    SaveLngFile(FileOut& out, int lang)
+{
+	CriticalSection::Lock __(slng);
+	out << "LANGUAGE " << AsCString(LNGAsText(lang)) << ";\r\n";
+	Array<LngModule>& ma = sMod();
+	for(int i = 0; i < ma.GetCount(); i++) {
+		LngModule& m = ma[i];
+		out << "// " << m.name << "\r\n";
+		for(int j = 0; j < m.map.GetCount(); j++) {
+			String id = m.map.GetKey(j).s;
+			out << AsCString(id, 70) << ",\r\n"
+			    << "\t" << AsCString(GetLngString_(lang, id), 60, "\t", ASCSTRING_SMART)
+			    << ";\r\n\r\n";
+		}
+	}
+}
+
+void LngSetAdd(const char *id, int lang, const char *txt, bool addid)
+{
+	CriticalSection::Lock __(slng);
+	CharS ids;
+	ids.s = PermanentCopy(id);
+	String text = ToCharset(CHARSET_UTF8, txt, GetLNGCharset(lang));
+	lang = SetLNGCharset(lang, CHARSET_UTF8);
+	Array<LngModule>& ma = sMod();
+	for(int i = 0; i < ma.GetCount(); i++) {
+		LngModule& m = ma[i];
+		int q = m.map.Find(ids);
+		if(q >= 0) {
+			char *t = PermanentCopy(text);
+			Vector<LngRec>& r = m.map[q];
+			for(int i = 0; i < r.GetCount(); i++)
+				if(r[i].lang == lang) {
+					r[i].text = t;
+					return;
+				}
+			LngRec& rec = r.Add();
+			rec.lang = lang;
+			rec.text = t;
+			return;
+		}
+	}
+	if(addid) {
+		if(ma.GetCount() == 0)
+			ma.Add();
+		LngRec& r = ma.Top().map.Add(ids).Add();
+		char *t = PermanentCopy(text);
+		strcpy(t, text);
+		r.lang = lang;
+		r.text = t;
+	}
+}
+
+bool   LoadLngFile(const char *file)
+{
+	String data = LoadFile(file);
+	CParser p(data);
+	try {
+		while(!p.IsEof()) {
+			p.PassId("LANGUAGE");
+			int lang = LNGFromText(p.ReadString());
+			if(!lang)
+				return false;
+			p.PassChar(';');
+			while(p.IsString()) {
+				String id = p.ReadString();
+				p.PassChar(',');
+				LngSetAdd(id, lang, p.ReadString(), false);
+				p.PassChar(';');
+			}
+		}
+	}
+	catch(CParser::Error) {
+		return false;
+	}
+	return true;
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/Core/t.h b/uppsrc/Core/t.h
new file mode 100644
index 000000000..667fa0f63
--- /dev/null
+++ b/uppsrc/Core/t.h
@@ -0,0 +1,295 @@
+#ifndef _Core_lng_h_
+#define _Core_lng_h_
+
+#define enUS(text)  { LNGC_('E','N','U','S', CHARSET_UTF8), text },
+#define enGB(text)  { LNGC_('E','N','G','B', CHARSET_UTF8), text },
+#define enAU(text)  { LNGC_('E','N','A','U', CHARSET_UTF8), text },
+#define enCA(text)  { LNGC_('E','N','C','A', CHARSET_UTF8), text },
+#define enNZ(text)  { LNGC_('E','N','N','Z', CHARSET_UTF8), text },
+#define enIE(text)  { LNGC_('E','N','I','E', CHARSET_UTF8), text },
+#define enZA(text)  { LNGC_('E','N','Z','A', CHARSET_UTF8), text },
+#define enJM(text)  { LNGC_('E','N','J','M', CHARSET_UTF8), text },
+#define enCB(text)  { LNGC_('E','N','C','B', CHARSET_UTF8), text },
+#define enBZ(text)  { LNGC_('E','N','B','Z', CHARSET_UTF8), text },
+#define enTT(text)  { LNGC_('E','N','T','T', CHARSET_UTF8), text },
+#define bgBG(text)  { LNGC_('B','G','B','G', CHARSET_UTF8), text },
+#define csCZ(text)  { LNGC_('C','S','C','Z', CHARSET_UTF8), text },
+#define daDK(text)  { LNGC_('D','A','D','K', CHARSET_UTF8), text },
+#define deDE(text)  { LNGC_('D','E','D','E', CHARSET_UTF8), text },
+#define deCH(text)  { LNGC_('D','E','C','H', CHARSET_UTF8), text },
+#define deAT(text)  { LNGC_('D','E','A','T', CHARSET_UTF8), text },
+#define deLU(text)  { LNGC_('D','E','L','U', CHARSET_UTF8), text },
+#define deLI(text)  { LNGC_('D','E','L','I', CHARSET_UTF8), text },
+#define elGR(text)  { LNGC_('E','L','G','R', CHARSET_UTF8), text },
+#define esES(text)  { LNGC_('E','S','E','S', CHARSET_UTF8), text },
+#define esMX(text)  { LNGC_('E','S','M','X', CHARSET_UTF8), text },
+#define esES(text)  { LNGC_('E','S','E','S', CHARSET_UTF8), text },
+#define esGT(text)  { LNGC_('E','S','G','T', CHARSET_UTF8), text },
+#define esCR(text)  { LNGC_('E','S','C','R', CHARSET_UTF8), text },
+#define esPA(text)  { LNGC_('E','S','P','A', CHARSET_UTF8), text },
+#define esDO(text)  { LNGC_('E','S','D','O', CHARSET_UTF8), text },
+#define esVE(text)  { LNGC_('E','S','V','E', CHARSET_UTF8), text },
+#define esCO(text)  { LNGC_('E','S','C','O', CHARSET_UTF8), text },
+#define esPE(text)  { LNGC_('E','S','P','E', CHARSET_UTF8), text },
+#define esAR(text)  { LNGC_('E','S','A','R', CHARSET_UTF8), text },
+#define esEC(text)  { LNGC_('E','S','E','C', CHARSET_UTF8), text },
+#define esCL(text)  { LNGC_('E','S','C','L', CHARSET_UTF8), text },
+#define esUY(text)  { LNGC_('E','S','U','Y', CHARSET_UTF8), text },
+#define esPY(text)  { LNGC_('E','S','P','Y', CHARSET_UTF8), text },
+#define esBO(text)  { LNGC_('E','S','B','O', CHARSET_UTF8), text },
+#define esSV(text)  { LNGC_('E','S','S','V', CHARSET_UTF8), text },
+#define esHN(text)  { LNGC_('E','S','H','N', CHARSET_UTF8), text },
+#define esNI(text)  { LNGC_('E','S','N','I', CHARSET_UTF8), text },
+#define esPR(text)  { LNGC_('E','S','P','R', CHARSET_UTF8), text },
+#define fiFI(text)  { LNGC_('F','I','F','I', CHARSET_UTF8), text },
+#define frFR(text)  { LNGC_('F','R','F','R', CHARSET_UTF8), text },
+#define frBE(text)  { LNGC_('F','R','B','E', CHARSET_UTF8), text },
+#define frCA(text)  { LNGC_('F','R','C','A', CHARSET_UTF8), text },
+#define frCH(text)  { LNGC_('F','R','C','H', CHARSET_UTF8), text },
+#define frLU(text)  { LNGC_('F','R','L','U', CHARSET_UTF8), text },
+#define huHU(text)  { LNGC_('H','U','H','U', CHARSET_UTF8), text },
+#define isIS(text)  { LNGC_('I','S','I','S', CHARSET_UTF8), text },
+#define itIT(text)  { LNGC_('I','T','I','T', CHARSET_UTF8), text },
+#define itCH(text)  { LNGC_('I','T','C','H', CHARSET_UTF8), text },
+#define nlNL(text)  { LNGC_('N','L','N','L', CHARSET_UTF8), text },
+#define nlBE(text)  { LNGC_('N','L','B','E', CHARSET_UTF8), text },
+#define noNO(text)  { LNGC_('N','O','N','O', CHARSET_UTF8), text },
+#define noNO(text)  { LNGC_('N','O','N','O', CHARSET_UTF8), text },
+#define plPL(text)  { LNGC_('P','L','P','L', CHARSET_UTF8), text },
+#define ptBR(text)  { LNGC_('P','T','B','R', CHARSET_UTF8), text },
+#define ptPT(text)  { LNGC_('P','T','P','T', CHARSET_UTF8), text },
+#define roRO(text)  { LNGC_('R','O','R','O', CHARSET_UTF8), text },
+#define ruRU(text)  { LNGC_('R','U','R','U', CHARSET_UTF8), text },
+#define hrHR(text)  { LNGC_('H','R','H','R', CHARSET_UTF8), text },
+#define srSP(text)  { LNGC_('S','R','S','P', CHARSET_UTF8), text },
+#define srSP(text)  { LNGC_('S','R','S','P', CHARSET_UTF8), text },
+#define skSK(text)  { LNGC_('S','K','S','K', CHARSET_UTF8), text },
+#define svSE(text)  { LNGC_('S','V','S','E', CHARSET_UTF8), text },
+#define svFI(text)  { LNGC_('S','V','F','I', CHARSET_UTF8), text },
+#define trTR(text)  { LNGC_('T','R','T','R', CHARSET_UTF8), text },
+#define slSI(text)  { LNGC_('S','L','S','I', CHARSET_UTF8), text },
+#define afZA(text)  { LNGC_('A','F','Z','A', CHARSET_UTF8), text },
+#define sqAL(text)  { LNGC_('S','Q','A','L', CHARSET_UTF8), text },
+#define euES(text)  { LNGC_('E','U','E','S', CHARSET_UTF8), text },
+#define beBY(text)  { LNGC_('B','E','B','Y', CHARSET_UTF8), text },
+#define caES(text)  { LNGC_('C','A','E','S', CHARSET_UTF8), text },
+#define etEE(text)  { LNGC_('E','T','E','E', CHARSET_UTF8), text },
+#define foFO(text)  { LNGC_('F','O','F','O', CHARSET_UTF8), text },
+#define idID(text)  { LNGC_('I','D','I','D', CHARSET_UTF8), text },
+#define lvLV(text)  { LNGC_('L','V','L','V', CHARSET_UTF8), text },
+#define ltLT(text)  { LNGC_('L','T','L','T', CHARSET_UTF8), text },
+#define ukUA(text)  { LNGC_('U','K','U','A', CHARSET_UTF8), text },
+#define zhCN(text)  { LNGC_('Z','H','C','N', CHARSET_UTF8), text },
+#define koKR(text)  { LNGC_('K','O','K','R', CHARSET_UTF8), text },
+#define jaJP(text)  { LNGC_('J','A','J','P', CHARSET_UTF8), text },
+
+
+#define T_(text)    { 1, text },
+
+#ifndef LNG_VERA
+#define LNG_VERA 0
+#define LNG_VERB 0
+#else
+	#if LNG_VERA == 0
+		#undef LNG_VERA
+		#define LNG_VERA 1
+	#elif LNG_VERA == 1
+		#undef LNG_VERA
+		#define LNG_VERA 2
+	#elif LNG_VERA == 2
+		#undef LNG_VERA
+		#define LNG_VERA 3
+	#elif LNG_VERA == 3
+		#undef LNG_VERA
+		#define LNG_VERA 4
+	#elif LNG_VERA == 4
+		#undef LNG_VERA
+		#define LNG_VERA 5
+	#elif LNG_VERA == 5
+		#undef LNG_VERA
+		#define LNG_VERA 6
+	#elif LNG_VERA == 6
+		#undef LNG_VERA
+		#define LNG_VERA 7
+	#elif LNG_VERA == 6
+		#undef LNG_VERA
+		#define LNG_VERA 7
+	#elif LNG_VERA == 6
+		#undef LNG_VERA
+		#define LNG_VERA 7
+	#elif LNG_VERA == 7
+		#undef LNG_VERA
+		#define LNG_VERA 8
+	#elif LNG_VERA == 8
+		#undef LNG_VERA
+		#define LNG_VERA 9
+	#elif LNG_VERA == 9
+		#undef LNG_VERA
+		#define LNG_VERA 0
+		#if LNG_VERB == 0
+			#undef LNG_VERB
+			#define LNG_VERB 1
+		#elif LNG_VERB == 1
+			#undef LNG_VERB
+			#define LNG_VERB 2
+		#elif LNG_VERB == 2
+			#undef LNG_VERB
+			#define LNG_VERB 3
+		#elif LNG_VERB == 3
+			#undef LNG_VERB
+			#define LNG_VERB 4
+		#elif LNG_VERB == 4
+			#undef LNG_VERB
+			#define LNG_VERB 5
+		#elif LNG_VERB == 5
+			#undef LNG_VERB
+			#define LNG_VERB 6
+		#elif LNG_VERB == 6
+			#undef LNG_VERB
+			#define LNG_VERB 7
+		#elif LNG_VERB == 6
+			#undef LNG_VERB
+			#define LNG_VERB 7
+		#elif LNG_VERB == 6
+			#undef LNG_VERB
+			#define LNG_VERB 7
+		#elif LNG_VERB == 7
+			#undef LNG_VERB
+			#define LNG_VERB 8
+		#elif LNG_VERB == 8
+			#undef LNG_VERB
+			#define LNG_VERB 9
+		#elif LNG_VERB == 9
+			#undef LNG_VERB
+			#define LNG_VERB 10
+		#elif LNG_VERB == 10
+			#undef LNG_VERB
+			#define LNG_VERB 11
+		#elif LNG_VERB == 11
+			#undef LNG_VERB
+			#define LNG_VERB 12
+		#elif LNG_VERB == 12
+			#undef LNG_VERB
+			#define LNG_VERB 13
+		#elif LNG_VERB == 13
+			#undef LNG_VERB
+			#define LNG_VERB 14
+		#elif LNG_VERB == 14
+			#undef LNG_VERB
+			#define LNG_VERB 15
+		#elif LNG_VERB == 15
+			#undef LNG_VERB
+			#define LNG_VERB 16
+		#elif LNG_VERB == 16
+			#undef LNG_VERB
+			#define LNG_VERB 17
+		#elif LNG_VERB == 17
+			#undef LNG_VERB
+			#define LNG_VERB 18
+		#elif LNG_VERB == 18
+			#undef LNG_VERB
+			#define LNG_VERB 19
+		#elif LNG_VERB == 19
+			#undef LNG_VERB
+			#define LNG_VERB 20
+		#else
+			#error Too many language files !
+		#endif
+	#endif
+#endif
+
+INITBLOCK_(COMBINE3(LNG_MODULE, LNG_VERB, LNG_VERA))
+{
+	static UPP::LngEntry__ langset[] = {
+	#include TFILE
+		{ 0, NULL }
+	};
+#ifdef LNGMODULE
+	AddModule(langset, #LNGMODULE);
+#else
+	AddModule(langset);
+#endif
+}
+
+#undef enUS
+#undef enGB
+#undef enAU
+#undef enCA
+#undef enNZ
+#undef enIE
+#undef enZA
+#undef enJM
+#undef enCB
+#undef enBZ
+#undef enTT
+#undef bgBG
+#undef csCZ
+#undef daDK
+#undef deDE
+#undef deCH
+#undef deAT
+#undef deLU
+#undef deLI
+#undef elGR
+#undef esES
+#undef esMX
+#undef esES
+#undef esGT
+#undef esCR
+#undef esPA
+#undef esDO
+#undef esVE
+#undef esCO
+#undef esPE
+#undef esAR
+#undef esEC
+#undef esCL
+#undef esUY
+#undef esPY
+#undef esBO
+#undef esSV
+#undef esHN
+#undef esNI
+#undef esPR
+#undef fiFI
+#undef frFR
+#undef frBE
+#undef frCA
+#undef frCH
+#undef frLU
+#undef huHU
+#undef isIS
+#undef itIT
+#undef itCH
+#undef nlNL
+#undef nlBE
+#undef noNO
+#undef noNO
+#undef plPL
+#undef ptBR
+#undef ptPT
+#undef roRO
+#undef ruRU
+#undef hrHR
+#undef srSP
+#undef srSP
+#undef skSK
+#undef svSE
+#undef svFI
+#undef trTR
+#undef slSI
+#undef afZA
+#undef sqAL
+#undef euES
+#undef beBY
+#undef caES
+#undef etEE
+#undef foFO
+#undef idID
+#undef lvLV
+#undef ltLT
+#undef ukUA
+
+#undef T_
+
+#endif
diff --git a/uppsrc/Core/t_.h b/uppsrc/Core/t_.h
new file mode 100644
index 000000000..30564a5e7
--- /dev/null
+++ b/uppsrc/Core/t_.h
@@ -0,0 +1,10 @@
+#ifdef t_
+#undef t_
+#endif
+
+#ifdef tt_
+#undef tt_
+#endif
+
+#define t_(x)          t_GetLngString(x)
+#define tt_(x)         x
diff --git a/uppsrc/Core/topic_group.h b/uppsrc/Core/topic_group.h
new file mode 100644
index 000000000..7fb66d4ba
--- /dev/null
+++ b/uppsrc/Core/topic_group.h
@@ -0,0 +1,128 @@
+//#BLITZ_APPROVE
+
+#ifndef TOPIC_VERA
+#define TOPIC_VERA 0
+#define TOPIC_VERB 0
+#else
+	#if TOPIC_VERA == 0
+		#undef TOPIC_VERA
+		#define TOPIC_VERA 1
+	#elif TOPIC_VERA == 1
+		#undef TOPIC_VERA
+		#define TOPIC_VERA 2
+	#elif TOPIC_VERA == 2
+		#undef TOPIC_VERA
+		#define TOPIC_VERA 3
+	#elif TOPIC_VERA == 3
+		#undef TOPIC_VERA
+		#define TOPIC_VERA 4
+	#elif TOPIC_VERA == 4
+		#undef TOPIC_VERA
+		#define TOPIC_VERA 5
+	#elif TOPIC_VERA == 5
+		#undef TOPIC_VERA
+		#define TOPIC_VERA 6
+	#elif TOPIC_VERA == 6
+		#undef TOPIC_VERA
+		#define TOPIC_VERA 7
+	#elif TOPIC_VERA == 6
+		#undef TOPIC_VERA
+		#define TOPIC_VERA 7
+	#elif TOPIC_VERA == 6
+		#undef TOPIC_VERA
+		#define TOPIC_VERA 7
+	#elif TOPIC_VERA == 7
+		#undef TOPIC_VERA
+		#define TOPIC_VERA 8
+	#elif TOPIC_VERA == 8
+		#undef TOPIC_VERA
+		#define TOPIC_VERA 9
+	#elif TOPIC_VERA == 9
+		#undef TOPIC_VERA
+		#define TOPIC_VERA 0
+		#if TOPIC_VERB == 0
+			#undef TOPIC_VERB
+			#define TOPIC_VERB 1
+		#elif TOPIC_VERB == 1
+			#undef TOPIC_VERB
+			#define TOPIC_VERB 2
+		#elif TOPIC_VERB == 2
+			#undef TOPIC_VERB
+			#define TOPIC_VERB 3
+		#elif TOPIC_VERB == 3
+			#undef TOPIC_VERB
+			#define TOPIC_VERB 4
+		#elif TOPIC_VERB == 4
+			#undef TOPIC_VERB
+			#define TOPIC_VERB 5
+		#elif TOPIC_VERB == 5
+			#undef TOPIC_VERB
+			#define TOPIC_VERB 6
+		#elif TOPIC_VERB == 6
+			#undef TOPIC_VERB
+			#define TOPIC_VERB 7
+		#elif TOPIC_VERB == 6
+			#undef TOPIC_VERB
+			#define TOPIC_VERB 7
+		#elif TOPIC_VERB == 6
+			#undef TOPIC_VERB
+			#define TOPIC_VERB 7
+		#elif TOPIC_VERB == 7
+			#undef TOPIC_VERB
+			#define TOPIC_VERB 8
+		#elif TOPIC_VERB == 8
+			#undef TOPIC_VERB
+			#define TOPIC_VERB 9
+		#elif TOPIC_VERB == 9
+			#undef TOPIC_VERB
+			#define TOPIC_VERB 10
+		#elif TOPIC_VERB == 10
+			#undef TOPIC_VERB
+			#define TOPIC_VERB 11
+		#elif TOPIC_VERB == 11
+			#undef TOPIC_VERB
+			#define TOPIC_VERB 12
+		#elif TOPIC_VERB == 12
+			#undef TOPIC_VERB
+			#define TOPIC_VERB 13
+		#elif TOPIC_VERB == 13
+			#undef TOPIC_VERB
+			#define TOPIC_VERB 14
+		#elif TOPIC_VERB == 14
+			#undef TOPIC_VERB
+			#define TOPIC_VERB 15
+		#elif TOPIC_VERB == 15
+			#undef TOPIC_VERB
+			#define TOPIC_VERB 16
+		#elif TOPIC_VERB == 16
+			#undef TOPIC_VERB
+			#define TOPIC_VERB 17
+		#elif TOPIC_VERB == 17
+			#undef TOPIC_VERB
+			#define TOPIC_VERB 18
+		#elif TOPIC_VERB == 18
+			#undef TOPIC_VERB
+			#define TOPIC_VERB 19
+		#elif TOPIC_VERB == 19
+			#undef TOPIC_VERB
+			#define TOPIC_VERB 20
+		#else
+			#error Too many topic files !
+		#endif
+	#endif
+#endif
+
+#define TOPIC(id)       { const char *topic = id;
+#define TITLE(x)          const char *title = x;
+#define COMPRESSED        static const UPP::byte data[] = {
+#define END_TOPIC         }; RegisterTopic__(ASSTRING(TOPICFILE), topic, title, data, __countof(data)); }
+
+INITBLOCK_(COMBINE3(TOPIC__, TOPIC_VERB, TOPIC_VERA))
+{
+	#include TOPICFILE
+}
+
+#undef TOPIC
+#undef COMPRESSED
+#undef END_TOPIC
+#undef TOPICFILE
diff --git a/uppsrc/Core/z.cpp b/uppsrc/Core/z.cpp
new file mode 100644
index 000000000..8884e42a1
--- /dev/null
+++ b/uppsrc/Core/z.cpp
@@ -0,0 +1,257 @@
+#include "Core.h"
+
+#ifdef PLATFORM_WIN32
+#include <plugin/z/lib/zlib.h>
+#include <plugin/z/lib/zutil.h>
+#else
+#include <zlib.h>
+
+#ifndef DEF_MEM_LEVEL
+#define DEF_MEM_LEVEL 8
+#endif
+
+#ifndef OS_CODE
+#define OS_CODE  0x03
+#endif
+
+#endif
+
+NAMESPACE_UPP
+
+//////////////////////////////////////////////////////////////////////
+
+static voidpf zalloc_new(voidpf opaque, uInt items, uInt size)
+{
+	return new byte[items * size];
+}
+
+static void zfree_new(voidpf opaque, voidpf address)
+{
+	delete[] (byte *)address;
+}
+
+enum
+{
+	GZ_MAGIC1    = 0x1f,
+	GZ_MAGIC2    = 0x8b,
+
+	ASCII_FLAG   = 0x01, /* bit 0 set: file probably ascii text */
+	HEAD_CRC     = 0x02, /* bit 1 set: header CRC present */
+	EXTRA_FIELD  = 0x04, /* bit 2 set: extra field present */
+	ORIG_NAME    = 0x08, /* bit 3 set: original file name present */
+	COMMENT      = 0x10, /* bit 4 set: file comment present */
+	RESERVED     = 0xE0, /* bits 5..7: reserved */
+};
+
+void Crc32::Put(const void *ptr, int count)
+{
+	crc = crc32(crc, (byte *)ptr, count);
+}
+
+void Crc32::Put(char c)
+{
+	crc = crc32(crc, (byte *)&c, 1);
+}
+
+void Crc32::Put(byte c)
+{
+	crc = crc32(crc, (byte *)&c, 1);
+}
+
+Crc32::Crc32()
+{
+	crc = crc32(0, NULL, 0);
+}
+
+static int sZpress(Stream& out, Stream& in, int size, Gate2<int, int> progress, bool nohdr, dword *crc,
+                    bool compress)
+{
+	const int BUF_SIZE = 65536;
+	Buffer<Bytef> input(BUF_SIZE), output(BUF_SIZE);
+	z_stream z;
+	z.zalloc = zalloc_new;
+	z.zfree = zfree_new;
+	z.opaque = 0;
+	if(compress ? deflateInit2(&z, Z_DEFAULT_COMPRESSION, Z_DEFLATED,
+	                          nohdr ? -MAX_WBITS : MAX_WBITS, DEF_MEM_LEVEL, Z_DEFAULT_STRATEGY)
+	            : inflateInit2(&z, nohdr ? -MAX_WBITS : +MAX_WBITS) != Z_OK) {
+		out.SetError();
+		return -1;
+	}
+	int code;
+	int flush;
+	int done = 0;
+	int outsz = 0;
+	if(crc)
+		*crc = crc32(0, NULL, 0);
+	do {
+		z.avail_in = in.Get(z.next_in = input, min(size - done, BUF_SIZE));
+		if(progress(done += z.avail_in, size) || in.IsError())
+			goto error;
+		if(!compress && z.avail_in == 0)
+			break;
+		flush = z.avail_in > 0 ? Z_NO_FLUSH : Z_FINISH;
+		if(crc && compress)
+			*crc = crc32(*crc, input, z.avail_in);
+		do {
+			z.avail_out = BUF_SIZE;
+			z.next_out = output;
+			code = (compress ? deflate : inflate)(&z, flush);
+			if(code == Z_STREAM_ERROR)
+				goto error;
+			int count = BUF_SIZE - z.avail_out;
+			if(crc && !compress)
+			    *crc = crc32(*crc, output, count);
+			out.Put(output, count);
+			if(out.IsError())
+				goto error;
+			outsz += count;
+	    }
+		while(z.avail_out == 0);
+    }
+	while(compress ? flush != Z_FINISH : code != Z_STREAM_END);
+	if(!compress || code == Z_STREAM_END) {
+		(compress ? deflateEnd : inflateEnd)(&z);
+		return outsz;
+	}
+error:
+	(compress ? deflateEnd : inflateEnd)(&z);
+	return -1;
+}
+
+int ZCompress(Stream& out, Stream& in, int size, Gate2<int, int> progress, bool nohdr, dword *crc)
+{
+	return sZpress(out, in, size, progress, nohdr, crc, true);
+}
+
+int ZDecompress(Stream& out, Stream& in, int size, Gate2<int, int> progress, bool nohdr, dword *crc)
+{
+	return sZpress(out, in, size, progress, nohdr, crc, false);
+}
+
+int    ZCompress(Stream& out, Stream& in, Gate2<int, int> progress)
+{
+	return ZCompress(out, in, (int)in.GetLeft(), progress);
+}
+
+int    ZDecompress(Stream& out, Stream& in, Gate2<int, int> progress)
+{
+	return ZDecompress(out, in, (int)in.GetLeft(), progress);
+}
+
+String ZCompress(const void *data, int len, Gate2<int, int> progress)
+{
+	StringStream out;
+	MemReadStream in(data, len);
+	ZCompress(out, in, progress);
+	return out;
+}
+
+String ZDecompress(const void *data, int len, Gate2<int, int> progress)
+{
+	StringStream out;
+	MemReadStream in(data, len);
+	ZDecompress(out, in, progress);
+	return out;
+}
+
+String ZCompress(const String& s, Gate2<int, int> progress)
+{
+	return ZCompress(~s, s.GetCount(), progress);
+}
+
+String ZDecompress(const String& s, Gate2<int, int> progress)
+{
+	return ZDecompress(~s, s.GetCount(), progress);
+}
+
+int GZCompress(Stream& out, Stream& in, int size, Gate2<int, int> progress)
+{
+	static byte gzip_header[10] = { GZ_MAGIC1, GZ_MAGIC2, Z_DEFLATED, 0, 0, 0, 0, 0, 0, OS_CODE };
+	out.Put(gzip_header, 10);
+	dword crc;
+	int sz = ZCompress(out, in, size, progress, true, &crc);
+	out.Put32le(crc);
+	out.Put32le(size);
+	return sz;
+}
+
+static int sSkipZ(Stream& stream)
+{
+	int q = 0;
+	while(stream.Get() > 0)
+		q++;
+	return q;
+}
+
+int GZDecompress(Stream& out, Stream& in, int size, Gate2<int, int> progress)
+{
+	byte buffer[10];
+	if(!in.GetAll(buffer, 10) || buffer[0] != GZ_MAGIC1 || buffer[1] != GZ_MAGIC2) {
+		out.SetError();
+		return -1;
+	}
+	int flags = buffer[3];
+	if(buffer[2] != Z_DEFLATED || (flags & RESERVED) != 0)
+		return false;
+	size -= 10;
+	if(flags & EXTRA_FIELD) {
+		int len = in.Get16le();
+		in.SeekCur(len);
+		size -= len;
+	}
+	if(flags & ORIG_NAME)
+		size -= sSkipZ(in);
+	if(flags & COMMENT)
+		size -= sSkipZ(in);
+	if(flags & HEAD_CRC) {
+		in.Get16le();
+		size -= 2;
+	}
+	if(in.IsEof() || size < 0) {
+		out.SetError();
+		return -1;
+	}
+	dword crc;
+	int sz = ZDecompress(out, in, size, progress, true, &crc);
+	return sz < 0 || in.Get32le() != (int)crc || in.Get32le() != sz ? -1 : sz;
+}
+
+int GZCompress(Stream& out, Stream& in, Gate2<int, int> progress = false)
+{
+	return GZCompress(out, in, (int)in.GetLeft(), progress);
+}
+
+int GZDecompress(Stream& out, Stream& in, Gate2<int, int> progress = false)
+{
+	return GZDecompress(out, in, (int)in.GetLeft(), progress);
+}
+
+String GZCompress(const void *data, int len, Gate2<int, int> progress)
+{
+	StringStream out;
+	MemReadStream in(data, len);
+	GZCompress(out, in, progress);
+	return out;
+}
+
+String GZDecompress(const void *data, int len, Gate2<int, int> progress)
+{
+	StringStream out;
+	MemReadStream in(data, len);
+	GZDecompress(out, in, progress);
+	return out;
+}
+
+String GZCompress(const String& s, Gate2<int, int> progress)
+{
+	return GZCompress(~s, s.GetCount(), progress);
+}
+
+String GZDecompress(const String& s, Gate2<int, int> progress)
+{
+	return GZDecompress(~s, s.GetCount(), progress);
+}
+
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/Core/z.h b/uppsrc/Core/z.h
new file mode 100644
index 000000000..bed8c2a7e
--- /dev/null
+++ b/uppsrc/Core/z.h
@@ -0,0 +1,33 @@
+class Crc32 {
+	dword crc;
+
+public:
+	void Put(const void *ptr, int count);
+	void Put(char c);
+	void Put(byte c);
+
+	operator dword() const { return crc; }
+
+	Crc32();
+};
+
+int    ZCompress(Stream& out, Stream& in, int size, Gate2<int, int> progress = false, bool nohdr = false, dword *crc = NULL);
+int    ZDecompress(Stream& out, Stream& in, int size, Gate2<int, int> progress = false, bool nohdr = false, dword *crc = NULL);
+
+int    ZCompress(Stream& out, Stream& in, Gate2<int, int> progress = false);
+int    ZDecompress(Stream& out, Stream& in, Gate2<int, int> progress = false);
+
+String ZCompress(const void *data, int len, Gate2<int, int> progress = false);
+String ZDecompress(const void *data, int len, Gate2<int, int> progress = false);
+
+String ZCompress(const String& s, Gate2<int, int> progress = false);
+String ZDecompress(const String& s, Gate2<int, int> progress = false);
+
+int    GZCompress(Stream& out, Stream& in, int size, Gate2<int, int> progress = false);
+int    GZDecompress(Stream& out, Stream& in, int size, Gate2<int, int> progress = false);
+
+String GZCompress(const void *data, int len, Gate2<int, int> progress = false);
+String GZDecompress(const void *data, int len, Gate2<int, int> progress = false);
+
+String GZCompress(const String& s, Gate2<int, int> progress = false);
+String GZDecompress(const String& s, Gate2<int, int> progress = false);
diff --git a/uppsrc/CppBase/AUTHORS b/uppsrc/CppBase/AUTHORS
new file mode 100644
index 000000000..f782e5b62
--- /dev/null
+++ b/uppsrc/CppBase/AUTHORS
@@ -0,0 +1,2 @@
+Mirek Fidler <cxl@ntllib.org>
+Tomas Rylek  <rylek@volny.cz>
\ No newline at end of file
diff --git a/uppsrc/CppBase/Base.cpp b/uppsrc/CppBase/Base.cpp
new file mode 100644
index 000000000..0f1c472cf
--- /dev/null
+++ b/uppsrc/CppBase/Base.cpp
@@ -0,0 +1,401 @@
+#include "CppBase.h"
+
+NAMESPACE_UPP
+
+#ifdef _MSC_VER
+#pragma inline_depth(255)
+#pragma optimize("t", on)
+#endif
+
+#define LLOG(x)
+#define LTIMING(x)  // RTIMING(x)
+
+void CppWordsHash::AddWord(const String& s)
+{
+	int i = GetHashValue(s) & 127;
+	w[i >> 5] |= 1 << (i & 31);
+}
+
+void CppWordsHash::AddWords(const char *s)
+{
+	CParser p(s);
+	while(p)
+		if(p.IsId())
+			AddWord(p.ReadId());
+		else
+			p.SkipTerm();
+}
+
+CppWordsHash AllCppWords()
+{
+	CppWordsHash h;
+	h.SetAll();
+	return h;
+}
+
+CppItem& CppNest::GetAdd(const String& _key, const String& _name)
+{
+	int i = key.Find(_key);
+	if(i < 0) {
+		key.Add(_key);
+		name.Add(_name);
+		return item.Add();
+	}
+	return item[i];
+}
+
+bool CppBase::IsType(int i) const
+{
+	return GetKey(i) != "::";
+}
+
+Nestfo::Nestfo(const CppBase& base, int nesti)
+	: nesti(nesti), base(base)
+{
+	Init();
+}
+
+Nestfo::Nestfo(int nesti, const CppBase& base)
+	: nesti(nesti), base(base)
+{
+	Init();
+}
+
+Nestfo::Nestfo(const CppBase& base, const String& nest)
+	: nesti(base.Find(nest)), base(base)
+{
+	Init();
+}
+
+Nestfo::Nestfo(const Nestfo& f)
+	: base(f.base)
+{
+	nests <<= f.nests;
+	bvalid = nvalid = false;
+	nesti = f.nesti;
+}
+
+void Nestfo::Init()
+{
+	bvalid = nvalid = false;
+}
+
+void Nestfo::Bases(int i, Vector<int>& g)
+{
+	LTIMING("GetBases");
+	if(base.IsType(i)) {
+		const CppNest& n = base.nest[i];
+		for(int i = 0; i < n.GetCount(); i++) {
+			const CppItem& im = n[i];
+			if(im.IsType()) {
+				const char *q = im.qptype;
+				const char *b = q;
+				for(;;) {
+					if(*q == ';' || *q == '\0') {
+						if(b < q) {
+							int nq = base.Find(String(b, q));
+							if(nq >= 0)
+								g.Add(nq);
+						}
+						if(*q == '\0')
+							return;
+						q++;
+						b = q;
+					}
+					else
+						q++;
+				}
+			}
+		}
+	}
+}
+
+const Vector<String>& Nestfo::GetBases()
+{
+	if(!bvalid) {
+		bvalid = true;
+		baselist.Clear();
+		if(nesti < 0)
+			return baselist;
+		Vector<int> b;
+		Index<int> bi;
+		Bases(nesti, b);
+		while(b.GetCount()) {
+			Vector<int> bb;
+			for(int i = 0; i < b.GetCount(); i++) {
+				int q = b[i];
+				if(bi.Find(q) < 0) {
+					bi.Add(q);
+					Bases(b[i], bb);
+				}
+			}
+			b = bb;
+		}
+		for(int i = 0; i < bi.GetCount(); i++)
+			baselist.Add(base.GetKey(bi[i]) + "::");
+	}
+	return baselist;
+}
+
+
+const Vector<String>& Nestfo::GetNests()
+{
+	if(!nvalid) {
+		nvalid = true;
+		nests.Clear();
+		if(nesti < 0)
+			return nests;
+		String nn = base.GetKey(nesti);
+		while(nn.GetCount()) {
+			if(nn[0] == ':' && nn.GetCount() == 2) {
+				nests.Add(nn);
+				return nests;
+			}
+			nests.Add(nn + "::");
+			int q = nn.ReverseFind(':');
+			nn.Trim(max(0, q - 1));
+		}
+		nests.Add("::");
+	}
+	return nests;
+}
+
+String Qualify0(Nestfo& nf, const String& type)
+{
+	if(IsNull(type) || type == "const" ||
+	   type == "int" || type == "double" || type == "long" || type == "char" || type == "void")
+		return type;
+	const Vector<String>& nd = nf.GetNests();
+	if(type[0] == ':') {
+		if(nf.base.Find(type) >= 0)
+			return type;
+	}
+	else
+	if(nd.GetCount()) {
+		LTIMING("First test");
+		String qt = nd[0] + type;
+		if(nf.base.Find(qt) >= 0)
+			return qt;
+	}
+	if(nf.GetNest() >= 0) {
+		int q = type.ReverseFind(':');
+		if(q >= 0) {
+			LTIMING("Qualifying qualification");
+			Nestfo hnf(nf);
+			hnf.NoBases();
+			String qn = Qualify(hnf, type.Mid(0, max(q - 1, 0)));
+			if(qn[0] != ':')
+				return type;
+			int nesti = nf.base.Find(qn);
+			if(nesti < 0)
+				return type;
+			String tp = type.Mid(q + 1);
+			Nestfo nnf(nf.base, nesti);
+			const Vector<String>& bs = nnf.GetBases();
+			for(int i = 0; i < bs.GetCount(); i++) {
+				String qt = bs[i] + tp;
+				if(nf.base.Find(qt) >= 0)
+					return qt;
+			}
+		}
+		else {
+			const Vector<String>& bs = nf.GetBases();
+			for(int i = 0; i < bs.GetCount(); i++) {
+				String qt = bs[i] + type;
+				if(nf.base.Find(qt) >= 0)
+					return qt;
+			}
+		}
+	}
+	if(type[0] != ':') {
+		LTIMING("Testing nests");
+		for(int i = 1; i < nd.GetCount(); i++) {
+			String qt = nd[i] + type;
+			if(nf.base.Find(qt) >= 0)
+				return qt;
+		}
+	}
+	return type;
+}
+
+String Qualify(Nestfo& nf, const String& type)
+{
+	int q = nf.cache.Find(type);
+	if(q >= 0)
+		return nf.cache[q];
+	String x = Qualify0(nf, type);
+	nf.cache.Add(type, x);
+	return x;
+}
+
+String QualifyIds(Nestfo& nf, const String& k, CppWordsHash& w)
+{
+	String r;
+	CParser p(k);
+	Vector<String> empty;
+	while(p) {
+		if(p.IsChar2(':', ':')) {
+			String t;
+			while(p.Char2(':', ':')) {
+				t << "::";
+				if(p.IsId()) {
+					String id = p.ReadId();
+					w.AddWord(id);
+					t << id;
+				}
+			}
+			Nestfo nnf(nf.GetNest(), nf.base);
+			t = Qualify(nnf, t);
+			if(iscid(*r.Last()) && iscid(*t))
+				r << ' ';
+			r << t;
+		}
+		else
+		if(p.IsId()) {
+			String t = p.ReadId();
+			w.AddWord(t);
+			while(p.Char2(':', ':')) {
+				t << "::";
+				if(p.IsId()) {
+					String id = p.ReadId();
+					w.AddWord(id);
+					t << id;
+				}
+			}
+			t = Qualify(nf, t);
+			if(iscid(*r.Last()) && iscid(*t))
+				r << ' ';
+			r << t;
+		}
+		else {
+			int c = p.GetChar();
+			r.Cat(c);
+			p.Spaces();
+		}
+	}
+	return r;
+}
+
+String Qualify(const CppBase& base, const String& nest, const String& type)
+{
+	CppWordsHash dummy;
+	Nestfo nf(base, nest);
+	return QualifyIds(nf, type, dummy);
+}
+
+String QualifyKey(const CppBase& base, const String& nest, const String& type)
+{
+	CppWordsHash dummy;
+	Nestfo nf(base, nest);
+	return QualifyIds(nf, type, dummy);
+}
+
+void QualifyTypes(Nestfo& nf, CppItem& m)
+{
+	m.qtype = QualifyIds(nf, m.type, m.words);
+	m.qptype = QualifyIds(nf, m.ptype, m.words);
+}
+
+void QualifyTypes(CppBase& base, const String& nest, CppItem& m)
+{
+	Nestfo nf(base, nest);
+	QualifyTypes(nf, m);
+}
+
+void QualifyPass1(CppBase& base, const CppWordsHash& words)
+{
+	LTIMING("Qualify1");
+	for(int ni = 0; ni < base.GetCount(); ni++) {
+		CppNest& n = base[ni];
+		Nestfo nf(base, ni);
+		for(int i = 0; i < n.GetCount(); i++) {
+			CppItem& m = n.item[i];
+			if((m.words.IsAll() || (m.words & words)) && m.IsType()) {
+				m.words.Clear();
+				QualifyTypes(nf, m);
+			}
+		}
+	}
+}
+
+void QualifyPass2(CppBase& base, const CppWordsHash& words)
+{
+	LTIMING("Qualify2");
+	for(int ni = 0; ni < base.GetCount(); ni++) {
+		CppNest& n = base[ni];
+		Nestfo nf(base, ni);
+		Index<int> rem;
+		for(int i = 0; i < n.GetCount(); i++) {
+			CppItem& m = n.item[i];
+			if((m.words.IsAll() || (words & m.words)) && !m.IsType()) {
+				m.words.Clear();
+				QualifyTypes(nf, m);
+				if(m.IsCode()) {
+					String k = n.key[i];
+					String r = QualifyIds(nf, m.key, m.words);
+					if(k != r) {
+						int q = n.key.Find(r);
+						if(q >= 0 && q != i)
+							if(m.decla) {
+								m.pos.Append(n.item[q].pos);
+								rem.FindAdd(q);
+								n.key.Set(i, r);
+							}
+							else {
+								n.item[q].pos.Append(m.pos);
+								rem.FindAdd(i);
+							}
+						else
+							n.key.Set(i, r);
+					}
+				}
+			}
+		}
+		Vector<int> rm = rem.PickKeys();
+		Sort(rm);
+		n.Remove(rm);
+	}
+}
+
+void   Qualify(CppBase& base, const CppWordsHash& words)
+{
+	LTIMING("Qualify");
+	QualifyPass1(base, words);
+	QualifyPass2(base, words);
+}
+
+void Remove(CppBase& base, const Vector<String>& pf)
+{
+	int ni = 0;
+	Vector<int> file;
+	for(int i = 0; i < pf.GetCount(); i++)
+		file.Add(GetCppFileIndex(pf[i]));
+	while(ni < base.GetCount()) {
+		CppNest& n = base[ni];
+		Vector<int> nr;
+		for(int mi = 0; mi < n.GetCount(); mi++) {
+			CppItem& m = n.item[mi];
+			int i = 0;
+			while(i < m.pos.GetCount())
+				if(FindIndex(file, m.pos[i].file) >= 0)
+					m.pos.Remove(i);
+				else
+					i++;
+			if(m.pos.GetCount() == 0)
+				nr.Add(mi);
+		}
+		n.Remove(nr);
+		if(n.GetCount() == 0)
+			base.nest.Remove(ni);
+		else
+			ni++;
+	}
+}
+
+void CppItem::Serialize(Stream& s)
+{
+	s % kind % access;
+	s % natural % at % tparam % param % pname % tname % type % ptype % virt % key;
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/CppBase/COPYING b/uppsrc/CppBase/COPYING
new file mode 100644
index 000000000..33aa39102
--- /dev/null
+++ b/uppsrc/CppBase/COPYING
@@ -0,0 +1,30 @@
+Copyright (C) 2005 Mirek Fidler, Tomas Rylek and various contributors (see AUTHORS)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to
+deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies of the Software and its Copyright notices. In addition publicly
+documented acknowledgment must be given that this software has been used if no
+source code of this software is made available publicly. This includes
+acknowledgments in either Copyright notices, Manuals, Publicity and Marketing
+documents or any documentation provided with any product containing this
+software. This License does not apply to any software that links to the
+libraries provided by this software (statically or dynamically), but only to
+the software provided.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+-----------
+
+Please see the COPYING.PLAIN for a plain-english explanation of this notice
+and it's intent.
diff --git a/uppsrc/CppBase/COPYING-PLAIN b/uppsrc/CppBase/COPYING-PLAIN
new file mode 100644
index 000000000..770a8132f
--- /dev/null
+++ b/uppsrc/CppBase/COPYING-PLAIN
@@ -0,0 +1,33 @@
+Plain English Copyright Notice
+
+This file is not intended to be the actual License. The reason this file
+exists is that we here are programmers and engineers. We aren't lawyers. We
+provide licenses that we THINK say the right things, but we have our own
+intentions at heart. This is a plain-english explanation of what those
+intentions are, and if you follow them you will be within the "spirit" of
+the license.
+
+The intent is for us to enjoy writing software that is useful to us (the
+AUTHORS) and allow others to use it freely and also benefit from the work we
+put into making it. We don't want to restrict others using it. They should
+not *HAVE* to make the source code of the applications they write that
+simply link to these libraries (be that statically or dynamically), or for
+them to be limited as to what license they choose to use (be it open, closed
+or anything else). But we would like to know you are using these libraries.
+We simply would like to know that it has been useful to someone. This is why
+we ask for acknowledgement of some sort.
+
+You can do what you want with the source of this software - it doesn't
+matter. We still have it here for ourselves and it is open and free to use
+and download and play with. It can't be taken away. We don't really mind what
+you do with the source to your software. We would simply like to know that
+you are using it - especially if it makes it to a commerical product. If you
+simply e-mail all the AUTHORS (see COPYING and AUTHORS files) telling us, and
+then make sure you include a paragraph or page in the manual or in the "About.."
+box for the product with the copyright notice and state that you used this
+software, we will be very happy. If you want to contribute back modifications
+and fixes you may have made we will welcome those too with open arms (generally).
+If you want help with changes needed, ports needed or features to be added,
+arrangements can be easily made with some dialogue.
+
+Mirek Fidler <cxl@ntllib.org>
diff --git a/uppsrc/CppBase/CppBase.h b/uppsrc/CppBase/CppBase.h
new file mode 100644
index 000000000..6f0fe6228
--- /dev/null
+++ b/uppsrc/CppBase/CppBase.h
@@ -0,0 +1,479 @@
+#ifndef DOCPP_H
+#define DOCPP_H
+
+#include <Core/Core.h>
+
+NAMESPACE_UPP
+
+int           GetCppFileIndex(const String& path);
+const String& GetCppFile(int i);
+
+enum {
+	Tmarker_before_first = 255,
+#define CPPID(x)   tk_##x,
+#include "keyword.i"
+#undef  CPPID
+};
+
+class CppWordsHash {
+	dword w[4];
+
+public:
+	void Clear()  { w[0] = w[1] = w[2] = w[3] = 0; }
+	void SetAll() { w[0] = w[1] = w[2] = w[3] = ~0; }
+	void AddWord(const String& s);
+	void AddWords(const char *s);
+
+	bool operator&(const CppWordsHash& b) const {
+		return (w[0] & b.w[0]) | (w[1] & b.w[1]) | (w[2] & b.w[2]) | (w[3] & b.w[3]);
+	}
+
+	bool IsAll() const { return (w[0] & w[1] & w[2] & w[3]) == (dword)~0; }
+
+	CppWordsHash() { Clear(); }
+};
+
+CppWordsHash AllCppWords();
+
+enum {
+	t_eof,
+	t_string = -200,
+	t_integer,
+	t_double,
+	t_character,
+	t_dblcolon,
+	t_mulass,
+	t_divass,
+	t_modass,
+	t_xorass,
+	t_neq,
+	t_dot_asteriks,
+	t_elipsis,
+	t_inc,
+	t_addass,
+	t_dec,
+	t_arrow_asteriks,
+	t_arrow,
+	t_subass,
+	t_and,
+	t_andass,
+	t_or,
+	t_orass,
+	t_eq,
+	t_shl,
+	t_shlass,
+	t_le,
+	t_shr,
+	t_shrass,
+	t_ge,
+	te_integeroverflow,
+	te_badcharacter,
+	te_badstring,
+};
+
+const char **CppKeyword();
+
+class LexSymbolStat
+{
+public:
+	LexSymbolStat();
+	void Reset(int minSymbol, int maxSymbol);
+	void IncStat(int symbol);
+	int  GetStat(int symbol) const;
+	int  SumStat(const Vector<int> & symbols) const;
+	void Merge(const LexSymbolStat & other);
+
+private:
+	Vector<int> v;
+	int minSymbol;
+};
+
+
+class Lex {
+#ifdef _DEBUG
+	const char *pp;
+#endif
+	const char *ptr;
+	const char *pos;
+
+	Index<String> id;
+	Index<int>    ignore;
+	int           endkey;
+	int           braceslevel;
+	int           ignore_low, ignore_high;
+
+	struct Term  : Moveable<Term>{
+		const  char *ptr;
+		int    code;
+		String text;
+		double number;
+	};
+
+	bool statsCollected;
+	LexSymbolStat symbolStat;
+	BiVector<Term> term;
+
+
+	bool Char(int c)                 { if(*ptr == c) { ptr++; return true; } else return false; }
+	void AddCode(int code)           { Term& tm = term.AddTail(); tm.code = code; tm.ptr = pos; }
+	void AssOp(int noass, int ass)   { AddCode(Char('=') ? ass : noass); }
+	void Next();
+	bool Prepare(int pos);
+	int  GetCharacter();
+public:
+	int         Code(int pos = 0);
+	bool        IsId(int pos = 0);
+	String      Id(int pos = 0);
+	int         Int(int pos = 0);
+	double      Double(int pos = 0);
+	int         Chr(int pos = 0);
+	String      Text(int pos = 0);
+
+	void        Get(int n = 1);
+	int         GetCode()                   { int q = Code(); Get(); return q; }
+	String      GetId()                     { String q = Id(); Get(); return q; }
+	int         GetInt()                    { int q = Int(); Get(); return q; }
+	double      GetDouble()                 { double q = Double(); Get(); return q; }
+	int         GetChr()                    { int q = Chr(); Get(); return q; }
+	String      GetText()                   { String q = Text(); Get(); return q; }
+
+	int         Id(const String& s)         { return id.FindAdd(s) + 256; }
+
+	int         GetBracesLevel() const      { return braceslevel; }
+
+	const char *Pos(int pos = 0);
+	int         operator[](int pos)         { return Code(pos); }
+	operator    int()                       { return Code(0); }
+	void        operator++()                { Get(); }
+
+	void        Init(const char *s, const Vector<String>& ignore);
+	void        StartStatCollection();
+	const LexSymbolStat & FinishStatCollection();
+
+	Lex();
+};
+
+struct SrcFile {
+	SrcFile();
+	String      text;
+	Vector<int> linepos;
+	int preprocessorLinesRemoved;
+	int blankLinesRemoved;
+	int commentLinesRemoved;
+};
+
+SrcFile PreProcess(Stream& in);
+
+enum Kind {
+	STRUCT,
+	STRUCTTEMPLATE,
+	TYPEDEF,
+	CONSTRUCTOR,
+	DESTRUCTOR,
+	FUNCTION,
+	INSTANCEFUNCTION,
+	CLASSFUNCTION,
+	FUNCTIONTEMPLATE,
+	INSTANCEFUNCTIONTEMPLATE,
+	CLASSFUNCTIONTEMPLATE,
+	INLINEFRIEND,
+	VARIABLE,
+	INSTANCEVARIABLE,
+	CLASSVARIABLE,
+	ENUM,
+	MACRO,
+};
+
+inline bool IsCppType(int i)
+{
+	return i >= STRUCT && i <= TYPEDEF;
+}
+
+inline bool IsCppCode(int i) {
+	return i >= CONSTRUCTOR && i <= INLINEFRIEND;
+};
+
+inline bool IsCppData(int i) {
+	return i >= VARIABLE && i <= ENUM;
+}
+
+inline bool IsCppMacro(int i) {
+	return i == MACRO;
+}
+
+inline bool IsCppTemplate(int i) {
+	return i == STRUCTTEMPLATE || i >= FUNCTIONTEMPLATE && i <= CLASSFUNCTIONTEMPLATE;
+}
+
+enum {
+	PUBLIC,
+	PROTECTED,
+	PRIVATE,
+};
+
+struct CppPos : Moveable<CppPos> {
+	bool   impl;
+	int    line;
+	int    file;
+
+	String GetFile() const                       { return GetCppFile(file); }
+
+	CppPos()                                     { line = 0; impl = false; }
+};
+
+struct CppSimpleItem {
+	String         natural;
+	String         type;
+	String         qtype;
+	String         tparam;
+	String         param;
+	String         pname;
+	String         ptype;
+	String         qptype;
+	String         tname;
+	byte           access;
+	byte           kind;
+	int16          at;
+	bool           virt;
+	bool           decla;
+
+	bool           IsType() const      { return IsCppType(kind); }
+	bool           IsCode() const      { return IsCppCode(kind); }
+	bool           IsData() const      { return IsCppData(kind); }
+	bool           IsMacro() const     { return IsCppMacro(kind); }
+	bool           IsTemplate() const  { return IsCppTemplate(kind); }
+
+	CppSimpleItem() { decla = false; virt = false; at = 0; }
+};
+
+struct CppItem : CppSimpleItem {
+	Vector<CppPos> pos;
+	String         key;
+	CppWordsHash   words;
+
+	void Serialize(Stream& s);
+
+	CppItem()      { words.SetAll(); }
+};
+
+struct CppNest {
+	int            namespacel;
+	Index<String>  key;
+	Index<String>  name;
+	Array<CppItem> item;
+
+	void           Remove(const Vector<int>& rm)                 { key.Remove(rm); name.Remove(rm); item.Remove(rm); }
+	int            GetCount() const                              { return item.GetCount(); }
+	const CppItem& operator[](int i) const                       { return item[i]; }
+	CppItem&       GetAdd(const String& key, const String& name);
+
+	CppNest()                                                    { namespacel = 0; }
+};
+
+struct CppBase {
+	ArrayMap<String, CppNest> nest;
+
+	CppNest&       operator[](int i)                             { return nest[i]; }
+	int            GetCount() const                              { return nest.GetCount(); }
+	const String&  GetKey(int i) const                           { return nest.GetKey(i); }
+	void           Clear()                                       { nest.Clear(); }
+	int            Find(const String& s) const                   { return nest.Find(s); }
+	CppNest&       GetAdd(const String& s)                       { return nest.GetAdd(s); }
+
+	bool           IsType(int i) const;
+};
+
+class Parser {
+	struct Context {
+		int         namespacel;
+		String      nesting;
+		Vector<int> tparam;
+		Index<int>  typenames;
+		int         access;
+		bool        noclass;
+
+		void operator<<=(const Context& t);
+
+		String  Dump() const;
+	};
+
+	struct Decla {
+		bool    s_static:1;
+		bool    s_extern:1;
+		bool    s_register:1;
+		bool    s_auto:1;
+		bool    s_mutable:1;
+		bool    s_explicit:1;
+		bool    s_virtual:1;
+		String  name;
+		bool    function:1;
+		bool    type_def:1;
+		bool    isfriend:1;
+		bool    istemplate:1;
+		bool    istructor:1;
+		bool    isdestructor:1;
+		bool    isptr:1;
+		bool    nofn:1;
+
+		String  tnames;
+		String  type;
+		String  natural;
+
+		Decla();
+	};
+
+	struct Decl : Decla {
+		Array<Decl> param;
+	};
+
+	struct RecursionCounter
+	{
+		int change;
+		int &count;
+		RecursionCounter(int &count_i, int change_i = 1) :
+		  change(change_i), count(count_i)
+		{
+		  count += change;
+		}
+		~RecursionCounter() { count -= change; }
+	};
+
+	Context     context;
+	SrcFile     file;
+	Lex         lex;
+	int         filei;
+	bool        inbody;
+
+	Callback2<int, const String&> err;
+
+	int     lpos, line;
+
+	CppBase *base;
+
+	int    RPtr();
+
+	bool   Key(int code);
+	bool   EatBody();
+
+	void   Cv();
+	String SimpleType(Decla& d);
+	void   Qualifier();
+	void   ParamList(Decl& d);
+	void   Declarator(Decl& d, const char *p);
+	void   EatInitializers();
+	Decl   Type();
+	void   Vars(Array<Decl>& r, const char *p, bool type_def, bool more);
+	Array<Decl> Declaration(bool l0 = false, bool more = false);
+	bool   IsParamList(int q);
+	void   Elipsis(Decl& d);
+	Decl&  Finish(Decl& d, const char *p);
+	bool   Nest(const String& tp, const String& tn);
+
+	String TemplateParams(String& pnames);
+	String TemplateParams();
+	String TemplatePnames();
+	String Name(String& h);
+	String Name();
+	String Constant();
+	String ReadOper();
+
+	int    GetLine(const char *pos);
+	void   Line();
+	void   Check(bool b, const char *err);
+	void   CheckKey(int c);
+
+	void   SetNestCurrent();
+	void   NestBody();
+	void   Do();
+
+	CppItem& Item(const String& nesting, const String& item, const String& name, bool impl);
+	CppItem& Item(const String& nesting, const String& item, const String& name);
+
+	CppItem& Fn(const Decl& d, const String& templ, bool body, int kind);
+
+	struct Error {};
+
+	void   ThrowError(const String& e);
+	void   Resume(int bl);
+
+	void   MatchPars();
+	bool   TryDecl();
+	void   Statement();
+	void   Locals(const String& type);
+	String Tparam(int& q);
+
+public:
+	struct FunctionStat
+	{
+		FunctionStat(const String & nesting,
+		             const CppItem & cppItem,
+		             const LexSymbolStat &symbolStat,
+		             int maxScopeDepth);
+		String nesting;
+		const CppItem & cppItem;
+		const LexSymbolStat &symbolStat;
+		int maxScopeDepth;
+	};
+
+	bool                      IsInBody() const                   { return inbody; }
+
+	typedef Callback1<const FunctionStat &> FnEndCallback;
+
+	bool                      dobody;
+	String                    current_nest;
+	int                       current_namespacel;
+	String                    current_key;
+	CppItem                   current;
+	int                       currentScopeDepth;
+	int                       maxScopeDepth;
+	VectorMap<String, String> local;
+	FnEndCallback             whenFnEnd;
+	LexSymbolStat             symbolsOutsideFunctions;
+
+	const SrcFile &getPreprocessedFile() { return file; }
+
+	void   Do(Stream& s, const Vector<String>& ignore, CppBase& base, const String& fn,
+	          Callback2<int, const String&> err, const Vector<String>& typenames = Vector<String>());
+
+	Parser() : dobody(false) {}
+};
+
+String NoTemplatePars(const String& type);
+
+class Nestfo {
+	bool           bvalid, nvalid;
+	Vector<String> baselist;
+	Vector<String> nests;
+	int            nesti;
+	void           Bases(int i, Vector<int>& g);
+	void           Init();
+
+public:
+	const CppBase&            base;
+	VectorMap<String, String> cache;
+
+	const Vector<String>& GetBases();
+	const Vector<String>& GetNests();
+	int                   GetNest() const               { return nesti; }
+	void                  NoBases()                     { baselist.Clear(); bvalid = true; }
+
+	Nestfo(const CppBase& base, int nesti = -1);
+	Nestfo(int nesti, const CppBase& base);
+	Nestfo(const CppBase& base, const String& nest);
+	Nestfo(const Nestfo& f);
+};
+
+String Qualify(Nestfo& nf, const String& type);
+String Qualify(const CppBase& base, const String& nest, const String& type);
+void   QualifyTypes(CppBase& base, const String& nest, CppItem& m);
+String QualifyKey(const CppBase& base, const String& nest, const String& type);
+
+void   Qualify(CppBase& base, const CppWordsHash& words);
+
+void Parse(Stream& s, const Vector<String>& ignore, CppBase& base, const String& fn,
+           Callback2<int, const String&> err);
+void Remove(CppBase& base, const Vector<String>& fn);
+
+END_UPP_NAMESPACE
+
+#endif
diff --git a/uppsrc/CppBase/CppBase.upp b/uppsrc/CppBase/CppBase.upp
new file mode 100644
index 000000000..7c800cee6
--- /dev/null
+++ b/uppsrc/CppBase/CppBase.upp
@@ -0,0 +1,22 @@
+description "Partly heurestic (imprecise) C++ parser for purposes of Assist++ (intellisense)";
+
+optimize_speed;
+
+uses
+	Core;
+
+file
+	CppBase.h,
+	keyword.i,
+	Pre.cpp,
+	cpplex.cpp,
+	Parser.cpp,
+	Base.cpp,
+	Info readonly separator,
+	COPYING,
+	COPYING-PLAIN,
+	AUTHORS;
+
+mainconfig
+	"" = "";
+
diff --git a/uppsrc/CppBase/Parser.cpp b/uppsrc/CppBase/Parser.cpp
new file mode 100644
index 000000000..d7b64a83d
--- /dev/null
+++ b/uppsrc/CppBase/Parser.cpp
@@ -0,0 +1,1415 @@
+#include "CppBase.h"
+
+NAMESPACE_UPP
+
+#ifdef _MSC_VER
+#pragma inline_depth(255)
+#pragma optimize("t", on)
+#endif
+
+
+#define LLOG(x) // LOG(x)
+#define LTIMING(x) // TIMING(x)
+
+inline const char *bew(const char *s, const char *t)
+{
+	while(*s)
+		if(*s++ != *t++)
+			return NULL;
+	return t;
+}
+
+String FnItem(const char *s, const char *pname, const char *qname, const String& name) {
+	String res;
+	while(*s) {
+		while(*s && !iscid(*s) && *s != '~')
+			s++;
+		while(iscid(*s) || *s == '~')
+			res.Cat(*s++);
+		if(res == "operator") {
+			while(*s && *s != '(') {
+				if((byte)*s >= ' ')
+					res.Cat(*s);
+				s++;
+			}
+			break;
+		}
+		while(*s && (byte)*s <= ' ')
+			s++;
+		if(*s == '(' && (res == name || res == '~' + name))
+			break;
+		res.Clear();
+	}
+	while(*s) {
+		const char *w = bew(qname, s);
+		if(w && !iscid(*w)) {
+			if(iscid(*res.Last()))
+				res.Cat(' ');
+			res.Cat(name);
+			s = w;
+		}
+		else
+		if(iscid(*s)) {
+			String q;
+			while(iscid(*s))
+				q.Cat(*s++);
+			if(q != "virtual" && q != "inline" && q != "static" && !InScList(q, pname)) {
+				if(iscid(*res.Last()))
+					res.Cat(' ');
+				res.Cat(q);
+			}
+			else
+				while((byte)*s <= ' ' && *s) s++;
+		}
+		else
+		if(*s == '=') {
+			s++;
+			int l = 0;
+			while(*s && !(l == 0 && (*s == ',' || *s == ')'))) {
+				if(*s == '(')
+					l++;
+				else
+				if(*s == ')')
+					l--;
+				s++;
+			}
+		}
+		else
+		if((byte)*s <= ' ') {
+			s++;
+			while((byte)*s <= ' ' && *s)
+				s++;
+		}
+		else
+			res.Cat(*s++);
+	}
+	return res;
+}
+
+String Purify(const char *s, const char *qname, const String& name) {
+	String res;
+	while(*s) {
+		const char *w = bew(qname, s);
+		if(w) {
+			res.Cat(name);
+			s = w;
+		}
+		else
+		if(iscid(*s)) {
+			String q(*s++, 1); //!!! speed up!
+			while(iscid(*s))
+				q.Cat(*s++);
+			if(q != "virtual" && q != "inline" && q != "static")
+				res.Cat(q);
+			else
+				while((byte)*s <= ' ' && *s) s++;
+		}
+		else
+		if((byte)*s <= ' ') {
+			s++;
+			res.Cat(' ');
+			while((byte)*s <= ' ' && *s)
+				s++;
+		}
+		else
+			res.Cat(*s++);
+	}
+	return TrimRight(res);
+}
+
+String Purify(const char *s) {
+	String res;
+	while(*s) {
+		if(iscid(*s)) {
+			String q(*s++, 1); //!!! speed up!
+			while(iscid(*s))
+				q.Cat(*s++);
+			if(q != "virtual" && q != "inline")
+				res.Cat(q);
+			else
+				while((byte)*s <= ' ' && *s) s++;
+		}
+		else
+		if((byte)*s <= ' ') {
+			s++;
+			res.Cat(' ');
+			while((byte)*s <= ' ' && *s)
+				s++;
+		}
+		else
+			res.Cat(*s++);
+	}
+	return TrimRight(res);
+}
+
+void ScAdd(String& s, const String& a)
+{
+	if(a.IsEmpty()) return;
+	if(!s.IsEmpty())
+		s << ';';
+	s << a;
+}
+
+String Parser::Context::Dump() const
+{
+	return "Nesting: " + nesting;
+}
+
+Parser::FunctionStat::FunctionStat(const String & nesting,
+                                   const CppItem & cppItem,
+		                           const LexSymbolStat &symbolStat,
+		                           int maxScopeDepth) :
+	nesting(nesting), cppItem(cppItem),
+	symbolStat(symbolStat), maxScopeDepth(maxScopeDepth)
+{
+}
+
+void Parser::Context::operator<<=(const Context& t)
+{
+	nesting = t.nesting;
+	typenames <<= t.typenames;
+	tparam <<= t.tparam;
+	access = t.access;
+	noclass = t.noclass;
+	namespacel = t.namespacel;
+}
+
+Parser::Decla::Decla()
+{
+	function = type_def = false;
+	s_static = s_auto = s_register = s_extern = s_mutable = s_explicit = s_virtual = false;
+	isfriend = istemplate = istructor = isptr = nofn = false;
+}
+
+
+bool Parser::Key(int code)
+{
+	if(lex == code) {
+		++lex;
+		return true;
+	}
+	return false;
+}
+
+int  Parser::GetLine(const char *p)
+{
+	int pos = int(p - ~file.text);
+	int l = 0;
+	int h = file.linepos.GetCount();
+	while(l < h) {
+		int q = (l + h) / 2;
+		if(file.linepos[q] < pos)
+			l = q + 1;
+		else
+			h = q;
+	}
+	return l;
+}
+
+void Parser::Line()
+{
+	int pos = int(lex.Pos() - ~file.text);
+	while(line + 1 < file.linepos.GetCount() && file.linepos[line + 1] <= pos)
+		line++;
+}
+
+void Parser::ThrowError(const String& e)
+{
+	err(GetLine(lex.Pos()), e);
+	LLOG(e);
+	throw Error();
+}
+
+void Parser::Check(bool b, const char *err)
+{
+	if(!b) ThrowError(err);
+}
+
+void Parser::CheckKey(int c)
+{
+	if(!Key(c)) ThrowError(Format("Missing %c", c));
+}
+
+String Parser::TemplateParams(String& param)
+{
+	const char *pos = lex.Pos();
+	CheckKey('<');
+	int level = 1;
+	String id;
+	bool gp = true;
+	while(lex != t_eof) {
+		if(lex.IsId() && gp)
+			id = lex.GetId();
+		else
+		if(Key(',')) {
+			ScAdd(param, id);
+			id.Clear();
+			gp = true;
+		}
+		else
+		if(Key('=')) {
+			if(!id.IsEmpty()) {
+				ScAdd(param, id);
+				id.Clear();
+			}
+			gp = false;
+		}
+		else
+		if(Key('>')) {
+			level--;
+			if(level <= 0) {
+				ScAdd(param, id);
+				break;
+			}
+		}
+		else
+		if(Key('<'))
+			level++;
+		else
+			++lex;
+	}
+	return String(pos, lex.Pos());
+}
+
+String Parser::TemplateParams()
+{
+	String dummy;
+	return TemplateParams(dummy);
+}
+
+String Parser::TemplatePnames()
+{
+	String pnames;
+	TemplateParams(pnames);
+	return pnames;
+}
+
+String Parser::ReadOper() {
+	const char *p = lex.Pos();
+	Key(tk_operator);
+	int level = 0;
+	if(Key('('))
+		level++;
+	for(;;) {
+		if(lex == t_eof || level <= 0 && lex == '(') break;
+		if(Key('(') || Key('[')) level++;
+		else
+		if(Key(')')  || Key(']')) level--;
+		else
+			++lex;
+	}
+	StringBuffer r;
+	while(p < lex.Pos()) {
+		if((byte)*p > ' ')
+			r.Cat(*p);
+		p++;
+	}
+	return r;
+}
+
+String Parser::Name(String& name)
+{
+	String s;
+	if(Key(t_dblcolon)) {
+		s << "::";
+		name = s;
+	}
+	Check(lex.IsId() || lex == tk_operator, "Name expected");
+	for(;;) {
+		if(lex.IsId()) {
+			name << lex.Id();
+			s << lex.GetId();
+		}
+		else {
+			String h = ReadOper();
+			name << h;
+			s << h;
+			break;
+		}
+		if(lex == '<')
+			s << TemplateParams();
+		if(Key(t_dblcolon)) {
+			s << "::";
+			name << "::";
+			if(Key('~')) {
+				s << "~";
+				name << "~";
+			}
+		}
+		else
+			break;
+	}
+	return s;
+}
+
+String Parser::Name()
+{
+	String h;
+	return Name(h);
+}
+
+String Parser::Constant()
+{
+	const char *p = lex.Pos();
+	const char *p1 = p;
+	int level = 0;
+	for(;;) {
+		p1 = lex.Pos();
+		if(lex == t_eof) break;
+		if(level <= 0 && (lex == ',' || lex == ';' || lex == ')' || lex == '}' || lex == ']'))
+			break;
+		if(Key('(') || Key('[') || Key('{')) level++;
+		else
+		if(Key(')') || Key(']') || Key('}')) level--;
+		else
+			++lex;
+	}
+	return String(p, p1);
+}
+
+String Parser::SimpleType(Decla& d)
+{
+	if(Key(tk_struct) || Key(tk_class) || Key(tk_union) || Key(tk_enum) || Key(tk_typename)) {
+		if(lex.IsId() || lex == t_dblcolon) d.type = Name();
+		if(lex == '{') EatBody();
+		return Null;
+	}
+	if(Key(tk_bool) || Key(tk_float) || Key(tk_double) || Key(tk_void))
+		return Null;
+	bool sgn = Key(tk_signed) || Key(tk_unsigned);
+	if(Key(tk_long)) {
+		Key(tk_long);
+		Key(tk_int) || Key(tk_double);
+		return Null;
+	}
+	if(Key(tk_short)) {
+		Key(tk_int);
+		return Null;
+	}
+	if(Key(tk_int) || Key(tk_char) ||
+	   Key(tk___int8) || Key(tk___int16) || Key(tk___int32) || Key(tk___int64)) return Null;
+	if(sgn) return Null;
+	const char *p = lex.Pos();
+	bool cs = false;
+	Index<int> cix;
+	if(Key(t_dblcolon))
+		d.type << "::";
+	Check(lex.IsId(), "Name expected");
+	while(lex.IsId()) {
+		int q = FindIndex(context.tparam, lex[0]);
+		if(q >= 0) {
+			d.type << AsString(q);
+			++lex;
+			break;
+		}
+		else {
+			d.type << lex.Id();
+			if(cix.Find(lex) >= 0)
+				cs = true;
+			else
+				cix.Add(lex);
+			++lex;
+			if(lex == '<')
+				d.type << TemplateParams();
+			if(Key(t_dblcolon)) {
+				d.type << "::";
+				if(Key('~'))
+					cs = true;
+			}
+			else
+				break;
+		}
+	}
+	return cs ? String(p, lex.Pos()) : String();
+}
+
+void Parser::Qualifier()
+{
+	Key(tk_const);
+	Key(tk_volatile);
+	if(Key(tk_throw)) {
+		while(lex != t_eof && !Key(')'))
+			++lex;
+	}
+}
+
+void Parser::Elipsis(Decl& d)
+{
+	Decl& q = d.param.Add();
+	q.name = "...";
+	CheckKey(')');
+}
+
+void Parser::ParamList(Decl& d) {
+	if(!Key(')'))
+		for(;;) {
+			if(Key(t_elipsis)) {
+				Elipsis(d);
+				break;
+			}
+			else
+				d.param.Add() = Declaration().Top();
+			if(Key(t_elipsis)) {
+				Elipsis(d);
+				break;
+			}
+			if(Key(')')) break;
+			CheckKey(',');
+		}
+}
+
+int Parser::RPtr()
+{
+	int n = 0;
+	int tlevel = 0;
+	for(;;) {
+		int t = lex[n];
+		if(t == '*') return n + 1;
+		if(t == '<') {
+			tlevel++;
+			n++;
+		}
+		else
+		if(t == '>') {
+			tlevel--;
+			n++;
+		}
+		else
+		if(t == t_dblcolon || lex.IsId(n) || t == ',' && tlevel > 0)
+			n++;
+		else
+			return 0;
+	}
+}
+
+void Parser::EatInitializers()
+{
+	if(Key(':')) {
+		while(lex != '{' && lex != t_eof) ++lex;
+	}
+}
+
+void Parser::Declarator(Decl& d, const char *p)
+{
+	int n = RPtr();
+	if(n) {
+		while(n--) lex.Get();
+		Declarator(d, p);
+		d.isptr = true;
+		return;
+	}
+	if(Key('&')) {
+		Declarator(d, p);
+		return;
+	}
+	if(Key(tk_const)) {
+		Declarator(d, p);
+		return;
+	}
+	if(Key('(')) {
+		Declarator(d, p);
+		if(d.isptr)
+			d.nofn = true;
+		CheckKey(')');
+	}
+//	if(lex == tk_operator)
+//		d.name = ReadOper();
+//	else
+	if(lex.IsId() || lex == t_dblcolon || lex == tk_operator) {
+		d.name = Name();
+		if(Key(':'))
+			if(!Key(t_integer))
+				Name();
+	}
+	if(Key('(')) {
+		if(inbody || (lex < 256 || lex == tk_true || lex == tk_false)
+		   && lex != ')' && lex != t_dblcolon) {
+			int level = 0;
+			for(;;) {
+				if(lex == t_eof) break;
+				if(Key('(')) level++;
+				else
+				if(Key(')')) {
+					if(--level < 0) break;
+				}
+				else
+					++lex;
+			}
+			return;
+		}
+		else {
+			d.function = !d.nofn;
+			ParamList(d);
+			p = lex.Pos();
+			Qualifier();
+		}
+	}
+	EatInitializers();
+	while(Key('[')) {
+		int level = 1;
+		while(level && lex != t_eof) {
+			if(Key('[')) level++;
+			else
+			if(Key(']')) level--;
+			else
+				++lex;
+		}
+	}
+	if(Key('=') || (inbody && lex == '(')) {
+		int lvl = 0;
+		for(;;) {
+			if(lex == t_eof || lvl == 0 && (lex == ',' || lex == ')' || lex == ';'))
+				break;
+			if(Key('('))
+				lvl++;
+			else
+			if(Key(')'))
+				lvl--;
+			else
+				++lex;
+		}
+	}
+}
+
+Parser::Decl& Parser::Finish(Decl& d, const char *s)
+{
+	d.natural = String(s, lex.Pos());
+	return d;
+}
+
+Parser::Decl Parser::Type() {
+	Decl d;
+	const char *p = lex.Pos();
+	Qualifier();
+	SimpleType(d);
+	Declarator(d, p);
+	return Finish(d, p);
+}
+
+bool Parser::IsParamList(int q)
+{
+	return true;
+}
+
+Array<Parser::Decl> Parser::Declaration(bool l0, bool more)
+{
+	Array<Decl> r;
+	Decla d;
+	const char *p = lex.Pos();
+	if(Key(tk_typedef)) {
+		r = Declaration(false, true);
+		for(int i = 0; i < r.GetCount(); i++) {
+			r[i].type_def = true;
+			r[i].natural = "typedef " + r[i].natural;
+		}
+		return r;
+	}
+	if(Key(tk_friend))
+		d.isfriend = true;
+	for(;;) {
+		if(Key(tk_static))
+			d.s_static = true;
+		else
+		if(Key(tk_extern))
+			d.s_extern = true;
+		else
+		if(Key(tk_auto))
+			d.s_auto = true;
+		else
+		if(Key(tk_register))
+			d.s_register = true;
+		else
+		if(Key(tk_mutable))
+			d.s_mutable = true;
+		else
+		if(Key(tk_explicit))
+			d.s_explicit = true;
+		else
+		if(Key(tk_virtual))
+			d.s_virtual = true;
+		else
+		if(!Key(tk_inline))
+			break;
+	}
+	Qualifier();
+	bool isdestructor = Key('~');
+	if(l0 && context.typenames.Find(lex) >= 0 && lex[1] == '(' && lex.IsId()) {
+		Decl& a = r.Add();
+		a.name = lex.GetId();
+		a.isdestructor = isdestructor;
+		a.function = true;
+		a.istructor = true;
+		++lex;
+		ParamList(a);
+		Qualifier();
+		a.natural = String(p, lex.Pos());
+		EatInitializers();
+		return r;
+	}
+	if(lex == tk_operator) {
+		Decl& a = r.Add();
+		(Decla&)a = d;
+		a.name = ReadOper();
+		Key('(');
+		ParamList(a);
+		Qualifier();
+		a.function = true;
+		a.natural = String(p, lex.Pos());
+		return r;
+	}
+	String st = SimpleType(d);
+	if(!st.IsEmpty()) {
+		Decl& a = r.Add();
+		a.name = st;
+		a.isdestructor = st.Find('~') > 0;
+		a.function = true;
+		a.istructor = true;
+		if(Key('('))
+			ParamList(a);
+		Qualifier();
+		a.natural = String(p, lex.Pos());
+		EatInitializers();
+		return r;
+	}
+	String natural1 = String(p, lex.Pos());
+	do {
+		const char *p1 = lex.Pos();
+		Decl& a = r.Add();
+		(Decla&)a = d;
+		Declarator(a, p);
+		a.natural = natural1 + String(p1, lex.Pos());
+		p = lex.Pos();
+	}
+	while(more && Key(','));
+	return r;
+}
+
+void Parser::Locals(const String& type)
+{
+	Array<Parser::Decl> d = Declaration(true, true);
+	for(int i = 0; i < d.GetCount(); i++)
+		local.Add(d[i].name, type);
+}
+
+String Parser::Tparam(int& q)
+{
+	if(lex[q] != '<')
+		return Null;
+	const char *p = lex.Pos(q);
+	int level = 1;
+	q++;
+	while(lex[q] != t_eof && level) {
+		if(lex[q] == '<')
+			level++;
+		if(lex[q] == '>')
+			level--;
+		q++;
+	}
+	return String(p, lex.Pos(q));
+}
+
+String NoTemplatePars(const String& s)
+{
+	int q = s.Find('<');
+	return q >= 0 ? s.Mid(0, q) : s;
+}
+
+bool Parser::TryDecl()
+{
+	int q = 0;
+	while(lex[0] == tk_static || lex[0] == tk_const || lex[0] == tk_auto ||
+	      lex[0] == tk_register || lex[0] == tk_volatile)
+	      	++lex;
+	int t = lex[q];
+	if(t == tk_int || t == tk_bool || t == tk_float || t == tk_double || t == tk_void ||
+	   t == tk_long || t == tk_signed || t == tk_unsigned || t == tk_short ||
+	   t == tk_char || t == tk___int8 || t == tk___int16 || t == tk___int32 || t == tk___int64) {
+		while(lex[q] == '*' || lex[q] == '&')
+			q++;
+		if(!lex.IsId(q))
+			return false;
+		Locals(Null);
+		return true;
+	}
+	String type;
+	if(lex[q] == t_dblcolon) {
+		type << "::";
+		q++;
+	}
+	if(lex.IsId(q)) {
+		type << lex.Id(q++);
+		type << Tparam(q);
+	}
+	else
+		return false;
+	while(lex[q] == t_dblcolon) {
+		type << "::";
+		if(lex.IsId(++q))
+			type << lex.Id(q++);
+		else
+			return false;
+		type << Tparam(q);
+	}
+	while(lex[q] == '*' || lex[q] == '&')
+		q++;
+	if(!lex.IsId(q))
+		return false;
+	type = Qualify(*base, current_nest, type);
+	if(base->Find(NoTemplatePars(type)) >= 0) {
+		Locals(type);
+		return true;
+	}
+	return false;
+}
+
+void Parser::MatchPars()
+{
+	int level = 1;
+	while(level && lex != t_eof) {
+		if(Key('(')) level++;
+		else
+		if(Key(')')) level--;
+		else
+			++lex;
+	}
+}
+
+void Parser::Statement()
+{
+	RecursionCounter recursionCounter(currentScopeDepth, lex == '{' ? 0 : 1);
+	maxScopeDepth = max(maxScopeDepth, currentScopeDepth);
+
+	if(Key(tk_case)) {
+		if(lex.IsId())
+			++lex;
+		Key(':');
+	}
+	if(Key(tk_default))
+		Key(':');
+	if(lex.IsId() && lex[1] == ':') {
+		++lex;
+		++lex;
+	}
+	if(Key('{')) {
+		int l = local.GetCount();
+		while(!Key('}')) {
+			if(lex == t_eof)
+				ThrowError("");
+			Statement();
+		}
+		local.Trim(l);
+	}
+	else
+	if(Key(tk_if)) {
+		int l = local.GetCount();
+		Key('(');
+		TryDecl();
+		MatchPars();
+		Statement();
+		if(Key(tk_else))
+			Statement();
+		local.Trim(l);
+	}
+	else
+	if(Key(tk_for)) {
+		int l = local.GetCount();
+		Key('(');
+		TryDecl();
+		MatchPars();
+		Statement();
+		local.Trim(l);
+	}
+	else
+	if(Key(tk_while)) {
+		int l = local.GetCount();
+		Key('(');
+		TryDecl();
+		MatchPars();
+		Statement();
+		local.Trim(l);
+	}
+	else
+	if(Key(tk_try))
+		Statement();
+	else
+	if(Key(tk_catch)) {
+		Key('(');
+		MatchPars();
+		Statement();
+	}
+	else
+	if(Key(tk_do)) {
+		Statement();
+		Key(tk_while);
+		Key('(');
+		MatchPars();
+	}
+	else
+	if(Key(tk_switch)) {
+		int l = local.GetCount();
+		Key('(');
+		TryDecl();
+		MatchPars();
+		Statement();
+		local.Trim(l);
+	}
+	else
+	if(TryDecl())
+		Key(';');
+	else
+		for(;;) {
+			if(lex == t_eof)
+				ThrowError("");
+			if(Key(';') || lex == '{' || lex == '}' || lex >= tk_if && lex <= tk_do)
+				break;
+			++lex;
+		}
+}
+
+bool Parser::EatBody()
+{
+	if(lex != '{') return false;
+	maxScopeDepth = currentScopeDepth = dobody ? 0 : 1;
+	if(dobody) {
+		inbody = true;
+		Statement();
+		inbody = false;
+		local.Clear();
+	}
+	else {
+		Key('{');
+		int level = 1;
+		while(level && lex != t_eof) {
+			if(Key('{')) level++;
+			else
+			if(Key('}')) level--;
+			else
+				++lex;
+			maxScopeDepth = max(level, maxScopeDepth);
+		}
+	}
+	return true;
+}
+
+String CleanTp(const String& tp)
+{
+	int q = tp.Find('<');
+	int w = tp.ReverseFind('>');
+	if(q < 0 || w < 0) return tp;
+	String a = TrimLeft(TrimRight(tp.Mid(q + 1, w - q - 1)));
+	const char *s = a;
+	String r;
+	while(*s) {
+		if(*s == ',') {
+			r.Cat(';');
+			s++;
+			while(*s && *s <= ' ')
+				s++;
+		}
+		else
+			r.Cat(*s++);
+	}
+	return r;
+}
+
+void Parser::SetNestCurrent()
+{
+	current_nest = Nvl(context.nesting, "::");
+}
+
+CppItem& Parser::Item(const String& nesting, const String& item, const String& name, bool impl)
+{
+	current_nest = Nvl(nesting, "::");
+	if(dobody)
+		current = CppItem();
+	current_key = item;
+	CppNest& n = base->GetAdd(current_nest);
+	n.namespacel = current_namespacel = context.namespacel;
+	CppItem& im = dobody ? current : n.GetAdd(item, name);
+	im.key = item;
+	CppPos& p = im.pos.Add();
+	p.file = filei;
+	p.line = line + 1;
+	p.impl = impl;
+	return im;
+}
+
+CppItem& Parser::Item(const String& nesting, const String& item, const String& name)
+{
+	String h = Purify(item);
+	CppItem& im = Item(nesting, h, name, false);
+	im.natural = h;
+	return im;
+}
+
+void Parser::Resume(int bl)
+{
+	for(;;) {
+		if(lex == t_eof || lex.GetBracesLevel() == bl && lex == ';')
+			break;
+		++lex;
+	}
+}
+
+void Parser::NestBody()
+{
+	int bl = lex.GetBracesLevel();
+	while(!Key('}')) {
+		if(lex == t_eof)
+			ThrowError("Unexpected end of file");
+		try {
+			Do();
+		}
+		catch(Error) {
+			Resume(bl);
+			Key(';');
+		}
+	}
+}
+
+void TpSkip(CParser& p)
+{
+	int lvl = 0;
+	for(;;) {
+		if(lvl == 0 && (p.IsChar(',') || p.IsChar('>')) || p.IsEof())
+			break;
+		if(p.Char('<'))
+			lvl++;
+		else
+		if(p.Char('>'))
+			lvl--;
+		else
+			p.SkipTerm();
+	}
+}
+
+String Subst(const String& s, const Vector<String>& tpar)
+{
+	if(tpar.GetCount() == 0)
+		return s;
+	String r;
+	CParser p(s);
+	while(!p.IsEof()) {
+		if(p.IsId()) {
+			String id = p.ReadId();
+			int q = FindIndex(tpar, id);
+			if(q >= 0)
+				r << AsString(q);
+			else
+				r << id;
+		}
+		else
+			r << p.GetChar();
+	}
+	return r;
+}
+
+bool Parser::Nest(const String& tp, const String& tn) {
+	if(Key(tk_namespace)) {
+		Check(lex.IsId(), "Expected name of namespace");
+		String name = lex.GetId();
+		if(Key('{')) {
+			Context cc;
+			cc <<= context;
+			context.nesting << "::" << name;
+			context.namespacel = context.nesting.GetLength();
+			NestBody();
+			context <<= cc;
+		}
+		Key(';');
+		SetNestCurrent();
+		return true;
+	}
+	if((lex == tk_class || lex == tk_struct || lex == tk_union) && lex[1] != '{') {
+		int t = lex.GetCode();
+		context.typenames.FindAdd(lex);
+		Context cc;
+		cc <<= context;
+		CParser p(tp);
+		Vector<String> tpar;
+		if(p.Char('<')) {
+			while(!p.IsEof() && !p.Char('>')) {
+				if((p.Id("class") || p.Id("typename") || p.Id("struct")) && p.IsId()) {
+					tpar.Add(p.ReadId());
+					context.tparam.Add(lex.Id(tpar.Top()));
+				}
+				else
+					context.tparam.Add(0);
+				TpSkip(p);
+				p.Char(',');
+			}
+		}
+		if(Key(t_dblcolon))
+			context.nesting = Null;
+		String name;
+		do {
+			Check(lex.IsId(), "Missing identifier");
+			context.typenames.FindAdd(lex);
+			name = lex.GetId();
+			context.nesting << "::" << name;
+		}
+		while(Key(t_dblcolon));
+		context.access = t == tk_class ? PRIVATE : PUBLIC;
+		context.noclass = false;
+		String nn;
+		if(!tp.IsEmpty())
+			nn = "template " + tp + " ";
+		String key = (t == tk_class ? "class" : t == tk_union ? "union" : "struct");
+		nn << key << ' ' << name;
+		CppItem& im = Item(context.nesting, key, name, lex != ';');
+		if(Key(';')) {
+			context = cc;
+			SetNestCurrent();
+			return true;
+		}
+		im.kind = tp.IsEmpty() ? STRUCT : STRUCTTEMPLATE;
+		im.type = name;
+		im.access = cc.access;
+		im.tname = tn;
+		im.tparam = CleanTp(tp);
+		im.ptype.Clear();
+		im.pname.Clear();
+		im.param.Clear();
+		if(Key(':')) {
+			nn << " : ";
+			bool c = false;
+			do {
+				String access = t == tk_class ? "private" : "public";
+				if(Key(tk_public)) access = "public";
+				else
+				if(Key(tk_protected)) access = "protected";
+				else
+				if(Key(tk_private)) access = "private";
+				if(Key(tk_virtual)) access << " virtual";
+				String h;
+				String n = Name(h);
+				ScAdd(im.pname, h);
+				if(c)
+					im.ptype << ';';
+				im.ptype << Subst(n, tpar);
+				ScAdd(im.param, access + ' ' + n);
+				if(c)
+					nn << ", ";
+				nn << access + ' ' + n;
+				c = true;
+			}
+			while(Key(','));
+		}
+		if(Key('{')) {
+			NestBody();
+			im.natural = nn;
+			im.decla = true;
+		}
+		else
+			if(IsNull(im.natural))
+				im.natural = nn;
+		context = cc;
+		CheckKey(';');
+		SetNestCurrent();
+		return true;
+	}
+	return false;
+}
+
+String DeTemp(const char *s)
+{
+	String r;
+	return r;
+}
+
+CppItem& Parser::Fn(const Decl& d, const String& templ, bool body, int kind)
+{
+	String param;
+	String pname;
+	String ptype;
+	for(int i = 0; i < d.param.GetCount(); i++) {
+		const Decla& p = d.param[i];
+		ScAdd(param, p.natural);
+		if(i)
+			ptype << ';';
+		ptype << p.type;
+		ScAdd(pname, p.name);
+	}
+	String nn0;
+	String nm = d.name;
+	int q = d.name.ReverseFind(':');
+	if(q >= 0) {
+		nm = d.name.Mid(q + 1);
+		if(q > 0)
+			nn0 = d.name.Mid(0, q - 1);
+	}
+	String item = FnItem(d.natural, pname, d.name, nm);
+	String nesting = context.nesting;
+	String nn;
+	const char *s = nn0;
+	int l = 0;
+	while(*s) {
+		if(*s == '<')
+			l++;
+		else
+		if(*s == '>')
+			l--;
+		else
+		if(l == 0)
+			nn.Cat(*s);
+		s++;
+	}
+	if(*nn == ':')
+		nesting = nn;
+	else
+	if(!IsNull(nn))
+		nesting << "::" << nn;
+	CppItem& im = Item(nesting, item, nm, body);
+	if(!body || IsNull(im.natural)) {
+		im.natural.Clear();
+		if(!IsNull(templ)) {
+			im.natural = templ;
+			im.at = im.natural.GetLength();
+		}
+		im.natural << Purify(d.natural, d.name, nm);
+		im.kind = kind;
+		im.param = param;
+		im.pname = pname;
+		im.ptype = ptype;
+		im.access = context.access;
+		im.virt = d.s_virtual;
+		im.type = d.type;
+		im.decla = true;
+	}
+	return im;
+}
+
+void Parser::Do()
+{
+	Line();
+	if(Key(tk_using)) {
+		while(!Key(';') && lex != t_eof)
+			++lex;
+	}
+	else
+	if(Key(tk_extern) && lex == t_string) {
+		++lex;
+		++lex;
+		if(Key('{')) {
+			int bl = lex.GetBracesLevel();
+			while(lex != '}')
+				try {
+					if(lex == t_eof)
+						ThrowError("Unexpected end of file");
+					Do();
+				}
+				catch(Error) {
+					Resume(bl);
+				}
+		}
+		Key(';');
+	}
+	else
+	if(Key(tk_template)) {
+		if(lex.IsId() || lex == tk_class && lex.IsId(1)) {
+			Key(tk_class);
+			for(;;) {
+				if(lex.IsId())
+					lex.GetId();
+				else
+				if(!Key(t_dblcolon))
+					break;
+			}
+			TemplateParams();
+			Key(';');
+		}
+		else {
+			String tnames;
+			String tparam = TemplateParams(tnames);
+			if(!Nest(tparam, tnames)) {
+				Array<Decl> r = Declaration(true, true);
+				CppItem *functionItem = 0;
+				bool body = lex == '{';
+				for(int i = 0; i < r.GetCount(); i++) {
+					Decl& d = r[i];
+					if(!d.isfriend && d.function) {
+						CppItem& m = Fn(d, "template " + tparam + ' ', body,
+						                context.noclass ? FUNCTIONTEMPLATE :
+								        d.s_static ? CLASSFUNCTIONTEMPLATE :
+								                     INSTANCEFUNCTIONTEMPLATE);
+						m.tname = tnames;
+						m.tparam = CleanTp(tparam);
+						functionItem = &m;
+					}
+				}
+				if(body && functionItem && whenFnEnd) {
+					symbolsOutsideFunctions.Merge( lex.FinishStatCollection() );
+					lex.StartStatCollection(); // start collection of function symbols
+				}
+				EatBody();
+				if(body && functionItem && whenFnEnd) {
+					whenFnEnd(FunctionStat(current_nest, *functionItem,
+					                       lex.FinishStatCollection(), maxScopeDepth));
+					lex.StartStatCollection(); // start collection of orphan symbols
+				}
+				Key(';');
+			}
+			EatBody();
+		}
+	}
+	else
+	if(lex == tk_enum && (lex[1] == '{' || lex[2] == '{')) {
+		++lex;
+		String name;
+		if(lex.IsId())
+			name = lex.GetId();
+		if(Key('{')) {
+			for(;;) {
+				Line();
+				String val;
+				Check(lex.IsId(), "Expected identifier");
+				String id = lex.GetId();
+				CppItem& im = Item(context.nesting, id, id);
+				im.natural = "enum ";
+				if(!IsNull(name))
+					im.natural << name << ' ';
+				im.natural << id;
+				if(Key('='))
+					im.natural << " = " << Constant();
+				im.kind = ENUM;
+				im.access = context.access;
+				Key(',');
+				if(Key('}')) break;
+			}
+		}
+		Key(';');
+		SetNestCurrent();
+	}
+	else
+	if(Key('#')) {
+		if(lex.Code() == t_string) {
+			String n = lex.GetText();
+			String name;
+			const char *s = n;
+			while(*s && iscid(*s))
+				name.Cat(*s++);
+			CppItem& im = Item(context.nesting, n, name);
+			im.kind = MACRO;
+			s = strchr(n, '(');
+			if(s) {
+				s++;
+				String p;
+				for(;;) {
+					if(iscid(*s))
+						p.Cat(*s++);
+					else {
+						ScAdd(im.pname, p);
+						p.Clear();
+						if(*s == ')' || *s == '\0') break;
+						s++;
+					}
+				}
+			}
+			im.access = context.access;
+		}
+	}
+	else
+	if(!Nest(String(), String())) {
+		if(Key(tk_public)) {
+			context.access = PUBLIC;
+			Key(':');
+		}
+		else
+		if(Key(tk_private)) {
+			context.access = PRIVATE;
+			Key(':');
+		}
+		else
+		if(Key(tk_protected)) {
+			context.access = PROTECTED;
+			Key(':');
+		}
+		else {
+			Array<Decl> r = Declaration(true, true);
+			CppItem *functionItem = 0;
+			bool body = lex == '{';
+			for(int i = 0; i < r.GetCount(); i++) {
+				Decl& d = r[i];
+				if(!d.isfriend || body) {
+					if(d.function) {
+						CppItem &im =
+						  Fn(d, Null, body, d.istructor ? (d.isdestructor ? DESTRUCTOR : CONSTRUCTOR) :
+						                    d.isfriend ? INLINEFRIEND :
+						                    context.noclass ? FUNCTION :
+						                    d.s_static ? CLASSFUNCTION : INSTANCEFUNCTION);
+						functionItem = &im;
+					}
+					else {
+						String h = d.natural;
+						int q = h.Find('=');
+						if(q >= 0)
+							h = TrimRight(h.Mid(0, q));
+						String nest = context.nesting;
+						if(d.type_def)
+							nest << "::" << d.name;
+						CppItem& im = Item(nest, d.type_def ? "typedef" : d.name, d.name);
+						im.natural = Purify(h);
+						im.type = im.ptype = d.type;
+						im.access = context.access;
+						im.kind = d.type_def ? TYPEDEF :
+						          context.noclass ? VARIABLE :
+						          d.s_static ? CLASSVARIABLE : INSTANCEVARIABLE;
+					}
+				}
+			}
+			if(body && functionItem && whenFnEnd) {
+				symbolsOutsideFunctions.Merge( lex.FinishStatCollection() );
+				lex.StartStatCollection(); // start collection of function symbols
+			}
+			EatBody();
+			if(body && functionItem && whenFnEnd) {
+				whenFnEnd(FunctionStat(current_nest, *functionItem,
+				                       lex.FinishStatCollection(), maxScopeDepth));
+				lex.StartStatCollection(); // start collection of orphan symbols
+			}
+			SetNestCurrent();
+			Key(';');
+		}
+	}
+}
+
+void Parser::Do(Stream& in, const Vector<String>& ignore, CppBase& _base, const String& fn,
+                Callback2<int, const String&> _err, const Vector<String>& typenames)
+{
+	base = &_base;
+	file = PreProcess(in);
+	lex.Init(~file.text, ignore);
+	err = _err;
+	current_nest = "::";
+	context.access = PUBLIC;
+	context.noclass = true;
+	context.typenames.Clear();
+	for(int i = 0; i < typenames.GetCount(); i++)
+		context.typenames.Add(lex.Id(typenames[i]));
+	context.namespacel = 0;
+	inbody = false;
+	filei = GetCppFileIndex(fn);
+	lpos = 0;
+	line = 0;
+	if(whenFnEnd)
+		lex.StartStatCollection();
+
+	while(lex != t_eof)
+		try {
+			Do();
+		}
+		catch(Error) {
+			Resume(lex.GetBracesLevel());
+			Key(';');
+		}
+}
+
+void Parse(Stream& s, const Vector<String>& ignore, CppBase& base, const String& fn,
+           Callback2<int, const String&> _err)
+{
+	LTIMING("Parse");
+	Parser p;
+	p.Do(s, ignore, base, fn, _err);
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/CppBase/Pre.cpp b/uppsrc/CppBase/Pre.cpp
new file mode 100644
index 000000000..0d6efe265
--- /dev/null
+++ b/uppsrc/CppBase/Pre.cpp
@@ -0,0 +1,188 @@
+#include "CppBase.h"
+
+NAMESPACE_UPP
+
+#ifdef _MSC_VER
+#pragma inline_depth(255)
+#pragma optimize("t", on)
+#endif
+
+static StaticMutex   cpp_file_mutex;
+static Index<String> cpp_file;
+
+int GetCppFileIndex(const String& path)
+{
+	INTERLOCKED_(cpp_file_mutex) {
+		return cpp_file.FindAdd(path);
+	}
+	return -1;
+}
+
+const String& GetCppFile(int i)
+{
+	INTERLOCKED_(cpp_file_mutex) {
+		return cpp_file[i];
+	}
+	static String x;
+	return x;
+}
+/*
+void  CppPos::Serialize(Stream& s)
+{
+	s % impl % line;
+	String fn = GetCppFile(file);
+	s % fn;
+	file = GetCppFileIndex(fn);
+}
+
+String SSpaces(const char *txt)
+{
+	StringBuffer r;
+	while(*txt)
+		if(*txt == ' ') {
+			while((byte)*txt <= ' ' && *txt) txt++;
+			r.Cat(' ');
+		}
+		else
+			r.Cat(*txt++);
+	return r;
+}
+*/
+void SLPos(SrcFile& res)
+{
+	res.linepos.Add(res.text.GetLength());
+}
+
+SrcFile::SrcFile() :
+	preprocessorLinesRemoved(0),
+	blankLinesRemoved(0),
+	commentLinesRemoved(0)
+{
+}
+
+SrcFile PreProcess(Stream& in)
+{
+	SrcFile res;
+	bool include = true;
+	while(!in.IsEof()) {
+		String ln = in.GetLine();
+		SLPos(res);
+		while(*ln.Last() == '\\') {
+			ln.Trim(ln.GetLength() - 1);
+			ln.Cat(in.GetLine());
+			SLPos(res);
+		}
+		const char *rm = ln;
+		while(*rm == ' ' || *rm == '\t') rm++;
+		if(*rm == '\0')
+			res.blankLinesRemoved++;
+		else
+		if(*rm == '#')
+		{
+			if(rm[1] == 'd' && rm[2] == 'e' && rm[3] == 'f' &&
+			   rm[4] == 'i' && rm[5] == 'n' && rm[6] == 'e' && !iscid(rm[7])) {
+				const char *s = rm + 8;
+				while(*s == ' ') s++;
+				String macro;
+				while(iscid(*s))
+					macro.Cat(*s++);
+				if(*s == '(') {
+					while(*s != ')' && *s)
+						macro.Cat(*s++);
+					macro << ')';
+				}
+//				res.text << '#' << AsCString(SSpaces(macro));
+				res.text << '#' << AsCString(macro);
+			}
+			res.preprocessorLinesRemoved++;
+		}
+		else {
+			bool lineContainsComment = false;
+			bool lineContainsNonComment = false;
+			String cmd;
+			while(*rm) {
+				if(*rm == '\"') {
+					lineContainsNonComment = true;
+					res.text << '\"';
+					rm++;
+					while((byte)*rm && *rm != '\r' && *rm != '\n') {
+						if(*rm == '\"') {
+							res.text << '\"';
+							rm++;
+							break;
+						}
+						if(*rm == '\\' && rm[1]) {
+							if(include)
+								res.text.Cat(*rm);
+							rm++;
+						}
+						if(include)
+							res.text.Cat(*rm);
+						rm++;
+					}
+				}
+				else
+				if(*rm == '\\' && rm[1]) {
+					lineContainsNonComment = true;
+					if(include) {
+						res.text.Cat(*rm++);
+						res.text.Cat(*rm++);
+					}
+					else
+						rm += 2;
+				}
+				else
+				if(rm[0] == '/' && rm[1] == '/') {
+					cmd = rm + 2;
+					if(!lineContainsNonComment)
+						res.commentLinesRemoved++;
+					break;
+				}
+				else
+				if(rm[0] == '/' && rm[1] == '*') {
+					lineContainsComment = true;
+					rm += 2;
+					for(;;) {
+						if(*rm == '\0') {
+							if(!lineContainsNonComment)
+								res.commentLinesRemoved++;
+							if(in.IsEof()) break;
+							SLPos(res);
+							ln = in.GetLine();
+							rm = ~ln;
+							lineContainsNonComment = false;
+						}
+						if(rm[0] == '*' && rm[1] == '/') {
+							rm += 2;
+							break;
+						}
+						rm++;
+					}
+					if(include)
+						res.text.Cat(' ');
+				}
+				else {
+					lineContainsNonComment = true;
+					if(include)
+						res.text.Cat(*rm);
+					rm++;
+				}
+			}
+			if(include)
+				res.text << ' ';
+			if(cmd[0] == '$') {
+				if(cmd[1] == '-') include = false;
+				if(cmd[1] == '+') include = true;
+				if(cmd[1]) {
+					res.text.Cat(~cmd + 2);
+					res.text.Cat(' ');
+				}
+			}
+			if(lineContainsComment && !lineContainsNonComment)
+				res.commentLinesRemoved++;
+		}
+	}
+	return res;
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/CppBase/cpplex.cpp b/uppsrc/CppBase/cpplex.cpp
new file mode 100644
index 000000000..9e4b1ec0b
--- /dev/null
+++ b/uppsrc/CppBase/cpplex.cpp
@@ -0,0 +1,421 @@
+#include "CppBase.h"
+
+NAMESPACE_UPP
+
+#ifdef _MSC_VER
+#pragma inline_depth(255)
+#pragma optimize("t", on)
+#endif
+
+
+#define case_id \
+	case '_':case 'a':case 'b':case 'c':case 'd':case 'e':case 'f':case 'g':case 'h': \
+	case 'i':case 'j':case 'k':case 'l':case 'm':case 'n':case 'o':case 'p':case 'q': \
+	case 'r':case 's':case 't':case 'u':case 'v':case 'w':case 'x':case 'y':case 'z': \
+	case 'A':case 'B':case 'C':case 'D':case 'E':case 'F':case 'G':case 'H':case 'I': \
+	case 'J':case 'K':case 'L':case 'M':case 'N':case 'O':case 'P':case 'Q':case 'R': \
+	case 'S':case 'T':case 'U':case 'V':case 'W':case 'X':case 'Y':case 'Z'
+
+#define case_nonzero_digit \
+	case '1':case '2':case '3':case '4':case '5':case '6':case '7':case '8':case '9'
+
+
+const char *_CppKeyword[] = {
+#define CPPID(x) #x,
+#include "keyword.i"
+#undef  CPPID
+	NULL
+};
+
+const char **CppKeyword() { return _CppKeyword; }
+
+
+LexSymbolStat::LexSymbolStat() :
+  minSymbol(0)
+{
+}
+
+void LexSymbolStat::Reset(int minSymbol, int maxSymbol)
+{
+	ASSERT(minSymbol <= maxSymbol);
+	v.Clear();
+	this->minSymbol = minSymbol;
+	v.SetCount(maxSymbol - minSymbol + 1, 0);
+}
+
+void LexSymbolStat::IncStat(int symbol)
+{
+	int symbolIndex = symbol - minSymbol;
+	if(symbolIndex >= 0 && symbolIndex < v.GetCount())
+	  v[symbolIndex]++;
+}
+
+int  LexSymbolStat::GetStat(int symbol) const
+{
+	int symbolIndex = symbol - minSymbol;
+	return (symbolIndex >= 0 && symbolIndex < v.GetCount()) ?
+	       v[symbolIndex] :
+	       0;
+}
+
+int  LexSymbolStat::SumStat(const Vector<int> & symbols) const
+{
+	int sum = 0;
+	for(int i = 0; i < symbols.GetCount(); i++)
+		sum += GetStat(symbols[i]);
+	return sum;
+}
+
+void LexSymbolStat::Merge(const LexSymbolStat & other)
+{
+	if(v.GetCount() == 0) {
+		minSymbol = other.minSymbol;
+		v <<= other.v;
+		return;
+	}
+	ASSERT(other.minSymbol == minSymbol && other.v.GetCount() == v.GetCount());
+	for(int i = 0; i < v.GetCount(); i++)
+		v[i] += other.v[i];
+}
+
+
+Lex::Lex() :
+  statsCollected(false)
+{
+	const char **cppk = CppKeyword();
+	for(int i = 0; cppk[i]; i++)
+		id.Add(cppk[i]);
+	endkey = id.GetCount();
+	braceslevel = ignore_low = ignore_high = 0;
+}
+
+void Lex::Init(const char *s, const Vector<String>& ig)
+{
+	ptr = s;
+	ignore_low = id.GetCount();
+	for(int i = 0; i < ig.GetCount(); i++)
+		id.Add(ig[i]);
+	ignore_high = id.GetCount();
+}
+
+void Lex::StartStatCollection()
+{
+	symbolStat.Reset(-200, endkey+256);
+	statsCollected = true;
+}
+
+const LexSymbolStat & Lex::FinishStatCollection()
+{
+	statsCollected = false;
+	return symbolStat;
+}
+
+
+int Lex::GetCharacter()
+{
+	if(*ptr == '\0') return t_eof;
+	int c = *ptr++;
+	if(c == '\\') {
+		c = *ptr++;
+		switch(c) {
+		case 'a': return '\a';
+		case 'b': return '\b';
+		case 't': return '\t';
+		case 'v': return '\v';
+		case 'n': return '\n';
+		case 'r': return '\r';
+		case 'f': return '\f';
+		case 'x':
+			c = 0;
+			if(isxdigit(*ptr)) {
+				c = (*ptr >= 'A' ? ToUpper(*ptr) - 'A' + 10 : *ptr - '0');
+				ptr++;
+				if(isxdigit(*ptr)) {
+					c = 16 * c + (*ptr >= 'A' ? ToUpper(*ptr) - 'A' + 10 : *ptr - '0');
+					ptr++;
+				}
+			}
+			break;
+		default:
+			if(c >= '0' && c <= '7') {
+				c -= '0';
+				if(*ptr >= '0' && *ptr <= '7')
+					c = 8 * c + *ptr++ - '0';
+				if(*ptr >= '0' && *ptr <= '7')
+					c = 8 * c + *ptr++ - '0';
+			}
+		}
+	}
+	return (byte)c;
+}
+
+void Lex::Next()
+{
+	while((byte)*ptr <= ' ') {
+		if(*ptr == '\0') return;
+		ptr++;
+	}
+	pos = ptr;
+	int c = (byte)*ptr++;
+	if(c == '\0') return;
+	switch(c) {
+	case_id: {
+			String x;
+			x.Reserve(12);
+			x.Cat(c);
+			while(iscid(*ptr))
+				x.Cat(*ptr++);
+			int q = id.FindAdd(x);
+			if(q >= ignore_low && q < ignore_high)
+				while(*ptr && (byte)*ptr <= ' ') {
+					ptr++;
+					if(*ptr == '(') {
+						int level = 1;
+						while(*ptr && level) {
+							if(*ptr == '(')
+								level++;
+							if(*ptr == ')')
+								level--;
+							ptr++;
+						}
+					}
+				}
+			else
+				AddCode(q + 256);
+			break;
+		}
+	case ':': AddCode(Char(':') ? t_dblcolon : ':'); break;
+	case '*': AssOp('*', t_mulass); break;
+	case '/': AssOp('/', t_divass); break;
+	case '%': AssOp('%', t_modass); break;
+	case '^': AssOp('^', t_xorass); break;
+	case '!': AssOp('!', t_neq); break;
+	case '.':
+		if(Char('*')) AddCode(t_dot_asteriks);
+		else
+		if(*ptr == '.' && ptr[1] == '.') {
+			AddCode(t_elipsis);
+			ptr += 2;
+		}
+		else
+			AddCode('.');
+		break;
+	case '+':
+		if(Char('+')) AddCode(t_inc);
+		else
+			AssOp('+', t_addass);
+		return;
+	case '-':
+		if(Char('-')) AddCode(t_dec);
+		else
+		if(Char('>'))
+			AddCode(Char('*') ? t_arrow_asteriks : t_arrow);
+		else
+			AssOp('-', t_subass);
+		break;
+	case '&':
+		if(Char('&'))
+			AddCode(t_and);
+		else
+			AssOp('&', t_andass);
+		break;
+	case '|':
+		if(Char('|'))
+			AddCode(t_or);
+		else
+			AssOp('|', t_orass);
+		break;
+	case '=':
+		AssOp('=', t_eq);
+		break;
+	case '<':
+		if(Char('<'))
+			AssOp(t_shl, t_shlass);
+		else
+			AssOp('<', t_le);
+		break;
+	case '>':
+		if(Char('>'))
+			AssOp(t_shr, t_shrass);
+		else
+			AssOp('>', t_ge);
+		break;
+	case '0': {
+			dword w = 0;
+			if(Char('x') || Char('X')) {
+				for(;;) {
+					int d;
+					if(*ptr >= '0' && *ptr <= '9')
+						d = *ptr - '0';
+					else
+					if(*ptr >= 'A' && *ptr <= 'F')
+						d = *ptr - 'A' + 10;
+					else
+					if(*ptr >= 'a' && *ptr <= 'f')
+						d = *ptr - 'a' + 10;
+					else
+						break;
+					if(w >= 0x8000000u - d) {
+						AddCode(te_integeroverflow);
+						return;
+					}
+					w = w * 16 + d - '0';
+					ptr++;
+				}
+			}
+			else
+				while(*ptr >= '0' && *ptr <= '7') {
+					int d = *ptr++ - '0';
+					if(w >= 0x1000000u - d) {
+						AddCode(te_integeroverflow);
+						return;
+					}
+					w = w * 8 + d - '0';
+				}
+			Term& tm = term.AddTail();
+			tm.code = t_integer;
+			tm.ptr = pos;
+			tm.number = w;
+		}
+		break;
+	case_nonzero_digit: {
+			double w = c - '0';
+			bool fp = false;
+			while(*ptr >= '0' && *ptr <= '9')
+				w = w * 10 + *ptr++ - '0';
+			if(*ptr == '.') { //TODO TO BE Completed !!!
+				fp = true;
+				ptr++;
+				double x = 0.1;
+				while(*ptr >= '0' && *ptr <= '9') {
+					w += x * (*ptr++ - '0');
+					x /= 10;
+				}
+			}
+			Term& tm = term.AddTail();
+			if(fp || w < INT_MIN || w > INT_MAX)
+				tm.code = t_double;
+			else
+				tm.code = t_integer;
+			tm.ptr = pos;
+			tm.number = w;
+		}
+		break;
+	case '\'': {
+			Term& tm = term.AddTail();
+			tm.code = t_character;
+			tm.ptr = pos;
+			tm.text = String(GetCharacter(), 1);
+			if(*ptr == '\'')
+				ptr++;
+			else
+				tm.code = te_badcharacter;
+		}
+		break;
+	case '\"': {
+			Term& tm = term.AddTail();
+			tm.code = t_string;
+			tm.ptr = pos;
+			for(;;) {
+				while(*ptr != '\"') {
+					if((byte)*ptr < ' ') {
+						tm.code = te_badstring;
+						return;
+					}
+					tm.text.Cat(GetCharacter());
+				}
+				ptr++;
+				while(*ptr && (byte)*ptr <= ' ') ptr++;
+				if(*ptr != '\"') break;
+				ptr++;
+			}
+		}
+		break;
+	default:
+		AddCode(c);
+		return;
+	}
+}
+
+bool Lex::Prepare(int pos) {
+	while(term.GetCount() <= pos) {
+		if(*ptr == '\0') return false;
+		Next();
+	}
+#ifdef _DEBUG
+	pp = term[0].ptr;
+#endif
+	return true;
+}
+
+int Lex::Code(int pos)
+{
+	if(!Prepare(pos)) return t_eof;
+	return term[pos].code;
+}
+
+bool   Lex::IsId(int pos)
+{
+	return Code(pos) >= endkey + 256;
+}
+
+String Lex::Id(int pos)
+{
+	ASSERT(IsId(pos));
+	return id[Code(pos) - 256];
+}
+
+void Lex::Get(int n)
+{
+	while(n--) {
+		if(term.GetCount()) {
+			int chr = term.Head().code;
+			if(statsCollected)
+				symbolStat.IncStat(chr);
+			if(chr == '{')
+				braceslevel++;
+			else
+			if(chr == '}')
+				braceslevel--;
+			term.DropHead();
+		}
+		if(term.GetCount() == 0)
+			Next();
+	}
+}
+
+int Lex::Int(int pos)
+{
+	Prepare(pos);
+	ASSERT(term[pos].code == t_integer);
+	return (int)term[pos].number;
+}
+
+double Lex::Double(int pos)
+{
+	Prepare(pos);
+	ASSERT(term[pos].code == t_double);
+	return term[pos].number;
+}
+
+String Lex::Text(int pos)
+{
+	Prepare(pos);
+	ASSERT(term[pos].code == t_string);
+	return term[pos].text;
+}
+
+int Lex::Chr(int pos)
+{
+	Prepare(pos);
+	ASSERT(term[pos].code == t_character);
+	return (byte)*term[pos].text;
+}
+
+const char *Lex::Pos(int pos)
+{
+	Prepare(pos);
+	return pos < term.GetCount() ? term[pos].ptr : ptr;
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/CppBase/init b/uppsrc/CppBase/init
new file mode 100644
index 000000000..19d24e702
--- /dev/null
+++ b/uppsrc/CppBase/init
@@ -0,0 +1,4 @@
+#ifndef _CppBase_icpp_init_stub
+#define _CppBase_icpp_init_stub
+#include "Core/init"
+#endif
diff --git a/uppsrc/CppBase/keyword.i b/uppsrc/CppBase/keyword.i
new file mode 100644
index 000000000..d90fb1a6f
--- /dev/null
+++ b/uppsrc/CppBase/keyword.i
@@ -0,0 +1,81 @@
+//#BLITZ_APPROVE
+
+CPPID(__asm)
+CPPID(else)
+CPPID(struct)
+CPPID(enum)
+CPPID(auto)
+CPPID(__except)
+CPPID(template)
+CPPID(explicit)
+CPPID(this)
+CPPID(bool)
+CPPID(extern)
+CPPID(mutable)
+CPPID(thread)
+CPPID(break)
+CPPID(false)
+CPPID(throw)
+CPPID(case)
+//CPPID(__fastcall)
+CPPID(namespace)
+CPPID(true)
+//CPPID(__finally)
+CPPID(new)
+//CPPID(__cdecl)
+CPPID(float)
+CPPID(__try)
+CPPID(char)
+CPPID(operator)
+CPPID(typedef)
+CPPID(class)
+CPPID(friend)
+CPPID(private)
+CPPID(typeid)
+CPPID(const)
+CPPID(goto)
+CPPID(protected)
+CPPID(typename)
+CPPID(const_cast)
+CPPID(public)
+CPPID(union)
+CPPID(continue)
+CPPID(inline)
+CPPID(register)
+CPPID(unsigned)
+//CPPID(__declspec)
+//CPPID(__inline)
+CPPID(reinterpret_cast)
+CPPID(using)
+CPPID(default)
+CPPID(int)
+CPPID(return)
+CPPID(delete)
+CPPID(__int8)
+CPPID(short)
+CPPID(__uuidof)
+CPPID(dllexport)
+CPPID(__int16)
+CPPID(signed)
+CPPID(virtual)
+CPPID(dllimport)
+CPPID(__int32)
+CPPID(sizeof)
+CPPID(void)
+CPPID(__int64)
+CPPID(static)
+CPPID(volatile)
+CPPID(double)
+CPPID(__leave)
+CPPID(static_cast)
+CPPID(dynamic_cast)
+CPPID(long)
+//CPPID(__stdcall)
+
+CPPID(if)
+CPPID(while)
+CPPID(switch)
+CPPID(for)
+CPPID(try)
+CPPID(catch)
+CPPID(do)
diff --git a/uppsrc/Crash/AUTHORS b/uppsrc/Crash/AUTHORS
new file mode 100644
index 000000000..f782e5b62
--- /dev/null
+++ b/uppsrc/Crash/AUTHORS
@@ -0,0 +1,2 @@
+Mirek Fidler <cxl@ntllib.org>
+Tomas Rylek  <rylek@volny.cz>
\ No newline at end of file
diff --git a/uppsrc/Crash/COPYING b/uppsrc/Crash/COPYING
new file mode 100644
index 000000000..33aa39102
--- /dev/null
+++ b/uppsrc/Crash/COPYING
@@ -0,0 +1,30 @@
+Copyright (C) 2005 Mirek Fidler, Tomas Rylek and various contributors (see AUTHORS)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to
+deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies of the Software and its Copyright notices. In addition publicly
+documented acknowledgment must be given that this software has been used if no
+source code of this software is made available publicly. This includes
+acknowledgments in either Copyright notices, Manuals, Publicity and Marketing
+documents or any documentation provided with any product containing this
+software. This License does not apply to any software that links to the
+libraries provided by this software (statically or dynamically), but only to
+the software provided.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+-----------
+
+Please see the COPYING.PLAIN for a plain-english explanation of this notice
+and it's intent.
diff --git a/uppsrc/Crash/COPYING-PLAIN b/uppsrc/Crash/COPYING-PLAIN
new file mode 100644
index 000000000..770a8132f
--- /dev/null
+++ b/uppsrc/Crash/COPYING-PLAIN
@@ -0,0 +1,33 @@
+Plain English Copyright Notice
+
+This file is not intended to be the actual License. The reason this file
+exists is that we here are programmers and engineers. We aren't lawyers. We
+provide licenses that we THINK say the right things, but we have our own
+intentions at heart. This is a plain-english explanation of what those
+intentions are, and if you follow them you will be within the "spirit" of
+the license.
+
+The intent is for us to enjoy writing software that is useful to us (the
+AUTHORS) and allow others to use it freely and also benefit from the work we
+put into making it. We don't want to restrict others using it. They should
+not *HAVE* to make the source code of the applications they write that
+simply link to these libraries (be that statically or dynamically), or for
+them to be limited as to what license they choose to use (be it open, closed
+or anything else). But we would like to know you are using these libraries.
+We simply would like to know that it has been useful to someone. This is why
+we ask for acknowledgement of some sort.
+
+You can do what you want with the source of this software - it doesn't
+matter. We still have it here for ourselves and it is open and free to use
+and download and play with. It can't be taken away. We don't really mind what
+you do with the source to your software. We would simply like to know that
+you are using it - especially if it makes it to a commerical product. If you
+simply e-mail all the AUTHORS (see COPYING and AUTHORS files) telling us, and
+then make sure you include a paragraph or page in the manual or in the "About.."
+box for the product with the copyright notice and state that you used this
+software, we will be very happy. If you want to contribute back modifications
+and fixes you may have made we will welcome those too with open arms (generally).
+If you want help with changes needed, ports needed or features to be added,
+arrangements can be easily made with some dialogue.
+
+Mirek Fidler <cxl@ntllib.org>
diff --git a/uppsrc/Crash/Crash.upp b/uppsrc/Crash/Crash.upp
new file mode 100644
index 000000000..ae3a6efd0
--- /dev/null
+++ b/uppsrc/Crash/Crash.upp
@@ -0,0 +1,18 @@
+description "Utility to examine content of .crash and .map files";
+
+uses
+	CtrlLib;
+
+file
+	imagehlp.dli,
+	crash.cpp,
+	crash.iml,
+	crash.rc,
+	Info readonly separator,
+	COPYING,
+	COPYING-PLAIN,
+	AUTHORS;
+
+mainconfig
+	"" = "GUI";
+
diff --git a/uppsrc/Crash/crash.cpp b/uppsrc/Crash/crash.cpp
new file mode 100644
index 000000000..15bfc100d
--- /dev/null
+++ b/uppsrc/Crash/crash.cpp
@@ -0,0 +1,253 @@
+#include <CtrlLib/CtrlLib.h>
+#include <winver.h>
+#include <imagehlp.h>
+
+using namespace Upp;
+
+#define DLLFILENAME "imagehlp.dll"
+#define DLIHEADER   "imagehlp.dli"
+#define DLIMODULE   Imagehlp
+#include <Core/dli.h>
+
+Vector<unsigned > address;
+Vector<String>    name;
+String            mapname;
+
+void LoadMap(String fn)
+{
+	String fpos = GetFileName(fn);
+	int dp = fpos.Find('.');
+	if(dp >= 0)
+		fpos.Trim(dp);
+	fn = AppendFileName(GetFileDirectory(fn), fpos) + ".map";
+	if(mapname == fn)
+		return;
+	mapname = fn;
+	address.Clear();
+	name.Clear();
+	String map = LoadFile(fn);
+	if(IsNull(map))
+		return;
+	const char *p = map;
+	while(*p)
+		if(*p++ == '\n' && !memcmp(p, " 0001:", 6)) {
+			p += 5;
+			while(IsXDigit(*++p))
+				;
+			while(*p == ' ')
+				p++;
+			const char *b = p;
+			while((byte)*p > ' ')
+				p++;
+			const char *e = p;
+			while(*p == ' ')
+				p++;
+			if(e > b && IsXDigit(*p)) {
+				unsigned addr = strtoul(p, 0, 16);
+				address.Add(addr);
+				name.Add(String(b, e));
+			}
+		}
+	IndexSort(address, name, StdLess<unsigned>());
+}
+
+String Fname(dword addr, bool& recognized) {
+	int pos = BinFindIndex(address, addr + 1) - 1;
+	String s;
+	s.Cat(Format("0x%08x", (int)addr));
+	if(pos >= 0) {
+		dword off = addr - address[pos];
+		if(off < 8000) {
+			s << ": ";
+			if(Imagehlp()) {
+				char nm[1024];
+				Imagehlp().UnDecorateSymbolName(name[pos], nm, 1024, UNDNAME_NO_ACCESS_SPECIFIERS|
+					                          UNDNAME_NO_MEMBER_TYPE|UNDNAME_NO_MS_KEYWORDS);
+				s << nm;
+			}
+			else
+				s << name[pos];
+			s << Format(" + 0x%x bytes", (int)off);
+			recognized = true;
+			return s;
+		}
+	}
+	s << "       = " << Format("%d [%d, %d]", (int)addr, (int)LOWORD(addr), (int)HIWORD(addr));
+	recognized = false;
+	return s;
+}
+
+String LoadCrashFile(String filename)
+{
+	LoadMap(filename);
+	FileIn in(filename);
+	String text;
+	text << "Crash log " << GetFileName(filename) << "\n";
+	if(name.GetCount() == 0)
+		text << "No mapfile found" << "\n";
+	dword version;
+	dword code, address;
+	int npar;
+	in % version;
+	in % code % address % npar;
+	Vector<dword> info;
+	Vector<dword> stack;
+	bool r;
+	int i;
+	while(npar--)
+		in % info.Add();
+	switch(code) {
+	case EXCEPTION_ACCESS_VIOLATION:
+		text << "Access violation ";
+		if(info.GetCount() >= 2)
+			text << (info[0] ? "writing" : "reading") << Format(" at 0x%08x", (int)info[1]);
+		break;
+	#define MEX(id) case id: text << #id; break;
+		MEX(EXCEPTION_DATATYPE_MISALIGNMENT)
+		MEX(EXCEPTION_BREAKPOINT)
+		MEX(EXCEPTION_SINGLE_STEP)
+		MEX(EXCEPTION_ARRAY_BOUNDS_EXCEEDED)
+		MEX(EXCEPTION_FLT_DENORMAL_OPERAND)
+		MEX(EXCEPTION_FLT_DIVIDE_BY_ZERO)
+		MEX(EXCEPTION_FLT_INEXACT_RESULT)
+		MEX(EXCEPTION_FLT_INVALID_OPERATION)
+		MEX(EXCEPTION_FLT_OVERFLOW)
+		MEX(EXCEPTION_FLT_STACK_CHECK)
+		MEX(EXCEPTION_FLT_UNDERFLOW)
+		MEX(EXCEPTION_INT_DIVIDE_BY_ZERO)
+		MEX(EXCEPTION_INT_OVERFLOW)
+		MEX(EXCEPTION_PRIV_INSTRUCTION)
+		MEX(EXCEPTION_IN_PAGE_ERROR)
+		MEX(EXCEPTION_ILLEGAL_INSTRUCTION)
+		MEX(EXCEPTION_NONCONTINUABLE_EXCEPTION)
+		MEX(EXCEPTION_STACK_OVERFLOW)
+		MEX(EXCEPTION_INVALID_DISPOSITION)
+		MEX(EXCEPTION_GUARD_PAGE)
+		MEX(EXCEPTION_INVALID_HANDLE)
+	default:
+		text << Format("Exception 0x%08x", (int)code);
+	}
+	text << '\n' << Fname(address, r) << '\n';
+	while(!in.IsEof())
+		in % stack.Add();
+	text << "\nRecognized stack dwords:\n";
+	for(i = 0; i < stack.GetCount(); i++) {
+		String s = Fname(stack[i], r);
+		if(r) text << "\t" << s << '\n';
+	}
+	text << "\nComplete stack:\n";
+	for(i = 0; i < stack.GetCount(); i++)
+		text << "\t" << Fname(stack[i], r) << '\n';
+	return text;
+}
+
+class CrashViewer : public TopWindow {
+public:
+	typedef CrashViewer CLASSNAME;
+	CrashViewer();
+
+	void Run();
+
+	bool OpenFile();
+
+	virtual bool Key(dword key, int repcnt);
+
+	void LoadCrashFile();
+
+private:
+	Splitter splitter;
+	ArrayCtrl crashfiles;
+	LineEdit crashdump;
+};
+
+CrashViewer::CrashViewer()
+{
+	Sizeable().Zoomable();
+	splitter.Horz(crashfiles, crashdump);
+	splitter.SetPos(3000);
+	Add(splitter.SizePos());
+	crashfiles.AutoHideSb().NoHeader();
+	crashfiles.AddColumn();
+	crashfiles.WhenCursor = THISBACK(LoadCrashFile);
+	crashdump.SetFont(Courier(14));
+}
+
+void CrashViewer::Run()
+{
+	if(!OpenFile())
+		return;
+	LoadCrashFile();
+	TopWindow::Run();
+}
+
+bool CrashViewer::Key(dword key, int repcnt)
+{
+	if(key == K_CTRL_O) {
+		OpenFile();
+		return true;
+	}
+	return TopWindow::Key(key, repcnt);
+}
+
+bool CrashViewer::OpenFile()
+{
+	FileSelector fs;
+	LoadFromFile(fs);
+	fs.Type("Crash file", "*.crash");
+	fs.DefaultExt("crash");
+	fs.Multi();
+	if(!fs.ExecuteOpen()) return false;
+	StoreToFile(fs);
+	int newln = -1;
+	for(int i = 0; i < fs.GetCount(); i++) {
+		String path = fs[i];
+		int f = crashfiles.Find(path);
+		if(f < 0) {
+			newln = crashfiles.GetCount();
+			crashfiles.Add(path);
+		}
+	}
+	if(newln >= 0)
+		crashfiles.SetCursor(newln);
+	return true;
+}
+
+void CrashViewer::LoadCrashFile()
+{
+	String fn = Null;
+	if(crashfiles.IsCursor())
+		fn = crashfiles.Get(0);
+	String title = fn;
+	if(!IsNull(title))
+		title << " - crash analyzer";
+	else
+		title << "Crash analyzer";
+	Title(title);
+	if(IsNull(fn))
+		crashdump <<= Null;
+	else
+		crashdump <<= ::LoadCrashFile(fn);
+}
+
+GUI_APP_MAIN
+{
+	SetDefaultCharset(CHARSET_WIN1250);
+	CrashViewer viewer;
+	viewer.Run();
+/*
+	FileSelector fs;
+	LoadFromFile(fs);
+	fs.Type("Crash file", "*.crash");
+	if(!fs.ExecuteOpen()) return;
+	String text = LoadCrashFile(~fs);
+	TopWindow win;
+	win.Title("Crash analyzer - " + ~fs).Sizeable().Zoomable();
+	win.Icon(Image::Icon(100, true), Image::Icon(100, false));
+	LineEdit edit;
+	edit.SetFont(Courier(14));
+	edit <<= text;
+	win.Add(edit.SizePos());
+	win.Run();
+*/
+//	StoreToFile(fs);
+}
diff --git a/uppsrc/Crash/crash.ico b/uppsrc/Crash/crash.ico
new file mode 100644
index 000000000..d27561707
Binary files /dev/null and b/uppsrc/Crash/crash.ico differ
diff --git a/uppsrc/Crash/crash.iml b/uppsrc/Crash/crash.iml
new file mode 100644
index 000000000..cbec1ef44
--- /dev/null
+++ b/uppsrc/Crash/crash.iml
@@ -0,0 +1,56 @@
+//!icon_file="crash.ico"
+//!icon_small="app_small"
+//!icon_large="app_large"
+//!icon_bpp="4"
+IMAGE_BEGIN(app_large)
+	IMAGE_SCAN("΄\0\0�")
+	IMAGE_SCAN("ʌ\0\0�")
+	IMAGE_SCAN("Ȑ\0\0�")
+	IMAGE_SCAN("ǒ\0\0�")
+	IMAGE_SCAN("Ŗ\0\0�")
+	IMAGE_SCAN("Ę\0\0�")
+	IMAGE_SCAN("Ę\0\0�")
+	IMAGE_SCAN("Ú\0\0�")
+	IMAGE_SCAN("œ\0\0�")
+	IMAGE_SCAN("œ\0\0�")
+	IMAGE_SCAN("��\0\0�")
+	IMAGE_SCAN("��\0\0�")
+	IMAGE_SCAN("��\0\0�")
+	IMAGE_SCAN("�\0\0��\0\377\377�\0\0��\0\377\377�\0\0��\0\377\377�\0\0��\0\377\377�\0\0�\1\0\377\377�\0\0�\1\0\377\377�\0\0�")
+	IMAGE_SCAN("�\0\0�\1\0\377\377�\0\0�\1\0\377\377�\0\0�\1\0\377\377�\0\0�\1\0\377\377�\0\0�\3\0\377\377\0\0�\0\377\377�\0\0�\1\0\377\377�\0\0�\1\0\377\377�\0\0�")
+	IMAGE_SCAN("�\0\0�\1\0\377\377�\0\0��\0\377\377�\0\0�\1\0\377\377�\0\0�\1\0\377\377�\0\0��\0\377\377�\0\0�\1\0\377\377�\0\0�\1\0\377\377�\0\0�")
+	IMAGE_SCAN("�\0\0�\1\0\377\377�\0\0�\1\0\377\377�\0\0�\1\0\377\377�\0\0��\0\377\377�\0\0�\2\0\377\377\0\0��\0\377\377�\0\0�")
+	IMAGE_SCAN("�\0\0�\1\0\377\377�\0\0�\1\0\377\377�\0\0�\1\0\377\377�\0\0�\1\0\377\377�\0\0�\1\0\377\377�\0\0�\3\0\377\377\0\0�\0\377\377�\0\0�\1\0\377\377�\0\0�")
+	IMAGE_SCAN("�\0\0��\0\377\377�\0\0�\1\0\377\377�\0\0�\1\0\377\377�\0\0�\1\0\377\377�\0\0�\2\0\377\377\0\0��\0\377\377�\0\0�\1\0\377\377�\0\0�\1\0\377\377�\0\0�")
+	IMAGE_SCAN("��\0\0�")
+	IMAGE_SCAN("��\0\0�")
+	IMAGE_SCAN("��\0\0�")
+	IMAGE_SCAN("œ\0\0�")
+	IMAGE_SCAN("œ\0\0�")
+	IMAGE_SCAN("Ú\0\0�")
+	IMAGE_SCAN("Ę\0\0�")
+	IMAGE_SCAN("Ę\0\0�")
+	IMAGE_SCAN("Ŗ\0\0�")
+	IMAGE_SCAN("ǒ\0\0�")
+	IMAGE_SCAN("Ȑ\0\0�")
+	IMAGE_SCAN("ʌ\0\0�")
+	IMAGE_SCAN("΄\0\0�")
+IMAGE_PACKED(app_large, "\2 \0\0\0 \0\0\0\0\0\0\0\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(app_small)
+	IMAGE_SCAN("�\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0")
+	IMAGE_SCAN("ł\0\0\0")
+	IMAGE_SCAN("�\3\0\0\0\0\377\377\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\1\0\0\0�\0\377\377\1\0\0\0†\0\0\0")
+	IMAGE_SCAN("�\0\0\0�\2\0\0\0\0\0\377�\0\0\0�\0\377\377�\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\0\377\377�\0\0\0\2\0\377\377\0\0\377�\0\377\377\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\377�\0\0\377\2\0\377\377\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\377�\0\0\377�\0\377\377\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\377\1\0\0\0�\0\377\377\1\0\0\377�\0\377\377\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\377\1\0\0\0�\5\0\0\0\0\377\377\0\0\377\0\377\377\0\0\0�\0\377\377\1\0\0\0")
+	IMAGE_SCAN("‚\0\0\0�\1\0\0\0�\0\377\377�\0\0\0\2\0\377\377\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\1\0\0\0�\0\377\377\1\0\0\0��\0\0\0")
+	IMAGE_SCAN("Ȃ\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("Ȃ\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0")
+IMAGE_PACKED(app_small, "\2\20\0\0\0\20\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0")
diff --git a/uppsrc/Crash/crash.mak b/uppsrc/Crash/crash.mak
new file mode 100644
index 000000000..54a32b03d
--- /dev/null
+++ b/uppsrc/Crash/crash.mak
@@ -0,0 +1,313 @@
+# Microsoft Developer Studio Generated NMAKE File, Based on crash.dsp
+!IF "$(CFG)" == ""
+CFG=crash - Win32 Debug
+!MESSAGE No configuration specified. Defaulting to crash - Win32 Debug.
+!ENDIF
+
+!IF "$(CFG)" != "crash - Win32 Release" && "$(CFG)" != "crash - Win32 Debug"
+!MESSAGE Invalid configuration "$(CFG)" specified.
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "crash.mak" CFG="crash - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "crash - Win32 Release" (based on "Win32 (x86) Application")
+!MESSAGE "crash - Win32 Debug" (based on "Win32 (x86) Application")
+!MESSAGE
+!ERROR An invalid configuration is specified.
+!ENDIF
+
+!IF "$(OS)" == "Windows_NT"
+NULL=
+!ELSE
+NULL=nul
+!ENDIF
+
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "crash - Win32 Release"
+
+OUTDIR=.\Release
+INTDIR=.\Release
+
+!IF "$(RECURSE)" == "0"
+
+ALL : "c:\tools\crash.exe"
+
+!ELSE
+
+ALL : "VLib - Win32 Release" "tlib - Win32 Release" "tgui - Win32 Release" "CtrlLib - Win32 Release" "c:\tools\crash.exe"
+
+!ENDIF
+
+!IF "$(RECURSE)" == "1"
+CLEAN :"CtrlLib - Win32 ReleaseCLEAN" "tgui - Win32 ReleaseCLEAN" "tlib - Win32 ReleaseCLEAN" "VLib - Win32 ReleaseCLEAN"
+!ELSE
+CLEAN :
+!ENDIF
+	-@erase "$(INTDIR)\crash.obj"
+	-@erase "$(INTDIR)\crash.res"
+	-@erase "$(INTDIR)\vc60.idb"
+	-@erase "c:\tools\crash.exe"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP_PROJ=/nologo /MT /W3 /GR /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /Fp"$(INTDIR)\crash.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
+MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32
+RSC_PROJ=/l 0x405 /fo"$(INTDIR)\crash.res" /d "NDEBUG"
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\crash.bsc"
+BSC32_SBRS= \
+
+LINK32=link.exe
+LINK32_FLAGS=/nologo /subsystem:windows /incremental:no /pdb:"$(OUTDIR)\crash.pdb" /machine:I386 /out:"c:/tools/crash.exe"
+LINK32_OBJS= \
+	"$(INTDIR)\crash.obj" \
+	"$(INTDIR)\crash.res" \
+	"..\CtrlLib\Release\CtrlLib.lib" \
+	"E:\build\tgui\Release\tgui.lib" \
+	"E:\build\tlib\Release\tlib.lib" \
+	"..\VLib\Release\VLib.lib"
+
+"c:\tools\crash.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+!ELSEIF  "$(CFG)" == "crash - Win32 Debug"
+
+OUTDIR=.\Debug
+INTDIR=.\Debug
+# Begin Custom Macros
+OutDir=.\Debug
+# End Custom Macros
+
+!IF "$(RECURSE)" == "0"
+
+ALL : "$(OUTDIR)\crash.exe"
+
+!ELSE
+
+ALL : "VLib - Win32 Debug" "tlib - Win32 Debug" "tgui - Win32 Debug" "CtrlLib - Win32 Debug" "$(OUTDIR)\crash.exe"
+
+!ENDIF
+
+!IF "$(RECURSE)" == "1"
+CLEAN :"CtrlLib - Win32 DebugCLEAN" "tgui - Win32 DebugCLEAN" "tlib - Win32 DebugCLEAN" "VLib - Win32 DebugCLEAN"
+!ELSE
+CLEAN :
+!ENDIF
+	-@erase "$(INTDIR)\crash.obj"
+	-@erase "$(INTDIR)\crash.res"
+	-@erase "$(INTDIR)\vc60.idb"
+	-@erase "$(INTDIR)\vc60.pdb"
+	-@erase "$(OUTDIR)\crash.exe"
+	-@erase "$(OUTDIR)\crash.ilk"
+	-@erase "$(OUTDIR)\crash.pdb"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP_PROJ=/nologo /MTd /W3 /Gm /GR /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /Fp"$(INTDIR)\crash.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c
+MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32
+RSC_PROJ=/l 0x405 /fo"$(INTDIR)\crash.res" /d "_DEBUG"
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\crash.bsc"
+BSC32_SBRS= \
+
+LINK32=link.exe
+LINK32_FLAGS=/nologo /subsystem:windows /incremental:yes /pdb:"$(OUTDIR)\crash.pdb" /debug /machine:I386 /out:"$(OUTDIR)\crash.exe" /pdbtype:sept
+LINK32_OBJS= \
+	"$(INTDIR)\crash.obj" \
+	"$(INTDIR)\crash.res" \
+	"..\CtrlLib\Debug\CtrlLib.lib" \
+	"E:\build\tgui\Debug\tgui.lib" \
+	"E:\build\tlib\Debug\tlib.lib" \
+	"..\VLib\Debug\VLib.lib"
+
+"$(OUTDIR)\crash.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+!ENDIF
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $<
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $<
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $<
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $<
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $<
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $<
+<<
+
+
+!IF "$(NO_EXTERNAL_DEPS)" != "1"
+!IF EXISTS("crash.dep")
+!INCLUDE "crash.dep"
+!ELSE
+!MESSAGE Warning: cannot find "crash.dep"
+!ENDIF
+!ENDIF
+
+
+!IF "$(CFG)" == "crash - Win32 Release" || "$(CFG)" == "crash - Win32 Debug"
+SOURCE=.\crash.cpp
+
+"$(INTDIR)\crash.obj" : $(SOURCE) "$(INTDIR)"
+
+
+SOURCE=.\crash.rc
+
+"$(INTDIR)\crash.res" : $(SOURCE) "$(INTDIR)"
+	$(RSC) $(RSC_PROJ) $(SOURCE)
+
+
+!IF  "$(CFG)" == "crash - Win32 Release"
+
+"CtrlLib - Win32 Release" :
+   cd "\SOURCE\CtrlLib"
+   $(MAKE) /$(MAKEFLAGS) /F .\CtrlLib.mak CFG="CtrlLib - Win32 Release"
+   cd "..\crash"
+
+"CtrlLib - Win32 ReleaseCLEAN" :
+   cd "\SOURCE\CtrlLib"
+   $(MAKE) /$(MAKEFLAGS) /F .\CtrlLib.mak CFG="CtrlLib - Win32 Release" RECURSE=1 CLEAN
+   cd "..\crash"
+
+!ELSEIF  "$(CFG)" == "crash - Win32 Debug"
+
+"CtrlLib - Win32 Debug" :
+   cd "\SOURCE\CtrlLib"
+   $(MAKE) /$(MAKEFLAGS) /F .\CtrlLib.mak CFG="CtrlLib - Win32 Debug"
+   cd "..\crash"
+
+"CtrlLib - Win32 DebugCLEAN" :
+   cd "\SOURCE\CtrlLib"
+   $(MAKE) /$(MAKEFLAGS) /F .\CtrlLib.mak CFG="CtrlLib - Win32 Debug" RECURSE=1 CLEAN
+   cd "..\crash"
+
+!ENDIF
+
+!IF  "$(CFG)" == "crash - Win32 Release"
+
+"tgui - Win32 Release" :
+   E:
+   cd "E:\V\TLIB"
+   $(MAKE) /$(MAKEFLAGS) /F .\tgui.mak CFG="tgui - Win32 Release"
+   F:
+   cd "F:\SOURCE\crash"
+
+"tgui - Win32 ReleaseCLEAN" :
+   E:
+   cd "E:\V\TLIB"
+   $(MAKE) /$(MAKEFLAGS) /F .\tgui.mak CFG="tgui - Win32 Release" RECURSE=1 CLEAN
+   F:
+   cd "F:\SOURCE\crash"
+
+!ELSEIF  "$(CFG)" == "crash - Win32 Debug"
+
+"tgui - Win32 Debug" :
+   E:
+   cd "E:\V\TLIB"
+   $(MAKE) /$(MAKEFLAGS) /F .\tgui.mak CFG="tgui - Win32 Debug"
+   F:
+   cd "F:\SOURCE\crash"
+
+"tgui - Win32 DebugCLEAN" :
+   E:
+   cd "E:\V\TLIB"
+   $(MAKE) /$(MAKEFLAGS) /F .\tgui.mak CFG="tgui - Win32 Debug" RECURSE=1 CLEAN
+   F:
+   cd "F:\SOURCE\crash"
+
+!ENDIF
+
+!IF  "$(CFG)" == "crash - Win32 Release"
+
+"tlib - Win32 Release" :
+   E:
+   cd "E:\V\TLIB"
+   $(MAKE) /$(MAKEFLAGS) /F .\tlib.mak CFG="tlib - Win32 Release"
+   F:
+   cd "F:\SOURCE\crash"
+
+"tlib - Win32 ReleaseCLEAN" :
+   E:
+   cd "E:\V\TLIB"
+   $(MAKE) /$(MAKEFLAGS) /F .\tlib.mak CFG="tlib - Win32 Release" RECURSE=1 CLEAN
+   F:
+   cd "F:\SOURCE\crash"
+
+!ELSEIF  "$(CFG)" == "crash - Win32 Debug"
+
+"tlib - Win32 Debug" :
+   E:
+   cd "E:\V\TLIB"
+   $(MAKE) /$(MAKEFLAGS) /F .\tlib.mak CFG="tlib - Win32 Debug"
+   F:
+   cd "F:\SOURCE\crash"
+
+"tlib - Win32 DebugCLEAN" :
+   E:
+   cd "E:\V\TLIB"
+   $(MAKE) /$(MAKEFLAGS) /F .\tlib.mak CFG="tlib - Win32 Debug" RECURSE=1 CLEAN
+   F:
+   cd "F:\SOURCE\crash"
+
+!ENDIF
+
+!IF  "$(CFG)" == "crash - Win32 Release"
+
+"VLib - Win32 Release" :
+   cd "\SOURCE\VLib"
+   $(MAKE) /$(MAKEFLAGS) /F .\VLib.mak CFG="VLib - Win32 Release"
+   cd "..\crash"
+
+"VLib - Win32 ReleaseCLEAN" :
+   cd "\SOURCE\VLib"
+   $(MAKE) /$(MAKEFLAGS) /F .\VLib.mak CFG="VLib - Win32 Release" RECURSE=1 CLEAN
+   cd "..\crash"
+
+!ELSEIF  "$(CFG)" == "crash - Win32 Debug"
+
+"VLib - Win32 Debug" :
+   cd "\SOURCE\VLib"
+   $(MAKE) /$(MAKEFLAGS) /F .\VLib.mak CFG="VLib - Win32 Debug"
+   cd "..\crash"
+
+"VLib - Win32 DebugCLEAN" :
+   cd "\SOURCE\VLib"
+   $(MAKE) /$(MAKEFLAGS) /F .\VLib.mak CFG="VLib - Win32 Debug" RECURSE=1 CLEAN
+   cd "..\crash"
+
+!ENDIF
+
+
+!ENDIF
diff --git a/uppsrc/Crash/crash.rc b/uppsrc/Crash/crash.rc
new file mode 100644
index 000000000..71b361e24
--- /dev/null
+++ b/uppsrc/Crash/crash.rc
@@ -0,0 +1 @@
+100 ICON DISCARDABLE "crash.ico"
diff --git a/uppsrc/Crash/imagehlp.dli b/uppsrc/Crash/imagehlp.dli
new file mode 100644
index 000000000..2320a0229
--- /dev/null
+++ b/uppsrc/Crash/imagehlp.dli
@@ -0,0 +1 @@
+FN_C(DWORD, __stdcall, UnDecorateSymbolName, (PCSTR dn,  PSTR udn, DWORD len, DWORD Flags))
diff --git a/uppsrc/Crash/prj.aux b/uppsrc/Crash/prj.aux
new file mode 100644
index 000000000..6d70d4a73
--- /dev/null
+++ b/uppsrc/Crash/prj.aux
@@ -0,0 +1,2 @@
+file
+	g:\temp\ce-crash\cybexpo.map;
diff --git a/uppsrc/Crypto/AUTHORS b/uppsrc/Crypto/AUTHORS
new file mode 100644
index 000000000..f782e5b62
--- /dev/null
+++ b/uppsrc/Crypto/AUTHORS
@@ -0,0 +1,2 @@
+Mirek Fidler <cxl@ntllib.org>
+Tomas Rylek  <rylek@volny.cz>
\ No newline at end of file
diff --git a/uppsrc/Crypto/BscF.cpp b/uppsrc/Crypto/BscF.cpp
new file mode 100644
index 000000000..af3e26f80
--- /dev/null
+++ b/uppsrc/Crypto/BscF.cpp
@@ -0,0 +1,158 @@
+#include "Crypto.h"
+
+NAMESPACE_UPP
+
+template <int N>
+class Birc {
+	byte  r[N];
+	int   origin;
+public:
+	byte& operator[](int i)       { return r[(origin + i) % N]; }
+	void  Restart()               { origin = 0; }
+	void  Move()                  { origin = (origin + 1) % N; }
+
+	Birc()                        { origin = 0; }
+};
+
+struct BscF {
+	static byte T1[256];
+	static const int Krok;
+
+	Birc<81> R81, Q81;
+	byte IV[10], Wk[10];   /*  MAC, Klic na zpr.  */
+
+	void MAC_init();
+	void R81_init();
+	void MAC_step();
+	byte R81_step();
+	void R81_start();
+	void MACDummy();
+	void MACGen(const char *s, const char *lim);
+	void Start();
+};
+
+const int BscF::Krok = 101;
+
+byte BscF::T1[256] = {
+	32, 124, 29, 247, 230, 199, 244, 5, 86, 19, 125, 149, 108, 74, 237, 176,
+	165, 82, 240, 236, 144, 154, 107, 131, 147, 66, 118, 116, 126, 250, 127, 23,
+	232, 223, 243, 45, 83, 67, 216, 202, 33, 145, 62, 114, 61, 34, 205, 109,
+	14, 6, 193, 238, 55, 196, 163, 182, 140, 8, 115, 222, 217, 191, 112, 73,
+	142, 75, 214, 1, 59, 46, 239, 72, 164, 68, 180, 119, 209, 84, 152, 159,
+	184, 36, 47, 99, 235, 212, 42, 38, 123, 26, 17, 97, 155, 22, 190, 175,
+	64, 25, 94, 166, 183, 69, 234, 65, 195, 197, 77, 173, 20, 104, 63, 201,
+	249, 15, 134, 122, 57, 204, 139, 0, 210, 174, 3, 2, 80, 135, 106, 213,
+	56, 221, 172, 12, 162, 103, 188, 128, 9, 138, 137, 133, 54, 169, 100, 132,
+	60, 28, 113, 141, 44, 255, 181, 111, 10, 117, 254, 160, 90, 218, 186, 30,
+	48, 246, 79, 187, 37, 35, 53, 179, 129, 157, 146, 203, 177, 71, 27, 189,
+	252, 229, 143, 130, 11, 78, 226, 105, 88, 101, 251, 24, 170, 7, 76, 41,
+	198, 245, 208, 31, 21, 242, 89, 98, 225, 81, 219, 58, 96, 91, 215, 110,
+	227, 93, 39, 220, 52, 211, 253, 85, 151, 70, 228, 233, 171, 148, 206, 121,
+	248, 156, 241, 102, 207, 161, 192, 185, 120, 153, 4, 40, 136, 194, 50, 95,
+	87, 168, 178, 13, 18, 200, 49, 167, 150, 92, 16, 51, 231, 224, 43, 158
+};
+
+void BscF::MAC_init() {
+	for(int i = 0; i < 81; i++)
+		Q81[i] = T1[i];
+}
+
+
+void BscF::R81_init() {
+	for(int i = 80; i >= 0; i--)
+		R81[i] = T1[i];
+}
+
+void BscF::MAC_step() {
+	byte zvq81, neq81;
+	neq81 = T1[Q81[80]];
+	zvq81 = Q81[0];
+	Q81.Move();
+	Q81[80] = zvq81 ^ neq81;
+	Q81[54] = Q81[54] ^ zvq81;
+	Q81[49] = Q81[49] ^ zvq81;
+	Q81[16] = Q81[16] ^ zvq81;
+}
+
+byte BscF::R81_step() {
+	byte zvr81, ner81;
+	ner81 = T1[R81[80]];
+	zvr81 = R81[0];
+	R81.Move();
+	R81[80] = zvr81 ^ ner81;
+	R81[79] = R81[79] ^ zvr81;
+	R81[48] = R81[48] ^ zvr81;
+	R81[16] = R81[16] ^ zvr81;
+	return ner81;
+}
+
+void BscF::R81_start() {
+	int i;
+	for(i = 0; i < 81; i++) {
+		R81_step();
+		R81[80] = R81[80] ^ Wk[i % 10];
+	}
+	for(i = 0; i < Krok; i++)
+		R81_step();
+}
+
+void BscF::MACDummy() {
+	for(int k = 0; k < Krok; k++)
+		MAC_step();
+}
+
+void BscF::MACGen(const char *s, const char *lim) {
+	int i;
+	MAC_init();
+	while(s < lim) {
+		MAC_step();
+		Q81[80] = Q81[80] ^ *s++;
+	}
+	MACDummy();
+	for(i = 0; i < 10; i++)
+		IV[i] = Q81[80 - i];
+}
+
+void BscF::Start() {
+	R81_init();
+	R81_start();
+}
+
+String EncodeBscF(const String& src) {
+	String result;
+	BscF f;
+	const char *lim = src.End();
+	f.MACGen(src, lim);
+	memcpy(f.Wk, f.IV, 10);
+	f.Start();
+	result.Cat((const char *)f.IV, 10);
+	for(const char *s = src; s < lim; s++)
+		result.Cat(*s ^ f.R81_step());
+	for(int i = 0; i < 10; i++)
+		result.Cat(f.IV[i] ^ f.R81_step());
+	return result;
+}
+
+String DecodeBscF(const String& src) {
+	if(src.GetLength() <= 20)
+		return String::GetVoid();
+	BscF f;
+	String result;
+	const char *s = ~src + 10;
+	const char *lim = src.End() - 10;
+	f.MAC_init();
+	memcpy(f.Wk, src, 10);
+	f.Start();
+	while(s < lim) {
+		byte b = *s++ ^ f.R81_step();
+		result.Cat(b);
+		f.MAC_step();
+		f.Q81[80] ^= b;
+	}
+	f.MACDummy();
+	for(int i = 0; i < 10; i++)
+		if((byte)*s++ != (f.R81_step() ^ f.Q81[80 - i])) return String::GetVoid();
+	return result;
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/Crypto/COPYING b/uppsrc/Crypto/COPYING
new file mode 100644
index 000000000..33aa39102
--- /dev/null
+++ b/uppsrc/Crypto/COPYING
@@ -0,0 +1,30 @@
+Copyright (C) 2005 Mirek Fidler, Tomas Rylek and various contributors (see AUTHORS)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to
+deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies of the Software and its Copyright notices. In addition publicly
+documented acknowledgment must be given that this software has been used if no
+source code of this software is made available publicly. This includes
+acknowledgments in either Copyright notices, Manuals, Publicity and Marketing
+documents or any documentation provided with any product containing this
+software. This License does not apply to any software that links to the
+libraries provided by this software (statically or dynamically), but only to
+the software provided.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+-----------
+
+Please see the COPYING.PLAIN for a plain-english explanation of this notice
+and it's intent.
diff --git a/uppsrc/Crypto/COPYING-PLAIN b/uppsrc/Crypto/COPYING-PLAIN
new file mode 100644
index 000000000..770a8132f
--- /dev/null
+++ b/uppsrc/Crypto/COPYING-PLAIN
@@ -0,0 +1,33 @@
+Plain English Copyright Notice
+
+This file is not intended to be the actual License. The reason this file
+exists is that we here are programmers and engineers. We aren't lawyers. We
+provide licenses that we THINK say the right things, but we have our own
+intentions at heart. This is a plain-english explanation of what those
+intentions are, and if you follow them you will be within the "spirit" of
+the license.
+
+The intent is for us to enjoy writing software that is useful to us (the
+AUTHORS) and allow others to use it freely and also benefit from the work we
+put into making it. We don't want to restrict others using it. They should
+not *HAVE* to make the source code of the applications they write that
+simply link to these libraries (be that statically or dynamically), or for
+them to be limited as to what license they choose to use (be it open, closed
+or anything else). But we would like to know you are using these libraries.
+We simply would like to know that it has been useful to someone. This is why
+we ask for acknowledgement of some sort.
+
+You can do what you want with the source of this software - it doesn't
+matter. We still have it here for ourselves and it is open and free to use
+and download and play with. It can't be taken away. We don't really mind what
+you do with the source to your software. We would simply like to know that
+you are using it - especially if it makes it to a commerical product. If you
+simply e-mail all the AUTHORS (see COPYING and AUTHORS files) telling us, and
+then make sure you include a paragraph or page in the manual or in the "About.."
+box for the product with the copyright notice and state that you used this
+software, we will be very happy. If you want to contribute back modifications
+and fixes you may have made we will welcome those too with open arms (generally).
+If you want help with changes needed, ports needed or features to be added,
+arrangements can be easily made with some dialogue.
+
+Mirek Fidler <cxl@ntllib.org>
diff --git a/uppsrc/Crypto/Crypto.dsp b/uppsrc/Crypto/Crypto.dsp
new file mode 100644
index 000000000..e682293eb
--- /dev/null
+++ b/uppsrc/Crypto/Crypto.dsp
@@ -0,0 +1,104 @@
+# Microsoft Developer Studio Project File - Name="Crypto" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=Crypto - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "Crypto.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "Crypto.mak" CFG="Crypto - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "Crypto - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "Crypto - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "Crypto - Win32 Release"
+
+# PROP BASE Use_MFC 2
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 1
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_AFXDLL" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GR /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c
+# ADD BASE RSC /l 0x405 /d "NDEBUG" /d "_AFXDLL"
+# ADD RSC /l 0x405 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "Crypto - Win32 Debug"
+
+# PROP BASE Use_MFC 2
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 1
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_AFXDLL" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GR /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "_AFXDLL"
+# ADD RSC /l 0x405 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ENDIF
+
+# Begin Target
+
+# Name "Crypto - Win32 Release"
+# Name "Crypto - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=.\BscF.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Sha1.cpp
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=..\INCLUDE\Crypto.h
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/uppsrc/Crypto/Crypto.h b/uppsrc/Crypto/Crypto.h
new file mode 100644
index 000000000..c3ae188a5
--- /dev/null
+++ b/uppsrc/Crypto/Crypto.h
@@ -0,0 +1,35 @@
+#ifndef CRYPTO_H
+#define CRYPTO_H
+
+#include <Core/Core.h>
+
+NAMESPACE_UPP
+
+void   SHA1Transform(dword state[5], byte buffer[64]);
+void   SHA1Init(dword state[5]);
+void   SHA1Size(byte buffer[64], dword size);
+String SHA1(const void *s, dword size);
+String SHA1(const String& s);
+
+class Sha1 {
+	dword state[5];
+	byte  buffer[64];
+	int   pos;
+	dword size;
+
+public:
+	void    Put(const void *data, dword length);
+	void    Put(const String& s)                      { Put(s, s.GetLength()); }
+	String  Finish();
+	dword   GetSize()                                 { return size; }
+
+	Sha1();
+	~Sha1();
+};
+
+String EncodeBscF(const String& src);
+String DecodeBscF(const String& src);
+
+END_UPP_NAMESPACE
+
+#endif
diff --git a/uppsrc/Crypto/Crypto.upp b/uppsrc/Crypto/Crypto.upp
new file mode 100644
index 000000000..b37504788
--- /dev/null
+++ b/uppsrc/Crypto/Crypto.upp
@@ -0,0 +1,8 @@
+file
+	Crypto.h,
+	BscF.cpp,
+	Sha1.cpp,
+	Info readonly separator,
+	COPYING,
+	COPYING-PLAIN,
+	AUTHORS;
diff --git a/uppsrc/Crypto/Sha1.cpp b/uppsrc/Crypto/Sha1.cpp
new file mode 100644
index 000000000..92be9877a
--- /dev/null
+++ b/uppsrc/Crypto/Sha1.cpp
@@ -0,0 +1,176 @@
+#include "Crypto.h"
+
+
+NAMESPACE_UPP
+
+/*
+SHA-1 in C
+By Steve Reid <steve@edmweb.com>
+100% Public Domain
+
+Test Vectors (from FIPS PUB 180-1)
+"abc"
+  A9993E36 4706816A BA3E2571 7850C26C 9CD0D89D
+"abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq"
+  84983E44 1C3BD26E BAAE4AA1 F95129E5 E54670F1
+A million repetitions of "a"
+  34AA973C D4C4DAA4 F61EEB2B DBAD2731 6534016F
+*/
+
+/* Hash a single 512-bit block. This is the core of the algorithm. */
+/* blk0() and blk() perform the initial expand. */
+/* I got the idea of expanding during the round function from SSLeay */
+
+#ifdef COMPILER_MSC
+#define rol(value, bits) _rotl(value, bits)
+#else
+#define rol(value, bits) (((value) << (bits)) | ((value) >> (32 - (bits))))
+#endif
+
+#define blk0(i) (block[i] = (rol(block[i],24)&0xFF00FF00)|(rol(block[i],8)&0x00FF00FF))
+#define blk(i) (block[i&15] = rol(block[(i+13)&15]^block[(i+8)&15] \
+               ^block[(i+2)&15]^block[i&15],1))
+#define R0(v,w,x,y,z,i) z+=((w&(x^y))^y)+blk0(i)+0x5A827999+rol(v,5);w=rol(w,30);
+#define R1(v,w,x,y,z,i) z+=((w&(x^y))^y)+blk(i)+0x5A827999+rol(v,5);w=rol(w,30);
+#define R2(v,w,x,y,z,i) z+=(w^x^y)+blk(i)+0x6ED9EBA1+rol(v,5);w=rol(w,30);
+#define R3(v,w,x,y,z,i) z+=(((w|x)&y)|(w&x))+blk(i)+0x8F1BBCDC+rol(v,5);w=rol(w,30);
+#define R4(v,w,x,y,z,i) z+=(w^x^y)+blk(i)+0xCA62C1D6+rol(v,5);w=rol(w,30);
+
+void SHA1Transform(dword state[5], byte buffer[64]) {
+	dword a, b, c, d, e;
+    dword *block = (dword *)buffer;
+    a = state[0];
+    b = state[1];
+    c = state[2];
+    d = state[3];
+    e = state[4];
+    /* 4 rounds of 20 operations each. Loop unrolled. */
+    R0(a,b,c,d,e, 0); R0(e,a,b,c,d, 1); R0(d,e,a,b,c, 2); R0(c,d,e,a,b, 3);
+    R0(b,c,d,e,a, 4); R0(a,b,c,d,e, 5); R0(e,a,b,c,d, 6); R0(d,e,a,b,c, 7);
+    R0(c,d,e,a,b, 8); R0(b,c,d,e,a, 9); R0(a,b,c,d,e,10); R0(e,a,b,c,d,11);
+    R0(d,e,a,b,c,12); R0(c,d,e,a,b,13); R0(b,c,d,e,a,14); R0(a,b,c,d,e,15);
+    R1(e,a,b,c,d,16); R1(d,e,a,b,c,17); R1(c,d,e,a,b,18); R1(b,c,d,e,a,19);
+    R2(a,b,c,d,e,20); R2(e,a,b,c,d,21); R2(d,e,a,b,c,22); R2(c,d,e,a,b,23);
+    R2(b,c,d,e,a,24); R2(a,b,c,d,e,25); R2(e,a,b,c,d,26); R2(d,e,a,b,c,27);
+    R2(c,d,e,a,b,28); R2(b,c,d,e,a,29); R2(a,b,c,d,e,30); R2(e,a,b,c,d,31);
+    R2(d,e,a,b,c,32); R2(c,d,e,a,b,33); R2(b,c,d,e,a,34); R2(a,b,c,d,e,35);
+    R2(e,a,b,c,d,36); R2(d,e,a,b,c,37); R2(c,d,e,a,b,38); R2(b,c,d,e,a,39);
+    R3(a,b,c,d,e,40); R3(e,a,b,c,d,41); R3(d,e,a,b,c,42); R3(c,d,e,a,b,43);
+    R3(b,c,d,e,a,44); R3(a,b,c,d,e,45); R3(e,a,b,c,d,46); R3(d,e,a,b,c,47);
+    R3(c,d,e,a,b,48); R3(b,c,d,e,a,49); R3(a,b,c,d,e,50); R3(e,a,b,c,d,51);
+    R3(d,e,a,b,c,52); R3(c,d,e,a,b,53); R3(b,c,d,e,a,54); R3(a,b,c,d,e,55);
+    R3(e,a,b,c,d,56); R3(d,e,a,b,c,57); R3(c,d,e,a,b,58); R3(b,c,d,e,a,59);
+    R4(a,b,c,d,e,60); R4(e,a,b,c,d,61); R4(d,e,a,b,c,62); R4(c,d,e,a,b,63);
+    R4(b,c,d,e,a,64); R4(a,b,c,d,e,65); R4(e,a,b,c,d,66); R4(d,e,a,b,c,67);
+    R4(c,d,e,a,b,68); R4(b,c,d,e,a,69); R4(a,b,c,d,e,70); R4(e,a,b,c,d,71);
+    R4(d,e,a,b,c,72); R4(c,d,e,a,b,73); R4(b,c,d,e,a,74); R4(a,b,c,d,e,75);
+    R4(e,a,b,c,d,76); R4(d,e,a,b,c,77); R4(c,d,e,a,b,78); R4(b,c,d,e,a,79);
+    state[0] += a;
+    state[1] += b;
+    state[2] += c;
+    state[3] += d;
+    state[4] += e;
+	a = b = c = d = e = 0;
+}
+
+void SHA1Init(dword state[5]) {
+    state[0] = 0x67452301;
+    state[1] = 0xEFCDAB89;
+    state[2] = 0x98BADCFE;
+    state[3] = 0x10325476;
+    state[4] = 0xC3D2E1F0;
+}
+
+void SHA1Size(byte buffer[64], dword size) {
+	buffer[63] = byte(size << 3);
+	buffer[62] = byte(size >> 5);
+	buffer[61] = byte(size >> 13);
+	buffer[60] = byte(size >> 21);
+	buffer[59] = byte(size >> 29);
+	buffer[58] = 0;
+	buffer[57] = 0;
+	buffer[56] = 0;
+}
+
+String SHA1Result(dword state[5]) {
+	String r;
+    for(int i = 0; i < 5; i++) {
+		const byte *h = (const byte *)&state[i];
+		if(i) r.Cat(' ');
+		r.Cat(Format("%02X%02X%02X%02X", h[3], h[2], h[1], h[0]));
+	}
+	return r;
+}
+
+String SHA1(const void *data, dword length) {
+	dword state[5];
+	byte buffer[64];
+	dword pos = 0;
+	SHA1Init(state);
+	const char *s = (const char *) data;
+	dword size = length;
+	while(size >= 64) {
+		memcpy(buffer, s, 64);
+		SHA1Transform(state, buffer);
+		size -= 64;
+		s += 64;
+	}
+	memcpy(buffer, s, size);
+	memset(buffer + size, 0, 64 - size);
+	buffer[size] = 128;
+	if(size > 55) {
+		SHA1Transform(state, buffer);
+		memset(buffer, 0, 64);
+	}
+	SHA1Size(buffer, length);
+	SHA1Transform(state, buffer);
+	String r = SHA1Result(state);
+	size = 0;
+	memset(buffer, 0, 64);
+	memset(state, 0, 5);
+	return r;
+}
+
+String SHA1(const String& s) {
+	return SHA1(s, s.GetLength());
+}
+
+String Sha1::Finish() {
+	memset(buffer + pos, 0, 64 - pos);
+	buffer[pos] = 128;
+	if(pos > 55) {
+		SHA1Transform(state, buffer);
+		memset(buffer, 0, 64);
+	}
+	SHA1Size(buffer, size);
+	SHA1Transform(state, buffer);
+	return SHA1Result(state);
+}
+
+void Sha1::Put(const void *data, dword length) {
+	const byte *s = (const byte *)data;
+	size += length;
+	while(pos + length >= 64) {
+		int n = 64 - pos;
+		memcpy(buffer + pos, s, n);
+		SHA1Transform(state, buffer);
+		s += n;
+		length -= n;
+		pos = 0;
+	}
+	memcpy(buffer + pos, s, length);
+	pos += length;
+}
+
+Sha1::Sha1() {
+	SHA1Init(state);
+	pos = 0;
+	size = 0;
+}
+
+Sha1::~Sha1() {
+	memset(buffer, 0, 64);
+	memset(state, 0, 5);
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/CtrlCore/AUTHORS b/uppsrc/CtrlCore/AUTHORS
new file mode 100644
index 000000000..69b6e8abe
--- /dev/null
+++ b/uppsrc/CtrlCore/AUTHORS
@@ -0,0 +1,3 @@
+Mirek Fidler <cxl@ntllib.org>
+Tomas Rylek  <rylek@volny.cz>
+Guido Schimmels
diff --git a/uppsrc/CtrlCore/COPYING b/uppsrc/CtrlCore/COPYING
new file mode 100644
index 000000000..33aa39102
--- /dev/null
+++ b/uppsrc/CtrlCore/COPYING
@@ -0,0 +1,30 @@
+Copyright (C) 2005 Mirek Fidler, Tomas Rylek and various contributors (see AUTHORS)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to
+deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies of the Software and its Copyright notices. In addition publicly
+documented acknowledgment must be given that this software has been used if no
+source code of this software is made available publicly. This includes
+acknowledgments in either Copyright notices, Manuals, Publicity and Marketing
+documents or any documentation provided with any product containing this
+software. This License does not apply to any software that links to the
+libraries provided by this software (statically or dynamically), but only to
+the software provided.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+-----------
+
+Please see the COPYING.PLAIN for a plain-english explanation of this notice
+and it's intent.
diff --git a/uppsrc/CtrlCore/COPYING-PLAIN b/uppsrc/CtrlCore/COPYING-PLAIN
new file mode 100644
index 000000000..770a8132f
--- /dev/null
+++ b/uppsrc/CtrlCore/COPYING-PLAIN
@@ -0,0 +1,33 @@
+Plain English Copyright Notice
+
+This file is not intended to be the actual License. The reason this file
+exists is that we here are programmers and engineers. We aren't lawyers. We
+provide licenses that we THINK say the right things, but we have our own
+intentions at heart. This is a plain-english explanation of what those
+intentions are, and if you follow them you will be within the "spirit" of
+the license.
+
+The intent is for us to enjoy writing software that is useful to us (the
+AUTHORS) and allow others to use it freely and also benefit from the work we
+put into making it. We don't want to restrict others using it. They should
+not *HAVE* to make the source code of the applications they write that
+simply link to these libraries (be that statically or dynamically), or for
+them to be limited as to what license they choose to use (be it open, closed
+or anything else). But we would like to know you are using these libraries.
+We simply would like to know that it has been useful to someone. This is why
+we ask for acknowledgement of some sort.
+
+You can do what you want with the source of this software - it doesn't
+matter. We still have it here for ourselves and it is open and free to use
+and download and play with. It can't be taken away. We don't really mind what
+you do with the source to your software. We would simply like to know that
+you are using it - especially if it makes it to a commerical product. If you
+simply e-mail all the AUTHORS (see COPYING and AUTHORS files) telling us, and
+then make sure you include a paragraph or page in the manual or in the "About.."
+box for the product with the copyright notice and state that you used this
+software, we will be very happy. If you want to contribute back modifications
+and fixes you may have made we will welcome those too with open arms (generally).
+If you want help with changes needed, ports needed or features to be added,
+arrangements can be easily made with some dialogue.
+
+Mirek Fidler <cxl@ntllib.org>
diff --git a/uppsrc/CtrlCore/Ctrl.cpp b/uppsrc/CtrlCore/Ctrl.cpp
new file mode 100644
index 000000000..abd0dbb42
--- /dev/null
+++ b/uppsrc/CtrlCore/Ctrl.cpp
@@ -0,0 +1,898 @@
+#include "CtrlCore.h"
+
+NAMESPACE_UPP
+
+#define LLOG(x) // LOG(x)
+
+#define IMAGECLASS CtrlCoreImg
+#define IMAGEFILE <CtrlCore/Ctrl.iml>
+#include <Draw/iml_source.h>
+
+static bool StdDisplayErrorFn(const Value& e)
+{
+	if(!e.IsError())
+		return false;
+	String s = GetErrorText(e);
+#ifdef PLATFORM_WIN32
+#ifdef PLATFORM_WINCE
+	MessageBox(NULL, ToSystemCharset(s), ToSystemCharset(GetExeTitle()), MB_OK | MB_ICONQUESTION);
+#else
+	MessageBox(NULL, s, GetExeTitle(), MB_OK | MB_ICONQUESTION);
+#endif
+#else
+	fputs(String().Cat() << GetExeTitle() << ": " << s << '\n', stderr);
+#endif
+	return true;
+}
+
+bool (*&DisplayErrorFn())(const Value& v)
+{
+	static bool (*errfn)(const Value& v) = &StdDisplayErrorFn;
+	return errfn;
+}
+
+Ctrl *Ctrl::LoopCtrl;
+int   Ctrl::LoopLevel;
+
+bool Ctrl::MemoryCheck;
+
+void   Ctrl::SetData(const Value&) {}
+Value  Ctrl::GetData() const       { return Value(); }
+
+void Ctrl::Paint(Draw& draw)                        {}
+int  Ctrl::OverPaint() const                        { return 0; }
+
+void Ctrl::Activate()                               {}
+void Ctrl::Deactivate()                             {}
+void Ctrl::CancelMode()                             {}
+void Ctrl::MouseEnter(Point p, dword keyflags)      {}
+void Ctrl::LeftDown(Point p, dword keyflags)        {}
+void Ctrl::RightDown(Point p, dword keyflags)       {}
+void Ctrl::LeftRepeat(Point p, dword keyflags)      {}
+void Ctrl::RightRepeat(Point p, dword keyflags)     {}
+void Ctrl::MouseMove(Point p, dword keyflags)       {}
+void Ctrl::LeftUp(Point, dword keyflags)            {}
+void Ctrl::RightUp(Point p, dword keyflags)         {}
+void Ctrl::MouseLeave()                             {}
+void Ctrl::MouseWheel(Point p, int zd, dword kf)    {}
+void Ctrl::LeftDrag(Point p, dword keyflags)        {}
+void Ctrl::LeftHold(Point p, dword keyflags)        {}
+void Ctrl::RightDrag(Point p, dword keyflags)       {}
+void Ctrl::RightHold(Point p, dword keyflags)       {}
+void Ctrl::MiddleDown(Point p, dword keyflags)      {}
+void Ctrl::MiddleDouble(Point p, dword keyflags)    {}
+void Ctrl::MiddleTriple(Point p, dword keyflags)    {}
+void Ctrl::MiddleRepeat(Point p, dword keyflags)    {}
+void Ctrl::MiddleDrag(Point p, dword keyflags)      {}
+void Ctrl::MiddleHold(Point p, dword keyflags)      {}
+void Ctrl::MiddleUp(Point p, dword keyflags)        {}
+
+void Ctrl::Layout()                                 {}
+
+void Ctrl::PostInput()
+{
+	if(parent) parent->PostInput();
+}
+
+void Ctrl::LeftDouble(Point p, dword keyflags)
+{
+	LeftDown(p, keyflags);
+}
+
+void Ctrl::LeftTriple(Point p, dword keyflags)
+{
+	LeftDown(p, keyflags);
+}
+
+void Ctrl::RightDouble(Point p, dword keyflags)
+{
+	RightDown(p, keyflags);
+}
+
+void Ctrl::RightTriple(Point p, dword keyflags)
+{
+	RightDown(p, keyflags);
+}
+
+void Ctrl::ChildGotFocus()
+{
+	if(parent) parent->ChildGotFocus();
+}
+
+void Ctrl::ChildLostFocus()
+{
+	if(parent) parent->ChildLostFocus();
+}
+
+void Ctrl::ChildAdded(Ctrl *q)
+{
+	if(parent) parent->ChildAdded(q);
+}
+
+void Ctrl::ChildRemoved(Ctrl *q)
+{
+	if(parent) parent->ChildRemoved(q);
+}
+
+void Ctrl::ParentChange() {}
+
+bool Ctrl::Key(dword key, int count)
+{
+	return false;
+}
+
+void Ctrl::GotFocus()                               {}
+void Ctrl::LostFocus()                              {}
+
+dword  Ctrl::AccessKeyBit(byte accesskey)
+{
+	if(accesskey >= 'A' && accesskey <= 'Z')
+		return (uint64)2 << (accesskey - 'A');
+	return !!accesskey;
+}
+
+dword Ctrl::GetAccessKeysDeep() const
+{
+	dword used = GetAccessKeys();
+	for(Ctrl *ctrl = GetFirstChild(); ctrl; ctrl = ctrl->GetNext())
+		used |= ctrl->GetAccessKeysDeep();
+	return used;
+}
+
+void Ctrl::AssignAccessKeys(dword used)
+{
+	for(Ctrl *ctrl = GetFirstChild(); ctrl; ctrl = ctrl->GetNext()) {
+		ctrl->AssignAccessKeys(used);
+		used |= ctrl->GetAccessKeys();
+	}
+}
+
+dword Ctrl::GetAccessKeys() const
+{
+	return 0;
+}
+
+void Ctrl::DistributeAccessKeys()
+{
+	AssignAccessKeys(GetAccessKeysDeep());
+}
+
+bool Ctrl::VisibleAccessKeys()
+{
+	if(GUI_AltAccessKeys())
+		return GetAlt() && GetTopCtrl() == GetActiveCtrl();
+	return true;
+}
+
+void Ctrl::State(int) {}
+
+void Ctrl::StateDeep(int reason)
+{
+	if(destroying)
+		return;
+	State(reason);
+	for(Ctrl *q = GetFirstChild(); q; q = q->GetNext())
+		q->StateDeep(reason);
+}
+
+void Ctrl::StateH(int reason)
+{
+	for(int i = 0; i < statehook().GetCount(); i++)
+		if((*statehook()[i])(this, reason))
+			return;
+	if(reason == POSITION)
+		State(reason);
+	else
+		StateDeep(reason);
+}
+
+bool   Ctrl::Accept()
+{
+	if(!IsEnabled() || !IsShown())
+		return true;
+	if(DisplayError(GetData())) {
+		SetWantFocus();
+		return false;
+	}
+	for(Ctrl *q = GetFirstChild(); q; q = q->GetNext())
+		if(!q->Accept()) return false;
+	return true;
+}
+
+void   Ctrl::Reject()
+{
+	for(Ctrl *q = GetFirstChild(); q; q = q->GetNext())
+		q->Reject();
+}
+
+void   Ctrl::Serialize(Stream& s)
+{
+	Value x;
+	if(s.IsStoring())
+		x = GetData();
+	s % x;
+	if(s.IsLoading())
+		SetData(x);
+	for(Ctrl *q = GetFirstChild(); q; q = q->GetNext())
+		q->Serialize(s);
+}
+
+void Ctrl::Updated() {}
+
+bool Ctrl::IsForeground() const
+{
+	return GetTopCtrl()->IsWndForeground();
+}
+
+void Ctrl::SetForeground()
+{
+	GetTopCtrl()->SetWndForeground();
+}
+
+bool Ctrl::IsOpen() const
+{
+	const Ctrl *q = GetTopCtrl();
+	return q->IsWndOpen() && q->isopen;
+}
+
+void Ctrl::Show(bool ashow) {
+	if(visible != ashow) {
+		LLOG("Show " << Name() << " " << ashow);
+		visible = true;
+		fullrefresh = false;
+		RefreshFrame();
+		visible = ashow;
+		fullrefresh = false;
+		RefreshFrame();
+		if(parent)
+			StateH(SHOW);
+// 01/12/2007 - mdelfede
+// added support for windowed controls
+//		else
+		if(top)
+// 01/12/2007 - END
+			WndShow(visible);
+		if(InFrame() && parent)
+			RefreshParentLayout();
+	}
+}
+
+bool Ctrl::IsVisible() const {
+	const Ctrl *q = this;
+	for(;;) {
+		if(!q->visible) return false;
+		if(!q->parent) break;
+		q = q->parent;
+	}
+	return q->visible;
+}
+
+void Ctrl::Enable(bool aenable) {
+	if(enabled != aenable) {
+		enabled = aenable;
+// 01/12/2007 - mdelfede
+// added support for windowed controls
+//		if(!parent) WndEnable(enabled);
+		if(top) WndEnable(enabled);
+// 01/12/2007 - END
+		if(!enabled && parent && HasFocusDeep())
+			IterateFocusForward(this, GetTopCtrl());
+		RefreshFrame();
+		StateH(ENABLE);
+		SyncCaret();
+	}
+}
+
+bool Ctrl::IsShowEnabled() const {
+	return IsEnabled() && (!parent || parent->IsShowEnabled());
+}
+
+Ctrl& Ctrl::SetEditable(bool aeditable) {
+	if(editable != aeditable) {
+		editable = aeditable;
+		RefreshFrame();
+		StateH(EDITABLE);
+	}
+	return *this;
+}
+
+void Ctrl::SetModify()
+{
+	modify = true;
+}
+
+void Ctrl::ClearModify()
+{
+	modify = false;
+	for(Ctrl *q = firstchild; q; q = q->next)
+		q->ClearModify();
+}
+
+bool Ctrl::IsModified() const
+{
+	if(IsModifySet()) return true;
+	for(Ctrl *q = firstchild; q; q = q->next)
+		if(q->IsModified()) return true;
+	return false;
+}
+
+void Ctrl::SetCaret(int x, int y, int cx, int cy)
+{
+	caretx = x;
+	carety = y;
+	caretcx = cx;
+	caretcy = cy;
+}
+
+void Ctrl::SetCaret(const Rect& r)
+{
+	caretx = r.left;
+	carety = r.top;
+	caretcx = r.GetWidth();
+	caretcy = r.GetHeight();
+}
+
+Rect Ctrl::GetCaret() const
+{
+	return RectC(caretx, carety, caretcx, caretcy);
+}
+
+void Ctrl::KillCaret()
+{
+	SetCaret(0, 0, 0, 0);
+}
+
+void Ctrl::SetInfoPart(int i, const char *txt)
+{
+	Vector<String> f = Split(info, '\x7f', false);
+	f.At(i) = txt;
+	info = Join(f, "\x7f");
+}
+
+Ctrl& Ctrl::Tip(const char *txt)
+{
+	SetInfoPart(0, txt);
+	return *this;
+}
+
+Ctrl& Ctrl::HelpLine(const char *txt)
+{
+	SetInfoPart(1, txt);
+	return *this;
+}
+
+Ctrl& Ctrl::Description(const char *txt)
+{
+	SetInfoPart(2, txt);
+	return *this;
+}
+
+Ctrl& Ctrl::HelpTopic(const char *txt)
+{
+	SetInfoPart(3, txt);
+	return *this;
+}
+
+Ctrl& Ctrl::LayoutId(const char *txt)
+{
+	SetInfoPart(4, txt);
+	return *this;
+}
+
+String Ctrl::GetInfoPart(int i) const
+{
+	Vector<String> f = Split(info, '\x7f', false);
+	return i < f.GetCount() ? f[i] : String();
+}
+
+String Ctrl::GetTip() const
+{
+	return GetInfoPart(0);;
+}
+
+String Ctrl::GetHelpLine() const
+{
+	return GetInfoPart(1);
+}
+
+String Ctrl::GetDescription() const
+{
+	return GetInfoPart(2);
+}
+
+String Ctrl::GetHelpTopic() const
+{
+	return GetInfoPart(3);
+}
+
+String Ctrl::GetLayoutId() const
+{
+	return GetInfoPart(4);
+}
+
+bool  Ctrl::SetWantFocus() {
+	if(IsWantFocus() && IsEnabled() && IsVisible() && IsOpen())
+		return SetFocus();
+	return false;
+}
+
+void Ctrl::UpdateRefresh() {
+	Update();
+	Refresh();
+}
+
+void Ctrl::Update() {
+	SetModify();
+	Updated();
+}
+
+void Ctrl::Action() {
+	WhenAction();
+}
+
+void Ctrl::UpdateAction() {
+	Update();
+	Action();
+}
+
+void Ctrl::UpdateActionRefresh() {
+	Update();
+	Action();
+	Refresh();
+};
+
+void  Ctrl::CancelModeDeep() {
+	CancelMode();
+	for(Ctrl *q = firstchild; q; q = q->next)
+		q->CancelModeDeep();
+}
+
+String Ctrl::Name() const {
+#ifdef CPU_64
+	String s = String(typeid(*this).name()) + " : 0x" + FormatIntHex(this);
+#else
+	String s = String(typeid(*this).name()) + " : " + Format("0x%x", (int) this);
+#endif
+	if(IsChild())
+		s << "(parent " << String(typeid(*parent).name()) << ")";
+	else
+#ifdef PLATFORM_WIN32
+		s << Format("(hwnd 0x%x)", (int)(intptr_t) GetHWND());
+#endif
+#ifdef PLATFORM_X11
+		s << Format("(window 0x%x)", (int)(intptr_t) GetWindow());
+#endif
+	return s;
+}
+
+String Ctrl::GetDesc() const
+{
+	return "";
+}
+
+
+String Name(const Ctrl *ctrl)
+{
+	return ctrl ? ctrl->Name() : "NULL";
+}
+
+String Desc(const Ctrl *ctrl)
+{
+	if(!ctrl)
+		return "NULL";
+	String s;
+	s << typeid(*ctrl).name();
+	String q = ctrl->GetDesc();
+	if(IsNull(q)) {
+		if(ctrl->GetPrev()) {
+			q = ctrl->GetPrev()->GetDesc();
+			if(!IsNull(q))
+			  s << " <<\"" << q << "\">>";
+		}
+	}
+	else
+	  s << " \"" << q << '\"';
+	const Ctrl *top = ctrl->GetTopWindow();
+ 	if(top && top != ctrl) {
+ 		String q = top->GetDesc();
+ 		if(IsNull(q))
+ 			s << " (" << typeid(*top).name() << ")";
+ 		else
+	 		s << " (\"" << q << "\")";
+ 	}
+ 	return s;
+}
+
+#ifdef _DEBUG
+
+#define sFLAG(x)  (x ? #x" " : "")
+#define LG(x)     s << x << '\n'
+
+void Ctrl::Dump(Stream& s) const {
+	LG(Name());
+	LG(sFLAG(backpaint) << sFLAG(inframe) << sFLAG(visible) << sFLAG(enabled) <<
+	   sFLAG(wantfocus) << sFLAG(editable) << sFLAG(IsModified()) << sFLAG(transparent));
+	LG("Rect:   " << GetRect());
+	LG("View:   " << GetView());
+	for(int i = 0; i < frame.GetCount(); i++)
+		LG("Frame " << i << ": " << typeid(*frame[i].frame).name() << " - " << frame[i].view);
+	LG("Data: " << GetData().ToString());
+	if(firstchild) {
+		LG("Children");
+		s << LOG_BEGIN;
+		for(Ctrl *q = GetFirstChild(); q; q = q->GetNext()) {
+			q->Dump(s);
+			LG("------");
+		}
+		s << LOG_END;
+	}
+	else
+		LG("No child");
+}
+
+void Ctrl::Dump() const {
+	Dump(VppLog());
+}
+
+void   Dump(const Ctrl *ctrl)
+{
+	if(ctrl)
+		ctrl->Dump();
+	else
+		LOG("NULL");
+}
+
+#endif
+
+bool Ctrl::IsOcxChild()
+{
+	return false;
+}
+
+Ctrl::Ctrl() {
+	LLOG("Ctrl::Ctrl");
+	destroying = false;
+	parent = prev = next = firstchild = lastchild = NULL;
+	top = NULL;
+	exitcode = 0;
+	frame.Add().frame = &NullFrame();
+	enabled = visible = wantfocus = initfocus = true;
+	editable = true;
+	GLX = false;
+#ifdef PLATFORM_WIN32
+	activex = false;
+#endif
+	backpaint = TRANSPARENTBACKPAINT;
+	inframe = false;
+	ignoremouse = transparent = false;
+	caretcx = caretcy = caretx = carety = 0;
+	SetRect(Rect(0, 0, 0, 0));
+	inloop = popup = isopen = false;
+	modify = false;
+	unicode = false;
+	popupgrab = false;
+	fullrefresh = false;
+	akv = false;
+}
+
+void KillTimeCallbacks(void *id, void *idlim);
+
+void Ctrl::DoRemove() {
+	if(!IsOpen()) return;
+	ReleaseCapture();
+	CancelModeDeep();
+	if(HasChildDeep(mouseCtrl) || mouseCtrl == this)
+		mouseCtrl = NULL;
+	LLOG("DoRemove " << Name() << " focusCtrl: " << UPP::Name(focusCtrl) << BeginIndent);
+#ifdef PLATFORM_X11
+	if(popupgrab) {
+		EndPopupGrab();
+		popupgrab = false;
+	}
+#endif
+	if(HasFocusDeep()) {
+		LLOG("DoRemove - HasFocusDeep");
+		if(destroying) {
+			if(parent) {
+				LLOG("parent - deferred SetFocus / ChildLostFocus; parent = " << UPP::Name(parent));
+				defferedSetFocus = parent;
+				defferedChildLostFocus.Add(parent);
+			}
+			else
+				if(IsPopUp()) {
+					LLOG("Remove Popup");
+					Ctrl *owner = GetOwner();
+					if(owner && owner->IsEnabled())
+						owner->ActivateWnd();
+				}
+			NoWantFocus();
+		}
+		else {
+			Ptr<Ctrl> fc = focusCtrl;
+			focusCtrl = NULL;
+			DoKillFocus(fc, NULL);
+			if(parent) {
+				LLOG("DoRemove -> SetFocus(" << UPP::Name(parent) << "), focusCtrl = " << UPP::Name(focusCtrl) << ", fc = " << UPP::Name(fc));
+				bool b = IsWantFocus();
+				NoWantFocus();
+				parent->SetFocus0(false);
+				WantFocus(b);
+			}
+			else
+				if(IsPopUp()) {
+					LLOG("Remove Popup");
+					Ctrl *owner = GetOwner();
+					if(owner && owner->IsEnabled()) {
+						LLOG("Remove popup -> owner->ActivateWnd");
+						owner->ActivateWnd();
+					}
+				}
+		}
+		SyncCaret();
+	}
+	LLOG(EndIndent << "//DoRemove " << Name() << " focusCtrl: " << UPP::Name(focusCtrl));
+}
+
+void Ctrl::Close()
+{
+	Ctrl *q = GetTopCtrl();
+	if(!q->top) return;
+	DoRemove();
+	if(parent) return;
+	StateH(CLOSE);
+	bool vis = visible;
+	UsrLogT(3, "CLOSE " + Desc(this));
+	WndDestroy();
+	visible = vis;
+	popup = false;
+}
+
+Ctrl::~Ctrl() {
+	LLOG("Ctrl::~Ctrl");
+	destroying = true;
+	while(GetFirstChild())
+		RemoveChild(GetFirstChild());
+	if(parent)
+		parent->RemoveChild(this);
+	Close();
+	KillTimeCallbacks(this, (byte *) this + sizeof(Ctrl));
+}
+
+GLOBAL_VAR(Vector<Ctrl::MouseHook>, Ctrl::mousehook);
+GLOBAL_VAR(Vector<Ctrl::KeyHook>,   Ctrl::keyhook);
+GLOBAL_VAR(Vector<Ctrl::StateHook>, Ctrl::statehook);
+
+void Ctrl::InstallMouseHook(MouseHook hook)
+{
+	mousehook().Add(hook);
+}
+
+void Ctrl::DeinstallMouseHook(MouseHook hook)
+{
+	int q = FindIndex(mousehook(), hook);
+	if(q >= 0) mousehook().Remove(q);
+}
+
+void Ctrl::InstallKeyHook(KeyHook hook)
+{
+	keyhook().Add(hook);
+}
+
+void Ctrl::DeinstallKeyHook(KeyHook hook)
+{
+	int q = FindIndex(keyhook(), hook);
+	if(q >= 0) keyhook().Remove(q);
+}
+
+void Ctrl::InstallStateHook(StateHook hook)
+{
+	statehook().Add(hook);
+}
+
+void Ctrl::DeinstallStateHook(StateHook hook)
+{
+	int q = FindIndex(statehook(), hook);
+	if(q >= 0) statehook().Remove(q);
+}
+
+static char sZoomText[] = "OK Cancel Exit Retry";
+
+const char *Ctrl::GetZoomText()
+{
+	return sZoomText;
+}
+
+Size Ctrl::Dsize;
+Size Ctrl::Csize;
+
+inline void Ctrl::Csizeinit()
+{
+	if(Csize.cx == 0)
+		Csize = GetTextSize(sZoomText, StdFont());
+	if(Dsize.cx == 0)
+		Dsize = Size(99, 13);
+	Csize.cx = max(Csize.cx, Dsize.cx);
+	Csize.cy = max(Csize.cy, Dsize.cy);
+}
+
+void Ctrl::SetZoomSize(Size sz, Size bsz)
+{
+	Csize = sz;
+	Dsize = bsz;
+}
+
+void Ctrl::NoLayoutZoom()
+{
+	Csize = Dsize = Size(1, 1);
+}
+
+void Ctrl::GetZoomRatio(Size& m, Size& d)
+{
+	m = Csize;
+	d = Dsize;
+}
+
+int  Ctrl::HorzLayoutZoom(int cx)
+{
+	Csizeinit();
+	return Csize.cx * cx / Dsize.cx;
+}
+
+int  Ctrl::VertLayoutZoom(int cy)
+{
+	Csizeinit();
+	return Csize.cy * cy / Dsize.cy;
+}
+
+Size Ctrl::LayoutZoom(int cx, int cy)
+{
+	Csizeinit();
+	return Size(Csize.cx * cx / Dsize.cx, Csize.cy * cy / Dsize.cy);
+}
+
+Size Ctrl::LayoutZoom(Size sz)
+{
+	Csizeinit();
+	return LayoutZoom(sz.cx, sz.cy);
+}
+
+Font FontZ(int face, int height)
+{
+	return Font(face, Ctrl::VertLayoutZoom(height));
+}
+
+Font StdFontZ(int height) { return FontZ(Font::STDFONT, height); }
+Font ScreenSansZ(int height) { return FontZ(Font::SCREEN_SANS, height); }
+Font ScreenSerifZ(int height) { return FontZ(Font::SCREEN_SERIF, height); }
+Font ScreenFixedZ(int height) { return FontZ(Font::SCREEN_FIXED, height); }
+Font RomanZ(int height) { return FontZ(Font::ROMAN, height); }
+Font ArialZ(int height) { return FontZ(Font::ARIAL, height); }
+Font CourierZ(int height) { return FontZ(Font::COURIER, height); }
+
+String Ctrl::appname;
+
+void Ctrl::SetAppName(const String& nm)
+{
+	appname = nm;
+}
+
+String Ctrl::GetAppName()
+{
+	if(appname.IsEmpty())
+		appname = GetExeTitle();
+	return appname;
+}
+
+static bool _ClickFocus;
+bool Ctrl::ClickFocus() { return _ClickFocus; }
+void Ctrl::ClickFocus(bool cf) { _ClickFocus = cf; }
+
+
+Vector<Ctrl *> Ctrl::GetTopWindows()
+{
+	Vector<Ctrl *> c = GetTopCtrls();
+	Vector<Ctrl *> r;
+	for(int i = 0; i < c.GetCount(); i++)
+		if(!c[i]->IsPopUp())
+			r.Add(c[i]);
+	return r;
+}
+
+void Ctrl::CloseTopCtrls()
+{
+	Vector<Ctrl *> tc = Ctrl::GetTopCtrls();
+	for(int i = 0; i < tc.GetCount(); i++)
+		tc[i]->Close();
+}
+
+bool xpstyle;
+
+bool IsOrOwnedBy(Ctrl *q, Ctrl *window)
+{
+	while(q) {
+		if(q == window)
+			return true;
+		q = q->GetOwner();
+	}
+	return false;
+}
+
+Vector< Ptr<Ctrl> > DisableCtrls(const Vector<Ctrl *>& ctrl, Ctrl *exclude)
+{
+	Vector< Ptr<Ctrl> > disabled;
+	for(int i = 0; i < ctrl.GetCount(); i++) {
+		Ctrl *q = ctrl[i];
+		if(q && q->IsEnabled() && !IsOrOwnedBy(q, exclude)) {
+			q->Disable();
+			disabled.Add(q);
+		}
+	}
+	return disabled;
+}
+
+void EnableCtrls(const Vector< Ptr<Ctrl> >& ctrl)
+{
+	for(int i = ctrl.GetCount(); --i >= 0;) {
+		Ctrl *q = ctrl[i];
+		if(q) q->Enable();
+	}
+}
+
+void Modality::Begin(Ctrl *modal, bool fo)
+{
+	active = Ctrl::GetFocusCtrl();
+	fore_only = fo;
+	LLOG("Active " << Name(active));
+	enable = DisableCtrls(Ctrl::GetTopWindows(), modal);
+}
+
+void Modality::End()
+{
+	EnableCtrls(enable);
+	if(active && (!fore_only || active->IsForeground()))
+		active->SetFocus();
+	enable.Clear();
+	active = NULL;
+}
+
+void (*s_chdefault)();
+
+void (*Ctrl::skin)();
+
+void CtrlSetDefaultSkin(void (*fn1)(), void (*fn2)())
+{
+	s_chdefault = fn1;
+	Ctrl::skin = fn2;
+}
+
+void Ctrl::SetSkin(void (*_skin)())
+{
+	skin = _skin;
+	ChSync();
+	Vector<Ctrl *> ctrl = GetTopCtrls();
+	for(int i = 0; i < ctrl.GetCount(); i++) {
+		ctrl[i]->RefreshLayoutDeep();
+		ctrl[i]->RefreshFrame();
+	}
+}
+
+void Ctrl::ChSync()
+{
+	if(s_chdefault)
+		(*s_chdefault)();
+	if(skin)
+		(*skin)();
+	Csize.cx = Dsize.cx = 0;
+	ChFinish();
+}
+
+CH_INT(GUI_GlobalStyle, GUISTYLE_CLASSIC);
+CH_INT(GUI_DragFullWindow, 1);
+CH_INT(GUI_PopUpEffect, GUIEFFECT_SLIDE);
+CH_INT(GUI_DropShadows, 1);
+CH_INT(GUI_AltAccessKeys, 1);
+CH_INT(GUI_AKD_Conservative, 0);
+CH_INT(GUI_DragDistance, 4);
+CH_INT(GUI_DblClickTime, 500);
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/CtrlCore/Ctrl.iml b/uppsrc/CtrlCore/Ctrl.iml
new file mode 100644
index 000000000..c7ddf0865
--- /dev/null
+++ b/uppsrc/CtrlCore/Ctrl.iml
@@ -0,0 +1,69 @@
+PREMULTIPLIED
+IMAGE_ID(DndMove)
+IMAGE_ID(DndMove98)
+IMAGE_ID(DndNone)
+IMAGE_ID(DndNone98)
+IMAGE_ID(DndCopy)
+IMAGE_ID(DndCopy98)
+IMAGE_ID(DndData)
+
+IMAGE_BEGIN_DATA
+IMAGE_DATA(120,156,237,154,91,136,77,81,24,199,255,227,50,147,40,183,145,82,52,169,121,147,68,30,144,113,45,50,17,33,229,30)
+IMAGE_DATA(81,51,15,212,36,133,144,114,203,45,204,132,72,226,129,16,226,137,7,229,69,241,98,152,23,151,121,48,15,52,102,212)
+IMAGE_DATA(52,145,92,155,237,255,57,123,159,115,236,189,246,217,103,159,115,214,90,231,97,127,245,157,189,215,218,251,236,223,255,251)
+IMAGE_DATA(214,229,156,181,91,168,65,13,178,204,129,93,115,92,175,117,125,152,105,190,152,171,97,43,125,186,97,13,142,103,174,134)
+IMAGE_DATA(157,134,53,56,217,102,65,131,227,55,195,26,2,124,195,26,148,124,131,26,66,249,134,52,228,228,27,208,16,201,215,172)
+IMAGE_DATA(33,138,233,249,3,250,105,250,50,122,181,46,62,130,243,145,112,175,210,143,67,207,252,24,136,87,193,23,246,26,232,249)
+IMAGE_DATA(125,240,179,30,40,52,8,191,94,3,27,200,180,239,30,164,242,188,83,193,151,122,201,125,173,38,254,84,122,35,50,253)
+IMAGE_DATA(187,70,161,65,103,14,36,174,217,248,191,111,153,204,129,48,171,17,140,205,100,14,84,102,50,7,161,26,178,216,54,248)
+IMAGE_DATA(146,235,233,46,215,198,255,51,79,131,173,255,167,137,37,150,88,98,122,172,76,95,6,88,227,103,253,216,90,227,91,212)
+IMAGE_DATA(160,90,128,88,227,91,208,16,224,27,214,160,228,27,212,16,202,55,164,33,39,223,128,134,72,190,102,13,81,76,163,241)
+IMAGE_DATA(195,252,124,20,136,215,6,223,199,50,169,65,197,48,205,87,214,27,110,135,114,225,135,246,69,239,216,209,209,241,95,57)
+IMAGE_DATA(234,24,23,238,127,134,95,79,1,199,66,226,79,151,227,198,224,143,69,247,119,34,30,87,108,252,69,193,145,196,159,196)
+IMAGE_DATA(175,249,59,17,143,43,52,254,146,29,227,194,53,104,72,44,204,202,244,101,64,178,51,0,201,206,0,11,26,2,124,195)
+IMAGE_DATA(26,148,124,131,26,66,249,134,52,228,228,27,208,16,201,215,172,33,138,233,121,178,51,160,188,118,6,84,86,0,171,231)
+IMAGE_DATA(0,237,135,129,190,22,222,183,31,248,51,1,120,202,107,243,227,240,93,143,179,51,160,114,8,112,242,32,208,123,17,248)
+IMAGE_DATA(190,8,248,48,21,120,187,30,248,120,135,90,182,3,157,85,64,19,239,235,151,39,63,214,206,128,254,140,187,153,236,189)
+IMAGE_DATA(64,15,207,143,177,110,1,189,110,32,112,130,122,250,122,120,255,1,234,98,221,76,250,128,60,52,196,218,25,64,17,237)
+IMAGE_DATA(143,129,223,131,129,243,44,179,9,48,145,241,30,160,144,47,173,228,115,128,116,182,241,59,99,129,123,188,54,134,94,17)
+IMAGE_DATA(193,143,181,51,224,36,25,140,253,51,207,87,210,39,209,183,156,1,126,188,102,61,219,255,5,3,62,116,3,248,181,2)
+IMAGE_DATA(120,199,107,243,232,149,121,228,64,101,202,28,72,95,107,0,62,241,124,46,227,62,36,236,151,100,215,166,250,158,204,15)
+IMAGE_DATA(13,23,128,111,107,129,14,158,47,167,15,45,144,15,100,250,103,122,103,192,9,246,115,230,186,151,65,93,103,66,190,190)
+IMAGE_DATA(206,176,137,196,12,198,191,238,46,219,103,121,42,126,209,51,162,8,126,96,103,0,59,235,211,103,100,82,76,95,171,155)
+IMAGE_DATA(115,151,51,131,62,134,90,238,75,251,15,7,238,184,117,195,139,224,123,26,210,255,79,217,153,230,239,98,31,235,34,131)
+IMAGE_DATA(141,251,145,117,251,232,171,232,139,71,1,87,110,2,63,55,2,221,82,166,79,161,15,42,146,31,48,230,190,105,27,199)
+IMAGE_DATA(216,67,198,207,65,219,203,201,177,253,8,208,245,136,154,40,164,155,99,113,55,111,155,69,31,135,252,230,129,184,38,207)
+IMAGE_DATA(156,57,146,99,108,9,219,153,252,247,11,57,7,113,76,222,98,61,167,36,212,209,199,211,171,52,176,61,147,185,69,198)
+IMAGE_DATA(183,140,49,233,231,75,233,211,232,147,145,138,91,39,219,51,153,91,100,124,203,24,147,126,46,125,77,218,91,71,206,19)
+IMAGE_DATA(75,172,180,86,166,47,3,172,241,179,126,108,173,241,45,106,80,45,64,172,241,45,104,8,240,13,107,80,242,13,106,8)
+IMAGE_DATA(229,27,210,144,147,111,64,67,36,95,179,134,40,166,209,248,97,126,62,10,196,107,131,239,99,229,163,97,180,124,112,81)
+IMAGE_DATA(230,240,79,184,211,146,90,0,59,155,227,107,86,49,162,248,255,216,92,148,58,87,82,11,195,180,115,17,230,236,137,167)
+IMAGE_DATA(33,236,222,156,26,46,179,238,176,162,254,18,235,122,66,174,197,180,80,190,196,249,68,241,252,179,172,227,162,216,89,77)
+IMAGE_DATA(111,43,172,45,242,210,112,138,231,71,125,207,62,199,242,27,151,45,229,219,26,249,210,215,118,100,149,133,253,42,139,45)
+IMAGE_DATA(230,245,139,34,249,128,162,127,74,252,205,110,221,89,95,220,158,221,103,121,83,105,248,117,254,10,137,235,57,253,90,86)
+IMAGE_DATA(123,251,239,41,81,251,135,154,244,111,121,25,80,175,96,220,45,93,238,115,90,19,25,178,248,223,71,111,116,231,32,41)
+IMAGE_DATA(111,8,178,181,45,138,37,199,107,221,120,87,106,206,121,153,90,127,184,243,177,207,76,188,136,72,44,177,162,236,47,6)
+IMAGE_DATA(32,123,164,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0)
+IMAGE_END_DATA(1152, 4)
+
+IMAGE_BEGIN_DATA
+IMAGE_DATA(120,156,237,152,191,106,21,65,20,198,207,35,88,228,1,182,201,35,216,164,178,21,83,104,149,194,62,24,31,32,77,64)
+IMAGE_DATA(236,82,72,192,20,86,193,34,104,103,170,96,99,33,232,3,8,130,88,104,17,66,2,17,3,33,66,98,140,70,248,220)
+IMAGE_DATA(147,153,235,157,204,206,236,206,122,119,206,68,114,62,248,184,115,103,151,249,125,103,118,119,246,15,85,84,145,35,80,89)
+IMAGE_DATA(193,122,218,250,154,52,159,101,51,204,215,158,17,206,128,145,108,134,69,225,12,112,85,32,3,124,9,103,104,240,133,51)
+IMAGE_DATA(4,249,130,25,162,124,161,12,173,124,129,12,157,252,204,25,186,152,35,111,214,126,92,251,78,237,169,92,124,106,174,71)
+IMAGE_DATA(204,93,175,253,136,242,172,143,141,122,3,124,102,223,165,60,247,7,159,181,25,200,192,252,91,25,216,68,227,227,187,68)
+IMAGE_DATA(102,158,23,3,124,238,231,185,159,206,196,191,94,251,62,141,207,239,42,144,193,157,3,255,220,12,249,166,29,39,69,92)
+IMAGE_DATA(215,13,186,120,110,181,205,1,86,55,128,123,43,192,220,67,224,246,146,49,183,185,207,238,63,107,51,164,136,153,83,212)
+IMAGE_DATA(60,190,177,57,192,219,247,192,218,75,96,249,185,217,246,224,169,105,115,159,221,247,73,237,133,68,126,76,177,57,192,167)
+IMAGE_DATA(29,224,245,59,224,197,27,179,237,217,43,211,230,190,1,249,68,227,227,185,238,242,191,28,52,214,167,115,127,216,26,156)
+IMAGE_DATA(207,199,100,198,114,71,235,15,190,29,3,187,251,192,231,93,195,251,184,109,218,220,55,48,127,148,193,125,62,197,201,79)
+IMAGE_DATA(224,240,8,248,122,104,120,123,7,166,205,125,25,248,190,112,246,27,56,253,5,124,63,5,142,127,24,115,155,251,36,248)
+IMAGE_DATA(9,206,201,231,235,122,214,50,98,238,115,253,247,85,101,199,94,104,113,159,245,79,165,42,163,75,250,49,160,24,223,185)
+IMAGE_DATA(217,22,227,23,204,16,122,1,41,198,47,144,161,193,23,206,16,228,11,102,136,242,133,50,180,242,5,50,116,242,51,103)
+IMAGE_DATA(232,98,138,214,79,242,235,81,163,222,18,124,143,37,153,33,196,144,230,7,251,91,50,164,188,12,76,156,171,141,159,241)
+IMAGE_DATA(90,141,158,139,161,126,255,154,241,247,233,155,197,103,197,198,236,226,123,191,255,82,255,223,255,129,26,46,100,114,237,214)
+IMAGE_DATA(60,73,253,41,25,59,230,63,84,75,106,132,65,248,82,245,251,34,129,250,19,156,179,254,62,195,229,168,63,121,32,250)
+IMAGE_DATA(127,235,31,236,183,47,60,67,6,85,76,149,126,176,82,169,84,42,149,74,165,114,117,213,31,134,7,123,128,158,164,254)
+IMAGE_DATA(33,248,164,245,107,253,90,191,126,12,80,69,245,7,245,218,88,188,0,0,0,0,0,0,0,0,0,0,0,0,0,0)
+IMAGE_END_DATA(608, 3)
diff --git a/uppsrc/CtrlCore/CtrlChild.cpp b/uppsrc/CtrlCore/CtrlChild.cpp
new file mode 100644
index 000000000..c1544d0bc
--- /dev/null
+++ b/uppsrc/CtrlCore/CtrlChild.cpp
@@ -0,0 +1,251 @@
+#include "CtrlCore.h"
+
+NAMESPACE_UPP
+
+#define LLOG(x)   // DLOG(x)
+
+bool Ctrl::HasDHCtrl() const
+{
+	if(dynamic_cast<const DHCtrl *>(this))
+		return true;
+	for(Ctrl *q = GetFirstChild(); q; q = q->next)
+		if(q->HasDHCtrl())
+			return true;
+	return false;
+}
+
+void Ctrl::SyncDHCtrl()
+{
+	Ctrl *p = GetTopCtrl();
+	p->hasdhctrl = p->HasDHCtrl();
+}
+
+void  Ctrl::AddChild(Ctrl *q, Ctrl *p)
+{
+	ASSERT(q);
+	LLOG("Add " << UPP::Name(q) << " to: " << Name());
+	if(p == q) return;
+	bool updaterect = true;
+	if(q->parent) {
+		ASSERT(!q->inframe);
+		if(q->parent == this) {
+			RemoveChild0(q);
+			updaterect = false;
+		}
+		else
+			q->parent->RemoveChild(q);
+	}
+	q->parent = this;
+	if(p) {
+		ASSERT(p->parent == this);
+		q->prev = p;
+		q->next = p->next;
+		if(p == lastchild)
+			lastchild = q;
+		else
+			p->next->prev = q;
+		p->next = q;
+	}
+	else
+		if(firstchild) {
+			q->prev = NULL;
+			q->next = firstchild;
+			firstchild->prev = q;
+			firstchild = q;
+		}
+		else {
+			ASSERT(lastchild == NULL);
+			firstchild = lastchild = q;
+			q->prev = q->next = NULL;
+		}
+	q->CancelModeDeep();
+	if(updaterect)
+		q->UpdateRect();
+	ChildAdded(q);
+	q->ParentChange();
+	if(GetTopCtrl()->IsOpen())
+		q->StateH(OPEN);
+	if(dynamic_cast<DHCtrl *>(q))
+		SyncDHCtrl();
+}
+
+void Ctrl::AddChild(Ctrl *child)
+{
+	AddChild(child, lastchild);
+}
+
+void Ctrl::AddChildBefore(Ctrl *child, Ctrl *insbefore)
+{
+	if(insbefore)
+		AddChild(child, insbefore->prev);
+	else
+		AddChild(child);
+}
+
+void  Ctrl::RemoveChild0(Ctrl *q)
+{
+	ChildRemoved(q);
+	q->DoRemove();
+	q->parent = NULL;
+	if(q == firstchild)
+		firstchild = firstchild->next;
+	if(q == lastchild)
+		lastchild = lastchild->prev;
+	if(q->prev)
+		q->prev->next = q->next;
+	if(q->next)
+		q->next->prev = q->prev;
+	q->next = q->prev = NULL;
+	if(dynamic_cast<DHCtrl *>(q))
+		SyncDHCtrl();
+}
+
+void  Ctrl::RemoveChild(Ctrl *q)
+{
+	if(q->parent != this) return;
+	q->RefreshFrame();
+	RemoveChild0(q);
+	q->ParentChange();
+	if(GetTopCtrl()->IsOpen())
+		q->StateH(CLOSE);
+}
+
+void  Ctrl::Remove()
+{
+	if(parent)
+		parent->RemoveChild(this);
+}
+
+bool Ctrl::HasChild(Ctrl *q) const
+{
+	return q && q->IsChild() && q->parent == this;
+}
+
+bool Ctrl::HasChildDeep(Ctrl *q) const
+{
+	while(q && q->IsChild()) {
+		if(q->parent == this) return true;
+		q = q->parent;
+	}
+	return false;
+}
+
+static bool IterateFocusFw(Ctrl *ctrl, bool noframe, bool init, bool all)
+{
+	LLOG("IterateFocusFw(" << UPP::Name(ctrl) << ")");
+	while(ctrl) {
+		if(ctrl->IsOpen() && ctrl->IsVisible() && ctrl->IsEnabled()) {
+			if(!(noframe && ctrl->InFrame())) {
+				if(all) {
+					ctrl->SetFocus();
+					return true;
+				}
+				if((!init || ctrl->IsInitFocus()) && ctrl->SetWantFocus())
+					return true;
+			}
+			if(IterateFocusFw(ctrl->GetFirstChild(), noframe, init, all))
+				return true;
+		}
+		ctrl = ctrl->GetNext();
+	}
+	return false;
+}
+
+bool Ctrl::IterateFocusForward(Ctrl *ctrl, Ctrl *top, bool noframe, bool init, bool all)
+{
+	LLOG("IterateFocusForward(" << UPP::Name(ctrl) << ", top " << UPP::Name(top) << ", noframe " << noframe << ", init " << init << ")");
+	if(!ctrl) return false;
+	if(IterateFocusFw(ctrl->GetFirstChild(), noframe, init, all))
+		return true;
+	if(ctrl->GetNext() && IterateFocusFw(ctrl->GetNext(), noframe, init, all))
+		return true;
+	while(ctrl->GetParent() != top && (ctrl = ctrl->GetParent()) != NULL)
+		if(IterateFocusFw(ctrl->GetNext(), noframe, init, all))
+			return true;
+	return false;
+}
+
+static bool IterateFocusBw(Ctrl *ctrl, bool noframe, bool all)
+{
+	while(ctrl) {
+		if(ctrl->IsOpen() && ctrl->IsVisible() && ctrl->IsEnabled()) {
+			if(IterateFocusBw(ctrl->GetLastChild(), noframe, all))
+				return true;
+			if(!(noframe && ctrl->InFrame())) {
+				if(all) {
+					ctrl->SetFocus();
+					return true;
+				}
+				if(ctrl->SetWantFocus())
+					return true;
+			}
+		}
+		ctrl = ctrl->GetPrev();
+	}
+	return false;
+}
+
+bool Ctrl::IterateFocusBackward(Ctrl *ctrl, Ctrl *top, bool noframe, bool all)
+{
+	if(!ctrl || ctrl == top) return false;
+	if(IterateFocusBw(ctrl->GetPrev(), noframe, all))
+		return true;
+	while(ctrl->GetParent() != top) {
+		ctrl = ctrl->GetParent();
+		if(ctrl->SetWantFocus())
+			return true;
+		if(IterateFocusBw(ctrl->GetPrev(), noframe, all))
+			return true;
+	}
+	return false;
+}
+
+Ctrl *Ctrl::GetTopCtrl()
+{
+	Ctrl *q = this;
+	while(q->parent)
+		q = q->parent;
+	return q;
+}
+
+const Ctrl *Ctrl::GetTopCtrl() const      { return const_cast<Ctrl *>(this)->GetTopCtrl(); }
+const Ctrl *Ctrl::GetOwner() const        { return const_cast<Ctrl *>(this)->GetOwner(); }
+Ctrl       *Ctrl::GetTopCtrlOwner()       { return GetTopCtrl()->GetOwner(); }
+const Ctrl *Ctrl::GetTopCtrlOwner() const { return GetTopCtrl()->GetOwner(); }
+
+Ctrl       *Ctrl::GetOwnerCtrl()          { return !IsChild() && top ? top->owner : NULL; }
+const Ctrl *Ctrl::GetOwnerCtrl() const    { return const_cast<Ctrl *>(this)->GetOwnerCtrl(); }
+
+TopWindow *Ctrl::GetTopWindow()
+{
+	Ctrl *q = GetTopCtrl();
+	while(q) {
+		TopWindow *w = dynamic_cast<TopWindow *>(q);
+		if(w) return w;
+		q = q->GetOwner();
+	}
+	return NULL;
+}
+
+const TopWindow *Ctrl::GetTopWindow() const
+{
+	return const_cast<Ctrl *>(this)->GetTopWindow();
+}
+
+TopWindow *Ctrl::GetMainWindow()
+{
+	Ctrl *q = GetTopCtrl();
+	for(;;) {
+		Ctrl *w = q->GetOwner();
+		if(!w)
+			return dynamic_cast<TopWindow *>(q);
+		q = w;
+	}
+}
+
+const TopWindow *Ctrl::GetMainWindow() const
+{
+	return const_cast<Ctrl *>(this)->GetMainWindow();
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/CtrlCore/CtrlClip.cpp b/uppsrc/CtrlCore/CtrlClip.cpp
new file mode 100644
index 000000000..cf2e99087
--- /dev/null
+++ b/uppsrc/CtrlCore/CtrlClip.cpp
@@ -0,0 +1,298 @@
+#include "CtrlCore.h"
+
+NAMESPACE_UPP
+
+ClipData::ClipData(const Value& data, String (*render)(const Value& data))
+:	data(data), render(render)
+{}
+
+String sRawClipData(const Value& data)
+{
+	return data;
+}
+
+ClipData::ClipData(const String& data)
+:	data(data), render(sRawClipData)
+{}
+
+ClipData::ClipData()
+:	render(sRawClipData)
+{}
+
+void Ctrl::DragAndDrop(Point p, PasteClip& d)       {}
+void Ctrl::FrameDragAndDrop(Point p, PasteClip& d)  {}
+void Ctrl::DragEnter()                              {}
+void Ctrl::DragRepeat(Point p) {}
+void Ctrl::DragLeave() {}
+
+PasteClip& Ctrl::Clipboard()
+{
+	static PasteClip d;
+	d.fmt.Clear();
+	return d;
+}
+
+PasteClip& Ctrl::Selection()
+{
+	static PasteClip d;
+#ifdef PLATFORM_X11
+	d.fmt.Clear();
+	d.type = 2;
+#endif
+	return d;
+}
+
+String Ctrl::GetDropData(const String& fmt) const
+{
+	return GetSelectionData(fmt);
+}
+
+String Ctrl::GetSelectionData(const String& fmt) const
+{
+	return Null;
+}
+
+#ifdef PLATFORM_WIN32
+bool   Has(UDropTarget *dt, const char *fmt);
+String Get(UDropTarget *dt, const char *fmt);
+
+bool PasteClip::IsAvailable(const char *fmt) const
+{
+	if(this == &Ctrl::Selection())
+		return false;
+	return dt ? UPP::Has(dt, fmt) : IsClipboardAvailable(fmt);
+}
+
+String PasteClip::Get(const char *fmt) const
+{
+	if(this == &Ctrl::Selection())
+		return Null;
+	return dt ? UPP::Get(dt, fmt) : ReadClipboard(fmt);
+}
+#endif
+
+#ifdef PLATFORM_X11
+bool PasteClip::IsAvailable(const char *fmt) const
+{
+	return Ctrl::ClipHas(type, fmt);
+}
+
+String PasteClip::Get(const char *fmt) const
+{
+	return Ctrl::ClipGet(type, fmt);
+}
+#endif
+
+bool PasteClip::Accept()
+{
+	accepted = true;
+	return paste;
+}
+
+bool   PasteClip::Accept(const char *_fmt)
+{
+	Vector<String> f = Split(_fmt, ';');
+	for(int i = 0; i < f.GetCount(); i++) {
+		if(IsAccepted() && fmt == _fmt)
+			return paste;
+		if(IsAvailable(f[i])) {
+			accepted = true;
+			if(paste) {
+				fmt = f[i];
+				data = Get(f[i]);
+				return true;
+			}
+			break;
+		}
+	}
+	return false;
+}
+
+PasteClip::PasteClip()
+{
+	paste = true;
+	accepted = false;
+#ifdef PLATFORM_WIN32
+	dt = NULL;
+#else
+	type = 0;
+#endif
+}
+
+int Ctrl::DoDragAndDrop(const char *fmts, const Image& sample, dword actions)
+{
+	VectorMap<String, ClipData> dummy;
+	return DoDragAndDrop(fmts, sample, actions, dummy);
+}
+
+int Ctrl::DoDragAndDrop(const VectorMap<String, ClipData>& data, const Image& sample, dword actions)
+{
+	return DoDragAndDrop("", sample, actions, data);
+}
+
+Uuid        sDndUuid;
+const void *sInternalPtr;
+
+String GetInternalDropId__(const char *type, const char *id)
+{
+	return "U++ Internal clip:" + AsString(sDndUuid) + '-' + type + '-' + id;
+}
+
+void NewInternalDrop__(const void *ptr)
+{
+	sDndUuid = Uuid::Create();
+	sInternalPtr = ptr;
+}
+
+const void *GetInternalDropPtr__()
+{
+	return sInternalPtr;
+}
+
+String Unicode__(const WString& w)
+{
+	return String((const char *)~w, 2 * w.GetLength());
+}
+
+WString Unicode__(const String& s)
+{
+	return WString((const wchar *)~s, s.GetLength() / 2);
+}
+
+Image MakeDragImage(const Image& arrow, Image sample)
+{
+	ImageBuffer b;
+	if(IsNull(sample)) {
+		sample = CtrlCoreImg::DndData();
+		b = sample;
+		Over(b, Point(0, 0), arrow, arrow.GetSize());
+	}
+	else {
+		b.Create(128, 128);
+		memset(~b, 0, sizeof(RGBA) * b.GetLength());
+		Size ssz = sample.GetSize();
+		Over(b, Point(2, 22), sample, sample.GetSize());
+		for(int y = 20; y < 96; y++) {
+			RGBA *s = b[y];
+			RGBA *e = s + 96;
+			while(s < e)
+				(s++)->a >>= 1;
+			e += 32;
+			int q = 128;
+			while(s < e) {
+				s->a = (s->a * q) >> 8;
+				q -= 4;
+				s++;
+			}
+		}
+		int qq = 128;
+		for(int y = 96; y < 128; y++) {
+			RGBA *s = b[y];
+			RGBA *e = s + 96;
+			while(s < e) {
+				s->a = (s->a * qq) >> 8;
+				s++;
+			}
+			e += 32;
+			int q = 255;
+			while(s < e) {
+				s->a = (s->a * q * qq) >> 16;
+				q -= 8;
+				s++;
+			}
+			qq -= 4;
+		}
+		RGBA *s = b[21] + 1;
+		RGBA c1 = Blue();
+		RGBA c2 = White();
+		for(int a = 255; a > 0; a -= 3) {
+			c1.a = c2.a = a;
+			*s++ = c1;
+			Swap(c1, c2);
+		}
+		s = b[21] + 1;
+		c1 = Black();
+		c2 = White();
+		for(int a = 255; a > 0; a -= 8) {
+			c1.a = c2.a = a;
+			*s = c1;
+			s += b.GetWidth();
+			Swap(c1, c2);
+		}
+	}
+	Over(b, Point(0, 0), arrow, arrow.GetSize());
+	return b;
+}
+
+Ptr<Ctrl> Ctrl::dndctrl;
+Point     Ctrl::dndpos;
+bool      Ctrl::dndframe;
+PasteClip Ctrl::dndclip;
+
+void Ctrl::DnDRepeat()
+{
+	if(dndctrl) {
+		dndctrl->DragRepeat(dndpos);
+		if(dndctrl) {
+			PasteClip d = dndclip;
+			if(dndframe)
+				dndctrl->FrameDragAndDrop(dndpos, d);
+			else
+				dndctrl->DragAndDrop(dndpos, d);
+		}
+	}
+	else
+		UPP::KillTimeCallback(&dndpos);
+}
+
+void Ctrl::DnD(Point p, PasteClip& clip)
+{
+	UPP::KillTimeCallback(&dndpos);
+	dndclip = clip;
+	Point hp = p - GetScreenRect().TopLeft();
+	Ptr<Ctrl> ctrl = this;
+	while(ctrl && ctrl->IsEnabled()) {
+		Rect view = ctrl->GetScreenView();
+		if(ctrl->IsMouseActive())
+			if(view.Contains(p)) {
+				dndpos = p - view.TopLeft();
+				dndframe = false;
+				ctrl->DragAndDrop(dndpos, clip);
+				if(clip.IsAccepted())
+					break;
+			}
+			else {
+				dndpos = p - ctrl->GetScreenRect().TopLeft();
+				dndframe = true;
+				ctrl->FrameDragAndDrop(dndpos, clip);
+				if(clip.IsAccepted())
+					break;
+			}
+		ctrl = ctrl->ChildFromPoint(hp);
+	}
+	if(ctrl != dndctrl) {
+		if(dndctrl)
+			dndctrl->DragLeave();
+		dndctrl = ctrl;
+		if(dndctrl)
+			dndctrl->DragEnter();
+	}
+	if(dndctrl)
+		UPP::SetTimeCallback(-40, callback(DnDRepeat), &dndpos);
+}
+
+void Ctrl::DnDLeave()
+{
+	if(dndctrl) {
+		dndctrl->DragLeave();
+		UPP::KillTimeCallback(&dndpos);
+		dndctrl = NULL;
+	}
+}
+
+Ctrl *Ctrl::GetDragAndDropTarget()
+{
+	return dndctrl;
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/CtrlCore/CtrlCore.h b/uppsrc/CtrlCore/CtrlCore.h
new file mode 100644
index 000000000..803745e0d
--- /dev/null
+++ b/uppsrc/CtrlCore/CtrlCore.h
@@ -0,0 +1,1829 @@
+#ifndef CTRLCORE_H
+#define CTRLCORE_H
+
+#include <Draw/Draw.h>
+
+NAMESPACE_UPP
+
+enum {
+	K_DELTA        = 0x010000,
+
+	K_ALT          = 0x080000,
+	K_SHIFT        = 0x040000,
+	K_CTRL         = 0x020000,
+
+	K_KEYUP        = 0x100000,
+
+	K_MOUSEMIDDLE  = 0x200000,
+	K_MOUSERIGHT   = 0x400000,
+	K_MOUSELEFT    = 0x800000,
+	K_MOUSEDOUBLE  = 0x1000000,
+	K_MOUSETRIPLE  = 0x2000000,
+
+	K_SHIFT_CTRL = K_SHIFT|K_CTRL,
+};
+
+#include "MKeys.h"
+
+enum {
+	DELAY_MINIMAL = 0
+};
+
+void  SetTimeCallback(int delay_ms, Callback cb, void *id = NULL); // delay_ms < 0 -> periodic
+void  KillTimeCallback(void *id);
+bool  ExistsTimeCallback(void *id);
+dword GetTimeClick();
+
+inline
+void  PostCallback(Callback cb, void *id = NULL)                { SetTimeCallback(1, cb, id); }
+
+class TimeCallback
+{
+public:
+	~TimeCallback()                      { Kill(); }
+
+	void Set(int delay, Callback cb)     { UPP::SetTimeCallback(delay, cb, this); }
+	void Post(Callback cb)               { UPP::PostCallback(cb, this); }
+	void Kill()                          { UPP::KillTimeCallback(this); }
+	void KillSet(int delay, Callback cb) { Kill(); Set(delay, cb); }
+	void KillPost(Callback cb)           { Kill(); Post(cb); }
+
+private:
+	byte dummy;
+};
+
+class Ctrl;
+
+class CtrlFrame {
+public:
+	virtual void FrameLayout(Rect& r) = 0;
+	virtual void FrameAddSize(Size& sz) = 0;
+	virtual void FramePaint(Draw& w, const Rect& r);
+	virtual void FrameAdd(Ctrl& parent);
+	virtual void FrameRemove();
+	virtual int  OverPaint() const;
+
+#ifdef flagSO
+	CtrlFrame();
+	virtual ~CtrlFrame();
+#else
+	CtrlFrame() {}
+	virtual ~CtrlFrame() {}
+#endif
+
+private:
+	CtrlFrame(const CtrlFrame&);
+	void operator=(const CtrlFrame&);
+};
+
+struct NullFrameClass : public CtrlFrame {
+	virtual void FrameLayout(Rect& r);
+	virtual void FramePaint(Draw& draw, const Rect& r);
+	virtual void FrameAddSize(Size& sz);
+};
+
+CtrlFrame& NullFrame();
+
+class BorderFrame : public CtrlFrame {
+public:
+	virtual void FrameLayout(Rect& r);
+	virtual void FramePaint(Draw& w, const Rect& r);
+	virtual void FrameAddSize(Size& sz);
+
+protected:
+	const ColorF *border;
+
+public:
+#ifdef flagSO
+	BorderFrame(const ColorF *border);
+	virtual ~BorderFrame();
+#else
+	BorderFrame(const ColorF *border) : border(border) {}
+#endif
+};
+
+CtrlFrame& InsetFrame();
+CtrlFrame& OutsetFrame();
+CtrlFrame& ButtonFrame();
+CtrlFrame& ThinInsetFrame();
+CtrlFrame& ThinOutsetFrame();
+CtrlFrame& BlackFrame();
+
+CtrlFrame& XPFieldFrame();
+
+CtrlFrame& FieldFrame();
+// CtrlFrame& EditFieldFrame(); //TODO remove
+
+CtrlFrame& TopSeparatorFrame();
+CtrlFrame& BottomSeparatorFrame();
+CtrlFrame& LeftSeparatorFrame();
+CtrlFrame& RightSeparatorFrame();
+
+void LayoutFrameLeft(Rect& r, Ctrl *ctrl, int cx);
+void LayoutFrameRight(Rect& r, Ctrl *ctrl, int cx);
+void LayoutFrameTop(Rect& r, Ctrl *ctrl, int cy);
+void LayoutFrameBottom(Rect& r, Ctrl *ctrl, int cy);
+
+dword GetMouseFlags();
+
+Point GetMousePos();
+dword GetMouseFlags();
+
+#ifdef PLATFORM_WIN32
+#ifdef PLATFORM_WINCE
+bool GetShift();
+bool GetCtrl();
+bool GetAlt();
+bool GetCapsLock();
+bool GetMouseLeft();
+bool GetMouseRight();
+bool GetMouseMiddle();
+#else
+inline bool GetShift()       { return !!(GetKeyState(VK_SHIFT) & 0x8000); }
+inline bool GetCtrl()        { return !!(GetKeyState(VK_CONTROL) & 0x8000); }
+inline bool GetAlt()         { return !!(GetKeyState(VK_MENU) & 0x8000); }
+inline bool GetCapsLock()    { return !!(GetKeyState(VK_CAPITAL) & 1); }
+inline bool GetMouseLeft()   { return !!(GetKeyState(VK_LBUTTON) & 0x8000); }
+inline bool GetMouseRight()  { return !!(GetKeyState(VK_RBUTTON) & 0x8000); }
+inline bool GetMouseMiddle() { return !!(GetKeyState(VK_MBUTTON) & 0x8000); }
+#endif
+#endif
+
+#ifdef PLATFORM_X11
+bool GetShift();
+bool GetCtrl();
+bool GetAlt();
+bool GetCapsLock();
+bool GetMouseLeft();
+bool GetMouseRight();
+bool GetMouseMiddle();
+
+String XAtomName(Atom atom);
+Atom   XAtom(const char *name);
+
+String      GetProperty(Window w, Atom property, Atom rtype = AnyPropertyType);
+Vector<int> GetPropertyInts(Window w, Atom property, Atom rtype = AnyPropertyType);
+String      ReadPropertyData(Window w, Atom property, Atom rtype = AnyPropertyType);
+
+Index<Atom>& _NET_Supported();
+#endif
+
+#define IMAGECLASS CtrlCoreImg
+#define IMAGEFILE <CtrlCore/Ctrl.iml>
+#include <Draw/iml_header.h>
+
+class TopWindow;
+class TrayIcon;
+class GLCtrl;
+
+enum {
+	DND_NONE = 0,
+	DND_COPY = 1,
+	DND_MOVE = 2,
+
+	DND_ALL  = 3,
+};
+
+struct UDropTarget;
+
+struct ClipData : Moveable<ClipData> {
+	Value  data;
+	String (*render)(const Value& data);
+
+	String  Render() const                   { return (*render)(data); }
+
+	ClipData(const Value& data, String (*render)(const Value& data));
+	ClipData(const String& data);
+	ClipData();
+};
+
+class PasteClip {
+	friend struct UDropTarget;
+	friend class  Ctrl;
+	friend PasteClip sMakeDropClip(bool paste);
+
+
+#ifdef PLATFORM_WIN32
+	UDropTarget *dt;
+#endif
+#ifdef PLATFORM_X11
+	int          type;
+#endif
+	byte         action;
+	byte         allowed;
+	bool         paste;
+	bool         accepted;
+	String       fmt;
+	String       data;
+
+public:
+	bool   IsAvailable(const char *fmt) const;
+	String Get(const char *fmt) const;
+
+	bool   Accept();
+	bool   Accept(const char *fmt);
+	String Get() const                  { return data; }
+	operator String() const             { return data; }
+	String operator ~() const           { return data; }
+
+	void   Reject()                     { accepted = false; data.Clear(); }
+
+	int    GetAction() const            { return action; }
+	int    GetAllowedActions() const    { return allowed; }
+	void   SetAction(int x)             { action = x; }
+
+	bool   IsAccepted() const           { return accepted; }
+
+	bool   IsQuery() const              { return !paste; }
+	bool   IsPaste() const              { return paste; }
+
+	PasteClip();
+};
+
+String  Unicode__(const WString& w);
+WString Unicode__(const String& s);
+
+const char *ClipFmtsText();
+bool        AcceptText(PasteClip& clip);
+String      GetString(PasteClip& clip);
+WString     GetWString(PasteClip& clip);
+String      GetTextClip(const String& text, const String& fmt);
+String      GetTextClip(const WString& text, const String& fmt);
+void        Append(VectorMap<String, ClipData>& data, const String& text);
+void        Append(VectorMap<String, ClipData>& data, const WString& text);
+
+const char *ClipFmtsImage();
+bool        AcceptImage(PasteClip& clip);
+Image       GetImage(PasteClip& clip);
+String      GetImageClip(const Image& m, const String& fmt);
+void        Append(VectorMap<String, ClipData>& data, const Image& img);
+
+bool            AcceptFiles(PasteClip& clip);
+Vector<String>  GetFiles(PasteClip& clip);
+
+template <class T>
+String ClipFmt()
+{
+	return String("U++ type: ") + typeid(T).name();
+}
+
+template <class T>
+bool   Accept(PasteClip& clip)
+{
+	return clip.Accept(ClipFmt<T>());
+}
+
+
+String GetInternalDropId__(const char *type, const char *id);
+void NewInternalDrop__(const void *ptr);
+const void *GetInternalDropPtr__();
+
+template <class T>
+VectorMap<String, ClipData> InternalClip(const T& x, const char *id = "")
+{
+	NewInternalDrop__(&x);
+	VectorMap<String, ClipData> d;
+	d.Add(GetInternalDropId__(typeid(T).name(), id));
+	return d;
+}
+
+template <class T>
+bool IsAvailableInternal(PasteClip& d, const char *id = "")
+{
+	return d.IsAvailable(GetInternalDropId__(typeid(T).name(), id));
+}
+
+template <class T>
+bool AcceptInternal(PasteClip& d, const char *id = "")
+{
+	return d.Accept(GetInternalDropId__(typeid(T).name(), id));
+}
+
+template <class T>
+const T& GetInternal(PasteClip& d)
+{
+	return *(T *)GetInternalDropPtr__();
+}
+
+class Ctrl : public Pte<Ctrl> {
+public:
+	enum PlacementConstants {
+		CENTER   = 0,
+		MIDDLE   = 0,
+		LEFT     = 1,
+		RIGHT    = 2,
+		TOP      = 1,
+		BOTTOM   = 2,
+		SIZE     = 3,
+
+		MINSIZE  = -16380,
+		MAXSIZE  = -16381,
+		STDSIZE  = -16382,
+	};
+
+	class Logc {
+		dword data;
+
+		static int LSGN(dword d)       { return int16(d & 0x7fff | ((d & 0x4000) << 1)); }
+
+	public:
+		bool  operator==(Logc q) const { return data == q.data; }
+		bool  operator!=(Logc q) const { return data != q.data; }
+		int   GetAlign() const         { return (data >> 30) & 3; }
+		int   GetA() const             { return LSGN(data >> 15); }
+		int   GetB() const             { return LSGN(data); }
+		void  SetAlign(int align)      { data = (data & ~(3 << 30)) | (align << 30); }
+		void  SetA(int a)              { data = (data & ~(0x7fff << 15)) | ((a & 0x7fff) << 15); }
+		void  SetB(int b)              { data = (data & ~0x7fff) | (b & 0x7fff); }
+		bool  IsEmpty() const;
+
+		Logc(int al, int a, int b)     { data = (al << 30) | ((a & 0x7fff) << 15) | (b & 0x7fff); }
+		Logc()                         { data = 0xffffffff; }
+	};
+
+	struct LogPos {
+		Logc x, y;
+
+		bool operator==(LogPos b) const   { return x == b.x && y == b.y; }
+		bool operator!=(LogPos b) const   { return !(*this == b); }
+
+		LogPos(Logc x, Logc y)            : x(x), y(y) {}
+		LogPos()                          {}
+	};
+
+	static Logc PosLeft(int pos, int size)       { return Logc(LEFT, pos, size); }
+	static Logc PosRight(int pos, int size)      { return Logc(RIGHT, pos, size); }
+	static Logc PosTop(int pos, int size)        { return Logc(TOP, pos, size); }
+	static Logc PosBottom(int pos, int size)     { return Logc(BOTTOM, pos, size); }
+	static Logc PosSize(int lpos, int rpos)      { return Logc(SIZE, lpos, rpos); }
+	static Logc PosCenter(int size, int offset)  { return Logc(CENTER, offset, size); }
+	static Logc PosCenter(int size)              { return Logc(CENTER, 0, size); }
+
+	typedef bool (*MouseHook)(Ctrl *ctrl, bool inframe, int event, Point p,
+	                          int zdelta, dword keyflags);
+	typedef bool (*KeyHook)(Ctrl *ctrl, dword key, int count);
+	typedef bool (*StateHook)(Ctrl *ctrl, int reason);
+
+	static dword KEYtoK(dword);
+
+private:
+	Ctrl(Ctrl&);
+	void operator=(Ctrl&);
+
+private:
+	struct Frame : Moveable<Frame> {
+		CtrlFrame *frame;
+		Rect16     view;
+
+		Frame()    { view.Clear(); }
+	};
+	Ctrl        *parent;
+
+	struct Scroll : Moveable<Scroll> {
+		Rect rect;
+		int  dx;
+		int  dy;
+	};
+
+	struct MoveCtrl : Moveable<MoveCtrl> {
+		Ptr<Ctrl>  ctrl;
+		Rect       from;
+		Rect       to;
+	};
+
+	friend struct UDropTarget;
+
+	struct Top {
+#ifdef PLATFORM_WIN32
+		HWND           hwnd;
+		UDropTarget   *dndtgt;
+#endif
+#ifdef PLATFORM_X11
+		Window         window;
+#endif
+		Vector<Scroll> scroll;
+		VectorMap<Ctrl *, MoveCtrl> move;
+		VectorMap<Ctrl *, MoveCtrl> scroll_move;
+		Ptr<Ctrl>      owner;
+	};
+
+	Top         *top;
+	int          exitcode;
+
+	Ctrl        *prev, *next;
+	Ctrl        *firstchild, *lastchild;//16
+	LogPos       pos;//8
+	Rect16       rect;
+	Mitor<Frame> frame;//16
+	String       info;//16
+	int16        caretx, carety, caretcx, caretcy;//8
+
+	byte         overpaint;
+
+	bool         unicode:1;
+
+#ifdef PLATFORM_WIN32
+	bool         activex:1;
+#endif
+	bool         fullrefresh:1;
+
+	bool         transparent:1;
+	bool         visible:1;
+	bool         enabled:1;
+	bool         wantfocus:1;
+	bool         initfocus:1;
+	bool         activepopup:1;
+	bool         editable:1;
+	bool         modify:1;
+	bool         ignoremouse:1;
+	bool         inframe:1;
+	bool         inloop:1;
+	bool         isopen:1;
+	bool         popup:1;
+	bool         popupgrab:1;
+	byte         backpaint:2;//2
+	bool         GLX:1;
+	bool         hasdhctrl:1;
+
+	bool         akv:1;
+	bool         destroying:1;
+#ifdef PLATFORM_X11
+	bool         ignoretakefocus:1;
+#endif
+
+	static  Ptr<Ctrl> eventCtrl;
+	static  Ptr<Ctrl> mouseCtrl;
+	static  Point     mousepos;
+	static  Point     leftmousepos, rightmousepos, middlemousepos;
+	static  Ptr<Ctrl> focusCtrl;
+	static  Ptr<Ctrl> focusCtrlWnd;
+	static  Ptr<Ctrl> lastActiveWnd;
+	static  Ptr<Ctrl> caretCtrl;
+	static  Rect      caretRect;
+	static  Ptr<Ctrl> captureCtrl;
+	static  bool      ignoreclick;
+	static  bool      ignorekeyup;
+	static  bool      mouseinview;
+	static  bool      mouseinframe;
+	static  bool      globalbackpaint;
+	static  int       LoopLevel;
+	static  Ctrl     *LoopCtrl;
+
+	static  Ptr<Ctrl>           defferedSetFocus;
+	static  Vector< Ptr<Ctrl> > defferedChildLostFocus;
+
+	static  Ptr<Ctrl> repeatTopCtrl;
+	static  Point     repeatMousePos;
+
+	static  Vector<MouseHook>& mousehook();
+	static  Vector<KeyHook>&   keyhook();
+	static  Vector<StateHook>& statehook();
+
+#ifdef flagSO
+	static Ptr<Ctrl> FocusCtrl();
+	static void      FocusCtrl(Ptr<Ctrl> fc);
+#else
+	static Ptr<Ctrl> FocusCtrl() { return focusCtrl; }
+	static void      FocusCtrl(Ptr<Ctrl> fc) { focusCtrl = fc; }
+#endif
+
+	void    StateDeep(int state);
+
+	void    RemoveChild0(Ctrl *q);
+
+	static  void ChSync();
+
+	static int       FindMoveCtrl(const VectorMap<Ctrl *, MoveCtrl>& m, Ctrl *x);
+	static MoveCtrl *FindMoveCtrlPtr(VectorMap<Ctrl *, MoveCtrl>& m, Ctrl *x);
+
+	Size    PosVal(int v) const;
+	void    Lay1(int& pos, int& r, int align, int a, int b, int sz) const;
+	Rect    CalcRect(LogPos pos, const Rect& prect, const Rect& pview) const;
+	Rect    CalcRect(const Rect& prect, const Rect& pview) const;
+	void    UpdateRect0();
+	void    UpdateRect();
+	void    SetPos0(LogPos p, bool inframe);
+	void    SetWndRect(const Rect& r);
+	void    SyncMoves();
+
+	static  void  EndIgnore();
+	static  void  LRep();
+	static  void  LHold();
+	static  void  LRepeat();
+	static  void  RRep();
+	static  void  RHold();
+	static  void  RRepeat();
+	static  void  MRep();
+	static  void  MHold();
+	static  void  MRepeat();
+	static  void  KillRepeat();
+	static  void  CheckMouseCtrl();
+	static  void  DoCursorShape();
+	static  Image& CursorOverride();
+	bool    IsMouseActive() const;
+	Image   MouseEventH(int event, Point p, int zdelta, dword keyflags);
+	Image   FrameMouseEventH(int event, Point p, int zdelta, dword keyflags);
+	Image   MEvent0(int e, Point p, int zd);
+	Image   DispatchMouse(int e, Point p, int zd = 0);
+	Image   DispatchMouseEvent(int e, Point p, int zd = 0);
+	void    LogMouseEvent(const char *f, const Ctrl *ctrl, int event, Point p, int zdelta, dword keyflags);
+
+	void    StateH(int reason);
+
+	void    RefreshAccessKeys();
+	void    RefreshAccessKeysDo(bool vis);
+	static  void  DefferedFocusSync();
+	static  void  SyncCaret();
+	static  bool  DispatchKey(dword keycode, int count);
+	void    SetFocusWnd();
+	void    KillFocusWnd();
+
+	static Ptr<Ctrl> dndctrl;
+	static Point     dndpos;
+	static bool      dndframe;
+	static PasteClip dndclip;
+
+	void    DnD(Point p, PasteClip& clip);
+	static void DnDRepeat();
+	static void DnDLeave();
+
+	void    SyncLayout(int force = 0);
+	bool    AddScroll(const Rect& sr, int dx, int dy);
+	Rect    GetClippedView();
+	void    ScrollRefresh(const Rect& r, int dx, int dy);
+	void    SyncScroll();
+	void    CtrlPaint(Draw& w, const Rect& clip);
+	void    RemoveFullRefresh();
+	bool    PaintOpaqueAreas(Draw& w, const Rect& r, const Rect& clip, bool nochild = false);
+	void    GatherTransparentAreas(Vector<Rect>& area, Draw& w, Rect r, const Rect& clip);
+	Ctrl   *FindBestOpaque(const Rect& clip);
+	void    UpdateArea0(Draw& draw, const Rect& clip, int backpaint);
+	void    UpdateArea(Draw& draw, const Rect& clip);
+	Ctrl   *GetTopRect(Rect& r, bool inframe);
+	void    DoSync(Ctrl *q, Rect r, bool inframe);
+	bool    HasDHCtrl() const;
+	void    SyncDHCtrl();
+	void    SetInfoPart(int i, const char *txt);
+	String  GetInfoPart(int i) const;
+
+// System window interface...
+	void WndShow(bool b);
+
+	void WndSetPos(const Rect& rect);
+
+	bool IsWndOpen() const;
+
+	bool SetWndCapture();
+	bool HasWndCapture() const;
+	bool ReleaseWndCapture();
+
+	static void SetMouseCursor(const Image& m);
+
+	static void DoDeactivate(Ptr<Ctrl> pfocusCtrl, Ptr<Ctrl> nfocusCtrl);
+	static void DoKillFocus(Ptr<Ctrl> pfocusCtrl, Ptr<Ctrl> nfocusCtrl);
+	static void DoSetFocus(Ptr<Ctrl> pfocusCtrl, Ptr<Ctrl> nfocusCtrl, bool activate);
+
+	void ActivateWnd();
+	void ClickActivateWnd();
+	bool SetFocus0(bool activate);
+	bool SetWndFocus();
+	bool HasWndFocus() const;
+
+	static void WndDestroyCaret();
+	void WndCreateCaret(const Rect& cr);
+
+	void WndInvalidateRect(const Rect& r);
+
+	void SetWndForeground();
+	bool IsWndForeground() const;
+
+	bool WndEnable(bool b);
+
+	Rect GetWndUpdateRect() const;
+	Rect GetWndScreenRect() const;
+	void WndScrollView(const Rect& r, int dx, int dy);
+	void WndUpdate();
+	void WndUpdate(const Rect& r);
+
+	void WndFree();
+	void WndDestroy();
+
+	static void InitTimer();
+
+	static String appname;
+
+	static Size Dsize;
+	static Size Csize;
+	static void Csizeinit();
+	static void (*skin)();
+
+	friend void CtrlSetDefaultSkin(void (*fn1)(), void (*fn2)());
+	friend class DHCtrl;
+	friend class ViewDraw;
+	friend class TopWindow;
+	friend class TrayIcon;
+	friend class GLCtrl;
+	friend class WaitCursor;
+	friend struct UDropSource;
+	friend class DnDAction;
+	friend class PasteClip;
+
+#ifdef PLATFORM_WIN32
+	static LRESULT CALLBACK UtilityProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam);
+	static void RenderFormat(int format);
+	static void RenderAllFormats();
+	static void DestroyClipboard();
+
+public:
+	static Event&    ExitLoopEvent();
+	static bool&     EndSession();
+	static bool      IsEndSession()            { return EndSession(); }
+	static HINSTANCE hInstance;
+
+protected:
+	static HCURSOR   hCursor;
+
+	static VectorMap< HWND, Ptr<Ctrl> >& Windows();
+	static LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam);
+
+	static Event  OverwatchEndSession;
+	static HWND   OverwatchHWND;
+	static HANDLE OverwatchThread;
+
+	static LRESULT CALLBACK OverwatchWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam);
+	static DWORD WINAPI Win32OverwatchThread(LPVOID);
+
+	static Rect GetScreenClient(HWND hwnd);
+	void  Create(HWND parent, DWORD style, DWORD exstyle, bool savebits, int show, bool dropshadow);
+	Image DoMouse(int e, Point p, int zd = 0);
+
+	friend void sSetCursor(Ctrl *ctrl, const Image& m);
+
+public:
+	virtual void    NcCreate(HWND hwnd);
+	virtual void    NcDestroy();
+	virtual void    PreDestroy();
+	virtual LRESULT WindowProc(UINT message, WPARAM wParam, LPARAM lParam);
+
+	HWND  GetHWND() const              { return parent ? NULL : top ? top->hwnd : NULL; }
+	HWND  GetOwnerHWND() const;
+
+	static Ctrl  *CtrlFromHWND(HWND hwnd);
+#endif
+
+#ifdef PLATFORM_X11
+protected:
+	struct XWindow {
+		Ptr<Ctrl>    ctrl;
+		bool         exposed;
+		Vector<Rect> invalid;
+		Ptr<Ctrl>    owner;
+		Ptr<Ctrl>    last_active;
+		XIC          xic;
+	};
+
+private:
+	static ArrayMap<Window, XWindow>& Xwindow();
+	static Ptr<Ctrl> WndCaretCtrl;
+	static int       WndCaretTime;
+	static Rect      WndCaretRect;
+	static bool      WndCaretVisible;
+	static int       Xbuttons;
+	static int       Xbuttontime;
+	static Window    grabWindow, focusWindow;
+	static Point     mousePos;
+	static int       PopupGrab;
+	static Ptr<Ctrl> popupWnd;
+	static Index<String> sel_formats;
+	static Ptr<Ctrl>     sel_ctrl;
+	static void     ProcessEvent(XEvent *event);
+	static void     TimerAndPaint();
+	static void     ProcessEvent(XEvent& event);
+	       void     Invalidate(XWindow& xw, const Rect& r);
+	static void     XorCaret();
+	static void     AnimateCaret();
+	       void     DoPaint(const Vector<Rect>& invalid);
+	       void     SetLastActive(XWindow *w, Ctrl *la);
+	       XWindow *GetXWindow();
+	static void     SyncMousePos();
+	static void     ReleaseGrab();
+
+	       void  StartPopupGrab();
+	static void  EndPopupGrab();
+
+	friend bool  GetMouseRight();
+	friend bool  GetMouseLeft();
+	friend bool  GetMouseMiddle();
+	friend Point GetMousePos();
+
+protected:
+	       void   Create(Ctrl *owner, bool redirect, bool savebits);
+	       void   SyncExpose();
+	       void   TakeFocus();
+	static Window GetXServerFocusWindow();
+	       void   AddGlobalRepaint();
+	static void   KillFocus(Window w);
+	static void   FocusSync();
+
+	       void DropEvent(XWindow& w, XEvent *event);
+	static void DropStatusEvent(XEvent *event);
+	static Index<String> drop_formats;
+	static String  Unicode(const WString& w);
+	static WString Unicode(const String& s);
+	static bool   ClipHas(int type, const char *fmt);
+	static String ClipGet(int type, const char *fmt);
+
+	       XWindow *AddXWindow(Window &w);
+	       void RemoveXWindow(Window &w);
+	       XWindow *XWindowFromWindow(Window &w);
+
+public:
+	struct Xclipboard {
+		Window win;
+
+		VectorMap<int, ClipData> data;
+
+		String Read(int fmt, int selection, int property);
+		void   Write(int fmt, const ClipData& data);
+		bool   IsAvailable(int fmt, const char *type);
+
+		void   Clear()                     { data.Clear(); }
+		void   Request(XSelectionRequestEvent *se);
+
+		Xclipboard();
+		~Xclipboard();
+	};
+
+	static Xclipboard& xclipboard();
+
+	static int  Xeventtime;
+
+	static XIM  xim;
+
+	void DnD(Window src, bool paste);
+
+	virtual void    EventProc(XWindow& w, XEvent *event);
+	virtual bool    HookProc(XEvent *event);
+	Window  GetWindow() const         { return top ? top->window : None; }
+	static  Ctrl   *CtrlFromWindow(Window w);
+	bool    TrapX11Errors();
+	void    UntrapX11Errors(bool b);
+
+	Window GetParentWindow(void) const;
+	Ctrl *GetParentWindowCtrl(void) const;
+	Rect GetRectInParentWindow(void) const;
+
+	static void SyncNativeWindows(void);
+#endif
+
+private:
+			void    DoRemove();
+
+protected:
+	static void     TimerProc(dword time);
+
+			Ctrl&   Unicode()                         { unicode = true; return *this; }
+
+public:
+	enum StateReason {
+		FOCUS      = 10,
+		ACTIVATE   = 11,
+		DEACTIVATE = 12,
+		SHOW       = 13,
+		ENABLE     = 14,
+		EDITABLE   = 15,
+		OPEN       = 16,
+		CLOSE      = 17,
+		POSITION   = 100,
+		LAYOUTPOS  = 101,
+	};
+
+	enum MouseEvents {
+		BUTTON        = 0x0F,
+		ACTION        = 0xF0,
+
+		MOUSEENTER    = 0x10,
+		MOUSEMOVE     = 0x20,
+		MOUSELEAVE    = 0x30,
+		CURSORIMAGE   = 0x40,
+		MOUSEWHEEL    = 0x50,
+
+		DOWN          = 0x80,
+		UP            = 0x90,
+		DOUBLE        = 0xa0,
+		REPEAT        = 0xb0,
+		DRAG          = 0xc0,
+		HOLD          = 0xd0,
+		TRIPLE        = 0xe0,
+
+		LEFTDOWN      = LEFT|DOWN,
+		LEFTDOUBLE    = LEFT|DOUBLE,
+		LEFTREPEAT    = LEFT|REPEAT,
+		LEFTUP        = LEFT|UP,
+		LEFTDRAG      = LEFT|DRAG,
+		LEFTHOLD      = LEFT|HOLD,
+		LEFTTRIPLE    = LEFT|TRIPLE,
+
+		RIGHTDOWN     = RIGHT|DOWN,
+		RIGHTDOUBLE   = RIGHT|DOUBLE,
+		RIGHTREPEAT   = RIGHT|REPEAT,
+		RIGHTUP       = RIGHT|UP,
+		RIGHTDRAG     = RIGHT|DRAG,
+		RIGHTHOLD     = RIGHT|HOLD,
+		RIGHTTRIPLE   = RIGHT|TRIPLE,
+
+		MIDDLEDOWN     = MIDDLE|DOWN,
+		MIDDLEDOUBLE   = MIDDLE|DOUBLE,
+		MIDDLEREPEAT   = MIDDLE|REPEAT,
+		MIDDLEUP       = MIDDLE|UP,
+		MIDDLEDRAG     = MIDDLE|DRAG,
+		MIDDLEHOLD     = MIDDLE|HOLD,
+		MIDDLETRIPLE   = MIDDLE|TRIPLE
+	};
+
+	enum {
+		NOBACKPAINT,
+		FULLBACKPAINT,
+		TRANSPARENTBACKPAINT,
+		EXCLUDEPAINT,
+	};
+
+	static  Vector<Ctrl *> GetTopCtrls();
+	static  Vector<Ctrl *> GetTopWindows();
+	static  void   CloseTopCtrls();
+
+	static  void   InstallMouseHook(MouseHook hook);
+	static  void   DeinstallMouseHook(MouseHook hook);
+
+	static  void   InstallKeyHook(KeyHook hook);
+	static  void   DeinstallKeyHook(KeyHook hook);
+
+	static  void   InstallStateHook(StateHook hook);
+	static  void   DeinstallStateHook(StateHook hook);
+
+	virtual bool   Accept();
+	virtual void   Reject();
+	virtual void   SetData(const Value& data);
+	virtual Value  GetData() const;
+	virtual void   Serialize(Stream& s);
+	virtual void   SetModify();
+	virtual void   ClearModify();
+	virtual bool   IsModified() const;
+
+	virtual void   Paint(Draw& draw);
+	virtual int    OverPaint() const;
+
+	virtual void   CancelMode();
+
+	virtual void   Activate();
+	virtual void   Deactivate();
+
+	virtual Image  FrameMouseEvent(int event, Point p, int zdelta, dword keyflags);
+	virtual Image  MouseEvent(int event, Point p, int zdelta, dword keyflags);
+	virtual void   MouseEnter(Point p, dword keyflags);
+	virtual void   MouseMove(Point p, dword keyflags);
+	virtual void   LeftDown(Point p, dword keyflags);
+	virtual void   LeftDouble(Point p, dword keyflags);
+	virtual void   LeftTriple(Point p, dword keyflags);
+	virtual void   LeftRepeat(Point p, dword keyflags);
+	virtual void   LeftDrag(Point p, dword keyflags);
+	virtual void   LeftHold(Point p, dword keyflags);
+	virtual void   LeftUp(Point p, dword keyflags);
+	virtual void   RightDown(Point p, dword keyflags);
+	virtual void   RightDouble(Point p, dword keyflags);
+	virtual void   RightTriple(Point p, dword keyflags);
+	virtual void   RightRepeat(Point p, dword keyflags);
+	virtual void   RightDrag(Point p, dword keyflags);
+	virtual void   RightHold(Point p, dword keyflags);
+	virtual void   RightUp(Point p, dword keyflags);
+	virtual void   MiddleDown(Point p, dword keyflags);
+	virtual void   MiddleDouble(Point p, dword keyflags);
+	virtual void   MiddleTriple(Point p, dword keyflags);
+	virtual void   MiddleRepeat(Point p, dword keyflags);
+	virtual void   MiddleDrag(Point p, dword keyflags);
+	virtual void   MiddleHold(Point p, dword keyflags);
+	virtual void   MiddleUp(Point p, dword keyflags);
+	virtual void   MouseWheel(Point p, int zdelta, dword keyflags);
+	virtual void   MouseLeave();
+
+	virtual void   DragAndDrop(Point p, PasteClip& d);
+	virtual void   FrameDragAndDrop(Point p, PasteClip& d);
+	virtual void   DragRepeat(Point p);
+	virtual void   DragEnter();
+	virtual void   DragLeave();
+	virtual String GetDropData(const String& fmt) const;
+	virtual String GetSelectionData(const String& fmt) const;
+
+	virtual Image  CursorImage(Point p, dword keyflags);
+
+	virtual bool   Key(dword key, int count);
+	virtual void   GotFocus();
+	virtual void   LostFocus();
+	virtual bool   HotKey(dword key);
+
+	virtual dword  GetAccessKeys() const;
+	virtual void   AssignAccessKeys(dword used);
+
+	virtual void   PostInput();
+
+	virtual void   ChildFrameMouseEvent(Ctrl *child, int event, Point p, int zdelta, dword keyflags);
+	virtual void   ChildMouseEvent(Ctrl *child, int event, Point p, int zdelta, dword keyflags);
+	virtual void   ChildGotFocus();
+	virtual void   ChildLostFocus();
+	virtual void   ChildAdded(Ctrl *child);
+	virtual void   ChildRemoved(Ctrl *child);
+	virtual void   ParentChange();
+
+	virtual void   State(int reason);
+
+	virtual void   Layout();
+
+	virtual Size   GetMinSize() const;
+	virtual Size   GetStdSize() const;
+	virtual Size   GetMaxSize() const;
+
+	virtual bool   IsShowEnabled() const;
+
+	virtual Rect   GetOpaqueRect();
+	virtual Rect   GetVoidRect();
+
+	virtual void   Updated();
+
+	virtual void   Close();
+
+	virtual bool   IsOcxChild();
+
+	virtual String GetDesc() const;
+
+	Callback       WhenAction;
+
+	void             AddChild(Ctrl *child);
+	void             AddChild(Ctrl *child, Ctrl *insafter);
+	void             AddChildBefore(Ctrl *child, Ctrl *insbefore);
+	void             RemoveChild(Ctrl *child);
+	Ctrl            *GetParent() const           { return parent; }
+	Ctrl            *GetLastChild() const        { return lastchild; }
+	Ctrl            *GetFirstChild() const       { return firstchild; }
+	Ctrl            *GetPrev() const             { return parent ? prev : NULL; }
+	Ctrl            *GetNext() const             { return parent ? next : NULL; }
+
+	bool             IsChild() const             { return parent; }
+
+	Ctrl            *ChildFromPoint(Point& pt) const;
+
+	bool             IsForeground() const;
+	void             SetForeground();
+
+	const Ctrl      *GetTopCtrl() const;
+	Ctrl            *GetTopCtrl();
+	const Ctrl      *GetOwner() const;
+	Ctrl            *GetOwner();
+	const Ctrl      *GetTopCtrlOwner() const;
+	Ctrl            *GetTopCtrlOwner();
+
+	Ctrl            *GetOwnerCtrl();
+	const Ctrl      *GetOwnerCtrl() const;
+
+	const TopWindow *GetTopWindow() const;
+	TopWindow       *GetTopWindow();
+
+	const TopWindow *GetMainWindow() const;
+	TopWindow       *GetMainWindow();
+
+	Ctrl&            SetFrame(int i, CtrlFrame& frm);
+	Ctrl&            SetFrame(CtrlFrame& frm)            { return SetFrame(0, frm); }
+	Ctrl&            AddFrame(CtrlFrame& frm);
+	const CtrlFrame& GetFrame(int i = 0) const           { return *frame[i].frame; }
+	CtrlFrame&       GetFrame(int i = 0)                 { return *frame[i].frame; }
+	void             RemoveFrame(int i);
+	void             RemoveFrame(CtrlFrame& frm);
+	void             InsertFrame(int i, CtrlFrame& frm);
+	int              FindFrame(CtrlFrame& frm);
+	int              GetFrameCount() const               { return frame.GetCount(); }
+	void             ClearFrames();
+
+	bool        IsOpen() const;
+
+	void        Shutdown()                               { destroying = true; }
+	bool        IsShutdown() const                       { return destroying; }
+
+	Ctrl&       SetPos(LogPos p, bool inframe);
+
+	Ctrl&       SetPos(LogPos p);
+	Ctrl&       SetPos(Logc x, Logc y)                   { return SetPos(LogPos(x, y)); }
+	Ctrl&       SetPosX(Logc x);
+	Ctrl&       SetPosY(Logc y);
+
+	void        SetRect(const Rect& r);
+	void        SetRect(int x, int y, int cx, int cy);
+	void        SetRectX(int x, int cx);
+	void        SetRectY(int y, int cy);
+
+	Ctrl&       SetFramePos(LogPos p);
+	Ctrl&       SetFramePos(Logc x, Logc y)              { return SetFramePos(LogPos(x, y)); }
+	Ctrl&       SetFramePosX(Logc x);
+	Ctrl&       SetFramePosY(Logc y);
+
+	void        SetFrameRect(const Rect& r);
+	void        SetFrameRect(int x, int y, int cx, int cy);
+	void        SetFrameRectX(int x, int cx);
+	void        SetFrameRectY(int y, int cy);
+
+	bool        InFrame() const                          { return inframe; }
+	bool        InView() const                           { return !inframe; }
+	LogPos      GetPos() const                           { return pos; }
+
+	void        RefreshLayout()                          { SyncLayout(1); }
+	void        RefreshLayoutDeep()                      { SyncLayout(2); }
+	void        RefreshParentLayout()                    { if(parent) parent->RefreshLayout(); }
+
+	Ctrl&       LeftPos(int a, int size = STDSIZE);
+	Ctrl&       RightPos(int a, int size = STDSIZE);
+	Ctrl&       TopPos(int a, int size = STDSIZE);
+	Ctrl&       BottomPos(int a, int size = STDSIZE);
+	Ctrl&       HSizePos(int a = 0, int b = 0);
+	Ctrl&       VSizePos(int a = 0, int b = 0);
+	Ctrl&       SizePos();
+	Ctrl&       HCenterPos(int size = STDSIZE, int delta = 0);
+	Ctrl&       VCenterPos(int size = STDSIZE, int delta = 0);
+
+	Ctrl&       LeftPosZ(int a, int size = STDSIZE);
+	Ctrl&       RightPosZ(int a, int size = STDSIZE);
+	Ctrl&       TopPosZ(int a, int size = STDSIZE);
+	Ctrl&       BottomPosZ(int a, int size = STDSIZE);
+	Ctrl&       HSizePosZ(int a = 0, int b = 0);
+	Ctrl&       VSizePosZ(int a = 0, int b = 0);
+	Ctrl&       HCenterPosZ(int size = STDSIZE, int delta = 0);
+	Ctrl&       VCenterPosZ(int size = STDSIZE, int delta = 0);
+
+	Rect        GetRect() const;
+	Rect        GetScreenRect() const;
+
+	Rect        GetView() const;
+	Rect        GetScreenView() const;
+	Size        GetSize() const;
+
+	Rect        GetVisibleScreenRect() const;
+	Rect        GetVisibleScreenView() const;
+
+	Rect        GetWorkArea() const;
+
+	Size        AddFrameSize(int cx, int cy) const;
+	Size        AddFrameSize(Size sz) const              { return AddFrameSize(sz.cx, sz.cy); }
+
+	void        Refresh(const Rect& r);
+	void        Refresh(int x, int y, int cx, int cy);
+	void        Refresh();
+	bool        IsFullRefresh() const                    { return fullrefresh; }
+
+	void        RefreshFrame(const Rect& r);
+	void        RefreshFrame(int x, int y, int cx, int cy);
+	void        RefreshFrame();
+
+	void        ScrollView(const Rect& r, int dx, int dy);
+	void        ScrollView(int x, int y, int cx, int cy, int dx, int dy);
+	void        ScrollView(int dx, int dy);
+	void        ScrollView(const Rect& r, Size delta)    { ScrollView(r, delta.cx, delta.cy); }
+	void        ScrollView(Size delta)                   { ScrollView(delta.cx, delta.cy); }
+
+	void        Sync();
+	void        Sync(const Rect& r);
+
+	static Image OverrideCursor(const Image& m);
+
+	void        DrawCtrl(Draw& w, int x = 0, int y = 0);
+	void        DrawCtrlWithParent(Draw& w, int x = 0, int y = 0);
+
+	bool    HasChild(Ctrl *ctrl) const;
+	bool    HasChildDeep(Ctrl *ctrl) const;
+
+	Ctrl&   IgnoreMouse(bool b = true)                   { ignoremouse = b; return *this; }
+	Ctrl&   NoIgnoreMouse()                              { return IgnoreMouse(false); }
+	bool    HasMouse() const;
+	bool    HasMouseDeep() const;
+	bool    HasMouseInFrame(const Rect& r);
+	bool    HasMouseIn(const Rect& r) const;
+	Point   GetMouseViewPos() const;
+	static Ctrl *GetMouseCtrl();
+
+	static void IgnoreMouseClick();
+	static void IgnoreMouseUp();
+
+	bool    SetCapture();
+	bool    ReleaseCapture();
+	bool    HasCapture() const;
+	static bool ReleaseCtrlCapture();
+
+	bool    SetFocus();
+	bool    HasFocus() const                   { return FocusCtrl() == this; }
+	bool    HasFocusDeep() const;
+	Ctrl&   WantFocus(bool ft = true)          { wantfocus = ft; return *this; }
+	Ctrl&   NoWantFocus()                      { return WantFocus(false); }
+	bool	IsWantFocus() const                { return wantfocus; }
+	bool    SetWantFocus();
+	Ctrl&   InitFocus(bool ft = true)          { initfocus = ft; return *this; }
+	Ctrl&   NoInitFocus()                      { return InitFocus(false); }
+	bool    IsInitFocus()                      { return initfocus; }
+	Ctrl   *GetFocusChild() const              { return HasChild(FocusCtrl()) ? ~FocusCtrl() : NULL; }
+	Ctrl   *GetFocusChildDeep() const          { return HasChildDeep(FocusCtrl()) ? ~FocusCtrl() : NULL; }
+
+	void    CancelModeDeep();
+
+	void    SetCaret(int x, int y, int cx, int cy);
+	void    SetCaret(const Rect& r);
+	Rect    GetCaret() const;
+	void    KillCaret();
+
+	static Ctrl *GetFocusCtrl()                { return FocusCtrl(); }
+
+	static Ctrl *GetEventTopCtrl()             { return eventCtrl; }
+
+	static bool  IterateFocusForward(Ctrl *ctrl, Ctrl *top, bool noframe = false, bool init = false, bool all = false);
+	static bool  IterateFocusBackward(Ctrl *ctrl, Ctrl *top, bool noframe = false, bool all = false);
+
+	static dword AccessKeyBit(byte accesskey);
+	dword   GetAccessKeysDeep() const;
+	void    DistributeAccessKeys();
+	bool    VisibleAccessKeys();
+
+	void    Show(bool show = true);
+	void    Hide()                             { Show(false); }
+	bool    IsShown() const                    { return visible; }
+	bool    IsVisible() const;
+
+	void    Enable(bool enable = true);
+	void    Disable()                          { Enable(false); }
+	bool    IsEnabled() const                  { return enabled; }
+
+	Ctrl&   SetEditable(bool editable = true);
+	Ctrl&   SetReadOnly()                      { return SetEditable(false); }
+	bool    IsEditable() const                 { return editable; }
+	bool    IsReadOnly() const                 { return !editable; }
+
+	void    ResetModify()                      { modify = false; }
+	bool    IsModifySet() const                { return modify; }
+
+	void    UpdateRefresh();
+	void    Update();
+	void    Action();
+	void    UpdateAction();
+	void    UpdateActionRefresh();
+
+	Ctrl&   BackPaint(int bp = FULLBACKPAINT)  { backpaint = bp; return *this; }
+	Ctrl&   TransparentBackPaint()             { backpaint = TRANSPARENTBACKPAINT; return *this; }
+	Ctrl&   NoBackPaint()                      { return BackPaint(NOBACKPAINT); }
+	Ctrl&   BackPaintHint();
+	int     GetBackPaint()                     { return backpaint; }
+	Ctrl&   Transparent(bool bp = true)        { transparent = bp; return *this; }
+	Ctrl&   NoTransparent()                    { return Transparent(false); }
+	bool    IsTransparent() const              { return transparent; }
+#ifdef PLATFORM_WIN32
+	Ctrl&   ActiveX(bool ax = true)            { activex = ax; return *this; }
+	Ctrl&   NoActiveX()                        { return ActiveX(false); }
+	bool    IsActiveX() const                  { return activex; }
+#endif
+
+	Ctrl&   Info(const char *txt)              { info = txt; return *this; }
+	String  GetInfo() const                    { return info; }
+
+	Ctrl&   Tip(const char *txt);
+	Ctrl&   HelpLine(const char *txt);
+	Ctrl&   Description(const char *txt);
+	Ctrl&   HelpTopic(const char *txt);
+	Ctrl&   LayoutId(const char *txt);
+
+	String  GetTip() const;
+	String  GetHelpLine() const;
+	String  GetDescription() const;
+	String  GetHelpTopic() const;
+	String  GetLayoutId() const;
+
+	void    Add(Ctrl& ctrl)                    { AddChild(&ctrl); }
+	Ctrl&   operator<<(Ctrl& ctrl)             { Add(ctrl); return *this; }
+
+	void    Remove();
+
+	Value        operator~() const             { return GetData(); }
+	const Value& operator<<=(const Value& v)   { SetData(v); return v; }
+	bool         IsNullInstance() const        { return GetData().IsNull(); }
+
+	Callback     operator<<=(Callback action)  { WhenAction = action; return action; }
+	Callback&    operator<<(Callback action)   { return WhenAction << action; }
+
+	void    SetTimeCallback(int delay_ms, Callback cb, int id = 0);
+	void    KillTimeCallback(int id = 0);
+	void    KillSetTimeCallback(int delay_ms, Callback cb, int id);
+	bool    ExistsTimeCallback(int id = 0) const;
+	void    PostCallback(Callback cb, int id = 0);
+	void    KillPostCallback(Callback cb, int id);
+
+	enum { TIMEID_COUNT = 1 };
+
+	static void  SetTimerGranularity(int ms);
+
+	static Ctrl *GetActiveCtrl();
+	static Ctrl *GetActiveWindow();
+
+	static Ctrl *GetVisibleChild(Ctrl *ctrl, Point p, bool pointinframe);
+
+#ifdef PLATFORM_WIN32
+	void   PopUpHWND(HWND hwnd, bool savebits = true, bool activate = true, bool dropshadow = false,
+	                 bool topmost = false);
+#endif
+	void   PopUp(Ctrl *owner = NULL, bool savebits = true, bool activate = true, bool dropshadow = false,
+	             bool topmost = false);
+
+	void   SetAlpha(byte alpha);
+
+	static bool IsWaitingEvent();
+	static bool ProcessEvent(bool *quit = NULL);
+	static bool ProcessEvents(bool *quit = NULL);
+
+	bool   IsPopUp() const          { return popup; }
+
+	static void  EventLoop(Ctrl *loopctrl = NULL);
+	static int   GetLoopLevel()     { return LoopLevel; }
+	static Ctrl *GetLoopCtrl()      { return LoopCtrl; }
+
+	void   EndLoop()                { inloop = false; }
+	void   EndLoop(int code)        { ASSERT(!parent); exitcode = code; EndLoop(); }
+	bool   InLoop() const           { return inloop; }
+	bool   InCurrentLoop() const    { return GetLoopCtrl() == this; }
+	int    GetExitCode() const      { return exitcode; }
+
+	static PasteClip& Clipboard();
+	static PasteClip& Selection();
+
+	void   SetSelectionSource(const char *fmts);
+
+	int    DoDragAndDrop(const char *fmts, const Image& sample, dword actions,
+	                     const VectorMap<String, ClipData>& data);
+	int    DoDragAndDrop(const char *fmts, const Image& sample = Null, dword actions = DND_ALL);
+	int    DoDragAndDrop(const VectorMap<String, ClipData>& data, const Image& sample = Null,
+	                     dword actions = DND_ALL);
+	static Ctrl *GetDragAndDropSource();
+	static Ctrl *GetDragAndDropTarget();
+	bool   IsDragAndDropSource()    { return this == GetDragAndDropSource(); }
+	bool   IsDragAndDropTarget()    { return this == GetDragAndDropTarget(); }
+	static Size  StdSampleSize()    { return Size(126, 106); }
+
+	void SetMinSize(Size sz) {} // see CtrlLayout template and WindowCtrl...
+
+public:
+	static void SetSkin(void (*skin)());
+
+	static const char *GetZoomText();
+	static void SetZoomSize(Size sz, Size bsz = Size(0, 0));
+	static int  HorzLayoutZoom(int cx);
+	static int  VertLayoutZoom(int cy);
+	static Size LayoutZoom(int cx, int cy);
+	static Size LayoutZoom(Size sz);
+	static void NoLayoutZoom();
+	static void GetZoomRatio(Size& m, Size& d);
+
+	static int  HZoom(int cx)                            { return HorzLayoutZoom(cx); }
+
+	static bool ClickFocus();
+	static void ClickFocus(bool cf);
+
+	static Rect   GetVirtualWorkArea();
+	static Rect   GetVirtualScreenArea();
+	static Rect   GetPrimaryWorkArea();
+	static Rect   GetPrimaryScreenArea();
+	static int    GetKbdDelay();
+	static int    GetKbdSpeed();
+	static bool   IsAlphaSupported();
+	static Rect   GetDefaultWindowRect();
+	static String GetAppName();
+	static void   SetAppName(const String& appname);
+	static bool   IsCompositedGui();
+
+	static void   GlobalBackPaint(bool b = true);
+	static void   GlobalBackPaintHint();
+
+	String      Name() const;
+
+#ifdef _DEBUG
+	virtual void   Dump() const;
+	virtual void   Dump(Stream& s) const;
+
+	static bool LogMessages;
+#endif
+
+	static void ShowRepaint(int ms);
+
+	static bool MemoryCheck;
+
+#ifdef PLATFORM_WIN32
+	static void InitWin32(HINSTANCE hinst);
+	static void ExitWin32();
+#ifdef PLATFORM_WINCE
+	static void GuiFlush()                              {}
+#else
+	static void GuiFlush()                              { ::GdiFlush(); }
+#endif
+#endif
+
+#ifdef PLATFORM_X11
+	static void InitX11(const char *display);
+	static void ExitX11();
+	static void GuiFlush()                              { XFlush(Xdisplay); }
+#endif
+
+	static void GuiSleep(int ms);
+
+	Ctrl();
+	virtual ~Ctrl();
+};
+
+Font FontZ(int face, int height = 0);
+Font StdFontZ(int height = 0);
+Font ScreenSansZ(int height = 0);
+Font ScreenSerifZ(int height = 0);
+Font ScreenFixedZ(int height = 0);
+Font RomanZ(int height = 0);
+Font ArialZ(int height = 0);
+Font CourierZ(int height = 0);
+
+int   EditFieldIsThin();
+Value TopSeparator1();
+Value TopSeparator2();
+int   FrameButtonWidth();
+int   ScrollBarArrowSize();
+Color FieldFrameColor();
+
+enum { GUISTYLE_FLAT, GUISTYLE_CLASSIC, GUISTYLE_XP, GUISTYLE_X };
+int GUI_GlobalStyle();
+
+int GUI_DragFullWindow();
+
+enum { GUIEFFECT_NONE, GUIEFFECT_SLIDE, GUIEFFECT_FADE };
+int GUI_PopUpEffect();
+
+int GUI_DropShadows();
+int GUI_AltAccessKeys();
+int GUI_AKD_Conservative();
+int GUI_DragDistance();
+int GUI_DblClickTime();
+
+void GUI_GlobalStyle_Write(int);
+void GUI_DragFullWindow_Write(int);
+void GUI_PopUpEffect_Write(int);
+void GUI_DropShadows_Write(int);
+void GUI_AltAccessKeys_Write(int);
+void GUI_AKD_Conservative_Write(int);
+void GUI_DragDistance_Write(int);
+void GUI_DblClickTime_Write(int);
+
+void  EditFieldIsThin_Write(int);
+void  TopSeparator1_Write(Value);
+void  TopSeparator2_Write(Value);
+void  FrameButtonWidth_Write(int);
+void  ScrollBarArrowSize_Write(int);
+void  FieldFrameColor_Write(Color);
+
+String Name(const Ctrl *ctrl);
+String Desc(const Ctrl *ctrl);
+void   Dump(const Ctrl *ctrl);
+
+inline Ctrl *operator<<(Ctrl *parent, Ctrl& child)
+{
+	parent->Add(child);
+	return parent;
+}
+
+inline unsigned GetHashValue(Ctrl *x)
+{
+	return (unsigned)(intptr_t)x;
+}
+
+String GetKeyDesc(dword key);
+
+Vector< Ptr<Ctrl> > DisableCtrls(const Vector<Ctrl *>& ctrl, Ctrl *exclude = NULL);
+void EnableCtrls(const Vector< Ptr<Ctrl> >& ctrl);
+
+template <class T>
+class FrameCtrl : public T, public CtrlFrame {
+public:
+	virtual void FrameAdd(Ctrl& parent) { parent.Add(*this); }
+	virtual void FrameRemove()          { this->Ctrl::Remove(); }
+
+	FrameCtrl()                         { this->NoWantFocus(); }
+};
+
+template <class T>
+class FrameLR : public FrameCtrl<T> {
+public:
+	virtual void FrameAddSize(Size& sz) { sz.cx += (cx ? cx : sz.cy) * this->IsShown(); }
+
+protected:
+	int cx;
+
+public:
+	FrameLR& Width(int _cx)             { cx = _cx; this->RefreshParentLayout(); return *this; }
+	int      GetWidth() const           { return cx; }
+	FrameLR()                           { cx = 0; }
+};
+
+template <class T>
+class FrameLeft : public FrameLR<T> {
+public:
+	virtual void FrameLayout(Rect& r) {
+		LayoutFrameLeft(r, this, this->cx ? this->cx : FrameButtonWidth());
+	}
+};
+
+template <class T>
+class FrameRight : public FrameLR<T> {
+public:
+	virtual void FrameLayout(Rect& r) {
+		LayoutFrameRight(r, this, this->cx ? this->cx : FrameButtonWidth());
+	}
+};
+
+template <class T>
+class FrameTB : public FrameCtrl<T> {
+public:
+	virtual void FrameAddSize(Size& sz) { sz.cy += (cy ? cy : sz.cx) * this->IsShown(); }
+
+protected:
+	int cy;
+
+public:
+	FrameTB& Height(int _cy)            { cy = _cy; this->RefreshParentLayout(); return *this; }
+	int      GetHeight() const          { return cy; }
+	FrameTB()                           { cy = 0; }
+};
+
+template <class T>
+class FrameTop : public FrameTB<T> {
+public:
+	virtual void FrameLayout(Rect& r) {
+		LayoutFrameTop(r, this, this->cy ? this->cy : r.Width());
+	}
+};
+
+template <class T>
+class FrameBottom : public FrameTB<T> {
+public:
+	virtual void FrameLayout(Rect& r) {
+		LayoutFrameBottom(r, this, this->cy ? this->cy : r.Width());
+	}
+};
+
+class Modality {
+	Ptr<Ctrl>           active;
+	bool                fore_only;
+	Vector< Ptr<Ctrl> > enable;
+
+public:
+	void Begin(Ctrl *modal, bool fore_only = false);
+	void End();
+
+	~Modality()      { End(); }
+};
+
+class ViewDraw : public Draw {
+public:
+	ViewDraw(Ctrl *ctrl);
+	~ViewDraw();
+
+protected:
+#ifdef PLATFORM_WIN32
+	HWND   hwnd;
+#endif
+#ifdef PLATFORM_X11
+	bool   caret;
+#endif
+};
+
+#ifdef PLATFORM_WIN32
+#ifdef COMPILER_MSC
+inline unsigned GetHashValue(const HWND& hwnd)
+{
+	return (unsigned)(intptr_t)hwnd;
+}
+#endif
+#endif
+
+class LocalLoop : public Ctrl {
+	Ctrl *master;
+
+public:
+	void  Run();
+	void  SetMaster(Ctrl& m)      { master = &m; }
+	Ctrl& GetMaster() const       { return *master; }
+
+	LocalLoop()                   { master = NULL; }
+};
+
+void DrawDragRect(Ctrl& q, const Rect& rect1, const Rect& rect2, const Rect& clip, int n,
+                  Color color, const word *pattern);
+
+bool PointLoop(Ctrl& ctrl, const Vector<Image>& ani, int ani_ms);
+bool PointLoop(Ctrl& ctrl, const Image& img);
+
+class RectTracker : public LocalLoop {
+public:
+	virtual void  LeftUp(Point, dword);
+	virtual void  RightUp(Point, dword);
+	virtual void  MouseMove(Point p, dword);
+	virtual Image CursorImage(Point, dword);
+
+public:
+	struct Rounder {
+		virtual Rect Round(const Rect& r) = 0;
+		virtual ~Rounder() {}
+	};
+
+protected:
+	Rect            rect;
+	int             tx, ty;
+	Rect            maxrect;
+	Size            minsize, maxsize;
+	bool            keepratio;
+	Rect            clip;
+	Color           color;
+	Image           cursorimage;
+	int             width;
+	uint64          pattern;
+	int             animation;
+	int             panim;
+	Rounder        *rounder;
+
+	Rect            org;
+	Rect            o;
+	Point           op;
+
+	Rect            Round(const Rect& r)           { return rounder ? rounder->Round(r) : r; }
+
+	virtual void    DrawRect(Rect r1, Rect r2);
+
+public:
+	Callback1<Rect> sync;
+
+	RectTracker&    SetCursorImage(const Image& m) { cursorimage = m; return *this; }
+	RectTracker&    MinSize(Size sz)               { minsize = sz; return *this; }
+	RectTracker&    MaxSize(Size sz)               { maxsize = sz; return *this; }
+	RectTracker&    MaxRect(const Rect& mr)        { maxrect = mr; return *this; }
+	RectTracker&    Clip(const Rect& c)            { clip = c; return *this; }
+	RectTracker&    Width(int n)                   { width = n; return *this; }
+	RectTracker&    SetColor(Color c)              { color = c; return *this; }
+	RectTracker&    Pattern(uint64 p)              { pattern = p; return *this; }
+	RectTracker&    Dashed();
+	RectTracker&    Solid();
+	RectTracker&    Animation(int step_ms = 40)    { animation = step_ms; return *this; }
+	RectTracker&    KeepRatio(bool b)              { keepratio = b; return *this; }
+	RectTracker&    Round(Rounder& r)              { rounder = &r; return *this; }
+
+	Rect            Get()                          { return rect; }
+
+	Rect Track(const Rect& r, int tx = ALIGN_RIGHT, int ty = ALIGN_BOTTOM);
+	int  TrackHorzLine(int x0, int y0, int cx, int line);
+	int  TrackVertLine(int x0, int y0, int cy, int line);
+
+	RectTracker(Ctrl& master);
+	virtual ~RectTracker();
+};
+
+class WaitCursor {
+	Image   prev;
+	bool    flag;
+
+public:
+	void    Show();
+
+	WaitCursor(bool show = true);
+	~WaitCursor();
+};
+
+class AutoWaitCursor : public WaitCursor {
+protected:
+	int&   avg;
+	int    time0;
+
+public:
+	void Cancel()                   { time0 = 0; }
+
+	AutoWaitCursor(int& avg);
+	~AutoWaitCursor();
+};
+
+void    ClearClipboard();
+void    AppendClipboard(const char *format, const byte *data, int length);
+void    AppendClipboard(const char *format, const String& data);
+void    AppendClipboard(const char *format, const Value& data, String (*render)(const Value& data));
+String  ReadClipboard(const char *format);
+bool    IsClipboardAvailable(const char *format);
+
+inline  void WriteClipboard(const char *format, const String& data)
+	{ ClearClipboard(); AppendClipboard(format, data); }
+
+void    AppendClipboardText(const String& s);
+String  ReadClipboardText();
+void    AppendClipboardUnicodeText(const WString& s);
+WString ReadClipboardUnicodeText();
+bool    IsClipboardAvailableText();
+
+inline  void WriteClipboardText(const String& s)
+	{ ClearClipboard(); AppendClipboardText(s); }
+inline  void WriteClipboardUnicodeText(const WString& s)
+	{ ClearClipboard(); AppendClipboardUnicodeText(s); }
+
+template <class T>
+inline void AppendClipboardFormat(const T& object) {
+	AppendClipboard(typeid(T).name(), StoreAsString(const_cast<T&>(object)));
+}
+
+template <class T>
+inline void WriteClipboardFormat(const T& object) {
+	ClearClipboard();
+	AppendClipboardFormat(object);
+}
+
+template <class T>
+inline bool ReadClipboardFormat(T& object)
+{
+	String s = ReadClipboard(typeid(T).name());
+	return !IsNull(s) && LoadFromString(object, s);
+}
+
+template <class T>
+bool IsClipboardFormatAvailable()
+{
+	return IsClipboardAvailable(typeid(T).name());
+}
+
+template <class T>
+inline T ReadClipboardFormat() {
+	T object;
+	ReadClipboardFormat(object);
+	return object;
+}
+
+Image  ReadClipboardImage();
+void   AppendClipboardImage(const Image& img);
+
+inline void WriteClipboardImage(const Image& img)
+	{ ClearClipboard(); AppendClipboardImage(img); }
+
+#include <CtrlCore/TopWindow.h>
+
+bool (*&DisplayErrorFn())(const Value& v);
+inline bool DisplayError(const Value& v) { return DisplayErrorFn()(v); }
+
+#ifdef PLATFORM_WIN32
+
+Vector<String>& coreCmdLine__();
+Vector<String> SplitCmdLine__(const char *cmd);
+
+#ifdef PLATFORM_WINCE
+
+#define GUI_APP_MAIN \
+void GuiMainFn_();\
+\
+int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE, LPTSTR lpCmdLine, int nCmdShow) \
+{ \
+	UPP::Ctrl::InitWin32(hInstance); \
+	UPP::coreCmdLine__() = UPP::SplitCmdLine__(UPP::FromSystemCharset(lpCmdLine)); \
+	UPP::AppInitEnvironment__(); \
+	GuiMainFn_(); \
+	UPP::Ctrl::CloseTopCtrls(); \
+	UPP::UsrLog("---------- About to delete this log..."); \
+	UPP::DeleteUsrLog(); \
+	UPP::Ctrl::ExitWin32(); \
+	UPP::AppExit__(); \
+	return UPP::GetExitCode(); \
+} \
+\
+void GuiMainFn_()
+
+#else
+
+#define GUI_APP_MAIN \
+void GuiMainFn_();\
+\
+int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE, LPSTR lpCmdLine, int nCmdShow) \
+{ \
+	UPP::Ctrl::InitWin32(hInstance); \
+	UPP::coreCmdLine__() = UPP::SplitCmdLine__(lpCmdLine); \
+	UPP::AppInitEnvironment__(); \
+	GuiMainFn_(); \
+	UPP::Ctrl::CloseTopCtrls(); \
+	UPP::UsrLog("---------- About to delete this log..."); \
+	UPP::DeleteUsrLog(); \
+	UPP::Ctrl::ExitWin32(); \
+	UPP::AppExit__(); \
+	return UPP::GetExitCode(); \
+} \
+\
+void GuiMainFn_()
+
+#endif
+#endif
+
+#ifdef PLATFORM_POSIX
+
+#define GUI_APP_MAIN \
+void GuiMainFn_(); \
+\
+int main(int argc, const char **argv, const char **envptr) { \
+	UPP::AppInit__(argc, argv, envptr); \
+	UPP::Ctrl::InitX11(NULL); \
+	GuiMainFn_(); \
+	UPP::Ctrl::CloseTopCtrls(); \
+	UPP::UsrLog("---------- About to delete this log..."); \
+	UPP::DeleteUsrLog(); \
+	UPP::Ctrl::ExitX11(); \
+	UPP::AppExit__(); \
+	return UPP::GetExitCode(); \
+} \
+ \
+void GuiMainFn_()
+
+#endif
+
+#ifdef PLATFORM_WIN32
+#ifndef PLATFORM_WINCE
+
+class DHCtrl : public Ctrl {
+public:
+	virtual void    State(int reason);
+	virtual LRESULT WindowProc(UINT message, WPARAM wParam, LPARAM lParam);
+	virtual void    NcCreate(HWND hwnd);
+	virtual void    NcDestroy();
+
+private:
+	HWND   hwnd;
+
+	void CloseHWND();
+	void OpenHWND();
+	void SyncHWND();
+
+public:
+	HWND    GetHWND()                              { return hwnd; }
+
+	DHCtrl();
+	~DHCtrl();
+};
+
+#endif
+#endif
+
+#ifdef PLATFORM_X11
+
+class DHCtrl : public Ctrl {
+	bool isInitialized;
+	int isError;
+	bool isMapped;
+	Size CurrentSize;
+	XVisualInfo* UserVisualInfo;
+	String ErrorMessage;
+
+	void MapWindow(bool map);
+	bool Init(void);
+	void Terminate(void);
+
+	virtual void State(int reason);
+
+protected:
+	Visual     *GetVisual(void);
+	XVisualInfo GetVisualInfo(void);
+
+	virtual XVisualInfo *CreateVisual(void) {return 0;}
+	virtual void SetAttributes(unsigned long &ValueMask, XSetWindowAttributes &attr) {}
+	virtual void Paint(Draw &draw) {}
+	virtual void BeforeInit(void) {}
+	virtual void AfterInit(bool Error) {}
+	virtual void BeforeTerminate(void) {}
+	virtual void AfterTerminate(void) {}
+	virtual void Resize(int w, int h) {}
+
+	void SetError(bool err) { isError = err; }
+	void SetErrorMessage(String const &msg) { ErrorMessage = msg; }
+
+public:
+	typedef DHCtrl CLASSNAME;
+
+	bool   IsInitialized(void) { return isInitialized; }
+
+	bool   GetError(void) { return isError; }
+	String GetErrorMessage(void) { return ErrorMessage; }
+
+	DHCtrl();
+	~DHCtrl();
+};
+
+#endif
+
+END_UPP_NAMESPACE
+
+#ifdef PLATFORM_WIN32
+#ifndef PLATFORM_WINCE
+
+#include <ShellAPI.h>
+
+#endif
+#endif
+
+#endif
diff --git a/uppsrc/CtrlCore/CtrlCore.icpp b/uppsrc/CtrlCore/CtrlCore.icpp
new file mode 100644
index 000000000..f3741126e
--- /dev/null
+++ b/uppsrc/CtrlCore/CtrlCore.icpp
@@ -0,0 +1,8 @@
+#include "CtrlCore.h"
+
+NAMESPACE_UPP
+
+#define  TFILE <CtrlCore/CtrlCore.t>
+#include <Core/t.h>
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/CtrlCore/CtrlCore.t b/uppsrc/CtrlCore/CtrlCore.t
new file mode 100644
index 000000000..7f5dc8236
--- /dev/null
+++ b/uppsrc/CtrlCore/CtrlCore.t
@@ -0,0 +1,247 @@
+#ifdef _MSC_VER
+#pragma setlocale("C")
+#endif
+// CtrlKbd.cpp
+
+T_("key\vCtrl+")
+deDE("Strg+")
+esES("")
+fiFI("Ctrl+")
+huHU("Ctrl+")
+roRO("tastă\vCtrl+")
+ruRU("")
+trTR("Ctrl+")
+
+T_("key\vAlt+")
+deDE("Alt+")
+esES("")
+fiFI("Alt+")
+huHU("Alt+")
+roRO("tastă\vAlt+")
+ruRU("")
+trTR("Alt+")
+
+T_("key\vShift+")
+deDE("Umschalt+")
+esES("")
+fiFI("Shift+")
+huHU("Shift+")
+roRO("tastă\vShift+")
+ruRU("")
+trTR("Shift+")
+
+T_("key\vTab")
+deDE("Tab")
+esES("")
+fiFI("Tabulaattori")
+huHU("Tab")
+roRO("tastă\vTab")
+ruRU("")
+trTR("Tab")
+
+T_("key\vSpace")
+deDE("Leertaste")
+esES("")
+fiFI("Välilyönti")
+huHU("Space")
+roRO("tastă\vSpațiu")
+ruRU("")
+trTR("Space")
+
+T_("key\vEnter")
+deDE("Eingabetaste")
+esES("")
+fiFI("Enter")
+huHU("Enter")
+roRO("tastă\vEnter")
+ruRU("")
+trTR("Enter")
+
+T_("key\vBackspace")
+deDE("Rückschritt")
+esES("")
+fiFI("Backspace")
+huHU("Backspace")
+roRO("tastă\vBackspace")
+ruRU("")
+trTR("Backspace")
+
+T_("key\vCaps Lock")
+deDE("Umschaltverriegelung")
+esES("")
+fiFI("Caps Lock")
+huHU("Caps Lock")
+roRO("tastă\vCaps Lock")
+ruRU("")
+trTR("Caps Lock")
+
+T_("key\vEsc")
+deDE("Esc")
+esES("")
+fiFI("Esc")
+huHU("Esc")
+roRO("tastă\vEsc")
+ruRU("")
+trTR("Esc")
+
+T_("key\vPage Up")
+deDE("Bild hoch")
+esES("")
+fiFI("Page Down")
+huHU("Page Up")
+roRO("tastă\vPage Up")
+ruRU("")
+trTR("Page Up")
+
+T_("key\vPage Down")
+deDE("Bild runter")
+esES("")
+fiFI("Page Down")
+huHU("Page Down")
+roRO("tastă\vPage Down")
+ruRU("")
+trTR("Page Down")
+
+T_("key\vEnd")
+deDE("Ende")
+esES("")
+fiFI("End")
+huHU("End")
+roRO("tastă\vEnd")
+ruRU("")
+trTR("End")
+
+T_("key\vHome")
+deDE("Pos1")
+esES("")
+fiFI("Home")
+huHU("Home")
+roRO("tastă\vHome")
+ruRU("")
+trTR("Home")
+
+T_("key\vLeft")
+deDE("Links")
+esES("")
+fiFI("Vasen")
+huHU("Bal")
+roRO("tastă\vStânga")
+ruRU("")
+trTR("Left")
+
+T_("key\vUp")
+deDE("Hoch")
+esES("")
+fiFI("Ylös")
+huHU("Up")
+roRO("tastă\vSus")
+ruRU("")
+trTR("Up")
+
+T_("key\vRight")
+deDE("Rechts")
+esES("")
+fiFI("Oikea")
+huHU("Jobb")
+roRO("tastă\vDreapta")
+ruRU("")
+trTR("Right")
+
+T_("key\vDown")
+deDE("Runter")
+esES("")
+fiFI("Alas")
+huHU("Down")
+roRO("tastă\vJos")
+ruRU("")
+trTR("Down")
+
+T_("key\vInsert")
+deDE("Einfg")
+esES("")
+fiFI("Insert")
+huHU("Insert")
+roRO("tastă\vInsert")
+ruRU("")
+trTR("Insert")
+
+T_("key\vDelete")
+deDE("Entf")
+esES("")
+fiFI("Delete")
+huHU("Delete")
+roRO("tastă\vDelete")
+ruRU("")
+trTR("Delete")
+
+T_("key\vBreak")
+deDE("UntBr")
+esES("")
+fiFI("Break")
+huHU("Break")
+roRO("tastă\vBreak")
+ruRU("")
+trTR("Break")
+
+T_("key\vNum[*]")
+deDE("Num[*]")
+esES("")
+fiFI("Num[*]")
+huHU("Num[*]")
+roRO("tastă\vNum[*]")
+ruRU("")
+trTR("Num[*]")
+
+T_("key\vNum[+]")
+deDE("Num[+]")
+esES("")
+fiFI("Num[+]")
+huHU("Num[+]")
+roRO("tastă\vNum[+]")
+ruRU("")
+trTR("Num[+]")
+
+T_("key\vNum[-]")
+deDE("Num[-]")
+esES("")
+fiFI("Num[-]")
+huHU("Num[-]")
+roRO("tastă\vNum[-]")
+ruRU("")
+trTR("Num[-]")
+
+T_("key\vNum[/]")
+deDE("Num[/]")
+esES("")
+fiFI("Num[/]")
+huHU("Num[/]")
+roRO("tastă\vNum[/]")
+ruRU("")
+trTR("Num[/]")
+
+T_("key\vAlt")
+deDE("Alt")
+esES("")
+fiFI("Alt")
+huHU("Alt")
+roRO("tastă\vAlt")
+ruRU("")
+trTR("Alt")
+
+T_("key\vShift")
+deDE("Umschalt")
+esES("")
+fiFI("Shift")
+huHU("Shift")
+roRO("tastă\vShift")
+ruRU("")
+trTR("Shift")
+
+T_("key\vCtrl")
+deDE("Strg")
+esES("")
+fiFI("Ctrl")
+huHU("Ctrl")
+roRO("tastă\vCtrl")
+ruRU("")
+trTR("Ctrl")
diff --git a/uppsrc/CtrlCore/CtrlCore.upp b/uppsrc/CtrlCore/CtrlCore.upp
new file mode 100644
index 000000000..9d98a96f1
--- /dev/null
+++ b/uppsrc/CtrlCore/CtrlCore.upp
@@ -0,0 +1,60 @@
+description "GUI core system";
+
+uses
+	Draw,
+	plugin\bmp;
+
+library(WIN32 !MSC8ARM) "advapi32 comdlg32 comctl32";
+
+file
+	Core readonly separator,
+	CtrlCore.h,
+	Win32Keys.i,
+	X11Keys.i,
+	MKeys.h,
+	Frame.cpp,
+	Ctrl.cpp,
+	CtrlChild.cpp,
+	CtrlPos.cpp,
+	CtrlDraw.cpp,
+	CtrlMouse.cpp,
+	CtrlKbd.cpp,
+	CtrlTimer.cpp,
+	CtrlClip.cpp,
+	LocalLoop.cpp,
+	CtrlCore.icpp,
+	Ctrl.iml,
+	CtrlCore.t,
+	TopWindow readonly separator,
+	TopWindow.h,
+	TopWindow.cpp,
+	lay.h,
+	llay.h,
+	Win32 readonly separator,
+	MultiMon.dli,
+	Win32Wnd.cpp,
+	Win32Clip.cpp,
+	Win32DnD.cpp,
+	Win32Proc.cpp,
+	TopWin32.cpp,
+	DHCtrl.cpp,
+	Win32Msg.i,
+	X11 readonly separator,
+	X11Wnd.cpp,
+	X11Proc.cpp,
+	TopWinX11.cpp,
+	X11Clip.cpp,
+	X11DnD.cpp,
+	X11ImgClip.cpp,
+	X11App.cpp,
+	X11DHCtrl.cpp,
+	X11Event.i,
+	Info readonly separator,
+	src.tpp,
+	srcdoc.tpp,
+	COPYING,
+	COPYING-PLAIN,
+	AUTHORS;
+
+mainconfig
+	"Debug" = "MSC GUI DEBUG WIN32";
diff --git a/uppsrc/CtrlCore/CtrlDraw.cpp b/uppsrc/CtrlCore/CtrlDraw.cpp
new file mode 100644
index 000000000..89326694b
--- /dev/null
+++ b/uppsrc/CtrlCore/CtrlDraw.cpp
@@ -0,0 +1,610 @@
+#include "CtrlCore.h"
+
+NAMESPACE_UPP
+
+#define LLOG(x)     // DLOG(x)
+#define LTIMING(x)  // TIMING(x)
+
+bool Ctrl::globalbackpaint;
+
+void Ctrl::RefreshFrame(const Rect& r) {
+	if(!IsOpen() || !IsVisible() || r.IsEmpty()) return;
+	LTIMING("RefreshFrame");
+	LLOG("RefreshRect " << Name() << ' ' << r);
+// 01/12/2007 - mdelfede
+// added support for windowed controls
+//	if(parent) {
+	if(!top) {
+// 01/12/2007 - END
+		if(InFrame())
+			parent->RefreshFrame(r + GetRect().TopLeft());
+		else
+			parent->Refresh(r + GetRect().TopLeft());
+	}
+	else {
+		LLOG("WndInvalidateRect: " << r << ' ' << Name());
+		LTIMING("RefreshFrame InvalidateRect");
+		WndInvalidateRect(r);
+#ifdef PLATFORM_WIN32
+		LLOG("UpdateRect: " << GetWndUpdateRect() << ' ' << Name());
+#endif
+	}
+}
+
+void Ctrl::Refresh(const Rect& area) {
+	if(fullrefresh || !IsVisible() || !IsOpen()) return;
+	LLOG("Refresh " << Name() << ' ' <<  area);
+	RefreshFrame((area + GetView().TopLeft()) & GetView().Inflated(OverPaint()));
+}
+
+void Ctrl::Refresh() {
+	if(fullrefresh || !IsVisible() || !IsOpen()) return;
+	LLOG("Refresh " << Name() << " full:" << fullrefresh);
+	Refresh(Rect(GetSize()).Inflated(OverPaint()));
+	fullrefresh = true;
+}
+
+void Ctrl::Refresh(int x, int y, int cx, int cy) {
+	Refresh(RectC(x, y, cx, cy));
+}
+
+void Ctrl::RefreshFrame(int x, int y, int cx, int cy) {
+	RefreshFrame(RectC(x, y, cx, cy));
+}
+
+void Ctrl::RefreshFrame() {
+	LLOG("RefreshFrame " << Name());
+	RefreshFrame(Rect(GetRect().Size()).Inflated(overpaint));
+}
+
+void  Ctrl::ScrollRefresh(const Rect& r, int dx, int dy)
+{
+	if(!IsOpen() || !IsVisible() || r.IsEmpty()) return;
+	int tdx = tabs(dx), tdy = tabs(dy);
+	if(dx) WndInvalidateRect(RectC(dx >= 0 ? r.left : r.right - tdx, r.top - tdy, tdx, r.Height()));
+	if(dy) WndInvalidateRect(RectC(r.left - tdx, dy >= 0 ? r.top : r.bottom - tdy, r.Width(), tdy));
+}
+
+bool Ctrl::AddScroll(const Rect& sr, int dx, int dy)
+{
+	if(!top)
+		return true;
+	for(int i = 0; i < top->scroll.GetCount(); i++) {
+		Scroll& sc = top->scroll[i];
+		if(sc.rect == sr && sgn(dx) == sgn(sc.dx) && sgn(dy) == sgn(sc.dy)) {
+			sc.dx += dx;
+			sc.dy += dy;
+			ScrollRefresh(sc.rect, sc.dx, sc.dy);
+			return false;
+		}
+		if(sc.rect.Intersects(sr)) {
+			sc.rect |= sr;
+			sc.dx = sc.dy = 0;
+			WndInvalidateRect(sc.rect);
+			return true;
+		}
+	}
+	Scroll& sc = top->scroll.Add();
+	sc.rect = sr;
+	sc.dx = dx;
+	sc.dy = dy;
+	ScrollRefresh(sc.rect, sc.dx, sc.dy);
+	return false;
+}
+
+Rect  Ctrl::GetClippedView()
+{
+	Rect sv = GetScreenView();
+	Rect view = sv;
+	Ctrl *q = parent;
+	Ctrl *w = this;
+	while(q) {
+		view &= w->InFrame() ? q->GetScreenRect() : q->GetScreenView();
+		w = q;
+		q = q->parent;
+	}
+	return view - GetScreenRect().TopLeft();
+}
+
+void  Ctrl::ScrollView(const Rect& _r, int dx, int dy)
+{
+	if(IsFullRefresh() || !IsVisible())
+		return;
+	Size vsz = GetSize();
+	dx = sgn(dx) * min(abs(dx), vsz.cx);
+	dy = sgn(dy) * min(abs(dy), vsz.cy);
+	Rect r = _r & vsz;
+	Ctrl *w = GetTopCtrl();
+	if(!w || !w->top) return;
+	Rect view = InFrame() ? GetView() : GetClippedView();
+	Rect sr = (r + view.TopLeft()) & view;
+	sr += GetScreenRect().TopLeft() - w->GetScreenRect().TopLeft();
+	if(w->AddScroll(sr, dx, dy))
+		Refresh();
+	else {
+		LTIMING("ScrollCtrls1");
+		Top *top = GetTopCtrl()->top;
+		for(Ctrl *q = GetFirstChild(); q; q = q->GetNext())
+			if(q->InView()) {
+				Rect cr = q->GetRect();
+				if(top && r.Intersects(cr)) { // Uno: Contains -> Intersetcs
+					Rect to = cr;
+					GetTopRect(to, false);
+					if(r.Intersects(cr.Offseted(-dx, -dy))) { // Uno's suggestion 06/11/26 Contains -> Intersetcs
+						Rect from = cr.Offseted(-dx, -dy);
+						GetTopRect(from, false);
+						MoveCtrl *m = FindMoveCtrlPtr(top->move, q);
+						if(m && m->from == from && m->to == to) {
+							LLOG("ScrollView Matched " << from << " -> " << to);
+							m->ctrl = NULL;
+							goto done;
+						}
+					}
+
+					if(r.Intersects(cr.Offseted(dx, dy))) { // Uno's suggestion 06/11/26 Contains -> Intersetcs
+						Rect from = to;
+						to = cr.Offseted(dx, dy);
+						GetTopRect(to, false);
+						MoveCtrl& m = top->scroll_move.Add(q);
+						m.from = from;
+						m.to = to;
+						m.ctrl = q;
+						LLOG("ScrollView Add " << UPP::Name(q) << from << " -> " << to);
+						goto done;
+					}
+					cr &= r;
+					if(!cr.IsEmpty()) {
+						Refresh(cr);
+						Refresh(cr + Point(dx, dy));
+					}
+				done:;
+				}
+			}
+	}
+}
+
+void  Ctrl::ScrollView(int x, int y, int cx, int cy, int dx, int dy) {
+	ScrollView(RectC(x, y, cx, cy), dx, dy);
+}
+
+void  Ctrl::ScrollView(int dx, int dy) {
+	ScrollView(Rect(GetSize()), dx, dy);
+}
+
+void  Ctrl::SyncScroll()
+{
+// 01/12/2007 - mdelfede
+// added support for windowed controls
+//	if(parent || !top)
+	if(!top)
+// 01/12/2007 - END
+		return;
+	Vector<Scroll> scroll = top->scroll;
+	top->scroll.Clear();
+	if(IsFullRefresh())
+		return;
+	for(int i = 0; i < scroll.GetCount(); i++) {
+		Scroll& sc = scroll[i];
+		if(abs(sc.dx) > 3 * sc.rect.Width() / 4 || abs(sc.dy) > 3 * sc.rect.Height() / 4) {
+			LLOG("Sync scroll Invalidate rect" << sc.rect);
+			WndInvalidateRect(sc.rect);
+		}
+		else
+		if(sc.dx || sc.dy) {
+			LLOG("WndScrollView " << sc.rect);
+			WndScrollView(sc.rect, sc.dx, sc.dy);
+		}
+	}
+}
+
+Rect Ctrl::GetOpaqueRect()
+{
+	return IsTransparent() ? Rect(0, 0, 0, 0) : GetSize();
+}
+
+Rect Ctrl::GetVoidRect()
+{
+	return Rect(0, 0, 0, 0);
+}
+
+
+#ifdef _DEBUG
+struct sDrawLevelCheck {
+	Draw&        w;
+	int          lvl;
+	const Ctrl  *q;
+
+	void Check() {
+		ASSERT_(lvl == w.GetCloffLevel(), "Draw::Begin/End mismatch for " + UPP::Name(q));
+	}
+
+	sDrawLevelCheck(Draw& w, const Ctrl *q) : w(w), lvl(w.GetCloffLevel()), q(q) {}
+	~sDrawLevelCheck() { Check(); }
+};
+
+#define LEVELCHECK(w, q)    sDrawLevelCheck __(w, q)
+#define DOLEVELCHECK        __.Check();
+#else
+#define LEVELCHECK(w, q)
+#define DOLEVELCHECK
+#endif
+
+void Ctrl::CtrlPaint(Draw& w, const Rect& clip) {
+	LEVELCHECK(w, this);
+	LTIMING("CtrlPaint");
+	Rect rect = GetRect().GetSize();
+	Rect orect = rect.Inflated(overpaint);
+	if(!IsShown() || orect.IsEmpty() || clip.IsEmpty() || !clip.Intersects(orect))
+		return;
+	Ctrl *q;
+	Rect view = rect;
+	for(int i = 0; i < frame.GetCount(); i++) {
+		LEVELCHECK(w, NULL);
+		frame[i].frame->FramePaint(w, view);
+		view = frame[i].view;
+	}
+	Rect oview = view.Inflated(overpaint);
+	bool hasviewctrls = false;
+	bool viewexcluded = false;
+	for(q = firstchild; q; q = q->next)
+		if(q->IsShown())
+			if(q->InFrame()) {
+				if(!viewexcluded && IsTransparent() && q->GetRect().Intersects(view)) {
+					w.Begin();
+					w.ExcludeClip(view);
+					viewexcluded = true;
+				}
+				LEVELCHECK(w, q);
+				Point off = q->GetRect().TopLeft();
+				w.Offset(off);
+				q->CtrlPaint(w, clip - off);
+				w.End();
+			}
+			else
+				hasviewctrls = true;
+	if(viewexcluded)
+		w.End();
+	DOLEVELCHECK;
+	if(!oview.IsEmpty()) {
+		if(oview.Intersects(clip) && w.IsPainting(oview)) {
+			LEVELCHECK(w, this);
+			if(overpaint) {
+				w.Clip(oview);
+				w.Offset(view.left, view.top);
+				Paint(w);
+				w.End();
+				w.End();
+			}
+			else {
+				w.Clipoff(view);
+				Paint(w);
+				w.End();
+			}
+		}
+	}
+	if(hasviewctrls && !view.IsEmpty()) {
+		Rect cl = clip & view;
+		w.Clip(cl);
+		for(q = firstchild; q; q = q->next)
+			if(q->IsShown() && q->InView()) {
+				LEVELCHECK(w, q);
+				Rect qr = q->GetRect();
+				Point off = qr.TopLeft() + view.TopLeft();
+				Rect ocl = cl - off;
+				if(ocl.Intersects(Rect(qr.GetSize()).Inflated(overpaint))) {
+					w.Offset(off);
+					q->CtrlPaint(w, cl - off);
+					w.End();
+				}
+			}
+		w.End();
+	}
+}
+
+int sShowRepaint;
+
+void Ctrl::ShowRepaint(int q)
+{
+	sShowRepaint = q;
+}
+
+void ShowRepaintRect(Draw& w, const Rect& r, Color c)
+{
+	if(sShowRepaint) {
+		w.DrawRect(r, c);
+		Draw::Flush();
+		Sleep(sShowRepaint);
+	}
+}
+
+bool Ctrl::PaintOpaqueAreas(Draw& w, const Rect& r, const Rect& clip, bool nochild)
+{
+	LTIMING("PaintOpaqueAreas");
+	if(!IsShown() || r.IsEmpty() || !r.Intersects(clip) || !w.IsPainting(r))
+		return true;
+	Point off = r.TopLeft();
+	Point viewpos = off + GetView().TopLeft();
+	if(backpaint == EXCLUDEPAINT)
+		return w.ExcludeClip(r);
+	Rect cview = clip & (GetView() + off);
+	for(Ctrl *q = lastchild; q; q = q->prev)
+		if(!q->PaintOpaqueAreas(w, q->GetRect() + (q->InView() ? viewpos : off),
+		                        q->InView() ? cview : clip))
+			return false;
+	if(nochild && (lastchild || GetNext()))
+		return true;
+	Rect opaque = (GetOpaqueRect() + viewpos) & clip;
+	if(opaque.IsEmpty())
+		return true;
+	if(backpaint == FULLBACKPAINT && !w.IsBack()) {
+		ShowRepaintRect(w, opaque, LtRed());
+		BackDraw bw;
+		bw.Create(w, opaque.GetSize());
+		bw.Offset(viewpos - opaque.TopLeft());
+		bw.SetPaintingDraw(w, opaque.TopLeft());
+		{
+			LEVELCHECK(bw, this);
+			Paint(bw);
+		}
+		bw.Put(w, opaque.TopLeft());
+	}
+	else {
+		w.Clip(opaque);
+		ShowRepaintRect(w, opaque, Green());
+		w.Offset(viewpos);
+		{
+			LEVELCHECK(w, this);
+			Paint(w);
+		}
+		w.End();
+		w.End();
+	}
+	LLOG("Exclude " << opaque);
+	return w.ExcludeClip(opaque);
+}
+
+inline int Area(const Rect& r)
+{
+	return r.GetHeight() * r.GetWidth();
+}
+
+void CombineArea(Vector<Rect>& area, const Rect& r)
+{
+	LTIMING("CombineArea");
+	if(r.IsEmpty()) return;
+	int ra = Area(r);
+	for(int i = 0; i < area.GetCount(); i++) {
+		Rect ur = r | area[i];
+		int a = Area(ur);
+		if(a < 2 * (ra + Area(area[i])) || a < 16000) {
+			area[i] = ur;
+			return;
+		}
+	}
+	area.Add(r);
+}
+
+void Ctrl::GatherTransparentAreas(Vector<Rect>& area, Draw& w, Rect r, const Rect& clip)
+{
+	LTIMING("GatherTransparentAreas");
+	Point off = r.TopLeft();
+	Point viewpos = off + GetView().TopLeft();
+	r.Inflate(overpaint);
+	Rect notr = GetVoidRect();
+	if(notr.IsEmpty())
+		notr = GetOpaqueRect();
+	notr += viewpos;
+	if(!IsShown() || r.IsEmpty() || !clip.Intersects(r) || !w.IsPainting(r))
+		return;
+	if(notr.IsEmpty())
+		CombineArea(area, r & clip);
+	else {
+		if(notr != r) {
+			CombineArea(area, clip & Rect(r.left, r.top, notr.left, r.bottom));
+			CombineArea(area, clip & Rect(notr.right, r.top, r.right, r.bottom));
+			CombineArea(area, clip & Rect(notr.left, r.top, notr.right, notr.top));
+			CombineArea(area, clip & Rect(notr.left, notr.bottom, notr.right, r.bottom));
+		}
+		for(Ctrl *q = firstchild; q; q = q->next) {
+			Point qoff = q->InView() ? viewpos : off;
+			Rect qr = q->GetRect() + qoff;
+			if(clip.Intersects(qr))
+				q->GatherTransparentAreas(area, w, qr, clip);
+		}
+	}
+}
+
+Ctrl *Ctrl::FindBestOpaque(const Rect& clip)
+{
+	Ctrl *w = NULL;
+	for(Ctrl *q = GetFirstChild(); q; q = q->GetNext()) {
+		if(q->IsVisible() && GetScreenView().Contains(q->GetScreenRect())) {
+			Rect sw = q->GetScreenView();
+			if((q->GetOpaqueRect() + sw.TopLeft()).Contains(clip)) {
+				w = q;
+				Ctrl *h = q->FindBestOpaque(clip);
+				if(h) w = h;
+			}
+			else
+			if(q->GetScreenView().Contains(clip))
+				w = q->FindBestOpaque(clip);
+			else
+			if(q->GetScreenRect().Intersects(clip))
+				w = NULL;
+		}
+	}
+	return w;
+}
+
+void Ctrl::UpdateArea0(Draw& draw, const Rect& clip, int backpaint)
+{
+	LTIMING("UpdateArea");
+	LLOG("========== UPDATE AREA " << UPP::Name(this) << " ==========");
+	if(backpaint == FULLBACKPAINT || globalbackpaint && !hasdhctrl && !dynamic_cast<DHCtrl *>(this)) {
+		ShowRepaintRect(draw, clip, LtRed());
+		BackDraw bw;
+		bw.Create(draw, clip.GetSize());
+		bw.Offset(-clip.TopLeft());
+		bw.SetPaintingDraw(draw, clip.TopLeft());
+		CtrlPaint(bw, clip);
+		bw.Put(draw, clip.TopLeft());
+		LLOG("========== END (FULLBACKPAINT)");
+		return;
+	}
+	if(backpaint == TRANSPARENTBACKPAINT) {
+		LLOG("TransparentBackpaint");
+		Vector<Rect> area;
+		GatherTransparentAreas(area, draw, GetRect().GetSize(), clip);
+		for(int i = 0; i < area.GetCount(); i++) {
+			Rect ar = area[i];
+			LLOG("Painting area: " << ar);
+			ShowRepaintRect(draw, ar, LtBlue());
+			BackDraw bw;
+			bw.Create(draw, ar.GetSize());
+			bw.Offset(-ar.TopLeft());
+			bw.SetPaintingDraw(draw, ar.TopLeft());
+			CtrlPaint(bw, ar);
+			bw.Put(draw, ar.TopLeft());
+			if(!draw.ExcludeClip(ar)) {
+				LLOG("========== END");
+				return;
+			}
+		}
+		PaintOpaqueAreas(draw, GetRect().GetSize(), clip);
+		LLOG("========== END");
+		return;
+	}
+	CtrlPaint(draw, clip);
+	LLOG("========== END");
+}
+
+void Ctrl::UpdateArea(Draw& draw, const Rect& clip)
+{
+	if(IsPanicMode())
+		return;
+	RemoveFullRefresh();
+	Point sp = GetScreenRect().TopLeft();
+	Ctrl *b = FindBestOpaque(clip + sp);
+	if(b) {
+		Point p = b->GetScreenRect().TopLeft() - sp;
+		draw.Offset(p);
+		b->UpdateArea0(draw, clip.Offseted(-p), backpaint);
+		draw.End();
+	}
+	else
+		UpdateArea0(draw, clip, backpaint);
+}
+
+void Ctrl::RemoveFullRefresh()
+{
+	fullrefresh = false;
+	for(Ctrl *q = GetFirstChild(); q; q = q->GetNext())
+		q->RemoveFullRefresh();
+}
+
+Ctrl *Ctrl::GetTopRect(Rect& r, bool inframe)
+{
+	if(!inframe) {
+		r &= Rect(GetSize());
+		r.Offset(GetView().TopLeft());
+	}
+	if(parent) {
+		r.Offset(GetRect().TopLeft());
+		return parent->GetTopRect(r, InFrame());
+	}
+	return this;
+}
+
+void  Ctrl::DoSync(Ctrl *q, Rect r, bool inframe)
+{
+	ASSERT(q);
+	LLOG("DoSync " << UPP::Name(q) << " " << r);
+	Ctrl *top = q->GetTopRect(r, inframe);
+	top->SyncScroll();
+	top->WndUpdate(r);
+}
+
+void  Ctrl::Sync()
+{
+	LLOG("Sync " << Name());
+	if(top && IsOpen()) {
+		LLOG("Sync UpdateWindow " << Name());
+		SyncScroll();
+		WndUpdate();
+	}
+	else
+	if(parent)
+		DoSync(parent, GetRect(), inframe);
+	SyncCaret();
+}
+
+void Ctrl::Sync(const Rect& sr)
+{
+	LLOG("Sync " << Name() << "   " << sr);
+	DoSync(this, sr, true);
+	SyncCaret();
+}
+
+void Ctrl::DrawCtrlWithParent(Draw& w, int x, int y)
+{
+	if(parent) {
+		Rect r = GetRect();
+		Ctrl *top = parent->GetTopRect(r, inframe);
+		w.Clip(x, y, r.Width(), r.Height());
+		w.Offset(x - r.left, y - r.top);
+		top->UpdateArea(w, r);
+		w.End();
+		w.End();
+	}
+	else
+		DrawCtrl(w, x, y);
+}
+
+void Ctrl::DrawCtrl(Draw& w, int x, int y)
+{
+	w.Offset(x, y);
+	UpdateArea(w, GetRect().GetSize());
+	w.End();
+}
+
+void Ctrl::SyncMoves()
+{
+	if(!top)
+		return;
+	for(int i = 0; i < top->move.GetCount(); i++) {
+		MoveCtrl& m = top->move[i];
+		if(m.ctrl) {
+			RefreshFrame(m.from);
+			RefreshFrame(m.to);
+		}
+	}
+	for(int i = 0; i < top->scroll_move.GetCount(); i++) {
+		MoveCtrl& s = top->scroll_move[i];
+		if(s.ctrl) {
+			RefreshFrame(s.from);
+			RefreshFrame(s.to);
+		}
+	}
+	top->move.Clear();
+	top->scroll_move.Clear();
+}
+
+Ctrl& Ctrl::BackPaintHint()
+{
+	if(IsDecentMachine())
+		BackPaint();
+	return *this;
+}
+
+void  Ctrl::GlobalBackPaint(bool b)
+{
+	globalbackpaint = b;
+}
+
+void  Ctrl::GlobalBackPaintHint()
+{
+	if(IsDecentMachine())
+		GlobalBackPaint();
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/CtrlCore/CtrlKbd.cpp b/uppsrc/CtrlCore/CtrlKbd.cpp
new file mode 100644
index 000000000..6df5b6888
--- /dev/null
+++ b/uppsrc/CtrlCore/CtrlKbd.cpp
@@ -0,0 +1,384 @@
+#include "CtrlCore.h"
+
+NAMESPACE_UPP
+
+#define LLOG(x)   //LOG(x)
+
+Ptr<Ctrl> Ctrl::focusCtrl;
+Ptr<Ctrl> Ctrl::focusCtrlWnd;
+Ptr<Ctrl> Ctrl::lastActiveWnd;
+Ptr<Ctrl> Ctrl::caretCtrl;
+Rect      Ctrl::caretRect;
+bool      Ctrl::ignorekeyup;
+
+Ptr<Ctrl>           Ctrl::defferedSetFocus;
+Vector< Ptr<Ctrl> > Ctrl::defferedChildLostFocus;
+
+
+#ifdef flagSO
+Ptr<Ctrl> Ctrl::FocusCtrl() { return focusCtrl; }
+void Ctrl::FocusCtrl(Ptr<Ctrl> fc) { focusCtrl = fc; }
+#endif
+
+static bool s_hotkey;
+
+void Ctrl::RefreshAccessKeys()
+{
+	if(GetAccessKeys())
+		Refresh();
+	for(Ctrl *ctrl = GetFirstChild(); ctrl; ctrl = ctrl->GetNext())
+		ctrl->RefreshAccessKeys();
+}
+
+void Ctrl::RefreshAccessKeysDo(bool vis)
+{
+	if(GUI_AltAccessKeys() && vis != akv) {
+		akv = vis;
+		RefreshAccessKeys();
+	}
+}
+
+bool Ctrl::DispatchKey(dword keycode, int count)
+{
+	if(GUI_AltAccessKeys()) {
+		bool alt = GetAlt();
+		Ctrl *c = GetActiveCtrl();
+		if(c)
+			c->RefreshAccessKeysDo(alt);
+	}
+//	RLOGBLOCK("Ctrl::DispatchKey");
+//	RLOG("DispatchKey: focusCtrl = " << FormatIntHex((int)~focusCtrl) << ", wnd = " << FormatIntHex((int)~focusCtrlWnd) << ")");
+	LLOG("DispatchKey " << keycode << " (0x" << Sprintf("%08x", keycode)
+		<< ", " << GetKeyDesc(keycode) << "), count:" << count
+		<< " focusCtrl:" << UPP::Name(focusCtrl) << " focusCtrlWnd:" << UPP::Name(focusCtrlWnd));
+	if((keycode & K_KEYUP) && ignorekeyup)
+	{
+		ignorekeyup = false;
+		return true;
+	}
+	for(int i = 0; i < keyhook().GetCount(); i++)
+		if((*keyhook()[i])(focusCtrl, keycode, count))
+			return true;
+	dword k = keycode;
+	word l = LOWORD(keycode);
+	if(!(k & K_DELTA) && l >= 32 && l != 127 && GetDefaultCharset() != CHARSET_UNICODE)
+		k = MAKELONG((word)FromUnicode(l, CHARSET_DEFAULT), HIWORD(keycode));
+	if(!focusCtrl)
+		return false;
+	Ptr<Ctrl> p = focusCtrl;
+	if(IsUsrLog()) {
+		String kl;
+		dword k = keycode;
+		int l = 0;
+		if(k < 65536) {
+			kl << "CHAR \'" << ToUtf8((wchar)keycode) << "\' (" << keycode << ')';
+			l = 2;
+		}
+		else {
+			kl << "KEY";
+			if(k & K_KEYUP) {
+				kl << "UP";
+				k &= ~K_KEYUP;
+				l = 2;
+			}
+			kl << " " << GetKeyDesc(k);
+		}
+		UsrLogT(l, kl);
+	}
+	for(;;) {
+		LLOG("Trying to DispatchKey: p = " << Desc(p));
+		if(p->IsEnabled() && p->Key(p->unicode ? keycode : k, count))
+		{
+			LLOG("Ctrl::DispatchKey(" << FormatIntHex(keycode) << ", " << GetKeyDesc(keycode)
+				<< "): eaten in " << Desc(p));
+			if(IsUsrLog())
+				UsrLogT(2, String().Cat() << "-> " << Desc(p));
+			eventCtrl = focusCtrl;
+			return true;
+		}
+		s_hotkey = true;
+		if(!p->GetParent()) {
+			if(p->HotKey(keycode)) {
+				eventCtrl = focusCtrl;
+				return true;
+			}
+			return false;
+		}
+		p = p->GetParent();
+	}
+
+	UsrLogT(2, "key was ignored");
+
+	return false;
+}
+
+bool Ctrl::HotKey(dword key)
+{
+	if(!IsEnabled() || !IsVisible()) return false;
+	for(Ptr<Ctrl> ctrl = firstchild; ctrl; ctrl = ctrl->next)
+	{
+		if(ctrl->IsOpen() && ctrl->IsVisible() && ctrl->IsEnabled() && ctrl->HotKey(key))
+		{
+			if(IsUsrLog() && s_hotkey) {
+				UsrLogT(2, String().Cat() << "HOT-> " << UPP::Name(ctrl));
+				s_hotkey = false;
+			}
+			return true;
+		}
+	}
+	return false;
+}
+
+void Ctrl::DoDeactivate(Ptr<Ctrl> pfocusCtrl, Ptr<Ctrl> nfocusCtrl)
+{
+	if(pfocusCtrl) {
+		Ctrl *ptop = pfocusCtrl->GetTopCtrl();
+		Ctrl *ntop = nfocusCtrl ? nfocusCtrl->GetTopCtrl() : NULL;
+		LLOG("DoDeactivate " << UPP::Name(ptop) << " in favor of " << UPP::Name(ntop));
+		if(ntop != ptop && !ptop->destroying) {
+			ptop->Deactivate();
+			ptop->StateH(DEACTIVATE);
+			ptop->RefreshAccessKeysDo(false);
+		}
+	}
+}
+
+void Ctrl::DoKillFocus(Ptr<Ctrl> pfocusCtrl, Ptr<Ctrl> nfocusCtrl)
+{
+	if(pfocusCtrl && !pfocusCtrl->destroying) {
+		pfocusCtrl->StateH(FOCUS);
+		LLOG("LostFocus: " << Desc(pfocusCtrl));
+		pfocusCtrl->LostFocus();
+	}
+	if(pfocusCtrl && pfocusCtrl->parent && !pfocusCtrl->parent->destroying)
+		pfocusCtrl->parent->ChildLostFocus();
+	SyncCaret();
+}
+
+void Ctrl::DoSetFocus(Ptr<Ctrl> pfocusCtrl, Ptr<Ctrl> nfocusCtrl, bool activate)
+{
+	if(activate && focusCtrl == nfocusCtrl && nfocusCtrl) {
+		Ctrl *top = nfocusCtrl->GetTopCtrl();
+		if((!pfocusCtrl || pfocusCtrl->GetTopCtrl() != top) && !top->destroying) {
+			top->StateH(ACTIVATE);
+			top->Activate();
+			top->RefreshAccessKeysDo(top->VisibleAccessKeys());
+		}
+	}
+
+	if(focusCtrl == nfocusCtrl && nfocusCtrl && !nfocusCtrl->destroying) {
+		nfocusCtrl->GotFocus();
+		nfocusCtrl->StateH(FOCUS);
+	}
+	if(focusCtrl == nfocusCtrl && nfocusCtrl && nfocusCtrl->parent &&
+	   !nfocusCtrl->parent->destroying)
+		nfocusCtrl->parent->ChildGotFocus();
+	SyncCaret();
+}
+
+bool Ctrl::SetFocus0(bool activate)
+{
+	if(IsUsrLog())
+		UsrLogT(6, String().Cat() << "SETFOCUS " << Desc(this));
+	LLOG("Ctrl::SetFocus " << Desc(this));
+	LLOG("focusCtrlWnd " << UPP::Name(focusCtrlWnd));
+	LLOG("Ctrl::SetFocus0 -> deferredSetFocus = NULL; was: " << UPP::Name(defferedSetFocus));
+	defferedSetFocus = NULL;
+	if(focusCtrl == this) return true;
+	if(!IsOpen() || !IsEnabled() || !IsVisible()) return false;
+	Ptr<Ctrl> pfocusCtrl = focusCtrl;
+	Ptr<Ctrl> topwindow = GetTopWindow();
+	Ptr<Ctrl> topctrl = GetTopCtrl();
+	Ptr<Ctrl> _this = this;
+	if(!topwindow) topwindow = topctrl;
+	LLOG("SetFocus -> SetWndFocus: topwindow = " << UPP::Name(topwindow) << ", focusCtrlWnd = " << UPP::Name(focusCtrlWnd));
+	if(!topwindow->HasWndFocus() && !topwindow->SetWndFocus()) return false;// cxl 31.1.2004
+	topwindow->SetWndForeground(); // cxl 2007-4-27
+	LLOG("SetFocus -> focusCtrl = this: " << FormatIntHex(this) << ", _this = " << FormatIntHex(~_this) << ", " << UPP::Name(_this));
+	focusCtrl = _this;
+	focusCtrlWnd = topwindow;
+	DoKillFocus(pfocusCtrl, _this);
+	LLOG("SetFocus 2");
+	DoDeactivate(pfocusCtrl, _this);
+	DoSetFocus(pfocusCtrl, _this, activate);
+	if(topwindow)
+		lastActiveWnd = topwindow;
+	return true;
+}
+
+bool Ctrl::SetFocus()
+{
+	LLOG("Ctrl::SetFocus(" << Name() << ")");
+	return SetFocus0(true);
+}
+
+void Ctrl::ActivateWnd()
+{
+	// notification, don't set physical focus here
+	LLOG("ActivateWnd " << Name());
+	Ptr<Ctrl> nfocusCtrl = this;
+	Ptr<Ctrl> pfocusCtrl = focusCtrl;
+	LLOG("About to set focus: " << UPP::Name(nfocusCtrl));
+	DoDeactivate(pfocusCtrl, nfocusCtrl);
+	focusCtrl = nfocusCtrl;
+	focusCtrlWnd = this;
+	DoKillFocus(pfocusCtrl, nfocusCtrl);
+	DoSetFocus(pfocusCtrl, nfocusCtrl, true);
+	LLOG("Focus: " << UPP::Name(focusCtrl) << " FocusWnd:" << UPP::Name(focusCtrlWnd));
+}
+
+void Ctrl::SetFocusWnd()
+{
+	// notification, don't set physical focus here
+	LLOG("Ctrl::SetFocusWnd");
+	if(focusCtrlWnd != this) {
+		LLOG("Ctrl::SetFocusWnd->ActivateWnd");
+		ActivateWnd();
+	}
+}
+
+void Ctrl::KillFocusWnd()
+{
+	// notification, don't set physical focus here
+	LLOG("KillFocusWnd " << Name());
+	if(this == ~focusCtrlWnd) {
+		Ptr<Ctrl> pfocusCtrl = focusCtrl;
+		DoDeactivate(pfocusCtrl, NULL);
+		focusCtrl = focusCtrlWnd = NULL;
+		DoKillFocus(pfocusCtrl, NULL);
+	}
+}
+
+void Ctrl::ClickActivateWnd()
+{
+	LLOG("Ctrl::ClickActivateWnd");
+	if(this == ~focusCtrlWnd && focusCtrl && focusCtrl->GetTopCtrl() != this) {
+		LLOG("Ctrl::ClickActivateWnd -> ActivateWnd");
+		ActivateWnd();
+	}
+}
+
+void Ctrl::DefferedFocusSync()
+{
+	while(defferedChildLostFocus.GetCount() || defferedSetFocus) {
+		LLOG("Ctrl::DeferredFocusSync, defferedSetFocus = " << UPP::Name(defferedSetFocus));
+		Vector< Ptr<Ctrl> > b = defferedChildLostFocus;
+		defferedChildLostFocus.Clear();
+		for(int i = 0; i < b.GetCount(); i++)
+			if(b[i]) {
+				LLOG("Ctrl::DeferredFocusSync -> ChildLostFocus " << UPP::Name(b[i]));
+				b[i]->ChildLostFocus();
+			}
+		if(defferedSetFocus) {
+			LLOG("Ctrl::DeferredFocusSync -> SetFocus " << UPP::Name(defferedSetFocus));
+			defferedSetFocus->SetFocus();
+		}
+		defferedSetFocus = NULL;
+		SyncCaret();
+	}
+}
+
+void Ctrl::SyncCaret() {
+	Rect cr;
+	cr.Clear();
+	if(focusCtrl && focusCtrl->IsVisible()) {
+		bool inframe = focusCtrl->InFrame();
+		cr = focusCtrl->GetScreenView();
+		cr = RectC(focusCtrl->caretx + cr.left, focusCtrl->carety + cr.top,
+				   focusCtrl->caretcx, focusCtrl->caretcy) & cr;
+		for(Ctrl *q = focusCtrl->GetParent(); q; q = q->GetParent()) {
+			cr &= inframe ? q->GetScreenRect() : q->GetScreenView();
+			inframe = q->InFrame();
+		}
+	}
+	if(focusCtrl != caretCtrl || cr != caretRect) {
+		LLOG("Do SyncCaret focusCtrl: " << UPP::Name(focusCtrl)
+		     << ", caretCtrl: " << UPP::Name(caretCtrl)
+		     << ", cr: " << cr);
+		WndDestroyCaret();
+		if(focusCtrl && !cr.IsEmpty())
+			focusCtrl->GetTopCtrl()->WndCreateCaret(cr);
+		caretCtrl = focusCtrl;
+		caretRect = cr;
+	}
+}
+
+Ctrl *Ctrl::GetActiveWindow()
+{
+	Ctrl *q = GetActiveCtrl();
+	return q ? q->GetTopWindow() : NULL;
+}
+
+bool  Ctrl::HasFocusDeep() const
+{
+	if(HasFocus() || HasChildDeep(FocusCtrl())) return true;
+	Ctrl *a = GetActiveCtrl();
+	if(!a || !a->IsPopUp()) return false;
+	a = a->GetOwnerCtrl();
+	return a && HasChildDeep(a);
+}
+
+String GetKeyDesc(dword key)
+{
+	String desc;
+//	key &= 0xFFFF;
+
+	if(key == 0)
+		return desc;
+
+	if(key & K_CTRL)  desc << t_("key\vCtrl+");
+	if(key & K_ALT)   desc << t_("key\vAlt+");
+	if(key & K_SHIFT) desc << t_("key\vShift+");
+
+
+	key &= ~(K_CTRL | K_ALT | K_SHIFT);
+	if(key < K_DELTA && key > 32 && key != K_DELETE)
+		return desc + String(key, 1);
+	if(key >= K_NUMPAD0 && key <= K_NUMPAD9)
+		desc << "Num " << (char)(key - K_NUMPAD0 + '0');
+	else if(key >= K_0 && key <= K_9)
+		desc << (char)('0' + key - K_0);
+	else if(key >= K_A && key <= K_Z)
+		desc << (char)('A' + key - K_A);
+	else if(key >= K_F1 && key <= K_F12)
+		desc << Format("F%d", (int)key - K_F1 + 1);
+	else {
+		static struct {
+			dword key;
+			const char *name;
+		} nkey[] = {
+			{ K_TAB, tt_("key\vTab") }, { K_SPACE, tt_("key\vSpace") },
+			{ K_RETURN, tt_("key\vEnter") }, { K_BACKSPACE, tt_("key\vBackspace") },
+			{ K_CAPSLOCK, tt_("key\vCaps Lock") }, { K_ESCAPE, tt_("key\vEsc") },
+			{ K_PAGEUP, tt_("key\vPage Up") }, { K_PAGEDOWN, tt_("key\vPage Down") },
+			{ K_END, tt_("key\vEnd") }, { K_HOME, tt_("key\vHome") },
+			{ K_LEFT, tt_("key\vLeft") }, { K_UP, tt_("key\vUp") },
+			{ K_RIGHT, tt_("key\vRight") }, { K_DOWN, tt_("key\vDown") },
+			{ K_INSERT, tt_("key\vInsert") }, { K_DELETE, tt_("key\vDelete") },{ K_BREAK, tt_("key\vBreak") },
+			{ K_MULTIPLY, tt_("key\vNum[*]") }, { K_ADD, tt_("key\vNum[+]") }, { K_SUBTRACT, tt_("key\vNum[-]") }, { K_DIVIDE, tt_("key\vNum[/]") },
+			{ K_ALT_KEY, tt_("key\vAlt") }, { K_SHIFT_KEY, tt_("key\vShift") }, { K_CTRL_KEY, tt_("key\vCtrl") },
+		#ifdef PLATFORM_X11
+			{ 0x10060, "[`]" }, { 0x1002d, "[-]" }, { 0x1003d, "[=]" }, { 0x1005c, "[\\]" },
+			{ 0x1005b, "[[]" }, { 0x1005d, "[]]" },
+			{ 0x1003b, "[;]" }, { 0x10027, "[']" },
+			{ 0x1002c, "[,]" }, { 0x1002e, "[.]" }, { 0x1005f, "[/]" },
+		#endif
+		#ifdef PLATFORM_WIN32
+			{ 0x100c0, "[`]" }, { 0x100bd, "[-]" }, { 0x100bb, "[=]" }, { 0x100dc, "[\\]" },
+			{ 0x100db, "[[]" }, { 0x100dd, "[]]" },
+			{ 0x100ba, "[;]" }, { 0x100de, "[']" },
+			{ 0x100bc, "[,]" }, { 0x100be, "[.]" }, { 0x100bf, "[/]" },
+		#endif
+			{ 0, NULL }
+		};
+		for(int i = 0; nkey[i].key; i++)
+			if(nkey[i].key == key) {
+				desc << GetLngString(nkey[i].name);
+				return desc;
+			}
+		desc << Format("%04x", (int)key);
+	}
+	return desc;
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/CtrlCore/CtrlMouse.cpp b/uppsrc/CtrlCore/CtrlMouse.cpp
new file mode 100644
index 000000000..f793a86e3
--- /dev/null
+++ b/uppsrc/CtrlCore/CtrlMouse.cpp
@@ -0,0 +1,625 @@
+#include "CtrlCore.h"
+
+NAMESPACE_UPP
+
+#define LLOG(x)   // LOG(x)
+
+Ptr<Ctrl> Ctrl::eventCtrl;
+Ptr<Ctrl> Ctrl::mouseCtrl;
+Ptr<Ctrl> Ctrl::captureCtrl;
+Ptr<Ctrl> Ctrl::repeatTopCtrl;
+Point     Ctrl::repeatMousePos;
+bool      Ctrl::ignoreclick;
+bool      Ctrl::mouseinframe;
+bool      Ctrl::mouseinview;
+Point     Ctrl::mousepos;
+Point     Ctrl::leftmousepos = Null;
+Point     Ctrl::rightmousepos = Null;
+Point     Ctrl::middlemousepos = Null;
+
+dword GetMouseFlags() {
+	dword style = 0;
+	if(GetAlt()) style |= K_ALT;
+	if(GetCtrl()) style |= K_CTRL;
+	if(GetShift()) style |= K_SHIFT;
+	if(GetMouseLeft()) style |= K_MOUSELEFT;
+	if(GetMouseRight()) style |= K_MOUSERIGHT;
+	if(GetMouseMiddle()) style |= K_MOUSEMIDDLE;
+	return style;
+}
+
+void Ctrl::LogMouseEvent(const char *f, const Ctrl *ctrl, int event, Point p, int zdelta, dword keyflags)
+{
+	if(!IsUsrLog())
+		return;
+	String txt = f;
+	txt += (event & BUTTON) == RIGHT ? "RIGHT" : (event & BUTTON) == MIDDLE ? "MIDDLE" : "LEFT";
+	switch(event & ACTION) {
+	case DOWN:        txt << "DOWN"; break;
+	case UP:          txt << "UP"; break;
+	case DOUBLE:      txt << "DOUBLE"; break;
+	case MOUSEWHEEL:  txt << "WHEEL"; break;
+	default:
+		return;
+	}
+	txt << ' ' << p << " (";
+	if(keyflags & K_ALT)
+		txt << " ALT";
+	if(keyflags & K_CTRL)
+		txt << " CTRL";
+	if(keyflags & K_SHIFT)
+		txt << " SHIFT";
+	if(keyflags & K_MOUSELEFT)
+		txt << " LEFT";
+	if(keyflags & K_MOUSERIGHT)
+		txt << " RIGHT";
+	if(keyflags & K_MOUSEMIDDLE)
+		txt << " MIDDLE";
+	txt << " ) " << Desc(ctrl);
+	UsrLogT(txt);
+}
+
+Image Ctrl::FrameMouseEventH(int event, Point p, int zdelta, dword keyflags)
+{
+	for(int i = 0; i < mousehook().GetCount(); i++)
+		if((*mousehook()[i])(this, true, event, p, zdelta, keyflags))
+			return Image::Arrow();
+	LogMouseEvent("FRAME ", this, event, p, zdelta, keyflags);
+	eventCtrl = this;
+	if(parent)
+		parent->ChildFrameMouseEvent(this, event, p, zdelta, keyflags);
+	return FrameMouseEvent(event, p, zdelta, keyflags);
+}
+
+Image Ctrl::FrameMouseEvent(int event, Point p, int zdelta, dword keyflags)
+{
+	return Image::Arrow();
+}
+
+Image Ctrl::MouseEventH(int event, Point p, int zdelta, dword keyflags)
+{
+	for(int i = 0; i < mousehook().GetCount(); i++)
+		if((*mousehook()[i])(this, false, event, p, zdelta, keyflags))
+			return Image::Arrow();
+	LogMouseEvent(NULL, this, event, p, zdelta, keyflags);
+	if(parent)
+		parent->ChildMouseEvent(this, event, p, zdelta, keyflags);
+	return MouseEvent(event, p, zdelta, keyflags);
+}
+
+void Ctrl::ChildFrameMouseEvent(Ctrl *child, int event, Point p, int zdelta, dword keyflags)
+{
+	if(parent)
+		parent->ChildFrameMouseEvent(child, event, p, zdelta, keyflags);
+}
+
+void Ctrl::ChildMouseEvent(Ctrl *child, int event, Point p, int zdelta, dword keyflags)
+{
+	if(parent)
+		parent->ChildMouseEvent(child, event, p, zdelta, keyflags);
+}
+
+Image Ctrl::MouseEvent(int event, Point p, int zdelta, dword keyflags)
+{
+	LLOG("MouseEvent " << UPP::Name(this) << " " << FormatIntHex(event));
+	switch(event) {
+	case MOUSEENTER:
+		MouseEnter(p, keyflags);
+		break;
+	case MOUSEMOVE:
+		MouseMove(p, keyflags);
+		break;
+	case LEFTDOWN:
+		LeftDown(p, keyflags);
+		break;
+	case LEFTDOUBLE:
+		LeftDouble(p, keyflags);
+		break;
+	case LEFTDRAG:
+		LeftDrag(p, keyflags);
+		break;
+	case LEFTHOLD:
+		LeftHold(p, keyflags);
+		break;
+	case LEFTTRIPLE:
+		LeftTriple(p, keyflags);
+		break;
+	case LEFTREPEAT:
+		LeftRepeat(p, keyflags);
+		break;
+	case LEFTUP:
+		LeftUp(p, keyflags);
+		break;
+	case RIGHTDRAG:
+		RightDrag(p, keyflags);
+		break;
+	case RIGHTHOLD:
+		RightHold(p, keyflags);
+		break;
+	case RIGHTTRIPLE:
+		RightTriple(p, keyflags);
+		break;
+	case RIGHTDOWN:
+		RightDown(p, keyflags);
+		break;
+	case RIGHTDOUBLE:
+		RightDouble(p, keyflags);
+		break;
+	case RIGHTREPEAT:
+		RightRepeat(p, keyflags);
+		break;
+	case RIGHTUP:
+		RightUp(p, keyflags);
+		break;
+	case MIDDLEDRAG:
+		MiddleDrag(p, keyflags);
+		break;
+	case MIDDLEHOLD:
+		MiddleHold(p, keyflags);
+		break;
+	case MIDDLETRIPLE:
+		MiddleTriple(p, keyflags);
+		break;
+	case MIDDLEDOWN:
+		MiddleDown(p, keyflags);
+		break;
+	case MIDDLEDOUBLE:
+		MiddleDouble(p, keyflags);
+		break;
+	case MIDDLEREPEAT:
+		MiddleRepeat(p, keyflags);
+		break;
+	case MIDDLEUP:
+		MiddleUp(p, keyflags);
+		break;
+	case MOUSELEAVE:
+		MouseLeave();
+		break;
+	case MOUSEWHEEL:
+		MouseWheel(p, zdelta, keyflags);
+		break;
+	case CURSORIMAGE:
+		return CursorImage(p, keyflags);
+	}
+	return Image::Arrow();
+}
+
+Image Ctrl::CursorImage(Point p, dword keyflags)
+{
+	return Image::Arrow();
+}
+
+void Ctrl::IgnoreMouseClick()
+{
+	LLOG("IgnoreMouseClick");
+	ignoreclick = true;
+	KillRepeat();
+}
+
+void Ctrl::IgnoreMouseUp()
+{
+	LLOG("Ctrl::IgnoreMouseUp");
+	if(GetMouseLeft() || GetMouseRight() || GetMouseMiddle())
+		IgnoreMouseClick();
+}
+
+void Ctrl::EndIgnore()
+{
+	LLOG("Ctrl::EndIgnore");
+	if(GetMouseLeft() || GetMouseRight() || GetMouseMiddle()) return;
+	KillRepeat();
+	ignoreclick = false;
+}
+
+bool Ctrl::IsMouseActive() const
+{
+	return IsVisible() && IsEnabled() && IsOpen() && !ignoremouse;
+}
+
+Ctrl *Ctrl::ChildFromPoint(Point& pt) const
+{
+	Ctrl *q;
+	Point p = pt;
+	Rect rect = GetRect();
+	Rect view = GetView();
+	if(view.Contains(p)) {
+		Point vp = p - view.TopLeft();
+		for(q = GetLastChild(); q; q = q->prev) {
+			if(q->InView() && q->IsMouseActive()) {
+				Rect r = q->GetRect();
+				if(r.Contains(vp)) {
+					pt = vp - r.TopLeft();
+					return q;
+				}
+			}
+		}
+		return NULL;
+	}
+	for(q = GetLastChild(); q; q = q->prev) {
+		if(q->InFrame() && q->IsMouseActive()) {
+			Rect r = q->GetRect();
+			if(r.Contains(p)) {
+				pt = p - r.TopLeft();
+				return q;
+			}
+		}
+	}
+	return NULL;
+}
+
+Image Ctrl::MEvent0(int e, Point p, int zd)
+{
+	LLOG("MEvent0 " << Name() << " event: " << FormatIntHex(e, 0) << " point:" << p);
+	Ptr<Ctrl> _this = this;
+	mousepos = p;
+	dword mm = 0;
+	if((e & ACTION) == DOUBLE)
+		mm |= K_MOUSEDOUBLE;
+	if((e & ACTION) == TRIPLE)
+		mm |= K_MOUSETRIPLE;
+	Rect view = GetView();
+	if(mouseCtrl != this) {
+		if(mouseCtrl) {
+			Ptr<Ctrl> mousectrl = mouseCtrl;
+			mousectrl->MouseEventH(MOUSELEAVE, Point(0, 0), zd, GetMouseFlags() | mm);
+			if(mousectrl)
+				mousectrl->FrameMouseEventH(MOUSELEAVE, Point(0, 0), zd, GetMouseFlags() | mm);
+		}
+		mouseinframe = mouseinview = false;
+		if(_this) {
+			mouseCtrl = _this;
+			mouseinframe = true;
+			FrameMouseEventH(MOUSEENTER, p, zd, GetMouseFlags() | mm);
+		}
+	}
+	bool inview = view.Contains(p);
+	if(inview != mouseinview && _this) {
+		mouseinview = inview;
+		MouseEventH(inview ? MOUSEENTER : MOUSELEAVE, p, zd, GetMouseFlags() | mm);
+	}
+	if(_this)
+		if(view.Contains(p) || HasCapture()) {
+			p -= view.TopLeft();
+			return MouseEventH(e, p, zd, GetMouseFlags() | mm);
+		}
+		else
+			return FrameMouseEventH(e, p, zd, GetMouseFlags() | mm);
+	return Image::Arrow();
+}
+
+void    Ctrl::LRepeat() {
+	if(repeatTopCtrl && repeatTopCtrl->HasFocusDeep() && GetMouseLeft()) // 4.7.2004 cxl, IsForeground...
+		repeatTopCtrl->DispatchMouseEvent(LEFTREPEAT, repeatMousePos, 0);
+	else
+		KillRepeat();
+	LLOG("LRepeat " << UPP::Name(mouseCtrl));
+}
+
+static int sDistMax(Point a, Point b)
+{
+	return IsNull(a) ? INT_MAX : max(abs(a.x - b.x), abs(a.y - b.y));
+}
+
+static int sDistMin(Point a, Point b)
+{
+	return IsNull(a) ? -1 : max(abs(a.x - b.x), abs(a.y - b.y));
+}
+
+void    Ctrl::LRep() {
+	LLOG("LRep");
+	UPP::SetTimeCallback(-GetKbdSpeed(), callback(&Ctrl::LRepeat), &mousepos);
+}
+
+void    Ctrl::LHold() {
+	if(sDistMax(leftmousepos, mousepos) < GUI_DragDistance() && repeatTopCtrl && GetMouseLeft())
+		repeatTopCtrl->DispatchMouseEvent(LEFTHOLD, repeatMousePos, 0);
+}
+
+void    Ctrl::RRepeat() {
+	if(repeatTopCtrl && repeatTopCtrl->IsForeground() && GetMouseRight())
+		repeatTopCtrl->DispatchMouseEvent(RIGHTREPEAT, repeatMousePos, 0);
+	else
+		KillRepeat();
+}
+
+void    Ctrl::RRep() {
+	UPP::SetTimeCallback(-GetKbdSpeed(), callback(&Ctrl::RRepeat), &mousepos);
+}
+
+void    Ctrl::RHold() {
+	if(sDistMax(rightmousepos, mousepos) < GUI_DragDistance() && repeatTopCtrl && GetMouseRight())
+		repeatTopCtrl->DispatchMouseEvent(RIGHTHOLD, repeatMousePos, 0);
+}
+
+void    Ctrl::MRepeat() {
+	if(repeatTopCtrl && repeatTopCtrl->IsForeground() && GetMouseMiddle())
+		repeatTopCtrl->DispatchMouseEvent(MIDDLEREPEAT, repeatMousePos, 0);
+	else
+		KillRepeat();
+}
+
+void    Ctrl::MRep() {
+	UPP::SetTimeCallback(-GetKbdSpeed(), callback(&Ctrl::MRepeat), &mousepos);
+}
+
+void    Ctrl::MHold() {
+	if(sDistMax(middlemousepos, mousepos) < GUI_DragDistance() && repeatTopCtrl && GetMouseMiddle())
+		repeatTopCtrl->DispatchMouseEvent(MIDDLEHOLD, repeatMousePos, 0);
+}
+
+void    Ctrl::KillRepeat() {
+	LLOG("Ctrl::KillRepeat");
+	UPP::KillTimeCallback(&mousepos);
+	repeatTopCtrl = NULL;
+	leftmousepos = Null;
+	rightmousepos = Null;
+	middlemousepos = Null;
+}
+
+bool    Ctrl::HasMouse() const
+{
+	return mouseCtrl == this;
+}
+
+bool    Ctrl::HasMouseDeep() const
+{
+	return mouseCtrl == this || HasChildDeep(mouseCtrl);
+}
+
+Ctrl   *Ctrl::GetMouseCtrl()
+{
+	return mouseCtrl;
+}
+
+bool    Ctrl::HasMouseInFrame(const Rect& r)
+{
+	if(!HasMouse())
+		return false;
+	Rect q = GetVisibleScreenRect();
+	q = r.Offseted(q.TopLeft()) & q;
+	return q.Contains(GetMousePos());
+}
+
+bool    Ctrl::HasMouseIn(const Rect& r) const
+{
+	if(!HasMouse())
+		return false;
+	Rect q = GetVisibleScreenView();
+	q = r.Offseted(q.TopLeft()) & q;
+	return q.Contains(GetMousePos());
+}
+
+Point Ctrl::GetMouseViewPos() const
+{
+	return GetMousePos() - GetVisibleScreenView().TopLeft();
+}
+
+void    Ctrl::DoCursorShape() {
+	Image m = CursorOverride();
+	if(IsNull(m))
+		if(mouseCtrl)
+			SetMouseCursor(mouseCtrl->MEvent0(CURSORIMAGE, mousepos, 0));
+		else
+			SetMouseCursor(Image::Arrow());
+	else
+		SetMouseCursor(m);
+}
+
+void    Ctrl::CheckMouseCtrl() {
+	Point p = GetMousePos();
+	if(mouseCtrl) {
+		Rect r = mouseCtrl->GetScreenRect();
+		LLOG("CheckMouseCtrl mouseCtrl " << UPP::Name(mouseCtrl) << " " << r);
+		if(!mouseCtrl->HasCapture() && !r.Contains(p)) {
+			Ptr<Ctrl> mousectrl = mouseCtrl;
+			if(mouseinview)
+				mousectrl->MouseEventH(MOUSELEAVE, p - mousectrl->GetScreenView().TopLeft(),
+				                       0, GetMouseFlags());
+			if(mouseinframe && mousectrl)
+				mousectrl->FrameMouseEventH(MOUSELEAVE, p - r.TopLeft(),
+				                            0, GetMouseFlags());
+			mouseinview = mouseinframe = false;
+			mouseCtrl = NULL;
+			leftmousepos = rightmousepos = middlemousepos = Null;
+			KillRepeat();
+		}
+	}
+	DoCursorShape();
+}
+
+Point leftdblpos = Null, rightdblpos = Null, middledblpos = Null;
+int leftdbltime = Null, rightdbltime = Null, middledbltime = Null;
+
+bool sDblTime(int time)
+{
+	return !IsNull(time) && (int)GetTickCount() - time < GUI_DblClickTime();
+}
+
+Image Ctrl::DispatchMouse(int e, Point p, int zd) {
+	if(e == MOUSEMOVE) {
+		if(sDistMin(leftmousepos, p) > GUI_DragDistance() && repeatTopCtrl == this) {
+			DispatchMouseEvent(LEFTDRAG, leftmousepos, 0);
+			leftmousepos = Null;
+		}
+		if(sDistMin(rightmousepos, p) > GUI_DragDistance() && repeatTopCtrl == this) {
+			DispatchMouseEvent(RIGHTDRAG, rightmousepos, 0);
+			rightmousepos = Null;
+		}
+		if(sDistMin(middlemousepos, p) > GUI_DragDistance() && repeatTopCtrl == this) {
+			DispatchMouseEvent(MIDDLEDRAG, middlemousepos, 0);
+			middlemousepos = Null;
+		}
+	}
+	repeatMousePos = p;
+	if(e == LEFTDOUBLE) {
+		leftdbltime = GetTickCount();
+		leftdblpos = p;
+	}
+	if(e == RIGHTDOUBLE) {
+		rightdbltime = GetTickCount();
+		rightdblpos = p;
+	}
+	if(e == MIDDLEDOUBLE) {
+		middledbltime = GetTickCount();
+		middledblpos = p;
+	}
+	if(e == LEFTDOWN) {
+		LLOG("Ctrl::DispatchMouse: init left repeat for " << UPP::Name(this) << " at " << p);
+		UPP::SetTimeCallback(GetKbdDelay(), callback(&Ctrl::LRep), &mousepos);
+		UPP::SetTimeCallback(2 * GetKbdDelay(), callback(&Ctrl::LHold), &mousepos);
+		leftmousepos = p;
+		if(sDistMax(leftdblpos, p) < GUI_DragDistance() && sDblTime(leftdbltime))
+			e = LEFTTRIPLE;
+		repeatTopCtrl = this;
+	}
+	if(e == RIGHTDOWN) {
+		LLOG("Ctrl::DispatchMouse: init right repeat for " << UPP::Name(this) << " at " << p);
+		UPP::SetTimeCallback(GetKbdDelay(), callback(&Ctrl::RRep), &mousepos);
+		UPP::SetTimeCallback(2 * GetKbdDelay(), callback(&Ctrl::RHold), &mousepos);
+		rightmousepos = p;
+		if(sDistMax(rightdblpos, p) < GUI_DragDistance() && sDblTime(rightdbltime))
+			e = RIGHTTRIPLE;
+		repeatTopCtrl = this;
+	}
+	if(e == MIDDLEDOWN) {
+		LLOG("Ctrl::DispatchMouse: init middle repeat for " << UPP::Name(this) << " at " << p);
+		UPP::SetTimeCallback(GetKbdDelay(), callback(&Ctrl::MRep), &mousepos);
+		UPP::SetTimeCallback(2 * GetKbdDelay(), callback(&Ctrl::MHold), &mousepos);
+		middlemousepos = p;
+		if(sDistMax(middledblpos, p) < GUI_DragDistance() && sDblTime(middledbltime))
+			e = MIDDLETRIPLE;
+		repeatTopCtrl = this;
+	}
+	if(repeatTopCtrl != this)
+		repeatTopCtrl = NULL;
+	if(e == LEFTUP)
+		leftmousepos = Null;
+	if(e == RIGHTUP)
+		rightmousepos = Null;
+	if(e == MIDDLEUP)
+		rightmousepos = Null;
+	if(e == LEFTUP || e == RIGHTUP || e == MIDDLEUP)
+		KillRepeat();
+	Image result = DispatchMouseEvent(e, p, zd);
+	if(!GetMouseRight() && !GetMouseMiddle() && !GetMouseLeft())
+		ReleaseCtrlCapture();
+	return result;
+}
+
+Image Ctrl::DispatchMouseEvent(int e, Point p, int zd) {
+	if(!IsEnabled())
+		return Image::Arrow();
+	if(captureCtrl && captureCtrl != this && captureCtrl->IsMouseActive())
+		return captureCtrl->MEvent0(e, p + GetScreenRect().TopLeft() -
+		                            captureCtrl->GetScreenRect().TopLeft(), zd);
+	Ctrl *top = this;
+	if(e == MOUSEWHEEL && !GetParent()) {
+		Ctrl *w = GetFocusCtrl();
+		if(w) {
+			top = w->GetTopCtrl();
+			p = GetMousePos() - top->GetScreenRect().TopLeft();
+		}
+	}
+	Ctrl *q = top->ChildFromPoint(p);
+	return q ? q->DispatchMouseEvent(e, p, zd) : top->MEvent0(e, p, zd);
+}
+
+bool Ctrl::SetCapture() {
+	ReleaseCtrlCapture();
+	if(!GetTopCtrl()->SetWndCapture()) return false;
+	captureCtrl = mouseCtrl = this;
+	return true;
+}
+
+bool Ctrl::ReleaseCapture() {
+	return this == captureCtrl && ReleaseCtrlCapture();
+}
+
+bool Ctrl::ReleaseCtrlCapture() {
+	if(captureCtrl) {
+		captureCtrl->CancelMode();
+		Ctrl *w = captureCtrl->GetTopCtrl();
+		captureCtrl = NULL;
+		if(w->HasWndCapture()) {
+			w->ReleaseWndCapture();
+			return true;
+		}
+	}
+	captureCtrl = NULL;
+	return false;
+}
+
+bool Ctrl::HasCapture() const {
+	return captureCtrl == this && GetTopCtrl()->HasWndCapture();
+}
+
+Ctrl *Ctrl::GetVisibleChild(Ctrl *ctrl, Point p, bool pointinframe)
+{
+	if(!pointinframe)
+		p += ctrl->GetView().TopLeft();
+	Ctrl *q;
+	Rect rect = ctrl->GetRect();
+	for(q = ctrl->GetLastChild(); q; q = q->GetPrev()) {
+		if(q->InFrame() && q->IsVisible()) {
+			Rect r = q->GetRect();
+			if(r.Contains(p))
+				return GetVisibleChild(q, p - r.TopLeft(), true);
+		}
+	}
+	Rect view = ctrl->GetView();
+	if(view.Contains(p)) {
+		p -= view.TopLeft();
+		for(q = ctrl->GetLastChild(); q; q = q->GetPrev()) {
+			if(q->InView() && q->IsVisible()) {
+				Rect r = q->GetRect();
+				if(r.Contains(p))
+					return GetVisibleChild(q, p - r.TopLeft(), true);
+			}
+		}
+	}
+	return ctrl;
+}
+
+AutoWaitCursor::AutoWaitCursor(int& avg) : WaitCursor(avg >= 0), avg(avg) {
+	time0 = GetTickCount();
+}
+
+AutoWaitCursor::~AutoWaitCursor() {
+	if(time0) avg = GetTickCount() - time0 - 500;
+	if(avg < -10000) avg = -10000;
+	if(avg >  10000) avg = 10000;
+}
+
+Image& Ctrl::CursorOverride()
+{
+	static Image m;
+	return m;
+}
+
+Image Ctrl::OverrideCursor(const Image& m)
+{
+	Image om = CursorOverride();
+	CursorOverride() = m;
+	DoCursorShape();
+	if(!mouseCtrl)
+		SetMouseCursor(IsNull(m) ? Image::Arrow() : m);
+	return om;
+}
+
+void WaitCursor::Show() {
+	if(flag)
+		prev = Ctrl::OverrideCursor(Image::Wait());
+	flag = false;
+}
+
+WaitCursor::WaitCursor(bool show) {
+	flag = true;
+	if(show) Show();
+}
+
+WaitCursor::~WaitCursor() {
+	if(!flag)
+		Ctrl::OverrideCursor(prev);
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/CtrlCore/CtrlPos.cpp b/uppsrc/CtrlCore/CtrlPos.cpp
new file mode 100644
index 000000000..d08cf0d8e
--- /dev/null
+++ b/uppsrc/CtrlCore/CtrlPos.cpp
@@ -0,0 +1,471 @@
+#include "CtrlCore.h"
+
+NAMESPACE_UPP
+
+#define LLOG(x)    // LOG(x)
+#define LTIMING(x) // RTIMING(x)
+
+bool Ctrl::Logc::IsEmpty() const {
+	return GetAlign() == SIZE ? GetB() <= GetA() : GetB() <= 0;
+}
+
+Size Ctrl::PosVal(int v) const {
+	switch(v) {
+	case MINSIZE: return GetMinSize();
+	case STDSIZE: return GetStdSize();
+	case MAXSIZE: return GetMaxSize();
+	}
+	return Size(v, v);
+}
+
+void Ctrl::Lay1(int& pos, int& r, int align, int a, int b, int sz) const
+{
+	pos = a;
+	int size = b;
+	switch(align) {
+	case CENTER:
+		pos = (sz - b) / 2 + a;
+		break;
+	case RIGHT:
+		pos = sz - (a + b);
+		break;
+	case SIZE:
+		size = sz - (a + b);
+		break;
+	}
+	r = pos + max(size, 0);
+}
+
+Rect Ctrl::CalcRect(LogPos pos, const Rect& prect, const Rect& pview) const
+{
+	Rect r;
+	Size sz = InFrame() ? prect.Size() : pview.Size();
+	Lay1(r.left, r.right, pos.x.GetAlign(),
+	     PosVal(pos.x.GetA()).cx, PosVal(pos.x.GetB()).cx, sz.cx);
+	Lay1(r.top, r.bottom, pos.y.GetAlign(),
+	     PosVal(pos.y.GetA()).cy, PosVal(pos.y.GetB()).cy, sz.cy);
+	return r;
+}
+
+Rect Ctrl::CalcRect(const Rect& prect, const Rect& pview) const
+{
+	return CalcRect(pos, prect, pview);
+}
+
+Rect Ctrl::GetRect() const
+{
+	return rect;
+}
+
+Rect Ctrl::GetView() const
+{
+	return frame.GetCount() == 0 ? Rect(Size(rect.Size())) : Rect(frame[frame.GetCount() - 1].view);
+}
+
+Size Ctrl::GetSize() const
+{
+	return GetView().Size();
+}
+
+Rect  Ctrl::GetScreenRect() const
+{
+	Rect r = GetRect();
+	if(parent) {
+		Rect pr = inframe ? parent->GetScreenRect() : parent->GetScreenView();
+		r = r + pr.TopLeft();
+	}
+#ifdef PLATFORM_WIN32
+	else if(activex)
+		r = GetWndScreenRect();
+#endif
+	return r;
+}
+
+Rect  Ctrl::GetScreenView() const
+{
+	Rect r = GetScreenRect();
+	return GetView() + r.TopLeft();
+}
+
+Rect  Ctrl::GetVisibleScreenRect() const
+{
+	Rect r = GetRect();
+	if(parent) {
+		Rect pr = inframe ? parent->GetVisibleScreenRect() : parent->GetVisibleScreenView();
+		Rect pr1 = inframe ? parent->GetScreenRect() : parent->GetScreenView();
+		r = (r + pr1.TopLeft()) & pr;
+	}
+#ifdef PLATFORM_WIN32
+	else if(activex)
+		r = GetWndScreenRect();
+#endif
+	return r & GetVirtualScreenArea();
+}
+
+Rect  Ctrl::GetVisibleScreenView() const
+{
+	Rect r = GetVisibleScreenRect();
+	return (GetView() + r.TopLeft()) & r;
+}
+
+Size  Ctrl::AddFrameSize(int cx, int cy) const
+{
+	Size sz = Size(cx, cy);
+	for(int i = frame.GetCount() - 1; i >= 0; i--)
+		frame[i].frame->FrameAddSize(sz);
+	return sz;
+}
+
+int EditFieldIsThin();
+
+Size Ctrl::GetMinSize() const
+{
+	int fcy = Draw::GetStdFontCy();
+	return AddFrameSize(fcy / 2, fcy + 2 + 2 * EditFieldIsThin());
+}
+
+Size Ctrl::GetStdSize() const
+{
+	Size sz = GetMinSize();
+	sz.cx *= 10;
+	return sz;
+}
+
+Size Ctrl::GetMaxSize() const
+{
+	return GetWorkArea().Size();
+}
+
+void Ctrl::SyncLayout(int force)
+{
+	LLOG("SyncLayout " << Name() << " size: " << GetSize());
+	bool refresh = false;
+	Rect oview = GetView();
+	Rect view = GetRect().Size();
+	overpaint = OverPaint();
+	for(int i = 0; i < frame.GetCount(); i++) {
+		Frame& f = frame[i];
+		f.frame->FrameLayout(view);
+		if(view != f.view) {
+			f.view = view;
+			refresh = true;
+		}
+		int q = f.frame->OverPaint();
+		if(q > overpaint) overpaint = q;
+	}
+	if(oview.Size() != view.Size() || force > 1) {
+		for(Ctrl *q = GetFirstChild(); q; q = q->next) {
+			q->rect = q->CalcRect(rect, view);
+			LLOG("Layout set rect " << q->Name() << " " << q->rect);
+			q->SyncLayout(force > 1 ? force : 0);
+		}
+		Refresh();
+	}
+	if(oview != view || force) {
+		State(LAYOUTPOS);
+		Layout();
+	}
+	if(refresh)
+		RefreshFrame();
+}
+
+int Ctrl::FindMoveCtrl(const VectorMap<Ctrl *, MoveCtrl>& m, Ctrl *x)
+{
+	int q = m.Find(x);
+	return q >= 0 && m[q].ctrl ? q : -1;
+}
+
+Ctrl::MoveCtrl *Ctrl::FindMoveCtrlPtr(VectorMap<Ctrl *, MoveCtrl>& m, Ctrl *x)
+{
+	int q = FindMoveCtrl(m, x);
+	return q >= 0 ? &m[q] : NULL;
+}
+
+void Ctrl::SetPos0(LogPos p, bool _inframe)
+{
+	if(p == pos && inframe == _inframe) return;
+	if(parent) {
+		Rect from = GetRect().Size();
+		Top *top = GetTopRect(from, true)->top;
+		if(top) {
+			LTIMING("SetPos0 MoveCtrl");
+			pos = p;
+			inframe = _inframe;
+			Rect to = GetRect().Size();
+			UpdateRect0();
+			GetTopRect(to, true);
+			MoveCtrl *s = FindMoveCtrlPtr(top->scroll_move, this);
+			if(s && s->from == from && s->to == to) {
+				s->ctrl = NULL;
+				LLOG("SetPos Matched " << from << " -> " << to);
+			}
+			else {
+				MoveCtrl& m = top->move.Add(this);
+				m.ctrl = this;
+				m.from = from;
+				m.to = to;
+				LLOG("SetPos Add " << UPP::Name(this) << from << " -> " << to);
+			}
+			return;
+		}
+		RefreshFrame();
+	}
+	pos = p;
+	inframe = _inframe;
+	UpdateRect();
+}
+
+void Ctrl::UpdateRect0()
+{
+	LTIMING("UpdateRect0");
+	if(parent)
+		rect = CalcRect(parent->GetRect(), parent->GetView());
+	else {
+		Rect r = GetWorkArea();
+		rect = CalcRect(r, r);
+	}
+	LTIMING("UpdateRect0 SyncLayout");
+	SyncLayout();
+}
+
+
+void Ctrl::UpdateRect()
+{
+	UpdateRect0();
+	if(parent) RefreshFrame();
+}
+
+Ctrl& Ctrl::SetPos(LogPos p, bool _inframe)
+{
+	if(p != pos || inframe != _inframe) {
+		if(parent || !IsOpen())
+			SetPos0(p, _inframe);
+		else {
+			Rect wa = GetWorkArea();
+			WndSetPos(CalcRect(p, wa, wa));
+		}
+		StateH(POSITION);
+	}
+	return *this;
+}
+
+Ctrl& Ctrl::SetPos(LogPos p)
+{
+	return SetPos(p, false);
+}
+
+Ctrl& Ctrl::SetPosX(Logc x)
+{
+	return SetPos(LogPos(x, pos.y));
+}
+
+Ctrl& Ctrl::SetPosY(Logc y)
+{
+	return SetPos(LogPos(pos.x, y));
+}
+
+Ctrl& Ctrl::SetFramePos(LogPos p)
+{
+	return SetPos(p, true);
+}
+
+Ctrl& Ctrl::SetFramePosX(Logc x) {
+	return SetPos(LogPos(x, pos.y), true);
+}
+
+Ctrl& Ctrl::SetFramePosY(Logc y) {
+	return SetPos(LogPos(pos.x, y), true);
+}
+
+void  Ctrl::SetRect(int x, int y, int cx, int cy)
+{
+	LLOG("SetRect " << Name() << " rect: " << RectC(x, y, cx, cy));
+	LTIMING("SetRect");
+	SetPos(PosLeft(x, cx), PosTop(y, cy));
+}
+
+void  Ctrl::SetWndRect(const Rect& r)
+{
+	LLOG("SetWndRect " << Name() << " rect: " << r << " (Ctrl::GetRect = " << GetRect() << ")");
+	SetPos0(LogPos(PosLeft(r.left, r.Width()), PosTop(r.top, r.Height())), false);
+	StateH(POSITION);
+}
+
+void Ctrl::SetRect(const Rect& r)
+{
+	SetRect(r.left, r.top, r.Width(), r.Height());
+}
+
+void Ctrl::SetRectX(int x, int cx) {
+	SetPosX(PosLeft(x, cx));
+}
+
+void Ctrl::SetRectY(int y, int cy) {
+	SetPosY(PosTop(y, cy));
+}
+
+void  Ctrl::SetFrameRect(int x, int y, int cx, int cy) {
+	SetFramePos(PosLeft(x, cx), PosTop(y, cy));
+}
+
+void Ctrl::SetFrameRect(const Rect& r) {
+	SetFrameRect(r.left, r.top, r.Width(), r.Height());
+}
+
+void Ctrl::SetFrameRectX(int x, int cx) {
+	SetFramePosX(PosLeft(x, cx));
+}
+
+void Ctrl::SetFrameRectY(int y, int cy) {
+	SetFramePosY(PosTop(y, cy));
+}
+
+Ctrl& Ctrl::SetFrame(int i, CtrlFrame& fr) {
+	LLOG("SetFrame " << typeid(fr).name());
+	while(frame.GetCount() <= i)
+		frame.Add().frame = &NullFrame();
+	frame[i].frame->FrameRemove();
+	frame[i].frame = &fr;
+	fr.FrameAdd(*this);
+	SyncLayout();
+	RefreshFrame();
+	return *this;
+}
+
+Ctrl& Ctrl::AddFrame(CtrlFrame& fr) {
+	LLOG("AddFrame " << typeid(fr).name());
+	frame.Add().frame = &fr;
+	fr.FrameAdd(*this);
+	SyncLayout();
+	RefreshFrame();
+	return *this;
+}
+
+void Ctrl::ClearFrames() {
+	for(int i = 0; i < frame.GetCount(); i++)
+		frame[i].frame->FrameRemove();
+	frame.Clear();
+	frame.Add().frame = &NullFrame();
+	RefreshFrame();
+	SyncLayout();
+}
+
+void Ctrl::RemoveFrame(int i) {
+	int n = frame.GetCount();
+	Mitor<Frame> m;
+	if(n > 1)
+		for(int q = 0; q < n; q++)
+			if(q != i)
+				m.Add().frame = frame[q].frame;
+			else
+				frame[q].frame->FrameRemove();
+	frame = m;
+	if(frame.GetCount() == 0)
+		frame.Add().frame = &NullFrame();
+	RefreshFrame();
+	SyncLayout();
+}
+
+int  Ctrl::FindFrame(CtrlFrame& frm)
+{
+	for(int i = 0; i < frame.GetCount(); i++)
+		if(frame[i].frame == &frm)
+			return i;
+	return -1;
+}
+
+
+void Ctrl::RemoveFrame(CtrlFrame& frm)
+{
+	int i = FindFrame(frm);
+	if(i >= 0)
+		RemoveFrame(i);
+}
+
+void Ctrl::InsertFrame(int i, CtrlFrame& fr)
+{
+	ASSERT(i >= 0 && i <= frame.GetCount());
+	int n = frame.GetCount();
+	Mitor<Frame> m;
+	if(n >= 1)
+		for(int q = 0; q < n; q++) {
+			if(q == i) m.Add().frame = &fr;
+			m.Add().frame = frame[q].frame;
+		}
+	if(i == n)
+		m.Add().frame = &fr;
+	frame = m;
+	fr.FrameAdd(*this);
+	SyncLayout();
+	RefreshFrame();
+}
+
+Ctrl& Ctrl::LeftPos(int a, int size) {
+	return SetPosX(PosLeft(a, size));
+}
+
+Ctrl& Ctrl::RightPos(int a, int size) {
+	return SetPosX(PosRight(a, size));
+}
+
+Ctrl& Ctrl::TopPos(int a, int size) {
+	return SetPosY(PosTop(a, size));
+}
+
+Ctrl& Ctrl::BottomPos(int a, int size) {
+	return SetPosY(PosBottom(a, size));
+}
+
+Ctrl& Ctrl::HSizePos(int a, int b) {
+	return SetPosX(PosSize(a, b));
+}
+
+Ctrl& Ctrl::VSizePos(int a, int b) {
+	return SetPosY(PosSize(a, b));
+}
+
+Ctrl& Ctrl::SizePos() {
+	return HSizePos().VSizePos();
+}
+
+Ctrl& Ctrl::HCenterPos(int size, int delta) {
+	return SetPosX(PosCenter(size, delta));
+}
+
+Ctrl& Ctrl::VCenterPos(int size, int delta) {
+	return SetPosY(PosCenter(size, delta));
+}
+
+Ctrl& Ctrl::LeftPosZ(int a, int size) {
+	return LeftPos(HorzLayoutZoom(a), HorzLayoutZoom(size));
+}
+
+Ctrl& Ctrl::RightPosZ(int a, int size) {
+	return RightPos(HorzLayoutZoom(a), HorzLayoutZoom(size));
+}
+
+Ctrl& Ctrl::TopPosZ(int a, int size) {
+	return TopPos(VertLayoutZoom(a), VertLayoutZoom(size));
+}
+
+Ctrl& Ctrl::BottomPosZ(int a, int size) {
+	return BottomPos(VertLayoutZoom(a), VertLayoutZoom(size));
+}
+
+Ctrl& Ctrl::HSizePosZ(int a, int b) {
+	return HSizePos(HorzLayoutZoom(a), HorzLayoutZoom(b));
+}
+
+Ctrl& Ctrl::VSizePosZ(int a, int b) {
+	return VSizePos(VertLayoutZoom(a), VertLayoutZoom(b));
+}
+
+Ctrl& Ctrl::HCenterPosZ(int size, int delta) {
+	return HCenterPos(HorzLayoutZoom(size), HorzLayoutZoom(delta));
+}
+
+Ctrl& Ctrl::VCenterPosZ(int size, int delta) {
+	return VCenterPos(VertLayoutZoom(size), VertLayoutZoom(delta));
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/CtrlCore/CtrlTimer.cpp b/uppsrc/CtrlCore/CtrlTimer.cpp
new file mode 100644
index 000000000..8e774218d
--- /dev/null
+++ b/uppsrc/CtrlCore/CtrlTimer.cpp
@@ -0,0 +1,145 @@
+#include "CtrlCore.h"
+
+NAMESPACE_UPP
+
+int MemoryProbeInt;
+
+struct TimeEvent : public Link<TimeEvent> {
+	dword      time;
+	int        delay;
+	Callback   cb;
+	void      *id;
+};
+
+static dword sTClick;
+
+static StaticCriticalSection sTimerLock;
+
+struct CtrlTimerOwner__ : public LinkOwner<TimeEvent> {
+	CtrlTimerOwner__();
+	~CtrlTimerOwner__();
+};
+
+static TimeEvent *tevents() {
+	static LinkOwner<TimeEvent> t;
+	return t.GetPtr();
+}
+
+static void sTimeCallback(dword time, int delay, Callback cb, void *id) {
+	TimeEvent *list = tevents();
+	TimeEvent *e;
+	for(e = list->GetNext(); e != list && time >= e->time; e = e->GetNext());
+	TimeEvent *ne = e->InsertPrev();
+	ne->time = time;
+	ne->cb = cb;
+	ne->delay = delay;
+	ne->id = id;
+}
+
+void SetTimeCallback(int delay_ms, Callback cb, void *id) {
+	CriticalSection::Lock __(sTimerLock);
+	ASSERT(abs(delay_ms) < 0x40000000);
+	sTimeCallback(GetTickCount() + abs(delay_ms), delay_ms, cb, id);
+}
+
+void KillTimeCallbacks(void *id, void *idlim) {
+	CriticalSection::Lock __(sTimerLock);
+	TimeEvent *list = tevents();
+	for(TimeEvent *e = list->GetNext(); e != list;)
+		if(e->id >= id && e->id < idlim) {
+			e = e->GetNext();
+			delete e->GetPrev();
+		}
+		else
+			e = e->GetNext();
+}
+
+EXITBLOCK
+{
+	CriticalSection::Lock __(sTimerLock);
+	while(tevents()->GetNext() != tevents())
+		delete tevents()->GetNext();
+}
+
+bool ExistsTimeCallback(void *id) {
+	CriticalSection::Lock __(sTimerLock);
+	TimeEvent *list = tevents();
+	for(TimeEvent *e = list->GetNext(); e != list; e = e->GetNext())
+		if(e->id == id)
+			return true;
+	return false;
+}
+
+void KillTimeCallback(void *id) {
+	KillTimeCallbacks(id, (byte *)id + 1);
+}
+
+void Ctrl::TimerProc(dword time)
+{
+	sTimerLock.Enter();
+	TimeEvent *list = tevents();
+	if(sTClick > time)
+		for(TimeEvent *e = list->GetNext(); e != list; e = e->GetNext())
+			if(e->time > 0x80000000)
+				e->time = 0;
+	sTClick = time;
+	sTimerLock.Leave();
+	Ctrl::CheckMouseCtrl();
+	Ctrl::SyncCaret();
+	sTimerLock.Enter();
+	while(list->GetNext() != list && list->GetNext()->time < time) {
+		TimeEvent *e = list->GetNext();
+		e->Unlink();
+		if(e->delay < 0)
+			sTimeCallback(time - e->delay, e->delay, e->cb, e->id);
+		sTimerLock.Leave();
+		e->cb();
+		sTimerLock.Enter();
+		delete e;
+	}
+	sTimerLock.Leave();
+}
+
+void  Ctrl::InitTimer()
+{
+	CriticalSection::Lock __(sTimerLock);
+	tevents();
+}
+
+void  Ctrl::SetTimeCallback(int delay_ms, Callback cb, int id) {
+	ASSERT(id >= 0 && (size_t)id < (int)sizeof(Ctrl));
+	UPP::SetTimeCallback(delay_ms, cb, (byte *)this + id);
+}
+
+void  Ctrl::KillTimeCallback(int id) {
+	ASSERT(id >= 0 && (size_t)id < sizeof(Ctrl));
+	UPP::KillTimeCallback((byte *)this + id);
+}
+
+void  Ctrl::KillSetTimeCallback(int delay_ms, Callback cb, int id)
+{
+	KillTimeCallback(id);
+	SetTimeCallback(delay_ms, cb, id);
+}
+
+void  Ctrl::PostCallback(Callback cb, int id)
+{
+	SetTimeCallback(0, cb, id);
+}
+
+void  Ctrl::KillPostCallback(Callback cb, int id)
+{
+	KillSetTimeCallback(0, cb, id);
+}
+
+bool  Ctrl::ExistsTimeCallback(int id) const {
+	ASSERT(id >= 0 && (size_t)id < sizeof(Ctrl));
+	return UPP::ExistsTimeCallback((byte *)this + id);
+}
+
+dword GetTimeClick()
+{
+	return sTClick;
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/CtrlCore/DHCtrl.cpp b/uppsrc/CtrlCore/DHCtrl.cpp
new file mode 100644
index 000000000..95e39f141
--- /dev/null
+++ b/uppsrc/CtrlCore/DHCtrl.cpp
@@ -0,0 +1,81 @@
+#include "CtrlCore.h"
+
+NAMESPACE_UPP
+
+#ifdef PLATFORM_WIN32
+#ifndef PLATFORM_WINCE
+
+void DHCtrl::NcCreate(HWND _hwnd)
+{
+	hwnd = _hwnd;
+}
+
+void DHCtrl::NcDestroy()
+{
+	hwnd = NULL;
+}
+
+LRESULT DHCtrl::WindowProc(UINT message, WPARAM wParam, LPARAM lParam)
+{
+	return DefWindowProc(hwnd, message, wParam, lParam);
+}
+
+void DHCtrl::CloseHWND()
+{
+	if(hwnd) {
+		DestroyWindow(hwnd);
+		hwnd = NULL;
+	}
+}
+
+void DHCtrl::OpenHWND()
+{
+	CloseHWND();
+	HWND phwnd = GetTopCtrl()->GetHWND();
+	if(phwnd) {
+		CreateWindowEx(0, "UPP-CLASS-A", "",
+		               WS_CHILD|WS_DISABLED|WS_VISIBLE,
+		               0, 0, 20, 20,
+		               phwnd, (HMENU)this, hInstance, this);
+	}
+}
+
+void DHCtrl::SyncHWND()
+{
+	HWND phwnd = GetTopCtrl()->GetHWND();
+	if(phwnd) {
+		Rect r = GetScreenView();
+		Rect pr = GetScreenClient(phwnd);
+		SetWindowPos(hwnd, NULL, r.left - pr.left, r.top - pr.top, r.Width(), r.Height(),
+		             SWP_NOACTIVATE|SWP_NOZORDER);
+	}
+}
+
+void DHCtrl::State(int reason)
+{
+	switch(reason) {
+	case OPEN:
+		OpenHWND();
+	default:
+		SyncHWND();
+		break;
+	case CLOSE:
+		hwnd = NULL;
+	}
+}
+
+DHCtrl::DHCtrl()
+{
+	hwnd = NULL;
+}
+
+DHCtrl::~DHCtrl()
+{
+	CloseHWND();
+	BackPaint(EXCLUDEPAINT);
+}
+
+#endif
+#endif
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/CtrlCore/Frame.cpp b/uppsrc/CtrlCore/Frame.cpp
new file mode 100644
index 000000000..99246ec11
--- /dev/null
+++ b/uppsrc/CtrlCore/Frame.cpp
@@ -0,0 +1,163 @@
+#include "CtrlCore.h"
+
+NAMESPACE_UPP
+
+#ifdef flagSO
+CtrlFrame::CtrlFrame() {}
+CtrlFrame::~CtrlFrame() {}
+#endif
+
+void CtrlFrame::FramePaint(Draw& draw, const Rect& r) {}
+void CtrlFrame::FrameAdd(Ctrl& ctrl) {}
+void CtrlFrame::FrameRemove() {}
+int CtrlFrame::OverPaint() const { return 0; }
+
+void NullFrameClass::FrameLayout(Rect& r) {}
+void NullFrameClass::FramePaint(Draw& draw, const Rect& r) {}
+void NullFrameClass::FrameAddSize(Size& sz) {}
+
+CtrlFrame& GLOBAL_V(NullFrameClass, NullFrame);
+
+#ifdef flagSO
+BorderFrame::BorderFrame(const ColorF *border) : border(border) {}
+BorderFrame::~BorderFrame() {}
+#endif
+
+void BorderFrame::FrameLayout(Rect& r)
+{
+	Size sz = r.GetSize();
+	int n = (int)(intptr_t)*border;
+	if(sz.cx >= 2 * n && sz.cy >= 2 * n)
+		r.Deflate(n);
+}
+
+void BorderFrame::FrameAddSize(Size& sz)
+{
+	sz += 2 * (int)(intptr_t)*border;
+}
+
+void BorderFrame::FramePaint(Draw& draw, const Rect& r)
+{
+	Size sz = r.GetSize();
+	int n = (int)(intptr_t)*border;
+	if(sz.cx >= 2 * n && sz.cy >= 2 * n)
+		DrawBorder(draw, r.left, r.top, r.Width(), r.Height(), border);
+}
+
+CtrlFrame& GLOBAL_VP(BorderFrame, InsetFrame, (InsetBorder()));
+CtrlFrame& GLOBAL_VP(BorderFrame, ThinInsetFrame, (ThinInsetBorder()));
+CtrlFrame& GLOBAL_VP(BorderFrame, ButtonFrame, (ButtonBorder()));
+CtrlFrame& GLOBAL_VP(BorderFrame, BlackFrame, (BlackBorder()));
+CtrlFrame& GLOBAL_VP(BorderFrame, OutsetFrame, (OutsetBorder()));
+CtrlFrame& GLOBAL_VP(BorderFrame, ThinOutsetFrame, (ThinOutsetBorder()));
+
+CH_COLOR(FieldFrameColor, Blend(SColorHighlight, SColorShadow));
+
+class XPFieldFrameCls : public CtrlFrame {
+	virtual void FrameLayout(Rect& r)                   { r.Deflate(2); }
+	virtual void FramePaint(Draw& w, const Rect& r) {
+		DrawFrame(w, r, FieldFrameColor());
+		DrawFrame(w, r.Deflated(1), SColorPaper);
+	}
+	virtual void FrameAddSize(Size& sz) { sz += 4; }
+};
+
+class XPEditFieldFrameCls : public CtrlFrame {
+	virtual void FrameLayout(Rect& r)                   { r.Deflate(1); }
+	virtual void FramePaint(Draw& w, const Rect& r) {
+		DrawFrame(w, r, FieldFrameColor());
+	}
+	virtual void FrameAddSize(Size& sz) { sz += 2; }
+};
+
+CtrlFrame& XPFieldFrame() { return Single<XPFieldFrameCls>(); }
+CtrlFrame& XPEditFieldFrame() { return Single<XPEditFieldFrameCls>(); }
+
+CH_INT(EditFieldIsThin, 0);
+
+CtrlFrame& FieldFrame() { return GUI_GlobalStyle() >= GUISTYLE_XP ? XPFieldFrame() : InsetFrame(); }
+
+CH_VALUE(TopSeparator1, SColorShadow());
+CH_VALUE(TopSeparator2, SColorLight());
+
+class TopSeparatorFrameCls : public CtrlFrame {
+	virtual void FrameLayout(Rect& r)                   { r.top += 2; }
+	virtual void FramePaint(Draw& w, const Rect& r) {
+		ChPaint(w, r.left, r.top, r.Width(), 1, TopSeparator1());
+		ChPaint(w, r.left, r.top + 1, r.Width(), 1, TopSeparator2());
+	}
+	virtual void FrameAddSize(Size& sz) { sz.cy += 2; }
+};
+
+class BottomSeparatorFrameCls : public CtrlFrame {
+	virtual void FrameLayout(Rect& r)                   { r.bottom -= 2; }
+	virtual void FramePaint(Draw& w, const Rect& r) {
+		w.DrawRect(r.left, r.bottom - 2, r.Width(), 1, SColorShadow);
+		w.DrawRect(r.left, r.bottom - 1, r.Width(), 1, SColorLight);
+	}
+	virtual void FrameAddSize(Size& sz) { sz.cy += 2; }
+};
+
+class LeftSeparatorFrameCls : public CtrlFrame {
+	virtual void FrameLayout(Rect& r)                   { r.left += 2; }
+	virtual void FramePaint(Draw& w, const Rect& r) {
+		w.DrawRect(r.left, r.top, 1, r.Height(), SColorShadow);
+		w.DrawRect(r.left + 1, r.top, 1, r.Height(), SColorLight);
+	}
+	virtual void FrameAddSize(Size& sz) { sz.cx += 2; }
+};
+
+class RightSeparatorFrameCls : public CtrlFrame {
+	virtual void FrameLayout(Rect& r)                   { r.right -= 2; }
+	virtual void FramePaint(Draw& w, const Rect& r) {
+		w.DrawRect(r.right - 2, r.top, 1, r.Height(), SColorShadow);
+		w.DrawRect(r.right - 1, r.top, 1, r.Height(), SColorLight);
+	}
+	virtual void FrameAddSize(Size& sz) { sz.cx += 2; }
+};
+
+CtrlFrame& BottomSeparatorFrame() { return Single<BottomSeparatorFrameCls>(); }
+CtrlFrame& TopSeparatorFrame()    { return Single<TopSeparatorFrameCls>(); }
+CtrlFrame& RightSeparatorFrame()  { return Single<RightSeparatorFrameCls>(); }
+CtrlFrame& LeftSeparatorFrame()   { return Single<LeftSeparatorFrameCls>(); }
+
+CH_INT(FrameButtonWidth, 17);
+CH_INT(ScrollBarArrowSize, FrameButtonWidth());
+
+void LayoutFrameLeft(Rect& r, Ctrl *ctrl, int cx)
+{
+	if(ctrl) {
+		cx *= ctrl->IsShown();
+		ctrl->SetFrameRect(r.left, r.top, cx, r.Height());
+		r.left += cx;
+	}
+}
+
+void LayoutFrameRight(Rect& r, Ctrl *ctrl, int cx)
+{
+	if(ctrl) {
+		cx *= ctrl->IsShown();
+		ctrl->SetFrameRect(r.right - cx, r.top, cx, r.Height());
+		r.right -= cx;
+	}
+}
+
+void LayoutFrameTop(Rect& r, Ctrl *ctrl, int cy)
+{
+	if(ctrl) {
+		cy *= ctrl->IsShown();
+		ctrl->SetFrameRect(r.left, r.top, r.Width(), cy);
+		r.top += cy;
+	}
+}
+
+void LayoutFrameBottom(Rect& r, Ctrl *ctrl, int cy)
+{
+	if(ctrl) {
+		cy *= ctrl->IsShown();
+		ctrl->SetFrameRect(r.left, r.bottom - cy, r.Width(), cy);
+		r.bottom -= cy;
+	}
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/CtrlCore/LocalLoop.cpp b/uppsrc/CtrlCore/LocalLoop.cpp
new file mode 100644
index 000000000..5c84621ce
--- /dev/null
+++ b/uppsrc/CtrlCore/LocalLoop.cpp
@@ -0,0 +1,317 @@
+#include "CtrlCore.h"
+
+NAMESPACE_UPP
+
+#define LLOG(x) // DLOG(x)
+
+void LocalLoop::Run()
+{
+	ASSERT(master);
+	master->AddChild(this);
+	Ptr<Ctrl> focus = GetFocusCtrl();
+	SetCapture();
+	SetFocus();
+	LLOG("LocalLoop::Run");
+	EventLoop(this);
+	LLOG("LocalLoop Finished");
+	Remove();
+	if(focus)
+		focus->SetFocus();
+}
+
+void DrawDragRect(Ctrl& q, const Rect& rect1, const Rect& rect2, const Rect& clip, int n,
+                  Color color, uint64 pattern)
+{
+	ViewDraw w(&q);
+	DrawDragRect(w, rect1, rect2, clip, n, color, pattern);
+}
+
+void RectTracker::LeftUp(Point, dword)
+{
+	EndLoop();
+}
+
+void RectTracker::RightUp(Point, dword)
+{
+	EndLoop();
+}
+
+Image RectTracker::CursorImage(Point, dword)
+{
+	if(animation)
+		DrawRect(rect, rect);
+	return cursorimage;
+}
+
+static uint64 RectTracker_normal = I64(0x55aa55aa55aa55aa);
+static uint64 RectTracker_dashed = I64(0xf0783c1e0f87c3e1);
+static uint64 RectTracker_solid  = I64(0);
+
+RectTracker::RectTracker(Ctrl& master)
+{
+	SetMaster(master);
+	Clip(Rect(0, 0, 100000, 100000));
+	width = 1;
+	minsize = Size(0, 0);
+	maxsize = Size(100000, 100000);
+	maxrect = Rect(-100000, -100000, 100000, 100000);
+	keepratio = false;
+	cursorimage = Image::Arrow();
+	color = SColorPaper;
+	pattern = RectTracker_normal;
+	animation = 0;
+	rounder = NULL;
+}
+
+RectTracker::~RectTracker() {}
+
+RectTracker& RectTracker::Dashed() { pattern = RectTracker_dashed; return *this; }
+RectTracker& RectTracker::Solid()  { pattern = RectTracker_solid; return *this; }
+
+static uint64 sGetAniPat(uint64 src, int pos)
+{
+	uint64 out = 0;
+	pos &= 7;
+	for(int i = 8; --i >= 0;) {
+		byte sr = (byte)(src >> (8 * ((7 - i - pos) & 7)));
+		out = (out << 8) | (byte)((sr | (sr << 8)) >> pos);
+	}
+	return out;
+}
+
+void RectTracker::DrawRect(Rect r1, Rect r2)
+{
+	if(ty < 0) {
+		r1.left = r1.right - 1;
+		r2.left = r2.right - 1;
+	}
+	if(tx < 0) {
+		r1.top = r1.bottom - 1;
+		r2.top = r2.bottom - 1;
+	}
+	Rect c = clip & GetMaster().GetSize();
+	if(animation) {
+		int nanim = (GetTickCount() / animation) % 8;
+		DrawDragRect(GetMaster(), Rect(0, 0, 0, 0), r2, c, width, color, sGetAniPat(pattern, nanim));
+		DrawDragRect(GetMaster(), r1, Rect(0, 0, 0, 0), c, width, color, sGetAniPat(pattern, panim));
+		panim = nanim;
+	}
+	else
+		DrawDragRect(GetMaster(), r1, r2, c, width, color, pattern);
+}
+
+Rect RectTracker::Track(const Rect& r, int _tx, int _ty)
+{
+	rect = r;
+	tx = _tx;
+	ty = _ty;
+	org = rect;
+	o = rect;
+	op = GetMousePos();
+	GetMaster().Sync();
+	DrawRect(Rect(0, 0, 0, 0), rect);
+	Run();
+	DrawRect(o, Rect(0, 0, 0, 0));
+	return rect;
+}
+
+int RectTracker::TrackHorzLine(int x0, int y0, int cx, int line)
+{
+	return Track(RectC(x0, y0, cx, line + 1), -1, ALIGN_BOTTOM).bottom - 1;
+}
+
+int RectTracker::TrackVertLine(int x0, int y0, int cy, int line)
+{
+	return Track(RectC(x0, y0, line + 1, cy), ALIGN_RIGHT, -1).right - 1;
+}
+
+void RectTracker::MouseMove(Point, dword)
+{
+	Point p = GetMousePos();
+	rect = org;
+	if(tx == ALIGN_CENTER && ty == ALIGN_CENTER) {
+		int x = org.left - op.x + p.x;
+		int y = org.top - op.y + p.y;
+		if(x + org.Width() > maxrect.right)
+			x = maxrect.right - org.Width();
+		if(x < maxrect.left)
+			x = maxrect.left;
+		if(y + org.Height() > maxrect.bottom)
+			y = maxrect.bottom - org.Height();
+		if(y < maxrect.top)
+			y = maxrect.top;
+		rect = RectC(x, y, org.Width(), org.Height());
+	}
+	else {
+		if(tx == ALIGN_LEFT) {
+			rect.left = max(org.left - op.x + p.x, maxrect.left);
+			rect.left = minmax(rect.left, rect.right - maxsize.cx, rect.right - minsize.cx);
+		}
+		if(tx == ALIGN_RIGHT) {
+			rect.right = min(org.right - op.x + p.x, maxrect.right);
+			rect.right = minmax(rect.right, rect.left + minsize.cx, rect.left + maxsize.cx);
+		}
+		if(ty == ALIGN_TOP) {
+			rect.top = max(org.top - op.y + p.y, maxrect.top);
+			rect.top = minmax(rect.top, rect.bottom - maxsize.cy, rect.bottom - minsize.cy);
+		}
+		if(ty == ALIGN_BOTTOM) {
+			rect.bottom = min(org.bottom - op.y + p.y, maxrect.bottom);
+			rect.bottom = minmax(rect.bottom, rect.top + minsize.cy, rect.top + maxsize.cy);
+		}
+		if(tx == ALIGN_NULL) {
+			rect.right = min(org.right - op.x + p.x, maxrect.right);
+			if (rect.right < rect.left) {
+				Swap(rect.right, rect.left);
+				rect.InflateHorz(1);
+			}	
+		}
+		if(ty == ALIGN_NULL) {
+			rect.bottom = min(org.bottom - op.y + p.y, maxrect.bottom);
+			if (rect.bottom < rect.top) {
+				Swap(rect.bottom, rect.top);
+				rect.InflateVert(1);
+			}
+		}
+		if(keepratio) {
+			int cy = org.Width() ? rect.Width() * org.Height() / org.Width() : 0;
+			int cx = org.Height() ? rect.Height() * org.Width() / org.Height() : 0;
+			if(tx == ALIGN_BOTTOM && ty == ALIGN_RIGHT) {
+				Size sz = rect.Size();
+				if(cx > sz.cx)
+					rect.right = rect.left + cx;
+				else
+					rect.bottom = rect.top + cy;
+			}
+			else
+			if(tx == ALIGN_RIGHT)
+				rect.bottom = rect.top + cy;
+			else
+			if(ty == ALIGN_BOTTOM)
+				rect.right = rect.left + cx;
+		}
+	}
+	if(rect != o) {
+		rect = Round(rect);
+		if(rect != o) {
+			DrawRect(o, rect);
+			sync(rect);
+			o = rect;
+		}
+	}
+}
+
+/*
+void RectTracker::MouseMove(Point, dword)
+{
+	Point p = GetMousePos();
+	rect = org;
+	if(tx == ALIGN_CENTER && ty == ALIGN_CENTER) {
+		int x = org.left - op.x + p.x;
+		int y = org.top - op.y + p.y;
+		if(x + org.Width() > maxrect.right)
+			x = maxrect.right - org.Width();
+		if(x < maxrect.left)
+			x = maxrect.left;
+		if(y + org.Height() > maxrect.bottom)
+			y = maxrect.bottom - org.Height();
+		if(y < maxrect.top)
+			y = maxrect.top;
+		rect = RectC(x, y, org.Width(), org.Height());
+	}
+	else {
+		if(tx == ALIGN_LEFT) {
+			rect.left = max(org.left - op.x + p.x, maxrect.left);
+			rect.left = minmax(rect.left, rect.right - maxsize.cx, rect.right - minsize.cx);
+		}
+		if(tx == ALIGN_RIGHT) {
+			rect.right = min(org.right - op.x + p.x, maxrect.right);
+			rect.right = minmax(rect.right, rect.left + minsize.cx, rect.left + maxsize.cx);
+		}
+		if(ty == ALIGN_TOP) {
+			rect.top = max(org.top - op.y + p.y, maxrect.top);
+			rect.top = minmax(rect.top, rect.bottom - maxsize.cy, rect.bottom - minsize.cy);
+		}
+		if(ty == ALIGN_BOTTOM) {
+			rect.bottom = min(org.bottom - op.y + p.y, maxrect.bottom);
+			rect.bottom = minmax(rect.bottom, rect.top + minsize.cy, rect.top + maxsize.cy);
+		}
+		if(keepratio) {
+			int cy = org.Width() ? rect.Width() * org.Height() / org.Width() : 0;
+			int cx = org.Height() ? rect.Height() * org.Width() / org.Height() : 0;
+			if(tx == ALIGN_BOTTOM && ty == ALIGN_RIGHT) {
+				Size sz = rect.Size();
+				if(cx > sz.cx)
+					rect.right = rect.left + cx;
+				else
+					rect.bottom = rect.top + cy;
+			}
+			else
+			if(tx == ALIGN_RIGHT)
+				rect.bottom = rect.top + cy;
+			else
+			if(ty == ALIGN_BOTTOM)
+				rect.right = rect.left + cx;
+		}
+	}
+	if(rect != o) {
+		rect = Round(rect);
+		if(rect != o) {
+			DrawRect(o, rect);
+			sync(rect);
+			o = rect;
+		}
+	}
+}
+*/
+class PointLooper : public LocalLoop {
+	const Vector<Image>& ani;
+	int ani_ms;
+	bool result;
+
+public:
+	virtual void  LeftUp(Point, dword);
+	virtual Image CursorImage(Point p, dword keyflags);
+	virtual bool  Key(dword key, int);
+
+	operator bool() const     { return result; }
+
+	PointLooper(Ctrl& ctrl, const Vector<Image>& ani, int ani_ms)
+	: ani(ani), ani_ms(ani_ms) { SetMaster(ctrl); }
+};
+
+void  PointLooper::LeftUp(Point, dword)
+{
+	result = true;
+	EndLoop();
+}
+
+Image PointLooper::CursorImage(Point p, dword keyflags)
+{
+	return ani[int(GetTimeClick() / ani_ms % ani.GetCount())];
+}
+
+bool  PointLooper::Key(dword key, int)
+{
+	if(key == K_ESCAPE) {
+		result = false;
+		EndLoop();
+	}
+	return true;
+}
+
+bool PointLoop(Ctrl& ctrl, const Vector<Image>& ani, int ani_ms)
+{
+	PointLooper p(ctrl, ani, ani_ms);
+	p.Run();
+	return p;
+}
+
+bool PointLoop(Ctrl& ctrl, const Image& img)
+{
+	Vector<Image> m;
+	m.Add(img);
+	return PointLoop(ctrl, m, 1);
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/CtrlCore/MKeys.h b/uppsrc/CtrlCore/MKeys.h
new file mode 100644
index 000000000..12100037b
--- /dev/null
+++ b/uppsrc/CtrlCore/MKeys.h
@@ -0,0 +1,367 @@
+#ifdef PLATFORM_X11
+#include "X11/keysym.h"
+#endif
+
+enum {
+#ifdef PLATFORM_X11
+	#include "X11Keys.i"
+#endif
+
+#ifdef PLATFORM_WIN32
+	#include "Win32Keys.i"
+#endif
+
+	K_CTRL_BACK      = K_CTRL|K_BACKSPACE,
+	K_CTRL_BACKSPACE = K_CTRL|K_BACKSPACE,
+	K_CTRL_TAB       = K_CTRL|K_TAB,
+	K_CTRL_RETURN    = K_CTRL|K_ENTER,
+	K_CTRL_ENTER     = K_CTRL|K_ENTER,
+	K_CTRL_ESCAPE    = K_CTRL|K_ESCAPE,
+	K_CTRL_SPACE     = K_CTRL|K_SPACE,
+	K_CTRL_PRIOR     = K_CTRL|K_PAGEUP,
+	K_CTRL_PAGEUP    = K_CTRL|K_PAGEUP,
+	K_CTRL_NEXT      = K_CTRL|K_PAGEDOWN,
+	K_CTRL_PAGEDOWN  = K_CTRL|K_PAGEDOWN,
+	K_CTRL_END       = K_CTRL|K_END,
+	K_CTRL_HOME      = K_CTRL|K_HOME,
+	K_CTRL_LEFT      = K_CTRL|K_LEFT,
+	K_CTRL_UP        = K_CTRL|K_UP,
+	K_CTRL_RIGHT     = K_CTRL|K_RIGHT,
+	K_CTRL_DOWN      = K_CTRL|K_DOWN,
+	K_CTRL_INSERT    = K_CTRL|K_INSERT,
+	K_CTRL_DELETE    = K_CTRL|K_DELETE,
+
+
+	K_CTRL_NUMPAD0   = K_CTRL|K_NUMPAD0,
+	K_CTRL_NUMPAD1   = K_CTRL|K_NUMPAD1,
+	K_CTRL_NUMPAD2   = K_CTRL|K_NUMPAD2,
+	K_CTRL_NUMPAD3   = K_CTRL|K_NUMPAD3,
+	K_CTRL_NUMPAD4   = K_CTRL|K_NUMPAD4,
+	K_CTRL_NUMPAD5   = K_CTRL|K_NUMPAD5,
+	K_CTRL_NUMPAD6   = K_CTRL|K_NUMPAD6,
+	K_CTRL_NUMPAD7   = K_CTRL|K_NUMPAD7,
+	K_CTRL_NUMPAD8   = K_CTRL|K_NUMPAD8,
+	K_CTRL_NUMPAD9   = K_CTRL|K_NUMPAD9,
+	K_CTRL_MULTIPLY  = K_CTRL|K_MULTIPLY,
+	K_CTRL_ADD       = K_CTRL|K_ADD,
+	K_CTRL_SEPARATOR = K_CTRL|K_SEPARATOR,
+	K_CTRL_SUBTRACT  = K_CTRL|K_SUBTRACT,
+	K_CTRL_DECIMAL   = K_CTRL|K_DECIMAL,
+	K_CTRL_DIVIDE    = K_CTRL|K_DIVIDE,
+
+	K_CTRL_F1        = K_CTRL|K_F1,
+	K_CTRL_F2        = K_CTRL|K_F2,
+	K_CTRL_F3        = K_CTRL|K_F3,
+	K_CTRL_F4        = K_CTRL|K_F4,
+	K_CTRL_F5        = K_CTRL|K_F5,
+	K_CTRL_F6        = K_CTRL|K_F6,
+	K_CTRL_F7        = K_CTRL|K_F7,
+	K_CTRL_F8        = K_CTRL|K_F8,
+	K_CTRL_F9        = K_CTRL|K_F9,
+	K_CTRL_F10       = K_CTRL|K_F10,
+	K_CTRL_F11       = K_CTRL|K_F11,
+	K_CTRL_F12       = K_CTRL|K_F12,
+	K_CTRL_SCROLL    = K_CTRL|K_SCROLL,
+
+	K_CTRL_A         = K_CTRL|K_A,
+	K_CTRL_B         = K_CTRL|K_B,
+	K_CTRL_C         = K_CTRL|K_C,
+	K_CTRL_D         = K_CTRL|K_D,
+	K_CTRL_E         = K_CTRL|K_E,
+	K_CTRL_F         = K_CTRL|K_F,
+	K_CTRL_G         = K_CTRL|K_G,
+	K_CTRL_H         = K_CTRL|K_H,
+	K_CTRL_I         = K_CTRL|K_I,
+	K_CTRL_J         = K_CTRL|K_J,
+	K_CTRL_K         = K_CTRL|K_K,
+	K_CTRL_L         = K_CTRL|K_L,
+	K_CTRL_M         = K_CTRL|K_M,
+	K_CTRL_N         = K_CTRL|K_N,
+	K_CTRL_O         = K_CTRL|K_O,
+	K_CTRL_P         = K_CTRL|K_P,
+	K_CTRL_Q         = K_CTRL|K_Q,
+	K_CTRL_R         = K_CTRL|K_R,
+	K_CTRL_S         = K_CTRL|K_S,
+	K_CTRL_T         = K_CTRL|K_T,
+	K_CTRL_U         = K_CTRL|K_U,
+	K_CTRL_V         = K_CTRL|K_V,
+	K_CTRL_W         = K_CTRL|K_W,
+	K_CTRL_X         = K_CTRL|K_X,
+	K_CTRL_Y         = K_CTRL|K_Y,
+	K_CTRL_Z         = K_CTRL|K_Z,
+	K_CTRL_0         = K_CTRL|K_0,
+	K_CTRL_1         = K_CTRL|K_1,
+	K_CTRL_2         = K_CTRL|K_2,
+	K_CTRL_3         = K_CTRL|K_3,
+	K_CTRL_4         = K_CTRL|K_4,
+	K_CTRL_5         = K_CTRL|K_5,
+	K_CTRL_6         = K_CTRL|K_6,
+	K_CTRL_7         = K_CTRL|K_7,
+	K_CTRL_8         = K_CTRL|K_8,
+	K_CTRL_9         = K_CTRL|K_9,
+
+	K_SHIFT_BACK      = K_SHIFT|K_BACKSPACE,
+	K_SHIFT_BACKSPACE = K_SHIFT|K_BACKSPACE,
+	K_SHIFT_TAB       = K_SHIFT|K_TAB,
+	K_SHIFT_RETURN    = K_SHIFT|K_ENTER,
+	K_SHIFT_ENTER     = K_SHIFT|K_ENTER,
+	K_SHIFT_ESCAPE    = K_SHIFT|K_ESCAPE,
+	K_SHIFT_SPACE     = K_SHIFT|K_SPACE,
+	K_SHIFT_PRIOR     = K_SHIFT|K_PAGEUP,
+	K_SHIFT_PAGEUP    = K_SHIFT|K_PAGEUP,
+	K_SHIFT_NEXT      = K_SHIFT|K_PAGEDOWN,
+	K_SHIFT_PAGEDOWN  = K_SHIFT|K_PAGEDOWN,
+	K_SHIFT_END       = K_SHIFT|K_END,
+	K_SHIFT_HOME      = K_SHIFT|K_HOME,
+	K_SHIFT_LEFT      = K_SHIFT|K_LEFT,
+	K_SHIFT_UP        = K_SHIFT|K_UP,
+	K_SHIFT_RIGHT     = K_SHIFT|K_RIGHT,
+	K_SHIFT_DOWN      = K_SHIFT|K_DOWN,
+	K_SHIFT_INSERT    = K_SHIFT|K_INSERT,
+	K_SHIFT_DELETE    = K_SHIFT|K_DELETE,
+
+	K_SHIFT_NUMPAD0   = K_SHIFT|K_NUMPAD0,
+	K_SHIFT_NUMPAD1   = K_SHIFT|K_NUMPAD1,
+	K_SHIFT_NUMPAD2   = K_SHIFT|K_NUMPAD2,
+	K_SHIFT_NUMPAD3   = K_SHIFT|K_NUMPAD3,
+	K_SHIFT_NUMPAD4   = K_SHIFT|K_NUMPAD4,
+	K_SHIFT_NUMPAD5   = K_SHIFT|K_NUMPAD5,
+	K_SHIFT_NUMPAD6   = K_SHIFT|K_NUMPAD6,
+	K_SHIFT_NUMPAD7   = K_SHIFT|K_NUMPAD7,
+	K_SHIFT_NUMPAD8   = K_SHIFT|K_NUMPAD8,
+	K_SHIFT_NUMPAD9   = K_SHIFT|K_NUMPAD9,
+	K_SHIFT_MULTIPLY  = K_SHIFT|K_MULTIPLY,
+	K_SHIFT_ADD       = K_SHIFT|K_ADD,
+	K_SHIFT_SEPARATOR = K_SHIFT|K_SEPARATOR,
+	K_SHIFT_SUBRACT   = K_SHIFT|K_SUBTRACT,
+	K_SHIFT_DECIMAL   = K_SHIFT|K_DECIMAL,
+	K_SHIFT_DIVIDE    = K_SHIFT|K_DIVIDE,
+	K_SHIFT_F1        = K_SHIFT|K_F1,
+	K_SHIFT_F2        = K_SHIFT|K_F2,
+	K_SHIFT_F3        = K_SHIFT|K_F3,
+	K_SHIFT_F4        = K_SHIFT|K_F4,
+	K_SHIFT_F5        = K_SHIFT|K_F5,
+	K_SHIFT_F6        = K_SHIFT|K_F6,
+	K_SHIFT_F7        = K_SHIFT|K_F7,
+	K_SHIFT_F8        = K_SHIFT|K_F8,
+	K_SHIFT_F9        = K_SHIFT|K_F9,
+	K_SHIFT_F10       = K_SHIFT|K_F10,
+	K_SHIFT_F11       = K_SHIFT|K_F11,
+	K_SHIFT_F12       = K_SHIFT|K_F12,
+	K_SHIFT_SCROLL    = K_SHIFT|K_SCROLL,
+
+	K_SHIFT_A         = K_SHIFT|K_A,
+	K_SHIFT_B         = K_SHIFT|K_B,
+	K_SHIFT_C         = K_SHIFT|K_C,
+	K_SHIFT_D         = K_SHIFT|K_D,
+	K_SHIFT_E         = K_SHIFT|K_E,
+	K_SHIFT_F         = K_SHIFT|K_F,
+	K_SHIFT_G         = K_SHIFT|K_G,
+	K_SHIFT_H         = K_SHIFT|K_H,
+	K_SHIFT_I         = K_SHIFT|K_I,
+	K_SHIFT_J         = K_SHIFT|K_J,
+	K_SHIFT_K         = K_SHIFT|K_K,
+	K_SHIFT_L         = K_SHIFT|K_L,
+	K_SHIFT_M         = K_SHIFT|K_M,
+	K_SHIFT_N         = K_SHIFT|K_N,
+	K_SHIFT_O         = K_SHIFT|K_O,
+	K_SHIFT_P         = K_SHIFT|K_P,
+	K_SHIFT_Q         = K_SHIFT|K_Q,
+	K_SHIFT_R         = K_SHIFT|K_R,
+	K_SHIFT_S         = K_SHIFT|K_S,
+	K_SHIFT_T         = K_SHIFT|K_T,
+	K_SHIFT_U         = K_SHIFT|K_U,
+	K_SHIFT_V         = K_SHIFT|K_V,
+	K_SHIFT_W         = K_SHIFT|K_W,
+	K_SHIFT_X         = K_SHIFT|K_X,
+	K_SHIFT_Y         = K_SHIFT|K_Y,
+	K_SHIFT_Z         = K_SHIFT|K_Z,
+	K_SHIFT_0         = K_SHIFT|K_0,
+	K_SHIFT_1         = K_SHIFT|K_1,
+	K_SHIFT_2         = K_SHIFT|K_2,
+	K_SHIFT_3         = K_SHIFT|K_3,
+	K_SHIFT_4         = K_SHIFT|K_4,
+	K_SHIFT_5         = K_SHIFT|K_5,
+	K_SHIFT_6         = K_SHIFT|K_6,
+	K_SHIFT_7         = K_SHIFT|K_7,
+	K_SHIFT_8         = K_SHIFT|K_8,
+	K_SHIFT_9         = K_SHIFT|K_9,
+
+	K_SHIFT_CTRL_BACK      = K_SHIFT_CTRL|K_BACKSPACE,
+	K_SHIFT_CTRL_BACKSPACE = K_SHIFT_CTRL|K_BACKSPACE,
+	K_SHIFT_CTRL_TAB       = K_SHIFT_CTRL|K_TAB,
+	K_SHIFT_CTRL_RETURN    = K_SHIFT_CTRL|K_ENTER,
+	K_SHIFT_CTRL_ENTER     = K_SHIFT_CTRL|K_ENTER,
+	K_SHIFT_CTRL_ESCAPE    = K_SHIFT_CTRL|K_ESCAPE,
+	K_SHIFT_CTRL_SPACE     = K_SHIFT_CTRL|K_SPACE,
+	K_SHIFT_CTRL_PRIOR     = K_SHIFT_CTRL|K_PAGEUP,
+	K_SHIFT_CTRL_PAGEUP    = K_SHIFT_CTRL|K_PAGEUP,
+	K_SHIFT_CTRL_NEXT      = K_SHIFT_CTRL|K_PAGEDOWN,
+	K_SHIFT_CTRL_PAGEDOWN  = K_SHIFT_CTRL|K_PAGEDOWN,
+	K_SHIFT_CTRL_END       = K_SHIFT_CTRL|K_END,
+	K_SHIFT_CTRL_HOME      = K_SHIFT_CTRL|K_HOME,
+	K_SHIFT_CTRL_LEFT      = K_SHIFT_CTRL|K_LEFT,
+	K_SHIFT_CTRL_UP        = K_SHIFT_CTRL|K_UP,
+	K_SHIFT_CTRL_RIGHT     = K_SHIFT_CTRL|K_RIGHT,
+	K_SHIFT_CTRL_DOWN      = K_SHIFT_CTRL|K_DOWN,
+	K_SHIFT_CTRL_INSERT    = K_SHIFT_CTRL|K_INSERT,
+	K_SHIFT_CTRL_DELETE    = K_SHIFT_CTRL|K_DELETE,
+	K_SHIFT_CTRL_LBRACKET  = K_SHIFT_CTRL|219|K_DELTA,
+	K_SHIFT_CTRL_RBRACKET  = K_SHIFT_CTRL|221|K_DELTA,
+
+	K_SHIFT_CTRL_NUMPAD0   = K_SHIFT_CTRL|K_NUMPAD0,
+	K_SHIFT_CTRL_NUMPAD1   = K_SHIFT_CTRL|K_NUMPAD1,
+	K_SHIFT_CTRL_NUMPAD2   = K_SHIFT_CTRL|K_NUMPAD2,
+	K_SHIFT_CTRL_NUMPAD3   = K_SHIFT_CTRL|K_NUMPAD3,
+	K_SHIFT_CTRL_NUMPAD4   = K_SHIFT_CTRL|K_NUMPAD4,
+	K_SHIFT_CTRL_NUMPAD5   = K_SHIFT_CTRL|K_NUMPAD5,
+	K_SHIFT_CTRL_NUMPAD6   = K_SHIFT_CTRL|K_NUMPAD6,
+	K_SHIFT_CTRL_NUMPAD7   = K_SHIFT_CTRL|K_NUMPAD7,
+	K_SHIFT_CTRL_NUMPAD8   = K_SHIFT_CTRL|K_NUMPAD8,
+	K_SHIFT_CTRL_NUMPAD9   = K_SHIFT_CTRL|K_NUMPAD9,
+	K_SHIFT_CTRL_MULTIPLY  = K_SHIFT_CTRL|K_MULTIPLY,
+	K_SHIFT_CTRL_ADD       = K_SHIFT_CTRL|K_ADD,
+	K_SHIFT_CTRL_SEPARATOR = K_SHIFT_CTRL|K_SEPARATOR,
+	K_SHIFT_CTRL_SUBRACT   = K_SHIFT_CTRL|K_SUBTRACT,
+	K_SHIFT_CTRL_DECIMAL   = K_SHIFT_CTRL|K_DECIMAL,
+	K_SHIFT_CTRL_DIVIDE    = K_SHIFT_CTRL|K_DIVIDE,
+	K_SHIFT_CTRL_F1        = K_SHIFT_CTRL|K_F1,
+	K_SHIFT_CTRL_F2        = K_SHIFT_CTRL|K_F2,
+	K_SHIFT_CTRL_F3        = K_SHIFT_CTRL|K_F3,
+	K_SHIFT_CTRL_F4        = K_SHIFT_CTRL|K_F4,
+	K_SHIFT_CTRL_F5        = K_SHIFT_CTRL|K_F5,
+	K_SHIFT_CTRL_F6        = K_SHIFT_CTRL|K_F6,
+	K_SHIFT_CTRL_F7        = K_SHIFT_CTRL|K_F7,
+	K_SHIFT_CTRL_F8        = K_SHIFT_CTRL|K_F8,
+	K_SHIFT_CTRL_F9        = K_SHIFT_CTRL|K_F9,
+	K_SHIFT_CTRL_F10       = K_SHIFT_CTRL|K_F10,
+	K_SHIFT_CTRL_F11       = K_SHIFT_CTRL|K_F11,
+	K_SHIFT_CTRL_F12       = K_SHIFT_CTRL|K_F12,
+	K_SHIFT_CTRL_SCROLL    = K_SHIFT_CTRL|K_SCROLL,
+
+	K_SHIFT_CTRL_A         = K_SHIFT_CTRL|K_A,
+	K_SHIFT_CTRL_B         = K_SHIFT_CTRL|K_B,
+	K_SHIFT_CTRL_C         = K_SHIFT_CTRL|K_C,
+	K_SHIFT_CTRL_D         = K_SHIFT_CTRL|K_D,
+	K_SHIFT_CTRL_E         = K_SHIFT_CTRL|K_E,
+	K_SHIFT_CTRL_F         = K_SHIFT_CTRL|K_F,
+	K_SHIFT_CTRL_G         = K_SHIFT_CTRL|K_G,
+	K_SHIFT_CTRL_H         = K_SHIFT_CTRL|K_H,
+	K_SHIFT_CTRL_I         = K_SHIFT_CTRL|K_I,
+	K_SHIFT_CTRL_J         = K_SHIFT_CTRL|K_J,
+	K_SHIFT_CTRL_K         = K_SHIFT_CTRL|K_K,
+	K_SHIFT_CTRL_L         = K_SHIFT_CTRL|K_L,
+	K_SHIFT_CTRL_M         = K_SHIFT_CTRL|K_M,
+	K_SHIFT_CTRL_N         = K_SHIFT_CTRL|K_N,
+	K_SHIFT_CTRL_O         = K_SHIFT_CTRL|K_O,
+	K_SHIFT_CTRL_P         = K_SHIFT_CTRL|K_P,
+	K_SHIFT_CTRL_Q         = K_SHIFT_CTRL|K_Q,
+	K_SHIFT_CTRL_R         = K_SHIFT_CTRL|K_R,
+	K_SHIFT_CTRL_S         = K_SHIFT_CTRL|K_S,
+	K_SHIFT_CTRL_T         = K_SHIFT_CTRL|K_T,
+	K_SHIFT_CTRL_U         = K_SHIFT_CTRL|K_U,
+	K_SHIFT_CTRL_V         = K_SHIFT_CTRL|K_V,
+	K_SHIFT_CTRL_W         = K_SHIFT_CTRL|K_W,
+	K_SHIFT_CTRL_X         = K_SHIFT_CTRL|K_X,
+	K_SHIFT_CTRL_Y         = K_SHIFT_CTRL|K_Y,
+	K_SHIFT_CTRL_Z         = K_SHIFT_CTRL|K_Z,
+	K_SHIFT_CTRL_0         = K_SHIFT_CTRL|K_0,
+	K_SHIFT_CTRL_1         = K_SHIFT_CTRL|K_1,
+	K_SHIFT_CTRL_2         = K_SHIFT_CTRL|K_2,
+	K_SHIFT_CTRL_3         = K_SHIFT_CTRL|K_3,
+	K_SHIFT_CTRL_4         = K_SHIFT_CTRL|K_4,
+	K_SHIFT_CTRL_5         = K_SHIFT_CTRL|K_5,
+	K_SHIFT_CTRL_6         = K_SHIFT_CTRL|K_6,
+	K_SHIFT_CTRL_7         = K_SHIFT_CTRL|K_7,
+	K_SHIFT_CTRL_8         = K_SHIFT_CTRL|K_8,
+	K_SHIFT_CTRL_9         = K_SHIFT_CTRL|K_9,
+
+	K_ALT_BACK      = K_ALT|K_BACKSPACE,
+	K_ALT_BACKSPACE = K_ALT|K_BACKSPACE,
+	K_ALT_TAB       = K_ALT|K_TAB,
+	K_ALT_RETURN    = K_ALT|K_ENTER,
+	K_ALT_ENTER     = K_ALT|K_ENTER,
+	K_ALT_ESCAPE    = K_ALT|K_ESCAPE,
+	K_ALT_SPACE     = K_ALT|K_SPACE,
+	K_ALT_PRIOR     = K_ALT|K_PAGEUP,
+	K_ALT_PAGEUP    = K_ALT|K_PAGEUP,
+	K_ALT_NEXT      = K_ALT|K_PAGEDOWN,
+	K_ALT_PAGEDOWN  = K_ALT|K_PAGEDOWN,
+	K_ALT_END       = K_ALT|K_END,
+	K_ALT_HOME      = K_ALT|K_HOME,
+	K_ALT_LEFT      = K_ALT|K_LEFT,
+	K_ALT_UP        = K_ALT|K_UP,
+	K_ALT_RIGHT     = K_ALT|K_RIGHT,
+	K_ALT_DOWN      = K_ALT|K_DOWN,
+	K_ALT_INSERT    = K_ALT|K_INSERT,
+	K_ALT_DELETE    = K_ALT|K_DELETE,
+
+	K_ALT_NUMPAD0   = K_ALT|K_NUMPAD0,
+	K_ALT_NUMPAD1   = K_ALT|K_NUMPAD1,
+	K_ALT_NUMPAD2   = K_ALT|K_NUMPAD2,
+	K_ALT_NUMPAD3   = K_ALT|K_NUMPAD3,
+	K_ALT_NUMPAD4   = K_ALT|K_NUMPAD4,
+	K_ALT_NUMPAD5   = K_ALT|K_NUMPAD5,
+	K_ALT_NUMPAD6   = K_ALT|K_NUMPAD6,
+	K_ALT_NUMPAD7   = K_ALT|K_NUMPAD7,
+	K_ALT_NUMPAD8   = K_ALT|K_NUMPAD8,
+	K_ALT_NUMPAD9   = K_ALT|K_NUMPAD9,
+	K_ALT_MULTIPLY  = K_ALT|K_MULTIPLY,
+	K_ALT_ADD       = K_ALT|K_ADD,
+	K_ALT_SEPARATOR = K_ALT|K_SEPARATOR,
+	K_ALT_SUBTRACT  = K_ALT|K_SUBTRACT,
+	K_ALT_DECIMAL   = K_ALT|K_DECIMAL,
+	K_ALT_DIVIDE    = K_ALT|K_DIVIDE,
+	K_ALT_F1        = K_ALT|K_F1,
+	K_ALT_F2        = K_ALT|K_F2,
+	K_ALT_F3        = K_ALT|K_F3,
+	K_ALT_F4        = K_ALT|K_F4,
+	K_ALT_F5        = K_ALT|K_F5,
+	K_ALT_F6        = K_ALT|K_F6,
+	K_ALT_F7        = K_ALT|K_F7,
+	K_ALT_F8        = K_ALT|K_F8,
+	K_ALT_F9        = K_ALT|K_F9,
+	K_ALT_F10       = K_ALT|K_F10,
+	K_ALT_F11       = K_ALT|K_F11,
+	K_ALT_F12       = K_ALT|K_F12,
+	K_ALT_SCROLL    = K_ALT|K_SCROLL,
+
+	K_ALT_A         = K_ALT|K_A,
+	K_ALT_B         = K_ALT|K_B,
+	K_ALT_C         = K_ALT|K_C,
+	K_ALT_D         = K_ALT|K_D,
+	K_ALT_E         = K_ALT|K_E,
+	K_ALT_F         = K_ALT|K_F,
+	K_ALT_G         = K_ALT|K_G,
+	K_ALT_H         = K_ALT|K_H,
+	K_ALT_I         = K_ALT|K_I,
+	K_ALT_J         = K_ALT|K_J,
+	K_ALT_K         = K_ALT|K_K,
+	K_ALT_L         = K_ALT|K_L,
+	K_ALT_M         = K_ALT|K_M,
+	K_ALT_N         = K_ALT|K_N,
+	K_ALT_O         = K_ALT|K_O,
+	K_ALT_P         = K_ALT|K_P,
+	K_ALT_Q         = K_ALT|K_Q,
+	K_ALT_R         = K_ALT|K_R,
+	K_ALT_S         = K_ALT|K_S,
+	K_ALT_T         = K_ALT|K_T,
+	K_ALT_U         = K_ALT|K_U,
+	K_ALT_V         = K_ALT|K_V,
+	K_ALT_W         = K_ALT|K_W,
+	K_ALT_X         = K_ALT|K_X,
+	K_ALT_Y         = K_ALT|K_Y,
+	K_ALT_Z         = K_ALT|K_Z,
+	K_ALT_0         = K_ALT|K_0,
+	K_ALT_1         = K_ALT|K_1,
+	K_ALT_2         = K_ALT|K_2,
+	K_ALT_3         = K_ALT|K_3,
+	K_ALT_4         = K_ALT|K_4,
+	K_ALT_5         = K_ALT|K_5,
+	K_ALT_6         = K_ALT|K_6,
+	K_ALT_7         = K_ALT|K_7,
+	K_ALT_8         = K_ALT|K_8,
+	K_ALT_9         = K_ALT|K_9,
+
+	K_CTRL_BREAK    = K_CTRL|K_BREAK,
+};
diff --git a/uppsrc/CtrlCore/MultiMon.dli b/uppsrc/CtrlCore/MultiMon.dli
new file mode 100644
index 000000000..38aa60c0b
--- /dev/null
+++ b/uppsrc/CtrlCore/MultiMon.dli
@@ -0,0 +1,6 @@
+FN_C(HMONITOR, WINAPI, MonitorFromWindow, (HWND, DWORD))
+FN_C(HMONITOR, WINAPI, MonitorFromRect, (LPCRECT, DWORD))
+FN_C(HMONITOR, WINAPI, MonitorFromPoint, (POINT, DWORD))
+FN_C(BOOL,     WINAPI, GetMonitorInfo, (HMONITOR, LPMONITORINFO))
+FN_C(BOOL,     WINAPI, EnumDisplayMonitors, (HDC, LPCRECT, MONITORENUMPROC, LPARAM))
+FN_C(BOOL,     WINAPI, EnumDisplayDevices, (PVOID, DWORD, PDISPLAY_DEVICE,DWORD))
diff --git a/uppsrc/CtrlCore/TopWin32.cpp b/uppsrc/CtrlCore/TopWin32.cpp
new file mode 100644
index 000000000..d65e3fda8
--- /dev/null
+++ b/uppsrc/CtrlCore/TopWin32.cpp
@@ -0,0 +1,260 @@
+#include "CtrlCore.h"
+
+NAMESPACE_UPP
+
+#define LLOG(x)  // LOG(x)
+
+#ifdef PLATFORM_WIN32
+
+void    TopWindow::SyncSizeHints() {}
+
+LRESULT TopWindow::WindowProc(UINT message, WPARAM wParam, LPARAM lParam)
+{
+	HWND hwnd = GetHWND();
+#ifndef PLATFORM_WINCE
+	bool inloop;
+#endif
+	switch(message) {
+#ifndef PLATFORM_WINCE
+	case WM_QUERYENDSESSION:
+		inloop = InLoop();
+		WhenClose();
+		return inloop ? !InLoop() : !IsOpen();
+	case WM_ENDSESSION:
+		EndSession() = true;
+		PostQuitMessage(0);
+		return 0;
+#endif
+	case WM_CLOSE:
+		if(IsEnabled()) {
+			IgnoreMouseUp();
+			WhenClose();
+		}
+		return 0;
+	case WM_WINDOWPOSCHANGED:
+#ifndef PLATFORM_WINCE
+		if(IsIconic(hwnd))
+			state = MINIMIZED;
+		else
+		if(IsZoomed(hwnd))
+			state = MAXIMIZED;
+		else
+#endif
+		{
+			state = OVERLAPPED;
+			overlapped = GetScreenClient(hwnd);
+		}
+		Layout();
+		break;
+	}
+	return Ctrl::WindowProc(message, wParam, lParam);
+}
+
+void TopWindow::SyncTitle()
+{
+	HWND hwnd = GetHWND();
+#ifndef PLATFORM_WINCE
+	if(hwnd)
+		if(IsWindowUnicode(hwnd))
+			::SetWindowTextW(hwnd, (const WCHAR*)~title);
+		else
+#endif
+			::SetWindowText(hwnd, ToSystemCharset(title.ToString()));
+}
+
+void TopWindow::DeleteIco()
+{
+	if(ico)
+		DestroyIcon(ico);
+	if(lico)
+		DestroyIcon(lico);
+	ico = lico = NULL;
+}
+
+void TopWindow::SyncCaption()
+{
+	LLOG("SyncCaption");
+	if(fullscreen)
+		return;
+	HWND hwnd = GetHWND();
+	if(hwnd) {
+		style = ::GetWindowLong(hwnd, GWL_STYLE);
+		exstyle = ::GetWindowLong(hwnd, GWL_EXSTYLE);
+	}
+	style &= ~(WS_THICKFRAME|WS_MINIMIZEBOX|WS_MAXIMIZEBOX|WS_SYSMENU|WS_POPUP|WS_DLGFRAME);
+	exstyle &= ~(WS_EX_TOOLWINDOW|WS_EX_DLGMODALFRAME);
+	style |= WS_CAPTION;
+	if(minimizebox)
+		style |= WS_MINIMIZEBOX;
+	if(maximizebox)
+		style |= WS_MAXIMIZEBOX;
+	if(sizeable)
+		style |= WS_THICKFRAME;
+#ifndef PLATFORM_WINCE
+	if(IsNull(icon) && !maximizebox && !minimizebox) {
+		style |= WS_POPUPWINDOW|WS_DLGFRAME;
+		exstyle |= WS_EX_DLGMODALFRAME;
+	}
+	else
+#endif
+		style |= WS_SYSMENU;
+	if(tool)
+		exstyle |= WS_EX_TOOLWINDOW;
+	if(hwnd) {
+		::SetWindowLong(hwnd, GWL_STYLE, style);
+		::SetWindowLong(hwnd, GWL_EXSTYLE, exstyle);
+		SyncTitle();
+	}
+	DeleteIco();
+#ifndef PLATFORM_WINCE //TODO!!!
+	if(hwnd) {
+		::SendMessage(hwnd, WM_SETICON, false, (LPARAM)(ico = IconWin32(icon)));
+		::SendMessage(hwnd, WM_SETICON, true, (LPARAM)(lico = IconWin32(largeicon)));
+	}
+#endif
+}
+
+void TopWindow::CenterRect(HWND hwnd, int center)
+{
+	SetupRect();
+	if(hwnd && center == 1 || center == 2) {
+		Size sz = GetRect().Size();
+		Rect frmrc(sz);
+	#ifndef PLATFORM_WINCE
+		::AdjustWindowRect(frmrc, WS_OVERLAPPEDWINDOW, FALSE);
+	#endif
+		Rect r, wr;
+		wr = Ctrl::GetWorkArea().Deflated(-frmrc.left, -frmrc.top,
+			frmrc.right - sz.cx, frmrc.bottom - sz.cy);
+		sz.cx = min(sz.cx, wr.Width());
+		sz.cy = min(sz.cy, wr.Height());
+		if(center == 1) {
+			::GetClientRect(hwnd, r);
+			if(r.IsEmpty())
+				r = wr;
+			else {
+				Point p = r.TopLeft();
+				::ClientToScreen(hwnd, p);
+				r.Offset(p);
+			}
+		}
+		else
+			r = wr;
+		Point p = r.CenterPos(sz);
+		if(p.x + sz.cx > wr.right) p.x = wr.right - sz.cx;
+		if(p.y + sz.cy > wr.bottom) p.y = wr.bottom - sz.cy;
+		if(p.x < wr.left) p.x = wr.left;
+		if(p.y < wr.top) p.y = wr.top;
+		SetRect(p.x, p.y, sz.cx, sz.cy);
+	}
+}
+
+static HWND trayHWND__;
+HWND   GetTrayHWND__()          { return trayHWND__; }
+void   SetTrayHWND__(HWND hwnd) { trayHWND__ = hwnd; }
+
+void TopWindow::Open(HWND hwnd)
+{
+	if(dokeys && (!GUI_AKD_Conservative() || GetAccessKeysDeep() <= 1))
+		DistributeAccessKeys();
+	UsrLogT(3, "OPEN " + Desc(this));
+	LLOG("TopWindow::Open, owner HWND = " << FormatIntHex((int)hwnd, 8) << ", Active = " << FormatIntHex((int)::GetActiveWindow(), 8));
+	IgnoreMouseUp();
+	SyncCaption();
+#ifdef PLATFORM_WINCE
+	if(!GetRect().IsEmpty())
+#endif
+	if(fullscreen) {
+		SetRect(GetScreenSize());
+		Create(hwnd, WS_POPUP, 0, false, SW_SHOWMAXIMIZED, false);
+	}
+	else {
+		CenterRect(hwnd, hwnd && hwnd == GetTrayHWND__() ? center ? 2 : 0 : center);
+		Create(hwnd, style, exstyle, false, state == OVERLAPPED ? SW_SHOWNORMAL :
+		                                    state == MINIMIZED  ? SW_MINIMIZE :
+		                                                          SW_MAXIMIZE, false);
+	}
+	PlaceFocus();
+	SyncCaption();
+	FixIcons();
+}
+
+void TopWindow::Open(Ctrl *owner)
+{
+	LLOG("TopWindow::Open(Ctrl) -> " << UPP::Name(owner));
+	Open(owner ? owner->GetTopCtrl()->GetHWND() : NULL);
+	if(IsOpen() && top)
+		top->owner = owner;
+}
+
+void TopWindow::Open()
+{
+	Open(::GetActiveWindow()); // :: needed because of ActiveX controls (to create modal dlgs owned by a HWND)
+}
+
+void TopWindow::OpenMain()
+{
+	Open((HWND) NULL);
+}
+
+void TopWindow::Minimize(bool effect)
+{
+	state = MINIMIZED;
+	if(IsOpen())
+#ifdef PLATFORM_WINCE
+		::ShowWindow(GetHWND(), SW_MINIMIZE);
+#else
+		::ShowWindow(GetHWND(), effect ? SW_MINIMIZE : SW_SHOWMINIMIZED);
+#endif
+}
+
+void TopWindow::Maximize(bool effect)
+{
+	state = MAXIMIZED;
+	if(IsOpen())
+		::ShowWindow(GetHWND(), effect ? SW_MAXIMIZE : SW_SHOWMAXIMIZED);
+}
+
+void TopWindow::Overlap(bool effect)
+{
+	state = OVERLAPPED;
+	if(IsOpen())
+		::ShowWindow(GetHWND(), effect ? SW_SHOWNORMAL : SW_RESTORE);
+}
+
+TopWindow& TopWindow::Style(dword _style)
+{
+	style = _style;
+	if(GetHWND())
+		::SetWindowLong(GetHWND(), GWL_STYLE, style);
+	SyncCaption();
+	return *this;
+}
+
+TopWindow& TopWindow::ExStyle(dword _exstyle)
+{
+	exstyle = _exstyle;
+	if(GetHWND())
+		::SetWindowLong(GetHWND(), GWL_EXSTYLE, exstyle);
+	SyncCaption();
+	return *this;
+}
+
+TopWindow& TopWindow::TopMost(bool b, bool stay_top)
+{
+	HWND hwnd;
+	if(hwnd = GetHWND())
+	{
+		SetWindowPos(hwnd, b ? HWND_TOPMOST : (stay_top ? HWND_NOTOPMOST : HWND_BOTTOM),0,0,0,0,SWP_NOMOVE|SWP_NOSIZE );
+	}
+	return ExStyle(b ? GetExStyle() | WS_EX_TOPMOST : GetExStyle() & ~WS_EX_TOPMOST);
+}
+
+bool TopWindow::IsTopMost() const
+{
+	return GetExStyle() & WS_EX_TOPMOST;
+}
+
+#endif
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/CtrlCore/TopWinX11.cpp b/uppsrc/CtrlCore/TopWinX11.cpp
new file mode 100644
index 000000000..b790ac5eb
--- /dev/null
+++ b/uppsrc/CtrlCore/TopWinX11.cpp
@@ -0,0 +1,295 @@
+#include "CtrlCore.h"
+
+NAMESPACE_UPP
+
+#define LLOG(x)    //DLOG(x)
+
+#ifdef PLATFORM_X11
+
+void TopWindow::SyncSizeHints()
+{
+	Size min = GetMinSize();
+	Size max = GetMaxSize();
+	if(!sizeable)
+		min = max = GetRect().Size();
+	Window w = GetWindow();
+	if(w && (min != xminsize || max != xmaxsize)) {
+		xminsize = min;
+		xmaxsize = max;
+		size_hints->min_width = min.cx;
+		size_hints->min_height = min.cy;
+		size_hints->max_width = max.cx;
+		size_hints->max_height = max.cy;
+		size_hints->flags = PMinSize|PMaxSize;
+		XSetWMNormalHints(Xdisplay, w, size_hints);
+	}
+}
+
+void TopWindow::EndIgnoreTakeFocus()
+{
+	ignoretakefocus = false;
+}
+
+void TopWindow::EventProc(XWindow& w, XEvent *event)
+{
+	Ptr<Ctrl> this_ = this;
+	if(event->type == ClientMessage) {
+		if(event->xclient.format == 32 && event->xclient.message_type)
+			if(event->xclient.message_type == XAtom("WM_PROTOCOLS")) {
+				Atom a = event->xclient.data.l[0];
+				if(a == XAtom("WM_DELETE_WINDOW") && IsEnabled()) {
+					LLOG("DELETE_WINDOW " << Name());
+					WhenClose();
+					return;
+				}
+				if(a == XAtom("WM_TAKE_FOCUS")) {
+					LLOG("TAKE_FOCUS serial: " << event->xclient.serial);
+					Xeventtime = event->xclient.data.l[1];
+					TakeFocus();
+					return;
+				}
+			}
+	}
+	if(this_) Ctrl::EventProc(w, event);
+	if(this_) SyncSizeHints();
+}
+
+void TopWindow::DefSyncTitle()
+{
+	if(title2 == title)
+		return;
+	title2 = title;
+	if(IsOpen() && GetWindow()) {
+		Window w = GetWindow();
+		XStoreName(Xdisplay, w, title.ToString());
+		XSetIconName(Xdisplay, w, title.ToString());
+		String utf8title = FromUnicode(title, CHARSET_UTF8);
+		XChangeProperty(Xdisplay, w, XAtom("_NET_WM_NAME"), XAtom("UTF8_STRING"),
+		                8, PropModeReplace,
+		                (const unsigned char *)~utf8title, utf8title.GetLength());
+		XChangeProperty(Xdisplay, w, XAtom("_NET_WM_ICON_NAME"), XAtom("UTF8_STRING"),
+		                8, PropModeReplace,
+		                (const unsigned char *)~utf8title, utf8title.GetLength());
+	}
+}
+
+void TopWindow::SyncTitle()
+{
+	LLOG("SyncTitle: " << title);
+	KillTimeCallback(TIMEID_DEFSYNCTITLE);
+	SetTimeCallback(0, THISBACK(DefSyncTitle), TIMEID_DEFSYNCTITLE);
+	LLOG("*SyncTitle: " << title);
+}
+
+void TopWindow::SyncCaption()
+{
+	LLOG("SyncCaption");
+	SyncTitle();
+	if(IsOpen() && GetWindow()) {
+		unsigned long wina[6];
+		int n = 0;
+		Window w = GetWindow();
+		if(tool)
+			wina[n++] = XAtom("_NET_WM_WINDOW_TYPE_TOOLBAR");
+		if(GetOwner())
+			wina[n++] = XAtom("_NET_WM_WINDOW_TYPE_DIALOG");
+		wina[n++] = XAtom("_NET_WM_WINDOW_TYPE_NORMAL");
+		XChangeProperty(Xdisplay, GetWindow(), XAtom("_NET_WM_WINDOW_TYPE"), XAtom("ATOM"), 32,
+		                PropModeReplace, (const unsigned char *)wina, n);
+		n = 0;
+		if(topmost)
+			wina[n++] = XAtom("_NET_WM_STATE_ABOVE");
+		if(state == MAXIMIZED) {
+			wina[n++] = XAtom("_NET_WM_STATE_MAXIMIZED_HORZ");
+			wina[n++] = XAtom("_NET_WM_STATE_MAXIMIZED_VERT");
+		}
+		if(fullscreen)
+			wina[n++] = XAtom("_NET_WM_STATE_FULLSCREEN");
+		XChangeProperty(Xdisplay, GetWindow(), XAtom("_NET_WM_STATE"), XAtom("ATOM"), 32,
+		                PropModeReplace, (const unsigned char *)wina, n);
+		wm_hints->flags = InputHint|WindowGroupHint|StateHint;
+		wm_hints->initial_state = NormalState;
+		wm_hints->input = XTrue;
+		Ctrl *owner = GetOwner();
+		wm_hints->window_group = owner ? owner->GetWindow() : w;
+		if(!icon.IsEmpty()) {
+			Size isz = icon.GetSize();
+			int len = 2 + isz.cx * isz.cy;
+			Buffer<unsigned long> data(len);
+			unsigned long *t = data;
+			*t++ = isz.cx;
+			*t++ = isz.cy;
+			for(int y = 0; y < isz.cy; y++) {
+				const RGBA *q = icon[y];
+				for(int x = isz.cx; x--;) {
+					*t++ = ((dword)q->a << 24) |
+					       (dword)q->b | ((dword)q->g << 8) | ((dword)q->r << 16);
+					q++;
+				}
+			}
+			XChangeProperty(Xdisplay, w, XAtom("_NET_WM_ICON"), XA_CARDINAL, 32, PropModeReplace,
+			                (const unsigned char *)~data, len);
+		}
+		XSetWMHints(Xdisplay, w, wm_hints);
+	}
+}
+
+void TopWindow::CenterRect(Ctrl *owner)
+{
+	SetupRect();
+	if(owner && center == 1 || center == 2) {
+		Size sz = GetRect().Size();
+		Rect r, wr;
+		wr = Ctrl::GetWorkArea();
+		Rect fm = windowFrameMargin;
+		if((fm.left|fm.right|fm.top|fm.bottom) == 0)
+			fm = Rect(8, 32, 8, 8);
+		if(center == 1)
+			r = owner->GetRect();
+		else
+			r = wr;
+		Point p = r.CenterPos(sz);
+		r = RectC(p.x, p.y, sz.cx, sz.cy);
+		wr.left += fm.left;
+		wr.right -= fm.right;
+		wr.top += fm.top;
+		wr.bottom -= fm.bottom;
+		if(r.top < wr.top) {
+			r.bottom += wr.top - r.top;
+			r.top = wr.top;
+		}
+		if(r.bottom > wr.bottom)
+			r.bottom = wr.bottom;
+		minsize.cx = min(minsize.cx, r.GetWidth());
+		minsize.cy = min(minsize.cy, r.GetHeight());
+		SetRect(r);
+	}
+}
+
+void TopWindow::Open(Ctrl *owner)
+{
+	if(dokeys && (!GUI_AKD_Conservative() || GetAccessKeysDeep() <= 1))
+		DistributeAccessKeys();
+	UsrLogT(3, "OPEN " + Desc(this));
+	LLOG("OPEN " << Name() << " owner: " << UPP::Name(owner));
+	IgnoreMouseUp();
+	if(fullscreen)
+		SetRect(0, 0, Xwidth, Xheight);
+	else
+		CenterRect(owner);
+	LLOG("Open NextRequest " << NextRequest(Xdisplay));
+	Create(owner, false, false);
+	xminsize.cx = xmaxsize.cx = Null;
+	title2.Clear();
+	LLOG("SyncCaption");
+	SyncCaption();
+	LLOG("SyncSizeHints");
+	size_hints->flags = 0;
+	SyncSizeHints();
+	Rect r = GetRect();
+	size_hints->x = r.left;
+	size_hints->y = r.top;
+	size_hints->width = r.Width();
+	size_hints->height = r.Height();
+	size_hints->win_gravity = StaticGravity;
+	size_hints->flags |= PPosition|PSize|PWinGravity;
+	if(owner) {
+		ASSERT(owner->IsOpen());
+		LLOG("XSetTransientForHint");
+		XSetTransientForHint(Xdisplay, GetWindow(), owner->GetWindow());
+	}
+	LLOG("XSetWMNormalHints");
+	XSetWMNormalHints(Xdisplay, GetWindow(), size_hints);
+	Atom protocols[2];
+	protocols[0] = XAtom("WM_DELETE_WINDOW");
+	protocols[1] = XAtom("WM_TAKE_FOCUS");
+	LLOG("XSetWMProtocols");
+	XSetWMProtocols(Xdisplay, GetWindow(), protocols, 2);
+	String x = GetExeTitle().ToString();
+	const char *progname = ~x;
+	class_hint->res_name = (char *)progname;
+	class_hint->res_class = (char *)progname;
+	XSetClassHint(Xdisplay, GetWindow(), class_hint);
+	LLOG("WndShow(" << visible << ")");
+	WndShow(visible);
+	if(visible) {
+		XEvent e;
+		LLOG("XWindowEvent");
+		XWindowEvent(Xdisplay, top->window, VisibilityChangeMask, &e);
+		ignoretakefocus = true;
+		SetTimeCallback(500, THISBACK(EndIgnoreTakeFocus));
+		LLOG("SetWndFocus");
+		SetWndFocus();
+		for(int i = 0; i < 50; i++) {
+			if(XCheckTypedWindowEvent(Xdisplay, top->window, FocusIn, &e)) {
+				ProcessEvent(&e);
+				if(e.xfocus.window == top->window)
+					break;
+			}
+			Sleep(10);
+		}
+	}
+	LLOG(">Open NextRequest " << NextRequest(Xdisplay));
+	LLOG(">OPENED " << Name());
+	PlaceFocus();
+	StateH(OPEN);
+	Vector<int> fe = GetPropertyInts(top->window, XAtom("_NET_FRAME_EXTENTS"));
+	if(fe.GetCount() >= 4 &&
+	   fe[0] >= 0 && fe[0] <= 16 && fe[1] >= 0 && fe[1] <= 16 && //fluxbox returns wrong numbers - quick&dirty workaround
+	   fe[2] >= 0 && fe[2] <= 64 && fe[3] >= 0 && fe[3] <= 48)
+	{
+		windowFrameMargin.left = max(windowFrameMargin.left, fe[0]);
+		windowFrameMargin.right = max(windowFrameMargin.right, fe[1]);
+		windowFrameMargin.top = max(windowFrameMargin.top, fe[2]);
+		windowFrameMargin.bottom = max(windowFrameMargin.bottom, fe[3]);
+	}
+	if(IsOpen() && top)
+		top->owner = owner;
+
+	int version = 5;
+	XChangeProperty(Xdisplay, GetWindow(), XAtom("XdndAware"), XA_ATOM, 32,
+					0, (byte *)&version, 1);
+	FixIcons();
+}
+
+void TopWindow::Open()
+{
+	Open(GetActiveWindow());
+}
+
+void TopWindow::OpenMain()
+{
+	Open(NULL);
+}
+
+void TopWindow::Minimize(bool)
+{
+	state = MINIMIZED;
+	XIconifyWindow(Xdisplay, GetWindow(), Xscreenno);
+}
+
+void TopWindow::Maximize(bool effect)
+{
+	state = MAXIMIZED;
+}
+
+void TopWindow::Overlap(bool effect)
+{
+	state = OVERLAPPED;
+
+}
+
+TopWindow& TopWindow::TopMost(bool b, bool)
+{
+	topmost = b;
+	return *this;
+}
+
+bool TopWindow::IsTopMost() const
+{
+	return topmost;
+}
+
+#endif
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/CtrlCore/TopWindow.cpp b/uppsrc/CtrlCore/TopWindow.cpp
new file mode 100644
index 000000000..419e1ba66
--- /dev/null
+++ b/uppsrc/CtrlCore/TopWindow.cpp
@@ -0,0 +1,537 @@
+#include "CtrlCore.h"
+
+NAMESPACE_UPP
+
+#define LLOG(x)   // LOG(x)
+
+Rect TopWindow::windowFrameMargin;
+
+String TopWindow::GetDesc() const
+{
+	return title.ToString();
+}
+
+Size TopWindow::GetMinSize() const
+{
+	return minsize;
+}
+
+Size TopWindow::GetStdSize() const
+{
+	return GetMinSize();
+}
+
+void TopWindow::ActiveFocus0(Ctrl& ctrl)
+{
+	if(IsChild()) return;
+	activefocus = &ctrl;
+	if(IsForeground()) ctrl.SetWantFocus();
+}
+
+void TopWindow::Activate()
+{
+	LLOG("Activate " << Name() << " activefocus = " << UPP::Name(activefocus));
+	UsrLogT(3, "ACTIVATE " + Desc(this));
+	if(activefocus && (HasFocus() || !GetFocusChildDeep()) && IsEnabled())
+		activefocus->SetWantFocus();
+	LLOG("Activate End");
+}
+
+void TopWindow::ChildGotFocus()
+{
+	activefocus = GetFocusCtrl();
+}
+
+void TopWindow::Deactivate()
+{
+	LLOG("DeActivate current focus " << UPP::Name(GetFocusCtrl()));
+	if(HasFocusDeep())
+		activefocus = GetFocusCtrl();
+	UsrLogT(3, "DEACTIVATE " + Desc(this));
+	LLOG("DeActivate " << Name() << " activefocus = " << UPP::Name(activefocus));
+}
+
+void TopWindow::PlaceFocus()
+{
+	if(activefocus)
+		activefocus->SetFocus();
+	else
+		IterateFocusForward(this, this, true, true);
+}
+
+bool TopWindow::IsShowEnabled() const
+{
+	return true;
+}
+
+void TopWindow::Close()
+{
+	if(InLoop()) {
+		if(!InCurrentLoop()) return;
+		if(FindAction(IDCANCEL))
+			RejectBreak(IDCANCEL);
+		else
+		if(FindAction(IDYES))
+			AcceptBreak(IDYES);
+		else
+			AcceptBreak(IDOK);
+		return;
+	}
+	backup.Clear();
+	if(IsOpen()) IgnoreMouseUp();
+	Ctrl::Close();
+}
+
+void TopWindow::Backup()
+{
+	StringStream s;
+	Ctrl::Serialize(s);
+	backup = s;
+}
+
+void TopWindow::Restore()
+{
+	StringStream s(backup);
+	Ctrl::Serialize(s);
+}
+
+bool TopWindow::Accept()
+{
+	Ctrl *q;
+	for(q = GetFirstChild(); q; q = q->GetNext())
+		if(!q->Accept())
+			return false;
+	return true;
+}
+
+void TopWindow::Reject()
+{
+	for(Ctrl *q = GetFirstChild(); q; q = q->GetNext())
+		q->Reject();
+	if(!backup.IsEmpty())
+		Restore();
+}
+
+void TopWindow::Break(int ID)
+{
+	EndLoop(ID);
+}
+
+bool TopWindow::AcceptBreak(int ID)
+{
+	if(Accept()) {
+		Break(ID);
+		return true;
+	}
+	return false;
+}
+
+void TopWindow::RejectBreak(int ID)
+{
+	Reject();
+	Break(ID);
+}
+
+void TopWindow::SetupRect()
+{
+	Rect r = GetRect();
+	if(r.IsEmpty())
+	   SetRect(GetDefaultWindowRect());
+	else
+	if(r.left == 0 && r.top == 0 && center == 1) {
+		Rect area = Ctrl::GetWorkArea();
+		SetRect(area.CenterRect(min(area.Size(), r.Size())));
+	}
+}
+
+void TopWindow::FixIcons()
+{
+	TopWindow *q = GetMainWindow();
+	if(q) {
+		if(IsNull(icon)) {
+			icon = q->GetIcon();
+			SyncCaption();
+		}
+		if(IsNull(largeicon)) {
+			largeicon = q->GetIcon();
+			SyncCaption();
+		}
+	}
+}
+
+TopWindow::Abreak *TopWindow::FindAction(int ID)
+{
+	for(int i = 0; i < action.GetCount(); i++)
+		if(action[i].ID == ID) return &action[i];
+	return NULL;
+}
+
+TopWindow::Abreak *TopWindow::FindAddAction(int ID)
+{
+	Abreak *x = FindAction(ID);
+	if(x) return x;
+	Abreak& a = action.Add();
+	a.ID = ID;
+	a.dlg = this;
+	return &a;
+}
+
+Callback TopWindow::Breaker(int ID)
+{
+	return callback(FindAddAction(ID), &Abreak::Break);
+}
+
+Callback TopWindow::Acceptor(int ID)
+{
+	return callback(FindAddAction(ID), &Abreak::Accept);
+}
+
+Callback TopWindow::Rejector(int ID)
+{
+	return callback(FindAddAction(ID), &Abreak::Reject);
+}
+
+TopWindow& TopWindow::Breaker(Ctrl& m, int ID)
+{
+	m.WhenAction = Breaker(ID);
+	return *this;
+}
+
+TopWindow& TopWindow::Acceptor(Ctrl& m, int ID)
+{
+	m.WhenAction = Acceptor(ID);
+	return *this;
+}
+
+TopWindow& TopWindow::Rejector(Ctrl& m, int ID)
+{
+	m.WhenAction = Rejector(ID);
+	return *this;
+}
+
+void TopWindow::Paint(Draw& w)
+{
+	background.Paint(w, Rect(GetSize()), SColorText, SColorShadow);
+}
+
+TopWindow& TopWindow::Background(const PaintRect& prect)
+{
+	background = prect;
+	Refresh();
+	return *this;
+}
+
+bool TopWindow::Key(dword key, int count)
+{
+	if(Ctrl::Key(key, count))
+		return true;
+	if(IsChild()) return false;
+	if(key == K_DOWN || key == K_RIGHT || key == K_TAB) {
+		Ctrl *ctrl = GetFocusChildDeep();
+		if(ctrl && IterateFocusForward(ctrl, this))
+			return true;
+		ctrl = GetFirstChild();
+		if(ctrl) {
+			if(ctrl->SetWantFocus()) return true;
+			return IterateFocusForward(ctrl, this);
+		}
+	}
+	if(key == K_UP || key == K_LEFT || key == K_SHIFT_TAB) {
+		Ctrl *ctrl = GetFocusChildDeep();
+		if(ctrl && IterateFocusBackward(ctrl, this))
+			return true;
+		ctrl = GetLastChild();
+		if(ctrl) {
+			if(ctrl->SetWantFocus()) return true;
+			return IterateFocusBackward(ctrl, this);
+		}
+	}
+	return false;
+}
+
+void TopWindow::WorkAreaTrim()
+{
+	Rect a = GetWorkArea();
+	Rect h = GetRect();
+	h.left = max(h.left, a.left);
+	h.right = min(h.right, a.right);
+	h.top = max(h.top, a.top);
+	h.bottom = min(h.bottom, a.bottom);
+	if(h != GetRect() && !IsChild())
+		SetRect(h);
+}
+
+
+void GatherWindowTree(Ctrl *w, const Vector<Ctrl *>& ws, Vector<Ctrl *>& es)
+{
+	if(!w->InLoop())
+		es.Add(w);
+	for(int i = 0; i < ws.GetCount(); i++)
+		if(ws[i]->GetOwner() == w)
+			GatherWindowTree(ws[i], ws, es);
+}
+
+int  TopWindow::Run(bool appmodal)
+{
+	LLOG("TopWindow::Run() <- " << typeid(*this).name());
+	LLOG("Focus = " << UPP::Name(GetFocusCtrl()));
+	if(!IsOpen())
+		Open();
+	if(!IsVisible()) Show();
+	bool pinloop = inloop;
+	int  pexitcode = exitcode;
+	exitcode = Null;
+	Vector<Ctrl *> es;
+	if(appmodal)
+		es = GetTopCtrls();
+	else {
+		Vector<Ctrl *> ws = GetTopCtrls();
+		for(int i = 0; i < ws.GetCount(); i++)
+			if(ws[i]->InLoop())
+				es.Add(ws[i]);
+		Ctrl *mw = GetMainWindow();
+		if(mw) GatherWindowTree(mw, ws, es);
+	}
+	Vector< Ptr<Ctrl> > disabled = DisableCtrls(es, this);
+#ifdef _DEBUG
+	for(int d = 0; d < disabled.GetCount(); d++)
+		LLOG("DisableCtrls[" << d << "] = " << UPP::Name(disabled[d]));
+	LLOG("Running EventLoop in " << UPP::Name(this));
+#endif
+	EventLoop(this);
+#ifdef _DEBUG
+	LLOG("Finished EventLoop in " << UPP::Name(this));
+	for(int e = 0; e < disabled.GetCount(); e++)
+		LLOG("EnableCtrls[" << e << "] = " << UPP::Name(disabled[e]));
+#endif
+	EnableCtrls(disabled);
+	int q = exitcode;
+	inloop = pinloop;
+	exitcode = pexitcode;
+	LLOG("TopWindow::Run() = " << q << " -> " << typeid(*this).name());
+#ifdef PLATFORM_WIN32
+	LLOG("Focus = " << UPP::Name(GetFocusCtrl()) << ", raw " << (void *)::GetFocus());
+#endif
+	return q;
+}
+
+int  TopWindow::Execute()
+{
+	int m = Run();
+	Close();
+	return m;
+}
+
+TopWindow& TopWindow::Title(const WString& _title)
+{
+	if(title != _title) {
+		title = _title;
+		SyncTitle();
+	}
+	return *this;
+}
+
+TopWindow& TopWindow::Title(const char *s)
+{
+	return Title(WString(s));
+}
+
+TopWindow& TopWindow::Sizeable(bool b)
+{
+	sizeable = b;
+	SyncCaption();
+	SyncSizeHints();
+	return *this;
+}
+
+TopWindow& TopWindow::MinimizeBox(bool b)
+{
+	minimizebox = b;
+	SyncCaption();
+	SyncSizeHints();
+	return *this;
+}
+
+TopWindow& TopWindow::MaximizeBox(bool b)
+{
+	maximizebox = b;
+	SyncCaption();
+	SyncSizeHints();
+	return *this;
+}
+
+TopWindow& TopWindow::Icon(const Image& m)
+{
+	if(!icon.IsSame(m)) {
+		icon = m;
+		SyncCaption();
+	}
+	return *this;
+}
+
+TopWindow& TopWindow::LargeIcon(const Image& m)
+{
+	if(!largeicon.IsSame(m)) {
+		largeicon = m;
+		SyncCaption();
+	}
+	return *this;
+}
+
+TopWindow& TopWindow::Icon(const Image& smallicon, const Image& _largeicon)
+{
+	if(!icon.IsSame(smallicon) || !largeicon.IsSame(_largeicon)) {
+		icon = smallicon;
+		largeicon = _largeicon;
+		SyncCaption();
+	}
+	SyncCaption();
+	return *this;
+}
+
+TopWindow& TopWindow::ToolWindow(bool b)
+{
+	tool = b;
+	SyncCaption();
+	return *this;
+}
+
+void TopWindow::SerializePlacement(Stream& s, bool reminimize)
+{
+#ifndef PLATFORM_WINCE
+	int version = 0;
+	s / version;
+	Rect rect = GetRect();
+	s % overlapped % rect;
+	bool mn = state == MINIMIZED;
+	bool mx = state == MAXIMIZED;
+	s.Pack(mn, mx);
+	LLOG("TopWindow::SerializePlacement / " << (s.IsStoring() ? "write" : "read"));
+	LLOG("minimized = " << mn << ", maximized = " << mx);
+	LLOG("rect = " << rect << ", overlapped = " << overlapped);
+	if(s.IsLoading()) {
+		if(mn) rect = overlapped;
+		Rect limit = GetWorkArea();
+#ifdef PLATFORM_WIN32
+		Rect outer = rect;
+		::AdjustWindowRect(outer, WS_OVERLAPPEDWINDOW, FALSE);
+		limit.left   += rect.left   - outer.left;
+		limit.top    += rect.top    - outer.top;
+		limit.right  += rect.right  - outer.right;
+		limit.bottom += rect.bottom - outer.bottom;
+#endif
+#ifdef PLATFORM_X11
+		Rect fm = windowFrameMargin;
+		if((fm.left|fm.right|fm.top|fm.bottom) == 0)
+			fm = Rect(8, 32, 8, 8);
+		limit.left += fm.left;
+		limit.right -= fm.right;
+		limit.top += fm.top;
+		limit.bottom -= fm.bottom;
+#endif
+		Size sz = min(rect.Size(), limit.Size());
+		rect = RectC(
+			minmax(rect.left, limit.left, limit.right - sz.cx),
+			minmax(rect.top,  limit.top,  limit.bottom - sz.cy),
+			sz.cx, sz.cy);
+		state = OVERLAPPED;
+		if(mn && reminimize)
+			state = MINIMIZED;
+		if(mx)
+			state = MAXIMIZED;
+#ifdef PLATFORM_WIN32
+		if(state == OVERLAPPED)
+#endif
+			SetRect(rect);
+		if(IsOpen()) {
+	#ifdef PLATFORM_WIN32
+			HWND hwnd = GetHWND();
+			switch(state) {
+			case MINIMIZED:
+				if(!IsIconic(hwnd))
+					::ShowWindow(hwnd, SW_MINIMIZE);
+				break;
+			case MAXIMIZED:
+				if(!IsZoomed(hwnd))
+					::ShowWindow(hwnd, SW_MAXIMIZE);
+				break;
+			default:
+				if(IsIconic(hwnd) || IsZoomed(hwnd))
+					::ShowWindow(hwnd, SW_RESTORE);
+				break;
+			}
+	#endif
+		}
+	}
+#endif
+}
+
+struct DialogBackground : public Display {
+	void Paint(Draw& w, const Rect& r, const Value& q, Color ink, Color paper, dword style) const
+	{
+		w.DrawRect(r, SColorFace());
+	}
+};
+
+TopWindow::TopWindow()
+{
+	TransparentBackPaint();
+	background = PaintRect(Single<DialogBackground>(), Null);
+	center = 1;
+	minsize = Size(80, 20);
+
+#ifdef PLATFORM_WIN32
+	style = 0;
+	exstyle = 0;
+	ico = lico = NULL;
+#endif
+#ifdef PLATFORM_X11
+	size_hints = XAllocSizeHints();
+	wm_hints = XAllocWMHints();
+	class_hint = XAllocClassHint();
+	topmost = false;
+#endif
+	maximizebox = minimizebox = sizeable = tool = false;
+	state = OVERLAPPED;
+	WhenClose = THISBACK(Close);
+	overlapped.Clear();
+	dokeys = true;
+	fullscreen = false;
+}
+
+TopWindow::~TopWindow()
+{
+	if(InLoop())
+		EndLoop(IDOK);
+	if(!IsChild())
+		Close();
+#ifdef PLATFORM_WIN32
+	DeleteIco();
+#endif
+#ifdef PLATFORM_X11
+	XFree(size_hints);
+	XFree(wm_hints);
+	XFree(class_hint);
+#endif
+}
+
+void Maxisize(TopWindow& win, int screencxmax)
+{
+	if(win.GetWorkArea().Width() <= screencxmax)
+		win.Maximize();
+}
+
+CH_INT(SwapOKCancel, 0);
+
+void ArrangeOKCancel(Ctrl& ok, Ctrl& cancel)
+{
+	if(SwapOKCancel() &&
+	   ok.GetPos().x.GetB() == cancel.GetPos().x.GetB() &&
+	   ok.GetPos().y.GetB() == cancel.GetPos().y.GetB()) {
+	       Ctrl::LogPos h = ok.GetPos();
+	       ok.SetPos(cancel.GetPos());
+	       cancel.SetPos(h);
+	}
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/CtrlCore/TopWindow.h b/uppsrc/CtrlCore/TopWindow.h
new file mode 100644
index 000000000..ccbce8d2b
--- /dev/null
+++ b/uppsrc/CtrlCore/TopWindow.h
@@ -0,0 +1,271 @@
+#ifdef PLATFORM_X11
+
+enum {
+	IDOK = 1,
+	IDCANCEL = 2,
+	IDABORT = 3,
+	IDRETRY = 4,
+	IDIGNORE = 5,
+	IDYES = 6,
+	IDNO = 7,
+	IDCLOSE = 8,
+	IDHELP = 9,
+};
+
+#endif
+
+enum {
+	IDEXIT = IDYES
+};
+
+class TopWindow : public Ctrl {
+public:
+	virtual Size     GetMinSize() const;
+	virtual Size     GetStdSize() const;
+	virtual void     Activate();
+	virtual void     Deactivate();
+	virtual bool     Accept();
+	virtual void     Reject();
+	virtual void     Paint(Draw& w);
+	virtual bool     IsShowEnabled() const;
+	virtual bool     Key(dword key, int count);
+	virtual void     Close();
+	virtual String   GetDesc() const;
+	virtual void     ChildGotFocus();
+
+#ifdef PLATFORM_WIN32
+public:
+	virtual LRESULT  WindowProc(UINT message, WPARAM wParam, LPARAM lParam);
+
+private:
+
+	dword       style;
+	dword       exstyle;
+	HICON       ico, lico;
+
+	void        DeleteIco();
+#endif
+
+protected:
+	enum {
+		TIMEID_DEFSYNCTITLE = Ctrl::TIMEID_COUNT,
+		TIMEID_COUNT,
+	};
+
+#ifdef PLATFORM_X11
+	virtual void    EventProc(XWindow& w, XEvent *event);
+private:
+	XSizeHints *size_hints;
+	XWMHints   *wm_hints;
+	XClassHint *class_hint;
+	Size        xminsize, xmaxsize;
+	bool        topmost;
+#endif
+
+	static  Rect      windowFrameMargin;
+
+private:
+	struct Abreak : Pte<Abreak> {
+		int         ID;
+		TopWindow *dlg;
+
+		void    Accept()      { dlg->AcceptBreak(ID); }
+		void    Reject()      { dlg->RejectBreak(ID); }
+		void    Break()       { dlg->Break(ID); }
+	};
+
+	Array<Abreak> action;
+	Ptr<Ctrl>     activefocus;
+	String        backup;
+	PaintRect     background;
+	Size          minsize;
+	bool          dokeys;
+	bool          fullscreen;
+
+	byte          center:2;
+
+	void          PlaceFocus();
+	void          ActiveFocus0(Ctrl& ctrl);
+	Abreak       *FindAddAction(int ID);
+	Abreak       *FindAction(int ID);
+
+#ifdef PLATFORM_WIN32
+	void          CenterRect(HWND owner, int center);
+#endif
+
+#ifdef PLATFORM_X11
+	void          CenterRect(Ctrl *owner);
+	void          DefSyncTitle();
+	void          EndIgnoreTakeFocus();
+#endif
+
+	Rect        overlapped;
+
+	void        SyncSizeHints();
+	void        SyncTitle();
+	void        SyncCaption();
+
+	void        SetupRect();
+
+	void        FixIcons();
+
+	enum { MINIMIZED, MAXIMIZED, OVERLAPPED };
+
+	WString     title;
+	bool        minimizebox:1;
+	bool        maximizebox:1;
+	bool        sizeable:1;
+	bool        tool:1;
+	byte        state;
+	Image       icon, largeicon;
+#ifdef PLATFORM_X11
+	Image       invert;
+	WString     title2;
+#endif
+
+public:
+	Callback    WhenClose;
+
+	void        Backup();
+	void        Restore();
+
+	void        Break(int ID = IDEXIT);
+	bool        AcceptBreak(int ID);
+	void        RejectBreak(int ID);
+
+	void        WorkAreaTrim();
+
+	Callback    Breaker(int ID = IDEXIT);
+	Callback    Acceptor(int ID);
+	Callback    Rejector(int ID);
+
+	TopWindow&  Breaker(Ctrl& m, int ID = -1);
+	TopWindow&  Acceptor(Ctrl& m, int ID);
+	TopWindow&  Rejector(Ctrl& m, int ID);
+
+	TopWindow&  NoCenter()                          { center = 0; return *this; }
+	TopWindow&  CenterOwner()                       { center = 1; return *this; }
+	TopWindow&  CenterScreen()                      { center = 2; return *this; }
+
+	void        SetMinSize(Size sz)                 { minsize = sz; }
+
+#ifdef PLATFORM_WIN32
+	void       Open(HWND ownerhwnd);
+	TopWindow& Style(dword _style);
+	dword      GetStyle() const                       { return style; }
+	TopWindow& ExStyle(dword _exstyle);
+	dword      GetExStyle() const                     { return exstyle; }
+#endif
+
+	void       Open(Ctrl *owner);
+	void       Open();
+	void       OpenMain();
+	int        Run(bool appmodal = false);
+	int        RunAppModal()                          { return Run(true); }
+	int        Execute();
+	bool       ExecuteOK()                            { return Execute() == IDOK;     }
+	bool       ExecuteCancel()                        { return Execute() == IDCANCEL; }
+
+	void       Minimize(bool effect = false);
+	void       Maximize(bool effect = false);
+	void       Overlap(bool effect = false);
+
+	bool       IsMaximized() const                    { return state == MAXIMIZED; }
+	bool       IsMinimized() const                    { return state == MINIMIZED; }
+	bool       IsOverlapped() const                   { return state == OVERLAPPED; }
+
+	TopWindow& ActiveFocus(Ctrl& ctrl)                { ActiveFocus0(ctrl); return *this; }
+
+	TopWindow& Title(const WString& _title);
+	TopWindow& Title(const char *s);
+	const WString& GetTitle() const                   { return title; }
+	TopWindow& Sizeable(bool b = true);
+	TopWindow& NoSizeable()                           { return Sizeable(false); }
+	bool       IsSizeable() const                     { return sizeable; }
+	TopWindow& MinimizeBox(bool b = true);
+	TopWindow& MaximizeBox(bool b = true);
+	TopWindow& Zoomable(bool b = true)                { MinimizeBox(b); return MaximizeBox(b); }
+	TopWindow& NoZoomable()                           { return Zoomable(false); }
+	bool       IsZoomable() const                     { return maximizebox; }
+	TopWindow& Background(const PaintRect& prect);
+	const PaintRect& GetBackground() const            { return background; }
+	TopWindow& ToolWindow(bool b = true);
+	TopWindow& NoToolWindow()                         { return ToolWindow(false); }
+	bool       IsToolWindow() const                   { return tool; }
+	TopWindow& TopMost(bool b = true, bool stay_top = true);
+	TopWindow& NoTopMost()                            { return TopMost(false); }
+	bool       IsTopMost() const;
+	TopWindow& FullScreen(bool b = true)              { fullscreen = b; return *this; }
+	bool       IsFullScreen() const                   { return fullscreen; }
+	TopWindow& NoAccessKeysDistribution()             { dokeys = false; return *this; }
+
+	TopWindow& Icon(const Image& m);
+	TopWindow& LargeIcon(const Image& m);
+	TopWindow& Icon(const Image& smallicon, const Image& largeicon);
+
+	Image      GetIcon() const                        { return icon; }
+	Image      GetLargeIcon() const                   { return largeicon; }
+
+	void       SerializePlacement(Stream& s, bool reminimize = false);
+
+	typedef TopWindow CLASSNAME;
+
+	TopWindow();
+	~TopWindow();
+};
+
+void Maxisize(TopWindow& win, int screencxmax);
+
+void ArrangeOKCancel(Ctrl& ok, Ctrl& cancel);
+
+int  SwapOKCancel();
+void SwapOKCancel_Write(int b);
+
+template <class L>
+void InitLayout(Ctrl& ctrl, L& layout)
+{
+	InitLayout(ctrl, layout, layout, layout);
+}
+
+template <class T>
+void CtrlLayout(T& ctrl) {
+	InitLayout(ctrl, ctrl, ctrl, ctrl);
+	Size sz = ctrl.AddFrameSize(T::GetLayoutSize());
+	ctrl.SetMinSize(sz);
+	ctrl.SetRect(sz);
+}
+
+template <class T>
+void CtrlLayout(T& ctrl, const char *title) {
+	CtrlLayout(ctrl);
+	ctrl.Title(title);
+}
+
+template <class T>
+void CtrlLayoutOK(T& ctrl, const char *title) {
+	CtrlLayout(ctrl, title);
+	ctrl.Acceptor(ctrl.ok, IDOK);
+	ctrl.ok.Ok();
+}
+
+template <class T>
+void CtrlLayoutCancel(T& ctrl, const char *title) {
+	CtrlLayout(ctrl, title);
+	ctrl.Rejector(ctrl.cancel, IDCANCEL);
+	ctrl.cancel.Cancel();
+}
+
+template <class T>
+void CtrlLayoutOKCancel(T& ctrl, const char *title) {
+	CtrlLayoutOK(ctrl, title);
+	ctrl.Rejector(ctrl.cancel, IDCANCEL);
+	ctrl.cancel.Cancel();
+	ArrangeOKCancel(ctrl.ok, ctrl.cancel);
+}
+
+template <class T>
+void CtrlLayoutExit(T& ctrl, const char *title) {
+	CtrlLayout(ctrl, title);
+	ctrl.Acceptor(ctrl.exit, IDEXIT);
+	ctrl.exit.Exit();
+}
diff --git a/uppsrc/CtrlCore/Win32Clip.cpp b/uppsrc/CtrlCore/Win32Clip.cpp
new file mode 100644
index 000000000..0454f38e0
--- /dev/null
+++ b/uppsrc/CtrlCore/Win32Clip.cpp
@@ -0,0 +1,414 @@
+#include "CtrlCore.h"
+#include <plugin/bmp/bmp.h>
+
+NAMESPACE_UPP
+
+#ifdef PLATFORM_WIN32
+
+#define LLOG(x)  // LOG(x)
+
+VectorMap<int, ClipData>& sClipMap()
+{
+	static VectorMap<int, ClipData> x;
+	return x;
+}
+
+extern HWND utilityHWND;
+
+
+int  GetClipboardFormatCode(const char *format_id)
+{
+	int x = (int)(intptr_t)format_id;
+	if(x >= 0 && x < 65535)
+		return x;
+	String fmt = format_id;
+	if(fmt == "text")
+		return CF_TEXT;
+	if(fmt == "wtext")
+		return CF_UNICODETEXT;
+	if(fmt == "dib")
+		return CF_DIB;
+	if(fmt == "files")
+		return CF_HDROP;
+	static VectorMap<String, int> format_map;
+	int f = format_map.Find(format_id);
+	if(f < 0) {
+		f = format_map.GetCount();
+		format_map.Add(format_id,
+#ifdef PLATFORM_WINCE
+			::RegisterClipboardFormat(ToSystemCharset(format_id))
+#else
+			::RegisterClipboardFormat(format_id)
+#endif
+		);
+	}
+	return format_map[f];
+}
+
+void ClearClipboard()
+{
+	sClipMap().Clear();
+	if(OpenClipboard(utilityHWND)) {
+		EmptyClipboard();
+		CloseClipboard();
+	}
+}
+
+void SetClipboardRaw(int format, const byte *data, int length)
+{
+	HANDLE handle = NULL;
+	if(data) {
+		handle = GlobalAlloc(GMEM_MOVEABLE | GMEM_DDESHARE, length + 2);
+		byte *ptr;
+		if(!handle)
+			return;
+		if(!(ptr = (byte *)GlobalLock(handle))) {
+			GlobalFree(handle);
+			return;
+		}
+		memcpy(ptr, data, length);
+		ptr[length] = 0;
+		ptr[length + 1] = 0;
+		GlobalUnlock(handle);
+	}
+	if(!SetClipboardData(format, handle)) {
+		LLOG("SetClipboardData error: " << GetLastErrorMessage());
+		GlobalFree(handle);
+	}
+}
+
+void AppendClipboard(int format, const byte *data, int length)
+{
+	if(OpenClipboard(utilityHWND)) {
+		SetClipboardRaw(format, data, length);
+		CloseClipboard();
+	}
+}
+
+void AppendClipboard(const char *format, const byte *data, int length)
+{
+	Vector<String> f = Split(format, ';');
+	for(int i = 0; i < f.GetCount(); i++)
+		AppendClipboard(GetClipboardFormatCode(f[i]), data, length);
+}
+
+void AppendClipboard(const char *format, const String& data)
+{
+	AppendClipboard(format, data, data.GetLength());
+}
+
+void AppendClipboard(const char *format, const Value& data, String (*render)(const Value&))
+{
+	Vector<String> f = Split(format, ';');
+	for(int i = 0; i < f.GetCount(); i++) {
+		int c = GetClipboardFormatCode(f[i]);
+		sClipMap().GetAdd(c) = ClipData(data, render);
+		AppendClipboard(c, NULL, 0);
+	}
+}
+
+void Ctrl::RenderFormat(int format)
+{
+	int q = sClipMap().Find(format);
+	if(q >= 0) {
+		String s = sClipMap()[q].Render();
+		SetClipboardRaw(format, s, s.GetLength());
+	}
+}
+
+void Ctrl::RenderAllFormats()
+{
+	if(sClipMap().GetCount() && OpenClipboard(utilityHWND)) {
+		for(int i = 0; i < sClipMap().GetCount(); i++)
+			RenderFormat(sClipMap().GetKey(i));
+		CloseClipboard();
+	}
+}
+
+void Ctrl::DestroyClipboard()
+{
+	sClipMap().Clear();
+}
+
+String ReadClipboard(const char *format)
+{
+	if(!OpenClipboard(NULL))
+		return Null;
+	HGLOBAL hmem = GetClipboardData(GetClipboardFormatCode(format));
+	if(hmem == 0) {
+		CloseClipboard();
+		return Null;
+	}
+	const byte *src = (const byte *)GlobalLock(hmem);
+	ASSERT(src);
+	int length = (int)GlobalSize(hmem);
+	if(length < 0) {
+		CloseClipboard();
+		return Null;
+	}
+	String out(src, length);
+	GlobalUnlock(hmem);
+	CloseClipboard();
+	return out;
+}
+
+void AppendClipboardText(const String& s)
+{
+#ifdef PLATFORM_WINCE
+	AppendClipboardUnicodeText(s.ToWString());
+#else
+	AppendClipboard("text", ToSystemCharset(s));
+#endif
+}
+
+void AppendClipboardUnicodeText(const WString& s)
+{
+#ifndef PLATFORM_WINCE
+	AppendClipboardText(s.ToString());
+#endif
+	AppendClipboard("wtext", (byte *)~s, 2 * s.GetLength());
+}
+
+const char *ClipFmtsText()
+{
+	return "wtext;text";
+}
+
+String GetString(PasteClip& clip)
+{
+	if(clip.Accept("wtext")) {
+		String s = ~clip;
+		return WString((const wchar *)~s, wstrlen((const wchar *)~s)).ToString();
+	}
+	if(clip.IsAvailable("text"))
+		return ~clip;
+	return Null;
+}
+
+WString GetWString(PasteClip& clip)
+{
+	if(clip.Accept("wtext")) {
+		String s = ~clip;
+		return WString((const wchar *)~s, wstrlen((const wchar *)~s));
+	}
+	if(clip.IsAvailable("text"))
+		return (~clip).ToWString();
+	return Null;
+}
+
+
+bool AcceptText(PasteClip& clip)
+{
+	return clip.Accept(ClipFmtsText());
+}
+
+static String sText(const Value& data)
+{
+	return data;
+}
+
+static String sWText(const Value& data)
+{
+	return Unicode__(WString(data));
+}
+
+void Append(VectorMap<String, ClipData>& data, const String& text)
+{
+	data.GetAdd("text", ClipData(text, sText));
+	data.GetAdd("wtext", ClipData(text, sWText));
+}
+
+void Append(VectorMap<String, ClipData>& data, const WString& text)
+{
+	data.GetAdd("text", ClipData(text, sText));
+	data.GetAdd("wtext", ClipData(text, sWText));
+}
+
+String GetTextClip(const WString& text, const String& fmt)
+{
+	if(fmt == "text")
+		return text.ToString();
+	if(fmt == "wtext")
+		return Unicode__(text);
+	return Null;
+}
+
+String GetTextClip(const String& text, const String& fmt)
+{
+	if(fmt == "text")
+		return text;
+	if(fmt == "wtext")
+		return Unicode__(text.ToWString());
+	return Null;
+}
+
+String ReadClipboardText()
+{
+#ifdef PLATFORM_WINCE
+	return ReadClipboardUnicodeText().ToString();
+#else
+	String s = ReadClipboard((const char *)CF_TEXT);
+	return String(s, (int)strlen(~s));
+#endif
+}
+
+WString ReadClipboardUnicodeText()
+{
+	String s = ReadClipboard((const char *)CF_UNICODETEXT);
+	return WString((const wchar *)~s, wstrlen((const wchar *)~s));
+}
+
+bool IsClipboardAvailable(const char *id)
+{
+	return ::IsClipboardFormatAvailable(GetClipboardFormatCode(id));
+}
+
+bool IsClipboardAvailableText()
+{
+	return IsClipboardAvailable((const char *)CF_TEXT);
+}
+
+const char *ClipFmtsImage()
+{
+	static const char *q;
+	ONCELOCK {
+		static String s = "dib;" + ClipFmt<Image>();
+		q = s;
+	}
+	return q;
+}
+
+bool AcceptImage(PasteClip& clip)
+{
+	return clip.Accept(ClipFmtsImage());
+}
+
+Image GetImage(PasteClip& clip)
+{
+	Image m;
+	if(Accept<Image>(clip)) {
+		LoadFromString(m, ~clip);
+		if(!m.IsEmpty())
+			return m;
+	}
+	if(clip.Accept("dib")) {
+		String data = ~clip;
+		if(data.GetCount() < sizeof(BITMAPINFO)) return Null;
+		BITMAPINFO *lpBI = 	(BITMAPINFO *)~data;
+		BITMAPINFOHEADER& hdr = lpBI->bmiHeader;
+		byte *bits = (byte *)lpBI + hdr.biSize;
+		if(hdr.biBitCount <= 8)
+			bits += (hdr.biClrUsed ? hdr.biClrUsed : 1 << hdr.biBitCount) * sizeof(RGBQUAD);
+		if(hdr.biBitCount >= 16 || hdr.biBitCount == 32) {
+			if(hdr.biCompression == 3)
+				bits += 12;
+			if(hdr.biClrUsed != 0)
+				bits += hdr.biClrUsed * sizeof(RGBQUAD);
+		}
+		int h = abs((int)hdr.biHeight);
+		ImageDraw   iw(hdr.biWidth, h);
+		::StretchDIBits(iw.GetHandle(),
+			0, 0, hdr.biWidth, h,
+			0, 0, hdr.biWidth, h,
+			bits, lpBI, DIB_RGB_COLORS, SRCCOPY);
+		return iw;
+	}
+	return Null;
+}
+
+Image ReadClipboardImage()
+{
+	PasteClip d = Ctrl::Clipboard();
+	return GetImage(d);
+}
+
+String sDib(const Value& image)
+{
+	Image img = image;
+	BITMAPINFOHEADER header;
+	Zero(header);
+	header.biSize = sizeof(header);
+	header.biWidth = img.GetWidth();
+	header.biHeight = -img.GetHeight();
+	header.biBitCount = 32;
+	header.biPlanes = 1;
+	header.biCompression = BI_RGB;
+	StringBuffer b(sizeof(header) + 4 * img.GetLength());
+	byte *p = (byte *)~b;
+	memcpy(p, &header, sizeof(header));
+	memcpy(p + sizeof(header), ~img, 4 * img.GetLength());
+	return b;
+}
+
+String sImage(const Value& image)
+{
+	Image img = image;
+	return StoreAsString(const_cast<Image&>(img));
+}
+
+String GetImageClip(const Image& img, const String& fmt)
+{
+	if(img.IsEmpty()) return Null;
+	if(fmt == "dib")
+		return sDib(img);
+	if(fmt == ClipFmt<Image>())
+		return sImage(img);
+	return Null;
+}
+
+void AppendClipboardImage(const Image& img)
+{
+	if(img.IsEmpty()) return;
+	AppendClipboard(ClipFmt<Image>(), img, sImage);
+	AppendClipboard("dib", img, sDib);
+}
+
+bool AcceptFiles(PasteClip& clip)
+{
+	if(clip.Accept("files")) {
+		clip.SetAction(DND_COPY);
+		return true;
+	}
+	return false;
+}
+
+
+struct sDROPFILES {
+    DWORD offset;
+    POINT dummy;
+    BOOL  dummy2;
+    BOOL  unicode;
+};
+
+Vector<String> GetFiles(PasteClip& clip)
+{
+	Vector<String> f;
+	String data = clip;
+	if(data.GetCount() < sizeof(sDROPFILES) + 2)
+		return f;
+	const sDROPFILES *df = (const sDROPFILES *)~data;
+	const char *s = ((const char *)df + df->offset);
+	if(df->unicode) {
+		const wchar *ws = (wchar *)s;
+		while(*ws) {
+			WString fn;
+			while(*ws)
+				fn.Cat(*ws++);
+			f.Add(fn.ToString());
+			ws++;
+		}
+	}
+	else
+		while(*s) {
+			String fn;
+			while(*s)
+				fn.Cat(*s++);
+			f.Add(fn.ToString());
+			s++;
+		}
+	return f;
+}
+
+#endif
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/CtrlCore/Win32DnD.cpp b/uppsrc/CtrlCore/Win32DnD.cpp
new file mode 100644
index 000000000..1e33b94ea
--- /dev/null
+++ b/uppsrc/CtrlCore/Win32DnD.cpp
@@ -0,0 +1,528 @@
+#include "CtrlCore.h"
+
+NAMESPACE_UPP
+
+#ifdef PLATFORM_WIN32
+
+#define LLOG(x) // LOG(x)
+
+int  GetClipboardFormatCode(const char *format_id);
+
+int ToWin32CF(const char *s)
+{
+	return GetClipboardFormatCode(s);
+}
+
+String FromWin32CF(int cf)
+{
+	if(cf == CF_TEXT)
+		return "text";
+	if(cf == CF_UNICODETEXT)
+		return "wtext";
+	if(cf == CF_DIB)
+		return "dib";
+#ifndef PLATFORM_WINCE
+	if(cf == CF_HDROP)
+		return "files";
+#endif
+	char h[256];
+	GetClipboardFormatNameA(cf, h, 255);
+	return h;
+}
+
+FORMATETC ToFORMATETC(const char *s)
+{
+	FORMATETC fmtetc;
+	fmtetc.cfFormat = ToWin32CF(s);
+	fmtetc.dwAspect = DVASPECT_CONTENT;
+	fmtetc.lindex = -1;
+	fmtetc.ptd = NULL;
+	fmtetc.tymed = TYMED_HGLOBAL;
+	return fmtetc;
+}
+
+String AsString(POINTL p)
+{
+	return String().Cat() << "[" << p.x << ", " << p.y << "]";
+}
+
+struct UDropTarget : public IDropTarget {
+	ULONG         rc;
+	LPDATAOBJECT  data;
+	Ptr<Ctrl>     ctrl;
+	Index<String> fmt;
+
+	STDMETHOD(QueryInterface)(REFIID riid, void **ppvObj);
+	STDMETHOD_(ULONG, AddRef)(void)  { return ++rc; }
+	STDMETHOD_(ULONG, Release)(void) { if(--rc == 0) { delete this; return 0; } return rc; }
+
+	STDMETHOD(DragEnter)(LPDATAOBJECT pDataObj, DWORD grfKeyState, POINTL pt, LPDWORD pdwEffect);
+	STDMETHOD(DragOver)(DWORD grfKeyState, POINTL pt, LPDWORD pdwEffect);
+	STDMETHOD(DragLeave)();
+	STDMETHOD(Drop)(LPDATAOBJECT pDataObj, DWORD grfKeyState, POINTL pt, LPDWORD pdwEffect);
+
+	void DnD(POINTL p, bool drop, DWORD *effect, DWORD keys);
+	void FreeData();
+	void Repeat();
+	void EndDrag();
+	String Get(const char *fmt) const;
+
+	UDropTarget() { rc = 1; data = NULL; }
+	~UDropTarget();
+};
+
+bool Has(UDropTarget *dt, const char *fmt)
+{
+	return dt->fmt.Find(fmt) >= 0;
+}
+
+String Get(UDropTarget *dt, const char *fmt)
+{
+	return dt->Get(fmt);
+}
+
+STDMETHODIMP UDropTarget::QueryInterface(REFIID iid, void ** ppv)
+{
+	if(iid == IID_IUnknown || iid == IID_IDropTarget) {
+		*ppv = this;
+		AddRef();
+		return S_OK;
+	}
+	*ppv = NULL;
+	return E_NOINTERFACE;
+}
+
+String UDropTarget::Get(const char *fmt) const
+{
+	FORMATETC fmtetc = ToFORMATETC(fmt);
+	STGMEDIUM s;
+	if(data->GetData(&fmtetc, &s) == S_OK && s.tymed == TYMED_HGLOBAL) {
+		char *val = (char *)GlobalLock(s.hGlobal);
+		String data(val, (int)GlobalSize(s.hGlobal));
+		GlobalUnlock(s.hGlobal);
+		ReleaseStgMedium(&s);
+		return data;
+    }
+	return Null;
+}
+
+void UDropTarget::DnD(POINTL pl, bool drop, DWORD *effect, DWORD keys)
+{
+	dword e = *effect;
+	*effect = DROPEFFECT_NONE;
+	if(!ctrl)
+		return;
+	PasteClip d;
+	d.dt = this;
+	d.paste = drop;
+	d.accepted = false;
+	d.allowed = 0;
+	d.action = 0;
+	if(e & DROPEFFECT_COPY) {
+		d.allowed = DND_COPY;
+		d.action = DND_COPY;
+	}
+	if(e & DROPEFFECT_MOVE) {
+		d.allowed |= DND_MOVE;
+		if(Ctrl::GetDragAndDropSource())
+			d.action = DND_MOVE;
+	}
+	if((keys & MK_CONTROL) && (d.allowed & DND_COPY))
+		d.action = DND_COPY;
+	if((keys & (MK_ALT|MK_SHIFT)) && (d.allowed & DND_MOVE))
+		d.action = DND_MOVE;
+	ctrl->DnD(Point(pl.x, pl.y), d);
+	if(d.IsAccepted()) {
+		if(d.action == DND_MOVE)
+			*effect = DROPEFFECT_MOVE;
+		if(d.action == DND_COPY)
+			*effect = DROPEFFECT_COPY;
+	}
+}
+
+void UDropTarget::Repeat()
+{
+	Ctrl::DnDRepeat();
+}
+
+STDMETHODIMP UDropTarget::DragEnter(LPDATAOBJECT pDataObj, DWORD grfKeyState, POINTL pt, LPDWORD pdwEffect)
+{
+	LLOG("DragEnter " << pt);
+	data = pDataObj;
+	data->AddRef();
+	fmt.Clear();
+	IEnumFORMATETC *fe;
+	if(!ctrl || pDataObj->EnumFormatEtc(DATADIR_GET, &fe) != NOERROR) {
+		*pdwEffect = DROPEFFECT_NONE;
+		return NOERROR;
+	}
+	FORMATETC fmtetc;
+	while(fe->Next(1, &fmtetc, 0) == S_OK) {
+		fmt.FindAdd(FromWin32CF(fmtetc.cfFormat));
+		if(fmtetc.ptd)
+			CoTaskMemFree(fmtetc.ptd);
+	}
+	fe->Release();
+	DnD(pt, false, pdwEffect, grfKeyState);
+	return NOERROR;
+}
+
+
+STDMETHODIMP UDropTarget::DragOver(DWORD grfKeyState, POINTL pt, LPDWORD pdwEffect)
+{
+	LLOG("DragOver " << pt << " keys: " << grfKeyState);
+	DnD(pt, false, pdwEffect, grfKeyState);
+	return NOERROR;
+}
+
+void UDropTarget::FreeData()
+{
+	if(data) {
+		data->Release();
+		data = NULL;
+	}
+}
+
+void UDropTarget::EndDrag()
+{
+	Ctrl::DnDLeave();
+}
+
+STDMETHODIMP UDropTarget::DragLeave()
+{
+	LLOG("DragLeave");
+	EndDrag();
+	FreeData();
+	return NOERROR;
+}
+
+STDMETHODIMP UDropTarget::Drop(LPDATAOBJECT, DWORD grfKeyState, POINTL pt, LPDWORD pdwEffect)
+{
+	LLOG("Drop");
+	if(Ctrl::GetDragAndDropSource())
+		Ctrl::OverrideCursor(Null);
+	DnD(pt, true, pdwEffect, grfKeyState);
+	EndDrag();
+	FreeData();
+	return NOERROR;
+}
+
+UDropTarget::~UDropTarget()
+{
+	if(data) data->Release();
+	EndDrag();
+}
+
+// --------------------------------------------------------------------------------------------
+
+Ptr<Ctrl> sDnDSource;
+
+Ctrl * Ctrl::GetDragAndDropSource()
+{
+	return sDnDSource;
+}
+
+struct  UDataObject : public IDataObject {
+	ULONG                       rc;
+	dword                       effect;
+	VectorMap<String, ClipData> data;
+
+	STDMETHOD(QueryInterface)(REFIID riid, void FAR* FAR* ppvObj);
+	STDMETHOD_(ULONG, AddRef)(void)  { return ++rc; }
+	STDMETHOD_(ULONG, Release)(void) { if(--rc == 0) { delete this; return 0; } return rc; }
+
+	STDMETHOD(GetData)(FORMATETC *fmtetc, STGMEDIUM *medium);
+	STDMETHOD(GetDataHere)(FORMATETC *, STGMEDIUM *);
+	STDMETHOD(QueryGetData)(FORMATETC *fmtetc);
+	STDMETHOD(GetCanonicalFormatEtc)(FORMATETC *, FORMATETC *pformatetcOut);
+	STDMETHOD(SetData)(FORMATETC *fmtetc, STGMEDIUM *medium, BOOL release);
+	STDMETHOD(EnumFormatEtc)(DWORD dwDirection, IEnumFORMATETC **ief);
+	STDMETHOD(DAdvise)(FORMATETC *, DWORD, IAdviseSink *, DWORD *);
+	STDMETHOD(DUnadvise)(DWORD);
+	STDMETHOD(EnumDAdvise)(LPENUMSTATDATA *);
+
+	UDataObject() { rc = 1; effect = 0; }
+};
+
+struct UEnumFORMATETC : public IEnumFORMATETC {
+	ULONG        rc;
+	int          ii;
+	UDataObject *data;
+
+	STDMETHOD(QueryInterface)(REFIID riid, void FAR* FAR* ppvObj);
+	STDMETHOD_(ULONG, AddRef)(void)  { return ++rc; }
+	STDMETHOD_(ULONG, Release)(void) { if(--rc == 0) { delete this; return 0; } return rc; }
+
+	STDMETHOD(Next)(ULONG n, FORMATETC *fmtetc, ULONG *fetched);
+	STDMETHOD(Skip)(ULONG n);
+	STDMETHOD(Reset)(void);
+	STDMETHOD(Clone)(IEnumFORMATETC **newEnum);
+
+	UEnumFORMATETC()  { ii = 0; rc = 1; }
+	~UEnumFORMATETC() { data->Release(); }
+};
+
+struct UDropSource : public IDropSource {
+	ULONG rc;
+	Image move, copy;
+
+	STDMETHOD(QueryInterface)(REFIID riid, void ** ppvObj);
+	STDMETHOD_(ULONG, AddRef)(void)  { return ++rc; }
+	STDMETHOD_(ULONG, Release)(void) { if(--rc == 0) { delete this; return 0; } return rc; }
+
+	STDMETHOD(QueryContinueDrag)(BOOL fEscapePressed, DWORD grfKeyState);
+	STDMETHOD(GiveFeedback)(DWORD dwEffect);
+
+	UDropSource() { rc = 1; }
+};
+
+STDMETHODIMP UDataObject::QueryInterface(REFIID iid, void ** ppv)
+{
+	if(iid == IID_IUnknown || iid == IID_IDataObject) {
+		*ppv = this;
+		AddRef();
+		return S_OK;
+	}
+	*ppv = NULL;
+	return E_NOINTERFACE;
+}
+
+void SetMedium(STGMEDIUM *medium, const String& data)
+{
+	int sz = data.GetCount();
+	HGLOBAL hData = GlobalAlloc(0, sz + 4);
+	if (hData) {
+		char *ptr = (char *) GlobalLock(hData);
+		memcpy(ptr, ~data, sz);
+		memset(ptr + sz, 0, 4);
+		GlobalUnlock(hData);
+		medium->tymed = TYMED_HGLOBAL;
+		medium->hGlobal = hData;
+		medium->pUnkForRelease = 0;
+	}
+}
+
+STDMETHODIMP UDataObject::GetData(FORMATETC *fmtetc, STGMEDIUM *medium)
+{
+	String fmt = FromWin32CF(fmtetc->cfFormat);
+	ClipData *s = data.FindPtr(fmt);
+	if(s) {
+		String q = s->Render();
+		SetMedium(medium, q.GetCount() ? q : sDnDSource ? sDnDSource->GetDropData(fmt) : String());
+		return S_OK;
+	}
+	return DV_E_FORMATETC;
+}
+
+STDMETHODIMP UDataObject::GetDataHere(FORMATETC *, STGMEDIUM *)
+{
+    return DV_E_FORMATETC;
+}
+
+STDMETHODIMP UDataObject::QueryGetData(FORMATETC *fmtetc)
+{
+	return data.Find(FromWin32CF(fmtetc->cfFormat)) >= 0 ? S_OK : DV_E_FORMATETC;
+}
+
+STDMETHODIMP UDataObject::GetCanonicalFormatEtc(FORMATETC *, FORMATETC *pformatetcOut)
+{
+    pformatetcOut->ptd = NULL;
+    return E_NOTIMPL;
+}
+
+#ifdef PLATFORM_WINCE
+static int CF_PERFORMEDDROPEFFECT = RegisterClipboardFormat(_T("Performed DropEffect"));
+#else
+static int CF_PERFORMEDDROPEFFECT = RegisterClipboardFormat("Performed DropEffect");
+#endif
+
+STDMETHODIMP UDataObject::SetData(FORMATETC *fmtetc, STGMEDIUM *medium, BOOL release)
+{
+	if(fmtetc->cfFormat == CF_PERFORMEDDROPEFFECT && medium->tymed == TYMED_HGLOBAL) {
+        DWORD *val = (DWORD*)GlobalLock(medium->hGlobal);
+        effect = *val;
+        GlobalUnlock(medium->hGlobal);
+        if(release)
+            ReleaseStgMedium(medium);
+        return S_OK;
+    }
+	return E_NOTIMPL;
+}
+
+STDMETHODIMP UDataObject::EnumFormatEtc(DWORD dwDirection, IEnumFORMATETC **ief)
+{
+	UEnumFORMATETC *ef = new UEnumFORMATETC;
+	ef->data = this;
+	AddRef();
+	*ief = ef;
+	return S_OK;
+}
+
+STDMETHODIMP UDataObject::DAdvise(FORMATETC *, DWORD, IAdviseSink *, DWORD *)
+{
+	return OLE_E_ADVISENOTSUPPORTED;
+}
+
+
+STDMETHODIMP UDataObject::DUnadvise(DWORD)
+{
+	return OLE_E_ADVISENOTSUPPORTED;
+}
+
+STDMETHODIMP UDataObject::EnumDAdvise(LPENUMSTATDATA FAR*)
+{
+	return OLE_E_ADVISENOTSUPPORTED;
+}
+
+STDMETHODIMP UEnumFORMATETC::QueryInterface(REFIID riid, void FAR* FAR* ppvObj)
+{
+	if (riid == IID_IUnknown || riid == IID_IEnumFORMATETC) {
+		*ppvObj = this;
+		AddRef();
+		return NOERROR;
+    }
+	*ppvObj = NULL;
+	return ResultFromScode(E_NOINTERFACE);
+}
+
+STDMETHODIMP UEnumFORMATETC::Next(ULONG n, FORMATETC *t, ULONG *fetched) {
+	if(t == NULL)
+		return E_INVALIDARG;
+	if(fetched) *fetched = 0;
+	while(ii < data->data.GetCount() && n > 0) {
+		if(fetched) (*fetched)++;
+		n--;
+		*t++ = ToFORMATETC(data->data.GetKey(ii++));
+	}
+	return n ? S_FALSE : NOERROR;
+}
+
+STDMETHODIMP UEnumFORMATETC::Skip(ULONG n) {
+	ii += n;
+	if(ii >= data->data.GetCount())
+		return S_FALSE;
+	return NOERROR;
+}
+
+STDMETHODIMP UEnumFORMATETC::Reset()
+{
+    ii = 0;
+    return NOERROR;
+}
+
+STDMETHODIMP UEnumFORMATETC::Clone(IEnumFORMATETC **newEnum)
+{
+	if(newEnum == NULL)
+		return E_INVALIDARG;
+	UEnumFORMATETC *ef = new UEnumFORMATETC;
+	ef->data = data;
+	data->AddRef();
+	ef->ii = ii;
+	*newEnum = ef;
+	return NOERROR;
+}
+
+STDMETHODIMP UDropSource::QueryInterface(REFIID riid, void **ppvObj)
+{
+	if (riid == IID_IUnknown || riid == IID_IDropSource) {
+		*ppvObj = this;
+		AddRef();
+		return NOERROR;
+	}
+	*ppvObj = NULL;
+	return ResultFromScode(E_NOINTERFACE);
+}
+
+STDMETHODIMP UDropSource::QueryContinueDrag(BOOL fEscapePressed, DWORD grfKeyState)
+{
+	if(fEscapePressed)
+		return DRAGDROP_S_CANCEL;
+	else
+	if(!(grfKeyState & (MK_LBUTTON|MK_MBUTTON|MK_RBUTTON)))
+		return DRAGDROP_S_DROP;
+	Ctrl::ProcessEvents();
+	return NOERROR;
+}
+
+STDMETHODIMP UDropSource::GiveFeedback(DWORD dwEffect)
+{
+	Image m = IsNull(move) ? copy : move;
+	if((dwEffect & DROPEFFECT_COPY) == DROPEFFECT_COPY) {
+		if(!IsNull(copy)) m = copy;
+	}
+	else
+	if((dwEffect & DROPEFFECT_MOVE) == DROPEFFECT_MOVE) {
+		if(!IsNull(move)) m = move;
+	}
+	else
+		m = Image::No();
+	Ctrl::OverrideCursor(m);
+	Ctrl::SetMouseCursor(m);
+	return S_OK;
+}
+
+Image MakeDragImage(const Image& arrow, Image sample);
+
+Image MakeDragImage(const Image& arrow, const Image& arrow98, Image sample)
+{
+	if(IsWin2K())
+		return MakeDragImage(arrow, sample);
+	else
+		return arrow98;
+}
+
+int Ctrl::DoDragAndDrop(const char *fmts, const Image& sample, dword actions,
+                        const VectorMap<String, ClipData>& data)
+{
+	UDataObject *obj = new UDataObject;
+	obj->data <<= data;
+	if(fmts) {
+		Vector<String> f = Split(fmts, ';');
+		for(int i = 0; i < f.GetCount(); i++)
+			obj->data.GetAdd(f[i]);
+	}
+	UDropSource *dsrc = new UDropSource;
+	DWORD result = 0;
+	Image m = Ctrl::OverrideCursor(CtrlCoreImg::DndMove());
+	if(actions & DND_COPY)
+		dsrc->copy = MakeDragImage(CtrlCoreImg::DndCopy(), CtrlCoreImg::DndCopy98(), sample);
+	if(actions & DND_MOVE)
+		dsrc->move = MakeDragImage(CtrlCoreImg::DndMove(), CtrlCoreImg::DndMove98(), sample);
+	sDnDSource = this;
+	HRESULT r = DoDragDrop(obj, dsrc,
+	                       (actions & DND_COPY ? DROPEFFECT_COPY : 0) |
+	                       (actions & DND_MOVE ? DROPEFFECT_MOVE : 0), &result);
+	DWORD re = obj->effect;
+	obj->Release();
+	dsrc->Release();
+	OverrideCursor(m);
+	SyncCaret();
+	CheckMouseCtrl();
+	KillRepeat();
+	sDnDSource = NULL;
+	if(r == DRAGDROP_S_DROP) {
+		if(((result | re) & DROPEFFECT_MOVE) == DROPEFFECT_MOVE && (actions & DND_MOVE))
+			return DND_MOVE;
+		if(((result | re) & DROPEFFECT_COPY) == DROPEFFECT_COPY && (actions & DND_COPY))
+			return DND_COPY;
+    }
+	return DND_NONE;
+}
+
+void ReleaseUDropTarget(UDropTarget *dt)
+{
+	dt->Release();
+}
+
+UDropTarget *NewUDropTarget(Ctrl *ctrl)
+{
+	UDropTarget *dt = new UDropTarget;
+	dt->ctrl = ctrl;
+	return dt;
+}
+
+void Ctrl::SetSelectionSource(const char *fmts) {}
+
+#endif
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/CtrlCore/Win32Keys.i b/uppsrc/CtrlCore/Win32Keys.i
new file mode 100644
index 000000000..000cea433
--- /dev/null
+++ b/uppsrc/CtrlCore/Win32Keys.i
@@ -0,0 +1,109 @@
+K_BACK       = VK_BACK + K_DELTA,
+K_BACKSPACE  = VK_BACK + K_DELTA,
+
+K_TAB        = 9,
+
+K_SPACE      = 32,
+
+K_RETURN     = 13,
+K_ENTER      = K_RETURN,
+
+K_SHIFT_KEY  = VK_SHIFT + K_DELTA,
+K_CTRL_KEY   = VK_CONTROL + K_DELTA,
+K_ALT_KEY    = VK_MENU + K_DELTA,
+K_CAPSLOCK   = VK_CAPITAL + K_DELTA,
+K_ESCAPE     = VK_ESCAPE + K_DELTA,
+K_PRIOR      = VK_PRIOR + K_DELTA,
+K_PAGEUP     = VK_PRIOR + K_DELTA,
+K_NEXT       = VK_NEXT + K_DELTA,
+K_PAGEDOWN   = VK_NEXT + K_DELTA,
+K_END        = VK_END + K_DELTA,
+K_HOME       = VK_HOME + K_DELTA,
+K_LEFT       = VK_LEFT + K_DELTA,
+K_UP         = VK_UP + K_DELTA,
+K_RIGHT      = VK_RIGHT + K_DELTA,
+K_DOWN       = VK_DOWN + K_DELTA,
+K_INSERT     = VK_INSERT + K_DELTA,
+K_DELETE     = VK_DELETE + K_DELTA,
+
+K_NUMPAD0    = VK_NUMPAD0 + K_DELTA,
+K_NUMPAD1    = VK_NUMPAD1 + K_DELTA,
+K_NUMPAD2    = VK_NUMPAD2 + K_DELTA,
+K_NUMPAD3    = VK_NUMPAD3 + K_DELTA,
+K_NUMPAD4    = VK_NUMPAD4 + K_DELTA,
+K_NUMPAD5    = VK_NUMPAD5 + K_DELTA,
+K_NUMPAD6    = VK_NUMPAD6 + K_DELTA,
+K_NUMPAD7    = VK_NUMPAD7 + K_DELTA,
+K_NUMPAD8    = VK_NUMPAD8 + K_DELTA,
+K_NUMPAD9    = VK_NUMPAD9 + K_DELTA,
+K_MULTIPLY   = VK_MULTIPLY + K_DELTA,
+K_ADD        = VK_ADD + K_DELTA,
+K_SEPARATOR  = VK_SEPARATOR + K_DELTA,
+K_SUBTRACT   = VK_SUBTRACT + K_DELTA,
+K_DECIMAL    = VK_DECIMAL + K_DELTA,
+K_DIVIDE     = VK_DIVIDE + K_DELTA,
+K_SCROLL     = VK_SCROLL + K_DELTA,
+
+K_F1         = VK_F1 + K_DELTA,
+K_F2         = VK_F2 + K_DELTA,
+K_F3         = VK_F3 + K_DELTA,
+K_F4         = VK_F4 + K_DELTA,
+K_F5         = VK_F5 + K_DELTA,
+K_F6         = VK_F6 + K_DELTA,
+K_F7         = VK_F7 + K_DELTA,
+K_F8         = VK_F8 + K_DELTA,
+K_F9         = VK_F9 + K_DELTA,
+K_F10        = VK_F10 + K_DELTA,
+K_F11        = VK_F11 + K_DELTA,
+K_F12        = VK_F12 + K_DELTA,
+
+K_A          = 'A' + K_DELTA,
+K_B          = 'B' + K_DELTA,
+K_C          = 'C' + K_DELTA,
+K_D          = 'D' + K_DELTA,
+K_E          = 'E' + K_DELTA,
+K_F          = 'F' + K_DELTA,
+K_G          = 'G' + K_DELTA,
+K_H          = 'H' + K_DELTA,
+K_I          = 'I' + K_DELTA,
+K_J          = 'J' + K_DELTA,
+K_K          = 'K' + K_DELTA,
+K_L          = 'L' + K_DELTA,
+K_M          = 'M' + K_DELTA,
+K_N          = 'N' + K_DELTA,
+K_O          = 'O' + K_DELTA,
+K_P          = 'P' + K_DELTA,
+K_Q          = 'Q' + K_DELTA,
+K_R          = 'R' + K_DELTA,
+K_S          = 'S' + K_DELTA,
+K_T          = 'T' + K_DELTA,
+K_U          = 'U' + K_DELTA,
+K_V          = 'V' + K_DELTA,
+K_W          = 'W' + K_DELTA,
+K_X          = 'X' + K_DELTA,
+K_Y          = 'Y' + K_DELTA,
+K_Z          = 'Z' + K_DELTA,
+K_0          = '0' + K_DELTA,
+K_1          = '1' + K_DELTA,
+K_2          = '2' + K_DELTA,
+K_3          = '3' + K_DELTA,
+K_4          = '4' + K_DELTA,
+K_5          = '5' + K_DELTA,
+K_6          = '6' + K_DELTA,
+K_7          = '7' + K_DELTA,
+K_8          = '8' + K_DELTA,
+K_9          = '9' + K_DELTA,
+
+K_CTRL_LBRACKET  = K_CTRL|219|K_DELTA,
+K_CTRL_RBRACKET  = K_CTRL|221|K_DELTA,
+K_CTRL_MINUS     = K_CTRL|0xbd|K_DELTA,
+K_CTRL_GRAVE     = K_CTRL|0xc0|K_DELTA,
+K_CTRL_SLASH     = K_CTRL|0xbf|K_DELTA,
+K_CTRL_BACKSLASH = K_CTRL|0xdc|K_DELTA,
+K_CTRL_COMMA     = K_CTRL|0xbc|K_DELTA,
+K_CTRL_PERIOD    = K_CTRL|0xbe|K_DELTA,
+K_CTRL_SEMICOLON = K_CTRL|0xbe|K_DELTA,
+K_CTRL_EQUAL     = K_CTRL|0xbb|K_DELTA,
+K_CTRL_APOSTROPHE= K_CTRL|0xde|K_DELTA,
+
+K_BREAK      = VK_CANCEL + K_DELTA,
diff --git a/uppsrc/CtrlCore/Win32Msg.i b/uppsrc/CtrlCore/Win32Msg.i
new file mode 100644
index 000000000..765db43d6
--- /dev/null
+++ b/uppsrc/CtrlCore/Win32Msg.i
@@ -0,0 +1,126 @@
+#pragma BLITZ_APPROVE
+
+x_MSG(WM_CREATE)
+x_MSG(WM_DESTROY)
+x_MSG(WM_MOVE)
+x_MSG(WM_SIZE)
+x_MSG(WM_ACTIVATE)
+x_MSG(WM_SETFOCUS)
+x_MSG(WM_KILLFOCUS)
+x_MSG(WM_ENABLE)
+x_MSG(WM_SETREDRAW)
+x_MSG(WM_SETTEXT)
+x_MSG(WM_GETTEXT)
+x_MSG(WM_GETTEXTLENGTH)
+x_MSG(WM_PAINT)
+x_MSG(WM_CLOSE)
+x_MSG(WM_QUIT)
+x_MSG(WM_ERASEBKGND)
+x_MSG(WM_SYSCOLORCHANGE)
+x_MSG(WM_SHOWWINDOW)
+x_MSG(WM_WININICHANGE)
+x_MSG(WM_FONTCHANGE)
+x_MSG(WM_NEXTDLGCTL)
+x_MSG(WM_DRAWITEM)
+x_MSG(WM_MEASUREITEM)
+x_MSG(WM_DELETEITEM)
+x_MSG(WM_VKEYTOITEM)
+x_MSG(WM_CHARTOITEM)
+x_MSG(WM_SETFONT)
+x_MSG(WM_GETFONT)
+x_MSG(WM_QUERYDRAGICON)
+x_MSG(WM_COMPAREITEM)
+x_MSG(WM_GETDLGCODE)
+x_MSG(WM_KEYDOWN)
+x_MSG(WM_KEYUP)
+x_MSG(WM_CHAR)
+x_MSG(WM_DEADCHAR)
+x_MSG(WM_SYSKEYDOWN)
+x_MSG(WM_SYSKEYUP)
+x_MSG(WM_SYSCHAR)
+x_MSG(WM_SYSDEADCHAR)
+x_MSG(WM_KEYLAST)
+x_MSG(WM_INITDIALOG)
+x_MSG(WM_COMMAND)
+x_MSG(WM_SYSCOMMAND)
+x_MSG(WM_TIMER)
+x_MSG(WM_HSCROLL)
+x_MSG(WM_VSCROLL)
+x_MSG(WM_INITMENUPOPUP)
+x_MSG(WM_MENUCHAR)
+x_MSG(WM_LBUTTONDOWN)
+x_MSG(WM_LBUTTONUP)
+x_MSG(WM_LBUTTONDBLCLK)
+x_MSG(WM_RBUTTONDOWN)
+x_MSG(WM_RBUTTONUP)
+x_MSG(WM_RBUTTONDBLCLK)
+x_MSG(WM_MBUTTONDOWN)
+x_MSG(WM_MBUTTONUP)
+x_MSG(WM_MBUTTONDBLCLK)
+x_MSG(WM_MOUSEMOVE)
+x_MSG(WM_CUT)
+x_MSG(WM_COPY)
+x_MSG(WM_PASTE)
+x_MSG(WM_CLEAR)
+x_MSG(WM_UNDO)
+x_MSG(WM_RENDERFORMAT)
+x_MSG(WM_RENDERALLFORMATS)
+x_MSG(WM_DESTROYCLIPBOARD)
+x_MSG(WM_QUERYNEWPALETTE)
+x_MSG(WM_PALETTECHANGED)
+x_MSG(WM_WINDOWPOSCHANGED)
+
+#ifndef PLATFORM_WINCE
+x_MSG(WM_QUERYENDSESSION)
+x_MSG(WM_ENDSESSION)
+x_MSG(WM_QUERYOPEN)
+x_MSG(WM_DEVMODECHANGE)
+x_MSG(WM_ACTIVATEAPP)
+x_MSG(WM_TIMECHANGE)
+x_MSG(WM_MOUSEACTIVATE)
+x_MSG(WM_CHILDACTIVATE)
+x_MSG(WM_QUEUESYNC)
+x_MSG(WM_GETMINMAXINFO)
+x_MSG(WM_ICONERASEBKGND)
+x_MSG(WM_SPOOLERSTATUS)
+x_MSG(WM_COMPACTING)
+x_MSG(WM_NCLBUTTONDOWN)
+x_MSG(WM_NCLBUTTONUP)
+x_MSG(WM_NCLBUTTONDBLCLK)
+x_MSG(WM_NCRBUTTONDOWN)
+x_MSG(WM_NCRBUTTONUP)
+x_MSG(WM_NCRBUTTONDBLCLK)
+x_MSG(WM_NCMBUTTONDOWN)
+x_MSG(WM_NCMBUTTONUP)
+x_MSG(WM_NCMBUTTONDBLCLK)
+x_MSG(WM_NCCREATE)
+x_MSG(WM_NCDESTROY)
+x_MSG(WM_NCCALCSIZE)
+x_MSG(WM_NCPAINT)
+x_MSG(WM_NCACTIVATE)
+x_MSG(WM_INITMENU)
+x_MSG(WM_MENUSELECT)
+x_MSG(WM_PARENTNOTIFY)
+x_MSG(WM_MDICREATE)
+x_MSG(WM_MDIDESTROY)
+x_MSG(WM_MDIACTIVATE)
+x_MSG(WM_MDIRESTORE)
+x_MSG(WM_MDINEXT)
+x_MSG(WM_MDIMAXIMIZE)
+x_MSG(WM_MDITILE)
+x_MSG(WM_MDICASCADE)
+x_MSG(WM_MDIICONARRANGE)
+x_MSG(WM_MDIGETACTIVE)
+x_MSG(WM_MDISETMENU)
+x_MSG(WM_DRAWCLIPBOARD)
+x_MSG(WM_PAINTCLIPBOARD)
+x_MSG(WM_VSCROLLCLIPBOARD)
+x_MSG(WM_SIZECLIPBOARD)
+x_MSG(WM_ASKCBFORMATNAME)
+x_MSG(WM_CHANGECBCHAIN)
+x_MSG(WM_HSCROLLCLIPBOARD)
+x_MSG(WM_PALETTEISCHANGING)
+x_MSG(WM_DROPFILES)
+x_MSG(WM_POWER)
+x_MSG(WM_WINDOWPOSCHANGING)
+#endif
diff --git a/uppsrc/CtrlCore/Win32Proc.cpp b/uppsrc/CtrlCore/Win32Proc.cpp
new file mode 100644
index 000000000..dca905864
--- /dev/null
+++ b/uppsrc/CtrlCore/Win32Proc.cpp
@@ -0,0 +1,487 @@
+#include "CtrlCore.h"
+
+#ifdef PLATFORM_WIN32
+#include <winnls.h>
+#endif
+
+//#include "imm.h"
+
+NAMESPACE_UPP
+
+#define LLOG(x)  // LOG(x)
+
+#ifdef PLATFORM_WIN32
+
+dword Ctrl::KEYtoK(dword chr) {
+	if(chr == VK_TAB)
+		chr = K_TAB;
+	else
+	if(chr == VK_SPACE)
+		chr = K_SPACE;
+	else
+	if(chr == VK_RETURN)
+		chr = K_RETURN;
+	else
+		chr = chr + K_DELTA;
+	if(chr == K_ALT_KEY || chr == K_CTRL_KEY || chr == K_SHIFT_KEY)
+		return chr;
+	if(GetCtrl()) chr |= K_CTRL;
+	if(GetAlt()) chr |= K_ALT;
+	if(GetShift()) chr |= K_SHIFT;
+	return chr;
+}
+
+
+class NilDrawFull : public NilDraw {
+	virtual bool IsPaintingOp(const Rect& r) const { return true; }
+};
+
+#ifdef PLATFORM_WINCE
+
+
+bool GetShift() { return false; }
+bool GetCtrl() { return false; }
+bool GetAlt() { return false; }
+bool GetCapsLock() { return false; }
+
+bool wince_mouseleft;
+bool wince_mouseright;
+
+bool GetMouseLeft() { return wince_mouseleft; }
+bool GetMouseRight() { return wince_mouseright; }
+bool GetMouseMiddle() { return false; }
+
+Point wince_mousepos = Null;
+
+Point GetMousePos() {
+	return wince_mousepos;
+}
+
+void  SetWinceMouse(HWND hwnd, LPARAM lparam)
+{
+	Point p(lparam);
+	ClientToScreen(hwnd, p);
+	wince_mousepos = p;
+}
+#else
+void  SetWinceMouse(HWND hwnd, LPARAM lparam) {}
+#endif
+
+#ifdef _DEBUG
+static String sPainting;
+#endif
+
+bool PassWindowsKey(int wParam);
+
+LRESULT Ctrl::WindowProc(UINT message, WPARAM wParam, LPARAM lParam) {
+	ASSERT(IsNull(sPainting)); // WindowProc invoked while in Paint routine
+//	LLOG("Ctrl::WindowProc(" << message << ") in " << ::Name(this) << ", focus " << (void *)::GetFocus());
+	Ptr<Ctrl> _this = this;
+	HWND hwnd = GetHWND();
+	switch(message) {
+	case WM_PALETTECHANGED:
+		if((HWND)wParam == hwnd)
+			break;
+#ifndef PLATFORM_WINCE
+	case WM_QUERYNEWPALETTE:
+		if(!Draw::AutoPalette()) break;
+		{
+			HDC hDC = GetDC(hwnd);
+			HPALETTE hOldPal = SelectPalette(hDC, GetQlibPalette(), FALSE);
+			int i = RealizePalette(hDC);
+			SelectPalette(hDC, hOldPal, TRUE);
+			RealizePalette(hDC);
+			ReleaseDC(hwnd, hDC);
+			LLOG("Realized " << i << " colors");
+			if(i) InvalidateRect(hwnd, NULL, TRUE);
+			return i;
+		}
+#endif
+	case WM_PAINT:
+		ASSERT(hwnd);
+		if(IsVisible() && hwnd) {
+			PAINTSTRUCT ps;
+			SyncScroll();
+			HDC dc = BeginPaint(hwnd, &ps);
+			fullrefresh = false;
+			Draw draw(dc);
+#ifndef PLATFORM_WINCE
+			HPALETTE hOldPal;
+			if(draw.PaletteMode() && Draw::AutoPalette()) {
+				hOldPal = SelectPalette(dc, GetQlibPalette(), TRUE);
+				int n = RealizePalette(dc);
+				LLOG("In paint realized " << n << " colors");
+			}
+#endif
+#ifdef _DEBUG
+			sPainting = Name();
+#endif
+			UpdateArea(draw, Rect(ps.rcPaint));
+#ifdef _DEBUG
+			sPainting = Null;
+#endif
+#ifndef PLATFORM_WINCE
+			if(draw.PaletteMode() && Draw::AutoPalette())
+				SelectPalette(dc, hOldPal, TRUE);
+#endif
+			EndPaint(hwnd, &ps);
+		}
+		return 0L;
+#ifndef PLATFORM_WINCE
+	case WM_NCHITTEST:
+		CheckMouseCtrl();
+		if(ignoremouse) return HTTRANSPARENT;
+		break;
+#endif
+	case WM_LBUTTONDOWN:
+#ifdef PLARFORM_WINCE
+		wince_mouseleft = true;
+#endif
+		SetWinceMouse(hwnd, lParam);
+		ClickActivateWnd();
+		if(ignoreclick) return 0L;
+		DoMouse(LEFTDOWN, Point((dword)lParam), 0);
+		if(_this) PostInput();
+		return 0L;
+	case WM_LBUTTONUP:
+		if(ignoreclick)
+			EndIgnore();
+		else
+			DoMouse(LEFTUP, Point((dword)lParam), 0);
+#ifdef PLATFORM_WINCE
+		wince_mouseleft = false;
+#endif
+#ifdef PLATFORM_WINCE
+		wince_mousepos = Point(-99999, -99999);
+		if(!ignoreclick)
+			if(_this) DoMouse(MOUSEMOVE, Point(-99999, -99999));
+#endif
+		if(_this) PostInput();
+		return 0L;
+	case WM_LBUTTONDBLCLK:
+		ClickActivateWnd();
+		if(ignoreclick) return 0L;
+		DoMouse(LEFTDOUBLE, Point((dword)lParam), 0);
+		if(_this) PostInput();
+		return 0L;
+	case WM_RBUTTONDOWN:
+		ClickActivateWnd();
+		if(ignoreclick) return 0L;
+		DoMouse(RIGHTDOWN, Point((dword)lParam));
+		if(_this) PostInput();
+		return 0L;
+	case WM_RBUTTONUP:
+		if(ignoreclick)
+			EndIgnore();
+		else
+			DoMouse(RIGHTUP, Point((dword)lParam));
+		if(_this) PostInput();
+		return 0L;
+	case WM_RBUTTONDBLCLK:
+		ClickActivateWnd();
+		if(ignoreclick) return 0L;
+		DoMouse(RIGHTDOUBLE, Point((dword)lParam));
+		if(_this) PostInput();
+		return 0L;
+	case WM_MBUTTONDOWN:
+		ClickActivateWnd();
+		if(ignoreclick) return 0L;
+		DoMouse(MIDDLEDOWN, Point((dword)lParam));
+		if(_this) PostInput();
+		return 0L;
+	case WM_MBUTTONUP:
+		if(ignoreclick)
+			EndIgnore();
+		else
+			DoMouse(MIDDLEUP, Point((dword)lParam));
+		if(_this) PostInput();
+		return 0L;
+	case WM_MBUTTONDBLCLK:
+		ClickActivateWnd();
+		if(ignoreclick) return 0L;
+		DoMouse(MIDDLEDOUBLE, Point((dword)lParam));
+		if(_this) PostInput();
+		return 0L;
+#ifndef PLATFORM_WINCE
+	case WM_NCLBUTTONDOWN:
+	case WM_NCRBUTTONDOWN:
+	case WM_NCMBUTTONDOWN:
+		ClickActivateWnd();
+		IgnoreMouseUp();
+		break;
+#endif
+	case WM_MOUSEMOVE:
+		SetWinceMouse(hwnd, lParam);
+		LLOG("WM_MOUSEMOVE: ignoreclick = " << ignoreclick);
+		if(ignoreclick) {
+			EndIgnore();
+			return 0L;
+		}
+		if(_this)
+			DoMouse(MOUSEMOVE, Point((dword)lParam));
+		DoCursorShape();
+		return 0L;
+	case 0x20a: // WM_MOUSEWHEEL:
+		if(ignoreclick) {
+			EndIgnore();
+			return 0L;
+		}
+		if(_this)
+			DoMouse(MOUSEWHEEL, Point((dword)lParam), (short)HIWORD(wParam));
+		if(_this) PostInput();
+		return 0L;
+	case WM_SETCURSOR:
+		if((HWND)wParam == hwnd && LOWORD((dword)lParam) == HTCLIENT) {
+			if(hCursor) SetCursor(hCursor);
+			return TRUE;
+		}
+		break;
+//	case WM_MENUCHAR:
+//		return MAKELONG(0, MNC_SELECT);
+	case WM_KEYDOWN:
+	case WM_SYSKEYDOWN:
+	case WM_CHAR:
+		ignorekeyup = false;
+	case WM_KEYUP:
+	case WM_SYSKEYUP:
+		{
+#if 0
+			String msgdump;
+			switch(message)
+			{
+			case WM_KEYDOWN:    msgdump << "WM_KEYDOWN"; break;
+			case WM_KEYUP:      msgdump << "WM_KEYUP"; break;
+			case WM_SYSKEYDOWN: msgdump << "WM_SYSKEYDOWN"; break;
+			case WM_SYSKEYUP:   msgdump << "WM_SYSKEYUP"; break;
+			case WM_CHAR:       msgdump << "WM_CHAR"; break;
+			}
+			msgdump << " wParam = 0x" << FormatIntHex(wParam, 8)
+				<< ", lParam = 0x" << FormatIntHex(lParam, 8)
+				<< ", ignorekeyup = " << (ignorekeyup ? "true" : "false");
+			LLOG(msgdump);
+#endif
+			dword keycode = 0;
+			if(message == WM_KEYDOWN)
+				keycode = KEYtoK((dword)wParam);
+			else
+			if(message == WM_KEYUP)
+				keycode = KEYtoK((dword)wParam) | K_KEYUP;
+			else
+			if(message == WM_SYSKEYDOWN /*&& ((lParam & 0x20000000) || wParam == VK_F10)*/)
+				keycode = KEYtoK((dword)wParam);
+			else
+			if(message == WM_SYSKEYUP /*&& ((lParam & 0x20000000) || wParam == VK_F10)*/)
+				keycode = KEYtoK((dword)wParam) | K_KEYUP;
+			else
+			if(message == WM_CHAR && wParam != 127 && wParam > 32) {
+#ifdef PLATFORM_WINCE
+				keycode = wParam;
+#else
+				if(IsWindowUnicode(hwnd)) // TRC 04/10/17: ActiveX Unicode patch
+					keycode = (dword)wParam;
+				else {
+					char b[20];
+					::GetLocaleInfo(MAKELCID(LOWORD(GetKeyboardLayout(0)), SORT_DEFAULT),
+					                LOCALE_IDEFAULTANSICODEPAGE, b, 20);
+					int codepage = atoi(b);
+					if(codepage >= 1250 && codepage <= 1258)
+						keycode = ToUnicode((dword)wParam, codepage - 1250 + CHARSET_WIN1250);
+					else
+						keycode = (dword)wParam;
+				}
+#endif
+			}
+			bool b = false;
+			if(keycode) {
+				b = DispatchKey(keycode, LOWORD(lParam));
+				SyncCaret();
+				if(_this) PostInput();
+			}
+//			LOG("key processed = " << b);
+			if(b || (message == WM_SYSKEYDOWN || message == WM_SYSKEYUP)
+			&& wParam != VK_F4 && !PassWindowsKey((dword)wParam)) // 17.11.2003 Mirek -> invoke system menu
+				return 0L;
+			break;
+		}
+		break;
+//	case WM_GETDLGCODE:
+//		return wantfocus ? 0 : DLGC_STATIC;
+	case WM_ERASEBKGND:
+		return 1L;
+	case WM_DESTROY:
+		PreDestroy();
+#ifndef PLATFORM_WINCE
+		break;
+	case WM_NCDESTROY:
+#endif
+		if(!hwnd) break;
+		if(HasChildDeep(mouseCtrl) || this == ~mouseCtrl) mouseCtrl = NULL;
+		if(HasChildDeep(focusCtrl) || this == ~focusCtrl) focusCtrl = NULL;
+		if(HasChildDeep(focusCtrlWnd) || this == ~focusCtrlWnd) {
+			LLOG("WM_NCDESTROY: clearing focusCtrlWnd = " << ::Name(focusCtrlWnd));
+			focusCtrlWnd = NULL;
+			focusCtrl = NULL;
+		}
+		if(::GetFocus() == NULL) {
+			Ctrl *owner = GetOwner();
+			if(owner && (owner->IsForeground() || IsForeground()) && !owner->SetWantFocus())
+				IterateFocusForward(owner, owner);
+		}
+#ifdef PLATFORM_WINCE
+		DefWindowProc(hwnd, message, wParam, lParam);
+#else
+		if(IsWindowUnicode(hwnd)) // TRC 04/10/17: ActiveX unicode patch
+			DefWindowProcW(hwnd, message, wParam, lParam);
+		else
+			DefWindowProc(hwnd, message, wParam, lParam);
+#endif
+		hwnd = NULL;
+		return 0L;
+	case WM_CANCELMODE:
+		if(this == ~captureCtrl || HasChildDeep(captureCtrl))
+			ReleaseCtrlCapture();
+		break;
+	case WM_SHOWWINDOW:
+		visible = (BOOL) wParam;
+		StateH(SHOW);
+		break;
+#ifndef PLATFORM_WINCE
+	case WM_MOUSEACTIVATE:
+		LLOG("WM_MOUSEACTIVATE " << Name() << ", focusCtrlWnd = " << UPP::Name(focusCtrlWnd) << ", raw = " << (void *)::GetFocus());
+		if(!IsEnabled()) {
+			if(lastActiveWnd && lastActiveWnd->IsEnabled()) {
+				LLOG("WM_MOUSEACTIVATE -> ::SetFocus for " << UPP::Name(lastActiveWnd));
+				::SetFocus(lastActiveWnd->GetHWND());
+			}
+			else
+				MessageBeep(MB_OK);
+			return MA_NOACTIVATEANDEAT;
+		}
+		if(IsPopUp()) return MA_NOACTIVATE;
+		break;
+#endif
+	case WM_SIZE:
+	case WM_MOVE:
+		if(hwnd) {
+			Rect rect;
+#ifndef PLATFORM_WINCE
+			if(activex) {
+				WINDOWPLACEMENT wp;
+				wp.length = sizeof(WINDOWINFO);
+				::GetWindowPlacement(hwnd, &wp);
+				rect = wp.rcNormalPosition;
+			}
+			else
+#endif
+				rect = GetScreenClient(hwnd);
+			LLOG("WM_MOVE / WM_SIZE: screen client = " << rect);
+			if(GetRect() != rect)
+				SetWndRect(rect);
+			WndDestroyCaret();
+			caretCtrl = NULL;
+			SyncCaret();
+		}
+		return 0L;
+	case WM_HELP:
+		return TRUE;
+	case WM_ACTIVATE:
+		LLOG("WM_ACTIVATE " << Name() << ", wParam = " << (int)wParam << ", focusCtrlWnd = " << ::Name(focusCtrlWnd) << ", raw = " << (void *)::GetFocus());
+		ignorekeyup = true;
+		break;
+	case WM_SETFOCUS:
+		LLOG("WM_SETFOCUS " << Name() << ", focusCtrlWnd = " << UPP::Name(focusCtrlWnd) << ", raw = " << (void *)::GetFocus());
+		if(this != focusCtrlWnd)
+			if(IsEnabled()) {
+				LLOG("WM_SETFOCUS -> ActivateWnd: this != focusCtrlWnd, this = "
+					<< Name() << ", focusCtrlWnd = " << UPP::Name(focusCtrlWnd));
+				ActivateWnd();
+			}
+			else {
+				if(focusCtrlWnd && focusCtrlWnd->IsEnabled()) {
+					if(!IsEnabled())
+						MessageBeep(MB_OK);
+					LLOG("WM_SETFOCUS -> ::SetFocus for " << UPP::Name(focusCtrlWnd));
+					::SetFocus(focusCtrlWnd->GetHWND());
+				}
+				else
+				if(lastActiveWnd && lastActiveWnd->IsEnabled()) {
+					LLOG("WM_SETFOCUS -> ::SetFocus for " << UPP::Name(lastActiveWnd));
+					::SetFocus(lastActiveWnd->GetHWND());
+				}
+				else {
+					LLOG("WM_SETFOCUS - ::SetFocus(NULL)");
+					::SetFocus(NULL);
+				}
+			}
+		LLOG("//WM_SETFOCUS " << (void *)hwnd << ", focusCtrlWnd = " << UPP::Name(focusCtrlWnd) << ", raw = " << (void *)::GetFocus());
+		return 0L;
+	case WM_KILLFOCUS:
+		LLOG("WM_KILLFOCUS " << (void *)(HWND)wParam << ", this = " << UPP::Name(this) << ", focusCtrlWnd = " << UPP::Name(focusCtrlWnd) << ", raw = " << (void *)::GetFocus());
+		LLOG("Kill " << ::Name(CtrlFromHWND((HWND)wParam)));
+		if(!CtrlFromHWND((HWND)wParam)) {
+			LLOG("WM_KILLFOCUS -> KillFocusWnd: " << UPP::Name(this));
+			KillFocusWnd();
+		}
+		LLOG("//WM_KILLFOCUS " << (void *)(HWND)wParam << ", focusCtrlWnd = " << ::Name(focusCtrlWnd) << ", raw = " << (void *)::GetFocus());
+		return 0L;
+	case WM_ENABLE:
+		if(!!wParam != enabled) {
+			enabled = !!wParam;
+			RefreshFrame();
+			StateH(ENABLE);
+		}
+		return 0L;
+#ifndef PLATFORM_WINCE
+	case WM_GETMINMAXINFO:
+		{
+			MINMAXINFO *mmi = (MINMAXINFO *)lParam;
+			Rect minr(Point(50, 50), GetMinSize());
+			Rect maxr(Point(50, 50), GetMaxSize());
+			dword style = ::GetWindowLong(hwnd, GWL_STYLE);
+			dword exstyle = ::GetWindowLong(hwnd, GWL_EXSTYLE);
+			AdjustWindowRectEx(minr, style, FALSE, exstyle);
+			AdjustWindowRectEx(maxr, style, FALSE, exstyle);
+			mmi->ptMinTrackSize = Point(minr.Size());
+			mmi->ptMaxTrackSize = Point(maxr.Size());
+			LLOG("WM_GETMINMAXINFO: MinTrackSize = " << Point(mmi->ptMinTrackSize) << ", MaxTrackSize = " << Point(mmi->ptMaxTrackSize));
+			LLOG("ptMaxSize = " << Point(mmi->ptMaxSize) << ", ptMaxPosition = " << Point(mmi->ptMaxPosition));
+		}
+		return 0L;
+#endif
+	case WM_SETTINGCHANGE:
+	case 0x031A: // WM_THEMECHANGED
+		ChSync();
+		RefreshLayoutDeep();
+		RefreshFrame();
+		break;
+/*
+    case WM_IME_COMPOSITION:
+		HIMC himc = ImmGetContext(hwnd);
+		if(!himc) break;
+		CANDIDATEFORM cf;
+		Rect r = GetScreenRect();
+		cf.dwIndex = 0;
+		cf.dwStyle = CFS_CANDIDATEPOS;
+		cf.ptCurrentPos.x = r.left + caretx;
+		cf.ptCurrentPos.y = r.top + carety + caretcy;
+		ImmSetCandidateWindow (himc, &cf);
+		break;
+*/
+	}
+	if(hwnd)
+#ifdef PLATFORM_WINCE
+		return DefWindowProc(hwnd, message, wParam, lParam);
+#else
+		if(IsWindowUnicode(hwnd)) // TRC 04/10/17: ActiveX unicode patch
+			return DefWindowProcW(hwnd, message, wParam, lParam);
+		else
+			return DefWindowProc(hwnd, message, wParam, lParam);
+#endif
+	return 0L;
+}
+
+void Ctrl::PreDestroy() {}
+
+#endif
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/CtrlCore/Win32Wnd.cpp b/uppsrc/CtrlCore/Win32Wnd.cpp
new file mode 100644
index 000000000..181d46e91
--- /dev/null
+++ b/uppsrc/CtrlCore/Win32Wnd.cpp
@@ -0,0 +1,1116 @@
+#include "CtrlCore.h"
+
+NAMESPACE_UPP
+
+#ifdef PLATFORM_WIN32
+
+#define LLOG(x)   //   LOG(x)
+#define LOGTIMING 0
+
+#ifdef _DEBUG
+#define LOGMESSAGES 0
+#endif
+
+#define ELOG(x)  // RLOG(GetSysTime() << ": " << x)
+
+template<>
+unsigned GetHashValue(const HWND& h)
+{
+	return (unsigned)(intptr_t)h;
+}
+
+static bool PeekMsg(MSG& msg)
+{
+	if(!PeekMessage(&msg, NULL, 0, 0, PM_NOREMOVE)) return false;
+	return IsWindowUnicode(msg.hwnd) ? PeekMessageW(&msg, NULL, 0, 0, PM_REMOVE)
+	                                 : PeekMessage(&msg, NULL, 0, 0, PM_REMOVE);
+}
+
+static bool sFinished;
+
+static BOOL CALLBACK sDumpWindow(HWND hwnd, LPARAM lParam) {
+	String dump;
+	dump << (IsWindowEnabled(hwnd) ? "ena" : "dis") << ' '
+	     << (IsWindowVisible(hwnd) ? "vis" : "hid") << ' '
+	     << Sprintf("owner=0x%x ", GetWindow(hwnd, GW_OWNER));
+	Ctrl *ctrl = Ctrl::CtrlFromHWND(hwnd);
+	if(ctrl) {
+#ifdef _DEBUG
+		dump << "Ctrl: " << UPP::Name(ctrl);
+#endif
+	}
+	else if(!lParam)
+		return TRUE;
+	else
+	{
+#ifdef PLATFORM_WINCE
+		wchar clsname[256], title[1024];
+#else
+		char clsname[256], title[1024];
+#endif
+		::GetClassName(hwnd, clsname, __countof(clsname));
+		::GetWindowText(hwnd, title, __countof(title));
+		dump << "HWND: " << Sprintf("0x%x", hwnd) << ", class = "
+		     << clsname << ", title = " << title;
+	}
+	LLOG(dump);
+	return TRUE;
+}
+
+void DumpWindowOrder(bool aliens) {
+#ifndef PLATFORM_WINCE
+	LLOG("DumpWindowOrder" << BeginIndent);
+	EnumChildWindows(NULL, &sDumpWindow, (LPARAM)(aliens ? 1 : 0));
+	LLOG(EndIndent << "//DumpWindowOrder");
+#endif
+}
+
+#ifndef PLATFORM_WINCE
+Point GetMousePos() {
+	Point p;
+	return ::GetCursorPos(p) ? p : Null;
+	::GetCursorPos(p);
+	return p;
+}
+#endif
+
+HCURSOR   Ctrl::hCursor;
+HINSTANCE Ctrl::hInstance;
+#ifndef flagDLL
+#ifndef PLATFORM_WINCE
+HANDLE    Ctrl::OverwatchThread;
+HWND      Ctrl::OverwatchHWND;
+
+Event Ctrl::OverwatchEndSession;
+GLOBAL_VAR(Event, Ctrl::ExitLoopEvent)
+#endif
+#endif
+
+GLOBAL_VAR(bool, Ctrl::EndSession)
+
+#ifndef flagDLL
+#ifndef PLATFORM_WINCE
+LRESULT CALLBACK Ctrl::OverwatchWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
+{
+	if(msg == WM_USER) {
+		ELOG("WM_USER");
+		PostQuitMessage(0);
+	}
+	if(msg == WM_ENDSESSION) {
+		EndSession() = true;
+		ELOG("WM_ENDSESSION 1");
+		ExitLoopEvent().Set();
+		ELOG("WM_ENDSESSION 2");
+		OverwatchEndSession.Wait();
+		ELOG("WM_ENDSESSION 3");
+	}
+	return DefWindowProc(hwnd, msg, wParam, lParam);
+}
+
+DWORD WINAPI Ctrl::Win32OverwatchThread(LPVOID)
+{
+    WNDCLASS  wc;
+    Zero(wc);
+	wc.style         = CS_DBLCLKS|CS_HREDRAW|CS_VREDRAW;
+	wc.lpfnWndProc   = (WNDPROC)OverwatchWndProc;
+	wc.hInstance     = hInstance;
+	wc.hCursor       = NULL;
+	wc.hbrBackground = NULL;
+	wc.lpszClassName = "UPP-OVERWATCH";
+	RegisterClass(&wc);
+
+	OverwatchHWND = CreateWindowEx(0, "UPP-OVERWATCH", "", WS_OVERLAPPEDWINDOW,
+	                               -1000, -1000, 50, 50, NULL, NULL, hInstance, NULL);
+
+	ELOG("OverWatch 1");
+	ExitLoopEvent().Set();
+	ELOG("OverWatch 2");
+	MSG Msg;
+	while(GetMessage(&Msg, NULL, 0, 0) > 0) {
+        TranslateMessage(&Msg);
+	if(IsWindowUnicode(Msg.hwnd))
+		DispatchMessageW(&Msg);
+	else
+		DispatchMessage(&Msg);
+    }
+	ELOG("OverWatch 3");
+	return 0;
+}
+#endif
+#endif
+
+HWND utilityHWND = 0;
+
+extern VectorMap<int, ClipData>& sClipMap();
+
+INITBLOCK
+{
+	sClipMap();
+}
+
+EXITBLOCK
+{
+	if(utilityHWND) DestroyWindow(utilityHWND);
+}
+
+LRESULT CALLBACK Ctrl::UtilityProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
+{
+	sClipMap();
+	switch(message) {
+	case WM_TIMER:
+		TimerProc(GetTickCount());
+		return 0;
+	case WM_RENDERFORMAT:
+		RenderFormat((dword)wParam);
+		return 0;
+	case WM_DESTROYCLIPBOARD:
+		DestroyClipboard();
+		return 0;
+	}
+	return ::DefWindowProc(hWnd, message, wParam, lParam);
+}
+
+#ifdef PLATFORM_WINCE
+#define L_(x)  L##x
+#else
+#define L_(x)  x
+#endif
+
+void Ctrl::InitWin32(HINSTANCE hInstance)
+{
+	LLOG("InitWin32");
+//	RLOGBLOCK("Ctrl::InitWin32");
+#define ILOG(x) // RLOG(x)
+	Ctrl::hInstance = hInstance;
+	ILOG("RegisterClassW");
+
+#ifndef PLATFORM_WINCE
+	if(IsWinNT())
+#endif
+	{
+	    WNDCLASSW  wc;
+	    Zero(wc);
+		wc.style         = CS_DBLCLKS|CS_HREDRAW|CS_VREDRAW;
+		wc.lpfnWndProc   = (WNDPROC)Ctrl::WndProc;
+		wc.hInstance     = hInstance;
+		wc.hCursor       = LoadCursor(NULL, IDC_ARROW);
+		wc.hbrBackground = NULL; //(HBRUSH)(COLOR_WINDOW+1);
+		wc.lpszClassName = L"UPP-CLASS-W";
+		RegisterClassW(&wc);
+		wc.style         = 0x20000|CS_DBLCLKS|CS_HREDRAW|CS_VREDRAW;
+		wc.lpszClassName = L"UPP-CLASS-DS-W";
+		RegisterClassW(&wc);
+		wc.style         = CS_SAVEBITS|CS_DBLCLKS|CS_HREDRAW|CS_VREDRAW;
+		wc.lpszClassName = L"UPP-CLASS-SB-W";
+		RegisterClassW(&wc);
+		wc.style         = 0x20000|CS_DBLCLKS|CS_HREDRAW|CS_VREDRAW|CS_SAVEBITS;
+		wc.lpszClassName = L"UPP-CLASS-SB-DS-W";
+		RegisterClassW(&wc);
+	}
+
+	ILOG("RegisterClassA");
+	WNDCLASS  wc;
+	Zero(wc);
+	wc.style         = CS_DBLCLKS|CS_HREDRAW|CS_VREDRAW;
+	wc.lpfnWndProc   = (WNDPROC)Ctrl::WndProc;
+	wc.hInstance     = hInstance;
+	wc.hCursor       = LoadCursor(NULL, IDC_ARROW);
+	wc.hbrBackground = NULL; //(HBRUSH)(COLOR_WINDOW+1);
+	wc.lpszClassName = L_("UPP-CLASS-A");
+	RegisterClass(&wc);
+	if(IsWinXP()) {
+		wc.style         = 0x20000|CS_DBLCLKS|CS_HREDRAW|CS_VREDRAW;
+		wc.lpszClassName = L_("UPP-CLASS-DS-A");
+		RegisterClass(&wc);
+	}
+	wc.style         = CS_SAVEBITS|CS_DBLCLKS|CS_HREDRAW|CS_VREDRAW;
+	wc.lpszClassName = L_("UPP-CLASS-SB-A");
+	RegisterClass(&wc);
+	if(IsWinXP()) {
+		wc.style         = 0x20000|CS_DBLCLKS|CS_HREDRAW|CS_VREDRAW|CS_SAVEBITS;
+		wc.lpszClassName = L_("UPP-CLASS-SB-DS-A");
+		RegisterClass(&wc);
+	}
+	wc.style         = 0;
+	wc.lpszClassName = L_("UPP-TIMER");
+	wc.hCursor       = NULL;
+	wc.lpfnWndProc   = &Ctrl::UtilityProc;
+	RegisterClass(&wc);
+
+	ILOG("InitTimer");
+	InitTimer();
+	ILOG("SetTimer");
+	utilityHWND = CreateWindow(L_("UPP-TIMER"), L_(""), WS_OVERLAPPED,
+		CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT,
+		NULL, NULL, hInstance, NULL);
+	SetTimer(utilityHWND, 1, 10, NULL);
+	ILOG("Windows");
+	Windows(); //?? TRC: what's the use of this?
+
+	ChSync();
+
+	OleInitialize(NULL);
+
+/* TRC 05/11/14: moved to GuiSleep to avoid thread creation in OCX DllMain
+	DWORD dummy;
+	OverwatchThread = CreateThread(NULL, 0x100000, Win32OverwatchThread, NULL, 0, &dummy);
+	ExitLoopEvent().Wait();
+*/
+
+// TRC 05/11/18: pSetLayeredWindowAttributes moved to GLOBAL_VAR (see below) to make OCX initialization simpler
+#undef ILOG
+}
+
+typedef DWORD (WINAPI *PSLWA)(HWND, DWORD, BYTE, DWORD);
+
+static PSLWA SetLayeredWindowAttributes()
+{
+	static PSLWA pSet;
+#ifndef PLATFORM_WINCE
+	static bool inited = false;
+	if(!inited) {
+		inited = true;
+		if(HMODULE hDLL = LoadLibrary ("user32"))
+			pSet = (PSLWA) GetProcAddress(hDLL, "SetLayeredWindowAttributes");
+	}
+#endif
+	return pSet;
+}
+
+bool Ctrl::IsAlphaSupported()
+{
+	return SetLayeredWindowAttributes();
+}
+
+bool Ctrl::IsCompositedGui()
+{
+	return false;
+}
+
+void Ctrl::ExitWin32()
+{
+	RenderAllFormats();
+
+	OleUninitialize();
+
+	sFinished = true;
+	for(int i = 0; i < Windows().GetCount(); i++) {
+		HWND hwnd = Windows().GetKey(i);
+		if(hwnd)
+			::DestroyWindow(hwnd);
+	}
+	MSG msg;
+	while(PeekMsg(msg))
+		if(msg.message != WM_QUIT)
+			::PostQuitMessage(0);
+#ifndef flagDLL
+#ifndef PLATFORM_WINCE
+	ELOG("ExitWin32 1");
+	OverwatchEndSession.Set();
+	ELOG("ExitWin32 2");
+	PostMessage(OverwatchHWND, WM_USER, 0, 0);
+	ELOG("ExitWin32 3");
+	LLOG("Waiting for overwatch thread to finish...");
+	WaitForSingleObject(OverwatchThread, INFINITE);
+	ELOG("ExitWin32 4");
+	LLOG("...overwatch thread finished");
+#endif
+#endif
+}
+
+void Ctrl::SetTimerGranularity(int ms)
+{
+	if(ms > 0)
+		SetTimer(utilityHWND, 1, ms, NULL);
+	else
+		KillTimer(utilityHWND, 1);
+}
+
+VectorMap< HWND, Ptr<Ctrl> >& Ctrl::Windows()
+{
+	static VectorMap< HWND, Ptr<Ctrl> > map;
+	return map;
+}
+
+Vector<Ctrl *> Ctrl::GetTopCtrls()
+{
+	Vector<Ctrl *> v;
+	VectorMap< HWND, Ptr<Ctrl> >& w = Windows();
+	for(int i = 0; i < w.GetCount(); i++)
+		if(w.GetKey(i) && w[i] && !w[i]->parent)
+			v.Add(w[i]);
+	return v;
+}
+
+void  Ctrl::SetMouseCursor(const Image& image)
+{
+#ifndef PLATFORM_WINCE
+	static Image img;
+	if(image.GetSerialId() != img.GetSerialId()) {
+		img = image;
+		HCURSOR hc = IconWin32(img, true);
+		SetCursor(hc);
+		if(hCursor)
+			DestroyCursor(hCursor);
+		hCursor = hc;
+	}
+#endif
+}
+
+Ctrl *Ctrl::CtrlFromHWND(HWND hwnd)
+{
+	return hwnd ? Windows().Get(hwnd, NULL) : NULL;
+}
+
+HWND Ctrl::GetOwnerHWND() const
+{
+	HWND hwnd = GetHWND();
+	if(!hwnd) return NULL;
+	return GetWindow(hwnd, GW_OWNER);
+}
+
+Ctrl *Ctrl::GetOwner()
+{
+	HWND hwnd = GetOwnerHWND();
+	return hwnd ? CtrlFromHWND(hwnd) : NULL;
+}
+
+Ctrl *Ctrl::GetActiveCtrl()
+{
+	if(focusCtrl)
+		return focusCtrl->GetTopCtrl();
+	HWND actwnd = ::GetActiveWindow();
+	Vector<Ctrl *> top = GetTopCtrls();
+	for(int i = 0; i < top.GetCount(); i++)
+		if(top[i]->IsActiveX() && top[i]->GetHWND()) {
+			LLOG("-> top[" << i << "] = " << FormatIntHex(top[i]->GetHWND()));
+			for(HWND hwnd = top[i]->GetHWND(); hwnd; hwnd = ::GetParent(hwnd))
+				if(hwnd == actwnd) {
+					LLOG("-> match for " <<UPP::Name(top[i]));
+					return top[i];
+				}
+		}
+	LLOG("//Ctrl::GetActiveCtrl -> not found (NULL)");
+	return NULL;
+}
+
+UDropTarget *NewUDropTarget(Ctrl *);
+
+void Ctrl::Create(HWND parent, DWORD style, DWORD exstyle, bool savebits, int show, bool dropshadow)
+{
+	LLOG("Ctrl::Create(parent = " << (void *)parent << ") in " <<UPP::Name(this) << BeginIndent);
+	ASSERT(!IsChild() && !IsOpen());
+	Rect r = GetRect();
+	AdjustWindowRectEx(r, style, FALSE, exstyle);
+	isopen = true;
+	top = new Top;
+	ASSERT(!parent || IsWindow(parent));
+	if(!IsWinXP())
+		dropshadow = false;
+#ifdef PLATFORM_WINCE
+		if(parent)
+			top->hwnd = CreateWindowExW(exstyle,
+			                            savebits ? dropshadow ? L"UPP-CLASS-SB-DS-W" : L"UPP-CLASS-SB-W"
+			                                     : dropshadow ? L"UPP-CLASS-DS-W"    : L"UPP-CLASS-W",
+			                            L"", style, r.left, r.top, r.Width(), r.Height(),
+			                            parent, NULL, hInstance, this);
+		else
+			top->hwnd = CreateWindowW(L"UPP-CLASS-W",
+			                          L"", WS_VISIBLE, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT,
+			                          parent, NULL, hInstance, this);
+#else
+	if(IsWinNT() && (!parent || IsWindowUnicode(parent)))
+		top->hwnd = CreateWindowExW(exstyle,
+		                            savebits ? dropshadow ? L"UPP-CLASS-SB-DS-W" : L"UPP-CLASS-SB-W"
+		                                     : dropshadow ? L"UPP-CLASS-DS-W"    : L"UPP-CLASS-W",
+		                            L"", style, r.left, r.top, r.Width(), r.Height(),
+		                            parent, NULL, hInstance, this);
+	else
+		top->hwnd = CreateWindowEx(exstyle,
+		                           savebits ? dropshadow ? "UPP-CLASS-SB-DS-A" : "UPP-CLASS-SB-A"
+		                                    : dropshadow ? "UPP-CLASS-DS-A"    : "UPP-CLASS-A",
+		                           "", style, r.left, r.top, r.Width(), r.Height(),
+		                           parent, NULL, hInstance, this);
+#endif
+
+	inloop = false;
+
+	ASSERT(top->hwnd);
+
+	::ShowWindow(top->hwnd, visible ? show : SW_HIDE);
+//	::UpdateWindow(hwnd);
+	StateH(OPEN);
+	LLOG(EndIndent << "//Ctrl::Create in " <<UPP::Name(this));
+	RegisterDragDrop(top->hwnd, (LPDROPTARGET) (top->dndtgt = NewUDropTarget(this)));
+	CancelMode();
+}
+
+void ReleaseUDropTarget(UDropTarget *dt);
+
+void Ctrl::WndFree()
+{
+	if(!top) return;
+	RevokeDragDrop(GetHWND());
+	ReleaseUDropTarget(top->dndtgt);
+	isopen = false;
+	if(!top) return;
+	HWND owner = GetWindow(top->hwnd, GW_OWNER);// CXL 31.10.2003 z DoRemove
+	bool focus = ::GetFocus() == top->hwnd;
+	LLOG("Ctrl::WndDestroy owner " << (void *)owner
+	     << " focus " << focus
+	     << " ::GetFocus() " << (void *)::GetFocus());
+	if(owner && focus) { // CXL 7.11.2003 presun - melo by to fungovat take a neblikat...
+		LLOG("Ctrl::WndFree->SetFocus " << UPP::Name(Ctrl::CtrlFromHWND(owner)));
+		::SetFocus(owner);
+	}
+	LLOG(EndIndent << "//Ctrl::WndFree() in " <<UPP::Name(this));
+	delete top;
+	top = NULL;
+}
+
+void Ctrl::WndDestroy()
+{
+	LLOG("Ctrl::WndDestroy() in " <<UPP::Name(this) << BeginIndent);
+	LLOG((DumpWindowOrder(false), ""));
+	if(top && top->hwnd) {
+		HWND hwnd = top->hwnd;
+		WndFree(); // CXL 2007-06-04 to avoid loosing focus with maximize box owned dialogs
+		::DestroyWindow(hwnd);
+	}
+}
+
+Image Ctrl::DoMouse(int e, Point p, int zd)
+{
+//	LLOG("Ctrl::DoMouse(" << p << ", " << e << ")");
+	eventCtrl = this;
+	Image img = DispatchMouse(e, p, zd);
+	SyncCaret();
+	return img;
+}
+
+#ifdef _DEBUG
+
+bool Ctrl::LogMessages;
+
+#define x_MSG(x)       { x, #x },
+
+struct WinMsg {
+	int         ID;
+	const char *name;
+}
+sWinMsg[] = {
+#include "Win32Msg.i"
+	0, NULL
+};
+
+#endif
+
+void Ctrl::NcCreate(HWND hwnd)
+{
+	if(!parent)
+		top->hwnd = hwnd;
+}
+
+void Ctrl::NcDestroy()
+{
+	if(!parent)
+		WndFree();
+}
+
+LRESULT CALLBACK Ctrl::WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
+{
+	if(sFinished)
+		return DefWindowProc(hWnd, message, wParam, lParam);
+#ifdef PLATFORM_WINCE
+	if(message == WM_CREATE)
+#else
+	if(message == WM_NCCREATE)
+#endif
+	{
+		Ctrl *w = (Ctrl *)((LPCREATESTRUCT) lParam)->lpCreateParams;
+		if(w) {
+			w->NcCreate(hWnd);
+			int i = Windows().Find(NULL);
+			if(i >= 0) {
+				Windows().SetKey(i, hWnd);
+				Windows()[i] = w;
+			}
+			else
+				Windows().Add(hWnd) = w;
+		}
+	}
+	Ctrl *w = Windows().Get(hWnd, NULL);
+#ifdef PLATFORM_WINCE
+	if(message == WM_DESTROY)
+#else
+	if(message == WM_NCDESTROY)
+#endif
+	{
+		if(w) w->NcDestroy();
+		int i = Windows().Find(hWnd);
+		if(i >= 0)
+			Windows().SetKey(i, NULL);
+	}
+	#if LOGMESSAGES
+	bool logblk = false;
+	if(message != WM_SETCURSOR && message != WM_CTLCOLORBTN && message != WM_TIMER &&
+#ifndef PLATFORM_WINCE
+	   message != WM_NCHITTEST  && message != WM_ENTERIDLE &&
+#endif
+	   message != WM_CTLCOLORDLG && message != WM_CTLCOLOREDIT && message != WM_CTLCOLORLISTBOX &&
+	   message != WM_CTLCOLORMSGBOX && message != WM_CTLCOLORSCROLLBAR &&
+	   message != WM_CTLCOLORSTATIC && message != WM_CANCELMODE &&
+	   message != 0x0118)
+		for(WinMsg *m = sWinMsg; m->ID; m++)
+			if(m->ID == message) {
+				RLOG(m->name << ' ' << UPP::Name(w) <<
+					Sprintf(", wParam = %d (0x%x), lParam = %d (0x%x)",
+					       wParam, wParam, lParam, lParam));
+				VppLog().Begin();
+				logblk = true;
+				break;
+			}
+	#endif
+	LRESULT l = 0;
+	if(w) {
+		try
+		{
+#if defined(_DEBUG) && LOGTIMING
+			int ticks = msecs();
+			String wname = w->Name();
+#endif
+			Ptr<Ctrl> pw = w;
+			l = w->WindowProc(message, wParam, lParam);
+			if(pw)
+				pw->SyncMoves();
+#if defined(_DEBUG) && LOGTIMING
+			String msgname;
+			for(WinMsg *m = sWinMsg; m->ID; m++)
+				if(m->ID == message) {
+					msgname = m->name;
+					break;
+				}
+			if(IsNull(msgname))
+				msgname = NFormat("0x%04x", (int)message);
+			LLOG(NFormat("T+%d %s 0x%08x 0x%08x -> %s", msecs(ticks), msgname, (int)wParam, (int)lParam, wname));
+#endif
+		}
+		catch(Exc e)
+		{
+			LOG("Ctrl::WindowProc -> Exc: " << e);
+			NEVER();
+		}
+	}
+	else
+		l = DefWindowProc(hWnd, message, wParam, lParam);
+#if LOGMESSAGES
+	if(logblk)
+		VppLog().End();
+#endif
+	return l;
+}
+
+bool PassWindowsKey(int wParam)
+{
+	return wParam >= VK_NUMPAD0 && wParam <= VK_NUMPAD9
+	||     wParam == VK_INSERT || wParam == VK_DELETE
+	||     wParam == VK_HOME || wParam == VK_END
+	||     wParam == VK_PRIOR || wParam == VK_NEXT
+	||     wParam == VK_UP || wParam == VK_DOWN
+	||     wParam == VK_LEFT || wParam == VK_RIGHT
+	||     wParam == VK_CLEAR || wParam == VK_SPACE
+	||     wParam >= 0x90; // OEM keys
+}
+
+static void sProcessMSG(MSG& msg)
+{
+	if(msg.message != WM_SYSKEYDOWN && msg.message != WM_SYSKEYUP
+	|| PassWindowsKey((dword)msg.wParam) || msg.wParam == VK_MENU) //17.11 Mirek - fix to get windows menu invoked on Alt+Space
+		TranslateMessage(&msg); // 04/09/07: TRC fix to make barcode reader going better
+	if(IsWindowUnicode(msg.hwnd))
+		DispatchMessageW(&msg);
+	else
+		DispatchMessage(&msg);
+}
+
+bool Ctrl::IsWaitingEvent()
+{
+	MSG msg;
+	return PeekMsg(msg);
+}
+
+bool Ctrl::ProcessEvent(bool *quit)
+{
+	if(EndSession())
+		return false;
+	if(!GetMouseLeft() && !GetMouseRight() && !GetMouseMiddle())
+		ReleaseCtrlCapture();
+	MSG msg;
+	if(PeekMsg(msg)) {
+		if(msg.message == WM_QUIT && quit)
+			*quit = true;
+//		LLOG(GetSysTime() << " % " << (unsigned)msecs() % 10000 << ": sProcessMSG " << FormatIntHex(msg.message));
+		sProcessMSG(msg);
+//		LLOG(GetSysTime() << " % " << (unsigned)msecs() % 10000 << ": //sProcessMSG " << FormatIntHex(msg.message));
+		DefferedFocusSync();
+		SyncCaret();
+		return true;
+	}
+	return false;
+}
+
+void SweepMkImageCache();
+
+bool Ctrl::ProcessEvents(bool *quit)
+{
+	if(ProcessEvent(quit)) {
+		while(ProcessEvent(quit) && (!LoopCtrl || LoopCtrl->InLoop())); // LoopCtrl-MF 071008
+		SweepMkImageCache();
+		return true;
+	}
+	SweepMkImageCache();
+	return false;
+}
+
+void Ctrl::EventLoop(Ctrl *ctrl)
+{
+	ASSERT(LoopLevel == 0 || ctrl);
+	LoopLevel++;
+	LLOG("Entering event loop at level " << LoopLevel << BeginIndent);
+	Ptr<Ctrl> ploop;
+	if(ctrl) {
+		ploop = LoopCtrl;
+		LoopCtrl = ctrl;
+		ctrl->inloop = true;
+	}
+
+	bool quit = false;
+	ProcessEvents(&quit);
+	while(!EndSession() && !quit && ctrl ? ctrl->IsOpen() && ctrl->InLoop() : GetTopCtrls().GetCount())
+	{
+//		LLOG(GetSysTime() << " % " << (unsigned)msecs() % 10000 << ": EventLoop / GuiSleep");
+		SyncCaret();
+		GuiSleep(1000);
+		if(EndSession()) break;
+//		LLOG(GetSysTime() << " % " << (unsigned)msecs() % 10000 << ": EventLoop / ProcessEvents");
+		ProcessEvents(&quit);
+//		LLOG(GetSysTime() << " % " << (unsigned)msecs() % 10000 << ": EventLoop / after ProcessEvents");
+	}
+
+	if(ctrl)
+		LoopCtrl = ploop;
+	LoopLevel--;
+	LLOG(EndIndent << "Leaving event loop ");
+}
+
+void Ctrl::GuiSleep(int ms)
+{
+	ELOG("GuiSleep");
+	if(EndSession())
+		return;
+	ELOG("GuiSleep 2");
+#if !defined(flagDLL) && !defined(PLATFORM_WINCE)
+	if(!OverwatchThread) {
+		DWORD dummy;
+		OverwatchThread = CreateThread(NULL, 0x100000, Win32OverwatchThread, NULL, 0, &dummy);
+		ELOG("ExitLoopEventWait 1");
+		ExitLoopEvent().Wait();
+	}
+	HANDLE h[1];
+	*h = ExitLoopEvent().GetHandle();
+	ELOG("ExitLoopEventWait 2 " << (void *)*h);
+	MsgWaitForMultipleObjects(1, h, FALSE, ms, QS_ALLINPUT);
+#else
+	MsgWaitForMultipleObjects(0, NULL, FALSE, ms, QS_ALLINPUT);
+#endif
+}
+
+void Ctrl::WndDestroyCaret()
+{
+	LLOG("Ctrl::WndDestroyCaret()");
+	::DestroyCaret();
+}
+
+void Ctrl::WndCreateCaret(const Rect& cr)
+{
+	LLOG("Ctrl::WndCreateCaret(" << cr << ") in " << UPP::Name(this));
+	HWND hwnd = GetHWND();
+	if(!hwnd) return;
+	Rect r;
+	::GetClientRect(hwnd, r);
+	Point p = r.TopLeft();
+	::ClientToScreen(hwnd, p);
+	::CreateCaret(hwnd, NULL, cr.Width(), cr.Height());
+	::SetCaretPos(cr.left - p.x, cr.top - p.y);
+	::ShowCaret(hwnd);
+}
+
+Rect Ctrl::GetWndUpdateRect() const
+{
+	HWND hwnd = GetHWND();
+	if(!hwnd) return Null;
+	Rect r;
+	::GetUpdateRect(hwnd, r, FALSE);
+	return r;
+}
+
+Rect Ctrl::GetWndScreenRect() const
+{
+	HWND hwnd = GetHWND();
+	if(!hwnd) return Null;
+	Rect r;
+	::GetWindowRect(hwnd, r);
+	return r;
+}
+
+void Ctrl::WndShow(bool b)
+{
+	HWND hwnd = GetHWND();
+	if(hwnd)
+		::ShowWindow(hwnd, b ? SW_SHOW : SW_HIDE);
+}
+
+void Ctrl::WndUpdate()
+{
+	HWND hwnd = GetHWND();
+	if(hwnd) ::UpdateWindow(hwnd);
+}
+
+bool Ctrl::IsWndOpen() const {
+	return GetHWND();
+}
+
+void Ctrl::SetAlpha(byte alpha)
+{
+	HWND hwnd = GetHWND();
+	if(!IsAlphaSupported() || parent || !top || !hwnd)
+		return;
+	if(alpha == 255) {
+		SetWindowLong(hwnd, GWL_EXSTYLE, GetWindowLong(hwnd, GWL_EXSTYLE) & ~0x80000);
+		return;
+	}
+	SetWindowLong(hwnd, GWL_EXSTYLE, GetWindowLong(hwnd, GWL_EXSTYLE) | 0x80000);
+    SetLayeredWindowAttributes() (hwnd, 0, alpha, 2);
+}
+
+#define DLLFILENAME "User32.dll"
+#define DLIMODULE   MultiMon
+#define DLIHEADER   <CtrlCore/MultiMon.dli>
+#include <Core/dli.h>
+
+Rect MonitorRectForHWND(HWND hwnd)
+{
+	if(hwnd && MultiMon())
+		if(HMONITOR monitor = MultiMon().MonitorFromWindow(hwnd, 2/*MONITOR_DEFAULTTONEAREST*/)) {
+			MONITORINFO moninfo;
+			Zero(moninfo);
+			moninfo.cbSize = sizeof(moninfo);
+			MultiMon().GetMonitorInfo(monitor, &moninfo);
+			return Rect(moninfo.rcWork);
+		}
+	return Ctrl::GetPrimaryWorkArea();
+}
+
+Rect Ctrl::GetWorkArea() const
+{
+	return MonitorRectForHWND(GetHWND());
+}
+
+static BOOL CALLBACK sMonEnumProc(HMONITOR monitor, HDC hdc, LPRECT lprcMonitor, LPARAM data)
+{
+	MONITORINFO moninfo;
+	Zero(moninfo);
+	moninfo.cbSize = sizeof(moninfo);
+	MultiMon().GetMonitorInfo(monitor, &moninfo);
+	*(Rect *)data |= Rect(moninfo.rcWork);
+	return TRUE;
+}
+
+Rect Ctrl::GetVirtualWorkArea()
+{
+	Rect out = GetPrimaryWorkArea();
+	MultiMon().EnumDisplayMonitors(NULL, NULL, &sMonEnumProc, (LPARAM)&out);
+	return out;
+}
+
+Rect Ctrl::GetVirtualScreenArea()
+{
+	return RectC(GetSystemMetrics(SM_XVIRTUALSCREEN),
+		GetSystemMetrics(SM_YVIRTUALSCREEN),
+		GetSystemMetrics(SM_CXVIRTUALSCREEN),
+		GetSystemMetrics(SM_CYVIRTUALSCREEN));
+}
+
+Rect Ctrl::GetPrimaryWorkArea()
+{
+	Rect r;
+	SystemParametersInfo(SPI_GETWORKAREA, 0, &r, 0);
+	LLOG("Ctrl::GetWorkArea -> " << r);
+	return r;
+}
+
+Rect Ctrl::GetPrimaryScreenArea()
+{
+	return Size(GetSystemMetrics(SM_CXSCREEN), GetSystemMetrics(SM_CYSCREEN));
+}
+
+int Ctrl::GetKbdDelay()
+{
+#ifdef PLATFORM_WINCE
+	return 500;
+#else
+	int a;
+	SystemParametersInfo(SPI_GETKEYBOARDDELAY, 0, &a, 0);
+	return 250 + a * 750 / 4;
+#endif
+}
+
+int Ctrl::GetKbdSpeed()
+{
+#ifdef PLATFORM_WINCE
+	return 1000 / 32;
+#else
+	int a;
+	SystemParametersInfo(SPI_GETKEYBOARDSPEED, 0, &a, 0);
+	return 1000 / (a + 2);
+#endif
+}
+
+void Ctrl::SetWndForeground()
+{
+	LLOG("Ctrl::SetWndForeground() in " << UPP::Name(this));
+	HWND hwnd = GetHWND();
+	if(hwnd)
+		::SetForegroundWindow(hwnd);
+}
+
+bool Ctrl::IsWndForeground() const
+{
+	HWND hwnd = GetHWND();
+	if(!hwnd)
+		return false;
+	HWND fore = ::GetForegroundWindow();
+	LLOG("Ctrl::IsWndForeground(): hwnd = " << (void *)hwnd
+	     << ", fore = " << (void *)fore << " - " << UPP::Name(CtrlFromHWND(fore)));
+	if(IsActiveX()) {
+		while(hwnd && hwnd != fore && !!::GetParent(hwnd))
+			hwnd = ::GetParent(hwnd);
+	}
+	return hwnd == fore;
+}
+
+bool Ctrl::WndEnable(bool b)
+{
+	LLOG("Ctrl::WndEnable(" << b << ") in " << UPP::Name(this) << ", focusCtrlWnd = " << UPP::Name(focusCtrlWnd) << ", raw = " << (void *)::GetFocus());
+	HWND hwnd = GetHWND();
+	if(!b) {
+		ReleaseCapture();
+		LLOG("//Ctrl::WndEnable(" << b << ") -> true " << UPP::Name(this) << ", focusCtrlWnd = " <<UPP::Name(focusCtrlWnd) << ", raw = " << (void *)::GetFocus());
+		return true;
+	}
+	LLOG("//Ctrl::WndEnable(" << b << ") -> false " <<UPP::Name(this) << ", focusCtrlWnd = " <<UPP::Name(focusCtrlWnd) << ", raw = " << (void *)::GetFocus());
+	return false;
+}
+
+bool Ctrl::SetWndFocus()
+{
+	LLOG("Ctrl::SetWndFocus() in " <<UPP::Name(this));
+	HWND hwnd = GetHWND();
+	if(hwnd) {
+		LLOG("Ctrl::SetWndFocus() -> ::SetFocus(" << (void *)hwnd << ")");
+//		::SetActiveWindow(hwnd);
+		::SetFocus(hwnd);
+		return true;
+	}
+	LLOG("//Ctrl::SetWndFocus() in " <<UPP::Name(this) << ", active window = " << (void *)::GetActiveWindow());
+	return false;
+}
+
+bool Ctrl::HasWndFocus() const
+{
+	HWND hwnd = GetHWND();
+	return hwnd && ::GetFocus() == hwnd;
+}
+
+bool Ctrl::SetWndCapture()
+{
+	HWND hwnd = GetHWND();
+	if(hwnd) {
+		::SetCapture(hwnd);
+		return true;
+	}
+	return false;
+}
+
+bool Ctrl::ReleaseWndCapture()
+{
+	HWND hwnd = GetHWND();
+	if(hwnd && HasWndCapture())
+	{
+		::ReleaseCapture();
+		return true;
+	}
+	return false;
+}
+
+bool Ctrl::HasWndCapture() const
+{
+	HWND hwnd = GetHWND();
+	return hwnd && hwnd == ::GetCapture();
+}
+
+void Ctrl::WndInvalidateRect(const Rect& r)
+{
+	HWND hwnd = GetHWND();
+	if(hwnd)
+		::InvalidateRect(hwnd, r, false);
+}
+
+void Ctrl::WndSetPos(const Rect& rect) {
+	HWND hwnd = GetHWND();
+	if(hwnd) {
+		Rect r = rect;
+		AdjustWindowRectEx(r, ::GetWindowLong(hwnd, GWL_STYLE), FALSE,
+		                   ::GetWindowLong(hwnd, GWL_EXSTYLE));
+		SetWindowPos(hwnd, NULL, r.left, r.top, r.Width(), r.Height(),
+		             SWP_NOACTIVATE|SWP_NOZORDER);
+		if(HasFocusDeep()) {
+			caretCtrl = NULL;
+			SyncCaret();
+		}
+	}
+	fullrefresh = false;
+}
+
+void Ctrl::WndUpdate(const Rect& r)
+{
+	Ctrl *top = GetTopCtrl();
+	if(top->IsOpen()) {
+		HWND hwnd = top->GetHWND();
+		HDC hdc = GetDC(hwnd);
+		HRGN hrgn = CreateRectRgn(0, 0, 0, 0);
+		if(GetUpdateRgn(hwnd, hrgn, FALSE) != NULLREGION) {
+			SelectClipRgn(hdc, hrgn);
+			Draw draw(hdc);
+			bool hcr = focusCtrl && focusCtrl->GetTopCtrl() == top &&
+			           caretRect.Intersects(r + top->GetRect().TopLeft());
+			if(hcr) ::HideCaret(hwnd);
+			draw.Clip(r);
+			top->UpdateArea(draw, r);
+			ValidateRect(hwnd, r);
+			SelectClipRgn(hdc, NULL);
+			if(hcr) ::ShowCaret(hwnd);
+		}
+		ReleaseDC(hwnd, hdc);
+		DeleteObject(hrgn);
+	}
+}
+
+void  Ctrl::WndScrollView(const Rect& r, int dx, int dy)
+{
+	if(caretCtrl && caretCtrl->GetTopCtrl() == this) {
+		WndDestroyCaret();
+		caretRect.Clear();
+	}
+#ifdef PLATFORM_WINCE
+	::ScrollWindowEx(GetHWND(), dx, dy, r, r, NULL, NULL, 0);
+#else
+	::ScrollWindow(GetHWND(), dx, dy, r, r);
+#endif
+	SyncCaret();
+}
+
+void Ctrl::PopUpHWND(HWND owner, bool savebits, bool activate, bool dropshadow, bool topmost)
+{
+	popup = false;
+	Create(owner, WS_POPUP, topmost ? WS_EX_TOPMOST : 0, savebits,
+	       owner || !activate ? SW_SHOWNOACTIVATE : SW_SHOW,
+	       dropshadow);
+	HWND hwnd = GetHWND();
+	if(hwnd) popup = true;
+	if(activate) SetFocus();
+}
+
+void Ctrl::PopUp(Ctrl *owner, bool savebits, bool activate, bool dropshadow, bool topmost)
+{
+	popup = false;
+	Ctrl *q = owner ? owner->GetTopCtrl() : GetActiveCtrl();
+	PopUpHWND(q ? q->GetHWND() : NULL, savebits, activate, dropshadow, topmost);
+	if(top) top->owner = owner;
+}
+
+Rect Ctrl::GetScreenClient(HWND hwnd)
+{
+	Rect r;
+	::GetClientRect(hwnd, r);
+	Point tl = r.TopLeft();
+	Point br = r.BottomRight();
+	::ClientToScreen(hwnd, tl);
+	::ClientToScreen(hwnd, br);
+	LLOG("Ctrl::GetScreenClient: hwnd = " << FormatPtr(hwnd) << ", client = " << r
+	     << ", screen(tl) = " << tl << ", screen(br) = " << br);
+	return Rect(tl, br);
+}
+
+Rect Ctrl::GetDefaultWindowRect() {
+#ifdef PLATFORM_WINCE
+	return Rect(0, 0, 100, 100);
+#else
+	HWND hwnd = ::CreateWindow("UPP-CLASS-A", "", WS_OVERLAPPED,
+		                       CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT,
+							   NULL, NULL, NULL, NULL);
+	Rect sr;
+	if(hwnd) {
+		::ShowWindow(hwnd, SW_HIDE);
+		sr = GetScreenClient(hwnd);
+		::DestroyWindow(hwnd);
+	}
+	else
+		sr = RectC(20, 20, 500, 350);
+	return sr;
+#endif
+}
+
+ViewDraw::ViewDraw(Ctrl *ctrl)
+{
+	Ctrl *top = ctrl->GetTopCtrl();
+	hwnd = top->GetHWND();
+	ASSERT(hwnd);
+	Attach(GetDC(hwnd));
+	Clipoff(ctrl->GetScreenView() - top->GetScreenRect().TopLeft());
+}
+
+ViewDraw::~ViewDraw()
+{
+	End();
+	HDC hdc = Detach();
+	if(hwnd && hdc)
+		ReleaseDC(hwnd, hdc);
+}
+
+Vector<String> SplitCmdLine__(const char *cmd)
+{
+	Vector<String> out;
+	while(*cmd)
+		if((byte)*cmd <= ' ')
+			cmd++;
+		else if(*cmd == '\"')
+		{
+			String quoted;
+			while(*++cmd && (*cmd != '\"' || *++cmd == '\"'))
+				quoted.Cat(*cmd);
+			out.Add(quoted);
+		}
+		else
+		{
+			const char *begin = cmd;
+			while((byte)*cmd > ' ')
+				cmd++;
+			out.Add(String(begin, cmd));
+		}
+	return out;
+}
+
+#endif
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/CtrlCore/X11App.cpp b/uppsrc/CtrlCore/X11App.cpp
new file mode 100644
index 000000000..c82877017
--- /dev/null
+++ b/uppsrc/CtrlCore/X11App.cpp
@@ -0,0 +1,459 @@
+#include "CtrlCore.h"
+
+#ifdef PLATFORM_X11
+#include <locale.h>
+#endif
+
+NAMESPACE_UPP
+
+#ifdef PLATFORM_X11
+
+#define LLOG(x)  // LOG(x)
+
+XIM Ctrl::xim;
+
+Atom XAtom(const char *name)
+{
+	Atom x;
+	INTERLOCKED {
+		static VectorMap<String, int> atoms;
+		int q = atoms.Get(name, Null);
+		if(IsNull(q)) {
+			q = XInternAtom(Xdisplay, name, XFalse);
+			atoms.Add(name, q);
+		}
+		x = q;
+	}
+	return x;
+}
+
+String XAtomName(Atom atom)
+{
+	LLOG("GetAtomName");
+	return XGetAtomName(Xdisplay, atom);
+}
+
+String GetProperty(Window w, Atom property, Atom rtype)
+{
+	LLOG("GetProperty");
+	String result;
+	int format;
+	unsigned long nitems, after = 1;
+	long offset = 0;
+	Atom type = None;
+	unsigned char *data;
+	long rsize = minmax((long)(XMaxRequestSize(Xdisplay) - 100), (long)256, (long)65536);
+	while(after > 0) {
+		if(XGetWindowProperty(Xdisplay, w, property, offset, rsize, XFalse,
+	                          rtype, &type, &format, &nitems, &after, &data) != Success)
+	    	break;
+	    if(type == None)
+	        break;
+		if(data) {
+			int len = format == 32 ? sizeof(unsigned long) * nitems : nitems * (format >> 3);
+			result.Cat(data, len);
+			XFree((char *)data);
+			offset += nitems / (32 / format);
+		}
+		else
+			break;
+	}
+	result.Shrink();
+	XFlush(Xdisplay);
+	return result;
+}
+
+bool WaitForEvent(Window w, int type, XEvent& event){
+	for(int i = 0; i < 80; i++) {
+		if(XCheckTypedWindowEvent(Xdisplay, w, type, &event))
+			return true;
+		XFlush(Xdisplay);
+		Sleep(50);
+	}
+	LOG("WaitForEvent failed");
+	return false;
+}
+
+
+String ReadPropertyData(Window w, Atom property, Atom rtype)
+{
+	static Atom XA_INCR = XAtom("INCR");
+	Atom type;
+	int format;
+	unsigned long nitems, after;
+	unsigned char *ptr;
+	String r;
+	if(XGetWindowProperty(Xdisplay, w, property, 0, 0, XFalse, AnyPropertyType,
+	                      &type, &format, &nitems, &after, &ptr) == Success && type != None) {
+		XFree(ptr);
+		if(type == XA_INCR) {
+			XDeleteProperty(Xdisplay, w, property);
+			XEvent event;
+			for(;;) {
+				XFlush(Xdisplay);
+				if(!WaitForEvent(w, PropertyNotify, event))
+					break;
+				if(event.xproperty.atom == property && event.xproperty.state == PropertyNewValue) {
+					String x = GetProperty(w, property);
+					if(!x.GetLength())
+						break;
+					r.Cat(x);
+					XDeleteProperty(Xdisplay, w, property);
+				}
+			}
+		}
+		else {
+			r = GetProperty(w, property);
+			XDeleteProperty(Xdisplay, w, property);
+		}
+	}
+	return r;
+}
+
+Vector<int> GetPropertyInts(Window w, Atom property, Atom rtype)
+{
+	Vector<int> result;
+	String p = GetProperty(w, property, rtype);
+	const long int *ptr = (const long int *)~p;
+	const long int *lim = ptr + p.GetLength() / 4;
+	result.Reserve(p.GetLength() / 4);
+	while(ptr < lim)
+		result.Add(*ptr++);
+	return result;
+}
+
+Index<Atom>& _NET_Supported()
+{
+	static Index<Atom> q;
+	return q;
+}
+
+bool X11ErrorTrap;
+
+bool Ctrl::TrapX11Errors()
+{
+	bool b = X11ErrorTrap;
+	X11ErrorTrap = true;
+	return b;
+}
+
+void Ctrl::UntrapX11Errors(bool b)
+{
+	X11ErrorTrap = b;
+}
+
+static void sPanicMessageBox(const char *title, const char *text)
+{
+	Ctrl::ReleaseCtrlCapture();
+	XDisplay *display = XOpenDisplay(NULL);
+	if(!display)
+		return;
+	int screen = DefaultScreen(display);
+	int x = (DisplayWidth(display, screen) - 600) / 2;
+	int y = (DisplayHeight(display, screen) - 120) / 2;
+	Window win = XCreateSimpleWindow(display, RootWindow(display, screen),
+	                                 x, y, 600, 120, 4,
+	                                 BlackPixel(display, screen),
+	                                 WhitePixel(display, screen));
+	XSizeHints size_hints;
+	size_hints.flags = PPosition|PSize|PMinSize;
+	size_hints.x = x;
+	size_hints.y = x;
+	size_hints.width = 600;
+	size_hints.height = 120;
+	size_hints.min_width = 600;
+	size_hints.min_height = 120;
+	char *h[1]; h[0] = "";
+	XSetStandardProperties(display, win, title, title, None, h, 0, &size_hints);
+	XSelectInput(display, win, ExposureMask|KeyPressMask|ButtonPressMask|StructureNotifyMask);
+	XGCValues values;
+	GC gc = XCreateGC(display, win, 0, &values);
+	XMapWindow(display, win);
+	XFontStruct *font_info = XQueryFont(display, XGContextFromGC(gc));
+	for(;;) {
+		XEvent e;
+		XNextEvent(display, &e);
+		switch(e.type) {
+		case ButtonPress:
+			XFreeFont(display, font_info);
+			XFreeGC(display, gc);
+			XCloseDisplay(display);
+			return;
+		case Expose:
+			int y = 20;
+			const char *b = text;
+			for(;;) {
+				const char *e = strchr(b, '\n');
+				if(!e) break;
+				XDrawString(display, win, gc, 20, y, b, e - b);
+				y += font_info->max_bounds.ascent + font_info->max_bounds.descent;
+				b = e + 1;
+			}
+			XDrawString(display, win, gc, 20, y, b, strlen(b));
+			break;
+		}
+	}
+}
+
+#ifdef _DEBUG
+#define INI_PREFIX "DEBUG_"
+#else
+#define INI_PREFIX
+#endif
+
+int X11ErrorHandler(XDisplay *, XErrorEvent *error)
+{
+	if(GetIniKey(INI_PREFIX "X11_ERRORS") != "1")
+		return 0;
+
+	if(X11ErrorTrap || IsPanicMode()) return 0;
+
+	static const char *request[] = {
+		"",
+		"X_CreateWindow",
+		"X_ChangeWindowAttributes",
+		"X_GetWindowAttributes",
+		"X_DestroyWindow",
+		"X_DestroySubwindows",
+		"X_ChangeSaveSet",
+		"X_ReparentWindow",
+		"X_MapWindow",
+		"X_MapSubwindows",
+		"X_UnmapWindow",
+		"X_UnmapSubwindows",
+		"X_ConfigureWindow",
+		"X_CirculateWindow",
+		"X_GetGeometry",
+		"X_QueryTree",
+		"X_InternAtom",
+		"X_GetAtomName",
+		"X_ChangeProperty",
+		"X_DeleteProperty",
+		"X_GetProperty",
+		"X_ListProperties",
+		"X_SetSelectionOwner",
+		"X_GetSelectionOwner",
+		"X_ConvertSelection",
+		"X_SendEvent",
+		"X_GrabPointer",
+		"X_UngrabPointer",
+		"X_GrabButton",
+		"X_UngrabButton",
+		"X_ChangeActivePointerGrab",
+		"X_GrabKeyboard",
+		"X_UngrabKeyboard",
+		"X_GrabKey",
+		"X_UngrabKey",
+		"X_AllowEvents",
+		"X_GrabServer",
+		"X_UngrabServer",
+		"X_QueryPointer",
+		"X_GetMotionEvents",
+		"X_TranslateCoords",
+		"X_WarpPointer",
+		"X_SetInputFocus",
+		"X_GetInputFocus",
+		"X_QueryKeymap",
+		"X_OpenFont",
+		"X_CloseFont",
+		"X_QueryFont",
+		"X_QueryTextExtents",
+		"X_ListFonts",
+		"X_ListFontsWithInfo",
+		"X_SetFontPath",
+		"X_GetFontPath",
+		"X_CreatePixmap",
+		"X_FreePixmap",
+		"X_CreateGC",
+		"X_ChangeGC",
+		"X_CopyGC",
+		"X_SetDashes",
+		"X_SetClipRectangles",
+		"X_FreeGC",
+		"X_ClearArea",
+		"X_CopyArea",
+		"X_CopyPlane",
+		"X_PolyPoint",
+		"X_PolyLine",
+		"X_PolySegment",
+		"X_PolyRectangle",
+		"X_PolyArc",
+		"X_FillPoly",
+		"X_PolyFillRectangle",
+		"X_PolyFillArc",
+		"X_PutImage",
+		"X_GetImage",
+		"X_PolyText8",
+		"X_PolyText16",
+		"X_ImageText8",
+		"X_ImageText16",
+		"X_CreateColormap",
+		"X_FreeColormap",
+		"X_CopyColormapAndFree",
+		"X_InstallColormap",
+		"X_UninstallColormap",
+		"X_ListInstalledColormaps",
+		"X_AllocColor",
+		"X_AllocNamedColor",
+		"X_AllocColorCells",
+		"X_AllocColorPlanes",
+		"X_FreeColors",
+		"X_StoreColors",
+		"X_StoreNamedColor",
+		"X_QueryColors",
+		"X_LookupColor",
+		"X_CreateCursor",
+		"X_CreateGlyphCursor",
+		"X_FreeCursor",
+		"X_RecolorCursor",
+		"X_QueryBestSize",
+		"X_QueryExtension",
+		"X_ListExtensions",
+		"X_ChangeKeyboardMapping",
+		"X_GetKeyboardMapping",
+		"X_ChangeKeyboardControl",
+		"X_GetKeyboardControl",
+		"X_Bell",
+		"X_ChangePointerControl",
+		"X_GetPointerControl",
+		"X_SetScreenSaver",
+		"X_GetScreenSaver",
+		"X_ChangeHosts",
+		"X_ListHosts",
+		"X_SetAccessControl",
+		"X_SetCloseDownMode",
+		"X_KillClient",
+		"X_RotateProperties",
+		"X_ForceScreenSaver",
+		"X_SetPointerMapping",
+		"X_GetPointerMapping",
+		"X_SetModifierMapping",
+		"X_GetModifierMapping",
+		"X_NoOperation",
+	};
+
+	char h[512];
+	XGetErrorText(Xdisplay, error->error_code, h, 512);
+	String e;
+	e << "X Error: " << h;
+	if(error->request_code < __countof(request))
+		e << "\nrequest: " << request[error->request_code];
+	e << "\nresource id: " << (int)error->resourceid << " = " << Format("%0X", (int)error->resourceid);
+
+	RLOG(e);
+	puts(e);
+	BugLog() << e << "\r\n";
+	UsrLogT(e);
+
+	Panic(e);
+
+	return 0;
+}
+
+void SetX11ErrorHandler()
+{
+	XSetErrorHandler(X11ErrorHandler);
+}
+
+void Ctrl::InitX11(const char *display)
+{
+	InstallPanicMessageBox(sPanicMessageBox);
+
+	InitX11Draw(display);
+	InitTimer();
+	byte dummy[5];
+	Xbuttons = XGetPointerMapping(Xdisplay, dummy, 5);
+
+	Xeventtime = CurrentTime;
+	SetX11ErrorHandler();
+	if(GetIniKey(INI_PREFIX "X11_SYNCHRONIZE") == "1")
+		XSynchronize(Xdisplay, 1);
+	Vector<int> nets = GetPropertyInts(Xroot, XAtom("_NET_SUPPORTED"));
+	for(int i = 0; i < nets.GetCount(); i++)
+		_NET_Supported().Add(nets[i]);
+
+	ChSync();
+
+	GUI_GlobalStyle_Write(GUISTYLE_XP);
+	GUI_DragFullWindow_Write(1);
+	GUI_PopUpEffect_Write(GUIEFFECT_SLIDE);
+	GUI_DropShadows_Write(1);
+	GUI_AltAccessKeys_Write(1);
+	GUI_AKD_Conservative_Write(0);
+
+	setlocale(LC_ALL, "en_US.utf8");
+	if(XSupportsLocale()) {
+		XSetLocaleModifiers("");
+		xim = XOpenIM(Xdisplay, NULL, NULL, NULL);
+	}
+	else {
+		xim = NULL;
+		LOG("IM unsupported!");
+	}
+}
+
+void Ctrl::ExitX11()
+{
+//	if(xic)
+//		XDestroyIC(xic);
+	if(xim)
+		XCloseIM(xim);
+}
+
+Rect Ctrl::GetDefaultWindowRect()
+{
+	static int pos = 0;
+	pos += 10;
+	int cx = Xwidth * 2 / 3;
+	int cy = Xheight * 2 / 3;
+	if(pos + cx + 50 > Xwidth || pos + cy + 50 > Xheight)
+		pos = 0;
+	return RectC(pos + 20, pos + 20, cx, cy);
+}
+
+Rect Ctrl::GetWorkArea() const
+{
+	return GetPrimaryWorkArea();
+}
+
+Rect Ctrl::GetVirtualWorkArea()
+{
+	return GetPrimaryWorkArea();
+}
+
+Rect Ctrl::GetVirtualScreenArea()
+{
+	return GetPrimaryScreenArea();
+}
+
+Rect Ctrl::GetPrimaryWorkArea()
+{
+	static Rect r;
+	if(r.right == 0) {
+		Vector<int> x = GetPropertyInts(Xroot, XAtom("_NET_WORKAREA"));
+		if(x.GetCount())
+			r = RectC(x[0], x[1], x[2], x[3]);
+		else
+			r = RectC(0, 0, Xwidth, Xheight);
+	}
+	return r;
+}
+
+Rect Ctrl::GetPrimaryScreenArea()
+{
+	return RectC(0, 0, Xwidth, Xheight);
+}
+
+int Ctrl::GetKbdDelay()
+{
+	return 250;
+}
+
+int Ctrl::GetKbdSpeed()
+{
+	return 25;
+}
+
+#endif
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/CtrlCore/X11Clip.cpp b/uppsrc/CtrlCore/X11Clip.cpp
new file mode 100644
index 000000000..55ee0c77e
--- /dev/null
+++ b/uppsrc/CtrlCore/X11Clip.cpp
@@ -0,0 +1,337 @@
+#include "CtrlCore.h"
+
+NAMESPACE_UPP
+
+#define LLOG(x)  // LOG(x)
+
+#ifdef PLATFORM_X11
+
+Index<String> Ctrl::sel_formats;
+Ptr<Ctrl>     Ctrl::sel_ctrl;
+
+void Ctrl::SetSelectionSource(const char *fmts)
+{
+	LLOG("SetSelectionSource " << UPP::Name(this) << ": " << fmts);
+	sel_formats = Split(fmts, ';');
+	sel_ctrl = this;
+	XSetSelectionOwner(Xdisplay, XAtom("PRIMARY"), xclipboard().win, CurrentTime);
+}
+
+Ctrl::Xclipboard::Xclipboard()
+{
+	XSetWindowAttributes swa;
+	win = XCreateWindow(Xdisplay, RootWindow(Xdisplay, Xscreenno),
+	                    0, 0, 10, 10, 0, CopyFromParent, InputOnly, CopyFromParent,
+	                    0, &swa);
+	XSelectInput(Xdisplay, win, PropertyChangeMask);
+}
+
+Ctrl::Xclipboard::~Xclipboard()
+{
+	XDestroyWindow(Xdisplay, win);
+}
+
+void Ctrl::Xclipboard::Write(int fmt, const ClipData& _data)
+{
+	LLOG("SetSelectionOwner " << XAtomName(fmt));
+	data.GetAdd(fmt) = _data;
+	XSetSelectionOwner(Xdisplay, XAtom("CLIPBOARD"), win, CurrentTime);
+}
+
+void Ctrl::Xclipboard::Request(XSelectionRequestEvent *se)
+{
+	LLOG("Request " << XAtomName(se->target));
+	XEvent e;
+	e.xselection.type      = SelectionNotify;
+	e.xselection.display   = Xdisplay;
+	e.xselection.requestor = se->requestor;
+	e.xselection.selection = se->selection;
+	e.xselection.target    = se->target;
+	e.xselection.time      = se->time;
+	e.xselection.property  = se->property;
+	if(se->target == XAtom("TARGETS")) {
+		LLOG("Request targets:");
+		if(se->selection == XAtom("PRIMARY")) {
+			Buffer<Atom> x(sel_formats.GetCount());
+			for(int i = 0; i < sel_formats.GetCount(); i++) {
+				x[i] = XAtom(sel_formats[i]);
+				LLOG('\t' << sel_formats[i]);
+			}
+			XChangeProperty(Xdisplay, se->requestor, se->property, XAtom("ATOM"),
+			                32, 0, (unsigned char*)~x,
+			                sel_formats.GetCount());
+		}
+		else {
+			Buffer<Atom> x(data.GetCount());
+			for(int i = 0; i < data.GetCount(); i++) {
+				x[i] = data.GetKey(i);
+				LLOG('\t' << XAtomName(x[i]));
+			}
+			XChangeProperty(Xdisplay, se->requestor, se->property, XAtom("ATOM"),
+			                32, 0, (unsigned char*)~x,
+			                data.GetCount());
+		}
+	}
+	else {
+		if(se->selection == XAtom("PRIMARY")) {
+			LLOG("Request PRIMARY data " << XAtomName(se->target));
+			String fmt = XAtomName(se->target);
+			int i = sel_formats.Find(fmt);
+			if(i >= 0) {
+				String d = sel_ctrl->GetSelectionData(fmt);
+				XChangeProperty(Xdisplay, se->requestor, se->property, se->target, 8, PropModeReplace,
+				                d, d.GetLength());
+			}
+			else
+			    e.xselection.property = None;
+		}
+		else {
+			LLOG("Request CLIPBOARD data " << XAtomName(se->target));
+			int i = data.Find(se->target);
+			if(i >= 0) {
+				String d = data[i].Render();
+				XChangeProperty(Xdisplay, se->requestor, se->property, se->target, 8, PropModeReplace,
+				                d, d.GetLength());
+			}
+			else
+			    e.xselection.property = None;
+		}
+	}
+	XSendEvent(Xdisplay, se->requestor, XFalse, 0, &e);
+}
+
+String Ctrl::Xclipboard::Read(int fmt, int selection, int property)
+{
+	if(data.GetCount() && (dword)selection == XAtom("CLIPBOARD")) {
+		int q = data.Find(fmt);
+		return q >= 0 ? data[q].Render() : String();
+	}
+	if(sel_ctrl && (dword)selection == XAtom("PRIMARY"))
+		return sel_ctrl->GetSelectionData(XAtomName(fmt));
+	XConvertSelection(Xdisplay, selection, fmt, property, win, CurrentTime);
+	XFlush(Xdisplay);
+	XEvent event;
+	for(int i = 0; i < 20; i++) {
+		if(XCheckTypedWindowEvent(Xdisplay, win, SelectionNotify, &event)) {
+			if(event.xselection.property != None) {
+				XSync(Xdisplay, false);
+				return ReadPropertyData(win, event.xselection.property);
+			}
+			return Null;
+		}
+		if(XCheckTypedWindowEvent(Xdisplay, win, SelectionRequest, &event) &&
+		   event.xselectionrequest.owner == win)
+			Request(&event.xselectionrequest);
+		if(XCheckTypedWindowEvent(Xdisplay, win, SelectionClear, &event) &&
+		   event.xselectionclear.window == win) {
+			if(event.xselectionclear.selection == XAtom("CLIPBOARD"))
+				Clear();
+			if(event.xselectionclear.selection == XAtom("PRIMARY")) {
+				sel_ctrl = NULL;
+				sel_formats.Clear();
+			}
+		}
+		Sleep(10);
+	}
+	return Null;
+}
+
+Ctrl::Xclipboard& Ctrl::xclipboard()
+{
+	static Xclipboard xc;
+	return xc;
+}
+
+void ClearClipboard()
+{
+	Ctrl::xclipboard().Clear();
+}
+
+void AppendClipboard(const char *format, const Value& data, String (*render)(const Value& data))
+{
+	Vector<String> s = Split(format, ';');
+	for(int i = 0; i < s.GetCount(); i++)
+		Ctrl::xclipboard().Write(XAtom(s[i]), ClipData(data, render));
+}
+
+String sRawClipData(const Value& data);
+
+void AppendClipboard(const char *fmt, const String& data)
+{
+	AppendClipboard(fmt, data, sRawClipData);
+}
+
+String ReadClipboard(const char *fmt)
+{
+	return Ctrl::xclipboard().Read(XAtom(fmt), XAtom("CLIPBOARD"), XAtom("CLIPDATA"));
+}
+
+void AppendClipboardText(const String& s)
+{
+	AppendClipboard("STRING", s);
+}
+
+String ReadClipboardText()
+{
+	return ReadClipboard("STRING");
+}
+
+void AppendClipboardUnicodeText(const WString& s)
+{
+	AppendClipboard("UTF8_STRING", ToUtf8(s));
+}
+
+WString ReadClipboardUnicodeText()
+{
+	return FromUtf8(ReadClipboard("UTF8_STRING"));
+}
+
+bool Ctrl::Xclipboard::IsAvailable(int fmt, const char *type)
+{
+	if(data.GetCount())
+		return data.Find(fmt) >= 0;
+	String formats = Read(XAtom("TARGETS"), XAtom(type), XAtom("CLIPDATA"));
+	int c = formats.GetCount() / sizeof(Atom);
+	const Atom *m = (Atom *) ~formats;
+	for(int i = 0; i < c; i++) {
+		if(m[i] == (dword)fmt)
+			return true;
+	}
+	return false;
+}
+
+bool Ctrl::ClipHas(int type, const char *fmt)
+{
+	LLOG("ClipHas " << type << ": " << fmt);
+	if(type == 0)
+		return Ctrl::xclipboard().IsAvailable(XAtom(fmt), "CLIPBOARD");
+	if(type == 2) {
+		if(sel_ctrl)
+			return sel_formats.Find(fmt) >= 0;
+		return Ctrl::xclipboard().IsAvailable(XAtom(fmt), "PRIMARY");
+	}
+	return drop_formats.Find(fmt) >= 0;
+}
+
+String DnDGetData(const String& f);
+
+String Ctrl::ClipGet(int type, const char *fmt)
+{
+	LLOG("ClipGet " << type << ": " << fmt);
+	if(type && GetDragAndDropSource())
+		return DnDGetData(fmt);
+	return Ctrl::xclipboard().Read(
+	           XAtom(fmt),
+	           XAtom(type == 2 ? "PRIMARY" : type == 1 ? "XdndSelection" : "CLIPBOARD"),
+	           type == 1 ? XA_SECONDARY : XAtom("CLIPDATA")
+	       );
+}
+
+const char *ClipFmtsText()
+{
+	return "STRING;UTF8_STRING;text/plain;text/unicode";
+}
+
+String GetString(PasteClip& clip)
+{
+	if(clip.Accept("STRING") || clip.Accept("text/plain"))
+		return ~clip;
+	if(clip.Accept("UTF8_STRING"))
+		return FromUtf8(~clip).ToString();
+	if(clip.Accept("text/unicode"))
+		return Unicode__(~clip).ToString();
+	return Null;
+}
+
+WString GetWString(PasteClip& clip)
+{
+	if(clip.Accept("STRING") || clip.Accept("text/plain"))
+		return (~clip).ToWString();
+	if(clip.Accept("UTF8_STRING"))
+		return FromUtf8(~clip);
+	if(clip.Accept("text/unicode"))
+		return Unicode__(~clip);
+	return Null;
+}
+
+String GetTextClip(const WString& text, const String& fmt)
+{
+	if(fmt == "STRING" || fmt == "text/plain")
+		return text.ToString();
+	if(fmt == "UTF8_STRING")
+		return ToUtf8(text);
+	if(fmt == "text/unicode")
+		return Unicode__(text);
+	return Null;
+}
+
+String GetTextClip(const String& text, const String& fmt)
+{
+	if(fmt == "STRING" || fmt == "text/plain")
+		return text;
+	if(fmt == "UTF8_STRING")
+		return ToUtf8(text.ToWString());
+	if(fmt == "text/unicode")
+		return Unicode__(text.ToWString());
+	return Null;
+}
+
+bool AcceptText(PasteClip& clip)
+{
+	return clip.Accept(ClipFmtsText());
+}
+
+void Append(VectorMap<String, ClipData>& data, const String& text) // optimize
+{
+	data.GetAdd("STRING", text);
+	data.GetAdd("text/plain", text);
+	data.GetAdd("UTF8_STRING", ToUtf8(text.ToWString()));
+	data.GetAdd("text/unicode", Unicode__(text.ToWString()));
+}
+
+void Append(VectorMap<String, ClipData>& data, const WString& text) // optimize
+{
+	data.GetAdd("STRING", text.ToString());
+	data.GetAdd("text/plain", text.ToString());
+	data.GetAdd("UTF8_STRING", ToUtf8(text));
+	data.GetAdd("text/unicode", Unicode__(text));
+}
+
+bool IsClipboardAvailable(const char *fmt)
+{
+	return Ctrl::xclipboard().IsAvailable(XAtom(fmt), "CLIPBOARD");
+}
+
+bool IsClipboardAvailableText()
+{
+	return IsClipboardAvailable("STRING") ||
+	       IsClipboardAvailable("UTF8_STRING") ||
+	       IsClipboardAvailable("text/plain") ||
+	       IsClipboardAvailable("text/unicode");
+}
+
+bool AcceptFiles(PasteClip& clip)
+{
+	return clip.Accept("text/uri-list");
+}
+
+int JustLf(int c)
+{
+	return (byte)c >= 32 || c == '\n' ? c : 0;
+}
+
+Vector<String> GetFiles(PasteClip& clip) {
+	Vector<String> r;
+	if(clip.Accept("text/uri-list")) {
+		String txt = clip;
+		Vector<String> f = Split(Filter(txt, JustLf), '\n');
+		for(int i = 0; i < f.GetCount(); i++)
+			if(f[i].StartsWith("file://"))
+				r.Add(f[i].Mid(7));
+	}
+	return r;
+}
+
+#endif
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/CtrlCore/X11DHCtrl.cpp b/uppsrc/CtrlCore/X11DHCtrl.cpp
new file mode 100644
index 000000000..5c45b01b2
--- /dev/null
+++ b/uppsrc/CtrlCore/X11DHCtrl.cpp
@@ -0,0 +1,408 @@
+#include "CtrlCore.h"
+
+NAMESPACE_UPP
+
+#ifdef PLATFORM_X11
+
+/////////////////////////////////////////////////////////////////////////////////////////
+// Constructor
+DHCtrl::DHCtrl()
+{
+	// Sets control NOT initialized
+	isInitialized = false;
+
+	// Sets control NOT mapped
+	isMapped = false;
+
+	// Resets error contition
+	isError = false;
+
+	// Sets the user visual to null
+	UserVisualInfo = 0;
+
+	// No background painting
+	backpaint = NOBACKPAINT;
+//	transparent = true;
+
+} // END Constructor class DHCtrl
+
+/////////////////////////////////////////////////////////////////////////////////////////
+// Destructor
+DHCtrl::~DHCtrl()
+{
+	// Destroys the associated window and clean up stuffs
+	Terminate();
+
+} // END Destructor class DHCtrl
+
+/////////////////////////////////////////////////////////////////////////////////////////
+// Maps/unmaps the window
+void DHCtrl::MapWindow(bool map)
+{
+	// no action if not initialized
+	if(!isInitialized)
+		return;
+
+	if(map && !isMapped)
+		XMapWindow(Xdisplay, top->window);
+	else if(!map && isMapped)
+		XUnmapWindow(Xdisplay, top->window);
+
+	isMapped = map;
+
+} // END DHCtrl::MapWndow()
+
+
+/////////////////////////////////////////////////////////////////////////////////////////
+// Initializes the view
+bool DHCtrl::Init()
+{
+	static bool isInitializing = false;
+
+	// Just for security sakes...
+	if(isInitialized)
+		return true;
+
+	// Prevents reentrant call....
+	if(isInitializing)
+		return false;
+	isInitializing = true;
+
+	// Call BeforeInit user func...
+	BeforeInit();
+
+	// if display is null, error
+	if(!Xdisplay)
+	{
+		// Call AfterInit user func...
+		AfterInit(true);
+
+		// Sets the appropriate error message
+		SetErrorMessage("DHCtrl : Bad display");
+
+		isError = true;
+		isInitializing = false;
+		return false;
+	}
+
+	// Calls the user visual function
+	UserVisualInfo = CreateVisual();
+
+	// If error, returns
+	if(isError)
+	{
+		isInitializing = false;
+		return false;
+	}
+
+	// Gets the default visual, if none is given
+	Visual *visual;
+	int Depth;
+	if(UserVisualInfo)
+	{
+		visual = UserVisualInfo->visual;
+		Depth = UserVisualInfo->depth;
+	}
+	else
+	{
+		visual = DefaultVisual(Xdisplay, DefaultScreen(Xdisplay));
+		Depth = DefaultDepth(Xdisplay, DefaultScreen(Xdisplay));
+	}
+
+	// Initializes attribute setting flags
+	unsigned long ValueMask =
+		CWBorderPixel
+		| CWColormap
+		| CWSaveUnder
+//		| CWBackPixel
+//		| CWBorderPixel
+		| CWColormap
+//		| CWEventMask
+//		| CWWinGravity
+//		| CWBitGravity
+	; // END ValueMask
+
+	// Initializes attribute structure
+	XSetWindowAttributes winAttributes;
+	// creates a ColorMap, in case we're not using default visual
+	winAttributes.colormap = XCreateColormap(Xdisplay, GetTopWindow()->GetWindow(), visual, AllocNone);
+	winAttributes.border_pixel = 0;
+	winAttributes.save_under = XFalse;
+//	winAttributes.win_gravity = StaticGravity;
+//	winAttributes.bit_gravity = ForgetGravity;
+
+	// Calls the attributes user setting routine
+	SetAttributes(ValueMask, winAttributes);
+
+	// Creates the X11 window
+	Rect r = GetRectInParentWindow();
+	Window WindowHandle = XCreateWindow
+	(
+		Xdisplay,									// display
+//		GetTopWindow()->GetWindow(), 				// parent
+		GetParentWindow(),
+
+		r.left, r.top, r.Width(), r.Height(),		// x, y, width, height
+		0,											// border width
+		Depth,										// depth
+		InputOutput,								// class
+		visual,										// visual
+		ValueMask,									// value mask
+		&winAttributes								// attributes
+	);
+
+	// Frees VisualInfo
+    if (UserVisualInfo)
+    {
+        XFree( (char *)UserVisualInfo);
+        UserVisualInfo = 0;
+    }
+
+    // If problem creating window, error
+    if(!WindowHandle)
+    {
+		// Call AfterInit user func...
+		AfterInit(true);
+
+		// Sets the appropriate error message
+		SetErrorMessage("DHCtrl : Can't create window");
+
+        isError = true;
+		isInitializing = false;
+        return false;
+    }
+
+	// Adds window to UPP managed windows
+	XWindow *cw = AddXWindow(WindowHandle);
+
+	cw->xic = xim ? XCreateIC
+					(
+						xim,
+						XNInputStyle,
+						XIMPreeditNothing | XIMStatusNothing,
+						XNClientWindow,
+						WindowHandle,
+						XNFocusWindow,
+						WindowHandle,
+	    				NULL
+	    			)
+	    : NULL;
+
+	top = new Top;
+	top->window = WindowHandle;
+
+	long im_event_mask = 0;
+	if(cw->xic)
+		XGetICValues(cw->xic, XNFilterEvents, &im_event_mask, NULL);
+	XSelectInput
+	(
+		Xdisplay,
+		WindowHandle,
+		ExposureMask
+//		| StructureNotifyMask		// *very* important, flag MUST NOT be set
+		| KeyPressMask
+		| FocusChangeMask
+		| KeyPressMask
+		| KeyReleaseMask
+		| PointerMotionMask
+		| ButtonPressMask
+		| ButtonReleaseMask
+		| PropertyChangeMask
+		| VisibilityChangeMask
+		| im_event_mask
+	);
+
+	int version = 5;
+	XChangeProperty
+	(
+		Xdisplay,
+		WindowHandle,
+		XAtom("XdndAware"),
+		XA_ATOM,
+		32,
+		0,
+		(byte *)&version,
+		1
+	);
+
+	// Maps the window if needed
+	if(IsShown())
+		MapWindow(true);
+
+	// Flushes the display
+    XFlush(Xdisplay);
+
+    // Stores the initial control size
+    CurrentSize = GetSize();
+
+	// Exits from initializing lock
+	isInitializing = false;
+
+	// mark control as initialized
+	isInitialized = true;
+
+	// Resets the message
+	isError = false;
+	SetErrorMessage("");
+
+	// Call AfterInit user func...
+	AfterInit(false);
+
+	return true;
+
+} // END DHCtrl::Init()
+
+
+/////////////////////////////////////////////////////////////////////////////////////////
+// Terminates the view
+void DHCtrl::Terminate(void)
+{
+	if(!isInitialized)
+		return;
+
+	// Unmaps the window
+	MapWindow(false);
+
+	// gathers data from XWindow (needs Input Context...)
+	XWindow *cw = XWindowFromWindow(top->window);
+
+	// Frees input context as needed
+	if(cw->xic)
+	{
+		XDestroyIC(cw->xic);
+		cw->xic = NULL;
+	}
+
+	// Removes XWindow from Upp list
+	RemoveXWindow(top->window);
+
+	// Destroys the window
+	// Not to do, it's done destroying the parent window by X11 system
+//	XDestroyWindow(Xdisplay, top->window);
+
+	// Destroys created Top struct
+	delete top;
+	top = NULL;
+
+	// Resets initialization and error flags
+	isInitialized = false;
+	isError = false;
+
+} // END DHCtrl::Terminate()
+
+/////////////////////////////////////////////////////////////////////////////////////////
+// State handler
+void DHCtrl::State(int reason)
+{
+	Window dummy;
+	int x, y;
+	unsigned int width, height, border, depth;
+	Rect r;
+
+	// No handling if in error state
+	if( isError)
+		return;
+
+	// Initializes the control if needed (and possible...)
+	if(!isInitialized && GetTopWindow() && GetTopWindow()->GetWindow())
+		Init();
+
+	if(isInitialized)
+	{
+		switch( reason )
+		{
+			case FOCUS      : // = 10,
+				break;
+
+			case ACTIVATE   : // = 11,
+				break;
+
+			case DEACTIVATE : // = 12,
+				break;
+
+			case SHOW       : // = 13,
+				MapWindow(IsShown());
+				break;
+
+			case ENABLE     : // = 14,
+				break;
+
+			case EDITABLE   : // = 15,
+				break;
+
+			case OPEN       : // = 16,
+				break;
+
+			case CLOSE      : // = 17,
+				Terminate();
+				break;
+
+			case POSITION   : // = 100,
+			case LAYOUTPOS  : // = 101,
+				SyncNativeWindows();
+				break;
+
+			default:
+				break;
+
+		} // switch(reason)
+	}
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+// Property Visual
+Visual *DHCtrl::GetVisual(void)
+{
+	if(UserVisualInfo)
+		return UserVisualInfo->visual;
+	else
+		return DefaultVisual(Xdisplay, DefaultScreen(Xdisplay));
+
+} // END DHCtrl::getVisual()
+
+
+/////////////////////////////////////////////////////////////////////////////////////////
+// Property VisualInfo
+XVisualInfo DHCtrl::GetVisualInfo(void)
+{
+	// if present an user visual info, just return it
+	if(UserVisualInfo)
+		return *UserVisualInfo;
+
+	XVisualInfo visualInfo;
+
+	// get the active visual
+	Visual *visual = GetVisual();
+
+	// gets a list of all available XVsualinfo
+	XVisualInfo *v = 0;
+	XVisualInfo vtemplate;
+	int nVis;
+	XVisualInfo *vlist = XGetVisualInfo(Xdisplay, VisualNoMask, &vtemplate, &nVis);
+
+	// search for current visual inside the list
+	if(vlist)
+	{
+		for (v = vlist; v < vlist + nVis; v++)
+		{
+			if (v->visual == visual)
+			{
+				visualInfo = *v;
+				break;
+			}
+		}
+	    XFree(vlist);
+	}
+	else
+	{
+		isError = true;
+		ErrorMessage = "DHCtrl: no XVisualInfo for current Visual";
+	}
+
+	// returns the found XVisualInfo struct
+	return visualInfo;
+}
+
+#endif
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/CtrlCore/X11DnD.cpp b/uppsrc/CtrlCore/X11DnD.cpp
new file mode 100644
index 000000000..6bc883dd4
--- /dev/null
+++ b/uppsrc/CtrlCore/X11DnD.cpp
@@ -0,0 +1,409 @@
+#include "CtrlCore.h"
+
+#define LLOG(x)   // LOG(x)
+
+#ifdef PLATFORM_X11
+
+NAMESPACE_UPP
+
+bool Xdnd_waiting_status;
+bool Xdnd_waiting_finished;
+int  Xdnd_status;
+int  Xdnd_version;
+
+static Atom XdndEnter;
+static Atom XdndPosition;
+static Atom XdndLeave;
+static Atom XdndDrop;
+static Atom XdndStatus;
+static Atom XdndFinished;
+static Atom XdndActionCopy;
+static Atom XdndActionMove;
+
+void InitDndAtoms()
+{
+	if(XdndEnter) return;
+	XdndEnter = XAtom("XdndEnter");
+	XdndPosition = XAtom("XdndPosition");
+	XdndLeave = XAtom("XdndLeave");
+	XdndDrop = XAtom("XdndDrop");
+	XdndStatus = XAtom("XdndStatus");
+	XdndFinished = XAtom("XdndFinished");
+	XdndActionCopy = XAtom("XdndActionCopy");
+	XdndActionMove = XAtom("XdndActionMove");
+}
+
+XEvent ClientMsg(Window src, Atom type, int format = 32)
+{
+	XEvent e;
+	Zero(e);
+	e.xclient.type = ClientMessage;
+	e.xclient.display = Xdisplay;
+	e.xclient.window = src;
+	e.xclient.message_type = type;
+	e.xclient.format = format;
+	return e;
+}
+
+struct DnDLoop : LocalLoop {
+	Image move, copy, reject;
+	Vector<Atom> fmt;
+	const VectorMap<String, ClipData> *data;
+	Ptr<Ctrl> source;
+	void SetFmts(Window w, Atom property);
+	Window src, target;
+	int    action;
+
+	void Request(XSelectionRequestEvent *se);
+	void Sync();
+	String GetData(const String& f);
+	void Leave();
+	virtual void  LeftUp(Point, dword);
+	virtual bool  Key(dword, int);
+	virtual void  MouseMove(Point p, dword);
+	virtual Image CursorImage(Point, dword);
+};
+
+Ptr<DnDLoop> dndloop;
+
+void DnDLoop::Leave()
+{
+	if(target) {
+		LLOG("Sending XdndLeave to " << target);
+		XEvent e = ClientMsg(target, XdndLeave);
+		e.xclient.data.l[0] = src;
+		XSendEvent(Xdisplay, target, XFalse, 0, &e);
+	}
+}
+
+void DnDLoop::Sync()
+{
+	if(Xdnd_waiting_status)
+		return;
+	bool tx = Ctrl::TrapX11Errors();
+	Window root;
+	unsigned int d1;
+	int x, y, d2;
+	Window tgt = Xroot;
+	int version;
+	for(;;) {
+		if(XQueryPointer(Xdisplay, tgt, &root, &tgt, &x, &y, &d2, &d2, &d1)) {
+			if(!tgt)
+				break;
+			Vector<int> x = GetPropertyInts(tgt, XAtom("XdndAware"));
+			LLOG("XdndAware " << tgt << ": " << x.GetCount());
+			if(x.GetCount()) {
+				Xdnd_version = x[0];
+				break;
+			}
+		}
+		else {
+			tgt = None;
+			break;
+		}
+	}
+	if(Xdnd_version < 3)
+		tgt = None;
+	if(tgt != target) {
+		Leave();
+		target = tgt;
+		if(target) {
+			LLOG("Sending XdndEnter to " << target << ", src = " << src);
+			XEvent e = ClientMsg(target, XdndEnter);
+			e.xclient.data.l[0] = src;
+			e.xclient.data.l[1] = (fmt.GetCount() > 3) | (version << 24);
+			for(int i = 0; i < min(3, fmt.GetCount()); i++)
+				e.xclient.data.l[i + 2] = fmt[i];
+			XSendEvent(Xdisplay, target, XFalse, 0, &e);
+		}
+	}
+
+	if(target) {
+		LLOG("Sending XdndPosition to " << target << " " << x << ", " << y);
+		XEvent e = ClientMsg(target, XdndPosition);
+		e.xclient.data.l[0] = src;
+		e.xclient.data.l[1] = 0;
+		e.xclient.data.l[2] = MAKELONG(y, x);
+		e.xclient.data.l[3] = Xeventtime;
+		int action = XdndActionCopy;
+		if(source && source->GetTopCtrl()->GetWindow() == target)
+			action = XdndActionMove;
+		if(GetShift())
+			action = XdndActionMove;
+		if(GetCtrl())
+			action = XdndActionCopy;
+		e.xclient.data.l[4] = action;
+		XSendEvent(Xdisplay, target, XFalse, 0, &e);
+		XFlush(Xdisplay);
+		Xdnd_waiting_status = true;
+		int timeout = GetTickCount() + 200;
+		LLOG("Waiting for XdndStatus");
+		TimeStop tm;
+		while(Xdnd_waiting_status && GetTickCount() < timeout) {
+			GuiSleep(0);
+			ProcessEvents();
+		}
+		LLOG("Waiting status " << tm << "ms");
+		if(Xdnd_waiting_status) {
+			LLOG("XdndStatus timeout");
+			Xdnd_status = DND_NONE;
+			Xdnd_waiting_status = false;
+		}
+		else
+			LLOG("XdndStatus recieved " << Xdnd_status);
+	}
+	Ctrl::UntrapX11Errors(tx);
+}
+
+void Ctrl::DropStatusEvent(XEvent *event)
+{
+	InitDndAtoms();
+	if(event->type != ClientMessage)
+		return;
+	LLOG("DropStatus Client Message " << XAtomName(event->xclient.message_type));
+	if(event->type == ClientMessage && dndloop && event->xclient.data.l[0] == (int)dndloop->target) {
+		if(event->xclient.message_type == XdndStatus && Xdnd_waiting_status) {
+			LLOG("XdndStatus, xdnd action: " << XAtomName(event->xclient.data.l[4]));
+			Xdnd_status = (event->xclient.data.l[1] & 1) ?
+			                 event->xclient.data.l[4] == (int)XdndActionMove ? DND_MOVE : DND_COPY
+			              : DND_NONE;
+			Xdnd_waiting_status = false;
+		}
+		if(event->xclient.message_type == XdndFinished && Xdnd_waiting_finished) {
+			LLOG("XdndFinished, xdnd action: " << XAtomName(event->xclient.data.l[2]));
+			if(Xdnd_version == 5)
+				Xdnd_status = (event->xclient.data.l[1] & 1) ?
+				                 event->xclient.data.l[2] == (int)XdndActionMove ? DND_MOVE : DND_COPY
+				              : DND_NONE;
+			Xdnd_waiting_finished = false;
+		}
+	}
+}
+
+void DnDLoop::LeftUp(Point, dword)
+{
+	LLOG("DnDLoop::LeftUp");
+	bool tx = TrapX11Errors();
+	if(target) {
+		LLOG("Sending XdndDrop to " << target);
+		XEvent e = ClientMsg(target, XdndDrop);
+		e.xclient.data.l[0] = src;
+		e.xclient.data.l[1] = 0;
+		e.xclient.data.l[2] = Xeventtime;
+		XSendEvent(Xdisplay, target, XFalse, 0, &e);
+		XFlush(Xdisplay);
+		Xdnd_waiting_finished = true;
+		int timeout = GetTickCount() + 200;
+		LLOG("Waiting for XdndFinished");
+		TimeStop tm;
+		while(Xdnd_waiting_finished && GetTickCount() < timeout) {
+			GuiSleep(0);
+			ProcessEvents();
+		}
+		LLOG("Waiting finished " << tm << "ms");
+		if(Xdnd_waiting_status) {
+			LLOG("XdndFinished timeout");
+			Xdnd_status = DND_NONE;
+			Xdnd_waiting_finished = false;
+		}
+		else
+			LLOG("XdndFinished recieved");
+	}
+	EndLoop();
+	UntrapX11Errors(tx);
+}
+
+void DnDLoop::MouseMove(Point p, dword)
+{
+	LLOG("DnDLoop::MouseMove");
+	Sync();
+}
+
+bool DnDLoop::Key(dword, int)
+{
+	LLOG("DnDLoop::Key");
+	Sync();
+	return false;
+}
+
+Image DnDLoop::CursorImage(Point, dword)
+{
+	return Xdnd_status == DND_MOVE ? move : Xdnd_status == DND_COPY ? copy : reject;
+}
+
+void DnDLoop::SetFmts(Window w, Atom property)
+{
+	Buffer<Atom> x(fmt.GetCount());
+	for(int i = 0; i < fmt.GetCount(); i++) {
+		x[i] = fmt[i];
+		LLOG('\t' << XAtomName(x[i]));
+	}
+	XChangeProperty(Xdisplay, w, property, XAtom("ATOM"),
+	                32, 0, (unsigned char*)~x,
+	                fmt.GetCount());
+}
+
+String DnDLoop::GetData(const String& f)
+{
+	int i = data->Find(f);
+	String d;
+	if(i >= 0)
+		d = (*data)[i].Render();
+	else
+		if(source)
+			d = source->GetDropData(f);
+	return d;
+}
+
+String DnDGetData(const String& f)
+{
+	String d;
+	if(dndloop)
+		d = dndloop->GetData(f);
+	return d;
+}
+
+void DnDLoop::Request(XSelectionRequestEvent *se)
+{
+	LLOG("DnDRequest " << XAtomName(se->target));
+	XEvent e;
+	e.xselection.type      = SelectionNotify;
+	e.xselection.display   = Xdisplay;
+	e.xselection.requestor = se->requestor;
+	e.xselection.selection = XAtom("XdndSelection");
+	e.xselection.target    = se->target;
+	e.xselection.time      = se->time;
+	e.xselection.property  = se->property;
+	if(se->target == XAtom("TARGETS")) {
+		LLOG("DnDRequest targets:");
+		SetFmts(se->requestor, se->property);
+	}
+	else {
+		String d = GetData(XAtomName(se->target));
+		if(d.GetCount())
+			XChangeProperty(Xdisplay, se->requestor, se->property, se->target, 8, PropModeReplace,
+			                d, d.GetCount());
+		else
+		    e.xselection.property = None;
+	}
+	XSendEvent(Xdisplay, se->requestor, XFalse, 0, &e);
+}
+
+void DnDRequest(XSelectionRequestEvent *se)
+{
+	if(dndloop) dndloop->Request(se);
+}
+
+void DnDClear() {}
+
+Image MakeDragImage(const Image& arrow, Image sample);
+
+Ptr<Ctrl> sDnDSource;
+
+int Ctrl::DoDragAndDrop(const char *fmts, const Image& sample, dword actions,
+                        const VectorMap<String, ClipData>& data)
+{
+	InitDndAtoms();
+	DnDLoop d;
+	d.reject = MakeDragImage(CtrlCoreImg::DndNone(), sample);
+	if(actions & DND_COPY) d.copy = MakeDragImage(CtrlCoreImg::DndCopy(), sample);
+	if(actions & DND_MOVE) d.move = MakeDragImage(CtrlCoreImg::DndMove(), sample);
+	d.SetMaster(*this);
+	d.data = &data;
+	d.source = this;
+	dndloop = &d;
+	Vector<String> f = Split(fmts, ';');
+	for(int i = 0; i < f.GetCount(); i++)
+		d.fmt.Add(XAtom(f[i]));
+	for(int i = 0; i < data.GetCount(); i++)
+		d.fmt.Add(XAtom(data.GetKey(i)));
+	d.SetFmts(xclipboard().win, XAtom("XdndTypeList"));
+	XSetSelectionOwner(Xdisplay, XAtom("XdndSelection"), xclipboard().win, CurrentTime);
+	d.src = xclipboard().win;
+	d.target = None;
+	sDnDSource = this;
+	d.Run();
+	sDnDSource = NULL;
+	SyncCaret();
+	LLOG("DoDragAndDrop finished");
+	return Xdnd_status;
+}
+
+Ctrl *Ctrl::GetDragAndDropSource()
+{
+	return sDnDSource;
+}
+
+Index<String>    Ctrl::drop_formats;
+
+int   XdndAction;
+Point XdndPos;
+
+PasteClip sMakeDropClip(bool paste)
+{
+	PasteClip d;
+	d.type = 1;
+	d.paste = paste;
+	d.accepted = false;
+	d.allowed = DND_MOVE|DND_COPY;
+	d.action = XdndAction;
+	return d;
+}
+
+void Ctrl::DnD(Window src, bool paste)
+{
+	PasteClip d = sMakeDropClip(paste);
+	LLOG("Source action " << XdndAction);
+	DnD(XdndPos, d);
+	XdndAction = d.GetAction();
+	LLOG("Target action " << XdndAction);
+	XEvent e = ClientMsg(src, paste ? XdndFinished : XdndStatus);
+	e.xclient.data.l[0] = GetWindow();
+	(paste ? e.xclient.data.l[2] : e.xclient.data.l[4])
+		= XdndAction == DND_MOVE ? XdndActionMove : XdndActionCopy;
+	if(d.IsAccepted())
+		e.xclient.data.l[1] = 1;
+	LLOG("Sending status/finished to " << src << " accepted: " << d.IsAccepted());
+	XSendEvent(Xdisplay, src, XFalse, 0, &e);
+}
+
+void Ctrl::DropEvent(XWindow& w, XEvent *event)
+{
+	InitDndAtoms();
+	if(event->type != ClientMessage)
+		return;
+	Window src = event->xclient.data.l[0];
+	LLOG("Client Message " << GetWindow() << " " << XAtomName(event->xclient.message_type)
+	      << ", src: " << src);
+	if(event->xclient.message_type == XdndEnter) {
+		LLOG("DnDEnter");
+		drop_formats.Clear();
+		if(event->xclient.data.l[1] & 1) {
+			Vector<int> v = GetPropertyInts(src, XAtom("XdndTypeList"), XA_ATOM);
+			for(int i = 0; i < v.GetCount(); i++)
+				drop_formats.Add(XAtomName(v[i]));
+		}
+		else
+			for(int i = 2; i <= 4; i++)
+				drop_formats.Add(XAtomName(event->xclient.data.l[i]));
+	}
+	static Point xdndpos;
+	if(event->xclient.message_type == XdndPosition) {
+		dword x = event->xclient.data.l[2];
+		XdndPos = Point(HIWORD(x), LOWORD(x));
+		LLOG("XdndPosition " << XdndPos << ", action " << XAtomName(event->xclient.data.l[4]));
+		XdndAction = event->xclient.data.l[4] == (int)XdndActionMove ? DND_MOVE : DND_COPY;
+		DnD(src, false);
+	}
+	if(event->xclient.message_type == XdndLeave)
+		DnDLeave();
+	if(event->xclient.message_type == XdndDrop && dndctrl) {
+		LLOG("XdndDrop to " << UPP::Name(dndctrl));
+		DnD(src, true);
+		DnDLeave();
+	}
+}
+
+END_UPP_NAMESPACE
+
+#endif
diff --git a/uppsrc/CtrlCore/X11Event.i b/uppsrc/CtrlCore/X11Event.i
new file mode 100644
index 000000000..071549e88
--- /dev/null
+++ b/uppsrc/CtrlCore/X11Event.i
@@ -0,0 +1,35 @@
+//#BLITZ_APPROVE
+
+x_Event(KeyPress)
+x_Event(KeyRelease)
+x_Event(ButtonPress)
+x_Event(ButtonRelease)
+x_Event(MotionNotify)
+x_Event(EnterNotify)
+x_Event(LeaveNotify)
+x_Event(FocusIn)
+x_Event(FocusOut)
+x_Event(KeymapNotify)
+x_Event(Expose)
+x_Event(GraphicsExpose)
+x_Event(NoExpose)
+x_Event(VisibilityNotify)
+x_Event(CreateNotify)
+x_Event(DestroyNotify)
+x_Event(UnmapNotify)
+x_Event(MapNotify)
+x_Event(MapRequest)
+x_Event(ReparentNotify)
+x_Event(ConfigureNotify)
+x_Event(ConfigureRequest)
+x_Event(GravityNotify)
+x_Event(ResizeRequest)
+x_Event(CirculateNotify)
+x_Event(CirculateRequest)
+x_Event(PropertyNotify)
+x_Event(SelectionClear)
+x_Event(SelectionRequest)
+x_Event(SelectionNotify)
+x_Event(ColormapNotify)
+x_Event(ClientMessage)
+x_Event(MappingNotify)
diff --git a/uppsrc/CtrlCore/X11ImgClip.cpp b/uppsrc/CtrlCore/X11ImgClip.cpp
new file mode 100644
index 000000000..99ad6f758
--- /dev/null
+++ b/uppsrc/CtrlCore/X11ImgClip.cpp
@@ -0,0 +1,75 @@
+#include "CtrlCore.h"
+
+#include <plugin/bmp/bmp.h>
+
+NAMESPACE_UPP
+
+#ifdef PLATFORM_X11
+
+
+const char *ClipFmtsImage()
+{
+	static const char *q;
+	ONCELOCK {
+		static String s(ClipFmt<Image>() + ";image/bmp;image/png");
+		q = s;
+	}
+	return q;
+}
+
+bool AcceptImage(PasteClip& clip)
+{
+	return clip.Accept(ClipFmt<Image>()) || clip.Accept("image/bmp") || clip.Accept("image/png");
+}
+
+Image GetImage(PasteClip& clip)
+{
+	Image m;
+	if(Accept<Image>(clip)) {
+		LoadFromString(m, ~clip);
+		if(!m.IsEmpty())
+			return m;
+	}
+	if(clip.Accept("image/bmp;image/png"))
+		return StreamRaster::LoadStringAny(~clip);
+	return Null;
+}
+
+Image ReadClipboardImage()
+{
+	return GetImage(Ctrl::Clipboard());
+}
+
+static String sBmp(const Value& data)
+{
+	Image img = data;
+	return BMPEncoder().SaveString(img);
+}
+
+static String sImg(const Value& data)
+{
+	Image img = data;
+	return StoreAsString(const_cast<Image&>(img));
+}
+
+String GetImageClip(const Image& img, const String& fmt)
+{
+	if(img.IsEmpty())
+		return Null;
+	if(fmt == "image/bmp")
+		return BMPEncoder().SaveString(img);
+	if(fmt == ClipFmt<Image>())
+		return StoreAsString(const_cast<Image&>(img));
+	return Null;
+}
+
+void AppendClipboardImage(const Image& img)
+{
+	if(img.IsEmpty()) return;
+	AppendClipboard(ClipFmt<Image>(), img, sImg);
+	AppendClipboard("image/bmp", img, sBmp);
+}
+
+#endif
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/CtrlCore/X11Keys.i b/uppsrc/CtrlCore/X11Keys.i
new file mode 100644
index 000000000..d89d26821
--- /dev/null
+++ b/uppsrc/CtrlCore/X11Keys.i
@@ -0,0 +1,111 @@
+K_BACK       = 8,
+K_BACKSPACE  = 8,
+
+K_TAB        = 9,
+
+K_RETURN     = 13,
+K_ENTER      = 13,
+K_ESCAPE     = 27,
+
+K_SPACE      = 32,
+
+K_DELETE     = XK_Delete + K_DELTA,
+
+K_SHIFT_KEY  = XK_Shift_L + K_DELTA,
+K_CTRL_KEY   = XK_Control_L + K_DELTA,
+K_ALT_KEY    = XK_Meta_L + K_DELTA,
+K_CAPSLOCK   = XK_Caps_Lock + K_DELTA,
+K_PRIOR      = XK_Page_Up + K_DELTA,
+K_PAGEUP     = XK_Page_Up + K_DELTA,
+K_NEXT       = XK_Page_Down + K_DELTA,
+K_PAGEDOWN   = XK_Page_Down + K_DELTA,
+K_END        = XK_End + K_DELTA,
+K_HOME       = XK_Home + K_DELTA,
+K_LEFT       = XK_Left + K_DELTA,
+K_UP         = XK_Up + K_DELTA,
+K_RIGHT      = XK_Right + K_DELTA,
+K_DOWN       = XK_Down + K_DELTA,
+K_INSERT     = XK_Insert + K_DELTA,
+
+K_NUMPAD0    = XK_KP_0 + K_DELTA,
+K_NUMPAD1    = XK_KP_1 + K_DELTA,
+K_NUMPAD2    = XK_KP_2 + K_DELTA,
+K_NUMPAD3    = XK_KP_3 + K_DELTA,
+K_NUMPAD4    = XK_KP_4 + K_DELTA,
+K_NUMPAD5    = XK_KP_5 + K_DELTA,
+K_NUMPAD6    = XK_KP_6 + K_DELTA,
+K_NUMPAD7    = XK_KP_7 + K_DELTA,
+K_NUMPAD8    = XK_KP_8 + K_DELTA,
+K_NUMPAD9    = XK_KP_9 + K_DELTA,
+K_MULTIPLY   = XK_KP_Multiply + K_DELTA,
+K_ADD        = XK_KP_Add + K_DELTA,
+K_SEPARATOR  = XK_KP_Separator + K_DELTA,
+K_SUBTRACT   = XK_KP_Subtract + K_DELTA,
+K_DECIMAL    = XK_KP_Decimal + K_DELTA,
+K_DIVIDE     = XK_KP_Divide + K_DELTA,
+
+K_SCROLL     = XK_Scroll_Lock + K_DELTA,
+
+K_F1         = XK_F1 + K_DELTA,
+K_F2         = XK_F2 + K_DELTA,
+K_F3         = XK_F3 + K_DELTA,
+K_F4         = XK_F4 + K_DELTA,
+K_F5         = XK_F5 + K_DELTA,
+K_F6         = XK_F6 + K_DELTA,
+K_F7         = XK_F7 + K_DELTA,
+K_F8         = XK_F8 + K_DELTA,
+K_F9         = XK_F9 + K_DELTA,
+K_F10        = XK_F10 + K_DELTA,
+K_F11        = XK_F11 + K_DELTA,
+K_F12        = XK_F12 + K_DELTA,
+
+K_A          = 'A' + K_DELTA,
+K_B          = 'B' + K_DELTA,
+K_C          = 'C' + K_DELTA,
+K_D          = 'D' + K_DELTA,
+K_E          = 'E' + K_DELTA,
+K_F          = 'F' + K_DELTA,
+K_G          = 'G' + K_DELTA,
+K_H          = 'H' + K_DELTA,
+K_I          = 'I' + K_DELTA,
+K_J          = 'J' + K_DELTA,
+K_K          = 'K' + K_DELTA,
+K_L          = 'L' + K_DELTA,
+K_M          = 'M' + K_DELTA,
+K_N          = 'N' + K_DELTA,
+K_O          = 'O' + K_DELTA,
+K_P          = 'P' + K_DELTA,
+K_Q          = 'Q' + K_DELTA,
+K_R          = 'R' + K_DELTA,
+K_S          = 'S' + K_DELTA,
+K_T          = 'T' + K_DELTA,
+K_U          = 'U' + K_DELTA,
+K_V          = 'V' + K_DELTA,
+K_W          = 'W' + K_DELTA,
+K_X          = 'X' + K_DELTA,
+K_Y          = 'Y' + K_DELTA,
+K_Z          = 'Z' + K_DELTA,
+K_0          = '0' + 128 + K_DELTA,
+K_1          = '1' + 128 + K_DELTA,
+K_2          = '2' + 128 + K_DELTA,
+K_3          = '3' + 128 + K_DELTA,
+K_4          = '4' + 128 + K_DELTA,
+K_5          = '5' + 128 + K_DELTA,
+K_6          = '6' + 128 + K_DELTA,
+K_7          = '7' + 128 + K_DELTA,
+K_8          = '8' + 128 + K_DELTA,
+K_9          = '9' + 128 + K_DELTA,
+
+K_CTRL_LBRACKET  = K_CTRL|XK_bracketleft|K_DELTA,
+K_CTRL_RBRACKET  = K_CTRL|XK_bracketright|K_DELTA,
+K_CTRL_MINUS     = K_CTRL|0x2d|K_DELTA,
+K_CTRL_GRAVE     = K_CTRL|XK_grave|K_DELTA,
+K_CTRL_SLASH     = K_CTRL|0x5f|K_DELTA,
+K_CTRL_BACKSLASH = K_CTRL|0x5c|K_DELTA,
+K_CTRL_COMMA     = K_CTRL|0x2c|K_DELTA,
+K_CTRL_PERIOD    = K_CTRL|XK_period|K_DELTA,
+K_CTRL_SEMICOLON = K_CTRL|XK_semicolon|K_DELTA,
+K_CTRL_EQUAL     = K_CTRL|0x3d|K_DELTA,
+K_CTRL_APOSTROPHE= K_CTRL|0x27|K_DELTA,
+
+K_BREAK      = XK_Pause|K_DELTA,
diff --git a/uppsrc/CtrlCore/X11Proc.cpp b/uppsrc/CtrlCore/X11Proc.cpp
new file mode 100644
index 000000000..f95cc2f93
--- /dev/null
+++ b/uppsrc/CtrlCore/X11Proc.cpp
@@ -0,0 +1,368 @@
+#include "CtrlCore.h"
+
+NAMESPACE_UPP
+
+#ifdef PLATFORM_X11
+
+#define LLOG(x)        //DLOG(x)
+
+#define LTIMING(x)     //TIMING(x)
+
+static dword sKbdState;
+static dword sModState;
+
+void ClearKbdState_()
+{
+	sKbdState = 0;
+}
+
+Point GetMousePos()
+{
+	LTIMING("GetMousePos");
+	return Ctrl::mousePos;
+}
+
+void Ctrl::SyncMousePos()
+{
+	LTIMING("XQueryPointer");
+	int x, y, xx, yy;
+	Window dm1, dm2;
+	Ctrl::mousePos = Null;
+	if(XQueryPointer(Xdisplay, Xroot, &dm1, &dm2, &x, &y, &xx, &yy, &sKbdState))
+		Ctrl::mousePos = Point(x, y);
+}
+
+bool GetShift() { return sKbdState & ShiftMask; }
+bool GetCtrl() { return sKbdState & ControlMask; }
+bool GetAlt() { return sKbdState & Mod1Mask; }
+bool GetCapsLock() { return sKbdState & LockMask; }
+bool GetMouseLeft() { return sModState & Button1Mask; }
+bool GetMouseRight() { return sModState & (Ctrl::Xbuttons >= 3 ? Button3Mask : Button2Mask); }
+bool GetMouseMiddle() { return sModState & (Ctrl::Xbuttons >= 3 ? Button2Mask : 0); }
+
+int  Ctrl::Xbuttontime;
+
+dword Ctrl::KEYtoK(dword key)
+{
+	if(key != K_CTRL_KEY && key != K_SHIFT_KEY) {
+		if(GetCtrl()) key |= K_CTRL;
+		if(GetAlt()) key |= K_ALT;
+		if(GetShift()) key |= K_SHIFT;
+	}
+	return key;
+}
+
+void Ctrl::SetLastActive(XWindow *w, Ctrl *la)
+{
+	while(w) {
+		LLOG("  to " << UPP::Name(w->ctrl));
+		w->last_active = la;
+		w = w->owner ? w->owner->GetXWindow() : NULL;
+	}
+}
+
+void Ctrl::EventProc(XWindow& w, XEvent *event)
+{
+	Ptr<Ctrl> _this = this;
+	bool pressed = false;
+	int  count = 1;
+	switch(event->type) {
+	case NoExpose:
+		LLOG("NoExpose serial " << event->xnoexpose.serial);
+		break;
+	case GraphicsExpose:
+		LLOG("GraphicsExpose serial " << event->xgraphicsexpose.serial);
+	case Expose: {
+			XExposeEvent& e = event->xexpose;
+			w.exposed = true;
+			LLOG("Expose " << RectC(e.x, e.y, e.width, e.height));
+			Invalidate(w, RectC(e.x, e.y, e.width, e.height));
+		}
+		return;
+	case ConfigureNotify: {
+			XConfigureEvent& e = event->xconfigure;
+			int x, y;
+			Window dummy;
+// 01/12/2007 - mdelfede
+// added support for windowed controls
+//			if(top)
+//				XTranslateCoordinates(Xdisplay, top->window, Xroot, 0, 0, &x, &y, &dummy);
+			if(top) {
+				Window DestW = (parent ? GetParentWindow() : Xroot);
+				XTranslateCoordinates(Xdisplay, top->window, DestW, 0, 0, &x, &y, &dummy);
+			}
+			Rect rect = RectC(x, y, e.width, e.height);
+			LLOG("CongigureNotify " << rect);
+			if(GetRect() != rect)
+				SetWndRect(rect);
+			// Synchronizes native windows (NOT the main one)
+			SyncNativeWindows();
+// 01/12/2007 - END
+
+		}
+		return;
+	default:
+		if(!IsEnabled()) return;
+	}
+	LTIMING("XUserInput");
+	switch(event->type) {
+	case FocusIn:
+		if(w.xic)
+			XSetICFocus(w.xic);
+		break;
+	case FocusOut:
+		if(w.xic)
+			XUnsetICFocus(w.xic);
+		break;
+	case KeyPress:
+		pressed = true;
+		LLOG("event type:" << event->type << " state:" << event->xkey.state <<
+		     "keycode:" << event->xkey.keycode);
+		for(;;) {
+			XEvent ev1[1], ev2[1];
+			if(!IsWaitingEvent()) break;
+			do
+				XNextEvent(Xdisplay, ev1);
+			while(ev1->type == NoExpose && IsWaitingEvent());
+			LLOG("ev1 type:" << ev1->type << " state:" << ev1->xkey.state <<
+			     "keycode:" << ev1->xkey.keycode);
+			if(ev1->type != KeyRelease ||
+			   ev1->xkey.state != event->xkey.state ||
+			   ev1->xkey.keycode != event->xkey.keycode ||
+			   !IsWaitingEvent()) {
+			   	XPutBackEvent(Xdisplay, ev1);
+			   	break;
+			}
+			do
+				XNextEvent(Xdisplay, ev2);
+			while(ev2->type == NoExpose && IsWaitingEvent());
+			LLOG("ev2 type:" << ev2->type << " state:" << ev2->xkey.state <<
+			     "keycode:" << ev2->xkey.keycode);
+			if(ev2->type != KeyPress ||
+			   ev2->xkey.state != event->xkey.state ||
+			   ev2->xkey.keycode != event->xkey.keycode) {
+			   	XPutBackEvent(Xdisplay, ev2);
+			   	XPutBackEvent(Xdisplay, ev1);
+			   	break;
+			}
+			else {
+				XFilterEvent(ev1, None);
+				XFilterEvent(ev2, None);
+			}
+			count++;
+		}
+	case KeyRelease: {
+			mousePos = Point(event->xkey.x_root, event->xkey.y_root);
+			char buff[128];
+			Xeventtime = event->xkey.time;
+			LLOG("Key Xeventtime: " << Xeventtime << " count:" << count);
+			KeySym keysym;
+			int    chr = 0;
+			WString wtext;
+			if(pressed && w.xic) {
+				Status status;
+				int len = Xutf8LookupString(w.xic, &event->xkey, buff, sizeof(buff), &keysym, &status);
+				buff[len] = 0;
+				if(status == XLookupChars || status == XLookupBoth) {
+					chr = FromUtf8(buff, len)[0];
+					if(status == XLookupChars)
+						wtext = FromUtf8(buff, len);
+				}
+				else
+				if(status != XLookupKeySym && status != XLookupBoth)
+				    keysym = 0;
+			}
+			else {
+				XLookupString(&event->xkey, buff, 1, &keysym, NULL);
+				chr = *buff;
+			}
+			if(keysym == XK_Control_L || keysym == XK_Control_R) {
+				keysym = XK_Control_L;
+				if(pressed)
+					sKbdState |= ControlMask;
+				else
+					sKbdState &= ~ControlMask;
+			}
+			if(keysym == XK_Shift_L || keysym == XK_Shift_R) {
+				keysym = XK_Shift_L;
+				if(pressed)
+					sKbdState |= ShiftMask;
+				else
+					sKbdState &= ~ShiftMask;
+			}
+			if(keysym == XK_Meta_L || keysym == XK_Meta_R || keysym == XK_Alt_L ||
+			   keysym == XK_Alt_R || keysym == XK_Super_L || keysym == XK_Super_R ||
+			   keysym == XK_Hyper_L || keysym == XK_Hyper_R || keysym == XK_ISO_Prev_Group) {
+				keysym = XK_Meta_L;
+				if(pressed)
+					sKbdState |= Mod1Mask;
+				else
+					sKbdState &= ~Mod1Mask;
+			}
+			LLOG("KeySym:" << FormatIntHex(keysym) << " " << (char)keysym << " " << count);
+			dword up = pressed ? 0 : K_KEYUP;
+			static struct { KeySym keysym; dword key; } tab[] = {
+				{ XK_ISO_Left_Tab, K_TAB|K_SHIFT },
+				{ XK_BackSpace, K_BACKSPACE },
+				{ XK_Tab, K_TAB },
+				{ XK_Return, K_ENTER },
+				{ XK_KP_Enter, K_ENTER },
+				{ XK_Escape, K_ESCAPE },
+				{ XK_space, K_SPACE },
+
+				{ XK_KP_Space, K_SPACE },
+				{ XK_KP_Tab, K_TAB },
+				{ XK_KP_Enter, K_ENTER },
+				{ XK_KP_F1, K_F1 },
+				{ XK_KP_F2, K_F2 },
+				{ XK_KP_F3, K_F3 },
+				{ XK_KP_F4, K_F4 },
+				{ XK_KP_Home, K_HOME },
+				{ XK_KP_Left, K_LEFT },
+				{ XK_KP_Up, K_UP },
+				{ XK_KP_Right, K_RIGHT },
+				{ XK_KP_Down, K_DOWN },
+				{ XK_KP_Page_Up, K_PAGEUP },
+				{ XK_KP_Page_Down, K_PAGEDOWN },
+				{ XK_KP_End, K_END },
+				{ XK_KP_Begin, K_HOME },
+				{ XK_KP_Insert, K_INSERT },
+				{ XK_KP_Delete, K_DELETE },
+			};
+			for(int i = 0; i < __countof(tab); i++)
+				if(tab[i].keysym == keysym) {
+					DispatchKey(KEYtoK(tab[i].key)|up, count);
+					return;
+				}
+			if(GetShift() && chr == 0) {
+				static dword k[] = { 41, 33, 64, 35, 36, 37, 94, 38, 42, 40 };
+				for(int i = 0; i < 10; i++)
+					if(keysym == k[i]) {
+						DispatchKey(KEYtoK(i + K_0)|up, count);
+						return;
+					}
+			}
+			if(keysym >= 48 && keysym <= 57 && chr == 0) {
+				DispatchKey(KEYtoK(keysym - 48 + K_0)|up, count);
+				return;
+			}
+			if(chr >= 1 && chr < 32) {
+				DispatchKey(KEYtoK(chr - 1 + K_CTRL_A)|up, count);
+				return;
+			}
+			if(keysym >= 0xff80 && keysym <= 0xffb9 && chr) {
+				DispatchKey(KEYtoK(chr)|up, count);
+				return;
+			}
+			if(keysym >= 0xff00 && chr < 128 ||
+			   (GetCtrl() || GetAlt()) && keysym >= 0x20 && keysym < 0x7f) {
+				if(keysym >= 'a' && keysym <= 'z')
+					keysym = keysym - 'a' + 'A';
+				DispatchKey(KEYtoK(keysym|K_DELTA)|up, count);
+				return;
+			}
+
+			if((chr == 32 || chr == 9 || chr == 13) && !pressed)
+				DispatchKey(chr|K_KEYUP, count);
+			if(chr && pressed) {
+				DispatchKey(chr, count);
+				for(int ii = 1; ii < wtext.GetLength(); ii++)
+					DispatchKey(wtext[ii], count);
+			}
+		}
+		break;
+	case ButtonPress: {
+			if(!HasWndFocus() && !popup)
+				SetWndFocus();
+			ClickActivateWnd();
+			mousePos = Point(event->xbutton.x_root, event->xbutton.y_root);
+			ReleaseGrab();
+			XButtonEvent& e = event->xbutton;
+			sModState = e.state;
+			Xeventtime = e.time;
+			if(ignoreclick) break;
+			Point p = Point(e.x, e.y);
+			dword action = DOWN;
+			if((dword)e.time - (dword)Xbuttontime < 800)
+				action = DOUBLE;
+			Xbuttontime = e.time;
+			switch(e.button) {
+			case Button1:
+				sModState |= Button1Mask;
+				DispatchMouse(LEFT|action, p, 0);
+				break;
+			case Button2:
+				sModState |= Button2Mask;
+				if(Xbuttons < 3)
+					DispatchMouse(RIGHT|action, p, 0);
+				else
+					DispatchMouse(MIDDLE|action, p, 0);
+				break;
+			case Button3:
+				sModState |= Button3Mask;
+				DispatchMouse(RIGHT|action, p, 0);
+				break;
+			}
+			if(_this) PostInput();
+		}
+		break;
+	case ButtonRelease: {
+			mousePos = Point(event->xbutton.x_root, event->xbutton.y_root);
+			XButtonEvent& e = event->xbutton;
+			sModState = e.state;
+			Xeventtime = e.time;
+			Point p = Point(e.x, e.y);
+			switch(e.button) {
+			case Button1:
+				sModState &= ~Button1Mask;
+				break;
+			case Button2:
+				sModState &= ~Button2Mask;
+				break;
+			case Button3:
+				sModState &= ~Button3Mask;
+				break;
+			}
+			if(ignoreclick)
+				EndIgnore();
+			else
+				switch(e.button) {
+				case Button1:
+					DispatchMouse(LEFTUP, p, 0);
+					break;
+				case Button2:
+					if(Xbuttons < 3)
+						DispatchMouse(RIGHTUP, p, 0);
+					else
+						DispatchMouse(MIDDLEUP, p, 0);
+					break;
+				case Button3:
+					DispatchMouse(RIGHTUP, p, 0);
+					break;
+				case Button4:
+					DispatchMouse(MOUSEWHEEL, p, 120);
+					break;
+				case Button5:
+					DispatchMouse(MOUSEWHEEL, p, -120);
+					break;
+				}
+			if(_this) PostInput();
+		}
+		break;
+	case MotionNotify:
+		while(XCheckWindowEvent(Xdisplay, top->window, PointerMotionMask, event));
+		EndIgnore();
+		mousePos = Point(event->xmotion.x_root, event->xmotion.y_root);
+		Xeventtime = event->xmotion.time;
+		Xbuttontime = Xeventtime - 0x80000000;
+		sModState = event->xmotion.state;
+		DispatchMouse(MOUSEMOVE, Point(event->xmotion.x, event->xmotion.y));
+		DoCursorShape();
+		break;
+	}
+	DropEvent(w, event);
+}
+
+#endif
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/CtrlCore/X11Wnd.cpp b/uppsrc/CtrlCore/X11Wnd.cpp
new file mode 100644
index 000000000..437ef574a
--- /dev/null
+++ b/uppsrc/CtrlCore/X11Wnd.cpp
@@ -0,0 +1,1019 @@
+#include "CtrlCore.h"
+
+#ifdef PLATFORM_X11
+#include <X11/Xlocale.h>
+#endif
+
+NAMESPACE_UPP
+
+#ifdef PLATFORM_X11
+
+#ifdef _DEBUG
+
+
+bool Ctrl::LogMessages
+// = true
+;
+#endif
+
+#define LLOG(x)      // DLOG(x)
+#define LTIMING(x)   // RTIMING(x)
+#define LDUMP(x)     // DDUMP(x)
+#define LDUMPC(x)    // DDUMPC(x)
+
+// #define SYNCHRONIZE
+
+#define x_Event(x) { x, #x },
+
+static
+struct XEventMap {
+	int         ID;
+	const char *name;
+}
+sXevent[] = {
+#include "X11Event.i"
+	{ 0, NULL }
+};
+
+ArrayMap<Window, Ctrl::XWindow>& Ctrl::Xwindow()
+{
+	return Single< ArrayMap<Window, XWindow> >();
+}
+
+Ptr<Ctrl> Ctrl::WndCaretCtrl;
+int       Ctrl::WndCaretTime;
+Rect      Ctrl::WndCaretRect;
+bool      Ctrl::WndCaretVisible;
+int       Ctrl::Xbuttons;
+Window    Ctrl::grabWindow, Ctrl::focusWindow;
+int       Ctrl::Xeventtime;
+
+int       Ctrl::PopupGrab;
+Ptr<Ctrl> Ctrl::popupWnd;
+
+Point     Ctrl::mousePos;
+
+static int s_starttime;
+
+void Ctrl::DoPaint(const Vector<Rect>& invalid)
+{
+	if(IsVisible()) {
+		LTIMING("DoPaint");
+		fullrefresh = false;
+		bool caret = false;
+		if(WndCaretCtrl == this && WndCaretVisible)
+			for(int i = 0; i < invalid.GetCount(); i++)
+				if(invalid[i].Intersects(WndCaretRect)) {
+					XorCaret();
+					caret = true;
+					break;
+				}
+		if(GLX) return;
+		GC gc = XCreateGC(Xdisplay, (Drawable)top->window, 0, 0);
+		XftDraw *xftdraw = XftDrawCreate(Xdisplay, (Drawable) top->window,
+		                                 DefaultVisual(Xdisplay, Xscreenno), Xcolormap);
+		Draw draw(top->window, gc, xftdraw, invalid);
+		UpdateArea(draw, draw.GetClip());
+		XftDrawDestroy(xftdraw);
+		XFreeGC(Xdisplay, gc);
+		if(caret)
+			XorCaret();
+	}
+}
+
+void  Ctrl::WndScrollView(const Rect& r, int dx, int dy)
+{
+	if(r.IsEmpty() || !GetWindow()) return;
+	bool caret = false;
+	if(WndCaretCtrl == this && WndCaretVisible && r.Intersects(WndCaretRect)) {
+		caret = true;
+		XorCaret();
+	}
+	int cx = r.Width() - abs(dx);
+	int cy = r.Height() - abs(dy);
+	GC gc = XCreateGC(Xdisplay, GetWindow(), 0, 0);
+	XCopyArea(Xdisplay, GetWindow(), GetWindow(), gc,
+	          r.left + max(-dx, 0), r.top + max(-dy, 0), cx, cy,
+	          r.left + max(dx, 0), r.top + max(dy, 0));
+	XFreeGC(Xdisplay, gc);
+	XWindow *xw = GetXWindow();
+	Vector<Rect> ur;
+	if(xw)
+		for(int i = 0; i < xw->invalid.GetCount(); i++)
+			if(xw->invalid[i].Intersects(r))
+				ur.Add(xw->invalid[i]);
+	for(int i = 0; i < ur.GetCount(); i++)
+		Invalidate(*xw, ur[i].Offseted(dx, dy));
+	if(caret)
+		XorCaret();
+}
+
+bool Ctrl::IsWaitingEvent()
+{
+	return XPending(Xdisplay);
+}
+
+Ctrl *Ctrl::CtrlFromWindow(Window w)
+{
+	int q = Xwindow().Find(w);
+	return q >= 0 ? Xwindow()[q].ctrl : NULL;
+}
+
+Ctrl::XWindow *Ctrl::GetXWindow()
+{
+	if(!top) return NULL;
+	int q = Xwindow().Find(top->window);
+	return q >= 0 ? &Xwindow()[q] : NULL;
+}
+// 01/12/2007 - mdelfede
+// added support for windowed controls
+
+// Gets handle of window containing control
+Window Ctrl::GetParentWindow(void) const
+{
+	Ctrl const *q = GetParentWindowCtrl();
+	if(q)
+		return q->top->window;
+	else
+		return 0;
+
+} // END Ctrl::GetParentWindow()
+
+// Get control with parentwindow as handle
+Ctrl *Ctrl::GetParentWindowCtrl(void) const
+{
+	Ctrl *q = parent;
+	while(q && !q->top)
+		q = q->parent;
+	return q;
+
+} // END Ctrl::GetParentWindowCtrl()
+
+// Gets the rect inside the parent window
+Rect Ctrl::GetRectInParentWindow(void) const
+{
+	Rect r = GetRect();
+	Ctrl *q = parent;
+	while(q)
+  	{
+		if(q->top)
+			break;
+		r += q->GetRect().TopLeft() + q->GetView().TopLeft();
+		q = q->parent;
+	}
+	if(q)
+		r += q->GetView().TopLeft();
+	return r;
+
+}
+// 01/12/2007 - END
+
+bool Ctrl::HookProc(XEvent *event) { return false; }
+
+void DnDRequest(XSelectionRequestEvent *se);
+void DnDClear();
+
+void Ctrl::ProcessEvent(XEvent *event)
+{
+	if(xim && XFilterEvent(event, None))
+		return;
+	ArrayMap<Window, Ctrl::XWindow>& xmap = Xwindow();
+	for(int i = 0; i < xmap.GetCount(); i++)
+		if(xmap[i].ctrl && xmap[i].ctrl->HookProc(event))
+			return;
+	FocusSync();
+	if(event->type == PropertyNotify &&
+	   (event->xproperty.atom == XAtom("_QT_SETTINGS_TIMESTAMP_") ||
+	    event->xproperty.atom == XAtom("_KDE_NET_USER_TIME"))) {
+		LLOG("Property notify " << XAtomName(event->xproperty.atom)
+		     << " " << (void *)event->xany.window);
+		for(int i = 0; i < Xwindow().GetCount(); i++) {
+			if(Xwindow().GetKey(i)) {
+				Ctrl *q = Xwindow()[i].ctrl;
+				if(q) q->Refresh();
+			}
+		}
+	}
+	if(event->type == SelectionRequest &&
+	   event->xselectionrequest.owner == xclipboard().win) {
+		if(event->xselectionrequest.selection == XAtom("XdndSelection"))
+			DnDRequest(&event->xselectionrequest);
+		else
+			xclipboard().Request(&event->xselectionrequest);
+		return;
+	}
+	if(event->type == SelectionClear &&
+	   event->xselectionclear.window == xclipboard().win) {
+		if(event->xselectionclear.selection == XAtom("PRIMARY")) {
+			sel_formats.Clear();
+			sel_ctrl = NULL;
+		}
+		if(event->xselectionclear.selection == XAtom("CLIPBOARD"))
+			xclipboard().Clear();
+		if(event->xselectionrequest.selection == XAtom("XdndSelection"))
+			DnDClear();
+	   	return;
+	}
+	int q = xmap.Find(event->xany.window);
+#ifdef _DEBUG
+	bool eo = false;
+	if(LogMessages && event->type != NoExpose && event->type != PropertyNotify
+	               && event->type != MotionNotify)
+		for(XEventMap *m = sXevent; m->ID; m++)
+			if(m->ID == event->type) {
+				int t = GetTickCount() - s_starttime;
+				VppLog() << Format("%d.%03d", t / 1000, t % 1000);
+				VppLog() << " EVENT " << Format("%-20.20s", m->name);
+				VppLog() << "[window: " << event->xany.window << "] ";
+				if(q >= 0)
+					VppLog() << '<' << UPP::Name(Xwindow()[q].ctrl) << '>';
+				else
+					VppLog() << "<unknown ctrl> ";
+				if(event->type == ClientMessage)
+					VppLog() << ": " << XAtomName(event->xclient.message_type);
+				VppLog() << '\n';
+				eo = true;
+				break;
+			}
+#endif
+	DropStatusEvent(event);
+	if(q < 0) {
+		if(event->type == ButtonRelease && popupWnd)
+			popupWnd->SetFocus();
+		return;
+	}
+	XWindow& w = xmap[q];
+	if(w.ctrl) {
+		w.ctrl->EventProc(w, event);
+		if(w.ctrl)
+			w.ctrl->SyncMoves();
+	}
+	else
+		xmap.SetKey(q, None);
+	DefferedFocusSync();
+#ifdef _DEBUG
+#ifdef UPP_HEAP
+	if(MemoryCheck)
+		UPP::MemoryCheck();
+#endif
+	if(eo)
+		LLOG("------ end of event processing ----------");
+#endif
+}
+
+void Ctrl::TimerAndPaint() {
+	LTIMING("TimerAndPaint");
+	TimerProc(GetTickCount());
+	for(int i = 0; i < Xwindow().GetCount(); i++) {
+		XWindow& xw = Xwindow()[i];
+		if(Xwindow().GetKey(i) && xw.exposed && xw.invalid.GetCount()) {
+			if(xw.ctrl) {
+				LLOG("..and paint " << UPP::Name(xw.ctrl));
+				FocusSync();
+				xw.ctrl->SyncScroll();
+				Vector<Rect> x = xw.invalid;
+				xw.invalid.Clear();
+				xw.ctrl->DoPaint(x);
+			}
+			else
+				Xwindow().SetKey(i, None);
+		}
+	}
+	SyncCaret();
+	AnimateCaret();
+}
+
+bool Ctrl::ProcessEvent(bool *)
+{
+	if(!IsWaitingEvent()) return false;
+	XEvent event;
+	XNextEvent(Xdisplay, &event);
+	ProcessEvent(&event);
+	return true;
+}
+
+void SweepMkImageCache();
+
+bool Ctrl::ProcessEvents(bool *)
+{
+	if(ProcessEvent()) {
+		while(ProcessEvent() && (!LoopCtrl || LoopCtrl->InLoop())); // LoopCtrl-MF 071008
+		TimerAndPaint();
+		SweepMkImageCache();
+		return true;
+	}
+	TimerAndPaint();
+	SweepMkImageCache();
+	return false;
+}
+
+void Ctrl::GuiSleep(int ms)
+{
+	fd_set fdset;
+	FD_ZERO(&fdset);
+	FD_SET(Xconnection, &fdset);
+	timeval timeout;
+	timeout.tv_sec = ms / 1000;
+	timeout.tv_usec = ms % 1000 * 1000;
+	XFlush(Xdisplay);
+	select(Xconnection + 1, &fdset, NULL, NULL, &timeout);
+}
+
+static int granularity = 10;
+
+void Ctrl::SetTimerGranularity(int ms)
+{
+	granularity = ms;
+}
+
+void Ctrl::EventLoop(Ctrl *ctrl)
+{
+	ASSERT(LoopLevel == 0 || ctrl);
+	LoopLevel++;
+	LLOG("Entering event loop at level " << LoopLevel << BeginIndent);
+	Ctrl *ploop;
+	if(ctrl) {
+		ploop = LoopCtrl;
+		LoopCtrl = ctrl;
+		ctrl->inloop = true;
+	}
+
+	while(ctrl ? ctrl->InLoop() && ctrl->IsOpen() : GetTopCtrls().GetCount()) {
+		XEvent event;
+		fd_set fdset;
+		FD_ZERO(&fdset);
+		FD_SET(Xconnection, &fdset);
+		timeval timeout;
+		timeout.tv_sec = 0;
+		timeout.tv_usec = 1000 * granularity;
+		XFlush(Xdisplay);
+		select(Xconnection + 1, &fdset, NULL, NULL, &timeout);
+//		GuiSleep()(granularity);
+		SyncMousePos();
+		while(IsWaitingEvent()) {
+			LTIMING("XNextEvent");
+			XNextEvent(Xdisplay, &event);
+			ProcessEvent(&event);
+		}
+		TimerAndPaint();
+	}
+
+	if(ctrl)
+		LoopCtrl = ploop;
+
+	LoopLevel--;
+	LLOG(EndIndent << "Leaving event loop ");
+}
+
+void Ctrl::SyncExpose()
+{
+	if(!top) return;
+	XEvent event;
+	while(XCheckTypedWindowEvent(Xdisplay, top->window, Expose, &event))
+		ProcessEvent(&event);
+	while(XCheckTypedWindowEvent(Xdisplay, top->window, GraphicsExpose, &event))
+		ProcessEvent(&event);
+}
+
+void Ctrl::Create(Ctrl *owner, bool redirect, bool savebits)
+{
+	LLOG("Create " << Name() << " " << GetRect());
+	ASSERT(!IsChild() && !IsOpen());
+	LLOG("Ungrab1");
+	ReleaseGrab();
+	XSetWindowAttributes swa;
+	swa.bit_gravity = ForgetGravity;
+	swa.background_pixmap = None;
+	swa.override_redirect = redirect;
+	swa.save_under = savebits;
+	Color c = SColorPaper();
+	swa.background_pixel = GetXPixel(c.GetR(), c.GetG(), c.GetB());
+	Rect r = GetRect();
+	isopen = true;
+	Window w = XCreateWindow(Xdisplay, RootWindow(Xdisplay, Xscreenno),
+	                         r.left, r.top, r.Width(), r.Height(),
+	                         0, CopyFromParent, InputOutput, CopyFromParent,
+	                         CWBitGravity|CWSaveUnder|CWOverrideRedirect|
+	                         (IsCompositedGui() ? CWBackPixel : CWBackPixmap),
+	                         &swa);
+	if(!w) XError("XCreateWindow failed !");
+	int i = Xwindow().Find(None);
+	if(i >= 0) Xwindow().SetKey(i, w);
+	XWindow& cw = i >= 0 ? Xwindow()[i] : Xwindow().Add(w);
+	cw.ctrl = this;
+	cw.exposed = false;
+	cw.owner = owner;
+	cw.xic = xim ? XCreateIC(xim,
+	                         XNInputStyle, XIMPreeditNothing|XIMStatusNothing,
+	                         XNClientWindow, w,
+	                         XNFocusWindow, w,
+	                         NULL)
+	             : NULL;
+	top = new Top;
+	top->window = w;
+	long im_event_mask = 0;
+	if(cw.xic)
+		XGetICValues(cw.xic, XNFilterEvents, &im_event_mask, NULL);
+	XSelectInput(Xdisplay, w, ExposureMask|StructureNotifyMask|KeyPressMask|
+	             FocusChangeMask|KeyPressMask|KeyReleaseMask|PointerMotionMask|
+	             ButtonPressMask|ButtonReleaseMask|PropertyChangeMask|
+	             VisibilityChangeMask|im_event_mask);
+	int version = 5;
+	XChangeProperty(Xdisplay, w, XAtom("XdndAware"), XA_ATOM, 32,
+					0, (byte *)&version, 1);
+	CancelMode();
+}
+
+void Ctrl::WndDestroy()
+{
+	LLOG("WndDestroy " << Name());
+	if(!top || !isopen) return;
+	AddGlobalRepaint();
+	bool revertfocus = HasWndFocus();
+	for(int i = 0; i < Xwindow().GetCount(); i++) {
+		LOGBEGIN();
+		XWindow& w = Xwindow()[i];
+		if(Xwindow().GetKey(i) != None && w.owner == this && w.ctrl->IsOpen())
+			w.ctrl->WndDestroy();
+		LOGEND();
+	}
+	Ptr<Ctrl> owner;
+	int i = Xwindow().Find(top->window);
+	if(i >= 0) {
+		XWindow& w = Xwindow()[i];
+		owner = w.owner;
+		w.invalid.Clear();
+		if(w.xic)
+			XDestroyIC(w.xic);
+	}
+	isopen = false;
+	if(focusWindow == top->window)
+		focusWindow = None;
+	if(grabWindow == top->window)
+		grabWindow = None;
+	XDestroyWindow(Xdisplay, top->window);
+	if(i >= 0) {
+		Xwindow().SetKey(i, None);
+		top->window = None;
+		Xwindow()[i].ctrl = NULL;
+	}
+	if(revertfocus && owner)
+		owner->TakeFocus();
+	delete top;
+	top = NULL;
+}
+
+Vector<Ctrl *> Ctrl::GetTopCtrls()
+{
+	Vector<Ctrl *> v;
+	const ArrayMap<Window, Ctrl::XWindow>& w = Xwindow();
+	for(int i = 0; i < w.GetCount(); i++)
+		if(w.GetKey(i) && w[i].ctrl && !w[i].ctrl->parent)
+			v.Add(w[i].ctrl);
+	return v;
+}
+
+void Ctrl::StartPopupGrab()
+{
+	if(PopupGrab == 0) {
+		if(!top) return;
+		if(XGrabPointer(
+		   Xdisplay, top->window, true,
+		   ButtonPressMask|ButtonReleaseMask|PointerMotionMask|EnterWindowMask|LeaveWindowMask,
+		   GrabModeAsync, GrabModeAsync, None, None, CurrentTime) == GrabSuccess) {
+				PopupGrab++;
+				popupWnd = GetTopWindow();
+			}
+	}
+}
+
+void Ctrl::EndPopupGrab()
+{
+	if(PopupGrab == 0) return;
+	if(--PopupGrab == 0) {
+		XUngrabPointer(Xdisplay, CurrentTime);
+		XFlush(Xdisplay);
+	}
+}
+
+void Ctrl::PopUp(Ctrl *owner, bool savebits, bool activate, bool, bool)
+{
+	LLOG("POPUP: " << UPP::Name(this));
+	Ctrl *q = owner ? owner->GetTopCtrl() : GetActiveCtrl();
+	ignoretakefocus = true;
+	Create(q, true, savebits);
+	if(activate) {
+		q->StartPopupGrab();
+		popupgrab = true;
+	}
+	if(top) popup = true;
+	WndShow(visible);
+	if(activate && IsEnabled())
+		SetFocus();
+	if(top) top->owner = owner;
+	StateH(OPEN);
+}
+
+Ctrl *Ctrl::GetActiveCtrl()
+{
+	return focusCtrl ? focusCtrl->GetTopCtrl() : NULL;
+}
+
+bool  Ctrl::IsAlphaSupported() { return false; }
+void  Ctrl::SetAlpha(byte alpha) {}
+
+bool Ctrl::IsCompositedGui()
+{
+	static bool b = XGetSelectionOwner(Xdisplay, XAtom(String().Cat() << "_NET_WM_CM_S" << Xscreenno)) != None;
+	return b;
+}
+
+Ctrl *Ctrl::GetOwner()
+{
+	if(!IsOpen()) return NULL;
+	int q = Xwindow().Find(GetWindow());
+	return q >= 0 ? Xwindow()[q].owner : NULL;
+}
+
+void Ctrl::WndShow(bool b)
+{
+	LLOG("WndShow " << b);
+	if(top) {
+		XWindowAttributes xwa;
+		XGetWindowAttributes(Xdisplay, top->window, &xwa);
+		bool v = xwa.map_state == IsViewable;
+		if(b == v) return;
+		if(b)
+			XMapWindow(Xdisplay, top->window);
+		else
+			XUnmapWindow(Xdisplay, top->window);
+		visible = b;
+		StateH(SHOW);
+	}
+}
+
+void Ctrl::WndUpdate()
+{
+	LTIMING("WndUpdate");
+	LLOG("WNDUPDATE");
+	if(!top) return;
+	SyncExpose();
+	XWindow& xw = Xwindow().Get(top->window);
+	if(xw.exposed && xw.invalid.GetCount()) {
+		SyncScroll();
+		DoPaint(xw.invalid);
+		xw.invalid.Clear();
+		LTIMING("WndUpdate XSync");
+		XSync(Xdisplay, false);
+	}
+}
+
+void Ctrl::WndUpdate(const Rect& r)
+{
+	LTIMING("WndUpdate Rect");
+	LLOG("WNDUPDATE " << r);
+	if(!top) return;
+	SyncExpose();
+	XWindow& xw = Xwindow().Get(top->window);
+	bool dummy;
+	SyncScroll();
+	DoPaint(Intersect(xw.invalid, r, dummy));
+	LTIMING("WndUpdate XSync");
+	XSync(Xdisplay, false);
+	xw.invalid = Subtract(xw.invalid, r, dummy);
+}
+
+void Ctrl::WndSetPos(const Rect& r)
+{
+	if(!top) return;
+	LLOG("WndSetPos " << Name() << r);
+	AddGlobalRepaint();
+	XMoveResizeWindow(Xdisplay, top->window, r.left, r.top, r.Width(), r.Height());
+	rect = r;
+	SetWndRect(r);
+}
+
+bool Ctrl::IsWndOpen() const
+{
+	return top;
+}
+
+bool Ctrl::SetWndCapture()
+{
+	if(!IsEnabled() || !top || !IsVisible()) return false;
+	if(top->window == grabWindow) return true;
+	int status = XGrabPointer(
+		Xdisplay, top->window, false,
+		ButtonPressMask|ButtonReleaseMask|PointerMotionMask|EnterWindowMask|LeaveWindowMask,
+		GrabModeAsync, GrabModeAsync, None, None, CurrentTime
+	);
+	if(status) return false;
+	LLOG("Capture set ok");
+	grabWindow = top->window;
+	return true;
+}
+
+bool Ctrl::HasWndCapture() const
+{
+	return top && top->window == grabWindow;
+}
+
+void Ctrl::ReleaseGrab()
+{
+	if(grabWindow) {
+		LLOG("RELEASE GRAB");
+		XUngrabPointer(Xdisplay, CurrentTime);
+		XFlush(Xdisplay);
+		grabWindow = None;
+	}
+}
+
+bool Ctrl::ReleaseWndCapture()
+{
+	LLOG("Releasing capture");
+	if(top && top->window == grabWindow) {
+		LLOG("Ungrab3");
+		ReleaseGrab();
+		return true;
+	}
+	return false;
+}
+
+/*
+void Ctrl::SetMouseCursor(const Image& image)
+{
+	if(!top) return;
+	Window w = GetWindow();
+	if(IsPopUp()) {
+		Ctrl *tw = GetTopWindow();
+		if(tw)
+			w = tw->GetWindow();
+	}
+	static Image img;
+	static Cursor shc;
+	static Window wnd;
+	if(img.GetSerialId() != image.GetSerialId() || w != wnd) {
+		img = image;
+		Cursor hc = X11Cursor(img);
+		wnd = w;
+		XDefineCursor(Xdisplay, wnd, hc);
+		if(shc)
+			XFreeCursor(Xdisplay, shc);
+		shc = hc;
+		XFlush(Xdisplay);
+	}
+}
+*/
+
+void Ctrl::SetMouseCursor(const Image& image)
+{
+	static Image img;
+	static Cursor shc;
+	if(img.GetSerialId() != image.GetSerialId()) {
+		img = image;
+		Cursor hc = X11Cursor(IsNull(img) ? Image::Arrow() : img);
+		for(int i = 0; i < Xwindow().GetCount(); i++) {
+			Window wnd = Xwindow().GetKey(i);
+			if(wnd)
+				XDefineCursor(Xdisplay, wnd, hc);
+		}
+		if(shc)
+			XFreeCursor(Xdisplay, shc);
+		shc = hc;
+		XFlush(Xdisplay);
+	}
+}
+
+void ClearKbdState_();
+
+void Ctrl::TakeFocus()
+{
+	if(IsChild()) {
+		Ctrl *w = GetTopCtrl();
+		if(w) w->TakeFocus();
+		return;
+	}
+	XWindow *w = GetXWindow();
+	if(!w)
+		return;
+	if(ignoretakefocus) {
+		LLOG("IGNORED TAKE_FOCUS (caused by CreateWindow)");
+		if(focusWindow != top->window && focusWindow != None)
+			XSetInputFocus(Xdisplay, focusWindow, RevertToParent, CurrentTime);
+		return;
+	}
+	if(w->owner) {
+		LLOG("IGNORED TAKE_FOCUS (window is owned)");
+		return;
+	}
+	LLOG("TAKE_FOCUS " << Name());
+	ClearKbdState_();
+	if(IsEnabled() && IsVisible() && top->window != GetXServerFocusWindow())
+		SetWndFocus();
+	if(this != focusCtrlWnd) {
+		if(IsEnabled()) {
+			SetLastActive(w, this);
+			LLOG("Activate " << Name());
+			SetFocusWnd();
+		}
+		else {
+			LLOG("Activate of disabled window" << Name());
+			if(w->last_active && w->last_active->IsOpen() && w->last_active->IsEnabled() &&
+			   w->last_active != this) {
+				LLOG("    activating last active: " << UPP::Name(w->last_active));
+				w->last_active->TakeFocus();
+			}
+		}
+	}
+
+	return;
+}
+
+void Ctrl::KillFocus(Window window)
+{
+	if(!window)
+		return;
+	int q = Xwindow().Find(window);
+	if(q < 0)
+		return;
+	XWindow& w = Xwindow()[q];
+	if(w.ctrl)
+		w.ctrl->KillFocusWnd();
+}
+
+bool Ctrl::SetWndFocus()
+{
+	LLOG("SetWndFocus " << Name());
+	if(top && top->window != focusWindow && IsEnabled() && IsVisible()) {
+		LLOG("Setting focus... ");
+		LTIMING("XSetInfputFocus");
+		KillFocus(focusWindow);
+		XSetInputFocus(Xdisplay, top->window, RevertToParent, CurrentTime);
+		focusWindow = top->window;
+		SetFocusWnd();
+		return true;
+	}
+	return false;
+}
+
+bool Ctrl::HasWndFocus() const
+{
+	return top && top->window == focusWindow;
+}
+
+Window Ctrl::GetXServerFocusWindow()
+{
+	Window w;
+	int    dummy;
+	XGetInputFocus(Xdisplay, &w, &dummy);
+	return w;
+}
+
+void Ctrl::FocusSync()
+{
+	Window fw = GetXServerFocusWindow();
+	if(fw != focusWindow) {
+		LLOG("FocusSync to " << FormatIntHex(fw));
+		if(fw) {
+			int q = Xwindow().Find(fw);
+			if(q >= 0) {
+				LLOG("Focus to app window");
+				focusWindow = fw;
+				XWindow& w = Xwindow()[q];
+				if(w.ctrl) {
+					if(w.ctrl->IsPopUp()) {
+						AnimateCaret();
+						return;
+					}
+					KillFocus(focusWindow);
+					focusWindow = None;
+					w.ctrl->SetFocusWnd();
+					AnimateCaret();
+					return;
+				}
+			}
+		}
+		KillFocus(focusWindow);
+		focusWindow = None;
+		AnimateCaret();
+	}
+}
+
+void  Ctrl::XorCaret()
+{
+	if(WndCaretCtrl && WndCaretCtrl->top && WndCaretCtrl->top->window) {
+		LTIMING("XorCaret");
+//		DLOG("XorCaret " << WndCaretRect << ", ctrl " << UPP::Name(WndCaretCtrl));
+		GC gc = XCreateGC(Xdisplay, WndCaretCtrl->top->window, 0, 0);
+		XSetFunction(Xdisplay, gc, GXinvert);
+		XFillRectangle(Xdisplay, WndCaretCtrl->top->window, gc,
+		               WndCaretRect.left, WndCaretRect.top,
+		               WndCaretRect.Width(), WndCaretRect.Height());
+		XFreeGC(Xdisplay, gc);
+	}
+	else
+		WndCaretCtrl = NULL;
+}
+
+void  Ctrl::AnimateCaret()
+{
+	if(WndCaretCtrl && WndCaretCtrl->top) {
+		int v = !(((GetTickCount() - WndCaretTime) / 500) & 1);
+		if(v != WndCaretVisible) {
+			XorCaret();
+			WndCaretVisible = v;
+		}
+	}
+}
+
+void Ctrl::WndDestroyCaret()
+{
+	LLOG("WndDestroyCaret vis: " << WndCaretVisible << ", ctrl: " << UPP::Name(WndCaretCtrl));
+	if(WndCaretVisible)
+		XorCaret();
+	WndCaretCtrl = NULL;
+}
+
+void Ctrl::WndCreateCaret(const Rect& cr)
+{
+	LLOG("WndCreateCaret " << cr);
+	WndDestroyCaret();
+	WndCaretCtrl = this;
+	WndCaretRect = cr - GetRect().TopLeft();
+	WndCaretVisible = true;
+	WndCaretTime = GetTickCount();
+	XorCaret();
+}
+
+void Ctrl::Invalidate(XWindow& xw, const Rect& _r)
+{
+	LTIMING("Invalidate");
+	LLOG("Invalidate " << UPP::Name(xw.ctrl) << " " << _r);
+	Vector<Rect> inv;
+	Rect r = _r;
+	int ra = r.Width() * r.Height();
+	for(int i = 0; i < xw.invalid.GetCount(); i++) {
+		const Rect& ir = xw.invalid[i];
+		Rect ur = r | ir;
+		if(ur.Width() * ur.Height() < 2 * (ir.Width() * ir.Height() + ra))
+			r = ur;
+		else
+		if(!r.Contains(xw.invalid[i]))
+			inv.Add(xw.invalid[i]);
+	}
+	Vector<Rect> rs;
+	rs.Add(r);
+	for(int i = 0; i < inv.GetCount(); i++) {
+		bool ch = false;
+		Vector<Rect> rs1 = Subtract(rs, inv[i], ch);
+		if(ch) rs = rs1;
+	}
+	inv.AppendPick(rs);
+	xw.invalid = inv;
+}
+
+void Ctrl::AddGlobalRepaint()
+{
+	Rect rect = GetRect();
+	rect.Inflate(32, 32);//TODO !!! Not correct !!! should read frame extent instead... - or shift GraphicsExposes /  NoExposes...
+	ArrayMap<Window, Ctrl::XWindow>& w = Xwindow();
+	for(int i = 0; i < w.GetCount(); i++)
+		if(w.GetKey(i) && w[i].ctrl) {
+			const Rect& r = w[i].ctrl->rect;
+			if(rect.Intersects(r))
+				Invalidate(w[i], Rect(rect.Offseted(-r.TopLeft())));
+		}
+}
+
+void Ctrl::WndInvalidateRect(const Rect& r)
+{
+	if(!top) return;
+	LLOG("WndInvalidateRect " << r);
+	Invalidate(Xwindow().Get(top->window), r);
+}
+
+void Ctrl::SetWndForeground()
+{
+	LLOG("SetWndForeground " << Name());
+	if(!top || !IsVisible()) return;
+	if(!IsEnabled()) {
+		LLOG("Not enabled");
+		XWindow *w = GetXWindow();
+		if(w && w->last_active && w->last_active != this &&
+		   w->last_active->IsOpen() && w->last_active->IsEnabled())
+			w->last_active->SetWndForeground();
+	}
+	else {
+		SetWndFocus();
+		XRaiseWindow(Xdisplay, top->window);
+	}
+}
+
+bool Ctrl::IsWndForeground() const
+{
+	const Ctrl *q = GetTopWindow();
+	return ~focusCtrlWnd == (q ? q : GetTopCtrl());
+}
+
+bool Ctrl::WndEnable(bool b)
+{
+	LLOG("WndEnable");
+	if(!top) return false;
+	if(!b) {
+		ReleaseCapture();
+		if(HasWndFocus())
+			XSetInputFocus(Xdisplay, None, RevertToPointerRoot, CurrentTime);
+	}
+	return true;
+}
+
+// 01/12/2007 - mdelfede
+// added support for windowed controls
+Ctrl::XWindow *Ctrl::AddXWindow(Window &w)
+{
+	int i = Xwindow().Find(None);
+	if(i >= 0)
+		Xwindow().SetKey(i, w);
+	XWindow& cw = i >= 0 ? Xwindow()[i] : Xwindow().Add(w);
+	cw.ctrl    = this;
+	cw.exposed = true;
+	cw.owner   = GetParent();
+	cw.xic     = NULL;
+	return &cw;
+}
+
+void Ctrl::RemoveXWindow(Window &w)
+{
+	int i = Xwindow().Find(w);
+	if(i >= 0) {
+		Xwindow().SetKey(i, None);
+		Xwindow()[i].ctrl = NULL;
+	}
+
+}
+Ctrl::XWindow *Ctrl::XWindowFromWindow(Window &w)
+{
+	int i = Xwindow().Find(w);
+	if(i >= 0)
+		return &Xwindow()[i];
+	else
+		return NULL;
+}
+
+// Synchronizes the native windows inside ctrls
+void Ctrl::SyncNativeWindows(void)
+{
+	ArrayMap<Window, Ctrl::XWindow>& xwindows = Xwindow();
+	for(int i = 0; i < xwindows.GetCount(); i++)
+	{
+		XWindow &xw = xwindows[i];
+		Window w = xwindows.GetKey(i);
+		if(xw.ctrl && xw.ctrl->parent && w)
+		{
+			Window dummy;
+			int x, y;
+			unsigned int width, height, border, depth;
+			XGetGeometry(Xdisplay, w, &dummy, &x, &y, &width, &height, &border, &depth);
+			Rect r = xw.ctrl->GetRectInParentWindow();
+			if( (x != r.left || y != r.top) && ((int)width == r.Width() && (int)height == r.Height()))
+				XMoveWindow(Xdisplay, w, r.left, r.top);
+			else if( (x == r.left || y == r.top) && ((int)width != r.Width() || (int)height != r.Height()))
+				XResizeWindow(Xdisplay, w, r.Width(), r.Height());
+			else if( x != r.left || y != r.top || (int)width != r.Width() || (int)height != r.Height())
+				XMoveResizeWindow(Xdisplay, w, r.left, r.top, r.Width(), r.Height());
+		}
+	}
+
+} // END Ctrl::SyncNativeWindows()
+
+// 01/12/2007 - END
+
+ViewDraw::ViewDraw(Ctrl *ctrl)
+{
+	Ctrl *top = ctrl->GetTopCtrl();
+	Rect r = ctrl->GetScreenView() - top->GetScreenRect().TopLeft();
+	Vector<Rect> clip;
+	clip.Add(r);
+	caret = Ctrl::WndCaretCtrl == ctrl && Ctrl::WndCaretVisible &&
+	        r.Intersects(Ctrl::WndCaretRect);
+	if(caret)
+		Ctrl::XorCaret();
+	dw = top->GetWindow();
+	gc = XCreateGC(Xdisplay, dw, 0, 0);
+#ifdef PLATFORM_XFT
+	xftdraw = XftDrawCreate(Xdisplay, (Drawable) dw,
+	                        DefaultVisual(Xdisplay, Xscreenno), Xcolormap);
+#endif
+	Init(clip, r.TopLeft());
+}
+
+ViewDraw::~ViewDraw()
+{
+	XFreeGC(Xdisplay, gc);
+	if(caret)
+		Ctrl::XorCaret();
+}
+
+#endif
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/CtrlCore/init b/uppsrc/CtrlCore/init
new file mode 100644
index 000000000..ec3aebdf4
--- /dev/null
+++ b/uppsrc/CtrlCore/init
@@ -0,0 +1,6 @@
+#ifndef _CtrlCore_icpp_init_stub
+#define _CtrlCore_icpp_init_stub
+#include "Draw/init"
+#include "plugin\bmp/init"
+#include "CtrlCore.icpp"
+#endif
diff --git a/uppsrc/CtrlCore/lay.h b/uppsrc/CtrlCore/lay.h
new file mode 100644
index 000000000..c771144f2
--- /dev/null
+++ b/uppsrc/CtrlCore/lay.h
@@ -0,0 +1,43 @@
+//#BLITZ_APPROVE
+
+#define LAYOUT(name, x, y)       struct name##__layid {};
+#define UNTYPED(variable, param)
+#define ITEM(classname, var, param)
+#define END_LAYOUT
+
+#include LAYOUTFILE
+
+#undef  LAYOUT
+#undef  UNTYPED
+#undef  ITEM
+#undef  END_LAYOUT
+
+#define LAYOUT(name, x, y)       template<class T> \
+	                             struct With##name : public T, public name##__layid { \
+										static UPP::Size GetLayoutSize() { return UPP::Ctrl::LayoutZoom(x, y); }
+#define UNTYPED(variable, param)
+#define ITEM(classname, var, param)     classname var;
+#define END_LAYOUT               };
+
+#include LAYOUTFILE
+
+#undef  LAYOUT
+#undef  UNTYPED
+#undef  ITEM
+#undef  END_LAYOUT
+
+#define LAYOUT(nm, x, y)       template <class L, class D> \
+                               void InitLayout(UPP::Ctrl& parent, L& layout, D& uts, nm##__layid&) { \
+                                  parent.LayoutId(#nm);
+#define UNTYPED(var, param)       uts.var.param; uts.var.LayoutId(#var); parent.Add(uts.var);
+#define ITEM(clss, var, param)    layout.var.param; layout.var.LayoutId(#var); parent.Add(layout.var);
+#define END_LAYOUT             };
+
+#include LAYOUTFILE
+
+#undef  LAYOUT
+#undef  UNTYPED
+#undef  ITEM
+#undef  END_LAYOUT
+
+#undef  LAYOUTFILE
diff --git a/uppsrc/CtrlCore/llay.h b/uppsrc/CtrlCore/llay.h
new file mode 100644
index 000000000..07e045fea
--- /dev/null
+++ b/uppsrc/CtrlCore/llay.h
@@ -0,0 +1,3 @@
+#include <Core/lt_.h>
+#include <CtrlCore/lay.h>
+#include <Core/t_.h>
diff --git a/uppsrc/CtrlCore/prj.aux b/uppsrc/CtrlCore/prj.aux
new file mode 100644
index 000000000..6fe7daf4f
--- /dev/null
+++ b/uppsrc/CtrlCore/prj.aux
@@ -0,0 +1,10 @@
+file
+	"D:\\Program Files\\Microsoft Visual Studio\\Vc98\\Mfc\\Src\\Thrdcore.cpp",
+	"D:\\Program Files\\Microsoft Visual Studio\\Vc98\\Mfc\\Src\\Afxtls.cpp",
+	"D:\\Program Files\\Microsoft Visual Studio\\Vc98\\Mfc\\Src\\Winmain.cpp",
+	"D:\\Program Files\\Microsoft Visual Studio\\Vc98\\Mfc\\Src\\Cmdtarg.cpp",
+	"D:\\Program Files\\Microsoft Visual Studio\\Vc98\\Mfc\\Src\\Appui.cpp",
+	"D:\\Program Files\\Microsoft Visual Studio\\Vc98\\Mfc\\Src\\Appcore.cpp",
+	"D:\\Program Files\\Microsoft Visual Studio\\Vc98\\Mfc\\Src\\Wincore.cpp",
+	F:\Source\repository,
+	F:\Source\Qlib.txt;
diff --git a/uppsrc/CtrlCore/src.tpp/Ctrl$en-us.tpp b/uppsrc/CtrlCore/src.tpp/Ctrl$en-us.tpp
new file mode 100644
index 000000000..e9bf50b3f
--- /dev/null
+++ b/uppsrc/CtrlCore/src.tpp/Ctrl$en-us.tpp
@@ -0,0 +1,74 @@
+TITLE("Ctrl")
+COMPRESSED
+120,156,237,125,11,123,211,72,178,232,95,209,153,217,179,227,176,78,198,118,158,192,236,126,27,66,24,242,77,72,114,72,50,236,89,46,140,101,171,29,235,32,75,30,73,78,8,203,238,111,191,245,232,110,181,164,150,45,63,2,129,97,31,36,145,212,175,170,234,234,170,234,122,188,238,56,127,250,83,171,217,250,190,53,227,63,143,158,138,129,59,9,210,55,175,131,206,222,222,99,191,221,238,180,30,187,237,221,199,167,15,31,255,231,63,255,217,104,111,181,246,30,99,103,109,232,172,221,218,218,108,119,218,240,172,181,213,217,109,111,63,108,61,220,222,107,239,181,54,119,183,58,219,187,173,237,71,99,55,118,71,111,94,187,123,155,143,31,188,220,129,86,157,230,246,247,155,237,205,118,171,189,211,217,130,175,90,155,173,206,86,187,179,221,222,219,219,106,239,110,239,109,62,220,217,121,212,119,199,169,31,133,111,94,247,176,221,22,52,219,132,102,173,221,189,157,173,54,52,218,218,238,108,238,110,111,65,227,173,45,152,222,38,12,188,187,179,187,251,40,245,211,64,188,121,237,
+227,188,97,182,7,56,203,173,230,206,247,48,187,206,46,180,220,234,108,237,108,109,238,117,54,219,123,157,206,206,195,205,173,135,91,48,237,118,231,145,159,10,152,100,111,171,243,216,133,255,99,179,109,24,111,107,123,171,189,9,16,217,218,221,222,132,207,118,225,231,86,235,97,187,3,131,238,181,182,183,97,60,241,94,129,169,7,0,66,32,97,219,29,24,178,179,187,141,45,246,182,246,218,155,187,123,157,173,206,78,7,38,209,218,133,133,226,12,182,31,121,34,233,67,219,205,78,251,113,10,211,122,124,240,247,237,199,109,104,188,219,220,253,190,211,122,216,234,236,236,62,132,65,97,194,176,230,205,135,15,219,155,123,48,232,86,123,187,213,222,124,212,143,60,88,103,175,179,221,218,164,17,247,0,21,59,208,51,129,101,123,167,13,147,238,108,238,193,144,187,237,205,77,248,119,123,107,111,247,81,34,16,25,105,20,191,121,253,224,239,141,214,70,107,163,179,189,189,134,205,31,66,243,189,205,173,205,205,173,157,135,91,237,214,38,12,3,125,108,33,204,118,90,128,206,246,
+118,103,239,81,207,77,96,204,20,30,237,50,100,219,72,77,0,251,205,189,237,77,24,122,7,254,1,188,194,2,55,1,62,157,135,91,123,155,155,123,173,71,253,192,77,18,9,36,4,208,3,92,100,187,221,108,183,191,223,69,216,110,111,118,182,30,34,112,54,59,0,228,206,206,246,195,54,64,121,123,103,171,213,121,20,139,223,39,126,44,70,34,4,48,251,64,30,143,21,138,36,45,194,100,152,20,59,205,118,7,136,113,123,103,167,133,240,218,6,130,232,108,110,3,192,91,237,189,45,152,17,252,23,208,156,74,106,236,101,107,216,108,182,55,191,127,216,217,218,132,153,60,220,218,2,8,64,7,237,135,237,118,187,181,7,255,133,149,1,92,136,62,218,146,176,228,240,220,124,171,217,222,250,126,23,200,24,48,245,112,11,135,127,184,137,240,235,0,248,59,59,173,109,192,67,135,155,119,16,234,157,63,1,220,219,157,61,252,63,65,190,189,221,108,195,126,128,41,182,183,183,97,221,155,0,234,206,30,172,125,27,96,191,73,36,222,222,221,123,116,34,110,146,167,110,42,
+36,193,60,56,248,19,83,90,123,167,217,222,249,190,133,237,183,247,30,2,2,219,91,8,191,205,173,173,135,157,135,155,155,219,157,135,219,155,59,45,128,99,194,27,26,27,227,150,162,237,168,59,217,109,182,119,97,115,193,90,183,183,97,245,212,12,86,190,219,198,169,116,246,30,238,32,20,100,39,221,245,192,15,113,30,64,25,143,153,24,30,28,252,165,221,222,197,142,246,96,211,236,237,237,180,54,31,2,48,0,6,173,109,160,116,96,8,123,128,104,192,115,7,182,1,114,132,254,59,247,74,116,215,229,110,165,41,32,5,110,111,110,239,33,221,66,75,152,58,76,2,250,121,216,106,237,192,147,189,61,216,77,143,174,220,113,142,0,59,173,102,167,5,84,4,252,103,27,54,37,140,5,228,215,122,136,188,4,56,3,96,0,88,209,195,109,166,192,238,122,40,146,84,120,128,252,237,22,45,187,211,110,118,218,0,59,160,191,237,237,189,173,173,29,152,47,140,189,139,172,9,81,8,27,120,123,119,243,209,153,27,35,237,109,1,226,59,219,143,223,253,2,168,135,221,179,
+179,69,232,235,116,236,91,160,147,109,129,221,150,228,46,149,125,108,206,236,35,219,70,255,250,237,223,255,125,120,178,126,121,238,188,78,58,143,157,215,255,221,106,173,183,90,206,65,26,7,111,254,252,6,158,117,30,255,242,168,11,255,197,39,248,147,218,61,82,31,102,219,222,145,29,202,14,126,83,191,253,93,118,166,95,60,202,94,101,141,199,147,94,224,247,203,173,223,226,144,64,168,238,91,7,255,213,31,52,157,121,59,57,75,197,91,231,12,41,94,190,254,169,106,134,127,251,141,86,222,122,236,228,127,52,158,138,216,191,118,241,28,113,6,113,52,194,222,126,194,150,127,115,220,32,136,110,18,234,198,73,35,167,39,156,113,228,135,64,29,244,215,45,124,25,243,151,249,30,47,134,126,226,164,67,225,32,43,100,0,58,209,192,249,249,242,200,185,241,189,43,145,38,206,208,23,177,27,247,135,183,78,35,29,186,169,3,13,110,224,143,203,238,95,186,127,209,31,185,177,128,41,36,145,19,186,35,24,179,251,29,142,149,116,191,91,219,200,141,247,64,97,237,129,35,194,
+201,72,195,199,57,11,220,62,49,197,131,40,76,82,55,76,19,130,192,206,99,71,63,112,38,9,244,236,135,78,16,93,249,125,55,112,250,81,20,123,126,8,60,36,161,81,218,143,115,100,114,112,120,114,113,248,82,211,201,131,131,191,111,58,252,236,205,250,199,3,24,74,196,48,101,255,42,196,97,109,29,28,31,62,187,200,55,199,39,208,248,88,12,210,233,77,95,30,253,252,188,208,150,30,65,227,151,254,213,112,70,235,139,211,179,124,91,120,0,45,15,127,159,184,132,92,156,134,211,232,137,20,151,128,0,119,6,81,236,92,139,56,45,192,101,205,214,251,147,211,139,139,211,23,249,1,248,153,57,6,77,183,222,32,150,49,206,143,254,121,152,31,1,159,64,255,231,254,7,49,125,241,47,142,78,202,173,229,67,232,224,87,55,152,8,164,65,79,192,196,70,192,184,61,32,12,63,188,114,126,22,233,11,63,196,1,172,221,238,255,195,210,45,63,156,217,173,251,190,170,219,243,139,167,150,181,242,195,89,221,86,237,12,218,133,217,214,224,161,30,29,71,87,125,181,39,
+228,15,218,188,124,6,200,173,155,136,248,90,192,110,76,28,225,195,174,54,240,5,184,27,70,177,255,33,10,83,248,11,132,134,20,247,185,218,74,227,40,241,145,171,200,221,186,41,39,21,192,185,89,216,19,48,11,253,179,1,12,166,219,212,255,172,101,80,112,104,182,106,5,248,157,94,207,3,0,144,27,24,108,180,244,114,202,187,158,126,183,38,97,65,83,100,38,17,79,250,32,9,74,44,241,115,19,43,48,232,250,199,125,69,122,78,122,59,22,27,206,83,133,23,100,106,192,220,34,130,26,201,84,248,38,113,70,194,13,55,156,202,62,161,203,103,126,156,164,206,53,98,186,114,236,30,146,190,232,71,161,103,124,88,31,206,83,64,155,135,131,212,115,96,119,102,240,112,206,145,65,99,43,220,215,200,235,197,104,156,222,58,192,85,211,252,68,240,164,213,231,47,190,246,251,182,67,206,71,209,213,114,200,30,159,255,124,146,77,44,119,244,121,55,192,45,222,58,244,195,210,118,211,241,10,136,181,1,241,119,100,189,114,25,253,104,52,198,51,231,6,200,60,15,245,7,
+63,58,47,69,58,137,67,134,52,180,185,136,97,15,222,12,69,232,8,228,110,165,37,27,75,83,147,232,69,81,144,173,28,164,154,220,66,163,177,32,165,227,191,186,127,205,127,148,95,180,137,203,183,252,129,137,187,98,191,184,192,220,171,181,140,7,16,62,239,16,48,97,148,214,7,142,129,255,50,108,128,175,209,30,43,0,102,250,90,202,83,43,236,211,85,204,106,201,25,21,183,249,146,211,121,178,228,116,42,185,137,185,137,141,121,93,71,190,109,231,181,144,59,228,16,150,17,241,204,45,191,201,39,121,5,79,86,79,137,253,184,121,124,86,146,50,119,56,19,255,243,46,112,177,197,85,44,140,22,52,168,193,245,93,37,1,44,59,255,39,11,205,191,234,176,164,249,39,69,250,169,58,182,236,11,152,155,103,30,37,135,120,234,44,73,245,196,177,252,1,159,102,32,252,208,73,86,56,76,205,31,37,221,17,26,158,69,9,254,198,231,227,35,152,90,25,162,252,174,98,49,14,247,49,83,22,3,78,220,35,193,34,189,137,120,194,215,44,13,134,146,77,7,32,97,44,
+36,129,201,21,200,223,26,37,185,161,89,122,82,144,31,112,250,154,162,240,131,156,144,245,222,16,192,74,47,111,43,136,170,142,4,246,30,48,248,60,19,66,177,239,202,111,111,145,244,148,240,170,191,156,19,48,211,150,93,87,112,234,129,72,200,232,43,19,219,82,210,67,247,175,181,197,7,152,120,38,64,24,171,40,139,16,189,252,171,218,34,68,143,69,8,232,251,11,148,174,190,104,240,104,254,179,128,204,8,59,202,36,98,219,222,90,221,88,183,185,177,202,123,83,189,201,239,211,74,139,207,57,170,31,47,133,155,68,161,98,165,251,241,213,4,207,124,50,65,209,123,231,218,143,83,180,72,128,54,54,140,60,155,6,254,236,244,224,242,60,175,127,211,35,52,242,160,49,236,42,74,127,12,34,56,171,7,81,127,98,53,20,237,31,92,28,253,186,127,81,80,226,213,83,213,207,13,40,213,110,63,69,243,155,176,78,228,233,161,189,163,236,185,217,149,39,166,118,118,254,252,244,85,193,168,0,79,84,7,215,126,226,247,252,192,7,45,174,63,116,195,43,123,31,135,39,
+251,79,142,11,147,225,103,230,68,68,232,246,2,225,253,232,249,9,254,98,237,232,233,209,133,165,43,249,84,117,38,60,63,197,30,72,115,156,36,211,102,118,122,118,120,146,239,12,159,152,179,2,38,16,58,13,63,197,253,54,238,174,7,226,90,4,78,254,109,20,58,73,63,22,34,180,90,185,14,142,79,207,11,19,166,71,230,32,125,160,11,56,174,43,135,225,247,107,27,53,41,250,69,52,73,196,225,181,176,26,47,201,116,58,114,223,9,103,50,38,62,33,240,195,55,142,43,105,30,73,30,31,103,157,192,59,16,208,240,217,51,180,70,152,47,242,187,34,217,112,180,157,137,133,14,182,16,67,143,189,73,154,194,111,216,17,146,27,252,218,243,97,39,248,34,240,146,13,67,128,129,243,20,47,63,30,56,207,240,21,204,51,121,151,216,76,135,151,23,23,167,5,204,241,51,0,235,11,104,68,54,66,57,40,141,82,181,223,138,189,240,51,179,23,57,95,238,37,47,218,201,185,238,211,23,182,121,190,56,189,60,63,180,152,127,179,231,56,18,2,212,33,59,48,16,1,
+54,181,218,13,177,201,139,211,95,139,150,67,245,88,119,52,138,174,161,27,248,39,158,222,215,241,225,190,181,51,122,174,123,11,208,196,92,213,207,193,229,203,243,211,151,71,47,246,127,46,82,120,246,2,233,124,18,39,0,72,127,228,94,9,103,232,38,242,94,192,48,69,54,152,128,156,100,24,77,0,237,177,72,198,168,20,224,185,198,205,172,91,139,166,251,234,249,225,225,177,101,25,244,92,47,3,14,62,216,80,113,148,86,50,205,211,87,5,74,192,39,186,189,36,37,220,140,99,152,93,98,239,228,178,96,46,191,60,179,117,16,139,0,78,155,170,105,92,150,248,27,63,179,245,228,69,19,224,115,221,245,126,224,247,223,217,59,124,121,120,118,184,95,188,1,160,103,208,225,43,20,7,70,102,175,190,94,31,211,62,0,206,15,68,83,94,178,248,35,31,1,152,56,239,196,109,47,114,99,216,204,19,16,144,196,88,0,79,73,68,232,161,65,57,69,5,100,4,125,0,218,54,140,125,2,28,196,121,66,163,36,111,164,29,179,242,78,131,103,179,225,52,72,155,233,75,
+230,133,179,67,3,145,39,6,68,53,126,104,178,58,52,210,130,214,227,122,124,45,193,215,82,234,54,39,49,56,160,207,55,56,138,164,172,151,35,159,120,22,154,149,28,100,108,211,198,79,176,207,50,165,170,167,249,121,79,35,84,110,81,38,181,236,121,161,47,166,180,89,93,218,136,45,123,94,232,50,35,157,170,238,138,219,137,159,21,186,153,182,155,8,155,101,120,233,199,250,22,108,54,196,100,155,50,200,140,23,197,238,102,3,141,26,91,183,104,246,162,216,235,116,184,81,195,34,224,228,195,98,79,57,208,25,118,11,37,71,144,84,209,253,87,78,237,62,57,125,178,127,240,203,217,254,209,201,133,229,6,26,191,120,118,121,124,60,235,155,139,151,251,39,231,103,251,47,225,8,156,245,233,225,63,14,142,47,159,30,230,63,249,173,251,111,37,217,92,12,5,94,24,235,125,133,250,144,113,109,2,178,199,19,183,255,238,204,245,97,231,74,225,29,219,220,102,199,143,211,131,15,186,235,227,192,133,223,189,216,189,65,46,150,164,183,118,25,212,0,64,30,200,38,100,214,
+63,158,68,212,237,152,198,149,123,221,170,53,152,208,42,104,15,57,64,34,183,142,128,154,96,125,46,174,138,132,67,232,88,143,98,239,223,6,233,194,157,174,13,23,235,31,79,195,224,214,73,99,55,76,80,197,132,69,244,225,36,96,241,132,129,60,99,96,19,111,5,121,221,196,168,148,130,37,79,85,253,177,21,11,254,151,140,69,223,199,91,94,244,10,192,19,137,30,12,252,190,147,220,2,155,29,33,13,227,145,238,36,62,8,162,196,54,157,70,224,131,116,123,122,124,136,84,145,198,81,160,186,69,247,131,88,92,77,2,55,118,94,249,161,135,126,10,113,52,73,129,6,242,178,117,238,254,9,237,190,192,235,109,174,26,166,253,192,249,173,209,125,96,88,15,232,76,120,30,69,239,50,59,85,3,151,250,91,247,65,31,126,88,189,54,242,253,249,225,0,201,216,250,101,206,212,74,18,124,211,57,67,63,139,223,198,179,191,255,224,137,32,117,155,124,11,246,27,156,229,131,192,189,74,214,244,142,130,5,19,172,135,48,123,220,11,44,33,208,40,168,122,198,81,130,118,
+116,214,79,146,149,3,238,23,113,59,13,108,122,210,179,215,217,143,38,97,90,189,44,45,196,124,170,149,145,37,97,78,146,200,45,40,38,43,69,245,138,232,38,85,234,187,243,172,167,112,197,90,54,202,228,239,122,77,35,217,89,148,224,105,188,208,189,192,216,48,131,206,94,188,209,48,241,63,100,206,75,26,28,7,0,30,20,78,73,101,105,0,88,64,149,94,227,139,28,216,251,101,103,29,182,56,91,197,64,156,217,250,199,167,62,158,41,125,96,117,34,189,1,253,158,123,30,129,166,236,179,42,107,254,13,44,153,25,101,247,135,4,244,98,113,99,235,151,38,206,206,39,250,117,217,84,119,92,154,234,93,161,142,196,129,251,132,187,152,228,19,68,94,47,2,25,101,180,90,252,113,239,6,2,115,15,190,72,12,94,68,227,251,128,63,237,174,37,249,65,3,250,111,210,183,243,224,7,54,172,137,29,227,207,47,18,55,79,136,132,239,27,122,104,207,47,134,31,222,147,38,138,242,79,190,72,44,157,155,16,155,7,71,193,194,72,138,205,150,229,243,171,204,233,110,134,
+2,36,110,79,226,35,209,8,97,184,39,132,138,60,228,179,87,208,112,224,191,7,14,138,31,33,240,77,237,225,218,141,125,178,149,55,60,80,41,67,47,41,227,176,154,74,130,41,199,228,143,133,189,92,124,86,139,84,226,105,124,252,199,50,53,218,158,87,15,244,57,137,142,221,126,23,34,187,220,14,159,139,236,162,193,32,17,105,53,225,245,149,13,186,76,129,77,73,130,138,110,198,104,210,34,219,151,84,200,224,15,69,158,108,244,226,206,44,224,183,217,254,108,60,193,120,45,39,14,74,41,253,98,14,240,85,97,211,202,175,185,243,6,126,216,116,90,214,141,184,50,150,154,211,224,127,22,41,72,23,236,63,111,186,48,88,129,245,171,64,87,133,183,14,255,212,43,250,73,234,55,127,43,120,157,169,142,51,152,233,181,243,172,89,111,193,251,53,138,28,200,221,137,49,147,138,35,224,132,201,134,115,81,124,137,28,47,29,70,9,223,139,131,126,47,41,208,105,192,192,103,244,107,99,205,65,175,7,231,228,242,248,24,126,93,199,78,216,34,160,250,64,134,138,29,79,
+198,134,242,100,135,43,47,25,231,132,83,70,30,183,128,186,53,63,252,164,5,163,30,4,179,239,117,240,4,91,170,249,60,129,185,103,16,144,193,23,49,255,34,240,138,56,246,241,78,137,182,157,254,110,45,143,133,33,158,79,131,1,48,9,147,83,231,166,74,80,53,144,239,248,242,58,210,124,22,203,201,75,232,227,101,81,148,241,140,89,208,207,6,91,196,161,184,210,245,237,0,47,96,167,208,44,189,79,20,254,115,228,184,210,121,28,33,198,130,160,108,91,178,187,164,232,239,222,90,204,81,38,23,26,230,140,18,106,85,114,180,68,26,128,240,35,220,43,174,50,154,49,242,98,209,23,254,181,92,61,127,233,135,227,9,93,36,187,227,113,0,60,135,47,124,197,32,130,157,233,167,14,5,234,72,202,97,171,28,67,202,249,223,104,226,244,221,144,9,147,122,139,133,49,56,124,241,34,155,137,154,132,190,51,36,178,72,209,205,5,24,39,16,1,14,44,216,207,28,232,46,35,86,180,148,52,144,20,201,238,131,79,199,238,21,205,209,202,92,9,54,235,31,201,186,38,
+208,168,144,27,126,165,232,125,42,252,79,138,224,203,208,87,40,30,199,226,218,135,46,130,91,5,125,192,76,6,250,207,12,24,73,137,69,211,160,29,40,242,171,183,37,75,226,28,20,175,109,131,117,136,94,127,188,82,186,135,113,208,183,68,228,231,2,95,255,146,155,219,215,188,13,238,28,223,179,54,64,14,244,247,99,15,148,141,200,118,168,232,239,222,90,236,206,115,236,4,182,41,215,217,6,121,235,51,238,130,240,182,32,60,125,102,122,250,68,176,211,227,85,80,85,6,210,85,2,70,249,98,205,3,25,186,22,173,0,198,211,216,189,121,235,224,191,250,131,238,159,115,161,82,230,171,236,82,130,221,63,200,157,7,189,38,120,201,228,120,74,224,85,86,5,186,199,132,15,220,30,74,232,236,17,20,139,252,133,98,14,46,52,220,250,199,11,80,235,5,49,89,124,32,157,116,241,222,111,181,144,57,64,193,24,206,97,207,176,13,205,88,99,79,197,34,247,137,223,135,230,157,36,173,159,16,26,186,106,167,40,51,140,220,73,232,38,192,62,167,225,85,132,204,25,206,
+94,237,125,86,0,84,63,16,110,204,33,213,30,59,140,111,224,109,16,169,119,226,189,139,46,253,216,125,50,233,15,141,30,244,176,236,134,227,168,40,234,241,36,25,242,252,249,192,39,119,34,220,237,254,128,206,13,249,158,155,227,189,172,92,71,128,215,169,176,88,143,45,1,220,107,19,79,58,121,24,65,143,106,166,240,107,154,65,109,195,57,228,89,18,159,40,194,41,173,2,47,221,135,222,68,241,59,124,28,139,81,116,141,112,34,32,146,110,130,254,147,82,215,3,149,128,221,27,178,11,76,76,124,50,137,87,188,131,246,165,243,108,109,42,209,59,129,180,159,76,89,192,147,216,55,60,123,9,254,180,142,36,26,17,214,112,117,230,37,188,102,190,250,148,34,207,98,56,212,185,15,196,250,36,153,16,158,208,235,142,67,74,19,255,42,164,192,220,94,12,160,65,232,220,176,218,135,82,202,21,112,25,20,18,98,102,227,248,150,70,229,148,49,83,46,201,23,1,221,83,237,121,188,42,224,25,190,204,8,62,6,7,46,253,10,229,40,216,62,137,239,101,251,142,26,229,
+97,90,127,129,196,34,143,208,53,241,173,67,63,172,75,44,58,204,46,98,33,18,185,150,205,252,12,232,148,120,203,87,255,246,139,132,197,76,133,236,34,80,53,234,204,40,90,229,83,48,215,241,96,184,25,0,210,198,99,17,34,171,225,77,159,119,123,65,87,17,244,237,128,195,2,73,20,229,12,19,137,58,136,198,71,22,131,142,119,188,25,188,72,144,155,201,144,27,121,218,214,64,8,236,62,122,180,31,199,209,77,195,42,254,50,22,224,248,193,59,119,152,7,79,147,125,0,145,53,189,126,11,228,232,99,168,244,143,221,31,113,26,7,176,157,186,63,38,113,159,255,236,254,73,132,221,245,73,210,253,222,20,52,208,195,202,244,30,116,186,255,146,126,204,221,166,116,69,134,95,50,111,97,245,7,58,252,170,223,201,95,23,254,48,124,110,213,43,242,129,133,63,208,215,13,126,92,158,209,239,232,170,6,191,176,119,25,252,162,220,7,245,175,242,131,204,115,79,254,65,237,181,243,92,246,187,234,48,243,89,83,127,93,158,57,221,127,191,205,57,164,147,87,153,245,206,
+137,132,30,14,62,67,8,75,166,45,125,135,21,29,148,115,109,228,58,145,116,107,113,251,37,2,192,151,78,195,87,232,3,2,204,224,100,69,187,38,228,245,143,7,121,143,118,120,227,208,43,242,192,56,31,250,131,180,153,241,149,125,160,62,248,98,154,217,240,168,56,11,66,93,211,41,186,66,83,35,162,80,229,55,237,39,227,192,189,197,27,157,36,7,165,85,115,175,111,140,107,41,198,149,137,185,75,242,173,62,43,98,202,243,205,28,78,6,94,80,214,28,15,35,81,164,50,175,28,32,191,177,178,251,200,202,136,50,190,113,178,85,112,178,58,130,38,227,204,126,69,183,56,51,186,27,134,210,187,85,26,93,145,11,0,166,50,226,51,25,143,164,43,186,38,228,28,90,37,206,83,77,164,62,71,124,45,66,161,43,161,168,213,34,249,69,116,109,241,229,248,122,112,60,196,176,46,50,5,92,207,133,229,229,88,209,253,66,52,186,151,61,141,110,44,121,66,190,2,60,7,70,100,139,95,140,53,251,67,32,22,67,102,254,8,168,181,199,238,221,127,20,231,163,180,96,
+77,23,177,15,0,224,236,31,132,26,78,251,65,176,54,189,70,22,37,9,238,255,143,64,18,41,67,50,71,18,149,249,99,112,179,196,238,213,221,193,29,123,255,202,160,78,22,117,140,143,102,49,105,36,37,107,63,192,219,152,128,162,87,77,148,144,65,92,221,196,254,124,121,212,253,13,97,162,189,17,199,254,123,129,90,155,218,110,180,110,71,166,49,133,111,226,20,59,28,43,17,203,131,182,77,82,1,241,61,236,98,178,83,243,28,10,73,119,170,81,254,28,166,121,119,40,199,222,191,70,148,35,114,77,148,7,185,200,214,155,208,140,117,46,162,96,105,160,190,164,88,205,123,12,86,14,38,21,94,112,187,114,193,133,67,246,240,254,34,245,49,146,141,3,200,115,193,87,70,4,121,79,12,93,188,45,181,90,45,238,229,97,184,52,113,92,90,162,55,238,13,97,172,140,26,10,49,218,95,57,94,41,192,226,171,213,80,98,51,130,252,143,166,162,72,212,222,115,29,101,37,12,189,2,207,95,59,71,207,39,83,64,24,220,165,126,99,12,112,143,233,105,117,68,52,143,
+134,195,123,237,206,84,28,221,253,87,6,248,26,58,78,14,43,247,76,201,33,180,220,157,150,163,187,255,26,177,94,84,115,226,124,50,154,59,212,115,8,172,127,12,69,231,15,122,46,46,79,30,223,84,157,175,15,177,4,146,87,120,53,189,74,220,222,63,55,143,5,232,130,47,236,145,34,114,73,7,239,206,79,96,127,132,233,110,176,27,229,37,240,133,208,207,177,112,175,231,242,178,94,240,242,52,192,113,146,138,107,211,21,186,77,113,186,203,252,251,175,131,227,145,204,55,116,217,109,40,79,172,229,164,158,27,247,154,5,86,120,178,144,115,10,244,20,226,52,216,21,165,202,43,107,154,243,232,188,27,36,159,53,202,160,165,95,196,109,5,13,213,161,132,197,120,43,165,205,154,78,63,227,56,186,246,61,211,245,156,66,223,54,28,202,40,154,79,172,229,68,125,132,36,167,159,144,174,236,28,39,97,70,201,177,75,59,250,106,115,16,29,249,110,55,201,63,27,96,80,162,219,13,231,104,96,190,80,200,192,184,183,166,25,225,38,169,66,251,39,13,252,208,199,104,6,
+234,192,79,117,195,129,27,36,58,207,41,59,220,25,221,235,44,6,166,231,184,148,39,19,7,192,229,7,170,208,21,69,222,249,42,142,89,144,51,61,53,194,181,133,145,236,135,134,167,240,140,98,190,103,106,234,246,97,138,249,217,32,36,158,71,105,54,169,74,194,196,180,30,192,112,115,30,206,180,188,138,205,4,116,143,189,2,62,97,29,3,95,196,10,54,62,230,210,74,18,86,13,119,182,183,55,119,40,184,67,197,20,82,102,237,216,237,99,148,18,22,77,109,114,132,193,141,159,8,217,26,58,7,93,31,94,81,208,34,255,106,75,14,237,38,126,159,208,132,31,48,165,12,38,49,129,147,183,179,28,50,203,113,134,81,35,184,189,105,67,115,180,254,36,25,254,40,165,47,153,209,205,182,94,38,110,56,45,129,40,71,19,206,29,104,8,230,244,122,10,131,120,97,115,105,75,101,49,16,53,103,35,148,50,75,22,155,248,49,39,90,241,241,88,74,82,74,105,152,112,172,75,6,81,10,201,97,26,235,247,197,152,202,38,14,41,4,116,197,140,133,73,105,21,188,165,
+142,135,44,208,189,177,168,196,216,146,92,132,174,6,85,243,46,200,237,128,188,243,44,110,40,100,47,217,195,2,87,176,178,138,28,201,206,179,91,194,108,187,44,66,46,112,90,38,152,42,66,209,12,38,79,137,125,208,35,140,163,140,33,116,237,187,249,101,175,88,6,251,57,74,159,33,179,173,45,129,101,65,56,58,2,201,224,217,179,216,210,138,239,208,96,39,45,58,123,206,217,176,204,212,115,150,171,3,164,187,76,98,50,202,225,60,144,181,9,13,131,214,106,173,90,133,161,43,118,53,206,229,109,161,2,173,145,159,114,147,119,206,98,50,195,87,237,235,239,135,215,209,59,148,149,57,146,63,51,176,41,214,160,1,192,250,222,68,86,187,197,15,141,79,24,188,27,206,89,46,59,49,5,230,211,70,119,101,223,9,197,59,37,50,135,77,46,189,120,61,38,73,49,155,58,233,82,129,56,204,10,38,171,50,255,209,16,245,249,136,130,39,109,69,12,130,0,48,88,3,27,205,189,185,82,182,65,19,158,131,119,204,154,113,153,149,20,167,91,174,62,196,101,109,172,42,
+38,147,46,127,144,163,95,123,65,193,62,10,187,112,62,20,234,13,217,139,154,97,182,26,228,126,242,76,66,50,54,227,109,241,92,242,175,48,72,153,227,145,251,36,107,185,52,4,107,79,206,126,246,7,209,172,22,247,233,9,73,48,152,204,2,148,65,42,148,12,61,202,230,178,152,6,198,103,194,121,231,6,209,21,28,127,97,223,136,252,85,198,212,52,186,18,116,44,82,5,8,169,184,201,188,221,178,111,149,126,31,20,88,83,143,64,65,235,42,132,150,13,21,250,202,18,70,247,207,56,124,247,255,245,168,112,179,219,19,65,178,214,196,71,41,246,73,85,163,65,10,28,185,84,75,8,90,37,183,33,188,193,196,90,170,80,238,235,7,206,126,130,157,27,240,214,251,241,72,70,248,52,0,88,20,107,58,144,148,1,163,101,49,166,105,44,196,26,41,2,36,169,184,38,32,49,223,37,109,120,13,215,128,74,30,39,36,49,198,152,84,193,233,254,176,223,253,1,35,91,187,63,252,179,251,3,204,159,38,175,130,173,69,166,115,96,120,175,47,171,2,202,233,235,89,63,
+193,194,43,18,236,27,206,41,129,217,156,73,214,157,18,75,9,200,216,95,75,38,143,194,90,180,160,156,209,211,208,141,111,29,78,192,212,70,92,115,41,251,181,153,106,115,107,138,216,132,83,76,56,200,223,164,188,149,178,128,18,46,23,20,133,145,198,167,159,32,87,156,33,131,9,4,227,170,251,44,254,105,10,35,10,97,108,151,214,91,16,64,105,52,44,186,201,85,147,75,109,120,251,113,17,116,80,35,189,91,222,131,164,123,51,94,81,27,193,12,2,72,107,161,202,65,131,4,227,83,10,236,59,130,54,49,220,125,207,19,85,23,111,115,10,39,181,24,53,111,58,12,170,199,129,17,230,85,81,18,220,121,46,233,6,55,166,150,119,0,138,151,130,202,244,124,14,96,196,60,52,103,76,152,27,32,178,245,170,211,144,160,176,114,64,153,99,22,16,228,53,134,41,233,131,177,58,105,107,89,233,92,41,33,76,25,111,117,178,190,114,141,185,89,88,83,135,38,108,84,127,112,171,242,17,82,242,15,85,13,129,108,32,221,117,78,181,163,210,215,235,157,207,81,166,215,
+66,166,221,40,213,232,122,81,132,228,128,163,199,252,88,24,231,148,14,90,189,161,83,73,230,172,113,139,229,212,242,249,90,121,133,104,151,245,178,208,210,13,132,89,232,161,132,192,31,240,241,134,193,147,152,187,133,103,105,84,225,203,194,42,87,167,38,186,183,0,191,57,229,188,128,26,105,56,100,133,171,98,49,128,83,110,104,214,169,80,194,134,52,2,74,77,65,102,214,192,104,15,29,233,8,176,214,182,244,204,224,71,130,198,114,66,35,102,255,148,50,163,153,210,216,42,50,190,240,195,242,55,149,242,162,9,164,188,41,99,228,135,254,8,9,210,72,43,60,205,28,98,124,254,233,22,123,158,122,171,89,172,251,126,174,197,26,159,47,188,216,153,197,140,207,135,209,205,33,87,78,92,96,129,153,225,17,104,146,40,215,212,13,122,66,87,78,201,234,51,206,190,15,73,228,124,48,201,234,159,65,238,110,252,151,180,157,119,63,118,63,42,197,116,253,111,185,185,55,214,64,154,133,63,5,150,173,203,82,145,34,23,11,34,215,147,118,82,37,182,130,248,204,236,46,186,
+9,57,199,240,40,242,0,106,172,84,36,210,221,169,39,80,238,149,229,36,61,199,155,196,156,11,40,251,210,9,252,129,64,127,13,98,72,217,30,37,173,67,174,119,102,250,87,101,253,157,13,185,169,230,163,83,88,42,165,227,194,92,187,132,176,71,181,137,100,106,141,119,221,241,2,244,129,186,150,194,107,24,133,221,245,15,34,134,147,105,50,234,161,76,80,200,91,197,181,142,196,251,84,132,9,34,41,75,192,157,93,185,130,238,194,98,48,116,44,107,35,133,148,148,135,117,80,110,1,58,220,216,79,101,138,185,1,168,140,50,83,85,170,51,184,0,128,131,8,107,205,69,50,167,116,198,135,197,96,18,176,30,34,39,198,186,86,86,55,232,157,31,82,246,5,49,24,8,232,154,171,5,93,5,36,51,115,250,35,100,205,236,209,49,91,141,65,128,204,76,163,124,58,118,127,159,192,233,214,79,243,137,148,173,172,13,63,123,235,224,191,118,115,173,217,157,229,68,83,201,127,113,17,49,124,2,135,53,39,3,203,144,160,242,126,69,212,15,232,151,137,46,3,14,71,216,
+192,207,196,43,66,17,23,245,195,211,204,3,173,124,77,230,250,157,14,22,250,158,234,85,25,201,222,6,206,133,81,79,10,109,111,148,149,76,164,77,46,105,109,206,87,153,229,55,56,71,157,78,59,56,49,46,77,224,140,29,241,176,128,239,104,12,27,57,99,181,149,184,248,21,100,132,149,97,66,117,182,28,30,128,98,11,181,182,26,42,75,145,159,104,70,226,135,58,231,34,119,182,182,20,108,90,143,139,144,49,144,67,121,171,112,97,137,29,76,156,116,249,39,252,34,203,76,253,192,169,234,196,2,158,103,104,122,49,86,156,187,175,145,186,127,150,249,73,74,183,86,238,106,244,82,43,73,183,57,170,49,66,110,19,151,129,195,123,110,113,184,20,219,223,41,72,212,198,38,59,13,127,167,119,50,235,19,221,239,128,209,137,184,251,157,186,160,12,133,64,77,119,173,22,8,101,255,245,161,103,80,197,175,64,254,203,82,150,238,163,46,20,253,28,153,52,139,80,213,91,242,174,232,44,27,64,85,16,158,78,103,11,3,169,208,124,65,42,171,5,15,38,130,121,232,197,
+128,194,106,45,42,104,126,183,44,85,102,101,47,120,88,100,198,90,73,250,217,251,166,114,210,96,217,192,240,131,144,9,6,169,222,55,48,226,33,94,224,255,124,121,228,52,164,194,231,234,132,245,100,229,78,166,38,81,210,242,109,62,147,82,246,24,254,160,220,251,111,51,81,248,205,154,153,88,147,10,130,195,223,213,23,65,180,244,141,130,40,29,147,207,78,193,220,223,3,132,188,147,98,113,16,69,99,93,192,22,239,56,160,27,58,134,6,185,15,96,177,34,198,19,70,26,15,252,197,108,44,149,206,9,71,201,105,255,253,65,206,198,149,97,245,82,121,91,195,55,186,194,99,126,249,5,110,84,33,152,157,139,244,169,155,186,221,6,137,191,84,132,1,41,23,116,150,37,175,99,101,199,83,141,68,44,114,151,90,191,213,211,120,203,181,212,245,39,133,220,187,102,255,26,52,231,34,101,129,3,221,215,216,248,47,175,33,163,222,255,17,65,215,184,224,166,205,124,160,198,88,255,120,162,250,154,41,230,50,52,231,213,94,140,37,243,7,185,117,91,53,122,19,186,51,180,
+153,159,17,36,42,14,133,65,34,47,93,103,128,68,177,68,154,77,131,138,132,144,87,85,6,138,10,174,167,198,144,253,207,34,193,23,145,231,15,110,167,75,163,53,137,142,187,178,108,25,162,139,17,190,85,215,100,40,124,207,112,103,192,196,189,171,154,156,209,153,149,79,195,91,219,4,167,144,43,41,12,211,87,112,148,208,136,190,240,22,80,169,103,217,93,84,215,53,201,240,127,38,34,246,197,60,107,180,251,34,89,204,76,243,161,117,159,60,176,106,99,180,146,69,115,63,85,22,213,188,205,185,104,180,215,219,80,91,239,141,212,214,202,239,109,134,143,3,143,207,1,77,65,144,47,78,92,244,123,196,227,203,234,102,144,115,253,36,59,78,166,119,170,229,200,172,218,84,214,36,49,130,173,212,85,245,233,47,186,78,252,81,150,242,158,98,225,216,198,84,24,6,190,39,112,96,122,113,105,19,50,134,41,251,96,167,101,123,100,42,146,84,27,236,20,111,203,231,20,111,224,109,158,240,124,148,213,8,220,107,14,168,131,253,33,150,216,20,191,79,252,152,235,209,43,9,
+7,237,42,166,124,193,94,178,212,1,28,255,77,137,148,92,135,6,152,9,116,242,42,89,185,210,229,77,167,114,237,213,84,108,26,207,10,94,149,216,217,132,238,37,89,79,86,30,188,217,236,24,201,121,212,85,199,244,138,255,155,169,253,215,138,105,162,126,22,219,0,230,106,129,246,227,52,91,139,231,39,125,55,166,48,77,19,218,51,118,3,79,198,182,27,102,157,63,49,16,169,255,65,134,55,159,167,32,11,142,86,33,0,201,110,43,238,55,121,28,44,174,128,63,43,68,28,139,95,150,234,151,151,174,124,47,206,25,144,137,26,148,83,32,230,121,76,136,97,143,238,173,54,185,36,19,63,37,119,92,4,153,220,168,88,208,28,228,119,164,235,136,242,157,187,168,24,37,232,27,12,114,254,6,176,234,226,238,79,100,153,0,109,45,172,146,130,107,57,36,120,94,65,228,93,201,157,48,116,139,206,7,134,87,44,104,39,160,92,164,232,167,50,215,213,47,55,78,205,82,50,252,34,240,19,144,163,78,34,101,178,101,183,245,144,108,249,169,251,14,147,252,163,157,62,25,
+250,227,204,49,6,228,41,254,130,41,216,19,104,126,36,116,188,86,147,216,112,222,92,208,165,102,16,96,245,48,246,99,33,51,244,80,184,99,153,243,86,122,255,222,31,200,23,220,16,103,182,6,117,203,29,152,185,73,205,26,44,34,206,37,168,119,232,75,32,209,40,187,172,81,36,173,28,62,24,116,243,34,214,214,64,207,76,242,103,26,233,198,7,6,211,19,186,172,17,205,81,24,157,44,139,133,39,212,241,103,195,69,47,63,252,52,100,72,16,124,58,108,200,185,217,208,193,132,177,58,108,176,131,202,93,48,36,238,57,49,202,118,152,92,68,27,102,136,55,48,87,152,10,191,3,246,88,144,23,243,118,231,148,178,212,159,173,128,5,119,115,25,82,220,55,214,66,74,39,59,169,212,148,247,149,245,95,85,35,145,231,16,112,55,44,57,169,175,11,41,108,110,140,225,32,83,36,124,131,66,12,155,221,221,44,242,24,14,134,28,210,107,174,147,14,148,60,173,79,93,72,246,125,9,38,210,4,71,47,97,181,119,179,206,103,126,188,216,66,7,216,112,158,149,26,13,
+62,207,82,207,98,113,61,231,34,165,23,144,100,101,218,237,221,79,180,52,149,109,89,27,77,243,154,225,5,154,87,209,223,214,175,77,224,178,94,86,30,96,119,3,152,19,241,126,222,237,28,66,147,2,116,152,241,206,1,28,150,189,22,128,141,49,120,125,184,204,52,100,212,222,4,246,249,93,152,222,15,72,207,21,62,119,203,99,140,38,250,12,206,139,92,28,137,156,113,238,100,226,120,19,126,99,249,56,175,102,140,11,111,43,157,230,135,162,255,46,243,147,177,87,38,38,226,215,117,148,166,160,53,7,182,114,163,69,79,237,115,224,108,186,39,139,110,186,159,188,163,218,221,41,26,239,105,191,77,210,210,26,144,105,85,79,199,66,98,57,91,118,129,198,22,216,151,178,206,238,60,6,94,84,73,10,203,104,234,29,154,9,75,228,194,87,222,169,228,238,136,106,95,62,68,183,214,166,44,93,46,29,104,151,25,26,170,18,157,117,100,40,27,56,12,108,126,105,75,191,123,210,57,69,61,115,78,158,174,125,200,74,235,57,204,42,233,225,71,94,206,159,147,253,199,220,
+73,136,161,218,44,199,142,92,180,51,24,193,40,252,253,134,67,211,226,107,68,86,21,138,67,213,130,55,79,180,184,91,245,9,147,24,211,195,179,133,166,188,60,249,229,64,106,241,111,169,4,223,167,91,211,39,99,73,243,144,215,225,239,19,31,22,140,226,58,172,51,235,163,177,214,93,255,155,130,107,99,141,204,31,243,192,170,2,210,171,96,49,85,168,254,140,75,41,185,71,96,67,250,219,52,224,206,71,204,54,110,58,115,172,170,235,163,59,225,96,115,28,127,166,155,25,67,149,121,215,101,72,126,141,170,199,166,25,222,238,246,201,162,203,254,124,210,140,224,202,192,3,23,125,131,168,163,238,119,89,25,41,60,48,78,209,247,1,118,230,89,52,190,28,179,213,174,232,107,183,8,120,180,135,130,132,81,230,241,48,115,75,218,190,171,118,107,213,158,16,28,161,200,101,184,140,67,177,30,229,234,110,166,239,186,108,85,229,5,213,88,139,121,157,112,55,243,46,25,76,63,37,238,94,192,10,230,66,158,162,114,58,97,229,145,208,192,56,75,242,212,14,37,67,89,99,
+16,121,62,186,72,6,20,149,136,14,238,234,175,155,249,161,102,140,183,74,124,151,215,111,57,88,239,237,90,45,140,214,84,169,88,11,65,198,81,54,28,214,136,146,242,167,25,111,169,91,30,59,63,66,94,167,27,196,217,165,82,222,9,226,25,187,44,166,20,148,25,102,41,73,241,30,20,37,51,193,146,6,167,230,81,111,157,91,65,62,131,116,111,234,41,247,119,56,189,78,38,1,207,131,93,33,19,29,137,6,34,95,72,213,145,7,208,165,140,247,100,111,73,188,123,194,27,37,79,10,233,134,139,38,127,48,154,36,232,68,239,39,48,91,25,178,64,34,62,70,41,176,47,26,241,105,63,148,140,126,63,72,162,38,251,184,203,73,160,111,189,11,79,117,4,54,94,170,140,38,65,138,185,119,11,225,12,134,65,213,55,82,115,109,56,100,32,147,83,34,194,243,157,238,95,187,127,117,90,228,6,55,193,36,95,166,213,210,232,7,129,191,254,241,101,105,233,83,168,80,145,124,247,1,209,44,70,140,227,149,15,134,154,113,165,68,140,240,80,17,9,193,148,50,189,203,
+210,231,234,8,109,160,8,77,19,81,107,69,192,98,32,45,9,130,125,207,187,75,16,208,165,163,6,129,31,162,56,177,78,89,143,114,73,128,239,12,24,139,202,105,188,230,76,88,203,45,188,108,61,98,83,114,249,27,13,204,105,145,57,6,171,83,199,228,95,205,183,173,122,118,41,181,119,44,188,166,204,230,102,109,251,105,91,212,138,149,169,20,88,139,130,202,48,92,240,184,168,2,159,83,58,89,239,15,168,234,223,196,173,2,66,165,43,184,57,215,126,20,122,226,189,142,66,184,187,69,173,132,5,233,53,26,7,25,156,224,46,217,55,95,203,86,27,168,219,186,129,159,222,202,131,152,68,0,14,152,96,201,136,99,126,35,56,0,229,233,154,203,210,211,224,19,153,126,71,183,105,244,6,177,86,95,101,214,198,178,2,5,167,225,228,150,130,32,223,71,223,67,57,75,93,148,47,187,177,234,30,12,51,0,104,95,127,11,4,156,240,78,143,64,236,255,158,82,223,192,159,122,55,145,223,230,116,85,37,48,155,225,181,242,170,242,213,43,105,149,27,212,189,40,152,26,
+167,170,142,129,3,51,253,104,221,11,75,149,250,88,201,225,225,44,197,231,32,223,98,169,173,72,254,203,52,119,91,192,141,98,68,232,152,39,167,151,165,222,200,20,146,76,78,68,4,135,50,163,5,37,110,17,100,119,211,202,198,42,110,253,208,152,83,19,198,133,139,175,146,173,118,96,222,43,112,136,76,141,104,105,253,217,194,87,93,195,73,234,229,138,44,229,5,112,218,63,232,194,199,113,166,89,2,209,44,197,38,221,109,83,140,184,72,96,94,253,212,204,232,16,195,86,11,110,117,54,142,36,10,128,254,73,205,82,95,147,131,110,236,113,194,207,94,32,70,181,228,208,217,1,253,249,117,205,135,29,189,234,68,118,99,134,217,214,184,143,132,141,163,91,142,48,113,235,210,154,22,240,245,41,28,22,127,30,71,87,240,209,91,135,127,90,15,171,25,9,2,43,188,212,209,103,106,144,227,219,121,18,153,22,163,197,147,81,1,90,111,157,32,186,34,7,109,181,77,223,232,12,16,102,56,153,25,74,86,108,193,154,125,79,112,226,166,65,218,93,199,252,159,233,237,216,
+234,133,137,137,178,143,11,61,216,189,194,120,133,84,133,157,83,154,170,201,140,3,183,79,150,2,60,114,166,44,117,31,189,239,153,125,101,235,205,98,59,223,152,1,97,58,132,239,142,245,211,213,19,78,30,245,37,228,24,158,194,122,141,115,227,229,51,3,163,79,160,232,91,1,241,126,154,184,87,163,189,37,223,175,29,144,61,202,141,235,95,251,30,74,59,70,42,119,202,99,167,97,107,149,83,222,3,196,158,71,177,255,1,141,220,65,169,111,91,147,91,10,52,141,41,109,159,217,224,211,225,229,31,171,66,76,30,176,195,106,56,56,17,26,23,87,7,206,59,5,207,255,46,7,158,42,186,187,182,224,124,46,224,84,17,206,146,160,169,233,165,147,79,26,97,57,210,166,197,135,90,242,82,228,21,18,139,47,57,111,86,125,236,148,160,54,27,96,49,169,96,42,145,133,174,243,96,246,90,168,240,117,119,208,169,82,106,109,92,174,70,179,69,11,37,44,56,92,191,146,153,46,131,31,220,237,186,108,91,79,164,55,130,18,184,144,195,112,150,128,132,135,16,222,21,187,
+253,228,180,164,194,238,152,221,25,137,59,51,251,234,23,248,144,78,136,85,252,46,183,37,173,105,179,22,160,35,11,123,190,59,66,234,87,113,115,170,18,53,141,165,127,98,252,86,226,100,73,104,91,184,253,29,238,191,170,125,132,59,168,250,128,168,119,54,172,140,250,235,83,245,124,183,87,159,77,62,206,84,131,123,36,32,215,7,201,23,32,37,103,16,254,74,196,100,133,157,207,41,43,175,8,168,119,15,164,207,39,49,207,0,209,231,21,153,117,238,172,123,39,55,207,0,219,39,20,156,235,193,232,143,41,61,215,216,255,223,196,103,59,53,125,65,50,244,167,196,242,93,8,209,26,230,95,138,36,93,227,204,248,132,162,244,252,23,46,161,205,127,103,142,0,56,186,208,202,178,122,80,8,156,130,79,89,88,94,114,174,152,216,239,206,166,154,183,123,215,12,222,51,244,12,158,80,94,217,176,94,243,150,222,207,179,136,162,110,161,52,147,101,246,221,75,78,232,94,153,37,30,246,99,52,26,79,80,60,151,73,225,7,145,114,180,231,251,194,176,31,76,60,193,89,94,
+240,70,145,136,234,56,251,214,184,252,69,10,87,159,201,47,242,217,98,150,116,172,161,165,112,176,122,229,130,142,74,1,155,77,153,135,67,167,231,206,193,100,74,89,211,122,226,237,49,112,84,171,118,86,131,57,217,42,124,213,104,150,152,249,103,208,57,236,252,226,233,249,209,63,15,167,31,42,115,88,9,92,147,181,209,149,62,215,2,231,59,97,93,50,212,214,148,230,86,125,170,87,137,208,236,201,171,106,31,178,111,236,146,136,161,210,236,247,18,51,49,206,108,101,168,161,52,204,212,227,151,133,159,139,104,124,47,177,147,19,12,150,198,12,246,54,7,94,202,50,192,39,198,202,147,40,77,49,16,253,30,34,166,71,83,91,33,110,100,135,95,18,122,158,99,189,143,229,177,83,233,81,60,23,218,122,179,251,171,180,102,1,0,81,76,248,52,135,82,175,212,116,6,195,252,132,24,253,245,139,198,232,181,177,33,150,194,39,103,109,168,199,43,203,232,156,181,147,63,33,62,75,232,204,0,38,171,159,42,140,131,232,249,60,251,245,115,48,147,3,129,78,117,139,18,95,
+21,215,158,139,226,242,133,110,103,83,157,33,184,244,105,246,194,155,135,232,102,136,63,198,151,60,177,245,143,167,131,1,186,169,114,58,175,242,136,134,51,229,103,193,225,175,95,32,14,245,41,186,4,6,237,39,241,151,135,63,169,62,254,243,254,137,91,69,253,241,245,143,206,135,40,194,196,248,111,170,208,229,40,174,204,238,252,177,0,4,245,39,1,85,194,227,28,151,216,3,21,62,138,98,89,62,55,26,97,254,253,84,112,241,49,207,31,200,80,136,68,219,212,18,85,99,111,0,19,97,183,101,25,62,42,77,22,92,25,151,204,15,50,1,64,174,73,125,129,240,11,214,114,239,33,1,149,212,220,63,0,5,173,68,17,223,249,28,138,248,61,36,160,156,38,254,7,32,158,47,214,86,112,15,105,167,104,44,248,3,144,207,23,108,206,88,150,128,62,183,246,107,80,215,12,69,248,75,37,178,175,70,63,255,245,27,201,125,35,185,207,101,103,89,140,232,238,141,161,229,171,58,68,191,98,83,208,23,68,102,101,91,144,38,178,55,95,1,71,187,247,214,170,10,7,24,
+114,40,101,23,22,211,233,210,234,244,82,254,96,30,175,23,157,232,64,86,123,50,253,118,36,203,118,142,40,27,132,44,72,89,114,236,129,85,178,47,146,225,108,126,23,235,60,239,199,64,38,119,183,90,183,151,68,193,4,41,148,6,186,235,229,44,231,113,165,203,64,24,206,74,132,141,204,245,77,251,136,125,18,188,124,138,229,172,0,67,40,125,202,133,157,27,252,214,190,176,210,7,139,44,137,248,93,121,57,42,200,255,78,40,43,241,123,129,184,235,253,34,125,45,57,157,140,192,28,23,156,207,79,241,9,246,247,250,1,75,150,209,124,20,214,50,24,12,52,235,32,159,177,6,214,254,237,97,18,82,125,142,216,86,179,134,28,39,235,93,246,90,0,47,118,77,143,184,231,25,221,34,241,174,73,143,187,172,176,26,176,249,193,36,96,191,198,18,226,28,241,190,47,132,151,56,62,205,66,2,3,207,71,44,64,229,115,162,114,167,239,38,34,87,104,79,101,202,133,239,179,226,45,42,169,58,166,188,233,7,254,120,12,19,197,3,175,119,107,172,19,79,218,192,31,249,
+233,29,113,163,2,56,238,128,102,114,37,234,191,145,205,210,100,67,19,189,35,218,169,205,39,85,190,71,11,179,212,20,51,53,87,97,230,149,207,239,50,113,119,70,187,219,252,187,202,60,54,202,193,86,49,98,130,29,34,154,211,135,229,248,179,41,91,138,98,22,39,155,147,254,43,223,75,135,149,46,229,207,5,222,71,76,145,20,207,205,57,113,190,108,42,57,56,116,175,5,229,133,21,9,85,106,196,185,213,116,75,95,57,250,230,233,16,36,238,15,245,208,162,188,49,204,9,52,146,15,27,253,247,77,7,127,220,218,111,159,63,72,160,221,37,76,23,240,138,158,170,240,45,21,57,134,172,161,172,182,189,112,227,119,137,177,152,28,159,201,152,44,82,121,44,198,192,195,48,65,213,134,179,207,164,45,31,81,185,9,76,125,23,203,84,190,178,246,58,25,113,160,121,2,243,158,29,118,38,213,128,59,135,226,215,23,91,246,89,145,136,204,11,157,31,114,199,179,158,65,85,192,205,133,17,82,56,179,193,124,12,114,101,180,83,128,239,205,48,2,136,86,130,115,54,67,
+157,153,88,237,217,36,8,10,179,88,38,132,166,56,97,148,2,96,37,18,189,217,212,177,54,44,149,87,192,163,95,62,134,143,110,197,74,224,57,59,255,231,170,3,98,167,110,135,44,218,105,198,126,64,192,44,193,215,246,113,4,202,163,74,189,125,26,72,254,193,88,91,109,92,126,227,109,86,10,178,50,56,146,118,234,48,184,185,194,70,251,113,20,4,166,58,184,122,78,208,253,45,94,140,238,188,5,233,213,171,65,175,22,181,48,3,105,179,148,244,83,169,101,164,178,41,226,197,106,9,61,225,120,88,97,3,180,177,132,96,137,77,148,98,140,21,87,100,13,215,140,214,140,106,215,74,17,161,134,185,189,144,49,40,210,88,140,218,216,84,5,2,43,247,82,157,3,51,195,40,37,247,245,161,71,149,38,196,96,152,177,203,25,88,135,48,101,61,207,169,44,210,66,100,69,147,122,49,134,153,250,181,126,153,143,190,205,190,187,99,178,253,106,216,238,183,109,243,245,108,155,123,119,118,125,53,219,122,245,132,127,51,244,167,168,22,127,96,122,191,255,68,178,34,229,165,
+144,204,139,172,100,57,3,217,148,203,249,82,96,82,54,245,70,220,228,143,201,28,38,127,187,173,14,149,95,22,48,171,157,252,202,103,126,27,102,9,169,50,233,247,89,20,163,251,128,63,26,9,207,71,207,2,131,82,97,175,224,142,212,154,51,219,239,165,56,221,204,201,213,120,45,144,77,94,26,220,151,204,41,149,155,240,170,169,47,177,232,206,119,10,139,38,223,29,168,139,26,125,115,35,207,26,54,163,79,61,113,114,22,195,18,104,115,229,49,79,175,129,119,249,158,56,152,196,73,20,119,27,4,42,124,113,52,114,175,68,247,207,197,226,156,244,248,173,67,63,172,200,200,119,184,48,90,172,227,228,17,99,169,213,161,6,7,224,71,147,68,32,79,79,216,37,70,129,135,218,109,56,23,145,35,136,69,3,14,100,27,78,156,129,165,217,220,43,174,160,7,192,199,15,104,14,242,74,8,144,2,60,218,108,150,21,75,93,148,124,159,198,238,77,206,207,41,207,39,240,245,91,250,168,2,14,217,243,185,206,217,165,197,110,13,117,156,155,172,27,1,39,94,50,22,125,
+127,224,27,142,60,89,45,6,164,229,208,147,214,133,9,156,136,88,50,101,60,137,225,75,76,201,130,133,78,83,247,29,238,23,190,47,236,174,39,195,40,77,100,7,0,241,4,55,129,49,222,235,31,9,79,152,28,197,233,185,253,119,92,235,220,105,36,19,172,222,204,216,226,123,57,235,253,198,13,202,114,110,140,213,83,177,83,171,128,136,208,209,130,95,174,184,205,178,8,127,5,51,231,252,46,223,80,191,48,234,63,51,222,231,182,95,63,119,147,3,172,216,158,255,162,156,32,178,86,165,97,80,31,74,239,43,235,230,10,172,68,169,234,139,232,172,65,25,206,0,160,92,119,244,13,215,148,183,106,43,56,220,250,199,131,220,251,234,226,48,125,89,193,34,235,111,37,176,123,42,196,248,254,193,175,47,211,234,250,169,92,176,147,2,33,59,13,6,170,89,216,213,74,147,11,130,22,6,204,6,91,210,165,246,232,42,140,98,241,2,143,206,169,7,119,101,153,150,188,127,63,78,181,80,203,135,6,192,10,146,120,58,99,69,155,13,231,21,21,73,234,99,89,170,172,228,
+9,127,40,43,158,210,199,126,56,158,164,200,13,216,255,194,31,141,163,24,4,28,206,202,149,164,160,63,245,185,36,170,42,175,124,141,126,240,26,87,36,85,1,143,57,118,123,34,120,18,189,71,247,15,246,26,197,178,58,34,76,38,32,149,169,82,174,217,128,218,213,3,40,97,50,98,190,162,186,104,210,141,16,42,128,126,146,198,62,252,193,138,157,49,139,192,197,244,192,9,138,9,126,165,35,255,175,84,139,11,13,245,8,143,149,184,185,206,135,246,147,200,138,248,146,206,97,124,213,24,184,65,34,238,204,41,119,54,31,200,205,117,233,12,122,88,241,135,143,131,140,224,4,136,217,22,7,30,203,65,95,177,29,178,121,22,114,19,222,253,245,158,69,31,176,56,170,186,102,230,239,37,96,68,214,14,126,32,203,221,49,99,34,186,207,248,163,113,15,21,87,42,39,139,129,247,254,64,182,92,115,232,238,1,155,89,196,102,195,85,177,202,242,121,153,231,16,229,82,231,56,141,188,154,178,54,135,87,226,188,219,171,56,207,58,114,181,193,159,14,2,191,255,174,218,136,
+65,164,120,19,197,239,144,95,243,89,67,153,29,115,192,39,131,93,40,222,167,200,231,211,8,235,105,141,249,93,38,213,94,69,17,242,252,40,40,148,150,235,71,160,43,198,228,88,168,78,158,113,52,134,246,178,14,124,63,136,18,62,77,184,111,244,37,236,191,99,162,40,33,156,142,50,148,42,168,96,60,114,226,27,1,83,107,232,2,245,221,71,143,14,176,67,153,250,145,25,239,36,36,147,65,181,45,104,73,16,95,142,45,240,61,10,175,163,119,34,41,161,2,37,22,2,12,22,0,167,245,241,186,9,136,99,56,122,1,26,75,241,2,16,47,14,220,49,208,156,245,0,67,217,67,90,4,248,163,98,222,79,121,68,129,202,129,174,107,61,134,36,87,103,167,69,208,21,1,52,161,63,40,9,133,178,214,80,210,245,13,222,201,55,72,49,176,7,5,150,216,204,232,137,37,137,73,8,4,5,219,36,16,64,20,114,174,36,27,243,72,122,99,72,130,32,147,53,125,59,77,26,188,208,172,36,3,0,57,169,36,147,62,16,122,130,158,177,141,73,50,129,49,110,157,219,
+104,66,230,111,73,240,210,44,158,245,87,203,108,88,137,129,252,202,44,88,144,31,16,168,208,75,54,135,144,90,107,204,163,16,151,153,3,209,210,186,69,126,234,243,75,21,170,248,162,86,14,202,75,156,115,35,206,132,54,86,0,172,132,248,209,0,78,144,91,178,72,162,90,220,167,75,6,4,61,139,168,165,25,54,29,46,68,91,151,240,252,193,60,40,153,115,59,63,139,250,19,107,94,49,220,204,239,196,109,47,194,72,52,222,91,3,252,22,89,48,90,230,120,91,171,163,149,11,247,210,213,12,239,75,221,84,178,249,107,223,117,126,17,183,138,5,184,88,228,35,188,194,159,0,12,4,145,109,44,169,182,208,32,158,8,125,145,20,250,117,26,116,151,131,48,67,155,6,137,203,28,231,150,141,181,166,224,61,118,19,89,157,20,185,124,230,71,110,78,11,235,199,70,206,212,242,12,10,39,137,72,201,18,205,80,201,115,131,149,108,148,28,106,86,176,77,172,16,94,217,68,45,214,130,69,39,139,9,160,121,67,33,162,60,145,244,69,232,185,72,69,184,12,134,119,68,
+103,182,174,17,13,162,211,41,30,219,220,158,55,36,107,187,44,17,44,169,187,189,130,209,11,59,101,30,133,125,96,8,198,69,141,253,136,175,83,69,193,232,113,67,235,213,59,14,206,74,147,124,81,164,161,59,207,166,35,54,64,187,39,190,29,186,215,254,149,186,152,141,163,201,21,27,214,61,223,13,162,43,121,65,114,225,246,156,6,222,135,12,253,65,218,253,11,252,185,134,116,97,83,154,97,210,82,136,198,33,229,44,141,114,192,198,12,167,249,173,235,136,150,187,208,168,45,120,153,38,46,207,55,153,5,156,102,75,243,153,81,142,88,61,44,148,37,214,91,86,247,71,196,188,49,67,213,110,26,234,78,17,59,75,152,171,66,255,238,105,63,87,101,90,4,254,21,5,73,1,225,113,176,146,220,8,147,49,94,206,141,69,40,111,0,37,105,147,205,79,90,161,18,127,228,7,110,156,221,246,91,125,41,237,180,93,28,255,179,145,181,5,228,101,51,145,250,102,182,145,104,177,201,214,17,32,142,146,202,169,214,82,202,153,74,97,30,85,199,209,156,210,76,37,63,48,
+146,248,155,156,181,161,27,52,136,48,233,24,151,170,2,194,202,79,65,122,160,216,121,197,136,177,139,38,211,218,141,15,194,70,8,191,34,53,14,65,246,19,225,52,78,168,76,202,134,188,96,113,106,159,82,59,162,150,173,157,172,8,180,34,219,253,71,21,31,146,34,108,118,211,206,198,238,200,144,30,104,218,205,44,102,79,42,206,116,28,77,89,245,89,246,29,247,73,23,190,250,12,63,185,60,62,70,160,132,17,74,79,67,71,188,247,147,250,241,124,139,66,165,174,172,146,65,38,7,15,20,26,141,171,135,37,160,179,204,253,230,1,58,140,7,47,34,79,152,203,49,8,254,128,204,20,217,103,133,186,25,90,57,231,248,192,32,176,8,92,203,57,140,160,174,12,16,153,122,110,124,53,238,170,26,236,103,88,71,30,152,8,172,220,240,26,237,5,81,255,29,222,222,178,99,137,189,144,140,115,80,104,69,22,38,172,133,18,184,9,177,153,94,244,158,208,165,140,13,190,62,65,169,124,61,178,86,180,57,160,57,205,39,126,37,211,125,72,77,13,237,18,20,49,248,127,
+19,80,215,208,57,143,230,185,225,156,98,77,59,105,93,209,251,115,72,218,89,34,215,226,249,9,140,113,11,156,177,1,7,78,4,84,228,134,242,224,70,147,135,23,209,21,78,40,148,139,222,40,186,86,96,200,24,254,85,4,83,197,72,222,72,50,194,202,178,83,255,152,89,160,241,127,167,126,241,249,234,128,205,38,250,85,7,25,125,35,185,165,73,14,175,24,24,20,12,182,185,238,78,42,169,225,23,63,8,10,228,96,24,234,112,186,106,169,100,180,176,230,206,88,250,78,129,207,189,218,119,10,89,132,113,78,219,54,78,106,173,100,103,230,46,137,184,149,26,223,142,128,140,128,206,104,250,207,162,248,198,141,189,242,174,170,3,133,188,255,129,173,86,237,212,198,105,52,158,126,58,84,234,62,97,52,200,221,72,162,2,68,210,250,124,221,160,124,92,238,67,19,210,69,140,134,49,216,0,68,254,90,82,165,59,149,238,119,128,164,56,26,199,40,213,117,191,147,226,43,221,148,208,14,65,123,0,232,255,198,253,0,167,107,80,102,131,13,103,63,107,207,136,15,41,211,
+3,12,64,187,58,211,80,241,94,189,137,134,10,149,226,2,153,134,8,93,248,117,170,147,75,158,3,216,190,68,4,112,52,0,125,220,93,215,215,46,192,189,251,129,224,219,1,157,114,139,44,238,244,101,50,233,105,127,141,66,159,10,53,235,31,11,74,104,150,131,131,51,76,176,241,69,188,167,138,101,51,93,70,8,168,54,139,32,204,15,209,83,109,175,93,118,135,60,113,251,239,190,166,45,50,139,188,129,92,175,253,8,45,35,5,2,157,143,188,187,223,237,151,54,200,55,18,103,18,63,80,188,71,46,97,132,39,56,129,68,107,253,179,188,105,86,188,41,136,26,189,155,40,246,222,58,244,195,186,45,246,169,255,95,196,237,19,191,202,231,179,119,155,138,183,14,254,107,165,74,151,122,0,202,41,203,90,234,202,189,231,167,221,245,145,155,188,99,215,40,237,38,192,77,187,235,21,86,213,172,231,245,143,251,198,167,152,142,46,187,23,5,169,7,232,116,255,252,224,232,136,65,73,199,173,165,231,50,196,141,78,113,142,56,67,51,174,134,200,168,251,195,126,247,7,36,
+178,238,15,255,132,95,8,165,232,94,229,3,201,101,11,75,208,204,4,154,98,66,238,36,220,210,152,67,222,35,203,157,164,209,200,37,33,58,224,233,77,209,219,25,131,172,121,231,208,104,205,226,164,209,89,251,142,161,149,89,86,169,123,253,205,131,234,254,176,171,156,230,159,33,58,116,227,91,20,129,12,245,223,236,38,75,103,148,76,2,116,94,84,46,237,252,0,155,169,2,150,102,51,28,92,23,187,36,115,66,44,66,160,3,101,201,196,137,27,38,5,196,39,185,219,161,155,60,54,195,17,140,40,233,28,23,152,74,22,9,167,161,236,221,102,218,255,42,213,254,167,154,42,50,64,91,196,95,96,235,87,87,34,78,50,202,201,232,73,198,96,48,177,225,202,19,195,195,121,52,14,196,72,80,86,8,160,207,43,138,222,66,216,186,20,248,5,58,141,199,185,44,205,230,89,170,171,108,78,230,157,95,138,28,138,191,217,79,48,31,103,249,51,137,85,244,146,166,13,9,76,51,163,127,68,53,33,154,6,107,248,5,28,242,253,163,248,125,226,67,91,25,245,86,28,167,
+145,155,92,99,109,109,185,240,34,25,0,51,21,5,202,141,68,126,43,169,74,157,44,242,22,46,35,11,6,1,223,172,101,60,198,165,117,44,121,17,45,19,144,85,207,118,250,173,33,102,98,197,156,137,87,100,102,148,190,80,230,36,71,145,39,80,169,65,77,53,227,178,234,20,191,138,221,241,144,212,255,88,160,152,0,173,89,169,209,62,29,147,208,19,49,236,96,177,86,96,196,75,90,200,134,209,244,128,190,74,177,41,49,91,218,189,128,105,117,28,0,64,222,183,218,23,199,114,42,81,119,202,68,109,185,148,41,193,108,169,101,63,247,189,105,14,176,8,21,243,82,99,201,59,57,236,46,172,115,106,216,105,108,42,24,151,156,154,36,251,197,39,151,154,215,230,190,246,3,4,138,85,180,29,177,184,203,209,30,153,191,134,122,237,15,148,255,69,113,157,137,72,155,134,163,132,217,72,157,24,84,134,60,16,215,176,181,84,191,120,57,183,20,109,28,146,52,189,216,166,16,249,182,165,109,193,125,147,53,3,88,55,255,94,181,35,100,95,181,246,132,169,1,44,113,106,
+230,23,94,218,22,60,251,21,110,12,238,176,214,21,81,61,234,155,5,135,154,181,14,69,122,232,249,233,18,100,80,108,109,231,143,234,51,135,226,219,93,175,187,78,18,46,30,21,58,143,173,115,206,114,189,10,122,64,99,102,31,239,234,141,168,6,22,27,0,156,170,63,67,174,232,9,146,173,245,249,20,88,117,2,61,225,41,212,230,103,19,254,28,193,11,231,152,145,219,245,208,102,59,141,115,103,168,91,37,157,22,240,185,2,66,53,33,185,228,236,138,96,153,113,159,168,64,245,95,217,186,166,84,139,175,39,233,37,232,55,238,249,3,27,106,232,45,58,32,226,251,76,91,95,114,209,60,220,121,102,215,94,28,39,198,204,40,129,195,146,137,222,46,199,152,143,191,58,125,30,95,138,246,64,60,151,159,210,62,85,18,240,42,226,228,185,219,233,187,132,225,183,36,226,247,201,62,52,69,174,247,196,192,69,5,84,222,195,4,1,198,112,162,218,143,94,149,220,122,5,43,173,156,6,131,218,128,50,105,89,43,30,119,22,166,249,219,166,57,182,252,67,182,4,205,242,
+118,204,102,11,229,249,225,14,240,238,30,116,200,24,217,103,120,37,164,206,151,84,230,55,159,143,153,162,169,246,204,245,109,1,201,117,170,251,100,38,11,60,216,158,93,30,31,63,217,63,248,229,108,255,232,228,66,47,30,87,122,77,71,8,226,188,187,206,249,82,232,108,155,166,7,244,208,10,249,164,208,226,115,156,55,23,177,27,38,44,121,90,160,53,77,39,212,159,55,46,94,238,159,156,159,237,191,60,60,185,200,0,180,180,111,214,194,211,57,57,173,49,139,153,248,39,139,216,156,115,56,144,26,113,137,20,86,67,206,6,174,22,19,216,10,20,93,22,213,82,61,66,95,158,20,90,64,59,26,88,222,114,180,40,9,163,77,153,27,8,37,55,94,249,129,12,32,30,97,116,134,24,12,4,187,9,223,184,86,217,140,118,196,69,113,132,207,19,63,106,5,244,116,251,136,110,176,66,121,204,50,141,249,143,127,29,142,91,194,222,146,96,34,206,39,254,177,24,37,186,239,167,80,34,170,2,110,160,132,126,233,33,40,135,147,250,129,54,78,186,198,33,231,112,248,152,
+14,98,239,91,239,5,222,43,153,8,206,103,37,167,170,206,49,89,86,28,5,159,133,232,74,240,156,70,112,242,227,21,18,91,97,248,37,8,77,1,115,5,52,118,20,14,162,169,4,86,225,224,99,126,49,116,99,131,214,114,151,169,239,179,166,121,62,120,225,143,217,209,70,179,63,178,138,43,223,155,204,93,6,47,110,0,176,41,124,111,242,248,226,165,227,123,188,218,187,128,214,159,131,159,61,23,193,248,216,15,23,138,215,94,22,144,67,24,27,205,87,160,216,7,126,248,110,170,76,196,80,130,153,190,187,171,56,124,78,84,150,226,45,134,170,70,64,127,84,239,11,144,1,128,22,22,223,20,74,34,80,4,117,87,147,44,226,120,241,153,98,79,23,26,97,185,249,46,78,130,209,24,253,39,162,248,167,159,202,68,88,167,135,130,215,4,211,216,220,106,156,55,135,207,198,204,209,81,246,247,188,132,19,151,208,253,173,112,2,55,73,103,39,155,161,75,196,200,113,61,254,10,58,82,171,201,165,50,99,183,181,110,195,72,89,86,207,74,129,205,172,6,10,118,131,227,
+248,4,244,130,203,140,206,117,196,228,105,190,148,196,251,223,58,244,99,38,9,116,255,186,8,39,170,55,206,166,115,109,225,68,153,61,224,169,155,186,141,107,171,99,226,53,224,230,68,220,56,250,28,203,241,41,91,74,0,89,131,16,145,121,61,131,71,75,155,192,91,71,253,102,197,221,116,24,213,239,105,147,162,152,12,91,65,9,20,153,97,194,233,254,85,126,253,216,38,45,113,63,232,178,41,173,26,170,98,144,79,182,15,143,125,78,202,42,124,13,0,94,192,142,209,223,42,171,73,19,195,66,121,12,157,220,84,221,124,82,82,2,129,55,243,129,18,3,67,114,116,69,231,21,146,6,23,198,194,188,236,106,229,88,248,233,167,133,176,192,30,69,192,74,24,58,10,138,210,160,141,222,36,203,227,41,71,232,43,178,104,157,227,185,58,18,37,232,205,149,145,87,128,12,214,253,109,148,221,97,23,189,233,234,97,169,223,179,116,80,99,124,115,105,51,43,165,158,77,200,243,131,165,70,109,34,148,33,222,41,128,34,118,126,159,136,137,216,112,246,49,79,10,116,14,228,
+140,142,78,113,126,119,220,12,253,254,144,238,8,1,180,78,247,1,185,217,101,205,155,128,64,186,50,121,227,128,46,14,191,195,36,101,85,49,207,12,242,166,60,191,9,232,58,183,168,185,147,99,140,38,29,242,62,80,77,67,39,70,106,113,90,206,198,198,6,121,237,71,131,6,118,177,38,139,183,146,95,153,44,99,79,243,208,139,163,9,233,196,84,50,39,21,19,102,24,57,30,58,125,83,162,98,61,48,118,24,96,102,10,242,31,176,241,232,12,229,235,31,159,226,239,38,112,200,214,144,176,165,66,250,176,180,154,198,91,29,112,166,163,175,208,207,138,76,144,8,128,177,8,201,179,129,131,182,127,190,60,210,89,107,96,90,227,56,234,103,89,61,138,7,123,207,216,154,27,120,173,110,100,221,80,120,86,14,77,44,181,218,186,1,120,175,127,244,61,179,131,12,252,27,27,123,173,13,105,98,241,196,0,68,61,88,78,52,26,251,129,232,174,35,224,113,138,105,212,143,56,246,48,243,240,161,32,101,129,105,59,60,134,141,17,155,7,211,154,80,104,93,216,93,255,32,
+226,136,48,152,205,154,105,128,188,106,228,29,44,143,140,15,232,50,142,23,241,159,255,56,235,31,95,27,27,70,132,147,209,27,199,124,210,253,151,243,230,226,232,197,225,209,211,238,111,103,135,47,143,78,159,30,29,224,193,243,250,71,167,231,38,162,15,130,83,242,166,251,232,145,250,230,224,244,242,228,162,169,186,55,101,100,224,29,235,31,29,227,63,185,38,64,245,255,126,172,154,61,192,5,172,127,188,228,146,194,184,60,96,185,111,124,15,158,34,49,156,254,98,38,71,48,194,28,56,181,163,17,232,144,131,138,114,113,122,131,33,7,38,15,91,58,126,97,105,134,56,23,67,82,226,96,30,229,128,135,168,239,187,58,91,111,149,174,70,180,122,228,153,219,111,121,35,196,33,197,36,218,192,48,87,73,64,191,232,229,88,1,139,133,242,35,26,0,50,249,142,201,193,231,0,215,44,95,94,159,74,66,14,40,25,168,101,148,149,70,175,176,217,198,22,190,98,248,104,26,241,150,50,235,3,155,71,246,179,63,88,44,201,59,172,168,248,86,162,41,157,30,99,86,74,131,
+51,251,96,119,180,114,54,30,206,181,118,157,177,74,203,99,178,12,169,124,143,174,172,55,97,146,7,213,83,93,188,92,123,153,23,230,64,119,120,57,140,16,76,113,136,252,83,148,143,101,198,163,49,66,124,50,150,142,249,92,90,160,216,173,242,112,117,131,27,247,54,49,102,143,181,67,7,230,44,201,143,159,123,108,202,52,93,128,66,53,134,206,179,52,53,76,163,140,61,78,22,182,122,252,73,239,174,92,28,246,42,163,50,104,37,111,29,250,97,101,188,139,198,100,16,69,249,97,62,48,35,75,238,6,224,66,49,77,140,209,231,213,112,15,45,22,254,53,221,197,208,130,237,250,128,100,21,139,232,83,9,246,1,157,108,20,249,77,77,57,252,59,115,122,70,129,105,138,205,130,211,58,211,95,182,175,198,10,221,214,151,230,34,81,108,3,162,24,145,252,162,152,43,125,33,147,191,78,175,9,63,147,210,166,50,136,58,7,241,89,52,190,28,63,127,117,242,212,66,72,248,248,173,147,123,105,98,115,120,19,122,11,18,66,226,94,139,158,159,38,6,113,242,165,200,124,
+221,184,242,50,122,201,110,188,56,26,39,67,215,43,120,190,46,16,80,7,231,192,40,74,166,197,212,157,98,50,135,210,121,225,106,246,147,103,26,120,195,179,217,153,122,191,67,88,192,2,53,248,33,104,186,30,87,141,99,38,102,116,86,116,204,85,24,40,5,241,36,183,73,42,70,74,2,78,227,91,25,20,5,170,52,240,52,35,91,119,79,21,72,182,104,239,132,21,164,84,94,84,230,210,168,94,90,53,2,3,17,165,182,28,75,18,227,67,254,196,105,96,174,172,201,24,19,9,11,207,106,226,82,232,176,77,132,80,128,111,103,177,233,218,187,104,81,86,76,168,202,145,12,134,196,126,219,80,171,223,80,5,242,96,192,175,127,164,4,95,223,54,201,93,111,146,115,16,207,130,241,208,173,216,39,179,34,231,114,77,11,110,28,69,236,227,183,14,136,8,210,194,97,128,128,138,70,17,242,164,207,58,197,30,194,82,181,131,121,17,81,52,174,113,221,75,15,86,27,109,155,188,114,125,180,92,28,94,207,225,129,161,116,38,14,62,241,49,4,146,58,113,38,161,182,222,
+200,100,134,152,213,158,172,60,243,169,82,117,230,126,198,67,21,102,62,179,135,28,3,252,125,82,8,67,71,254,151,89,18,229,98,176,36,61,37,146,224,53,241,141,142,177,42,182,246,105,104,132,145,182,112,81,131,76,246,51,204,97,27,78,67,118,175,191,35,3,114,128,150,130,44,47,133,124,128,215,224,110,218,167,228,21,126,74,153,39,243,153,111,100,252,48,154,211,217,96,111,221,112,180,220,245,143,251,218,202,175,81,249,234,69,247,183,255,185,60,186,128,238,146,4,195,241,100,225,141,184,47,198,72,187,141,188,56,48,45,53,215,133,197,223,155,215,135,145,178,154,64,154,50,181,37,189,103,3,38,190,23,163,113,122,123,103,116,50,79,194,183,133,8,5,205,155,210,152,249,141,76,230,38,19,188,97,162,116,198,177,206,165,125,35,76,155,240,92,68,179,128,107,78,78,154,90,50,229,167,95,33,89,175,38,159,54,145,243,113,20,45,44,251,5,208,182,159,127,93,160,234,195,247,162,63,65,220,16,42,224,152,131,22,164,224,190,126,96,180,119,222,200,74,23,44,
+58,2,217,153,231,26,93,150,21,142,72,144,77,176,49,25,113,120,8,79,230,184,62,12,61,92,146,153,205,171,60,150,188,102,43,207,132,174,95,120,22,165,254,13,251,51,70,123,22,231,196,74,58,197,135,26,9,96,200,15,9,53,104,87,30,223,167,231,154,180,157,238,119,201,112,146,2,90,195,238,119,50,185,187,101,43,233,185,173,127,196,149,225,198,156,203,178,86,207,121,22,187,62,198,213,212,59,193,233,83,20,40,112,218,140,87,167,145,253,14,32,114,48,180,14,221,24,211,250,89,224,107,27,145,112,182,54,227,231,116,111,153,160,14,248,234,133,227,121,249,125,147,197,111,43,100,39,76,64,72,127,185,97,141,164,3,233,208,164,14,153,203,162,162,21,93,147,73,174,239,134,28,70,77,159,186,61,188,244,32,91,17,254,221,212,169,23,243,148,199,155,131,70,116,61,143,50,94,1,71,87,52,206,38,191,213,130,164,54,249,109,2,79,244,44,22,181,44,194,143,122,110,172,113,205,27,74,121,165,46,213,104,1,176,243,82,234,195,106,19,195,190,121,231,20,62,
+92,142,207,135,230,106,151,143,189,154,74,154,150,217,77,185,83,161,13,114,8,75,61,48,192,58,255,12,15,21,176,112,151,147,175,20,1,27,142,125,160,206,145,48,67,255,151,222,79,24,251,227,135,185,114,164,115,213,43,77,62,148,201,199,44,173,224,97,178,51,185,49,40,167,8,210,60,75,29,3,76,214,70,41,219,134,81,224,177,93,18,139,133,28,187,183,152,29,13,84,45,120,73,121,168,163,152,42,196,161,249,61,4,2,140,125,188,74,167,203,80,33,203,94,72,15,24,102,106,36,86,97,102,138,32,114,61,149,138,141,179,192,195,166,244,71,50,173,30,67,23,199,178,234,240,31,0,19,47,170,63,95,149,40,112,128,125,231,18,106,21,114,222,127,136,64,18,5,88,165,81,204,94,222,232,221,3,107,20,114,54,137,211,208,79,240,91,163,12,31,2,77,137,142,92,6,75,12,210,179,40,249,231,218,134,99,100,34,196,75,112,76,202,201,87,248,212,19,235,187,31,54,250,239,157,31,157,30,253,210,196,106,124,156,148,80,190,187,85,239,110,137,75,194,175,136,
+93,36,149,70,171,233,180,214,154,58,224,11,47,175,25,136,13,252,213,195,40,112,28,211,195,235,45,150,58,209,145,96,0,243,89,203,220,48,50,126,205,247,249,20,56,136,211,227,212,250,4,145,92,154,23,206,199,12,29,131,212,60,118,244,72,174,44,221,172,6,84,67,85,166,96,36,220,159,76,70,236,221,132,136,207,143,106,141,203,160,70,79,69,24,17,227,175,108,182,34,185,1,208,247,129,55,202,63,1,231,139,241,254,247,229,173,123,198,60,38,113,134,102,89,105,94,68,239,54,43,130,61,11,26,148,236,242,169,164,43,77,177,83,20,138,115,166,58,69,138,171,4,21,230,210,92,22,84,182,180,170,10,84,215,89,93,237,5,0,117,251,137,0,53,155,153,183,156,213,17,212,242,73,107,21,116,23,166,62,11,131,171,68,128,78,183,90,250,178,18,1,83,19,179,174,26,248,139,158,196,75,65,145,24,26,14,55,7,89,206,5,149,58,199,227,73,100,131,75,254,132,44,28,9,48,219,70,187,233,180,225,144,51,60,154,177,3,58,154,232,31,122,223,116,178,223,
+203,154,82,206,201,28,228,186,87,32,133,236,199,194,205,121,154,87,101,200,45,200,132,170,173,101,5,202,107,194,212,78,149,192,67,197,221,116,106,45,223,67,233,72,249,9,146,115,129,81,129,142,19,170,152,55,193,50,17,174,169,19,27,154,243,141,140,1,147,146,19,201,97,30,247,46,180,188,35,59,133,19,109,146,228,94,160,26,222,131,145,64,106,67,255,203,212,215,197,124,209,77,211,77,222,117,215,123,110,76,98,129,156,183,180,51,20,29,167,168,166,246,88,132,114,62,230,77,123,54,218,56,6,41,44,190,37,184,204,170,178,247,74,125,51,37,99,110,17,181,191,178,153,205,138,97,235,86,158,141,241,66,151,83,16,79,16,139,82,67,202,68,51,164,12,157,74,36,236,45,240,86,87,189,51,22,117,78,40,92,241,178,178,78,23,94,216,172,233,159,49,206,87,137,147,66,151,51,166,94,73,124,184,73,212,67,185,65,96,255,169,152,74,63,145,233,60,105,153,76,228,36,145,130,36,30,78,106,174,122,181,72,43,117,58,231,202,229,34,87,184,236,229,12,102,191,
+244,60,114,106,158,178,12,79,57,61,107,39,186,158,24,80,185,71,208,23,98,49,22,120,23,139,211,75,216,52,158,207,201,58,205,240,141,110,160,236,64,189,90,43,32,44,234,124,44,132,55,101,81,9,190,167,125,164,23,49,237,68,174,248,186,182,188,50,155,176,158,178,122,199,52,144,251,208,126,190,77,174,174,68,130,172,63,59,185,96,126,161,184,65,125,61,59,4,166,44,74,142,168,234,105,46,88,248,84,70,13,22,2,6,75,105,62,199,227,147,92,249,222,105,134,78,252,178,144,130,124,195,185,148,105,45,89,125,197,67,90,70,229,208,105,43,79,204,179,56,26,141,87,92,18,245,220,50,123,75,251,105,33,100,21,48,202,7,145,193,106,195,178,79,94,241,38,92,126,180,254,113,223,195,156,251,73,78,36,193,87,119,18,237,105,174,126,70,14,164,167,147,209,24,239,223,220,171,48,74,16,214,126,136,98,51,151,107,34,233,87,153,14,48,69,243,236,201,242,112,234,242,78,143,105,162,171,60,95,156,68,97,190,69,132,8,119,148,45,30,254,200,127,158,71,77,
+161,226,215,172,130,95,179,65,160,19,10,131,52,142,215,162,9,77,97,195,134,113,116,124,225,25,174,148,170,49,201,51,25,139,44,10,210,243,163,147,243,139,253,147,131,195,183,142,254,213,170,38,13,125,147,230,51,39,210,96,146,12,229,21,176,23,187,55,84,208,139,194,219,52,0,248,204,107,220,200,160,187,195,127,236,31,92,28,255,47,91,56,125,42,62,145,34,200,10,247,167,171,90,252,207,19,255,60,200,165,7,158,67,195,54,98,191,50,213,9,123,75,112,61,232,3,13,235,142,120,209,236,152,157,237,80,186,88,75,135,152,145,142,224,16,79,194,53,78,19,156,58,88,242,51,229,123,60,24,2,100,213,32,240,19,1,4,230,81,43,190,250,0,254,46,111,210,229,13,56,64,249,218,245,131,92,234,56,73,61,220,145,60,102,17,232,56,73,37,61,188,249,255,79,15,255,64,
+
diff --git a/uppsrc/CtrlCore/src.tpp/Frame$en-us.tpp b/uppsrc/CtrlCore/src.tpp/Frame$en-us.tpp
new file mode 100644
index 000000000..dd9206bc2
--- /dev/null
+++ b/uppsrc/CtrlCore/src.tpp/Frame$en-us.tpp
@@ -0,0 +1,18 @@
+TITLE("Frame")
+COMPRESSED
+120,156,221,90,139,87,20,245,30,255,87,230,156,186,5,164,48,59,187,11,203,82,29,205,30,247,158,219,169,14,114,79,231,30,14,176,195,238,0,147,195,206,54,51,11,209,235,12,130,154,15,212,16,196,136,148,212,181,64,34,164,16,65,76,240,154,93,192,110,10,166,146,15,68,41,69,244,248,168,180,146,244,126,127,191,223,204,236,236,11,55,241,94,77,143,174,187,191,231,247,241,249,62,126,223,223,47,155,161,30,126,152,158,69,63,68,223,230,143,243,105,174,128,245,11,74,78,54,111,179,57,50,88,198,158,177,224,239,47,166,103,36,205,73,72,181,37,162,85,44,176,138,53,205,98,117,216,173,22,27,147,10,31,22,171,133,177,51,86,155,197,193,164,219,28,86,171,131,118,186,5,86,150,115,178,5,198,225,200,64,147,24,152,196,164,217,25,75,154,205,97,115,88,172,105,14,6,230,50,52,205,208,105,140,221,98,179,58,24,187,211,195,201,238,156,108,214,97,205,72,202,76,133,73,86,180,19,44,78,91,82,25,91,154,141,161,173,52,99,131,173,44,14,135,205,146,
+102,119,88,211,83,83,157,110,214,167,240,162,87,219,139,183,88,24,75,70,190,37,45,3,104,126,251,237,183,147,45,54,154,80,96,131,197,44,180,13,72,181,64,27,109,99,210,44,246,116,58,221,238,176,56,104,43,44,110,79,163,237,78,31,43,177,197,177,89,183,223,150,245,52,218,201,43,28,44,145,244,152,197,146,6,83,82,103,165,62,100,177,165,1,163,14,171,205,238,72,163,97,115,134,97,172,86,198,98,101,210,211,25,123,170,61,205,89,196,177,30,78,202,201,126,35,239,173,191,60,243,194,236,127,204,167,178,101,107,6,245,44,16,195,61,146,147,45,211,25,84,118,174,34,250,120,183,203,233,74,113,165,204,83,36,97,158,40,113,174,20,89,114,123,68,183,43,101,110,190,232,87,240,120,217,245,48,231,117,205,246,203,185,100,190,156,67,177,18,71,137,249,175,112,110,69,166,96,31,190,132,243,80,5,146,88,76,161,117,240,32,10,235,139,82,138,88,133,42,16,165,98,138,245,249,56,144,133,215,205,81,172,23,70,251,189,110,36,101,86,224,149,50,74,44,64,
+75,178,84,62,167,148,114,156,151,130,173,57,9,47,70,229,139,18,236,128,231,240,176,91,9,207,149,38,107,28,152,254,179,103,252,125,14,77,101,255,133,166,103,211,244,156,4,58,153,78,102,236,246,68,74,67,141,222,14,82,167,242,244,159,65,98,115,208,18,76,6,245,55,47,108,91,192,2,137,30,174,128,247,242,136,64,68,91,65,144,35,78,214,118,183,106,219,59,65,128,78,99,165,208,31,9,174,68,167,78,20,229,122,91,223,56,201,180,179,222,155,144,168,19,241,76,177,15,36,82,194,75,138,159,21,128,16,89,145,252,110,69,148,66,246,69,252,90,169,16,190,244,25,57,145,82,40,17,121,79,12,33,128,212,48,33,207,179,101,32,244,208,65,9,250,207,92,196,86,38,104,59,151,116,160,175,161,67,93,143,4,197,42,133,118,37,230,185,158,8,118,210,58,155,4,37,160,116,132,33,69,4,164,240,50,85,204,41,69,162,135,202,47,211,20,224,45,196,74,23,75,189,148,128,9,164,18,248,2,202,203,113,30,206,147,136,49,33,113,30,191,27,141,83,138,56,
+74,230,95,231,144,190,48,112,16,82,160,219,173,176,222,66,129,195,210,179,101,232,34,75,154,7,226,147,114,102,191,153,201,21,112,18,135,80,9,52,184,253,18,124,87,200,252,224,84,234,229,34,192,164,222,40,22,251,0,157,50,38,140,16,53,11,190,83,178,194,74,208,82,202,43,69,88,62,20,247,170,159,47,97,5,180,30,44,141,70,115,175,1,188,0,241,132,206,132,231,56,5,13,76,72,76,158,15,191,19,18,19,147,169,44,180,17,44,230,102,5,65,54,43,6,91,136,32,224,101,48,26,101,42,1,239,136,88,199,123,18,140,210,186,84,100,240,184,168,15,147,194,203,17,226,113,61,26,98,75,255,35,84,205,245,120,16,111,211,193,10,245,107,176,138,28,106,134,149,252,122,92,184,130,45,101,131,83,196,53,17,12,70,24,103,104,56,84,21,154,76,144,252,65,84,240,215,47,131,67,67,128,32,202,198,83,163,78,65,190,141,42,4,255,231,53,154,13,169,134,161,13,232,15,131,27,64,223,31,78,66,152,58,12,239,17,167,30,34,85,240,18,203,123,149,160,
+155,9,145,253,211,18,91,154,75,161,79,99,128,73,226,64,115,176,125,86,180,157,221,162,87,86,34,183,14,186,139,16,79,17,182,182,225,38,40,195,245,97,90,131,74,75,166,180,212,129,226,139,125,2,87,12,138,99,177,75,6,13,113,200,75,70,19,115,41,72,25,113,20,203,224,95,196,161,197,48,238,80,148,36,40,26,0,176,185,16,7,165,15,100,193,184,225,31,81,54,143,28,146,172,152,77,52,241,238,235,14,176,28,67,115,8,43,185,24,49,49,164,11,121,7,103,210,187,33,226,121,224,69,0,219,165,200,209,16,158,129,91,214,227,33,120,71,108,19,75,208,130,56,235,69,182,128,92,18,194,171,135,196,96,217,159,239,134,65,178,62,131,236,117,71,218,210,200,156,253,230,75,172,225,121,239,190,28,51,185,98,177,36,90,172,141,42,13,9,143,214,18,154,233,37,66,134,6,5,130,167,32,17,197,43,146,176,28,38,50,153,120,177,132,147,176,89,160,100,2,219,155,211,196,246,180,174,154,50,25,126,164,127,54,22,14,115,206,137,65,159,74,204,91,19,85,
+150,41,62,35,33,72,156,226,151,188,50,229,21,33,55,124,157,147,68,202,235,47,206,7,211,194,41,159,196,249,32,6,1,191,72,20,188,230,112,189,50,226,189,152,149,10,121,175,225,64,131,6,230,154,173,39,90,176,60,153,5,194,149,180,204,128,204,130,116,200,199,99,135,140,242,74,112,160,228,27,104,195,35,114,136,24,5,114,72,65,68,249,64,16,205,230,80,110,242,240,5,126,129,232,80,35,149,146,69,216,92,246,113,110,190,128,119,83,242,2,222,139,51,16,174,160,0,5,209,4,129,95,192,81,133,2,202,125,89,73,244,67,152,69,27,60,227,225,149,103,121,78,240,36,198,212,182,46,42,36,165,100,138,138,204,94,131,255,205,7,58,61,172,228,65,233,132,2,68,144,88,175,117,254,195,245,152,235,49,146,25,1,175,50,7,194,65,225,35,234,20,196,169,40,115,122,178,128,136,46,22,101,69,40,51,98,27,89,135,74,128,0,198,10,224,19,19,205,41,58,104,71,75,188,53,61,193,130,115,33,255,32,222,178,88,59,0,40,160,36,88,12,188,34,11,76,
+154,34,155,204,99,141,22,10,98,62,80,200,123,17,141,208,3,121,93,104,143,126,10,192,73,11,82,123,62,242,179,50,95,232,37,52,250,189,2,95,12,250,246,232,224,50,168,209,68,50,55,132,100,172,64,157,68,125,57,196,27,135,115,74,61,248,191,56,159,18,68,113,129,235,145,2,142,19,76,135,9,234,141,55,224,0,152,230,180,48,52,227,180,164,211,14,39,147,206,88,139,44,25,115,18,24,26,108,3,143,123,86,35,57,199,233,36,13,166,13,130,171,26,189,65,2,141,166,121,98,49,194,6,252,158,195,224,22,33,213,134,78,150,233,169,25,193,131,1,120,243,236,36,234,5,191,160,157,19,192,103,105,243,159,160,94,16,147,131,63,230,204,225,139,217,66,206,153,106,97,30,97,172,105,106,197,105,117,139,170,170,21,223,221,130,79,245,151,37,13,23,15,244,45,85,27,91,213,222,222,155,85,159,52,110,59,218,183,117,69,95,93,231,226,214,190,195,13,203,85,245,210,250,145,13,223,15,245,7,250,171,7,3,117,3,173,181,227,199,155,187,14,93,109,26,255,
+15,180,161,166,205,208,134,154,174,65,27,106,90,60,24,216,57,168,170,171,235,63,168,157,58,253,179,78,134,197,128,62,241,146,40,43,194,94,83,31,128,88,12,103,238,111,94,153,83,102,198,221,167,13,23,15,246,85,169,141,59,106,246,246,221,184,212,187,242,243,158,163,171,63,89,119,160,226,252,119,123,22,111,220,251,222,215,155,143,119,93,190,217,181,106,97,131,170,174,26,233,252,121,253,145,142,195,63,12,12,54,236,28,216,125,108,164,233,63,109,181,117,213,77,53,251,3,227,205,31,7,134,155,222,27,232,63,116,117,96,203,80,123,109,117,211,34,220,26,24,30,192,173,3,135,87,142,52,93,28,171,235,56,210,82,255,251,88,103,231,212,208,10,85,157,58,182,232,198,46,245,223,187,12,181,78,199,42,36,29,119,131,215,161,109,85,21,189,13,171,191,236,155,220,93,113,125,101,239,169,133,199,23,86,239,106,57,213,125,106,162,113,231,175,23,235,127,90,243,233,174,107,163,31,151,171,106,207,216,138,109,45,191,223,104,61,120,253,198,209,145,137,237,91,107,91,
+14,181,159,30,234,31,8,192,183,101,135,218,241,55,220,8,223,90,2,228,219,177,137,177,129,35,191,110,220,82,115,164,126,121,199,239,131,234,231,234,129,169,242,157,181,157,229,223,196,197,226,83,126,69,17,189,51,87,231,182,42,181,173,97,117,101,223,165,221,21,221,123,26,27,27,219,79,111,190,62,160,214,92,110,95,84,185,126,195,240,230,13,23,58,127,188,212,162,170,151,235,39,183,124,123,232,219,235,129,51,43,47,78,174,104,63,58,113,118,195,173,246,79,107,137,62,15,52,19,125,142,31,34,250,92,78,180,28,168,33,90,30,168,217,126,116,162,107,195,222,235,107,2,245,23,126,175,5,52,55,254,84,241,243,216,103,187,227,98,20,34,136,247,46,64,247,35,100,152,192,235,191,213,202,190,91,213,151,123,219,42,250,142,54,54,45,57,189,113,108,184,242,151,182,186,119,151,93,30,185,242,65,133,170,182,172,255,241,194,177,91,251,187,2,117,91,191,222,253,117,160,125,83,237,192,161,230,225,166,253,85,129,118,252,173,163,105,63,254,134,27,225,219,65,210,29,
+88,211,222,49,48,186,251,230,141,141,147,192,96,99,119,249,210,237,135,111,124,31,55,131,119,3,176,136,67,208,102,239,59,26,135,35,229,141,45,171,123,150,244,14,148,191,255,205,199,55,91,135,23,159,252,236,76,247,18,85,253,113,234,135,147,19,95,125,209,84,245,83,215,180,28,237,35,12,55,117,227,238,45,91,87,237,250,42,176,255,219,133,234,160,122,174,124,170,237,215,47,227,131,169,192,186,23,204,156,175,131,160,185,230,154,222,222,169,173,123,23,86,245,247,168,139,126,88,62,186,243,82,253,240,129,159,143,47,239,85,213,155,63,86,77,222,232,31,218,185,37,30,151,186,25,121,222,143,234,246,125,216,113,125,169,170,110,92,181,184,255,252,123,155,226,98,6,231,29,145,204,252,19,194,255,31,198,97,55,4,136,175,126,233,93,177,241,183,182,222,246,85,251,247,252,246,217,158,201,35,13,11,87,94,57,187,30,172,237,253,51,157,61,219,219,167,38,78,108,233,175,35,228,95,56,68,200,143,21,56,26,7,70,91,47,126,127,177,250,128,170,238,93,179,105,219,
+177,242,197,193,96,241,156,8,73,36,138,17,36,199,144,245,234,198,60,114,170,64,25,157,135,151,125,2,91,134,66,58,228,127,222,194,89,20,78,191,140,108,139,130,217,115,37,137,45,187,109,152,201,18,125,243,57,84,134,85,68,105,134,178,66,193,244,224,82,245,195,11,171,123,251,110,190,219,90,94,179,225,200,191,222,217,115,162,178,188,111,229,119,125,149,99,99,93,103,183,45,61,121,110,84,237,86,213,201,147,87,55,95,253,229,218,196,150,201,11,67,163,59,206,55,183,118,141,87,15,174,58,184,3,62,91,191,28,62,3,159,93,53,85,43,224,115,124,232,243,214,77,39,118,86,170,234,251,107,87,78,126,177,232,157,248,96,44,130,183,45,254,127,243,181,12,248,186,121,120,248,74,71,127,160,238,248,178,125,129,15,235,142,95,109,170,175,59,190,239,106,127,224,220,241,171,253,215,2,117,27,175,76,156,12,92,236,236,105,106,56,81,223,191,177,155,240,85,181,102,71,156,124,61,207,21,40,119,139,43,140,236,165,189,109,31,215,44,106,187,85,125,254,212,134,37,
+223,173,171,220,211,60,86,121,96,213,238,181,215,222,235,89,119,174,113,89,251,201,179,229,128,252,75,191,125,219,124,126,112,229,141,213,107,91,70,218,207,214,236,171,14,12,174,29,90,118,180,125,188,127,168,126,112,12,26,7,206,244,87,111,10,76,5,96,217,115,245,21,227,103,42,215,197,197,78,38,95,88,116,87,249,1,45,181,237,95,183,184,247,230,187,23,218,222,89,50,217,178,167,119,211,138,77,135,199,70,23,141,86,126,211,221,179,163,178,243,135,14,181,94,61,213,113,253,220,238,43,31,109,223,212,12,236,140,15,53,45,1,118,90,2,39,182,141,247,87,7,62,95,219,3,141,136,197,83,131,163,35,11,85,117,73,253,246,247,255,101,230,231,173,183,66,43,220,86,227,112,130,207,53,90,221,139,84,213,224,20,43,176,138,126,66,9,157,1,231,217,220,144,243,108,174,126,94,205,205,53,102,230,61,110,212,53,114,99,213,237,97,120,158,105,148,149,202,50,245,60,153,151,247,135,87,208,202,2,230,242,9,26,225,140,190,146,207,159,47,240,238,184,136,9,86,
+201,226,92,33,236,14,130,206,72,50,202,35,132,131,224,200,32,201,218,137,220,124,48,215,74,86,249,172,172,223,188,160,227,80,184,190,100,227,140,173,121,89,80,129,155,211,207,100,120,28,171,29,131,57,79,33,62,74,249,194,234,50,97,251,146,189,96,91,30,149,172,203,240,129,93,16,89,143,108,20,176,240,209,206,84,133,49,202,20,164,150,128,9,141,125,21,229,74,33,214,164,221,64,185,30,138,40,144,16,10,76,24,11,74,20,56,33,108,130,104,202,80,245,42,69,171,215,184,30,69,53,5,215,163,164,94,67,88,68,5,113,119,17,47,120,36,180,149,192,203,138,153,95,218,92,182,178,129,206,103,191,137,197,165,148,249,184,208,235,168,187,200,138,185,208,147,130,97,251,180,233,174,45,39,27,55,81,33,184,206,10,34,48,2,90,214,232,37,7,125,120,208,34,67,129,151,132,249,213,71,61,153,19,94,149,139,180,228,88,86,104,170,63,133,44,25,180,224,56,102,234,247,85,153,193,62,103,180,249,161,54,23,86,156,54,108,41,55,210,19,80,143,199,160,50,154,
+221,17,149,225,226,150,199,164,58,173,29,95,204,148,242,30,248,100,21,69,226,243,209,93,2,178,7,153,147,74,80,85,70,54,91,44,186,111,32,87,140,216,46,81,233,73,55,73,100,219,2,132,70,148,245,72,40,166,24,151,6,38,251,212,139,230,47,227,13,145,83,64,55,152,172,0,35,113,49,133,78,166,104,92,197,38,253,94,15,216,172,162,123,130,82,125,18,247,42,50,78,173,122,86,196,161,205,254,168,33,100,167,132,2,213,112,251,127,200,52,12,197,160,31,58,200,40,23,65,39,149,229,122,82,19,91,52,93,62,158,245,164,161,56,42,12,254,78,99,241,231,51,205,95,67,46,107,245,198,96,77,61,137,200,53,88,68,230,189,138,201,70,172,148,43,207,253,90,100,189,125,62,167,16,215,236,229,74,137,144,163,149,193,241,220,217,111,190,28,210,159,148,66,101,226,202,33,85,194,10,126,14,250,93,73,200,111,69,92,217,69,212,131,167,175,252,62,199,41,33,172,76,87,248,141,78,199,60,173,144,22,228,199,112,39,225,73,67,100,21,255,30,249,11,176,158,
+25,123,140,231,51,115,35,188,207,180,222,226,182,241,28,147,21,211,175,224,240,76,220,74,232,93,11,10,86,216,31,200,188,7,223,76,17,211,191,7,6,74,108,232,118,230,105,18,220,116,166,121,191,129,6,167,239,247,33,106,8,93,119,6,27,61,124,60,8,184,161,162,184,158,123,143,154,172,167,238,77,106,114,91,216,0,97,119,150,194,144,52,96,70,57,12,9,130,128,19,10,151,125,80,245,130,128,48,122,14,243,87,178,99,236,36,70,35,41,44,139,41,50,166,133,164,49,193,56,245,128,100,49,38,144,7,65,147,245,84,110,4,0,205,143,2,104,77,170,145,79,10,76,216,52,63,22,49,191,39,128,12,165,236,54,217,141,41,89,140,76,111,202,64,196,127,13,29,112,155,252,102,6,233,77,40,159,119,158,223,152,56,138,113,97,123,223,248,28,209,55,99,167,19,13,63,51,116,56,64,213,157,69,41,228,40,238,121,140,202,122,42,30,163,53,137,237,207,19,163,72,253,248,62,132,140,70,216,157,161,198,28,87,30,48,224,104,23,235,126,133,199,15,166,245,135,
+19,250,211,144,103,69,65,16,75,81,184,53,122,240,27,13,240,148,16,214,201,27,141,34,78,240,161,203,22,16,27,186,123,9,123,164,2,113,216,252,222,84,123,233,163,189,183,192,61,179,140,144,142,43,132,102,21,68,137,228,248,49,43,170,186,189,226,151,21,237,213,28,126,140,154,128,159,196,115,10,121,205,97,126,64,135,211,10,86,144,69,242,166,130,242,137,178,241,4,155,44,48,221,243,176,120,94,131,145,141,34,15,132,81,94,58,199,247,116,209,84,240,141,241,44,47,207,149,100,154,233,54,119,69,125,83,25,43,0,71,43,46,188,68,140,193,29,94,37,138,166,142,24,207,33,245,80,103,206,193,208,115,169,104,227,49,241,186,229,136,232,113,13,182,70,79,212,177,175,225,215,174,175,250,121,244,54,198,92,40,152,169,226,50,163,231,48,127,122,205,153,14,102,15,170,234,204,89,202,159,65,113,81,50,222,40,138,51,114,149,123,172,182,50,179,218,66,82,215,153,234,45,44,91,120,112,84,23,251,32,122,31,105,143,202,249,47,124,149,253,29,
diff --git a/uppsrc/CtrlCore/src.tpp/Layout$en-us.tpp b/uppsrc/CtrlCore/src.tpp/Layout$en-us.tpp
new file mode 100644
index 000000000..7f72cd803
--- /dev/null
+++ b/uppsrc/CtrlCore/src.tpp/Layout$en-us.tpp
@@ -0,0 +1,6 @@
+TITLE("Layout functions")
+COMPRESSED
+120,156,237,86,219,110,219,70,16,253,149,1,114,129,164,90,234,222,72,174,196,162,136,161,232,193,176,17,23,174,130,20,32,104,121,69,174,163,173,41,82,225,46,157,24,117,253,237,93,94,36,83,174,28,195,65,30,226,192,122,32,41,238,156,153,51,51,103,118,25,16,120,249,18,237,161,23,232,129,223,232,173,60,23,69,98,194,64,49,198,125,65,28,255,226,240,120,232,247,222,116,92,214,45,189,96,235,133,122,152,114,135,98,70,92,123,193,20,19,135,80,134,57,25,50,78,41,71,163,40,17,90,135,65,66,56,247,75,16,177,32,226,57,4,123,140,51,142,169,199,137,197,18,132,8,242,136,131,25,229,196,25,197,82,71,97,32,56,245,123,39,174,5,209,50,146,117,142,176,75,152,199,8,162,136,48,27,10,115,206,176,231,112,58,116,221,81,36,86,70,101,105,19,75,97,76,176,63,199,158,111,57,223,220,220,12,48,67,53,3,102,157,97,196,44,85,108,223,33,70,60,236,12,209,208,225,152,35,106,157,59,30,114,70,43,145,139,229,253,169,59,15,166,238,161,145,
+50,210,186,232,253,130,177,103,33,238,158,251,2,51,207,38,202,41,115,184,135,108,112,66,8,165,4,83,50,28,18,199,117,188,209,66,138,88,230,97,240,207,236,223,87,147,119,253,247,127,66,160,169,15,193,43,132,250,8,193,145,184,202,10,3,231,69,26,149,169,234,240,117,24,104,228,67,235,230,248,135,27,115,27,127,149,8,35,103,191,133,205,171,55,29,52,64,3,226,56,93,104,26,211,152,206,54,22,12,142,54,111,127,159,205,118,32,47,51,21,239,0,34,56,72,149,169,41,110,150,59,235,167,211,179,209,217,104,108,242,228,20,202,235,198,224,236,245,173,7,10,81,123,105,15,54,224,163,211,22,171,109,72,178,29,176,91,213,132,248,176,175,181,250,152,234,102,29,170,134,74,35,115,13,38,131,165,92,206,101,94,49,129,75,145,43,49,79,164,134,236,28,130,91,143,123,32,210,24,68,28,91,196,66,46,75,152,189,131,94,201,72,157,43,25,67,208,91,51,30,148,49,153,237,83,111,92,213,175,127,61,46,171,11,157,44,7,109,242,34,50,69,46,187,240,89,
+153,197,157,152,131,187,28,150,133,54,176,16,151,18,86,197,60,81,17,136,40,146,90,111,34,212,105,218,56,77,232,254,245,31,34,151,169,169,252,236,178,106,178,233,95,175,201,129,74,181,17,105,36,7,223,87,54,211,111,149,77,201,252,94,217,76,79,91,142,191,34,150,71,245,189,85,254,19,249,169,80,185,237,102,99,95,213,127,46,33,75,101,169,135,185,208,178,206,185,214,199,116,187,213,211,237,250,131,185,90,201,71,180,234,103,41,254,237,164,182,201,218,13,202,236,136,217,178,88,136,252,214,224,172,215,114,111,148,73,228,255,155,59,22,73,162,91,156,171,17,181,83,153,66,84,173,76,75,152,237,178,89,100,113,53,206,235,17,133,176,35,42,97,168,244,35,8,104,206,10,91,237,47,102,61,216,211,108,245,65,165,113,246,185,251,93,123,124,199,170,78,172,127,93,135,170,255,254,120,90,56,62,124,218,106,16,205,38,176,111,55,207,149,201,242,206,193,219,227,195,238,186,211,193,175,144,93,132,59,15,129,202,197,82,92,216,105,87,166,50,142,235,207,32,152,23,
+198,88,197,116,132,61,122,47,109,83,98,152,95,193,36,181,59,203,179,94,204,184,60,79,146,159,67,51,39,242,111,25,213,154,25,239,191,27,79,142,218,186,137,234,68,31,169,157,26,117,143,132,116,244,44,32,187,225,60,45,9,109,81,127,214,208,15,161,161,201,23,245,100,62,98,30,208,79,235,220,154,252,117,48,109,171,71,150,89,62,253,179,43,252,15,74,68,176,184,
diff --git a/uppsrc/CtrlCore/src.tpp/RectTracker$en-us.tpp b/uppsrc/CtrlCore/src.tpp/RectTracker$en-us.tpp
new file mode 100644
index 000000000..30d92beb5
--- /dev/null
+++ b/uppsrc/CtrlCore/src.tpp/RectTracker$en-us.tpp
@@ -0,0 +1,9 @@
+TITLE("RectTracker")
+COMPRESSED
+120,156,213,89,107,115,218,56,20,253,43,154,233,99,72,150,178,178,108,99,99,186,157,116,211,180,205,52,109,58,148,221,253,192,64,16,70,9,222,24,203,35,139,36,164,211,254,246,189,242,11,155,24,226,134,180,51,219,204,128,172,199,185,247,28,93,93,95,209,1,65,79,159,226,38,126,130,239,249,231,188,97,231,116,225,203,225,192,51,12,187,75,137,217,189,252,112,218,233,238,31,52,218,198,158,66,209,0,69,183,52,221,54,117,205,32,109,248,208,116,141,152,68,55,52,155,116,12,91,215,109,236,184,62,141,162,225,192,39,182,221,85,139,72,147,60,33,150,73,52,203,176,13,91,211,45,155,192,90,130,49,193,22,49,53,67,183,137,233,76,89,228,14,7,212,214,187,251,189,54,44,210,149,37,0,199,90,155,24,150,65,176,142,137,1,166,52,219,54,52,203,180,245,78,187,237,184,52,148,30,15,82,91,158,166,17,173,59,209,172,46,248,252,253,251,247,150,102,224,196,3,3,192,52,108,128,171,26,244,97,131,88,154,217,193,29,211,214,108,172,3,184,105,97,211,9,
+169,160,243,205,212,205,123,169,91,216,241,36,3,136,253,223,52,205,130,37,237,102,251,137,102,88,64,212,214,13,211,182,48,24,39,132,232,58,209,116,210,233,16,179,109,90,206,140,209,41,19,195,193,215,179,111,207,142,62,189,248,235,11,26,68,90,247,131,51,134,191,30,115,101,95,80,247,146,9,245,24,11,235,140,84,243,132,187,212,63,225,60,28,161,193,51,140,95,96,60,26,29,52,112,11,183,136,105,238,161,116,11,178,17,116,182,106,31,96,84,128,45,206,113,138,179,86,88,225,98,226,123,110,21,24,202,189,24,62,31,14,34,210,45,34,35,47,66,52,113,4,201,25,149,72,176,80,176,136,5,113,139,71,158,218,57,47,184,64,115,62,165,62,242,1,165,133,142,37,114,105,80,152,128,104,48,253,157,11,232,137,188,91,6,95,174,164,193,133,207,16,244,249,94,192,16,141,80,228,197,61,9,14,15,153,160,106,101,75,185,132,187,72,125,153,213,122,70,203,192,117,64,143,140,154,234,59,164,190,63,129,25,218,40,222,121,148,63,103,164,147,238,151,195,226,34,
+133,155,206,87,205,242,212,87,43,189,148,193,76,170,254,12,4,114,83,116,148,182,217,20,49,234,206,144,244,230,12,84,99,104,10,141,32,2,58,48,62,3,230,172,6,173,47,76,30,46,68,196,197,241,156,94,176,113,195,133,213,82,13,36,207,207,199,123,14,90,247,62,93,62,170,138,13,52,126,158,83,0,181,202,240,249,164,198,138,245,42,12,149,229,124,198,89,73,179,120,245,8,149,65,138,150,116,52,207,251,247,50,213,192,120,20,11,51,231,139,136,33,55,118,4,209,48,100,112,122,3,23,4,91,8,21,84,106,74,28,82,247,203,245,209,11,190,64,108,141,27,177,118,170,181,155,62,41,222,93,97,70,153,129,17,42,77,40,82,142,110,183,113,246,2,111,14,49,30,31,5,126,190,58,13,117,88,210,155,199,101,153,224,253,12,150,244,102,23,150,170,167,16,243,241,227,174,33,159,194,62,56,214,227,252,80,74,13,235,145,46,182,8,50,225,139,96,170,130,122,149,253,174,103,158,202,18,51,149,17,35,120,99,151,71,33,133,6,92,34,118,227,50,54,173,161,
+218,161,239,133,143,45,153,194,252,121,122,185,91,228,114,193,114,88,18,164,134,4,255,120,83,57,27,55,188,64,238,200,59,6,218,74,28,108,84,30,138,96,11,167,107,133,170,14,131,84,198,203,187,29,205,104,200,226,151,97,84,243,229,192,125,46,146,68,144,52,119,127,31,40,152,13,169,32,30,27,161,242,148,218,123,169,86,109,224,221,240,206,17,20,8,112,20,36,156,17,24,190,16,234,160,236,213,16,225,51,149,146,137,32,141,121,116,205,197,116,188,191,163,12,41,230,131,98,94,57,48,138,221,88,13,142,247,11,26,133,91,52,10,19,195,74,165,186,65,240,134,70,51,54,133,16,216,141,114,2,179,98,92,246,109,26,143,102,238,213,9,77,238,123,187,59,21,163,108,242,41,82,131,63,224,210,107,245,194,85,213,228,99,164,134,28,236,65,233,33,146,44,28,159,205,163,66,132,252,81,28,55,240,221,24,121,237,74,239,138,74,22,229,65,66,51,31,106,144,255,192,88,216,83,147,199,141,9,231,254,142,236,115,180,173,236,149,161,74,250,147,187,236,222,114,225,
+2,181,85,70,144,28,93,130,149,248,84,112,225,93,120,1,148,17,241,109,160,6,219,158,74,30,73,86,172,26,129,230,174,175,196,24,103,67,150,172,54,57,66,105,99,195,107,112,91,213,32,178,170,129,79,254,5,240,26,10,188,99,178,250,244,173,189,138,139,156,96,77,197,89,235,49,185,16,65,154,194,23,66,168,75,223,221,12,94,195,165,184,121,183,52,105,170,195,216,220,112,34,183,120,27,195,253,188,170,100,181,29,77,244,3,39,91,222,148,206,244,235,147,227,119,159,198,103,189,227,119,239,251,63,134,179,172,194,249,243,180,223,63,253,152,111,205,103,38,206,185,152,103,151,40,117,101,46,28,160,108,143,146,219,120,138,182,159,248,168,174,226,165,174,229,16,69,33,115,189,243,101,90,143,178,233,69,124,49,119,185,8,152,40,213,238,234,130,59,97,10,58,185,198,78,157,212,31,248,66,95,191,18,27,91,14,177,77,236,24,186,161,191,84,191,230,188,210,48,124,206,180,238,65,131,96,184,70,171,80,81,102,51,138,224,209,208,113,238,118,47,243,110,116,152,152,
+130,231,3,146,244,164,154,156,28,189,237,231,179,210,190,254,233,231,188,171,207,195,241,11,159,157,203,148,74,107,125,114,21,192,225,209,167,254,81,47,239,61,81,203,149,34,181,22,39,187,148,247,254,201,165,228,243,237,62,172,217,171,166,145,123,0,42,154,166,138,159,150,214,33,123,53,128,214,122,123,197,157,156,243,43,184,88,220,213,181,26,169,146,91,181,52,113,208,223,187,51,144,218,103,27,101,169,132,88,39,19,3,212,247,96,195,238,148,253,248,246,109,21,210,197,36,72,81,192,174,127,60,235,189,231,226,246,4,234,185,164,242,104,150,63,86,105,239,222,188,144,102,189,12,238,65,181,199,13,126,88,102,91,62,112,157,123,243,176,117,126,145,96,69,202,43,164,183,75,149,158,102,80,37,220,242,64,170,223,31,97,105,41,227,1,231,102,241,25,184,196,73,140,70,80,114,115,240,160,52,10,30,151,47,106,10,175,52,35,246,173,244,70,204,126,227,108,149,222,151,42,88,242,145,154,177,242,55,19,242,17,99,37,131,251,127,196,202,242,215,196,202,21,136,226,185,
+143,16,41,203,36,10,102,44,206,30,191,48,84,214,187,146,95,0,164,240,75,149,109,245,255,15,172,95,234,97,21,220,233,225,115,211,15,90,20,238,43,21,229,233,161,170,175,196,194,133,34,181,96,165,25,211,185,242,128,15,21,140,42,81,10,114,164,88,74,211,69,4,55,74,216,32,52,21,244,90,237,142,170,73,92,14,23,103,168,245,37,67,209,18,166,206,139,90,192,215,240,63,201,155,238,64,
diff --git a/uppsrc/CtrlCore/src.tpp/TopWindow$en-us.tpp b/uppsrc/CtrlCore/src.tpp/TopWindow$en-us.tpp
new file mode 100644
index 000000000..d38568f4d
--- /dev/null
+++ b/uppsrc/CtrlCore/src.tpp/TopWindow$en-us.tpp
@@ -0,0 +1,19 @@
+TITLE("TopWindow")
+COMPRESSED
+120,156,229,28,107,83,219,72,242,175,76,177,143,179,89,27,252,4,7,246,170,146,5,54,71,37,132,173,144,92,238,142,194,145,44,143,177,22,89,227,211,72,60,114,92,126,251,117,247,60,36,89,50,24,108,216,92,109,62,196,88,154,233,233,119,247,116,207,248,180,197,190,255,190,81,107,124,215,184,231,223,206,62,31,185,73,16,159,157,250,157,78,111,215,109,117,119,47,222,28,191,216,93,127,89,217,234,84,17,74,19,160,180,183,155,237,94,183,221,236,180,182,224,191,102,187,217,234,182,218,157,102,175,245,162,211,107,183,123,141,29,47,112,165,60,59,13,90,189,222,46,78,106,193,164,214,118,183,213,220,238,244,58,189,102,123,187,215,130,185,173,70,163,213,216,110,117,155,157,118,175,213,221,25,114,233,157,157,186,189,246,238,250,251,45,152,212,198,149,0,120,163,185,213,234,108,119,90,141,118,163,213,129,165,154,189,94,167,185,221,237,181,95,108,109,237,120,238,52,246,69,168,215,242,155,205,86,115,119,208,220,222,5,156,191,126,253,186,209,236,52,20,6,29,0,214,
+108,116,0,213,38,60,107,116,90,219,205,238,139,198,139,110,175,217,107,180,1,120,119,187,209,221,153,186,145,59,153,79,122,247,94,210,183,27,59,126,204,1,196,250,79,205,230,54,76,217,170,109,125,215,236,108,3,161,189,118,167,219,219,110,192,226,173,86,171,221,110,53,219,173,23,47,90,221,173,238,246,206,152,187,67,30,157,157,254,231,243,127,127,56,120,87,255,120,194,78,101,123,151,125,16,211,79,126,56,20,87,63,158,157,202,198,46,195,143,238,238,155,190,179,227,236,236,197,81,208,103,167,63,52,26,245,70,163,223,127,89,105,108,52,54,90,221,110,149,105,214,155,55,236,115,250,247,203,70,10,51,59,98,39,59,38,133,52,77,6,129,239,149,129,98,184,252,25,226,211,82,104,53,118,251,177,152,250,30,160,182,233,108,226,219,61,17,113,103,83,70,158,250,234,124,207,67,167,158,72,231,59,131,61,126,18,174,64,198,38,0,223,231,145,127,201,135,108,20,9,224,31,60,96,197,213,26,102,181,148,14,22,241,105,196,37,15,99,201,0,5,167,30,240,75,30,
+48,120,199,167,28,254,11,99,118,165,6,138,17,27,11,25,179,227,147,26,75,100,226,6,193,13,27,114,79,68,110,12,203,94,249,241,152,105,101,170,1,19,133,228,155,95,132,152,108,2,240,24,104,97,131,36,142,69,40,25,143,189,141,60,46,135,147,169,136,98,23,86,26,185,94,12,88,176,80,196,156,249,128,208,216,53,203,59,245,136,123,48,232,60,224,172,226,74,88,121,228,135,176,238,224,134,41,110,236,156,240,248,61,12,97,110,56,52,143,94,235,71,19,30,143,197,80,86,217,80,112,137,208,129,62,47,72,134,28,6,223,40,170,94,127,60,100,114,202,61,127,228,123,134,44,31,241,173,88,162,226,177,239,93,176,129,136,64,217,216,72,68,192,58,233,127,241,195,243,106,141,253,158,0,140,120,12,0,35,238,42,188,1,127,103,205,19,97,28,137,32,224,67,103,13,113,253,232,252,228,252,52,67,255,167,49,15,51,2,129,121,2,88,207,135,53,230,19,148,1,242,153,188,10,243,64,30,60,66,118,111,68,27,241,6,242,202,7,193,137,171,16,80,170,248,35,
+68,33,34,214,1,97,213,13,246,97,140,243,249,216,189,244,69,18,129,124,66,248,198,220,64,1,1,192,239,196,30,129,100,64,142,250,235,196,139,56,224,163,89,182,145,183,157,29,212,58,139,42,126,121,207,127,7,14,59,21,167,186,99,204,137,93,250,81,12,250,97,21,48,99,19,151,194,31,90,189,180,246,0,134,165,224,216,87,149,170,49,15,34,193,64,84,88,17,139,46,121,20,8,176,251,33,50,97,202,35,16,200,4,160,40,101,3,6,42,249,49,203,147,43,151,152,194,64,219,145,25,18,152,17,4,56,247,23,215,187,72,166,26,244,12,189,75,145,180,135,70,176,56,69,254,100,26,240,9,202,0,190,102,21,66,10,173,80,49,27,128,118,93,72,54,17,67,152,26,8,49,69,250,50,182,156,128,194,250,160,23,135,25,77,248,5,231,128,132,201,66,15,247,247,94,189,219,59,120,107,236,167,102,88,39,181,4,104,116,197,12,3,21,58,70,64,87,190,228,53,230,207,135,250,207,131,19,50,75,240,71,254,121,168,132,194,175,1,99,180,68,99,164,111,221,27,
+145,196,7,240,184,154,89,247,149,231,241,169,93,23,0,85,9,255,80,132,92,173,168,108,41,142,18,64,33,63,248,248,77,21,95,105,80,92,73,15,56,124,136,76,209,60,177,38,15,204,201,48,206,24,23,121,170,33,115,234,200,243,24,37,227,185,72,43,170,138,140,193,181,177,129,210,15,48,11,114,116,64,75,78,99,16,136,244,64,219,188,49,159,85,31,80,2,227,253,201,109,131,198,33,180,62,69,68,102,190,166,58,133,79,211,32,129,126,65,233,80,86,113,60,61,107,198,51,248,225,165,184,64,199,128,206,132,102,105,143,107,253,54,122,184,43,235,98,166,137,68,124,153,206,87,82,193,129,11,38,187,145,89,187,82,0,243,58,59,199,84,22,177,12,197,192,18,211,56,129,32,230,6,254,23,46,201,153,162,247,196,8,4,36,160,177,226,87,151,188,62,106,19,184,230,68,130,247,101,167,143,138,157,118,41,240,93,248,53,6,249,78,156,31,157,106,63,197,226,108,134,100,208,182,16,93,46,250,201,16,158,162,179,113,207,57,226,103,141,112,131,125,148,124,148,4,
+74,18,214,168,17,209,61,55,244,32,182,234,72,184,4,255,180,155,43,97,160,126,35,239,99,29,102,9,5,58,200,238,10,196,129,38,240,201,52,190,169,89,83,26,3,49,203,72,31,173,55,197,189,196,165,2,14,37,51,219,224,103,210,199,206,95,63,31,238,31,252,227,240,131,165,253,112,148,143,162,96,240,33,178,29,35,36,249,202,138,228,252,78,109,73,35,91,78,101,242,1,47,9,157,202,64,136,0,53,5,190,156,97,232,92,1,208,87,211,233,17,122,39,12,165,4,216,60,56,179,233,75,205,248,127,180,13,162,136,188,175,78,91,64,182,228,113,61,49,228,36,157,206,174,145,202,250,158,98,94,253,246,32,55,226,78,249,33,141,165,242,203,248,224,101,165,152,198,196,200,231,228,113,92,2,94,170,179,224,237,208,249,161,72,21,10,148,132,209,200,177,31,232,81,144,155,130,177,129,246,138,9,135,4,45,78,34,8,137,35,55,0,247,165,124,188,76,188,49,249,120,229,237,181,19,207,141,36,59,152,129,171,71,232,48,132,120,232,24,56,43,131,195,125,202,64,
+13,64,28,191,160,52,112,196,250,38,152,48,45,116,233,6,9,135,49,31,0,0,198,193,89,124,174,48,16,43,110,161,215,134,37,77,84,172,82,174,163,3,194,82,94,198,38,4,43,147,179,130,41,103,228,123,229,15,207,121,156,147,176,26,88,46,225,24,61,235,157,34,88,133,254,207,229,203,39,17,93,188,130,117,65,103,39,37,46,248,213,16,55,3,210,196,218,169,144,62,69,212,76,26,103,115,18,126,237,113,62,196,221,140,188,136,209,158,1,180,156,186,30,168,224,1,189,66,86,192,174,26,57,6,226,142,97,69,72,115,88,5,54,40,128,0,69,63,189,12,236,68,120,117,14,81,249,228,163,144,119,20,157,51,110,166,87,238,158,223,107,139,48,203,19,55,106,58,76,42,101,173,233,63,36,24,130,14,19,74,182,232,240,30,226,230,142,184,148,24,187,200,73,22,135,23,173,204,32,181,2,14,42,223,36,150,102,225,163,25,151,245,207,255,127,236,83,134,255,7,178,47,235,246,190,33,246,217,124,161,95,44,66,49,231,199,133,108,56,83,250,162,154,80,217,244,
+54,75,157,90,173,108,191,123,63,239,95,86,154,173,94,53,83,128,114,254,10,193,183,153,102,249,46,196,102,8,81,19,246,243,207,240,202,216,58,96,76,209,11,226,180,218,141,200,236,171,116,227,3,89,2,110,141,94,169,141,138,14,224,144,231,166,34,66,226,202,164,51,65,94,207,121,247,56,201,57,235,152,69,172,72,110,243,61,199,51,9,142,221,33,34,139,92,137,140,236,187,63,129,144,230,251,167,111,64,72,22,185,18,33,217,119,127,2,33,153,178,102,105,137,1,146,169,116,159,136,89,24,176,97,192,51,181,85,140,12,88,130,53,219,220,103,64,88,161,123,140,117,220,251,113,158,197,87,213,130,109,33,88,151,125,125,105,138,67,207,75,132,42,32,47,74,133,201,124,13,53,143,197,117,145,196,29,16,56,242,195,19,44,236,148,27,47,190,234,179,220,128,172,13,202,47,37,54,136,68,97,130,48,241,67,127,130,101,19,152,77,219,150,43,93,14,34,97,208,83,234,104,128,110,169,189,161,170,37,190,182,56,205,150,215,112,19,154,214,235,168,215,224,14,2,78,
+133,75,207,13,81,113,129,127,19,119,8,201,9,44,28,240,8,51,27,93,196,196,245,202,108,19,72,0,219,204,162,42,204,42,75,48,246,120,154,21,184,101,233,223,62,189,219,239,51,252,191,148,157,164,172,227,171,112,88,228,42,2,180,59,40,202,193,84,139,35,117,76,224,246,64,143,218,45,6,36,15,3,187,157,83,207,76,35,167,140,3,233,170,245,91,178,55,179,76,30,208,146,166,112,18,223,4,243,180,108,8,187,188,97,159,209,71,41,99,156,207,50,55,61,175,108,138,68,179,237,195,129,139,19,111,32,215,111,79,236,196,7,24,91,70,23,138,4,169,242,117,142,170,153,138,54,240,5,212,61,199,26,53,162,82,77,171,222,158,8,101,60,159,96,126,29,99,91,114,184,16,229,79,236,239,14,174,151,20,51,191,158,35,232,7,8,212,192,168,223,206,167,250,9,164,56,67,251,61,114,92,20,181,21,56,157,57,73,216,103,103,125,214,245,204,115,59,105,136,114,173,15,242,195,108,19,37,87,109,82,49,119,158,167,177,94,38,245,179,232,216,223,125,124,251,182,
+150,122,30,172,6,101,0,173,130,33,115,137,202,184,83,254,111,140,55,16,136,189,36,138,176,91,128,205,159,75,110,137,30,233,38,25,142,166,104,133,129,110,26,9,15,146,187,37,17,61,114,253,249,200,102,28,191,72,226,69,25,83,158,58,55,168,72,127,87,49,97,78,161,187,205,220,233,148,26,134,185,170,22,85,136,45,190,7,215,220,75,98,158,237,200,98,236,207,116,131,102,187,18,24,183,49,185,212,113,28,139,152,72,52,196,242,17,118,174,101,236,70,212,44,82,77,202,65,146,47,24,82,187,18,91,188,37,250,102,209,173,223,98,255,151,10,213,88,59,133,231,129,239,169,118,184,230,44,22,19,135,190,196,124,2,243,93,63,224,166,213,103,150,38,196,137,214,26,19,97,112,147,18,225,252,5,179,145,192,205,104,138,100,149,180,80,130,155,18,103,77,38,0,208,89,115,234,36,188,106,110,197,59,252,243,123,46,233,156,3,236,21,208,98,82,182,46,37,126,219,74,41,73,74,245,30,10,70,85,144,101,213,231,69,78,235,79,25,98,254,196,15,220,8,173,19,
+112,83,154,64,210,207,217,50,166,147,118,139,37,31,141,123,62,42,232,39,197,195,30,26,219,227,55,185,243,30,139,244,140,236,204,59,68,96,108,9,41,205,116,91,208,13,233,86,246,241,27,106,109,224,129,37,185,136,26,153,233,48,79,152,99,12,186,197,147,151,216,92,82,85,203,246,177,228,170,217,75,145,172,123,198,143,34,91,207,157,67,58,123,140,235,166,173,67,233,6,106,17,135,202,71,163,236,33,159,162,59,53,224,179,91,146,25,47,167,97,212,111,247,5,155,130,23,162,243,9,246,228,22,198,103,53,98,153,0,117,228,94,63,41,149,26,252,31,76,229,49,30,161,114,167,79,68,228,111,137,61,57,72,39,250,34,220,113,10,181,228,148,242,119,55,46,221,162,62,150,244,98,90,155,195,190,152,197,30,74,35,136,153,84,183,60,141,189,187,61,155,139,241,19,3,119,5,40,106,139,88,57,138,6,238,242,40,30,91,161,174,24,71,72,186,181,222,84,82,197,169,102,52,103,21,37,119,76,99,126,21,94,34,139,118,176,88,65,215,203,190,42,214,133,50,43,
+168,106,170,42,8,209,185,56,106,122,143,232,213,85,225,16,40,229,226,120,228,44,127,156,15,54,10,52,151,18,46,157,175,19,136,26,27,249,145,212,39,238,242,243,139,39,76,135,220,190,174,169,25,212,155,198,157,136,194,7,107,72,120,146,136,42,45,33,191,42,208,65,71,14,50,4,8,136,53,115,8,96,238,57,100,251,172,146,132,1,68,176,220,185,11,111,236,134,231,92,230,160,79,184,27,82,78,90,213,152,227,132,90,230,184,29,102,205,54,111,45,46,201,205,217,62,216,222,0,2,1,110,108,112,143,131,204,7,177,208,34,149,106,153,235,33,81,170,194,54,206,24,187,192,219,103,170,37,124,240,227,178,74,66,246,96,58,153,80,193,23,211,66,159,78,226,8,50,247,62,211,127,204,81,85,231,115,156,91,166,168,173,244,30,19,68,252,50,63,60,25,64,96,184,248,249,92,5,151,71,51,41,59,98,236,166,59,255,124,85,64,46,207,24,249,88,150,148,248,221,28,45,51,142,55,39,117,245,110,70,244,234,97,158,127,175,121,156,99,225,195,253,244,158,46,20,
+88,118,220,89,59,126,112,213,20,2,18,238,16,31,151,146,12,114,217,8,109,230,236,209,192,112,136,59,96,78,126,22,93,105,246,120,245,88,36,193,16,107,233,84,99,39,4,176,214,145,200,242,178,206,192,132,43,240,16,146,63,91,115,229,157,40,114,167,176,159,48,67,42,42,23,91,129,18,222,23,252,103,145,122,184,74,253,29,63,87,195,35,147,44,253,34,174,87,174,66,197,238,21,133,7,215,102,82,0,245,122,158,190,196,207,175,47,38,183,125,94,94,152,157,205,183,197,139,127,9,49,121,18,191,82,218,210,52,171,97,255,221,176,198,48,102,211,106,203,40,112,207,37,221,169,144,201,20,47,64,169,10,43,85,153,205,182,103,195,26,118,70,179,43,131,234,70,70,184,248,245,91,242,82,69,94,23,188,148,25,242,124,94,106,22,169,71,122,41,12,120,86,186,40,192,85,29,216,114,189,139,243,72,36,153,86,232,67,51,192,223,32,195,166,203,110,125,102,255,156,147,5,78,163,236,187,188,46,219,185,230,238,93,16,160,74,39,82,223,179,194,215,25,133,31,88,
+196,211,155,36,41,8,26,45,51,131,212,166,229,100,79,4,34,250,21,79,185,150,40,174,194,174,126,107,193,60,71,38,149,114,79,189,45,176,112,78,54,85,20,220,61,141,48,115,24,81,111,220,82,94,45,192,225,249,124,200,243,106,5,121,54,152,211,204,128,85,121,204,35,247,34,87,193,198,61,189,27,153,115,150,126,152,222,33,21,119,123,198,35,188,113,9,170,9,206,205,244,78,102,207,236,204,119,135,148,197,91,3,126,22,191,88,198,211,130,103,76,7,61,159,111,44,34,182,132,119,76,129,149,249,199,98,153,29,190,28,129,92,205,141,154,157,199,107,44,193,121,34,117,181,135,45,220,27,42,97,210,237,64,42,171,219,158,174,49,236,82,169,20,233,70,125,208,148,47,65,181,133,114,167,74,209,136,172,62,221,133,24,234,131,69,140,196,190,243,40,157,202,161,117,143,83,204,104,15,77,91,101,104,125,39,240,112,170,148,111,248,141,220,247,37,108,145,7,137,250,193,131,2,199,246,85,123,82,98,159,210,142,163,11,116,4,129,93,0,136,13,0,136,21,201,224,
+166,150,205,251,236,237,37,58,110,169,39,56,117,156,193,42,192,120,193,46,66,113,21,162,60,156,181,177,136,213,43,103,173,74,147,32,198,138,17,157,223,83,215,92,76,83,117,198,173,169,194,161,46,131,13,13,178,113,238,138,247,131,252,69,99,183,68,254,32,25,167,66,226,161,175,19,247,156,227,173,200,244,118,119,58,60,101,244,58,195,121,41,79,105,254,103,61,57,29,149,59,254,154,242,157,174,34,75,230,195,172,124,247,220,94,254,181,191,55,224,75,136,0,55,234,134,180,182,74,29,48,88,101,166,89,80,154,22,227,185,85,68,245,185,252,254,91,55,58,231,121,222,60,48,177,35,38,246,25,125,204,73,232,238,224,169,179,22,32,6,206,90,9,119,55,216,97,108,126,18,32,101,44,223,0,77,195,187,208,174,188,96,18,226,178,55,38,135,55,212,14,15,134,129,114,23,184,237,123,171,227,247,3,244,178,246,116,154,74,135,42,253,236,224,26,155,63,154,216,156,27,93,144,197,0,24,136,39,35,16,46,8,4,89,154,23,143,156,145,79,89,125,209,34,85,191,
+61,193,191,105,98,217,200,20,161,250,45,105,97,126,228,147,28,175,213,215,166,127,67,21,193,75,207,69,165,239,167,119,173,251,76,125,206,81,106,153,97,251,67,130,121,196,39,179,61,234,98,115,50,115,207,220,28,125,154,26,164,103,110,115,31,146,3,42,104,123,13,242,209,43,142,185,128,31,226,11,117,188,6,173,201,252,180,136,84,63,164,97,239,255,129,77,57,107,170,159,5,242,86,191,45,128,58,96,16,192,39,9,24,150,109,30,214,210,38,93,77,55,194,74,109,76,210,113,78,100,101,217,219,12,63,232,92,144,186,11,139,11,227,207,103,224,113,31,204,133,179,68,208,221,112,58,202,67,64,51,104,104,172,245,41,38,253,203,46,195,251,76,55,253,146,205,117,214,75,124,103,26,139,247,208,208,162,4,239,43,220,7,222,249,90,190,0,115,190,158,45,180,214,62,47,95,138,157,253,15,42,215,166,43,
+
diff --git a/uppsrc/CtrlCore/src.tpp/all.i b/uppsrc/CtrlCore/src.tpp/all.i
new file mode 100644
index 000000000..cfdf1d5d0
--- /dev/null
+++ b/uppsrc/CtrlCore/src.tpp/all.i
@@ -0,0 +1,20 @@
+TOPIC("Ctrl$en-us")
+#include "Ctrl$en-us.tpp"
+END_TOPIC
+
+TOPIC("Frame$en-us")
+#include "Frame$en-us.tpp"
+END_TOPIC
+
+TOPIC("TopWindow$en-us")
+#include "TopWindow$en-us.tpp"
+END_TOPIC
+
+TOPIC("Layout$en-us")
+#include "Layout$en-us.tpp"
+END_TOPIC
+
+TOPIC("RectTracker$en-us")
+#include "RectTracker$en-us.tpp"
+END_TOPIC
+
diff --git a/uppsrc/CtrlCore/srcdoc.tpp/AboutFrames$en-us.tpp b/uppsrc/CtrlCore/srcdoc.tpp/AboutFrames$en-us.tpp
new file mode 100644
index 000000000..098de3c76
--- /dev/null
+++ b/uppsrc/CtrlCore/srcdoc.tpp/AboutFrames$en-us.tpp
@@ -0,0 +1,1186 @@
+TITLE("About Frames")
+COMPRESSED
+120,156,172,188,137,115,226,89,126,39,248,175,40,162,189,222,
+234,118,185,34,165,188,171,98,34,108,183,103,118,28,225,245,
+78,184,61,49,177,209,209,177,157,157,165,238,206,117,117,102,
+109,102,86,87,219,51,118,32,129,64,18,18,32,113,131,196,
+141,0,33,113,8,113,8,4,226,144,184,239,251,70,2,113,
+95,226,22,247,254,80,102,85,103,87,183,103,236,8,235,224,
+120,239,123,191,247,126,63,62,223,239,123,252,120,97,238,143,
+254,232,222,199,247,190,119,239,127,241,243,233,95,46,254,252,
+217,87,95,188,253,201,143,191,88,120,242,228,179,23,143,239,
+61,248,236,217,252,227,207,254,175,167,159,253,243,63,255,243,
+39,79,159,46,124,6,72,154,7,36,205,223,123,112,127,126,
+97,126,254,193,189,123,15,22,30,207,63,124,122,239,233,195,
+39,243,79,238,221,127,252,96,225,225,227,123,15,63,253,242,
+217,235,103,191,250,201,143,159,61,185,255,217,15,254,246,17,
+192,181,240,241,195,239,221,159,191,63,127,111,254,209,194,3,
+128,234,222,253,123,11,15,230,23,30,206,63,121,242,96,254,
+241,195,39,247,159,62,122,244,233,243,103,95,190,125,241,234,
+229,79,126,252,179,25,31,192,117,31,224,186,247,248,201,163,
+7,243,0,207,131,135,11,247,31,63,124,0,240,62,120,48,
+63,15,188,158,127,248,248,209,227,199,159,190,125,241,246,139,
+69,128,103,254,209,227,207,158,61,88,248,236,135,0,227,131,
+143,31,125,15,48,110,225,49,192,249,96,225,193,163,7,247,
+159,44,220,159,127,178,176,240,232,233,253,7,79,31,0,86,
+207,47,124,250,226,237,34,96,227,207,0,150,25,27,192,245,
+16,80,247,224,225,131,249,251,64,48,30,60,126,120,31,160,
+122,12,60,63,184,247,116,126,1,208,249,228,222,195,135,128,
+186,197,223,124,19,161,89,112,0,182,71,128,178,133,199,15,
+103,196,79,30,60,153,191,255,248,201,194,131,133,71,11,128,
+250,123,143,1,15,103,186,31,126,250,249,226,155,231,0,219,
+253,133,249,207,222,2,6,125,246,195,63,123,248,217,60,192,
+252,248,227,199,223,91,184,247,244,222,194,163,199,79,1,125,
+128,169,128,183,247,159,62,157,191,255,4,208,247,96,254,225,
+189,249,251,159,62,127,245,249,204,195,133,135,247,238,207,20,
+62,1,134,224,17,32,248,46,30,15,31,205,3,230,46,220,
+127,2,104,124,60,127,255,62,240,248,240,193,147,199,159,190,
+89,156,13,194,219,87,175,127,242,227,31,252,217,71,247,62,
+185,247,201,194,195,135,223,7,184,159,2,220,79,238,63,184,
+127,255,193,163,167,15,230,239,221,7,148,0,34,30,204,98,
+245,232,30,48,138,243,15,23,158,124,250,179,103,111,0,141,
+111,31,204,130,250,195,63,153,159,127,60,27,249,217,36,2,
+194,126,255,201,195,251,128,242,71,192,3,48,162,128,135,247,
+129,216,44,60,125,240,228,254,253,39,247,62,125,254,197,179,
+55,111,62,8,208,15,102,94,206,207,127,60,63,255,189,199,
+179,184,62,188,191,240,224,233,44,58,247,23,128,0,47,60,
+122,248,116,30,136,240,195,71,15,238,45,124,250,122,241,255,
+251,234,197,235,197,95,45,190,4,66,252,2,80,254,217,55,
+163,243,126,14,206,154,102,226,22,62,158,95,0,102,225,195,
+71,143,238,205,226,245,16,152,10,11,247,31,2,1,191,55,
+255,228,1,96,16,240,11,12,240,219,247,211,240,110,106,204,
+166,197,252,253,143,231,239,127,239,233,194,131,251,128,29,79,
+31,60,0,66,0,240,207,63,157,159,159,191,247,4,248,5,
+252,2,2,115,55,49,230,129,217,251,126,50,205,63,248,120,
+254,193,247,30,3,179,22,24,159,167,15,102,74,159,222,159,
+197,109,1,136,250,194,163,123,15,129,240,47,188,227,90,152,
+5,123,225,143,128,112,207,47,60,153,253,207,2,62,255,240,
+227,121,96,246,3,118,205,63,124,8,248,122,31,136,240,194,
+19,192,223,135,64,200,239,223,205,232,249,199,79,62,253,155,
+197,175,223,252,229,179,183,139,239,103,201,15,126,248,71,119,
+65,127,244,241,252,163,239,221,155,113,63,124,242,20,24,181,
+249,7,179,136,221,127,240,224,233,194,211,251,247,31,46,60,
+125,120,255,209,61,32,114,111,222,173,220,25,235,108,249,220,
+45,189,247,34,30,127,60,255,24,88,71,128,119,15,31,2,
+254,222,49,1,190,62,158,159,153,177,240,228,233,163,153,223,
+239,69,252,244,79,191,120,241,114,102,3,48,25,62,123,55,
+254,63,248,118,2,60,1,22,200,147,39,143,238,221,127,10,
+196,1,112,255,222,67,96,106,3,75,255,9,48,176,192,184,
+46,0,243,126,182,246,159,255,253,179,95,44,254,244,79,223,
+47,204,255,254,255,252,211,255,246,31,255,230,79,255,235,143,
+230,126,252,6,88,102,127,254,179,87,95,189,157,251,79,192,
+192,44,190,249,227,159,252,248,205,189,207,230,222,63,253,199,
+103,207,127,57,247,95,127,250,39,63,253,147,185,31,190,125,
+253,197,220,71,95,191,248,252,23,139,111,191,63,247,203,103,
+111,230,94,189,92,156,123,245,122,238,87,175,94,47,206,253,
+252,142,249,147,247,66,230,158,1,77,175,126,246,255,46,62,
+127,251,102,238,243,197,215,47,126,189,248,57,64,242,234,87,
+119,82,238,104,230,238,38,229,220,219,95,62,123,59,247,243,
+87,175,127,53,247,236,203,47,23,129,185,241,242,249,226,220,
+179,151,0,245,87,47,159,207,174,60,207,190,120,241,246,31,
+230,94,253,124,38,242,217,220,207,22,223,126,189,184,248,114,
+14,176,119,241,245,59,147,126,246,234,53,160,225,142,231,5,
+160,237,215,47,22,191,254,228,119,157,248,208,166,25,45,96,
+203,140,122,113,230,219,204,143,25,219,139,151,159,47,254,230,
+147,119,18,103,109,207,190,248,250,217,63,188,121,231,214,220,
+215,47,222,254,242,29,197,220,189,247,138,230,94,188,153,251,
+234,205,87,207,190,248,226,31,128,103,64,226,219,87,115,95,
+190,126,245,235,23,159,47,2,14,63,127,5,44,115,192,233,
+111,140,3,204,159,73,254,100,238,175,222,189,152,251,252,21,
+96,208,203,87,111,231,94,46,190,227,253,229,179,95,207,252,
+254,135,223,103,254,248,189,17,247,230,158,63,123,9,4,96,
+238,205,226,219,25,199,223,124,245,197,187,72,126,244,125,32,
+236,192,56,44,254,230,217,175,190,252,98,241,227,185,31,189,
+5,248,159,255,45,16,252,185,159,205,4,222,221,65,238,188,
+250,128,103,238,217,123,239,238,125,250,65,180,128,139,231,159,
+254,143,191,123,245,229,127,3,188,125,245,245,28,224,249,203,
+207,190,109,255,64,238,115,192,137,223,118,204,222,125,242,195,
+87,95,188,122,253,209,143,254,250,237,15,255,225,217,203,239,
+255,182,19,16,241,201,159,127,254,249,71,119,68,63,122,241,
+143,139,255,229,213,155,143,190,255,29,130,31,45,190,157,201,
+253,232,222,199,115,192,31,112,245,188,123,248,14,209,223,126,
+245,242,163,111,155,126,103,136,255,195,220,159,253,217,139,95,
+1,51,252,211,71,143,22,254,24,88,0,171,224,18,8,2,
+2,129,150,71,83,224,17,116,11,219,169,198,135,118,127,168,
+77,129,221,168,68,32,89,192,83,101,147,14,145,235,91,235,
+209,17,230,230,16,177,197,88,229,138,204,101,20,8,99,116,
+195,184,1,183,172,20,59,28,179,19,4,149,15,102,73,200,
+98,21,163,156,140,57,46,166,249,82,153,172,170,57,34,59,
+116,209,51,153,35,4,190,144,175,251,87,148,246,184,74,219,
+203,105,15,52,161,253,250,209,89,106,71,149,79,10,136,218,
+93,162,213,100,17,76,174,201,100,21,76,149,23,186,118,228,
+74,48,120,53,121,166,175,241,18,201,54,255,220,172,129,91,
+138,55,110,239,229,214,186,106,133,116,200,184,220,142,120,66,
+244,234,182,221,121,5,63,24,249,21,13,150,30,125,196,166,
+104,189,120,173,117,183,55,49,246,120,167,212,99,41,234,66,
+159,17,84,52,190,173,56,231,198,151,216,190,46,163,143,206,
+55,118,46,43,14,162,77,18,215,147,192,50,221,214,132,16,
+109,215,171,88,194,94,76,60,188,132,81,39,43,146,178,150,
+124,25,55,128,45,245,13,210,222,153,90,81,18,25,35,83,
+68,206,161,98,66,73,137,203,124,237,70,209,163,246,182,232,
+16,245,237,4,179,195,187,205,169,193,171,27,40,209,90,178,
+131,6,181,86,174,167,155,108,56,247,182,189,156,56,23,76,
+8,198,177,252,202,138,32,76,21,251,208,141,252,25,15,26,
+23,69,142,87,122,206,75,112,224,168,80,63,130,4,147,212,
+48,57,189,164,175,226,28,93,99,159,0,101,49,247,26,184,
+115,174,234,32,207,218,199,186,195,195,205,91,247,37,118,221,
+85,180,111,168,81,244,238,50,220,188,106,148,197,55,43,59,
+160,160,235,202,18,219,114,128,105,168,46,194,148,52,59,119,
+194,87,237,100,204,221,241,69,176,61,181,50,33,79,140,55,
+84,4,245,105,215,18,13,183,59,224,173,92,154,188,213,9,
+49,28,227,148,114,159,175,151,217,244,37,92,175,81,102,43,
+120,29,140,191,195,227,21,46,210,76,12,33,97,69,195,48,
+219,230,53,135,89,113,24,41,168,2,234,184,79,95,198,181,
+74,180,86,172,166,188,222,190,52,47,111,51,111,32,83,184,
+112,205,20,79,79,93,89,147,112,79,169,135,41,203,133,44,
+170,34,23,219,42,4,38,11,178,19,14,211,96,48,109,232,
+58,117,233,33,42,87,118,16,206,74,191,175,5,181,125,182,
+233,161,125,66,40,38,189,154,243,212,114,178,113,121,194,38,
+105,107,220,107,122,195,86,186,189,170,174,56,78,141,195,173,
+21,84,254,166,176,114,51,74,67,215,53,251,210,192,105,22,
+51,168,76,73,188,41,181,200,217,202,73,109,254,1,79,119,
+62,221,46,130,54,143,26,214,113,246,186,42,87,56,133,8,
+154,41,195,132,178,47,111,150,200,35,7,41,36,181,107,124,
+40,104,136,161,169,178,151,147,60,173,87,209,10,83,10,181,
+74,159,61,182,228,91,129,102,18,207,84,39,105,129,10,170,
+199,15,173,169,130,240,88,213,75,147,173,251,87,165,254,182,
+120,79,97,73,19,202,33,34,49,20,61,189,86,164,77,49,
+135,174,37,226,94,211,66,233,20,228,228,214,228,169,119,97,
+134,162,105,205,80,106,136,55,73,174,10,197,96,78,214,78,
+53,135,163,212,141,188,232,58,10,131,215,185,35,68,13,163,
+44,64,221,240,1,210,174,30,55,192,242,233,72,120,83,213,
+244,16,237,29,229,192,218,17,233,58,205,222,110,139,77,202,
+183,98,203,187,174,90,235,180,220,20,157,6,4,114,108,148,
+44,88,103,41,55,211,1,82,22,46,102,75,203,65,234,122,
+11,205,10,109,94,212,67,185,148,187,58,130,187,157,147,198,
+222,228,250,124,111,69,72,25,136,216,181,240,86,213,11,119,
+36,55,175,249,133,252,36,132,70,145,79,186,209,32,146,140,
+237,117,211,180,252,200,50,202,140,183,122,67,164,38,212,19,
+115,66,67,100,189,222,111,169,45,157,75,121,43,11,85,154,
+224,57,80,91,51,8,85,111,247,188,98,97,43,158,12,179,
+2,249,181,145,234,72,105,195,203,179,101,251,176,208,56,175,
+20,42,218,186,46,100,232,136,142,108,254,224,41,26,29,17,
+138,69,19,92,231,164,20,247,237,202,164,131,84,99,207,40,
+172,241,210,209,240,21,36,190,177,170,232,98,93,75,177,139,
+156,1,159,156,244,121,121,169,90,144,234,7,85,169,112,241,
+118,243,220,50,57,138,215,14,196,213,186,0,83,106,178,149,
+144,157,138,45,80,174,96,165,252,3,182,45,218,220,174,34,
+5,228,141,129,187,232,91,74,50,83,252,193,165,114,13,173,
+149,209,64,248,140,5,143,36,105,221,62,45,34,172,200,109,
+198,122,202,101,6,89,173,141,234,32,182,188,232,234,116,208,
+180,103,60,245,171,252,48,117,58,160,20,4,212,209,186,198,
+70,178,102,19,23,222,205,93,93,156,200,174,197,4,229,152,
+210,26,212,44,143,173,194,233,152,16,32,148,70,26,69,177,
+61,89,214,100,248,123,204,228,145,204,127,129,28,168,221,195,
+91,10,181,64,140,66,153,66,251,168,116,227,175,169,115,83,
+38,59,115,5,178,42,76,83,120,17,11,165,228,50,185,67,
+24,243,194,165,171,67,41,161,174,246,48,147,51,236,147,5,
+177,56,174,130,104,7,189,236,211,120,55,122,124,51,242,48,
+124,39,80,250,224,160,182,68,49,97,88,170,188,180,130,42,
+46,119,210,43,250,124,230,70,230,71,46,5,2,217,184,218,
+55,174,113,57,196,186,132,134,55,64,135,140,122,164,177,177,
+102,88,11,28,16,211,236,100,80,102,55,177,109,212,242,161,
+249,88,139,17,40,170,230,83,153,160,73,98,244,10,252,80,
+44,145,25,172,108,155,132,72,188,43,21,62,149,148,174,77,
+84,120,58,28,225,99,54,75,169,50,200,88,23,171,227,66,
+181,105,178,47,131,109,136,110,226,242,64,187,198,189,138,187,
+109,60,77,27,26,9,198,137,193,137,97,153,125,233,169,55,
+89,20,181,166,185,95,58,220,170,18,146,200,1,236,54,148,
+57,72,247,219,12,190,124,112,66,198,211,132,201,75,161,224,
+250,150,13,97,131,29,106,84,18,220,202,146,106,171,231,88,
+254,149,185,126,177,212,41,90,11,13,97,101,243,194,139,238,
+107,142,91,25,241,141,64,81,196,226,14,235,91,228,171,156,
+169,183,7,145,156,172,81,53,7,84,70,65,92,130,97,124,
+26,55,216,136,221,237,40,200,96,172,139,125,128,206,197,107,
+4,151,149,131,86,118,215,225,59,76,90,118,120,120,14,19,
+185,55,2,130,36,178,39,218,103,164,147,253,102,191,71,103,
+54,139,18,48,52,162,38,95,85,55,47,20,121,129,163,22,
+28,106,29,112,86,26,115,226,213,217,45,34,131,242,232,60,
+210,202,196,228,89,227,244,168,189,93,58,100,15,146,188,137,
+187,151,158,164,122,222,150,91,231,61,35,28,146,182,156,234,
+118,54,59,136,187,87,14,74,13,88,64,182,71,115,40,229,
+30,132,56,181,105,68,69,200,215,150,245,246,173,160,124,202,
+57,79,198,74,225,65,6,66,15,107,108,151,251,190,222,117,
+102,231,132,203,79,82,206,28,53,66,174,110,35,7,41,210,
+170,79,124,129,118,11,3,203,3,170,36,42,174,45,37,227,
+28,50,173,126,174,102,154,116,46,7,62,50,118,200,119,91,
+70,72,31,58,244,237,164,105,202,9,148,4,61,15,143,55,
+97,61,142,204,160,48,16,76,188,44,30,14,94,43,221,50,
+33,144,177,82,238,128,157,236,140,139,107,163,27,52,25,94,
+221,223,92,217,39,69,92,206,227,90,170,218,195,156,171,146,
+235,123,86,168,37,237,204,95,75,202,123,99,220,104,191,236,
+183,213,141,218,11,254,46,87,222,232,113,97,59,114,143,235,
+162,224,118,81,51,198,52,59,143,192,48,246,67,133,13,240,
+102,26,170,217,111,200,32,75,54,74,109,217,193,194,151,228,
+142,112,47,27,235,225,185,254,118,167,124,221,42,153,32,221,
+142,189,131,179,55,44,215,142,109,73,70,21,44,156,222,164,
+175,198,92,249,69,144,206,138,6,212,92,36,132,155,175,177,
+9,187,248,83,225,46,69,201,153,200,215,185,103,155,166,66,
+194,41,135,65,117,71,6,133,29,126,206,85,202,189,244,155,
+53,249,113,114,9,164,141,245,237,196,224,81,54,189,214,237,
+120,171,70,68,86,46,180,97,202,33,171,106,199,183,27,195,
+43,237,240,110,64,187,3,171,150,77,234,93,135,122,122,62,
+42,108,249,193,92,232,234,240,128,64,81,19,176,214,193,109,
+134,156,109,71,229,50,9,111,223,113,109,160,133,245,219,192,
+93,9,165,27,193,233,122,130,137,169,15,56,12,103,6,66,
+125,112,133,91,155,134,184,42,196,242,217,5,203,85,19,196,
+33,232,29,52,232,116,144,197,155,53,121,167,136,28,138,246,
+96,165,108,149,191,19,224,161,157,235,231,161,126,133,219,59,
+155,132,114,121,104,67,227,29,132,37,54,134,6,187,75,94,
+26,68,240,158,104,125,5,158,183,91,109,45,105,58,165,182,
+98,116,42,61,12,8,94,111,31,76,54,86,108,68,103,88,
+187,6,1,209,43,38,60,201,130,72,134,57,232,155,61,5,
+47,134,130,40,131,241,51,200,166,92,197,138,116,100,29,118,
+193,11,143,101,218,12,94,224,232,16,83,179,219,170,88,94,
+51,40,91,65,56,214,156,219,138,82,65,230,110,236,148,235,
+36,124,199,83,133,51,53,67,34,211,215,166,13,150,68,148,
+131,186,174,126,133,35,11,242,190,6,131,12,147,67,233,173,
+115,79,70,181,149,223,44,25,201,98,194,114,21,73,95,109,
+31,80,77,83,234,70,49,209,111,133,39,220,65,229,180,33,
+222,207,182,182,225,226,136,151,76,138,39,148,230,146,157,132,
+129,163,207,151,21,188,189,250,250,49,61,104,37,64,57,123,
+23,225,224,249,200,53,36,220,120,14,150,58,141,166,128,73,
+43,136,113,189,242,161,9,132,221,90,206,203,131,123,49,67,
+167,166,223,0,110,8,125,109,81,162,63,244,145,243,187,241,
+203,173,225,81,181,100,27,156,221,226,42,16,92,229,4,115,
+24,145,196,36,249,241,33,25,155,194,157,100,236,229,156,31,
+152,120,82,14,210,68,241,32,235,169,147,124,215,238,77,141,
+201,44,203,112,223,115,123,219,217,185,16,82,236,225,227,65,
+101,23,201,60,24,240,208,88,46,213,224,144,236,226,4,253,
+235,64,237,28,87,11,94,240,251,189,102,106,88,54,226,203,
+249,177,98,26,103,122,88,176,51,39,229,198,200,202,210,153,
+22,52,194,183,119,78,177,173,169,41,194,145,118,141,213,160,
+30,34,149,245,214,74,198,201,146,25,169,4,124,191,31,63,
+75,52,34,122,79,160,33,17,212,163,165,100,137,154,116,186,
+244,157,176,135,72,128,102,216,167,105,105,66,120,197,60,84,
+133,218,107,209,161,99,180,157,113,45,171,42,214,229,114,227,
+20,138,76,115,15,67,165,201,244,184,40,210,82,121,189,92,
+200,65,30,123,200,2,222,217,152,130,164,232,212,224,8,175,
+210,220,135,35,58,106,151,55,122,70,10,108,210,69,141,32,
+89,115,9,221,59,82,221,76,9,106,34,95,107,8,198,221,
+208,53,22,33,31,105,103,91,82,45,225,70,124,179,236,195,
+143,245,124,235,214,238,141,150,189,161,172,51,40,145,58,149,
+190,39,182,230,208,212,177,218,223,11,242,39,172,16,202,195,
+136,165,72,91,166,181,171,233,134,33,95,8,94,235,170,62,
+176,35,113,218,217,81,194,249,137,173,148,178,108,57,186,37,
+199,227,78,226,213,96,195,25,55,110,47,21,212,22,21,71,
+29,183,247,32,88,237,86,51,40,69,133,45,71,217,238,225,
+142,118,235,0,26,88,178,21,116,106,57,77,206,218,145,85,
+150,55,206,146,163,150,105,106,160,120,92,91,133,101,139,22,
+185,19,150,134,173,14,117,206,120,80,57,145,243,52,245,13,
+49,9,110,204,172,159,89,212,12,206,57,117,43,157,162,69,
+213,94,56,54,25,246,154,225,12,209,185,125,74,181,180,205,
+66,200,32,179,93,60,227,168,189,76,181,168,187,86,76,108,
+170,9,215,122,132,23,110,172,67,139,142,45,74,113,37,102,
+70,118,218,250,67,57,180,189,236,55,147,236,97,146,5,137,
+109,235,185,166,113,82,116,229,233,173,73,204,200,246,169,89,
+24,79,123,152,158,85,38,87,173,49,92,12,182,88,248,125,
+117,116,119,147,96,5,132,108,37,185,186,78,218,107,22,174,
+170,7,2,64,139,187,228,217,218,96,115,129,126,54,86,141,
+42,123,206,76,131,6,11,239,164,171,85,244,180,137,105,20,
+89,202,172,64,194,227,133,75,41,29,239,144,101,26,92,161,
+189,199,76,192,112,19,138,34,1,132,41,160,109,51,30,217,
+214,139,129,46,54,11,143,160,3,93,85,98,18,159,159,170,
+80,56,10,64,112,123,238,114,140,103,47,8,198,45,38,222,
+48,0,232,54,174,48,222,97,100,144,160,83,234,94,6,224,
+105,76,125,179,54,77,9,88,231,166,1,11,111,180,148,143,
+89,51,247,111,108,215,81,252,161,20,240,199,163,23,22,19,
+199,170,1,82,210,46,12,195,102,33,155,53,104,239,22,116,
+231,158,196,46,27,80,183,57,160,116,134,186,146,135,123,170,
+27,208,253,204,58,59,190,186,55,26,226,44,200,8,16,207,
+13,198,196,181,124,90,92,161,144,90,150,208,204,206,246,216,
+182,4,92,116,213,87,86,120,24,228,228,110,19,174,236,132,
+61,252,121,216,237,34,142,196,90,249,13,117,61,201,97,101,
+194,75,105,146,90,207,137,30,35,125,154,196,129,74,147,181,
+38,72,99,72,125,63,116,156,25,81,229,212,212,133,42,170,
+178,107,234,93,117,152,138,87,82,70,116,87,172,49,81,70,
+82,121,226,128,69,189,36,91,252,103,140,164,97,74,212,50,
+217,220,17,146,13,225,161,41,223,64,183,247,72,238,255,126,
+245,213,29,194,125,254,203,103,47,127,177,248,45,232,253,234,
+205,139,151,191,152,251,241,15,230,0,136,120,7,93,127,50,
+247,171,197,183,191,124,245,249,239,193,214,119,0,243,61,213,
+71,127,245,242,205,55,47,191,11,54,255,0,142,252,215,0,
+200,196,216,142,201,31,3,0,50,162,88,174,226,153,161,117,
+169,198,231,239,142,116,248,101,13,156,47,162,45,175,31,52,
+101,171,221,117,27,188,70,231,210,140,133,88,121,56,192,251,
+234,199,65,150,186,236,59,182,224,109,86,210,113,30,206,150,
+201,58,201,38,222,22,137,158,217,125,62,173,24,199,232,208,
+4,42,137,106,75,5,215,123,142,57,28,82,243,44,79,137,
+228,115,30,216,69,79,238,206,162,207,82,57,178,165,98,56,
+232,169,134,87,253,148,50,43,82,212,194,157,204,145,128,89,
+56,138,209,226,198,172,111,219,222,61,57,193,9,92,52,120,
+204,209,218,219,106,83,58,88,129,243,250,122,208,133,199,121,
+232,29,140,67,233,139,87,93,131,113,205,188,102,8,21,168,
+250,139,150,165,85,128,52,237,233,109,54,90,167,92,82,29,
+120,45,184,77,91,222,98,186,132,196,177,150,190,50,15,143,
+121,247,249,39,158,72,120,237,2,206,165,172,158,87,8,235,
+131,201,109,16,84,183,224,118,200,201,209,105,90,113,229,184,
+130,244,2,80,185,198,193,152,226,163,215,182,33,19,154,188,
+148,101,106,141,161,177,43,39,24,214,198,141,138,34,106,50,
+147,59,27,52,173,118,143,149,214,238,130,174,183,117,78,143,
+92,154,8,19,113,232,130,30,209,54,81,26,106,120,232,72,
+75,8,173,91,180,55,145,152,21,164,67,27,19,138,198,178,
+176,136,51,142,241,12,247,32,173,77,97,224,152,253,250,133,
+87,238,212,75,105,91,145,142,1,37,184,133,226,83,254,253,
+227,32,166,126,162,141,243,67,55,23,249,218,38,244,38,16,
+42,104,143,208,167,181,220,237,152,118,123,208,52,65,245,100,
+40,125,220,222,65,28,160,40,238,158,126,213,208,163,151,188,
+235,124,211,169,18,220,27,215,54,212,4,205,233,32,90,41,
+180,165,224,171,92,140,120,53,123,154,36,14,47,28,130,145,
+82,30,203,41,107,39,136,94,118,155,183,158,60,97,171,175,
+87,79,217,70,124,252,154,14,57,247,22,50,94,97,115,80,
+64,92,8,203,203,242,161,122,127,187,16,223,223,241,19,182,
+55,138,171,215,92,122,237,108,5,127,158,174,81,247,0,111,
+12,222,200,102,54,33,61,62,90,45,138,13,240,42,203,168,
+67,136,196,110,45,18,185,36,208,48,67,12,73,251,134,184,
+155,97,229,243,224,37,247,161,101,40,151,103,124,122,60,246,
+22,219,231,21,176,113,223,22,115,249,26,218,164,192,148,2,
+8,54,152,98,114,66,220,233,245,228,252,132,150,92,218,113,
+176,184,17,106,86,38,201,15,160,53,255,230,230,176,15,54,
+57,168,209,136,181,232,66,43,163,90,240,105,151,62,218,166,
+55,15,137,121,147,39,35,247,172,110,109,43,64,136,128,102,
+47,80,222,155,250,114,52,104,128,209,97,47,179,147,188,208,
+242,42,56,225,220,77,152,144,138,20,55,140,66,146,171,82,
+232,149,205,82,29,101,131,147,186,87,166,25,73,206,131,36,
+43,68,140,59,100,240,86,3,114,2,174,205,186,144,231,48,
+7,181,114,125,197,52,212,163,116,138,244,196,170,61,44,49,
+6,240,179,46,124,207,52,12,100,210,251,59,199,30,146,97,
+149,82,11,28,28,198,229,149,234,192,185,29,165,141,214,135,
+180,243,115,152,3,85,242,184,178,107,249,129,102,80,230,164,
+144,169,226,248,50,220,83,173,113,18,194,192,73,114,124,216,
+208,52,89,173,11,229,190,169,149,69,228,237,100,4,199,118,
+14,101,12,7,9,129,91,2,22,134,195,105,241,158,140,37,
+188,93,181,5,79,253,225,72,125,58,73,173,197,48,120,26,
+117,188,173,26,180,174,138,199,81,117,218,128,37,92,233,216,
+54,222,113,95,134,194,110,77,123,98,100,170,54,101,133,142,
+148,137,131,131,2,26,172,206,243,115,192,141,88,19,74,181,
+117,245,14,53,89,239,15,251,181,108,102,83,144,129,237,10,
+175,130,138,164,12,76,107,85,87,172,38,73,22,193,12,178,
+187,131,17,93,70,150,167,200,209,192,145,64,186,222,178,112,
+248,20,230,238,254,110,225,112,154,99,81,58,197,237,0,214,
+117,205,138,7,143,143,207,216,9,193,161,215,175,150,5,83,
+124,88,242,54,160,142,216,119,211,112,252,197,242,50,130,89,
+191,184,12,134,110,211,209,178,74,216,62,107,132,59,1,85,
+52,111,27,238,156,29,137,215,76,214,243,129,222,54,212,157,
+210,247,108,220,162,133,85,61,73,195,15,161,109,38,187,208,
+41,119,161,113,95,148,120,142,84,174,3,104,110,68,190,64,
+106,79,175,182,205,120,204,13,148,17,105,234,86,86,7,142,
+210,18,124,35,146,44,175,81,82,237,12,62,172,202,112,139,
+27,178,109,57,133,18,166,166,90,221,150,218,60,189,221,42,
+76,52,83,144,148,87,228,110,33,113,160,85,41,116,146,82,
+166,18,148,116,76,226,9,30,13,40,214,250,40,131,9,4,
+8,55,82,218,36,237,44,54,129,207,85,219,106,41,255,240,
+136,210,30,210,228,189,50,245,92,194,195,110,12,79,111,66,
+96,14,174,157,226,34,73,136,149,37,171,42,51,17,238,1,
+183,176,16,151,204,161,108,96,18,112,97,160,115,214,88,45,
+185,119,201,94,182,114,67,115,112,74,44,28,92,240,35,253,
+19,233,244,34,48,194,114,241,155,204,118,33,1,94,85,115,
+45,184,156,180,237,67,1,8,146,103,231,92,55,200,60,224,
+19,94,64,158,133,240,38,61,63,58,101,47,186,109,91,208,
+97,234,40,210,56,88,211,53,98,88,222,136,152,12,158,230,
+130,116,91,164,226,216,228,75,174,15,207,10,171,170,177,244,
+10,113,32,63,190,40,51,107,98,245,169,238,48,31,50,228,
+234,109,74,191,165,77,38,73,17,209,129,223,180,203,80,123,
+64,155,87,148,65,132,50,64,228,111,249,59,34,189,190,81,
+64,80,196,2,84,67,39,204,112,220,68,92,84,146,27,197,
+54,197,184,56,59,101,206,11,213,234,43,153,103,47,230,171,
+37,0,4,57,185,205,28,167,79,58,122,1,127,64,36,195,
+104,65,131,16,118,112,29,102,67,36,108,199,249,42,127,41,
+66,99,72,88,231,89,242,165,217,204,6,151,37,89,183,60,
+19,41,195,33,227,147,33,233,68,76,149,19,82,103,39,90,
+220,88,225,16,245,207,202,249,10,219,30,78,185,130,14,76,
+167,208,41,130,121,212,194,82,102,192,232,30,145,13,251,20,
+91,58,233,176,212,88,53,44,203,121,222,1,109,238,160,75,
+218,129,111,21,234,78,193,55,132,73,121,222,28,80,176,6,
+236,242,57,184,15,70,64,19,8,194,53,146,90,63,10,101,
+209,39,45,92,7,234,133,213,162,2,55,230,96,187,153,135,
+67,163,253,101,122,148,132,246,85,101,204,156,68,234,91,35,
+39,141,212,235,18,172,163,17,150,20,48,10,25,81,198,25,
+219,1,123,129,133,101,243,125,25,232,250,101,229,226,236,224,
+200,50,138,118,14,200,117,194,16,203,61,223,176,160,15,236,
+24,74,195,186,141,196,174,195,224,123,59,0,226,134,196,144,
+32,194,113,199,117,44,216,206,182,50,149,147,86,5,186,119,
+34,171,156,84,139,45,130,38,37,197,22,216,17,206,106,114,
+89,230,237,105,207,133,164,96,109,247,220,69,45,4,129,43,
+58,191,158,47,118,19,8,73,10,7,146,177,161,204,82,157,
+95,167,131,176,242,176,185,198,59,175,241,48,141,29,47,102,
+196,68,113,161,103,186,146,150,86,206,31,17,108,212,72,47,
+15,34,135,83,178,75,161,205,231,182,15,142,7,205,94,238,
+140,41,202,24,183,84,177,99,251,101,65,146,143,39,149,99,
+56,17,146,66,171,175,5,203,66,197,17,184,160,238,14,251,
+12,88,111,141,2,247,182,183,212,88,242,38,140,98,199,112,
+49,66,15,113,176,77,142,140,226,153,226,42,110,25,119,16,
+38,91,132,199,254,186,156,106,22,83,59,246,64,161,36,91,
+207,121,29,136,253,172,189,147,243,56,219,215,174,188,132,193,
+140,202,79,155,185,11,195,198,185,240,66,199,142,96,247,212,
+92,200,185,171,196,182,115,119,79,133,227,154,50,54,158,194,
+249,106,184,73,188,10,238,25,161,122,175,194,112,187,10,225,
+19,8,16,94,96,133,72,130,209,68,180,27,105,149,34,189,
+109,31,166,164,1,110,82,103,160,85,164,197,116,103,93,170,
+16,90,60,82,99,86,31,165,131,114,154,82,42,42,235,55,
+189,134,60,78,113,129,82,131,24,160,107,60,242,226,16,198,
+244,54,14,228,101,201,134,179,106,196,244,130,129,53,33,25,
+154,139,173,10,186,40,61,145,13,163,97,26,167,250,128,42,
+222,56,193,52,16,48,101,206,50,61,73,83,117,176,75,211,
+53,49,209,231,115,175,154,203,32,249,153,210,105,43,216,121,
+221,214,122,105,76,77,30,68,235,220,29,115,27,103,60,177,
+226,160,250,190,107,90,110,215,116,84,6,235,236,182,95,93,
+6,83,133,8,230,128,120,59,62,175,171,225,118,34,58,139,
+43,179,169,3,140,208,6,94,129,2,16,18,129,176,145,141,
+109,27,17,228,44,204,32,100,123,223,132,183,34,82,133,20,
+218,84,23,121,45,40,136,2,0,252,96,99,44,144,32,92,
+198,36,75,242,226,82,191,169,174,91,183,237,231,100,136,79,
+57,140,48,178,138,252,73,38,116,32,57,23,145,72,135,254,
+83,147,77,6,235,143,193,85,126,95,175,137,177,208,29,26,
+120,176,116,7,33,43,65,137,207,231,63,93,21,15,116,194,
+118,205,60,192,85,242,167,78,203,173,36,7,101,84,1,224,
+223,61,232,248,38,104,37,71,130,24,90,144,125,87,92,10,
+19,28,85,162,85,241,30,41,188,190,173,92,15,70,233,155,
+141,145,238,128,74,198,28,94,187,48,50,211,218,148,135,238,
+59,182,112,157,210,85,74,173,27,31,129,252,35,232,121,54,
+69,3,17,105,166,152,128,67,89,177,96,76,0,23,25,218,
+53,150,18,100,183,105,20,107,130,192,114,168,160,114,19,110,
+78,198,254,190,195,37,33,203,47,142,243,231,90,89,254,160,
+228,76,133,167,219,226,75,85,155,16,116,28,247,241,222,92,
+42,122,164,84,31,158,148,182,39,57,107,12,10,19,30,246,
+199,129,94,67,41,204,40,220,46,249,69,185,115,105,236,49,
+188,76,42,194,93,18,115,236,254,99,232,126,206,86,198,10,
+10,129,154,191,138,19,20,119,213,161,80,43,22,108,118,99,
+219,200,34,222,81,91,159,182,125,45,8,143,131,230,236,110,
+192,168,81,12,161,179,47,102,151,218,122,102,62,205,65,76,
+197,77,186,48,100,215,42,209,248,70,206,114,11,199,195,59,
+28,124,211,81,38,51,18,41,57,90,237,206,10,7,184,61,
+19,50,208,60,38,248,245,75,200,173,226,58,185,202,78,122,
+106,232,1,41,194,50,225,53,144,48,182,31,202,244,41,27,
+231,146,253,193,210,85,57,236,34,251,195,205,147,129,209,34,
+101,167,124,5,6,145,181,107,238,163,125,180,72,155,75,181,
+241,206,148,82,62,145,149,57,80,230,42,218,78,190,123,53,
+220,16,13,76,200,84,108,112,19,163,236,93,238,176,125,1,
+108,66,126,169,101,47,9,208,4,229,245,166,217,116,52,208,
+47,75,74,21,13,169,201,58,91,33,25,249,22,242,30,73,
+205,42,2,8,104,74,177,85,131,85,90,121,205,198,188,154,
+18,57,80,167,91,103,144,185,184,155,178,108,168,113,45,16,
+11,6,166,130,29,93,187,106,72,175,85,89,76,217,238,83,
+153,113,171,231,117,178,51,199,111,38,174,123,218,194,218,206,
+85,0,190,68,196,30,36,146,250,181,29,147,206,202,79,150,
+36,30,53,26,68,164,135,220,112,129,57,220,217,135,13,40,
+190,193,134,198,152,119,141,166,3,199,100,69,224,103,221,138,
+229,205,14,182,40,69,170,209,27,187,142,233,68,73,205,216,
+88,234,101,190,55,110,183,8,74,14,105,146,2,147,15,19,
+131,29,100,181,231,5,83,175,140,88,164,177,174,243,195,181,
+2,36,148,112,66,101,80,232,165,21,79,221,171,71,150,185,
+176,1,87,222,0,183,7,25,46,158,232,70,56,7,75,5,
+135,65,237,239,26,212,168,181,18,61,233,132,120,200,16,160,
+45,93,133,18,109,204,18,125,39,137,234,136,82,240,115,167,
+43,101,153,209,33,102,116,70,164,201,181,9,106,135,17,216,
+210,38,61,41,106,223,244,142,163,52,117,31,16,173,243,249,
+225,246,115,53,168,125,171,244,32,59,203,124,24,66,130,3,
+1,253,152,84,103,249,0,54,166,148,196,244,164,25,210,49,
+186,49,72,211,166,182,45,235,193,47,107,220,210,74,12,137,
+29,170,253,128,232,85,114,137,78,41,173,164,221,12,100,199,
+45,196,128,7,124,64,40,157,224,55,68,213,126,248,5,141,
+82,58,93,137,9,125,99,97,226,220,61,35,128,48,44,131,
+243,237,14,240,154,171,7,198,199,236,55,40,1,186,21,90,
+50,236,40,116,148,103,150,181,14,11,232,211,211,162,211,88,
+117,121,48,19,37,67,5,0,133,116,10,185,180,98,199,36,
+60,113,82,25,16,186,226,60,222,30,40,84,36,26,101,114,
+78,133,151,86,2,200,51,16,248,16,165,206,246,48,87,128,
+22,197,32,92,23,172,236,195,152,208,210,202,134,15,121,134,
+167,161,212,137,238,216,54,11,101,1,191,78,108,168,91,220,
+97,254,140,130,56,225,194,88,3,58,118,56,74,29,21,71,
+171,173,212,109,64,197,113,77,91,148,250,62,57,227,203,228,
+100,224,75,255,246,104,137,100,172,181,117,72,69,117,76,240,
+128,219,235,252,9,187,236,56,115,28,43,181,219,198,222,154,
+114,115,51,105,205,15,140,190,115,193,25,203,51,12,105,84,
+123,91,231,195,97,196,16,61,101,78,204,113,99,181,119,161,
+57,245,215,87,72,120,121,166,223,142,230,137,170,62,139,186,
+133,142,76,55,88,3,95,146,99,178,15,180,253,51,19,206,
+164,252,14,200,252,155,87,111,23,223,213,156,191,91,136,126,
+241,242,237,226,235,159,63,123,190,56,171,236,126,190,248,230,
+197,47,94,46,126,62,247,230,213,59,234,23,0,46,125,246,
+102,113,86,200,125,243,229,226,243,23,63,127,241,252,155,178,
+242,71,95,188,248,251,197,185,223,194,205,187,2,241,171,183,
+191,92,124,253,97,45,247,205,93,237,244,125,153,252,251,119,
+165,243,23,47,129,198,89,185,27,16,250,14,237,190,171,152,
+127,83,231,189,43,43,255,252,213,235,187,178,240,203,175,126,
+245,179,223,22,146,191,229,125,243,9,160,249,189,182,153,129,
+111,62,158,187,51,231,71,207,95,191,250,226,139,191,120,246,
+250,3,107,222,233,158,123,254,234,229,219,103,47,94,206,80,
+245,59,173,111,190,250,217,12,58,3,172,255,0,64,240,111,
+10,210,95,205,188,5,172,124,231,211,183,182,126,9,8,154,
+33,242,47,238,236,251,78,161,253,111,94,125,61,247,245,226,
+157,253,207,62,159,21,217,127,47,12,63,127,47,109,238,213,
+87,223,22,172,255,48,144,255,243,207,63,127,135,222,255,226,
+139,103,207,255,254,223,23,200,207,42,193,152,187,74,240,74,
+21,205,140,233,165,26,222,126,180,212,240,104,229,138,117,28,
+131,166,165,9,117,110,63,65,183,171,231,233,217,84,89,66,
+227,75,28,59,218,212,189,106,141,188,151,176,87,188,94,86,
+36,118,140,148,242,134,230,154,172,120,56,45,144,4,155,171,
+88,34,15,222,33,16,85,189,163,28,205,189,31,197,98,99,
+145,84,221,185,219,170,231,78,221,196,181,54,244,154,210,107,
+57,28,187,146,222,40,73,117,150,41,60,159,212,227,65,58,
+204,67,35,24,157,130,110,53,5,233,118,19,184,76,146,32,
+219,16,202,149,48,32,50,87,50,66,94,99,29,10,19,105,
+67,219,251,187,183,238,34,202,217,175,139,138,72,70,20,219,
+213,102,198,219,20,140,48,122,206,72,107,92,149,230,238,170,
+0,172,40,226,246,45,146,213,72,112,163,185,115,233,88,179,
+73,118,93,250,96,215,35,150,65,81,56,159,10,19,59,222,
+166,78,253,133,157,84,26,151,80,43,148,237,219,66,9,87,
+102,242,234,136,218,160,9,102,142,225,146,78,149,33,54,56,
+87,69,242,91,48,165,49,206,113,175,234,38,74,221,180,62,
+9,187,180,160,101,136,61,141,72,153,65,90,122,199,150,82,
+174,113,247,97,238,139,93,74,99,67,221,69,59,175,65,197,
+53,97,70,123,211,47,67,172,32,244,69,130,112,162,94,234,
+217,24,26,11,10,21,30,95,82,215,97,235,192,71,253,8,
+44,127,69,194,163,194,198,173,85,247,228,230,194,28,218,167,
+139,170,193,50,221,125,128,137,123,81,132,33,93,95,69,30,
+176,104,196,196,141,84,217,184,38,156,174,152,76,12,114,219,
+72,175,16,186,167,168,228,174,72,79,96,202,233,229,210,145,
+196,164,38,25,68,114,240,134,138,168,86,75,186,201,240,113,
+199,224,201,27,203,30,224,201,200,210,57,58,129,171,169,11,
+171,79,134,38,41,215,77,220,39,224,213,240,190,8,15,54,
+228,122,84,217,189,99,36,27,229,133,163,250,250,164,187,203,
+27,244,83,55,171,67,33,127,201,89,133,131,192,150,101,58,
+220,26,64,108,157,226,147,219,72,76,67,148,110,138,144,62,
+172,15,126,7,225,67,221,112,86,182,145,196,132,193,7,7,
+110,131,129,182,196,23,30,23,219,9,253,70,13,223,29,141,
+104,32,147,178,51,197,229,198,144,211,118,145,154,81,211,66,
+254,166,5,177,142,34,91,155,253,2,135,125,42,234,174,194,
+78,77,99,14,156,193,71,172,173,95,222,94,172,220,96,67,
+197,147,86,86,59,117,75,183,196,131,169,152,32,187,245,199,
+5,50,221,249,16,55,171,4,103,162,234,254,101,44,52,171,
+4,211,77,25,246,172,18,188,76,30,109,238,247,56,246,201,
+222,213,134,240,130,87,178,174,168,125,244,181,117,20,116,168,
+28,164,198,112,127,163,45,109,251,235,179,10,48,178,118,28,
+44,85,228,148,248,85,226,172,189,2,192,45,24,193,70,11,
+102,172,94,187,50,11,74,68,214,170,236,50,20,161,140,93,
+137,69,215,52,107,168,153,90,97,31,114,13,192,144,79,7,
+193,179,194,32,110,95,217,59,201,25,69,219,48,114,29,46,
+79,110,78,9,75,16,41,87,69,211,83,11,12,112,78,179,
+42,229,214,111,51,96,87,253,108,146,129,213,187,195,179,97,
+186,222,48,237,160,132,82,69,138,219,58,21,78,105,25,34,
+184,203,9,245,98,212,227,48,149,207,65,145,172,149,77,192,
+136,132,160,220,9,162,53,188,195,195,161,39,213,244,230,105,
+70,235,0,62,69,104,106,62,234,74,23,46,31,75,243,204,
+163,211,142,155,7,227,53,12,36,142,215,91,184,169,208,52,
+211,158,187,225,114,215,194,101,98,63,81,203,37,215,150,40,
+135,153,126,6,201,73,82,236,149,190,124,234,18,246,98,234,
+134,191,206,119,56,143,240,72,69,146,43,57,11,231,33,90,
+147,79,218,117,114,246,43,166,253,202,38,241,34,61,214,116,
+46,115,20,215,197,160,27,207,82,243,2,202,210,46,0,226,
+209,183,214,16,82,117,222,177,92,72,20,4,44,188,108,175,
+71,240,252,227,192,217,230,161,244,102,93,222,232,112,93,56,
+159,137,117,125,181,175,213,78,14,118,226,208,41,9,57,189,
+9,182,212,125,225,78,103,34,72,54,178,21,250,176,190,225,
+101,134,177,222,12,175,106,222,34,133,241,156,96,54,29,35,
+11,146,37,94,252,122,95,19,243,81,168,241,163,154,21,87,
+210,113,96,131,30,98,204,46,44,113,236,203,150,200,202,202,
+169,101,210,111,208,150,33,234,14,104,197,153,193,165,148,120,
+76,2,123,190,34,216,245,183,149,70,184,241,144,35,197,245,
+248,234,198,117,138,74,89,194,43,169,174,201,18,219,129,195,
+122,183,182,197,206,252,64,141,169,38,206,28,71,123,117,52,
+59,13,198,164,248,125,147,69,162,233,52,17,22,107,127,25,
+203,145,75,29,38,117,167,122,68,233,204,80,124,158,90,200,
+19,147,8,166,112,20,64,95,178,19,3,187,201,193,55,25,
+150,178,141,41,94,236,227,175,107,236,14,223,14,210,184,158,
+196,147,6,160,84,31,82,218,165,122,9,137,246,73,112,76,
+212,222,230,5,49,131,205,113,81,224,11,241,66,165,176,37,
+246,100,58,200,54,141,133,53,72,249,87,96,76,252,156,19,
+180,182,147,53,13,100,176,202,141,39,140,246,122,71,197,166,
+20,236,80,115,18,65,174,180,140,195,27,52,20,145,61,180,
+28,135,131,197,195,108,25,163,116,45,179,115,250,107,159,39,
+181,222,82,94,163,201,249,67,203,160,39,239,251,213,125,65,
+136,165,236,12,110,67,163,77,135,164,174,8,55,92,12,114,
+176,195,3,15,163,91,80,110,207,111,51,181,220,146,179,64,
+21,182,179,133,235,154,186,150,77,38,123,7,62,56,89,113,
+158,201,195,59,114,247,129,173,114,132,77,78,171,147,113,135,
+35,115,94,168,165,187,161,73,135,54,5,33,157,222,125,74,
+76,168,28,160,26,170,62,104,80,238,92,109,174,108,8,33,
+55,69,116,122,237,74,42,114,165,161,24,179,95,74,132,250,
+119,42,97,170,112,153,226,10,162,194,12,77,252,82,42,39,
+202,112,135,210,90,242,186,110,57,115,49,98,97,73,83,85,
+212,215,188,166,242,32,111,27,28,12,116,24,35,178,13,106,
+24,56,2,172,241,242,162,101,13,181,236,2,249,198,208,202,
+217,43,117,87,87,16,91,168,132,30,222,88,222,144,161,249,
+170,80,153,120,176,206,13,233,196,73,165,247,186,30,37,101,
+96,186,110,129,18,179,27,196,78,98,185,133,241,107,110,92,
+235,226,235,181,245,176,194,237,63,68,117,146,107,185,229,115,
+68,98,173,70,21,238,174,13,200,26,21,154,79,245,171,111,
+67,70,117,59,222,190,41,218,235,2,210,150,179,83,180,194,
+58,10,250,114,88,189,42,8,69,8,52,92,121,111,89,57,
+208,177,247,13,21,219,54,187,152,54,244,189,2,38,219,235,
+57,26,50,49,3,194,114,21,214,73,2,48,222,43,220,90,
+71,251,171,43,173,138,178,143,35,142,250,187,145,150,38,178,
+191,11,27,20,247,252,49,159,127,9,24,215,237,168,98,165,
+138,47,21,19,3,129,64,89,32,149,73,6,97,136,185,17,
+74,192,183,19,6,113,39,132,21,105,139,164,242,169,66,41,
+14,49,176,70,133,142,119,182,125,110,197,24,168,116,154,155,
+40,25,158,216,179,21,36,2,15,2,0,71,186,188,193,245,
+186,55,162,221,27,97,171,68,83,31,123,146,35,69,200,235,
+56,202,57,135,74,197,56,199,225,157,25,141,234,13,10,36,
+30,216,90,25,72,38,200,193,141,0,221,217,217,64,116,252,
+238,218,1,101,32,208,210,187,35,132,85,20,54,231,180,104,
+146,203,128,18,101,221,236,200,70,84,220,229,28,86,111,150,
+170,102,186,158,17,146,39,142,106,50,234,182,219,24,55,93,
+85,134,87,19,123,217,57,202,7,171,42,151,240,20,221,145,
+197,34,43,109,9,3,134,45,161,58,113,53,132,9,238,184,
+58,102,71,239,102,90,102,148,234,122,77,238,102,121,51,37,
+10,231,86,145,187,75,171,129,173,45,107,192,160,160,79,86,
+151,151,241,187,18,28,193,22,138,32,65,21,124,185,215,224,
+198,172,9,156,95,229,80,98,236,181,51,81,176,24,230,5,
+65,185,100,38,38,174,14,210,131,4,7,111,162,129,40,90,
+177,54,158,105,244,202,58,174,63,105,139,41,15,56,62,149,
+24,27,240,118,24,100,163,14,199,192,242,168,208,85,224,78,
+135,203,236,172,174,6,228,203,113,68,230,244,106,41,210,216,
+75,209,71,121,212,173,166,144,9,186,60,251,132,157,36,232,
+50,224,114,209,118,173,98,95,46,158,83,177,120,88,68,69,
+20,226,156,116,247,209,187,88,56,125,4,206,159,73,85,93,
+39,158,33,217,75,198,123,38,142,222,198,116,11,243,160,14,
+87,166,104,56,15,228,113,136,100,82,246,8,144,56,72,178,
+77,195,180,252,73,238,113,206,102,189,209,90,105,52,208,234,
+21,95,105,119,54,211,250,137,82,7,243,161,149,27,58,218,
+176,5,86,187,111,135,86,223,33,125,40,139,110,70,203,19,
+211,97,0,37,32,201,214,93,208,142,108,255,184,152,130,174,
+15,41,44,83,113,25,115,28,227,222,118,119,123,205,136,180,
+215,62,64,12,148,183,107,198,32,184,4,3,13,110,250,240,
+65,43,74,62,161,132,46,224,197,29,117,215,144,71,28,152,
+66,43,78,50,198,126,156,225,110,69,107,6,84,33,126,54,
+30,159,17,91,202,22,254,96,156,26,105,179,227,82,198,71,
+145,238,141,247,121,193,3,41,167,130,141,80,205,149,67,203,
+17,110,111,53,213,151,92,236,54,210,185,238,113,25,23,246,
+65,185,160,22,114,149,42,216,118,111,11,167,235,203,203,148,
+50,248,132,50,216,112,83,120,55,183,229,42,169,17,80,197,
+165,151,160,126,118,9,86,22,108,142,36,229,72,36,186,217,
+200,203,237,213,196,116,43,76,66,251,73,146,43,150,116,216,
+136,57,25,136,22,112,159,139,192,5,136,107,135,90,52,206,
+153,6,198,209,74,181,141,216,60,245,9,15,198,129,19,204,
+161,3,111,209,155,200,104,213,41,128,226,25,222,12,37,133,
+16,149,0,16,79,60,221,8,56,130,194,68,61,204,143,19,
+14,19,236,73,47,103,91,154,32,100,24,137,10,55,22,141,
+162,77,155,85,77,101,27,119,161,102,85,239,220,26,183,37,
+163,35,203,241,173,143,55,232,81,157,196,110,113,31,165,58,
+139,157,100,219,205,152,189,152,245,80,15,3,107,59,209,131,
+227,138,243,38,56,137,173,151,109,147,246,142,61,142,172,102,
+139,34,82,80,79,71,22,215,169,7,213,132,154,17,10,15,
+97,57,244,142,118,59,29,178,227,226,200,188,24,101,34,4,
+82,75,16,15,77,78,229,138,111,213,208,137,86,88,236,157,
+182,219,2,236,177,185,191,229,59,41,184,193,26,156,119,90,
+14,202,37,118,99,164,115,11,34,243,237,21,198,205,85,219,
+8,66,185,98,253,4,101,47,122,185,147,245,97,213,33,196,
+165,246,66,187,100,79,228,215,161,215,106,213,229,82,155,216,
+153,128,106,17,117,211,237,11,103,91,235,248,245,164,178,92,
+12,12,131,85,115,37,80,41,192,173,121,253,205,116,195,192,
+44,227,210,186,172,111,247,34,178,223,105,39,46,2,194,213,
+192,230,240,200,177,4,197,123,125,70,197,153,4,142,119,159,
+211,162,61,89,124,123,163,158,83,24,172,151,200,104,72,138,
+82,108,103,241,13,249,13,104,40,106,242,97,248,200,58,176,
+158,107,43,5,121,5,178,113,150,114,117,180,90,67,82,172,
+221,46,44,91,220,174,157,184,60,140,37,149,237,155,9,84,
+171,152,27,79,49,99,74,207,70,77,209,33,219,217,80,84,
+199,166,55,32,57,212,148,20,117,209,170,167,221,24,149,137,
+110,235,167,201,211,246,222,160,164,115,168,49,103,87,3,209,
+185,195,62,69,206,138,152,230,129,207,123,198,84,123,155,76,
+181,25,89,220,228,223,36,43,37,78,113,133,33,151,131,218,
+102,100,123,111,195,2,60,50,140,117,202,122,113,133,38,95,
+201,25,15,28,179,82,173,95,199,156,8,49,234,170,92,46,
+122,71,135,177,140,218,5,255,170,165,140,20,186,103,197,100,
+134,13,25,52,25,188,177,107,237,128,133,119,170,195,205,99,
+47,92,39,36,183,33,102,225,233,224,56,179,166,183,0,253,
+22,161,93,48,240,215,1,122,199,116,25,149,84,148,60,92,
+196,214,122,18,39,136,238,238,179,213,55,179,146,177,21,96,
+111,208,213,94,28,83,109,33,120,153,106,142,151,188,1,188,
+101,218,222,189,245,250,238,222,194,207,100,73,249,48,165,66,
+81,84,197,173,228,185,41,67,62,178,204,122,201,44,78,195,
+3,103,3,244,170,59,247,144,201,186,124,136,199,188,171,100,
+167,51,67,97,34,103,158,133,161,153,217,18,43,173,179,10,
+114,21,205,42,5,60,202,96,133,6,112,31,52,60,61,102,
+192,131,234,20,122,220,176,89,120,48,104,147,187,5,122,129,
+199,103,178,118,128,32,120,128,24,104,253,106,146,212,44,220,
+233,14,218,42,8,189,208,240,164,98,123,179,26,115,202,140,
+164,166,136,28,53,255,178,83,176,179,213,171,49,63,179,90,
+169,226,206,116,242,141,158,167,70,62,235,14,228,253,105,210,
+183,135,143,42,40,34,21,22,148,201,172,95,228,8,170,24,
+109,109,171,139,240,26,55,82,238,195,17,254,64,222,170,96,
+186,32,66,174,183,20,85,58,38,214,252,208,40,230,199,39,
+102,73,207,49,236,239,228,54,122,173,86,31,118,107,28,163,
+250,14,94,146,3,107,6,199,120,197,96,188,227,194,183,38,
+122,108,10,63,166,34,115,142,201,86,167,54,134,245,242,24,
+84,115,138,242,95,129,44,223,129,242,127,254,230,14,175,206,
+192,230,155,197,197,143,191,129,183,119,192,243,243,207,191,217,
+111,254,110,163,248,251,109,216,0,172,157,109,15,127,183,149,
+252,219,61,217,127,247,234,14,137,190,0,192,238,191,152,20,
+0,96,245,226,91,0,241,206,61,7,88,223,2,152,249,197,
+12,185,190,135,179,119,138,222,60,7,32,238,243,95,126,7,
+204,190,121,251,250,171,231,239,183,214,207,207,125,250,129,130,
+159,254,247,111,161,236,175,95,188,126,251,213,179,47,230,126,
+253,234,197,231,239,72,255,250,25,224,218,219,143,102,91,162,
+127,250,199,115,175,191,255,33,245,159,254,143,215,159,124,177,
+248,243,183,115,63,253,147,159,254,135,185,133,123,191,133,196,
+63,253,167,255,137,72,0,79,207,54,95,127,52,123,0,100,
+190,249,199,239,8,125,243,143,159,60,255,205,191,81,230,127,
+121,6,4,232,163,191,124,253,236,107,64,226,215,31,207,82,
+11,111,222,206,253,11,86,127,253,201,140,240,110,151,247,59,
+7,62,158,123,253,201,219,87,95,126,12,232,155,189,252,207,
+139,47,126,241,203,183,31,125,255,227,185,31,253,245,219,255,
+227,245,226,226,135,155,200,191,53,227,167,255,244,217,239,230,
+28,126,252,131,15,67,246,147,217,238,248,55,115,95,125,249,
+110,232,94,2,230,126,113,215,241,219,36,203,44,33,242,249,
+226,108,28,223,0,211,229,13,16,142,111,179,42,175,1,227,
+158,205,114,27,159,188,63,243,240,230,237,179,215,111,223,124,
+56,147,190,37,249,150,105,38,239,249,179,47,190,120,243,161,
+29,119,121,155,187,3,6,119,74,129,73,246,203,197,185,119,
+167,57,102,137,151,223,74,121,189,248,37,208,188,248,18,208,
+50,147,246,211,255,253,253,9,134,111,253,122,63,110,63,249,
+144,242,213,151,95,190,122,243,2,152,134,95,190,126,245,124,
+17,152,167,63,253,211,111,143,36,188,203,222,124,190,8,24,
+123,55,165,223,222,41,190,59,195,243,249,239,122,11,144,1,
+6,190,88,252,245,59,162,247,121,173,15,168,102,134,124,124,
+151,172,185,75,227,124,13,44,162,55,31,207,216,158,191,250,
+213,151,95,189,125,207,246,161,200,187,64,125,216,250,205,137,
+140,119,71,40,102,61,207,191,122,253,26,112,226,238,20,195,
+55,99,50,59,55,242,226,229,221,89,138,111,220,190,155,90,
+63,153,3,218,94,125,253,102,238,203,217,187,89,224,0,99,
+102,66,222,143,36,48,134,127,32,3,245,126,165,126,144,97,
+122,71,255,123,121,166,247,171,242,174,115,254,59,167,25,102,
+249,188,215,239,247,143,220,123,127,113,153,255,95,165,159,254,
+77,89,168,248,108,59,201,245,221,118,18,157,12,235,41,211,
+127,103,59,9,247,221,118,18,200,58,159,27,227,238,115,229,
+209,110,165,28,133,3,159,211,211,222,164,180,24,21,219,216,
+108,7,73,114,49,62,116,168,241,241,236,182,171,139,220,43,
+22,181,7,35,179,154,107,171,217,157,182,218,50,109,125,208,
+76,199,128,251,134,171,34,145,120,133,237,174,220,157,40,249,
+36,253,220,81,75,52,148,119,35,249,42,37,208,217,86,38,
+106,113,231,137,99,84,131,67,108,74,136,165,91,195,163,235,
+233,117,37,83,81,61,205,163,44,65,163,47,123,185,209,173,
+169,122,102,108,172,193,137,99,109,222,154,214,75,214,90,107,
+149,137,177,197,139,83,249,199,160,115,109,21,193,93,169,174,
+122,17,59,86,182,226,4,39,64,155,180,136,1,101,61,76,
+41,94,6,171,114,37,236,100,235,152,59,45,45,21,160,244,
+112,62,178,227,75,93,216,53,37,245,78,207,78,28,225,36,
+142,126,34,79,234,137,162,142,158,168,156,162,202,174,253,144,
+179,22,26,41,57,234,35,55,216,215,23,190,170,245,70,39,
+47,83,180,160,4,200,226,215,168,64,102,8,123,154,113,224,
+61,87,93,152,114,117,60,246,192,56,117,29,17,35,154,116,
+64,27,4,193,40,182,118,201,223,230,194,13,156,155,146,204,
+226,135,65,150,252,48,120,115,175,64,115,143,205,145,164,98,
+211,3,58,15,217,145,58,133,151,28,223,247,123,215,78,54,
+83,141,190,38,39,40,28,25,195,155,212,171,125,225,54,232,
+250,186,158,112,152,7,186,155,107,16,98,243,66,166,160,95,
+79,168,178,99,84,5,165,63,227,130,123,180,210,182,228,216,
+116,74,26,247,70,27,178,19,226,233,105,51,106,14,30,75,
+193,91,70,213,150,125,246,52,113,100,175,29,181,124,167,166,
+58,110,36,26,187,136,236,182,245,56,121,146,85,43,86,182,
+215,212,134,90,211,189,204,187,144,221,20,241,138,42,140,204,
+192,183,16,177,201,5,97,173,93,83,85,206,183,69,27,22,
+119,147,112,153,146,94,177,61,132,161,65,32,86,13,69,129,
+132,59,129,49,240,193,151,200,68,9,125,81,88,57,209,234,
+1,0,120,10,81,14,70,104,163,49,164,203,246,46,93,92,
+23,108,153,22,235,11,143,106,205,188,25,223,196,30,78,176,
+237,117,129,205,3,90,242,26,78,92,137,80,92,15,231,11,
+211,39,37,7,242,0,20,54,241,65,226,204,214,218,254,94,
+188,233,202,145,53,75,49,131,129,218,153,26,18,151,73,49,
+55,22,85,84,35,44,240,246,177,57,67,181,168,200,96,141,
+161,209,37,168,73,5,164,248,96,9,109,190,108,151,221,234,
+92,147,8,181,138,142,113,60,62,182,157,118,246,247,180,132,
+74,73,93,152,180,80,227,190,53,212,160,37,163,124,52,5,
+29,183,135,170,215,189,250,97,186,39,0,135,173,62,13,61,
+183,205,38,48,88,75,232,218,196,100,140,219,132,158,35,77,
+55,168,16,238,108,16,205,216,91,124,109,84,67,151,28,253,
+115,252,128,82,247,33,215,121,238,155,243,34,130,169,60,241,
+72,100,55,83,67,106,239,140,64,223,220,167,185,85,214,253,
+182,123,131,142,235,236,104,134,123,245,140,92,56,174,54,107,
+117,152,73,133,84,170,171,183,135,206,134,53,180,57,206,114,
+170,194,202,197,209,110,164,168,74,139,220,234,196,158,12,19,
+46,115,154,43,164,195,81,118,144,69,107,216,236,86,151,154,
+108,109,207,242,79,146,204,4,90,67,167,32,93,23,28,22,
+149,108,17,41,209,65,193,128,225,94,97,205,6,222,177,66,
+142,170,7,92,227,115,52,138,220,221,137,230,240,100,98,55,
+93,164,229,167,145,219,234,109,107,56,118,80,187,147,70,172,
+67,233,81,202,19,201,137,174,209,62,27,99,73,91,49,155,
+17,116,124,150,170,100,135,50,125,87,97,191,141,166,184,254,
+92,83,21,242,169,172,65,89,206,213,153,182,139,153,176,103,
+73,149,100,212,213,29,145,45,236,15,157,130,119,195,91,120,
+212,4,215,62,177,250,98,157,72,116,44,188,101,46,135,122,
+215,226,142,61,238,70,64,33,21,152,77,119,118,40,108,132,
+3,189,228,184,54,201,208,50,114,233,102,23,223,11,79,50,
+168,9,18,187,214,185,8,142,11,43,122,7,194,141,222,140,
+86,79,154,106,246,104,83,199,187,142,148,107,105,95,104,221,
+194,133,237,82,10,2,245,228,144,1,163,136,220,107,44,60,
+230,134,81,148,100,193,235,168,182,31,188,141,67,68,52,229,
+164,214,218,102,226,21,93,183,143,88,60,32,224,41,225,212,
+52,220,114,110,81,82,103,7,160,182,220,53,217,100,31,108,
+102,211,19,6,221,232,50,213,45,215,189,154,72,87,9,103,
+120,177,149,108,84,62,153,232,15,92,154,180,23,211,166,215,
+61,107,151,82,137,187,126,193,63,216,135,141,41,5,199,24,
+150,28,236,201,210,102,56,213,78,58,149,178,76,35,63,173,
+125,140,113,83,122,211,154,76,189,172,53,196,227,213,206,37,
+171,48,57,20,180,134,155,96,119,185,128,42,237,123,178,13,
+149,15,164,118,198,143,54,112,100,184,22,159,226,197,155,186,
+60,150,109,42,81,10,58,11,150,116,204,167,131,49,113,35,
+7,103,107,83,106,73,214,93,246,9,234,144,116,134,22,181,
+142,176,214,87,239,200,194,248,13,89,56,191,137,89,23,90,
+243,8,254,49,206,139,93,79,136,147,167,173,9,131,119,217,
+247,172,36,210,107,1,159,62,171,94,57,172,117,144,91,37,
+236,170,64,77,81,30,76,153,45,123,67,53,220,176,92,27,
+214,41,29,55,73,21,7,117,106,131,147,141,218,64,150,223,
+175,138,234,122,125,247,6,33,22,52,8,77,157,144,227,46,
+162,115,132,86,142,216,89,35,239,141,86,82,121,129,194,114,
+50,32,149,14,235,61,236,33,108,12,62,109,120,251,141,248,
+96,11,59,246,99,29,155,110,159,16,38,228,94,23,216,16,
+27,249,6,186,122,184,116,194,144,158,247,24,235,82,17,43,
+173,45,14,236,43,237,219,224,224,150,113,85,167,152,226,132,
+160,144,96,170,239,86,45,154,113,156,65,14,72,165,39,87,
+233,174,158,135,245,113,175,213,222,241,165,21,134,24,104,21,
+251,187,161,76,76,148,62,185,230,159,88,52,155,25,165,119,
+109,159,162,167,45,141,33,172,233,202,237,45,8,74,242,4,
+202,168,46,50,120,225,231,199,172,188,154,80,36,173,72,26,
+0,244,191,33,75,5,8,84,222,30,136,88,169,23,138,234,
+150,251,56,100,102,83,217,133,220,186,82,161,104,37,71,49,
+220,173,47,97,227,208,147,36,234,245,86,9,214,17,118,29,
+242,75,53,126,55,78,66,243,247,114,44,180,32,193,163,136,
+164,126,16,127,120,181,143,33,163,221,233,68,193,228,75,9,
+207,179,171,142,35,144,226,226,118,223,116,234,46,28,80,14,
+196,187,110,195,41,170,146,224,180,184,195,11,198,68,16,38,
+212,29,82,114,45,224,144,95,59,53,117,219,206,164,239,37,
+156,248,109,82,122,178,34,147,30,12,105,248,144,181,120,171,
+114,187,234,94,116,161,201,224,215,138,221,248,154,81,148,220,
+194,177,161,76,111,169,206,165,131,2,114,119,225,166,147,86,
+97,244,171,10,43,79,189,101,199,52,12,101,20,170,16,85,
+70,81,185,102,80,221,191,220,222,11,226,35,229,117,204,228,
+152,137,171,196,85,145,157,58,31,33,207,186,208,154,14,186,
+95,177,224,101,3,231,128,209,15,113,241,166,224,10,200,166,
+116,215,243,226,20,157,178,195,160,76,193,110,58,197,186,121,
+126,227,112,173,99,172,121,46,107,3,188,89,209,236,55,46,
+229,144,37,159,115,249,34,75,195,238,203,99,189,44,52,210,
+203,243,219,82,178,245,34,19,141,9,178,246,152,52,239,18,
+103,157,233,77,73,58,22,58,27,13,166,13,48,87,174,51,
+178,79,72,88,53,23,194,229,72,59,219,16,68,50,68,169,
+225,19,201,169,209,159,84,131,171,192,125,43,73,231,139,206,
+81,181,229,171,125,135,129,153,221,119,27,198,92,16,4,34,
+184,182,31,155,240,130,203,94,21,179,79,151,187,185,101,7,
+52,92,85,235,226,232,82,76,186,22,191,10,31,128,114,103,
+251,233,196,241,149,183,100,88,227,224,141,116,138,118,235,102,
+150,122,42,234,184,251,254,168,35,118,192,246,153,84,91,216,
+64,135,81,38,238,92,194,61,126,132,126,95,145,65,65,68,
+8,99,72,97,85,77,96,162,228,122,199,112,48,68,134,6,
+34,50,100,98,39,199,3,58,17,100,143,3,186,109,209,249,
+18,115,222,46,39,249,229,225,94,225,34,193,39,85,176,188,
+110,243,220,116,18,217,225,158,141,67,198,208,48,183,166,143,
+130,241,198,224,198,112,148,132,148,156,217,14,61,185,15,115,
+226,137,89,92,217,88,87,39,173,89,157,30,140,192,236,50,
+16,86,184,241,218,2,34,118,205,179,253,35,254,235,11,188,
+25,145,52,111,113,208,55,92,222,245,106,115,121,183,76,93,
+49,198,148,129,157,74,68,76,146,203,10,253,221,104,18,181,
+127,75,8,194,161,216,224,250,49,166,97,98,196,100,16,218,
+176,177,51,75,60,17,101,14,100,35,218,168,42,108,76,167,
+35,96,30,44,187,199,90,164,160,174,83,212,75,146,64,139,
+123,27,244,116,192,154,66,124,171,215,41,88,251,187,219,158,
+213,220,134,49,150,93,93,94,171,242,57,19,213,120,144,203,
+215,70,84,56,85,209,103,164,74,81,153,157,197,114,201,176,
+172,30,246,128,36,46,163,251,12,136,198,126,230,52,239,50,
+42,8,37,214,203,185,41,51,28,88,62,195,121,166,27,43,
+55,201,6,117,156,188,186,74,25,176,178,202,242,150,54,217,
+103,209,14,165,87,230,110,172,206,89,26,219,93,55,72,197,
+77,185,16,199,17,251,249,208,5,37,33,95,58,236,251,70,
+173,160,158,210,10,198,115,246,147,67,89,68,226,202,27,229,
+185,158,253,148,32,174,166,141,92,75,181,40,198,75,209,87,
+177,224,217,77,163,47,228,57,57,69,141,243,90,179,17,35,
+231,121,48,9,14,139,165,244,155,16,255,89,48,203,72,95,
+113,75,178,35,77,81,159,204,66,171,194,226,118,146,88,31,
+12,58,177,168,179,66,154,90,60,250,53,135,5,57,194,41,
+118,90,167,89,79,198,178,42,118,240,196,28,111,90,235,218,
+59,27,41,139,250,2,222,70,25,53,27,183,100,223,154,135,
+147,55,77,46,79,92,173,38,34,116,188,39,115,54,198,18,
+193,97,102,232,150,120,212,71,216,12,71,23,94,131,197,247,
+236,252,246,49,118,112,129,100,162,66,118,206,201,132,197,55,
+11,14,68,20,87,213,73,67,240,78,151,86,157,40,80,221,
+157,105,12,55,107,99,170,183,222,47,20,61,44,236,93,222,
+105,179,224,190,203,59,153,131,18,179,49,210,41,168,65,100,
+115,69,63,189,90,106,215,64,200,216,196,84,120,183,123,4,
+171,172,202,103,121,39,132,219,158,88,135,94,31,70,192,244,
+37,98,167,70,173,141,45,41,250,222,150,53,199,218,66,170,
+253,197,98,96,123,136,179,213,131,149,82,125,205,172,117,79,
+161,244,177,167,131,186,108,242,156,45,198,129,114,32,76,239,
+111,135,32,198,83,226,222,116,8,182,241,12,59,212,164,103,
+201,198,64,29,242,203,50,129,13,86,20,160,182,153,97,125,
+224,16,88,65,49,75,246,176,162,197,29,200,70,37,182,156,
+73,129,220,154,55,199,208,29,16,93,152,231,215,10,83,179,
+228,106,64,116,208,214,10,91,109,48,252,196,139,54,198,59,
+133,44,158,19,232,34,232,161,94,211,41,40,28,11,199,69,
+240,144,227,141,90,116,89,193,68,129,31,118,130,230,98,163,
+103,58,60,51,37,157,237,101,77,191,88,80,139,142,6,55,
+102,240,217,165,91,77,72,231,156,163,243,54,33,185,218,81,
+27,57,83,109,155,64,9,248,224,61,145,122,43,112,5,119,
+214,242,3,93,161,225,184,30,216,145,197,205,181,45,145,122,
+15,184,252,48,51,196,36,106,80,190,164,26,189,230,59,198,
+78,248,12,191,65,145,165,208,100,11,192,238,59,32,51,27,
+222,12,211,168,112,15,218,43,235,69,241,88,237,46,138,3,
+30,218,86,59,119,4,8,176,242,213,5,204,30,30,146,60,
+226,248,50,3,122,32,163,145,224,104,237,112,137,219,241,193,
+197,148,114,143,176,76,241,145,193,87,3,102,121,223,100,220,
+188,108,7,113,29,81,192,179,135,47,237,169,131,117,49,32,
+160,209,189,186,179,167,127,1,216,99,106,27,215,211,128,210,
+204,32,83,17,3,173,98,181,184,70,0,90,245,194,80,190,
+56,72,9,128,166,164,88,45,66,198,228,219,184,119,221,219,
+3,161,186,0,80,16,52,201,91,88,113,115,35,153,226,148,
+241,24,64,196,77,102,112,69,173,79,171,33,253,204,11,248,
+52,175,56,68,0,6,155,134,109,163,217,207,103,86,100,81,
+240,29,63,75,168,150,41,73,44,202,218,80,141,219,195,123,
+213,145,46,185,160,43,240,248,9,38,160,96,197,136,76,204,
+142,41,136,61,96,114,113,197,139,28,11,116,167,162,65,187,
+135,35,82,44,190,153,2,234,25,78,226,106,47,135,50,153,
+137,192,55,92,41,142,189,221,58,179,61,180,221,136,60,61,
+139,49,238,234,83,209,9,46,69,206,38,130,46,51,235,43,
+105,130,58,64,90,186,146,245,36,27,228,11,90,108,228,138,
+212,189,71,150,10,72,188,41,216,13,119,72,99,12,176,138,
+247,77,39,35,188,209,101,24,246,119,140,27,249,140,207,167,
+82,152,198,120,226,230,38,133,51,108,121,199,120,229,224,116,
+183,199,105,141,172,184,58,103,76,232,237,5,198,75,29,202,
+24,36,135,28,232,178,211,208,86,125,169,253,157,44,212,95,
+189,124,247,253,7,51,72,252,197,226,111,190,217,132,241,53,
+0,152,191,221,237,240,230,195,47,7,184,203,75,60,123,254,
+238,128,255,226,47,159,253,250,197,12,168,2,0,254,110,223,
+198,226,39,191,248,228,131,205,27,175,94,207,253,231,197,103,
+159,47,190,158,161,235,143,223,99,252,217,14,141,119,40,127,
+150,235,122,243,234,131,45,28,51,233,175,190,139,144,191,61,
+89,241,249,172,235,197,140,232,195,236,194,79,238,50,24,223,
+52,252,237,226,175,94,253,250,219,51,22,111,230,62,250,160,
+21,176,247,93,242,2,128,198,191,126,191,55,229,245,172,231,
+221,94,18,0,250,127,179,189,229,247,14,109,204,210,62,63,
+249,159,228,198,22,230,62,253,38,73,246,65,210,232,47,190,
+122,251,246,213,203,185,223,124,7,99,255,219,51,102,191,249,
+228,67,67,190,155,127,154,127,52,251,255,0,220,255,110,138,
+109,254,209,191,127,138,237,95,45,243,223,37,197,6,232,188,
+115,242,119,19,109,179,73,55,107,253,209,95,191,253,63,159,
+253,98,241,229,219,103,127,40,225,246,47,56,250,209,93,182,
+234,143,231,190,124,54,203,230,124,199,142,119,141,119,223,250,
+240,155,127,173,204,119,83,236,163,223,27,184,111,218,255,160,
+152,223,77,229,44,252,62,247,95,3,65,152,125,223,196,189,
+187,17,254,228,239,94,125,249,193,187,191,121,245,223,158,189,
+124,251,159,94,61,255,234,205,31,148,255,62,215,248,187,201,
+29,224,233,147,119,63,127,176,239,27,83,222,45,133,133,239,
+100,149,190,221,212,244,174,247,223,245,251,45,18,99,55,250,
+46,159,180,25,215,201,242,204,208,114,103,196,225,26,110,151,
+133,43,35,60,83,203,93,94,135,244,225,203,92,61,68,186,
+226,93,177,158,86,135,81,121,49,209,14,43,199,141,61,117,
+153,35,247,37,227,118,162,179,237,115,174,71,85,157,100,110,
+84,171,237,141,13,197,246,70,91,123,176,74,40,153,131,93,
+9,89,75,247,31,23,56,156,230,89,158,234,32,75,200,14,
+239,105,220,123,178,172,81,165,34,145,211,64,101,143,236,162,
+140,41,123,121,170,191,221,246,103,101,87,77,103,185,25,163,
+145,236,206,44,38,238,228,141,87,114,123,44,88,196,178,122,
+4,165,8,165,82,132,199,120,153,239,54,237,108,218,110,213,
+175,244,37,201,71,230,1,216,188,114,89,223,245,11,175,6,
+140,11,197,206,78,52,223,72,67,57,165,154,214,32,102,185,
+172,209,107,9,87,180,68,105,110,114,79,99,186,74,133,58,
+236,28,93,30,19,162,244,122,120,111,235,150,201,244,41,167,
+240,163,94,192,179,178,106,2,160,9,201,49,190,238,181,19,
+42,110,180,183,225,150,105,234,210,91,216,254,89,75,226,66,
+71,243,60,232,246,168,121,93,61,132,21,28,74,40,138,118,
+105,220,150,76,101,160,35,158,38,159,40,50,246,43,218,35,
+188,116,42,234,186,119,37,97,52,104,79,131,88,22,66,225,
+41,28,152,160,8,89,245,230,181,157,67,68,164,73,55,106,
+59,75,103,52,222,54,215,175,57,175,47,237,64,202,218,52,
+217,116,78,179,247,59,123,9,1,30,98,223,171,19,244,240,
+160,207,203,22,119,245,132,76,180,222,208,30,41,175,32,198,
+118,70,116,123,228,226,33,207,229,155,250,27,217,201,129,133,
+158,212,174,136,163,176,186,54,112,49,132,6,223,165,149,146,
+203,68,42,69,35,223,113,56,198,55,152,70,176,157,208,187,
+143,27,110,223,24,108,139,140,153,18,95,188,126,53,216,162,
+88,217,129,177,221,187,63,116,147,172,109,39,162,184,13,219,
+54,243,92,88,203,169,185,224,56,218,78,38,251,185,188,244,
+4,233,86,84,197,25,139,72,122,174,219,78,46,79,214,27,
+156,243,244,206,134,162,162,174,26,120,197,149,28,73,44,56,
+90,45,137,109,85,17,119,224,92,23,93,106,71,112,228,210,
+158,198,125,96,242,16,9,0,0,233,223,88,76,160,54,127,
+234,56,181,171,17,5,175,230,124,99,186,162,222,22,240,214,
+195,218,52,55,187,70,205,166,80,250,104,221,163,177,38,102,
+121,37,3,86,59,242,92,64,214,249,199,20,218,137,74,212,
+110,157,199,134,195,122,117,137,153,150,5,164,226,104,107,21,
+225,214,211,144,35,86,181,50,192,65,59,146,100,219,236,111,
+166,185,144,174,118,87,104,215,53,156,183,146,93,195,33,42,
+202,58,240,187,149,77,44,112,7,87,152,252,211,97,206,215,
+205,243,251,68,240,32,166,70,12,71,35,126,76,66,76,168,
+86,124,9,245,82,250,208,14,155,132,173,56,38,134,69,0,
+117,224,142,217,190,166,48,31,170,140,93,133,11,133,35,84,
+168,153,34,246,11,135,230,122,146,67,105,167,195,200,193,185,
+125,201,120,2,207,16,146,23,155,241,48,92,99,72,238,157,
+233,104,120,191,150,14,91,111,187,111,136,250,195,146,106,208,
+171,104,77,245,233,141,37,166,26,83,53,209,97,219,75,52,
+149,55,17,161,146,174,34,60,171,77,175,144,152,155,91,249,
+77,152,118,74,242,233,228,216,8,105,221,119,162,172,86,58,
+70,137,87,115,120,56,172,165,154,70,239,44,173,212,154,240,
+17,241,61,245,106,72,216,28,112,213,120,44,59,200,53,104,
+194,107,132,160,162,122,173,255,255,59,57,147,223,68,178,59,
+142,255,43,45,37,167,81,38,125,200,109,20,229,144,81,142,
+185,68,115,27,117,203,61,147,78,50,202,36,61,234,246,40,
+57,26,48,139,89,12,102,43,48,155,1,155,213,44,54,59,
+184,176,89,140,141,141,217,87,179,217,24,179,239,187,139,45,
+96,119,119,102,34,69,26,205,237,189,250,253,222,247,87,85,
+122,135,170,175,62,239,135,168,34,115,51,141,9,125,4,51,
+241,163,172,203,92,79,67,114,225,29,189,154,138,53,55,14,
+56,179,155,75,244,116,14,1,96,147,35,4,155,250,29,83,
+6,188,153,239,121,205,35,55,102,109,80,172,250,214,139,178,
+117,7,77,223,119,229,148,86,94,154,117,149,8,29,152,193,
+225,173,67,124,201,179,17,56,37,151,226,225,58,77,212,109,
+224,46,176,69,245,157,156,45,78,101,114,162,152,53,92,3,
+51,138,89,236,168,101,139,128,110,15,83,67,97,162,225,112,
+59,191,211,98,176,74,86,104,58,86,89,134,214,182,191,109,
+129,178,99,220,120,61,203,24,213,197,242,145,43,152,132,153,
+5,74,37,81,126,121,186,23,235,244,93,213,123,243,172,155,
+192,14,38,121,186,51,18,218,226,106,161,29,223,176,20,59,
+228,142,236,225,29,82,214,127,226,38,111,37,209,200,157,146,
+212,66,222,15,23,31,246,199,176,110,0,169,106,53,119,118,
+55,66,137,0,27,154,220,65,237,172,5,61,158,181,232,139,
+31,186,94,67,30,190,15,134,109,60,201,109,69,212,171,89,
+107,131,161,136,85,85,246,163,88,157,63,55,155,242,196,251,
+80,248,166,186,39,5,112,116,118,60,110,192,149,21,21,96,
+216,219,73,35,192,242,124,230,228,150,235,146,34,82,237,35,
+100,174,195,14,235,205,133,153,12,151,244,199,154,99,70,38,
+112,99,107,244,149,144,63,212,179,70,197,254,177,43,228,175,
+158,131,128,44,120,175,182,104,44,107,222,160,30,78,77,34,
+176,64,70,158,25,4,84,69,17,186,202,45,217,204,110,148,
+81,102,227,80,97,169,37,214,36,51,144,134,224,186,36,155,
+118,21,60,253,113,2,244,50,176,4,5,219,124,147,61,180,
+99,125,76,12,53,73,49,185,151,88,147,60,207,50,195,145,
+116,123,190,203,11,144,113,230,60,165,26,47,94,64,184,235,
+84,101,155,27,144,231,216,208,116,150,159,160,206,152,195,250,
+176,126,182,133,151,67,212,168,237,17,107,138,208,46,187,1,
+202,102,24,151,245,59,236,144,95,105,117,240,169,45,155,92,
+28,98,149,11,137,78,33,222,211,187,11,246,211,108,65,21,
+52,155,6,168,96,50,225,46,39,136,215,232,209,157,197,152,
+51,245,5,114,180,124,131,133,219,185,86,17,197,233,115,210,
+5,198,160,223,218,34,5,17,221,81,174,137,193,200,162,14,
+0,11,153,163,69,249,206,169,38,167,163,183,124,116,137,107,
+207,85,11,192,7,227,212,160,58,19,70,211,108,110,164,238,
+6,58,20,175,130,195,21,149,111,43,104,135,108,217,222,66,
+199,41,145,244,168,200,17,186,103,160,139,205,124,99,179,151,
+179,87,208,173,27,22,44,151,56,182,135,215,96,162,35,23,
+4,42,109,145,173,50,42,178,95,32,82,55,174,242,150,245,
+82,158,216,80,59,117,84,225,65,183,190,217,79,161,26,113,
+59,205,211,47,98,139,45,115,130,109,86,218,130,164,248,129,
+226,172,29,190,144,158,55,211,122,154,20,178,165,113,243,251,
+208,169,207,141,54,184,198,35,37,51,176,97,80,66,78,34,
+227,98,45,130,160,183,0,2,217,159,79,179,140,66,30,85,
+168,118,110,1,249,242,246,208,201,221,154,135,165,115,181,103,
+36,185,32,166,213,245,99,175,44,50,28,77,39,86,163,41,
+16,85,135,68,172,114,243,138,151,216,2,187,154,246,125,251,
+92,149,198,247,8,133,193,142,25,13,109,28,215,241,209,245,
+94,207,107,6,183,148,230,130,168,128,203,42,36,119,138,118,
+144,157,51,138,102,116,54,62,28,239,82,214,175,188,53,136,
+138,96,58,168,157,234,134,205,169,159,192,224,240,10,152,4,
+28,113,239,32,149,135,25,219,132,61,189,9,37,96,94,73,
+78,89,234,97,3,143,221,219,176,183,111,241,25,3,237,138,
+195,134,30,186,84,95,104,46,36,244,14,33,210,205,225,54,
+37,56,206,15,207,137,36,174,0,68,139,28,208,26,214,192,
+6,192,3,191,75,82,23,170,241,90,178,243,33,126,87,193,
+192,11,186,163,93,185,237,50,210,184,212,213,85,106,142,132,
+58,46,87,244,93,87,223,190,201,53,249,116,128,151,98,232,
+136,213,166,54,135,85,227,153,193,30,108,215,64,117,223,4,
+21,135,220,176,204,190,43,214,147,25,155,221,76,204,42,78,
+83,230,67,130,236,24,81,101,76,1,67,26,113,123,192,103,
+231,225,183,50,161,144,134,117,146,28,83,210,250,186,50,115,
+127,165,167,170,114,67,108,173,80,49,108,73,146,163,52,61,
+107,217,200,2,23,202,90,162,172,222,167,73,96,93,158,190,
+206,28,101,76,83,91,8,119,71,186,225,158,220,158,104,207,
+114,150,48,34,35,61,2,82,44,205,186,183,140,42,70,29,
+180,141,6,3,153,196,108,136,102,12,59,227,108,39,192,56,
+96,223,202,154,227,10,199,51,74,34,53,185,221,99,207,131,
+111,167,149,38,186,194,92,193,189,218,72,134,157,176,178,92,
+91,47,226,242,176,218,148,58,47,70,207,106,92,18,175,198,
+31,19,89,100,5,219,67,201,55,175,234,155,28,103,240,62,
+53,127,136,76,121,112,5,198,14,153,16,231,230,38,1,65,
+96,238,201,85,49,184,181,47,1,204,126,28,141,35,57,101,
+83,189,34,66,155,122,88,187,81,147,49,107,246,22,94,201,
+164,227,179,45,49,165,149,195,72,75,24,120,186,170,20,59,
+78,147,161,237,74,49,173,163,235,74,137,180,242,58,74,242,
+50,163,29,31,42,162,151,105,103,49,6,249,246,140,12,106,
+97,90,101,82,50,178,211,209,135,137,250,148,115,41,244,10,
+175,98,231,144,127,122,178,70,108,52,109,77,72,110,10,132,
+34,71,12,215,173,147,216,243,158,67,249,66,249,200,230,53,
+50,17,1,237,96,27,126,82,172,184,253,49,77,113,80,84,
+77,134,202,209,65,21,186,47,224,57,114,15,20,238,38,194,
+21,95,226,16,103,101,222,40,220,57,28,197,56,65,149,83,
+209,145,178,43,168,91,248,209,35,81,197,94,184,243,136,187,
+204,93,64,50,231,192,224,92,107,231,58,221,87,239,132,67,
+164,170,92,87,118,166,155,69,20,108,234,81,17,141,189,89,
+55,63,209,35,139,81,192,201,75,170,133,253,203,155,92,213,
+27,172,122,39,136,104,237,161,110,234,170,122,121,177,190,120,
+101,165,110,234,238,130,5,41,135,217,108,3,90,138,57,154,
+217,159,151,239,85,202,221,18,211,122,81,216,84,249,252,195,
+170,13,115,202,71,31,23,216,182,136,143,43,145,236,227,105,
+128,226,204,124,224,86,117,50,170,94,160,121,236,73,44,161,
+38,13,38,73,159,29,142,114,151,195,11,199,89,232,110,115,
+79,123,101,165,147,99,100,186,100,46,80,204,242,21,71,91,
+28,18,205,172,53,24,89,69,247,26,57,236,238,58,116,219,
+3,112,90,177,187,120,160,168,82,216,89,180,94,96,186,39,
+66,5,162,0,29,11,170,25,17,133,157,15,220,98,203,117,
+254,105,52,64,155,120,243,114,210,157,15,94,187,128,119,170,
+237,148,57,103,172,80,170,107,234,237,27,184,174,70,159,170,
+248,60,82,114,0,210,184,94,54,140,186,47,50,221,179,54,
+31,170,5,233,189,161,208,119,24,251,188,8,170,103,132,225,
+93,202,73,211,213,68,183,124,90,154,97,183,1,135,48,137,
+163,84,162,77,49,167,82,212,248,26,255,50,112,70,210,186,
+88,187,106,65,192,203,59,169,78,98,18,107,217,120,40,21,
+4,47,33,64,156,209,21,25,30,110,244,138,174,151,236,83,
+17,29,222,109,169,39,98,79,180,83,153,230,66,179,217,108,
+104,140,23,76,62,41,42,78,214,154,254,30,22,1,76,53,
+87,165,139,245,3,65,191,224,0,122,234,91,7,51,5,175,
+26,229,67,228,9,103,223,10,34,107,132,56,130,118,6,122,
+236,209,93,49,156,236,32,114,108,150,29,210,148,134,38,64,
+188,9,118,230,162,140,206,225,80,225,4,222,116,132,157,86,
+195,224,52,6,80,161,217,6,212,40,220,82,55,204,138,249,
+236,70,147,217,48,198,252,167,187,251,220,187,92,22,75,227,
+250,187,205,253,233,192,43,203,0,61,65,208,114,188,235,135,
+96,4,68,11,118,199,144,58,137,102,70,130,167,64,58,154,
+219,115,92,15,56,103,32,156,92,110,149,88,31,48,45,142,
+166,61,89,161,169,75,204,9,170,94,121,8,221,197,41,190,
+27,63,216,132,244,209,188,71,19,246,201,185,195,8,84,108,
+108,130,241,176,87,69,90,188,240,8,143,153,30,66,26,199,
+158,56,62,86,66,248,72,87,25,123,184,95,36,178,184,156,
+100,179,195,148,21,175,124,125,219,240,97,17,144,45,62,20,
+218,203,2,84,59,163,7,33,229,214,129,198,218,215,159,96,
+246,48,38,54,52,243,105,130,16,72,203,156,92,50,16,252,
+201,28,226,55,134,112,212,17,255,0,189,225,245,249,146,87,
+30,17,20,38,206,43,4,138,177,140,52,178,124,96,172,119,
+142,167,133,34,66,232,110,15,8,58,18,129,241,89,83,31,
+145,46,166,82,128,229,226,245,225,254,234,98,1,187,89,235,
+151,48,123,18,31,216,242,108,6,65,153,166,104,224,214,135,
+18,174,59,194,66,243,33,126,4,33,4,93,106,136,229,57,
+234,13,168,21,130,142,59,88,6,35,184,145,214,15,202,206,
+250,18,174,102,161,31,38,86,78,183,103,139,203,139,97,136,
+88,9,44,35,90,193,241,97,198,208,205,74,45,143,137,2,
+167,85,153,61,95,232,235,207,250,46,119,170,151,83,72,151,
+233,91,60,169,12,216,6,27,69,149,68,250,184,76,96,181,
+54,230,215,200,74,64,6,202,128,135,54,147,243,176,183,148,
+39,80,226,146,226,89,25,68,69,144,203,199,105,64,61,210,
+64,123,14,66,227,253,120,184,233,233,151,154,59,219,72,161,
+216,183,120,128,3,153,65,15,105,211,56,84,148,56,216,14,
+55,247,197,139,32,121,93,120,230,153,53,153,203,59,83,46,
+84,91,150,110,56,174,106,129,215,197,32,88,183,92,54,149,
+89,123,143,59,190,108,105,135,231,118,158,178,88,158,111,142,
+13,41,149,147,200,140,98,215,58,237,83,182,30,159,110,240,
+215,212,73,116,249,8,101,40,209,103,151,65,86,71,75,214,
+173,73,174,188,132,235,251,109,144,234,235,16,164,178,148,121,
+55,49,245,119,175,197,204,211,233,36,223,33,197,36,68,102,
+100,63,150,73,240,66,253,148,132,10,89,148,42,241,140,118,
+63,4,166,140,186,103,228,21,6,89,19,216,117,40,186,78,
+155,195,42,158,163,53,219,143,185,137,63,46,207,24,125,254,
+104,33,45,219,100,190,250,234,219,215,75,131,233,95,111,222,
+254,253,217,87,111,86,255,182,236,22,249,246,245,95,191,255,
+246,213,219,71,158,99,229,211,71,134,234,201,116,90,30,81,
+122,247,129,191,250,136,162,188,103,75,254,252,212,131,242,237,
+55,143,46,209,163,214,199,70,160,143,206,211,71,36,234,215,
+207,254,240,132,107,60,221,195,255,113,193,254,7,248,248,224,
+109,189,250,246,221,211,153,165,239,87,191,121,236,24,186,250,
+122,33,245,106,117,33,246,229,39,47,87,223,124,247,205,215,
+43,159,173,60,95,121,190,212,248,252,205,219,215,43,207,223,
+189,253,122,229,249,99,229,149,95,190,254,231,202,167,223,191,
+91,249,197,34,231,179,39,63,233,245,95,86,151,147,15,50,
+207,86,126,251,132,132,125,177,242,187,247,112,216,199,188,151,
+255,29,190,248,213,207,43,247,167,165,37,243,83,234,61,38,
+190,252,193,248,231,86,252,226,205,119,63,165,222,34,237,229,
+199,209,7,171,240,103,148,251,253,155,213,213,55,255,248,41,
+21,159,50,95,254,112,242,226,203,79,158,61,123,241,222,240,
+124,207,220,253,168,61,236,50,180,216,192,175,255,253,205,187,
+71,76,232,7,27,229,55,207,94,252,7,193,119,84,109,
\ No newline at end of file
diff --git a/uppsrc/CtrlCore/srcdoc.tpp/LogPos$en-us.tpp b/uppsrc/CtrlCore/srcdoc.tpp/LogPos$en-us.tpp
new file mode 100644
index 000000000..078859668
--- /dev/null
+++ b/uppsrc/CtrlCore/srcdoc.tpp/LogPos$en-us.tpp
@@ -0,0 +1,85 @@
+TITLE("Logical positions")
+COMPRESSED
+120,156,149,85,219,110,219,70,16,253,149,69,228,22,182,43,
+11,59,123,33,119,197,151,20,78,158,26,36,65,210,246,193,
+130,96,211,212,74,90,132,34,85,146,138,47,69,243,237,61,
+67,202,142,29,181,72,107,193,162,77,242,204,185,204,12,57,
+83,226,232,72,142,229,72,126,231,103,250,42,44,243,93,217,
+205,103,165,114,46,139,169,52,89,78,105,246,206,103,95,190,
+124,153,120,175,50,46,69,40,69,210,104,82,68,70,74,163,
+82,178,94,122,235,200,73,157,26,101,83,105,167,219,188,201,
+55,243,89,238,116,118,250,33,1,74,141,237,72,147,38,73,
+137,50,184,75,106,169,12,41,75,206,25,74,173,211,62,73,
+166,69,190,237,98,93,205,103,215,140,3,74,3,37,83,151,
+24,2,198,88,165,83,107,128,53,134,8,127,147,77,147,52,
+157,118,177,43,3,48,148,164,89,110,84,118,206,42,205,56,
+25,65,157,74,1,53,202,36,70,59,165,201,41,149,120,109,
+188,129,108,82,211,216,5,136,188,6,134,113,12,179,32,52,
+214,144,70,30,38,181,26,183,165,56,26,233,73,129,213,73,
+107,65,24,110,31,66,226,124,24,151,128,78,165,150,239,118,
+198,145,78,157,50,42,81,16,32,83,152,100,118,59,93,132,
+182,0,78,43,202,58,72,202,206,95,218,140,0,78,199,233,
+72,73,47,85,146,122,16,66,44,12,107,239,73,59,16,26,
+178,146,244,180,168,23,108,82,89,169,51,96,28,186,144,160,
+112,31,137,77,8,122,149,118,96,76,73,107,124,91,227,210,
+105,27,184,15,93,221,204,103,167,47,143,229,68,78,148,181,
+39,172,215,3,238,180,209,218,36,222,144,212,96,65,13,195,
+113,37,18,157,36,171,220,244,58,111,65,217,25,14,246,156,
+59,207,83,132,216,181,179,26,204,9,190,208,81,216,211,72,
+70,121,227,180,118,114,90,148,121,219,62,137,231,148,45,18,
+141,137,70,41,167,106,181,50,158,163,209,10,241,170,196,122,
+66,190,54,49,82,77,155,240,199,46,54,97,19,42,4,28,
+49,24,217,67,115,246,67,8,45,195,16,170,49,41,140,161,
+77,18,201,105,89,204,130,210,22,113,75,114,6,138,240,65,
+131,187,253,28,246,179,209,207,5,233,49,233,145,87,70,67,
+137,55,6,1,160,0,121,34,146,14,31,56,67,44,253,100,
+16,36,244,38,6,250,1,110,198,100,70,41,6,24,125,242,
+134,233,189,230,248,20,210,87,137,180,104,131,26,224,138,67,
+87,71,136,157,148,227,223,19,198,219,49,97,17,160,144,172,
+133,109,141,160,149,131,117,139,228,117,63,220,148,186,233,219,
+112,211,190,202,187,176,159,150,211,243,163,97,204,40,25,83,
+50,146,140,183,206,163,125,100,56,62,109,140,87,94,107,171,
+188,213,137,68,140,237,176,199,12,230,93,234,247,240,177,72,
+58,166,20,107,5,171,214,194,124,15,131,241,148,88,138,114,
+62,225,16,246,69,174,206,202,88,177,14,204,69,54,140,194,
+233,249,79,68,41,23,114,216,22,231,18,169,61,178,64,4,
+210,98,204,241,36,112,232,51,218,172,176,3,252,40,40,62,
+229,171,112,117,182,223,211,63,47,255,250,225,245,219,179,223,
+62,138,89,171,50,241,166,94,197,34,47,197,182,110,35,47,
+127,251,227,124,214,218,76,188,47,243,162,31,4,81,47,197,
+121,215,148,173,184,137,221,58,86,34,118,173,64,95,249,82,
+108,197,34,116,161,217,64,227,66,92,223,137,242,219,106,147,
+3,2,145,151,245,141,216,212,77,16,69,189,217,150,225,86,
+108,31,185,154,80,230,93,252,28,68,87,63,112,48,55,206,
+23,93,94,173,202,48,17,191,174,3,160,184,38,150,245,174,
+17,221,221,54,180,172,113,93,55,241,190,174,58,80,29,168,
+152,14,166,34,86,57,123,39,51,49,59,21,101,88,118,115,
+113,117,38,224,8,182,90,81,96,219,198,7,208,175,254,96,
+53,182,16,81,128,184,169,55,125,1,17,22,171,192,228,123,
+173,143,50,69,94,45,158,42,106,227,125,152,28,138,224,211,
+189,136,255,78,123,93,119,235,129,155,41,154,184,90,15,42,
+218,39,50,62,64,198,33,217,112,239,252,59,108,223,136,238,
+89,158,43,248,202,201,148,204,245,15,206,10,232,8,205,255,
+244,54,128,254,37,55,241,123,104,186,190,208,65,123,251,105,
+224,71,215,231,188,68,137,7,192,235,188,88,139,46,110,194,
+179,81,42,214,232,16,168,121,140,203,252,174,222,117,226,120,
+215,238,242,178,188,19,121,43,134,181,99,103,69,19,242,94,
+111,221,240,217,120,31,171,213,201,88,108,227,109,120,202,141,
+59,129,221,175,8,11,193,16,96,174,119,29,111,4,102,106,
+33,80,226,112,47,246,26,127,174,208,79,120,142,109,187,195,
+212,175,243,126,169,250,53,0,146,183,224,145,40,62,234,189,
+175,107,196,183,234,119,65,108,155,250,186,12,27,209,175,5,
+238,233,107,228,219,109,9,194,94,126,145,87,98,215,242,186,
+12,203,188,136,203,101,232,243,232,27,92,15,59,196,184,74,
+112,55,22,121,195,154,3,131,22,188,30,123,86,188,62,227,
+170,130,214,155,117,168,246,255,65,197,254,50,139,25,196,223,
+172,239,30,32,7,173,175,194,224,234,58,244,38,194,98,34,
+46,112,20,203,188,192,107,242,240,121,210,176,5,22,205,239,
+124,49,123,169,197,213,139,119,191,92,158,243,204,148,151,175,
+111,99,119,249,33,116,205,221,213,139,57,43,109,118,85,223,
+239,71,27,189,231,222,38,72,63,226,120,236,253,88,144,62,
+225,193,28,236,47,135,245,239,9,118,45,27,122,134,126,104,
+212,197,144,249,131,179,103,109,89,12,105,241,229,175,143,178,
+77,232,214,245,98,120,106,138,11,209,238,150,203,120,43,142,
+203,248,41,136,55,216,223,247,117,123,33,66,87,76,38,147,
+147,158,68,102,90,204,255,6,214,199,18,85,
\ No newline at end of file
diff --git a/uppsrc/CtrlCore/srcdoc.tpp/TimerAndModalTrap$en-us.tpp b/uppsrc/CtrlCore/srcdoc.tpp/TimerAndModalTrap$en-us.tpp
new file mode 100644
index 000000000..87b5338a1
--- /dev/null
+++ b/uppsrc/CtrlCore/srcdoc.tpp/TimerAndModalTrap$en-us.tpp
@@ -0,0 +1,190 @@
+TITLE("About modal loops and periodic timer events")
+COMPRESSED
+120,156,197,88,107,115,227,182,21,253,43,104,189,237,218,27,
+217,37,248,16,73,169,211,137,227,36,141,39,217,199,196,155,
+233,7,143,39,130,72,200,66,76,18,44,9,90,171,73,147,
+223,222,115,1,80,15,123,147,166,51,233,116,119,118,37,81,
+184,175,115,207,125,64,183,33,123,241,34,152,4,39,193,127,
+248,51,251,92,174,196,80,153,187,219,42,204,178,185,74,131,
+120,46,120,58,127,155,207,127,254,249,231,139,60,15,231,164,
+138,67,21,15,226,136,135,156,199,65,16,135,41,79,242,32,
+79,50,158,5,81,26,135,73,26,36,179,86,116,162,190,187,
+21,89,52,127,245,237,20,82,225,36,57,137,120,196,3,62,
+13,99,156,10,162,32,140,121,152,240,44,139,121,154,100,81,
+62,157,206,10,209,26,165,155,187,219,37,201,65,42,130,84,
+144,102,211,152,67,38,78,194,40,77,98,200,198,49,231,120,
+207,147,116,154,166,51,163,76,37,239,110,21,57,189,228,211,
+116,46,226,144,156,190,34,111,227,201,244,4,94,134,41,84,
+196,97,60,141,163,44,140,120,22,134,211,60,138,243,24,238,
+243,112,166,140,132,179,75,136,145,40,137,37,48,28,39,49,
+143,128,75,156,38,17,142,165,120,141,131,156,135,176,158,5,
+73,2,195,242,195,8,22,225,68,114,83,152,11,211,132,78,
+103,113,198,163,52,11,227,112,26,194,129,32,69,176,100,61,
+153,149,178,47,32,23,133,124,110,224,210,252,234,211,100,206,
+33,156,78,210,147,48,200,131,112,154,230,48,8,103,17,120,
+148,231,60,202,96,48,230,73,192,163,89,161,75,4,187,12,
+147,32,154,67,38,67,54,166,80,108,161,73,166,28,254,134,
+81,6,139,41,143,34,252,159,196,89,58,235,37,229,195,232,
+238,238,246,213,167,167,193,69,112,17,38,201,25,249,155,67,
+60,139,226,40,138,167,121,204,131,8,86,160,35,38,184,166,
+1,50,202,147,48,155,45,69,15,147,38,38,108,175,136,1,
+196,38,192,31,101,73,4,203,83,252,135,204,34,188,8,200,
+132,121,156,69,81,22,204,138,74,244,253,1,60,175,40,68,
+206,39,156,159,164,132,106,18,133,113,78,208,68,33,224,13,
+167,73,206,129,111,50,141,131,112,214,201,127,14,170,147,181,
+108,0,176,2,65,230,99,114,60,25,225,139,35,99,56,225,
+33,232,152,76,167,1,161,149,128,19,97,148,0,238,128,103,
+49,60,194,95,36,216,120,62,90,122,88,94,240,104,194,163,
+147,60,140,35,120,146,199,49,0,128,2,158,115,206,131,12,
+127,17,25,96,177,204,224,158,91,135,180,226,241,132,199,39,
+41,136,140,60,229,49,153,207,35,130,47,4,250,225,52,72,
+144,134,208,137,135,4,122,248,2,176,243,48,163,127,103,36,
+159,76,56,10,2,30,242,36,65,216,17,128,14,51,132,158,
+0,249,200,146,156,167,217,236,141,220,244,159,11,35,61,91,
+94,93,189,112,52,227,211,9,159,158,4,36,159,100,57,210,
+199,99,130,47,138,227,60,204,163,40,9,243,36,154,6,128,
+177,119,245,76,194,84,83,182,30,119,74,210,9,79,81,94,
+8,53,73,16,188,21,67,224,41,39,87,194,44,159,18,8,
+94,201,226,188,82,13,249,1,94,204,29,21,94,93,125,194,
+121,74,138,50,84,75,150,77,131,40,7,22,128,32,72,64,
+115,116,132,12,121,70,154,67,212,0,181,132,226,65,220,203,
+197,185,175,215,31,191,255,233,79,95,188,57,255,238,134,221,
+246,225,156,93,46,245,96,88,173,75,81,177,74,235,182,103,
+162,41,89,43,59,165,75,85,48,163,106,217,49,249,8,70,
+244,127,190,187,237,131,57,243,47,215,13,51,107,133,227,157,
+81,69,37,217,70,50,211,109,153,209,76,126,104,43,161,26,
+182,89,11,195,112,98,211,233,230,158,109,148,89,59,137,86,
+201,66,50,189,98,84,83,179,3,173,233,156,157,168,166,168,
+134,82,178,191,94,153,174,250,70,45,255,226,95,47,214,127,
+243,71,252,139,229,57,251,230,237,219,119,108,198,218,97,89,
+193,219,247,186,253,135,106,74,189,97,139,31,253,49,247,205,
+204,127,58,255,151,217,182,178,148,43,39,120,245,205,229,205,
+205,155,203,215,95,204,119,223,211,243,211,179,253,231,71,173,
+74,182,226,251,71,139,159,230,199,142,248,23,18,92,204,102,
+78,126,60,251,227,78,207,141,52,239,129,229,149,168,170,37,
+50,114,186,56,167,158,49,97,239,191,186,190,249,236,242,234,
+235,211,21,63,59,176,225,223,88,235,94,51,57,241,92,239,
+187,78,215,173,121,251,245,233,226,143,173,125,251,135,197,31,
+159,235,241,47,127,255,238,122,241,253,229,187,119,139,239,95,
+95,94,191,121,174,204,57,127,241,237,208,156,62,209,177,207,
+251,251,53,37,90,3,86,73,201,53,148,100,131,103,163,35,
+108,169,63,176,123,105,122,166,91,217,200,146,233,71,48,136,
+72,229,222,220,131,26,19,214,107,134,79,91,188,234,134,109,
+245,192,122,3,34,177,110,104,26,5,178,16,39,65,16,151,
+204,158,161,22,244,208,21,178,103,167,27,151,223,53,20,86,
+178,63,187,128,63,240,162,175,232,24,190,104,172,47,29,26,
+175,106,204,5,123,75,36,27,186,30,174,174,172,153,2,100,
+120,96,186,177,252,163,163,240,86,246,19,86,139,102,203,52,
+30,116,196,104,201,68,213,73,81,110,201,173,226,1,65,44,
+37,44,48,101,200,113,27,50,148,45,94,226,96,35,109,84,
+132,6,168,95,84,26,182,160,166,134,134,234,226,24,185,239,
+122,10,77,60,45,46,170,33,32,10,191,182,84,31,205,253,
+156,81,11,174,151,248,206,154,130,213,7,41,81,153,35,58,
+80,109,125,39,249,137,45,78,38,122,27,222,74,202,138,173,
+144,9,251,61,210,205,30,149,220,180,26,96,140,186,22,47,
+123,68,3,145,101,165,93,104,148,133,90,90,211,23,236,178,
+48,3,244,111,39,174,86,23,47,215,18,137,89,74,1,65,
+86,41,164,192,231,219,166,175,208,221,14,73,42,84,214,111,
+123,244,94,155,95,184,253,195,208,219,156,162,7,172,165,67,
+138,78,218,118,194,64,87,100,212,98,66,16,84,0,24,222,
+0,68,35,30,36,67,11,41,36,220,169,160,233,24,14,210,
+112,88,74,172,84,125,43,76,129,220,49,240,210,160,95,146,
+194,213,128,40,32,10,83,157,128,57,229,168,209,203,198,102,
+200,225,90,136,6,49,52,144,25,236,87,165,37,31,209,192,
+39,167,134,135,232,158,189,67,121,192,201,202,2,221,73,51,
+116,205,30,234,213,208,20,180,67,65,99,85,57,80,149,121,
+146,255,27,237,142,34,208,98,77,108,215,150,147,96,79,219,
+130,150,194,202,99,232,43,210,177,101,75,48,240,97,36,181,
+23,213,132,146,205,211,151,186,163,22,216,41,131,84,9,214,
+15,117,45,144,16,159,11,66,19,10,225,136,37,48,252,20,
+136,196,53,99,101,12,101,223,18,90,138,98,205,218,181,232,
+45,123,215,178,106,109,116,40,95,232,92,74,156,236,16,116,
+137,170,48,194,131,227,12,168,190,31,228,113,124,10,139,210,
+252,45,62,126,209,208,32,0,229,52,21,240,107,84,162,59,
+96,103,216,21,187,189,244,78,221,45,110,253,247,139,187,39,
+42,84,131,35,196,114,155,4,12,152,7,178,109,189,229,200,
+19,82,86,126,84,231,236,72,41,91,220,30,116,229,103,70,
+64,76,79,69,26,124,35,65,236,96,112,93,230,191,50,129,
+166,249,204,130,88,17,128,163,199,51,204,17,215,25,29,73,
+126,155,250,221,76,27,109,224,153,133,229,208,248,138,63,179,
+189,235,199,214,34,213,72,37,182,32,4,117,98,133,39,251,
+145,79,64,252,206,190,224,211,104,255,87,161,17,141,43,182,
+143,3,52,14,139,37,77,3,244,56,182,86,247,246,244,158,
+211,255,123,191,127,35,220,99,36,191,2,123,255,127,193,253,
+247,74,209,47,177,152,134,215,90,117,165,159,70,190,155,186,
+73,7,65,12,8,227,27,154,106,86,170,193,106,142,230,89,
+96,38,163,219,29,247,199,55,122,51,25,231,244,90,144,226,
+94,213,45,173,25,207,4,169,88,5,108,213,237,96,108,223,
+4,164,237,47,180,212,9,53,122,116,62,92,109,160,162,82,
+15,178,218,238,102,56,219,232,161,42,109,43,240,59,135,35,
+215,110,57,177,163,12,75,163,143,193,99,130,65,187,241,120,
+244,174,225,30,180,240,162,19,253,26,221,22,111,157,50,90,
+124,168,235,179,211,163,73,54,161,40,252,138,227,199,173,221,
+5,42,116,104,90,39,236,74,0,246,203,66,12,187,13,198,
+45,29,122,191,42,61,181,238,219,88,41,151,195,253,189,236,
+38,110,234,29,251,49,244,118,198,51,171,248,121,0,104,220,
+170,174,101,169,48,65,232,148,93,106,0,159,52,248,68,123,
+60,65,69,66,141,238,106,32,47,154,70,111,201,151,197,203,
+47,133,161,7,7,202,100,215,233,14,187,3,22,173,11,118,
+77,115,71,161,233,238,194,5,186,99,128,186,41,228,129,183,
+142,99,154,24,96,221,144,31,214,56,134,153,54,217,237,133,
+165,110,22,47,13,43,105,99,163,20,238,150,184,113,110,187,
+58,179,33,181,148,92,101,206,158,12,229,175,176,117,60,18,
+76,150,54,189,194,246,227,96,60,200,68,169,86,43,217,73,
+90,40,47,11,172,60,118,16,238,70,114,87,15,149,147,249,
+40,249,14,2,234,220,46,75,167,31,41,34,218,90,241,178,
+56,119,139,146,176,87,49,199,173,53,166,110,103,247,8,67,
+43,151,231,218,4,0,222,15,8,109,130,133,74,97,24,34,
+217,180,224,141,83,185,116,191,36,161,86,95,127,118,148,4,
+231,64,165,106,101,215,30,226,143,173,128,122,40,214,150,225,
+207,246,16,218,140,78,119,235,141,147,119,123,36,108,145,205,
+51,135,56,134,167,20,228,60,8,130,2,4,244,248,30,178,
+224,72,71,107,245,118,41,209,242,58,172,114,59,164,203,161,
+115,196,133,240,40,68,199,159,241,208,213,230,184,203,120,124,
+232,218,228,187,236,184,188,59,44,106,12,7,23,218,146,28,
+70,245,16,93,151,114,11,224,118,140,41,68,43,150,10,121,
+85,36,72,131,101,23,129,235,18,253,208,217,93,136,114,227,
+214,113,191,130,129,13,26,4,248,108,107,221,220,8,170,204,
+45,150,88,191,194,210,246,187,248,228,203,216,206,215,181,174,
+44,71,160,18,252,96,98,48,64,160,149,190,229,244,107,27,
+215,82,62,185,54,140,107,125,123,16,156,85,247,20,23,44,
+251,27,89,85,251,214,96,15,236,141,236,13,172,16,216,225,
+222,236,85,23,88,45,125,179,192,215,143,182,132,237,206,122,
+224,184,13,218,122,79,248,194,207,3,215,15,56,140,182,80,
+60,80,117,122,11,98,9,230,210,190,125,180,120,158,186,205,
+25,109,220,246,29,119,19,243,87,37,86,17,250,71,215,71,
+31,244,179,133,140,6,168,172,86,19,223,134,93,222,159,81,
+87,126,160,57,59,138,186,225,118,56,118,73,187,59,227,103,
+236,211,158,112,13,28,90,73,47,2,235,33,117,152,13,46,
+22,196,46,98,50,61,213,5,149,158,181,124,88,127,96,40,
+90,91,45,140,7,189,193,245,144,238,56,216,204,47,216,215,
+184,195,145,84,173,108,116,192,203,14,25,123,243,244,68,179,
+83,205,81,149,178,224,46,83,246,62,186,191,199,184,253,141,
+168,74,84,135,22,162,13,230,164,6,15,65,167,137,61,96,
+119,118,86,168,174,24,106,90,221,233,234,236,132,96,98,37,
+10,115,52,13,39,123,130,244,72,215,254,50,163,169,145,162,
+221,151,71,3,223,118,133,71,92,61,244,208,31,165,121,226,
+46,146,170,30,239,75,232,140,70,209,4,119,207,132,113,61,
+254,148,60,247,115,202,30,49,107,186,109,203,114,113,110,175,
+103,174,48,253,176,183,44,179,38,233,150,179,252,200,69,139,
+212,160,51,208,239,84,31,32,51,182,98,171,221,122,79,191,
+18,208,152,241,65,175,113,253,239,13,25,1,228,149,106,30,
+220,181,179,71,47,220,111,24,238,103,128,125,60,27,141,59,
+144,173,85,186,106,226,214,221,183,178,80,150,205,27,207,212,
+173,21,65,159,70,210,233,234,101,127,241,42,97,170,27,138,
+209,41,80,66,47,127,192,247,23,236,244,186,22,247,116,89,
+21,251,177,99,87,2,71,107,215,207,157,176,118,93,213,53,
+153,115,250,93,184,244,106,232,199,4,26,65,189,117,21,69,
+37,69,51,56,138,251,54,75,60,63,184,106,147,218,98,188,
+57,215,18,23,209,70,245,245,33,14,118,73,117,91,138,179,
+129,188,18,79,48,6,69,165,239,237,134,215,233,138,86,22,
+16,178,95,17,209,220,35,102,149,218,193,8,166,173,69,181,
+90,156,143,33,236,60,62,110,161,227,26,128,48,214,162,117,
+85,91,211,143,135,32,68,175,93,3,162,103,55,235,193,216,
+142,180,115,153,144,178,120,188,236,47,206,216,107,221,83,91,
+83,118,215,100,125,171,77,63,50,140,14,93,81,221,86,106,
+217,209,29,89,173,168,137,216,100,1,24,227,146,5,30,141,
+148,174,129,97,239,238,30,80,106,105,177,75,144,31,26,214,
+237,82,203,222,118,7,18,112,37,100,15,139,131,61,181,160,
+221,200,184,149,240,89,167,242,109,39,98,119,255,6,15,61,
+167,109,
\ No newline at end of file
diff --git a/uppsrc/CtrlCore/srcdoc.tpp/all.i b/uppsrc/CtrlCore/srcdoc.tpp/all.i
new file mode 100644
index 000000000..1aee073ff
--- /dev/null
+++ b/uppsrc/CtrlCore/srcdoc.tpp/all.i
@@ -0,0 +1,12 @@
+TOPIC("AboutFrames$en-us")
+#include "AboutFrames$en-us.tpp"
+END_TOPIC
+
+TOPIC("LogPos$en-us")
+#include "LogPos$en-us.tpp"
+END_TOPIC
+
+TOPIC("TimerAndModalTrap$en-us")
+#include "TimerAndModalTrap$en-us.tpp"
+END_TOPIC
+
diff --git a/uppsrc/CtrlLib/AKeys.cpp b/uppsrc/CtrlLib/AKeys.cpp
new file mode 100644
index 000000000..65c63e811
--- /dev/null
+++ b/uppsrc/CtrlLib/AKeys.cpp
@@ -0,0 +1,369 @@
+#include "CtrlLib.h"
+
+NAMESPACE_UPP
+
+struct KeyBinding : Moveable<KeyBinding> {
+	KeyInfo    *key;
+	const char *id;
+	dword       def[4];
+};
+
+static VectorMap<String, Vector<KeyBinding> >& sKeys()
+{
+	static VectorMap<String, Vector<KeyBinding> > k;
+	return k;
+}
+
+void RegisterKeyBinding(const char *group, const char *id, KeyInfo& (*info)())
+{
+	VectorMap<String, Vector<KeyBinding> >& keys = sKeys();
+	KeyBinding& k = keys.GetAdd(group).Add();
+	k.id = id;
+	KeyInfo& f = (*info)();
+	k.key = &f;
+	memcpy(k.def, f.key, sizeof(f.key));
+}
+
+KeyInfo& AK_NULL()
+{
+	static KeyInfo x = { "" };
+	return x;
+}
+
+void SetDefaultKeys() {
+	VectorMap<String, Vector<KeyBinding> >& g = sKeys();
+	for(int i = 0; i < g.GetCount(); i++) {
+		Vector<KeyBinding>& k = g[i];
+		for(int i = 0; i < k.GetCount(); i++) {
+			KeyBinding& b = k[i];
+			KeyInfo& f = *b.key;
+			memcpy(f.key, b.def, sizeof(f.key));
+		}
+	}
+}
+
+struct KeyDisplay : Display {
+	virtual void Paint(Draw& w, const Rect& r, const Value& q,
+		               Color ink, Color paper, dword) const {
+		w.DrawRect(r, paper);
+		String txt = GetKeyDesc(int(q));
+		int tcy = GetTextSize(txt, StdFont()).cy;
+		w.DrawText(r.left + 2, r.top + (r.Height() - tcy) / 2, txt, StdFont(), ink);
+	}
+};
+
+struct KeyCtrl : Ctrl {
+	int key;
+
+	virtual void  SetData(const Value& v) { key = v; Refresh(); }
+	virtual Value GetData() const         { return key; }
+	virtual void  GotFocus()              { Refresh(); }
+	virtual void  LostFocus()             { Refresh(); }
+
+	virtual void  LeftDown(Point p, dword) { SetFocus(); }
+
+	virtual void Paint(Draw& w) {
+		Single<KeyDisplay>().Paint(w, GetSize(), key,
+		                           HasFocus() ? SColorLight : SColorText,
+		                           HasFocus() ? SColorHighlight : SColorPaper, 0);
+	}
+
+	virtual bool Key(dword _key, int) {
+		if(_key == K_ENTER || _key == K_ESCAPE)
+			return false;
+		if((_key & K_KEYUP) || _key < 65536 || _key == K_SHIFT_KEY || _key == K_ALT_KEY || _key == K_CTRL_KEY)
+			return true;
+		if(_key == K_SPACE || _key == K_DELETE || _key == K_BACKSPACE)
+			key = 0;
+		else
+			key = _key;
+		UpdateActionRefresh();
+		return true;
+	}
+
+	KeyCtrl() {
+		SetFrame(EditFieldFrame());
+		key = 0;
+	}
+};
+
+struct KeysDlg : WithKeysLayout<TopWindow> {
+	virtual bool  Key(dword key, int);
+
+	KeyCtrl key[3];
+
+	void EnterGroup();
+	void EnterKey();
+	void SetKey();
+	void Defaults();
+	void CopyKeys();
+
+	void Perform();
+
+	typedef KeysDlg CLASSNAME;
+
+	KeysDlg() {
+		CtrlLayoutOKCancel(*this, t_("Configure keyboard shortcuts"));
+		group.AddColumn(t_("Group"));
+		group.WhenEnterRow = THISBACK(EnterGroup);
+		keys.AddColumn(t_("Action"), 2);
+		keys.AddColumn(t_("Primary")).SetDisplay(Single<KeyDisplay>());
+		keys.AddColumn(t_("Secondary")).SetDisplay(Single<KeyDisplay>());
+		keys.WhenEnterRow = THISBACK(EnterKey);
+		key[0] <<= key[1] <<= THISBACK(SetKey);
+		defaults <<= THISBACK(Defaults);
+	}
+};
+
+bool KeysDlg::Key(dword key, int count)
+{
+	if(key == K_F3) {
+		String qtf;
+		for(int i = 0; i < sKeys().GetCount(); i++) {
+			qtf << "&&&" << DeQtf(sKeys().GetKey(i)) << "&&{{1:1 ";
+			const Vector<KeyBinding>& b = sKeys()[i];
+			for(int i = 0; i < b.GetCount(); i++) {
+				const KeyInfo& a = *b[i].key;
+				const char *text = a.name;
+				if(*text == '\3')
+					text++;
+				if(a.key[0]) {
+					if(i)
+						qtf << ":: ";
+					qtf << DeQtf(GetKeyDesc(a.key[0]));
+					if(a.key[1])
+						qtf << ", " << DeQtf(GetKeyDesc(a.key[1]));
+					qtf << ":: " << DeQtf(text);
+				}
+			}
+			qtf << "}}";
+		}
+		WriteClipboard("QTF", qtf);
+		BeepExclamation();
+		return true;
+	}
+	return TopWindow::Key(key, count);
+}
+
+void KeysDlg::EnterGroup()
+{
+	keys.Clear();
+	String g = group.GetKey();
+	int q = sKeys().Find(g);
+	if(q < 0)
+		return;
+	const Vector<KeyBinding>& b = sKeys()[q];
+	for(int i = 0; i < b.GetCount(); i++) {
+		const KeyInfo& a = *b[i].key;
+		const char *text = a.name;
+		if(*text == '\3')
+			text = t_GetLngString(text + 1);
+		keys.Add(text, (int)a.key[0], (int)a.key[1], (int)a.key[2]);
+	}
+	keys.GoBegin();
+}
+
+void KeysDlg::EnterKey()
+{
+	if(!keys.IsCursor())
+		return;
+	key[0] <<= keys.Get(1);
+	key[1] <<= keys.Get(2);
+}
+
+void KeysDlg::SetKey()
+{
+	if(!keys.IsCursor())
+		return;
+	keys.Set(1, ~key[0]);
+	keys.Set(2, ~key[1]);
+	String g = group.GetKey();
+	int q = sKeys().Find(g);
+	KeyInfo& a = *(sKeys()[q][keys.GetCursor()].key);
+	a.key[0] = (dword)(int)~key[0];
+	a.key[1] = (dword)(int)~key[1];
+}
+
+void KeysDlg::Defaults()
+{
+	if(PromptYesNo("Restore default keys?")) {
+		SetDefaultKeys();
+		EnterGroup();
+	}
+}
+
+void KeysDlg::Perform()
+{
+	String bkup = StoreKeys();
+	for(int i = 0; i < sKeys().GetCount(); i++)
+		group.Add(sKeys().GetKey(i));
+	group.Sort();
+	group.GoBegin();
+	if(Run() != IDOK)
+		RestoreKeys(bkup);
+}
+
+void EditKeys()
+{
+	KeysDlg().Perform();
+}
+
+int CharFilterNoSpace(int c)
+{
+	return c == ' ' ? 0 : c;
+}
+
+String StoreKeys()
+{
+	String out;
+	const VectorMap<String, Vector<KeyBinding> >& g = sKeys();
+	for(int i = 0; i < g.GetCount(); i++) {
+		out << "- " << g.GetKey(i) << ";\r\n";
+		const Vector<KeyBinding>& k = g[i];
+		for(int i = 0; i < k.GetCount(); i++) {
+			const KeyBinding& b = k[i];
+			const KeyInfo& f = *b.key;
+			for(int i = 0; i < 4; i++)
+				if(f.key[i]) {
+					out << Format("%-25s", b.id);
+					bool b = false;
+					for(int i = 0; i < 4; i++)
+						if(f.key[i]) {
+							if(b)
+								out << ", ";
+							out << ' ' << Filter(GetKeyDesc(f.key[i]), CharFilterNoSpace);
+							b = true;
+						}
+					out << ";\r\n";
+					break;
+				}
+		}
+		out << "\r\n";
+	}
+	return out;
+}
+
+dword ParseKeyDesc(CParser& p)
+{
+	dword f = 0;
+	for(;;) {
+		if(p.Id("Ctrl"))
+			f |= K_CTRL;
+		else
+		if(p.Id("Shift"))
+			f |= K_SHIFT;
+		else
+		if(p.Id("Alt"))
+			f |= K_ALT;
+		else
+			break;
+		p.PassChar('+');
+	}
+	if(p.IsNumber()) {
+		uint32 q = p.ReadNumber(16);
+		if(q >= 0 && q <= 9)
+			return f | (K_0 + q);
+		return f | q;
+	}
+	if(p.Char('[')) {
+		int q = p.GetChar();
+		p.PassChar(']');
+		switch(q) {
+		case '`':  return f | K_CTRL_GRAVE;
+		case '-':  return f | K_CTRL_MINUS;
+		case '=':  return f | K_CTRL_EQUAL;
+		case '\\': return f | K_CTRL_BACKSLASH;
+		case ';':  return f | K_CTRL_SEMICOLON;
+		case '\'': return f | K_CTRL_APOSTROPHE;
+		case ',':  return f | K_CTRL_COMMA;
+		case '.':  return f | K_CTRL_PERIOD;
+		case '/':  return f | K_CTRL_SLASH;
+		case '[':  return f | K_CTRL_LBRACKET;
+		case ']':  return f | K_CTRL_RBRACKET;
+		}
+		throw CParser::Error("");
+	}
+	String kid = p.ReadId();
+	if(kid.GetLength() == 1 && *kid >= 'A' && *kid <= 'Z')
+		return f | (K_A + *kid - 'A');
+	if(kid.GetLength() == 2 && kid[0] == 'F' && IsDigit(kid[1]) && kid[1] != '0')
+		return f | (K_F1 + (kid[1] - '1'));
+	static struct {
+		int key;
+		const char *name;
+	} nkey[] = {
+		{ K_TAB, "Tab" }, { K_SPACE, "Space" }, { K_RETURN, "Enter" }, { K_BACKSPACE, "Backspace" },
+		{ K_CAPSLOCK, "Caps Lock" }, { K_ESCAPE, "Esc" },
+		{ K_END, "End" }, { K_HOME, "Home" },
+		{ K_LEFT, "Left" }, { K_UP, "Up" }, { K_RIGHT, "Right" }, { K_DOWN, "Down" },
+		{ K_INSERT, "Insert" }, { K_DELETE, "Delete" },
+		{ K_ALT_KEY, "Alt" }, { K_SHIFT_KEY, "Shift" }, { K_CTRL_KEY, "Ctrl" },
+		{ K_F10, "F10" }, { K_F11, "F11" }, { K_F12, "F12" }, { K_PAGEUP, "PageUp" }, { K_PAGEDOWN, "PageDown" },
+		{ 0, NULL }
+	};
+	static VectorMap<String, int> map;
+	if(map.GetCount() == 0) {
+		for(int i = 0; i < __countof(nkey); i++)
+			map.Add(nkey[i].name, nkey[i].key);
+	}
+	int q = map.Find(kid);
+	if(q >= 0)
+		return f | map[q];
+	if(kid == "Num") {
+		p.PassChar('[');
+		int q = p.GetChar();
+		p.PassChar(']');
+		if(q == '*') return f | K_MULTIPLY;
+		if(q == '+') return f | K_ADD;
+		if(q == '-') return f | K_SUBTRACT;
+		if(q == '/') return f | K_DIVIDE;
+		throw CParser::Error("");
+	}
+	return f | p.ReadNumber(16);
+}
+
+void RestoreKeys(const String& data)
+{
+	SetDefaultKeys();
+	CParser p(data);
+	try {
+		while(!p.IsEof()) {
+			try {
+				p.PassChar('-');
+				String group = p.ReadId();
+				p.PassChar(';');
+				int q = sKeys().Find(group);
+				if(q < 0)
+					return;
+				const Vector<KeyBinding>& b = sKeys()[q];
+				while(!p.IsEof() && p.IsId())
+					try {
+						String id = p.ReadId();
+						int i;
+						for(i = 0; i < b.GetCount(); i++)
+							if(b[i].id == id)
+								break;
+						int q = 0;
+						do {
+							dword key = ParseKeyDesc(p);
+							if(i < b.GetCount() && q < 4)
+								b[i].key->key[q++] = key;
+						}
+						while(p.Char(','));
+						p.PassChar(';');
+					}
+					catch(CParser::Error) {
+						while(!p.IsEof() && !p.Char(';'))
+							p.SkipTerm();
+					}
+			}
+			catch(CParser::Error) {
+				while(!p.IsEof() && !p.Char(';'))
+					p.SkipTerm();
+			}
+		}
+	}
+	catch(CParser::Error) {}
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/CtrlLib/AKeys.h b/uppsrc/CtrlLib/AKeys.h
new file mode 100644
index 000000000..c43578ca3
--- /dev/null
+++ b/uppsrc/CtrlLib/AKeys.h
@@ -0,0 +1,17 @@
+struct KeyInfo {
+	const char *name;
+	dword key[4];
+};
+
+NTL_MOVEABLE(KeyInfo)
+
+void RegisterKeyBinding(const char *group, const char *id, KeyInfo& (*info)());
+
+KeyInfo& AK_NULL();
+
+void   EditKeys();
+
+String StoreKeys();
+void   RestoreKeys(const String& data);
+
+dword ParseKeyDesc(CParser& p);
diff --git a/uppsrc/CtrlLib/AUTHORS b/uppsrc/CtrlLib/AUTHORS
new file mode 100644
index 000000000..beb472938
--- /dev/null
+++ b/uppsrc/CtrlLib/AUTHORS
@@ -0,0 +1,3 @@
+Mirek Fidler <cxl@ntllib.org>
+Tomas Rylek  <rylek@volny.cz>
+Daniel Kos
\ No newline at end of file
diff --git a/uppsrc/CtrlLib/ArrayCtrl.cpp b/uppsrc/CtrlLib/ArrayCtrl.cpp
new file mode 100644
index 000000000..ce09f60e9
--- /dev/null
+++ b/uppsrc/CtrlLib/ArrayCtrl.cpp
@@ -0,0 +1,2651 @@
+#include "CtrlLib.h"
+
+NAMESPACE_UPP
+
+#define LTIMING(x)  // RTIMING(x)
+
+ArrayCtrl::Column::Column() {
+	convert = NULL;
+	edit = NULL;
+	display = &StdDisplay();
+	accel = NULL;
+	margin = -1;
+	cached = false;
+	clickedit = true;
+	index = -1;
+	order = NULL;
+	cmp = NULL;
+}
+
+ArrayCtrl::Column& ArrayCtrl::Column::Cache() {
+	cached = true;
+	return *this;
+}
+
+ArrayCtrl::Column& ArrayCtrl::Column::NoEdit()
+{
+	if(edit)
+		edit->Remove();
+	edit = NULL;
+	return *this;
+}
+
+ArrayCtrl::Column& ArrayCtrl::Column::Edit(Ctrl& e) {
+	e.Hide();
+	e.SetFrame(NullFrame());
+	edit = &e;
+	arrayctrl->AddChild(edit);
+	return *this;
+}
+
+ArrayCtrl::Column& ArrayCtrl::Column::SetConvert(const Convert& c) {
+	convert = &c;
+	ClearCache();
+	arrayctrl->Refresh();
+	arrayctrl->SyncInfo();
+	return *this;
+}
+
+ArrayCtrl::Column& ArrayCtrl::Column::SetFormat(const char *fmt)
+{
+	FormatConvert::SetFormat(fmt);
+	return SetConvert(*this);
+}
+
+ArrayCtrl::Column& ArrayCtrl::Column::SetDisplay(const Display& d)
+{
+	display = &d;
+	ClearCache();
+	arrayctrl->SyncCtrls();
+	arrayctrl->Refresh();
+	arrayctrl->SyncInfo();
+	return *this;
+}
+
+ArrayCtrl::Column& ArrayCtrl::Column::Ctrls(Callback1<One<Ctrl>&> _factory)
+{
+	factory = _factory;
+	arrayctrl->hasctrls = arrayctrl->headerctrls = true;
+	arrayctrl->SyncCtrls();
+	arrayctrl->Refresh();
+	arrayctrl->SyncInfo();
+	return *this;
+}
+
+void ArrayCtrl::Column::ClearCache() {
+	cache.Clear();
+}
+
+void ArrayCtrl::Column::Sorts()
+{
+	HeaderTab().WhenAction = callback1(arrayctrl, &ArrayCtrl::ToggleSortColumn, index);
+}
+
+ArrayCtrl::Column& ArrayCtrl::Column::Sorting(const ValueOrder& o)
+{
+	cmp = NULL;
+	order = &o;
+	Sorts();
+	return *this;
+}
+
+ArrayCtrl::Column& ArrayCtrl::Column::Sorting(int (*c)(const Value& a, const Value& b))
+{
+	order = NULL;
+	cmp = c;
+	Sorts();
+	return *this;
+}
+
+ArrayCtrl::Column& ArrayCtrl::Column::Sorting()
+{
+	return Sorting(StdValueCompare);
+}
+
+ArrayCtrl::Column& ArrayCtrl::Column::SortDefault()
+{
+	if(!cmp || !order)
+		Sorting();
+	arrayctrl->SetSortColumn(index);
+	return *this;
+}
+
+void ArrayCtrl::Column::InvalidateCache(int i) {
+	if(i < 0) return;
+	if(cache.Is< Vector<String> >() && i < cache.Get< Vector<String> >().GetCount())
+		cache.Get< Vector<String> >()[i] = String::GetVoid();
+	if(cache.Is< Vector<Value> >() && i < cache.Get< Vector<Value> >().GetCount())
+		cache.Get< Vector<Value> >()[i] = Value();
+}
+
+void ArrayCtrl::Column::InsertCache(int i, int count) {
+	if(i < 0) return;
+	if(cache.Is< Vector<String> >() && i < cache.Get< Vector<String> >().GetCount()) {
+		Vector<String>& v = cache.Get< Vector<String> >();
+		v.InsertN(i, count);
+		while(count--)
+			v[i++] = String::GetVoid();
+	}
+	if(cache.Is< Vector<Value> >() && i < cache.Get< Vector<Value> >().GetCount())
+		cache.Get< Vector<Value> >().Insert(i);
+}
+
+void ArrayCtrl::Column::RemoveCache(int i) {
+	if(i < 0) return;
+	if(cache.Is< Vector<String> >() && i < cache.Get< Vector<String> >().GetCount())
+		cache.Get< Vector<String> >().Remove(i);
+	if(cache.Is< Vector<Value> >() && i < cache.Get< Vector<Value> >().GetCount())
+		cache.Get< Vector<Value> >().Remove(i);
+}
+
+ArrayCtrl::Column& ArrayCtrl::Column::InsertValue(const Value& v) {
+	arrayctrl->IndexInfo(arrayctrl->Pos(pos[0])).InsertValue(v);
+	return *this;
+}
+
+ArrayCtrl::Column& ArrayCtrl::Column::InsertValue(ValueGen& g) {
+	arrayctrl->IndexInfo(arrayctrl->Pos(pos[0])).InsertValue(g);
+	return *this;
+}
+
+HeaderCtrl::Column& ArrayCtrl::Column::HeaderTab() {
+	return arrayctrl->header.Tab(arrayctrl->header.FindIndex(index));
+}
+
+void ArrayCtrl::InvalidateCache(int ri)
+{
+	for(int i = 0; i < column.GetCount(); i++)
+		column[i].InvalidateCache(ri);
+}
+
+void ArrayCtrl::CellCtrl::LeftDown(Point, dword)
+{
+	if(ctrl->IsWantFocus())
+		ctrl->SetFocus();
+}
+
+void ArrayCtrl::CellInfo::Set(Ctrl *ctrl, bool owned, bool value)
+{
+	CellCtrl *cc = new CellCtrl;
+	cc->ctrl = ctrl;
+	cc->Add(*ctrl);
+	cc->owned = owned;
+	cc->value = value;
+	ptr.Set1(cc);
+}
+
+ArrayCtrl::CellInfo::CellInfo(pick_ CellInfo& s)
+{
+	ptr = s.ptr;
+	const_cast<CellInfo&>(s).ptr.SetPtr(NULL);
+	const_cast<CellInfo&>(s).ptr.SetBit(0);
+}
+
+ArrayCtrl::CellInfo::~CellInfo()
+{
+	if(ptr.GetBit()) {
+		CellCtrl *cc = (CellCtrl *)ptr.GetPtr();
+		if(cc->owned)
+			delete cc->ctrl;
+		delete cc;
+	}
+}
+
+Ctrl& ArrayCtrl::SetCtrl(int i, int j, Ctrl *newctrl, bool owned, bool value)
+{
+	if(value)
+		newctrl->SetData(GetColumn(i, j));
+	hasctrls = true;
+	RefreshRow(i);
+	CellInfo& ci = cellinfo.At(i).At(j);
+	ci.Set(newctrl, owned, value);
+	Ctrl& c = ci.GetCtrl();
+	if(newctrl->GetPos().x.GetAlign() == LEFT && newctrl->GetPos().x.GetB() == 0)
+		newctrl->HSizePos().VCenterPos(STDSIZE);
+	j--;
+	for(;;) {
+		while(j >= 0) {
+			if(IsCtrl(i, j)) {
+				AddChild(&c, &GetCtrl(i, j));
+				SyncInfo();
+				return c;
+			}
+			j--;
+		}
+		i--;
+		if(i < 0) {
+			AddChild(&c, NULL);
+			SyncInfo();
+			return c;
+		}
+		j = cellinfo[i].GetCount();
+	}
+	SyncInfo();
+}
+
+void  ArrayCtrl::SetCtrl(int i, int j, Ctrl& ctrl, bool value)
+{
+	SetCtrl(i, j, &ctrl, false, value);
+	SyncCtrls(i);
+}
+
+bool  ArrayCtrl::IsCtrl(int i, int j) const
+{
+	return i < cellinfo.GetCount() && j < cellinfo[i].GetCount() && cellinfo[i][j].IsCtrl();
+}
+
+ArrayCtrl::CellCtrl& ArrayCtrl::GetCtrl(int i, int j)
+{
+	return cellinfo[i][j].GetCtrl();
+}
+
+const ArrayCtrl::CellCtrl& ArrayCtrl::GetCtrl(int i, int j) const
+{
+	return cellinfo[i][j].GetCtrl();
+}
+
+void ArrayCtrl::SetDisplay(int i, int j, const Display& d)
+{
+	cellinfo.At(i).At(j).Set(d);
+	RefreshRow(i);
+}
+
+const Display& ArrayCtrl::GetDisplay(int i, int j)
+{
+	if(i < cellinfo.GetCount() && j < cellinfo[i].GetCount() && cellinfo[i][j].IsDisplay())
+		return cellinfo[i][j].GetDisplay();
+	return *column[j].display;
+}
+
+const Display& ArrayCtrl::GetDisplay(int j)
+{
+	return *column[j].display;
+}
+
+int ArrayCtrl::Pos(int pos) const {
+	if(pos >= 0) return pos;
+	pos = idx.Find(Id(-pos));
+	ASSERT(pos >= 0);
+	return pos;
+}
+
+Value ArrayCtrl::Get0(int i, int ii) const {
+	ASSERT(ii >= 0);
+	if(hasctrls)
+		for(int j = 0; j < column.GetCount(); j++)
+			if(IsCtrl(i, j)) {
+				const Column& m = column[j];
+				ASSERT(m.pos.GetCount() == 1);
+				if(Pos(m.pos[0]) == ii) {
+					const CellCtrl& c = GetCtrl(i, j);
+					if(c.value)
+						return c.ctrl->GetData();
+				}
+			}
+	if(i < array.GetCount()) {
+		const Vector<Value>& v = array[i].line;
+		if(ii < v.GetCount())
+			return v[ii];
+	}
+	return Null;
+}
+
+Value ArrayCtrl::Get(int ii) const {
+	ASSERT(IsCursor());
+	int i;
+	for(i = 0; i < column.GetCount(); i++) {
+		const Column& m = column[i];
+		if(m.edit)
+			for(int j = 0; j < m.pos.GetCount(); j++)
+				if(Pos(m.pos[j]) == ii) {
+					Value v = m.edit->GetData();
+					return m.pos.GetCount() > 1 && IsValueArray(v) ? ValueArray(v)[j] : v;
+				}
+	}
+	for(i = 0; i < control.GetCount(); i++) {
+		const Control& c = control[i];
+		if(Pos(c.pos) == ii)
+			return c.ctrl->GetData();
+	}
+	return Get0(cursor, ii);
+}
+
+Value ArrayCtrl::Get(Id id) const {
+	return Get(GetPos(id));
+}
+
+Value ArrayCtrl::GetOriginal(int ii) const {
+	return Get0(cursor, ii);
+}
+
+Value ArrayCtrl::GetOriginal(Id id) const {
+	return GetOriginal(GetPos(id));
+}
+
+Value ArrayCtrl::GetKey() const {
+	return IsCursor() ? Get(0) : Null;
+}
+
+Value ArrayCtrl::GetOriginalKey() const {
+	return IsCursor() ? GetOriginal(0) : Null;
+}
+
+bool ArrayCtrl::IsModified(int ii) const {
+	ASSERT(IsCursor());
+	int i;
+	if(ii < modify.GetCount() && modify[ii]) return true;
+	for(i = 0; i < column.GetCount(); i++) {
+		const Column& m = column[i];
+		if(m.edit)
+			for(int j = 0; j < m.pos.GetCount(); j++)
+				if(Pos(m.pos[j]) == ii && m.edit->IsModified())
+					return true;
+	}
+	for(i = 0; i < control.GetCount(); i++) {
+		const Control& c = control[i];
+		if(Pos(c.pos) == ii && c.ctrl->IsModified())
+			return true;
+	}
+	return false;
+}
+
+bool ArrayCtrl::IsModified(Id id) const {
+	return IsModified(GetPos(id));
+}
+
+void ArrayCtrl::ColEditSetData(int j) {
+	ASSERT(IsCursor());
+	Column& m = column[j];
+	if(m.edit)
+		m.edit->SetData(GetColumn(cursor, j));
+}
+
+void ArrayCtrl::CtrlSetData(int j) {
+	ASSERT(IsCursor());
+	Control& c = control[j];
+	c.ctrl->Enable();
+	if(IsNull(c.pos))
+		c.ctrl->SetData(cursor);
+	else
+		c.ctrl->SetData(GetOriginal(Pos(c.pos)));
+}
+
+void ArrayCtrl::SetCtrlValue(int i, int ii, const Value& v)
+{
+	if(hasctrls)
+		for(int j = 0; j < column.GetCount(); j++)
+			if(IsCtrl(i, j)) {
+				const Column& m = column[j];
+				ASSERT(m.pos.GetCount() == 1);
+				if(Pos(m.pos[0]) == ii) {
+					const CellCtrl& c = GetCtrl(i, j);
+					if(c.value)
+						c.ctrl->SetData(v);
+					return;
+				}
+			}
+}
+
+void ArrayCtrl::Set(int ii, const Value& v) {
+	ASSERT(IsCursor());
+	array.At(cursor).line.At(ii) = v;
+	int i;
+	for(i = 0; i < column.GetCount(); i++) {
+		Column& m = column[i];
+		if(m.edit)
+			for(int j = 0; j < m.pos.GetCount(); j++)
+				if(Pos(m.pos[j]) == ii) {
+					ColEditSetData(i);
+					break;
+				}
+	}
+	for(i = 0; i < control.GetCount(); i++) {
+		const Control& c = control[i];
+		if(Pos(c.pos) == ii)
+			CtrlSetData(i);
+	}
+	SetCtrlValue(cursor, ii, v);
+	modify.At(ii, false) = true;
+	InvalidateCache(cursor);
+	RefreshRow(cursor);
+}
+
+void ArrayCtrl::Set(Id id, const Value& v) {
+	Set(GetPos(id), v);
+}
+
+void ArrayCtrl::Set0(int i, int ii, const Value& v) {
+	if(i == cursor)
+		Set(ii, v);
+	else
+		SetCtrlValue(i, ii, v);
+	array.At(i).line.At(ii) = v;
+}
+
+void ArrayCtrl::AfterSet(int i)
+{
+	SetSb();
+	Refresh();
+	SyncInfo();
+	SyncCtrls(i);
+	InvalidateCache(cursor);
+}
+
+void ArrayCtrl::Set(int i, int ii, const Value& v)
+{
+	Set0(i, ii, v);
+	AfterSet(i);
+}
+
+void ArrayCtrl::Set(int i, Id id, const Value& v) {
+	Set(i, GetPos(id), v);
+}
+
+Value ArrayCtrl::Get(int i, int ii) const {
+	return i == cursor ? Get(ii) : Get0(i, ii);
+}
+
+Value ArrayCtrl::Get(int i, Id id) const {
+	return Get(i, GetPos(id));
+}
+
+void  ArrayCtrl::SetCount(int n) {
+	ASSERT(n >= 0);
+	if(cursor >= n)
+		CancelCursor();
+	array.SetCount(n);
+	if(cellinfo.GetCount() > array.GetCount())
+		cellinfo.SetCount(array.GetCount());
+	Refresh();
+	SyncInfo();
+	SyncCtrls();
+	SetSb();
+	PlaceEdits();
+}
+
+Value ArrayCtrl::GetColumn(int row, int col) const {
+	const Column& c = column[col];
+	if(c.pos.GetCount() == 0) return row;
+	if(c.pos.GetCount() == 1) return Get0(row, Pos(c.pos[0]));
+	ValueMap vm;
+	for(int i = 0; i < c.pos.GetCount(); i++) {
+		int ii = Pos(c.pos[i]);
+		vm.Add(ii < idx.GetCount() ? idx.GetKey(ii) : Id(), Get0(row, ii));
+	}
+	return vm;
+}
+
+Value ArrayCtrl::GetConvertedColumn(int i, int col) {
+	LTIMING("GetConvertedColumn");
+	Column& m = column[col];
+	Value v = GetColumn(i, col);
+	if(!m.convert) return v;
+	if(m.cache.Is< Vector<String> >() && i < m.cache.Get< Vector<String> >().GetCount()) {
+		const String& s = m.cache.Get< Vector<String> >()[i];
+		if(!s.IsVoid()) return s;
+	}
+	if(m.cache.Is< Vector<Value> >() && i < m.cache.Get< Vector<Value> >().GetCount()) {
+		const Value& v = m.cache.Get< Vector<Value> >()[i];
+		if(!v.IsVoid()) return v;
+	}
+	Value r = m.convert->Format(v);
+	if(m.cached) {
+		if(m.cache.IsEmpty())
+			m.cache.Create< Vector<String> >();
+		if(IsString(r) && m.cache.Is< Vector<String> >())
+			m.cache.Get< Vector<String> >().At(i, String::GetVoid()) = r;
+		if(!IsString(r) && m.cache.Is< Vector<String> >())
+			m.cache.Create< Vector<Value> >();
+		if(m.cache.Is< Vector<Value> >())
+			m.cache.Get< Vector<Value> >().At(i) = r;
+		ASSERT(m.pos.GetCount() || m.cache.IsEmpty());
+	}
+	return r;
+}
+
+int ArrayCtrl::GetCount() const {
+	return max(virtualcount, array.GetCount());
+}
+
+void ArrayCtrl::SetVirtualCount(int c) {
+	virtualcount = c;
+	Refresh();
+	SyncInfo();
+	SetSb();
+}
+
+void ArrayCtrl::SetSb() {
+	sb.SetTotal(GetTotalCy() + IsInserting() * (GetLineCy() + horzgrid));
+	sb.SetPage(GetSize().cy);
+}
+
+void ArrayCtrl::Layout() {
+	SetSb();
+	HeaderScrollVisibility();
+	PlaceEdits();
+	SyncCtrls();
+}
+
+void ArrayCtrl::Reline(int i, int y)
+{
+	while(i < ln.GetCount()) {
+		Ln& p = ln[i];
+		p.y = y;
+		y += Nvl(p.cy, linecy) + horzgrid;
+		i++;
+	}
+	SetSb();
+}
+
+int  ArrayCtrl::GetLineY(int i) const
+{
+	return i < ln.GetCount() ? ln[i].y
+	                         : (ln.GetCount() ? ln.Top().y + Nvl(ln.Top().cy, linecy) + horzgrid : 0)
+	                           + (linecy + horzgrid) * (i - ln.GetCount());
+}
+
+ArrayCtrl& ArrayCtrl::SetLineCy(int cy)
+{
+	linecy = cy;
+	Reline(0, 0);
+	sb.SetLine(cy);
+	return *this;
+}
+
+void ArrayCtrl::SetLineCy(int i, int cy)
+{
+	int q = ln.GetCount();
+	if(i < q) {
+		ln[i].cy = cy;
+		Reline(i, ln[i].y);
+	}
+	else {
+		while(ln.GetCount() <= i)
+			ln.Add().cy = Null;
+		ln[i].cy = cy;
+		if(q > 0)
+			Reline(q - 1, ln[q - 1].y);
+		else
+			Reline(0, 0);
+	}
+}
+
+int  ArrayCtrl::GetTotalCy() const
+{
+	int i = GetCount();
+	return i ? GetLineY(i - 1) + GetLineCy(i - 1) + horzgrid: 0;
+}
+
+int  ArrayCtrl::GetLineCy(int i) const {
+	return i < ln.GetCount() ? Nvl(ln[i].cy, linecy) : linecy;
+}
+
+int  ArrayCtrl::GetLineAt(int y) const {
+	if(!GetCount()) return Null;
+	if(y < 0 || y >= GetTotalCy()) return Null;
+	int l = 0;
+	int h = GetCount();
+	while(l < h) {
+		int m = (l + h) / 2;
+		int yy = GetLineY(m);
+		if(yy == y) return m;
+		if(yy < y)
+			l = m + 1;
+		else
+			h = m;
+	}
+	return l > 0 ? l - 1 : l;
+}
+
+void  ArrayCtrl::SyncCtrls(int from)
+{
+	LTIMING("SyncCtrls");
+	if(!hasctrls)
+		return;
+	Ptr<Ctrl> restorefocus = GetFocusChildDeep();
+	Size sz = GetSize();
+	Ctrl *p = NULL;
+	for(int i = from; i < array.GetCount(); i++)
+		for(int j = 0; j < column.GetCount(); j++) {
+			bool ct = IsCtrl(i, j);
+			if(!ct && column[j].factory) {
+				One<Ctrl> newctrl;
+				column[j].factory(newctrl);
+				newctrl->SetData(GetColumn(i, j));
+				newctrl->WhenAction << Proxy(WhenCtrlsAction);
+				if(newctrl->GetPos().x.GetAlign() == LEFT && newctrl->GetPos().x.GetB() == 0)
+					newctrl->HSizePos().VCenterPos(STDSIZE);
+				CellInfo& ci = cellinfo.At(i).At(j);
+				ci.Set(newctrl.Detach(), true, true);
+				Ctrl& c = ci.GetCtrl();
+				AddChild(&c, p);
+				ct = true;
+			}
+			if(ct) {
+				Rect r = GetCellRectM(i, j);
+				Ctrl& c = GetCtrl(i, j);
+				p = &c;
+				if(r.bottom < 0 || r.top > sz.cy)
+					c.SetRect(-1000, -1000, 1, 1);
+				else
+					c.SetRect(r);
+			}
+		}
+	if(restorefocus)
+		restorefocus->SetFocus();
+}
+
+Point ArrayCtrl::FindCellCtrl(Ctrl *ctrl)
+{
+	if(hasctrls)
+		for(int i = 0; i < cellinfo.GetCount(); i++) {
+			Vector<CellInfo>& ci = cellinfo[i];
+			for(int j = 0; j < ci.GetCount(); j++)
+				if(IsCtrl(i, j)) {
+					CellCtrl& c = GetCtrl(i, j);
+					if(&c == ctrl || c.ctrl == ctrl)
+						return Point(j, i);
+				}
+		}
+	return Null;
+}
+
+void ArrayCtrl::ChildGotFocus()
+{
+	if(cursor >= 0)
+		RefreshRow(cursor);
+	if(!acceptingrow) {
+		Point p = FindCellCtrl(GetFocusCtrl());
+		if(!IsNull(p))
+			if(nocursor)
+				ScrollInto(p.y);
+			else
+				SetCursor(p.y);
+	}
+	Ctrl::ChildGotFocus();
+}
+
+void ArrayCtrl::ChildLostFocus()
+{
+	if(cursor >= 0)
+		RefreshRow(cursor);
+	Ctrl::ChildLostFocus();
+}
+
+const Display& ArrayCtrl::GetCellInfo(int i, int j, bool f0,
+                                      Value& v, Color& fg, Color& bg, dword& st)
+{
+	st = 0;
+	bool hasfocus = f0 && !isdrag;
+	bool drop = i == dropline && (dropcol == DND_LINE || dropcol == j);
+	if(IsReadOnly())
+		st |= Display::READONLY;
+	if(i < array.GetCount() && array[i].select)
+		st |= Display::SELECT;
+	if(i == cursor && !nocursor)
+		st |= Display::CURSOR;
+	if(drop) {
+		hasfocus = true;
+		st |= Display::CURSOR;
+	}
+	if(hasfocus)
+		st |= Display::FOCUS;
+	bg = i & 1 ? evenpaper : oddpaper;
+	if(nobg)
+		bg = Null;
+	fg = i & 1 ? evenink : oddink;
+	if((st & Display::SELECT) ||
+	    !multiselect && (st & Display::CURSOR) && !nocursor ||
+	    drop) {
+		fg = hasfocus ? SColorHighlightText : SColorText;
+		bg = hasfocus ? SColorHighlight : Blend(SColorDisabled, SColorPaper);
+	}
+	v = IsCtrl(i, j) && GetCtrl(i, j).value ? Null : GetConvertedColumn(i, j);
+	return GetDisplay(i, j);
+}
+
+Size  ArrayCtrl::DoPaint(Draw& w, bool sample) {
+	LTIMING("Paint");
+	bool hasfocus0 = HasFocusDeep() || sample;
+	Size size = sample ? StdSampleSize() : GetSize();
+	Rect r;
+	r.bottom = 0;
+	int i = sample ? 0 : GetLineAt(sb);
+	int xs = sample ? 0 : -header.GetScroll();
+	int js;
+	for(js = 0; js < column.GetCount(); js++) {
+		int cw = header.GetTabWidth(js);
+		if ((xs + cw - vertgrid + (js == column.GetCount() - 1)) >= 0)
+			break;
+		xs += cw;
+	}
+	int sy = 0;
+	if(!IsNull(i))
+		while(i < GetCount()) {
+			if(!sample || i == cursor || i < array.GetCount() && array[i].select) {
+				r.top = sample ? sy : GetLineY(i) - sb;
+				if(r.top > size.cy)
+					break;
+				r.bottom = r.top + GetLineCy(i);
+				int x = xs;
+				dword st = 0;
+				for(int j = js; j < column.GetCount(); j++) {
+					int cw = header.GetTabWidth(j);
+					int jj = header.GetTabIndex(j);
+					int cm = column[jj].margin;
+					if(cm < 0)
+						cm = header.Tab(j).GetMargin();
+					if(x > size.cx) break;
+					r.left = x;
+					r.right = x + cw - vertgrid + (j == column.GetCount() - 1);
+					dword st;
+					Color fg, bg;
+					Value q;
+					const Display& d = GetCellInfo(i, jj, hasfocus0, q, fg, bg, st);
+					if(sample || w.IsPainting(r))
+						if(cw < 2 * cm || editmode && i == cursor && column[jj].edit)
+							d.PaintBackground(w, r, q, fg, bg, st);
+						else {
+							d.PaintBackground(w, RectC(r.left, r.top, cm, r.Height()), q, fg, bg, st);
+							r.left += cm;
+							r.right -= cm;
+							d.PaintBackground(w, RectC(r.right, r.top, cm, r.Height()), q, fg, bg, st);
+							w.Clip(r);
+							GetDisplay(i, jj).Paint(w, r, q, fg, bg, st);
+							w.End();
+						}
+					x += cw;
+					if(vertgrid)
+						w.DrawRect(x - 1, r.top, 1, r.Height(), gridcolor);
+				}
+				if(horzgrid)
+					w.DrawRect(0, r.bottom, size.cx, 1, gridcolor);
+				r.left = 0;
+				r.right = x;
+				if(i == cursor && !nocursor && multiselect && GetSelectCount() != 1 && hasfocus0 && !isdrag)
+					DrawFocus(w, r, st & Display::SELECT ? SColorPaper() : SColorText());
+				r.bottom += horzgrid;
+				r.left = x;
+				r.right = size.cx;
+				if(!nobg)
+					w.DrawRect(r, SColorPaper);
+				if(i == dropline && dropcol == DND_INSERTLINE)
+					DrawHorzDrop(w, 0, r.top - (i > 0), size.cx);
+				sy = r.bottom;
+			}
+			i++;
+		}
+	if(sample) return Size(r.left, sy);
+	int ldy = r.bottom;
+	r.left = 0;
+	r.right = size.cx;
+	r.top = r.bottom;
+	if(IsAppendLine() && !IsCursor()) {
+		r.bottom = r.top + linecy;
+		w.DrawRect(r, HasFocus() ? SColorHighlight : SColorFace);
+		r.top = r.bottom;
+	}
+	r.bottom = size.cy;
+	if(!nobg)
+		w.DrawRect(r, SColorPaper);
+	if(GetCount() == dropline && dropcol == DND_INSERTLINE)
+		DrawHorzDrop(w, 0, ldy - 1, size.cx);
+	scroller.Set(Point(header.GetScroll(), sb));
+	return Size();
+}
+
+void ArrayCtrl::Paint(Draw& w)
+{
+	DoPaint(w, false);
+}
+
+Image ArrayCtrl::GetDragSample()
+{
+	ImageDraw iw(StdSampleSize());
+	Size sz = DoPaint(iw, true);
+	return Crop(iw, 0, 0, sz.cx, sz.cy);
+}
+
+void ArrayCtrl::Scroll() {
+	SyncCtrls();
+	PlaceEdits();
+	scroller.Scroll(*this, GetSize(), Point(header.GetScroll(), sb)); //TODO
+	info.Cancel();
+}
+
+void ArrayCtrl::HeaderLayout() {
+	Refresh();
+	SyncInfo();
+	SyncCtrls();
+	PlaceEdits();
+}
+
+void ArrayCtrl::HeaderScrollVisibility()
+{
+	scrollbox.Height(ScrollBarSize());
+	if(header.IsScroll())
+		sb.SetFrame(scrollbox);
+	else
+		sb.SetFrame(NullFrame());
+}
+
+void ArrayCtrl::RefreshRow(int i)
+{
+	if(i >= 0 && i < GetCount())
+		Refresh(0, GetLineY(i) - sb, GetSize().cx, GetLineCy(i) + horzgrid);
+	if(IsAppendLine() || i == GetCount())
+		Refresh(0, GetLineY(GetCount()) - sb, GetSize().cx, linecy + horzgrid);
+	SyncInfo();
+}
+
+ArrayCtrl::IdInfo& ArrayCtrl::IndexInfo(int i) {
+	return idx[i];
+}
+
+ArrayCtrl::IdInfo& ArrayCtrl::IndexInfo(Id id) {
+	return idx.Get(id);
+}
+
+ArrayCtrl::IdInfo& ArrayCtrl::AddIndex(Id id) {
+	return idx.Add(id);
+}
+
+ArrayCtrl::IdInfo& ArrayCtrl::AddIndex() {
+	return idx.Add(Id());
+}
+
+ArrayCtrl::IdInfo& ArrayCtrl::SetId(int i, Id id) {
+	while(idx.GetCount() < i + 1)
+		idx.Add(Id());
+	idx.SetKey(i, id);
+	return idx[i];
+}
+
+ArrayCtrl::Column& ArrayCtrl::AddColumn(const char *text, int w) {
+	AddIndex();
+	return AddColumnAt(idx.GetCount() - 1, text, w);
+}
+
+ArrayCtrl::Column& ArrayCtrl::AddColumn(Id id, const char *text, int w) {
+	AddIndex(id);
+	return AddColumnAt(idx.GetCount() - 1, text, w);
+}
+
+ArrayCtrl::Column& ArrayCtrl::AddColumnAt(int pos, const char *text, int w) {
+	header.Add(text, w);
+	Column& m = column.Add();
+	m.arrayctrl = this;
+	m.index = column.GetCount() - 1;
+	m.Add(pos);
+	if(allsorting)
+		m.Sorting();
+	return m;
+}
+
+ArrayCtrl::Column& ArrayCtrl::AddColumnAt(Id id, const char *text, int w) {
+	header.Add(text, w);
+	Column& m = column.Add();
+	m.arrayctrl = this;
+	m.index = column.GetCount() - 1;
+	m.Add(id);
+	if(allsorting)
+		m.Sorting();
+	return m;
+}
+
+ArrayCtrl::Column& ArrayCtrl::AddRowNumColumn(const char *text, int w) {
+	header.Add(text, w);
+	Column& m = column.Add();
+	m.arrayctrl = this;
+	m.index = column.GetCount() - 1;
+	if(allsorting)
+		m.Sorting();
+	return m;
+}
+
+int ArrayCtrl::FindColumnWithPos(int pos) const
+{
+	for(int i = 0; i < column.GetCount(); i++) {
+		const Mitor<int>& m = column[i].pos;
+		for(int j = 0; j < m.GetCount(); j++)
+			if(Pos(m[j]) == pos) return i;
+	}
+	return -1;
+}
+
+int ArrayCtrl::FindColumnWithId(Id id) const
+{
+	return FindColumnWithPos(GetPos(id));
+}
+
+ArrayCtrl::IdInfo& ArrayCtrl::AddCtrl(Ctrl& ctrl) {
+	IdInfo& f = AddIndex();
+	AddCtrlAt(idx.GetCount() - 1, ctrl);
+	return f;
+}
+
+ArrayCtrl::IdInfo& ArrayCtrl::AddCtrl(Id id, Ctrl& ctrl) {
+	IdInfo& f = AddIndex(id);
+	AddCtrlAt(idx.GetCount() - 1, ctrl);
+	return f;
+}
+
+void ArrayCtrl::AddCtrlAt(int ii, Ctrl& ctrl) {
+	Control& c = control.Add();
+	c.pos = ii;
+	c.ctrl = &ctrl;
+	ctrl.Disable();
+	ctrl <<= Null;
+}
+
+void ArrayCtrl::AddCtrlAt(Id id, Ctrl& ctrl) {
+	AddCtrlAt(-id.AsNdx(), ctrl);
+}
+
+void ArrayCtrl::AddRowNumCtrl(Ctrl& ctrl) {
+	AddCtrlAt(Null, ctrl);
+}
+
+Rect ArrayCtrl::GetCellRect(int i, int col)
+{
+	Rect r;
+	r.top = GetLineY(i) - sb;
+	r.bottom = r.top + GetLineCy(i);
+	int x = 0;
+	for(i = 0; header.GetTabIndex(i) != col; i++)
+		x += header.GetTabWidth(i);
+	r.left = x - header.GetScroll();
+	r.right = r.left + header.GetTabWidth(i) - vertgrid + (col == column.GetCount() - 1);
+	return r;
+}
+
+Rect ArrayCtrl::GetCellRectM(int i, int col)
+{
+	Rect r = GetCellRect(i, col);
+	int cm = column[col].margin;
+	if(cm < 0)
+		cm = header.Tab(header.FindIndex(col)).GetMargin();
+	r.left += cm;
+	r.right -= cm;
+	return r;
+}
+
+void ArrayCtrl::Remove0(int i) {
+	array.Remove(i);
+	for(int j = 0; j < column.GetCount(); j++)
+		column[j].RemoveCache(i);
+	if(i < ln.GetCount()) {
+		int y = ln[i].y;
+		ln.Remove(i);
+		Reline(i, y);
+	}
+	if(i < cellinfo.GetCount())
+		cellinfo.Remove(i);
+	if(virtualcount > 0) virtualcount--;
+	Refresh();
+	PlaceEdits();
+	SyncCtrls();
+	SyncInfo();
+	SetSb();
+	selectiondirty = true;
+}
+
+void ArrayCtrl::DisableCtrls() {
+	for(int i = 0; i < control.GetCount(); i++) {
+		Ctrl& c = *control[i].ctrl;
+		c <<= Null;
+		c.Disable();
+	}
+}
+
+void ArrayCtrl::RejectRow() {
+	bool rm_cursor = false;
+	if(IsCursor()) {
+		int i;
+		for(i = 0; i < column.GetCount(); i++) {
+			Column& m = column[i];
+			if(m.edit) m.edit->Reject();
+		}
+		for(i = 0; i < control.GetCount(); i++)
+			control[i].ctrl->Reject();
+		if(IsInsert()) {
+			Remove0(cursor);
+			DisableCtrls();
+			cursor = -1;
+			rm_cursor = true;
+		}
+		else
+			RefreshRow(cursor);
+	}
+	EndEdit();
+	WhenArrayAction();
+	if(rm_cursor) {
+		WhenCursor();
+		WhenSel();
+	}
+	SyncInfo();
+}
+
+void ArrayCtrl::Reject() {
+	RejectRow();
+}
+
+void ArrayCtrl::CancelCursor() {
+	RejectRow();
+	DisableCtrls();
+	cursor = anchor = -1;
+	WhenCursor();
+	WhenSel();
+	SyncInfo();
+}
+
+bool ArrayCtrl::UpdateRow() {
+	ASSERT(IsCursor());
+	bool iv = false;
+	int i;
+	for(i = 0; i < column.GetCount(); i++) {
+		Column& m = column[i];
+		if(m.edit && m.edit->IsModified()) {
+			Value v = m.edit->GetData();
+			if(m.pos.GetCount() == 1) {
+				Value& vv = array.At(cursor).line.At(Pos(m.pos[0]));
+				if(vv != v) {
+					iv = true;
+					vv = v;
+				}
+			}
+			else
+			if(m.pos.GetCount() > 1) {
+				ValueArray va = v;
+				for(int j = 0; j < m.pos.GetCount(); j++) {
+					Value& vv = array.At(cursor).line.At(Pos(m.pos[j]));
+					if(vv != va[j]) {
+						iv = true;
+						vv = va[j];
+					}
+				}
+			}
+		}
+	}
+	for(i = 0; i < control.GetCount(); i++) {
+		Control& c = control[i];
+		if(!IsNull(c.pos) && c.ctrl->IsModified()) {
+			Value v = c.ctrl->GetData();
+			Value& vv = array.At(cursor).line.At(Pos(c.pos));
+			if(vv != v) {
+				iv = true;
+				vv = v;
+			}
+		}
+	}
+	if(iv) {
+		InvalidateCache(cursor);
+		WhenArrayAction();
+	}
+	WhenUpdateRow();
+	return true;
+}
+
+void ArrayCtrl::ClearModify() {
+	int i;
+	modify.Set(0, false, idx.GetCount());
+	for(i = 0; i < column.GetCount(); i++)
+		if(column[i].edit)
+			column[i].edit->ClearModify();
+	for(i = 0; i < control.GetCount(); i++)
+		control[i].ctrl->ClearModify();
+}
+
+bool ArrayCtrl::AcceptRow() {
+	ASSERT(IsCursor());
+	int i;
+	for(i = 0; i < column.GetCount(); i++) {
+		Column& m = column[i];
+		if(m.edit && !m.edit->Accept())
+			return false;
+	}
+	for(i = 0; i < control.GetCount(); i++)
+		if(!control[i].ctrl->Accept())
+			return false;
+	acceptingrow++;
+	bool ar = WhenAcceptRow() && UpdateRow();
+	acceptingrow--;
+	if(!ar) {
+		SetCursorEditFocus();
+		return false;
+	}
+	bool b = editmode;
+	EndEdit();
+	SetCtrls();
+	ClearModify();
+	if(b)
+		WhenAcceptEdit();
+	return true;
+}
+
+bool ArrayCtrl::Accept() {
+	return IsCursor() ? AcceptRow() : true;
+}
+
+bool ArrayCtrl::KillCursor0() {
+	if(IsCursor()) {
+		if(!AcceptRow()) return false;
+		int c = cursor;
+		DisableCtrls();
+		WhenKillCursor();
+		cursor = -1;
+		RefreshRow(c);
+	}
+	return true;
+}
+
+bool ArrayCtrl::KillCursor() {
+	bool b = KillCursor0();
+	if(b) {
+		WhenCursor();
+		WhenSel();
+		SyncInfo();
+	}
+	return b;
+}
+
+void ArrayCtrl::SetCtrls() {
+	int i;
+	for(i = 0; i < column.GetCount(); i++)
+		ColEditSetData(i);
+	for(i = 0; i < control.GetCount(); i++)
+		CtrlSetData(i);
+}
+
+void ArrayCtrl::ScrollInto(int line)
+{
+	if(line < 0)
+		sb.Begin();
+	else
+	if(line >= GetCount())
+		sb.End();
+	else
+		sb.ScrollInto(GetLineY(line), GetLineCy(line));
+}
+
+void ArrayCtrl::ScrollIntoCursor()
+{
+	if(IsCursor())
+		ScrollInto(cursor);
+}
+
+void ArrayCtrl::SetCursorEditFocus()
+{
+	if(!IsEdit() && cursor >= 0 && hasctrls)
+		for(int j = 0; j < column.GetCount(); j++)
+			if(IsCtrl(cursor, j) && GetCtrl(cursor, j).ctrl->SetWantFocus())
+				break;
+}
+
+bool ArrayCtrl::SetCursor0(int i, bool dosel) {
+	if(nocursor || GetCount() == 0 || i >= 0 && i < array.GetCount() && !array[i].enabled)
+		return false;
+	i = minmax(i, 0, GetCount() - 1);
+	bool sel = false;
+	if(i != cursor) {
+		RefreshRow(cursor);
+		if(cursor >= 0) {
+			if(!KillCursor0()) return false;
+		}
+		cursor = i;
+		ScrollIntoCursor();
+		RefreshRow(cursor);
+		SetCtrls();
+		for(int j = 0; j < column.GetCount(); j++)
+			if(IsCtrl(cursor, j) && GetCtrl(cursor, j).ctrl->HasFocus())
+				goto nosetfocus;
+		SetCursorEditFocus();
+	nosetfocus:
+		ClearModify();
+		Action();
+		WhenEnterRow();
+		WhenCursor();
+		sel = true;
+	}
+	if(dosel && multiselect) {
+		ClearSelection();
+		anchor = cursor;
+		Select(cursor);
+		sel = true;
+	}
+	if(sel)
+		WhenSel();
+	SyncInfo();
+	return true;
+}
+
+bool ArrayCtrl::SetCursor(int i)
+{
+	return SetCursor0(i);
+}
+
+
+void ArrayCtrl::ShowAppendLine() {
+	sb.ScrollInto(GetTotalCy(), GetLineCy());
+}
+
+void ArrayCtrl::GoBegin() {
+	if(nocursor)
+		sb.Begin();
+	else
+		SetCursor(0);
+}
+
+void ArrayCtrl::GoEnd() {
+	if(nocursor)
+		sb.End();
+	else
+		SetCursor(GetCount() - 1);
+}
+
+int  ArrayCtrl::GetCursorSc() const {
+	return IsCursor() ? GetLineY(cursor) - sb : 0;
+}
+
+void ArrayCtrl::ScCursor(int a) {
+	if(IsCursor())
+		sb = GetLineY(cursor) - max(a, 0);
+}
+
+void ArrayCtrl::SyncSelection() const
+{
+	if(!selectiondirty)
+		return;
+	selectcount = 0;
+	for(int i = 0; i < array.GetCount(); i++)
+		if(array[i].select)
+			selectcount++;
+	selectiondirty = false;
+}
+
+int ArrayCtrl::GetSelectCount() const
+{
+	SyncSelection();
+	return selectcount;
+}
+
+void ArrayCtrl::Select(int i, bool sel)
+{
+	array[i].select = sel;
+	selectiondirty = true;
+	RefreshRow(i);
+	WhenSelection();
+	WhenSel();
+	SyncInfo();
+}
+
+void ArrayCtrl::EnableLine(int i, bool en)
+{
+	array[i].enabled = en;
+}
+
+void ArrayCtrl::Select(int i, int count, bool sel)
+{
+	while(count--) {
+		array[i].select = sel;
+		RefreshRow(i++);
+	}
+	selectiondirty = true;
+	WhenSelection();
+	WhenSel();
+	SyncInfo();
+}
+
+void ArrayCtrl::ClearSelection()
+{
+	if(IsSelection()) {
+		for(int i = 0; i < array.GetCount(); i++)
+			if(array[i].select) {
+				RefreshRow(i);
+				array[i].select = false;
+			}
+		selectiondirty = false;
+		selectcount = 0;
+		WhenSelection();
+		WhenSel();
+		SyncInfo();
+	}
+}
+
+bool ArrayCtrl::IsSel(int i) const
+{
+	return multiselect ? IsSelected(i) : GetCursor() == i;
+}
+
+int  ArrayCtrl::GetScroll() const
+{
+	return sb;
+}
+
+void ArrayCtrl::ScrollTo(int sc)
+{
+	sb = sc;
+}
+
+void ArrayCtrl::CenterCursor() {
+	if(IsCursor())
+		ScCursor((GetSize().cy - GetLineCy(cursor)) / 2);
+}
+
+void ArrayCtrl::Page(int q) {
+	q = q * max(GetSize().cy - (linecy + horzgrid), linecy + horzgrid);
+	int a = GetCursorSc();
+	if(IsCursor()) {
+		SetCursor(cursor + q / (linecy + horzgrid));
+		ScCursor(a);
+	}
+	else
+	if(q > 0)
+		sb.NextPage();
+	else
+		sb.PrevPage();
+}
+
+void ArrayCtrl::DoPoint(Point p, bool dosel) {
+	p.y += sb;
+	if(p.y >= GetTotalCy() && IsAppendLine())
+		KillCursor();
+	clickpos.y = GetLineAt(p.y);
+	if(!IsNull(clickpos.y))
+		SetCursor0(clickpos.y, dosel);
+	else
+	if(IsCursor())
+		AcceptRow();
+	if(!HasFocusDeep())
+		SetWantFocus();
+}
+
+void ArrayCtrl::ClickColumn(Point p)
+{
+	clickpos.x = Null;
+	if(clickpos.y >= 0)
+		for(int i = 0; i < column.GetCount(); i++)
+			if(GetCellRect(clickpos.y, i).Contains(p)) {
+				clickpos.x = i;
+				break;
+			}
+}
+
+void ArrayCtrl::ClickSel(dword flags)
+{
+	if(cursor >= 0 && multiselect) {
+		if(flags & K_CTRL) {
+			Select(cursor, !IsSelected(cursor));
+			anchor = cursor;
+		}
+		else {
+			ClearSelection();
+			if((flags & K_SHIFT) && anchor >= 0)
+				Select(min(anchor, cursor), abs(anchor - cursor) + 1, true);
+			else {
+				anchor = cursor;
+				Select(cursor, true);
+			}
+		}
+		Action();
+	}
+}
+
+void ArrayCtrl::LeftDown(Point p, dword flags)
+{
+	if(IsReadOnly()) return;
+	int q = header.GetSplit(p.x);
+	if(q >= 0) {
+		header.StartSplitDrag(q);
+		return;
+	}
+	q = GetLineAt(p.y + sb);
+	selclick = false;
+	if(q >= 0 && q < GetCount() && IsSel(q) && (flags & (K_CTRL|K_SHIFT)) == 0) {
+		selclick = true;
+		return;
+	}
+	DoClick(p, flags);
+}
+
+void ArrayCtrl::DoClick(Point p, dword flags) {
+	int c = cursor;
+	bool b = HasFocus();
+	DoPoint(p, !(flags & (K_CTRL|K_SHIFT)));
+	ClickColumn(p);
+	if(!IsNull(clickpos.x) && c == cursor && cursor >= 0 && b && column[clickpos.x].clickedit
+	   && (flags & (K_CTRL|K_SHIFT)) == 0)
+		StartEdit(clickpos.x);
+	else
+		ClickSel(flags);
+	WhenLeftClick();
+}
+
+void ArrayCtrl::LeftUp(Point p, dword flags)
+{
+	if(selclick)
+		DoClick(p, flags);
+	selclick = false;
+}
+
+void ArrayCtrl::LeftDouble(Point p, dword flags)
+{
+	if(IsReadOnly()) return;
+	DoPoint(p, !(flags & (K_CTRL|K_SHIFT)));
+	ClickColumn(p);
+	ClickSel(flags);
+	if((IsInserting() || IsAppending()) && IsAppendLine() && !IsCursor())
+		DoAppend();
+	if(!multiselect || (flags & (K_CTRL|K_SHIFT)) == 0)
+		WhenLeftDouble();
+}
+
+void ArrayCtrl::LeftDrag(Point p, dword)
+{
+	int ii = GetLineAt(p.y + sb);
+	if(!IsNull(ii) && IsSel(ii))
+		WhenDrag();
+}
+
+void ArrayCtrl::SyncInfo()
+{
+	if((HasMouse() || info.HasMouse()) && !IsEdit() && popupex) {
+		Point p = GetMouseViewPos();
+		Point c;
+		c.y = GetLineAt(p.y + sb);
+		if(c.y >= 0) {
+			for(c.x = 0; c.x < column.GetCount(); c.x++) {
+				Rect r = GetCellRect(c.y, c.x);
+				if(r.Contains(p)) {
+					if(!IsCtrl(c.y, c.x)) {
+						int cm = column[c.x].margin;
+						if(cm < 0)
+							cm = header.Tab(header.FindIndex(c.x)).GetMargin();
+						dword st;
+						Color fg, bg;
+						Value q;
+						const Display& d = GetCellInfo(c.y, c.x, HasFocusDeep(), q, fg, bg, st);
+						info.Set(this, r, q, &d, fg, bg, st, cm);
+						return;
+					}
+					break;
+				}
+			}
+		}
+	}
+	info.Cancel();
+}
+
+void ArrayCtrl::MouseMove(Point p, dword)
+{
+	if(mousemove && !IsReadOnly()) {
+		int i = GetLineAt(p.y + sb);
+		if(!IsNull(i)) SetCursor(i);
+	}
+	SyncInfo();
+}
+
+Image ArrayCtrl::CursorImage(Point p, dword)
+{
+	return header.GetSplit(p.x) < 0 ? Image::Arrow() : CtrlsImg::HorzPos();
+}
+
+void ArrayCtrl::RightDown(Point p, dword flags) {
+	if((flags & (K_CTRL|K_SHIFT)) == 0) {
+		DoPoint(p, false);
+		ClickColumn(p);
+		if(cursor >= 0 && multiselect) {
+			if(!IsSelected(cursor)) {
+				ClearSelection();
+				Select(anchor = cursor);
+			}
+			Action();
+		}
+	}
+	MenuBar::Execute(WhenBar);
+}
+
+bool ArrayCtrl::TestKey(int i, int key) {
+	for(int j = 0; j < column.GetCount(); j++) {
+		int (*af)(int) = column[j].accel;
+		if(af) {
+			int c = (*af)(key);
+			if(c && (*af)(StdFormat(GetColumn(i, j))[0]) == c) {
+				SetCursor(i);
+				return true;
+			}
+		}
+	}
+	for(int ii = 0; ii < idx.GetCount(); ii++) {
+		int (*af)(int) = idx[ii].accel;
+		if(af) {
+			int c = (*af)(key);
+			if(c && (*af)(StdFormat(Get(i, ii))[0]) == c) {
+				SetCursor(i);
+				return true;
+			}
+		}
+	}
+	return false;
+}
+
+int ArrayCtrl::GetEditColumn() const {
+	if(!IsEdit()) return -1;
+	for(int i = 0; i < column.GetCount(); i++) {
+		const Column& m = column[i];
+		if(m.edit && m.edit->HasFocusDeep())
+			return i;
+	}
+	return -1;
+}
+
+void ArrayCtrl::KeyMultiSelect(int aanchor, dword key)
+{
+	if(!multiselect)
+		return;
+	ClearSelection();
+	if(key & K_SHIFT) {
+		anchor = aanchor;
+		if(anchor >= 0)
+			Select(min(anchor, cursor), abs(anchor - cursor) + 1);
+	}
+	else
+	if(cursor >= 0) {
+		anchor = cursor;
+		Select(anchor);
+	}
+}
+
+bool ArrayCtrl::Key(dword key, int) {
+	if(IsReadOnly()) return false;
+	int aanchor = anchor;
+	if(!editmode) {
+		if(key > 32 && key < 256) {
+			int cr = cursor >= 0 ? cursor + 1 : 0;
+			for(int j = 0; j < column.GetCount(); j++)
+				if(column[j].accel) {
+					int i;
+					for(i = cr; i < array.GetCount(); i++)
+						if(TestKey(i, key)) return true;
+					for(i = 0; i < cr; i++)
+						if(TestKey(i, key)) return true;
+					return true;
+				}
+		}
+		switch(key) {
+		case K_PAGEUP:
+		case K_SHIFT_PAGEUP:
+			Page(-1);
+			KeyMultiSelect(aanchor, key);
+			return true;
+		case K_PAGEDOWN:
+		case K_SHIFT_PAGEDOWN:
+			if((IsInserting() || IsAppending()) && IsAppendLine() && cursor == GetCount() - 1)
+				KillCursor();
+			else {
+				Page(1);
+				KeyMultiSelect(aanchor, key);
+			}
+			return true;
+		case K_HOME:
+		case K_CTRL_HOME:
+		case K_CTRL_PAGEUP:
+		case K_SHIFT_HOME:
+		case K_SHIFT|K_CTRL_HOME:
+		case K_SHIFT|K_CTRL_PAGEUP:
+			GoBegin();
+			KeyMultiSelect(aanchor, key);
+			return true;
+		case K_END:
+		case K_CTRL_END:
+		case K_CTRL_PAGEDOWN:
+		case K_SHIFT|K_END:
+		case K_SHIFT|K_CTRL_END:
+		case K_SHIFT|K_CTRL_PAGEDOWN:
+			GoEnd();
+			KeyMultiSelect(aanchor, key);
+			return true;
+		case K_CTRL_A:
+			if(multiselect) {
+				GoEnd();
+				anchor = 0;
+				KeyMultiSelect(0, K_SHIFT);
+			}
+			return true;
+		}
+	}
+	switch(key) {
+	case K_UP:
+	case K_SHIFT_UP:
+		if(IsCursor()) {
+			int d = GetEditColumn();
+			if(SetCursor0(cursor - 1))
+				if(d >= 0)
+					StartEdit(d);
+				else
+					KeyMultiSelect(aanchor, key);
+		}
+		else
+		if((IsInserting() || IsAppending()) && IsAppendLine())
+			SetCursor(GetCount() - 1);
+		else
+			sb.PrevLine();
+		return true;
+	case K_DOWN:
+	case K_SHIFT_DOWN:
+		if((IsInserting() || IsAppending()) && IsAppendLine() && cursor == GetCount() - 1 && !editmode)
+			KillCursor();
+		else
+		if(IsCursor()) {
+			int d = GetEditColumn();
+			if(SetCursor0(cursor + 1) && d >= 0)
+				StartEdit(d);
+			else
+				KeyMultiSelect(aanchor, key);
+		}
+		else
+			sb.NextLine();
+		return true;
+	case K_ENTER:
+		if(!IsCursor() && (IsInserting() || IsAppending()) && IsAppendLine()) {
+			DoAppend();
+			return true;
+		}
+		if(editmode) {
+			bool ins = IsInsert() && autoappend;
+			if(AcceptEnter() && ins)
+				DoAppend();
+			return true;
+		}
+		if(WhenEnterKey && IsCursor()) {
+			WhenEnterKey();
+			return true;
+		}
+		break;
+	case K_ESCAPE:
+		if(IsEdit()) {
+			int c = cursor;
+			CancelCursor();
+			SetCursor(c);
+			return true;
+		}
+		break;
+	}
+	return MenuBar::Scan(WhenBar, key);
+}
+
+bool ArrayCtrl::AcceptEnter() {
+	if(editmode) {
+		bool ins = IsInsert();
+		if(!Accept())
+			return false;
+		if(GetCursor() == array.GetCount() - 1 &&
+		   (IsInserting() || IsAppending()) && IsAppendLine() && ins && !noinsertappend) {
+		   	KillCursor();
+		   	ShowAppendLine();
+		}
+	}
+	return true;
+}
+
+void  ArrayCtrl::Set(int i, const Vector<Value>& v) {
+	for(int ii = 0; ii < v.GetCount(); ii++)
+		Set(i, ii, v[ii]);
+	InvalidateCache(i);
+	SetSb();
+	RefreshRow(i);
+}
+
+void  ArrayCtrl::Add() {
+	if(GetIndexCount()) {
+		Vector<Value> x;
+		for(int ii = 0; ii < idx.GetCount(); ii++)
+			x.Add(idx[ii].GetInsertValue());
+		Set(array.GetCount(), x);
+	}
+	else {
+		int i = array.GetCount();
+		array.At(i);
+		SetSb();
+		Refresh();
+		InvalidateCache(cursor);
+		InvalidateCache(i);
+		RefreshRow(i);
+	}
+
+}
+
+void  ArrayCtrl::Add(const Vector<Value>& v)
+{
+	Set(array.GetCount(), v);
+}
+
+struct ArrayCtrlSeparatorDisplay : Display {
+	virtual void Paint(Draw& w, const Rect& r, const Value& q, Color ink, Color paper, dword style) const {
+		int y = r.top + r.GetHeight() / 2;
+		w.DrawRect(r, paper);
+		w.DrawRect(r.left, y, r.GetWidth(), 1, SColorShadow());
+		w.DrawRect(r.left, y + 1, r.GetWidth(), 1, SColorLight());
+	}
+};
+
+void ArrayCtrl::AddSeparator()
+{
+	int ii = GetCount();
+	Add();
+	SetLineCy(ii, Draw::GetStdFontCy() / 2);
+	for(int i = 0; i < GetColumnCount(); i++)
+		SetDisplay(ii, i, Single<ArrayCtrlSeparatorDisplay>());
+	DisableLine(ii);
+}
+
+#define E__Addv(I)    Set0(q, I - 1, p##I)
+#define E__AddF(I) \
+void ArrayCtrl::Add(__List##I(E__Value)) { \
+	int q = array.GetCount(); \
+	__List##I(E__Addv); \
+	AfterSet(q); \
+}
+__Expand(E__AddF)
+
+void  ArrayCtrl::Insert(int i, int count) {
+	if(i < array.GetCount()) {
+		array.InsertN(i, count);
+		for(int j = 0; j < column.GetCount(); j++)
+			column[j].InsertCache(i, count);
+	}
+	else
+		array.At(i + count - 1);
+	if(i <= cursor) cursor++;
+	if(i < cellinfo.GetCount())
+		cellinfo.InsertN(i, count);
+	if(i < ln.GetCount()) {
+		int y = ln[i].y;
+		ln.InsertN(i, count);
+		Reline(i, y);
+	}
+	if(virtualcount >= 0) virtualcount += count;
+	while(count--) {
+		for(int ii = 0; ii < idx.GetCount(); ii++) {
+			Value v = idx[ii].GetInsertValue();
+			if(!IsNull(v))
+				Set(i, ii, v);
+		}
+		i++;
+	}
+	Refresh();
+	SetSb();
+	PlaceEdits();
+	SyncCtrls();
+	SyncInfo();
+}
+
+void  ArrayCtrl::Insert(int i)
+{
+	Insert(i, 1);
+}
+
+void ArrayCtrl::Insert(int i, const Vector<Value>& v) {
+	Insert(i);
+	Set(i, v);
+}
+
+void ArrayCtrl::Insert(int i, const Vector< Vector<Value> >& v) {
+	Insert(i, v.GetCount());
+	for(int ii = 0; ii < v.GetCount(); ii++)
+		Set(i++, v[ii]);
+}
+
+void  ArrayCtrl::Remove(int i) {
+	int c = cursor;
+	if(i == cursor) CancelCursor();
+	Remove0(i);
+	if(c >= 0)
+		SetCursor0(c - (i < c), false);
+	anchor = -1;
+	PlaceEdits();
+	SyncCtrls();
+	SetSb();
+	Refresh();
+	SyncInfo();
+}
+
+void ArrayCtrl::PlaceEdits() {
+	for(int i = 0; i < column.GetCount(); i++) {
+		Column& m = column[i];
+		if(m.edit) {
+			m.edit->Show(editmode && header.IsTabVisible(i));
+			if(m.edit->IsVisible())
+				m.edit->SetRect(GetCellRectM(cursor, i));
+		}
+	}
+}
+
+bool ArrayCtrl::IsEditing() const {
+	for(int i = 0; i < column.GetCount(); i++)
+		if(column[i].edit) return true;
+	return false;
+}
+
+bool ArrayCtrl::StartEdit(int d) {
+	if(IsReadOnly()) return false;
+	if(!IsEditing()) return false;
+	editmode = true;
+	PlaceEdits();
+	for(int i = 0; i < column.GetCount(); i++) {
+		Column& m = column[(i + d) % column.GetCount()];
+		if(m.edit && (m.edit->SetWantFocus() || IterateFocusForward(m.edit, m.edit)))
+			break;
+	}
+	NoWantFocus();
+	RefreshRow(cursor);
+	WhenStartEdit();
+	SyncInfo();
+	return true;
+}
+
+void ArrayCtrl::EndEdit() {
+	if(!IsEditing())
+		return;
+	bool f = HasFocusDeep();
+	editmode = false;
+	insertmode = false;
+	PlaceEdits();
+	WantFocus();
+	if(f) SetWantFocus();
+	SyncInfo();
+}
+
+void ArrayCtrl::LostFocus() {
+	if(GetSelectCount() > 1)
+		Refresh();
+	else
+	if(IsCursor())
+		RefreshRow(cursor);
+	SyncInfo();
+}
+
+void ArrayCtrl::GotFocus() {
+	if(GetSelectCount() > 1)
+		Refresh();
+	else
+	if(IsCursor())
+		RefreshRow(cursor);
+	else
+	if(focussetcursor)
+		GoBegin();
+	SetCursorEditFocus();
+	SyncInfo();
+}
+
+void ArrayCtrl::DoEdit() {
+	if(IsReadOnly()) return;
+	if(!editmode)
+		StartEdit();
+}
+
+void ArrayCtrl::DoInsert(int c) {
+	if(IsReadOnly()) return;
+	Insert(c);
+	SetCursor(c);
+	insertmode = true;
+	DoEdit();
+	if(!IsEdit())
+		insertmode = false;
+	WhenArrayAction();
+}
+
+void ArrayCtrl::DoInsertBefore() {
+	DoInsert(IsCursor() ? GetCursor() : array.GetCount());
+}
+
+void ArrayCtrl::DoInsertAfter() {
+	DoInsert(IsCursor() ? GetCursor() + 1 : array.GetCount());
+}
+
+void ArrayCtrl::DoAppend() {
+	DoInsert(array.GetCount());
+}
+
+void ArrayCtrl::DoSelectAll()
+{
+	Select(0, GetCount());
+}
+
+String ArrayCtrl::RowFormat(const char *s)
+{
+	return Sprintf(s, ~row_name);
+}
+
+bool ArrayCtrl::DoRemove()
+{
+	if(IsReadOnly()) return false;
+	if(!IsCursor() || askremove && !PromptOKCancel(RowFormat(t_("Do you really want to delete the selected %s ?"))))
+		return false;
+	if(multiselect) {
+		for(int i = GetCount() - 1; i >= 0; i--)
+			if(IsSelected(i))
+				Remove(i);
+	}
+	else
+		Remove(cursor);
+	WhenArrayAction();
+	return true;
+}
+
+void ArrayCtrl::DoRemovem()
+{
+	DoRemove();
+}
+
+void ArrayCtrl::DoDuplicate() {
+	if(IsReadOnly()) return;
+	if(!IsCursor()) return;
+	int c = cursor;
+	if(!KillCursor()) return;
+	Vector<Value> va = ReadRow(c);
+	c = IsAppending() ? array.GetCount() : c + 1;
+	Insert(c, va);
+	SetCursor(c);
+	DoEdit();
+	WhenArrayAction();
+}
+
+void ArrayCtrl::StdBar(Bar& menu)
+{
+	bool e = IsEditable();
+	bool c = !IsEdit() && e;
+	bool d = c && IsCursor();
+	if(inserting)
+		menu.Add(e, RowFormat(t_("Insert %s")), THISBACK(DoInsertBefore))
+			.Help(RowFormat(t_("Insert a new %s into the table.")))
+			.Key(K_INSERT);
+	if(bains == 1) {
+		menu.Add(e, RowFormat(t_("Insert %s before")), THISBACK(DoInsertBefore))
+		    .Help(RowFormat(t_("Insert a new %s into the table before current")))
+		    .Key(K_INSERT);
+		menu.Add(e, RowFormat(t_("Insert %s after")), THISBACK(DoInsertAfter))
+		    .Help(RowFormat(t_("Insert a new %s into the table after current")))
+		    .Key(K_SHIFT_INSERT);
+	}
+	if(bains == 2) {
+		menu.Add(e, RowFormat(t_("Insert %s after")), THISBACK(DoInsertAfter))
+		    .Help(RowFormat(t_("Insert a new %s into the table after current")))
+		    .Key(K_INSERT);
+		menu.Add(e, RowFormat(t_("Insert %s before")), THISBACK(DoInsertBefore))
+		    .Help(RowFormat(t_("Insert a new %s into the table before current")))
+		    .Key(K_SHIFT_INSERT);
+	}
+	if(IsAppending())
+		menu.Add(c, RowFormat(t_("Append %s")), THISBACK(DoAppend))
+			.Help(RowFormat(t_("Append a new %s at the end of the table.")))
+			.Key(inserting ? (int)K_SHIFT_INSERT : (int)K_INSERT);
+	if(duplicating)
+		menu.Add(d, RowFormat(t_("Duplicate %s")), THISBACK(DoDuplicate))
+			.Help(RowFormat(t_("Duplicate current table %s.")))
+			.Key(K_CTRL_INSERT);
+	if(IsEditing())
+		menu.Add(d, RowFormat(t_("Edit %s")), THISBACK(DoEdit))
+			.Help(RowFormat(t_("Edit active %s.")))
+			.Key(K_CTRL_ENTER);
+	if(removing)
+		menu.Add(d, RowFormat(t_("Delete %s\tDelete")), THISBACK(DoRemovem))
+			.Help(RowFormat(t_("Delete active %s.")))
+			.Key(K_DELETE);
+	if(moving) {
+		menu.Add(GetCursor() > 0, RowFormat(t_("Move %s up")), THISBACK(SwapUp))
+			.Help(RowFormat(t_("Swap %s with previous thus moving it up.")))
+			.Key(K_CTRL_UP);
+		menu.Add(GetCursor() >= 0 && GetCursor() < GetCount() - 1,
+		         RowFormat(t_("Move %s down")), THISBACK(SwapDown))
+			.Help(RowFormat(t_("Swap %s with next thus moving it down.")))
+			.Key(K_CTRL_DOWN);
+	}
+	if(multiselect) {
+		menu.Add(GetCount() > 0, RowFormat(t_("Select all")), THISBACK(DoSelectAll))
+			.Help(t_("Select all table rows"))
+			.Key(K_CTRL_A);
+	}
+}
+
+int ArrayCtrl::Find(const Value& v, int ii, int i) const {
+	ASSERT(ii >= 0);
+	int n = GetCount();
+	while(i < n) {
+		if(Get(i, ii) == v) return i;
+		i++;
+	}
+	return -1;
+}
+
+int  ArrayCtrl::Find(const Value& v, Id id, int i) const {
+	return Find(v, GetPos(id), i);
+}
+
+bool ArrayCtrl::FindSetCursor(const Value& val, int ii, int i) {
+	i = Find(val, ii, i);
+	if(i < 0) return false;
+	if(!SetCursor(i)) return false;
+	CenterCursor();
+	return true;
+}
+
+bool ArrayCtrl::FindSetCursor(const Value& val, Id id, int i) {
+	return FindSetCursor(val, idx.Find(id), i);
+}
+
+void ArrayCtrl::ClearCache() {
+	for(int i = 0; i < column.GetCount(); i++)
+		column[i].ClearCache();
+}
+
+struct ArrayCtrl::SortPredicate {
+	const ArrayCtrl::Order *order;
+	bool operator()(const Line& a, const Line& b) const {
+		return order->operator()(a.line, b.line);
+	}
+};
+
+void ArrayCtrl::SortA()
+{
+	if(hasctrls) {
+		for(int i = 0; i < array.GetCount(); i++)
+			for(int j = 0; j < column.GetCount(); j++)
+				if(IsCtrl(i, j)) {
+					const Column& m = column[j];
+					ASSERT(m.pos.GetCount() == 1);
+					array[i].line[m.pos[0]] = GetCtrl(i, j).ctrl->GetData();
+				}
+	}
+}
+
+void ArrayCtrl::SortB(const Vector<int>& o)
+{
+	Vector<Line> narray;
+	narray.SetCount(array.GetCount());
+	Vector<Ln> nln;
+	Vector< Vector<CellInfo> > ncellinfo;
+	for(int i = 0; i < o.GetCount(); i++) {
+		int oi = o[i];
+		narray[i] = array[oi];
+		if(oi < cellinfo.GetCount())
+			ncellinfo.At(i) = cellinfo[oi];
+		if(oi < ln.GetCount())
+			nln.At(i) = ln[oi];
+	}
+	array = narray;
+	cellinfo = ncellinfo;
+	ln = nln;
+	Reline(0, 0);
+	if(hasctrls) {
+		for(int i = 0; i < array.GetCount(); i++)
+			for(int j = 0; j < column.GetCount(); j++)
+				if(IsCtrl(i, j)) {
+					const Column& m = column[j];
+					ASSERT(m.pos.GetCount() == 1);
+					array[i].line[m.pos[0]] = Null;
+				}
+		SyncCtrls(0);
+		ChildGotFocus();
+	}
+}
+
+void ArrayCtrl::Sort(const ArrayCtrl::Order& order) {
+	CHECK(KillCursor());
+	ClearCache();
+	SortPredicate sp;
+	sp.order = &order;
+	if(ln.GetCount() || cellinfo.GetCount()) {
+		SortA();
+		Vector<int> o = GetStableSortOrder(array, sp);
+		SortB(GetStableSortOrder(array, sp));
+	}
+	else
+		StableSort(array, sp);
+	Refresh();
+	SyncInfo();
+}
+
+void ArrayCtrl::Sort(int from, int count, const ArrayCtrl::Order& order) {
+	CHECK(KillCursor());
+	ClearCache();
+	SortPredicate sp;
+	sp.order = &order;
+	StableSort(array.GetIter(from), array.GetIter(from + count), sp);
+}
+
+void ArrayCtrl::ColumnSort(int column, const ValueOrder& order)
+{
+	CHECK(KillCursor());
+	ClearCache();
+	Vector<Value> hv;
+	for(int i = 0; i < GetCount(); i++)
+		hv.Add(GetConvertedColumn(i, column));
+	SortA();
+	SortB(GetStableSortOrder(hv, order));
+	Refresh();
+	SyncInfo();
+}
+
+void ArrayCtrl::SetSortColumn(int ii, bool desc)
+{
+	sortcolumn = ii;
+	sortcolumndescending = desc;
+	DoColumnSort();
+}
+
+void ArrayCtrl::ToggleSortColumn(int ii)
+{
+	if(sortcolumn == ii)
+		sortcolumndescending = !sortcolumndescending;
+	else {
+		sortcolumn = ii;
+		sortcolumndescending = false;
+	}
+	DoColumnSort();
+}
+
+struct sAC_ColumnSort : public ValueOrder {
+	bool              descending;
+	const ValueOrder *order;
+	int             (*cmp)(const Value& a, const Value& b);
+
+	virtual bool operator()(const Value& a, const Value& b) const {
+		return descending ? cmp ? (*cmp)(b, a) < 0 : (*order)(b, a)
+		                  : cmp ? (*cmp)(a, b) < 0 : (*order)(a, b);
+	}
+};
+
+void ArrayCtrl::DoColumnSort()
+{
+	if(sortcolumn < 0) {
+		sortcolumndescending = false;
+		for(int i = 0; i < column.GetCount(); i++)
+			if(column[i].order || column[i].cmp) {
+				sortcolumn = i;
+				break;
+			}
+	}
+	if(sortcolumn < 0)
+		return;
+	for(int i = 0; i < header.GetCount(); i++)
+		header.Tab(i).SetRightImage(header.GetTabIndex(i) == sortcolumn ?
+		                                 sortcolumndescending ? CtrlImg::SortUp()
+		                                                      : CtrlImg::SortDown()
+		                            : Image());
+	if(sortcolumn >= 0 && sortcolumn < column.GetCount()) {
+		sAC_ColumnSort cs;
+		const Column& c = column[sortcolumn];
+		cs.descending = sortcolumndescending;
+		cs.order = c.order;
+		cs.cmp = c.cmp;
+		ColumnSort(sortcolumn, cs);
+	}
+}
+
+ArrayCtrl& ArrayCtrl::AllSorting()
+{
+	allsorting = true;
+	for(int i = 0; i < column.GetCount(); i++)
+		column[i].Sorting();
+	return *this;
+}
+
+struct ArrayCtrl::RowOrder : public ArrayCtrl::Order {
+	int (*compare)(const Vector<Value>& v1, const Vector<Value>& v2);
+
+	virtual bool operator()(const Vector<Value>& row1, const Vector<Value>& row2) const {
+		return (*compare)(row1, row2) < 0;
+	}
+};
+
+void ArrayCtrl::Sort(int (*compare)(const Vector<Value>& v1, const Vector<Value>& v2)) {
+	RowOrder io;
+	io.compare = compare;
+	Sort(io);
+}
+
+struct ArrayCtrl::ItemOrder : public ArrayCtrl::Order {
+	int ii;
+	int (*compare)(const Value& v1, const Value& v2);
+
+	virtual bool operator()(const Vector<Value>& row1, const Vector<Value>& row2) const {
+		return (*compare)(row1[ii], row2[ii]) < 0;
+	}
+};
+
+void ArrayCtrl::Sort(int ii, int (*compare)(const Value& v1, const Value& v2)) {
+	ItemOrder io;
+	io.ii = ii;
+	io.compare = compare;
+	Sort(io);
+}
+
+void ArrayCtrl::Sort(Id id, int (*compare)(const Value& v1, const Value& v2)) {
+	Sort(idx.Find(id), compare);
+}
+
+void ArrayCtrl::Clear() {
+	EndEdit();
+	if(cursor >= 0) {
+		WhenKillCursor();
+		cursor = -1;
+		WhenCursor();
+		WhenSel();
+		SyncInfo();
+	}
+	array.Clear();
+	cellinfo.Clear();
+	ln.Clear();
+	ClearCache();
+	DisableCtrls();
+	virtualcount = -1;
+	anchor = -1;
+	SetSb();
+	Refresh();
+	SyncInfo();
+}
+
+void ArrayCtrl::Shrink() {
+	array.Shrink();
+	cellinfo.Shrink();
+	ln.Shrink();
+}
+
+void ArrayCtrl::SerializeSettings(Stream& s)
+{
+	int version = 0;
+	s / version;
+	header.Serialize(s);
+	s % sortcolumn % sortcolumndescending;
+	if(s.IsLoading())
+		DoColumnSort();
+}
+
+
+void ArrayCtrl::Reset() {
+	header.Reset();
+	idx.Clear();
+	column.Clear();
+	control.Clear();
+	nocursor = false;
+	vertgrid = horzgrid = true;
+	mousemove = false;
+	inserting = false;
+	popupex = true;
+	appending = false;
+	removing = false;
+	askremove = true;
+	duplicating = false;
+	moving = false;
+	appendline = false;
+	noinsertappend = false;
+	editmode = false;
+	insertmode = false;
+	multiselect = false;
+	selectiondirty = false;
+	hasctrls = false;
+	headerctrls = false;
+	nobg = false;
+	selectcount = 0;
+	bains = 0;
+	row_name = t_("row");
+	gridcolor = SColorShadow;
+	autoappend = false;
+	focussetcursor = true;
+	sortcolumn = -1;
+	allsorting = false;
+	acceptingrow = 0;
+	linecy = Draw::GetStdFontCy();
+	Clear();
+	sb.SetLine(linecy);
+}
+
+void ArrayCtrl::CancelMode()
+{
+	isdrag = false;
+	selclick = false;
+	dropline = dropcol = -1;
+	info.Cancel();
+}
+
+void ArrayCtrl::MouseWheel(Point p, int zdelta, dword keyflags) {
+	sb.Wheel(zdelta);
+}
+
+Vector<Value> ArrayCtrl::ReadRow(int i) const {
+	Vector<Value> v;
+	for(int j = 0; j < idx.GetCount(); j++)
+		v.Add(Get(i, j));
+	return v;
+}
+
+void ArrayCtrl::Move(int dir) {
+	int c = GetCursor();
+	int d = c + dir;
+	if(c < 0 || c >= GetCount() || d < 0 || d >= GetCount()) return;
+	Vector<Value> row(ReadRow(c), 0);
+	Set(c, ReadRow(d));
+	Set(d, row);
+	SetCursor(d);
+	WhenArrayAction();
+}
+
+void ArrayCtrl::SwapUp() {
+	Move(-1);
+}
+
+void ArrayCtrl::SwapDown() {
+	Move(1);
+}
+
+ArrayCtrl& ArrayCtrl::ColumnWidths(const char *s)
+{
+	Vector<String> w = Split(s, ' ');
+	for(int i = 0; i < min(w.GetCount(), header.GetCount()); i++)
+		header.SetTabRatio(header.FindIndex(i), atoi(w[i]));
+	return *this;
+}
+
+ArrayCtrl& ArrayCtrl::OddRowColor(Color paper, Color ink)
+{
+	oddpaper = paper;
+	oddink = ink;
+	Refresh();
+	SyncInfo();
+	return *this;
+}
+
+ArrayCtrl& ArrayCtrl::EvenRowColor(Color paper, Color ink)
+{
+	evenpaper = paper;
+	evenink = ink;
+	Refresh();
+	SyncInfo();
+	return *this;
+}
+
+void ArrayCtrl::RefreshSel()
+{
+	Size sz = GetSize();
+	int i = GetLineAt(sb);
+	if(i >= 0) {
+		int y = GetLineY(i) - sb;
+		while(y < sz.cy && i < array.GetCount()) {
+			if(IsSelected(i))
+				RefreshRow(i);
+			y += GetLineCy(i++);
+		}
+	}
+}
+
+void ArrayCtrl::DnD(int line, int col)
+{
+	if(dropline != line || dropcol != col) {
+		RefreshRow(dropline - 1);
+		RefreshRow(dropline);
+		dropline = line;
+		dropcol = col;
+		RefreshRow(dropline - 1);
+		RefreshRow(dropline);
+	}
+}
+
+bool ArrayCtrl::DnDInsert(int line, int py, PasteClip& d, int q)
+{
+	int y = GetLineY(line);
+	int cy = GetLineCy();
+	if(py < y + cy / q) {
+		WhenDropInsert(line, d);
+		if(d.IsAccepted()) {
+			DnD(line, DND_INSERTLINE);
+			return true;
+		}
+	}
+	if(py >= y + (q - 1) * cy / q && line < GetCount()) {
+		WhenDropInsert(line + 1, d);
+		if(d.IsAccepted()) {
+			DnD(line + 1, DND_INSERTLINE);
+			return true;
+		}
+	}
+	return false;
+}
+
+void ArrayCtrl::DragAndDrop(Point p, PasteClip& d)
+{
+	if(IsReadOnly())
+		return;
+	if(!isdrag) {
+		isdrag = true;
+		RefreshSel();
+	}
+	int py = p.y + sb;
+	int line = GetLineAt(py);
+	int col = -1;
+	if(line >= 0) {
+		for(int i = 0; i < column.GetCount(); i++)
+			if(GetCellRect(line, i).Contains(p)) {
+				col = i;
+				break;
+			}
+		if(col >= 0) {
+			WhenDropCell(line, col, d);
+			if(d.IsAccepted()) {
+				DnD(line, col);
+				return;
+			}
+		}
+		if(DnDInsert(line, py, d, 4)) return;
+		if(line >= 0) {
+			WhenDropLine(line, d);
+			if(d.IsAccepted()) {
+				DnD(line, DND_LINE);
+				return;
+			}
+		}
+		if(DnDInsert(line, py, d, 2)) return;
+	}
+	int ci = GetCount();
+	if(py < GetLineY(ci) + GetLineCy(ci) / 4 || !WhenDrop) {
+		WhenDropInsert(ci, d);
+		if(d.IsAccepted()) {
+			DnD(GetCount(), DND_INSERTLINE);
+			return;
+		}
+	}
+	WhenDrop(d);
+	DnD(-1, -1);
+}
+
+void ArrayCtrl::DragRepeat(Point p)
+{
+	sb = sb + GetDragScroll(this, p, 16).y;
+}
+
+void ArrayCtrl::DragLeave()
+{
+	isdrag = false;
+	RefreshSel();
+	DnD(-1, -1);
+}
+
+void ArrayCtrl::RemoveSelection()
+{
+	for(int i = GetCount() - 1; i >= 0; i--)
+		if(IsSel(i))
+			Remove(i); // Optimize!
+	KillCursor();
+}
+
+void ArrayCtrl::InsertDrop(int line, const Vector< Vector<Value> >& data, PasteClip& d, bool self)
+{
+	if(data.GetCount() == 0)
+		return;
+	if(d.GetAction() == DND_MOVE && self) {
+		for(int i = GetCount() - 1; i >= 0; i--) {
+			if(IsSel(i)) {
+				Remove(i); // Optimize!
+				if(i < line)
+					line--;
+			}
+		}
+		KillCursor();
+		d.SetAction(DND_COPY);
+	}
+	Insert(line, data);
+	ClearSelection();
+	SetCursor(line + data.GetCount() - 1);
+	if(IsMultiSelect())
+		Select(line, data.GetCount());
+}
+
+void ArrayCtrl::InsertDrop(int line, const Vector<Value>& data, PasteClip& d, bool self)
+{
+	Vector< Vector<Value> > x;
+	x.Add() <<= data;
+	InsertDrop(line, x, d, self);
+}
+
+void ArrayCtrl::InsertDrop(int line, const Value& data, PasteClip& d, bool self)
+{
+	Vector<Value> x;
+	x.Add(data);
+	InsertDrop(line, x, d, self);
+}
+
+void ArrayCtrl::InsertDrop(int line, const ArrayCtrl& src, PasteClip& d)
+{
+	Vector< Vector<Value> > data;
+	for(int i = 0; i < src.GetCount(); i++)
+		if(src.IsSel(i))
+			data.Add(src.GetLine(i));
+	InsertDrop(line, data, d, &src == this);
+}
+
+void ArrayCtrl::InsertDrop(int line, PasteClip& d)
+{
+	InsertDrop(line, GetInternal<ArrayCtrl>(d), d);
+}
+
+ArrayCtrl::ArrayCtrl() {
+	cursor = -1;
+	Reset();
+	AddFrame(sb);
+	AddFrame(header);
+	header.WhenLayout = THISBACK(HeaderLayout);
+	header.WhenScroll = sb.WhenScroll = THISBACK(Scroll);
+	header.Moving();
+	WhenAcceptRow = true;
+	WhenBar = THISBACK(StdBar);
+	SetFrame(ViewFrame());
+	oddpaper = evenpaper = SColorPaper;
+	oddink = evenink = SColorText;
+}
+
+ArrayCtrl::~ArrayCtrl() {}
+
+ArrayOption::ArrayOption()
+{
+	array = NULL;
+	f = 0;
+	t = 1;
+	hswitch = vswitch = false;
+	threestate = false;
+	frame = true;
+}
+
+ArrayOption::~ArrayOption()
+{
+}
+
+void ArrayOption::Click()
+{
+	if(!array)
+		return;
+	int c;
+	for(c = index.GetCount(); --c >= 0;)
+		if(array->FindColumnWithPos(index[c]) == array->GetClickColumn())
+			break;
+	int cr = array->GetCursor();
+	if(c >= 0 && cr >= 0) {
+		Value v = array->Get(index[c]);
+		if(!IsNull(v) && v != t && v != f) {
+			BeepExclamation();
+			return;
+		}
+		if(hswitch)
+			for(int i = 0; i < index.GetCount(); i++)
+				if(i != c)
+					array->Set(index[i], f);
+		array->Set(index[c], threestate && v == t
+			? Value() : v != t && !(threestate && IsNull(v)) ? t : f);
+		if(vswitch) {
+			for(int r = 0; r < array->GetCount(); r++)
+				if(r != cr) {
+					if(hswitch)
+						for(int i = 0; i < index.GetCount(); i++)
+							if(i != c)
+								array->Set(r, index[i], f);
+					array->Set(r, index[c], f);
+				}
+		}
+		WhenAction();
+		array->Action();
+		array->WhenArrayAction();
+	}
+}
+
+void ArrayOption::Disconnect()
+{
+	array = NULL;
+	index.Clear();
+}
+
+void ArrayOption::Connect(ArrayCtrl& a, int i)
+{
+	array = &a;
+	if(index.IsEmpty()) {
+		a.WhenLeftClick << THISBACK(Click);
+		a.WhenLeftDouble << THISBACK(Click);
+	}
+	index.Add(i);
+}
+
+ArrayCtrl::Column& ArrayOption::AddColumn(ArrayCtrl& ac, const char *text, int w)
+{
+	return AddColumn(ac, Id(), text, w).NoClickEdit();
+}
+
+ArrayCtrl::Column& ArrayOption::AddColumn(ArrayCtrl& ac, Id id, const char *text, int w)
+{
+	Connect(ac, ac.GetIndexCount());
+	return ac.AddColumn(id, text, w).SetDisplay(*this).InsertValue(f).NoClickEdit();
+}
+
+void ArrayOption::Paint(Draw& w, const Rect& r, const Value& q,
+		                Color ink, Color paper, dword style) const
+{
+	w.DrawRect(r, paper);
+	Size crsz = min(CtrlImg::smallcheck().GetSize() + 4, r.Size());
+	Rect cr = r.CenterRect(crsz);
+	bool focusCursor = (style & (CURSOR | SELECT)) && (style & FOCUS);
+	bool gray = false;
+	if(!array || array->IsEnabled()) {
+		gray = threestate && IsNull(q) || !threestate && !IsNull(q) && q != f && q != t;
+		w.DrawRect(cr, gray ? SColorFace() : paper);
+	}
+	if(frame)
+		DrawFrame(w, cr, focusCursor ? White : Blend(SColorLight, SColorHighlight));
+	Image icon;
+	if(q != f) {
+		Image icon = CtrlImg::smallcheck();
+		Point p = cr.CenterPos(icon.GetSize());
+		if(focusCursor && !gray)
+			w.DrawImage(p.x, p.y, icon, White());
+		else
+			w.DrawImage(p.x, p.y, icon);
+	}
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/CtrlLib/ArrayCtrl.h b/uppsrc/CtrlLib/ArrayCtrl.h
new file mode 100644
index 000000000..32efb5e39
--- /dev/null
+++ b/uppsrc/CtrlLib/ArrayCtrl.h
@@ -0,0 +1,651 @@
+
+template <class T>
+void DefaultCtrlFactoryFn(One<Ctrl>& ctrl)
+{
+	ctrl = new T;
+}
+
+template <class T>
+Callback1<One<Ctrl>&> DefaultCtrlFactory()
+{
+	return callback(DefaultCtrlFactoryFn<T>);
+}
+
+class ArrayCtrl : public Ctrl {
+public:
+	virtual void  CancelMode();
+	virtual bool  Accept();
+	virtual void  Reject();
+	virtual void  Paint(Draw& w);
+	virtual void  Layout();
+	virtual bool  Key(dword key, int);
+	virtual void  LeftDown(Point p, dword);
+	virtual void  LeftDouble(Point p, dword);
+	virtual void  LeftDrag(Point p, dword);
+	virtual void  LeftUp(Point p, dword flags);
+	virtual void  RightDown(Point p, dword);
+	virtual void  MouseMove(Point p, dword);
+	virtual void  MouseWheel(Point p, int zdelta, dword keyflags);
+	virtual Image CursorImage(Point p, dword);
+	virtual void  DragAndDrop(Point p, PasteClip& d);
+	virtual void  DragRepeat(Point p);
+	virtual void  DragLeave();
+	virtual void  GotFocus();
+	virtual void  LostFocus();
+	virtual void  ChildGotFocus();
+	virtual void  ChildLostFocus();
+
+public:
+	struct IdInfo {
+		Value           insertval;
+		ValueGen       *insertgen;
+		int            (*accel)(int);
+
+		IdInfo& InsertValue(const Value& v)  { insertval = v; return *this; }
+		IdInfo& InsertValue(ValueGen& g)     { insertgen = &g; return *this; }
+		IdInfo& Accel(int (*filter)(int))    { accel = filter; return *this; }
+		IdInfo& Accel()                      { return Accel(CharFilterDefaultToUpperAscii); }
+
+		Value   GetInsertValue()             { return insertgen ? insertgen->Get() : insertval; }
+
+		IdInfo()                             { insertgen = NULL; accel = NULL; }
+	};
+
+	class Column : FormatConvert {
+		ArrayCtrl            *arrayctrl;
+		int                   index;
+		Mitor<int>            pos;
+		const Convert        *convert;
+		Ptr<Ctrl>             edit;
+		const Display        *display;
+		Callback1<One<Ctrl>&> factory;
+		int                 (*accel)(int);
+		int                   margin;
+		bool                  cached;
+		bool                  clickedit;
+		Any                   cache;
+		const ValueOrder     *order;
+		int                 (*cmp)(const Value& a, const Value& b);
+
+
+		void   InvalidateCache(int i);
+		void   InsertCache(int i, int n);
+		void   RemoveCache(int i);
+		void   ClearCache();
+		void   Sorts();
+
+		friend class ArrayCtrl;
+
+	public:
+		Column& Add(int _pos)                      { pos.Add(_pos); return *this; }
+		Column& Add(Id id)                         { pos.Add(-id.AsNdx()); return *this; }
+		Column& AddIndex(Id id)                    { arrayctrl->AddIndex(id); return Add(id); }
+		Column& AddIndex()                         { Add(arrayctrl->GetIndexCount()); arrayctrl->AddIndex(); return *this; }
+
+		Column& SetConvert(const Convert& c);
+		Column& SetFormat(const char *fmt);
+		Column& SetDisplay(const Display& d);
+		Column& NoEdit();
+		Column& Edit(Ctrl& e);
+		Column& Ctrls(Callback1<One<Ctrl>&> factory);
+		Column& Ctrls(void (*factory)(One<Ctrl>&)) { return Ctrls(callback(factory)); }
+		template <class T>
+		Column& Ctrls()                            { return Ctrls(DefaultCtrlFactory<T>()); }
+		Column& InsertValue(const Value& v);
+		Column& InsertValue(ValueGen& g);
+		Column& NoClickEdit()                      { clickedit = false; return *this; }
+		Column& Cache();
+		Column& Accel(int (*filter)(int))          { accel = filter; return *this; }
+		Column& Accel()                            { return Accel(CharFilterDefaultToUpperAscii); }
+
+		Column& Sorting(const ValueOrder& o);
+		Column& Sorting(int (*c)(const Value& a, const Value& b));
+		Column& Sorting();
+		Column& SortDefault();
+
+		Column& Margin(int m)                      { margin = m; return *this; }
+
+		HeaderCtrl::Column& HeaderTab();
+
+		Column();
+	};
+
+	struct Order {
+		virtual bool operator()(const Vector<Value>& row1, const Vector<Value>& row2) const = 0;
+		virtual ~Order() {}
+	};
+
+private:
+	struct ItemOrder;
+	struct RowOrder;
+	struct SortPredicate;
+
+	struct Control : Moveable<Control> {
+		int   pos;
+		Ctrl *ctrl;
+	};
+
+	struct CellCtrl : ParentCtrl {
+		virtual void LeftDown(Point, dword);
+
+		bool       owned;
+		bool       value;
+		Ctrl      *ctrl;
+	};
+
+	struct CellInfo : Moveable<CellInfo> {
+		BitAndPtr ptr;
+
+		void           Set(Ctrl *ctrl, bool owned, bool value);
+		bool           IsCtrl() const             { return ptr.GetBit(); }
+		CellCtrl&      GetCtrl() const            { ASSERT(IsCtrl()); return *(CellCtrl *)ptr.GetPtr(); }
+
+		void           Set(const Display& d)      { ptr.Set0((void *)&d); }
+		bool           IsDisplay() const          { return !ptr.GetBit() && ptr.GetPtr(); }
+		const Display& GetDisplay() const         { ASSERT(IsDisplay()); return *(const Display *)ptr.GetPtr(); }
+
+		CellInfo(pick_ CellInfo& s);
+		CellInfo() {}
+		~CellInfo();
+	};
+
+	friend class Column;
+	friend struct SortPredicate;
+
+	struct Ln : Moveable<Ln> {
+		int y;
+		int cy;
+		Ln()               { cy = Null; }
+	};
+
+	struct Line : Moveable<Line> {
+		bool          select:1;
+		bool          enabled:1;
+		Vector<Value> line;
+
+		Line() { select = false; enabled = true; }
+	};
+
+	Vector<Line>               array;
+	HeaderCtrl                 header;
+	ScrollBar                  sb;
+	Scroller                   scroller;
+	Array<Column>              column;
+	Vector<Control>            control;
+	ArrayMap<Id, IdInfo>       idx;
+	Vector<Ln>                 ln;
+	Vector< Vector<CellInfo> > cellinfo;
+	Vector<bool>               modify;
+	FrameBottom<StaticRect>    scrollbox;
+	DisplayPopup               info;
+
+	int   keypos;
+	int   cursor;
+	int   anchor;
+	int   linecy;
+	int   virtualcount;
+	Point clickpos;
+	int   dropline, dropcol;
+	int   sortcolumn;
+	bool  sortcolumndescending;
+	int   acceptingrow;
+
+	mutable int   selectcount;
+
+	String row_name;
+	Color  gridcolor;
+	Color  evenpaper, evenink, oddpaper, oddink;
+
+	bool  horzgrid:1;
+	bool  vertgrid:1;
+	bool  nocursor:1;
+	bool  mousemove:1;
+	bool  editmode:1;
+	bool  insertmode:1;
+
+	bool  inserting:1;
+	bool  appending:1;
+	bool  appendline:1;
+	bool  noinsertappend:1;
+	bool  autoappend:1;
+	bool  removing:1;
+	bool  moving:1;
+	bool  askremove:1;
+	bool  duplicating:1;
+	bool  multiselect:1;
+	bool  hasctrls:1;
+	bool  headerctrls:1;
+	bool  popupex:1;
+	bool  nobg:1;
+	bool  focussetcursor:1;
+	bool  allsorting:1;
+
+	mutable bool  selectiondirty:1;
+
+	unsigned  bains:2;
+
+	bool  isdrag:1;
+	bool  selclick:1;
+
+	int    Pos(int np) const;
+
+	void   InsertCache(int i);
+	void   RemoveCache(int i);
+
+	void   RefreshRow(int i);
+
+	void   SetSb();
+	void   HeaderLayout();
+	void   Scroll();
+	void   Page(int q);
+
+	void   DoPoint(Point p, bool dosel = true);
+	void   DoClick(Point p, dword flags);
+	void   ClickColumn(Point p);
+	void   ClickSel(dword flags);
+	Rect   GetCellRect(int i, int col);
+	Rect   GetCellRectM(int i, int col);
+
+	Point           FindCellCtrl(Ctrl *c);
+	void            SyncCtrls(int from = 0);
+	bool            IsCtrl(int i, int j) const;
+	const CellCtrl& GetCtrl(int i, int j) const;
+	CellCtrl&       GetCtrl(int i, int j);
+	void            SetCtrlValue(int i, int ii, const Value& v);
+
+	void   PlaceEdits();
+	void   EndEdit();
+	void   ColEditSetData(int col);
+	void   CtrlSetData(int col);
+	Value  Get0(int i, int ii) const;
+	void   Set0(int i, int ii, const Value& v);
+	void   AfterSet(int i);
+
+	void   Reline(int i, int y);
+	bool   AcceptRow();
+	void   Remove0(int i);
+	void   DisableCtrls();
+	void   SetCtrls();
+	void   DoRemovem();
+	bool   KillCursor0();
+
+	const Display& GetCellInfo(int i, int j, bool f0, Value& v, Color& fg, Color& bg, dword& st);
+	Ctrl&  SetCtrl(int i, int j, Ctrl *newctrl, bool owned, bool value);
+	Size   DoPaint(Draw& w, bool sample);
+
+	bool   TestKey(int i, int key);
+
+	void   Move(int d);
+
+	bool   SetCursor0(int i, bool dosel = true);
+
+	void   SyncSelection() const;
+	void   KeyMultiSelect(int aanchor, dword key);
+
+	void   HeaderScrollVisibility();
+
+	void   RefreshSel();
+	bool   DnDInsert(int line, int py, PasteClip& d, int q);
+	void   DnD(int line, int col);
+	enum { DND_INSERTLINE = -1, DND_LINE = -2 };
+
+	void   SyncInfo();
+	void   SortA();
+	void   SortB(const Vector<int>& o);
+
+public: // temporary (TRC 06/07/28) // will be removed!
+	Ctrl&  SetCtrl(int i, int j, Ctrl *newctrl) { return SetCtrl(i, j, newctrl, true, true); }
+
+protected:
+	virtual bool UpdateRow();
+	virtual void RejectRow();
+
+	void   ClearModify();
+
+public:
+	Callback          WhenLeftDouble;
+	Callback          WhenEnterKey;
+	Callback          WhenLeftClick;
+	Callback1<Bar&>   WhenBar;
+	Gate              WhenAcceptRow;
+	Callback          WhenUpdateRow;
+	Callback          WhenArrayAction;
+	Callback          WhenStartEdit;
+	Callback          WhenAcceptEdit;
+	Callback          WhenCtrlsAction;
+	Callback          WhenSel;
+
+	Callback                        WhenDrag;
+	Callback3<int, int, PasteClip&> WhenDropCell;
+	Callback2<int, PasteClip&>      WhenDropInsert;
+	Callback2<int, PasteClip&>      WhenDropLine;
+	Callback1<PasteClip&>           WhenDrop;
+
+	//Deprecated - use WhenSel
+	Callback          WhenEnterRow;
+	Callback          WhenKillCursor;
+	Callback          WhenCursor;
+	Callback          WhenSelection;
+
+	IdInfo&    IndexInfo(int ii);
+	IdInfo&    IndexInfo(Id id);
+	IdInfo&    AddIndex(Id id);
+	IdInfo&    AddIndex();
+	int        GetIndexCount() const        { return idx.GetCount(); }
+	Id         GetId(int ii) const          { return idx.GetKey(ii); }
+	int        GetPos(Id id) const          { return idx.Find(id); }
+	IdInfo&    SetId(int ii, Id id);
+	IdInfo&    AddKey(Id id)                { ASSERT(idx.GetCount() == 0); return AddIndex(id); }
+	IdInfo&    AddKey()                     { ASSERT(idx.GetCount() == 0); return AddIndex(); }
+	Id         GetKeyId() const             { return idx.GetKey(0); }
+
+	Column&    AddColumn(const char *text = NULL, int w = 0);
+	Column&    AddColumn(Id id, const char *text, int w = 0);
+	Column&    AddColumnAt(int ii, const char *text, int w = 0);
+	Column&    AddColumnAt(Id id, const char *text, int w = 0);
+	Column&    AddRowNumColumn(const char *text, int w = 0);
+
+	int                       GetColumnCount() const   { return column.GetCount(); }
+	int                       FindColumnWithPos(int pos) const;
+	int                       FindColumnWithId(Id id) const;
+	Column&                   ColumnAt(int i)          { return column[i]; }
+	Column&                   ColumnAt(Id id)          { return column[FindColumnWithId(id)]; }
+	HeaderCtrl::Column&       HeaderTab(int i)         { return header.Tab(i); }
+	HeaderCtrl::Column&       HeaderTab(Id id)         { return header.Tab(FindColumnWithId(id)); }
+	const Column&             ColumnAt(int i) const    { return column[i]; }
+	const Column&             ColumnAt(Id id) const    { return column[FindColumnWithId(id)]; }
+	const HeaderCtrl::Column& HeaderTab(int i) const   { return header.Tab(i); }
+	const HeaderCtrl::Column& HeaderTab(Id id) const   { return header.Tab(FindColumnWithId(id)); }
+
+	const HeaderCtrl&         HeaderObject() const     { return header; }
+	HeaderCtrl&               HeaderObject()           { return header; }
+
+	void       SerializeHeader(Stream& s)    { header.Serialize(s); } // deprecated
+	void       SerializeSettings(Stream& s);
+
+	IdInfo&    AddCtrl(Ctrl& ctrl);
+	IdInfo&    AddCtrl(Id id, Ctrl& ctrl);
+	void       AddCtrlAt(int ii, Ctrl& ctrl);
+	void       AddCtrlAt(Id id, Ctrl& ctrl);
+	void       AddRowNumCtrl(Ctrl& ctrl);
+
+	void       SetCount(int c);
+	void       SetVirtualCount(int c);
+	int        GetCount() const;
+	void       Clear();
+	void       Shrink();
+	Value      Get(int i, int ii) const;
+	Value      Get(int i, Id id) const;
+	void       Set(int i, int ii, const Value& v);
+	void       Set(int i, Id id, const Value& v);
+
+	Value      Get(int ii) const;
+	Value      Get(Id id) const;
+	Value      GetOriginal(int ii) const;
+	Value      GetOriginal(Id id) const;
+	bool       IsModified(int ii) const;
+	bool       IsModified(Id id) const;
+	Value      GetKey() const;
+	Value      GetOriginalKey() const;
+	void       Set(int ii, const Value& v);
+	void       Set(Id id, const Value& v);
+
+	Value      GetColumn(int row, int col) const;
+	Value      GetConvertedColumn(int row, int col);
+
+	int        GetSelectCount() const;
+	bool       IsSelection() const                              { return GetSelectCount(); }
+	void       Select(int i, bool sel = true);
+	void       Select(int i, int count, bool sel = true);
+	bool       IsSelected(int i) const                          { return array[i].select; }
+	void       ClearSelection();
+	bool       IsSel(int i) const;
+
+	void       EnableLine(int i, bool e);
+	void       DisableLine(int i)                               { EnableLine(i, false); }
+	bool       IsLineDisabled(int i) const                      { return array[i].enabled; }
+
+	Vector<Value> ReadRow(int i) const; // deprecated name
+	Vector<Value> GetLine(int i) const                          { return ReadRow(i); }
+
+	void       Set(int i, const Vector<Value>& v);
+
+	void       Add();
+	void       Add(const Vector<Value>& v);
+
+//$-void Add(const Value& [, const Value& ]...);
+#define  E__Add(I)      void Add(__List##I(E__Value));
+	__Expand(E__Add)
+#undef   E__Add
+//$+
+
+	void       AddSeparator();
+
+	void       Insert(int i);
+	void       Insert(int i, int count);
+	void       Insert(int i, const Vector<Value>& v);
+	void       Insert(int i, const Vector< Vector<Value> >& v);
+
+	void       Remove(int i);
+
+	void       RemoveSelection();
+
+	Image      GetDragSample();
+
+	void       InsertDrop(int line, const Vector< Vector<Value> >& data, PasteClip& d, bool self);
+	void       InsertDrop(int line, const Vector<Value>& data, PasteClip& d, bool self);
+	void       InsertDrop(int line, const Value& data, PasteClip& d, bool self);
+	void       InsertDrop(int line, const ArrayCtrl& src, PasteClip& d);
+	void       InsertDrop(int line, PasteClip& d);
+
+	bool       IsCursor() const                        { return cursor >= 0; }
+	bool       SetCursor(int i);
+	bool       KillCursor();
+	void       CancelCursor();
+	int        GetCursor() const                       { return cursor; }
+	void       GoBegin();
+	void       GoEnd();
+	int        GetCursorSc() const;
+	void       ScCursor(int a);
+	void       CenterCursor();
+	void       ScrollInto(int line);
+	void       ScrollIntoCursor();
+	void       SetCursorEditFocus();
+	int        GetScroll() const;
+	void       ScrollTo(int sc);
+	void       ShowAppendLine();
+
+	void       SwapUp();
+	void       SwapDown();
+
+	int        Find(const Value& v, int ii = 0, int from = 0) const;
+	int        Find(const Value& v, Id id, int from = 0) const;
+
+	bool       FindSetCursor(const Value& val, int ii = 0, int from = 0);
+	bool       FindSetCursor(const Value& val, Id id, int from = 0);
+
+	void       Sort(const ArrayCtrl::Order& order);
+	void       Sort(int from, int count, const ArrayCtrl::Order& order);
+	void       Sort(int (*compare)(const Vector<Value>& v1, const Vector<Value>& v2));
+	void       Sort(int ii, int (*compare)(const Value& v1, const Value& v2)
+	                = StdValueCompare);
+	void       Sort(Id id, int (*compare)(const Value& v1, const Value& v2)
+	                = StdValueCompare);
+	void       Sort()                                  { Sort(0); }
+
+	void       ColumnSort(int column, const ValueOrder& order);
+
+	void       SetSortColumn(int ii, bool descending = false);
+	void       ToggleSortColumn(int ii);
+	void       DoColumnSort();
+	int        GetSortColumn() const                   { return sortcolumn; }
+	bool       IsSortDescending() const                { return sortcolumndescending; }
+
+	bool       IsInsert() const                        { return insertmode; }
+
+	void            SetDisplay(int i, int col, const Display& d);
+	const Display&  GetDisplay(int row, int col);
+	const Display&  GetDisplay(int col);
+
+	void       SetCtrl(int i, int col, Ctrl& ctrl, bool value = true);
+
+	ArrayCtrl& SetLineCy(int cy);
+	void       SetLineCy(int i, int cy);
+	int        GetLineCy() const                       { return linecy; }
+	int        GetLineY(int i) const;
+	int        GetLineCy(int i) const;
+	int        GetTotalCy() const;
+	int        GetLineAt(int y) const;
+
+	Point      GetClickPos() const                     { return clickpos; }
+	int        GetClickColumn() const                  { return clickpos.x; }
+	int        GetClickRow() const                     { return clickpos.y; }
+
+	bool       StartEdit(int d = 0);
+	int        GetEditColumn() const;
+	bool       IsEdit() const                          { return editmode; }
+
+	void       DoEdit();
+	void       DoInsert(int cursor);
+	void       DoInsertBefore();
+	void       DoInsertAfter();
+	void       DoAppend();
+	bool       DoRemove();
+	void       DoDuplicate();
+	void       DoSelectAll();
+	void       StdBar(Bar& menu);
+
+	bool       IsEditing() const;
+	bool       AcceptEnter();
+
+	void       ClearCache();
+	void       InvalidateCache(int i);
+
+	void       ScrollUp()                              { sb.PrevLine(); }
+	void       ScrollDown()                            { sb.NextLine(); }
+	void       ScrollPageUp()                          { sb.PrevPage(); }
+	void       ScrollPageDown()                        { sb.NextPage(); }
+	void       ScrollEnd()                             { sb.End(); }
+	void       ScrollBegin()                           { sb.Begin(); }
+
+	String     RowFormat(const char *s);
+
+	ArrayCtrl& RowName(const char *s)                  { row_name = s; return *this; }
+	ArrayCtrl& AppendLine(bool b = true)               { appendline = b; return *this; }
+	ArrayCtrl& NoAppendLine()                          { return AppendLine(false); }
+	bool       IsAppendLine() const                    { return appendline; }
+	ArrayCtrl& Inserting(bool b = true)                { inserting = b; return AppendLine(b); }
+	ArrayCtrl& NoInserting()                           { return Inserting(false); }
+	bool       IsInserting() const                     { return inserting; }
+	ArrayCtrl& Removing(bool b = true)                 { removing = b; return *this; }
+	ArrayCtrl& NoRemoving()                            { return Removing(false); }
+	bool       IsRemoving() const                      { return removing; }
+	ArrayCtrl& Appending(bool b = true)                { appending = b; return *this; }
+	bool       IsAppending() const                     { return appending || autoappend; }
+	ArrayCtrl& AutoAppending(bool b = true)            { autoappend = b; return *this; }
+	bool       IsAutoAppending() const                 { return autoappend; }
+	ArrayCtrl& BeforeAfterInserting(int q = 1)         { bains = 1; return *this; }
+	ArrayCtrl& AfterBeforeInserting(int q = 2)         { bains = 2; return *this; }
+	ArrayCtrl& Duplicating(bool b = true)              { duplicating = b; return *this; }
+	ArrayCtrl& NoInsertAppend(bool b = true)           { noinsertappend = b; return *this; }
+	bool       IsDuplicating() const                   { return duplicating; }
+	ArrayCtrl& Moving(bool b = true)                   { moving = b; return *this; }
+	bool       IsMoving() const                        { return moving; }
+	ArrayCtrl& NoDuplicating()                         { return Duplicating(false); }
+	ArrayCtrl& AskRemove(bool b = true)                { askremove = b; return *this; }
+	ArrayCtrl& NoAskRemove()                           { return AskRemove(false); }
+	bool       IsAskRemove() const                     { return askremove; }
+
+	ArrayCtrl& Header(bool b = true)                   { header.Invisible(!b); return *this; }
+	ArrayCtrl& NoHeader()                              { return Header(false); }
+	ArrayCtrl& Track(bool b = true)                    { header.Track(b); return *this; }
+	ArrayCtrl& NoTrack()                               { return Track(false); }
+	ArrayCtrl& VertGrid(bool b = true)                 { vertgrid = b; Refresh(); return *this; }
+	ArrayCtrl& NoVertGrid()                            { return VertGrid(false); }
+	ArrayCtrl& HorzGrid(bool b = true)                 { horzgrid = b; Refresh(); return *this; }
+	ArrayCtrl& NoHorzGrid()                            { return HorzGrid(false); }
+	ArrayCtrl& Grid(bool b = true)                     { return VertGrid(b).HorzGrid(b); }
+	ArrayCtrl& NoGrid()                                { return Grid(false); }
+	ArrayCtrl& GridColor(Color c)                      { gridcolor = c; return *this; }
+	ArrayCtrl& EvenRowColor(Color paper = Blend(SColorMark, SColorPaper, 220), Color ink = SColorText);
+	ArrayCtrl& OddRowColor(Color paper = SColorInfo, Color ink = SColorText);
+	ArrayCtrl& NoCursor(bool b = true)                 { nocursor = b; return *this; }
+	ArrayCtrl& MouseMoveCursor(bool b = true)          { mousemove = b; return *this; }
+	ArrayCtrl& NoMouseMoveCursor()                     { return MouseMoveCursor(false); }
+	ArrayCtrl& AutoHideSb(bool b = true)               { sb.AutoHide(b); return *this; }
+	ArrayCtrl& NoAutoHideSb()                          { return AutoHideSb(false); }
+	ArrayCtrl& HideSb(bool b = true)                   { sb.Show(!b); return *this; }
+	ArrayCtrl& MultiSelect(bool b = true)              { multiselect = b; return *this; }
+	bool       IsMultiSelect(bool b = true)            { return multiselect = b; }
+	ArrayCtrl& NoBackground(bool b = true)             { nobg = b; Transparent(); Refresh(); return *this; }
+	ArrayCtrl& PopUpEx(bool b = true)                  { popupex = b; return *this; }
+	ArrayCtrl& NoPopUpEx()                             { return PopUpEx(false); }
+	ArrayCtrl& NoFocusSetCursor()                      { focussetcursor = false; return *this; }
+	ArrayCtrl& MovingHeader(bool b)                    { header.Moving(b); return *this; }
+	ArrayCtrl& NoMovingHeader()                        { return MovingHeader(false); }
+	ArrayCtrl& AllSorting();
+
+	ArrayCtrl& ColumnWidths(const char *s);
+
+	ArrayCtrl& SetScrollBarStyle(const ScrollBar::Style& s)   { sb.SetStyle(s); header.SetScrollBarStyle(s); return *this; }
+	ArrayCtrl& SetHeaderCtrlStyle(const HeaderCtrl::Style& s) { header.SetStyle(s); return *this; }
+
+
+	void Reset();
+
+	typedef ArrayCtrl CLASSNAME;
+
+	ArrayCtrl();
+	virtual ~ArrayCtrl();
+};
+
+class ArrayOption : public Display, public Pte<ArrayOption> {
+public:
+	typedef ArrayOption CLASSNAME;
+	ArrayOption();
+	virtual ~ArrayOption();
+
+	virtual void       Paint(Draw& w, const Rect& r, const Value& q, Color ink, Color paper, dword style) const;
+
+	void               Connect(ArrayCtrl& ac, int ii = 0);
+	void               Connect(ArrayCtrl& ac, Id id)               { Connect(ac, ac.GetPos(id)); }
+
+	void               Disconnect();
+
+	ArrayCtrl::Column& AddColumn(ArrayCtrl& ac, const char *text = NULL, int w = 0);
+	ArrayCtrl::Column& AddColumn(ArrayCtrl& ac, Id id, const char *text, int w = 0);
+
+	ArrayOption&       TrueFalse(Value _t, Value _f)               { t = _t; f = _f; return *this; }
+	Value              GetFalse() const                            { return f; }
+	Value              GetTrue() const                             { return t; }
+	ArrayOption&       ThreeState(bool b = true)                   { threestate = b; return *this; }
+	ArrayOption&       NoThreeState()                              { return ThreeState(false); }
+	bool               IsThreeState() const                        { return threestate; }
+
+	ArrayOption&       HSwitch(bool hs = true)                     { hswitch = hs; return *this; }
+	ArrayOption&       NoHSwitch()                                 { return HSwitch(false); }
+	bool               IsHSwitch() const                           { return hswitch; }
+
+	ArrayOption&       VSwitch(bool vs = true)                     { vswitch = vs; return *this; }
+	ArrayOption&       NoVSwitch()                                 { return VSwitch(false); }
+	bool               IsVSwitch() const                           { return vswitch; }
+
+	ArrayOption&       Frame(bool frm = true)                      { frame = frm; return *this; }
+	ArrayOption&       NoFrame()                                   { return Frame(false); }
+	bool               IsFrame() const                             { return frame; }
+
+	void               Click();
+
+public:
+	Callback           WhenAction;
+
+	Callback           operator <<= (Callback cb)                  { return WhenAction = cb; }
+
+private:
+	Vector<int>        index;
+	ArrayCtrl         *array;
+	Value              t, f;
+	bool               hswitch, vswitch;
+	bool               threestate;
+	bool               frame;
+};
diff --git a/uppsrc/CtrlLib/Bar.cpp b/uppsrc/CtrlLib/Bar.cpp
new file mode 100644
index 000000000..69222d0be
--- /dev/null
+++ b/uppsrc/CtrlLib/Bar.cpp
@@ -0,0 +1,678 @@
+#include "CtrlLib.h"
+
+NAMESPACE_UPP
+
+#define LLOG(x) // LOG(x)
+
+void BarPane::LeftDown(Point pt, dword keyflags)
+{
+	WhenLeftClick();
+}
+
+void BarPane::PaintBar(Draw& w, const SeparatorCtrl::Style& ss, const Value& pane,
+                       const Value& iconbar, int iconsz)
+{
+	Size sz = GetSize();
+	Rect r = GetSize();
+	for(int i = 0; i < breakpos.GetCount(); i++)
+		if(horz) {
+			int y = breakpos[i];
+			Rect rr = r;
+			rr.bottom = y;
+			ChPaint(w, rr, pane);
+			if(!IsNull(ss.l1))
+				ChPaint(w, 0, y++, sz.cx, 1, ss.l1);
+			if(!IsNull(ss.l2))
+				ChPaint(w, 0, y++, sz.cx, 1, ss.l2);
+			r.top = y;
+		}
+		else {
+			int x = breakpos[i];
+			Rect rr = r;
+			rr.right = x;
+			if(!IsNull(iconbar)) {
+				Rect r2 = rr;
+				r2.right = r2.left + iconsz;
+				ChPaint(w, r2, iconbar);
+				rr.left = r2.right;
+			}
+			ChPaint(w, rr, pane);
+			if(!IsNull(ss.l1))
+				ChPaint(w, x++, 0, 1, sz.cy, ss.l1);
+			if(!IsNull(ss.l2))
+				ChPaint(w, x++, 0, 1, sz.cy, ss.l2);
+			r.left = x;
+		}
+	if(!horz && !IsNull(iconbar)) {
+		Rect r2 = r;
+		r2.right = r2.left + iconsz;
+		ChPaint(w, r2, iconbar);
+		r.left = r2.right;
+	}
+	ChPaint(w, r, pane);
+}
+
+Size BarPane::Repos(bool _horz, int maxsize)
+{
+	horz = _horz;
+	maxsize -= 2 * (horz ? hmargin : vmargin);
+	int bmargin = horz ? vmargin : hmargin;
+	breakpos.Clear();
+	Size asz(0, 0);
+	VeHo(asz) = bmargin;
+	Array<Item>::Iterator q = item.Begin();
+	while(q < item.End()) {
+		Size psz(0, 0);
+		Array<Item>::Iterator f = q;
+		while(q < item.End()) {
+			if(q->ctrl == NULL && IsNull(q->gapsize)) {
+				q++;
+				break;
+			}
+			int gapsize = q->gapsize;
+			if(gapsize == INT_MAX && q->ctrl == NULL) {
+				if(maxsize == INT_MAX) {
+					q++;
+					break;
+				}
+				gapsize = 0;
+				Array<Item>::Iterator w = q + 1;
+				while(w < item.End()) {
+					if(!w->ctrl) break;
+					Size sz = w->ctrl->GetMinSize();
+					if(HoVe(psz) + gapsize + HoVe(sz) > maxsize) break;
+					gapsize += HoVe(sz);
+					w++;
+				}
+				gapsize = maxsize - gapsize - HoVe(psz);
+			}
+			Size sz = q->ctrl ? q->ctrl->GetMinSize()
+			                  : Size(horz ? gapsize : 0, horz ? 0 : gapsize);
+			if(HoVe(sz) == INT_MAX)
+				HoVe(sz) = maxsize - HoVe(psz);
+			if(HoVe(psz) + HoVe(sz) > maxsize && HoVe(psz)) {
+				while(q < item.End() && q->ctrl == NULL && !IsNull(q->gapsize))
+					q++;
+				break;
+			}
+			VeHo(psz) = max(VeHo(psz), VeHo(sz));
+			if(q->ctrl)
+				if(horz)
+					q->ctrl->LeftPos(psz.cx + hmargin, sz.cx);
+				else
+					q->ctrl->TopPos(psz.cy + vmargin, sz.cy);
+			HoVe(psz) += HoVe(sz);
+			q++;
+		}
+		int& bp = VeHo(asz);
+		if(bp > bmargin) {
+			breakpos.Add(bp + bmargin);
+			bp += 2 + 2 * bmargin;
+		}
+		while(f != q) {
+			if(f->ctrl)
+				if(horz)
+					f->ctrl->TopPos(bp, psz.cy);
+				else
+					f->ctrl->LeftPos(bp, psz.cx);
+			f++;
+		}
+		bp += VeHo(psz);
+		HoVe(asz) = max(HoVe(asz), HoVe(psz));
+	}
+	VeHo(asz) += bmargin;
+	HoVe(asz) += horz ? 2 * hmargin : 2 * vmargin;
+	LLOG("Repos " << Name() << " " << asz);
+	return asz;
+}
+
+Size BarPane::GetPaneSize(bool horz, int maxsize) const
+{
+	maxsize -= 2 * (horz ? hmargin : vmargin);
+	Size asz(0, 0);
+	int bmargin = horz ? vmargin : hmargin;
+	VeHo(horz, asz) = bmargin;
+	Array<Item>::ConstIterator q = item.Begin();
+	while(q < item.End()) {
+		Size psz(0, 0);
+		while(q < item.End()) {
+			if(q->ctrl == NULL && IsNull(q->gapsize)) {
+				q++;
+				break;
+			}
+			int gapsize = q->gapsize;
+			if(gapsize == INT_MAX && q->ctrl == NULL) {
+				if(maxsize == INT_MAX) {
+					q++;
+					break;
+				}
+				gapsize = 0;
+				Array<Item>::ConstIterator w = q + 1;
+				while(w < item.End()) {
+					if(!w->ctrl) break;
+					Size sz = w->ctrl->GetMinSize();
+					if(HoVe(horz, psz) + gapsize + HoVe(horz, sz) > maxsize) break;
+					gapsize += HoVe(horz, sz);
+					w++;
+				}
+				gapsize = maxsize - gapsize - HoVe(horz, psz);
+			}
+			Size sz = q->ctrl ? q->ctrl->GetMinSize()
+			                  : Size(horz ? gapsize : 0, horz ? 0 : gapsize);
+			if(HoVe(horz, psz) + HoVe(horz, sz) >= maxsize && HoVe(horz, psz)) {
+				while(q < item.End() && q->ctrl == NULL && !IsNull(q->gapsize))
+					q++;
+				break;
+			}
+			VeHo(horz, psz) = max(VeHo(horz, psz), VeHo(horz, sz));
+			HoVe(horz, psz) += HoVe(horz, sz);
+			q++;
+		}
+		int& bp = VeHo(horz, asz);
+		if(bp > bmargin)
+			bp += 2 + 2 * bmargin;
+		bp += VeHo(horz, psz);
+		HoVe(horz, asz) = max(HoVe(horz, asz), HoVe(horz, psz));
+	}
+	VeHo(horz, asz) += bmargin;
+	HoVe(horz, asz) += horz ? 2 * hmargin : 2 * vmargin;
+	LLOG("Size " << Name() << " " << asz);
+	return asz + Size(2 * hmargin, 2 * vmargin);
+}
+
+void BarPane::IClear()
+{
+	breakpos.Clear();
+	item.Clear();
+}
+
+void BarPane::Clear()
+{
+	while(GetFirstChild())
+		RemoveChild(GetFirstChild());
+	IClear();
+}
+
+void BarPane::Add(Ctrl *ctrl, int gapsize)
+{
+	Item& m = item.Add();
+	m.ctrl = ctrl;
+	m.gapsize = gapsize;
+	if(ctrl)
+		AddChild(ctrl);
+}
+
+void BarPane::MouseMove(Point p, dword)
+{
+	Ctrl *q = Ctrl::GetVisibleChild(this, p, false);
+	if(q != phelpctrl) {
+		phelpctrl = q;
+		BarCtrl::SendHelpLine(q);
+	}
+}
+
+BarPane::BarPane()
+{
+	NoWantFocus();
+	phelpctrl = NULL;
+	hmargin = vmargin = 0;
+	menu = false;
+}
+
+BarPane::~BarPane() {}
+
+Bar::Item::Item() {}
+Bar::Item::~Item() {}
+
+Bar::Item& Bar::Item::Text(const char *text)        { return *this; }
+Bar::Item& Bar::Item::Key(dword key)                { return *this; }
+Bar::Item& Bar::Item::Repeat(bool b)                { return *this; }
+Bar::Item& Bar::Item::Image(const UPP::Image& img)  { return *this; }
+Bar::Item& Bar::Item::Enable(bool _enable)          { return *this; }
+Bar::Item& Bar::Item::Tip(const char *tip)          { return *this; }
+Bar::Item& Bar::Item::Help(const char *help)        { return *this; }
+Bar::Item& Bar::Item::Topic(const char *topic)      { return *this; }
+Bar::Item& Bar::Item::Description(const char *desc) { return *this; }
+Bar::Item& Bar::Item::Check(bool check)             { return *this; }
+Bar::Item& Bar::Item::Radio(bool check)             { return *this; }
+void       Bar::Item::FinalSync() {}
+
+Bar::Item& Bar::Item::Label(const char *text)
+{
+	ToolButton *b = dynamic_cast<ToolButton *>(this);
+	if(b) b->Label(text, ToolButton::BOTTOMLABEL);
+	return *this;
+}
+
+Bar::Item& Bar::Item::RightLabel(const char *text)
+{
+	ToolButton *b = dynamic_cast<ToolButton *>(this);
+	if(b) b->Label(text, ToolButton::RIGHTLABEL);
+	return *this;
+}
+
+Bar::Item& Bar::Item::Key(KeyInfo& (*key)()) {
+	KeyInfo& k = (*key)();
+	return Key(k.key[0]).Key(k.key[1]).Key(k.key[2]).Key(k.key[3]);
+}
+
+Bar::Bar() {}
+Bar::~Bar() {}
+
+Bar::Item& Bar::NilItem()
+{
+	static Item m;
+	return m;
+}
+
+void Bar::AddNC(Ctrl& ctrl)
+{
+	AddCtrl(&ctrl, (int)Null);
+}
+
+Bar::Item&  Bar::Add(bool enable, const char *text, const UPP::Image& image, Callback cb)
+{
+	return AddItem(cb).Text(text).Image(image).Enable(enable);
+}
+
+Bar::Item&  Bar::Add(bool enable, KeyInfo& (*key)(), const UPP::Image& image, Callback callback)
+{
+	const char *text = (*key)().name;
+	if(*text == '\3')
+		text = t_GetLngString(text + 1);
+	return Add(enable, text, image, callback).Key(key);
+}
+
+Bar::Item&  Bar::Add(const char *text, const UPP::Image& image, Callback callback)
+{
+	return Add(true, text, image, callback);
+}
+
+Bar::Item& Bar::Add(const String& text, const UPP::Image& image, Callback callback)
+{
+	return Add(~text, image, callback);
+}
+
+Bar::Item&  Bar::Add(KeyInfo& (*key)(), const UPP::Image& image, Callback callback)
+{
+	return Add(true, key, image, callback);
+}
+
+Bar::Item&  Bar::Add(bool enable, const char *text, Callback callback)
+{ return IsMenuBar() ? Add(enable, text, Image(), callback) : NilItem(); }
+
+Bar::Item&  Bar::Add(const char *text, Callback callback)
+{ return IsMenuBar() ? Add(true, text, Image(), callback) : NilItem(); }
+
+Bar::Item&  Bar::Add(bool enable, KeyInfo& (*key)(), Callback callback)
+{ return IsMenuBar() ? Add(enable, key, Image(), callback) : NilItem(); }
+
+Bar::Item&  Bar::Add(KeyInfo& (*key)(), Callback callback)
+{ return IsMenuBar() ? Add(true, key, Image(), callback) : NilItem(); }
+
+void Bar::Break()
+{
+	AddCtrl(NULL, (int)Null);
+}
+
+void Bar::Gap(int size)
+{
+	AddCtrl(NULL, size);
+}
+
+void   Bar::MenuSeparator()              { if(IsMenuBar()) Separator(); }
+void   Bar::MenuBreak()                  { if(IsMenuBar()) Break(); }
+void   Bar::MenuGap(int size)            { if(IsMenuBar()) Gap(size); }
+void   Bar::AddMenu(Ctrl& ctrl)          { if(IsMenuBar()) Add(ctrl); }
+void   Bar::AddMenu(Ctrl& ctrl, Size sz) { if(IsMenuBar()) Add(ctrl, sz); }
+
+Bar::Item&  Bar::AddMenu(bool enable, KeyInfo& (*key)(), const UPP::Image& image, Callback callback)
+{ return IsMenuBar() ? Add(enable, key, image, callback) : NilItem(); }
+
+Bar::Item&  Bar::AddMenu(KeyInfo& (*key)(), const UPP::Image& image, Callback callback)
+{ return IsMenuBar() ? Add(key, image, callback) : NilItem(); }
+
+Bar::Item&  Bar::AddMenu(bool enable, const char *text, const UPP::Image& image, Callback callback)
+{ return IsMenuBar() ? Add(enable, text, image, callback) : NilItem(); }
+
+Bar::Item&  Bar::AddMenu(const char *text, const UPP::Image& image, Callback callback)
+{ return IsMenuBar() ? Add(text, image, callback) : NilItem(); }
+
+Bar::Item& Bar::Add(bool enable, const char *text, Callback1<Bar&> proc)
+{ return AddSubMenu(proc).Text(text).Enable(enable); }
+
+Bar::Item& Bar::Add(const char *text, Callback1<Bar&> proc)
+{ return Add(true, text, proc); }
+
+Bar::Item& Bar::Add(bool enable, const char *text, const UPP::Image& image, Callback1<Bar&> proc)
+{ return Add(enable, text, proc).Image(image); }
+
+Bar::Item& Bar::Add(const char *text, const UPP::Image& image, Callback1<Bar&> proc)
+{ return Add(text, proc).Image(image); }
+
+void   Bar::ToolSeparator()                { if(IsToolBar()) Separator(); }
+void   Bar::ToolBreak()                    { if(IsToolBar()) Break(); }
+void   Bar::ToolGap(int size)              { if(IsToolBar()) Gap(size); }
+
+void   Bar::AddTool(Ctrl& ctrl)            { if(IsToolBar()) Add(ctrl); }
+void   Bar::AddTool(Ctrl& ctrl, Size sz)   { if(IsToolBar()) Add(ctrl, sz); }
+
+void   Bar::AddKey(dword key, Callback cb) {}
+
+void Bar::AddKey(KeyInfo& (*key)(), Callback cb)
+{
+	KeyInfo& k = (*key)();
+	AddKey(k.key[0], cb);
+	AddKey(k.key[1], cb);
+	AddKey(k.key[2], cb);
+	AddKey(k.key[3], cb);
+}
+
+Bar::Item&  Bar::Add(bool enable, const UPP::Image& image, Callback cb)
+{ return IsToolBar() ? AddItem(cb).Image(image).Enable(enable) : NilItem(); }
+
+Bar::Item&  Bar::Add(const UPP::Image& image, Callback cb)
+{ return IsToolBar() ? Add(true, image, cb) : NilItem(); }
+
+class Bar::ScanKeys : public Bar {
+	struct KeyItem : public Bar::Item {
+		bool          enabled;
+		Vector<dword> key;
+		Callback      action;
+
+		virtual Item& Text(const char *)             { return *this; }
+		virtual Item& Check(bool check)              { return *this; }
+		virtual Item& Radio(bool check)              { return *this; }
+		virtual Item& Key(dword _key)                { if(_key) key.Add(_key); return *this; }
+		virtual Item& Image(const UPP::Image& img)   { return *this;  }
+		virtual Item& Enable(bool _enable = true)    { enabled = _enable; return *this; }
+		virtual Item& Tip(const char *tip)           { return *this; }
+		virtual Item& Help(const char *help)         { return *this; }
+		virtual Item& Topic(const char *help)        { return *this; }
+		virtual Item& Description(const char *help)  { return *this; }
+	};
+
+	Array<KeyItem> key;
+	KeyItem        nilitem;
+	int            level;
+
+protected:
+	virtual Item&  AddItem(Callback cb);
+	virtual Item&  AddSubMenu(Callback1<Bar&> proc);
+	virtual void   AddCtrl(Ctrl *ctrl, int gapsize) {};
+	virtual void   AddCtrl(Ctrl *ctrl, Size sz) {};
+
+public:
+	virtual bool   IsMenuBar() const                 { return true; }
+	virtual bool   IsToolBar() const                 { return true; }
+	virtual bool   IsScanKeys() const                { return true; }
+
+	virtual bool   IsEmpty() const                   { return key.IsEmpty(); }
+	virtual void   Separator()                       {}
+	virtual void   AddKey(dword key, Callback cb);
+
+	bool Do(dword key);
+
+	ScanKeys()                                       { level = 0; }
+};
+
+Bar::Item& Bar::ScanKeys::AddItem(Callback cb)
+{
+	KeyItem& m = key.Add();
+	m.action = cb;
+	m.enabled = true;
+	return m;
+}
+
+Bar::Item&  Bar::ScanKeys::AddSubMenu(Callback1<Bar&> proc)
+{
+	level++;
+	if(level > 5)
+		return NilItem();;
+	proc(*this);
+	level--;
+	return key.GetCount() ? key.Top() : nilitem;
+}
+
+void   Bar::ScanKeys::AddKey(dword _key, Callback cb)
+{
+	if(_key) {
+		KeyItem& m = key.Add();
+		m.action = cb;
+		m.enabled = true;
+		m.key.Add(_key);
+	}
+}
+
+bool   Bar::ScanKeys::Do(dword k)
+{
+	for(int i = 0; i < key.GetCount(); i++) {
+		KeyItem& m = key[i];
+		if(m.enabled && FindIndex(m.key, k) >= 0) {
+			m.action();
+			return true;
+		}
+	}
+	return false;
+}
+
+bool   Bar::Scan(Callback1<Bar&> proc, dword key)
+{
+	ScanKeys keys;
+	proc(keys);
+	return keys.Do(key);
+}
+
+bool BarCtrl::IsEmpty() const
+{
+	return pane.IsEmpty();
+}
+
+void BarCtrl::Separator()
+{
+	AddNC(separator.DoIndex(sii++).Margin(lsepm, rsepm).SetStyle(*sepstyle).SetSize(ssize));
+}
+
+void BarCtrl::AddCtrl(Ctrl *ctrl, Size sz)
+{
+	SizeCtrl& m = sizer.DoIndex(zii++);
+	LogPos p = ctrl->GetPos();
+	if(p.x.IsEmpty())
+		if(sz.cx == INT_MAX)
+			ctrl->HSizePos();
+		else
+			ctrl->HCenterPos(sz.cx ? sz.cx : MINSIZE);
+	if(p.y.IsEmpty())
+		if(sz.cy == INT_MAX)
+			ctrl->VSizePos();
+		else
+			ctrl->VCenterPos(sz.cy ? sz.cy : MINSIZE);
+	LLOG("AddCtrl Ctrl::GetSize: " << ctrl->GetSize());
+	m.SetSize(sz);
+	m.AddChild(ctrl);
+	AddNC(m);
+	LLOG("AddCtrl2 Ctrl::GetSize: " << ctrl->GetSize());
+}
+
+Size BarCtrl::SizeCtrl::GetMinSize() const
+{
+	Size sz = size;
+	Size chsz = Size(8, 8);
+	if(GetFirstChild())
+		chsz = GetFirstChild()->GetStdSize();
+	sz.cx = sz.cx <= 0 ? chsz.cx : sz.cx;
+	sz.cy = sz.cy <= 0 ? chsz.cy : sz.cy;
+	return sz;
+}
+
+Value BarCtrl::GetBackground() const
+{
+	return Null;
+}
+
+void BarCtrl::Clear()
+{
+	separator.Clear();
+	sizer.Clear();
+	pane.Clear();
+}
+
+void BarCtrl::IClear()
+{
+	sii = zii = 0;
+	pane.IClear();
+}
+
+void BarCtrl::IFinish()
+{
+	separator.SetCount(sii);
+	sizer.SetCount(zii);
+}
+
+BarCtrl *BarCtrl::GetBarCtrlParent(Ctrl *q)
+{
+	while(q) {
+		BarCtrl *w = dynamic_cast<BarCtrl *>(q);
+		if(w) return w;
+		q = q->GetParent();
+	}
+	return NULL;
+}
+
+void BarCtrl::SendHelpLine(Ctrl *q)
+{
+	String s = q->GetHelpLine();
+	if(!UPP::IsEmpty(s)) {
+		BarCtrl *b = GetBarCtrlParent(q);
+		if(b) b->WhenHelp(s);
+	}
+}
+
+void BarCtrl::ClearHelpLine(Ctrl *q)
+{
+	BarCtrl *b = GetBarCtrlParent(q);
+	if(b) b->WhenHelp(Null);
+}
+
+void BarCtrl::FrameLayout(Rect& r)
+{
+	switch(align) {
+	case BAR_LEFT:
+		LayoutFrameLeft(r, this, pane.Repos(false, r.Height()).cx);
+		break;
+	case BAR_RIGHT:
+		LayoutFrameRight(r, this, pane.Repos(false, r.Height()).cx);
+		break;
+	case BAR_BOTTOM:
+		LayoutFrameBottom(r, this, pane.Repos(true, r.Width()).cy);
+		break;
+	default:
+		LayoutFrameTop(r, this, pane.Repos(true, r.Width()).cy);
+		break;
+	}
+}
+
+void BarCtrl::FrameAddSize(Size& sz)
+{
+	if(align == BAR_LEFT || align == BAR_RIGHT)
+		sz.cx += pane.GetPaneSize(true, sz.cy).cx;
+	else
+		sz.cy += pane.GetPaneSize(true, sz.cx).cy;
+}
+
+void BarCtrl::FrameAdd(Ctrl& parent)
+{
+	parent.Add(*this);
+}
+
+void BarCtrl::FrameRemove()
+{
+	Remove();
+}
+
+void BarCtrl::AddCtrl(Ctrl *ctrl, int gapsize)
+{
+	pane.Add(ctrl, gapsize);
+}
+
+BarCtrl& BarCtrl::Align(int al) {
+	align = al;
+	SyncBar();
+	return *this;
+}
+
+void BarCtrl::SyncBar()
+{
+	if(IsChild() && InFrame())
+		RefreshParentLayout();
+	else
+		Layout();
+}
+
+void BarCtrl::Layout()
+{
+	LLOG("BarCtrl::Layout");
+	if(IsChild()) {
+		bool dowrap = InFrame() && wrap >= 0 || wrap > 0;
+		if(GetAlign() == BAR_LEFT || GetAlign() == BAR_RIGHT)
+			pane.Repos(false, dowrap ? GetSize().cy : INT_MAX);
+		else
+			pane.Repos(true, dowrap ? GetSize().cx : INT_MAX);
+	}
+}
+
+void BarCtrl::PaintBar(Draw& w, const SeparatorCtrl::Style& ss, const Value& p, const Value& iconbar, int iconsz)
+{
+	pane.PaintBar(w, ss, p, iconbar, iconsz);
+}
+
+BarCtrl::BarCtrl() {
+	align = BAR_TOP;
+	Ctrl::Add(pane.SizePos());
+	lsepm = rsepm = 2;
+	ssize = 8;
+	sii = zii = 0;
+	NoWantFocus();
+	pane.WhenLeftClick = Proxy(WhenLeftClick);
+	wrap = 0;
+	sepstyle = &SeparatorCtrl::StyleDefault();
+}
+
+BarCtrl::~BarCtrl() {}
+
+void LRUList::Serialize(Stream& stream)
+{
+	StreamContainer(stream, lru);
+}
+
+void LRUList::Select(String f, Callback1<const String&> WhenSelect)
+{
+	WhenSelect(f);
+}
+
+void LRUList::operator()(Bar& bar, Callback1<const String&> WhenSelect)
+{
+	if(bar.IsMenuBar() && !lru.IsEmpty()) {
+		bar.Separator();
+		char n = '1';
+		for(int i = 0; i < lru.GetCount(); i++) {
+			bar.Add(String("&") + n + ' ' + GetFileName(lru[i]),
+			        THISBACK2(Select, lru[i], WhenSelect));
+			n = n == '9' ? 'A' : n + 1;
+		}
+	}
+}
+
+void LRUList::NewEntry(const String& path)
+{
+	LruAdd(lru, path, limit);
+}
+
+void LRUList::RemoveEntry(const String& path)
+{
+	int q = FindIndex(lru, path);
+	if(q >= 0)
+		lru.Remove(q);
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/CtrlLib/Bar.h b/uppsrc/CtrlLib/Bar.h
new file mode 100644
index 000000000..66a2c904c
--- /dev/null
+++ b/uppsrc/CtrlLib/Bar.h
@@ -0,0 +1,558 @@
+class BarPane : public ParentCtrl {
+public:
+	virtual void LeftDown(Point pt, dword keyflags);
+	virtual void MouseMove(Point p, dword);
+
+private:
+	struct Item {
+		Ctrl *ctrl;
+		int   gapsize;
+	};
+	Array<Item>    item;
+	Vector<int>    breakpos;
+	bool           horz;
+	Ctrl          *phelpctrl;
+	int            vmargin, hmargin;
+	bool           menu;
+
+	int&     HoVe(Size& sz)                  { return horz ? sz.cx : sz.cy; }
+	int&     VeHo(Size& sz)                  { return horz ? sz.cy : sz.cx; }
+	int&     HoVe(bool horz, Size& sz) const { return horz ? sz.cx : sz.cy; }
+	int&     VeHo(bool horz, Size& sz) const { return horz ? sz.cy : sz.cx; }
+
+public:
+	Callback WhenLeftClick;
+
+	void  PaintBar(Draw& w, const SeparatorCtrl::Style& ss,
+	               const Value& pane, const Value& iconbar = Null, int iconsz = 0);
+
+	void  IClear();
+	void  Clear();
+	bool  IsEmpty() const                    { return item.IsEmpty(); }
+
+	void  Add(Ctrl *ctrl, int gapsize);
+	void  AddBreak()                         { Add(NULL, Null); }
+	void  AddGap(int gapsize)                { Add(NULL, gapsize); }
+
+	void  Margin(int v, int h)               { vmargin = v; hmargin = h; }
+
+	Size  Repos(bool horz, int maxsize);
+	Size  GetPaneSize(bool _horz, int maxsize) const;
+
+	int   GetCount() const                   { return breakpos.GetCount() + 1; }
+
+	void  SubMenu()                          { menu = true; }
+
+	BarPane();
+	virtual ~BarPane();
+};
+
+class Bar : public Ctrl {
+public:
+	struct Item {
+		virtual Item& Text(const char *text);
+		virtual Item& Key(dword key);
+		virtual Item& Repeat(bool repeat = true);
+		virtual Item& Image(const class Image& img);
+		virtual Item& Check(bool check);
+		virtual Item& Radio(bool check);
+		virtual Item& Enable(bool _enable = true);
+		virtual Item& Tip(const char *tip);
+		virtual Item& Help(const char *help);
+		virtual Item& Topic(const char *topic);
+		virtual Item& Description(const char *desc);
+		virtual void  FinalSync();
+
+		Item&   Label(const char *text);
+		Item&   RightLabel(const char *text);
+
+		Item& Key(KeyInfo& (*key)());
+
+		Item();
+		virtual ~Item();
+	};
+
+protected:
+	virtual Item&  AddItem(Callback cb) = 0;
+	virtual Item&  AddSubMenu(Callback1<Bar&> proc) = 0;
+	virtual void   AddCtrl(Ctrl *ctrl, int gapsize) = 0;
+	virtual void   AddCtrl(Ctrl *ctrl, Size sz) = 0;
+
+	class ScanKeys;
+
+public:
+	virtual bool   IsEmpty() const = 0;
+	virtual void   Separator() = 0;
+
+	static  Item&  NilItem();
+	static bool    Scan(Callback1<Bar&> proc, dword key);
+
+	void   Break();
+	void   Gap(int size = 8);
+	void   GapRight()                               { Gap(INT_MAX); }
+
+	void   AddNC(Ctrl& ctrl);
+	void   Add(Ctrl& ctrl)                          { AddCtrl(&ctrl, ctrl.GetMinSize()); }
+	void   Add(Ctrl& ctrl, Size sz)                 { AddCtrl(&ctrl, sz); }
+	void   Add(Ctrl& ctrl, int cx, int cy = 0)      { AddCtrl(&ctrl, Size(cx, cy)); }
+
+	void   Add(bool en, Ctrl& ctrl)                     { Add(ctrl); ctrl.Enable(en); }
+	void   Add(bool en, Ctrl& ctrl, Size sz)            { Add(ctrl, sz); ctrl.Enable(en); }
+	void   Add(bool en, Ctrl& ctrl, int cx, int cy = 0) { Add(ctrl, cx, cy); ctrl.Enable(en); }
+
+
+	Item&  Add(bool enable, const char *text, const UPP::Image& image, Callback callback);
+	Item&  Add(bool enable, KeyInfo& (*key)(), const UPP::Image& image, Callback callback);
+	Item&  Add(const char *text, const UPP::Image& image, Callback callback);
+	Item&  Add(const String& text, const UPP::Image& image, Callback callback);
+	Item&  Add(KeyInfo& (*key)(), const UPP::Image& image, Callback callback);
+
+	Item&  Add(bool enable, const char *text, Callback callback);
+	Item&  Add(bool enable, KeyInfo& (*key)(), Callback callback);
+	Item&  Add(const char *text, Callback callback);
+	Item&  Add(KeyInfo& (*key)(), Callback callback);
+
+	void   MenuSeparator();
+	void   MenuBreak();
+	void   MenuGap(int size = 8);
+	void   MenuGapRight()                           { MenuGap(INT_MAX); }
+
+	void   AddMenu(Ctrl& ctrl);
+	void   AddMenu(Ctrl& ctrl, Size sz);
+	void   AddMenu(Ctrl& ctrl, int cx, int cy = 0)  { AddMenu(ctrl, Size(cx, cy)); }
+
+	Item&  AddMenu(bool enable, const char *text, const UPP::Image& image, Callback callback);
+	Item&  AddMenu(bool enable, KeyInfo& (*key)(), const UPP::Image& image, Callback callback);
+	Item&  AddMenu(const char *text, const UPP::Image& image, Callback callback);
+	Item&  AddMenu(const String& t, const UPP::Image& m, Callback c) { return AddMenu(t, m, c); }
+	Item&  AddMenu(KeyInfo& (*key)(), const UPP::Image& m, Callback c);
+
+	Item&  Add(bool enable, const char *text, Callback1<Bar&> proc);
+	Item&  Add(const char *text, Callback1<Bar&> proc);
+	Item&  Add(bool enable, const char *text, const UPP::Image& image, Callback1<Bar&> proc);
+	Item&  Add(const char *text, const UPP::Image& image, Callback1<Bar&> proc);
+
+	void   ToolSeparator();
+	void   ToolBreak();
+	void   ToolGap(int size = 8);
+	void   ToolGapRight()                           { ToolGap(INT_MAX); }
+
+	void   AddTool(Ctrl& ctrl);
+	void   AddTool(Ctrl& ctrl, Size sz);
+	void   AddTool(Ctrl& ctrl, int cx, int cy = 0)  { AddTool(ctrl, Size(cx, cy)); }
+
+	Item&  Add(const UPP::Image& image, Callback callback);
+	Item&  Add(bool enable, const UPP::Image& image, Callback callback);
+
+	virtual void AddKey(dword key, Callback cb);
+	        void AddKey(KeyInfo& (*key)(), Callback cb);
+
+	virtual bool IsMenuBar() const                  { return false; }
+	virtual bool IsToolBar() const                  { return false; }
+	virtual bool IsScanKeys() const                 { return false; }
+	virtual bool IsScanHelp() const                 { return false; }
+
+	typedef Bar CLASSNAME;
+	Bar();
+	virtual ~Bar();
+};
+
+class BarCtrl : public Bar, public CtrlFrame {
+public:
+	virtual void   Layout();
+
+	virtual void   FrameLayout(Rect& r);
+	virtual void   FrameAddSize(Size& sz);
+	virtual void   FrameAdd(Ctrl& ctrl);
+	virtual void   FrameRemove();
+
+	virtual bool   IsEmpty() const;
+	virtual void   Separator();
+
+protected:
+	virtual void   AddCtrl(Ctrl *ctrl, int gapsize);
+	virtual void   AddCtrl(Ctrl *ctrl, Size sz);
+
+private:
+	class SizeCtrl : public ParentCtrl {
+	public:
+		virtual Size GetMinSize() const;
+
+	private:
+		Size size;
+
+	public:
+		void  SetSize(Size sz)             { size = sz; }
+
+		SizeCtrl()                         { NoWantFocus(); }
+	};
+
+	int                  sii;
+	Array<SeparatorCtrl> separator;
+	int                  zii;
+	Array<SizeCtrl>      sizer;
+	int                  align;
+
+protected:
+	BarPane pane;
+	int     ssize;
+	int     wrap;
+	int     lsepm, rsepm;
+	const SeparatorCtrl::Style *sepstyle;
+
+	void     SyncBar();
+
+	void     IClear();
+	void     IFinish();
+
+	void     Clear();
+
+	virtual Value GetBackground() const;
+
+	friend class BarPane;
+
+public:
+	Callback1<const String&> WhenHelp;
+	Callback WhenLeftClick;
+
+	static BarCtrl *GetBarCtrlParent(Ctrl *child);
+	static void     SendHelpLine(Ctrl *q);
+	static void     ClearHelpLine(Ctrl *q);
+
+	enum {
+		BAR_LEFT, BAR_RIGHT, BAR_TOP, BAR_BOTTOM
+	};
+
+	void  PaintBar(Draw& w, const SeparatorCtrl::Style& ss,
+	               const Value& pane, const Value& iconbar = Null, int iconsz = 0);
+
+	BarCtrl& Align(int align);
+	BarCtrl& Top()                       { return Align(BAR_TOP); }
+	BarCtrl& Bottom()                    { return Align(BAR_BOTTOM); }
+	BarCtrl& Left()                      { return Align(BAR_LEFT); }
+	BarCtrl& Right()                     { return Align(BAR_RIGHT); }
+	int      GetAlign() const            { return align; }
+
+	BarCtrl& Wrap(int q = 1)             { wrap = q; SyncBar(); return *this; }
+	BarCtrl& NoWrap()                    { return Wrap(-1); }
+
+	typedef BarCtrl CLASSNAME;
+
+	BarCtrl();
+	virtual ~BarCtrl();
+};
+
+class MenuItemBase;
+
+CtrlFrame& MenuFrame();
+
+class MenuBar : public BarCtrl {
+public:
+	virtual void  LeftDown(Point, dword);
+	virtual bool  Key(dword key, int count);
+	virtual bool  HotKey(dword key);
+	virtual void  ChildGotFocus();
+	virtual void  ChildLostFocus();
+	virtual void  Deactivate();
+	virtual void  CancelMode();
+	virtual void  Paint(Draw& w);
+
+protected:
+	virtual Item& AddItem(Callback cb);
+	virtual Item& AddSubMenu(Callback1<Bar&> proc);
+	virtual Value GetBackground() const;
+
+public:
+	struct Style : ChStyle<Style> {
+		Value item, topitem[3], topbar;
+		Color itemtext, topitemtext[3];
+		SeparatorCtrl::Style breaksep;
+		Value look, arealook;
+		Value popupframe, popupbody, popupiconbar;
+		SeparatorCtrl::Style separator;
+		Size  maxiconsize;
+		int   leftgap, textgap;
+		int   lsepm, rsepm;
+		Point pullshift;
+	};
+
+private:
+	Array<MenuItemBase> item;
+
+	MenuBar     *parentmenu;
+	MenuBar     *submenu;
+	Ctrl        *submenuitem;
+	Ptr<Ctrl>    restorefocus;
+	bool         doeffect;
+	Font         font;
+	int          leftgap;
+	int          lock;
+	const Style *style;
+	int          arealook;
+	Size         maxiconsize;
+	LookFrame    frame;
+
+	friend class MenuItemBase;
+	friend class SubMenuBase;
+	friend class TopSubMenuItem;
+	friend class SubMenuItem;
+
+	void     SetParentMenu(MenuBar *parent)    { parentmenu = parent; style = parent->style; }
+	MenuBar *GetParentMenu()                   { return parentmenu; }
+	void     SetActiveSubmenu(MenuBar *sm, Ctrl *menuitem);
+	MenuBar *GetActiveSubmenu()                { return submenu; }
+	MenuBar *GetMasterMenu();
+	MenuBar *GetLastSubmenu();
+	void     DelayedClose();
+	void     KillDelayedClose();
+	void     SubmenuClose();
+	void     PostDeactivate();
+	void     SyncState();
+	void     SetupRestoreFocus();
+	void     PopUp(Ctrl *owner, Point p, Size rsz = Size(0, 0));
+
+protected:
+	enum {
+		TIMEID_STOP = BarCtrl::TIMEID_COUNT,
+		TIMEID_SUBMENUCLOSE,
+		TIMEID_POST,
+		TIMEID_COUNT
+	};
+
+public:
+	virtual bool IsMenuBar() const                  { return true; }
+
+	static int GetStdHeight(Font font = StdFont());
+
+	void     CloseMenu();
+
+	void     Set(Callback1<Bar&> menu);
+	void     Post(Callback1<Bar&> bar);
+
+	void     PopUp(Point p)                         { PopUp(GetActiveCtrl(), p); }
+	void     PopUp()                                { PopUp(GetMousePos()); }
+
+	void     Execute(Ctrl *owner, Point p);
+	void     Execute(Point p)                       { Execute(GetActiveCtrl(), p); }
+	void     Execute()                              { Execute(GetMousePos()); }
+
+	static void Execute(Ctrl *owner, Callback1<Bar&> proc, Point p);
+	static void Execute(Callback1<Bar&> proc, Point p) { Execute(GetActiveCtrl(), proc, p); }
+	static void Execute(Callback1<Bar&> proc)          { Execute(proc, GetMousePos()); }
+
+	bool     IsEmpty()                              { return item.IsEmpty(); }
+	void     Clear();
+
+	static const Style& StyleDefault();
+
+	MenuBar& LeftGap(int cx)                        { leftgap = cx; return *this; }
+	MenuBar& SetFont(Font f)                        { font = f; return *this; }
+	MenuBar& SetStyle(const Style& s);
+	Font     GetFont() const                        { return font; }
+	MenuBar& AreaLook(int q = 1)                    { arealook = q; Refresh(); return *this; }
+	MenuBar& MaxIconSize(Size sz)                   { maxiconsize = sz; return *this; }
+	Size     GetMaxIconSize() const                 { return maxiconsize; }
+
+	typedef MenuBar CLASSNAME;
+
+	MenuBar();
+	virtual ~MenuBar();
+};
+
+class ToolButton : public Ctrl, public Bar::Item {
+public:
+	virtual void   Paint(Draw& w);
+	virtual void   MouseEnter(Point, dword);
+	virtual void   MouseLeave();
+	virtual Size   GetMinSize() const;
+	virtual void   LeftDown(Point, dword);
+	virtual void   LeftRepeat(Point, dword);
+	virtual void   LeftUp(Point, dword);
+	virtual bool   HotKey(dword key);
+	virtual String GetDesc() const;
+
+	virtual Bar::Item& Text(const char *text);
+	virtual Bar::Item& Key(dword key);
+	virtual Bar::Item& Repeat(bool repeat = true);
+	virtual Bar::Item& Image(const UPP::Image& img);
+	virtual Bar::Item& Enable(bool _enable);
+	virtual Bar::Item& Tip(const char *tip);
+	virtual Bar::Item& Help(const char *help);
+	virtual Bar::Item& Topic(const char *help);
+	virtual Bar::Item& Description(const char *desc);
+	virtual Bar::Item& Radio(bool check);
+	virtual Bar::Item& Check(bool check);
+	virtual void       FinalSync();
+
+public:
+	struct Style : ChStyle<Style> {
+		Value  look[6];
+		Font   font;
+		Color  textcolor[6];
+		bool   light[6];
+		int    contrast[6];
+		Point  offset[6];
+	};
+
+protected:
+	String  text;
+	String  tiptext;
+	dword   accel;
+	bool    checked;
+	bool    paint_checked;
+	bool    repeat;
+
+	byte    kind;
+	Size    minsize;
+	Size    maxiconsize;
+
+	const Style      *style;
+
+private:
+	UPP::Image img;
+
+	void       SendHelpLine();
+	void       ClearHelpLine();
+	void       UpdateTip();
+	UPP::Image GetImage() const;
+
+public:
+	enum Kind { NOLABEL, RIGHTLABEL, BOTTOMLABEL, FORCE = 0x80 };
+
+	void  Reset();
+
+	static const Style& StyleDefault();
+	static const Style& StyleSolid();
+
+	bool		IsChecked()				 { return checked; }
+
+	ToolButton& SetStyle(const Style& s) { style = &s; Refresh(); return *this; }
+	ToolButton& MinSize(Size sz)         { minsize = sz; return *this; }
+	ToolButton& MaxIconSize(Size sz)     { maxiconsize = sz; return *this; }
+	ToolButton& Kind(int _kind)          { kind = _kind; Refresh(); return *this; }
+	ToolButton& Label(const char *text, int kind = ToolButton::RIGHTLABEL);
+
+	ToolButton();
+	virtual ~ToolButton();
+};
+
+void PaintBarArea(Draw& w, Ctrl *x, const Value& look, int bottom = Null);
+
+class ToolBar : public BarCtrl {
+public:
+	virtual bool HotKey(dword key);
+	virtual void Paint(Draw& w);
+
+protected:
+	virtual Item& AddItem(Callback cb);
+	virtual Item& AddSubMenu(Callback1<Bar&> proc);
+
+public:
+	struct Style : ChStyle<Style> {
+		ToolButton::Style    buttonstyle;
+		Size                 buttonminsize;
+		Size                 maxiconsize;
+		int                  buttonkind;
+		Value                look, arealook;
+		SeparatorCtrl::Style breaksep;
+		SeparatorCtrl::Style separator;
+	};
+
+private:
+	int               ii;
+	Array<ToolButton> item;
+	int               lock;
+	Callback1<Bar&>   proc;
+	const Style      *style;
+	int               arealook;
+
+	Size              buttonminsize;
+	Size              maxiconsize;
+	int               kind;
+
+protected:
+	enum {
+		TIMEID_POST = BarCtrl::TIMEID_COUNT,
+		TIMEID_COUNT
+	};
+
+public:
+	virtual bool IsToolBar() const                  { return true; }
+
+	static int GetStdHeight();
+
+	void Clear();
+	void Set(Callback1<Bar&> bar);
+	void Post(Callback1<Bar&> bar);
+
+	static const Style& StyleDefault();
+
+	ToolBar& SetStyle(const Style& s)               { style = &s; Refresh(); return *this; }
+
+	ToolBar& ButtonMinSize(Size sz)                 { buttonminsize = sz; return *this; }
+	ToolBar& MaxIconSize(Size sz)                   { maxiconsize = sz; return *this; }
+	ToolBar& ButtonKind(int _kind)                  { kind = _kind; return *this; }
+	ToolBar& AreaLook(int q = 1)                    { arealook = q; Refresh(); return *this; }
+
+	typedef ToolBar  CLASSNAME;
+
+	ToolBar();
+	virtual ~ToolBar();
+};
+
+class StaticBarArea : public Ctrl {
+public:
+	virtual void Paint(Draw& w);
+
+private:
+	bool upperframe;
+
+public:
+	StaticBarArea& UpperFrame(bool b) { upperframe = b; Refresh(); return *this; }
+	StaticBarArea& NoUpperFrame()     { return UpperFrame(false); }
+
+	StaticBarArea();
+};
+
+class LRUList {
+	Vector<String> lru;
+	int            limit;
+	void           Select(String s, Callback1<const String&> WhenSelect);
+
+public:
+	static int GetStdHeight();
+
+	void        Serialize(Stream& stream);
+
+	void        operator()(Bar& bar, Callback1<const String&> WhenSelect);
+
+	void        NewEntry(const String& path);
+	void        RemoveEntry(const String& path);
+
+	LRUList&    Limit(int _limit)                       { limit = _limit; return *this; }
+	int         GetLimit() const                        { return limit; }
+	int         GetCount() const                        { return lru.GetCount(); }
+
+	typedef LRUList CLASSNAME;
+
+	LRUList()   { limit = 6; }
+};
+
+class ToolTip : public Ctrl {
+public:
+	virtual void Paint(Draw& w);
+	virtual Size GetMinSize() const;
+
+private:
+	String  text;
+
+public:
+	void   Set(const char *_text)        { text = _text; }
+	String Get() const                   { return text; }
+
+	void PopUp(Ctrl *owner, Point p, bool effect);
+
+	ToolTip();
+};
+
+void PerformDescription();
diff --git a/uppsrc/CtrlLib/Button.cpp b/uppsrc/CtrlLib/Button.cpp
new file mode 100644
index 000000000..68fc7bbf6
--- /dev/null
+++ b/uppsrc/CtrlLib/Button.cpp
@@ -0,0 +1,730 @@
+#include "CtrlLib.h"
+
+NAMESPACE_UPP
+
+#define LLOG(x) // LOG(x)
+
+void Pusher::RefreshFocus() {
+	Refresh();
+}
+
+void Pusher::RefreshPush() {
+	Refresh();
+}
+
+void Pusher::PerformAction() {
+	WhenAction();
+}
+
+void Pusher::GotFocus() {
+	RefreshFocus();
+}
+
+void Pusher::LostFocus() {
+	if(keypush) EndPush();
+	RefreshFocus();
+}
+
+void Pusher::LeftDown(Point, dword) {
+	if(Ctrl::ClickFocus()) SetWantFocus();
+	if(IsReadOnly()) return;
+	push = true;
+	RefreshPush();
+	WhenPush();
+}
+
+void Pusher::MouseMove(Point, dword style) {
+	LLOG("Mouse move !");
+	if(IsReadOnly()) return;
+	bool b = style & K_MOUSELEFT;
+	if(b != push) {
+		push = b;
+		RefreshPush();
+	}
+}
+
+void Pusher::MouseLeave() {
+	EndPush();
+}
+
+void Pusher::LeftRepeat(Point, dword) {
+	if(IsReadOnly()) return;
+	WhenRepeat();
+}
+
+void Pusher::LeftUp(Point, dword) {
+	FinishPush();
+}
+
+dword Pusher::GetAccessKeys() const
+{
+	return AccessKeyBit(accesskey);
+}
+
+void  Pusher::AssignAccessKeys(dword used)
+{
+	if(!accesskey) {
+		accesskey = ChooseAccessKey(label, used);
+		if(accesskey) Refresh();
+		used |= AccessKeyBit(accesskey);
+	}
+	Ctrl::AssignAccessKeys(used);
+}
+
+void  Pusher::State(int)
+{
+	if(keypush && GetTopCtrl() && !GetTopCtrl()->HasFocusDeep())
+		EndPush();
+}
+
+void Pusher::KeyPush() {
+	if(IsReadOnly()) return;
+	if(keypush) {
+		WhenRepeat();
+		return;
+	}
+	push = keypush = true;
+	RefreshPush();
+	WhenPush();
+}
+
+bool Pusher::FinishPush()
+{
+	if(!IsPush())
+		return false;
+	EndPush();
+	if(IsReadOnly())
+		return false;
+	PerformAction();
+	return true;
+}
+
+bool Pusher::Key(dword key, int) {
+	if(IsReadOnly()) return false;
+	if(key == K_SPACE) {
+		KeyPush();
+		return true;
+	}
+	if(key == (K_SPACE|K_KEYUP))
+		return FinishPush();
+	return false;
+}
+
+bool Pusher::HotKey(dword key) {
+	if(CompareAccessKey(accesskey, key)) {
+		PseudoPush();
+		return true;
+	}
+	return false;
+}
+
+void Pusher::PseudoPush() {
+	if(IsReadOnly() || !IsEnabled()) return;
+	KeyPush();
+	Sync();
+	Sleep(50);
+	FinishPush();
+}
+
+void Pusher::EndPush() {
+	if(push || keypush)
+		RefreshPush();
+	keypush = push = false;
+}
+
+Pusher&  Pusher::SetFont(Font fnt) {
+	font = fnt;
+	Refresh();
+	return *this;
+}
+
+String Pusher::GetDesc()
+{
+	return label;
+}
+
+Pusher& Pusher::SetLabel(const char *atext) {
+	accesskey = ExtractAccessKey(atext, label);
+	Refresh();
+	return *this;
+}
+
+void Pusher::CancelMode() {
+	EndPush();
+}
+
+int Pusher::GetVisualState() const
+{
+	return !IsShowEnabled() ? CTRL_DISABLED :
+	       IsPush() ? CTRL_PRESSED :
+	       HasMouse() ? CTRL_HOT :
+	       CTRL_NORMAL;
+}
+
+Pusher::Pusher() {
+	keypush = push = false;
+	accesskey = 0;
+	font = Null;
+	NoInitFocus();
+}
+
+Pusher::~Pusher() {}
+
+// ----------------
+
+CH_STYLE(Button, Style, StyleNormal)
+{
+	CtrlsImageLook(look, CtrlsImg::I_B);
+	monocolor[0] = monocolor[1] = monocolor[2] = monocolor[3] =
+		Blend(Blend(SColorHighlight, SColorShadow), SColorText, 80);
+	textcolor[0] = textcolor[1] = textcolor[2] = SColorText();
+	textcolor[3] = SColorDisabled();
+	font = StdFont();
+	pressoffset = Point(0, 0);
+	focusmargin = 3;
+	overpaint = 0;
+	transparent = true;
+}
+
+CH_STYLE(Button, Style, StyleOk)
+{
+	Assign(Button::StyleNormal());
+	CtrlsImageLook(look, CtrlsImg::I_OkB);
+}
+
+CH_STYLE(Button, Style, StyleEdge)
+{
+	Assign(Button::StyleNormal());
+	CtrlsImageLook(look, CtrlsImg::I_EB);
+}
+
+CH_STYLE(Button, Style, StyleLeftEdge)
+{
+	Assign(Button::StyleEdge());
+}
+
+CH_STYLE(Button, Style, StyleScroll)
+{
+	Assign(Button::StyleNormal());
+	CtrlsImageLook(look, CtrlsImg::I_SB);
+}
+
+Color ButtonMonoColor(int i)
+{
+	return Button::StyleNormal().monocolor[i];
+}
+
+Button& Button::Ok()
+{
+	if(IsNull(img))
+		img = St()->ok;
+	type = OK;
+	Refresh();
+	return *this;
+}
+
+Button& Button::Cancel()
+{
+	if(IsNull(img))
+		img = St()->cancel;
+	type = CANCEL;
+	Refresh();
+	return *this;
+}
+
+Button& Button::Exit()
+{
+	if(IsNull(img))
+		img = St()->exit;
+	type = EXIT;
+	Refresh();
+	return *this;
+}
+
+const Button::Style *GetButtonStyle(const Ctrl *q)
+{
+	const Button::Style *st = &Button::StyleNormal();
+	if(q->InFrame()) {
+		st = &Button::StyleEdge();
+		if(q->GetParent()) {
+			Rect r = q->GetRect();
+			Size sz = q->GetParent()->GetRect().GetSize();
+			if(r.right < sz.cx / 2)
+				st = &Button::StyleLeftEdge();
+		}
+	}
+	return st;
+}
+
+int Button::OverPaint() const
+{
+	return St()->overpaint;
+}
+
+Button& Button::SetStyle(const Button::Style& s)
+{
+	if(style != &s) {
+		style = &s;
+		RefreshLayout();
+		Refresh();
+	}
+	return *this;
+}
+
+Button& Button::AutoStyle()
+{
+	style = NULL;
+	RefreshLayout();
+	Refresh();
+	return *this;
+}
+
+void Button::Layout()
+{
+	Transparent(St()->transparent);
+}
+
+void Button::RefreshOK(Ctrl *p)
+{
+	for(Ctrl *q = p->GetFirstChild(); q; q = q->GetNext()) {
+		Button *b = dynamic_cast<Button *>(q);
+		if(b && b->type == OK)
+			b->Refresh();
+		RefreshOK(q);
+	}
+}
+
+void Button::GotFocus()
+{
+	RefreshOK(GetTopCtrl());
+	Pusher::GotFocus();
+}
+
+void Button::LostFocus()
+{
+	RefreshOK(GetTopCtrl());
+	Pusher::LostFocus();
+}
+
+const Button::Style *Button::St() const
+{
+	const Style *st;
+	if(style)
+		st = style;
+	else {
+		st = GetButtonStyle(this);
+		if(type == OK) {
+			Button *b = dynamic_cast<Button *>(GetFocusCtrl());
+			if(!b || b == this || b->GetTopCtrl() != GetTopCtrl())
+				st = &StyleOk();
+		}
+		if(HasFocus())
+			st = &StyleOk();
+	}
+	return st;
+}
+
+void Button::Paint(Draw& w)
+{
+	const Style *st = St();
+	Size sz = GetSize();
+	bool ds = !IsShowEnabled();
+	DrawLabel dl;
+	dl.text = label;
+	dl.font = Nvl(font, st->font);
+	dl.limg = img;
+	dl.disabled = ds;
+	dl.lspc = !label.IsEmpty() && !img.IsEmpty() ? 4 : 0;
+	if(VisibleAccessKeys())
+		dl.accesskey = accesskey;
+	if(monoimg)
+		dl.lcolor = SColorText;
+	int i = GetVisualState();
+	ChPaint(w, sz, st->look[i]);
+	dl.ink = st->textcolor[i];
+	if(monoimg)
+		dl.lcolor = st->monocolor[i];
+	dl.Paint(w, 3 + IsPush() * st->pressoffset.x, 3 + IsPush() * st->pressoffset.y,
+	         sz.cx - 6, sz.cy - 6);
+	if(HasFocus())
+		DrawFocus(w, Rect(sz).Deflated(st->focusmargin));
+}
+
+void  Button::MouseEnter(Point, dword)
+{
+	Refresh();
+}
+
+void  Button::MouseLeave()
+{
+	Refresh();
+	Pusher::MouseLeave();
+}
+
+bool Button::Key(dword key, int w) {
+	if(Pusher::Key(key, w)) return true;
+	if(key == K_ENTER) {
+		KeyPush();
+		return true;
+	}
+	if(key == (K_ENTER|K_KEYUP))
+		return FinishPush();
+	return false;
+}
+
+bool Button::HotKey(dword key) {
+	if(Pusher::HotKey(key)) return true;
+	if(CompareAccessKey(accesskey, key)) {
+		PseudoPush();
+		return true;
+	}
+	bool up = key & K_KEYUP;
+	key = key & ~K_KEYUP;
+	if(key == K_ENTER && (type == OK || type == EXIT) ||
+	   key == K_ESCAPE && (type == CANCEL || type == EXIT)) {
+		if(up) {
+			if(IsKeyPush())
+				return FinishPush();
+		}
+		else
+			KeyPush();
+		return true;
+	}
+	return false;
+}
+
+dword Button::GetAccessKeys() const
+{
+	if(type == OK || type == EXIT)
+		return 1;
+	return Pusher::GetAccessKeys();
+}
+
+void  Button::AssignAccessKeys(dword used)
+{
+	if(type == OK || type == EXIT || type == CANCEL)
+		return;
+	return Pusher::AssignAccessKeys(used);
+}
+
+Button& Button::SetImage(const Image& _img)
+{
+	img = _img;
+	monoimg = false;
+	Refresh();
+	return *this;
+}
+
+Button& Button::SetMonoImage(const Image& _img)
+{
+	img = _img;
+	monoimg = true;
+	Refresh();
+	return *this;
+}
+
+Button::Button() {
+	style = NULL;
+	type = NORMAL;
+	monoimg = false;
+}
+
+Button::~Button() {}
+
+CH_STYLE(SpinButtons, Style, StyleDefault)
+{
+	inc = dec = Button::StyleNormal();
+	CtrlsImageLook(inc.look, CtrlsImg::I_EB, CtrlsImg::SpU(), inc.monocolor);
+	CtrlsImageLook(dec.look, CtrlsImg::I_EB, CtrlsImg::SpD(), dec.monocolor);
+	width = 12;
+}
+
+void SpinButtons::FrameLayout(Rect& r)
+{
+	if(!visible) {
+		inc.Hide();
+		dec.Hide();
+		return;
+	}
+	inc.Show();
+	dec.Show();
+	Size sz = r.Size();
+	int h = r.Height();
+	int h2 = h / 2;
+	int h7 = min(sz.cx / 2, style->width);
+	inc.SetFrameRect(r.right - h7, r.top, h7, h2);
+	dec.SetFrameRect(r.right - h7, r.top + h2, h7, r.Height() - h2);
+	r.right -= h7;
+}
+
+void SpinButtons::FrameAddSize(Size& sz)
+{
+	sz.cx += min(sz.cx / 2, 12);
+}
+
+void SpinButtons::FrameAdd(Ctrl& ctrl)
+{
+	ctrl.Add(inc);
+	ctrl.Add(dec);
+}
+
+void SpinButtons::FrameRemove() {
+	inc.Remove();
+	dec.Remove();
+}
+
+void SpinButtons::Show(bool s)
+{
+	visible = s;
+	inc.RefreshParentLayout();
+}
+
+SpinButtons& SpinButtons::SetStyle(const Style& s)
+{
+	if(style != &s) {
+		style = &s;
+		inc.SetStyle(style->inc);
+		dec.SetStyle(style->dec);
+		inc.RefreshParentLayout();
+	}
+	return *this;
+}
+
+SpinButtons::SpinButtons() {
+	visible = true;
+	inc.NoWantFocus();
+	dec.NoWantFocus();
+	style = NULL;
+	SetStyle(StyleDefault());
+}
+
+SpinButtons::~SpinButtons() {}
+
+// -----------------
+
+void  Option::MouseEnter(Point, dword)
+{
+	RefreshPush();
+}
+
+void  Option::MouseLeave()
+{
+	RefreshPush();
+	Pusher::MouseLeave();
+}
+
+void Option::RefreshFocus() {
+	Refresh();
+}
+
+void Option::RefreshPush() {
+	Refresh(0, 0, CtrlsImg::O0().GetSize().cx, GetSize().cy);
+}
+
+Size Option::GetMinSize() const {
+	Size isz = CtrlsImg::O0().GetSize();
+	return AddFrameSize(isz.cx + GetSmartTextSize(label).cx + 4,
+		                max(isz.cy, StdFont().Info().GetHeight()) + 2);
+}
+
+void Option::Paint(Draw& w) {
+	Size sz = GetSize();
+	if(!IsTransparent())
+		w.DrawRect(0, 0, sz.cx, sz.cy, SColorFace);
+	Size isz = CtrlsImg::O0().GetSize();
+	Size tsz = GetSmartTextSize(label, font);
+	int ty = (sz.cy - tsz.cy) / 2;
+	int iy = (tsz.cy - isz.cy) / 2 + ty;
+	bool ds = !IsShowEnabled();
+	int q = GetVisualState();
+	int g = (!notnull || threestate) && IsNull(option) ? CtrlsImg::I_O2
+	                                                   : option == 1 ? CtrlsImg::I_O1
+	                                                                 : CtrlsImg::I_O0;
+	if(switchimage)
+		g = option ? CtrlsImg::I_S1 : CtrlsImg::I_S0;
+	w.DrawImage(0, iy, CtrlsImg::Get(g + q));
+	DrawSmartText(w, isz.cx + 4, ty, tsz.cx, label, font,
+	              ds || IsReadOnly() ? SColorDisabled : SColorText,
+	              VisibleAccessKeys() ? accesskey : 0);
+	if(HasFocus())
+		DrawFocus(w, RectC(isz.cx + 2, ty - 1, tsz.cx + 3, tsz.cy + 2) & sz);
+}
+
+void   Option::SetData(const Value& data) {
+	Set(IsString(data) ? String(data) == "1" ? 1
+	                                         : IsNull(data) ? (notnull ? 0 : int(Null)) : 0
+	                   : notnull ? Nvl((int)data, 0) : (int)data);
+}
+
+Value  Option::GetData() const {
+	return (int) option;
+}
+
+void  Option::PerformAction() {
+	if(option == 0)
+		option = threestate ? Null : 1;
+	else
+	if(option == 1)
+		option = 0;
+	else
+		option = 1;
+	UpdateAction();
+	RefreshPush();
+}
+
+void  Option::Set(int b) {
+	if(b != option) {
+		option = b;
+		Update();
+		RefreshPush();
+	}
+}
+
+Option::Option() {
+	option = 0;
+	notnull = true;
+	switchimage = threestate = false;
+	blackedge = false;
+	Transparent();
+	font = StdFont();
+}
+
+Option::~Option() {}
+
+// --------
+
+ButtonOption::ButtonOption()
+{
+	option = push = false;
+	style = NULL;
+	Transparent();
+}
+
+void ButtonOption::Serialize(Stream& s) {
+	int version = 0;
+	s / version;
+	bool b = Get();
+	s % b;
+	Set(b);
+	if(s.IsLoading())
+		Refresh();
+}
+
+void  ButtonOption::Paint(Draw& w) {
+	Size sz = GetSize();
+	Size isz = image.GetSize();
+	Rect r = sz;
+	int i = !IsShowEnabled() ? CTRL_DISABLED :
+	         push ? CTRL_PRESSED :
+	         HasMouse() || HasFocus() ? CTRL_HOT :
+	         CTRL_NORMAL;
+	if(option) i = CTRL_PRESSED;
+	ChPaint(w, sz, style ? style->look[i] : GetButtonStyle(this)->look[i]);
+	Point p = r.CenterPos(image.GetSize());
+	w.DrawImage(p.x, p.y, DisabledImage((option && !IsNull(image1)) ? image1 : image, !IsEnabled()));
+}
+
+void  ButtonOption::LeftDown(Point, dword) {
+	push = true;
+	Refresh();
+}
+
+void  ButtonOption::LeftUp(Point, dword) {
+	option = !option;
+	push = false;
+	UpdateActionRefresh();
+}
+
+void  ButtonOption::MouseMove(Point, dword flags) {
+	bool p = !!(flags & K_MOUSELEFT);
+	if(push != p) {
+		push = p;
+		Refresh();
+	}
+}
+
+void  ButtonOption::MouseEnter(Point, dword) {
+	Refresh();
+}
+
+void  ButtonOption::MouseLeave() {
+	if(push)
+		push = false;
+	Refresh();
+}
+
+void  ButtonOption::SetData(const Value& v)
+{
+	Set(IsNull(v) ? 0 : IsString(v) ? String(v) == "1" : (int)v);
+}
+
+Value ButtonOption::GetData() const
+{
+	return (int)Get();
+}
+
+// --------------------
+
+DataPusher::DataPusher(const Convert& convert, const Display& display)
+: convert(&convert), display(&display)
+{
+	SetFrame(EditFieldFrame());
+}
+
+DataPusher::DataPusher(const Display& display)
+: convert(&NoConvert()), display(&display)
+{
+	SetFrame(EditFieldFrame());
+}
+
+DataPusher::~DataPusher() {}
+
+void DataPusher::PerformAction()
+{
+	WhenPreAction();
+	DoAction();
+}
+
+void DataPusher::DoAction()
+{
+	Action();
+}
+
+Value DataPusher::GetData() const
+{
+	return data;
+}
+
+void DataPusher::SetData(const Value& value)
+{
+	if(value != data) {
+		data = value;
+		UpdateRefresh();
+	}
+}
+
+void DataPusher::Paint(Draw& draw)
+{
+	Rect rc = GetSize();
+	Color paper = (IsPush() ? Blend(SColorHighlight, SColorFace, 235)
+	                        : IsShowEnabled() && !IsReadOnly() ? SColorPaper : SColorFace);
+	draw.DrawRect(rc, paper);
+	rc.Deflate(2, 1);
+	if(IsPush() && GUI_GlobalStyle() < GUISTYLE_XP)
+		rc += Size(1, 1);
+	draw.Clip(rc);
+	display -> Paint(draw, rc, convert -> Format(data),
+		(IsEnabled() ? SColorText : SColorDisabled), Color(paper),
+		(HasFocus() ? Display::FOCUS : 0) | (IsReadOnly() ? Display::READONLY : 0));
+	draw.End();
+	if(HasFocus())
+		DrawFocus(draw, GetSize());
+}
+
+void DataPusher::SetDataAction(const Value& value)
+{
+	SetData(value);
+	UpdateActionRefresh();
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/CtrlLib/COPYING b/uppsrc/CtrlLib/COPYING
new file mode 100644
index 000000000..33aa39102
--- /dev/null
+++ b/uppsrc/CtrlLib/COPYING
@@ -0,0 +1,30 @@
+Copyright (C) 2005 Mirek Fidler, Tomas Rylek and various contributors (see AUTHORS)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to
+deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies of the Software and its Copyright notices. In addition publicly
+documented acknowledgment must be given that this software has been used if no
+source code of this software is made available publicly. This includes
+acknowledgments in either Copyright notices, Manuals, Publicity and Marketing
+documents or any documentation provided with any product containing this
+software. This License does not apply to any software that links to the
+libraries provided by this software (statically or dynamically), but only to
+the software provided.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+-----------
+
+Please see the COPYING.PLAIN for a plain-english explanation of this notice
+and it's intent.
diff --git a/uppsrc/CtrlLib/COPYING-PLAIN b/uppsrc/CtrlLib/COPYING-PLAIN
new file mode 100644
index 000000000..770a8132f
--- /dev/null
+++ b/uppsrc/CtrlLib/COPYING-PLAIN
@@ -0,0 +1,33 @@
+Plain English Copyright Notice
+
+This file is not intended to be the actual License. The reason this file
+exists is that we here are programmers and engineers. We aren't lawyers. We
+provide licenses that we THINK say the right things, but we have our own
+intentions at heart. This is a plain-english explanation of what those
+intentions are, and if you follow them you will be within the "spirit" of
+the license.
+
+The intent is for us to enjoy writing software that is useful to us (the
+AUTHORS) and allow others to use it freely and also benefit from the work we
+put into making it. We don't want to restrict others using it. They should
+not *HAVE* to make the source code of the applications they write that
+simply link to these libraries (be that statically or dynamically), or for
+them to be limited as to what license they choose to use (be it open, closed
+or anything else). But we would like to know you are using these libraries.
+We simply would like to know that it has been useful to someone. This is why
+we ask for acknowledgement of some sort.
+
+You can do what you want with the source of this software - it doesn't
+matter. We still have it here for ourselves and it is open and free to use
+and download and play with. It can't be taken away. We don't really mind what
+you do with the source to your software. We would simply like to know that
+you are using it - especially if it makes it to a commerical product. If you
+simply e-mail all the AUTHORS (see COPYING and AUTHORS files) telling us, and
+then make sure you include a paragraph or page in the manual or in the "About.."
+box for the product with the copyright notice and state that you used this
+software, we will be very happy. If you want to contribute back modifications
+and fixes you may have made we will welcome those too with open arms (generally).
+If you want help with changes needed, ports needed or features to be added,
+arrangements can be easily made with some dialogue.
+
+Mirek Fidler <cxl@ntllib.org>
diff --git a/uppsrc/CtrlLib/Ch.cpp b/uppsrc/CtrlLib/Ch.cpp
new file mode 100644
index 000000000..608216780
--- /dev/null
+++ b/uppsrc/CtrlLib/Ch.cpp
@@ -0,0 +1,91 @@
+#include "CtrlLib.h"
+
+
+NAMESPACE_UPP
+
+#define LLOG(x)  // RLOG(x)
+
+#define IMAGECLASS CtrlsImg
+#define IMAGEFILE <CtrlLib/Ctrls.iml>
+#include <Draw/iml_source.h>
+
+#define IMAGECLASS ClassicCtrlsImg
+#define IMAGEFILE <CtrlLib/ClassicCtrls.iml>
+#include <Draw/iml_source.h>
+
+void ChSysInit();
+
+void ChStdSkin()
+{
+	ChSysInit();
+	GUI_GlobalStyle_Write(GUISTYLE_XP);
+	ColoredOverride(CtrlsImg::Iml(), CtrlsImg::Iml());
+}
+
+void SbWc(Value *look)
+{
+	Color wc = Blend(SColorFace(), SColorPaper(), 170);
+	look[CTRL_NORMAL] = wc;
+	look[CTRL_HOT] = wc;
+	look[CTRL_PRESSED] = SColorText();
+	look[CTRL_DISABLED] = wc;
+}
+
+void ChClassicSkin()
+{
+	LLOG("ChInitWinClassic");
+	ChSysInit();
+	GUI_GlobalStyle_Write(GUISTYLE_CLASSIC);
+
+	ColoredOverride(CtrlsImg::Iml(), ClassicCtrlsImg::Iml());
+	for(int q = 0; q < 4; q++)
+		CtrlsImg::Set(CtrlsImg::I_HTB + q, AdjustColors(CtrlsImg::Get(ClassicCtrlsImg::I_B + q)));
+
+	{
+		Button::Style& s = Button::StyleNormal().Write();
+		s.monocolor[0] = s.monocolor[1] = s.monocolor[2] = s.monocolor[3] = SColorText();
+		s.pressoffset.x = s.pressoffset.y = 1;
+		s.transparent = false;
+	}
+
+	{
+		ScrollBar::Style& s = ScrollBar::StyleDefault().Write();
+		SbWc(s.hupper);
+		SbWc(s.hlower);
+		SbWc(s.vupper);
+		SbWc(s.vlower);
+		for(int i = 0; i < 4; i++)
+			s.vthumb[i] = s.hthumb[i] = Button::StyleNormal().look[i];
+	}
+
+	{
+		MultiButton::Style& s = MultiButton::StyleDefault().Write();
+		s.border = s.trivialborder = 2;
+	}
+
+	{
+		SeparatorCtrl::Style& s = SeparatorCtrl::StyleDefault().Write();
+		s.l1 = SColorShadow();
+		s.l2 = SColorLight();
+	}
+
+	{
+		MenuBar::Style& s = MenuBar::StyleDefault().Write();
+		s.popupbody = SColorFace();
+	}
+
+	LabelBoxTextColor_Write(SColorText());
+}
+
+#ifdef PLATFORM_X11
+
+void ChSysInit()
+{
+	CtrlImg::Reset();
+	CtrlsImg::Reset();
+	ChReset();
+}
+
+#endif
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/CtrlLib/Ch.h b/uppsrc/CtrlLib/Ch.h
new file mode 100644
index 000000000..5698c7ed1
--- /dev/null
+++ b/uppsrc/CtrlLib/Ch.h
@@ -0,0 +1,3 @@
+void ChStdSkin();
+void ChClassicSkin();
+void ChHostSkin();
diff --git a/uppsrc/CtrlLib/ChGtk.cpp b/uppsrc/CtrlLib/ChGtk.cpp
new file mode 100644
index 000000000..72f4e0e59
--- /dev/null
+++ b/uppsrc/CtrlLib/ChGtk.cpp
@@ -0,0 +1,1225 @@
+#include "CtrlLib.h"
+
+#ifdef PLATFORM_X11
+
+#ifdef flagNOGTK
+
+NAMESPACE_UPP
+
+void ChHostSkin() {}
+
+END_UPP_NAMESPACE
+
+#else
+
+#define Time    XTime
+#define Font    XFont
+#define Display XDisplay
+#define Picture XPicture
+
+#include <limits.h>
+#include <gtk/gtk.h>
+#include <gdk/gdkx.h>
+
+#undef Picture
+#undef Time
+#undef Font
+#undef Display
+
+NAMESPACE_UPP
+
+#if defined(_DEBUG)// && 0
+#include <plugin/png/png.h>
+
+void LOGPNG(const Image& m)
+{
+	static int i;
+	PNGEncoder png;
+	png.SaveFile(ConfigFile(AsString(i++) + ".png"), m);
+}
+
+#else
+
+#define LOGPNG(a)
+
+#endif
+
+GtkWidget *gtk__parent()
+{
+	static GtkWidget *p;
+	if(!p) {
+		p = gtk_window_new(GTK_WINDOW_POPUP);
+		gtk_widget_realize(p);
+	}
+	return p;
+}
+
+GtkWidget *Setup(GtkWidget *widget)
+{
+	static GtkWidget *fl;
+	if (!fl) {
+		fl = gtk_fixed_new();
+		gtk_container_add(GTK_CONTAINER(gtk__parent()), fl);
+		gtk_widget_realize(fl);
+	}
+
+	gtk_fixed_put(GTK_FIXED(fl), widget, 0, 0);
+	gtk_widget_realize(widget);
+	gtk_widget_show(widget);
+	return widget;
+}
+
+enum {
+	GTK_BOX,
+	GTK_CHECK,
+	GTK_OPTION,
+	GTK_ARROW,
+	GTK_SLIDER,
+	GTK_ICON,
+	GTK_EXT,
+	GTK_SHADOW,
+	GTK_FOCUS,
+	GTK_FLATBOX,
+	GTK_BGBOX,
+	GTK_THEMEICON,
+
+	GTK_MARGIN1 = 0x0010,
+	GTK_MARGIN2 = 0x0020,
+	GTK_MARGIN3 = 0x0030,
+	GTK_MARGIN4 = 0x0040,
+	GTK_XMARGIN = 0x0080,
+
+	GTK_VAL1    = 0x0100,
+	GTK_VAL2    = 0x0200,
+	GTK_VAL3    = 0x0300,
+	GTK_VAL4    = 0x0400,
+
+	GTK_TOP     = 0x1000,
+	GTK_VCENTER = 0x2000,
+	GTK_BOTTOM  = 0x3000,
+	GTK_LEFT    = 0x4000,
+	GTK_HCENTER = 0x5000,
+	GTK_RIGHT   = 0x6000,
+
+	GTK_DEFLATE1 = 0x10000,
+	GTK_DEFLATE2 = 0x20000,
+	GTK_DEFLATE3 = 0x30000,
+	GTK_DEFLATE4 = 0x40000,
+
+	GTK_RANGEA =  0x100000,
+	GTK_RANGEB =  0x200000,
+	GTK_RANGEC =  0x400000,
+	GTK_RANGED =  0x800000,
+};
+
+static Image sLastImage;
+
+struct GtkRangeLayout_ {
+  GdkRectangle stepper_a;
+  GdkRectangle stepper_b;
+  GdkRectangle stepper_c;
+  GdkRectangle stepper_d;
+};
+
+Image GetGTK(GtkWidget *widget, int state, int shadow, const char *detail, int type, int cx, int cy)
+{
+	MemoryIgnoreLeaksBlock __;
+	GdkPixbuf *icon;
+	if(type == GTK_ICON || type == GTK_THEMEICON) {
+		gtk_widget_set_sensitive(widget, 1);
+		gtk_widget_set_state(widget, GTK_STATE_NORMAL);
+		if(type == GTK_THEMEICON)
+			icon = gtk_icon_theme_load_icon(gtk_icon_theme_get_default(), detail,
+			                                (GtkIconSize)state, (GtkIconLookupFlags)0, NULL);
+		else
+			icon = gtk_widget_render_icon(widget, detail, (GtkIconSize)state, NULL);
+		if(!icon) return Null;
+		cx = gdk_pixbuf_get_width(icon);
+		cy = gdk_pixbuf_get_height(icon);
+	}
+	else {
+		gtk_widget_set_sensitive(widget, state != 4);
+		gtk_widget_set_state(widget, (GtkStateType)state);
+	}
+	Rect rect;
+	int ht = type & 0xf000;
+	rect.top = ht == GTK_VCENTER ? cy : ht == GTK_BOTTOM ? 2 * cy : 0;
+	rect.left = ht == GTK_HCENTER ? cx : ht == GTK_RIGHT ? 2 * cx : 0;
+	rect.SetSize(cx, cy);
+	if(ht >= GTK_LEFT && ht <= GTK_RIGHT)
+		cx *= 3;
+	if(ht >= GTK_TOP && ht <= GTK_BOTTOM)
+		cy *= 3;
+	type &= ~0xf000;
+	if(GTK_IS_RANGE(widget)) {
+		GtkRange *r = GTK_RANGE(widget);
+		r->has_stepper_a = r->has_stepper_b = r->has_stepper_c = r->has_stepper_d = 1;
+		GdkRectangle cr;
+		cr.x = rect.left;
+		cr.y = rect.top;
+		cr.width = 0;
+		cr.height = 0;
+		GtkRangeLayout_ *rl = (GtkRangeLayout_ *)r->layout;
+		rl->stepper_a = rl->stepper_b = rl->stepper_c = rl->stepper_d = cr;
+		cr.width = rect.GetWidth();
+		cr.height = rect.GetHeight();
+		if(type & GTK_RANGEA) rl->stepper_a = cr;
+		if(type & GTK_RANGEB) rl->stepper_b = cr;
+		if(type & GTK_RANGEC) rl->stepper_c = cr;
+		if(type & GTK_RANGED) rl->stepper_d = cr;
+	}
+	GdkRectangle& allocation = widget->allocation;
+	allocation.x = 0;
+	allocation.y = 0;
+	allocation.width = cx;
+	allocation.height = cy;
+	Image m[2];
+	Color back = White;
+	int margin = (type >> 4) & 7;
+	for(int i = 0; i < 2; i++) {
+		ImageDraw iw(cx + 2 * margin, cy + 2 * margin);
+		iw.DrawRect(0, 0, cx + 2 * margin, cy + 2 * margin, back);
+		static GdkColormap *cm = gdk_x11_colormap_foreign_new(
+			                        gdkx_visual_get(XVisualIDFromVisual(Xvisual)), Xcolormap);
+		GdkPixmap *pixmap = gdk_pixmap_foreign_new(iw.GetDrawable());
+		gdk_drawable_set_colormap(pixmap, cm);
+		GdkRectangle cr;
+		cr.x = 0;
+		cr.y = 0;
+		cr.width = cx;
+		cr.height = cy;
+		GtkStyle *style = gtk_widget_get_style(widget);
+		int rcx = max(rect.GetWidth() - 2 * margin, 0);
+		int rcy = max(rect.GetHeight() - 2 * margin, 0);
+		int t1 = (type & 0xf00) >> 8;
+		switch(type & 15) {
+		case GTK_BGBOX:
+			gtk_style_apply_default_background(style, pixmap, TRUE, (GtkStateType)state,
+			                                   &cr, rect.left + margin, rect.top + margin, rcx, rcy);
+		case GTK_BOX:
+			gtk_paint_box(style, pixmap, (GtkStateType)state, (GtkShadowType)shadow, &cr,
+			                    widget, detail,
+			                    rect.left + margin, rect.top + margin, rcx, rcy);
+			break;
+		case GTK_FLATBOX:
+			gtk_paint_flat_box(style, pixmap, (GtkStateType)state, (GtkShadowType)shadow, &cr,
+			                    widget, detail,
+			                    rect.left + margin, rect.top + margin, rcx, rcy);
+			break;
+		case GTK_CHECK:
+			gtk_paint_check(style, pixmap, (GtkStateType)state, (GtkShadowType)shadow, &cr,
+			                      widget, detail,
+			                      rect.left + margin, rect.top + margin, rcx, rcy);
+			break;
+		case GTK_OPTION:
+			gtk_paint_option(style, pixmap, (GtkStateType)state, (GtkShadowType)shadow, &cr,
+			                       widget, detail,
+			                       rect.left + margin, rect.top + margin, rcx, rcy);
+			break;
+		case GTK_ARROW:
+			gtk_paint_arrow(style, pixmap, (GtkStateType)state, (GtkShadowType)shadow, &cr,
+			                      widget, detail, (GtkArrowType)t1, 1,
+			                      rect.left + margin, rect.top + margin, rcx, rcy);
+			break;
+		case GTK_SLIDER:
+			gtk_paint_slider(style, pixmap, (GtkStateType)state, (GtkShadowType)shadow, &cr,
+			                       widget, detail,
+			                       rect.left + margin, rect.top + margin, rcx, rcy,
+			                       (GtkOrientation)t1);
+			break;
+		case GTK_ICON:
+		case GTK_THEMEICON:
+			gdk_draw_pixbuf(pixmap, NULL, icon, 0, 0, 0, 0, -1, -1, (GdkRgbDither)0, 0, 0);
+			break;
+		case GTK_EXT:
+			gtk_paint_extension(style, pixmap, (GtkStateType)state, (GtkShadowType)shadow, &cr,
+			                    widget, (gchar *)detail,
+			                    rect.left + margin, rect.top + margin, rcx, rcy,
+			                    (GtkPositionType)t1);
+			break;
+		case GTK_SHADOW:
+		    gtk_paint_shadow(style, pixmap, (GtkStateType)state, (GtkShadowType)shadow, &cr,
+			                 widget, (gchar *)detail,
+			                 rect.left + margin, rect.top + margin, rcx, rcy);
+			break;
+		case GTK_FOCUS:
+		    gtk_paint_focus(style, pixmap, (GtkStateType)state, &cr,
+			                widget, (gchar *)detail,
+			                rect.left + margin, rect.top + margin, rcx, rcy);
+			break;
+		}
+		g_object_unref(pixmap);
+		m[i] = Crop(iw, rect.Inflated(margin));
+		back = Black;
+	}
+	if(type == GTK_ICON)
+		g_object_unref(icon);
+	sLastImage = RecreateAlpha(m[0], m[1]);
+	return sLastImage;
+}
+
+struct ChGtkI : Moveable<ChGtkI> {
+	GtkWidget  *widget;
+	const char *detail;
+	int         type;
+};
+
+Vector<ChGtkI>& ChGtkIs()
+{
+	static Vector<ChGtkI> x;
+	return x;
+}
+
+GtkWidget *ChGtkLast()
+{
+	return ChGtkIs().Top().widget;
+}
+
+const char *ChGtkLastDetail()
+{
+	return ChGtkIs().Top().detail;
+}
+
+int ChGtkLastType()
+{
+	return ChGtkIs().Top().type;
+}
+
+void ChGtkNew(GtkWidget *widget, const char *detail, int type)
+{
+	if(gtk_widget_get_parent(widget) == NULL)
+		Setup(widget);
+	ChGtkI& q = ChGtkIs().Add();
+	q.widget = widget;
+	q.detail = detail;
+	q.type = type;
+}
+
+void ChGtkNew(const char *detail, int type)
+{
+	ChGtkNew(ChGtkLast(), detail, type);
+}
+
+struct GtkElement {
+	word  gtki;
+	byte  state;
+	byte  shadow;
+	Rect  reduce;
+	Rect  margins;
+};
+
+enum {
+	GTKELEMENT_TABFLAG = 0x40
+};
+
+struct GtkImageMaker : ImageMaker {
+	GtkElement e;
+	ChGtkI     eg;
+	Size       sz;
+
+	virtual String Key() const {
+		StringBuffer key;
+		key.Cat((char *)&eg.widget, sizeof(eg.widget));
+		key.Cat((char *)&eg.detail, sizeof(eg.detail));
+		key.Cat((char *)&eg.type, sizeof(eg.type));
+		key.Cat((char *)&e.gtki, sizeof(e.gtki));
+		key.Cat((char *)&e.state, sizeof(e.state));
+		key.Cat((char *)&e.shadow, sizeof(e.shadow));
+		key.Cat((char *)&sz, sizeof(sz));
+		return key;
+	}
+	virtual Image Make() const {
+		return GetGTK(eg.widget, e.state, e.shadow & 0x3f, eg.detail, eg.type, sz.cx, sz.cy);
+	}
+};
+
+Value GtkLookFn(Draw& w, const Rect& rect, const Value& v, int op)
+{
+	if(IsTypeRaw<GtkElement>(v)) {
+		const GtkElement& e = ValueTo<GtkElement>(v);
+		ChGtkI& eg = ChGtkIs()[e.gtki];
+		switch(op) {
+		case LOOK_MARGINS:
+			return e.margins;
+		case LOOK_ISOPAQUE:
+			return false;
+		}
+		if(op == LOOK_PAINT || op == LOOK_PAINTEDGE) {
+			Rect r = rect.Inflated(eg.type & GTK_XMARGIN ? 0 : (eg.type >> 4) & 7);
+			r.Deflate((eg.type >> 16) & 15);
+			if(r.IsEmpty()) return 1;
+			GtkImageMaker gm;
+			gm.e = e;
+			gm.eg = eg;
+			gm.sz = r.Size();
+			Image m;
+			if(e.shadow & 0x80) {
+				m = MakeImage(gm);
+				w.DrawImage(r.left, r.top,
+				            m, RectC(0, 0, gm.sz.cx, gm.sz.cy - 7));
+				w.DrawImage(r.left + 4, r.bottom - 7,
+				            m, RectC(4, gm.sz.cy - 7, gm.sz.cx - 8, 5));
+			}
+			else {
+				if(e.reduce.left || e.reduce.right || e.reduce.top || e.reduce.bottom) {
+					Rect rr = e.reduce;
+					rr.SetSize(gm.sz);
+					gm.sz.cx += e.reduce.left + e.reduce.right;
+					gm.sz.cy += e.reduce.top + e.reduce.bottom;
+					w.DrawImage(r.left, r.top, MakeImagePaintOnly(gm), rr);
+				}
+				else
+					w.DrawImage(r.left, r.top, MakeImagePaintOnly(gm));
+				if((e.shadow & GTKELEMENT_TABFLAG) && r.GetWidth() > 0) {
+					w.DrawRect(r.left, r.top + 3, 1, r.GetHeight() - 6, SColorLight());
+					w.DrawRect(r.right - 1, r.top + 3, 1, r.GetHeight() - 6, SColorShadow());
+				}
+			}
+			return 1;
+		}
+	}
+	return Null;
+}
+
+Value GtkMakeCh(int shadow, int state, const Rect& r, const Rect& m)
+{
+	GtkElement e;
+	e.gtki = ChGtkIs().GetCount() - 1;
+	e.shadow = shadow;
+	e.state = state;
+	e.reduce = r;
+	e.margins = m;
+	return RawToValue(e);
+}
+
+Value GtkMakeCh(int shadow, int state, const Rect& r)
+{
+	return GtkMakeCh(shadow, state, r, Rect(0, 0, 0, 0));
+}
+
+Value GtkMakeCh(int shadow, int state)
+{
+	return GtkMakeCh(shadow, state, Rect(0, 0, 0, 0));
+}
+
+void GtkCh(Value& look, int shadow, int state)
+{
+	look = GtkMakeCh(shadow, state);
+}
+
+void GtkCh(Value *look, const char *d)
+{
+	GtkCh(look[CTRL_NORMAL], d[4] - '0', d[0] - '0');
+	GtkCh(look[CTRL_HOT], d[5] - '0', d[1] - '0');
+	GtkCh(look[CTRL_PRESSED], d[6] - '0', d[2] - '0');
+	GtkCh(look[CTRL_DISABLED], d[7] - '0', d[3] - '0');
+}
+
+void GtkCh(Value *look)             { GtkCh(look, "02140000"); }
+void GtkChButton(Value *look)       { GtkCh(look, "02142212"); }
+void GtkChSlider(Value *look)       { GtkCh(look, "02242222"); }
+void GtkChTrough(Value *look)       { GtkCh(look, "11141111"); }
+
+void GtkChWith(Value& look, int shadow, int state, const Image& img, Color c, Point offset = Point(0, 0))
+{
+	GtkElement e;
+	e.gtki = ChGtkIs().GetCount() - 1;
+	e.shadow = shadow;
+	e.state = state;
+	look = ChLookWith(GtkMakeCh(shadow, state), img, c, offset);
+}
+
+void GtkChWith(Value *look, const char *d, const Image& img, Point offset = Point(0, 0))
+{
+	GtkChWith(look[CTRL_NORMAL], d[4] - '0', d[0] - '0', img, ButtonMonoColor(0));
+	GtkChWith(look[CTRL_HOT], d[5] - '0', d[1] - '0', img, ButtonMonoColor(1));
+	GtkChWith(look[CTRL_PRESSED], d[6] - '0', d[2] - '0', img, ButtonMonoColor(2), offset);
+	GtkChWith(look[CTRL_DISABLED], d[7] - '0', d[3] - '0', img, ButtonMonoColor(3));
+}
+
+void GtkChButtonWith(Value *look, const Image& img) { GtkChWith(look, "02142222", img); }
+
+void GtkChArrow(Value *look, const Image& img, Point offset = Point(0, 0))
+{
+	GtkChWith(look, "02142212", img, offset);
+}
+
+int  GtkInt(GtkWidget *widget, const char *id)
+{
+	int x = 0;
+	gtk_widget_style_get(widget, id, &x, NULL);
+	return x;
+}
+
+int  GtkInt(const char *id)
+{
+	return GtkInt(ChGtkLast(), id);
+}
+
+void GtkIml(int uii, GtkWidget *w, int shadow, int state, const char *detail, int type, int cx, int cy)
+{
+	CtrlsImg::Set(uii, GetGTK(w, state, shadow, detail, type, cx, cy));
+}
+
+void GtkIml(int uii, GtkWidget *w, int shadow, const char *detail, int type, int cx, int cy)
+{
+	GtkIml(uii + 0, w, shadow, 0, detail, type, cx, cy);
+	GtkIml(uii + 1, w, shadow, 2, detail, type, cx, cy);
+	GtkIml(uii + 2, w, shadow, 1, detail, type, cx, cy);
+	GtkIml(uii + 3, w, shadow, 4, detail, type, cx, cy);
+}
+
+Color ChGtkColor(int ii, GtkWidget *widget)
+{
+	GdkColor cc = ((GtkStyle *)gtk_widget_get_style(widget))->fg[ii];
+	return Color(cc.red >> 8, cc.green >> 8, cc.blue >> 8);
+}
+
+void ChGtkColor(Color& c, int ii)
+{
+	c = ChGtkColor(ii, ChGtkLast());
+}
+
+void ChGtkColor(Color *c, int ii)
+{
+	ChGtkColor(c[0], ii + 0);
+	ChGtkColor(c[1], ii + 2);
+	ChGtkColor(c[2], ii + 1);
+	ChGtkColor(c[3], ii + 4);
+}
+
+Image GtkImage(const char *id, int size, int maxh = INT_MAX)
+{
+	if(maxh != INT_MAX)
+		maxh = Ctrl::VertLayoutZoom(maxh);
+	Image m = GetGTK(gtk__parent(), size, 0, id, GTK_ICON, 0, 0);
+	if(!IsNull(m)) {
+		Size sz = m.GetSize();
+		if(sz.cy > maxh && sz.cy)
+			m = Rescale(m, sz.cx * maxh / sz.cy, maxh);
+	}
+	return m;
+}
+
+void ChCtrlImg(int ii, const char *id, int size, int maxh = INT_MAX)
+{
+	Image m = GtkImage(id, size, maxh);
+	if(!IsNull(m))
+		CtrlImg::Set(ii, m);
+}
+
+enum {
+	GTK_BOTTOMLINE = 0x100
+};
+
+Image GtkChImgLook(int shadow, int state, int kind)
+{
+	Image m = GetGTK(ChGtkLast(), state, shadow, ChGtkLastDetail(), ChGtkLastType(), 32, 32);
+	int g = max(1, ImageMargin(m, 4, 10));
+	if((kind & 7) == 1)
+		m = WithHotSpots(Crop(m, 0, g, 32 - g, 32 - 2 * g), g, 0, 32 - 2 * g - 1, 0);
+	if((kind & 7) == 2)
+		m = WithHotSpots(Crop(m, g, g, 32 - g, 32 - 2 * g), 0, 0, 32 - 2 * g - g - 1, 0);
+	else
+		m = WithHotSpot(m, g, g);
+	if((kind & GTK_BOTTOMLINE) && m.GetHeight() > 0) {
+		ImageBuffer ib(m);
+		RGBA c = SColorShadow();
+		for(int i = 1; i < ib.GetWidth(); i++)
+			ib[ib.GetHeight() - 1][i] = c;
+		m = ib;
+	}
+	return m;
+}
+
+void GtkChImgWith(Value& look, int shadow, int state, const Image& img, Color c, int kind, Point offset = Point(0, 0))
+{
+	Value m = GtkChImgLook(shadow, state, kind);
+	look = IsNull(img) ? m : ChLookWith(m, img, c, offset);
+}
+
+void GtkChImgWith(Value *look, const Image& img, int kind, Point offset = Point(0, 0))
+{
+	GtkChImgWith(look[CTRL_HOT], 2, 2, img, ButtonMonoColor(1), kind);
+	GtkChImgWith(look[CTRL_PRESSED], 1, 1, img, ButtonMonoColor(2), kind, offset);
+	GtkChImgWith(look[CTRL_DISABLED], 2, 4, img, ButtonMonoColor(3), kind);
+	GtkChImgWith(look[CTRL_NORMAL], 2, 0, img, ButtonMonoColor(0), kind);
+}
+
+bool IsEmptyImage(const Image& m)
+{
+	const RGBA *s = ~m;
+	const RGBA *e = ~m + m.GetLength();
+	while(s < e) {
+		if(s->a)
+			return false;
+		s++;
+	}
+	return true;
+}
+
+Image GtkThemeIcon(const char *name, int size)
+{
+	return GetGTK(gtk__parent(), size, 0, name, GTK_THEMEICON, 0, 0);
+}
+
+int GtkStyleInt(const char *name)
+{
+	int h = Null;
+	g_object_get(gtk_settings_get_default(), name, &h, NULL);
+	return h;
+}
+
+String GtkStyleString(const char *name)
+{
+	const char *h = "";
+	g_object_get(gtk_settings_get_default(), name, &h, NULL);
+	return h;
+}
+
+extern int    gtk_antialias;
+extern int    gtk_hinting;
+extern String gtk_hintstyle;
+extern String gtk_rgba;
+
+void ChHostSkin()
+{
+	MemoryIgnoreLeaksBlock __;
+	static struct { void (*set)(Color); int ii; } col[] = {
+		{ SColorPaper_Write, 6*5 + 0 },
+		{ SColorFace_Write, 1*5 + 0 },
+		{ SColorText_Write, 5*5 + 0 },
+		{ SColorHighlight_Write, 6*5 + 3 },
+		{ SColorHighlightText_Write, 5*5 + 3 },
+		{ SColorMenu_Write, 6*5 + 0 },
+		{ SColorMenuText_Write, 5*5 + 0 },
+		{ SColorDisabled_Write, 5*5 + 4 },
+		{ SColorLight_Write, 2*5 + 0 },
+		{ SColorShadow_Write, 3*5 + 0 },
+	};
+	for(int i = 0; i < __countof(col); i++)
+		(*col[i].set)(ChGtkColor(col[i].ii, gtk__parent()));
+
+	CtrlsImg::Reset();
+	ColoredOverride(CtrlsImg::Iml(), CtrlsImg::Iml());
+
+	ChLookFn(GtkLookFn);
+
+	String engine = GtkStyleString("gtk-theme-name");
+
+	int fontname = Font::ARIAL;
+	int fontheight = 13;
+	bool bold = false;
+	bool italic = false;
+
+	const char *font_name = GtkStyleString("gtk-font-name");
+	int xdpi = Nvl(GtkStyleInt("gtk-xft-dpi"), 72 * 1024);
+
+	gtk_antialias = Nvl(GtkStyleInt("gtk-xft-antialias"), -1);
+	gtk_hinting = Nvl(GtkStyleInt("gtk-xft-hinting"), -1);
+	gtk_hintstyle = GtkStyleString("gtk-xft-hintstyle");
+	gtk_rgba = GtkStyleString("gtk-xft-rgba");
+
+	const char *q = strrchr(font_name, ' ');
+	if(q) {
+		int h = atoi(q);
+		if(h)
+			fontheight = h;
+		String face(font_name, q);
+		fontname = Font::FindFaceNameIndex(face);
+
+		if(fontname == 0) {
+			for(;;) {
+				const char *q = strrchr(face, ' ');
+				if(!q) break;
+				const char *s = q + 1;
+				if(stricmp(s, "Bold") == 0 || stricmp(s, "Heavy") == 0)
+					bold = true;
+				else
+				if(stricmp(s, "Italic") == 0 || stricmp(s, "Oblique") == 0)
+					italic = true;
+				else
+				if(stricmp(s, "Regular") == 0 || stricmp(s, "Light") || stricmp(s, "Medium"))
+					;
+				else
+					continue;
+				face = String(~face, q);
+			}
+			fontname = Font::FindFaceNameIndex(face);
+			if(fontname == 0)
+				if(ToUpper(face[0]) == 'M')
+					fontname = Font::COURIER;
+				else
+				if(ToUpper(face[0]) == 'S' && ToUpper(face[1]) == 'e')
+					fontname = Font::ROMAN;
+				else
+					fontname = Font::ARIAL;
+		}
+	}
+
+	Draw::SetStdFont(Font(fontname, (fontheight * xdpi + 512*72) / (1024*72))
+	                 .Bold(bold).Italic(italic));
+
+	ColoredOverride(CtrlsImg::Iml(), CtrlsImg::Iml());
+
+	Color fc = Blend(SColorHighlight, SColorShadow);
+
+	ChGtkIs().Clear();
+	GtkWidget *w = Setup(gtk_radio_button_new(NULL));
+	int is = GtkInt(w, "indicator-size") + 2;
+	GTK_TOGGLE_BUTTON(w)->active = false;
+	GTK_TOGGLE_BUTTON(w)->inconsistent = false;
+	GtkIml(CtrlsImg::I_S0, w, 2, "radiobutton", GTK_OPTION|GTK_MARGIN1, is, is);
+	GTK_TOGGLE_BUTTON(w)->active = true;
+	GtkIml(CtrlsImg::I_S1, w, 1, "radiobutton", GTK_OPTION|GTK_MARGIN1, is, is);
+	gtk_widget_destroy(w);
+
+	w = Setup(gtk_check_button_new());
+	GTK_TOGGLE_BUTTON(w)->active = false;
+	GTK_TOGGLE_BUTTON(w)->inconsistent = false;
+	GtkIml(CtrlsImg::I_O0, w, 2, "checkbutton", GTK_CHECK|GTK_MARGIN1, is, is);
+	GTK_TOGGLE_BUTTON(w)->active = true;
+	GtkIml(CtrlsImg::I_O1, w, 1, "checkbutton", GTK_CHECK|GTK_MARGIN1, is, is);
+	GTK_TOGGLE_BUTTON(w)->active = false;
+	GTK_TOGGLE_BUTTON(w)->inconsistent = true;
+	GtkIml(CtrlsImg::I_O2, w, 3, "checkbutton", GTK_CHECK|GTK_MARGIN1, is, is);
+	gtk_widget_destroy(w);
+
+	if(engine == "Qt") {
+		for(int i = 0; i < 4; i++) {
+			Image m = CtrlsImg::Get(CtrlsImg::I_O2 + i);
+			ImageBuffer ib(m);
+			Size sz = ib.GetSize();
+			if(sz.cx > 6)
+				for(int q = -2; q <= 2; q++)
+					ib[sz.cy / 2 - 1][sz.cx / 2 - q - 1] = i == CTRL_DISABLED ? SColorDisabled() : SColorText();
+			m = ib;
+			CtrlsImg::Set(CtrlsImg::I_O2 + i, m);
+		}
+	}
+
+	Point po(0, 0);
+
+	int classiq = engine == "Redmond" || engine == "Raleigh" || engine == "Glider" || engine == "Simple";
+
+	{
+		Button::Style& s = Button::StyleNormal().Write();
+		s.overpaint = 3;
+		static GtkWidget *button = gtk_button_new();
+		ChGtkNew(button, "button", GTK_BOX|GTK_MARGIN3);
+		GtkChButton(s.look);
+
+		po.x = GtkInt("child-displacement-x");
+		po.y = GtkInt("child-displacement-y");
+
+		s.ok = GtkImage("gtk-ok", 4, 16);
+		s.cancel = GtkImage("gtk-cancel", 4, 16);
+		s.exit = GtkImage("gtk-quit", 4, 16);
+
+		ChGtkColor(s.textcolor, 0 * 5);
+		s.pressoffset = po;
+
+		Color c = SColorPaper();
+		for(int i = 0; i < 4; i++)
+			s.monocolor[i] = c.GetR() + c.GetG() + c.GetB() < 3 * 128 ? White() : Black();
+		s.monocolor[3] = Gray();
+
+		ToolBar::Style& ts = ToolBar::StyleDefault().Write();
+		GtkChButton(ts.buttonstyle.look);
+		ts.buttonstyle.look[CTRL_NORMAL] = Null;
+		ts.buttonstyle.look[CTRL_DISABLED] = Null;
+		GtkCh(ts.buttonstyle.look[CTRL_CHECKED], 1, 1);
+		GtkCh(ts.buttonstyle.look[CTRL_HOTCHECKED], 1, 1);
+
+		{
+			HeaderCtrl::Style& hs = HeaderCtrl::StyleDefault().Write();
+			if(classiq)
+				for(int i = 0; i < 4; i++)
+					hs.look[i] = s.look[i];
+			else {
+				ChGtkNew(button, "button", GTK_BOX);
+				hs.look[0] = GtkMakeCh(2|GTKELEMENT_TABFLAG, /*0*/4, Rect(6, 3, 6, 0));
+				hs.look[1] = GtkMakeCh(2|GTKELEMENT_TABFLAG, 2, Rect(6, 3, 6, 0));
+				hs.look[2] = GtkMakeCh(1|GTKELEMENT_TABFLAG, 1, Rect(6, 3, 6, 0));
+				hs.look[3] = GtkMakeCh(2|GTKELEMENT_TABFLAG, 4, Rect(6, 3, 6, 0));
+				hs.pressoffset = po.x || po.y;
+			}
+		}
+	}
+
+	{
+		Button::Style& s = Button::StyleOk().Write();
+		static GtkWidget *def_button;
+		if(!def_button) {
+			def_button = gtk_button_new();
+			Setup(def_button);
+			gtk_widget_set(def_button, "can-default", true, NULL);
+			gtk_window_set_default(GTK_WINDOW(gtk__parent()), def_button);
+			ChGtkNew(def_button, "button", GTK_BOX|GTK_MARGIN3);
+		}
+		GtkChButton(s.look);
+	}
+
+	{
+		ScrollBar::Style& s = ScrollBar::StyleDefault().Write();
+		s.through = true;
+		GtkObject *adj = gtk_adjustment_new(250, 0, 1000, 1, 1, 500);
+		static GtkWidget *vscrollbar = gtk_vscrollbar_new(GTK_ADJUSTMENT(adj));
+		ChGtkNew(vscrollbar, "slider", GTK_SLIDER|GTK_VAL1);
+		Image m = GetGTK(ChGtkLast(), 0, 0, "slider", GTK_SLIDER|GTK_VAL1, 16, 32);
+		s.thumbmin = GtkInt("min-slider-length");
+		s.barsize = GtkInt("slider-width");
+		s.arrowsize = GtkInt("stepper-size");
+
+		s.isright2 = s.isdown2 = GtkInt("has-secondary-forward-stepper");
+		s.isleft2 = s.isup2 = GtkInt("has-secondary-backward-stepper");
+
+		if(engine == "Qt") {
+			for(int i = 0; i < 6; i++)
+				CtrlsImg::Set(CtrlsImg::I_DA + i, CtrlsImg::Get(CtrlsImg::I_kDA + i));
+			int r = Null;
+			for(int i = 0; i < 4; i++) {
+				ImageDraw iw(64, 64);
+				iw.DrawRect(0, 0, 64, 64, SColorFace());
+				ChPaint(iw, Size(64, 64), Button::StyleNormal().look[i == CTRL_HOT ? CTRL_NORMAL : i]);
+				Image m = iw;
+				if(IsNull(r))
+					r = minmax(ImageMargin(m, 4, 50), 0, 2);
+				m = Rescale(Crop(m, 4, 4, 56, 56), 16, 16);
+				ChPartMaker pm(m);
+				pm.tr = pm.tl = r;
+				pm.bl = pm.br = 0;
+				s.up.look[i] = ChLookWith(pm.Make(), CtrlsImg::UA(), ButtonMonoColor(i));
+				pm.tr = pm.tl = 0;
+				pm.t = false;
+				s.down2.look[i] = ChLookWith(pm.Make(), CtrlsImg::DA(), ButtonMonoColor(i));
+				pm.t = true;
+				pm.bl = pm.br = r;
+				s.down.look[i] = ChLookWith(pm.Make(), CtrlsImg::DA(), ButtonMonoColor(i));
+				pm.br = pm.bl = 0;
+				pm.b = false;
+				s.up2.look[i] = ChLookWith(pm.Make(), CtrlsImg::UA(), ButtonMonoColor(i));
+				pm.br = pm.bl = pm.tl = pm.tr = r;
+				pm.b = true;
+				Image bm = pm.Make();
+				Button::StyleScroll().Write().look[i] = bm;
+				pm.ResetShape();
+				pm.t = pm.b = pm.l = false;
+				Image lm = pm.Make();
+				Button::StyleLeftEdge().Write().look[i] = lm;
+				pm.r = false;
+				pm.l = true;
+				Image rm = pm.Make();
+				Button::StyleEdge().Write().look[i] = rm;
+				{
+					DropList::Style& s = DropList::StyleFrame().Write();
+					s.look[i] = s.trivial[i] = s.right[i] = ChLookWith(rm, CtrlsImg::DA());
+					s.left[i] = ChLookWith(lm, CtrlsImg::DA());
+					s.pressoffset = po;
+				}
+				{
+					SpinButtons::Style& s = SpinButtons::StyleDefault().Write();
+					s.dec.look[i] = ChLookWith(rm, CtrlImg::spindown2());
+					pm.b = true;
+					s.inc.look[i] = ChLookWith(pm.Make(), CtrlImg::spinup2());
+				}
+				pm.ResetShape();
+				pm.tl = pm.bl = r;
+				pm.tr = pm.br = 0;
+				s.left.look[i] = ChLookWith(pm.Make(), CtrlsImg::LA(), ButtonMonoColor(i));
+				pm.tl = pm.bl = 0;
+				pm.l = false;
+				s.right2.look[i] = ChLookWith(pm.Make(), CtrlsImg::RA(), ButtonMonoColor(i));
+				pm.l = true;
+				pm.tl = pm.bl = 0;
+				pm.tr = pm.br = r;
+				s.right.look[i] = ChLookWith(pm.Make(), CtrlsImg::RA(), ButtonMonoColor(i));
+				pm.tr = pm.br = 0;
+				pm.r = false;
+				s.left2.look[i] = ChLookWith(pm.Make(), CtrlsImg::LA(), ButtonMonoColor(i));
+			}
+			ChGtkNew(vscrollbar, "slider", GTK_SLIDER|GTK_VAL1|GTK_MARGIN1|GTK_XMARGIN);
+			GtkChSlider(s.vthumb);
+			s.barsize += 2;
+			s.arrowsize++;
+			for(int i = 0; i < 4; i++) {
+				Image m = CtrlsImg::Get(CtrlsImg::I_SBVU + i);
+				ImageBuffer ib(m);
+				Size sz = ib.GetSize();
+				ib[0][sz.cx - 1] = ib[0][0] = SColorShadow();
+				ib.SetHotSpot(Point(0, 0));
+				ib.Set2ndSpot(Point(sz.cx - 1, 0));
+				m = ib;
+				s.vlower[i] = s.vupper[i] = m;
+				m = CtrlsImg::Get(CtrlsImg::I_SBHU + i);
+				ib = m;
+				sz = ib.GetSize();
+				ib[sz.cy - 1][0] = ib[0][0] = SColorShadow();
+				ib.SetHotSpot(Point(0, 0));
+				ib.Set2ndSpot(Point(0, sz.cy - 1));
+				m = ib;
+				s.hupper[i] = s.hlower[i] = m;
+			}
+			static GtkWidget *hscrollbar = gtk_hscrollbar_new(GTK_ADJUSTMENT(adj));
+			ChGtkNew(hscrollbar, "slider", GTK_SLIDER|GTK_MARGIN1|GTK_XMARGIN);
+			GtkChSlider(s.hthumb);
+			s.overthumb = true;
+		}
+		else {
+			GtkChSlider(s.vthumb);
+			ChGtkNew("trough", GTK_BGBOX);
+			GtkChTrough(s.vupper);
+			GtkChTrough(s.vlower);
+			bool atp = IsEmptyImage(GetGTK(ChGtkLast(), 2, 2, "vscrollbar", GTK_BOX|GTK_TOP|GTK_RANGEA, 16, 16));
+			Size asz(s.barsize / 2, s.arrowsize / 2);
+			if(engine == "Qt")
+				atp = false;
+			if(atp) {
+				ChGtkNew("vscrollbar", GTK_ARROW);
+				GtkCh(s.up.look, "02141111");
+				GtkCh(s.up2.look, "02141111");
+				ChGtkNew("vscrollbar", GTK_ARROW|GTK_VAL1);
+				GtkCh(s.down.look, "02141111");
+				GtkCh(s.down2.look, "02141111");
+
+				static GtkWidget *btn = gtk_button_new();
+				ChGtkNew(btn, "button", GTK_BOX);
+
+				GtkChButton(Button::StyleScroll().Write().look);
+				GtkChButton(Button::StyleEdge().Write().look);
+				GtkChButton(Button::StyleLeftEdge().Write().look);
+
+				{
+					DropList::Style& s = DropList::StyleFrame().Write();
+					GtkChButtonWith(s.look, CtrlsImg::DA());
+					GtkChButtonWith(s.trivial, CtrlsImg::DA());
+				}
+				{
+					SpinButtons::Style& s = SpinButtons::StyleDefault().Write();
+					GtkChButtonWith(s.inc.look, CtrlImg::spinup2());
+					GtkChButtonWith(s.dec.look, CtrlImg::spindown2());
+				}
+			}
+			else {
+				GtkIml(CtrlsImg::I_UA, ChGtkLast(), 0, 0, "vscrollbar", GTK_ARROW|GTK_TOP|GTK_RANGEA, asz.cx, asz.cy);
+				GtkIml(CtrlsImg::I_DA, ChGtkLast(), 0, 0, "vscrollbar", GTK_ARROW|GTK_VAL1|GTK_BOTTOM|GTK_RANGED, asz.cx, asz.cy);
+
+				ChGtkNew("vscrollbar", GTK_BGBOX|GTK_TOP|GTK_RANGEA);
+				GtkChArrow(s.up.look, CtrlsImg::UA(), po);
+				ChGtkNew("vscrollbar", GTK_BGBOX|GTK_BOTTOM|GTK_RANGED);
+				GtkChArrow(s.down.look, CtrlsImg::DA(), po);
+				ChGtkNew("vscrollbar", GTK_BGBOX|GTK_VCENTER|GTK_RANGEC);
+				GtkChArrow(s.up2.look, CtrlsImg::UA(), po);
+				ChGtkNew("vscrollbar", GTK_BGBOX|GTK_VCENTER|GTK_RANGEB);
+				GtkChArrow(s.down2.look, CtrlsImg::DA(), po);
+
+				ChGtkNew("vscrollbar", GTK_BOX|GTK_VCENTER|GTK_RANGEB);
+				GtkCh(Button::StyleScroll().Write().look, "02142222");
+
+				int q = !classiq;
+
+				GtkChImgWith(Button::StyleEdge().Write().look, Null, 1 * q);
+				GtkChImgWith(Button::StyleLeftEdge().Write().look, Null, 2 * q);
+
+				{
+					DropList::Style& s = DropList::StyleFrame().Write();
+					GtkChImgWith(s.look, CtrlsImg::DA(), 1 * q, po);
+					GtkChImgWith(s.trivial, CtrlsImg::DA(), 1 * q, po);
+					GtkChImgWith(s.left, CtrlsImg::DA(), 2 * q, po);
+					GtkChImgWith(s.right, CtrlsImg::DA(), 1 * q, po);
+					s.pressoffset = po;
+				}
+				{
+					SpinButtons::Style& s = SpinButtons::StyleDefault().Write();
+					GtkChImgWith(s.inc.look, q ? CtrlImg::spinup2() : CtrlImg::spinup3(), (1|GTK_BOTTOMLINE) * q, po);
+					GtkChImgWith(s.dec.look, q ? CtrlImg::spindown2() : CtrlImg::spindown3(), 1 * q, po);
+				}
+			}
+
+			int d = Diff(fc, SColorPaper());
+			for(int x = 0; x < 4; x++)
+				for(int y = 0; y < 4; y++) {
+					RGBA c = sLastImage[x][y];
+					if(c.a == 255) {
+						int dd = Diff(c, SColorPaper());
+						if(dd > d) {
+							fc = c;
+							d = dd;
+						}
+					}
+				}
+			FieldFrameColor_Write(fc);
+
+			static GtkWidget *hscrollbar = gtk_hscrollbar_new(GTK_ADJUSTMENT(adj));
+			ChGtkNew(hscrollbar, "slider", GTK_SLIDER);
+			GtkChSlider(s.hthumb);
+			ChGtkNew("trough", GTK_BGBOX);
+			GtkChTrough(s.hupper);
+			GtkChTrough(s.hlower);
+			if(atp) {
+				ChGtkNew("hscrollbar", GTK_ARROW|GTK_VAL2);
+				GtkCh(s.left.look, "02141111");
+				GtkCh(s.left2.look, "02141111");
+				ChGtkNew("hscrollbar", GTK_ARROW|GTK_VAL3);
+				GtkCh(s.right.look, "02141111");
+				GtkCh(s.right2.look, "02141111");
+			}
+			else {
+				GtkIml(CtrlsImg::I_LA, ChGtkLast(), 0, 0, "hscrollbar", GTK_ARROW|GTK_VAL2|GTK_LEFT|GTK_RANGEA, asz.cy, asz.cx);
+				GtkIml(CtrlsImg::I_RA, ChGtkLast(), 0, 0, "hscrollbar", GTK_ARROW|GTK_VAL3|GTK_RIGHT|GTK_RANGED, asz.cy, asz.cx);
+				ChGtkNew("hscrollbar", GTK_BGBOX|GTK_LEFT|GTK_RANGEA);
+				GtkChArrow(s.left.look, CtrlsImg::LA(), po);
+				ChGtkNew("hscrollbar", GTK_BGBOX|GTK_VCENTER|GTK_RANGEC);
+				GtkChArrow(s.left2.look, CtrlsImg::LA(), po);
+				ChGtkNew("hscrollbar", GTK_BGBOX|GTK_VCENTER|GTK_RANGEB);
+				GtkChArrow(s.right2.look, CtrlsImg::RA());
+				ChGtkNew("hscrollbar", GTK_BGBOX|GTK_RIGHT|GTK_RANGED);
+				GtkChArrow(s.right.look, CtrlsImg::RA(), po);
+			}
+
+			gtk_object_sink(adj);
+
+			adj = gtk_adjustment_new(0, 0, 1000, 1, 1, 500);
+			w = gtk_vscrollbar_new(NULL);
+			Setup(w);
+			s.overthumb = m != GetGTK(w, 0, 0, "slider", GTK_SLIDER|GTK_VAL1, 16, 32) && engine != "Qt";
+			gtk_widget_destroy(w);
+			gtk_object_sink(adj);
+
+		}
+	}
+
+	if(engine != "Qt")
+	{
+		TabCtrl::Style& s = TabCtrl::StyleDefault().Write();
+		static GtkWidget *tabctrl = gtk_notebook_new();
+		ChGtkNew(tabctrl, "tab", GTK_EXT|GTK_VAL3|GTK_MARGIN3);
+		ImageBuffer ib(9, 9);
+		ImageBuffer ib1(9, 9);
+		Image m = GetGTK(tabctrl, 0, 2, "tab", GTK_EXT|GTK_VAL3, 12, 24);
+		for(int i = 0; i < 5; i++) {
+			RGBA *t = ~ib + i * 9 + i;
+			RGBA *t1 = ~ib1 + i * 9 + i;
+			for(int n = 9 - 2 * i; n--; t += 9, t1 += 9) {
+				Fill(t, m[21][i], 9 - 2 * i);
+				Fill(t1, m[21][11 - i], 9 - 2 * i);
+			}
+		}
+		{
+			RGBA *t = ~ib + 9 + 8;
+			RGBA *t1 = ~ib1 + 9 + 8;
+			for(int i = 1; i < 9; i++) {
+				memcpy(t, t1, i * sizeof(RGBA));
+				t += 9 - 1;
+				t1 += 9 - 1;
+			}
+		}
+		ib.SetHotSpot(Point(4, 4));
+		s.body = Image(ib);
+		GtkCh(s.normal[0], 2, 1);
+		GtkCh(s.normal[1], 2, 1);
+		GtkCh(s.normal[2], 0x82, 0);
+		GtkCh(s.normal[3], 2, 1);
+		for(int i = 0; i < 4; i++)
+			s.first[i] = s.last[i] = s.both[i] = s.normal[i];
+		s.margin = 0;
+
+		s.sel = Rect(0, 0, 0, 4);
+		s.extendleft = 2;
+	}
+
+	int efm = 0;
+	{
+		EditField::Style& s = EditField::StyleDefault().Write();
+		Image img;
+		for(int i = 0; i < 4; i++) {
+			GtkWidget *w = Setup(gtk_entry_new());
+			if(i == CTRL_PRESSED)
+				GTK_WIDGET_FLAGS (w) |= GTK_HAS_FOCUS;
+			if(i == CTRL_DISABLED)
+				GTK_WIDGET_FLAGS (w) &= GTK_SENSITIVE;
+			if(i == 0) {
+				img = GetGTK(w, GTK_STATE_NORMAL, GTK_SHADOW_IN, "entry", GTK_SHADOW, 20, 20);
+				efm = max(ImageMargin(img, 4, 0), 1);
+			}
+			img = GetGTK(w, GTK_STATE_NORMAL, GTK_SHADOW_IN,
+			             "entry", GTK_SHADOW, 2 * efm + 3, 2 * efm + 3);
+			ImageBuffer eb(img);
+			eb.SetHotSpot(Point(efm, efm));
+			s.edge[i] = Image(eb);
+			s.activeedge = true;
+			gtk_widget_destroy(w);
+		}
+	}
+
+	{
+		MultiButton::Style& s = MultiButton::StyleDefault().Write();
+		s.usetrivial = true;
+		s.trivialsep = true;
+		s.edge[0] = Null;
+		s.overpaint = Button::StyleNormal().overpaint;
+		s.margin.left = 3;
+		for(int i = 0; i < 4; i++)
+			s.left[i] = s.right[i] = s.lmiddle[i] = s.look[i] = Button::StyleNormal().look[i];
+		s.loff = 1;
+		s.roff = -1;
+		s.trivialborder = s.border = 0;
+		s.sep2 = SColorShadow();
+		s.sep1 = SColorLight();
+		s.sepm = 4;
+		{
+			MultiButton::Style& s = MultiButton::StyleFrame().Write();
+			for(int i = 0; i < 4; i++)
+				s.edge[i] = EditField::StyleDefault().edge[i];
+			s.activeedge = true;
+			s.sep1 = Null;
+			s.trivialborder = s.border = efm;
+			s.usetrivial = true;
+			s.sepm = 0;
+			s.margin = Rect(efm, efm, efm, efm);
+		}
+	}
+
+	ImageBuffer ib;
+	ib.Create(3, 3);
+	Fill(~ib, fc, ib.GetLength());
+	ib[1][1] = Color(Null);
+	ib.SetHotSpot(Point(1, 1));
+	CtrlsImg::Set(CtrlsImg::I_EFE, ib);
+	ib.Create(5, 5);
+	Fill(~ib, fc, ib.GetLength());
+	for(int x = 1; x < 4; x++)
+		Fill(ib[x] + 1, SColorPaper(), 3);
+	ib[2][2] = Color(Null);
+	ib.SetHotSpot(Point(2, 2));
+	CtrlsImg::Set(CtrlsImg::I_VE, ib);
+
+	static GtkWidget *popup;
+	static GtkWidget *bar = Setup(gtk_menu_bar_new());
+	static int shadowtype;
+	static GtkWidget *top_item;
+	static GtkWidget *menu_item;
+	if(!popup) {
+		gtk_widget_style_get(bar, "shadow_type", &shadowtype, NULL);
+		top_item = gtk_menu_item_new_with_label("M");
+		gtk_menu_shell_append(GTK_MENU_SHELL(bar), top_item);
+		gtk_widget_realize(top_item);
+		gtk_widget_show(top_item);
+		popup = gtk_menu_new();
+		gtk_menu_item_set_submenu(GTK_MENU_ITEM(top_item), popup);
+		gtk_widget_realize(popup);
+		gtk_widget_show(popup);
+		GTK_MENU_SHELL(bar)->active = true;
+		menu_item = gtk_menu_item_new_with_label("M");
+		gtk_menu_shell_append(GTK_MENU_SHELL(popup), menu_item);
+		gtk_widget_realize(menu_item);
+		gtk_widget_show(menu_item);
+//		gtk_widget_show(GTK_MENU(GTK_MENU_ITEM(top_item)->submenu)->toplevel);
+	}
+	Image mimg = GetGTK(popup, 0, 2, "menu", GTK_BGBOX, 32, 32);
+	Color c = mimg[16][16];
+	Value rlook;
+	if(!IsNull(c) && Diff(c, SColorPaper()) < 200)
+		SColorMenu_Write(c);
+	{
+		MenuBar::Style& s = MenuBar::StyleDefault().Write();
+		s.pullshift.y = 0;
+		int m = ImageMargin(mimg, 4, 5);
+		s.popupframe = WithHotSpot(mimg, m, m);
+		s.popupbody = Crop(mimg, m, m, 32 - 2 * m, 32 - 2 * m);
+		s.leftgap = 26;
+		ChGtkNew(menu_item, "menuitem", GTK_BOX);
+		int sw = GTK_SHADOW_OUT;
+		if(gtk_major_version > 2 || (gtk_major_version == 2 && gtk_minor_version >= 1))
+			sw = GtkInt("selected_shadow_type");
+		GtkCh(s.item, sw, GTK_STATE_PRELIGHT);
+		s.itemtext = ChGtkColor(2, menu_item);
+		ChGtkNew(top_item, "menuitem", GTK_BOX);
+		if(gtk_major_version > 2 || (gtk_major_version == 2 && gtk_minor_version >= 1))
+			sw = GtkInt("selected_shadow_type");
+		s.topitemtext[1] = s.topitemtext[0];
+		s.topitem[1] = s.topitem[0];
+		GtkCh(s.topitem[2], sw, GTK_STATE_PRELIGHT);
+		s.topitemtext[2] = ChGtkColor(2, top_item);
+		if(engine == "Redmond") {
+			s.topitem[1] = ChBorder(ThinOutsetBorder(), SColorFace());
+			s.topitem[2] = ChBorder(ThinInsetBorder(), SColorFace());
+		}
+		if(engine == "Geramik" || engine == "ThinGeramik")
+			s.topitemtext[2] = SColorText();
+		ChGtkNew(bar, "menubar", GTK_BGBOX);
+		sw = GtkInt("shadow_type");
+		s.look = GtkMakeCh(sw, GTK_STATE_NORMAL, Rect(0, 0, 0, 1));
+		rlook = GtkMakeCh(sw, GTK_STATE_NORMAL, Rect(0, 1, 0, 1));
+		Image img = GetGTK(bar, GTK_STATE_NORMAL, sw, "menubar", GTK_BGBOX, 32, 32);
+		s.breaksep.l1 = Color(img[31][15]);
+		TopSeparator1_Write(s.breaksep.l1);
+		s.breaksep.l2 = Null;
+	}
+	{
+		ToolBar::Style& s = ToolBar::StyleDefault().Write();
+		static GtkWidget *toolbar;
+		if(!toolbar) {
+			GtkWidget *handle = Setup(gtk_handle_box_new());
+			toolbar = gtk_toolbar_new();
+			gtk_container_add(GTK_CONTAINER(handle), toolbar);
+		}
+		ChGtkNew(toolbar, "toolbar", GTK_BGBOX);
+		int sw = GtkInt("shadow_type");
+		s.arealook = Null;
+		s.look = GtkMakeCh(sw, GTK_STATE_NORMAL, Rect(0, 1, 0, 1));
+		if(engine == "Redmond")
+			s.look = rlook;
+		s.breaksep.l1 = MenuBar::StyleDefault().breaksep.l1;
+		Image img = GetGTK(toolbar, GTK_STATE_NORMAL, sw, "toolbar", GTK_BGBOX, 32, 32);
+		MenuBar::StyleDefault().Write().breaksep.l2 = s.breaksep.l2 = Color(img[0][15]);
+		TopSeparator2_Write(s.breaksep.l2);
+	}
+
+	if(engine != "Qt")
+	{
+		ProgressIndicator::Style& s = ProgressIndicator::StyleDefault().Write();
+		static GtkWidget *pg = gtk_progress_bar_new();
+		ChGtkNew(pg, "trough", GTK_BOX);
+		int mx = pg->style->xthickness;
+		int my = pg->style->ythickness;
+		s.hlook = GtkMakeCh(GTK_SHADOW_IN, GTK_STATE_NORMAL, Rect(0, 0, 0, 0), Rect(mx, my, mx, my));
+		ChGtkNew(pg, "bar", GTK_BOX);
+		GtkCh(s.hchunk, GTK_SHADOW_OUT, GTK_STATE_PRELIGHT);
+		s.bound = true;
+	}
+
+	static GtkWidget *ve = Setup(gtk_text_view_new());
+	if(engine == "Redmond")
+		ViewEdge_Write(EditFieldEdge());
+	else
+		ViewEdge_Write(WithHotSpot(GetGTK(ve, GTK_STATE_NORMAL, GTK_SHADOW_IN, "frame", GTK_BOX, 32, 32), 2, 2));
+
+	ChCtrlImg(CtrlImg::I_information, "gtk-dialog-info", 6);
+	ChCtrlImg(CtrlImg::I_question, "gtk-dialog-question", 6);
+	ChCtrlImg(CtrlImg::I_exclamation, "gtk-dialog-warning", 6);
+
+	static struct {
+		void  (*set)(Image);
+		const char *gtk;
+	} bimg[] = {
+		{ YesButtonImage_Write, "gtk-yes" },
+		{ NoButtonImage_Write, "gtk-no" },
+		{ AbortButtonImage_Write, "gtk-stop" },
+		{ RetryButtonImage_Write, "gtk-refresh" },
+	};
+
+	for(int i = 0; i < __countof(bimg); i++)
+		(*bimg[i].set)(GtkImage(bimg[i].gtk, 4, 16));
+
+	if(engine != "Redmond")
+		DropEdge_Write(ViewEdge());
+
+	SwapOKCancel_Write(true);
+}
+
+END_UPP_NAMESPACE
+
+#endif
+
+#endif
diff --git a/uppsrc/CtrlLib/ChWin32.cpp b/uppsrc/CtrlLib/ChWin32.cpp
new file mode 100644
index 000000000..6a5ccd2b7
--- /dev/null
+++ b/uppsrc/CtrlLib/ChWin32.cpp
@@ -0,0 +1,619 @@
+#include "CtrlLib.h"
+
+NAMESPACE_UPP
+
+#define LLOG(x)   // RLOG(x)
+#define LTIMING(x) // RTIMING(x)
+
+void ChSysInit();
+
+#ifdef PLATFORM_WIN32
+
+#ifdef PLATFORM_WINCE
+
+void ChSysInit()
+{
+	CtrlImg::Reset();
+	CtrlsImg::Reset();
+	ChReset();
+	GUI_GlobalStyle_Write(GUISTYLE_CLASSIC);
+}
+
+void ChHostSkin()
+{
+	ChClassicSkin();
+}
+
+#else
+
+#include <uxtheme.h>
+#if defined(_MSC_VER) && _MSC_VER > 1400	// Visual C > 2005
+#include <vssym32.h>
+#else
+#include <tmschema.h>
+#endif
+
+#define DLLFILENAME "uxtheme.dll"
+#define DLIMODULE   XpTheme
+#define DLIHEADER   <CtrlLib/XpTheme.dli>
+#define DLLCALL     STDAPICALLTYPE
+#define WIDGET(x)
+#include <Core/dli.h>
+#undef  WIDGET
+
+#define FN(a, b, c)
+#define WIDGET(x)    XP_##x,
+enum {
+#include "XPTheme.dli"
+	XP_COUNT
+};
+
+#undef  WIDGET
+#define WIDGET(x)   #x,
+
+static const char *xp_widget_name[] = {
+#include "XPTheme.dli"
+	NULL
+};
+
+#undef  WIDGET
+#undef  FN
+
+struct XpElement : Moveable<XpElement> {
+	int16 widget;
+	int8  part;
+	int8  state;
+
+	bool  whista;
+	bool  contentm;
+
+	bool  operator==(const XpElement& e) const {
+		return e.widget == widget && e.part == part && e.state == state;
+	}
+
+	unsigned GetHashValue() const { return widget ^ part ^ state; }
+
+	XpElement() { contentm = whista = false; }
+};
+
+static HANDLE xp_widget_handle[XP_COUNT];
+static VectorMap<XpElement, int> xp_margin;
+static VectorMap<XpElement, int> xp_opaque;
+
+void XpClear()
+{
+	memset(xp_widget_handle, 0, sizeof(xp_widget_handle));
+	xp_margin.Clear();
+	xp_opaque.Clear();
+}
+
+HANDLE XpWidget(int widget)
+{
+	if(xp_widget_handle[widget] == NULL && XpTheme())
+		xp_widget_handle[widget] = XpTheme().OpenThemeData(NULL,
+		                            (WCHAR *)(const wchar *)WString(xp_widget_name[widget]));
+	return xp_widget_handle[widget];
+}
+
+Image XpImage(int widget, int part, int state, Color color = Null, Size sz = Null)
+{
+	HANDLE theme = XpWidget(widget);
+	if(!theme)
+		return Null;
+	if(IsNull(sz))
+		XpTheme().GetThemePartSize(theme, ScreenHDC(), part, state, NULL,
+		                           1 /*TS_TRUE*/, sz);
+	Color c = White;
+	Image m[2];
+	for(int q = 0; q < 2; q++) {
+		ImageDraw iw(sz);
+		iw.DrawRect(sz, Nvl(color, c));
+		HDC hdc = iw.BeginGdi();
+		Rect r(sz);
+		XpTheme().DrawThemeBackground(theme, hdc, part, state, r, NULL);
+		iw.EndGdi();
+		m[q] = iw;
+		if(!IsNull(color))
+			return m[q];
+		c = Black;
+	}
+	return RecreateAlpha(m[0], m[1]);
+}
+
+bool XpIsAvailable(int widget, int part, int state)
+{
+	HANDLE theme = XpWidget(widget);
+	if(!theme)
+		return false;
+	return XpTheme().IsThemePartDefined(theme, part, state);
+}
+
+int XpMargin(const XpElement& e)
+{
+	int q = xp_margin.Find(e);
+	if(q >= 0)
+		return xp_margin[q];
+
+	q = ImageMargin(XpImage(e.widget, e.part, e.state, White, Size(30, 30)), 4, 10);
+	xp_margin.Add(e, q);
+	return q;
+}
+
+int XpIsOpaque(const XpElement& e)
+{
+	int q = xp_opaque.Find(e);
+	if(q >= 0)
+		return xp_opaque[q];
+	Image m1 = XpImage(e.widget, e.part, e.state, Black, Size(30, 30));
+	Image m2 = XpImage(e.widget, e.part, e.state, White, Size(30, 30));
+	q = m1 == m2;
+	xp_opaque.Add(e, q);
+	return q;
+}
+
+Color XpColor(int widget, int part, int state, int type)
+{
+	COLORREF cref = 0;
+	HANDLE theme = XpWidget(widget);
+	if(!theme)
+		return Null;
+	int r = XpTheme().GetThemeColor(theme, part, state, type, &cref);
+	return r == S_OK ? Color::FromCR(cref) : Null;
+}
+
+int XpInt(int widget, int part, int state, int type)
+{
+	HANDLE theme = XpWidget(widget);
+	if(!theme)
+		return Null;
+	int n = Null;
+	int x = 0;
+	int r = XpTheme().GetThemeInt(theme, part, state, type, &n);
+	return r == S_OK ? n : Null;
+}
+
+int XpBool(int widget, int part, int state, int type)
+{
+	HANDLE theme = XpWidget(widget);
+	if(!theme)
+		return Null;
+	int x = 0;
+	BOOL flag = false;
+	int r = XpTheme().GetThemeBool(theme, part, state, type, &flag);
+	return r == S_OK ? flag : Null;
+}
+
+void SetXpImages(int uii, int n, int widget, int part, int state)
+{
+	for(int i = 0; i < n; i++) {
+		Image m = XpImage(widget, part, state++);
+		if(!IsNull(m))
+			CtrlsImg::Set(uii++, m);
+	}
+}
+
+void SetXpColors(Color *color, int n, int widget, int part, int state, int type)
+{
+	int ii = 0;
+	for(int i = 0; i < n; i++) {
+		Color c = XpColor(widget, part, state++, type);
+		if(!IsNull(c))
+			color[ii++] = c;
+	}
+}
+
+
+Value XpLookFn(Draw& w, const Rect& rect, const Value& v, int op)
+{
+	if(IsTypeRaw<XpElement>(v)) {
+		const XpElement& e = ValueTo<XpElement>(v);
+		HANDLE htheme = XpWidget(e.widget);
+		int q;
+		switch(op) {
+		case LOOK_MARGINS:
+			if(e.contentm && htheme) {
+				Rect r(0, 0, 100, 100);
+				Rect cr;
+				XpTheme().GetThemeBackgroundContentRect(htheme, NULL, e.part, e.state, r, cr);
+				cr.bottom = 100 - cr.bottom;
+				cr.right = 100 - cr.right;
+				return cr;
+			}
+			q = XpMargin(e);
+			return Rect(q, q, q, q);
+		case LOOK_ISOPAQUE:
+			return XpIsOpaque(e);
+		}
+		if(op == LOOK_PAINT || op == LOOK_PAINTEDGE) {
+			LTIMING("XpPaint");
+			Rect r = rect;
+			if(op == LOOK_PAINTEDGE) {
+				q = XpMargin(e);
+				w.Begin();
+				w.ExcludeClip(r.left + q, r.top + q,
+				              r.Width() - 2 * q, r.Height() - 2 * q);
+			}
+			if(e.whista) {
+				w.Clip(r);
+				r.right++;
+				r.top--;
+				r.bottom++;
+			}
+			if(htheme) {
+				HDC hdc = w.BeginGdi();
+				XpTheme().DrawThemeBackground(htheme, hdc, e.part, e.state, r, NULL);
+				w.EndGdi();
+			}
+			if(e.whista)
+				w.End();
+			if(op == LOOK_PAINTEDGE)
+				w.End();
+			return 1;
+		}
+	}
+	return Null;
+}
+
+struct chCtrlsImg {
+	int id;
+	int count;
+	int widget;
+	int part;
+	int state;
+};
+
+static chCtrlsImg sImgs[] = {
+	{ CtrlsImg::I_SizeGrip, 1, XP_STATUS, SP_GRIPPER, 0 },
+	{ CtrlsImg::I_S0, 4, XP_BUTTON, BP_RADIOBUTTON, RBS_UNCHECKEDNORMAL },
+	{ CtrlsImg::I_S1, 4, XP_BUTTON, BP_RADIOBUTTON, RBS_CHECKEDNORMAL },
+	{ CtrlsImg::I_O0, 4, XP_BUTTON, BP_CHECKBOX, CBS_UNCHECKEDNORMAL },
+	{ CtrlsImg::I_O1, 4, XP_BUTTON, BP_CHECKBOX, CBS_CHECKEDNORMAL },
+	{ CtrlsImg::I_O2, 4, XP_BUTTON, BP_CHECKBOX, CBS_MIXEDNORMAL },
+};
+
+void Win32Look(Value *ch, int count, int widget, int part, int state = 1, bool contentm = false)
+{
+	for(int i = 0; i < count; i++) {
+		XpElement e;
+		e.widget = widget;
+		e.part = part;
+		e.state = state + i;
+		e.contentm = contentm;
+		ch[i] = RawToValue(e);
+	}
+}
+
+void Win32Look(Value& ch, int widget, int part, int state = 1, bool contentm = false)
+{
+	Win32Look(&ch, 1, widget, part, state, contentm);
+}
+
+String XpThemeInfo(LPCWSTR pszPropertyName)
+{
+	wchar theme[512], colors[512], size[512];
+	XpTheme().GetCurrentThemeName(theme, 512, colors, 512, size, 512);
+	wchar h[1024];
+	XpTheme().GetThemeDocumentationProperty(theme, pszPropertyName, h, 1000);
+	return FromUnicode(h);
+}
+
+void ChHostSkin()
+{
+	ChSysInit();
+	if(XpWidget(XP_BUTTON)) {
+		LLOG("XP theme !");
+		GUI_GlobalStyle_Write(GUISTYLE_XP);
+		ColoredOverride(CtrlsImg::Iml(), CtrlsImg::Iml());
+		CtrlsImg::Reset();
+		EditFieldIsThin_Write(1);
+		
+		bool vista_aero = IsWinVista() && XpThemeInfo(L"ThemeName") == "Aero";
+
+		if(vista_aero) {
+			int efp = 6;
+			for(int i = 0; i < 4; i++) {
+				int efs = i + 1;
+				int ebsx = max(2, XpInt(XP_EDIT, efp, efs, 2403/*TMT_BORDERSIZE*/));
+				int ebsy = max(1, XpInt(XP_EDIT, efp, efs, 2403/*TMT_BORDERSIZE*/));
+				Image ee = XpImage(XP_EDIT, efp, efs, SColorFace(), Size(10 * ebsx, 10 * ebsx));
+				ImageBuffer eb(ee);
+				eb.SetHotSpot(Point(ebsx, ebsy));
+				ee = eb;
+				EditField::Style& s = EditField::StyleDefault().Write();
+				s.activeedge = true;
+				s.edge[i] = ee;
+			}
+		}
+		else {
+			int efp = EP_EDITTEXT;
+			int efs = 1;
+			int ebsx = max(2, XpInt(XP_EDIT, efp, efs, 2403/*TMT_BORDERSIZE*/));
+			int ebsy = max(1, XpInt(XP_EDIT, efp, efs, 2403/*TMT_BORDERSIZE*/));
+			Image ee = XpImage(XP_EDIT, efp, efs, SColorFace(), Size(10 * ebsx, 10 * ebsx));
+			ImageBuffer eb(ee);
+			eb.SetHotSpot(Point(ebsx, ebsy));
+			ee = eb;
+			EditField::Style& s = EditField::StyleDefault().Write();
+			s.activeedge = false;
+			s.edge[0] = ee;
+		}
+
+		int ebs = max(2, XpInt(XP_LISTVIEW, 0, 1, 2403/*TMT_BORDERSIZE*/));
+		Image ee = XpImage(XP_LISTVIEW, 0, 1, SColorFace(), Size(10 * ebs, 10 * ebs));
+		ImageBuffer eb(ee);
+		eb.SetHotSpot(Point(ebs, ebs));
+		ee = eb;
+		ViewEdge_Write(ee);
+
+		for(chCtrlsImg *m = sImgs; m < sImgs + __countof(sImgs); m++)
+			SetXpImages(m->id, m->count, m->widget, m->part, m->state);
+
+		{
+			Button::Style& s = Button::StyleNormal().Write();
+			Win32Look(s.look, 4, XP_BUTTON, BP_PUSHBUTTON);
+			SetXpColors(s.textcolor, 4, XP_BUTTON, BP_PUSHBUTTON, PBS_NORMAL, 3803/*TMT_TEXTCOLOR*/);
+		}
+		{
+			Button::Style& s = Button::StyleOk().Write();
+			Win32Look(s.look, 4, XP_BUTTON, BP_PUSHBUTTON);
+			Win32Look(s.look[0], XP_BUTTON, BP_PUSHBUTTON, PBS_DEFAULTED);
+		}
+		{
+			ToolBar::Style& s = ToolBar::StyleDefault().Write();
+			Win32Look(s.buttonstyle.look, 6, XP_TOOLBAR, 1, 1);
+			Win32Look(ToolButton::StyleDefault().Write().look, 6, XP_TOOLBAR, 1, 1);
+			Win32Look(s.arealook, XP_REBAR, 0, 1);
+			s.breaksep.l2 = SColorLight();
+		}
+		Win32Look(StatusBar::StyleDefault().Write().look, XP_STATUS, 0, 1);
+		{
+			ScrollBar::Style& s = ScrollBar::StyleDefault().Write();
+			Win32Look(s.hupper, 4, XP_SCROLLBAR, SBP_LOWERTRACKHORZ);
+			Win32Look(s.hlower, 4, XP_SCROLLBAR, SBP_UPPERTRACKHORZ);
+			Win32Look(s.vupper, 4, XP_SCROLLBAR, SBP_LOWERTRACKVERT);
+			Win32Look(s.vlower, 4, XP_SCROLLBAR, SBP_UPPERTRACKVERT);
+			Win32Look(s.up.look, 4, XP_SCROLLBAR, SBP_ARROWBTN, ABS_UPNORMAL);
+			Win32Look(s.down.look, 4, XP_SCROLLBAR, SBP_ARROWBTN, ABS_DOWNNORMAL);
+			Win32Look(s.left.look, 4, XP_SCROLLBAR, SBP_ARROWBTN, ABS_LEFTNORMAL);
+			Win32Look(s.right.look, 4, XP_SCROLLBAR, SBP_ARROWBTN, ABS_RIGHTNORMAL);
+		}
+		{
+			TabCtrl::Style& s = TabCtrl::StyleDefault().Write();
+			Win32Look(s.normal, 4, XP_TAB, TABP_TABITEM);
+			Win32Look(s.first, 4, XP_TAB, TABP_TABITEMLEFTEDGE);
+			Win32Look(s.last, 4, XP_TAB, TABP_TABITEM);
+			Win32Look(s.both, 4, XP_TAB, TABP_TABITEMBOTHEDGE);
+			Win32Look(s.body, XP_TAB, TABP_PANE);
+		}
+		{
+			SpinButtons::Style& s = SpinButtons::StyleDefault().Write();
+			Win32Look(s.inc.look, 4, XP_SPIN, SPNP_UP);
+			Win32Look(s.dec.look, 4, XP_SPIN, SPNP_DOWN);
+			s.width = FrameButtonWidth();
+		}
+		{
+			MultiButton::Style& s = MultiButton::StyleDefault().Write();
+			s.usetrivial = true;
+			if(vista_aero) {
+				s.edge[0] = Null;
+				Win32Look(s.look, 4, XP_COMBOBOX, 5);
+				s.trivialborder = s.border = 0;
+				s.sep1 = XpColor(XP_COMBOBOX, 5, 1, 3822/*TMT_BORDERCOLORHINT*/);
+				s.sep2 = Null;
+				s.sepm = 2;
+				{
+					MultiButton::Style& s = MultiButton::StyleFrame().Write();
+					for(int i = 0; i < 4; i++) {
+						s.left[i] = Unglyph(XpImage(XP_COMBOBOX, 7, i + 1, Null, Size(20, 20)));
+						s.right[i] = Unglyph(XpImage(XP_COMBOBOX, 6, i + 1, Null, Size(20, 20)));
+						s.lmiddle[i] = s.rmiddle[i] = HorzBlend(s.right[i], s.left[i], 6, 14);
+						Win32Look(s.look[i], XP_COMBOBOX, 4, i + 1);
+					}
+					s.activeedge = true;
+					s.sep1 = Null;
+				}
+			}
+			else {
+				Win32Look(s.trivial, 4, XP_COMBOBOX, CP_DROPDOWNBUTTON);
+				Win32Look(s.edge[0], XP_COMBOBOX, 0, 0);
+				s.border = s.trivialborder = XpInt(XP_COMBOBOX, CP_DROPDOWNBUTTON, CBXS_NORMAL, 2403/*TMT_BORDERSIZE*/);
+			}
+		}
+		{
+			HeaderCtrl::Style& s = HeaderCtrl::StyleDefault().Write();
+			Win32Look(s.look, 4, XP_HEADER, HP_HEADERITEM);
+			Image hm = Unmultiply(XpImage(XP_HEADER, HP_HEADERITEM, 1, SColorPaper, Size(20, 10)));
+			RGBA textc = SColorText();
+			int diff = Diff(hm[4][19], textc);
+			int hdroll = 0;
+			for(int i = 0; i < 4; i++) {
+				int d = Diff(hm[4][i], textc);
+				if(d < diff) {
+					diff = d;
+					hdroll = i + 1;
+				}
+				d = Diff(hm[4][19 - i], textc);
+				if(d < diff) {
+					diff = d;
+					hdroll = -i;
+				}
+			}
+			s.gridadjustment = hdroll;
+		}
+		{
+			ProgressIndicator::Style& s = ProgressIndicator::StyleDefault().Write();
+			Win32Look(s.hlook, XP_PROGRESS, PP_BAR, 0, true);
+			Win32Look(s.vlook, XP_PROGRESS, PP_BARVERT, 0, true);
+			Win32Look(s.hchunk, XP_PROGRESS, PP_CHUNK);
+			Win32Look(s.vchunk, XP_PROGRESS, PP_CHUNKVERT);
+		}
+		{
+			MenuBar::Style& s = MenuBar::StyleDefault().Write();
+			if(vista_aero) {
+				s.itemtext = XpColor(XP_MENU, 14 /*MENU_POPUPITEM*/, 2 /*HOT*/, 3803/*TMT_TEXTCOLOR*/);
+				Win32Look(s.item, XP_MENU, 14 /*MENU_POPUPITEM*/, 2 /*HOT*/);
+				Win32Look(s.popupiconbar, XP_MENU, 13, 1);
+				s.leftgap = 32;
+				s.textgap = 6;
+				s.lsepm = 32;
+				s.separator.l1 = Blend(SColorMenu(), SColorShadow());
+				s.separator.l2 = SColorLight();
+			}
+			Win32Look(s.arealook, XP_REBAR, 0, 1);
+		}
+
+		XpElement e;
+		for(int i = 0; i < 4; i++) {
+			{
+				ScrollBar::Style& s = ScrollBar::StyleDefault().Write();
+				e.widget = XP_SCROLLBAR;
+				e.state = 1 + i;
+				e.contentm = false;
+				e.part = SBP_THUMBBTNHORZ;
+				s.hthumb[i] = ChLookWith(RawToValue(e), XpImage(XP_SCROLLBAR, SBP_GRIPPERHORZ, 1));
+				e.part = SBP_THUMBBTNVERT;
+				s.vthumb[i] = ChLookWith(RawToValue(e), XpImage(XP_SCROLLBAR, SBP_GRIPPERVERT, 1));
+			}
+			Color paper = i == 3 ? SColorFace : SColorPaper;
+			Image m = XpImage(XP_COMBOBOX, CP_DROPDOWNBUTTON, CBXS_NORMAL + i, paper, Size(32, 32));
+			Image mm = m;
+			Size isz = m.GetSize();
+			int cbs = XpInt(XP_COMBOBOX, CP_DROPDOWNBUTTON, CBXS_NORMAL + i, 2403/*TMT_BORDERSIZE*/);
+			if(cbs == 0) {
+				Image h = HorzSymm(m);
+				Button::StyleLeftEdge().Write().look[i] = Unglyph(Crop(h, 1, 1, isz.cx - 1, isz.cy - 2));
+				m = Crop(h, 0, 1, isz.cx - 1, isz.cy - 2);
+			}
+			bool outer = false;
+			if(cbs == 1 &&
+			   XpBool(XP_COMBOBOX, CP_DROPDOWNBUTTON, CBXS_NORMAL + i, 2203/*TMT_BORDERONLY*/) == 0 &&
+			   XpInt(XP_COMBOBOX, 0, 0, 2403/*TMT_BORDERSIZE*/) == 1 &&
+			   XpBool(XP_COMBOBOX, 0, 0, 2203/*TMT_BORDERONLY*/) == 0) {
+					m = Crop(m, 0, 1, isz.cx - 1, isz.cy - 2);
+					e.widget = XP_COMBOBOX;
+					e.part = CP_DROPDOWNBUTTON;
+					e.state = CBXS_NORMAL + i;
+					e.whista = true;
+					outer = true;
+			}
+			Color c;
+			double gf;
+			m = Unglyph(m, c, gf);
+			if(i == 0 && gf > 150)
+				CtrlsImg::Set(CtrlsImg::I_DA, ClassicCtrlsImg::DA());
+
+			Button::StyleEdge().Write().look[i] = m;
+			if(cbs)
+				Button::StyleLeftEdge().Write().look[i] = m;
+
+			MultiButton::StyleDefault().Write().simple[i] = m;
+			MultiButton::StyleFrame().Write().simple[i] = m;
+
+			Button::StyleNormal().Write().monocolor[i] = c;
+			Button::StyleOk().Write().monocolor[i] = c;
+			Button::StyleEdge().Write().monocolor[i] = c;
+			Button::StyleLeftEdge().Write().monocolor[i] = c;
+			Button::StyleScroll().Write().monocolor[i] = c;
+
+			MultiButton::StyleDefault().Write().monocolor[i] = c;
+			MultiButton::StyleFrame().Write().monocolor[i] = c;
+			if(!vista_aero) {
+				MultiButton::Style& s = MultiButton::StyleDefault().Write();
+				MultiButton::Style& fs = MultiButton::StyleFrame().Write();
+				Image cm = Unglyph(XpImage(XP_COMBOBOX, CP_DROPDOWNBUTTON, i + 1, Null, Size(20, 20)));
+				fs.right[i] = s.right[i] = cm;
+				fs.left[i] = s.left[i] = MirrorHorz(s.right[i]);
+				if(s.border == 0) {
+					mm = Crop(Unglyph(cm), 0, 0, 12, 20);
+					ImageBuffer ib(mm);
+					ib.SetHotSpot(cm.GetHotSpot());
+					mm = ib;
+				}
+				else
+					mm = m;
+				fs.rmiddle[i] = s.rmiddle[i] = mm;
+				fs.lmiddle[i] = s.lmiddle[i] = MirrorHorz(mm);
+			}
+
+			m = Unglyph(XpImage(XP_SCROLLBAR, SBP_ARROWBTN, i + ABS_UPNORMAL, paper));
+			Size msz = m.GetSize();
+
+			Button::StyleScroll().Write().look[i] =
+			      VertBlend(m, Unglyph(XpImage(XP_SCROLLBAR, SBP_ARROWBTN, i + ABS_DOWNNORMAL,
+			                                   paper)),
+			                msz.cy / 3, msz.cy * 2 / 3);
+		}
+
+		LabelBoxTextColor_Write(XpColor(XP_BUTTON, BP_GROUPBOX, GBS_NORMAL, 3803/*TMT_TEXTCOLOR*/));
+		LabelBoxColor_Write(XpColor(XP_BUTTON, BP_GROUPBOX, GBS_NORMAL, 3822/*TMT_BORDERCOLORHINT*/));
+
+		ChLookFn(XpLookFn);
+	}
+	else
+		ChClassicSkin();
+}
+
+struct sysColor {
+	void (*set)(Color c);
+	int syscolor;
+};
+
+static sysColor sSysColor[] = {
+	{ SColorFace_Write, COLOR_3DFACE },
+	{ SColorPaper_Write, COLOR_WINDOW },
+	{ SColorText_Write, COLOR_WINDOWTEXT },
+	{ SColorHighlight_Write, COLOR_HIGHLIGHT },
+	{ SColorHighlightText_Write, COLOR_HIGHLIGHTTEXT },
+	{ SColorMenu_Write, COLOR_MENU },
+	{ SColorMenuText_Write, COLOR_MENUTEXT },
+	{ SColorInfo_Write, COLOR_INFOBK },
+	{ SColorInfoText_Write, COLOR_INFOTEXT },
+	{ SColorLight_Write, COLOR_3DHILIGHT },
+	{ SColorShadow_Write, COLOR_3DSHADOW },
+};
+
+bool IsSysFlag(dword flag)
+{
+	BOOL b;
+	return SystemParametersInfo(flag, 0, &b, 0) && b;
+}
+
+void ChSysInit()
+{
+	CtrlImg::Reset();
+	CtrlsImg::Reset();
+	ChReset();
+	XpClear();
+
+	GUI_GlobalStyle_Write(IsWinXP() && !ScreenInPaletteMode() && IsSysFlag(0x1022 /*SPI_GETFLATMENU*/)
+	                      ? GUISTYLE_XP : GUISTYLE_CLASSIC);
+#ifndef PLATFORM_WINCE
+	GUI_DragFullWindow_Write(IsSysFlag(SPI_GETDRAGFULLWINDOWS));
+#endif
+	GUI_PopUpEffect_Write(IsSysFlag(0x1002 /*SPI_GETMENUANIMATION*/) ?
+	                      IsSysFlag(0x1012 /*SPI_GETMENUFADE*/) ? GUIEFFECT_FADE
+	                                                            : GUIEFFECT_SLIDE
+	                                                            : GUIEFFECT_NONE);
+	GUI_DropShadows_Write(IsSysFlag(0x1024 /*SPI_GETDROPSHADOW*/));
+	GUI_AltAccessKeys_Write(!IsSysFlag(0x100A /*SPI_GETKEYBOARDCUES*/));
+	GUI_AKD_Conservative_Write(0);
+	GUI_DragDistance_Write(GetSystemMetrics(SM_CXDRAG));
+	GUI_DblClickTime_Write(GetDoubleClickTime());
+
+	CtrlImg::Set(CtrlImg::I_information, Win32Icon(IDI_INFORMATION));
+	CtrlImg::Set(CtrlImg::I_question, Win32Icon(IDI_QUESTION));
+	CtrlImg::Set(CtrlImg::I_exclamation, Win32Icon(IDI_EXCLAMATION));
+
+	FrameButtonWidth_Write(GetSystemMetrics(SM_CYHSCROLL));
+	ScrollBarArrowSize_Write(GetSystemMetrics(SM_CXHSCROLL));
+	for(sysColor *s = sSysColor; s < sSysColor + __countof(sSysColor); s++)
+		(*s->set)(Color::FromCR(GetSysColor(s->syscolor)));
+	dword x = GetSysColor(COLOR_GRAYTEXT);
+	SColorDisabled_Write(x ? Color::FromCR(x) : Color::FromCR(GetSysColor(COLOR_3DSHADOW)));
+}
+
+#endif
+
+#endif
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/CtrlLib/ClassicCtrls.iml b/uppsrc/CtrlLib/ClassicCtrls.iml
new file mode 100644
index 000000000..5a540df6b
--- /dev/null
+++ b/uppsrc/CtrlLib/ClassicCtrls.iml
@@ -0,0 +1,107 @@
+PREMULTIPLIED
+IMAGE_ID(S0)
+IMAGE_ID(S0h)
+IMAGE_ID(S0p)
+IMAGE_ID(S0d)
+IMAGE_ID(S1)
+IMAGE_ID(S1h)
+IMAGE_ID(S1p)
+IMAGE_ID(S1d)
+IMAGE_ID(SBlack)
+IMAGE_ID(O0)
+IMAGE_ID(O0h)
+IMAGE_ID(O0p)
+IMAGE_ID(O0d)
+IMAGE_ID(O1)
+IMAGE_ID(O1h)
+IMAGE_ID(O1p)
+IMAGE_ID(O1d)
+IMAGE_ID(O2)
+IMAGE_ID(O2h)
+IMAGE_ID(O2p)
+IMAGE_ID(O2d)
+IMAGE_ID(OBlack)
+IMAGE_ID(SizeGrip)
+IMAGE_ID(B)
+IMAGE_ID(Bh)
+IMAGE_ID(Bp)
+IMAGE_ID(Bd)
+IMAGE_ID(EB)
+IMAGE_ID(EBh)
+IMAGE_ID(EBp)
+IMAGE_ID(EBd)
+IMAGE_ID(SB)
+IMAGE_ID(SBh)
+IMAGE_ID(SBp)
+IMAGE_ID(SBd)
+IMAGE_ID(OkB)
+IMAGE_ID(OkBh)
+IMAGE_ID(OkBp)
+IMAGE_ID(OkBd)
+IMAGE_ID(DA)
+IMAGE_ID(UA)
+IMAGE_ID(LA)
+IMAGE_ID(RA)
+IMAGE_ID(EFE)
+IMAGE_ID(VE)
+IMAGE_ID(TAB)
+IMAGE_ID(TABh)
+IMAGE_ID(TABs)
+IMAGE_ID(TABd)
+IMAGE_ID(FTAB)
+IMAGE_ID(FTABh)
+IMAGE_ID(FTABs)
+IMAGE_ID(FTABd)
+IMAGE_ID(LTAB)
+IMAGE_ID(LTABh)
+IMAGE_ID(LTABs)
+IMAGE_ID(LTABd)
+IMAGE_ID(BTAB)
+IMAGE_ID(BTABh)
+IMAGE_ID(BTABs)
+IMAGE_ID(BTABd)
+IMAGE_ID(TABB)
+IMAGE_ID(TB)
+IMAGE_ID(TBh)
+IMAGE_ID(TBp)
+IMAGE_ID(TBd)
+IMAGE_ID(TB1)
+IMAGE_ID(TB1h)
+
+IMAGE_BEGIN_DATA
+IMAGE_DATA(120,156,237,90,109,110,131,48,12,205,58,77,251,211,222,169,71,235,209,122,128,222,41,131,193,211,130,235,47,50,40,129)
+IMAGE_DATA(58,200,202,68,222,171,29,231,129,221,106,233,146,206,233,163,187,184,113,187,221,114,105,44,136,96,175,215,235,196,36,110)
+IMAGE_DATA(137,205,57,77,236,239,126,206,28,135,226,97,143,199,99,194,177,240,28,175,101,78,77,14,192,233,239,15,107,207,120,142)
+IMAGE_DATA(211,143,60,14,96,74,44,135,231,184,42,54,196,23,226,123,107,241,221,239,247,137,89,226,163,120,152,116,80,18,158,227)
+IMAGE_DATA(181,204,169,201,1,56,16,14,135,15,241,133,248,66,124,52,232,163,149,221,62,47,67,110,124,229,16,120,202,91,154,227)
+IMAGE_DATA(137,173,38,7,224,68,217,37,248,16,95,136,111,115,241,189,178,236,166,241,128,189,229,48,17,33,173,197,241,196,86,147)
+IMAGE_DATA(3,112,162,236,18,252,22,226,67,60,94,241,209,28,172,197,241,196,86,147,3,112,154,20,223,89,17,95,74,79,37,196)
+IMAGE_DATA(139,211,120,218,231,113,107,94,223,30,172,20,111,43,120,250,183,133,165,190,180,56,180,248,106,207,121,58,46,221,5,49)
+IMAGE_DATA(209,39,208,178,126,112,111,47,201,240,20,88,125,8,215,147,4,167,125,14,125,227,105,86,59,66,176,193,89,140,115,120)
+IMAGE_DATA(193,90,191,141,149,189,79,112,218,231,132,96,119,116,88,193,121,3,193,46,93,166,82,154,199,65,99,47,113,176,70,241)
+IMAGE_DATA(22,7,235,20,111,113,56,188,182,31,9,111,229,128,195,71,75,16,130,13,193,30,77,176,75,151,169,52,254,80,237,229)
+IMAGE_DATA(224,176,37,14,214,40,222,226,96,157,226,45,14,135,215,246,35,225,173,28,112,248,104,9,54,16,108,143,153,195,193,62)
+IMAGE_DATA(36,14,214,40,222,226,96,157,226,45,14,135,215,246,35,225,173,28,112,248,16,236,138,45,65,89,114,185,89,43,161,191)
+IMAGE_DATA(155,158,204,150,31,138,207,59,247,51,63,111,209,18,132,96,67,176,149,99,151,45,65,217,35,114,179,214,243,113,115,248)
+IMAGE_DATA(209,253,68,75,240,79,193,150,61,34,55,107,61,31,55,135,31,221,79,179,130,229,190,173,174,108,158,17,156,125,113,214)
+IMAGE_DATA(181,225,63,169,78,206,216,198,8,187,49,150,18,23,22,79,176,23,235,193,83,172,134,167,88,45,126,14,43,197,35,97)
+IMAGE_DATA(57,188,133,45,241,22,182,140,223,131,181,214,180,152,230,88,250,234,174,211,40,38,250,106,28,154,226,60,41,15,218,189)
+IMAGE_DATA(178,148,75,37,123,91,135,73,120,166,202,15,42,239,193,161,134,123,178,77,119,72,15,24,101,23,163,44,197,112,74,75)
+IMAGE_DATA(122,219,14,95,126,134,199,79,105,156,225,34,59,252,238,174,207,238,210,118,8,227,94,12,229,26,125,25,120,215,104,160)
+IMAGE_DATA(88,99,3,182,58,141,163,109,232,7,25,11,97,143,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0)
+IMAGE_END_DATA(640, 37)
+
+IMAGE_BEGIN_DATA
+IMAGE_DATA(120,156,237,154,225,82,195,48,8,199,163,206,205,250,221,247,233,163,245,209,250,102,19,180,236,144,2,73,61,117,231,241)
+IMAGE_DATA(39,199,109,11,191,80,66,67,146,15,107,151,118,105,79,212,54,185,102,186,44,203,78,181,109,93,215,155,254,148,45,122)
+IMAGE_DATA(94,168,71,38,100,101,158,231,47,54,29,212,17,155,14,88,219,248,187,213,129,9,157,219,35,181,1,201,28,69,246,104)
+IMAGE_DATA(124,228,127,76,14,4,61,242,128,145,128,123,19,205,38,246,41,103,10,59,9,218,27,60,154,197,239,102,189,255,54,156)
+IMAGE_DATA(160,123,89,140,250,123,217,29,229,253,64,181,60,83,147,160,109,133,75,1,73,129,112,145,233,62,30,163,251,244,238,17)
+IMAGE_DATA(201,223,63,112,106,111,183,109,40,130,181,35,177,103,125,158,93,84,7,30,49,50,33,48,96,126,155,65,1,128,41,205)
+IMAGE_DATA(208,177,60,165,5,144,45,252,108,49,103,65,220,203,22,37,131,213,221,9,188,171,189,117,28,101,55,179,91,255,96,192)
+IMAGE_DATA(220,155,193,81,8,166,52,131,2,0,83,154,41,117,23,204,18,130,187,32,152,210,12,142,66,48,165,25,20,0,152,210)
+IMAGE_DATA(76,169,187,96,148,12,86,220,5,193,148,102,112,20,130,41,205,160,0,192,148,102,112,23,220,20,119,65,48,165,25,42)
+IMAGE_DATA(128,169,157,182,2,216,157,129,70,4,73,29,254,99,198,43,124,209,182,255,91,170,175,15,212,194,255,156,218,140,178,103)
+IMAGE_DATA(27,221,145,62,55,82,253,64,222,0,61,213,3,116,159,56,206,56,171,251,41,191,82,123,161,198,134,44,169,86,101,138)
+IMAGE_DATA(217,167,68,153,49,54,181,149,252,245,132,170,253,244,241,98,120,137,104,131,93,99,222,111,171,239,73,125,25,40,0,0)
+IMAGE_END_DATA(384, 31)
diff --git a/uppsrc/CtrlLib/ColorPopup.cpp b/uppsrc/CtrlLib/ColorPopup.cpp
new file mode 100644
index 000000000..76b6d99ea
--- /dev/null
+++ b/uppsrc/CtrlLib/ColorPopup.cpp
@@ -0,0 +1,330 @@
+#include "CtrlLib.h"
+
+NAMESPACE_UPP
+
+static struct {
+	const char  *name;
+	ColorF color;
+}
+s_colors[] = {
+	{ "Black", &Black },
+	{ "Red", &Red },
+	{ "Green", &Green },
+	{ "Brown", &Brown },
+	{ "Blue", &Blue },
+	{ "Magenta", &Magenta },
+	{ "Cyan", &Cyan },
+	{ "Gray", &Gray },
+	{ "LtGray", &LtGray },
+	{ "LtRed", &LtRed },
+	{ "LtGreen", &LtGreen },
+	{ "LtYellow", &LtYellow },
+	{ "LtBlue", &LtBlue },
+	{ "LtMagenta", &LtMagenta },
+	{ "LtCyan", &LtCyan },
+	{ "Yellow", &Yellow },
+	{ "WhiteGray", &WhiteGray },
+	{ "White", &White },
+
+//deprecated: (TODO)
+	{ "SBlack", &Black },
+	{ "SRed", &Red },
+	{ "SGreen", &Green },
+	{ "SBrown", &Brown },
+	{ "SBlue", &Blue },
+	{ "SMagenta", &Magenta },
+	{ "SCyan", &Cyan },
+	{ "SGray", &Gray },
+	{ "SLtGray", &LtGray },
+	{ "SLtRed", &LtRed },
+	{ "SLtGreen", &LtGreen },
+	{ "SLtYellow", &LtYellow },
+	{ "SLtBlue", &LtBlue },
+	{ "SLtMagenta", &LtMagenta },
+	{ "SLtCyan", &LtCyan },
+	{ "SYellow", &Yellow },
+	{ "SWhiteGray", &WhiteGray },
+	{ "SWhite", &White },
+};
+
+String FormatColor(Color c)
+{
+	if(IsNull(c))
+		return "Null";
+	for(int i = 0; i < __countof(s_colors); i++)
+		if((*s_colors[i].color)() == c)
+			return s_colors[i].name;
+	return Format("Color(%d, %d, %d)", c.GetR(), c.GetG(), c.GetB());
+}
+
+Color ReadColor(CParser& p)
+{
+	for(int i = 0; i < __countof(s_colors); i++)
+		if(p.Id(s_colors[i].name))
+			return (*s_colors[i].color)();
+	p.PassId("Color");
+	p.PassChar('(');
+	int r = p.ReadInt();
+	p.PassChar(',');
+	int g = p.ReadInt();
+	p.PassChar(',');
+	int b = p.ReadInt();
+	p.PassChar(')');
+	return Color(minmax(r, 0, 255), minmax(g, 0, 255), minmax(b, 0, 255));
+}
+
+ColorPopUp::~ColorPopUp() {}
+
+int ColorPopUp::GetColorCount() const
+{
+	return scolors ? 216 + 36 + 18 : 216 + 18 + 18;
+}
+
+Color ColorPopUp::GetColor(int i) const
+{
+	if(!scolors)
+		i += 18;
+	if(i < 36)
+		return *s_colors[i].color;
+	i -= 36;
+	if(i < 18)
+		return GrayColor(255 * (i + 1) / 20);
+	i -= 18;
+	int q = i % 18;
+	i /= 18;
+	return Color(255 * (q < 9 ? q + 1 : 18 - q) / 9,
+                 255 * (i < 6 ? i + 1 : 12 - i) / 6,
+	             q < 9 ? i < 6 ? 0 : 200 : i < 6 ? 150 : 255);
+}
+
+int ColorPopUp::GetCy()
+{
+	return ((GetColorCount() + 17) / 18) * 16 +
+			(norampwheel ? 0 : 2) +
+	        (notnull ? 0 : StdFont().Info().GetHeight() + 3 + 2);
+}
+
+void ColorPopUp::DrawFilledFrame(Draw &w, int x, int y, int cx, int cy, Color fcol, Color bcol)
+{
+	DrawFrame(w, x, y, cx, cy, fcol);
+	w.DrawRect(x + 1, y + 1, cx - 2, cy - 2, bcol);
+}
+
+void ColorPopUp::DrawFilledFrame(Draw &w, Rect &r, Color fcol, Color bcol)
+{
+	DrawFrame(w, r.left, r.top, r.Width(), r.Height(), fcol);
+	w.DrawRect(r.left + 1, r.top + 1, r.Width() - 2, r.Height() - 2, bcol);
+}
+
+void ColorPopUp::Paint(Draw& w)
+{
+	Size sz = GetSize();
+	int cy = GetCy();
+
+	w.DrawRect(sz, SColorMenu);
+
+	int y = 1;
+
+	if(!notnull) {
+		Size fsz = GetTextSize(nulltext, StdFont());
+		Rect r(1, y, sz.cx - 1, fsz.cy + y + 2);
+		DrawFrame(w, r, SColorText);
+		w.DrawText((sz.cx - fsz.cx) / 2, y, nulltext, StdFont(), SColorText());
+		y = r.bottom + 3;
+		if(colori == 998)
+		{
+			r.Inflate(1);
+			if(GetMouseLeft())
+				DrawFrame(w, r, SColorShadow, SColorLight);
+			else
+				DrawFrame(w, r, GUI_GlobalStyle() >= GUISTYLE_XP ? SColorText : SColorHighlight);
+		}
+	}
+
+	int i = 0;
+	for(;;) {
+		for(int x = 0; x < 18 * 16; x += 16) {
+			if(i >= GetColorCount()) {
+				if(!norampwheel) {
+					Rect r(8 * 16 + 1, cy + 4, 10 * 16 - 1, sz.cy - 4);
+					DrawFilledFrame(w, r, SColorText, color);
+
+					r.Inflate(1);
+					if(colori == 999)
+						if(GetMouseLeft())
+							DrawFrame(w, r, SColorShadow, SColorLight);
+						else
+							DrawFrame(w, r, GUI_GlobalStyle() >= GUISTYLE_XP ? SColorText : SColorHighlight);
+				}
+				return;
+			}
+
+			DrawFilledFrame(w, x + 1, y, 14, 14, SColorText, GetColor(i));
+			if(i < 18 && scolors)
+				DrawFrame(w, x + 2, y + 1, 12, 12, Blend(SColorLight, SColorHighlight));
+
+			if(i == colori)
+				if(GetMouseLeft())
+					DrawFrame(w, x, y - 1, 16, 16, SColorShadow, SColorLight);
+				else
+					DrawFrame(w, x, y - 1, 16, 16, GUI_GlobalStyle() >= GUISTYLE_XP ? SColorText : SColorHighlight);
+			i++;
+		}
+		y += 16;
+	}
+}
+
+int ColorPopUp::Get(Point p)
+{
+	if(p.y >= GetCy())
+		return 999;
+	if(!notnull) {
+		int y0 = StdFont().Info().GetHeight() + 4;
+		if(p.y < y0)
+			return 998;
+		p.y -= y0;
+	}
+	Size sz = GetSize();
+	if(p.x >= 0 && p.x < sz.cx && p.y >= 0)
+		return p.x / 16 + p.y / 16 * 18;
+	return -1;
+}
+
+void ColorPopUp::MouseMove(Point p, dword)
+{
+	int ci = Get(p);
+	if(ci != colori) {
+		colori = ci;
+		Refresh();
+		WhenAction();
+	}
+}
+
+void ColorPopUp::MouseLeave()
+{
+	colori = -1;
+	Refresh();
+}
+
+void ColorPopUp::Deactivate() {
+	if(IsOpen()) {
+		Close();
+		IgnoreMouseClick();
+		WhenCancel();
+	}
+}
+
+void ColorPopUp::Finish()
+{
+	Close();
+	if(colori >= 0)
+		WhenSelect();
+	else
+		WhenCancel();
+}
+
+void ColorPopUp::LeftDown(Point p, dword)
+{
+	Refresh();
+}
+
+void ColorPopUp::LeftUp(Point p, dword)
+{
+	Finish();
+}
+
+bool ColorPopUp::Key(dword key, int count)
+{
+	if(key == K_ESCAPE)	{
+		Close();
+		WhenCancel();
+	}
+	return true;
+}
+
+void ColorPopUp::Ramp()
+{
+	color = wheel <<= ~ramp;
+	WhenAction();
+	Refresh();
+}
+
+void ColorPopUp::Wheel()
+{
+	color = ramp <<= ~wheel;
+	WhenAction();
+	Refresh();
+}
+
+Color ColorPopUp::Get() const
+{
+	if(colori >= 0 && colori < GetColorCount())
+		return GetColor(colori);
+	else
+	if(colori == 999)
+		return color;
+	else
+		return Null;
+}
+
+void ColorPopUp::PopUp(Ctrl *owner, Color c)
+{
+	int cy = norampwheel ? 0 : 110;
+	Size sz = AddFrameSize(18 * 16, GetCy() + cy);
+	Rect wr = GetWorkArea();
+	Rect r = owner->GetScreenRect();
+	int x = r.left;
+	int y = r.bottom;
+	if(x + sz.cx >= wr.right)
+		x = r.right - sz.cx;
+	if(y + sz.cy >= wr.bottom)
+		y = r.top - sz.cy;
+
+	Rect rt = RectC(x, y, sz.cx, sz.cy);
+	if(GUI_PopUpEffect()) {
+		Ctrl popup;
+		popup.Add(BottomPos(0, rt.Height()).LeftPos(0, rt.Width()));
+		popup.SetRect(RectC(rt.left, rt.top, 3, 3));
+		popup.PopUp(owner, true, true, GUI_GlobalStyle() >= GUISTYLE_XP);
+		SetFocus();
+		Ctrl::ProcessEvents();
+		Animate(popup, rt, GUIEFFECT_SLIDE);
+	}
+
+	SetRect(rt);
+	Ctrl::PopUp(owner, true, true, true);
+	SetFocus();
+
+	if(!norampwheel) {
+		ramp.LeftPos(0, 18*7).VSizePos(GetCy(), 0);
+		wheel.LeftPos(18*9 - 1, 18*7).VSizePos(GetCy(), 0);
+	}
+
+	ramp <<= c;
+	wheel <<= c;
+	color = c;
+	colori = -1;
+}
+
+void ColorPopUp::Select()
+{
+	colori = 999;
+	Finish();
+}
+
+ColorPopUp::ColorPopUp()
+{
+	norampwheel = false;
+	notnull = false;
+	scolors = false;
+	SetFrame(MenuFrame());
+	Add(ramp);
+	Add(wheel);
+	ramp <<= THISBACK(Ramp);
+	wheel <<= THISBACK(Wheel);
+	ramp.WhenLeftDouble = wheel.WhenLeftDouble = THISBACK(Select);
+	BackPaint();
+	nulltext = t_("(transparent)");
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/CtrlLib/ColorPusher.cpp b/uppsrc/CtrlLib/ColorPusher.cpp
new file mode 100644
index 000000000..6f6a57926
--- /dev/null
+++ b/uppsrc/CtrlLib/ColorPusher.cpp
@@ -0,0 +1,151 @@
+#include "CtrlLib.h"
+
+NAMESPACE_UPP
+
+ColorPusher::~ColorPusher() {}
+
+void ColorPusher::Paint(Draw& w)
+{
+	Size sz = GetSize();
+	w.DrawRect(sz, push ? SColorHighlight : SColorPaper);
+	int ty = (sz.cy - StdFont().Info().GetHeight()) / 2;
+	if(withtext) {
+		w.DrawRect(2, 2, sz.cy - 4, sz.cy - 4, color);
+		DrawFrame(w, 1, 1, sz.cy - 2, sz.cy - 2, SColorText);
+		w.DrawText(sz.cy + 2, ty, FormatColor(color), StdFont(), SColorText());
+	}
+	else {
+		if(!IsNull(color)) {
+			w.DrawRect(2, 2, sz.cx - 4, sz.cy - 4, color);
+			DrawFrame(w, 1, 1, sz.cx - 2, sz.cy - 2, SColorText);
+		}
+		else
+		if(!withtext)
+			w.DrawText(max(2, (sz.cx - GetTextSize(nulltext, StdFont()).cx) / 2), ty,
+			           nulltext, StdFont(), SColorText());
+	}
+	if(HasFocus())
+		DrawFocus(w, GetSize());
+}
+
+void ColorPusher::LeftDown(Point p, dword)
+{
+	Drop();
+}
+
+bool ColorPusher::Key(dword key, int)
+{
+	if(key == K_SPACE) {
+		Drop();
+		return true;
+	}
+	return false;
+}
+
+void ColorPusher::Drop()
+{
+	if(push) return;
+	push = true;
+	Refresh();
+	saved_color = color;
+	colors.PopUp(this, color);
+}
+
+void ColorPusher::CloseColors()
+{
+	push = false;
+	if(color != saved_color) {
+		color = saved_color;
+		UpdateAction();
+	}
+	Refresh();
+}
+
+void ColorPusher::AcceptColors()
+{
+	push = false;
+	color = colors.Get();
+	UpdateActionRefresh();
+}
+
+void ColorPusher::SetData(const Value& v)
+{
+	if(color != v) {
+		color = v;
+		Refresh();
+	}
+}
+
+Value ColorPusher::GetData() const
+{
+	return color;
+}
+
+void ColorPusher::NewColor()
+{
+	if(track) {
+		color = colors.Get();
+		UpdateAction();
+	}
+}
+
+ColorPusher::ColorPusher()
+{
+	nulltext = t_("(transparent)");
+	color = Null;
+	track = push = withtext = false;
+	colors.WhenSelect = THISBACK(AcceptColors);
+	colors.WhenCancel = THISBACK(CloseColors);
+	colors.WhenAction = THISBACK(NewColor);
+	SetFrame(EditFieldFrame());
+}
+
+ColorButton::~ColorButton() {}
+
+Size ColorButton::GetMinSize() const
+{
+	return Size(24, 24);
+}
+
+void ColorButton::Paint(Draw& w)
+{
+	Size sz = GetSize();
+	Size isz = image.GetSize();
+	Point center = (sz - isz) / 2;
+	if(GUI_GlobalStyle() >= GUISTYLE_XP)
+		ChPaint(w, sz, style->look[!IsEnabled() ? CTRL_DISABLED : push ? CTRL_PRESSED
+		                                        : HasMouse() ? CTRL_HOT : CTRL_NORMAL]);
+	else {
+		w.DrawRect(sz, SColorFace);
+		if(push)
+			DrawFrame(w, sz, SColorShadow, SColorLight);
+		else
+		if(HasMouse())
+			DrawFrame(w, sz, SColorLight, SColorShadow);
+	}
+	if(IsNull(color))
+		w.DrawImage(center.x + push, center.y + push, nullimage);
+	else
+		w.DrawImage(center.x + push, center.y + push, image, color);
+	w.DrawImage(center.x + push, center.y + push, staticimage);
+}
+
+void  ColorButton::MouseEnter(Point p, dword keyflags)
+{
+	Refresh();
+}
+
+void  ColorButton::MouseLeave()
+{
+	Refresh();
+}
+
+ColorButton::ColorButton()
+{
+	style = &ToolBar::StyleDefault().buttonstyle;
+	SetFrame(NullFrame());
+	NoTrack();
+	Transparent();
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/CtrlLib/ColumnList.cpp b/uppsrc/CtrlLib/ColumnList.cpp
new file mode 100644
index 000000000..ffa44a358
--- /dev/null
+++ b/uppsrc/CtrlLib/ColumnList.cpp
@@ -0,0 +1,809 @@
+#include "CtrlLib.h"
+
+NAMESPACE_UPP
+
+void ColumnList::MouseWheel(Point p, int zdelta, dword keyflags) {
+	sb.Wheel(zdelta);
+}
+
+int  ColumnList::GetColumnCx(int i) const {
+	int szcx = GetSize().cx;
+	int cx = max(szcx / max(ncl, 1), Draw::GetStdFontCy());
+	return i == ncl - 1 ? szcx - i * cx : cx;
+}
+
+int ColumnList::GetColumnItems() const {
+	if(cy == 0) return 0;
+	return GetSize().cy / cy;
+}
+
+int  ColumnList::GetDragColumn(int x) const {
+	int cx = GetColumnCx();
+	int i = 0;
+	if(cx == 0) return -1;
+	for(;;) {
+		x -= GetColumnCx(i);
+		if(x >= -3 && x < 4)
+			return i;
+		if(x < 0) return -1;
+		i++;
+	}
+}
+
+void ColumnList::ShiftSelect() {
+	if(anchor < 0)
+		anchor = cursor;
+	int l = min(anchor, cursor);
+	int h = max(anchor, cursor);
+	for(int i = 0; i < GetCount(); i++) {
+		bool sel = i >= l && i <= h;
+		if(item[i].canselect && item[i].sel != sel) {
+			item[i].sel = sel;
+			RefreshItem(i);
+		}
+	}
+	UpdateSelect();
+}
+
+Image ColumnList::CursorImage(Point p, dword)
+{
+	return HasCapture() || GetDragColumn(p.x) >= 0 ? Image::SizeHorz() : Image::Arrow();
+}
+
+int ColumnList::GetItem(Point p)
+{
+	int i = p.y / cy + GetColumnItems() * (p.x / GetColumnCx(0));
+	if(i < 0 || i >= GetPageItems())
+		return -1;
+	i += sb;
+	return i >= 0 && i < GetCount() ? i : -1;
+}
+
+void ColumnList::PointDown(Point p) {
+	int i = GetItem(p);
+	if(i >= 0 && i < GetCount())
+		SetCursor0(i, false);
+	else
+	if(clickkill)
+		KillCursor();
+}
+
+void ColumnList::DoClick(Point p, dword flags)
+{
+	SetWantFocus();
+	PointDown(p);
+	p.y %= cy;
+	p.x %= GetColumnCx(0);
+	if(multi && cursor >= 0) {
+		if(flags & K_SHIFT)
+			ShiftSelect();
+		else
+		if(flags & K_CTRL)
+			SelectOne(cursor, !IsSelected(cursor));
+		else {
+			ClearSelection();
+			SelectOne(cursor, true);
+			anchor = cursor;
+		}
+	}
+	WhenLeftClick();
+	WhenLeftClickPos(p);
+}
+
+void ColumnList::LeftDown(Point p, dword flags) {
+	selclick = false;
+	int i = GetDragColumn(p.x);
+	if(i >= 0) {
+		ci = i;
+		dx = p.x - GetColumnCx(0) * (i + 1);
+		mpos = p.x;
+		SetCapture();
+		Refresh(mpos - dx, 0, 1, GetSize().cy);
+		SyncInfo();
+	}
+	else {
+		int i = GetItem(p);
+		if(i >= 0 && i < GetCount() && multi && IsSel(i))
+			selclick = true;
+		else
+			DoClick(p, flags);
+	}
+}
+
+void ColumnList::LeftUp(Point p, dword flags)
+{
+	if(selclick)
+		DoClick(p, flags);
+	selclick = false;
+	if(HasCapture()) {
+		Refresh();
+		SyncInfo();
+	}
+}
+
+void ColumnList::LeftDrag(Point p, dword keyflags)
+{
+	if(!HasCapture())
+		WhenDrag();
+}
+
+void ColumnList::RightDown(Point p, dword flags) {
+	int i = GetItem(p);
+	if(!(i >= 0 && i < GetCount() && multi && IsSel(i)))
+		PointDown(p);
+	MenuBar::Execute(WhenBar);
+}
+
+void ColumnList::LeftDouble(Point p, dword flags) {
+	LeftDown(p, flags);
+	WhenLeftDouble();
+}
+
+void ColumnList::SyncInfo()
+{
+	if((HasMouse() || info.HasMouse()) && !HasCapture() && popupex) {
+		Point p = GetMouseViewPos();
+		int i = GetItem(p);
+		if(i >= 0) {
+			Rect r = GetItemRect(i);
+			if(p.x > r.left + 3 && p.x < r.right - 2) {
+				Color ink, paper;
+				dword style;
+				GetItemStyle(i, ink, paper, style);
+				Item& m = item[i];
+				info.Set(this, r, m.value, m.display ? m.display : display, ink, paper, style);
+				return;
+			}
+		}
+	}
+	info.Cancel();
+}
+
+void ColumnList::MouseMove(Point p, dword)
+{
+	if(HasCapture()) {
+		int cx = sb.GetViewSize().cx;
+		Refresh(mpos - dx, 0, 1, GetSize().cy);
+		mpos = p.x;
+		Refresh(mpos - dx, 0, 1, GetSize().cy);
+		int ocl = ncl;
+		ncl = max(1, cx * (ci + 1) / max(p.x, Draw::GetStdFontCy()));
+		if(ncl != ocl)
+			Refresh();
+		SetSb();
+	}
+	SyncInfo();
+}
+
+void ColumnList::CancelMode()
+{
+	info.Cancel();
+	dropitem = -1;
+	anchor = -1;
+	selclick = false;
+}
+
+void ColumnList::MouseLeave()
+{
+	if(!info.IsOpen())
+		info.Cancel();
+}
+
+Rect ColumnList::GetItemRect(int i) const {
+	i -= sb;
+	int n = GetColumnItems();
+	if(i < 0 || n == 0) return Rect(0, 0, 0, 0);
+	int cl = i / n;
+	int x = 0;
+	for(int q = 0; q < cl; q++)
+		x += GetColumnCx(q);
+	return RectC(x, i % n * cy, GetColumnCx(cl), cy);
+}
+
+void ColumnList::Page(bool down) {
+	int q = sb;
+	if(down)
+		sb.NextPage();
+	else
+		sb.PrevPage();
+	if(q == sb)
+		SetCursor(down ? GetCount() - 1 : 0);
+	else
+		SetCursor(cursor - q + sb);
+}
+
+bool ColumnList::Key(dword _key, int count) {
+	int c = cursor;
+	bool sel = _key & K_SHIFT;
+	int key = _key & ~K_SHIFT;
+	switch(key) {
+	case K_UP:
+		if(c < 0)
+			c = GetCount() - 1;
+		else
+		if(c > 0)
+			c--;
+		break;
+	case K_DOWN:
+		if(c < 0)
+			c = 0;
+		else
+		if(c < GetCount() - 1)
+			c++;
+		break;
+	case K_LEFT:
+		c = max(c - GetColumnItems(), 0);
+		break;
+	case K_RIGHT:
+		c = min(c + GetColumnItems(), GetCount() - 1);
+		break;
+	case K_PAGEUP:
+		Page(false);
+		return true;
+	case K_PAGEDOWN:
+		Page(true);
+		return true;
+	case K_HOME:
+		c = 0;
+		break;
+	case K_END:
+		c = GetCount() - 1;
+		break;
+	default:
+		return MenuBar::Scan(WhenBar, _key);
+	}
+	if(sel) {
+		SetCursor0(c, false);
+		ShiftSelect();
+	}
+	else {
+		SetCursor(c);
+		anchor = c;
+	}
+	return true;
+}
+
+void ColumnList::RefreshSel()
+{
+	for(int i = 0; i < item.GetCount(); i++)
+		if(item[i].sel)
+			RefreshItem(i);
+}
+
+void ColumnList::ClearSelection() {
+	bool upd = false;
+	for(int i = 0; i < item.GetCount(); i++)
+		if(item[i].sel) {
+			item[i].sel = false;
+			upd = true;
+			RefreshItem(i);
+		}
+	if(upd)
+		UpdateSelect();
+}
+
+void ColumnList::SelectOne(int i, bool sel) {
+	if(!multi) return;
+	if(item[i].canselect)
+		item[i].sel = sel;
+	UpdateSelect();
+	RefreshItem(i);
+}
+
+bool ColumnList::IsSelected(int i) const {
+	return item[i].sel;
+}
+
+bool ColumnList::IsSel(int i) const
+{
+	return IsMultiSelect() ? IsSelected(i) : GetCursor() == i;
+}
+
+void ColumnList::UpdateSelect() {
+	selcount = 0;
+	for(int i = 0; i < item.GetCount(); i++)
+		if(item[i].sel)
+			selcount++;
+	SyncInfo();
+	Action();
+	WhenSelection();
+	WhenSel();
+}
+
+void ColumnList::GetItemStyle(int i, Color& fg, Color& bg, dword& st)
+{
+	st = 0;
+	bool hasfocus = HasFocusDeep() && !IsDragAndDropTarget();
+	bool drop = i == dropitem && !insert;
+	if(IsReadOnly())
+		st |= Display::READONLY;
+	if(IsSelected(i))
+		st |= Display::SELECT;
+	if(i == cursor)
+		st |= Display::CURSOR;
+	if(drop) {
+		hasfocus = true;
+		st |= Display::CURSOR;
+	}
+	if(hasfocus)
+		st |= Display::FOCUS;
+	fg = SColorText;
+	bg = SColorPaper;
+	if(nobg)
+		bg = Null;
+	if((st & Display::SELECT) ||
+	   (!multi || !item[i].canselect && selcount == 0) && (st & Display::CURSOR) ||
+	   drop) {
+		fg = hasfocus ? SColorHighlightText : SColorText;
+		bg = hasfocus ? SColorHighlight : Blend(SColorDisabled, SColorPaper);
+	}
+}
+
+dword ColumnList::PaintItem(Draw& w, int i, const Rect& r)
+{
+	Color ink, paper;
+	dword style;
+	GetItemStyle(i, ink, paper, style);
+	const Item& m = item[i];
+	w.Clip(r);
+	(m.display ? m.display : display)->Paint(w, r, m.value, ink, paper, style);
+	w.End();
+	return style;
+}
+
+void ColumnList::Paint(Draw& w) {
+	Size sz = GetSize();
+	if(GetColumnCx(0) == 0) return;
+	int x = 0;
+	int i = sb;
+	int coli = 0;
+	while(x < sz.cx) {
+		int cx = GetColumnCx(coli++);
+		int y = 0;
+		while(y + cy <= sz.cy) {
+			Rect rect = RectC(x, y, cx, cy);
+			if(i < GetCount()) {
+				if(w.IsPainting(rect)) {
+					Rect r = rect;
+					r.right--;
+					dword style = PaintItem(w, i, r);
+					w.DrawRect(rect.right - 1, rect.top, 1, rect.Height(),
+					           x + cx < sz.cx ? SColorDisabled : SColorPaper);
+					if(i == cursor && selcount != 1 && multi && item[i].canselect)
+						DrawFocus(w, r, style & Display::SELECT ? SColorPaper() : SColorText());
+				}
+			}
+			else
+				w.DrawRect(rect, SColorPaper);
+			if(i == dropitem && insert)
+				DrawHorzDrop(w, x, y, cx);
+			if(i + 1 == dropitem && insert && y + 2 * cy > sz.cy)
+				DrawHorzDrop(w, x, y + cy - 2, cx);
+			y += cy;
+			i++;
+		}
+		w.DrawRect(x, y, cx, sz.cy - y, SColorPaper);
+		x += cx;
+	}
+	if(HasCapture())
+		w.DrawRect(mpos - dx, 0, 1, sz.cy, Blend(SColorHighlight, SColorFace));
+	scroller.Set(sb);
+}
+
+Image ColumnList::GetDragSample()
+{
+	Size sz = StdSampleSize();
+	ImageDraw iw(sz);
+	int y = 0;
+	for(int i = 0; i < GetCount() && y < sz.cy; i++)
+		if(IsSel(i)) {
+			PaintItem(iw, i, RectC(0, y, sz.cx, cy));
+			y += cy;
+		}
+	return Crop(iw, 0, 0, sz.cx, y);;
+}
+
+int  ColumnList::GetPageItems() const {
+	return ncl * GetColumnItems();
+}
+
+void ColumnList::SetSb() {
+	sb.SetTotal(GetCount());
+	sb.SetPage(GetPageItems());
+}
+
+void ColumnList::Layout() {
+	SetSb();
+}
+
+void ColumnList::Scroll() {
+	Size sz = GetSize();
+	sz.cy = sz.cy / cy * cy;
+	scroller.Scroll(*this, sz, sb, cy);
+	info.Cancel();
+}
+
+void ColumnList::RefreshItem(int i, int ex)
+{
+	if(i >= 0) {
+		Refresh(GetItemRect(i).InflatedVert(ex));
+		SyncInfo();
+	}
+}
+
+void ColumnList::SetCursor0(int c, bool sel)
+{
+	int c0 = cursor;
+	c = minmax(c, 0, GetCount() - 1);
+	if(c < 0 || cursor < 0)
+		Refresh();
+	else
+		RefreshCursor();
+	cursor = c;
+	int q = sb;
+	sb.ScrollInto(cursor);
+	if(q != sb)
+		Refresh();
+	else
+		RefreshCursor();
+	if(sel && multi) {
+		ClearSelection();
+		if(cursor >= 0) {
+			SelectOne(cursor, true);
+			anchor = cursor;
+		}
+	}
+	if(c0 != cursor) {
+		if(cursor >= 0)
+			WhenEnterItem();
+		else
+			WhenKillCursor();
+		WhenSel();
+	}
+	SyncInfo();
+	Action();
+}
+
+void ColumnList::SetCursor(int c)
+{
+	SetCursor0(c, true);
+}
+
+void ColumnList::SetSbPos(int y)
+{
+	SetSb();
+	sb = minmax(y, 0, GetCount() - GetPageItems());
+}
+
+void ColumnList::KillCursor()
+{
+	if(cursor < 0) return;
+	Refresh();
+	SyncInfo();
+	cursor = -1;
+	sb.Begin();
+	WhenKillCursor();
+	WhenSel();
+	Action();
+}
+
+void ColumnList::GotFocus()
+{
+	if(cursor < 0 && GetCount())
+		SetCursor(sb);
+	Refresh();
+	SyncInfo();
+}
+
+void ColumnList::LostFocus()
+{
+	Refresh();
+	SyncInfo();
+}
+
+int ColumnList::RoundedCy()
+{
+	Rect r = GetRect();
+	Rect rr = r;
+	frame->FrameLayout(r);
+	return r.Height() / cy * cy + rr.Height() - r.Height();
+}
+
+void ColumnList::FrameLayout(Rect& r)
+{
+	r.bottom = r.top + RoundedCy();
+	frame->FrameLayout(r);
+}
+
+void ColumnList::FrameAddSize(Size& sz)
+{
+	frame->FrameAddSize(sz);
+}
+
+void ColumnList::FramePaint(Draw& draw, const Rect& r)
+{
+	int ry = RoundedCy();
+	Rect rr = r;
+	rr.bottom = ry;
+	frame->FramePaint(draw, rr);
+	rr = r;
+	rr.top = ry;
+	draw.DrawRect(rr, SColorFace);
+}
+
+ColumnList& ColumnList::RoundSize(bool b)
+{
+	if(b)
+		Ctrl::SetFrame(0, *this);
+	else
+		Ctrl::SetFrame(0, *frame);
+	RefreshLayout();
+	Refresh();
+	SyncInfo();
+	return *this;
+}
+
+void ColumnList::SetFrame(CtrlFrame& _frame)
+{
+	frame = &_frame;
+	RefreshLayout();
+	Refresh();
+	SyncInfo();
+}
+
+struct ColumnList::ItemOrder {
+	const ValueOrder *order;
+	bool operator()(const Item& a, const Item& b) const {
+		return (*order)(a.value, b.value);
+	}
+};
+
+void ColumnList::Sort(const ValueOrder& order)
+{
+	ItemOrder itemorder;
+	itemorder.order = &order;
+	KillCursor();
+	UPP::Sort(item, itemorder);
+	sb.Begin();
+	SyncInfo();
+}
+
+void ColumnList::Clear() {
+	CancelMode();
+	KillCursor();
+	item.Clear();
+	selcount = 0;
+	Update();
+	Refresh();
+	SyncInfo();
+	SetSb();
+}
+
+void ColumnList::Insert(int ii, const Value& val, bool canselect)
+{
+	int c = -1;
+	if(cursor >= ii) {
+		c = cursor + 1;
+		KillCursor();
+	}
+	Item& m = item.Insert(ii);
+	m.value = val;
+	m.sel = false;
+	m.canselect = canselect;
+	m.display = NULL;
+	Refresh();
+	SyncInfo();
+	SetSb();
+	if(c >= 0)
+		SetCursor(c);
+}
+
+void ColumnList::Insert(int ii, const Value& val, const Display& display, bool canselect)
+{
+	Insert(ii, val, canselect);
+	item[ii].display = &display;
+	SyncInfo();
+}
+
+void ColumnList::Set(int ii, const Value& val, bool canselect)
+{
+	Item& m = item[ii];
+	m.value = val;
+	m.sel = false;
+	m.canselect = canselect;
+	m.display = NULL;
+	RefreshItem(ii);
+	SyncInfo();
+	SetSb();
+}
+
+void ColumnList::Set(int ii, const Value& val, const Display& display, bool canselect)
+{
+	Set(ii, val, canselect);
+	item[ii].display = &display;
+	SyncInfo();
+}
+
+void ColumnList::Remove(int ii)
+{
+	int c = -1;
+	if(cursor >= ii) {
+		c = max(ii, cursor - 1);
+		KillCursor();
+	}
+	item.Remove(ii);
+	Refresh();
+	SyncInfo();
+	SetSb();
+	if(c >= 0)
+		SetCursor(c);
+}
+
+void ColumnList::Add(const Value& val, bool canselect)
+{
+	Insert(item.GetCount(), val, canselect);
+}
+
+void ColumnList::Add(const Value& val, const Display& display, bool canselect)
+{
+	Add(val, canselect);
+	item.Top().display = &display;
+}
+
+void ColumnList::DnD(int _drop, bool _insert)
+{
+	if(dropitem != _drop || insert != _insert) {
+		RefreshItem(dropitem - 1);
+		RefreshItem(dropitem);
+		dropitem = _drop;
+		insert = _insert;
+		RefreshItem(dropitem - 1);
+		RefreshItem(dropitem);
+	}
+}
+
+bool ColumnList::DnDInsert(int i, int py, PasteClip& d, int q)
+{
+	Rect r = GetItemRect(i);
+	int cy = r.GetHeight();
+	if(py < r.top + cy / q) {
+		WhenDropInsert(i, d);
+		if(d.IsAccepted()) {
+			DnD(i, true);
+			return true;
+		}
+	}
+	if(py >= r.top + (q - 1) * cy / q && i < GetCount()) {
+		WhenDropInsert(i + 1, d);
+		if(d.IsAccepted()) {
+			DnD(i + 1, true);
+			return true;
+		}
+	}
+	return false;
+}
+
+void ColumnList::DragAndDrop(Point p, PasteClip& d)
+{
+	int i = GetItem(p);
+	if(i >= 0) {
+		if(DnDInsert(i, p.y, d, 4))
+			return;
+		WhenDropItem(i, d);
+		if(d.IsAccepted()) {
+			DnD(i, false);
+			return;
+		}
+		if(DnDInsert(i, p.y, d, 2))
+			return;
+	}
+	if(GetCount() == 0 && p.y < 4 || !WhenDrop) {
+		WhenDropInsert(GetCount(), d);
+		if(d.IsAccepted()) {
+			DnD(GetCount(), true);
+			return;
+		}
+	}
+	WhenDrop(d);
+	DnD(-1, false);
+}
+
+void ColumnList::DragRepeat(Point p)
+{
+	sb = sb + GetDragScroll(this, p, 1).y;
+}
+
+void ColumnList::DragEnter()
+{
+	RefreshSel();
+}
+
+void ColumnList::DragLeave()
+{
+	DnD(-1, false);
+	RefreshSel();
+}
+
+void ColumnList::RemoveSelection()
+{
+	for(int i = GetCount() - 1; i >= 0; i--)
+		if(IsSel(i))
+			Remove(i); // Optimize!
+}
+
+void ColumnList::InsertDrop(int ii, const Vector<Value>& data, PasteClip& d, bool self)
+{
+	if(data.GetCount() == 0)
+		return;
+	if(d.GetAction() == DND_MOVE && self) {
+		for(int i = GetCount() - 1; i >= 0; i--) {
+			if(IsSel(i)) {
+				Remove(i); // Optimize!
+				if(i < ii)
+					ii--;
+			}
+		}
+		KillCursor();
+		d.SetAction(DND_COPY);
+	}
+	item.InsertN(ii, data.GetCount());
+	for(int i = 0; i < data.GetCount(); i++) {
+		Item& m = item[ii + i];
+		m.value = data[i];
+		m.sel = false;
+		m.canselect = true;
+		m.display = NULL;
+	}
+	Refresh();
+	SyncInfo();
+	SetSb();
+	ClearSelection();
+	SetCursor(ii + data.GetCount() - 1);
+	if(IsMultiSelect())
+		for(int i = 0; i < data.GetCount(); i++)
+			SelectOne(ii + i, true);
+}
+
+void ColumnList::InsertDrop(int ii, const ColumnList& src, PasteClip& d)
+{
+	Vector<Value> data;
+	for(int i = 0; i < src.GetCount(); i++)
+		if(src.IsSel(i))
+			data.Add(src[i]);
+	InsertDrop(ii, data, d, &src == this);
+}
+
+void ColumnList::InsertDrop(int ii, PasteClip& d)
+{
+	InsertDrop(ii, GetInternal<ColumnList>(d), d);
+}
+
+void ColumnList::Serialize(Stream& s) {
+	int version = 0;
+	s / version;
+	s / ncl;
+	Refresh();
+	SyncInfo();
+}
+
+ColumnList::ColumnList() {
+	clickkill = false;
+	ncl = 1;
+	cy = Draw::GetStdFontCy();
+	cursor = -1;
+	AddFrame(sb);
+	sb.WhenScroll = THISBACK(Scroll);
+	sb.AutoHide();
+	Ctrl::SetFrame(ViewFrame());
+	frame = &ViewFrame();
+	RoundSize();
+	display = &StdDisplay();
+	multi = false;
+	selcount = 0;
+	nobg = false;
+	popupex = true;
+}
+
+ColumnList::~ColumnList() {}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/CtrlLib/ColumnList.h b/uppsrc/CtrlLib/ColumnList.h
new file mode 100644
index 000000000..bcbe70a3c
--- /dev/null
+++ b/uppsrc/CtrlLib/ColumnList.h
@@ -0,0 +1,174 @@
+class ColumnList : public Ctrl, private CtrlFrame {
+public:
+	virtual void  Serialize(Stream& s);
+	virtual void  Paint(Draw& w);
+	virtual void  Layout();
+	virtual Image CursorImage(Point p, dword);
+	virtual void  LeftDown(Point p, dword);
+	virtual void  LeftUp(Point p, dword);
+	virtual void  LeftDouble(Point p, dword);
+	virtual void  RightDown(Point p, dword);
+	virtual void  LeftDrag(Point p, dword keyflags);
+	virtual void  MouseMove(Point p, dword);
+	virtual void  MouseLeave();
+	virtual void  MouseWheel(Point p, int zdelta, dword keyflags);
+	virtual bool  Key(dword key, int count);
+	virtual void  GotFocus();
+	virtual void  LostFocus();
+	virtual void  CancelMode();
+	virtual void  DragEnter();
+	virtual void  DragAndDrop(Point p, PasteClip& d);
+	virtual void  DragRepeat(Point p);
+	virtual void  DragLeave();
+
+private:
+	virtual void  FrameLayout(Rect& r);
+	virtual void  FrameAddSize(Size& sz);
+	virtual void  FramePaint(Draw& draw, const Rect& r);
+
+private:
+	int        ncl;
+	int        cy;
+	int        cursor, anchor;
+	int        dx;
+	int        ci;
+	int        mpos;
+	ScrollBar  sb;
+	Scroller   scroller;
+	CtrlFrame *frame;
+	int        dropitem;
+	bool       insert;
+	bool       clickkill;
+	bool       nobg;
+	bool       popupex;
+
+	bool       selclick;
+
+	DisplayPopup info;
+
+	const Display *display;
+
+	struct Item {
+		bool           sel;
+		bool           canselect;
+		Value          value;
+		const Display *display;
+	};
+
+	Array<Item> item;
+	int         selcount;
+	bool        multi;
+
+	struct  ItemOrder;
+	friend struct ItemOrder;
+
+	void    SetSb();
+	void    Scroll();
+	int     GetDragColumn(int x) const;
+	int     RoundedCy();
+	void    Page(bool down);
+	void    PointDown(Point p);
+	void    DoClick(Point p, dword flags);
+	void    ShiftSelect();
+	void    RefreshItem(int i, int ex = 0);
+	void    RefreshCursor()                    { RefreshItem(cursor); }
+	void    GetItemStyle(int i, Color& ink, Color& paper, dword& style);
+	dword   PaintItem(Draw& w, int i, const Rect& r);
+	void    SyncInfo();
+	void    SetCursor0(int c, bool sel);
+	void    UpdateSelect();
+	void    RefreshSel();
+
+	bool    DnDInsert(int i, int py, PasteClip& d, int q);
+	void    DnD(int _drop, bool _insert);
+
+public:
+	Callback         WhenLeftClick;
+	Callback1<Point> WhenLeftClickPos;
+	Callback         WhenLeftDouble;
+	Callback1<Bar&>  WhenBar;
+	Callback         WhenSel;
+
+	Callback                     WhenDrag;
+	Callback2<int, PasteClip&>   WhenDropItem;
+	Callback2<int, PasteClip&>   WhenDropInsert;
+	Callback1<PasteClip&>        WhenDrop;
+
+
+
+	// depracated - use WhenSel
+	Callback         WhenSelection;
+	Callback         WhenEnterItem;
+	Callback         WhenKillCursor;
+
+	int     GetColumnItems() const;
+	int     GetColumnCx(int i = 0) const;
+	int     GetPageItems() const;
+
+	int     GetItem(Point p);
+	Rect    GetItemRect(int i) const;
+
+	int     GetCursor() const                          { return cursor; }
+	void    SetCursor(int c);
+	void    KillCursor();
+	bool    IsCursor() const                           { return cursor >= 0; }
+
+	int     GetSbPos() const                           { return sb; }
+	void    SetSbPos(int y);
+
+	void    SetFrame(CtrlFrame& frame);
+
+	void         Clear();
+	void         Add(const Value& val, bool canselect = true);
+	void         Add(const Value& val, const Display& display, bool canselect = true);
+	int          GetCount() const                     { return item.GetCount();; }
+	const Value& Get(int i) const                     { return item[i].value; }
+	const Value& operator[](int i) const              { return item[i].value; }
+
+	void         Set(int ii, const Value& val, bool canselect = true);
+	void         Set(int ii, const Value& val, const Display& display, bool canselect = true);
+
+	void         Insert(int ii, const Value& val, bool canselect = true);
+	void         Insert(int ii, const Value& val, const Display& display, bool canselect = true);
+	void         Remove(int ii);
+
+	void         RemoveSelection();
+
+	bool         IsSelection() const                  { return selcount > 0; }
+	void         ClearSelection();
+	void         SelectOne(int i, bool sel);
+	bool         IsSelected(int i) const;
+	bool         IsSel(int i) const;
+
+	void         Sort(const ValueOrder& order);
+
+	Image        GetDragSample();
+
+	void         InsertDrop(int ii, const Vector<Value>& data, PasteClip& d, bool self);
+	void         InsertDrop(int ii, const ColumnList& src, PasteClip& d);
+	void         InsertDrop(int ii, PasteClip& d);
+
+	ColumnList&  Columns(int _n)                      { ncl = _n; Refresh(); return *this; }
+	int          GetColumns() const                   { return ncl; }
+	ColumnList&  ItemHeight(int _cy)                  { cy = _cy; RefreshLayout(); Refresh(); return *this; }
+	int          GetItemHeight() const                { return cy; }
+	ColumnList&  RoundSize(bool b = true);
+	ColumnList&  NoRoundSize()                        { return RoundSize(false); }
+	ColumnList&  ClickKill(bool b = true)             { clickkill = b; return *this; }
+	ColumnList&  NoClickKill()                        { return ClickKill(false); }
+	ColumnList&  SetDisplay(const Display& d)         { display = &d; return *this; }
+	ColumnList&  NoBackground(bool b = true)          { nobg = b; Transparent(); Refresh(); return *this; }
+	ColumnList&  Multi(bool b = true)                 { multi = b; return *this; }
+	bool         IsMulti() const                      { return multi; }
+	ColumnList&  MultiSelect(bool b = true)           { multi = b; return *this; }
+	bool         IsMultiSelect() const                { return multi; }
+	ColumnList&  PopUpEx(bool b = true)               { popupex = b; return *this; }
+	ColumnList&  NoPopUpEx()                          { return PopUpEx(false); }
+
+	ColumnList&  SetScrollBarStyle(const ScrollBar::Style& s) { sb.SetStyle(s); return *this; }
+
+	typedef ColumnList CLASSNAME;
+
+	ColumnList();
+	virtual ~ColumnList();
+};
diff --git a/uppsrc/CtrlLib/Complex.upt b/uppsrc/CtrlLib/Complex.upt
new file mode 100644
index 000000000..80487fc02
--- /dev/null
+++ b/uppsrc/CtrlLib/Complex.upt
@@ -0,0 +1,70 @@
+template "CtrlLib application with main window" main;
+
+id     "Main window class name" classname = PACKAGE;
+select("No layouts", "Generate layout file", "Main window has layout", "Main window has OK/Cancel")
+       "Layout" lay = 2;
+option "Imagelist file"         iml;
+option "Multithreaded"          mt;
+
+@@<:PACKAGE:>.h
+#ifndef _<:PACKAGE:>_<:PACKAGE:>_h
+#define _<:PACKAGE:>_<:PACKAGE:>_h
+
+#include <CtrlLib/CtrlLib.h>
+
+using namespace Upp;
+
+<:?lay:>#define LAYOUTFILE <<:PACKAGE:>/<:PACKAGE:>.lay>
+#include <CtrlCore/lay.h><:.:>
+
+<:?iml:>#define IMAGEFILE <<:PACKAGE:>/<:PACKAGE:>.iml>
+#include <Draw/iml_header.h><:.:>
+
+class <:classname:> : public <:lay > 1 ? "With" + classname + "Layout<TopWindow>" : "TopWindow":> {
+public:
+	typedef <:classname:> CLASSNAME;
+	<:classname:>();
+};
+
+#endif
+
+@@main.cpp
+#include "<:PACKAGE:>.h"
+
+<:?iml:>#define IMAGEFILE <<:PACKAGE:>/<:PACKAGE:>.iml>
+#include <Draw/iml_source.h><:.:>
+
+<:classname:>::<:classname:>()
+{
+	<:?lay > 1:>CtrlLayout<:(lay == 3 ? "OKCancel" : ""):>(*this, "Window title");<:.:>
+}
+
+GUI_APP_MAIN
+{
+	<:classname:>().Run();
+}
+
+@@<:PACKAGE:>.lay
+??lay
+
+LAYOUT(<:classname:>Layout, 200, 100)
+	<:?lay == 3:>ITEM(Button, ok, SetLabel("OK").RightPosZ(90, 80).BottomPosZ(4, 22))
+	ITEM(Button, cancel, SetLabel("Cancel").RightPosZ(4, 80).BottomPosZ(4, 22))<:.:>
+END_LAYOUT
+
+@@<:PACKAGE:>.iml
+??iml
+
+@@<:PACKAGE:>.upp
+uses
+	CtrlLib;
+
+file
+	"<:PACKAGE:>.h"
+	, main.cpp
+	<:?lay:>, "<:PACKAGE:>.lay"<:.:>
+	<:?iml:>, "<:PACKAGE:>.iml"<:.:>
+;
+
+mainconfig
+	"" = <:?mt:>"GUI MT"<:/:>"GUI"<:.:>;
diff --git a/uppsrc/CtrlLib/Ctrl.iml b/uppsrc/CtrlLib/Ctrl.iml
new file mode 100644
index 000000000..6f9596580
--- /dev/null
+++ b/uppsrc/CtrlLib/Ctrl.iml
@@ -0,0 +1,293 @@
+PREMULTIPLIED
+IMAGE_ID(arrow)
+IMAGE_ID(exclamation)
+IMAGE_ID(information)
+IMAGE_ID(question)
+IMAGE_ID(error)
+IMAGE_ID(smallcheck)
+IMAGE_ID(smallup)
+IMAGE_ID(smalldown)
+IMAGE_ID(smallleft)
+IMAGE_ID(smallright)
+IMAGE_ID(spinup3)
+IMAGE_ID(spinup2)
+IMAGE_ID(spinup)
+IMAGE_ID(spindown3)
+IMAGE_ID(spindown2)
+IMAGE_ID(spindown)
+IMAGE_ID(reporticon)
+IMAGE_ID(smallreporticon)
+IMAGE_ID(ibeam0)
+IMAGE_ID(HandCursor)
+IMAGE_ID(HelpCursor0)
+IMAGE_ID(HelpCursor1)
+IMAGE_ID(write)
+IMAGE_ID(open)
+IMAGE_ID(save)
+IMAGE_ID(save_as)
+IMAGE_ID(print)
+IMAGE_ID(new_doc)
+IMAGE_ID(menu_window)
+IMAGE_ID(undo)
+IMAGE_ID(redo)
+IMAGE_ID(cut)
+IMAGE_ID(copy)
+IMAGE_ID(paste)
+IMAGE_ID(remove)
+IMAGE_ID(menu_check)
+IMAGE_ID(menu_radio)
+IMAGE_ID(right_arrow)
+IMAGE_ID(white_right_arrow)
+IMAGE_ID(check)
+IMAGE_ID(white_check)
+IMAGE_ID(left_arrow)
+IMAGE_ID(white_left_arrow)
+IMAGE_ID(cross)
+IMAGE_ID(up_arrow)
+IMAGE_ID(down_arrow)
+IMAGE_ID(plus)
+IMAGE_ID(selection)
+IMAGE_ID(Dir)
+IMAGE_ID(DirUp)
+IMAGE_ID(MkDir)
+IMAGE_ID(File)
+IMAGE_ID(Plus)
+IMAGE_ID(Minus)
+IMAGE_ID(Toggle)
+IMAGE_ID(Diskette)
+IMAGE_ID(Hd)
+IMAGE_ID(CdRom)
+IMAGE_ID(Computer)
+IMAGE_ID(Network)
+IMAGE_ID(Var)
+IMAGE_ID(Home)
+IMAGE_ID(MenuCheck1)
+IMAGE_ID(MenuCheck0)
+IMAGE_ID(Empty16x16)
+IMAGE_ID(MenuRadio0)
+IMAGE_ID(MenuRadio1)
+IMAGE_ID(set_transparent)
+IMAGE_ID(wheel_cursor)
+IMAGE_ID(white_wheel_cursor)
+IMAGE_ID(column_cursor)
+IMAGE_ID(swap_color_cursor)
+IMAGE_ID(fetch_color)
+IMAGE_ID(fetch_color_cursor)
+IMAGE_ID(tab_wheel)
+IMAGE_ID(hthumb)
+IMAGE_ID(vthumb)
+IMAGE_ID(hthumb1)
+IMAGE_ID(vthumb1)
+IMAGE_ID(treeplus)
+IMAGE_ID(tree0)
+IMAGE_ID(tree1)
+IMAGE_ID(tree2)
+IMAGE_ID(treeminus)
+IMAGE_ID(Add)
+IMAGE_ID(Remove)
+IMAGE_ID(SmallDown)
+IMAGE_ID(SmallUp)
+IMAGE_ID(SmallRight)
+IMAGE_ID(SmallLeft)
+IMAGE_ID(go_back)
+IMAGE_ID(go_forward)
+IMAGE_ID(font_size)
+IMAGE_ID(help)
+IMAGE_ID(focus_h)
+IMAGE_ID(focus_v)
+IMAGE_ID(checkers)
+IMAGE_ID(SmallDot)
+IMAGE_ID(SmallDotH)
+IMAGE_ID(BigDot)
+IMAGE_ID(BigDotH)
+IMAGE_ID(Bg)
+IMAGE_ID(SortUp)
+IMAGE_ID(SortDown)
+
+IMAGE_BEGIN_DATA
+IMAGE_DATA(120,156,237,154,11,110,196,32,12,68,125,148,189,64,165,30,49,71,203,205,82,209,124,74,89,2,54,193,216,180,51,146)
+IMAGE_DATA(165,86,221,45,111,50,94,2,100,233,69,47,130,222,180,57,24,223,146,97,35,91,134,141,108,25,210,241,71,51,228,198)
+IMAGE_DATA(31,201,112,55,254,40,134,210,248,35,24,188,228,159,254,60,114,252,148,197,195,124,244,95,199,135,32,8,130,32,8,210)
+IMAGE_DATA(209,39,125,88,35,64,16,228,88,203,66,219,89,214,44,82,5,230,109,219,107,93,215,169,54,117,49,123,234,97,89,22)
+IMAGE_DATA(247,62,114,252,161,232,224,247,236,225,142,61,205,192,171,135,18,191,247,12,106,236,222,51,224,240,123,205,128,203,238,53)
+IMAGE_DATA(131,148,63,154,243,191,43,252,238,53,131,220,181,167,204,193,180,215,12,90,248,189,100,80,186,87,213,248,61,100,240,132)
+IMAGE_DATA(223,58,131,210,156,195,229,183,204,160,196,127,172,153,175,170,121,29,205,95,155,239,107,243,167,117,6,156,251,21,85,122)
+IMAGE_DATA(199,42,3,238,189,246,236,33,111,235,34,46,255,201,84,234,157,209,25,72,214,57,39,19,247,181,35,50,144,242,75,75)
+IMAGE_DATA(147,95,202,30,207,65,220,30,210,204,160,165,119,72,48,7,105,102,208,210,55,173,252,26,25,180,240,183,244,143,86,6)
+IMAGE_DATA(218,159,219,18,127,15,15,35,249,211,254,153,41,131,28,123,239,207,49,101,214,198,61,43,101,215,185,23,188,143,161,85)
+IMAGE_DATA(189,217,71,122,208,98,135,32,8,130,254,128,240,101,14,8,130,114,154,113,129,25,243,237,27,247,188,194,223,60,121,225)
+IMAGE_DATA(48,115,188,88,177,183,112,223,249,24,205,94,99,10,231,87,113,213,188,210,190,25,54,103,223,89,242,85,127,159,174,7)
+IMAGE_DATA(14,251,19,126,77,15,146,126,111,233,159,223,239,237,239,129,123,237,123,136,142,67,161,158,236,61,230,26,174,122,127,121)
+IMAGE_DATA(78,114,237,239,122,159,219,255,63,255,199,134,191,228,163,133,191,207,97,52,248,193,255,140,95,58,255,60,225,215,121,32)
+IMAGE_DATA(38,203,224,9,127,204,222,147,95,146,65,43,191,214,195,164,211,67,11,183,196,135,22,123,36,222,133,108,80,202,174,184)
+IMAGE_DATA(47,152,153,253,242,208,107,255,101,192,126,121,104,245,17,63,172,183,60,163,56,198,187,170,118,254,16,191,214,203,249,74)
+IMAGE_DATA(50,254,173,151,59,102,111,231,41,177,23,14,191,53,119,78,53,126,107,62,129,102,231,15,154,157,63,104,118,254,116,158)
+IMAGE_DATA(154,82,179,243,67,16,4,65,62,244,5,160,162,162,149,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0)
+IMAGE_END_DATA(576, 3)
+
+IMAGE_BEGIN_DATA
+IMAGE_DATA(120,156,237,154,91,114,195,32,12,69,221,5,117,166,75,100,105,222,89,26,154,216,81,9,130,43,44,241,104,117,102,248)
+IMAGE_DATA(73,136,125,46,96,28,99,182,175,237,115,251,216,28,199,113,126,19,66,184,149,202,104,191,28,212,111,223,247,27,71,252)
+IMAGE_DATA(110,166,44,136,51,146,101,148,123,139,55,151,163,183,187,54,247,195,118,201,80,115,143,237,121,87,201,150,90,127,89,103)
+IMAGE_DATA(64,221,169,231,44,25,144,241,126,56,114,159,115,223,191,183,129,126,6,100,204,115,158,18,255,71,253,77,245,154,70,231)
+IMAGE_DATA(154,156,103,238,122,168,113,244,129,86,6,116,190,161,174,71,94,169,251,171,45,250,251,151,242,72,220,169,191,70,134,86)
+IMAGE_DATA(255,86,247,217,252,91,238,211,51,249,183,253,86,215,95,227,191,14,10,157,127,70,93,195,185,185,8,133,186,107,250,75)
+IMAGE_DATA(60,90,231,205,180,237,181,239,99,214,254,86,238,4,65,59,202,198,79,234,110,248,92,128,55,40,72,71,247,51,131,214)
+IMAGE_DATA(243,215,0,247,51,67,107,14,242,63,121,232,26,197,243,124,103,169,173,63,208,186,179,172,175,36,231,103,179,112,206,179)
+IMAGE_DATA(173,167,208,44,136,255,104,239,28,53,255,209,126,2,86,247,143,172,238,31,89,221,63,157,167,150,100,117,127,199,113,28)
+IMAGE_DATA(103,18,226,102,14,199,113,156,191,70,136,15,44,133,50,206,140,39,16,63,246,77,252,179,132,201,178,4,192,185,148,101)
+IMAGE_DATA(164,247,21,247,180,63,122,187,95,245,30,213,23,22,238,61,51,88,251,91,62,232,23,221,31,171,85,88,41,212,181,202)
+IMAGE_DATA(80,117,127,173,24,214,221,43,117,131,193,56,98,253,115,92,172,27,12,250,128,245,71,189,4,57,15,127,181,23,193,232)
+IMAGE_DATA(152,230,252,36,125,100,208,7,144,63,231,217,224,62,204,31,201,0,30,231,240,87,217,204,33,241,47,101,16,28,195,253)
+IMAGE_DATA(27,253,87,30,63,40,51,250,151,60,27,50,104,250,87,51,32,126,130,12,212,221,220,95,210,182,96,221,174,254,169,151)
+IMAGE_DATA(100,156,117,26,59,112,6,201,117,222,113,236,192,25,46,150,212,125,117,127,109,119,203,12,189,220,105,6,141,28,33,227)
+IMAGE_DATA(222,235,101,247,207,185,148,199,251,136,205,100,129,180,35,220,222,19,184,191,229,72,178,100,203,164,27,201,34,165,141,110)
+IMAGE_DATA(51,111,130,203,177,162,179,227,56,206,127,226,27,171,6,20,236,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0)
+IMAGE_END_DATA(544, 2)
+
+IMAGE_BEGIN_DATA
+IMAGE_DATA(120,156,237,155,107,114,131,48,12,132,221,105,155,166,255,122,132,30,149,163,229,102,20,146,144,130,145,188,146,95,74,169)
+IMAGE_DATA(54,227,25,30,70,223,202,54,198,48,147,112,14,231,32,212,8,206,141,76,189,145,56,31,111,143,76,253,248,28,23,83)
+IMAGE_DATA(235,151,214,71,56,169,175,73,128,56,147,92,130,212,113,148,164,202,52,2,32,48,50,36,111,241,211,100,27,24,165,142)
+IMAGE_DATA(73,12,229,38,128,19,35,76,163,174,231,142,163,33,33,173,143,253,188,135,87,206,96,202,216,126,40,156,232,64,52,85)
+IMAGE_DATA(122,103,23,186,251,221,142,2,73,70,56,13,36,210,76,221,22,104,68,221,196,184,227,182,121,119,223,211,175,64,169,9)
+IMAGE_DATA(64,63,93,170,153,35,40,85,189,8,153,208,75,38,59,151,75,250,48,98,171,61,52,96,139,61,176,215,14,195,48,78)
+IMAGE_DATA(91,162,50,12,225,90,95,233,1,250,159,99,206,177,215,28,205,121,224,65,212,134,219,248,116,142,235,182,162,235,80,147)
+IMAGE_DATA(147,172,15,183,237,204,181,241,182,158,160,13,132,185,15,130,184,125,248,124,223,74,125,174,31,24,178,182,151,244,253,190)
+IMAGE_DATA(94,42,190,110,126,69,125,31,143,127,212,71,26,126,170,77,41,46,106,163,82,62,87,210,115,79,9,159,207,75,151,115)
+IMAGE_DATA(30,63,213,167,210,113,153,203,71,247,157,244,190,172,195,167,243,203,235,3,217,28,32,155,243,181,124,249,252,151,234,251)
+IMAGE_DATA(252,62,144,241,53,113,117,125,128,159,129,212,61,175,153,119,149,107,144,100,62,91,15,116,59,208,126,169,186,249,107,160)
+IMAGE_DATA(242,146,191,6,236,192,110,232,193,242,29,160,228,29,200,236,253,139,240,209,253,253,19,120,169,240,254,253,53,253,26,8)
+IMAGE_DATA(153,68,166,71,169,82,215,223,22,102,195,125,98,210,95,95,147,79,21,201,245,151,203,229,90,214,219,203,254,209,249,165)
+IMAGE_DATA(237,191,40,151,191,206,55,46,26,126,142,127,101,169,163,249,203,224,91,248,172,22,175,146,150,134,226,246,123,122,176,96)
+IMAGE_DATA(199,30,172,228,124,231,59,223,249,206,183,99,91,62,251,184,125,151,203,229,114,185,92,71,209,252,49,224,20,94,80,181)
+IMAGE_DATA(150,159,58,33,27,124,69,113,190,243,123,242,123,251,216,240,27,123,161,98,178,252,6,94,168,190,22,241,43,141,145,113)
+IMAGE_DATA(173,123,172,158,252,93,190,150,252,56,54,167,202,252,157,7,141,14,194,207,246,112,32,190,218,67,101,246,51,240,85,30)
+IMAGE_DATA(44,249,141,216,34,15,141,217,15,15,137,226,114,185,92,127,91,209,127,134,172,39,183,158,147,59,203,55,244,96,241,144)
+IMAGE_DATA(99,249,6,30,44,31,246,44,191,231,130,35,99,209,83,115,81,146,228,71,30,110,219,243,177,165,148,251,128,252,135,135)
+IMAGE_DATA(53,55,46,249,30,80,222,152,93,230,97,199,220,241,37,236,10,252,133,7,249,169,118,209,123,88,179,2,233,33,29,191)
+IMAGE_DATA(152,79,197,236,204,39,143,147,227,48,250,104,87,241,62,64,124,218,123,27,182,196,67,203,220,17,191,7,251,151,101,199)
+IMAGE_DATA(222,123,177,99,63,3,127,235,193,112,205,106,202,126,134,182,247,241,247,95,199,159,171,162,126,0,202,153,180,45,0,0)
+IMAGE_END_DATA(704, 16)
+
+IMAGE_BEGIN_DATA
+IMAGE_DATA(120,156,237,154,11,146,131,32,12,134,57,194,30,161,71,117,58,30,172,55,99,183,15,20,98,94,36,32,186,54,59,25)
+IMAGE_DATA(171,203,151,63,65,96,196,54,220,194,45,100,22,63,62,202,226,211,6,230,16,147,13,202,33,230,54,32,135,8,109,231)
+IMAGE_DATA(28,54,250,59,231,128,234,239,152,3,169,207,228,16,67,187,121,203,234,131,28,226,187,253,234,13,242,16,245,83,14,185)
+IMAGE_DATA(46,116,71,14,82,221,162,182,51,7,164,206,82,95,163,221,66,127,213,227,245,185,126,49,228,144,107,5,44,7,33,190)
+IMAGE_DATA(91,31,143,185,171,62,122,29,27,135,160,125,203,121,32,233,19,109,186,104,107,114,232,89,187,164,191,135,246,162,53,80)
+IMAGE_DATA(123,147,203,64,237,35,232,23,57,12,208,94,114,24,169,125,132,190,255,142,191,203,142,191,175,181,180,159,191,191,19,153)
+IMAGE_DATA(235,65,127,154,222,110,140,225,225,175,170,253,226,31,143,199,203,61,188,145,13,161,193,6,213,193,158,203,6,44,6,158)
+IMAGE_DATA(55,8,155,29,1,113,221,146,15,60,215,196,132,109,201,93,51,226,104,60,231,174,191,57,47,212,32,214,63,223,101,199)
+IMAGE_DATA(120,3,187,240,57,155,242,83,176,129,107,171,96,23,190,162,191,142,101,29,22,131,154,14,193,58,39,62,239,105,8,244)
+IMAGE_DATA(43,187,124,187,142,109,219,107,120,175,126,106,251,255,120,244,149,20,240,40,240,90,183,234,219,242,247,214,223,153,15,186)
+IMAGE_DATA(186,59,44,46,87,88,12,96,44,192,177,60,119,12,159,187,46,241,75,219,76,127,154,38,53,15,143,79,86,203,195,186)
+IMAGE_DATA(19,43,243,242,100,140,34,191,198,65,46,42,120,121,220,88,248,98,28,48,253,103,231,139,235,38,222,224,126,219,97,155)
+IMAGE_DATA(224,41,68,181,32,72,60,166,169,101,59,107,83,125,160,210,78,123,105,176,167,86,13,30,132,93,206,53,206,197,168,113)
+IMAGE_DATA(240,62,129,212,155,239,243,226,88,14,169,118,138,207,183,47,80,179,182,239,176,126,204,239,93,109,255,97,99,167,194,219)
+IMAGE_DATA(89,167,197,192,91,128,52,1,165,24,44,239,89,8,148,181,136,147,89,200,225,203,159,156,175,240,227,24,88,12,44,171)
+IMAGE_DATA(59,224,231,10,239,193,87,25,199,91,250,2,12,148,234,90,26,243,213,125,209,148,199,39,208,204,77,44,146,79,28,60)
+IMAGE_DATA(66,30,187,23,121,140,228,132,126,81,143,65,159,228,97,156,90,125,201,48,190,218,79,246,213,226,201,173,156,192,207,71)
+IMAGE_DATA(94,186,29,198,109,219,225,49,242,246,148,6,165,5,243,148,76,226,189,250,92,12,174,15,5,213,187,182,190,11,217,119)
+IMAGE_DATA(49,232,99,235,96,171,153,88,144,221,252,7,185,78,181,99,21,178,133,194,194,231,172,85,159,230,249,137,218,127,161,184)
+IMAGE_DATA(172,237,244,2,145,59,63,3,31,145,207,150,28,172,131,51,127,156,179,154,131,77,219,16,235,228,130,139,143,54,14,108)
+IMAGE_DATA(159,115,53,79,28,71,225,211,231,218,250,119,178,198,139,1,181,31,81,243,196,94,72,27,3,229,137,61,21,201,39,205)
+IMAGE_DATA(245,51,185,79,23,245,169,125,34,17,3,214,188,232,83,49,65,12,86,191,172,11,173,69,173,191,173,69,175,159,59,228)
+IMAGE_DATA(113,87,235,19,166,214,103,121,143,190,236,7,176,1,95,45,214,182,143,145,255,53,92,193,190,191,126,10,233,17,177,224)
+IMAGE_DATA(98,241,235,180,25,253,5,91,206,114,57,18,237,96,92,210,37,125,237,145,210,47,219,136,47,30,89,125,106,50,32,3)
+IMAGE_DATA(153,212,231,23,137,117,49,224,244,243,188,225,185,69,31,153,204,106,253,109,30,107,31,108,253,28,139,201,47,241,199,189)
+IMAGE_DATA(65,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0)
+IMAGE_END_DATA(832, 13)
+
+IMAGE_BEGIN_DATA
+IMAGE_DATA(120,156,237,89,65,114,195,48,8,116,59,61,244,152,31,215,135,62,44,63,83,235,38,74,20,4,104,1,217,178,167,222)
+IMAGE_DATA(14,147,88,98,1,35,68,100,119,186,76,151,105,79,248,158,166,180,200,2,143,110,30,107,217,209,230,91,54,208,24,57)
+IMAGE_DATA(27,232,189,73,177,88,249,82,28,91,248,151,238,223,155,59,58,215,90,219,150,78,132,143,216,176,230,218,131,174,126,246)
+IMAGE_DATA(214,12,14,134,200,34,36,128,47,205,167,9,231,83,29,148,203,233,90,184,156,13,43,87,138,195,131,213,55,230,225,113)
+IMAGE_DATA(54,131,77,16,217,12,41,195,105,131,227,70,55,243,150,124,206,198,137,53,112,153,62,167,143,182,90,116,1,122,116,245)
+IMAGE_DATA(136,141,209,191,76,199,248,85,251,252,253,171,60,55,206,160,69,167,82,231,37,157,68,224,229,107,254,181,248,69,112,201)
+IMAGE_DATA(112,64,115,78,207,92,210,28,167,203,217,69,170,116,92,50,144,42,225,244,232,10,83,93,79,213,180,226,81,1,36,3)
+IMAGE_DATA(93,117,105,174,181,186,145,39,134,200,19,73,141,86,50,208,85,151,230,90,171,235,225,35,254,145,248,43,24,183,137,246)
+IMAGE_DATA(220,198,93,123,246,189,198,71,252,251,209,169,129,114,64,202,27,217,66,92,50,162,231,86,30,61,147,193,189,186,203,162)
+IMAGE_DATA(233,104,118,52,95,221,2,207,80,146,17,109,76,232,170,107,21,210,219,191,142,50,25,105,233,55,165,212,157,110,221,249)
+IMAGE_DATA(173,253,145,249,251,187,137,55,115,18,87,70,164,39,8,121,133,109,104,213,139,84,245,226,173,189,208,207,200,170,190,152)
+IMAGE_DATA(199,17,153,231,147,223,159,127,27,71,133,171,129,64,253,140,195,217,12,32,223,195,154,193,211,158,125,51,148,49,90,249)
+IMAGE_DATA(153,67,63,173,155,49,18,63,119,15,244,243,108,6,29,177,52,131,148,222,7,120,78,142,36,148,28,233,123,43,209,89)
+IMAGE_DATA(151,126,222,47,160,38,194,114,57,223,133,164,66,242,117,182,241,28,71,26,201,45,204,210,6,141,95,46,126,194,165,54)
+IMAGE_DATA(84,126,230,190,242,95,242,0,111,196,87,62,30,191,178,137,59,241,67,77,160,81,3,59,109,2,25,127,205,224,107,116)
+IMAGE_DATA(20,34,170,4,206,243,108,58,37,92,175,215,135,228,107,131,141,138,191,192,96,131,229,27,108,84,124,70,96,62,149,147)
+IMAGE_DATA(191,62,31,144,253,224,118,50,24,29,133,14,230,215,218,204,207,191,190,198,102,50,132,47,157,6,50,191,149,143,82,191)
+IMAGE_DATA(37,92,60,61,248,203,120,41,165,126,61,215,55,127,123,228,91,238,119,24,142,208,12,254,27,184,102,160,129,227,207,203)
+IMAGE_DATA(41,10,17,105,51,71,249,204,166,151,164,71,206,78,116,192,22,205,96,46,138,199,195,163,99,218,53,50,151,199,181,152)
+IMAGE_DATA(52,187,37,215,195,159,201,134,178,240,41,215,227,191,31,164,202,225,78,17,17,126,196,191,134,22,191,165,131,218,229,174)
+IMAGE_DATA(173,187,14,189,167,0,118,122,50,64,158,181,180,103,46,90,76,207,87,71,249,251,67,71,122,9,212,153,207,10,202,215)
+IMAGE_DATA(68,227,183,114,215,230,43,167,145,147,175,242,195,53,188,61,118,218,12,142,142,72,49,136,5,200,129,121,145,245,24,71)
+IMAGE_DATA(228,126,76,103,249,191,199,139,63,241,242,163,254,189,252,60,110,120,76,169,214,32,176,126,199,197,17,154,129,247,25,243)
+IMAGE_DATA(161,159,94,255,177,132,216,225,120,156,157,53,248,106,204,128,13,170,87,234,104,115,107,241,173,241,143,206,127,105,195,91)
+IMAGE_DATA(63,156,157,189,191,35,249,1,177,42,192,112,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0)
+IMAGE_END_DATA(800, 24)
+
+IMAGE_BEGIN_DATA
+IMAGE_DATA(120,156,237,91,203,145,219,48,12,101,18,79,254,201,108,110,169,33,197,228,154,113,15,41,66,5,164,128,20,145,30,236)
+IMAGE_DATA(2,82,65,102,175,190,238,33,13,40,210,218,212,66,212,3,8,240,99,201,19,66,131,89,155,196,3,64,18,4,104,73)
+IMAGE_DATA(235,238,220,157,235,123,183,85,234,35,44,98,99,20,209,113,145,193,124,60,30,255,11,252,40,199,177,128,143,173,155,180)
+IMAGE_DATA(142,209,117,139,172,99,212,111,202,93,215,65,252,216,174,101,52,134,140,241,175,71,99,50,168,64,87,11,6,16,148,69)
+IMAGE_DATA(130,225,150,241,190,125,99,193,220,239,247,251,156,224,207,193,107,125,102,199,24,36,64,200,163,127,136,61,62,38,43,233)
+IMAGE_DATA(86,114,222,248,55,122,50,200,201,158,154,234,97,181,109,76,102,150,132,182,208,49,181,35,126,210,127,230,174,195,248,152)
+IMAGE_DATA(207,26,124,47,176,215,81,203,126,238,248,57,124,200,24,127,110,215,50,138,129,140,248,89,143,206,39,131,103,215,48,149)
+IMAGE_DATA(51,232,222,225,10,166,199,122,54,38,150,25,214,166,3,99,117,58,100,172,172,163,68,69,153,54,132,244,87,24,195,76)
+IMAGE_DATA(214,185,110,226,121,59,143,159,219,121,194,175,97,63,101,252,6,222,14,141,201,224,185,123,81,76,159,229,120,234,249,82)
+IMAGE_DATA(73,38,252,233,116,50,241,45,226,119,187,93,50,126,196,106,241,84,142,98,45,120,47,139,176,90,60,135,213,140,95,194)
+IMAGE_DATA(106,231,143,195,110,45,126,150,39,71,29,165,236,213,5,181,100,208,240,13,191,29,252,234,201,160,81,163,70,141,110,34)
+IMAGE_DATA(25,128,187,223,38,92,120,247,93,163,135,226,104,22,7,143,215,68,60,87,13,36,124,12,75,117,160,170,112,235,120,237)
+IMAGE_DATA(252,73,21,145,91,63,58,247,177,138,202,61,193,177,86,227,42,85,188,6,181,100,192,99,75,37,131,208,127,75,50,240)
+IMAGE_DATA(63,163,70,162,254,107,55,163,199,83,236,32,98,194,131,121,51,225,67,108,12,143,116,56,114,211,173,37,131,74,244,206)
+IMAGE_DATA(189,165,95,107,60,18,161,178,8,39,245,107,251,144,255,156,13,171,108,170,127,154,126,142,108,235,240,126,184,12,202,52)
+IMAGE_DATA(198,209,231,107,201,75,129,150,19,136,20,111,149,183,248,131,116,160,207,146,205,218,242,188,191,82,48,89,211,26,149,89)
+IMAGE_DATA(67,62,244,55,148,151,250,53,182,115,74,130,198,31,235,120,215,144,23,231,238,165,123,179,192,32,61,14,71,99,255,225)
+IMAGE_DATA(208,163,190,199,118,208,55,181,7,125,162,60,210,207,248,131,253,255,60,92,145,1,150,36,107,10,51,235,191,172,100,45)
+IMAGE_DATA(27,52,90,106,216,8,35,178,180,13,180,75,57,27,41,229,138,203,18,225,57,162,239,127,127,131,28,177,133,211,208,197)
+IMAGE_DATA(134,70,39,211,30,213,207,217,120,108,35,204,201,104,244,35,27,26,253,116,44,194,252,107,230,129,157,175,80,255,226,179)
+IMAGE_DATA(48,207,139,241,132,175,91,5,250,195,249,154,244,82,36,99,51,166,159,91,111,164,255,220,70,46,197,252,112,49,139,230)
+IMAGE_DATA(159,211,47,196,15,162,104,124,114,107,34,248,204,142,97,154,227,180,253,171,26,131,111,99,56,149,66,253,165,169,118,109)
+IMAGE_DATA(107,84,155,62,14,151,240,10,66,202,2,135,9,101,171,56,231,112,2,86,99,115,112,205,102,21,155,206,149,76,74,159)
+IMAGE_DATA(134,235,245,112,137,214,240,233,67,69,94,62,245,22,38,197,58,80,57,98,183,81,61,222,45,39,45,252,140,254,67,40)
+IMAGE_DATA(196,47,212,71,236,21,209,17,193,179,68,113,21,116,196,170,247,236,244,87,209,143,36,29,232,59,240,95,196,151,210,65)
+IMAGE_DATA(219,193,158,152,217,82,140,125,177,191,40,5,123,73,162,217,254,10,30,55,217,11,152,246,196,119,11,207,2,35,148,123)
+IMAGE_DATA(172,157,126,18,166,226,31,50,241,127,50,241,191,50,241,63,51,241,63,50,241,223,51,241,95,51,241,95,50,241,110,93)
+IMAGE_DATA(124,57,122,21,36,3,244,126,175,111,191,191,191,159,101,186,241,59,125,7,248,112,248,59,113,248,126,240,216,230,58,215)
+IMAGE_DATA(250,64,31,154,51,58,183,104,45,80,251,63,223,249,107,65,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0)
+IMAGE_END_DATA(928, 18)
+
+IMAGE_BEGIN_DATA
+IMAGE_DATA(120,156,237,89,75,114,219,48,12,165,211,133,155,73,23,158,233,5,114,161,110,50,211,3,244,38,218,244,50,185,68,188)
+IMAGE_DATA(234,162,237,162,157,230,51,241,175,118,108,55,253,164,139,116,209,45,42,201,150,34,146,32,8,80,146,229,113,9,13,162)
+IMAGE_DATA(49,249,30,8,60,80,178,228,168,129,234,171,170,37,73,2,33,94,112,39,147,9,72,45,227,20,113,50,187,184,248,35)
+IMAGE_DATA(242,106,30,5,95,37,138,229,46,126,232,250,213,90,66,53,12,229,166,173,28,164,127,1,168,102,22,227,231,231,83,203)
+IMAGE_DATA(11,12,103,46,149,47,206,9,53,51,231,168,30,169,205,149,73,55,83,178,171,176,36,56,78,21,17,194,87,204,163,173)
+IMAGE_DATA(245,67,248,181,175,204,19,117,156,254,61,170,222,105,1,113,204,208,91,166,131,99,97,16,14,11,107,224,205,53,75,199)
+IMAGE_DATA(114,146,198,13,201,215,92,19,211,141,165,239,73,122,184,132,119,146,16,172,39,25,13,71,20,73,98,29,120,20,39,17)
+IMAGE_DATA(17,193,146,56,12,47,204,163,228,16,222,142,17,13,175,38,198,49,87,97,40,142,16,2,197,81,194,49,69,150,52,208)
+IMAGE_DATA(139,175,145,71,137,199,56,30,253,234,111,12,70,195,139,133,56,24,95,210,190,219,24,138,233,168,41,226,6,10,176,40)
+IMAGE_DATA(158,192,90,186,120,176,26,71,195,30,231,13,247,126,215,178,111,119,102,98,77,96,176,92,132,113,156,121,27,194,113,48)
+IMAGE_DATA(22,142,16,223,55,95,213,92,183,65,254,122,114,240,86,247,59,108,243,110,186,91,190,190,25,19,231,133,66,175,233,114)
+IMAGE_DATA(222,102,169,179,190,157,75,151,250,183,253,12,115,8,118,224,55,3,234,241,192,203,77,240,13,228,26,231,196,144,112,173)
+IMAGE_DATA(24,1,92,87,30,65,220,128,24,117,234,111,68,127,225,248,255,109,199,170,175,122,233,33,177,87,111,222,162,98,22,227)
+IMAGE_DATA(217,185,112,115,190,58,238,251,140,241,176,121,87,124,81,254,27,33,100,5,115,23,246,21,208,132,48,84,158,190,252,53)
+IMAGE_DATA(235,167,82,28,25,99,161,138,183,53,223,212,56,89,95,38,132,116,71,236,50,225,182,231,203,15,123,240,192,16,252,69)
+IMAGE_DATA(166,248,175,77,22,111,56,28,230,46,224,107,60,181,61,24,124,148,199,224,147,60,130,207,226,113,215,47,127,111,151,243)
+IMAGE_DATA(89,113,164,250,155,113,66,251,95,253,207,164,144,175,197,201,53,174,247,0,178,63,111,53,217,205,0,154,77,165,182,56)
+IMAGE_DATA(198,239,58,65,252,242,98,8,120,226,205,215,223,30,1,113,52,126,64,28,148,47,136,67,242,25,113,72,126,229,159,113)
+IMAGE_DATA(162,245,25,60,148,47,224,105,252,0,94,201,15,220,55,37,63,144,215,189,213,191,25,36,53,216,25,183,112,14,206,197)
+IMAGE_DATA(165,98,36,149,141,143,97,252,107,135,243,147,146,103,199,224,228,79,241,205,24,110,46,93,7,173,155,159,239,227,234,206)
+IMAGE_DATA(139,241,132,115,57,47,111,220,125,253,228,196,199,49,137,39,71,187,46,119,63,185,123,190,206,245,103,24,227,102,0,14)
+IMAGE_DATA(247,89,142,251,13,159,81,247,196,113,242,28,113,72,174,153,187,39,134,53,135,225,29,124,118,206,174,28,67,184,92,62)
+IMAGE_DATA(167,31,109,241,57,177,27,224,139,246,14,167,255,130,218,155,218,191,101,12,142,222,14,174,21,7,113,219,78,245,159,78)
+IMAGE_DATA(160,211,115,47,77,103,111,146,57,53,146,73,95,61,160,171,115,151,107,111,5,137,245,199,250,99,253,177,254,88,127,172)
+IMAGE_DATA(63,214,31,235,143,245,199,250,99,253,177,254,88,127,172,255,240,235,127,150,30,132,129,53,66,17,230,103,103,94,194,235)
+IMAGE_DATA(212,31,42,231,140,240,113,251,249,93,126,54,9,219,168,249,185,240,234,184,234,169,151,37,250,241,241,47,124,185,28,193)
+IMAGE_DATA(229,213,24,174,174,39,112,125,51,133,155,219,25,220,142,230,48,26,47,96,60,185,131,201,108,9,211,175,43,152,205,215)
+IMAGE_DATA(48,95,220,195,98,249,29,238,86,63,96,185,254,9,171,111,191,96,125,255,0,239,63,124,2,245,92,189,160,196,105,219)
+IMAGE_DATA(108,45,245,57,112,96,0,113,106,206,21,103,191,172,227,102,132,24,71,108,78,35,56,77,218,105,3,255,1,200,6,138)
+IMAGE_DATA(189,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0)
+IMAGE_END_DATA(960, 28)
diff --git a/uppsrc/CtrlLib/Ctrl.lay b/uppsrc/CtrlLib/Ctrl.lay
new file mode 100644
index 000000000..9d270dc30
--- /dev/null
+++ b/uppsrc/CtrlLib/Ctrl.lay
@@ -0,0 +1,114 @@
+LAYOUT(EditStringLayout, 236, 62)
+	ITEM(Label, lbl, SetLabel(t_("Test")).LeftPosZ(4, 68).TopPosZ(4, 19))
+	ITEM(EditString, text, HSizePosZ(68, 4).TopPosZ(4, 19))
+	ITEM(Button, ok, SetLabel(t_("OK")).HCenterPosZ(80, -10).BottomPosZ(4, 22))
+	ITEM(Button, cancel, SetLabel(t_("Cancel")).RightPosZ(4, 80).BottomPosZ(4, 22))
+END_LAYOUT
+
+LAYOUT(ProgressLayout, 320, 72)
+	ITEM(Button, stop, SetLabel(t_("Cancel")).HCenterPosZ(68, 0).BottomPosZ(4, 24))
+	UNTYPED(pi, HSizePosZ(4, 4).TopPosZ(28, 12))
+	ITEM(Label, info, HSizePosZ(4, 4).TopPosZ(4, 15))
+END_LAYOUT
+
+LAYOUT(CommentLayout, 400, 204)
+	ITEM(DocEdit, text, HSizePosZ(8, 8).VSizePosZ(8, 40))
+	ITEM(Button, ok, SetLabel(t_("OK")).RightPosZ(80, 64).BottomPosZ(8, 24))
+	ITEM(Button, cancel, SetLabel(t_("Cancel")).RightPosZ(8, 64).BottomPosZ(8, 24))
+END_LAYOUT
+
+LAYOUT(SimpleSelectLayout, 172, 184)
+	ITEM(ArrayCtrl, list, HSizePosZ(4, 4).VSizePosZ(4, 34))
+	ITEM(Button, ok, SetLabel(t_("OK")).RightPosZ(74, 64).BottomPosZ(4, 24))
+	ITEM(Button, cancel, SetLabel(t_("Cancel")).RightPosZ(4, 64).BottomPosZ(4, 24))
+END_LAYOUT
+
+LAYOUT(FileSelectorLayout, 516, 400)
+	ITEM(Label, dv___0, SetLabel(t_("&Directory")).LeftPosZ(8, 60).TopPosZ(6, 15))
+	ITEM(DropList, dir, HSizePosZ(72, 8).TopPosZ(4, 19))
+	ITEM(Splitter, splitter, HSizePosZ(8, 8).VSizePosZ(28, 108))
+	ITEM(Label, filename, HSizePosZ(8, 208).BottomPosZ(88, 16))
+	ITEM(Label, filesize, RightPosZ(148, 56).BottomPosZ(88, 16))
+	ITEM(Label, filetime, RightPosZ(8, 136).BottomPosZ(88, 16))
+	ITEM(Label, file_lbl, SetLabel(t_("&File")).LeftPosZ(8, 64).BottomPosZ(67, 15))
+	ITEM(EditString, file, HSizePosZ(76, 8).BottomPosZ(65, 19))
+	ITEM(Label, type_lbl, SetLabel(t_("&Type")).LeftPosZ(8, 64).BottomPosZ(43, 15))
+	ITEM(DropList, type, HSizePosZ(76, 116).BottomPosZ(41, 19))
+	ITEM(EditString, search, RightPosZ(8, 104).BottomPosZ(41, 19))
+	ITEM(Label, sort_lbl, SetLabel(t_("&Sort by")).LeftPosZ(8, 64).BottomPosZ(21, 15))
+	ITEM(Switch, sortext, SetLabel(t_("Name\nExtension")).LeftPosZ(76, 84).BottomPosZ(4, 32))
+	ITEM(Option, readonly, SetLabel(t_("Read only")).HSizePosZ(164, 256).BottomPosZ(6, 18))
+	ITEM(Option, hidden, SetLabel(t_("Show hidden")).HSizePosZ(260, 156).BottomPosZ(6, 18))
+	ITEM(Button, ok, SetLabel(t_("Open")).RightPosZ(84, 68).BottomPosZ(8, 24))
+	ITEM(Button, cancel, SetLabel(t_("Cancel")).RightPosZ(8, 68).BottomPosZ(8, 24))
+END_LAYOUT
+
+LAYOUT(PaletteLayout, 212, 332)
+	ITEM(TabCtrl, palette_tab, HSizePosZ(4, 4).VSizePosZ(4, 82))
+	ITEM(Label, dv___1, SetLabel(t_("Color:")).LeftPosZ(4, 36).BottomPosZ(52, 24))
+	ITEM(DataPusher, color, HSizePosZ(68, 32).BottomPosZ(54, 22))
+	ITEM(Button, set_transparent, RightPosZ(4, 18).BottomPosZ(56, 18))
+	UNTYPED(fetch_color, RightPosZ(4, 18).BottomPosZ(30, 18))
+	ITEM(Label, dv___5, SetLabel(t_("R:")).LeftPosZ(4, 12).BottomPosZ(29, 19))
+	ITEM(EditIntSpin, r, LeftPosZ(16, 40).BottomPosZ(29, 19))
+	ITEM(Label, dv___7, SetLabel(t_("G:")).LeftPosZ(68, 12).BottomPosZ(29, 19))
+	ITEM(EditIntSpin, g, LeftPosZ(80, 40).BottomPosZ(29, 19))
+	ITEM(Label, dv___9, SetLabel(t_("B:")).LeftPosZ(130, 12).BottomPosZ(29, 19))
+	ITEM(EditIntSpin, b, LeftPosZ(142, 40).BottomPosZ(29, 19))
+	ITEM(Label, dv___11, SetLabel(t_("H:")).LeftPosZ(4, 12).BottomPosZ(5, 19))
+	ITEM(EditIntSpin, h, LeftPosZ(16, 40).BottomPosZ(5, 19))
+	ITEM(Label, dv___13, SetLabel(t_("S:")).LeftPosZ(68, 12).BottomPosZ(5, 19))
+	ITEM(EditIntSpin, s, LeftPosZ(80, 40).BottomPosZ(5, 19))
+	ITEM(Label, dv___15, SetLabel(t_("V:")).LeftPosZ(130, 12).BottomPosZ(5, 19))
+	ITEM(EditIntSpin, v, LeftPosZ(142, 40).BottomPosZ(5, 19))
+END_LAYOUT
+
+LAYOUT(PaletteSelectorLayout, 248, 320)
+	ITEM(Ctrl, palette, HSizePosZ(4, 4).VSizePosZ(4, 32))
+	ITEM(Button, ok, SetLabel(t_("OK")).RightPosZ(88, 80).BottomPosZ(4, 22))
+	ITEM(Button, cancel, SetLabel(t_("Cancel")).RightPosZ(4, 80).BottomPosZ(4, 22))
+END_LAYOUT
+
+LAYOUT(PalCtrlSizeLayout, 206, 60)
+	ITEM(Label, dv___0, SetLabel(t_("&Rows:")).LeftPosZ(4, 44).TopPosZ(4, 19))
+	ITEM(EditIntSpin, rows, LeftPosZ(48, 50).TopPosZ(4, 19))
+	ITEM(Label, dv___2, SetLabel(t_("&Columns:")).LeftPosZ(108, 44).TopPosZ(4, 19))
+	ITEM(EditIntSpin, columns, LeftPosZ(152, 50).TopPosZ(4, 19))
+	ITEM(Button, ok, SetLabel(t_("OK")).RightPosZ(88, 80).BottomPosZ(4, 22))
+	ITEM(Button, cancel, SetLabel(t_("Cancel")).RightPosZ(4, 80).BottomPosZ(4, 22))
+END_LAYOUT
+
+LAYOUT(KeysLayout, 540, 388)
+	ITEM(ArrayCtrl, group, LeftPosZ(8, 116).TopPosZ(8, 308))
+	ITEM(ArrayCtrl, keys, LeftPosZ(132, 400).TopPosZ(8, 308))
+	UNTYPED(key[0], LeftPosZ(132, 196).TopPosZ(324, 20))
+	UNTYPED(key[1], LeftPosZ(332, 196).TopPosZ(324, 20))
+	ITEM(Button, ok, SetLabel(t_("OK")).LeftPosZ(400, 64).TopPosZ(356, 24))
+	ITEM(Button, cancel, SetLabel(t_("Cancel")).LeftPosZ(468, 64).TopPosZ(356, 24))
+	ITEM(Button, defaults, SetLabel(t_("Default")).LeftPosZ(8, 64).TopPosZ(324, 24))
+END_LAYOUT
+
+LAYOUT(PrinterLayout, 372, 264)
+	ITEM(LabelBox, dv___0, SetLabel(t_("Printer")).LeftPosZ(8, 356).TopPosZ(4, 68))
+	ITEM(Label, dv___1, SetLabel(t_("Printer")).LeftPosZ(16, 92).TopPosZ(20, 20))
+	ITEM(DropList, printer, LeftPosZ(104, 252).TopPosZ(20, 19))
+	ITEM(Label, dv___3, SetLabel(t_("Paper size")).LeftPosZ(16, 88).TopPosZ(44, 20))
+	ITEM(DropList, paper, LeftPosZ(104, 84).TopPosZ(44, 19))
+	ITEM(Label, dv___5, SetLabel(t_("Input slot")).LeftPosZ(196, 72).TopPosZ(44, 20))
+	ITEM(DropList, slot, LeftPosZ(268, 88).TopPosZ(44, 19))
+	ITEM(Label, dv___7, SetLabel(t_("Pages per sheet")).LeftPosZ(188, 104).TopPosZ(192, 20))
+	ITEM(DropList, npage, LeftPosZ(296, 60).TopPosZ(192, 19))
+	ITEM(LabelBox, dv___9, SetLabel(t_("Print range")).LeftPosZ(8, 216).TopPosZ(80, 88))
+	ITEM(Switch, range, SetLabel(t_("All pages\nCurrent page\nPages from")).LeftPosZ(16, 196).TopPosZ(100, 60))
+	ITEM(EditIntSpin, from, LeftPosZ(100, 52).TopPosZ(132, 19))
+	ITEM(Label, dv___12, SetLabel(t_("to")).LeftPosZ(156, 16).TopPosZ(135, 13))
+	ITEM(EditIntSpin, to, LeftPosZ(172, 48).TopPosZ(132, 19))
+	ITEM(LabelBox, dv___14, SetLabel(t_("Copies")).LeftPosZ(232, 132).TopPosZ(80, 88))
+	ITEM(Label, dv___15, SetLabel(t_("Copies")).LeftPosZ(244, 56).TopPosZ(100, 20))
+	ITEM(EditIntSpin, copies, LeftPosZ(300, 56).TopPosZ(100, 19))
+	ITEM(Option, collate, SetLabel(t_("Collate")).LeftPosZ(244, 116).TopPosZ(136, 19))
+	ITEM(Button, ok, SetLabel(t_("OK")).LeftPosZ(232, 64).TopPosZ(232, 24))
+	ITEM(Button, cancel, SetLabel(t_("Cancel")).LeftPosZ(300, 64).TopPosZ(232, 24))
+	ITEM(Switch, landscape, SetLabel(t_("Portrait\nLandscape")).LeftPosZ(16, 168).TopPosZ(194, 18))
+	ITEM(LabelBox, dv___21, SetLabel(t_("Placement")).LeftPosZ(8, 356).TopPosZ(176, 48))
+END_LAYOUT
diff --git a/uppsrc/CtrlLib/CtrlLib.h b/uppsrc/CtrlLib/CtrlLib.h
new file mode 100644
index 000000000..e4ff7c1d2
--- /dev/null
+++ b/uppsrc/CtrlLib/CtrlLib.h
@@ -0,0 +1,57 @@
+#ifndef CTRLLIB_H
+#define CTRLLIB_H
+
+#include <CtrlCore/CtrlCore.h>
+#include <RichText/RichText.h>
+
+NAMESPACE_UPP
+
+#define IMAGECLASS CtrlImg
+#define IMAGEFILE <CtrlLib/Ctrl.iml>
+#include <Draw/iml_header.h>
+
+#define IMAGECLASS CtrlsImg
+#define IMAGEFILE <CtrlLib/Ctrls.iml>
+#include <Draw/iml_header.h>
+
+#define IMAGECLASS ClassicCtrlsImg
+#define IMAGEFILE <CtrlLib/ClassicCtrls.iml>
+#include <Draw/iml_header.h>
+
+class Bar;
+
+#include <CtrlLib/LabelBase.h>
+#include <CtrlLib/StaticCtrl.h>
+#include <CtrlLib/PushCtrl.h>
+#include <CtrlLib/MultiButton.h>
+#include <CtrlLib/ScrollBar.h>
+#include <CtrlLib/HeaderCtrl.h>
+#include <CtrlLib/EditCtrl.h>
+#include <CtrlLib/AKeys.h>
+#include <CtrlLib/Bar.h>
+#include <CtrlLib/StatusBar.h>
+#include <CtrlLib/TabCtrl.h>
+#include <CtrlLib/DlgColor.h>
+#include <CtrlLib/ArrayCtrl.h>
+#include <CtrlLib/DropChoice.h>
+#include <CtrlLib/TreeCtrl.h>
+#include <CtrlLib/Splitter.h>
+#include <CtrlLib/RichText.h>
+#include <CtrlLib/TextEdit.h>
+#include <CtrlLib/SliderCtrl.h>
+#include <CtrlLib/ColumnList.h>
+#include <CtrlLib/DateTimeCtrl.h>
+
+#define  LAYOUTFILE <CtrlLib/Ctrl.lay>
+#include <CtrlCore/lay.h>
+
+#include <CtrlLib/Progress.h>
+#include <CtrlLib/FileSel.h>
+#include <CtrlLib/CtrlUtil.h>
+#include <CtrlLib/Lang.h>
+
+#include <CtrlLib/Ch.h>
+
+END_UPP_NAMESPACE
+
+#endif
diff --git a/uppsrc/CtrlLib/CtrlLib.icpp b/uppsrc/CtrlLib/CtrlLib.icpp
new file mode 100644
index 000000000..ccbebef02
--- /dev/null
+++ b/uppsrc/CtrlLib/CtrlLib.icpp
@@ -0,0 +1,14 @@
+#include "CtrlLib.h"
+
+NAMESPACE_UPP
+
+#define  TFILE <CtrlLib/CtrlLib.t>
+#include <Core/t.h>
+
+void CtrlSetDefaultSkin(void (*fn1)(), void (*fn2)());
+
+INITBLOCK {
+	CtrlSetDefaultSkin(ChStdSkin, ChHostSkin);
+};
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/CtrlLib/CtrlLib.t b/uppsrc/CtrlLib/CtrlLib.t
new file mode 100644
index 000000000..9f906547d
--- /dev/null
+++ b/uppsrc/CtrlLib/CtrlLib.t
@@ -0,0 +1,2628 @@
+#ifdef _MSC_VER
+#pragma setlocale("C")
+#endif
+// EditCtrl.h
+
+T_("(default)")
+csCZ("(výchozí)")
+deDE("(Voreinstellung)")
+esES("(por defecto)")
+fiFI("(oletus)")
+frFR("")
+huHU("(alapértelmezett)")
+itIT("(predefinito)")
+plPL("(domyślny)")
+roRO("(implicit)")
+ruRU("")
+srSP("")
+trTR("(varsayılan")
+zhCN("(缺省)")
+
+
+// EditField.cpp
+
+T_("Undo")
+csCZ("Zpět")
+deDE("Rückgängig")
+esES("Deshacer")
+fiFI("Kumoa")
+frFR("Annuler")
+huHU("Visszavonás")
+itIT("Annulla")
+plPL("Cofnij")
+roRO("Anulează ultima operație")
+ruRU("Отменить")
+srSP("Undo")
+trTR("Geri Al")
+zhCN("撤销")
+
+T_("Cut")
+csCZ("Vyjmout")
+deDE("Ausschneiden")
+esES("Cortar")
+fiFI("Leikkaa")
+frFR("Couper")
+huHU("Kivágás")
+itIT("Taglia")
+plPL("Wytnij")
+roRO("Decupează")
+ruRU("Вырезать")
+srSP("Iseci")
+trTR("Kes")
+zhCN("剪切")
+
+T_("Copy")
+csCZ("Kopírovat")
+deDE("Kopieren")
+esES("Copiar")
+fiFI("Kopioi")
+frFR("Copier")
+huHU("Másolás")
+itIT("Copia")
+plPL("Kopiuj")
+roRO("Copiază")
+ruRU("Копировать")
+srSP("Kopiraj")
+trTR("Kopyala")
+zhCN("复制")
+
+T_("Paste")
+csCZ("Vložit")
+deDE("Einfügen")
+esES("Pegar")
+fiFI("Liitä")
+frFR("Coller")
+huHU("Beillesztés")
+itIT("Incolla")
+plPL("Wklej")
+roRO("Lipește")
+ruRU("Вставить")
+srSP("Zalepi")
+trTR("Yapıştır")
+zhCN("粘贴")
+
+T_("Erase")
+csCZ("Vymazat")
+deDE("Löschen")
+esES("Borrar")
+fiFI("Pyyhi")
+frFR("Effacer")
+huHU("Törlés")
+itIT("Cancella")
+plPL("Usuń")
+roRO("Şterge")
+ruRU("Стереть")
+srSP("Obriši")
+trTR("Sil")
+zhCN("清除")
+
+T_("Select all")
+csCZ("Vybrat vše")
+deDE("Alles auswählen")
+esES("Seleccionar todo")
+fiFI("Valitse kaikki")
+frFR("Tout sélectionner")
+huHU("Minden kiválasztása")
+itIT("Seleziona tutto")
+plPL("Zaznacz wszystko")
+roRO("Alege tot")
+ruRU("Выделить всё")
+srSP("Izaberi sve")
+trTR("Tümünü Seç")
+zhCN("全选")
+
+
+// Text.cpp
+
+T_("Redo")
+csCZ("Znovu")
+deDE("Wiederherstellen")
+esES("Rehacer")
+fiFI("Toista")
+frFR("Refaire")
+huHU("Újra végrehajtás")
+itIT("Ripeti")
+plPL("Powtórz")
+roRO("Refă ultima operație")
+ruRU("Повторить")
+srSP("Redo")
+trTR("Yinele")
+zhCN("重做")
+
+
+// ArrayCtrl.cpp
+
+T_("Do you really want to delete the selected %s ?")
+csCZ("Smazat aktuální %s ?")
+deDE("Möchten Sie die ausgewählte %s wirklich löschen?")
+esES("¿ Realmente quieres eliminar la selección %s ?")
+fiFI("Haluatko varmasti poistaa valitun %s ?")
+frFR("Voulez-vous réellement supprimer le %s sélectioné ?")
+huHU("Biztosan töröljük a kijelölt %s ?")
+itIT("Vuoi realmente cancellare la %s selezionata ?")
+plPL("Czy na pewno chcesz usunąć zaznaczone %s ?")
+roRO("Doriţi să ştergeţi %s ales/aleasă?")
+ruRU("Вы действительно хотите удалить выделенный "
+     "%s?")
+srSP("Da li stvarno želite da obrišete izabran %s?")
+trTR("%s öğesini silmeyi gerçekten istiyor musunuz ?")
+zhCN("真的要删除选择的 %s 吗? ")
+
+T_("Insert %s")
+csCZ("Vložit %s")
+deDE("%s einfügen")
+esES("Insertar %s")
+fiFI("Lisää %s")
+frFR("Insérer %s")
+huHU("Beszúrás")
+itIT("Inserisci %s")
+plPL("Wstaw %s")
+roRO("Inserează %s")
+ruRU("Вставить %s")
+srSP("Ubaci %s")
+trTR("%s öğesini araya ekle")
+zhCN("插入 %s")
+
+T_("Insert a new %s into the table.")
+csCZ("Vložit do tabulky nový %s.")
+deDE("Neue %s in die Tabelle einfügen")
+esES("Insertar un nuevo %s en la tabla.")
+fiFI("Lisää uusi %s taulukkoon.")
+frFR("Insère une nouvelle %d dans la table.")
+huHU("Új %s beszúrása a táblázatba")
+itIT("Inserisce una nuova %s nella tabella.")
+plPL("Wstawia nowy %s do tabeli.")
+roRO("Înserează un nou/o nouă %s în tabel")
+ruRU("Вставить новый %s в таблицу.")
+srSP("Ubaci u tabelu novi %s.")
+trTR("Tabloya yeni bir %s ekle.")
+zhCN("插入新的 %s 到表格")
+
+T_("Insert %s before")
+csCZ("Vložit %s před")
+deDE("%s vorher einfügen")
+esES("Insertar %s antes")
+fiFI("Lisää %s ennen")
+frFR("Insérer %s avant")
+huHU("%s beszúrása elé")
+itIT("Inserisci %s sopra")
+plPL("Wstaw %s przed")
+roRO("Inserează %s înainte")
+ruRU("Вставить %s перед")
+srSP("Ubaci %s pre")
+trTR("%s öğesini öne ekle")
+zhCN("前插 %s")
+
+T_("Insert a new %s into the table before current")
+csCZ("Vložit nový %s před aktuální")
+deDE("Neue %s vor der aktuellen in die Tabelle einfügen")
+esES("Insertar un nuevo %s en la tabla antes del actual")
+fiFI("Lisää uusi %s taulukkoon ennen nykyistä")
+frFR("Insérer une nouvelle %d dans la table avant l'actuelle")
+huHU("Új %s beszúrása a táblázatba az aktuális elé")
+itIT("Inserisce una nuova %s prima di quella selezioanta")
+plPL("Wstawia nowy %s do tabeli przed aktualnym")
+roRO("Înserează un nou/o nouă %s în tabel înainte de cel curent")
+ruRU("Вставить новый %s в таблицу перед существующим")
+srSP("Ubaci novi %s u tabeli pre trenutne")
+trTR("Seçili olanın önüne yeni bir %s öğesi ekle")
+zhCN("在表格中当前项前插入新的 %s")
+
+T_("Insert %s after")
+csCZ("Vložit %s za")
+deDE("%s danach einfügen")
+esES("Insertar %s después")
+fiFI("Lisää %s jälkeen")
+frFR("Insérer %s après")
+huHU("% beszúrása mögé")
+itIT("Inserisci %s sotto")
+plPL("Wstaw %s po")
+roRO("Inserează %s după")
+ruRU("Вставить %s после")
+srSP("Ubaci %s posle")
+trTR("%s öğesini sona ekle")
+zhCN("后插 %s")
+
+T_("Insert a new %s into the table after current")
+csCZ("Vložit %s za aktuální")
+deDE("Neue %s hinter der aktuellen in die Tabelle einfügen")
+esES("Insertar un nuevo %s en la tabla después de la actual")
+fiFI("Lisää uusi %s taulukkoon nykyisen jälkeen")
+frFR("Insérer une nouvelle %d dans la table après l'actuelle")
+huHU("Új %s beszúrása a táblázatba az aktuális mögé")
+itIT("Inserisce una nuova %s dopo quella selezioanta")
+plPL("Wstawia nowy %s do tabeli po aktualnym")
+roRO("Înserează un nou/o nouă %s în tabel după de cel curent")
+ruRU("Вставить новый %s в таблицу после существующего")
+srSP("Ubaci novi %s u tabeli posle trenutne")
+trTR("Seçili olanın ardına yeni bir %s öğesi ekle")
+zhCN("在表格中当前项后插入新的 %s")
+
+T_("Append %s")
+csCZ("Přidat %s")
+deDE("%s hinzufügen")
+esES("Añadir %s")
+fiFI("Lisää %s jälkeen")
+frFR("Ajouter %s")
+huHU("%s hozzáfűzése")
+itIT("Aggiungi %s")
+plPL("Dodaj %s")
+roRO("Adaugă %s la capăt")
+ruRU("Добавить %s")
+srSP("Dodaj %s")
+trTR("%s öğesini iliştir")
+zhCN("添加 %s")
+
+T_("Append a new %s at the end of the table.")
+csCZ("Přidat nový %s na konec")
+deDE("Neue %s am Ende der Tabelle hinzufügen")
+esES("Añadir un nuevo %s en el final de la tabla.")
+fiFI("Lisää uusi %s taulukon loppuun.")
+frFR("Ajouter une nouvelle %s à la fin de la table.")
+huHU("Új %s hozzáfűzése a táblázat végéhez")
+itIT("Aggiunge una nuova %s al fondo della tabella.")
+plPL("Dodaje nowy %s na końcu tabeli.")
+roRO("Adaugă un nou/o nouă %s la capătul tabelului")
+ruRU("Добавить новый %s в конце таблицы.")
+srSP("Dodaj novi %s na kraju tabele.")
+trTR("Tablonun sonuna yeni bir %s öğesi iliştir.")
+zhCN("在表格末尾插入新的 %s")
+
+T_("Duplicate %s")
+csCZ("Duplikovat %s")
+deDE("%s duplizieren")
+esES("Duplicar %s")
+fiFI("Kahdenna %s")
+frFR("Dupliquer %s")
+huHU("%s megkettőzése")
+itIT("Duplica %s")
+plPL("Zduplikuj %s")
+roRO("Crează un duplicat pentru %s")
+ruRU("Дублировать %s")
+srSP("Dupliraj %s")
+trTR("%s öğesini kopyala")
+zhCN("复制 %s")
+
+T_("Duplicate current table %s.")
+csCZ("Vložit do tabulky duplikát aktuálního %s.")
+deDE("Aktuelle %s der Tabelle duplizieren")
+esES("Duplicar la tabla actual %s.")
+fiFI("Kahdenna tämänhetkinen taulukko %s.")
+frFR("Dupliquer la table %s sélectionnée.")
+huHU("Az aktuális táblázat megkettőzése")
+itIT("Duplica la tabella %s selezionata.")
+plPL("Utwórz duplikat aktualnej tabeli %s.")
+roRO("Duplifică tabelul curent %s.")
+ruRU("Дублировать текущий %s таблицы.")
+srSP("Dupliraj trenutni %s tabele.")
+trTR("Seçili %s tablosunu kopyala")
+zhCN("复制当前表格 %s.")
+
+T_("Edit %s")
+csCZ("Opravit aktuální %s")
+deDE("%s bearbeiten")
+esES("Editar %s")
+fiFI("Muokkaa %s")
+frFR("Editer %s")
+huHU("%s szerkesztése")
+itIT("Edita %s")
+plPL("Edytuj %s")
+roRO("Editează %s")
+ruRU("Редактировать %s")
+srSP("Promeni %s")
+trTR("%s öğesini düzenle")
+zhCN("编辑 %s")
+
+T_("Edit active %s.")
+csCZ("Opravit aktuální %s.")
+deDE("Aktive %s bearbeiten")
+esES("Editar activa %s")
+fiFI("Muokkaa aktiivista %s.")
+frFR("Editer %s actif.")
+huHU("Az aktuális %s szerkesztése")
+itIT("Edita la %s attiva.")
+plPL("Edytowanie aktualnego %s.")
+roRO("Editează %s activ(e).")
+ruRU("Редактировать активный %s.")
+srSP("Promeni aktivni %s.")
+trTR("Seçili %s öğesini düzenle")
+zhCN("编辑活动 %s")
+
+T_("Delete %s\tDelete")
+csCZ("Odstranit %s\tDelete")
+deDE("%s löschen\tLöschen")
+esES("Borrar %s\tBorrar")
+fiFI("Poista %s\tPoista")
+frFR("Supprimer %s\tSupprimer")
+huHU("Törlés %s\tTörlés")
+itIT("Cancella %s\tCancella")
+plPL("Usuń %s\tUsuń")
+roRO("Şterge %s\tŞterge")
+ruRU("Удалить %s\tУдалить")
+srSP("Obriši %s\tObriši")
+trTR("%s öğesini sil")
+zhCN("删除%s\t删除")
+
+T_("Delete active %s.")
+csCZ("Odstranit aktuální %s.")
+deDE("Aktive %s löschen")
+esES("Borrar activa %s.")
+fiFI("Poista aktiivinen %s.")
+frFR("Supprimer %s actif.")
+huHU("Az aktív %s törlése")
+itIT("Cancella %s attiva.")
+plPL("Usuwa aktualny %s.")
+roRO("Șterge %s activ(e).")
+ruRU("Удалить активный %s.")
+srSP("Obriši aktivni %s.")
+trTR("Etkin %s öğesini sil")
+zhCN("删除活动 %s")
+
+T_("Move %s up")
+csCZ("Posunout %s nahoru")
+deDE("%s nach oben verschieben")
+esES("Mover %s arriba")
+fiFI("Siirrä %s ylöspäin")
+frFR("Monter %s")
+huHU("%s felfelé mozgatása")
+itIT("Sposta %s su")
+plPL("Przesuń %s do góry")
+roRO("Mută %s sus")
+ruRU("Двигать %s вверх")
+srSP("Pomeri %s na gore")
+trTR("%s öğesini yukarı taşı")
+zhCN("上移%s")
+
+T_("Swap %s with previous thus moving it up.")
+csCZ("Vyměnit aktuální %s s předchozím a tak ho posunout nahoru.")
+deDE("%s mit der vorigen vertauschen und so nach oben verschieben")
+esES("Intercambiar %s con el anterior y así moverlo arriba.")
+fiFI("Vaihda %s yläpuolella sijaitsevan kanssa.")
+frFR("Intervertir %s avec le précédent.")
+huHU("%s felcserélése az előzővel - felfelé mozgatás")
+itIT("Inverte la %s con la precedente.")
+plPL("Zamienia %s z poprzednim przesuwając go do góry.")
+roRO("Interschimbă %s cu cel precedent, mutându-l în sus.")
+ruRU("Поменять местами %s с предыдущим, подвинув "
+     "вверх.")
+srSP("Zameni %s sa prethodnim, pomeri ga na gore.")
+trTR(" %s öğesini yukarıya taşıyarak bir öncekiyle yerini değiştir.")
+zhCN("将%s与前面换位上移之")
+
+T_("Move %s down")
+csCZ("Posunout %s dolů")
+deDE("%s nach unten verschieben")
+esES("Mover %s abajo")
+fiFI("Siirrä %s alaspäin")
+frFR("Descendre %s")
+huHU("%s lefelé mozgatása")
+itIT("Sposta %s giu")
+plPL("Przesuń %s w dół")
+roRO("Mută %s jos")
+ruRU("Двигать %s вниз")
+srSP("Pomeri %s dole")
+trTR("%s öğesini aşağı taşı")
+zhCN("下移%s")
+
+T_("Swap %s with next thus moving it down.")
+csCZ("Vyměnit aktuální %s s dalším a tak ho posunout dolů.")
+deDE("%s mit der nächsten vertauschen und so nach unten verschieben")
+esES("Intercambiar %s con el siguiente y así moverlo abajo")
+fiFI("Vaihda %s alapuolella sijaitsevan kanssa.")
+frFR("Intervertir %s avec le suivant.")
+huHU("%s felcserélése a következővel - lefelé mozgatás")
+itIT("Inverte la %s la successiva.")
+plPL("Zamienia %s z następnym przesuwając go w dół.")
+roRO("Interschimbă %s cu următorul, mutându-l în jos.")
+ruRU("Поменять местами %s со следующим, подвинув "
+     "вниз.")
+srSP("Zameni %s sa sledećim, pomeri ga na dole.")
+trTR("%s öğesini aşağıya taşıyarak bir sonrakiyle yerini değiştir")
+zhCN("将%s与后面换位下移之")
+
+T_("Select all table rows")
+csCZ("Vybrat všechny řádky v tabulce")
+deDE("Alle Zeilen der Tabelle auswählen")
+esES("Seleccionar todas las filas de la tabla")
+fiFI("Valitse kaikki taulukon rivit")
+frFR("Sélectionner toutes les lignes")
+huHU("Az összes sor kijelölése")
+itIT("Seleziona tutte le righe")
+plPL("Zaznacz wszystkie wiersze tabeli")
+roRO("Selecteză toate liniile tabelului")
+ruRU("Выделить все ряды таблицы")
+srSP("Izaberi sve redove tabele")
+trTR("Tüm satırları seç")
+zhCN("全选表格行")
+
+T_("row")
+csCZ("řádek")
+deDE("Zeile")
+esES("fila")
+fiFI("rivi")
+frFR("ligne")
+huHU("sor")
+itIT("riga")
+plPL("wiersz")
+roRO("linie")
+ruRU("ряды")
+srSP("red")
+trTR("satır")
+zhCN("行")
+
+
+// Progress.cpp
+
+T_("Working...")
+csCZ("Pracuji...")
+deDE("Bearbeitung läuft ...")
+esES("Trabajando...")
+fiFI("Työskentelee...")
+frFR("En cours d'exécution...")
+huHU("Folyamatban...")
+itIT("Esecuzione...")
+plPL("Pracuję...")
+roRO("Se lucrează...")
+ruRU("Обработка...")
+srSP("Radim...")
+trTR("işlem yapılıyor...")
+zhCN("工作中...")
+
+
+// AKeys.cpp
+
+T_("Configure keyboard shortcuts")
+csCZ("Nastavit klávesy")
+deDE("Tasten zuweisen")
+esES("Teclas de configuración")
+fiFI("Aseta pikanäppäimet")
+frFR("Configurer les raccourcis")
+huHU("Billentyűk beállítása")
+itIT("Selezione tasti veloci")
+plPL("Ustawienia klawiszy")
+roRO("Configurează scurtăturile de tastatură")
+ruRU("Настроить горячие клавиши")
+srSP("Podesi tastere")
+trTR("Tuş Ayarları")
+zhCN("设置键值")
+
+T_("Group")
+csCZ("Skupina")
+deDE("Gruppe")
+esES("Grupo")
+fiFI("Ryhmä")
+frFR("Groupe")
+huHU("Csoport")
+itIT("Gruppo")
+plPL("Grupa")
+roRO("Grup")
+ruRU("Группа")
+srSP("Grupa")
+trTR("Grup")
+zhCN("组")
+
+T_("Action")
+csCZ("Akce")
+deDE("Aktion")
+esES("Actión")
+fiFI("Toiminto")
+frFR("Action")
+huHU("Művelet")
+itIT("Azione")
+plPL("Akcja")
+roRO("Acţiune")
+ruRU("Действие")
+srSP("Akcija")
+trTR("Eylem")
+zhCN("动作")
+
+T_("Primary")
+csCZ("Primární")
+deDE("Taste 1")
+esES("Tecla 1")
+fiFI("Näppäin 1")
+frFR("Touche 1")
+huHU("1. billentyű")
+itIT("Combinazione 1")
+plPL("Klawisz 1")
+roRO("Primar")
+ruRU("Первично")
+srSP("Taster 1")
+trTR("1. Tuş")
+zhCN("键1")
+
+T_("Secondary")
+csCZ("Sekundární")
+deDE("Taste 2")
+esES("Tecla 2")
+fiFI("Näppäin 2")
+frFR("Touche 2")
+huHU("2. billentyű")
+itIT("Combinazione 2")
+plPL("Klawisz 2")
+roRO("Secundar")
+ruRU("Вторично")
+srSP("Taster 2")
+trTR("2. Tuş")
+zhCN("键2")
+
+
+// Prompt.cpp
+
+T_("OK")
+csCZ("OK")
+deDE("OK")
+esES("Aceptar")
+fiFI("OK")
+frFR("Ok")
+huHU("Rendben")
+itIT("Ok")
+plPL("OK")
+roRO("OK")
+ruRU("OK")
+srSP("OK")
+trTR("Tamam")
+zhCN("确定")
+
+T_("Cancel")
+csCZ("Storno")
+deDE("Abbrechen")
+esES("Cancelar")
+fiFI("Peruuta")
+frFR("Annuler")
+huHU("Mégsem")
+itIT("Annulla")
+plPL("Anuluj")
+roRO("Anulează")
+ruRU("Отмена")
+srSP("Otkaži")
+trTR("İptal")
+zhCN("取消")
+
+T_("&Yes")
+csCZ("&Ano")
+deDE("&Ja")
+esES("&Sí")
+fiFI("&Kyllä")
+frFR("&Oui")
+huHU("&Igen")
+itIT("&Si")
+plPL("&Tak")
+roRO("&Da")
+ruRU("&Да")
+srSP("&Da")
+trTR("&Evet")
+zhCN("是(&Y)")
+
+T_("&No")
+csCZ("&Ne")
+deDE("&Nein")
+esES("&No")
+fiFI("&Ei")
+frFR("&Non")
+huHU("&Nem")
+itIT("&No")
+plPL("&Nie")
+roRO("&Nu")
+ruRU("&Нет")
+srSP("&Ne")
+trTR("&Hayır")
+zhCN("否(&N)")
+
+T_("&Abort")
+csCZ("&Přerušit")
+deDE("&Abbrechen")
+esES("&Abortar")
+fiFI("&Keskeytä")
+frFR("&Interrompre")
+huHU("&Megszakítás")
+itIT("&Interrompi")
+plPL("&Przerwij")
+roRO("&Abandonează")
+ruRU("&Прервать")
+srSP("&Prekini")
+trTR("&İptal")
+zhCN("放弃(&A)")
+
+T_("&Retry")
+csCZ("&Opakovat")
+deDE("&Erneut versuchen")
+esES("&Reintentar")
+fiFI("&Yritä uudelleen")
+frFR("&Réessayer")
+huHU("&Újra")
+itIT("&Riprova")
+plPL("Po&wtórz")
+roRO("&Reîncearcă")
+ruRU("П&овторить")
+srSP("&Ponovi")
+trTR("&Tekrar Dene")
+zhCN("重试(&R)")
+
+T_("&Ignore")
+csCZ("&Ignorovat")
+deDE("&Ignorieren")
+esES("&Ignorar")
+fiFI("&Jätä huomiotta")
+frFR("")
+huHU("&Ignore")
+itIT("")
+plPL("")
+roRO("&Ignoră")
+ruRU("Пропустить")
+srSP("")
+trTR("&Ignore")
+zhCN("")
+
+
+// Help.cpp
+
+T_("Go Back")
+csCZ("Předchozí téma")
+deDE("Rückwärts")
+esES("Volver atrás")
+fiFI("Palaa takaisin")
+frFR("Précédent")
+huHU("Visszalépés")
+itIT("Indiatro")
+plPL("Idź wstecz")
+roRO("Înapoi")
+ruRU("Назад")
+srSP("Nazad")
+trTR(" Geri Git")
+zhCN("回退")
+
+T_("Go Forward")
+csCZ("Další téma")
+deDE("Vorwärts")
+esES("Ir adelante")
+fiFI("Siirry eteenpäin")
+frFR("Suivant")
+huHU("Előrelépés")
+itIT("Avanti")
+plPL("Idź do przodu")
+roRO("Înainte")
+ruRU("Вперёд")
+srSP("Napred")
+trTR("İleri Git")
+zhCN("向前")
+
+T_("Font size")
+csCZ("Velikost")
+deDE("Schriftgrad")
+esES("Tamaño del font")
+fiFI("Kirjasinkoko")
+frFR("Taille de police")
+huHU("Betűméret")
+itIT("Dimensione font")
+plPL("Rozmiar czcionki")
+roRO("Dimensiunea fontului")
+ruRU("Размер шрифта")
+srSP("Veličina fonta")
+trTR("Yazı tipi boyutu")
+zhCN("字体大小")
+
+T_("Print")
+csCZ("Tisk")
+deDE("Drucken")
+esES("Imprimir")
+fiFI("Tulosta")
+frFR("Imprimer")
+huHU("Nyomtatás")
+itIT("Stampa")
+plPL("Drukuj")
+roRO("Listează")
+ruRU("Печать")
+srSP("Štampa")
+trTR("Yazdır")
+zhCN("打印")
+
+T_("Help")
+csCZ("Nápověda")
+deDE("Hilfe")
+esES("Ayuda")
+fiFI("Apua")
+frFR("Aide")
+huHU("Súgó")
+itIT("Aiuto")
+plPL("Pomoc")
+roRO("Ajutor")
+ruRU("Помощь")
+srSP("Pomoć")
+trTR("Yardım")
+zhCN("帮助")
+
+
+// DateTimeCtrl.cpp
+
+T_("Previous month")
+csCZ("Minulý měsíc")
+deDE("Voriger Monat")
+esES("Mes anterior")
+fiFI("Edellinen kuukausi")
+frFR("")
+huHU("Előző hónap")
+itIT("")
+plPL("Poprzedni miesiąc")
+roRO("Luna trecută")
+ruRU("Пред. месяц")
+srSP("")
+trTR("Önceki ay")
+zhCN("")
+
+T_("Next month")
+csCZ("Další měsíc")
+deDE("Nächster Monat")
+esES("Mes siguiente")
+fiFI("Seuraava kuukausi")
+frFR("")
+huHU("Következő hónap")
+itIT("")
+plPL("Następny miesiąc")
+roRO("Luna viitoare")
+ruRU("След. месяц")
+srSP("")
+trTR("Sonraki ay")
+zhCN("")
+
+T_("Previous year")
+csCZ("Minulý rok")
+deDE("Voriges Jahr")
+esES("Año siguiente")
+fiFI("Edellinen vuosi")
+frFR("")
+huHU("Előző év")
+itIT("")
+plPL("Poprzedni rok")
+roRO("Anul trecut")
+ruRU("Пред. год")
+srSP("")
+trTR("Önceki yıl")
+zhCN("")
+
+T_("Next year")
+csCZ("Další rok")
+deDE("Nächstes Jahr")
+esES("Año anterior")
+fiFI("Seuraava vuosi")
+frFR("")
+huHU("Következő év")
+itIT("")
+plPL("Następny rok")
+roRO("Anul viitor")
+ruRU("След. год")
+srSP("")
+trTR("Sonraki yıl")
+zhCN("")
+
+T_("Today")
+csCZ("Dnes")
+deDE("Heute")
+esES("Hoy")
+fiFI("Tänään")
+frFR("")
+huHU("Ma")
+itIT("")
+plPL("Dziś")
+roRO("Azi")
+ruRU("Сегодня")
+srSP("")
+trTR("Bugün")
+zhCN("")
+
+T_("Wk")
+csCZ("Tý")
+deDE("Wo.")
+esES("Sem")
+fiFI("Vko")
+frFR("")
+huHU("H")
+itIT("")
+plPL("Ty.")
+roRO("Sp")
+ruRU("")
+srSP("")
+trTR("Hft.")
+zhCN("")
+
+T_("Previous hour")
+csCZ("Předchozí hodina")
+deDE("Vorige Stunde")
+esES("Hora anterior")
+fiFI("Edellinen tunti")
+frFR("")
+huHU("Előző óra")
+itIT("")
+plPL("")
+roRO("Ora trecută")
+ruRU("Час назад")
+srSP("")
+trTR("")
+zhCN("")
+
+T_("Next hour")
+csCZ("Další hodina")
+deDE("Nächste Stunde")
+esES("Hora siguiente")
+fiFI("Seuraava tunti")
+frFR("")
+huHU("Következő óra")
+itIT("")
+plPL("")
+roRO("Ora viitoare")
+ruRU("Через час")
+srSP("")
+trTR("")
+zhCN("")
+
+T_("Previous minute")
+csCZ("Předchozí minuta")
+deDE("Vorige Minute")
+esES("Minuto anterior")
+fiFI("Edellinen minuutti")
+frFR("")
+huHU("Előző perc")
+itIT("")
+plPL("")
+roRO("Minutul trecut")
+ruRU("Минуту назад")
+srSP("")
+trTR("")
+zhCN("")
+
+T_("Next minute")
+csCZ("Další minuta")
+deDE("Nächste Minute")
+esES("Minuto siguiente")
+fiFI("Seuraava minuutti")
+frFR("")
+huHU("Következő perc")
+itIT("")
+plPL("")
+roRO("Minutul următor")
+ruRU("Через минуту")
+srSP("")
+trTR("")
+zhCN("")
+
+
+// StatusBar.cpp
+
+T_("Ready")
+csCZ("Připraven")
+deDE("Fertig")
+esES("Preparado")
+fiFI("Valmis")
+frFR("Prêt")
+huHU("Kész")
+itIT("Pronto")
+plPL("Gotowy")
+roRO("Gata")
+ruRU("Готов")
+srSP("Spreman")
+trTR("Hazır")
+zhCN("待命")
+
+
+// TabCtrl.cpp
+
+T_("Apply")
+csCZ("Použít")
+deDE("Übernehmen")
+esES("Aplicar")
+fiFI("Käytä")
+frFR("Appliquer")
+huHU("Alkalmaz")
+itIT("Applica")
+plPL("Zastosuj")
+roRO("Aplică")
+ruRU("Применить")
+srSP("Primeni")
+trTR("Uygula")
+zhCN("应用")
+
+T_("Close")
+csCZ("Zavřít")
+deDE("Schließen")
+esES("Cerra")
+fiFI("Sulje")
+frFR("Fermer")
+huHU("Bezár")
+itIT("Chiudi")
+plPL("Zamknij")
+roRO("Închide")
+ruRU("Закрыть")
+srSP("Zatvori")
+trTR("Kapat")
+zhCN("关闭")
+
+
+// DlgColor.cpp
+
+T_("(no color)")
+csCZ("(bez barvy)")
+deDE("(keine Farbe)")
+esES("(sin color)")
+fiFI("(ei väriä)")
+frFR("(aucune couleur)")
+huHU("(nincs szín)")
+itIT("(nessun colore)")
+plPL("(bez koloru)")
+roRO("(fără culoare)")
+ruRU("нет цвета")
+srSP("(bez boje)")
+trTR("(renk yok)")
+zhCN("(无颜色)")
+
+T_("Set color")
+csCZ("Nastavit barvu")
+deDE("Farbe festlegen")
+esES("Establecer color")
+fiFI("Aseta väri")
+frFR("Appliquer la couleur")
+huHU("Szín beállítása")
+itIT("(Set colore)")
+plPL("(Ustaw kolor)")
+roRO("Setează culoarea")
+ruRU("Установить цвет")
+srSP("Postavi boju")
+trTR("Rengi ayarla")
+zhCN("设置颜色")
+
+T_("Write current color to selected palette slot")
+csCZ("Nastavit barvu pole v paletě na aktuální kreslicí barvu")
+deDE("Palettenplatz mit aktueller Farbe belegen")
+esES("Guardar el color actual al slot seleccionado en la paleta")
+fiFI("Aseta tämänhetkinen väri valittuun paletin soluun")
+frFR("Ecrire la couleur courante dans l'emplacement sélectionné de la palette")
+huHU("Aktuális szín beírása a kijelölt palettamezőbe")
+itIT("Salva il colore corrente nello slot selezionato della tavolozza")
+plPL("Zapisz aktualny kolor do wskazanego miejsca w palecie kolorów")
+roRO("Scrie culoarea curentă în locaţia din paletă selectată")
+ruRU("Записать текущий цвет в выделенный слот "
+     "палитры")
+srSP("Zapiši trenutnu boju u izabranu paletu boja")
+trTR("Seçilen palet slotunu geçerli renkle değiştir")
+zhCN("写当前颜色到选择的调色板槽")
+
+T_("Default palette")
+csCZ("Standardní paleta")
+deDE("Vorgabepalette")
+esES("Paleta por defecto")
+fiFI("Oletuspaletti")
+frFR("Palette par défaut")
+huHU("Alapértelmezett paletta")
+itIT("Tavolozza di default")
+plPL("Domyślna paleta kolorów")
+roRO("Paletă implicită")
+ruRU("Палитра по умолчанию")
+srSP("Podrazumevana paleta")
+trTR("Varsayılan renk paleti")
+zhCN("缺省调色板")
+
+T_("Restore default system palette")
+csCZ("Nastavit standardní systémovou paletu")
+deDE("Voreingestellte Systempalette wiederherstellen")
+esES("Restaurar la paleta por defecto del sistema")
+fiFI("Palauta järjestelmän oletuspaletti")
+frFR("Restaurer la palette système par défaut")
+huHU("Alapértelmezett rendszer paletta visszaállítása")
+itIT("Ripristina la tavolozza di default")
+plPL("Przywróc standardową systemową paletę kolorów")
+roRO("Restaurează paleta implictă a sistemului")
+ruRU("Восстановить системную палитру по умолчанию")
+srSP("Vrati standardnu paletu sistema")
+trTR("Varsayılan sistem renk paletini geri yükle")
+zhCN("恢复到缺省系统调色板")
+
+T_("Save as..")
+csCZ("Uložit jako...")
+deDE("Speichern unter ...")
+esES("Guardar como..")
+fiFI("Tallenna nimellä...")
+frFR("Enregistrer sous..")
+huHU("Mentés másként..")
+itIT("Salva come..")
+plPL("Zapisz jako...")
+roRO("Salvează ca..")
+ruRU("Сохранить как...")
+srSP("Sačuvaj kao..")
+trTR("Farklı kaydet...")
+zhCN("保存为")
+
+T_("Store palette information into a disk file")
+csCZ("Uložit paletu do souboru")
+deDE("Paletteninformationen in einer Datei speichern")
+esES("Guardar en disco la información de la paleta")
+fiFI("Tallenna paletti tiedostoon")
+frFR("Enregistrer la palette dans un fichier ")
+huHU("Palettainformáció tárolása fájlba")
+itIT("salva la tavolozza in un file su disco")
+plPL("Zapisz informacje o palecie kolorów do pliku")
+roRO("Salvează informaţia despre paletă pe disc")
+ruRU("Сохранить информацию о палитре в файл "
+     "на диск")
+srSP("Sačuvaj paletu u fajl na disku")
+trTR("Renk paleti bilgisini dosyada sakla")
+zhCN("保存调色板信息到磁盘文件")
+
+T_("Load")
+csCZ("Načíst...")
+deDE("Laden")
+esES("Cargar")
+fiFI("Lataa")
+frFR("Charger")
+huHU("Betöltés")
+itIT("Carica")
+plPL("Ładuj")
+roRO("Încarcă")
+ruRU("Загрузить")
+srSP("Učitaj")
+trTR("Yükle")
+zhCN("装载")
+
+T_("Load previously saved palette")
+csCZ("Načíst paletu z dříve uloženého souboru")
+deDE("Zuvor gespeicherte Palette laden")
+esES("Cargar la paleta guardada previamente")
+fiFI("Lataa aiemmin tallennettu paletti")
+frFR("Charger une palette précédemment sauvée")
+huHU("Az előző tárolt paletta betöltése")
+itIT("Carica la tavolozza precedentemente salvata")
+plPL("Ładuj ostatnio zapisaną paletę kolorów")
+roRO("Încarcă o paletă salvată")
+ruRU("Загрузить сохранённую палитру")
+srSP("Učitaj prethodno sačuvanu paletu")
+trTR("Daha önce kaydedilmiş olan renk paletini yükle")
+zhCN("载入以前保存的调色板")
+
+T_("Small")
+csCZ("Malá")
+deDE("Klein")
+esES("Pequeño")
+fiFI("Pieni")
+frFR("Petit")
+huHU("Kicsi")
+itIT("Piccolo")
+plPL("Mały")
+roRO("Mic")
+ruRU("Маленький")
+srSP("Mali")
+trTR("Küçük")
+zhCN("小")
+
+T_("Set up palette size 4 times 4 colors")
+csCZ("Nastavit rozměry palety 4 x 4 polí")
+deDE("Palette in der Größe von 4 mal 4 Farben erstellen")
+esES("Establezca el tamaño de la paleta 4 veces 4 colores")
+fiFI("Aseta paletin kooksi 4x4 väriä")
+frFR("Modifier la taille de la palette à 4x4")
+huHU("Palettaméret 4x4 színre állítása")
+itIT("Imposta la tavolozza a 4 colori alla volta")
+plPL("Ustaw rozmiar palety 4 na 4 kolory")
+roRO("Setează dimensiunea paletei la 4 ori 4 culori")
+ruRU("Установить размер палитры 16 цветов")
+srSP("Podesi veličinu palete na 4x4 boje")
+trTR("16 renkli palet oluştur")
+zhCN("设置调色板大小为4倍4颜色")
+
+T_("Medium")
+csCZ("Střední")
+deDE("Mittel")
+esES("Medio")
+fiFI("Keskikokoinen")
+frFR("Moyen")
+huHU("Közepes")
+itIT("Medio")
+plPL("Średni")
+roRO("Mediu")
+ruRU("Средний")
+srSP("Srednji")
+trTR("Orta")
+zhCN("中")
+
+T_("Set up palette size 8 times 8 colors")
+csCZ("Nastavit rozměry palety 8 x 8 polí")
+deDE("Palette in der Größe von 8 mal 8 Farben erstellen")
+esES("Establezca el tamaño de la la paleta 8 veces 8 colores")
+fiFI("Aseta paletin kooksi 8x8 väriä")
+frFR("Modifier la taille de la palette à 8x8")
+huHU("Palettaméret 8x8 színre állítása")
+itIT("Imposta la tavolozza a 8 colori alla volta")
+plPL("Ustaw rozmiar palety 8 na 8 kolorów")
+roRO("Setează dimensiunea paletei la 8 ori 8 culori")
+ruRU("Установить размер палитры 64 цветов")
+srSP("Podesi veličinu palete na 8x8 boja")
+trTR("64 renkli palet oluştur")
+zhCN("设置调色板大小为8倍8颜色")
+
+T_("Large")
+csCZ("Velká")
+deDE("Groß")
+esES("Grande")
+fiFI("Suuri")
+frFR("Large")
+huHU("Nagy")
+itIT("Largo")
+plPL("Duży")
+roRO("Mare")
+ruRU("Большой")
+srSP("Velika")
+trTR("Büyük")
+zhCN("大")
+
+T_("Set up palette size 16 times 16 colors (maximum size)")
+csCZ("Nastavit rozměry palety 16 x 16 polí (max. velikost)")
+deDE("Palette in der Größe von 16 mal 16 Farben erstellen (Maximalgröße)")
+esES("Establezca el tamaño de la paleta 16 veces 16 colores (tamaño máximo)")
+fiFI("Aseta paletin kooksi 16x16 väriä (maksimikoko)")
+frFR("Modifier la taille de la palette à 16x16")
+huHU("Palettaméret 16x16 színre állítása")
+itIT("Imposta la tavolozza a 16 colori alla volta (dimensione massima)")
+plPL("Ustaw rozmiar palety 16 na 16 kolorów")
+roRO("Setează dimensiunea paletei la 16 ori 16 culori (dimensiunea maximă)")
+ruRU("Установить размер палитры 256 цветов (максимальный "
+     "размер)")
+srSP("Podesi veličinu palete na 16x16 boja (maksimalna veličina)")
+trTR("256 renkli palet oluştur")
+zhCN("设置调色板大小为16倍16颜色(最大)")
+
+T_("Custom...")
+csCZ("Vlastní...")
+deDE("Eigen ...")
+esES("Personalizar...")
+fiFI("Mukautettu...")
+frFR("Personnalisé...")
+huHU("Választott...")
+itIT("Personalizzato...")
+plPL("Własny...")
+roRO("Definit de utilizator...")
+ruRU("Пользовательская...")
+srSP("Proizvoljno...")
+trTR("Özel...")
+zhCN("定制...")
+
+T_("Select custom palette size")
+csCZ("Zvolit vlastní počet polí v paletě")
+deDE("Eigene Palettengröße auswählen")
+esES("Seleccione el tamaño personal de la paleta")
+fiFI("Valitse mukautettu paletin koko")
+frFR("Sélectionner une taille personnalisée de palette")
+huHU("Választott palettaméret beállítása")
+itIT("Seleziona tavolozza di dimensione personalizzata")
+plPL("Ustaw własny rozmiar palety kolorów")
+roRO("Alege dimensiunea paletei")
+ruRU("Выберите размер пользовательской палитры")
+srSP("Izaberi proizvoljnu veličinu palete")
+trTR("Özel palet boyutunu seç")
+zhCN("选择定制调色板大小")
+
+T_("Palette (*.pal)")
+csCZ("Paleta (*.pal)")
+deDE("Palette (*.pal)")
+esES("Paleta (*.pal)")
+fiFI("Paletti (*.pal)")
+frFR("Palette (*.pal)")
+huHU("Paletta (*.pal)")
+itIT("Tavolozza (*.pal)")
+plPL("Paleta (*.pal)")
+roRO("Paletă (*.pal)")
+ruRU("Палитра (*.pal)")
+srSP("Paleta (*.pal)")
+trTR("Palet (*.pal)")
+zhCN("调色板(*.pal)")
+
+T_("*.pal")
+csCZ("*.pal")
+deDE("*.pal")
+esES("*.pal")
+fiFI("*.pal")
+frFR("*.pal")
+huHU("*.pal")
+itIT("*.pal")
+plPL("*.pal")
+roRO("*.pal")
+ruRU("")
+srSP("*.pal")
+trTR("*.pal")
+zhCN("*.pal")
+
+T_("pal")
+csCZ("pal")
+deDE("pal")
+esES("pal")
+fiFI("pal")
+frFR("pal")
+huHU("pal")
+itIT("pal")
+plPL("pal")
+roRO("pal")
+ruRU("")
+srSP("pal")
+trTR("pal")
+zhCN("pal")
+
+T_("Save palette as..")
+csCZ("Uložit paletu jako...")
+deDE("Palette speichern unter ...")
+esES("Guardar paleta como..")
+fiFI("Tallenna paletti nimellä...")
+frFR("Sauver la palette sous..")
+huHU("Paletta mentése más néven..")
+itIT("Salva tavolozza come..")
+plPL("Zapisz paletę kolorów jako...")
+roRO("Salvează paleta ca..")
+ruRU("Сохранить палитру как...")
+srSP("Sačuvajte paletu kao...")
+trTR("Paleti farklı kaydet...")
+zhCN("保存调色板为..")
+
+T_("Error writing file [* \001%s\001].")
+csCZ("Chyba při zápisu do souboru [* \001%s\001].")
+deDE("Fehler beim Schreiben der Datei [* \001%s\001]")
+esES("Error escribiendo archivo [* \001%s\001].")
+fiFI("Virhe tallennettaessa tiedostoa  [* \001%s\001].")
+frFR("Erreur d'écriture du fichier [* \001%s\001].")
+huHU("Hiba a [* \001%s\001] fájl írásakor")
+itIT("Errore di scrittura file [* \001%s\001].")
+plPL("Błąd zapisu pliku [* \001%s\001].")
+roRO("Eroare la salvarea fişierului [* \001%s\001].")
+ruRU("Ошибка записи файла [* \001%s\001].")
+srSP("Greška prilikom pisanja fajla [* \001%s\001].")
+trTR("Dosya yazma hatası: veriler [* \001%s\001] dosyasına yazılamıyor.")
+zhCN("写文件错误[* \001%s\001].")
+
+T_("Load palette..")
+csCZ("Načíst paletu...")
+deDE("Palette laden ...")
+esES("Cargar paleta..")
+fiFI("Lataa paletti...")
+frFR("Charger la palette..")
+huHU("Paletta betöltése..")
+itIT("Carica tavolozza..")
+plPL("Ładuj paletę kolorów...")
+roRO("Încarcă paleta")
+ruRU("Загрузить палитру...")
+srSP("Učitaj paletu..")
+trTR("Renk paleti yükle...")
+zhCN("装载调色板..")
+
+T_("Error opening file [* \001%s\001].")
+csCZ("Nelze otevřít soubor [* \001%s\001].")
+deDE("Fehler beim Öffnen der Datei [* \001%s\001]")
+esES("Error abriendo archivo [* \001%s\001].")
+fiFI("Virhe avattaessa tiedostoa [* \001%s\001].")
+frFR("Erreur d'ouverture du fichier [* \001%s\001].")
+huHU("Hiba a [* \001%s\001] fájl megnyitásakor")
+itIT("Errore di aprtura file [* \001%s\001].")
+plPL("Błąd otwarcia pliku [* \001%s\001].")
+roRO("Eroare la deschiderea fişierului [* \001%s\001].")
+ruRU("Ошибка открытия файла [* \001%s\001].")
+srSP("Greška prilikom otvaranja fajla [* \001%s\001].")
+trTR("Dosya yazma hatası: [* \001%s\001] dosyası açılamıyor.")
+zhCN("打开文件错误[* \001%s\001].")
+
+T_("Error reading palette from file [* \001%s\001].")
+csCZ("Chyba při načítání palety ze souboru [* \001%s\001].")
+deDE("Fehler beim Lesen der Palette aus der Datei [* \001%s\001]")
+esES("Error leyendo paleta desde archivo [* \001%s\001].")
+fiFI("Virhe luettaessa palettia tiedostosta [* \001%s\001].")
+frFR("Erreur de lecture du fichier de palette [* \001%s\001].")
+huHU("Hiba a paletta beolvasásakor a [* \001%s\001] fájlból")
+itIT("Errore di lettura tavolozza dal file [* \001%s\001].")
+plPL("Błąd czytania palety kolorów z pliku [* \001%s\001].")
+roRO("Eroare la citirea paletei din fişierul [* \001%s\001].")
+ruRU("Ошибка чтения палитры из файла [* \001%s\001].")
+srSP("Greška prilikom čitanja fajla [* \001%s\001].")
+trTR("Dosya okuma hatası: palet [* \001%s\001] dosyasından okunamıyor.")
+zhCN("从文件[* \001%s\001]. 读调色板错")
+
+T_("Palette dimensions")
+csCZ("Rozměry palety")
+deDE("Palettenmaße")
+esES("Tamaño de la paleta")
+fiFI("Paletin dimensiot")
+frFR("Dimensions de la palette")
+huHU("Paletta dimenziói")
+itIT("Dimensioni tavolozza")
+plPL("Rozmiary palety kolorów")
+roRO("Dimensiunile paletei")
+ruRU("Размер палитры")
+srSP("Dimenzije palete")
+trTR("Palet boyutları")
+zhCN("调色板维度")
+
+T_("(transparent)")
+csCZ("(průhledná)")
+deDE("(transparent)")
+esES("(transparente)")
+fiFI("(läpinäkyvä)")
+frFR("transparent")
+huHU("(átlátszó)")
+itIT("(trasparente)")
+plPL("(przezroczysty)")
+roRO("(transparent)")
+ruRU("(прозрачный)")
+srSP("(transparenta)")
+trTR("(saydam)")
+zhCN("(透明)")
+
+T_("Palette")
+csCZ("Paleta")
+deDE("Palette")
+esES("Paleta")
+fiFI("Paletti")
+frFR("Palette")
+huHU("Paletta")
+itIT("Tavolozza")
+plPL("Paleta")
+roRO("Paletă")
+ruRU("Палитра")
+srSP("Paleta")
+trTR("Palet")
+zhCN("调色板")
+
+T_("Wheel")
+csCZ("Kolo")
+deDE("Farbkreis")
+esES("Rueda")
+fiFI("Pyörä")
+frFR("Molette")
+huHU("Korong")
+itIT("Ruota")
+plPL("Koło")
+roRO("Roată")
+ruRU("Колесо")
+srSP("Točak")
+trTR("Teker")
+zhCN("滚轮")
+
+T_("Hue")
+csCZ("Odstín")
+deDE("Farbton")
+esES("Hue")
+fiFI("Sävy (Hue)")
+frFR("Tinte")
+huHU("Színezet")
+itIT("Tinta")
+plPL("Odcień")
+roRO("Hue")
+ruRU("Оттенок")
+srSP("Obojenost")
+trTR("Renk (Hue)")
+zhCN("色调")
+
+T_("RGB")
+csCZ("RGB")
+deDE("RGB")
+esES("RGB")
+fiFI("RGB")
+frFR("RVB")
+huHU("RGB")
+itIT("RGB")
+plPL("RGB")
+roRO("RGB")
+ruRU("")
+srSP("RGB")
+trTR("RGB")
+zhCN("RGB")
+
+T_("HSV")
+csCZ("HSV")
+deDE("FSH")
+esES("HSV")
+fiFI("HSV")
+frFR("HSV")
+huHU("HSB")
+itIT("HSV")
+plPL("HSV")
+roRO("HSV")
+ruRU("")
+srSP("HSV")
+trTR("HSV")
+zhCN("HSV")
+
+T_("Select color")
+csCZ("Výběr barvy")
+deDE("Farbe auswählen")
+esES("Selección de color")
+fiFI("Valitse väri")
+frFR("Sélectionner la couleur")
+huHU("Szín választása")
+itIT("Seleziona colore")
+plPL("Wybrany kolor")
+roRO("Alege culoarea")
+ruRU("Выбирите цвет")
+srSP("Izaberi boju")
+trTR("Renk Seçin")
+zhCN("选择颜色")
+
+
+// FileSel.cpp
+
+T_("[A3* Unable to read the directory !]&&")
+csCZ("[A3* Nelze načíst obsah adresáře !]&&")
+deDE("[A3* Verzeichnis kann nicht gelesen werden!]&&")
+esES("[A3* No se puede leer el directorio !]&&")
+fiFI("[A3* Kansiota ei kyetä lukemaan !]&&")
+frFR("[A3* Impossible de lire le répertoire !]&&")
+huHU("[A3* Nem sikerült olvasni a mappát!]&&")
+itIT("[A3* Impossibile leggere la cartella !]&&")
+plPL("[A3* Nie można odczytać katalogu !]&&")
+roRO("[A3* Directorul nu poate fi citit !]&&")
+ruRU("[A3* Не могу прочитать папку!]&&")
+srSP("[A3* Ne mogu da pročitam folder!]&&")
+trTR("[A3* Klasör okunamıyor !]&&")
+zhCN("[A3* 不能读取目录 !]&&")
+
+T_(" is directory.")
+csCZ(" je adresář.")
+deDE(" ist ein Verzeichnis.")
+esES("es directorio")
+fiFI(" on kansio.")
+frFR(" est un répertoire.")
+huHU("mappa")
+itIT(" è una cartella.")
+plPL(" jest katalogiem.")
+roRO(" este director")
+ruRU(" папка.")
+srSP(" je folder.")
+trTR(" bir klasördür")
+zhCN(" 为目录.")
+
+T_(" already exists.&Do you want to continue ?")
+csCZ(" již existuje.&Přejete si pokračovat ?")
+deDE(" existiert bereits. &Möchten Sie fortfahren?")
+esES("ya existe.&¿Quieres continuar?")
+fiFI(" on jo olemassa.&Haluatko silti jatkaa?")
+frFR(" existe déjà.&Voulez-vous continuer ?")
+huHU("már létezik. &Folytatás?")
+itIT(" esiste già.&Desideri proseguire ?")
+plPL(" już istnieje. &Czy chcesz kontynuować ?")
+roRO(" există deja.&Doriţi să continuaţi ?")
+ruRU(" уже существует. &Вы хотите продолжить?")
+srSP(" već postoji. &Da li želite da nastavite?")
+trTR(" zaten var.&Yine de devam etmek istiyor musunuz?")
+zhCN(" 已经存在.继续(&D)?")
+
+T_(" does not exist.")
+csCZ(" neexistuje.")
+deDE(" existiert nicht.")
+esES(" no existe.")
+fiFI(" ei ole olemassa.")
+frFR(" n'existe pas.")
+huHU("nem létezik")
+itIT(" non esistono.")
+plPL(" nie istnieje.")
+roRO(" nu există")
+ruRU(" не существует.")
+srSP(" ne postoji.")
+trTR(" yok.")
+zhCN("不存在")
+
+T_("&do not exist.")
+csCZ("&neexistují.")
+deDE("existieren nicht")
+esES("&no existe.")
+fiFI("&ei ole olemassa.")
+frFR("&n'existe pas")
+huHU("&nem létezik")
+itIT(" non esiste")
+plPL(" &nie istnieje.")
+roRO("&nu există")
+ruRU("&не существует.")
+srSP("&ne postoji.")
+trTR("& yok.")
+zhCN("不存在(&d)")
+
+T_("&Do you want to continue ?")
+csCZ("&Přejete si pokračovat ?")
+deDE("&Möchten Sie fortfahren?")
+esES("¿&Quieres continuar?")
+fiFI("&Haluatko jatkaa?")
+frFR("&Voulez-vous continuer ?")
+huHU("&Folytatás?")
+itIT("&Desideri proseguire ?")
+plPL("&Czy chcesz kontynuować ?")
+roRO("&Doriţi să continuaţi ?")
+ruRU("&Вы хотите продолжить?")
+srSP("&Da li želite da nastavite?")
+trTR("&Devam etmek istiyor musunuz?")
+zhCN("继续(&D)?")
+
+T_("Custom file type (")
+csCZ("Jiný typ souboru (")
+deDE("Eigener Dateityp (")
+esES("Tipo de archivo personalizado(")
+fiFI("Mukautettu tiedostotyyppi (")
+frFR("Type de fichier personnalisé (")
+huHU("Választott fájltípus (")
+itIT("Tipo file personalizzato (")
+plPL("Własny typ pliku (")
+roRO("Tip de fișier ales de utilizator")
+ruRU("Свой тип файла (")
+srSP("Proizvoljni tip fajla (")
+trTR("Özel dosya türü(")
+zhCN("定制文件类型 (")
+
+T_("New directory")
+csCZ("Nový adresář")
+deDE("Neues Verzeichnis")
+esES("Nuevo directorio")
+fiFI("Uusi kansio")
+frFR("Nouveau répertoire")
+huHU("Új mappa")
+itIT("Nuova cartella")
+plPL("Nowy katalog")
+roRO("Director nou")
+ruRU("Новая папка")
+srSP("Novi folder")
+trTR("Yeni klasör")
+zhCN("新建文件夹")
+
+T_("Name")
+csCZ("Jméno")
+deDE("Name")
+esES("Nombre")
+fiFI("Nimi")
+frFR("Nom")
+huHU("Név")
+itIT("Nome")
+plPL("Nazwa")
+roRO("Nume")
+ruRU("Имя")
+srSP("Ime")
+trTR("İsim")
+zhCN("名称")
+
+T_("[A3* Creating directory failed !&&]")
+csCZ("[A3* Chyba při vytváření adresáře !&&]")
+deDE("[A3* Verzeichnis konnte nicht erstellt werden!&&]")
+esES("[A3* Falló la creación del directorio !&&]")
+fiFI("[A3* Kansion luominen epäonnistui!&&]")
+frFR("[A3* La création du répertoire a échoué !&&]")
+huHU("[A3* A mappa létrehozása sikertelen!&&]")
+itIT("[A3* Creazione cartella fallita !&&]")
+plPL("[A3* Tworzenie katalogu nie powiodło się !&&]")
+roRO("[A3* Crearea directorului a eşuat !&&]")
+ruRU("[A3* Не удалось создать папку!&&]")
+srSP("[A3* Pravljenje foldera nije uspelo!&&]")
+trTR("[A3* Klasör oluşturulamadı !]&&")
+zhCN("[A3* 创建文件夹失败 !&&]")
+
+T_("Mask")
+csCZ("Maska")
+deDE("Maske")
+esES("Máscara")
+fiFI("Maski")
+frFR("Masque")
+huHU("Maszk")
+itIT("Maschera")
+plPL("Maska")
+roRO("Mască")
+ruRU("Маска")
+srSP("Maska")
+trTR("Maske")
+zhCN("掩码")
+
+T_("Add to selection")
+csCZ("Přidat k výběru")
+deDE("Zur Auswahl hinzufügen")
+esES("Añadir a la selección")
+fiFI("Lisää valintaan")
+frFR("Ajouter à la sélection")
+huHU("Hozzáadás a kijelöléshez")
+itIT("Aggiungi alla selezione")
+plPL("Dodaj do zaznaczonych")
+roRO("Adaugă la selecţie")
+ruRU("Добавить к выделению")
+srSP("Dodaj u izbor")
+trTR("Seçilenlere ekle")
+zhCN("选上")
+
+T_("Remove from selection")
+csCZ("Odebrat od výběru")
+deDE("Aus der Auswahl entfernen")
+esES("Eliminar de la selección")
+fiFI("Poista valinnasta")
+frFR("Enlever de la sélection")
+huHU("Eltávolítás a kijelölésből")
+itIT("Rimuovi dalla selezione")
+plPL("Usuń z zaznaczonych")
+roRO("Înlătură din selecţie")
+ruRU("Убрать из выделения")
+srSP("Ukloni iz selekcije")
+trTR("Seçilenlerden çıkar")
+zhCN("去选")
+
+T_("  Drive")
+csCZ("  Disková jednotka")
+deDE("  Laufwerk")
+esES("  Disco")
+fiFI("  Levyasema")
+frFR("  Disque")
+huHU("  Meghajtó")
+itIT("  Disco")
+plPL("  Napęd")
+roRO("  Unitate")
+ruRU("  Диск")
+srSP("  Disk")
+trTR("  Sürücü")
+zhCN("  驱动")
+
+T_("Directory  ")
+csCZ("Adresář  ")
+deDE("Verzeichnis  ")
+esES("Directorio")
+fiFI("Kansio  ")
+frFR("Répertoire")
+huHU("Mappa")
+itIT("Cartella ")
+plPL("Katalog  ")
+roRO("Director  ")
+ruRU("Папка  ")
+srSP("Folder ")
+trTR(" Klasör ")
+zhCN("文件夹  ")
+
+T_(" drive(s)")
+csCZ(" disk(y)")
+deDE("Laufwerk(e)")
+esES("")
+fiFI("")
+frFR("")
+huHU(" meghajtó(k)")
+itIT("")
+plPL("")
+roRO(" unitate(unitati)")
+ruRU("диск(и)")
+srSP("")
+trTR("")
+zhCN("")
+
+T_(" folder(s)")
+csCZ(" adresář(e)")
+deDE("Ordner")
+esES(" carpeta(s)")
+fiFI("")
+frFR("")
+huHU(" mappá(k)")
+itIT("")
+plPL("")
+roRO(" director(directoare)")
+ruRU("папка(и)")
+srSP("")
+trTR("")
+zhCN("")
+
+T_(" file(s)")
+csCZ(" soubor(y)")
+deDE("Datei(en)")
+esES(" archivo(s)")
+fiFI("")
+frFR("")
+huHU(" fájl(ok)")
+itIT("")
+plPL("")
+roRO(" fişier(e)")
+ruRU("файл(ы)")
+srSP("")
+trTR("")
+zhCN("")
+
+T_("Open")
+csCZ("Otevřít")
+deDE("Öffnen")
+esES("Abrir")
+fiFI("Avaa")
+frFR("Ouvrir")
+huHU("Megnyitás")
+itIT("Apri")
+plPL("Otwórz")
+roRO("Deschide")
+ruRU("Открыть")
+srSP("Otvori")
+trTR("Aç")
+zhCN("打开")
+
+T_("Save")
+csCZ("Uložit")
+deDE("Speichern")
+esES("Guardar")
+fiFI("Tallenna")
+frFR("Sauver")
+huHU("Mentés")
+itIT("Salva")
+plPL("Zapisz")
+roRO("Salvează")
+ruRU("Сохранить")
+srSP("Sačuvaj")
+trTR("Kaydet")
+zhCN("保存")
+
+T_("[A3* Renaming of file failed !&&]")
+csCZ("[A3* Chyba při přejmenovávání souboru !&&]")
+deDE("[A3* Datei konnte nicht umbenannt werden!&&]")
+esES("[A3* Error al renombrar el archivo !&&]")
+fiFI("[A3* Tiedoston uudelleennimeäminen epäonnistui!&&]")
+frFR("[A3* Le renommage du fichier a échoué !&&]")
+huHU("[A3* A fájl átnevezése sikertelen!&&]")
+itIT("[A3* Rinomina fallito !&&]")
+plPL("[A3* Zmiana nazwy pliku nie powiodła się !&&]")
+roRO("[A3* Redenumirea fişierului a eşuat !&&]")
+ruRU("[A3* Не удалось переименовать файл!&&]")
+srSP("[A3* Promena imena fajla nije uspela!&&]")
+trTR("[A3* Dosya yeniden adlandırılamadı !]&&")
+zhCN("[A3* 文件重命名失败 !&&]")
+
+T_("All files")
+csCZ("Všechny soubory")
+deDE("Alle Dateien")
+esES("Todos los archivos")
+fiFI("Kaikki tiedostot")
+frFR("Tous les fichiers")
+huHU("Az összes fájl")
+itIT("Titti i files")
+plPL("Wszystkie pliki")
+roRO("Toate fişierele")
+ruRU("Все файлы")
+srSP("Svi fajlovi")
+trTR("Tüm dosyalar")
+zhCN("所有文件")
+
+T_("&Select")
+csCZ("&Vybrat")
+deDE("&Auswählen")
+esES("&Seleccionar")
+fiFI("&Valitse")
+frFR("&Sélectionner")
+huHU("&Kijelölés")
+itIT("Seleziona")
+plPL("&Wybierz")
+roRO("&Selectează")
+ruRU("&Выбрать")
+srSP("&Izaberi")
+trTR("&Seç")
+zhCN("选择(&S)")
+
+T_("Save as")
+csCZ("Uložit jako")
+deDE("Speichern unter")
+esES("Guardar como")
+fiFI("Tallenna nimellä")
+frFR("Sauver sous")
+huHU("Mentés más néven")
+itIT("Salva come")
+plPL("Zapisz jako")
+roRO("Salvează ca")
+ruRU("Сохранить как")
+srSP("Sačuvaj kao")
+trTR("Farklı kaydet")
+zhCN("另存为")
+
+T_("Select directory")
+csCZ("Vybrat adresář")
+deDE("Verzeichnis auswählen")
+esES("Seleccionar directorio")
+fiFI("Valitse kansio")
+frFR("Sélectionner un répertoire")
+huHU("Mappa kijelölése")
+itIT("Seleziona cartella")
+plPL("Wybierz katalog")
+roRO("Alege directorul")
+ruRU("Выберите папку")
+srSP("Izaberi folder")
+trTR("Klasör seç")
+zhCN("选择文件夹")
+
+T_("Dir up")
+csCZ("Nadřazený adresář")
+deDE("Übergeordnetes Vwerzeichnis")
+esES("Directorio superior")
+fiFI("Ylemmän tason kansio")
+frFR("Répertoire parent")
+huHU("Szülőmappa")
+itIT("Cartella su")
+plPL("Katalog w górę")
+roRO("Directorul părinte")
+ruRU("Папка вверх")
+srSP("Folder iznad")
+trTR("Üst klasöre çık")
+zhCN("向上")
+
+T_("Create directory")
+csCZ("Vytvořit adresář")
+deDE("Verzeichnis erstellen")
+esES("Crear directorio")
+fiFI("Luo kansio")
+frFR("Créer un répertoire")
+huHU("Mappa létrehozása")
+itIT("Crea nuova cartella")
+plPL("Utwórz katalog")
+roRO("Crează director")
+ruRU("Создать папку")
+srSP("Napravi folder")
+trTR("Klasör oluştur")
+zhCN("创建文件夹")
+
+T_("Select files")
+csCZ("Označit soubory")
+deDE("Dateien auswählen")
+esES("Seleccionar archivos")
+fiFI("Valitse tiedostot")
+frFR("Sélectionner les fichiers")
+huHU("Fájlok kijelölése")
+itIT("Seleziona i files")
+plPL("Wybierz pliki")
+roRO("Selectează fişierele")
+ruRU("Выделить файлы")
+srSP("Izaberite fajlove")
+trTR("Dosyaları seç")
+zhCN("选择文件")
+
+T_("Unselect files")
+csCZ("Odznačit soubory")
+deDE("Dateien abwählen")
+esES("Desmarcar archivos")
+fiFI("Poista tiedostojen valinta")
+frFR("Désélectionner les fichiers")
+huHU("Fájlkijelölés megszüntetése")
+itIT("Deseleziona i files")
+plPL("Odznacz pliki")
+roRO("Deselectează fişierele")
+ruRU("Убрать выделение файлов")
+srSP("Deselektujte fajlove")
+trTR("Seçili dosyaları iptal et")
+zhCN("取消选择文件")
+
+T_("Toggle files")
+csCZ("Inverze označení")
+deDE("Dateiauswahl umkehren")
+esES("Intercambiar archivos")
+fiFI("Käänteinen tiedostojen valinta")
+frFR("Invertir la sélection")
+huHU("Kijelölés felcserélése")
+itIT("Inverti selezione")
+plPL("Odwróć zaznaczone pliki")
+roRO("Alternează fișierele")
+ruRU("Поменять выделение файлов")
+srSP("Invertuj izabrane")
+trTR("Seçili dosyaları değiştir")
+zhCN("Toggle files")
+
+
+// Windows.cpp
+
+T_("Activate window")
+csCZ("Aktivovat okno")
+deDE("Fenster aktivieren")
+esES("Activar ventana")
+fiFI("Aktivoi ikkuna")
+frFR("Activer la fenêtre")
+huHU("Ablak aktiválása")
+itIT("Attiva finestra")
+plPL("Aktywuj okno")
+roRO("Activează fereastră")
+ruRU("Активное окно")
+srSP("Aktviraj prozor")
+trTR("Pencereyi etkinleştir")
+zhCN("激活窗口")
+
+T_("Activate this window")
+csCZ("Aktivovat toto okno")
+deDE("Dieses Fenster aktivieren")
+esES("Activar esta ventana")
+fiFI("Aktivoi tämä ikkuna")
+frFR("Activer cette fenêtre")
+huHU("Ez az ablak aktív")
+itIT("Attiva questa finestra")
+plPL("Aktywuj to okno")
+roRO("Activează această fereastră")
+ruRU("Сделать активным это окно")
+srSP("Aktiviraj ovaj prozor")
+trTR("Bu pencereyi etkinleştir")
+zhCN("激活当前窗口")
+
+T_("More windows..")
+csCZ("Další okna..")
+deDE("Weitere Fenster ...")
+esES("Más ventanas..")
+fiFI("Lisää ikkunoita...")
+frFR("Plus de fenêtres..")
+huHU("Több ablak..")
+itIT("Altre finestre")
+plPL("Więcej okien..")
+roRO("Mai multe ferestre..")
+ruRU("Ещё окна...")
+srSP("Još prozora..")
+trTR("Daha fazla pencere...")
+zhCN("更多窗口")
+
+
+// Win32.cpp
+
+T_("Open..")
+csCZ("Otevřít..")
+deDE("Öffnen ...")
+esES("Abrir..")
+fiFI("Avaa...")
+frFR("Ouvrir..")
+huHU("Megnyitás..")
+itIT("Apri..")
+plPL("Otwórz..")
+roRO("Deschide..")
+ruRU("Открыть...")
+srSP("Otvori..")
+trTR("Aç...")
+zhCN("打开..")
+
+
+// CtrlUtil.cpp
+
+T_("Invalid data.")
+csCZ("Chybný údaj.")
+deDE("Ungültige Daten")
+esES("Dato incorrecto.")
+fiFI("Virheellinen data.")
+frFR("Donnée invalide.")
+huHU("Érvénytelen adat")
+itIT("Dato non valido.")
+plPL("Niepoprawna data.")
+roRO("Date invalide.")
+ruRU("Неверные данные.")
+srSP("Nevalidni podaci.")
+trTR("Geçersiz veri.")
+zhCN("无效数据")
+
+
+// Update.cpp
+
+T_("Updating ")
+csCZ("Aktualizuji ")
+deDE("Updaten von ")
+esES("Actualizando ")
+fiFI("Päivittää ")
+frFR("Mise à jour de ")
+huHU("Frissítés ")
+itIT("Aggiornamento")
+plPL("Aktualizacja ")
+roRO("Se actualizează ")
+ruRU("Обновление ")
+srSP("Ažuriram ")
+trTR("Güncelliyor")
+zhCN("更新中 ")
+
+T_("Error creating file [* \001%s\001].")
+csCZ("Nelze vytvořit soubor [* \001%s\001].")
+deDE("Fehler beim Erstellen der Datei [* \001%s\001]")
+esES("Error al crear el archivo [* \001%s\001].")
+fiFI("Virhe luotaessa tiedostoa [* \001%s\001].")
+frFR("Erreur en créant le fichier [* \001%s\001].")
+huHU("Hiba a [* \001%s\001] fájl létrehozásánál")
+itIT("Errore creazione file [* \001%s\001].")
+plPL("Błąd tworzenia pliku [* \001%s\001].")
+roRO("Eroare la crearea fişierului [* \001%s\001].")
+ruRU("Ошибка создания файла [* \001%s\001].")
+srSP("Greška pri pravljenju fajla [* \001%s\001].")
+trTR("Dosya oluşturma hatası: [* \001%s\001] dosyası oluşturulamadı.")
+zhCN("创建文件错误 [* \001%s\001].")
+
+T_("Aborting update is likely to cause trouble when running the application "
+     "for the next time.\nContinue?")
+csCZ("Přerušení aktualizace může vést k velkým problémům při příštím "
+     "spuštění aplikace.\nPokračovat?")
+deDE("Abbruch des Updates wird wahrscheinlich beim nächsten Start der Anwendung "
+     "Probleme hervorrufen.\nFortfahren?")
+esES("Abortar la actualización podría ser la causa de un problema en la ejecución "
+     "de la aplicación la próxima vez.¿Continuar?")
+fiFI("Päivityksen keskeyttäminen aiheuttaa todennäköisesti ongelmia kun "
+     "sovellusta seuraavan kerran käytetään.\nJatketaanko?")
+frFR("Interrompre une mise à jour peut causer de sérieux problèmes lors du "
+     "prochain démarrage de l'application.\nContinuer ?")
+huHU("A frissítés megszakítása problémákat okozhataz alkalmazás futtatásánál.\n"
+     "Folytatás?")
+itIT("Interrompere l'aggiornamento può causare seri problemi al prossimo avvio.\n"
+     "Continuare?")
+plPL("Przerwanie aktualizacji najprawdopodobniej spowoduje kłopoty przy ponownym "
+     "uruchomieniu aplikacji.\nKontynuować?")
+roRO("Anularea operţiei de actualizare poate provoca probleme la următoarea "
+     "lansare a aplicaţiei\nDoriți să continuați?")
+ruRU("Отмена обновления может повести за собой "
+     "проблемы при запуске приложения в следующий "
+     "раз.\nПродолжить?")
+srSP("Prekid ažuriranja će verovatno prouzrokovati nevolje kada startujete "
+     "aplikaciju sledeći put.\nNastaviti?")
+trTR("Güncellemenin iptal edilmesi durumunda, uygulama düzgün çalışmayabilir.Bu "
+     "tehlikeye rağmen devam etmek istiyor musunuz?\nEvet")
+zhCN("放弃可能导致下次运行本程序出现问题.\n继续?")
+
+T_("Overwriting %s")
+csCZ("Přepisuji %s")
+deDE("%s wird überschrieben")
+esES("Sobreescribiendo %s")
+fiFI("Korvataan %s")
+frFR("")
+huHU("%s felülírása")
+itIT("")
+plPL("")
+roRO("Se suprascrie %s")
+ruRU("Переписать %s")
+srSP("")
+trTR("Overwriting %s")
+zhCN("%s dosyasının üzerine yazılıyor")
+
+
+// Ctrl.lay
+
+T_("Test")
+csCZ("Test")
+deDE("Test")
+esES("Prueba")
+fiFI("Testi")
+frFR("Tester")
+huHU("Próba")
+itIT("Test")
+plPL("Test")
+roRO("Test")
+ruRU("Тест")
+srSP("Test")
+trTR("Deneme")
+zhCN("测试")
+
+T_("&Directory")
+csCZ("&Adresář")
+deDE("&Verzeichnis")
+esES("&Directorio")
+fiFI("&Kansio")
+frFR("&Répertoire")
+huHU("&Mappa")
+itIT("&Cartella")
+plPL("&Katalog")
+roRO("&Director")
+ruRU("&Папка")
+srSP("&Folder")
+trTR("&Klasör")
+zhCN("文件夹(&D)")
+
+T_("&File")
+csCZ("&Soubor")
+deDE("&Datei")
+esES("&Archivo")
+fiFI("&Tiedosto")
+frFR("&Fichier")
+huHU("&Fájl")
+itIT("&File")
+plPL("&Plik")
+roRO("&Fişier")
+ruRU("&Файл")
+srSP("&Fajl")
+trTR("&Dosya")
+zhCN("文件(&F)")
+
+T_("&Type")
+csCZ("&Typ")
+deDE("&Typ")
+esES("&Tipo")
+fiFI("&Tyyppi")
+frFR("&Type")
+huHU("&Típus")
+itIT("&Tipo")
+plPL("&Typ")
+roRO("&Tip")
+ruRU("&Тип")
+srSP("&Tip")
+trTR("&Tür")
+zhCN("类型(&T)")
+
+T_("&Sort by")
+csCZ("&Třídit dle")
+deDE("&Sortiert nach")
+esES("&Ordenar por")
+fiFI("&Järjestys")
+frFR("&Trier par")
+huHU("&Rendezés")
+itIT("&Ordina per")
+plPL("&Sortuj w/g")
+roRO("&Sortează după")
+ruRU("&Cортировать по")
+srSP("&Sortiraj po")
+trTR("&Şuna göre sırala:")
+zhCN("排序(&S)于")
+
+T_("Name\nExtension")
+csCZ("Jména\nPřípony")
+deDE("Name\nErweiterung")
+esES("Nombre\nExtensión")
+fiFI("Nimi\nPääte")
+frFR("Nom\nExtension")
+huHU("Név\nKiterjesztés")
+itIT("Nome\nEstensione")
+plPL("Nazwy\nRozszerzenia")
+roRO("Nume\nExtensie")
+ruRU("Имя\nРасширение")
+srSP("Ime\nEkstenzija")
+trTR("İsim")
+zhCN("名称\n扩展")
+
+T_("Read only")
+csCZ("Jen číst")
+deDE("Schreibgeschützt")
+esES("Sólo lectura")
+fiFI("Vain luku")
+frFR("Lecture seule")
+huHU("Csak olvasható")
+itIT("Sola lettura")
+plPL("Tylko do odczytu")
+roRO("Modificare nepermisă")
+ruRU("Только для чтения")
+srSP("Samo za čitanje")
+trTR("Salt okunur")
+zhCN("只读")
+
+T_("Show hidden")
+csCZ("Zobrazit skryté")
+deDE("Aufdecken")
+esES("Mostrar ocultos")
+fiFI("")
+frFR("")
+huHU("Mutassa a rejtetteket")
+itIT("")
+plPL("")
+roRO("Arată ascunse")
+ruRU("Показать скрытые")
+srSP("")
+trTR("")
+zhCN("")
+
+T_("Color:")
+csCZ("B&arva:")
+deDE("Farbe:")
+esES("Color:")
+fiFI("Väri:")
+frFR("Couleur :")
+huHU("Szín:")
+itIT("Colore")
+plPL("Kolor:")
+roRO("Culoare:")
+ruRU("Цвет:")
+srSP("Boja:")
+trTR("Renk:")
+zhCN("颜色")
+
+T_("R:")
+csCZ("&R:")
+deDE("R:")
+esES("R:")
+fiFI("R:")
+frFR("R :")
+huHU("R:")
+itIT("R:")
+plPL("R:")
+roRO("R:")
+ruRU("")
+srSP("R:")
+trTR("R:")
+zhCN("R:")
+
+T_("G:")
+csCZ("&G:")
+deDE("G:")
+esES("G:")
+fiFI("G:")
+frFR("V :")
+huHU("G:")
+itIT("G:")
+plPL("G:")
+roRO("G:")
+ruRU("")
+srSP("G:")
+trTR("G:")
+zhCN("G:")
+
+T_("B:")
+csCZ("&B:")
+deDE("B:")
+esES("B:")
+fiFI("B:")
+frFR("B :")
+huHU("B:")
+itIT("B:")
+plPL("B:")
+roRO("B:")
+ruRU("")
+srSP("B:")
+trTR("B:")
+zhCN("B:")
+
+T_("H:")
+csCZ("&H:")
+deDE("F:")
+esES("H:")
+fiFI("H:")
+frFR("H :")
+huHU("H:")
+itIT("h:")
+plPL("H:")
+roRO("H:")
+ruRU("")
+srSP("H:")
+trTR("H:")
+zhCN("H:")
+
+T_("S:")
+csCZ("&S:")
+deDE("S:")
+esES("S:")
+fiFI("S:")
+frFR("S :")
+huHU("S:")
+itIT("S:")
+plPL("S:")
+roRO("S:")
+ruRU("")
+srSP("S:")
+trTR("S:")
+zhCN("S:")
+
+T_("V:")
+csCZ("&V:")
+deDE("H:")
+esES("V:")
+fiFI("V:")
+frFR("V :")
+huHU("V:")
+itIT("V:")
+plPL("V:")
+roRO("V:")
+ruRU("")
+srSP("V:")
+trTR("V:")
+zhCN("V:")
+
+T_("&Rows:")
+csCZ("Řa&dy:")
+deDE("&Zeilen:")
+esES("&Filas:")
+fiFI("&Rivit:")
+frFR("&Lignes :")
+huHU("&Sorok:")
+itIT("&Righe")
+plPL("&Wiersze:")
+roRO("&Linii")
+ruRU("&Ряды:")
+srSP("&Redovi:")
+trTR("&Satırlar:")
+zhCN("行(&R)")
+
+T_("&Columns:")
+csCZ("&Sloupce:")
+deDE("&Spalten:")
+esES("&Columnas:")
+fiFI("&Sarakkeet:")
+frFR("&Colonnes :")
+huHU("&Oszlopok:")
+itIT("&Colonne")
+plPL("&Kolumny:")
+roRO("&Coloane")
+ruRU("&Колонки:")
+srSP("&Kolone:")
+trTR("S&ütunlar:")
+zhCN("列(&C)")
+
+T_("Default")
+csCZ("Základní")
+deDE("Voreinstellung")
+esES("Por defecto")
+fiFI("Oletus")
+frFR("Par défaut")
+huHU("Alapértelmezett")
+itIT("Predefiniti")
+plPL("Domyślny")
+roRO("Implicit")
+ruRU("По умолчанию")
+srSP("Podrazumevano")
+trTR("Varsayılan")
+zhCN("缺省")
+
+T_("Printer")
+csCZ("Tiskárna")
+deDE("Drucker")
+esES("Impresora")
+fiFI("Tulostin")
+frFR("")
+huHU("Nyomtató")
+itIT("")
+plPL("Drukarka")
+roRO("Imprimantă")
+ruRU("Принтер")
+srSP("")
+trTR("Yazıcı")
+zhCN("打印机")
+
+T_("Paper size")
+csCZ("Velikost papíru")
+deDE("Papiergröße")
+esES("Tamaño del papel")
+fiFI("Paperin koko")
+frFR("")
+huHU("Papírméret")
+itIT("")
+plPL("Rozmiar strony")
+roRO("Dimensiune hărtie")
+ruRU("Размер бумаги")
+srSP("")
+trTR("Kağıt Boyutu")
+zhCN("纸张大小")
+
+T_("Input slot")
+csCZ("Vstup")
+deDE("Papierzufuhr")
+esES("¿Input slot?")
+fiFI("Syöttökaukalo")
+frFR("")
+huHU("Input slot")
+itIT("")
+plPL("Slot wejściowy")
+roRO("Slot de intrare")
+ruRU("Лоток")
+srSP("")
+trTR("Yazıcı Girişi")
+zhCN("输入槽")
+
+T_("Pages per sheet")
+csCZ("Stránek na list")
+deDE("Seiten pro Blatt")
+esES("Páginas por sheet")
+fiFI("Sivuja per arkki")
+frFR("")
+huHU("Laponkénti oldalak")
+itIT("")
+plPL("Stron na arkusz")
+roRO("Pagini per coală")
+ruRU("Страниц на лист")
+srSP("")
+trTR("Kağıt başına düşen sayfa sayısı")
+zhCN("每sheet页数")
+
+T_("Print range")
+csCZ("Rozsah tisku")
+deDE("Seitenbereich")
+esES("Rango de impresión")
+fiFI("Tulosta sivut")
+frFR("")
+huHU("Nyomtatási tartomány")
+itIT("")
+plPL("Zakres drukowania")
+roRO("Demeniul de imprimare")
+ruRU("")
+srSP("")
+trTR("Yazdırma aralığı")
+zhCN("打印范围")
+
+T_("All pages\nCurrent page\nPages from")
+csCZ("Vše\nAktulí stránku\nRozsah")
+deDE("Alle Seiten\nAktuelle Seite\nSeiten von")
+esES("Todas las páginas\nLa página acutal\nPáginas a partir de")
+fiFI("Kaikki sivut\nTämä sivu\nSivut väliltä")
+frFR("")
+huHU("Minden oldal\nAktuális oldal\nOldalak a következőtől")
+itIT("")
+plPL("Wszystkie strony\nBieżąca strona\nStrony od")
+roRO("Toate paginile\nPagina curentă\nPagini de la")
+ruRU("")
+srSP("")
+trTR("Tüm sayfalar\nGeçerli sayfa\nSayfa aralığı")
+zhCN("所有页\n当前页\n始于页")
+
+T_("to")
+csCZ("až")
+deDE("bis")
+esES("hasta")
+fiFI("-")
+frFR("")
+huHU("-")
+itIT("")
+plPL("do")
+roRO("până")
+ruRU("в")
+srSP("")
+trTR("to")
+zhCN("到")
+
+T_("Copies")
+csCZ("Kopie")
+deDE("Exemplare")
+esES("Copias")
+fiFI("Kopiot")
+frFR("")
+huHU("Példány")
+itIT("")
+plPL("Kopie")
+roRO("Copii")
+ruRU("Копий")
+srSP("")
+trTR("Kopya sayısı")
+zhCN("份数")
+
+T_("Collate")
+csCZ("Seřadit")
+deDE("Zusammenstellen")
+esES("Cotejar")
+fiFI("Lajittele")
+frFR("")
+huHU("Collate")
+itIT("")
+plPL("Zestaw")
+roRO("Legare")
+ruRU("Подобрать")
+srSP("")
+trTR("Harmanla")
+zhCN("比较")
+
+T_("Portrait\nLandscape")
+csCZ("Na výšku\nNa šířku")
+deDE("Hochformat\nQuerformat")
+esES("Horizontal\nApaisado")
+fiFI("Pysty\nVaaka")
+frFR("")
+huHU("Álló\nFekvő")
+itIT("")
+plPL("Portret\nKrajobraz")
+roRO("Portret\nPeisaj")
+ruRU("Портрет\nАльбом")
+srSP("")
+trTR("Dikey\nYatay")
+zhCN("纵向\n横向")
+
+T_("Placement")
+csCZ("Umístění")
+deDE("Ausrichtung")
+esES("Disposición")
+fiFI("Sijoittelu")
+frFR("")
+huHU("Elhelyezés")
+itIT("")
+plPL("Umiejscowienie")
+roRO("Poziție")
+ruRU("Размещение")
+srSP("")
+trTR("Sayfa yerleşimi")
+zhCN("布局")
+
+
+// Obsolete
+
+T_("&Cancel")
+csCZ("&Zrušit")
+deDE("&Abbrechen")
+esES("&Cancelar")
+fiFI("&Peruuta")
+frFR("&Annuler")
+huHU("Mégsem")
+itIT("&Annulla")
+plPL("&Anuluj")
+roRO("&Anulează")
+ruRU("&Отменить")
+srSP("&Otkaži")
+trTR("&İptal")
+zhCN("取消(&C)")
+
+T_("Week")
+csCZ("Týden")
+deDE("Woche")
+esES("")
+fiFI("Viikko")
+frFR("")
+huHU("Hét")
+itIT("")
+plPL("Tydzień")
+roRO("Săptămână")
+ruRU("Неделя")
+srSP("")
+trTR("Hafta")
+zhCN("")
+
+T_("1 / 1")
+csCZ("1 / 1")
+deDE("1 / 1")
+esES("1 / 1")
+fiFI("1 / 1")
+frFR("1 / 1")
+huHU("1 / 1")
+itIT("1 / 1")
+plPL("1 / 1")
+roRO("1 / 1")
+ruRU("1 / 1")
+srSP("1 / 1")
+trTR("1 / 1")
+zhCN("1 / 1")
+
+T_("Sideways")
+csCZ("Na šířku")
+deDE("Querformat")
+esES("¿Sideways?")
+fiFI("Sivuttain")
+frFR("Direction")
+huHU("Oldalsáv")
+itIT("Direzione")
+plPL("Liczba stron")
+roRO("Prin lateral")
+ruRU("По бокам")
+srSP("Sa strane")
+trTR("Yanlama")
+zhCN("侧边")
+
+T_("&1 page\n&2 pages\n&4 pages\n&8 pages")
+csCZ("&1 strana\n&2 strany\n&4 strany\n&8 stran")
+deDE("&1 Seite\n&2 Seiten\n&4 Seiten\n&8 Seiten")
+esES("&1 página\n&2 páginas\n&4 páginas\n&8 páginas")
+fiFI("&1 sivu\n&2 sivua\n&4 sivua\n&8 sivua")
+frFR("&1 page\n&2 pages\n&4 pages\n&8 pages")
+huHU("&1 oldal\n&2 oldal\n&4 oldal\n&8 oldal")
+itIT("&1 pagina\n&2 pagine\n&4 pagine\n&8 pagine")
+plPL("&1 strona\n&2 strony\n&4 strony\n&8 stron")
+roRO("&1 pagină\n&2 pagini\n&4 pagini\n&8 pagini")
+ruRU("&1 страница\n&2 страницы\n&4 страницы\n&8 страниц")
+srSP("&1 strana\n&2 strane\n&4 strane\n&8 strana")
+trTR("&1 sayfa\n&2 sayfa\n&4 sayfa\n&8 sayfa")
+zhCN("&1 页\n&2 页\n&4 页\n&8 页")
+
+T_("Page &numbers")
+csCZ("Čísla &stránek")
+deDE("&Seitenzahlen")
+esES("&Numeros de página")
+fiFI("&Sivunumerot")
+frFR("&Numéros de page")
+huHU("&Oldalszámok")
+itIT("&Numero pagine")
+plPL("Numery &stron")
+roRO("&Numere de pagină")
+ruRU("&Номера страниц")
+srSP("&Broj strana")
+trTR("Sayfa &numaraları")
+zhCN("页码(&n)")
+
+T_("PDF export..")
+csCZ("PDF export..")
+deDE("PDF-Export ...")
+esES("Exportar a PDF..")
+fiFI("PDF export...")
+frFR("Export PDF..")
+huHU("PDF export..")
+itIT("")
+plPL("Eksportuj PDF..")
+roRO("Exportă PDF..")
+ruRU("Экспорт в PDF")
+srSP("PDF eksport..")
+trTR("PDF dosyasını içe aktar...")
+zhCN("输出PDF..")
+
+T_("Report")
+csCZ("Výstupní sestava")
+deDE("Bericht")
+esES("Informe")
+fiFI("Raportti")
+frFR("Rapport")
+huHU("Jelentés")
+itIT("Report")
+plPL("Raport")
+roRO("Raport")
+ruRU("Отчёт")
+srSP("Izveštaj")
+trTR("Bildir")
+zhCN("报告")
+
+T_("&Print")
+csCZ("&Tisk")
+deDE("&Drucken")
+esES("&Imprimir")
+fiFI("&Tulosta")
+frFR("&Imprimer")
+huHU("&Nyomtatás")
+itIT("&Stampa")
+plPL("&Drukuj")
+roRO("&Imprimă")
+ruRU("&Печать")
+srSP("&Štampa")
+trTR("&Yazdır")
+zhCN("打印(&P)")
diff --git a/uppsrc/CtrlLib/CtrlLib.upp b/uppsrc/CtrlLib/CtrlLib.upp
new file mode 100644
index 000000000..df732a2fb
--- /dev/null
+++ b/uppsrc/CtrlLib/CtrlLib.upp
@@ -0,0 +1,124 @@
+description "Basic library of GUI elements";
+
+acceptflags
+	NOGTK;
+
+uses
+	CtrlCore,
+	RichText;
+
+uses(LINUX) PdfDraw;
+
+uses(FREEBSD) PdfDraw;
+
+uses(OSX11) PdfDraw;
+
+file
+	CtrlLib.h,
+	CtrlLib readonly separator,
+	LabelBase.h,
+	LabelBase.cpp,
+	PushCtrl.h,
+	Button.cpp,
+	Switch.cpp,
+	EditCtrl.h,
+	EditField.cpp,
+	TextEdit.h,
+	Text.cpp,
+	LineEdit.cpp,
+	DocEdit.cpp,
+	ScrollBar.h,
+	ScrollBar.cpp,
+	HeaderCtrl.h,
+	HeaderCtrl.cpp,
+	ArrayCtrl.h,
+	ArrayCtrl.cpp,
+	MultiButton.h,
+	MultiButton.cpp,
+	DropChoice.h,
+	PopupTable.cpp,
+	DropList.cpp,
+	DropChoice.cpp,
+	StaticCtrl.h,
+	Static.cpp,
+	Splitter.h,
+	Splitter.cpp,
+	FrameSplitter.cpp,
+	SliderCtrl.h,
+	SliderCtrl.cpp,
+	ColumnList.h,
+	ColumnList.cpp,
+	Progress.h,
+	Progress.cpp,
+	AKeys.h,
+	key_header.h,
+	key_source.h,
+	AKeys.cpp,
+	RichText.h,
+	RichTextView.cpp,
+	Prompt.cpp,
+	Help.cpp,
+	DateTimeCtrl.h,
+	DateTimeCtrl.cpp,
+	Bar readonly separator,
+	Bar.h,
+	Bar.cpp,
+	MenuImp.h,
+	MenuItem.cpp,
+	MenuBar.cpp,
+	ToolButton.cpp,
+	ToolBar.cpp,
+	ToolTip.cpp,
+	StatusBar.h,
+	StatusBar.cpp,
+	TabCtrl readonly separator,
+	TabCtrl.h,
+	TabCtrl.cpp,
+	TreeCtrl readonly separator,
+	TreeCtrl.h,
+	TreeCtrl.cpp,
+	DlgColor readonly separator,
+	DlgColor.h,
+	DlgColor.cpp,
+	ColorPopup.cpp,
+	ColorPusher.cpp,
+	FileSel readonly separator,
+	FileSel.h,
+	FileList.cpp,
+	FileSel.cpp,
+	Utilities readonly separator,
+	CtrlUtil.h,
+	PrinterJob.cpp,
+	Windows.cpp,
+	Win32.cpp,
+	TrayIconWin32.cpp,
+	TrayIconX11.cpp,
+	CtrlUtil.cpp,
+	Update.cpp,
+	Ctrl.iml,
+	Ctrl.lay,
+	CtrlLib.t charset "UTF-8",
+	CtrlLib.icpp,
+	Lang readonly separator,
+	Lang.h,
+	LNGCtrl.cpp,
+	Ch readonly separator,
+	Ch.h,
+	Ch.cpp,
+	XPTheme.dli,
+	Ctrls.iml,
+	ChWin32.cpp,
+	ChGtk.cpp,
+	ClassicCtrls.iml,
+	Meta readonly separator,
+	Normal.upt,
+	Complex.upt,
+	CtrlLib.usc font 2 charset "UTF-8",
+	Info readonly separator,
+	src.tpp,
+	srcdoc.tpp,
+	appdoc.tpp,
+	COPYING,
+	COPYING-PLAIN,
+	AUTHORS;
+
diff --git a/uppsrc/CtrlLib/CtrlLib.usc b/uppsrc/CtrlLib/CtrlLib.usc
new file mode 100644
index 000000000..739641757
--- /dev/null
+++ b/uppsrc/CtrlLib/CtrlLib.usc
@@ -0,0 +1,1213 @@
+enum_property Frame {
+	"NullFrame()",
+	"FieldFrame()",
+	"InsetFrame()",
+	"OutsetFrame()",
+	"ButtonFrame()",
+	"ThinInsetFrame()",
+	"ThinOutsetFrame()",
+	"BlackFrame()",
+	"TopSeparatorFrame()",
+	"BottomSeparatorFrame()",
+	"LeftSeparatorFrame()",
+	"RightSeparatorFrame()"
+};
+
+enum_property Align {
+	"ALIGN_LEFT",
+	"ALIGN_CENTER",
+	"ALIGN_RIGHT"
+};
+
+fn DeflateRect(&r)
+{
+	r.top++;
+	r.left++;
+	r.right--;
+	r.bottom--;
+}
+
+fn DrawFrame(w, &r, c1, c2) {
+	w.DrawRect(r.left, r.top, r.right - r.left, 1, c1);
+	w.DrawRect(r.left, r.top, 1, r.bottom - r.top, c1);
+	w.DrawRect(r.right - 1, r.top, 1, r.bottom - r.top, c2);
+	w.DrawRect(r.left, r.bottom - 1, r.right - r.left, 1, c2);
+	DeflateRect(r);
+}
+
+fn DrawBorder(w, &r, ...)
+{
+	for(i = 0; i < count(argv); i += 2)
+		DrawFrame(w, r, argv[i], argv[i + 1]);
+}
+
+fn DrawButtonFrame(w, &r)
+{
+	DrawBorder(w, r, :SWhite, :SBlack, :SWhiteGray, :SGray);
+}
+
+fn DrawEdgeButtonFrame(w, &r)
+{
+	DrawBorder(w, r, :SWhiteGray, :SBlack, :SWhite, :SGray);
+}
+
+fn DrawEdgeButton(w, &r)
+{
+	DrawEdgeButtonFrame(w, r);
+	w.DrawRect(r, :SLtGray);
+}
+
+fn DrawInsetFrame(w, &r)
+{
+	DrawBorder(w, r, :SGray, :SWhite, :SBlack, :SLtGray);
+}
+
+fn DrawCtrlFrame(w, &r, frame)
+{
+	width = r.right - r.left;
+	height = r.bottom - r.top;
+	switch(frame) {
+	case "FieldFrame()":
+	case "InsetFrame()": DrawInsetFrame(w, r); break;
+	case "OutsetFrame()": DrawBorder(w, r, :SLtGray, :SBlack, :SWhite, :SGray); break;
+	case "ButtonFrame()": DrawButtonFrame(w, r); break;
+	case "ThinInsetFrame()": DrawBorder(w, r, :SGray, :SWhite); break;
+	case "ThinOutsetFrame()": DrawBorder(w, r, :SWhite, :SGray); break;
+	case "BlackFrame()": DrawBorder(w, r, :SBlack, :SBlack); break;
+	case "TopSeparatorFrame()":
+		w.DrawRect(r.left, r.top, width, 1, :SGray);
+		w.DrawRect(r.left, r.top + 1, width, 1, :SWhite);
+		r.top += 2;
+		break;
+	case "BottomSeparatorFrame()":
+		w.DrawRect(r.left, r.bottom - 2, width, 1, :SGray);
+		w.DrawRect(r.left, r.bottom - 1, width, 1, :SWhite);
+		r.bottom -= 2;
+		break;
+	case "LeftSeparatorFrame()":
+		w.DrawRect(r.left, r.top, 1, height, :SGray);
+		w.DrawRect(r.left + 1, r.top, 1, height, :SWhite);
+		r.left += 2;
+		break;
+	case "RightSeparatorFrame()":
+		w.DrawRect(r.right - 2, r.top, 1, height, :SGray);
+		w.DrawRect(r.right - 1, r.top, 1, height, :SWhite);
+		r.right -= 2;
+		break;
+	}
+}
+
+fn GradientColor(fc, tc, i, n)
+{
+	return Color(
+			fc.r + i * (tc.r - fc.r) / n,
+			fc.g + i * (tc.g - fc.g) / n,
+			fc.b + i * (tc.b - fc.b) / n
+	);
+}
+
+fn max(a, b)
+{
+	return a > b ? a : b;
+}
+
+fn min(a, b)
+{
+	return a < b ? a : b;
+}
+
+fn DrawSpinButtons(w, r)
+{
+	h = r.bottom - r.top;
+	h2 = int(h / 2);
+	h7 = int(7 * h / 10);
+	x = r.right - h7;
+	DrawEdgeButton(w, RectC(x, r.top, h7, h2));
+	w.DrawImage((h7 - 5) / 2 + x, (h2 - 3) / 2 + r.top, "CtrlsImg::SpU");
+	DrawEdgeButton(w, RectC(x, r.top + h2, h7, h - h2));
+	w.DrawImage((h7 - 5) / 2 + x, (h - h2 - 3) / 2 + r.top + h2, "CtrlsImg::SpD");
+}
+
+fn XMinSize()
+{
+	return Size(8, 13);
+}
+
+subctrl NormalSize {
+	GetMinSize() { sz = XMinSize(); sz.cy += 2; return sz; }
+	GetStdSize() { sz = GetMinSize(); sz.cx *= 7; return sz; }
+};
+
+subctrl Base {
+	>NormalSize;
+
+	Font   SetFont = StdFont();
+	Color  SetInk = :SBlack;
+	Frame  SetFrame @1;
+//	Qtf    SetInfo @1 ? "Info of control" ;
+
+	ViewRect(w) {
+		r = GetRect();
+		DrawCtrlFrame(w, r, .SetFrame);
+		return r;
+	}
+	ViewSize(w) {
+		r = ViewRect(w);
+		return Size(r.right - r.left, r.bottom - r.top);
+	}
+};
+
+subctrl Unknown {
+	> Base;
+};
+
+subctrl TextCtrl {
+	GetMinSize() { sz = XMinSize(); sz.cy += 2; return sz; }
+	GetStdSize() { sz = GetMinSize(); sz.cx *= 8; return sz; }
+
+	Text   SetLabel @1 ? "Label of control" ;
+
+	ViewRect(w) {
+		r = GetRect();
+		DrawCtrlFrame(w, r, .SetFrame);
+		return r;
+	}
+	ViewSize(w) {
+		r = ViewRect(w);
+		return Size(r.right - r.left, r.bottom - r.top);
+	}
+
+	Paint(w) {
+		sz = ViewSize(w);
+		textsize = GetSmartTextSize(.SetLabel, .SetFont);
+		px = 0;
+		if(.SetAlign == "ALIGN_CENTER")
+			px = (sz.cx - textsize.cx) / 2;
+		if(.SetAlign == "ALIGN_RIGHT")
+			px = sz.cx - textsize.cx;
+		w.DrawSmartText(px, (sz.cy - textsize.cy) / 2, .SetLabel, .SetFont, .SetInk);
+	}
+};
+
+ctrl Label {
+	group "Static";
+
+	GetMinSize() { return XMinSize(); }
+	GetStdSize() { sz = GetTextSize("Label", .StdFont); sz.cy += 6; sz.cx *= 1.2; return sz; }
+
+	>TextCtrl;
+
+	Doc    SetLabel ? "Label of control" ;
+	Align  SetAlign = ALIGN_LEFT @2;
+	Font   SetFont = StdFont() @2;
+	Color  SetInk = :SBlack @2;
+	Frame  SetFrame @3;
+//	Qtf    SetInfo @1 ? "Info of control" ;
+
+	Paint(w) {
+		sz = ViewSize(w);
+		textsize = GetSmartTextSize(.SetLabel, .SetFont);
+		px = 0;
+		if(.SetAlign == "ALIGN_CENTER")
+			px = (sz.cx - textsize.cx) / 2;
+		if(.SetAlign == "ALIGN_RIGHT")
+			px = sz.cx - textsize.cx;
+		w.DrawSmartText(px, (sz.cy - textsize.cy) / 2, .SetLabel, .SetFont, .SetInk);
+	}
+	Sample() {
+		.SetLabel = "Label";
+		.SetFont = Arial(10).Bold().Italic();
+	}
+};
+
+ctrl StaticText {
+	group "Static";
+
+	GetMinSize() { return XMinSize(); }
+	GetStdSize() { sz = XMinSize(); sz.cy += 6; sz.cx *= 5; return sz; }
+
+	Doc    SetText ? "Label of control" ;
+	Align  SetAlign = ALIGN_LEFT;
+	Font   SetFont = StdFont();
+	Color  SetInk = :SBlack;
+	Frame  SetFrame @1;
+//	Qtf    SetInfo @1 ? "Info of control" ;
+
+	ViewRect(w) {
+		r = GetRect();
+		DrawCtrlFrame(w, r, .SetFrame);
+		return r;
+	}
+	ViewSize(w) {
+		r = ViewRect(w);
+		return Size(r.right - r.left, r.bottom - r.top);
+	}
+
+	Paint(w) {
+		sz = ViewSize(w);
+		textsize = GetTextSize(.SetText, .SetFont);
+		px = 0;
+		if(.SetAlign == "ALIGN_CENTER")
+			px = (sz.cx - textsize.cx) / 2;
+		if(.SetAlign == "ALIGN_RIGHT")
+			px = sz.cx - textsize.cx;
+		w.DrawText(px, (sz.cy - textsize.cy) / 2, .SetText, .SetFont, .SetInk);
+	}
+	Sample() {
+		.SetText = "Text";
+		.SetFont = Arial(10).Bold().Italic();
+	}
+};
+
+ctrl LabelBox {
+	group "Static";
+
+	GetMinSize() { return Size(0, 0); }
+	GetStdSize() { return Size(64, 24); }
+
+	>Base;
+	Text SetLabel ? "Box label" ;
+
+	Paint(w) {
+		sz = GetSize();
+		ts = GetSmartTextSize(.SetLabel, .SetFont);
+		d = ts.cy / 2;
+		if(2 * GetSmartTextSize("X").cy > sz.cy) {
+			d = sz.cy / 2;
+			w.DrawSmartText(d, (sz.cy - ts.cy) / 2, .SetLabel, .SetFont, .SetInk);
+			w.DrawRect(1, d, d - 1, 1, :SGray);
+			w.DrawRect(1, d + 1, d - 1, 1, :SWhite);
+		}
+		else {
+			w.DrawSmartText(d, 0, .SetLabel, .SetFont, .SetInk);
+			w.DrawRect(0, d + 2, 1, sz.cy - d - 4, :SGray);
+			w.DrawRect(1, d + 2, 1, sz.cy - d - 4, :SWhite);
+			w.DrawRect(sz.cx - 2, d, 1, sz.cy - d - 2, :SGray);
+			w.DrawRect(sz.cx - 1, d, 1, sz.cy - d - 2, :SWhite);
+			w.DrawRect(0, sz.cy - 2, sz.cx - 1, 1, :SGray);
+			w.DrawRect(0, sz.cy - 1, sz.cx - 1, 1, :SWhite);
+			w.DrawRect(sz.cx - 1, sz.cy - 2, 1, 2, :SWhite);
+			w.DrawRect(1, d, d - 1, 1, :SGray);
+			w.DrawRect(1, d + 1, d - 1, 1, :SWhite);
+			w.DrawRect(0, d, 1, 2, :SGray);
+		}
+		w.DrawRect(d + ts.cx, d, sz.cx - ts.cx - d - 2, 1, :SGray);
+		w.DrawRect(d + ts.cx, d + 1, sz.cx - ts.cx - d - 2, 1, :SWhite);
+	}
+}
+
+ctrl DataPusher {
+	group "Push";
+
+	GetStdSize() { return Size(64, 24); }
+
+	>Base;
+	Frame SetFrame = InsetFrame();
+	bool  SetEditable = true @1;
+	Text  Tip;
+
+	Paint(w) {
+		r = GetRect();
+		DrawCtrlFrame(w, r, .SetFrame);
+		w.DrawRect(r, :SWhite);
+	}
+};
+
+
+ctrl Button {
+	group "Push";
+
+	GetMinSize() { sz = XMinSize(); sz.cy += 2; return sz; }
+	GetStdSize() { sz = GetMinSize(); sz.cx *= 7; return sz; }
+
+	Text   SetLabel ? "Button label";
+	Font   SetFont = StdFont();
+	Frame  SetFrame @1;
+	Text  Tip;
+
+	Paint(w) {
+		r = GetRect();
+		DrawCtrlFrame(w, r, .SetFrame);
+		DrawButtonFrame(w, r);
+		sz = Size(r.right - r.left, r.bottom - r.top);
+		n = int(sz.cy / 8);
+		w.DrawRect(r.left, r.top, sz.cx, sz.cy, :SLtGray);
+		textsize = GetSmartTextSize(.SetLabel, .SetFont);
+		px = (sz.cx - textsize.cx) / 2;
+		py = (sz.cy - textsize.cy) / 2;
+		w.DrawSmartText(px + r.left, py + r.top, .SetLabel, .SetFont, :SBlack);
+	}
+}
+
+ctrl Option {
+	group "Push";
+
+	Text   SetLabel @1 ? "Option text";
+	Font   SetFont = StdFont() @1;
+	Frame  SetFrame @2;
+	bool   BlackEdge;
+	bool   SwitchImage;
+	bool   SetEditable = true @1 ? "Editable";
+	bool   ThreeState;
+	bool   NotNull;
+	Text   Tip @2;
+
+	GetMinSize() { sz = XMinSize(); sz.cy += 2; return sz; }
+	GetStdSize() { sz = GetMinSize(); sz.cx *= 7; sz.cy = max(16, sz.cy); return sz; }
+
+	ViewRect(w) {
+		r = GetRect();
+		DrawCtrlFrame(w, r, .SetFrame);
+		return r;
+	}
+	ViewSize(w) {
+		r = ViewRect(w);
+		return Size(r.right - r.left, r.bottom - r.top);
+	}
+
+	Paint(w) {
+		x = self;
+		sz = ViewSize(w);
+		img = .SwitchImage ? "ClassicCtrlsImg::S0"
+		                   : .ThreeState ? "ClassicCtrlsImg::O2"
+		                                 : "ClassicCtrlsImg::O0";
+		imagesize = GetImageSize(img);
+		textsize = GetSmartTextSize(.SetLabel, .SetFont);
+		w.DrawImage(0, (sz.cy - imagesize.cy) / 2, img);
+		w.DrawSmartText(imagesize.cx + 4, (sz.cy - textsize.cy) / 2, .SetLabel, .SetFont);
+	}
+}
+
+ctrl Switch {
+	group "Push";
+
+	GetMinSize() { sz = XMinSize(); sz.cy += 2; return sz; }
+	GetStdSize() { sz = GetMinSize(); sz.cx *= 7; sz.cy = max(16, sz.cy); return sz; }
+
+	Doc    SetLabel;
+	Font   SetFont = StdFont();
+	bool   SetEditable = true @1 ? "Editable";
+//	Qtf    SetInfo @1 ? "Info of control" ;
+
+	Paint(w)
+	{
+		sz = GetSize();
+		ln = [];
+		cs = [];
+		for(i = 0; i < count(.SetLabel); i++) {
+			if(.SetLabel[i] >= 32 && .SetLabel[i] < 65536)
+				ln[] = .SetLabel[i];
+			if(.SetLabel[i] == '\n') {
+				cs[] = ln;
+				ln = "";
+			}
+		}
+		cs[] = ln;
+		tcy = GetTextSize("W", .SetFont).cy;
+		linecy = max(16, tcy + 2);
+		imagesize = GetImageSize("ClassicCtrlsImg::S0");
+		y = 0;
+		x = 0;
+		setlabel = .SetLabel;
+		for(i = 0; i < count(cs); i++) {
+			textsize = GetSmartTextSize(cs[i], .SetFont);
+			w.DrawImage(x, y, "ClassicCtrlsImg::S0");
+			w.DrawSmartText(x + imagesize.cx + 4, y + (imagesize.cy - tcy) / 2,
+			                cs[i], .SetFont);
+			if(linecy * count(cs) > sz.cy)
+				x += imagesize.cx + 4 + textsize.cx + max(imagesize.cy, tcy) / 2;
+			else
+				y += linecy;
+		}
+	}
+};
+
+ctrl EditField {
+	group "Input fields";
+
+	GetMinSize() { sz = XMinSize(); sz.cy += 6; return sz; }
+	GetStdSize() { sz = GetMinSize(); sz.cx *= 8; return sz; }
+
+	bool  AlignRight @1;
+	int   MaxChars @2;
+	Font  SetFont = StdFont() @3;
+	bool  SetEditable = true @4 ? "Editable";
+	Frame SetFrame = InsetFrame() @5;
+	Text  Tip @6;
+	bool  WantFocus = true @7;
+
+	Paint(w) {
+		r = GetRect();
+		DrawCtrlFrame(w, r, .SetFrame);
+		w.DrawRect(r, :SWhite);
+		PaintData(w);
+	}
+
+	PaintText(w, text) {
+		w.DrawText(3, (GetSize().cy - GetTextSize(text, Arial(10)).cy) / 2,
+			(.SetEditable ? "" : "R/O ") + text, Arial(10), :SMagenta);
+	}
+
+	PaintData(w) {
+		PaintText(w, "EditField");
+	}
+}
+
+ctrl DocEdit {
+	group "Editors";
+
+	GetMinSize() { sz = XMinSize(); sz.cy += 6; return sz; }
+	GetStdSize() { sz = GetMinSize(); sz.cx *= 8; return sz; }
+
+	Frame SetFrame = InsetFrame();
+	Font  SetFont = StdFont();
+	bool  SetEditable = true @1 ? "Editable";
+	bool  WantFocus = true;
+	Text  Tip;
+//	Qtf   SetInfo @1 ? "Info of control" ;
+
+	Paint(w) {
+		r = GetRect();
+		DrawCtrlFrame(w, r, .SetFrame);
+		w.DrawRect(r, :SWhite);
+		PaintData(w);
+	}
+
+	PaintText(w, text) {
+		w.DrawText(3, (GetSize().cy - GetTextSize(text, Arial(10)).cy) / 2,
+			(.SetEditable ? "" : "R/O ") + text, Arial(10), :SMagenta);
+	}
+
+	PaintData(w) {
+		PaintText(w, "DocEdit");
+	}
+}
+
+ctrl LineEdit {
+	group "Editors";
+
+	>EditField;
+
+	PaintData(w) {
+		PaintText(w, "LineEdit");
+	}
+}
+
+subctrl EditNotNull {
+	>EditField;
+	bool NotNull = false;
+
+	PaintMinMax(w, type, minval, maxval) {
+		PaintMinMaxText(w, type, minval, maxval, addtext);
+	}
+
+	PaintMinMaxText(w, type, minval, maxval, addtext) {
+		text = (.NotNull ? "!" : "") + type;
+		if(minval != "" && maxval != "")
+			text << " " << minval << "..." << maxval;
+		else
+		if(minval != "")
+			text << " >= " << minval;
+		else
+		if(maxval != "")
+			text << " <= " << maxval;
+		text << addtext;
+		PaintText(w, text);
+	}
+}
+
+ctrl EditString {
+	>EditNotNull;
+	raw MaxLen;
+
+	PaintData(w) {
+		text = (.NotNull ? "!" : "") + "Str";
+		if(.MaxLen != "")
+			text << " < " << .MaxLen;
+		PaintText(w, text);
+	}
+}
+
+fn IntStr(x)
+{
+	return x == :IntNull || x < :DblNullLim ? "" : to_string(x);
+}
+
+fn DblStr(x)
+{
+	return x < :DblNullLim ? "" : to_string(x);
+}
+
+ctrl EditInt {
+	>EditNotNull;
+	int Min;
+	int Max;
+
+	PaintData(w) { PaintMinMax(w, "int", IntStr(.Min), IntStr(.Max)); }
+}
+
+ctrl EditInt64 {
+	>EditNotNull;
+	int Min;
+	int Max;
+
+	PaintData(w) { PaintMinMax(w, "int64", IntStr(.Min), IntStr(.Max)); }
+}
+
+ctrl EditIntNotNull {
+	>EditInt;
+
+	bool NotNull = true;
+};
+
+ctrl EditDouble {
+	>EditNotNull;
+	double Min;
+	double Max;
+
+	PaintData(w) { PaintMinMax(w, "dbl", DblStr(.Min), DblStr(.Max)); }
+}
+
+ctrl EditDoubleNotNull {
+	>EditDouble;
+
+	bool NotNull = true;
+}
+
+ctrl EditDate {
+	>EditNotNull;
+	PaintData(w) { PaintMinMax(w, "Date", "", ""); }
+}
+
+ctrl EditDateNotNull {
+	>EditDate;
+
+	bool NotNull = true;
+}
+
+ctrl EditTime {
+	>EditNotNull;
+	PaintData(w) { PaintMinMax(w, "Time", "", ""); }
+}
+
+ctrl EditTimeNotNull {
+	>EditTime;
+
+	bool NotNull = true;
+}
+
+ctrl EditIntSpin {
+	>EditInt;
+
+	Paint(w) {
+		r = GetRect();
+		DrawCtrlFrame(w, r, .SetFrame);
+		w.DrawRect(r, :SWhite);
+		DrawSpinButtons(w, r);
+		PaintMinMax(w, "int", IntStr(.Min), IntStr(.Max));
+	}
+}
+
+ctrl EditDoubleSpin {
+	>EditDouble;
+
+	double SetInc = 0.1;
+
+	Paint(w) {
+		r = GetRect();
+		DrawCtrlFrame(w, r, .SetFrame);
+		w.DrawRect(r, :SWhite);
+		DrawSpinButtons(w, r);
+		PaintMinMaxText(w, "dbl", DblStr(.Min), DblStr(.Max), "+-" + DblStr(.SetInc));
+	}
+}
+
+ctrl DropList {
+	group "Input fields";
+
+	GetMinSize() { sz = XMinSize(); sz.cy += 6; return sz; }
+	GetStdSize() { sz = GetMinSize(); sz.cx *= 8; return sz; }
+
+	Frame SetFrame = InsetFrame();
+	bool  SetEditable = true @2 ? "Editable";
+	bool  WantFocus = true;
+	bool  DisplayAll = false;
+	bool  AlwaysDrop = false @1;
+	Text  Tip;
+//	Qtf   SetInfo @1 ? "Info of control" ;
+
+	Paint(w) {
+		r = GetRect();
+		DrawCtrlFrame(w, r, .SetFrame);
+		w.DrawRect(r, :SWhite);
+		n = r.bottom - r.top;
+		DrawEdgeButton(w, RectC(r.right - n, r.top, n, n));
+		w.DrawImage((n - 7) / 2 + r.right - n, (n - 6) / 2 + r.top, "ClassicCtrlsImg::DA");
+		w.DrawText(3, (GetSize().cy - GetTextSize("", Arial(10)).cy) / 2,
+			(.SetEditable ? "" : "R/O ") + "DropList", Arial(10), :SMagenta);
+	}
+}
+
+template WithDropChoice {
+	bool   Dropping = true;
+	String Appending = ", ";
+	raw    SetDropLines = 16;
+	Text   Tip;
+
+	Paint(w) {
+		CtrlPaint(w);
+		r = GetRect();
+		DrawCtrlFrame(w, r, .SetFrame);
+		n = r.bottom - r.top;
+		DrawEdgeButton(w, RectC(r.right - n, r.top, n, n));
+		w.DrawImage((n - 7) / 2 + r.right - n, (n - 6) / 2 + r.top, "ClassicCtrlsImg::DA");
+	}
+};
+
+fn TabItemSize(text, font)
+{
+	SIDEGAP = 12;
+	VERTGAP = 4;
+	ts = GetTextSize(text, font.Bold());
+	return Size(ts.cx + 2 * SIDEGAP, (ts.cy < 16 ? 16 : ts.cy) + 2 * VERTGAP);
+}
+
+fn PaintTabItemFrame(w, rc)
+{
+	size = Size(rc.right - rc.left, rc.bottom - rc.top);
+	w.DrawRect(rc.left, rc.top, 1, size.cy - 1, :SLtGray);
+	w.DrawRect(rc.left + 1, rc.top + 2, 1, size.cy - 2, :SWhite);
+	w.DrawRect(rc.left + 2, rc.top + 1, 1, 1, :SWhite);
+	w.DrawRect(rc.left + 2, rc.top + 2, 1, size.cy - 2, :SLtGray);
+	w.DrawRect(rc.left + 3, rc.top, size.cx - 5, 1, :SWhite);
+	w.DrawRect(rc.left + 3, rc.top + 1, size.cx - 5, size.cy - 1, :SLtGray);
+	w.DrawRect(rc.right - 2, rc.top, 1, size.cy, :SBlack);
+	w.DrawRect(rc.right - 1, rc.top + 2, 1, size.cy - 2, :SBlack);
+}
+
+fn PaintTabItem(w, rc, text, font, active)
+{
+	if(active)
+		font = font.Bold();
+	else {
+		w.DrawRect(rc.left, rc.bottom - 1, rc.right - rc.left, 1, :SWhite);
+		w.DrawRect(rc.left, rc.bottom - 2, rc.right - rc.left, 1, :SLtGray);
+		rc.left += 2;
+		rc.top += 2;
+		rc.right -= 2;
+		rc.bottom -= 2;
+	}
+
+	PaintTabItemFrame(w, rc);
+
+	rc.top += (active ? 0 : 2);
+	SIDEGAP = 12;
+	sz = GetTextSize(text, font);
+	w.DrawText(rc.left + SIDEGAP, rc.top + ((rc.bottom - rc.top - sz.cy) >> 1), text, font);
+}
+
+ctrl TabCtrl {
+	group "Complex";
+
+	GetStdSize() { return Size(150, 100); }
+
+	Font SetFont = StdFont();
+	bool AcceptCurrent = false;
+//	Qtf  SetInfo @1 ? "Info of control" ;
+
+	Paint(w) {
+		text1 = "Tab1";
+		text2 = "Tab2";
+		text3 = "Tab3";
+		size1 = TabItemSize(text1, .SetFont);
+		size2 = TabItemSize(text2, .SetFont);
+		size3 = TabItemSize(text3, .SetFont);
+		r = GetRect();
+		r1 = r;
+		INITGAP = -1;
+		r1.right = (r1.left += INITGAP) + size1.cx;
+		r1.bottom = r1.top + size1.cy;
+		CELLSEP = -4;
+		r2 = r1;
+		r2.right = (r2.left = r2.right + CELLSEP) + size2.cx;
+		r3 = r2;
+		r3.right = (r3.left = r3.right + CELLSEP) + size3.cx;
+		PaintTabItem(w, r3, text3, .SetFont, 0);
+		PaintTabItem(w, r2, text2, .SetFont, 0);
+		PaintTabItem(w, r1, text1, .SetFont, 1);
+		w.DrawRect(r.left, r1.bottom, 1, r.bottom - r1.bottom, :SWhite);
+		w.DrawRect(r3.right, r1.bottom - 1, r.right - r3.right, 1, :SWhite);
+		w.DrawRect(r.right - 1, r1.bottom, 1, r.bottom - r1.bottom, :SGray);
+		w.DrawRect(r.left, r.bottom - 1, r.right - r.left, 1, :SGray);
+	}
+};
+
+fn PaintHeaderTab(w, r, text)
+{
+	DrawButtonFrame(w, r);
+	w.DrawText(r.left + 2, (r.top + r.bottom - GetTextSize(text).cy) >> 1, text, StdFont());
+}
+
+fn PaintHeaderTabs(w, ...)
+{
+	for(i = 0; i < count(argv); i += 2)
+		PaintHeaderTab(w, argv[i], argv[i + 1]);
+}
+
+fn PaintCenterImage(w, x, y, img)
+{
+	sz = GetImageSize(img);
+	w.DrawImage(x - sz.cx / 2, y - sz.cy / 2, img);
+}
+
+fn PaintCenterText(w, x, y, text, fnt, color)
+{
+	sz = GetTextSize(text, fnt);
+	w.DrawText(x - sz.cx / 2, y - sz.cy / 2, text, fnt, color);
+}
+
+fn PaintRcCenterImage(w, r, img)
+{
+	PaintCenterImage(w, (r.left + r.right) >> 1, (r.top + r.bottom) >> 1, img);
+}
+
+fn PaintVScrollBar(w, r)
+{
+	wd = r.right - r.left;
+	up = r;
+	r.top = (up.bottom = up.top + wd);
+	down = r;
+	r.bottom = (down.top = down.bottom - wd);
+	DrawButtonFrame(w, up);
+	PaintRcCenterImage(w, up, "ClassicCtrlsImg::UA");
+	DrawButtonFrame(w, down);
+	PaintRcCenterImage(w, down, "ClassicCtrlsImg::DA");
+	w.DrawRect(r, :SWhiteGray);
+//	ht = r.bottom - r.top;
+//	r.top += ht / 4;
+//	r.bottom = r.top + ht / 3;
+//	DrawButtonFrame(w, r);
+//	w.DrawRect(r, :SLtGray);
+}
+
+ctrl ArrayCtrl {
+	group "Complex";
+
+	GetStdSize() { return Size(150, 100); }
+	Frame SetFrame = InsetFrame();
+	bool AutoHideSb = false;
+	bool Header = true;
+	bool Inserting = false;
+	bool Appending = false;
+	bool AppendLine = false;
+	bool Removing = false;
+	bool AskRemove = true;
+	bool Duplicating = false;
+	bool Moving = false;
+	bool Track = false;
+	bool VertGrid = true;
+	bool HorzGrid = true;
+	bool NoCursor = false;
+	bool MouseMoveCursor = false;
+	bool MultiSelect = false;
+	int  SetLineCy;
+//	Qtf  SetInfo @1 ? "Info of control" ;
+
+	Paint(w) {
+		PaintArray(w, GetRect());
+	}
+
+	PaintArray(w, r) {
+		col1 = "Column 1";
+		col2 = "Column 2";
+		col3 = "Column 3";
+		fontcy = GetTextSize(col1).cy;
+		DrawCtrlFrame(w, r, .SetFrame);
+		if(!.AutoHideSb) {
+			rsb = r;
+			r.right = rsb.left = rsb.right - fontcy - 4;
+			PaintVScrollBar(w, rsb);
+		}
+		wd = r.right - r.left;
+		hdrcy = .Header ? fontcy + 4 : 0;
+		third = wd / 3;
+		r1 = r;
+		r1.bottom = r1.top + hdrcy;
+		r1.right = r.left + third;
+		r2 = r1;
+		r2.right = (r2.left = r1.right) + third;
+		r3 = r2;
+		r3.left = r2.right;
+		r3.right = r.right;
+		if(hdrcy)
+			PaintHeaderTabs(w, r1, col1, r2, col2, r3, col3);
+		linecy = .SetLineCy;
+		if(is_void(linecy) || linecy <= 0)
+			linecy = fontcy + 1;
+		celltop = r1.bottom;
+		cellht = 3 * linecy;
+		cellbot = celltop + cellht + 1;
+		w.DrawRect(r.left, celltop, wd, cellht, :SWhite);
+		if(.NoCursor == "false")
+			w.DrawRect(r.left, celltop + linecy, wd, linecy, :SBlue);
+		for(i = 1; i <= 3; i++)
+		{
+			if(.HorzGrid)
+				w.DrawRect(r.left, celltop + linecy * i, wd, 1, :SLtGray);
+			if(.VertGrid)
+				w.DrawRect(r.left + i * third - 1, celltop, 1, cellht, :SLtGray);
+		}
+		w.DrawRect(r.left, cellbot, wd, r.bottom - cellbot, :SGray);
+	}
+};
+
+ctrl RichTextView {
+	group "Complex";
+
+	GetMinSize() { sz = XMinSize(); sz.cy += 6; return sz; }
+	GetStdSize() { sz = GetMinSize(); sz.cx *= 8; return sz; }
+
+	Frame SetFrame = InsetFrame() @1;
+	Color Background = :SWhite;
+	bool  VCenter = false;
+	bool  NoSb = false;
+	bool  AutoHideSb = false;
+	int   HMargins = 0;
+	int   VMargins = 0;
+
+	Paint(w) {
+		r = GetRect();
+		DrawCtrlFrame(w, r, .SetFrame);
+		w.DrawRect(r, .Background);
+		w.DrawText(3, 3, "RichTextView", Arial(10), :SMagenta);
+	}
+}
+
+ctrl RichTextCtrl {
+	group "Static";
+
+	>RichTextView;
+
+	GetMinSize() { sz = XMinSize(); sz.cy += 6; return sz; }
+	GetStdSize() { sz = GetMinSize(); sz.cx *= 8; return sz; }
+
+	Frame SetFrame = NullFrame() @1;
+	Color Background = Null;
+	bool  AutoHideSb = true;
+
+	Paint(w) {
+		r = GetRect();
+		DrawCtrlFrame(w, r, .SetFrame);
+		if(!is_void(.Background))
+			w.DrawRect(r, .Background);
+		w.DrawText(3, 3, "RichTextCtrl", Arial(10), :SMagenta);
+	}
+}
+
+ctrl DropDate {
+	group "Input fields";
+
+	GetMinSize() { sz = XMinSize(); sz.cy += 6; return sz; }
+	GetStdSize() { sz = GetMinSize(); sz.cx *= 13; return sz; }
+
+	Frame SetFrame = InsetFrame();
+	bool  SetEditable = true @2 ? "Editable";
+	bool  WantFocus = true;
+	bool  SelectAll = true;
+	bool  SwapMonthYear = false;
+	bool  OneButton = false;
+	bool  NotNull = false;
+	Text  Tip;
+
+	Paint(w) {
+		r = GetRect();
+		DrawCtrlFrame(w, r, .SetFrame);
+		w.DrawRect(r, :SWhite);
+		n = r.bottom - r.top;
+		DrawEdgeButton(w, RectC(r.right - n, r.top, n, n));
+		w.DrawImage((n - 7) / 2 + r.right - n, (n - 6) / 2 + r.top, "ClassicCtrlsImg::DA");
+		w.DrawText(3, (GetSize().cy - GetTextSize("", Arial(10)).cy) / 2,
+			(.SetEditable ? "" : "R/O ") + (.NotNull ? "!" : "") + "01/05/2007", Arial(10), :SMagenta);
+	}
+}
+
+ctrl DropTime {
+	group "Input fields";
+
+	GetMinSize() { sz = XMinSize(); sz.cy += 6; return sz; }
+	GetStdSize() { sz = GetMinSize(); sz.cx *= 15; return sz; }
+
+	Frame SetFrame = InsetFrame();
+	bool  SetEditable = true @2 ? "Editable";
+	bool  WantFocus = true;
+	bool  SelectAll = true;
+	bool  SwapMonthYear = false;
+	bool  Seconds = true;
+	bool  NotNull = false;
+	Text  Tip;
+
+	Paint(w) {
+		r = GetRect();
+		DrawCtrlFrame(w, r, .SetFrame);
+		w.DrawRect(r, :SWhite);
+		n = r.bottom - r.top;
+		DrawEdgeButton(w, RectC(r.right - n, r.top, n, n));
+		w.DrawImage((n - 7) / 2 + r.right - n, (n - 6) / 2 + r.top, "ClassicCtrlsImg::DA");
+		w.DrawText(3, (GetSize().cy - GetTextSize("", Arial(10)).cy) / 2,
+			(.SetEditable ? "" : "R/O ") + (.NotNull ? "!" : "") + "01/05/2007 10:34:58", Arial(10), :SMagenta);
+	}
+}
+
+fn PaintButton(w, r, img)
+{
+	col = Color(153, 204, 255);
+	w.DrawRect(r, :SWhite);
+	DeflateRect(r);
+	w.DrawRect(r, col);
+	PaintRcCenterImage(w, r, img);
+}
+
+ctrl Clock {
+	group "Input fields";
+	GetMinSize() { return Size(150, 156); }
+	GetStdSize() { return Size(150, 156); }
+	Frame SetFrame = BlackFrame();
+	bool  SetEditable = true @2 ? "Editable";
+	bool  WantFocus = true;
+	bool  Seconds = true;
+	Text  Tip;
+
+	PaintPtr(w, cmx, cmy, pos, m, d, color, cf) {
+		dx = m * sin(pos * 2 * 3.1415);
+		dy = m * cos(pos * 2 * 3.1415);
+
+		sx = cmx - dx * 35 / 2.0;
+		sy = cmy + dy * 35 / 2.0;
+		ex = cmx + dx * cf;
+		ey = cmy - dy * cf;
+
+		w.DrawLine(sx, sy, ex, ey, d, color);
+	}
+
+	Paint(w) {
+		ts = GetTextSize("X");
+		r = GetRect();
+		ro = GetRect();
+		b = r.bottom;
+		hs = 20;
+		r.bottom = hs;
+		w.DrawImageColor(r, "CtrlImg:Bg", :SColorHighlight, 120);
+		r.top = r.bottom;
+		r.bottom = b;
+		w.DrawRect(r, :SWhite);
+		width = r.right - r.left;
+		height = r.bottom - r.top;
+
+		w.DrawRect(0, hs, 5, ro.bottom - hs, Color(200, 200, 200));
+		w.DrawRect(ro.right - 5, hs, 5, ro.bottom - hs, Color(200, 200, 200));
+
+		cmx = width / 2;
+		cmy = height / 2 + hs;
+
+		cf = min(cmy - 15, cmx) - 5;
+		for(i = 1; i <= 60; i++)
+		{
+			x = cmx + (0.95 * sin(i * 3.1415 / 30.0) * cf);
+			y = cmy - (0.95 * cos(i * 3.1415 / 30.0) * cf);
+			if(i % 5 == 0)
+				w.DrawRect(x, y, 2, 2, :SBlack);
+			else
+				w.DrawRect(x, y, 1, 1, :SBlack);
+		}
+
+		fnt = Arial(10);
+
+		for(i = 1; i <= 12; i++)
+		{
+			x = cmx + (0.8 * sin(i * 3.1415 / 6.0) * cf);
+			y = cmy - (0.8 * cos(i * 3.1415 / 6.0) * cf);
+			PaintCenterText(w, x, y, to_string(i), .fnt, :Black);
+		}
+
+		hour = 10;
+		minute = 34;
+		second = 15;
+
+		tm = hour * 3600 + minute * 60 + second;
+		PaintPtr(w, cmx, cmy, tm / 3600 / 12, 0.5, 5, :SRed, cf);
+		PaintPtr(w, cmx, cmy, tm / 3600, 0.6, 3, :SBlue, cf);
+		PaintPtr(w, cmx, cmy, tm / 60, 0.75, 2, :SBlack, cf);
+
+		r = Rect(ro.left + 3, ro.top + 2, ro.left + 3 + 16, ro.top + 18);
+		PaintRcCenterImage(w, r, "ClassicCtrlsImg::LA");
+		left = r.left;
+		r.left += 15 + 25;
+		r.right += 15 + 25;
+		PaintRcCenterImage(w, r, "ClassicCtrlsImg::RA");
+		PaintCenterText(w, (r.right + left) / 2, (r.top + r.bottom) / 2, to_string(hour), .fnt, :White);
+
+		r = Rect(ro.right - 3 - 16, ro.top + 2, ro.right - 3, ro.top + 18);
+		//PaintButton(w, r, "ClassicCtrlsImg::RA");
+		PaintRcCenterImage(w, r, "ClassicCtrlsImg::RA");
+		right = r.right;
+		r.left -= 15 + 25;
+		r.right -= 15 + 25;
+		PaintRcCenterImage(w, r, "ClassicCtrlsImg::LA");
+		PaintCenterText(w, (right + r.left) / 2, (r.top + r.bottom) / 2, to_string(minute), .fnt, :White);
+
+		DrawCtrlFrame(w, ro, .SetFrame);
+	}
+}
+
+ctrl Calendar {
+	group "Input fields";
+
+	GetMinSize() { return Size(180, 120); }
+	GetStdSize() { return Size(236, 156); }
+
+	Frame SetFrame = BlackFrame();
+	bool  SetEditable = true @2 ? "Editable";
+	bool  WantFocus = true;
+	bool  SelectAll = true;
+	bool  SwapMonthYear = false;
+	bool  OneButton = false;
+	Text  Tip;
+
+	Paint(w) {
+		ts = GetTextSize("X");
+		r = GetRect();
+		ro = GetRect();
+		f = StdFont();
+		b = r.bottom;
+		hs = 20;
+		r.bottom = hs;
+		w.DrawImageColor(r, "CtrlImg:Bg", :SColorHighlight, 120);
+		r.top = r.bottom;
+		r.bottom = b;
+		w.DrawRect(r, :SWhite);
+		width = r.right - r.left;
+		height = r.bottom - r.top - 15;
+		sw = width / 8;
+		sh = height / 7;
+		w.DrawRect(r.left + 4, r.top + sh, width - 8, 1, :SBlack);
+		w.DrawRect(r.left + sw, r.top + 4, 1, height - 8, :SBlack);
+		ts = GetTextSize("Wk");
+		ty = r.top + (sh - ts.cy) / 2;
+		w.DrawText(r.left + (sw - ts.cx) / 2 , ty, "Wk", f, :SBlack);
+
+		days = ["Mo", "Tu", "We", "Th", "Fr", "Sa", "Su"];
+		for(i = 0; i < 7; i++)
+			w.DrawText(r.left + sw + i * sw + (sw - ts.cx) / 2, ty, days[i], f, :SBlack);
+
+		d = 1;
+		tn = GetTextSize("0");
+		gray = 0;
+		fnt = f;
+		for(j = 0; j < 6; j++)
+		{
+			ty = r.top + sh  + j * sh + (sh - ts.cy) / 2;
+			w.DrawText(r.left + (sw - tn.cx) / 2, ty, to_string(j + 1), f, :SBlack);
+
+			for(i = 0; i < 7; i++)
+			{
+				if(d == 19)
+				{
+					w.DrawRect(r.left + sw + i * sw + 0, r.top + sh + j * sh + 0, sw, sh, :SBlack);
+					w.DrawRect(r.left + sw + i * sw + 1, r.top + sh + j * sh + 1, sw - 2, sh - 2, Color(255, 254, 220));
+					fnt = f.Bold(1);
+				}
+				day = to_string(d);
+				ts = GetTextSize(day, fnt);
+
+				w.DrawText(r.left + sw + i * sw + (sw - ts.cx) / 2, ty, day, fnt, gray ? :SGray : (i == 6 ? :SRed : :SBlack));
+				fnt = f.Bold(false);
+				if(++d > 31)
+				{
+					d = 1;
+					gray = 1;
+				}
+			}
+		}
+
+		today = "Today: 01/19/2007";
+		ts = GetTextSize(today, StdFont().Bold());
+		w.DrawText((r.right - ts.cx) / 2, r.bottom - 3 - ts.cy, today, f.Bold(), :SBlue);
+
+		r = Rect(ro.left + 3, ro.top + 2, ro.left + 3 + 16, ro.top + 18);
+		PaintRcCenterImage(w, r, "ClassicCtrlsImg::LA");
+		left = r.left;
+		r.left += 15 + 65;
+		r.right += 15 + 65;
+		PaintRcCenterImage(w, r, "ClassicCtrlsImg::RA");
+		PaintCenterText(w, (left + r.right) / 2, (r.top + r.bottom) / 2, "January", f.Bold(), :SWhite);
+
+		r = Rect(ro.right - 3 - 16, ro.top + 2, ro.right - 3, ro.top + 18);
+		PaintRcCenterImage(w, r, "ClassicCtrlsImg::RA");
+		right = r.right;
+		r.left -= 15 + 40;
+		r.right -= 15 + 40;
+		PaintRcCenterImage(w, r, "ClassicCtrlsImg::LA");
+		PaintCenterText(w, (r.left + right) / 2, (r.top + r.bottom) / 2, "2007", f.Bold(), :SWhite);
+
+		DrawCtrlFrame(w, ro, .SetFrame);
+	}
+}
+
+ctrl SliderCtrl {
+	group "Progress";
+
+	GetMinSize() { return Size(0, 0); }
+	GetStdSize() { return Size(64, 24); }
+
+	Frame  SetFrame @1;
+
+	Paint(w) {
+		r = GetRect();
+		DrawCtrlFrame(w, r, .SetFrame);
+
+		sz = Size(r.right - r.left, r.bottom - r.top);
+
+		halfX = int(r.left + r.right) >> 1;
+		halfY = int(r.top + r.bottom) >> 1;
+
+		if (sz.cx < sz.cy) {
+			DrawInsetFrame(w, Rect(halfX - 2, r.top + 2, halfX + 2, r.bottom - 2));
+			imgSz = GetImageSize("CtrlImg::vthumb");
+			w.DrawImage(halfX - (imgSz.cx >> 1), halfY - (imgSz.cy >> 1), "CtrlImg::vthumb");
+		} else {
+			DrawInsetFrame(w, Rect(r.left + 2, halfY - 2, r.right - 2, halfY + 2));
+			imgSz = GetImageSize("CtrlImg::hthumb");
+			w.DrawImage(halfX - (imgSz.cx >> 1), halfY - (imgSz.cy >> 1), "CtrlImg::hthumb");
+		}
+	}
+}
+
+ctrl ProgressIndicator {
+	group "Progress";
+
+	GetMinSize() { return Size(0, 0); }
+	GetStdSize() { return Size(64, 24); }
+
+	Frame  SetFrame @1;
+
+	Paint(w) {
+		r = GetRect();
+
+		DrawCtrlFrame(w, r, .SetFrame);
+		DrawInsetFrame(w, r);
+
+		sz = Size(r.right - r.left, r.bottom - r.top);
+
+		w.DrawRect(r.left, r.top, sz.cx, sz.cy, :SBlack);
+		DeflateRect(r);
+		sz = Size(r.right - r.left, r.bottom - r.top);
+		w.DrawRect(r.left, r.top, sz.cx, sz.cy, :SWhite);
+
+		if(sz.cx > sz.cy) {
+			w.DrawRect(r.left, r.top, sz.cx >> 2, sz.cy, :SLtGreen);
+		}
+		else {
+			w.DrawRect(r.left, r.bottom - (sz.cy >> 2), sz.cx, sz.cy >> 2, :SLtGreen);
+		}
+	}
+}
diff --git a/uppsrc/CtrlLib/CtrlUtil.cpp b/uppsrc/CtrlLib/CtrlUtil.cpp
new file mode 100644
index 000000000..a2ee975d6
--- /dev/null
+++ b/uppsrc/CtrlLib/CtrlUtil.cpp
@@ -0,0 +1,261 @@
+#include "CtrlLib.h"
+
+
+NAMESPACE_UPP
+
+#define LLOG(x) // RLOG(x)
+
+#define IMAGECLASS CtrlImg
+#define IMAGEFILE  <CtrlLib/Ctrl.iml>
+#include <Draw/iml_source.h>
+
+void Animate(Ctrl& c, const Rect& target, int type)
+{
+	if(type < 0)
+		type = GUI_PopUpEffect();
+	Rect r0 = c.GetRect();
+	dword time0 = GetTickCount();
+	for(;;) {
+		dword t = (GetTickCount() - time0);
+		if(t > 200)
+			break;
+		if(type == GUIEFFECT_SLIDE) {
+			int q = 25 * t / 200;
+			q *= q;
+			Rect r = r0;
+			if(r.left > target.left)
+				r.left = max(r.left - q, target.left);
+			if(r.top > target.top)
+				r.top = max(r.top - q, target.top);
+			if(r.right < target.right)
+				r.right = min(r.right + q, target.right);
+			if(r.bottom < target.bottom)
+				r.bottom = min(r.bottom + q, target.bottom);
+			if(r.GetWidth() > target.GetWidth())
+				r.right = r.left + target.GetWidth();
+			if(r.GetHeight() > target.GetHeight())
+				r.bottom = r.top + target.GetHeight();
+			if(r == target)
+				break;
+			c.SetRect(r);
+		}
+		else
+		if(type == GUIEFFECT_FADE)
+			c.SetAlpha((byte)(255 * t / 200));
+		else
+			break;
+		c.Sync();
+		Sleep(0);
+	}
+	c.SetRect(target);
+	c.SetAlpha(255);
+}
+
+void Animate(Ctrl& c, int x, int y, int cx, int cy, int type)
+{
+	Animate(c, RectC(x, y, cx, cy), type);
+}
+
+bool CtrlLibDisplayError(const Value& e) {
+	if(!e.IsError())
+		return false;
+	String s = ValueTo<String>(e);
+	if(s.IsEmpty())
+		s = t_("Invalid data.");
+	Exclamation(s);
+	return true;
+}
+
+INITBLOCK
+{
+	DisplayErrorFn() = &CtrlLibDisplayError;
+}
+/*
+String SaveCtrlLayout(Ctrl::LogPos p, const String& classname, const String& variable,
+					  const String& label, const String& help) {
+	String out;
+	if(classname.IsEmpty())
+		out << "\tUNTYPED(";
+	else
+		out << "\tITEM(" << classname << ", ";
+	out << variable << ", ";
+	switch(p.x.GetAlign()) {
+	case Ctrl::LEFT:   out << Format("LeftPos(%d, %d).", p.x.GetA(), p.x.GetB()); break;
+	case Ctrl::RIGHT:  out << Format("RightPos(%d, %d).", p.x.GetA(), p.x.GetB()); break;
+	case Ctrl::SIZE:   out << Format("HSizePos(%d, %d).", p.x.GetA(), p.x.GetB()); break;
+	case Ctrl::CENTER: out << Format("HCenterPos(%d, %d).", p.x.GetB(), p.x.GetA()); break;
+	}
+	switch(p.y.GetAlign()) {
+	case Ctrl::TOP:    out << Format("TopPos(%d, %d)", p.y.GetA(), p.y.GetB()); break;
+	case Ctrl::BOTTOM: out << Format("BottomPos(%d, %d)", p.y.GetA(), p.y.GetB()); break;
+	case Ctrl::SIZE:   out << Format("VSizePos(%d, %d)", p.y.GetA(), p.y.GetB()); break;
+	case Ctrl::CENTER: out << Format("VCenterPos(%d, %d)", p.y.GetB(), p.y.GetA()); break;
+	}
+	if(!label.IsEmpty()) {
+		out << ".SetLabel(\"";
+		for(const char *s = label; *s; s++)
+			if(*s == '\n')
+				out.Cat("\\n");
+			else
+				out.Cat(*s);
+		out << "\")";
+	}
+	if(!help.IsEmpty()) {
+		out << ".HelpC(\"";
+		for(const char *s = help; *s; s++)
+			if(*s == '\n')
+				out.Cat("\\n");
+			else
+				out.Cat(*s);
+		out << "\")";
+	}
+	out << ")\n";
+	return out;
+}
+*/
+void Show2(Ctrl& ctrl1, Ctrl& ctrl2, bool show) {
+	ctrl1.Show(show);
+	ctrl2.Show(show);
+}
+
+void Hide2(Ctrl& ctrl1, Ctrl& ctrl2) {
+	Show2(ctrl1, ctrl2, false);
+}
+
+void DelayCallback::Invoke() {
+	KillTimeCallback(this);
+	SetTimeCallback(delay, target, this);
+}
+
+bool EditText(String& s, const char *title, const char *label, int (*f)(int), int maxlen)
+{
+	WithEditStringLayout<TopWindow> dlg;
+	CtrlLayoutOKCancel(dlg, title);
+	dlg.lbl = label;
+	dlg.text = s.ToWString();
+	dlg.text.SetFilter(f);
+	if(maxlen) dlg.text.MaxLen(maxlen);
+	if(dlg.Execute() == IDOK) {
+		s = dlg.text;
+		return true;
+	}
+	return false;
+}
+
+bool EditText(String& s, const char *title, const char *label, int maxlen)
+{
+	return EditText(s, title, label, CharFilterUnicode, maxlen);
+}
+
+bool EditText(WString& s, const char *title, const char *label, int (*f)(int), int maxlen)
+{
+	WithEditStringLayout<TopWindow> dlg;
+	CtrlLayoutOKCancel(dlg, title);
+	dlg.lbl = label;
+	dlg.text = s;
+	dlg.text.SetFilter(f);
+	if(maxlen) dlg.text.MaxLen(maxlen);
+	if(dlg.Execute() == IDOK) {
+		s = dlg.text.GetText();
+		return true;
+	}
+	return false;
+}
+
+bool EditText(WString& s, const char *title, const char *label, int maxlen)
+{
+	return EditText(s, title, label, CharFilterUnicode, maxlen);
+}
+
+Callback CtrlRetriever::operator<<=(Callback cb)
+{
+	for(int i = 0; i < item.GetCount(); i++) {
+		CtrlItem0 *m = dynamic_cast<CtrlItem0 *>(&item[i]);
+		if(m)
+			m->ctrl->WhenAction = cb;
+	}
+	return cb;
+}
+
+void CtrlRetriever::Retrieve()
+{
+	for(int i = 0; i < item.GetCount(); i++)
+		item[i].Retrieve();
+}
+
+void IdCtrls::Add(Id id, Ctrl& ctrl)
+{
+	Item& m = item.Add();
+	m.id = id;
+	m.ctrl = &ctrl;
+}
+
+void Set(ArrayCtrl& array, int ii, IdCtrls& m)
+{
+	for(int i = 0; i < m.GetCount(); i++)
+		array.Set(ii, m(i), ~m[i]);
+}
+
+void Get(ArrayCtrl& array, int ii, IdCtrls& m)
+{
+	for(int i = 0; i < m.GetCount(); i++)
+		m[i] <<= array.Get(ii, m(i));
+}
+
+void sLarge(String& text, int *large, int count, const char *txt)
+{
+	int n = min(1024, count);
+	Sort(large, large + n, StdLess<int>());
+	int i = 0;
+	while(i < n) {
+		int q = large[i];
+		int nn = i++;
+		while(i < n && large[i] == q) i++;
+		nn = i - nn;
+		if(q < 10000)
+			text << Format("%4d B, %5d %s (%6d KB)\r\n", q, nn, txt, (nn * q) >> 10);
+		else
+			text << Format("%4d`KB, %5d %s (%6d KB)\r\n", q >> 10, nn, txt, (nn * q) >> 10);
+	}
+}
+
+String sProfile(MemoryProfile& mem)
+{
+	String text;
+	int acount = 0;
+	size_t asize = 0;
+	int fcount = 0;
+	size_t fsize = 0;
+	for(int i = 0; i < 1024; i++)
+		if(mem.allocated[i]) {
+			int sz = 4 * i;
+			text << Format("%4d B, %6d allocated (%5d KB), %6d fragmented (%5d KB)\r\n",
+			              sz, mem.allocated[i], (mem.allocated[i] * sz) >> 10,
+			              mem.fragmented[i], (mem.fragmented[i] * sz) >> 10);
+			acount += mem.allocated[i];
+			asize += mem.allocated[i] * sz;
+			fcount += mem.fragmented[i];
+			fsize += mem.fragmented[i] * sz;
+		}
+	text << Format(" TOTAL, %6d allocated (%5d KB), %6d fragmented (%5d KB)\r\n",
+	              acount, int(asize >> 10), fcount, int(fsize >> 10));
+	text << "Free pages " << mem.freepages << " (" << mem.freepages * 4 << " KB)\r\n";
+	text << "Large block count " << mem.large_count
+	    << ", total size " << (mem.large_total >> 10) << " KB\r\n";
+	sLarge(text, mem.large_size, mem.large_count, "allocated");
+	text << "Large fragments count " << mem.large_free_count
+	    << ", total size " << (mem.large_free_total >> 10) << " KB\r\n";
+	sLarge(text, mem.large_free_size, mem.large_free_count, "fragments");
+	return text;
+}
+
+void MemoryProfileInfo() {
+	MemoryProfile mem;
+	String text = sProfile(mem);
+	const MemoryProfile *peak = PeakMemoryProfile();
+	if(peak)
+		text << "\r\n=== Peak memory profile\r\n" << sProfile(mem);
+	PromptOK("[C " + DeQtfLf(text));
+};
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/CtrlLib/CtrlUtil.h b/uppsrc/CtrlLib/CtrlUtil.h
new file mode 100644
index 000000000..f03be3d07
--- /dev/null
+++ b/uppsrc/CtrlLib/CtrlUtil.h
@@ -0,0 +1,347 @@
+void Animate(Ctrl& c, const Rect& target, int type = -1);
+void Animate(Ctrl& c, int x, int y, int cx, int cy, int type = -1);
+
+bool CtrlLibDisplayError(const Value& ev);
+
+bool EditText(String& s, const char *title, const char *label, int (*filter)(int), int maxlen = 0);
+bool EditText(String& s, const char *title, const char *label, int maxlen = 0);
+
+bool EditText(WString& s, const char *title, const char *label, int (*filter)(int), int maxlen = 0);
+bool EditText(WString& s, const char *title, const char *label, int maxlen = 0);
+
+void Show2(Ctrl& ctrl1, Ctrl& ctrl, bool show = true);
+void Hide2(Ctrl& ctrl1, Ctrl& ctrl);
+
+#ifndef PLATFORM_WINCE //TODO?
+void UpdateFile(const char *filename);
+void SelfUpdate();
+bool SelfUpdateSelf();
+#endif
+
+void WindowsList();
+void WindowsMenu(Bar& bar);
+
+class DelayCallback : public Pte<DelayCallback> {
+	Callback target;
+	int      delay;
+
+public:
+	void     Invoke();
+	void     operator<<=(Callback x)  { target = x; }
+	void     SetDelay(int ms)         { delay = ms; }
+	Callback Get()                    { return callback(this, &DelayCallback::Invoke); }
+	Callback operator~()              { return Get(); }
+	operator Callback()               { return Get(); }
+
+	DelayCallback()                   { delay = 2000; }
+	~DelayCallback()                  { KillTimeCallback(this); }
+};
+
+#ifdef PLATFORM_WIN32
+struct Win32PrintDlg_;
+#endif
+
+#ifndef PLATFORM_WINCE
+
+class PrinterJob {
+#ifdef PLATFORM_WIN32
+	One<Win32PrintDlg_> pdlg;
+#endif
+#ifdef PLATFORM_X11
+	Size                pgsz;
+#endif
+	One<Draw>           draw;
+	Vector<int>         page;
+	int                 from, to, current;
+	bool                landscape;
+	String              name;
+	String              options;
+	bool                Execute0(bool dodlg);
+
+public:
+	Draw&               GetDraw();
+	operator            Draw&()                         { return GetDraw(); }
+	const Vector<int>&  GetPages() const                { return page; }
+	int                 operator[](int i) const         { return page[i]; }
+	int                 GetPageCount() const            { return page.GetCount(); }
+
+	bool                Execute();
+
+	PrinterJob& Landscape(bool b = true)                { landscape = b; return *this; }
+	PrinterJob& MinMaxPage(int minpage, int maxpage);
+	PrinterJob& PageCount(int n)                        { return MinMaxPage(0, n - 1); }
+	PrinterJob& CurrentPage(int currentpage);
+
+	PrinterJob(const char *name = NULL);
+	~PrinterJob();
+};
+
+#endif
+
+#ifdef PLATFORM_X11
+
+class TrayIcon : Ctrl {
+	virtual bool HookProc(XEvent *event);
+	virtual void Paint(Draw& draw);
+	virtual void LeftDown(Point p, dword keyflags);
+	virtual void LeftUp(Point p, dword keyflags);
+	virtual void LeftDouble(Point p, dword keyflags);
+	virtual void RightDown(Point p, dword keyflags);
+
+private:
+	void AddToTray();
+
+	Window traywin;
+	Image  icon;
+	void DoMenu(Bar& bar);
+	void Call(int code, unsigned long d1, unsigned long d2, unsigned long d3);
+	void Message(const char *title, const char *text, int timeout);
+
+public:
+	virtual void    LeftDown();
+	virtual void    LeftUp();
+	virtual void    LeftDouble();
+	virtual void    Menu(Bar& bar);
+	virtual void    BalloonLeftDown();
+	virtual void    BalloonShow();
+	virtual void    BalloonHide();
+	virtual void    BalloonTimeout();
+
+	Callback        WhenLeftDown;
+	Callback        WhenLeftUp;
+	Callback        WhenLeftDouble;
+	Callback1<Bar&> WhenBar;
+	Callback        WhenBalloonLeftDown;
+	Callback        WhenBalloonShow;
+	Callback        WhenBalloonHide;
+	Callback        WhenBalloonTimeout;
+
+	void            Break()                                { EndLoop(0); }
+	void            Run()                                  { EventLoop(this); }
+
+	void            Show(bool b = true);
+	void            Hide()                                 { Show(false); }
+
+	void            Info(const char *title, const char *text, int timeout = 10)    { Message(title, text, timeout); }
+	void            Warning(const char *title, const char *text, int timeout = 10) { Message(title, text, timeout); }
+	void            Error(const char *title, const char *text, int timeout = 10)   { Message(title, text, timeout); }
+
+	TrayIcon&  Icon(const Image &img)                      { icon = img; Refresh(); return *this; }
+	TrayIcon&  Tip(const char *text)                       { Ctrl::Tip(text); return *this; }
+
+	typedef TrayIcon CLASSNAME;
+
+	TrayIcon();
+};
+
+#endif
+
+#ifdef PLATFORM_WIN32
+#ifndef PLATFORM_WINCE
+
+class TrayIcon : private Ctrl {
+	struct NotifyIconOld {
+		dword sz;
+		HWND  hwnd;
+		dword id;
+		dword flags;
+		dword message;
+		HICON icon;
+		char  tip[64];
+	};
+	struct NotifyIconNew {
+		dword sz;
+		HWND  hwnd;
+		dword id;
+		dword flags;
+		dword message;
+		HICON icon;
+		char  tip[128];
+
+		dword state;
+		dword statemask;
+		char  info[256];
+		dword timeout;
+		char  title[64];
+		dword infoflags;
+	};
+
+	Image          icon;
+	bool           visible;
+	String         tip;
+	NotifyIconNew  nid;
+	HWND           hwnd;
+
+	virtual LRESULT WindowProc(UINT message, WPARAM wParam, LPARAM lParam);
+	void Notify(dword msg);
+	void DoMenu(Bar& bar);
+	void Message(int type, const char *title, const char *text, int timeout = 10);
+
+public:
+	virtual void    Menu(Bar& bar);
+	virtual void    LeftDown();
+	virtual void    LeftUp();
+	virtual void    LeftDouble();
+	virtual void    BalloonLeftDown();
+	virtual void    BalloonShow();
+	virtual void    BalloonHide();
+	virtual void    BalloonTimeout();
+
+	Callback        WhenLeftDown;
+	Callback        WhenLeftUp;
+	Callback        WhenLeftDouble;
+	Callback1<Bar&> WhenBar;
+	Callback        WhenBalloonLeftDown;
+	Callback        WhenBalloonShow;
+	Callback        WhenBalloonHide;
+	Callback        WhenBalloonTimeout;
+
+	void            Show(bool b = true);
+	void            Hide()                                 { Show(false); }
+	void            Break()                                { EndLoop(0); }
+	void            Run()                                  { EventLoop(this); }
+
+	void            Info(const char *title, const char *text, int timeout = 10)    { Message(1, title, text, timeout); }
+	void            Warning(const char *title, const char *text, int timeout = 10) { Message(2, title, text, timeout); }
+	void            Error(const char *title, const char *text, int timeout = 10)   { Message(3, title, text, timeout); }
+
+	TrayIcon&  Icon(const Image &img);
+	TrayIcon&  Tip(const char *text);
+
+	typedef TrayIcon CLASSNAME;
+
+	TrayIcon();
+	~TrayIcon();
+};
+
+class FileSelector {
+protected:
+	struct FileType : Moveable<FileType> {
+		String name;
+		String ext;
+	};
+
+	Vector<FileType> type;
+
+	int    activetype;
+	String activedir;
+	String defext;
+	bool   rdonly;
+	bool   multi;
+	bool   readonly;
+	bool   asking;
+
+	Vector<String> filename;
+
+public:
+	void Serialize(Stream& s);
+
+	void New()                                   { filename.Clear(); }
+	bool IsNew() const                           { return filename.IsEmpty(); }
+	bool Execute(bool open, const char *title = NULL);
+	bool ExecuteOpen(const char *title = NULL)   { return Execute(true, title); }
+	bool ExecuteSaveAs(const char *title = NULL) { return Execute(false, title); }
+
+	String Get() const;
+	void  Set(const String& s)                   { filename.At(0) = s; }
+
+	operator String() const                      { return Get(); }
+	void operator=(const String& s)              { Set(s); }
+
+	String operator~() const                     { return Get(); }
+	void operator<<=(const String& s)            { Set(s); }
+
+	int   GetCount() const                       { return filename.GetCount(); }
+	const String& operator[](int i) const        { return filename[i]; }
+
+	bool   GetReadOnly() const                   { return readonly; }
+	String GetActiveDir() const                  { return activedir; }
+
+	FileSelector& Type(const char *name, const char *ext);
+	FileSelector& AllFilesType();
+	FileSelector& ActiveDir(const String& dir)   { activedir = dir; return *this; }
+	FileSelector& ActiveType(int i)              { activetype = i; return *this;  }
+	FileSelector& DefaultExt(const char *ext)    { defext = ext; return *this; }
+	FileSelector& Multi(bool b = true)           { multi = b; return *this; }
+	FileSelector& ReadOnlyOption(bool b = true)  { rdonly = b; return *this; }
+	FileSelector& Asking(bool b = true)          { asking = b; return *this; }
+	FileSelector& NoAsking()                     { return Asking(false); }
+
+	FileSelector();
+};
+
+#endif
+#endif
+
+#ifdef PLATFORM_X11
+typedef FileSel FileSelector;
+#endif
+
+class CtrlRetriever {
+public:
+	struct Item {
+		virtual void Retrieve() = 0;
+		virtual ~Item() {}
+	};
+
+private:
+	struct CtrlItem0 : Item {
+		Ctrl  *ctrl;
+	};
+
+	template <class T>
+	struct CtrlItem : CtrlItem0 {
+		T     *value;
+
+		virtual void Retrieve()  { *value = ~*ctrl; }
+		virtual ~CtrlItem() {}
+	};
+
+	Array<Item> item;
+
+public:
+	void Put(Item *newitem)                       { item.Add(newitem); }
+
+	template <class T>
+	void Put(Ctrl& ctrl, T& val);
+
+	template <class T>
+	CtrlRetriever& operator()(Ctrl& ctrl, T& val) { Put(ctrl, val); return *this; }
+
+	void Retrieve();
+
+	Callback operator<<=(Callback cb);
+};
+
+template <class T>
+void CtrlRetriever::Put(Ctrl& ctrl, T& val)
+{
+	CtrlItem<T> *m = new CtrlItem<T>();
+	m->ctrl = &ctrl;
+	m->value = &val;
+	ctrl <<= val;
+	Put(m);
+}
+
+class IdCtrls {
+	struct Item {
+		Id    id;
+		Ctrl *ctrl;
+	};
+	Array<Item> item;
+
+public:
+	void        Add(Id id, Ctrl& ctrl);
+	IdCtrls&    operator()(Id id, Ctrl& ctrl)        { Add(id, ctrl); return *this; }
+	int         GetCount() const                     { return item.GetCount(); }
+	Ctrl&       operator[](int i)                    { return *item[i].ctrl; }
+	const Ctrl& operator[](int i) const              { return *item[i].ctrl; }
+	Id          operator()(int i) const              { return item[i].id; }
+};
+
+void Set(ArrayCtrl& array, int ii, IdCtrls& m);
+void Get(ArrayCtrl& array, int ii, IdCtrls& m);
+
+void UpdateFile(String dst, String src);
+
+void MemoryProfileInfo();
diff --git a/uppsrc/CtrlLib/Ctrls.iml b/uppsrc/CtrlLib/Ctrls.iml
new file mode 100644
index 000000000..57f1b0c8d
--- /dev/null
+++ b/uppsrc/CtrlLib/Ctrls.iml
@@ -0,0 +1,309 @@
+PREMULTIPLIED
+IMAGE_ID(S0)
+IMAGE_ID(S0h)
+IMAGE_ID(S0p)
+IMAGE_ID(S0d)
+IMAGE_ID(S1)
+IMAGE_ID(S1h)
+IMAGE_ID(S1p)
+IMAGE_ID(S1d)
+IMAGE_ID(O0)
+IMAGE_ID(O0h)
+IMAGE_ID(O0p)
+IMAGE_ID(O0d)
+IMAGE_ID(O1)
+IMAGE_ID(O1h)
+IMAGE_ID(O1p)
+IMAGE_ID(O1d)
+IMAGE_ID(O2)
+IMAGE_ID(O2h)
+IMAGE_ID(O2p)
+IMAGE_ID(O2d)
+IMAGE_ID(B)
+IMAGE_ID(Bh)
+IMAGE_ID(Bp)
+IMAGE_ID(Bd)
+IMAGE_ID(EB)
+IMAGE_ID(EBh)
+IMAGE_ID(EBp)
+IMAGE_ID(EBd)
+IMAGE_ID(SB)
+IMAGE_ID(SBh)
+IMAGE_ID(SBp)
+IMAGE_ID(SBd)
+IMAGE_ID(SBHT)
+IMAGE_ID(SBHTh)
+IMAGE_ID(SBHTp)
+IMAGE_ID(SBHTd)
+IMAGE_ID(SBVT)
+IMAGE_ID(SBVTh)
+IMAGE_ID(SBVTp)
+IMAGE_ID(SBVTd)
+IMAGE_ID(OkB)
+IMAGE_ID(OkBh)
+IMAGE_ID(OkBp)
+IMAGE_ID(OkBd)
+IMAGE_ID(OBlack)
+IMAGE_ID(SBlack)
+IMAGE_ID(SizeGrip)
+IMAGE_ID(kDA)
+IMAGE_ID(kUA)
+IMAGE_ID(kLA)
+IMAGE_ID(kRA)
+IMAGE_ID(kSpU)
+IMAGE_ID(kSpD)
+IMAGE_ID(DA)
+IMAGE_ID(UA)
+IMAGE_ID(LA)
+IMAGE_ID(RA)
+IMAGE_ID(SpU)
+IMAGE_ID(SpD)
+IMAGE_ID(SBVU)
+IMAGE_ID(SBVUh)
+IMAGE_ID(SBVUp)
+IMAGE_ID(SBVUd)
+IMAGE_ID(SBVL)
+IMAGE_ID(SBVLh)
+IMAGE_ID(SBVLp)
+IMAGE_ID(SBVLd)
+IMAGE_ID(SBHU)
+IMAGE_ID(SBHUh)
+IMAGE_ID(SBHUp)
+IMAGE_ID(SBHUd)
+IMAGE_ID(SBHL)
+IMAGE_ID(SBHLh)
+IMAGE_ID(SBHLp)
+IMAGE_ID(SBHLd)
+IMAGE_ID(SBVI)
+IMAGE_ID(SBHI)
+IMAGE_ID(EFE)
+IMAGE_ID(VE)
+IMAGE_ID(HorzPos)
+IMAGE_ID(HorzSplit)
+IMAGE_ID(HTB)
+IMAGE_ID(HTBh)
+IMAGE_ID(HTBp)
+IMAGE_ID(HTBd)
+IMAGE_ID(PI)
+IMAGE_ID(VPI)
+IMAGE_ID(PIC)
+IMAGE_ID(VPIC)
+IMAGE_ID(TAB)
+IMAGE_ID(TABh)
+IMAGE_ID(TABs)
+IMAGE_ID(TABd)
+IMAGE_ID(FTAB)
+IMAGE_ID(FTABh)
+IMAGE_ID(FTABs)
+IMAGE_ID(FTABd)
+IMAGE_ID(LTAB)
+IMAGE_ID(LTABh)
+IMAGE_ID(LTABs)
+IMAGE_ID(LTABd)
+IMAGE_ID(BTAB)
+IMAGE_ID(BTABh)
+IMAGE_ID(BTABs)
+IMAGE_ID(BTABd)
+IMAGE_ID(TABB)
+IMAGE_ID(SLA)
+IMAGE_ID(SRA)
+IMAGE_ID(TB)
+IMAGE_ID(TBh)
+IMAGE_ID(TBp)
+IMAGE_ID(TBd)
+IMAGE_ID(TB1)
+IMAGE_ID(TB1h)
+
+IMAGE_BEGIN_DATA
+IMAGE_DATA(120,156,237,155,251,83,85,215,21,199,233,76,127,108,126,237,244,15,104,127,105,126,200,76,76,166,14,62,210,198,206,132)
+IMAGE_DATA(73,198,58,78,147,88,251,131,105,213,73,70,133,24,13,38,147,162,1,95,25,27,130,216,86,20,144,32,92,158,242,136)
+IMAGE_DATA(17,231,202,67,121,8,222,81,184,50,80,31,132,151,200,67,64,30,26,139,15,176,53,93,61,223,77,215,153,195,190,123)
+IMAGE_DATA(239,115,72,17,117,122,15,179,230,206,189,231,243,221,123,237,117,214,217,126,57,94,34,158,139,120,46,226,7,214,143,124)
+IMAGE_DATA(148,149,213,208,123,239,253,153,150,46,221,68,47,190,184,142,94,121,37,154,54,110,252,156,252,254,179,20,2,91,199,199)
+IMAGE_DATA(31,167,208,226,197,209,180,115,231,17,42,43,171,166,250,250,70,139,173,163,221,187,191,164,69,139,54,209,246,237,105,36)
+IMAGE_DATA(243,43,86,124,66,129,64,19,117,116,116,80,87,87,23,245,244,244,80,111,111,47,245,247,247,83,75,203,21,113,126,199)
+IMAGE_DATA(142,105,29,242,193,248,78,30,44,162,251,122,55,13,14,14,210,240,240,48,93,186,212,46,184,138,138,6,145,63,242,145)
+IMAGE_DATA(121,176,136,145,145,17,17,227,227,227,180,119,111,22,197,196,36,137,245,34,127,240,109,157,109,74,126,120,116,152,110,223)
+IMAGE_DATA(190,77,213,213,141,180,108,217,102,81,31,172,151,243,103,158,53,224,239,220,185,35,162,181,181,157,34,35,55,136,122,162)
+IMAGE_DATA(62,242,248,96,157,252,221,187,119,169,182,246,162,152,103,195,134,207,69,61,81,31,221,248,224,239,223,191,79,159,125,230)
+IMAGE_DATA(163,205,155,147,197,28,168,63,234,137,250,240,26,100,190,179,179,79,112,167,79,7,68,189,227,226,82,69,253,81,79,212)
+IMAGE_DATA(7,235,149,249,229,203,63,177,234,155,49,227,186,226,122,161,254,168,39,234,131,245,34,127,228,131,241,101,158,15,92,47)
+IMAGE_DATA(212,31,235,68,125,240,138,252,57,31,251,152,203,134,93,186,36,134,146,183,189,79,193,148,53,116,45,115,21,53,165,252)
+IMAGE_DATA(129,146,98,183,208,18,235,115,85,195,254,246,55,31,208,141,236,55,233,95,133,203,102,196,119,133,175,210,128,111,53,173)
+IMAGE_DATA(92,190,117,70,195,98,124,240,247,78,174,23,220,183,103,62,165,241,192,65,154,168,137,23,154,135,254,245,212,239,251,189)
+IMAGE_DATA(152,143,27,22,249,240,184,96,209,220,67,125,157,52,54,216,35,222,127,119,236,85,17,95,108,139,181,27,22,249,243,248)
+IMAGE_DATA(204,179,6,205,49,85,191,75,156,191,112,112,157,221,176,88,47,207,33,243,136,201,230,52,113,190,43,235,29,187,97,131)
+IMAGE_DATA(41,239,136,207,144,191,147,31,26,25,18,241,207,115,211,243,156,63,184,222,110,216,253,177,31,216,57,99,46,104,152,199)
+IMAGE_DATA(251,127,31,251,149,136,196,216,143,236,134,69,61,6,124,191,19,245,129,110,170,97,151,200,7,227,131,125,84,190,142,250)
+IMAGE_DATA(114,214,136,70,115,54,44,234,63,96,213,19,26,231,245,129,6,252,138,55,182,42,27,22,243,125,17,251,161,168,15,214)
+IMAGE_DATA(139,252,145,207,244,134,246,20,53,108,100,100,140,85,212,12,74,76,172,161,67,135,26,105,255,254,179,180,105,83,166,248)
+IMAGE_DATA(92,213,176,175,189,246,39,193,229,228,180,81,94,94,59,21,22,118,81,81,209,53,42,41,185,78,89,89,151,197,121,103)
+IMAGE_DATA(195,98,28,39,15,22,81,80,220,78,199,143,247,211,137,19,55,40,55,247,27,193,113,195,34,31,39,15,214,201,159,60)
+IMAGE_DATA(57,68,167,78,141,88,197,241,217,13,139,252,117,60,162,204,127,195,26,127,140,14,31,110,178,27,22,121,33,127,153,7)
+IMAGE_DATA(203,124,85,213,45,202,207,239,176,27,22,245,145,243,119,242,136,234,234,59,148,158,222,108,55,108,116,244,81,81,31,85)
+IMAGE_DATA(62,204,215,214,78,208,150,45,185,118,195,162,30,217,217,87,236,245,50,91,94,57,98,243,95,125,213,103,113,51,27,22)
+IMAGE_DATA(245,71,61,81,31,206,223,201,227,188,170,97,49,31,234,153,154,26,20,235,69,254,200,7,227,63,182,134,61,127,254,60)
+IMAGE_DATA(101,100,100,88,91,251,94,138,143,143,23,175,153,153,153,212,216,216,168,156,176,160,160,64,48,121,121,121,214,36,167,169)
+IMAGE_DATA(161,161,65,188,230,230,230,210,158,61,123,172,11,83,68,50,159,156,156,76,231,206,157,163,139,23,47,134,4,244,73,73)
+IMAGE_DATA(73,84,92,92,76,156,15,198,103,190,169,169,73,228,130,87,89,135,249,130,193,160,200,31,249,240,57,176,50,207,145,147)
+IMAGE_DATA(147,99,221,36,89,98,14,228,109,226,249,179,202,202,74,218,183,111,159,168,15,230,85,141,43,235,107,107,107,69,126,206)
+IMAGE_DATA(121,220,52,21,21,21,98,30,212,31,245,116,227,17,62,159,207,106,210,108,81,35,204,229,204,143,215,133,26,241,103,245)
+IMAGE_DATA(245,245,34,175,230,230,102,81,111,92,47,212,95,183,46,240,137,137,137,84,90,90,58,227,186,226,122,97,28,212,19,245)
+IMAGE_DATA(169,171,171,19,249,35,31,124,46,243,124,32,23,212,31,235,4,135,87,228,207,249,184,54,236,179,224,97,225,49,171,90)
+IMAGE_DATA(171,60,123,216,35,103,143,208,234,175,87,83,76,93,12,69,21,69,209,177,224,49,87,15,11,254,248,224,113,74,185,150)
+IMAGE_DATA(66,113,87,227,104,97,222,66,163,135,173,106,169,18,227,51,191,182,121,45,189,80,244,2,181,246,182,106,61,108,215,245)
+IMAGE_DATA(46,145,15,243,81,129,40,122,62,251,121,26,191,61,110,244,176,5,193,2,145,15,198,7,127,234,234,41,79,30,22,246)
+IMAGE_DATA(161,165,183,197,30,63,236,97,231,193,195,34,224,49,209,176,94,60,44,120,85,195,178,175,211,121,88,85,195,154,60,172)
+IMAGE_DATA(174,97,77,30,22,243,168,26,22,94,81,231,97,145,183,170,97,225,71,77,30,22,17,246,176,17,79,198,195,250,242,47)
+IMAGE_DATA(83,82,78,185,229,1,59,60,121,216,109,25,105,244,118,201,116,195,254,58,63,138,118,230,230,27,61,44,198,7,239,108)
+IMAGE_DATA(216,5,89,11,141,30,22,249,168,26,54,251,68,179,209,195,34,31,103,195,254,236,200,207,109,143,169,243,176,9,185,121)
+IMAGE_DATA(86,62,191,16,227,131,79,42,57,233,201,195,34,255,44,43,159,176,135,157,71,15,139,64,46,240,132,78,15,103,242,176)
+IMAGE_DATA(126,191,95,204,121,224,192,1,241,90,94,94,110,244,176,24,31,92,90,90,154,29,120,111,242,176,200,7,227,203,26,120)
+IMAGE_DATA(62,157,135,197,120,242,60,24,131,61,166,206,195,34,127,232,120,77,200,199,171,135,69,62,207,188,135,93,176,224,93,250)
+IMAGE_DATA(62,209,214,214,38,162,189,189,221,242,54,157,34,224,231,250,250,250,104,96,96,192,14,248,39,175,26,241,124,241,191,158)
+IMAGE_DATA(139,53,96,153,239,238,238,14,153,3,188,172,225,177,153,119,230,227,228,199,198,198,108,13,88,126,94,169,227,249,89,38)
+IMAGE_DATA(107,48,182,204,243,58,156,225,212,200,245,113,142,141,124,192,78,76,76,136,96,141,137,71,128,189,119,239,158,8,167,134)
+IMAGE_DATA(61,190,147,117,242,15,30,60,16,193,26,121,173,206,124,152,159,154,154,18,161,210,128,103,223,107,210,204,54,230,164,97)
+IMAGE_DATA(169,246,101,207,49,23,26,83,195,234,52,166,134,213,105,76,13,171,211,152,26,214,77,163,106,16,147,70,215,176,58,141)
+IMAGE_DATA(169,97,231,242,250,204,70,243,68,26,22,126,147,195,231,187,42,124,15,188,11,60,93,113,113,143,245,207,64,175,29,139)
+IMAGE_DATA(22,69,207,208,184,241,240,92,78,141,142,119,62,87,245,251,111,218,26,175,60,60,26,107,188,242,240,116,172,241,202,159)
+IMAGE_DATA(57,243,173,173,241,202,215,212,252,195,214,120,229,235,234,238,218,26,175,124,125,253,125,91,99,226,193,50,239,212,240,115)
+IMAGE_DATA(97,149,134,117,178,6,175,94,35,164,97,19,18,18,232,251,4,124,138,215,8,107,194,26,167,102,182,241,84,123,88,124)
+IMAGE_DATA(54,27,15,27,145,16,17,162,49,121,88,240,172,145,61,44,62,195,57,21,143,80,121,88,214,176,78,230,101,13,231,230)
+IMAGE_DATA(228,56,188,120,88,153,247,234,97,85,124,216,195,62,1,15,139,11,49,27,15,203,23,91,167,49,53,172,73,163,107,88)
+IMAGE_DATA(55,141,170,97,77,30,86,215,176,110,30,86,213,176,97,15,251,4,60,44,46,132,202,195,34,116,60,66,229,97,17,56)
+IMAGE_DATA(167,226,17,42,15,139,224,243,58,94,229,97,85,13,235,197,195,154,120,147,135,213,241,97,15,59,207,30,201,201,120,209)
+IMAGE_DATA(200,140,234,189,206,119,121,25,67,87,35,157,198,84,83,211,56,186,117,154,198,10,123,216,121,124,14,187,114,247,74,109)
+IMAGE_DATA(232,158,195,154,52,186,231,176,110,26,213,115,216,217,104,120,173,38,141,206,195,154,52,58,15,107,210,132,61,236,99,244)
+IMAGE_DATA(176,166,194,135,53,115,171,9,123,216,57,240,176,166,194,235,158,195,154,52,186,231,176,38,141,238,57,172,73,163,243,176)
+IMAGE_DATA(38,141,206,195,154,52,58,15,107,210,132,61,236,99,244,72,94,114,9,107,230,70,243,212,121,216,31,69,252,56,226,135)
+IMAGE_DATA(214,15,14,124,55,19,95,66,8,4,2,218,137,112,14,12,179,223,92,105,160,53,155,247,82,228,202,173,244,147,151,254)
+IMAGE_DATA(56,35,150,188,249,17,173,223,150,68,195,131,29,194,199,64,11,22,209,208,248,119,225,171,248,24,26,26,162,64,240,138)
+IMAGE_DATA(224,17,240,57,152,15,227,130,213,29,127,73,57,40,230,193,1,30,243,98,220,71,143,30,41,35,51,243,144,96,156,60)
+IMAGE_DATA(142,135,15,31,42,163,164,48,77,201,79,78,78,42,67,199,179,175,148,67,199,179,119,149,67,199,243,223,104,201,161,227)
+IMAGE_DATA(111,221,186,165,12,29,63,58,58,170,12,29,127,243,230,77,101,232,120,92,127,85,232,120,249,191,192,57,116,60,126,95)
+IMAGE_DATA(80,133,142,231,223,151,228,80,241,200,179,181,181,85,25,71,143,166,206,224,209,171,232,115,124,153,75,21,127,59,124,152)
+IMAGE_DATA(126,185,42,78,240,184,95,248,126,64,159,227,75,81,248,130,16,34,61,61,93,176,27,227,14,137,192,253,130,251,113,232)
+IMAGE_DATA(70,135,224,49,143,124,63,98,92,176,147,15,166,127,175,192,61,140,87,104,117,7,206,49,251,63,111,22,8,183,205,2)
+IMAGE_DATA(191,12,134,108,22,133,241,212,87,185,131,40,184,93,68,255,233,79,41,80,188,75,189,89,88,44,149,45,14,137,209,47)
+IMAGE_DATA(127,74,197,7,214,134,108,22,98,92,48,210,1,190,46,245,173,208,230,64,14,22,47,111,44,224,219,178,95,215,242,242)
+IMAGE_DATA(198,226,198,203,27,133,27,47,111,20,110,188,124,227,187,241,33,55,191,11,47,223,248,110,188,124,227,187,241,242,141,239)
+IMAGE_DATA(198,203,55,190,27,47,223,248,110,188,124,227,235,120,244,46,120,249,198,7,127,54,109,85,232,102,97,245,57,206,169,162)
+IMAGE_DATA(244,175,239,42,55,11,244,57,122,23,243,35,48,46,88,121,179,192,189,230,182,89,112,63,61,51,155,69,169,191,92,188)
+IMAGE_DATA(231,11,135,226,126,93,94,165,220,44,192,234,118,122,104,228,205,194,57,174,28,152,71,190,216,58,150,35,204,255,255,241)
+IMAGE_DATA(248,235,44,85,168,120,244,20,63,133,149,227,194,133,11,33,155,5,122,86,199,151,85,214,40,55,11,104,48,15,231,140)
+IMAGE_DATA(113,193,206,231,102,241,31,129,78,254,41,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0)
+IMAGE_END_DATA(2496, 23)
+
+IMAGE_BEGIN_DATA
+IMAGE_DATA(120,156,237,153,219,79,26,65,24,197,55,182,79,141,233,83,211,244,175,236,95,209,151,62,52,125,181,166,15,62,216,164)
+IMAGE_DATA(141,166,177,105,12,94,17,196,11,119,22,80,139,70,5,4,68,20,235,165,181,125,220,242,217,140,193,111,102,216,51,184)
+IMAGE_DATA(169,91,217,37,191,184,204,156,179,27,216,153,79,206,140,53,108,61,183,30,119,94,116,84,42,21,167,31,66,161,144,51)
+IMAGE_DATA(49,49,225,140,141,141,221,130,218,168,143,107,9,219,182,157,82,169,116,211,78,231,212,38,250,69,59,93,131,218,117,247)
+IMAGE_DATA(166,62,210,136,247,116,223,238,235,114,168,143,52,221,122,183,207,23,232,3,125,47,189,201,120,51,29,207,166,243,69,120)
+IMAGE_DATA(208,249,104,130,245,212,122,97,13,117,94,116,56,119,56,82,59,231,206,200,244,1,4,105,197,33,222,35,144,182,219,151)
+IMAGE_DATA(220,62,131,224,190,68,233,59,4,247,197,191,157,66,112,223,250,86,27,130,251,214,54,79,32,36,223,198,49,4,247,173)
+IMAGE_DATA(22,91,16,220,183,82,60,130,224,190,88,161,9,193,125,203,249,67,8,201,103,55,32,184,47,154,171,67,112,95,36,91)
+IMAGE_DATA(131,224,190,165,12,6,247,133,211,85,8,217,87,129,144,62,95,106,7,66,122,14,169,77,8,105,156,165,114,16,221,190)
+IMAGE_DATA(126,235,82,63,135,47,138,105,163,253,27,130,127,185,245,147,95,16,94,249,106,199,87,16,94,249,14,90,63,33,188,242)
+IMAGE_DATA(85,143,126,64,120,231,187,132,224,190,74,243,18,66,246,93,64,112,95,249,240,2,66,246,157,67,112,223,126,227,28,66)
+IMAGE_DATA(246,157,65,120,230,171,181,32,36,223,65,29,66,242,85,202,16,3,93,76,223,126,202,66,240,47,55,240,5,190,192,119)
+IMAGE_DATA(127,190,209,169,28,4,247,125,152,177,33,184,239,75,52,15,225,139,98,26,137,68,156,126,217,44,166,157,201,143,239,32)
+IMAGE_DATA(72,43,124,226,61,2,105,187,125,27,133,20,4,247,21,243,73,8,238,43,216,9,8,238,203,231,226,16,220,103,103,215)
+IMAGE_DATA(33,36,95,102,13,130,251,114,233,85,8,238,203,166,87,32,184,47,147,138,65,112,95,58,185,12,33,249,18,81,8,238)
+IMAGE_DATA(75,197,35,16,220,151,92,95,130,224,190,196,90,24,130,251,226,171,139,16,178,111,1,66,246,205,67,200,159,111,14,66)
+IMAGE_DATA(122,14,235,179,16,221,190,126,235,82,63,88,180,193,242,168,243,162,163,221,42,57,253,240,126,114,209,121,53,58,237,188)
+IMAGE_DATA(124,253,249,22,212,70,125,92,75,236,84,14,157,246,217,229,77,85,167,115,106,19,253,66,79,215,160,246,176,221,86,146)
+IMAGE_DATA(45,100,174,53,66,79,247,165,107,45,230,78,148,236,237,21,254,106,186,244,116,44,230,142,149,220,92,147,233,23,178,45)
+IMAGE_DATA(37,94,233,231,51,71,74,244,250,166,18,189,254,80,137,78,63,151,110,40,241,74,63,155,170,43,209,235,107,74,188,210)
+IMAGE_DATA(135,51,101,37,42,61,141,183,88,110,87,9,31,111,98,60,199,11,37,37,124,60,139,249,64,237,116,45,209,78,231,212)
+IMAGE_DATA(198,231,139,233,124,52,225,191,41,22,251,205,43,37,186,98,161,211,235,138,133,78,175,27,76,129,254,97,235,203,205,11)
+IMAGE_DATA(37,186,98,81,109,158,42,209,21,139,90,179,165,36,40,22,138,98,177,146,78,59,246,102,222,217,43,111,93,67,231,212)
+IMAGE_DATA(166,42,22,212,254,166,147,185,85,80,31,47,22,116,45,157,158,250,248,195,166,251,235,244,212,23,232,7,79,63,66,107)
+IMAGE_DATA(53,10,84,122,26,83,227,51,182,18,62,222,196,120,158,138,230,149,240,241,108,58,95,124,95,44,98,145,41,39,244,117)
+IMAGE_DATA(92,202,72,212,70,125,92,75,236,110,39,156,122,213,190,105,167,115,106,19,253,162,157,174,65,237,186,24,66,125,164,17)
+IMAGE_DATA(122,186,47,93,75,23,67,168,143,52,221,122,250,219,43,134,168,244,189,98,133,23,250,94,49,68,173,215,199,16,181,94)
+IMAGE_DATA(31,67,84,250,94,177,194,11,125,175,24,162,214,235,99,133,23,250,94,49,132,235,105,76,233,98,8,31,111,98,60,235)
+IMAGE_DATA(98,8,31,207,166,243,197,116,62,26,21,139,39,157,98,49,212,71,177,64,170,23,26,57,208,117,9,116,61,2,93,135)
+IMAGE_DATA(64,215,19,76,117,110,235,13,232,58,3,186,190,128,174,19,152,234,220,214,17,208,245,0,83,157,219,122,1,186,78,128)
+IMAGE_DATA(174,15,152,252,212,247,242,191,182,175,38,159,91,206,71,243,61,154,251,2,157,63,117,110,249,27,205,221,104,222,126,208)
+IMAGE_DATA(147,207,45,15,160,185,25,205,203,104,142,10,116,254,212,185,229,89,52,199,162,249,213,36,183,250,98,242,33,191,131,209)
+IMAGE_DATA(223,215,104,14,69,243,39,154,59,209,252,104,170,115,203,151,104,174,68,243,36,154,11,77,117,110,185,17,205,127,166,58)
+IMAGE_DATA(183,124,136,230,66,52,15,154,228,64,47,243,159,53,108,61,235,76,189,161,91,147,47,216,119,14,246,157,239,170,15,246)
+IMAGE_DATA(157,255,253,190,243,189,77,102,183,188,200,191,92,183,220,200,31,158,223,246,37,3,253,253,234,7,97,95,216,179,201,28)
+IMAGE_DATA(236,219,6,122,63,235,7,97,223,246,15,245,87,120,90,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0)
+IMAGE_END_DATA(1152, 16)
+
+IMAGE_BEGIN_DATA
+IMAGE_DATA(120,156,237,90,223,79,28,85,20,30,160,13,160,248,96,82,27,255,0,95,124,52,241,201,104,226,139,47,250,164,182,233)
+IMAGE_DATA(155,137,198,248,208,23,147,38,245,165,182,146,38,141,177,6,99,52,54,214,40,161,214,31,141,11,129,96,113,161,148,117)
+IMAGE_DATA(149,108,64,86,126,164,42,89,8,1,182,44,200,238,150,165,44,11,101,113,155,227,124,3,151,206,189,123,239,220,153,133)
+IMAGE_DATA(45,44,236,185,249,50,51,247,126,247,59,103,238,156,123,118,55,59,70,157,113,196,168,50,42,13,216,157,120,132,128,222)
+IMAGE_DATA(96,27,249,127,254,142,154,175,93,230,128,62,140,49,30,227,2,19,99,127,80,44,58,178,213,143,115,244,177,113,214,15)
+IMAGE_DATA(13,244,7,70,238,72,129,49,112,24,31,126,161,213,51,156,148,2,99,224,216,249,56,246,12,39,164,176,115,236,231,55)
+IMAGE_DATA(135,226,82,236,20,191,123,112,94,10,53,255,95,41,212,252,57,41,84,252,27,127,206,74,177,83,252,174,112,76,10,53)
+IMAGE_DATA(127,70,138,157,226,7,6,167,164,144,241,145,83,189,195,19,82,136,249,198,242,185,255,86,68,10,49,159,189,238,23,47)
+IMAGE_DATA(251,209,168,51,142,26,135,204,6,155,158,158,166,112,56,76,161,80,136,130,193,160,20,24,3,135,113,129,55,222,189,64)
+IMAGE_DATA(207,189,122,138,158,124,246,77,14,47,28,123,143,222,62,221,64,147,147,147,148,78,167,173,185,224,2,95,53,221,164,230)
+IMAGE_DATA(214,65,10,4,38,45,180,180,13,209,215,223,254,106,241,129,181,181,53,203,31,116,193,109,108,28,202,195,197,143,58,232)
+IMAGE_DATA(252,135,77,150,31,24,248,240,11,93,140,139,6,254,199,13,63,88,28,59,31,254,193,207,229,114,28,192,255,226,243,102)
+IMAGE_DATA(37,63,155,205,114,208,241,87,87,87,57,232,248,203,203,203,28,116,252,165,165,37,14,58,126,42,149,226,160,227,39,147)
+IMAGE_DATA(73,14,58,126,60,30,231,160,227,207,205,205,113,208,241,99,177,24,7,29,63,26,141,114,208,241,71,71,71,57,168,248)
+IMAGE_DATA(200,93,240,7,6,6,56,128,223,240,201,143,28,31,185,138,60,199,152,12,23,46,94,165,23,79,156,177,248,216,47,108)
+IMAGE_DATA(63,32,207,145,187,240,15,64,23,220,147,103,46,89,192,126,193,94,196,94,3,31,126,196,253,8,93,112,177,23,1,236)
+IMAGE_DATA(97,28,49,87,101,24,99,220,93,43,22,189,215,62,160,104,215,89,162,240,251,22,110,119,159,163,144,239,188,180,88,128)
+IMAGE_DATA(75,237,207,231,33,241,205,83,228,251,244,173,188,98,97,233,130,35,24,248,193,47,143,231,61,108,43,6,147,47,22,11)
+IMAGE_DATA(240,71,175,188,172,228,139,197,66,199,207,100,50,28,116,124,246,80,25,116,252,133,133,5,14,58,126,34,145,224,161,225)
+IMAGE_DATA(207,207,207,115,208,241,197,205,175,227,207,204,204,112,208,241,197,205,175,227,71,34,17,14,58,254,200,200,8,7,21,31)
+IMAGE_DATA(185,11,126,95,95,31,7,240,127,187,124,34,175,88,32,207,49,38,67,203,103,239,72,139,5,242,28,185,11,255,0,116)
+IMAGE_DATA(193,61,16,197,162,165,195,111,93,179,7,135,197,109,243,223,144,22,11,112,197,7,205,128,57,98,177,176,235,138,128,31)
+IMAGE_DATA(241,97,171,184,12,101,254,193,227,143,141,141,73,33,227,35,167,198,199,199,165,232,239,239,207,43,22,200,89,21,191,189)
+IMAGE_DATA(43,32,45,22,152,3,63,44,102,232,130,187,171,197,162,16,248,253,126,242,249,124,212,212,212,196,1,125,24,19,185,0)
+IMAGE_DATA(42,53,110,154,245,227,28,125,108,156,245,67,3,253,42,223,24,3,135,93,195,175,93,87,4,198,192,177,243,117,247,87)
+IMAGE_DATA(230,151,249,78,124,47,249,230,53,159,189,238,23,54,199,237,126,244,2,227,49,179,85,152,173,108,101,43,9,43,39,108)
+IMAGE_DATA(217,74,202,234,204,86,76,235,188,126,149,58,175,95,33,79,252,14,247,124,24,190,99,122,143,204,193,191,45,94,93,252)
+IMAGE_DATA(44,94,22,131,155,248,197,120,183,19,191,46,94,233,181,36,94,47,241,203,236,118,116,130,140,234,205,239,245,155,70,14)
+IMAGE_DATA(80,141,171,230,203,140,239,23,156,171,137,122,7,94,2,222,192,33,211,189,11,231,238,196,212,193,201,131,21,156,171,238)
+IMAGE_DATA(70,118,119,94,2,145,235,31,54,170,100,159,120,186,103,153,239,76,16,242,178,44,188,195,90,115,57,42,54,255,181,246)
+IMAGE_DATA(96,186,44,115,155,165,94,2,118,202,126,149,190,251,248,53,11,225,70,208,109,96,197,90,24,167,56,221,215,168,106,115)
+IMAGE_DATA(41,10,88,8,175,117,105,59,117,172,216,227,27,166,88,136,221,12,236,97,45,48,111,219,172,90,15,206,21,85,75,117)
+IMAGE_DATA(174,174,90,143,219,162,193,255,245,11,137,113,74,37,39,104,113,97,138,238,166,162,180,180,24,163,229,165,57,202,164,231)
+IMAGE_DATA(105,101,57,73,171,43,11,116,111,245,46,101,215,210,180,158,93,161,255,214,239,81,46,183,78,247,239,231,54,62,204,139)
+IMAGE_DATA(42,136,55,12,218,90,26,233,151,246,239,169,219,239,163,96,79,59,133,126,239,164,129,254,0,13,15,134,232,159,191,194)
+IMAGE_DATA(52,30,185,69,83,147,17,154,157,153,162,68,124,150,22,83,73,202,100,210,148,205,174,61,132,8,247,190,224,222,92,195)
+IMAGE_DATA(10,83,178,116,4,119,100,13,75,235,150,15,200,26,214,152,141,21,86,229,63,11,182,31,78,207,156,12,145,10,165,62)
+IMAGE_DATA(223,92,10,199,47,48,121,102,77,82,28,97,165,126,100,73,33,59,154,31,200,15,62,146,95,122,237,52,217,33,237,59)
+IMAGE_DATA(108,182,202,205,213,21,7,25,236,102,239,99,158,157,120,121,14,143,152,155,165,214,124,168,110,76,149,47,133,218,166,6)
+IMAGE_DATA(49,233,253,166,39,206,113,210,211,233,203,214,92,167,167,210,100,243,10,136,79,59,71,146,35,174,198,68,173,237,66,166)
+IMAGE_DATA(185,221,248,138,177,126,246,113,175,122,42,45,97,190,151,248,60,153,147,94,33,86,10,122,66,126,56,219,81,179,184,62)
+IMAGE_DATA(82,96,113,117,237,196,133,174,93,222,216,225,197,221,171,186,78,27,80,165,235,102,67,21,170,171,210,214,196,226,38,94)
+IMAGE_DATA(101,191,161,72,43,153,174,140,99,215,182,247,57,65,156,175,227,22,43,222,98,174,175,125,188,80,93,149,166,160,83,72)
+IMAGE_DATA(188,158,204,141,110,33,86,138,186,138,188,114,182,42,243,43,59,251,65,132,9,236,205,24,213,185,248,10,106,107,107,171)
+IMAGE_DATA(5,207,66,236,197,116,192,254,130,110,158,16,188,176,201,178,115,123,52,246,119,102,188,71,100,59,231,132,170,205,134,223)
+IMAGE_DATA(66,204,240,59,255,248,235,175,108,1,215,172,191,254,236,41,238,1,224,154,241,101,198,52,10,25,115,242,231,20,231,254)
+IMAGE_DATA(187,161,26,227,209,173,191,238,48,233,111,69,99,246,147,162,49,59,167,104,204,142,41,26,179,167,21,141,153,161,104,110)
+IMAGE_DATA(231,235,252,235,226,215,221,191,211,250,153,75,93,99,229,144,83,221,145,25,4,224,4,129,32,88,220,16,110,26,71,92)
+IMAGE_DATA(163,31,227,204,217,126,229,122,49,163,214,120,130,219,170,176,250,250,122,178,67,172,233,232,19,235,180,157,39,27,23,121)
+IMAGE_DATA(101,78,153,179,23,56,91,27,160,210,172,59,229,13,80,230,28,52,142,245,170,129,211,39,128,83,226,235,28,49,141,189)
+IMAGE_DATA(50,166,90,12,224,127,88,40,37,162,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0)
+IMAGE_END_DATA(1632, 53)
+
+IMAGE_BEGIN_DATA
+IMAGE_DATA(120,156,237,150,223,75,2,65,16,199,183,196,126,188,22,245,247,250,111,4,61,24,244,16,20,36,20,244,22,66,65,16)
+IMAGE_DATA(20,101,101,26,234,233,101,154,89,98,89,47,33,92,59,171,35,59,227,221,37,62,89,59,123,124,112,119,190,223,187,61)
+IMAGE_DATA(119,103,111,87,45,171,53,149,208,151,93,82,169,84,96,163,88,129,88,58,157,38,216,190,48,157,251,196,35,158,89,240)
+IMAGE_DATA(168,105,23,64,54,155,37,240,5,192,117,238,19,143,120,102,193,35,11,64,60,78,123,212,162,94,2,113,11,32,46,241)
+IMAGE_DATA(127,235,8,159,49,235,26,48,245,151,64,206,130,226,249,15,30,217,10,197,227,180,71,22,128,120,156,246,56,117,22,140)
+IMAGE_DATA(26,12,64,206,130,226,113,218,35,91,161,120,156,246,200,2,16,143,211,30,57,11,14,145,179,160,120,156,246,232,47,193)
+IMAGE_DATA(162,154,211,87,82,95,60,241,57,179,178,162,227,80,11,195,63,20,81,198,86,243,48,198,227,65,72,60,136,136,71,249)
+IMAGE_DATA(227,158,79,223,39,228,165,227,110,136,235,36,238,197,162,254,204,164,207,167,101,108,148,151,212,186,154,215,87,82,173,154)
+IMAGE_DATA(246,73,54,19,28,29,108,7,123,59,27,6,168,67,12,53,192,175,222,5,237,151,170,1,234,24,7,47,180,191,62,219)
+IMAGE_DATA(132,195,204,214,232,153,112,79,239,163,69,216,223,221,28,245,7,254,247,110,147,128,26,234,221,206,19,129,235,157,183,71)
+IMAGE_DATA(2,215,95,219,53,2,215,219,45,143,192,245,214,115,133,192,245,102,163,68,224,122,163,254,64,224,122,221,47,16,184,238)
+IMAGE_DATA(215,242,4,174,215,188,91,2,215,189,114,142,192,245,74,233,154,192,245,226,253,57,193,214,97,126,239,114,167,4,156,95)
+IMAGE_DATA(204,143,171,139,99,2,230,7,230,17,180,225,30,0,234,24,255,45,63,245,146,28,36,115,130,37,115,88,18,223,220,156)
+IMAGE_DATA(25,236,228,133,118,217,203,27,160,142,29,21,138,151,163,56,212,177,115,140,33,18,159,60,94,169,14,176,227,48,182,85)
+IMAGE_DATA(157,208,0,142,51,206,139,239,231,13,56,47,81,243,24,53,239,227,159,190,164,201,150,132,102,133,100,11,207,20,40,118)
+IMAGE_DATA(150,216,5,51,164,215,235,154,54,252,226,191,177,139,203,177,126,255,155,196,248,88,133,141,105,216,216,135,205,145,217,191)
+IMAGE_DATA(236,34,251,151,236,95,127,117,255,250,1,96,153,229,142,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0)
+IMAGE_END_DATA(544, 22)
diff --git a/uppsrc/CtrlLib/DateTimeCtrl.cpp b/uppsrc/CtrlLib/DateTimeCtrl.cpp
new file mode 100644
index 000000000..e8a9a6297
--- /dev/null
+++ b/uppsrc/CtrlLib/DateTimeCtrl.cpp
@@ -0,0 +1,1478 @@
+#include <CtrlLib/CtrlLib.h>
+
+NAMESPACE_UPP
+
+const Point Calendar::nullday = Point(-1, -1);
+
+void DrawBg(Draw& w, int x, int y, int cx, int cy, Color c)
+{
+	Image bg = CtrlImg::Bg();
+	Image nbg = Colorize(bg, c, 150);
+	w.DrawImage(x, y, cx, cy, nbg);
+}
+
+void PopUpCtrl::PopUp(Ctrl *owner, const Rect& rt)
+{
+	Close();
+	Reset();
+	SetRect(rt);
+	Ctrl::PopUp(owner, true, true, GUI_DropShadows());
+}
+
+void PopUpCtrl::Deactivate()
+{
+	if(WhenDeactivate)
+	{
+		WhenDeactivate();
+	}
+	else if(IsOpen() && IsPopUp())
+	{
+		WhenPopDown();
+		IgnoreMouseClick();
+		Close();
+	}
+}
+
+bool PopUpCtrl::IsPopUp() const
+{
+	return popup || Ctrl::IsPopUp();
+}
+
+void PopUpCtrl::SetPopUp(bool b /* = true*/)
+{
+	popup = b;
+}
+
+Calendar::Calendar()
+{
+	SetFrame(BlackFrame());
+
+	Add(spin_year);
+	Add(spin_month);
+	Add(spin_all);
+
+	spin_month.SetCallbacks(THISBACK(OnMonthLeft), THISBACK(OnMonthRight));
+	spin_month.SetTips(t_("Previous month"), t_("Next month"));
+	spin_year.SetCallbacks(THISBACK(OnYearLeft), THISBACK(OnYearRight));
+	spin_year.SetTips(t_("Previous year"), t_("Next year"));
+	spin_all.SetCallbacks(THISBACK(OnMonthLeft), THISBACK(OnMonthRight));
+	spin_all.SetTips(t_("Previous month"), t_("Next month"));
+
+	time_mode = false;
+	swap_month_year = false;
+	one_button = false;
+	first_day = MONDAY;
+	selall = true;
+	bs = 5;
+	style = NULL;
+
+	Reset();
+}
+
+void Calendar::Reset()
+{
+	today = GetSysTime();
+	view = today;
+	view.day = 0;
+	sel = today;
+
+	istoday = false;
+	wastoday = false;
+
+	newday = oldday = nullday;
+	stoday = Format("%s: %s", t_("Today"), time_mode ? Format(today) : Format(Date(today)));
+
+	UpdateFields();
+}
+
+Calendar& Calendar::SetStyle(const Style& s)
+{
+	style = &s;
+	Refresh();
+	return *this;
+}
+
+void Calendar::OnMonthLeft()
+{
+	if(--view.month < 1)
+	{
+		view.month = 12;
+		if(view.year > 0)
+			view.year--;
+	}
+	UpdateFields();
+}
+
+void Calendar::OnMonthRight()
+{
+	if(++view.month > 12)
+	{
+		view.month = 1;
+		view.year++;
+	}
+	UpdateFields();
+}
+
+void Calendar::OnYearLeft()
+{
+	if(view.year > 0) view.year--;
+	UpdateFields();
+}
+
+void Calendar::OnYearRight()
+{
+	view.year++;
+	UpdateFields();
+}
+
+void Calendar::UpdateFields()
+{
+	String month = MonthName(view.month - 1);
+	String year = AsString(view.year);
+	spin_month.SetText(month);
+	spin_year.SetText(year);
+	if(swap_month_year)
+		spin_all.SetText(month + " " + year);
+	else
+		spin_all.SetText(year + " " + month);
+	Refresh();
+}
+
+int	Calendar::DayOfWeek(int day, int month, int year, int zelleroffset)
+{
+	if(month < 3)
+	{
+		month += 12 ;
+		year -= 1 ;
+    }
+
+	int n1 = (26 * (month + 1)) / 10;
+	int n2 = (125 * year) / 100;
+
+	return ((day + n1 + n2 - (year / 100) + (year / 400) - zelleroffset) % 7);
+}
+
+int Calendar::WeekOfYear(int day, int month, int year) /* ISO-8601 */
+{
+	const static int mnth[12] = {0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334};
+	int weeknum;
+
+	bool cleapyear = IsLeapYear(year);
+	bool bleapyear = IsLeapYear(year - 1);
+
+	int daynum = day + mnth[month - 1];
+	if(cleapyear && month > 2)
+		daynum += 1;
+
+	int yy = (year - 1) % 100;
+	int c = (year - 1) - yy;
+	int g = yy + yy / 4;
+	int jan1weekday = 1 + (((((c / 100) % 4) * 5) + g) % 7);
+	int h = daynum + (jan1weekday - 1);
+	int weekday = 1 + ((h -1) % 7);
+
+	int yearnum;
+
+	if(daynum <= (8 - jan1weekday) && jan1weekday > 4)
+	{
+		yearnum = year - 1;
+		if(jan1weekday == 5 || (jan1weekday == 6 && bleapyear))
+			weeknum = 53;
+		else
+			weeknum = 52;
+	}
+	else
+		yearnum = year;
+
+	if(yearnum == year)
+	{
+		int yeardays = cleapyear ? 366 : 365;
+		if((yeardays - daynum) < (4 - weekday))
+		{
+			yearnum = year + 1;
+			weeknum = 1;
+		}
+	}
+	if(yearnum == year)
+	{
+		int fday = daynum + (7 - weekday) + (jan1weekday -1);
+		weeknum = fday / 7;
+		if(jan1weekday > 4)
+			weeknum -= 1;
+	}
+
+	return weeknum;
+}
+
+void Calendar::LeftDown(Point p, dword keyflags)
+{
+	bool isnewday = newday != nullday;
+	int day = 1;
+	bool refall = false;
+	if(isnewday)
+	{
+		day = Day(newday);
+		if(!selall && day < 0) return;
+
+		if(day < 0)
+		{
+			view.day = -day;
+			if(lastrow < 3)
+				view.month--;
+			else
+				view.month++;
+
+			if(view.month < 1)
+			{
+				view.month = 12;
+				view.year--;
+			}
+			if(view.month > 12)
+			{
+				view.month = 1;
+				view.year++;
+			}
+			refall = true;
+		}
+	}
+	else if(!istoday)
+		return;
+
+	Time tm = istoday ? today : view;
+
+	if(time_mode)
+		WhenTime(tm);
+	else
+	{
+		tm.hour = 0;
+		tm.minute = 0;
+		tm.second = 0;
+	}
+
+	if(PopUpCtrl::IsPopUp())
+	{
+		sel = tm;
+		Deactivate();
+		WhenAction();
+	}
+	else
+	{
+		sel = tm;
+		WhenAction();
+
+		if(refall)
+		{
+			view.day = 0;
+			Refresh();
+			Sync();
+			oldday = nullday;
+			MouseMove(p, 0);
+			return;
+		}
+
+		RefreshDay(prevday);
+		if(istoday)
+			SetDate(tm);
+		else
+			RefreshDay(newday);
+	}
+}
+
+void Calendar::MouseMove(Point p, dword keyflags)
+{
+	newday = GetDay(p);
+	if(newday != oldday)
+	{
+		if(oldday != nullday)
+		{
+			bool b = (selall == false ? Day(oldday) > 0 : true);
+			if(b)
+			{
+				view.day = 0;
+				RefreshDay(oldday);
+			}
+		}
+		if(newday != nullday)
+		{
+			bool b = (selall == false ? Day(newday) > 0 : true);
+			if(b)
+			{
+				view.day = Day(newday);
+				RefreshDay(newday);
+			}
+		}
+		oldday = newday;
+	}
+	istoday = MouseOnToday(p);
+	if(istoday != wastoday)
+	{
+		wastoday = istoday;
+		RefreshToday();
+	}
+}
+
+Image Calendar::CursorImage(Point p, dword keyflags)
+{
+	bool b = (selall == false ? Day(newday) > 0 : true);
+	if((newday != nullday && b) || istoday)
+		return CtrlImg::HandCursor();
+	else
+		return Image::Arrow();
+}
+
+bool Calendar::MouseOnToday(Point p)
+{
+	Size sz = GetSize();
+	int x0 = (sz.cx - sztoday.cx) / 2;
+	int x1 = x0 + sztoday.cx;
+	int y0 = sz.cy - (rh + sztoday.cy) / 2;
+	int y1 = y0 + sztoday.cy;
+	return (p.x >= x0 && p.x <= x1 && p.y >= y0 && p.y <= y1);
+}
+
+void Calendar::RefreshDay(Point p)
+{
+	col = p.x;
+	row = p.y;
+
+	int y0 = 2 + (int)((p.y + 2) * rowh);
+	int x0 = bs + 2 + (int)((p.x + 1) * colw);
+
+	Refresh(x0, y0, cw, rh);
+}
+
+void Calendar::RefreshToday()
+{
+	Size sz = GetSize();
+	Refresh(0, sz.cy - ts, sz.cx, ts);
+}
+
+void Calendar::RefreshHeader()
+{
+	Size sz = GetSize();
+	Refresh(0, 0, sz.cx, hs);
+}
+
+Point Calendar::GetDay(Point p)
+{
+	for(int i = 0; i < rows; i++)
+	{
+		int y0 = 2 + (int)((i + 2) * rowh);
+		int y1 = y0 + rh;
+
+		if(p.y >= y0 && p.y < y1)
+		for(int j = 0; j < cols; j++)
+		{
+			int x0 = bs + 2 + (int)((j + 1) * colw);
+			int x1 = x0 + cw;
+			if(p.x >= x0 && p.x < x1)
+				return Point(j, i);
+		}
+	}
+	return Point(-1, -1);
+}
+
+Size Calendar::ComputeSize()
+{
+	const Style &st = style ? *style : StyleDefault();
+	Font fnt = st.font;
+	spin_all.SetFont(fnt);
+	spin_month.SetFont(fnt);
+	spin_year.SetFont(fnt);
+
+	Size sz = IsPopUp() ? Size(-1, -1) : GetSize();
+	Size tsz = GetTextSize("WW", fnt.NoBold().NoUnderline());
+	Size rsz;
+
+	fh = tsz.cy;
+
+	colw = (float)(tsz.cx + 6);
+	rowh = (float)(tsz.cy + 4);
+	hs = tsz.cy + 4;
+
+	rsz.cx = bs * 2 + 2 + (int)(colw * (cols + 1));
+	rsz.cy = 4 + (int)(rowh * (rows + 3));
+
+	if(sz.cx > rsz.cx)
+	{
+		colw = (sz.cx - bs * 2 + 2) / (float) (cols + 1);
+		rsz.cx = sz.cx;
+	}
+	if(sz.cy > rsz.cy)
+	{
+		rowh = (sz.cy - 4) / (float) (rows + 3);
+		rsz.cy = sz.cy;
+	}
+
+	cw = (int)(colw);
+	rh = (int)(rowh);
+
+	ts = rh;
+
+	return rsz;
+}
+
+void Calendar::Paint(Draw &w)
+{
+	const Style &st = style ? *style : StyleDefault();
+	Font fnt = st.font;
+
+	Size sz = GetSize();
+
+	Size tsz;
+	String str;
+	int d = 1;
+	int m = view.month;
+	int y = view.year;
+
+	if(w.IsPainting(0, 0, sz.cx, hs))
+	{
+		DrawBg(w, 0, 0, sz.cx, hs, st.header);
+		curdate = Format("%s %d", MonthName(view.month - 1), view.year);
+	}
+	w.DrawRect(0, hs, sz.cx, sz.cy - ts - hs, st.bgmain);
+
+	if(w.IsPainting(0, hs, sz.cx, rh))
+	{
+		int y = (int) (rowh + (rowh - fh) / 2.0);
+		fnt.NoBold().NoUnderline();
+		tsz = GetTextSize(t_("Wk"), fnt);
+		w.DrawText(bs + (cw - tsz.cx) / 2, y, t_("Wk"), fnt, st.week);
+
+		for(int i = 0; i < cols; i++)
+		{
+			const String &s = DyName((i + first_day) % 7);
+			tsz = GetTextSize(s, fnt);
+			w.DrawText(bs  + 2 + (int)((i + 1) * colw) + (cw - tsz.cx) / 2, y, s, fnt, st.dayname);
+		}
+	}
+
+	if(w.IsPainting(0, sz.cy - ts, sz.cx, ts))
+	{
+		sztoday = GetTextSize(stoday, fnt.Bold().Underline(istoday));
+		w.DrawRect(0, sz.cy - ts, sz.cx, ts, st.bgtoday);
+		w.DrawText((sz.cx - sztoday.cx) / 2, sz.cy - (ts + sztoday.cy) / 2, stoday, fnt, istoday ? st.selecttoday : st.today);
+	}
+
+	int fd = DayOfWeek(1, view.month, view.year);
+
+	if(fd > 0)
+	{
+		if(--m < 1)
+		{
+			m = 12;
+			y -= 1;
+		}
+		d = GetDaysOfMonth(m, y) - fd + 1;
+	}
+
+	for(int i = 0; i < rows; i++)
+	{
+		int yp = 2 + (int) ((i + 2) * rowh);
+		int yc = (rh - fh) / 2;
+
+		str = AsString(WeekOfYear(d, m, y));
+		w.DrawText(bs + (cw - GetTextSize(str, fnt).cx) / 2, yp + yc, str, fnt.NoBold().NoUnderline(), st.week);
+
+		for(int j = 0; j < cols; j++)
+		{
+			int xp = bs + 2 + (int)((j + 1) * colw);
+
+			if(w.IsPainting(xp, yp, cw, rh))
+			{
+				Color fg = st.fgmain;
+				Color bg = st.bgmain;
+
+				fnt.NoBold().NoUnderline();
+				bool special = false;
+				int sd = d;
+
+				if(m == view.month)
+				{
+					Day(j, i) = d;
+
+					fg = Black;
+
+					if(j == 6)
+					{
+						fg = Red;
+					}
+					if(d == 1)
+					{
+						firstday.x = j;
+						firstday.y = i;
+					}
+					if(d == today.day && m == today.month && y == today.year)
+					{
+						fg = st.fgtoday;
+						bg = st.bgtoday;
+						fnt.Bold();
+						special = true;
+
+						curday.x = j;
+						curday.y = i;
+					}
+					if(d == sel.day && m == sel.month && y == sel.year)
+					{
+						fg = st.fgselect;
+						bg = st.bgselect;
+						fnt.Bold();
+						special = true;
+
+						prevday.x = j;
+						prevday.y = i;
+					}
+				}
+				else
+				{
+					fg = st.outofmonth;
+					sd = d > 0 ? -d : d;
+					Day(j, i) = sd;
+				}
+				if(sd == char(view.day))
+				{
+					if(sd < 0 && selall)
+					{
+						fg = st.outofmonth;
+						fnt.Bold().Underline(!special);
+					}
+					if(sd > 0 && view.month == m)
+					{
+						fg = st.selectday;
+						fnt.Bold().Underline(!special);
+					}
+				}
+
+				w.DrawRect(xp, yp, cw, rh, bg);
+				if(special)
+				{
+					DrawFrame(w, xp + 1, yp + 1, cw - 2, rh - 2, Black);
+					DrawFrame(w, xp, yp, cw, rh, st.bgmain);
+				}
+
+				str = AsString(abs(d));
+				w.DrawText(xp + (cw - GetTextSize(str, fnt).cx) / 2, yp + yc , str, fnt, fg);
+			}
+
+			if(++d > GetDaysOfMonth(m, y))
+			{
+				d = 1;
+				if(++m > 12)
+				{
+					m = 1;
+					y += 1;
+				}
+			}
+		}
+	}
+
+	w.DrawRect(bs, (int) (rowh * 2) + 1, sz.cx - bs * 2, 1, st.line);
+	w.DrawRect(bs + cw + 1, hs + bs, 1, sz.cy - hs - ts - bs * 1, st.line);
+
+	lastrow = row;
+}
+
+void Calendar::State(int reason)
+{
+	if(reason == OPEN)
+	{
+		ComputeSize();
+
+		int yw = 0;
+		int mw = 0;
+		for(int i = 0; i < 12; i++)
+			mw = max(mw, spin_month.GetWidth(MonthName(i)));
+
+		if(one_button)
+		{
+			yw = spin_year.GetWidth(" 0000", false);
+			spin_all.HCenterPos(mw + yw, 0).TopPos(0, hs);
+		}
+		else
+		{
+			yw = spin_year.GetWidth("0000");
+
+			spin_month.TopPos(0, hs);
+			spin_year.TopPos(0, hs);
+			if(swap_month_year)
+			{
+				spin_month.RightPos(0, mw);
+				spin_year.LeftPos(0, yw);
+			}
+			else
+			{
+				spin_month.LeftPos(0, mw);
+				spin_year.RightPos(0, yw);
+			}
+		}
+	}
+}
+
+bool Calendar::Key(dword key, int count)
+{
+	if(key == K_ESCAPE)
+	{
+		Deactivate();
+		return true;
+	}
+
+	return Ctrl::Key(key, count);
+}
+
+void Calendar::MouseLeave()
+{
+	if(istoday)
+	{
+		istoday = false;
+		wastoday = false;
+		RefreshToday();
+	}
+	else
+		MouseMove(Point(-1, -1), 0);
+}
+
+Date Calendar::GetDate() const
+{
+	return sel;
+}
+
+void Calendar::SetDate(int y, int m, int d)
+{
+	SetDate(Date(y, m, d));
+}
+
+void Calendar::SetDate(const Date &dt)
+{
+	sel = !IsNull(dt) && dt.IsValid() ? Time(dt.year, dt.month, dt.day, 0, 0, 0) : today;
+	view = sel;
+	view.day = 0;
+	UpdateFields();
+}
+
+Date Calendar::GetTime() const
+{
+	return sel;
+}
+
+void Calendar::SetTime(int y, int m, int d, int h, int n, int s)
+{
+	SetTime(Time(y, m, d, h, n, s));
+}
+
+void Calendar::SetTime(const Time &tm)
+{
+	sel = !IsNull(tm) && tm.IsValid() ? tm : today;
+	view = sel;
+	view.day = 0;
+	UpdateFields();
+}
+
+void Calendar::SetView(const Time &v)
+{
+	view = v;
+	view.day = 0;
+	UpdateFields();
+}
+
+// Clock
+
+void LineCtrl::Paint(Draw& w)
+{
+	Size sz = GetSize();
+	w.DrawRect(sz, Color(240, 240, 240));
+
+	if(real_pos < 0)
+		return;
+
+	if(sz.cx > sz.cy)
+		w.DrawRect(Rect(0, 0, min(sz.cx, real_pos), sz.cy), Blend(SColorHighlight(), White, 200));
+	else
+		w.DrawRect(Rect(0, max(0, real_pos), sz.cx, sz.cy), Blend(SColorHighlight(), White, 200));
+}
+
+void LineCtrl::SetPos(Point p)
+{
+	Size sz = GetSize();
+
+	bool vh = sz.cy > sz.cx;
+	int mp = max(sz.cx, sz.cy);
+	real_pos = vh ? p.y : p.x;
+
+	if(real_pos < 0)
+		real_pos = 0;
+	else if(real_pos > mp)
+		real_pos = mp;
+
+	pos = (vh ? mp - real_pos : real_pos) * 100 / mp;
+	Refresh();
+	WhenAction();
+}
+
+int LineCtrl::GetPos()
+{
+	return pos;
+}
+
+void LineCtrl::SetPos(int p)
+{
+	Size sz = GetSize();
+	pos = p;
+	real_pos = p * max(sz.cx, sz.cy) / 100;
+	if(sz.cy > sz.cx)
+		real_pos = sz.cy - real_pos;
+	Refresh();
+}
+
+void LineCtrl::LeftDown(Point p, dword keyflags)
+{
+	SetCapture();
+	SetPos(p);
+}
+
+void LineCtrl::MouseMove(Point p, dword keyflags)
+{
+	if(HasCapture())
+		SetPos(p);
+}
+
+void LineCtrl::LeftUp(Point p, dword keyflags)
+{
+	ReleaseCapture();
+}
+
+LineCtrl::LineCtrl()
+{
+	pos = 0;
+	real_pos = -1;
+	BackPaint();
+}
+
+//Clock
+
+Clock& Clock::SetStyle(const Style& s)
+{
+	style = &s;
+	Refresh();
+	return *this;
+}
+
+void Clock::PaintPtr(int n, Draw& w, Point p, double pos, double m, int d, Color color, Point cf)
+{
+	double dx = m * sin(pos * 2 * M_PI);
+	double dy = m * cos(pos * 2 * M_PI);
+
+	lines[n].s.x = p.x - int(dx * 35 / 2);
+	lines[n].s.y = p.y + int(dy * 35 / 2);
+	lines[n].e.x = p.x + int(dx * cf.x);
+	lines[n].e.y = p.y - int(dy * cf.y);
+
+	w.DrawLine(lines[n].s, lines[n].e, d, color);
+}
+
+void Clock::PaintCenteredText(Draw& w, int x, int y, const char *text, Font fnt, Color c)
+{
+	Size tsz = GetTextSize(text, fnt);
+	w.DrawText(x - tsz.cx / 2, y - tsz.cy / 2, text, fnt, c);
+}
+
+void Clock::PaintCenteredImage(Draw &w, int x, int y, const Image& img)
+{
+	Size isz = img.GetSize();
+	w.DrawImage(x - isz.cx / 2, y - isz.cy / 2, img);
+}
+
+bool Clock::Key(dword key, int count)
+{
+	if(key == K_TAB || key == K_SHIFT_TAB)
+	{
+		if(ed_minute.HasFocus())
+			ed_hour.SetFocus();
+		else if(ed_hour.HasFocus())
+			ed_minute.SetFocus();
+		else
+			ed_hour.SetFocus();
+		return true;
+	}
+	return Ctrl::Key(key, count);
+}
+
+void Clock::CalcSizes()
+{
+	int margin = 3;
+	sz = GetSize();
+	int cx = sz.cx - 7 * 2;
+	int cy = sz.cy - 2 * margin - hs;
+	cm.x = cx / 2 + 7;
+	cm.y = cy / 2 + margin + hs;
+	cf.x = min(cy / 2, cx / 2);
+	cf.y = cf.x;
+}
+
+void Clock::Paint(Draw& w)
+{
+	const Style &st = style ? *style : StyleDefault();
+
+	CalcSizes();
+
+	w.DrawRect(sz, st.bgmain);
+	DrawBg(w, 0, 0, sz.cx, hs, st.header);
+
+	if(colon)
+		PaintCenteredText(w, sz.cx / 2, hs / 2 - 1, " : ", StdFont().Bold(), SColorHighlightText());
+
+	//w.DrawEllipse(cm.x - r / 2, cm.y - r / 2, cf.x, cf.x, Blend(st.header, White, 250), PEN_NULL, Black);
+
+	Font fnt = st.font;
+
+	for(int i = 1; i <= 12; i++) {
+		PaintCenteredText(w,
+		                  cm.x + int(0.8 * sin(i * M_PI / 6.0) * cf.x),
+		                  cm.y - int(0.8 * cos(i * M_PI / 6.0) * cf.y),
+		                  AsString(i), fnt.Bold(i % 3 == 0), SBlack());
+	}
+
+	for(int i = 1; i <= 60; i++) {
+		int x = cm.x + int(0.95 * sin(i * M_PI / 30.0) * cf.x);
+		int y = cm.y - int(0.95 * cos(i * M_PI / 30.0) * cf.y);
+		PaintCenteredImage(w, x, y,
+		                   cur_point == i ? CtrlImg::BigDotH()
+		                                  : i % 5 == 0 ? CtrlImg::BigDot() : CtrlImg::SmallDot());
+	}
+
+	PaintPtr(0, w, cm, cur_time / 3600.0 / 12, 0.5, 5, cur_line == 0 ? st.arrowhl : st.arrowhour, cf);
+	PaintPtr(1, w, cm, cur_time / 3600.0, 0.6, 3, cur_line == 1 ? st.arrowhl : st.arrowminute, cf);
+	if(seconds)
+		PaintPtr(2, w, cm, cur_time / 60.0, 0.75, 2, cur_line == 2 ? st.arrowhl : st.arrowsecond, cf);
+}
+
+int Clock::GetDir(int pp, int cp)
+{
+	dir = 0;
+	if(cp >= 1 && cp <= 30 && pp >= 1 && pp <= 30 ||
+	   cp > 30 && cp <= 60 && pp > 30 && pp <= 60)
+	{
+		dir = pp < cp ? 1 : -1;
+	}
+	else //there is a small problem on 30 when direction is opposite to "correct dir". Fortunatelly it won't hurt us hour/minute change is on 60
+	{
+		if(pp <= 60 && pp > 30 && cp >= 1)
+			dir = 1;
+		else if(pp >= 1 && cp <= 60 && cp > 30)
+			dir = -1;
+	}
+
+	return dir;
+}
+
+Clock::MinMax Clock::SetMinMax(int v, int min, int max)
+{
+	MinMax mm;
+	if(v > max)
+	{
+		mm.diff = 1;
+		mm.value = min;
+	}
+	else if(v < min)
+	{
+		mm.diff = -1;
+		mm.value = max;
+	}
+	else
+	{
+		mm.diff = 0;
+		mm.value = v;
+	}
+	return mm;
+}
+
+int Clock::IncFactor(int dir, int pp, int cp)
+{
+	if(dir > 0 && (pp < 60 && pp > 45 && (cp == 60 || (cp >= 1 && cp < 15))))
+		return 1;
+	if(dir < 0 && ((pp == 60 || (pp >= 1 && pp < 15)) && cp < 60 && cp > 45))
+		return -1;
+
+	return 0;
+}
+
+void Clock::MouseMove(Point p, dword keyflags)
+{
+	if(!HasCapture())
+	{
+		cur_line = GetPointedLine(p);
+		if(cur_line != prv_line)
+		{
+			Refresh();
+			prv_line = cur_line;
+		}
+		if(cur_line < 0)
+			accept_time = !IsCircle(p, cm, cf.x / 2);
+	}
+	else
+	{
+		cur_point = GetPoint(p);
+		if(cur_point != prv_point && cur_point >= 0)
+		{
+			int dir = GetDir(prv_point, cur_point);
+			int inc = IncFactor(dir, prv_point, cur_point);
+			int cp  = cur_point == 60 ? 0 : cur_point;
+
+			if(cur_line == 0)
+			{
+				int h = cp / 5;
+				if(sel.hour >= 12)
+					h += 12;
+				if(inc > 0)
+					h += 12;
+				else if(inc < 0)
+					h -= 12;
+
+				sel.hour = SetMinMax(h, 0, 23).value;
+			}
+			else if(cur_line == 1)
+			{
+				sel.hour = SetMinMax(sel.hour + inc, 0, 23).value;
+				sel.minute = cp;
+			}
+			else
+			{
+				MinMax mm = SetMinMax(sel.minute + inc, 0, 59);
+				int hour = int(sel.hour) + mm.diff;
+				sel.hour = SetMinMax(hour, 0, 23).value;
+				sel.minute = mm.value;
+				sel.second = cp;
+			}
+
+			UpdateTime();
+			prv_point = cur_point;
+		}
+	}
+}
+
+void Clock::LeftDown(Point p, dword keyflags)
+{
+	if(cur_line >= 0)
+		SetCapture();
+	else if(accept_time)
+	{
+		Deactivate();
+		WhenAction();
+	}
+}
+
+void Clock::LeftUp(Point p, dword keyflags)
+{
+	ReleaseCapture();
+	if(cur_point >= 0)
+	{
+		cur_point = -1;
+		prv_point = -1;
+		Refresh();
+	}
+}
+
+Image Clock::CursorImage(Point p, dword keyflags)
+{
+	if(cur_line >= 0 || accept_time)
+		return CtrlImg::HandCursor();
+	else
+		return Image::Arrow();
+}
+
+int Clock::GetPointedLine(Point p)
+{
+	for(int i = 0; i < 2 + int(seconds); i++)
+		if(IsLine(lines[i].s, lines[i].e, p))
+			return i;
+	return -1;
+}
+
+bool Clock::IsLine(Point s, Point e, Point p, double tolerance)
+{
+	int minx = min(s.x, e.x);
+	int maxx = max(s.x, e.x);
+	int miny = min(s.y, e.y);
+	int maxy = max(s.y, e.y);
+
+	if(p.x < minx - tolerance) return false;
+	if(p.x > maxx + tolerance) return false;
+	if(p.y < miny - tolerance) return false;
+	if(p.y > maxy + tolerance) return false;
+
+	int dx = e.x - s.x;
+	int dy = e.y - s.y;
+	double u = (p.x - s.x) * dy - (p.y - s.y) * dx;
+	u *= u;
+	double l = dx * dx + dy * dy;
+	if(l == 0.0)
+		return false;
+	return u / l < tolerance * tolerance;
+}
+
+bool Clock::IsCircle(Point p, Point s, int r)
+{
+	int dx = p.x - s.x;
+	int dy = p.y - s.y;
+	return dx * dx + dy * dy < r * r;
+}
+
+int Clock::GetPoint(Point p, double tolerance /* = 4.0*/)
+{
+	double tcx = 0.95 * cf.x;
+	double tcy = 0.95 * cf.y;
+
+	int dx = p.x - cm.x;
+	int dy = p.y - cm.y;
+
+	double r = sqrt(double(dx * dx + dy * dy));
+	double sa = r != 0 ? dx / r : 0;
+	double ca = r != 0 ? dy / r : 0;
+
+	p.x = cm.x + int(tcx * sa);
+	p.y = cm.y + int(tcy * ca);
+
+	for(int i = 1; i <= 60; i++) {
+		int x = cm.x + int(tcx * sin(i * M_PI / 30));
+		int y = cm.y - int(tcy * cos(i * M_PI / 30));
+		if(abs(p.x - x) + abs(p.y - y) < tolerance)
+			return i;
+	}
+	return -1;
+}
+
+void Clock::Timer()
+{
+	Refresh();
+}
+
+void Clock::UpdateFields()
+{
+	ed_hour <<= sel.hour;
+	ed_minute <<= sel.minute;
+	ln_minute.SetPos(sel.minute * 100 / 59);
+	ln_hour.SetPos(sel.hour * 100 / 23);
+	spin_hour.SetText(Format("%.2d", sel.hour));
+	spin_minute.SetText(Format("%.2d", sel.minute));
+}
+
+void Clock::SetHourEdit()
+{
+	sel.hour = int(~ed_hour);
+	UpdateTime();
+}
+
+void Clock::SetMinuteEdit()
+{
+	sel.minute = int(~ed_minute);
+	UpdateTime();
+}
+
+void Clock::SetHourLine()
+{
+	sel.hour = ln_hour.GetPos() * 23 / 100;
+	UpdateTime();
+}
+
+void Clock::SetMinuteLine()
+{
+	sel.minute = ln_minute.GetPos() * 59 / 100;
+	UpdateTime();
+}
+
+void Clock::SetHourLeft()
+{
+	sel.hour = SetMinMax(--sel.hour, 0, 23).value;
+	UpdateTime();
+}
+
+void Clock::SetHourRight()
+{
+	sel.hour = SetMinMax(++sel.hour, 0, 23).value;
+	UpdateTime();
+}
+
+void Clock::SetMinuteLeft()
+{
+	MinMax mm = SetMinMax(--sel.minute, 0, 59);
+	sel.minute = mm.value;
+	sel.hour = SetMinMax(sel.hour + mm.diff, 0, 23).value;
+	UpdateTime();
+}
+
+void Clock::SetMinuteRight()
+{
+	MinMax mm = SetMinMax(++sel.minute, 0, 59);
+	sel.minute = mm.value;
+	sel.hour = SetMinMax(sel.hour + mm.diff, 0, 23).value;
+	UpdateTime();
+}
+
+void Clock::UpdateTime()
+{
+	cur_time = int(sel.hour) * 3600 + int(sel.minute) * 60 + int(sel.second);
+	UpdateFields();
+	Refresh();
+}
+
+Size Clock::ComputeSize()
+{
+	const Style &st = style ? *style : StyleDefault();
+	spin_hour.SetFont(st.font);
+	spin_minute.SetFont(st.font);
+	Font fnt = st.font;
+	Size tsz = GetTextSize("W", st.font);
+	hs = tsz.cy + 4;
+	//TODO: Find better scaling method.
+	double d = fnt == StdFont() ? 1 : tsz.cy / double(tsz.cx);
+	return Size(int(150.0 * d), int(157.0 * d));
+}
+
+void Clock::State(int reason)
+{
+	if(reason == OPEN)
+	{
+		ComputeSize();
+		//spin_hour.LeftPos(0, spin_hour.GetWidth("00")).TopPos(0, hs);
+		//spin_minute.RightPos(0, spin_minute.GetWidth("00")).TopPos(0, hs);
+		int shw = spin_hour.GetWidth("00");
+		int smw = spin_minute.GetWidth("00");
+		spin_hour.HCenterPos(shw, -shw / 2).TopPos(0, hs);
+		spin_minute.HCenterPos(smw, smw / 2).TopPos(0, hs);
+		ln_minute.RightPos(0, 5).VSizePos(hs, 0);
+		ln_hour.LeftPos(0, 5).VSizePos(hs, 0);
+	}
+}
+
+Value Clock::GetData() const
+{
+	return sel;
+}
+
+void Clock::SetData(const Value& v)
+{
+	SetTime((Time) v);
+}
+
+Time Clock::GetTime() const
+{
+	return sel;
+}
+
+void Clock::SetTime(const Time& tm)
+{
+	sel = !IsNull(tm) && tm.IsValid() ? tm : GetSysTime();
+	UpdateTime();
+}
+
+void Clock::SetTime(int h, int n, int s)
+{
+	sel.hour = h;
+	sel.minute = n;
+	sel.second = s;
+	UpdateTime();
+}
+
+void Clock::Reset()
+{
+	sel = GetSysTime();
+	UpdateTime();
+}
+
+Clock::Clock()
+{
+	sel = GetSysTime();
+	UpdateTime();
+
+	Add(ed_hour);
+	Add(ed_minute);
+	Add(ln_hour);
+	Add(ln_minute);
+	Add(spin_hour);
+	Add(spin_minute);
+
+	ed_hour.Min(0).Max(23);
+	ed_minute.Min(0).Max(59);
+	ed_hour <<= THISBACK(SetHourEdit);
+	ed_minute <<= THISBACK(SetMinuteEdit);
+	ln_hour <<= THISBACK(SetHourLine);
+	ln_minute <<= THISBACK(SetMinuteLine);
+	spin_hour.SetCallbacks(THISBACK(SetHourLeft), THISBACK(SetHourRight));
+	spin_hour.SetTips(t_("Previous hour"), t_("Next hour"));
+	spin_minute.SetCallbacks(THISBACK(SetMinuteLeft), THISBACK(SetMinuteRight));
+	spin_minute.SetTips(t_("Previous minute"), t_("Next minute"));
+
+	cur_line = -1;
+	prv_line = -1;
+	cur_hour = -1;
+	cur_minute = -1;
+	cur_second = -1;
+
+	prv_point = -1;
+	cur_point = -1;
+
+	style = NULL;
+	seconds = true;
+	colon = false;
+	accept_time = false;
+
+	SetFrame(BlackFrame());
+	BackPaint();
+}
+
+// CalendarClock
+
+CalendarClock::CalendarClock(int m) : mode(m)
+{
+	if(mode == MODE_TIME)
+	{
+		Add(clock);
+		clock.SetFrame(NullFrame());
+		calendar.SetFrame(NullFrame());
+		SetFrame(BlackFrame());
+		calendar.TimeMode();
+		calendar.WhenTime = THISBACK(UpdateTime);
+	}
+
+	Add(calendar);
+	calendar.WhenDeactivate = THISBACK(Deactivate);
+	clock.WhenDeactivate = THISBACK(Deactivate);
+}
+
+void CalendarClock::UpdateTime(Time &tm)
+{
+	tm.hour = clock.GetHour();
+	tm.minute = clock.GetMinute();
+	tm.second = clock.GetSecond();
+}
+
+void CalendarClock::PopUp(Ctrl *owner, const Rect& rt)
+{
+	Close();
+	calendar.Reset();
+	clock.Reset();
+	calendar.SetPopUp(true);
+	clock.SetPopUp(true);
+	SetRect(rt);
+	Ctrl::PopUp(owner, true, true, GUI_DropShadows());
+	SetFocus();
+}
+
+Size CalendarClock::ComputeSize()
+{
+	calendar_size = calendar.GetPopUpSize();
+	clock_size = clock.GetPopUpSize();
+	return mode == MODE_DATE ? calendar_size
+	                         : Size(calendar_size.cx + clock_size.cx + 2, max(calendar_size.cy, clock_size.cy));
+}
+
+void CalendarClock::Layout()
+{
+	sz = ComputeSize();
+	calendar.LeftPos(0, calendar_size.cx).VSizePos(0, 0);
+	clock.RightPos(0, clock_size.cx).VSizePos(0, 0);
+}
+
+void CalendarClock::Deactivate()
+{
+	if(IsOpen() && IsPopUp())
+	{
+		WhenPopDown();
+		IgnoreMouseClick();
+		Close();
+		calendar.SetPopUp(false);
+		clock.SetPopUp(false);
+	}
+}
+
+bool CalendarClock::Key(dword key, int count)
+{
+	if(key == K_ESCAPE)
+	{
+		Deactivate();
+		return true;
+	}
+
+	return Ctrl::Key(key, count);
+}
+
+DropDate::DropDate() : DateTimeCtrl<EditDate>(CalendarClock::MODE_DATE)
+{}
+
+DropDate& DropDate::SetDate(int y, int m, int d)
+{
+	EditDate::SetData(Date(y, m, d));
+	return *this;
+}
+
+DropTime::DropTime() : DateTimeCtrl<EditTime>(CalendarClock::MODE_TIME)
+{}
+
+DropTime& DropTime::SetTime(int y, int m, int d, int h, int n, int s)
+{
+	EditTime::SetData(Time(y, m, d, h, n, s));
+	return *this;
+}
+
+// FlatButton
+
+FlatButton::FlatButton()
+{
+	hl = Blend(SColorHighlight, White, 200);
+	bg = Blend(SColorHighlight, White, 50);
+	fg = SColorPaper;
+	left = true;
+	Transparent();
+}
+
+void FlatButton::DrawFrame(Draw &w, const Rect& r, Color lc, Color tc, Color rc, Color bc)
+{
+	w.DrawRect(r.left, r.top, r.left + 1, r.bottom, lc);
+	w.DrawRect(r.right - 1, r.top, r.right, r.bottom, rc);
+	w.DrawRect(r.left, r.top, r.right, r.top + 1, tc);
+	w.DrawRect(r.left, r.bottom - 1, r.right, r.bottom, bc);
+}
+
+void FlatButton::Paint(Draw &w)
+{
+	Size sz = GetSize();
+	Size isz = img.GetSize();
+
+	int dx = IsPush() * (left ? -1 : 1);
+	int dy = IsPush();
+	w.DrawImage((sz.cx - isz.cx) / 2 + dx, (sz.cy - isz.cy) / 2 + dy, img, HasMouse() ? SColorHighlightText() : Black);
+}
+
+FlatSpin::FlatSpin()
+{
+	tsz.Clear();
+	left.SetImage(CtrlImg::smallleft());
+	right.SetImage(CtrlImg::smallright());
+	Add(left);
+	Add(right);
+	left.SetLeft();
+	right.SetRight();
+	Transparent();
+	font = StdFont().Bold();
+	selected = false;
+	selectable = false;
+}
+
+FlatSpin& FlatSpin::Selectable(bool b /* = true*/)
+{
+	selectable = b;
+	return *this;
+}
+
+void FlatSpin::SetFont(const Font& fnt)
+{
+	font = fnt;
+	font.Bold();
+}
+
+int FlatSpin::GetWidth(const String& s, bool with_buttons)
+{
+	return (with_buttons ? (CtrlImg::smallleft().GetSize().cx + 8) * 2 : 0) + GetTextSize(s, font).cx;
+}
+
+void FlatSpin::SetText(const String& s)
+{
+	text = s;
+	tsz = GetTextSize(text, font);
+	Refresh();
+}
+
+void FlatSpin::SetTips(const char *tipl, const char *tipr)
+{
+	left.Tip(tipl);
+	right.Tip(tipr);
+}
+
+void FlatSpin::SetCallbacks(const Callback &cbl, const Callback& cbr)
+{
+	left.WhenAction = cbl;
+	right.WhenAction = cbr;
+}
+
+void FlatSpin::Layout()
+{
+	Size sz = GetSize();
+	Size isz = CtrlImg::smallleft().GetSize();
+	left.LeftPos(0, isz.cx + 8).TopPos(0, sz.cy);
+	right.RightPos(0, isz.cx + 8).TopPos(0, sz.cy);
+}
+
+void FlatSpin::Paint(Draw& w)
+{
+	Size sz = GetSize();
+	w.DrawText((sz.cx - tsz.cx) / 2, (sz.cy - tsz.cy) / 2, text, font.Underline(selected), SColorHighlightText());
+}
+
+Image FlatSpin::CursorImage(Point p, dword keyflags)
+{
+	if(selectable && selected)
+		return CtrlImg::HandCursor();
+	else
+		return Image::Arrow();
+}
+
+void FlatSpin::MouseLeave()
+{
+	selected = false;
+	Refresh();
+}
+
+void FlatSpin::MouseMove(Point p, dword keyflags)
+{
+	if(!selectable)
+		return;
+
+	Size sz = GetSize();
+	bool s = selected;
+	selected = p.x >= (sz.cx - tsz.cx) / 2 && p.x <= (sz.cx + tsz.cx) / 2;
+	if(s != selected)
+		Refresh();
+}
+
+void FlatSpin::LeftDown(Point p, dword keyflags)
+{
+	if(selected)
+		WhenAction();
+}
+
+CH_STYLE(Clock, Style, StyleDefault)
+{
+	header        = SColorHighlight;
+	bgmain        = SColorPaper;
+	fgmain        = SColorText;
+	arrowhl       = Green;
+	arrowhour     = Red;
+	arrowminute   = Blue;
+	arrowsecond   = Black;
+	font          = StdFont();
+}
+
+CH_STYLE(Calendar, Style, StyleDefault)
+{
+	header        = SColorHighlight;
+
+	bgmain        = SColorPaper;
+	bgtoday       = SColorPaper;
+	bgselect      = Color(255, 254, 220);
+
+	fgmain        = SColorText;
+	fgtoday       = Black;
+	fgselect      = Black;
+
+	outofmonth    = Color(180, 180, 180);
+	curdate       = White;
+	today         = SColorText;
+	selecttoday   = SColorMark;
+	cursorday     = SColorText;
+	selectday     = SColorMark;
+	line          = Gray;
+	dayname       = SColorText;
+	week          = SColorText;
+	font          = StdFont();
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/CtrlLib/DateTimeCtrl.h b/uppsrc/CtrlLib/DateTimeCtrl.h
new file mode 100644
index 000000000..1d555c2d2
--- /dev/null
+++ b/uppsrc/CtrlLib/DateTimeCtrl.h
@@ -0,0 +1,521 @@
+enum
+{
+	SUNDAY    = 0,
+	MONDAY    = 1,
+	TUESDAY   = 2,
+	WEDNESDAY = 3,
+	THURSDAY  = 4,
+	FRIDAY    = 5,
+	SATURDAY  = 6
+};
+
+class FlatButton : public Pusher {
+public:
+	Image img;
+	Color fg, bg, hl;
+	bool left;
+	bool drawedge;
+
+	FlatButton();
+
+	void DrawFrame(Draw &w, const Rect &r, Color lc, Color tc, Color rc, Color bc);
+	virtual void Paint(Draw &w);
+	virtual void MouseEnter(Point p, dword kflags) {
+		Refresh();
+		Pusher::MouseEnter(p, kflags);
+	}
+	virtual void MouseLeave() {
+		Refresh();
+		Pusher::MouseLeave();
+	}
+
+	FlatButton& SetImage(const Image &_img) {
+		img = _img;
+		Refresh();
+		return *this;
+	}
+
+	FlatButton& SetLeft()           { left = true;  return *this; }
+	FlatButton& SetRight() 			{ left = false;	return *this; }
+	FlatButton& DrawEdge(bool b) 	{ drawedge = b;	return *this; }
+};
+
+class FlatSpin : public Ctrl
+{
+private:
+	FlatButton left;
+	FlatButton right;
+	String text;
+	Size tsz;
+	Font font;
+	bool selected;
+	bool selectable;
+
+public:
+	FlatSpin();
+	void SetText(const String& s);
+	void SetTips(const char *tipl, const char *tipr);
+	void SetCallbacks(const Callback &cbl, const Callback& cbr);
+
+	FlatSpin& Selectable(bool b = true);
+	int GetWidth(const String& s, bool with_buttons = true);
+	void SetFont(const Font& fnt);
+
+	virtual void MouseMove(Point p, dword keyflags);
+	virtual void MouseLeave();
+	virtual void LeftDown(Point p, dword keyflags);
+	virtual void Layout();
+	virtual void Paint(Draw& w);
+	virtual Image CursorImage(Point p, dword keyflags);
+
+	typedef FlatSpin CLASSNAME;
+};
+
+class PopUpCtrl : public Ctrl
+{
+private:
+	bool popup;
+public:
+	PopUpCtrl() : popup(false) {}
+
+	Callback WhenPopDown;
+	Callback WhenDeactivate;
+	virtual void Deactivate();
+	virtual Size ComputeSize() = 0;
+	virtual void Reset() {}
+
+	void PopUp(Ctrl *owner, const Rect& rt);
+	Size GetPopUpSize() { return ComputeSize(); }
+
+	bool IsPopUp() const;
+	void SetPopUp(bool b = true);
+};
+
+class Calendar : public PopUpCtrl
+{
+public:
+	struct Style : ChStyle<Style> {
+		Color header;
+
+		Color bgmain;
+		Color bgtoday;
+		Color bgselect;
+
+		Color fgmain;
+		Color fgtoday;
+		Color fgselect;
+		Color outofmonth;
+		Color curdate;
+		Color today;
+		Color selecttoday;
+		Color cursorday;
+		Color selectday;
+		Color line;
+		Color dayname;
+		Color week;
+		Font font;
+	};
+
+protected:
+	const Style *style;
+	const Style *St() const;
+
+private:
+	typedef Calendar CLASSNAME;
+
+	FlatSpin spin_year;
+	FlatSpin spin_month;
+	FlatSpin spin_all;
+
+	static const int cols = 7;
+	static const int rows = 6;
+
+	static const Point nullday;
+	int bs; //border size
+	int hs; //header vertical size
+	int ts; //today vertical size
+	float colw;
+	float rowh;
+	int cw, rh;
+
+	int col;
+	int row;
+	int lastrow;
+
+	int fh;
+
+	int days[rows][cols];
+
+	Point newday;
+	Point oldday;
+	Point prevday;
+	Point curday, firstday;
+
+	String stoday;
+	Size sztoday;
+	String curdate;
+
+	bool selall;
+	bool istoday;
+	bool wastoday;
+	bool time_mode;
+	bool swap_month_year;
+	bool one_button;
+
+	Time view;
+	Time today;
+	Time sel;
+
+	int first_day;
+
+	void OnMonthLeft();
+	void OnMonthRight();
+	void OnYearLeft();
+	void OnYearRight();
+
+	void UpdateFields();
+
+	bool MouseOnToday(Point p);
+	bool MouseOnHeader(Point p);
+
+	virtual void LeftDown(Point p, dword keyflags);
+	virtual void MouseMove(Point p, dword keyflags);
+	virtual void Paint(Draw &w);
+	virtual bool Key(dword key, int count);
+	virtual void MouseLeave();
+	virtual void State(int reason);
+	virtual Image CursorImage(Point p, dword keyflags);
+
+	int& Day(int x, int y) { return days[y][x]; }
+	int& Day(Point p) 	   { return days[p.y][p.x]; }
+	Point GetDay(Point p);
+
+	void RefreshDay(Point p);
+	void RefreshToday();
+	void RefreshHeader();
+	virtual Size ComputeSize();
+
+public:
+	Calendar();
+	Callback1<Time &> WhenTime;
+
+	static const Style& StyleDefault();
+
+	void Reset();
+
+	int	 DayOfWeek(int day, int month, int year, int zelleroffset = 2);
+	int  WeekOfYear(int day, int month, int year);
+
+	virtual Value GetData() const			{ return sel;          }
+	virtual void  SetData(const Value& v)   { time_mode ? SetTime((Time) v) : SetDate((Date) v); }
+
+	Date GetDate() const;
+	void SetDate(int y, int m, int d);
+	void SetDate(const Date &dt);
+
+	Date GetTime() const;
+	void SetTime(int y, int m, int d, int h, int n, int s);
+	void SetTime(const Time &tm);
+
+	Date GetCursor() const			   { return view; 				  }
+	bool HasCursor() const			   { return view.day != 0;        }
+
+	Date GetView() const			   { return Date(view.year, view.month, view.day ? view.day : 1); }
+	void SetView(const Time &v);
+
+	Calendar& SetStyle(const Style& s);
+	Calendar& SelectAll(bool b = true)     { selall = b; return *this;       }
+	Calendar& NoSelectAll()                { selall = false; return *this;   }
+	Calendar& FirstDay(int n = MONDAY)     { first_day = n; return *this;    }
+	Calendar& TimeMode(bool b = true)      { time_mode = b; return *this;    }
+	Calendar& SwapMonthYear(bool b = true) { swap_month_year = b; return *this; }
+	Calendar& OneButton(bool b = true)     { one_button = b; return *this;   }
+	Calendar& NoOneButton()                { one_button = false; return *this;   }
+
+	void PopUp(Ctrl *owner, Rect &rt);
+};
+
+struct LineCtrl : Ctrl
+{
+	int pos, real_pos;
+
+	virtual void Paint(Draw& w);
+	void SetPos(Point p);
+	int GetPos();
+	void SetPos(int p);
+
+	virtual void LeftDown(Point p, dword keyflags);
+	virtual void MouseMove(Point p, dword keyflags);
+	virtual void LeftUp(Point p, dword keyflags);
+	LineCtrl();
+};
+
+class Clock : public PopUpCtrl
+{
+public:
+	struct Style : ChStyle<Style> {
+		Color header;
+		Color bgmain;
+		Color fgmain;
+
+		Color arrowhl;
+		Color arrowhour;
+		Color arrowminute;
+		Color arrowsecond;
+
+		Font font;
+	};
+
+protected:
+	const Style *style;
+	const Style *St() const;
+
+private:
+	FlatSpin spin_hour;
+	FlatSpin spin_minute;
+	EditIntSpin ed_hour, ed_minute;
+	LineCtrl ln_hour, ln_minute;
+
+	//int hour, minute, second;
+	Time sel;
+	int hs;
+	int dir;
+	bool accept_time;
+
+	struct Line {
+		Point s, e;
+	};
+
+	struct MinMax {
+		int diff;
+		int value;
+	};
+
+	Line lines[3];
+	Size sz;
+	Point cm; //circle middle
+	Point cf; //circle factor
+
+	int64 cur_time;
+	int   cur_line;
+	int   prv_line;
+	int   cur_hour;
+	int   cur_minute;
+	int   cur_second;
+	int   cur_point;
+	int   prv_point;
+
+	bool seconds;
+	bool colon;
+
+	void PaintPtr(int n, Draw& w, Point p, double pos, double m, int d, Color color, Point cf);
+	void PaintCenteredText(Draw& w, int x, int y, const char *text, Font fnt, Color c);
+	void PaintCenteredImage(Draw &w, int x, int y, const Image& img);
+
+	void SetHourEdit();
+	void SetMinuteEdit();
+	void SetHourLine();
+	void SetMinuteLine();
+	void SetHourLeft();
+	void SetHourRight();
+	void SetMinuteLeft();
+	void SetMinuteRight();
+
+	MinMax SetMinMax(int v, int min, int max);
+	void UpdateFields();
+	void UpdateTime();
+	int  IncFactor(int dir, int pp, int cp);
+
+	int  GetDir(int prev_point, int cur_point);
+	int  GetPointedLine(Point p);
+	int  GetPoint(Point p, double tolerance = 4.0);
+	bool IsCircle(Point p, Point s, int r);
+	bool IsLine(Point s, Point e, Point p, double tolerance = 3.0);
+	void CalcSizes();
+
+	void Timer();
+
+public:
+
+	virtual bool Key(dword key, int count);
+	virtual void Paint(Draw& w);
+	virtual void State(int reason);
+	virtual void LeftDown(Point p, dword keyflags);
+	virtual void LeftUp(Point p, dword keyflags);
+	virtual void MouseMove(Point p, dword keyflags);
+	virtual Image CursorImage(Point p, dword keyflags);
+	virtual Size ComputeSize();
+
+	virtual Value GetData() const;
+	virtual void  SetData(const Value& v);
+
+	Time GetTime() const;
+	void SetTime(int h, int n, int s);
+	void SetTime(const Time& tm);
+
+	static const Style& StyleDefault();
+
+	void Reset();
+
+	int GetHour() const   { return sel.hour;   }
+	int GetMinute() const { return sel.minute; }
+	int GetSecond() const { return sel.second; }
+
+	Clock& SetStyle(const Style& s);
+	Clock& Seconds(bool b = true)    { seconds = b; return *this; }
+	Clock& NoSeconds()               { return Seconds(false); }
+	Clock& Colon(bool b = true)      { colon = b; return *this; }
+	Clock& NoColon()                 { return Colon(false); }
+
+	Clock();
+
+	typedef Clock CLASSNAME;
+};
+
+class CalendarClock : public Ctrl
+{
+private:
+	int mode;
+
+	Size calendar_size;
+	Size clock_size;
+	Size sz;
+
+public:
+	enum {
+		MODE_DATE = 0,
+		MODE_TIME = 1
+	};
+
+	typedef CalendarClock CLASSNAME;
+
+	Calendar calendar;
+	Clock clock;
+
+	CalendarClock(int m = MODE_TIME);
+	Callback WhenPopDown;
+
+	virtual void Deactivate();
+	virtual bool Key(dword key, int count);
+	virtual void Layout();
+
+	Size ComputeSize();
+	Size GetCalendarClockSize() { return ComputeSize(); }
+	void UpdateTime(Time &tm);
+
+	void PopUp(Ctrl *owner, const Rect& rt);
+};
+
+template<class T>
+class DateTimeCtrl : public T {
+	MultiButtonFrame drop;
+	CalendarClock cc;
+
+	int mode;
+
+	void OnCalendarChoice() {
+		this->SetData(~cc.calendar);
+		this->WhenAction();
+	}
+
+	void OnClockChoice() {
+		this->SetData(~cc.clock);
+		this->WhenAction();
+	}
+
+	void OnClose() {
+		this->SetFocus();
+	}
+
+	void OnDrop() {
+		if(!this->IsEditable())
+			return;
+
+		Size sz = cc.GetCalendarClockSize();
+
+		int width = sz.cx;
+		int height = sz.cy;
+
+		Rect rw = Ctrl::GetWorkArea();
+		Rect rs = this->GetScreenRect();
+		Rect r;
+		r.left   = rs.left;
+		r.right  = rs.left + width;
+		r.top    = rs.bottom;
+		r.bottom = rs.bottom + height;
+
+		if(r.bottom > rw.bottom)
+		{
+			r.top = rs.top - height;
+			r.bottom = rs.top;
+		}
+		if(r.right > rw.right)
+		{
+			int diff;
+			if(rs.right <= rw.right)
+				diff = rs.right - r.right;
+			else
+				diff = rw.right - r.right;
+
+			r.left += diff;
+			r.right += diff;
+		}
+		if(r.left < rw.left)
+		{
+			int diff = rw.left - r.left;
+			r.left += diff;
+			r.right += diff;
+
+		}
+		cc.PopUp(this, r);
+		cc.calendar <<= this->GetData();
+		cc.clock <<= this->GetData();
+	}
+
+public:
+	typedef DateTimeCtrl CLASSNAME;
+
+	DateTimeCtrl(int m) : cc(m) {
+		drop.AddTo(*this);
+		drop.AddButton().Main() <<= THISBACK(OnDrop);
+		drop.NoDisplay();
+		drop.SetStyle(drop.StyleFrame());
+		cc.calendar   <<= THISBACK(OnCalendarChoice);
+		cc.clock      <<= THISBACK(OnClockChoice);
+		cc.WhenPopDown  = THISBACK(OnClose);
+	}
+
+	virtual void GotFocus()  { drop.RefreshFrame(); }
+	virtual void LostFocus() { drop.RefreshFrame(); }
+	virtual Size GetMinSize() const { return drop.GetMinSize(); }
+
+	DateTimeCtrl& SetCalendarStyle(const Calendar::Style& style)   { cc.calendar.SetStyle(style); return *this;  }
+	DateTimeCtrl& SetClockStyle(const Clock::Style& style)         { cc.clock.SetStyle(style); return *this;  }
+	DateTimeCtrl& SetButtonStyle(const MultiButton::Style& style)  { drop.SetStyle(style); return *this; }
+	DateTimeCtrl& SelectAll(bool b = true)                         { cc.calendar.SelectAll(b); return *this;     }
+	DateTimeCtrl& NoSelectAll()     						       { cc.calendar.SelectAll(false); return *this; }
+	DateTimeCtrl& Seconds(bool b = true)                           { cc.clock.Seconds(b); return *this; }
+	DateTimeCtrl& NoSeconds()                                      { cc.clock.Seconds(false); return *this; }
+	DateTimeCtrl& Colon(bool b = true)                             { cc.clock.Colon(b); return *this; }
+	DateTimeCtrl& NoColon()                                        { cc.clock.Colon(false); return *this; }
+	DateTimeCtrl& SwapMonthYear(bool b = true)                     { cc.calendar.SwapMonthYear(b); return *this; }
+	DateTimeCtrl& OneButton(bool b = true)                         { cc.calendar.OneButton(true); return *this; }
+	DateTimeCtrl& NoOneButton()                                    { cc.calendar.OneButton(false); return *this; }
+};
+
+class DropDate : public DateTimeCtrl<EditDate>
+{
+public:
+	DropDate();
+	DropDate& SetDate(int y, int m, int d);
+};
+
+class DropTime : public DateTimeCtrl<EditTime>
+{
+public:
+	DropTime();
+	DropTime& SetTime(int y, int m, int d, int h, int n, int s);
+	DropTime& Seconds(bool b = true)                           { DateTimeCtrl<EditTime>::Seconds(b); EditTime::Seconds(b); return *this; }
+	DropTime& NoSeconds()                                      { return Seconds(false); }
+
+};
diff --git a/uppsrc/CtrlLib/DlgColor.cpp b/uppsrc/CtrlLib/DlgColor.cpp
new file mode 100644
index 000000000..21c590edb
--- /dev/null
+++ b/uppsrc/CtrlLib/DlgColor.cpp
@@ -0,0 +1,1633 @@
+#include "CtrlLib.h"
+
+NAMESPACE_UPP
+
+class FetchColorCtrl : public Button
+{
+public:
+	FetchColorCtrl();
+
+	void          SetData(const Value& v);
+	Value         GetData() const;
+
+	virtual void  LeftDown(Point pt, dword keyflags);
+	virtual void  MouseMove(Point pt, dword keyflags);
+	virtual bool  Key(dword key, int repcnt);
+	virtual Image CursorImage(Point pt, dword keyflags);
+
+private:
+	Color         user_color;
+	Color         std_color;
+};
+
+FetchColorCtrl::FetchColorCtrl()
+{
+	SetImage(CtrlImg::fetch_color());
+}
+
+void FetchColorCtrl::SetData(const Value& v)
+{
+	if(IsNull(user_color))
+		std_color = v;
+}
+
+Value FetchColorCtrl::GetData() const
+{
+	return Nvl(user_color, std_color);
+}
+
+void FetchColorCtrl::LeftDown(Point pt, dword keyflags)
+{
+	Button::LeftDown(pt, keyflags);
+	SetCapture();
+	SetWantFocus();
+}
+
+void FetchColorCtrl::MouseMove(Point pt, dword keyflags)
+{
+	if(keyflags & K_MOUSELEFT)
+	{
+		if(Rect(GetSize()).Contains(pt))
+		{
+			user_color = Null;
+			Action();
+		}
+		else
+		{
+			pt += GetScreenView().TopLeft();
+#ifdef PLATFORM_WIN32
+			HDC sdc = GetWindowDC(0);
+			user_color = Color::FromCR(GetPixel(sdc, pt.x, pt.y));
+			ReleaseDC(0, sdc);
+#endif
+#ifdef PLATFORM_X11
+			// todo: is it possible to screenshot a single screen pixel?
+			user_color = Black;
+#endif
+			Action();
+		}
+	}
+	Button::MouseMove(pt, keyflags);
+}
+
+bool FetchColorCtrl::Key(dword key, int repcnt)
+{
+	if(key == K_ESCAPE && HasCapture())
+	{
+		ReleaseCapture();
+		user_color = Null;
+		Action();
+		return true;
+	}
+	return Button::Key(key, repcnt);
+}
+
+Image FetchColorCtrl::CursorImage(Point pt, dword keyflags)
+{
+	if(keyflags & K_MOUSELEFT)
+		return CtrlImg::fetch_color_cursor();
+	return Button::CursorImage(pt, keyflags);
+}
+
+const Display& StdColorDisplayNull()
+{
+	static ColorDisplayNull display(t_("(no color)"));
+	return display;
+}
+
+const int *Gamma16()
+{
+	static int table[65536];
+	if(table[65535] == 0)
+	{
+		enum { STEP = 4 };
+		int prev = 0;
+		for(int i = 0; i < 65536; i += STEP)
+		{
+			int next = minmax<int>(fround(pow((i + STEP) / 65535.0, 1.5) * 65535.0), 0, 65535);
+			for(int t = 0; t < STEP; t++)
+				table[i + t] = prev + iscale(next - prev, t, STEP);
+			prev = next;
+		}
+	}
+	return table;
+}
+
+inline int Gamma16(int a)
+{
+	return Gamma16()[a];
+}
+
+const int *DeGamma16()
+{
+	static int table[65536];
+	if(table[65535] == 0)
+	{
+		enum { STEP = 4 };
+		int prev = 0;
+		for(int i = 0; i < 65536; i += STEP)
+		{
+			int next = minmax<int>(fround(pow((i + STEP) / 65535.0, 1.0 / 1.5) * 65535.0), 0, 65535);
+			for(int t = 0; t < STEP; t++)
+				table[i + t] = prev + iscale(next - prev, t, STEP);
+			prev = next;
+		}
+	}
+	return table;
+}
+
+inline int DeGamma16(int a)
+{
+	return DeGamma16()[a];
+}
+
+const int *Sin16()
+{
+	static int table[65536];
+	if(table[16384] == 0)
+	{
+		enum { STEP = 4 };
+		int prev = 0;
+		for(int i = 0; i < 65536; i += STEP)
+		{
+			int next = minmax<int>(fround(sin((i + STEP) * (M_PI / 32768.0)) * 65536.0), -65536, +65536);
+			for(int t = 0; t < STEP; t++)
+				table[i + t] = prev + iscale(next - prev, t, STEP);
+			prev = next;
+		}
+	}
+	return table;
+}
+
+inline int Sin16(int i)
+{
+	return Sin16()[i & 65535];
+}
+
+inline int Cos16(int i)
+{
+	return Sin16()[(i + 16384) & 65535];
+}
+
+inline byte GetRRaw(Color rgb)
+{
+	return byte(rgb.GetRaw() >> 0);
+}
+
+inline byte GetGRaw(Color rgb)
+{
+	return byte(rgb.GetRaw() >> 8);
+}
+
+inline byte GetBRaw(Color rgb)
+{
+	return byte(rgb.GetRaw() >> 16);
+}
+
+inline int GetRGamma(Color rgb)
+{
+	return Gamma16(GetRRaw(rgb) * 257);
+}
+
+inline int GetGGamma(Color rgb)
+{
+	return Gamma16(GetGRaw(rgb) * 257);
+}
+
+inline int GetBGamma(Color rgb)
+{
+	return Gamma16(GetBRaw(rgb) * 257);
+}
+
+inline int GetV16(Color rgb)
+{
+	return Gamma16(max(GetRRaw(rgb), max(GetGRaw(rgb), GetBRaw(rgb))) * 257);
+}
+
+inline int GetL16(Color rgb)
+{
+	return Gamma16(min(GetRRaw(rgb), min(GetGRaw(rgb), GetBRaw(rgb))) * 257);
+}
+
+int GetS16(Color rgb)
+{
+	int hi = GetV16(rgb);
+	if(hi <= 0)
+		return 0;
+	return iscale((hi - GetL16(rgb)), 0xFFFF, hi);
+}
+
+//inline int GetS(Color rgb) { return GetS16(rgb) >> 8; }
+
+int GetH16(Color rgb)
+{
+	int l = GetL16(rgb), v = GetV16(rgb), d = v - l;
+	if(d == 0)
+		return 0;
+	int r = GetRGamma(rgb);
+	int g = GetGGamma(rgb);
+	int b = GetBGamma(rgb);
+	int h;
+	if(g == v)
+		h = 0x5555 + (b - r) * 0x2AAA / d;
+	else if(b == v)
+		h = 0xAAAA + (r - g) * 0x2AAA / d;
+	else
+		h = (g - b) * 0x2AAA / d;
+	return h & 0xFFFF;
+}
+
+//inline int GetHValue(Color rgb) { return GetH16(rgb) >> 8; }
+
+Color HSV16toRGB(int h16, int s16, int v16)
+{
+	const int *degamma = DeGamma16();
+	int v = degamma[v16] >> 8;
+	if(s16 == 0)
+		return GrayColor(v);
+	h16 &= 0xFFFF;
+	unsigned rem = (h16 *= 6) & 0xFFFF;
+	int p = degamma[iscale(v16, 0xFFFF - s16, 65536)] >> 8;
+	int q = degamma[iscale(v16, 0xFFFF - iscale(s16, rem, 65536), 65536)] >> 8;
+	int t = degamma[iscale(v16, 0xFFFF - iscale(s16, 0xFFFFu - rem, 65536), 65536)] >> 8;
+	switch(h16 >> 16)
+	{
+	default: NEVER(); // invalid color!
+	case 0: return Color(v, t, p);
+	case 1: return Color(q, v, p);
+	case 2: return Color(p, v, t);
+	case 3: return Color(p, q, v);
+	case 4: return Color(t, p, v);
+	case 5: return Color(v, p, q);
+	}
+}
+
+static void PaintArrowRaw(Draw& draw, const Rect& rc, int y)
+{
+	Size size = CtrlImg::column_cursor().GetSize();
+	draw.DrawImage(rc.left - size.cx - 2, y - (size.cy >> 1), CtrlImg::column_cursor());
+}
+
+static void PaintArrow(Draw& draw, const Rect& rc, int pos)
+{
+	PaintArrowRaw(draw, rc, rc.bottom - pos * rc.Height() / 255);
+}
+
+static const int std_palette[] =
+{
+	0x000000, 0x808080,
+	0xC0C0C0, 0xFFFFFF,
+	0x000080, 0x0000FF,
+	0x008000, 0x00FF00,
+	0x008080, 0x00FFFF,
+	0x800000, 0xFF0000,
+	0x800080, 0xFF00FF,
+	0x808000, 0xFFFF00,
+};
+
+WheelRampCtrl::WheelRampCtrl(bool r)
+: ramp(r)
+{
+//	gamma = 2.5;
+	style = S_WHEEL;
+	color = Black;
+	normalized_color = White;
+	h16 = s16 = v16 = 0;
+	Transparent();
+}
+
+WheelRampCtrl::~WheelRampCtrl()
+{
+}
+
+void WheelRampCtrl::Layout()
+{
+	Size size = max(GetSize(), Size(10, 10));
+	round_step = 1;
+	if(size.cx <= 20)
+		column_rect = Null;
+	else
+	{
+		int col_wd = size.cx >> 3;
+		column_rect = Rect(size.cx - col_wd, 0, size.cx, size.cy);
+		column_rect.Deflate(1, 5);
+		size.cx -= col_wd + 8;
+		while(round_step < 32768 && round_step * column_rect.Height() <= 65535)
+			round_step <<= 1;
+	}
+	wheel_rect = Rect(size);
+	wheel_rect.Deflate(1, 5);
+	Refresh();
+}
+
+static byte GetColorLevel(Color color)
+{
+	return IsNull(color) ? 255 : max(color.GetR(), max(color.GetG(), color.GetB()));
+}
+
+static Color SetColorLevel(Color color, int level)
+{
+	int m = GetColorLevel(color);
+	if(!m)
+		return Color(level, level, level);
+	return Color(
+		color.GetR() * level / m,
+		color.GetG() * level / m,
+		color.GetB() * level / m);
+}
+
+int WheelRampCtrl::ClientToLevel(int y) const
+{
+	if(column_rect.IsEmpty())
+		return 65535;
+	return minmax<int>(iscale(column_rect.bottom - y, 65535, column_rect.Height()), 0, 65535);
+}
+
+int WheelRampCtrl::LevelToClient(int l) const
+{
+	return column_rect.bottom - iscale(l, column_rect.Height(), 65535);
+}
+
+void WheelRampCtrl::Paint(Draw& draw)
+{
+	if(!cache || cache.GetSize() != wheel_rect.GetSize() || cache_level != (ramp ? h16 : v16)) {
+		Size size = max(GetSize(), Size(1, 1));
+		cache = ramp ? PaintRamp(wheel_rect.GetSize()) : PaintWheel(wheel_rect.GetSize());
+		cache_level = (ramp ? h16 : v16);
+	}
+
+	draw.DrawImage(wheel_rect.left, wheel_rect.top, cache);
+	PaintColumn(draw);
+
+	Point mark = wheel_rect.CenterPoint();
+	if(ramp)
+	{
+		mark.x = wheel_rect.left + iscale(s16, wheel_rect.Width(), 65536);
+		mark.y = wheel_rect.bottom - iscale(v16, wheel_rect.Height(), 65536);
+	}
+	else
+	{
+		Point c = wheel_rect.CenterPoint();
+		Size r = wheel_rect.Size() >> 1;
+		mark.x = c.x + iscale(iscale(r.cx, s16, 65536), Cos16(h16), 65536);
+		mark.y = c.y - iscale(iscale(r.cy, s16, 65536), Sin16(h16), 65536);
+	}
+	Size size = CtrlImg::wheel_cursor().GetSize();
+	mark -= size >> 1;
+	draw.DrawImage(mark.x, mark.y, v16 >= 0x8000 ? CtrlImg::wheel_cursor() : CtrlImg::white_wheel_cursor());
+	if(!column_rect.IsEmpty())
+		PaintArrowRaw(draw, column_rect, LevelToClient(ramp ? h16 : v16));
+}
+
+void WheelRampCtrl::SetColor(Color _color, bool set_norm, bool set_hsv)
+{
+	Color new_color = Nvl(_color, White);
+	Refresh();
+	color = new_color;
+	if(set_norm)
+		normalized_color = SetColorLevel(_color, 255);
+	if(set_hsv)
+	{
+		h16 = GetH16(color);
+		v16 = GetV16(color);
+		s16 = GetS16(color);
+	}
+}
+
+void WheelRampCtrl::SetData(const Value& value)
+{
+	if(Color(value) != color)
+		SetColor(value, true, true);
+}
+
+void WheelRampCtrl::LeftUp(Point pt, dword keyflags)
+{
+	firstclick = 0;
+	ReleaseCapture();
+}
+
+#ifdef PLATFORM_WINCE
+inline double hypot(double a, double b) { return _hypot(a, b); }
+#endif
+
+void WheelRampCtrl::LeftDown(Point pt, dword keyflags)
+{
+	if(!HasCapture())
+	{
+		SetCapture();
+		if(!column_rect.IsEmpty() && pt.x >= column_rect.left)
+			firstclick = 1;
+		else if (pt.x < wheel_rect.right)
+			firstclick = 2;
+		else
+			firstclick = 0;
+	}
+
+	Color new_color = Null;
+	if(firstclick == 1)
+	{
+		if(ramp)
+			new_color = HSV16toRGB(h16 = ClientToLevel(pt.y), s16, v16);
+		else
+			new_color = HSV16toRGB(h16, s16, v16 = ClientToLevel(pt.y));
+		SetColor(new_color, false, false);
+	}
+	else if(firstclick == 2)
+	{ // set location on color wheel
+		if(ramp)
+		{
+			s16 = minmax<int>(iscale(pt.x - wheel_rect.left, 65535, wheel_rect.Width()), 0, 65535);
+			v16 = minmax<int>(iscale(wheel_rect.bottom - pt.y, 65535, wheel_rect.Height()), 0, 65535);
+			new_color = HSV16toRGB(h16, s16, v16);
+		}
+		else
+		{
+			Point c = wheel_rect.CenterPoint();
+			Size r = wheel_rect.Size() >> 1;
+			double x = (pt.x - c.x) / (double)r.cx;
+			double y = (c.y - pt.y) / (double)r.cy;
+			double s = min<double>(hypot(x, y), 1);
+			h16 = s16 = 0;
+			if(x || y)
+			{
+				double a = fmod(atan2(y, x) / (2 * M_PI) + 1, 1);
+				h16 = minmax<int>(fround(a * 65536), 0, 65535);
+				s16 = minmax<int>(fround(s * 65536), 0, 65535);
+			}
+			new_color = HSV16toRGB(h16, s16, v16);
+		}
+		SetColor(new_color, true, false);
+	}
+	Action();
+}
+
+void WheelRampCtrl::LeftDouble(Point pt, dword keyflags)
+{
+	WhenLeftDouble();
+}
+
+void WheelRampCtrl::MouseMove(Point pt, dword keyflags)
+{
+	if(keyflags & (K_MOUSELEFT | K_MOUSERIGHT))
+		LeftDown(pt, keyflags);
+}
+
+enum { PREC = 64 };
+
+Image WheelRampCtrl::PaintRamp(Size size)
+{
+	ImageDraw iw(size);
+	Size rcsize = wheel_rect.Size();
+	ImageBuffer ib(PREC, PREC);
+	for(int y = 0; y < PREC; y++) {
+		RGBA *scan = ib[y];
+		int v16 = iscale(PREC - y - 1, 65535, PREC - 1);
+		for(int x = 0; x < PREC; x++) {
+			int s16 = iscale(x, 65535, PREC - 1);
+			Color c = HSV16toRGB(h16, s16, v16);
+			scan->r = GetRRaw(c);
+			scan->g = GetGRaw(c);
+			scan->b = GetBRaw(c);
+			scan->a = 255;
+			scan++;
+		}
+	}
+	iw.DrawImage(0, 0, Rescale(ib, size));
+	DrawFrame(iw, size, Black, Black);
+	return iw;
+}
+
+Image WheelRampCtrl::PaintWheel(Size size)
+{
+	ImageBuffer ib(PREC, PREC);
+	static WheelBuff wb[PREC * PREC];
+	ONCELOCK {
+		int i = 0;
+		for(int y = 0; y < PREC; y++) {
+			double ny = (PREC / 2 - y) / (double)(PREC / 2);
+			for(int x = 0; x < PREC; x++) {
+				double nx = (x - (PREC / 2)) / (double)(PREC / 2);
+				double arg = fmod(atan2(ny, nx) / (2 * M_PI) + 1, 1);
+				double l = min<double>(hypot(nx, ny), 1);
+				wb[i].arg = fround(arg * 65535);
+				wb[i].l = fround(l * 65535);
+				i++;
+			}
+		}
+	}
+
+	WheelBuff *cwb = wb;
+	for(int y = 0; y < PREC; y++) {
+		RGBA *scan = ib[y];
+		for(int x = 0; x < PREC; x++) {
+			*scan++ = HSV16toRGB(cwb->arg, cwb->l, v16);
+			cwb++;
+		}
+	}
+
+	ImageDraw iw(size);
+	iw.DrawImage(size, Rescale(ib, size));
+	iw.DrawEllipse(size, Null, 0, Black);
+	iw.Alpha().DrawRect(size, GrayColor(0));
+	iw.Alpha().DrawEllipse(size, GrayColor(255), 0, GrayColor(255));
+	return iw;
+}
+
+void WheelRampCtrl::PaintColumn(Draw& draw)
+{
+	if(column_rect.IsEmpty())
+		return;
+	Rect rc = column_rect;
+	rc.Inflate(1, 1);
+	DrawFrame(draw, rc, Black, Black);
+	Size size = column_rect.Size();
+//	int nr = GetRRaw(normalized_color);
+//	int ng = GetGRaw(normalized_color);
+//	int nb = GetBRaw(normalized_color);
+	for(int i = column_rect.top; i < column_rect.bottom; i++)
+	{
+		int factor = ClientToLevel(i);
+		Color c = ramp ? HSV16toRGB(factor, 65535, 65535) : HSV16toRGB(h16, s16, factor);
+//			: Color(iscale(nr, factor, 65536), iscale(ng, factor, 65536), iscale(nb, factor, 65536));
+		draw.DrawRect(column_rect.left, i, size.cx, 1, c);
+	}
+}
+
+//////////////////////////////////////////////////////////////////////
+// RGBCtrl::
+
+class RGBCtrl : public Ctrl
+{
+public:
+	RGBCtrl();
+
+	virtual void  SetData(const Value& value);
+	virtual Value GetData() const { return color; }
+
+	virtual void  Layout();
+	virtual void  Paint(Draw& draw);
+
+	virtual void  LeftDown(Point pt, dword keyflags);
+	virtual void  MouseMove(Point pt, dword keyflags);
+
+private:
+	int           ClientToLevel(int y) const;
+
+private:
+	enum { BAR = 6 };
+	Rect          rect[3];
+	int           round_step;
+	Color         color;
+};
+
+RGBCtrl::RGBCtrl()
+: color(Black)
+{
+	Transparent();
+}
+
+void RGBCtrl::SetData(const Value& value)
+{
+	Color new_color = value;
+	if(color != new_color)
+		Refresh();
+	color = new_color;
+}
+
+void RGBCtrl::Layout()
+{
+	Size size = GetSize();
+	int third = max(size.cx / 3 - 3, 10);
+	rect[0] = Rect(8, 5, third - 2, max(size.cy - 5, 6));
+	rect[2] = rect[1] = rect[0];
+	rect[1].Offset((size.cx - third) >> 1, 0);
+	rect[2].Offset(size.cx - third, 0);
+	round_step = 1;
+	while(round_step < 256 && round_step * rect[0].Height() <= 255)
+		round_step <<= 1;
+}
+
+int RGBCtrl::ClientToLevel(int y) const
+{
+	y = (rect[0].bottom - y) * 255 / rect[0].Height();
+	return minmax(y & ~(round_step - 1), 0, 255);
+}
+
+void RGBCtrl::Paint(Draw& draw)
+{
+	int comp[3] = { GetRValue(color), GetGValue(color), GetBValue(color) };
+	int w = rect[0].Width() >> 1;
+	int i;
+	for(i = rect[0].top; i < rect[0].bottom; i++)
+	{
+		int   level = ClientToLevel(i);
+		Color colors[6] =
+		{
+			Color(level, comp[1], comp[2]), Color(level, 0, 0),
+			Color(comp[0], level, comp[2]), Color(0, level, 0),
+			Color(comp[0], comp[1], level), Color(0, 0, level),
+		};
+		for(int j = 0; j < 3; j++)
+		{
+			draw.DrawRect(rect[j].left, i, w, 1, colors[2 * j + 0]);
+			draw.DrawRect(rect[j].left + w + 1, i, w, 1, colors[2 * j + 1]);
+		}
+	}
+	for(i = 0; i < 3; i++)
+	{
+		Rect rc = rect[i];
+		draw.DrawRect(rc.left + w, rc.top, 1, rc.Height(), Black);
+		rc.Inflate(1);
+		DrawFrame(draw, rc, Black, Black);
+		draw.ExcludeClip(rc);
+	}
+	for(i = 0; i < 3; i++)
+		PaintArrow(draw, rect[i], comp[i]);
+}
+
+void RGBCtrl::LeftDown(Point pt, dword keyflags)
+{
+	int level = ClientToLevel(pt.y);
+	int r = GetRValue(color), g = GetGValue(color), b = GetBValue(color);
+	Color new_color = color;
+	if(pt.x <= rect[0].right)
+		new_color = Color(level, g, b);
+	else if(pt.x <= rect[1].right)
+		new_color = Color(r, level, b);
+	else
+		new_color = Color(r, g, level);
+	SetData(new_color);
+	Action();
+}
+
+void RGBCtrl::MouseMove(Point pt, dword keyflags)
+{
+	if(keyflags & (K_MOUSELEFT | K_MOUSERIGHT))
+		LeftDown(pt, keyflags);
+}
+
+//////////////////////////////////////////////////////////////////////
+// HSVCtrl::
+
+class HSVCtrl : public Ctrl
+{
+public:
+	HSVCtrl();
+
+	virtual void  SetData(const Value& value);
+	virtual Value GetData() const { return color; }
+
+	virtual void  Layout();
+	virtual void  Paint(Draw& draw);
+
+	virtual void  LeftDown(Point pt, dword keyflags);
+	virtual void  MouseMove(Point pt, dword keyflags);
+
+	int           GetHValue() const { return h16 >> 8; }
+	int           GetSValue() const { return s16 >> 8; }
+	int           GetVValue() const { return v16 >> 8; }
+
+private:
+	int           ClientToLevel16(int y) const;
+	void          SetDataRaw(Color color);
+
+private:
+	enum { BAR = 6 };
+	Rect          rect[3];
+	int           round_step;
+	Color         color;
+	int           h16, s16, v16;
+};
+
+HSVCtrl::HSVCtrl()
+: color(Black)
+, h16(0), s16(0), v16(0)
+{
+	Transparent();
+}
+
+void HSVCtrl::SetDataRaw(Color new_color)
+{
+	if(color != new_color)
+	{
+		color = new_color;
+		Refresh();
+	}
+}
+
+void HSVCtrl::SetData(const Value& value)
+{
+	Color i = Nvl(Color(value), Black);
+	if(i != color)
+	{
+		SetDataRaw(i);
+		h16 = GetH16(i);
+		s16 = GetS16(i);
+		v16 = GetV16(i);
+		Refresh();
+	}
+}
+
+void HSVCtrl::Layout()
+{
+	Size size = GetSize();
+	int third = max(size.cx / 3 - 3, 10);
+	rect[0] = Rect(8, 5, third - 2, max(size.cy - 5, 6));
+	rect[2] = rect[1] = rect[0];
+	rect[1].OffsetHorz((size.cx - third) >> 1);
+	rect[2].OffsetHorz(size.cx - third);
+	round_step = 1;
+	while(round_step < 32768 && round_step * rect[0].Height() <= 65535)
+		round_step <<= 1;
+}
+
+int HSVCtrl::ClientToLevel16(int y) const
+{
+	y = (rect[0].bottom - y) * 65535 / rect[0].Height();
+	return minmax(y & ~(round_step - 1), 0, 65535);
+}
+
+void HSVCtrl::Paint(Draw& draw)
+{
+	int w = rect[0].Width() >> 1;
+	int i;
+	for(i = rect[0].top; i < rect[0].bottom; i++)
+	{
+		int l16 = ClientToLevel16(i);
+		Color colors[6] =
+		{
+			HSV16toRGB(l16, s16, v16), HSV16toRGB(l16, 0xFFFF, 0xFFFF),
+			HSV16toRGB(h16, l16, v16), HSV16toRGB(0xAAAA, l16, 0xFFFF),
+			HSV16toRGB(h16, s16, l16), HSV16toRGB(0, 0, l16),
+		};
+		for(int j = 0; j < 3; j++)
+		{
+			draw.DrawRect(rect[j].left, i, w, 1, colors[2 * j + 0]);
+			draw.DrawRect(rect[j].left + w + 1, i, w, 1, colors[2 * j + 1]);
+		}
+	}
+	for(i = 0; i < 3; i++)
+	{
+		Rect rc = rect[i];
+		draw.DrawRect(rc.left + w, rc.top, 1, rc.Height(), Black);
+		rc.Inflate(1);
+		DrawFrame(draw, rc, Black, Black);
+		draw.ExcludeClip(rc);
+	}
+	int comp[] = { h16 >> 8, s16 >> 8, v16 >> 8 };
+	for(i = 0; i < 3; i++)
+		PaintArrow(draw, rect[i], comp[i]);
+}
+
+void HSVCtrl::LeftDown(Point pt, dword keyflags)
+{
+	int level = ClientToLevel16(pt.y);
+	if(pt.x <= rect[0].right)
+		h16 = level;
+	else if(pt.x <= rect[1].right)
+		s16 = level;
+	else
+		v16 = level;
+	Color new_color = HSV16toRGB(h16, s16, v16);
+	SetDataRaw(new_color);
+	Refresh();
+	Action();
+}
+
+void HSVCtrl::MouseMove(Point pt, dword keyflags)
+{
+	if(keyflags & (K_MOUSELEFT | K_MOUSERIGHT))
+		LeftDown(pt, keyflags);
+}
+
+//////////////////////////////////////////////////////////////////////
+// PalCtrl::
+
+//#ifdef COMPILER_MSC
+//class PalCtrl;
+//unsigned GetHashValue(PalCtrl *x) { return (unsigned) x; }
+//#endif
+
+class PalCtrl : public Ctrl
+{
+public:
+	typedef PalCtrl CLASSNAME;
+	PalCtrl();
+	virtual ~PalCtrl();
+
+	virtual void  SetData(const Value& value);
+	virtual Value GetData() const { return color; }
+
+	virtual void  Layout();
+	virtual void  Paint(Draw& draw);
+
+	virtual void  LeftDown(Point pt, dword keyflags);
+	virtual void  LeftUp(Point pt, dword keyflags);
+	virtual void  RightDown(Point pt, dword keyflags);
+	virtual Image CursorImage(Point pt, dword keyflags);
+
+	static Vector<Color> GetPalette();
+	static void   SetPalette(const Vector<Color>& pal);
+	void          SerializePalette(Stream& stream);
+
+	static void   FlushConfig() { if(GlobalConfig().loaded) StoreToGlobal(GlobalConfig(), "PalCtrl"); }
+	static void   SerializeConfig(Stream& stream) { stream % GlobalConfig(); }
+
+private:
+	void          Load();
+
+	int           ClientToIndex(Point pt) const;
+	Rect          IndexToClient(int index) const;
+
+	void          OnSetColor();
+	void          OnStandard();
+	void          OnSave();
+	void          OnLoad();
+	void          OnSizeSmall();
+	void          OnSizeMedium();
+	void          OnSizeLarge();
+	void          OnSizeCustom();
+	void          UpdateColorIndex();
+
+	static Index<PalCtrl *, PtrHash>& GetActive();
+
+public:
+	enum
+	{
+		XMAXSIZE = 16,
+		YMAXSIZE = 16,
+		MAXSIZE = XMAXSIZE * YMAXSIZE,
+	};
+
+private:
+	enum
+	{
+		OGAP = 2,
+		IGAP = 1,
+	};
+	struct Config
+	{
+		Config() : lastsize(4, 4), loaded(false) {}
+		void   Serialize(Stream& stream);
+
+		Color  current[MAXSIZE];
+		Size   lastsize;
+		String lastfile;
+		bool   loaded;
+	};
+	static Config& GlobalConfig();
+
+	Point         offset;
+	Size          cell;
+	Size          step;
+	Size          cellcount;
+	Color         color;
+	int           color_index;
+	int           swap_index;
+	int           set_index;
+	String        recent_file;
+};
+
+static void InitColor(Color *out)
+{
+	out[ 0] = Color(0x00, 0x00, 0x00);
+	out[ 1] = Color(0x80, 0x80, 0x80);
+	out[ 2] = Color(0xC0, 0xC0, 0xC0);
+	out[ 3] = Color(0xFF, 0xFF, 0xFF);
+	out[ 4] = Color(0x80, 0x00, 0x00);
+	out[ 5] = Color(0xFF, 0x00, 0x00);
+	out[ 6] = Color(0x00, 0x80, 0x00);
+	out[ 7] = Color(0x00, 0xFF, 0x00);
+	out[ 8] = Color(0x80, 0x80, 0x00);
+	out[ 9] = Color(0xFF, 0xFF, 0x00);
+	out[10] = Color(0x00, 0x00, 0x80);
+	out[11] = Color(0x00, 0x00, 0xFF);
+	out[12] = Color(0x80, 0x00, 0x80);
+	out[13] = Color(0xFF, 0x00, 0xFF);
+	out[14] = Color(0x00, 0x80, 0x80);
+	out[15] = Color(0x00, 0xFF, 0xFF);
+};
+
+PalCtrl::Config& PalCtrl::GlobalConfig()
+{
+	static PalCtrl::Config x;
+	return x;
+}
+
+typedef Index<PalCtrl *, PtrHash> PalCtrlIndex;
+
+PalCtrlIndex& PalCtrl::GetActive()
+{
+	static PalCtrlIndex x;
+	return x;
+}
+
+PalCtrl::PalCtrl()
+{
+	color = Null;
+	color_index = -1;
+	swap_index = -1;
+	cellcount = Size(4, 4);
+	Transparent();
+}
+
+PalCtrl::~PalCtrl()
+{
+	GetActive().RemoveKey(this);
+}
+
+Vector<Color> PalCtrl::GetPalette()
+{
+	int count = MAXSIZE;
+	while(count > 0 && IsNull(GlobalConfig().current[count - 1]))
+		count--;
+	Vector<Color> out;
+	out.SetCount(count);
+	for(int i = 0; i < count; i++)
+		out[i] = GlobalConfig().current[i];
+	return out;
+}
+
+
+void PalCtrl::SetPalette(const Vector<Color>& pal)
+{
+	for(int n = min<int>(pal.GetCount(), MAXSIZE), i = 0; i < n; i++)
+		GlobalConfig().current[i] = pal[i];
+	PalCtrlIndex& active = GetActive();
+	for(int c = 0; c < active.GetCount(); c++)
+		active[c]->Refresh();
+}
+
+void PalCtrl::SerializePalette(Stream& stream)
+{
+	int version = StreamHeading(stream, 1, 1, 1, "PalCtrl::Palette");
+	if(version >= 1)
+	{
+		int count = cellcount.cx * cellcount.cy;
+		stream / count;
+		for(int i = 0; i < count; i++)
+			stream % GlobalConfig().current[i];
+	}
+}
+
+INITBLOCK
+{
+	RegisterGlobalConfig("PalCtrl", callback(&PalCtrl::FlushConfig));
+}
+
+void PalCtrl::Config::Serialize(Stream& stream)
+{
+	if(stream.IsLoading() && stream.IsEof())
+		return;
+	int version = 1;
+	stream / version;
+	if(stream.IsError() || version < 1 || version > 1)
+	{
+		stream.SetError();
+		return;
+	}
+	int count = __countof(current);
+	stream / count;
+	count = min<int>(count, MAXSIZE);
+	for(int i = 0; i < count; i++)
+		stream % current[i];
+	stream % lastsize % lastfile;
+}
+
+void PalCtrl::Load()
+{
+	Config& gc = GlobalConfig();
+	if(!gc.loaded)
+	{
+		gc.loaded = true;
+		InitColor(gc.current);
+		LoadFromGlobal(gc, "PalCtrl");
+		cellcount = gc.lastsize;
+		Layout();
+		UpdateColorIndex();
+	}
+}
+
+void PalCtrl::SetData(const Value& value)
+{
+	if(Color(value) != color)
+	{
+		color = value;
+		UpdateColorIndex();
+		UpdateRefresh();
+	}
+}
+
+void PalCtrl::UpdateColorIndex()
+{
+	Config& gc = GlobalConfig();
+	if(gc.loaded)
+		color_index =(int)( UPP::Find(gc.current,
+			gc.current + __countof(gc.current), color, StdEqual<int>()) - gc.current);
+}
+
+void PalCtrl::Layout()
+{
+	cell = max((GetSize() - 2 * OGAP - (cellcount + 1) * IGAP) / cellcount, Size(2, 2));
+	step = cell + IGAP;
+	offset = (GetSize() - cellcount * step + IGAP) >> 1;
+	Refresh();
+}
+
+void PalCtrl::Paint(Draw& draw)
+{
+	Load();
+
+	GetActive().FindAdd(this);
+	draw.Begin();
+	Size tcell = GetTextSize("256", StdFont());
+	bool do_text = (tcell.cx <= cell.cx && tcell.cy <= cell.cy);
+	for(int i = 0, n = cellcount.cx * cellcount.cy; i < n; i++)
+	{
+		Rect rc = IndexToClient(i);
+		DrawFrame(draw, rc, White, Black);
+		rc.Deflate(1);
+		Color c = Nvl(GlobalConfig().current[i], SColorFace);
+		draw.DrawRect(rc, c);
+		if(do_text)
+		{
+			int brightness = 3 * c.GetR() + 6 * c.GetG() + 1 * c.GetB();
+			Color ink = (brightness <= 1280 ? White : Black);
+			draw.DrawText(rc.left + 2, rc.top + 2, IntStr(i + 1), StdFont(), ink);
+		}
+		rc.Inflate(1);
+		draw.ExcludeClip(rc);
+	}
+	if(color_index >= 0)
+	{
+		Rect selected = IndexToClient(color_index);
+		selected.Inflate(3);
+		DrawFatFrame(draw, selected, SColorMark(), 2);
+	}
+	draw.End();
+}
+
+void PalCtrl::LeftDown(Point pt, dword keyflags)
+{
+	swap_index = ClientToIndex(pt);
+	if(swap_index < 0)
+		return;
+	if(keyflags & K_CTRL)
+	{
+		set_index = swap_index;
+		swap_index = -1;
+		OnSetColor();
+		return;
+	}
+	color = GlobalConfig().current[swap_index];
+	color_index = swap_index;
+	UpdateActionRefresh();
+	SetCapture();
+}
+
+void PalCtrl::LeftUp(Point pt, dword keyflags)
+{
+	ReleaseCapture();
+	int i = ClientToIndex(pt);
+	if(i < 0 || swap_index < 0 || i == swap_index)
+	{
+		swap_index = -1;
+		return;
+	}
+	Swap(GlobalConfig().current[swap_index], GlobalConfig().current[i]);
+	color_index = i;
+	swap_index = -1;
+	UpdateActionRefresh();
+}
+
+Image PalCtrl::CursorImage(Point pt, dword keyflags)
+{
+	if(swap_index >= 0)
+		return CtrlImg::swap_color_cursor();
+	return Image::Arrow();
+}
+
+void PalCtrl::RightDown(Point pt, dword keyflags)
+{
+	MenuBar bar;
+	set_index = ClientToIndex(pt);
+	bar.Add(set_index >= 0 && !IsNull(color), t_("Set color"), THISBACK(OnSetColor))
+		.Help(t_("Write current color to selected palette slot"));
+	bar.Add(t_("Default palette"), THISBACK(OnStandard))
+		.Help(t_("Restore default system palette"));
+	bar.MenuSeparator();
+	bar.Add(t_("Save as.."), THISBACK(OnSave))
+		.Help(t_("Store palette information into a disk file"));
+	bar.Add(t_("Load"), THISBACK(OnLoad))
+		.Help(t_("Load previously saved palette"));
+	bar.MenuSeparator();
+	bool is_small = (cellcount.cx == 4 && cellcount.cy == 4);
+	bool is_medium = (cellcount.cx == 8 && cellcount.cy == 8);
+	bool is_large = (cellcount.cx == 16 && cellcount.cy == 16);
+	bar.Add(t_("Small"), THISBACK(OnSizeSmall))
+		.Check(is_small)
+		.Help(t_("Set up palette size 4 times 4 colors"));
+	bar.Add(t_("Medium"), THISBACK(OnSizeMedium))
+		.Check(is_medium)
+		.Help(t_("Set up palette size 8 times 8 colors"));
+	bar.Add(t_("Large"), THISBACK(OnSizeLarge))
+		.Check(is_large)
+		.Help(t_("Set up palette size 16 times 16 colors (maximum size)"));
+	bar.Add(t_("Custom..."), THISBACK(OnSizeCustom))
+		.Check(!is_small && !is_medium && !is_large)
+		.Help(t_("Select custom palette size"));
+	bar.Execute();
+}
+
+void PalCtrl::OnSetColor()
+{
+	if(set_index >= 0 && set_index < cellcount.cx * cellcount.cy && !IsNull(color))
+	{
+		GlobalConfig().current[set_index] = color;
+		UpdateRefresh();
+		PalCtrlIndex& active = GetActive();
+		for(int i = 0; i < active.GetCount(); i++)
+		{
+			PalCtrl *pal = active[i];
+			if(pal->color_index == set_index && pal->color != color)
+			{
+				pal->UpdateColorIndex();
+				pal->Refresh();
+			}
+		}
+	}
+}
+
+void PalCtrl::OnStandard()
+{
+	memcpy(GlobalConfig().current, std_palette, min(sizeof(GlobalConfig().current), sizeof(std_palette)));
+	PalCtrlIndex& active = GetActive();
+	for(int i = 0; i < active.GetCount(); i++)
+	{
+		PalCtrl *pal = active[i];
+		pal->UpdateColorIndex();
+		pal->Refresh();
+	}
+}
+
+void PalCtrl::OnSave()
+{
+#ifndef PLATFORM_WINCE //TODO?
+	FileSelector fsel;
+	fsel.Type(t_("Palette (*.pal)"), t_("*.pal"));
+	fsel.DefaultExt(t_("pal"));
+	fsel <<= recent_file;
+	if(fsel.ExecuteSaveAs(t_("Save palette as..")))
+	{
+		recent_file = ~fsel;
+		StringStream stream;
+		SerializePalette(stream);
+		if(!SaveFile(recent_file, stream))
+			Exclamation(NFormat(t_("Error writing file [* \1%s\1]."), recent_file));
+	}
+#endif
+}
+
+void PalCtrl::OnLoad()
+{
+#ifndef PLATFORM_WINCE //TODO?
+	FileSelector fsel;
+	fsel.Type(t_("Palette (*.pal)"), t_("*.pal"))
+		.DefaultExt(t_("pal"));
+	fsel <<= recent_file;
+	if(fsel.ExecuteOpen(t_("Load palette..")))
+	{
+		recent_file = ~fsel;
+		FileIn fi(recent_file);
+		if(!fi.IsOpen())
+		{
+			Exclamation(NFormat(t_("Error opening file [* \1%s\1]."), recent_file));
+			return;
+		}
+		SerializePalette(fi);
+		fi.Close();
+		if(fi.IsError())
+		{
+			Exclamation(NFormat(t_("Error reading palette from file [* \1%s\1]."), recent_file));
+			return;
+		}
+		Refresh();
+	}
+#endif
+}
+
+void PalCtrl::OnSizeSmall()
+{
+	GlobalConfig().lastsize = cellcount = Size(4, 4);
+	Layout();
+}
+
+void PalCtrl::OnSizeMedium()
+{
+	GlobalConfig().lastsize = cellcount = Size(8, 8);
+	Layout();
+}
+
+void PalCtrl::OnSizeLarge()
+{
+	GlobalConfig().lastsize = cellcount = Size(16, 16);
+	Layout();
+}
+
+//RegisterHelpTopicObjectTitle(DlgPalCtrlSize, s_(PalCtrlSizeCustomDlgTitle))
+
+void PalCtrl::OnSizeCustom()
+{
+	WithPalCtrlSizeLayout<TopWindow> dlg;
+//	CtrlLayoutOKCancel(dlg, DlgPalCtrlSizeHelpTitle());
+	CtrlLayoutOKCancel(dlg, t_("Palette dimensions"));
+	dlg.HelpTopic("DlgPalCtrlSize");
+	dlg.rows <<= cellcount.cy;
+	dlg.columns <<= cellcount.cx;
+	dlg.rows.NotNull().MinMax(1, 16);
+	dlg.columns.NotNull().MinMax(1, 16);
+	if(dlg.Run() == IDOK)
+	{
+		cellcount.cx = ~dlg.columns;
+		cellcount.cy = ~dlg.rows;
+		GlobalConfig().lastsize = cellcount;
+		Layout();
+	}
+}
+
+int PalCtrl::ClientToIndex(Point pt) const
+{
+	Size rel = pt - offset + (IGAP / 2);
+	Point div = idivfloor(rel, step);
+	if(div.x < 0 || div.x >= cellcount.cx || div.y < 0 || div.y >= cellcount.cy)
+		return -1;
+	return div.x * cellcount.cy + div.y;
+}
+
+Rect PalCtrl::IndexToClient(int index) const
+{
+	if(index < 0 || index >= cellcount.cx * cellcount.cy)
+		return Rect(Null);
+	return Rect(Size(index / cellcount.cy, index % cellcount.cy) * step + offset, cell);
+}
+
+//////////////////////////////////////////////////////////////////////
+// ColorSelectorImpl::
+
+class ColorSelectorImpl : public WithPaletteLayout<TopWindow>, public ColorSelector::Impl
+{
+public:
+	typedef ColorSelectorImpl CLASSNAME;
+	ColorSelectorImpl(ColorSelector& parent);
+	virtual ~ColorSelectorImpl();
+
+	void                  Attach(Ctrl& parent);
+
+	virtual void          Set(Color color);
+	virtual Color         Get() const;
+
+	virtual void          NotNull(bool _nn = true);
+	virtual bool          IsNotNull() const;
+
+	virtual Vector<Color> GetPalette() const;
+	virtual void          SetPalette(const Vector<Color>& pal);
+
+	virtual void          SerializeConfig(Stream& stream);
+
+	virtual Ctrl&         GetCtrl() { return *this; }
+
+public:
+	FetchColorCtrl        fetch_color;
+
+private:
+	void                  SetAction(Color color);
+	void                  SetRaw();
+
+	void                  UpdateRGB();
+	void                  UpdateHSV();
+
+	void                  OnRGB();
+	void                  OnHSV();
+
+//	void                  OnColor();
+	void                  OnSetTransparent();
+
+	void                  OnWheelCtrl();
+	void                  OnRampCtrl();
+	void                  OnRGBCtrl();
+	void                  OnHSVCtrl();
+	void                  OnPalCtrl();
+
+	void                  OnFetchColor();
+
+protected:
+//	WithPaletteLayout<Ctrl> dialog;
+	ColorDisplayNull      paint_color_display;
+
+private:
+	ColorSelector&        parent;
+	Color                 colorval;
+	WheelRampCtrl         wheel;
+	WheelRampCtrl         ramp;
+	RGBCtrl               rgb;
+	HSVCtrl               hsv;
+	PalCtrl               pal;
+};
+
+ColorSelectorImpl::ColorSelectorImpl(ColorSelector& parent)
+: paint_color_display(t_("(transparent)"))
+, parent(parent), wheel(false), ramp(true)
+{
+	Transparent();
+	CtrlLayout(*this);
+	parent << SizePos();
+
+//	dialog.palette_tab.Background(SLtGray);
+
+	palette_tab.Add(pal.HSizePos(4, 4).VSizePos(4, 4), t_("Palette"));
+	pal <<= THISBACK(OnPalCtrl);
+
+	palette_tab.Add(wheel.HSizePos(4, 4).VSizePos(4, 4), t_("Wheel"));
+	wheel <<= THISBACK(OnWheelCtrl);
+
+	palette_tab.Add(ramp.HSizePos(4, 4).VSizePos(4, 4), t_("Hue"));
+	ramp <<= THISBACK(OnRampCtrl);
+
+	palette_tab.Add(rgb.HSizePos(4, 4).VSizePos(4, 4), t_("RGB"));
+	rgb <<= THISBACK(OnRGBCtrl);
+
+	palette_tab.Add(hsv.HSizePos(4, 4).VSizePos(4, 4), t_("HSV"));
+	hsv <<= THISBACK(OnHSVCtrl);
+
+	color.SetFrame(InsetFrame());
+	color.SetDisplay(paint_color_display);
+	color.NoWantFocus();
+	color.SetReadOnly();
+//	dialog.color.WhenAction = THISBACK(OnColor);
+
+	fetch_color <<= THISBACK(OnFetchColor);
+
+	set_transparent <<= THISBACK(OnSetTransparent);
+	set_transparent.SetImage(CtrlImg::set_transparent());
+
+	EditIntSpin *spins[6] =
+	{
+		&r, &g, &b,
+		&h, &s, &v,
+	};
+
+	int i;
+	for(i = 0; i < __countof(spins); i++)
+	{
+		spins[i] ->	MinMax(0, 255);
+		spins[i]->WhenAction = (i < 3 ? THISBACK(OnRGB) : THISBACK(OnHSV));
+	}
+
+	Set(Black);
+}
+
+ColorSelectorImpl::~ColorSelectorImpl()
+{
+}
+
+void ColorSelectorImpl::SerializeConfig(Stream& stream)
+{
+	int version = 2;
+	stream / version;
+	if(version < 2)
+		stream % palette_tab;
+	else {
+		int t = palette_tab.Get();
+		stream / t;
+		palette_tab.Set(t);
+	}
+	Color c = colorval;
+	stream % c;
+	if(stream.IsLoading())
+		Set(c);
+	PalCtrl::SerializeConfig(stream);
+}
+
+void ColorSelectorImpl::NotNull(bool _nn)
+{
+	set_transparent.Enable(!_nn);
+}
+
+bool ColorSelectorImpl::IsNotNull() const
+{
+	return !set_transparent.IsEnabled();
+}
+
+Vector<Color> ColorSelectorImpl::GetPalette() const
+{
+	return pal.GetPalette();
+}
+
+void ColorSelectorImpl::SetPalette(const Vector<Color>& p)
+{
+	pal.SetPalette(p);
+}
+
+void ColorSelectorImpl::SetRaw()
+{
+	wheel <<= ramp <<= rgb <<= hsv <<= pal <<= colorval;
+	parent.WhenSetColor();
+}
+
+void ColorSelectorImpl::SetAction(Color color)
+{
+	Set(color);
+	parent.Action();
+}
+
+Color ColorSelectorImpl::Get() const
+{
+	return colorval;
+}
+
+void ColorSelectorImpl::Set(Color c)
+{
+	colorval = c;
+	color <<= c;
+	fetch_color <<= c;
+	UpdateRGB();
+	UpdateHSV();
+	wheel <<= ramp <<= rgb <<= hsv <<= pal <<= c;
+	parent.Update();
+	parent.WhenSetColor();
+}
+
+void ColorSelectorImpl::UpdateRGB()
+{
+	Color c = Nvl(colorval, Black);
+	r <<= c.GetR();
+	g <<= c.GetG();
+	b <<= c.GetB();
+}
+
+void ColorSelectorImpl::UpdateHSV()
+{
+	Color c = Nvl(colorval, Black);
+	double vh, vs, vv;
+	RGBtoHSV(c.GetR() / 255.0, c.GetG() / 255.0, c.GetB() / 255.0, vh, vs, vv);
+	h <<= fround(vh * 255);
+	s <<= fround(vs * 255);
+	v <<= fround(vv * 255);
+}
+
+void ColorSelectorImpl::OnRGB()
+{
+	int vr = Nvl((int)~r, 0), vg = Nvl((int)~g, 0), vb = Nvl((int)~b, 0);
+	colorval = Color(vr, vg, vb);
+	color <<= colorval;
+	UpdateHSV();
+	SetRaw();
+}
+
+void ColorSelectorImpl::OnHSV()
+{
+	int vh = Nvl((int)~h, 0), vs = Nvl((int)~s, 0), vv = Nvl((int)~v, 0);
+	double r, g, b;
+	HSVtoRGB(vh / 255.0, vs / 255.0, vv / 255.0, r, g, b);
+	colorval = Color(fround(255 * r), fround(255 * g), fround(255 * b));
+	color <<= colorval;
+	UpdateRGB();
+	SetRaw();
+}
+
+/*
+void ColorSelectorImpl::OnColor()
+{
+	SetColor(~dialog.color);
+}
+*/
+
+void ColorSelectorImpl::OnSetTransparent()
+{
+	SetAction(Null);
+}
+
+void ColorSelectorImpl::OnWheelCtrl()
+{
+	SetAction(~wheel);
+}
+
+void ColorSelectorImpl::OnRampCtrl()
+{
+	SetAction(~ramp);
+}
+
+void ColorSelectorImpl::OnRGBCtrl()
+{
+	SetAction(~rgb);
+}
+
+void ColorSelectorImpl::OnHSVCtrl()
+{
+	SetAction(~hsv);
+	h <<= hsv.GetHValue();
+	s <<= hsv.GetSValue();
+	v <<= hsv.GetVValue();
+}
+
+void ColorSelectorImpl::OnPalCtrl()
+{
+	SetAction(~pal);
+}
+
+void ColorSelectorImpl::OnFetchColor()
+{
+	SetAction(~fetch_color);
+}
+
+//////////////////////////////////////////////////////////////////////
+// ColorSelector::
+
+ColorSelector::ColorSelector(bool not_null)
+{
+	Transparent();
+	impl = new ColorSelectorImpl(*this);
+	impl->NotNull(not_null);
+}
+
+class DlgSelectColor : public WithPaletteSelectorLayout<TopWindow>
+{
+public:
+	typedef DlgSelectColor CLASSNAME;
+	DlgSelectColor();
+
+	virtual void  Serialize(Stream& stream);
+
+	Color         Run(Color init_color, bool not_null, const char *title, bool *ok);
+
+private:
+	ColorSelector selector;
+};
+
+Color RunDlgSelectColor(Color init_color, bool not_null, const char *title, bool *ok)
+{ return DlgSelectColor().Run(init_color, not_null, title, ok); }
+
+//RegisterHelpTopicObjectTitle(DlgSelectColor, s_(DlgColorDefaultTitle));
+
+DlgSelectColor::DlgSelectColor()
+{
+	palette.Transparent().NoWantFocus() << selector.SizePos();
+//	CtrlLayoutOKCancel(*this, DlgSelectColorHelpTitle());
+	CtrlLayoutOKCancel(*this, t_("Select color"));
+//RegisterHelpTopicObjectTitle(DlgSelectColor, );
+	HelpTopic("DlgSelectColor");
+	Sizeable().MaximizeBox();
+}
+
+INITBLOCK
+{
+	RegisterGlobalConfig("DlgSelectColor");
+}
+
+void DlgSelectColor::Serialize(Stream& stream)
+{
+	if(stream.IsLoading() && stream.IsEof())
+		return;
+	int version = 1;
+	stream / version;
+	if(stream.IsError() || version < 1 || version > 1) {
+		stream.SetError();
+		return;
+	}
+	SerializePlacement(stream);
+}
+
+Color DlgSelectColor::Run(Color init_color, bool not_null, const char *title, bool *ok)
+{
+	if(title)
+		Title(title);
+	selector.NotNull(not_null).Set(init_color);
+	LoadFromGlobal(*this, "DlgSelectColor");
+	bool is_ok = (TopWindow::Run() == IDOK);
+	StoreToGlobal(*this, "DlgSelectColor");
+	if(ok)
+		*ok = is_ok;
+	return is_ok ? selector.Get() : init_color;
+}
+
+ColorCtrl::ColorCtrl(bool not_null)
+: DataPusher(NoConvert(), StdColorDisplayNull())
+{
+	SetFrame(EditFieldFrame());
+	AddFrame(empty);
+	empty.SetImage(CtrlImg::cross());
+	empty <<= THISBACK(OnClear);
+	NotNull(not_null);
+}
+
+ColorCtrl::~ColorCtrl() {}
+
+void ColorCtrl::DoAction()
+{
+	bool ok;
+	Color new_color = RunDlgSelectColor(convert->Format(GetData()), IsNotNull(), 0, &ok);
+	if(ok)
+		SetDataAction(convert->Scan(new_color));
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/CtrlLib/DlgColor.h b/uppsrc/CtrlLib/DlgColor.h
new file mode 100644
index 000000000..00944ddf8
--- /dev/null
+++ b/uppsrc/CtrlLib/DlgColor.h
@@ -0,0 +1,250 @@
+#ifndef __CtrlLib_DlgColor__
+#define __CtrlLib_DlgColor__
+
+class WheelRampCtrl : public Ctrl
+{
+public:
+	WheelRampCtrl(bool ramp);
+	~WheelRampCtrl();
+
+	virtual void  Layout();
+	virtual void  Paint(Draw& draw);
+	virtual void  SetData(const Value& value);
+	virtual Value GetData() const                { return color; }
+
+	virtual void  LeftDown(Point pt, dword keyflags);
+	virtual void  LeftUp(Point pt, dword keyflags);
+	virtual void  LeftDouble(Point pt, dword keyflags);
+	virtual void  MouseMove(Point pt, dword keyflags);
+
+	Callback      WhenLeftDouble;
+
+private:
+	void          SetColor(Color color, bool set_norm, bool set_hsv);
+
+	Image         PaintRamp(Size size);
+	Image         PaintWheel(Size size);
+	void          PaintColumn(Draw& draw);
+
+	int           ClientToLevel(int y) const;
+	int           LevelToClient(int l) const;
+
+private:
+//	double        gamma;
+	bool          ramp;
+	Color         color;
+	Color         normalized_color;
+	int           h16, s16, v16;
+	int           round_step;
+	int           wheel_style;
+	enum STYLE { S_WHEEL, S_RECT, S_HEXAGON };
+	STYLE         style;
+	Image         cache;
+	int           cache_level;
+	Image         wheel_cache;
+	Rect          wheel_rect;
+	Rect          column_rect;
+
+	int           firstclick;
+
+	struct WheelBuff
+	{
+		int arg;
+		int l;
+	};
+};
+
+struct ColorWheelCtrl : public WheelRampCtrl {
+	ColorWheelCtrl() : WheelRampCtrl(false) {}
+};
+
+struct ColorRampCtrl : public WheelRampCtrl {
+	ColorRampCtrl() : WheelRampCtrl(true) {}
+};
+
+class ColorSelector : public Ctrl
+{
+public:
+	ColorSelector(bool not_null = true);
+
+	ColorSelector& NotNull(bool nn = true)                  { impl->NotNull(nn); return *this; }
+	ColorSelector& NoNotNull()                              { return NotNull(false); }
+	bool           IsNotNull() const                        { return impl->IsNotNull(); }
+
+	Color          Get() const                              { return impl->Get(); }
+	void           Set(Color c)                             { impl->Set(c); }
+
+	Vector<Color>  GetPalette() const                       { return impl->GetPalette(); }
+	void           SetPalette(const Vector<Color>& palette) { impl->SetPalette(palette); }
+
+	void           SerializeConfig(Stream& stream)          { impl->SerializeConfig(stream); }
+
+	virtual void   SetData(const Value& color)              { Set(color); }
+	virtual Value  GetData() const                          { return Get(); }
+
+	Ctrl&          GetImplCtrl()                            { return impl->GetCtrl(); }
+
+public:
+	Callback       WhenSetColor;
+
+public:
+	class Impl
+	{
+	public:
+		virtual ~Impl() {}
+
+		virtual void          Set(Color c) = 0;
+		virtual Color         Get() const = 0;
+		virtual void          NotNull(bool nn) = 0;
+		virtual bool          IsNotNull() const = 0;
+		virtual Vector<Color> GetPalette() const = 0;
+		virtual void          SetPalette(const Vector<Color>& pal) = 0;
+		virtual void          SerializeConfig(Stream& stream) = 0;
+		virtual Ctrl&         GetCtrl() = 0;
+
+	protected:
+		Impl() {}
+	};
+
+protected:
+	One<Impl>      impl;
+};
+
+class ColorCtrl : public DataPusher
+{
+public:
+	typedef ColorCtrl CLASSNAME;
+	ColorCtrl(bool not_null = true);
+	virtual ~ColorCtrl();
+
+	ColorCtrl&     NotNull(bool _nn = true) { empty.Show(!_nn); return *this; }
+	ColorCtrl&     NoNotNull()              { return NotNull(false); }
+	bool           IsNotNull() const        { return !empty.IsVisible(); }
+
+protected:
+	virtual void   DoAction();
+	void           OnClear()                { SetDataAction(Null); }
+
+protected:
+	FrameRight<Button> empty;
+};
+
+Color RunDlgSelectColor(Color init_color = Black, bool not_null = true, const char *title = 0, bool *ok = 0);
+const Display& StdColorDisplayNull();
+
+class ColorPopUp : public Ctrl {
+public:
+	virtual  void Paint(Draw& w);
+	virtual  void LeftUp(Point p, dword);
+	virtual  void LeftDown(Point p, dword);
+	virtual  void MouseMove(Point p, dword);
+	virtual  void MouseLeave();
+	virtual  void Deactivate();
+	virtual  bool Key(dword key, int count);
+
+private:
+	int      Get(Point p);
+	int      GetCy();
+	void     Setup(Color c);
+	void     Finish();
+	void     Ramp();
+	void     Wheel();
+	int      GetColorCount() const;
+	Color    GetColor(int i) const;
+	void     Select();
+
+	void 	 DrawFilledFrame(Draw &w, int x, int y, int cx, int cy, Color fcol, Color bcol);
+	void 	 DrawFilledFrame(Draw &w, Rect &r, Color fcol, Color bcol);
+
+
+	int      colori;
+	bool     notnull;
+	bool     scolors;
+	bool     norampwheel;
+	String   nulltext;
+	Color    color;
+
+	ColorRampCtrl  ramp;
+	ColorWheelCtrl wheel;
+
+public:
+	Callback WhenCancel;
+	Callback WhenSelect;
+
+	typedef ColorPopUp CLASSNAME;
+
+	void     PopUp(Ctrl *owner, Color c = White);
+	Color    Get() const;
+
+	ColorPopUp& NotNull(bool b = true)               { notnull = b; return *this; }
+	ColorPopUp& SColors(bool b = true)               { scolors = b; return *this; }//Deprecated
+	ColorPopUp& NullText(const char *s)              { nulltext = s; Refresh(); return *this; }
+	ColorPopUp& NoRampWheel(bool b = true)           { norampwheel = b; return *this; }
+
+	ColorPopUp();
+	virtual ~ColorPopUp();
+};
+
+class ColorPusher : public Ctrl {
+public:
+	virtual void  Paint(Draw& w);
+	virtual void  LeftDown(Point p, dword);
+	virtual bool  Key(dword key, int);
+	virtual void  GotFocus()                  { Refresh(); }
+	virtual void  LostFocus()                 { Refresh(); }
+	virtual void  SetData(const Value& v);
+	virtual Value GetData() const;
+
+protected:
+	bool       push;
+	bool       withtext;
+	bool       track;
+	Color      color, saved_color;
+	ColorPopUp colors;
+	String     nulltext;
+
+	void AcceptColors();
+	void CloseColors();
+	void NewColor();
+	void Drop();
+
+public:
+	typedef ColorPusher CLASSNAME;
+
+	ColorPusher& NullText(const char *s)    { nulltext = s; colors.NullText(s); Refresh(); return *this; }
+	ColorPusher& NotNull(bool b = true)     { colors.NotNull(b); return *this; }
+	ColorPusher& SColors(bool b = true)     { colors.SColors(b); return *this; }
+	ColorPusher& WithText()                 { withtext = true; return *this; }
+	ColorPusher& Track(bool b = true)       { track = b; return *this; }
+	ColorPusher& NoTrack()                  { return Track(false); }
+	ColorPusher& NoRampWheel(bool b = true) { colors.NoRampWheel(b); return *this; }
+
+	ColorPusher();
+	virtual ~ColorPusher();
+};
+
+class ColorButton : public ColorPusher {
+public:
+	virtual void  Paint(Draw& w);
+	virtual void  MouseEnter(Point p, dword keyflags);
+	virtual void  MouseLeave();
+	virtual Size  GetMinSize() const;
+
+protected:
+	Image      image, nullimage, staticimage;
+	const ToolButton::Style *style;
+
+public:
+	ColorButton& ColorImage(const Image& img)             { image = img; Refresh(); return *this; }
+	ColorButton& NullImage(const Image& img)              { nullimage = img; Refresh(); return *this; }
+	ColorButton& StaticImage(const Image& img)            { staticimage = img; Refresh(); return *this; }
+	ColorButton& SetStyle(const ToolButton::Style& s)     { style = &s; Refresh(); return *this; }
+
+	ColorButton();
+	virtual ~ColorButton();
+};
+
+String FormatColor(Color c);
+Color  ReadColor(CParser& p);
+
+#endif//__TCtrlLib_DlgColor__
diff --git a/uppsrc/CtrlLib/DocEdit.cpp b/uppsrc/CtrlLib/DocEdit.cpp
new file mode 100644
index 000000000..28054e173
--- /dev/null
+++ b/uppsrc/CtrlLib/DocEdit.cpp
@@ -0,0 +1,590 @@
+#include "CtrlLib.h"
+
+NAMESPACE_UPP
+
+void DocEdit::MouseWheel(Point p, int zdelta, dword keyflags)
+{
+	sb.Wheel(zdelta);
+}
+
+void DocEdit::ClearLines()
+{
+	para.Clear();
+	ASSERT(this->line.GetCount() == para.GetCount());
+}
+
+void DocEdit::InsertLines(int line, int count)
+{
+	para.Insert(line, Para(), count);
+	ASSERT(this->line.GetCount() == para.GetCount());
+}
+
+void DocEdit::RemoveLines(int line, int count)
+{
+	para.Remove(line, count);
+	ASSERT(this->line.GetCount() == para.GetCount());
+}
+
+DocEdit::Fmt DocEdit::Format(const WString& text) const
+{
+	FontInfo fi = font.Info();
+	Fmt fmt;
+	int tcx = fi['x'] * 4;
+	fmt.len = text.GetLength();
+	fmt.text.Alloc(text.GetLength());
+	memcpy(fmt.text, text, text.GetLength() * sizeof(wchar));
+	fmt.width.Alloc(text.GetLength());
+	fmt.line.Add(0);
+	int *w = fmt.width;
+	int x = 0;
+	const wchar *space = NULL;
+	int spacex = 0;
+	for(wchar *s = fmt.text; s < fmt.text + fmt.len; s++) {
+		int cw;
+		if(*s == '\t')
+			cw = (x + tcx) / tcx * tcx - x;
+		else
+			cw = fi[*s];
+		*w++ = cw;
+		if(*s == ' ' || *s == '\t') {
+			space = s;
+			spacex = x + cw;
+			*s = ' ';
+		}
+		x += cw;
+		if(x > cx)
+			if(space && space <= s) {
+				space++;
+				fmt.line.Add(int(space - fmt.text));
+				space = NULL;
+				x -= spacex;
+			}
+			else {
+				fmt.line.Add(int(s - fmt.text));
+				x = cw;
+			}
+	}
+	fmt.fi = fi;
+	return fmt;
+}
+
+int  DocEdit::GetHeight(int i) {
+	Para& p = para[i];
+	if(p.cx == cx) return p.cy;
+	Fmt fmt = Format(line[i]);
+	p.cx = cx;
+	p.cy = fmt.line.GetCount() * (fmt.fi.GetHeight()) + after;
+	return p.cy;
+}
+
+int DocEdit::GetY(int parai) {
+	int y = 1;
+	for(int i = 0; i < parai; i++)
+		y += GetHeight(i);
+	return y;
+}
+
+void DocEdit::InvalidateLine(int i)
+{
+	para[i].cx = -1;
+}
+
+void DocEdit::RefreshLine(int i) {
+	int q = para[i].cx >= 0 ? para[i].cy : -1;
+	Refresh(1, GetY(i) - sb, cx, GetHeight(i));
+	if(q < 0 || q != para[i].cy)
+		Refresh();
+}
+
+int sSum(const int *w, int n)
+{
+	int m = 0;
+	while(n--)
+		m += *w++;
+	return m;
+}
+
+void DocEdit::Paint(Draw& w) {
+	Size sz = GetSize();
+	Color bg =  color[IsShowEnabled() && !IsReadOnly() ? PAPER_NORMAL : PAPER_READONLY];
+	if(nobg)
+		bg = Null;
+	int y = -sb + 1;
+	int pos = 0;
+	int sell, selh;
+	GetSelection(sell, selh);
+	for(int i = 0; i < para.GetCount() && y < sz.cy; i++) {
+		int h = GetHeight(i);
+		if(y + h >= 0) {
+			WString text = line[i];
+			Fmt fmt = Format(text);
+			int p = pos;
+			for(int i = 0; i < fmt.line.GetCount(); i++) {
+				int n = fmt.LineEnd(i) - fmt.line[i];
+				int a = minmax(sell - p, 0, n);
+				int b = minmax(selh - p, 0, n) - a;
+				int c = n - a - b;
+				int *wa = fmt.width + fmt.line[i];
+				int *wb = fmt.width + fmt.line[i] + a;
+				int *wc = fmt.width + fmt.line[i] + a + b;
+				int acx = sSum(wa, a);
+				int bcx = sSum(wb, b);
+				int ccx = sSum(wc, c);
+				w.DrawRect(1, y, acx, fmt.fi.GetHeight(), bg);
+				w.DrawText(1, y, ~fmt.text + fmt.line[i], font,
+				           IsShowEnabled() ? color[INK_NORMAL] : color[INK_DISABLED], a, wa);
+				w.DrawRect(1 + acx, y, bcx, fmt.fi.GetHeight(), color[PAPER_SELECTED]);
+				w.DrawText(1 + acx, y, ~fmt.text + fmt.line[i] + a, font, color[INK_SELECTED], b, wb);
+				w.DrawRect(1 + acx + bcx, y, ccx, fmt.fi.GetHeight(), bg);
+				w.DrawText(1 + acx + bcx, y, ~fmt.text + fmt.line[i] + a + b, font, color[INK_NORMAL], c, wc);
+				p += n;
+				w.DrawRect(1 + acx + bcx + ccx, y, cx - (acx + bcx + ccx), fmt.fi.GetHeight(),
+				           p >= sell && p < selh ? color[PAPER_SELECTED] : bg);
+				y += fmt.fi.GetHeight();
+			}
+			w.DrawRect(1, y, cx, after, color[PAPER_NORMAL]);
+			y += after;
+		}
+		else
+			y += h;
+		pos += line[i].GetLength() + 1;
+	}
+	w.DrawRect(0, -sb, sz.cx, 1, bg);
+	w.DrawRect(0, 0, 1, sz.cy, bg);
+	w.DrawRect(sz.cx - 1, 0, 1, sz.cy, bg);
+	w.DrawRect(1, y++, cx, 1, SColorShadow);
+	if(y < sz.cy)
+		w.DrawRect(1, y, cx, sz.cy - y, bg);
+	DrawTiles(w, DropCaret(), CtrlImg::checkers());
+}
+
+void DocEdit::SetSb()
+{
+	Size sz = GetSize();
+	cx = max(Draw::GetStdFontCy(), sz.cx - 2);
+	sb.SetPage(GetSize().cy);
+	sb.SetTotal(GetY(para.GetCount()) + 2);
+}
+
+void DocEdit::Layout()
+{
+	SetSb();
+	Invalidate();
+}
+
+Point DocEdit::GetCaret(int pos) {
+	int i = GetLinePos(pos);
+	Fmt fmt = Format(line[i]);
+	int l;
+	for(l = 0; l < fmt.line.GetCount(); l++)
+		if(pos < fmt.line[l])
+			break;
+	l--;
+	const int *w = fmt.width + fmt.line[l];
+	pos -= fmt.line[l];
+	int x = 0;
+	while(pos-- > 0)
+		x += *w++;
+	return Point(x, GetY(i) + l * fmt.fi.GetHeight());
+}
+
+int  DocEdit::GetCursorPos(Point p) {
+	int pos = 0;
+	for(int i = 0; i < para.GetCount(); i++) {
+		int h = GetHeight(i);
+		if(p.y < h) {
+			WString text = line[i];
+			Fmt fmt = Format(text);
+			int x = 0;
+			int l = p.y / fmt.fi.GetHeight();
+			if(l < 0)
+				return pos;
+			if(l >= fmt.line.GetCount())
+				return pos + text.GetLength();
+			const int *w = fmt.width + fmt.line[l];
+			const int *e = fmt.width + fmt.LineEnd(l);
+			while(w < e) {
+				if(p.x < x + *w / 2)
+					return int(w - fmt.width) + pos;
+				x += *w++;
+			}
+			int p = int(e - fmt.width);
+			if(p > 0 && text[p - 1] == ' ' && l < fmt.line.GetCount() - 1)
+			   p--;
+			return p + pos;
+		}
+		p.y -= h;
+		pos += line[i].GetLength() + 1;
+	}
+	return GetLength();
+}
+
+void DocEdit::PlaceCaret(bool scroll) {
+	Point cr = GetCaret(cursor);
+	int fy = font.Info().GetLineHeight();
+	if(scroll)
+		if(cursor == total)
+			sb.End();
+		else
+			sb.ScrollInto(cr.y, fy + 2);
+	SetCaret(cr.x + 1, cr.y - sb, 1, fy);
+}
+
+void DocEdit::PlaceCaret(int newpos, bool select) {
+	if(newpos > GetLength())
+		newpos = GetLength();
+	int z = GetLine(newpos);
+	if(select) {
+		if(anchor < 0) {
+			anchor = cursor;
+		}
+		RefreshLines(z, GetLine(cursor));
+	}
+	else
+		if(anchor >= 0) {
+			RefreshLines(GetLine(cursor), GetLine(anchor));
+			anchor = -1;
+		}
+	cursor = newpos;
+	PlaceCaret(true);
+	if(IsSelection())
+		SetSelectionSource(ClipFmtsText());
+	SelectionChanged();
+}
+
+int DocEdit::GetMousePos(Point p)
+{
+	return GetCursorPos(Point(p.x - 1, p.y + sb - 1));
+}
+
+void DocEdit::LeftDown(Point p, dword flags) {
+	SetWantFocus();
+	int c = GetMousePos(p);
+	int l, h;
+	if(GetSelection(l, h) && c >= l && c < h) {
+		selclick = true;
+		return;
+	}
+	PlaceCaret(c, flags & K_SHIFT);
+	SetCapture();
+}
+
+void DocEdit::LeftUp(Point p, dword flags)
+{
+	if(!HasCapture() && selclick) {
+		int c = GetMousePos(p);
+		PlaceCaret(c, flags & K_SHIFT);
+		SetWantFocus();
+	}
+	selclick = false;
+}
+
+void DocEdit::MouseMove(Point p, dword flags) {
+	if(!HasCapture()) return;
+	PlaceCaret(GetMousePos(p), true);
+}
+
+void DocEdit::LeftDouble(Point, dword)
+{
+	int l, h;
+	if(GetWordSelection(cursor, l, h))
+		SetSelection(l, h);
+}
+
+void DocEdit::LeftTriple(Point, dword)
+{
+	int q = cursor;
+	int i = GetLinePos(q);
+	q = cursor - q;
+	SetSelection(q, q + GetLineLength(i) + 1);
+}
+
+Image DocEdit::CursorImage(Point, dword) {
+	return Image::IBeam();
+}
+
+void DocEdit::GotFocus() {
+	Refresh();
+}
+
+void DocEdit::LostFocus() {
+	Refresh();
+}
+
+void DocEdit::VertMove(int delta, bool select, bool scs) {
+	int hy = GetY(para.GetCount());
+	Point p = GetCaret(cursor);
+	int yy = p.y;
+	for(;;) {
+		p.y += delta;
+		if(p.y > hy) p.y = hy - 1;
+		if(p.y < 0) p.y = 0;
+		int q = GetCursorPos(p);
+		if(q >= 0 && q != cursor && delta < 0 == q < cursor && GetCaret(q).y != yy) {
+			PlaceCaret(q, select);
+			break;
+		}
+		if(p.y == 0 || p.y >= hy - 1) {
+			PlaceCaret(delta > 0 ? total : 0, select);
+			break;
+		}
+		delta = sgn(delta) * 4;
+	}
+	if(scs)
+		sb = GetCaret(cursor).y - (yy - sb);
+	PlaceCaret(true);
+}
+
+void DocEdit::HomeEnd(int x, bool select) {
+	Point p = GetCaret(cursor);
+	p.x = x;
+	PlaceCaret(GetCursorPos(p), select);
+}
+
+bool DocEdit::Key(dword key, int cnt)
+{
+	NextUndo();
+	bool h;
+	int q;
+	bool select = key & K_SHIFT;
+	int pgsk = max(8, 6 * GetSize().cy / 8);
+	switch(key & ~K_SHIFT) {
+	case K_CTRL_LEFT:
+		PlaceCaret(GetPrevWord(cursor), select);
+		break;
+	case K_CTRL_RIGHT:
+		PlaceCaret(GetNextWord(cursor), select);
+		break;
+	case K_HOME:
+		HomeEnd(0, select);
+		break;
+	case K_END:
+		HomeEnd(cx, select);
+		break;
+	case K_CTRL_HOME:
+	case K_CTRL_PAGEUP:
+		PlaceCaret(0, select);
+		break;
+	case K_CTRL_END:
+	case K_CTRL_PAGEDOWN:
+		PlaceCaret(total, select);
+		break;
+	case K_UP:
+		if(GetCursor() == 0)
+			return !updownleave;
+		VertMove(-8, select, false);
+		return true;
+	case K_DOWN:
+		if(GetCursor() == GetLength())
+			return !updownleave;
+		VertMove(8, select, false);
+		return true;
+	case K_PAGEUP:
+		VertMove(-pgsk, select, true);
+		return true;
+	case K_PAGEDOWN:
+		VertMove(pgsk, select, true);
+		return true;
+	case K_LEFT:
+		if(cursor)
+			PlaceCaret(cursor - 1, select);
+		break;
+	case K_RIGHT:
+		if(cursor < total)
+			PlaceCaret(cursor + 1, select);
+		break;
+	default:
+		if(IsReadOnly()) return MenuBar::Scan(WhenBar, key);
+		switch(key) {
+		case K_BACKSPACE:
+		case K_SHIFT|K_BACKSPACE:
+			if(RemoveSelection()) break;
+			if(cursor == 0) return true;
+			cursor--;
+			Remove(cursor, 1);
+			break;
+		case K_CTRL_BACKSPACE:
+			if(RemoveSelection()) break;
+			if(cursor <= 0) return true;
+			q = cursor - 1;
+			h = IsLetter(GetChar(q));
+			while(q > 0 && IsLetter(GetChar(q - 1)) == h) q--;
+			Remove(q, cursor - q);
+			SetCursor(q);
+			break;
+		case K_DELETE:
+			if(RemoveSelection()) break;
+			if(cursor >= total) return true;
+			if(cursor < total)
+				Remove(cursor, 1);
+			break;
+		case K_CTRL_DELETE:
+			if(RemoveSelection()) break;
+			if(cursor >= total) return true;
+			q = cursor;
+			h = IsLetter(GetChar(q));
+			while(IsLetter(GetChar(q)) == h && q < total) q++;
+			Remove(cursor, q - cursor);
+			break;
+		case K_ENTER:
+			key = '\n';
+		default:
+			if(filter && key >= 32 && key < 65535)
+				key = (*filter)(key);
+			if(key >= ' ' && key < 65536 || key == '\n' || key == '\t' || key == K_SHIFT_SPACE) {
+				if(key == K_TAB && !processtab)
+					return false;
+				if(key >= 128 && key < 65536 && charset != CHARSET_UNICODE
+				   && FromUnicode((wchar)key, charset) == DEFAULTCHAR)
+					return true;
+				RemoveSelection();
+				Insert(cursor, WString(key == K_SHIFT_SPACE ? ' ' : key, cnt), true);
+				cursor += cnt;
+				break;
+			}
+			return MenuBar::Scan(WhenBar, key);
+		}
+		UpdateAction();
+	}
+	PlaceCaret(true);
+	return true;
+}
+
+void DocEdit::Scroll()
+{
+	PlaceCaret(false);
+	Refresh();
+}
+
+void DocEdit::Invalidate()
+{
+	for(int i = 0; i < para.GetCount(); i++)
+		para[i].cx = -1;
+	PlaceCaret(false);
+}
+
+void  DocEdit::RefreshStyle()
+{
+	cursor = 0;
+	sb = 0;
+	ClearSelection();
+	Invalidate();
+	Layout();
+	Refresh();
+}
+
+void DocEdit::RightDown(Point p, dword w)
+{
+	SetFocus();
+	int c = GetMousePos(p);
+	int l, h;
+	if(!GetSelection(l, h) || c < l || c >= h)
+		PlaceCaret(c, false);
+	MenuBar::Execute(WhenBar);
+}
+
+DocEdit::DocEdit()
+{
+	updownleave = false;
+	cx = 0;
+	filter = NULL;
+	after = 0;
+	font = StdFont();
+	AutoHideSb();
+	SetFrame(ViewFrame());
+	AddFrame(sb);
+	sb.SetLine(8);
+	sb.WhenScroll = THISBACK(Scroll);
+	InsertLines(0, 1);
+}
+
+DocEdit::~DocEdit() {}
+
+void DocEdit::DragAndDrop(Point p, PasteClip& d)
+{
+	if(IsReadOnly()) return;
+	int c = GetMousePos(p);
+	if(AcceptText(d)) {
+		NextUndo();
+		int a = sb;
+		int sell, selh;
+		if(GetSelection(sell, selh)) {
+			if(c >= sell && c < selh) {
+				RemoveSelection();
+				if(IsDragAndDropSource())
+					d.SetAction(DND_COPY);
+				c = sell;
+			}
+			else
+			if(d.GetAction() == DND_MOVE && IsDragAndDropSource()) {
+				if(c > sell)
+					c -= selh - sell;
+				RemoveSelection();
+				d.SetAction(DND_COPY);
+			}
+		}
+		int count = Insert(c, GetWString(d));
+		sb = a;
+		SetFocus();
+		SetSelection(c, c + count);
+		Action();
+		return;
+	}
+	if(!d.IsAccepted()) return;
+	Point dc = Null;
+	if(c >= 0) {
+		Point cr = GetCaret(c);
+		dc = Point(cr.x + 1, cr.y);
+	}
+	if(dc != dropcaret) {
+		RefreshDropCaret();
+		dropcaret = dc;
+		RefreshDropCaret();
+	}
+}
+
+Rect DocEdit::DropCaret()
+{
+	if(IsNull(dropcaret))
+		return Rect(0, 0, 0, 0);
+	return RectC(dropcaret.x, dropcaret.y - sb, 1, font.Info().GetLineHeight());
+}
+
+void DocEdit::RefreshDropCaret()
+{
+	Refresh(DropCaret());
+}
+
+void DocEdit::DragRepeat(Point p)
+{
+	sb = (int)sb + GetDragScroll(this, p, 16).y;
+}
+
+void DocEdit::DragLeave()
+{
+	RefreshDropCaret();
+	dropcaret = Null;
+	isdrag = false;
+	Layout();
+}
+
+void DocEdit::LeftDrag(Point p, dword flags)
+{
+	int c = GetMousePos(p);
+	int l, h;
+	if(!HasCapture() && GetSelection(l, h) && c >= l && c < h) {
+		WString sample = GetW(l, min(h - l, 3000));
+		Size ssz = StdSampleSize();
+		ImageDraw iw(ssz);
+		iw.DrawRect(ssz, Black());
+		iw.Alpha().DrawRect(ssz, Black());
+		DrawTLText(iw.Alpha(), 0, 0, ssz.cx, sample, StdFont(), White());
+		NextUndo();
+		if(DoDragAndDrop(ClipFmtsText(), iw) == DND_MOVE) {
+			RemoveSelection();
+			Action();
+		}
+	}
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/CtrlLib/DropChoice.cpp b/uppsrc/CtrlLib/DropChoice.cpp
new file mode 100644
index 000000000..dcb6225f8
--- /dev/null
+++ b/uppsrc/CtrlLib/DropChoice.cpp
@@ -0,0 +1,149 @@
+#include "CtrlLib.h"
+
+NAMESPACE_UPP
+
+DropChoice::DropChoice() {
+	always_drop = false;
+	AddButton().Main() <<= THISBACK(Drop);
+	NoDisplay();
+	list.Normal();
+	list.WhenSelect = callback(this, &DropChoice::Select);
+	dropfocus = true;
+	EnableDrop(false);
+}
+
+void DropChoice::EnableDrop(bool b)
+{
+	MainButton().Enable(b);
+}
+
+void DropChoice::PseudoPush()
+{
+	MultiButton::PseudoPush(0);
+}
+
+void DropChoice::Drop() {
+	if(!owner || owner->IsReadOnly() || list.GetCount() == 0 && !WhenDrop) return;
+	WhenDrop();
+	if(dropfocus)
+		owner->SetWantFocus();
+	if(!list.FindSetCursor(owner->GetData()) && list.GetCount() > 0)
+		list.SetCursor(0);
+	list.PopUp(owner);
+}
+
+void DropChoice::Select() {
+	if(!owner || owner->IsReadOnly()) return;
+	WhenSelect();
+}
+
+Value DropChoice::Get() const {
+	if(!owner || owner->IsReadOnly()) return Value();
+	int c = list.GetCursor();
+	if(c < 0) return Value();
+	return list.Get(c, 0);
+}
+
+int DropChoice::GetIndex() const
+{
+	if(!owner || owner->IsReadOnly()) return -1;
+	return list.GetCursor();
+}
+
+bool DropChoice::DataSelect(Ctrl& owner, DropChoice& drop, const String& appends) {
+	Value g = drop.Get();
+	if(g.IsVoid()) return false;
+	Value s = owner.GetData();
+	if(!appends.IsVoid()) {
+		String txt = s;
+		if(!txt.IsEmpty()) txt.Cat(appends);
+		txt.Cat((String)g);
+		s = txt;
+	}
+	else
+		s = g;
+	owner.SetData(s);
+	owner.WhenAction();
+	return true;
+}
+
+bool DropChoice::DoKey(dword key) {
+	if(owner && !owner->IsReadOnly() && list.GetCount()) {
+		int q = list.GetCursor();
+		switch(key) {
+		case K_ALT_DOWN:
+			PseudoPush();
+			return true;
+		case K_DOWN:
+			if(appending)
+				PseudoPush();
+			else {
+				list.SetCursor(q <= 0 ? list.GetCount() - 1 : q - 1);
+				Select();
+			}
+			return true;
+		case K_UP:
+			if(appending)
+				PseudoPush();
+			else {
+				list.SetCursor(q < 0 || q >= list.GetCount() - 1 ? 0 : q + 1);
+				Select();
+			}
+			return true;
+		}
+	}
+	return false;
+}
+
+void DropChoice::Add(const Value& s) {
+	list.Add(s);
+	EnableDrop(true);
+}
+
+void DropChoice::Clear() {
+	list.Clear();
+	EnableDrop(always_drop);
+}
+
+void DropChoice::Serialize(Stream& s) {
+	int version = 0x00;
+	int n = list.GetCount();
+	s / version / n;
+	Value v;
+	if(s.IsLoading()) {
+		Clear();
+		for(int i = 0; i < n; i++) {
+			s % v;
+			Add(v);
+		}
+	}
+	else
+		for(int i = 0; i < n; i++) {
+			v = list.Get(i, 0);
+			s % v;
+		}
+	EnableDrop(list.GetCount() || always_drop);
+}
+
+void DropChoice::AddHistory(const Value& v, int max) {
+	if(IsNull(v)) return;
+	for(int i = 0; i < list.GetCount(); i++)
+		if(list.Get(i, 0) == v) {
+			list.Remove(i);
+			break;
+		}
+	list.Insert(0, Vector<Value>() << v);
+	if(list.GetCount() > max)
+		list.SetCount(max);
+	EnableDrop(list.GetCount() || always_drop);
+	list.KillCursor();
+}
+
+DropChoice& DropChoice::AlwaysDrop(bool e)
+{
+	always_drop = e;
+	EnableDrop(list.GetCount() || always_drop);
+	return *this;
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/CtrlLib/DropChoice.h b/uppsrc/CtrlLib/DropChoice.h
new file mode 100644
index 000000000..e2d10f7ce
--- /dev/null
+++ b/uppsrc/CtrlLib/DropChoice.h
@@ -0,0 +1,283 @@
+void DropEdge_Write(Value);
+
+class PopUpTable : public ArrayCtrl {
+public:
+	virtual void Deactivate();
+	virtual void LeftUp(Point p, dword keyflags);
+	virtual bool Key(dword key, int);
+	virtual void CancelMode();
+
+protected:
+	int          droplines;
+	bool         open;
+
+	void         DoClose();
+
+public:
+	void         PopUp(Ctrl *owner, int x, int top, int bottom, int width);
+	void         PopUp(Ctrl *owner, int width);
+	void         PopUp(Ctrl *owner);
+
+	Callback     WhenCancel;
+	Callback     WhenSelect;
+
+	PopUpTable&  SetDropLines(int _droplines)          { droplines = _droplines; return *this; }
+
+	void         Normal();
+
+	PopUpTable();
+	virtual ~PopUpTable();
+};
+
+class DropList : public MultiButton, public Convert {
+public:
+	virtual void  MouseWheel(Point p, int zdelta, dword keyflags);
+	virtual bool  Key(dword key, int);
+	virtual void  SetData(const Value& data);
+	virtual Value GetData() const;
+
+	virtual Value Format(const Value& q) const;
+
+private:
+	PopUpTable         list;
+	Index<Value>       key;
+	Value              value;
+	const Convert     *valueconvert;
+	const Display     *valuedisplay;
+	bool               displayall;
+	bool               dropfocus;
+	bool               notnull;
+	bool               alwaysdrop;
+
+	void          Select();
+	void          Cancel();
+	void          Change(int q);
+	void          EnableDrop(bool b = true)         { MainButton().Enable(b || alwaysdrop); }
+	void          Sync();
+
+	typedef       DropList CLASSNAME;
+
+public:
+	typedef MultiButton::Style Style;
+
+	Callback      WhenDrop;
+
+	DropList&     Add(const Value& key, const Value& value);
+	DropList&     Add(const Value& value)         { return Add(value, value); }
+	void          Remove(int i);
+	void          ClearList();
+	void          Clear();
+
+	DropList&     AddSeparator();
+
+	void          Drop();
+
+	const Value& operator=(const Value& v)        { SetData(v); return v; }
+	operator Value() const                        { return GetData(); }
+
+	void          SetIndex(int i)                 { SetData(GetKey(i)); }
+	int           GetIndex() const                { return FindKey(value); }
+	void          GoBegin()                       { if(GetCount()) SetIndex(0); }
+	void          GoEnd()                         { if(GetCount()) SetIndex(GetCount() - 1); }
+
+	bool          HasKey(const Value& k) const    { return key.Find(k) >= 0; }
+	int           FindKey(const Value& k) const   { return key.Find(k); }
+	int           Find(const Value& k) const      { return key.Find(k); }
+	int           FindValue(const Value& v) const { return list.Find(v); }
+
+	int           GetCount() const                { return key.GetCount(); }
+	void          Trim(int n);
+	const Value&  GetKey(int i) const             { return key[i]; }
+
+	Value         GetValue(int i) const           { return list.Get(i, 0); }
+	Value         GetValue() const;
+	void          SetValue(int i, const Value& v);
+	void          SetValue(const Value& v);
+	Value         operator[](int i) const         { return GetValue(i); }
+
+	void          Adjust();
+	void          Adjust(const Value& k);
+
+	const PopUpTable& GetList() const                   { return list; }
+	PopUpTable&   ListObject()                          { return list; }
+
+	DropList&     SetDropLines(int d)                   { list.SetDropLines(d); return *this; }
+	DropList&     SetConvert(const Convert& cv);
+	DropList&     SetDisplay(int i, const Display& d);
+	DropList&     SetDisplay(const Display& d);
+	DropList&     SetLineCy(int lcy)                    { list.SetLineCy(lcy); return *this; }
+	DropList&     SetDisplay(const Display& d, int lcy);
+	DropList&     ValueDisplay(const Display& d);
+	DropList&     DisplayAll(bool b = true)             { displayall = b; return *this; }
+	DropList&     DropFocus(bool b = true)              { dropfocus = b; return *this; }
+	DropList&     NoDropFocus()                         { return DropFocus(false); }
+	DropList&     AlwaysDrop(bool e = true);
+	DropList&     SetStyle(const Style& s)              { MultiButton::SetStyle(s); return *this; }
+	DropList&     NotNull(bool b = true)                { notnull = b; return *this; }
+
+	DropList&     SetScrollBarStyle(const ScrollBar::Style& s) { list.SetScrollBarStyle(s); return *this; }
+
+	DropList();
+	virtual ~DropList();
+};
+
+void Add(DropList& list, const VectorMap<Value, Value>& values);
+void Add(MapConvert& convert, const VectorMap<Value, Value>& values);
+void Add(DropList& list, const MapConvert& convert);
+
+class DropChoice : public MultiButtonFrame {
+protected:
+	PopUpTable         list;
+	Ctrl              *owner;
+	bool               appending;
+	bool               dropfocus;
+	bool               always_drop;
+
+	void        Select();
+	void        Drop();
+	void        EnableDrop(bool b);
+	void        PseudoPush();
+
+	typedef DropChoice CLASSNAME;
+
+public:
+	Callback    WhenDrop;
+	Callback    WhenSelect;
+
+	bool        DoKey(dword key);
+
+	void        Clear();
+	void        Add(const Value& data);
+	void        Serialize(Stream& s);
+
+	int         GetCount() const                      { return list.GetCount(); }
+	Value       Get(int i) const                      { return list.Get(i, 0); }
+
+	void        AddHistory(const Value& data, int max = 12);
+
+	void        AddTo(Ctrl& _owner)                   { MultiButtonFrame::AddTo(_owner); owner = &_owner; }
+	bool        IsActive() const                      { return IsOpen(); }
+
+//	void        Show(bool b = true)                   { drop.Show(b); }
+//	void        Hide()                                { Show(false); }
+
+	Value       Get() const;
+	int         GetIndex() const;
+
+	DropChoice& SetDisplay(int i, const Display& d)   { list.SetDisplay(i, 0, d); return *this; }
+	DropChoice& SetDisplay(const Display& d)          { list.ColumnAt(0).SetDisplay(d); return *this; }
+	DropChoice& SetLineCy(int lcy)                    { list.SetLineCy(lcy); return *this; }
+	DropChoice& SetDisplay(const Display& d, int lcy) { SetDisplay(d); SetLineCy(lcy); return *this; }
+	DropChoice& SetDropLines(int n)                   { list.SetDropLines(n); return *this; }
+	DropChoice& Appending()                           { appending = true; return *this; }
+	DropChoice& AlwaysDrop(bool e = true);
+	DropChoice& NoDropFocus()                         { dropfocus = false; return *this; }
+
+	DropChoice& SetScrollBarStyle(const ScrollBar::Style& s) { list.SetScrollBarStyle(s); return *this; }
+
+	DropChoice();
+
+	static bool DataSelect(Ctrl& owner, DropChoice& drop, const String& appends);
+};
+
+template <class T>
+class WithDropChoice : public T {
+public:
+	virtual bool   Key(dword key, int repcnt);
+	virtual void   MouseEnter(Point p, dword keyflags);
+	virtual void   MouseLeave();
+	virtual void   GotFocus();
+	virtual void   LostFocus();
+
+
+protected:
+	DropChoice      select;
+	String          appends;
+
+	void            DoWhenSelect();
+	void            DoWhenDrop()                          { WhenDrop(); }
+
+public:
+	Callback        WhenDrop;
+	Callback        WhenSelect;
+
+	void            ClearList()                           { select.Clear(); }
+	void            AddList(const Value& data)            { select.Add(data); }
+	void            SerializeList(Stream& s)              { select.Serialize(s); }
+
+	int             GetCount() const                      { return select.GetCount(); }
+	Value           Get(int i) const                      { return select.Get(i); }
+
+	void            AddHistory(int max = 12)              { select.AddHistory(this->GetData(), max); }
+
+	MultiButton::SubButton& AddButton()                   { return select.AddButton(); }
+	int                     GetButtonCount() const        { return select.GetButtonCount(); }
+	MultiButton::SubButton& GetButton(int i)              { return select.GetButton(i); }
+	Rect                    GetPushScreenRect() const     { return select.GetPushScreenRect(); }
+
+	const MultiButton::Style& StyleDefault()              { return select.StyleFrame(); }
+	WithDropChoice& SetStyle(const MultiButton::Style& s) { select.SetStyle(s); return *this; }
+
+	WithDropChoice& Dropping(bool b = true)               { select.Show(b); return *this; }
+	WithDropChoice& NoDropping()                          { return Dropping(false); }
+	WithDropChoice& NoDropFocus()                         { select.NoDropFocus(); return *this; }
+	WithDropChoice& Appending(const String& s = ", ")     { appends = s; select.Appending(); return *this; }
+	WithDropChoice& SetDropLines(int n)                   { select.SetDropLines(n); return *this; }
+	WithDropChoice& SetDisplay(int i, const Display& d)   { select.SetDisplay(i, d); return *this; }
+	WithDropChoice& SetDisplay(const Display& d)          { select.SetDisplay(d); return *this; }
+	WithDropChoice& SetLineCy(int lcy)                    { select.SetLineCy(lcy); return *this; }
+	WithDropChoice& SetDisplay(const Display& d, int lcy) { select.SetDisplay(d, lcy); return *this; }
+	WithDropChoice& AlwaysDrop(bool b = true)             { select.AlwaysDrop(b); return *this; }
+
+	WithDropChoice();
+};
+
+template <class T>
+WithDropChoice<T>::WithDropChoice() {
+	select.AddTo(*this);
+	select.WhenDrop = callback(this, &WithDropChoice::DoWhenDrop);
+	select.WhenSelect = callback(this, &WithDropChoice::DoWhenSelect);
+	appends = String::GetVoid();
+	SetStyle(StyleDefault());
+}
+
+template <class T>
+bool WithDropChoice<T>::Key(dword key, int repcnt) {
+	return select.DoKey(key) || T::Key(key, repcnt);
+}
+
+template <class T>
+void WithDropChoice<T>::MouseEnter(Point p, dword keyflags)
+{
+	select.Refresh();
+	T::MouseEnter(p, keyflags);
+}
+
+template <class T>
+void WithDropChoice<T>::MouseLeave()
+{
+	select.Refresh();
+	T::MouseLeave();
+}
+
+template <class T>
+void WithDropChoice<T>::GotFocus()
+{
+	select.Refresh();
+	T::GotFocus();
+}
+
+template <class T>
+void WithDropChoice<T>::LostFocus()
+{
+	select.Refresh();
+	T::LostFocus();
+}
+
+template <class T>
+void WithDropChoice<T>::DoWhenSelect() {
+	if(DropChoice::DataSelect(*this, select, appends)) {
+		this->SetFocus();
+		WhenSelect();
+	}
+}
diff --git a/uppsrc/CtrlLib/DropList.cpp b/uppsrc/CtrlLib/DropList.cpp
new file mode 100644
index 000000000..c15c59a53
--- /dev/null
+++ b/uppsrc/CtrlLib/DropList.cpp
@@ -0,0 +1,273 @@
+#include "CtrlLib.h"
+
+NAMESPACE_UPP
+
+void DropList::Sync() {
+	Value v;
+	if(displayall)
+		v = value;
+	int i = key.Find(value);
+	const Display& d = valuedisplay ? *valuedisplay : i >= 0 ? list.GetDisplay(i, 0)
+	                                                         : list.GetDisplay(0);
+	if(i >= 0) v = list.Get(i, 0);
+	MultiButton::SetDisplay(d);
+	MultiButton::SetValueCy(list.GetLineCy());
+	v = valueconvert->Format(v);
+	Set(v);
+}
+
+void DropList::Change(int q) {
+	if(key.GetCount() == 0) return;
+	int i = key.Find(value);
+	i += q;
+	if(i >= key.GetCount()) i = key.GetCount() - 1;
+	if(i < 0) i = 0;
+	if(value != key[i]) {
+		value = key[i];
+		Sync();
+		UpdateAction();
+	}
+}
+
+bool DropList::Key(dword k, int) {
+	if(IsReadOnly()) return false;
+	switch(k) {
+	case K_ALT_DOWN:
+		Drop();
+		break;
+	case K_DOWN:
+	case K_RIGHT:
+		Change(1);
+		break;
+	case K_UP:
+	case K_LEFT:
+		Change(-1);
+		break;
+	default:
+		if(k >= 32 && k < 256) {
+			bool b = list.Key(k, 1);
+			if(list.GetCursor() >= 0 && list.GetCursor() < key.GetCount() && key[list.GetCursor()] != value)
+				Select();
+			return b;
+		}
+		return false;
+	}
+	return true;
+}
+
+void DropList::MouseWheel(Point, int zdelta, dword)
+{
+	Change(zdelta < 0 ? 1 : -1);
+}
+
+void DropList::Drop() {
+	if(IsReadOnly()) return;
+	if(dropfocus)
+		SetFocus();
+	WhenDrop();
+	list.SetCursor(key.Find(value));
+	list.PopUp(this);
+}
+
+void DropList::Select() {
+	int c = list.GetCursor();
+	if(c >= 0)
+		value = key[c];
+	if(dropfocus)
+		SetFocus();
+	Sync();
+	UpdateAction();
+}
+
+void DropList::Cancel() {
+	if(dropfocus)
+		SetFocus();
+	Sync();
+}
+
+void DropList::Remove(int i)
+{
+	key.Remove(i);
+	list.Remove(i);
+	Adjust();
+}
+
+void DropList::ClearList() {
+	key.Clear();
+	list.Clear();
+	Sync();
+	list.Refresh();
+	EnableDrop(false);
+}
+
+void DropList::Clear() {
+	ClearList();
+	value = Value();
+	Sync();
+	Update();
+}
+
+DropList& DropList::Add(const Value& _key, const Value& text)
+{
+	key.Add(_key);
+	list.Add(text);
+	list.Refresh();
+	EnableDrop();
+	Sync();
+	return *this;
+}
+
+DropList& DropList::AddSeparator()
+{
+	key.Add(Null);
+	list.AddSeparator();
+	list.Refresh();
+	EnableDrop();
+	Sync();
+	return *this;
+}
+
+void DropList::Trim(int n) {
+	if(GetIndex() >= n)
+		SetIndex(0);
+	key.Trim(n);
+	list.SetCount(n);
+	Sync();
+	list.Refresh();
+	EnableDrop(n);
+}
+
+void DropList::SetData(const Value& data) {
+	if(value != data) {
+		value = data;
+		Update();
+		Sync();
+	}
+}
+
+Value DropList::GetData() const {
+	return notnull && IsNull(value) ? NotNullError() : value;
+}
+
+Value DropList::GetValue() const {
+	int i = FindKey(value);
+	return i < 0 ? Null : GetValue(i);
+}
+
+void  DropList::SetValue(int i, const Value& v) {
+	list.Set(i, 0, v);
+	EnableDrop();
+	Sync();
+}
+
+void  DropList::SetValue(const Value& v) {
+	int i = FindKey(value);
+	if(i >= 0)
+		SetValue(i, v);
+	Sync();
+}
+
+DropList& DropList::SetConvert(const Convert& cv)
+{
+	list.ColumnAt(0).SetConvert(cv);
+	valueconvert = &cv;
+	Sync();
+	return *this;
+}
+
+DropList& DropList::SetDisplay(int i, const Display& d)
+{
+	list.SetDisplay(i, 0, d);
+	Sync();
+	return *this;
+}
+
+DropList& DropList::SetDisplay(const Display& d)
+{
+	list.ColumnAt(0).SetDisplay(d);
+	Sync();
+	return *this;
+}
+
+DropList& DropList::SetDisplay(const Display& d, int lcy)
+{
+	SetDisplay(d);
+	SetLineCy(lcy);
+	Sync();
+	return *this;
+}
+
+DropList& DropList::ValueDisplay(const Display& d)
+{
+	valuedisplay = &d;
+	Sync();
+	return *this;
+}
+
+void  DropList::Adjust()
+{
+	int i = FindKey(value);
+	if(i < 0)
+		if(GetCount())
+			SetIndex(0);
+		else
+			SetData(Null);
+}
+
+void DropList::Adjust(const Value& k)
+{
+	int i = FindKey(value);
+	if(i < 0 && GetCount())
+		SetData(k);
+}
+
+Value DropList::Format(const Value& q) const {
+	int i = FindKey(q);
+	return valueconvert->Format(i < 0 ? Null : GetValue(i));
+}
+
+DropList& DropList::AlwaysDrop(bool e)
+{
+	alwaysdrop = e;
+	if(e)
+		EnableDrop();
+	return *this;
+}
+
+DropList::DropList()
+{
+	displayall = false;
+	valueconvert = &NoConvert();
+	valuedisplay = NULL;
+	dropfocus = false;
+	notnull = false;
+	alwaysdrop = false;
+	AddButton().Main().WhenPush = THISBACK(Drop);
+	NoInitFocus();
+	EnableDrop(false);
+	list.Normal();
+	list.WhenSelect = THISBACK(Select);
+	list.WhenCancel = THISBACK(Cancel);
+}
+
+DropList::~DropList() {}
+
+void Add(DropList& list, const VectorMap<Value, Value>& values)
+{
+	for(int i = 0; i < values.GetCount(); i++)
+		list.Add(values.GetKey(i), values[i]);
+}
+
+void Add(MapConvert& convert, const VectorMap<Value, Value>& values)
+{
+	for(int i = 0; i < values.GetCount(); i++)
+		convert.Add(values.GetKey(i), values[i]);
+}
+
+void Add(DropList& list, const MapConvert& convert)
+{
+	for(int i = 0; i < convert.GetCount(); i++)
+		list.Add(convert.GetKey(i), convert.GetValue(i));
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/CtrlLib/EditCtrl.h b/uppsrc/CtrlLib/EditCtrl.h
new file mode 100644
index 000000000..a24cbd1ee
--- /dev/null
+++ b/uppsrc/CtrlLib/EditCtrl.h
@@ -0,0 +1,346 @@
+struct TextArrayOps {
+	virtual int GetLength() const = 0;
+	virtual int GetChar(int i) const = 0;
+
+	bool GetWordSelection(int c, int& sell, int& selh);
+	int  GetNextWord(int c);
+	int  GetPrevWord(int c);
+	
+	virtual ~TextArrayOps() {}
+};
+
+class LookFrame : public CtrlFrame {
+public:
+	virtual void FrameLayout(Rect& r);
+	virtual void FramePaint(Draw& w, const Rect& r);
+	virtual void FrameAddSize(Size& sz);
+
+private:
+	Value (*look)();
+	Value lookv;
+	Value Get() const { return look ? (*look)() : lookv; }
+
+public:
+	void  Set(const Value& v)                  { look = NULL; lookv = v; }
+	void  Set(Value (*l)())                    { look = l; }
+	LookFrame(Value (*look)()) : look(look)    {}
+	LookFrame(const Value& v) : lookv(v) { look = NULL; }
+	LookFrame() { look = NULL; }
+};
+
+Value EditFieldEdge();
+Value ViewEdge();
+
+void ViewEdge_Write(Value);
+
+CtrlFrame& EditFieldFrame();
+CtrlFrame& ViewFrame();
+
+class ActiveEdgeFrame : public CtrlFrame {
+public:
+	virtual void FrameLayout(Rect& r);
+	virtual void FramePaint(Draw& w, const Rect& r);
+	virtual void FrameAddSize(Size& sz);
+
+private:
+	const Value *edge;
+	const Ctrl  *ctrl;
+	bool  mousein;
+
+public:
+	void Set(const Ctrl *ctrl, const Value *edge, bool active);
+	void Mouse(bool in) { mousein = in; }
+
+	ActiveEdgeFrame() { edge = NULL; mousein = false; }
+};
+
+class EditField : public Ctrl, private TextArrayOps {
+public:
+	virtual void  Layout();
+	virtual void  Paint(Draw& draw);
+	virtual void  LeftDown(Point p, dword keyflags);
+	virtual void  MiddleDown(Point p, dword keyflags);
+	virtual void  MouseMove(Point p, dword keyflags);
+	virtual void  LeftDouble(Point p, dword keyflags);
+	virtual void  LeftTriple(Point p, dword keyflags);
+	virtual void  LeftDrag(Point p, dword flags);
+	virtual void  LeftUp(Point p, dword flags);
+	virtual void  RightDown(Point p, dword keyflags);
+	virtual void  MouseEnter(Point p, dword keyflags);
+	virtual void  MouseLeave();
+	virtual Image CursorImage(Point p, dword keyflags);
+	virtual void  DragAndDrop(Point p, PasteClip& d);
+	virtual void  DragRepeat(Point p);
+	virtual void  DragLeave();
+	virtual bool  Key(dword key, int rep);
+	virtual void  GotFocus();
+	virtual void  LostFocus();
+	virtual Size  GetMinSize() const;
+	virtual void  SetData(const Value& data);
+	virtual Value GetData() const;
+	virtual void  CancelMode();
+	virtual String GetSelectionData(const String& fmt) const;
+
+public:
+	struct Style : ChStyle<Style> {
+		Color paper;
+		Color disabled;
+		Color focus;
+		Color invalid;
+		Color text, textdisabled;
+		Color selected, selectedtext;
+		Value edge[4];
+		bool  activeedge;
+	};
+
+protected:
+	const Style *style;
+
+	ActiveEdgeFrame edge;
+
+	WString    text;
+	int        sc;
+	int        cursor, anchor;
+
+	WString    undotext;
+	int        undocursor, undoanchor;
+
+	CharFilter      filter;
+	const Convert  *convert;
+	const Convert  *inactive_convert;
+	Font            font;
+
+	WString         nulltext;
+	Color           nullink;
+	Font            nullfont;
+	int             maxlen;
+	int             autosize;
+	byte            charset;
+
+	int        dropcursor;
+	Rect       dropcaret;
+	bool       selclick;
+
+	bool       password:1;
+	bool       autoformat:1;
+	bool       initcaps:1;
+	bool       keep_selection:1;
+	bool       clickselect:1;
+	bool       nobg:1;
+	bool       alignright:1;
+
+	bool    FrameIsEdge();
+	void    SetEdge(int i);
+	void    SyncEdge();
+	int     GetTextCx(const wchar *text, int n, bool password, Font fnt);
+	void    Paints(Draw& w, int& x, int fcy, const wchar *&txt,
+		           Color ink, Color paper, int n, bool pwd, Font fnt);
+	int     GetStringCx(const wchar *text, int n);
+	int     GetCaret(int cursor);
+	int     GetCursor(int posx);
+	void    SyncCaret();
+	void    Finish(bool refresh = true);
+	void    SaveUndo();
+	void    DoAutoFormat();
+	int     GetTy();
+	void    Undo();
+	void    Cut();
+	void    Paste();
+	void    Erase();
+	void    SelectAll();
+	void    MenuBar(Bar& menu);
+
+
+
+public:
+	static const Style& StyleDefault();
+	EditField&  SetStyle(const Style& s);
+
+	static  int   GetViewHeight(Font font = StdFont());
+	static  int   GetStdHeight(Font font = StdFont());
+
+	int     Insert(int pos, const WString& text);
+	int     Insert(int pos, const String& text)         { return Insert(pos, text.ToWString()); }
+	int     Insert(int pos, const char *text)           { return Insert(pos, WString(text)); }
+	void    Remove(int pos, int n);
+
+	void    Insert(const WString& text);
+	void    Insert(const String& text)                  { return Insert(text.ToWString()); }
+	void    Insert(const char *text)                    { return Insert(WString(text)); }
+	void    Insert(int chr);
+
+	void    Move(int newpos, bool select = false);
+
+	void    SetSelection(int l = 0, int h = INT_MAX);
+	bool    GetSelection(int& l, int& h) const;
+	bool    IsSelection() const;
+	bool    RemoveSelection();
+	void    CancelSelection();
+	void    Copy();
+
+	void           SetText(const WString& text);
+	void           SetText(const String& t)  { SetText(t.ToWString()); }
+	void           SetText(const char *t)    { SetText(WString(t)); }
+	const WString& GetText() const           { return text; }
+
+	operator const WString&() const          { return text; }
+	operator String() const                  { return text.ToString(); }
+	void operator=(const WString& s)         { SetText(s); }
+	int     GetLength() const                { return text.GetLength(); }
+	int     GetChar(int i) const             { return text[i]; }
+
+	void    Clear();
+	void    Reset();
+
+	EditField& Password(bool pwd = true)     { password = pwd; Finish(); return *this; }
+	EditField& SetFilter(int (*f)(int))      { filter = f; return *this; }
+	EditField& SetConvert(const Convert& c)  { convert = &c; return *this; }
+	EditField& SetInactiveConvert(const Convert& c) { inactive_convert = &c; return *this; }
+	EditField& AutoFormat(bool b = true)     { autoformat = b; return *this; }
+	EditField& NoAutoFormat()                { return AutoFormat(false); }
+	EditField& SetCharset(byte cs)           { charset = cs; return *this; }
+	EditField& SetFont(Font _font);
+	EditField& ClickSelect(bool b = true)    { clickselect = b; return *this; }
+	EditField& InitCaps(bool b = true)       { initcaps = b; return *this; }
+	EditField& NullText(const char *text = t_("(default)"), Color ink = Brown);
+	EditField& NullText(const char *text, Font fnt, Color ink);
+	EditField& MaxChars(int mc)              { maxlen = mc; return *this; }
+	EditField& AutoSize(int maxcx = INT_MAX) { autosize = maxcx; Finish(); return *this; }
+	EditField& NoBackground(bool b = true)   { nobg = b; Transparent(); Refresh(); return *this; }
+	EditField& AlignRight(bool b = true)     { alignright = b; Refresh(); return *this; }
+
+	CharFilter     GetFilter() const         { return filter; }
+	const Convert& GetConvert() const        { return *convert; }
+	Font           GetFont() const           { return font; }
+
+	typedef EditField CLASSNAME;
+
+	EditField();
+	virtual ~EditField();
+};
+
+template <class DataType, class Cv>
+class EditValue : public EditField, public Cv {
+public:
+	EditValue& operator=(const DataType& t)  { SetData(t); return *this; }
+	operator DataType() const                { return GetData(); }
+
+	EditValue()                              { SetConvert(*this); }
+};
+
+template <class DataType, class Cv>
+class EditMinMax : public EditValue<DataType, Cv> {
+public:
+	EditMinMax& operator=(const DataType& t)          { SetData(t); return *this; }
+
+	EditMinMax() {}
+	EditMinMax(DataType min, DataType max)            { Cv::MinMax(min, max); }
+
+	EditMinMax& Min(DataType min)                     { Cv::Min(min); return *this; }
+	EditMinMax& Max(DataType max)                     { Cv::Max(max); return *this; }
+	EditMinMax& NotNull(bool nn = true)               { Cv::NotNull(nn); return *this; }
+};
+
+template <class DataType, class Cv>
+class EditMinMaxNotNull : public EditValue<DataType, Cv> {
+public:
+	EditMinMaxNotNull& operator=(const DataType& t)   { SetData(t); return *this; }
+
+	EditMinMaxNotNull()                               { Cv::NotNull(); }
+	EditMinMaxNotNull(DataType min, DataType max)     { Cv::NotNull(); Cv::MinMax(min, max); }
+
+	EditMinMaxNotNull& Min(DataType min)              { Cv::Min(min); return *this; }
+	EditMinMaxNotNull& Max(DataType max)              { Cv::Max(max); return *this; }
+	EditMinMaxNotNull& NotNull(bool nn = true)        { Cv::NotNull(nn); return *this; }
+};
+
+typedef EditMinMax<int, ConvertInt>              EditInt;
+typedef EditMinMax<int64, ConvertInt64>          EditInt64;
+typedef EditMinMax<double, ConvertDouble>        EditDouble;
+typedef EditMinMax<Date, ConvertDate>            EditDate;
+typedef EditMinMax<Time, ConvertTime>            EditTime;
+typedef EditMinMaxNotNull<int, ConvertInt>       EditIntNotNull;
+typedef EditMinMaxNotNull<double, ConvertDouble> EditDoubleNotNull;
+typedef EditMinMaxNotNull<Date, ConvertDate>     EditDateNotNull;
+typedef EditMinMaxNotNull<Time, ConvertTime>     EditTimeNotNull;
+
+class EditString : public EditValue<WString, ConvertString> {
+public:
+	operator const WString&() const                  { return GetText(); }
+
+	EditString& operator=(const WString& data)       { SetData(data); return *this; }
+	EditString& operator=(const String& data)        { SetData(data); return *this; }
+
+	EditString() {}
+	EditString(int maxlen)                           { MaxLen(maxlen); }
+
+	EditString& MaxLen(int maxlen)                   { ConvertString::MaxLen(maxlen); return *this; }
+	EditString& NotNull(bool nn = true)              { ConvertString::NotNull(nn); return *this; }
+};
+
+class EditStringNotNull : public EditString {
+public:
+	EditStringNotNull& operator=(const WString& data) { SetData(data); return *this; }
+	EditStringNotNull& operator=(const String& data)  { SetData(data); return *this; }
+
+	EditStringNotNull()                               { NotNull(); }
+	EditStringNotNull(int maxlen)                     { NotNull(); MaxLen(maxlen); }
+};
+
+class EditIntSpin : public EditInt {
+public:
+	virtual void MouseWheel(Point p, int zdelta, dword keyflags);
+	virtual bool Key(dword key, int repcnt);
+
+
+protected:
+	SpinButtons sb;
+	int         inc;
+
+	void   Inc();
+	void   Dec();
+	void   Init();
+
+public:
+	EditIntSpin&    ShowSpin(bool s = true)   { sb.Show(s); return *this; }
+	EditIntSpin&    SetInc(int _inc)           { inc = _inc; return *this; }
+	int             GetInc() const            { return inc; }
+
+	EditIntSpin();
+	EditIntSpin(int min, int max);
+	virtual ~EditIntSpin();
+};
+
+class EditDoubleSpin : public EditDouble
+{
+public:
+	virtual void MouseWheel(Point p, int zdelta, dword keyflags);
+	virtual bool Key(dword key, int repcnt);
+
+protected:
+	void            Inc();
+	void            Dec();
+	void            Init();
+
+private:
+	SpinButtons     spin;
+	double          inc;
+
+public:
+	typedef EditDoubleSpin CLASSNAME;
+	EditDoubleSpin(double inc = 0.1);
+	EditDoubleSpin(double min, double max, double inc = 0.1);
+	virtual ~EditDoubleSpin();
+
+	EditDoubleSpin& SetInc(double _inc = 0.1) { inc = _inc; return *this; }
+	double          GetInc() const            { return inc; }
+
+	EditDoubleSpin& ShowSpin(bool s = true)   { spin.Show(s); return *this; }
+};
+
+class EditDoubleNotNullSpin : public EditDoubleSpin
+{
+public:
+	EditDoubleNotNullSpin(double inc = 0.1) : EditDoubleSpin(inc) { NotNull(); }
+	EditDoubleNotNullSpin(double min, double max, double inc = 0.1) : EditDoubleSpin(min, max, inc) { NotNull(); }
+};
diff --git a/uppsrc/CtrlLib/EditField.cpp b/uppsrc/CtrlLib/EditField.cpp
new file mode 100644
index 000000000..6225eb714
--- /dev/null
+++ b/uppsrc/CtrlLib/EditField.cpp
@@ -0,0 +1,1130 @@
+#include "CtrlLib.h"
+
+NAMESPACE_UPP
+
+CH_VALUE(ViewEdge, CtrlsImg::VE());
+
+Value EditFieldEdge()
+{
+	return EditField::StyleDefault().edge[0];
+}
+
+CtrlFrame& EditFieldFrame()
+{
+	static LookFrame m(EditFieldEdge);
+	return m;
+}
+
+CtrlFrame& ViewFrame()
+{
+	static LookFrame m(ViewEdge);
+	return m;
+}
+
+bool IsWCh(int c)
+{
+	return IsLeNum(c) || c == '_';
+}
+
+bool TextArrayOps::GetWordSelection(int c, int& l, int& h)
+{
+	if(IsWCh(GetChar(c))) {
+		l = h = c;
+		while(l > 0 && IsWCh(GetChar(l - 1)))
+			l--;
+		while(h < GetLength() && IsWCh(GetChar(h)))
+			h++;
+		if(h != c)
+			while(h < GetLength() && GetChar(h) == ' ')
+				h++;
+		return true;
+	}
+	return false;
+}
+
+int TextArrayOps::GetNextWord(int cursor)
+{
+	bool a = IsWCh(GetChar(cursor));
+	int n = 0;
+	int c = cursor;
+	while(c <= GetLength() && IsWCh(GetChar(c)) == a) {
+		if(++n > 10000) return cursor;
+		c++;
+	}
+	return c;
+}
+
+int TextArrayOps::GetPrevWord(int cursor)
+{
+	int n = 0;
+	int c = cursor;
+	if(c == 0) return 0;
+	bool a = IsWCh(GetChar(c - 1));
+	while(c > 0 && IsWCh(GetChar(c - 1)) == a) {
+		if(++n > 10000) return cursor;
+		c--;
+	}
+	return c;
+}
+
+void LookFrame::FrameLayout(Rect& r)
+{
+	Rect m = ChMargins(Get());
+	r.left += m.left;
+	r.right -= m.right;
+	r.top += m.top;
+	r.bottom -= m.bottom;
+}
+
+void LookFrame::FramePaint(Draw& w, const Rect& r)
+{
+	ChPaintEdge(w, r, Get());
+}
+
+void LookFrame::FrameAddSize(Size& sz)
+{
+	Rect m = ChMargins(Get());
+	sz.cx += m.left + m.right;
+	sz.cy += m.top + m.bottom;
+}
+
+void ActiveEdgeFrame::FrameLayout(Rect& r)
+{
+	Rect m = ChMargins(edge[0]);
+	r.left += m.left;
+	r.right -= m.right;
+	r.top += m.top;
+	r.bottom -= m.bottom;
+}
+
+void ActiveEdgeFrame::FramePaint(Draw& w, const Rect& r)
+{
+	int i = 0;
+	if(ctrl) {
+		i = !ctrl->IsEnabled() ? CTRL_DISABLED
+		    : ctrl->HasFocus() ? CTRL_PRESSED
+		    : mousein ? CTRL_HOT
+		    : CTRL_NORMAL;
+	}
+	ChPaintEdge(w, r, edge[i]);
+}
+
+void ActiveEdgeFrame::FrameAddSize(Size& sz)
+{
+	Rect m = ChMargins(edge[0]);
+	sz.cx += m.left + m.right;
+	sz.cy += m.top + m.bottom;
+}
+
+void ActiveEdgeFrame::Set(const Ctrl *ctrl_, const Value *edge_, bool active)
+{
+	ctrl = active ? ctrl_ : NULL;
+	edge = edge_;
+}
+
+CH_STYLE(EditField, Style, StyleDefault)
+{
+	paper = SColorPaper();
+	disabled = SColorFace();
+	focus = paper;
+	invalid = Blend(paper, Color(255, 0, 0), 32);
+	text = SColorText();
+	textdisabled = SColorDisabled();
+	selected = SColorHighlight();
+	selectedtext = SColorHighlightText();
+	for(int i = 0; i < 4; i++)
+		edge[i] = CtrlsImg::EFE();
+	activeedge = false;
+}
+
+bool EditField::FrameIsEdge()
+{
+	return &GetFrame() == &edge;
+}
+
+void EditField::SyncEdge()
+{
+	if(FrameIsEdge() && style->activeedge)
+		RefreshFrame();
+}
+
+void EditField::MouseEnter(Point p, dword keyflags)
+{
+	edge.Mouse(true);
+	SyncEdge();
+}
+
+void EditField::MouseLeave()
+{
+	edge.Mouse(false);
+	SyncEdge();
+}
+
+EditField& EditField::SetStyle(const Style& s)
+{
+	style = &s;
+	edge.Set(this, style->edge, style->activeedge);
+	RefreshLayout();
+	RefreshFrame();
+	return *this;
+}
+
+void EditField::CancelMode()
+{
+	keep_selection = false;
+	selclick = false;
+	dropcaret.Clear();
+}
+
+int EditField::GetTextCx(const wchar *txt, int n, bool password, Font fnt)
+{
+	FontInfo fi = fnt.Info();
+	if(password)
+		return n * fi['*'];
+	const wchar *s = txt;
+	int x = 0;
+	while(n--)
+		x += fi[*s++];
+	return x;
+}
+
+int  EditField::GetCaret(int cursor)
+{
+	return GetTextCx(text, cursor, password, font);
+}
+
+int  EditField::GetViewHeight(Font font)
+{
+	Size sz = Size(font.Info().GetHeight() * 4, font.Info().GetHeight() + 4);
+	return sz.cy;
+}
+
+int  EditField::GetStdHeight(Font font)
+{
+	Size sz = Size(font.Info().GetHeight() * 4, font.Info().GetHeight() + 4);
+	EditFieldFrame().FrameAddSize(sz);
+	return sz.cy;
+}
+
+Size EditField::GetMinSize() const
+{
+	return AddFrameSize(10, font.Info().GetHeight() + 4);
+}
+
+int  EditField::GetCursor(int posx)
+{
+	FontInfo fi = font.Info();
+	const wchar *s = text;
+	posx -= 2;
+	int x = 0;
+	int x0 = 0;
+	int i = 0;
+	for(i = 0; i < text.GetLength(); i++) {
+		x0 = x;
+		x += fi[*s];
+		if(posx < (x + x0) / 2)
+			return i;
+		s++;
+	}
+	return posx > (x + x0) / 2 ? i : max(i - 1, 0);
+}
+
+Image EditField::CursorImage(Point, dword)
+{
+	return Image::IBeam();
+}
+
+int  EditField::GetTy()
+{
+	return (GetSize().cy + 1 - font.Info().GetHeight()) / 2;
+}
+
+void EditField::Paints(Draw& w, int& x, int fcy, const wchar *&txt,
+					   Color ink, Color paper, int n, bool password, Font fnt)
+{
+	if(n < 0) return;
+	int cx = GetTextCx(txt, n, password, font);
+	w.DrawRect(x, 0, cx, fcy, paper);
+	if(password) {
+		String h;
+		h.Cat('*', n);
+		w.DrawText(x, 0, ~h, fnt, ink, n);
+	}
+	else
+		w.DrawText(x, 0, txt, fnt, ink, n);
+	txt += n;
+	x += cx;
+}
+
+void EditField::Paint(Draw& w)
+{
+	Size sz = GetSize();
+	const EditField::Style *st = style ? style : &StyleDefault();
+	bool enabled = IsShowEnabled();
+	Color paper = enabled && !IsReadOnly() ? (HasFocus() ? st->focus : st->paper) : st->disabled;
+	if(nobg)
+		paper = Null;
+	Color ink = enabled ? st->text : st->textdisabled;
+	if(convert && enabled && convert->Scan(text).IsError())
+		paper = st->invalid;
+	int fcy = font.Info().GetHeight();
+	int yy = GetTy();
+	w.DrawRect(0, 0, 2, sz.cy, paper);
+	w.DrawRect(0, 0, sz.cx, yy, paper);
+	w.DrawRect(0, yy + fcy, sz.cx, sz.cy - yy - fcy, paper);
+	w.DrawRect(sz.cx - 2, 0, 2, sz.cy, paper);
+	w.Clipoff(2, yy, sz.cx - 4, fcy);
+	int x = -sc;
+	bool ar = alignright && !HasFocus();
+	if(IsNull(text) && !IsNull(nulltext)) {
+		const wchar *txt = nulltext;
+		Paints(w, x, fcy, txt, nullink, paper, nulltext.GetLength(), false, nullfont);
+	}
+	else {
+		const wchar *txt = text;
+		if(ar) {
+			x = sz.cx - 4 - GetTextCx(text, text.GetLength(), password, font);
+			w.DrawRect(0, 0, x, fcy, paper);
+		}
+		int l, h;
+		if(GetSelection(l, h)) {
+			Paints(w, x, fcy, txt, ink, paper, l, password, font);
+			Paints(w, x, fcy, txt, enabled ? st->selectedtext : paper,
+			                       enabled ? st->selected : ink, h - l, password, font);
+			Paints(w, x, fcy, txt, ink, paper, text.GetLength() - h, password, font);
+		}
+		else
+			Paints(w, x, fcy, txt, ink, paper, text.GetLength(), password, font);
+	}
+	if(!ar)
+		w.DrawRect(x, 0, 9999, fcy, paper);
+	w.End();
+	DrawTiles(w, dropcaret, CtrlImg::checkers());
+}
+
+bool EditField::GetSelection(int& l, int& h) const
+{
+	if(anchor < 0 || anchor == cursor) {
+		l = h = cursor;
+		return false;
+	}
+	if(anchor < cursor) {
+		l = anchor;
+		h = cursor;
+	}
+	else {
+		l = cursor;
+		h = anchor;
+	}
+	return true;
+}
+
+bool EditField::IsSelection() const
+{
+	return anchor >= 0 && anchor != cursor;
+}
+
+void EditField::SyncCaret()
+{
+	FontInfo fi = font.Info();
+	SetCaret(GetCaret(cursor) - sc + 2 - fi.GetRightSpace('o') + fi.GetLeftSpace('o'), GetTy(),
+	         1, min(GetSize().cy - 2 * GetTy(), fi.GetHeight()));
+}
+
+void EditField::Finish(bool refresh)
+{
+	if(anchor > text.GetLength()) anchor = text.GetLength();
+	if(cursor > text.GetLength()) cursor = text.GetLength();
+	if(cursor < 0) cursor = 0;
+	Size sz = GetSize();
+	if(autosize) {
+		Rect r = GetRect();
+		int mw = min(r.Width(), Draw::GetStdFontSize().cx);
+		sz.cx = GetCaret(text.GetLength()) + 4;
+		sz = AddFrameSize(sz);
+		if(GetParent())
+			sz.cx = min(sz.cx, GetParent()->GetSize().cx - r.left);
+		sz.cx = minmax(sz.cx, mw, autosize);
+		if(sz.cx != r.Width())
+			LeftPos(r.left, sz.cx);
+		sz = GetSize();
+	}
+	sz.cx -= 2;
+	if(sz.cx <= 0) return;
+	int x = GetCaret(cursor);
+	int wx = x + font.Info().GetRightSpace('o');
+	if(wx > sz.cx + sc - 1) {
+		sc = wx - sz.cx + 1;
+		Refresh();
+	}
+	if(x < sc) {
+		sc = x;
+		Refresh();
+	}
+	if(refresh)
+		Refresh();
+	SyncCaret();
+}
+
+void EditField::Layout()
+{
+	Ctrl::Layout();
+	sc = 0;
+	Finish();
+}
+
+void EditField::GotFocus()
+{
+	if(autoformat && IsEditable() && !IsNull(text) && inactive_convert) {
+		Value v = convert->Scan(text);
+		if(!v.IsError()) {
+			WString s = convert->Format(v);
+			if(s != text) text = s;
+		}
+	}
+	if(!keep_selection) {
+		anchor = 0;
+		cursor = text.GetLength();
+	}
+	Finish();
+	SyncEdge();
+}
+
+void EditField::LostFocus()
+{
+	if(autoformat && IsEditable() && !IsNull(text)) {
+		Value v = convert->Scan(text);
+		if(!v.IsError()) {
+			const Convert * cv = inactive_convert ? inactive_convert : convert;
+			WString s = cv->Format(v);
+			if(s != text) text = s;
+		}
+	}
+	if(!keep_selection) {
+		anchor = -1;
+		cursor = sc = 0;
+	}
+	Refresh();
+	SyncEdge();
+}
+
+void EditField::LeftDown(Point p, dword flags)
+{
+	int c = GetCursor(p.x + sc);
+	if(!HasFocus()) {
+		SetFocus();
+		if(clickselect) {
+			SetSelection();
+			Finish();
+			return;
+		}
+		sc = 0;
+		Move(c);
+	}
+	int l, h;
+	selclick = false;
+	if(GetSelection(l, h) && c >= l && c < h) {
+		selclick = true;
+		return;
+	}
+	SetCapture();
+	Move(c, flags & K_SHIFT);
+	Finish();
+}
+
+void EditField::MiddleDown(Point p, dword flags)
+{
+	if(IsReadOnly())
+		return;
+	if(AcceptText(Selection())) {
+		WString w = GetWString(Selection());
+		selclick = false;
+		LeftDown(p, flags);
+		Insert(w);
+		Action();
+		Finish();
+	}
+}
+
+void EditField::LeftUp(Point p, dword flags)
+{
+	int c = GetCursor(p.x + sc);
+	int l, h;
+	if(GetSelection(l, h) && c >= l && c < h && !HasCapture() && selclick)
+		Move(c, false);
+	Finish();
+	selclick = false;
+}
+
+void EditField::LeftDouble(Point p, dword flags)
+{
+	int l, h;
+	if(GetWordSelection(cursor, l, h))
+		SetSelection(l, h);
+}
+
+void EditField::LeftTriple(Point p, dword keyflags)
+{
+	anchor = 0;
+	cursor = text.GetLength();
+	Finish();
+}
+
+void EditField::MouseMove(Point p, dword flags)
+{
+	if(!HasCapture()) return;
+	Move(GetCursor(p.x + sc), true);
+	Finish();
+}
+
+void EditField::SaveUndo()
+{
+	undotext = text;
+	undoanchor = anchor;
+	undocursor = cursor;
+}
+
+void EditField::Move(int newpos, bool select)
+{
+	bool refresh = anchor >= 0;
+	if(select) {
+		if(anchor < 0) anchor = cursor;
+		refresh = true;
+	}
+	else
+		anchor = -1;
+	cursor = newpos;
+	Finish(refresh);
+	if(select)
+		SetSelectionSource(ClipFmtsText());
+}
+
+void EditField::SetSelection(int l, int h)
+{
+	if(l < h) {
+		anchor = max(l, 0);
+		cursor = min(h, text.GetLength());
+	}
+	else {
+		cursor = l;
+		anchor = -1;
+	}
+	Finish();
+}
+
+void EditField::CancelSelection()
+{
+	int l, h;
+	if(GetSelection(l, h)) {
+		cursor = l;
+		anchor = -1;
+		sc = 0;
+		Finish();
+	}
+}
+
+bool EditField::RemoveSelection()
+{
+	int l, h;
+	if(!GetSelection(l, h)) {
+		anchor = -1;
+		return false;
+	}
+	SaveUndo();
+	Remove(l, h - l);
+	cursor = l;
+	anchor = -1;
+	sc = 0;
+	return true;
+}
+
+void EditField::Copy()
+{
+	int l, h;
+	if(password) return;
+	if(!GetSelection(l, h)) {
+		l = 0;
+		h = text.GetLength();
+	}
+	WriteClipboardUnicodeText(text.Mid(l, h - l));
+}
+
+int EditField::Insert(int pos, const WString& itext)
+{
+	if(IsReadOnly()) return 0;
+	WString ins;
+	const wchar *s = itext;
+	for(;;) {
+		wchar chr = *s++;
+		if(chr == '\t')
+			ins.Cat(WString(' ', 4));
+		else
+		if(chr >= ' ') {
+			chr = (*filter)(chr);
+			if(chr) {
+				chr = convert->Filter(chr);
+				if(chr && (charset == CHARSET_UNICODE || FromUnicode(chr, charset, 0)))
+					ins.Cat(chr);
+			}
+		}
+		else
+			break;
+	}
+	if(ins.GetCount() + text.GetCount() > maxlen) {
+		BeepExclamation();
+		return 0;
+	}
+	text.Insert(pos, ins);
+	Update();
+	return ins.GetLength();
+}
+
+void EditField::Remove(int pos, int n)
+{
+	if(IsReadOnly()) return;
+	text.Remove(pos, n);
+	Update();
+}
+
+void EditField::Insert(int chr)
+{
+	if(IsReadOnly()) return;
+	if(initcaps && cursor == 0 && text.GetCount() == 0)
+		chr = ToUpper(chr);
+	cursor += Insert(cursor, WString(chr, 1));
+	Finish();
+}
+
+void EditField::Insert(const WString& s)
+{
+	if(!RemoveSelection()) SaveUndo();
+	cursor += Insert(cursor, s);
+	Finish();
+}
+
+void EditField::DragAndDrop(Point p, PasteClip& d)
+{
+	if(IsReadOnly()) return;
+	int c = GetCursor(p.x + sc);
+	if(AcceptText(d)) {
+		SaveUndo();
+		int sell, selh;
+		if(GetSelection(sell, selh)) {
+			if(c >= sell && c < selh) {
+				RemoveSelection();
+				if(IsDragAndDropSource())
+					d.SetAction(DND_COPY);
+				c = sell;
+			}
+			else
+			if(d.GetAction() == DND_MOVE && IsDragAndDropSource()) {
+				if(c > sell)
+					c -= selh - sell;
+				RemoveSelection();
+				d.SetAction(DND_COPY);
+			}
+		}
+		int count = Insert(c, GetWString(d));
+		SetFocus();
+		SetSelection(c, c + count);
+		Action();
+		return;
+	}
+	if(!d.IsAccepted()) return;
+	Rect dc(0, 0, 0, 0);
+	if(c >= 0) {
+		FontInfo fi = font.Info();
+		int x = GetCaret(c);
+		dc = RectC(x - sc + 2 - fi.GetRightSpace('o'), GetTy(),
+		           1, min(GetSize().cy - 2 * GetTy(), fi.GetHeight()));
+	}
+	if(dc != dropcaret) {
+		Refresh(dropcaret);
+		dropcaret = dc;
+		Refresh(dropcaret);
+	}
+}
+
+void EditField::DragRepeat(Point p)
+{
+	if(IsReadOnly())
+		return;
+	Size sz = GetSize();
+	int sd = min(sz.cx / 6, 16);
+	int d = 0;
+	if(p.x < sd)
+		d = -3;
+	if(p.x > sz.cx - sd)
+		d = 3;
+	int a = minmax((int)sc + minmax(d, -16, 16), 0, max(0, GetCaret(GetLength()) - sz.cx + 2));
+	if(a != sc) {
+		sc = a;
+		Refresh();
+		SyncCaret();
+	}
+}
+
+void EditField::DragLeave()
+{
+	Refresh(dropcaret);
+	dropcaret.Clear();
+}
+
+void EditField::LeftDrag(Point p, dword flags)
+{
+	int c = GetCursor(p.x + sc);
+	Size ssz = StdSampleSize();
+	int sell, selh;
+	if(!HasCapture() && GetSelection(sell, selh) && c >= sell && c <= selh) {
+		WString sel = text.Mid(sell, selh - sell);
+		ImageDraw iw(ssz);
+		iw.DrawText(0, 0, sel);
+		iw.Alpha().DrawRect(ssz, Black);
+		iw.Alpha().DrawText(0, 0, sel, StdFont(), White);
+		VectorMap<String, ClipData> data;
+		Append(data, sel);
+		if(DoDragAndDrop(data, iw) == DND_MOVE) {
+			CancelSelection();
+			SaveUndo();
+			Remove(sell, selh - sell);
+			sc = 0;
+			Finish();
+			Action();
+		}
+	}
+}
+
+String EditField::GetSelectionData(const String& fmt) const
+{
+	int sell, selh;
+	if(GetSelection(sell, selh))
+		return GetTextClip(text.Mid(sell, selh - sell), fmt);
+	return String();
+}
+
+void EditField::Undo()
+{
+	Swap(undotext, text);
+	Swap(undoanchor, anchor);
+	Swap(undocursor, cursor);
+	anchor = -1;
+	UpdateAction();
+	Finish();
+}
+
+void EditField::Cut()
+{
+	Copy();
+	RemoveSelection();
+	Action();
+	Finish();
+}
+
+void EditField::Paste()
+{
+	Insert(ReadClipboardUnicodeText());
+	Action();
+	Finish();
+}
+
+void EditField::Erase()
+{
+	if(!IsSelection())
+		SelectAll();
+	RemoveSelection();
+	Finish();
+}
+
+void EditField::SelectAll()
+{
+	SetSelection();
+	Finish();
+}
+
+void EditField::MenuBar(Bar& menu) {
+	menu.Add(t_("Undo"), THISBACK(Undo))
+		.Key(K_ALT_BACKSPACE)
+		.Key(K_CTRL_Z);
+	menu.Separator();
+	menu.Add(IsEditable() && IsSelection(),
+			t_("Cut"), CtrlImg::cut(), THISBACK(Cut))
+		.Key(K_SHIFT_DELETE)
+		.Key(K_CTRL_X);
+	menu.Add(IsSelection(),
+			t_("Copy"), CtrlImg::copy(), THISBACK(Copy))
+		.Key(K_CTRL_INSERT)
+		.Key(K_CTRL_C);
+	menu.Add(IsEditable()
+		#ifdef PLATFORM_WIN32
+			&& ::IsClipboardFormatAvailable(CF_TEXT)
+		#endif
+			,
+			t_("Paste"), CtrlImg::paste(), THISBACK(Paste))
+		.Key(K_SHIFT_INSERT)
+		.Key(K_CTRL_V);
+	menu.Add(IsEditable(),
+			t_("Erase"), CtrlImg::remove(), THISBACK(Erase))
+		.Key(K_DELETE);
+	menu.Separator();
+	menu.Add(GetLength(),
+			t_("Select all"), THISBACK(SelectAll))
+		.Key(K_CTRL_A);
+}
+
+
+void EditField::RightDown(Point p, dword keyflags)
+{
+	keep_selection = true;
+	MenuBar::Execute(THISBACK(MenuBar));
+	SetFocus();
+	keep_selection = false;
+}
+
+bool EditField::Key(dword key, int rep)
+{
+	int q;
+	bool h;
+	String s;
+	bool select = key & K_SHIFT;
+	switch(key & ~K_SHIFT) {
+	case K_LEFT:
+		Move(cursor - 1, select);
+		return true;
+	case K_CTRL_LEFT:
+		Move(GetPrevWord(cursor), select);
+		return true;
+	case K_CTRL_RIGHT:
+		Move(GetNextWord(cursor), select);
+		return true;
+	case K_RIGHT:
+		Move(cursor + 1, select);
+		return true;
+	case K_HOME:
+		Move(0, select);
+		return true;
+	case K_END:
+		Move(text.GetLength(), select);
+		return true;
+	case K_CTRL_C:
+	case K_CTRL_INSERT:
+		Copy();
+		return true;
+	case K_CTRL_A:
+		SetSelection();
+		return true;
+	}
+	if(!IsEditable())
+		return false;
+	switch(key) {
+	case K_CTRL_X:
+	case K_SHIFT_DELETE:
+		Cut();
+		return true;
+	case K_CTRL_V:
+	case K_SHIFT_INSERT:
+		Paste();
+		return true;
+	case K_CTRL_Z:
+	case K_ALT_BACKSPACE:
+		Undo();
+		return true;
+	case K_BACKSPACE:
+	case K_SHIFT|K_BACKSPACE:
+		if(RemoveSelection()) {
+			Action();
+			break;
+		}
+		if(cursor == 0 || IsReadOnly()) return true;
+		SaveUndo();
+		cursor--;
+		Remove(cursor, 1);
+		Action();
+		break;
+	case K_CTRL_BACKSPACE:
+		if(RemoveSelection()) {
+			Action();
+			break;
+		}
+		if(cursor == 0 || IsReadOnly()) return true;
+		SaveUndo();
+		q = cursor;
+		h = IsWCh(text[--cursor]);
+		while(cursor > 0 && IsWCh(text[cursor - 1]) == h)
+			cursor--;
+		Remove(cursor, q - cursor);
+		Action();
+		break;
+	case K_DELETE:
+		if(RemoveSelection()) {
+			Action();
+			break;
+		}
+		if(cursor >= text.GetLength()) return true;
+		SaveUndo();
+		Remove(cursor, 1);
+		Action();
+		break;
+	case K_CTRL_DELETE:
+		if(RemoveSelection()) {
+			Action();
+			break;
+		}
+		if(cursor >= text.GetLength()) return true;
+		q = cursor;
+		h = IsWCh(text[q]);
+		while(IsWCh(text[q]) == h && q < text.GetLength()) q++;
+		SaveUndo();
+		Remove(cursor, q - cursor);
+		Action();
+		break;
+	default:
+		if(key >= ' ' && key < 65536 || key == K_SHIFT_SPACE) {
+			if(!RemoveSelection()) SaveUndo();
+			while(rep--)
+				Insert(key == K_SHIFT_SPACE ? ' ' : key);
+			Action();
+			return true;
+		}
+		else
+			return false;
+	}
+	Finish();
+	return true;
+}
+
+void EditField::SetText(const WString& txt)
+{
+	if(text == txt) {
+		Update();
+		return;
+	}
+	text = txt;
+	sc = 0;
+	if(HasFocus()) {
+		cursor = txt.GetLength();
+		anchor = 0;
+	}
+	else {
+		cursor = 0;
+		anchor = -1;
+	}
+	Update();
+	Finish();
+}
+
+void EditField::SetData(const Value& data)
+{
+	const Convert * cv = convert;
+	if(!HasFocus() && inactive_convert)
+		cv = inactive_convert;
+	SetText((WString) cv->Format(data));
+}
+
+Value EditField::GetData() const
+{
+	return convert->Scan(text);
+}
+
+void EditField::Clear()
+{
+	SetText(WString());
+	sc = cursor = 0;
+}
+
+void EditField::Reset()
+{
+	Clear();
+	ClearModify();
+	sc = 0;
+	cursor = 0;
+	anchor = -1;
+	password = false;
+	autoformat = true;
+	clickselect = false;
+	filter = CharFilterUnicode;
+	convert = &NoConvert();
+	inactive_convert = NULL;
+	initcaps = false;
+	maxlen = INT_MAX;
+	autosize = false;
+	keep_selection = false;
+	nobg = false;
+	charset = CHARSET_UNICODE;
+	alignright = false;
+	SetStyle(StyleDefault());
+	SetFrame(edge);
+}
+
+EditField& EditField::SetFont(Font _font)
+{
+	font = _font;
+	Refresh();
+	return *this;
+}
+
+EditField& EditField::NullText(const char *text, Font fnt, Color ink)
+{
+	nulltext = text;
+	nullink = ink;
+	nullfont = fnt;
+	Refresh();
+	return *this;
+}
+
+EditField& EditField::NullText(const char *text, Color ink)
+{
+	return NullText(text, GetFont(), ink);
+}
+
+EditField::EditField()
+{
+	Unicode();
+	Reset();
+}
+
+EditField::~EditField() {}
+
+void EditIntSpin::Inc()
+{
+	if(IsReadOnly()) return;
+	int i = GetData();
+	if(IsNull(i)) {
+		if(IsNull(GetMin()) || GetMin() == INT_MIN) return;
+		SetData(GetMin());
+	}
+	else
+	if(!IsNull(GetMax()) && i < GetMax())
+		SetData(min(i + inc, GetMax()));
+	else
+		return;
+	SetFocus();
+	SetSelection();
+	UpdateAction();
+}
+
+void EditIntSpin::Dec()
+{
+	if(IsReadOnly()) return;
+	int i = GetData();
+	if(IsNull(i)) {
+		if(IsNull(GetMax()) || GetMax() == INT_MAX) return;
+		SetData(GetMax());
+	}
+	else
+	if(!IsNull(GetMin()) && i > GetMin())
+		SetData(max(i - inc, GetMin()));
+	else
+		return;
+	SetFocus();
+	SetSelection();
+	UpdateAction();
+}
+
+void EditIntSpin::Init()
+{
+	sb.inc.WhenAction = sb.inc.WhenRepeat = callback(this, &EditIntSpin::Inc);
+	sb.dec.WhenAction = sb.dec.WhenRepeat = callback(this, &EditIntSpin::Dec);
+	AddFrame(sb);
+	inc = 1;
+}
+
+EditIntSpin::EditIntSpin()
+{
+	Init();
+}
+
+EditIntSpin::EditIntSpin(int min, int max)
+{
+	MinMax(min, max);
+	Init();
+}
+
+EditIntSpin::~EditIntSpin() {}
+
+bool EditIntSpin::Key(dword key, int repcnt)
+{
+	if(key == K_UP)   { Inc(); return true; }
+	if(key == K_DOWN) { Dec(); return true; }
+	return EditInt::Key(key, repcnt);
+}
+
+void EditIntSpin::MouseWheel(Point, int zdelta, dword)
+{
+	if(zdelta < 0)
+		Dec();
+	else
+		Inc();
+}
+
+EditDoubleSpin::EditDoubleSpin(double inc) : inc(inc) { Init(); }
+EditDoubleSpin::EditDoubleSpin(double min, double max, double inc) : EditDouble(min, max), inc(inc) { Init(); }
+
+EditDoubleSpin::~EditDoubleSpin() {}
+
+void EditDoubleSpin::Init()
+{
+	AddFrame(spin);
+	spin.inc.WhenRepeat = spin.inc.WhenAction = THISBACK(Inc);
+	spin.dec.WhenRepeat = spin.dec.WhenAction = THISBACK(Dec);
+}
+
+void EditDoubleSpin::Inc()
+{
+	if(IsReadOnly())
+	{
+		BeepExclamation();
+		return;
+	}
+	double d = GetData();
+	if(!IsNull(d))
+	{
+		d = (floor(d / inc + 1e-3) + 1) * inc;
+		if(IsNull(GetMax()) || d <= GetMax())
+		{
+			SetData(d);
+			Action();
+		}
+	}
+	else if(minval != DOUBLE_NULL_LIM)
+		SetData(minval);
+	SetFocus();
+}
+
+void EditDoubleSpin::Dec()
+{
+	if(IsReadOnly())
+	{
+		BeepExclamation();
+		return;
+	}
+	double d = GetData();
+	if(!IsNull(d))
+	{
+		d = (ceil(d / inc - 1e-3) - 1) * inc;
+		if(IsNull(GetMin()) || d >= GetMin())
+		{
+			SetData(d);
+			Action();
+		}
+	}
+	else if(maxval != -DOUBLE_NULL_LIM)
+		SetData(maxval);
+	SetFocus();
+}
+
+bool EditDoubleSpin::Key(dword key, int repcnt)
+{
+	if(key == K_UP)   { Inc(); return true; }
+	if(key == K_DOWN) { Dec(); return true; }
+	return EditDouble::Key(key, repcnt);
+}
+
+void EditDoubleSpin::MouseWheel(Point, int zdelta, dword)
+{
+	if(zdelta < 0)
+		Dec();
+	else
+		Inc();
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/CtrlLib/FileList.cpp b/uppsrc/CtrlLib/FileList.cpp
new file mode 100644
index 000000000..159763f7e
--- /dev/null
+++ b/uppsrc/CtrlLib/FileList.cpp
@@ -0,0 +1,303 @@
+#include "CtrlLib.h"
+
+NAMESPACE_UPP
+
+int GetTextSize(const FontInfo& fi, const wchar *text, const wchar *end) {
+	int w = 0;
+	while(text < end)
+		w += fi[*text++];
+	return w;
+}
+
+int GetTextSize(const FontInfo& fi, const WString& text) {
+	return GetTextSize(fi, text, text.End());
+}
+
+const wchar *GetTextFitLim(const FontInfo& fi, const wchar *txt, const wchar *end, int& cx) {
+	for(;;) {
+		if(fi[*txt] > cx || txt >= end)
+			return txt;
+		cx -= fi[*txt++];
+	}
+}
+
+int GetTextFitCount(const FontInfo& fi, const WString& s, int& cx) {
+	return (int)(GetTextFitLim(fi, s, s.End(), cx) - s.Begin());
+}
+
+const wchar *strdirsep(const wchar *s) {
+	while(*s) {
+		if(*s == '\\' || *s == '/') return s;
+		s++;
+	}
+	return NULL;
+}
+
+void DrawFileName(Draw& w, int x, int y, int wcx, int cy, const WString& mname, bool isdir, Font font,
+                  Color ink, Color extink, const WString& desc, Font descfont, bool justname)
+{
+	FontInfo fi = font.Info();
+	int extpos = (isdir ? -1 : mname.ReverseFind('.'));
+	int slash = isdir ? -1 : max(mname.ReverseFind('\\'), mname.ReverseFind('/'));
+	if(extpos < slash)
+		extpos = -1;
+	const wchar *ext = extpos >= slash && extpos >= 0 ? mname.Begin() + extpos + 1
+	                                                  : mname.End();
+	const wchar *name = mname;
+	if(justname && slash >= 0)
+		name += slash + 1;
+	int txtcx = GetTextSize(fi, name);
+	if(txtcx <= wcx) {
+		w.DrawText(x, y, name, font, ink, (int)(ext - name));
+		w.DrawText(x + GetTextSize(fi, name, ext), y, ext, font, extink, (int)(mname.End() - ext));
+		if(!IsEmpty(desc))
+			DrawTextEllipsis(w, x + fi.GetHeight(), y, wcx - txtcx,
+			                 desc, "...", descfont, extink);
+	}
+	else {
+		int dot3 = 3 * fi['.'];
+		if(2 * dot3 > wcx)
+			w.DrawText(x, y, name, font, ink, GetTextFitCount(fi, name, wcx));
+		else {
+			const wchar *end = mname.End();
+			int dircx = 2 * fi['.'] + fi[DIR_SEP];
+			const wchar *bk = strdirsep(name);
+			if(bk) {
+				wcx -= dircx;
+				w.DrawText(x, y, ".." DIR_SEPS, font, SColorDisabled, 3);
+				x += dircx;
+				do {
+					txtcx -= GetTextSize(fi, name, bk + 1);
+					name = bk + 1;
+					if(txtcx < wcx) {
+						w.DrawText(x, y, name, font, ink, (int)(ext - name));
+						x += GetTextSize(fi, name, ext);
+						w.DrawText(x, y, ext, font, extink, (int)(end - ext));
+						return;
+					}
+					bk = strdirsep(name);
+				}
+				while(bk);
+			}
+			wcx -= dot3;
+			int extcx = GetTextSize(fi, ext, end);
+			if(2 * extcx > wcx || ext == end) {
+				int n = GetTextFitCount(fi, name, wcx);
+				w.DrawText(x, y, name, font, ink, n);
+				x += GetTextSize(fi, name, name + n);
+				w.DrawText(x, y, "...", font, SColorDisabled, 3);
+			}
+			else {
+				wcx -= extcx;
+				int n = (int)(GetTextFitLim(fi, name, end, wcx) - name);
+				w.DrawText(x, y, name, font, ink, n);
+				x += GetTextSize(fi, name, name + n);
+				w.DrawText(x, y, "...", font, SColorDisabled, 3);
+				w.DrawText(x + dot3, y, ext, font, extink, (int)(end - ext));
+			}
+		}
+	}
+}
+
+void FileList::Paint(Draw& w, const Rect& r, const Value& q,
+		             Color ink, Color paper, dword style) const
+{
+	const File& m = ValueTo<File>(q);
+	bool dark = Grayscale(paper) < 150;
+	w.DrawRect(r, paper);
+	int x = r.left + 2;
+	w.DrawImage(x, r.top + (r.Height() - m.icon.GetSize().cy) / 2, m.icon);
+	x += iconwidth;
+	x += 2;
+	FontInfo fi = m.font.Info();
+	DrawFileName(w, x, r.top + (r.Height() - fi.GetHeight()) / 2,
+	             r.right - x - 2, r.Height(), WString(m.name), m.isdir, m.font,
+	             dark ? SColorHighlightText : m.ink,
+	             dark ? SColorHighlightText : m.extink,
+	             WString(m.desc), m.descfont, justname);
+}
+
+Size FileList::GetStdSize(const Value& q) const
+{
+	const File& m = ValueTo<File>(q);
+	FontInfo fi = m.font.Info();
+	int cx = GetTextSize(fi, WString(m.name)) + 2 + iconwidth + 2 + 3;
+	if(!IsNull(m.desc))
+		cx += GetTextSize(m.descfont.Info(), WString(m.desc)) + fi.GetHeight();
+	return Size(cx, GetItemHeight());
+}
+
+void FileList::StartEdit() {
+	Rect r = GetItemRect(GetCursor());
+	const File& cf = Get(GetCursor());
+	Font f = cf.font;
+	int fcy = f.Info().GetHeight();
+	r.left += iconwidth + 2;
+	r.top += (r.Height() - fcy - 4) / 2;
+	r.bottom = r.top + fcy + 2;
+	edit.SetRect(r);
+	edit.SetFont(cf.font);
+	edit = cf.name.ToWString();
+	edit.Show();
+	edit.SetFocus();
+}
+
+void FileList::EndEdit() {
+	KillTimeCallback(TIMEID_STARTEDIT);
+	int b = edit.HasFocus();
+	edit.Hide();
+	if(b) SetFocus();
+}
+
+void FileList::OkEdit() {
+	EndEdit();
+	int c = GetCursor();
+	if(c >= 0 && c < GetCount())
+		WhenRename(Get(c).name, ~edit);
+}
+
+void FileList::LeftDown(Point p, dword flags) {
+	int c = GetCursor();
+	if(IsEdit()) {
+		OkEdit();
+		c = -1;
+	}
+	ColumnList::LeftDown(p, flags);
+	KillTimeCallback(TIMEID_STARTEDIT);
+	if(c == GetCursor() && c >= 0 && !HasCapture() && renaming && !(flags & (K_SHIFT|K_CTRL)))
+		SetTimeCallback(750, THISBACK(StartEdit), TIMEID_STARTEDIT);
+}
+
+bool FileList::FindChar(int from, int chr) {
+	for(int i = max(0, from); i < GetCount(); i++) {
+		WString x = Get(i).name.ToWString(); // TRC patch 05/09/15; for CXL to check
+		if(ToUpper(ToAscii(x[0])) == chr) {
+			ClearSelection();
+			SetCursor(i);
+			return true;
+		}
+	}
+	return false;
+}
+
+bool FileList::Key(dword key, int count) {
+	if(key == K_ESCAPE && IsEdit()) {
+		EndEdit();
+		return true;
+	}
+	if(key == K_ENTER && IsEdit()) {
+		OkEdit();
+		return true;
+	}
+	if(accelkey) {
+		int c = ToUpper((int)key);
+		if(key < 256 && IsAlNum(c)) {
+			if(!FindChar(GetCursor() + 1, c))
+				FindChar(0, c);
+			return true;
+		}
+	}
+	return ColumnList::Key(key, count);
+}
+
+void FileList::Insert(int ii,
+                      const String& name, const Image& icon, Font font, Color ink,
+				      bool isdir, int64 length, Time time, Color extink,
+				      const String& desc, Font descfont, Value data)
+{
+	Value v;
+	File& m = CreateRawValue<File>(v);
+	m.isdir = isdir;
+	m.icon = icon;
+	m.name = name;
+	m.font = font;
+	m.ink = ink;
+	m.length = length;
+	m.time = time;
+	m.extink = IsNull(extink) ? ink : extink;
+	m.desc = desc;
+	m.descfont = descfont;
+	m.data = data;
+	ColumnList::Insert(ii, v, !m.isdir);
+}
+
+void FileList::Add(const String& name, const Image& icon, Font font, Color ink,
+				   bool isdir, int64 length, Time time, Color extink,
+				   const String& desc, Font descfont, Value data)
+{
+	Value v;
+	File& m = CreateRawValue<File>(v);
+	m.isdir = isdir;
+	m.icon = icon;
+	m.name = name;
+	m.font = font;
+	m.ink = ink;
+	m.length = length;
+	m.time = time;
+	m.extink = IsNull(extink) ? ink : extink;
+	m.desc = desc;
+	m.descfont = descfont;
+	m.data = data;
+	ColumnList::Add(v, !m.isdir);
+}
+
+const FileList::File& FileList::Get(int i) const
+{
+	return ValueTo<File>(ColumnList::Get(i));
+}
+
+String FileList::GetCurrentName() const
+{
+	return GetCount() && GetCursor() >= 0 && GetCursor() < GetCount() ? Get(GetCursor()).name
+	       : Null;
+}
+
+int FileList::Find(const char *s) {
+	for(int i = 0; i < GetCount(); i++)
+		if(strcmp(Get(i).name, s) == 0) return i;
+	return -1;
+}
+
+bool FileList::FindSetCursor(const char *name) {
+	int i = Find(name);
+	if(i < 0) return false;
+	SetCursor(i);
+	return true;
+}
+
+struct FileList::FileOrder : public ValueOrder {
+	const FileList::Order *order;
+
+	virtual bool operator()(const Value& a, const Value& b) const {
+		return (*order)(ValueTo<File>(a), ValueTo<File>(b));
+	}
+};
+
+void FileList::Sort(const Order& order)
+{
+	FileOrder fo;
+	fo.order = &order;
+	int i = GetCursor();
+	String fn;
+	if(i >= 0)
+		fn = Get(i).name;
+	ColumnList::Sort(fo);
+	if(i >= 0)
+		FindSetCursor(fn);
+}
+
+FileList::FileList() {
+	iconwidth = 16;
+	ItemHeight(max(Draw::GetStdFontCy(), 16));
+	Ctrl::Add(edit);
+	edit.Hide();
+	edit.SetFrame(BlackFrame());
+	renaming = false;
+	justname = false;
+	accelkey = false;
+	SetDisplay(*this);
+}
+
+FileList::~FileList() {}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/CtrlLib/FileSel.cpp b/uppsrc/CtrlLib/FileSel.cpp
new file mode 100644
index 000000000..390c3ebef
--- /dev/null
+++ b/uppsrc/CtrlLib/FileSel.cpp
@@ -0,0 +1,1285 @@
+#include <CtrlLib/CtrlLib.h>
+
+NAMESPACE_UPP
+
+#ifdef PLATFORM_WIN32
+struct FileIconMaker : ImageMaker {
+	String file;
+	bool   exe;
+	bool   dir;
+
+	virtual String Key() const {
+		return file + (exe ? "1" : "0") + (dir ? "1" : "0");
+	}
+
+	virtual Image Make() const {
+		Color c = White();
+		Image m[2];
+		for(int i = 0; i < 2; i++) {
+			SHFILEINFO info;
+			SHGetFileInfo(file, dir ? FILE_ATTRIBUTE_DIRECTORY : FILE_ATTRIBUTE_NORMAL,
+			              &info, sizeof(info),
+			              SHGFI_ICON|SHGFI_SMALLICON|(exe ? 0 : SHGFI_USEFILEATTRIBUTES));
+			HICON icon = info.hIcon;
+			ICONINFO iconinfo;
+			if(!icon || !GetIconInfo(icon, &iconinfo))
+				return Image();
+			BITMAP bm;
+			::GetObject((HGDIOBJ)iconinfo.hbmMask, sizeof(BITMAP), (LPVOID)&bm);
+			Size sz(bm.bmWidth, bm.bmHeight);
+			ImageDraw iw(sz);
+			iw.DrawRect(sz, c);
+			::DrawIconEx(iw.GetHandle(), 0, 0, info.hIcon, 0, 0, 0, NULL, DI_NORMAL|DI_COMPAT);
+			::DeleteObject(iconinfo.hbmColor);
+			::DeleteObject(iconinfo.hbmMask);
+			::DestroyIcon(info.hIcon);
+			c = Black();
+			m[i] = iw;
+		}
+		return RecreateAlpha(m[0], m[1]);
+	}
+};
+
+
+Image GetFileIcon(const char *path, bool dir, bool force = false)
+{
+	FileIconMaker m;
+	String ext = GetFileExt(path);
+	m.exe = false;
+	m.dir = false;
+	m.file = path;
+	if(force)
+		m.exe = true;
+	else
+	if(dir) {
+		m.dir = true;;
+		m.file.Clear();
+	}
+	else
+	if(ext == ".exe")
+		m.exe = true;
+	else
+		m.file = "x." + ext;
+	return MakeImage(m);
+}
+#endif
+
+#ifdef PLATFORM_X11
+
+#ifdef flagNOGTK
+Image PosixGetDriveImage(String dir)
+{
+	if(dir.GetCount() == 0 || dir == "/")
+		return CtrlImg::Computer();
+	if(dir.Find("cdrom") == 0 || dir.Find("cdrecorder") == 0)
+		return CtrlImg::CdRom();
+	if(dir.Find("floppy") == 0 || dir.Find("zip") == 0)
+		return CtrlImg::Diskette();
+	return CtrlImg::Hd();
+}
+
+Image GetFileIcon(const String& folder, const String& filename, bool isdir, bool isexe)
+{
+	return Null;
+}
+
+#else
+Image GtkThemeIcon(const char *name, int size);
+
+Image GnomeImage(const char *s)
+{
+	return GtkThemeIcon(String("gnome-") + s, 16);
+}
+
+struct ExtToMime {
+	Index<String> major;
+	Index<String> minor;
+	VectorMap<String, dword> map;
+
+	void Load(const char *file);
+	void Refresh();
+	bool GetMime(const String& ext, String& maj, String& min);
+};
+
+void ExtToMime::Load(const char *fn)
+{
+	FileIn in(fn);
+	if(in)
+		while(!in.IsEof()) {
+			String ln = TrimLeft(TrimRight(in.GetLine()));
+			if(ln[0] != '#') {
+				int q = ln.Find(':');
+				if(q >= 0) {
+					String h = ln.Mid(0, q);
+					int w = h.Find('/');
+					if(w >= 0) {
+						int x = ln.Find("*.", q);
+						if(x >= 0) {
+							String ext = ln.Mid(x + 2);
+							if(ext.GetCount() && map.Find(ext) < 0)
+								map.Add(ext, MAKELONG(minor.FindAdd(h.Mid(w + 1)), major.FindAdd(h.Mid(0, w))));
+						}
+					}
+				}
+			}
+		}
+}
+
+void ExtToMime::Refresh()
+{
+	major.Clear();
+	minor.Clear();
+	map.Clear();
+	Load("/usr/local/share/mime/globs");
+	Load("/usr/share/mime/globs");
+}
+
+bool ExtToMime::GetMime(const String& ext, String& maj, String& min)
+{
+	ONCELOCK {
+		Refresh();
+	}
+	int q = map.Find(ext);
+	if(q < 0)
+		return false;
+	dword x = map[q];
+	maj = major[HIWORD(x)];
+	min = minor[LOWORD(x)];
+	return true;
+}
+
+struct FileExtMaker : ImageMaker {
+	String ext;
+
+	virtual String Key() const {
+		return ext;
+	}
+
+	virtual Image Make() const {
+		String major;
+		String minor;
+		if(!Single<ExtToMime>().GetMime(ext, major, minor))
+			return Null;
+		Image img = GnomeImage("mime-" + major + '-' + minor);
+		return IsNull(img) ? GnomeImage("mime-" + major) : img;
+	}
+};
+
+Image PosixGetDriveImage(String dir)
+{
+	static Image cdrom = GnomeImage("dev-cdrom");
+	static Image harddisk = GnomeImage("dev-harddisk");
+	static Image floppy = GnomeImage("dev-floppy");
+	static Image computer = GnomeImage("dev-computer");
+	if(dir.GetCount() == 0 || dir == "/")
+		return IsNull(computer) ? CtrlImg::Computer() : computer;
+	if(dir.Find("cdrom") == 0 || dir.Find("cdrecorder") == 0)
+		return IsNull(cdrom) ? CtrlImg::CdRom() : cdrom;
+	if(dir.Find("floppy") == 0 || dir.Find("zip") == 0)
+		return IsNull(floppy) ? CtrlImg::Diskette() : floppy;
+	return IsNull(harddisk) ? CtrlImg::Hd() : harddisk;
+}
+
+Image GetFileIcon(const String& folder, const String& filename, bool isdir, bool isexe)
+{
+	static Image file = GnomeImage("fs-regular");
+	static Image dir = GnomeImage("fs-directory");
+	static Image exe = GnomeImage("fs-executable");
+	static Image home = GnomeImage("fs-home");
+	static Image desktop = GnomeImage("fs-desktop");
+	if(isdir) {
+		Image img = dir;
+		if(AppendFileName(folder, filename) == GetHomeDirectory())
+			return home;
+		else
+		if(folder == GetHomeDirectory() && filename == "Desktop")
+			return desktop;
+		else
+		if(folder == "/media" || filename.GetCount() == 0)
+			return PosixGetDriveImage(filename);
+		return dir;
+	}
+	FileExtMaker m;
+	m.ext = GetFileExt(filename);
+	Image img;
+	if(m.ext.GetCount()) {
+		m.ext = m.ext.Mid(1);
+		img = MakeImage(m);
+	}
+	return IsNull(img) ? isexe ? exe : file : img;
+}
+
+#endif
+#endif
+
+bool MatchSearch(const String& filename, const String& search)
+{
+	return search.GetCount() ? Filter(filename, CharFilterDefaultToUpperAscii).Find(search) >= 0 : true;
+}
+
+bool Load(FileList& list, const String& dir, const char *patterns, bool dirs,
+          Callback3<bool, const String&, Image&> WhenIcon, FileSystemInfo& filesystem,
+          const String& search, bool hidden)
+{
+	if(dir.IsEmpty()) {
+		Array<FileSystemInfo::FileInfo> root = filesystem.Find(Null);
+		for(int i = 0; i < root.GetCount(); i++)
+			if(MatchSearch(root[i].filename, search))
+				list.Add(root[i].filename,
+			#ifdef PLATFORM_WIN32
+					GetFileIcon(root[i].filename, false, true),
+			#else
+					GetDriveImage(root[i].root_style),
+			#endif
+					StdFont().Bold(), SColorText, true, -1, Null, SColorDisabled,
+					root[i].root_desc, StdFont()
+			);
+	}
+	else {
+		Array<FileSystemInfo::FileInfo> ffi =
+			filesystem.Find(AppendFileName(dir, filesystem.IsWin32() ? "*.*" : "*"));
+		if(ffi.IsEmpty())
+			return false;
+	#ifdef PLATFORM_POSIX
+		bool isdrive = dir == "/media" || dir == "/mnt";
+	#endif
+		for(int t = 0; t < ffi.GetCount(); t++) {
+			const FileSystemInfo::FileInfo& fi = ffi[t];
+			bool nd = dirs && !fi.is_directory;
+			if(fi.filename != "." && fi.filename != ".." != 0 &&
+			   (fi.is_directory || PatternMatchMulti(patterns, fi.filename)) &&
+			   MatchSearch(fi.filename, search) &&
+			   (hidden || (filesystem.IsWin32() ? !fi.is_hidden : fi.filename[0] != '.'))) {
+			#ifdef PLATFORM_X11
+				Image img = isdrive ? PosixGetDriveImage(fi.filename)
+				                    : GetFileIcon(dir, fi.filename, fi.is_directory, fi.unix_mode & 0111);
+			#else
+				Image img = GetFileIcon(AppendFileName(dir, fi.filename), fi.is_directory);
+			#endif
+				if(IsNull(img))
+					img = fi.is_directory ? CtrlImg::Dir() : CtrlImg::File();
+				WhenIcon(fi.is_directory, fi.filename, img);
+				list.Add(fi.filename, fi.is_hidden ? Contrast(img, 200) :img,
+						 StdFont().Bold(fi.is_directory),
+						 nd ? SColorDisabled : fi.is_hidden ? Blend(SColorText, Gray, 200) : SColorText, fi.is_directory,
+						 fi.is_directory ? -1 : fi.length,
+						 Null, nd ? SColorDisabled
+						          : fi.is_directory ? SColorText
+						                            : fi.is_hidden ? Blend(SColorMark, Gray, 200)
+						                                           : SColorMark
+				);
+			}
+		}
+	}
+	return true;
+}
+
+class FileListSortName : public FileList::Order {
+public:
+	virtual bool operator()(const FileList::File& a, const FileList::File& b) const {
+		if(a.isdir != b.isdir)
+			return a.isdir;
+		if(a.name == "..")
+			return b.name != "..";
+		if(b.name == "..")
+			return false;
+		return stricmp(a.name, b.name) < 0;
+	}
+};
+
+void SortByName(FileList& list)
+{
+	list.Sort(FileListSortName());
+}
+
+class FileListSortExt : public FileList::Order {
+public:
+	virtual bool operator()(const FileList::File& a, const FileList::File& b) const {
+		if(a.isdir != b.isdir)
+			return a.isdir;
+		if(a.name == "..")
+			return b.name != "..";
+		if(b.name == "..")
+			return false;
+		const char *ae = strrchr(a.name, '.');
+		const char *be = strrchr(b.name, '.');
+		int q;
+		if(ae == NULL || be == NULL) {
+			if(ae) return false;
+			if(be) return true;
+			q = 0;
+		}
+		else
+			q = stricmp(ae, be);
+		return (q ? q : stricmp(a.name, b.name)) < 0;
+	}
+};
+
+void SortByExt(FileList& list)
+{
+	list.Sort(FileListSortExt());
+}
+
+String FileSel::GetDir() {
+	String s = ~dir;
+	if(s.IsEmpty()) return basedir;
+	if(basedir.IsEmpty()) return s;
+	return AppendFileName(basedir, s);
+}
+
+void FileSel::SetDir(const String& _dir) {
+	dir <<= _dir;
+	Load();
+	Update();
+}
+
+String FileSel::FilePath(const String& fn) {
+	return AppendFileName(GetDir(), fn);
+}
+
+Image GetDriveImage(char drive_style)
+{
+	switch(drive_style)
+	{
+	case FileSystemInfo::ROOT_NO_ROOT_DIR: return Null;
+	case FileSystemInfo::ROOT_COMPUTER:  return CtrlImg::Computer();
+	case FileSystemInfo::ROOT_REMOVABLE: return CtrlImg::Diskette();
+	case FileSystemInfo::ROOT_CDROM:     return CtrlImg::CdRom();
+	default:                             return CtrlImg::Hd();
+	}
+}
+
+String FileSel::GetMask()
+{
+	String emask = "*";
+	if(!IsNull(type)) {
+		if(IsString(~type))
+			emask = ~type;
+		else {
+			int q = ~type;
+			if(q >= 0 && q < mask.GetCount())
+				emask = mask[q];
+		}
+	}
+	return emask;
+}
+
+void FileSel::Load()
+{
+	search <<= Null;
+	SearchLoad();
+}
+
+void FileSel::SearchLoad()
+{
+	list.EndEdit();
+	list.Clear();
+	String d = GetDir();
+	String emask = GetMask();
+	if(!UPP::Load(list, d, emask, mode == SELECTDIR, WhenIcon, *filesystem, ~search, ~hidden)) {
+		Exclamation(t_("[A3* Unable to read the directory !]&&") + DeQtf((String)~dir) + "&&" +
+		            GetErrorMessage(GetLastError()));
+		if(!basedir.IsEmpty() && String(~dir).IsEmpty()) {
+			Break(IDCANCEL);
+			return;
+		}
+		dir <<= olddir;
+		olddir = Null;
+		SearchLoad();
+	}
+	if(d.IsEmpty()) {
+		if(filesystem->IsWin32()) {
+			mkdir.Disable();
+			plus.Disable();
+			minus.Disable();
+			toggle.Disable();
+			list.Renaming(false);
+		}
+		dir <<= d;
+		dirup.Disable();
+	}
+	else {
+		dirup.Enable();
+		mkdir.Enable();
+		plus.Enable();
+		minus.Enable();
+		toggle.Enable();
+		list.Renaming(true);
+	}
+	if(filesystem->IsPosix())
+		if(d == "/" || !IsEmpty(basedir) && String(~dir).IsEmpty())
+			dirup.Disable();
+	if(filesystem->IsWin32())
+		if(!IsEmpty(basedir) && String(~dir).IsEmpty())
+			dirup.Disable();
+	if(sortext && mode != SELECTDIR)
+		SortByExt(list);
+	else
+		SortByName(list);
+	olddir = ~dir;
+	Update();
+}
+
+String TrimDot(String f) {
+	int i = f.Find('.');
+	if(i >= 0 && i == f.GetLength() - 1)
+		f.Trim(i);
+	return f;
+}
+
+void FileSel::AddName(Vector<String>& fn, String& f) {
+	if(!f.IsEmpty()) {
+		if(f.Find('.') < 0) {
+			String t = GetMask();
+			int q = t.Find('.');
+			if(q >= 0 && IsAlNum(t[q + 1])) {
+				int w = q + 2;
+				while(IsAlNum(t[w]))
+					w++;
+				f << t.Mid(q, w - q);
+			}
+			else
+			if(defext.GetCount())
+				f << '.' << defext;
+		}
+		f = TrimDot(f);
+		if(f[0] == '\"' && f.GetCount() > 2)
+			fn.Add(f.Mid(1, f.GetCount() - 2));
+		else
+			fn.Add(f);
+	}
+	f.Clear();
+}
+
+void FileSel::Finish() {
+	if(filesystem->IsWin32())
+		if(GetDir().IsEmpty()) {
+			file.Clear();
+			return;
+		}
+	fn.Clear();
+	if(mode == SELECTDIR) {
+		String p = GetDir();
+		if(list.GetCursor() >= 0) {
+			const FileList::File& m = list[list.GetCursor()];
+			if(m.isdir)
+				p = AppendFileName(p, m.name);
+		}
+		fn.Add(p);
+		Break(IDOK);
+		return;
+	}
+	String f = file.GetText().ToString();
+	if(f.IsEmpty()) return;
+	String o;
+	if(mode == OPEN && IsMulti()) {
+		for(const char *s = f; *s; s++) {
+			if(*s == ' ')
+				AddName(fn, o);
+			else
+			if(*s == '\"') {
+				AddName(fn, o);
+				s++;
+				for(;;) {
+					if(*s == '\0')
+						AddName(fn, o);
+					else
+					if(*s == '\"') {
+						AddName(fn, o);
+						break;
+					}
+					o.Cat(*s++);
+				}
+			}
+			else
+				o.Cat(*s);
+		}
+		AddName(fn, o);
+	}
+	else {
+		o = f;
+		AddName(fn, o);
+	}
+	if(!IsMulti() && fn.GetCount())
+		fn.SetCount(1);
+	String d = GetDir();
+	String nonexist;
+	int ne = 0;
+	for(int i = 0; i < fn.GetCount(); i++) {
+		String p = fn[i];
+		if(!IsFullPath(p))
+			p = NormalizePath(AppendFileName(d, fn[i]));
+		Array<FileSystemInfo::FileInfo> ff = filesystem->Find(p, 1);
+		p = DeQtf(p);
+		if(!ff.IsEmpty() && ff[0].is_directory) {
+			Exclamation(p + t_(" is directory."));
+			return;
+		}
+		if(asking)
+			if(mode == SAVEAS) {
+				if(!ff.IsEmpty() && !PromptOKCancel(p + t_(" already exists.&Do you want to continue ?")))
+					return;
+			}
+			else
+			if(ff.IsEmpty()) {
+				if(ne) nonexist << '&';
+				nonexist << p;
+				ne++;
+			}
+	}
+	if(ne) {
+		nonexist << (ne == 1 ? t_(" does not exist.") : t_("&do not exist."));
+		if(!PromptOKCancel(nonexist + t_("&Do you want to continue ?")))
+			return;
+	}
+	Break(IDOK);
+}
+
+bool FileSel::OpenItem() {
+	if(list.IsCursor()) {
+		const FileList::File& m = list.Get(list.GetCursor());
+		if(m.isdir) {
+			SetDir(AppendFileName(~dir, m.name));
+			return true;
+		}
+	}
+	if(mode != SELECTDIR)
+		Finish();
+	return false;
+}
+
+void FileSel::Open() {
+	if(mode == SELECTDIR) {
+		Finish();
+		return;
+	}
+	if(list.HasFocus() || type.HasFocus()) {
+		if(OpenItem()) list.SetCursor(0);
+	}
+	else
+	if(list.IsSelection())
+		for(int i = 0; i < list.GetCount(); i++) {
+			const FileList::File& m = list[i];
+			if(!m.isdir) Finish();
+		}
+	else
+	if(file.HasFocus()) {
+		String fn = file.GetText().ToString();
+		if(fn == "." || fn == "..") {
+			DirUp();
+			return;
+		}
+		if(HasWildcards(fn)) {
+			file.Clear();
+			int q = FindIndex(mask, fn);
+			if(q >= 0)
+				type.SetIndex(q);
+			else {
+				type.Add(fn, t_("Custom file type (") + fn + ')');
+				type.SetIndex(type.GetCount() - 1);
+			}
+			Load();
+			return;
+		}
+		if(fn.Find(' ') < 0 && fn.Find('\"') < 0) {
+			if(filesystem->IsWin32())
+			{
+				if(fn.GetLength() >= 2 && fn[1] == ':' && fn.GetLength() <= 3) {
+					fn.Set(0, ToUpper(fn[0]));
+					if(fn.GetLength() == 2)
+						fn.Cat('\\');
+					SetDir(fn);
+					return;
+				}
+			}
+			if(!IsFullPath(fn))
+				fn = AppendFileName(~dir, fn);
+			if(filesystem->IsWin32() && (!fn.IsEmpty() && (*fn.Last() == '\\' || *fn.Last() == '/'))
+			|| filesystem->IsPosix() && (fn != "/" && (*fn.Last() == '\\' || *fn.Last() == '/')))
+			{
+				fn.Trim(fn.GetLength() - 1);
+				SetDir(TrimDot(fn));
+				return;
+			}
+			Array<FileSystemInfo::FileInfo> ff = filesystem->Find(fn, 1);
+			if(!ff.IsEmpty()) {
+				if(ff[0].is_directory) {
+					SetDir(TrimDot(fn));
+					return;
+				}
+				else {
+					SetDir(TrimDot(GetFileFolder(fn)));
+					file.SetText(GetFileName(fn).ToWString());
+				}
+			}
+		}
+		if(mode != SELECTDIR) Finish();
+	}
+}
+
+String DirectoryUp(String& dir, bool basedir)
+{
+	String s = dir;
+	String name;
+#ifdef PLATFORM_WIN32
+	if(s.GetLength() < 3 || s.GetLength() == 3 && s[1] == ':') {
+		dir.Clear();
+		name = s;
+	}
+	else
+#endif
+#ifdef PLATFORM_POSIX
+	if(s != "/")
+#endif
+	{
+#ifdef PLATFORM_WIN32
+		int i = max(s.ReverseFind('/'), s.ReverseFind('\\'));
+#endif
+#ifdef PLATFORM_POSIX
+		int i = s.ReverseFind('/');
+#endif
+		if(basedir)
+			if(i < 0)
+				dir.Clear();
+			else {
+				dir = s.Mid(0, i);
+				name = s.Mid(i + 1);
+			}
+		else {
+#ifdef PLATFORM_WIN32
+			if(s.GetLength() && s[1] == ':')
+				if(i > 3) {
+					dir = s.Mid(0, i);
+					name = s.Mid(i + 1);
+				}
+				else {
+					dir = s.Mid(0, 3);
+					name = s.Mid(3);
+				}
+			if(s.GetLength() && s[0] == DIR_SEP && s[1] == DIR_SEP)
+				if(i > 2) {
+					dir = s.Mid(0, i);
+					name = s.Mid(i + 1);
+				}
+				else {
+					dir.Clear();
+					name = s;
+				}
+#endif
+#ifdef PLATFORM_X11
+			if(i == 0 && s.GetLength() > 1) {
+				dir = "/";
+				name = s.Mid(1);
+			}
+			else
+			if(s.GetLength() && s[0] == '/' && s[1] != '/') {
+				dir = s.Mid(0, i);
+				name = s.Mid(i + 1);
+			}
+#endif
+		}
+	}
+	return name;
+}
+
+void FileSel::DirUp() {
+	String s = ~dir;
+	String name = DirectoryUp(s, !basedir.IsEmpty());
+	SetDir(s);
+	if(list.HasFocus())
+		list.FindSetCursor(name);
+}
+
+void FileSel::MkDir() {
+	if(String(~dir).IsEmpty() && basedir.IsEmpty()) return;
+	String name, error;
+	if(EditText(name, t_("New directory"), t_("Name")) && !name.IsEmpty())
+		if(filesystem->CreateFolder(FilePath(name), error))
+		{
+			Load();
+			list.FindSetCursor(name);
+		}
+		else
+			Exclamation(t_("[A3* Creating directory failed !&&]") + error);
+}
+
+void FileSel::PlusMinus(const char *title, bool sel) {
+	String pattern;
+	if(EditText(pattern, title, t_("Mask")) && !pattern.IsEmpty())
+		for(int i = 0; i < list.GetCount(); i++)
+			if(!list.Get(i).isdir)
+				if(PatternMatchMulti(pattern, list.Get(i).name))
+					list.SelectOne(i, sel);
+}
+
+void FileSel::Plus() {
+	PlusMinus(t_("Add to selection"), true);
+}
+
+void FileSel::Minus() {
+	PlusMinus(t_("Remove from selection"), false);
+}
+
+void FileSel::Toggle() {
+	for(int i = 0; i < list.GetCount(); i++)
+		if(!list.Get(i).isdir)
+			list.SelectOne(i, !list.IsSelected(i));
+}
+
+bool FileSel::Key(dword key, int count) {
+	switch(key) {
+	case '.':
+	case K_CTRL_UP:
+		list.SetFocus();
+		dirup.PseudoPush();
+		return true;
+	case '+':
+		plus.PseudoPush();
+		return true;
+	case '-':
+		minus.PseudoPush();
+		return true;
+	case '*':
+		toggle.PseudoPush();
+		return true;
+	case K_F6:
+		list.StartEdit();
+		return true;
+	case K_F7:
+		mkdir.PseudoPush();
+		return true;
+	case K_ENTER:
+		if(mode == SELECTDIR && OpenItem())
+			return true;
+		break;
+	case K_UP:
+	case K_DOWN:
+	case K_PAGEUP:
+	case K_PAGEDOWN:
+		list.SetFocus();
+		return list.Key(key, count);
+	}
+	if(CharFilterDefaultToUpperAscii(key) || key == K_BACKSPACE)
+		return search.Key(key, count);
+	return TopWindow::Key(key, count);
+}
+
+void Catq(String& s, const String& fn) {
+	if(!s.IsEmpty())
+		s << ' ';
+	if(fn.Find(' ') >= 0)
+		s << '"' << fn << '"';
+	else
+		s << fn;
+}
+
+String FormatFileSize(int64 n)
+{
+	if(n < 10000)
+		return Format("%d B  ", n);
+	else
+	if(n < 10000 * 1024)
+		return Format("%d K  ", n >> 10);
+	else
+	if(n < I64(10000000) * 1024)
+		return Format("%d M  ", n >> 20);
+	else
+		return Format("%d G  ", n >> 30);
+}
+
+void FileSel::Update() {
+	String fn;
+	if(list.IsSelection()) {
+		for(int i = 0; i < list.GetCount(); i++)
+			if(list.IsSelected(i))
+				Catq(fn, list[i].name);
+	}
+	else
+	if(list.IsCursor()) {
+		const FileList::File& m = list[list.GetCursor()];
+		if(!m.isdir)
+			Catq(fn, m.name);
+	}
+	if(mode == OPEN)
+		file <<= fn;
+	filename = String();
+	filesize = String();
+	filetime = String();
+	if(preview)
+		*preview <<= Null;
+	if(list.IsCursor() && !list.IsSelection()) {
+		fn = list[list.GetCursor()].name;
+		if(fn[1] == ':' && fn.GetLength() <= 3)
+			filename = t_("  Drive");
+		else {
+			String path = FilePath(fn);
+			Array<FileSystemInfo::FileInfo> ff = filesystem->Find(path, 1);
+			if(!ff.IsEmpty()) {
+				filename = "  " + fn;
+				if(ff[0].is_directory)
+					filesize = t_("Directory  ");
+				else {
+					if(mode == SAVEAS)
+						file <<= fn;
+					filesize = FormatFileSize(ff[0].length);
+					if(preview)
+						*preview <<= path;
+				}
+				Time tm = ff[0].last_write_time;
+				filetime = "     " + Format(tm);
+			}
+		}
+	}
+	else {
+		int drives = 0;
+		int dirs = 0;
+		int files = 0;
+		int64 length = 0;
+		for(int i = 0; i < list.GetCount(); i++)
+			if(!list.IsSelection() || list.IsSelected(i)) {
+				const FileList::File& f = list[i];
+				if(f.isdir)
+#ifdef PLATFORM_WIN32
+					(*f.name.Last() == ':' ? drives : dirs)++;
+#else
+					dirs++;
+#endif
+				else {
+					files++;
+					length += f.length;
+				}
+			}
+		String s;
+		if(drives)
+			s << drives << t_(" drive(s)");
+		else {
+			if(dirs)
+				s << dirs << t_(" folder(s)");
+			if(files) {
+				if(s.GetCount())
+					s << ", ";
+				s << files << t_(" file(s)");
+			}
+		}
+		filename = "  " + s;
+		if(length >= 0)
+			filesize = FormatFileSize(length);
+	}
+	FileUpdate();
+}
+
+void FileSel::FileUpdate() {
+	if(mode == SELECTDIR) {
+		ok.Enable(!IsNull(~dir));
+		return;
+	}
+	bool b = list.IsCursor() || !String(file).IsEmpty();
+	ok.Enable(b);
+	if(mode != SAVEAS || list.IsCursor() && list[list.GetCursor()].isdir)
+		ok.SetLabel(t_("Open"));
+	else
+		ok.SetLabel(t_("Save"));
+}
+
+void FileSel::Rename(const String& on, const String& nn) {
+#ifdef PLATFORM_WIN32
+	if(FileMove(FilePath(on), FilePath(nn)))
+#endif
+#ifdef PLATFORM_X11
+	if(rename(FilePath(on), FilePath(nn)) == 0)
+#endif
+	{
+		Load();
+		list.FindSetCursor(nn);
+	}
+	else
+		Exclamation(t_("[A3* Renaming of file failed !&&]") + GetErrorMessage(GetLastError()));
+}
+
+void FileSel::Choice() {
+//	String s = ~dir;
+	Load();
+}
+
+FileSel& FileSel::Type(const char *name, const char *ext) {
+	type.Add(type.GetCount(), name);
+	mask.Add(ext);
+	if(IsNull(type))
+		type.SetIndex(0);
+	return *this;
+}
+
+FileSel& FileSel::AllFilesType() {
+	return Type(t_("All files"), "*.*");
+}
+
+struct FolderDisplay : public Display {
+	virtual void Paint(Draw& w, const Rect& r, const Value& q,
+	                   Color ink, Color paper, dword style) const;
+};
+
+void FolderDisplay::Paint(Draw& w, const Rect& r, const Value& q,
+	                   Color ink, Color paper, dword style) const
+{
+	String s = q;
+	w.DrawRect(r, paper);
+#ifdef PLATFORM_X11
+	Image img = GetFileIcon(GetFileFolder(s), GetFileName(s), true, false);
+#else
+	Image img = s.GetCount() ? GetFileIcon(s, false, true) : CtrlImg::Computer();
+#endif
+	if(IsNull(img))
+		img = CtrlImg::Dir();
+	w.DrawImage(r.left, r.top + (r.Height() - img.GetSize().cx) / 2, img);
+	w.DrawText(r.left + 20,
+	           r.top + (r.Height() - StdFont().Bold().Info().GetHeight()) / 2,
+			   ~s, StdFont().Bold(), ink);
+}
+
+struct HomeDisplay : public Display {
+	virtual void Paint(Draw& w, const Rect& r, const Value& q,
+	                   Color ink, Color paper, dword style) const {
+		w.DrawRect(r, paper);
+		w.DrawImage(r.left, r.top + (r.Height() - CtrlImg::Home().GetSize().cx) / 2,
+			        CtrlImg::Home());
+		w.DrawText(r.left + 20,
+		           r.top + (r.Height() - StdFont().Bold().Info().GetHeight()) / 2,
+				   String(q), StdFont().Bold(), ink);
+	}
+};
+
+void FileSel::Set(const String& s)
+{
+	fn.Clear();
+	if(IsFullPath(s)) {
+		ActiveDir(GetFileFolder(s));
+		fn.Add(GetFileName(s));
+	}
+	else
+		fn.Add(s);
+	bidname = true;
+}
+
+bool FileSel::Execute(int _mode) {
+	mode = _mode;
+	if(mode == SELECTDIR) {
+		if(!fn.IsEmpty())
+			dir <<= NormalizePath(fn[0]);
+		type.Hide();
+		type_lbl.Hide();
+		file.Hide();
+		file_lbl.Hide();
+		sortext.Hide();
+		sort_lbl.Hide();
+		ok.SetLabel(t_("&Select"));
+		Logc p = filename.GetPos().y;
+		int q = ok.GetPos().y.GetA() + ok.GetPos().y.GetB() + 8;
+		p.SetA(q);
+		filename.SetPosY(p);
+		filesize.SetPosY(p);
+		filetime.SetPosY(p);
+		p = splitter.Ctrl::GetPos().y;
+		p.SetB(q + 20);
+		splitter.SetPosY(p);
+		LogPos ps = search.GetPos();
+		LogPos pl = sort_lbl.GetPos();
+		pl.x.SetB(ps.x.GetB());
+		pl.y.SetA(ok.GetPos().y.GetA());
+		pl.y.SetB(ps.y.GetB());
+		search.SetPos(pl);
+		bidname = false;
+	}
+	else {
+		for(Ctrl *q = GetFirstChild(); q; q = q->GetNext())
+			if(q != &mkdir)
+				q->Show();
+		Rect r = GetRect();
+		CtrlLayout(*this);
+		ArrangeOKCancel(ok, cancel);
+		SetRect(r);
+	}
+	readonly.Show(rdonly && mode == OPEN);
+	list.Multi(multi && mode == OPEN);
+	dir.ClearList();
+	file <<= Null;
+	int i;
+	if(basedir.IsEmpty()) {
+		dir.Add(GetHomeDirectory());
+	#ifdef PLATFORM_POSIX
+		Array<FileSystemInfo::FileInfo> root = filesystem->Find("/media/*");
+		dir.Add(GetHomeDirFile("Desktop"));
+		dir.Add("/");
+		for(i = 0; i < root.GetCount(); i++) {
+			String ugly = root[i].filename;
+			if(ugly[0] != '.') {
+				dir.Add("/media/" + root[i].filename);
+			}
+		}
+	#else
+		const char *fs = "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders";
+		dir.Add(FromSystemCharset(GetWinRegString("Desktop", fs, HKEY_CURRENT_USER)));
+		Array<FileSystemInfo::FileInfo> root = filesystem->Find(Null);
+		for(i = 0; i < root.GetCount(); i++) {
+			String ugly = root[i].filename;
+			ugly.Cat('\0');
+			ugly.Cat(root[i].root_style);
+			dir.Add(root[i].filename, ugly);
+		}
+	#endif
+		if(filesystem->IsPosix() && String(~dir).IsEmpty())
+			dir <<= GetHomeDirectory();
+		if(lru.GetCount())
+			dir.AddSeparator();
+		for(i = 0; i < lru.GetCount(); i++)
+			if(IsFullPath(lru[i]) && filesystem->FolderExists(lru[i]))
+				dir.Add(lru[i]);
+		dir.SetDisplay(Single<FolderDisplay>(), max(16, Draw::GetStdFontCy()));
+	}
+	else {
+		dir.SetDisplay(Single<HomeDisplay>(), max(16, Draw::GetStdFontCy()));
+		if(filesystem->IsPosix()) {
+			if(String(~dir)[0] == '/')
+				dir <<= "";
+		}
+	}
+	Rect lr = splitter.GetRect();
+	Rect dr = dir.GetRect();
+	int dp = max(20, dir.Ctrl::GetPos().y.GetB());
+	int px = GetSize().cx - lr.right;
+/*	if(IsMulti()) { // Cxl: Have we ever used these?!
+		toggle.RightPos(px, dp).TopPos(dr.top, dp);
+		minus.RightPos(px + 2 * dp, dp).TopPos(dr.top, dp);
+		plus.RightPos(px + 3 * dp, dp).TopPos(dr.top, dp);
+		px += 3 * dp;
+		toggle.Show();
+		minus.Show();
+		plus.Show();
+	}
+	else {*/
+		toggle.Hide();
+		minus.Hide();
+		plus.Hide();
+//	}
+	if(mkdir.IsShown()) {
+		mkdir.RightPos(px, dp).TopPos(dr.top, dp);
+		dirup.RightPos(px + dp, dp).TopPos(dr.top, dp);
+		px += 2 * dp;
+	}
+	else {
+		dirup.RightPos(px, dp).TopPos(dr.top, dp);
+		px += dp;
+	}
+	dir.HSizePos(dr.left, px + 4);
+	if(activetype >= 0 && activetype < type.GetCount())
+		type.SetIndex(activetype);
+	int dlc = type.GetCount();
+	Load();
+	ActiveFocus(file.IsEditable() ? (Ctrl&)file : (Ctrl&)list);
+	if(bidname) {
+		String s;
+		for(int i = 0; i < fn.GetCount(); i++)
+			Catq(s, fn[i]);
+		file <<= s;
+		ActiveFocus(file);
+		bidname = false;
+	}
+	list.SetSbPos(lastsby);
+	FileUpdate();
+	Update();
+	int c = TopWindow::Run(appmodal);
+	TopWindow::Close();
+	lastsby = list.GetSbPos();
+	type.Trim(dlc);
+	activetype = type.GetIndex();
+	if(activetype >= dlc || activetype < 0)
+		activetype = 0;
+	if(c == IDOK) {
+		String d = ~dir;
+		if(filesystem->IsWin32())
+			if(d.GetLength() == 3 && d[1] == ':') return true;
+		if(filesystem->IsPosix())
+			if(d == "/") return true;
+		if(!IsFullPath(d)) return true;
+		LruAdd(lru, d, 8);
+		return true;
+	}
+	return false;
+}
+
+bool FileSel::ExecuteOpen(const char *title) {
+	Title(title ? title : t_("Open"));
+	return Execute(OPEN);
+}
+
+bool FileSel::ExecuteSaveAs(const char *title) {
+	Title(title ? title : t_("Save as"));
+	ok.SetLabel(t_("Save"));
+	return Execute(SAVEAS);
+}
+
+bool FileSel::ExecuteSelectDir(const char *title)
+{
+	Title(title ? title : t_("Select directory"));
+	return Execute(SELECTDIR);
+}
+
+void FileSel::Serialize(Stream& s) {
+	int version = 7;
+	s / version;
+	String ad = ~dir;
+	s / activetype % ad;
+	dir <<= ad;
+	if(version < 1) {
+		String n = fn.At(0);
+		s % n;
+		fn.At(0) = n;
+	}
+	else {
+		if(version < 4)
+			s % fn;
+		else {
+			Vector<String> __;
+			s % __;
+		}
+	}
+	if(version >= 2) {
+		SerializePlacement(s);
+		s % list;
+	}
+	if(version >= 3) {
+		s % lastsby;
+	}
+	if(version >= 4) {
+		s % lru;
+	}
+	if(version >= 5) {
+		s % sortext;
+	}
+	if(version >= 6) {
+		s % splitter;
+	}
+	if(version >= 7) {
+		s % hidden;
+	}
+}
+
+String FileSel::GetFile(int i) const {
+	String p;
+	if(i >= 0 && i < fn.GetCount()) {
+		p = fn[i];
+		if(!IsFullPath(p))
+			p = AppendFileName(dir.GetData(), p);
+	}
+	return p;
+}
+
+void FileSel::SyncSplitter()
+{
+	splitter.Clear();
+	splitter.Add(list);
+	if(preview)
+		splitter.Add(*preview);
+}
+
+FileSel& FileSel::Preview(Ctrl& ctrl)
+{
+	bool n = false;
+	if(!preview) {
+		Size sz = GetRect().GetSize();
+		sz.cx = 5 * sz.cx / 3;
+		SetRect(sz);
+		n = true;
+	}
+	preview = &ctrl;
+	SyncSplitter();
+	if(n)
+		splitter.SetPos(6666);
+	return *this;
+}
+
+FileSel& FileSel::Preview(const Display& d)
+{
+	preview_display.SetDisplay(d);
+	return Preview(preview_display);
+}
+
+FileSel::FileSel() {
+	filesystem = &StdFileSystemInfo();
+	CtrlLayout(*this);
+	ArrangeOKCancel(ok, cancel);
+	Acceptor(ok, IDOK); ok.Ok();
+	Rejector(cancel, IDCANCEL); cancel.Cancel();
+	list.IconWidth(16).Renaming().Columns(3).ClickKill();
+	list.WhenLeftDouble = THISBACK(OpenItem2);
+	dirup <<= THISBACK(DirUp);
+	Add(dirup);
+	sortext <<= THISBACK(SearchLoad);
+	Add(sortext);
+	hidden <<= THISBACK(SearchLoad);
+	Add(hidden);
+	mkdir <<= THISBACK(MkDir);
+	Add(mkdir);
+	plus <<= THISBACK(Plus);
+	Add(plus);
+	minus <<= THISBACK(Minus);
+	Add(minus);
+	toggle <<= THISBACK(Toggle);
+	Add(toggle);
+
+	ok <<= THISBACK(Open);
+	list <<= THISBACK(Update);
+	file <<= THISBACK(FileUpdate);
+	list.WhenRename = THISBACK(Rename);
+	Sizeable();
+	dirup.SetImage(CtrlImg::DirUp()).NoWantFocus();
+	dirup.Tip(t_("Dir up") + String(" (Ctrl+Up)"));
+	mkdir.SetImage(CtrlImg::MkDir()).NoWantFocus();
+	mkdir.Tip(t_("Create directory") + String(" (F7)"));
+	plus.SetImage(CtrlImg::Plus()).NoWantFocus();
+	plus.Tip(t_("Select files"));
+	minus.SetImage(CtrlImg::Minus()).NoWantFocus();
+	minus.Tip(t_("Unselect files"));
+	toggle.SetImage(CtrlImg::Toggle()).NoWantFocus();
+	toggle.Tip(t_("Toggle files"));
+	type <<= THISBACK(Load);
+	sortext <<= 0;
+
+	search.NullText("Search", StdFont().Italic(), SColorDisabled());
+	search.SetFilter(CharFilterDefaultToUpperAscii);
+	search <<= THISBACK(SearchLoad);
+
+	filename.SetFont(StdFont());
+	filename.SetFrame(ThinInsetFrame());
+	filesize.SetFont(StdFont()).SetAlign(ALIGN_RIGHT);
+	filesize.SetFrame(ThinInsetFrame());
+	filetime.SetFont(StdFont());
+	filetime.SetFrame(ThinInsetFrame());
+
+	dir <<= THISBACK(Choice);
+	dir.DisplayAll();
+	dir.SetDropLines(24);
+
+	activetype = 0;
+	readonly.Hide();
+
+	lastsby = 0;
+
+	asking = true;
+	rdonly = false;
+	multi = false;
+	bidname = false;
+	appmodal = true;
+
+	AddChildBefore(GetFirstChild(), &sizegrip);
+
+	preview = NULL;
+	preview_display.SetFrame(FieldFrame());
+
+	SyncSplitter();
+
+	BackPaintHint();
+}
+
+FileSel::~FileSel() {}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/CtrlLib/FileSel.h b/uppsrc/CtrlLib/FileSel.h
new file mode 100644
index 000000000..2aebab74e
--- /dev/null
+++ b/uppsrc/CtrlLib/FileSel.h
@@ -0,0 +1,226 @@
+Image GetDriveImage(char drive_style);
+
+void DrawFileName(Draw& w, int x, int y, int wcx, int cy, const WString& mname, bool isdir, Font font,
+                  Color ink, Color extink, const WString& desc, Font descfont, bool justname);
+
+class FileList : public ColumnList, private Display {
+public:
+	virtual void  LeftDown(Point p, dword);
+	virtual bool  Key(dword key, int count);
+
+	virtual void  Paint(Draw& w, const Rect& r, const Value& q,
+		                Color ink, Color paper, dword style) const;
+	virtual Size  GetStdSize(const Value& q) const;
+
+public:
+	struct File {
+		bool   isdir;
+		Image  icon;
+		String name;
+		Font   font;
+		Color  ink;
+		int64  length;
+		Time   time;
+		Color  extink;
+		String desc;
+		Font   descfont;
+		Value  data;
+
+		operator const String&() const { return name; }
+	};
+
+	class Order {
+	public:
+		virtual bool operator()(const File& a, const File& b) const = 0;
+		virtual ~Order() {}
+	};
+
+private:
+	int            iconwidth;
+	EditField      edit;
+
+	bool           renaming;
+	bool           justname;
+	bool           accelkey;
+
+	void        UpdateSelect();
+	void        Update();
+	bool        FindChar(int from, int chr);
+
+	struct FileOrder;
+
+protected:
+	enum {
+		TIMEID_STARTEDIT = ColumnList::TIMEID_COUNT,
+		TIMEID_COUNT
+	};
+
+public:
+	Callback2<const String&, const String&> WhenRename;
+
+	void        StartEdit();
+	void        EndEdit();
+	bool        IsEdit() const                       { return edit.IsVisible(); }
+	void        OkEdit();
+
+	const File& Get(int i) const;
+	const File& operator[](int i) const              { return Get(i); }
+	void        Insert(int ii,
+	                const String& name, const Image& icon = Null,
+		            Font font = StdFont(), Color ink = SColorText(),
+	                bool isdir = false, int64 length = 0, Time time = Null, Color extink = Null,
+	                const String& desc = Null, Font descfont = Null, Value data = Null);
+	void        Add(const String& name, const Image& icon = Null,
+		            Font font = StdFont(), Color ink = SColorText(),
+	                bool isdir = false, int64 length = 0, Time time = Null, Color extink = Null,
+	                const String& desc = Null, Font descfont = Null, Value data = Null);
+
+	String      GetCurrentName() const;
+
+	int         Find(const char *name);
+	bool        FindSetCursor(const char *name);
+
+	void        Sort(const Order& order);
+
+	FileList&   IconWidth(int w)                     { iconwidth = w; Refresh(); return *this; }
+	int         GetIconWidth() const                 { return iconwidth; }
+	FileList&   Renaming(bool b = true)              { renaming = b; return *this; }
+	FileList&   JustName(bool b = true)              { justname = b; Refresh(); return *this; }
+	FileList&   AccelKey(bool b = true)              { accelkey = b; return *this; }
+
+	typedef FileList CLASSNAME;
+
+	FileList();
+	virtual ~FileList();
+};
+
+bool Load(FileList& list, const String& dir, const char *patterns, bool dirs = false,
+          Callback3<bool, const String&, Image&> WhenIcon = CNULL,
+          FileSystemInfo& filesystem = StdFileSystemInfo(), const String& search = String(),
+          bool hidden = true);
+void SortByName(FileList& list);
+void SortByExt(FileList& list);
+
+String DirectoryUp(String& dir, bool basedir = false);
+
+class FileSel : public WithFileSelectorLayout<TopWindow> {
+public:
+	virtual bool Key(dword key, int count);
+
+private:
+	SizeGrip    sizegrip;
+
+	Button      dirup, mkdir, plus, minus, toggle;
+
+protected:
+	Vector<String> mask;
+	Vector<String> path;
+	Vector<String> lru;
+	int            lastsby;
+	FileSystemInfo *filesystem;
+
+	String         olddir;
+	String         basedir;
+	int            activetype;
+	String         defext;
+	Vector<String> fn;
+
+	DisplayCtrl    preview_display;
+	Ctrl          *preview;
+	FileList       list;
+
+	enum {
+		OPEN, SAVEAS, SELECTDIR
+	};
+
+	int         mode;
+	bool        asking;
+	bool        multi;
+	bool        rdonly;
+	bool        bidname;
+	bool        appmodal;
+
+	bool        PatternMatch(const char *fn);
+	bool        OpenItem();
+	void        OpenItem2()                                  { OpenItem(); }
+	void        Open();
+	void        DirUp();
+	void        MkDir();
+	void        Plus();
+	void        Minus();
+	void        Toggle();
+	void        PlusMinus(const char *title, bool sel);
+	void        Update();
+	void        FileUpdate();
+	void        Rename(const String& on, const String& nn);
+	void        Choice();
+	void        SearchLoad();
+	void        Load();
+	String      FilePath(const String& fn);
+	void        SetDir(const String& dir);
+	String      GetDir();
+	void        AddName(Vector<String>& fn, String& o);
+	void        Finish();
+	bool        Execute(int mode);
+	bool        IsMulti()                                     { return multi && mode == OPEN; }
+	void        SyncSplitter();
+	String      GetMask();
+
+	using       WithFileSelectorLayout<TopWindow>::Title;
+
+public:
+	typedef FileSel CLASSNAME;
+
+	Callback3<bool, const String&, Image&> WhenIcon;
+
+	void        Serialize(Stream& s);
+
+	bool        ExecuteOpen(const char *title = NULL);
+	bool        ExecuteSaveAs(const char *title = NULL);
+
+	bool        ExecuteSelectDir(const char *title = NULL);
+
+	String Get() const                           { return GetFile(0); }
+	void   Set(const String& s);
+	void   Set(const Vector<String>& s)          { fn <<= s; bidname = true; }
+
+	operator String() const                      { return Get(); }
+	void operator=(const String& s)              { Set(s); }
+
+	String operator~() const                     { return Get(); }
+	void operator<<=(const String& s)            { Set(s); }
+
+	int    GetCount() const                      { return fn.GetCount(); }
+	String GetFile(int i) const;
+	String operator[](int i) const               { return GetFile(i); }
+	void   ClearFiles()                          { fn.Clear(); }
+
+	bool   GetReadOnly() const                   { return readonly; }
+	String GetActiveDir() const                  { return dir.GetData(); }
+	int    GetActiveType() const                 { return activetype; }
+
+	void   Filesystem(FileSystemInfo& fsys)      { filesystem = &fsys;}
+	FileSystemInfo& GetFilesystem() const        { return *filesystem; }
+
+	FileSel& Type(const char *name, const char *ext);
+	FileSel& AllFilesType();
+	FileSel& ActiveDir(const String& d)          { dir <<= d; return *this; }
+	FileSel& ActiveType(int i)                   { activetype = i; return *this;  }
+	FileSel& DefaultExt(const char *ext)         { defext = ext; return *this; }
+	FileSel& Multi(bool b = true)                { multi = b; return *this; }
+	FileSel& ReadOnlyOption(bool b = true)       { rdonly = b; return *this; }
+	FileSel& MkDirOption(bool b = true)          { mkdir.Show(b); return *this; }
+	FileSel& NoMkDirOption()                     { return MkDirOption(false); }
+	FileSel& BaseDir(const char *dir)            { basedir = dir; return *this; }
+	FileSel& Asking(bool b = true)               { asking = b; return *this; }
+	FileSel& NoAsking()                          { return Asking(false); }
+	FileSel& EditFileName(bool b)                { file.SetEditable(b); return *this; }
+	FileSel& NoEditFileName()                    { return EditFileName(false); }
+	FileSel& AppModal(bool b = true)             { appmodal = b; return *this; }
+	FileSel& NoAppModal()                        { return AppModal(false); }
+	FileSel& Preview(Ctrl& ctrl);
+	FileSel& Preview(const Display& d);
+
+	FileSel();
+	virtual ~FileSel();
+};
diff --git a/uppsrc/CtrlLib/FrameSplitter.cpp b/uppsrc/CtrlLib/FrameSplitter.cpp
new file mode 100644
index 000000000..a733b62b8
--- /dev/null
+++ b/uppsrc/CtrlLib/FrameSplitter.cpp
@@ -0,0 +1,132 @@
+#include "CtrlLib.h"
+
+NAMESPACE_UPP
+
+void SplitterFrame::FrameAdd(Ctrl& parent)
+{
+	parent.Add(*this);
+}
+
+void SplitterFrame::FrameRemove()
+{
+	this->Ctrl::Remove();
+}
+
+void SplitterFrame::FrameAddSize(Size& sz)
+{
+	if (IsShown()) (type == LEFT || type == RIGHT ? sz.cx : sz.cy) += size;
+}
+
+int  SplitterFrame::BoundSize()
+{
+	int maxsize = max(0, (type == LEFT || type == RIGHT ? parentsize.cx : parentsize.cy) - sizemin);
+	return IsShown() ? max(4, minmax(size, minsize - 4, maxsize)) : 0;
+}
+
+void SplitterFrame::FrameLayout(Rect& r)
+{
+	Rect rr = r;
+	parentsize = r.GetSize();
+	int sz = BoundSize();
+	switch(type) {
+	case LEFT:
+		r.left += sz;
+		rr.right = r.left;
+		break;
+	case RIGHT:
+		r.right -= sz;
+		rr.left = r.right;
+		break;
+	case TOP:
+		r.top += sz;
+		rr.bottom = r.top;
+		break;
+	case BOTTOM:
+		r.bottom -= sz;
+		rr.top = r.bottom;
+		break;
+	}
+	SetFrameRect(rr);
+}
+
+void SplitterFrame::Paint(Draw& draw)
+{
+	draw.DrawRect(
+		Ctrl::GetSize(),
+		HasCapture() ? GUI_GlobalStyle() >= GUISTYLE_XP ? Blend(SColorHighlight, SColorFace) : SColorShadow
+		             : SColorFace()
+	);
+}
+
+void SplitterFrame::LeftDown(Point p, dword)
+{
+	SetCapture();
+	Refresh();
+	ref = GetMousePos();
+	size0 = BoundSize();
+}
+
+void SplitterFrame::MouseMove(Point p, dword keyflags)
+{
+	if(!HasCapture())
+		return;
+	p = GetMousePos();
+	switch(type) {
+	case LEFT: size = size0 + p.x - ref.x; break;
+	case RIGHT: size = size0 + ref.x - p.x; break;
+	case TOP: size = size0 + p.y - ref.y; break;
+	case BOTTOM: size = size0 + ref.y - p.y; break;
+	}
+	RefreshParentLayout();
+}
+
+void SplitterFrame::LeftUp(Point p, dword keyflags)
+{
+	Refresh();
+}
+
+Image SplitterFrame::CursorImage(Point p, dword keyflags)
+{
+	return type == LEFT || type == RIGHT ? Image::SizeHorz() : Image::SizeVert();
+}
+
+SplitterFrame& SplitterFrame::Set(Ctrl& c, int _size, int _type)
+{
+	while(GetFirstChild())
+		GetFirstChild()->Remove();
+	type = _type;
+	size = _size;
+	Add(c.SizePos());
+	switch(type) {
+	case LEFT: c.HSizePos(0, 4); break;
+	case RIGHT: c.HSizePos(4, 0); break;
+	case TOP: c.VSizePos(0, 4); break;
+	case BOTTOM: c.VSizePos(4, 0); break;
+	}
+	RefreshParentLayout();
+	return *this;
+}
+
+void SplitterFrame::Serialize(Stream& s)
+{
+	int version = 1;
+	s / version;
+	s % size;
+	bool visible = IsShown();
+	if(version >= 1)
+		s % visible;
+	if(s.IsLoading()) {
+		Show(visible);
+		RefreshParentLayout();
+	}
+}
+
+SplitterFrame::SplitterFrame()
+{
+	type = LEFT;
+	size = size0 = 4;
+	minsize = 0;
+	sizemin = 0;
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/CtrlLib/HeaderCtrl.cpp b/uppsrc/CtrlLib/HeaderCtrl.cpp
new file mode 100644
index 000000000..d774fae82
--- /dev/null
+++ b/uppsrc/CtrlLib/HeaderCtrl.cpp
@@ -0,0 +1,819 @@
+#include "CtrlLib.h"
+
+NAMESPACE_UPP
+
+HeaderCtrl::Column::Column()
+{
+	ratio = 1;
+	visible = true;
+	min = 0;
+	max = INT_MAX;
+	margin = 4;
+	header = NULL;
+	SetAlign(ALIGN_LEFT);
+	paper = Null;
+	index = Null;
+}
+
+HeaderCtrl::Column&  HeaderCtrl::Column::SetMargin(int m)
+{
+	if(m != margin) {
+		margin = m;
+		LabelUpdate();
+	}
+	return *this;
+}
+
+HeaderCtrl::Column&  HeaderCtrl::Column::SetRatio(double wd)
+{
+	ratio = wd ? wd : 1;
+	LabelUpdate();
+	return *this;
+}
+
+void  HeaderCtrl::Column::LabelUpdate()
+{
+	if(header) {
+		header->RefreshParentLayout();
+		header->Refresh();
+		header->WhenLayout();
+		header->SbTotal();
+	}
+}
+
+CH_STYLE(HeaderCtrl, Style, StyleDefault)
+{
+	CtrlsImageLook(look, CtrlsImg::I_HTB);
+	gridadjustment = 0;
+	Point p = Button::StyleNormal().pressoffset;
+	pressoffset = p.x || p.y;
+}
+
+void HeaderCtrl::Column::Paint(bool& first, Draw& w,
+                               int x, int y, int cx, int cy, bool disabled, bool push, bool hl)
+{
+	const HeaderCtrl::Style *style = header ? header->style : &HeaderCtrl::StyleDefault();;
+	if(first) {
+		if(cx >= -style->gridadjustment) {
+			cx -= style->gridadjustment;
+			if(cx < 0)
+				cx = 0;
+			first = false;
+		}
+	}
+	else
+		x -= style->gridadjustment;
+	bool p = push && style->pressoffset;
+	int q = CTRL_NORMAL;
+	if(hl)
+		q = CTRL_HOT;
+	if(push)
+		q = CTRL_PRESSED;
+	if(disabled)
+		q = CTRL_DISABLED;
+	ChPaint(w, x, y, cx, cy, IsNull(paper) ? style->look[q] : paper.operator Value());
+	x += margin;
+	cx -= 2 * margin;
+	w.Clip(x + 2, y, cx - 4, cy);
+	PaintLabel(w, x + 2, y + 1, cx - 4, cy - 4, disabled, p);
+	w.End();
+}
+
+HeaderCtrl::Column& HeaderCtrl::Tab(int i) {
+	if(i >= col.GetCount())
+		for(int j = col.GetCount(); j <= i; j++) {
+			Column& c = col.Add();
+			c.header = this;
+			c.index = i;
+		}
+	return col[i];
+}
+
+void HeaderCtrl::SetHeight(int cy)
+{
+	height = cy;
+	RefreshParentLayout();
+}
+
+int  HeaderCtrl::GetHeight() const
+{
+	int cy = 0;
+	for(int i = 0; i < col.GetCount(); i++)
+		cy = max(cy, col[i].GetLabelSize().cy);
+	return max(height, cy + 4);
+}
+
+HeaderCtrl::Column& HeaderCtrl::Add()
+{
+	oszcx = -1;
+	return Tab(col.GetCount());
+}
+
+HeaderCtrl::Column& HeaderCtrl::Add(const char *text, double ratio)
+{
+	HeaderCtrl::Column& c = Add();
+	c.ratio = ratio ? ratio : 1;
+	c.SetText(text);
+	SbTotal();
+	return c;
+}
+
+void HeaderCtrl::SetTabRatio(int i, double ratio)
+{
+	col[i].ratio = ratio;
+	oszcx = -1;
+	Refresh();
+	WhenLayout();
+}
+
+void HeaderCtrl::SwapTabs(int first, int second)
+{
+	col.Swap(first, second);
+	oszcx = -1;
+	Refresh();
+	WhenLayout();
+}
+
+void HeaderCtrl::MoveTab(int from, int to)
+{
+	col.Move(from, to);
+	oszcx = -1;
+	Refresh();
+	WhenLayout();
+}
+
+double HeaderCtrl::Denominator() const {
+	double rs = 0;
+	for(int i = 0; i < col.GetCount(); i++)
+		if(col[i].visible)
+			rs += col[i].ratio;
+	return rs;
+}
+
+void HeaderCtrl::SbTotal()
+{
+	if(mode == SCROLL) {
+		int cx = 0;
+		for(int i = 0; i < col.GetCount(); i++)
+			cx += (int)col[i].ratio;
+		sb.SetTotal(cx);
+	}
+	else
+		sb.SetTotal(0);
+}
+
+HeaderCtrl& HeaderCtrl::Proportional() { mode = PROPORTIONAL; SbTotal(); return *this; }
+HeaderCtrl& HeaderCtrl::ReduceNext()   { mode = REDUCENEXT; SbTotal(); return *this; }
+HeaderCtrl& HeaderCtrl::ReduceLast()   { mode = REDUCELAST; SbTotal(); return *this; }
+HeaderCtrl& HeaderCtrl::Absolute()     { mode = SCROLL; SbTotal(); return *this; }
+
+int  HeaderCtrl::SumMin(int from)
+{
+	int mincx = 0;
+	for(int i = from; i < col.GetCount(); i++)
+		if(col[i].visible)
+			mincx += col[i].min;
+	return mincx;
+}
+
+int  HeaderCtrl::SumMax(int from)
+{
+	int maxcx = 0;
+	for(int i = from; i < col.GetCount(); i++)
+		if(col[i].visible) {
+			if(col[i].max == INT_MAX)
+				return INT_MAX;
+			maxcx += col[i].max;
+		}
+	return maxcx;
+}
+
+void HeaderCtrl::ReCompute()
+{
+	int szcx = GetSize().cx;
+	tabrect.Clear();
+	Rect r;
+	r.top = 0;
+	r.bottom = GetSize().cy;
+	r.right = 0;
+	if(mode == SCROLL)
+		for(int i = 0; i < col.GetCount(); i++) {
+			r.left = r.right;
+			if(col[i].visible)
+				r.right += (int)col[i].ratio;
+			tabrect.Add(r);
+		}
+	else {
+		double rs = Denominator();
+		double rr = 0;
+		double eps = rs / 2.0e5;
+		Vector<int> ci = GetVisibleCi(0);
+		for(int i = 0; i < ci.GetCount() - 1; i++) {
+			int cii = ci[i];
+			r.left = r.right;
+			while(tabrect.GetCount() < cii)
+				tabrect.Add(r);
+			rr += rs ? col[cii].ratio : 1;
+			r.right = int(rr * szcx / (rs ? rs : ci.GetCount()) + eps);
+			tabrect.Add(r);
+		}
+		r.left = r.right;
+		if(!ci.IsEmpty()) {
+			int cii = ci.Top();
+			while(tabrect.GetCount() < cii)
+				tabrect.Add(r);
+			r.right = szcx;
+			tabrect.Add(r);
+		}
+		r.left = r.right;
+		tabrect.SetCount(col.GetCount(), r);
+	}
+}
+
+void HeaderCtrl::Distribute(const Vector<int>& sci, double delta)
+{
+	Vector<int> ci(sci, 1);
+	int szcx = GetSize().cx;
+	if(szcx == 0)
+		return;
+	double rs = Denominator();
+	double eps = max(1.0e-6, rs / 1.0e6);
+	double epsr = max(1.0e-4, rs / 1.0e4);
+	bool checkmin = SumMin(0) < szcx;
+	for(;;) {
+		double psm = 0;
+		for(int i = 0; i < ci.GetCount(); i++)
+			psm += col[ci[i]].ratio;
+		if(fabs(psm) < eps)
+			return;
+		double q = 1 + delta / psm;
+		double x = 0;
+		Vector<int> nci;
+		for(int i = 0; i < ci.GetCount(); i++) {
+			Column& c = col[ci[i]];
+			c.ratio *= q;
+			if(c.ratio < epsr)
+				c.ratio = epsr;
+			else
+			if(c.ratio < c.min * rs / szcx && checkmin) {
+				c.ratio = c.min * rs / szcx;
+				if(delta > 0)
+					nci.Add(ci[i]);
+			}
+			else
+			if(c.ratio > c.max * rs / szcx) {
+				c.ratio = c.max * rs / szcx;
+				if(delta < 0)
+					nci.Add(ci[i]);
+			}
+			else
+				nci.Add(ci[i]);
+			x += c.ratio;
+		}
+
+		delta = (psm + delta) - x;
+
+		if(fabs(delta) < eps)
+			break;
+		ci = nci;
+		if(ci.GetCount() == 0) {
+			double psm = 0;
+			for(int i = 0; i < sci.GetCount(); i++)
+				psm += col[sci[i]].ratio;
+			if(fabs(psm) < eps)
+				return;
+			double q = 1 + delta / psm;
+			for(int i = 0; i < sci.GetCount(); i++)
+				col[sci[i]].ratio *= q;
+			return;
+		}
+	}
+}
+
+Vector<int> HeaderCtrl::GetVisibleCi(int from)
+{
+	Vector<int> sci;
+	for(int i = from; i < col.GetCount(); i++)
+		if(col[i].visible)
+			sci.Add(i);
+	return sci;
+}
+
+void HeaderCtrl::RefreshDistribution()
+{
+	int szcx = GetSize().cx;
+	if(oszcx != szcx) {
+		if(mode == SCROLL)
+			for(int i = 0; i < col.GetCount(); i++) {
+				Column& c = col[i];
+				c.ratio = minmax((int)c.ratio, c.min, c.max);
+			}
+		else {
+			Distribute(GetVisibleCi(0), 0);
+			oszcx = szcx;
+		}
+		ReCompute();
+	}
+}
+
+Rect HeaderCtrl::GetTabRect(int q)
+{
+	RefreshDistribution();
+	return tabrect[q];
+}
+
+int  HeaderCtrl::GetTabWidth(int ci)
+{
+	return GetTabRect(ci).Width();
+}
+
+void HeaderCtrl::SetTabWidth0(int i, int cx)
+{
+	Column& c = col[i];
+	int szcx = GetSize().cx;
+	Rect ir = GetTabRect(i);
+	bool checkmin = SumMin(0) < szcx;
+	cx = checkmin ? minmax(cx, c.min, c.max) : min(cx, c.max);
+	if(mode != SCROLL) {
+		if(checkmin)
+			cx = min(cx, szcx - SumMin(i + 1) - ir.left);
+		cx = max(cx, szcx - SumMax(i + 1) - ir.left);
+	}
+	if(cx < 0)
+		cx = 0;
+
+	double rs = Denominator();
+	int ocx = ir.Width();
+	if(szcx == 0) return;
+
+	double delta = rs * (cx - ocx) / szcx;
+	if(ocx == cx) return;
+	col[i].ratio += delta;
+
+	switch(mode) {
+	case PROPORTIONAL:
+		Distribute(GetVisibleCi(i + 1), -delta);
+		break;
+	case REDUCELAST:
+		for(int q = col.GetCount() - 1; q >= i; q--)
+			Reduce(q, delta, rs, szcx, checkmin);
+		break;
+	case REDUCENEXT:
+		for(int q = i + 1; q < col.GetCount(); q++)
+			Reduce(q, delta, rs, szcx, checkmin);
+		if(delta > 0)
+			Reduce(i, delta, rs, szcx, checkmin);
+		break;
+	case SCROLL:
+		col[i].ratio = cx;
+		SbTotal();
+		break;
+	}
+
+	ReCompute();
+	Refresh();
+}
+
+void HeaderCtrl::Reduce(int i, double& delta, double rs, int szcx, bool checkmin)
+{
+	if(col[i].visible) {
+		Column& c = col[i];
+		double q = minmax(c.ratio - delta, checkmin ? c.min * rs / szcx : 0, c.max * rs / szcx);
+		if(q < 0)
+			q = 0;
+		delta -= c.ratio - q;
+		c.ratio = q;
+	}
+}
+
+void HeaderCtrl::SetTabWidth(int i, int cx) {
+	SetTabWidth0(i, cx);
+	WhenLayout();
+}
+
+void HeaderCtrl::Paint(Draw& w) {
+	RefreshDistribution();
+	Size sz = GetSize();
+	w.DrawRect(sz, SColorFace());
+	bool ds = !IsShowEnabled();
+	double rs = Denominator();
+	double rr = 0;
+	int x = -sb;
+	light = -1;
+	bool first = true;
+	int dx = Null;
+	for(int i = 0; i < col.GetCount(); i++) {
+		if(col[i].visible) {
+			Rect r;
+			if(mode == SCROLL) {
+				int cx = (int)col[i].ratio;
+				r = RectC(x, 0, cx, sz.cy);
+				x += cx;
+			}
+			else {
+				rr += rs ? col[i].ratio : 1;
+				int xx = int(rr * sz.cx / (rs ? rs : col.GetCount()));
+				r = RectC(x, 0, i == col.GetCount() - 1 ? sz.cx - x : xx - x, sz.cy);
+				x = xx;
+			}
+			bool mousein = HasMouseIn(r.Deflated(1, 0)) && col[i].WhenAction && pushi < 0 &&
+			               !isdrag;
+			if(mousein)
+				light = i;
+			col[i].Paint(first, w,
+			             r.left, r.top, r.Width(), r.Height(), ds, push && i == pushi, mousein);
+			if(isdrag && ti == i)
+				dx = r.left;
+		}
+		if(x >= sz.cx) break;
+	}
+	Column h;
+	h.header = this;
+	h.Paint(first, w, x, 0, 999, sz.cy, false, false, false);
+	if(isdrag) {
+		w.DrawImage(dragx + dragd, 0, dragtab);
+		DrawVertDrop(w, IsNull(dx) ? sz.cx - 2 : dx - (dx > 0), 0, sz.cy);
+	}
+}
+
+void HeaderCtrl::Layout()
+{
+	sb.SetPage(GetSize().cx);
+}
+
+int HeaderCtrl::GetNextTabWidth(int i) {
+	while(++i < col.GetCount())
+		if(col[i].visible)
+			return GetTabWidth(i);
+	return 0;
+}
+
+int HeaderCtrl::GetLastVisibleTab() {
+	int i = col.GetCount();
+	while(--i >= 0)
+		if(col[i].visible) return i;
+	return -1;
+}
+
+int HeaderCtrl::GetSplit(int px) {
+	if(!IsEnabled())
+		return Null;
+	RefreshDistribution();
+	px += sb;
+	int cx = GetSize().cx;
+	double rs = Denominator();
+	int n = col.GetCount();
+	int l = GetLastVisibleTab();
+	if(mode != SCROLL && abs(px - cx) <= 4 && n > 0 && l >= 0 && GetTabWidth(l) < 4)
+		while(--n >= 0)
+			if(GetTabWidth(n) >= 4)
+				return n;
+	double rr = 0;
+	int x = 0;
+	int first_move = 0;
+	while(first_move < n && (!col[first_move].visible || col[first_move].min == col[first_move].max))
+		first_move++;
+	int last_move = n - 1;
+	while(last_move >= 0 && (!col[last_move].visible || col[last_move].min == col[last_move].max))
+		last_move--;
+	if(mode == PROPORTIONAL)
+		last_move--;
+	for(int i = 0; i < n; i++) {
+		Column& cl = col[i];
+		if(cl.visible) {
+			bool canmove = (i >= first_move && i <= last_move);
+			if(cl.min == cl.max) {
+				int j = i;
+				while(++j < n && !col[j].visible)
+					;
+				if(j >= n || col[j].min == col[j].max)
+					canmove = false;
+			}
+			if(mode == SCROLL) {
+				x += (int)col[i].ratio;
+				if(canmove && px >= x - 3 && px < x + 3 && (i >= n - 1 || GetNextTabWidth(i) >= 4 || px < x))
+					return i;
+			}
+			else {
+				rr += rs ? col[i].ratio : 1;
+				x = int(rr * cx / (rs ? rs : col.GetCount()));
+				if(canmove && px >= x - 3 && px < x + 3 && i < n - 1 && (i >= n - 1 || GetNextTabWidth(i) >= 4 || px < x))
+					return i;
+			}
+			if(px < x)
+				return -1 - i;
+		}
+	}
+	return Null;
+}
+
+Image HeaderCtrl::CursorImage(Point p, dword) {
+	if(HasCapture())
+		return split >= 0 ? CtrlsImg::HorzPos() : Image::Arrow();
+	int q = GetSplit(p.x);
+	return q < 0 ? Image::Arrow()
+	             : GetTabWidth(q) < 4 ? CtrlsImg::HorzSplit()
+	                                  : CtrlsImg::HorzPos();
+}
+
+void HeaderCtrl::LeftDown(Point p, dword keyflags) {
+#ifdef _DEBUG
+	if(keyflags & K_CTRL) {
+		String text;
+		for(int i = 0; i < col.GetCount(); i++)
+			text += Format(i ? " %d" : "%d", GetTabWidth(i));
+		WriteClipboardText(".ColumnWidths(\"" + text + "\");");
+		BeepExclamation();
+	}
+#endif
+	split = GetSplit(p.x);
+	if(IsNull(split)) return;
+	SetCapture();
+	if(split >= 0) {
+		colRect = GetTabRect(split);
+		return;
+	}
+	li = pushi = -1 - split;
+	if(!col[pushi].WhenAction) {
+		pushi = -1;
+		return;
+	}
+	colRect = GetTabRect(pushi);
+	push = true;
+	Refresh();
+}
+
+void HeaderCtrl::RightDown(Point p, dword)
+{
+	int q = GetSplit(p.x);
+	if(q >= 0 || IsNull(q))
+		return;
+	q = -1 - q;
+	if(col[q].WhenBar)
+		MenuBar::Execute(col[q].WhenBar);
+}
+
+void HeaderCtrl::StartSplitDrag(int s)
+{
+	split = s;
+	colRect = GetTabRect(split);
+	SetCapture();
+}
+
+void HeaderCtrl::MouseMove(Point p, dword keyflags) {
+	if(isdrag) {
+		ti = GetLastVisibleTab() + 1;
+		for(int i = 0; i < GetCount(); i++)
+			if(col[i].visible) {
+				Rect r = GetTabRect(i).OffsetedHorz(-sb);
+				if(p.x < r.left + r.Width() / 2) {
+					ti = i;
+					break;
+				}
+			}
+		dragx = p.x;
+		Refresh();
+		return;
+	}
+	int q = GetSplit(p.x);
+	q = IsNull(q) || q >= 0 ? -1 : -1 - q;
+	if(q != light)
+		Refresh();
+	if(!HasCapture())
+		return;
+	Size sz = GetSize();
+	int x = mode == SCROLL ? p.x + sb : min(sz.cx, p.x);
+	if(split >= 0) {
+		int w = x - colRect.left;
+		if(w < 0) w = 0;
+		if(w != GetTabWidth(split)) {
+			SetTabWidth0(split, w);
+			Refresh();
+			if(track) {
+				Sync();
+				Action();
+				WhenLayout();
+			}
+		}
+	}
+}
+
+void HeaderCtrl::LeftDrag(Point p, dword keyflags)
+{
+	if(li < 0 || !moving) return;
+	int n = 0;
+	for(int i = 0; i < col.GetCount(); i++)
+		if(col[i].visible)
+			n++;
+	if(n < 2)
+		return;
+	push = false;
+	ti = li;
+	pushi = -1;
+	Refresh();
+	Rect r = GetTabRect(li).OffsetedHorz(-sb);
+	Size sz = r.GetSize();
+	ImageDraw iw(sz.cx, sz.cy);
+	bool first = true;
+	col[li].Paint(first, iw, 0, 0, sz.cx, sz.cy, false, false, false);
+	DrawFrame(iw, sz, SColorText());
+	dragtab = iw;
+	dragx = p.x;
+	dragd = r.left - p.x;
+	ImageBuffer ib(dragtab);
+	Unmultiply(ib);
+	RGBA *s = ~ib;
+	RGBA *e = s + ib.GetLength();
+	while(s < e) {
+		s->a >>= 1;
+		s++;
+	}
+	Premultiply(ib);
+	dragtab = ib;
+	isdrag = true;
+}
+
+void HeaderCtrl::MouseLeave()
+{
+	Refresh();
+}
+
+void HeaderCtrl::LeftUp(Point, dword) {
+	if(isdrag) {
+		if(li >= 0 && ti >= 0)
+			MoveTab(li, ti);
+		li = ti = -1;
+		Refresh();
+	}
+	else
+	if(pushi >= 0 && push)
+		col[pushi].WhenAction();
+	push = false;
+	ti = li = pushi = -1;
+	isdrag = false;
+	Refresh();
+	if(split >= 0 && !track) {
+		Action();
+		WhenLayout();
+	}
+}
+
+void HeaderCtrl::CancelMode() {
+	ti = li = split = pushi = -1;
+	isdrag = push = false;
+}
+
+void HeaderCtrl::ShowTab(int i, bool show) {
+	Column& cm = Tab(i);
+	if(cm.visible == show) return;
+	cm.visible = show;
+	if(mode == PROPORTIONAL)
+		InvalidateDistribution();
+	Refresh();
+	WhenLayout();
+}
+
+int HeaderCtrl::FindIndex(int ndx)
+{
+	if(ndx >= 0 && ndx < col.GetCount() && col[ndx].index == ndx) return ndx;
+	for(int i = 0; i < col.GetCount(); i++)
+		if(col[i].index == ndx)
+			return i;
+	return -1;
+}
+
+#ifdef COMPILER_MSC
+#pragma warning(push)
+#pragma warning(disable: 4700) // MSVC6 complaint about n having not been initialized
+#endif
+
+void HeaderCtrl::Serialize(Stream& s) {
+	int version = 0x02;
+	s / version;
+	if(version < 0x01) {
+		int n = col.GetCount();
+		s / n;
+		for(int i = 0; i < n; i++)
+			if(i < col.GetCount()) {
+				int n;
+				s / n;
+				col[i].ratio = n;
+			}
+			else {
+				int dummy = 0;
+				s / dummy;
+			}
+	}
+	else {
+		int n = col.GetCount();
+		s / n;
+		if(version < 0x02)
+		for(int i = 0; i < n; i++)
+			if(i < col.GetCount()) {
+				s % col[i].ratio;
+			}
+			else {
+				int dummy = 0;
+				s % dummy;
+			}
+		else {
+			int t = 0;
+			for(int i = 0; i < col.GetCount(); i++) {
+				int ndx = col[i].index;
+				double r = col[i].ratio;
+				s % ndx;
+				s % r;
+				int q = FindIndex(ndx);
+				if(q >= 0) {
+					col[q].ratio = r;
+					col.Swap(t++, q);
+				}
+			}
+		}
+	}
+	if(s.IsLoading()) {
+		Refresh();
+		WhenLayout();
+	}
+}
+
+#ifdef COMPILER_MSC
+#pragma warning(pop)
+#endif
+
+void HeaderCtrl::FrameAdd(Ctrl& parent)
+{
+	parent.Add(*this);
+	parent.Add(sb);
+}
+
+void HeaderCtrl::FrameRemove()
+{
+	Remove();
+	sb.Remove();
+}
+
+void HeaderCtrl::FrameLayout(Rect& r)
+{
+	LayoutFrameTop(r, this, invisible ? 0 : GetHeight());
+	LayoutFrameBottom(r, &sb, sb.IsShown() ? ScrollBarSize() : 0);
+}
+
+void HeaderCtrl::FrameAddSize(Size& sz)
+{
+	if(!invisible)
+		sz.cy += GetHeight();
+	if(sb.IsVisible())
+		sz.cy += ScrollBarSize();
+}
+
+HeaderCtrl& HeaderCtrl::Invisible(bool inv)
+{
+	invisible = inv;
+	if(InFrame() && GetParent())
+		RefreshParentLayout();
+	return *this;
+}
+
+void HeaderCtrl::Reset()
+{
+	col.Clear();
+	track = true;
+	mode = PROPORTIONAL;
+	oszcx = -1;
+	invisible = false;
+	height = 0;
+	style = &StyleDefault();
+	Refresh();
+	moving = false;
+}
+
+void HeaderCtrl::WScroll()
+{
+	WhenLayout();
+}
+
+void HeaderCtrl::Scroll()
+{
+	Refresh();
+	WhenScroll();
+}
+
+void HeaderCtrl::ScrollVisibility()
+{
+	WhenScrollVisibility();
+}
+
+HeaderCtrl::HeaderCtrl() {
+	Reset();
+	NoWantFocus();
+	sb.AutoHide();
+	sb.WhenScroll = THISBACK(Scroll);
+	WhenScroll = THISBACK(WScroll);
+	sb.WhenVisibility = THISBACK(ScrollVisibility);
+	BackPaintHint();
+}
+
+HeaderCtrl::~HeaderCtrl() {}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/CtrlLib/HeaderCtrl.h b/uppsrc/CtrlLib/HeaderCtrl.h
new file mode 100644
index 000000000..38e434486
--- /dev/null
+++ b/uppsrc/CtrlLib/HeaderCtrl.h
@@ -0,0 +1,163 @@
+class HeaderCtrl : public Ctrl, public CtrlFrame {
+public:
+	virtual void  CancelMode();
+	virtual void  Paint(Draw& draw);
+	virtual Image CursorImage(Point p, dword keyflags);
+	virtual void  LeftDown(Point p, dword keyflags);
+	virtual void  LeftDrag(Point p, dword keyflags);
+	virtual void  MouseMove(Point p, dword keyflags);
+	virtual void  MouseLeave();
+	virtual void  LeftUp(Point, dword);
+	virtual void  RightDown(Point, dword);
+	virtual void  Serialize(Stream& s);
+	virtual void  Layout();
+
+	virtual void  FrameAdd(Ctrl& parent);
+	virtual void  FrameRemove();
+	virtual void  FrameLayout(Rect& r);
+	virtual void  FrameAddSize(Size& sz);
+
+public:
+	struct Style : ChStyle<Style> {
+		Value look[4];
+		int   gridadjustment;
+		bool  pressoffset;
+	};
+
+	class Column : public LabelBase {
+	protected:
+		virtual void  LabelUpdate();
+
+		HeaderCtrl *header;
+		double      ratio;
+		bool        visible;
+		int         min, max;
+		int         margin;
+		Color       paper;
+		int         index;
+
+		void        Paint(bool& first, Draw& w,
+		                  int x, int y, int cx, int cy, bool disabled, bool push, bool hl);
+
+		friend class HeaderCtrl;
+
+	public:
+		Callback        WhenAction;
+		Callback1<Bar&> WhenBar;
+
+		Column&  Min(int _min)                     { min = _min; return *this; }
+		Column&  Max(int _max)                     { max = _max; return *this; }
+		Column&  MinMax(int m, int n)              { return Min(m).Max(n); }
+		Column&  Fixed(int f)                      { return MinMax(f, f); }
+		Column&  SetPaper(Color c)                 { paper = c; return *this; }
+		Column&  SetRatio(double ratio);
+		Column&  SetMargin(int m);
+
+		int      GetMargin() const                 { return margin + 2; }
+		Color    GetPaper() const                  { return paper; }
+		int      GetIndex() const                  { return index; }
+
+		Column();
+	};
+
+	friend class Column;
+
+protected:
+	enum { PROPORTIONAL, REDUCELAST, REDUCENEXT, SCROLL };
+
+	Array<Column> col;
+	HScrollBar    sb;
+
+	mutable int          oszcx;
+	mutable Vector<Rect> tabrect;
+
+	int   split, pushi, li, ti;
+	bool  isdrag;
+	Image dragtab;
+	int   dragd, dragx;
+	Rect  colRect;
+	bool  push:1;
+	bool  track:1;
+	bool  invisible:1;
+	bool  moving:1;
+	byte  mode;
+	int   light;
+	int   height;
+	const Style *style;
+
+	double Denominator() const;
+	void   Reduce(int q, double& delta, double rs, int szcx, bool checkmin);
+	int    GetNextTabWidth(int i);
+	int    GetLastVisibleTab();
+	void   WScroll();
+	void   Scroll();
+	void   ScrollVisibility();
+	void   SbTotal();
+	void   SetTabWidth0(int i, int cx);
+	int    SumMin(int from);
+	int    SumMax(int from);
+	void   Distribute(const Vector<int>& sci, double delta);
+	void   ReCompute();
+	void   InvalidateDistribution()                              { oszcx = -1; }
+	void   RefreshDistribution();
+	Vector<int> GetVisibleCi(int from);
+
+public:
+	Callback      WhenLayout;
+	Callback      WhenScroll;
+	Callback      WhenScrollVisibility;
+
+	Rect          GetTabRect(int i);
+
+	const Column& Tab(int i) const                        { return col[i]; }
+	Column&       Tab(int i);
+
+	Column&       Add(const char *text, double ratio = 0);
+	Column&       Add();
+	const Column& operator[](int i) const                 { return col[i]; }
+	int           GetCount() const                        { return col.GetCount(); }
+	void          Reset();
+
+	void          ShowTab(int i, bool show = true);
+	void          HideTab(int i)                          { ShowTab(i, false); }
+	bool          IsTabVisible(int i)                     { return col[i].visible; }
+	void          SetTabRatio(int i, double ratio);
+	double        GetTabRatio(int i) const                { return col[i].ratio; }
+	void          SetTabWidth(int i, int cx);
+	int           GetTabWidth(int i);
+	
+	void          SwapTabs(int first, int second);
+	void          MoveTab(int from, int to);
+	int           GetTabIndex(int i)                      { return col[i].index; }
+	int           FindIndex(int ndx);
+
+	void          StartSplitDrag(int s);
+	int           GetSplit(int x);
+
+	int           GetScroll() const                       { return sb; }
+	bool          IsScroll() const                        { return sb.IsShown(); }
+
+	void          SetHeight(int cy);
+	int           GetHeight() const;
+	
+	static const Style& StyleDefault();
+
+	HeaderCtrl&   Invisible(bool inv);
+	HeaderCtrl&   Track(bool _track = true)               { track = _track; sb.Track(track); return *this; }
+	HeaderCtrl&   NoTrack()                               { return Track(false); }
+	HeaderCtrl&   Proportional();
+	HeaderCtrl&   ReduceNext();
+	HeaderCtrl&   ReduceLast();
+	HeaderCtrl&   Absolute();
+	HeaderCtrl&   SetStyle(const Style& s)                { style = &s; Refresh(); return *this; }
+	HeaderCtrl&   Moving(bool b = true)                   { moving = b; return *this; }
+
+	HeaderCtrl&   SetScrollBarStyle(const ScrollBar::Style& s)   { sb.SetStyle(s); return *this; }
+
+	static int GetStdHeight()                             { return Draw::GetStdFontCy() + 4; }
+
+	typedef HeaderCtrl CLASSNAME;
+
+	HeaderCtrl();
+	virtual ~HeaderCtrl();
+};
diff --git a/uppsrc/CtrlLib/Help.cpp b/uppsrc/CtrlLib/Help.cpp
new file mode 100644
index 000000000..b897ca312
--- /dev/null
+++ b/uppsrc/CtrlLib/Help.cpp
@@ -0,0 +1,203 @@
+#include "CtrlLib.h"
+
+NAMESPACE_UPP
+
+Topic HelpWindow::AcquireTopic(const String& topic)
+{
+	return GetTopic(topic);
+}
+
+void HelpWindow::BarEx(Bar& bar)
+{}
+
+void HelpWindow::FinishText(RichText& text)
+{}
+
+bool HelpWindow::GoTo0(const String& link)
+{
+	if(IsNull(link))
+		return false;
+	Topic t = AcquireTopic(link);
+	SetBar();
+	if(!IsNull(t.text)) {
+		label = t.label;
+		topic = t.link;
+		Title(FromUtf8(t.title));
+		RichText txt = ParseQTF(t.text);
+		FinishText(txt);
+		view.Pick(txt, zoom);
+		view.GotoLabel(label, true);
+		tree.FindSetCursor(topic);
+		return true;
+	}
+	return false;
+}
+
+HelpWindow::Pos HelpWindow::GetPos()
+{
+	Pos p;
+	p.link = topic;
+	p.scy = view.GetSb();
+	return p;
+}
+
+void HelpWindow::GoTo(const String& link)
+{
+	Pos p = GetPos();
+	if(GoTo0(link)) {
+		if(!IsNull(p.link))
+			back.Add(p);
+		forward.Clear();
+		SetBar();
+		return;
+	}
+	LaunchWebBrowser(link);
+}
+
+void HelpWindow::Back()
+{
+	Pos p = GetPos();
+	if(back.GetCount() && GoTo0(back.Top().link)) {
+		if(back.GetCount()) {
+			view.SetSb(back.Top().scy);
+			back.Drop();
+		}
+		if(!IsNull(p.link))
+			forward.Add(p);
+		SetBar();
+	}
+}
+
+void HelpWindow::Forward()
+{
+	Pos p = GetPos();
+	if(forward.GetCount() && GoTo0(forward.Top().link)) {
+		if(forward.GetCount()) {
+			view.SetSb(forward.Top().scy);
+			forward.Drop();
+		}
+		if(!IsNull(p.link))
+			back.Add(p);
+		SetBar();
+	}
+}
+
+void HelpWindow::SetZoom()
+{
+	zoom.d = 1000;
+	GoTo0(topic);
+	Refresh();
+}
+
+void HelpWindow::FontSize()
+{
+	int q = zoom.m / 20;
+	if(q < 6 || q > 10)
+		q = 6;
+	else
+		q++;
+	zoom.m = 20 * q;
+	SetZoom();
+}
+
+void HelpWindow::Print()
+{
+#ifndef PLATFORM_PDA
+	Topic t = AcquireTopic(topic);
+	UPP::Print(ParseQTF(t.text), Size(3968, 6074), 0);
+#endif
+}
+
+void HelpWindow::Tools(Bar& bar)
+{
+	bar.Add(back.GetCount(), t_("Go Back"), CtrlImg::go_back(), THISBACK(Back))
+	   .Key(K_ALT_LEFT);
+	bar.Add(forward.GetCount(), t_("Go Forward"), CtrlImg::go_forward(), THISBACK(Forward))
+	   .Key(K_ALT_RIGHT);
+	bar.Gap();
+	bar.Add(t_("Font size"), CtrlImg::font_size(), THISBACK(FontSize));
+	bar.Gap();
+#ifndef PLATFORM_PDA
+	bar.Add(t_("Print"), CtrlImg::print(), THISBACK(Print));
+#endif
+	BarEx(bar);
+}
+
+void HelpWindow::SetBar()
+{
+	toolbar.Set(THISBACK(Tools));
+}
+
+bool HelpWindow::Key(dword key, int count)
+{
+	if(key == K_ESCAPE) {
+		Close();
+		return true;
+	}
+	return view.Key(key, count);
+}
+
+void HelpWindow::ClearTree()
+{
+	tree_view.Zoom(1);
+	tree.Clear();
+}
+
+int HelpWindow::AddTree(int parent, const Image& img, const String& topic, const String& title)
+{
+	tree_view.NoZoom();
+	return tree.Add(parent, img, topic, title, false);
+}
+
+void HelpWindow::SortTree(int id)
+{
+	tree.SortDeep(id);
+}
+
+void HelpWindow::FinishTree()
+{
+	tree.FindSetCursor(topic);
+}
+
+void HelpWindow::OpenDeep(int id)
+{
+	tree.OpenDeep(id);
+}
+
+void HelpWindow::Serialize(Stream& s)
+{
+	s % zoom.m;
+	s % tree_view;
+	SerializePlacement(s);
+	SetZoom();
+}
+
+void HelpWindow::TreeCursor()
+{
+	if(!IsNull(tree))
+		GoTo(~tree);
+}
+
+HelpWindow::HelpWindow()
+{
+	tree_view.Horz(tree, view);
+	tree_view.SetPos(3000);
+	Add(tree_view.SizePos());
+	tree_view.Zoom(1);
+	Sizeable().Zoomable();
+	Title(t_("Help"));
+	BackPaint();
+	view.WhenLink = THISBACK(GoTo);
+	AddFrame(toolbar);
+	view.SetZoom(Zoom(1, 1));
+	zoom.m = 160;
+	SetZoom();
+	view.Margins(2);
+	SetRect(Ctrl::GetWorkArea().Deflated(80));
+	tree <<= THISBACK(TreeCursor);
+	tree.NoRoot();
+	Icon(CtrlImg::help());
+	SetBar();
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/CtrlLib/LNGCtrl.cpp b/uppsrc/CtrlLib/LNGCtrl.cpp
new file mode 100644
index 000000000..9a10a5c5b
--- /dev/null
+++ b/uppsrc/CtrlLib/LNGCtrl.cpp
@@ -0,0 +1,84 @@
+#include "CtrlLib.h"
+
+
+NAMESPACE_UPP
+
+Size  LNGCtrl::GetMinSize() const
+{
+	int c = EditField::GetStdHeight();
+	int d = 9 * c / 4;
+	return Size(2 * d + 2, hi.GetMinSize().cy);
+}
+
+Value LNGCtrl::GetData() const
+{
+	return ~lo;
+}
+
+void  LNGCtrl::SetData(const Value& v)
+{
+	int l = v;
+	hi <<= l & LNG_(0xff, 0xff, 0, 0);
+	LoadLo();
+	lo <<= l;
+	Update();
+}
+
+void LNGCtrl::LoadLo() {
+	lo.Clear();
+	Index<int> h;
+	int hv = ~hi;
+	int set = 0;
+	if(hv == 0) {
+		lo.Add(0, "--");
+		lo <<= 0;
+		return;
+	}
+	lo.Add(hv, "");
+	for(const int *l = GetAllLanguages(); *l; l++)
+		if((*l & LNG_(0xff, 0xff, 0, 0)) == hv) {
+			h.FindAdd(*l);
+			if(!set)
+				set = *l;
+		}
+	Vector<int> q = h.PickKeys();
+	Sort(q);
+	for(int i = 0; i < q.GetCount(); i++)
+		lo.Add(q[i], LNGAsText(q[i]).Mid(3));
+	lo <<= set;
+}
+
+void LNGCtrl::Hi()
+{
+	LoadLo();
+	UpdateAction();
+}
+
+void LNGCtrl::Lo()
+{
+	UpdateAction();
+}
+
+LNGCtrl::LNGCtrl() {
+	int c = EditField::GetStdHeight();
+	int d = 9 * c / 4;
+	Add(hi.LeftPos(0, d).VSizePos());
+	Add(lo.LeftPos(d + 2, d).VSizePos());
+
+	Index<int> h;
+	for(const int *l = GetAllLanguages(); *l; l++)
+		h.FindAdd(*l & LNG_(0xff, 0xff, 0, 0));
+	Vector<int> q = h.PickKeys();
+	Sort(q);
+	hi.Add(0, "--");
+	for(int i = 0; i < q.GetCount(); i++)
+		hi.Add(q[i], LNGAsText(q[i]));
+	hi <<= THISBACK(Hi);
+	lo <<= THISBACK(Lo);
+}
+
+LNGCtrl::~LNGCtrl()
+{
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/CtrlLib/LabelBase.cpp b/uppsrc/CtrlLib/LabelBase.cpp
new file mode 100644
index 000000000..14b1ee935
--- /dev/null
+++ b/uppsrc/CtrlLib/LabelBase.cpp
@@ -0,0 +1,557 @@
+#include "CtrlLib.h"
+
+NAMESPACE_UPP
+
+void CtrlsImageLook(Value *look, int i, int n)
+{
+	while(n--)
+		*look++ = CtrlsImg::Get(i++);
+}
+
+void CtrlsImageLook(Value *look, int i, const Image& image, const Color *color, int n)
+{
+	for(int q = 0; q < n; q++)
+		*look++ = ChLookWith(CtrlsImg::Get(i++), image, *color++);
+}
+
+void CtrlsImageLook(Value *look, int i, const Image& image, int n)
+{
+	for(int q = 0; q < n; q++)
+		*look++ = ChLookWith(CtrlsImg::Get(i++), image);
+}
+
+CtrlsImgLook& CtrlsImgLook::operator()(int i, int n)
+{
+	while(n-- > 0)
+		Add(CtrlsImg::Get(i++));
+	return *this;
+}
+
+CtrlsImgLook& CtrlsImgLook::operator()(int i, const Image& img, Color (*fn)(int i), int n)
+{
+	for(int q = 0; q < n; q++)
+		Add(ChLookWith(CtrlsImg::Get(i++), img, fn, q));
+	return *this;
+}
+
+CtrlsImgLook& CtrlsImgLook::operator()(int i, const Image& img, int n)
+{
+	for(int q = 0; q < n; q++)
+		Add(ChLookWith(CtrlsImg::Get(i++), img));
+	return *this;
+}
+
+CtrlsImgLook::CtrlsImgLook(int i, int n)
+{
+	operator()(i, n);
+}
+
+CtrlsImgLook::CtrlsImgLook(int i, const Image& img, Color (*fn)(int i), int n)
+{
+	operator()(i, img, fn, n);
+}
+
+CtrlsImgLook::CtrlsImgLook(int i, const Image& img, int n)
+{
+	operator()(i, img, n);
+}
+
+String DeAmp(const char *s)
+{
+	String out;
+	for(; *s; out.Cat(*s++))
+		if(*s == '&')
+			out.Cat('&');
+	return out;
+}
+
+Size GetSmartTextSize(const char *text, Font font, int cx) {
+	if(*text == '\1') {
+		Size sz;
+		RichText txt = ParseQTF(text + 1);
+		txt.ApplyZoom(GetRichTextStdScreenZoom());
+		sz.cx = min(cx, txt.GetWidth());
+		sz.cy = txt.GetHeight(Zoom(1, 1), sz.cx);
+		return sz;
+	}
+	return GetTLTextSize(ToUnicode(text, CHARSET_DEFAULT), font);
+}
+
+int GetSmartTextHeight(const char *s, int cx, Font font) {
+	if(*s == '\1') {
+		Size sz;
+		RichText txt = ParseQTF(s + 1);
+		txt.ApplyZoom(GetRichTextStdScreenZoom());
+		return txt.GetHeight(Zoom(1, 1), cx);
+	}
+	int cy = font.Info().GetHeight();
+	int h = cy;
+	while(*s) {
+		if(*s == '\n')
+			h += cy;
+		s++;
+	}
+	return h;
+}
+
+void DrawSmartText(Draw& draw, int x, int y, int cx, const char *text, Font font, Color ink, int accesskey) {
+	if(*text == '\1') {
+		Size sz;
+		RichText txt = ParseQTF(text + 1, false, accesskey);
+		txt.ApplyZoom(GetRichTextStdScreenZoom());
+		txt.Paint(Zoom(1, 1), draw, x, y, cx);
+		return;
+	}
+	DrawTLText(draw, x, y, cx, ToUnicode(text, CHARSET_DEFAULT), font, ink, accesskey);
+}
+
+bool CompareAccessKey(byte accesskey, dword key)
+{
+	return accesskey && dword(ToUpper(accesskey) - 'A' + K_ALT_A) == key;
+}
+
+byte  ExtractAccessKey(const char *s, String& label)
+{
+	byte accesskey = 0;
+	String text;
+	bool qtf = *s == '\1';
+	while(*s)
+		if((*s == '&' && !qtf || *s == '\b') && s[1] && s[1] != '&') {
+			accesskey = ToAscii(ToUpper(s[1]));
+			s++;
+		}
+		else
+			text.Cat(*s++);
+	text.Shrink();
+	label = text;
+	return accesskey;
+}
+
+byte  ChooseAccessKey(const char *text, dword used)
+{
+	for(const char *s = text; *s; s++) {
+		byte ac = ToAscii(*s);
+		if(ac >= 'A' && ac <= 'Z' && (Ctrl::AccessKeyBit(ac) & used) == 0)
+			return ac;
+	}
+	for(const char *s = text; *s; s++) {
+		byte ac = ToUpper(ToAscii(*s));
+		if(ac >= 'A' && ac <= 'Z' && ac != 'I' && ac != 'L' && (Ctrl::AccessKeyBit(ac) & used) == 0)
+			return ac;
+	}
+	for(const char *s = text; *s; s++) {
+		byte ac = ToUpper(ToAscii(*s));
+		if(ac >= 'A' && ac <= 'Z' && (Ctrl::AccessKeyBit(ac) & used) == 0)
+			return ac;
+	}
+	return 0;
+}
+
+DrawLabel::DrawLabel()
+{
+	push = focus = disabled = false;
+	lspc = rspc = 0;
+	ink = Null;
+	align = valign = ALIGN_CENTER;
+	accesskey = 0;
+}
+
+Size DrawLabel::GetSize(int txtcx) const
+{
+	return GetSize(txtcx, limg.GetSize(), lspc, rimg.GetSize(), rspc);
+}
+
+Size DrawLabel::GetSize(int txtcx, Size sz1, int lspc, Size sz2, int rspc) const
+{
+	Size isz(0, 0);
+	Size txtsz = *text ? GetSmartTextSize(text, font, txtcx) : paintrect.GetStdSize();
+
+	if(!IsNull(lspc)) {
+		isz.cx = lspc;
+		isz.cy = sz1.cy;
+		isz.cx += sz1.cx;
+	}
+
+	if(!IsNull(rspc)) {
+		isz.cx += rspc;
+		if(sz2.cy > isz.cy) isz.cy = sz2.cy;
+		isz.cx += sz2.cx;
+	}
+
+	isz.cy = max(txtsz.cy, max(sz1.cy, sz2.cy));
+	isz.cx += txtsz.cx;
+
+	return isz;
+}
+
+Image DisImage(const Image& m)
+{
+	Image mm = Grayscale(m, 200);
+	ImageBuffer ib(mm);
+	RGBA *s = ~ib;
+	RGBA *e = s + ib.GetLength();
+	while(s < e)
+		(s++)->a /= 3;
+	Premultiply(ib);
+	return ib;
+}
+
+Image DisabledImage(const Image& img, bool dis)
+{
+	return dis ? MakeImage(img, GUI_GlobalStyle() == GUISTYLE_CLASSIC ? Etched : DisImage)
+	           : img;
+}
+
+Size DrawLabel::Paint(Draw& w, const Rect& r, bool visibleaccesskey) const
+{
+	int lspc = this->lspc;
+	int rspc = this->rspc;
+	Size sz1 = limg.GetSize();
+	Size sz2 = rimg.GetSize();
+	int txtcx = r.GetWidth() - sz1.cx - Nvl(lspc, 0) - sz2.cx - Nvl(rspc, 0);
+	Size txtsz = *text ? GetSmartTextSize(text, font, txtcx) : paintrect.GetStdSize();
+	if(txtsz.cx) {
+		if(txtsz.cx + sz1.cx + sz2.cx + Nvl(lspc, 0) + Nvl(rspc, 0) > r.GetWidth()) {
+			sz2.cx = 0;
+			rspc = 0;
+		}
+		if(txtsz.cx + sz1.cx + sz2.cx + Nvl(lspc, 0) + Nvl(rspc, 0) > r.GetWidth()) {
+			sz1.cx = 0;
+			lspc = 0;
+		}
+	}
+	Size isz = GetSize(txtcx, sz1, lspc, sz2, rspc);
+	Point p, ip;
+	if(align == ALIGN_LEFT)
+		p.x = r.left;
+	else
+	if(align == ALIGN_RIGHT)
+		p.x = r.right - isz.cx;
+	else
+	if(align == ALIGN_CENTER)
+		p.x = (r.right + r.left - isz.cx) / 2;
+	if(valign == ALIGN_TOP)
+		p.y = r.top;
+	else
+	if(valign == ALIGN_BOTTOM)
+		p.y = r.bottom - isz.cy;
+	else
+	if(valign == ALIGN_CENTER)
+		p.y = (r.bottom + r.top - txtsz.cy) / 2;
+	Color color = ink;
+	if(IsNull(color))
+		color = disabled ? SColorDisabled : SColorText;
+	int ix;
+	if(IsNull(lspc))
+		ix = r.left + push;
+	else {
+		ix = p.x + push;
+		p.x += sz1.cx;
+		p.x += lspc;
+	}
+	int iy = push + (r.top + r.bottom - sz1.cy) / 2;
+
+	if(sz1.cx)
+		if(IsNull(lcolor))
+			w.DrawImage(ix, iy, DisabledImage(limg, disabled));
+		else
+			w.DrawImage(ix, iy, limg, lcolor);
+
+	iy = push + (r.top + r.bottom - sz2.cy) / 2;
+	ix = (IsNull(rspc) ? r.right - sz2.cx : p.x + txtsz.cx + rspc) + push;
+	if(sz2.cx)
+		if(IsNull(rcolor))
+			w.DrawImage(ix, iy, DisabledImage(rimg, disabled));
+		else
+			w.DrawImage(ix, iy, rimg, rcolor);
+	paintrect.Paint(w, p.x + push, p.y + push, txtsz.cx, isz.cy, color, Null);
+	if(*text) {
+		if(disabled)
+			DrawSmartText(w, p.x + push + 1, p.y + push + (isz.cy - txtsz.cy) / 2 + 1,
+			              txtsz.cx, text, font, SColorPaper);
+		DrawSmartText(w, p.x + push, p.y + push, txtcx,
+		              text, font, color, visibleaccesskey ? accesskey : 0);
+		if(focus)
+			DrawFocus(w, p.x - 2, p.y, txtsz.cx + 5, isz.cy);
+	}
+
+	return isz;
+}
+
+Size DrawLabel::Paint(Draw& w, int x, int y, int cx, int cy, bool vak) const
+{
+	return Paint(w, RectC(x, y, cx, cy), vak);
+}
+
+void LabelBase::LabelUpdate() {}
+
+LabelBase& LabelBase::SetLeftImage(const Image& img, int spc) {
+	lbl.limg = img;
+	lbl.lspc = spc;
+	LabelUpdate();
+	return *this;
+}
+
+LabelBase& LabelBase::SetRightImage(const Image& img, int spc) {
+	lbl.rimg = img;
+	lbl.rspc = spc;
+	LabelUpdate();
+	return *this;
+}
+
+LabelBase& LabelBase::SetPaintRect(const PaintRect& paintrect) {
+	lbl.paintrect = paintrect;
+	LabelUpdate();
+	return *this;
+}
+
+
+LabelBase& LabelBase::SetText(const char *text) {
+	lbl.text = text;
+	LabelUpdate();
+	return *this;
+}
+
+LabelBase& LabelBase::SetFont(Font font) {
+	if(lbl.font != font) {
+		lbl.font = font;
+		LabelUpdate();
+	}
+	return *this;
+}
+
+LabelBase& LabelBase::SetInk(Color ink) {
+	if(lbl.ink != ink) {
+		lbl.ink = ink;
+		LabelUpdate();
+	}
+	return *this;
+}
+
+LabelBase& LabelBase::SetAlign(int align) {
+	if(lbl.align != align) {
+		lbl.align = align;
+		LabelUpdate();
+	}
+	return *this;
+}
+
+LabelBase& LabelBase::SetVAlign(int valign) {
+	if(lbl.valign != valign) {
+		lbl.valign = valign;
+		LabelUpdate();
+	}
+	return *this;
+}
+
+Size LabelBase::PaintLabel(Draw& w, const Rect& r, bool disabled, bool push, bool focus, bool vak)
+{
+	DrawLabel lbl1 = lbl;
+	lbl1.disabled = disabled;
+	lbl1.push = push;
+	lbl1.focus = focus;
+	return lbl1.Paint(w, r, vak);
+}
+
+
+Size LabelBase::PaintLabel(Draw& w, int x, int y, int cx, int cy, bool disabled, bool push, bool focus, bool vak)
+{
+	return PaintLabel(w, RectC(x, y, cx, cy), disabled, push, focus, vak);
+}
+
+Size LabelBase::GetLabelSize() const
+{
+	return lbl.GetSize();
+}
+
+void LinkToolTipIn__();
+
+LabelBase::~LabelBase() {
+	LinkToolTipIn__();
+}
+
+void DrawFocus(Draw& w, int x, int y, int cx, int cy, Color c) {
+	w.Clipoff(x, y, cx, cy);
+	for(int a = 0; a < cx; a += CtrlImg::focus_h().GetWidth()) {
+		w.DrawImage(a, 0, CtrlImg::focus_h(), c);
+		w.DrawImage(a, cy - 1, CtrlImg::focus_h(), c);
+	}
+	for(int a = 0; a < cy; a += CtrlImg::focus_v().GetHeight()) {
+		w.DrawImage(0, a, CtrlImg::focus_v(), c);
+		w.DrawImage(cx - 1, a, CtrlImg::focus_v(), c);
+	}
+	w.End();
+}
+
+void DrawFocus(Draw& w, const Rect& r, Color c) {
+	DrawFocus(w, r.left, r.top, r.Width(), r.Height(), c);
+}
+
+void DrawHorzDrop(Draw& w, int x, int y, int cx)
+{
+	w.DrawRect(x, y, cx, 2, SColorHighlight);
+	w.DrawRect(x, y - 2, 1, 6, SColorHighlight);
+	w.DrawRect(x + cx - 1, y - 2, 1, 6, SColorHighlight);
+	w.DrawRect(x + 1, y - 1, 1, 4, SColorHighlight);
+	w.DrawRect(x + cx - 2, y - 1, 1, 4, SColorHighlight);
+}
+
+void DrawVertDrop(Draw& w, int x, int y, int cy)
+{
+	w.DrawRect(x, y, 2, cy, SColorHighlight);
+	w.DrawRect(x - 2, y, 6, 1, SColorHighlight);
+	w.DrawRect(x - 2, y + cy - 1, 6, 1, SColorHighlight);
+	w.DrawRect(x - 1, y + 1, 4, 1, SColorHighlight);
+	w.DrawRect(x - 1, y + cy - 2, 4, 1, SColorHighlight);
+}
+
+Point GetDragScroll(Ctrl *ctrl, Point p, Size max)
+{
+	if(ctrl->IsReadOnly())
+		return Point(0, 0);
+	Size sz = ctrl->GetSize();
+	Size sd = min(sz / 6, Size(16, 16));
+	Point d(0, 0);
+	if(p.x < sd.cx)
+		d.x = p.x - sd.cx;
+	if(p.x > sz.cx - sd.cx)
+		d.x = p.x - sz.cx + sd.cx;
+	if(p.y < sd.cy)
+		d.y = p.y - sd.cy;
+	if(p.y > sz.cy - sd.cy)
+		d.y = p.y - sz.cy + sd.cy;
+	d.x = minmax(d.x, -max.cx, max.cx);
+	d.y = minmax(d.y, -max.cy, max.cy);
+	return d;
+}
+
+Point GetDragScroll(Ctrl *ctrl, Point p, int max)
+{
+	return GetDragScroll(ctrl, p, Size(max, max));
+}
+
+Point DisplayPopup::Op(Point p)
+{
+	return p + GetScreenView().TopLeft() - ctrl->GetScreenView().TopLeft();
+}
+
+void DisplayPopup::LeftDown(Point p, dword flags)
+{
+	ctrl->LeftDown(Op(p), flags);
+}
+
+void DisplayPopup::LeftDrag(Point p, dword flags)
+{
+	Cancel();
+	ctrl->LeftDrag(Op(p), flags);
+}
+
+void DisplayPopup::LeftDouble(Point p, dword flags)
+{
+	ctrl->LeftDouble(Op(p), flags);
+}
+
+void DisplayPopup::RightDown(Point p, dword flags)
+{
+	ctrl->RightDown(Op(p), flags);
+}
+
+void DisplayPopup::LeftUp(Point p, dword flags)
+{
+	ctrl->LeftUp(Op(p), flags);
+}
+
+void DisplayPopup::MouseWheel(Point p, int zdelta, dword flags)
+{
+	ctrl->MouseWheel(Op(p), zdelta, flags);
+}
+
+void DisplayPopup::MouseLeave()
+{
+	Cancel();
+}
+
+void DisplayPopup::MouseMove(Point p, dword flags)
+{
+	p += GetScreenView().TopLeft();
+	if(!slim.Contains(p))
+		MouseLeave();
+}
+
+void DisplayPopup::Paint(Draw& w)
+{
+	Rect r = GetSize();
+	w.DrawRect(r, SColorPaper);
+	display->PaintBackground(w, r, value, ink, paper, style);
+	r.left += margin;
+	display->Paint(w, r, value, ink, paper, style);
+}
+
+DisplayPopup::DisplayPopup()
+{
+	SetFrame(BlackFrame());
+	display = NULL;
+	paper = ink = Null;
+	style = 0;
+	item = slim = Null;
+	margin = 0;
+}
+
+void DisplayPopup::Sync()
+{
+	Refresh();
+	if(display && ctrl && !ctrl->IsDragAndDropTarget() && !IsDragAndDropTarget()) {
+		Size sz = display->GetStdSize(value);
+		if(sz.cx + 2 * margin > item.GetWidth() || sz.cy > item.GetHeight()) {
+			Rect wa = GetWorkArea();
+			slim = item + ctrl->GetScreenView().TopLeft();
+			Rect r = item;
+			r.right = max(r.right, r.left + sz.cx + 2 * margin);
+			r.bottom = max(r.bottom, r.top + sz.cy);
+			r.Inflate(1, 1);
+			r.Offset(ctrl->GetScreenView().TopLeft());
+			SetRect(r);
+			if(!IsOpen())
+				Ctrl::PopUp(ctrl, true, false, false);
+			return;
+		}
+	}
+	if(IsOpen())
+		Close();
+}
+
+void DisplayPopup::Cancel()
+{
+	display = NULL;
+	Sync();
+}
+
+bool DisplayPopup::IsOpen()
+{
+	return Ctrl::IsOpen();
+}
+
+bool DisplayPopup::HasMouse()
+{
+	return Ctrl::HasMouse() || ctrl && ctrl->HasMouse();
+}
+
+void DisplayPopup::Set(Ctrl *_ctrl, const Rect& _item,
+                       const Value& _value, const Display *_display,
+                       Color _ink, Color _paper, dword _style, int _margin)
+{
+	if(item != _item || ctrl != _ctrl || value != _value || display != _display || ink != _ink ||
+	   paper != _paper || style != _style) {
+		item = _item;
+		ctrl = _ctrl;
+		value = _value;
+		display = _display;
+		ink = _ink;
+		paper = _paper;
+		style = _style;
+		margin = _margin;
+		Sync();
+	}
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/CtrlLib/LabelBase.h b/uppsrc/CtrlLib/LabelBase.h
new file mode 100644
index 000000000..1c73ca0f3
--- /dev/null
+++ b/uppsrc/CtrlLib/LabelBase.h
@@ -0,0 +1,135 @@
+enum {
+	CTRL_NORMAL, CTRL_HOT, CTRL_PRESSED, CTRL_DISABLED,
+	CTRL_CHECKED, CTRL_HOTCHECKED
+};
+
+struct CtrlsImgLook : Vector<Value> { // deprecated - remove after refactoring chameleon
+	CtrlsImgLook& operator()(int i, int n = 4);
+	CtrlsImgLook& operator()(int i, const Image& img, Color (*fn)(int i), int n = 4);
+	CtrlsImgLook& operator()(int i, const Image& img, int n = 4);
+	CtrlsImgLook(int i, int n = 4);
+	CtrlsImgLook(int i, const Image& img, Color (*fn)(int i), int n = 4);
+	CtrlsImgLook(int i, const Image& img, int n = 4);
+};
+
+void CtrlsImageLook(Value *look, int i, int n = 4);
+void CtrlsImageLook(Value *look, int i, const Image& image, const Color *color, int n = 4);
+void CtrlsImageLook(Value *look, int i, const Image& image, int n = 4);
+
+String DeAmp(const char *s);
+
+Size GetSmartTextSize(const char *text, Font font = StdFont(), int cx = INT_MAX);
+int  GetSmartTextHeight(const char *s, int cx, Font font = StdFont());
+void DrawSmartText(Draw& w, int x, int y, int cx, const char *text,
+                   Font font = StdFont(), Color ink = DefaultInk, int accesskey = 0);
+
+byte  ExtractAccessKey(const char *s, String& label);
+bool  CompareAccessKey(byte accesskey, dword key);
+byte  ChooseAccessKey(const char *s, dword used);
+
+void DrawFocus(Draw& w, int x, int y, int cx, int cy, Color c = SColorText());
+void DrawFocus(Draw& w, const Rect& r, Color c = SColorText());
+
+void DrawHorzDrop(Draw& w, int x, int y, int cx);
+void DrawVertDrop(Draw& w, int x, int y, int cy);
+
+Point GetDragScroll(Ctrl *ctrl, Point p, Size max);
+Point GetDragScroll(Ctrl *ctrl, Point p, int max = 16);
+
+struct DrawLabel {
+	bool      push;
+	bool      focus;
+	bool      disabled;
+
+	PaintRect paintrect;
+	Image     limg;
+	Color     lcolor;
+	int       lspc;
+	String    text;
+	Font      font;
+	Color     ink;
+	Image     rimg;
+	Color     rcolor;
+	int       rspc;
+
+	int       align, valign;
+
+	int       accesskey;
+
+	Size      GetSize(int txtcx, Size sz1, int lspc, Size sz2, int rspc) const;
+	Size      GetSize(int txtcx = INT_MAX) const;
+	Size      Paint(Draw& w, const Rect& r, bool visibleaccesskey = true) const;
+	Size      Paint(Draw& w, int x, int y, int cx, int cy, bool visibleaccesskey = true) const;
+
+	DrawLabel();
+};
+
+Image DisabledImage(const Image& img, bool disabled = true);
+
+class LabelBase {
+protected:
+	virtual void  LabelUpdate();
+
+	DrawLabel   lbl;
+
+public:
+	LabelBase&  SetLeftImage(const Image& bmp1, int spc = 0);
+	LabelBase&  SetPaintRect(const PaintRect& pr);
+	LabelBase&  SetText(const char *text);
+	LabelBase&  SetFont(Font font);
+	LabelBase&  SetInk(Color color);
+	LabelBase&  SetRightImage(const Image& bmp2, int spc = 0);
+	LabelBase&  SetAlign(int align);
+	LabelBase&  SetVAlign(int align);
+	LabelBase&  SetImage(const Image& bmp, int spc = 0)      { SetLeftImage(bmp, spc); return *this; }
+
+	int         GetAlign() const                             { return lbl.align; }
+	int         GetVAlign() const                            { return lbl.valign; }
+	PaintRect   GetPaintRect() const                         { return lbl.paintrect; }
+	String      GetText() const                              { return lbl.text; }
+	Font        GetFont() const                              { return lbl.font; }
+	Color       GetInk() const                               { return lbl.ink; }
+
+	Size        PaintLabel(Draw& w, const Rect& r,
+	                       bool disabled = false, bool push = false, bool focus = false, bool vak = true);
+	Size        PaintLabel(Draw& w, int x, int y, int cx, int cy,
+	                       bool disabled = false, bool push = false, bool focus = false, bool vak = true);
+	Size        GetLabelSize() const;
+
+	virtual ~LabelBase();
+};
+
+class DisplayPopup : Ctrl {
+	virtual void  Paint(Draw& w);
+	virtual void  LeftDown(Point p, dword);
+	virtual void  LeftDrag(Point p, dword);
+	virtual void  LeftDouble(Point p, dword);
+	virtual void  RightDown(Point p, dword);
+	virtual void  LeftUp(Point p, dword);
+	virtual void  MouseWheel(Point p, int zdelta, dword keyflags);
+	virtual void  MouseLeave();
+	virtual void  MouseMove(Point p, dword);
+
+private:
+	Ptr<Ctrl>      ctrl;
+	Rect           item;
+	Rect           slim;
+
+	Value          value;
+	Color          paper, ink;
+	dword          style;
+	const Display *display;
+	int            margin;
+
+	Point   Op(Point p);
+	void    Sync();
+
+public:
+	void Set(Ctrl *ctrl, const Rect& item, const Value& v, const Display *display,
+	         Color ink, Color paper, dword style, int margin = 0);
+	void Cancel();
+	bool IsOpen();
+	bool HasMouse();
+
+	DisplayPopup();
+};
diff --git a/uppsrc/CtrlLib/Lang.h b/uppsrc/CtrlLib/Lang.h
new file mode 100644
index 000000000..499aa5ecc
--- /dev/null
+++ b/uppsrc/CtrlLib/Lang.h
@@ -0,0 +1,30 @@
+#ifndef _CtrlLib_Lang_h_
+#define _CtrlLib_Lang_h_
+
+class LNGCtrl : public StaticRect
+{
+public:
+	virtual Value GetData() const;
+	virtual void  SetData(const Value& v);
+
+	virtual Size  GetMinSize() const;
+
+private:
+	DropList hi;
+	DropList lo;
+
+	void LoadLo();
+	void Hi();
+	void Lo();
+
+public:
+	typedef LNGCtrl CLASSNAME;
+
+	LNGCtrl& DropFocus(bool b = true)    { hi.DropFocus(b); lo.DropFocus(b); return *this; }
+	LNGCtrl& NoWantFocus()               { hi.NoWantFocus(); lo.NoWantFocus(); return *this; }
+
+	LNGCtrl();
+	virtual ~LNGCtrl();
+};
+
+#endif
diff --git a/uppsrc/CtrlLib/LineEdit.cpp b/uppsrc/CtrlLib/LineEdit.cpp
new file mode 100644
index 000000000..15d126631
--- /dev/null
+++ b/uppsrc/CtrlLib/LineEdit.cpp
@@ -0,0 +1,833 @@
+#include "CtrlLib.h"
+
+NAMESPACE_UPP
+
+#define LLOG(x) //  LOG(x)
+
+LineEdit::LineEdit() {
+	isdrag = false;
+	nohbar = false;
+	showtabs = false;
+	tabsize = 4;
+	font = Courier(16);
+	SetFrame(ViewFrame());
+	sb.NoBox();
+	AddFrame(sb);
+	sb.WhenScroll = THISBACK(Scroll);
+	cutline = true;
+	bordercolumn = -1;
+	bordercolor = Null;
+	overwrite = false;
+	filter = NULL;
+}
+
+LineEdit::~LineEdit() {}
+
+void LineEdit::MouseWheel(Point, int zdelta, dword) {
+	sb.WheelY(zdelta);
+}
+
+void   LineEdit::Clear() {
+	gcolumn = 0;
+	TextCtrl::Clear();
+	sb.SetTotal(0, 0);
+	sb.Set(0, 0);
+	NewScrollPos();
+	PlaceCaret(0, false);
+}
+
+LineEdit& LineEdit::TabSize(int n) {
+	tabsize = n;
+	PlaceCaret0(GetColumnLine(cursor));
+	Refresh();
+	return *this;
+}
+
+LineEdit& LineEdit::BorderColumn(int col, Color c)
+{
+	bordercolumn = col;
+	bordercolor = c;
+	Refresh();
+	return *this;
+}
+
+LineEdit& LineEdit::SetFont(Font f) {
+	font = f;
+	Layout();
+	TabSize(tabsize);
+	SetSb();
+	return *this;
+}
+
+Size LineEdit::GetFontSize() const {
+	FontInfo fi = font.Info();
+	return Size(fi.GetAveWidth(), fi.GetHeight());
+}
+
+void   LineEdit::Paint0(Draw& w) {
+	int sell, selh;
+	GetSelection(sell, selh);
+	if(!IsEnabled())
+		sell = selh = 0;
+	Size sz = GetSize();
+	Size fsz = GetFontSize();
+	Point sc = sb;
+	int ll = min(line.GetCount(), sz.cy / fsz.cy + sc.y + 1);
+	int  y = 0;
+	cpos = GetPos(sc.y);
+	cline = sc.y;
+	sell -= cpos;
+	selh -= cpos;
+	int pos = cpos;
+	Vector<int> dx, dx2;
+	int fascent = font.Info().GetAscent();
+	for(int i = sc.y; i < ll; i++) {
+		WString tx = line[i];
+		int len = tx.GetLength();
+		if(w.IsPainting(0, y, sz.cx, fsz.cy)) {
+			Highlight ih;
+			ih.ink = color[IsShowEnabled() ? INK_NORMAL : INK_DISABLED];
+			ih.paper = color[IsReadOnly() || !IsShowEnabled() ? PAPER_READONLY : PAPER_NORMAL];
+			if(nobg)
+				ih.paper = Null;
+			ih.font = font;
+			ih.chr = 0;
+			Vector<Highlight> hl;
+			hl.SetCount(len + 1, ih);
+			for(int q = 0; q < tx.GetCount(); q++)
+				hl[q].chr = tx[q];
+			HighlightLine(i, hl, pos);
+			int ln = hl.GetCount() - 1;
+			int l = max(sell, 0);
+			int h = selh > len ? len : selh;
+			if(l < h)
+				for(int i = l; i < h; i++) {
+					hl[i].paper = color[PAPER_SELECTED];
+					hl[i].ink = color[INK_SELECTED];
+				}
+			if(sell <= len && selh > len)
+				for(int i = len; i < hl.GetCount(); i++) {
+					hl[i].paper = color[PAPER_SELECTED];
+					hl[i].ink = color[INK_SELECTED];
+				}
+			int gp = 0;
+			int scx = fsz.cx * sc.x;
+			if(ln >= 0) {
+				Buffer<wchar> txt(ln);
+				for(int i = 0; i < ln; i++)
+					txt[i] = hl[i].chr;
+				int q = 0;
+				while(q < ln) {
+					Highlight& h = hl[q];
+					if(txt[q] == '\t') {
+						int ngp = (gp + tabsize) / tabsize * tabsize;
+						int l = ngp - gp;
+						LLOG("Highlight -> tab[" << q << "] paper = " << h.paper);
+						w.DrawRect(gp * fsz.cx - scx, y, fsz.cx * l, fsz.cy, h.paper);
+						if(showtabs && h.paper != SColorHighlight) {
+							Color c = Blend(SColorLight, SColorHighlight);
+							w.DrawRect(gp * fsz.cx - scx + 2, y + fsz.cy / 2,
+							           l * fsz.cx - 4, 1, c);
+							w.DrawRect(ngp * fsz.cx - scx - 3, y + 3,
+							           1, fsz.cy - 6, c);
+						}
+						if(bordercolumn > 0 && bordercolumn >= gp && bordercolumn < gp + l)
+							w.DrawRect((bordercolumn - sc.x) * fsz.cx, y, 1, fsz.cy, bordercolor);
+						q++;
+						gp = ngp;
+					}
+					else {
+						bool cjk = IsCJKIdeograph(txt[q]);
+						int p = q + 1;
+						while(p < len && h == hl[p] && txt[p] != '\t' && IsCJKIdeograph(txt[p]) == cjk)
+							p++;
+						int l = p - q;
+						int ll = cjk ? 2 * l : l;
+						LLOG("Highlight -> paper[" << q << "] = " << h.paper);
+						w.DrawRect(gp * fsz.cx - scx, y, fsz.cx * ll, fsz.cy, h.paper);
+						if(bordercolumn > 0 && bordercolumn >= gp && bordercolumn < gp + ll)
+							w.DrawRect((bordercolumn - sc.x) * fsz.cx, y, 1, fsz.cy, bordercolor);
+						if(cjk)
+							dx2.At(l, 2 * fsz.cx);
+						else
+							dx.At(l, fsz.cx);
+						w.DrawText(gp * fsz.cx - scx,
+						           y + fascent - h.font.Info().GetAscent(),
+						           ~txt + q, h.font, h.ink, l, cjk ? dx2 : dx);
+						q = p;
+						gp += ll;
+					}
+				}
+			}
+			int gpx = gp * fsz.cx - scx;
+			w.DrawRect(gpx, y, sz.cx - gpx, fsz.cy, hl.Top().paper);
+			if(bordercolumn > 0 && bordercolumn >= gp)
+				w.DrawRect((bordercolumn - sc.x) * fsz.cx, y, 1, fsz.cy, bordercolor);
+		}
+		y += fsz.cy;
+		sell -= len + 1;
+		selh -= len + 1;
+		pos += len + 1;
+	}
+	w.DrawRect(0, y, sz.cx, sz.cy - y, color[IsReadOnly() || !IsShowEnabled() ? PAPER_READONLY : PAPER_NORMAL]);
+	DrawTiles(w, DropCaret(), CtrlImg::checkers());
+}
+
+void LineEdit::Paint(Draw& w)
+{
+	Paint0(w);
+	scroller.Set(sb);
+}
+
+struct LineEdit::RefreshDraw : public NilDraw {
+	Ctrl  *ctrl;
+	bool (*chars)(int c);
+	Size   fsz;
+	virtual void DrawTextOp(int x, int y, int angle, const wchar *text, Font,
+	                        Color, int n, const int *dx) {
+		if(dx)
+			while(n > 0) {
+				if((*chars)(*text))
+					ctrl->Refresh(x, y, fsz.cx, fsz.cy);
+				text++;
+				x += *dx++;
+				n--;
+			}
+	}
+	bool IsPaintingOp(const Rect& r) const {
+		return true;
+	}
+};
+
+void LineEdit::RefreshChars(bool (*chars)(int c))
+{
+	RefreshDraw rw;
+	rw.ctrl = this;
+	rw.fsz = GetFontSize();
+	rw.chars = chars;
+	Paint(rw);
+}
+
+void   LineEdit::Layout() {
+	Size sz = sb.GetReducedViewSize();
+	if(nohbar || isdrag)
+		sz.cy = GetSize().cy;
+	sb.SetPage(sz / GetFontSize());
+	SetHBar();
+}
+
+int   LineEdit::GetGPos(int ln, int cl) const {
+	ln = minmax(ln, 0, line.GetCount() - 1);
+	WString txt = line[ln];
+	const wchar *b = txt;
+	const wchar *e = txt.End();
+	const wchar *s = b;
+	int gl = 0;
+	while(s < e) {
+		if(*s == '\t')
+			gl = (gl + tabsize) / tabsize * tabsize;
+		else
+			gl += 1 + IsCJKIdeograph(*s);
+		if(cl < gl) break;
+		s++;
+	}
+	return GetPos(ln, int(s - b));
+}
+
+Point LineEdit::GetColumnLine(int pos) const {
+	Point p;
+	if(pos > total) pos = total;
+	p.y = GetLinePos(pos);
+	p.x = 0;
+	WString txt = line[p.y];
+	const wchar *s = txt;
+	while(pos--) {
+		if(*s == '\t')
+			p.x = (p.x + tabsize) / tabsize * tabsize;
+		else
+			p.x += 1 + IsCJKIdeograph(*s);
+		s++;
+	}
+	return p;
+}
+
+Point LineEdit::GetIndexLine(int pos) const
+{
+	Point p;
+	if(pos > total) pos = total;
+	p.y = GetLinePos(pos);
+	p.x = minmax(pos, 0, line[p.y].GetLength());
+	return p;
+}
+
+int LineEdit::GetIndexLinePos(Point pos) const
+{
+	if(pos.y < 0)
+		return 0;
+	if(pos.y >= GetLineCount())
+		return total;
+	return GetPos(pos.y, minmax(pos.x, 0, line[pos.y].GetLength()));
+}
+
+void LineEdit::RefreshLine(int i) {
+	Size sz = GetSize();
+	int fcy = GetFontSize().cy;
+	Refresh(0, (i - sb.Get().y) * fcy, sz.cx, fcy);
+}
+
+Rect LineEdit::GetLineScreenRect(int line) const {
+	int fcy = GetFontSize().cy;
+	Rect r = RectC(0, (line - sb.Get().y) * fcy, GetSize().cx, fcy);
+	r.Offset(GetScreenView().TopLeft());
+	return r;
+}
+
+void LineEdit::SetSb() {
+	sb.SetTotalY(line.GetCount());
+	SetHBar();
+}
+
+void LineEdit::NewScrollPos() {}
+void LineEdit::HighlightLine(int line, Vector<Highlight>& h, int pos) {}
+
+void LineEdit::AlignChar() {
+	int c = GetCursor();
+	if(c == 0)
+		return;
+	Point pos = GetColumnLine(c);
+	if(pos.x == 0)
+		return;
+	for(int d = 1; d <= pos.y && d < 100; d++) {
+		int lny = pos.y - d;
+		WString above = GetWLine(lny);
+		int offset = GetGPos(lny, pos.x) - GetPos(lny);
+		int end = offset;
+		char ch = GetChar(c - 1);
+		if(ch == ' ')
+		{
+			offset++;
+			while(end < above.GetLength() && above[end] != ' ')
+				end++;
+			while(end < above.GetLength() && above[end] == ' ')
+				end++;
+		}
+		else
+			while(end < above.GetLength() && above[end] != ch)
+				end++;
+		if(end < above.GetLength()) {
+			int count = end - offset + 1;
+			WString s(' ', count);
+			Insert(c - 1, s, true);
+			SetCursor(c + count);
+			return;
+		}
+	}
+}
+
+void LineEdit::PlaceCaret0(Point p) {
+	Size fsz = GetFontSize();
+	p -= sb;
+	caretpos = Point(p.x * fsz.cx, p.y * fsz.cy);
+	if(overwrite)
+		SetCaret(caretpos.x, caretpos.y + fsz.cy - 2, fsz.cx, 2);
+	else
+		SetCaret(caretpos.x, caretpos.y, 2, fsz.cy);
+}
+
+int LineEdit::PlaceCaretNoG(int newcursor, bool sel) {
+	if(newcursor > total) newcursor = total;
+	Point p = GetColumnLine(newcursor);
+	if(sel) {
+		if(anchor < 0) {
+			anchor = cursor;
+		}
+		RefreshLines(p.y, GetLine(cursor));
+	}
+	else
+		if(anchor >= 0) {
+			RefreshLines(GetLine(cursor), GetLine(anchor));
+			anchor = -1;
+		}
+	cursor = newcursor;
+	ScrollIntoCursor();
+	PlaceCaret0(p);
+	SelectionChanged();
+	if(IsSelection())
+		SetSelectionSource(ClipFmtsText());
+	return p.x;
+}
+
+void LineEdit::PlaceCaret(int newcursor, bool sel) {
+	gcolumn = PlaceCaretNoG(newcursor, sel);
+}
+
+void LineEdit::TopCursor() {
+	sb.SetY(GetLine(cursor));
+}
+
+void LineEdit::CenterCursor() {
+	int cy = sb.GetPage().cy;
+	if(cy > 4)
+		sb.SetY(max(min(GetLine(cursor) - cy / 2, line.GetCount() - cy), 0));
+}
+
+void LineEdit::Scroll() {
+	PlaceCaret0(GetColumnLine(cursor));
+	scroller.Scroll(*this, GetSize(), sb.Get(), GetFontSize());
+	SetHBar();
+	NewScrollPos();
+}
+
+int LineEdit::GetMousePos(Point p) const {
+	Size fsz = GetFontSize();
+	p = (p + fsz.cx / 2 + fsz * (Size)sb.Get()) / fsz;
+	return GetGPos(p.y, p.x);
+}
+
+void LineEdit::LeftDown(Point p, dword flags) {
+	mpos = GetMousePos(p);
+	int l, h;
+	if(GetSelection(l, h) && mpos >= l && mpos < h) {
+		selclick = true;
+		return;
+	}
+	PlaceCaret(mpos, flags & K_SHIFT);
+	SetWantFocus();
+	SetCapture();
+}
+
+void LineEdit::LeftUp(Point p, dword flags)
+{
+	if(!HasCapture() && selclick) {
+		mpos = GetMousePos(p);
+		PlaceCaret(mpos, flags & K_SHIFT);
+		SetWantFocus();
+	}
+	selclick = false;
+}
+
+void LineEdit::RightDown(Point p, dword flags)
+{
+	mpos = GetMousePos(p);
+	SetWantFocus();
+	int l, h;
+	if(!GetSelection(l, h) || mpos < l || mpos >= h)
+		PlaceCaret(mpos, false);
+	MenuBar::Execute(WhenBar);
+}
+
+void LineEdit::LeftDouble(Point, dword)
+{
+	int l, h;
+	if(GetWordSelection(cursor, l, h))
+		SetSelection(l, h);
+}
+
+void LineEdit::LeftTriple(Point, dword)
+{
+	int q = cursor;
+	int i = GetLinePos(q);
+	q = cursor - q;
+	SetSelection(q, q + GetLineLength(i) + 1);
+}
+
+void LineEdit::MouseMove(Point p, dword flags) {
+	if((flags & K_MOUSELEFT) && HasFocus() && HasCapture()) {
+		int c = GetMousePos(p);
+		if(mpos != c)
+			PlaceCaret(c, true);
+	}
+}
+
+void LineEdit::LeftRepeat(Point p, dword flags) {
+	if(HasCapture()) {
+		int c = GetMousePos(p);
+		if(mpos != c)
+			PlaceCaret(c, true);
+	}
+}
+
+Image LineEdit::CursorImage(Point, dword) {
+	return Image::IBeam();
+}
+
+void LineEdit::MoveUpDown(int n, bool sel) {
+	int cl = cursor;
+	int ln = GetLinePos(cl);
+	ln = minmax(ln + n, 0, line.GetCount() - 1);
+	PlaceCaretNoG(GetGPos(ln, gcolumn), sel);
+}
+
+void LineEdit::MoveLeft(bool sel) {
+	if(cursor)
+		PlaceCaret(cursor - 1, sel);
+}
+
+void LineEdit::MoveRight(bool sel) {
+	if(cursor < total)
+		PlaceCaret(cursor + 1, sel);
+}
+
+void LineEdit::MoveUp(bool sel) {
+	MoveUpDown(-1, sel);
+}
+
+void LineEdit::MoveDown(bool sel) {
+	MoveUpDown(1, sel);
+}
+
+void LineEdit::MovePage(int dir, bool sel) {
+	int n = dir * max(GetSize().cy / GetFontSize().cy - 2, 2);
+	sb.SetY(Point(sb).y + n);
+	MoveUpDown(n, sel);
+}
+
+void LineEdit::MovePageUp(bool sel) {
+	MovePage(-1, sel);
+}
+
+void LineEdit::MovePageDown(bool sel) {
+	MovePage(1, sel);
+}
+
+inline bool sTabSpace(int c) { return c == '\t' || c == ' '; }
+
+void LineEdit::MoveHome(bool sel) {
+	int cl = cursor;
+	int li = GetLinePos(cl);
+	int i = 0;
+	WString l = line[li];
+	while(sTabSpace(l[i]))
+		i++;
+	PlaceCaret(GetPos(li, cl == i ? 0 : i), sel);
+}
+
+void LineEdit::MoveEnd(bool sel) {
+	int i = GetLine(cursor);
+	PlaceCaret(GetPos(i, line[i].GetLength()), sel);
+}
+
+void LineEdit::MoveTextBegin(bool sel) {
+	PlaceCaret(0, sel);
+}
+
+void LineEdit::MoveTextEnd(bool sel) {
+	PlaceCaret(total, sel);
+}
+
+bool LineEdit::InsertChar(dword key, int count, bool canow) {
+	if(key == K_TAB && !processtab)
+		return false;
+	if(filter && key >= 32 && key < 65535)
+		key = (*filter)(key);
+	if(!IsReadOnly() && (key >= 32 && key < 65536 || key == '\t' || key == '\n' ||
+	   key == K_ENTER || key == K_SHIFT_SPACE)) {
+		if(key >= 128 && key < 65536 && charset != CHARSET_UNICODE
+		   && FromUnicode((wchar)key, charset) == DEFAULTCHAR)
+			return true;
+		if(!RemoveSelection() && overwrite && key != '\n' && key != K_ENTER && canow) {
+			int q = cursor;
+			int i = GetLinePos(q);
+			if(q + count - 1 < GetLineLength(i))
+				Remove(cursor, count);
+		}
+		WString text(key == K_ENTER ? '\n' : key == K_SHIFT_SPACE ? ' ' : key, count);
+		Insert(cursor, text, true);
+		PlaceCaret(cursor + count);
+		Action();
+		return true;
+	}
+	return false;
+}
+
+void LineEdit::DeleteChar() {
+	if(IsReadOnly() || RemoveSelection()) {
+		Action();
+		return;
+	}
+	if(cursor < total) {
+		Remove(cursor, 1);
+		Action();
+	}
+}
+
+void LineEdit::Backspace() {
+	if(IsReadOnly() || RemoveSelection() || cursor == 0) return;
+	MoveLeft();
+	DeleteChar();
+	Action();
+}
+
+void LineEdit::DeleteLine()
+{
+	int b, e;
+	if(GetSelection(b, e) && GetLine(b) != GetLine(e)) {
+		RemoveSelection();
+		return;
+	}
+	int i = GetLine(cursor);
+	int p = GetPos(i);
+	Remove(p, line[i].GetLength() + 1);
+	PlaceCaret(p);
+	Action();
+}
+
+void LineEdit::CutLine()
+{
+	if(IsReadOnly()) return;
+	int b, e;
+	if(GetSelection(b, e) && GetLine(b) != GetLine(e)) {
+		Cut();
+		return;
+	}
+	int i = GetLine(cursor);
+	int p = GetPos(i);
+	WString txt = Get(p, line[i].GetLength() + 1).ToWString();
+	WriteClipboardUnicodeText(txt);
+	AppendClipboardText(txt.ToString());
+	ClearSelection();
+	DeleteLine();
+}
+
+void LineEdit::EditPos::Serialize(Stream& s) {
+	int version = 0;
+	s / version;
+	s % sby % cursor;
+}
+
+LineEdit::EditPos LineEdit::GetEditPos() const {
+	EditPos pos;
+	pos.sby = sb.Get().y;
+	pos.cursor = cursor;
+	return pos;
+}
+
+void LineEdit::SetEditPos(const LineEdit::EditPos& pos) {
+	sb.SetY(minmax(pos.sby, 0, line.GetCount() - 1));
+	SetCursor(pos.cursor);
+}
+
+void LineEdit::SetEditPosSb(const LineEdit::EditPos& pos) {
+	SetCursor(pos.cursor);
+	sb.SetY(minmax(pos.sby, 0, line.GetCount() - 1));
+}
+
+void LineEdit::SetHBar()
+{
+	int mpos = 0;
+	if(!nohbar && !isdrag) {
+		int m = min(sb.y + sb.GetPage().cy + 2, line.GetCount());
+		for(int i = sb.y; i < m; i++) {
+			int pos = 0;
+			WString l = line[i];
+			const wchar *s = l;
+			const wchar *e = l.End();
+			while(s < e) {
+				if(*s == '\t')
+					pos = (pos + tabsize) / tabsize * tabsize;
+				else
+					pos += 1 + IsCJKIdeograph(*s);
+				s++;
+			}
+			mpos = max(mpos, pos);
+		}
+	}
+	sb.SetTotalX(mpos + 1);
+}
+
+void LineEdit::ScrollIntoCursor()
+{
+	Point p = GetColumnLine(GetCursor());
+	sb.ScrollInto(p);
+	SetHBar();
+	sb.ScrollInto(p);
+}
+
+bool LineEdit::Key(dword key, int count) {
+	NextUndo();
+	switch(key) {
+	case K_CTRL_UP:
+		ScrollUp();
+		return true;
+	case K_CTRL_DOWN:
+		ScrollDown();
+		return true;
+	case K_INSERT:
+		OverWriteMode(!IsOverWriteMode());
+		break;
+	}
+	bool sel = key & K_SHIFT;
+	switch(key & ~K_SHIFT) {
+	case K_CTRL_LEFT:
+		{
+			PlaceCaret(GetPrevWord(cursor), sel);
+			break;
+		}
+	case K_CTRL_RIGHT:
+		{
+			PlaceCaret(GetNextWord(cursor), sel);
+			break;
+		}
+	case K_LEFT:
+		MoveLeft(sel);
+		break;
+	case K_RIGHT:
+		MoveRight(sel);
+		break;
+	case K_HOME:
+		MoveHome(sel);
+		break;
+	case K_END:
+		MoveEnd(sel);
+		break;
+	case K_UP:
+		MoveUp(sel);
+		break;
+	case K_DOWN:
+		MoveDown(sel);
+		break;
+	case K_PAGEUP:
+		MovePageUp(sel);
+		break;
+	case K_PAGEDOWN:
+		MovePageDown(sel);
+		break;
+	case K_CTRL_PAGEUP:
+	case K_CTRL_HOME:
+		MoveTextBegin(sel);
+		break;
+	case K_CTRL_PAGEDOWN:
+	case K_CTRL_END:
+		MoveTextEnd(sel);
+		break;
+	case K_CTRL_C:
+	case K_CTRL_INSERT:
+		Copy();
+		break;
+	case K_CTRL_A:
+		SelectAll();
+		break;
+	default:
+		if(IsReadOnly())
+			return MenuBar::Scan(WhenBar, key);
+		switch(key) {
+		case K_DELETE:
+			DeleteChar();
+			break;
+		case K_BACKSPACE:
+		case K_SHIFT|K_BACKSPACE:
+			Backspace();
+			break;
+	   	case K_SHIFT_TAB:
+			AlignChar();
+			break;
+		case K_CTRL_Y:
+		case K_CTRL_L:
+			if(cutline) {
+				CutLine();
+				break;
+			}
+		default:
+			if(InsertChar(key, count, true))
+				return true;
+			return MenuBar::Scan(WhenBar, key);
+		}
+		return true;
+	}
+	Sync();
+	return true;
+}
+
+void LineEdit::DragAndDrop(Point p, PasteClip& d)
+{
+	if(IsReadOnly()) return;
+	int c = GetMousePos(p);
+	if(AcceptText(d)) {
+		NextUndo();
+		int a = sb.y;
+		int sell, selh;
+		if(GetSelection(sell, selh)) {
+			if(c >= sell && c < selh) {
+				RemoveSelection();
+				if(IsDragAndDropSource())
+					d.SetAction(DND_COPY);
+				c = sell;
+			}
+			else
+			if(d.GetAction() == DND_MOVE && IsDragAndDropSource()) {
+				if(c > sell)
+					c -= selh - sell;
+				RemoveSelection();
+				d.SetAction(DND_COPY);
+			}
+		}
+		int count = Insert(c, GetWString(d));
+		sb.y = a;
+		SetFocus();
+		SetSelection(c, c + count);
+		Action();
+		return;
+	}
+	if(!d.IsAccepted()) return;
+	if(!isdrag) {
+		isdrag = true;
+		ScrollIntoCursor();
+	}
+	Point dc = Null;
+	if(c >= 0)
+		dc = GetColumnLine(c);
+	if(dc != dropcaret) {
+		RefreshDropCaret();
+		dropcaret = dc;
+		RefreshDropCaret();
+	}
+}
+
+Rect LineEdit::DropCaret()
+{
+	if(IsNull(dropcaret))
+		return Rect(0, 0, 0, 0);
+	Size fsz = GetFontSize();
+	Point p = dropcaret - sb;
+	p = Point(p.x * fsz.cx, p.y * fsz.cy);
+	return RectC(p.x, p.y, 1, fsz.cy);
+}
+
+void LineEdit::RefreshDropCaret()
+{
+	Refresh(DropCaret());
+}
+
+void LineEdit::DragRepeat(Point p)
+{
+	sb.y = (int)sb.y + GetDragScroll(this, p, 1).y;
+}
+
+void LineEdit::DragLeave()
+{
+	RefreshDropCaret();
+	dropcaret = Null;
+	isdrag = false;
+	Layout();
+}
+
+void LineEdit::LeftDrag(Point p, dword flags)
+{
+	int c = GetMousePos(p);
+	int l, h;
+	if(!HasCapture() && GetSelection(l, h) && c >= l && c < h) {
+		WString sample = GetW(l, min(h - l, 3000));
+		Size sz = StdSampleSize();
+		ImageDraw iw(sz);
+		iw.DrawRect(sz, Black());
+		iw.Alpha().DrawRect(sz, Black());
+		DrawTLText(iw.Alpha(), 0, 0, 9999, sample, Courier(10), White());
+		NextUndo();
+		if(DoDragAndDrop(ClipFmtsText(), iw) == DND_MOVE) {
+			RemoveSelection();
+			Action();
+		}
+	}
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/CtrlLib/MenuBar.cpp b/uppsrc/CtrlLib/MenuBar.cpp
new file mode 100644
index 000000000..df952d1c2
--- /dev/null
+++ b/uppsrc/CtrlLib/MenuBar.cpp
@@ -0,0 +1,572 @@
+#include "MenuImp.h"
+
+#ifdef PLATFORM_WIN32
+#include <mmsystem.h>
+#endif
+
+NAMESPACE_UPP
+
+#define LLOG(x)    // LOG(x)
+#define LTIMING(x) // RTIMING(x)
+
+static ColorF xpmenuborder[] = {
+	(ColorF)3,
+	&SColorShadow, &SColorShadow, &SColorShadow, &SColorShadow,
+	&SColorMenu, &SColorMenu, &SColorMenu, &SColorMenu,
+	&SColorMenu, &SColorMenu, &SColorMenu, &SColorMenu,
+};
+
+GLOBAL_VARP(BorderFrame, XPMenuFrame, (xpmenuborder));
+
+CtrlFrame& MenuFrame()
+{
+	return GUI_GlobalStyle() >= GUISTYLE_XP ? (CtrlFrame&)XPMenuFrame() : (CtrlFrame&)OutsetFrame();
+}
+
+CH_STYLE(MenuBar, Style, StyleDefault)
+{
+	topitem[0] = Null;
+	topitem[1] = topitem[2] = item = SColorHighlight();
+	topitemtext[0] = SColorMenuText();
+	topitemtext[1] = topitemtext[2] = itemtext = SColorHighlightText();
+	topbar = SColorFace();
+	maxiconsize = Size(16, 16);
+	arealook = Null;
+	look = SColorFace();
+	separator = breaksep = SeparatorCtrl::StyleDefault();
+	ImageBuffer ib(7, 7);
+	Fill(ib, SColorShadow(), 7 * 7);
+	for(int i = 0; i < 5; i++)
+		Fill(ib[i + 1] + 1, SColorMenu(), 5);
+	ib.SetHotSpot(Point(3, 3));
+	ib.Set2ndSpot(Point(3, 3));
+	popupframe = Image(ib);
+	popupbody = SColorMenu();
+	popupiconbar = Null;
+	leftgap = 16;
+	textgap = 6;
+	lsepm = rsepm = 2;
+	pullshift.x = 0;
+	pullshift.y = -1;
+}
+
+MenuBar::MenuBar()
+{
+	LLOG("MenuBar " << Name());
+	submenu = parentmenu = NULL;
+	submenuitem = NULL;
+	doeffect = true;
+	font = StdFont();
+	leftgap = Null;
+	lock = 0;
+	SetStyle(StyleDefault());
+	arealook = -1;
+	maxiconsize = Null;
+}
+
+MenuBar& MenuBar::SetStyle(const Style& s)
+{
+	style = &s;
+	lsepm = style->lsepm;
+	rsepm = style->rsepm;
+	sepstyle = &style->separator;
+	Layout();
+	Refresh();
+	return *this;
+}
+
+void MenuBar::Paint(Draw& w)
+{
+	if(IsTransparent())
+		return;
+	if(GetParent())
+		if(!IsNull(style->arealook) && (arealook < 0 ? InFrame() : arealook)) {
+			PaintBarArea(w, this, style->arealook, (GetAlign() != BAR_TOP) ? GetScreenRect().bottom : Null);
+			PaintBarArea(w, this, style->arealook);
+			PaintBar(w, style->breaksep, Null);
+		}
+		else
+			PaintBar(w, style->breaksep, style->look);
+	else
+		PaintBar(w, style->breaksep, style->popupbody, style->popupiconbar, style->leftgap);
+}
+
+Value MenuBar::GetBackground() const
+{
+	return parentmenu || !IsChild() ? Null : style->topbar;
+}
+
+void MenuBar::Clear()
+{
+	if(lock) return;
+	lock++;
+	SetActiveSubmenu(NULL, NULL);
+	item.Clear();
+	BarCtrl::Clear();
+	lock--;
+}
+
+Bar::Item& MenuBar::AddItem(Callback cb)
+{
+	LLOG("MenuBar::AddItem " << Name());
+	MenuItemBase *q;
+	if(IsChild())
+		q = new TopMenuItem;
+	else
+		q = new MenuItem;
+	item.Add(q);
+	pane.Add(q, Null);
+	q->SetFont(font);
+	q->LeftGap(Nvl(leftgap, style->leftgap));
+	q->TextGap(style->textgap);
+	q->Style(style);
+	q->MaxIconSize(IsNull(maxiconsize) ? style->maxiconsize : maxiconsize);
+	*q <<= THISBACK(CloseMenu);
+	*q << cb;
+	return *q;
+}
+
+Bar::Item& MenuBar::AddSubMenu(Callback1<Bar&> proc)
+{
+	LLOG("MenuBar::AddSubMenu " << Name());
+	SubMenuBase *w;
+	MenuItemBase *q;
+	if(IsChild()) {
+		TopSubMenuItem *a = new TopSubMenuItem;
+		q = a;
+		w = a;
+	}
+	else {
+		SubMenuItem *a = new SubMenuItem;
+		q = a;
+		w = a;
+	}
+	item.Add(q);
+	pane.Add(q, Null);
+	q->SetFont(font);
+	q->LeftGap(Nvl(leftgap, style->leftgap));
+	q->TextGap(style->textgap);
+	q->Style(style);
+	q->MaxIconSize(IsNull(maxiconsize) ? style->maxiconsize : maxiconsize);
+	w->SetParent(this);
+	w->Set(proc);
+	return *q;
+}
+
+void MenuBar::CloseMenu()
+{
+	LLOG("CloseMenu");
+	MenuBar *q = GetLastSubmenu();
+	while(q && q->IsPopUp()) {
+		if(q->IsOpen()) {
+			q->doeffect = true;
+			q->Close();
+		}
+		MenuBar *w = q;
+		q = q->parentmenu;
+		w->submenu = w->parentmenu = NULL;
+	}
+	if(q)
+		q->submenu = NULL;
+	while(q) {
+		q->SyncState();
+		q->doeffect = true;
+		q = q->parentmenu;
+	}
+}
+
+MenuBar *MenuBar::GetMasterMenu()
+{
+	MenuBar *q = this;
+	while(q->parentmenu)
+		q = q->parentmenu;
+	return q;
+}
+
+MenuBar *MenuBar::GetLastSubmenu()
+{
+	MenuBar *q = this;
+	while(q->submenu)
+		q = q->submenu;
+	return q;
+}
+
+void MenuBar::SetupRestoreFocus()
+{
+	MenuBar *q = GetMasterMenu();
+	while(q) {
+		if(q->HasFocusDeep()) return;
+		q = q->submenu;
+	}
+	restorefocus = GetFocusCtrl();
+	LLOG("SetupRestoreFocus -> " << ::Name(restorefocus));
+}
+
+void MenuBar::PostDeactivate()
+{
+	MenuBar *q = GetLastSubmenu();
+	MenuBar *u = q;
+	while(q && q->IsPopUp()) {
+		if(q->IsOpen() && q->HasFocusDeep())
+			return;
+		q = q->parentmenu;
+	}
+	if(u->IsPopUp()) {
+		while(u->parentmenu && u->parentmenu->IsPopUp())
+			u = u->parentmenu;
+		Ctrl *w = GetActiveCtrl();
+		while(w) {
+			if(w == u) return;
+			w = w->GetOwner();
+		}
+	}
+	CloseMenu();
+}
+
+void MenuBar::Deactivate()
+{
+	if(IsOpen())
+		SetTimeCallback(0, THISBACK(PostDeactivate), TIMEID_STOP);
+}
+
+void MenuBar::SyncState()
+{
+	if(lock) return;
+	for(int i = 0; i < item.GetCount(); i++)
+		item[i].SyncState();
+}
+
+void MenuBar::ChildGotFocus()
+{
+	if(submenu && !submenuitem->HasFocusDeep() && !ExistsTimeCallback()) {
+	   	if(submenu->IsOpen())
+			submenu->DelayedClose();
+	}
+	KillDelayedClose();
+	SyncState();
+}
+
+void MenuBar::ChildLostFocus()
+{
+	SyncState();
+}
+
+bool PullMenu(Ctrl *q)
+{
+	if(q->IsEnabled()) {
+		TopSubMenuItem *w = dynamic_cast<TopSubMenuItem *>(q);
+		if(w) {
+			w->Pull();
+			return true;
+		}
+	}
+	return false;
+}
+
+static bool s_doaltkey;
+
+bool MenuKeyHook(Ctrl *ctrl, dword key, int count)
+{
+	if(key != K_ALT_KEY && key != (K_ALT_KEY|K_KEYUP))
+		s_doaltkey = false;
+	return false;
+}
+
+bool MenuStateHook(Ctrl *ctrl, int reason)
+{
+	if(reason == Ctrl::ACTIVATE)
+		s_doaltkey = false;
+	return false;
+}
+
+INITBLOCK
+{
+	Ctrl::InstallKeyHook(MenuKeyHook);
+	Ctrl::InstallStateHook(MenuStateHook);
+}
+
+bool MenuBar::Key(dword key, int count)
+{
+	bool horz = IsChild();
+	if((horz ? key == K_RIGHT : key == K_DOWN)) {
+		Ctrl *ctrl = GetFocusChildDeep();
+		LLOG("MenuBar::Key(" << key << ") -> IterateFocusForward for " << ::Name(ctrl) << ", pane " << ::Name(&pane));
+		if(HasMouseDeep())
+			GetMouseCtrl()->Refresh();
+		if(ctrl && IterateFocusForward(ctrl, &pane, false, false, true))
+			return true;
+		Ctrl *f = pane.GetFirstChild();
+		if(!f) return true;
+		if(f->IsEnabled()) {
+			f->SetFocus();
+			return true;
+		}
+		if(IterateFocusForward(pane.GetFirstChild(), &pane, false, false, true)) return true;
+	}
+	else
+	if((horz ? key == K_LEFT : key == K_UP)) {
+		Ctrl *ctrl = GetFocusChildDeep();
+		LLOG("MenuBar::Key(" << key << ") -> IterateFocusBackward for " << ::Name(ctrl) << ", pane " << ::Name(&pane));
+		if(HasMouseDeep())
+			GetMouseCtrl()->Refresh();
+		if(ctrl && IterateFocusBackward(ctrl, &pane, false, true))
+			return true;
+		Ctrl *f = pane.GetLastChild();
+		if(!f) return true;
+		if(f->IsEnabled()) {
+			f->SetFocus();
+			return true;
+		}
+		if(IterateFocusBackward(pane.GetLastChild(), &pane, false, true)) return true;
+	}
+	else
+	if(parentmenu && !parentmenu->IsChild() && key == K_LEFT || key == K_ESCAPE) {
+		if(HasMouseDeep())
+			GetMouseCtrl()->Refresh();
+		if(parentmenu && parentmenu->submenu)
+			parentmenu->submenuitem->SetFocus();
+		else
+		if(IsChild() && HasFocusDeep()) {
+			if(restorefocus)
+				restorefocus->SetFocus();
+			doeffect = true;
+			return true;
+		}
+		if(IsPopUp()) {
+			SubmenuClose();
+			return true;
+		}
+		doeffect = true;
+	}
+	if(parentmenu && parentmenu->IsChild() && parentmenu->GetActiveSubmenu() &&
+	   parentmenu->pane.GetFirstChild() && parentmenu->submenuitem) {
+		Ctrl *smi = parentmenu->submenuitem;
+		Ctrl *q = smi;
+		if(key == K_RIGHT)
+			for(;;) {
+				q = q->GetNext();
+				if(!q)
+					q = parentmenu->pane.GetFirstChild();
+				if(q == smi)
+					break;
+				if(PullMenu(q)) {
+					SyncState();
+					return true;
+				}
+			}
+		if(key == K_LEFT)
+			for(;;) {
+				q = q->GetPrev();
+				if(!q)
+					q = parentmenu->pane.GetLastChild();
+				if(q == smi)
+					break;
+				if(PullMenu(q)) {
+					SyncState();
+					return true;
+				}
+			}
+	}
+	return HotKey(key);
+}
+
+void MenuBar::LeftDown(Point, dword)
+{
+	if(IsChild() && HasFocusDeep()) {
+		if(restorefocus)
+			restorefocus->SetFocus();
+	}
+	WhenLeftClick();
+}
+
+bool MenuBar::HotKey(dword key)
+{
+	if(Ctrl::HotKey(key))
+		return true;
+	if(IsChild()) {
+		if((key == (K_ALT_KEY|K_KEYUP) || key == K_F10) && (submenu || HasFocusDeep())) {
+			LLOG("CloseMenu()");
+			CloseMenu();
+			if(restorefocus)
+				restorefocus->SetFocus();
+			s_doaltkey = false;
+			return true;
+		}
+		if(key == K_ALT_KEY) {
+			s_doaltkey = true;
+			return true;
+		}
+		if((key == K_F10 || key == (K_ALT_KEY|K_KEYUP) && s_doaltkey)
+		   && !submenu && !HasFocusDeep() && GetTopWindow() && GetTopWindow()->IsForeground()) {
+			SetupRestoreFocus();
+			for(Ctrl *q = pane.GetFirstChild(); q; q = q->GetNext())
+				if(q->SetFocus()) return true;
+		}
+	}
+	return (key == K_LEFT || key == K_RIGHT) && parentmenu ? parentmenu->Key(key, 1) : false;
+}
+
+void MenuBar::SetActiveSubmenu(MenuBar *sm, Ctrl *item)
+{
+	if(submenu && submenu != sm) {
+		submenu->Close();
+		submenu->parentmenu = NULL;
+	}
+	if(submenuitem)
+		submenuitem->Refresh();
+	submenu = sm;
+	submenuitem = item;
+}
+
+void MenuBar::SubmenuClose()
+{
+	if(parentmenu && parentmenu->GetActiveSubmenu() == this)
+		parentmenu->SetActiveSubmenu(NULL, NULL);
+	else
+		Close();
+	parentmenu = NULL;
+	Clear();
+}
+
+void MenuBar::DelayedClose()
+{
+	SetTimeCallback(400, THISBACK(SubmenuClose), TIMEID_SUBMENUCLOSE);
+}
+
+void MenuBar::KillDelayedClose()
+{
+	KillTimeCallback(TIMEID_SUBMENUCLOSE);
+	KillTimeCallback(TIMEID_STOP);
+}
+
+void MenuBar::Set(Callback1<Bar&> menu)
+{
+	if(lock) return;
+	Clear();
+	lock++;
+	menu(*this);
+	SyncBar();
+	DistributeAccessKeys();
+	lock--;
+}
+
+void MenuBar::Post(Callback1<Bar&> bar)
+{
+	KillTimeCallback(TIMEID_POST);
+	SetTimeCallback(0, THISBACK1(Set, bar), TIMEID_POST);
+}
+
+#ifdef PLATFORM_WIN32
+
+DWORD WINAPI PlaySoundThread(LPVOID)
+{
+#ifdef PLATFORM_WINCE
+	PlaySound(L"MenuPopup", NULL, SND_ASYNC|SND_NODEFAULT);
+#else
+	PlaySound("MenuPopup", NULL, SND_ASYNC|SND_NODEFAULT);
+#endif
+	return 0;
+}
+
+#endif
+
+void MenuBar::PopUp(Ctrl *owner, Point p, Size rsz)
+{
+	bool szcx = true;
+	bool szcy = true;
+	bool szx = false;
+	bool szy = false;
+	if(parentmenu) {
+		if(parentmenu->IsChild())
+			szcx = false;
+		else
+			szcy = false;
+		WhenHelp = parentmenu->WhenHelp;
+	}
+	Rect r = GetWorkArea();
+	restorefocus = GetFocusCtrl();
+	LLOG("PopUp " << ::Name(this) << " set restorefocus:" << ::Name(restorefocus));
+	DistributeAccessKeys();
+	frame.Set(style->popupframe);
+	if(GUI_GlobalStyle() >= GUISTYLE_XP)
+		SetFrame(frame);
+	else
+		SetFrame(OutsetFrame());
+	pane.SubMenu();
+	Size sz = pane.Repos(false, r.Height());
+	pane.RightPos(0, sz.cx).BottomPos(0, sz.cy);
+	Size sz0 = sz;
+	sz = AddFrameSize(sz);
+	if(p.y + sz.cy > r.bottom) {
+		if(p.y - r.top > r.bottom - p.y) {
+			int y0 = p.y + rsz.cy;
+			szy = szcy;
+			sz = pane.Repos(false, y0 - max(y0 - sz.cy, r.top) - (sz.cy - sz0.cy));
+			pane.RightPos(0, sz.cx).TopPos(0, sz.cy);
+			sz = AddFrameSize(sz);
+			p.y = y0 - sz.cy;
+		}
+		else {
+			sz = pane.Repos(false, r.bottom - p.y - (sz.cy - sz0.cy));
+			pane.RightPos(0, sz.cx).BottomPos(0, sz.cy);
+			sz = AddFrameSize(sz);
+		}
+	}
+	if(p.x + sz.cx > r.right) {
+		p.x = max(p.x + rsz.cx - sz.cx, 0);
+		szx = szcx;
+		pane.LeftPos(0, sz.cx);
+	}
+	bool eff = parentmenu == NULL || parentmenu->doeffect;
+	if(eff && GUI_PopUpEffect() == GUIEFFECT_SLIDE)
+		SetRect(szx ? p.x + sz.cx : p.x, szy ? p.y + sz.cy : p.y, parentmenu ? sz.cx : 1, 1);
+	else
+		SetRect(p.x, p.y, sz.cx, sz.cy);
+#ifdef PLATFORM_WIN32
+	DWORD dummy;
+	CreateThread(NULL, 0, PlaySoundThread, NULL, 0, &dummy);
+#endif
+	doeffect = true;
+	Ctrl::PopUp(owner, true, true, GUI_DropShadows(), !owner);
+#ifdef PLATFORM_X11
+	XSync(Xdisplay, false);
+	ProcessEvents();
+#endif
+	if(eff)
+		Animate(*this, p.x, p.y, sz.cx, sz.cy);
+}
+
+void MenuBar::Execute(Ctrl *owner, Point p)
+{
+	if(IsEmpty()) return;
+	PopUp(owner, p);
+	EventLoop(this);
+}
+
+void MenuBar::Execute(Ctrl *owner, Callback1<Bar&> proc, Point p)
+{
+	MenuBar bar;
+	proc(bar);
+	bar.Execute(owner, p);
+}
+
+int MenuBar::GetStdHeight(Font font)
+{
+	return TopMenuItem::GetStdHeight(font);
+}
+
+void MenuBar::CancelMode()
+{
+}
+
+MenuBar::~MenuBar()
+{
+	lock++;
+	LLOG("~MenuBar " << Name());
+	LLOG("Parent menu " << ::Name(parentmenu));
+	if(parentmenu)
+		parentmenu->SetActiveSubmenu(NULL, NULL);
+	LLOG("~MenuBar 1");
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/CtrlLib/MenuImp.h b/uppsrc/CtrlLib/MenuImp.h
new file mode 100644
index 000000000..9194763e7
--- /dev/null
+++ b/uppsrc/CtrlLib/MenuImp.h
@@ -0,0 +1,181 @@
+#include "CtrlLib.h"
+
+#ifndef CtrlCore_MenuImp_h
+#define CtrlCore_MenuImp_h
+
+NAMESPACE_UPP
+
+class MenuItemBase : public Ctrl, public Bar::Item
+{
+public:
+	virtual Bar::Item& Text(const char *text);
+	virtual Bar::Item& Key(dword key);
+	virtual Bar::Item& Image(const UPP::Image& img);
+	virtual Bar::Item& Enable(bool _enable);
+	virtual Bar::Item& Tip(const char *tip);
+	virtual Bar::Item& Help(const char *help);
+	virtual Bar::Item& Topic(const char *help);
+	virtual Bar::Item& Description(const char *desc);
+	virtual Bar::Item& Check(bool check);
+	virtual Bar::Item& Radio(bool check);
+
+	virtual String GetDesc() const;
+	virtual dword  GetAccessKeys() const;
+	virtual void   AssignAccessKeys(dword used);
+
+protected:
+	enum {
+		NOTHING, CHECK0, CHECK1, RADIO0, RADIO1
+	};
+
+	enum {
+		NORMAL, HIGHLIGHT, PUSH
+	};
+
+	String  text;
+	dword   accel;
+	int     state;
+	int     leftgap, textgap;
+	Font    font;
+	bool    isenabled;
+	byte    type;
+	byte    accesskey;
+	Size    maxiconsize;
+	const MenuBar::Style *style;
+
+public:
+	virtual void SyncState() = 0;
+
+	void           DrawMenuText(Draw& w, int x, int y, const String& s, Font f, bool enabled, bool hl,
+	                            Color color, Color hlcolor);
+	void           PaintTopItem(Draw& w, int state);
+
+	bool           IsItemEnabled() const          { return isenabled; }
+	String         GetText() const                { return text; }
+	MenuItemBase&  LeftGap(int cx)                { leftgap = cx; return *this; }
+	MenuItemBase&  TextGap(int cx)                { textgap = cx; return *this; }
+	MenuItemBase&  SetFont(Font f)                { font = f; return *this; }
+	MenuItemBase&  Style(const MenuBar::Style *s) { style = s; return *this; }
+	Font           GetFont() const                { return font; }
+	MenuItemBase&  MaxIconSize(Size sz)           { maxiconsize = sz; return *this; }
+
+	MenuItemBase();
+};
+
+void DrawMenuText(Draw& w, int x, int y, const String& s, Font f, bool enabled,
+                  bool highlight, int mn, Color color, Color hltext);
+
+class MenuItem : public MenuItemBase {
+public:
+	virtual void  Paint(Draw& w);
+	virtual void  MouseEnter(Point, dword);
+	virtual void  MouseLeave();
+	virtual Size  GetMinSize() const;
+	virtual void  LeftUp(Point, dword);
+	virtual void  RightUp(Point, dword);
+	virtual void  GotFocus();
+	virtual void  LostFocus();
+	virtual bool  Key(dword key, int count);
+	virtual bool  HotKey(dword key);
+	virtual void  SyncState();
+
+	virtual Bar::Item& Image(const UPP::Image& img);
+
+private:
+	UPP::Image licon, ricon;
+
+	void  SendHelpLine();
+	void  ClearHelpLine();
+
+protected:
+	virtual int  GetVisualState();
+
+public:
+	MenuItem& RightImage(const UPP::Image& img);
+};
+
+class SubMenuBase {
+protected:
+	MenuBar  menu;
+	Callback1<Bar&> proc;
+	MenuBar *parentmenu;
+
+	void     Pull(Ctrl *item, Point p, Size sz);
+
+public:
+	virtual  void Pull() = 0;
+
+	void SetParent(MenuBar *m)                           { parentmenu = m; menu.MaxIconSize(m->GetMaxIconSize()); }
+	void Set(Callback1<Bar&> _submenu)                   { proc = _submenu; }
+	Callback1<Bar&> Get()                                { return proc; }
+
+	SubMenuBase()                                        { parentmenu = NULL; }
+	virtual ~SubMenuBase() {}
+};
+
+class SubMenuItem : public MenuItem, public SubMenuBase {
+public:
+	virtual void MouseEnter(Point, dword);
+	virtual void MouseLeave();
+	virtual void GotFocus();
+	virtual bool HotKey(dword key);
+	virtual bool Key(dword key, int count);
+	virtual int  GetVisualState();
+	virtual void Pull();
+
+protected:
+	enum {
+		TIMEID_PULL = BarCtrl::TIMEID_COUNT,
+		TIMEID_COUNT
+	};
+
+public:
+	typedef SubMenuItem CLASSNAME;
+
+	SubMenuItem();
+};
+
+class TopSubMenuItem : public MenuItemBase, public SubMenuBase {
+public:
+	virtual void Paint(Draw& w);
+	virtual void MouseEnter(Point, dword);
+	virtual void MouseLeave();
+	virtual void LeftDown(Point, dword);
+	virtual void SyncState();
+	virtual Size GetMinSize() const;
+	virtual bool Key(dword key, int);
+	virtual bool HotKey(dword key);
+	virtual void Pull();
+
+private:
+	int  GetState();
+
+public:
+	TopSubMenuItem() { NoInitFocus(); }
+};
+
+class TopMenuItem : public MenuItemBase {
+public:
+	virtual void  Paint(Draw& w);
+	virtual void  MouseEnter(Point, dword);
+	virtual void  MouseLeave();
+	virtual void  LeftUp(Point, dword);
+	virtual void  LeftDown(Point, dword);
+	virtual void  GotFocus();
+	virtual void  LostFocus();
+	virtual bool  Key(dword key, int count);
+	virtual Size  GetMinSize() const;
+	virtual void  SyncState();
+
+	static int GetStdHeight(Font font = StdFont());
+
+private:
+	int  GetState();
+
+public:
+	TopMenuItem() { NoInitFocus(); }
+};
+
+END_UPP_NAMESPACE
+
+#endif
diff --git a/uppsrc/CtrlLib/MenuItem.cpp b/uppsrc/CtrlLib/MenuItem.cpp
new file mode 100644
index 000000000..9a696a222
--- /dev/null
+++ b/uppsrc/CtrlLib/MenuItem.cpp
@@ -0,0 +1,599 @@
+#include "MenuImp.h"
+
+#ifdef PLATFORM_WIN32
+#include <mmsystem.h>
+#endif
+
+NAMESPACE_UPP
+
+#define LLOG(x)    // LOG(x)
+#define LTIMING(x) // RTIMING(x)
+
+MenuItemBase::MenuItemBase()
+{
+	accel = 0;
+	state = 0;
+	isenabled = true;
+	type = 0;
+	font = StdFont();
+	leftgap = 16;
+	textgap = 6;
+	accesskey = 0;
+	NoWantFocus();
+	style = &MenuBar::StyleDefault();
+	Transparent();
+	maxiconsize = Size(INT_MAX, INT_MAX);
+}
+
+Bar::Item& MenuItemBase::Text(const char *s)
+{
+	accesskey = ExtractAccessKey(s, text);
+	Refresh();
+	return *this;
+}
+
+Bar::Item& MenuItemBase::Key(dword key)
+{
+	if(key) {
+		accel = key;
+		Refresh();
+	}
+	return *this;
+}
+
+Bar::Item& MenuItemBase::Image(const UPP::Image& img)
+{
+	return *this;
+}
+
+Bar::Item& MenuItemBase::Check(bool check)
+{
+	type = CHECK0 + check;
+	return *this;
+}
+
+Bar::Item& MenuItemBase::Radio(bool check)
+{
+	type = RADIO0 + check;
+	return *this;
+}
+
+Bar::Item& MenuItemBase::Tip(const char *s)
+{
+	return *this;
+}
+
+Bar::Item& MenuItemBase::Help(const char *s)
+{
+	HelpLine(s);
+	return *this;
+}
+
+Bar::Item& MenuItemBase::Description(const char *s)
+{
+	Ctrl::Description(s);
+	return *this;
+}
+
+Bar::Item& MenuItemBase::Topic(const char *s)
+{
+	HelpTopic(s);
+	return *this;
+}
+
+Bar::Item& MenuItemBase::Enable(bool en)
+{
+	isenabled = en;
+	Refresh();
+	return *this;
+}
+
+String MenuItemBase::GetDesc() const
+{
+	return text;
+}
+
+dword  MenuItemBase::GetAccessKeys() const
+{
+	return AccessKeyBit(accesskey);
+}
+
+void   MenuItemBase::AssignAccessKeys(dword used)
+{
+	if(!accesskey) {
+		accesskey = ChooseAccessKey(text, used);
+		used |= AccessKeyBit(accesskey);
+	}
+	Ctrl::AssignAccessKeys(used);
+}
+
+void DrawMnemonicText(Draw& w, int x, int y, const String& s, Font font, Color color,
+                      int mnemonic)
+{
+	int q = s.Find(ToUpper(mnemonic));
+	int e = s.Find(ToLower(mnemonic));
+	if(q < 0 || e >= 0 && e < q) q = e;
+	w.DrawText(x, y, s, font, color);
+	if(q < 0) return;
+	FontInfo f = font.Info();
+	w.DrawRect(x + GetTextSize(~s, font, q).cx, y + f.GetAscent() + 1, f[s[q]], 1,
+	           SColorMark());
+}
+
+void DrawMenuText(Draw& w, int x, int y, const String& s, Font f, bool enabled,
+                  bool hl, int mnemonic, Color color, Color hlcolor)
+{
+	if(enabled)
+		DrawMnemonicText(w, x, y, s, f, hl ? hlcolor : color, mnemonic);
+	else {
+		if(GUI_GlobalStyle() >= GUISTYLE_XP)
+			DrawMnemonicText(w, x, y, s, f, SColorDisabled, 0);
+		else {
+			DrawMnemonicText(w, x + 1, y + 1, s, f, SColorPaper, 0);
+			DrawMnemonicText(w, x, y, s, f, SColorDisabled, 0);
+		}
+	}
+}
+
+void MenuItemBase::DrawMenuText(Draw& w, int x, int y, const String& s, Font f, bool enabled,
+                                bool hl, Color color, Color hlcolor)
+{
+	UPP::DrawMenuText(w, x, y, s, f, enabled, hl, VisibleAccessKeys() ? accesskey : 0,
+	                  color, hlcolor);
+}
+
+void MenuItemBase::PaintTopItem(Draw& w, int state) {
+	Size sz = GetSize();
+	if(GUI_GlobalStyle() >= GUISTYLE_XP) {
+		ChPaint(w, 0, 0, sz.cx, sz.cy, style->topitem[state]);
+		String text = GetText();
+		Size isz = GetTextSize(text, StdFont());
+		DrawMenuText(w, 6, (sz.cy - isz.cy) / 2, text, GetFont(), IsItemEnabled(), state,
+		             style->topitemtext[0], style->topitemtext[state]);
+	}
+	else {
+		w.DrawRect(sz, SColorFace);
+		static const ColorF b0[] = { (ColorF)1, SColorLight, SColorLight, SColorShadow, SColorShadow, };
+		static const ColorF b1[] = { (ColorF)1, SColorShadow, SColorShadow, SColorLight, SColorLight, };
+		String text = GetText();
+		Size isz = GetTextSize(text, StdFont());
+		DrawMenuText(w, 6, (sz.cy - isz.cy) / 2, text, GetFont(), IsItemEnabled(), false,
+		             SColorMenuText, SColorHighlightText);
+		if(state)
+			DrawBorder(w, 0, 0, sz.cx, sz.cy, state == 2 ? b1 : b0);
+	}
+}
+
+// -------------------------------------
+
+Bar::Item& MenuItem::Image(const UPP::Image& img)
+{
+	licon = img;
+	Refresh();
+	return *this;
+}
+
+MenuItem& MenuItem::RightImage(const UPP::Image& img)
+{
+	ricon = img;
+	Refresh();
+	return *this;
+}
+
+void MenuItem::SendHelpLine()
+{
+	BarCtrl::SendHelpLine(this);
+}
+
+void MenuItem::ClearHelpLine()
+{
+	BarCtrl::ClearHelpLine(this);
+}
+
+void MenuItem::MouseEnter(Point, dword)
+{
+	SetFocus();
+	Refresh();
+	SendHelpLine();
+}
+
+void MenuItem::MouseLeave()
+{
+	ClearHelpLine();
+}
+
+void MenuItem::GotFocus()
+{
+	Refresh();
+	SendHelpLine();
+}
+
+void MenuItem::LostFocus()
+{
+	Refresh();
+	ClearHelpLine();
+}
+
+int MenuItem::GetVisualState()
+{
+	return HasFocus() ?
+	       (HasMouse() && GetMouseLeft() || GetMouseRight()) ? PUSH : HIGHLIGHT : NORMAL;
+}
+
+void MenuItem::SyncState()
+{
+	int s = GetVisualState();
+	if(s != state) {
+		state = s;
+		Refresh();
+	}
+}
+
+void MenuItem::Paint(Draw& w)
+{
+	int q = text.Find('\t');
+	String txt, keydesc;
+	if(accel)
+		keydesc = GetKeyDesc(accel);
+	if(q >= 0) {
+		keydesc = text.Mid(q + 1);
+		txt = text.Mid(0, q);
+	}
+	else
+		txt = text;
+	state = GetVisualState();
+	bool hl = state != NORMAL;
+	Size sz = GetSize();
+
+	if(hl)
+		if(GUI_GlobalStyle() >= GUISTYLE_XP)
+			ChPaint(w, 0, 0, sz.cx, sz.cy, style->item);
+		else
+			w.DrawRect(sz, SColorHighlight);
+	UPP::Image li = licon;
+	if(li.IsEmpty()) {
+		switch(type) {
+		case CHECK0: li = CtrlImg::MenuCheck0(); break;
+		case CHECK1: li = CtrlImg::MenuCheck1(); break;
+		case RADIO0: li = CtrlImg::MenuRadio0(); break;
+		case RADIO1: li = CtrlImg::MenuRadio1(); break;
+		}
+	}
+	Size imsz = li.GetSize();
+	Size isz = min(maxiconsize, imsz);
+	if(isz != imsz)
+		li = CachedRescale(li, isz);
+	int iy = (sz.cy - isz.cy) / 2;
+	bool chk = false;
+	if(!licon.IsEmpty() && type) {
+		chk = type == CHECK1 || type == RADIO1;
+		if(GUI_GlobalStyle() >= GUISTYLE_XP) {
+			if(chk && !hl) {
+				DrawXPButton(w, RectC(0, iy - 2, isz.cx + 4, isz.cy + 4), BUTTON_EDGE|BUTTON_CHECKED);
+			}
+		}
+		else {
+			w.DrawRect(1, iy - 1, isz.cx + 2, isz.cy + 2, chk ? Blend(SColorFace, SColorLight)
+			                                                  : SColorFace);
+			DrawBorder(w, 0, iy - 2, isz.cx + 4, isz.cy + 4, chk ? ThinInsetBorder : ThinOutsetBorder);
+		}
+	}
+	if(isenabled)
+		DrawHighlightImage(w, (max(isz.cx, leftgap - 2) - isz.cx) / 2, iy, li, hl || chk, true);
+	else
+		w.DrawImage((max(isz.cx, leftgap - 2) - isz.cx) / 2, iy, DisabledImage(li));
+	int x = max(isz.cx, leftgap) + textgap;
+	isz = GetTextSize(text, StdFont());
+	DrawMenuText(w, x, (sz.cy - isz.cy) / 2, txt, font, isenabled, hl, SColorMenuText,
+	             style->itemtext);
+	isz = ricon.GetSize();
+	if(isenabled)
+		DrawHighlightImage(w, sz.cx - isz.cx, (sz.cy - isz.cy) / 2, ricon, hl, true);
+	else
+		w.DrawImage(sz.cx - isz.cx, (sz.cy - isz.cy) / 2, DisabledImage(ricon));
+	x = sz.cx - max(isz.cx, 16) - 1;
+	if(!IsEmpty(keydesc)) {
+		isz = GetTextSize(keydesc, StdFont());
+		UPP::DrawMenuText(w, x - isz.cx - 2, (sz.cy - isz.cy) / 2, keydesc, font, isenabled, hl,
+		                  0, SColorMark(), style->itemtext);
+	}
+}
+
+Size MenuItem::GetMinSize() const
+{
+	Size sz1 = GetTextSize(text, font);
+	Size sz2(0, 0);
+	if(accel) {
+		sz2 = GetTextSize(GetKeyDesc(accel), font);
+		sz2.cx += 12;
+	}
+	Size lsz = min(maxiconsize, licon.GetSize());
+	Size rsz = ricon.GetSize();
+	return AddFrameSize(Size(max(lsz.cx, leftgap) + sz1.cx + max(sz2.cx, (rsz.cx ? 16 : 0))
+	                         + max(rsz.cx, 16) + textgap + 10,
+	                         max(max(lsz.cy, rsz.cy) + 4, sz1.cy + 6)));
+}
+
+void MenuItem::LeftUp(Point, dword)
+{
+	if(!isenabled) return;
+#ifdef PLATFORM_WIN32
+#ifdef PLATFORM_WINCE
+	PlaySound(L"MenuCommand", NULL, SND_ASYNC|SND_NODEFAULT); //TODO?
+#else
+	PlaySound("MenuCommand", NULL, SND_ASYNC|SND_NODEFAULT);
+#endif
+#endif
+	LLOG("Menu Item pre Action");
+	WhenAction();
+	LLOG("Menu Item post Action");
+}
+
+void MenuItem::RightUp(Point p, dword w)
+{
+	LeftUp(p, w);
+}
+
+bool MenuItem::HotKey(dword key)
+{
+	if(isenabled && (key == accel || CompareAccessKey(accesskey, key)
+	|| key < 256 && IsAlNum((char)key) && CompareAccessKey(accesskey, ToUpper((char)key) + K_DELTA + K_ALT))) {
+		LLOG("MenuItem::HotKey(" << key << ") -> SetFocus");
+		SetFocus();
+		Sync();
+		Sleep(50);
+		WhenAction();
+		return true;
+	}
+	return false;
+}
+
+bool MenuItem::Key(dword key, int count)
+{
+	if(key == K_ENTER && isenabled) {
+		WhenAction();
+		return true;
+	}
+	return false;
+}
+
+// ----------------------------------------------------
+
+void SubMenuBase::Pull(Ctrl *item, Point p, Size sz)
+{
+	if(!item->IsOpen() || menu.IsOpen()) return;
+	menu.Clear();
+	if(parentmenu)
+		menu.SetStyle(*parentmenu->style);
+	proc(menu);
+	if(parentmenu) {
+		parentmenu->SetActiveSubmenu(&menu, item);
+		menu.SetParentMenu(parentmenu);
+	}
+	menu.PopUp(parentmenu, p, sz);
+	if(parentmenu)
+		parentmenu->doeffect = false;
+}
+
+// ----------------------------------------------------
+
+SubMenuItem::SubMenuItem()
+{
+	RightImage(CtrlImg::right_arrow());
+}
+
+void SubMenuItem::GotFocus()
+{
+	Refresh();
+}
+
+void SubMenuItem::Pull()
+{
+	Rect r = GetScreenRect();
+	Point p = r.TopRight();
+	p.x -= 3;
+	p.y -= 2;
+	SubMenuBase::Pull(this, p, Size(-r.Width(), 0));
+	if(parentmenu)
+		parentmenu->SyncState();
+}
+
+void SubMenuItem::MouseEnter(Point, dword)
+{
+	SetFocus();
+	Refresh();
+	if(!menu.IsOpen() && isenabled)
+		SetTimeCallback(400, THISBACK(Pull), TIMEID_PULL);
+}
+
+void SubMenuItem::MouseLeave()
+{
+	if(HasFocus() && GetParent())
+		GetParent()->SetFocus();
+	KillTimeCallback(TIMEID_PULL);
+}
+
+int SubMenuItem::GetVisualState()
+{
+	if(menu.IsOpen() && !GetParent()->HasFocusDeep())
+		return PUSH;
+	return MenuItem::GetVisualState();
+}
+
+bool SubMenuItem::Key(dword key, int count)
+{
+	if(key == K_RIGHT || key == K_ENTER) {
+		Pull();
+		return true;
+	}
+	return MenuItem::Key(key, count);
+}
+
+bool SubMenuItem::HotKey(dword key)
+{
+	if(isenabled && (key == accel || CompareAccessKey(accesskey, key))) {
+		Pull();
+		return true;
+	}
+	return false;
+}
+
+
+// ----------------------------------------------------
+
+Size TopSubMenuItem::GetMinSize() const
+{
+	return AddFrameSize(GetTextSize(text, font) + Size(12, 7));
+}
+
+int  TopSubMenuItem::GetState()
+{
+	if(parentmenu && parentmenu->GetActiveSubmenu() == &menu) return PUSH;
+	if(HasMouse() && GetParent() && !GetParent()->HasFocusDeep() &&
+	                 (!parentmenu || !parentmenu->GetActiveSubmenu() || parentmenu->GetActiveSubmenu() == &menu)
+	   || HasFocus())
+		return HIGHLIGHT;
+	return NORMAL;
+}
+
+void TopSubMenuItem::Paint(Draw& w)
+{
+	PaintTopItem(w, state = GetState());
+}
+
+void TopSubMenuItem::Pull()
+{
+	Rect r = GetScreenRect();
+	if(parentmenu && parentmenu->IsChild() && !parentmenu->submenu)
+		parentmenu->SetupRestoreFocus();
+	Point p = r.BottomLeft();
+	if(GUI_GlobalStyle() >= GUISTYLE_XP)
+		p += style->pullshift;
+	SubMenuBase::Pull(this, p, Size(r.Width(), -r.Height()));
+	if(parentmenu)
+		parentmenu->SyncState();
+}
+
+void TopSubMenuItem::MouseEnter(Point p, dword)
+{
+	Refresh();
+	if(isenabled && parentmenu->GetActiveSubmenu())
+		Pull();
+}
+
+bool TopSubMenuItem::Key(dword key, int) {
+	if(isenabled && (key == K_ENTER || key == K_DOWN)) {
+		Pull();
+		return true;
+	}
+	return false;
+}
+
+bool TopSubMenuItem::HotKey(dword key)
+{
+	if(BarCtrl::Scan(proc, key))
+		return true;
+	if(isenabled && (key == accel || CompareAccessKey(accesskey, key))) {
+		Pull();
+		return true;
+	}
+	return false;
+}
+
+void TopSubMenuItem::MouseLeave()
+{
+	Refresh();
+}
+
+void TopSubMenuItem::LeftDown(Point, dword)
+{
+	if(isenabled && !menu.IsOpen()) {
+		Pull();
+		Refresh();
+	}
+}
+
+void TopSubMenuItem::SyncState()
+{
+	int q = GetState();
+	if(q != state) {
+		state = q;
+		Refresh();
+	}
+}
+
+// ----------------------------------------------------
+
+int  TopMenuItem::GetState()
+{
+	if(!IsEnabled()) return NORMAL;
+	if(HasMouse() && GetMouseLeft() || GetMouseRight()) return PUSH;
+	if(HasFocus() || HasMouse()) return HIGHLIGHT;
+	return NORMAL;
+}
+
+void TopMenuItem::Paint(Draw& w)
+{
+	PaintTopItem(w, state = GetState());
+}
+
+void TopMenuItem::MouseEnter(Point, dword)
+{
+	Refresh();
+}
+
+void TopMenuItem::MouseLeave()
+{
+	Refresh();
+}
+
+void TopMenuItem::LeftUp(Point, dword)
+{
+	if(!isenabled) return;
+	WhenAction();
+	Refresh();
+}
+
+void TopMenuItem::LeftDown(Point, dword)
+{
+	Refresh();
+}
+
+void TopMenuItem::GotFocus()
+{
+	Refresh();
+}
+
+void TopMenuItem::LostFocus()
+{
+	Refresh();
+}
+
+bool TopMenuItem::Key(dword key, int count)
+{
+	if(isenabled && key == K_ENTER) {
+		WhenAction();
+		return true;
+	}
+	return false;
+}
+
+Size TopMenuItem::GetMinSize() const
+{
+	return AddFrameSize(GetTextSize(text, StdFont()) + Size(12, 7));
+}
+
+int TopMenuItem::GetStdHeight(Font font)
+{
+	return font.Info().GetHeight() + 7;
+}
+
+void TopMenuItem::SyncState()
+{
+	if(state != GetState()) {
+		state = GetState();
+		Refresh();
+	}
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/CtrlLib/MultiButton.cpp b/uppsrc/CtrlLib/MultiButton.cpp
new file mode 100644
index 000000000..e4dcffca2
--- /dev/null
+++ b/uppsrc/CtrlLib/MultiButton.cpp
@@ -0,0 +1,654 @@
+#include "CtrlLib.h"
+
+NAMESPACE_UPP
+
+CH_STYLE(MultiButton, Style, StyleDefault)
+{
+	for(int i = 0; i < 4; i++) {
+		simple[i] = left[i] = right[i] = lmiddle[i] = rmiddle[i]
+			= Button::StyleEdge().look[i];
+		monocolor[i] = Button::StyleEdge().monocolor[i];
+		look[i] = trivial[i] = ChLookWith(simple[i], CtrlsImg::DA(), monocolor[i]);
+		edge[i] = EditFieldEdge();
+	}
+	activeedge = false;
+	trivialborder = 1;
+	border = 1;
+	pressoffset = Button::StyleEdge().pressoffset;
+	sep1 = SColorHighlight();
+	sep2 = SColorLight();
+	sepm = 2;
+	stdwidth = FrameButtonWidth();
+	trivialsep = false;
+	margin = Rect(2, 2, 2, 2);
+	usetrivial = false;
+	overpaint = loff = roff = 0;
+}
+
+CH_STYLE(MultiButton, Style, StyleFrame)
+{
+	Assign(MultiButton::StyleDefault());
+}
+
+MultiButton::SubButton::SubButton()
+{
+	cx = Null;
+	left = false;
+	monoimg = false;
+	enabled = true;
+	main = false;
+}
+
+void MultiButton::SubButton::Refresh()
+{
+	owner->Refresh();
+	if(owner->Frame() && owner->GetParent())
+		owner->GetParent()->RefreshLayout();
+}
+
+MultiButton::SubButton& MultiButton::SubButton::SetImage(const Image& m)
+{
+	img = m;
+	monoimg = false;
+	Refresh();
+	return *this;
+}
+
+MultiButton::SubButton& MultiButton::SubButton::SetMonoImage(const Image& m)
+{
+	img = m;
+	monoimg = true;
+	Refresh();
+	return *this;
+}
+
+MultiButton::SubButton& MultiButton::SubButton::SetStdImage()
+{
+	img = Null;
+	monoimg = true;
+	Refresh();
+	return *this;
+}
+
+MultiButton::SubButton& MultiButton::SubButton::Left(bool b)
+{
+	left = b;
+	Refresh();
+	return *this;
+}
+
+MultiButton::SubButton& MultiButton::SubButton::Width(int w)
+{
+	cx = w;
+	Refresh();
+	return *this;
+}
+
+MultiButton::SubButton& MultiButton::SubButton::Enable(bool b)
+{
+	enabled = b;
+	Refresh();
+	return *this;
+}
+
+MultiButton::SubButton& MultiButton::AddButton()
+{
+	SubButton& b = button.Add();
+	b.owner = this;
+	return b;
+}
+
+MultiButton::SubButton& MultiButton::InsertButton(int i)
+{
+	SubButton& b = button.Insert(i);
+	b.owner = this;
+	return b;
+}
+
+MultiButton::SubButton& MultiButton::SubButton::Main(bool b)
+{
+	if(b)
+		for(int i = 0; i < owner->button.GetCount(); i++)
+			owner->button[i].main = false;
+	main = b;
+	return *this;
+}
+
+Size MultiButton::GetMinSize() const
+{
+	return Size(4, StdFont().Info().GetHeight() + 6);
+}
+
+void MultiButton::GotFocus()
+{
+	Refresh();
+}
+
+void MultiButton::LostFocus()
+{
+	Refresh();
+}
+
+static CtrlFrame& sNullFrame()
+{
+	static NullFrameClass f;
+	return f;
+}
+
+int MultiButton::OverPaint() const
+{
+	return style->overpaint;
+}
+
+bool MultiButton::Frame()
+{
+	return false;
+}
+
+bool MultiButton::ComplexFrame()
+{
+	return Frame() ? GetParent() && &GetParent()->GetFrame() != &sNullFrame()
+	                 : &GetFrame() != &sNullFrame();
+}
+
+bool MultiButton::Metrics(int& border, int& lx, int &rx, const Rect& r)
+{
+	border = IsTrivial() ? style->trivialborder : style->border;
+	lx = r.left;
+	rx = r.right;
+	if(ComplexFrame()) {
+		border = 0;
+		return false;
+	}
+	if(!IsNull(style->edge[0])) {
+		lx += border;
+		rx -= border;
+		return true;
+	}
+	border = 0;
+	return false;
+}
+
+bool MultiButton::Metrics(int& border, int& lx, int &rx)
+{
+	return Metrics(border, lx, rx, GetSize());
+}
+
+int MultiButton::FindButton(int px)
+{
+	if(IsReadOnly())
+		return Null;
+	if(IsTrivial() && !Frame())
+		return button[0].enabled ? 0 : Null;
+	int border, lx, rx;
+	Metrics(border, lx, rx);
+	for(int i = 0; i < button.GetCount(); i++) {
+		SubButton& b = button[i];
+		int bcx = Nvl(b.cx, style->stdwidth);
+		if(b.left) {
+			lx += bcx;
+			if(px < lx)
+				return b.enabled ? i : Null;
+		}
+		else {
+			rx -= bcx;
+			if(px >= rx)
+				return b.enabled ? i : Null;
+		}
+	}
+	if(WhenPush || WhenClick)
+		return MAIN;
+	if(display)
+		for(int i = 0; i < button.GetCount(); i++)
+			if(button[i].main)
+				return i;
+	return Null;
+}
+
+void MultiButton::GetPos(int ii, int& x, int& cx)
+{
+	int border, lx, rx;
+	Metrics(border, lx, rx);
+	for(int i = 0; i <= ii; i++) {
+		SubButton& b = button[i];
+		cx = Nvl(b.cx, style->stdwidth);
+		if(b.left) {
+			x = lx;
+			lx += cx;
+		}
+		else {
+			rx -= cx;
+			x = rx;
+		}
+	}
+}
+
+int MultiButton::ChState(int i)
+{
+	if(i == MAIN && Frame() && style->activeedge) {
+		int q = 0;
+		Ctrl *p = GetParent();
+		if(p)
+			q = !p->IsEnabled() || !IsEnabled() || i >= 0 && !button[i].enabled ? CTRL_DISABLED
+			    : p->HasFocus() || push ? CTRL_PRESSED
+			    : p->HasMouse() || hl >= 0 ? CTRL_HOT
+			    : CTRL_NORMAL;
+		return q;
+	}
+	if(IsTrivial() && !Frame())
+		i = 0;
+	if(!IsEnabled() || i >= 0 && !button[i].enabled)
+		return CTRL_DISABLED;
+	return hl == i ? push ? CTRL_PRESSED
+	                      : CTRL_HOT
+	               : CTRL_NORMAL;
+}
+
+void MultiButton::Lay(Rect& r)
+{
+	int border, lx, rx;
+	bool frm = Metrics(border, lx, rx);
+	bool left = false;
+	bool right = false;
+	for(int i = 0; i < button.GetCount(); i++) {
+		const SubButton& b = button[i];
+		int cx = Nvl(b.cx, style->stdwidth);
+		int x;
+		if(b.left) {
+			x = lx;
+			lx += cx;
+		}
+		else {
+			rx -= cx;
+			x = rx;
+		}
+		(b.left ? left : right) = true;
+	}
+	if(ComplexFrame()) {
+		r.right = r.left + rx;
+		r.left += lx;
+	}
+	else
+	if(frm) {
+		Rect m = style->margin;
+		r = Rect(r.left + max(lx, m.left), r.top + m.top, min(rx, r.right - m.right), r.bottom - m.bottom);
+	}
+	else {
+		Rect m = style->margin;
+		r = Rect(r.left + max(lx, m.left), r.top + m.top, min(rx, r.right - m.right), r.bottom - m.bottom);
+		if(!IsTrivial() || style->trivialsep) {
+			if(left)
+				r.left++;
+			if(right)
+				r.right--;
+		}
+	}
+	if(!IsNull(valuecy)) {
+		r.top += (r.GetHeight() - valuecy) / 2;
+		r.bottom = r.top + valuecy;
+	}
+}
+
+void MultiButton::Paint(Draw& w)
+{
+	Size sz = GetSize();
+	int border, lx, rx;
+	bool frm = Metrics(border, lx, rx);
+	int mst = ChState(MAIN);
+	if(frm)
+		ChPaint(w, sz, style->edge[style->activeedge ? mst : 0]);
+	bool left = false;
+	bool right = false;
+	for(int i = 0; i < button.GetCount(); i++) {
+		SubButton& b = button[i];
+		int st = ChState(i);
+		int cx = Nvl(b.cx, style->stdwidth);
+		int x;
+		if(b.left) {
+			x = lx;
+			lx += cx;
+		}
+		else {
+			rx -= cx;
+			x = rx;
+		}
+		bool paintimg = true;
+		Value v = b.left ? left ? style->lmiddle[st] : style->left[st]
+		                 : right ? style->rmiddle[st] : style->right[st];
+		if(ComplexFrame())
+			ChPaint(w, x, border, cx, sz.cy - 2 * border, style->simple[st]);
+		else
+		if(frm) {
+			if(IsTrivial() && style->usetrivial)
+				paintimg = false;
+			ChPaint(w, x, border, cx, sz.cy - 2 * border,
+			        paintimg ? v : style->trivial[st]);
+		}
+		else {
+			w.Clip(x, 0, cx, sz.cy);
+			ChPaint(w, sz, style->look[Frame() ? mst : st/* == CTRL_DISABLED ? CTRL_NORMAL : st*/]);
+			if(IsNull(v) || !Frame()) {
+				if((!IsTrivial() || style->trivialsep) && IsEnabled()) {
+					if(b.left) {
+						if(left)
+							ChPaint(w, x, style->sepm, 1, sz.cy - 2 * style->sepm, style->sep1);
+						ChPaint(w, x + cx - 1, style->sepm, 1, sz.cy - 2 * style->sepm, style->sep2);
+					}
+					else {
+						ChPaint(w, x, style->sepm, 1, sz.cy - 2 * style->sepm, style->sep1);
+						if(right)
+							ChPaint(w, x + cx - 1, style->sepm, 1, sz.cy - 2 * style->sepm, style->sep2);
+					}
+				}
+			}
+			else
+				ChPaint(w, x, 0, cx, sz.cy, v);
+			w.End();
+		}
+		if(paintimg) {
+			Image m = Nvl(b.img, CtrlsImg::DA());
+			Size isz = m.GetSize();
+			Point p = (st == CTRL_PRESSED) * style->pressoffset;
+			p.x += x + (cx - isz.cx) / 2;
+			p.y += (sz.cy - isz.cy) / 2;
+			if(b.left) {
+				if(!left) p.x += style->loff;
+			}
+			else
+				if(!right) p.x += style->roff;
+			if(b.monoimg || IsNull(b.img))
+				w.DrawImage(p.x, p.y, m, style->monocolor[st]);
+			else
+				w.DrawImage(p.x, p.y, m);
+		}
+		(b.left ? left : right) = true;
+	}
+	Rect r, cr;
+	Color text = SColorText();
+	Color paper = Null;
+	if(ComplexFrame()) {
+		cr = GetSize();
+		cr.left = lx;
+		cr.right = rx;
+		r = cr;
+		paper = HasFocus() ? SColorHighlight() : SColorPaper();
+		if(HasFocus())
+			text = SColorHighlightText();
+		w.DrawRect(r, paper);
+	}
+	else
+	if(frm) {
+		Rect m = style->margin;
+		r = Rect(max(lx, m.left), m.top, min(rx, sz.cx - m.right), sz.cy - m.bottom);
+		Color paper;
+		if(mst == CTRL_HOT && !IsTrivial())
+			paper = Blend(SColorHighlight, SColorPaper, 235);
+		else
+		if(mst == CTRL_PRESSED && !IsTrivial())
+			paper = Blend(SColorHighlight, SColorFace, 235);
+		else
+		if(HasFocus()) {
+			paper = SColorHighlight();
+			text = SColorHighlightText();
+		}
+		else
+			paper = SColorPaper();
+		w.DrawRect(r, paper);
+		cr = r;
+	}
+	else {
+		w.Clip(lx, 0, rx - lx, sz.cy);
+		ChPaint(w, sz, style->look[mst]);
+		Rect m = style->margin;
+		r = Rect(max(lx, m.left), m.top, min(rx, sz.cx - m.right), sz.cy - m.bottom);
+		if(!IsTrivial() || style->trivialsep) {
+			if(left) {
+				r.left++;
+				if(IsEnabled())
+					ChPaint(w, lx, style->sepm, 1, sz.cy - 2 * style->sepm, style->sep1);
+			}
+			if(right) {
+				if(IsEnabled())
+					ChPaint(w, rx - 1, style->sepm, 1, sz.cy - 2 * style->sepm, style->sep2);
+				r.right--;
+			}
+		}
+		w.End();
+		cr = r;
+	}
+	cr.left++;
+	Rect clr = cr;
+	if(!IsNull(valuecy)) {
+		cr.top += (cr.GetHeight() - valuecy + 1) / 2;
+		cr.bottom = cr.top + valuecy;
+	}
+	Value v = convert->Format(value);
+	bool f = HasFocus() && !push && frm;
+	if(cr.left < cr.right && display) {
+		w.Clip(clr);
+		display->Paint(w, cr, v,
+		               IsShowEnabled() ? text : SColorDisabled,
+		               paper, f ? Display::CURSOR : Display::FOCUS|Display::CURSOR);
+		w.End();
+	}
+	if(!frm && HasFocus())
+		DrawFocus(w, r);
+}
+
+void MultiButton::MouseMove(Point p, dword flags)
+{
+	int h = FindButton(p.x);
+	if(hl != h) {
+		hl = h;
+		Ctrl::Tip(hl >= 0 ? Nvl(button[hl].tip, tip) : tip);
+		Refresh();
+	}
+	bool b = flags & K_MOUSELEFT;
+	if(b != push) {
+		push = b;
+		Refresh();
+	}
+}
+
+void MultiButton::LeftDown(Point p, dword flags)
+{
+	push = true;
+	Refresh();
+	if(IsNull(hl))
+		pushrect = Null;
+	else {
+		if(hl == MAIN)
+			pushrect = GetScreenRect();
+		else {
+			int x, cx;
+			int border = IsTrivial() ? style->trivialborder : style->border;
+			GetPos(hl, x, cx);
+			pushrect = RectC(x, border, cx, GetSize().cy - 2 * border)
+			           .Offseted(GetScreenView().TopLeft());
+		}
+		Sync();
+		if(hl >= 0)
+			button[hl].WhenPush();
+		else
+			WhenPush();
+	}
+}
+
+void MultiButton::LeftUp(Point p, dword flags)
+{
+	push = false;
+	Refresh();
+	Sync();
+	if(!IsNull(hl))
+		if(hl >= 0)
+			button[hl].WhenClick();
+		else
+			WhenClick();
+}
+
+void MultiButton::MouseLeave()
+{
+	hl = Null;
+	Refresh();
+}
+
+void MultiButton::CancelMode()
+{
+	hl = Null;
+	push = false;
+	Refresh();
+}
+
+bool MultiButton::IsTrivial() const
+{
+	return button.GetCount() == 1 && IsNull(button[0].img) && !WhenPush && !WhenClick;
+}
+
+MultiButton::SubButton& MultiButton::MainButton()
+{
+	for(int i = 0; i < button.GetCount(); i++)
+		if(button[i].main)
+			return button[i];
+	NEVER();
+	return button[0];
+}
+
+void MultiButton::Reset()
+{
+	button.Clear();
+}
+
+MultiButton& MultiButton::SetDisplay(const Display& d)
+{
+	if(display != &d) {
+		display = &d;
+		Refresh();
+	}
+	return *this;
+}
+
+MultiButton& MultiButton::NoDisplay()
+{
+	if(display) {
+		display = NULL;
+		Refresh();
+	}
+	return *this;
+}
+
+MultiButton& MultiButton::SetConvert(const Convert& c)
+{
+	if(convert != &c) {
+		convert = &c;
+		Refresh();
+	}
+	return *this;
+}
+
+MultiButton& MultiButton::Set(const Value& v)
+{
+	if(value != v) {
+		value = v;
+		Refresh();
+	}
+	return *this;
+}
+
+MultiButton& MultiButton::SetValueCy(int cy)
+{
+	if(cy != valuecy) {
+		valuecy = cy;
+		Refresh();
+		if(Frame() && GetParent())
+			GetParent()->RefreshLayout();
+	}
+	return *this;
+}
+
+void MultiButton::SetData(const Value& v)
+{
+	if(value != v) {
+		value = v;
+		UpdateRefresh();
+	}
+}
+
+Value MultiButton::GetData() const
+{
+	return value;
+}
+
+void MultiButton::PseudoPush(int bi)
+{
+	hl = bi;
+	push = true;
+	button[bi].WhenPush();
+	Sync();
+	Sleep(50);
+	button[bi].WhenClick();
+	hl = Null;
+	push = false;
+	Sync();
+}
+
+void MultiButton::PseudoPush()
+{
+	hl = MAIN;
+	WhenPush();
+	Sync();
+	Sleep(50);
+	WhenClick();
+	hl = Null;
+	push = false;
+	Sync();
+}
+
+MultiButton::MultiButton()
+{
+	Transparent();
+	SetStyle(StyleDefault());
+	display = &StdDisplay();
+	convert = &NoConvert();
+	valuecy = Null;
+	push = false;
+	SetFrame(sNullFrame());
+}
+
+void MultiButtonFrame::FrameAdd(Ctrl& parent)
+{
+	parent.Add(*this);
+	NoWantFocus();
+}
+
+void MultiButtonFrame::FrameRemove()
+{
+	Remove();
+	SetWantFocus();
+}
+
+void MultiButtonFrame::FrameLayout(Rect& r)
+{
+	SetFrameRect(r);
+	Lay(r);
+}
+
+void MultiButtonFrame::FrameAddSize(Size& sz)
+{
+	Rect r(0, 0, 100, 100);
+	Lay(r);
+	sz.cx += r.left + 100 - r.right;
+	sz.cy += r.top + 100 - r.bottom;
+}
+
+bool MultiButtonFrame::Frame()
+{
+	return true;
+}
+
+void MultiButtonFrame::AddTo(Ctrl& w)
+{
+	w.SetFrame(sNullFrame());
+	w.AddFrame(*this);
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/CtrlLib/MultiButton.h b/uppsrc/CtrlLib/MultiButton.h
new file mode 100644
index 000000000..6017bfc6f
--- /dev/null
+++ b/uppsrc/CtrlLib/MultiButton.h
@@ -0,0 +1,159 @@
+#ifndef _CtrlLib_MultiButton_h_
+#define _CtrlLib_MultiButton_h_
+
+class MultiButton : public Ctrl {
+public:
+	virtual void  Paint(Draw& w);
+	virtual void  MouseMove(Point p, dword flags);
+	virtual void  LeftDown(Point p, dword flags);
+	virtual void  LeftUp(Point p, dword flags);
+	virtual void  MouseLeave();
+	virtual void  CancelMode();
+	virtual void  GotFocus();
+	virtual void  LostFocus();
+	virtual void  SetData(const Value& data);
+	virtual Value GetData() const;
+	virtual Size  GetMinSize() const;
+	virtual int   OverPaint() const;
+
+public:
+	struct Style : public ChStyle<Style> {
+		Value edge[4];
+		bool  activeedge;
+		Value look[4];
+		Value left[4];
+		Value lmiddle[4];
+		Value right[4];
+		Value rmiddle[4];
+		Value simple[4];
+		int   border;
+		Value trivial[4];
+		int   trivialborder;
+		Color monocolor[4];
+		Point pressoffset;
+		Value sep1, sep2;
+		int   sepm;
+		int   stdwidth;
+		bool  trivialsep;
+		bool  usetrivial;
+		Rect  margin;
+		int   overpaint;
+		int   loff, roff;
+	};
+
+	class SubButton {
+		friend class MultiButton;
+
+		String       tip;
+		MultiButton *owner;
+		Image        img;
+		int          cx;
+		bool         main;
+		bool         left;
+		bool         monoimg;
+		bool         enabled;
+
+		void Refresh();
+
+	public:
+		Callback WhenPush;
+		Callback WhenClick;
+
+		SubButton& SetImage(const Image& m);
+		SubButton& SetMonoImage(const Image& m);
+		SubButton& SetStdImage();
+		SubButton& Left(bool b = true);
+		SubButton& Width(int w);
+		SubButton& Enable(bool b);
+		SubButton& Tip(const char *s)                     { tip = s; return *this; }
+		SubButton& Main(bool b = true);
+
+		Callback operator<<=(Callback cb)                 { WhenPush = cb; return cb; }
+
+		SubButton();
+	};
+
+private:
+	enum { MAIN = -1 };
+
+	virtual bool Frame();
+
+	const Display   *display;
+	const Convert   *convert;
+	Value            value;
+	int              valuecy;
+	bool             push;
+	String           tip;
+	Rect             pushrect;
+
+	Array<SubButton> button;
+	int              hl;
+
+	const Style *style;
+
+	int  FindButton(int px);
+	void Margins(int& l, int& r);
+	Rect ContentRect();
+	void GetPos(int ii, int& x, int& cx);
+	int  ChState(int i);
+	void Lay(Rect& r);
+	bool ComplexFrame();
+	bool Metrics(int& border, int& lx, int &rx, const Rect& r);
+	bool Metrics(int& border, int& lx, int &rx);
+
+	friend class SubButton;
+	friend class MultiButtonFrame;
+
+public:
+	Callback WhenPush;
+	Callback WhenClick;
+
+	static const Style& StyleDefault();
+	static const Style& StyleFrame();
+
+	bool IsTrivial() const;
+
+	void Reset();
+
+	void PseudoPush(int bi);
+	void PseudoPush();
+
+	SubButton& AddButton();
+	SubButton& InsertButton(int i);
+	int        GetButtonCount() const                { return button.GetCount(); }
+	SubButton& GetButton(int i)                      { return button[i]; }
+	SubButton& MainButton();
+
+	Rect  GetPushScreenRect() const                  { return pushrect; }
+
+	const Display& GetDisplay() const                { return *display; }
+	const Convert& GetConvert() const                { return *convert; }
+	const Value&   Get() const                       { return value; }
+
+	MultiButton& SetDisplay(const Display& d);
+	MultiButton& NoDisplay();
+	MultiButton& SetConvert(const Convert& c);
+	MultiButton& SetValueCy(int cy);
+	MultiButton& Set(const Value& v);
+	MultiButton& Tip(const char *s)                  { tip = s; return *this; }
+
+	MultiButton& SetStyle(const Style& s)            { style = &s; Refresh(); return *this; }
+
+	MultiButton();
+};
+
+class MultiButtonFrame : public MultiButton, public CtrlFrame {
+public:
+	virtual void  FrameLayout(Rect& r);
+	virtual void  FrameAddSize(Size& sz);
+	virtual void  FrameAdd(Ctrl& parent);
+	virtual void  FrameRemove();
+
+private:
+	virtual bool Frame();
+
+public:
+	void AddTo(Ctrl& w);
+};
+
+#endif
diff --git a/uppsrc/CtrlLib/Normal.upt b/uppsrc/CtrlLib/Normal.upt
new file mode 100644
index 000000000..89c23527b
--- /dev/null
+++ b/uppsrc/CtrlLib/Normal.upt
@@ -0,0 +1,33 @@
+template "Basic CtrlLib application" main;
+
+option "Create header" header;
+option "Multithreaded" mt;
+
+@@<:PACKAGE:>.h
+??header
+#ifndef _<:PACKAGE:>_<:PACKAGE:>_h
+#define _<:PACKAGE:>_<:PACKAGE:>_h
+
+#include <CtrlLib/CtrlLib.h>
+
+using namespace Upp;
+
+#endif
+
+@@main.cpp
+#include <:?header:>"<:PACKAGE:>.h"<:/:><CtrlLib/CtrlLib.h><:.:>
+
+GUI_APP_MAIN
+{
+}
+
+@@<:PACKAGE:>.upp
+uses
+	CtrlLib;
+
+file
+	<:?header:>"<:PACKAGE:>.h",<:.:>
+	"main.cpp";
+
+mainconfig
+	"" = <:?mt:>"GUI MT"<:/:>"GUI"<:.:>;
diff --git a/uppsrc/CtrlLib/PopupTable.cpp b/uppsrc/CtrlLib/PopupTable.cpp
new file mode 100644
index 000000000..db25eb262
--- /dev/null
+++ b/uppsrc/CtrlLib/PopupTable.cpp
@@ -0,0 +1,136 @@
+#include "CtrlLib.h"
+
+NAMESPACE_UPP
+
+CH_VALUE(DropEdge, ChBorder(BlackBorder()));
+
+CtrlFrame& DropFrame()
+{
+	static LookFrame m(DropEdge);
+	return m;
+}
+
+void PopUpTable::CancelMode() {
+	if(open) {
+		DoClose();
+		WhenCancel();
+	}
+	ArrayCtrl::CancelMode();
+}
+
+void PopUpTable::DoClose() {
+	open = false;
+	Close();
+}
+
+void PopUpTable::Deactivate() {
+	if(open) {
+		DoClose();
+		IgnoreMouseClick();
+		WhenCancel();
+	}
+}
+
+void PopUpTable::LeftUp(Point p, dword keyflags) {
+	ArrayCtrl::LeftUp(p, keyflags);
+	DoClose();
+	WhenSelect();
+}
+
+bool PopUpTable::Key(dword key, int n) {
+	switch(key) {
+	case K_ENTER:
+	case K_ALT_DOWN:
+		DoClose();
+		WhenSelect();
+		return true;
+	case K_ESCAPE:
+		DoClose();
+		WhenCancel();
+		return true;
+	case K_UP:
+		if(!IsCursor()) {
+			SetCursor(GetCount() - 1);
+			return true;
+		}
+		break;
+	case K_DOWN:
+		if(!IsCursor()) {
+			SetCursor(0);
+			return true;
+		}
+		break;
+	}
+	return ArrayCtrl::Key(key, n);
+}
+
+void PopUpTable::PopUp(Ctrl *owner, int x, int top, int bottom, int width) {
+	DoClose();
+	int h = AddFrameSize(width, min(droplines * GetLineCy(), GetTotalCy())).cy;
+	Rect rt = RectC(x, bottom, width, h);
+	Rect area = Ctrl::GetWorkArea();
+	bool up = false;
+	if(rt.bottom > area.bottom) {
+		up = true;
+		rt.top = top - h;
+		rt.bottom = rt.top + h;
+	}
+	open = false;
+	Ctrl popup;
+	if(GUI_PopUpEffect()) {
+		if(up) {
+			popup.SetRect(Rect(rt.left, rt.bottom - 1, rt.right, rt.bottom));
+			popup.Add(TopPos(0, rt.Height()).LeftPos(0, rt.Width()));
+		}
+		else {
+			popup.SetRect(Rect(rt.left, rt.top, rt.right, rt.top + 1));
+			popup.Add(BottomPos(0, rt.Height()).LeftPos(0, rt.Width()));
+		}
+		CenterCursor();
+		popup.PopUp(owner, true, true, GUI_DropShadows());
+		SetFocus();
+		Ctrl::ProcessEvents();
+		Animate(popup, rt, GUIEFFECT_SLIDE);
+		Ctrl::Remove();
+	}
+	CenterCursor();
+	SetRect(rt);
+	Ctrl::PopUp(owner, true, true, GUI_DropShadows());
+	SetFocus();
+	open = true;
+}
+
+void PopUpTable::PopUp(Ctrl *owner, int width)
+{
+	Rect r = owner->GetScreenRect();
+	r.right = r.left + width;
+	PopUp(owner, r.left, r.top, r.bottom, width);
+}
+
+void PopUpTable::PopUp(Ctrl *owner)
+{
+	Rect r = owner->GetScreenRect();
+	PopUp(owner, r.left, r.top, r.bottom, r.Width());
+}
+
+void PopUpTable::Normal()
+{
+	AddColumn().Accel();
+	NoHeader();
+	HeaderTab(0).SetMargin(0);
+	MouseMoveCursor();
+	NoGrid();
+	AutoHideSb();
+	SetLineCy(Draw::GetStdFontCy());
+	NoPopUpEx();
+}
+
+PopUpTable::PopUpTable() {
+	SetFrame(DropFrame());
+	droplines = 16;
+	open = false;
+}
+
+PopUpTable::~PopUpTable() {}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/CtrlLib/PrinterJob.cpp b/uppsrc/CtrlLib/PrinterJob.cpp
new file mode 100644
index 000000000..2ca21557f
--- /dev/null
+++ b/uppsrc/CtrlLib/PrinterJob.cpp
@@ -0,0 +1,370 @@
+#include "CtrlLib.h"
+
+#ifdef PLATFORM_WIN32
+#ifndef PLATFORM_WINCE
+
+#include <commdlg.h>
+#pragma  comment(lib, "comdlg32.lib")
+
+#endif
+#else
+
+#include <PdfDraw/PdfDraw.h>
+
+#endif
+
+NAMESPACE_UPP
+
+#ifdef PLATFORM_WIN32
+
+#ifndef PLATFORM_WINCE
+
+#include <commdlg.h>
+#pragma  comment(lib, "comdlg32.lib")
+
+struct Win32PrintDlg_ : PRINTDLG {
+	Win32PrintDlg_() {
+		memset(this, 0, sizeof(PRINTDLG));
+		lStructSize = sizeof(PRINTDLG);
+	}
+	~Win32PrintDlg_() {
+		if(hDevMode)
+			::GlobalFree(hDevMode);
+		if(hDevNames)
+			::GlobalFree(hDevNames);
+	}
+};
+
+PrinterJob::PrinterJob(const char *_name)
+{
+	name = _name;
+	landscape = false;
+	from = to = 1;
+	current = 1;
+}
+
+PrinterJob::~PrinterJob()
+{
+}
+
+bool PrinterJob::Execute0(bool dodlg)
+{
+	pdlg = new Win32PrintDlg_;
+	PRINTDLG& dlg = *pdlg;
+	dlg.Flags = PD_DISABLEPRINTTOFILE|PD_NOSELECTION|PD_HIDEPRINTTOFILE|PD_RETURNDEFAULT;
+	dlg.nFromPage = current;
+	dlg.nToPage = current;
+	dlg.nMinPage = from;
+	dlg.nMaxPage = to;
+	if(from != to)
+		dlg.Flags |= PD_ALLPAGES;
+	dlg.hwndOwner = GetActiveWindow();
+	dlg.Flags |= PD_RETURNDEFAULT;
+	dlg.nCopies = 1;
+	if(!PrintDlg(&dlg)) return false;
+	if(dlg.hDevMode) {
+		DEVMODE *pDevMode = (DEVMODE*)::GlobalLock(dlg.hDevMode);
+		pDevMode->dmOrientation = landscape ? DMORIENT_LANDSCAPE : DMORIENT_PORTRAIT;
+		::GlobalUnlock(dlg.hDevMode);
+	}
+	HDC hdc;
+	if(dodlg) {
+		dlg.Flags = PD_DISABLEPRINTTOFILE|PD_NOSELECTION|PD_HIDEPRINTTOFILE|PD_RETURNDC;
+		Vector< Ptr<Ctrl> > disabled = DisableCtrls(Ctrl::GetTopCtrls());
+		bool b = PrintDlg(&dlg);
+		EnableCtrls(disabled);
+		if(!b) return false;
+		hdc = dlg.hDC;
+	}
+	else {
+		DEVNAMES *p = (DEVNAMES *)::GlobalLock(dlg.hDevNames);
+		const char *driver = (const char *)p + p->wDriverOffset;
+		const char *device = (const char *)p + p->wDeviceOffset;
+		if(dlg.hDevMode) {
+			DEVMODE *pDevMode = (DEVMODE*)::GlobalLock(dlg.hDevMode);
+			hdc = CreateDC(driver, device, NULL, pDevMode);
+			::GlobalUnlock(dlg.hDevMode);
+		}
+		else
+			hdc = CreateDC(driver, device, NULL, NULL);
+	}
+	if(dlg.hDevMode)
+		::GlobalFree(dlg.hDevMode);
+	if(dlg.hDevNames)
+		::GlobalFree(dlg.hDevNames);
+	if(hdc) {
+		draw = new PrintDraw(hdc, Nvl(name, Ctrl::GetAppName()));
+		page.Clear();
+		if(!(dlg.Flags & PD_PAGENUMS)) {
+			dlg.nFromPage = dlg.nMinPage;
+			dlg.nToPage = dlg.nMaxPage;
+		}
+		for(int c = 0; c < ((dlg.Flags & PD_COLLATE) ? dlg.nCopies : 1); c++)
+			for(int i = dlg.nFromPage - 1; i <= dlg.nToPage - 1; i++)
+				for(int c = 0; c < ((dlg.Flags & PD_COLLATE) ? 1 : dlg.nCopies); c++)
+					page.Add(i);
+		return true;
+	}
+	return false;
+}
+
+bool PrinterJob::Execute()
+{
+	return Execute0(true);
+}
+
+Draw& PrinterJob::GetDraw()
+{
+	if(!draw) {
+		Execute0(false);
+		if(!draw)
+			draw = new NilDraw;
+	}
+	return *draw;
+}
+
+PrinterJob& PrinterJob::MinMaxPage(int minpage, int maxpage)
+{
+	from = minpage + 1;
+	to = maxpage + 1;
+	return *this;
+}
+
+PrinterJob& PrinterJob::CurrentPage(int i)
+{
+	current = i + 1;
+	return *this;
+}
+
+#endif
+
+#endif
+
+#ifdef PLATFORM_POSIX
+
+String System(const char *cmd, const String& in)
+{
+	String ofn = GetTempFileName();
+	String ifn = GetTempFileName();
+	SaveFile(ifn, in);
+	String c = cmd;
+	c << " >" << ofn;
+	if(in.GetCount())
+		c << " <" << ifn;
+	system(c);
+	String q = LoadFile(ofn);
+	return q;
+}
+
+String System(const char *cmd)
+{
+	return System(cmd, Null);
+}
+
+struct PrinterDlg : WithPrinterLayout<TopWindow> {
+	void FillOpt(const String& s, const char *id, DropList& dl);
+	void SyncPrinterOptions();
+
+	typedef PrinterDlg CLASSNAME;
+
+	PrinterDlg();
+};
+
+void PrinterDlg::FillOpt(const String& s, const char *id, DropList& dl)
+{
+	int a = s.Find('/');
+	int b = s.Find(':');
+	if(a > 0 && b > a) {
+		String opt = ToLower(s.Mid(0, a));
+		if(opt == id) {
+			Vector<String> v = Split(~s + b + 1, ' ');
+			dl.Enable();
+			for(int i = 0; i < v.GetCount(); i++) {
+				String o = v[i];
+				if(o[0] == '*') {
+					o = o.Mid(1);
+					dl <<= o;
+				}
+				dl.Add(o);
+			}
+		}
+	}
+}
+
+void PrinterDlg::SyncPrinterOptions()
+{
+	Vector<String> l = Split(System("lpoptions -l -d " + String(~printer)), '\n');
+	paper.Disable();
+	paper.Clear();
+	slot.Disable();
+	slot.Clear();
+	for(int i = 0; i < l.GetCount(); i++) {
+		FillOpt(l[i], "pagesize", paper);
+		FillOpt(l[i], "inputslot", slot);
+	}
+}
+
+PrinterDlg::PrinterDlg()
+{
+	CtrlLayoutOKCancel(*this, "Print");
+	printer <<= THISBACK(SyncPrinterOptions);
+	npage.Add(1);
+	npage.Add(2);
+	npage.Add(4);
+	npage.Add(6);
+	npage.Add(9);
+	npage.Add(16);
+	npage <<= 1;
+	copies <<= 1;
+	landscape <<= 0;
+	range <<= 0;
+	Vector<String> l = Split(System("lpstat -a"), '\n');
+	for(int i = 0; i < l.GetCount(); i++) {
+		Vector<String> w = Split(l[i], ' ');
+		if(w.GetCount())
+			printer.Add(w[0]);
+	}
+	String h = System("lpstat -d");
+	int q = h.Find(':');
+	if(q >= 0) {
+		String p = h.Mid(q + 1);
+		if(printer.HasKey(p)) {
+			printer <<= p;
+			SyncPrinterOptions();
+			return;
+		}
+	}
+	if(printer.GetCount()) {
+		printer.SetIndex(0);
+		SyncPrinterOptions();
+	}
+}
+
+PrinterJob::PrinterJob(const char *_name)
+{
+	name = _name;
+	from = to = 1;
+	current = 1;
+}
+
+PrinterJob::~PrinterJob()
+{
+}
+
+bool PrinterJob::Execute0(bool dodlg)
+{
+	struct {
+		const char *name;
+		int   cx, cy;
+	}
+	pg[] = {
+		{ "A0", 841, 1189 },
+		{ "A1", 594, 841 },
+		{ "A2", 420, 594 },
+		{ "A3", 297, 420 },
+		{ "A4", 210, 297 },
+		{ "A5", 148, 210 },
+		{ "A6", 105, 148 },
+		{ "A7", 74, 105 },
+		{ "A8", 52, 74 },
+		{ "A9", 37, 52 },
+		{ "B0", 1030, 1456 },
+		{ "B1", 728, 1030 },
+		{ "B10", 32, 45 },
+		{ "B2", 515, 728 },
+		{ "B3", 364, 515 },
+		{ "B4", 257, 364 },
+		{ "B5", 182, 257 },
+		{ "B6", 128, 182 },
+		{ "B7", 91, 128 },
+		{ "B8", 64, 91 },
+		{ "B9", 45, 64 },
+		{ "C5E", 163, 229 },
+		{ "Comm10E", 105, 241 },
+		{ "DLE", 110, 220 },
+		{ "Executive", 191, 254 },
+		{ "Folio", 210, 330 },
+		{ "Ledger", 432, 279 },
+		{ "Legal", 216, 356 },
+		{ "Letter", 216, 279 },
+		{ "Tabloid", 279, 432 }
+	};
+
+	PrinterDlg dlg;
+	dlg.from <<= from + 1;
+	dlg.to <<= to + 1;
+	dlg.from.Min(from + 1).Max(to + 1);
+	dlg.to.Min(from + 1).Max(to + 1);
+	if(dodlg)
+		if(dlg.Run() != IDOK)
+			return false;
+	options.Clear();
+	options << " -d " << ~dlg.printer;
+	options << " -o media=" << ~dlg.paper << "," << ~dlg.slot;
+	if(dlg.landscape)
+		options << " -o landscape";
+	options << " -o number-up=" << ~dlg.npage;
+	options << " -n " << ~dlg.copies;
+	if(dlg.collate)
+		options << " -o Collate=True";
+	page.Clear();
+	switch(dlg.range) {
+	case 0:
+		for(int i = from; i <= to; i++)
+			page.Add(i);
+		break;
+	case 1:
+		page.Add(current);
+		break;
+	case 2:
+		for(int i = (int)~dlg.from - 1; i <= (int)~dlg.to - 1; i++)
+			page.Add(i);
+		break;
+	}
+	pgsz = Size(5100, 6600);
+	for(int i = 0; i < __countof(pg); i++)
+		if((String)~dlg.paper == pg[i].name) {
+			pgsz.cx = 6000 * pg[i].cx / 254;
+			pgsz.cy = 6000 * pg[i].cy / 254;
+		}
+	return true;
+}
+
+bool PrinterJob::Execute()
+{
+	return Execute0(true);
+}
+
+struct PrinterDraw : PdfDraw {
+	String options;
+
+	PrinterDraw(Size sz) : PdfDraw(sz) {}
+	~PrinterDraw() {
+		System("lp " + options + " -", Finish());
+	}
+};
+
+Draw& PrinterJob::GetDraw()
+{
+	PrinterDraw *pd = new PrinterDraw(pgsz);
+	pd->options = options;
+	draw = pd;
+	return *pd;
+}
+
+PrinterJob& PrinterJob::MinMaxPage(int minpage, int maxpage)
+{
+	from = minpage;
+	to = maxpage;
+	return *this;
+}
+
+PrinterJob& PrinterJob::CurrentPage(int i)
+{
+	current = i;
+	return *this;
+}
+
+#endif
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/CtrlLib/Progress.cpp b/uppsrc/CtrlLib/Progress.cpp
new file mode 100644
index 000000000..19feffb7b
--- /dev/null
+++ b/uppsrc/CtrlLib/Progress.cpp
@@ -0,0 +1,275 @@
+#include "CtrlLib.h"
+
+NAMESPACE_UPP
+
+CH_STYLE(ProgressIndicator, Style, StyleDefault)
+{
+	classic = GUI_GlobalStyle() == GUISTYLE_CLASSIC;
+	hlook = CtrlsImg::PI();
+	hchunk = CtrlsImg::PIC();
+	vlook = CtrlsImg::VPI();
+	vchunk = CtrlsImg::VPIC();
+	bound = false;
+}
+
+Size ProgressIndicator::GetMsz()
+{
+	Size sz = GetSize();
+	Rect mg = ChMargins(style->classic || percent || !IsNull(color) ? EditFieldEdge()
+	                    : sz.cx > sz.cy ? style->hlook : style->vlook);
+	sz.cx -= mg.left + mg.right;
+	sz.cy -= mg.top + mg.bottom;
+	return sz;
+}
+
+void ProgressIndicator::Paint(Draw& w) {
+	Size sz = GetSize();
+	Size msz = GetMsz();
+	int p0 = 0;
+	int p = pxp;
+	if(total <= 0) {
+		int l = max(msz.cx, msz.cy) & ~7;
+		p0 = pxp - l / 4;
+		p = min(p - p0, max(msz.cx, msz.cy) - p0);
+		if(style->bound && p0 < 0) {
+			p += p0;
+			p0 = 0;
+		}
+	}
+	if(style->classic || percent || !IsNull(color)) {
+		ChPaintEdge(w, sz, EditFieldEdge());
+		Rect mg = ChMargins(EditFieldEdge());
+		sz -= Size(mg.left + mg.right, mg.top + mg.bottom);
+		Rect r1, r2, r3;
+		r1 = r2 = r3 = RectC(mg.left, mg.top, sz.cx, sz.cy);
+		w.Clip(r1);
+		if(sz.cx > sz.cy) {
+			r1.right = r2.left = min(p, sz.cx) + mg.left + p0;
+			r3.right = mg.left + p0;
+			r3.bottom = r1.bottom;
+		}
+		else {
+			r2.bottom = r1.top = sz.cy - min(p, sz.cy) + mg.left + p0;
+			r3.bottom = mg.top + p0;
+			r3.right = r1.right;
+		}
+		w.DrawRect(r1, Nvl(color, SColorHighlight()));
+		w.DrawRect(r2, SColorPaper);
+		w.DrawRect(r3, SColorPaper);
+		if(percent) {
+			String pt = Format("%d %%", 100 * actual / max(total, 1));
+			Size psz = GetTextSize(pt, StdFont());
+			int px = (sz.cx - psz.cx) / 2 + 2;
+			int py = (sz.cy - psz.cy) / 2 + 2;
+			w.Clip(r1);
+			w.DrawText(px, py, pt, StdFont(), SColorLight);
+			w.End();
+			w.Clip(r2);
+			w.DrawText(px, py, pt, StdFont(), SColorText);
+			w.End();
+		}
+		w.End();
+	}
+	else {
+		if(sz.cy > sz.cx) {
+			ChPaint(w, sz, style->vlook);
+			Rect r = ChMargins(style->vlook);
+			w.Clip(r.left, r.top, sz.cx - r.left - r.right, sz.cy - r.top - r.bottom);
+			ChPaint(w, r.left, sz.cy - r.bottom - p - p0, sz.cx - r.left - r.right, p,
+			        style->vchunk);
+		}
+		else {
+			ChPaint(w, sz, style->hlook);
+			Rect r = ChMargins(style->hlook);
+			w.Clip(r.left, r.top, sz.cx - r.left - r.right, sz.cy - r.top - r.bottom);
+			ChPaint(w, r.left + p0, r.top, p, sz.cy - r.top - r.bottom, style->hchunk);
+		}
+		w.End();
+	}
+}
+
+void ProgressIndicator::Layout() {
+	Set(actual, total);
+}
+
+void ProgressIndicator::Set(int _actual, int _total) {
+	actual = _actual;
+	total = _total;
+	Size sz = GetMsz();
+	int p;
+	if(total <= 0) {
+		int l = max(1, max(sz.cx, sz.cy) & ~7);
+		int p = GetTickCount() / 15 % (l + l / 4);
+		if(pxp != p) {
+			pxp = p;
+			Refresh();
+		}
+		return;
+	}
+	else {
+		int l = max(1, max(sz.cx, sz.cy));
+		p = total ? min(actual * l / total, l) : 0;
+	}
+	if(p != pxp) {
+		pxp = p;
+		Refresh();
+	}
+}
+
+ProgressIndicator::ProgressIndicator() {
+	style = &StyleDefault();
+	Transparent();
+	NoWantFocus();
+	total = actual = 0;
+	percent = false;
+	color = Null;
+	pxp = 0;
+}
+
+ProgressIndicator::~ProgressIndicator() {}
+
+void Progress::Reset() {
+	pos = 0;
+	total = 0;
+	cancel = false;
+	granularity = 50;
+	set_time = show_time = GetTickCount(); // + 300;
+}
+
+void Progress::Init() {
+	CtrlLayout(*this, t_("Working..."));
+	stop <<= callback(this, &Progress::Cancel);
+	info.SetAlign(ALIGN_CENTER);
+	owner = NULL;
+	Reset();
+}
+
+Progress::Progress() {
+	Init();
+}
+
+Progress::Progress(Ctrl *owner) {
+	Init();
+	SetOwner(owner);
+}
+
+Progress::Progress(const char *s, int total) {
+	Init();
+	text = s;
+	SetTotal(total);
+}
+
+Progress::Progress(Ctrl *owner, const char *s, int total) {
+	Init();
+	text = s;
+	SetTotal(total);
+	SetOwner(owner);
+}
+
+Progress::~Progress() {}
+
+void Progress::Create() {
+	if(IsOpen() || cancel) return;
+	stop.Hide();
+	if(owner)
+		Open(owner);
+	else
+		Open();
+	SetFocus();
+	Show();
+	modality.Begin(this);
+	if(total) Set(pos, total);
+	Setxt();
+	Sync();
+	Process();
+}
+
+void Progress::Process()
+{
+	if(!IsOpen()) {
+		dword t = GetTickCount();
+		if((int)(t - show_time) >= granularity) {
+			Create();
+			show_time = t;
+		}
+	}
+	GuiSleep(0);
+	ProcessEvents();
+}
+
+void Progress::Setxt()
+{
+	info = Format(text, pos);
+	Process();
+}
+
+void Progress::Set(int apos, int atotal) {
+	pos = apos;
+	total = atotal;
+	dword t = GetTickCount();
+	if((int)(t - set_time) < granularity)
+		return;
+	set_time = t;
+	while(atotal > 30000) {
+		atotal >>= 8;
+		apos >>= 8;
+	}
+	pi.Set(apos, atotal);
+	Setxt();
+	Sync();
+	Process();
+}
+
+void Progress::SetTotal(int atotal) {
+	Set(pos, atotal);
+}
+
+void Progress::SetPos(int apos) {
+	Set(apos, total);
+}
+
+void Progress::Step(int n)
+{
+	Set(pos + n, total);
+}
+
+void Progress::Close()
+{
+	modality.End();
+	TopWindow::Close();
+}
+
+void Progress::Cancel() {
+	cancel = true;
+	Close();
+}
+
+bool Progress::Canceled()
+{
+	stop.Show();
+	Process();
+	return cancel;
+}
+
+bool Progress::SetCanceled(int pos, int total)
+{
+	stop.Show();
+	Set(pos, total);
+	return cancel;
+}
+
+bool Progress::SetPosCanceled(int pos)
+{
+	stop.Show();
+	SetPos(pos);
+	return cancel;
+}
+
+bool Progress::StepCanceled(int n)
+{
+	stop.Show();
+	Step(n);
+	return cancel;
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/CtrlLib/Progress.h b/uppsrc/CtrlLib/Progress.h
new file mode 100644
index 000000000..2729fd66b
--- /dev/null
+++ b/uppsrc/CtrlLib/Progress.h
@@ -0,0 +1,99 @@
+class ProgressIndicator : public Ctrl {
+public:
+	virtual void   Paint(Draw& draw);
+	virtual void   Layout();
+
+public:
+	struct Style : ChStyle<Style> {
+		bool  classic;
+		bool  bound;
+		Value vlook, vchunk, hlook, hchunk;
+	};
+
+protected:
+	int   total, actual;
+	int   pxp;
+	bool  percent:1;
+	const Style *style;
+	Color color;
+
+	Size GetMsz();
+
+public:
+	void  Set(int actual, int total);
+	void  Set(int _actual)                      { Set(_actual, total); }
+
+	void  operator=(int i)                      { Set(i); }
+	int   operator++()                          { Set(actual + 1); return actual; }
+	int   operator++(int)                       { int i = actual; Set(actual + 1); return i; }
+	int   operator+=(int i)                     { Set(actual + i); return actual; }
+
+	operator int()                              { return actual; }
+
+	static const Style& StyleDefault();
+
+	ProgressIndicator& SetTotal(int _total)     { Set(actual, _total); return *this; }
+	ProgressIndicator& Percent(bool b = true)   { percent = b; Refresh(); return *this; }
+	ProgressIndicator& NoPercent()              { return Percent(false); }
+	ProgressIndicator& SetColor(Color c)        { color = c; Refresh(); return *this; }
+	ProgressIndicator& SetStyle(const Style& s) { style = &s; Refresh(); return *this; }
+
+	ProgressIndicator();
+	virtual ~ProgressIndicator();
+};
+
+class Progress : public WithProgressLayout<TopWindow> {
+public:
+	ProgressIndicator pi;
+	virtual void Close();
+
+protected:
+	bool     cancel;
+	int      total;
+	int      pos;
+	String   text;
+	int      granularity;
+	dword    set_time;
+	dword    show_time;
+	Ctrl    *owner;
+	Modality modality;
+
+	void     Setxt();
+	void     Init();
+	void     Process();
+
+public:
+	void     SetOwner(Ctrl *_owner)        { owner = _owner; }
+
+	void     Create();
+	void     Cancel();
+
+	void     Set(int pos, int total);
+	void     SetPos(int pos);
+	void     SetText(const char *s)        { text = s; Setxt(); Sync(); }
+	void     SetText(const String& s)      { text = s; Setxt(); Sync(); }
+	void     SetTotal(int total);
+	void     Step(int steps = 1);
+	int      GetPos() const                { return pos; }
+	int      GetTotal() const              { return total; }
+	String   GetText() const               { return text; }
+
+	bool     Canceled();
+	bool     SetCanceled(int pos, int total);
+	bool     SetPosCanceled(int pos);
+	bool     StepCanceled(int steps = 1);
+
+	void     Reset();
+
+	void     Granularity(int ms)           { granularity = ms; }
+
+	void     AlignText(int align)          { info.SetAlign(align); }
+
+	operator Gate2<int, int>()             { return callback(this, &Progress::SetCanceled); }
+
+	Progress();
+	Progress(Ctrl *_owner);
+	Progress(const char *txt, int total = 0);
+	Progress(Ctrl *_owner, const char *txt, int total = 0);
+	virtual ~Progress();
+};
diff --git a/uppsrc/CtrlLib/Prompt.cpp b/uppsrc/CtrlLib/Prompt.cpp
new file mode 100644
index 000000000..c9044ac6c
--- /dev/null
+++ b/uppsrc/CtrlLib/Prompt.cpp
@@ -0,0 +1,202 @@
+#include "CtrlLib.h"
+
+NAMESPACE_UPP
+
+struct PromptDlgWnd__ : TopWindow {
+	bool    esc;
+	Button *b;
+
+	virtual bool HotKey(dword key) {
+		if(TopWindow::HotKey(key))
+			return true;
+		if(IsAlpha(key))
+			return TopWindow::HotKey(K_ALT_A + ToUpper((int)key) - 'A');
+		if(key == K_ESCAPE && esc)
+			b->PseudoPush();
+		return false;
+	}
+};
+
+static void sAdd(Ctrl& dlg, int fcy, int bcy, int& bx, int bcx, int gap, Button& b, const char *button, const Image& img)
+{
+	if(button) {
+		dlg << b.BottomPos(fcy, bcy).LeftPos(bx, bcx);
+		b.SetLabel(button);
+		if(!IsNull(img))
+			b.SetImage(img);
+		bx += gap + bcx;
+	}
+}
+
+int Prompt(Callback1<const String&> WhenLink,
+           const char *title, const Image& iconbmp, const char *qtf, bool okcancel,
+           const char *button1, const char *button2, const char *button3,
+		   int cx,
+		   Image im1, Image im2, Image im3)
+{
+	int fcy = Draw::GetStdFontCy();
+	PromptDlgWnd__ dlg;
+	RichTextCtrl qtfctrl;
+	Icon         icon;
+	qtfctrl.WhenLink = WhenLink;
+	icon.SetImage(iconbmp);
+	Button b1, b2, b3;
+	qtfctrl.SetQTF(String("[G1 ") + qtf, GetRichTextStdScreenZoom());
+	int bcy = Ctrl::VertLayoutZoom(24);
+	int bcx = Ctrl::HorzLayoutZoom(72);
+	if(button1)
+		bcx = max(2 * fcy + GetTextSize(button1, Draw::GetStdFont()).cx, bcx);
+	if(button2)
+		bcx = max(2 * fcy + GetTextSize(button2, Draw::GetStdFont()).cx, bcx);
+	if(button3)
+		bcx = max(2 * fcy + GetTextSize(button3, Draw::GetStdFont()).cx, bcx);
+	Size bsz = icon.GetStdSize();
+	if(cx == 0) {
+		cx = qtfctrl.GetWidth();
+		if(!cx)
+			cx = 350;
+		cx += 2 * fcy;
+		if(bsz.cx)
+			cx += bsz.cx + fcy;
+	}
+	int nbtn = !!button1 + !!button2 + !!button3;
+	dlg.esc = okcancel && nbtn == 1;
+	cx = min(550, max(nbtn * bcx + (1 + nbtn) * fcy, cx));
+	int qcx = cx - 2 * fcy;
+	if(bsz.cx)
+		qcx -= bsz.cx + fcy;
+	int ccy = qtfctrl.GetHeight(qcx);
+	int qcy = min(400, ccy);
+	if(qcy <= ccy) {
+		qcx += ScrollBarSize() + fcy;
+		cx += ScrollBarSize() + fcy;
+	}
+	int mcy = max(qcy, bsz.cy);
+	int cy = mcy + 48 * fcy / 10;
+	dlg.SetRect(Size(cx, cy));
+	dlg << icon.TopPos(fcy, bsz.cy).LeftPos(fcy, bsz.cx);
+	dlg << qtfctrl.TopPos(fcy + (mcy - qcy) / 2, qcy).RightPos(fcy, qcx);
+	if(okcancel) {
+		b1.Ok();
+		if(nbtn == 2)
+			b2.Cancel();
+		if(nbtn == 3)
+			b3.Cancel();
+	}
+	b1.WhenAction = dlg.Breaker(1);
+	b2.WhenAction = dlg.Breaker(0);
+	b3.WhenAction = dlg.Breaker(-1);
+	dlg.b = &b1;
+	int bx = bcx;
+	int gap = fcy / 2;
+	fcy = 8 * fcy / 10;
+	if(button2)
+		bx += gap + bcx;
+	if(button3)
+		bx += gap + bcx;
+	bx = (cx - bx) / 2;
+	if(SwapOKCancel()) {
+		sAdd(dlg, fcy, bcy, bx, bcx, gap, b2, button2, im2);
+		sAdd(dlg, fcy, bcy, bx, bcx, gap, b3, button3, im1);
+		sAdd(dlg, fcy, bcy, bx, bcx, gap, b1, button1, im3);
+	}
+	else {
+		sAdd(dlg, fcy, bcy, bx, bcx, gap, b1, button1, im1);
+		sAdd(dlg, fcy, bcy, bx, bcx, gap, b2, button2, im2);
+		sAdd(dlg, fcy, bcy, bx, bcx, gap, b3, button3, im3);
+	}
+	dlg.WhenClose = dlg.Breaker(button3 ? -1 : 0);
+	dlg.Open();
+	dlg.Title(title);
+	return dlg.RunAppModal();
+}
+
+int Prompt(Callback1<const String&> WhenLink,
+           const char *title, const Image& icon, const char *qtf, bool okcancel,
+           const char *button1, const char *button2, const char *button3,
+		   int cx)
+{
+	return Prompt(WhenLink, title, icon, qtf, okcancel, button1, button2, button3, cx, Null, Null, Null);
+}
+
+int Prompt(const char *title, const Image& icon, const char *qtf, bool okcancel,
+           const char *button1, const char *button2, const char *button3,
+		   int cx)
+{
+	return Prompt(callback(LaunchWebBrowser), title,
+	              icon, qtf, okcancel, button1, button2, button3, cx, Null, Null, Null);
+}
+
+int Prompt(const char *title, const Image& icon, const char *qtf,
+           const char *button1, const char *button2, const char *button3,
+		   int cx)
+{
+	return Prompt(title, icon, qtf, true, button1, button2, button3, cx);
+}
+
+void PromptOK(const char *qtf) {
+	BeepInformation();
+	Prompt(Ctrl::GetAppName(), CtrlImg::information(), qtf, t_("OK"));
+}
+
+void Exclamation(const char *qtf) {
+	BeepExclamation();
+	Prompt(Ctrl::GetAppName(), CtrlImg::exclamation(), qtf, t_("OK"));
+}
+
+void ShowExc(const Exc& exc) {
+	BeepExclamation();
+	Prompt(Ctrl::GetAppName(), CtrlImg::exclamation(), DeQtf(exc), t_("OK"));
+}
+
+int PromptOKCancel(const char *qtf) {
+	BeepQuestion();
+	return Prompt(Ctrl::GetAppName(), CtrlImg::question(), qtf, t_("OK"), t_("Cancel"));
+}
+
+CH_IMAGE(YesButtonImage, Null);
+CH_IMAGE(NoButtonImage, Null);
+CH_IMAGE(AbortButtonImage, Null);
+CH_IMAGE(RetryButtonImage, Null);
+
+int PromptYesNo(const char *qtf) {
+	BeepQuestion();
+	return Prompt(callback(LaunchWebBrowser),
+	              Ctrl::GetAppName(), CtrlImg::question(), qtf, false,
+	              t_("&Yes"), t_("&No"), NULL, 0,
+	              YesButtonImage(), NoButtonImage(), Null);
+}
+
+int PromptYesNoCancel(const char *qtf) {
+	BeepQuestion();
+	return Prompt(callback(LaunchWebBrowser),
+	              Ctrl::GetAppName(), CtrlImg::question(), qtf, true,
+	              t_("&Yes"), t_("&No"), t_("Cancel"), 0,
+	              YesButtonImage(), NoButtonImage(), Null);
+}
+
+int PromptAbortRetry(const char *qtf) {
+	BeepExclamation();
+	return Prompt(callback(LaunchWebBrowser),
+	              Ctrl::GetAppName(), CtrlImg::exclamation(), qtf, false,
+	              t_("&Abort"), t_("&Retry"), NULL, 0,
+	              AbortButtonImage(), RetryButtonImage(), Null);
+}
+
+int PromptRetryCancel(const char *qtf) {
+	BeepExclamation();
+	return Prompt(callback(LaunchWebBrowser),
+	              Ctrl::GetAppName(), CtrlImg::exclamation(), qtf, true,
+	              t_("&Retry"), t_("Cancel"), NULL, 0,
+	              RetryButtonImage(), Null, Null);
+}
+
+int PromptAbortRetryIgnore(const char *qtf) {
+	BeepExclamation();
+	return Prompt(callback(LaunchWebBrowser),
+	              Ctrl::GetAppName(), CtrlImg::exclamation(), qtf, false,
+	              t_("&Abort"), t_("&Retry"), t_("&Ignore"), 0,
+	              AbortButtonImage(), RetryButtonImage(), Null);
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/CtrlLib/PushCtrl.h b/uppsrc/CtrlLib/PushCtrl.h
new file mode 100644
index 000000000..8fdca3a92
--- /dev/null
+++ b/uppsrc/CtrlLib/PushCtrl.h
@@ -0,0 +1,338 @@
+class Pusher : public Ctrl {
+public:
+	virtual void   CancelMode();
+	virtual void   LeftDown(Point, dword);
+	virtual void   MouseMove(Point, dword);
+	virtual void   MouseLeave();
+	virtual void   LeftRepeat(Point, dword);
+	virtual void   LeftUp(Point, dword);
+	virtual void   GotFocus();
+	virtual void   LostFocus();
+	virtual void   State(int);
+	virtual String GetDesc();
+	virtual bool   Key(dword key, int);
+	virtual bool   HotKey(dword key);
+	virtual dword  GetAccessKeys() const;
+	virtual void   AssignAccessKeys(dword used);
+
+private:
+	bool    push:1;
+	bool    keypush:1;
+
+	void    EndPush();
+
+protected:
+	byte    accesskey;
+	String  label;
+	Font    font;
+
+	void    KeyPush();
+	bool    IsPush() const                                  { return push || keypush; }
+	bool    IsKeyPush()                                     { return keypush; }
+	bool    FinishPush();
+
+protected:
+	virtual void  RefreshPush();
+	virtual void  RefreshFocus();
+	virtual void  PerformAction();
+
+public:
+	Pusher&  SetFont(Font fnt);
+	Pusher&  SetLabel(const char *text);
+
+	void     PseudoPush();
+
+	int GetVisualState() const;
+
+	Callback WhenPush;
+	Callback WhenRepeat;
+
+	Pusher();
+	virtual ~Pusher();
+};
+
+
+class Button : public Pusher {
+public:
+	virtual void   Paint(Draw& draw);
+	virtual bool   Key(dword key, int);
+	virtual bool   HotKey(dword key);
+	virtual void   MouseEnter(Point, dword);
+	virtual void   MouseLeave();
+	virtual dword  GetAccessKeys() const;
+	virtual void   AssignAccessKeys(dword used);
+	virtual void   Layout();
+	virtual void   GotFocus();
+	virtual void   LostFocus();
+	virtual int    OverPaint() const;
+
+public:
+	struct Style : ChStyle<Style> {
+		Value look[4];
+		Color monocolor[4], textcolor[4];
+		Point pressoffset;
+		int   focusmargin;
+		int   overpaint;
+		Font  font;
+		Image ok, cancel, exit;
+		bool  transparent;
+	};
+
+protected:
+	enum { NORMAL, OK, CANCEL, EXIT };
+	const Style *style;
+	Image   img;
+	bool    monoimg;
+	byte    type;
+
+	void  RefreshOK(Ctrl *p);
+	const Style *St() const;
+
+public:
+	Button&  SetImage(const Image& img);
+	Button&  SetMonoImage(const Image& img);
+
+	static const Style& StyleNormal();
+	static const Style& StyleOk();
+	static const Style& StyleEdge();
+	static const Style& StyleLeftEdge();
+	static const Style& StyleScroll();
+
+	Button&  SetStyle(const Style& s);
+	Button&  AutoStyle();
+
+	Button&  NormalStyle()                        { return SetStyle(StyleNormal()); }
+	Button&  EdgeStyle()                          { return SetStyle(StyleEdge()); }
+	Button&  LeftEdgeStyle()                      { return SetStyle(StyleLeftEdge()); }
+	Button&  ScrollStyle()                        { return SetStyle(StyleScroll()); }
+
+	Button&  Ok();
+	Button&  Cancel();
+	Button&  Exit();
+	Button&  Normal()                             { type = NORMAL; Refresh(); return *this; }
+
+	Button();
+	virtual ~Button();
+};
+
+Color ButtonMonoColor(int i);
+
+class SpinButtons : public CtrlFrame {
+public:
+	virtual void FrameLayout(Rect& r);
+	virtual void FrameAddSize(Size& sz);
+	virtual void FrameAdd(Ctrl& ctrl);
+	virtual void FrameRemove();
+
+public:
+	struct Style : ChStyle<Style> {
+		Button::Style inc;
+		Button::Style dec;
+		int           width;
+	};
+
+private:
+	bool         visible;
+	const Style *style;
+
+public:
+	Button inc;
+	Button dec;
+
+	void         Show(bool s = true);
+
+	static const Style& StyleDefault();
+
+	SpinButtons& SetStyle(const Style& s);
+
+	SpinButtons();
+	virtual ~SpinButtons();
+};
+
+class Option : public Pusher {
+public:
+	virtual void   Paint(Draw& draw);
+	virtual Size   GetMinSize() const;
+	virtual void   SetData(const Value& data);
+	virtual Value  GetData() const;
+	virtual void   MouseEnter(Point, dword);
+	virtual void   MouseLeave();
+
+protected:
+	virtual void  RefreshPush();
+	virtual void  RefreshFocus();
+	virtual void  PerformAction();
+
+protected:
+	Image  edge, edged;
+	int    option;
+	bool   switchimage;
+	bool   threestate;
+	bool   notnull;
+	bool   blackedge;
+
+public:
+	void   Set(int b);
+	int    Get() const                            { return option; }
+
+	operator int() const                          { return option; }
+	void operator=(int b)                         { Set(b); }
+
+	Option& BlackEdge(bool b = true)              { blackedge = b; Refresh(); return *this; }
+	Option& SwitchImage(bool b = true)            { switchimage = b; Refresh(); return *this; }
+	Option& ThreeState(bool b = true)             { threestate = b; notnull = false; return *this; }
+	Option& NotNull(bool nn = true)               { notnull = nn; Refresh(); return *this; }
+	Option& NoNotNull()                           { return NotNull(false); }
+
+	Option();
+	virtual ~Option();
+};
+
+class ButtonOption : public Ctrl {
+public:
+	virtual void  Paint(Draw& w);
+	virtual void  LeftDown(Point, dword);
+	virtual void  LeftUp(Point, dword);
+	virtual void  MouseMove(Point, dword);
+	virtual void  MouseEnter(Point, dword);
+	virtual void  MouseLeave();
+	virtual void  SetData(const Value& v);
+	virtual Value GetData() const;
+	virtual void  Serialize(Stream& s);
+
+public:
+	struct Style : ChStyle<Style> {
+		Value look[4];
+	};
+
+private:
+	Image        image;
+	Image        image1;
+	const Style *style;
+	bool         option;
+	bool         push;
+
+public:
+	ButtonOption&  SetImage(const Image& img)                 { image = img; Refresh(); return *this; }
+	ButtonOption&  SetImage(const Image& m, const Image& m1)  { image = m; image1 = m1; Refresh(); return *this; }
+	void operator=(const Image& img)                          { SetImage(img); }
+
+	void Set(bool b)                                          { option = b; UpdateRefresh(); }
+	bool Get() const                                          { return option; }
+
+	void operator=(bool b)                                    { Set(b); }
+	operator bool() const                                     { return Get(); }
+
+	ButtonOption& SetStyle(const Style& s)                    { style = &s; Refresh(); return *this; }
+	ButtonOption& AutoStyle()                                 { style = NULL; Refresh(); return *this; }
+
+	ButtonOption();
+};
+
+class Switch : public Ctrl {
+public:
+	virtual void   Paint(Draw& draw);
+	virtual void   CancelMode();
+	virtual void   MouseMove(Point p, dword keyflags);
+	virtual void   LeftDown(Point p, dword keyflags);
+	virtual void   LeftUp(Point p, dword keyflags);
+	virtual void   MouseLeave();
+	virtual bool   Key(dword key, int count);
+	virtual bool   HotKey(dword key);
+	virtual dword  GetAccessKeys() const;
+	virtual void   AssignAccessKeys(dword used);
+	virtual void   SetData(const Value& data);
+	virtual Value  GetData() const;
+	virtual void   GotFocus();
+	virtual void   LostFocus();
+
+public:
+	struct Case : Moveable<Case> {
+		String label;
+		Value  value;
+		int    accesskey;
+		bool   enabled;
+
+		Case()         { accesskey = 0; enabled = true; }
+	};
+
+private:
+	Font         font;
+	Value        value;
+	int          pushindex;
+	Array<Case>  cs;
+	Vector<int>  posx;
+	int          linecy;
+	int          light;
+
+	int   GetIndex() const;
+	int   GetIndex(Point p);
+	bool  DoHot(dword key);
+	void  Updates();
+	void  RefreshCase(int i);
+
+	Rect    GetCaseRect(int i) const;
+	Rect    GetCheckRect(int i) const;
+
+public:
+	Switch& SetLabel(int i, const char *text);
+	Switch& SetLabel(const char *text);
+	String  GetLabel() const                                    { return GetLabel(GetIndex()); }
+	String  GetLabel(int i) const                               { return cs[i].label; }
+	Switch& Set(int i, const Value& val, const char *text);
+	Switch& Set(int i, const Value& val);
+	Switch& Add(const Value& val, const char *text);
+	Switch& Add(const char *text);
+
+	void    EnableCase(int i, bool enable = true);
+	void    DisableCase(int i)                                  { EnableCase(i, false); }
+
+	void    EnableValue(const Value& val, bool enable = true);
+	void    DisableValue(const Value& val)                      { EnableValue(val, false); }
+
+	void  Reset()                                               { cs.Clear(); }
+
+	const Array<Case>& GetCases() const                         { return cs; }
+
+	operator int() const                                        { return GetData(); }
+	void operator=(const Value& v)                              { SetData(v); }
+
+	Switch& SetFont(Font f)                                     { font = f; return *this; }
+	Font    GetFont() const                                     { return font; }
+
+	Switch();
+	virtual ~Switch();
+};
+
+class DataPusher : public Pusher
+{
+public:
+	virtual void   Paint(Draw& draw);
+
+protected:
+	const Convert *convert;
+	const Display *display;
+	Value          data;
+
+protected:
+	virtual void   PerformAction();
+	virtual void   DoAction();
+
+public:
+	Callback       WhenPreAction;
+
+	DataPusher(const Convert& convert = NoConvert(), const Display& display = StdDisplay());
+	DataPusher(const Display& display);
+	virtual ~DataPusher();
+
+	DataPusher&    SetConvert(const Convert& _convert) { convert = &_convert; Refresh(); return *this; }
+	const Convert& GetConvert() const                  { return *convert; }
+
+	DataPusher&    SetDisplay(const Display& _display) { display = &_display; Refresh(); return *this; }
+	const Display& GetDisplay() const                  { return *display; }
+
+	virtual Value  GetData() const;
+	virtual void   SetData(const Value& value);
+
+	void           SetDataAction(const Value& value);
+};
diff --git a/uppsrc/CtrlLib/RichText.h b/uppsrc/CtrlLib/RichText.h
new file mode 100644
index 000000000..d59ce1429
--- /dev/null
+++ b/uppsrc/CtrlLib/RichText.h
@@ -0,0 +1,207 @@
+class RichTextView : public Ctrl {
+public:
+	virtual void  Paint(Draw& w);
+	virtual bool  Key(dword key, int count);
+	virtual void  Layout();
+	virtual Value GetData() const;
+	virtual void  SetData(const Value& v);
+	virtual void  MouseWheel(Point p, int zdelta, dword keyflags);
+	virtual Image CursorImage(Point p, dword keyflags);
+	virtual void  LeftDown(Point p, dword keyflags);
+	virtual void  MouseMove(Point p, dword keyflags);
+	virtual void  LeftRepeat(Point p, dword keyflags);
+	virtual void  RightDown(Point p, dword keyflags);
+
+private:
+	Rect          margin;
+	Color         background;
+	Zoom          zoom;
+	int           cx;
+	ScrollBar     sb;
+	Scroller      scroller;
+	RichText      text;
+	bool          sizetracking;
+	bool          vcenter;
+	bool          hldec;
+	int           highlight;
+	int           sell, selh;
+	int           cursor, anchor;
+
+	void          EndSizeTracking();
+	void          SetSb();
+	void          Scroll();
+	Zoom          GetZoom() const;
+	int           GetPageCx(bool reduced = false) const;
+	int           GetPointPos(Point p) const;
+	String        GetLink(int pos, Point p) const;
+	Rect          GetPage() const;
+	void          RefreshSel();
+	void          RefreshRange(int a, int b);
+
+protected:
+	enum {
+		TIMEID_ENDSIZETRACKING = Ctrl::TIMEID_COUNT,
+		TIMEID_COUNT
+	};
+
+public:
+	Callback1<const String&> WhenLink;
+
+	void            Clear();
+	void            Pick(pick_ RichText& t);
+	void            Pick(pick_ RichText& txt, Zoom z);
+	void            SetQTF(const char *qtf, Zoom z = Zoom(1, 1), bool scolors = false);
+	const RichText& Get() const                               { return text; }
+	String          GetQTF(byte cs = CHARSET_UTF8) const      { return AsQTF(text, cs); }
+
+	int             GetWidth() const                          { return text.GetWidth(); }
+	int             GetHeight(int cx) const                   { return text.GetHeight(Zoom(1, 1), cx); }
+
+	int             GetSb() const                             { return sb; }
+	void            SetSb(int i)                              { sb = i; }
+	int             GetSbTotal() const                        { return sb.GetTotal(); }
+
+	void            GotoLabel(const String& lbl, bool highlight = false);
+	void            ClearHighlight()                          { highlight = Null; Refresh(); }
+
+	int             GetLength() const                         { return text.GetLength(); }
+
+	void            Copy();
+
+	void            ScrollUp()                                { sb.PrevLine(); }
+	void            ScrollDown()                              { sb.NextLine(); }
+	void            ScrollPageUp()                            { sb.PrevPage(); }
+	void            ScrollPageDown()                          { sb.NextPage(); }
+	void            ScrollEnd()                               { sb.End(); }
+	void            ScrollBegin()                             { sb.Begin(); }
+
+	RichTextView&   PageWidth(int cx);
+	RichTextView&   SetZoom(Zoom z);
+	RichTextView&   Background(Color _color);
+	RichTextView&   VCenter(bool b = true);
+	RichTextView&   NoVCenter()                               { return VCenter(false); }
+	RichTextView&   Margins(const Rect& m);
+	RichTextView&   HMargins(int a);
+	RichTextView&   VMargins(int a);
+	RichTextView&   Margins(int a);
+	RichTextView&   NoSb(bool b = true)                       { sb.Hide(); return *this; }
+	RichTextView&   AutoHideSb(bool b = true)                 { sb.AutoHide(b); return *this; }
+	RichTextView&   HyperlinkDecoration(bool b = true)        { hldec = b; Refresh(); return *this; }
+	RichTextView&   NoHyperlinkDecoration()                   { return HyperlinkDecoration(false); }
+
+	void            operator=(const char *qtf)                { SetQTF(qtf); }
+
+	RichTextView&   SetScrollBarStyle(const ScrollBar::Style& s) { sb.SetStyle(s); return *this; }
+
+	typedef RichTextView CLASSNAME;
+
+	RichTextView();
+	virtual ~RichTextView();
+};
+
+class RichTextCtrl : public RichTextView {
+public:
+	virtual void  SetData(const Value& v);
+
+public:
+	void            SetQTF(const char *qtf, Zoom z = GetRichTextStdScreenZoom()) { RichTextView::SetQTF(qtf, z, true); }
+	void            operator=(const char *qtf)                                   { SetQTF(qtf); }
+	RichTextCtrl();
+};
+
+int Prompt(Callback1<const String&> WhenLink,
+           const char *title, const Image& icon, const char *qtf, bool okcancel,
+           const char *button1, const char *button2 = NULL, const char *button3 = NULL,
+		   int cx = 0);
+int Prompt(const char *title, const Image& icon, const char *qtf, bool okcancel,
+           const char *button1, const char *button2 = NULL, const char *button3 = NULL,
+		   int cx = 0);
+int Prompt(const char *title, const Image& icon, const char *qtf,
+           const char *button1, const char *button2 = NULL, const char *button3 = NULL,
+		   int cx = 0);
+
+void PromptOK(const char *qtf);
+int  PromptOKCancel(const char *qtf);
+int  PromptYesNo(const char *qtf);
+int  PromptYesNoCancel(const char *qtf);
+int  PromptRetryCancel(const char *qtf);
+int  PromptAbortRetry(const char *qtf);
+int  PromptAbortRetryIgnore(const char *qtf);
+
+void Exclamation(const char *qtf);
+
+Image YesButtonImage();
+Image NoButtonImage();
+Image AbortButtonImage();
+Image RetryButtonImage();
+
+void YesButtonImage_Write(Image m);
+void NoButtonImage_Write(Image m);
+void AbortButtonImage_Write(Image m);
+void RetryButtonImage_Write(Image m);
+
+void ShowExc(const Exc& exc);
+
+class HelpWindow : public TopWindow {
+public:
+	virtual bool Key(dword key, int);
+
+private:
+	RichTextView   view;
+	TreeCtrl       tree;
+	Splitter       tree_view;
+	ToolBar        toolbar;
+	Zoom           zoom;
+
+	struct Pos : Moveable<Pos> {
+		String link;
+		int    scy;
+	};
+
+	Vector<Pos>    back;
+	Vector<Pos>    forward;
+	Index<String>  tree_ndx;
+	String         topic;
+	String         label;
+
+	bool GoTo0(const String& link);
+	void Back();
+	void Forward();
+	void FontSize();
+	void Tools(Bar& bar);
+	void TreeCursor();
+	void SetZoom();
+	void Print();
+	Pos  GetPos();
+
+public:
+	virtual Topic AcquireTopic(const String& topic);
+	virtual void  FinishText(RichText& text);
+	virtual void  BarEx(Bar& bar);
+
+	void GoTo(const String& link);
+
+	void SetBar();
+	void Serialize(Stream& s);
+
+	void ClearTree();
+	int  AddTree(int parent, const Image& img, const String& topic, const String& title);
+	void SortTree(int id = 0);
+	void FinishTree();
+	void OpenDeep(int id = 0);
+
+	String GetCurrent() const                     { return topic; }
+	String GetCurrentLabel() const                { return label; }
+
+	typedef HelpWindow CLASSNAME;
+
+	HelpWindow();
+};
+
+#ifndef PLATFORM_PDA
+
+void Print(Draw& w, const RichText& text, const Rect& page, const Vector<int>& pagelist);
+void Print(Draw& w, const RichText& text, const Rect& page);
+bool Print(const RichText& text, const Rect& page, int currentpage, const char *name = NULL);
+
+#endif
diff --git a/uppsrc/CtrlLib/RichTextView.cpp b/uppsrc/CtrlLib/RichTextView.cpp
new file mode 100644
index 000000000..9c8880d9f
--- /dev/null
+++ b/uppsrc/CtrlLib/RichTextView.cpp
@@ -0,0 +1,472 @@
+#include "CtrlLib.h"
+
+NAMESPACE_UPP
+
+#define LLOG(x) // LOG(x)
+
+Rect  RichTextView::GetPage() const
+{
+	return Rect(0, 0, GetPageCx(), INT_MAX);
+}
+
+void  RichTextView::Paint(Draw& w)
+{
+	Size sz = GetSize();
+	w.DrawRect(sz, background);
+	sz.cx -= margin.left + margin.right;
+	sz.cy -= margin.top + margin.bottom;
+	w.Clipoff(margin.left, margin.top, sz.cx, sz.cy);
+	PaintInfo pi;
+	if(!hldec)
+		pi.hyperlink = Null;
+	if(sell < selh) {
+		pi.sell = sell;
+		pi.selh = selh;
+	}
+	pi.indexentry = Null;
+	pi.highlightpara = highlight;
+	pi.zoom = GetZoom();
+	int q = sb * pi.zoom;
+	scroller.Set(q);
+	w.Offset(0, -q);
+	SimplePageDraw pw(w);
+	pi.top = PageY(0, sb);
+	pi.bottom = PageY(0, sb + sz.cy / pi.zoom);
+	pi.usecache = true;
+	pi.sizetracking = sizetracking;
+	int y = 0;
+	if(vcenter && sb.GetTotal() < sb.GetPage()) {
+		PageY py = text.GetHeight(GetPage());
+		y = (sz.cy / zoom  - py.y) / 2;
+	}
+	Color c = SColorPaper();
+	if(Grayscale(c) < 100)
+		pi.coloroverride = true;
+	text.Paint(pw, GetPage(), pi);
+	w.End();
+	w.End();
+}
+
+Zoom  RichTextView::GetZoom() const
+{
+	int szcx = GetSize().cx;
+	if(!sb.IsShown() && sb.IsAutoHide())
+		szcx -= ScrollBarSize();
+	return IsNull(zoom) ? Zoom(szcx - margin.left - margin.right, cx) : zoom;
+}
+
+int   RichTextView::GetPageCx(bool reduced) const
+{
+	int szcx = GetSize().cx;
+	if(reduced && !sb.IsShown() && sb.IsAutoHide())
+		szcx -= ScrollBarSize();
+	return IsNull(zoom) ? cx : (szcx - margin.left - margin.right) / zoom;
+}
+
+void  RichTextView::SetSb()
+{
+	Rect page(0, 0, GetPageCx(true), INT_MAX);
+	PageY py = text.GetHeight(page);
+	sb.SetTotal(py.y);
+	sb.SetPage((GetSize().cy - margin.top - margin.bottom) / GetZoom());
+}
+
+bool  RichTextView::Key(dword key, int count)
+{
+	if(key == K_CTRL_C || key == K_SHIFT_INSERT) {
+		Copy();
+		return true;
+	}
+	return sb.VertKey(key);
+}
+
+void  RichTextView::MouseWheel(Point p, int zdelta, dword keyflags)
+{
+	sb.Wheel(zdelta);
+}
+
+Image RichTextView::CursorImage(Point p, dword keyflags)
+{
+	int pos = GetPointPos(p);
+	if(WhenLink && pos >= 0 && !IsNull(GetLink(pos, p)))
+		return CtrlImg::HandCursor();
+	if(HasCapture())
+		return CtrlImg::ibeam0();
+	return Image::Arrow();
+}
+
+
+void RichTextView::Copy()
+{
+	if(anchor == cursor)
+		WriteClipboardUnicodeText(text.GetPlainText());
+	else {
+		RefreshSel();
+		WriteClipboardUnicodeText(text.Copy(sell, selh - sell).GetPlainText());
+	}
+}
+
+void RichTextView::RightDown(Point p, dword keyflags)
+{
+	MenuBar b;
+	b.Add(CtrlImg::copy(), t_("Copy"), THISBACK(Copy)).Key(K_CTRL_C);
+	b.Execute();
+}
+
+int  RichTextView::GetPointPos(Point p) const
+{
+	Size sz = GetSize();
+	sz.cx -= margin.left + margin.right;
+	sz.cy -= margin.top + margin.bottom;
+	p -= margin.TopLeft();
+	Zoom zoom = GetZoom();
+	p.y += sb * zoom;
+	return text.GetPos(p.x / zoom, PageY(0, p.y / zoom), GetPage());
+}
+
+String RichTextView::GetLink(int pos, Point p) const
+{
+
+	String link;
+	RichObject object = text.GetRichPos(pos).object;
+	if(object) {
+		Rect rc = text.GetCaret(pos, GetPage());
+		link = object.GetLink(p - rc.TopLeft(), rc.Size());
+	}
+
+	if(IsNull(link)) {
+		RichPos richpos = text.GetRichPos(pos);
+		link = Nvl(richpos.fieldformat.link, richpos.format.link);
+	}
+	return link;
+}
+
+void RichTextView::RefreshRange(int a, int b)
+{
+	int l = min(a, b);
+	int h = max(a, b);
+	if(l == h)
+		return;
+	Rect r1 = text.GetCaret(l, GetPage());
+	Rect r2 = text.GetCaret(h, GetPage());
+	Zoom zoom = GetZoom();
+	Refresh(0, zoom * (r1.top - sb), GetSize().cx, zoom * (r2.bottom - sb + zoom.d - 1));
+}
+
+void  RichTextView::RefreshSel()
+{
+	int l = min(cursor, anchor);
+	int h = max(cursor, anchor);
+	if(l != h) {
+		for(;;) {
+			RichPos pl = text.GetRichPos(l);
+			if(!pl.table)
+				break;
+			l -= pl.posintab + 1;
+			if(l < 0)
+				break;
+		}
+		for(;;) {
+			RichPos ph = text.GetRichPos(h);
+			if(!ph.table)
+				break;
+			h += ph.tablen - ph.posintab + 1;
+			if(h >= text.GetLength())
+				break;
+		}
+		if(l < 0)
+			l = 0;
+		if(h >= text.GetLength())
+			h = text.GetLength();
+	}
+	if(sell == l && selh == h || sell == selh && l == h)
+		return;
+	RichPos pl = text.GetRichPos(l);
+	RichPos ph = text.GetRichPos(h);
+	RichPos psell = text.GetRichPos(sell);
+	RichPos pselh = text.GetRichPos(selh);
+	if(psell.parai != pl.parai || pselh.parai != ph.parai)
+		Refresh();
+	else {
+		RefreshRange(l, sell);
+		RefreshRange(h, selh);
+	}
+	sell = l;
+	selh = h;
+}
+
+void  RichTextView::LeftDown(Point p, dword keyflags)
+{
+	int pos = GetPointPos(p);
+	if(pos < 0) {
+		cursor = 0;
+		anchor = 0;
+		return;
+	}
+	String link = GetLink(pos, p);
+	if(!IsNull(link))
+		WhenLink(link);
+	else {
+		cursor = pos;
+		if(!(keyflags & K_SHIFT))
+			anchor = pos;
+		RefreshSel();
+		SetFocus();
+		SetCapture();
+	}
+}
+
+void RichTextView::MouseMove(Point p, dword keyflags)
+{
+	if(HasCapture()) {
+		int pos = GetPointPos(p);
+		if(pos < 0)
+			return;
+		cursor = pos;
+		Rect r1 = text.GetCaret(cursor, GetPage());
+		sb.ScrollInto(r1.top, r1.Height());
+		RefreshSel();
+	}
+}
+
+void RichTextView::LeftRepeat(Point p, dword keyflags)
+{
+	MouseMove(p, keyflags);
+}
+
+void  RichTextView::EndSizeTracking()
+{
+	sizetracking = false;
+	Refresh();
+}
+
+void  RichTextView::Layout()
+{
+	if(IsOpen()) {
+		sizetracking = true;
+		KillTimeCallback(TIMEID_ENDSIZETRACKING);
+		SetTimeCallback(250, THISBACK(EndSizeTracking), TIMEID_ENDSIZETRACKING);
+	}
+	SetSb();
+	Refresh();
+}
+
+Value RichTextView::GetData() const
+{
+	if(text.IsEmpty()) return Value();
+	return GetQTF();
+}
+
+void  RichTextView::SetData(const Value& v)
+{
+	SetQTF(String(v));
+}
+
+void  RichTextView::Scroll()
+{
+	scroller.Scroll(*this, Rect(GetSize()).Deflated(margin), sb * GetZoom());
+}
+
+void RichTextView::GotoLabel(const String& lbl, bool dohighlight)
+{
+	Vector<RichValPos> f = text.GetValPos(GetPage(), RichText::LABELS);
+	highlight = Null;
+	for(int i = 0; i < f.GetCount(); i++) {
+		if(f[i].data == WString(lbl)) {
+			sb = f[i].py.y;
+			if(dohighlight)
+				highlight = f[i].pos;
+			break;
+		}
+	}
+	Refresh();
+}
+
+void  RichTextView::Clear()
+{
+	sb = 0;
+	text.Clear();
+	SetSb();
+	Refresh();
+	anchor = cursor = sell = selh = 0;
+}
+
+void  RichTextView::Pick(pick_ RichText& rt)
+{
+	sb = 0;
+	anchor = cursor = sell = selh = 0;
+	text = rt;
+	SetSb();
+	Refresh();
+	highlight = -1;
+}
+
+void  RichTextView::Pick(pick_ RichText& txt, Zoom z) {
+	if(z.m != z.d)
+		const_cast<RichText&>(txt).ApplyZoom(z);
+	Pick(txt);
+	sb.SetLine(z * 100);
+}
+
+void  RichTextView::SetQTF(const char *qtf, Zoom z, bool scolors)
+{
+	Pick(ParseQTF(qtf, scolors), z);
+}
+
+RichTextView& RichTextView::PageWidth(int _cx)
+{
+	cx = _cx;
+	sb = 0;
+	SetSb();
+	Refresh();
+	return *this;
+}
+
+RichTextView& RichTextView::SetZoom(Zoom z)
+{
+	zoom = z;
+	sb = 0;
+	SetSb();
+	Refresh();
+	return *this;
+}
+
+RichTextView& RichTextView::Background(Color c)
+{
+	background = c;
+	Transparent(IsNull(c));
+	Refresh();
+	return *this;
+}
+
+RichTextView& RichTextView::VCenter(bool b)
+{
+	vcenter = b;
+	return *this;
+}
+
+RichTextView& RichTextView::Margins(const Rect& m)
+{
+	margin = m;
+	Refresh();
+	return *this;
+}
+
+RichTextView& RichTextView::HMargins(int a)
+{
+	margin.left = margin.right = a;
+	Refresh();
+	return *this;
+}
+
+RichTextView& RichTextView::VMargins(int a)
+{
+	margin.top = margin.bottom = a;
+	Refresh();
+	return *this;
+}
+
+RichTextView& RichTextView::Margins(int a)
+{
+	margin.Set(a, a, a, a);
+	Refresh();
+	return *this;
+}
+
+void LinkInRichTextClipboard__();
+
+RichTextView::RichTextView()
+{
+	cx = 3968;
+	sizetracking = false;
+	sb.SetLine(100);
+	sb.WhenScroll = THISBACK(Scroll);
+	zoom = Null;
+	background = SColorPaper;
+	vcenter = false;
+	margin = Rect(0, 0, 0, 0);
+	highlight = -1;
+	hldec = true;
+	WhenLink = callback(LaunchWebBrowser);
+	anchor = cursor = sell = selh = 0;
+	SetFrame(ViewFrame());
+	AddFrame(sb);
+	NoWantFocus();
+}
+
+RichTextView::~RichTextView() {}
+
+void RichTextCtrl::SetData(const Value& v)
+{
+	SetQTF(String(v));
+}
+
+RichTextCtrl::RichTextCtrl()
+{
+	SetZoom(Zoom(1, 1));
+	Transparent();
+	Background(Null);
+	SetFrame(NullFrame());
+	AutoHideSb();
+}
+
+#ifndef PLATFORM_PDA
+
+void Print(Draw& w, const RichText& text, const Rect& page, const Vector<int>& pg)
+{
+	LLOG("Print");
+	int lpage = text.GetHeight(page).page;
+	PrintPageDraw pw(w);
+	Size sz = w.GetPageMMs();
+	Size pgsz = page.Size();
+	int x = (6000 * sz.cx / 254 - pgsz.cx) / 2;
+	int y = (6000 * sz.cy / 254 - pgsz.cy) / 2;
+	for(int pi = 0; pi < pg.GetCount(); pi++) {
+		int i = pg[pi];
+		w.StartPage();
+		w.Offset(x, y);
+		pw.SetPage(i);
+		PaintInfo paintinfo;
+		paintinfo.top = PageY(i, 0);
+		paintinfo.bottom = PageY(i + 1, 0);
+		paintinfo.indexentry = Null;
+		if(text.IsPrintNoLinks())
+			paintinfo.hyperlink = Null;
+		text.Paint(pw, page, paintinfo);
+		w.End();
+		String footer = text.GetFooter();
+		if(!IsNull(footer) && lpage) {
+			String n = Format(footer, i + 1, lpage + 1);
+			Size nsz = GetTextSize(n, Arial(90).Italic());
+			pw.Page(i).DrawText(
+				x + pgsz.cx - nsz.cx, y + pgsz.cy + 100,
+				n, Arial(90).Italic());
+		}
+		w.EndPage();
+	}
+}
+
+void Print(Draw& w, const RichText& text, const Rect& page)
+{
+	int n = text.GetHeight(page).page;
+	Vector<int> pg;
+	for(int i = 0; i <= n; i++)
+		pg.Add(i);
+	Print(w, text, page, pg);
+}
+
+bool Print(const RichText& text, const Rect& page, int currentpage, const char *name)
+{
+	PrinterJob pj(name);
+	pj.CurrentPage(currentpage);
+	pj.PageCount(text.GetHeight(page).page + 1);
+	if(pj.Execute()) {
+		Print(pj, text, page, pj.GetPages());
+		return true;
+	}
+	return false;
+}
+
+#endif
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/CtrlLib/ScrollBar.cpp b/uppsrc/CtrlLib/ScrollBar.cpp
new file mode 100644
index 000000000..d8802e9cb
--- /dev/null
+++ b/uppsrc/CtrlLib/ScrollBar.cpp
@@ -0,0 +1,844 @@
+#include "CtrlLib.h"
+
+NAMESPACE_UPP
+
+#define LLOG(x) // LOG(x)
+
+void Sb(Button::Style& bs, const Image& img)
+{
+	bs = Button::StyleNormal();
+	CtrlsImageLook(bs.look, CtrlsImg::I_SB, img, bs.monocolor);
+}
+
+CH_STYLE(ScrollBar, Style, StyleDefault)
+{
+	arrowsize = ScrollBarArrowSize();
+	barsize = FrameButtonWidth();
+	thumbmin = 16;
+	overthumb = 0;
+	through = false;
+	CtrlsImageLook(vupper, CtrlsImg::I_SBVU);
+	CtrlsImageLook(vthumb, CtrlsImg::I_SBVT, CtrlsImg::SBVI());
+	CtrlsImageLook(vlower, CtrlsImg::I_SBVL);
+	CtrlsImageLook(hupper, CtrlsImg::I_SBHU);
+	CtrlsImageLook(hthumb, CtrlsImg::I_SBHT, CtrlsImg::SBHI());
+	CtrlsImageLook(hlower, CtrlsImg::I_SBHL);
+	Sb(up, CtrlsImg::UA());
+	Sb(up2, CtrlsImg::UA());
+	Sb(down, CtrlsImg::DA());
+	Sb(down2, CtrlsImg::DA());
+	Sb(left, CtrlsImg::LA());
+	Sb(left2, CtrlsImg::LA());
+	Sb(right, CtrlsImg::RA());
+	Sb(right2, CtrlsImg::RA());
+	isup2 = isdown2 = isleft2 = isright2 = false;
+}
+
+ScrollBar::ScrollBar() {
+	minthumb = 16;
+	pagepos = pagesize = totalsize = 0;
+	linesize = 1;
+	autohide = false;
+	autodisable = true;
+	jump = false;
+	track = true;
+	horz = false;
+	thumbsize = 8;
+	thumbpos = 0;
+	push = light = -1;
+	Add(prev);
+	Add(prev2);
+	Add(next);
+	Add(next2);
+	NoWantFocus();
+	prev.ScrollStyle().NoWantFocus().Transparent();
+	prev.WhenPush = prev.WhenRepeat = callback(this, &ScrollBar::PrevLine);
+	prev.WhenPush << Proxy(WhenLeftClick);
+	prev2.ScrollStyle().NoWantFocus().Transparent();
+	prev2.WhenRepeat = prev.WhenRepeat;
+	prev2.WhenPush = prev.WhenPush;
+	next.ScrollStyle().NoWantFocus().Transparent();
+	next.WhenPush = next.WhenRepeat = callback(this, &ScrollBar::NextLine);
+	next.WhenPush << Proxy(WhenLeftClick);
+	next2.ScrollStyle().NoWantFocus().Transparent();
+	next2.WhenRepeat = next.WhenRepeat;
+	next2.WhenPush = next.WhenPush;
+	style = NULL;
+	SetStyle(StyleDefault());
+	BackPaint();
+}
+
+ScrollBar::~ScrollBar() {}
+
+Rect ScrollBar::Slider() const
+{
+	Size sz = GetSize();
+	Rect r;
+	if(IsHorz()) {
+		int cc = sz.cx > (3 + style->isleft2 + style->isright2) * style->arrowsize ? style->arrowsize : 0;
+		r = RectC(cc, 0, sz.cx - 2 * cc, sz.cy);
+		if(style->isleft2)
+			r.right -= cc;
+		if(style->isright2)
+			r.left += cc;
+	}
+	else {
+		int cc = sz.cy > (3 + style->isup2 + style->isdown2) * style->arrowsize ? style->arrowsize : 0;
+		r = RectC(0, cc, sz.cx, sz.cy - 2 * cc);
+		if(style->isup2)
+			r.bottom -= cc;
+		if(style->isdown2)
+			r.top += cc;
+	}
+	return r;
+}
+
+int& ScrollBar::HV(int& h, int& v) const
+{
+	return IsHorz() ? h : v;
+}
+
+int ScrollBar::GetHV(int h, int v) const {
+	return IsHorz() ? h : v;
+}
+
+Rect ScrollBar::GetPartRect(int p) const {
+	Rect h = Slider();
+	int sbo = style->overthumb;
+	int off = GetHV(h.left, h.top);
+	int ts = thumbsize;
+	if(ts < style->thumbmin)
+		ts = 0;
+	switch(p) {
+	case 0:
+		HV(h.right, h.bottom) = thumbpos - sbo + ts / 2 + off;
+		break;
+	case 1:
+		HV(h.left, h.top) = thumbpos + ts / 2 + sbo + off;
+		break;
+	case 2:
+		HV(h.left, h.top) = thumbpos - sbo + off;
+		HV(h.right, h.bottom) = thumbpos + ts + sbo + off;
+		break;
+	}
+	return h;
+}
+
+void ScrollBar::Paint(Draw& w) {
+	w.DrawRect(GetSize(), SColorPaper());
+	Size sz = style->through ? GetSize() : Slider().GetSize();
+	light = GetMousePart();
+	int p = push;
+	if(!HasCapture())
+		p = -1;
+	const Value *hl[] = { style->hupper, style->hlower, style->hthumb };
+	const Value *vl[] = { style->vupper, style->vlower, style->vthumb };
+
+	const Value **l = IsHorz() ? hl : vl;
+
+	if(prev.IsShowEnabled()) {
+		for(int i = 0; i < 3; i++) {
+			Rect pr = GetPartRect(i);
+			if(i != 2) {
+				w.Clip(pr);
+				pr = style->through ? GetSize() : Slider();
+			}
+			if(i != 2 || thumbsize >= style->thumbmin)
+				ChPaint(w, pr, l[i][p == i ? CTRL_PRESSED : light == i ? CTRL_HOT : CTRL_NORMAL]);
+			if(i != 2)
+				w.End();
+		}
+	}
+	else
+		if(style->through) {
+			ChPaint(w, sz, l[0][CTRL_DISABLED]);
+		}
+		else
+		if(IsHorz()) {
+			ChPaint(w, style->arrowsize, 0, sz.cx / 2, sz.cy, l[0][CTRL_DISABLED]);
+			ChPaint(w, style->arrowsize + sz.cx / 2, 0, sz.cx - sz.cx / 2, sz.cy, l[1][CTRL_DISABLED]);
+		}
+		else {
+			ChPaint(w, 0, style->arrowsize, sz.cx, sz.cy / 2, l[0][CTRL_DISABLED]);
+			ChPaint(w, 0, style->arrowsize + sz.cy / 2, sz.cx, sz.cy - sz.cy / 2, l[1][CTRL_DISABLED]);
+		}
+}
+
+
+int  ScrollBar::GetMousePart()
+{
+	int q = -1;
+	for(int i = 2; i >= 0; i--)
+		if(HasMouseIn(GetPartRect(i))) {
+			q = i;
+			break;
+		}
+	return q;
+}
+
+int  ScrollBar::GetRange() const {
+	Size sz = Slider().GetSize();
+	return GetHV(sz.cx, sz.cy);
+}
+
+void ScrollBar::Bounds() {
+	int maxsize = GetRange();
+	if(thumbsize > maxsize)
+		thumbsize = maxsize;
+	if(thumbpos + thumbsize > maxsize)
+		thumbpos = maxsize - thumbsize;
+	if(thumbpos < 0)
+		thumbpos = 0;
+}
+
+bool ScrollBar::SetThumb(int _thumbpos, int _thumbsize) {
+	int ts = thumbsize;
+	int tp = thumbpos;
+	thumbsize = _thumbsize;
+	thumbpos = _thumbpos;
+	Bounds();
+	if(thumbsize != ts || thumbpos != tp) {
+		Refresh();
+		return true;
+	}
+	return false;
+}
+
+void ScrollBar::Drag(Point p) {
+	if(SetThumb(max(0, IsHorz() ? p.x - delta : p.y - delta), thumbsize) && track)
+		Position();
+}
+
+void ScrollBar::LeftDown(Point p, dword) {
+	push = GetMousePart();
+	LLOG("ScrollBar::LeftDown(" << p << ")");
+	LLOG("MousePos = " << GetMousePos() << ", ScreenView = " << GetScreenView()
+	<< ", rel. pos = " << (GetMousePos() - GetScreenView().TopLeft()));
+	LLOG("GetWorkArea = " << GetWorkArea());
+	LLOG("VisibleScreenView = " << GetVisibleScreenView());
+	LLOG("PartRect(0) = " << GetPartRect(0));
+	LLOG("PartRect(1) = " << GetPartRect(1));
+	LLOG("PartRect(2) = " << GetPartRect(2));
+	LLOG("ScrollBar::LeftDown: mousepart = " << (int)push << ", rect = " << GetPartRect(push)
+		<< ", overthumb = " << style->overthumb << ", slider = " << Slider());
+	LLOG("thumbpos = " << thumbpos << ", thumbsize = " << thumbsize);
+	if(push == 2)
+		delta = GetHV(p.x, p.y) - thumbpos;
+	else {
+		if(jump) {
+			delta = thumbsize / 2;
+			Drag(p);
+		}
+		else
+			if(push == 0)
+				PrevPage();
+			else
+				NextPage();
+	}
+	SetCapture();
+	Refresh();
+	WhenLeftClick();
+}
+
+void ScrollBar::MouseMove(Point p, dword) {
+	if(HasCapture() && push == 2)
+		Drag(p);
+	else
+	if(light != GetMousePart())
+		Refresh();
+}
+
+void ScrollBar::MouseEnter(Point p, dword)
+{
+	Refresh();
+}
+
+void ScrollBar::MouseLeave()
+{
+	Refresh();
+}
+
+void ScrollBar::LeftUp(Point p, dword) {
+	ReleaseCapture();
+	if(!track)
+		Position();
+	Refresh();
+	push = -1;
+}
+
+void ScrollBar::LeftRepeat(Point p, dword) {
+	if(jump || push < 0 || push == 2) return;
+	if(push == 0)
+		PrevPage();
+	else
+		NextPage();
+	Refresh();
+}
+
+void ScrollBar::CancelMode() {
+	push = light = -1;
+}
+
+bool  ScrollBar::Set(int apagepos) {
+	int op = pagepos;
+	pagepos = apagepos;
+	if(pagepos > totalsize - pagesize) pagepos = totalsize - pagesize;
+	if(pagepos < 0) pagepos = 0;
+	int slsize = GetRange();
+	int mint = max(minthumb, style->thumbmin);
+	if(totalsize <= 0)
+		SetThumb(0, slsize);
+	else {
+		double thumbsize = slsize * pagesize / (double) totalsize;
+		double rest = slsize * pagesize - thumbsize * totalsize;
+		double ts, ps;
+		if(thumbsize >= slsize || thumbsize < 0) {
+			ts = slsize;
+			ps = 0;
+		}
+		else
+		if(thumbsize <= mint) {
+			ps = ((slsize - mint) * (double)pagepos + rest) / (double) (totalsize - pagesize);
+			ts = mint;
+		}
+		else {
+			ps = (slsize * (double)pagepos + rest) / (double) totalsize;
+			ts = thumbsize;
+		}
+		SetThumb(ffloor(ps), fceil(ts));
+    }
+	if(pagepos != op) {
+		Refresh();
+		WhenScroll();
+		return true;
+	}
+	return false;
+}
+
+void ScrollBar::Set(int _pagepos, int _pagesize, int _totalsize) {
+	pagesize = _pagesize;
+	totalsize = _totalsize;
+	bool a = totalsize > pagesize && pagesize > 0;
+	if(autohide && a != IsShown()) {
+		Show(a);
+		WhenVisibility();
+	}
+	if(autodisable) {
+		if(prev.IsEnabled() != a)
+			Refresh();
+		prev.Enable(a);
+		next.Enable(a);
+		prev2.Enable(a);
+		next2.Enable(a);
+	}
+	Set(_pagepos);
+}
+
+void ScrollBar::SetPage(int _pagesize) {
+	Set(pagepos, _pagesize, totalsize);
+}
+
+void ScrollBar::SetTotal(int _totalsize) {
+	Set(pagepos, pagesize, _totalsize);
+}
+
+void ScrollBar::Position() {
+	int slsize = GetRange();
+	int mint = max(minthumb, style->thumbmin);
+	if(slsize < mint || totalsize <= pagesize)
+		pagepos = 0;
+	else
+	if(thumbpos == slsize - thumbsize)
+		pagepos = totalsize - pagesize;
+	else
+	if(thumbsize == mint)
+		pagepos = iscale(thumbpos, (totalsize - pagesize), (slsize - mint));
+	else
+		pagepos = iscale(thumbpos, totalsize, slsize);
+	Action();
+	WhenScroll();
+}
+
+void ScrollBar::Uset(int a) {
+	if(Set(a))
+		Action();
+}
+
+void ScrollBar::PrevLine() {
+	Uset(pagepos - linesize);
+}
+
+void ScrollBar::NextLine() {
+	Uset(pagepos + linesize);
+}
+
+void ScrollBar::PrevPage() {
+	Uset(pagepos - max(pagesize - linesize, 1));
+}
+
+void ScrollBar::NextPage() {
+	Uset(pagepos + max(pagesize - linesize, 1));
+}
+
+void ScrollBar::Wheel(int zdelta, int lines) {
+	Uset(pagepos - lines * linesize * zdelta / 120);
+}
+
+bool ScrollBar::VertKey(dword key, bool homeend) {
+	if(!IsVisible() || !IsEnabled() || GetRect().IsEmpty())
+		return false;
+	switch(key) {
+	case K_PAGEUP:
+		PrevPage();
+		break;
+	case K_PAGEDOWN:
+		NextPage();
+		break;
+	case K_UP:
+		PrevLine();
+		break;
+	case K_DOWN:
+		NextLine();
+		break;
+	case K_HOME:
+		if(!homeend) break;
+	case K_CTRL_HOME:
+	case K_CTRL_PAGEUP:
+		Begin();
+		break;
+	case K_END:
+		if(!homeend) break;
+	case K_CTRL_END:
+	case K_CTRL_PAGEDOWN:
+		End();
+		break;
+	default:
+		return false;
+	}
+	return true;
+}
+
+void ScrollBar::Begin()
+{
+	Uset(0);
+}
+
+void ScrollBar::End()
+{
+	Uset(max(0, totalsize - pagesize));
+}
+
+bool ScrollBar::HorzKey(dword key) {
+	if(!IsVisible() || !IsEnabled() || GetRect().IsEmpty())
+		return false;
+	switch(key) {
+	case K_CTRL_LEFT:
+		PrevPage();
+		break;
+	case K_CTRL_RIGHT:
+		NextPage();
+		break;
+	case K_LEFT:
+		PrevLine();
+		break;
+	case K_RIGHT:
+		NextLine();
+		break;
+	case K_HOME:
+		Begin();
+		break;
+	case K_END:
+		End();
+		break;
+	default:
+		return false;
+	}
+	return true;
+}
+
+void ScrollBar::Layout() {
+	Size sz = GetSize();
+	if(IsHorz()) {
+		prev.SetStyle(style->left);
+		next.SetStyle(style->right);
+		prev2.SetStyle(style->left2);
+		next2.SetStyle(style->right2);
+		int cc = sz.cx > (3 + style->isleft2 + style->isright2) * style->arrowsize ? style->arrowsize : 0;
+		prev.SetRect(0, 0, cc, sz.cy);
+		next.SetRect(sz.cx - cc, 0, cc, sz.cy);
+		prev2.Show(style->isleft2);
+		prev2.SetRect(sz.cx - 2 * cc, 0, cc, sz.cy);
+		next2.Show(style->isright2);
+		next2.SetRect(cc, 0, cc, sz.cy);
+	}
+	else {
+		prev.SetStyle(style->up);
+		next.SetStyle(style->down);
+		prev2.SetStyle(style->up2);
+		next2.SetStyle(style->down2);
+		int cc = sz.cy > (3 + style->isup2 + style->isdown2) * style->arrowsize ? style->arrowsize : 0;
+		prev.SetRect(0, 0, sz.cx, cc);
+		next.SetRect(0, sz.cy - cc, sz.cx, cc);
+		prev2.Show(style->isup2);
+		prev2.SetRect(0, sz.cy - 2 * cc, sz.cx, cc);
+		next2.Show(style->isdown2);
+		next2.SetRect(0, cc, sz.cx, cc);
+	}
+	Set(pagepos);
+	Refresh();
+}
+
+bool ScrollBar::ScrollInto(int pos, int _linesize) {
+	int new_pos = pagepos;
+	if(pos > new_pos + pagesize - _linesize)
+		new_pos = pos - pagesize + _linesize;
+	if(pos < new_pos)
+		new_pos = pos;
+	return Set(new_pos);
+}
+
+Size ScrollBar::GetStdSize() const {
+	int a = HeaderCtrl::GetStdHeight();
+	return Size(a, a);
+}
+
+void ScrollBar::FrameLayout(Rect& r)
+{
+	(IsHorz() ? LayoutFrameBottom : LayoutFrameRight)(r, this, ScrollBarSize());
+}
+
+void ScrollBar::FrameAddSize(Size& sz)
+{
+	(IsHorz() ? sz.cy : sz.cx) += ScrollBarSize();
+}
+
+Size ScrollBar::GetViewSize() const {
+	if(IsChild() && InFrame()) {
+		Size sz = GetParent()->GetSize();
+		if(IsShown())
+			(IsVert() ? sz.cx : sz.cy) += ScrollBarSize();
+		return sz;
+	}
+	return Size(0, 0);
+}
+
+Size ScrollBar::GetReducedViewSize() const {
+	if(IsChild() && InFrame()) {
+		Size sz = GetParent()->GetSize();
+		if(!IsShown())
+			(IsVert() ? sz.cx : sz.cy) -= ScrollBarSize();
+		return sz;
+	}
+	return Size(0, 0);
+}
+
+ScrollBar& ScrollBar::AutoHide(bool b) {
+	autohide = b;
+	if(b)
+		SetTotal(totalsize);
+	else
+		Show();
+	WhenVisibility();
+	return *this;
+}
+
+ScrollBar& ScrollBar::AutoDisable(bool b) {
+	autodisable = b;
+	if(!b) {
+		if(!prev.IsEnabled())
+			Refresh();
+		prev.Enable();
+		prev2.Enable();
+		next.Enable();
+		next2.Enable();
+	}
+	return *this;
+}
+
+ScrollBar& ScrollBar::SetStyle(const Style& s)
+{
+	if(style != &s) {
+		style = &s;
+		RefreshLayout();
+		Refresh();
+	}
+	return *this;
+}
+
+Image SizeGrip::CursorImage(Point p, dword)
+{
+#ifdef PLATFORM_X11
+	if(_NET_Supported().Find(XAtom("_NET_WM_MOVERESIZE")) >= 0) {
+#endif
+		TopWindow *q = dynamic_cast<TopWindow *>(GetTopCtrl());
+		if(q && !q->IsMaximized() && q->IsSizeable())
+			return Image::SizeBottomRight();
+#ifdef PLATFORM_X11
+	}
+#endif
+	return Image::Arrow();
+}
+
+CH_IMAGE(SizeGripImg, CtrlsImg::SizeGrip());
+
+void SizeGrip::Paint(Draw& w)
+{
+    Size sz = GetSize();
+    if(!IsTransparent())
+        w.DrawRect(sz, SColorFace);
+#ifdef PLATFORM_X11
+    if(_NET_Supported().Find(XAtom("_NET_WM_MOVERESIZE")) >= 0)
+    {
+#endif
+		TopWindow *q = dynamic_cast<TopWindow *>(GetTopCtrl());
+		if(q && !q->IsMaximized() && q->IsSizeable()) {
+			Size isz = CtrlsImg::SizeGrip().GetSize();
+			w.DrawImage(sz.cx - isz.cx, sz.cy - isz.cy, CtrlsImg::SizeGrip());
+		}
+#ifdef PLATFORM_X11
+    }
+#endif
+}
+
+SizeGrip::SizeGrip()
+{
+	Transparent();
+	RightPos(0, 12).BottomPos(0, 12);
+	NoWantFocus();
+	Width(14);
+}
+
+SizeGrip::~SizeGrip() {}
+
+void SizeGrip::LeftDown(Point p, dword flags)
+{
+	TopWindow *q = dynamic_cast<TopWindow *>(GetTopCtrl());
+	if(!q || q->IsMaximized() || !q->IsSizeable()) return;
+#ifdef PLATFORM_WIN32
+	HWND hwnd = q->GetHWND();
+	p = GetMousePos() - q->GetRect().TopLeft();
+	if(hwnd) {
+		::SendMessage(hwnd, WM_SYSCOMMAND, 0xf008, MAKELONG(p.x, p.y));
+		::SendMessage(hwnd, WM_LBUTTONUP, 0, MAKELONG(p.x, p.y));
+	}
+#endif
+#ifdef PLATFORM_X11
+	if(_NET_Supported().Find(XAtom("_NET_WM_MOVERESIZE")) >= 0) {
+		XUngrabPointer(Xdisplay, CurrentTime); // 2008-02-25 cxl/mdelfe... compiz fix... who has grabbed it anyway?...
+		XClientMessageEvent m;
+		m.type = ClientMessage;
+		m.serial = 0;
+		m.send_event = XTrue;
+		m.window = q->GetWindow();
+		m.message_type = XAtom("_NET_WM_MOVERESIZE");
+		m.format = 32;
+		p = GetMousePos();
+		m.data.l[0] = p.x;
+		m.data.l[1] = p.y;
+		m.data.l[2] = 4;
+		m.data.l[3] = 0;
+		m.data.l[4] = 0;
+		XSendEvent(Xdisplay, Xroot, 0, SubstructureNotifyMask|SubstructureRedirectMask,
+		           (XEvent*)&m);
+	}
+#endif
+}
+
+void ScrollBars::Scroll() {
+	WhenScroll();
+}
+
+bool ScrollBars::Key(dword key) {
+	return x.HorzKey(key) || y.VertKey(key);
+}
+
+void ScrollBars::Set(Point pos, Size page, Size total) {
+	x.Set(pos.x, page.cx, total.cx);
+	y.Set(pos.y, page.cy, total.cy);
+}
+
+bool ScrollBars::Set(int _x, int _y) {
+	bool b = x.Set(_x) | y.Set(_y);
+	return b;
+}
+
+bool ScrollBars::Set(Point pos) {
+	return Set(pos.x, pos.y);
+}
+
+void ScrollBars::SetPage(int cx, int cy) {
+	x.SetPage(cx);
+	y.SetPage(cy);
+}
+
+void ScrollBars::SetPage(Size page) {
+	SetPage(page.cx, page.cy);
+}
+
+void ScrollBars::SetTotal(int cx, int cy) {
+	x.SetTotal(cx);
+	y.SetTotal(cy);
+}
+
+void ScrollBars::SetTotal(Size total) {
+	SetTotal(total.cx, total.cy);
+}
+
+bool ScrollBars::ScrollInto(Point pos, Size linesize) {
+	return x.ScrollInto(pos.x, linesize.cx) | y.ScrollInto(pos.y, linesize.cy);
+}
+
+bool ScrollBars::ScrollInto(Point pos) {
+	return x.ScrollInto(pos.x) | y.ScrollInto(pos.y);
+}
+
+ScrollBars& ScrollBars::SetLine(int linex, int liney) {
+	x.SetLine(linex);
+	y.SetLine(liney);
+	return *this;
+}
+
+ScrollBars& ScrollBars::Track(bool b) {
+	x.Track(b);
+	y.Track(b);
+	return *this;
+}
+
+ScrollBars& ScrollBars::Jump(bool b) {
+	x.Jump(b);
+	y.Jump(b);
+	return *this;
+}
+
+ScrollBars& ScrollBars::AutoHide(bool b) {
+	x.AutoHide(b);
+	y.AutoHide(b);
+	return *this;
+}
+
+ScrollBars& ScrollBars::AutoDisable(bool b) {
+	x.AutoDisable(b);
+	y.AutoDisable(b);
+	return *this;
+}
+
+ScrollBars& ScrollBars::Box(Ctrl& _box) {
+	box->Remove();
+	box = &_box;
+	if(x.GetParent() && x.GetParent() != box->GetParent())
+		x.GetParent()->Add(*box);
+	return *this;
+}
+
+void ScrollBars::FrameAdd(Ctrl& p) {
+	p.Add(x);
+	p.Add(y);
+	if(box->GetParent() != &p)
+		p.Add(*box);
+}
+
+void ScrollBars::FrameRemove() {
+	x.Remove();
+	y.Remove();
+	box->Remove();
+}
+
+void ScrollBars::FramePaint(Draw& w, const Rect& r) {
+	if(x.IsShown() && y.IsShown() && !box) {
+		int h = ScrollBarSize();
+		w.DrawRect(r.right - h, r.bottom - h, h, h, SColorFace);
+	}
+}
+
+void ScrollBars::FrameLayout(Rect& r) {
+	int h = ScrollBarSize();
+	int by = 0;
+	int bx = x.IsShown() && y.IsShown() ? h : 0;
+	if(box_type == 1)
+		by = bx;
+	if(box_type == 2)
+		by = h;
+	int dx = x.IsShown() * h;
+	int dy = y.IsShown() * h;
+	y.SetFrameRect(r.right - dy, r.top, dy, r.Height() - by);
+	x.SetFrameRect(r.left, r.bottom - dx, r.Width() - bx, dx);
+	if(box)
+		box->SetFrameRect(r.right - by, r.bottom - by, by, by);
+	r.right -= dy;
+	r.bottom -= dx;
+}
+
+void ScrollBars::FrameAddSize(Size& sz) {
+	int h = ScrollBarSize();
+	sz.cy += x.IsShown() * h;
+	sz.cx += y.IsShown() * h;
+}
+
+Size ScrollBars::GetViewSize() const {
+	return Size(y.GetViewSize().cx, x.GetViewSize().cy);
+}
+
+Size ScrollBars::GetReducedViewSize() const {
+	return Size(y.GetReducedViewSize().cx, x.GetReducedViewSize().cy);
+}
+
+ScrollBars& ScrollBars::NormalBox()
+{
+	box_type = 1;
+	y.RefreshParentLayout();
+	return *this;
+}
+
+ScrollBars& ScrollBars::NoBox()
+{
+	box_type = 0;
+	y.RefreshParentLayout();
+	return *this;
+}
+
+ScrollBars& ScrollBars::FixedBox()
+{
+	box_type = 2;
+	y.RefreshParentLayout();
+	return *this;
+}
+
+ScrollBars::ScrollBars() {
+	box = &the_box;
+	the_box.NoTransparent();
+	x.WhenScroll = y.WhenScroll = callback(this, &ScrollBars::Scroll);
+	x.WhenLeftClick = y.WhenLeftClick = Proxy(WhenLeftClick);
+	x.AutoHide();
+	y.AutoHide();
+	box_type = 1;
+}
+
+ScrollBars::~ScrollBars() {}
+
+void Scroller::Scroll(Ctrl& p, const Rect& rc, Point newpos, Size cellsize)
+{
+	if(!IsNull(psb)) {
+		Point d = psb - newpos;
+		p.ScrollView(rc, d.x * cellsize.cx, d.y * cellsize.cy);
+	}
+	else
+		p.Refresh();
+	psb = newpos;
+}
+
+void Scroller::Scroll(Ctrl& p, const Rect& rc, int newposy, int linesize)
+{
+	Scroll(p, rc, Point(0, newposy), Size(0, linesize));
+}
+
+void Scroller::Scroll(Ctrl& p, Point newpos)
+{
+	Scroll(p, p.GetSize(), newpos);
+}
+
+void Scroller::Scroll(Ctrl& p, int newposy)
+{
+	Scroll(p, p.GetSize(), newposy);
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/CtrlLib/ScrollBar.h b/uppsrc/CtrlLib/ScrollBar.h
new file mode 100644
index 000000000..3760702f8
--- /dev/null
+++ b/uppsrc/CtrlLib/ScrollBar.h
@@ -0,0 +1,284 @@
+class ScrollBar : public FrameCtrl<Ctrl> {
+public:
+	virtual void Layout();
+	virtual Size GetStdSize() const;
+	virtual void Paint(Draw& draw);
+	virtual void LeftDown(Point p, dword);
+	virtual void MouseMove(Point p, dword);
+	virtual void MouseEnter(Point p, dword);
+	virtual void MouseLeave();
+	virtual void LeftUp(Point p, dword);
+	virtual void LeftRepeat(Point p, dword);
+	virtual void CancelMode();
+
+	virtual void FrameLayout(Rect& r);
+	virtual void FrameAddSize(Size& sz);
+
+public:
+	struct Style : ChStyle<Style> {
+		int barsize, arrowsize, thumbmin, overthumb;
+		bool through;
+		Value vupper[4], vthumb[4], vlower[4];
+		Value hupper[4], hthumb[4], hlower[4];
+		Button::Style up, down, left, right;
+		Button::Style up2, down2, left2, right2;
+		bool          isup2, isdown2, isleft2, isright2;
+	};
+
+private:
+	int     thumbpos;
+	int     thumbsize;
+	bool    horz:1;
+	bool    jump:1;
+	bool    track:1;
+	int     delta;
+	int8    push;
+	int8    light;
+
+	Button  prev, prev2, next, next2;
+	int     pagepos;
+	int     pagesize;
+	int     totalsize;
+	int     linesize;
+	int     minthumb;
+	bool    autohide:1;
+	bool    autodisable:1;
+
+	const Style *style;
+
+	Rect    Slider() const;
+	int&    HV(int& h, int& v) const;
+	int     GetHV(int h, int v) const;
+	Rect    GetPartRect(int p) const;
+	void    Bounds();
+	bool    SetThumb(int _thumbpos, int _thumbsize);
+	void    Drag(Point p);
+	int     GetMousePart();
+	int     GetRange() const;
+
+	void    Position();
+	void    Uset(int a);
+
+	int     ScrollBarSize() const                 { return style->barsize; }
+
+public:
+	Callback WhenScroll;
+	Callback WhenVisibility;
+	Callback WhenLeftClick;
+
+	bool    IsHorz() const                  { return horz; }
+	bool    IsVert() const                  { return !horz; }
+
+	void    Set(int pagepos, int pagesize, int totalsize);
+
+	bool    Set(int pagepos);
+	void    SetPage(int pagesize);
+	void    SetTotal(int totalsize);
+
+	bool    ScrollInto(int pos, int linesize);
+	bool    ScrollInto(int pos)             { return ScrollInto(pos, linesize); }
+
+	bool    VertKey(dword key, bool homeend = true);
+	bool    HorzKey(dword key);
+
+	void    PrevLine();
+	void    NextLine();
+	void    PrevPage();
+	void    NextPage();
+	void    Begin();
+	void    End();
+
+	void    Wheel(int zdelta, int lines = 3);
+
+	Size    GetViewSize() const;
+	Size    GetReducedViewSize() const;
+
+	int     Get() const                     { return pagepos; }
+	int     GetPage() const                 { return pagesize; }
+	int     GetTotal() const                { return totalsize; }
+	int     GetLine() const                 { return linesize; }
+
+	static const Style& StyleDefault();
+
+	ScrollBar& Horz(bool b = true)          { horz = b; Refresh(); RefreshLayout(); return *this; }
+	ScrollBar& Vert()                       { return Horz(false); }
+
+	ScrollBar& SetLine(int _line)           { linesize = _line; return *this; }
+
+	ScrollBar& Track(bool b = true)         { track = b; return *this; }
+	ScrollBar& NoTrack()                    { return Track(false); }
+	ScrollBar& Jump(bool b = true)          { jump = b; return *this; }
+	ScrollBar& NoJump(bool b = true)        { return Jump(false); }
+	ScrollBar& AutoHide(bool b = true);
+	ScrollBar& NoAutoHide()                 { return AutoHide(false); }
+	bool       IsAutoHide() const           { return autohide; }
+	ScrollBar& AutoDisable(bool b = true);
+	ScrollBar& NoAutoDisable()              { return AutoDisable(false); }
+	ScrollBar& MinThumb(int sz)             { minthumb = sz; return *this; }
+	ScrollBar& SetStyle(const Style& s);
+
+	operator int() const                    { return pagepos; }
+	int operator=(int pagepos)              { Set(pagepos); return pagepos; }
+
+	ScrollBar();
+	virtual ~ScrollBar();
+};
+
+inline int ScrollBarSize()                  { return ScrollBar::StyleDefault().barsize; }//!!
+
+class VScrollBar : public ScrollBar {
+public:
+	int operator=(int pagepos)              { Set(pagepos); return pagepos; }
+};
+
+class HScrollBar : public ScrollBar {
+public:
+	int operator=(int pagepos)              { Set(pagepos); return pagepos; }
+
+	HScrollBar() { Horz(); }
+};
+
+class SizeGrip : public FrameRight<Ctrl> {
+public:
+	virtual void  Paint(Draw& w);
+	virtual void  LeftDown(Point p, dword);
+	virtual Image CursorImage(Point p, dword);
+
+public:
+	SizeGrip();
+	virtual ~SizeGrip();
+};
+
+Image SizeGripImg();
+void  SizeGripImg_Write(Image m);
+
+class ScrollBars : public CtrlFrame {
+public:
+	virtual void FrameLayout(Rect& r);
+	virtual void FrameAddSize(Size& sz);
+	virtual void FramePaint(Draw& w, const Rect& r);
+	virtual void FrameAdd(Ctrl& ctrl);
+	virtual void FrameRemove();
+
+protected:
+	Ctrl      *box;
+	StaticRect the_box;
+	int        box_type;
+	SizeGrip   grip;
+
+	void    Scroll();
+
+public:
+	HScrollBar x;
+	VScrollBar y;
+
+	Callback   WhenScroll;
+	Callback   WhenLeftClick;
+
+	void    Set(Point pos, Size page, Size total);
+	bool    Set(Point pos);
+	bool    Set(int x, int y);
+	void    SetPage(Size page);
+	void    SetPage(int cx, int cy);
+	void    SetTotal(Size total);
+	void    SetTotal(int cx, int cy);
+
+	void    SetX(int pos, int page, int total)       { x.Set(pos, page, total); }
+	bool    SetX(int _x)                             { return x.Set(_x); }
+	void    SetPageX(int cx)                         { x.SetPage(cx); }
+	void    SetTotalX(int cx)                        { x.SetTotal(cx); }
+
+	void    SetY(int pos, int page, int total)       { y.Set(pos, page, total); }
+	bool    SetY(int _y)                             { return y.Set(_y); }
+	void    SetPageY(int cy)                         { y.SetPage(cy); }
+	void    SetTotalY(int cy)                        { y.SetTotal(cy); }
+
+	bool    ScrollInto(Point pos, Size linesize);
+	bool    ScrollInto(const Rect& r)                { return ScrollInto(r.TopLeft(), r.Size()); }
+	bool    ScrollInto(Point pos);
+
+	bool    ScrollIntoX(int pos, int linesize)       { return x.ScrollInto(pos, linesize); }
+	bool    ScrollIntoX(int pos)                     { return x.ScrollInto(pos); }
+	bool    ScrollIntoY(int pos, int linesize)       { return y.ScrollInto(pos, linesize); }
+	bool    ScrollIntoY(int pos)                     { return y.ScrollInto(pos); }
+
+	bool    Key(dword key);
+
+	void    LineUp()                                 { y.PrevLine(); }
+	void    LineDown()                               { y.NextLine(); }
+	void    PageUp()                                 { y.PrevPage(); }
+	void    PageDown()                               { y.NextPage(); }
+	void    VertBegin()                              { y.Begin(); }
+	void    VertEnd()                                { y.End(); }
+
+	void    LineLeft()                               { x.PrevLine(); }
+	void    LineRight()                              { x.NextLine(); }
+	void    PageLeft()                               { x.PrevPage(); }
+	void    PageRight()                              { x.NextPage(); }
+	void    HorzBegin()                              { x.Begin(); }
+	void    HorzEnd()                                { x.End(); }
+
+	void    WheelX(int zdelta, int lines = 3)        { x.Wheel(zdelta, lines); }
+	void    WheelY(int zdelta, int lines = 3)        { y.Wheel(zdelta, lines); }
+
+	Size    GetViewSize() const;
+	Size    GetReducedViewSize() const;
+
+	Point   Get() const                              { return Point(x, y); }
+	int     GetX() const                             { return x; }
+	int     GetY() const                             { return y; }
+	Size    GetPage() const                          { return Size(x.GetPage(), y.GetPage()); }
+	Size    GetTotal() const                         { return Size(x.GetTotal(), y.GetTotal()); }
+	Size    GetLine() const                          { return Size(x.GetLine(), y.GetLine()); }
+
+	void    ShowX(bool show)                         { x.Show(show); }
+	void    HideX()                                  { ShowX(false); }
+	void    ShowY(bool show)                         { y.Show(show); }
+	void    HideY()                                  { ShowY(false); }
+	void    Show(bool show = true)                   { x.Show(show); y.Show(show); }
+	void    Hide()                                   { Show(false); }
+
+	ScrollBars& SetLine(int linex, int liney);
+	ScrollBars& SetLine(Size line)                   { return SetLine(line.cx, line.cy); }
+	ScrollBars& SetLine(int line)                    { return SetLine(line, line); }
+
+	ScrollBars& Track(bool b = true);
+	ScrollBars& NoTrack()                            { return Track(false); }
+	ScrollBars& Jump(bool b = true);
+	ScrollBars& NoJump(bool b = true)                { return Jump(false); }
+	ScrollBars& AutoHide(bool b = true);
+	ScrollBars& NoAutoHide()                         { return AutoHide(false); }
+	ScrollBars& AutoDisable(bool b = true);
+	ScrollBars& NoAutoDisable()                      { return AutoDisable(false); }
+
+	ScrollBars& NormalBox();
+	ScrollBars& NoBox();
+	ScrollBars& FixedBox();
+
+	ScrollBars& Box(Ctrl& box);
+	ScrollBars& WithSizeGrip()                       { the_box.Add(grip); return *this; }
+
+	ScrollBars& SetStyle(const ScrollBar::Style& s)  { x.SetStyle(s); y.SetStyle(s); return *this; }
+
+	operator Point() const                           { return Get(); }
+	Point operator=(Point p)                         { Set(p); return p; }
+
+	ScrollBars();
+	virtual ~ScrollBars();
+};
+
+class Scroller {
+	Point psb;
+
+public:
+	void Scroll(Ctrl& p, const Rect& rc, Point newpos, Size cellsize = Size(1, 1));
+	void Scroll(Ctrl& p, const Rect& rc, int newpos, int linesize = 1);
+	void Scroll(Ctrl& p, Point newpos);
+	void Scroll(Ctrl& p, int newposy);
+
+	void Set(Point pos)          { psb = pos; }
+	void Set(int pos)            { psb = Point(0, pos); }
+	void Clear()                 { psb = Null; }
+
+	Scroller()                   { psb = Null; }
+};
diff --git a/uppsrc/CtrlLib/SliderCtrl.cpp b/uppsrc/CtrlLib/SliderCtrl.cpp
new file mode 100644
index 000000000..559c9c1db
--- /dev/null
+++ b/uppsrc/CtrlLib/SliderCtrl.cpp
@@ -0,0 +1,212 @@
+#include "CtrlLib.h"
+
+NAMESPACE_UPP
+
+SliderCtrl::SliderCtrl()
+: value(Null)
+, min(0)
+, max(100)
+, step(1)
+, round_step(true)
+{
+	Transparent();
+	NoWantFocus();
+}
+
+bool SliderCtrl::IsVert() const
+{
+	return GetSize().cx < GetSize().cy;
+}
+
+int  SliderCtrl::HoVe(int  x, int  y) const
+{
+	return IsVert() ? y : x;
+}
+
+int& SliderCtrl::HoVeR(int& x, int& y) const
+{
+	return IsVert() ? y : x;
+}
+
+void SliderCtrl::Paint(Draw& w)
+{
+	Size size = GetSize();
+	if(IsVert()) {
+		int half = size.cx >> 1;
+		DrawBorder(w, half - 2, 2, 4, size.cy - 4, InsetBorder);
+		if(!IsNull(value))
+			w.DrawImage((size.cx - CtrlImg::vthumb().GetSize().cx) >> 1, SliderToClient(value),
+			            HasCapture() || HasFocus() ? CtrlImg::vthumb1() : CtrlImg::vthumb());
+	}
+	else {
+		int half = size.cy >> 1;
+		DrawBorder(w, 2, half - 2, size.cx - 4, 4, InsetBorder);
+		if(!IsNull(value))
+			w.DrawImage(SliderToClient(value), (size.cy - CtrlImg::hthumb().GetSize().cy) >> 1,
+			            HasCapture() || HasFocus() ? CtrlImg::hthumb1() : CtrlImg::hthumb());
+	}
+}
+
+bool SliderCtrl::Key(dword key, int repcnt)
+{
+	if(IsEditable())
+		switch(key) {
+		case K_LEFT:
+		case K_UP:
+			Dec();
+			return true;
+		case K_RIGHT:
+		case K_DOWN:
+			Inc();
+			return true;
+		}
+	return Ctrl::Key(key, repcnt);
+}
+
+void SliderCtrl::LeftDown(Point pos, dword keyflags)
+{
+	if(!IsEditable())
+		return;
+	int thumb = SliderToClient(value);
+	int p = HoVe(pos.x, pos.y);
+	if(IsNull(thumb)) {
+		value = ClientToSlider(p);
+		WhenSlideFinish();
+		UpdateActionRefresh();
+	}
+	else
+	if(p >= thumb && p < thumb + HoVe(CtrlImg::hthumb().GetSize().cx, CtrlImg::vthumb().GetSize().cy))
+		SetCapture();
+	else {
+		if(p < thumb)
+			Dec();
+		else
+			Inc();
+	}
+	Refresh();
+}
+
+void SliderCtrl::LeftRepeat(Point p, dword f)
+{
+	if(!HasCapture())
+		LeftDown(p, f);
+}
+
+void SliderCtrl::LeftUp(Point pos, dword keyflags)
+{
+	if (HasCapture())
+		WhenSlideFinish();
+	Refresh();
+}
+
+void SliderCtrl::MouseMove(Point pos, dword keyflags)
+{
+	if(HasCapture()) {
+		int n = ClientToSlider(HoVe(pos.x, pos.y));
+		if(n != value) {
+			value = n;
+			UpdateActionRefresh();
+		}
+	}
+}
+
+void SliderCtrl::SetData(const Value& v)
+{
+	int i = v;
+	if(!IsNull(i))
+		i = minmax(i, min, max);
+	if(i != value) {
+		value = i;
+		UpdateRefresh();
+	}
+}
+
+Value SliderCtrl::GetData() const
+{
+	return value;
+}
+
+SliderCtrl& SliderCtrl::MinMax(int _min, int _max)
+{
+	if(min != _min || max != _max) {
+		min = _min;
+		max = _max;
+		if(!IsNull(value)) {
+			int v = minmax(value, min, max);
+			if(value != v) {
+				value = v;
+				Update();
+			}
+		}
+		Refresh();
+	}
+	return *this;
+}
+
+int SliderCtrl::SliderToClient(int v) const
+{
+	if(IsNull(v))
+		return Null;
+	v = minmax(v, min, max);
+	if(max > min)
+		v = iscale(v - min, HoVe(GetSize().cx - CtrlImg::hthumb().GetSize().cx,
+		                         GetSize().cy - CtrlImg::vthumb().GetSize().cy), max - min);
+	else
+		v = 0;
+	return v;
+}
+
+int SliderCtrl::ClientToSlider(int p) const
+{
+	if(max <= min)
+		return min;
+	return minmax(min + iscale(p, max - min,
+	                           HoVe(GetSize().cx - CtrlImg::hthumb().GetSize().cx,
+	                                GetSize().cy - CtrlImg::vthumb().GetSize().cy)), min, max);
+}
+
+void SliderCtrl::Dec()
+{
+	int n = value;
+	if(IsNull(value))
+		n = max;
+	else
+	if(n > min) {
+		if(round_step && step > 1)
+			n = idivfloor(n - 1, step) * step;
+		else
+			n -= step;
+		if(n < min)
+			n = min;
+	}
+	if(n != value) {
+		value = n;
+		WhenSlideFinish();
+		UpdateActionRefresh();
+	}
+}
+
+void SliderCtrl::Inc()
+{
+	int n = value;
+	if(IsNull(value))
+		n = min;
+	else
+	if(n < max) {
+		if(round_step && step > 1)
+			n = idivceil(n + 1, step) * step;
+		else
+			n += step;
+		if(n > max)
+			n = max;
+	}
+	if(n != value) {
+		value = n;
+		WhenSlideFinish();
+		UpdateActionRefresh();
+	}
+}
+
+SliderCtrl::~SliderCtrl() {}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/CtrlLib/SliderCtrl.h b/uppsrc/CtrlLib/SliderCtrl.h
new file mode 100644
index 000000000..9b4b090b7
--- /dev/null
+++ b/uppsrc/CtrlLib/SliderCtrl.h
@@ -0,0 +1,42 @@
+class SliderCtrl : public Ctrl {
+	int           value;
+	int           min, max, step;
+	bool          round_step;
+
+	int           SliderToClient(int value) const;
+	int           ClientToSlider(int x) const;
+
+	bool          IsVert() const;
+	int           HoVe(int  x, int  y) const;
+	int&          HoVeR(int& x, int& y) const;
+
+public:
+	typedef SliderCtrl CLASSNAME;
+
+	Callback 	  WhenSlideFinish;
+	
+	SliderCtrl();
+	virtual ~SliderCtrl();
+
+	virtual void  Paint(Draw& draw);
+	virtual bool  Key(dword key, int repcnt);
+	virtual void  LeftDown(Point pos, dword keyflags);
+	virtual void  LeftRepeat(Point pos, dword keyflags);
+	virtual void  LeftUp(Point pos, dword keyflags);
+	virtual void  MouseMove(Point pos, dword keyflags);
+
+	virtual void  SetData(const Value& value);
+	virtual Value GetData() const;
+
+	void          Inc();
+	void          Dec();
+
+	SliderCtrl&   MinMax(int _min, int _max);
+	SliderCtrl&   Range(int max)                  { return MinMax(0, max); }
+	int           GetMin() const                  { return min; }
+	int           GetMax() const                  { return max; }
+
+	SliderCtrl&   Step(int _step, bool _r = true) { step = _step; round_step = _r; return *this; }
+	int           GetStep() const                 { return step; }
+	bool          IsRoundStep() const             { return round_step; }
+};
diff --git a/uppsrc/CtrlLib/Splitter.cpp b/uppsrc/CtrlLib/Splitter.cpp
new file mode 100644
index 000000000..dc588bd46
--- /dev/null
+++ b/uppsrc/CtrlLib/Splitter.cpp
@@ -0,0 +1,220 @@
+#include "CtrlLib.h"
+
+NAMESPACE_UPP
+
+int Splitter::ClientToPos(Point p) const
+{
+	return minmax(vert ? 10000 * p.y / GetSize().cy : 10000 * p.x / GetSize().cx, 0, 9999);
+}
+
+int Splitter::PosToClient(int pos) const
+{
+	return (vert ? GetSize().cy : GetSize().cx) * pos / 10000;
+}
+
+int Splitter::GetChildCount() const
+{
+	int count = 0;
+	for(Ctrl *child = GetFirstChild(); child; child = child->GetNext())
+		count++;
+	return count;
+}
+
+void   Splitter::Layout() {
+	Size sz = GetSize();
+	int count = GetChildCount();
+	if(count == 0)
+		return;
+	count--;
+	if(pos.GetCount() < count) {
+		pos.SetCount(count, 0);
+		for(int i = 0; i < count; i++)
+			pos[i] = (i + 1) * 10000 / (count + 1);
+	}
+	if(style >= 0) {
+		int i = 0;
+		for(Ctrl *q = GetFirstChild(); q; q = q->GetNext()) {
+			if(style == i)
+				q->SizePos().Show();
+			else
+				q->Hide();
+			i++;
+		}
+		return;
+	}
+	int wd = width >> 1;
+	int i = 0;
+	for(Ctrl *q = GetFirstChild(); q; q = q->GetNext()) {
+		int lo = i > 0 ? PosToClient(pos[i - 1]) + wd : 0;
+		int hi = i < count ? PosToClient(pos[i]) - wd : vert ? sz.cy : sz.cx;
+		q->Show();
+		if(vert)
+			q->SetRect(0, lo, sz.cx, hi - lo);
+		else
+			q->SetRect(lo, 0, hi - lo, sz.cy);
+		i++;
+	}
+}
+
+void   Splitter::Paint(Draw& w) {
+	Size sz = GetSize();
+	w.Begin();
+	if(HasCapture() && mouseindex >= 0 && mouseindex < pos.GetCount()) {
+		int p = PosToClient(pos[mouseindex]) - (width >> 1);
+		Rect r = vert ? RectC(0, p, sz.cx, width) : RectC(p, 0, width, sz.cy);
+		w.DrawRect(r, GUI_GlobalStyle() >= GUISTYLE_XP ? Blend(SColorHighlight, SColorFace) : SColorShadow);
+		w.ExcludeClip(r);
+	}
+	w.DrawRect(sz, SColorFace());
+	w.End();
+}
+
+void   Splitter::MouseMove(Point p, dword) {
+	if(HasCapture() && mouseindex >= 0 && mouseindex < pos.GetCount()) {
+		SetPos(ClientToPos(p), mouseindex);
+		WhenAction();
+	}
+}
+
+void   Splitter::LeftDown(Point p, dword) {
+	SetCapture();
+	Refresh();
+	mouseindex = FindIndex(p);
+}
+
+int Splitter::FindIndex(Point client) const {
+	int best = -1;
+	int maxdist = width;
+	for(int i = 0; i < pos.GetCount(); i++) {
+		int dist = abs((vert ? client.y : client.x) - PosToClient(pos[i]));
+		if(dist < maxdist) {
+			best = i;
+			maxdist = abs(dist);
+		}
+	}
+	return best;
+}
+
+void   Splitter::LeftUp(Point p, dword keyflags) {
+	Refresh();
+}
+
+Image Splitter::CursorImage(Point p, dword) {
+	return FindIndex(p) < 0 ? Image::Arrow() : vert ? Image::SizeVert() : Image::SizeHorz();
+}
+
+int Splitter::GetMins(int i) const
+{
+	int min1 = (i < mins.GetCount() ? mins[i] : 0);
+	int min2 = 0;
+	int cx = GetSize().cx;
+	if(cx)
+		min2 = (i < minpx.GetCount() ? minpx[i] : 0) * 10000 / cx;
+	return max(min1, min2);
+}
+
+Splitter& Splitter::SetPos(int p, int i) {
+	int l = (i > 0 && i - 1 < pos.GetCount() ? pos[i - 1] : 0) + GetMins(i);
+	int h = (i + 1 < pos.GetCount() ? pos[i + 1] : 10000) - GetMins(i + 1);
+	pos.At(i) = minmax(p, l, h);
+	Layout();
+	return *this;
+}
+
+void   Splitter::Zoom(int i)
+{
+	style = i;
+	Layout();
+}
+
+Splitter& Splitter::BarWidth(int w)
+{
+	width = w;
+	Layout();
+	return *this;
+}
+
+Splitter& Splitter::Vert(Ctrl& top, Ctrl& bottom)
+{
+	vert = true;
+	Set(top, bottom);
+	return *this;
+}
+
+Splitter& Splitter::Horz(Ctrl& left, Ctrl& right)
+{
+	vert = false;
+	Set(left, right);
+	return *this;
+}
+
+void Splitter::Set(Ctrl& l, Ctrl& r)
+{
+	Clear();
+	*this << l << r;
+	Layout();
+}
+
+void Splitter::Add(Ctrl& pane)
+{
+	Ctrl::Add(pane);
+	Layout();
+}
+
+void Splitter::Serialize(Stream& s) {
+	int version = 0x02;
+	s / version;
+	if(version <= 1) {
+		int p = GetPos(0);
+		s % p;
+		SetPos(p, 0);
+	}
+	else
+		s % pos;
+	if(version >= 0x01) {
+		s / style;
+		if(version == 0x01 && style == 3)
+			style = -1;
+	}
+	if(s.IsLoading()) {
+		for(int i = 0; i < pos.GetCount(); i++)
+			if(pos[i] < 0 || pos[i] >= 10000) {
+				pos.Clear();
+				s.LoadError();
+			}
+		if(style >= GetChildCount()) {
+			style = -1;
+			s.LoadError();
+		}
+		Layout();
+	}
+}
+
+void Splitter::Clear() {
+	while(GetFirstChild())
+		RemoveChild(GetFirstChild());
+}
+
+void Splitter::Reset() {
+	Clear();
+	pos.Clear();
+	mins.Clear();
+	style = -1;
+	width = 4;
+	vert = false;
+}
+
+Splitter::Splitter() {
+	style = -1;
+	pos.Add(5000);
+	width = 4;
+	SetFrame(NullFrame());
+	vert = false;
+	NoWantFocus();
+	VSizePos(0, 0).HSizePos(0, 0);
+	mouseindex = -1;
+}
+
+Splitter::~Splitter() {}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/CtrlLib/Splitter.h b/uppsrc/CtrlLib/Splitter.h
new file mode 100644
index 000000000..0bc11ac0e
--- /dev/null
+++ b/uppsrc/CtrlLib/Splitter.h
@@ -0,0 +1,104 @@
+class Splitter : public Ctrl {
+public:
+	virtual void   Layout();
+	virtual void   Paint(Draw& draw);
+	virtual void   MouseMove(Point p, dword keyflags);
+	virtual void   LeftDown(Point p, dword keyflags);
+	virtual void   LeftUp(Point p, dword keyflags);
+	virtual Image  CursorImage(Point p, dword keyflags);
+	virtual void   Serialize(Stream& s);
+
+protected:
+	Vector<int> pos;
+	Vector<int> mins;
+	Vector<int> minpx;
+	int         width;
+	int         style;
+	int         mouseindex;
+	bool        vert;
+	int         inset;
+
+	int       ClientToPos(Point client) const;
+	int       PosToClient(int pos) const;
+	int       FindIndex(Point client) const;
+	int       GetChildCount() const;
+	int       GetMins(int i) const;
+
+public:
+	void      Set(Ctrl& l, Ctrl& r);
+
+	Splitter& SetPos(int newpos, int index = 0);
+	int       GetPos(int index = 0) const          { return index < pos.GetCount() ? pos[index] : 10000; }
+
+	int       GetCount() const                     { return GetChildCount(); }
+
+	void      Zoom(int i);
+	void      NoZoom()                             { Zoom(-1); }
+	int       GetZoom() const                      { return style; }
+
+	void      SetMin(int i, int w)                 { mins.At(i, 0) = w; }
+	void      SetMinPixels(int i, int w)           { minpx.At(i, 0) = w; }
+
+	void      Add(Ctrl& pane);
+	Splitter& operator<<(Ctrl& pane)               { Add(pane); return *this; }
+
+	Splitter& Vert(Ctrl& top, Ctrl& bottom);
+	Splitter& Horz(Ctrl& left, Ctrl& right);
+	Splitter& Vert()                               { vert = true; Layout(); return *this; }
+	Splitter& Horz()                               { vert = false; Layout(); return *this; }
+	Splitter& BarWidth(int w);
+	bool      IsHorz() const                       { return !vert; }
+	bool      IsVert() const                       { return vert; }
+
+	void      Clear();
+	void      Reset();
+
+	Splitter();
+	virtual ~Splitter();
+};
+
+class SplitterFrame : public CtrlFrame, private Ctrl {
+public:
+	virtual void FrameAdd(Ctrl& parent);
+	virtual void FrameRemove();
+	virtual void FrameAddSize(Size& sz);
+	virtual void FrameLayout(Rect& r);
+
+	virtual void Paint(Draw& draw);
+	virtual void LeftDown(Point p, dword keyflags);
+	virtual void MouseMove(Point p, dword keyflags);
+	virtual void LeftUp(Point p, dword keyflags);
+	virtual Image CursorImage(Point p, dword keyflags);
+
+private:
+	Point ref;
+	Size  parentsize;
+	int   type, minsize, sizemin;
+	int   size, size0;
+
+	int   BoundSize();
+
+public:
+	enum { LEFT, TOP, RIGHT, BOTTOM };
+
+	void Serialize(Stream& s);
+
+	SplitterFrame& Set(Ctrl& c, int size, int type);
+	SplitterFrame& Left(Ctrl& c, int size)    { return Set(c, size, LEFT); }
+	SplitterFrame& Top(Ctrl& c, int size)     { return Set(c, size, TOP); }
+	SplitterFrame& Right(Ctrl& c, int size)   { return Set(c, size, RIGHT); }
+	SplitterFrame& Bottom(Ctrl& c, int size)  { return Set(c, size, BOTTOM); }
+
+	SplitterFrame& MinSize(int sz)            { minsize = sz; return *this; }
+	SplitterFrame& SizeMin(int sz)            { sizemin = sz; return *this; }
+
+	int  GetType() const                      { return type; }
+	int  GetSize() const                      { return size; }
+	void SetSize(int sz)                      { size = sz; RefreshParentLayout(); }
+
+	void Show(bool show = true)				  { Ctrl::Show(show); }
+	void Hide()								  { Ctrl::Hide(); }
+	bool IsShown()							  { return Ctrl::IsShown(); }
+
+	SplitterFrame();
+};
diff --git a/uppsrc/CtrlLib/Static.cpp b/uppsrc/CtrlLib/Static.cpp
new file mode 100644
index 000000000..92c817069
--- /dev/null
+++ b/uppsrc/CtrlLib/Static.cpp
@@ -0,0 +1,346 @@
+#include "CtrlLib.h"
+
+NAMESPACE_UPP
+
+void StaticText::Paint(Draw& w)
+{
+	Size sz = GetSize();
+	if(!IsTransparent())
+		w.DrawRect(0, 0, sz.cx, sz.cy, SColorFace);
+	PaintLabel(w, 0, 0, sz.cx, sz.cy, !IsShowEnabled(), false, false, VisibleAccessKeys());
+}
+
+Size StaticText::GetMinSize() const
+{
+	return GetLabelSize();
+}
+
+void StaticText::LabelUpdate() {
+	Refresh();
+}
+
+StaticText::StaticText()
+{
+	NoWantFocus();
+	IgnoreMouse();
+	Transparent();
+	SetAlign(ALIGN_LEFT);
+}
+
+Label& Label::SetText(const char *text)
+{
+	LabelBase::SetText(text);
+	lbl.accesskey = 0;
+	noac = false;
+	return *this;
+}
+
+Label& Label::SetLabel(const char *_text)
+{
+	String text;
+	byte accesskey = ExtractAccessKey(_text, text);
+	LabelBase::SetText(text);
+	lbl.accesskey = accesskey;
+	return *this;
+}
+
+bool Label::HotKey(dword key) {
+	if(CompareAccessKey(lbl.accesskey, key)) {
+		IterateFocusForward(this, GetParent());
+		return true;
+	}
+	return false;
+}
+
+dword Label::GetAccessKeys() const
+{
+	return AccessKeyBit(lbl.accesskey);
+}
+
+void  Label::AssignAccessKeys(dword used)
+{
+	if(noac)
+		return;
+	Ctrl *next = GetNext();
+	if(!lbl.accesskey && next && next->IsInitFocus()) {
+		next->AssignAccessKeys(used);
+		if(!next->GetAccessKeysDeep()) {
+			lbl.accesskey = ChooseAccessKey(GetText(), used);
+			if(lbl.accesskey) Refresh();
+			used |= AccessKeyBit(lbl.accesskey);
+		}
+	}
+	Ctrl::AssignAccessKeys(used);
+}
+
+Label::Label() {
+	noac = false;
+}
+
+Label::~Label() {}
+
+CH_COLOR(LabelBoxTextColor, LtBlue());
+CH_COLOR(LabelBoxColor, SColorShadow());
+
+LabelBox::LabelBox()
+{
+	SetInk(LabelBoxTextColor);
+	SetVAlign(ALIGN_TOP);
+}
+
+void  LabelBox::AssignAccessKeys(dword used)
+{
+	Ctrl::AssignAccessKeys(used);
+}
+
+LabelBox::~LabelBox() {}
+
+Rect LabelBox::GetVoidRect()
+{
+	Rect r = GetSize();
+	r.left += 2;
+	r.top += max(GetLabelSize().cy, 2);
+	r.bottom -= 2;
+	r.right -= 2;
+	return r;
+}
+
+void LabelBox::Paint(Draw& w)
+{
+	Size sz = GetSize();
+	if(!IsTransparent())
+		w.DrawRect(sz, SColorFace);
+	Size lsz = GetLabelSize();
+	int d = lsz.cy >> 1;
+	bool hline = sz.cy < 2 * Draw::GetStdFontCy();
+	bool vline = sz.cx < 2 * Draw::GetStdFontCy();
+	int ty = hline ? (sz.cy - lsz.cy) / 2 : 0;
+	Size ts = PaintLabel(w, d + 2, ty, sz.cx, lsz.cy, !IsShowEnabled(), false, false, VisibleAccessKeys());
+	w.Begin();
+	w.ExcludeClip(d, ty, ts.cx + 4, ts.cy);
+	if(GUI_GlobalStyle() >= GUISTYLE_XP) {
+		if(hline) {
+			d = sz.cy / 2;
+			w.DrawRect(0, d - 1, sz.cx, 1, SColorLight);
+			w.DrawRect(0, d, sz.cx, 1, SColorShadow);
+			w.DrawRect(0, d + 1, sz.cx, 1, SColorLight);
+		}
+		else
+		if(vline) {
+			d = sz.cx / 2;
+			w.DrawRect(d - 1, 0, 1, sz.cy, SColorLight);
+			w.DrawRect(d, 0, 1, sz.cy, SColorShadow);
+			w.DrawRect(d + 1, 0, 1, sz.cy, SColorLight);
+		}
+		else {
+			w.DrawRect(0, d + 2, 1, sz.cy - d - 4, LabelBoxColor);
+			w.DrawRect(sz.cx - 1, d + 2, 1, sz.cy - d - 4, LabelBoxColor);
+			w.DrawRect(2, sz.cy - 1, sz.cx - 4, 1, LabelBoxColor);
+			w.DrawRect(2, d, sz.cx - 4, 1, LabelBoxColor);
+
+			w.DrawRect(1, d + 1, 2, 1, LabelBoxColor);
+			w.DrawRect(1, d + 2, 1, 1, LabelBoxColor);
+
+			w.DrawRect(sz.cx - 3, d + 1, 2, 1, LabelBoxColor);
+			w.DrawRect(sz.cx - 2, d + 2, 1, 1, LabelBoxColor);
+
+			w.DrawRect(1, sz.cy - 2, 2, 1, LabelBoxColor);
+			w.DrawRect(1, sz.cy - 3, 1, 1, LabelBoxColor);
+
+			w.DrawRect(sz.cx - 3, sz.cy - 2, 2, 1, LabelBoxColor);
+			w.DrawRect(sz.cx - 2, sz.cy - 3, 1, 1, LabelBoxColor);
+		}
+	}
+	else {
+		if(hline) {
+			d = sz.cy / 2;
+			w.DrawRect(0, d, sz.cx, 1, SColorShadow);
+			w.DrawRect(0, d + 1, sz.cx, 1, SColorLight);
+		}
+		else
+		if(vline) {
+			d = sz.cx / 2;
+			w.DrawRect(d, 0, 1, sz.cy, SColorShadow);
+			w.DrawRect(d - 1, 1, 0, sz.cy, SColorLight);
+		}
+		else {
+			w.DrawRect(1, d, sz.cx - 2, 1, SColorShadow);
+			w.DrawRect(1, d + 1, sz.cx - 2, 1, SColorLight);
+
+			w.DrawRect(0, d, 1, sz.cy - d - 1, SColorShadow);
+			w.DrawRect(1, d + 1, 1, sz.cy - d - 2, SColorLight);
+
+			w.DrawRect(sz.cx - 2, d, 1, sz.cy - d, SColorShadow);
+			w.DrawRect(sz.cx - 1, d, 1, sz.cy - d, SColorLight);
+
+			w.DrawRect(1, sz.cy - 2, sz.cx - 2, 1, SColorShadow);
+			w.DrawRect(1, sz.cy - 1, sz.cx - 2, 1, SColorLight);
+		}
+	}
+	w.End();
+}
+
+Rect ParentCtrl::GetVoidRect()
+{
+	return GetSize();
+}
+
+Size ParentCtrl::GetStdSize() const
+{
+	return GetMinSize();
+}
+
+Size ParentCtrl::GetMinSize() const
+{
+	return IsNull(minsize) ? Ctrl::GetMinSize() : minsize;
+}
+
+ParentCtrl::ParentCtrl()
+{
+	NoWantFocus();
+	Transparent();
+	minsize = Null;
+}
+
+StaticRect& StaticRect::Background(const Value& chvalue)
+{
+	if(chvalue != bg) {
+		bg = chvalue;
+		Refresh();
+	}
+	return *this;
+}
+
+void StaticRect::Paint(Draw& w)
+{
+	ChPaint(w, GetSize(), bg);
+}
+
+StaticRect::StaticRect() {
+	bg = SColorFace();
+	NoWantFocus();
+}
+
+StaticRect::~StaticRect() {}
+
+void ImageCtrl::Paint(Draw& w)
+{
+	if(!img) return;
+	Size sz = GetSize();
+	Size bsz = GetStdSize();
+	w.DrawImage((sz.cx - bsz.cx) / 2, (sz.cy - bsz.cy) / 2, img);
+}
+
+Size ImageCtrl::GetStdSize() const
+{
+	return img.GetSize();
+}
+
+Size ImageCtrl::GetMinSize() const
+{
+	return img.GetSize();
+}
+
+void Picture::Paint(Draw& w) {
+	Size sz = GetSize();
+	w.DrawRect(0, 0, sz.cx, sz.cy, background);
+	if(!picture) return;
+	int dx = 0;
+	int dy = 0;
+	Size rz = sz;
+	if(ratio) {
+		Size sr = picture.GetSize();
+		if(sr.cy * sz.cx < sz.cy * sr.cx) {
+			rz.cy = sr.cy * sz.cx / sr.cx;
+			dy = (sz.cy - rz.cy) / 2;
+		}
+		else {
+			rz.cx = sr.cx * sz.cy / sr.cy;
+			dx = (sz.cx - rz.cx) / 2;
+		}
+	}
+	w.Clipoff(dx, dy, rz.cx, rz.cy);
+	w.DrawDrawing(0, 0, rz.cx, rz.cy, picture);
+	w.End();
+}
+
+Picture::Picture() {
+	ratio = true;
+	background = White;
+}
+
+Size SeparatorCtrl::GetMinSize() const {
+	return Size(size, size);
+}
+
+CH_STYLE(SeparatorCtrl, Style, StyleDefault)
+{
+	l1 = SColorShadow();
+	l2 = Null;
+}
+
+void SeparatorCtrl::Paint(Draw& w) {
+	Size sz = GetSize();
+	if(sz.cx > sz.cy) {
+		int q = sz.cy / 2;
+		ChPaint(w, lmargin, q - 1, sz.cx - (lmargin + rmargin), 1, style->l1);
+		ChPaint(w, lmargin, q, sz.cx - (lmargin + rmargin), 1, style->l2);
+	}
+	else {
+		int q = sz.cx / 2;
+		ChPaint(w, q - 1, lmargin, 1, sz.cy - (lmargin + rmargin), style->l1);
+		ChPaint(w, q, lmargin, 1, sz.cy - (lmargin + rmargin), style->l2);
+	}
+};
+
+SeparatorCtrl& SeparatorCtrl::Margin(int l, int r)
+{
+	if(l != lmargin || r != rmargin) {
+		lmargin = l;
+		rmargin = r;
+		Refresh();
+	}
+	return *this;
+}
+
+SeparatorCtrl& SeparatorCtrl::SetSize(int w)
+{
+	if(w != size) {
+		size = w;
+		Refresh();
+	}
+	return *this;
+}
+
+SeparatorCtrl::SeparatorCtrl()
+{
+	NoWantFocus();
+	Transparent();
+	Disable();
+	lmargin = rmargin = 2;
+	size = 7;
+	SetStyle(StyleDefault());
+}
+
+void DisplayCtrl::Paint(Draw& w)
+{
+	pr.Paint(w, GetSize());
+}
+
+Size DisplayCtrl::GetMinSize() const
+{
+	return pr.GetStdSize();
+}
+
+void DisplayCtrl::SetData(const Value& v)
+{
+	pr.SetValue(v);
+	Refresh();
+}
+
+void DisplayCtrl::SetDisplay(const Display& d)
+{
+	pr.SetDisplay(d);
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/CtrlLib/StaticCtrl.h b/uppsrc/CtrlLib/StaticCtrl.h
new file mode 100644
index 000000000..a66d8f9c2
--- /dev/null
+++ b/uppsrc/CtrlLib/StaticCtrl.h
@@ -0,0 +1,158 @@
+class StaticText : public Ctrl, public LabelBase {
+public:
+	virtual void   Paint(Draw& w);
+	virtual Size   GetMinSize() const;
+	virtual void   LabelUpdate();
+
+public:
+	StaticText& SetFont(Font font)                      { LabelBase::SetFont(font); return *this; }
+	StaticText& SetInk(Color color)                     { LabelBase::SetInk(color); return *this; }
+	StaticText& SetAlign(int align)                     { LabelBase::SetAlign(align); return *this; }
+	StaticText& SetImage(const Image& img, int spc = 0) { LabelBase::SetImage(img, spc); return *this; }
+	StaticText& SetText(const char *text)               { LabelBase::SetText(text); return *this; }
+
+	StaticText& operator=(const char *s)                { SetText(s); return *this; }
+
+	StaticText();
+};
+
+class Label : public StaticText {
+public:
+	virtual bool   HotKey(dword key);
+	virtual dword  GetAccessKeys() const;
+	virtual void   AssignAccessKeys(dword used);
+
+private:
+	bool   noac;
+
+public:
+	Label& SetText(const char *text);
+	Label& SetLabel(const char *lbl);
+
+	Label& operator=(const char *s)                     { SetText(s); return *this; }
+
+	Label();
+	virtual ~Label();
+};
+
+class LabelBox : public Label {
+public:
+	virtual void   Paint(Draw& w);
+	virtual void   AssignAccessKeys(dword used);
+	virtual Rect   GetVoidRect();
+
+public:
+	LabelBox();
+	virtual ~LabelBox();
+	LabelBox& operator=(const char *s)   { SetText(s); return *this; }
+};
+
+Color LabelBoxTextColor();
+Color LabelBoxColor();
+
+void LabelBoxTextColor_Write(Color c);
+void LabelBoxColor_Write(Color c);
+
+class ParentCtrl : public Ctrl {
+	Size minsize;
+
+public:
+	virtual Rect   GetVoidRect();
+	virtual Size   GetStdSize() const;
+	virtual Size   GetMinSize() const;
+
+	void    SetMinSize(Size sz)         { minsize = sz; }
+
+	ParentCtrl();
+};
+
+class StaticRect : public Ctrl {
+public:
+	virtual void   Paint(Draw& w);
+
+protected:
+	Value bg;
+
+public:
+	StaticRect& Background(const Value& chvalue);
+	StaticRect& Color(class Color c)                   { Background(c); return *this; }
+
+	StaticRect();
+	virtual ~StaticRect();
+};
+
+class ImageCtrl : public Ctrl {
+public:
+	virtual void   Paint(Draw& w);
+	virtual Size   GetStdSize() const;
+	virtual Size   GetMinSize() const;
+
+protected:
+	Image   img;
+
+public:
+	ImageCtrl&   SetImage(const Image& _img)          { img = _img; Refresh(); return *this; }
+
+	ImageCtrl()                                       { Transparent(); NoWantFocus(); }
+};
+
+class DisplayCtrl : public Ctrl {
+public:
+	virtual void   Paint(Draw& w);
+	virtual Size   GetMinSize() const;
+	virtual void   SetData(const Value& v);
+
+private:
+	PaintRect pr;
+
+public:
+	void SetDisplay(const Display& d);
+};
+
+// BWC
+typedef ImageCtrl Icon;
+
+class Picture : public Ctrl {
+public:
+	virtual void   Paint(Draw& w);
+
+protected:
+	Drawing picture;
+	Color   background;
+	bool    ratio;
+
+public:
+	Picture& Background(Color color)             { background = color; Refresh(); return *this; }
+	Picture& KeepRatio(bool keep = true)         { ratio = keep; Refresh(); return *this; }
+	Picture& NoKeepRatio()                       { return KeepRatio(false); }
+	Picture& Set(const Drawing& _picture)        { picture = _picture; Refresh(); return *this; }
+
+	Picture& operator=(const Drawing& _picture)  { return Set(_picture); }
+
+	Picture();
+};
+
+class SeparatorCtrl : public Ctrl {
+public:
+	virtual Size GetMinSize() const;
+	virtual void Paint(Draw& w);
+
+	struct Style : ChStyle<Style> {
+		Value l1, l2;
+	};
+
+private:
+	int          lmargin, rmargin;
+	int          size;
+	const Style *style;
+
+public:
+	static const Style& StyleDefault();
+
+	SeparatorCtrl& Margin(int l, int r);
+	SeparatorCtrl& Margin(int w)                { return Margin(w, w); }
+	SeparatorCtrl& SetSize(int w);
+	SeparatorCtrl& SetStyle(const Style& s)     { style = &s; Refresh(); return *this; }
+
+	SeparatorCtrl();
+};
diff --git a/uppsrc/CtrlLib/StatusBar.cpp b/uppsrc/CtrlLib/StatusBar.cpp
new file mode 100644
index 000000000..fb0e71724
--- /dev/null
+++ b/uppsrc/CtrlLib/StatusBar.cpp
@@ -0,0 +1,311 @@
+#include "CtrlLib.h"
+
+NAMESPACE_UPP
+
+class RightInfoFrame : public CtrlFrame {
+	virtual void FrameLayout(Rect& r);
+	virtual void FramePaint(Draw& draw, const Rect& r);
+	virtual void FrameAddSize(Size& sz);
+};
+
+void RightInfoFrame::FrameLayout(Rect& r)
+{
+	r.left += 3;
+	r.right--;
+	r.top++;
+	r.bottom--;
+}
+
+void RightInfoFrame::FramePaint(Draw& w, const Rect& r)
+{
+	w.DrawRect(r.left, r.top, 2, r.Height(), SColorFace);
+	DrawFrame(w, r.left + 2, r.top, r.Width() - 2, r.Height(), SColorShadow, SColorLight);
+}
+
+void RightInfoFrame::FrameAddSize(Size& sz)
+{
+	sz.cx += 4;
+	sz.cy += 2;
+}
+
+class LeftInfoFrame : public CtrlFrame {
+	virtual void FrameLayout(Rect& r);
+	virtual void FramePaint(Draw& draw, const Rect& r);
+	virtual void FrameAddSize(Size& sz);
+};
+
+void LeftInfoFrame::FrameLayout(Rect& r)
+{
+	r.left++;
+	r.right -= 3;
+	r.top++;
+	r.bottom--;
+}
+
+void LeftInfoFrame::FramePaint(Draw& w, const Rect& r)
+{
+	w.DrawRect(r.right - 2, r.top, 2, r.Height(), SColorFace);
+	DrawFrame(w, r.left, r.top, r.Width() - 2, r.Height(), SColorShadow, SColorLight);
+}
+
+void LeftInfoFrame::FrameAddSize(Size& sz)
+{
+	sz.cx += 4;
+	sz.cy += 2;
+}
+
+InfoCtrl::InfoCtrl()
+{
+	SetFrame(ThinInsetFrame());
+	right = false;
+	defaulttext = t_("Ready");
+	Set(Null);
+	Transparent();
+}
+
+void InfoCtrl::Paint(Draw& w)
+{
+	Size sz = GetSize();
+	Rect r = sz;
+	if(temp) {
+		r.left = 2;
+		temp.Paint(w, r);
+	}
+	else {
+		r.right = 2;
+		for(int i = 0; i < tab.GetCount() && r.right < sz.cx; i++) {
+			const Tab& t = tab[i];
+			r.left = r.right;
+			if(t.width < 0)
+				r.right = max(r.right, sz.cx + t.width);
+			else
+				r.right = min((dword)sz.cx, dword(r.right) + t.width);
+			t.info.Paint(w, r);
+		}
+	}
+}
+
+int InfoCtrl::GetTabOffset(int t) const
+{
+	Size sz = GetSize();
+	Rect r = sz;
+	r.right = 2;
+	for(int i = 0; i < tab.GetCount() && r.right < sz.cx; i++) {
+		const Tab& t = tab[i];
+		r.left = r.right;
+		if(t.width < 0)
+			r.right = max(r.right, sz.cx + t.width);
+		else
+			r.right = min((dword)sz.cx, dword(r.right) + t.width);
+	}
+	return r.right;
+}
+
+int InfoCtrl::GetRealTabWidth(int tabi, int width) const
+{
+	int cx = GetSize().cx;
+	int x = 2;
+	for(int i = 0; i < tabi; i++) {
+		const Tab& t = tab[i];
+		if(t.width < 0)
+			x = max(x, cx + t.width);
+		else {
+			if((dword)x + t.width > (dword)cx) return 0;
+			x += t.width;
+		}
+	}
+	return width < 0 ? max(x, cx + width) - x : min(cx - x, width);
+}
+
+void InfoCtrl::FrameLayout(Rect& r) {
+	(right ? LayoutFrameRight : LayoutFrameLeft)(r, this, cx ? cx : r.Height());
+};
+
+class VCenterDisplay : public Display
+{
+public:
+	void Paint(Draw& w, const Rect& r, const Value& q, Color ink, Color paper, dword s) const {
+		if(IsType<Image>(q)) {
+			Image img = q;
+			Size sz = img.GetSize();
+			w.DrawImage(r.left, r.top + (r.Height() - sz.cy) / 2, img);
+		}
+		else {
+			String text;
+			if(IsString(q))
+				text = q;
+			else
+				text = StdFormat(q);
+			w.DrawText(r.left, r.top + (r.Height() - StdFont().Info().GetHeight()) / 2,
+			           text, StdFont(), ink);
+		}
+	}
+};
+
+void InfoCtrl::Set(int _tab, const PaintRect& info, int width)
+{
+	Tab& t = tab.At(_tab);
+	t.width = width;
+	t.info = info;
+	Refresh();
+}
+
+void InfoCtrl::Set(int tab, const Value& info, int width)
+{
+	Set(tab, PaintRect(Single<VCenterDisplay>(), info), width);
+}
+
+void InfoCtrl::Set(const PaintRect& info)
+{
+	tab.Clear();
+	Set(0, info, INT_MAX);
+}
+
+void InfoCtrl::Set(const Value& info)
+{
+	tab.Clear();
+	Set(0, Nvl(info, (Value)defaulttext), INT_MAX);
+}
+
+void InfoCtrl::EndTemporary()
+{
+	temptime.Kill();
+	temp.Clear();
+	Refresh();
+}
+
+void InfoCtrl::Temporary(const PaintRect& info, int timeout)
+{
+	temptime.KillSet(timeout, THISBACK(EndTemporary));
+	temp = info;
+	Refresh();
+}
+
+void InfoCtrl::Temporary(const Value& info, int timeout)
+{
+	Temporary(PaintRect(Single<VCenterDisplay>(), info), timeout);
+}
+
+InfoCtrl& InfoCtrl::Left(int w)
+{
+	right = false;
+	Width(w);
+	SetFrame(Single<LeftInfoFrame>());
+	return *this;
+}
+
+InfoCtrl& InfoCtrl::Right(int w)
+{
+	right = true;
+	Width(w);
+	SetFrame(Single<RightInfoFrame>());
+	return *this;
+}
+
+CH_STYLE(StatusBar, Style, StyleDefault)
+{
+	look = SColorFace();
+}
+
+void StatusBar::TopFrame::FrameLayout(Rect& r)
+{
+	r.top += 2;
+}
+
+void StatusBar::TopFrame::FramePaint(Draw& w, const Rect& r)
+{
+	ChPaint(w, r, style->look);
+}
+
+void StatusBar::Paint(Draw& w)
+{
+	ChPaint(w, GetScreenRect().Offseted(-GetScreenView().TopLeft()), frame.style->look);
+	InfoCtrl::Paint(w);
+}
+
+void StatusBar::TopFrame::FrameAddSize(Size& sz)
+{
+	sz.cy += 2;
+}
+
+StatusBar::StatusBar()
+{
+	Height(5 + max(16, Draw::GetStdFontCy()));
+	frame.style = frame.style = &StyleDefault();
+	SetFrame(frame);
+	AddFrame(grip);
+}
+
+StatusBar::~StatusBar()
+{
+}
+
+StatusBar& StatusBar::Height(int _cy)
+{
+	cy = _cy;
+	RefreshParentLayout();
+	return *this;
+}
+
+void StatusBar::FrameLayout(Rect& r) {
+	LayoutFrameBottom(r, this, cy ? cy : r.Width());
+}
+
+void StatusBar::FrameAddSize(Size& sz) {
+	sz.cy += cy * IsShown();
+}
+
+class ProgressDisplayCls : public Display {
+public:
+	virtual void Paint(Draw& w, const Rect& r, const Value& q, Color ink, Color paper, dword s) const;
+};
+
+void ProgressDisplayCls::Paint(Draw& w, const Rect& _r, const Value& q,
+                               Color ink, Color paper, dword s) const
+{
+	Rect r = _r;
+	r.top += 1;
+	r.bottom -= 1;
+	DrawBorder(w, r, InsetBorder);
+	r.Deflate(2);
+	int pos = minmax(int((double)q * r.Width() / 1000), 0, r.Width());
+	if(pos) {
+		w.DrawRect(r.left, r.top, 1, r.Height(), SColorLight);
+		w.DrawRect(r.left + 1, r.top, pos - 1, 1, SColorLight);
+		w.DrawRect(r.left + 1, r.top + 1, pos - 1, r.Height() - 2, LtBlue);
+		w.DrawRect(r.left + 1, r.top + r.Height() - 1, pos - 1, 1, SColorLight);
+		w.DrawRect(r.left + pos - 1, r.top + 1, 1, r.Height() - 1, SColorLight);
+	}
+	w.DrawRect(r.left + pos, r.top, r.Width() - pos, r.Height(), SColorPaper);
+};
+
+Display& ProgressDisplay()
+{
+	return Single<ProgressDisplayCls>();
+}
+
+void ProgressInfo::Refresh()
+{
+	if(!info) return;
+	String txt = Format(~text, pos);
+	info->Set(tabi, txt, tw ? tw : GetTextSize(txt, StdFont()).cx + 8);
+	info->Set(tabi + 1, PaintRect(ProgressDisplay(), 1000.0 * pos / total), cx);
+}
+
+ProgressInfo& ProgressInfo::Set(int _pos, int _total)
+{
+	pos = _pos;
+	total = _total;
+	Refresh();
+	if(info)
+		info->Sync();
+	return *this;
+}
+
+ProgressInfo::~ProgressInfo()
+{
+	if(info)
+		info->Set(Null);
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/CtrlLib/StatusBar.h b/uppsrc/CtrlLib/StatusBar.h
new file mode 100644
index 000000000..dbdc4847d
--- /dev/null
+++ b/uppsrc/CtrlLib/StatusBar.h
@@ -0,0 +1,123 @@
+class InfoCtrl : public FrameLR<Ctrl> {
+public:
+	virtual void Paint(Draw& w);
+	virtual void FrameLayout(Rect& r);
+
+private:
+
+	struct Tab {
+		PaintRect             info;
+		int                   width;
+
+		Tab() { width = 0; }
+	};
+
+	Array<Tab>   tab;
+	PaintRect    temp;
+	bool         right;
+	String       defaulttext;
+	TimeCallback temptime;
+
+public:
+	void Set(int tab, const PaintRect& info, int width);
+	void Set(int tab, const Value& info, int width);
+	void Set(const PaintRect& info);
+	void Set(const Value& info);
+	void Temporary(const PaintRect& info, int timeoout = 2000);
+	void Temporary(const Value& info, int timeout = 2000);
+	void EndTemporary();
+
+	int  GetTabCount() const              { return tab.GetCount(); }
+	int  GetTabOffset(int t) const;
+	int  GetRealTabWidth(int tabi, int width) const;
+
+	void operator=(const String& s)       { Set(s); }
+
+	InfoCtrl& SetDefault(const String& d) { defaulttext = d; Refresh(); return *this; }
+	InfoCtrl& Left(int w);
+	InfoCtrl& Right(int w);
+
+	typedef InfoCtrl CLASSNAME;
+
+	InfoCtrl();
+};
+
+class StatusBar : public InfoCtrl {
+public:
+	virtual void FrameLayout(Rect& r);
+	virtual void FrameAddSize(Size& sz);
+	virtual void Paint(Draw& w);
+
+public:
+	struct Style : public ChStyle<Style> {
+		Value look;
+	};
+
+private:
+	int      cy;
+	SizeGrip grip;
+	
+	struct TopFrame : public CtrlFrame {
+		virtual void FrameLayout(Rect& r);
+		virtual void FramePaint(Draw& draw, const Rect& r);
+		virtual void FrameAddSize(Size& sz);
+		
+		const Style *style;
+	};
+	
+	TopFrame frame;
+
+	void    SetText(const String& s)          { Set(s); }
+
+public:
+	void operator=(const String& s)           { Set(s); }
+
+	operator Callback1<const String&>()       { return pteback(this, &StatusBar::SetText); }
+
+	StatusBar&  Height(int _cy);
+	StatusBar&  NoSizeGrip()                  { RemoveFrame(grip); return *this; }
+
+	static const Style& StyleDefault();
+
+	InfoCtrl& SetStyle(const Style& s)        { frame.style = &s; Refresh(); return *this; }
+
+	StatusBar();
+	~StatusBar();
+};
+
+
+Display& ProgressDisplay();
+
+class ProgressInfo {
+	InfoCtrl *info;
+	String    text;
+	int       tw;
+	int       tabi;
+	int       cx;
+	int       total;
+	int       pos;
+
+	void Refresh();
+	void Reset()                                { tabi = 0; cx = 200; total = 100; pos = 0; tw = 0; info = NULL; }
+
+public:
+	ProgressInfo& Text(const String& s)         { text = s; Refresh(); return *this; }
+	ProgressInfo& TextWidth(int cx)             { tw = cx; Refresh(); return *this; }
+	ProgressInfo& Width(int _cx)                { cx = _cx; Refresh(); return *this;  }
+	ProgressInfo& Placement(int _tabi)          { tabi = _tabi; Refresh(); return *this; }
+	ProgressInfo& Info(InfoCtrl& _info)         { info = &_info; info->EndTemporary(); Refresh(); return *this; }
+	ProgressInfo& Total(int _total)             { total = _total; Refresh(); return *this; }
+
+	ProgressInfo& Set(int _pos, int _total);
+
+	void          Set(int _pos)                 { Set(_pos, total); }
+	int           Get() const                   { return pos; }
+
+	void operator=(int p)                       { Set(p); }
+	void operator++()                           { pos++; Refresh(); }
+	operator int()                              { return pos; }
+
+	ProgressInfo()                              { Reset(); }
+	ProgressInfo(InfoCtrl& f)                   { Reset(); Info(f); }
+	~ProgressInfo();
+};
diff --git a/uppsrc/CtrlLib/Switch.cpp b/uppsrc/CtrlLib/Switch.cpp
new file mode 100644
index 000000000..4bcfa65c9
--- /dev/null
+++ b/uppsrc/CtrlLib/Switch.cpp
@@ -0,0 +1,316 @@
+#include "CtrlLib.h"
+
+NAMESPACE_UPP
+
+#define LDUMP(x) // DUMP(x)
+
+Switch& Switch::Set(int i, const Value& val) {
+	cs.At(i).value = val;
+	Refresh();
+	return *this;
+}
+
+Switch& Switch::Set(int i, const Value& val, const char *text) {
+	Case& v = cs.At(i);
+	if(value.IsVoid())
+		value = val;
+	SetLabel(i, text);
+	v.value = val;
+	Refresh();
+	return *this;
+}
+
+Switch& Switch::Add(const Value& val, const char *text) {
+	Set(cs.GetCount(), val, text);
+	return *this;
+}
+
+Switch& Switch::Add(const char *text) {
+	Set(cs.GetCount(), cs.GetCount(), text);
+	return *this;
+}
+
+int Switch::GetIndex() const {
+	for(int i = 0; i < cs.GetCount(); i++)
+		if(cs[i].value == value)
+			return i;
+	return -1;
+}
+
+Switch&  Switch::SetLabel(int i, const char *text) {
+	if(i >= cs.GetCount())
+		cs.At(i).value = i;
+	Case& v = cs[i];
+	v.accesskey = ExtractAccessKey(text, v.label);
+	Refresh();
+	return *this;
+}
+
+dword Switch::GetAccessKeys() const
+{
+	dword keys = 0;
+	for(int i = 0; i < cs.GetCount(); i++)
+		keys |= AccessKeyBit(cs[i].accesskey);
+	return keys;
+}
+
+void  Switch::AssignAccessKeys(dword used)
+{
+	for(int i = 0; i < cs.GetCount(); i++) {
+		Case& v = cs[i];
+		if(!v.accesskey) {
+			v.accesskey = ChooseAccessKey(v.label, used);
+			if(v.accesskey) Refresh();
+			used |= AccessKeyBit(v.accesskey);
+		}
+	}
+	Ctrl::AssignAccessKeys(used);
+}
+
+Switch& Switch::SetLabel(const char *text) {
+	const char *q = text;
+	int i = 0;
+	const char *s = text;
+	while(*s) {
+		if(*s == '\r') {
+			SetLabel(i++, String(q, s));
+			q = ++s;
+			if(*q == '\n') {
+				q++;
+				s++;
+			}
+		}
+		else
+		if(*s == '\n') {
+			SetLabel(i++, String(q, s));
+			q = ++s;
+		}
+		else
+			s++;
+	}
+	SetLabel(i++, String(q, s));
+	cs.SetCount(i);
+	return *this;
+}
+
+void  Switch::SetData(const Value& val) {
+	if(val != value) {
+		RefreshCase(GetIndex());
+		value = val;
+		RefreshCase(GetIndex());
+		Update();
+	}
+}
+
+Value Switch::GetData() const {
+	return value;
+}
+
+Rect  Switch::GetCaseRect(int i) const {
+	Size sz = GetSize();
+	if(posx.GetCount())
+		return RectC(i ? posx[i - 1] : 0, 0, posx[i], sz.cy);
+	else
+		return RectC(0, linecy * i, sz.cx, linecy);
+}
+
+Rect  Switch::GetCheckRect(int i) const {
+	Size sz = GetSize();
+	int cx = CtrlsImg::S0().GetSize().cx;
+	if(posx.GetCount())
+		return RectC(i ? posx[i - 1] : 0, 0, cx, sz.cy);
+	else
+		return RectC(0, linecy * i, cx, linecy);
+}
+
+void Switch::EnableCase(int i, bool enable) {
+	cs.At(i).enabled = enable;
+	Refresh(GetCaseRect(i));
+}
+
+void Switch::EnableValue(const Value& val, bool enable) {
+	for(int i = 0; i < cs.GetCount(); i++)
+		if(cs[i].value == val)
+			EnableCase(i, enable);
+}
+
+void  Switch::RefreshCase(int i) {
+	if(i >= 0 && i < cs.GetCount())
+		Refresh(HasFocus() ? GetCaseRect(i) : GetCheckRect(i));
+}
+
+void Switch::GotFocus() {
+	RefreshCase(GetIndex());
+}
+
+void Switch::LostFocus() {
+	int i = GetIndex();
+	if(i >= 0 && i < cs.GetCount())
+		Refresh(GetCaseRect(i));
+}
+
+void Switch::Paint(Draw& w) {
+	if(cs.GetCount() == 0) return;
+	Size sz = GetSize();
+	if(!IsTransparent())
+		w.DrawRect(0, 0, sz.cx, sz.cy, SColorFace);
+	int tcy = GetTextSize("W", font).cy;
+	linecy = max(16, tcy + 2);
+	int y = 0;
+	int x = 0;
+	int ty = (linecy - tcy) / 2;
+	bool horz = linecy * cs.GetCount() > sz.cy;
+	if(horz)
+		posx.SetCount(cs.GetCount());
+	else
+		posx.Clear();
+	bool ds = !IsShowEnabled();
+	int i;
+	light = -1;
+	for(i = 0; i < cs.GetCount(); i++) {
+		Case& v = cs[i];
+		bool dv = ds || !v.enabled;
+
+		Size isz = CtrlsImg::S0().GetSize();
+		Size tsz = GetSmartTextSize(v.label, font);
+		int iy = (linecy - isz.cy) / 2;
+
+		Rect hr = RectC(x, y, horz ? tsz.cx + isz.cx + 4 : sz.cx, linecy);
+		bool mousein = HasMouseIn(hr);
+		if(mousein)
+			light = i;
+		Image img;
+		int q = dv ? CTRL_DISABLED :
+		        pushindex == i ? CTRL_PRESSED :
+		        mousein ? CTRL_HOT :
+		        CTRL_NORMAL;
+		img = CtrlsImg::Get((v.value == value ? CtrlsImg::I_S1 : CtrlsImg::I_S0) + q);
+		w.DrawImage(x, y + iy, img);
+		DrawSmartText(w, x + isz.cx + 4, y + ty, sz.cx, v.label, font,
+		              dv || IsReadOnly() ? SColorDisabled : SColorText,
+		              VisibleAccessKeys() ? v.accesskey : 0);
+		if(HasFocus() && (pushindex == i || v.value == value && pushindex < 0))
+			DrawFocus(w, RectC(x + isz.cx + 2, y + ty - 1, tsz.cx + 3, tsz.cy + 2) & sz);
+		if(horz) {
+			x += hr.Width() + sz.cy / 2;
+			posx[i] = x;
+		}
+		else
+			y += linecy;
+	}
+	if(horz)
+		posx[i - 1] = sz.cx;
+}
+
+int Switch::GetIndex(Point p) {
+	if(posx.GetCount()) {
+		for(int i = 0; i < posx.GetCount(); i++)
+			if(p.x < posx[i]) return cs[i].enabled ? i : -1;
+		return -1;
+	}
+	else {
+		int i = p.y / linecy;
+		i = i >= 0 && i < cs.GetCount() ? i : -1;
+		return i < 0 ? -1 : cs[i].enabled ? i : -1;
+	}
+}
+
+void Switch::MouseMove(Point p, dword keyflags) {
+	if(IsReadOnly()) return;
+	int i = GetIndex(p);
+	int a = -1;
+	if(keyflags & K_MOUSELEFT)
+		a = i;
+	if(pushindex != a) {
+		RefreshCase(pushindex);
+		RefreshCase(a);
+		pushindex = a;
+	}
+	if(i != light) {
+		RefreshCase(light);
+		RefreshCase(i);
+	}
+}
+
+void Switch::LeftDown(Point p, dword keyflags) {
+	if(IsReadOnly()) return;
+	if(Ctrl::ClickFocus()) SetWantFocus();
+	pushindex = GetIndex();
+	MouseMove(p, keyflags);
+}
+
+void Switch::LeftUp(Point p, dword keyflags) {
+	if(IsReadOnly()) return;
+	if(pushindex >= 0 && pushindex < cs.GetCount()) {
+		RefreshCase(GetIndex());
+		const Value& v = cs[pushindex].value;
+		if(v != value) {
+			value = v;
+			UpdateAction();
+		}
+		RefreshCase(pushindex);
+	}
+	pushindex = -1;
+}
+
+void Switch::MouseLeave() {
+	RefreshCase(light);
+	RefreshCase(pushindex);
+	pushindex = -1;
+}
+
+bool Switch::Key(dword key, int) {
+	if(IsReadOnly()) return false;
+	int index, i;
+	index = i = GetIndex();
+	if(key == K_UP || key == K_LEFT) {
+		for(int t = 0; t < cs.GetCount(); t++) {
+			if(--index < 0) index = cs.GetCount() - 1;
+			if(cs[index].enabled)
+				break;
+		}
+	}
+	else
+	if(key == K_DOWN || key == K_RIGHT) {
+		for(int t = 0; t < cs.GetCount(); t++) {
+			if(++index >= cs.GetCount()) index = 0;
+			if(cs[index].enabled)
+				break;
+		}
+	}
+	else
+		return false;
+	if(i != index && cs[index].enabled) {
+		value = cs[index].value;
+		RefreshCase(i);
+		RefreshCase(index);
+		UpdateAction();
+	}
+	return true;
+}
+
+bool Switch::HotKey(dword key) {
+	if(IsReadOnly()) return false;
+	for(int i = 0; i < cs.GetCount(); i++) {
+		if(cs[i].enabled && CompareAccessKey(cs[i].accesskey, key)) {
+			value = cs[i].value;
+			UpdateActionRefresh();
+			return true;
+		}
+	}
+	return false;
+}
+
+void Switch::CancelMode() {
+	pushindex = -1;
+}
+
+Switch::Switch() {
+	linecy = 16;
+	Transparent();
+	NoInitFocus();
+}
+
+Switch::~Switch() {}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/CtrlLib/TabCtrl.cpp b/uppsrc/CtrlLib/TabCtrl.cpp
new file mode 100644
index 000000000..9c415068e
--- /dev/null
+++ b/uppsrc/CtrlLib/TabCtrl.cpp
@@ -0,0 +1,560 @@
+#include "CtrlLib.h"
+
+NAMESPACE_UPP
+
+CH_STYLE(TabCtrl, Style, StyleDefault)
+{
+	font = StdFont();
+	tabheight = font.Info().GetHeight() + 8;
+	margin = 2;
+	sel = Rect(2, 2, 2, 2);
+	edge = Rect(6, 6, 6, 6);
+	extendleft = 0;
+	CtrlsImageLook(normal, CtrlsImg::I_TAB, 4);
+	CtrlsImageLook(first, CtrlsImg::I_FTAB, 4);
+	CtrlsImageLook(last, CtrlsImg::I_LTAB, 4);
+	CtrlsImageLook(both, CtrlsImg::I_BTAB, 4);
+	body = CtrlsImg::TABB();
+	for(int i = 0; i < 4; i++)
+		text_color[i] = SColorText();
+}
+
+TabCtrl::Item& TabCtrl::Item::Text(const String& _text)
+{
+	text = _text;
+	owner->Layout();
+	return *this;
+}
+
+TabCtrl::Item& TabCtrl::Item::Picture(PaintRect d)
+{
+	pict = d;
+	owner->Layout();
+	return *this;
+}
+
+TabCtrl::Item& TabCtrl::Item::SetCtrl(Ctrl *_ctrl)
+{
+	if(ctrl)
+		ctrl->Remove();
+	ctrl = _ctrl;
+	owner->Layout();
+	return *this;
+}
+
+TabCtrl::Item& TabCtrl::Item::Slave(Ctrl *_slave)
+{
+	if(slave)
+		slave->Remove();
+	slave = _slave;
+	if(slave)
+		owner->pane.Add(*slave);
+	int q = owner->sel;
+	owner->sel = -1;
+	owner->Set(q);
+	return *this;
+}
+
+TabCtrl::Item& TabCtrl::Item::Enable(bool _en)
+{
+	enabled = _en;
+	owner->Refresh();
+	return *this;
+}
+
+TabCtrl::Item::Item()
+{
+	ctrl = slave = NULL;
+	enabled = true;
+	key = 0;
+}
+
+void TabCtrl::Item::Layout(int xp, int y, int cy)
+{
+	Font fnt = owner->style->font;
+	Size chsz = GetTextSize("M", fnt);
+	x = xp;
+	Size sz = pict.GetStdSize();
+	if(sz.cx) {
+		xp += chsz.cx / 2;
+		pictpos.x = xp;
+		pictpos.y = y + (cy - sz.cy) / 2;
+		xp += sz.cx + chsz.cx / 2;
+	}
+	else
+		xp += chsz.cx;
+	sz = GetTextSize(text, fnt);
+	if(sz.cx) {
+		textpos.x = xp;
+		textpos.y = y + (cy - sz.cy) / 2;
+		xp += sz.cx;
+	}
+	if(ctrl) {
+		xp += chsz.cx / 2;
+		sz = ctrl->GetRect().GetSize();
+		ctrl->SetRect(xp, y + (cy - sz.cy) / 2, sz.cx, sz.cy);
+		xp += sz.cx + chsz.cx / 2;
+	}
+	else
+		xp += chsz.cx;
+	cx = xp - x;
+}
+
+void TabCtrl::Item::Paint(Draw& w, int state)
+{
+	Size sz = pict.GetStdSize();
+	pict.Paint(w, pictpos.x, pictpos.y, sz.cx, sz.cy, owner->style->text_color[state], Null);
+	w.DrawText(textpos.x, textpos.y, text, owner->style->font, owner->style->text_color[state]);
+}
+
+void TabCtrl::SyncTabs()
+{
+	int x = style->margin - x0;
+	for(int i = 0; i < tab.GetCount(); i++) {
+		Item& t = tab[i];
+		t.Layout(x, style->sel.top * (i != sel),
+		            style->tabheight + style->sel.top * (i == sel));
+		x += t.cx;
+	}
+	left.Show(x0 > 0);
+	right.Show(tab.GetCount() && tab.Top().Right() > tabs.GetSize().cx);
+}
+
+void TabCtrl::Layout()
+{
+	for(int i = 0; i < tab.GetCount(); i++)
+		if(tab[i].ctrl)
+			tab[i].ctrl->Remove();
+	for(int i = 0; i < tab.GetCount(); i++)
+		if(tab[i].ctrl)
+			Ctrl::Add(*tab[i].ctrl);
+	Size sz = GetSize();
+	int th = style->tabheight + style->sel.top;
+	tabs.TopPos(0, th + style->sel.bottom)
+	    .HSizePos(0, style->sel.left + style->sel.right);
+	SyncTabs();
+	SyncHot();
+	pane.VSizePos(style->tabheight + style->edge.top, style->edge.bottom)
+	    .HSizePos(style->edge.left, style->edge.right);
+	left.LeftPos(0, 16).TopPos(th - 16, 16);
+	right.RightPos(0, 16).TopPos(th - 16, 16);
+	Refresh();
+}
+
+Size TabCtrl::ComputeSize(Size pane)
+{
+	return Size(pane.cx + style->edge.left + style->edge.right,
+	            pane.cy + style->tabheight + style->edge.top + style->edge.bottom);
+}
+
+int TabCtrl::TabsRight()
+{
+	return tabs.GetSize().cx - style->sel.left - style->sel.right;
+}
+
+void TabCtrl::Tabs::Paint(Draw& w)
+{
+	static_cast<TabCtrl *>(GetParent())->PaintTabs(w);
+}
+
+Rect TabCtrl::GetOpaqueRect()
+{
+	return pane.GetRect();
+}
+
+void TabCtrl::PaintTabs(Draw& w)
+{
+	int tt = style->sel.top;
+	int th = style->tabheight + tt;
+	Size sz = GetSize();
+	ChPaint(w, 0, th, sz.cx, sz.cy - th, style->body);
+	Size chsz = GetTextSize("M", style->font);
+	for(int phase = 0; phase < 2; phase++) {
+		for(int i = tab.GetCount() - 1; i >= 0; i--)
+			if((sel == i) == phase) {
+				Item& t = tab[i];
+				Rect r = RectC(t.x, tt, t.cx, th - tt);
+				if(i)
+					r.left -= style->extendleft;
+				if(phase) {
+					r.left -= style->sel.left;
+					r.right += style->sel.right;
+					r.top -= tt;
+					r.bottom += style->sel.bottom;
+				}
+				int ndx = !IsEnabled() || !t.enabled ? CTRL_DISABLED :
+					       phase ? CTRL_PRESSED :
+					       i == hot ? CTRL_HOT : CTRL_NORMAL;
+				ChPaint(w, r,
+					(tab.GetCount() == 1 ? style->both : i == 0 ? style->first :
+					 i == tab.GetCount() - 1 ? style->last : style->normal)
+					[ndx]
+				);
+				t.Paint(w, ndx);
+			}
+	}
+}
+
+void TabCtrl::Paint(Draw& w)
+{
+	int th = style->tabheight + style->sel.top;
+	Size sz = GetSize();
+	ChPaint(w, 0, th, sz.cx, sz.cy - th, style->body);
+}
+
+int  TabCtrl::GetTab(Point p)
+{
+	if(p.y >= 0 && p.y < style->tabheight)
+		for(int i = 0; i < tab.GetCount(); i++)
+			if(p.x < tab[i].Right())
+				return i;
+	return -1;
+}
+
+void TabCtrl::CancelMode()
+{
+	hot = -1;
+}
+
+void TabCtrl::SyncHot()
+{
+	Point p = GetMousePos() - GetScreenRect().TopLeft();
+	int h = GetTab(p);
+	if(h != hot) {
+		hot = h;
+		tabs.Refresh();
+	}
+}
+
+void TabCtrl::MouseMove(Point p, dword keyflags)
+{
+	SyncHot();
+}
+
+void TabCtrl::LeftDown(Point p, dword keyflags)
+{
+	if(!IsEditable())
+		return;
+	int h = GetTab(p);
+	if(h >= 0 && tab[h].IsEnabled()) {
+		Set(h);
+		Action();
+	}
+}
+
+void TabCtrl::MouseLeave()
+{
+	SyncHot();
+}
+
+void TabCtrl::ScrollInto(int i)
+{
+	if(i < 0)
+		return;
+	Item& t = tab[i];
+	int tr = TabsRight();
+	if(t.Right() > tr) {
+		x0 += t.Right() - tr;
+		tabs.Refresh();
+		SyncTabs();
+	}
+	if(t.x < style->margin) {
+		x0 += t.x - style->margin;
+		tabs.Refresh();
+		SyncTabs();
+	}
+}
+
+void TabCtrl::Left()
+{
+	if(x0 <= 0)
+		return;
+	for(int i = tab.GetCount() - 1; i >= 0; i--)
+		if(tab[i].x < style->margin) {
+			ScrollInto(i);
+			break;
+		}
+}
+
+void TabCtrl::Right()
+{
+	for(int i = 0; i < tab.GetCount(); i++)
+		if(tab[i].Right() > tabs.GetRect().GetWidth() - style->sel.left - style->sel.right) {
+			ScrollInto(i);
+			break;
+		}
+}
+
+void TabCtrl::Set(int i)
+{
+	if(i != sel) {
+		bool refocus = HasFocusDeep();
+		sel = i;
+		tabs.Refresh();
+		SyncTabs();
+		for(int i = 0; i < tab.GetCount(); i++)
+			if(tab[i].slave)
+				tab[i].slave->Show(sel == i);
+		if(sel >= 0 && refocus)
+			IterateFocusForward(tab[sel].slave, GetTopCtrl(), false, true);
+		WhenSet();
+	}
+	ScrollInto(sel);
+}
+
+void TabCtrl::SetData(const Value& data)
+{
+	Set(data);
+}
+
+Value TabCtrl::GetData() const
+{
+	return Get();
+}
+
+TabCtrl::Item& TabCtrl::Add()
+{
+	CancelMode();
+	Item& t = tab.Add();
+	t.owner = this;
+	if(sel < 0)
+		Set(0);
+	Layout();
+	return t;
+}
+
+TabCtrl::Item& TabCtrl::Add(const char *text)
+{
+	return Add().Text(text);
+}
+
+TabCtrl::Item& TabCtrl::Add(const Image& m, const char *text)
+{
+	return Add().Text(text).SetImage(m);
+}
+
+TabCtrl::Item& TabCtrl::Add(Ctrl& slave, const char *text)
+{
+	return Add(text).Slave(&slave);
+}
+
+TabCtrl::Item& TabCtrl::Add(Ctrl& slave, const Image& m, const char *text)
+{
+	return Add(slave, text).SetImage(m);
+}
+
+TabCtrl::Item& TabCtrl::Insert(int i)
+{
+	CancelMode();
+	int c = i < sel ? sel + 1 : sel;
+	TabCtrl::Item& m = tab.Insert(i);
+	m.owner = this;
+	Layout();
+	sel = -1;
+	Set(c);
+	return m;
+}
+
+TabCtrl::Item& TabCtrl::Insert(int i, const char *text)
+{
+	return Insert(i).Text(text);
+}
+
+TabCtrl::Item& TabCtrl::Insert(int i, const Image& m, const char *text)
+{
+	return Insert(i).Text(text).SetImage(m);
+}
+
+TabCtrl::Item& TabCtrl::Insert(int i, Ctrl& slave, const char *text)
+{
+	return Insert(i, text).Slave(&slave);
+}
+
+TabCtrl::Item& TabCtrl::Insert(int i, Ctrl& slave, const Image& m, const char *text)
+{
+	return Insert(i, slave, text).SetImage(m);
+}
+
+
+void TabCtrl::Remove(int i)
+{
+	CancelMode();
+	if(tab[i].ctrl)
+		tab[i].ctrl->Remove();
+	if(tab[i].slave)
+		tab[i].slave->Remove();
+	int c = i < sel ? sel - 1 : sel;
+	tab.Remove(i);
+	Layout();
+	sel = -1;
+	if(tab.GetCount())
+		Set(minmax(c, 0, tab.GetCount() - 1));
+	else {
+		x0 = 0;
+		sel = -1;
+		accept_current = false;
+		WhenSet();
+	}
+}
+
+void TabCtrl::Go(int d)
+{
+	if(IsEditable() && tab.GetCount()) {
+		int i = sel + d;
+		while(i != sel) {
+			if(i < 0)
+				i = tab.GetCount() - 1;
+			if(i >= tab.GetCount())
+				i = 0;
+			if(tab[i].IsEnabled()) {
+				Set(i);
+				break;
+			}
+			i += d;
+		}
+	}
+}
+
+bool TabCtrl::Key(dword key, int repcnt)
+{
+	switch(key) {
+	case K_CTRL_TAB:
+		GoNext();
+		Action();
+		return true;
+	case K_SHIFT_CTRL_TAB:
+		GoPrev();
+		Action();
+		return true;
+	}
+	return Ctrl::Key(key, repcnt);
+}
+
+bool TabCtrl::HotKey(dword key)
+{
+	switch(key) {
+	case K_CTRL_TAB:
+		GoNext();
+		Action();
+		return true;
+	case K_SHIFT_CTRL_TAB:
+		GoPrev();
+		Action();
+		return true;
+	}
+	return Ctrl::HotKey(key);
+}
+
+bool TabCtrl::Accept()
+{
+	if(tab.GetCount() == 0)
+		return true;
+	int ii = Get();
+	if(accept_current)
+		return !tab[ii].slave || tab[ii].slave -> Accept();
+	for(int i = 0; i < tab.GetCount(); i++)
+		if(tab[i].slave) {
+			Set(i);
+			if(!tab[i].slave->Accept())
+				return false;
+		}
+	Set(ii);
+	return true;
+}
+
+void TabCtrl::Reset()
+{
+	for(int i = 0; i < tab.GetCount(); i++) {
+		if(tab[i].ctrl)
+			tab[i].ctrl->Remove();
+		if(tab[i].slave)
+			tab[i].slave->Remove();
+	}
+	tab.Clear();
+	x0 = 0;
+	CancelMode();
+	sel = -1;
+	Refresh();
+	accept_current = false;
+	WhenSet();
+}
+
+TabCtrl::TabCtrl()
+{
+	hot = -1;
+	sel = -1;
+	x0 = 0;
+	accept_current = false;
+	Ctrl::Add(tabs);
+	Ctrl::Add(pane);
+	tabs.BackPaint().IgnoreMouse();
+	Ctrl::Add(left.SetImage(CtrlsImg::SLA()).ScrollStyle().NoWantFocus());
+	left <<= THISBACK(Left);
+	Ctrl::Add(right.SetImage(CtrlsImg::SRA()).ScrollStyle().NoWantFocus());
+	right <<= THISBACK(Right);
+	Transparent().NoWantFocus();
+	tabs.Transparent().NoWantFocus();
+	SetStyle(StyleDefault());
+}
+
+// ----------------------------------------------------------------
+
+void TabDlg::PlaceButton(Button& b, int& r)
+{
+	if(b.GetParent()) {
+		b.Remove();
+		AddChild(&b, &tabctrl);
+		b.RightPosZ(r, 64).BottomPosZ(4, 24);
+		r += 72;
+	}
+}
+
+void TabDlg::Rearrange()
+{
+	int r = 4;
+	PlaceButton(apply, r);
+	PlaceButton(cancel, r);
+	PlaceButton(exit, r);
+	PlaceButton(ok, r);
+	SetRect(Rect(GetRect().TopLeft(), tabctrl.ComputeSize(sz) + Ctrl::LayoutZoom(Size(8, 40))));
+}
+
+TabCtrl::Item& TabDlg::Add0(Ctrl& tab, const char *text)
+{
+	Size tsz = max(tab.GetRect().GetSize(), sz);
+	TabCtrl::Item& m = tabctrl.Add(tab, text);
+	if(tsz != sz) {
+		sz = tsz;
+		Rearrange();
+	}
+	return m;
+}
+
+TabDlg& TabDlg::AButton(Button& b)
+{
+	if(binit) {
+		exit.Remove();
+		binit = false;
+	}
+	Ctrl::Add(b);
+	Rearrange();
+	return *this;
+}
+
+TabDlg::TabDlg()
+{
+	binit = true;
+	Ctrl::Add(tabctrl.HSizePosZ(4, 4).VSizePosZ(4, 36));
+	sz = Size(0, 0);
+	ok.Ok().SetLabel(t_("OK"));
+	Acceptor(ok, IDOK);
+	cancel.Cancel().SetLabel(t_("Cancel"));
+	Rejector(cancel, IDCANCEL);
+	apply.SetLabel(t_("Apply"));
+	Acceptor(apply, IDYES);
+	exit.SetLabel(t_("Close"));
+	Acceptor(exit, IDEXIT);
+	Ctrl::Add(exit);
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/CtrlLib/TabCtrl.h b/uppsrc/CtrlLib/TabCtrl.h
new file mode 100644
index 000000000..49af59351
--- /dev/null
+++ b/uppsrc/CtrlLib/TabCtrl.h
@@ -0,0 +1,175 @@
+class TabCtrl : public Ctrl {
+public:
+	virtual bool  Accept();
+	virtual void  Paint(Draw& draw);
+	virtual void  CancelMode();
+	virtual void  MouseMove(Point p, dword keyflags);
+	virtual void  LeftDown(Point p, dword keyflags);
+	virtual void  MouseLeave();
+	virtual bool  Key(dword key, int count);
+	virtual bool  HotKey(dword key);
+	virtual void  Layout();
+	virtual Rect  GetOpaqueRect();
+	virtual Value GetData() const;
+	virtual void  SetData(const Value& data);
+
+public:
+	class Item {
+		TabCtrl  *owner;
+
+		int       x;
+		Point     pictpos;
+		Point     textpos;
+		int       cx;
+
+		String    text;
+		PaintRect pict;
+		Ctrl     *ctrl;
+		bool      enabled;
+		Ctrl     *slave;
+		dword     key;
+
+		friend class TabCtrl;
+
+		void Layout(int x, int y, int cy);
+		void Paint(Draw& w, int state);
+		int  Right() { return x + cx; }
+
+	public:
+		Item&          Text(const String& _text);
+		Item&          Picture(PaintRect d);
+		Item&          SetImage(const UPP::Image& _im)  { return Picture(PaintRect(ImageDisplay(), _im)); }
+		Item&          SetCtrl(Ctrl *_ctrl);
+		Item&          SetCtrl(Ctrl& c)                 { return SetCtrl(&c); }
+		Item&          Slave(Ctrl *_slave);
+		Item&          Key(dword _key)                  { key = _key; return *this; }
+
+		Item&          Enable(bool _en = true);
+		Item&          Disable()                        { return Enable(false); }
+		bool           IsEnabled() const                { return enabled; }
+		Ctrl          *GetSlave()                       { return slave; }
+		const Ctrl    *GetSlave() const                 { return slave; }
+		Ctrl          *GetCtrl()                        { return ctrl; }
+		const Ctrl    *GetCtrl() const                  { return ctrl; }
+
+		Item();
+
+	//deprecated:
+		Item&          Control(Ctrl *c)                 { return SetCtrl(c); }
+		Item&          Image(const UPP::Image& m)       { return SetImage(m); }
+	};
+
+	struct Style : ChStyle<Style> {
+		int tabheight, margin, extendleft;
+		Rect sel, edge;
+		Value normal[4], first[4], last[4], both[4], body;
+		Color text_color[4];
+		Font font;
+	};
+
+private:
+	struct Tabs : public Ctrl {
+		virtual void Paint(Draw& w);
+	};
+
+	Array<Item> tab;
+	int         x0;
+	int         hot;
+	int         sel;
+	Tabs        tabs;
+	Button      left, right;
+	ParentCtrl  pane;
+	bool        accept_current;
+
+	const Style *style;
+
+	static Image Fade(int i);
+
+	int        GetTab(Point p);
+	void       PaintTabs(Draw& w);
+	void       ScrollInto(int i);
+	void       Left();
+	void       Right();
+	void       SyncHot();
+	void       SyncTabs();
+	int        TabsRight();
+	void       Go(int d);
+
+public:
+	Callback WhenSet;
+
+	TabCtrl::Item& Add();
+	TabCtrl::Item& Add(const char *text);
+	TabCtrl::Item& Add(const Image& m, const char *text);
+	TabCtrl::Item& Add(Ctrl& slave, const char *text);
+	TabCtrl::Item& Add(Ctrl& slave, const Image& m, const char *text);
+
+	TabCtrl::Item& Insert(int i);
+	TabCtrl::Item& Insert(int i, const char *text);
+	TabCtrl::Item& Insert(int i, const Image& m, const char *text);
+	TabCtrl::Item& Insert(int i, Ctrl& slave, const char *text);
+	TabCtrl::Item& Insert(int i, Ctrl& slave, const Image& m, const char *text);
+
+	void  Remove(int i);
+
+	int   GetCount() const                       { return tab.GetCount(); }
+	Item& GetItem(int i)                         { return tab[i]; }
+	const Item& GetItem(int i) const             { return tab[i]; }
+
+	void Set(int i);
+	int  Get() const                             { return sel; }
+
+	void GoNext()                                { Go(1); }
+	void GoPrev()                                { Go(-1); }
+
+	Size     ComputeSize(Size pane);
+	void     Add(Ctrl& c)                        { pane.Add(c.SizePos()); }
+	TabCtrl& operator<<(Ctrl& c)                 { Add(c); return *this; }
+
+	static const Style& StyleDefault();
+
+	TabCtrl& AcceptCurrent(bool ac = true)       { accept_current = ac; return *this; }
+	TabCtrl& AcceptAll()                         { return AcceptCurrent(false); }
+	TabCtrl& SetStyle(const Style& s)            { style = &s; Refresh(); return *this; }
+
+	void Reset();
+
+	typedef TabCtrl CLASSNAME;
+
+	TabCtrl();
+};
+
+class TabDlg : public TopWindow {
+	void    Rearrange();
+
+	bool    binit;
+	Size    sz;
+
+	void           PlaceButton(Button& b, int& r);
+	TabCtrl::Item& Add0(Ctrl& tab, const char *text);
+	TabDlg&        AButton(Button& b);
+
+public:
+	TabCtrl  tabctrl;
+	Button   ok;
+	Button   cancel;
+	Button   exit;
+	Button   apply;
+
+	template <class T>
+	TabCtrl::Item& Add(T& tab, const char *text)                   { CtrlLayout(tab); return Add0(tab, text); }
+	template <class T>
+	TabCtrl::Item& Add(T& tab, const Image& img, const char *name) { return Add(tab, name).Image(img); }
+	template <class T>
+	TabDlg&  operator()(T& tab, const char *text)                  { Add(tab, text); return *this; }
+	template <class T>
+	TabDlg&  operator()(T& tab, const Image& img, const char *txt) { Add(tab, img, txt); return *this; }
+
+	TabDlg&  OK()                                                  { return AButton(ok); }
+	TabDlg&  Cancel()                                              { return AButton(cancel); }
+	TabDlg&  OKCancel()                                            { return OK().Cancel(); }
+	TabDlg&  Exit()                                                { return AButton(exit); }
+	TabDlg&  Apply()                                               { return AButton(apply); }
+
+	TabDlg();
+};
diff --git a/uppsrc/CtrlLib/Text.cpp b/uppsrc/CtrlLib/Text.cpp
new file mode 100644
index 000000000..ee8d8087b
--- /dev/null
+++ b/uppsrc/CtrlLib/Text.cpp
@@ -0,0 +1,669 @@
+#include <CtrlLib/CtrlLib.h>
+
+NAMESPACE_UPP
+
+TextCtrl::TextCtrl()
+{
+	Unicode();
+	undosteps = 10;
+	Clear();
+	undoserial = 0;
+	incundoserial = false;
+	undo_op = false;
+	WhenBar = THISBACK(StdBar);
+	charset = CHARSET_UNICODE;
+	color[INK_NORMAL] = SColorText;
+	color[INK_DISABLED] = SColorDisabled;
+	color[INK_SELECTED] = SColorHighlightText;
+	color[PAPER_NORMAL] = SColorPaper;
+	color[PAPER_READONLY] = SColorFace;
+	color[PAPER_SELECTED] = SColorHighlight;
+	processtab = true;
+	nobg = false;
+}
+
+TextCtrl::~TextCtrl() {}
+
+void TextCtrl::MiddleDown(Point p, dword flags)
+{
+	if(IsReadOnly())
+		return;
+	if(AcceptText(Selection())) {
+		WString w = GetWString(Selection());
+		selclick = false;
+		LeftDown(p, flags);
+		Paste(w);
+		Action();
+	}
+}
+
+void TextCtrl::CancelMode()
+{
+	selclick = false;
+	dropcaret = Null;
+	isdrag = false;
+}
+
+void TextCtrl::Clear()
+{
+	cline = cpos = 0;
+	total = 0;
+	line.Clear();
+	line.Shrink();
+	ClearLines();
+	line.Add();
+	InsertLines(0, 1);
+	DirtyFrom(0);
+	anchor = -1;
+	cursor = 0;
+	SelectionChanged();
+	Refresh();
+	undo.Clear();
+	redo.Clear();
+	ClearDirty();
+	SetSb();
+	PlaceCaret(0);
+}
+
+void TextCtrl::DirtyFrom(int line) {}
+void TextCtrl::SelectionChanged() {}
+void TextCtrl::ClearLines() {}
+void TextCtrl::InsertLines(int line, int count) {}
+void TextCtrl::RemoveLines(int line, int count) {}
+void TextCtrl::PreInsert(int pos, const WString& text) {}
+void TextCtrl::PostInsert(int pos, const WString& text) {}
+void TextCtrl::PreRemove(int pos, int size) {}
+void TextCtrl::PostRemove(int pos, int size) {}
+void TextCtrl::RefreshLine(int i) {}
+void TextCtrl::InvalidateLine(int i) {}
+void TextCtrl::SetSb() {}
+void TextCtrl::PlaceCaret(int newcursor, bool sel) {}
+
+void   TextCtrl::CachePos(int pos) {
+	int p = pos;
+	cline = GetLinePos(p);
+	cpos = pos - p;
+}
+
+void   TextCtrl::Load(Stream& s, byte charset) {
+	Clear();
+	line.Clear();
+	ClearLines();
+	String ln;
+	total = 0;
+	while(!s.IsEof()) {
+		int c = s.Get();
+		if(c == '\n') {
+			WString w = ToUnicode(ln, charset);
+			line.Add(w);
+			total += w.GetLength() + 1;
+			ln.Clear();
+			ln.Reserve(1000);
+		}
+		if(c >= ' ' || c == '\t')
+			ln.Cat(c);
+	}
+	ln.Shrink();
+	WString w = ToUnicode(ln, charset);
+	line.Add(w);
+	total += w.GetLength();
+	InsertLines(0, line.GetCount());
+	Update();
+	SetSb();
+	SetCharset(charset);
+	PlaceCaret(0);
+}
+
+void   TextCtrl::Save(Stream& s, byte charset) const {
+	charset = ResolveCharset(charset);
+	for(int i = 0; i < line.GetCount(); i++) {
+		if(i) s.PutEol();
+		String txt = charset == CHARSET_UTF8 ? line[i].text
+		                                     : FromUnicode(line[i], charset);
+		const char *e = txt.End();
+		for(const char *w = txt; w != e; w++)
+			s.Put(*w == DEFAULTCHAR ? '?' : *w);
+	}
+}
+
+void   TextCtrl::Set(const String& s, byte charset) {
+	StringStream ss(s);
+	Load(ss, charset);
+}
+
+String TextCtrl::Get(byte charset) const
+{
+	StringStream ss;
+	Save(ss, charset);
+	return ss;
+}
+
+int TextCtrl::GetInvalidCharPos(byte charset) const
+{
+	int q = 0;
+	if(charset != CHARSET_UTF8)
+		for(int i = 0; i < line.GetCount(); i++) {
+			WString txt = line[i];
+			WString ctxt = ToUnicode(FromUnicode(txt, charset), charset);
+			for(int w = 0; w < txt.GetLength(); w++)
+				if(txt[w] != ctxt[w])
+					return q + w;
+			q += txt.GetLength() + 1;
+		}
+	return -1;
+}
+
+void   TextCtrl::ClearDirty()
+{
+	dirty = 0;
+	ClearModify();
+	WhenState();
+}
+
+TextCtrl::UndoData TextCtrl::PickUndoData()
+{
+	UndoData data;
+	data.undo = undo;
+	data.redo = redo;
+	data.undoserial = undoserial;
+	return data;
+}
+
+void TextCtrl::SetPickUndoData(pick_ TextCtrl::UndoData& data)
+{
+	undo = data.undo;
+	redo = data.redo;
+	undoserial = data.undoserial;
+	incundoserial = true;
+}
+
+void TextCtrl::Set(const WString& s)
+{
+	Clear();
+	Insert0(0, s);
+}
+
+void  TextCtrl::SetData(const Value& v)
+{
+	Set((WString)v);
+}
+
+Value TextCtrl::GetData() const
+{
+	return GetW();
+}
+
+String TextCtrl::GetEncodedLine(int i, byte charset) const
+{
+	charset = ResolveCharset(charset);
+	if(charset == CHARSET_UTF8)
+		return line[i].text;
+	return FromUnicode(FromUtf8(line[i].text), charset);
+}
+
+int   TextCtrl::GetLinePos(int& pos) const {
+	if(pos < cpos && cpos - pos < pos) {
+		int i = cline;
+		int ps = cpos;
+		for(;;) {
+			ps -= line[--i].GetLength() + 1;
+			if(ps <= pos) {
+				pos = pos - ps;
+				return i;
+			}
+		}
+	}
+	else {
+		int i = 0;
+		if(pos >= cpos) {
+			pos -= cpos;
+			i = cline;
+		}
+		for(;;) {
+			int n = line[i].GetLength() + 1;
+			if(pos < n) return i;
+			pos -= n;
+			i++;
+			if(i >= line.GetCount()) {
+				pos = line.Top().GetLength();
+				return line.GetCount() - 1;
+			}
+		}
+	}
+}
+
+int   TextCtrl::GetPos(int ln, int lpos) const {
+	ln = minmax(ln, 0, line.GetCount() - 1);
+	int i, pos;
+	if(ln < cline && cline - ln < ln) {
+		pos = cpos;
+		i = cline;
+		while(i > ln)
+			pos -= line[--i].GetLength() + 1;
+	}
+	else {
+		if(ln >= cline) {
+			pos = cpos;
+			i = cline;
+		}
+		else {
+			pos = 0;
+			i = 0;
+		}
+		while(i < ln)
+			pos += line[i++].GetLength() + 1;
+	}
+	return pos + min(line[ln].GetLength(), lpos);
+}
+
+WString TextCtrl::GetW(int pos, int size) const
+{
+	int i = GetLinePos(pos);
+	WString r;
+	for(;;) {
+		if(i >= line.GetCount()) break;
+		WString ln = line[i++];
+		int sz = min(ln.GetLength() - pos, size);
+		r.Cat(ln.Mid(pos, sz));
+		size -= sz;
+		if(size == 0) break;
+#ifdef PLATFORM_WIN32
+		r.Cat('\r');
+#endif
+		r.Cat('\n');
+		size--;
+		if(size == 0) break;
+		pos = 0;
+	}
+	return r;
+}
+
+String TextCtrl::Get(int pos, int size, byte charset) const
+{
+	return FromUnicode(GetW(pos, size), charset);
+}
+
+int  TextCtrl::GetChar(int pos) const {
+	int i = GetLinePos(pos);
+	WString ln = line[i];
+	int c = ln.GetLength() == pos ? '\n' : ln[pos];
+	return c;
+}
+
+int TextCtrl::Insert0(int pos, const WString& txt) {
+	int inspos = pos;
+	PreInsert(inspos, txt);
+	if(pos < cpos)
+		cpos = cline = 0;
+	int i = GetLinePos(pos);
+	DirtyFrom(i);
+	int size = 0;
+	WString ln;
+	Vector<Ln> iln;
+	for(const wchar *s = txt; s < txt.End(); s++)
+		if(*s >= ' ' || *s == '\t') {
+			ln.Cat(*s);
+			size++;
+		}
+		else
+		if(*s == '\n') {
+			iln.Add(ln);
+			size++;
+			ln.Clear();
+		}
+
+	WString l = line[i];
+	if(iln.GetCount()) {
+		iln[0] = l.Mid(0, pos) + WString(iln[0]);
+		ln.Cat(l.Mid(pos));
+		line[i] = ln;
+		InvalidateLine(i);
+		line.Insert(i, iln);
+		InsertLines(i, iln.GetCount());
+		Refresh();
+	}
+	else {
+		line[i] = l.Mid(0, pos) + ln + l.Mid(pos);
+		InvalidateLine(i);
+		RefreshLine(i);
+	}
+	total += size;
+	SetSb();
+	Update();
+	PostInsert(inspos, txt);
+	return size;
+}
+
+void TextCtrl::Remove0(int pos, int size) {
+	int rmpos = pos, rmsize = size;
+	PreRemove(rmpos, rmsize);
+	total -= size;
+	if(pos < cpos)
+		cpos = cline = 0;
+	int i = GetLinePos(pos);
+	DirtyFrom(i);
+	WString ln = line[i];
+	int sz = min(ln.GetLength() - pos, size);
+	ln.Remove(pos, sz);
+	size -= sz;
+	line[i] = ln;
+	if(size == 0) {
+		InvalidateLine(i);
+		RefreshLine(i);
+	}
+	else {
+		size--;
+		int j = i + 1;
+		for(;;) {
+			int sz = line[j].GetLength() + 1;
+			if(sz > size) break;
+			j++;
+			size -= sz;
+		}
+		WString p1 = line[i];
+		WString p2 = line[j];
+		p1.Insert(p1.GetLength(), p2.Mid(size, p2.GetLength() - size));
+		line[i] = p1;
+		line.Remove(i + 1, j - i);
+		RemoveLines(i + 1, j - i);
+		InvalidateLine(i);
+		Refresh();
+	}
+	Update();
+	PostRemove(rmpos, rmsize);
+	SetSb();
+}
+
+void TextCtrl::Undodo()
+{
+	while(undo.GetCount() > undosteps)
+		undo.DropHead();
+	redo.Clear();
+}
+
+void TextCtrl::NextUndo()
+{
+	undoserial += incundoserial;
+	incundoserial = false;
+}
+
+void TextCtrl::IncDirty() {
+	dirty++;
+	if(dirty == 0 || dirty == 1)
+	{
+		if(dirty)
+			SetModify();
+		else
+			ClearModify();
+		WhenState();
+	}
+}
+
+void TextCtrl::DecDirty() {
+	dirty--;
+	if(dirty == 0 || dirty == -1)
+	{
+		if(dirty)
+			SetModify();
+		else
+			ClearModify();
+		WhenState();
+	}
+}
+
+int TextCtrl::InsertU(int pos, const WString& txt, bool typing) {
+	int sz = Insert0(pos, txt);
+	if(undosteps) {
+		if(undo.GetCount() > 1 && typing && *txt != '\n' && IsDirty()) {
+			UndoRec& u = undo.Tail();
+			if(u.typing && u.pos + u.size == pos) {
+				u.size += txt.GetLength();
+				return sz;
+			}
+		}
+		UndoRec& u = undo.AddTail();
+		incundoserial = true;
+		IncDirty();
+		u.serial = undoserial;
+		u.pos = pos;
+		u.size = sz;
+		u.typing = typing;
+	}
+	return sz;
+}
+
+void TextCtrl::RemoveU(int pos, int size) {
+	if(size + pos > total)
+		size = total - pos;
+	if(size <= 0) return;
+	if(undosteps) {
+		UndoRec& u = undo.AddTail();
+		incundoserial = true;
+		IncDirty();
+		u.serial = undoserial;
+		u.pos = pos;
+		u.size = 0;
+		u.text = Get(pos, size, CHARSET_UTF8);
+		u.typing = false;
+	}
+	Remove0(pos, size);
+}
+
+int TextCtrl::Insert(int pos, const WString& _txt, bool typing) {
+	WString txt = _txt;
+	if(charset != CHARSET_UNICODE)
+		for(int i = 0; i < txt.GetCount(); i++)
+			if(FromUnicode(txt[i], charset) == DEFAULTCHAR)
+				txt.Set(i, '?');
+	int sz = InsertU(pos, txt, typing);
+	Undodo();
+	return sz;
+}
+
+int TextCtrl::Insert(int pos, const String& txt, byte charset)
+{
+	return Insert(pos, ToUnicode(txt, charset), false);
+}
+
+void TextCtrl::Remove(int pos, int size) {
+	RemoveU(pos, size);
+	Undodo();
+}
+
+void TextCtrl::Undo() {
+	if(undo.IsEmpty()) return;
+	undo_op = true;
+	int nc = 0;
+	int s = undo.Tail().serial;
+	while(undo.GetCount()) {
+		const UndoRec& u = undo.Tail();
+		if(u.serial != s)
+			break;
+		UndoRec& r = redo.AddTail();
+		r.serial = s;
+		r.typing = false;
+		nc = r.pos = u.pos;
+		CachePos(r.pos);
+		if(u.size) {
+			r.size = 0;
+			r.text = Get(u.pos, u.size, CHARSET_UTF8);
+			Remove0(u.pos, u.size);
+		}
+		else {
+			WString text = FromUtf8(u.text);
+			r.size = Insert0(u.pos, text);
+			nc += r.size;
+		}
+		undo.DropTail();
+		DecDirty();
+	}
+	ClearSelection();
+	PlaceCaret(nc, false);
+	Action();
+	undo_op = false;
+}
+
+void TextCtrl::Redo() {
+	if(!redo.GetCount()) return;
+	NextUndo();
+	int s = redo.Tail().serial;
+	int nc = 0;
+	while(redo.GetCount()) {
+		const UndoRec& r = redo.Tail();
+		if(r.serial != s)
+			break;
+		nc = r.pos + r.size;
+		CachePos(r.pos);
+		if(r.size)
+			RemoveU(r.pos, r.size);
+		else
+			nc += InsertU(r.pos, FromUtf8(r.text));
+		redo.DropTail();
+		IncDirty();
+	}
+	ClearSelection();
+	PlaceCaret(nc, false);
+	Action();
+}
+
+void  TextCtrl::ClearSelection() {
+	anchor = -1;
+	Refresh();
+}
+
+void   TextCtrl::SetSelection(int l, int h) {
+	if(l != h) {
+		PlaceCaret(minmax(l, 0, total), false);
+		PlaceCaret(minmax(h, 0, total), true);
+	}
+	else
+		SetCursor(l);
+}
+
+bool   TextCtrl::GetSelection(int& l, int& h) const {
+	if(anchor < 0) {
+		l = h = cursor;
+		return false;
+	}
+	else {
+		l = min(anchor, cursor);
+		h = max(anchor, cursor);
+		return true;
+	}
+}
+
+String TextCtrl::GetSelection(byte charset) const {
+	int l, h;
+	if(GetSelection(l, h))
+		return Get(l, h - l, charset);
+	return String();
+}
+
+WString TextCtrl::GetSelectionW() const {
+	int l, h;
+	if(GetSelection(l, h))
+		return GetW(l, h - l);
+	return WString();
+}
+
+bool   TextCtrl::RemoveSelection() {
+	int l, h;
+	if(anchor < 0) return false;
+	GetSelection(l, h);
+	Remove(l, h - l);
+	anchor = -1;
+	Refresh();
+	PlaceCaret(l);
+	Action();
+	return true;
+}
+
+void TextCtrl::RefreshLines(int l1, int l2) {
+	int h = max(l1, l2);
+	for(int i = min(l1, l2); i <= h; i++)
+		RefreshLine(i);
+}
+
+void TextCtrl::Cut() {
+	if(!IsReadOnly() && IsSelection()) {
+		Copy();
+		RemoveSelection();
+	}
+}
+
+void TextCtrl::Copy() {
+	int l, h;
+	if(!GetSelection(l, h)) {
+		int i = GetLine(cursor);
+		l = GetPos(i);
+		h = l + line[i].GetLength() + 1;
+	}
+	WString txt = GetW(l, h - l);
+	ClearClipboard();
+	AppendClipboardUnicodeText(txt);
+	AppendClipboardText(txt.ToString());
+}
+
+void TextCtrl::SelectAll() {
+	SetSelection();
+}
+
+int  TextCtrl::Paste(const WString& text) {
+	if(IsReadOnly()) return 0;
+	RemoveSelection();
+	int n = Insert(cursor, text);
+	PlaceCaret(cursor + n);
+	Refresh();
+	return n;
+}
+
+void TextCtrl::Paste() {
+	WString w = ReadClipboardUnicodeText();
+	if(w.IsEmpty())
+		w = ReadClipboardText().ToWString();
+	Paste(w);
+	Action();
+}
+
+void TextCtrl::StdBar(Bar& menu) {
+	NextUndo();
+	if(undosteps) {
+		menu.Add(undo.GetCount(), t_("Undo"), THISBACK(Undo))
+			.Key(K_ALT_BACKSPACE)
+			.Key(K_CTRL_Z);
+		menu.Add(redo.GetCount(), t_("Redo"), THISBACK(Redo))
+			.Key(K_SHIFT|K_ALT_BACKSPACE)
+			.Key(K_SHIFT_CTRL_Z);
+		menu.Separator();
+	}
+	menu.Add(IsEditable() && IsSelection(),
+			t_("Cut"), CtrlImg::cut(), THISBACK(Cut))
+		.Key(K_SHIFT_DELETE)
+		.Key(K_CTRL_X);
+	menu.Add(IsSelection(),
+			t_("Copy"), CtrlImg::copy(), THISBACK(Copy))
+		.Key(K_CTRL_INSERT)
+		.Key(K_CTRL_C);
+	menu.Add(IsEditable()
+		#ifdef PLATFORM_WIN32
+			&& ::IsClipboardFormatAvailable(CF_TEXT)
+		#endif
+			,
+			t_("Paste"), CtrlImg::paste(), THISBACK(DoPaste))
+		.Key(K_SHIFT_INSERT)
+		.Key(K_CTRL_V);
+	menu.Add(IsEditable() && IsSelection(),
+			t_("Erase"), CtrlImg::remove(), THISBACK(DoRemoveSelection))
+		.Key(K_DELETE);
+	menu.Separator();
+	menu.Add(GetLength(),
+			t_("Select all"), THISBACK(SelectAll))
+		.Key(K_CTRL_A);
+}
+
+String TextCtrl::GetSelectionData(const String& fmt) const
+{
+	return GetTextClip(GetSelectionW(), fmt);
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/CtrlLib/TextEdit.h b/uppsrc/CtrlLib/TextEdit.h
new file mode 100644
index 000000000..8a75dacb5
--- /dev/null
+++ b/uppsrc/CtrlLib/TextEdit.h
@@ -0,0 +1,429 @@
+class TextCtrl : public Ctrl, protected TextArrayOps {
+public:
+	virtual void  SetData(const Value& v);
+	virtual Value GetData() const;
+	virtual void  CancelMode();
+	virtual String GetSelectionData(const String& fmt) const;
+	virtual void  MiddleDown(Point p, dword flags);
+
+public:
+	struct UndoRec {
+		int    serial;
+		int    pos;
+		int    size;
+		String text;
+		bool   typing;
+	};
+
+	struct UndoData {
+		int              undoserial;
+		BiArray<UndoRec> undo;
+		BiArray<UndoRec> redo;
+
+		void Clear()                     { undo.Clear(); redo.Clear(); }
+	};
+
+	enum {
+		INK_NORMAL,
+		INK_DISABLED,
+		INK_SELECTED,
+		PAPER_NORMAL,
+		PAPER_READONLY,
+		PAPER_SELECTED,
+		COLOR_COUNT,
+	};
+
+protected:
+	virtual void   DirtyFrom(int line);
+	virtual void   SelectionChanged();
+	virtual void   ClearLines();
+	virtual void   InsertLines(int line, int count);
+	virtual void   RemoveLines(int line, int count);
+	virtual void   PreInsert(int pos, const WString& text);
+	virtual void   PostInsert(int pos, const WString& text);
+	virtual void   PreRemove(int pos, int size);
+	virtual void   PostRemove(int pos, int size);
+	virtual void   SetSb();
+	virtual void   PlaceCaret(int newcursor, bool sel = false);
+	virtual void   InvalidateLine(int i);
+
+	struct Ln : Moveable<Ln> {
+		int    len;
+		String text;
+
+		int      GetLength() const       { return len; }
+		operator WString() const         { return FromUtf8(text); }
+
+		Ln(const WString& wtext)         { text = ToUtf8(wtext); len = wtext.GetLength(); }
+		Ln()                             { len = 0; }
+	};
+
+	Vector<Ln>       line;
+	int              total;
+	int              cline, cpos;
+	int              cursor, anchor;
+	int              undoserial;
+	bool             incundoserial;
+	int              undosteps;
+	BiArray<UndoRec> undo;
+	BiArray<UndoRec> redo;
+	int              dirty;
+	int              undo_op;
+	byte             charset;
+
+	bool             selclick;
+	Point            dropcaret;
+	bool             isdrag;
+
+	Color            color[COLOR_COUNT];
+
+	bool             processtab;
+	bool             nobg;
+
+	void   IncDirty();
+	void   DecDirty();
+	int    Insert0(int pos, const WString& txt);
+	void   Remove0(int pos, int size);
+	int    InsertU(int pos, const WString& txt, bool typing = false);
+	void   RemoveU(int pos, int size);
+	void   Undodo();
+	int    Insert(int pos, const WString& txt, bool typing);
+	void   DoPaste() { Paste(); }
+	void   DoRemoveSelection() { RemoveSelection(); }
+	void   RefreshLines(int l1, int l2);
+
+public:
+	virtual void   RefreshLine(int i);
+
+	Callback1<Bar&> WhenBar;
+	Callback        WhenState;
+
+	void   CachePos(int pos);
+
+	void   Load(Stream& s, byte charset = CHARSET_DEFAULT);
+	void   Save(Stream& s, byte charset = CHARSET_DEFAULT) const;
+
+	int    GetInvalidCharPos(byte charset = CHARSET_DEFAULT) const;
+	bool   CheckCharset(byte charset = CHARSET_DEFAULT) const { return GetInvalidCharPos(charset) < 0; }
+
+	void    Set(const WString& s);
+	void    Set(const String& s, byte charset = CHARSET_DEFAULT);
+	String  Get(byte charset = CHARSET_DEFAULT) const;
+	String  Get(int pos, int size, byte charset = CHARSET_DEFAULT) const;
+	WString GetW(int pos, int size) const;
+	WString GetW() const                      { return GetW(0, GetLength()); }
+
+	void   ClearDirty();
+	bool   IsDirty() const                    { return dirty; }
+
+	void   Clear();
+
+	int    GetLinePos(int& pos) const;
+	int    GetPos(int line, int column) const;
+	int    GetPos(int line) const             { return GetPos(line, 0); }
+	int    GetLine(int pos) const             { return GetLinePos(pos); }
+
+	const String& GetUtf8Line(int i) const    { return line[i].text; }
+	WString       GetWLine(int i) const       { return FromUtf8(line[i].text); }
+	String        GetEncodedLine(int i, byte charset = CHARSET_DEFAULT) const;
+	int           GetLineLength(int i) const  { return line[i].GetLength(); }
+
+	int    GetLineCount() const               { return line.GetCount(); }
+	int    GetChar(int pos) const;
+	int    operator[](int pos) const          { return GetChar(pos); }
+	int    GetLength() const                  { return total; }
+
+	int     GetCursor() const                 { return cursor; }
+	int     GetCursorLine()                   { return GetLine(GetCursor()); }
+
+	void    SetSelection(int anchor = 0, int cursor = INT_MAX);
+	bool    IsSelection() const               { return anchor >= 0; }
+	bool    GetSelection(int& l, int& h) const;
+	String  GetSelection(byte charset = CHARSET_DEFAULT) const;
+	WString GetSelectionW() const;
+	void    ClearSelection();
+	bool    RemoveSelection();
+	void    SetCursor(int cursor)             { PlaceCaret(cursor); }
+	int     Paste(const WString& text);
+
+	int     Insert(int pos, const WString& txt)  { return Insert(pos, txt, false); }
+	int     Insert(int pos, const String& txt, byte charset = CHARSET_DEFAULT);
+	int     Insert(int pos, const char *txt)     { return Insert(pos, WString(txt)); }
+	void    Remove(int pos, int size);
+
+	void      NextUndo();
+	void      Undo();
+	void      Redo();
+	bool      IsUndo() const                  { return undo.GetCount(); }
+	bool      IsRedo() const                  { return redo.GetCount(); }
+	void      ClearUndo()                     { undo.Clear(); redo.Clear(); }
+	bool      IsUndoOp() const                { return undo_op; }
+	UndoData  PickUndoData();
+	void      SetPickUndoData(pick_ UndoData& data);
+
+	void      Cut();
+	void      Copy();
+	void      Paste();
+	void      SelectAll();
+
+	void      StdBar(Bar& menu);
+
+	void      SetCharset(byte cs)              { charset = ResolveCharset(cs); }
+	byte      GetCharset() const               { return charset; }
+
+	void      SetColor(int i, Color c)         { color[i] = c; Refresh(); }
+	Color     GetColor(int i) const            { return color[i]; }
+
+	TextCtrl& UndoSteps(int n)                 { undosteps = n; Undodo(); return *this; }
+	TextCtrl& ProcessTab(bool b = true)        { processtab = b; return *this; }
+	TextCtrl& NoProcessTab()                   { return ProcessTab(false); }
+	TextCtrl& NoBackground(bool b = true)      { nobg = b; Transparent(); Refresh(); return *this; }
+	bool      IsProcessTab()                   { return processtab; }
+
+	typedef TextCtrl CLASSNAME;
+
+	TextCtrl();
+	virtual ~TextCtrl();
+};
+
+class LineEdit : public TextCtrl {
+public:
+	virtual bool   Key(dword key, int count);
+	virtual void   Paint(Draw& w);
+	virtual void   LeftDown(Point p, dword flags);
+	virtual void   RightDown(Point p, dword flags);
+	virtual void   LeftRepeat(Point p, dword keyflags);
+	virtual void   LeftDouble(Point p, dword keyflags);
+	virtual void   LeftTriple(Point p, dword keyflags);
+	virtual void   LeftUp(Point p, dword flags);
+	virtual void   LeftDrag(Point p, dword flags);
+	virtual void   MouseMove(Point p, dword flags);
+	virtual void   MouseWheel(Point, int zdelta, dword);
+	virtual Image  CursorImage(Point, dword);
+	virtual void   DragAndDrop(Point p, PasteClip& d);
+	virtual void   DragRepeat(Point p);
+	virtual void   DragLeave();
+	virtual void   Layout();
+	virtual void   RefreshLine(int i);
+
+protected:
+	virtual void  SetSb();
+	virtual void  PlaceCaret(int newcursor, bool sel = false);
+
+public:
+	struct Highlight : Moveable<Highlight> {
+		Color paper;
+		Color ink;
+		Font  font;
+		wchar chr;
+
+		bool operator==(const Highlight& h) const
+		     { return paper == h.paper && ink == h.ink && font == h.font; }
+	};
+
+	struct EditPos : Moveable<EditPos> {
+		int sby;
+		int cursor;
+
+		void Serialize(Stream& s);
+		void Clear()                      { sby = 0; cursor = 0; }
+		EditPos()                         { Clear(); }
+	};
+
+protected:
+	virtual void  HighlightLine(int line, Vector<Highlight>& h, int pos);
+	virtual void  NewScrollPos();
+
+	ScrollBars       sb;
+	int              gcolumn;
+	int              mpos;
+
+
+	Font             font;
+	CharFilter       filter;
+	int              tabsize;
+	int              bordercolumn;
+	Color            bordercolor;
+	bool             nohbar;
+	bool             showtabs;
+	bool             cutline;
+	bool             overwrite;
+	Scroller         scroller;
+	Point            caretpos;
+
+	void   Paint0(Draw& w);
+
+	void   AlignChar();
+
+	void   MovePage(int dir, bool sel);
+
+	void   PlaceCaret0(Point p);
+	int    PlaceCaretNoG(int newcursor, bool sel = false);
+
+	void   Scroll();
+	void   SetHBar();
+	Rect   DropCaret();
+	void   RefreshDropCaret();
+
+	struct RefreshDraw;
+
+public:
+	Size   GetFontSize() const;
+	int    GetGPos(int ln, int cl) const;
+	int    GetMousePos(Point p) const;
+	Point  GetColumnLine(int pos) const;
+	int    GetColumnLinePos(Point pos) const  { return GetGPos(pos.y, pos.x); }
+	Point  GetIndexLine(int pos) const;
+	int    GetIndexLinePos(Point pos) const;
+
+	void   ScrollUp()                         { sb.LineUp(); }
+	void   ScrollDown()                       { sb.LineDown(); }
+
+	Rect   GetLineScreenRect(int line) const;
+
+	void   TopCursor();
+	void   CenterCursor();
+
+	void   MoveUpDown(int n, bool sel = false);
+
+	void   MoveLeft(bool sel = false);
+	void   MoveRight(bool sel = false);
+	void   MoveUp(bool sel = false);
+	void   MoveDown(bool sel = false);
+	void   MovePageUp(bool sel = false);
+	void   MovePageDown(bool sel = false);
+	void   MoveHome(bool sel = false);
+	void   MoveEnd(bool sel = false);
+	void   MoveTextBegin(bool sel = false);
+	void   MoveTextEnd(bool sel = false);
+
+	bool   InsertChar(dword key, int count = 1, bool canoverwrite = false);
+	void   DeleteChar();
+	void   Backspace();
+	void   DeleteLine();
+	void   CutLine();
+
+	Point   GetScrollPos() const              { return sb; }
+	Size    GetPageSize()                     { return sb.GetPage(); }
+	void    SetScrollPos(Point p)             { sb.Set(p); }
+
+	EditPos GetEditPos() const;
+	void    SetEditPos(const EditPos& pos);
+	void    SetEditPosSb(const LineEdit::EditPos& pos);
+
+	void    ScrollIntoCursor();
+
+	Point   GetCaretPoint() const             { return caretpos; }
+
+	void    Clear();
+
+	void    OverWriteMode(bool o = true)      { overwrite = o; PlaceCaret(cursor, false); }
+	bool    IsOverWriteMode() const           { return overwrite; }
+
+	void    RefreshChars(bool (*predicate)(int c));
+
+	LineEdit& TabSize(int n);
+	int       GetTabSize() const              { return tabsize; }
+	LineEdit& BorderColumn(int col, Color c = SColorFace());
+	LineEdit& SetFont(Font f);
+	Font      GetFont() const                 { return font; }
+	LineEdit& NoHorzScrollbar(bool b = true)  { nohbar = b; ScrollIntoCursor(); return *this; }
+	LineEdit& ShowTabs(bool st = true)        { showtabs = st; Refresh(); return *this; }
+	bool      IsShowTabs() const              { return showtabs; }
+	LineEdit& WithCutLine(bool b)             { cutline = b; return *this; }
+	LineEdit& NoCutLine()                     { return WithCutLine(false); }
+	LineEdit& SetFilter(int (*f)(int c))      { filter = f; return *this; }
+	
+	LineEdit& SetScrollBarStyle(const ScrollBar::Style& s)   { sb.SetStyle(s); return *this; }
+
+	typedef LineEdit CLASSNAME;
+
+	LineEdit();
+	virtual ~LineEdit();
+};
+
+class DocEdit : public TextCtrl {
+public:
+	virtual void  Paint(Draw& w);
+	virtual void  Layout();
+	virtual bool  Key(dword key, int count);
+	virtual void  LeftDown(Point p, dword flags);
+	virtual void  LeftDouble(Point p, dword keyflags);
+	virtual void  LeftTriple(Point p, dword keyflags);
+	virtual void  LeftUp(Point p, dword flags);
+	virtual void  RightDown(Point p, dword w);
+	virtual void  MouseMove(Point p, dword flags);
+	virtual void  MouseWheel(Point p, int zdelta, dword keyflags);
+	virtual Image CursorImage(Point p, dword keyflags);
+	virtual void  GotFocus();
+	virtual void  LostFocus();
+	virtual void  RefreshLine(int i);
+	virtual void  SetSb();
+
+	virtual void  DragAndDrop(Point p, PasteClip& d);
+	virtual void  DragRepeat(Point p);
+	virtual void  DragLeave();
+	virtual void  LeftDrag(Point p, dword flags);
+
+protected:
+	virtual void  ClearLines();
+	virtual void  InsertLines(int line, int count);
+	virtual void  RemoveLines(int line, int count);
+	virtual void  PlaceCaret(int pos, bool select = false);
+	virtual void  InvalidateLine(int i);
+
+	struct Para : Moveable<Para> {
+		int    cx, cy;
+
+		Para()         { cx = -1; }
+	};
+
+	Vector<Para> para;
+	Font         font;
+	int          after;
+	CharFilter   filter;
+	ScrollBar    sb;
+	int          cx;
+	bool         updownleave;
+
+	struct Fmt {
+		FontInfo      fi;
+		int           len;
+		Buffer<wchar> text;
+		Buffer<int>   width;
+		Vector<int>   line;
+		int           LineEnd(int i)  {
+			return i < line.GetCount() - 1 ? line[i + 1] : len;
+		}
+	};
+	Fmt    Format(const WString& text) const;
+
+	void   Invalidate();
+	int    GetHeight(int i);
+	void   Scroll();
+	void   PlaceCaret(bool scroll);
+	int    GetY(int parai);
+	int    GetCursorPos(Point p);
+	Point  GetCaret(int pos);
+	void   VertMove(int delta, bool select, bool scs);
+	void   HomeEnd(int x, bool select);
+	void   RefreshStyle();
+	Rect   DropCaret();
+	void   RefreshDropCaret();
+	int    GetMousePos(Point p);
+
+public:
+	DocEdit&  After(int a)                                   { after = a; RefreshStyle(); return *this; }
+	DocEdit&  SetFont(Font f)                                { font = f; RefreshStyle(); return *this; }
+	DocEdit&  SetFilter(int (*f)(int c))                     { filter = f; return *this; }
+	DocEdit&  AutoHideSb(bool b = true)                      { sb.AutoHide(b); return *this; }
+	DocEdit&  UpDownLeave(bool u = true)                     { updownleave = u; return *this; }
+	DocEdit&  NoUpDownLeave()                                { return UpDownLeave(false); }
+	bool      IsUpDownLeave() const                          { return updownleave; }
+	DocEdit&  SetScrollBarStyle(const ScrollBar::Style& s)   { sb.SetStyle(s); return *this; }
+
+	typedef DocEdit CLASSNAME;
+
+	DocEdit();
+	virtual ~DocEdit();
+};
diff --git a/uppsrc/CtrlLib/ToolBar.cpp b/uppsrc/CtrlLib/ToolBar.cpp
new file mode 100644
index 000000000..de81e1af8
--- /dev/null
+++ b/uppsrc/CtrlLib/ToolBar.cpp
@@ -0,0 +1,129 @@
+#include "CtrlLib.h"
+
+NAMESPACE_UPP
+
+#define LTIMING(x)  // TIMING(x)
+
+CH_STYLE(ToolBar, Style, StyleDefault)
+{
+	buttonstyle = ToolButton::StyleDefault();
+	buttonminsize = Size(16, 16);
+	maxiconsize = Size(INT_MAX, INT_MAX);
+	arealook = Null;
+	look = SColorFace();
+	breaksep = separator = SeparatorCtrl::StyleDefault();
+}
+
+ToolBar::ToolBar()
+{
+	pane.Margin(2, 3);
+	lsepm = rsepm = 0;
+	ssize = 8;
+	lock = 0;
+	ii = 0;
+	SetStyle(StyleDefault());
+	buttonminsize = Null;
+	maxiconsize = Null;
+	kind = ToolButton::NOLABEL;
+	arealook = -1;
+}
+
+ToolBar::~ToolBar() {}
+
+void PaintBarArea(Draw& w, Ctrl *x, const Value& look, int bottom)
+{
+	Ctrl *tc = x->GetTopCtrl();
+	Rect sr = tc->GetScreenRect();
+	sr.bottom = Nvl(bottom, tc->GetScreenView().top);
+	sr.Offset(-x->GetScreenRect().TopLeft());
+	ChPaint(w, sr, look);
+}
+
+void ToolBar::Paint(Draw& w)
+{
+	if(IsTransparent())
+		return;
+	Value look = style->look;
+	if(!IsNull(style->arealook) && (arealook < 0 ? InFrame() : arealook)) {
+		PaintBarArea(w, this, style->arealook, GetScreenRect().bottom);
+		look = Null;
+	}
+	PaintBar(w, style->breaksep, look);
+}
+
+Bar::Item& ToolBar::AddItem(Callback cb)
+{
+	ToolButton& m = item.DoIndex(ii++);
+	m.Reset();
+	m.WhenAction = cb;
+	m.MinSize(IsNull(buttonminsize) ? style->buttonminsize : buttonminsize);
+	m.MaxIconSize(IsNull(maxiconsize) ? style->maxiconsize : maxiconsize);
+	m.Kind(kind);
+	m.SetStyle(style->buttonstyle);
+	pane.Add(&m, Null);
+	return m;
+}
+
+Bar::Item& ToolBar::AddSubMenu(Callback1<Bar&> proc)
+{
+	if(item.GetCount())
+		Separator();
+	proc(*this);
+	return NilItem();
+}
+
+void ToolBar::Clear()
+{
+	item.Clear();
+	BarCtrl::Clear();
+}
+
+bool ToolBar::HotKey(dword key)
+{
+	return Bar::Scan(proc, key);
+}
+
+void ToolBar::Set(Callback1<Bar&> bar)
+{
+	LTIMING("SetToolBar");
+	if(lock) return;
+	lock++;
+	BarCtrl::IClear();
+	ii = 0;
+	bar(*this);
+	proc = bar;
+	item.SetCount(ii);
+	for(int i = 0; i < item.GetCount(); i++)
+		item[i].FinalSync();
+	BarCtrl::IFinish();
+	SyncBar();
+	lock--;
+}
+
+void ToolBar::Post(Callback1<Bar&> bar)
+{
+	KillTimeCallback(TIMEID_POST);
+	SetTimeCallback(0, PTEBACK1(Set, bar), TIMEID_POST);
+}
+
+int ToolBar::GetStdHeight()
+{
+	Size sz = StyleDefault().maxiconsize;
+	return sz.cy > 10000 ? 22 + 3 : sz.cy + 6 + 3;
+}
+
+StaticBarArea::StaticBarArea()
+{
+	upperframe = true;
+}
+
+void StaticBarArea::Paint(Draw& w)
+{
+	if(IsNull(ToolBar().StyleDefault().arealook))
+		ChPaint(w, GetSize(), ToolBar().StyleDefault().look);
+	else
+		PaintBarArea(w, this, ToolBar().StyleDefault().arealook,
+		             upperframe ? Null : GetScreenRect().bottom);
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/CtrlLib/ToolButton.cpp b/uppsrc/CtrlLib/ToolButton.cpp
new file mode 100644
index 000000000..1908a7343
--- /dev/null
+++ b/uppsrc/CtrlLib/ToolButton.cpp
@@ -0,0 +1,309 @@
+#include "CtrlLib.h"
+
+NAMESPACE_UPP
+
+#define LTIMING(x)  // TIMING(x)
+
+CH_STYLE(ToolButton, Style, StyleDefault)
+{
+	CtrlsImageLook(look, CtrlsImg::I_TB, 6);
+	font = StdFont();
+	for(int i = 0; i < 4; i++)
+		textcolor[i] = Button::StyleNormal().textcolor[i];
+	textcolor[CTRL_CHECKED] = textcolor[CTRL_NORMAL];
+	textcolor[CTRL_HOTCHECKED] = textcolor[CTRL_HOT];
+	for(int i = 0; i < 6; i++) {
+		light[i] = false;
+		contrast[i] = 0;
+	}
+	light[CTRL_PRESSED] = light[CTRL_HOT] = light[CTRL_HOTCHECKED] = true;
+}
+
+CH_STYLE(ToolButton, Style, StyleSolid)
+{
+	const Button::Style& bs = Button::StyleNormal(); 
+	look[0] = bs.look[0];
+	look[1] = bs.look[1];
+	look[2] = bs.look[2];
+	look[3] = bs.look[3];
+	look[4] = bs.look[2];
+	look[5] = bs.look[1];
+	font = StdFont();
+	for(int i = 0; i < 4; i++)
+		textcolor[i] = Button::StyleNormal().textcolor[i];
+	textcolor[CTRL_CHECKED] = textcolor[CTRL_NORMAL];
+	textcolor[CTRL_HOTCHECKED] = textcolor[CTRL_HOT];
+	for(int i = 0; i < 6; i++) {
+		light[i] = false;
+		contrast[i] = 0;
+	}
+	light[CTRL_PRESSED] = light[CTRL_HOT] = light[CTRL_HOTCHECKED] = true;
+}
+
+ToolButton::ToolButton()
+{
+	Reset();
+	checked = false;
+	paint_checked = false;
+	Transparent();
+}
+
+ToolButton::~ToolButton() {}
+
+void ToolButton::Reset()
+{
+	Tip("");
+	Help("");
+	Topic("");
+	Description("");
+	repeat = false;
+	accel = 0;
+	checked = false;
+	NoWantFocus();
+	minsize = Size(0, 0);
+	maxiconsize = Size(INT_MAX, INT_MAX);
+	style = &StyleDefault();
+}
+
+void ToolButton::UpdateTip()
+{
+	LTIMING("UpdateTip");
+	String s = tiptext;
+	if(IsNull(s) && kind == NOLABEL)
+		s = text;
+	if(accel) {
+		if(s.GetCount())
+			s << ' ';
+		s << '(' << GetKeyDesc(accel) << ')';
+	}
+	Ctrl::Tip(s);
+}
+
+Bar::Item& ToolButton::Text(const char *txt)
+{
+	ExtractAccessKey(txt, text);
+	UpdateTip();
+	return *this;
+}
+
+Bar::Item& ToolButton::Check(bool check)
+{
+	checked = check;
+	Refresh();
+	return *this;
+}
+
+Bar::Item& ToolButton::Radio(bool check)
+{
+	return Check(check);
+}
+
+Bar::Item& ToolButton::Key(dword key)
+{
+	if(key) {
+		accel = key;
+		UpdateTip();
+	}
+	return *this;
+}
+
+Bar::Item& ToolButton::Repeat(bool r)
+{
+	repeat = r;
+	return *this;
+}
+
+ToolButton& ToolButton::Label(const char *text, int _kind)
+{
+	if(!(kind & FORCE)) {
+		kind = _kind;
+		Refresh();
+	}
+	Text(text);
+	return *this;
+}
+
+Image ToolButton::GetImage() const
+{
+	return CachedRescale(img, min(img.GetSize(), maxiconsize));
+}
+
+Bar::Item& ToolButton::Image(const UPP::Image& img_)
+{
+	if(!img_.IsSame(img)) {
+		img = img_;
+		Refresh();
+	}
+	return *this;
+}
+
+Bar::Item& ToolButton::Enable(bool enable)
+{
+	Ctrl::Enable(enable);
+	return *this;
+}
+
+Bar::Item& ToolButton::Tip(const char *tip)
+{
+	tiptext = tip;
+	UpdateTip();
+	return *this;
+}
+
+Bar::Item& ToolButton::Help(const char *help)
+{
+	HelpLine(help);
+	return *this;
+}
+
+Bar::Item& ToolButton::Topic(const char *help)
+{
+	HelpTopic(help);
+	return *this;
+}
+
+Bar::Item& ToolButton::Description(const char *desc)
+{
+	Ctrl::Description(desc);
+	return *this;
+}
+
+struct sCachedContrast : public ImageMaker
+{
+	int   d;
+	Image img;
+
+	virtual String Key() const {
+		String s;
+		RawCat(s, d);
+		RawCat(s, img.GetSerialId());
+		return s;
+	}
+
+	virtual Image Make() const {
+		return Contrast(img, 256 + d);
+	}
+};
+
+Image CachedContrast(const Image& m, int d)
+{
+	if(d == 0)
+		return m;
+	sCachedContrast cr;
+	cr.d = d;
+	cr.img = m;
+	return MakeImage(cr);
+}
+
+void  ToolButton::Paint(Draw& w)
+{
+	LTIMING("ToolButton::Paint");
+	paint_checked = checked;
+	Size sz = GetSize();
+	UPP::Image image = GetImage();
+	Size isz = image.GetSize();
+//	Ctrl *q = GetParent()->GetParent();
+//	if(!q || !q->IsTransparent())
+//		w.DrawRect(sz, checked && !HasMouse() ? Blend(SColorFace, SColorLight) : SColorFace);
+	int li = IsEnabled() ? HasMouse() ? GetMouseLeft() ? CTRL_PRESSED
+						                               : checked ? CTRL_HOTCHECKED : CTRL_HOT
+				                       : checked ? CTRL_CHECKED : CTRL_NORMAL
+					     : CTRL_DISABLED;
+	ChPaint(w, sz, style->look[li]);
+	Point off = style->offset[li];
+	Point ip = (sz - isz) / 2 + off;
+	Size tsz;
+	if(kind != NOLABEL)
+		tsz = GetTextSize(text, style->font);
+	if(kind == BOTTOMLABEL) {
+		ip.y  -= tsz.cy / 2 + 1;
+		w.DrawText((sz.cx - tsz.cx) / 2 + off.x, ip.y + isz.cy + 2 + off.y, text, style->font, style->textcolor[li]);
+	}
+	if(kind == RIGHTLABEL) {
+		ip.x -= tsz.cx / 2 + 2;
+		w.DrawText(ip.x + isz.cx + 3 + off.x, (sz.cy - tsz.cy) / 2 + off.y, text, style->font, style->textcolor[li]);
+	}
+	UPP::Image img = CachedContrast(image, style->contrast[li]);
+	if(!IsEnabled())
+		img = DisabledImage(img);
+	if(IsEnabled() && style->light[li])
+		DrawHighlightImage(w, ip.x, ip.y, img, true);
+	else
+		w.DrawImage(ip.x, ip.y, img);
+}
+
+void  ToolButton::MouseEnter(Point, dword)
+{
+	BarCtrl::SendHelpLine(this);
+	Refresh();
+}
+
+void  ToolButton::MouseLeave()
+{
+	BarCtrl::ClearHelpLine(this);
+	Refresh();
+}
+
+Size  ToolButton::GetMinSize() const
+{
+	UPP::Image image = GetImage();
+	Size sz = image.GetSize();
+	if(sz.IsEmpty())
+		sz = Size(16, 16);
+	sz += 6;
+	if(text.GetCount()) {
+		Size tsz = GetTextSize(text, style->font);
+		if(kind == BOTTOMLABEL) {
+			sz.cy += tsz.cy + 3;
+			sz.cx = max(sz.cx, tsz.cx + 9);
+		}
+		if(kind == RIGHTLABEL) {
+			sz.cx += tsz.cx + 6;
+			sz.cy = max(sz.cy, tsz.cy + 6);
+		}
+	}
+	return max(sz, minsize);
+}
+
+void  ToolButton::LeftDown(Point, dword)
+{
+	Refresh();
+	if(repeat)
+		WhenAction();
+}
+
+void  ToolButton::LeftRepeat(Point, dword)
+{
+	Refresh();
+	if(repeat)
+		WhenAction();
+}
+
+void  ToolButton::LeftUp(Point, dword)
+{
+	Refresh();
+	if(!repeat)
+		WhenAction();
+}
+
+bool  ToolButton::HotKey(dword key)
+{
+	if(key == accel) {
+		WhenAction();
+		return true;
+	}
+	return false;
+}
+
+void ToolButton::FinalSync()
+{
+	if(checked != paint_checked)
+		Refresh();
+}
+
+String ToolButton::GetDesc() const
+{
+	return tiptext;
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/CtrlLib/ToolTip.cpp b/uppsrc/CtrlLib/ToolTip.cpp
new file mode 100644
index 000000000..d0ed8e04e
--- /dev/null
+++ b/uppsrc/CtrlLib/ToolTip.cpp
@@ -0,0 +1,231 @@
+#include "CtrlLib.h"
+
+NAMESPACE_UPP
+
+#define LLOG(x) // LOG(x)
+
+ToolTip::ToolTip()
+{
+	SetFrame(BlackFrame());
+}
+
+Size ToolTip::GetMinSize() const
+{
+	return AddFrameSize(GetSmartTextSize(text) + 4);
+}
+
+void ToolTip::Paint(Draw& w)
+{
+	Size sz = GetSize();
+	w.DrawRect(sz, SColorInfo);
+	DrawSmartText(w, 2, 2, sz.cx - 4, text);
+}
+
+void ToolTip::PopUp(Ctrl *owner, Point p, bool effect)
+{
+	LLOG("ToolTip::PopUp" << Desc(owner) << " @ " << p);
+	Rect r = owner->GetWorkArea();
+	Size sz = GetMinSize();
+	p.x = max(p.x + sz.cx > r.right ? r.right - sz.cx : p.x, r.left);
+	p.y = max(p.y + sz.cy > r.bottom ? r.bottom - sz.cy : p.y, r.top);
+	if(GUI_PopUpEffect() == GUIEFFECT_SLIDE && effect)
+		SetRect(p.x, p.y, sz.cx, 1);
+	else
+		SetRect(p.x, p.y, sz.cx, sz.cy);
+	Ctrl::PopUp(owner, true, false, true);
+	if(effect)
+		Animate(*this, p.x, p.y, sz.cx, sz.cy);
+}
+
+Ptr<Ctrl> tipctrl;
+bool      showmode;
+
+ToolTip& AppToolTip()
+{
+	static ToolTip tip;
+	return tip;
+}
+
+void CloseToolTip()
+{
+	ToolTip& q = AppToolTip();
+	if(q.IsOpen())
+		q.Close();
+}
+
+void EndShowMode()
+{
+	showmode = false;
+}
+
+void ShowToolTip()
+{
+	LLOG("ShowToolTip");
+	CloseToolTip();
+	if(tipctrl) {
+		String text = tipctrl->GetTip();
+		LLOG("-> showing tip: " << text);
+		Ctrl *top = tipctrl->GetTopCtrl();
+		if(!text.IsEmpty() && top && (top->IsForeground() || top->IsPopUp())) {
+			LLOG("-> foreground");
+			ToolTip& q = AppToolTip();
+			q.Set(text);
+			q.PopUp(top, GetMousePos() + Size(0, 22), !showmode);
+			showmode = true;
+			KillTimeCallback((void *)EndShowMode);
+			return;
+		}
+		LLOG("-> background / empty text, top = " << UPP::Name(top));
+	}
+	SetTimeCallback(200, callback(EndShowMode), (void *)EndShowMode);
+}
+
+bool ToolTipHook(Ctrl *ctrl, bool inframe, int event, Point p, int zdelta, dword keyflags)
+{
+	if(event == Ctrl::MOUSEMOVE && ctrl != &AppToolTip())
+	{
+		LLOG("ToolTipHook MOUSEMOVE");
+		ctrl = Ctrl::GetVisibleChild(ctrl, p, inframe);
+		if(ctrl != tipctrl || ctrl->GetTip() != AppToolTip().Get() && showmode) {
+			LLOG("ToolTipHook / ctrl change " << UPP::Name(ctrl) << " -> " << UPP::Name(ctrl));
+			tipctrl = ctrl;
+			KillTimeCallback((void *)ToolTipHook);
+			if(showmode)
+				ShowToolTip();
+			else {
+				LLOG("ToolTipHook -> SetTimeCallback");
+				SetTimeCallback(1000, callback(ShowToolTip), (void *)ToolTipHook);
+			}
+		}
+	}
+	if(event == Ctrl::MOUSELEAVE) {
+		LLOG("ToolTipHook MOUSELEAVE");
+		CloseToolTip();
+		SetTimeCallback(1000, callback(EndShowMode), (void *)EndShowMode);
+	}
+	if((event & Ctrl::ACTION) == Ctrl::DOWN) {
+		LLOG("ToolTipHook DOWN");
+		CloseToolTip();
+		EndShowMode();
+	}
+	return false;
+}
+
+bool ToolTipStateHook(Ctrl *ctrl, int reason)
+{
+	if((reason == Ctrl::CLOSE || reason == Ctrl::ENABLE) && ctrl != &AppToolTip()) {
+		LLOG("ToolTipStateHook -> close");
+		CloseToolTip();
+		EndShowMode();
+	}
+	return false;
+}
+
+INITBLOCK {
+	LLOG("Ctrl::InstallMouseHook(ToolTipHook)");
+	Ctrl::InstallMouseHook(ToolTipHook);
+	Ctrl::InstallStateHook(ToolTipStateHook);
+}
+
+void LinkToolTipIn__() {}  // "Call" from elsewhere to force linking this module in...
+
+class QTFPopUp : public RichTextCtrl {
+public:
+	virtual void Deactivate();
+	virtual void CancelMode();
+
+protected:
+	int  width;
+	int  maxheight;
+	bool open;
+
+	void DoClose();
+
+public:
+	void      PopUp(Ctrl *parent);
+
+	QTFPopUp& Width(int _width)                   { width = _width; return *this; }
+	QTFPopUp& MaxHeight(int _maxheight)           { maxheight = _maxheight; return *this; }
+
+	QTFPopUp();
+};
+
+void QTFPopUp::Deactivate() {
+	if(open)
+		DoClose();
+}
+
+void QTFPopUp::CancelMode() {
+	DoClose();
+}
+
+void QTFPopUp::DoClose() {
+	if(open) {
+		open = false;
+		Close();
+	}
+}
+
+void QTFPopUp::PopUp(Ctrl *parent) {
+	Close();
+	Rect r = Rect(0, 0, width, maxheight);
+	GetFrame().FrameLayout(r);
+	int cy = min(maxheight, GetHeight(r.Width()) + maxheight - r.Height());
+	Rect area = GetWorkArea();
+	Point p = GetMousePos();
+	r.top = max(area.top, p.y + 16);
+	r.bottom = r.top + cy;
+	if(r.bottom > area.bottom) {
+		r.bottom = area.bottom;
+		r.top = r.bottom - cy;
+	}
+	r.left = max(area.left, p.x - width / 2);
+	r.right = r.left + width;
+	if(r.right > area.right) {
+		r.right = area.right;
+		r.left = r.right - width;
+	}
+	open = false;
+	SetRect(r);
+	Ctrl::PopUp(parent);
+	SetFocus();
+	open = true;
+}
+
+QTFPopUp::QTFPopUp() {
+	static ColorF helpborder[] = {
+		(ColorF)2,
+		&SColorText, &SColorText, &SColorText, &SColorText,
+		&SColorFace, &SColorFace, &SColorFace, &SColorFace,
+	};
+	static BorderFrame helpframe(helpborder);
+	width = 250;
+	maxheight = 150;
+	Margins(5).Background(LtYellow).SetFrame(helpframe);
+	open = false;
+}
+
+void PerformDescription()
+{
+	Ctrl *top = Ctrl::GetActiveWindow();
+	if(!top) return;
+	Vector<Image> vi;
+	vi.Add(CtrlImg::HelpCursor0());
+	vi.Add(CtrlImg::HelpCursor1());
+	if(PointLoop(*top, vi, 300)) {
+		Point p = GetMousePos();
+		Ctrl *ctrl = Ctrl::GetVisibleChild(top, p - top->GetRect().TopLeft(), true);
+		while(ctrl) {
+			String desc = ctrl->GetDescription();
+			if(!IsEmpty(desc)) {
+				static QTFPopUp qtf;
+				qtf.SetQTF(desc);
+				qtf.PopUp(top);
+				return;
+			}
+			ctrl = ctrl->GetParent();
+		}
+	}
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/CtrlLib/TrayIconWin32.cpp b/uppsrc/CtrlLib/TrayIconWin32.cpp
new file mode 100644
index 000000000..d19615e6a
--- /dev/null
+++ b/uppsrc/CtrlLib/TrayIconWin32.cpp
@@ -0,0 +1,190 @@
+#include "CtrlLib.h"
+
+#ifdef PLATFORM_WIN32
+#ifndef PLATFORM_WINCE
+
+#include <commdlg.h>
+#include <cderr.h>
+#include <ShellApi.h>
+
+#endif
+#endif
+
+NAMESPACE_UPP
+
+
+#ifdef PLATFORM_WIN32
+
+#ifndef PLATFORM_WINCE
+#define LLOG(x)
+
+enum {
+	UM_TASKBAR_ = WM_USER + 1024,
+	NIN_BALLOONSHOW_ = WM_USER + 2,
+	NIN_BALLOONHIDE_ = WM_USER + 3,
+	NIN_BALLOONTIMEOUT_ = WM_USER + 4,
+	NIN_BALLOONUSERCLICK_ = WM_USER + 5,
+};
+
+TrayIcon::TrayIcon()
+{
+	Create(NULL, WS_POPUP, 0, false, 0, 0);
+	Ctrl::Hide();
+	Zero(nid);
+	nid.sz = IsWin2K() ? sizeof(NotifyIconNew) : sizeof(NotifyIconOld);
+	nid.message = UM_TASKBAR_;
+	nid.hwnd = GetHWND();
+	static int id;
+	nid.id = ++id;
+	visible = false;
+	Show();
+}
+
+TrayIcon::~TrayIcon()
+{
+	Hide();
+	if(nid.icon)
+		DestroyIcon(nid.icon);
+}
+
+void TrayIcon::Notify(dword msg)
+{
+	if(visible) {
+		nid.flags = NIF_ICON|NIF_MESSAGE|NIF_TIP;
+		if(nid.icon)
+			DestroyIcon(nid.icon);
+		nid.icon = IconWin32(icon);
+		int len = min(tip.GetLength(), 60);
+		memcpy(nid.tip, tip, len);
+		nid.tip[len] = 0;
+		VERIFY(Shell_NotifyIcon(msg, (NOTIFYICONDATA *)&nid));
+    }
+}
+
+void TrayIcon::Message(int type, const char *title, const char *text, int timeout)
+{
+	if(!IsWin2K())
+	    return;
+	nid.flags = 0x10;
+	*nid.info = *nid.title = 0;
+	if(text) {
+		memcpy(nid.info, text, min((int)strlen(text), 255) + 1);
+		nid.info[255] = 0;
+	}
+	if(title) {
+		memcpy(nid.title, title, min((int)strlen(title), 63) + 1);
+		nid.title[63] = 0;
+	}
+	nid.infoflags = type;
+	nid.timeout = minmax(timeout, 10, 30) * 1000;
+	Shell_NotifyIcon(NIM_MODIFY, (NOTIFYICONDATA *)&nid);
+}
+
+void TrayIcon::Show(bool b)
+{
+	if(b == visible)
+		return;
+	if(visible)
+		Notify(NIM_DELETE);
+	visible = b;
+	if(visible)
+		Notify(NIM_ADD);
+}
+
+TrayIcon& TrayIcon::Icon(const Image &img)
+{
+	icon = img;
+	Notify(NIM_MODIFY);
+	return *this;
+}
+
+TrayIcon& TrayIcon::Tip(const char *text)
+{
+	tip = text;
+	Notify(NIM_MODIFY);
+	return *this;
+}
+
+void TrayIcon::Menu(Bar& bar)
+{
+	WhenBar(bar);
+}
+
+void TrayIcon::LeftDown()
+{
+	WhenLeftDown();
+}
+
+void TrayIcon::LeftUp()
+{
+	WhenLeftUp();
+}
+
+void TrayIcon::LeftDouble()
+{
+	WhenLeftDouble();
+}
+
+void TrayIcon::DoMenu(Bar& bar)
+{
+	Menu(bar);
+}
+
+void TrayIcon::BalloonLeftDown()
+{
+	WhenBalloonLeftDown();
+}
+
+void TrayIcon::BalloonShow()
+{
+	WhenBalloonShow();
+}
+
+void TrayIcon::BalloonHide()
+{
+	WhenBalloonHide();
+}
+
+void TrayIcon::BalloonTimeout()
+{
+	WhenBalloonTimeout();
+}
+
+LRESULT TrayIcon::WindowProc(UINT message, WPARAM wParam, LPARAM lParam)
+{
+	if(message == UM_TASKBAR_)
+		switch(lParam) {
+		case WM_LBUTTONDOWN:
+			LeftDown();
+			return TRUE;
+		case WM_LBUTTONUP:
+			LeftUp();
+			return TRUE;
+		case WM_LBUTTONDBLCLK:
+			::SetForegroundWindow(nid.hwnd);
+			LeftDouble();
+			return TRUE;
+		case WM_RBUTTONDOWN:
+			::SetForegroundWindow(nid.hwnd);
+			MenuBar::Execute(NULL, THISBACK(DoMenu), GetMousePos());
+			return TRUE;
+		case NIN_BALLOONSHOW_:
+			BalloonShow();
+			return TRUE;
+		case NIN_BALLOONHIDE_:
+			BalloonHide();
+			return TRUE;
+		case NIN_BALLOONTIMEOUT_:
+			BalloonTimeout();
+			return TRUE;
+		case NIN_BALLOONUSERCLICK_:
+			BalloonLeftDown();
+			return TRUE;
+		}
+	return Ctrl::WindowProc(message, wParam, lParam);
+}
+
+#endif
+#endif
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/CtrlLib/TrayIconX11.cpp b/uppsrc/CtrlLib/TrayIconX11.cpp
new file mode 100644
index 000000000..08aeeaafd
--- /dev/null
+++ b/uppsrc/CtrlLib/TrayIconX11.cpp
@@ -0,0 +1,210 @@
+#include "CtrlLib.h"
+
+#define LLOG(x) // LOG(x)
+
+NAMESPACE_UPP
+
+#ifdef PLATFORM_X11
+Atom TraySelection()
+{
+	return XAtom(Format("_NET_SYSTEM_TRAY_S%d", Xscreenno));
+}
+
+void TrayIcon::Call(int code, unsigned long d1, unsigned long d2, unsigned long d3)
+{
+	if(!traywin)
+		return;
+	bool x11trap = TrapX11Errors();
+	XEvent e;
+	Zero(e);
+	e.xclient.data.l[0] = CurrentTime;
+	e.xclient.data.l[1] = code;
+	e.xclient.data.l[2] = d1;
+	e.xclient.data.l[3] = d2;
+	e.xclient.data.l[4] = d3;
+	e.xclient.window = traywin;
+	e.xclient.type = ClientMessage;
+	e.xclient.message_type = XAtom("_NET_SYSTEM_TRAY_OPCODE");
+	e.xclient.format = 32;
+	XSendEvent(Xdisplay, traywin, XFalse, 0, &e);
+	XSync(Xdisplay, XFalse);
+	UntrapX11Errors(x11trap);
+}
+
+void TrayIcon::AddToTray()
+{
+	Hide();
+	traywin = XGetSelectionOwner(Xdisplay, TraySelection());
+	if(!traywin) return;
+
+	XSelectInput(Xdisplay, traywin, StructureNotifyMask);
+	XWindowAttributes attr;
+	XGetWindowAttributes(Xdisplay, Xroot, &attr);
+	XSelectInput(Xdisplay, Xroot, attr.your_event_mask | StructureNotifyMask);
+
+	Window win = GetWindow();
+	XSizeHints *size_hints = XAllocSizeHints();
+	size_hints->min_width = 22;
+	size_hints->min_height = 22;
+	size_hints->max_width = 22;
+	size_hints->max_height = 22;
+	size_hints->width = 22;
+	size_hints->height = 22;
+	size_hints->x = 0;
+	size_hints->y = 0;
+	size_hints->win_gravity = StaticGravity;
+	size_hints->flags = PMinSize|PMaxSize|PPosition|PSize|PWinGravity;
+	XSetWMNormalHints(Xdisplay, win, size_hints);
+
+	Call(0, win, 0, 0);
+
+	XSetWMNormalHints(Xdisplay, win, size_hints);
+
+	Show();
+	XSetWMNormalHints(Xdisplay, win, size_hints);
+	XFree(size_hints);
+}
+
+void TrayIcon::Message(const char *title, const char *text, int timeout)
+{
+	if(!traywin)
+		return;
+	int len = strlen(text);
+	static int stamp;
+	Call(1, 1000 * timeout, len, ++stamp);
+	bool x11trap = TrapX11Errors();
+	while(len > 0) {
+		XClientMessageEvent ev;
+		Zero(ev);
+		ev.type = ClientMessage;
+		ev.window = GetWindow();
+		ev.format = 8;
+		ev.message_type = XAtom("_NET_SYSTEM_TRAY_MESSAGE_DATA");
+		int n = min(len, 20);
+		memcpy(&ev.data, text, n);
+		text += n;
+		len -= n;
+		XSendEvent(Xdisplay, traywin, XFalse, StructureNotifyMask, (XEvent *) &ev);
+		XSync(Xdisplay, XFalse);
+	}
+	UntrapX11Errors(x11trap);
+}
+
+bool TrayIcon::HookProc(XEvent *event)
+{
+	XAnyEvent *e = (XAnyEvent *)event;
+	if(e->type == DestroyNotify && e->window == traywin) {
+		AddToTray();
+		return true;
+	}
+	if(e->type == ClientMessage && !traywin) {
+		XClientMessageEvent *cm = (XClientMessageEvent *)event;
+		if(cm->message_type == XAtom("MANAGER") && (Atom)cm->data.l[1] == TraySelection()) {
+			AddToTray();
+			return true;
+		}
+    }
+	return false;
+}
+
+void TrayIcon::Paint(Draw& w)
+{
+	Size sz = GetSize();
+	Size isz = icon.GetSize();
+	Image m = icon;
+	if(isz.cx > sz.cx || isz.cy > sz.cy) {
+		m = Rescale(icon, sz);
+		isz = sz;
+	}
+	Point p = Rect(sz).CenterPos(isz);
+	w.DrawRect(sz, SColorFace());
+	w.DrawImage(p.x, p.y, m);
+}
+
+void TrayIcon::LeftDown()
+{
+	WhenLeftDown();
+}
+
+void TrayIcon::LeftDown(Point p, dword keyflags)
+{
+	LeftDown();
+}
+
+void TrayIcon::LeftUp()
+{
+	WhenLeftUp();
+}
+
+void TrayIcon::LeftUp(Point p, dword keyflags)
+{
+	LeftUp();
+}
+
+void TrayIcon::LeftDouble()
+{
+	WhenLeftDouble();
+}
+
+void TrayIcon::LeftDouble(Point p, dword keyflags)
+{
+	LeftDouble();
+}
+
+void TrayIcon::Menu(Bar& bar)
+{
+	WhenBar(bar);
+}
+
+void TrayIcon::DoMenu(Bar& bar)
+{
+	Menu(bar);
+}
+
+void TrayIcon::RightDown(Point p, dword keyflags)
+{
+	MenuBar::Execute(this, THISBACK(DoMenu), GetMousePos());
+}
+
+void TrayIcon::Show(bool b)
+{
+/*	if(!!b == !!IsOpen()) return; // Needs fixing....
+	if(b) {
+	}
+	else
+		Close();*/
+}
+
+TrayIcon::TrayIcon()
+{
+	SetRect(0, 0, 24, 24);
+	ignoretakefocus = true;
+	Create(NULL, true, false);
+	if(top) {
+		popup = true;
+		Transparent();
+		AddToTray();
+	}
+}
+
+// Not implemented in X11 yet...
+void TrayIcon::BalloonLeftDown()
+{
+}
+
+void TrayIcon::BalloonShow()
+{
+}
+
+void TrayIcon::BalloonHide()
+{
+}
+
+void TrayIcon::BalloonTimeout()
+{
+}
+
+
+#endif
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/CtrlLib/TreeCtrl.cpp b/uppsrc/CtrlLib/TreeCtrl.cpp
new file mode 100644
index 000000000..48b84752d
--- /dev/null
+++ b/uppsrc/CtrlLib/TreeCtrl.cpp
@@ -0,0 +1,1746 @@
+#include "CtrlLib.h"
+
+NAMESPACE_UPP
+
+TreeCtrl::Node::Node()
+{
+	Init();
+}
+
+TreeCtrl::Node::Node(const Image& img, const Value& v)
+{
+	Init();
+	image = img;
+	key = value = v;
+}
+
+TreeCtrl::Node::Node(const Image& img, const Value& v, const Value& t)
+{
+	Init();
+	image = img;
+	key = v;
+	value = t;
+}
+
+TreeCtrl::Node::Node(const Value& v)
+{
+	Init();
+	key = value = v;
+}
+
+TreeCtrl::Node::Node(const Value& v, const Value& t)
+{
+	Init();
+	key = v;
+	value = t;
+}
+
+TreeCtrl::Node::Node(Ctrl& ctrl)
+{
+	Init();
+	SetCtrl(ctrl);
+}
+
+TreeCtrl::Node::Node(const Image& img, Ctrl& ctrl, int cx, int cy)
+{
+	Init();
+	SetCtrl(ctrl);
+	image = img;
+	size = ctrl.GetMinSize();
+	if(cx > 0)
+		size.cx = cx;
+	if(cy > 0)
+		size.cy = cy;
+}
+
+TreeCtrl::TreeCtrl()
+{
+	levelcx = 16;
+	nocursor = false;
+	noroot = false;
+	dirty = true;
+	multiselect = false;
+	nobg = false;
+	popupex = true;
+	mousemove = false;
+	accel = false;
+	treesize = Size(0, 0);
+	Clear();
+	SetFrame(ViewFrame());
+	AddFrame(sb);
+	sb.WhenScroll = THISBACK(Scroll);
+	WhenLeftDouble = THISBACK(StdLeftDouble);
+	chldlck = false;
+}
+
+void TreeCtrl::StdLeftDouble()
+{
+	if(IsCursor())
+		Open(GetCursor(), !IsOpen(GetCursor()));
+}
+
+void TreeCtrl::CancelMode()
+{
+	selclick = false;
+	dropinsert = 0;
+	dropitem = -1;
+	repoint = Null;
+}
+
+TreeCtrl::~TreeCtrl()
+{
+	Shutdown();
+}
+
+void   TreeCtrl::Layout()
+{
+	Size full = sb.GetViewSize();
+	Size red = sb.GetReducedViewSize();
+	Size total = sb.GetTotal();
+	if(total.cx > full.cx) full.cy = red.cy;
+	if(total.cy > full.cy) full.cx = red.cx;
+	if(total.cx > full.cx) full.cy = red.cy;
+	sb.SetPage(full);
+	sb.SetLine(item[0].GetSize().cy);
+}
+
+// 2008-04-08 mrjt
+Size   TreeCtrl::Item::GetValueSize() const
+{
+	return display ? display->GetStdSize(value) : StdDisplay().GetStdSize(value);
+}
+
+Size   TreeCtrl::Item::GetCtrlSize() const
+{
+	return IsNull(size) ? (ctrl ? ctrl->GetStdSize() : Size(0, 0)) : size;
+}
+
+Size   TreeCtrl::Item::GetSize() const
+{
+	Size sz = GetValueSize();
+	Size csz = GetCtrlSize();
+	sz += Size(2 * margin, 2 * margin);
+	Size isz = image.GetSize();
+	sz.cx += isz.cx;
+	sz.cy = max(sz.cy, isz.cy);
+	sz.cx += csz.cx;
+	sz.cy = max(sz.cy, csz.cy);
+	return sz;
+}
+
+/*
+Size   TreeCtrl::Item::GetValueSize() const
+{
+	if(IsNull(size))
+		if(ctrl)
+			return ctrl->GetMinSize();
+		else
+			return display ? display->GetStdSize(value) : StdDisplay().GetStdSize(value);
+	else
+		return size;
+}
+
+Size   TreeCtrl::Item::GetCtrlSize() const
+{
+	return size;
+}
+
+Size   TreeCtrl::Item::GetSize() const
+{
+	Size sz = GetValueSize();
+	sz += Size(2 * margin, 2 * margin);
+	Size isz = image.GetSize();
+	sz.cx += isz.cx;
+	sz.cy = max(sz.cy, isz.cy);
+	return sz;
+}
+*/
+
+void   TreeCtrl::SetRoot(const TreeCtrl::Node& n)
+{
+	(TreeCtrl::Node &)item[0] = n;
+	RefreshItem(0);
+}
+
+void   TreeCtrl::SetRoot(const Image& img, Value v)
+{
+	SetRoot(TreeCtrl::Node(img, v).CanOpen());
+}
+
+void   TreeCtrl::SetRoot(const Image& img, Value v, Value t)
+{
+	SetRoot(TreeCtrl::Node(img, v, t).CanOpen());
+}
+
+void   TreeCtrl::SetRoot(const Image& img, Ctrl& ctrl, int cx, int cy)
+{
+	SetRoot(TreeCtrl::Node(img, ctrl, cx, cy).CanOpen());
+}
+
+int    TreeCtrl::Insert(int parentid, int i, const TreeCtrl::Node& n)
+{
+	int id;
+	if(freelist >= 0) {
+		id = freelist;
+		freelist = item[id].freelink;
+	}
+	else {
+		id = item.GetCount();
+		item.Add();
+	}
+	Item& m = item[id];
+	m.free = false;
+	m.parent = parentid;
+	(TreeCtrl::Node&)m = n;
+	if(parentid >= 0) {
+		Item& parent = item[parentid];
+		parent.child.Insert(i, id);
+	}
+	dirty = true;
+	Dirty(parentid);
+	return id;
+}
+
+int    TreeCtrl::Add(int parentid, const TreeCtrl::Node& n)
+{
+	return Insert(parentid, item[parentid].child.GetCount(), n);
+}
+
+int    TreeCtrl::Insert(int parentid, int i)
+{
+	return Insert(parentid, i, TreeCtrl::Node());
+}
+
+int    TreeCtrl::Add(int parentid)
+{
+	return Add(parentid, TreeCtrl::Node());
+}
+
+int    TreeCtrl::Insert(int parentid, int i, const Image& img, Value v, bool withopen)
+{
+	return Insert(parentid, i, TreeCtrl::Node(img, v).CanOpen(withopen));
+}
+
+int    TreeCtrl::Insert(int parentid, int i, const Image& img, Value v, Value t, bool withopen)
+{
+	return Insert(parentid, i, TreeCtrl::Node(img, v, t).CanOpen(withopen));
+}
+
+int    TreeCtrl::Add(int parentid, const Image& img, Value v, bool withopen)
+{
+	return Add(parentid, TreeCtrl::Node(img, v).CanOpen(withopen));
+}
+
+int    TreeCtrl::Add(int parentid, const Image& img, Value v, Value t, bool withopen)
+{
+	return Add(parentid, TreeCtrl::Node(img, v, t).CanOpen(withopen));
+}
+
+int    TreeCtrl::Insert(int parentid, int i, const Image& img, Ctrl& ctrl, int cx, int cy, bool withopen)
+{
+	return Insert(parentid, i, TreeCtrl::Node(img, ctrl, cx, cy).CanOpen(withopen));
+}
+
+int    TreeCtrl::Add(int parentid, const Image& img, Ctrl& ctrl, int cx, int cy, bool withopen)
+{
+	return Add(parentid, TreeCtrl::Node(img, ctrl, cx, cy).CanOpen(withopen));
+}
+
+Value  TreeCtrl::Get(int id) const
+{
+	const Item& m = item[id];
+	return m.ctrl ? m.ctrl->GetData() : m.key;
+}
+
+Value  TreeCtrl::GetValue(int id) const
+{
+	const Item& m = item[id];
+	return m.ctrl ? m.ctrl->GetData() : m.value;
+}
+
+void  TreeCtrl::Set(int id, Value v)
+{
+	Item& m = item[id];
+	if(m.ctrl)
+		m.ctrl->SetData(v);
+	else {
+		m.value = m.key = v;
+		RefreshItem(id);
+	}
+	SetOption(id);
+}
+
+void  TreeCtrl::Set(int id, Value k, Value v)
+{
+	Item& m = item[id];
+	if(m.ctrl)
+		m.ctrl->SetData(v);
+	else {
+		m.key = k;
+		m.value = v;
+		RefreshItem(id);
+	}
+	SetOption(id);
+}
+
+void   TreeCtrl::SetNode(int id, const TreeCtrl::Node& n)
+{
+	(TreeCtrl::Node&)item[id] = n;
+	Dirty(id);
+	SetOption(id);
+}
+
+void   TreeCtrl::RemoveChildren(int id)
+{
+	Item& m = item[id];
+	for(int i = 0; i < m.child.GetCount(); i++)
+		RemoveSubtree(m.child[i]);
+	m.child.Clear();
+	Dirty(id);
+}
+
+int TreeCtrl::GetChildIndex(int id, int childid) const
+{
+	for(int i = 0; i < GetChildCount(id); i++)
+		if(GetChild(id, i) == childid)
+			return i;
+	return -1;
+}
+
+void   TreeCtrl::RemoveSubtree(int id)
+{
+	Item& m = item[id];
+	if(m.sel)
+		selectcount--;
+	if(m.linei == cursor)
+		cursor = item[m.parent].linei;
+	if(m.ctrl)
+		m.ctrl->Remove();
+	m.key = Null;
+	m.value = Null;
+	m.image = Null;
+	RemoveChildren(id);
+	m.freelink = freelist;
+	freelist = id;
+	m.free = true;
+}
+
+void   TreeCtrl::Remove(int id)
+{
+	ASSERT(id > 0);
+	int pi = item[id].parent;
+	Item& parent = item[item[id].parent];
+	parent.child.Remove(FindIndex(parent.child, id));
+	RemoveSubtree(id);
+	Dirty(pi);
+}
+
+void   TreeCtrl::Remove(const Vector<int>& id)
+{
+	for(int i = 0; i < id.GetCount(); i++)
+		if(!item[id[i]].free)
+			Remove(id[i]);
+}
+
+void   TreeCtrl::Clear()
+{
+	item.Clear();
+	item.Add();
+	item[0].linei = -1;
+	item[0].parent = -1;
+	item[0].canopen = true;
+	freelist = -1;
+	selectcount = 0;
+	Dirty();
+	cursor = anchor = -1;
+}
+
+void TreeCtrl::RemoveCtrls(int itemi)
+{
+	Item& m = item[itemi];
+	if(m.ctrl)
+		m.ctrl->Remove();
+	for(int i = 0; i < m.child.GetCount(); i++)
+		RemoveCtrls(m.child[i]);
+}
+
+void TreeCtrl::ReLine(int itemi, int level, Size& sz)
+{
+	int ii = line.GetCount();
+	Line& l = line.Add();
+	l.level = level;
+	l.itemi = itemi;
+	l.y = sz.cy;
+	l.ll = -1;
+	Item& m = item[itemi];
+	if(m.ctrl) {
+		hasctrls = true;
+		chldlck = true;
+		m.ctrl->Remove();
+		chldlck = false;
+	}
+	m.linei = ii;
+	Size msz = m.GetSize();
+	sz.cy += msz.cy;
+	sz.cx = max(sz.cx, level * levelcx + msz.cx);
+	level++;
+	for(int i = 0; i < m.child.GetCount(); i++)
+		if(m.isopen) {
+			line[ii].ll = line.GetCount();
+			ReLine(m.child[i], level, sz);
+		}
+		else
+			RemoveCtrls(m.child[i]);
+}
+
+void TreeCtrl::SyncTree()
+{
+	if(!dirty)
+		return;
+	if(noroot)
+		Open(0);
+	Ptr<Ctrl> restorefocus = GetFocusChildDeep();
+	hasctrls = false;
+	int cursorid = GetCursor();
+	for(int i = 0; i < item.GetCount(); i++)
+		item[i].linei = -1;
+	line.Clear();
+	treesize = Size(0, 0);
+	if(noroot) {
+		if(GetChildCount(0))
+			treesize.cy = -item[0].GetSize().cy;
+		ReLine(0, -1, treesize);
+	}
+	else
+		ReLine(0, 0, treesize);
+	treesize.cy = max(0, treesize.cy);
+	treesize.cx += levelcx;
+	if(treesize != sb.GetTotal()) {
+		sb.SetTotal(treesize);
+		Refresh();
+	}
+	cursor = -1;
+	dirty = false;
+	if(cursorid >= 0)
+		SetCursor(cursorid, false, false, false);
+	SyncCtrls(true, restorefocus);
+	PostCallback(PTEBACK(SyncInfo));
+}
+
+void TreeCtrl::SyncCtrls(bool add, Ctrl *restorefocus)
+{
+	if(!hasctrls)
+		return;
+	Point org = sb;
+	chldlck = true;
+	for(int i = noroot; i < line.GetCount(); i++) {
+		const Line& l = line[i];
+		Item& m = item[l.itemi];
+		if(m.ctrl) {
+			if(add)
+				AddChildBefore(m.ctrl, GetLastChild());
+			if(m.ctrl == restorefocus || m.ctrl->HasChildDeep(restorefocus))
+				restorefocus->SetFocus();
+			Size msz = m.GetSize();
+			Size isz = m.image.GetSize();
+			Size csz = m.GetCtrlSize();
+			m.ctrl->SetRect(levelcx + l.level * levelcx + isz.cx + m.margin - org.x,
+			                l.y + (msz.cy - csz.cy) / 2 - org.y, csz.cx, csz.cy);
+		}
+	}
+	chldlck = false;
+}
+
+bool TreeCtrl::IsOpen(int id) const
+{
+	return item[id].isopen;
+}
+
+void TreeCtrl::Dirty(int id)
+{
+	if(selectcount) SelClear(0);
+	Size sz = GetSize();
+	dirty = true;
+	while(id >= 0) {
+		int q = item[id].linei;
+		if(q >= 0) {
+			int y = line[q].y - sb.GetY();
+			Refresh(0, y, sz.cx, sz.cy - y);
+			return;
+		}
+		id = item[id].parent;
+	}
+	Refresh();
+}
+
+void TreeCtrl::Open(int id, bool open)
+{
+	Item& m = item[id];
+	if(m.isopen != open && (m.canopen || !open || m.child.GetCount())) {
+		m.isopen = open;
+		int q = GetCursor();
+		while(q >= 0) {
+			q = GetParent(q);
+			if(q == id) {
+				SetCursor(id, true, true, true);
+				break;
+			}
+		}
+		Dirty(id);
+		if(open)
+			WhenOpen(id);
+		else
+			WhenClose(id);
+	}
+}
+
+void TreeCtrl::OpenDeep(int id, bool open)
+{
+	Open(id, open);
+	Item& m = item[id];
+	for(int i = 0; i < m.child.GetCount(); i++)
+		OpenDeep(m.child[i], open);
+}
+
+void TreeCtrl::MakeVisible(int id)
+{
+	id = GetParent(id);
+	while(id >= 0) {
+		Open(id);
+		id = GetParent(id);
+	}
+}
+
+int TreeCtrl::FindLine(int y) const
+{
+	int l = FindUpperBound(line, y, LineLess());
+	return l > 0 ? l - 1 : 0;
+}
+
+void TreeCtrl::RefreshLine(int i, int ex)
+{
+	SyncTree();
+	if(i >= 0) {
+		Size sz = GetSize();
+		int y = line[i].y - sb.GetY();
+		Refresh(0, y - ex, sz.cx, item[line[i].itemi].GetSize().cy + 2 * ex);
+		SyncInfo();
+	}
+}
+
+void TreeCtrl::RefreshItem(int id, int ex)
+{
+	SyncTree();
+	if(id >= 0 && id < item.GetCount())
+		RefreshLine(item[id].linei, ex);
+}
+
+int  TreeCtrl::GetItemAtLine(int i)
+{
+	SyncTree();
+	return line[i].itemi;
+}
+
+int  TreeCtrl::GetLineAtItem(int id)
+{
+	SyncTree();
+	return item[id].linei;
+}
+
+int  TreeCtrl::GetLineCount()
+{
+	SyncTree();
+	return line.GetCount();
+}
+
+void TreeCtrl::ScrollIntoLine(int i)
+{
+	sb.ScrollIntoY(line[i].y, item[line[i].itemi].GetSize().cy);
+}
+
+void TreeCtrl::CenterLine(int i)
+{
+	int top = line[i].y;
+	int bottom = top + item[line[i].itemi].GetSize().cy;
+	sb.SetY(top + ((bottom - GetSize().cy) >> 1));
+}
+
+void TreeCtrl::ScrollIntoCursor()
+{
+	int c = GetCursorLine();
+	if(c >= 0)
+		ScrollIntoLine(c);
+}
+
+void TreeCtrl::CenterCursor()
+{
+	int c = GetCursorLine();
+	if(c >= 0)
+		CenterLine(c);
+}
+
+void TreeCtrl::MoveCursorLine(int c, int incr)
+{
+	int cnt = line.GetCount();
+	if (!incr) return;
+	else if (c < 0) c = cnt-1;
+	else if (c >= cnt) c = 0;
+
+	while (!item[line[c].itemi].canselect) {
+		c += incr;
+		if (c == cursor) return;
+		else if (c < 0) c = cnt-1;
+		else if (c >= cnt) c = 0;
+	}
+	SetCursorLineSync(c);
+}
+
+void TreeCtrl::SetCursorLine(int i, bool sc, bool sel, bool cb)
+{
+	if(nocursor)
+		return;
+	if(sel && multiselect) {
+		if(selectcount) SelClear(0);
+		SelectOne(line[i].itemi, true);
+	}
+	if(i != cursor) {
+		i = minmax(i, 0, line.GetCount() - 1);
+		if(i < 0) return;
+		Item& m = item[line[i].itemi];
+		if (!multiselect && !m.canselect) return;
+		if(sc)
+			sb.ScrollIntoY(line[i].y, m.GetSize().cy);
+		RefreshLine(cursor);
+		cursor = i;
+		RefreshLine(cursor);
+		if(m.ctrl && m.ctrl->SetWantFocus())
+			return;
+		if(cb) {
+			WhenCursor();
+			if (!multiselect) WhenSel();
+		}
+	}
+}
+
+void TreeCtrl::SetCursorLine(int i)
+{
+	SetCursorLine(i, true, true, true);
+}
+
+void TreeCtrl::SetCursorLineSync(int i)
+{
+	if(nocursor)
+		return;
+	if(i != cursor) {
+		RefreshLine(cursor);
+		if(i < 0)
+			cursor = -1;
+		else
+			cursor = minmax(i, (int)noroot, line.GetCount() - 1);
+		RefreshLine(cursor);
+		Item& m = item[line[cursor].itemi];
+		if(cursor >= 0) {
+			Sync();
+			sb.ScrollIntoY(line[cursor].y, m.GetSize().cy);
+		}
+		if(!(m.ctrl && m.ctrl->SetWantFocus()))
+			SetWantFocus();
+		WhenCursor();
+		if (!multiselect) WhenSel();
+	}
+}
+
+void TreeCtrl::KillCursor()
+{
+	RefreshLine(cursor);
+	cursor = -1;
+	Refresh();
+	WhenCursor();
+	WhenSel();
+	SyncInfo();
+}
+
+void TreeCtrl::SetCursor(int id, bool sc, bool sel, bool cb)
+{
+	while(id > 0) {
+		ASSERT(id >= 0 && id < item.GetCount());
+		MakeVisible(id);
+		SyncTree();
+		const Item& m = item[id];
+		if(m.linei >= 0) {
+			SetCursorLine(m.linei, sc, sel, cb);
+			return;
+		}
+		id = m.parent;
+	}
+	SetCursorLine(0, sc, sel, cb);
+}
+
+void TreeCtrl::SetCursor(int id)
+{
+	SetCursor(id, true, true, true);
+}
+
+int  TreeCtrl::GetCursor() const
+{
+	return cursor >= 0 ? line[cursor].itemi : -1;
+}
+
+Value  TreeCtrl::Get() const
+{
+	return IsCursor() ? Get(GetCursor()) : Value();
+}
+
+Value  TreeCtrl::GetValue() const
+{
+	return IsCursor() ? GetValue(GetCursor()) : Value();
+}
+
+int    TreeCtrl::Find(Value key)
+{
+	for(int i = 0; i < item.GetCount(); i++)
+		if(!item[i].free && Get(i) == key)
+			return i;
+	return -1;
+}
+
+bool   TreeCtrl::FindSetCursor(Value key)
+{
+	int q = Find(key);
+	if(q < 0)
+		return false;
+	SetCursor(q);
+	return true;
+}
+
+void TreeCtrl::UpdateSelect()
+{
+	WhenSelection();
+	WhenSel();
+	WhenAction();
+}
+
+bool TreeCtrl::IsSel(int id) const
+{
+	return multiselect ? IsSelected(id) : GetCursor() == id;
+}
+
+bool TreeCtrl::IsSelDeep(int id) const
+{
+	return IsSel(id) || id && IsSelDeep(GetParent(id));
+}
+
+void TreeCtrl::SelectOne0(int id, bool sel, bool cb)
+{
+	if(!multiselect)
+		return;
+	if(item[id].canselect && item[id].sel != sel) {
+		item[id].sel = sel;
+		selectcount += 2 * sel - 1;
+		RefreshItem(id);
+		if (cb) UpdateSelect();
+	}
+}
+
+void TreeCtrl::SelectOne(int id, bool sel)
+{
+	SelectOne0(id, sel, true);
+}
+
+void TreeCtrl::ShiftSelect(int l1, int l2)
+{
+	if(!multiselect)
+		return;
+	if(l1 > l2)
+		UPP::Swap(l1, l2);
+	for(int i = 0; i < line.GetCount(); i++)
+		SelectOne0(line[i].itemi, i >= l1 && i <= l2, true);
+}
+
+void TreeCtrl::LeftDrag(Point p, dword keyflags)
+{
+	if(p.y + sb.y > sb.GetTotal().cy)
+		return;
+	WhenDrag();
+}
+
+void TreeCtrl::DoClick(Point p, dword flags, bool down)
+{
+	Point org = sb;
+	if(p.y + org.y > sb.GetTotal().cy)
+		return;
+	int i = FindLine(p.y + org.y);
+	const Line& l = line[i];
+	int x = levelcx + l.level * levelcx - org.x - (levelcx >> 1);
+	if(p.x > x - 6 && p.x < x + 6) {
+		if(down)
+			Open(l.itemi, !IsOpen(l.itemi));
+	}
+	else {
+		if(down && IsSel(l.itemi)) {
+			selclick = true;
+			return;
+		}
+		SetWantFocus();
+		int q = cursor;
+		SetCursorLine(i, true, false, true);
+		if(multiselect) {
+			int id = GetCursor();
+			if(flags & K_CTRL) {
+				SelectOne(id, !IsSelected(id));
+				anchor = cursor;
+			}
+			else
+				if(flags & K_SHIFT)
+					ShiftSelect(anchor < 0 ? cursor : anchor, cursor);
+				else {
+					if(selectcount) SelClear(0);
+					SelectOne(id);
+					anchor = cursor;
+				}
+		}
+		if(cursor != q)
+			WhenAction();
+	}
+}
+
+void TreeCtrl::SyncInfo()
+{
+	if(IsShutdown())
+		return;
+	if((HasMouse() || info.HasMouse()) && popupex) {
+		Size sz = GetSize();
+		Point p = GetMouseViewPos();
+		Point org = sb;
+		if(p.y + org.y > sb.GetTotal().cy)
+			return;
+		int i = FindLine(p.y + org.y);
+		const Line& l = line[i];
+		const Item& m = item[l.itemi];
+		int x = levelcx + l.level * levelcx - org.x + m.image.GetSize().cx;
+		Rect r = RectC(x, l.y - org.y, sz.cx - x, m.GetSize().cy);
+		if(r.Contains(p)) {
+			Color fg, bg;
+			dword st;
+			const Display *d = GetStyle(i, fg, bg, st);
+			info.Set(this, r, m.value, d, fg, bg, st, m.margin);
+			return;
+		}
+	}
+	info.Cancel();
+}
+
+void TreeCtrl::MouseMove(Point p, dword)
+{
+	if(mousemove && !IsReadOnly()) {
+		Point org = sb;
+		if(p.y + org.y < treesize.cy) {
+			int i = FindLine(p.y + org.y);
+			if(!IsNull(i)) SetCursorLine(i);
+		}
+	}
+	SyncInfo();
+}
+
+void TreeCtrl::LeftDown(Point p, dword flags)
+{
+	DoClick(p, flags, true);
+}
+
+void TreeCtrl::LeftUp(Point p, dword keyflags)
+{
+	if(selclick) {
+		DoClick(p, keyflags, false);
+		selclick = false;
+	}
+}
+
+void TreeCtrl::LeftDouble(Point p, dword flags)
+{
+	LeftDown(p, flags);
+	Point org = sb;
+	if(p.y + org.y > sb.GetTotal().cy)
+		return;
+	int i = FindLine(p.y + org.y);
+	const Line& l = line[i];
+	int x = levelcx + l.level * levelcx - org.x - (levelcx >> 1) - org.x;
+	if(i == GetCursorLine() && (flags & (K_SHIFT|K_CTRL)) == 0 && p.x > x + 6)
+		WhenLeftDouble();
+}
+
+void TreeCtrl::RightDown(Point p, dword flags)
+{
+	Point org = sb;
+	if(p.y + org.y < sb.GetTotal().cy) {
+		int i = FindLine(p.y + org.y);
+		if(i >= 0) {
+			SetWantFocus();
+			SetCursorLine(i);
+		}
+	}
+	if(WhenBar)
+		MenuBar::Execute(WhenBar);
+}
+
+const Display *TreeCtrl::GetStyle(int i, Color& fg, Color& bg, dword& st)
+{
+	const Line& l = line[i];
+	const Item& m = item[l.itemi];
+	st = 0;
+	fg = SColorText;
+	bg = SColorPaper;
+	if(nobg)
+		bg = Null;
+	bool hasfocus = HasFocus() && !IsDragAndDropTarget();
+	bool drop = l.itemi == dropitem && dropinsert == 0;
+	if(IsReadOnly())
+		st |= Display::READONLY;
+	if(m.sel && multiselect)
+		st |= Display::SELECT;
+	if(i == cursor && !nocursor)
+		st |= Display::CURSOR;
+	if(drop) {
+		hasfocus = true;
+		st |= Display::CURSOR;
+	}
+	if(hasfocus)
+		st |= Display::FOCUS;
+	if((st & Display::SELECT) ||
+	    !multiselect && (st & Display::CURSOR) && !nocursor ||
+	    drop) {
+		fg = hasfocus ? SColorHighlightText : SColorText;
+		bg = hasfocus ? SColorHighlight : Blend(SColorDisabled, SColorPaper);
+	}
+	if(m.display)
+		return m.display;
+	return &StdDisplay();
+}
+
+void TreeCtrl::Paint(Draw& w)
+{
+	SyncTree();
+	Size sz = GetSize();
+	Point org = sb;
+	scroller.Set(org);
+	if(!nobg)
+		w.DrawRect(sz, SColorPaper);
+	int levelcx2 = levelcx >> 1;
+	for(int i = 0; i < line.GetCount(); i++) {
+		Line& l = line[i];
+		if(l.ll >= 0) {
+			int yl = line[i].y + item[l.itemi].GetSize().cy - org.y;
+			int yh = line[l.ll].y + item[line[l.ll].itemi].GetSize().cy / 2 - org.y;
+			if(yh >= 0 && yl < sz.cy) {
+				int x = levelcx + levelcx * l.level + levelcx2 - org.x;
+				w.DrawRect(x, yl, 1, yh - yl, SColorShadow);
+			}
+		}
+	}
+	Rect dri;
+	for(int i = FindLine(org.y); i < line.GetCount(); i++) {
+		Line& l = line[i];
+		const Item& m = item[l.itemi];
+		Size msz = m.GetSize();
+		Size isz = m.image.GetSize();
+		Size vsz = m.GetValueSize();
+		int y = l.y - org.y;
+		if(y > sz.cy)
+			break;
+		int x = 0;
+		x = levelcx + l.level * levelcx - org.x;
+		Point op = Point(x - levelcx2, y + msz.cy / 2);
+		Rect r = RectC(x, y, vsz.cx + 2 * m.margin, msz.cy);
+		if(l.itemi == dropitem) {
+			dri = r;
+			if(i == 0)
+				dri.top++;
+		}
+		if(w.IsPainting(0, y, sz.cx, msz.cy)) {
+			w.DrawRect(op.x, op.y, levelcx2, 1, SColorShadow);
+			if(m.canopen || m.child.GetCount()) {
+				Image im = m.isopen ? CtrlImg::treeminus() : CtrlImg::treeplus();
+				op -= im.GetSize() / 2;
+				w.DrawImage(op.x, op.y, im);
+			}
+			w.DrawImage(x, y + (msz.cy - isz.cy) / 2, m.image);
+			x += isz.cx;
+			Color fg, bg;
+			dword st;
+			if(m.ctrl) // 2008-04-08 mrjt
+				x += m.GetCtrlSize().cx;
+			if(x < sz.cx) {
+				const Display *d = GetStyle(i, fg, bg, st);
+				w.DrawRect(x, y, vsz.cx + 2 * m.margin, msz.cy, bg);
+				Rect r = RectC(x + m.margin, y + (msz.cy - vsz.cy) / 2, vsz.cx, vsz.cy);
+				w.Clip(r);
+				d->Paint(w, r, m.value, fg, bg, st);
+				w.End();
+				if(i == cursor && !nocursor && multiselect && GetSelectCount() != 1 && HasFocus()
+				   && !IsDragAndDropTarget())
+					DrawFocus(w, r, st & Display::SELECT ? SColorPaper() : SColorText());
+			}
+		}
+	}
+	if(dropitem >= 0 && dropinsert)
+		DrawHorzDrop(w, dri.left - 2, dropinsert < 0 ? dri.top : dri.bottom - 1,
+		             sz.cx - dri.left + 2);
+}
+
+Image TreeCtrl::GetDragSample()
+{
+	SyncTree();
+	Size sz = StdSampleSize();
+	ImageDraw iw(StdSampleSize());
+	iw.DrawRect(sz, SColorPaper);
+	int y = 0;
+	for(int i = 0; i < line.GetCount(); i++) {
+		Line& l = line[i];
+		const Item& m = item[l.itemi];
+		const Display *d = m.display;
+		if(!d) d = &StdDisplay();
+		Size msz = m.GetSize();
+		Size isz = m.image.GetSize();
+		Size vsz = m.GetValueSize();
+		Rect r = RectC(0, y, vsz.cx + 2 * m.margin, msz.cy);
+		int x = 0;
+		if(IsSel(l.itemi)) {
+			iw.DrawImage(x, y + (msz.cy - isz.cy) / 2, m.image);
+			x += isz.cx;
+			if(!(m.ctrl && m.ctrl->IsWantFocus())) {
+				d->Paint(iw, RectC(x + m.margin, y + (msz.cy - vsz.cy) / 2, vsz.cx, vsz.cy), m.value,
+				         SColorHighlightText, SColorHighlight, Display::SELECT|Display::FOCUS);
+			}
+			y += msz.cy;
+		}
+	}
+	return ColorMask(iw, SColorPaper);
+}
+
+void TreeCtrl::Scroll()
+{
+	SyncTree();
+	if(hasctrls) {
+		Refresh();
+		SyncCtrls(false, NULL);
+	}
+	else
+		scroller.Scroll(*this, sb);
+}
+
+void TreeCtrl::MouseWheel(Point, int zdelta, dword)
+{
+	sb.WheelY(zdelta);
+}
+
+void TreeCtrl::ChildGotFocus()
+{
+	for(int i = 0; i < line.GetCount(); i++) {
+		Item& m = item[line[i].itemi];
+		if(m.ctrl && m.ctrl->HasFocusDeep()) {
+			SetCursorLine(i);
+			return;
+		}
+	}
+}
+
+bool TreeCtrl::Tab(int d)
+{
+	if(cursor < 0)
+		return false;
+	Item& m = item[line[cursor].itemi];
+	if(m.ctrl && m.ctrl->HasFocusDeep())
+		return false;
+	for(int i = cursor + d; i >= 0 && i < line.GetCount(); i += d) {
+		Item& m = item[line[i].itemi];
+		if(m.ctrl && m.ctrl->SetWantFocus())
+			return true;
+	}
+	return false;
+}
+
+bool TreeCtrl::Key(dword key, int)
+{
+	SyncTree();
+	Size sz = GetSize();
+	int cid = GetCursor();
+	bool shift = key & K_SHIFT;
+	key &= ~K_SHIFT;
+	switch(key) {
+	case K_TAB:
+		return Tab(1);
+	case K_SHIFT_TAB:
+		return Tab(-1);
+	case K_UP:
+		MoveCursorLine(cursor - 1, -1);
+		break;
+	case K_DOWN:
+		MoveCursorLine(cursor + 1, 1);
+		break;
+	case K_PAGEDOWN:
+		MoveCursorLine(cursor >= 0 ? FindLine(line[cursor].y + sz.cy) : 0, 1);
+		break;
+	case K_PAGEUP:
+		MoveCursorLine(cursor >= 0 ? FindLine(line[cursor].y - sz.cy) : line.GetCount() - 1, -1);
+		break;
+	case K_LEFT:
+		if(cid >= 0)
+			Close(cid);
+		break;
+	case K_RIGHT:
+		if(cid >= 0)
+			Open(cid);
+		break;
+	default: {
+			if(accel && key >= ' ' && key < 65536) {
+				int ascii_line = -1;
+				int upper_line = -1;
+				int exact_line = -1;
+				int l = GetCursorLine();
+				for(;;) {
+					if(++l >= GetLineCount())
+						l = 0;
+					if(l == GetCursorLine())
+						break;
+					Value v = GetValue(line[l].itemi);
+					WString w;
+					if(IsString(v)) w = v;
+					else w = StdFormat(v).ToWString();
+					word first = w[0];
+					if(ascii_line < 0 && ToAscii(first) == ToAscii((word)key))
+						ascii_line = l;
+					if(upper_line < 0 && ToUpper(first) == ToUpper((word)key))
+						upper_line = l;
+					if(exact_line < 0 && first == key)
+						exact_line = l;
+				}
+				int ln = (exact_line >= 0 ? exact_line : upper_line >= 0 ? upper_line : ascii_line);
+				if(ln < 0)
+					BeepExclamation();
+				else {
+					int id = GetItemAtLine(ln);
+					Open(id);
+					SetCursor(id);
+				}
+				return true;
+			}
+			return false;
+		}
+	}
+	if(GetCursor() != cid) {
+		if(multiselect && cursor >= 0) {
+			if(shift) {
+				if(anchor < 0)
+					anchor = cursor;
+				ShiftSelect(anchor, cursor);
+			}
+			else {
+				ClearSelection();
+				SelectOne(GetCursor());
+				anchor = cursor;
+			}
+		}
+		WhenAction();
+	}
+	return true;
+}
+
+void TreeCtrl::GotFocus()
+{
+	if(dirty)
+		return;
+	if(hasctrls && cursor >= 0 && item[line[cursor].itemi].ctrl)
+		for(int i = 0; i < line.GetCount(); i++) {
+			Item& m = item[line[i].itemi];
+			if(m.ctrl && m.ctrl->SetWantFocus())
+				break;
+		}
+	RefreshLine(cursor);
+	if(GetSelectCount() > 1)
+		Refresh();
+	SyncInfo();
+}
+
+void TreeCtrl::LostFocus()
+{
+	if(dirty)
+		return;
+	RefreshLine(cursor);
+	if(GetSelectCount() > 1)
+		Refresh();
+	SyncInfo();
+}
+
+void TreeCtrl::ChildRemoved(Ctrl *)
+{
+	if(!chldlck)
+		Dirty();
+}
+
+struct TreeCtrl::SortOrder {
+	TreeCtrl         *tree;
+	const ValueOrder *order;
+	bool              byvalue;
+
+	bool operator()(int a, int b) const {
+		return byvalue ? (*order)(tree->GetValue(a), tree->GetValue(b))
+		               : (*order)(tree->Get(a), tree->Get(b));
+	}
+
+};
+
+void TreeCtrl::Sort0(int id, const ValueOrder& order, bool byvalue)
+{
+	SortOrder so;
+	so.tree = this;
+	so.order = &order;
+	so.byvalue = byvalue;
+	UPP::Sort(item[id].child, so);
+}
+
+void TreeCtrl::Sort(int id, const ValueOrder& order, bool byvalue)
+{
+	SyncTree();
+	Sort0(id, order, byvalue);
+	Dirty(id);
+}
+
+void TreeCtrl::SortDeep0(int id, const ValueOrder& order, bool byvalue)
+{
+	Sort0(id, order, byvalue);
+	Item& m = item[id];
+	for(int i = 0; i < m.child.GetCount(); i++)
+		SortDeep0(m.child[i], order, byvalue);
+}
+
+void TreeCtrl::SortDeep(int id, const ValueOrder& order, bool byvalue)
+{
+	SyncTree();
+	SortDeep0(id, order, byvalue);
+	Dirty(id);
+}
+
+void TreeCtrl::Sort(int id, int (*compare)(const Value& v1, const Value& v2), bool byvalue)
+{
+	Sort(id, FnValueOrder(compare), byvalue);
+}
+
+void TreeCtrl::SortDeep(int id, int (*compare)(const Value& v1, const Value& v2), bool byvalue)
+{
+	SortDeep(id, FnValueOrder(compare), byvalue);
+}
+
+void TreeCtrl::SortByValue(int id, const ValueOrder& order)
+{
+	Sort(id, order, true);
+}
+
+void TreeCtrl::SortDeepByValue(int id, const ValueOrder& order)
+{
+	SortDeep(id, order, true);
+}
+
+void TreeCtrl::SortByValue(int id, int (*compare)(const Value& v1, const Value& v2))
+{
+	Sort(id, compare, true);
+}
+
+void TreeCtrl::SortDeepByValue(int id, int (*compare)(const Value& v1, const Value& v2))
+{
+	SortDeep(id, compare, true);
+}
+
+void  TreeCtrl::SetData(const Value& data)
+{
+	FindSetCursor(data);
+}
+
+Value TreeCtrl::GetData() const
+{
+	return Get();
+}
+
+Point  TreeCtrl::GetScroll() const
+{
+	return sb;
+}
+
+void TreeCtrl::ScrollTo(Point sc)
+{
+	sb = sc;
+}
+
+void TreeCtrl::SelClear(int id)
+{
+	Item& m = item[id];
+	if(m.sel) {
+		m.sel = false;
+		RefreshItem(id);
+		selectcount--;
+	}
+	for(int i = 0; i < m.child.GetCount(); i++)
+		SelClear(m.child[i]);
+}
+
+void TreeCtrl::GatherSel(int id, Vector<int>& sel) const
+{
+	if(IsSel(id))
+		sel.Add(id);
+	const Item& m = item[id];
+	for(int i = 0; i < m.child.GetCount(); i++)
+		GatherSel(m.child[i], sel);
+}
+
+Vector<int> TreeCtrl::GetSel() const
+{
+	Vector<int> v;
+	GatherSel(0, v);
+	return v;
+}
+
+void TreeCtrl::RefreshSel()
+{
+	Size sz = GetSize();
+	for(int i = FindLine(sb.GetY()); i < line.GetCount(); i++) {
+		Line& l = line[i];
+		int y = l.y - sb.GetY();
+		if(y > sz.cy)
+			break;
+		if(IsSel(l.itemi))
+			RefreshItem(l.itemi);
+	}
+}
+
+void TreeCtrl::ClearSelection()
+{
+	if(selectcount) {
+		SelClear(0);
+		WhenSelection();
+		WhenSel();
+		WhenAction();
+		selectcount = 0;
+	}
+}
+
+void TreeCtrl::SetOption(int id)
+{
+}
+
+void TreeCtrl::DnD(int itemid, int insert)
+{
+	if(itemid != dropitem || insert != dropinsert)
+	{
+		RefreshItem(dropitem, 4);
+		dropitem = itemid;
+		dropinsert = insert;
+		RefreshItem(dropitem, 4);
+	}
+}
+
+bool TreeCtrl::DnDInserti(int ii, PasteClip& d, bool bottom)
+{
+	if(ii >= 0 && ii < line.GetCount()) {
+		int itemi = line[ii].itemi;
+		int parent = GetParent(itemi);
+		int childi = GetChildIndex(parent, itemi);
+		int ins = -1;
+		if(bottom)
+			if(childi != GetChildCount(parent) - 1 && ii + 1 < line.GetCount())
+				return DnDInserti(ii + 1, d, false);
+			else {
+				childi++;
+				ins = 1;
+			}
+		WhenDropInsert(parent, childi, d);
+		if(d.IsAccepted()) {
+			DnD(itemi, ins);
+			return true;
+		}
+	}
+	return false;
+}
+
+void TreeCtrl::DragEnter()
+{
+	RefreshSel();
+}
+
+void TreeCtrl::DragAndDrop(Point p, PasteClip& d)
+{
+	int py = p.y + sb.GetY();
+	if(py < sb.GetTotal().cy) {
+		int ii = FindLine(py);
+		const Line& l = line[ii];
+		if(l.itemi && WhenDropInsert) {
+			int y = l.y;
+			int cy = item[l.itemi].GetSize().cy;
+			if(py < y + cy / 4 && DnDInserti(ii, d, false))
+				return;
+			if(py >= y + 3 * cy / 4 && DnDInserti(ii, d, true))
+				return;
+		}
+		WhenDropItem(l.itemi, d);
+		if(d.IsAccepted()) {
+			DnD(l.itemi, 0);
+			return;
+		}
+		WhenDropInsert(l.itemi, GetChildCount(l.itemi), d);
+		if(d.IsAccepted()) {
+			DnD(l.itemi, 0);
+			return;
+		}
+	}
+	WhenDrop(d);
+	DnD(-1, 0);
+}
+
+void TreeCtrl::DragRepeat(Point p)
+{
+	if(IsReadOnly())
+		return;
+	sb = sb + GetDragScroll(this, p, 16);
+	p.y += sb.y;
+	if(p == repoint) {
+		if(GetTimeClick() - retime > 1000 && p.y < sb.GetTotal().cy) {
+			int ii = FindLine(p.y);
+			const Line& l = line[ii];
+			int y = l.y;
+			int cy = item[l.itemi].GetSize().cy;
+			if(p.y >= y + cy / 4 && p.y < y + 3 * cy / 4 &&
+			   !IsOpen(l.itemi) && GetChildCount(l.itemi)) {
+				Open(l.itemi, true);
+				retime = GetTimeClick();
+			}
+		}
+	}
+	else {
+		retime = GetTimeClick();
+		repoint = p;
+	}
+}
+
+void TreeCtrl::DragLeave()
+{
+	DnD(-1, 0);
+	RefreshSel();
+	repoint = Null;
+}
+
+void TreeCtrl::AdjustAction(int parent, PasteClip& d)
+{
+	if(IsDragAndDropSource() && IsSelDeep(parent) && d.GetAction() == DND_MOVE)
+		d.SetAction(DND_COPY);
+}
+
+void TreeCtrl::InsertDrop(int parent, int ii, const TreeCtrl& src, PasteClip& d)
+{
+	TreeCtrl copy;
+	Vector<int> sel = src.GetSel();
+	for(int i = 0; i < sel.GetCount(); i++)
+		Copy(copy, 0, i, src, sel[i]);
+	Vector<int> did;
+	for(int i = 0; i < copy.GetChildCount(0); i++) {
+		did.Add(Copy(*this, parent, ii + i, copy, copy.GetChild(0, i)));
+		SetCursor(did.Top());
+	}
+	if(&src == this && d.GetAction() == DND_MOVE) {
+		Remove(sel);
+		d.SetAction(DND_COPY);
+	}
+	for(int i = 0; i < did.GetCount(); i++)
+		SelectOne(did[i], true);
+}
+
+void TreeCtrl::InsertDrop(int parent, int ii, PasteClip& d)
+{
+	InsertDrop(parent, ii, GetInternal<TreeCtrl>(d), d);
+}
+
+void TreeCtrl::Swap(int id1, int id2)
+{
+	SyncTree();
+	Item& i1 = item[id1];
+	Item& i2 = item[id2];
+	for(int i = 0; i < i1.child.GetCount(); i++)
+		item[i1.child[i]].parent = id2;
+	for(int i = 0; i < i2.child.GetCount(); i++)
+		item[i2.child[i]].parent = id1;
+	item.Swap(id1, id2);
+	Dirty(id1);
+	Dirty(id2);
+}
+
+void TreeCtrl::SwapChildren(int parentid, int i1, int i2)
+{
+	SyncTree();
+	Item& parent = item[parentid];
+	UPP::Swap(parent.child[i1], parent.child[i2]);
+	Dirty(parentid);
+}
+
+void OptionTree::SetRoot(const Image& img, Option& opt, const char *text)
+{
+	if(text)
+		opt.SetLabel(text);
+	TreeCtrl::SetRoot(img, opt);
+	opt.NoNotNull().BlackEdge();
+	option.At(0) = &opt;
+	opt <<= THISBACK1(SetOption, 0);
+}
+
+void OptionTree::Clear()
+{
+	TreeCtrl::Clear();
+	aux.Clear();
+	option.Clear();
+	aux.Add();
+}
+
+void OptionTree::SetRoot(Option& option, const char *text)
+{
+	SetRoot(Null, option, text);
+}
+
+void OptionTree::SetRoot(const Image& img, const char *text)
+{
+	SetRoot(img, aux[0], text);
+}
+
+void OptionTree::SetRoot(const char *text)
+{
+	SetRoot(Null, aux[0], text);
+}
+
+int OptionTree::Add(int parentid, const Image& img, Option& opt, const char *text)
+{
+	return Insert(parentid, GetChildCount(parentid), img, opt, text);
+}
+
+int OptionTree::Insert(int parentid, int i, const Image& img, Option& opt, const char *text)
+{
+	if(text)
+		opt.SetLabel(text);
+	int id = TreeCtrl::Insert(parentid, i, img, opt);
+	option.At(id, NULL) = &opt;
+	opt.NoNotNull().BlackEdge();
+	opt <<= THISBACK1(SetOption, id);
+	SetOption(id);
+	return id;
+}
+
+int OptionTree::Add(int parentid, const Image& img, const char *text)
+{
+	return Insert(parentid, GetChildCount(parentid), img, text);
+}
+
+int OptionTree::Insert(int parentid, int i, const Image& img, const char *text)
+{
+	return Insert(parentid, i, img, aux.Add().NoNotNull(), text);
+}
+
+int OptionTree::Add(int parentid, Option& opt, const char *text)
+{
+	return Insert(parentid, GetChildCount(parentid), opt, text);
+}
+
+int OptionTree::Insert(int parentid, int i, Option& opt, const char *text)
+{
+	return Insert(parentid, i, Null, opt.NoNotNull(), text);
+}
+
+int OptionTree::Add(int parentid, const char *text)
+{
+	return Insert(parentid, GetChildCount(parentid), text);
+}
+
+int OptionTree::Insert(int parentid, int i, const char *text)
+{
+	return Insert(parentid, i, aux.Add().NoNotNull(), text);
+}
+
+void OptionTree::SetChildren(int id, bool b)
+{
+	for(int i = 0; i < GetChildCount(id); i++) {
+		int chid = GetChild(id, i);
+		Option *opt = option[chid];
+		if(opt)
+			opt->Set(b);
+		SetChildren(chid, b);
+	}
+}
+
+void OptionTree::SetOption(int id)
+{
+	Option *opt = option[id];
+	ASSERT(opt);
+	SetChildren(id, opt->Get());
+	for(;;) {
+		id = GetParent(id);
+		if(id < 0)
+			break;
+		bool t = false;
+		bool f = false;
+		bool n = false;
+		for(int i = 0; i < GetChildCount(id); i++) {
+			int chid = GetChild(id, i);
+			Option *opt = option[chid];
+			if(opt) {
+				int x = opt->Get();
+				if(x == 1)
+					t = true;
+				else
+				if(x == 0)
+					f = true;
+				else
+					n = true;
+			}
+		}
+		opt = option[id];
+		if(opt) {
+			if(t && f || n) {
+				opt->Set(Null);
+			}
+			else
+				opt->Set(t);
+		}
+	}
+	WhenOption();
+}
+
+OptionTree::OptionTree() { aux.Add(); }
+OptionTree::~OptionTree() {}
+
+int Copy(TreeCtrl& dst, int did, int i, const TreeCtrl& src, int id)
+{
+	TreeCtrl::Node x = src.GetNode(id);
+	x.ctrl = NULL;
+	did = dst.Insert(did, i, x);
+	dst.Open(did, src.IsOpen(id));
+	for(int i = 0; i < src.GetChildCount(id); i++)
+		Copy(dst, did, i, src, src.GetChild(id, i));
+	return did;
+}
+
+CH_VALUE(TreeDropEdge, ChBorder(BlackBorder()));
+
+CtrlFrame& TreeDropFrame()
+{
+	static LookFrame m(TreeDropEdge);
+	return m;
+}
+
+PopUpTree::PopUpTree() {
+	SetFrame(TreeDropFrame());
+	Accel();
+	MouseMoveCursor();
+	NoPopUpEx();
+	maxheight = 200;
+	open = false;
+	WhenOpen = WhenClose = THISBACK(OpenClose);
+}
+
+PopUpTree::~PopUpTree() {}
+
+void PopUpTree::CancelMode() {
+	if(open) {
+		DoClose();
+		WhenCancel();
+	}
+	TreeCtrl::CancelMode();
+}
+
+void PopUpTree::DoClose() {
+	open = false;
+	Ctrl::Close();
+}
+
+void PopUpTree::Deactivate() {
+	if(open) {
+		DoClose();
+		IgnoreMouseClick();
+		WhenCancel();
+	}
+}
+
+void PopUpTree::LeftUp(Point p, dword keyflags) {
+	TreeCtrl::LeftUp(p, keyflags);
+	if(IsCursor() && !GetData().IsVoid()) {
+		DoClose();
+		WhenSelect();
+	}
+}
+
+bool PopUpTree::Key(dword key, int n) {
+	switch(key) {
+	case K_ENTER:
+	case K_ALT_DOWN:
+		DoClose();
+		WhenSelect();
+		return true;
+	case K_ESCAPE:
+		DoClose();
+		WhenCancel();
+		return true;
+	}
+	return TreeCtrl::Key(key, n);
+}
+
+void PopUpTree::PopUp(Ctrl *owner, int x, int top, int bottom, int width) {
+	DoClose();
+	int h = AddFrameSize(width, maxheight).cy;
+	showpos.x = x;
+	showpos.y = bottom;
+	showwidth = width;
+	Rect area = Ctrl::GetWorkArea();
+	up = false;
+	if(showpos.y + h > area.bottom) {
+		up = true;
+		showpos.y = top;
+	}
+	open = false;
+	Ctrl popup;
+	int ht = AddFrameSize(width, min(maxheight, GetTreeSize().cy)).cy;
+	Rect rt = RectC(showpos.x, showpos.y - (up ? ht : 0), showwidth, ht);
+	if(GUI_PopUpEffect()) {
+		if(up) {
+			popup.SetRect(Rect(rt.left, rt.bottom - 1, rt.right, rt.bottom));
+			popup.Add(TopPos(0, rt.Height()).LeftPos(0, rt.Width()));
+		}
+		else {
+			popup.SetRect(Rect(rt.left, rt.top, rt.right, rt.top + 1));
+			popup.Add(BottomPos(0, rt.Height()).LeftPos(0, rt.Width()));
+		}
+		CenterCursor();
+		popup.PopUp(owner, true, true, GUI_DropShadows());
+		SetFocus();
+		Ctrl::ProcessEvents();
+		Animate(popup, rt, GUIEFFECT_SLIDE);
+		Ctrl::Remove();
+	}
+	CenterCursor();
+	SetRect(rt);
+	Ctrl::PopUp(owner, true, true, GUI_DropShadows());
+	SetFocus();
+	open = true;
+}
+
+void PopUpTree::OpenClose(int i)
+{
+	SyncTree();
+	int ht = AddFrameSize(showwidth, min(maxheight, GetTreeSize().cy)).cy;
+	SetRect(RectC(showpos.x, showpos.y - (up ? ht : 0), showwidth, ht));
+}
+
+void PopUpTree::PopUp(Ctrl *owner, int width)
+{
+	Rect r = owner->GetScreenRect();
+	r.right = r.left + width;
+	PopUp(owner, r.left, r.top, r.bottom, width);
+}
+
+void PopUpTree::PopUp(Ctrl *owner)
+{
+	Rect r = owner->GetScreenRect();
+	PopUp(owner, r.left, r.top, r.bottom, r.Width());
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/CtrlLib/TreeCtrl.h b/uppsrc/CtrlLib/TreeCtrl.h
new file mode 100644
index 000000000..d1204e791
--- /dev/null
+++ b/uppsrc/CtrlLib/TreeCtrl.h
@@ -0,0 +1,362 @@
+class TreeCtrl : public Ctrl {
+public:
+	virtual void  CancelMode();
+	virtual void  Paint(Draw& w);
+	virtual void  Layout();
+	virtual void  LeftDown(Point p, dword flags);
+	virtual void  LeftUp(Point p, dword flags);
+	virtual void  LeftDouble(Point p, dword flags);
+	virtual void  LeftDrag(Point p, dword keyflags);
+	virtual void  RightDown(Point p, dword flags);
+	virtual void  MouseWheel(Point p, int zdelta, dword keyflags);
+	virtual void  MouseMove(Point, dword);
+	virtual bool  Key(dword key, int);
+	virtual void  GotFocus();
+	virtual void  LostFocus();
+	virtual void  ChildGotFocus();
+	virtual void  ChildRemoved(Ctrl *);
+	virtual void  SetData(const Value& data);
+	virtual Value GetData() const;
+	virtual void  DragEnter();
+	virtual void  DragAndDrop(Point p, PasteClip& d);
+	virtual void  DragRepeat(Point p);
+	virtual void  DragLeave();
+
+public:
+	class Node
+	{
+		void           Init() { display = NULL; size = Null; margin = 2; canopen = false; canselect = true; }
+
+	public:
+		Image          image;
+		int            margin;
+		Value          key;
+		Value          value;
+		const Display *display;
+		Size           size;
+		Ptr<Ctrl>      ctrl;
+		bool           canopen;
+		bool           canselect;
+
+		Node& SetImage(const Image& img)          { image = img; return *this; }
+		Node& Set(const Value& v)                 { key = value = v; return *this; }
+		Node& Set(const Value& v, const Value& t) { key = v; value = t; return *this; }
+		Node& SetDisplay(const Display& d)        { display = &d; return *this; }
+		Node& SetSize(Size sz)                    { size = sz; return *this; }
+		Node& SetCtrl(Ctrl& _ctrl)                { ctrl = &_ctrl; return *this; }
+		Node& CanOpen(bool b = true)              { canopen = b; return *this; }
+		Node& CanSelect(bool b)                   { canselect = b; return *this; }
+
+		Node();
+		Node(const Image& img, const Value& v);
+		Node(const Image& img, const Value& v, const Value& t);
+		Node(const Value& v);
+		Node(const Value& v, const Value& t);
+		Node(Ctrl& ctrl);
+		Node(const Image& img, Ctrl& ctrl, int cx = 0, int cy = 0);
+	};
+
+private:
+	struct Item : Node {
+		union {
+			int            parent;
+			int            freelink;
+		};
+
+		bool           free;
+		bool           isopen;
+		bool           sel;
+		Vector<int>    child;
+		int            linei;
+
+		Size GetValueSize() const;
+		Size GetCtrlSize() const;
+		Size GetSize() const;
+
+		Item() { isopen = false; linei = -1; parent = -1; canselect = true; sel = false; free = false; }
+	};
+	struct Line : Moveable<Line> {
+		int  level;
+		int  itemi;
+		int  ll;
+		int  y;
+	};
+
+	Array<Item>  item;
+	Vector<Line> line;
+	int          cursor;
+	int          freelist;
+	int          levelcx;
+	int          anchor;
+	int          selectcount;
+	bool         nocursor;
+	bool         noroot;
+	bool         dirty;
+	bool         hasctrls;
+	bool         multiselect;
+	bool         nobg;
+	bool         popupex;
+	bool         chldlck;
+	bool         mousemove;
+	bool         accel;
+
+	bool         selclick;
+	int          dropitem, dropinsert;
+	Point        repoint;
+	int          retime;
+	Size         treesize;
+
+	ScrollBars   sb;
+	Scroller     scroller;
+	Display     *display;
+
+	DisplayPopup info;
+
+	struct LineLess {
+		bool   operator()(int y, const Line& l) const            { return y < l.y; }
+	};
+
+	struct SortOrder;
+
+	const Display *GetStyle(int i, Color& fg, Color& bg, dword& st);
+	void   Dirty(int id = 0);
+	void   ReLine(int, int, Size&);
+	void   RemoveSubtree(int id);
+	void   Scroll();
+	int    FindLine(int y) const;
+	void   RefreshLine(int i, int ex = 0);
+	void   RefreshItem(int id, int ex = 0);
+	void   SetCursorLineSync(int i);
+	void   MoveCursorLine(int c, int incr);
+	void   SetCursorLine(int i, bool sc, bool sel, bool cb);
+	void   SetCursor(int id, bool sc, bool sel, bool cb);
+	void   RemoveCtrls(int itemi);
+	void   SyncCtrls(bool add, Ctrl *restorefocus);
+	bool   Tab(int d);
+	void   Sort0(int id, const ValueOrder& order, bool byvalue);
+	void   SortDeep0(int id, const ValueOrder& order, bool byvalue);
+	void   GatherOpened(int id, Vector<int>& o);
+	void   SelClear(int id);
+	void   UpdateSelect();
+	void   ShiftSelect(int l1, int l2);
+	void   SelectOne0(int id, bool sel, bool cb = false);
+	void   DnD(int itemid, int insert);
+	bool   DnDInserti(int ii, PasteClip& d, bool bottom);
+	bool   DnDInsert(int ii, int py, int q, PasteClip& d);
+	void   RefreshSel();
+	void   GatherSel(int id, Vector<int>& sel) const;
+	void   DoClick(Point p, dword flags, bool down);
+	void   SyncInfo();
+
+protected:
+	virtual void SetOption(int id);
+	void         SyncTree();
+
+public:
+	Callback1<int>  WhenOpen;
+	Callback1<int>  WhenClose;
+	Callback        WhenLeftDouble;
+	Callback1<Bar&> WhenBar;
+	Callback        WhenSel;
+
+	Callback                        WhenDrag;
+	Callback2<int, PasteClip&>      WhenDropItem;
+	Callback3<int, int, PasteClip&> WhenDropInsert;
+	Callback1<PasteClip&>           WhenDrop;
+
+	// deprecated - use WhenSel
+	Callback        WhenCursor;
+	Callback        WhenSelection;
+
+	void   SetRoot(const Node& n);
+	void   SetRoot(const Image& img, Value v);
+	void   SetRoot(const Image& img, Value v, Value t);
+	void   SetRoot(const Image& img, Ctrl& ctrl, int cx = 0, int cy = 0);
+	int    Insert(int parentid, int i, const Node& n);
+	int    Insert(int parentid, int i);
+	int    Insert(int parentid, int i, const Image& img, Value value, bool withopen = false);
+	int    Insert(int parentid, int i, const Image& img, Value key, Value value, bool withopen = false);
+	int    Insert(int parentid, int i, const Image& img, Ctrl& c, int cx = 0, int cy = 0, bool wo = false);
+	int    Add(int parentid, const Node& n);
+	int    Add(int parentid);
+	int    Add(int parentid, const Image& img, Value value, bool withopen = false);
+	int    Add(int parentid, const Image& img, Value key, Value value, bool withopen = false);
+	int    Add(int parentid, const Image& img, Ctrl& ctrl, int cx = 0, int cy = 0, bool withopen = false);
+	void   Remove(int id);
+	void   RemoveChildren(int id);
+
+	void   Swap(int id1, int id2);
+	void   SwapChildren(int parentid, int i1, int i2);
+
+	int    GetChildCount(int id) const                         { return item[id].child.GetCount(); }
+	int    GetChild(int id, int i) const                       { return item[id].child[i]; }
+	int    GetChildIndex(int id, int childid) const;
+	int    GetParent(int id) const                             { return item[id].parent; }
+
+	Value  Get(int id) const;
+	Value  GetValue(int id) const;
+	Value  operator[](int id) const                            { return Get(id); }
+	void   Set(int id, Value value);
+	void   Set(int id, Value key, Value value);
+
+	int    GetLineCount();
+	int    GetItemAtLine(int i);
+	int    GetLineAtItem(int id);
+
+	Node   GetNode(int id) const                               { return item[id]; }
+	void   SetNode(int id, const Node& n);
+
+	bool   IsOpen(int id) const;
+	void   Open(int id, bool open = true);
+	void   Close(int id)                                       { Open(id, false); }
+
+	void   OpenDeep(int id, bool open = true);
+	void   CloseDeep(int id)                                   { OpenDeep(id, false); }
+
+	void   MakeVisible(int id);
+
+	void   SetCursorLine(int i);
+	int    GetCursorLine() const                               { return cursor; }
+	void   KillCursor();
+	void   SetCursor(int id);
+	int    GetCursor() const;
+	bool   IsCursor() const                                    { return GetCursor() >= 0; }
+
+	Point  GetScroll() const;
+	void   ScrollTo(Point sc);
+
+	Value  Get() const;
+	Value  GetValue() const;
+
+	int    Find(Value key);
+	bool   FindSetCursor(Value key);
+
+	void   Sort(int id, const ValueOrder& order, bool byvalue = false);
+	void   SortDeep(int id, const ValueOrder& order, bool byvalue = false);
+
+	void   Sort(int id, int (*compare)(const Value& v1, const Value& v2) = StdValueCompare,
+	            bool byvalue = false);
+	void   SortDeep(int id, int (*compare)(const Value& v1, const Value& v2) = StdValueCompare,
+	                bool byvalue = false);
+
+	void   SortByValue(int id, const ValueOrder& order);
+	void   SortDeepByValue(int id, const ValueOrder& order);
+
+	void   SortByValue(int id, int (*compare)(const Value& v1, const Value& v2) = StdValueCompare);
+	void   SortDeepByValue(int id, int (*compare)(const Value& v1, const Value& v2) = StdValueCompare);
+
+	void   Clear();
+
+	void         ClearSelection();
+	void         SelectOne(int id, bool sel = true);
+	bool         IsSelected(int id) const       { return item[id].sel; }
+	bool         IsSel(int id) const;
+	int          GetSelectCount() const         { return selectcount; }
+	bool         IsSelDeep(int id) const;
+	Vector<int>  GetSel() const;
+	void         Remove(const Vector<int>& id);
+	void         RemoveSelection()              { Remove(GetSel()); }
+
+	void         AdjustAction(int parent, PasteClip& x);
+	void         InsertDrop(int parent, int ii, const TreeCtrl& src, PasteClip& x);
+	void         InsertDrop(int parent, int ii, PasteClip& d);
+	Image        GetDragSample();
+
+	void         StdLeftDouble();
+
+	void         ScrollIntoLine(int i);
+	void         CenterLine(int i);
+
+	void         ScrollIntoCursor();
+	void         CenterCursor();
+
+	Size         GetTreeSize() const         { return treesize; }
+
+	void   Dump();
+
+	TreeCtrl& NoCursor(bool b = true)        { nocursor = b; if(b) KillCursor(); return *this; }
+	TreeCtrl& NoRoot(bool b = true)          { noroot = b; Dirty(); Refresh(); return *this; }
+	TreeCtrl& LevelCx(int cx)                { levelcx = cx; Dirty(); return *this; }
+	TreeCtrl& MultiSelect(bool b = true)     { multiselect = b; return *this; }
+	TreeCtrl& NoBackground(bool b = true)    { nobg = b; Transparent(); Refresh(); return *this; }
+	TreeCtrl& PopUpEx(bool b = true)         { popupex = b; return *this; }
+	TreeCtrl& NoPopUpEx()                    { return PopUpEx(false); }
+	TreeCtrl& MouseMoveCursor(bool m = true) { mousemove = m; return *this; }
+	TreeCtrl& Accel(bool a = true)           { accel = a; return *this; }
+
+	TreeCtrl& SetScrollBarStyle(const ScrollBar::Style& s) { sb.SetStyle(s); return *this; }
+
+	typedef TreeCtrl CLASSNAME;
+
+	TreeCtrl();
+	~TreeCtrl();
+};
+
+int Copy(TreeCtrl& dst, int dstid, int i, const TreeCtrl& src, int srcid);
+
+class OptionTree : public TreeCtrl {
+	Vector<Option *> option;
+	Array<Option>    aux;
+
+	void SetOption(int i);
+	void SetChildren(int id, bool b);
+
+public:
+	Callback WhenOption;
+
+	void SetRoot(const Image& img, Option& option, const char *text = NULL);
+	void SetRoot(Option& option, const char *text = NULL);
+	void SetRoot(const Image& img, const char *text);
+	void SetRoot(const char *text);
+	int  Insert(int parent, int i, const Image& img, Option& option, const char *text = NULL);
+	int  Insert(int parent, int i, Option& option, const char *text = NULL);
+	int  Insert(int parent, int i, const Image& img, const char *text);
+	int  Insert(int parent, int i, const char *text);
+	int  Add(int parent, const Image& img, Option& option, const char *text = NULL);
+	int  Add(int parent, Option& option, const char *text = NULL);
+	int  Add(int parent, const Image& img, const char *text);
+	int  Add(int parent, const char *text);
+
+	int  Get(int id) const                          { return option[id]->Get(); }
+
+	void Clear();
+
+	typedef OptionTree CLASSNAME;
+
+	OptionTree();
+	~OptionTree();
+};
+
+class PopUpTree : public TreeCtrl {
+public:
+	typedef PopUpTree CLASSNAME;
+	PopUpTree();
+	virtual ~PopUpTree();
+
+	void         PopUp(Ctrl *owner, int x, int top, int bottom, int width);
+	void         PopUp(Ctrl *owner, int width);
+	void         PopUp(Ctrl *owner);
+
+	Callback     WhenCancel;
+	Callback     WhenSelect;
+
+	PopUpTree&   MaxHeight(int maxheight_)          { maxheight = maxheight_; return *this; }
+	int          GetMaxHeight() const               { return maxheight; }
+
+public:
+	virtual void Deactivate();
+	virtual void LeftUp(Point p, dword keyflags);
+	virtual bool Key(dword key, int);
+	virtual void CancelMode();
+
+protected:
+	void         DoClose();
+	void         OpenClose(int i);
+
+protected:
+	int          maxheight;
+	Point        showpos;
+	int          showwidth;
+	bool         up;
+	bool         open;
+};
diff --git a/uppsrc/CtrlLib/Update.cpp b/uppsrc/CtrlLib/Update.cpp
new file mode 100644
index 000000000..4e834e74b
--- /dev/null
+++ b/uppsrc/CtrlLib/Update.cpp
@@ -0,0 +1,166 @@
+#include "CtrlLib.h"
+
+
+NAMESPACE_UPP
+
+#ifdef PLATFORM_WIN32
+#ifndef PLATFORM_WINCE
+
+Time FileTimeToTime(const FILETIME& time) {
+	SYSTEMTIME t;
+	FileTimeToSystemTime(&time, &t);
+	return Time(t.wYear, t.wMonth, t.wDay, t.wHour, t.wMinute, t.wSecond);
+}
+
+bool NoUpdate(const char *dsf, const char *srf, int& len) {
+	FindFile dst(dsf);
+	FindFile src(srf);
+	if(!src) return true;
+	len = (int)src.GetLength();
+	if(!dst) return false;
+	return abs(FileTimeToTime(dst.GetLastWriteTime()) - FileTimeToTime(src.GetLastWriteTime()))
+		    < 100 && len == dst.GetLength();
+}
+
+void UpdateFile(String dst, String src)
+{
+	if(src.IsEmpty()) return;
+	String filename = GetFileName(dst);
+	int len;
+	if(NoUpdate(dst, src, len)) return;
+	String tmp = dst + ".tmp";
+	Progress pi;
+	pi.Title((t_("Updating ") + filename).ToWString());
+	pi.SetText(t_("Updating ") + filename);
+//	pi.Open();
+	FileIn in(src);
+	if(!in)
+	{
+		Exclamation(NFormat(t_("Error opening file [* \1%s\1]."), src));
+		return;
+	}
+	FileDelete(tmp);
+	FileOut out(tmp);
+	dword n = 0;
+	char buffer[2048];
+	if(!out)
+	{
+		Exclamation(NFormat(t_("Error creating file [* \1%s\1]."), tmp));
+		return;
+	}
+	for(;;)
+	{
+		dword i = in.Get(buffer, 2048);
+		if(i == 0) break;
+		out.Put(buffer, i);
+		n += i;
+		pi.Set(n, len);
+		if(pi.Canceled() && PromptYesNo(t_("Aborting update is likely to cause trouble when running the application for the next time.\nContinue?")))
+		{
+			out.Close();
+			FileDelete(tmp);
+			return;
+		}
+	}
+	out.SetTime(in.GetTime());
+	out.Close();
+	if(out.IsError())
+	{
+		Exclamation(NFormat(t_("Error writing file [* \1%s\1]."), tmp));
+		FileDelete(tmp);
+		return;
+	}
+	String old = dst + ".old";
+	pi.SetText(NFormat(t_("Overwriting %s"), dst));
+	pi.SetTotal(10000);
+	int start = msecs();
+	for(;;)
+	{
+		SetFileAttributes(dst, 0);
+		FileDelete(old);
+		FileMove(dst, old);
+		if(FileMove(tmp, dst))
+			return;
+		if(pi.SetPosCanceled(msecs(start) % 10000) && PromptYesNo(t_("Aborting update is likely to cause trouble when running the application for the next time.\nContinue?")))
+			return;
+		Sleep(500);
+	}
+}
+
+void UpdateFile(const char *filename)
+{
+	String dst = GetExeDirFile(filename);
+	String src = GetIniKey("UPDATE");
+	if(IsNull(src))
+		return;
+	UpdateFile(dst, AppendFileName(src, filename));
+}
+
+static String FixArg(String s)
+{
+	if(s.Find(' ') < 0 && s.Find('\"') < 0)
+		return s;
+	String ucmd;
+	ucmd << '\"';
+	for(const char *p = s; *p; p++)
+		if(*p == '\"')
+			ucmd << "\"\"";
+		else
+			ucmd << *p;
+	ucmd << '\"';
+	return ucmd;
+}
+
+void SelfUpdate() {
+	char dst[512];
+	UpdateFile("UPDATER.EXE");
+	::GetModuleFileName(NULL, dst, 512);
+	String src = GetIniKey("UPDATE");
+	if(src.IsEmpty()) return;
+	src = AppendFileName(src, GetFileNamePos(dst));
+	int dummy;
+	if(NoUpdate(dst, src, dummy)) return;
+	String commandline;
+	const Vector<String>& cmd = CommandLine();
+	for(int i = 0; i < cmd.GetCount(); i++) {
+		commandline += ' ';
+		commandline += FixArg(cmd[i]);
+	}
+	if(WinExec(GetExeDirFile("updater.exe") + " " + GetFileName(dst) + commandline, SW_SHOWNORMAL) <= 31)
+		return;
+	exit(0);
+}
+
+bool SelfUpdateSelf()
+{
+	const Vector<String>& cmdline = CommandLine();
+	String exe = GetExeFilePath();
+
+	if(cmdline.GetCount() >= 2 && cmdline[0] == "-update")
+	{ // updater
+		String exec = FixArg(cmdline[1]);
+		UpdateFile(exec, exe);
+		for(int i = 2; i < cmdline.GetCount(); i++)
+			exec << ' ' << FixArg(cmdline[i]);
+		WinExec(exec, SW_SHOWNORMAL);
+		return true;
+	}
+
+	String src = GetIniKey("UPDATE");
+	if(src.IsEmpty()) return false;
+	src = AppendFileName(src, GetFileNamePos(exe));
+	int dummy;
+	if(NoUpdate(exe, src, dummy)) return false;
+
+	String commandline;
+	commandline << src << " -update " << FixArg(exe);
+	for(int i = 0; i < cmdline.GetCount(); i++)
+		commandline << ' ' << FixArg(cmdline[i]);
+	RLOG("SelfUpdateSelf (running updater): " << commandline);
+	return WinExec(commandline, SW_SHOWNORMAL) >= 32;
+}
+
+#endif
+#endif
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/CtrlLib/Win32.cpp b/uppsrc/CtrlLib/Win32.cpp
new file mode 100644
index 000000000..ecd1bae73
--- /dev/null
+++ b/uppsrc/CtrlLib/Win32.cpp
@@ -0,0 +1,195 @@
+#include "CtrlLib.h"
+
+#ifdef PLATFORM_WIN32
+#ifndef PLATFORM_WINCE
+
+#include <commdlg.h>
+#include <cderr.h>
+
+#endif
+#endif
+
+
+NAMESPACE_UPP
+
+#ifdef PLATFORM_WIN32
+
+#ifndef PLATFORM_WINCE
+
+#define LLOG(x)
+
+FileSelector::FileSelector() {
+	activetype = 0;
+	readonly = rdonly = multi = false;
+	asking = true;
+}
+
+FileSelector& FileSelector::Type(const char *name, const char *ext) {
+	FileType& t = type.Add();
+	t.name = ToSystemCharset(name);
+	t.ext = ToSystemCharset(ext);
+	return *this;
+}
+
+FileSelector& FileSelector::AllFilesType() {
+	return Type(t_("All files"), "*.*");
+}
+
+void FileSelector::Serialize(Stream& s) {
+	int version = 2;
+	s / version;
+	s / activetype % activedir;
+	if(version < 2) {
+		String dummy;
+		s % dummy;
+	}
+}
+
+String FileSelector::Get() const {
+	return filename.GetCount() ? filename[0] : String::GetVoid();
+}
+
+#ifdef _DEBUG
+static String Dump(Ctrl *ctrl)
+{
+	if(!ctrl)
+		return "NULL";
+	StringStream out;
+	ctrl -> Dump(out);
+	return out;
+}
+#endif
+
+Rect MonitorRectForHWND(HWND hwnd);
+
+static UINT_PTR CALLBACK sCenterHook(HWND hdlg, UINT msg, WPARAM wParam, LPARAM lParam)
+{
+	LLOG("msg = " << (int)msg << ", wParam = " << Format("%08x", (int)wParam)
+	    << ", lParam = " << Format("%08x", (int)lParam)
+		<< ", focus = " << Dump(Ctrl::GetFocusCtrl()));
+
+	if(msg == WM_NOTIFY && ((LPNMHDR)lParam) -> code == CDN_INITDONE) {
+		//&& !(GetWindowLong(hdlg, GWL_STYLE) & WS_CHILD)) {
+		while(GetWindowLong(hdlg, GWL_STYLE) & WS_CHILD) {
+			HWND p = GetParent(hdlg);
+			if(!p) break;
+			hdlg = p;
+		}
+		Rect dr, pr;
+		::GetWindowRect(hdlg, dr);
+		Rect wa = Ctrl::GetPrimaryWorkArea();
+		if(HWND owner = ::GetWindow(hdlg, GW_OWNER)) {
+			::GetWindowRect(owner, pr);
+			wa = MonitorRectForHWND(owner);
+		}
+		else
+			pr = wa;
+		pr.Intersect(wa);
+		Point p = pr.CenterPos(dr.Size());
+		::SetWindowPos(hdlg, NULL, p.x, p.y, 0, 0,
+			SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE);
+//		::MoveWindow(hdlg, p.x, p.y, dr.Width(), dr.Height(), false);
+	}
+	return 0;
+}
+
+#ifndef OFN_ENABLESIZING
+#define OFN_ENABLESIZING             0x00800000
+#endif
+
+bool FileSelector::Execute(bool open, const char *dlgtitle) {
+	String filter;
+	for(int i = 0; i < type.GetCount(); i++) {
+		filter.Cat(type[i].name);
+		filter.Cat('\0');
+		filter.Cat(type[i].ext);
+		filter.Cat('\0');
+	}
+	OPENFILENAME ofn;
+	memset(&ofn, 0, sizeof(ofn));
+	ofn.lStructSize = sizeof(OPENFILENAME);
+	Ctrl *q = Ctrl::GetActiveWindow();
+	if(q) ofn.hwndOwner = q->GetHWND();
+	ofn.Flags = OFN_ENABLESIZING|OFN_ENABLEHOOK|OFN_EXPLORER;
+	if(asking) ofn.Flags |= (open ? OFN_FILEMUSTEXIST|OFN_PATHMUSTEXIST : OFN_OVERWRITEPROMPT);
+	if(!rdonly) ofn.Flags |= OFN_HIDEREADONLY;
+	if(multi) ofn.Flags |= OFN_ALLOWMULTISELECT;
+	ofn.lpstrFilter = filter;
+	ofn.nFilterIndex = activetype;
+	ofn.lpstrInitialDir = activedir;
+	ofn.lpfnHook = sCenterHook;
+	int bufsize = ofn.nMaxFile = (multi ? 32000 : _MAX_PATH);
+	Buffer<char> buffer(bufsize);
+	*(ofn.lpstrFile = buffer) = 0;
+	if(!filename.IsEmpty())
+	{
+		String out;
+		for(int i = 0; i < filename.GetCount(); i++)
+		{
+			if(*ofn.lpstrInitialDir == 0 && FindFile().Search(AppendFileName(GetFileDirectory(filename[i]), "*")))
+				ofn.lpstrInitialDir = GetFileDirectory(filename[i]);
+			if(!open || FileExists(filename[i]))
+			{
+				String fn = GetFileName(filename[i]);
+				if(!IsNull(fn))
+				{
+					if(multi && fn.Find(' ') >= 0)
+						out << '\"' << ToSystemCharset(fn) << '\"';
+					else
+						out << ToSystemCharset(fn);
+					out.Cat(0);
+				}
+			}
+		}
+		int l = min(out.GetLength(), bufsize - 1);
+		memcpy(buffer, out, l + 1);
+	}
+
+	String title;
+	if(dlgtitle)
+		title = ToSystemCharset(dlgtitle);
+	else if(open)
+		title = ToSystemCharset(t_("Open.."));
+	else
+		title = ToSystemCharset(t_("Save as"));
+	ofn.lpstrTitle = ~title;
+	if(!defext.IsEmpty())
+		ofn.lpstrDefExt = defext;
+	bool res = !!(open ? GetOpenFileName : GetSaveFileName)(&ofn);
+	if(!res && CommDlgExtendedError() == FNERR_INVALIDFILENAME)
+	{
+		*buffer = 0;
+		res = !!(open ? GetOpenFileName : GetSaveFileName)(&ofn);
+	}
+	if(!res && CommDlgExtendedError() == FNERR_INVALIDFILENAME)
+	{
+		ofn.lpstrInitialDir = "";
+		res = !!(open ? GetOpenFileName : GetSaveFileName)(&ofn);
+	}
+	if(!res)
+		return false;
+	filename.Clear();
+	activetype = ofn.nFilterIndex;
+	if(multi) {
+		const char *s = ofn.lpstrFile;
+		activedir = s;
+		s += strlen(s);
+		if(s[1] == 0)
+			filename.Add() = FromSystemCharset(activedir);
+		else
+			do
+				filename.Add() = FromSystemCharset(AppendFileName(activedir, ++s));
+			while((s += strlen(s))[1]);
+	}
+	else {
+		filename.Add(FromSystemCharset(ofn.lpstrFile));
+		activedir = GetFileDirectory(filename[0]);
+	}
+	readonly = ofn.Flags & OFN_READONLY ? TRUE : FALSE;
+	return true;
+}
+
+#endif
+#endif
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/CtrlLib/Windows.cpp b/uppsrc/CtrlLib/Windows.cpp
new file mode 100644
index 000000000..54c3f9f32
--- /dev/null
+++ b/uppsrc/CtrlLib/Windows.cpp
@@ -0,0 +1,53 @@
+#include <CtrlLib/CtrlLib.h>
+
+NAMESPACE_UPP
+
+void WindowsList()
+{
+	WithSimpleSelectLayout<TopWindow> d;
+	CtrlLayoutOKCancel(d, t_("Activate window"));
+	d.SetRect(0, 0, 400, 300);
+	d.list.AddColumn();
+	d.list.NoHeader().NoGrid();
+	Vector<Ctrl *> w = Ctrl::GetTopWindows();
+	int p = 0;
+	Vector< Ptr<Ctrl> > ww;
+	for(int i = 0; i < w.GetCount() && p < 10; i++) {
+		TopWindow *q = dynamic_cast<TopWindow *>(w[i]);
+		if(q && !q->GetOwner()) {
+			d.list.Add(q->GetTitle());
+			ww.Add(q);
+		}
+	}
+	d.list.GoBegin();
+	if(d.Run() == IDOK && d.list.IsCursor()) {
+		Ctrl *q = ww[d.list.GetCursor()];
+		if(q)
+			q->SetForeground();
+	}
+}
+
+void PutForeground(Ptr<Ctrl> ctrl)
+{
+	if(ctrl)
+		ctrl->SetForeground();
+}
+
+void WindowsMenu(Bar& bar)
+{
+	Vector<Ctrl *> w = Ctrl::GetTopWindows();
+	int p = 1;
+	for(int i = 0; i < w.GetCount() && p < 10; i++) {
+		TopWindow *q = dynamic_cast<TopWindow *>(w[i]);
+		if(q && !q->GetOwner() && p < 10) {
+			bar.Add(Format("&%d ", p++) + FromUnicode(q->GetTitle(), CHARSET_DEFAULT),
+			        callback1(PutForeground, Ptr<Ctrl>(q)))
+			   .Check(q->IsForeground())
+			   .Help(t_("Activate this window"));
+		}
+	}
+	if(p >= 10)
+		bar.Add(t_("More windows.."), callback(WindowsList));
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/CtrlLib/XPTheme.dli b/uppsrc/CtrlLib/XPTheme.dli
new file mode 100644
index 000000000..ea74aa608
--- /dev/null
+++ b/uppsrc/CtrlLib/XPTheme.dli
@@ -0,0 +1,28 @@
+FN(HANDLE,  OpenThemeData,(HWND, LPCWSTR))
+FN(HRESULT, CloseThemeData,(HANDLE))
+FN(HRESULT, DrawThemeBackground,(HANDLE, HDC, int, int, const RECT *, const RECT *))
+FN(HRESULT, GetThemePartSize,(HANDLE, HDC, int, int, RECT *, int, SIZE *))
+FN(HRESULT, GetThemeColor,(HANDLE,int,int,int,COLORREF*))
+FN(HRESULT, GetThemeInt,(HANDLE, int, int, int, int *))
+FN(HRESULT, GetThemeBool,(HANDLE, int, int, int, BOOL *))
+//FN(HRESULT, GetThemeMargins,(HANDLE, HDC, int, int, int, RECT *prc, MARGINS *pMargins))
+FN(HRESULT, GetThemeBackgroundContentRect,(HANDLE, HDC, int, int, const RECT *, RECT *))
+FN(BOOL, IsThemePartDefined, (HANDLE hTheme, int iPartId, int iStateId))
+
+FN(HRESULT, GetThemeDocumentationProperty, (LPCWSTR, LPCWSTR, LPWSTR, int))
+FN(HRESULT, GetCurrentThemeName, (LPWSTR, int, LPWSTR, int, LPWSTR, int))
+
+WIDGET(BUTTON)
+WIDGET(SPIN)
+WIDGET(COMBOBOX)
+WIDGET(SCROLLBAR)
+WIDGET(WINDOW)
+WIDGET(EDIT)
+WIDGET(LISTVIEW)
+WIDGET(STATUS)
+WIDGET(HEADER)
+WIDGET(PROGRESS)
+WIDGET(TAB)
+WIDGET(TOOLBAR)
+WIDGET(MENU)
+WIDGET(REBAR)
diff --git a/uppsrc/CtrlLib/akt_.h b/uppsrc/CtrlLib/akt_.h
new file mode 100644
index 000000000..0777b4c9c
--- /dev/null
+++ b/uppsrc/CtrlLib/akt_.h
@@ -0,0 +1,10 @@
+#ifdef t_
+#undef t_
+#endif
+
+#ifdef tt_
+#undef tt_
+#endif
+
+#define t_(x)          "\3" x
+#define tt_(x)         x
diff --git a/uppsrc/CtrlLib/appdoc.tpp/DlgSelectColor$cs-cz.tpp b/uppsrc/CtrlLib/appdoc.tpp/DlgSelectColor$cs-cz.tpp
new file mode 100644
index 000000000..de6575ee3
--- /dev/null
+++ b/uppsrc/CtrlLib/appdoc.tpp/DlgSelectColor$cs-cz.tpp
@@ -0,0 +1,631 @@
+TITLE("Výběr barvy")
+COMPRESSED
+120,156,172,188,231,111,99,89,150,39,248,175,8,216,217,70,247,160,167,58,179,186,178,45,22,24,204,12,176,11,12,118,182,177,189,211,31,166,208,168,85,86,198,76,70,101,100,70,34,51,34,49,153,139,5,232,73,137,70,20,173,68,138,78,18,141,232,73,209,136,222,91,209,123,111,68,138,86,36,37,209,251,125,140,136,204,170,234,233,158,233,15,27,128,116,223,187,239,220,227,126,231,158,115,159,240,78,252,114,239,95,252,139,143,254,248,163,255,233,163,255,193,191,191,250,119,47,254,243,254,219,87,111,254,254,151,159,126,252,209,71,127,189,255,201,71,127,253,239,255,37,176,246,99,96,237,207,255,244,163,95,252,217,71,63,255,228,23,31,127,242,139,191,252,197,199,31,125,252,139,159,255,249,95,254,28,32,251,139,63,255,232,227,79,62,254,228,175,254,102,255,155,253,255,242,205,254,215,159,255,253,47,255,159,95,253,191,255,243,191,253,219,127,245,111,255,211,222,47,191,253,232,175,247,254,221,203,253,87,175,255,203,222,183,175,94,191,117,153,29,146,189,47,126,245,157,
+195,244,169,147,254,205,219,189,79,247,191,249,238,251,159,237,253,27,96,120,187,247,155,23,123,159,189,122,177,247,245,235,55,174,211,23,159,126,191,247,229,107,151,249,171,215,123,63,236,127,182,255,102,239,187,95,125,229,164,127,241,250,213,203,47,246,119,171,94,124,247,149,195,244,235,207,247,190,254,230,245,183,111,94,127,243,2,184,252,234,197,167,175,247,190,251,254,211,111,0,234,31,246,190,222,127,245,226,205,247,123,78,236,62,240,28,224,249,78,244,119,251,239,87,189,99,240,179,189,255,232,50,191,252,110,255,205,139,87,223,126,225,184,250,113,5,160,197,7,193,95,237,59,177,14,201,27,128,221,254,222,219,47,94,57,56,59,61,190,218,223,251,236,229,183,95,252,236,15,254,254,151,223,126,252,215,123,127,251,245,235,87,47,156,216,175,118,235,95,191,2,214,125,241,253,238,9,96,245,127,120,241,249,171,23,159,57,233,187,21,251,95,188,121,9,40,44,217,251,193,193,121,71,244,118,239,15,127,52,226,71,19,118,227,222,119,175,95,125,250,193,43,127,180,247,237,
+139,189,239,94,236,125,251,245,235,207,118,75,1,93,56,223,190,121,9,72,223,121,243,237,222,15,175,1,75,127,120,11,168,251,213,219,47,95,124,243,242,215,95,56,56,123,159,3,180,175,223,236,191,231,176,247,221,63,225,169,95,254,203,189,255,243,127,253,55,127,191,247,135,78,236,139,111,190,123,241,21,176,112,239,255,254,87,128,217,159,125,3,92,2,87,63,188,120,181,155,253,35,192,112,128,246,127,251,219,191,3,104,95,127,246,237,27,135,228,171,221,227,111,191,127,3,240,218,93,253,102,255,219,63,250,217,222,223,253,234,245,167,175,223,238,125,237,58,117,72,190,222,255,108,39,226,55,59,28,1,107,94,236,44,252,230,245,15,223,238,127,254,65,185,29,199,143,246,126,246,179,189,159,127,242,201,223,239,214,254,184,204,73,255,227,61,151,249,197,222,15,128,228,55,47,246,222,0,66,118,70,75,190,125,241,106,231,222,247,171,191,127,231,166,175,1,31,238,127,246,26,128,243,245,123,111,189,253,227,189,47,93,50,96,53,176,112,39,122,199,242,75,192,157,47,190,
+254,22,192,236,179,215,239,103,190,125,245,214,197,121,239,141,23,159,189,124,179,191,195,77,178,115,205,235,87,14,201,95,255,36,1,0,233,187,151,223,190,122,239,53,32,170,191,124,241,230,27,151,108,7,199,254,219,55,175,191,220,127,3,248,250,251,29,199,23,95,191,126,31,33,191,113,72,126,246,1,246,15,195,191,254,215,47,191,220,255,47,47,254,234,47,63,250,131,191,252,232,79,62,254,51,16,148,0,34,128,64,32,104,127,11,252,6,205,100,103,228,227,34,214,193,78,97,96,217,45,180,31,225,32,165,48,95,242,234,160,110,241,33,189,88,62,147,29,224,194,50,252,238,141,105,185,148,223,72,219,74,157,219,187,13,38,106,155,205,133,218,194,130,10,5,171,30,131,196,91,105,104,230,146,15,183,189,152,4,234,190,193,65,60,8,39,92,92,56,172,43,165,88,192,183,212,11,50,249,163,138,183,16,94,101,158,219,248,220,32,122,128,225,197,124,112,174,227,114,4,137,71,161,182,123,227,205,201,140,54,49,37,19,209,231,154,54,112,133,184,35,86,93,46,53,193,
+147,38,240,105,122,203,69,111,163,124,64,9,159,133,89,91,187,67,124,232,177,189,7,167,177,41,5,149,90,131,231,249,56,125,239,255,122,245,126,119,124,177,219,39,223,190,217,255,14,8,81,192,207,64,164,191,5,98,124,23,176,239,99,16,64,251,107,32,170,126,248,236,39,168,0,208,255,230,253,12,16,108,187,153,253,189,47,129,43,32,39,252,240,213,254,151,123,175,63,253,238,251,47,128,52,240,221,175,190,125,249,230,237,254,175,119,8,253,241,222,23,159,125,191,247,235,207,127,189,195,247,135,111,0,20,95,2,168,238,32,5,54,200,187,45,255,19,247,247,105,224,235,215,95,188,253,236,199,5,223,125,255,27,96,239,186,78,95,190,121,31,96,0,144,239,4,190,91,247,147,14,191,254,220,193,249,26,8,150,223,236,3,38,125,13,0,190,219,190,192,227,127,2,216,191,248,203,63,248,139,191,252,147,191,248,135,184,242,207,24,199,217,67,187,85,140,135,47,55,218,71,132,115,51,227,100,157,242,235,230,21,18,229,160,177,100,151,252,67,92,240,152,112,152,113,53,
+179,233,246,241,49,115,99,12,4,218,51,235,53,89,218,100,231,229,85,123,64,237,116,105,184,121,124,205,170,44,220,115,133,168,130,77,201,243,71,21,209,228,173,178,64,38,129,135,102,234,70,52,57,188,42,60,87,74,228,49,67,122,217,193,97,22,88,100,62,86,80,159,33,228,253,199,57,79,184,1,165,21,77,114,39,181,98,138,107,237,176,176,51,125,212,123,165,196,126,114,13,235,86,2,203,100,65,59,154,86,9,79,34,207,208,2,17,178,2,1,206,54,68,92,10,193,194,209,239,66,250,118,151,2,93,168,119,217,229,221,36,176,221,127,74,88,63,102,130,31,246,94,127,1,36,183,223,188,220,109,207,253,175,119,169,249,215,59,122,32,145,124,245,18,72,53,111,1,160,223,225,240,221,175,62,36,159,183,123,111,126,148,177,191,7,36,179,111,191,248,106,7,208,171,23,223,1,28,222,252,86,252,151,223,3,8,3,201,231,139,183,223,252,0,100,198,31,0,226,215,111,119,169,28,144,244,249,235,189,207,190,1,96,220,133,216,155,215,159,191,6,178,196,239,48,221,
+237,202,55,14,206,231,239,248,126,181,255,217,222,171,151,159,238,242,208,78,197,47,119,102,236,176,221,255,245,235,119,217,248,235,87,175,127,253,249,247,63,169,251,199,255,48,122,247,119,161,242,83,116,3,134,189,207,16,31,18,244,222,215,47,255,235,139,87,111,119,243,64,86,0,24,127,241,250,43,128,177,227,234,203,247,146,156,244,15,69,226,79,246,126,249,39,123,255,233,67,230,223,223,251,251,191,217,21,154,253,15,241,244,219,249,223,241,249,239,148,129,189,15,181,242,197,151,123,63,252,234,67,137,2,20,250,234,179,253,111,62,123,159,189,222,5,252,127,183,206,253,205,206,41,251,159,3,186,1,217,79,242,229,222,183,187,156,251,242,71,47,126,249,222,255,159,255,158,31,223,35,240,83,78,253,242,197,15,47,1,103,236,178,252,15,251,95,58,233,46,20,144,124,129,189,242,98,231,143,87,47,191,251,157,242,247,161,142,126,216,54,255,203,79,27,230,227,63,251,248,231,127,240,243,159,127,252,115,16,20,2,190,3,3,91,134,185,249,176,101,122,140,131,81,34,181,
+165,9,100,61,16,24,198,73,90,3,242,155,135,10,40,5,61,128,201,43,147,149,92,83,178,185,151,56,16,216,32,174,162,15,66,133,133,114,172,12,94,18,253,163,230,37,99,100,111,110,77,76,159,249,140,217,191,246,181,37,166,53,175,124,204,51,156,162,218,248,90,32,80,123,200,21,53,25,131,212,133,71,149,77,220,195,60,133,75,246,39,185,91,242,229,243,150,53,72,44,162,197,152,207,34,221,224,195,233,88,210,103,50,85,160,16,238,154,172,25,206,140,136,222,26,39,191,160,154,169,9,30,233,9,75,191,239,68,193,7,11,12,79,164,57,135,160,253,106,29,199,136,62,245,118,107,39,225,174,55,34,157,63,31,5,104,72,147,11,209,7,95,168,14,161,243,128,178,173,227,99,250,7,171,132,165,72,72,64,52,173,3,229,12,98,84,31,79,36,147,148,170,111,63,66,178,219,135,219,22,215,244,252,72,100,8,226,166,169,201,103,56,121,74,132,207,154,75,217,29,171,123,176,213,53,195,73,52,12,198,34,166,46,76,119,199,29,132,228,34,46,135,228,108,79,102,
+82,162,230,168,80,132,168,54,198,19,198,159,51,80,210,179,6,70,218,227,32,251,55,181,227,200,138,165,59,20,193,154,121,57,164,138,92,233,207,143,54,160,230,37,207,117,50,81,129,13,242,219,45,124,35,39,145,2,48,55,8,79,41,140,73,23,1,126,66,17,95,54,57,194,155,246,227,197,240,10,146,180,170,18,201,218,121,174,59,168,68,152,82,213,177,126,27,177,30,108,109,221,171,160,224,130,35,54,10,201,80,97,94,32,63,46,28,171,113,168,92,62,163,66,143,234,33,103,149,73,194,168,177,172,182,187,115,12,233,156,45,90,72,227,49,41,50,132,248,9,19,114,5,41,113,72,224,201,68,35,129,141,194,146,101,231,161,204,114,26,189,63,186,19,12,80,162,103,182,125,18,34,117,55,133,252,193,148,53,209,144,212,83,194,67,243,226,232,134,123,155,187,92,10,224,121,249,169,228,185,85,211,10,56,138,178,22,114,41,139,244,147,27,250,163,109,123,0,87,66,78,13,86,27,230,17,52,39,144,249,206,120,9,12,170,42,35,157,11,146,246,238,52,30,91,141,
+32,156,38,150,183,196,192,196,14,25,253,198,120,245,120,42,70,80,89,49,158,6,206,213,74,206,25,216,58,134,106,206,87,93,135,226,153,232,112,177,57,18,200,71,71,117,80,242,193,230,118,200,48,143,199,45,234,34,155,206,10,143,138,153,172,187,81,181,9,169,135,25,80,18,116,141,62,131,39,31,207,206,7,3,209,208,220,225,115,184,126,102,218,136,96,225,96,151,171,44,58,5,162,38,44,13,123,222,68,60,192,108,57,105,184,49,99,205,59,132,171,24,164,201,174,72,41,100,249,51,175,48,131,217,177,142,213,69,202,82,179,220,112,150,55,183,217,233,113,144,79,199,217,171,72,237,136,85,145,118,211,37,139,116,169,45,78,221,33,122,159,65,223,96,142,68,209,139,226,162,195,1,57,158,177,100,75,91,221,83,173,7,109,33,150,207,21,204,116,99,175,102,217,56,98,229,140,151,166,43,211,157,139,104,107,44,237,226,81,26,41,158,164,183,134,21,203,151,245,172,105,220,224,134,149,145,15,169,151,43,74,107,46,97,139,212,172,232,138,55,85,199,203,113,208,130,
+239,225,245,204,246,35,97,14,158,75,222,248,61,5,73,181,149,127,234,29,240,115,212,164,102,35,21,107,66,34,121,128,39,189,14,8,52,97,241,137,34,44,178,159,220,161,23,65,5,220,237,211,33,212,62,221,194,103,24,19,31,148,57,247,101,1,235,219,206,164,19,56,239,230,25,228,238,112,200,178,44,173,128,157,226,140,169,226,104,124,38,234,178,206,124,71,110,131,150,241,252,112,211,96,100,70,118,197,4,85,13,142,57,118,37,116,18,192,18,58,203,130,114,249,112,180,25,223,147,131,84,169,116,122,55,37,16,51,137,233,185,85,210,197,74,194,118,166,194,152,171,235,73,246,123,113,72,147,120,136,139,169,131,8,181,31,163,90,164,46,85,93,226,86,129,154,178,139,186,184,237,79,51,243,55,186,201,202,77,125,238,142,169,114,148,115,3,246,67,218,172,227,5,132,53,62,49,75,207,195,11,162,25,83,14,104,64,217,132,46,217,83,161,93,172,212,198,13,1,67,41,68,147,39,178,234,66,73,137,88,158,189,148,173,123,60,69,55,164,239,250,137,61,138,132,31,
+232,30,209,80,105,134,82,118,211,90,116,31,65,237,249,38,30,155,116,226,177,181,219,69,206,186,93,247,136,27,194,186,121,6,105,180,117,233,254,242,246,134,166,174,221,93,210,24,219,241,138,203,235,140,56,51,228,234,97,220,55,82,205,250,249,51,95,27,102,45,210,125,79,105,192,144,206,185,134,78,185,160,34,203,110,252,27,95,50,60,59,19,85,178,233,208,241,246,185,97,185,15,172,101,49,221,90,85,43,94,52,113,220,165,161,89,87,79,196,190,165,204,56,228,115,113,219,71,251,67,152,229,49,108,38,104,237,230,41,246,188,236,134,213,230,109,21,149,76,215,214,231,126,205,51,207,254,172,119,174,12,202,200,74,105,93,121,243,184,246,163,70,193,75,42,35,234,98,89,37,189,114,119,219,115,201,245,134,76,87,57,43,166,164,129,130,16,207,32,93,176,110,114,243,44,146,223,57,181,196,113,72,85,26,118,158,31,203,68,42,146,97,52,62,139,162,238,40,159,238,49,157,77,230,78,31,162,202,55,211,34,213,5,199,67,167,71,142,23,35,193,65,242,34,49,60,
+131,95,153,233,23,72,133,149,135,46,245,204,75,118,234,108,1,227,246,214,190,238,36,78,113,198,60,129,46,238,52,157,4,159,164,207,228,150,72,207,156,51,135,111,196,254,19,121,185,159,41,8,89,101,108,65,169,101,223,187,67,71,67,18,70,68,156,20,184,198,101,144,53,146,105,139,113,10,201,82,89,220,207,169,218,242,114,44,225,47,203,166,121,71,210,119,248,100,99,214,74,65,225,12,128,192,62,64,185,194,83,195,51,235,233,190,117,214,110,91,158,251,171,130,174,246,116,83,115,5,155,5,135,157,114,144,55,95,240,155,138,12,228,242,14,124,207,11,204,177,211,82,123,54,221,170,39,90,166,198,180,153,9,199,89,71,138,143,193,229,152,2,165,165,4,199,185,228,198,220,131,249,138,57,48,211,106,226,96,65,155,24,36,168,125,227,150,114,125,103,199,233,6,49,41,221,74,129,72,172,198,10,186,191,61,47,67,142,31,224,230,46,219,204,46,187,77,218,173,172,181,229,167,5,13,163,126,54,174,57,171,104,7,174,218,158,202,162,182,97,93,49,25,22,22,105,
+140,96,81,184,229,177,12,131,132,204,190,9,71,165,22,68,78,161,196,87,192,43,152,101,182,102,205,151,23,148,203,248,17,5,235,65,65,68,71,196,187,133,86,38,81,201,216,82,173,68,160,8,201,38,202,64,80,27,240,165,13,225,64,239,84,195,231,18,52,6,29,207,212,190,147,198,214,94,152,165,83,202,13,56,20,8,250,49,220,178,232,159,214,150,173,205,22,188,30,76,89,11,53,203,176,224,246,149,219,231,16,185,226,223,122,210,13,62,49,164,210,55,99,237,35,15,46,94,63,57,56,202,193,68,184,60,149,213,210,97,68,253,131,210,132,158,138,89,125,18,18,188,225,187,88,62,174,203,150,37,115,149,63,10,171,204,67,170,119,113,209,185,173,221,251,26,68,56,239,66,199,195,230,2,53,155,202,145,132,18,56,29,164,206,45,100,230,210,4,173,240,106,73,157,195,25,79,3,203,9,38,72,121,174,192,33,247,55,96,179,172,114,93,217,42,164,154,205,164,26,107,42,202,170,213,132,3,54,142,8,210,99,202,106,100,95,115,203,12,209,118,156,214,81,55,115,
+233,166,136,14,72,68,204,45,221,63,151,67,196,39,151,173,82,91,193,42,183,179,91,212,61,216,161,0,210,233,17,248,232,118,82,5,60,35,80,2,249,71,21,244,107,105,161,176,218,217,215,4,198,65,141,179,222,25,56,132,245,22,159,91,52,76,251,77,71,107,188,141,153,242,82,62,224,23,249,58,229,107,250,180,134,48,235,145,123,56,51,177,176,229,192,160,172,148,213,108,7,184,141,63,84,86,74,228,200,36,47,95,50,182,151,186,182,42,101,29,223,111,181,4,138,67,199,131,158,18,17,194,250,58,75,89,99,170,119,183,165,164,68,135,18,61,45,211,3,115,107,27,58,180,208,20,117,186,142,4,103,137,105,246,193,216,182,182,112,47,28,157,6,186,190,32,48,175,11,184,249,100,84,32,216,194,77,95,62,40,70,11,2,209,246,166,102,186,215,60,119,67,214,135,169,10,106,245,231,65,165,216,165,123,26,15,141,231,247,169,36,210,33,22,29,101,211,76,149,70,44,211,136,175,228,226,137,64,17,16,169,2,33,149,54,28,86,187,250,26,155,187,126,202,191,167,
+93,244,175,49,83,30,253,34,174,196,70,219,146,41,79,197,197,149,182,219,177,140,62,189,130,87,122,176,48,170,252,164,179,58,250,81,171,79,4,71,79,117,148,158,173,91,136,116,42,89,80,45,140,202,143,213,64,254,52,98,60,224,69,67,107,132,228,199,240,174,2,178,13,102,111,219,147,198,232,30,158,142,83,215,196,64,164,9,30,59,97,18,43,66,210,45,166,179,215,249,240,194,223,230,209,83,89,91,92,50,93,44,54,214,208,53,121,187,234,204,114,170,242,73,121,221,81,87,152,206,209,209,9,217,103,161,221,107,34,216,194,105,166,50,84,54,41,53,240,201,74,7,222,70,214,249,49,47,235,162,144,213,18,17,234,40,199,202,12,138,185,200,125,54,209,56,16,105,202,1,159,54,144,233,154,9,22,143,145,155,87,93,249,226,163,1,98,110,215,195,218,118,90,251,78,63,145,219,44,199,121,252,172,9,46,210,121,139,235,158,174,214,182,54,193,25,240,243,249,118,210,183,21,200,181,184,205,28,90,233,25,215,156,225,52,128,198,220,231,109,143,89,144,14,191,48,
+50,10,43,35,136,89,46,175,141,81,22,43,162,108,70,109,27,120,172,161,226,147,221,106,174,100,198,211,81,251,80,228,157,215,158,10,167,136,52,214,116,99,21,0,37,25,239,166,18,121,210,89,222,100,42,163,163,71,240,164,197,112,118,156,157,36,157,230,229,53,79,1,62,103,135,108,113,57,45,15,187,165,210,226,117,101,21,10,127,134,122,32,155,7,155,114,157,186,79,82,37,183,147,44,53,145,75,81,73,122,36,196,120,123,48,42,12,31,152,195,128,79,115,165,143,27,57,14,194,25,185,207,164,54,104,69,86,159,118,130,144,220,24,149,157,245,54,110,170,234,120,90,162,134,221,210,245,211,190,97,209,21,214,123,30,227,1,126,241,138,207,97,228,195,55,196,35,189,60,197,120,22,203,20,178,114,97,112,98,8,43,174,187,49,112,153,145,108,159,28,166,147,58,89,194,162,139,250,122,182,152,5,222,120,136,187,26,113,110,253,201,214,42,197,131,188,226,100,60,19,179,203,224,250,41,35,232,139,211,137,77,53,139,27,90,230,67,115,86,193,172,210,165,33,200,14,
+120,46,241,246,120,30,245,185,174,97,70,247,159,176,42,36,84,176,89,27,204,24,244,67,189,123,218,63,214,181,58,117,18,87,29,62,193,138,224,107,18,215,60,235,34,20,88,163,108,49,214,11,158,6,213,77,177,104,131,106,42,155,85,119,112,39,76,205,214,48,151,128,220,71,31,138,175,209,19,113,124,40,81,232,40,166,147,179,161,201,16,36,26,148,129,232,41,69,113,122,223,120,106,103,96,142,89,154,100,57,10,172,6,197,4,157,162,167,167,207,52,219,102,235,108,30,190,121,230,176,120,148,186,177,26,40,205,11,58,224,212,249,52,134,213,146,81,207,179,3,139,131,171,113,58,228,153,249,90,200,152,37,219,73,46,46,187,212,55,201,39,103,124,238,218,140,164,161,117,132,188,247,170,41,83,60,179,130,28,42,4,119,207,169,93,67,106,61,68,149,180,61,20,33,70,237,225,114,100,104,168,30,140,150,7,238,124,161,46,94,155,123,69,69,247,130,76,92,48,37,108,4,244,166,76,236,160,229,184,155,39,116,9,99,194,227,101,116,133,88,138,111,44,215,150,181,
+230,252,124,124,251,96,179,160,170,166,1,171,5,190,96,176,117,208,33,115,65,155,154,17,125,66,219,21,155,205,22,84,119,224,28,182,185,91,176,32,107,40,241,217,13,191,194,195,25,241,231,80,174,73,205,83,146,185,58,37,157,163,36,85,33,141,76,29,18,105,66,82,157,42,36,147,187,27,249,69,109,146,27,4,21,56,95,185,199,160,246,24,68,246,61,195,81,144,99,131,135,109,125,115,93,30,89,32,93,174,36,19,173,133,113,75,187,110,121,245,28,197,163,44,193,45,100,53,137,107,198,209,230,157,175,121,212,169,225,238,61,12,180,0,103,104,166,245,124,214,229,37,197,153,50,240,147,149,105,80,164,8,21,250,71,26,235,26,10,185,179,245,66,135,113,155,106,88,141,23,27,64,150,118,24,214,88,117,187,126,125,237,167,75,84,16,68,17,141,201,157,94,99,175,226,88,95,1,248,81,4,175,226,103,210,62,107,18,133,18,21,62,59,129,22,21,222,214,76,14,48,19,125,206,44,48,42,224,101,119,114,183,146,220,204,58,243,199,68,66,118,126,168,143,148,158,
+49,99,115,199,195,88,81,206,102,15,77,198,68,15,189,96,242,168,183,23,43,233,163,222,40,241,207,100,215,237,212,253,227,249,82,59,148,153,77,26,221,189,6,78,38,247,208,194,60,37,197,202,52,168,218,144,168,55,102,20,11,250,139,155,241,241,198,158,15,152,37,122,95,88,99,78,107,52,158,153,102,49,237,182,30,82,38,32,106,162,6,154,103,41,222,250,167,60,108,233,44,112,59,205,19,153,67,102,125,227,61,93,31,245,99,104,230,136,151,214,105,39,166,70,225,49,167,107,168,73,195,249,65,211,94,139,135,178,158,66,28,119,92,73,215,112,250,154,176,55,81,184,220,79,249,77,4,214,4,103,227,234,166,244,92,253,112,171,52,157,181,207,245,164,222,230,230,54,49,167,247,141,248,64,46,85,230,137,179,188,81,219,93,37,157,212,158,3,183,33,232,9,58,127,103,46,105,108,56,113,125,124,157,43,170,156,226,147,167,99,12,156,159,129,100,208,78,172,196,215,71,103,215,148,213,96,100,150,61,222,217,56,172,213,234,20,119,132,58,100,200,234,6,177,174,95,
+208,159,142,228,147,235,203,103,129,216,115,210,51,145,239,251,228,106,104,250,8,49,92,231,168,96,151,194,205,40,233,93,79,36,35,242,76,125,237,96,74,219,81,83,211,101,209,242,215,13,223,210,98,124,158,204,1,95,77,132,249,102,26,223,206,114,184,189,107,127,111,74,85,231,239,14,31,162,240,30,171,54,204,187,251,192,64,142,155,159,167,121,175,94,156,55,25,70,14,66,58,220,46,117,128,18,119,101,120,218,192,215,241,131,152,199,127,202,151,110,87,25,21,54,255,8,235,230,39,167,77,247,117,8,230,113,49,142,206,38,82,227,125,146,182,46,168,123,2,133,155,173,119,147,139,61,214,73,166,69,51,141,135,177,168,53,203,16,244,16,192,169,89,211,53,155,71,68,212,211,246,80,186,141,247,150,8,5,79,98,153,221,186,137,130,3,214,25,163,177,14,180,27,9,31,175,206,108,173,113,173,129,38,96,91,169,54,170,172,247,220,125,42,177,184,157,153,132,216,43,62,121,148,57,33,208,21,41,83,225,122,212,96,120,194,52,75,130,134,233,165,247,182,12,107,50,
+171,14,74,36,82,238,185,121,114,17,181,95,87,199,81,50,69,179,38,41,210,68,169,64,1,70,189,111,83,16,224,145,64,54,167,63,32,249,250,105,161,54,221,22,110,44,45,247,131,242,142,62,20,14,140,83,196,211,193,237,232,105,57,179,207,187,53,180,244,40,96,192,108,194,161,241,113,182,215,115,76,78,17,151,204,180,97,189,66,20,89,215,254,162,158,128,203,104,77,157,152,247,10,56,86,25,171,119,1,225,176,111,170,21,54,143,110,93,3,51,180,73,175,165,112,126,241,58,236,159,148,183,103,25,185,34,152,34,171,195,102,94,217,105,188,139,179,22,18,239,69,199,74,12,250,174,115,55,135,4,12,57,143,65,198,98,24,100,124,73,22,216,114,21,97,185,6,64,103,113,215,125,140,122,41,161,139,90,212,194,77,81,119,18,166,224,90,106,208,1,212,3,203,65,140,130,4,30,45,174,139,175,30,100,15,215,160,195,124,223,166,182,197,11,186,103,255,150,139,108,110,195,179,121,208,26,200,156,130,201,199,39,107,178,67,29,145,231,78,27,97,29,247,86,251,108,
+86,165,43,62,8,250,46,180,189,166,84,174,138,241,114,130,97,108,153,91,76,34,182,168,224,202,107,238,54,210,115,246,140,219,160,253,254,1,70,214,63,137,103,102,79,225,77,243,241,12,199,247,138,187,142,120,224,216,114,80,110,149,250,151,134,204,176,179,73,67,213,147,67,172,231,44,207,226,198,138,15,51,0,247,167,102,175,113,29,114,234,155,157,206,117,8,41,135,31,233,164,13,70,135,185,56,43,180,60,140,101,68,173,180,95,110,166,184,118,235,124,73,16,91,161,126,10,35,220,41,20,141,234,121,24,186,92,16,176,8,127,111,4,70,92,167,122,154,36,239,150,230,79,209,111,153,242,75,138,248,129,90,245,100,182,53,222,113,89,98,94,138,136,115,135,207,174,41,9,248,240,240,129,213,156,61,45,54,109,132,131,51,92,136,76,96,117,2,133,109,249,238,38,25,198,228,199,39,152,121,193,81,111,83,110,162,162,16,108,160,195,19,74,107,71,102,44,193,244,133,22,40,103,212,226,40,167,179,123,237,105,132,204,117,173,252,98,75,135,155,4,187,251,74,151,236,
+80,179,49,240,93,79,60,9,103,53,77,162,133,122,201,179,68,127,52,192,5,250,189,67,105,235,80,210,62,155,68,75,174,174,205,169,180,72,5,49,105,212,85,196,79,169,35,87,99,130,213,250,58,40,175,2,193,53,109,130,83,75,47,97,247,62,134,221,205,145,68,24,87,202,244,245,242,99,225,34,90,147,184,25,45,38,170,212,97,17,122,135,229,131,41,50,102,157,107,163,27,156,162,54,232,94,200,174,184,146,142,47,15,119,149,30,87,79,229,3,200,189,153,142,189,63,112,43,97,132,184,207,63,140,198,110,33,165,51,117,147,215,159,230,215,158,236,173,38,138,104,142,29,150,229,163,215,67,24,218,151,18,107,5,125,153,202,249,154,77,147,167,228,12,214,181,243,101,14,115,133,182,163,31,142,93,14,30,42,118,221,104,157,170,238,91,220,113,203,156,242,219,185,213,150,249,130,131,141,201,47,237,222,227,232,211,208,225,12,14,142,150,10,57,46,240,152,149,231,156,242,209,41,176,99,236,183,249,80,167,46,77,173,174,207,91,147,48,250,78,67,122,30,166,96,137,
+144,47,99,31,177,202,122,67,254,210,108,14,111,202,138,245,89,39,155,94,223,79,2,119,15,186,117,103,158,38,109,149,210,165,255,97,74,209,232,220,84,157,155,164,47,184,41,89,100,211,128,88,54,50,23,74,189,157,160,207,59,8,150,228,154,181,64,170,241,133,211,218,245,218,208,32,103,106,211,60,155,165,175,135,111,58,222,197,77,167,176,70,213,56,135,53,28,217,195,184,13,39,110,168,103,143,65,125,95,114,104,106,208,70,25,245,64,195,91,246,133,105,188,247,124,57,67,40,196,182,220,26,139,18,145,60,147,179,219,116,10,227,65,186,146,105,101,45,63,49,95,94,202,188,17,42,175,133,182,166,232,135,76,37,73,76,144,55,100,234,94,177,34,41,153,110,9,167,232,163,56,242,209,90,41,141,180,98,115,213,235,186,175,178,158,130,184,11,116,54,155,148,27,206,42,232,187,109,0,33,190,25,156,245,192,41,49,136,85,50,108,163,115,140,232,110,59,117,116,7,13,87,170,116,186,16,76,211,105,103,98,128,109,11,150,147,13,75,159,26,57,184,134,232,201,178,
+230,18,161,156,151,185,64,214,60,42,179,10,184,192,195,25,3,155,215,113,216,64,250,219,54,235,132,208,9,33,148,94,30,26,228,81,46,35,67,188,213,123,168,35,108,234,170,111,63,196,8,228,102,79,95,93,86,27,68,122,241,5,180,231,244,48,195,229,214,38,233,154,182,183,130,132,230,196,148,110,58,40,165,76,97,92,203,242,55,184,123,164,254,238,200,63,114,179,30,10,137,252,226,116,250,216,20,35,13,151,119,93,3,143,161,242,224,146,249,39,69,164,30,29,165,103,125,44,169,128,33,165,214,169,46,120,105,157,95,149,21,157,103,247,73,64,100,104,110,76,235,167,235,164,248,62,104,160,106,99,247,46,237,189,167,124,59,41,37,206,200,252,240,137,154,27,198,170,31,206,234,190,12,229,62,115,19,179,60,107,148,237,251,89,26,29,143,26,174,35,50,56,41,135,202,64,58,168,22,91,15,39,161,156,16,97,94,236,56,42,240,54,146,48,132,84,201,176,197,16,106,185,1,62,124,60,235,128,32,109,48,5,9,209,221,104,55,161,222,193,92,114,225,83,230,60,
+189,54,131,190,234,210,89,249,195,3,251,240,193,21,206,123,234,26,15,174,148,159,132,251,121,25,234,76,227,53,105,56,240,108,175,122,218,171,94,185,83,42,211,125,224,217,226,134,35,38,134,33,90,218,112,247,244,122,93,183,195,87,21,26,217,121,186,81,108,106,131,1,131,230,226,137,61,207,217,134,9,72,185,225,131,35,14,224,136,181,96,85,19,152,16,213,243,37,102,122,79,115,196,60,180,104,99,112,23,223,112,160,36,57,51,114,216,79,209,115,253,149,122,221,15,82,69,23,230,130,97,110,40,240,218,77,77,72,31,212,142,39,58,201,117,152,57,96,60,141,41,109,170,74,19,94,79,134,245,193,131,54,96,188,49,119,242,85,88,148,202,162,109,122,2,232,116,109,186,124,176,92,212,34,203,238,157,207,30,143,61,64,197,168,5,5,214,6,143,137,155,206,77,145,237,134,113,146,218,44,76,122,214,103,48,140,87,8,118,4,155,19,243,37,87,13,49,113,200,178,20,135,67,94,205,30,34,123,61,117,180,99,90,164,29,163,98,219,169,127,122,129,210,142,79,170,
+87,227,227,43,45,21,193,83,21,200,43,149,238,188,29,155,77,110,245,213,188,244,34,56,174,109,98,102,201,220,135,157,247,61,134,43,120,98,19,104,204,205,156,90,127,194,42,185,165,203,100,38,104,161,208,181,115,109,77,187,189,212,244,227,205,40,125,235,166,171,239,167,53,205,54,180,169,55,194,158,135,205,176,38,15,110,237,124,199,249,113,215,124,148,159,242,7,170,197,84,113,197,98,172,69,3,209,236,10,170,28,178,239,146,158,165,107,216,221,154,219,125,89,227,104,181,218,250,50,211,59,207,173,233,122,180,50,220,186,13,38,139,170,3,229,70,251,44,247,209,188,238,243,26,195,84,236,236,222,94,189,101,57,177,235,122,223,233,150,53,97,235,27,162,137,97,225,165,22,218,33,121,38,27,207,228,236,3,77,18,180,192,8,58,108,124,223,102,43,117,33,46,112,50,79,154,205,14,208,106,52,45,113,115,62,190,180,92,9,112,112,127,223,99,146,45,76,253,184,65,31,238,15,106,23,23,102,243,224,248,190,134,96,21,207,87,198,217,237,212,38,169,89,124,150,211,
+233,136,39,52,61,6,37,117,175,107,122,147,62,49,49,73,215,144,129,111,37,42,245,104,177,7,204,57,149,246,220,199,93,173,30,147,171,203,219,38,252,41,211,175,193,17,15,157,204,217,99,201,170,100,103,215,107,40,183,196,194,168,79,99,211,167,182,229,0,241,52,44,137,146,90,65,247,210,30,104,161,157,135,101,81,156,8,57,144,201,5,80,240,221,250,68,62,215,210,175,226,85,82,60,104,14,245,51,113,248,196,16,173,48,169,224,112,61,235,243,151,24,139,75,94,43,86,234,179,25,105,223,197,248,68,184,62,183,66,238,193,165,99,206,193,170,255,92,163,235,228,193,166,67,75,84,180,150,217,136,86,199,190,155,234,189,189,115,37,94,85,182,26,56,83,91,75,202,4,45,111,67,32,33,50,19,187,156,63,6,121,198,121,230,24,139,173,139,210,236,19,152,57,165,25,169,204,197,50,50,9,97,205,210,197,115,177,120,176,118,45,240,227,158,190,48,4,27,41,15,70,143,248,17,139,182,26,172,104,53,180,12,102,178,158,220,120,144,173,115,24,36,82,8,94,110,
+198,149,208,10,4,93,183,147,24,114,73,7,39,207,153,162,89,220,61,12,182,98,71,32,40,76,37,81,66,37,125,107,188,100,211,68,195,96,184,181,2,243,138,65,32,57,8,100,5,65,64,32,52,8,36,174,191,191,133,48,35,246,180,44,46,32,144,80,28,151,225,16,158,129,225,149,21,72,220,136,52,43,4,101,72,245,78,236,141,44,166,118,92,202,67,192,105,96,170,75,208,61,20,156,115,178,41,151,170,236,249,213,224,64,107,133,243,24,161,135,164,43,22,175,24,193,228,62,9,108,22,64,208,245,94,134,251,108,141,191,155,144,197,214,92,230,74,109,101,212,76,146,217,177,144,9,226,233,181,232,199,242,21,146,35,103,171,8,145,230,196,127,220,23,141,65,20,88,203,13,33,0,167,30,209,249,40,146,99,55,36,80,73,251,212,133,142,60,193,106,198,77,81,37,119,138,139,104,150,108,145,72,119,102,54,33,26,6,228,49,34,35,43,72,122,14,73,7,80,43,86,94,34,100,103,146,205,165,117,73,90,82,211,235,22,229,152,242,88,230,195,155,163,113,146,85,
+93,248,77,222,103,172,247,182,139,32,150,79,42,158,249,161,216,94,133,173,5,122,135,69,130,175,203,208,243,109,49,133,48,198,205,46,179,176,112,110,38,146,99,248,27,56,36,31,101,167,61,55,241,205,136,175,53,214,214,106,171,136,201,121,28,128,167,136,62,140,111,119,131,45,28,37,145,172,103,179,224,5,137,47,79,64,216,7,199,6,74,12,151,175,136,48,231,196,202,2,46,42,222,24,96,79,219,165,17,148,15,209,30,249,35,97,154,187,236,137,248,99,171,178,146,89,113,71,89,201,99,162,105,83,244,172,113,83,22,65,57,119,178,218,168,128,53,96,65,62,77,16,233,21,13,205,158,209,77,89,182,241,108,93,226,206,142,15,148,179,66,21,44,10,187,242,214,251,94,239,120,112,92,86,232,239,14,35,21,25,8,126,96,36,66,110,193,232,25,74,219,98,187,40,103,232,39,99,72,212,7,203,68,119,178,213,52,123,250,172,185,143,87,107,162,135,134,72,29,112,131,231,43,175,179,96,187,84,128,242,215,5,214,166,202,64,206,99,108,246,61,190,114,188,240,199,
+229,43,220,134,95,105,15,78,231,57,126,103,165,138,135,111,100,9,104,130,34,224,94,214,170,241,235,49,241,140,70,17,200,29,100,89,204,238,34,70,170,238,39,87,46,221,1,139,81,216,17,44,113,19,53,78,200,160,5,8,109,191,0,147,73,0,214,59,168,25,0,214,59,168,53,0,214,59,168,245,0,214,219,16,14,172,80,131,41,48,82,204,106,68,159,215,186,38,28,92,136,239,96,92,93,31,127,130,134,148,45,131,109,94,39,42,137,79,58,80,248,241,225,244,2,52,3,103,216,32,80,5,12,2,193,65,32,16,5,4,202,128,42,187,91,152,7,194,169,148,193,20,214,8,41,50,8,177,94,249,35,30,188,145,75,91,20,54,249,14,73,174,50,236,157,203,67,139,67,127,25,58,89,183,5,51,233,138,45,183,42,243,32,56,24,98,133,128,229,214,6,62,3,162,68,189,172,138,13,196,150,59,65,98,252,41,140,2,59,61,135,119,136,64,241,202,119,115,118,70,130,219,179,35,81,53,219,118,113,200,165,166,25,30,244,77,184,187,212,39,192,103,199,126,138,152,
+45,43,92,241,51,57,74,2,46,50,186,32,15,136,156,53,102,3,19,226,119,160,27,138,252,176,196,141,143,34,86,225,53,232,224,106,35,22,160,83,243,44,26,214,142,64,244,225,227,36,142,18,225,60,163,31,19,227,155,132,39,32,247,135,242,20,235,241,241,117,173,147,120,0,19,201,40,46,200,200,162,182,110,33,213,234,36,107,171,128,181,23,145,51,184,170,2,246,58,241,153,138,228,129,25,242,162,19,125,176,159,36,128,139,106,147,234,118,232,205,50,25,71,196,17,237,248,64,232,172,96,225,66,11,66,38,232,26,206,15,39,120,238,28,49,191,113,95,218,10,132,64,132,77,17,123,123,206,120,200,223,5,83,14,29,241,227,99,191,149,207,60,66,37,32,119,116,54,58,1,135,160,141,112,80,6,207,70,137,65,232,122,29,1,134,87,192,43,43,0,15,10,130,182,66,32,167,128,26,25,182,114,251,223,245,155,128,225,134,204,36,167,49,118,85,110,205,162,9,82,182,228,170,2,182,179,229,32,154,24,111,177,66,64,54,208,142,201,53,74,76,2,68,28,201,217,
+86,252,142,137,23,3,57,4,68,204,129,10,234,197,195,40,32,184,18,74,182,66,228,214,13,64,4,129,237,244,8,156,3,152,169,41,86,237,161,128,4,1,195,15,243,218,8,138,231,93,117,151,32,50,226,157,198,120,128,116,167,49,20,188,122,167,241,142,31,160,177,77,238,205,176,163,106,63,185,136,175,86,56,7,24,114,91,13,2,37,2,17,220,1,42,65,23,12,84,233,66,207,138,0,35,105,238,39,8,243,57,32,138,181,110,203,16,212,21,209,141,21,115,198,246,150,131,12,177,82,80,72,64,67,144,28,80,34,83,65,195,69,84,64,177,10,62,199,150,147,1,47,89,33,201,3,9,59,156,39,139,73,171,198,99,62,50,189,79,216,176,143,57,16,222,32,196,93,69,142,225,198,88,64,80,63,20,138,43,109,56,59,82,61,66,49,209,152,68,124,203,20,87,200,53,35,191,205,149,180,170,103,162,89,201,109,107,130,79,174,19,29,0,79,188,248,154,34,136,66,156,87,197,25,211,236,182,245,192,70,0,227,154,26,132,171,113,187,150,145,184,85,77,116,207,10,
+20,129,7,236,214,87,21,86,198,57,172,138,130,67,39,50,104,17,4,73,94,69,144,20,88,208,3,169,186,109,13,48,55,71,18,64,1,253,110,184,226,10,66,57,14,159,195,183,234,243,49,139,90,122,148,161,133,125,255,213,45,31,202,194,230,241,58,60,201,172,142,163,225,29,14,116,43,142,16,193,89,246,35,92,28,57,147,131,132,98,188,1,176,20,36,120,103,229,255,120,148,139,241,3,240,106,193,188,20,159,136,41,42,8,252,224,16,10,224,248,140,68,237,156,7,248,238,159,59,206,128,209,42,27,216,236,0,207,29,235,15,35,164,82,3,199,166,0,84,199,72,158,50,145,2,138,85,228,218,102,56,143,245,168,236,77,13,75,70,212,47,79,102,130,170,216,42,43,173,165,41,182,150,45,20,59,132,240,80,100,158,96,26,121,153,52,114,44,140,192,197,120,140,220,74,16,146,108,64,96,53,8,32,40,26,130,0,166,184,192,28,9,121,0,79,128,55,80,123,251,110,90,63,169,128,47,175,16,202,58,188,171,128,55,185,106,10,104,12,127,134,91,216,152,12,69,
+46,147,8,74,173,50,128,158,159,35,192,243,140,20,57,235,121,129,75,134,32,77,87,144,98,151,163,203,220,115,118,248,185,6,238,72,90,134,5,41,205,143,16,234,164,44,133,34,23,22,231,85,187,56,72,145,251,101,45,46,55,76,100,138,35,104,8,126,69,97,99,113,240,74,7,124,11,169,3,105,207,199,100,236,4,31,178,45,231,16,116,230,158,138,28,17,154,7,37,116,130,115,105,5,34,152,199,64,137,35,114,43,196,23,83,193,208,206,60,72,245,120,62,17,75,225,118,59,164,123,31,62,78,212,109,77,186,208,18,59,84,85,108,197,173,66,211,164,176,249,188,86,205,224,190,44,40,193,39,146,72,254,81,18,161,48,30,175,178,21,111,131,4,94,65,237,87,4,168,245,189,249,114,33,96,254,206,35,224,6,225,157,71,18,239,188,68,178,29,190,243,18,20,205,126,79,102,77,190,39,107,128,222,147,225,133,239,201,32,240,247,100,144,8,226,31,247,111,242,61,153,28,242,158,12,33,120,79,70,34,191,39,251,255,93,15,144,27,78,97,143,145,117,208,201,172,
+117,238,184,151,224,65,32,53,81,117,113,78,78,34,58,244,96,146,110,218,229,1,132,194,10,110,155,241,135,11,244,57,205,120,21,90,132,209,9,4,186,136,236,0,49,98,199,252,94,220,253,56,146,162,74,80,147,92,184,155,158,156,24,129,188,61,123,98,206,53,160,165,106,48,190,76,212,192,75,250,117,126,123,131,133,38,33,230,144,51,226,146,75,42,20,139,202,239,172,100,34,84,157,235,232,56,0,108,244,10,141,98,140,141,101,126,244,133,96,129,68,67,20,86,17,59,103,82,35,243,16,125,42,43,18,129,252,226,46,27,93,54,81,70,189,176,59,113,14,146,81,30,153,26,161,11,178,41,193,31,208,153,53,103,5,11,196,50,214,94,148,10,247,159,226,208,29,37,40,187,60,176,137,70,54,20,22,61,202,132,119,254,224,179,81,96,116,70,6,134,155,43,96,25,199,53,132,28,186,159,161,76,37,157,124,1,168,73,1,53,225,120,33,142,9,88,185,66,117,16,20,239,217,63,127,63,254,143,70,92,166,18,132,136,90,135,144,12,91,181,75,237,144,225,110,54,
+3,130,80,254,121,35,225,221,72,69,83,8,149,45,67,116,206,134,58,172,142,39,52,200,10,13,238,106,60,80,226,129,26,191,43,241,182,15,183,92,24,165,226,2,131,220,168,227,182,237,82,139,6,65,216,163,119,231,214,203,15,231,86,246,238,24,91,145,103,145,236,153,75,111,197,216,170,155,76,7,200,214,163,92,186,194,49,194,36,45,59,43,132,11,161,73,243,160,137,14,243,226,107,96,33,11,237,98,110,161,215,190,19,201,108,120,107,98,159,9,87,202,138,80,102,131,245,166,0,240,17,11,217,156,99,15,204,231,132,131,221,221,161,57,15,141,196,4,132,99,74,193,105,139,151,32,104,144,171,246,148,132,56,110,47,210,168,97,207,120,4,22,131,250,104,21,52,76,105,29,76,224,179,40,113,36,138,149,114,86,253,57,87,103,197,64,212,53,17,220,61,13,50,226,71,9,24,124,45,1,14,70,5,72,169,125,37,1,81,4,167,44,9,91,94,224,141,251,55,129,135,96,36,62,130,13,147,78,118,198,74,99,68,202,183,61,186,51,196,10,112,78,173,239,24,240,
+26,83,70,205,115,168,151,222,159,72,18,78,249,17,170,129,175,77,238,33,169,71,252,2,76,1,153,115,21,229,36,173,219,92,178,69,80,98,214,30,132,13,197,200,74,127,219,99,34,224,62,110,72,186,99,113,127,13,119,35,98,77,119,1,209,129,208,120,252,147,91,153,191,7,126,68,107,99,209,236,53,90,110,13,246,102,29,176,171,216,164,240,205,126,15,145,52,138,131,245,209,39,52,76,200,130,226,80,32,158,57,95,41,61,167,117,87,54,226,8,44,178,221,200,240,230,115,232,157,230,145,10,128,73,27,44,250,224,228,232,128,61,71,27,143,220,36,56,36,14,28,19,173,243,21,84,99,93,249,46,159,243,104,171,58,252,20,67,162,53,170,67,25,69,69,147,145,15,96,110,32,110,69,140,89,29,44,179,148,161,94,244,76,2,138,52,81,97,133,181,219,6,13,64,52,184,10,126,216,4,205,68,46,17,60,166,204,136,173,145,133,5,201,209,236,222,83,80,60,32,30,192,31,226,1,172,168,244,46,50,32,140,178,1,156,46,240,14,136,86,82,206,198,226,243,238,
+131,126,254,52,123,106,39,107,183,252,134,50,83,41,183,60,203,13,50,24,11,175,178,42,224,213,148,56,13,250,32,7,131,32,255,232,28,30,91,111,206,253,79,106,159,36,210,218,208,66,237,82,26,125,50,101,93,132,73,163,109,105,68,83,220,89,51,79,7,90,24,239,118,152,30,61,155,243,17,255,180,171,171,151,154,245,180,38,22,94,198,219,30,38,36,37,161,156,76,243,96,194,163,163,165,223,6,83,252,129,8,158,88,55,91,24,168,132,77,63,133,5,9,240,130,161,215,186,53,65,216,117,89,187,190,38,106,64,79,71,250,13,58,58,235,199,248,18,184,56,26,63,87,208,33,234,160,24,147,186,72,99,109,11,156,97,56,189,52,247,80,203,170,186,210,8,7,131,139,184,198,230,45,167,67,135,84,226,234,209,80,182,111,208,45,122,52,58,189,24,92,164,80,89,233,164,228,29,153,115,86,131,196,136,231,192,252,174,89,178,161,159,233,3,205,46,2,175,107,97,83,155,66,193,248,112,47,226,225,33,225,178,136,31,122,199,97,86,190,67,23,166,140,139,235,182,
+182,82,49,8,150,224,184,175,10,30,230,102,25,113,101,44,243,98,193,70,152,99,133,120,76,144,207,33,243,165,132,222,191,53,43,239,195,249,170,88,61,35,120,75,245,142,55,61,156,19,242,214,50,20,119,101,38,50,24,242,46,87,14,236,133,227,237,22,77,129,104,65,184,82,26,30,57,244,85,232,190,30,88,99,213,24,101,62,146,5,42,154,56,115,108,49,252,172,59,244,82,141,103,148,105,100,202,174,149,48,184,180,255,48,41,213,193,11,66,172,205,110,133,148,122,92,91,18,170,189,212,101,60,158,2,124,145,67,31,139,107,167,197,170,237,182,172,5,246,241,212,124,146,180,16,175,134,92,173,117,157,45,235,120,129,243,59,77,245,86,69,241,182,192,51,59,214,38,212,89,164,41,173,34,54,233,128,173,155,235,100,87,154,126,94,173,137,106,107,247,104,89,183,117,43,12,153,14,62,10,122,90,39,145,37,191,113,65,205,225,80,144,171,115,223,70,154,122,226,5,233,150,167,25,163,253,248,60,165,89,116,179,186,73,138,11,112,25,50,5,156,217,247,8,61,178,
+227,162,128,5,55,151,68,2,15,21,61,198,218,185,9,199,9,248,88,90,147,19,59,254,43,62,2,125,82,189,218,42,146,198,75,223,166,160,130,75,86,21,238,32,14,248,39,58,39,228,172,197,41,78,131,54,153,71,104,21,229,30,101,51,31,245,111,186,75,145,36,28,132,224,45,50,32,246,178,144,176,214,114,113,145,152,84,75,163,248,134,201,24,78,111,149,160,62,202,39,205,118,245,184,173,236,84,164,155,235,112,98,252,115,105,148,59,193,160,103,34,106,22,67,152,245,81,193,38,16,64,155,181,210,74,60,177,219,39,136,56,132,61,61,80,97,232,118,32,218,245,115,215,19,10,125,197,22,111,193,49,68,78,30,56,68,223,94,22,143,15,142,14,180,146,171,201,46,114,253,217,104,215,86,222,202,240,7,78,8,40,66,169,128,33,160,247,27,200,186,203,175,207,153,202,117,23,94,240,225,31,149,50,56,239,29,125,135,67,132,111,138,161,177,220,240,240,104,57,199,123,49,165,171,250,53,187,149,86,11,185,101,60,45,84,166,199,125,34,56,66,140,122,202,29,153,
+118,59,170,77,76,31,82,224,199,79,228,113,71,3,234,123,72,134,28,240,124,185,165,146,84,74,179,231,178,131,214,85,54,78,14,195,24,203,2,249,229,249,137,138,126,52,49,55,27,59,13,236,63,148,209,33,227,82,3,92,150,60,101,154,19,8,127,126,189,57,27,160,195,115,56,169,178,9,192,76,56,94,56,175,184,203,213,163,189,213,248,92,11,55,210,76,129,135,81,7,205,96,48,165,241,185,138,99,12,145,143,248,43,248,243,208,146,132,88,135,83,31,100,210,247,28,182,143,213,195,187,36,58,65,145,231,225,58,15,164,191,69,103,241,51,175,28,162,2,37,189,85,53,112,194,189,244,177,36,105,136,204,135,174,203,238,99,144,43,125,89,61,75,84,193,90,34,112,178,66,207,16,32,89,222,118,163,95,21,241,226,0,180,230,2,39,230,241,235,219,19,187,177,72,183,121,75,234,62,108,110,4,221,227,173,50,202,29,162,78,237,206,184,68,106,168,188,210,40,167,247,97,53,27,95,119,245,7,144,136,37,38,132,168,175,107,199,73,39,65,144,183,162,199,54,45,
+251,81,178,2,128,235,54,204,179,44,187,215,20,29,86,146,44,170,156,230,74,147,198,59,38,196,169,58,141,119,34,19,115,244,96,141,154,133,113,46,49,90,149,70,87,252,87,101,74,229,241,104,147,89,135,114,89,7,106,128,178,14,14,160,142,85,190,132,246,213,159,37,7,24,223,243,212,247,0,73,121,158,39,234,147,26,147,42,159,143,207,37,64,206,120,231,105,181,49,38,23,63,46,76,180,115,39,213,150,197,199,102,235,18,251,204,72,27,170,1,112,59,188,48,132,161,222,210,113,105,115,163,174,240,222,112,0,0,137,60,0,192,83,49,234,118,115,248,110,2,105,217,77,232,196,54,252,196,115,105,190,44,104,121,185,96,25,192,92,1,63,3,178,174,6,100,221,21,93,160,230,194,118,69,23,168,185,49,16,232,222,86,143,201,51,160,147,209,205,192,22,229,163,120,103,112,52,80,182,209,191,91,191,49,45,31,214,70,9,140,211,157,58,218,123,8,235,22,109,231,16,10,220,63,96,177,133,112,25,220,104,81,28,65,77,236,45,5,76,65,165,50,236,81,138,96,
+106,57,12,134,161,164,213,54,187,9,207,32,248,185,36,2,214,22,14,170,48,113,4,103,212,178,37,230,12,155,111,135,184,241,238,8,132,126,31,71,135,58,232,12,66,238,181,216,108,249,10,168,213,198,236,232,164,239,232,242,16,221,140,121,156,134,152,243,142,17,242,210,14,188,166,158,231,35,41,150,248,177,115,15,142,150,5,162,145,250,196,223,64,15,84,103,40,76,134,221,203,69,69,231,229,105,103,166,93,84,192,55,40,180,244,22,105,16,166,51,241,194,193,28,175,74,89,253,106,116,142,54,191,85,0,15,211,104,193,200,128,247,131,59,6,19,142,35,130,207,5,90,8,142,226,85,65,18,179,133,206,191,170,155,252,140,50,81,152,68,162,19,109,91,235,145,36,247,61,128,249,119,250,169,74,98,228,243,177,83,132,25,224,144,177,179,69,240,115,145,14,255,152,134,150,215,64,61,132,192,71,216,54,23,169,112,245,39,183,15,85,179,159,136,5,222,162,196,226,97,153,123,19,223,152,104,179,139,14,20,126,152,171,180,15,110,159,249,117,168,24,100,71,59,51,21,
+133,198,251,112,184,174,7,30,170,12,48,5,10,70,95,22,212,220,20,45,26,206,202,22,216,30,172,31,187,204,174,181,114,171,1,206,67,224,253,110,47,132,59,68,231,106,0,159,146,164,82,74,138,44,36,188,220,250,116,84,128,104,22,70,74,224,12,12,188,206,69,202,79,200,198,59,130,22,72,93,62,252,93,127,51,1,27,182,121,130,63,187,59,182,129,224,80,188,48,67,17,244,27,114,208,20,2,88,99,133,131,197,6,0,112,82,5,246,254,143,52,20,32,70,210,144,167,54,2,225,135,121,139,41,74,29,223,0,161,76,114,8,122,178,13,171,42,245,20,226,92,113,154,246,60,88,70,242,244,157,9,173,154,28,222,28,205,14,54,10,138,163,109,39,155,157,98,236,96,139,45,220,47,25,70,111,72,123,72,195,78,25,235,85,190,91,226,206,139,201,26,97,227,82,12,234,89,183,245,142,42,107,104,162,188,162,233,206,152,123,204,43,85,227,222,157,205,121,196,245,81,15,81,205,37,143,225,124,164,64,111,180,33,205,49,242,68,251,92,127,204,165,10,15,198,91,
+203,45,205,157,200,13,27,108,92,68,161,11,28,79,169,247,216,82,103,99,137,214,147,121,84,123,21,93,203,52,68,79,137,71,36,110,253,78,241,201,86,56,135,129,52,182,192,22,121,113,82,2,219,126,191,3,227,223,191,122,249,197,87,111,223,236,62,92,255,250,155,253,127,226,203,245,223,105,57,248,240,209,252,171,31,118,157,32,223,189,126,181,255,102,239,213,235,47,62,124,230,255,213,254,167,14,201,103,95,188,253,237,215,247,14,201,175,119,141,90,95,58,233,95,189,124,179,247,221,11,64,218,174,217,233,61,151,63,222,123,187,251,202,253,229,135,251,183,63,182,131,237,237,255,182,79,226,195,147,31,222,61,120,251,87,255,68,251,200,39,127,246,7,31,127,244,231,159,28,66,15,118,155,26,4,73,252,216,23,212,99,20,159,186,154,21,222,61,174,32,98,169,182,228,188,87,192,61,227,9,154,152,131,230,117,52,182,9,168,204,195,172,114,175,21,104,174,181,218,188,176,62,201,155,70,18,12,50,191,99,130,9,114,210,74,187,218,150,249,173,167,217,131,209,188,49,
+199,157,192,118,216,174,11,137,192,214,64,176,50,19,94,8,205,154,141,92,160,59,117,29,245,148,38,27,234,144,61,78,210,104,190,237,177,59,172,218,60,89,42,162,213,132,97,18,182,228,240,112,235,52,133,181,70,168,53,197,228,229,52,71,239,111,227,154,240,250,190,159,209,132,137,5,40,75,186,192,12,104,149,17,20,229,140,102,12,103,106,91,244,200,84,44,39,177,93,47,142,72,42,192,30,174,203,234,18,93,234,102,22,199,201,243,234,180,209,121,230,119,221,15,66,106,62,222,185,163,105,224,73,146,211,236,44,218,171,129,114,52,62,139,148,242,194,172,134,120,32,201,202,159,240,138,203,160,252,97,32,231,100,105,90,98,89,36,2,35,84,201,161,110,51,203,240,88,53,23,174,186,211,62,27,241,95,220,150,130,44,203,6,4,102,188,51,132,102,195,138,5,199,174,108,44,216,115,28,230,180,15,198,206,73,48,249,32,179,60,175,158,206,242,174,161,179,80,107,101,200,40,90,126,123,0,161,33,144,230,83,14,173,7,131,107,167,6,112,206,191,28,110,197,6,77,
+168,56,177,109,117,14,14,201,178,89,171,109,186,162,158,64,172,220,168,251,151,165,254,150,187,166,176,142,206,47,69,108,150,77,125,138,172,250,0,183,119,98,184,233,162,136,93,162,6,211,193,253,227,72,42,234,241,52,24,245,69,87,85,165,21,130,253,128,43,191,22,156,138,121,245,136,159,214,41,128,205,150,172,82,168,206,134,132,13,50,225,92,173,67,182,13,87,250,19,198,189,154,90,17,54,215,185,89,226,228,97,56,178,18,157,88,21,82,173,188,98,187,41,82,44,30,222,80,43,129,43,81,67,114,129,104,16,226,195,144,237,180,248,220,177,194,18,208,119,214,95,160,91,157,250,59,139,235,112,181,18,19,33,46,205,204,167,13,58,16,52,156,90,192,189,100,102,48,167,123,162,183,102,34,83,213,148,74,44,224,97,210,24,96,118,18,103,232,196,185,134,55,103,192,166,84,74,188,80,142,61,78,253,184,167,147,238,99,17,113,149,77,150,147,25,113,75,167,197,164,31,73,183,138,98,144,219,235,98,25,93,164,201,93,38,233,58,15,247,98,10,47,205,140,198,83,
+193,94,114,137,112,132,132,76,26,136,250,152,94,13,131,118,101,245,146,243,92,142,8,123,248,161,76,108,43,157,45,13,240,235,66,167,35,208,115,152,110,166,42,57,136,183,169,12,202,40,86,41,96,85,48,192,166,51,55,229,29,128,214,119,168,217,176,110,241,117,130,36,189,145,49,3,195,251,224,179,75,152,152,50,196,143,101,242,201,86,208,144,139,218,182,83,243,237,209,165,181,74,27,46,98,53,205,181,65,236,86,157,168,117,8,36,89,20,140,95,145,41,116,156,226,137,134,230,198,251,28,119,50,56,209,45,123,112,142,143,87,134,228,176,207,190,113,33,121,46,211,14,24,188,19,118,163,205,83,173,7,193,225,18,70,25,129,90,52,124,21,68,219,100,161,120,49,237,6,249,99,220,192,213,241,247,238,94,84,7,52,91,40,120,196,162,9,207,19,228,51,26,62,0,126,7,196,123,191,23,212,91,14,133,252,16,138,14,203,17,155,13,219,73,213,41,51,154,180,215,225,52,122,220,158,132,207,243,246,145,154,206,99,204,25,204,55,245,109,17,34,116,149,117,62,62,
+148,238,212,253,50,31,172,171,240,210,71,201,78,213,92,184,44,117,146,55,55,189,7,83,66,168,40,213,33,106,29,118,217,59,141,75,144,207,234,254,236,74,144,172,149,71,195,113,196,199,229,205,93,87,209,26,248,208,26,60,82,247,175,148,233,97,221,78,151,32,38,11,209,85,144,188,41,93,71,151,247,124,233,101,47,42,64,144,172,128,9,167,128,13,59,69,153,132,136,242,81,231,166,196,19,94,101,12,91,92,201,141,15,217,113,58,216,26,75,121,218,148,198,162,213,20,238,148,37,154,168,125,76,102,231,253,54,167,122,236,67,41,187,33,205,147,46,165,108,95,147,148,27,59,145,134,109,68,182,231,200,198,100,180,164,227,249,247,183,204,50,186,115,153,184,190,233,69,47,184,136,168,234,218,138,93,87,75,194,86,175,114,91,66,176,121,12,50,173,37,105,140,32,167,57,59,77,47,161,69,2,160,247,254,114,236,252,229,181,222,58,236,205,93,188,222,158,205,212,79,132,219,216,237,131,226,34,233,236,222,34,253,157,199,115,17,2,33,162,60,13,153,154,98,155,122,
+127,78,229,123,0,228,110,86,207,212,56,13,66,123,212,162,107,72,20,189,203,204,158,30,95,184,53,168,17,130,58,154,13,207,208,242,33,27,174,174,37,141,196,163,18,194,104,9,63,161,2,173,98,210,106,81,143,249,196,200,106,170,211,202,105,145,119,26,224,222,135,153,23,103,189,125,167,1,254,226,118,160,150,164,138,103,148,130,169,205,240,139,96,152,118,225,193,38,75,235,163,215,60,71,34,147,28,223,95,90,26,90,232,37,57,124,24,8,114,225,33,36,212,141,150,7,130,74,2,229,1,101,15,146,212,74,91,253,136,206,230,117,81,16,61,117,78,152,166,8,35,227,154,142,40,210,15,42,161,22,252,2,165,190,144,36,0,45,248,196,94,132,18,139,244,146,32,30,100,23,85,202,7,124,199,172,177,98,145,46,250,205,10,114,50,205,110,126,191,10,252,221,135,94,199,223,246,79,237,186,181,254,243,219,175,190,248,245,111,107,210,187,86,228,175,28,156,111,95,189,248,236,67,89,250,253,98,242,242,227,79,62,250,235,255,3,184,253,229,191,220,251,15,239,186,212,
+94,190,249,208,98,249,87,239,219,83,29,18,23,231,119,26,36,63,180,104,253,84,18,223,119,38,191,235,120,115,210,255,65,31,229,207,254,91,25,127,251,219,182,179,247,28,246,1,57,175,63,253,234,245,174,59,238,157,9,175,127,248,241,209,219,189,143,255,108,215,72,251,197,171,253,15,109,106,239,122,209,246,254,240,93,123,37,32,248,245,167,187,30,208,47,222,254,209,63,34,232,63,126,168,177,59,90,64,196,251,78,231,93,127,233,251,70,242,119,141,210,239,187,226,118,125,129,159,238,138,252,254,174,249,244,237,143,253,220,187,102,185,247,205,199,187,195,193,143,52,239,74,55,192,230,199,62,223,223,247,254,123,253,126,175,121,237,247,29,252,190,188,255,179,245,1,142,27,255,136,14,187,83,194,155,23,63,54,16,254,83,194,254,247,253,87,14,14,32,233,167,222,195,111,94,0,166,125,249,65,242,139,159,0,248,126,239,23,123,255,21,248,121,215,192,188,247,135,191,126,241,234,11,192,116,192,243,239,140,249,199,92,251,183,187,222,250,29,34,255,44,238,127,1,112,255,
+139,247,220,255,240,207,126,241,79,115,253,59,64,240,63,83,97,64,185,255,186,251,245,65,229,159,127,242,223,81,246,239,94,1,236,222,235,250,15,125,254,15,142,107,63,33,255,242,199,255,46,224,195,210,189,93,139,246,139,55,31,196,125,247,171,159,20,250,208,239,239,164,255,213,143,141,138,255,77,195,226,159,254,233,159,255,193,39,127,254,9,4,154,2,21,118,45,190,151,239,143,104,72,224,136,134,125,32,37,105,76,107,51,127,225,194,114,206,98,92,54,138,50,160,222,34,85,43,173,152,68,58,148,68,164,163,238,109,8,205,37,1,111,146,28,34,249,112,177,233,158,214,2,36,95,61,113,189,208,89,157,119,119,56,56,233,130,220,44,246,159,15,120,205,42,6,153,22,67,184,154,173,178,88,204,102,139,148,137,157,211,138,130,77,91,116,94,187,94,78,26,147,249,100,56,225,221,26,87,42,229,124,56,49,151,182,155,205,178,100,60,109,79,142,225,212,21,129,184,181,203,211,143,132,202,115,232,28,154,82,207,5,42,5,247,174,24,224,137,226,174,42,227,170,79,39,
+94,61,203,139,244,27,94,12,172,36,231,161,164,169,136,92,34,63,198,170,233,139,85,100,78,67,92,163,28,231,109,243,160,25,146,247,49,1,61,225,246,89,18,144,146,193,103,167,170,91,206,115,129,207,186,54,38,93,55,40,12,214,129,159,202,103,190,49,127,237,11,106,99,204,103,67,113,185,116,214,169,197,112,124,106,136,149,167,220,169,229,222,111,4,69,44,18,108,102,131,43,63,66,10,66,231,221,9,217,245,196,241,194,78,21,2,27,164,139,191,178,224,229,102,208,141,23,52,35,171,186,122,138,215,123,185,117,92,227,37,133,219,204,29,104,77,160,77,198,220,129,233,224,182,66,56,136,151,93,32,164,251,26,96,98,191,107,197,236,216,25,36,116,131,184,101,186,206,171,147,3,244,185,13,100,95,80,110,29,7,86,55,24,208,4,68,231,173,14,137,73,63,166,85,79,173,60,36,218,105,149,48,41,6,181,214,132,185,104,5,97,15,176,233,14,145,142,176,250,26,81,30,253,32,40,5,53,171,86,255,225,19,130,202,235,129,117,7,65,65,41,118,65,242,142,12,
+125,33,126,181,168,204,72,181,33,58,234,85,99,46,19,133,91,49,99,16,22,183,227,201,242,221,189,166,212,208,232,248,107,186,204,33,230,95,234,163,105,199,253,17,205,126,192,138,182,219,102,14,76,224,83,203,117,252,147,53,114,154,182,174,136,1,222,48,86,170,220,13,12,208,252,9,138,121,135,199,110,172,23,44,59,231,184,179,80,197,239,240,12,19,170,87,116,2,111,238,76,162,245,226,20,244,76,183,123,23,32,155,90,46,239,128,42,179,203,72,43,118,170,63,25,91,25,45,149,13,65,101,35,203,231,91,121,205,140,48,67,79,49,178,8,191,226,172,248,12,72,191,253,206,195,65,34,165,75,14,92,53,166,70,148,170,137,16,234,226,28,211,216,39,71,18,237,131,195,47,86,15,220,250,12,179,92,228,240,232,185,116,192,161,12,203,29,139,154,215,130,63,186,57,110,174,195,13,215,180,197,95,117,61,86,72,88,143,74,64,208,21,219,19,57,53,14,204,150,28,197,229,130,35,57,45,222,216,146,161,28,231,106,2,210,70,6,201,168,105,16,245,196,151,201,2,
+243,66,98,179,122,82,82,69,63,223,46,122,20,126,253,248,180,114,69,14,64,2,247,67,60,247,114,24,68,156,50,68,252,49,83,124,186,85,72,212,158,9,121,40,199,216,252,92,238,218,23,48,96,48,172,179,103,206,9,56,21,237,64,15,198,164,217,217,50,184,193,52,107,204,54,241,38,9,63,184,202,89,25,10,74,135,131,108,167,142,174,244,137,86,112,49,177,184,55,79,80,173,116,61,59,79,13,150,178,233,96,107,8,204,253,23,67,215,98,224,25,170,113,77,77,126,200,42,116,182,74,255,6,150,129,167,11,141,174,120,82,239,166,115,34,42,157,131,57,229,15,249,91,245,217,86,218,53,54,20,143,252,88,249,120,121,193,114,21,214,138,64,231,136,47,86,55,232,168,51,7,239,56,119,164,213,153,224,73,115,9,171,126,52,92,40,18,17,172,51,253,212,176,77,145,129,250,57,14,51,50,6,202,195,118,196,176,70,178,202,221,245,80,100,66,178,152,157,82,250,97,53,167,106,107,174,197,114,168,150,178,57,181,118,111,194,159,106,50,211,84,134,118,184,204,34,
+32,93,220,153,20,123,232,146,116,27,43,149,109,192,204,80,79,111,186,210,60,7,220,34,28,247,253,32,209,89,70,139,49,179,54,78,42,187,212,79,47,85,205,164,81,18,207,33,173,173,86,147,82,185,59,120,62,174,28,175,7,58,198,205,244,169,178,65,15,164,150,242,58,199,108,222,18,176,184,230,52,183,77,183,93,166,156,77,77,206,21,38,84,197,120,254,176,62,215,39,100,105,153,54,81,106,208,252,13,45,229,18,196,40,221,32,78,81,84,6,184,82,89,151,23,88,12,140,79,213,46,152,43,152,213,234,173,225,252,246,152,28,207,132,113,158,240,129,22,93,112,211,160,69,89,231,168,113,52,92,177,93,98,104,94,53,121,122,22,154,41,155,193,166,213,34,44,227,182,88,63,77,52,188,41,114,31,76,54,61,229,58,173,31,195,239,135,113,30,247,78,65,42,207,147,158,227,107,197,122,229,187,47,196,187,77,134,207,120,118,116,122,35,79,214,216,198,2,18,2,158,110,136,82,221,105,242,208,237,172,216,205,15,11,34,255,204,197,174,64,21,78,123,120,118,99,
+44,64,159,40,237,64,8,131,186,55,219,111,210,129,14,194,208,236,178,49,49,179,190,220,126,216,244,2,199,173,53,234,178,191,70,63,139,243,215,54,203,144,147,93,197,250,82,230,90,109,158,133,174,160,86,107,175,128,128,128,35,132,222,149,185,22,239,48,103,9,86,230,233,80,123,52,63,240,56,136,120,13,222,215,162,173,9,39,60,88,189,12,82,92,71,238,202,157,4,40,113,124,137,173,119,159,135,85,225,209,216,28,78,78,51,44,193,121,51,170,71,72,60,122,215,224,170,140,110,37,7,235,209,176,122,75,187,106,165,174,28,57,248,49,183,102,66,152,31,29,49,62,246,18,65,209,9,166,193,83,111,98,202,203,247,91,156,107,199,100,244,176,48,22,98,14,168,94,81,123,228,94,50,61,60,133,220,70,59,185,174,69,67,6,21,120,110,70,228,202,44,161,198,225,165,242,78,150,218,33,150,235,212,201,110,58,195,78,243,228,14,26,98,213,53,1,53,217,15,176,182,65,61,84,48,198,129,144,182,136,90,63,126,177,192,35,197,66,233,8,127,141,207,20,145,162,
+84,20,177,24,5,251,146,117,1,226,60,97,212,39,126,42,222,136,208,30,134,90,156,22,191,158,186,113,251,241,249,41,154,167,68,89,79,150,71,67,239,173,227,36,124,124,196,65,81,50,146,219,170,0,141,48,194,143,6,96,145,53,31,159,28,44,31,23,165,3,57,137,18,212,246,79,30,174,12,55,229,187,147,132,186,10,237,180,199,113,75,86,149,79,193,177,206,96,37,7,165,122,173,145,167,39,122,108,129,70,168,65,161,85,186,142,59,227,173,110,16,71,1,2,70,219,157,220,54,189,93,153,15,161,105,192,100,178,2,105,211,247,178,7,224,185,50,99,207,207,225,155,184,183,204,123,236,51,77,112,51,226,80,60,188,55,128,122,87,242,149,52,197,17,228,169,137,203,202,57,20,56,206,27,208,221,135,32,189,39,159,21,181,215,209,84,6,211,191,93,166,239,143,215,25,236,117,60,67,104,63,84,47,83,231,114,176,58,160,146,133,115,166,107,205,152,8,191,16,68,229,215,225,57,205,150,105,65,227,147,249,9,10,197,58,3,246,200,200,219,189,94,108,152,21,21,
+69,23,9,41,233,81,104,59,91,213,141,69,49,17,205,127,116,3,170,115,83,28,232,113,137,228,171,158,89,73,242,229,81,19,179,46,201,5,71,28,92,35,134,161,79,56,171,254,113,172,239,14,159,174,143,47,48,216,92,207,128,49,130,134,110,65,187,240,36,236,173,103,61,122,213,200,173,172,78,101,133,39,86,136,14,199,112,2,74,14,148,207,178,69,122,236,147,27,5,217,100,59,7,33,104,72,108,33,38,188,139,197,28,106,80,144,196,79,142,151,216,130,108,114,45,93,8,77,135,253,222,133,197,120,139,135,193,208,196,25,46,194,242,241,6,172,237,24,213,5,13,47,167,76,184,95,38,144,50,100,72,42,8,229,144,165,17,167,41,134,232,65,127,36,67,78,111,120,4,82,190,118,156,54,210,76,71,161,130,49,215,148,5,131,106,42,174,134,169,137,155,93,247,89,81,183,184,30,142,202,231,208,107,3,126,14,27,234,241,224,233,234,4,124,138,186,246,90,249,241,212,145,70,174,216,88,241,93,70,143,77,70,66,169,237,56,182,28,229,112,155,155,231,145,16,86,
+178,123,97,57,66,201,3,214,162,194,84,37,29,114,6,58,53,129,22,109,47,118,160,29,92,174,40,246,180,67,137,130,95,109,133,92,63,43,156,146,40,122,185,1,35,95,108,37,101,27,46,51,125,13,212,72,3,229,97,66,194,169,169,24,205,180,193,85,73,44,195,140,236,33,127,12,22,61,4,106,148,108,151,173,66,120,141,214,233,209,32,117,100,214,223,31,28,109,105,145,71,61,49,204,235,233,251,106,11,222,191,60,99,116,186,180,147,193,124,68,164,82,2,135,233,203,167,52,115,245,52,185,208,129,14,76,158,67,9,153,228,116,212,44,29,16,231,198,178,128,232,132,43,206,120,233,215,244,39,146,227,96,202,66,19,49,243,182,94,64,57,40,151,43,98,218,255,199,199,91,52,75,212,108,87,98,127,69,67,15,58,218,191,193,99,207,61,87,135,52,144,251,201,175,35,100,105,208,163,91,204,204,76,183,152,153,153,153,110,49,51,51,179,239,247,61,201,225,48,141,42,35,243,68,158,147,59,87,237,92,123,101,196,90,81,182,173,66,203,82,18,101,198,173,220,110,
+57,38,34,141,49,14,84,156,186,38,22,124,14,250,152,112,234,223,199,25,11,10,5,46,67,86,209,80,194,210,40,242,47,3,155,115,116,186,165,42,104,151,219,38,111,0,76,236,103,228,90,193,173,97,28,173,152,124,56,191,238,97,64,247,204,181,167,78,166,83,9,88,114,173,69,220,97,248,67,223,119,248,85,178,119,132,155,41,152,146,129,60,5,70,104,223,234,19,164,160,149,68,203,52,99,192,82,204,174,58,146,165,54,179,253,145,216,145,74,137,239,166,253,56,111,211,170,145,152,246,172,80,203,64,143,151,201,250,128,208,113,43,4,213,156,55,194,71,129,219,174,162,179,111,228,183,139,198,154,226,223,160,243,23,143,176,101,226,84,201,58,168,253,30,69,196,241,199,166,208,50,149,251,34,84,247,52,130,126,153,216,223,36,93,22,68,219,82,249,248,248,245,51,250,70,80,171,228,80,87,19,242,82,184,160,144,187,45,130,201,237,130,115,16,78,93,227,4,76,142,39,185,129,98,109,74,19,171,101,184,33,204,137,141,180,165,176,150,71,250,18,53,89,85,132,45,
+106,6,171,57,174,157,49,69,78,73,76,18,160,160,208,220,194,51,199,42,223,85,6,249,134,224,165,138,55,180,0,60,198,163,83,31,232,23,227,186,65,233,241,86,214,87,213,247,115,55,99,50,248,23,145,229,222,140,85,164,173,253,178,58,68,128,218,188,219,127,52,138,69,250,175,212,29,220,124,124,63,69,115,65,72,180,34,229,99,188,67,228,66,253,164,174,242,171,255,16,209,220,36,152,67,58,114,204,21,107,247,74,141,109,36,234,211,117,67,169,110,99,16,212,244,164,38,222,147,29,34,85,154,152,69,53,73,159,31,254,33,63,252,130,50,170,91,72,28,206,132,246,219,213,138,79,21,18,24,116,239,47,235,151,8,62,102,5,64,98,113,15,45,60,146,164,238,47,193,241,44,212,231,60,208,64,238,5,23,15,181,77,135,77,127,142,236,194,242,73,148,134,89,212,40,117,8,209,106,22,111,234,201,203,154,76,186,145,188,217,109,122,213,114,247,142,243,249,78,90,193,122,72,156,235,190,238,221,167,136,13,118,70,123,77,95,14,167,126,71,170,231,105,57,49,159,
+85,55,226,173,248,111,211,128,212,68,247,169,120,107,11,220,187,85,151,51,40,229,53,147,70,241,64,50,146,175,20,48,223,191,167,211,162,99,47,60,198,144,33,77,57,126,218,14,210,80,207,126,121,177,61,175,121,46,210,130,141,177,17,7,155,176,255,22,141,222,211,59,39,58,198,94,185,203,204,138,151,229,190,159,42,245,172,138,14,101,97,210,5,54,211,195,106,63,156,233,83,32,62,167,241,30,61,40,29,242,185,206,105,213,58,200,143,232,80,157,129,32,226,86,0,26,124,28,21,136,99,88,111,60,69,232,166,148,11,112,240,172,44,100,228,50,112,150,219,164,238,109,159,189,16,122,149,187,48,111,40,71,76,99,91,123,112,210,49,99,174,251,110,20,72,7,225,204,122,115,58,81,27,94,34,255,193,84,144,94,254,162,11,130,185,12,54,91,81,138,196,105,78,226,40,71,33,218,51,145,147,41,96,208,121,42,161,227,65,86,135,143,248,42,145,106,150,124,122,72,232,182,160,204,17,34,55,127,66,197,167,220,116,181,77,242,3,191,81,151,124,93,238,202,183,141,
+84,20,118,27,39,67,207,12,124,182,135,176,76,14,224,215,214,116,76,85,219,74,133,80,55,133,194,102,63,5,59,226,154,56,134,95,233,250,159,236,70,6,118,167,56,32,57,156,65,213,50,230,89,110,184,6,48,251,165,198,161,190,37,59,232,130,98,62,242,147,244,7,25,134,48,166,84,252,181,43,67,182,191,252,84,41,188,252,35,181,157,21,33,132,180,60,84,153,223,10,194,132,139,146,102,55,188,71,43,231,108,86,107,3,236,180,152,131,51,82,101,164,147,116,135,199,111,173,173,49,23,36,192,1,86,254,12,58,151,1,28,211,164,107,243,74,251,48,98,62,31,138,205,122,165,153,37,8,247,25,181,204,189,254,222,78,198,37,155,224,234,58,70,143,201,228,254,173,0,35,0,81,176,212,175,44,17,195,209,235,236,37,119,58,13,133,222,7,150,150,100,168,69,207,135,191,137,18,203,176,249,19,9,159,75,200,201,43,208,175,25,230,35,185,109,26,32,6,64,193,121,59,180,48,234,150,48,133,70,172,213,35,0,19,90,203,197,44,30,16,106,40,99,191,20,103,
+140,241,107,204,103,191,4,168,136,15,15,119,212,148,9,70,76,239,37,130,81,244,24,136,192,164,139,31,27,125,1,10,37,131,29,253,238,86,15,186,13,104,4,133,30,63,25,237,45,248,11,101,213,173,131,131,102,60,205,109,166,251,232,32,65,16,195,49,126,161,35,66,152,24,141,62,150,212,118,76,168,68,22,52,124,31,43,9,104,149,229,232,176,48,38,228,193,196,104,166,109,32,138,198,146,87,144,23,67,182,84,209,197,158,13,1,59,66,79,65,51,249,19,106,16,16,229,123,208,45,79,82,71,18,166,5,65,35,62,54,125,1,31,155,208,168,249,116,129,232,212,201,200,33,4,44,25,186,234,27,16,99,152,99,62,205,55,55,87,252,16,24,100,106,228,120,51,127,40,225,240,124,95,183,196,220,206,213,253,249,134,152,116,223,139,161,175,109,15,249,2,70,88,134,7,56,50,3,23,226,96,154,11,37,125,31,173,52,242,219,65,212,30,215,61,112,230,206,128,39,167,23,229,55,85,139,212,65,21,78,34,98,184,142,163,217,191,171,118,16,145,253,28,20,202,116,
+204,175,42,213,136,111,194,20,136,111,40,211,74,161,211,81,97,167,222,192,148,221,13,109,178,89,231,114,234,243,113,6,0,61,44,81,195,21,8,252,140,12,214,203,62,167,154,243,213,26,128,209,248,121,181,74,23,82,218,209,55,245,76,75,161,242,95,73,112,69,14,90,6,145,156,135,35,167,85,2,8,120,238,198,79,87,208,89,206,66,102,205,46,226,232,110,18,226,62,5,246,25,129,223,141,206,225,143,223,196,103,232,58,187,201,88,116,202,3,16,32,209,155,72,40,244,233,213,228,246,12,56,19,254,202,208,33,251,109,136,8,101,230,57,104,68,46,222,217,195,20,0,184,168,31,213,251,6,112,134,236,170,95,130,209,156,95,214,60,74,85,108,215,239,107,181,223,148,28,231,27,136,185,207,100,29,155,213,143,145,128,198,96,236,2,244,207,12,169,85,17,58,83,232,220,33,67,141,249,80,195,244,183,249,103,75,96,248,91,11,246,71,231,111,235,245,231,176,44,90,246,205,42,138,190,54,15,62,85,238,249,85,138,52,209,174,21,134,220,172,42,14,201,16,191,97,
+129,189,61,59,90,12,5,36,91,1,28,208,71,175,65,190,127,193,139,95,34,158,86,33,51,231,67,217,141,254,53,131,8,173,171,57,220,29,26,12,64,242,26,151,148,98,115,104,159,230,149,57,164,37,21,138,176,118,130,41,119,11,162,210,189,83,24,147,42,99,0,44,149,88,132,37,232,114,230,221,0,85,59,149,214,188,110,23,151,9,139,11,93,168,226,181,212,43,61,225,4,198,84,115,14,33,226,38,78,144,12,29,246,124,126,175,123,92,192,148,87,225,229,20,80,122,180,218,223,239,240,138,212,220,31,208,135,140,187,48,122,172,9,132,113,195,155,116,23,166,25,85,195,4,100,78,79,2,19,242,30,248,26,88,170,139,139,109,19,176,169,188,25,163,203,138,96,200,110,111,77,102,111,43,30,146,134,43,159,110,63,208,76,14,141,30,227,123,32,59,196,192,152,102,167,250,207,109,38,126,169,193,172,219,201,12,18,103,164,224,102,108,213,197,83,29,225,253,108,88,186,216,147,155,164,227,103,204,191,109,236,44,89,48,231,21,91,130,180,92,209,78,208,181,115,216,
+68,129,66,28,59,131,15,211,126,254,96,122,171,114,139,94,167,2,214,224,145,18,157,128,75,95,125,31,168,98,194,128,23,131,101,141,114,152,64,60,53,132,116,18,0,6,36,242,42,166,54,50,164,138,47,51,31,31,110,165,90,41,243,3,230,248,97,57,21,9,122,204,252,187,237,133,191,5,132,231,145,1,144,159,142,221,211,231,111,43,147,62,66,135,0,81,188,22,122,201,218,153,184,30,60,196,20,10,141,172,201,83,40,18,143,249,201,106,155,43,239,158,22,253,93,238,85,15,11,171,238,64,80,233,232,226,200,118,89,194,0,218,75,251,242,32,202,231,5,244,141,169,73,23,136,162,254,180,67,123,212,244,208,104,199,63,167,2,26,157,89,21,230,25,99,110,151,106,87,7,229,144,187,98,6,48,173,18,38,128,73,73,8,95,159,145,201,196,26,66,233,49,244,10,112,69,68,41,198,106,112,216,197,100,152,227,52,15,58,143,28,1,175,241,39,201,29,116,167,34,153,51,18,98,179,83,177,109,238,11,54,220,95,32,129,251,141,212,246,132,202,52,23,157,76,159,
+231,193,26,212,230,124,33,194,127,168,214,47,139,73,0,117,40,38,226,111,62,1,170,217,182,188,1,31,99,247,9,64,219,225,151,134,57,159,202,66,148,15,192,45,185,142,254,223,61,201,254,231,191,254,229,175,255,127,142,100,127,83,213,254,230,176,247,127,117,36,251,119,83,184,63,36,206,255,250,215,191,252,253,127,254,187,255,233,191,255,211,63,255,235,159,54,153,255,49,244,207,127,140,252,227,223,253,235,63,4,5,255,22,20,252,159,238,113,127,74,160,255,233,239,254,237,191,255,246,255,229,31,255,183,63,238,88,255,250,15,127,247,47,127,234,147,255,250,219,252,111,127,200,202,191,99,255,238,54,249,79,255,174,153,254,15,255,250,231,197,238,31,79,253,249,198,63,68,242,176,224,31,255,225,159,254,152,251,79,43,180,255,18,84,255,229,63,92,253,254,211,223,164,230,127,251,235,239,148,255,235,191,252,33,129,255,41,117,255,78,25,148,255,187,205,230,127,254,187,255,229,175,127,249,47,127,255,135,149,229,127,88,174,253,203,63,254,161,233,254,78,248,15,127,10,136,
+255,252,215,63,36,198,127,249,251,127,254,125,239,223,255,239,127,91,236,127,251,235,191,252,235,31,30,114,255,245,15,73,247,143,107,232,191,254,241,245,255,247,104,252,45,162,255,227,255,83,90,252,255,242,66,139,178,151,108,216,149,29,14,190,116,144,167,47,240,6,126,131,169,177,24,219,97,174,210,155,187,168,59,222,160,170,218,170,246,99,211,112,243,238,27,119,109,109,117,95,218,98,229,69,51,113,27,134,129,29,9,0,245,93,207,199,8,220,122,70,19,244,24,107,246,1,106,26,157,86,171,211,154,63,60,46,227,203,121,243,112,110,222,166,88,140,234,243,72,42,26,190,209,139,205,164,132,119,150,106,198,161,229,215,248,124,32,226,182,70,247,119,186,255,6,100,180,14,134,186,219,112,169,79,66,202,122,71,164,216,245,172,254,9,206,53,249,45,99,92,214,75,108,128,123,196,242,1,235,213,82,178,72,63,98,231,231,28,174,46,179,132,21,113,192,128,209,123,97,87,109,40,202,240,46,237,49,105,147,216,172,117,49,224,39,34,55,42,179,206,247,35,8,156,92,62,
+56,242,1,57,142,93,54,145,143,85,227,152,59,243,241,78,90,128,165,25,213,181,148,180,38,191,132,136,189,252,228,168,233,108,243,61,128,21,214,123,77,225,130,48,49,12,6,105,47,1,182,201,231,141,192,199,0,129,5,198,51,188,35,120,255,56,120,212,55,40,215,230,228,195,230,251,6,101,26,55,115,126,107,241,7,31,120,82,9,134,225,26,52,92,240,0,248,145,8,16,105,39,142,49,234,96,25,105,171,187,22,137,41,226,0,96,252,182,193,240,68,216,215,38,1,188,126,197,127,174,40,215,234,162,254,66,67,34,20,134,220,139,70,78,13,198,108,92,53,35,95,243,235,103,106,8,252,138,162,107,82,34,88,196,253,232,220,103,112,171,2,156,210,12,153,142,167,119,5,113,190,134,173,43,39,86,36,171,98,68,222,254,10,209,234,200,177,125,226,198,208,185,198,175,78,148,211,137,91,241,96,198,119,196,246,237,26,223,78,3,73,174,227,238,189,79,8,210,57,137,155,117,72,121,231,91,37,42,125,28,71,131,94,119,19,133,63,70,86,108,218,33,123,145,114,5,
+99,178,73,137,193,100,64,154,162,97,212,74,134,34,133,249,209,249,44,63,145,135,114,5,3,199,189,189,132,29,65,0,162,136,161,122,164,9,216,57,3,148,111,168,206,254,29,78,188,42,254,169,144,14,66,5,2,51,185,238,65,192,243,204,140,57,155,34,170,191,66,32,129,75,12,159,24,238,192,128,124,69,60,71,67,84,107,82,53,167,242,48,61,44,123,139,68,62,217,207,250,152,82,234,67,226,17,54,217,171,172,242,195,205,43,200,47,68,219,82,91,16,42,233,213,225,203,211,179,220,150,237,158,216,111,20,155,180,207,241,251,224,91,58,6,124,83,239,252,143,39,227,197,157,183,128,239,158,54,228,250,170,110,29,58,245,16,10,52,1,3,91,148,139,124,249,25,140,198,242,221,73,32,115,86,117,190,52,65,235,203,16,12,49,13,117,150,193,42,140,161,180,220,75,52,59,162,54,222,69,217,122,7,76,61,228,244,149,249,162,61,236,223,227,214,153,38,52,3,121,168,114,245,169,169,159,24,211,209,69,42,164,208,32,149,158,212,18,147,137,228,195,248,74,189,46,
+146,81,45,222,224,61,201,84,102,107,83,143,46,105,93,11,234,143,6,238,253,62,196,197,231,78,241,202,93,163,188,222,37,62,223,32,21,239,131,194,231,168,223,85,113,29,170,230,144,97,234,33,155,8,165,147,1,174,23,254,189,111,136,67,190,185,239,253,66,234,246,34,63,0,152,126,150,31,117,127,94,251,35,129,173,128,97,123,212,115,43,115,227,165,15,45,175,174,188,14,196,146,155,195,134,197,125,68,175,201,38,11,234,222,48,206,73,143,70,155,51,166,180,216,9,125,93,251,76,79,148,79,144,84,41,221,226,15,251,194,126,179,84,200,222,197,178,95,135,177,76,221,36,82,159,118,85,154,206,151,186,24,161,253,210,130,74,9,244,160,62,206,103,245,214,101,73,158,234,14,246,101,81,228,132,82,215,29,222,88,190,43,124,88,89,82,185,97,116,56,23,201,225,102,51,158,19,21,73,50,48,9,75,117,134,100,8,249,108,229,159,109,65,97,198,166,189,113,15,208,188,150,12,183,36,77,148,142,14,201,179,143,126,9,234,56,203,18,166,190,31,150,50,114,251,121,
+224,250,23,230,4,171,172,20,184,151,219,75,204,7,126,87,1,8,200,102,73,174,68,63,188,23,248,70,160,95,15,245,248,224,176,97,88,124,236,9,113,202,91,111,253,221,39,14,225,32,123,185,58,40,150,142,131,185,46,226,24,125,142,98,134,148,94,214,250,222,182,102,62,174,167,207,126,195,113,221,69,206,67,234,156,29,223,203,162,209,239,152,79,216,165,44,61,201,245,233,169,19,175,193,249,24,9,118,151,109,176,93,186,173,158,45,227,96,147,136,173,180,42,197,235,148,143,228,173,161,115,92,16,184,3,106,230,69,210,118,138,117,196,171,187,98,120,211,211,52,181,78,93,242,158,207,184,219,150,105,237,184,247,82,39,183,108,225,112,18,42,230,224,253,39,176,184,83,193,103,245,209,147,61,35,146,102,125,153,70,235,252,172,153,226,215,15,210,118,77,142,189,1,65,159,38,106,121,181,232,135,91,104,155,25,209,120,148,57,175,153,132,45,19,144,55,149,189,49,184,7,203,103,121,202,45,78,185,21,244,148,95,238,126,156,139,137,243,187,241,20,220,121,23,147,18,
+43,231,93,198,119,75,45,223,154,120,61,120,61,245,185,237,151,81,226,208,65,250,134,112,119,110,237,45,174,189,125,92,29,214,123,154,63,194,112,47,201,196,205,252,44,91,201,167,43,91,52,114,49,178,207,118,67,222,169,62,141,132,58,31,145,183,35,45,101,52,98,122,91,140,122,62,236,77,167,97,33,151,75,28,88,226,97,173,254,69,139,184,205,200,183,144,103,32,123,48,182,238,39,169,227,152,177,172,94,202,170,227,226,26,101,109,78,148,113,144,206,98,45,184,217,59,6,39,64,91,143,205,236,236,150,215,110,235,236,200,66,163,150,222,253,217,252,157,47,79,190,100,16,201,174,82,180,62,121,20,253,107,177,45,117,238,183,241,107,70,223,137,235,105,3,63,64,147,232,109,125,2,90,168,93,132,18,205,10,249,36,135,156,54,241,219,57,125,118,158,189,250,213,232,114,116,180,65,76,107,241,201,84,86,159,124,165,165,203,230,197,183,52,101,81,171,142,95,143,42,231,179,239,154,64,36,177,232,65,96,153,0,253,169,199,43,13,38,100,92,55,198,209,49,59,58,
+206,11,174,185,56,183,144,111,193,233,25,54,142,82,72,168,118,195,124,22,239,10,2,32,4,8,132,124,202,158,29,8,2,164,5,198,53,208,16,214,23,156,70,170,76,178,90,138,85,165,212,100,245,199,213,171,226,110,223,32,93,91,48,152,22,37,111,179,146,69,232,213,213,131,154,69,202,167,108,26,73,28,36,205,248,64,138,94,179,29,79,94,58,249,169,173,215,48,221,183,166,167,76,249,209,12,45,43,122,32,105,5,62,92,55,156,65,249,65,72,196,179,48,232,36,58,245,92,188,210,226,75,131,181,109,102,39,183,38,111,62,167,212,7,179,248,76,203,140,22,60,206,57,71,246,151,196,242,16,60,128,177,231,60,130,183,168,242,94,141,42,87,113,240,78,43,82,17,29,102,180,89,161,83,132,222,163,35,209,125,240,132,31,158,234,98,166,134,219,125,59,81,135,63,166,206,46,71,230,190,151,108,65,154,10,117,73,45,195,182,125,13,2,226,150,103,152,129,231,135,203,107,189,102,134,14,4,14,83,31,252,212,201,19,253,136,183,78,15,182,233,177,28,255,100,234,
+178,51,43,185,63,179,180,196,44,225,232,241,206,10,220,166,198,82,211,20,214,87,38,66,11,129,163,24,57,121,164,239,7,108,219,91,39,42,163,54,153,55,170,101,181,166,45,217,140,134,252,83,1,145,248,217,194,101,217,178,92,42,149,157,118,94,55,16,171,222,165,81,37,170,204,151,12,123,233,55,181,246,204,224,213,207,37,184,88,179,51,52,147,177,125,199,37,145,241,208,47,125,138,26,120,94,222,221,42,235,225,105,103,27,142,201,165,147,155,115,37,237,215,90,107,94,87,126,174,78,241,151,65,171,56,63,211,3,205,78,107,196,162,12,4,60,89,8,22,20,186,110,94,116,77,107,223,250,67,200,123,255,60,155,74,241,82,158,74,243,232,134,2,222,254,1,109,228,6,53,233,81,223,30,244,133,29,43,223,119,34,6,251,223,228,104,154,203,26,173,81,135,48,61,27,220,140,43,149,66,188,197,36,65,86,71,165,179,114,86,96,187,235,34,183,36,254,248,121,245,248,199,229,134,124,242,29,17,151,35,249,65,2,180,90,196,160,252,113,107,189,143,245,226,209,117,
+110,130,129,12,75,133,255,177,60,249,173,117,221,101,54,238,44,12,168,180,35,207,7,91,30,225,8,138,116,4,209,211,209,100,195,154,240,120,203,237,27,25,108,220,16,150,73,164,198,149,177,70,247,53,40,120,152,108,22,156,71,84,122,161,98,212,220,222,124,210,113,21,221,15,69,162,86,177,146,179,239,244,108,169,148,36,90,90,217,249,149,62,120,110,191,235,133,27,8,153,4,146,112,143,217,76,34,106,6,178,124,68,47,0,158,169,251,29,54,243,113,106,205,231,55,207,151,72,144,0,99,7,33,128,86,16,248,163,71,166,107,99,77,173,239,121,28,211,225,200,163,2,195,138,217,55,63,204,154,228,216,147,150,250,141,26,159,65,232,34,168,112,185,241,174,5,25,20,199,23,47,211,145,159,14,197,42,238,251,153,124,180,46,31,138,129,145,32,155,220,154,235,60,215,115,103,173,170,235,152,66,227,251,9,118,157,221,102,8,19,175,11,40,107,47,196,102,158,90,106,51,121,204,252,178,140,60,50,123,235,88,108,23,253,10,162,254,93,102,180,193,225,253,12,222,235,
+224,224,16,92,99,50,110,229,97,157,254,136,221,159,242,242,37,133,214,179,74,133,251,83,172,173,95,113,249,68,28,134,113,105,20,48,237,90,11,235,186,99,125,254,156,109,250,172,233,131,77,194,190,66,224,72,122,232,109,194,66,130,105,237,171,187,11,213,108,173,119,122,189,33,119,81,142,244,24,49,105,3,250,8,188,54,174,13,178,214,190,55,122,44,34,26,213,201,65,0,135,204,198,188,13,251,240,234,188,245,97,37,20,76,203,249,28,153,54,60,226,212,79,211,63,222,103,116,224,167,124,65,144,160,222,55,248,244,180,118,94,23,158,19,130,131,140,237,233,172,172,69,245,8,138,31,86,81,141,11,227,237,226,46,236,78,103,239,47,57,202,48,235,138,250,168,245,173,215,65,136,0,253,64,125,25,52,137,214,218,244,197,110,253,38,215,110,56,244,61,4,3,174,14,155,233,105,140,45,78,95,105,245,132,75,161,180,105,228,71,199,144,155,191,218,250,73,24,38,254,93,32,4,85,87,191,93,3,155,204,121,57,240,89,96,212,81,164,129,179,34,31,57,239,214,154,
+85,127,16,46,205,166,117,182,118,220,27,201,193,204,137,99,43,145,90,155,67,158,157,86,110,212,98,51,99,180,72,237,87,99,217,169,63,198,180,142,181,111,225,25,94,212,216,187,123,246,107,165,111,173,85,112,184,150,110,51,156,58,1,244,85,81,19,128,87,70,211,93,213,153,154,213,225,161,121,91,158,225,107,110,181,95,42,233,123,20,227,65,69,42,157,54,80,188,224,244,107,152,241,230,98,163,62,95,206,94,55,250,93,29,151,94,27,127,24,181,91,49,94,66,116,200,58,224,235,92,31,55,51,63,17,163,151,237,239,247,49,205,88,139,119,150,77,231,221,20,174,95,34,235,102,125,185,128,186,126,111,224,148,249,12,223,61,83,5,66,199,165,30,234,28,215,123,193,174,237,214,163,57,131,41,58,46,204,113,116,211,249,121,116,10,43,213,203,63,106,118,40,15,2,175,66,12,77,223,249,172,231,84,99,72,195,53,243,4,202,220,41,6,165,159,116,158,151,9,157,56,137,173,30,146,0,188,246,102,207,235,224,214,166,143,45,175,165,118,171,219,162,195,5,175,218,
+122,84,238,214,58,139,250,10,56,55,55,122,231,209,232,239,27,55,232,164,67,105,93,56,240,161,170,218,20,99,79,94,142,220,157,97,246,81,10,191,198,17,96,248,107,6,231,104,173,188,177,250,194,175,240,37,127,53,38,157,235,78,11,213,153,230,28,87,231,56,223,88,120,251,239,19,12,245,29,244,7,183,171,62,10,204,1,143,66,183,35,14,220,111,8,48,208,218,246,242,30,180,40,181,67,136,72,244,219,129,188,144,109,183,227,117,27,58,217,107,11,245,31,111,208,242,134,213,43,151,136,48,36,167,155,225,189,137,54,154,112,109,185,132,55,148,235,187,123,223,90,0,183,47,149,237,152,5,172,80,162,148,230,61,173,159,119,34,35,138,199,204,181,233,189,227,251,5,202,254,130,133,243,9,94,56,79,29,231,160,85,187,87,159,95,188,107,21,188,229,167,189,122,30,20,147,22,143,228,204,29,42,55,233,249,195,218,37,200,7,77,207,7,196,173,180,10,46,244,40,135,193,181,200,61,130,149,0,244,59,153,215,248,113,74,31,167,44,123,255,188,98,31,204,184,54,
+251,209,214,47,30,193,99,100,233,215,37,61,149,177,90,235,90,95,207,35,20,228,69,61,122,115,252,180,197,119,24,112,89,225,239,118,244,212,150,166,185,107,216,201,104,73,244,59,147,76,106,140,147,229,212,234,183,223,186,119,182,146,143,246,180,253,212,174,195,165,160,99,212,209,182,174,149,251,125,167,69,161,24,246,178,202,104,239,69,182,125,62,26,162,13,189,99,94,224,187,177,90,183,128,94,214,113,31,165,177,175,235,192,135,152,42,236,86,145,39,17,230,92,79,252,14,78,113,227,124,147,24,19,240,9,208,135,217,30,97,41,148,234,164,156,46,19,119,231,216,122,243,224,207,114,235,253,40,160,54,46,70,231,233,91,22,113,254,180,135,51,187,239,192,218,56,228,130,209,184,6,243,109,47,13,66,125,202,29,231,149,153,9,87,76,103,173,71,118,218,105,153,84,218,71,248,238,105,231,84,218,91,248,92,107,145,82,78,54,37,163,140,218,80,246,84,162,47,87,70,150,151,70,14,254,37,12,183,75,3,95,181,86,189,243,13,32,219,81,109,60,78,57,247,53,104,
+62,34,90,199,217,61,56,190,78,111,216,206,169,173,29,221,199,241,31,154,142,49,171,209,86,63,110,72,95,148,41,73,19,244,53,170,246,205,125,80,184,48,115,123,255,40,113,157,98,99,89,141,218,204,23,220,210,165,127,39,183,189,202,79,221,90,11,107,79,113,119,89,226,220,152,49,3,30,45,68,51,136,139,227,132,179,88,5,90,23,225,1,160,220,245,235,18,122,230,65,126,215,14,95,93,255,167,120,207,162,222,1,32,76,75,38,70,33,12,130,191,200,187,182,203,234,247,29,121,186,174,115,189,50,123,107,39,70,161,226,14,252,34,123,147,27,21,175,243,62,178,155,15,234,166,152,39,99,69,56,13,234,137,198,250,242,6,57,60,134,193,164,65,171,133,165,202,230,35,185,213,26,80,222,202,189,217,215,224,198,172,201,163,123,44,193,242,107,233,197,17,101,59,38,135,251,186,1,161,180,179,14,250,25,222,20,105,39,207,231,181,40,100,223,170,155,182,102,156,243,60,202,187,115,247,33,95,131,41,131,34,223,158,16,3,224,177,142,221,187,159,176,15,179,225,230,
+253,37,26,144,116,59,236,7,126,45,80,207,213,253,15,160,29,86,103,214,166,101,45,28,238,96,231,186,210,185,80,27,217,45,114,117,170,168,180,94,143,170,114,160,221,96,225,16,64,117,143,71,118,96,84,79,28,236,129,35,243,67,166,30,71,237,58,243,129,244,89,46,239,96,163,174,149,33,169,221,54,102,115,210,173,208,94,52,233,91,52,219,175,84,143,235,68,75,69,179,98,222,60,148,13,207,112,27,140,5,71,72,248,172,170,44,139,174,24,172,135,4,36,155,42,240,240,155,177,184,252,111,238,187,0,0,108,72,108,98,198,165,41,72,186,85,190,127,191,176,250,72,221,41,39,230,146,183,42,251,114,119,105,197,180,192,128,117,226,169,188,104,227,243,12,99,93,112,35,80,21,107,250,249,18,214,231,175,87,24,163,125,171,149,159,176,51,210,113,109,118,231,240,207,57,171,118,173,251,219,26,234,206,251,148,75,151,195,196,236,253,172,189,233,44,47,255,58,226,113,72,119,54,163,162,209,41,79,125,142,187,97,141,219,140,241,241,4,168,200,204,183,143,30,178,7,
+156,95,134,247,235,240,186,159,127,241,147,62,45,88,246,238,229,245,125,57,93,222,46,207,211,202,170,2,179,180,149,198,219,221,157,206,118,78,123,50,94,122,37,61,192,92,220,19,183,148,231,149,166,53,107,141,29,168,76,61,201,51,215,88,123,16,112,108,188,167,22,146,51,243,189,197,76,73,77,98,229,49,106,143,213,111,212,137,231,178,238,0,67,163,85,133,199,71,16,96,0,10,236,247,47,75,254,219,174,42,186,220,174,15,212,119,178,242,2,209,2,28,234,134,83,200,206,61,154,243,120,71,210,242,193,92,35,85,36,210,134,198,219,97,172,0,181,185,228,175,237,88,45,112,190,240,215,70,182,45,30,50,156,228,211,226,158,22,159,154,242,87,230,241,122,165,248,245,199,232,48,167,41,223,242,203,44,45,74,178,54,204,166,195,13,137,20,58,174,233,118,102,119,159,147,31,233,225,134,99,54,104,220,242,235,41,191,17,218,210,113,25,129,212,170,112,166,177,247,168,73,57,117,110,199,111,217,23,80,104,245,100,212,83,171,237,108,87,172,69,197,90,44,121,55,200,
+78,231,234,143,0,121,139,205,227,125,59,106,173,187,211,143,183,238,106,126,202,199,57,207,132,125,112,153,53,47,21,46,1,33,231,165,158,120,5,90,123,29,102,73,215,182,80,54,150,61,95,148,51,54,243,26,3,139,49,250,188,38,180,189,235,193,145,19,125,240,189,124,39,107,206,220,44,235,4,207,178,195,94,19,205,216,51,11,8,3,180,4,255,115,242,56,93,168,177,51,92,26,10,222,251,191,25,142,235,33,124,158,100,248,68,154,136,194,59,82,172,228,217,148,180,175,213,215,14,243,72,68,213,159,7,125,68,168,0,13,146,14,50,86,63,94,215,221,175,205,179,87,234,66,133,243,237,120,211,221,146,92,39,90,136,219,72,186,46,66,168,103,252,150,10,215,141,149,115,178,185,8,194,145,15,171,37,8,155,214,202,73,105,162,113,9,31,35,122,239,54,178,166,53,205,242,239,126,99,180,174,238,113,84,213,66,43,239,239,199,136,56,83,43,179,138,246,93,18,120,63,7,70,101,56,22,174,136,33,112,245,205,138,28,83,112,105,109,198,113,182,57,146,171,250,197,
+227,53,63,107,247,164,119,203,108,189,10,234,201,78,146,61,163,64,213,135,146,204,72,235,57,106,99,59,61,203,61,117,201,135,65,195,15,152,65,141,48,114,64,79,121,22,134,131,234,177,51,113,131,8,247,189,63,200,204,112,94,237,109,64,197,191,95,209,183,253,9,249,172,185,187,168,67,135,200,174,175,151,29,235,139,10,135,83,83,46,173,247,189,90,70,208,178,34,230,185,244,68,38,68,84,155,91,241,94,193,239,108,136,20,113,3,179,12,30,246,145,88,62,139,84,26,40,68,63,121,71,187,50,7,93,187,144,36,191,36,192,213,123,116,164,203,13,210,213,148,78,117,116,129,111,185,78,16,232,112,227,193,95,131,30,26,71,150,141,184,81,159,219,40,102,33,230,45,230,173,146,54,177,62,137,2,227,254,25,29,78,88,93,239,217,121,179,210,249,241,220,47,160,134,242,99,240,236,55,164,147,18,24,252,61,23,147,143,97,194,139,209,62,91,222,235,188,131,214,186,167,243,231,202,46,90,252,194,184,243,18,101,204,82,211,73,235,17,220,71,250,48,152,198,101,213,
+68,245,115,51,93,128,231,232,90,69,179,117,107,108,231,83,101,82,73,98,107,50,7,207,217,146,182,111,144,73,179,36,174,169,120,206,78,139,53,226,222,128,46,139,141,220,217,226,141,239,175,146,51,186,248,152,95,251,236,103,92,225,253,120,239,54,222,190,22,149,156,58,162,111,226,79,129,202,163,213,73,18,143,44,133,116,252,216,34,23,53,7,188,54,209,142,18,129,83,220,184,100,10,214,117,116,114,138,172,142,170,23,191,242,90,185,14,138,32,120,134,215,173,241,199,204,141,84,228,114,84,156,199,245,126,225,234,72,52,225,101,20,217,94,249,85,221,157,94,5,130,188,52,76,149,47,227,191,83,155,7,111,250,188,143,17,202,143,107,116,57,149,138,231,142,103,180,29,176,103,253,184,49,2,138,217,11,159,107,174,116,134,57,214,13,57,8,23,193,45,93,129,53,33,170,207,168,47,184,124,100,195,45,55,236,79,154,58,169,157,209,219,239,210,103,239,69,27,180,222,241,245,182,129,110,43,224,182,222,245,52,144,122,163,63,16,55,153,110,195,185,46,163,165,124,102,
+181,238,251,231,71,27,112,73,158,241,72,134,142,126,252,32,168,29,222,244,86,248,5,199,209,44,110,240,188,147,99,56,58,94,119,208,102,135,41,115,231,20,166,139,164,104,165,217,126,166,151,155,237,53,186,88,87,90,180,209,185,151,42,210,37,154,74,139,108,31,4,210,147,246,151,153,158,32,169,126,134,17,159,58,55,213,156,151,255,243,254,60,39,146,154,214,220,137,185,43,138,99,158,181,152,87,207,167,221,74,33,21,53,74,145,139,236,101,172,202,29,236,145,181,230,48,168,26,235,210,26,98,210,30,179,111,234,44,91,179,102,159,174,190,136,193,46,109,18,77,157,79,40,6,118,1,195,200,113,16,67,125,11,225,106,221,39,124,151,47,54,223,217,197,11,69,177,133,129,78,84,104,171,4,73,21,151,44,227,166,211,85,129,209,221,157,111,227,217,212,207,113,93,204,65,101,101,237,43,206,24,129,120,231,173,39,54,191,0,250,80,192,100,18,146,70,101,103,173,235,34,89,200,126,178,139,98,119,98,242,190,234,131,254,137,244,123,220,105,158,51,232,96,63,25,81,
+207,238,162,245,10,67,57,188,143,244,217,221,178,208,200,245,206,91,80,63,59,202,147,71,163,206,217,76,77,222,141,184,181,147,172,39,139,143,131,243,41,172,158,176,118,251,146,116,180,180,83,30,251,117,40,172,189,243,32,251,245,81,76,120,36,216,134,204,104,152,83,239,52,204,246,5,1,132,63,73,214,58,235,85,183,174,227,118,60,68,75,72,62,43,209,50,179,24,29,58,103,13,235,147,169,185,172,147,196,196,91,211,111,78,159,132,253,163,96,60,112,53,102,77,91,201,92,5,227,113,157,183,144,190,244,235,241,243,163,164,159,170,44,65,207,160,148,98,73,9,154,240,122,138,82,93,63,120,123,21,24,23,61,65,196,158,207,32,116,141,164,183,82,90,99,107,211,215,156,245,183,175,197,220,29,243,104,233,47,108,46,110,4,193,211,169,142,219,207,71,220,56,154,133,205,221,207,207,244,26,241,188,29,217,253,41,11,151,211,156,87,209,243,85,220,99,28,217,184,245,237,13,167,247,217,152,197,229,209,245,122,122,72,218,112,88,240,42,36,173,62,125,235,131,127,15,
+115,98,32,181,191,215,18,44,173,91,122,190,174,106,89,203,235,148,105,79,38,147,245,123,183,206,252,254,46,159,189,53,119,76,27,175,94,235,181,167,63,153,112,175,227,181,159,232,77,217,85,108,172,23,183,139,3,162,30,187,202,100,28,117,116,55,206,72,122,226,49,199,109,82,245,222,101,190,87,198,250,126,164,62,180,149,220,221,178,199,204,127,90,238,251,173,71,25,180,155,246,249,173,107,30,180,171,206,49,100,125,18,241,26,182,121,77,150,230,121,140,163,33,15,111,193,126,230,131,71,54,181,188,93,244,167,77,60,169,98,56,150,207,19,67,50,235,139,157,213,156,71,243,11,163,19,226,149,228,246,67,160,64,137,165,161,198,116,239,8,80,215,113,59,40,241,10,25,45,210,227,28,65,143,252,173,62,119,159,233,173,246,3,183,89,94,202,250,17,163,107,59,239,220,79,179,27,236,243,203,31,245,184,85,65,9,205,29,39,229,105,38,53,111,74,134,104,243,29,135,184,102,119,158,128,206,253,236,191,175,146,176,109,114,101,73,58,183,66,151,229,184,6,72,231,74,
+118,55,111,91,211,246,189,241,141,178,95,49,124,31,41,128,164,125,142,237,45,105,12,65,61,120,57,199,46,27,171,66,0,159,221,109,215,203,234,160,159,10,82,123,171,16,23,1,16,195,109,243,29,125,218,25,166,10,9,62,1,35,255,86,234,107,108,63,145,135,242,19,159,233,208,99,90,255,198,99,153,52,49,217,165,23,159,54,105,34,149,108,218,166,240,74,98,45,241,70,1,144,189,120,194,67,216,124,42,110,151,110,8,209,149,172,13,62,85,224,151,31,219,147,181,17,110,151,150,127,158,26,58,224,243,49,224,159,105,200,149,195,211,80,77,168,17,129,237,5,180,112,215,143,142,238,248,132,62,233,76,65,197,69,142,205,222,61,60,166,151,63,96,90,131,243,90,123,162,100,62,211,102,192,104,95,7,135,200,133,29,43,128,43,113,76,31,43,41,119,108,175,216,222,97,229,224,15,86,115,23,123,102,84,129,111,2,20,217,180,169,137,232,62,20,179,199,221,187,155,175,248,177,232,42,184,206,172,110,202,99,33,12,177,200,120,221,44,172,36,185,220,10,236,106,24,
+77,62,185,213,201,126,213,180,145,228,14,30,97,64,105,226,169,25,131,124,123,137,83,168,188,170,128,250,126,122,8,117,52,63,140,252,1,202,11,242,111,106,140,32,52,251,196,72,178,28,82,248,142,213,213,120,225,136,86,219,146,15,155,6,125,31,142,156,35,99,128,149,67,238,64,209,94,31,80,0,231,65,159,102,49,53,198,112,100,214,134,46,206,59,242,227,130,124,95,248,141,250,62,10,93,83,255,12,155,204,164,185,239,182,98,75,43,185,189,120,17,125,88,49,92,140,221,186,49,229,237,29,184,97,20,151,152,176,54,229,80,156,37,207,117,45,33,107,207,5,182,26,202,62,223,234,107,183,68,178,209,152,30,25,245,209,210,81,108,143,54,207,66,242,144,126,171,255,133,44,104,238,102,24,220,238,102,214,108,50,228,144,139,221,14,45,160,214,228,30,0,119,206,164,41,183,45,213,252,212,18,84,230,174,224,163,245,109,154,64,255,174,112,187,84,95,58,106,19,151,140,126,104,173,152,58,142,175,111,119,92,224,169,250,110,240,15,175,253,102,230,214,217,118,31,235,
+178,32,5,229,198,185,253,101,99,93,19,15,31,149,207,182,178,110,90,143,236,202,65,149,67,126,83,114,163,86,220,180,188,151,182,231,77,11,175,219,221,11,55,126,69,177,206,19,104,111,247,155,242,189,253,109,249,37,92,99,110,15,211,229,5,75,0,80,151,34,144,215,176,196,187,167,70,165,160,105,7,175,157,164,5,231,60,14,56,67,118,115,67,242,251,183,135,147,235,21,213,217,204,92,208,130,121,192,217,97,22,32,109,36,166,62,61,42,155,185,107,221,176,160,151,79,76,236,182,44,115,141,237,225,60,114,69,145,77,83,179,36,39,109,190,99,218,6,226,17,92,251,121,17,107,163,137,99,228,131,75,191,151,211,127,86,244,221,140,123,119,222,69,5,87,84,81,177,59,152,93,73,231,163,101,49,191,105,238,143,41,163,178,93,39,213,247,74,246,59,121,226,114,109,17,30,218,158,27,220,243,180,206,251,134,177,219,123,23,187,253,151,169,107,249,44,46,239,181,123,51,146,72,31,151,15,194,210,145,70,129,188,230,167,75,205,160,123,149,143,187,186,29,42,75,15,
+238,211,174,30,150,173,179,243,130,203,106,68,32,157,52,176,113,65,158,26,247,246,131,243,86,237,32,107,147,86,14,249,2,185,2,84,215,183,153,68,126,207,207,139,6,238,230,186,172,53,196,95,100,61,154,193,223,72,190,62,23,255,239,78,157,8,195,250,150,183,144,153,187,15,203,198,83,109,219,237,49,207,239,62,30,48,98,13,181,121,110,193,26,206,130,181,18,157,251,95,154,168,224,7,232,28,93,191,8,238,195,97,244,139,205,228,173,117,32,65,178,184,147,230,3,86,217,164,147,138,79,140,58,222,222,55,54,2,245,62,193,107,252,115,56,145,29,165,145,199,185,211,45,54,251,18,27,34,248,79,24,171,9,120,97,120,14,32,203,201,191,120,143,17,234,252,200,223,224,254,109,163,198,110,87,130,29,135,75,118,247,98,170,11,109,113,95,125,202,27,94,228,49,229,37,235,13,20,31,151,67,130,13,167,247,183,236,30,172,250,237,154,127,224,84,94,47,230,141,230,209,115,159,92,86,238,229,108,217,175,37,237,86,74,224,108,220,162,243,68,54,105,57,72,60,172,
+192,247,152,250,220,184,13,186,16,89,175,2,88,137,87,167,24,114,41,94,189,32,2,183,134,78,245,130,77,143,62,49,249,17,136,80,244,118,49,85,29,161,91,241,147,173,132,110,4,109,230,21,186,147,189,98,208,157,79,200,150,70,55,2,182,142,26,221,202,84,57,232,75,45,62,109,161,235,193,80,244,113,219,242,68,151,185,177,255,181,225,13,91,201,160,235,5,182,190,179,252,8,188,115,27,84,62,102,24,94,14,241,170,104,119,40,85,215,70,14,221,227,41,52,106,48,112,113,77,34,131,147,170,254,68,110,98,163,128,132,51,50,96,244,228,183,75,66,211,61,196,112,121,146,238,96,55,103,74,186,5,57,83,126,24,30,234,108,65,247,60,0,51,22,195,131,152,173,27,116,15,101,214,160,31,44,160,153,147,225,64,189,229,78,134,1,22,127,108,232,38,30,2,118,189,226,249,36,172,126,173,27,64,112,186,187,140,199,153,188,134,8,40,111,232,238,248,89,132,2,138,219,77,46,113,170,183,139,20,219,14,241,17,36,157,226,167,143,101,145,176,78,128,69,124,33,
+82,153,126,2,89,204,22,233,92,191,180,150,234,197,122,99,174,241,192,160,150,98,203,81,74,51,86,103,144,99,213,112,61,95,140,53,189,181,99,172,73,76,218,145,241,239,14,20,198,227,245,104,109,25,155,214,147,53,118,188,236,203,51,235,241,166,119,110,35,199,171,193,24,48,230,246,135,17,129,199,158,58,210,69,41,119,130,60,72,69,60,153,16,41,101,139,155,109,69,180,61,45,35,214,35,84,195,243,210,5,7,183,37,203,241,237,4,131,99,106,219,99,129,83,125,52,174,149,255,209,70,247,142,163,159,175,1,136,1,197,39,66,91,73,212,144,48,51,103,250,39,49,27,71,127,143,197,58,39,6,107,159,165,210,195,182,197,126,56,212,240,217,0,176,73,165,234,101,244,112,50,77,104,33,150,138,97,197,193,183,82,237,167,216,106,235,91,139,246,44,66,163,1,108,150,135,22,145,149,11,170,113,98,235,192,25,139,67,157,13,83,30,10,118,49,110,191,80,88,131,250,163,59,96,117,23,153,226,128,213,63,108,198,76,93,55,248,230,177,251,245,243,76,66,213,217,
+201,8,230,132,158,139,84,247,145,102,73,103,32,94,62,74,102,228,216,216,166,241,66,156,185,107,193,168,106,170,200,173,5,189,112,232,189,90,42,186,70,239,134,174,37,142,244,98,176,99,63,107,188,4,69,39,248,85,223,178,113,84,103,197,222,252,8,85,108,220,83,160,38,5,66,218,167,65,133,127,236,170,76,208,243,5,65,7,200,84,253,208,158,180,148,249,54,100,184,36,19,104,194,51,78,98,145,191,212,225,5,9,217,194,23,155,40,226,149,108,229,91,206,164,72,103,174,137,81,247,185,212,229,32,254,254,38,99,249,91,252,45,168,82,121,82,125,81,140,51,15,158,109,168,140,110,139,255,70,101,244,27,211,161,158,164,183,18,42,99,202,39,27,220,237,69,37,157,218,140,135,20,145,138,62,42,97,226,230,244,124,178,232,244,138,57,224,141,254,224,25,120,131,240,31,224,129,197,172,84,143,87,171,69,191,161,27,3,200,124,225,140,62,13,129,74,18,214,69,159,167,143,157,241,20,172,83,210,237,130,20,31,53,121,127,163,68,181,61,25,181,4,162,72,120,120,
+214,47,192,136,25,178,204,88,64,199,20,52,9,229,77,70,22,22,192,243,177,94,145,204,55,16,245,246,252,167,204,247,80,79,193,147,108,227,123,145,230,45,86,190,3,188,91,126,42,86,145,7,116,106,201,0,155,200,10,55,127,228,163,13,216,28,240,131,19,162,247,112,74,80,198,243,167,103,50,100,52,231,202,200,137,36,25,59,244,38,235,81,89,81,35,32,44,244,169,220,222,155,113,72,96,24,69,191,42,49,254,201,232,221,76,185,57,165,200,141,2,156,193,130,81,194,249,224,145,141,214,231,166,109,37,111,158,115,246,162,60,62,208,223,127,36,104,139,81,170,152,46,117,144,191,5,121,12,61,21,132,76,90,210,135,217,159,137,204,179,27,72,164,198,87,150,190,200,62,125,84,232,72,23,3,55,193,40,81,63,7,239,197,93,72,4,91,38,22,177,145,9,199,69,193,144,141,68,92,144,239,206,101,66,166,84,129,218,142,86,143,166,234,174,122,166,160,106,198,179,186,136,170,9,62,64,117,214,38,223,70,159,169,38,107,82,232,230,172,56,211,141,46,244,160,37,
+47,186,35,90,155,188,232,143,222,58,19,150,115,192,199,61,83,17,199,223,145,79,3,25,153,23,93,129,21,210,60,213,14,217,207,200,137,220,183,106,20,103,144,19,85,98,19,219,132,160,20,53,75,53,252,156,143,203,186,168,147,202,56,61,11,217,222,207,93,98,214,9,8,55,125,250,249,243,124,205,228,65,208,230,220,105,214,162,139,186,151,27,120,79,192,84,116,138,68,190,102,27,144,95,78,145,31,185,52,4,82,138,62,15,75,11,231,212,113,136,69,29,48,205,90,55,44,236,12,225,160,42,27,29,144,37,195,129,60,50,100,103,82,190,108,63,164,92,50,224,238,67,48,38,147,49,151,232,246,127,201,195,33,159,81,68,165,120,206,104,74,125,136,156,64,55,101,170,182,69,54,152,251,34,215,89,224,222,145,163,85,224,197,50,94,234,233,38,248,185,59,239,206,124,7,242,110,175,143,23,190,23,231,46,190,166,28,223,134,239,96,193,114,110,116,134,112,100,97,5,47,182,88,90,253,190,19,213,197,41,55,114,18,129,79,133,159,12,159,88,135,38,236,9,138,140,
+90,50,124,35,33,115,42,189,34,106,4,133,117,106,250,71,175,229,218,49,41,234,114,72,146,72,44,70,154,28,178,83,163,103,35,255,80,228,72,19,27,57,231,185,132,223,59,205,190,96,225,81,188,30,44,65,199,232,22,35,232,231,79,163,42,77,126,73,88,58,111,17,88,43,167,140,19,55,128,132,106,226,15,33,64,27,6,249,144,65,249,24,214,31,6,207,193,115,85,126,26,226,51,112,101,180,48,73,202,103,194,210,61,167,149,58,26,243,201,88,216,139,3,1,209,72,149,174,9,237,237,209,229,68,223,132,20,153,233,218,120,248,234,142,176,116,237,34,120,55,78,89,186,6,15,134,180,162,47,125,195,51,45,226,212,183,65,187,72,27,125,233,61,191,68,53,16,157,19,152,234,160,244,168,206,133,244,235,209,7,172,232,3,116,147,166,37,110,192,10,230,20,76,176,236,47,22,234,163,105,146,42,202,3,238,98,133,162,36,251,17,53,65,253,170,26,121,138,85,68,149,160,79,24,161,154,244,90,28,162,150,78,45,123,247,167,178,88,191,218,56,122,206,234,249,179,
+147,97,48,169,64,169,98,121,153,193,246,103,31,245,222,198,234,88,254,108,103,189,45,216,66,145,196,56,231,14,104,77,99,156,33,103,62,133,181,164,42,56,102,26,58,105,98,216,18,179,11,55,249,0,241,66,118,231,206,178,176,249,203,220,253,9,238,242,232,168,146,40,206,115,167,81,1,233,107,77,92,222,229,83,105,15,15,224,247,168,17,59,125,212,19,177,113,113,129,36,169,19,170,35,71,200,88,169,179,52,48,181,122,170,210,107,121,0,7,12,125,19,216,62,81,212,134,190,10,21,132,177,170,115,95,143,226,28,220,244,77,248,201,51,142,31,122,239,87,205,223,75,97,7,103,112,81,132,161,115,131,67,155,68,170,210,121,16,121,57,58,243,61,168,2,253,242,251,68,158,83,6,173,108,14,146,96,82,214,234,144,178,185,197,52,203,42,194,50,44,53,119,39,78,50,139,206,252,77,184,73,134,204,154,245,39,240,44,143,45,250,135,18,147,173,51,234,126,200,119,38,114,209,35,35,49,151,66,3,87,79,95,224,61,252,118,163,166,54,13,234,109,242,22,45,252,
+162,203,206,59,2,147,34,112,99,79,56,152,24,102,119,65,145,76,23,36,150,21,113,170,56,0,232,13,148,177,202,18,241,115,195,5,41,185,149,63,249,210,95,44,140,215,4,170,49,147,64,11,156,3,63,138,164,57,92,152,207,13,134,72,104,162,62,17,182,113,102,164,84,202,168,79,134,143,42,222,1,152,66,233,10,178,200,222,78,85,234,45,77,76,137,169,42,247,194,102,238,2,83,221,4,142,119,99,185,161,111,67,197,167,179,234,210,119,163,88,139,86,117,227,191,243,172,229,135,222,243,85,242,11,84,216,222,137,158,20,161,171,220,224,222,70,253,141,135,23,113,147,167,50,224,65,25,56,147,75,38,42,157,38,40,99,139,144,50,180,82,47,11,120,153,250,22,243,56,207,105,70,169,25,135,121,154,154,248,198,50,124,78,74,164,101,60,11,63,23,232,151,135,156,70,53,151,113,97,199,232,139,65,68,154,181,82,13,224,78,199,212,68,125,66,136,224,190,168,107,112,1,129,151,132,250,118,63,190,168,168,168,238,99,58,232,164,186,137,193,40,49,110,7,88,227,
+136,33,10,197,158,39,234,156,63,249,18,184,228,73,85,222,224,239,133,1,230,137,169,153,47,29,251,114,109,29,48,69,66,5,52,228,219,6,21,16,232,225,1,27,22,175,3,37,113,186,164,75,245,67,111,80,106,173,58,30,119,25,176,18,160,12,1,87,181,193,177,221,162,76,235,90,144,213,124,89,81,244,173,88,39,166,186,154,133,214,198,115,67,215,73,34,95,231,229,165,235,245,144,30,127,4,228,189,214,158,31,58,231,87,43,224,95,98,123,23,122,131,41,170,114,195,103,186,165,17,213,219,1,167,184,42,150,29,148,128,35,57,181,62,209,201,130,46,182,113,187,79,41,117,234,208,119,2,57,152,163,231,58,25,50,236,197,186,239,71,150,32,183,30,206,72,204,52,123,106,18,149,129,9,37,63,177,82,205,162,30,80,207,142,165,158,13,94,84,213,174,35,73,138,102,198,45,131,56,98,37,3,193,244,236,159,251,181,168,15,221,154,227,98,11,50,242,33,42,210,49,110,179,152,32,29,58,99,81,19,99,161,195,13,43,98,51,97,133,143,18,18,18,99,25,179,
+46,88,195,36,164,250,77,51,125,240,23,24,46,149,119,7,208,161,221,111,68,192,6,36,201,82,3,137,14,21,117,17,80,67,178,170,168,79,68,29,164,29,107,185,220,235,211,209,147,6,239,20,46,81,250,72,7,16,76,176,203,131,145,14,26,61,217,52,209,233,78,148,97,109,235,64,119,177,204,182,244,76,32,150,148,99,91,5,102,86,91,230,177,171,195,138,239,17,27,219,61,226,163,193,148,141,235,223,201,176,81,213,214,134,13,34,150,217,107,255,131,116,22,171,148,84,183,129,76,51,150,9,181,78,19,85,0,147,9,135,74,161,211,70,84,208,89,177,158,154,255,246,149,100,128,32,244,200,202,255,44,2,86,198,138,106,42,212,243,203,160,27,83,42,156,201,206,220,50,36,192,163,236,85,240,129,208,68,77,153,241,201,209,33,81,23,61,92,75,222,228,38,125,79,80,1,74,217,26,191,96,4,222,21,10,92,221,88,209,171,75,245,254,36,212,7,57,54,56,146,48,253,140,133,14,24,5,112,147,105,3,59,125,146,71,229,243,161,253,194,15,225,152,55,250,131,
+64,245,155,69,173,139,6,104,110,153,117,231,210,239,221,225,13,183,195,75,4,116,200,119,143,139,8,155,168,59,122,85,220,229,128,211,200,145,101,86,29,119,105,16,223,11,139,189,217,200,221,115,21,62,48,176,169,131,145,137,56,41,217,180,254,233,72,173,89,236,106,95,250,133,164,105,29,56,32,148,202,202,182,142,158,96,78,141,115,219,194,44,184,154,230,165,231,224,85,64,43,27,55,116,194,107,96,169,157,29,152,212,55,177,181,193,19,56,33,217,56,201,192,204,132,21,219,168,179,254,22,10,51,44,147,90,189,210,103,33,54,20,158,165,66,175,241,43,168,179,100,93,53,215,105,163,102,21,160,24,65,179,116,229,121,68,7,121,149,143,192,122,126,54,152,57,235,54,206,244,40,44,67,18,22,26,146,255,133,154,213,13,161,201,211,49,206,121,148,164,243,204,148,22,158,174,108,53,47,255,108,7,185,18,96,21,40,89,4,75,177,77,9,24,247,47,125,28,116,180,175,163,130,130,136,105,54,188,129,58,218,135,28,3,119,22,82,125,154,72,17,128,17,255,128,75,
+185,162,47,13,195,212,131,166,84,222,18,170,248,168,238,40,186,169,59,138,124,85,22,201,155,2,146,245,184,72,0,60,2,199,202,249,106,180,75,194,93,87,194,115,188,42,237,139,240,216,129,36,83,179,225,70,125,54,46,41,208,212,195,54,234,192,1,180,102,41,54,117,100,165,94,115,22,219,206,215,35,226,178,88,6,122,8,78,125,45,44,163,3,24,215,185,155,52,49,19,174,235,210,79,255,150,84,175,43,59,84,27,224,185,176,157,13,200,121,228,155,184,222,155,237,182,254,6,43,176,50,113,52,191,193,234,239,161,43,154,129,157,220,41,124,35,57,49,154,96,43,116,52,109,68,3,109,212,151,157,63,64,165,0,36,135,17,21,83,183,137,168,144,12,18,21,221,208,47,81,65,62,199,141,61,58,81,185,117,72,137,194,228,154,32,138,131,60,253,225,203,14,122,14,106,202,203,230,27,236,250,36,103,160,52,198,8,19,78,60,27,250,130,102,25,220,92,43,197,142,43,248,45,93,207,153,188,16,3,29,123,155,10,82,146,174,5,82,204,106,116,12,204,206,133,166,
+162,251,223,48,1,16,154,240,78,149,124,37,20,11,149,215,235,170,82,176,65,95,182,14,71,181,222,20,5,196,16,36,107,202,173,175,92,252,1,94,146,175,74,4,116,136,160,133,232,20,78,151,131,93,204,167,175,35,164,100,118,97,155,137,255,214,163,21,118,243,160,218,42,125,110,248,101,52,188,170,162,3,49,87,185,218,54,65,149,186,171,140,26,152,1,155,244,117,115,139,60,148,237,198,182,61,192,94,50,207,115,207,232,97,241,220,215,101,112,50,247,182,97,91,15,252,146,233,185,112,221,23,121,67,31,92,57,209,5,184,205,148,238,92,144,201,204,85,79,108,101,225,23,122,173,25,217,40,131,58,96,193,23,107,74,182,202,224,39,14,42,170,177,39,219,207,120,208,249,106,137,44,24,70,213,212,43,161,71,168,53,85,77,183,246,234,88,95,220,25,225,208,207,66,82,7,162,153,130,168,173,38,243,40,207,203,3,176,59,113,133,52,197,243,142,7,190,124,51,165,36,183,53,137,41,201,217,0,80,80,254,7,247,137,133,240,253,70,238,122,130,223,48,219,26,223,
+62,116,163,86,89,88,21,27,28,19,203,188,162,158,11,41,53,85,85,90,95,0,131,0,199,23,36,93,222,85,64,17,1,104,164,78,159,13,100,40,20,0,112,151,208,235,232,238,18,132,0,141,53,78,186,115,48,131,80,180,225,50,160,10,30,72,3,96,15,27,38,99,15,182,36,100,212,78,160,13,155,177,226,46,29,85,147,46,215,165,107,191,139,69,141,125,188,118,116,165,12,220,14,224,166,116,85,69,38,79,181,103,177,109,125,109,170,145,167,117,96,133,120,145,171,235,42,186,129,189,59,206,109,3,211,225,62,43,231,190,149,231,5,93,199,156,208,6,255,134,237,198,78,96,71,255,196,13,158,15,96,135,116,101,7,122,19,147,71,124,165,245,143,47,168,214,224,74,236,42,42,159,136,136,83,52,91,202,157,210,111,166,86,142,142,230,124,171,137,202,13,128,104,132,253,139,56,101,68,3,97,149,85,13,181,126,30,52,112,14,88,123,202,161,159,5,108,168,66,48,23,221,10,146,44,95,70,237,48,77,43,34,96,11,98,9,215,41,83,16,65,116,19,164,15,51,
+8,59,60,56,50,37,121,137,23,235,192,241,160,126,174,95,230,75,68,148,193,83,108,19,7,246,156,174,5,246,176,101,71,6,215,189,30,91,220,209,1,193,49,123,57,25,72,81,156,140,203,130,172,202,6,34,16,212,12,45,215,171,243,204,64,128,178,123,198,80,61,157,57,232,67,229,148,238,248,92,181,245,103,72,187,25,102,105,87,239,61,34,13,30,132,99,123,182,68,184,203,198,36,85,26,7,194,38,238,113,129,209,46,147,203,184,142,123,20,57,232,194,109,67,174,100,117,175,129,222,236,159,229,69,223,202,252,152,175,90,127,240,227,6,176,16,213,66,200,71,5,90,136,54,18,198,199,1,175,191,183,5,26,224,1,111,38,187,67,15,240,66,186,226,125,185,32,152,43,217,194,1,248,40,194,22,241,237,128,219,12,126,139,252,20,175,13,90,183,131,236,48,158,141,196,86,29,181,2,121,153,132,75,25,186,150,6,129,26,40,170,230,158,108,184,202,160,252,181,16,105,108,105,155,117,240,131,30,52,81,88,117,213,220,107,48,176,105,88,153,83,61,91,250,121,8,
+131,14,212,59,90,208,227,188,40,72,150,96,150,85,221,52,203,153,21,17,148,33,141,52,145,146,197,239,228,224,201,188,141,115,94,144,67,254,243,243,78,165,167,10,222,214,205,231,91,248,189,61,222,187,103,233,249,31,216,23,239,66,176,225,130,43,162,99,93,220,113,32,11,151,170,73,237,187,232,19,177,203,38,239,125,35,69,142,33,182,94,93,12,180,40,14,199,99,129,86,233,3,232,10,73,97,148,169,85,122,125,48,195,153,141,22,195,186,122,235,109,80,65,211,87,198,111,131,245,137,61,236,130,188,214,219,162,209,30,1,62,49,180,229,220,171,116,192,65,100,45,29,143,253,58,30,84,224,152,143,225,137,66,84,253,61,159,2,88,33,217,168,32,254,9,188,226,79,73,74,63,11,209,14,108,45,78,160,149,100,32,225,91,65,240,82,50,212,10,30,72,120,45,27,3,4,176,42,226,158,142,23,129,217,76,241,149,238,143,34,60,72,255,54,14,252,173,71,64,76,62,17,152,68,184,116,65,31,3,48,186,86,70,221,14,162,67,241,148,104,215,114,183,136,186,112,
+14,237,211,213,220,173,193,127,162,162,117,218,102,30,144,234,192,164,50,179,178,225,204,131,28,246,5,59,139,56,213,99,15,67,237,18,253,52,70,75,114,100,198,139,189,152,211,179,114,168,77,243,162,34,140,114,28,210,10,147,60,111,3,211,160,225,31,237,247,154,171,53,27,101,156,76,250,187,168,136,230,205,123,0,210,192,95,222,195,175,145,192,62,164,53,182,219,166,159,45,96,136,58,193,7,217,221,38,109,153,192,10,26,235,154,116,237,95,184,26,209,53,220,85,66,45,72,200,122,106,154,118,45,100,28,165,209,220,109,172,62,117,136,38,33,176,99,91,181,218,221,64,56,102,203,193,82,117,244,39,64,183,5,134,109,219,110,61,182,0,158,132,175,133,77,145,116,11,143,24,169,218,43,205,69,218,198,253,82,140,187,131,126,26,182,89,129,132,143,251,2,2,81,112,188,74,50,181,251,149,136,239,118,122,203,12,148,9,60,3,55,135,1,175,133,174,35,74,168,134,91,68,135,95,46,40,21,182,224,175,51,222,66,211,189,192,223,28,254,146,223,131,225,241,156,200,
+17,156,215,135,70,81,2,199,119,36,230,206,197,95,188,154,192,120,112,33,144,193,55,35,91,160,221,79,1,151,136,85,95,184,107,6,152,193,63,163,126,7,214,113,123,78,156,171,169,91,132,95,72,247,118,250,106,233,230,145,219,7,107,189,178,153,6,197,38,160,40,197,182,170,102,16,167,42,180,229,70,253,176,20,194,25,155,88,179,220,56,197,18,168,239,60,211,180,224,34,75,210,5,102,105,150,19,248,9,228,251,109,62,148,183,124,225,52,91,49,201,153,33,241,4,226,7,125,207,25,1,162,55,74,243,75,101,40,7,44,146,202,248,184,93,77,234,49,11,124,70,237,93,47,244,131,184,166,245,193,13,245,125,216,182,14,240,77,255,73,237,138,80,104,171,162,205,188,206,112,61,49,72,202,229,66,77,87,122,111,13,116,50,126,214,84,91,189,223,199,132,81,234,204,217,102,239,78,166,96,145,50,195,181,101,175,221,57,174,129,95,171,5,87,240,128,130,184,76,209,158,221,85,210,101,49,208,29,197,123,6,30,6,136,244,116,87,227,191,93,193,52,162,11,141,31,
+137,192,26,254,145,34,52,59,225,101,162,133,171,195,8,192,43,225,211,216,107,32,17,157,200,21,43,60,103,136,122,20,220,29,90,234,196,125,30,225,129,176,1,99,33,129,16,75,218,69,193,112,81,136,45,234,7,108,61,41,220,27,190,6,102,129,36,92,41,94,210,209,189,17,60,65,40,249,240,245,248,148,34,40,129,193,168,31,252,79,178,59,230,0,78,96,83,183,115,131,119,72,158,223,208,194,186,69,224,69,217,94,113,175,166,65,27,208,144,86,52,28,219,177,7,198,154,187,62,26,135,99,57,18,171,197,94,220,9,89,101,198,38,102,174,31,50,110,1,233,251,111,26,144,57,194,32,232,73,241,35,231,22,157,96,230,47,116,111,223,115,46,197,40,163,51,35,225,80,34,154,179,28,250,21,154,191,58,216,175,28,90,40,62,90,7,226,222,60,16,40,74,116,69,177,221,56,248,21,200,133,150,191,116,76,150,228,31,93,0,36,88,214,213,30,176,94,201,187,126,157,101,251,74,156,86,224,137,88,175,244,254,10,107,21,215,219,229,107,189,59,131,181,96,160,53,
+214,102,31,84,230,64,165,83,211,182,161,110,125,194,215,68,215,118,8,93,162,45,34,96,69,82,189,215,39,9,17,91,10,116,24,62,26,104,52,192,51,130,111,92,14,216,15,160,240,20,146,133,141,211,81,192,90,201,19,163,33,44,224,85,95,40,98,19,90,73,118,72,108,229,11,173,164,115,88,222,185,128,215,211,63,92,225,5,75,112,243,166,160,16,79,241,125,199,231,163,112,15,51,241,163,255,141,243,169,2,148,145,66,28,225,158,104,34,136,67,84,226,174,8,133,27,132,9,132,118,205,119,17,117,138,128,2,72,40,225,235,201,41,71,40,56,129,173,248,102,44,148,35,1,210,224,95,188,118,128,29,165,103,117,205,154,6,45,64,5,198,157,113,174,199,30,84,211,101,6,104,70,14,246,232,136,231,122,81,39,102,85,22,155,234,133,126,6,37,55,166,35,38,70,65,150,229,128,52,167,250,207,172,32,86,102,48,72,51,242,135,144,44,138,147,163,167,226,123,92,124,35,70,36,59,212,136,45,116,30,231,239,141,133,127,70,9,134,121,175,153,255,153,124,233,112,
+66,2,38,106,130,228,209,204,192,4,239,248,202,217,125,1,50,60,47,12,81,84,93,12,208,12,47,8,132,49,156,15,4,196,32,66,58,177,143,253,73,62,121,234,173,209,159,197,118,166,143,39,123,183,11,52,174,16,109,197,213,220,253,242,206,32,43,235,117,1,197,59,132,223,138,246,198,146,79,17,2,46,210,1,32,252,111,96,17,145,145,142,191,73,191,229,130,29,156,31,145,202,177,171,33,192,161,145,244,192,88,41,212,211,8,230,234,252,2,97,174,199,142,18,161,21,111,53,82,232,171,208,146,239,26,75,245,78,68,43,24,95,182,251,23,194,227,75,90,5,133,184,194,179,78,172,143,194,221,145,229,78,215,207,226,31,68,122,209,25,98,75,36,96,122,1,36,204,226,91,145,31,251,87,158,18,42,17,107,97,221,208,76,48,131,43,68,95,59,90,117,247,48,240,45,19,190,250,254,70,116,3,99,96,3,62,23,235,30,152,47,203,179,177,91,44,124,86,18,79,227,242,161,73,46,31,71,83,113,56,90,211,173,176,69,176,156,31,245,229,212,44,8,51,144,227,
+36,51,53,51,77,196,126,250,29,52,63,209,100,69,65,25,197,196,148,20,37,121,65,88,0,132,144,246,4,45,103,129,201,140,191,121,56,16,191,254,100,62,215,5,146,191,212,42,109,231,131,96,72,144,254,198,121,63,29,202,182,66,41,94,79,129,51,250,161,148,184,47,232,161,224,136,78,192,102,232,205,9,224,153,176,142,140,209,204,4,143,32,2,102,226,201,253,8,28,226,47,131,243,13,252,48,137,119,3,242,88,176,131,208,13,124,173,149,239,245,245,214,157,12,16,90,171,199,115,189,142,6,44,112,71,246,238,125,129,67,4,122,48,231,154,248,17,224,111,18,19,74,149,129,116,170,192,30,206,201,138,132,95,49,161,176,136,66,212,51,63,9,97,179,66,114,83,233,167,208,118,201,63,139,244,44,132,185,17,104,90,250,22,146,213,74,186,182,66,27,137,235,173,221,61,224,157,108,248,9,232,227,8,31,186,248,42,10,241,196,111,186,116,23,69,120,253,79,57,160,159,37,85,2,77,249,112,55,129,43,69,22,182,190,138,236,43,16,114,33,205,193,156,50,133,224,
+185,19,161,18,25,184,112,168,32,192,66,44,132,42,134,41,143,18,168,193,38,34,161,25,201,57,1,28,112,230,216,239,64,58,52,207,168,11,106,31,111,133,217,221,15,115,174,52,38,103,50,55,14,41,69,234,179,196,212,40,12,131,255,7,9,87,217,156,76,179,5,255,58,14,139,203,226,238,238,238,182,104,112,135,16,18,44,9,26,220,229,242,188,151,174,153,154,217,218,47,187,61,231,116,119,213,22,114,38,64,98,57,56,229,191,88,80,72,115,94,106,191,149,97,16,212,229,117,117,141,172,164,186,1,99,130,87,110,167,218,183,90,97,102,157,169,21,138,95,53,77,250,51,143,178,162,157,226,57,73,74,145,161,239,63,247,152,85,14,156,57,28,104,2,21,101,23,81,89,77,192,177,212,89,154,70,196,148,213,128,154,172,34,229,167,131,50,34,206,162,82,117,193,213,54,102,212,1,118,85,142,69,19,226,100,216,152,16,183,87,49,32,38,213,141,8,226,72,7,69,154,31,17,35,114,119,96,21,15,83,159,48,42,34,129,74,80,5,191,249,180,65,10,224,232,22,
+220,155,212,32,92,229,10,50,27,144,83,234,196,11,77,76,198,166,217,5,36,14,19,50,201,14,36,197,122,6,188,23,111,201,251,192,77,179,160,81,70,137,98,174,94,99,1,127,54,211,205,15,68,244,35,133,238,16,43,144,10,33,66,49,161,102,82,105,159,47,91,177,210,201,140,93,19,1,49,20,34,217,218,230,0,148,10,22,125,181,197,160,108,244,255,250,70,136,238,209,13,116,126,192,40,117,177,56,190,239,193,20,88,74,116,52,174,70,37,227,3,191,42,119,0,109,105,196,58,212,132,147,209,137,166,177,209,190,16,181,167,225,30,95,248,20,219,44,12,237,46,132,127,109,25,187,88,154,29,190,202,32,103,103,112,243,100,71,187,252,251,22,68,58,247,172,26,183,10,206,178,36,107,29,83,99,206,202,202,188,146,197,116,79,65,125,73,149,230,126,157,179,236,178,141,82,229,218,61,78,18,67,188,61,12,118,102,57,194,194,254,30,215,197,100,41,69,64,68,199,208,159,234,135,195,184,102,0,226,100,215,32,31,124,51,212,111,130,128,209,154,133,116,116,125,212,
+106,96,89,125,208,47,3,28,166,29,214,242,55,84,122,167,142,19,32,137,86,119,65,29,198,36,141,106,217,105,38,148,159,182,148,21,56,234,126,15,119,243,225,246,202,26,133,10,139,196,16,0,89,166,1,165,95,150,152,12,32,69,45,96,170,37,235,103,32,180,130,206,141,214,88,101,148,23,250,161,85,35,115,50,205,154,128,140,234,101,82,185,214,103,90,111,177,147,143,238,166,122,0,8,158,87,44,148,19,126,166,254,158,233,101,54,38,250,231,145,26,96,131,119,133,114,174,30,75,180,216,244,200,155,203,210,42,100,186,107,35,0,25,10,129,130,52,6,51,234,140,73,250,227,5,71,118,5,147,102,169,21,42,104,128,169,64,52,104,173,124,140,4,96,157,80,147,214,44,118,121,72,43,130,4,57,104,210,143,92,141,80,54,66,104,23,173,92,56,249,251,116,33,206,7,44,100,40,35,66,138,51,69,124,8,241,239,78,30,103,31,196,215,78,224,119,175,168,11,33,150,155,247,241,187,81,85,203,52,204,117,186,208,82,236,210,2,190,67,152,250,115,26,151,42,75,
+205,90,238,186,157,166,41,203,145,144,118,29,168,43,203,214,197,73,187,144,255,25,181,12,133,220,240,4,145,219,119,158,236,86,48,254,194,154,146,9,49,195,200,140,121,133,193,156,254,195,0,53,111,50,4,144,85,52,53,116,73,52,86,25,184,246,64,83,221,195,157,122,140,65,14,103,151,20,172,248,22,127,176,192,173,85,146,36,192,97,203,62,184,192,65,157,69,106,204,75,89,16,216,41,99,20,20,238,25,67,2,20,89,196,192,41,227,100,52,41,187,143,147,225,8,202,128,92,132,83,200,170,184,44,81,238,99,112,230,131,173,31,200,171,77,212,211,184,15,153,213,125,52,160,255,77,119,227,21,31,189,97,102,4,104,163,188,98,94,146,142,245,218,247,204,199,32,58,53,85,142,12,223,59,214,113,87,44,212,139,8,108,130,205,248,115,157,229,191,151,125,32,58,216,195,151,211,91,128,147,181,58,163,151,58,193,26,217,174,96,209,58,133,172,1,173,101,42,106,180,46,53,191,33,101,156,3,250,126,150,54,168,165,240,83,33,57,224,227,102,42,151,28,221,106,12,
+58,192,146,44,215,9,211,100,153,47,11,252,201,12,4,26,10,243,50,117,204,220,15,53,36,132,59,174,213,101,234,131,111,54,246,28,167,178,115,30,101,248,73,38,7,219,87,250,130,130,200,125,242,80,235,148,134,9,39,21,93,255,174,241,74,125,27,228,13,141,125,130,182,45,171,197,40,117,130,6,114,0,34,212,99,175,245,71,60,180,123,93,66,185,134,225,181,125,63,8,18,56,248,89,219,175,113,103,52,202,240,219,148,236,137,90,45,35,195,45,100,231,170,202,55,67,246,134,71,248,51,89,133,158,102,200,100,108,174,140,79,193,165,58,70,16,93,11,124,43,232,29,250,111,30,97,4,202,7,133,135,254,151,11,100,9,235,37,116,166,254,76,51,6,183,53,4,93,100,180,97,49,7,43,71,97,16,150,193,140,141,52,90,154,76,22,3,40,146,134,140,151,246,200,232,56,78,65,229,99,114,118,131,111,59,240,38,13,81,80,40,4,29,159,54,168,38,17,111,70,159,233,229,55,183,78,165,65,179,193,107,136,188,98,169,90,232,39,245,247,244,103,244,82,168,132,
+142,180,16,150,24,28,37,230,242,33,140,139,205,140,60,80,178,111,35,211,77,107,34,113,56,18,72,184,67,5,87,157,126,165,184,36,192,85,42,196,82,118,144,184,219,84,244,105,161,94,97,196,215,166,149,221,44,173,85,42,201,163,216,133,206,79,79,21,218,56,0,125,211,81,29,156,224,79,105,34,181,14,3,149,15,183,4,25,245,4,76,1,69,60,31,50,223,52,62,193,73,229,156,195,70,210,65,252,238,213,137,54,229,91,204,11,78,54,106,69,25,137,113,79,63,132,154,173,170,65,227,93,239,186,133,214,166,170,208,35,217,173,46,167,117,203,248,57,152,221,7,78,171,72,89,102,226,44,104,183,211,10,156,97,19,136,139,87,107,91,192,45,244,129,134,192,23,150,225,140,154,68,192,130,10,232,88,187,139,158,106,197,236,0,5,181,168,190,187,38,132,116,134,45,207,195,29,227,138,178,150,174,42,242,252,90,36,88,33,165,157,170,122,25,4,9,21,67,218,250,45,77,144,71,88,186,144,147,62,168,50,76,197,113,66,15,100,118,178,50,22,135,250,164,223,50,
+56,73,35,68,61,125,13,98,56,24,65,217,128,230,30,43,140,6,165,232,194,68,173,64,44,175,33,5,157,47,137,117,121,107,46,244,19,167,81,223,6,161,12,218,163,48,202,189,28,144,25,87,24,100,123,210,100,166,73,191,23,47,201,138,155,66,179,162,137,139,209,252,164,222,98,185,254,116,247,146,111,244,108,7,154,51,37,54,32,71,66,217,44,109,105,191,186,123,182,49,93,219,10,212,61,221,176,171,142,132,42,61,202,64,174,188,246,245,228,183,204,203,101,142,26,244,242,87,34,233,228,58,21,77,56,189,151,234,4,39,36,166,194,69,151,149,160,205,202,158,49,42,156,244,150,39,25,243,175,23,208,30,65,109,102,230,108,43,149,74,42,239,18,21,102,148,250,227,17,202,58,241,9,143,32,117,114,26,145,78,0,241,123,80,103,216,201,155,152,23,208,28,21,5,171,176,211,156,10,181,107,172,172,3,215,249,117,11,177,198,34,235,34,108,85,105,129,83,157,70,0,17,95,237,244,42,51,25,39,181,160,217,118,225,195,77,87,240,17,161,181,5,34,119,65,10,
+8,60,20,25,21,167,100,55,68,226,24,239,97,69,135,191,133,224,241,174,142,183,229,25,222,52,221,216,217,190,25,222,53,44,231,181,177,169,90,94,78,197,227,242,70,191,111,12,105,10,35,229,38,85,35,14,109,25,245,49,131,19,151,226,157,246,29,89,243,24,19,147,194,71,27,79,163,58,181,182,167,104,158,168,131,148,45,156,1,224,10,44,13,140,85,232,26,64,70,143,167,113,115,181,148,126,210,12,228,118,128,240,210,185,22,42,53,160,227,138,74,169,80,11,229,232,246,76,86,249,237,21,191,238,102,209,194,62,129,131,169,48,170,60,119,35,119,150,110,69,214,223,42,155,155,225,100,2,134,197,104,33,185,170,205,109,127,166,23,47,244,14,155,3,99,11,19,32,181,35,129,234,7,231,77,1,153,96,114,185,222,20,239,212,43,94,80,29,129,25,106,53,91,224,110,178,222,180,86,237,71,204,179,127,54,125,90,167,210,99,218,134,142,109,6,141,106,72,70,57,114,145,79,242,36,197,75,88,99,89,189,71,187,80,184,105,175,99,50,192,2,66,197,142,198,161,
+172,169,132,175,88,83,230,16,150,119,80,69,4,43,188,115,22,47,66,28,19,64,234,197,169,34,23,222,125,178,146,71,177,187,203,223,52,160,221,75,182,73,210,148,173,19,104,10,59,73,140,188,225,103,105,6,207,48,170,229,42,249,73,129,107,4,138,212,121,167,87,154,89,59,201,18,237,118,7,164,70,158,183,0,44,110,247,122,132,14,36,163,125,12,23,104,0,196,170,9,196,177,199,243,80,61,62,111,78,113,51,244,23,214,240,252,60,172,0,24,229,212,63,46,162,151,144,166,201,127,0,159,55,59,210,211,140,137,132,139,220,190,140,248,116,212,56,198,226,182,89,163,74,155,49,126,83,5,185,109,242,200,199,152,100,49,175,132,41,26,157,104,75,95,222,103,158,60,20,104,41,149,5,117,44,90,105,92,129,79,147,228,74,129,17,196,209,229,105,178,74,165,197,40,90,244,97,154,75,84,75,105,168,17,125,84,205,100,37,94,194,8,18,84,54,105,163,196,56,195,237,6,149,38,213,202,192,19,157,35,147,124,214,10,182,249,153,94,238,112,99,109,92,52,187,80,
+144,18,142,150,178,163,219,219,184,102,222,83,189,199,230,66,166,31,113,129,248,104,39,148,62,57,231,84,166,22,142,62,50,155,34,173,113,228,5,232,155,108,230,203,31,239,113,207,227,17,162,65,125,207,44,153,94,74,125,84,163,86,223,14,223,194,246,126,228,164,214,75,233,239,151,135,25,57,18,84,83,41,219,225,107,249,11,197,142,218,213,170,226,90,2,148,142,172,164,73,61,185,208,242,13,126,249,56,85,16,239,194,117,128,248,4,144,183,161,170,2,151,143,58,48,101,170,45,18,12,239,67,181,11,190,250,18,5,108,125,169,171,249,42,253,156,87,254,55,62,128,237,77,146,151,174,16,178,57,207,34,150,214,198,11,211,117,23,107,25,118,4,245,33,206,102,199,178,87,105,50,146,16,240,88,248,247,106,219,61,166,5,143,9,148,52,199,64,108,182,241,116,124,185,137,62,139,195,179,60,237,126,114,110,147,81,81,213,250,11,157,109,35,45,53,161,206,137,120,231,206,168,57,161,234,83,38,169,183,160,26,241,104,179,12,249,230,244,186,70,45,198,176,147,38,219,
+219,166,145,159,192,88,100,92,236,118,136,60,58,211,198,197,111,9,151,27,29,97,168,180,44,27,131,35,174,42,242,116,155,242,234,211,14,78,101,52,200,144,228,78,17,8,67,85,232,153,130,76,27,71,143,28,21,91,38,111,80,57,217,142,91,133,0,100,90,201,228,198,214,252,164,59,121,6,231,200,188,146,255,32,189,252,244,199,37,183,108,188,24,113,139,145,1,225,232,79,245,108,80,206,87,77,171,24,253,130,227,201,229,21,7,209,146,131,2,229,138,131,166,170,53,129,76,95,139,135,21,171,165,88,84,139,62,253,104,52,114,137,0,209,193,111,244,25,179,44,60,227,5,120,155,105,70,79,150,187,69,93,204,134,231,205,76,100,175,12,240,61,182,117,210,115,165,156,164,36,30,42,254,244,76,130,117,50,106,166,138,132,59,163,255,102,21,118,120,193,113,122,145,66,81,26,227,152,134,166,35,155,0,99,137,87,160,162,145,164,8,7,170,36,134,62,36,102,231,163,118,42,15,227,90,39,187,46,170,249,170,227,126,214,107,31,147,5,20,171,186,198,162,207,10,221,
+247,77,150,200,80,9,88,150,145,71,148,218,121,144,186,4,205,73,214,110,47,37,56,210,54,23,23,159,161,246,92,152,20,81,140,109,231,46,44,223,189,215,75,126,84,32,199,218,105,63,37,229,147,20,205,200,106,4,217,190,1,255,147,174,106,222,164,8,116,86,7,106,202,146,4,156,12,67,95,64,78,229,43,246,17,226,158,89,163,119,198,232,239,45,20,60,147,71,44,47,227,39,43,242,159,223,69,163,11,99,22,55,233,196,94,248,8,69,103,252,230,10,184,182,204,22,183,166,201,106,61,221,160,41,218,100,25,162,212,78,134,19,79,54,122,186,168,96,5,1,199,168,82,73,183,242,74,167,208,145,171,236,182,233,162,92,14,251,151,23,240,153,78,244,112,211,109,26,84,59,171,27,223,143,22,138,63,251,153,245,210,239,100,244,128,23,28,42,22,66,44,8,34,151,202,149,56,129,213,56,124,233,178,20,79,46,97,118,160,108,8,10,127,140,109,128,37,28,181,39,86,124,86,163,83,254,18,113,137,49,200,172,214,162,168,178,18,93,7,27,85,88,43,30,53,162,
+247,32,161,198,48,151,34,61,185,227,156,31,185,24,213,24,84,208,183,23,35,192,33,103,180,163,73,245,228,99,162,136,243,20,47,239,212,127,153,39,186,16,112,196,212,37,86,241,93,96,196,91,29,80,85,144,168,178,20,164,190,3,85,54,147,100,33,148,239,107,138,20,106,1,73,135,162,19,63,116,65,237,74,209,21,42,108,205,130,167,58,77,39,128,160,122,225,29,231,127,51,111,5,206,186,139,242,13,49,255,234,132,204,199,58,61,138,100,116,188,63,232,45,69,86,112,107,108,219,9,31,213,182,115,1,23,62,171,230,55,183,230,209,72,103,204,51,110,41,38,234,16,46,127,140,174,94,148,177,173,13,124,119,214,198,53,240,83,54,93,155,165,181,228,128,177,97,106,168,190,146,152,108,16,196,19,181,54,105,186,77,124,185,46,131,214,129,85,150,224,49,53,254,67,160,217,201,35,72,68,241,130,15,104,87,202,136,88,120,131,109,144,105,138,106,16,6,3,180,115,127,20,75,80,249,153,165,195,75,182,190,140,25,35,85,248,14,180,129,145,154,198,108,229,26,120,
+174,118,164,66,210,104,133,36,230,95,59,28,209,185,197,134,84,221,126,75,183,11,133,108,96,211,100,184,49,129,125,116,244,39,121,50,208,124,188,182,155,237,31,240,199,94,201,65,144,125,24,222,183,113,219,221,240,94,180,181,144,160,88,118,178,36,74,41,77,40,187,94,227,57,197,210,141,62,168,130,159,98,149,7,53,168,224,163,197,82,55,185,70,39,130,76,131,126,170,230,141,81,78,176,94,169,165,250,177,32,154,4,186,42,37,13,244,176,159,141,35,0,235,160,191,39,11,126,47,71,56,58,210,235,137,239,26,155,139,203,168,245,164,104,225,213,152,126,139,42,85,16,120,37,166,225,132,15,200,189,44,21,135,183,144,79,136,10,41,226,194,91,77,161,26,166,194,136,228,246,212,58,188,118,201,86,251,111,94,247,88,36,22,172,37,53,18,157,125,42,248,215,89,56,195,245,39,176,124,123,148,169,28,228,153,198,104,113,242,76,176,78,243,145,60,65,73,54,12,211,175,204,150,252,250,182,60,207,121,153,2,87,251,42,34,215,231,41,108,166,229,142,111,121,22,82,
+48,225,198,68,5,2,9,213,185,19,152,242,86,214,74,102,50,218,33,228,121,188,109,135,112,227,141,198,208,28,120,121,111,78,85,219,148,223,4,241,36,129,214,37,109,17,7,111,87,188,81,235,82,182,224,146,113,193,176,237,115,249,220,183,64,235,59,97,251,107,227,111,218,141,90,67,141,202,36,248,184,134,168,196,88,136,177,21,94,166,125,199,201,36,60,68,107,243,51,76,83,212,97,120,128,12,109,232,233,188,212,189,101,118,29,155,74,38,3,147,248,171,185,134,171,13,120,71,108,106,21,90,102,173,94,125,250,61,241,8,76,241,141,205,211,123,5,138,34,111,209,241,182,53,135,23,234,59,129,128,54,54,190,92,254,89,167,190,219,123,73,53,37,93,71,86,48,3,114,69,5,52,40,179,138,95,232,47,63,174,40,24,35,27,151,251,157,83,29,77,182,192,81,217,187,254,221,33,222,140,116,252,155,39,25,246,86,128,120,41,105,232,188,106,68,103,88,73,112,49,92,147,75,60,6,139,91,254,102,43,190,126,188,97,68,40,18,146,175,114,25,211,74,67,122,62,
+247,182,54,122,235,56,57,77,76,227,240,105,138,5,177,98,44,88,146,21,101,37,88,169,58,43,242,223,94,247,255,125,28,206,74,189,92,26,212,105,197,58,223,250,88,131,89,55,242,232,62,58,134,159,204,195,73,44,254,162,65,247,27,142,237,247,239,189,28,203,20,29,218,189,33,7,96,245,225,65,244,225,231,167,45,28,254,176,22,24,174,175,186,83,77,194,90,121,48,58,211,230,215,57,222,176,38,46,241,165,236,11,39,43,207,82,180,53,82,217,87,92,139,208,239,254,209,31,195,159,56,60,48,220,153,194,76,247,93,114,27,25,176,133,138,75,250,149,252,155,137,165,126,1,161,242,68,130,155,141,171,39,252,15,214,43,26,215,55,226,245,46,248,243,14,79,200,171,190,245,152,33,247,77,206,19,63,217,98,53,197,235,243,237,73,24,221,159,15,38,237,18,126,134,120,231,176,88,158,121,76,219,43,113,233,150,101,224,63,101,39,32,241,138,16,159,169,7,107,243,126,164,62,81,55,198,168,131,165,62,225,55,253,168,245,41,15,227,231,30,91,138,145,14,197,15,
+172,54,238,60,98,211,62,146,151,41,115,178,127,25,169,94,55,118,225,27,253,243,15,217,112,22,122,167,180,46,0,110,196,201,12,21,114,40,157,108,11,134,91,65,59,15,184,68,86,107,230,158,4,103,85,67,209,242,29,122,235,8,102,91,131,200,100,241,165,179,116,253,253,205,96,182,217,10,83,142,106,246,110,200,180,154,118,139,116,16,143,171,200,36,0,14,208,140,246,119,124,67,225,82,144,71,133,210,104,57,18,141,122,35,252,99,4,31,69,193,62,12,164,129,101,208,10,194,214,32,0,106,193,9,12,228,130,109,208,11,106,206,32,122,148,24,41,209,163,241,136,57,170,143,210,206,209,94,17,116,180,26,83,91,61,86,73,86,30,125,251,91,210,21,185,4,200,51,191,97,97,197,23,244,150,92,143,126,37,56,231,38,139,189,120,16,72,63,218,62,251,139,160,71,177,204,83,156,137,73,4,106,191,158,14,107,169,184,150,92,58,231,206,28,101,37,142,167,104,186,234,195,147,210,253,176,185,51,237,174,236,206,168,237,233,95,205,76,87,245,160,181,178,103,217,15,
+112,75,157,14,10,233,16,69,25,60,109,188,207,230,41,28,217,78,97,71,181,39,20,59,63,68,7,183,37,72,222,151,152,6,115,255,162,76,182,196,21,255,189,104,56,73,154,16,213,144,126,126,106,139,180,39,218,240,91,116,147,180,15,120,189,88,102,7,113,211,163,166,23,207,159,89,217,99,233,129,35,109,24,224,181,44,130,72,103,101,214,92,22,37,70,103,98,34,3,126,74,93,30,194,32,128,39,104,122,38,185,7,63,240,109,248,252,52,150,250,153,124,248,216,103,137,237,154,22,41,36,87,220,156,211,30,146,20,69,42,89,38,76,29,47,160,241,31,51,21,39,122,196,203,16,233,130,182,235,167,37,248,217,50,224,164,196,203,183,127,206,191,239,104,103,189,209,216,180,222,191,62,98,62,80,65,242,242,179,174,122,154,228,152,79,218,54,137,83,39,117,74,236,50,187,252,247,40,57,74,87,242,213,167,108,37,221,201,137,178,11,81,74,148,227,37,248,166,20,47,207,74,178,178,75,86,154,253,183,104,202,178,114,157,196,32,67,24,254,253,55,76,244,165,217,229,
+120,47,213,139,212,27,80,35,214,73,118,88,125,61,214,68,95,184,190,143,173,238,120,72,217,43,68,95,36,17,251,208,176,182,62,190,127,128,69,226,238,98,255,22,170,92,121,43,248,54,195,124,59,72,68,45,175,168,41,150,174,134,236,94,144,213,140,213,107,80,84,21,168,86,212,246,13,185,57,102,200,244,186,247,237,226,210,194,233,95,238,76,87,253,96,182,120,99,25,27,16,168,111,72,86,233,136,42,210,61,126,204,83,211,51,175,111,124,224,42,49,221,61,225,107,116,45,117,29,45,161,43,122,236,204,133,227,167,135,12,35,150,63,123,220,240,230,153,66,60,121,184,69,240,105,82,156,200,39,231,108,244,146,132,27,81,154,39,252,246,146,91,236,200,241,39,123,176,247,216,176,230,40,237,81,46,18,235,212,92,126,146,46,56,231,116,168,41,202,30,100,160,206,173,253,148,63,32,197,158,91,175,215,154,229,246,7,228,132,109,92,89,169,95,131,45,147,165,55,2,108,67,195,247,65,121,82,35,146,112,226,33,114,253,213,94,127,210,106,154,34,47,229,39,93,200,
+249,148,60,9,84,208,10,130,96,110,180,58,137,35,180,50,163,163,59,93,77,116,206,229,106,183,6,85,12,25,138,178,240,70,82,5,38,180,5,109,242,141,29,182,33,224,249,120,108,22,166,206,186,117,20,157,185,166,11,79,97,83,201,84,103,153,226,166,26,30,167,206,67,241,20,60,144,167,115,240,136,60,3,79,80,231,5,166,136,169,108,170,163,79,109,83,188,78,87,215,241,116,190,44,38,251,80,225,89,176,0,41,160,70,26,8,115,254,132,140,127,247,35,232,65,87,223,139,20,209,14,141,246,199,124,120,100,10,153,46,182,115,98,42,183,21,193,8,107,38,106,8,242,92,30,165,90,83,107,242,149,59,62,57,214,142,215,217,33,2,20,151,56,210,112,110,252,160,121,177,35,108,186,65,164,135,222,166,174,12,14,78,119,3,31,234,203,27,51,61,142,177,1,161,65,125,194,68,142,167,226,98,224,199,28,113,75,243,124,125,7,182,18,242,125,214,58,246,175,212,55,63,133,243,9,237,176,68,51,87,254,132,127,20,31,150,3,225,81,255,176,8,186,201,43,249,
+52,27,70,255,182,199,51,127,247,36,46,47,205,223,7,114,121,252,173,247,34,87,114,135,82,58,60,136,7,187,67,44,103,5,81,7,75,71,254,251,78,145,6,225,7,191,35,249,83,18,196,183,180,60,110,236,104,150,187,169,237,133,145,135,241,222,53,127,86,153,8,10,162,46,240,197,52,245,34,136,36,169,92,16,83,98,221,163,251,6,192,98,169,32,19,40,146,94,228,128,149,16,148,241,103,144,144,102,211,44,102,249,103,212,133,159,167,73,19,202,44,237,110,77,58,163,55,4,148,101,193,5,70,101,197,105,51,194,54,194,13,18,207,192,195,8,89,253,43,191,99,97,58,246,212,61,53,243,116,98,30,140,39,233,80,235,29,75,71,211,225,116,116,158,14,202,167,240,57,234,62,162,207,224,19,116,116,129,14,162,35,235,208,235,29,91,7,207,211,241,178,60,158,111,42,226,105,248,60,205,235,126,141,255,162,241,105,92,180,163,5,64,206,217,19,209,59,238,59,221,122,31,253,33,63,230,251,67,163,213,147,251,13,217,31,116,193,182,72,104,58,4,199,207,36,87,
+30,138,149,174,248,158,151,205,42,152,63,160,90,67,10,84,5,242,21,234,134,19,122,251,54,74,58,32,225,4,161,41,117,244,65,175,186,1,10,213,159,217,21,124,52,61,202,204,8,76,211,95,130,135,253,20,210,198,175,136,162,181,155,26,173,68,201,53,238,250,99,108,133,226,23,235,55,101,105,9,34,215,164,93,120,202,46,86,175,250,218,211,124,11,226,86,127,99,52,237,25,254,142,134,253,95,222,19,150,24,142,172,232,65,76,179,20,38,63,22,127,187,63,249,19,119,87,27,127,41,146,39,226,222,55,239,62,37,79,214,29,160,236,212,37,113,244,73,230,126,160,119,236,210,71,98,116,20,126,228,119,238,82,249,35,121,100,47,36,157,172,212,65,41,133,98,87,60,103,129,235,148,29,195,198,111,178,156,147,156,49,181,111,252,222,49,229,214,212,118,205,79,217,40,233,168,32,39,106,202,29,227,149,217,58,56,211,52,202,201,185,164,5,153,162,161,58,58,135,207,97,106,112,93,14,221,37,197,8,177,39,165,130,203,18,179,136,103,7,211,129,39,129,228,147,212,
+64,54,176,13,138,206,4,51,161,76,196,80,29,17,194,135,200,33,184,46,4,132,208,33,82,104,143,12,17,66,216,16,236,51,132,11,161,66,6,201,83,47,209,203,244,82,99,93,190,144,44,100,19,233,97,34,95,226,94,156,124,184,202,75,73,43,97,141,98,111,20,110,26,125,120,186,90,76,139,61,115,56,96,222,103,187,230,175,33,95,233,73,157,185,45,176,79,202,246,232,233,182,230,250,214,22,74,92,85,32,155,152,112,19,0,126,40,30,165,210,36,186,80,138,221,114,118,242,10,37,61,32,211,56,138,7,187,37,90,200,220,184,174,226,230,23,150,234,8,246,234,51,19,57,146,255,184,1,181,105,37,142,236,141,133,63,163,69,156,60,160,27,200,121,43,148,216,209,146,199,165,53,64,90,238,29,102,64,114,6,234,230,210,67,76,241,252,126,234,104,70,80,121,16,203,31,66,3,91,243,60,126,69,139,150,241,157,144,100,91,66,68,239,250,95,133,157,76,180,36,197,250,64,172,195,214,164,217,242,64,175,249,52,98,202,42,74,157,240,249,225,132,248,99,233,70,
+20,43,32,206,36,54,45,140,110,100,69,136,47,136,233,163,149,40,19,199,158,23,216,93,190,163,148,41,86,137,56,17,198,44,181,109,31,176,43,150,242,210,12,63,233,70,30,200,139,78,160,131,118,16,126,89,63,101,131,164,157,176,99,192,139,112,143,153,230,107,28,122,237,93,163,208,92,205,84,41,85,94,146,148,62,165,53,73,77,106,147,92,92,82,151,220,42,179,214,229,123,201,94,186,149,155,183,178,163,148,34,161,104,6,184,62,238,11,55,64,19,251,196,97,110,144,211,244,115,195,220,87,110,128,206,189,22,134,47,131,100,96,232,27,134,154,175,160,102,160,145,154,229,127,9,201,159,108,6,252,190,107,126,253,191,190,95,87,217,253,39,233,37,156,132,205,138,162,212,68,10,34,162,228,67,235,15,206,173,70,187,212,159,249,65,30,124,36,163,147,167,119,52,127,57,134,234,167,194,21,217,191,137,178,130,49,55,91,69,188,138,38,32,15,71,199,175,71,179,218,228,138,85,42,29,84,157,113,208,20,57,136,67,24,160,71,84,110,248,43,99,204,45,193,245,228,
+43,244,83,41,184,177,87,130,248,157,151,111,106,5,169,181,32,241,113,32,53,204,150,27,188,114,14,159,150,24,74,249,39,76,56,228,105,239,186,218,103,242,140,192,63,207,205,80,51,250,188,126,178,156,3,127,145,246,201,71,15,159,219,167,153,181,219,119,54,223,207,228,77,159,107,134,163,183,107,238,9,185,111,100,79,53,127,181,176,158,152,179,228,219,108,109,60,73,103,205,247,144,211,42,14,66,164,137,65,181,221,114,76,125,31,98,146,229,169,248,156,101,223,247,70,154,152,84,209,220,209,96,13,69,78,184,225,240,165,206,156,148,149,220,175,220,240,107,68,92,129,129,180,196,42,231,219,154,227,75,197,169,48,238,1,140,239,182,11,115,167,255,253,108,148,140,242,247,136,95,9,52,16,7,2,9,172,147,136,78,129,19,225,140,208,235,148,105,173,83,147,92,28,73,135,202,193,42,59,92,187,195,174,176,131,45,137,34,98,136,248,96,18,225,47,7,208,207,193,104,57,107,110,157,3,234,185,76,78,155,227,230,116,237,156,55,119,206,161,209,185,68,78,153,27,231,
+36,204,92,61,231,36,238,225,68,18,60,206,136,19,34,113,254,29,123,103,127,84,92,29,33,60,111,226,45,131,53,137,44,133,10,222,68,224,60,219,166,89,49,70,165,63,145,138,93,245,140,3,198,184,231,205,114,142,134,214,92,122,87,181,125,208,152,182,9,40,65,111,214,14,170,181,57,57,77,172,112,71,15,90,33,215,90,145,43,146,105,65,72,181,198,157,144,131,234,17,248,167,60,191,3,87,244,29,181,252,10,207,48,127,248,222,155,167,184,24,250,8,91,7,249,149,24,40,253,32,126,60,139,175,13,57,172,245,134,217,61,196,62,74,41,128,116,95,40,154,7,101,224,14,166,159,232,221,53,145,48,63,23,122,27,231,243,33,39,159,244,253,104,56,63,157,223,175,134,112,234,146,144,105,76,237,79,246,222,133,158,93,101,30,199,195,143,223,111,13,88,139,8,72,94,80,51,171,65,189,176,220,176,99,34,107,235,105,153,6,94,226,152,215,103,241,91,203,190,151,164,28,155,88,215,214,114,216,120,192,206,180,239,126,142,254,143,30,74,255,161,197,159,17,91,133,
+74,171,200,217,95,244,228,251,133,78,196,129,91,3,195,172,45,201,36,206,56,13,142,117,254,213,130,36,81,125,24,221,195,247,48,61,45,185,32,149,212,101,245,187,180,46,47,75,202,210,169,85,226,124,217,51,59,82,230,30,174,190,86,125,112,55,220,13,54,125,188,228,11,63,32,247,201,95,104,242,0,232,103,190,50,146,65,166,159,25,102,190,152,153,255,22,218,210,64,219,215,30,203,209,105,37,209,141,119,83,221,103,164,6,213,98,181,100,184,21,109,37,74,113,215,249,34,220,249,127,15,37,36,66,69,113,94,117,135,25,115,174,105,53,74,204,103,149,89,166,85,122,178,111,165,212,155,25,34,47,49,159,211,57,213,215,216,86,173,161,220,83,56,34,172,53,57,102,56,115,55,154,234,72,157,201,81,31,134,236,148,56,210,0,52,236,171,124,68,180,123,68,57,10,245,175,168,63,58,219,67,122,178,66,252,211,167,185,239,37,94,101,133,250,214,83,248,122,146,223,241,192,250,150,75,89,132,222,228,9,119,255,249,13,17,153,90,225,229,94,251,211,74,111,194,179,
+62,221,115,141,102,63,233,199,3,91,99,68,45,146,198,157,252,126,154,245,163,159,131,103,76,123,248,28,62,185,215,158,216,18,6,238,31,243,154,120,240,68,93,31,243,221,231,215,53,219,117,186,6,127,9,246,194,143,94,100,137,174,237,139,26,191,159,184,208,185,102,173,165,98,192,143,28,176,239,65,183,225,248,170,156,151,159,155,89,26,52,131,188,165,79,89,66,9,31,124,159,165,191,129,44,174,193,158,108,125,91,12,95,109,168,106,67,157,185,91,221,55,217,153,155,113,220,150,69,103,64,255,234,196,20,137,139,38,174,73,105,34,18,51,36,137,73,146,102,218,71,105,82,158,148,184,165,42,191,244,110,105,89,58,56,171,207,234,181,156,45,139,171,229,106,69,89,80,71,11,202,154,180,38,45,215,164,85,105,121,97,111,29,91,198,175,49,27,91,153,22,166,149,217,124,77,117,75,221,106,110,88,26,86,151,197,241,103,117,88,28,214,227,75,59,107,9,7,105,141,173,15,77,152,143,221,245,23,21,77,81,8,87,222,97,233,156,107,218,101,171,177,169,208,75,228,
+106,163,28,163,84,122,19,241,216,80,207,184,96,156,123,221,44,82,123,213,81,181,35,107,123,210,125,248,77,224,165,183,109,246,145,42,93,244,211,121,146,51,8,113,250,235,242,64,14,97,129,110,64,118,131,149,238,136,197,17,215,141,186,97,199,135,74,52,243,152,7,190,25,113,43,59,108,7,220,93,171,8,200,179,59,163,21,247,78,250,148,94,17,222,197,195,33,150,92,168,230,177,63,253,9,29,176,90,133,89,126,118,242,195,234,251,209,242,37,237,220,95,245,51,251,138,134,163,215,175,27,86,16,142,156,55,116,114,51,81,45,175,7,46,50,101,117,35,14,191,236,2,236,250,6,12,45,51,218,206,71,38,92,143,205,242,43,39,13,60,111,176,33,157,172,247,152,212,67,15,48,132,165,132,159,243,163,229,51,21,66,189,14,254,161,63,151,183,218,226,47,113,252,1,94,101,168,67,102,94,109,125,95,45,249,1,63,238,130,213,22,180,119,122,131,105,248,208,183,154,22,211,240,227,35,162,139,218,208,9,188,46,129,73,144,219,240,182,19,104,163,219,36,45,22,70,
+82,25,147,194,100,176,142,17,17,57,57,142,177,206,153,115,4,156,15,14,250,163,21,104,221,90,200,94,11,217,138,181,100,173,63,89,107,216,98,180,24,198,86,181,85,245,216,60,208,198,179,241,224,61,248,150,39,235,201,182,244,45,191,190,53,123,129,127,109,241,238,14,139,203,154,61,88,118,214,249,176,231,160,89,22,131,78,28,119,194,92,160,86,213,174,23,12,155,111,100,204,194,9,251,112,10,153,11,229,2,134,54,122,243,92,146,150,182,55,78,233,58,126,109,252,162,167,220,81,122,12,177,62,16,147,157,209,171,205,118,244,243,42,160,190,72,230,204,12,16,39,106,117,48,132,196,84,174,70,26,200,253,74,163,82,17,226,184,254,140,31,177,247,34,108,201,247,188,30,52,32,19,33,23,136,198,196,222,42,16,90,78,246,135,131,75,150,61,121,139,54,251,151,44,123,16,199,235,148,38,20,57,184,168,37,88,186,55,222,42,27,170,103,180,67,1,59,0,142,5,249,138,180,176,111,67,184,12,128,230,103,191,126,225,154,216,40,216,155,114,207,51,185,215,65,117,
+146,71,53,21,215,194,8,106,143,107,246,187,169,21,93,24,223,35,154,71,217,141,184,223,35,202,4,207,167,233,43,128,217,98,10,158,119,207,223,48,64,216,118,168,63,212,2,214,131,53,172,67,201,51,234,135,51,46,172,5,12,143,168,255,198,137,89,73,67,86,170,34,32,163,5,4,15,107,179,50,124,125,38,66,24,232,46,188,170,14,192,1,102,156,87,230,182,249,166,54,199,27,178,6,157,1,49,53,240,12,29,131,15,101,184,228,130,28,11,31,111,229,90,184,214,182,213,255,110,245,88,61,150,203,135,229,98,61,91,209,150,20,214,130,93,67,107,72,182,130,214,138,149,106,21,85,173,191,87,223,235,111,196,107,98,173,88,235,39,235,170,249,50,12,12,205,190,102,248,251,245,59,40,253,246,255,134,127,95,179,46,190,229,182,46,191,218,216,132,13,203,205,221,57,249,182,221,162,255,73,21,159,46,178,137,69,198,144,159,60,23,158,69,87,33,158,24,129,143,200,3,167,191,172,58,192,204,103,103,4,176,161,49,85,90,210,118,24,90,210,230,8,174,200,91,177,
+43,84,153,130,149,118,74,222,16,45,15,186,108,141,21,113,65,21,232,201,125,73,31,210,219,29,121,250,123,41,246,204,205,58,45,133,77,203,167,55,122,41,67,234,239,222,76,118,16,98,24,191,20,163,212,143,248,182,76,227,115,13,69,114,170,57,238,127,202,63,235,94,197,55,207,129,201,168,67,48,60,138,196,113,248,218,39,141,247,231,244,213,59,48,195,167,232,39,86,244,132,182,233,183,128,185,127,102,22,187,252,83,47,186,133,139,136,247,211,97,232,213,116,244,116,209,223,74,144,184,103,5,71,109,247,103,37,126,48,162,154,171,205,67,225,127,4,223,207,172,147,130,189,236,33,185,208,93,156,63,34,187,148,85,56,201,188,163,142,154,229,186,27,250,71,18,47,230,212,146,102,172,166,192,132,94,118,95,36,173,140,95,133,110,194,139,217,34,127,52,170,2,80,48,10,42,48,129,77,176,17,100,5,45,157,96,58,231,133,28,31,173,221,11,196,22,156,216,202,35,88,118,22,140,192,226,179,176,13,117,196,229,118,153,15,226,131,14,70,150,144,45,5,92,189,160,
+41,120,94,142,91,167,48,129,38,226,210,80,95,10,150,129,37,98,169,147,45,233,75,219,18,95,95,234,76,60,147,207,52,197,152,84,5,86,193,37,134,201,145,114,194,157,143,190,146,93,31,243,107,107,120,180,72,190,190,139,80,213,4,8,229,239,24,151,117,191,219,239,28,14,39,224,112,56,234,142,154,163,8,214,198,181,81,77,137,168,185,52,111,154,69,229,167,43,177,36,31,204,174,13,223,86,218,8,10,54,57,157,167,9,148,214,60,235,134,111,217,101,12,40,145,4,40,244,75,236,107,106,125,164,78,162,175,224,154,242,83,186,125,6,145,153,212,154,112,221,211,24,111,7,186,125,155,200,253,200,44,34,26,122,254,177,182,58,82,229,39,114,250,54,7,177,180,191,148,143,226,52,82,90,55,44,201,221,109,93,153,117,118,235,241,165,124,11,143,96,210,35,59,156,67,191,23,105,207,26,201,112,242,7,194,241,251,21,209,99,175,67,152,224,209,24,248,235,223,211,61,156,61,32,30,6,81,175,231,249,205,93,40,125,87,16,56,58,122,246,83,207,140,235,160,142,
+248,222,121,38,11,236,15,136,218,205,127,250,3,82,195,197,38,168,72,157,176,107,162,243,139,155,176,147,127,180,109,209,207,73,181,202,13,223,94,91,236,15,188,168,147,137,148,93,189,167,249,88,155,251,189,72,16,168,188,35,174,4,55,200,214,9,216,8,54,157,141,175,179,121,106,140,154,165,158,146,213,34,53,28,107,133,81,24,7,251,129,112,232,232,93,162,121,75,208,170,124,180,130,158,128,231,182,242,32,61,113,79,204,243,50,53,195,23,24,184,83,229,5,219,41,97,59,109,78,248,19,1,119,122,123,65,119,162,233,78,211,23,120,170,19,207,115,253,237,47,159,195,233,215,116,208,77,154,189,72,57,246,69,212,182,21,197,52,14,134,121,182,211,114,218,135,131,119,124,186,153,78,69,222,139,176,183,212,219,91,53,30,135,229,63,18,249,76,61,250,149,40,180,179,19,130,140,128,138,169,206,164,205,76,48,106,102,12,212,158,172,237,76,111,224,144,96,237,104,15,170,144,26,23,48,201,111,96,201,19,45,223,16,242,19,38,225,158,89,206,18,50,191,25,124,72,
+80,62,9,221,54,219,115,115,77,200,88,56,193,189,247,246,78,93,22,129,123,210,189,78,123,113,164,16,199,14,222,119,177,172,120,198,145,142,173,39,193,94,111,182,206,92,37,251,209,58,245,62,70,207,152,19,81,218,122,7,169,113,43,26,150,175,158,200,199,230,229,33,128,167,254,84,254,164,110,121,15,202,170,249,23,15,139,159,209,219,225,179,255,196,60,221,167,65,241,43,172,236,48,31,252,237,201,60,8,191,92,205,254,193,63,45,251,254,79,210,159,201,163,190,7,127,222,47,210,83,45,212,115,32,249,9,55,230,79,91,15,189,120,90,231,135,111,252,168,27,251,39,250,195,203,122,202,128,254,212,124,174,77,253,143,136,31,168,52,17,71,130,153,72,209,9,40,8,10,157,130,175,83,120,20,140,155,229,214,145,221,34,55,220,77,99,178,1,54,151,141,254,81,80,26,2,151,224,16,66,11,60,93,79,208,115,191,123,16,47,196,61,160,252,36,59,13,78,140,236,137,113,170,158,236,39,255,63,158,94,76,29,95,100,101,95,88,234,78,255,49,133,59,241,95,120,
+63,173,223,79,190,147,207,227,78,163,187,126,207,97,189,236,247,81,216,160,108,190,15,124,13,155,89,50,122,1,35,124,216,133,12,161,28,182,64,26,131,121,33,9,102,220,147,156,206,58,19,198,84,142,209,99,175,114,192,77,24,241,244,13,95,56,114,165,77,180,182,178,29,140,77,129,145,108,45,57,15,182,208,15,46,231,99,136,20,59,226,87,117,135,24,158,82,235,3,57,193,234,119,41,107,18,240,82,205,7,251,125,97,200,184,161,123,97,71,26,122,198,68,118,89,248,231,118,110,139,82,31,124,243,174,31,125,74,174,248,73,148,172,184,182,187,234,100,92,215,248,236,143,73,172,222,116,188,86,126,63,51,243,19,133,198,206,99,120,197,213,75,163,8,15,214,23,88,4,66,145,213,216,202,181,243,110,132,175,43,202,17,146,173,180,240,34,192,17,200,86,156,8,77,58,110,225,5,138,21,47,2,107,35,216,184,174,108,133,100,70,246,8,55,64,100,224,120,137,47,106,196,124,218,94,35,95,52,143,87,129,44,66,67,2,145,17,229,72,44,153,47,252,211,71,124,
+180,111,219,19,123,191,50,247,63,147,97,124,237,73,122,250,30,249,219,148,126,123,63,141,78,163,143,19,248,66,237,196,168,157,28,39,231,105,47,59,237,79,164,23,160,220,41,119,50,156,12,36,207,194,179,64,152,176,48,147,218,196,46,184,77,26,243,50,188,132,137,168,117,145,165,167,233,113,66,58,79,72,17,2,31,142,250,131,248,16,60,2,15,29,2,46,131,211,225,182,58,28,15,215,61,120,15,157,239,129,121,168,30,172,123,200,21,34,195,220,132,218,145,95,36,139,62,186,95,87,132,9,69,19,204,11,222,127,245,244,243,254,76,186,152,38,52,153,251,116,1,44,154,10,142,121,138,124,100,31,139,135,121,234,120,120,188,141,78,15,35,100,2,4,241,198,26,121,129,118,222,54,83,228,155,105,35,189,171,178,26,160,27,188,21,40,183,243,49,59,74,133,43,224,99,127,229,176,137,204,252,211,48,104,19,159,168,127,211,194,134,184,119,73,195,207,105,97,44,159,208,73,40,140,215,119,236,82,47,2,110,89,251,9,168,46,83,5,241,3,106,210,87,136,177,173,
+155,96,95,108,23,175,56,230,177,117,33,184,19,77,206,147,219,102,255,113,206,189,132,44,138,152,126,13,189,3,172,253,11,243,188,169,159,102,194,101,19,190,60,149,187,35,74,241,136,254,42,99,102,58,230,130,44,249,7,15,103,202,65,41,61,98,216,132,242,150,252,229,199,62,233,2,159,116,71,144,218,99,245,24,211,151,254,197,75,49,51,25,154,203,147,236,24,216,82,176,28,35,4,117,146,93,90,177,138,210,44,235,39,246,234,62,161,102,209,94,180,113,165,86,113,168,31,160,192,232,74,218,30,104,197,253,194,71,49,78,196,12,229,6,210,26,220,156,70,165,83,25,176,18,181,68,47,209,74,15,70,233,171,217,111,14,117,238,47,247,192,221,119,55,135,246,93,63,241,19,239,205,82,179,200,12,92,165,60,43,207,250,186,186,30,87,167,53,102,141,89,249,18,171,196,58,181,86,3,43,53,160,0,70,56,112,4,124,227,190,1,22,30,96,225,88,64,3,7,54,94,83,3,112,181,112,46,192,113,249,29,62,255,190,254,6,159,73,55,28,249,199,254,163,92,79,
+139,136,209,242,51,104,102,56,5,10,217,181,216,45,88,59,131,195,232,48,56,172,121,71,222,65,172,145,226,181,93,109,95,115,128,140,58,88,3,153,32,248,55,26,143,20,35,119,250,245,251,163,119,212,94,67,114,128,62,217,172,202,137,140,0,125,3,69,188,229,175,32,144,6,103,59,50,226,207,131,179,126,200,143,178,213,215,9,117,135,255,106,210,239,203,126,8,121,154,68,28,139,125,179,84,250,160,93,76,251,51,152,252,65,21,154,15,196,132,230,30,160,70,219,87,179,39,219,92,98,230,125,224,232,221,214,194,239,207,47,233,178,254,221,27,76,217,151,192,245,17,68,246,176,183,31,196,254,7,247,151,113,35,14,219,113,244,153,9,143,196,192,141,151,254,139,3,183,232,233,12,245,116,242,13,141,86,4,4,6,201,13,183,234,199,82,22,156,152,17,59,172,38,241,216,15,238,147,26,51,41,87,117,233,24,248,148,237,110,239,14,123,28,137,90,99,113,97,112,28,88,241,113,154,95,84,10,242,172,248,15,213,114,183,114,52,78,130,190,55,70,64,69,216,128,153,
+209,145,58,136,201,95,97,9,35,5,224,82,99,172,18,219,196,96,248,88,54,166,139,77,235,136,14,194,135,184,32,116,24,68,18,161,66,124,195,16,44,68,3,225,66,164,15,8,242,45,232,89,63,253,43,255,122,255,21,53,207,18,179,56,63,194,70,67,226,164,88,73,149,215,168,106,142,130,35,227,232,84,160,18,148,131,106,88,77,82,83,116,101,93,152,170,43,237,42,187,242,90,77,253,239,74,77,39,171,169,90,210,150,114,225,201,75,176,194,155,191,120,58,174,224,205,175,34,54,46,226,127,184,253,166,184,75,184,19,238,4,14,254,194,177,120,209,102,116,57,114,181,124,141,88,155,147,106,59,112,15,58,54,224,139,184,17,115,180,3,255,17,167,112,83,211,153,244,146,218,82,183,67,201,57,250,215,70,187,36,214,11,244,55,212,223,246,197,44,154,242,200,61,164,45,221,161,108,250,77,229,208,18,191,239,113,131,45,206,193,38,228,189,147,143,127,55,74,251,149,110,58,113,231,214,209,224,143,157,42,78,94,232,198,97,122,46,234,191,66,17,86,208,10,70,54,
+106,195,227,13,138,93,99,169,159,111,1,37,247,100,101,62,237,195,117,80,121,176,63,58,161,45,68,121,67,136,169,137,59,91,102,166,223,209,250,223,25,244,169,186,192,163,229,59,20,150,95,168,250,95,246,192,228,188,24,51,101,198,191,61,134,246,123,150,46,40,61,41,235,66,250,37,201,144,144,243,143,26,76,237,66,191,145,69,82,76,187,27,116,252,247,114,89,54,132,84,25,92,142,62,81,158,130,18,216,177,32,88,4,83,105,126,91,102,139,141,152,202,180,143,70,146,241,33,191,11,151,6,210,56,141,22,167,1,244,56,61,0,206,112,47,0,124,13,142,15,240,95,163,212,198,181,129,215,248,2,188,56,31,224,187,236,86,140,21,117,117,232,179,227,127,41,113,68,44,139,80,165,28,37,71,13,234,36,160,2,84,9,164,104,129,82,32,175,72,42,48,69,69,86,81,85,164,145,138,178,34,175,168,43,58,73,229,117,165,171,114,254,163,175,22,119,25,165,66,132,31,117,196,33,97,97,138,248,218,59,232,131,243,83,235,80,221,207,129,23,89,66,199,188,245,143,
+174,154,177,70,251,71,23,169,70,196,190,200,218,129,78,144,95,27,213,71,224,136,25,24,141,20,74,133,43,13,46,233,159,18,87,97,151,174,223,226,125,101,140,240,62,216,16,115,64,171,82,241,163,127,232,71,148,137,188,22,200,101,200,225,53,103,184,208,191,177,119,102,61,27,220,29,75,36,9,59,8,191,240,116,250,1,45,29,127,136,218,92,235,249,166,246,70,147,110,3,249,30,159,178,13,98,240,204,146,18,174,156,43,204,221,118,115,31,194,76,51,200,57,209,214,127,70,3,129,119,168,139,229,15,3,143,181,35,40,214,79,133,241,241,54,8,75,31,215,77,127,203,126,178,91,88,43,20,146,30,96,45,41,230,223,247,106,210,67,14,155,243,36,11,12,255,155,115,142,176,190,65,38,252,7,247,58,103,149,60,201,241,18,207,109,206,113,45,65,124,16,151,229,185,252,28,211,185,108,85,203,223,104,66,30,200,166,230,141,31,148,215,138,94,87,83,135,203,241,174,179,246,104,194,230,117,196,135,20,80,89,9,141,95,96,226,160,250,11,78,8,218,191,64,130,72,
+56,40,15,229,32,3,68,51,64,243,23,4,7,72,128,250,120,1,22,68,72,205,82,177,20,30,142,88,34,150,180,5,150,179,196,52,73,77,1,230,201,120,18,138,188,66,242,166,72,57,138,142,72,221,145,118,228,28,49,131,46,107,72,26,10,142,168,209,145,113,212,83,252,180,17,155,102,167,93,125,97,51,230,71,93,90,114,28,61,2,11,134,253,143,195,229,54,63,181,15,165,125,189,180,174,30,202,155,74,111,87,178,84,45,101,55,162,98,47,57,171,214,114,201,85,177,149,106,213,82,147,214,164,86,25,117,218,163,76,103,49,232,52,80,79,167,82,63,193,207,44,107,68,90,233,164,99,218,151,23,195,130,100,99,62,143,89,119,30,65,141,139,229,23,15,56,41,151,14,195,219,176,250,57,138,117,78,6,202,178,210,95,47,146,220,190,17,15,26,115,65,22,70,205,99,207,83,116,239,224,171,219,225,100,125,74,99,81,236,59,220,30,141,204,221,99,115,236,50,23,126,27,137,185,39,78,176,248,140,183,204,103,238,38,152,85,5,139,5,244,89,247,138,199,50,130,
+250,129,129,138,153,64,164,61,24,211,205,180,19,65,14,93,21,33,213,154,43,7,138,153,91,102,48,83,247,143,52,79,97,0,102,0,251,160,231,92,211,180,16,147,222,76,119,37,160,53,50,32,3,87,69,125,73,168,15,7,52,64,152,82,136,112,166,231,96,213,117,132,24,12,72,173,7,138,84,49,227,220,19,220,202,168,192,154,185,254,155,165,154,9,57,229,136,16,221,88,107,238,218,11,91,163,95,87,157,107,24,105,109,92,7,173,72,152,85,110,101,88,237,86,24,193,170,183,242,173,126,152,21,91,86,151,217,101,152,187,76,41,155,105,159,22,241,67,6,143,69,67,161,24,42,134,146,163,134,26,136,254,66,21,10,217,33,27,180,129,240,71,8,15,189,189,176,212,67,122,104,6,205,62,32,254,11,239,208,181,3,249,94,112,13,129,37,14,58,0,243,95,90,82,2,245,168,31,55,17,226,31,97,229,240,190,188,174,28,74,7,102,117,83,222,85,86,165,186,187,106,47,59,43,86,88,201,85,181,149,29,149,135,133,218,100,84,233,245,58,181,204,104,208,42,84,
+10,200,160,2,127,49,65,15,224,15,232,243,4,129,31,116,104,45,196,39,173,254,137,232,121,187,118,153,185,58,16,64,86,248,2,209,213,148,13,69,75,248,151,21,75,196,145,187,99,181,220,139,111,213,225,58,180,67,38,156,163,38,149,216,3,183,159,252,159,214,33,156,152,174,251,52,187,116,231,36,124,218,158,222,153,93,108,189,91,25,127,215,237,220,40,10,37,91,222,183,192,25,158,250,148,123,82,44,195,138,37,150,107,30,16,235,150,162,135,179,234,179,44,211,76,135,166,209,141,144,46,166,118,127,83,155,112,198,140,58,250,218,27,62,253,147,30,192,75,3,97,250,79,166,215,146,156,51,185,144,202,92,36,172,195,163,133,245,234,165,9,192,205,113,20,183,211,227,138,20,234,166,47,121,77,160,37,243,35,251,185,115,5,52,161,100,84,15,104,16,106,118,218,52,161,118,149,94,19,226,75,51,50,131,61,58,246,11,254,167,76,235,210,154,76,84,147,249,77,255,102,126,37,105,78,154,147,225,164,163,156,76,43,221,202,180,26,233,22,224,199,249,1,243,191,233,
+138,187,126,2,103,220,25,64,95,96,56,58,137,70,34,64,53,25,36,131,134,16,227,14,85,94,176,67,152,45,180,85,224,21,89,153,34,171,208,189,0,77,21,83,5,79,193,195,41,58,47,248,20,122,31,116,109,169,66,113,204,156,221,18,149,81,47,7,134,187,246,15,241,249,20,213,38,151,72,165,245,179,186,46,31,42,155,18,98,87,93,149,143,149,173,238,191,42,115,85,224,182,146,173,234,40,91,238,116,55,181,74,43,211,175,13,106,133,49,191,7,47,204,1,7,183,55,65,212,222,92,35,13,72,233,4,85,68,247,96,222,222,186,39,246,42,71,40,200,79,219,164,163,183,40,162,54,188,55,155,9,2,84,6,26,49,254,43,198,195,11,228,188,132,243,83,233,165,147,107,70,123,111,221,46,141,94,232,27,221,40,18,241,159,2,38,195,112,239,234,13,213,239,240,224,224,34,168,142,118,39,229,231,32,94,237,132,201,222,23,45,163,15,60,104,169,240,249,217,51,112,118,160,120,37,127,128,172,93,92,186,216,133,233,15,230,228,243,141,250,8,78,220,153,48,239,
+237,34,175,136,241,98,127,107,39,173,96,209,76,221,215,197,51,169,42,138,6,130,94,176,75,244,49,122,122,40,121,193,76,222,205,138,63,106,40,117,9,245,39,216,1,79,113,231,236,119,140,202,80,145,68,71,64,131,83,187,131,105,101,220,50,62,111,196,45,13,165,41,183,134,215,58,45,101,82,102,129,71,89,64,37,179,28,249,115,228,2,218,204,158,156,232,205,152,82,165,82,174,84,143,97,138,177,108,172,26,75,35,19,229,68,62,81,79,116,146,137,98,34,155,168,234,19,233,68,217,151,247,97,106,154,132,166,160,201,234,189,56,231,132,58,129,176,22,197,58,0,6,25,248,32,136,31,165,71,153,232,40,195,74,179,50,44,217,107,170,103,234,233,104,61,227,76,59,51,206,206,107,58,148,164,109,155,210,155,31,96,33,83,98,29,132,115,16,229,131,94,54,79,182,0,187,48,75,255,197,76,80,191,215,216,228,252,123,153,156,52,102,191,214,175,241,106,125,4,77,75,251,174,105,107,3,29,13,39,195,79,115,139,153,233,235,160,205,18,139,79,79,219,15,99,66,
+28,80,166,155,43,83,253,24,32,205,151,189,4,195,162,255,30,245,27,124,132,196,18,45,216,122,190,45,134,226,144,15,217,224,103,188,160,202,193,168,7,191,211,248,17,151,71,214,142,178,87,221,173,177,109,163,242,101,101,186,195,173,205,58,99,183,253,169,236,4,205,42,88,79,93,206,143,183,32,250,254,166,174,106,177,199,65,91,12,15,230,143,15,81,32,51,252,220,78,126,221,129,19,243,248,228,119,37,105,75,228,227,194,38,159,172,173,149,123,0,73,27,223,104,155,153,241,10,247,185,247,81,79,45,220,90,185,69,148,116,179,255,126,235,3,252,51,43,147,3,108,159,64,209,193,205,157,109,236,116,151,150,23,73,184,252,17,38,205,237,210,236,86,174,212,150,165,100,136,12,46,141,33,147,114,173,182,87,227,53,49,178,233,28,145,219,166,219,182,49,46,181,77,15,231,203,57,157,134,248,67,117,65,107,139,93,105,163,196,137,2,98,12,194,108,38,78,143,160,26,100,215,226,197,78,164,147,238,232,114,157,88,39,219,73,214,59,133,78,180,147,233,232,18,157,124,
+54,158,125,67,103,83,217,162,46,162,139,164,117,144,45,103,171,116,82,32,100,160,120,214,58,20,0,2,142,140,161,158,17,104,3,90,153,86,71,159,216,38,248,137,174,62,225,77,124,19,204,68,167,154,176,38,174,9,25,61,49,105,23,21,63,34,145,249,160,95,21,84,28,215,206,30,186,177,26,63,157,230,146,239,226,187,152,219,129,116,32,28,55,199,252,238,8,212,130,181,110,171,246,81,19,128,66,208,58,7,23,160,97,100,124,27,229,70,164,17,113,128,249,107,203,175,21,185,41,26,233,41,56,117,42,13,195,96,1,211,118,41,102,249,138,239,202,1,253,201,210,88,153,1,37,48,76,138,174,6,170,180,163,38,90,194,241,93,141,56,21,254,166,202,36,9,55,89,191,83,235,84,124,116,52,61,82,201,150,61,35,79,155,205,187,253,5,93,255,254,131,78,125,13,142,57,167,248,107,249,222,151,7,156,123,101,145,188,217,217,239,201,208,119,230,74,12,188,68,166,121,90,217,142,133,207,175,158,152,15,238,191,67,135,220,199,141,124,50,191,217,37,71,198,147,141,
+219,132,165,199,237,198,156,167,95,209,115,254,232,51,43,189,194,219,247,209,209,204,184,35,230,205,152,96,238,189,18,231,25,155,218,158,17,41,175,240,249,24,109,107,102,122,234,235,219,236,132,28,253,225,9,40,241,156,202,161,228,67,44,151,28,209,46,219,134,35,132,26,5,133,252,198,154,60,214,246,74,105,111,38,43,253,131,165,131,207,121,245,54,169,172,204,46,105,20,38,157,9,232,50,13,75,166,97,68,140,13,141,55,1,189,141,60,149,109,13,149,45,232,78,102,27,186,100,163,144,140,38,51,245,100,34,153,79,198,147,248,183,100,42,89,84,69,96,170,244,75,183,114,190,90,204,215,73,17,107,2,77,45,38,225,42,184,175,240,40,101,50,193,52,187,155,102,103,192,116,45,29,170,101,106,233,70,198,117,79,187,50,174,215,200,238,210,187,204,156,160,16,28,255,229,45,57,186,151,129,7,81,145,165,128,41,228,188,151,125,101,31,142,230,235,119,164,157,40,141,7,231,61,166,161,169,172,167,19,233,150,89,19,148,45,224,201,248,195,230,215,181,105,172,143,89,
+14,29,149,168,98,232,23,154,248,190,175,72,56,29,80,134,137,225,99,54,68,101,95,246,174,255,6,239,145,186,93,85,83,154,198,2,61,161,197,70,33,154,62,47,242,204,171,42,56,149,84,133,34,231,51,145,6,246,52,165,17,73,57,116,131,74,92,241,207,63,88,147,239,34,191,217,246,103,219,211,113,159,234,61,177,204,231,106,78,56,250,230,224,170,169,211,129,201,248,52,89,66,226,242,157,120,27,70,86,254,192,13,121,221,155,87,127,137,229,77,112,135,135,223,2,250,35,23,4,154,125,239,32,213,159,69,159,201,135,56,253,188,210,111,127,233,167,232,214,16,103,194,111,143,248,198,46,166,134,35,15,106,171,194,166,133,179,15,207,121,80,141,153,188,79,242,173,144,216,176,209,31,95,15,29,230,12,223,28,81,31,170,194,35,180,34,102,194,100,217,147,115,99,88,173,90,254,51,251,224,158,181,238,77,117,244,147,41,18,188,137,213,3,184,225,169,20,210,184,137,94,170,204,8,169,59,81,72,22,76,215,44,218,203,212,112,118,23,91,178,247,42,68,66,25,39,
+253,161,99,191,77,168,227,238,208,19,250,189,48,172,87,237,101,123,221,48,47,197,107,246,138,189,186,112,27,214,150,180,169,245,182,229,149,22,52,109,4,135,123,18,3,182,76,29,190,195,239,120,59,140,110,71,206,137,114,180,121,29,152,115,231,232,46,83,215,37,117,145,93,70,215,72,232,250,41,100,175,41,209,94,216,252,163,99,102,60,7,20,180,180,149,189,27,185,51,5,196,194,3,139,184,147,234,172,63,6,211,231,236,144,60,29,212,69,242,197,122,42,241,86,111,199,219,249,76,162,156,205,68,163,61,19,78,168,183,226,244,38,246,76,121,187,102,40,34,15,153,163,104,212,18,50,93,44,11,32,54,8,219,131,240,145,150,65,202,229,190,171,191,121,154,168,105,195,5,179,236,123,196,17,71,101,45,21,250,39,21,166,225,44,12,53,98,201,197,64,188,4,71,20,84,49,223,152,7,93,127,22,107,164,51,39,245,241,222,27,55,193,32,196,204,231,165,195,206,87,115,124,133,81,89,213,34,219,31,184,50,146,88,184,197,86,216,192,141,125,150,134,55,127,199,238,
+249,70,66,134,71,223,98,165,85,69,53,172,190,197,242,213,195,66,120,172,118,119,237,83,34,112,227,159,208,176,223,4,31,122,22,102,201,234,41,86,34,52,229,19,170,24,98,63,96,136,175,88,57,209,114,176,80,192,125,222,98,92,252,207,4,189,223,244,241,232,153,4,92,86,56,212,208,164,140,142,226,227,49,159,90,97,49,116,227,120,249,32,182,11,88,162,253,10,177,68,102,125,107,114,101,142,136,93,57,199,108,37,10,130,221,208,204,113,240,54,166,79,64,212,112,56,60,12,143,207,150,131,230,223,180,230,87,251,155,32,41,157,236,200,1,241,139,72,208,32,42,250,253,201,217,239,233,71,218,145,113,164,134,143,255,45,40,117,42,133,78,161,81,24,79,202,107,65,160,17,140,140,183,29,77,193,150,33,249,75,121,92,245,166,210,165,92,17,87,218,4,213,77,177,80,54,148,12,233,10,161,104,40,19,74,48,67,249,80,60,244,246,152,241,111,100,239,7,124,190,19,181,211,184,185,178,173,202,219,25,3,117,230,80,71,44,17,5,193,129,168,107,128,223,168,36,
+39,185,199,93,168,29,152,78,252,196,83,108,108,58,86,246,198,71,188,221,72,155,103,153,139,110,208,198,202,252,65,182,167,240,113,19,160,50,5,126,33,172,66,161,1,23,219,48,81,92,123,79,107,3,124,143,11,85,172,52,172,136,5,119,134,151,177,206,185,45,231,231,7,146,232,150,244,5,138,99,177,148,72,50,65,244,20,50,228,68,46,12,149,71,180,173,217,78,120,163,243,103,187,9,19,250,24,100,184,45,3,246,31,142,202,151,24,1,42,178,77,249,112,202,63,109,27,239,95,92,188,94,201,49,189,203,112,149,95,222,224,240,197,231,102,219,236,94,237,51,129,255,34,62,79,211,168,96,234,230,223,65,97,154,0,253,124,91,255,128,174,79,201,201,143,55,87,191,110,239,6,170,113,41,111,122,196,131,168,53,162,31,159,72,137,63,173,72,66,58,9,19,118,208,92,114,6,160,181,46,49,3,107,127,229,64,126,109,74,36,163,125,105,227,6,173,217,86,75,89,75,46,11,112,108,23,62,145,177,198,109,239,2,230,16,149,64,159,241,111,32,27,77,12,45,60,
+38,16,74,0,84,56,141,57,142,101,170,53,84,165,6,124,79,203,111,243,178,26,63,73,200,53,117,5,152,7,141,50,14,221,212,73,4,202,254,28,231,106,174,90,143,217,51,94,123,209,92,180,24,13,136,209,162,52,40,45,164,209,64,175,9,210,150,20,26,5,122,163,221,184,38,27,110,200,54,218,52,71,155,17,126,244,54,138,190,129,58,112,10,78,113,32,15,228,131,239,96,249,29,244,191,224,42,94,91,82,203,219,131,226,11,140,80,7,219,124,76,105,229,45,140,111,127,2,230,206,168,51,254,168,31,86,208,39,237,89,121,12,22,204,25,33,103,90,153,141,180,139,25,245,227,211,136,72,149,220,71,230,24,188,90,133,31,10,143,118,162,255,138,118,21,217,72,164,28,164,9,251,139,48,249,117,112,204,160,78,71,148,170,187,49,37,45,235,218,166,124,156,128,197,52,62,166,214,44,75,1,0,181,139,187,163,147,233,15,191,164,188,148,23,115,155,0,43,207,251,5,53,234,194,249,72,195,231,120,191,116,189,185,81,209,83,108,80,255,54,89,183,240,73,219,158,
+123,164,32,32,169,12,143,119,252,100,104,48,57,73,40,71,187,131,82,140,30,189,91,23,210,44,219,110,143,221,43,92,31,122,178,32,199,145,187,206,94,15,255,218,106,20,44,106,158,132,49,91,235,12,199,206,164,236,95,105,241,136,204,171,198,63,117,240,134,30,199,65,74,105,23,74,158,21,227,42,152,40,150,67,146,70,22,220,155,203,161,232,153,101,153,215,76,159,242,155,120,147,68,102,41,154,48,203,132,159,142,173,217,162,54,60,101,152,100,99,110,214,94,24,88,2,129,244,25,208,111,240,28,131,206,92,189,247,192,216,197,6,218,176,6,179,177,134,239,231,35,175,190,245,150,49,251,70,89,165,92,163,197,199,180,178,250,136,169,196,226,104,134,107,57,145,49,146,221,141,30,161,62,13,246,96,240,108,52,43,205,246,97,89,90,182,156,181,102,127,215,89,0,159,193,107,101,161,10,104,127,225,119,11,94,210,132,17,161,6,102,17,136,132,46,161,227,41,125,74,140,82,85,87,178,148,46,37,89,137,48,41,23,89,63,120,140,105,151,229,136,196,108,153,188,108,
+77,170,192,90,232,136,31,142,143,151,127,169,47,20,70,84,222,67,210,113,246,26,39,174,110,17,50,169,99,201,73,120,189,141,140,39,104,95,39,92,135,54,19,173,177,219,48,174,224,71,45,64,103,49,7,223,101,10,145,3,213,174,1,133,82,67,179,233,180,98,186,25,65,201,169,210,111,66,186,128,63,40,78,211,46,204,24,189,181,209,147,9,226,246,247,71,95,46,224,142,188,186,61,15,22,105,20,233,53,214,110,12,21,148,214,41,210,190,220,27,127,214,27,86,171,124,55,116,191,150,188,176,157,205,13,69,70,94,139,170,96,127,208,203,195,12,81,208,63,89,40,225,220,215,111,184,149,186,31,5,72,76,175,255,205,239,14,174,104,189,121,179,46,214,166,178,99,155,122,38,223,79,4,187,196,44,209,39,110,65,230,103,233,245,190,179,250,218,35,61,254,240,232,196,149,51,42,11,119,90,223,221,27,78,182,236,210,165,18,75,111,150,235,180,246,244,27,90,150,41,210,53,53,93,133,45,82,31,147,153,215,88,207,203,222,80,179,22,38,173,175,49,183,184,106,91,
+249,136,229,240,100,54,185,32,233,208,17,98,35,169,205,16,81,205,245,179,154,11,106,163,234,99,2,190,134,59,207,245,120,169,197,160,185,107,95,253,20,85,80,157,6,96,190,129,231,226,49,245,90,91,127,208,145,81,58,19,237,167,17,144,53,107,203,4,151,217,115,28,104,138,238,181,30,3,151,114,80,14,14,193,225,7,200,120,161,10,70,171,247,255,113,112,78,91,182,44,81,16,253,245,238,109,219,182,109,219,182,109,219,188,125,238,107,85,62,101,140,53,35,34,71,85,142,100,83,249,56,34,27,63,101,57,213,197,145,151,148,248,37,169,175,108,247,219,227,246,176,61,145,182,7,237,201,59,51,124,192,140,219,9,247,106,147,7,8,124,157,223,246,205,229,116,143,106,153,130,50,157,139,23,51,197,132,56,159,42,196,114,216,226,25,153,71,23,224,176,46,95,25,205,237,139,247,112,113,85,73,14,12,28,252,178,40,109,139,88,130,22,147,169,195,91,17,153,158,56,36,50,241,249,238,28,43,9,54,221,202,183,242,43,144,223,80,134,132,1,190,70,40,94,45,104,
+149,109,57,96,52,77,168,254,5,255,6,236,84,249,148,144,199,33,100,38,8,120,102,52,12,140,10,134,0,56,162,91,98,235,236,193,239,152,147,188,214,104,189,247,70,98,172,210,60,1,241,40,172,207,109,94,40,163,80,74,179,103,118,121,25,135,51,153,225,128,208,160,237,9,7,114,15,71,77,91,243,197,255,41,200,222,139,51,95,128,241,235,106,212,171,79,31,77,189,126,179,246,212,169,255,251,200,156,185,242,15,98,225,217,202,63,191,11,102,169,218,21,62,240,229,108,120,75,56,47,168,37,175,228,243,32,45,246,31,69,158,100,44,101,139,110,81,133,180,46,107,139,238,191,142,231,83,49,100,152,2,251,43,120,224,22,186,29,61,69,222,24,135,37,169,172,149,65,88,205,11,85,121,97,255,19,114,45,114,188,82,103,242,194,65,179,148,213,137,7,16,106,80,24,14,138,4,223,166,93,188,101,11,249,2,220,83,209,254,24,8,84,132,77,130,150,242,146,95,107,29,158,176,95,191,144,44,200,52,251,84,219,211,64,66,243,84,30,13,31,90,175,252,70,249,169,
+237,178,22,101,192,130,176,64,36,28,101,44,138,172,34,179,200,21,23,25,224,179,199,236,229,82,148,126,32,31,208,138,4,59,65,76,32,23,103,230,2,186,160,46,44,42,223,24,154,208,144,221,234,4,140,84,83,234,155,150,145,213,151,249,93,187,202,109,22,91,181,70,169,7,166,52,167,96,34,148,52,196,210,96,112,149,135,250,95,37,5,20,122,20,146,201,161,177,243,217,87,125,226,7,27,14,221,59,3,51,96,84,253,238,147,120,249,24,24,248,120,53,242,46,134,62,211,175,32,80,191,66,168,202,123,80,36,253,6,190,10,150,82,82,104,20,112,18,189,249,13,166,89,59,109,49,35,252,165,133,44,252,84,71,188,22,174,80,58,79,106,1,10,86,32,53,6,9,249,40,76,32,52,119,252,84,56,235,67,155,1,97,200,159,210,221,66,202,26,99,225,78,251,121,136,103,114,222,37,55,159,140,79,218,109,189,96,203,237,126,252,74,107,62,191,71,239,216,153,210,218,206,82,39,196,236,198,162,26,197,44,126,246,189,83,94,208,197,119,147,122,87,75,93,201,167,
+195,56,91,101,222,236,59,50,92,112,243,222,216,251,146,92,116,115,95,202,35,2,95,116,243,222,228,251,1,56,39,75,90,68,58,113,60,55,75,219,162,23,165,180,104,75,220,220,119,18,122,235,119,28,45,86,150,255,38,222,244,115,156,186,40,6,142,106,75,150,179,198,55,8,59,22,126,157,17,254,141,99,120,4,187,167,21,17,204,18,193,211,223,203,69,100,253,141,74,75,73,81,51,208,140,38,226,184,101,85,224,174,201,25,145,147,101,90,156,80,108,205,88,153,167,146,122,9,142,42,112,120,199,106,35,145,55,33,133,252,138,238,182,111,229,185,83,14,136,204,36,179,201,172,64,153,85,102,150,217,21,46,3,202,3,174,88,129,24,255,38,192,137,114,238,203,107,240,26,162,138,224,91,145,84,248,21,177,69,149,94,67,27,154,178,187,173,200,205,133,169,14,93,223,38,56,195,22,228,105,132,60,29,78,7,147,177,108,50,0,192,104,210,25,42,186,221,221,154,202,96,61,88,44,194,179,176,14,22,171,63,236,79,141,47,107,201,2,72,81,211,227,69,208,228,31,
+152,58,28,216,0,41,20,35,138,163,88,255,241,203,162,111,135,248,163,194,55,82,85,187,129,92,27,15,22,13,133,212,239,130,207,217,193,134,177,43,152,195,211,130,29,123,91,204,8,104,17,203,19,126,162,19,164,129,29,227,249,134,43,177,245,59,71,68,17,192,214,190,107,150,238,78,159,212,18,173,202,184,39,239,147,168,206,163,55,82,5,187,251,29,9,20,236,26,110,232,107,216,59,234,241,172,222,161,241,17,109,221,185,200,237,99,255,49,103,92,41,57,169,123,124,101,151,73,176,11,169,146,79,97,94,87,6,249,129,68,178,115,215,192,55,188,154,58,194,253,197,130,190,206,87,66,253,144,27,241,51,186,249,91,16,18,209,51,164,115,86,90,178,167,68,192,12,106,58,140,40,68,208,12,107,58,68,113,68,220,140,171,111,238,194,53,107,12,44,242,137,148,69,102,46,114,134,146,10,192,238,17,27,106,103,153,128,241,253,97,146,30,65,160,205,253,144,182,88,19,233,197,40,90,141,113,96,32,62,42,205,79,3,53,48,159,76,40,75,0,214,213,229,117,48,146,
+122,18,148,128,108,104,163,52,39,48,181,4,120,104,121,7,111,188,132,60,110,2,143,198,197,194,76,67,126,161,199,35,79,152,235,160,131,172,109,221,24,197,124,65,95,212,23,246,242,226,190,0,47,194,11,180,216,147,40,41,222,165,174,188,44,43,203,205,114,173,85,102,149,95,101,87,187,124,91,236,242,61,201,213,59,203,131,248,200,238,2,194,73,190,36,86,84,1,200,17,118,128,27,247,80,195,206,168,51,232,251,148,241,57,90,182,67,100,40,8,150,124,192,19,122,138,226,112,126,193,90,185,60,233,96,252,20,60,249,246,32,105,3,111,132,147,135,104,129,35,248,116,228,42,15,252,19,71,165,111,57,212,237,52,96,101,80,87,138,66,167,4,141,127,12,101,196,61,105,203,211,50,214,156,150,223,196,99,30,239,69,152,116,12,196,69,101,11,240,132,136,27,53,22,46,34,141,85,102,209,33,1,73,28,85,185,32,189,143,167,70,177,190,137,204,120,51,213,194,33,123,231,168,214,120,248,237,211,141,46,215,31,250,33,99,236,254,202,132,120,6,238,137,95,179,157,
+38,60,29,141,39,123,183,218,143,12,134,244,19,221,83,109,196,135,244,57,117,99,93,38,189,148,43,252,28,84,231,91,147,225,21,222,185,157,217,7,51,89,154,186,73,201,253,55,253,54,93,179,197,23,96,82,53,97,231,57,87,228,40,74,23,55,166,108,222,21,59,26,178,181,112,211,229,63,254,180,39,108,198,245,193,156,35,56,57,150,196,46,176,128,13,166,232,60,3,139,102,63,19,146,110,184,201,164,243,45,158,61,118,180,143,182,9,91,228,8,148,68,66,180,131,105,108,26,7,76,100,83,121,32,176,254,25,189,156,250,87,213,100,195,175,38,28,40,38,228,69,205,137,158,150,226,246,99,147,59,64,205,157,172,249,83,17,133,112,188,106,70,85,130,152,150,165,41,180,52,8,150,126,238,141,112,88,198,48,40,175,202,151,78,206,149,6,160,1,2,116,129,59,102,144,15,140,178,103,81,90,150,34,204,18,211,212,48,53,30,38,135,201,250,151,85,229,250,228,16,11,41,129,193,151,197,170,2,190,40,60,43,234,156,50,35,205,98,212,57,57,148,157,141,4,160,
+254,195,154,53,83,135,0,113,168,32,48,28,151,52,89,117,44,28,5,130,2,44,159,241,248,228,235,131,204,3,60,147,79,92,20,131,15,6,212,181,31,178,16,144,242,73,225,62,121,84,206,126,182,153,62,3,71,67,19,144,132,0,138,168,138,88,73,69,28,240,7,186,95,144,214,37,97,55,234,144,175,209,64,200,228,150,46,42,174,106,158,225,27,80,222,235,107,224,217,28,4,238,235,79,188,205,197,83,188,210,168,174,96,232,103,104,165,85,221,145,216,24,162,61,196,119,172,160,148,238,138,235,219,195,191,196,51,169,94,90,79,128,242,105,183,17,177,71,238,110,178,206,104,221,153,125,119,127,242,50,246,183,44,21,14,66,114,82,240,127,99,137,20,125,2,203,238,204,29,203,47,201,141,109,238,1,45,87,160,38,15,255,252,67,174,80,77,152,162,35,208,94,210,212,68,83,166,88,114,68,151,2,181,210,52,212,156,171,69,108,206,193,18,86,136,22,200,204,205,23,153,85,149,163,57,162,153,163,139,12,156,82,206,105,20,3,108,175,89,122,84,209,155,201,0,219,
+18,54,43,84,240,38,51,176,100,171,197,255,78,78,9,184,141,72,109,214,205,68,179,121,248,180,73,250,196,201,80,82,53,49,53,68,22,126,110,107,7,57,140,198,49,5,96,166,84,193,50,34,40,194,143,41,105,162,71,73,45,147,229,170,150,129,32,82,76,32,26,38,51,85,114,29,144,108,149,10,171,168,118,221,90,197,166,251,106,14,41,23,41,101,64,153,48,86,10,81,246,36,200,139,254,46,38,204,9,180,66,173,28,44,106,118,195,105,186,152,102,130,92,79,11,117,248,157,230,63,69,171,243,75,101,70,154,83,67,220,96,227,101,173,229,82,48,223,96,237,137,104,20,15,199,141,142,155,243,114,87,134,232,45,114,133,92,129,30,144,185,199,95,96,123,37,236,7,237,5,115,233,103,109,60,85,112,158,2,157,182,79,227,151,80,52,63,198,9,88,66,143,200,63,15,184,78,86,82,253,33,60,108,71,13,224,117,6,160,96,215,247,251,71,32,227,28,175,72,107,244,213,116,78,2,227,39,208,53,253,29,59,225,136,87,116,8,50,223,255,70,182,41,195,1,221,
+87,186,92,193,88,206,14,201,30,175,42,17,48,106,187,131,150,80,168,253,0,166,98,119,230,15,49,243,242,201,175,3,219,7,18,237,246,119,107,36,235,81,28,11,58,55,104,36,181,255,83,240,228,66,126,132,107,110,241,243,129,95,148,166,46,15,252,198,172,177,243,111,160,252,252,89,7,77,216,98,201,147,120,218,214,69,83,49,155,243,100,159,130,117,71,105,250,107,30,242,138,214,100,221,22,56,34,119,231,47,250,88,160,115,172,62,199,33,47,29,13,34,222,36,157,103,145,102,50,123,125,239,151,186,29,2,197,146,94,151,251,37,229,157,229,16,155,196,1,249,86,173,158,49,203,114,112,174,24,111,74,83,140,198,42,162,151,55,45,69,139,30,17,87,235,181,99,82,100,240,182,52,101,230,38,207,195,175,44,161,160,2,157,207,166,164,27,151,146,246,164,108,236,63,113,143,66,188,48,187,95,102,42,80,101,61,10,58,115,234,52,132,111,63,199,77,183,130,106,13,56,19,206,136,210,217,137,2,47,196,74,15,171,110,172,253,191,151,135,101,253,79,191,107,14,212,
+128,153,234,75,131,186,217,147,102,46,236,141,24,189,33,103,194,175,59,206,61,48,63,169,41,191,59,212,114,143,132,12,242,175,253,102,79,203,197,53,44,14,139,236,180,45,9,158,68,96,98,7,90,36,22,238,224,165,105,181,63,157,43,18,15,195,21,83,194,248,125,61,152,148,150,226,200,58,48,38,85,24,180,11,219,130,214,181,12,50,165,94,14,98,114,59,96,68,6,48,41,218,40,48,101,53,175,226,53,9,179,38,91,116,92,101,16,180,181,119,176,46,131,146,245,225,64,56,104,193,140,252,96,202,75,106,10,165,44,8,221,155,156,253,8,89,86,186,39,18,84,162,68,237,209,206,117,205,232,58,59,4,51,106,191,144,40,74,168,253,6,59,66,23,182,35,92,234,25,221,108,78,214,29,24,212,30,224,51,49,230,53,223,207,223,91,32,22,173,159,194,236,127,51,249,225,108,180,202,153,39,116,45,59,190,74,209,83,211,198,206,63,137,196,245,167,29,60,121,215,146,39,105,179,119,72,173,51,14,255,201,217,136,203,142,234,172,35,125,18,211,155,159,182,243,4,
+157,11,48,103,106,21,91,124,183,2,87,149,215,182,7,56,55,162,90,171,204,38,163,154,77,7,114,176,15,175,174,97,27,229,90,5,247,246,199,106,160,218,184,142,55,165,92,25,190,181,204,53,21,218,245,116,14,24,157,162,37,1,184,108,107,149,180,246,218,49,115,16,159,195,38,199,209,225,107,187,219,7,248,98,100,66,8,7,243,38,36,187,177,29,251,188,103,45,9,199,215,157,210,206,120,50,250,223,136,140,246,173,70,20,107,226,235,229,218,105,85,50,102,44,131,237,96,35,32,108,9,187,194,93,243,28,108,71,219,209,60,125,46,179,85,161,46,4,82,124,76,55,197,169,190,32,25,43,211,7,137,124,148,190,17,108,202,221,20,243,234,20,127,69,219,199,217,227,215,76,73,144,160,163,18,243,188,80,38,10,251,171,14,166,148,72,102,128,37,37,218,40,54,107,143,135,31,129,71,208,249,108,116,56,228,79,49,5,31,34,232,115,229,6,169,219,23,119,140,253,12,156,102,19,202,205,107,167,8,71,41,19,253,184,34,44,68,225,47,237,196,153,180,4,199,42,
+56,13,191,78,18,49,63,149,105,157,61,145,140,9,98,56,133,99,160,88,35,43,162,94,254,192,31,248,196,32,10,107,248,60,168,248,47,213,126,109,109,54,199,68,229,181,93,72,237,103,229,36,35,191,211,137,155,102,49,190,81,94,106,11,107,177,121,136,147,198,117,138,56,73,145,170,88,242,84,156,36,91,35,72,64,218,49,67,39,128,240,70,223,15,207,255,3,0,249,126,64,62,193,4,55,191,250,53,21,165,191,88,156,62,54,101,103,58,155,175,175,27,223,88,155,66,132,185,59,215,109,214,204,157,94,75,185,235,249,103,58,46,117,249,139,15,5,155,148,217,18,192,70,178,229,204,178,141,173,141,43,124,30,182,238,20,69,18,106,191,138,165,222,226,112,20,125,93,53,93,175,39,92,213,190,101,154,125,238,214,29,188,73,27,202,115,108,224,93,145,7,170,22,223,140,110,220,7,14,23,255,68,181,252,135,33,52,206,22,95,89,45,218,191,223,75,217,210,171,16,222,42,31,198,163,141,19,239,12,106,88,45,160,229,128,141,149,9,74,1,173,170,134,111,236,143,
+67,57,43,246,91,171,1,141,44,13,223,175,68,213,244,175,166,10,215,51,120,214,152,136,79,177,231,15,67,251,72,2,30,176,152,120,62,102,189,233,240,32,118,53,121,215,2,13,197,98,178,148,138,137,103,100,146,226,133,21,126,185,236,206,35,205,118,200,236,245,163,97,107,84,33,201,143,138,231,172,118,88,34,72,209,67,52,163,173,218,237,63,195,212,254,216,52,36,82,167,240,136,33,148,214,11,119,186,69,227,164,183,48,3,213,184,53,247,75,99,77,113,124,66,106,8,153,8,49,83,200,148,54,121,170,170,40,137,84,108,242,234,84,46,134,203,38,189,120,124,58,1,36,119,36,90,131,18,145,228,11,79,220,70,7,158,120,201,57,19,137,37,124,137,109,102,28,1,19,244,6,189,4,177,1,193,204,173,138,52,76,193,185,227,95,82,176,202,156,130,136,5,90,219,149,87,33,73,241,67,106,120,52,34,25,193,214,149,99,148,126,72,120,144,123,25,169,249,40,155,214,25,41,124,232,26,16,29,135,64,66,135,167,151,4,83,41,148,174,147,157,105,131,248,54,225,
+99,203,249,187,51,166,91,77,192,180,239,65,214,229,209,88,206,53,90,137,30,1,73,44,56,205,253,234,183,60,118,217,139,193,97,179,68,218,127,9,138,171,102,255,116,89,197,217,221,155,84,197,28,197,123,217,20,115,124,240,90,82,239,208,137,181,29,40,28,232,101,223,51,123,246,119,101,21,34,238,170,63,69,173,59,244,128,59,175,61,47,225,11,126,45,173,163,43,254,139,125,125,164,7,46,222,27,251,232,168,119,225,40,139,243,134,203,31,212,29,57,210,18,219,222,132,7,245,82,31,50,215,56,149,248,245,125,20,248,123,226,80,30,45,187,177,42,65,75,149,93,71,47,226,157,18,63,166,53,87,220,150,96,138,190,28,218,251,231,0,36,76,248,36,46,223,43,249,165,160,239,113,240,220,43,244,117,167,47,87,192,84,198,147,186,2,45,94,210,236,168,180,62,174,43,79,147,92,238,72,192,89,135,148,10,172,91,82,176,218,81,75,57,20,87,20,148,190,195,181,51,199,145,41,88,54,147,207,112,17,135,77,236,205,155,79,210,94,71,204,99,53,163,87,77,100,
+115,11,122,139,73,173,93,143,150,137,236,233,110,144,150,70,227,105,114,249,196,42,94,148,23,166,37,71,12,71,200,132,63,163,160,17,197,58,233,151,122,74,33,18,29,142,120,93,122,200,170,25,178,56,104,73,41,153,150,241,77,97,197,121,250,118,42,18,2,251,75,211,90,252,1,9,211,106,117,254,137,67,176,233,68,136,78,224,53,172,247,37,237,33,194,226,34,195,1,126,148,61,35,136,51,172,144,88,132,186,86,119,177,152,102,84,210,101,1,24,47,238,254,131,54,163,211,232,194,45,81,136,154,98,99,227,132,108,8,55,180,2,81,23,99,43,217,131,89,129,237,211,57,38,56,155,66,66,107,254,195,26,87,30,140,229,92,197,175,242,17,142,4,199,61,112,207,129,28,210,241,166,185,144,173,182,110,196,173,196,182,60,169,52,178,229,29,6,201,197,150,203,111,111,10,89,158,212,21,122,119,111,140,152,213,52,247,188,176,106,81,169,246,40,173,122,5,114,229,123,179,118,22,22,73,21,215,133,52,32,180,185,27,59,224,81,32,182,249,90,182,127,204,33,160,114,
+150,100,71,154,7,224,8,169,140,37,150,236,126,3,99,68,85,86,38,229,109,225,190,6,204,59,32,176,114,151,32,151,136,247,229,96,6,194,108,32,45,228,46,105,78,20,213,111,192,22,196,31,229,86,205,89,37,144,126,90,196,117,141,78,4,122,194,209,121,154,84,23,239,103,26,177,15,216,142,56,218,0,87,141,12,180,170,151,115,185,28,162,158,190,161,54,146,223,39,73,69,234,173,0,87,153,45,212,77,117,118,112,123,94,133,185,112,246,86,146,11,17,242,124,129,0,108,64,18,227,183,16,126,4,31,111,91,144,2,7,111,185,38,97,224,136,120,41,234,118,185,200,86,9,138,23,71,8,181,51,115,124,183,49,80,130,11,129,108,62,166,108,148,121,57,209,79,137,83,27,116,62,210,146,192,78,115,223,135,36,75,230,160,70,197,18,242,70,36,233,129,211,45,9,115,208,66,212,195,90,9,164,79,104,18,13,196,185,159,158,228,241,203,157,57,222,203,27,214,53,56,239,31,181,166,160,95,86,79,102,86,226,47,53,104,163,103,152,23,23,210,98,212,133,82,144,
+83,234,129,106,244,213,139,124,105,86,66,64,159,156,125,216,30,159,227,84,4,77,92,18,165,179,136,177,160,85,207,143,219,88,155,88,117,176,117,138,193,14,168,20,168,177,56,26,51,203,82,112,182,167,207,38,98,165,144,11,182,139,11,148,226,254,128,73,177,247,79,43,19,116,182,188,97,125,219,176,233,14,35,227,180,166,221,75,212,53,156,225,160,5,255,216,18,215,57,212,126,193,9,185,199,115,249,227,185,97,177,215,238,222,191,116,189,133,14,134,111,124,135,159,137,215,189,223,155,123,145,7,75,3,233,154,127,113,7,31,33,130,91,116,197,246,58,96,88,72,202,230,92,97,240,94,21,70,146,180,197,182,43,162,71,13,212,136,208,85,78,41,190,98,251,4,62,156,64,100,229,21,73,78,37,174,101,247,118,113,88,130,80,147,154,34,235,192,93,11,235,161,131,176,54,196,162,64,197,99,191,222,38,192,119,9,39,156,89,46,215,134,233,226,252,108,208,145,77,195,228,234,15,7,201,64,52,16,141,7,2,194,119,193,151,236,180,128,199,21,180,251,110,182,10,153,
+119,207,40,118,237,118,79,30,48,110,81,55,98,73,178,134,102,137,86,139,164,158,234,101,212,88,219,34,131,200,35,212,177,195,74,35,214,191,46,61,127,152,25,104,12,231,125,60,126,241,154,170,123,60,59,59,239,18,137,62,114,87,149,83,21,70,157,48,249,163,42,81,14,92,68,44,129,145,159,78,209,152,104,44,82,11,197,180,246,229,58,178,240,255,98,34,135,216,156,173,101,204,188,110,70,10,240,195,122,51,3,135,191,74,184,214,47,228,246,172,184,111,253,106,173,73,198,154,162,80,116,19,188,172,219,244,34,64,202,0,15,164,22,227,200,42,48,194,69,20,205,29,196,28,232,84,148,162,156,218,96,211,222,69,160,163,49,149,50,186,229,58,253,134,56,68,161,117,23,67,104,199,3,190,79,208,107,161,26,204,82,219,44,246,201,148,175,4,146,32,98,58,123,239,100,223,10,181,217,92,114,141,231,52,113,150,179,159,241,177,207,164,253,75,117,90,109,147,118,4,189,108,57,83,250,49,178,101,75,214,139,224,215,14,64,252,11,96,118,218,22,115,40,79,95,94,
+61,23,219,157,190,223,197,87,255,252,249,86,53,105,108,210,251,92,237,199,10,113,37,219,1,187,16,74,109,144,219,123,215,176,65,110,208,111,67,69,251,24,16,11,96,220,253,106,224,65,179,12,216,220,81,137,137,62,223,5,72,220,116,8,115,14,121,222,177,154,12,30,184,193,3,58,12,162,77,59,208,125,138,199,251,170,224,27,37,229,224,209,189,248,186,105,16,194,88,209,99,214,129,187,77,57,248,190,101,155,54,26,252,14,226,90,17,229,102,65,63,183,65,218,144,17,65,152,52,224,222,43,157,51,104,57,124,93,150,153,42,44,19,113,30,23,135,248,15,20,255,123,162,180,5,31,36,98,227,47,189,176,123,251,149,208,212,194,218,244,119,226,199,164,238,69,187,246,159,41,185,141,203,118,238,191,36,134,111,255,145,157,131,115,51,14,153,77,106,228,167,129,172,192,102,27,233,116,145,248,84,16,17,15,113,157,209,22,20,240,169,89,61,141,216,108,10,18,136,80,168,175,98,32,240,40,4,252,167,127,44,186,220,76,230,101,112,58,61,194,87,87,222,161,208,161,
+172,205,218,68,151,76,218,88,181,181,52,144,53,214,116,76,253,147,14,210,171,170,194,50,85,144,231,85,132,133,120,68,21,127,185,142,199,84,61,21,59,53,71,162,225,245,79,180,184,107,189,251,232,128,255,190,214,106,254,36,179,216,118,251,116,2,230,42,145,36,50,157,238,185,190,153,183,219,108,222,150,74,187,147,156,76,126,185,30,161,32,148,68,69,28,175,26,235,38,95,57,70,204,203,63,164,130,27,72,150,59,41,47,178,50,54,127,254,31,82,151,126,224,235,99,127,94,187,199,207,243,213,199,186,218,31,135,246,115,214,200,94,245,147,55,244,144,59,163,188,152,50,220,209,26,170,218,216,51,124,161,222,173,174,152,95,0,69,178,88,234,131,32,38,23,76,247,200,150,236,96,143,153,121,130,113,120,67,182,55,183,34,87,236,175,163,35,116,37,202,189,33,146,196,44,107,252,67,144,69,154,102,228,185,188,80,17,9,85,177,42,158,35,112,135,163,15,36,225,215,91,34,81,104,43,189,96,24,150,252,34,83,74,250,237,24,102,78,144,4,160,72,145,248,64,32,
+18,152,5,230,241,201,68,167,98,94,103,211,83,4,22,48,112,38,211,27,90,36,2,197,41,235,232,120,101,1,142,231,18,133,245,193,45,41,12,135,219,235,34,158,173,31,176,132,45,8,1,4,67,193,133,225,84,37,130,38,131,229,71,81,59,42,67,9,197,201,99,15,175,72,58,245,115,22,217,180,95,152,244,121,38,186,226,115,143,149,121,95,130,150,77,186,31,15,179,78,146,80,255,37,246,23,138,180,65,12,191,174,156,78,209,37,148,250,226,145,70,182,208,177,82,51,202,106,24,95,247,91,163,2,252,22,224,224,179,108,238,144,213,186,115,163,169,124,203,230,190,63,108,115,3,162,141,75,255,86,163,28,56,105,76,88,8,169,43,78,125,32,188,236,254,85,115,208,24,243,4,66,102,132,201,71,164,49,149,54,26,163,39,20,148,88,68,101,13,22,126,0,158,13,10,9,183,206,143,55,182,245,186,255,230,241,156,203,135,155,80,245,107,109,50,239,92,240,199,116,90,170,20,139,201,34,139,161,224,30,102,112,236,139,155,255,224,156,87,251,230,76,53,52,91,78,
+191,125,188,108,217,82,117,36,154,229,72,194,185,182,71,21,16,140,218,110,104,174,228,27,254,104,111,223,225,246,226,206,46,183,199,69,112,251,93,80,75,90,155,171,51,120,151,166,0,128,93,75,186,185,125,30,128,121,75,174,117,123,71,64,239,79,83,205,206,228,35,195,1,82,4,75,189,171,242,125,99,64,21,65,90,144,109,229,222,230,247,240,3,192,34,93,138,92,93,221,155,255,50,0,102,112,126,129,116,105,115,37,30,93,236,107,254,98,0,109,5,216,129,60,81,102,218,152,174,214,147,241,238,59,214,16,12,15,113,84,49,4,103,145,250,181,139,177,157,173,254,71,241,211,136,35,129,121,74,142,42,34,132,125,37,95,11,39,50,65,213,63,110,94,41,55,109,248,113,187,13,32,167,135,185,192,126,193,13,25,72,130,107,50,152,254,99,148,240,52,177,158,31,213,7,53,193,1,176,30,178,226,81,67,52,134,22,39,155,195,116,51,43,207,26,64,202,1,45,212,24,97,144,144,201,242,156,159,242,186,203,19,219,159,1,23,251,0,23,104,226,110,108,242,25,255,
+48,226,132,14,209,232,52,143,26,26,198,213,78,16,93,224,91,24,203,183,117,102,68,146,9,152,168,150,221,174,128,62,96,197,255,19,117,219,169,121,72,78,111,53,218,128,56,56,90,30,190,165,12,128,96,71,7,152,57,239,98,40,8,69,88,51,91,151,137,100,32,221,29,31,224,162,166,71,124,152,159,207,106,37,163,87,4,7,195,140,200,84,86,111,87,50,229,153,33,17,149,210,93,76,145,158,236,29,60,1,48,5,183,175,202,101,51,220,166,115,190,224,47,46,152,217,166,124,43,177,48,241,12,8,167,146,175,71,131,66,169,235,21,184,55,134,27,207,168,242,78,144,55,135,181,133,186,221,201,251,140,169,118,183,16,32,164,153,253,9,138,249,14,179,254,225,235,3,122,151,161,183,45,242,242,78,181,151,220,93,162,249,117,79,144,19,234,95,49,41,109,218,184,41,217,165,157,110,235,212,169,219,245,60,90,94,148,105,143,19,188,55,49,19,59,126,90,226,220,140,119,205,200,206,154,94,22,28,131,203,122,104,169,211,69,206,212,207,137,158,238,138,99,105,44,143,
+91,138,76,169,39,123,116,221,210,247,198,193,52,158,99,99,69,178,212,153,221,46,57,31,23,240,14,57,36,81,35,122,50,105,121,173,70,157,129,126,122,72,73,39,244,108,210,37,82,244,179,5,78,186,51,192,235,79,119,212,29,30,213,253,40,87,167,37,231,217,185,238,108,25,151,198,213,35,225,171,135,0,172,89,28,239,124,203,59,95,116,139,30,110,199,1,22,51,81,135,249,118,50,149,88,227,137,178,38,173,228,183,6,234,144,4,206,123,30,134,17,31,5,56,89,217,17,208,82,71,207,123,125,222,179,143,99,165,92,38,196,14,123,177,176,145,59,255,93,16,11,93,82,6,31,77,36,206,7,131,144,161,20,178,73,123,145,190,253,155,31,71,137,131,34,172,26,13,217,40,8,2,138,133,131,33,189,93,42,169,219,10,63,36,185,110,133,240,10,0,155,123,4,95,153,53,43,82,37,104,243,34,11,84,198,253,4,147,191,166,173,9,118,129,53,44,52,243,245,9,21,51,147,136,2,40,119,179,241,144,76,169,18,132,227,8,195,26,26,81,105,163,97,25,206,129,
+128,195,19,22,94,112,166,174,188,54,16,115,58,229,43,193,36,245,144,102,187,182,82,15,57,223,152,44,24,242,5,111,105,192,68,179,183,29,201,124,144,182,222,41,53,66,153,216,28,207,28,234,182,112,236,75,166,154,227,34,135,144,106,14,39,22,116,148,61,238,158,158,39,70,254,142,222,182,184,39,230,185,123,72,93,7,169,183,222,0,103,167,44,173,126,243,89,60,1,44,111,108,188,111,96,222,246,78,50,189,207,99,178,7,86,74,181,183,69,243,172,232,209,200,74,236,37,209,59,107,78,61,180,210,121,202,144,80,193,56,237,137,163,107,24,219,203,162,99,140,98,192,42,219,23,199,210,52,114,227,8,229,209,36,230,215,194,98,219,29,199,19,119,58,75,231,185,67,158,58,154,195,224,89,66,59,61,114,76,77,104,133,192,220,48,61,18,136,46,28,38,72,38,202,98,105,204,110,141,121,103,4,4,20,199,30,143,235,70,34,69,214,199,9,226,137,165,19,209,16,128,183,227,112,197,104,111,134,90,165,38,21,27,205,242,176,114,5,75,239,8,58,12,200,157,132,
+28,222,52,16,132,12,226,175,53,165,138,182,242,201,226,118,20,82,83,75,165,88,224,208,84,149,230,73,79,177,241,161,102,252,247,218,184,87,122,29,207,191,148,21,109,196,176,243,208,137,226,3,74,168,227,91,242,245,40,38,10,35,217,132,36,194,204,119,4,69,33,191,45,83,73,189,82,228,95,25,19,255,234,247,251,238,21,8,252,30,181,81,36,14,39,42,189,197,216,214,42,205,159,41,251,35,179,102,187,214,174,81,96,122,167,190,33,62,71,11,91,178,204,130,142,19,110,240,242,3,174,100,87,83,137,199,49,69,40,34,117,41,141,206,19,157,169,0,194,34,42,173,215,249,211,95,155,91,120,194,22,67,246,80,244,103,253,54,117,79,185,82,250,152,89,60,155,242,181,216,65,87,244,34,10,230,173,20,5,22,166,164,234,113,10,183,218,56,197,138,191,252,108,125,29,209,123,147,101,143,63,229,75,150,55,144,255,51,68,79,212,95,124,93,186,4,172,103,232,22,174,12,206,208,18,122,11,75,17,95,51,82,49,97,107,245,250,207,96,98,110,177,99,211,187,58,
+217,172,119,156,233,67,158,146,53,188,148,244,241,142,178,53,178,234,217,131,34,73,87,77,193,198,86,226,96,78,214,227,148,102,125,51,146,103,245,7,94,50,76,73,168,84,229,186,194,232,74,22,152,212,241,157,34,81,169,87,245,134,241,223,197,67,209,2,91,108,77,126,41,253,95,85,176,30,49,160,72,127,115,105,192,143,21,251,100,170,98,24,78,141,60,213,40,63,174,39,18,133,149,194,162,164,223,33,59,85,68,108,140,19,194,81,6,185,134,138,86,104,202,121,178,238,143,104,101,217,84,174,172,234,17,221,41,132,49,73,37,175,114,165,73,37,38,247,171,248,89,21,109,26,124,14,56,200,86,135,56,77,189,178,43,61,118,5,191,57,76,73,10,241,137,56,196,228,211,130,198,123,2,100,54,243,120,202,228,149,30,139,222,1,87,139,25,191,114,233,134,75,76,170,198,228,172,239,197,144,240,138,133,129,11,168,150,64,45,242,189,246,94,189,21,135,66,11,46,10,95,163,120,144,5,47,96,155,204,117,59,67,158,143,87,181,130,209,70,199,128,216,187,24,168,201,
+41,35,55,90,115,224,17,138,222,166,83,39,71,68,146,95,99,7,53,148,63,11,100,82,82,138,196,41,43,78,85,175,28,71,140,233,18,129,136,68,105,83,58,71,52,166,10,22,69,168,84,222,235,223,218,136,109,225,9,83,244,132,250,203,31,245,219,116,222,89,93,76,71,134,99,46,234,219,137,178,145,140,46,117,76,59,30,230,48,109,13,229,147,10,121,140,181,95,26,126,49,148,229,141,190,233,78,150,35,190,95,190,94,79,112,144,122,59,124,88,92,246,68,72,116,225,159,236,237,59,185,236,118,191,52,231,80,65,127,78,254,218,166,63,74,234,183,173,244,78,98,183,129,216,176,198,23,163,159,68,153,186,211,155,37,184,71,165,164,70,86,124,231,9,230,197,168,170,145,52,182,33,233,253,12,228,73,231,88,70,178,88,142,206,87,136,130,103,200,148,190,48,220,76,163,89,42,199,226,215,204,193,39,36,131,106,199,232,15,227,105,76,139,21,116,164,190,45,56,131,224,247,40,34,93,98,72,81,166,180,180,142,218,231,139,132,242,67,146,94,162,227,77,244,120,190,
+60,21,97,2,89,18,158,164,95,242,32,205,72,97,196,162,239,226,248,221,24,36,216,252,198,97,225,171,90,72,10,230,207,40,38,253,55,46,90,79,64,2,82,10,198,139,141,149,66,205,35,150,137,160,66,77,250,30,63,14,27,13,159,100,246,160,105,139,9,137,187,181,68,157,155,82,126,35,253,32,160,219,5,202,17,73,46,92,112,199,161,3,69,3,103,139,47,223,234,31,147,197,194,196,215,177,54,9,108,100,97,92,191,217,226,215,184,4,172,40,198,77,136,33,188,86,209,114,158,207,106,23,191,2,80,49,32,187,213,224,130,52,242,62,247,118,129,180,90,46,9,202,225,57,86,32,21,227,224,61,221,77,100,59,216,234,244,129,78,85,9,84,140,154,206,32,157,98,42,81,19,69,110,38,254,25,141,214,224,240,237,68,172,160,17,149,42,90,27,225,45,168,61,60,97,228,133,191,172,138,75,3,49,166,75,62,151,108,91,207,89,135,124,35,85,144,251,137,137,130,113,207,249,200,110,199,198,53,156,152,117,227,242,31,119,197,136,116,198,219,75,185,51,157,103,255,
+150,246,184,51,213,75,245,126,32,112,57,211,115,208,232,122,18,172,24,224,177,185,253,166,168,174,47,221,226,14,61,154,14,99,47,93,160,162,94,211,131,89,60,255,16,39,233,141,105,43,186,235,210,210,213,28,35,186,59,210,214,193,220,147,60,26,210,115,136,105,90,104,165,142,98,227,95,231,181,22,91,113,212,81,155,6,154,200,243,6,71,122,39,72,28,105,190,209,116,158,51,10,38,187,100,158,41,50,36,110,84,122,202,208,152,220,115,228,163,128,18,209,83,198,57,107,98,74,215,24,240,155,169,56,151,20,83,146,52,61,105,196,77,244,232,129,2,237,80,239,27,142,139,233,97,18,41,24,5,44,173,72,144,77,147,73,34,139,32,84,195,13,26,159,56,211,19,171,67,231,86,25,44,117,114,40,130,176,76,139,246,170,115,118,130,143,209,107,240,2,205,220,156,159,8,21,6,138,136,86,93,175,53,246,164,189,120,212,213,74,0,164,50,234,69,136,219,161,177,136,76,32,88,53,54,112,230,17,113,146,221,166,241,180,28,69,14,77,115,56,199,17,92,203,25,14,
+11,132,252,92,158,119,25,241,0,220,60,80,202,101,66,109,15,131,115,91,134,128,164,131,168,129,193,32,229,95,167,184,183,202,230,108,201,253,38,13,79,239,30,137,157,106,120,29,52,137,96,154,217,24,45,64,209,27,13,92,80,182,231,107,129,124,51,87,175,155,140,174,222,32,19,83,113,230,58,118,177,33,41,161,212,26,189,35,182,3,0,143,18,84,170,96,77,103,73,180,54,241,223,124,38,194,75,93,58,104,194,228,246,185,104,91,251,167,105,113,51,138,59,177,77,121,97,54,241,11,175,12,219,164,24,77,79,91,218,137,47,65,166,42,237,85,63,123,14,101,185,162,215,107,241,118,145,116,169,251,222,67,193,237,12,130,71,215,225,8,177,102,15,204,161,193,43,65,42,164,42,173,89,255,121,104,110,83,146,216,155,217,123,139,47,189,49,204,45,188,8,3,159,29,17,148,99,68,55,77,49,124,149,103,164,54,234,120,48,64,40,229,26,41,213,70,31,92,16,79,121,117,35,149,197,246,182,240,158,72,202,22,75,34,25,38,153,199,9,244,225,35,16,81,33,173,
+229,142,194,229,36,158,197,243,84,1,195,27,238,253,187,87,208,32,143,20,82,34,90,170,160,103,15,36,225,22,34,124,39,33,229,37,121,233,35,143,147,171,146,156,244,37,106,212,104,1,22,65,53,139,43,9,202,73,76,18,55,21,14,137,194,88,87,41,16,212,58,6,33,233,112,88,195,143,68,14,43,248,144,114,100,160,60,12,144,243,151,107,57,178,80,154,17,226,225,54,87,73,114,191,230,45,102,14,183,152,86,39,223,120,56,209,99,103,16,54,1,115,86,0,69,16,39,13,47,17,83,116,107,200,81,132,204,200,69,82,98,227,133,57,71,241,43,47,247,221,25,37,49,86,95,47,210,105,1,255,174,208,58,10,137,98,113,73,67,137,92,152,112,164,88,197,177,68,88,207,207,47,42,90,74,196,12,111,153,30,34,232,163,190,13,56,81,17,184,183,129,73,68,4,228,123,206,120,148,76,80,169,229,31,107,244,252,113,42,157,142,17,130,72,148,38,39,242,70,187,42,119,241,84,72,231,245,254,166,77,29,23,154,176,69,91,40,120,251,57,191,75,167,191,228,200,
+148,178,93,27,169,64,75,126,166,91,203,209,197,5,180,46,109,31,148,50,93,110,169,6,45,177,244,162,188,125,126,187,237,33,61,198,198,180,71,62,250,153,219,26,103,169,183,97,228,254,153,210,63,239,133,58,122,242,15,227,201,100,85,197,245,32,255,54,209,171,37,184,240,35,108,188,228,137,29,226,4,45,65,199,74,28,68,113,189,200,220,149,222,249,113,187,40,64,37,182,226,7,117,156,141,22,89,137,173,244,193,226,141,7,69,88,130,107,16,63,152,226,105,66,3,33,58,199,57,210,121,34,90,32,136,212,241,40,161,175,17,185,227,15,226,9,39,165,167,12,164,209,223,179,26,97,47,34,198,169,18,66,74,68,79,27,228,220,17,31,174,136,23,126,8,105,194,154,208,38,196,130,133,129,37,29,143,15,106,102,137,120,82,224,120,73,40,253,88,20,82,81,237,68,130,105,24,79,8,83,63,215,106,111,201,100,59,3,141,243,22,177,178,153,114,13,178,211,96,153,91,47,227,32,161,78,166,190,159,150,194,192,84,89,40,244,194,106,215,137,112,23,121,106,152,250,
+122,185,199,21,128,197,75,3,251,168,17,8,247,4,92,70,164,52,172,1,152,110,25,173,149,211,53,223,188,234,198,41,202,147,71,126,182,53,117,242,111,60,205,86,191,224,253,207,38,84,131,119,41,156,87,35,20,16,5,42,22,145,49,74,22,141,236,63,71,162,19,107,110,66,42,103,56,203,124,87,247,91,97,29,32,67,69,87,192,19,186,24,186,83,56,145,150,137,58,5,100,208,245,250,241,168,0,205,218,48,122,181,112,81,132,80,104,45,209,247,119,223,177,63,38,115,134,68,50,68,88,224,141,200,188,194,24,223,117,231,96,169,133,201,21,163,197,14,231,115,58,202,136,208,117,171,176,29,111,140,86,166,189,154,247,153,29,26,215,240,53,48,79,21,55,62,161,190,85,218,46,63,194,241,132,229,8,82,173,119,81,27,133,213,28,162,73,23,99,207,233,178,239,249,182,77,215,255,192,207,197,235,219,255,109,142,169,206,87,229,67,181,94,239,61,170,25,123,189,15,168,218,203,249,62,161,14,157,172,26,115,12,109,103,54,135,254,149,154,116,182,154,227,72,67,99,
+189,216,157,201,123,78,243,183,208,148,28,219,52,217,171,188,46,190,60,169,143,54,103,91,48,29,146,73,205,218,105,218,42,11,246,224,21,227,118,58,79,91,157,46,152,195,172,132,78,212,70,231,9,242,67,152,162,51,181,213,65,157,193,22,6,233,84,101,55,58,19,240,1,77,35,48,14,246,201,73,187,48,116,235,216,194,50,142,150,4,213,181,147,224,152,95,91,248,146,251,138,17,253,104,238,23,209,121,178,142,64,183,24,16,118,181,82,193,206,13,175,112,169,15,234,132,57,234,117,148,29,113,50,49,158,84,81,186,93,2,251,118,116,188,249,177,226,169,254,92,65,63,236,136,174,33,141,195,170,17,46,230,172,129,92,94,19,133,110,123,239,42,106,57,188,45,109,92,125,217,51,69,69,202,233,182,16,131,183,114,152,249,253,61,90,73,196,192,228,247,78,70,131,150,251,120,176,246,219,156,152,21,118,187,82,209,111,53,9,130,25,42,147,208,72,218,90,189,17,77,65,167,150,4,239,230,84,11,110,253,86,64,68,139,110,132,11,6,36,198,67,89,165,234,52,179,
+193,181,158,36,66,32,252,62,224,22,58,34,38,148,220,68,175,9,190,248,14,184,235,152,206,88,226,55,195,111,145,55,36,51,198,148,125,151,253,169,138,201,67,140,190,162,71,241,188,95,75,233,96,38,209,180,67,155,9,245,100,99,58,68,213,191,201,115,235,22,161,215,23,31,217,32,36,78,71,21,183,201,111,151,108,60,134,217,30,79,28,218,24,187,222,228,110,119,0,164,78,255,217,38,227,99,253,179,205,185,179,199,226,18,92,140,222,21,174,253,224,122,111,208,147,104,121,113,122,61,64,16,94,199,72,108,248,94,9,112,50,194,255,48,75,234,85,22,0,3,200,74,104,173,226,57,78,207,15,64,32,64,100,184,130,80,146,70,110,20,158,198,31,4,132,35,160,52,188,65,52,57,164,127,113,136,205,147,170,252,93,192,47,8,8,7,67,136,40,9,45,169,155,227,123,6,255,9,64,135,129,142,240,9,81,37,201,229,196,57,105,78,148,3,252,49,86,39,210,73,92,162,79,135,128,187,173,107,205,0,1,198,134,195,241,220,147,88,244,187,21,247,127,165,124,120,
+170,3,34,137,118,36,10,79,203,215,102,135,133,136,136,87,58,206,125,10,80,196,150,34,25,132,9,48,21,87,51,146,16,114,201,139,93,32,8,67,97,25,187,242,178,1,159,112,125,30,6,131,57,53,142,82,160,117,250,137,105,113,164,3,150,61,41,107,6,130,59,61,120,64,120,246,89,204,224,183,70,109,231,26,56,241,248,182,46,45,194,133,47,130,100,213,236,115,156,53,252,39,117,140,138,188,187,187,37,233,240,113,112,168,49,93,217,21,68,211,76,218,189,170,191,229,181,130,179,156,87,247,175,35,227,1,54,31,119,1,237,78,163,193,34,81,167,24,116,221,78,63,233,149,178,58,204,206,143,6,46,30,148,89,163,46,122,254,102,236,141,213,116,206,150,220,17,145,21,156,17,145,51,199,245,128,174,28,44,161,115,245,92,52,140,197,58,228,91,248,40,227,180,54,228,75,248,100,33,164,50,108,93,103,148,62,101,41,38,161,30,57,170,180,183,252,254,26,244,213,201,124,156,174,199,151,232,37,237,157,202,180,235,49,255,67,109,88,73,219,139,43,217,46,216,252,
+21,103,180,3,23,197,57,85,219,182,145,187,204,158,153,238,61,168,227,153,204,218,14,89,216,163,161,153,161,219,166,195,22,34,117,52,103,206,54,235,208,216,130,31,181,25,160,45,70,222,115,162,119,130,20,226,200,24,109,231,61,195,60,48,69,230,152,34,67,47,117,103,162,44,141,205,229,222,63,6,167,40,221,142,50,178,166,223,199,149,245,77,133,233,112,35,51,52,245,100,2,172,50,171,44,182,45,108,13,155,67,97,123,216,34,54,137,205,60,177,81,108,22,91,168,180,119,14,108,67,66,152,184,64,36,25,92,169,164,159,92,171,37,217,238,217,79,91,69,94,122,112,88,198,41,206,74,122,122,87,10,177,140,11,74,85,233,32,122,108,125,130,154,229,7,22,184,146,130,31,3,68,34,161,159,82,174,81,233,169,55,232,247,162,209,128,60,9,249,253,58,151,222,135,199,203,19,236,19,165,102,167,32,199,35,137,75,89,91,162,88,241,100,110,74,232,22,44,99,49,233,90,144,75,171,157,147,202,159,114,248,200,120,222,166,62,165,140,20,77,32,191,6,168,89,244,
+79,125,252,174,219,240,186,81,171,29,114,33,155,161,98,114,174,180,161,180,82,78,250,238,172,27,78,19,17,209,47,120,111,28,74,34,168,7,106,73,47,229,181,124,86,54,141,69,104,194,142,21,101,198,21,158,41,19,211,156,33,157,209,120,27,49,106,42,44,97,143,163,35,44,10,44,157,246,60,55,244,217,110,205,71,147,135,179,218,180,55,82,226,67,36,99,221,73,48,68,122,214,214,73,91,203,175,73,59,78,37,191,46,63,73,108,226,126,197,108,219,195,145,217,240,217,159,163,149,147,63,152,127,39,85,66,174,13,217,121,129,190,82,244,158,73,219,70,110,18,105,4,170,247,160,247,23,94,164,170,199,132,110,21,77,36,78,147,14,89,117,228,94,31,33,211,170,147,97,11,182,119,70,220,6,218,117,232,66,237,109,195,8,145,150,29,150,66,69,25,58,207,29,222,81,120,9,77,173,111,12,78,218,208,12,145,103,11,173,168,200,23,245,75,11,234,173,115,64,158,54,76,104,237,146,65,42,74,67,235,99,212,33,63,50,64,149,11,150,197,218,212,156,89,239,249,
+237,176,22,177,161,73,119,102,210,82,89,175,156,77,66,106,91,163,212,44,131,234,159,95,105,86,191,73,226,245,220,180,240,210,157,117,29,187,149,9,113,137,111,137,255,231,99,52,195,185,228,39,68,72,41,195,80,30,8,9,3,196,41,66,185,163,176,193,148,12,190,37,49,171,45,221,4,106,160,206,42,100,124,248,171,132,11,133,191,76,168,132,8,39,228,146,231,35,34,209,176,11,106,209,22,145,7,236,54,10,145,109,133,92,76,204,145,184,202,195,123,39,105,212,239,183,214,33,32,136,255,56,62,236,6,40,1,198,59,68,240,185,224,121,108,209,15,253,0,213,212,52,128,177,40,151,56,148,234,173,182,51,90,83,42,98,111,14,45,94,36,42,148,175,249,23,108,7,131,152,212,247,195,249,168,221,140,166,163,124,146,207,106,34,202,154,67,177,51,38,183,146,39,253,22,153,137,37,37,106,127,34,73,131,174,11,103,212,255,185,62,109,208,106,112,189,217,156,14,73,55,91,169,110,173,38,161,150,80,202,180,213,163,134,107,214,86,72,87,203,24,150,108,84,68,120,
+94,101,159,243,122,59,98,188,72,251,93,88,63,97,163,165,147,86,255,161,104,110,237,169,204,139,57,68,72,37,111,228,94,36,101,5,164,23,126,156,35,9,243,100,76,248,238,73,96,243,229,76,196,142,27,31,72,185,101,126,19,178,147,199,146,13,233,32,195,10,93,112,68,129,46,86,36,210,74,82,67,118,206,115,162,148,57,162,192,18,155,19,148,39,41,35,107,231,31,68,193,41,76,135,25,104,143,178,131,151,160,29,144,227,184,172,152,159,8,82,152,48,29,107,192,133,201,165,177,28,225,64,88,16,10,13,194,131,208,35,228,101,132,29,33,70,152,17,3,55,66,168,144,159,147,176,124,189,187,145,41,241,229,250,91,27,25,233,22,112,116,44,81,140,132,10,149,197,43,161,214,228,26,224,32,66,236,72,205,146,70,19,183,15,46,217,216,62,202,212,231,18,116,244,183,54,184,132,71,32,196,49,15,145,44,156,88,4,128,91,153,4,170,242,85,139,192,154,74,43,228,23,19,184,199,193,59,160,211,104,22,97,175,151,94,201,127,101,149,94,123,20,15,168,86,183,
+77,38,38,231,77,231,68,227,214,15,10,80,189,248,219,142,130,158,10,218,146,66,193,77,120,100,201,79,36,125,250,156,240,98,77,45,186,30,207,5,232,178,2,201,153,84,239,180,163,222,152,50,17,119,113,40,209,18,249,211,177,65,179,24,103,35,159,196,199,229,112,212,109,70,198,81,54,41,103,109,145,229,206,145,216,57,217,28,200,155,94,255,211,145,142,206,219,19,194,62,135,134,41,120,124,109,207,70,125,222,9,145,75,118,107,176,153,6,148,83,230,61,202,199,111,153,182,74,212,142,255,135,85,164,98,229,185,167,184,138,219,240,3,236,216,162,218,237,43,31,211,220,116,170,55,124,121,54,158,252,95,228,142,228,21,188,60,1,174,64,239,226,246,191,160,172,208,194,66,237,210,32,33,62,151,9,217,200,253,20,40,135,196,107,194,54,6,63,162,10,168,97,87,1,9,22,189,225,248,130,192,88,9,82,192,202,120,78,152,42,67,230,112,124,125,128,114,4,85,96,107,188,195,246,167,223,12,158,99,134,249,222,64,47,68,249,42,98,32,253,152,74,196,235,37,130,
+127,115,168,131,81,251,252,192,0,84,254,1,157,65,105,208,26,244,243,6,5,65,67,80,113,7,58,206,241,96,61,248,53,54,147,57,170,140,238,103,101,74,56,55,215,90,5,195,227,232,148,125,58,43,253,176,142,2,139,161,32,185,217,38,197,112,182,132,159,183,129,73,253,99,64,22,171,196,80,250,124,71,189,135,134,131,162,0,105,192,238,160,137,40,164,174,32,96,83,186,159,78,158,182,170,189,152,119,176,44,217,128,193,183,125,112,219,208,16,41,9,19,158,32,70,125,217,197,251,249,38,171,217,184,230,244,38,91,163,16,42,201,109,251,209,71,205,104,197,106,230,204,40,217,106,11,215,134,66,112,248,77,53,105,1,2,13,72,3,20,192,141,7,151,129,46,45,101,174,143,74,163,215,37,88,208,83,221,90,212,72,40,244,211,201,176,233,165,34,176,57,153,143,4,74,30,232,247,137,49,203,23,197,226,82,48,248,36,168,21,140,21,117,206,146,246,49,142,0,157,147,46,186,227,101,3,136,60,44,161,118,189,38,237,224,223,156,142,202,36,214,192,209,92,246,114,
+53,17,185,102,205,199,37,157,81,202,176,55,124,214,219,153,245,138,76,203,171,175,118,240,142,190,248,128,115,215,219,251,182,158,248,92,123,247,141,29,9,203,135,55,15,254,194,95,128,137,78,11,186,187,83,30,141,110,11,190,203,82,83,69,255,159,43,210,182,253,224,63,87,76,209,33,186,105,176,133,56,138,141,169,179,206,250,23,53,81,71,109,234,173,35,247,11,28,232,157,48,153,211,204,12,157,185,191,8,186,16,216,34,73,34,78,53,159,52,140,142,221,255,174,71,170,220,99,104,75,205,158,223,61,117,106,161,117,97,131,62,178,76,73,54,173,50,107,110,195,111,6,180,94,48,223,180,179,140,210,247,154,101,52,95,52,167,132,52,120,152,188,52,204,226,160,84,41,18,93,231,208,145,206,203,32,156,88,137,45,236,204,131,221,11,34,183,92,150,103,127,162,63,51,54,240,87,239,143,173,228,63,203,89,12,101,15,232,193,61,90,141,224,71,133,14,73,90,100,62,83,131,123,122,241,200,110,91,197,86,169,59,238,198,172,33,16,134,119,248,181,254,149,217,223,224,
+252,174,182,150,25,36,103,85,71,226,182,199,59,233,164,89,30,73,16,174,26,13,219,97,143,56,201,68,148,251,35,97,218,11,204,148,32,100,58,202,145,40,255,201,244,123,98,206,222,178,247,72,181,230,53,166,254,164,253,197,56,42,83,42,29,123,61,41,132,67,134,97,41,19,89,163,154,52,195,202,208,227,103,67,90,252,104,3,100,59,28,38,211,108,62,171,11,226,225,163,7,188,152,202,217,194,201,21,34,45,186,232,163,253,204,70,30,182,184,253,206,67,103,133,218,235,217,243,197,163,57,237,228,200,99,130,205,154,79,71,202,104,151,121,183,224,181,204,27,215,128,201,114,246,121,115,124,235,238,119,135,29,109,177,71,134,122,13,200,132,2,90,254,31,164,236,219,215,114,171,170,63,87,103,152,217,116,25,195,126,40,255,207,13,121,33,63,31,23,13,188,168,3,242,19,39,13,178,144,251,138,62,68,198,85,3,173,218,159,27,134,218,184,177,136,207,129,220,72,2,131,42,84,134,45,112,102,126,124,17,52,129,102,168,252,128,37,48,135,158,176,12,26,167,186,113,
+112,111,62,252,17,68,65,104,24,253,140,48,80,133,110,176,56,10,87,76,116,117,204,65,67,19,10,192,194,56,133,2,183,192,49,112,13,28,219,129,123,20,140,70,17,103,41,53,145,117,160,177,108,186,70,38,252,69,252,148,100,79,30,114,144,189,101,51,134,84,8,40,160,69,208,217,43,204,30,249,14,48,141,31,14,200,189,97,92,212,110,98,56,192,225,136,149,233,150,107,30,238,167,68,64,164,246,214,93,200,32,114,105,77,129,1,183,141,84,184,144,60,74,237,113,252,213,159,40,245,47,107,12,212,202,204,176,60,46,174,180,74,7,66,137,217,29,15,83,110,232,157,105,67,106,205,85,206,109,162,84,197,227,132,119,183,90,34,101,20,40,244,76,235,161,4,235,55,229,120,180,0,206,67,114,159,149,224,34,60,232,109,64,127,192,113,236,76,170,79,250,69,103,14,136,152,180,61,117,152,68,217,104,245,63,138,10,187,9,174,159,206,33,182,35,142,243,211,180,156,149,11,42,73,97,15,135,144,207,200,82,62,83,116,39,203,40,114,171,232,98,140,250,182,49,99,
+216,98,247,47,58,43,7,98,175,100,201,29,13,251,178,211,32,139,236,87,178,27,185,170,89,243,201,46,39,132,50,110,38,140,6,203,221,103,138,157,23,61,176,229,30,181,100,239,216,128,220,160,85,238,208,247,95,185,8,75,111,101,41,207,139,56,68,112,70,43,240,133,27,13,121,164,46,232,174,136,89,253,121,12,216,142,31,149,112,121,163,95,3,178,179,70,151,5,206,192,179,2,90,51,120,129,51,242,227,16,18,30,22,88,2,203,49,250,131,42,214,198,65,120,108,180,159,1,48,129,230,10,100,1,79,10,119,216,122,145,53,246,197,253,242,88,65,63,4,136,130,208,121,72,3,126,84,184,51,43,19,64,10,66,195,234,96,184,158,222,87,248,57,31,230,104,208,72,76,226,100,25,226,53,80,207,115,238,230,71,31,134,90,249,81,167,26,43,166,225,231,138,217,36,212,170,101,49,36,66,40,17,135,117,89,203,196,107,150,8,199,183,45,148,163,209,175,132,174,200,246,105,39,55,117,26,30,176,192,54,8,135,88,210,255,121,19,127,251,204,205,13,18,83,236,218,
+166,192,83,208,41,230,86,246,52,228,139,92,201,100,249,204,75,59,72,135,58,70,13,202,198,170,28,18,132,131,128,146,229,40,233,248,107,211,86,56,4,215,169,1,176,70,78,98,154,128,165,142,149,76,97,238,98,34,47,51,127,78,97,73,102,87,83,234,51,120,175,216,92,156,166,188,85,55,90,187,219,171,36,83,140,98,92,153,122,208,106,253,20,52,45,67,246,165,65,204,7,178,58,53,103,230,156,101,45,73,134,160,120,75,205,173,118,48,76,38,5,105,94,19,108,240,83,164,161,148,45,154,147,67,186,64,33,185,233,226,119,155,228,26,177,153,3,117,156,171,10,181,183,178,224,14,51,115,217,41,144,68,182,138,181,28,50,41,158,197,112,128,140,120,54,61,224,199,209,209,244,209,210,87,117,17,199,206,127,191,203,51,224,83,78,170,184,74,6,242,163,247,41,127,63,53,106,175,251,115,5,172,24,216,93,253,7,248,139,97,64,111,22,223,254,71,58,0,178,224,59,143,79,252,243,83,5,180,176,59,163,210,183,254,91,214,194,162,119,58,223,240,39,11,192,185,
+208,57,34,207,226,163,188,127,166,191,12,203,252,217,17,157,137,151,180,87,216,122,161,54,134,211,55,250,10,207,211,19,43,29,221,28,121,76,50,75,222,178,78,44,114,84,11,42,201,52,236,115,219,193,174,157,172,133,71,84,185,48,31,214,6,175,204,238,70,204,99,33,92,211,186,244,180,48,91,179,33,38,7,132,22,247,159,65,148,102,220,57,203,207,226,81,150,238,229,143,96,188,172,79,38,239,139,71,194,197,84,210,236,187,164,22,176,241,233,112,202,107,237,146,100,2,176,31,147,26,63,7,215,205,69,237,220,157,198,133,96,34,226,247,44,254,151,58,56,55,149,49,2,217,22,197,63,180,163,61,116,11,111,108,237,234,130,12,27,37,60,53,150,182,92,229,60,244,251,152,225,22,17,247,37,113,228,162,30,163,81,49,61,5,36,104,43,135,41,120,220,219,178,147,109,201,145,21,122,251,98,48,71,66,138,161,143,19,169,210,246,70,19,52,197,35,126,160,239,75,225,161,58,213,103,166,162,101,35,40,251,140,28,137,131,157,53,151,148,242,118,90,48,193,75,145,
+46,186,113,184,87,97,165,118,47,49,236,134,111,176,199,227,144,180,20,182,232,131,194,229,103,250,180,23,147,241,196,6,115,221,175,161,208,116,211,86,11,76,211,171,199,55,243,60,175,148,99,215,213,236,122,156,162,87,174,191,237,1,83,107,222,85,146,234,186,241,190,90,43,183,251,184,23,179,78,215,199,115,58,202,185,64,211,7,115,183,15,166,78,143,183,251,188,251,179,245,146,151,250,106,93,142,233,123,22,237,181,190,90,103,78,113,51,253,229,70,63,15,197,187,116,151,255,189,72,101,217,92,136,23,221,249,48,222,166,219,252,184,45,246,165,201,172,149,139,232,120,85,159,95,111,240,158,208,70,222,168,59,253,188,51,206,167,137,44,234,151,91,231,30,61,119,13,67,243,24,49,117,37,199,197,249,24,129,228,71,190,243,26,31,229,103,68,63,223,121,15,110,186,106,102,73,16,209,109,97,150,40,217,174,1,164,171,142,13,89,92,113,13,118,141,242,48,133,89,46,7,223,246,239,14,65,28,28,219,140,4,223,196,167,103,251,92,197,168,179,122,138,142,188,246,134,
+184,122,98,178,52,177,55,206,237,101,139,158,205,111,103,125,39,173,168,33,66,151,82,29,168,145,231,175,102,83,99,113,57,75,64,237,211,178,183,16,251,213,243,254,231,87,152,177,73,198,93,197,255,196,59,28,215,153,152,25,106,210,75,136,221,183,5,229,247,38,164,223,116,45,195,241,42,120,174,59,37,209,124,107,95,55,58,90,114,173,208,79,6,125,164,150,80,8,57,144,100,187,39,26,244,232,30,169,27,179,119,172,79,245,185,46,103,153,72,194,49,227,111,4,230,70,59,22,38,87,209,82,84,11,22,248,4,216,194,73,239,123,148,195,60,191,201,236,151,0,230,48,213,98,142,15,48,42,164,100,115,250,176,239,87,215,156,188,182,89,243,81,206,5,133,54,110,38,48,118,204,188,77,237,219,202,17,217,108,112,235,0,45,133,155,101,119,238,127,250,181,134,212,23,17,219,189,103,110,193,104,211,227,217,69,247,122,172,246,245,26,247,135,76,110,244,205,218,73,246,137,40,157,59,125,47,90,135,125,57,74,199,190,153,158,205,237,175,217,19,61,88,4,23,251,118,
+89,247,251,82,20,141,109,52,184,103,15,231,57,59,104,243,43,97,57,250,132,232,217,204,211,58,103,228,43,145,222,47,208,63,166,142,132,204,127,231,108,254,112,8,66,100,166,182,177,143,130,214,198,169,253,1,43,100,69,42,39,110,33,179,81,83,12,181,29,173,151,158,94,25,71,202,38,152,6,0,66,86,75,115,137,69,11,51,177,17,7,218,183,46,167,14,54,45,75,62,49,196,111,157,215,33,249,108,230,3,239,228,239,46,217,115,140,190,224,114,85,252,149,59,248,119,133,85,143,30,48,1,109,100,183,142,251,156,15,193,182,96,94,88,6,190,173,78,147,122,243,176,170,253,3,87,13,7,72,108,10,165,233,7,170,247,105,101,62,77,174,218,81,249,146,129,58,235,105,35,241,109,62,181,90,225,75,18,142,112,13,204,143,130,163,246,241,147,254,212,52,128,43,160,80,14,58,198,229,28,63,96,53,104,44,172,61,42,120,10,7,80,244,220,73,254,148,202,184,25,159,144,104,124,25,82,161,157,168,197,173,96,75,231,72,113,237,139,227,175,224,206,157,230,220,74,
+18,143,29,13,192,243,99,97,46,205,62,55,197,4,142,136,34,11,165,212,241,139,121,26,177,45,250,100,66,26,19,87,45,246,176,32,155,66,83,118,99,72,254,155,57,93,246,38,234,214,113,87,184,137,218,198,221,134,198,174,26,55,39,220,202,57,102,149,15,175,28,185,185,110,83,238,208,131,238,236,233,184,127,209,20,88,181,70,107,86,255,147,249,50,237,253,83,230,203,158,169,178,151,47,103,102,127,206,200,53,199,7,251,184,108,93,90,211,132,163,90,177,91,245,25,245,121,163,41,74,61,153,224,153,163,46,154,237,153,178,163,188,116,49,154,210,13,27,114,102,204,171,243,142,116,204,182,168,206,142,202,188,37,125,198,218,148,111,215,1,76,68,180,144,42,189,62,85,73,79,108,173,49,223,128,233,110,99,167,110,72,54,10,7,174,106,68,130,236,20,41,46,67,186,122,27,167,14,113,43,228,147,22,29,172,17,115,94,64,175,14,66,180,121,155,108,246,136,222,229,148,18,131,181,21,24,84,247,96,119,86,219,123,29,252,37,184,64,164,150,156,10,153,183,251,38,
+20,204,101,32,141,82,203,224,41,235,138,108,57,149,75,202,95,224,254,28,55,118,107,249,0,157,208,113,245,251,82,114,66,21,255,197,44,47,233,221,237,94,17,47,61,165,48,25,172,4,247,35,176,31,13,128,153,68,8,75,120,162,179,143,123,103,89,248,138,105,29,235,167,17,130,156,45,160,20,200,222,129,77,8,108,214,219,73,165,104,221,137,208,209,40,252,218,43,8,179,243,140,191,9,102,49,80,96,238,3,210,236,16,92,192,142,71,232,254,174,12,113,163,84,185,169,82,82,13,95,13,108,204,198,177,50,213,103,250,130,101,197,207,135,128,120,199,0,152,61,149,150,242,2,36,103,15,9,201,88,170,70,206,157,110,88,214,137,218,166,79,155,227,154,148,105,183,71,29,133,44,206,114,50,226,69,255,60,235,137,213,62,111,6,102,182,227,184,203,216,215,70,253,90,13,44,211,174,199,203,178,93,0,154,109,163,86,172,255,104,52,183,125,253,250,103,127,91,151,107,190,31,179,181,223,195,1,222,167,2,59,152,251,61,178,79,234,181,82,215,171,7,29,171,168,200,
+142,230,201,181,47,196,169,100,90,171,185,186,90,199,67,55,73,5,83,163,29,206,237,110,93,136,35,73,53,245,1,209,102,221,166,199,188,147,22,158,209,23,179,163,194,158,53,158,93,12,48,72,20,111,239,105,206,125,72,89,162,180,122,187,196,89,28,204,205,19,242,189,143,125,41,80,89,106,181,110,105,144,153,229,180,2,134,66,159,148,2,143,241,214,8,17,86,7,88,160,75,52,0,206,96,102,225,146,180,210,30,236,132,218,9,2,189,6,23,56,116,6,90,135,123,59,38,167,127,17,63,200,185,81,79,129,221,137,172,21,209,136,71,118,72,232,76,189,25,62,26,252,137,165,137,109,238,140,144,80,68,90,85,128,41,69,136,142,100,148,179,112,91,86,11,163,170,192,179,138,77,167,1,227,244,67,21,130,225,195,83,27,75,89,90,31,169,95,195,186,81,136,221,79,192,43,166,138,78,185,240,177,53,2,92,33,148,143,214,252,141,137,94,65,21,29,49,253,137,133,134,214,179,87,35,133,111,36,25,138,55,107,1,54,127,134,184,245,164,143,15,168,60,61,215,179,
+54,63,154,166,34,69,24,233,26,211,88,155,218,205,153,233,208,74,185,251,240,134,208,252,224,44,60,55,193,88,207,64,136,189,27,165,205,234,99,223,13,155,76,193,18,44,207,117,154,236,161,15,48,14,213,47,93,0,222,199,160,155,135,244,15,244,97,203,185,131,210,246,75,78,188,182,27,119,35,185,107,250,194,111,148,155,254,176,185,108,211,174,208,227,238,236,101,189,218,125,210,252,241,142,35,220,202,237,139,126,179,150,47,79,196,111,198,80,181,251,53,35,90,181,91,237,137,121,57,163,62,36,246,100,165,178,213,29,155,35,10,107,213,238,76,252,145,10,91,189,155,18,243,177,162,172,44,105,15,144,21,217,81,102,84,238,99,79,162,168,80,43,77,85,117,193,147,152,42,218,90,229,73,85,168,62,54,93,242,180,133,131,226,177,224,213,55,234,74,221,70,39,147,97,220,143,4,85,153,168,6,59,113,171,84,116,94,3,15,71,63,194,33,210,180,65,198,247,22,215,182,32,97,117,132,69,175,65,133,133,20,27,28,113,157,252,4,45,216,89,1,27,91,229,220,107,
+141,247,1,193,32,168,166,29,169,230,142,255,33,91,200,219,159,29,14,170,198,142,122,171,144,139,224,52,186,103,10,121,106,255,31,71,87,213,156,60,187,69,255,122,113,119,13,238,238,238,133,224,16,156,82,188,184,187,195,75,233,225,59,51,204,176,135,139,103,146,181,178,100,231,134,175,52,246,175,185,183,44,105,92,106,131,153,228,238,1,214,165,88,67,50,12,220,170,123,79,149,17,76,17,100,223,84,205,72,195,131,21,74,177,186,91,211,45,91,157,113,137,169,166,153,30,52,39,84,64,113,204,77,16,92,146,76,248,194,147,45,225,203,35,105,230,137,60,123,45,246,22,132,228,126,224,109,64,111,80,201,31,50,242,80,134,31,151,6,222,28,158,204,105,138,94,159,140,94,241,66,211,177,201,153,31,203,3,73,52,157,63,234,73,236,133,20,10,216,75,107,73,38,81,80,146,147,77,145,206,160,253,25,108,100,110,206,218,99,45,156,27,255,215,29,254,200,16,136,244,211,17,55,153,188,93,174,220,40,66,176,154,30,201,161,203,117,247,226,252,253,205,70,215,245,211,
+118,14,109,55,240,188,150,83,79,125,110,57,79,14,229,243,103,183,227,97,220,129,0,99,217,143,82,196,15,79,161,215,167,98,228,34,114,254,126,235,70,41,162,252,235,225,233,245,109,24,125,83,148,9,180,79,187,36,46,26,164,92,131,213,91,232,182,234,227,48,106,145,97,17,168,154,138,110,112,28,197,147,244,14,115,81,233,3,91,120,161,114,251,60,196,67,133,178,221,88,223,198,187,103,132,222,54,63,10,27,180,125,202,243,203,199,185,137,105,117,123,10,121,198,232,115,62,247,21,104,49,157,4,19,187,222,150,5,107,158,24,110,108,174,172,26,104,37,209,156,229,10,6,3,183,199,108,101,103,96,57,105,23,239,93,193,97,71,111,99,176,31,52,216,69,211,119,70,217,158,137,179,150,197,7,204,29,81,26,158,203,85,220,198,145,233,233,156,39,208,162,165,194,49,60,105,20,95,155,82,221,60,39,99,28,41,61,40,32,250,57,165,143,46,27,128,242,180,129,132,19,222,214,44,80,251,74,27,203,202,102,35,57,253,52,193,41,14,51,227,30,140,84,14,99,123,
+127,241,157,76,155,206,224,117,104,100,179,18,93,39,18,22,139,87,75,137,148,219,105,19,16,218,172,211,241,116,140,186,239,126,188,3,253,6,28,182,233,134,214,177,95,29,253,101,191,170,64,46,83,252,166,104,142,79,168,141,229,60,161,195,55,179,148,46,83,101,13,36,1,106,155,74,196,189,25,212,160,55,249,75,186,86,219,141,232,96,34,27,19,218,66,196,240,96,224,76,60,254,113,156,194,120,126,230,173,42,43,153,184,155,97,17,191,136,103,179,128,9,6,142,173,104,171,19,168,69,54,230,230,171,102,242,148,22,214,59,125,57,93,193,87,28,241,84,252,125,251,18,224,183,134,221,5,47,118,27,222,15,128,216,188,147,23,115,125,119,178,35,128,174,199,114,110,238,158,90,219,237,211,49,158,115,66,110,119,187,125,56,126,39,114,94,62,102,163,107,123,2,151,202,88,213,204,85,72,252,166,251,188,17,221,253,243,67,101,165,250,186,228,252,124,50,39,80,23,250,59,182,194,250,104,13,246,6,197,184,133,64,43,112,136,137,100,7,242,72,185,237,201,163,161,112,
+112,236,89,153,129,255,51,193,246,223,202,208,169,179,240,124,53,191,31,207,133,168,153,96,38,228,10,192,216,222,210,64,45,6,46,54,110,158,89,68,39,172,4,92,86,49,213,219,110,67,84,83,210,231,113,100,73,253,103,50,4,254,108,107,190,9,199,193,249,234,213,67,250,214,141,25,27,242,116,107,51,216,224,180,186,188,71,225,127,125,43,75,251,146,150,51,31,167,51,249,186,158,85,193,30,242,94,76,15,65,184,160,102,194,57,66,95,102,203,208,84,38,116,135,240,17,66,148,26,255,84,171,22,212,117,83,112,90,40,178,75,191,230,18,79,90,169,14,42,109,221,38,54,214,84,90,41,151,228,18,237,66,171,146,131,149,71,18,69,56,113,107,155,77,195,143,228,15,58,168,172,48,135,28,211,151,47,224,48,27,83,20,107,35,94,177,125,22,132,213,150,214,89,186,12,149,77,144,5,36,139,9,29,49,80,172,152,146,99,19,186,181,216,104,10,30,87,138,133,50,229,159,251,13,187,82,17,8,24,131,27,50,153,244,6,134,153,8,45,36,30,12,219,145,208,108,
+186,238,118,17,179,201,119,231,175,66,128,5,234,174,241,154,97,102,89,95,23,211,13,195,225,155,61,183,78,188,101,18,118,207,123,41,161,208,225,10,118,251,84,156,198,1,146,237,231,118,128,225,244,166,157,246,110,159,142,247,190,56,99,211,198,231,249,92,15,68,132,127,217,128,171,61,41,217,88,217,106,219,88,9,66,246,241,34,205,158,215,85,251,70,136,226,102,151,179,207,70,119,58,23,102,79,198,138,29,13,153,25,47,53,34,47,71,11,14,78,199,128,105,14,134,61,12,156,90,131,159,169,132,144,39,54,120,4,166,212,248,47,28,225,139,251,61,86,246,106,32,131,170,154,205,89,72,186,6,225,71,45,171,132,175,164,225,13,173,30,229,71,179,48,172,49,127,195,175,235,47,181,181,193,187,59,248,234,187,140,130,248,3,166,195,233,93,99,112,213,187,216,74,130,211,102,8,149,6,173,108,140,173,28,101,92,86,131,23,238,255,200,167,43,89,175,50,185,80,15,123,133,72,205,148,149,140,214,163,53,211,112,96,26,241,201,50,81,162,61,65,113,34,74,170,125,
+2,135,153,125,118,41,138,55,210,52,86,250,208,18,149,27,95,188,99,101,6,115,106,46,129,192,188,176,85,137,147,139,81,82,185,100,68,12,208,162,251,17,231,190,36,10,67,187,204,243,107,197,31,41,248,82,157,174,239,123,20,109,84,38,210,113,92,164,37,17,77,60,65,213,123,155,240,213,205,4,139,149,177,247,41,80,192,113,248,9,7,130,66,183,179,93,45,86,92,177,47,22,135,237,157,88,10,13,239,139,219,143,255,155,147,115,251,17,220,22,29,10,184,227,74,127,21,18,12,58,176,238,194,62,61,119,187,243,23,37,116,138,156,107,123,78,189,254,246,203,192,45,246,247,61,24,125,231,187,187,195,210,197,160,8,158,171,17,246,168,198,8,5,151,195,176,154,222,171,213,66,1,241,114,200,167,227,234,111,171,224,93,79,162,105,35,164,190,10,152,254,123,47,169,0,211,67,117,65,80,15,156,203,67,69,237,142,123,95,231,1,190,189,24,83,47,87,46,130,137,198,18,194,14,249,33,56,29,188,35,223,44,156,167,246,58,35,184,252,146,88,109,137,45,192,98,
+215,206,188,111,209,67,205,216,67,227,220,14,35,58,118,155,207,98,41,245,69,158,163,201,126,103,40,4,119,250,108,92,43,79,1,169,144,134,137,52,226,55,192,37,201,107,67,105,141,14,211,140,15,192,220,41,199,209,174,213,77,72,247,0,225,29,245,148,162,238,235,182,72,76,11,156,91,121,228,128,140,251,122,107,237,84,57,126,71,202,210,24,66,215,80,214,116,195,225,184,160,74,203,188,122,56,131,229,198,54,252,179,90,210,162,75,148,223,117,147,164,54,75,178,132,70,90,201,143,219,213,35,146,18,66,153,44,92,250,116,94,120,154,184,203,9,99,224,54,112,241,86,111,46,22,101,238,177,195,126,194,245,17,107,219,152,35,73,24,246,167,250,125,61,158,167,230,54,181,51,70,179,173,45,79,96,230,5,109,241,231,106,151,61,42,79,81,161,113,191,171,230,25,252,52,197,88,229,222,123,178,74,59,37,12,186,79,109,160,120,200,69,89,74,147,80,247,174,43,243,123,222,155,223,63,209,242,138,224,42,26,245,144,98,202,222,186,215,136,137,199,11,245,185,37,238,
+150,161,79,39,132,234,26,128,165,81,238,50,91,95,34,95,79,76,22,6,22,189,51,102,43,240,222,190,35,24,114,136,120,222,133,35,82,76,210,34,16,28,119,96,132,50,33,231,235,222,237,148,238,23,234,47,166,150,119,190,157,186,132,254,75,102,189,9,56,142,169,188,82,56,208,249,159,159,78,37,199,235,234,116,59,133,181,227,162,67,144,106,124,232,126,243,173,108,151,141,171,228,26,202,11,170,242,7,172,23,55,187,86,172,251,72,207,101,237,245,154,165,26,103,132,26,177,189,115,216,237,231,193,0,10,101,79,81,121,25,165,13,231,189,37,215,116,42,171,134,197,153,170,104,216,47,143,168,2,63,92,92,20,118,83,119,167,51,9,27,224,158,163,88,4,125,173,102,112,209,13,238,62,195,241,37,252,204,129,24,196,5,188,92,210,74,74,11,87,55,227,154,13,23,195,158,29,199,110,160,138,102,247,163,93,184,58,212,72,183,34,172,167,150,240,143,109,227,78,210,64,154,143,180,134,127,28,248,113,139,26,205,60,138,172,18,11,105,165,168,211,210,60,110,156,22,
+58,213,18,32,238,32,44,180,214,122,65,9,52,92,44,243,188,10,79,123,136,12,107,194,29,159,133,184,244,190,7,42,178,17,43,41,141,119,66,205,26,24,38,33,145,23,11,249,69,219,114,243,149,88,147,214,250,192,53,149,176,215,84,241,156,45,176,212,9,142,135,225,107,52,150,162,168,7,251,53,215,118,237,100,149,194,89,248,237,108,99,203,199,23,206,174,123,177,235,189,88,32,57,241,38,108,81,169,150,12,29,188,115,143,152,188,223,96,13,91,210,241,33,49,147,183,207,164,175,183,56,166,54,89,195,39,198,116,251,52,173,159,4,210,79,235,54,141,38,90,174,144,197,170,254,73,76,93,228,166,167,188,26,182,248,201,181,128,228,216,55,19,94,62,167,186,106,187,246,185,4,224,39,241,93,155,186,103,26,28,191,230,45,75,230,58,42,207,89,156,179,147,197,157,214,188,209,175,214,120,169,40,141,148,13,239,110,51,183,167,126,167,106,84,113,67,8,178,31,134,211,71,43,102,243,142,216,66,249,47,182,177,82,14,39,60,21,4,241,98,15,127,125,77,87,63,
+12,165,29,79,113,76,72,207,6,158,165,8,212,109,146,90,182,60,63,205,206,179,211,12,121,230,158,233,216,158,51,144,10,161,163,216,138,226,62,239,111,236,200,185,177,216,84,244,207,29,25,12,23,13,233,249,53,120,109,15,175,129,53,151,1,201,50,198,12,49,227,170,133,194,53,112,45,229,230,137,73,130,166,56,125,90,241,177,113,124,136,219,176,247,180,251,74,34,221,78,107,248,138,141,84,179,252,249,208,26,225,194,26,167,248,59,69,185,213,25,27,87,48,238,83,238,196,240,212,50,169,128,2,110,151,85,168,156,21,3,191,144,98,177,243,134,35,126,95,83,143,210,208,224,105,139,27,110,44,234,212,245,35,127,200,121,175,219,99,201,23,150,126,155,115,93,192,231,253,250,55,218,236,12,167,224,227,144,174,217,203,218,107,65,136,113,221,75,63,36,251,46,9,229,228,227,23,218,52,247,26,134,112,24,250,184,200,155,247,135,33,109,72,120,250,147,253,118,131,156,223,221,153,255,124,234,123,79,224,78,222,202,67,228,15,229,104,70,180,254,172,38,79,217,241,228,
+189,91,200,22,206,17,27,23,98,67,96,48,118,238,244,219,198,237,27,196,56,216,33,235,46,12,126,187,254,251,134,64,92,147,160,54,8,172,187,110,4,140,19,190,13,109,187,104,23,5,141,101,119,241,227,193,107,220,138,15,239,173,117,91,77,112,128,90,53,209,229,2,246,108,128,111,142,24,134,107,149,61,108,156,52,89,82,8,163,73,159,250,29,21,45,141,185,0,51,183,181,55,42,164,82,22,26,77,46,87,37,18,68,136,203,117,120,44,227,94,51,76,236,22,177,193,227,99,194,66,218,250,90,246,89,227,48,168,230,168,83,91,103,76,32,193,15,162,15,242,25,62,30,171,71,154,120,228,141,20,225,194,122,20,143,1,186,52,136,14,78,210,159,162,43,176,231,55,28,60,134,133,106,179,140,165,225,149,116,32,93,244,91,58,16,130,218,16,104,224,120,135,254,9,174,155,63,104,89,174,204,169,39,66,71,202,223,135,135,242,81,76,38,35,234,18,1,14,136,190,229,167,181,18,229,10,7,184,156,199,8,244,179,239,65,41,37,55,73,115,211,132,143,137,46,93,
+25,153,62,176,9,58,209,153,0,112,214,64,174,216,97,194,226,136,18,71,133,158,18,54,212,78,196,119,130,203,162,139,115,201,86,139,84,124,237,176,195,16,76,19,31,0,102,193,242,139,124,247,193,96,111,187,177,200,34,102,55,166,228,169,105,95,33,52,95,117,54,1,222,65,79,38,26,31,155,249,153,71,57,89,34,241,111,194,236,97,207,247,241,157,95,140,185,233,191,252,194,117,121,199,169,179,212,189,103,49,140,29,229,199,194,225,99,70,63,131,223,224,41,66,72,22,206,133,201,107,60,57,95,39,93,215,49,4,236,127,39,33,251,81,9,28,205,57,129,245,40,196,157,183,185,103,111,96,192,213,9,42,19,224,89,12,204,62,28,95,249,109,77,187,186,169,177,170,33,174,221,185,183,213,0,71,83,51,19,11,226,193,90,153,126,49,255,229,19,242,246,191,146,155,59,119,150,55,18,103,52,204,137,156,14,193,5,250,65,60,233,69,224,32,18,172,175,146,167,1,211,35,174,224,208,35,240,164,174,138,180,70,73,211,53,113,64,11,110,197,210,55,247,35,198,211,
+52,254,161,172,102,13,198,52,92,137,206,147,34,242,126,202,51,49,214,132,200,137,183,112,162,43,22,182,148,133,97,73,74,188,173,174,156,182,76,184,160,27,180,250,226,97,185,88,30,22,128,213,109,52,23,205,74,131,59,173,107,217,68,182,241,200,250,163,100,202,84,58,210,83,21,116,90,194,250,32,230,131,255,124,105,25,14,154,43,209,153,193,173,85,165,199,64,58,61,97,181,212,153,244,43,28,206,150,139,178,56,220,97,242,81,232,61,43,115,169,181,158,211,88,120,214,78,159,183,39,42,98,196,32,151,56,236,241,95,154,95,26,253,241,86,89,137,69,183,88,55,255,194,39,172,81,241,162,201,29,155,212,47,249,41,228,52,157,139,26,114,44,250,29,197,19,7,144,149,61,136,244,215,84,139,125,186,204,141,171,49,201,215,8,209,179,9,19,196,245,232,135,24,227,79,102,121,219,224,228,186,144,170,59,202,222,67,252,161,243,143,184,45,28,47,76,204,167,184,247,253,119,87,253,251,229,215,178,74,52,76,202,169,255,125,118,118,63,91,210,19,76,109,73,1,112,
+62,18,202,255,108,135,172,149,102,38,62,199,35,142,133,38,79,144,249,222,252,124,228,160,29,209,119,106,250,199,181,251,146,152,253,125,62,186,193,232,218,197,41,201,64,10,75,162,103,58,146,45,241,210,113,16,254,92,51,120,126,240,174,39,217,223,162,92,145,173,213,95,165,212,117,54,43,148,75,70,121,50,41,142,229,87,78,68,19,237,148,16,231,168,160,77,215,175,65,81,79,98,183,98,128,11,41,43,175,199,182,114,141,178,150,91,177,154,37,131,126,169,108,102,179,53,74,124,218,175,72,247,122,9,231,132,196,38,41,166,234,166,147,174,10,24,48,12,228,157,21,20,5,171,203,71,0,93,35,221,224,196,27,105,245,230,138,250,31,89,117,27,53,229,162,58,45,107,137,234,80,109,135,193,2,89,36,233,4,211,66,173,48,102,176,77,29,171,121,122,1,83,28,22,233,177,222,224,72,43,40,49,58,115,145,130,225,38,92,61,150,101,249,231,82,167,106,115,131,164,242,15,154,32,33,247,93,68,215,85,102,166,15,222,28,125,65,230,172,84,46,103,120,249,113,221,
+42,94,191,252,132,154,215,233,169,109,98,73,101,199,69,230,214,76,29,73,118,208,21,231,242,224,254,59,145,30,106,125,213,180,75,229,44,209,113,224,90,72,175,127,48,130,98,198,208,118,150,119,13,67,65,115,84,142,204,233,66,90,152,116,90,4,95,199,27,206,92,13,61,173,225,228,241,57,239,147,175,147,219,145,247,243,118,2,194,167,160,240,82,229,244,227,193,239,95,118,106,248,100,152,110,251,210,245,229,23,253,44,238,194,187,232,247,209,173,28,105,44,81,225,44,40,30,83,141,130,251,65,158,123,165,211,41,83,100,127,228,231,140,113,252,95,60,233,20,238,198,62,32,223,46,165,197,134,77,136,140,241,137,244,243,81,200,158,73,86,52,70,103,179,244,252,90,146,231,197,178,134,213,121,86,8,236,26,105,205,219,207,200,151,69,44,211,146,227,84,223,185,207,230,78,30,71,224,17,139,91,154,202,91,201,179,68,45,247,27,180,74,7,135,146,38,223,169,16,224,23,113,135,106,87,16,202,70,72,222,188,83,29,150,181,12,57,36,2,85,58,119,81,203,46,63,
+44,29,68,52,106,91,160,57,108,55,155,194,166,126,9,151,190,218,121,245,55,219,205,247,203,70,213,199,168,50,202,118,165,154,101,80,203,212,186,105,43,156,132,146,237,36,152,100,144,217,29,99,186,60,215,164,230,10,81,64,62,185,21,140,56,39,189,168,149,201,62,53,184,117,28,5,42,69,83,114,90,3,96,141,153,84,244,212,197,86,58,140,134,234,130,44,151,125,108,90,126,156,194,107,251,138,168,159,184,193,30,21,170,79,19,18,46,10,173,125,238,184,174,67,195,73,131,208,146,109,148,246,247,115,7,122,86,87,52,186,102,95,156,71,18,157,77,21,167,234,122,162,212,3,129,118,63,212,154,196,171,87,246,184,250,61,97,81,143,77,150,126,245,101,47,0,222,225,136,25,177,135,116,67,95,168,180,75,164,114,48,101,168,51,50,202,81,93,254,244,199,64,249,228,247,57,127,247,78,246,159,219,196,34,156,131,151,119,31,124,249,122,241,163,250,223,183,240,179,116,248,68,179,221,206,128,121,188,253,100,23,28,79,237,24,187,52,38,29,207,239,7,42,183,24,143,
+255,37,244,229,127,133,108,211,52,243,22,76,125,52,186,197,219,108,102,30,53,205,15,97,110,60,209,92,83,197,230,27,250,102,142,196,107,58,241,179,62,191,58,32,205,153,77,250,103,111,73,95,115,179,39,67,201,171,168,107,81,34,86,80,247,168,34,224,34,94,123,52,43,217,53,72,57,1,174,19,114,91,189,167,8,119,87,125,78,1,30,131,39,26,163,39,236,70,35,253,209,58,10,24,225,64,14,174,64,40,22,28,171,105,80,219,245,75,253,22,24,66,186,42,57,27,207,205,99,73,72,34,210,146,23,104,86,106,206,213,236,77,212,87,149,94,164,87,233,101,189,77,169,52,40,101,74,152,110,220,202,66,209,182,32,10,70,201,188,142,211,145,118,106,149,101,101,153,68,43,89,221,169,75,41,94,94,28,9,153,106,159,35,80,56,173,122,100,45,150,227,0,186,84,53,250,26,137,112,130,162,47,73,187,32,235,1,58,187,57,31,23,51,31,191,191,126,202,105,93,228,83,123,185,201,55,49,191,246,201,28,220,248,140,84,177,197,43,146,20,49,75,130,45,220,28,
+237,153,208,115,63,162,19,7,129,213,21,25,113,249,213,56,132,249,167,111,183,247,199,108,156,52,54,61,252,158,193,148,78,58,62,107,94,47,203,101,252,49,241,239,249,48,45,248,212,172,127,22,55,40,247,226,177,182,230,195,5,190,221,66,123,254,103,213,252,251,194,212,210,247,166,136,99,169,255,109,59,59,10,47,212,125,119,48,180,219,129,9,200,251,133,69,168,244,115,68,241,16,202,111,253,153,183,253,122,170,39,10,18,79,92,125,75,52,98,48,218,189,250,133,201,172,216,15,113,173,108,187,67,164,91,179,8,165,200,132,218,207,112,25,214,151,78,92,250,252,214,104,190,74,44,51,157,210,27,202,114,114,194,64,184,237,40,114,118,216,242,100,42,58,37,87,143,182,123,127,76,230,86,241,180,215,221,57,162,158,35,184,124,253,53,255,81,10,106,95,217,240,83,81,136,85,178,45,20,139,9,222,117,128,123,183,148,244,29,247,82,167,179,219,226,102,221,184,82,206,40,16,1,14,213,38,129,193,175,200,107,247,223,246,23,134,67,248,111,219,72,23,187,221,6,175,
+221,192,215,87,236,119,251,75,9,174,74,195,180,146,6,98,230,239,61,240,55,97,206,175,46,23,171,225,218,89,54,94,163,142,222,158,74,245,197,187,78,44,47,245,110,179,116,193,152,83,164,22,74,68,152,18,197,100,151,186,138,216,216,90,212,220,198,112,156,57,115,175,100,190,54,192,54,163,209,170,93,81,193,227,192,211,205,12,20,137,23,206,206,52,245,161,185,94,33,167,231,51,191,62,221,220,164,80,211,157,221,204,67,55,55,191,115,130,46,205,160,245,128,166,81,67,201,89,196,175,145,165,155,143,121,25,99,58,196,178,118,18,144,246,104,207,234,104,120,78,97,196,33,176,150,28,66,247,206,49,26,62,158,215,76,177,37,187,150,52,109,58,227,55,116,139,78,4,128,208,14,190,54,142,121,153,162,70,66,44,45,67,49,43,96,181,79,122,130,170,36,227,211,75,69,20,84,191,200,179,72,255,112,145,141,62,45,127,78,195,247,146,27,96,86,141,208,79,97,183,141,185,163,55,164,254,219,78,162,212,250,52,155,137,51,17,240,45,91,66,216,37,90,250,12,11,
+147,85,31,241,240,16,87,254,44,248,73,168,180,67,70,234,111,60,202,105,255,139,230,133,227,100,109,167,29,11,126,178,158,6,40,237,159,11,182,191,132,128,219,67,42,53,197,127,120,184,147,69,126,21,35,37,60,55,255,189,51,193,245,172,123,91,147,244,10,254,141,147,96,73,249,240,22,50,218,146,54,105,22,68,15,54,40,99,213,39,109,2,96,105,91,101,145,152,250,159,32,131,156,122,219,25,227,78,19,213,19,183,229,73,255,128,249,211,194,148,112,36,139,94,206,204,112,184,190,50,198,164,126,201,80,10,58,206,152,40,27,56,10,46,157,205,40,198,54,3,26,21,109,247,98,1,38,56,66,41,88,120,222,252,159,189,251,125,104,48,107,181,80,177,163,81,183,40,255,189,94,211,64,70,185,71,92,134,103,8,66,148,174,81,192,223,74,199,152,126,208,229,236,92,122,164,142,174,203,106,181,5,165,137,248,176,241,178,129,153,78,237,21,176,15,199,102,102,110,86,203,5,231,60,222,167,155,105,37,110,55,60,132,127,100,129,182,102,106,17,72,15,232,125,22,208,
+78,29,68,43,217,150,200,114,53,44,71,185,1,86,113,21,37,52,99,218,91,177,118,233,223,68,55,65,25,152,22,110,204,92,221,51,51,220,9,86,86,221,103,187,178,37,84,210,140,24,222,66,162,43,152,219,21,57,25,63,76,59,220,213,5,28,238,163,205,80,167,184,28,58,230,30,39,201,0,229,165,130,156,245,165,194,92,172,41,233,35,144,23,66,229,232,69,60,112,171,200,103,168,197,205,143,58,184,239,39,70,180,246,56,251,229,128,46,80,154,21,145,235,134,124,103,254,177,137,236,69,31,180,176,26,34,219,158,208,247,21,184,19,30,108,126,159,184,185,239,106,218,59,202,45,58,42,203,151,221,116,126,32,155,196,136,250,249,30,25,8,52,232,47,201,133,135,210,255,26,2,245,196,222,150,55,172,183,96,22,41,156,27,187,229,13,251,32,97,58,53,101,71,166,164,27,207,107,218,135,146,203,198,95,23,234,92,246,125,190,15,142,244,211,5,153,157,238,24,81,198,110,249,142,220,134,52,15,250,47,198,22,109,125,197,145,108,70,85,3,165,104,210,56,146,227,
+161,149,20,35,38,222,100,83,168,168,105,41,245,122,176,135,62,230,48,42,142,232,210,138,71,79,233,151,241,211,64,169,6,202,135,18,234,144,0,188,163,201,148,234,52,172,14,54,84,6,175,65,121,193,72,15,69,15,72,51,207,56,140,198,66,5,204,239,133,22,97,198,223,42,177,47,235,117,139,215,106,165,46,100,196,71,231,101,230,6,37,70,203,100,151,155,217,121,87,47,15,18,243,54,223,191,204,204,36,87,19,187,121,219,35,51,51,15,37,4,102,164,140,206,0,38,211,88,193,44,209,19,25,15,215,220,151,113,211,3,140,10,207,237,214,164,118,57,10,98,91,190,195,207,113,168,88,122,115,44,64,234,171,14,150,238,49,185,25,151,105,205,140,109,101,106,152,206,12,159,163,107,241,82,19,148,140,156,78,110,143,77,53,36,21,18,21,47,184,103,175,24,14,99,68,122,16,172,90,142,212,111,237,147,90,188,6,238,65,248,3,85,69,255,189,130,183,75,175,67,242,124,115,68,66,48,64,70,113,92,130,230,126,70,115,138,150,142,13,104,163,221,143,104,104,129,
+242,255,211,62,156,1,99,98,41,12,240,190,52,193,113,132,191,221,132,6,181,172,41,68,232,129,246,124,245,240,236,252,190,107,17,153,42,143,124,120,80,139,109,121,151,76,142,59,19,220,39,199,40,169,130,113,186,137,133,63,250,185,172,129,136,185,60,106,184,164,129,3,31,187,55,137,47,107,98,139,16,215,109,102,186,168,151,115,104,65,83,234,230,210,119,180,88,142,172,141,55,238,53,49,61,117,11,34,159,4,148,0,7,67,97,145,44,172,247,8,18,100,216,172,90,246,147,50,203,184,194,2,36,178,222,93,169,3,242,57,42,183,63,164,193,191,1,57,237,205,131,13,54,115,53,106,120,21,19,156,114,93,182,243,211,41,166,78,52,153,202,105,252,248,203,133,242,226,153,211,34,47,123,23,1,172,123,32,59,141,135,172,111,190,58,225,22,120,214,225,181,38,153,10,155,243,201,22,132,185,70,133,209,114,39,131,102,102,38,50,74,131,72,50,221,247,200,206,116,82,63,82,52,163,191,39,189,244,147,143,140,12,208,120,224,197,48,211,100,9,2,87,79,30,4,168,
+56,80,69,176,114,117,61,159,24,120,54,39,71,100,110,108,19,179,162,32,185,216,121,106,51,89,106,177,227,66,72,89,225,105,83,166,37,128,174,179,158,121,151,134,11,132,178,161,56,84,244,121,148,57,147,218,105,217,210,243,21,210,58,4,201,223,218,84,73,26,249,169,91,188,210,247,1,106,9,108,242,102,75,32,14,5,77,183,107,239,203,8,237,77,231,101,76,137,80,95,208,125,50,166,163,119,25,215,224,48,52,201,129,140,6,57,65,154,125,227,174,255,110,206,69,81,51,41,213,253,162,170,244,144,240,196,161,235,154,197,249,145,21,78,2,49,135,114,249,206,77,3,247,21,214,122,218,51,222,182,72,133,179,184,155,215,79,140,38,203,103,88,251,37,109,119,94,35,31,82,55,161,164,101,74,55,225,144,46,102,167,150,214,224,137,80,50,199,190,52,31,21,56,68,176,176,13,97,213,135,31,46,24,225,119,25,142,234,211,183,29,15,105,148,105,232,157,105,49,119,33,197,97,236,169,201,162,40,226,69,158,39,116,182,94,81,39,42,33,218,193,148,156,82,91,124,
+146,130,239,89,13,16,118,100,217,136,107,40,92,19,58,83,203,180,103,149,233,48,59,191,240,21,129,131,91,46,52,16,15,27,91,58,171,144,16,100,142,85,198,166,205,74,101,78,206,212,27,40,12,199,108,145,249,120,103,20,190,22,176,45,94,163,149,184,16,84,31,200,195,207,13,5,133,22,203,150,53,9,129,153,94,22,196,146,101,23,31,97,102,146,169,177,194,174,236,129,159,153,7,28,9,54,2,190,9,107,155,70,10,106,9,158,8,227,185,230,158,236,167,40,25,137,42,119,104,106,27,50,178,43,242,177,1,17,205,122,194,91,106,246,85,131,62,248,251,181,78,147,213,235,121,83,97,163,22,3,76,250,8,42,245,65,100,67,97,143,21,176,180,115,94,81,137,229,233,129,96,164,234,161,174,60,232,39,209,82,2,147,88,172,136,93,126,161,136,120,255,93,244,252,135,98,186,253,162,224,237,212,171,25,125,208,253,93,196,165,8,192,127,89,53,45,43,214,104,242,203,117,13,171,200,213,11,225,59,207,190,165,151,70,86,206,235,155,62,189,25,255,230,115,252,224,
+255,244,117,87,179,217,115,102,193,229,203,74,248,55,77,188,113,111,137,55,85,118,54,252,207,208,75,194,27,100,214,206,247,113,188,47,218,121,206,198,215,77,55,166,221,144,238,30,200,167,146,118,241,250,121,58,254,32,213,223,164,131,37,215,136,6,10,220,214,136,97,209,67,183,115,42,174,205,112,56,239,192,217,23,78,180,195,232,54,237,241,105,136,31,23,172,129,156,192,25,130,92,138,221,111,120,145,83,156,54,41,183,69,113,121,133,170,162,41,104,100,247,31,123,150,151,207,128,190,98,222,170,37,225,70,213,50,91,41,255,234,37,30,186,198,124,164,136,50,56,249,8,58,14,96,153,211,18,47,126,119,241,89,141,64,182,31,39,123,205,135,187,48,219,10,252,232,14,154,188,92,37,206,249,158,139,227,92,35,193,104,63,38,240,38,254,173,43,137,241,131,12,247,61,8,51,157,196,255,33,154,193,223,147,94,242,89,249,128,193,209,71,32,3,77,61,98,90,32,113,180,113,179,195,0,7,215,142,169,142,220,102,205,85,177,55,160,145,149,31,111,211,85,71,192,160,
+32,52,103,208,80,123,254,125,23,58,230,216,136,251,218,50,76,108,20,40,198,29,193,233,151,219,211,80,108,179,229,159,56,68,112,22,100,47,21,42,118,237,15,145,37,18,205,150,217,97,97,233,40,146,56,116,43,20,173,191,163,40,108,23,95,137,33,233,47,41,75,201,91,59,158,19,174,242,185,110,250,44,171,100,128,84,73,176,137,60,235,12,116,219,104,107,180,99,137,82,207,36,95,75,239,119,84,104,187,130,140,15,206,207,65,185,33,169,127,142,43,101,249,211,84,192,60,148,125,189,116,203,48,134,215,57,46,190,246,120,20,238,2,4,52,190,153,166,7,239,84,156,101,181,55,19,25,70,144,13,182,171,199,123,69,128,152,144,155,94,144,137,36,35,4,196,131,5,151,163,169,188,205,201,80,206,32,117,92,228,134,39,63,238,211,81,75,246,198,211,184,77,250,66,92,1,82,189,128,219,20,127,103,176,16,54,108,90,226,160,119,52,17,26,45,63,42,242,74,243,152,154,198,80,226,21,44,15,176,183,89,21,90,112,254,19,27,125,210,233,40,221,214,54,10,150,
+43,41,38,77,152,81,108,120,247,57,83,85,145,10,34,105,244,24,168,62,70,7,3,97,218,8,68,161,201,217,181,61,104,142,153,126,199,244,229,173,198,39,101,78,246,87,68,18,220,29,227,146,32,153,189,137,214,119,199,180,68,11,39,167,162,206,253,52,69,148,24,201,173,232,247,142,39,142,172,92,253,76,19,229,244,219,137,3,55,7,245,13,252,253,74,101,179,3,208,64,199,152,67,245,137,13,153,83,217,57,165,196,147,71,208,26,50,189,122,166,175,5,216,44,16,137,203,130,180,217,252,235,159,207,179,63,166,38,124,44,192,90,132,227,57,7,33,254,33,83,33,125,60,141,148,129,36,50,28,58,213,8,118,21,71,182,58,174,88,26,192,236,5,132,112,80,252,29,106,63,172,40,133,135,220,169,159,217,253,10,110,140,177,176,8,109,7,73,94,35,54,9,72,109,177,153,155,185,150,7,15,236,235,177,249,90,75,219,209,220,194,20,40,13,159,172,105,247,240,236,57,49,63,90,60,140,181,173,23,143,248,170,228,194,53,160,244,194,223,168,43,241,151,158,196,92,
+83,27,9,165,182,152,38,71,123,134,63,54,244,181,231,47,151,161,106,191,209,81,151,38,219,215,0,99,53,121,17,130,236,214,2,147,110,249,171,191,85,3,251,29,160,201,128,103,218,227,149,200,255,124,162,249,77,233,32,120,89,191,149,93,33,37,151,124,105,252,52,129,42,131,37,90,128,190,109,36,43,35,203,231,82,122,30,83,48,248,10,230,17,70,202,42,66,180,57,220,130,195,41,148,116,122,108,214,164,3,233,145,146,250,33,151,23,18,17,93,156,61,103,42,74,188,252,221,134,102,1,129,194,40,126,81,153,109,55,97,188,21,50,232,108,218,188,74,149,229,55,5,139,227,44,69,146,90,49,19,65,243,224,154,229,164,70,206,165,221,246,29,230,25,169,31,179,23,9,30,199,89,86,170,250,196,192,4,104,59,0,100,38,30,62,205,144,136,219,185,217,65,160,82,84,196,208,12,0,82,218,143,194,4,196,179,107,161,223,52,50,167,182,80,33,234,128,158,5,159,81,120,61,37,125,225,60,113,41,81,114,90,5,138,36,71,226,65,78,53,100,19,100,132,183,235,
+87,192,136,132,212,195,193,19,56,46,39,151,1,111,100,188,55,194,9,162,247,92,240,183,40,78,225,230,109,202,80,44,191,4,193,188,102,185,81,72,141,228,187,90,37,228,113,157,132,10,120,110,41,75,155,126,218,190,200,245,53,46,188,61,202,92,174,61,141,236,23,175,159,86,166,236,91,79,41,254,243,87,227,164,111,135,112,145,127,38,22,37,23,27,74,165,255,253,173,168,48,182,206,221,203,176,3,109,168,63,90,160,221,118,36,142,206,187,218,139,185,112,240,140,80,207,103,106,57,63,72,142,248,168,187,168,227,32,60,58,12,21,164,226,49,115,205,235,234,1,247,142,63,234,76,90,79,154,179,163,246,149,81,127,92,168,113,246,175,161,143,82,166,103,43,82,244,10,28,169,168,0,233,216,130,162,102,163,105,144,50,6,22,70,163,235,227,244,66,219,38,40,223,232,74,133,66,78,229,133,31,50,32,77,28,169,25,124,232,133,119,162,108,248,49,83,85,182,178,19,113,94,161,124,79,138,242,89,98,119,188,123,169,16,110,32,144,85,92,124,140,166,97,97,211,180,
+10,50,43,65,101,224,173,237,179,180,202,201,191,4,86,62,219,28,82,233,143,132,141,225,97,155,229,72,50,51,225,101,64,219,108,0,52,210,48,250,196,84,194,198,205,245,12,66,96,127,82,149,185,208,144,174,99,105,129,138,109,50,40,115,115,19,19,112,255,80,176,233,141,84,207,138,131,41,165,47,41,89,81,206,198,76,116,123,234,212,135,23,5,190,3,121,151,111,128,93,14,150,4,36,216,139,40,42,143,143,255,192,158,9,212,67,211,93,203,111,164,158,21,222,42,91,76,81,16,63,74,138,96,171,127,214,53,163,236,64,54,47,189,46,105,222,226,80,101,73,9,162,227,186,56,90,183,50,254,145,39,232,114,237,45,83,69,78,117,12,211,133,144,227,89,122,91,209,194,151,32,220,252,113,66,210,210,222,91,13,66,176,230,144,153,51,156,238,254,19,89,157,218,219,72,74,135,73,165,216,27,73,173,121,59,7,12,95,58,157,22,172,57,17,106,237,76,45,211,23,25,182,79,32,109,161,41,250,166,168,13,181,100,142,164,13,195,47,158,156,22,120,148,67,58,177,
+69,143,108,210,55,21,46,142,81,60,233,40,94,251,133,211,32,21,84,166,164,170,5,73,52,58,175,112,11,208,139,217,160,141,172,193,89,75,244,193,128,22,163,115,205,82,41,121,116,27,17,246,138,116,58,37,209,243,105,2,197,129,174,73,25,85,26,128,206,204,140,56,204,172,6,26,223,117,62,115,249,198,74,44,29,254,174,170,194,202,251,79,237,55,39,57,137,9,209,71,19,121,246,89,70,194,246,50,106,80,211,54,111,21,20,114,70,158,232,219,216,102,121,137,26,209,197,191,183,171,89,97,42,225,11,35,39,116,153,155,55,12,21,164,82,53,81,6,1,142,85,58,180,161,132,218,145,138,1,164,233,42,7,63,213,134,31,203,112,246,160,209,174,9,178,108,58,22,197,197,118,101,232,5,45,133,146,177,177,86,49,7,31,199,64,248,142,243,128,80,161,64,156,246,85,1,141,30,49,142,19,72,238,5,209,95,38,206,77,107,163,247,60,250,228,128,106,81,122,45,138,227,252,201,254,229,94,7,252,50,162,228,166,90,115,103,55,99,77,22,57,164,217,46,126,65,
+176,116,158,167,13,195,205,243,214,194,185,248,131,185,120,107,6,209,63,199,171,44,22,125,231,219,72,241,213,174,90,212,83,126,191,55,93,3,98,168,32,42,1,78,101,235,97,131,70,230,70,133,221,125,162,190,152,34,245,85,14,16,47,54,234,51,5,125,2,114,5,68,87,88,178,160,12,167,143,49,87,116,107,54,38,133,245,213,200,54,125,199,26,100,76,241,40,254,59,208,229,236,111,9,130,51,141,64,13,176,76,170,66,234,65,214,52,125,17,251,189,136,19,105,165,88,130,198,250,136,175,28,123,107,106,152,72,211,169,50,169,147,156,62,221,108,202,81,54,93,207,73,62,105,96,12,63,103,104,114,42,3,128,55,49,69,202,93,59,145,213,1,230,81,32,61,94,235,116,219,178,246,93,4,248,36,159,99,81,153,165,114,114,45,105,114,106,150,29,243,156,218,40,188,156,106,190,242,44,35,247,147,26,34,199,163,50,203,202,209,159,44,88,21,93,1,164,116,171,97,24,75,204,98,248,97,54,51,9,0,52,156,226,205,67,102,84,246,193,0,173,189,60,153,14,0,
+194,176,11,194,255,33,227,117,54,242,134,49,105,176,72,172,18,228,244,112,45,201,168,171,225,98,69,142,100,207,0,179,235,192,78,251,71,43,157,13,101,223,72,17,195,67,17,14,125,232,172,166,232,198,197,251,92,191,116,133,190,162,2,253,55,17,231,71,191,172,31,229,170,219,30,187,140,89,92,101,141,99,100,120,169,182,60,63,136,76,135,189,121,91,217,61,105,118,201,170,225,244,234,65,54,155,181,230,240,224,86,60,224,106,146,11,21,245,206,147,191,163,141,151,164,123,0,100,153,30,226,48,60,236,152,49,38,100,50,188,98,236,66,22,167,48,74,80,216,15,131,169,113,96,185,30,213,26,84,101,72,1,14,158,119,253,109,53,176,18,146,167,16,57,233,145,214,216,82,61,210,141,19,89,111,217,196,64,72,40,16,67,2,43,152,187,124,204,224,99,57,22,47,83,208,139,112,44,40,195,82,212,182,40,156,155,82,148,82,114,120,154,168,242,162,27,6,239,156,110,27,166,200,114,208,45,10,104,81,101,252,140,174,73,43,12,180,195,73,161,99,220,216,16,65,51,
+234,42,143,62,148,27,210,86,149,187,124,130,4,35,54,129,179,141,55,106,58,50,51,122,201,32,39,198,19,124,226,5,16,238,108,190,241,41,61,99,163,74,114,249,119,226,7,63,255,213,18,21,22,46,36,40,218,162,105,162,194,106,231,197,234,178,33,14,10,43,44,90,150,131,85,40,158,4,246,61,148,225,2,132,113,8,125,159,177,149,178,6,113,144,198,254,169,176,24,203,155,6,44,183,161,152,193,194,119,120,97,178,19,199,175,108,113,8,8,168,247,2,112,8,149,53,146,153,207,84,77,83,143,130,248,139,233,135,104,43,180,149,71,207,208,83,92,82,175,108,30,229,233,223,219,241,156,210,108,116,102,151,189,135,241,213,37,111,220,242,182,74,241,83,242,214,192,248,132,25,228,121,26,41,218,99,77,5,123,74,174,200,131,9,232,138,255,80,240,191,143,131,20,38,199,9,152,50,145,98,44,99,234,203,27,40,83,34,79,95,1,157,114,31,32,115,232,145,5,35,190,119,144,131,30,34,85,201,205,90,88,61,209,157,48,54,212,172,245,68,172,39,70,68,137,249,
+210,12,36,149,191,53,109,57,127,135,165,47,28,255,146,227,1,3,246,131,124,245,225,72,36,141,155,40,106,136,82,41,18,77,167,37,170,39,143,149,22,75,82,123,212,116,153,169,45,41,16,113,42,45,91,51,120,67,244,195,32,69,145,91,236,162,193,45,163,100,166,149,218,84,175,1,47,48,76,119,32,165,87,116,21,235,189,11,167,123,115,226,212,166,85,46,224,49,42,243,232,239,120,208,2,105,246,168,201,152,103,85,147,32,64,30,249,24,115,94,70,229,7,68,138,199,146,49,203,202,62,113,176,143,255,114,59,211,243,204,97,52,173,188,156,24,216,0,202,244,189,230,123,230,42,5,148,196,243,112,134,190,139,231,213,76,228,178,6,182,183,111,244,13,90,84,68,131,12,23,233,71,24,1,105,232,125,126,244,127,2,161,227,173,48,80,56,229,213,202,85,204,174,102,50,126,104,224,128,161,162,158,203,16,12,122,211,75,154,1,99,21,131,177,19,118,24,33,98,138,252,229,116,46,166,126,181,197,118,76,178,163,185,236,149,159,140,49,121,227,58,82,156,36,130,81,
+227,60,254,179,225,228,164,22,38,76,205,40,102,190,135,190,88,248,135,125,163,47,37,67,242,189,128,24,77,131,187,56,238,91,217,102,74,224,134,126,215,64,25,222,65,38,33,65,108,90,103,132,152,132,131,136,56,18,242,18,55,54,100,163,226,88,102,173,84,143,13,56,105,92,20,73,166,121,48,239,116,32,183,184,155,62,251,134,30,176,240,87,44,43,36,189,161,134,226,24,55,76,141,192,222,28,244,68,80,21,107,149,198,250,40,41,73,109,133,51,153,169,178,60,69,145,217,135,188,21,247,48,76,81,188,202,48,72,67,210,61,173,204,64,243,150,137,40,252,223,127,246,222,181,227,226,25,190,165,107,50,61,65,7,254,133,171,170,202,82,78,234,87,70,194,57,18,202,178,32,149,149,25,249,56,135,178,44,74,77,71,178,14,238,164,46,50,36,225,45,252,23,119,202,130,0,213,166,25,107,68,233,254,45,49,224,118,216,13,164,21,55,180,66,49,133,5,136,86,29,149,18,13,138,89,249,233,21,178,123,236,67,24,43,53,131,29,96,179,17,3,42,2,73,144,31,
+127,244,23,193,121,51,245,130,148,239,64,71,116,244,20,6,46,68,60,235,200,87,60,249,129,202,130,235,32,93,195,58,139,132,27,179,114,9,75,25,72,204,176,136,136,20,225,194,231,63,155,191,179,191,211,65,131,193,116,218,206,37,232,173,164,140,119,181,83,72,88,107,156,135,127,54,148,60,215,194,191,113,231,206,60,55,221,27,119,194,127,184,163,133,81,171,128,216,95,57,92,28,153,151,151,203,205,172,155,216,222,140,199,148,202,1,60,24,164,171,105,172,89,76,198,135,189,144,80,130,198,69,14,217,100,69,156,203,238,215,49,125,56,31,255,171,33,75,61,4,84,79,64,92,90,54,154,200,13,57,0,176,223,183,143,16,236,246,24,78,117,73,201,231,27,120,148,132,14,196,78,22,58,21,54,136,166,177,114,175,32,220,240,204,105,163,24,189,199,138,231,153,247,210,40,156,172,112,163,123,131,210,111,101,166,53,212,29,100,7,143,158,110,98,175,251,36,127,239,3,36,181,206,46,90,220,22,138,106,134,163,101,148,37,202,82,38,202,96,78,180,198,114,211,175,112,
+100,231,212,50,112,43,188,49,218,159,98,210,10,63,249,35,248,221,99,137,41,46,211,162,232,163,61,108,90,61,49,124,251,203,36,192,195,105,34,81,6,13,138,91,132,121,7,228,177,247,33,148,13,46,6,159,22,66,196,176,64,219,20,177,207,27,44,178,165,135,178,55,227,32,233,253,72,6,54,71,15,63,63,8,16,42,68,242,176,82,47,244,253,184,115,13,201,30,130,194,142,253,195,10,37,172,188,200,223,162,174,113,169,237,41,198,5,86,253,119,175,38,163,151,238,230,188,83,243,249,196,78,123,61,2,49,211,223,150,183,145,232,215,214,150,68,79,137,174,174,159,54,166,230,55,25,201,72,160,167,56,221,79,189,200,210,209,10,201,145,121,232,254,8,9,187,65,202,233,252,60,98,87,5,139,148,89,212,78,92,23,69,104,165,76,140,239,99,19,82,26,23,61,20,17,199,212,88,45,82,71,14,56,216,209,239,7,25,230,185,15,221,3,138,94,188,9,221,126,110,131,57,130,227,14,125,119,111,255,232,163,164,230,227,147,6,139,161,232,124,77,172,109,41,247,232,
+160,37,133,83,58,137,167,93,254,109,195,100,137,155,62,127,166,240,50,13,94,86,83,240,222,193,57,212,32,136,253,134,193,60,184,131,64,118,137,219,42,2,71,214,46,15,58,145,188,144,103,241,22,130,92,218,34,39,60,188,225,12,103,148,59,201,46,79,83,217,62,165,102,204,162,82,186,107,129,5,67,208,122,202,198,203,226,104,152,136,144,150,136,113,187,32,158,34,51,229,52,98,220,38,106,68,98,30,198,27,232,152,85,152,57,97,237,17,26,132,182,115,98,79,201,141,0,51,220,236,179,36,142,110,190,33,56,55,147,185,111,197,254,147,153,8,110,15,52,116,96,134,134,248,197,94,207,13,237,36,225,23,147,205,224,22,122,23,31,121,207,69,203,103,12,202,238,196,93,247,29,24,12,50,115,92,32,2,235,89,82,73,241,7,219,242,89,63,227,230,248,60,201,86,186,32,20,108,126,118,48,100,13,222,163,145,80,28,184,83,172,173,3,83,204,22,244,48,19,184,73,49,143,60,132,152,89,156,180,77,233,95,176,215,76,212,35,38,46,44,20,4,162,136,5,245,
+41,13,193,164,231,96,35,31,137,11,140,123,27,78,40,168,178,152,253,170,255,27,44,17,4,33,133,28,242,60,182,195,21,138,192,49,137,130,158,127,189,62,204,173,150,188,186,200,7,99,16,117,122,204,180,87,236,38,175,227,36,33,106,76,66,39,32,104,40,6,27,76,120,52,141,254,8,73,227,96,243,47,15,138,198,76,126,20,121,233,134,130,85,170,86,19,251,0,143,83,194,4,240,147,179,99,59,196,104,240,253,14,209,105,69,84,19,69,78,244,151,8,144,172,142,120,81,16,61,101,137,198,255,38,137,40,58,37,118,74,39,120,178,194,200,109,29,191,178,210,41,105,165,166,123,31,138,40,141,152,180,208,235,166,153,131,104,181,36,6,81,0,219,183,113,181,228,158,10,193,197,141,84,247,143,198,223,228,201,189,78,198,17,76,124,203,14,128,245,3,146,178,195,124,75,148,109,246,190,27,222,63,68,152,251,106,98,17,166,227,15,116,118,110,80,169,44,252,216,136,46,199,161,137,137,18,159,145,41,186,150,36,137,21,26,74,29,85,140,247,51,220,121,61,54,215,
+125,144,146,13,38,5,219,62,228,86,251,84,158,170,215,142,53,220,46,63,185,102,20,214,84,63,152,6,98,92,12,191,183,179,212,36,226,166,196,190,3,164,141,31,53,37,52,55,188,72,238,117,63,66,148,95,20,220,183,120,61,2,251,104,139,163,14,249,103,255,122,51,132,213,61,85,117,185,247,126,31,197,98,169,107,162,250,163,199,153,146,17,124,242,198,35,246,15,6,112,191,190,91,222,220,30,212,94,218,82,229,244,187,177,27,117,93,206,26,196,251,151,226,38,101,48,195,25,137,54,130,82,96,222,123,233,5,75,242,74,71,152,50,53,225,41,113,149,125,38,186,66,21,229,199,200,130,236,150,160,165,179,169,110,252,112,81,209,221,165,0,65,54,241,225,121,154,133,92,211,162,200,164,248,132,134,183,150,205,200,50,39,222,21,210,52,229,51,172,194,190,164,155,82,62,249,28,183,150,184,225,161,221,35,106,1,176,83,11,81,106,137,160,163,0,174,239,64,10,173,189,4,2,192,14,46,50,106,250,67,245,4,114,151,105,130,210,248,153,184,158,220,227,164,75,64,
+133,11,236,96,253,208,34,135,255,118,176,233,174,13,142,250,52,63,106,53,181,86,68,209,5,153,208,128,160,55,230,137,27,62,58,72,159,212,55,31,249,18,243,20,18,69,49,43,35,41,125,10,216,186,131,78,67,57,44,63,150,191,109,251,98,216,54,127,158,118,156,0,255,243,180,230,194,51,122,211,183,243,84,145,88,47,102,148,94,190,199,156,254,200,143,35,36,174,228,95,207,69,50,254,99,26,63,14,149,111,141,76,111,31,68,17,219,106,224,62,93,161,84,156,166,104,214,189,201,150,176,16,6,125,222,112,253,195,5,218,91,213,179,77,117,111,111,200,39,26,25,23,178,199,99,30,172,176,124,134,200,100,190,121,6,219,4,213,175,148,138,144,255,232,227,184,149,232,166,139,21,33,197,223,131,182,162,64,98,7,246,195,6,79,227,21,106,62,54,208,59,32,180,68,227,187,226,211,139,25,208,169,197,42,109,196,105,127,28,192,14,191,60,230,104,239,206,200,127,121,182,160,91,75,150,184,224,62,108,99,241,134,85,98,133,167,39,216,38,56,39,169,39,70,193,101,
+231,3,231,60,162,92,79,220,88,30,139,247,143,74,51,243,245,65,69,131,92,226,68,131,224,246,37,9,56,64,138,141,12,31,251,63,213,147,15,156,134,111,243,23,111,85,65,96,63,168,49,136,94,202,164,211,216,13,143,17,86,156,195,22,176,211,67,177,32,252,194,181,52,241,21,219,218,12,15,64,209,209,11,77,173,162,116,100,135,254,157,159,212,242,34,16,91,194,115,123,151,136,34,117,101,16,52,71,53,225,177,67,57,105,78,234,219,198,97,175,181,115,122,18,23,133,155,158,183,144,151,89,6,87,140,119,98,194,87,67,170,94,123,28,126,53,48,226,160,202,59,200,165,205,249,71,109,31,33,232,69,237,235,112,228,194,92,131,158,237,62,31,189,138,188,210,77,58,193,248,118,116,110,11,6,92,100,71,231,185,94,83,127,128,213,34,38,100,91,189,57,28,99,72,198,199,229,237,154,253,197,7,11,35,239,230,111,94,134,114,6,98,249,253,77,172,250,160,174,211,6,245,190,222,85,220,24,163,40,254,101,214,134,20,255,104,115,93,193,245,233,133,141,48,31,101,
+106,170,68,85,70,96,239,103,89,244,78,46,107,1,188,137,192,44,245,210,69,237,84,76,183,20,94,69,149,133,153,156,70,236,148,190,39,106,102,54,212,228,164,14,76,57,76,207,44,53,107,169,35,138,41,2,224,55,182,67,136,156,144,21,62,244,3,167,254,70,136,72,27,215,155,42,126,68,95,240,132,243,201,61,143,33,206,190,45,86,5,128,211,32,35,101,204,11,147,0,119,63,153,214,72,94,206,68,200,109,236,6,37,90,28,163,102,175,194,239,207,2,143,203,198,33,142,165,131,11,143,68,114,47,113,98,46,241,251,115,71,179,66,15,0,224,47,61,201,32,6,4,211,23,247,154,52,122,131,224,185,111,34,26,246,125,170,29,33,16,88,123,169,207,207,203,218,50,131,235,243,159,219,133,66,22,94,95,241,181,68,140,235,249,185,76,169,126,181,185,125,139,147,142,166,118,226,48,230,17,220,29,143,122,72,196,219,41,130,34,250,56,176,202,121,228,89,211,43,25,82,76,194,199,232,194,173,15,70,8,28,214,57,169,113,91,131,249,17,103,100,145,107,158,186,113,
+176,193,112,130,33,178,6,233,161,141,32,13,65,71,51,197,188,180,97,30,38,192,148,41,244,96,154,117,1,39,57,30,5,104,135,70,119,250,48,43,170,137,239,47,230,163,178,146,20,210,31,99,24,19,67,44,3,41,123,184,139,52,238,109,216,239,72,0,231,29,172,169,91,184,134,188,86,169,184,190,222,2,225,152,99,85,86,172,74,82,225,33,102,36,153,17,91,186,72,124,240,57,81,145,208,83,55,31,15,248,140,114,86,23,196,175,63,244,27,207,211,56,197,233,23,197,137,55,178,19,104,78,216,23,18,65,238,78,213,43,11,181,110,85,7,0,246,253,26,224,85,175,39,2,174,123,26,33,7,226,45,182,129,51,20,243,12,17,1,196,182,52,230,177,25,12,113,63,77,229,69,97,116,202,54,2,54,135,234,30,64,53,21,30,138,170,8,244,242,30,151,59,233,113,101,148,52,82,158,116,204,82,213,232,170,215,97,177,29,252,68,78,24,159,252,34,10,153,127,26,243,7,252,139,118,159,203,237,24,161,119,18,59,105,213,76,129,183,151,90,177,48,166,214,177,37,
+10,250,47,109,251,80,106,172,46,92,154,150,124,78,106,176,89,62,246,172,41,73,108,201,82,32,49,225,54,184,131,13,222,233,189,204,216,158,70,127,66,82,215,73,161,203,173,197,152,193,195,88,121,63,31,243,137,24,107,120,140,117,115,15,232,237,244,65,29,71,56,170,133,114,48,125,146,49,90,252,246,246,240,212,80,118,210,20,103,240,147,9,254,106,174,114,144,50,237,188,2,215,41,234,211,220,120,222,133,225,214,135,46,12,191,113,194,231,15,39,28,86,69,21,197,225,104,239,35,7,115,96,138,131,67,65,255,185,126,57,254,17,42,253,164,90,220,121,153,78,255,202,195,172,153,50,250,13,157,254,217,123,57,156,132,19,21,17,255,217,166,131,136,198,63,220,16,59,126,107,63,163,32,48,246,121,200,107,93,167,136,34,132,253,2,53,172,91,68,52,224,36,212,12,77,190,197,33,248,83,245,224,187,68,150,107,146,126,98,231,27,184,239,56,203,73,209,94,194,195,176,176,7,146,130,73,151,121,85,123,93,193,200,121,111,34,238,21,125,166,178,148,39,237,106,43,
+46,34,234,167,255,169,245,161,208,114,166,14,107,126,157,239,68,203,127,94,91,71,132,16,179,190,29,27,108,187,75,96,239,55,232,206,111,163,103,30,47,10,179,85,131,103,11,35,233,188,20,168,232,142,247,43,72,227,240,68,44,198,156,177,159,15,121,20,226,19,45,182,72,141,153,220,29,219,134,157,59,150,13,227,127,248,240,21,206,165,146,87,69,88,140,76,160,197,157,101,121,64,75,192,225,76,10,191,236,40,175,228,132,196,171,45,144,34,237,21,5,198,211,140,15,6,53,23,85,140,111,123,108,51,191,154,83,31,176,80,204,207,219,60,171,15,253,116,111,135,26,71,247,248,209,253,106,247,202,90,132,227,251,225,61,231,39,140,50,205,153,252,52,159,162,217,89,154,195,92,196,47,95,112,126,80,181,248,55,145,249,17,156,29,21,242,31,6,140,130,238,0,143,38,155,31,53,17,61,38,203,2,228,218,135,121,15,228,177,205,195,204,96,186,114,129,90,182,97,180,97,96,29,217,80,203,194,238,229,101,90,130,202,224,3,96,210,25,98,67,63,248,8,51,163,196,
+251,177,126,4,40,147,162,112,124,127,17,117,149,54,48,41,77,152,223,106,175,35,18,244,238,243,196,253,81,131,194,36,111,253,27,135,134,172,239,79,194,223,37,42,184,88,202,122,219,79,33,86,248,59,77,255,24,188,135,73,68,123,100,66,94,91,47,49,174,152,248,59,105,22,57,30,86,137,55,87,15,171,131,81,78,37,235,119,180,194,49,170,3,136,175,72,152,195,248,53,240,136,22,43,24,225,78,55,149,54,180,115,36,147,117,248,159,30,110,192,89,19,210,54,59,229,31,172,180,52,15,117,155,130,203,29,233,188,194,195,88,128,107,31,1,48,141,252,52,229,50,33,242,163,54,76,230,189,184,138,104,49,99,171,168,122,43,207,211,199,155,185,123,219,103,8,223,161,110,96,47,203,16,174,197,110,245,95,105,24,23,14,56,231,174,227,86,154,233,226,12,78,174,235,120,16,202,147,180,95,45,20,25,78,143,226,56,226,246,135,130,155,147,175,52,77,72,63,245,8,19,209,103,153,142,32,11,67,78,38,182,125,182,73,152,27,28,142,46,80,221,54,143,50,241,206,
+74,13,170,91,150,246,188,1,56,170,32,126,206,222,139,201,96,217,199,196,48,135,147,103,176,9,154,190,32,4,154,225,115,80,132,57,106,32,105,128,144,53,2,166,194,241,142,194,19,24,154,220,97,145,131,15,135,207,241,202,125,37,195,107,247,187,203,100,84,194,207,172,146,197,135,207,124,186,251,152,33,25,226,239,65,236,15,241,190,253,250,32,60,218,239,43,247,137,220,167,210,43,179,11,10,69,51,233,3,121,73,242,52,75,137,17,231,12,177,19,62,238,114,48,53,98,132,176,60,218,195,227,13,251,112,183,246,21,158,32,235,212,85,154,203,100,209,106,177,6,117,9,102,5,194,178,159,190,214,164,47,225,73,138,39,183,0,249,145,151,49,132,148,38,194,221,196,244,149,191,70,25,28,95,185,97,230,252,165,126,222,126,21,109,253,199,178,240,123,19,72,92,222,39,127,137,2,133,163,36,129,104,82,22,254,182,246,170,142,8,85,147,43,175,51,223,171,191,188,36,151,187,217,153,237,212,202,10,203,196,241,117,132,179,189,234,27,8,169,251,15,33,176,27,21,97,
+6,233,63,244,154,107,29,30,171,108,43,63,97,4,114,150,65,153,158,38,168,236,16,215,53,78,32,27,248,225,132,8,184,123,93,24,5,213,97,159,235,244,206,64,92,237,151,232,186,122,54,80,31,117,225,25,241,177,205,27,62,12,223,143,137,215,19,53,87,158,9,91,28,151,38,23,118,159,209,155,41,249,167,251,67,111,23,92,125,241,71,233,64,253,253,173,213,59,53,179,67,94,28,222,166,72,60,123,228,57,175,209,148,8,246,117,42,183,195,243,245,203,29,39,219,149,161,18,166,163,84,239,7,108,175,115,126,183,241,47,112,85,230,183,212,158,217,32,41,163,248,97,221,196,173,204,27,110,65,170,86,154,152,32,249,140,121,132,88,87,210,245,3,99,218,146,144,166,217,76,127,121,205,75,185,213,21,216,10,115,58,8,210,71,69,24,7,129,106,188,80,115,86,33,32,0,63,213,117,110,195,13,72,224,116,125,187,86,19,229,54,5,206,227,160,80,255,101,170,122,202,168,37,40,36,144,76,14,142,175,56,2,237,118,99,43,239,240,85,38,49,255,128,33,204,159,
+188,229,245,34,69,65,4,201,167,198,186,178,77,126,8,17,46,27,177,105,25,229,44,172,132,156,253,158,38,121,173,7,96,168,32,158,165,54,134,28,180,10,26,234,204,236,250,108,187,50,81,58,27,197,65,132,17,207,156,217,34,152,46,240,17,254,151,213,152,15,255,104,30,62,161,45,156,150,5,214,233,196,107,143,166,231,17,114,254,184,91,152,87,15,120,205,119,245,177,113,108,248,217,89,182,248,218,219,63,69,250,202,123,42,204,121,107,82,240,136,53,154,206,252,231,168,140,48,185,187,83,52,222,189,61,132,191,129,47,150,67,36,153,202,241,17,57,84,181,186,139,225,7,238,210,244,252,204,123,58,2,70,212,141,62,110,0,125,22,179,80,173,125,85,140,75,95,195,19,6,239,158,157,50,234,210,14,69,3,15,56,185,115,215,168,78,29,103,157,46,163,247,50,106,149,98,179,2,45,168,36,51,171,190,226,38,140,146,23,136,130,251,38,69,72,118,77,222,67,147,230,38,87,201,222,67,158,182,72,46,124,66,237,81,209,165,161,123,73,158,112,126,144,52,26,176,
+26,166,185,154,187,213,234,40,57,239,247,173,196,115,151,50,137,238,242,183,15,195,220,61,8,211,145,145,44,218,192,117,77,17,49,98,169,146,200,113,137,246,73,27,139,139,170,212,103,160,60,108,114,128,149,112,226,4,126,65,1,26,125,92,24,2,131,146,157,165,196,24,180,31,182,104,27,205,207,182,59,163,92,25,62,157,122,253,133,160,214,75,206,29,42,68,225,79,97,43,188,253,156,251,203,175,156,28,181,88,138,85,111,119,91,51,95,153,63,177,120,179,79,161,62,135,25,65,8,81,94,155,243,63,163,242,217,212,61,14,243,36,81,123,96,189,217,154,186,89,39,57,147,72,39,139,122,48,145,47,10,147,185,182,99,247,29,73,100,49,63,29,248,137,135,45,171,171,31,187,40,90,70,194,90,19,3,176,31,208,226,38,10,128,225,24,68,116,168,57,123,68,111,210,214,113,178,243,30,175,49,235,197,89,212,42,32,41,93,204,70,121,195,203,42,133,133,213,173,191,79,102,253,221,198,62,113,36,187,47,213,198,62,191,39,243,252,139,181,198,174,150,119,201,232,22,
+111,37,122,227,18,71,215,248,247,230,106,230,86,69,121,207,188,222,103,152,185,20,199,36,188,75,120,64,115,200,61,12,51,35,12,180,149,8,184,6,49,106,137,141,72,156,128,239,33,184,231,224,132,42,39,80,70,14,154,12,224,60,17,111,236,234,68,59,58,217,22,236,18,80,102,203,186,249,236,161,216,4,42,61,156,79,100,89,166,230,120,38,161,130,212,251,226,182,54,21,255,135,51,20,60,8,234,63,176,199,66,91,247,103,65,177,233,56,252,34,146,127,38,49,101,254,167,25,158,11,56,249,227,209,68,191,154,100,23,161,122,239,190,61,48,81,63,119,218,141,14,96,46,93,29,253,9,222,173,27,222,173,187,24,200,81,98,23,76,230,67,6,148,16,5,155,249,125,3,228,84,228,155,84,45,13,151,80,240,185,18,187,50,199,36,218,167,54,40,237,82,127,195,123,79,2,222,160,181,41,142,117,122,89,159,49,104,254,44,178,50,126,90,11,184,45,111,73,152,141,239,14,152,107,45,187,141,74,117,157,35,57,157,181,42,189,85,234,197,229,172,92,154,237,104,149,
+7,105,189,7,181,102,59,248,149,254,35,207,1,58,170,19,87,91,94,130,98,235,111,194,122,226,219,122,41,9,108,17,125,16,151,214,3,211,80,18,38,28,192,247,128,14,50,210,36,149,200,142,56,99,231,95,19,145,37,244,143,226,245,67,63,253,121,159,77,248,110,4,50,107,58,245,79,130,84,115,200,30,107,170,31,127,181,63,235,252,253,231,34,151,157,45,10,44,205,22,9,39,57,13,207,61,231,21,88,198,251,12,65,32,127,231,86,218,159,132,131,87,116,234,198,134,248,230,119,241,250,137,219,175,33,150,149,93,139,108,66,100,202,126,82,138,255,210,186,148,125,227,75,18,102,72,212,72,230,130,102,138,86,43,131,218,137,54,163,153,147,112,77,40,141,86,112,233,11,94,204,71,3,18,35,96,206,24,130,34,237,93,37,99,242,202,171,4,14,128,198,19,230,251,246,242,79,251,81,196,63,150,5,174,239,73,192,53,125,107,240,107,18,176,171,155,130,118,243,184,128,180,110,57,35,66,76,216,121,208,60,239,82,126,49,93,140,166,159,52,183,168,42,88,147,78,
+238,35,205,173,146,239,134,56,20,124,156,185,69,248,120,167,141,250,136,75,180,245,128,164,229,18,78,34,247,31,116,147,171,170,70,224,153,170,254,170,190,180,220,210,100,226,178,187,41,128,63,241,100,177,77,29,219,141,28,183,27,132,81,248,112,199,125,181,155,226,236,27,142,36,129,114,118,48,53,91,60,220,169,50,60,251,20,193,63,154,85,25,109,123,243,235,202,186,253,25,29,254,148,124,140,143,205,152,104,30,60,30,136,108,171,222,141,244,31,166,188,206,211,73,30,219,210,144,238,166,167,221,230,92,234,25,116,96,139,58,197,3,103,109,198,230,11,249,151,116,175,77,251,178,169,83,170,34,143,138,153,16,194,70,74,57,21,246,2,21,46,199,19,53,100,151,172,202,181,13,117,124,162,214,49,1,172,230,20,116,155,131,122,70,183,192,221,213,144,186,161,206,79,210,90,85,53,174,111,50,92,144,102,22,89,26,134,157,68,155,196,185,51,41,201,125,92,126,125,167,235,172,42,207,114,54,106,243,105,86,212,231,196,236,244,111,129,91,28,21,17,35,233,25,45,182,
+203,18,125,141,110,72,1,62,11,123,15,158,113,5,2,209,120,213,168,218,90,142,44,117,35,11,117,122,155,239,235,164,96,217,225,227,67,141,65,216,36,255,93,94,252,167,249,177,107,7,73,120,212,130,175,232,25,9,71,245,223,167,233,21,206,121,197,69,47,190,89,152,169,95,112,50,29,61,181,186,189,216,59,203,96,238,159,174,8,117,203,211,141,72,162,192,150,245,220,50,62,119,31,18,12,82,71,251,124,97,83,201,152,70,14,148,36,93,6,82,173,168,205,105,178,184,206,53,167,250,70,1,229,82,235,253,241,141,22,116,115,82,90,23,197,31,204,89,69,87,46,120,67,172,71,160,130,152,122,97,102,226,109,156,14,47,17,93,110,81,121,47,248,127,117,103,109,41,174,174,137,31,65,222,137,253,190,223,119,195,236,136,154,162,242,131,233,18,254,52,157,243,162,172,66,176,110,212,167,101,89,31,105,152,125,191,148,249,95,44,254,193,67,80,128,71,24,182,251,77,84,185,95,147,223,21,121,232,230,122,34,185,145,83,101,178,156,105,234,249,255,136,120,175,30,245,
+186,46,79,236,171,60,87,115,101,121,220,125,225,11,143,44,205,55,176,175,61,26,89,79,187,71,227,118,135,183,213,111,119,75,221,87,196,34,84,1,69,42,114,206,80,64,1,69,134,3,20,185,200,57,115,40,114,206,57,29,243,239,119,60,70,130,179,207,58,59,172,189,214,111,175,245,91,8,177,137,43,13,151,231,229,198,99,130,104,39,193,185,124,252,1,3,144,186,179,72,170,61,89,33,160,172,224,139,225,141,76,197,135,82,72,164,82,224,139,78,108,103,197,135,3,233,172,232,203,188,240,158,98,35,150,150,192,83,141,128,114,45,218,27,14,212,91,35,22,148,53,233,227,50,12,184,132,103,145,65,45,9,168,68,183,64,187,99,165,20,200,163,87,185,239,215,255,99,164,34,247,47,56,241,237,84,125,108,56,168,76,24,44,50,7,173,48,74,235,252,50,98,234,101,123,212,249,99,188,38,103,180,172,98,172,142,252,243,104,153,196,140,121,99,189,89,149,147,55,57,79,1,45,219,60,60,127,109,62,168,143,13,231,132,141,31,36,113,231,16,228,118,34,236,220,124,
+206,143,110,236,8,136,60,47,76,75,12,201,231,124,81,153,174,32,231,135,243,82,111,109,151,236,78,137,233,9,4,210,39,57,212,27,191,228,56,10,166,61,25,39,247,147,36,99,245,214,56,4,128,162,123,31,211,98,240,163,252,155,138,105,95,58,23,250,7,248,145,206,250,55,255,70,78,8,142,231,22,245,41,108,176,195,131,111,170,247,84,11,210,36,27,131,149,27,27,238,185,56,250,246,133,7,227,160,204,13,241,214,242,243,29,200,52,101,33,116,212,221,134,22,212,37,76,138,145,50,148,20,117,136,205,102,81,73,145,115,60,217,89,107,10,209,146,194,139,20,27,9,120,179,178,32,140,251,168,248,132,218,124,210,137,162,207,137,230,120,93,117,83,173,108,87,65,250,253,131,28,19,198,159,202,2,90,152,228,157,119,108,254,34,183,101,246,195,159,74,77,70,29,226,168,103,164,209,232,232,29,220,28,243,88,70,251,149,106,156,233,207,35,103,2,210,62,205,185,31,71,158,72,243,2,86,251,93,177,100,192,186,212,232,6,211,139,160,221,62,163,168,97,214,25,55,
+2,111,150,21,148,174,40,252,58,141,50,45,70,79,10,79,7,251,8,178,110,193,59,106,69,98,242,190,130,99,165,69,177,116,161,27,49,86,157,190,116,97,130,41,244,85,79,62,162,21,175,26,84,67,209,126,122,207,88,113,238,68,157,247,44,253,150,54,101,21,180,150,133,87,29,34,158,212,174,143,52,10,94,55,175,122,23,166,171,201,42,191,13,6,181,108,76,83,103,204,186,16,154,157,202,31,59,186,208,179,185,169,90,181,171,4,235,56,175,90,125,37,233,227,194,163,17,184,69,110,126,54,63,189,56,194,228,151,79,80,178,14,162,139,244,234,60,27,212,197,195,60,199,34,87,220,81,231,156,109,93,177,58,168,111,165,161,39,48,242,162,159,82,6,105,192,183,100,133,146,134,51,66,97,144,252,218,94,184,41,135,62,61,29,168,160,76,40,116,96,70,24,40,227,45,220,46,189,127,62,165,202,87,76,130,84,30,64,168,28,185,78,234,184,86,148,69,238,200,23,189,121,113,194,13,170,41,188,93,197,100,6,14,64,104,187,236,85,41,106,243,201,178,9,202,66,
+228,76,216,171,51,227,252,85,22,55,91,140,246,67,212,25,19,193,241,65,53,77,147,222,159,73,198,11,13,148,184,215,252,212,124,213,230,39,245,139,213,152,191,152,247,86,69,180,154,222,84,185,210,55,70,213,153,87,225,115,250,184,159,199,94,204,114,91,78,191,246,217,188,72,103,79,179,210,200,166,14,13,232,14,93,238,230,36,243,159,183,124,73,42,135,187,155,94,184,253,101,87,234,15,179,28,95,203,102,234,229,26,25,30,46,152,93,107,208,33,58,206,157,159,39,132,44,251,113,26,15,245,150,176,167,189,254,30,212,73,237,19,86,192,144,28,5,194,165,84,148,81,224,156,254,64,69,28,184,203,250,220,21,227,85,218,148,254,80,162,140,232,206,254,53,46,100,245,100,224,196,123,159,116,235,66,217,226,233,100,85,185,162,190,76,226,123,158,57,63,219,215,181,124,93,188,126,35,164,22,171,246,155,126,209,89,157,223,22,243,245,190,44,47,88,85,192,35,60,16,198,250,220,129,119,46,79,62,235,178,17,62,81,96,140,236,129,73,176,90,213,165,239,68,34,56,
+202,187,98,37,150,35,149,43,110,40,77,234,150,39,19,65,175,72,12,235,106,106,78,102,224,206,151,127,23,130,68,85,163,40,12,156,241,93,193,233,17,118,94,21,87,72,216,18,250,200,24,172,251,235,104,16,31,83,175,55,74,57,23,96,220,16,219,23,220,183,116,0,225,167,220,209,32,154,183,165,250,104,163,158,18,186,144,93,49,90,93,172,93,26,131,12,149,61,158,168,244,190,245,233,19,122,57,40,29,239,44,6,131,123,218,177,74,140,211,166,134,83,199,92,206,200,174,21,28,235,210,23,254,185,177,249,228,74,86,37,118,134,54,4,252,49,253,103,137,47,159,73,103,138,97,222,22,26,144,29,196,204,254,246,202,23,0,213,8,0,14,158,145,138,164,234,248,56,4,130,1,186,80,125,187,98,190,0,69,59,139,17,19,41,27,42,133,234,15,8,100,63,204,232,85,17,57,177,242,84,105,79,32,238,124,86,60,175,244,205,179,125,16,241,196,180,190,10,62,153,125,15,192,85,148,222,119,94,153,241,171,2,38,89,83,185,114,175,223,245,201,117,255,93,189,72,
+165,119,207,139,187,83,116,254,52,43,148,206,253,35,33,125,114,133,43,47,51,17,30,1,241,24,59,245,201,147,222,48,142,14,0,201,197,80,227,168,128,78,71,61,158,22,201,249,24,151,174,57,8,89,168,6,143,98,78,138,204,60,146,85,74,10,97,69,83,225,8,18,221,20,159,70,18,249,198,228,74,70,93,158,12,82,162,195,17,165,35,20,53,124,147,184,185,59,23,223,113,57,39,161,77,199,101,11,197,106,18,23,240,205,145,184,242,238,120,65,164,134,196,230,190,62,207,151,206,195,177,49,20,247,31,62,111,3,114,31,132,54,100,15,127,30,135,150,57,3,218,241,45,245,26,154,167,110,39,118,147,156,32,113,139,235,196,123,36,71,231,247,1,80,76,47,223,30,197,110,237,228,223,194,155,69,246,120,82,0,55,13,88,108,118,245,156,1,116,70,222,61,154,135,9,157,172,133,207,240,229,185,190,112,32,1,116,117,35,100,202,172,112,12,70,249,90,119,180,88,171,130,16,234,5,61,240,88,20,202,128,4,119,126,116,23,7,208,56,26,150,34,203,10,241,223,
+180,8,92,153,17,171,31,178,95,162,215,135,236,155,134,80,173,203,119,85,70,188,87,133,187,210,150,0,8,194,177,202,12,40,8,224,3,62,28,69,245,42,251,150,126,123,105,74,50,34,35,182,61,100,184,115,81,121,40,239,158,119,226,110,166,158,100,144,175,123,101,217,79,172,112,219,185,214,133,113,73,50,178,55,185,138,119,60,24,102,63,114,18,17,45,88,153,48,0,160,25,237,106,114,161,155,243,154,185,124,215,196,173,249,139,102,22,92,60,20,91,162,47,96,77,6,11,122,89,246,135,38,217,143,53,248,217,195,191,201,123,42,26,151,22,231,30,27,218,167,135,186,141,82,177,169,58,78,178,91,69,74,99,102,120,54,37,50,34,69,70,220,36,218,28,236,238,245,173,39,225,207,51,92,215,86,149,15,193,73,16,140,74,91,250,137,134,72,187,198,46,54,240,116,108,84,202,153,177,64,115,212,208,147,190,167,216,197,27,20,163,47,149,154,220,212,210,231,190,184,208,14,54,238,253,244,78,187,159,205,204,233,244,250,28,110,143,255,251,171,90,74,120,52,30,170,
+23,71,155,246,238,51,58,194,227,38,109,46,189,18,93,27,42,84,189,102,205,179,243,20,248,108,178,79,19,236,177,172,100,47,142,6,50,98,81,220,215,100,45,16,12,159,194,235,9,190,40,217,204,4,108,58,154,87,103,92,73,182,27,116,9,239,241,63,206,221,90,148,253,96,68,205,61,252,189,151,197,162,55,16,171,94,41,87,152,205,70,249,50,223,231,6,31,39,54,169,52,159,107,88,232,136,175,89,44,234,84,71,235,97,117,95,184,61,193,251,250,11,95,100,65,245,134,125,66,155,238,41,167,54,153,172,52,251,170,70,52,116,17,12,230,16,231,202,44,130,13,15,124,131,72,144,176,64,179,190,249,33,97,105,88,227,55,232,64,67,157,69,153,138,1,10,111,30,211,248,221,174,60,134,87,58,144,245,176,230,155,234,200,42,225,236,230,6,237,218,140,128,58,140,35,226,91,3,133,162,234,40,128,222,29,34,69,224,6,143,204,124,247,204,155,178,60,38,92,205,100,4,65,245,58,169,53,167,235,244,50,170,201,193,9,156,136,79,93,69,59,231,72,101,106,76,
+166,210,148,69,144,141,182,58,221,60,42,199,149,112,75,31,64,225,209,34,162,95,32,123,96,44,248,111,184,75,11,211,159,218,7,66,107,111,217,95,232,171,249,124,231,123,106,106,215,207,64,168,20,138,233,83,182,109,233,140,115,246,107,94,159,103,208,168,94,166,251,195,5,221,28,84,74,251,133,101,210,177,6,224,136,141,33,55,35,161,241,78,40,47,102,116,240,138,150,64,80,245,232,9,160,26,61,159,152,82,90,225,233,164,176,143,246,56,52,199,52,210,121,195,211,201,229,112,49,175,106,242,150,53,239,218,96,154,135,147,247,178,84,123,76,214,198,93,116,109,53,212,50,115,229,173,79,27,98,111,51,8,216,90,238,26,218,123,151,23,187,76,32,121,107,215,19,86,111,9,218,149,57,27,118,160,204,7,242,79,235,199,125,108,238,125,11,61,35,8,148,124,81,245,134,216,41,130,107,151,173,221,88,87,45,115,123,79,193,51,204,39,147,201,128,58,143,146,57,7,75,91,123,19,84,247,134,250,228,224,189,107,137,64,211,21,90,92,91,154,215,13,162,208,221,106,
+78,195,109,241,252,185,119,187,236,151,145,37,242,192,35,103,235,108,83,211,149,107,227,98,158,117,24,35,203,216,128,77,132,58,188,155,32,247,152,99,210,195,73,179,122,43,20,67,234,73,163,149,211,115,196,203,91,111,183,166,189,112,211,227,53,247,205,217,190,206,169,60,8,132,57,198,89,60,55,138,4,61,151,104,251,8,141,168,32,89,192,193,23,19,83,168,91,190,30,111,69,75,197,243,3,211,95,38,25,121,40,86,225,141,102,156,43,58,247,193,94,33,231,102,106,67,237,3,39,77,10,18,193,58,137,38,140,171,29,173,153,145,253,7,43,78,154,184,118,62,27,180,105,123,246,196,93,204,168,183,73,59,165,76,226,45,152,54,207,41,176,164,142,51,97,203,252,132,105,84,31,27,42,162,181,53,253,18,15,108,87,1,199,236,203,247,4,208,143,175,4,2,231,75,167,47,106,27,168,251,59,35,180,158,199,138,152,107,152,51,5,165,199,158,224,106,57,57,44,9,164,254,56,199,55,7,188,154,198,172,246,153,247,55,203,236,153,251,8,75,87,98,153,49,94,11,
+86,134,57,175,226,20,72,91,212,217,88,161,182,218,241,86,72,67,155,94,215,40,107,192,199,120,34,1,95,170,242,163,208,178,22,53,53,133,89,83,59,84,201,25,70,128,220,253,210,21,103,195,253,83,105,31,243,136,26,172,75,221,51,178,95,67,144,113,236,172,125,254,178,91,95,114,26,22,47,159,142,239,245,69,121,236,210,110,184,75,241,49,128,255,229,135,128,62,233,216,74,192,147,201,76,233,219,19,58,248,30,134,191,244,112,119,49,186,12,137,42,28,98,238,35,121,212,238,6,163,203,19,8,127,0,133,195,187,164,53,183,70,227,36,41,227,187,153,125,3,178,157,62,60,151,137,238,86,33,150,127,33,178,101,68,11,82,33,43,98,180,127,91,231,110,243,74,106,133,169,201,102,59,148,242,75,87,89,76,46,30,196,232,212,180,220,157,74,91,186,59,119,220,62,244,170,242,199,185,244,132,68,220,121,134,199,105,40,133,128,5,14,65,130,219,237,163,15,103,212,71,36,225,174,237,63,61,240,60,142,73,194,87,71,197,202,4,104,230,201,45,177,32,205,7,111,
+91,3,163,181,21,125,222,66,85,253,175,197,181,55,204,19,218,83,208,167,177,232,130,56,48,211,63,206,158,144,242,111,1,254,191,159,199,229,12,131,174,185,95,53,219,87,213,35,211,3,22,37,4,114,60,181,170,60,143,7,22,235,249,192,10,122,158,79,88,0,223,249,60,196,106,97,31,177,177,83,21,109,146,189,249,6,94,170,199,70,22,16,103,91,97,249,249,113,192,4,7,243,202,41,219,209,192,171,255,103,229,142,195,83,76,210,112,98,185,91,47,91,224,238,219,178,7,126,236,254,19,221,6,196,2,125,237,49,174,168,218,219,62,130,172,103,232,62,33,143,20,19,224,35,91,4,70,216,221,160,39,176,51,40,131,6,171,33,31,236,245,151,3,71,87,97,102,133,55,209,109,66,80,220,165,43,14,241,221,117,158,88,118,203,131,220,210,225,32,8,225,227,236,59,153,90,27,171,192,158,245,62,143,17,143,229,229,149,26,191,39,166,53,53,250,29,156,67,111,202,227,242,220,234,85,76,90,164,103,61,144,41,241,69,29,120,189,130,203,159,99,172,163,197,34,57,
+22,253,3,83,141,111,146,234,184,70,197,105,109,232,137,118,205,242,142,137,41,131,138,8,38,9,119,126,97,144,94,238,126,132,145,148,15,78,112,237,225,130,237,87,127,102,210,16,203,131,83,50,45,19,42,47,37,224,221,251,211,41,133,59,152,23,80,96,170,254,108,16,59,148,101,214,86,145,56,95,250,211,3,125,215,254,62,246,96,160,150,10,36,66,79,193,182,235,170,59,158,5,122,218,28,110,234,216,125,146,33,47,0,30,13,227,249,224,177,252,197,74,9,248,20,90,144,130,54,227,121,87,183,140,231,249,212,151,173,217,59,54,107,61,6,29,4,2,56,238,11,163,32,173,7,245,207,28,49,33,69,236,141,12,49,133,234,85,79,187,127,88,208,2,254,245,157,83,217,236,106,204,4,111,101,239,169,86,197,187,62,69,124,162,112,13,210,65,110,130,189,61,210,107,195,235,154,219,242,235,23,23,34,69,0,57,85,240,144,88,5,174,1,208,186,114,102,30,62,187,174,237,226,41,146,99,230,173,80,226,204,156,49,157,95,155,22,219,47,28,48,118,156,60,250,114,
+27,57,8,163,86,141,243,130,223,6,128,140,229,79,0,193,202,241,123,64,130,223,134,3,192,191,73,196,181,42,17,79,115,138,46,20,143,42,173,184,148,112,247,219,236,58,31,57,189,202,87,217,24,138,254,119,190,128,253,197,23,30,20,226,243,193,33,30,162,221,27,237,234,39,63,30,120,64,110,115,32,100,2,177,165,51,254,184,5,201,239,127,234,168,124,253,83,71,5,25,1,125,178,193,50,177,86,59,52,206,176,81,179,84,117,0,207,180,119,158,164,101,189,153,252,179,161,255,81,112,180,161,157,223,92,120,84,248,104,206,62,253,81,107,86,247,22,5,187,113,243,227,223,222,212,3,224,140,163,69,162,105,120,204,4,26,44,162,115,171,52,171,25,230,207,85,90,196,231,219,150,222,243,9,85,249,182,217,203,57,23,78,122,73,240,248,118,134,111,31,200,144,123,142,237,71,24,211,213,44,198,78,3,76,193,143,220,75,6,67,187,190,137,33,147,38,223,167,77,45,51,182,179,120,123,176,143,108,102,169,143,47,52,69,189,163,160,107,152,126,214,251,229,144,138,167,
+213,156,244,31,226,244,112,0,244,23,161,24,189,78,127,152,111,204,179,128,62,97,120,234,228,50,48,251,134,139,47,39,107,199,125,126,153,63,215,105,87,10,130,254,130,226,212,68,72,143,204,90,39,88,251,179,201,126,66,213,225,45,42,164,102,214,89,67,186,71,153,60,199,68,5,165,252,33,136,223,31,229,104,39,210,11,90,32,22,130,20,60,133,223,238,86,168,27,6,46,61,81,131,161,122,85,149,139,73,124,247,165,171,63,29,168,49,167,62,187,140,226,3,69,106,86,93,199,20,199,93,103,195,249,152,122,249,152,27,111,145,152,174,19,231,238,103,61,112,43,46,189,199,200,114,48,142,7,250,21,18,195,34,76,61,162,195,67,101,243,114,1,25,237,218,234,208,189,110,58,251,254,158,100,150,150,211,148,31,19,247,228,252,121,30,56,14,31,30,59,86,112,103,127,69,29,143,101,70,248,59,194,114,162,79,76,248,125,173,102,225,77,128,136,175,171,80,29,63,74,80,73,37,77,40,203,187,218,62,247,254,203,192,78,50,128,32,35,244,158,206,36,250,39,245,238,
+155,129,39,121,13,86,81,102,68,195,58,11,59,244,237,236,135,29,45,208,212,84,107,115,84,234,149,182,174,84,60,160,178,16,17,176,198,96,163,176,34,196,173,135,118,154,196,212,137,248,197,31,52,255,63,78,70,191,64,6,72,91,41,200,113,40,209,95,239,14,223,9,122,167,46,127,158,30,82,64,43,89,174,62,246,90,52,20,46,120,162,208,198,87,135,238,226,91,27,114,122,128,164,17,67,235,91,210,107,253,254,202,167,1,233,10,107,70,144,166,244,179,109,240,74,130,32,19,129,177,33,63,175,111,83,63,112,119,52,245,214,171,57,197,239,143,209,247,240,9,176,145,224,200,46,116,59,1,85,249,33,13,213,161,86,197,83,18,28,195,83,184,2,1,57,227,71,97,36,155,238,47,158,215,202,13,128,140,30,30,92,84,49,127,140,129,19,88,107,238,99,54,48,85,215,107,237,103,183,136,176,142,166,249,156,187,2,132,234,227,185,254,118,103,244,94,150,248,211,19,56,95,49,128,67,192,136,70,67,214,100,80,216,242,200,113,122,187,56,112,243,159,33,56,150,83,
+224,84,255,221,127,254,79,127,252,179,255,240,239,127,251,79,255,254,183,255,195,47,250,155,63,4,129,191,254,253,183,255,252,191,253,229,31,255,209,175,253,187,95,15,255,167,255,240,219,255,30,100,253,213,111,255,252,135,191,249,139,0,231,183,191,248,253,31,254,249,95,126,251,187,223,127,251,87,191,232,175,255,230,247,191,124,136,254,240,167,206,255,244,219,31,255,203,111,255,207,239,127,252,237,247,223,254,248,47,255,248,135,63,254,227,127,235,251,207,255,242,23,126,237,63,248,69,191,253,235,255,249,135,191,248,75,191,234,111,254,206,175,253,235,63,252,179,95,245,219,223,254,254,247,255,242,63,252,127,195,127,141,126,172,225,215,254,246,175,255,252,55,126,81,80,20,148,253,246,247,127,248,219,63,252,95,15,201,31,127,255,219,199,124,191,255,227,223,249,85,255,247,31,30,210,63,254,211,63,255,154,228,159,126,233,241,247,255,240,251,175,185,254,248,143,255,240,251,223,61,148,249,203,191,250,253,111,254,240,95,255,233,127,252,111,170,255,233,242,191,254,246,31,255,227,95,
+253,237,239,255,245,191,252,47,127,246,63,255,217,159,255,187,63,255,243,63,251,115,24,18,1,111,195,97,48,36,255,14,123,188,142,12,238,180,129,230,114,122,214,251,113,133,190,123,121,139,67,135,232,39,206,97,73,126,248,103,158,197,7,101,248,188,146,179,59,100,17,7,197,251,238,112,56,24,14,251,155,117,62,7,6,111,172,104,196,5,13,66,39,74,67,103,126,211,21,62,151,214,147,27,188,180,190,251,3,197,207,250,134,239,82,166,150,174,209,227,112,244,204,180,70,54,98,196,117,111,115,24,96,172,244,63,119,125,243,178,23,54,31,250,59,124,215,83,107,102,233,177,9,237,251,125,34,136,76,94,17,131,178,35,63,126,134,74,66,249,253,80,69,67,7,157,207,29,190,95,5,230,216,96,237,211,19,144,195,151,53,137,7,103,100,40,79,29,190,235,169,137,229,194,189,12,228,242,132,124,95,108,253,187,190,90,49,93,166,192,12,199,185,25,142,23,128,129,229,73,161,249,29,38,255,116,78,246,11,146,202,163,230,30,52,107,109,88,161,134,184,217,30,121,206,168,
+185,54,27,157,187,103,121,104,203,23,126,57,216,33,194,98,70,255,190,188,219,141,91,233,251,7,147,217,135,197,247,60,54,146,34,68,185,74,177,186,46,213,42,18,69,175,19,175,22,201,116,98,20,72,31,187,32,114,1,200,87,132,214,229,129,196,175,220,96,113,135,54,143,27,117,176,53,54,170,193,120,156,184,217,175,236,78,174,174,224,253,26,51,76,200,99,93,230,44,120,121,200,72,206,219,172,69,154,141,198,51,6,237,34,169,215,37,182,99,83,101,46,70,44,28,242,228,142,190,167,27,129,25,242,88,123,10,43,125,140,147,63,107,37,52,18,176,202,166,53,41,128,95,83,214,244,203,249,84,146,250,68,82,103,95,123,224,76,222,224,35,208,105,152,66,193,125,220,104,178,191,237,98,158,163,214,61,239,88,119,63,243,73,20,170,103,209,169,73,188,63,50,135,65,207,143,47,136,172,83,116,249,36,6,209,186,163,99,213,31,187,226,152,109,225,210,89,234,129,135,147,235,249,187,54,58,66,232,157,102,60,6,252,77,1,53,190,42,98,239,245,185,242,129,213,192,
+64,41,218,170,250,78,201,139,63,90,48,120,64,140,241,2,36,67,214,170,60,195,30,213,143,101,231,215,94,185,246,150,203,228,213,84,246,48,151,116,54,118,201,130,6,243,66,163,185,162,251,181,29,130,33,93,90,250,210,133,168,241,1,47,37,117,222,5,2,95,101,190,109,212,232,116,225,43,9,128,251,71,225,236,142,54,108,201,221,246,206,65,169,199,55,57,76,228,9,24,247,45,61,103,253,109,183,234,185,123,117,197,128,153,154,72,48,6,114,39,253,176,11,225,31,87,47,114,53,217,12,0,53,108,241,254,220,144,33,212,140,248,7,80,71,20,35,64,197,154,87,85,103,201,7,95,152,120,8,139,211,79,185,166,212,110,239,247,200,61,10,168,223,191,188,151,17,252,234,246,218,160,131,237,10,41,232,30,100,28,156,251,96,250,20,97,221,71,154,87,125,235,250,114,225,131,122,153,141,20,175,243,102,13,182,134,119,214,142,66,139,5,129,255,195,177,59,22,139,249,212,44,84,181,36,247,123,104,205,227,88,75,193,13,52,198,53,185,151,1,177,231,54,215,57,197,
+229,66,91,82,23,188,151,32,94,45,247,76,170,75,76,250,162,128,159,5,9,168,96,24,29,60,154,177,242,124,161,223,52,74,215,157,207,153,114,48,0,95,109,101,67,55,227,199,189,237,153,86,154,78,145,226,140,226,15,217,141,235,193,218,234,52,96,115,47,47,9,119,240,174,9,104,184,184,132,157,139,157,127,230,34,125,46,235,131,92,96,21,121,246,183,20,167,228,224,92,53,113,54,35,179,178,187,147,61,77,180,47,123,150,214,114,126,77,14,93,153,99,251,253,2,173,34,247,92,230,58,199,248,133,14,191,176,244,137,89,122,53,55,219,96,121,94,238,28,79,224,112,53,203,215,202,75,211,82,137,158,230,152,222,122,207,16,28,16,158,9,19,202,157,153,253,6,245,6,125,162,196,104,234,4,23,231,28,26,207,174,240,214,8,155,102,44,173,119,222,120,177,194,155,86,166,98,42,58,86,214,92,100,139,58,226,195,126,192,167,104,168,238,128,15,160,20,213,123,218,136,143,6,254,182,72,79,233,180,176,228,105,207,169,106,170,67,124,163,110,45,143,194,152,119,117,
+248,242,194,185,47,74,223,14,94,147,222,93,136,1,166,22,103,102,191,152,89,148,227,248,195,114,244,45,91,129,139,31,177,32,189,184,62,205,194,101,8,242,78,110,55,132,126,183,243,212,115,53,40,75,2,55,141,31,87,234,176,246,52,147,151,221,225,141,120,1,178,85,207,181,176,82,6,147,187,105,200,139,92,71,10,165,204,233,210,126,38,133,8,242,197,51,177,204,227,153,63,223,171,3,81,121,82,3,202,51,93,249,100,105,148,71,111,229,57,70,52,219,109,69,163,252,79,236,176,186,98,36,199,210,249,100,74,109,151,174,172,104,203,116,29,7,2,8,150,33,188,110,66,79,214,68,76,97,213,201,139,201,48,105,240,226,93,99,126,114,147,51,74,190,195,19,22,210,55,110,206,110,147,231,174,203,128,211,155,46,222,63,124,137,219,13,216,238,83,167,116,101,108,238,33,215,10,162,229,26,196,4,139,155,48,130,241,173,211,11,97,192,225,11,87,55,239,171,7,175,116,2,17,56,230,235,234,165,71,234,212,223,15,36,211,253,228,186,236,154,184,55,103,136,169,133,
+62,170,92,107,254,24,13,43,55,205,143,78,51,99,243,54,245,29,58,31,64,55,182,152,85,181,51,241,233,243,190,228,58,49,240,249,228,185,175,132,2,213,6,137,132,219,167,120,113,188,191,182,46,72,68,121,65,194,2,21,253,114,26,2,161,201,237,170,247,236,183,238,122,227,114,253,46,165,76,60,87,234,211,181,241,84,191,86,222,82,240,236,113,67,58,200,236,113,170,17,252,77,176,87,193,116,52,164,224,96,42,121,33,52,4,60,135,81,232,88,226,176,162,234,102,202,127,17,77,184,134,78,53,110,104,0,233,43,187,145,30,138,151,81,229,157,62,243,77,77,60,55,233,227,211,6,7,67,8,124,150,253,133,255,162,158,179,120,231,155,193,89,202,78,142,253,215,231,80,219,244,228,104,231,48,79,242,45,174,157,156,226,190,176,132,73,151,205,45,24,108,46,94,26,90,110,64,79,168,9,205,5,182,170,91,123,39,141,89,60,189,7,102,21,34,212,48,47,26,122,87,57,203,240,33,194,53,62,68,238,8,230,212,125,7,41,174,187,218,229,251,246,184,224,234,218,
+147,122,193,21,32,146,154,245,147,218,211,42,249,240,231,216,21,127,186,209,4,115,90,118,117,107,34,24,27,224,141,122,181,186,25,234,29,93,219,98,221,99,55,36,40,34,62,155,185,130,115,183,46,141,183,120,240,214,221,138,212,239,136,64,221,196,90,126,89,161,77,227,186,75,109,183,238,70,230,2,46,246,252,112,237,60,182,127,238,61,217,250,169,53,247,119,26,59,93,87,191,218,119,173,136,167,143,25,225,128,96,66,246,75,251,68,181,4,49,239,216,189,180,70,155,25,74,83,84,85,14,93,12,189,188,104,86,233,138,126,142,119,141,127,181,180,83,108,175,46,177,149,118,233,192,46,117,99,41,229,7,185,8,100,170,94,166,106,133,54,87,83,203,132,150,79,246,238,140,18,61,198,69,229,79,227,93,132,115,35,36,206,16,250,201,252,252,50,31,221,5,229,120,73,33,210,203,82,165,165,61,203,32,209,220,188,230,198,114,247,147,26,67,123,99,225,70,189,89,215,111,236,239,34,108,216,100,212,85,8,187,63,125,254,154,57,68,6,65,49,205,249,41,69,80,140,
+9,236,121,156,203,160,87,29,230,247,182,252,83,87,109,246,46,119,152,83,146,234,223,45,8,136,124,114,58,149,131,11,102,76,194,122,111,46,35,138,2,195,128,176,210,5,113,34,1,187,180,246,56,29,120,169,123,222,13,26,47,52,57,106,232,80,158,128,18,45,220,13,97,170,71,193,60,215,63,215,36,27,112,76,100,244,245,251,190,21,49,120,250,56,229,127,226,14,211,240,72,248,128,11,174,107,247,101,12,205,233,0,47,254,220,112,145,44,142,123,195,141,240,182,250,1,30,194,16,16,175,132,112,108,166,10,99,188,204,24,119,102,249,171,164,48,88,203,97,228,98,64,114,129,207,174,193,232,64,44,243,249,118,115,184,49,46,132,127,158,75,159,137,102,121,115,105,74,74,186,214,66,177,248,201,136,116,108,192,131,71,17,43,195,125,223,184,91,177,35,219,90,23,176,74,17,83,173,190,186,160,51,234,174,235,15,189,20,86,2,215,177,166,222,217,134,199,189,79,103,114,13,28,80,130,25,220,109,69,160,52,78,212,101,208,138,13,9,119,81,233,140,206,54,135,111,
+103,203,102,88,82,17,125,144,153,148,63,143,58,144,148,14,253,28,222,238,143,125,66,197,92,29,74,111,64,127,34,237,130,38,237,91,236,6,138,175,133,251,35,198,124,220,80,77,50,178,132,72,129,98,137,55,85,92,186,218,224,93,6,76,159,209,141,27,35,15,107,146,161,206,9,185,100,129,136,153,196,91,248,86,194,83,11,55,111,130,68,213,181,19,80,89,157,207,239,226,154,228,20,99,135,74,234,144,240,242,130,205,195,222,220,249,240,194,104,217,230,71,196,220,139,189,59,213,196,222,164,70,214,103,89,213,24,132,194,218,132,90,77,185,237,85,37,95,131,244,157,208,0,172,2,67,163,214,71,117,174,43,58,22,46,190,3,235,132,90,121,136,178,205,119,214,117,214,248,81,56,159,154,124,84,198,99,122,189,152,60,251,80,85,144,142,185,191,82,195,29,193,221,48,108,3,223,86,31,100,121,6,170,14,199,114,25,243,130,85,33,74,48,228,31,133,149,69,203,215,23,162,23,200,199,193,35,125,175,75,168,176,122,46,127,234,28,151,74,53,76,154,222,52,83,235,
+210,178,46,184,163,129,247,247,163,253,22,145,152,8,5,205,114,55,133,53,17,104,175,226,139,122,121,218,134,119,234,42,88,219,125,82,23,225,51,223,178,184,54,226,194,104,110,46,111,164,236,28,183,112,116,165,214,249,7,1,156,115,26,133,177,131,123,165,71,18,17,209,5,250,167,134,253,162,248,88,70,227,242,213,105,214,241,9,204,111,181,26,59,58,159,96,239,225,216,182,243,186,214,113,142,33,117,129,81,191,108,77,223,147,226,242,99,162,57,110,204,240,14,92,217,218,93,238,101,206,109,89,186,204,219,250,109,168,57,36,190,18,81,188,47,104,44,152,188,231,44,199,200,196,155,247,107,145,164,79,108,115,85,114,29,23,38,239,205,151,64,146,44,72,122,249,215,239,36,62,161,196,135,104,60,71,208,183,44,45,126,207,161,206,140,49,212,7,163,150,164,115,94,24,66,64,160,189,126,114,161,233,2,11,133,132,243,96,238,126,53,221,78,208,193,217,247,29,4,211,132,199,89,195,220,44,206,131,0,70,200,160,9,250,226,107,150,91,147,217,0,206,21,112,92,57,
+94,225,91,193,219,33,53,209,245,184,208,186,242,52,8,80,111,238,185,74,77,35,83,53,164,73,205,111,7,129,29,111,111,126,54,237,8,249,252,112,124,151,55,62,140,8,201,145,78,196,120,178,11,140,89,100,68,32,238,174,53,18,157,54,19,10,161,53,69,19,71,198,212,142,250,49,122,100,188,167,169,110,116,233,58,79,53,242,183,4,212,93,79,110,96,23,174,62,14,194,211,158,5,56,106,110,34,198,197,45,194,59,80,252,49,109,119,46,133,211,188,189,168,26,126,208,229,162,252,248,228,213,180,110,90,63,20,159,145,93,86,59,214,87,62,64,212,75,67,64,223,12,244,184,194,44,116,112,99,214,179,53,154,104,242,7,137,166,22,90,43,95,98,19,114,188,128,212,123,247,176,19,30,235,195,14,29,37,244,213,186,143,198,240,43,245,134,90,54,0,104,247,35,152,198,128,67,37,1,45,253,38,150,126,106,16,26,48,196,179,39,124,64,250,107,62,107,6,17,218,163,244,216,171,22,89,59,158,173,246,110,243,201,149,224,239,239,183,1,74,145,241,184,9,16,163,
+119,62,71,27,165,20,111,126,185,252,60,211,187,121,18,38,197,67,210,97,79,92,239,215,83,115,43,28,193,4,86,117,209,103,6,100,103,125,182,81,204,119,241,106,27,243,107,30,182,65,117,159,185,87,40,213,148,64,178,112,210,232,146,203,211,155,198,82,235,69,198,30,116,190,155,43,97,28,251,111,148,154,20,247,90,33,225,34,139,142,19,36,188,229,224,66,209,143,118,242,230,60,225,202,211,158,33,192,185,159,150,4,83,85,178,236,113,252,12,119,142,54,233,138,188,253,104,121,123,136,51,109,114,138,101,183,246,227,210,146,63,195,61,150,213,29,36,221,240,87,243,177,128,142,47,72,109,118,130,92,93,199,49,11,60,252,57,65,82,120,65,222,13,72,6,143,195,151,244,129,6,185,67,203,59,90,244,149,203,33,209,16,1,69,207,171,70,10,87,83,191,62,22,173,16,18,20,227,211,159,2,154,23,95,117,243,40,204,242,187,237,51,177,212,149,157,222,87,203,221,71,74,252,44,146,103,168,169,167,195,244,137,103,224,237,158,58,177,239,177,210,49,111,0,59,142,
+185,156,100,154,120,174,87,144,67,242,124,17,242,166,190,123,112,250,230,17,189,134,22,208,173,120,212,176,91,93,183,234,211,95,234,34,151,217,56,170,204,26,76,215,66,223,10,159,140,80,125,117,147,225,117,142,43,126,144,134,214,232,37,48,54,245,11,186,91,174,160,208,232,102,227,106,233,30,133,160,24,36,191,242,166,224,204,35,226,143,124,174,52,157,115,85,89,79,109,61,212,62,241,143,166,198,106,160,112,180,83,219,32,164,169,176,142,82,201,42,221,196,180,239,251,0,88,179,145,161,17,18,146,153,107,119,198,155,200,115,157,97,0,13,240,14,241,50,220,157,213,93,20,76,108,34,248,194,158,24,222,120,51,117,75,157,62,26,151,183,32,234,167,179,250,186,124,117,208,214,208,179,158,136,160,241,217,114,0,64,53,239,7,50,252,75,114,187,217,194,142,243,226,214,62,214,123,232,37,249,187,97,95,155,65,240,9,190,136,215,158,158,62,137,247,90,92,253,97,179,67,222,142,37,54,159,120,53,10,68,47,33,56,88,79,1,80,117,36,167,36,225,45,129,207,175,
+64,103,247,82,178,222,53,78,59,222,7,34,164,216,46,203,48,181,18,41,121,26,125,122,23,221,239,198,187,16,222,100,92,177,1,180,255,237,123,129,62,164,176,14,252,210,244,190,155,145,105,126,121,213,223,127,231,114,167,146,194,155,97,32,199,107,237,215,107,170,111,204,245,52,224,188,201,230,56,186,182,77,176,156,104,252,180,244,107,206,22,178,86,67,58,253,117,254,168,228,170,25,104,254,30,114,215,168,103,192,90,217,125,45,198,167,230,82,123,205,53,162,10,7,213,4,77,191,93,89,244,241,71,105,58,65,225,181,254,7,76,67,243,112,163,193,120,114,57,233,43,8,36,94,160,37,89,12,185,47,244,6,182,76,72,29,84,109,128,151,176,178,164,38,216,9,195,224,192,241,126,57,22,140,83,0,214,155,52,207,81,186,236,205,250,113,245,126,204,43,87,224,234,231,3,129,121,194,21,73,187,14,127,202,61,234,99,131,193,15,204,218,134,214,236,76,235,101,50,177,14,220,13,207,238,176,48,34,250,158,15,27,26,2,210,166,103,63,104,106,210,247,113,246,0,161,
+21,124,146,44,183,176,112,229,239,52,245,124,227,245,218,146,249,74,16,194,186,206,236,63,244,192,243,211,146,242,66,47,46,189,95,101,248,201,134,213,120,91,38,118,45,89,57,29,163,40,152,181,251,17,236,89,45,121,45,12,111,52,10,102,79,21,117,106,81,248,138,189,101,7,158,194,205,172,33,174,231,244,88,17,168,155,243,214,157,153,174,91,109,86,198,198,67,85,72,174,189,54,218,183,217,8,74,238,69,130,177,207,83,27,112,248,110,249,210,142,233,57,178,135,3,17,50,91,114,199,57,241,7,154,236,25,128,134,126,194,232,29,72,43,36,141,131,145,98,105,150,82,56,131,227,34,161,3,48,195,86,22,236,69,51,52,6,135,54,71,229,120,165,44,87,210,201,207,45,250,85,163,6,246,140,240,115,138,128,187,95,55,180,247,150,207,215,14,220,110,246,139,227,105,193,57,111,235,58,68,241,197,97,235,76,143,82,69,46,239,6,23,250,43,146,93,57,98,44,110,166,87,16,37,33,221,32,105,239,60,29,249,25,229,200,239,91,134,72,103,143,39,117,36,255,184,
+49,77,151,166,20,128,195,136,216,2,29,182,67,34,222,97,200,48,155,156,156,246,208,149,28,23,197,163,233,246,223,132,218,71,241,62,153,156,180,110,99,199,171,117,11,93,58,93,122,23,141,234,84,235,112,116,61,102,232,5,13,142,250,17,160,43,147,169,251,244,0,208,245,42,107,214,108,213,181,166,177,96,64,196,171,59,115,169,174,77,164,125,159,63,76,38,93,13,170,125,141,110,48,70,23,167,241,176,237,215,238,122,201,37,188,143,135,121,218,175,195,39,174,233,223,147,229,16,181,102,70,153,4,19,230,105,242,202,57,60,234,183,216,234,227,25,175,151,227,193,56,237,11,224,72,175,159,21,37,204,25,61,82,243,31,190,242,117,61,221,26,50,203,254,45,239,33,210,22,243,67,240,166,106,180,136,36,100,218,0,227,166,171,43,79,235,165,99,10,215,103,23,112,189,191,148,75,151,75,76,237,76,130,3,147,220,187,32,33,220,227,39,133,211,141,219,157,87,237,43,22,188,21,160,81,227,193,212,33,199,242,202,115,45,37,2,204,143,119,112,247,195,4,239,186,119,
+97,250,7,6,240,198,47,208,60,63,240,157,159,231,218,185,115,211,60,244,191,244,163,69,201,218,161,28,220,77,247,185,104,25,215,46,50,217,98,196,192,172,207,38,57,108,74,100,169,49,141,43,223,48,86,203,213,208,57,56,238,48,110,69,155,249,173,9,36,216,11,143,122,28,214,91,84,26,106,115,58,1,23,139,34,208,100,116,119,116,143,245,125,127,152,68,252,60,177,101,231,48,164,182,47,245,142,1,129,185,4,230,19,7,255,20,43,69,4,14,99,112,62,21,216,221,244,227,166,70,157,190,145,62,23,39,142,253,65,199,248,213,171,178,209,149,1,245,233,197,111,35,133,87,172,158,192,113,59,121,183,164,112,195,94,171,97,230,183,209,146,203,109,17,13,46,227,254,131,120,185,97,234,193,68,115,189,61,146,80,63,94,208,134,160,14,79,37,156,103,16,190,243,119,79,136,70,19,183,63,105,47,249,31,251,123,195,227,227,175,87,199,167,52,3,130,246,5,72,242,163,173,145,15,158,219,68,135,128,125,229,151,196,39,232,240,54,189,132,186,79,16,7,124,4,153,
+226,114,194,104,55,44,58,120,205,129,129,95,157,103,212,124,72,104,236,50,12,204,249,50,31,78,38,191,46,139,158,41,229,152,165,207,22,31,218,238,153,35,237,121,204,32,212,167,200,188,5,102,188,0,106,29,26,157,231,222,253,233,113,180,39,185,68,253,6,206,114,12,253,179,235,106,129,116,93,129,135,166,147,92,111,43,15,100,238,207,23,222,155,155,173,57,148,73,17,207,133,187,246,242,248,245,142,27,144,144,246,216,171,27,83,59,88,249,215,155,251,216,191,56,54,135,195,207,157,84,38,123,36,188,67,141,163,137,104,9,171,26,192,201,246,22,63,38,14,188,233,220,220,139,100,133,179,185,210,239,7,77,222,87,162,192,73,150,56,186,252,27,207,231,113,82,160,203,158,6,85,135,63,232,76,170,77,149,4,28,146,96,24,131,193,67,60,218,109,154,19,172,246,186,186,86,167,189,90,243,254,5,185,6,167,57,188,97,89,109,112,57,32,21,65,221,219,78,127,6,78,165,154,170,195,183,110,220,11,133,99,6,36,23,103,135,123,86,91,28,171,45,14,3,81,157,
+241,95,204,239,72,190,145,8,71,250,150,57,207,252,52,105,232,160,91,81,122,75,53,16,214,172,18,71,113,114,97,248,166,22,13,167,95,27,153,2,60,18,129,61,10,22,40,179,103,121,180,80,155,232,171,172,156,24,197,156,73,225,93,38,237,41,200,46,221,162,58,207,17,163,67,206,117,142,54,47,123,203,72,142,242,84,132,112,227,23,23,27,189,2,242,174,173,201,183,41,88,53,145,142,219,182,96,254,117,151,24,57,151,136,117,191,104,84,37,94,127,163,140,113,58,13,135,195,115,61,103,142,35,40,54,13,245,48,232,91,235,208,132,106,151,245,209,212,18,214,117,72,143,186,11,170,102,63,18,132,57,20,210,149,122,151,175,157,183,181,224,188,187,71,227,28,36,179,132,249,16,233,137,93,144,29,7,220,7,237,165,107,37,59,86,72,9,137,212,157,79,194,97,248,224,235,176,199,45,234,85,126,114,50,77,226,47,139,128,14,177,245,22,13,192,109,16,83,144,126,202,108,119,103,113,55,146,36,133,73,210,178,176,237,107,238,241,244,166,214,208,119,177,121,49,117,
+170,173,93,163,89,53,92,26,86,127,64,198,225,4,216,5,181,139,143,151,60,204,239,5,55,215,186,193,185,2,117,116,229,213,139,174,96,7,1,143,78,200,65,212,222,133,169,43,17,30,77,76,193,137,31,165,211,152,90,85,81,93,119,166,38,232,19,253,169,150,118,123,16,96,7,222,42,125,184,198,225,53,156,120,108,92,180,75,143,53,8,85,21,124,155,199,77,172,99,142,87,164,174,125,248,12,79,160,53,225,4,205,162,12,103,149,124,176,200,230,215,69,162,89,69,184,100,119,220,219,65,54,224,135,104,12,205,50,163,26,56,0,251,252,82,93,145,138,16,49,92,115,10,166,45,254,89,253,40,7,121,245,101,106,187,246,52,163,55,105,89,113,240,56,46,124,104,218,117,234,37,80,10,2,143,247,114,17,130,214,213,243,98,212,78,94,226,241,156,34,186,178,121,25,45,88,86,54,146,228,26,70,189,128,12,108,4,200,45,18,82,2,183,186,103,117,162,226,83,130,44,255,243,104,93,111,20,249,37,129,95,130,246,204,57,218,4,13,129,123,26,28,65,64,195,237,
+153,128,158,155,100,158,128,20,103,176,247,134,24,172,247,238,33,136,153,75,89,7,201,30,63,231,20,220,136,169,68,176,28,144,48,21,137,249,139,119,107,51,44,31,145,207,195,214,86,69,148,244,101,130,39,188,58,187,107,205,62,24,221,80,169,7,100,113,69,250,52,53,120,149,50,20,214,39,14,46,179,225,174,194,253,232,110,17,236,213,128,91,37,29,114,185,147,205,132,64,113,39,54,35,36,172,119,249,200,209,123,142,53,7,137,208,133,61,124,210,202,70,2,1,63,49,151,30,94,171,190,81,159,63,106,236,143,7,76,24,58,143,68,172,139,199,185,131,6,77,197,252,182,13,220,4,2,30,160,247,177,46,192,214,121,57,12,6,139,51,114,250,37,0,180,40,61,15,179,184,44,175,90,65,255,173,95,112,215,20,209,59,14,77,158,154,241,169,118,49,61,65,167,70,244,143,48,112,235,79,54,135,198,226,222,211,59,155,238,234,33,60,57,44,142,61,168,217,208,55,172,3,179,245,178,7,206,41,120,73,59,7,142,217,6,6,4,175,126,248,96,110,91,54,226,51,
+140,0,232,45,98,158,205,222,3,98,114,105,245,89,219,214,101,225,144,73,141,152,150,106,14,225,199,171,75,185,180,191,157,140,79,82,147,119,35,219,197,122,144,201,20,38,67,160,115,114,151,158,61,69,31,169,187,233,80,78,91,76,238,132,161,182,42,213,140,44,144,188,143,247,96,80,228,94,93,221,171,97,134,211,73,17,72,61,239,46,245,235,123,83,253,11,138,217,23,92,51,87,86,20,231,58,30,170,228,146,221,173,193,130,195,49,255,213,233,166,150,39,35,85,119,176,64,69,16,168,251,28,98,223,50,19,4,51,166,30,190,220,189,170,213,65,209,57,22,60,109,199,122,37,240,41,239,139,146,118,139,27,128,12,245,69,55,38,136,57,119,126,173,185,91,242,192,150,253,147,53,63,3,87,210,110,133,237,129,196,129,249,249,244,5,90,63,9,93,115,146,188,174,226,95,109,57,8,143,36,141,43,250,202,212,84,96,103,78,132,47,194,114,178,119,22,244,40,152,110,21,69,127,160,20,138,171,51,150,162,89,175,7,181,107,103,82,142,65,133,49,114,55,49,150,224,
+205,49,28,163,12,94,207,13,22,106,121,144,63,119,53,121,251,163,168,122,112,79,4,174,231,81,21,112,190,155,61,79,151,170,185,150,177,202,180,62,139,233,131,245,224,153,110,140,121,39,165,67,60,237,12,213,5,97,140,81,32,71,154,196,80,16,15,100,188,120,88,26,91,208,214,51,251,111,180,114,124,27,123,142,82,80,232,212,220,75,243,195,73,191,212,204,197,211,184,66,105,92,144,221,239,23,219,134,176,65,222,148,33,207,167,145,44,234,104,171,85,72,178,6,90,107,235,152,189,225,131,228,131,2,156,86,241,227,219,194,170,214,10,139,218,42,190,57,46,252,91,235,244,144,254,106,245,127,9,199,133,51,250,86,92,110,60,142,53,44,151,60,157,78,214,155,37,92,56,71,61,57,60,232,133,53,182,181,180,196,222,168,213,124,11,159,140,72,191,174,6,249,101,238,133,223,192,129,41,4,202,174,22,114,190,8,96,230,198,64,29,107,246,61,71,176,142,188,186,199,147,194,61,157,98,31,134,103,193,119,205,103,182,156,144,247,194,243,188,88,128,234,21,26,126,254,
+77,208,1,83,163,245,254,84,191,84,161,254,4,19,1,139,190,68,152,231,7,27,104,235,225,164,94,20,145,37,219,190,80,197,223,55,102,250,53,252,174,185,19,138,222,235,45,244,165,212,182,74,141,137,219,76,207,63,50,229,205,166,43,221,77,253,141,144,65,218,204,208,102,58,182,254,96,7,10,79,211,77,157,164,46,171,17,59,123,200,165,238,19,15,43,214,125,76,100,213,216,134,221,251,157,224,94,82,109,135,73,34,100,235,211,111,215,176,243,240,160,90,150,144,130,113,157,84,131,79,224,69,61,57,14,10,55,207,241,100,134,234,23,72,103,65,8,174,41,87,20,71,175,175,152,171,153,128,236,108,175,5,206,151,111,143,93,160,115,143,60,246,16,183,9,168,98,3,222,189,228,216,131,121,196,37,160,47,250,122,206,3,72,81,61,58,178,207,171,32,189,14,156,24,250,209,117,3,93,7,13,10,95,51,215,196,14,81,66,169,244,254,83,40,21,151,135,156,117,95,82,182,240,224,101,191,190,93,159,247,184,89,170,121,161,47,252,174,132,218,22,66,65,161,164,250,
+104,39,49,205,239,214,22,37,39,139,233,143,96,248,54,40,221,57,122,119,139,164,103,223,75,234,184,80,199,49,112,42,62,176,208,39,28,87,202,187,10,113,43,248,241,186,213,101,69,225,108,76,115,185,185,250,184,209,223,44,125,141,45,52,54,67,43,43,187,78,121,168,48,33,45,240,16,128,191,79,80,184,87,79,21,93,114,237,253,117,37,94,61,71,111,53,64,182,105,188,86,237,26,178,85,138,16,184,28,80,78,115,180,31,50,245,25,154,33,240,116,227,2,157,197,245,116,159,220,243,135,43,65,244,30,85,239,205,174,49,184,28,31,115,248,82,161,230,147,221,211,207,247,195,21,185,95,104,83,139,171,3,220,45,158,103,214,190,153,94,103,220,30,62,124,184,80,59,45,120,175,251,135,11,193,135,15,127,185,16,120,248,240,225,208,1,172,177,155,161,31,148,8,53,209,28,11,135,197,108,142,246,248,83,228,194,7,136,224,104,44,136,106,233,84,146,209,235,39,245,74,91,165,231,167,11,61,20,219,229,18,224,194,220,168,185,135,91,211,161,56,139,171,14,103,28,
+158,127,113,177,232,245,109,70,93,152,77,24,101,247,45,88,48,0,15,181,180,16,153,240,88,75,253,104,154,181,213,127,107,229,31,210,95,173,204,47,225,163,5,208,243,231,89,236,66,111,38,11,86,72,83,92,54,39,245,99,53,7,77,114,163,42,189,187,158,123,36,143,74,101,138,30,197,249,114,94,82,250,218,117,192,169,17,223,74,250,36,21,155,50,221,80,0,133,130,7,36,117,23,213,87,70,162,112,189,161,244,37,32,52,229,63,253,98,20,150,252,211,126,66,162,226,145,91,4,69,134,189,174,54,193,87,210,106,205,34,181,205,125,163,14,219,125,233,114,185,48,142,193,196,226,192,218,61,227,155,188,19,154,198,183,33,44,115,248,242,2,188,140,190,88,51,27,85,34,18,154,233,153,204,146,37,195,169,34,47,92,100,60,130,141,124,119,165,142,128,28,129,249,94,197,241,44,190,42,104,148,69,16,134,55,21,190,135,247,199,88,136,116,31,241,26,199,113,73,253,36,218,52,112,34,89,38,120,124,228,117,247,105,173,20,119,59,112,36,143,166,240,141,213,49,1,
+241,12,216,199,234,45,155,50,195,222,77,112,69,219,62,241,104,186,192,183,169,190,64,97,42,81,73,149,78,114,186,31,236,43,118,147,179,193,226,233,50,241,125,169,175,209,152,4,65,122,101,26,159,174,189,125,139,195,196,225,178,194,59,98,220,17,238,107,147,18,83,136,95,153,165,114,239,159,131,98,217,20,99,207,88,61,75,60,91,115,244,13,102,83,132,93,81,15,19,239,31,253,126,101,104,220,104,89,246,183,248,240,125,211,151,219,55,200,111,59,117,145,188,46,190,3,215,193,119,220,212,147,95,153,38,42,129,133,11,145,227,199,78,159,43,50,109,66,175,172,94,228,37,223,31,60,77,76,254,29,203,178,216,177,124,142,56,172,216,144,11,116,185,48,7,28,201,18,219,116,223,177,29,25,121,102,22,145,93,142,95,18,114,173,35,87,253,230,141,116,201,171,150,252,253,153,237,1,233,94,4,40,244,199,26,211,66,248,120,107,140,122,53,194,152,82,27,119,52,15,124,5,233,188,244,235,222,194,107,12,241,217,17,141,252,250,173,200,141,80,148,16,134,50,98,82,
+18,114,120,16,37,21,186,94,83,136,205,106,139,250,233,188,162,168,177,156,247,147,23,10,42,135,108,154,8,225,131,7,63,229,94,145,136,103,68,29,183,176,213,102,84,22,96,78,246,79,12,54,37,109,144,63,159,87,198,244,8,211,30,228,44,176,120,180,198,250,68,27,114,182,17,181,45,205,61,45,137,85,210,240,107,164,69,235,70,202,79,246,183,38,130,138,68,229,244,110,53,41,244,26,197,90,89,150,210,228,170,189,185,222,209,17,120,137,49,196,178,178,35,107,163,233,240,178,103,56,187,229,16,50,129,215,184,86,64,146,167,208,217,65,130,108,130,111,71,208,185,66,243,220,178,2,224,135,155,18,28,100,36,81,152,125,27,73,154,219,159,133,233,252,106,189,165,57,128,187,21,93,28,164,135,211,44,123,105,140,220,243,237,112,126,56,51,156,238,92,152,222,252,249,94,28,100,86,171,61,91,227,141,180,146,228,182,63,56,83,37,160,59,67,110,182,34,250,230,65,90,170,228,38,83,210,168,176,223,170,47,103,158,76,235,254,122,107,206,235,49,189,89,206,40,231,
+172,207,218,81,176,184,69,116,99,103,64,230,78,81,84,252,73,50,101,81,12,56,172,156,41,49,18,196,51,163,107,238,236,80,221,236,60,131,187,192,228,183,35,241,148,81,174,96,103,205,29,194,104,245,180,101,6,110,103,26,224,254,18,172,249,186,20,169,32,243,212,10,50,204,40,139,252,12,142,238,213,173,96,230,216,49,228,13,63,117,46,159,70,15,69,169,83,157,19,204,10,35,203,120,171,177,20,28,118,245,205,172,158,53,210,172,251,23,235,62,207,179,116,250,184,71,111,137,120,100,17,143,56,98,243,104,82,37,178,98,194,77,251,48,147,225,83,9,243,202,131,234,136,168,77,3,85,80,98,220,176,205,71,172,234,87,63,170,189,77,235,224,74,46,244,220,199,97,11,148,215,172,45,155,102,193,72,3,15,163,8,99,236,55,5,10,150,155,143,193,180,111,48,164,236,33,131,17,122,148,34,86,65,248,97,194,222,27,176,239,137,242,27,21,65,127,178,225,184,215,17,250,5,65,245,230,178,40,121,9,38,139,25,30,207,41,66,154,14,215,163,40,97,248,98,76,
+8,235,105,248,182,142,135,233,141,130,212,51,138,84,104,37,4,209,93,81,222,138,10,182,6,47,170,133,158,111,1,230,161,135,214,109,117,12,129,218,203,106,206,227,11,227,70,140,231,142,18,5,4,174,252,131,152,248,208,18,203,118,92,59,211,9,201,226,71,157,221,236,107,49,239,94,74,115,232,163,131,204,220,38,62,178,87,2,248,248,136,37,47,251,48,135,208,118,219,57,179,123,234,150,81,228,142,190,158,248,48,117,90,17,30,187,52,154,244,195,178,233,39,116,117,43,156,245,208,43,118,29,221,40,140,146,153,241,22,147,134,171,27,182,80,161,2,55,26,17,79,65,7,32,110,48,242,1,97,202,35,14,211,35,174,113,214,7,123,24,208,81,122,141,203,40,209,252,55,2,135,196,229,223,201,112,188,88,252,154,194,97,91,130,212,202,160,68,124,224,12,52,42,122,40,125,127,250,162,49,197,112,81,48,41,180,189,126,29,149,1,167,2,17,129,33,175,245,204,55,38,144,109,70,190,83,72,91,133,246,56,23,17,21,6,89,33,115,120,18,99,86,245,220,150,231,
+200,242,143,238,139,226,5,38,161,103,115,42,158,88,134,205,177,141,178,80,62,64,251,142,74,105,88,110,170,18,125,85,241,41,45,149,13,255,94,32,210,208,89,164,76,148,199,101,185,113,38,29,157,67,251,242,240,143,215,72,3,43,77,98,238,217,193,85,101,186,231,251,172,238,167,126,247,205,56,59,70,49,222,82,70,188,94,114,97,151,74,18,137,147,83,227,15,197,46,18,164,58,134,81,222,82,113,217,59,115,151,186,202,45,153,231,249,165,177,85,3,154,99,244,234,40,62,235,47,229,22,103,174,198,37,169,180,196,252,91,120,236,54,73,204,81,114,117,232,74,205,62,20,197,90,206,61,153,170,204,150,60,123,91,27,211,181,230,44,123,89,253,73,104,173,242,183,101,37,23,211,170,130,111,153,188,56,54,22,217,205,10,47,151,61,72,38,204,37,69,159,153,53,197,85,97,150,60,255,210,81,131,2,230,185,201,100,207,227,241,132,73,42,103,103,169,108,130,42,122,206,163,110,226,49,23,48,23,5,236,134,54,70,200,202,66,195,121,214,255,169,18,85,243,216,214,
+108,252,106,49,123,15,212,177,34,186,203,72,207,103,117,174,81,80,233,12,227,252,160,160,70,170,11,133,38,125,44,249,54,135,242,114,182,42,151,160,45,84,79,248,60,3,159,239,40,240,249,219,73,253,200,218,187,55,215,14,239,234,236,222,223,11,225,55,53,211,135,238,232,36,156,134,212,103,100,193,40,209,35,86,204,242,139,189,46,21,83,252,229,138,134,133,68,52,14,150,145,114,18,198,52,86,251,245,131,162,80,90,210,47,108,148,219,162,190,48,41,109,170,143,136,103,11,239,145,44,230,40,137,68,73,207,118,50,131,243,190,53,190,34,163,85,248,187,99,36,161,22,3,148,175,36,155,252,8,118,82,56,229,41,144,146,237,164,5,169,140,202,134,69,212,24,156,20,31,81,195,93,24,149,151,186,118,169,144,146,15,41,45,246,253,209,181,161,95,191,223,48,148,158,72,212,85,189,198,223,80,24,106,208,215,205,124,84,178,76,24,30,17,125,134,71,187,39,104,205,93,23,205,2,87,39,198,223,203,228,169,19,69,113,139,82,251,205,161,205,122,138,115,40,174,113,
+148,191,146,146,238,23,10,166,30,69,206,71,93,120,215,163,177,167,24,244,250,228,123,190,146,93,15,78,170,147,27,229,73,146,93,226,96,237,148,8,236,9,114,125,28,153,31,87,82,107,141,202,153,146,162,132,125,247,169,182,230,241,180,246,226,91,189,19,138,233,44,242,82,133,106,209,104,163,244,183,238,122,27,91,171,100,246,0,5,86,159,38,117,70,5,3,100,83,55,137,232,73,78,238,214,115,107,139,202,174,136,49,185,163,248,189,85,141,247,57,84,144,67,209,130,44,74,238,37,170,146,156,187,221,219,90,12,228,237,62,1,87,17,35,86,10,178,240,132,34,49,19,30,96,234,126,204,214,25,172,197,94,166,114,149,251,232,190,36,189,168,169,2,119,33,202,31,119,15,197,157,81,163,174,68,233,177,169,240,219,146,147,215,170,74,170,150,30,237,227,203,93,106,208,40,18,159,8,118,241,73,229,170,128,84,254,187,38,5,200,98,62,64,28,3,52,177,98,134,44,159,164,125,135,82,33,67,208,9,201,145,0,156,204,124,77,5,200,100,58,86,134,42,35,194,182,
+144,144,141,21,78,63,125,13,236,43,1,133,70,161,209,175,88,159,98,137,66,202,108,1,108,12,69,246,182,81,235,48,5,8,196,80,114,23,150,211,162,232,218,242,159,0,119,251,69,12,151,135,40,243,75,229,203,139,51,121,101,241,252,151,27,203,84,162,248,168,173,183,251,21,147,127,162,164,94,57,69,13,75,41,87,56,20,34,21,129,191,139,224,126,74,246,241,249,165,193,225,211,98,23,77,169,67,34,112,217,150,88,106,96,42,159,16,56,177,23,45,254,120,85,98,165,58,193,81,180,185,7,236,144,169,253,174,95,133,24,182,35,225,72,85,184,112,84,83,51,128,91,180,109,138,183,85,156,106,27,71,185,0,188,142,243,207,3,162,254,161,45,116,174,188,244,88,121,241,61,221,200,246,39,7,229,194,197,53,146,153,128,110,208,86,152,12,36,63,185,60,143,76,55,125,169,165,74,173,77,113,225,196,62,32,191,180,37,68,173,193,247,86,94,196,158,223,77,178,98,149,58,17,188,227,10,197,128,58,230,104,163,101,134,58,165,220,234,71,223,205,138,55,230,157,250,
+156,192,161,251,129,8,34,215,6,84,134,20,149,198,236,196,227,22,249,71,159,69,53,189,224,4,226,23,220,213,223,118,136,58,43,30,96,40,8,152,81,113,42,158,85,200,199,99,74,103,135,91,57,2,88,230,172,253,105,49,100,101,28,166,46,241,82,144,142,158,134,20,164,25,7,55,140,3,208,78,172,119,240,50,53,222,80,245,189,157,150,100,14,37,133,71,11,226,136,223,1,103,79,92,32,136,51,89,242,80,46,140,124,102,164,236,111,42,71,16,163,10,34,84,129,225,155,178,235,225,172,221,25,174,36,197,13,100,56,177,35,27,32,168,153,151,39,94,163,133,111,33,86,125,27,100,71,181,237,39,123,74,246,138,222,8,18,9,24,93,244,252,200,101,33,74,75,84,71,112,185,57,232,25,23,80,203,188,237,47,59,138,249,232,43,69,13,135,109,196,207,24,133,75,23,40,66,234,19,217,104,132,139,69,193,214,11,194,198,125,36,72,38,153,22,19,162,122,20,44,226,209,31,241,200,141,106,72,12,131,227,142,148,159,193,245,3,94,134,91,149,85,4,159,233,213,
+33,178,7,51,170,110,71,237,93,78,234,195,254,238,228,57,15,151,24,98,228,242,104,228,165,151,31,134,47,208,233,101,10,103,170,28,34,38,109,183,217,144,76,227,53,229,25,28,247,238,139,23,91,201,119,147,63,143,127,227,80,158,227,184,40,90,158,135,27,12,165,24,83,211,146,139,12,254,45,76,115,108,10,152,58,167,254,221,203,96,74,253,75,250,144,218,49,127,32,196,25,33,34,209,182,61,61,21,151,90,135,161,220,192,87,224,234,76,13,173,145,12,229,241,109,230,11,255,3,192,233,74,138,214,180,166,71,168,137,46,78,63,245,162,141,1,133,241,251,9,47,165,211,35,227,44,201,103,156,12,67,165,87,18,41,220,94,13,95,40,83,50,28,27,58,161,158,113,33,137,56,32,126,17,194,3,35,17,63,164,228,215,197,100,196,115,7,251,20,68,137,87,66,10,172,76,178,9,8,151,87,61,117,116,16,206,3,193,48,207,131,69,18,107,254,87,109,150,107,69,228,235,95,65,82,2,139,123,225,144,145,14,86,137,250,74,196,78,184,112,151,206,215,25,7,6,
+232,48,189,92,135,71,144,6,219,59,42,234,95,45,163,202,38,25,245,141,140,173,140,45,215,39,140,174,67,181,131,240,35,217,195,110,98,105,199,14,227,186,88,109,128,163,189,251,222,181,222,67,28,207,140,112,18,32,92,43,42,255,24,199,165,174,54,231,61,254,194,243,140,137,2,120,61,181,242,235,142,162,210,117,36,212,220,189,44,112,81,123,89,108,66,7,71,199,117,225,174,26,196,163,238,51,124,85,72,0,63,127,7,206,73,11,83,216,186,169,118,106,211,85,194,146,57,202,107,87,137,25,88,249,216,224,130,160,55,197,66,165,106,123,242,190,10,23,222,142,234,216,85,22,178,3,95,92,112,78,188,234,205,65,6,179,253,204,78,172,130,242,227,87,39,123,5,12,64,138,41,120,155,188,164,12,129,1,75,213,54,17,86,172,243,145,0,0,119,55,0,52,230,2,129,252,57,85,8,2,138,73,155,250,185,194,73,170,199,227,236,250,110,89,2,33,170,64,134,35,129,233,0,70,211,241,23,102,171,69,97,229,27,31,223,97,5,151,64,221,12,55,233,11,217,203,
+33,29,50,59,85,157,6,109,149,124,198,31,173,248,163,51,248,236,50,187,154,95,252,197,89,78,178,146,131,30,202,44,232,97,4,61,228,160,206,67,11,77,190,59,11,75,180,163,143,180,83,145,104,123,39,93,177,243,31,218,187,195,225,163,7,218,15,18,34,70,100,152,48,206,18,198,236,4,202,40,229,15,92,20,18,126,190,178,159,55,175,232,87,110,0,187,52,112,125,226,180,178,69,121,70,76,223,97,71,176,194,36,193,93,241,248,4,105,27,69,130,97,238,214,107,235,99,195,83,172,159,128,175,144,159,189,161,89,188,27,71,49,163,204,48,28,182,13,196,195,1,194,167,77,250,240,43,44,245,172,250,96,82,50,168,108,123,157,142,63,69,144,31,6,92,150,252,66,199,120,219,189,200,72,88,108,7,73,244,75,39,24,17,197,245,197,214,115,195,155,188,94,58,3,151,193,212,236,149,89,94,170,115,134,195,240,214,129,228,185,173,0,235,134,206,188,108,232,70,149,154,125,128,238,156,226,240,188,117,144,232,232,240,49,92,195,45,2,132,171,83,189,196,18,38,215,
+154,51,210,204,24,222,87,175,29,231,212,48,179,148,135,150,218,84,163,181,4,199,111,181,41,97,102,12,45,45,213,14,231,221,176,147,188,149,29,177,169,86,214,177,132,184,181,25,81,171,254,12,23,153,157,88,130,96,232,201,203,217,220,148,128,83,89,202,204,218,144,245,162,253,8,245,57,109,243,230,197,96,127,42,79,81,254,233,27,96,201,9,78,23,159,32,86,10,3,80,41,8,228,130,242,209,181,157,251,52,68,171,101,108,96,54,69,88,44,201,43,149,163,193,17,138,1,99,72,213,145,228,13,63,212,113,57,189,155,214,10,95,211,87,181,197,75,159,48,20,47,187,76,232,172,122,239,184,105,134,57,190,60,101,4,223,37,226,61,225,203,85,76,242,39,90,18,104,126,13,178,191,219,132,125,207,160,239,26,82,178,153,33,37,53,144,100,6,217,65,106,176,202,12,165,71,102,24,168,219,164,194,41,48,78,251,44,147,225,242,169,4,163,98,191,78,209,148,28,246,228,113,66,6,59,10,101,123,112,247,233,144,239,96,122,123,87,184,31,37,126,132,167,55,70,18,
+10,162,152,99,220,40,253,184,251,224,66,228,103,92,250,215,15,8,219,173,187,94,238,13,188,180,2,61,196,49,142,241,70,80,31,74,134,23,251,13,147,195,52,216,95,148,60,173,133,67,58,120,217,12,215,51,96,239,222,75,210,0,55,241,199,56,155,84,84,134,107,246,241,2,149,5,163,58,186,1,122,222,214,190,240,232,184,178,74,35,107,33,113,93,117,248,35,100,41,103,208,111,162,242,83,172,135,232,215,141,8,141,23,45,47,227,63,114,61,116,136,233,21,179,211,112,145,197,11,211,84,152,207,234,116,184,63,17,254,160,77,94,180,163,252,3,232,44,188,188,144,96,76,20,138,69,33,46,81,75,123,241,33,101,71,146,42,24,200,21,124,222,32,23,169,203,173,52,220,152,182,120,43,21,184,184,168,244,195,53,195,119,210,142,67,243,227,171,8,124,23,254,136,98,29,48,218,57,18,188,104,74,25,67,89,214,209,250,82,222,133,176,220,74,25,189,174,69,82,120,222,17,195,252,75,40,128,38,183,201,196,87,241,55,25,69,23,191,144,50,47,17,102,75,76,251,
+90,43,51,98,196,15,54,20,130,249,35,175,184,143,140,199,221,70,14,149,12,226,249,227,245,192,92,163,37,73,86,192,23,156,97,9,66,145,164,104,28,251,226,129,90,30,197,196,41,225,152,209,246,152,199,12,13,74,216,83,166,147,41,96,179,225,39,49,62,157,231,163,158,186,62,37,13,27,144,249,224,195,160,176,74,60,210,37,189,251,80,229,169,54,17,71,113,16,24,146,211,250,42,246,40,65,55,89,67,244,98,235,178,158,181,73,36,111,23,72,29,245,98,69,35,147,123,20,187,135,45,74,115,174,211,251,238,62,158,143,230,102,250,146,228,240,103,176,125,237,154,206,105,178,187,133,29,205,15,129,3,124,63,28,54,47,91,146,219,81,115,240,27,189,231,249,103,16,56,148,197,53,109,102,38,41,14,139,147,237,179,89,227,168,80,26,93,220,124,245,25,176,150,197,147,4,33,179,235,15,171,155,45,129,96,119,84,105,255,47,73,87,217,165,60,179,4,255,58,238,238,176,72,112,119,151,197,221,97,113,91,220,221,23,189,60,239,61,103,146,48,51,153,124,232,78,
+119,85,205,132,164,61,10,97,116,150,72,149,37,246,165,112,133,15,157,166,88,6,71,163,208,21,39,165,219,83,84,214,30,158,52,103,226,195,169,224,188,145,167,154,246,81,166,115,73,66,204,103,128,249,236,232,190,120,58,124,246,39,42,149,207,197,63,150,66,66,204,153,134,51,71,143,107,235,202,242,120,98,2,193,81,137,197,84,162,80,25,95,232,169,166,164,209,177,103,48,185,242,236,149,254,7,119,254,9,223,21,34,250,55,173,192,223,79,171,140,63,139,217,211,40,240,185,43,61,214,70,143,52,239,9,145,86,82,144,21,227,211,193,236,168,78,88,86,96,201,13,45,185,9,247,146,91,39,114,204,96,22,211,20,189,48,73,138,7,68,122,236,67,228,200,246,197,116,82,222,130,173,169,77,1,255,78,192,69,32,5,6,165,247,115,63,248,21,102,32,89,176,113,0,48,4,119,34,54,152,132,130,77,132,56,122,200,22,39,129,33,184,41,82,54,45,32,175,179,2,21,137,104,161,212,26,151,146,30,15,160,207,32,218,10,138,162,211,180,176,161,44,30,166,246,195,
+17,168,8,28,139,240,16,51,99,1,2,133,133,79,241,146,144,153,4,20,254,97,160,128,99,144,164,40,9,80,81,95,133,123,95,109,204,44,165,192,130,90,159,138,141,63,251,228,46,29,251,157,236,131,171,30,208,53,156,57,240,119,220,152,103,209,33,231,28,194,159,245,46,65,107,122,102,148,156,163,26,30,196,141,242,107,169,166,228,239,48,72,94,31,33,28,2,33,79,151,25,187,52,35,207,243,78,223,111,183,6,212,75,51,172,104,219,118,242,76,171,231,162,219,197,77,77,191,50,193,58,34,162,181,13,117,250,210,244,163,102,71,160,161,209,217,177,139,116,95,199,161,58,26,18,157,105,133,86,227,251,24,177,131,220,82,232,204,152,20,158,215,167,64,29,53,64,215,176,160,176,199,254,227,251,234,200,233,179,101,180,25,115,234,107,120,142,31,249,253,5,208,15,214,254,5,211,216,185,241,142,140,88,151,45,163,168,214,190,164,96,117,4,180,132,42,150,49,40,247,89,116,71,242,38,37,148,208,33,122,31,146,255,48,97,37,161,210,195,64,233,253,55,188,214,170,
+10,207,12,236,247,8,215,191,56,107,101,221,57,196,64,243,70,253,59,251,175,86,81,217,40,152,12,91,218,255,65,215,106,162,238,75,73,254,138,135,137,38,117,152,168,10,95,84,207,176,61,21,97,166,34,222,73,50,18,75,70,56,150,210,246,246,15,169,130,40,136,2,197,164,162,132,219,79,190,34,168,146,88,16,198,239,132,213,20,34,247,219,0,70,36,165,29,127,232,207,199,242,59,184,13,8,109,42,82,81,199,64,239,241,155,6,41,148,12,16,97,68,241,135,37,223,21,182,31,149,125,139,116,96,224,104,4,131,88,105,160,9,14,255,106,75,96,1,45,229,199,142,230,148,237,231,122,173,126,188,14,147,117,41,57,103,169,11,49,64,228,215,22,163,206,6,65,147,149,109,47,223,209,130,191,104,234,182,95,181,182,140,85,53,204,88,153,246,107,214,166,105,85,214,133,160,53,25,80,165,75,171,178,213,234,181,1,149,50,161,167,145,120,228,182,19,242,203,128,22,138,78,39,42,0,221,63,153,22,224,156,157,139,38,171,6,104,86,71,189,164,205,166,43,0,37,
+166,87,133,63,12,77,234,208,5,217,234,110,19,238,104,196,193,42,18,246,57,226,125,242,86,88,103,170,225,2,72,101,173,211,168,195,193,225,71,67,100,131,192,232,37,20,94,149,135,55,63,198,28,209,233,180,55,154,72,47,75,32,16,234,191,201,26,63,22,18,242,239,242,176,158,19,5,10,76,179,168,24,128,9,11,235,40,255,182,226,15,127,100,7,108,38,4,25,175,228,95,214,30,1,39,17,253,232,15,49,67,215,178,148,61,9,194,51,34,200,36,58,73,3,210,101,88,187,0,140,101,140,11,65,232,27,32,153,6,241,16,70,1,6,59,145,64,69,56,124,148,207,195,80,192,159,159,4,126,5,200,115,166,36,14,207,41,200,23,244,40,174,172,42,24,1,204,119,144,28,83,40,194,24,79,16,110,223,158,58,90,110,40,235,130,73,204,186,158,101,159,84,26,185,71,140,156,27,220,193,229,219,52,152,119,66,149,98,220,96,207,189,141,111,117,220,48,161,6,123,210,108,61,65,166,182,160,102,206,53,120,187,210,99,6,203,181,25,253,92,131,185,87,113,27,214,
+80,214,56,150,70,236,87,38,40,67,154,13,5,201,210,128,62,45,50,65,23,213,80,217,43,52,70,140,26,31,36,36,161,134,32,160,177,207,81,41,92,176,248,109,152,134,245,154,10,22,123,140,4,131,60,195,175,60,93,255,65,31,172,65,174,150,101,104,170,211,37,140,185,104,9,18,57,189,59,62,111,104,139,31,114,134,76,172,130,43,231,61,83,210,204,82,80,100,10,216,78,162,234,105,138,44,45,45,28,85,194,201,201,30,139,22,100,169,72,222,50,202,14,29,6,65,206,252,47,67,119,252,68,243,40,24,205,177,243,109,217,145,62,198,240,36,65,164,50,175,233,168,44,100,148,86,178,12,30,208,219,19,60,143,87,4,175,166,224,52,15,210,61,90,186,71,94,151,240,84,117,158,186,204,3,106,201,60,63,50,79,229,165,42,1,144,15,197,78,71,171,254,3,151,210,51,0,140,158,131,79,240,67,122,176,190,144,34,172,1,252,9,128,67,23,242,41,210,24,138,242,225,254,82,65,15,19,184,18,251,37,196,191,87,31,103,195,148,192,254,12,49,9,43,84,174,
+29,24,115,237,61,50,137,108,236,122,188,176,209,44,232,97,160,246,156,32,160,143,150,192,29,244,82,1,241,180,136,137,71,204,83,202,165,30,121,120,157,168,143,37,61,15,101,130,169,255,120,238,65,54,34,245,97,76,235,1,223,218,223,124,231,164,159,195,186,174,230,248,76,254,102,38,19,130,227,94,14,74,35,223,173,128,224,176,133,197,120,15,178,251,205,178,56,135,19,98,227,10,109,217,94,62,252,239,100,64,191,52,254,190,227,107,181,207,151,10,110,44,91,247,94,243,56,99,125,153,180,101,99,61,52,211,143,113,150,234,75,132,55,150,221,240,43,253,184,137,125,217,69,92,111,221,47,112,15,207,28,234,75,250,245,150,196,86,141,123,236,191,125,141,116,78,95,62,164,142,202,135,136,231,203,199,244,130,252,238,96,125,120,180,15,95,53,149,171,236,205,65,203,35,141,247,133,66,223,147,197,117,83,126,28,227,86,95,38,147,43,239,96,63,165,135,132,238,43,220,35,196,234,126,64,123,24,88,82,95,35,64,44,161,183,226,79,5,238,43,134,179,111,245,4,153,
+248,251,3,239,189,2,220,134,35,30,220,19,87,126,81,239,253,162,109,68,35,247,62,241,71,160,120,121,176,225,70,220,107,86,182,153,79,2,215,171,175,209,209,230,193,28,61,38,159,18,27,61,144,163,135,251,60,122,124,141,30,41,169,246,97,150,62,6,210,199,71,84,146,218,49,187,227,5,33,12,156,170,63,226,105,139,163,164,64,112,21,137,2,176,20,76,16,94,52,154,8,100,36,196,62,142,206,111,95,7,52,73,238,252,203,73,253,91,66,65,100,2,115,147,82,80,100,55,214,52,32,194,142,136,164,74,3,168,137,239,143,233,7,185,88,32,159,161,1,241,126,198,51,217,73,89,126,222,75,121,180,78,216,199,61,66,247,128,233,135,51,223,29,250,58,213,213,80,125,3,205,60,237,7,143,40,134,3,43,70,174,129,241,190,225,73,157,246,99,86,102,17,12,163,121,172,63,76,203,63,126,185,33,106,195,78,210,76,211,233,172,63,60,53,154,196,224,30,28,232,183,202,159,211,151,14,106,252,39,89,93,165,174,23,219,72,40,3,35,230,20,213,131,3,96,39,
+231,213,179,33,42,134,80,230,253,6,198,135,178,1,178,161,148,30,22,186,166,107,146,42,252,137,92,62,136,129,71,85,87,35,230,69,203,168,186,14,174,64,134,108,209,113,140,29,116,248,56,130,216,42,127,242,66,65,125,216,90,207,157,200,163,224,244,199,23,166,20,128,56,223,167,191,17,124,212,124,196,70,10,72,241,133,196,23,147,152,228,188,248,5,30,255,39,68,20,14,29,165,87,131,5,186,83,6,70,76,11,145,43,40,112,215,2,19,10,183,6,102,24,130,18,64,134,15,218,4,30,207,66,165,142,68,246,163,75,168,165,29,137,203,67,46,81,34,250,68,195,26,70,29,45,42,169,143,67,9,195,213,25,148,164,139,207,192,16,144,28,189,157,135,233,135,46,237,21,239,77,134,68,16,145,250,231,80,138,140,187,143,210,117,50,213,214,195,86,26,71,35,213,219,115,40,178,214,229,51,14,58,72,183,134,96,221,147,77,63,11,206,174,53,25,170,123,48,204,186,157,173,31,194,84,2,117,247,244,93,66,211,57,136,23,52,238,75,56,202,179,237,46,72,18,180,
+178,6,209,87,205,205,232,92,119,126,63,24,107,34,188,137,95,178,76,7,119,166,69,48,35,237,237,244,202,188,107,238,51,45,6,213,94,143,27,86,166,253,23,190,133,224,139,237,29,191,214,188,149,44,240,45,14,212,222,152,228,180,197,131,250,212,42,97,190,237,173,152,246,39,190,75,157,90,20,158,61,89,75,105,139,123,172,165,215,122,224,237,185,80,134,92,222,30,44,173,165,21,103,255,201,100,242,7,95,72,225,124,208,237,237,136,238,41,239,203,148,78,229,35,185,54,81,190,20,195,180,76,225,216,97,214,154,21,228,75,220,141,38,156,108,242,126,237,224,126,169,4,3,68,220,17,48,173,237,0,110,161,31,221,18,127,78,111,81,199,132,45,24,194,158,43,241,177,125,66,247,3,191,100,224,85,179,14,178,248,201,90,53,242,9,135,126,248,101,30,46,248,164,67,159,116,228,152,73,7,49,233,36,38,19,206,75,202,105,79,58,87,159,6,121,202,17,235,39,29,156,82,215,67,80,172,143,112,50,10,107,208,104,194,102,178,193,31,22,41,96,97,20,39,72,6,
+105,184,104,97,64,226,159,6,94,170,62,52,142,18,49,119,192,90,212,15,146,185,32,254,174,75,118,107,250,80,3,138,142,173,1,164,131,162,31,196,249,13,134,62,42,122,68,233,130,172,2,2,200,0,34,21,226,65,166,251,68,97,27,205,139,226,146,255,68,241,162,94,178,139,170,72,146,125,78,130,83,158,194,182,100,139,220,151,196,121,6,229,49,0,215,197,225,227,234,208,67,117,77,112,9,238,41,154,117,136,228,25,242,15,33,158,184,15,195,176,125,139,239,28,99,231,92,107,132,0,32,181,25,114,168,18,15,44,134,43,144,213,244,75,169,35,155,75,107,248,204,18,187,191,50,228,246,56,158,61,52,134,72,165,169,77,171,147,17,75,107,212,198,18,219,191,240,228,76,52,30,181,132,134,80,161,169,67,106,213,39,40,77,57,86,105,79,197,234,19,185,124,43,196,147,237,33,252,3,216,45,102,93,134,215,20,182,81,198,66,140,181,144,99,112,78,28,146,25,122,183,50,83,142,202,86,19,200,233,74,108,172,20,155,213,101,50,91,21,247,170,66,251,111,149,169,
+205,254,227,102,217,108,21,46,93,240,71,101,74,17,149,78,142,162,49,113,71,100,168,241,123,76,13,62,91,74,252,194,145,34,136,148,40,180,31,145,55,35,114,160,88,143,251,103,18,159,165,120,172,82,102,90,244,145,66,10,223,226,162,182,74,20,224,169,69,159,242,155,161,197,26,244,88,131,105,137,53,24,49,14,61,242,195,161,69,56,140,136,183,175,192,63,42,156,63,5,205,82,212,91,246,235,68,110,136,167,196,83,82,50,86,142,21,127,168,243,220,150,7,175,254,5,228,200,160,73,1,22,191,129,210,131,65,166,140,48,138,201,137,128,13,88,161,208,32,137,7,192,152,19,212,37,89,132,60,40,100,55,213,70,97,253,117,121,182,230,34,185,65,70,27,46,98,21,49,72,67,130,49,44,3,226,28,114,136,20,40,67,193,21,102,215,154,67,69,115,42,50,189,107,26,208,189,21,112,252,121,208,164,177,137,111,77,24,157,170,92,129,61,177,25,69,56,234,69,123,19,18,165,185,107,34,102,19,37,161,57,234,216,236,217,163,219,103,3,252,147,97,226,38,253,16,
+206,52,222,247,47,154,107,48,199,86,75,144,241,235,78,115,246,71,67,98,179,30,170,156,129,58,253,187,11,62,55,107,142,39,227,172,103,183,7,203,241,229,171,222,6,161,119,237,89,255,194,170,173,184,178,243,23,185,61,31,102,236,172,122,6,113,166,134,192,237,105,215,206,170,213,79,183,51,143,223,86,243,39,213,105,189,236,58,167,232,132,182,114,80,157,154,107,163,198,153,205,104,91,85,159,164,88,255,152,238,76,70,180,21,61,102,127,90,251,155,159,117,28,51,79,60,158,168,107,245,150,234,44,195,60,3,145,239,177,186,190,161,47,47,158,228,153,67,225,169,186,97,185,186,150,192,156,69,59,46,79,63,137,37,234,44,227,254,108,193,241,148,184,65,44,94,235,153,206,85,5,237,89,73,18,40,1,19,84,186,124,163,155,252,106,240,204,48,124,171,127,106,107,250,178,138,177,61,14,206,166,145,251,148,177,185,171,102,214,166,27,120,155,52,99,38,89,147,89,165,203,80,241,140,45,54,207,230,226,89,76,177,73,58,232,251,26,125,143,82,140,247,162,241,126,52,
+22,238,53,99,19,138,105,165,170,5,188,14,36,243,203,253,255,240,230,61,253,122,161,13,255,77,84,210,190,130,166,131,0,64,246,30,19,10,80,211,39,193,255,22,232,8,147,253,103,143,168,27,147,121,88,240,67,176,1,238,225,141,69,195,186,143,9,134,178,13,57,97,143,237,236,165,151,117,71,163,142,50,9,243,104,96,96,52,209,241,239,2,219,0,185,14,235,194,179,45,72,192,0,137,233,192,53,176,146,247,189,66,162,253,24,209,114,137,110,234,192,3,66,229,172,176,154,192,88,207,209,240,5,98,183,39,82,196,167,51,189,92,3,63,35,72,244,236,54,154,153,254,10,212,29,201,191,234,96,126,27,208,107,178,254,152,174,80,174,0,160,81,245,31,97,62,127,41,17,109,17,152,174,225,148,204,216,210,242,97,213,170,252,145,108,33,128,97,249,33,102,218,146,152,220,215,2,71,248,157,7,105,242,100,93,57,8,51,12,44,37,78,183,176,9,14,224,120,226,16,61,94,103,145,139,103,22,141,7,89,171,72,6,168,100,9,34,45,225,244,229,6,83,194,5,156,
+77,171,167,26,24,221,77,182,21,91,5,128,105,171,74,163,30,64,59,239,51,180,10,96,61,55,118,135,9,34,58,27,205,34,78,137,228,32,188,112,59,184,111,73,165,89,200,33,80,143,35,34,81,226,40,51,12,2,165,65,63,16,133,65,67,36,84,142,255,1,10,92,73,122,116,224,10,226,238,196,186,18,104,192,101,13,252,75,130,31,101,132,179,212,253,48,58,56,6,6,65,220,30,28,39,117,143,32,129,185,240,199,214,138,118,1,218,92,32,14,210,58,81,1,56,254,141,75,67,19,144,111,28,108,107,166,175,133,50,174,242,96,150,234,192,50,152,242,108,140,100,99,138,124,130,6,34,140,213,16,168,115,211,205,130,9,231,177,134,231,28,76,28,89,168,109,76,195,59,29,179,65,182,198,26,84,98,83,22,221,57,31,17,206,53,32,196,24,147,224,91,231,116,76,96,177,159,127,113,47,213,92,13,47,105,70,163,59,147,214,137,165,102,106,189,55,180,125,237,88,43,196,88,13,174,179,250,93,219,130,157,185,117,198,98,126,29,152,84,6,11,214,201,53,214,18,
+68,117,241,160,178,96,151,53,141,177,148,81,23,142,34,140,5,107,196,25,43,71,136,186,168,199,80,179,107,145,249,88,200,169,3,132,241,88,205,250,83,141,137,4,12,91,59,28,43,15,255,62,51,137,160,36,44,85,195,175,154,53,195,8,199,110,184,185,156,77,243,200,102,234,40,29,118,114,205,129,40,142,105,28,4,71,105,150,210,156,76,186,113,52,83,72,154,54,40,208,230,112,16,199,48,68,160,42,22,152,158,246,237,49,178,28,252,199,205,141,204,234,217,163,126,226,226,49,204,188,20,139,48,74,166,239,38,217,74,249,67,117,209,102,133,164,69,27,29,113,104,6,124,138,117,212,39,89,57,44,155,216,196,176,111,145,180,59,146,72,127,69,210,169,72,154,247,19,73,139,225,105,188,87,229,215,139,5,127,104,26,166,217,25,188,235,112,148,133,23,85,24,194,34,24,204,95,112,68,6,113,36,10,6,137,131,128,105,223,215,23,79,245,160,159,34,63,140,239,90,176,226,31,30,10,138,42,156,195,103,134,72,27,136,67,88,33,168,69,9,98,147,161,3,65,69,
+236,242,105,79,172,0,39,188,18,151,59,231,248,76,74,7,33,25,192,125,202,22,157,126,40,41,73,48,195,132,234,92,145,116,132,41,146,102,93,133,90,130,41,132,19,92,47,144,179,11,228,154,51,209,33,94,119,63,163,8,61,207,86,144,47,143,137,225,215,51,136,225,217,139,177,152,230,88,192,30,195,143,160,192,150,71,166,143,157,192,16,196,238,108,68,196,11,123,250,45,187,17,41,93,201,229,107,214,142,174,111,114,114,167,7,216,251,95,211,21,226,166,6,219,59,34,164,109,49,203,60,110,55,49,161,3,136,99,213,197,244,228,186,105,51,140,142,88,90,93,204,106,229,198,77,138,232,8,177,66,230,98,58,154,223,154,74,78,71,36,99,170,119,179,136,234,38,196,240,125,122,209,68,57,117,38,189,55,2,133,175,149,76,40,202,25,27,115,67,194,55,60,61,224,171,230,127,160,163,163,197,249,93,206,234,114,228,2,117,120,12,111,217,223,129,40,145,90,68,12,164,199,169,242,59,217,73,18,73,249,144,244,200,202,163,191,37,16,126,43,29,32,106,0,100,41,
+95,125,38,103,222,209,81,191,223,187,98,236,182,22,39,92,23,163,23,149,216,125,161,21,87,169,153,77,154,60,170,139,174,8,186,13,181,192,214,173,224,187,12,74,191,59,233,119,35,189,170,234,101,11,122,97,195,160,21,244,204,130,158,94,47,230,152,69,34,163,200,183,42,64,94,194,122,107,130,247,12,60,29,231,77,194,252,123,213,106,15,178,149,124,212,189,168,241,72,13,72,76,125,26,148,2,103,124,105,0,230,12,10,157,176,101,64,193,244,43,65,54,241,255,243,217,1,125,157,242,244,31,158,221,105,172,180,105,171,31,250,47,17,126,49,63,228,27,155,125,235,44,96,57,45,3,212,2,6,166,83,69,53,252,48,225,203,127,179,163,147,85,166,76,49,20,229,100,86,19,4,247,34,252,176,52,248,216,51,167,63,226,95,42,34,178,246,232,165,57,83,188,227,233,104,214,148,206,67,176,64,26,127,174,178,249,249,105,154,209,211,213,52,227,74,194,44,71,148,107,165,3,91,57,183,148,21,209,145,6,232,10,173,90,10,36,165,6,16,161,4,72,38,202,2,220,
+131,185,49,32,124,165,63,74,143,207,30,206,116,183,229,206,131,113,124,149,248,42,159,168,73,197,129,116,96,128,24,41,55,11,108,200,87,130,233,56,53,128,71,86,242,191,99,181,98,35,191,51,197,152,228,244,216,249,55,43,80,228,1,201,2,92,122,252,162,160,93,101,116,155,91,202,251,211,118,93,148,78,43,60,5,140,194,9,59,189,60,2,112,248,113,1,87,124,67,32,183,2,132,83,34,251,255,169,24,136,138,193,149,41,12,104,18,10,200,6,89,20,17,0,0,100,2,240,226,238,133,134,14,8,123,55,24,190,138,59,56,32,239,163,224,153,85,32,142,168,65,73,32,41,201,38,150,249,134,234,35,18,15,210,107,98,182,163,215,192,216,34,172,161,142,129,83,248,3,164,42,185,6,212,234,57,221,30,77,72,178,54,132,225,252,178,35,56,2,153,91,210,49,238,19,15,132,109,216,88,28,162,152,144,51,101,11,254,126,4,248,222,53,177,22,156,44,123,102,118,156,189,184,90,172,143,45,198,57,67,11,12,176,39,81,28,75,247,196,99,244,150,124,184,26,186,
+24,139,192,4,39,114,130,200,117,186,247,4,25,61,185,34,171,179,192,109,140,8,203,229,11,104,35,182,89,90,232,138,244,122,218,130,67,71,70,220,148,145,246,205,52,248,69,206,184,182,138,232,234,10,181,121,58,199,175,142,28,175,47,195,180,213,105,80,109,237,149,197,243,109,242,116,133,187,200,158,22,175,35,195,232,189,101,56,83,17,196,150,241,189,72,114,27,28,93,123,96,147,231,151,205,87,39,81,185,2,108,162,14,126,155,105,61,246,126,139,35,253,57,126,249,175,14,31,204,215,97,223,114,108,238,66,135,203,227,33,170,20,223,75,20,183,176,217,21,236,145,120,42,20,190,56,139,38,50,96,177,10,108,25,43,193,144,101,24,18,201,64,250,180,68,162,138,68,36,106,136,23,61,54,113,209,98,47,58,236,5,166,194,94,20,248,139,26,132,191,40,241,23,21,58,126,81,160,237,106,180,29,166,68,219,85,4,187,30,68,176,107,9,118,29,166,246,46,211,94,30,197,99,56,43,56,94,189,235,211,29,220,186,225,189,42,150,29,212,211,97,2,29,42,238,107,
+144,116,1,120,1,250,111,245,206,95,144,144,252,69,88,162,135,66,128,72,37,20,90,4,230,22,246,98,47,110,223,167,73,144,59,36,192,236,195,168,16,154,56,94,39,55,131,32,19,66,129,237,159,91,33,89,120,42,198,161,250,252,194,159,242,3,84,138,226,156,40,9,210,214,252,36,56,222,166,225,182,254,66,145,41,13,168,184,172,146,179,56,150,36,121,227,60,26,170,138,98,150,249,146,176,216,149,235,106,110,224,96,155,115,241,174,243,2,158,173,41,127,64,9,184,107,36,204,54,20,34,106,124,103,62,165,211,32,158,245,39,6,162,158,192,181,48,207,84,64,130,105,226,147,63,190,178,23,229,119,92,169,3,181,34,79,245,21,112,158,41,121,173,219,28,201,111,16,166,59,197,202,53,87,19,26,84,145,216,182,80,102,26,175,185,152,209,0,164,149,254,66,113,226,204,181,8,110,3,170,80,150,231,243,38,157,211,80,202,42,10,179,98,164,154,179,49,13,170,74,196,80,43,35,201,243,92,72,105,0,146,113,95,173,248,195,204,117,16,43,71,44,31,167,148,117,
+238,126,142,224,222,2,81,253,40,165,216,140,74,71,128,109,205,36,51,244,34,226,71,82,26,42,173,133,82,48,67,202,15,36,165,64,13,51,79,195,173,170,0,132,83,15,224,245,114,51,130,254,19,74,42,55,230,148,50,48,42,129,76,127,170,55,187,108,167,205,143,237,228,73,35,117,49,81,197,118,74,161,147,150,180,49,202,252,139,162,106,19,140,101,25,107,94,79,107,172,122,145,87,39,226,0,204,194,47,189,32,96,22,139,2,90,241,132,85,142,46,88,197,5,163,168,154,176,10,38,86,33,215,99,242,196,14,48,207,7,180,251,127,108,156,36,33,37,0,135,159,196,162,160,32,91,19,10,70,242,81,162,55,146,190,143,14,52,214,97,58,140,27,40,46,192,159,96,196,27,111,254,4,182,31,77,123,139,59,20,11,164,87,94,40,93,87,24,123,141,227,145,249,146,88,101,151,28,169,67,76,120,45,26,161,74,225,72,146,155,135,23,215,8,32,69,42,34,235,16,104,45,209,119,215,135,114,16,22,252,85,239,138,245,107,96,162,29,58,135,154,0,221,51,144,230,
+154,0,247,135,177,151,192,61,189,28,130,240,149,24,140,247,1,5,218,213,23,17,191,156,241,80,116,10,144,61,165,127,120,20,127,198,135,29,168,51,150,91,87,136,84,247,113,248,33,115,250,117,158,220,60,13,109,125,158,179,156,90,23,40,200,47,235,80,230,15,173,169,37,210,151,101,120,195,43,157,217,140,174,76,93,80,75,195,185,213,153,140,72,117,37,178,186,52,220,7,233,206,116,66,87,166,200,82,180,97,95,234,140,199,3,186,18,9,75,27,118,31,112,103,46,155,165,19,169,230,209,80,227,252,232,243,104,150,68,246,197,193,241,7,219,217,78,190,44,114,169,60,145,80,82,8,123,19,140,43,17,202,109,201,248,142,62,116,96,12,251,37,220,233,130,112,135,229,44,65,33,71,50,51,212,80,42,33,28,13,3,93,211,62,207,118,2,84,218,178,154,60,107,165,227,59,147,242,157,138,175,105,210,97,149,98,58,24,125,117,35,235,33,99,45,97,213,180,77,41,106,50,222,228,12,54,174,199,198,43,81,248,176,10,31,66,25,193,61,21,98,122,129,19,127,47,
+240,95,22,252,167,189,193,247,17,236,240,167,193,140,199,114,84,171,130,5,28,254,61,113,128,74,64,96,91,145,9,252,240,197,14,196,192,135,146,15,73,162,239,184,14,220,149,71,254,144,104,24,208,138,67,94,142,55,147,186,85,5,156,48,207,246,165,239,200,186,224,131,32,229,87,224,219,105,63,124,68,233,111,41,69,152,172,11,114,232,100,93,228,167,163,231,71,140,168,10,3,197,198,212,124,16,137,52,89,147,88,32,182,7,237,135,193,210,67,227,191,19,37,68,177,1,12,253,83,250,65,212,120,197,80,221,9,82,160,10,160,102,176,65,12,25,73,237,255,89,106,193,167,8,172,162,216,196,203,170,36,134,54,244,239,71,35,56,102,111,28,66,42,6,127,54,203,140,76,40,44,177,120,146,218,197,235,166,18,152,150,70,50,41,191,169,2,156,242,218,115,96,92,138,22,248,130,112,243,100,117,55,141,115,58,93,92,46,90,213,82,136,145,76,114,40,229,201,195,165,67,127,177,21,135,63,147,241,142,84,1,135,244,77,139,221,8,94,138,12,221,34,147,85,1,5,
+72,203,74,252,213,230,162,212,87,19,104,153,15,131,212,87,82,105,11,110,60,238,16,85,215,243,119,40,253,113,202,164,120,74,209,250,7,71,92,32,187,229,250,73,36,74,88,10,128,250,200,32,140,8,221,33,80,57,210,94,12,210,1,126,7,25,217,87,94,168,182,48,230,138,146,124,114,22,89,230,79,41,88,100,104,87,120,228,139,130,200,41,216,46,220,57,168,243,240,8,66,211,117,130,224,56,15,134,35,199,33,132,96,31,80,145,242,123,100,97,140,76,174,72,97,116,87,140,89,133,1,114,113,42,197,144,176,162,74,223,211,21,102,235,88,148,153,209,199,117,101,140,236,23,250,39,158,160,138,118,193,48,55,70,96,167,208,226,104,31,181,175,249,227,92,19,9,137,15,123,192,67,31,191,38,151,95,206,115,244,55,136,80,115,106,197,231,25,138,231,106,244,145,140,134,78,106,27,207,208,90,78,31,139,24,212,52,66,219,12,133,215,204,167,80,78,77,47,203,85,148,40,171,170,143,143,96,106,90,81,69,137,174,211,147,125,56,165,166,227,72,24,74,148,20,211,
+79,161,33,53,13,192,72,28,208,240,125,31,204,101,121,244,242,113,2,229,52,17,250,4,28,75,43,30,83,146,104,118,177,143,84,214,201,122,169,151,73,250,233,75,195,22,180,209,10,33,179,138,129,180,14,144,93,43,36,106,18,189,27,65,195,181,125,63,237,52,138,93,56,86,61,138,83,68,197,8,250,199,77,232,199,38,133,14,72,195,254,61,69,244,70,23,244,48,244,244,39,120,84,201,110,15,26,181,141,69,235,34,201,240,68,36,26,144,11,98,47,106,218,140,91,116,121,73,131,65,201,96,208,35,61,22,21,133,135,153,52,120,24,138,13,203,153,96,20,81,79,58,233,73,193,141,64,222,113,231,60,243,43,255,58,231,238,166,34,103,95,174,38,29,76,250,255,116,104,204,24,148,192,2,1,9,41,136,125,162,136,59,132,144,136,238,35,32,14,236,14,226,125,181,122,177,21,10,127,223,246,42,225,126,40,211,3,49,237,194,168,31,74,251,242,56,248,5,240,218,214,90,68,173,168,6,28,174,108,57,40,5,135,48,226,164,50,193,132,214,188,231,151,198,225,221,
+88,74,184,186,178,139,243,80,74,72,234,127,117,134,112,204,78,123,5,239,3,16,65,35,150,173,111,205,227,7,23,183,111,224,4,166,0,76,158,185,162,169,47,110,199,208,143,225,174,133,33,25,5,246,45,253,68,246,100,11,5,241,125,64,172,122,89,236,158,32,194,175,79,29,186,76,183,109,151,235,193,100,52,148,145,139,108,186,91,113,30,95,8,226,175,42,96,7,205,31,109,51,231,87,18,181,171,200,59,188,234,241,141,249,21,200,131,85,213,214,154,180,60,172,166,36,90,95,74,116,213,180,235,30,238,109,164,193,122,250,32,53,84,94,251,78,111,156,160,167,210,122,216,225,213,195,126,120,171,136,28,185,111,14,73,175,26,165,247,7,35,207,145,186,190,248,246,17,71,123,219,144,119,21,188,206,169,253,242,74,151,234,82,111,19,163,107,120,79,122,4,157,94,29,87,80,105,34,136,202,80,140,254,215,19,167,118,61,233,85,104,40,62,226,202,215,42,140,246,42,96,130,26,68,123,209,7,238,140,193,83,141,217,117,34,87,162,168,238,105,146,59,82,212,198,84,
+130,93,20,225,38,211,217,95,97,119,21,248,117,132,133,120,234,224,142,196,0,218,28,193,239,61,164,217,233,66,94,9,248,227,30,58,92,219,135,107,243,119,178,171,102,123,122,126,42,36,112,33,125,183,53,188,104,223,234,5,18,27,75,255,95,30,51,0,56,172,48,0,192,224,97,146,175,143,13,118,194,58,42,168,133,82,131,156,169,39,9,106,132,122,211,117,68,237,201,138,96,217,45,50,181,27,192,241,211,27,208,180,77,34,20,92,16,35,30,91,20,171,152,61,217,49,248,129,32,191,110,136,42,129,19,203,60,235,131,65,177,228,50,95,80,226,213,96,77,205,152,167,171,131,24,109,13,204,129,187,186,129,44,116,108,94,114,217,110,44,215,56,239,201,51,53,229,80,82,67,187,123,48,194,151,17,55,136,46,21,96,87,63,225,39,124,25,66,183,233,31,192,119,3,177,243,162,0,60,93,75,61,161,121,16,71,206,98,183,165,86,202,106,109,33,232,170,154,237,54,73,218,249,18,187,230,52,53,81,155,210,88,192,171,150,80,83,7,110,212,254,244,23,244,26,135,
+35,181,53,208,218,98,87,162,166,215,48,112,91,107,4,214,82,7,169,81,173,68,113,218,106,4,45,5,213,195,142,106,16,182,45,251,139,200,80,251,7,105,175,198,85,218,154,152,12,153,210,53,75,107,68,74,67,227,131,220,189,144,47,74,7,252,172,130,51,234,75,76,70,27,80,83,70,66,98,84,11,155,150,143,48,219,166,195,125,53,17,116,188,46,18,165,247,197,222,164,177,39,173,229,41,164,101,28,109,115,192,190,76,37,28,94,17,189,49,185,131,39,214,216,137,212,70,122,145,38,70,174,104,147,168,69,17,117,82,133,167,46,218,199,131,6,27,13,94,83,67,52,17,112,179,178,132,84,62,201,122,181,133,156,71,112,77,224,245,183,28,28,106,200,137,207,232,154,24,236,185,158,92,207,11,117,60,200,239,233,137,113,63,106,206,84,7,61,255,199,94,76,153,136,234,54,229,13,144,49,164,158,223,80,98,251,73,153,131,216,249,71,44,125,133,223,190,113,112,143,190,186,0,183,158,9,42,99,63,144,179,245,203,114,35,9,100,173,80,129,181,216,85,82,218,133,
+149,178,73,16,140,155,215,129,221,178,63,107,53,229,71,208,155,143,143,58,10,254,249,88,104,16,92,109,41,201,186,76,196,63,212,130,141,246,84,16,157,101,164,70,209,73,24,174,246,1,36,40,16,35,124,0,137,103,57,131,18,82,0,142,230,14,213,53,105,224,60,151,252,91,103,181,218,50,182,54,27,132,105,72,130,30,186,194,120,74,38,97,16,90,109,14,255,8,43,23,16,171,196,141,163,189,168,4,198,53,69,33,134,48,245,97,45,75,48,173,247,165,143,208,227,134,186,144,210,130,152,85,6,1,73,165,82,43,144,232,180,48,83,201,35,168,44,16,87,165,136,68,25,253,1,144,236,193,197,41,3,25,33,173,109,41,165,128,81,100,115,56,170,1,159,168,174,217,144,53,192,164,71,124,79,86,186,23,55,241,123,120,230,170,237,206,42,243,100,215,202,108,79,104,254,253,99,110,155,51,233,109,173,221,110,167,211,105,226,103,163,47,199,99,10,230,163,89,106,132,31,55,171,174,93,69,94,112,129,51,119,208,166,127,158,238,177,166,228,251,229,150,122,240,78,49,
+218,240,154,44,222,141,20,215,123,188,116,245,199,93,186,83,0,204,243,243,193,210,117,25,79,21,112,123,226,166,23,202,175,24,35,250,125,51,126,255,94,131,248,69,0,172,49,193,95,31,157,175,25,3,199,167,32,228,128,156,4,8,65,59,112,249,121,71,229,249,247,185,124,241,189,171,239,233,252,222,241,249,126,23,39,55,0,45,55,218,26,56,39,46,15,252,130,78,249,197,160,204,63,251,32,150,219,40,15,64,230,84,181,237,14,55,146,54,93,39,73,59,168,36,191,5,224,25,135,113,87,157,70,146,6,19,132,169,173,228,228,228,47,136,241,144,230,132,35,47,54,194,218,11,116,189,146,82,145,19,205,5,249,59,26,71,170,222,141,34,134,54,113,22,199,133,2,221,113,26,2,106,83,228,158,101,243,253,94,132,78,175,61,87,189,12,111,107,73,179,116,25,221,179,221,252,77,116,150,110,160,21,233,70,144,56,102,216,94,52,171,254,243,12,185,244,185,139,230,20,87,233,51,39,43,86,249,170,169,124,170,1,73,188,127,215,214,196,132,244,25,80,250,128,147,128,
+43,238,191,201,181,183,226,121,22,160,158,247,196,139,254,61,124,175,77,111,121,170,238,211,30,55,232,231,243,43,248,70,228,125,217,223,139,126,247,84,63,222,124,204,175,47,125,210,239,212,79,108,235,13,169,250,124,185,115,206,248,52,47,173,111,92,211,151,57,230,138,166,39,53,253,118,252,60,124,209,11,177,248,12,37,143,111,82,219,23,63,193,136,249,231,179,244,214,47,202,191,161,243,133,252,52,242,134,111,100,253,55,250,117,180,83,158,153,240,187,242,35,242,9,11,191,130,197,84,159,57,86,99,247,139,186,255,164,239,94,166,218,245,157,208,248,20,149,199,47,105,145,195,158,39,175,240,221,44,122,178,11,205,23,46,254,94,196,223,171,84,252,109,142,191,7,182,237,27,186,125,183,183,205,119,38,255,182,230,223,190,141,240,133,21,190,4,84,200,243,23,121,247,225,7,103,65,61,112,111,92,105,180,91,135,126,188,181,137,146,230,2,100,155,158,180,134,177,188,10,58,217,174,21,104,89,82,86,131,12,38,133,213,104,173,171,139,34,124,7,60,12,232,224,132,209,
+226,27,62,156,227,106,28,137,234,155,29,207,250,53,71,138,223,159,204,126,123,91,3,80,115,109,49,74,113,8,90,67,44,3,11,207,148,184,145,41,210,159,251,64,99,26,177,249,29,121,236,200,216,85,122,153,160,87,43,135,188,120,156,124,57,214,105,78,127,87,109,147,146,1,57,40,154,213,223,95,148,25,169,110,254,78,201,38,209,68,241,251,199,53,73,95,52,184,184,74,158,59,29,239,74,190,173,252,19,255,158,26,13,170,75,84,210,233,89,4,92,104,127,99,156,213,238,146,51,31,243,173,67,38,58,207,225,166,19,48,93,152,228,219,5,54,234,172,132,151,212,180,93,31,222,237,215,206,201,203,184,224,55,237,209,173,186,112,116,70,186,11,122,97,104,15,239,204,90,231,143,103,187,48,86,188,222,173,42,103,119,148,178,11,229,50,227,1,247,216,172,211,40,184,46,176,57,79,182,190,33,21,157,128,202,30,19,44,87,226,251,61,241,236,172,77,118,236,116,213,146,220,154,232,142,77,244,109,151,22,154,220,233,170,159,62,218,36,183,69,95,240,109,221,117,230,
+215,13,99,164,177,139,42,77,6,126,161,69,159,24,145,251,25,43,250,254,43,116,184,241,233,166,34,177,155,139,171,187,172,120,119,181,238,54,81,235,174,105,221,29,169,214,29,40,221,237,37,201,221,92,186,107,75,119,147,179,118,55,214,238,161,139,225,178,240,111,228,224,68,199,172,86,100,190,4,235,96,206,9,89,219,155,26,240,74,242,179,2,203,196,197,181,205,207,43,53,166,53,122,137,52,182,183,244,75,6,8,99,113,69,150,121,255,188,237,137,151,241,238,186,164,82,246,35,236,18,117,155,70,34,39,139,85,213,49,66,10,39,211,109,240,118,164,171,6,173,181,34,19,108,193,20,230,115,102,24,211,22,213,48,25,208,213,248,165,238,150,10,164,196,37,4,208,70,27,4,185,101,39,45,140,183,67,91,64,89,221,2,230,54,113,171,110,51,157,197,19,4,89,180,78,104,134,166,108,145,57,106,189,179,52,119,205,41,182,29,3,140,89,226,186,149,80,85,249,197,234,23,95,126,99,195,181,162,196,35,223,93,33,202,107,58,32,213,107,60,218,46,49,48,194,239,
+138,250,19,197,151,232,221,23,248,250,91,120,63,87,167,29,178,203,254,119,90,107,189,119,234,166,243,219,117,87,157,107,171,238,124,167,47,58,61,23,115,81,95,75,109,119,242,202,211,233,186,39,236,181,179,45,187,51,102,252,158,171,42,159,173,149,174,59,229,185,230,203,221,49,197,186,81,80,221,97,115,190,108,229,66,38,214,96,147,187,42,88,174,197,238,59,234,185,94,139,220,216,233,154,22,63,218,229,174,38,149,215,214,162,215,178,235,133,49,240,184,189,157,54,115,178,209,161,79,213,152,235,161,30,180,71,198,117,177,54,189,36,44,110,69,163,213,38,205,178,216,227,164,18,118,153,69,237,77,232,217,222,4,219,250,80,123,172,15,182,115,161,54,177,248,217,130,237,11,116,213,182,67,219,85,104,91,206,132,182,63,197,135,128,185,124,152,227,155,99,190,78,136,127,175,139,240,87,249,243,201,152,7,157,29,248,153,137,86,217,97,11,178,242,188,229,104,203,248,101,120,203,248,111,234,225,57,128,113,88,13,214,57,13,188,126,207,2,181,184,247,204,73,242,171,113,
+68,117,125,83,209,165,173,249,37,144,229,163,247,119,157,2,250,13,242,101,192,182,79,69,211,118,47,129,70,150,159,70,177,84,244,101,104,148,163,135,219,23,76,78,137,127,186,20,131,26,21,182,133,179,117,52,177,153,237,119,45,224,46,7,184,84,165,221,2,40,136,41,219,77,192,57,104,165,91,214,251,156,193,234,95,88,81,34,133,149,143,7,225,9,133,127,106,240,146,100,212,174,251,242,2,233,64,139,206,208,197,181,59,20,160,85,103,228,116,87,107,10,208,172,179,31,186,152,44,5,104,109,230,75,229,84,192,37,15,41,214,59,140,10,112,35,63,230,22,82,84,0,209,117,71,173,59,16,149,63,126,188,200,182,240,230,71,119,237,214,140,235,80,7,55,174,93,255,128,166,108,113,155,26,109,62,58,66,215,16,142,204,232,221,117,16,183,157,228,53,126,185,189,184,13,37,82,98,254,162,207,95,228,96,141,254,160,45,189,130,229,198,123,144,64,252,151,81,210,127,209,43,32,239,203,185,250,90,231,158,57,157,31,112,175,30,152,239,137,13,211,224,101,221,237,89,
+29,44,155,90,12,46,69,80,152,201,210,75,126,39,19,76,7,53,54,180,64,16,60,92,212,8,67,50,108,30,83,158,77,64,91,25,40,250,117,71,137,169,40,131,72,138,115,148,20,32,16,29,244,65,153,128,129,78,251,200,79,147,116,74,130,103,33,97,108,157,87,227,99,33,113,157,132,138,16,182,228,168,33,198,13,94,198,136,143,164,49,134,245,36,99,218,99,171,197,78,179,103,14,146,247,24,227,175,107,69,30,66,77,153,127,14,135,130,106,0,137,58,7,164,180,251,6,80,93,13,165,89,76,118,13,80,53,182,159,238,22,247,39,181,37,11,39,117,59,32,195,137,1,148,229,163,121,200,224,105,2,14,94,214,7,222,241,254,152,232,126,157,161,248,191,74,179,53,89,203,170,206,192,73,103,158,241,22,203,137,170,233,36,7,207,58,51,47,149,110,79,68,63,78,255,49,251,243,195,59,28,39,154,54,224,12,93,178,63,188,31,76,105,34,41,127,70,232,9,100,158,120,56,65,5,234,206,244,249,243,123,7,13,79,124,133,58,19,58,93,102,142,103,185,235,233,
+166,240,120,187,236,185,118,157,52,61,102,107,135,94,231,46,150,152,147,237,20,118,45,6,60,107,97,144,229,76,39,101,139,185,40,106,212,249,51,13,190,123,100,196,92,216,16,143,248,215,203,182,182,147,115,211,113,104,43,14,43,197,234,144,81,28,202,138,131,45,98,56,204,12,135,66,211,112,120,1,135,44,176,58,140,129,195,28,56,200,77,190,3,243,61,33,190,95,89,253,131,39,184,49,92,57,141,159,111,243,82,225,252,11,124,117,198,234,102,214,47,0,60,207,12,52,149,101,53,32,5,179,233,1,180,210,94,206,91,194,243,21,36,14,109,253,88,121,112,76,188,100,136,91,226,229,198,158,77,253,6,213,130,20,169,13,148,190,210,7,37,27,150,133,18,69,153,77,90,113,154,162,130,20,22,106,220,59,230,229,236,3,128,19,218,139,156,103,22,204,180,138,3,168,97,243,5,63,160,148,43,61,101,118,55,25,86,246,237,168,145,61,182,155,224,229,204,166,133,231,235,63,171,148,106,197,96,24,169,45,91,114,5,141,138,172,167,98,83,110,5,91,139,77,113,127,
+208,223,222,75,203,220,93,31,59,128,242,47,205,227,128,175,94,174,231,182,238,137,236,44,126,199,13,59,201,54,127,82,87,191,221,102,85,93,63,91,101,79,250,204,243,219,107,48,217,103,233,200,245,36,175,127,129,102,117,50,59,59,85,79,198,107,46,16,54,228,202,51,38,97,122,66,150,2,185,190,25,139,159,11,162,103,1,54,21,200,26,72,244,224,12,14,223,223,162,239,181,190,208,161,78,55,132,149,253,18,105,186,251,43,226,106,119,182,213,238,169,47,205,183,179,210,97,173,116,27,148,173,26,105,46,124,226,85,153,124,86,197,53,247,136,228,91,83,236,228,41,107,61,193,206,68,188,155,135,208,202,41,60,175,150,249,187,59,127,111,214,186,247,155,225,89,54,172,158,127,134,231,12,120,218,62,2,228,5,60,179,111,224,137,240,61,85,190,220,211,228,123,50,127,239,107,162,247,172,127,172,4,190,91,35,167,1,9,108,50,47,156,127,128,107,43,100,53,154,147,209,16,230,193,184,184,12,167,231,117,165,129,20,16,89,43,198,72,69,5,242,20,87,35,141,159,
+161,180,208,72,224,192,108,175,134,15,1,58,194,96,44,37,69,243,20,14,228,233,98,180,12,67,4,164,179,40,252,162,191,32,131,188,145,250,61,191,76,204,200,160,248,184,228,209,35,37,109,16,84,145,132,81,104,125,31,143,116,58,221,132,165,21,119,125,143,146,118,238,140,1,229,39,172,75,37,3,95,51,143,24,145,53,251,163,196,214,108,41,3,60,149,146,25,217,229,12,28,93,162,241,210,166,24,244,61,5,135,130,139,248,20,143,201,104,193,91,214,230,187,175,105,18,255,42,80,239,233,46,8,93,28,49,235,186,184,215,186,151,11,91,211,238,138,216,214,38,237,215,45,189,112,253,184,162,22,169,206,164,85,31,23,166,69,219,21,182,235,138,90,26,182,180,240,148,93,177,148,53,91,212,154,135,139,162,165,254,25,145,165,40,181,212,240,194,81,112,157,163,22,2,73,27,66,171,43,194,240,162,43,58,141,129,66,131,185,89,225,47,246,115,184,233,30,104,137,60,99,133,80,91,220,191,52,86,107,165,65,89,33,86,24,155,45,218,252,114,139,180,39,114,133,19,
+215,44,78,18,171,169,216,216,146,215,90,172,157,1,155,55,177,65,45,92,88,33,63,242,139,181,194,234,254,169,113,216,203,12,202,22,144,33,155,191,240,134,32,140,108,8,96,13,193,159,173,185,185,55,55,215,38,231,179,233,111,13,125,253,175,241,222,89,95,155,215,226,153,108,222,148,118,245,41,141,137,207,6,63,232,169,179,154,95,218,190,176,0,193,194,177,230,225,61,186,171,130,144,74,42,164,82,128,76,83,213,248,226,33,41,105,198,210,146,75,243,79,180,8,192,105,112,142,137,148,204,144,11,187,175,4,0,242,214,134,42,16,150,198,73,11,19,37,40,38,97,79,60,168,20,16,154,203,200,89,7,16,128,179,138,250,89,133,8,71,40,101,195,192,210,197,44,215,245,166,127,176,76,201,23,255,248,131,111,97,103,50,51,220,89,204,204,239,170,25,213,168,110,225,45,32,115,201,146,200,28,197,6,84,230,187,86,74,131,87,38,101,194,22,155,248,21,121,46,153,115,29,179,141,249,48,226,111,156,4,253,62,210,118,193,174,153,65,114,207,31,132,113,79,182,188,
+181,41,227,118,45,15,182,166,39,98,41,110,32,95,233,131,171,237,244,68,237,250,98,70,205,57,30,76,101,79,216,42,249,84,176,165,131,103,87,247,196,108,57,74,134,102,30,30,44,117,79,164,102,201,145,50,131,240,1,195,42,120,56,83,126,226,106,33,202,57,200,126,134,0,221,141,95,215,195,239,151,199,105,175,180,168,11,243,26,99,189,68,57,110,183,40,179,42,140,43,211,229,225,96,113,42,139,45,13,107,166,35,90,170,145,21,103,17,204,148,123,99,99,114,123,248,115,56,53,224,82,139,50,215,97,172,94,38,140,115,128,100,156,177,192,88,211,253,228,54,156,83,156,231,242,167,175,56,123,250,90,111,94,125,203,230,53,221,120,55,155,166,119,181,240,246,22,222,85,127,225,29,174,94,17,65,243,241,109,255,83,111,114,7,57,127,108,86,163,142,233,47,193,63,234,166,139,138,209,165,47,42,154,90,250,42,27,200,126,124,81,93,150,81,21,54,236,176,43,2,99,248,239,159,205,147,249,1,114,218,246,240,18,72,0,37,75,225,207,202,242,75,76,196,35,126,
+163,97,152,15,21,16,161,135,70,149,143,237,151,16,238,28,63,227,43,94,241,7,238,111,142,95,182,103,199,211,50,82,244,206,249,84,84,179,100,6,37,3,236,43,144,28,8,91,181,221,4,68,102,204,207,104,114,74,94,254,37,118,13,195,16,142,208,233,151,165,37,6,28,253,17,217,94,195,86,193,238,173,122,12,218,178,63,228,172,220,25,3,16,215,31,20,253,10,64,74,68,10,144,124,147,64,5,79,166,59,132,101,69,24,74,102,16,67,143,141,176,18,41,214,69,115,31,197,128,198,169,33,82,106,120,21,202,198,189,68,191,154,130,18,41,61,91,19,186,24,27,236,247,107,17,202,88,123,10,8,80,106,177,231,58,226,203,202,68,112,176,208,12,33,18,24,127,218,72,253,105,22,147,46,109,173,114,223,159,84,160,218,90,57,190,163,245,247,16,128,127,117,198,234,78,2,227,169,103,62,10,148,169,218,30,51,255,183,91,242,38,46,232,237,115,0,133,81,89,53,184,100,60,102,21,66,68,138,146,1,227,137,11,71,81,134,130,11,252,4,139,210,40,198,24,87,
+201,192,70,148,84,137,197,131,183,112,28,148,176,20,6,134,70,78,126,245,135,96,135,80,164,56,197,214,7,16,162,164,88,5,9,198,101,228,164,229,4,1,72,179,235,15,203,166,111,111,69,74,132,124,87,222,66,171,170,30,45,107,68,182,12,226,98,40,45,179,106,252,34,107,122,222,15,193,112,253,16,201,182,156,130,117,245,60,6,192,227,89,84,142,56,232,29,192,98,136,191,40,9,254,203,26,114,160,160,170,211,111,227,155,174,67,111,181,233,200,89,214,70,252,201,157,30,16,126,28,153,150,101,93,192,127,29,7,58,68,219,65,200,227,23,156,210,64,85,118,4,173,50,29,21,159,26,14,68,63,117,135,223,150,165,226,105,135,240,64,83,112,132,242,150,172,156,35,167,224,245,84,116,20,29,30,212,208,158,157,165,227,160,108,40,92,130,157,16,225,32,93,3,60,212,24,245,214,150,131,141,197,40,111,212,112,188,213,18,103,59,135,111,156,166,24,175,37,71,141,140,248,224,224,48,126,208,173,70,90,107,176,118,117,5,193,81,135,240,229,152,48,138,201,15,254,
+12,112,163,165,86,227,46,53,18,156,101,140,252,220,225,120,188,19,28,213,188,7,111,153,111,135,247,237,172,111,223,78,170,223,177,245,239,29,90,191,19,234,119,111,190,125,103,179,239,16,111,251,14,35,223,81,228,127,187,73,110,112,225,71,223,250,22,94,224,122,255,61,82,194,215,157,180,252,255,188,0,0,9,162,125,197,192,119,39,52,199,159,84,10,208,158,174,246,128,233,202,18,22,0,21,246,35,77,85,55,1,239,139,65,19,128,87,156,108,31,12,41,105,176,0,6,13,131,68,161,186,223,248,4,12,157,114,163,35,244,92,2,152,106,162,166,144,40,78,126,127,28,198,249,134,12,231,189,244,247,30,6,153,105,72,186,123,2,172,47,95,32,57,21,118,205,48,50,91,23,72,25,89,178,67,191,74,246,59,134,21,209,124,69,92,30,116,162,130,79,184,192,213,41,220,149,85,44,192,252,168,130,184,59,21,12,130,96,21,233,188,145,170,36,1,12,186,124,26,155,199,24,177,27,178,189,72,237,128,252,194,190,125,203,94,47,166,242,87,184,176,159,2,90,215,139,
+170,250,253,5,230,85,229,205,170,26,191,232,154,79,59,115,145,184,73,77,47,178,194,243,233,152,160,111,206,158,232,101,43,248,168,10,169,32,91,202,73,231,114,247,224,68,221,221,118,87,248,179,230,121,89,42,190,6,69,45,32,148,137,145,231,28,41,58,61,11,55,163,119,250,220,88,188,242,91,241,151,174,220,224,74,143,75,120,222,12,158,180,177,222,141,177,125,254,56,122,94,99,233,87,160,210,191,176,229,42,98,174,134,10,78,244,192,13,211,125,34,234,6,175,36,255,203,173,43,244,184,210,4,57,247,30,158,167,250,235,118,249,125,221,236,222,79,217,220,170,222,27,211,123,123,77,58,183,88,231,134,188,119,110,159,210,228,111,110,11,254,77,205,191,189,82,252,155,160,125,250,173,186,23,190,99,245,221,63,169,124,102,72,200,178,59,43,143,190,118,224,253,100,248,84,64,69,93,14,76,164,152,127,76,172,164,40,229,97,112,19,3,137,113,74,74,41,8,124,8,42,105,240,197,121,70,135,234,83,72,228,160,22,29,133,249,39,11,110,151,76,105,225,193,71,93,
+84,152,168,115,208,168,165,22,172,82,88,29,40,165,117,202,64,96,65,91,25,35,105,24,4,72,241,234,67,57,73,51,85,127,100,231,152,77,94,172,187,148,69,214,143,62,196,173,110,81,37,188,236,103,48,154,126,230,139,27,78,39,56,198,250,209,140,98,117,20,51,88,140,195,136,89,30,43,220,64,143,23,181,86,48,181,5,127,176,10,97,90,252,221,100,5,219,206,44,237,244,187,63,119,64,100,231,7,40,187,46,88,221,93,26,161,237,206,148,215,133,148,245,171,180,66,148,221,157,108,69,7,86,15,87,52,76,193,157,46,233,200,106,43,54,188,10,138,206,14,111,193,205,84,240,50,151,82,54,188,144,15,172,186,159,93,35,113,93,133,3,154,179,167,226,102,168,43,60,116,153,16,155,35,125,34,43,180,208,0,79,211,171,183,197,166,47,54,249,84,229,138,80,58,71,30,115,119,200,186,234,53,140,182,237,106,161,176,57,147,165,38,77,181,194,149,157,21,228,98,1,177,90,99,129,198,188,187,26,1,66,155,39,223,100,40,180,73,116,137,241,183,192,62,137,214,
+191,87,163,245,94,189,109,250,51,79,127,214,190,245,103,188,254,108,181,191,207,112,251,153,109,63,191,141,242,51,88,126,230,191,229,103,134,252,236,114,191,207,24,247,153,226,62,123,38,151,213,69,215,208,175,219,86,129,99,158,211,164,187,195,198,149,118,203,114,233,165,222,39,176,224,93,245,39,176,170,88,160,15,218,75,53,72,147,244,71,37,234,179,73,81,140,182,252,47,176,252,97,37,73,83,130,123,162,208,61,33,81,174,251,135,42,218,145,33,6,161,21,101,81,80,41,243,115,19,37,209,128,61,167,133,139,53,148,163,141,7,119,49,88,183,68,245,234,82,213,29,100,151,172,94,163,15,137,120,89,190,69,149,221,134,2,186,188,160,152,37,106,212,184,75,81,69,187,164,140,234,230,85,65,27,222,152,170,167,30,112,109,73,77,57,230,152,27,176,120,181,177,28,176,185,252,165,189,0,26,75,159,124,30,133,43,89,221,20,203,110,74,233,100,43,127,71,202,149,205,7,47,76,55,222,76,211,17,171,170,232,57,135,46,186,177,21,157,100,188,164,151,169,152,148,178,
+254,128,158,59,195,167,101,192,115,147,117,190,121,122,51,31,83,205,69,85,114,111,191,60,48,206,141,53,248,105,106,185,73,26,223,24,174,150,143,169,16,163,11,213,93,92,126,146,231,198,78,252,148,115,184,220,156,86,155,173,91,163,170,122,59,82,213,12,150,181,49,225,124,156,63,253,24,122,46,97,173,45,208,232,44,248,74,21,166,82,67,4,101,58,120,190,247,159,114,74,159,43,252,219,30,158,244,186,109,121,242,167,242,28,158,229,186,119,126,17,116,230,246,206,252,184,73,156,212,155,19,54,119,146,252,228,78,131,220,9,74,201,157,218,151,147,246,50,59,157,46,39,129,110,126,250,109,149,125,110,149,239,122,41,191,103,154,87,184,91,127,142,225,68,25,94,150,19,78,90,1,105,145,173,45,125,20,190,137,255,126,255,60,153,6,249,157,242,81,12,31,220,39,251,83,76,57,85,81,26,181,131,196,179,64,47,11,176,194,16,39,46,149,145,100,252,67,35,26,70,91,14,18,175,29,132,189,76,144,63,135,217,114,6,201,42,151,137,23,116,95,102,17,101,20,146,
+138,63,195,153,192,198,57,140,138,38,72,212,182,225,16,18,52,150,113,50,74,87,141,184,190,76,96,157,106,164,162,112,64,212,174,90,12,18,201,253,37,36,155,11,178,235,64,58,175,72,77,60,204,230,208,173,64,213,65,139,101,20,71,168,178,9,81,203,205,28,5,80,77,170,232,4,140,82,27,57,195,67,248,110,254,119,37,159,90,92,21,170,156,139,197,84,242,126,62,96,1,110,158,198,55,3,142,49,137,202,33,50,215,15,78,151,2,14,151,190,213,14,99,209,75,76,249,130,248,83,185,1,176,54,48,23,50,128,108,87,172,2,88,249,54,83,161,195,151,26,85,49,230,81,166,191,102,243,189,79,215,53,234,169,174,184,189,16,224,110,42,39,134,221,245,211,228,45,122,202,236,165,228,219,63,252,240,245,60,182,158,167,145,107,133,191,252,108,115,173,117,176,249,230,150,247,75,221,235,25,94,149,103,240,255,25,212,57,44,42,153,106,41,0,81,244,209,106,144,71,84,81,236,1,44,77,196,0,67,102,146,124,2,204,142,131,254,210,176,132,164,74,30,131,4,234,
+109,220,22,132,65,16,121,76,84,73,239,82,72,108,13,184,63,3,37,113,225,128,164,140,174,67,73,168,36,29,180,29,138,139,17,121,217,227,167,137,203,45,209,152,162,6,101,37,245,157,68,125,70,117,83,21,13,100,76,126,168,198,48,61,235,138,241,144,63,59,126,232,8,107,69,82,101,139,198,86,143,86,162,245,36,42,72,40,33,216,73,210,15,27,17,158,38,65,237,191,180,166,202,7,35,75,35,112,177,236,204,125,210,17,221,233,150,156,145,154,150,76,167,182,163,146,25,209,158,4,109,229,74,58,169,234,88,165,210,213,232,228,8,19,30,21,61,123,99,167,237,36,233,185,196,106,182,16,81,77,6,116,179,81,157,156,213,70,37,203,62,111,106,56,201,90,46,49,88,33,68,84,49,49,93,39,38,39,123,241,81,62,224,216,27,90,78,146,142,189,36,86,207,8,213,221,27,164,183,133,73,93,62,61,154,24,76,223,181,58,132,161,89,226,43,54,228,77,245,5,161,227,193,201,191,155,127,196,243,153,162,158,223,250,74,175,57,86,231,149,127,127,19,167,75,7,
+222,100,255,119,36,180,223,77,254,38,123,162,77,131,119,149,241,159,202,252,157,161,179,249,201,99,110,36,81,95,70,135,203,232,135,114,25,137,47,35,104,53,49,106,87,71,218,234,232,248,239,75,114,217,228,175,155,75,103,114,233,191,206,190,202,119,44,189,250,138,179,199,12,57,252,68,229,196,252,65,7,180,116,66,183,212,132,193,0,64,159,243,71,10,97,70,154,124,214,47,3,73,3,152,4,152,57,2,192,198,106,150,6,1,111,235,56,168,6,43,162,177,165,105,40,230,39,65,75,248,65,97,87,151,139,52,74,202,132,15,69,35,147,162,195,125,220,160,67,6,64,228,228,107,160,92,66,59,228,3,42,63,178,111,165,169,108,87,23,103,172,80,121,27,26,55,82,27,182,35,179,129,189,27,137,131,116,124,171,91,39,30,151,245,20,163,100,237,226,180,68,83,141,132,250,225,143,147,33,139,197,22,103,34,167,251,65,28,115,15,211,5,197,145,5,89,250,243,162,219,98,109,234,146,216,243,68,143,200,151,226,23,98,167,142,116,95,232,253,41,252,215,32,139,30,214,
+130,151,162,63,255,18,152,122,48,214,168,222,195,107,127,15,205,163,171,171,120,191,180,2,244,31,35,23,75,201,69,35,61,149,188,71,199,255,174,96,201,67,83,244,114,116,22,1,154,73,68,166,144,238,208,8,42,220,191,242,233,191,95,133,199,94,234,208,168,154,13,129,113,65,60,83,110,200,104,5,222,27,109,254,191,20,224,113,142,243,157,161,126,179,101,250,170,247,212,226,49,178,14,188,251,249,239,159,84,79,245,4,171,157,177,86,255,179,99,48,239,41,236,55,113,244,199,223,183,114,127,11,130,220,147,250,225,207,110,186,220,150,41,119,167,94,191,174,148,192,157,20,220,93,73,129,51,185,113,167,146,27,87,106,227,76,173,244,206,212,123,203,120,175,198,10,95,87,241,206,118,10,47,233,247,131,122,143,251,222,207,245,91,80,164,147,63,34,242,163,33,195,121,21,189,148,47,25,49,144,184,56,82,36,12,63,119,176,255,67,208,134,221,148,18,128,42,145,104,17,128,30,166,32,93,112,74,78,171,249,65,46,40,166,0,10,23,165,162,182,42,9,114,80,84,17,
+127,218,82,198,196,107,44,152,114,88,204,7,33,126,189,146,254,16,141,225,252,33,59,129,111,37,40,84,114,56,73,16,14,145,54,33,100,56,50,98,127,77,226,87,43,17,166,227,252,126,44,253,168,145,13,82,13,54,76,57,99,21,89,63,0,7,46,62,206,88,186,36,30,28,80,89,252,116,10,31,26,27,206,132,117,238,13,180,166,74,239,97,229,76,87,112,133,104,107,157,24,93,212,134,103,99,178,232,40,46,184,248,250,90,27,90,29,72,213,59,117,113,84,155,21,53,199,161,177,226,34,169,121,196,1,35,27,73,77,196,82,157,185,80,156,197,103,37,176,228,104,42,186,200,74,46,143,200,36,192,83,49,119,72,42,238,21,123,121,248,44,175,56,26,74,46,11,73,181,34,210,207,240,71,234,14,145,182,3,69,163,174,59,155,0,22,113,48,223,96,40,86,120,218,221,118,77,125,61,165,248,193,171,136,120,207,190,245,63,150,74,181,49,80,107,7,123,122,229,150,74,125,227,165,163,78,145,178,153,109,200,114,75,254,135,179,81,41,51,39,230,216,157,106,254,58,
+83,31,23,253,38,28,159,152,73,254,186,24,201,127,222,114,164,226,2,103,234,227,173,13,224,72,109,92,73,189,211,149,124,111,105,175,177,162,254,221,213,63,179,157,219,68,250,125,164,54,103,236,49,125,201,178,121,225,124,220,1,174,82,49,2,96,148,178,255,47,162,230,14,134,2,160,198,138,64,8,62,44,177,227,254,180,80,245,209,245,157,128,35,225,23,177,233,96,11,64,46,170,208,31,217,211,139,239,72,41,101,129,141,37,130,12,18,132,159,4,51,133,203,196,135,255,171,196,248,246,227,81,170,84,62,197,243,11,21,103,190,89,188,83,209,107,142,50,46,152,230,206,135,70,168,186,58,7,19,10,86,127,72,168,24,88,108,73,181,184,108,113,225,242,115,146,116,72,40,206,65,65,21,17,147,56,145,149,94,24,177,129,58,121,133,29,113,137,237,142,7,191,169,249,13,69,94,106,162,79,227,22,239,27,172,139,149,23,59,244,105,158,254,166,252,232,169,177,82,202,120,234,211,148,110,210,7,92,202,7,8,249,180,12,127,83,11,146,92,172,244,211,59,13,183,181,
+111,114,133,136,44,195,6,194,211,52,254,77,73,23,137,200,82,72,120,146,116,243,109,65,233,2,15,149,191,3,167,156,191,77,226,229,47,240,18,15,220,56,185,127,219,227,170,93,126,43,103,94,39,106,206,221,158,254,84,239,165,147,196,123,210,86,219,171,114,184,250,87,166,119,78,206,82,172,61,47,48,175,165,105,132,127,2,55,121,155,78,101,226,42,215,215,167,181,155,121,211,166,158,209,178,244,181,42,250,142,42,171,192,93,206,113,231,49,23,225,244,68,222,8,161,236,243,71,232,29,87,223,225,117,245,61,175,254,26,222,106,159,89,233,51,40,59,62,163,50,167,233,150,191,44,59,229,145,171,86,168,24,229,254,14,121,215,99,187,59,95,251,205,191,31,92,111,238,71,206,63,183,19,163,209,205,6,137,20,152,143,192,199,157,143,145,247,12,151,204,201,72,241,34,218,96,124,215,241,7,48,26,38,241,188,209,32,88,216,138,146,81,226,127,42,175,129,12,2,93,230,62,50,136,232,188,38,96,48,71,25,243,65,246,105,153,250,185,140,120,238,12,132,33,22,149,
+80,46,163,2,37,50,102,243,70,137,192,148,205,91,4,6,5,159,255,134,119,113,84,116,184,220,4,85,91,164,31,125,172,180,48,90,209,48,93,184,156,42,76,78,69,42,76,52,255,35,199,135,144,222,233,120,29,155,192,164,155,231,8,205,194,32,115,225,7,178,27,32,21,0,172,177,10,220,29,234,128,180,95,39,158,252,183,221,67,98,30,223,115,134,192,85,71,170,213,181,110,185,122,47,159,174,157,19,94,229,23,235,168,71,133,218,51,55,149,18,224,102,123,89,97,58,75,59,248,161,53,231,50,69,174,38,156,238,40,111,228,220,121,53,219,10,76,110,132,19,21,121,235,81,215,152,229,252,235,172,240,255,202,94,101,153,183,11,61,99,52,31,54,155,211,173,187,227,255,44,200,82,43,104,88,120,208,88,35,238,129,175,24,141,4,11,236,35,150,56,216,73,198,38,252,97,90,159,18,69,129,114,221,127,122,227,72,254,220,213,69,22,152,173,162,0,194,193,14,70,10,73,250,37,85,20,229,103,145,177,66,18,77,141,5,75,198,72,239,176,80,80,119,249,93,6,
+198,175,227,31,32,200,170,37,14,253,170,90,68,203,66,59,200,200,248,195,12,188,2,55,238,98,110,48,221,100,62,21,49,166,211,126,133,5,199,23,35,100,152,70,67,160,70,132,38,199,18,133,64,245,7,162,171,31,229,73,211,4,18,76,245,18,248,14,239,214,158,248,85,222,241,224,215,145,25,198,62,136,124,25,251,240,83,109,199,161,104,63,86,97,232,195,88,166,184,29,73,145,251,145,248,46,24,148,92,249,104,102,174,9,199,78,66,17,115,79,221,159,229,119,37,197,21,100,42,121,200,42,62,113,78,39,194,177,49,104,68,39,14,244,123,221,93,30,12,92,13,121,15,73,225,92,99,105,151,27,246,46,120,68,218,175,190,238,221,217,201,245,142,80,181,165,28,171,215,39,186,253,250,198,126,125,71,240,157,254,21,177,217,125,203,29,21,203,79,107,160,212,237,105,182,170,11,171,110,69,70,131,117,159,114,217,25,213,63,142,124,185,213,85,101,143,7,250,196,129,53,115,137,17,118,182,143,155,236,222,46,241,149,46,190,194,223,226,43,91,124,69,127,191,175,194,
+239,43,255,251,250,38,124,95,101,218,171,234,160,189,94,154,59,189,109,213,199,86,250,27,109,164,244,91,195,250,140,52,193,173,30,88,252,91,193,250,31,15,103,185,164,76,211,116,235,83,111,220,221,221,221,29,6,151,193,29,6,25,220,7,119,183,143,251,121,99,239,136,110,154,102,130,31,100,86,175,92,87,77,85,62,253,205,224,123,219,247,71,138,65,95,62,176,187,114,81,117,225,208,136,141,147,37,245,16,58,30,40,34,141,36,41,41,29,4,228,158,110,145,137,97,30,130,160,108,143,42,36,185,208,1,0,138,76,213,210,70,117,36,24,137,132,132,34,170,22,26,4,46,48,87,90,65,245,4,194,131,241,202,215,5,103,245,221,3,112,130,234,106,53,176,135,246,121,97,5,211,224,116,16,137,61,4,9,129,195,33,152,234,177,213,76,35,60,154,8,33,153,128,28,19,142,244,136,88,59,17,22,139,139,55,74,104,225,194,84,122,226,212,243,42,102,186,111,67,173,254,165,135,39,107,154,248,8,109,245,253,73,21,140,202,41,44,110,214,141,78,252,235,100,235,154,
+40,170,83,31,67,51,2,223,27,88,47,228,220,248,154,206,33,67,207,197,209,178,208,25,90,17,134,149,68,33,90,162,219,139,24,55,30,160,230,164,107,185,56,186,10,15,69,35,32,176,240,25,20,10,6,122,128,191,97,236,116,106,19,195,66,119,100,156,46,104,247,147,0,227,249,66,248,78,111,237,118,24,51,141,218,12,170,91,156,232,246,43,218,202,241,194,112,252,208,151,39,215,211,185,141,209,86,178,54,210,107,15,12,250,143,27,157,106,194,100,122,83,168,95,237,137,44,70,93,167,206,156,104,211,219,0,125,236,66,91,120,48,57,11,31,58,196,122,26,242,189,135,185,247,44,247,68,111,112,239,133,27,61,169,183,209,91,54,122,184,93,163,247,51,239,173,43,184,80,71,7,243,215,49,97,191,141,250,234,169,30,189,90,241,50,134,149,94,15,163,143,246,114,248,33,162,254,187,18,244,9,194,161,221,85,155,15,200,49,168,143,249,138,163,229,32,60,41,49,164,4,128,199,23,123,0,96,164,59,108,80,8,146,13,164,194,225,226,17,10,245,133,112,36,238,170,
+68,2,27,179,64,9,14,70,226,8,160,67,137,223,137,190,53,140,207,246,173,163,78,15,198,73,113,121,32,189,253,169,75,30,236,43,112,139,241,26,177,24,11,87,137,49,143,188,122,67,163,99,185,221,197,88,135,47,44,150,156,185,146,160,113,2,229,26,23,25,227,67,4,249,90,138,117,11,226,183,145,239,121,3,171,216,254,220,71,92,221,221,172,246,237,230,208,253,180,76,7,234,240,139,175,115,210,195,22,7,189,102,210,55,172,137,95,78,12,176,61,35,124,213,99,122,143,107,254,213,84,42,223,116,46,106,156,123,33,246,10,240,149,18,196,60,80,221,215,69,248,38,107,137,126,118,92,128,122,14,9,247,61,226,113,141,65,94,15,208,251,229,127,25,252,57,70,103,144,82,172,79,163,243,117,239,230,120,175,188,246,227,180,190,189,52,10,255,55,165,211,88,36,214,187,161,195,185,222,207,91,215,227,234,241,199,62,191,108,26,127,50,67,235,244,146,134,243,200,193,248,218,165,184,215,111,73,246,17,154,188,124,146,151,191,74,18,44,227,185,223,221,112,242,187,183,
+44,214,215,233,233,81,61,61,94,12,251,67,97,127,196,58,246,7,194,254,184,87,214,143,70,229,193,169,60,252,154,202,35,69,127,116,118,186,171,191,190,243,219,174,195,119,47,251,174,61,238,185,247,223,226,173,0,251,12,49,69,113,175,19,186,25,169,17,136,252,109,158,9,113,74,23,149,40,40,197,135,82,33,88,74,134,101,81,0,162,137,30,32,75,46,120,222,28,5,245,201,164,29,52,14,56,75,200,239,64,57,253,77,134,126,60,23,84,139,4,143,67,217,220,192,215,29,5,246,124,252,30,194,8,105,198,220,69,22,180,88,72,178,209,110,165,43,218,15,199,93,241,62,10,77,158,88,74,46,255,79,201,133,208,35,214,225,10,43,2,239,36,145,21,20,75,177,184,68,80,59,51,142,211,74,119,4,210,101,85,216,121,206,68,15,114,180,106,197,118,231,64,171,182,50,102,173,103,55,219,13,235,174,162,59,135,216,53,183,144,154,54,41,215,205,86,101,91,168,137,30,177,247,51,66,46,140,168,9,27,110,124,84,55,35,205,27,227,198,89,232,94,1,105,185,74,
+160,102,34,176,34,70,132,103,15,209,77,247,198,121,199,9,254,178,119,32,158,174,240,171,25,60,117,86,128,193,209,97,188,27,147,212,242,56,62,53,47,123,183,215,213,106,23,154,217,220,202,173,112,8,50,148,198,44,177,220,142,38,118,247,158,211,114,69,113,171,230,237,188,210,173,52,142,40,173,177,76,126,235,14,163,138,115,159,18,112,93,178,108,179,63,185,173,72,18,71,128,196,169,174,227,153,227,112,220,176,239,59,245,125,231,119,255,178,44,92,83,123,147,241,182,55,39,246,166,194,190,110,198,42,77,68,165,233,187,87,154,13,122,147,243,166,55,53,244,102,138,254,110,98,198,77,65,218,165,233,176,247,126,227,228,245,187,72,122,221,96,217,192,94,154,94,43,196,204,24,76,35,6,169,90,92,81,24,151,107,32,40,228,212,168,253,212,111,218,8,36,68,212,88,3,0,23,215,214,209,68,32,16,89,192,67,233,104,16,155,24,211,36,66,48,178,110,68,38,63,58,25,154,64,2,113,194,163,89,193,120,2,164,76,95,111,159,67,241,125,184,197,82,231,24,139,
+4,38,44,203,38,169,231,22,177,57,218,21,154,111,114,114,137,84,215,229,137,160,186,201,152,28,198,200,193,218,70,236,134,194,7,180,58,104,227,228,63,169,223,57,31,182,71,232,215,9,119,211,194,171,60,57,56,108,47,37,211,142,138,91,245,6,105,145,137,159,136,81,233,221,139,109,97,178,19,3,220,82,13,213,99,41,209,66,182,49,81,51,94,98,154,79,24,231,126,97,150,9,164,110,1,21,22,211,141,154,232,157,158,115,252,205,132,112,183,248,99,143,186,228,181,32,141,59,39,163,225,30,103,84,188,127,41,254,102,124,126,221,45,119,79,221,219,46,44,86,185,211,7,56,4,37,74,171,151,88,157,87,19,135,203,210,104,213,99,153,213,66,126,62,73,86,26,119,144,214,154,36,167,250,227,168,234,180,104,4,220,58,45,187,216,77,190,78,44,137,59,66,106,133,23,113,253,97,200,168,173,45,251,69,221,117,90,72,23,247,147,187,113,106,144,27,39,78,227,52,111,36,78,169,249,105,63,63,73,75,243,147,100,126,130,144,83,167,86,234,180,76,37,78,184,212,
+137,182,63,73,71,251,211,247,254,148,43,201,23,235,76,189,195,44,152,253,246,145,160,21,36,140,63,46,226,161,201,51,186,113,192,74,46,20,129,0,188,200,166,4,201,200,132,234,67,45,138,1,81,219,37,38,68,32,24,16,39,73,2,224,132,90,184,37,66,10,32,12,18,154,100,66,47,159,231,167,130,84,92,92,223,8,15,27,169,185,0,156,159,230,47,82,226,4,65,10,11,62,82,87,3,104,21,109,27,41,99,130,80,69,172,80,58,22,210,188,121,18,8,77,255,67,142,176,137,144,82,130,26,65,177,177,32,77,100,100,86,225,68,13,115,231,148,123,208,170,44,33,8,81,238,4,77,18,70,125,150,36,121,155,172,91,220,68,43,29,97,82,18,183,241,106,155,24,164,170,26,78,210,54,174,158,178,137,86,51,32,73,11,76,184,243,41,185,24,103,119,2,73,178,128,93,238,215,192,221,105,20,79,91,18,229,223,53,13,220,194,94,21,123,38,73,2,250,174,166,224,238,212,136,187,55,9,50,152,59,26,201,98,175,252,188,231,11,8,230,134,100,177,211,156,220,
+173,36,222,97,206,4,117,139,163,170,209,76,242,199,12,115,66,182,216,172,84,115,94,242,75,97,86,84,84,218,147,90,195,245,38,209,8,115,83,164,173,237,149,169,69,178,239,238,152,243,250,180,67,179,159,45,146,92,142,57,37,175,61,38,37,159,77,221,241,213,104,6,93,146,81,105,141,246,152,29,234,251,42,137,139,31,221,66,219,246,208,172,89,180,106,38,121,208,140,71,35,202,78,108,79,92,41,137,171,46,193,185,186,10,87,83,225,122,57,193,16,209,143,178,209,116,66,74,129,120,24,135,118,239,233,55,60,119,70,8,66,131,55,88,33,148,106,60,204,120,32,196,52,78,205,160,130,40,16,113,130,19,158,151,226,206,168,26,223,205,55,180,26,218,124,236,50,158,240,254,111,254,75,59,30,41,156,228,141,133,137,97,165,77,64,133,107,109,191,35,95,96,106,95,182,249,252,17,44,237,131,41,40,34,9,205,79,75,137,121,235,10,245,49,211,208,126,173,27,1,155,70,70,248,57,228,39,5,168,119,38,143,155,22,138,155,152,180,156,73,172,172,16,180,70,143,
+198,5,244,66,105,147,64,204,72,55,54,101,19,213,205,202,137,121,61,176,31,230,200,27,205,228,65,177,163,46,84,74,215,73,48,171,55,234,152,39,217,139,24,202,221,2,254,66,245,62,249,202,128,110,177,61,228,228,221,162,221,77,141,46,245,40,180,221,69,75,224,178,35,8,165,106,84,84,68,218,173,82,195,67,37,147,101,80,171,190,146,87,233,191,91,24,102,113,76,134,56,230,142,60,141,252,166,213,104,245,202,72,39,255,97,129,212,70,165,180,211,160,126,2,60,225,41,193,150,29,169,126,117,117,176,52,38,181,154,185,38,53,114,101,64,249,32,20,148,143,40,146,198,12,190,24,106,167,215,71,75,240,215,176,105,90,206,115,100,165,0,86,90,134,2,36,233,40,13,120,196,208,145,51,0,134,147,44,191,86,33,192,138,32,137,197,0,52,205,141,4,168,160,152,248,33,199,134,184,23,58,20,4,205,92,64,18,66,230,66,146,15,64,242,85,87,108,82,240,182,30,192,13,171,43,177,52,104,45,158,78,143,211,72,19,201,4,134,144,10,18,14,10,171,39,21,
+192,153,63,177,133,30,139,14,88,127,36,35,55,133,5,5,149,181,177,16,237,197,143,125,124,16,130,148,134,196,109,99,159,147,145,109,194,94,231,16,171,209,75,235,106,196,147,133,234,34,37,255,154,132,145,30,102,210,48,130,105,90,119,188,19,6,246,168,38,118,168,191,172,44,147,39,107,255,74,31,234,239,49,182,159,226,162,78,163,236,213,172,120,102,88,148,118,122,187,30,215,153,142,125,153,227,234,195,50,220,211,16,127,53,91,17,94,22,132,159,126,29,206,99,129,219,82,229,253,175,143,249,232,84,112,153,255,95,31,243,201,152,99,177,8,190,89,255,191,143,185,153,195,101,69,143,248,244,111,108,140,203,122,45,73,126,125,154,227,104,141,19,122,221,156,226,47,89,223,246,180,184,177,27,131,108,150,14,155,133,159,103,210,246,255,250,152,91,116,44,22,61,45,61,164,198,154,253,24,67,222,143,45,251,49,101,159,24,75,74,227,103,105,44,109,149,198,186,210,248,72,30,140,105,131,177,108,112,29,127,15,198,4,120,26,187,198,178,4,28,179,255,96,31,242,91,
+65,218,118,240,79,133,226,178,18,74,85,254,229,75,65,5,74,148,28,8,72,173,4,184,51,128,102,66,254,164,16,150,28,64,33,35,113,164,34,192,141,92,180,104,170,24,201,192,67,136,200,163,185,6,100,238,32,130,32,232,9,64,242,83,135,136,119,2,41,66,50,222,40,144,149,45,145,44,187,20,140,97,217,41,76,212,137,137,178,138,64,83,16,94,79,170,68,77,25,15,209,11,143,14,166,36,227,39,59,132,111,83,240,175,118,3,60,120,169,0,52,65,144,14,16,41,215,103,21,100,59,24,197,90,204,16,29,120,249,219,73,73,125,98,154,88,249,26,106,40,85,131,182,238,109,198,20,62,101,68,31,86,223,184,150,24,207,41,230,197,58,92,223,55,46,193,221,154,167,4,91,89,238,254,46,42,60,83,74,251,144,70,173,111,78,199,51,221,130,240,142,82,194,165,104,67,120,167,225,213,33,120,58,223,0,183,183,195,155,183,39,201,245,81,118,62,59,139,238,214,148,151,45,28,240,147,155,219,226,37,100,88,237,89,124,189,173,75,29,238,34,135,59,141,226,240,
+135,219,253,198,195,123,189,21,126,123,153,59,27,204,178,234,111,49,197,94,78,71,246,3,121,254,117,51,217,188,121,118,219,211,205,228,44,210,201,111,163,104,209,77,215,218,105,140,53,62,96,247,183,47,187,235,73,115,61,97,170,198,147,165,122,162,84,207,165,72,245,244,153,158,120,187,233,73,55,61,191,76,141,39,90,244,36,139,158,30,70,248,70,128,31,214,157,195,84,48,47,249,43,119,197,167,72,180,182,42,202,7,214,227,178,97,4,200,38,2,208,4,138,2,0,4,39,105,160,48,137,19,88,56,85,44,141,179,63,156,66,248,14,98,73,189,98,129,216,43,246,96,208,12,44,64,132,18,205,242,17,194,215,149,149,192,252,46,92,143,222,131,229,8,150,25,194,49,146,27,76,88,156,5,82,129,140,44,138,10,146,143,149,208,95,66,24,187,54,195,66,176,209,162,36,110,181,49,185,25,28,40,24,159,165,255,165,133,47,234,105,202,225,205,12,228,20,124,101,91,24,217,10,236,142,137,202,75,225,73,195,156,126,177,210,45,164,92,255,133,48,206,65,229,159,0,
+103,134,22,184,23,185,22,102,167,208,223,74,140,7,171,118,237,204,184,134,227,188,194,249,26,100,120,39,175,60,11,162,240,203,31,39,60,115,42,142,105,138,248,107,150,229,109,21,248,167,187,132,104,170,32,171,66,25,84,157,249,53,54,67,142,246,59,79,46,183,91,249,201,93,114,115,85,49,94,182,140,143,205,220,62,137,45,67,250,157,197,169,203,147,212,94,47,113,56,75,21,238,84,190,221,191,102,58,157,45,74,255,229,46,83,58,179,172,82,123,253,107,127,45,171,148,255,200,243,153,73,102,203,239,201,236,117,34,99,145,222,199,204,146,37,163,90,115,210,170,245,231,146,94,171,166,242,114,85,94,126,49,228,101,69,180,28,123,71,203,136,104,249,30,125,150,221,240,50,7,94,30,207,225,101,63,86,197,200,29,84,254,191,210,187,252,163,120,73,114,207,38,131,115,51,233,143,11,52,188,243,159,13,14,208,169,35,20,146,76,135,130,163,226,228,67,138,79,36,145,218,46,128,67,154,97,210,120,96,83,3,71,72,246,44,30,164,68,26,107,98,38,148,24,197,131,
+129,201,166,100,38,92,64,8,70,168,25,248,78,100,201,196,61,224,14,197,237,221,139,108,136,33,19,51,1,4,149,136,139,55,237,0,244,217,172,136,76,117,206,150,98,235,98,81,73,73,183,112,253,84,237,145,232,15,105,103,146,16,68,99,240,225,212,250,193,132,112,120,7,33,158,252,210,14,27,147,56,147,132,15,197,76,217,129,59,192,187,76,15,120,64,154,132,120,149,242,216,253,108,190,13,29,198,41,193,120,236,190,55,207,160,66,112,78,78,60,163,93,221,240,128,111,227,63,10,239,78,69,120,20,95,18,193,38,30,107,237,208,38,199,163,172,19,4,213,205,93,143,241,136,203,164,130,67,2,209,220,189,170,10,79,78,181,62,38,79,119,238,110,133,240,164,126,69,235,77,188,193,219,101,237,110,207,143,126,109,90,167,56,203,157,220,237,241,22,228,6,71,98,190,104,237,126,57,158,168,218,208,48,39,53,186,29,90,99,241,164,197,6,91,60,245,165,221,137,49,158,188,214,155,115,164,246,233,29,247,219,226,73,73,223,19,242,211,111,75,116,152,67,67,21,183,
+99,68,175,123,9,231,161,42,188,106,194,183,253,143,216,177,196,215,204,204,208,113,220,205,111,87,171,224,118,149,121,31,140,6,239,17,227,61,56,188,229,99,207,123,72,116,15,213,2,125,24,148,166,157,134,174,219,113,223,218,228,174,148,36,253,78,51,35,80,73,2,5,209,118,161,168,207,227,18,74,73,133,217,0,56,252,111,69,133,81,75,7,245,160,164,16,81,136,4,91,199,8,31,1,74,254,96,125,98,133,129,82,155,1,20,23,74,28,43,164,28,163,220,8,96,140,10,105,137,107,97,130,195,205,98,204,200,131,228,163,210,12,149,3,33,73,10,83,41,24,23,235,73,69,82,45,14,46,3,127,108,174,214,139,238,65,9,225,34,100,227,87,94,91,144,51,164,200,19,98,15,110,160,133,142,59,196,144,34,206,127,106,25,196,173,125,234,67,100,7,213,183,162,245,73,9,81,102,56,20,52,173,77,178,58,241,22,93,17,9,175,112,140,79,60,197,41,1,125,72,234,120,135,148,130,22,216,58,14,105,25,47,127,76,196,154,197,30,3,124,136,171,120,135,36,194,
+205,45,190,20,214,156,74,180,60,198,239,220,226,202,129,176,166,68,75,107,234,228,94,20,79,110,107,38,162,95,218,18,141,69,49,43,231,88,11,242,165,113,149,152,235,138,95,26,171,46,170,214,217,147,26,45,175,152,196,88,155,98,93,221,18,79,101,138,125,75,216,26,215,234,140,169,189,58,83,108,82,172,49,169,41,99,78,88,112,69,172,67,114,192,21,110,191,202,200,115,74,244,57,226,2,58,91,74,192,21,17,55,222,212,235,61,216,219,183,71,201,224,149,83,94,162,55,229,245,185,136,41,142,151,146,246,146,208,94,110,61,237,37,165,241,91,91,208,241,161,126,206,5,96,201,173,170,38,126,155,156,31,252,64,109,129,112,17,74,130,97,133,87,172,26,60,164,112,227,0,20,130,180,212,176,17,82,148,130,5,140,200,66,141,168,133,254,21,8,121,49,225,245,121,86,34,205,0,108,76,20,83,136,188,0,30,41,141,112,140,224,84,147,104,133,80,140,209,8,132,148,135,180,202,101,48,14,207,196,32,37,159,52,135,49,225,222,22,137,133,99,190,65,196,147,83,
+234,195,130,9,144,254,39,33,59,101,59,12,238,183,128,191,139,66,216,142,62,250,59,157,255,66,105,110,48,178,234,179,111,219,252,40,124,237,45,138,225,173,201,70,134,75,65,211,222,32,53,147,160,139,112,169,72,188,252,45,70,209,234,171,102,155,162,140,191,65,197,212,173,190,137,113,41,203,60,255,107,43,41,34,41,46,196,45,18,193,109,245,95,8,103,78,180,250,61,34,239,139,254,202,125,119,166,244,43,43,166,241,181,236,219,57,206,31,185,111,101,66,113,116,125,249,68,227,44,168,87,70,244,121,174,237,255,98,156,209,172,88,111,71,106,116,125,60,218,226,108,106,245,150,37,38,149,238,247,41,78,83,94,170,55,162,246,233,159,126,83,226,108,40,179,191,102,180,5,215,199,66,66,206,150,240,53,34,250,219,86,164,96,254,157,59,76,251,177,219,22,226,189,244,248,237,71,67,225,83,61,40,157,18,234,157,71,217,223,37,244,187,128,126,231,242,232,183,136,246,150,71,72,111,41,233,237,76,177,222,109,168,62,96,241,81,104,31,99,150,24,22,195,204,8,134,
+137,168,5,76,27,38,78,9,13,199,133,1,225,194,12,234,11,109,112,99,66,137,4,140,22,220,167,156,136,200,32,82,23,225,35,239,193,132,4,235,64,97,98,156,164,175,72,17,180,8,208,227,246,223,1,19,198,36,213,10,69,106,138,13,18,161,57,83,144,158,93,142,26,135,56,38,70,26,11,215,242,113,167,11,11,15,213,2,93,165,11,224,35,40,12,66,32,220,221,129,200,187,120,155,32,93,131,220,165,215,144,247,222,217,157,184,81,174,125,232,57,30,235,196,220,55,180,69,56,20,207,44,211,222,202,13,25,72,138,63,252,206,237,168,96,231,58,203,223,43,206,185,47,202,164,153,40,213,145,154,107,146,230,153,22,147,252,141,140,224,166,248,99,220,132,164,139,180,208,175,53,146,103,24,231,111,14,82,130,147,124,95,226,18,207,211,176,125,223,121,9,94,215,135,155,71,227,212,202,42,59,215,200,182,198,50,177,172,12,43,135,249,14,99,115,213,217,133,230,95,98,101,148,86,63,100,55,215,38,108,244,194,144,189,223,209,92,46,72,145,219,236,101,245,150,172,
+140,193,38,167,210,137,232,183,124,24,26,236,124,92,147,43,199,228,14,210,137,172,93,234,183,72,253,27,155,116,194,36,151,142,235,132,225,240,239,152,228,14,137,207,65,32,127,206,67,226,124,156,39,28,199,132,195,154,208,87,109,9,255,156,242,214,149,228,111,109,226,21,44,81,30,132,204,110,194,238,12,9,81,242,219,149,18,188,61,217,155,64,131,212,225,114,178,73,3,4,196,17,4,39,148,81,11,192,1,54,39,0,34,247,140,48,176,52,192,13,246,229,66,116,62,4,133,6,21,200,16,88,8,60,164,137,49,164,13,37,122,2,72,92,19,149,70,113,81,199,32,63,182,8,160,35,72,40,198,24,131,82,200,116,26,54,0,28,72,193,62,194,26,160,208,163,1,162,146,137,66,133,187,74,64,138,21,7,123,128,199,131,71,19,136,192,198,168,20,122,128,51,36,228,165,250,79,85,67,51,248,248,9,45,5,155,148,162,153,134,58,60,161,227,38,19,209,52,143,232,170,167,134,30,17,54,9,73,243,80,198,48,2,87,199,38,27,210,113,143,189,73,51,164,158,50,
+54,73,25,247,80,70,43,2,91,197,38,29,16,113,143,200,24,55,148,236,33,54,113,17,215,186,192,32,22,161,151,219,40,38,152,80,247,101,136,239,224,24,27,242,133,25,125,114,235,66,120,141,49,19,81,47,108,232,134,54,148,29,99,140,9,241,194,186,64,114,210,161,155,197,40,203,106,181,38,140,38,195,11,169,41,198,162,84,91,118,160,82,233,80,81,2,49,214,148,90,51,26,163,193,134,30,16,99,85,168,74,155,144,22,108,232,252,117,235,53,188,27,92,155,195,212,51,124,69,84,135,241,7,205,29,66,138,47,94,79,162,219,248,42,151,69,85,227,209,209,218,249,95,180,97,6,245,207,161,50,255,244,223,197,47,195,162,222,38,249,99,225,75,95,10,204,77,24,189,126,229,54,23,63,12,176,190,19,216,127,25,41,130,114,24,100,44,183,82,9,40,204,205,225,173,213,71,205,148,251,4,10,157,51,107,126,220,247,84,1,185,19,242,33,102,90,138,12,244,65,0,69,8,141,10,152,181,119,104,3,137,41,238,4,12,222,72,98,6,176,247,175,183,114,12,66,
+127,0,142,132,37,57,254,225,95,8,108,199,96,207,31,242,139,51,225,184,127,27,41,136,84,12,28,124,121,231,200,151,16,55,192,135,201,41,155,223,193,185,247,62,63,66,216,150,224,67,147,224,54,173,39,255,240,168,164,89,216,35,171,94,10,202,57,133,165,86,31,68,12,144,101,220,51,106,2,100,71,1,21,247,132,86,112,237,78,16,5,223,131,134,233,206,21,51,29,208,115,245,240,79,252,131,156,13,46,32,95,56,50,242,174,144,118,106,40,40,70,228,177,161,11,253,107,16,138,5,211,152,176,204,184,87,26,80,160,233,208,47,5,97,140,66,53,181,41,53,93,97,194,70,209,30,11,90,168,129,213,70,36,70,140,11,129,33,101,33,3,49,254,131,213,111,61,121,65,29,80,60,36,20,223,180,130,234,136,209,214,144,117,242,219,163,232,54,162,186,58,32,241,104,72,109,83,17,185,254,19,130,77,215,222,122,16,18,196,132,71,112,161,55,145,132,8,248,232,219,5,126,163,65,14,129,105,240,111,202,42,17,216,122,66,96,120,62,177,128,162,137,216,40,16,133,
+34,75,181,69,145,202,10,137,133,88,226,3,25,128,6,1,209,197,191,65,130,214,224,61,224,32,127,79,90,159,114,109,106,151,241,139,0,251,91,27,32,97,35,151,18,212,1,30,67,242,8,83,139,89,237,130,51,72,14,102,43,145,118,165,72,28,226,42,250,149,6,8,96,16,240,246,49,183,123,194,227,17,110,109,128,237,246,252,124,120,188,155,106,172,179,237,35,28,222,135,206,240,166,80,182,27,135,231,113,220,148,50,225,206,113,95,13,48,71,142,119,2,214,58,160,182,140,230,227,202,120,87,179,40,222,113,55,225,110,31,83,197,59,9,226,145,15,27,5,247,177,117,71,223,233,172,0,22,91,152,30,61,206,59,30,21,80,172,91,196,226,241,210,248,253,185,228,218,182,187,239,181,143,149,198,159,10,41,254,53,247,212,62,78,217,127,205,61,215,182,253,248,95,115,79,139,63,145,72,175,173,91,78,250,225,185,81,252,217,136,193,150,219,105,112,15,181,196,239,40,198,13,198,77,10,235,122,20,33,254,72,192,192,54,111,48,199,7,216,251,240,231,114,185,159,189,
+37,116,124,104,121,254,82,108,157,203,111,59,127,87,3,195,246,96,252,190,246,159,159,162,130,191,107,225,247,91,217,235,84,55,107,252,115,187,198,109,13,132,237,196,128,223,190,5,131,247,233,43,249,190,82,223,225,47,229,91,32,121,228,162,207,139,0,183,121,123,193,118,1,28,120,35,7,165,212,39,39,129,221,7,165,119,88,161,160,235,68,135,137,64,224,79,15,234,7,114,249,38,54,18,132,82,34,33,33,20,12,165,59,129,151,52,120,5,24,246,75,159,201,113,2,22,26,220,5,240,80,59,123,191,139,219,209,165,33,86,29,132,98,134,153,160,63,77,152,171,135,78,65,240,0,106,55,8,174,168,216,188,16,180,114,6,112,160,122,16,112,116,99,124,72,58,246,90,137,8,247,174,98,176,130,220,219,43,125,204,57,24,173,36,252,85,140,142,112,163,86,23,231,115,190,90,176,57,110,244,222,233,212,232,87,102,12,201,13,213,127,185,48,89,215,202,227,156,12,179,95,40,167,5,191,178,58,71,153,73,246,215,69,57,125,190,225,28,15,240,191,78,174,196,190,50,
+226,220,195,196,231,198,5,233,250,27,180,198,164,119,250,117,58,189,244,149,3,214,24,225,122,39,182,139,55,94,157,221,172,198,120,108,103,111,157,58,249,202,130,106,176,135,125,59,219,137,139,142,87,60,82,99,62,172,140,153,174,31,248,138,6,210,54,122,93,58,199,57,90,220,86,42,126,67,59,201,210,167,46,216,109,229,123,227,57,138,193,248,207,9,171,127,173,220,58,71,233,156,202,228,119,37,91,115,84,101,175,82,184,179,43,5,191,151,195,79,79,116,241,116,70,189,254,168,215,110,137,122,109,73,175,175,145,244,154,147,94,79,114,244,60,82,239,61,232,125,244,68,158,5,146,102,174,31,117,10,112,251,220,203,222,16,254,167,63,39,80,216,140,13,23,41,98,37,116,156,248,176,159,60,100,218,38,76,208,225,84,34,4,135,144,65,120,254,3,127,100,166,224,242,3,56,240,87,128,131,162,153,244,93,40,94,57,86,34,236,210,208,47,8,38,97,146,140,115,180,37,250,215,13,132,180,252,63,0,109,143,207,2,76,38,46,208,149,128,78,76,236,53,104,10,250,
+221,0,255,158,48,198,124,39,209,165,43,31,173,63,121,56,233,143,253,222,250,82,107,116,59,244,15,72,71,87,78,127,125,142,196,120,199,253,189,1,172,209,159,204,20,146,247,147,135,58,38,91,58,121,32,238,73,55,199,254,170,89,144,60,239,178,57,201,213,235,148,211,169,7,197,185,87,3,66,221,93,147,216,79,72,154,183,134,197,215,235,16,250,73,1,192,90,235,222,185,190,175,121,233,39,2,171,229,92,142,207,172,58,111,156,61,33,80,173,85,223,49,97,213,116,242,19,6,213,107,45,134,14,86,29,135,141,158,32,164,214,186,155,169,178,106,54,248,9,215,3,181,70,221,234,172,94,163,221,78,46,126,75,205,159,48,254,106,223,95,39,13,9,223,18,14,38,243,125,221,245,123,194,211,121,94,217,200,95,50,119,102,219,26,139,125,250,130,63,201,201,240,203,20,125,217,19,209,215,87,244,245,201,199,203,152,244,57,146,62,187,37,233,115,37,125,190,70,200,103,14,249,60,161,209,235,8,125,246,152,79,221,211,120,159,247,78,19,65,120,65,128,215,39,126,171,
+65,137,255,95,61,200,24,173,153,60,69,24,15,228,255,241,30,157,140,249,240,30,177,22,253,240,30,148,2,5,161,19,47,231,167,52,75,143,209,11,192,113,138,153,86,138,19,240,130,235,226,58,150,86,11,49,89,76,17,145,56,128,194,133,4,170,249,31,136,3,118,38,60,10,73,35,5,28,35,60,252,26,231,17,56,14,16,243,141,73,140,123,13,201,191,176,238,252,197,153,143,112,97,86,78,214,187,241,25,126,174,143,238,51,57,250,241,151,115,156,236,235,191,76,154,236,120,109,166,184,160,78,38,166,136,31,127,28,83,55,235,175,179,44,93,44,207,117,89,14,178,117,38,165,43,129,226,92,171,17,190,46,96,125,220,18,205,181,168,245,240,117,38,132,62,158,0,176,250,122,124,2,185,188,227,49,129,85,95,114,251,39,22,147,39,31,43,16,168,250,106,104,103,237,89,186,232,24,67,170,27,23,159,27,38,14,30,29,67,64,245,117,183,50,152,177,108,183,177,141,111,174,203,38,149,25,139,166,253,26,179,240,117,245,32,70,255,99,126,255,142,69,63,244,186,112,
+52,158,178,174,46,246,216,14,103,201,226,189,241,140,185,182,165,23,142,65,250,96,26,107,236,166,49,198,52,182,20,26,99,74,97,44,41,140,151,144,194,216,75,26,243,236,164,113,134,52,62,146,26,99,90,111,60,234,141,207,134,112,26,19,78,175,37,8,102,135,96,122,251,206,145,71,131,184,95,84,29,72,245,127,117,131,28,40,88,163,5,169,144,31,0,71,250,148,62,146,24,140,5,161,80,74,173,137,132,10,144,37,80,23,141,240,49,199,48,190,84,158,116,131,62,246,21,9,90,2,167,46,102,80,81,118,131,33,43,139,25,170,91,73,76,48,147,255,71,35,2,186,79,30,188,49,248,101,90,48,130,225,224,231,129,200,132,66,218,193,155,233,2,229,223,254,110,136,174,207,57,145,175,167,96,247,234,102,239,139,95,107,215,31,167,11,199,172,125,171,136,222,53,213,248,187,104,136,111,33,52,112,64,24,252,13,204,115,251,214,138,92,125,106,177,43,22,88,156,111,41,201,113,69,149,155,148,230,235,205,101,132,198,116,128,132,45,124,51,17,161,246,23,206,210,111,
+68,150,239,79,62,38,0,207,241,77,128,122,182,231,226,51,243,175,213,148,223,24,168,246,84,154,62,51,167,203,232,141,211,32,181,103,66,7,243,207,149,129,223,40,160,246,31,79,232,248,155,30,111,183,59,143,223,214,40,170,127,150,191,159,175,155,12,223,22,136,36,255,26,211,253,218,111,42,122,91,43,99,140,167,83,24,251,230,131,175,249,10,209,228,239,175,46,31,28,180,166,219,152,185,240,14,176,175,49,246,101,191,81,95,59,234,171,223,160,190,22,212,215,16,170,123,253,65,95,93,232,139,188,134,190,238,204,215,62,193,124,45,153,175,17,83,250,186,34,95,91,228,107,213,67,190,158,196,231,156,30,188,117,16,211,55,7,33,21,60,95,193,253,99,168,246,118,208,113,116,8,28,71,3,40,162,66,14,138,4,168,137,60,137,136,135,139,46,80,33,82,88,52,37,255,173,227,249,22,123,2,184,38,41,141,74,115,227,204,127,19,83,86,177,40,9,78,7,168,132,200,199,167,66,149,94,83,30,166,212,245,21,86,110,23,139,189,25,73,130,136,13,11,39,26,108,
+127,52,25,60,48,136,132,189,170,93,158,16,132,68,50,245,214,185,116,14,180,34,230,239,214,182,224,8,234,184,140,99,9,213,218,20,33,213,160,13,113,164,53,185,219,60,99,89,147,185,67,199,66,182,21,88,148,149,87,206,49,27,229,193,224,19,109,121,170,57,162,37,92,107,81,161,45,111,193,155,116,232,95,43,45,72,186,220,179,28,145,92,162,181,128,72,151,95,20,140,45,23,89,218,10,247,6,182,188,50,166,226,75,162,53,239,198,150,79,16,136,45,19,88,218,242,13,202,161,60,246,218,18,57,241,178,92,226,28,202,55,51,207,86,137,233,10,5,153,230,88,86,235,108,197,83,74,151,47,166,108,229,72,17,103,139,132,117,21,116,30,99,253,224,170,77,254,198,178,221,209,12,203,38,25,19,10,29,92,241,96,137,169,88,146,242,193,94,152,205,73,179,20,169,49,219,147,102,37,210,108,57,32,205,36,189,217,211,222,155,181,122,179,101,175,49,203,136,102,54,209,108,40,8,151,83,225,50,198,13,41,99,32,229,53,130,164,234,16,138,111,95,224,254,108,0,
+199,197,25,207,190,255,123,44,218,79,116,142,44,5,17,135,96,80,36,136,77,116,11,68,114,176,63,100,66,229,176,218,160,6,92,72,202,169,20,210,238,6,197,82,78,233,83,179,61,65,208,98,28,71,90,65,115,164,85,42,12,22,177,233,0,19,20,192,6,8,135,87,122,131,177,190,118,105,4,78,6,38,69,82,120,136,168,108,112,33,47,113,208,70,201,244,236,40,159,76,108,28,87,193,150,116,14,116,91,140,43,98,75,118,4,131,58,197,149,178,37,74,29,220,225,7,27,130,230,182,109,80,93,12,71,230,77,34,218,182,146,24,219,192,149,115,205,162,121,13,27,121,162,29,78,35,217,16,223,76,84,232,134,76,20,230,218,196,242,44,56,74,44,51,36,89,174,148,26,148,103,38,33,50,245,33,136,226,234,196,87,105,200,29,55,228,75,92,180,70,96,101,38,186,113,168,33,30,226,106,229,86,156,18,165,113,28,210,189,38,87,61,183,42,146,56,228,227,16,206,115,181,99,14,125,137,60,183,13,217,59,157,235,55,165,47,146,165,26,235,112,135,115,165,23,97,
+253,15,49,21,141,167,191,7,195,144,105,23,100,50,93,107,44,215,157,220,102,89,178,9,142,220,17,124,78,60,209,18,77,197,167,146,97,85,50,124,51,194,195,73,120,168,120,135,135,177,240,16,17,110,12,239,225,161,59,60,148,53,194,67,78,120,56,183,64,134,126,120,130,1,79,36,24,136,132,31,71,12,250,57,194,183,55,240,178,221,129,235,154,144,152,172,170,155,247,191,2,14,52,64,65,34,74,26,20,69,130,139,162,21,255,29,9,48,81,36,17,145,91,164,34,251,175,46,164,221,71,142,65,43,41,214,85,0,40,206,16,147,87,3,17,133,61,24,189,139,15,116,229,93,40,220,47,103,157,41,95,194,99,143,157,52,194,47,168,130,177,15,150,193,73,4,19,20,238,8,2,136,203,34,202,55,128,16,72,204,165,43,190,127,236,19,146,226,156,175,164,43,160,145,237,211,199,16,247,84,184,2,230,237,211,130,205,115,162,245,213,26,50,101,239,147,157,198,63,137,190,102,218,87,10,125,110,95,148,253,69,66,45,244,254,199,62,201,79,89,54,138,210,117,178,62,
+246,73,140,103,35,37,136,174,17,229,28,74,241,59,54,234,227,158,72,53,234,68,120,98,35,189,112,126,223,1,170,201,20,167,253,12,197,235,186,249,53,158,92,98,159,33,117,95,252,190,5,95,147,202,236,253,25,10,247,219,247,210,103,53,133,172,242,135,252,209,178,251,52,120,77,37,250,170,96,73,169,24,114,36,31,68,200,166,254,150,249,109,250,163,214,156,201,52,86,32,27,227,200,251,24,7,89,151,68,180,164,254,114,140,220,46,145,219,76,205,104,122,50,47,51,230,242,227,47,47,11,228,197,126,64,94,46,200,203,38,129,188,188,137,151,51,81,122,153,19,47,3,226,101,117,36,94,98,192,182,104,7,182,125,96,171,0,225,250,103,2,170,227,149,207,95,79,211,118,77,64,53,39,159,68,124,42,183,105,210,8,138,73,72,9,105,27,193,70,222,254,246,124,37,137,145,181,185,106,102,95,237,30,14,231,163,192,170,158,21,191,212,26,184,198,86,249,157,68,134,75,36,86,103,171,232,109,254,202,111,43,221,76,143,50,78,116,117,250,27,5,212,24,48,16,132,
+185,132,70,134,52,64,252,212,129,177,126,213,95,173,118,92,129,31,65,130,176,48,229,224,206,76,244,123,4,189,187,7,224,44,152,22,246,215,82,11,154,9,43,95,208,34,140,38,175,192,101,196,252,130,171,2,206,71,161,150,176,19,54,194,102,176,16,87,38,148,132,40,197,137,148,236,129,35,65,136,22,251,29,132,170,120,169,21,13,31,254,56,237,191,111,45,240,136,247,242,198,170,115,8,224,60,238,229,1,60,107,137,80,195,5,1,213,77,8,190,72,146,166,8,227,220,35,240,127,210,251,95,142,255,11,252,217,238,127,137,238,56,93,23,161,152,37,4,92,232,201,9,102,196,178,200,254,117,84,130,102,101,145,250,235,170,132,162,135,34,207,227,170,108,196,164,119,4,133,252,12,155,200,78,106,90,134,135,161,194,193,190,130,72,136,16,174,219,240,120,245,32,82,252,77,156,157,183,138,224,29,193,10,105,177,177,220,156,36,47,186,73,224,235,191,9,213,187,4,161,33,133,71,241,239,94,113,184,49,237,156,9,227,217,233,63,59,29,210,179,211,125,118,90,206,72,
+39,207,199,69,11,178,45,56,33,22,70,12,68,134,112,33,223,139,255,109,0,231,193,201,252,122,112,136,30,46,146,127,130,17,198,119,8,98,13,70,180,222,160,176,62,208,211,4,214,189,84,160,183,127,247,236,150,119,143,242,238,73,26,239,30,164,211,243,118,150,61,94,167,167,235,244,162,184,241,134,189,191,192,236,46,79,156,203,151,16,252,185,60,66,241,23,22,52,166,225,245,52,108,240,88,16,130,11,225,61,244,222,31,75,244,43,124,31,132,14,102,26,151,203,181,134,73,167,32,198,90,199,1,244,10,194,150,95,242,37,42,96,7,209,128,250,246,216,83,8,180,65,30,109,209,29,7,105,227,229,132,201,26,7,13,97,13,40,2,37,125,16,17,166,60,81,215,35,25,17,33,231,183,22,10,254,134,4,118,160,61,68,176,91,1,114,208,193,13,49,144,253,46,33,128,66,62,64,138,9,194,5,210,156,187,105,101,31,223,205,241,107,230,30,211,182,239,130,198,7,20,232,191,60,72,205,71,97,142,247,7,216,119,71,97,162,63,27,130,168,234,171,48,114,34,80,
+11,119,196,103,28,248,137,68,57,94,26,224,58,137,153,111,2,116,11,1,117,19,49,194,197,4,89,45,18,0,197,93,131,185,11,6,200,242,47,88,57,116,35,150,79,117,244,214,8,96,174,246,27,95,145,32,94,154,120,59,184,107,7,223,197,118,176,223,14,134,48,237,224,227,210,213,63,144,70,138,143,137,23,164,131,48,188,60,140,160,136,12,144,109,62,88,251,235,2,214,139,145,235,97,162,137,124,44,156,208,134,227,183,55,8,226,9,130,180,93,129,96,174,43,108,188,27,155,223,247,38,249,222,44,67,239,77,243,188,41,219,207,155,218,121,19,63,151,54,129,243,134,224,114,194,194,220,102,31,191,50,190,16,213,63,72,234,16,28,127,223,186,220,231,70,211,57,119,169,231,110,108,109,8,58,218,16,131,7,65,20,148,16,111,49,254,213,113,131,223,151,151,147,119,88,192,150,39,55,204,106,251,205,228,187,63,156,26,17,87,118,179,151,104,101,16,66,46,174,25,65,81,73,82,121,125,34,129,80,151,27,117,34,104,138,86,209,193,9,99,39,74,198,11,241,212,
+95,19,17,134,39,73,107,109,72,143,216,85,119,131,196,64,219,38,120,6,206,250,12,240,165,34,92,65,180,53,197,69,194,2,124,105,227,52,129,53,244,221,136,121,25,155,202,151,8,123,186,193,214,69,181,1,238,138,83,252,102,154,126,236,192,211,60,210,65,126,135,13,200,130,225,248,185,47,127,94,13,45,138,138,178,115,227,228,242,114,42,214,161,6,125,225,165,65,93,99,72,53,100,131,56,223,15,150,109,130,54,131,179,185,10,11,159,227,183,141,178,59,36,131,165,46,126,183,20,219,55,96,126,95,218,188,167,237,172,125,31,25,188,158,105,181,141,118,48,194,75,19,108,115,247,53,249,24,150,99,18,94,178,242,247,202,87,153,143,182,41,32,146,37,170,123,215,214,248,95,56,123,12,188,236,5,160,119,101,254,197,249,35,172,160,191,207,215,73,224,127,63,163,157,213,214,225,22,60,150,85,223,41,213,241,223,97,134,103,186,250,178,36,173,2,203,18,145,94,222,65,37,95,204,177,46,229,151,141,195,29,222,146,249,146,14,195,189,193,184,123,151,251,246,201,208,
+94,158,84,234,39,228,231,69,130,207,222,65,155,95,94,111,188,197,13,127,43,248,247,190,189,185,89,59,216,94,209,252,68,216,58,56,69,105,153,225,180,104,53,153,119,172,176,168,1,82,74,101,67,107,207,113,91,130,134,112,17,191,213,58,42,54,14,41,95,227,100,217,66,34,171,124,244,72,162,69,126,244,104,65,147,25,55,34,26,56,120,214,126,108,4,200,64,48,25,128,172,195,227,194,130,205,82,242,146,20,160,44,231,46,82,58,5,227,178,90,116,72,173,196,212,181,80,102,112,74,61,130,203,165,221,180,29,27,16,44,214,83,226,147,126,242,203,244,160,217,147,174,46,20,165,224,111,177,44,214,215,177,235,30,25,206,33,13,64,185,115,84,95,39,34,82,35,141,199,31,134,177,188,108,65,138,226,47,206,138,61,137,117,203,248,28,83,175,207,151,43,155,253,116,251,157,223,117,54,111,37,58,115,218,200,43,29,98,209,72,245,42,125,167,45,77,156,101,16,191,123,17,172,178,80,218,40,139,76,13,209,40,5,43,67,35,210,70,90,224,16,191,3,12,168,242,
+39,180,145,255,190,112,215,6,228,85,105,60,222,243,64,103,182,119,148,111,79,157,195,87,113,48,12,63,163,185,119,252,123,50,176,42,24,249,17,187,153,122,123,191,132,105,101,22,254,58,10,86,45,217,171,225,240,234,56,237,74,243,184,158,171,29,199,122,163,241,21,176,101,11,58,123,71,85,81,169,143,144,88,253,6,95,60,131,246,174,79,222,16,144,116,29,132,190,251,124,127,101,21,233,70,208,82,95,8,113,212,49,175,92,251,249,170,84,64,35,252,175,5,138,230,8,129,50,103,93,187,26,164,197,244,71,119,132,186,209,152,77,3,39,200,36,59,129,28,55,177,16,121,19,241,27,157,65,214,192,144,222,185,134,132,6,241,66,194,117,159,17,116,149,59,38,206,19,183,39,202,32,115,67,74,76,151,178,144,102,128,54,253,42,225,152,159,184,103,26,104,148,229,19,247,105,182,63,146,15,75,72,236,157,73,127,249,85,144,223,72,73,15,41,163,228,234,66,57,17,53,125,123,84,8,179,176,86,98,207,147,128,51,81,161,126,115,66,66,164,220,126,45,200,13,224,
+45,83,146,201,74,93,156,233,124,181,232,53,238,25,93,236,195,135,237,189,164,233,108,18,28,213,80,230,71,44,45,55,81,54,70,88,146,145,229,247,166,114,211,131,180,79,32,25,87,55,189,183,215,184,40,187,34,10,201,168,2,123,115,222,197,69,90,99,207,76,65,251,222,71,58,220,147,35,134,120,100,130,157,125,160,90,93,156,109,247,71,6,219,238,88,16,211,147,165,149,209,203,175,232,169,175,35,229,228,166,99,203,151,229,10,93,249,196,28,130,192,155,185,183,199,173,53,99,111,119,92,41,179,118,67,193,174,170,198,50,245,236,10,90,240,101,28,69,53,49,206,13,247,8,51,239,138,43,60,192,127,47,98,218,234,23,179,5,121,80,240,237,201,42,26,65,134,164,160,148,28,163,184,72,185,78,99,127,234,174,12,63,147,32,209,93,158,189,24,252,168,12,149,179,251,167,50,82,168,172,28,32,47,24,38,40,18,44,129,69,255,205,111,69,175,213,218,71,102,146,249,65,144,8,188,184,227,3,4,75,94,230,235,112,36,35,31,151,7,193,96,224,98,198,157,217,
+123,16,88,65,158,57,139,56,247,210,40,74,192,109,117,163,22,176,152,59,198,165,163,131,13,24,59,121,9,42,3,215,23,242,224,140,24,35,194,15,212,151,48,138,78,53,193,185,241,62,142,168,34,47,227,98,220,22,101,21,129,67,241,48,113,55,221,128,12,197,238,74,105,115,222,113,45,35,101,184,90,32,56,141,94,180,61,118,154,64,80,246,156,35,138,254,42,77,236,153,91,11,101,167,130,209,34,196,104,98,46,180,80,14,99,31,140,54,133,38,206,238,47,13,101,151,64,209,20,213,111,154,174,211,23,31,103,240,138,50,253,166,229,108,142,189,176,195,62,127,84,104,216,86,170,76,107,151,253,76,75,24,211,158,167,199,246,30,36,152,211,202,35,231,24,254,162,109,204,215,182,217,184,204,160,75,207,214,206,191,114,42,4,101,212,171,222,50,198,179,166,156,237,80,69,209,71,243,22,182,104,138,181,28,70,60,90,23,111,97,236,191,71,218,250,18,146,217,157,11,91,112,103,3,159,83,112,101,11,192,249,224,219,249,9,188,58,232,109,27,68,182,27,146,86,174,
+141,212,21,240,252,27,159,244,126,10,236,208,83,140,254,219,10,55,154,177,136,112,149,20,41,150,5,125,113,170,209,137,67,138,214,179,2,17,4,189,199,125,124,184,136,168,74,247,64,93,132,79,123,141,2,236,68,217,11,80,193,67,121,86,106,34,96,55,18,213,151,230,231,236,1,35,200,218,6,72,151,172,59,192,41,223,184,205,48,112,0,19,136,69,110,30,189,249,239,249,175,240,140,170,254,196,181,122,244,254,135,22,32,105,82,146,4,83,251,203,0,39,164,81,61,190,252,29,96,170,78,152,211,236,17,104,104,240,251,243,140,187,121,50,252,11,232,188,209,187,85,6,74,31,202,30,58,30,3,249,167,174,214,193,85,240,85,240,113,212,125,170,166,128,14,62,195,128,110,183,135,208,55,49,228,110,222,185,229,117,179,250,125,141,209,231,102,70,241,157,111,78,131,111,166,33,76,46,179,112,250,137,84,45,8,230,163,35,237,21,172,245,231,194,177,253,245,226,192,245,231,210,81,191,22,60,109,142,87,241,83,95,123,58,191,100,150,83,121,111,3,245,139,168,246,119,
+132,179,115,252,198,51,175,94,24,109,71,56,175,206,145,55,154,248,133,82,218,4,138,127,251,183,167,228,220,115,146,123,222,115,137,39,39,247,220,159,159,210,193,249,41,57,63,33,62,245,197,143,47,37,42,250,188,230,71,29,183,85,152,160,81,69,5,166,5,37,34,73,243,159,165,168,34,168,198,143,172,124,151,127,217,210,90,2,108,255,35,144,133,47,60,6,68,87,146,13,223,1,254,103,188,187,62,230,63,8,24,18,149,71,0,193,196,214,162,31,55,163,47,0,88,40,148,172,190,22,109,76,199,70,148,96,83,156,44,192,91,183,44,7,21,125,183,110,96,81,152,168,46,147,98,11,115,75,49,237,252,75,136,235,177,107,204,12,174,92,96,147,149,38,177,205,69,86,37,196,67,155,138,24,153,245,189,83,54,18,121,158,129,189,92,182,31,187,13,217,86,22,103,52,24,178,181,242,127,75,69,185,129,255,177,139,136,221,165,165,214,64,10,42,21,136,205,214,93,142,109,128,14,58,75,129,188,191,69,161,253,207,160,123,94,230,251,215,47,215,223,182,207,13,153,203,
+172,180,246,253,82,13,246,169,38,249,185,25,164,151,88,141,10,103,182,145,228,246,118,186,10,255,251,109,124,53,237,129,234,109,250,43,16,56,42,115,221,241,50,135,180,218,191,140,159,251,119,253,167,93,180,77,202,203,60,235,231,30,170,240,41,41,27,98,184,244,213,221,244,88,101,69,180,53,34,211,37,188,224,142,150,245,155,203,140,225,181,237,249,215,95,86,110,105,117,159,222,22,247,201,235,62,217,4,238,147,203,125,58,87,19,75,73,117,9,81,95,94,126,66,41,209,22,42,209,101,77,77,246,11,151,157,42,38,44,45,224,198,3,69,219,63,67,239,73,144,63,178,146,207,128,168,210,249,155,71,7,182,96,98,106,80,32,6,119,166,31,111,133,9,53,215,172,68,40,224,135,92,129,51,228,67,166,27,185,6,160,10,75,76,144,39,190,55,207,224,250,110,211,240,251,5,240,106,196,200,143,134,173,252,5,88,168,170,60,179,85,147,152,196,26,247,71,160,153,1,246,74,240,39,98,178,229,191,53,194,164,180,248,19,81,239,208,66,76,89,118,255,65,137,137,235,
+159,239,184,83,29,199,86,97,61,181,96,83,11,253,172,148,73,144,187,33,154,101,141,31,211,129,0,255,100,186,71,73,190,214,34,148,171,129,153,208,241,213,55,232,239,154,212,251,53,19,251,191,186,26,69,246,174,222,119,43,213,12,175,167,46,165,143,104,149,42,107,254,65,201,191,152,217,106,108,58,67,182,162,60,185,38,124,56,230,211,141,231,92,135,191,104,192,207,246,204,240,243,12,67,127,238,202,25,227,231,201,204,252,116,72,63,140,97,240,232,170,63,147,21,1,133,248,19,139,28,69,133,169,55,87,94,147,127,26,123,254,76,151,59,194,21,95,183,76,201,187,80,181,155,135,106,206,173,153,52,91,63,157,230,143,160,249,179,92,183,126,12,173,159,28,189,245,227,119,107,4,174,186,70,240,81,148,45,55,248,242,255,108,104,63,129,245,227,173,18,54,85,212,96,170,134,162,186,147,180,56,248,130,216,197,73,41,219,167,120,82,241,210,32,17,125,173,38,192,207,10,92,252,111,117,84,100,15,173,65,23,162,186,22,171,13,9,153,65,112,128,48,124,76,177,32,
+43,89,253,113,47,176,184,180,46,18,145,105,132,141,228,78,219,48,54,31,69,81,214,254,40,52,142,81,188,69,71,97,204,1,141,66,214,20,153,32,81,165,32,41,160,208,248,63,9,13,151,103,198,212,106,33,182,76,85,197,219,223,190,42,9,180,157,182,191,201,209,72,47,136,70,34,195,180,160,242,39,132,240,228,97,156,136,221,25,76,174,140,102,10,75,187,64,24,117,129,209,208,146,175,35,203,149,231,187,198,246,155,103,6,237,243,162,73,249,146,100,67,193,140,164,63,104,87,185,217,28,43,143,89,73,44,184,196,26,171,75,135,81,131,172,79,231,105,219,47,163,57,90,141,122,105,36,233,122,84,107,176,118,149,49,92,149,4,126,166,138,139,250,89,150,49,212,158,131,72,211,26,202,48,90,147,71,174,49,36,146,24,130,120,135,85,122,100,234,9,1,149,148,228,70,160,163,98,215,41,185,230,170,82,243,84,94,125,105,170,130,22,77,179,74,142,206,140,145,88,179,203,254,184,222,3,245,163,175,126,12,151,234,199,90,251,88,106,219,143,149,246,209,170,95,151,
+241,194,21,64,191,28,199,193,7,156,168,201,81,188,136,210,128,67,49,19,236,129,31,6,241,170,46,250,95,221,60,199,138,237,127,251,45,239,194,96,21,61,49,50,145,226,58,119,7,93,152,66,44,237,13,10,22,18,163,143,64,8,193,164,254,147,20,169,182,4,64,161,230,142,232,4,56,54,178,100,86,212,5,78,210,182,29,4,158,123,22,193,254,200,130,52,130,6,214,5,112,35,8,49,116,27,41,13,137,149,73,230,25,161,180,234,209,104,1,190,62,5,88,173,77,186,80,100,118,18,203,116,80,79,169,69,198,232,87,128,161,221,147,138,1,22,69,185,134,39,55,238,174,59,223,222,49,236,142,231,8,103,92,105,222,134,107,82,227,219,161,171,6,15,214,56,146,201,29,158,56,149,193,220,121,248,37,190,36,101,57,92,235,112,125,174,52,82,125,245,61,83,93,238,146,26,24,218,59,166,195,51,211,209,8,249,81,79,237,137,232,104,8,213,174,161,246,224,3,244,123,98,103,168,83,95,97,250,29,185,115,196,11,175,12,181,67,26,61,25,145,171,75,241,72,15,
+75,175,153,202,127,162,90,5,183,36,161,57,186,239,87,59,222,249,106,119,179,31,165,31,223,74,221,97,31,105,6,119,146,209,204,140,246,217,29,107,114,149,50,38,87,197,228,234,38,199,174,243,216,213,18,91,95,215,248,93,12,191,91,32,202,27,63,87,65,25,232,132,53,53,13,35,155,129,231,188,56,3,63,68,6,232,87,196,40,192,78,73,119,49,114,87,144,168,211,200,194,54,73,247,29,15,80,35,196,244,148,0,165,193,69,86,58,20,84,232,230,122,190,128,48,161,37,227,60,64,232,148,26,74,133,0,34,65,109,210,2,48,238,54,77,50,220,235,32,28,138,166,13,100,193,233,2,25,197,4,69,69,224,169,68,198,203,35,197,119,89,166,157,192,1,229,187,108,196,44,1,226,171,83,138,233,21,243,220,196,199,244,147,145,72,22,68,22,52,70,98,96,173,172,45,140,192,184,129,217,180,218,249,5,53,94,254,34,221,111,157,134,237,226,135,236,216,153,102,170,135,223,145,145,38,183,166,9,84,58,179,40,110,253,126,11,83,251,195,20,159,190,220,82,150,118,
+209,234,0,91,71,186,204,45,69,41,151,167,92,53,174,32,219,21,212,214,16,29,158,0,21,137,117,182,52,5,169,12,85,2,229,145,36,211,183,197,7,184,242,72,188,202,244,185,169,77,113,72,36,75,183,158,202,123,158,80,249,174,84,174,41,155,196,86,197,240,121,234,179,105,14,185,159,175,129,250,167,181,163,173,156,201,170,128,39,211,100,139,178,73,117,10,182,28,178,133,219,244,167,240,53,82,62,255,160,202,231,68,249,28,25,106,207,177,225,217,106,223,20,18,239,1,68,123,228,194,177,233,80,163,164,162,131,113,119,133,127,173,166,239,38,243,191,253,169,90,49,149,172,145,215,239,66,7,233,187,47,172,144,84,202,232,135,122,68,211,62,138,249,161,30,42,29,232,191,186,169,62,86,72,162,60,197,140,60,16,33,43,191,193,23,128,131,98,136,255,251,119,116,26,47,94,4,216,186,143,98,195,152,98,166,169,104,5,212,94,115,181,12,90,182,245,5,8,20,51,19,162,217,12,90,92,169,68,210,122,163,0,93,157,132,48,229,80,36,228,187,96,84,82,177,93,
+112,128,244,97,253,151,152,177,121,124,183,22,239,109,12,177,188,163,233,13,95,95,30,162,58,194,204,254,87,169,57,64,111,53,200,86,83,132,73,13,15,91,148,94,95,252,86,194,12,246,181,46,123,205,97,44,237,62,246,135,43,145,163,75,229,45,89,77,205,230,191,183,102,103,20,75,143,37,250,200,58,87,252,111,31,218,150,168,28,249,100,104,72,196,36,72,42,79,87,244,218,243,173,229,231,76,141,210,98,183,96,116,92,24,67,235,123,204,88,245,45,231,173,74,161,185,68,126,30,67,181,211,119,160,173,221,232,51,135,247,237,206,246,117,147,234,22,110,185,100,10,30,80,95,217,222,81,13,206,41,122,194,251,238,44,191,125,165,83,159,112,234,159,27,167,126,213,222,159,216,231,253,207,135,254,95,180,246,159,124,111,184,217,148,29,124,94,163,227,124,28,45,188,131,105,53,144,68,209,165,253,78,138,235,172,144,47,110,236,179,180,73,184,152,55,13,125,0,19,100,36,171,161,181,96,158,24,255,132,58,124,194,98,176,66,16,35,65,37,42,3,96,48,138,225,33,
+5,112,77,83,26,197,253,168,194,247,34,128,214,154,73,105,174,138,9,108,227,4,11,240,108,7,17,42,40,230,87,8,154,229,185,65,24,85,244,249,70,136,62,12,208,181,113,144,80,154,39,66,10,66,225,87,228,1,3,249,3,136,166,231,13,154,135,157,190,78,72,111,48,66,140,176,236,82,110,252,166,218,131,72,120,171,166,192,204,187,35,154,94,123,193,164,218,137,16,185,118,160,211,149,245,144,231,135,41,65,91,134,229,30,92,157,166,192,186,42,99,130,46,143,135,132,206,194,231,99,73,68,220,131,42,177,20,152,72,154,235,229,75,204,13,117,116,243,194,124,57,81,213,218,186,12,244,7,39,102,210,90,133,230,231,30,77,161,217,20,127,46,43,117,220,179,167,241,191,48,4,14,15,22,203,134,32,147,106,207,103,217,84,11,78,216,82,217,60,80,87,206,25,186,202,133,105,78,161,166,236,222,243,120,55,21,120,251,242,83,113,142,52,160,199,159,230,49,209,60,186,35,205,99,172,123,100,248,191,23,137,109,3,162,101,30,231,127,35,58,238,10,127,220,245,208,
+136,85,198,207,195,189,138,56,180,45,39,70,40,210,210,15,76,181,104,113,28,221,0,254,65,77,63,88,225,3,245,220,29,68,48,118,227,226,28,196,32,36,22,47,252,225,135,223,195,142,102,0,22,217,103,255,150,237,127,203,188,130,90,127,0,188,24,101,2,80,17,246,126,13,51,75,16,40,143,156,156,135,175,56,98,30,242,99,52,64,209,80,33,97,56,10,160,165,126,144,167,70,64,61,174,11,17,241,178,123,4,246,141,145,11,73,153,24,175,135,150,220,15,177,79,31,112,58,175,3,229,28,94,251,22,167,3,209,180,31,60,180,195,191,200,24,10,199,154,152,214,17,238,246,158,242,11,159,206,129,89,23,179,63,51,86,32,31,118,41,73,32,220,13,34,250,23,54,78,184,237,36,19,254,195,168,240,15,19,118,194,215,126,221,186,130,218,103,95,135,183,222,79,134,247,214,149,95,245,53,230,180,245,110,212,113,239,236,6,222,149,145,125,236,79,147,23,203,242,142,176,228,239,69,220,127,24,10,78,206,221,153,123,117,227,89,143,229,253,37,247,190,171,45,190,127,
+150,235,216,91,35,195,239,110,178,188,78,44,246,199,180,241,162,218,109,111,137,237,173,179,53,222,52,219,91,37,123,123,28,169,23,129,254,64,156,202,155,206,71,158,117,11,33,34,5,198,146,191,91,69,225,15,41,33,11,2,190,184,112,170,197,247,197,60,85,147,26,9,240,39,228,255,22,70,220,225,53,96,20,35,187,4,216,46,128,139,236,219,1,41,136,140,234,65,55,194,70,129,203,113,2,20,212,104,200,13,224,23,36,110,228,248,25,184,22,114,150,194,2,62,246,46,159,205,10,146,83,128,142,26,59,173,1,94,90,5,152,123,128,10,236,114,17,175,96,147,202,175,0,245,223,171,236,48,12,13,116,83,222,45,11,27,27,58,211,57,60,36,239,106,125,57,218,159,32,55,233,14,135,22,101,247,184,142,198,168,238,131,1,77,52,173,97,132,167,134,43,82,90,39,33,186,174,198,216,112,204,65,53,177,36,142,124,119,41,69,86,69,10,103,131,25,70,189,46,83,110,53,40,83,56,219,65,120,229,110,10,221,231,10,143,67,223,140,110,45,151,175,122,214,87,105,
+247,65,242,200,117,238,91,217,230,124,226,94,209,44,231,34,233,110,233,197,189,251,33,255,235,111,151,227,186,98,167,102,58,124,95,249,188,231,220,157,239,30,228,90,230,209,108,245,187,171,46,93,26,139,189,57,106,172,196,182,241,185,205,118,15,50,188,134,125,252,178,15,95,198,247,208,103,27,250,204,195,213,231,242,26,103,159,185,2,247,14,160,241,4,206,135,101,136,153,177,197,164,61,192,83,38,114,188,242,229,206,37,129,203,44,30,199,70,72,67,123,72,246,11,233,61,181,17,116,81,140,90,0,151,186,15,236,252,0,226,101,192,164,195,226,248,63,58,192,7,117,163,226,250,199,203,101,17,102,134,13,194,49,154,224,38,140,17,97,145,139,165,84,27,24,146,151,80,130,90,252,31,164,142,195,147,227,106,16,90,9,81,215,97,2,10,132,229,23,107,142,61,178,240,52,130,126,35,41,52,115,253,83,79,45,117,62,110,59,165,106,17,139,155,197,221,37,52,56,173,221,216,161,226,47,32,73,61,196,166,54,185,147,227,106,124,97,78,215,196,22,76,228,4,138,197,
+179,16,151,216,61,191,39,178,23,115,137,191,112,81,21,110,148,211,66,153,172,22,78,183,123,156,61,227,191,44,18,253,194,184,208,184,135,73,252,151,121,184,110,213,65,19,123,103,192,90,238,199,119,94,221,195,159,216,27,164,229,174,54,236,184,205,6,110,125,204,192,47,246,247,19,43,235,189,151,249,207,69,110,231,51,79,4,53,243,153,191,172,187,237,11,94,99,127,162,219,238,97,182,23,61,206,180,109,99,67,99,106,97,232,234,123,250,98,193,74,157,172,178,187,197,46,187,67,92,119,157,171,113,151,185,238,42,215,221,227,40,157,8,242,5,2,40,231,253,255,230,69,200,114,74,226,44,181,168,120,196,225,82,97,132,106,160,248,126,66,242,1,20,212,201,114,215,26,145,50,150,81,168,1,34,150,87,161,11,193,146,195,127,93,33,172,76,149,128,10,164,99,226,223,122,6,162,119,138,253,183,160,1,91,47,0,255,91,207,240,13,152,152,38,192,155,87,194,140,186,60,96,243,163,36,224,164,48,240,96,245,92,6,9,164,8,77,156,226,76,44,19,201,196,98,136,
+81,40,144,155,92,112,72,71,248,56,118,118,5,85,78,93,100,92,170,131,150,239,145,157,100,182,104,131,227,74,144,205,170,19,101,22,13,212,158,30,86,233,200,180,152,84,223,240,187,123,126,154,171,176,24,230,137,180,211,82,234,34,146,60,214,97,34,111,154,88,219,234,56,77,99,17,143,163,104,147,213,155,68,199,113,22,235,48,110,43,191,44,144,108,218,47,33,148,38,241,195,151,121,189,227,178,248,49,121,131,79,153,154,39,237,186,197,192,89,178,24,167,244,190,225,30,171,116,251,8,253,138,94,164,60,214,17,191,246,178,156,181,44,119,37,157,94,206,199,116,219,62,172,33,187,198,137,166,105,104,212,215,205,140,52,107,79,25,127,94,198,140,125,98,60,217,143,17,165,177,180,81,26,167,74,227,210,111,105,188,150,167,5,184,37,139,160,20,94,184,175,159,148,230,98,112,5,73,226,172,162,20,87,243,134,238,37,4,74,142,244,133,130,138,73,128,7,35,231,81,3,8,86,23,73,249,106,60,24,72,9,194,15,22,0,58,28,144,140,124,32,46,205,128,193,23,
+98,209,155,198,53,3,172,168,248,159,76,136,210,232,153,54,192,141,164,3,72,53,180,8,23,34,190,2,240,223,121,204,26,192,149,135,190,244,52,165,1,184,172,224,48,144,148,202,144,36,30,29,242,57,197,157,182,53,192,25,67,248,106,71,230,91,105,69,36,41,107,48,79,237,205,244,3,141,225,141,178,32,78,103,31,141,144,86,81,7,49,186,159,48,220,139,169,1,255,32,174,109,20,147,65,107,234,58,223,42,60,20,63,216,156,78,171,55,70,146,198,63,200,20,77,211,116,59,185,165,89,124,46,76,146,61,24,37,94,210,48,78,248,42,174,121,215,41,40,246,213,225,175,56,22,197,125,57,229,223,253,95,13,254,202,44,235,156,27,69,195,98,202,176,215,15,251,198,141,101,123,134,203,236,87,63,227,55,215,229,130,223,210,89,55,29,223,233,7,94,234,102,231,202,158,37,178,111,149,125,116,44,10,3,179,196,224,164,167,152,241,193,85,74,220,170,165,27,163,116,147,42,74,55,196,224,198,33,15,110,169,193,173,52,200,221,12,209,131,0,59,45,126,194,252,228,
+102,237,9,240,80,77,75,247,239,43,97,16,189,22,160,64,81,37,57,32,238,18,160,219,65,44,36,68,70,140,98,96,3,17,144,191,153,200,0,100,61,68,194,226,192,208,240,13,124,136,239,183,151,254,184,89,82,8,177,8,192,161,165,74,23,9,26,75,137,102,144,100,97,20,190,168,252,63,192,78,223,202,172,62,42,27,165,36,202,101,80,180,144,56,41,154,217,20,48,138,197,35,75,218,84,36,114,235,85,129,66,178,11,160,143,201,156,64,88,126,90,6,241,172,223,40,178,12,167,147,126,161,156,200,108,210,130,232,174,69,13,127,91,70,215,78,10,122,115,169,250,54,118,179,25,183,182,184,215,151,181,204,45,65,38,231,169,84,147,217,185,200,98,3,3,124,89,197,148,216,102,113,156,147,95,12,227,203,68,175,173,249,151,243,218,20,240,197,85,245,186,171,115,244,89,206,38,107,215,138,94,123,178,236,208,253,140,50,222,176,93,222,254,45,25,180,57,213,164,82,182,164,102,60,148,236,88,35,223,134,158,132,215,40,93,113,74,246,115,70,229,30,151,117,227,253,
+76,238,58,182,168,162,175,89,178,101,151,233,143,172,226,36,163,178,68,215,101,67,244,223,225,203,69,203,231,104,217,33,128,151,25,255,118,190,12,84,126,118,241,157,87,100,125,66,240,223,246,171,174,71,159,206,148,56,152,214,91,199,165,3,97,242,227,116,76,222,10,19,37,11,133,181,66,164,176,144,94,16,30,0,138,43,2,145,25,245,84,17,24,146,216,189,244,191,153,232,47,83,31,138,151,50,173,144,223,15,77,131,164,48,166,13,132,218,42,112,1,32,117,64,26,84,144,95,33,208,51,218,242,166,132,44,16,82,208,2,31,204,137,56,84,71,185,44,128,69,230,19,36,26,21,12,178,116,41,9,126,151,156,200,227,67,210,115,16,79,170,55,225,13,254,80,94,163,109,164,85,111,194,230,224,216,103,89,61,48,58,71,119,9,90,243,255,216,186,170,230,86,122,40,249,215,205,204,204,12,49,198,204,24,51,51,196,56,198,152,153,113,125,191,125,217,135,173,146,74,209,164,198,53,58,234,211,167,91,227,84,96,88,189,121,232,209,56,255,194,227,1,63,193,254,219,
+53,216,70,222,78,166,12,194,164,55,231,42,78,248,165,74,145,167,33,202,235,92,228,124,159,9,212,54,108,122,154,187,0,99,97,151,143,238,139,68,103,190,195,255,88,127,7,153,83,147,58,110,87,135,243,212,142,78,144,95,139,148,71,47,225,242,153,101,66,14,53,39,76,39,98,227,97,104,191,223,129,157,215,28,205,19,158,39,59,54,249,154,125,165,216,211,137,121,116,152,174,12,118,38,227,181,64,102,121,214,105,129,85,38,122,91,101,57,54,197,127,98,83,186,92,74,119,226,165,118,39,212,79,92,231,111,117,238,21,20,126,242,29,243,248,39,216,8,241,64,95,203,162,228,80,225,95,178,129,233,166,196,17,98,25,6,30,4,13,70,68,192,199,128,46,194,242,9,48,42,244,112,36,88,56,246,213,3,175,34,192,15,4,173,220,24,142,11,112,26,161,13,244,107,177,116,0,134,243,165,147,160,67,32,6,124,226,10,158,113,74,96,121,30,116,161,238,68,208,34,6,76,205,163,141,36,241,144,244,131,130,13,33,196,75,31,22,149,83,120,134,57,34,177,0,45,
+115,125,108,127,225,162,114,129,54,31,85,15,181,208,149,90,127,8,215,186,41,169,108,120,243,97,3,197,152,143,38,56,195,100,214,81,54,254,225,161,167,177,62,198,136,83,42,150,104,244,189,143,109,9,88,102,101,116,25,68,147,13,139,20,238,151,64,129,86,195,205,121,127,29,224,76,236,138,155,246,23,221,73,245,241,242,66,96,144,56,52,41,109,198,111,120,158,234,203,157,91,232,15,239,178,202,122,204,85,165,128,67,37,102,208,227,152,34,28,42,245,125,60,213,54,199,114,12,210,224,150,77,177,226,80,237,92,28,122,142,8,211,67,230,190,73,188,45,144,28,233,117,156,87,81,102,231,43,170,242,128,22,30,209,202,245,17,189,62,160,191,147,7,244,123,66,121,87,16,242,151,40,245,8,192,53,171,127,7,22,225,222,193,72,194,243,209,32,175,138,48,241,164,49,96,96,58,140,131,46,238,83,31,226,11,128,56,232,65,39,29,56,194,250,31,143,140,67,162,163,109,45,115,195,144,128,29,208,250,175,77,228,31,195,25,192,169,39,250,247,181,11,68,9,154,230,
+255,196,172,1,104,89,142,178,235,255,85,52,255,151,131,135,73,129,104,160,120,60,141,11,15,91,100,20,105,11,6,168,91,133,160,143,222,131,99,84,113,23,238,94,45,154,124,126,23,194,213,95,16,245,206,57,82,11,168,205,62,108,31,247,13,149,255,61,246,5,176,206,209,223,19,174,23,94,159,152,107,12,8,230,211,197,226,245,193,195,138,229,22,221,124,180,46,12,33,84,90,189,160,226,86,223,2,79,252,29,196,160,213,75,243,179,176,14,101,109,15,223,181,91,109,39,245,192,59,59,131,37,225,204,29,180,199,151,197,124,255,160,59,95,197,56,237,221,195,248,237,145,63,33,167,159,75,111,99,230,232,69,58,120,128,141,179,87,151,229,159,227,186,20,99,120,205,237,219,241,185,237,28,113,177,62,31,61,140,239,149,16,250,69,111,162,176,20,203,77,250,71,229,113,91,114,93,136,119,215,229,236,186,212,26,203,11,179,113,241,91,182,86,255,108,240,206,71,253,114,17,164,244,161,3,76,178,111,172,91,164,28,44,25,244,143,6,0,241,138,180,168,99,225,32,33,
+125,20,250,49,34,34,80,200,122,242,97,89,25,11,37,173,11,0,2,160,255,101,80,29,15,22,191,174,1,85,206,97,72,26,5,162,154,193,82,131,232,64,74,19,15,1,236,101,96,226,136,16,106,24,70,5,7,67,226,100,147,2,106,40,154,20,65,20,139,213,68,129,72,219,48,76,80,102,9,55,160,26,127,208,6,181,13,3,204,18,10,210,213,22,212,133,99,0,159,3,25,118,51,194,3,27,233,177,5,91,235,172,246,177,40,175,13,32,74,51,205,193,30,168,50,252,92,99,68,17,164,233,194,182,41,54,83,31,12,76,64,154,195,181,70,163,18,173,177,151,90,196,41,4,174,37,220,105,244,161,213,177,182,203,155,155,99,213,91,198,104,87,212,137,106,85,117,137,57,178,251,222,239,180,145,25,173,99,109,131,133,211,120,74,179,100,247,25,206,107,140,10,242,236,62,17,111,68,34,216,117,111,104,161,23,159,30,49,161,91,78,108,151,255,98,250,249,160,118,52,142,53,174,186,188,189,128,0,250,83,150,233,150,226,237,252,106,244,245,105,239,114,212,87,138,250,
+170,235,176,47,31,246,21,194,185,151,26,253,12,82,239,124,16,134,246,143,7,70,168,176,180,46,115,197,4,24,104,190,67,22,105,152,32,152,244,197,32,26,18,98,169,101,115,130,73,69,52,209,111,24,180,7,37,207,72,255,12,146,5,154,147,77,100,25,64,104,61,40,170,213,144,14,132,3,131,40,0,186,125,43,112,31,110,21,127,168,181,12,150,163,85,32,94,28,64,165,49,178,192,2,93,194,128,72,168,22,171,107,226,143,192,250,62,102,55,15,232,53,46,168,141,31,41,232,12,104,27,175,224,59,26,198,40,61,132,190,185,31,216,218,95,41,182,1,4,25,252,15,156,164,1,173,206,53,192,103,11,80,213,252,80,228,240,249,134,112,44,200,146,187,78,51,52,161,46,9,141,123,19,18,203,18,235,114,42,82,168,98,226,87,53,4,127,152,19,71,178,78,255,22,4,3,75,147,181,220,152,162,93,174,244,27,151,43,48,17,19,108,232,128,119,138,111,101,210,179,63,66,249,170,49,225,84,234,35,30,10,247,219,196,139,120,30,8,190,91,147,217,245,202,177,157,
+124,228,123,63,149,212,142,133,84,131,61,137,44,15,16,219,237,146,229,122,165,232,151,228,141,126,105,209,47,17,218,246,82,162,95,58,194,203,173,39,188,36,132,87,164,195,127,66,111,93,159,126,254,250,83,3,124,37,149,172,3,214,223,69,50,130,42,38,108,100,113,12,200,226,167,252,60,64,83,20,44,250,143,79,227,34,206,143,9,5,108,133,91,15,148,217,15,241,2,224,235,2,69,53,26,181,1,195,207,96,12,204,54,209,212,191,63,155,65,209,11,48,176,46,47,26,134,241,225,114,0,77,34,195,73,90,40,187,143,142,131,97,61,20,249,28,134,193,86,112,20,104,211,102,17,55,151,54,153,208,199,45,32,1,254,223,144,187,13,219,230,1,133,212,4,174,46,71,100,171,1,83,93,144,69,163,230,16,173,109,72,62,48,181,154,214,248,116,1,252,59,31,70,57,108,167,13,40,49,226,50,249,201,4,102,73,7,227,248,150,229,52,205,8,56,22,69,26,82,44,226,52,118,218,18,233,112,36,80,197,44,238,55,22,255,112,7,22,71,186,198,145,5,3,172,172,
+73,154,154,194,157,3,87,242,141,35,51,17,191,113,236,115,232,244,237,234,105,225,85,77,244,20,194,49,193,84,66,60,146,199,72,87,252,217,30,234,55,250,93,140,235,212,225,67,173,114,116,53,145,214,184,22,178,134,19,31,101,160,67,137,98,215,161,58,223,26,244,67,77,120,72,222,132,135,150,240,16,17,108,15,13,225,33,199,60,220,122,204,67,130,121,68,24,244,171,87,189,3,211,121,90,225,199,5,139,112,8,172,17,18,255,226,1,240,171,27,210,19,2,245,135,133,18,240,128,102,27,21,50,17,48,120,80,223,206,5,66,207,160,6,121,19,173,251,7,185,12,36,151,38,81,199,192,102,129,170,100,241,15,130,241,17,88,241,52,214,18,200,0,16,181,8,134,33,42,144,32,147,232,56,160,136,16,1,9,83,1,131,212,88,116,162,35,228,9,192,121,149,48,185,115,132,157,3,122,91,221,132,180,7,17,190,186,29,254,33,84,93,219,3,97,232,122,114,3,106,130,255,6,93,83,151,25,33,221,248,49,51,54,21,11,155,107,66,42,51,189,30,218,176,194,16,
+217,196,31,169,98,131,98,217,114,8,36,174,23,28,92,196,58,163,7,192,157,185,248,159,167,168,70,122,13,92,168,51,235,167,125,219,68,152,190,71,67,248,146,175,136,254,50,178,59,249,241,230,142,61,165,107,67,101,180,47,70,253,35,206,189,189,190,240,221,26,98,125,155,134,206,214,94,147,195,222,232,50,23,133,226,129,107,83,125,10,116,183,176,68,126,171,66,204,74,79,185,159,109,126,143,151,26,165,114,97,86,46,202,74,226,130,172,92,154,149,139,76,51,186,236,71,23,234,109,116,249,78,110,214,244,74,143,248,5,12,29,124,217,2,46,206,127,197,49,2,24,241,2,254,150,146,28,253,186,101,115,35,230,181,90,202,22,142,98,32,247,14,182,84,15,44,68,64,136,0,32,109,97,44,230,23,12,103,145,49,230,203,135,69,73,44,129,92,17,66,145,24,19,16,39,180,133,125,16,74,67,129,220,50,164,73,20,105,137,196,104,18,148,220,199,37,209,96,208,134,28,67,245,254,80,91,48,114,209,0,27,249,247,9,119,33,174,217,242,10,157,5,92,77,5,57,
+86,11,166,170,141,136,71,97,74,3,130,253,99,228,33,114,11,145,165,13,237,199,121,45,203,40,69,42,200,165,73,146,102,229,88,224,138,128,195,136,178,140,113,120,78,72,42,1,234,44,142,9,134,232,224,197,118,68,30,52,17,214,144,183,131,184,243,228,78,240,190,178,148,120,100,207,127,218,174,252,188,141,157,208,245,135,34,243,230,20,99,189,53,132,96,186,8,229,172,98,101,35,175,29,44,39,98,197,33,112,162,186,190,209,237,18,204,185,154,252,216,43,226,166,121,150,199,31,39,46,23,235,80,225,187,180,152,182,186,8,215,127,253,252,149,51,98,179,58,63,29,77,150,52,211,129,106,58,120,109,166,131,206,116,160,75,154,7,182,228,128,150,28,60,204,200,228,140,201,35,25,229,205,193,193,95,192,85,65,192,0,130,65,94,111,6,49,114,33,230,3,212,102,15,251,79,159,138,211,100,226,230,156,15,14,153,27,19,175,147,206,162,77,96,13,252,183,62,230,195,112,28,16,121,20,104,162,68,31,112,50,182,97,224,95,97,178,43,64,31,237,127,238,153,68,32,
+56,69,169,64,72,68,168,3,0,9,32,61,238,80,212,138,116,2,76,163,5,126,14,124,160,9,87,216,117,117,68,221,142,16,215,72,169,13,93,91,199,66,82,64,130,215,130,69,177,99,192,211,199,100,107,108,136,25,136,210,120,30,27,92,137,171,203,140,60,7,56,138,15,26,67,253,77,153,196,3,135,16,37,128,228,115,124,17,125,101,56,244,6,248,125,117,190,18,123,154,65,214,135,68,80,208,54,52,153,139,109,17,209,157,67,191,45,185,32,179,1,96,151,155,136,83,113,73,83,31,234,48,218,87,128,9,231,16,47,209,18,68,206,0,40,226,184,17,124,234,55,31,235,145,18,58,69,248,186,164,134,216,203,193,185,154,13,84,42,27,147,233,162,45,176,61,34,156,160,212,64,228,190,160,74,122,240,84,194,0,57,12,112,110,98,0,59,6,168,237,158,192,223,14,136,237,0,95,119,24,236,166,160,66,65,62,248,223,193,162,116,115,135,242,125,129,131,243,2,177,164,82,18,150,24,55,36,243,15,1,168,188,165,101,50,247,38,30,58,144,229,27,193,154,31,160,
+207,0,16,10,88,128,251,143,63,5,82,87,65,4,231,216,21,99,85,128,84,251,192,51,64,8,56,160,38,17,156,18,14,144,63,240,36,73,78,114,16,104,3,38,26,225,82,7,8,122,90,130,249,46,141,13,111,11,40,228,109,3,184,26,228,200,13,141,89,180,26,48,57,13,110,24,11,130,85,4,32,78,22,114,31,13,104,141,60,3,84,129,7,171,160,36,219,20,149,6,109,67,1,32,45,100,193,165,55,106,192,224,51,200,176,184,46,196,238,10,128,244,249,209,55,246,48,133,122,27,248,0,55,47,197,31,230,105,72,155,19,152,103,128,8,93,177,41,82,47,98,3,218,83,67,10,84,80,91,174,2,86,206,2,82,198,17,16,171,55,1,122,202,241,141,105,149,224,171,246,39,126,116,112,51,201,14,100,70,128,203,180,193,101,216,14,9,174,85,205,195,244,106,200,31,29,252,103,198,4,216,17,192,98,243,108,204,158,141,212,211,220,120,61,27,188,103,179,148,107,55,108,237,198,184,211,110,254,126,129,179,201,24,88,87,55,211,231,86,226,234,97,30,6,68,68,
+97,102,49,35,199,188,111,75,249,216,209,126,164,197,210,50,127,174,60,45,50,104,144,202,198,208,42,227,15,30,72,107,169,253,173,158,13,6,203,99,45,31,130,159,55,89,244,105,60,173,28,152,122,36,160,29,72,180,7,138,34,112,95,228,86,64,126,68,134,158,228,17,128,182,52,81,48,223,13,196,250,77,68,115,2,80,141,119,91,192,53,248,181,35,170,153,58,70,147,176,227,24,105,95,196,37,181,129,198,120,159,179,22,6,184,214,203,56,208,180,4,237,240,201,147,154,189,117,97,29,59,33,138,57,248,10,252,53,12,103,156,63,66,174,174,136,17,189,107,142,248,201,243,217,106,116,133,209,26,182,3,76,30,94,78,215,30,253,174,201,79,222,234,189,195,86,61,191,43,62,230,236,217,221,211,215,236,228,153,83,30,221,37,59,111,117,116,21,168,30,68,186,239,128,76,126,74,250,90,127,45,126,96,228,214,109,34,237,242,101,245,245,168,85,233,62,13,166,75,119,42,215,148,214,57,184,114,119,190,207,124,250,253,69,95,94,95,228,235,139,113,125,189,104,87,31,
+245,234,235,146,175,62,218,205,71,109,223,124,140,219,75,123,28,61,59,183,117,119,252,234,222,161,229,227,203,193,103,109,224,184,80,158,111,81,13,70,5,80,216,195,42,5,119,135,60,142,235,88,212,179,176,48,47,208,1,5,13,54,96,244,75,98,17,7,99,54,136,188,149,13,254,29,159,212,200,174,127,167,84,123,20,6,245,69,70,74,65,59,145,34,180,96,209,226,32,86,208,104,148,136,96,144,48,52,249,129,229,134,140,133,135,192,110,0,105,52,139,155,227,49,118,1,193,171,169,54,66,53,157,86,59,250,195,15,46,201,191,59,8,22,177,8,6,210,70,168,19,106,214,196,198,205,67,218,194,42,154,169,14,215,226,39,134,131,26,135,58,179,122,20,13,24,42,12,118,209,4,229,44,52,58,4,59,111,120,114,10,10,98,193,236,157,141,149,120,206,180,96,110,207,50,138,84,196,83,53,126,171,203,233,212,230,39,226,225,213,76,57,90,186,36,135,239,235,9,79,209,68,252,161,167,161,240,125,55,40,110,149,12,103,122,122,233,112,238,83,217,22,205,140,172,141,
+210,86,231,190,82,201,182,24,70,230,48,189,129,179,247,217,40,143,62,51,250,147,236,174,44,61,202,21,199,72,213,158,143,165,93,27,63,15,85,79,226,163,27,132,41,150,255,149,98,117,177,236,174,86,1,204,158,219,15,38,51,30,203,242,216,167,97,161,11,209,4,114,169,175,160,176,112,75,171,220,144,8,177,69,0,113,49,104,240,41,72,122,37,85,0,149,197,166,128,16,253,77,161,60,22,99,82,159,33,229,10,72,146,224,214,129,64,255,220,38,87,209,3,163,201,26,221,7,145,164,128,214,242,81,238,204,234,38,93,215,215,193,77,153,98,145,10,175,33,120,93,56,254,13,181,26,102,104,89,13,87,55,213,33,91,236,237,6,78,207,167,105,167,65,19,26,31,14,130,79,244,10,212,198,2,247,147,34,66,141,120,175,91,45,142,5,12,8,193,185,152,135,206,22,58,142,86,144,47,61,103,46,226,169,80,240,170,111,120,140,110,85,40,180,213,174,212,29,237,173,22,191,105,7,88,74,254,252,73,248,107,169,124,142,118,40,193,159,155,112,208,95,205,19,135,137,
+67,200,249,12,100,187,92,106,233,60,58,240,157,142,103,51,218,165,20,236,144,225,225,200,126,102,162,31,160,21,153,242,67,100,163,122,6,147,66,106,17,241,39,59,76,209,207,228,236,231,45,19,191,73,121,111,55,49,249,142,28,152,148,254,173,100,124,158,141,191,207,63,227,51,39,185,201,236,154,250,229,205,203,22,28,16,76,212,132,218,141,80,72,135,27,149,140,236,118,38,158,32,157,53,237,142,14,149,198,96,72,247,80,216,143,241,73,1,251,240,65,203,239,139,44,1,45,62,47,61,37,35,134,34,4,222,151,14,181,16,54,169,97,252,148,236,52,185,31,132,5,64,151,198,24,135,116,128,6,63,152,83,144,80,183,245,155,20,160,20,95,130,142,80,182,13,81,13,98,4,77,113,181,148,2,200,133,130,1,235,154,9,210,224,95,135,206,10,85,88,203,52,40,171,156,167,2,173,80,16,47,158,205,202,25,188,17,212,179,90,101,10,68,191,82,111,210,173,34,9,255,22,20,82,102,149,162,107,77,43,19,41,51,68,171,141,153,89,33,55,121,66,212,81,127,49,
+49,179,189,147,119,83,40,5,73,167,74,185,155,25,121,55,142,236,51,249,66,154,214,51,31,206,165,148,174,206,201,175,102,113,198,160,201,93,42,249,42,174,154,119,138,51,53,205,37,17,47,244,137,47,44,101,230,185,194,92,26,113,22,165,242,150,250,51,26,235,150,224,164,159,34,133,143,94,24,119,177,95,223,225,178,178,42,153,173,37,179,46,204,89,246,99,85,93,109,0,123,248,36,241,6,46,203,39,40,124,216,180,231,68,253,234,137,227,161,211,21,107,201,248,35,104,53,12,254,87,156,129,157,224,102,52,225,80,208,178,153,116,8,204,253,18,240,44,36,50,241,11,144,8,146,74,167,65,217,36,9,3,82,252,161,124,244,142,226,23,254,9,30,10,61,128,129,245,128,40,186,99,166,22,160,101,56,176,2,239,50,134,158,168,118,172,131,56,117,184,198,181,96,35,180,211,120,36,156,210,131,65,87,157,19,57,182,18,235,56,4,15,81,226,208,118,69,124,6,180,181,18,156,136,175,120,129,238,244,74,36,200,32,9,195,187,148,251,107,250,16,68,33,47,144,79,
+140,169,22,164,251,10,36,175,168,25,92,157,18,137,218,110,71,239,241,30,42,101,55,158,128,255,153,118,236,139,90,186,22,198,227,49,211,142,92,160,61,68,242,117,42,225,185,23,119,122,154,71,26,23,175,83,241,38,101,167,68,192,60,122,241,119,226,30,215,244,119,38,150,199,33,83,124,163,18,251,126,110,167,69,61,42,225,23,75,34,201,161,227,194,72,106,120,150,236,154,226,171,146,78,122,252,196,95,161,93,252,213,142,191,176,32,246,227,15,124,229,210,39,199,206,71,143,235,3,131,161,216,245,169,196,253,232,155,23,8,154,220,132,58,164,94,37,40,123,224,113,144,129,222,2,81,96,130,54,80,111,162,193,148,188,227,42,192,51,70,18,195,80,129,33,114,59,96,2,51,104,70,234,71,119,7,37,4,170,24,6,9,124,72,11,70,220,128,149,203,80,96,1,225,27,240,169,9,250,159,65,12,80,93,132,58,84,3,192,225,5,74,10,64,107,103,61,52,28,111,35,142,3,76,45,135,5,46,205,250,56,76,90,109,64,211,141,28,66,180,28,254,162,112,97,5,
+74,8,136,39,112,81,53,202,14,4,130,135,190,6,229,11,103,15,201,4,218,190,147,32,15,169,4,90,207,222,54,162,30,50,133,252,61,10,99,195,135,164,135,73,201,201,194,225,146,106,27,78,122,24,73,10,81,22,14,161,183,218,192,79,139,73,58,203,130,225,54,122,219,76,183,88,20,170,61,18,254,192,122,219,78,183,232,228,26,36,28,30,145,183,133,240,87,139,68,254,11,135,217,2,241,86,67,186,68,226,193,135,86,246,162,81,186,20,44,106,13,15,215,32,137,254,30,188,37,130,183,67,187,111,251,253,232,11,161,215,240,186,10,60,223,35,94,214,1,177,167,63,249,234,50,32,83,157,158,233,208,172,87,25,145,109,47,140,75,243,79,118,242,97,4,76,151,44,130,28,6,231,204,201,214,252,81,93,111,37,69,64,130,172,51,55,163,20,8,26,45,161,154,195,129,73,24,22,214,250,0,182,65,15,76,65,109,175,13,106,11,194,25,132,38,140,11,240,137,5,215,199,174,212,131,24,203,106,100,128,49,200,108,235,61,184,20,32,247,113,128,81,112,254,149,87,
+134,169,1,174,160,175,208,13,131,254,64,4,23,224,164,59,12,167,105,133,128,126,126,245,194,34,134,43,219,203,233,38,146,157,247,159,209,202,110,58,19,39,126,134,203,45,91,213,138,248,179,70,117,151,95,196,173,173,159,233,16,38,90,178,156,124,165,164,156,7,93,244,157,92,127,230,23,147,151,232,212,101,186,215,92,116,251,28,89,185,37,222,243,146,124,103,196,159,136,210,208,167,223,117,169,119,215,55,166,205,132,175,14,169,159,115,68,124,247,160,243,207,44,224,147,110,228,66,134,227,77,118,188,111,159,97,232,246,255,189,221,254,158,219,223,119,119,252,127,238,119,240,252,62,227,255,94,76,193,93,216,185,190,79,234,253,123,172,143,69,238,131,195,15,189,238,104,235,211,211,157,193,187,208,114,7,40,250,136,16,92,176,216,35,72,148,220,36,67,83,196,186,145,241,79,191,48,164,179,166,104,102,112,211,2,65,54,69,170,96,226,228,112,1,37,140,66,131,81,40,128,12,85,128,30,129,210,102,208,98,32,23,51,131,250,131,61,27,73,55,151,81,23,160,99,120,
+208,232,255,3,95,193,205,0,7,41,117,24,86,189,56,117,70,28,168,25,85,228,125,104,143,174,87,25,168,170,128,130,166,223,26,248,138,13,62,105,36,27,0,237,25,47,54,213,68,169,244,177,58,230,128,158,7,83,77,72,155,211,93,133,78,188,253,201,219,126,108,70,113,116,82,173,239,103,32,133,158,195,235,71,72,107,113,83,156,188,244,179,91,128,106,19,35,122,79,76,178,16,199,143,129,210,208,245,189,107,211,157,206,21,170,109,135,235,155,183,159,90,70,60,71,228,113,199,54,224,82,111,218,16,178,67,143,109,49,225,83,61,22,82,187,250,230,85,109,247,168,233,30,57,214,181,43,114,126,134,247,212,103,96,255,140,237,159,137,208,167,239,159,217,206,254,9,157,223,184,181,235,241,187,85,91,59,244,205,174,86,116,249,95,29,67,96,241,71,33,251,130,69,31,77,13,78,213,71,253,165,38,17,156,72,235,77,253,57,37,112,58,135,96,14,101,138,224,176,188,255,67,211,58,73,55,54,49,14,150,133,0,208,127,50,250,150,22,128,46,32,228,196,160,55,3,
+160,118,120,94,239,81,150,80,29,222,134,182,89,3,46,201,73,11,174,48,13,144,47,222,39,115,127,180,16,184,252,147,184,102,26,225,55,220,99,129,157,37,32,217,99,209,6,241,79,209,88,177,160,82,148,105,17,30,179,16,33,132,41,38,162,125,180,95,3,7,122,169,164,185,126,97,2,95,203,8,130,252,68,119,58,160,249,223,17,47,161,6,200,235,219,31,240,240,162,223,121,168,206,146,0,162,148,196,6,226,239,1,57,191,205,79,46,50,209,161,197,116,173,208,113,222,25,78,112,67,98,130,37,120,192,8,108,67,74,192,145,61,183,6,110,179,126,199,175,93,8,169,198,35,22,241,13,32,185,234,150,240,231,72,237,31,203,228,254,241,179,231,245,101,174,87,223,245,2,92,77,223,192,229,27,187,124,137,161,203,55,112,248,122,39,199,43,186,125,160,7,237,11,63,182,229,210,195,214,238,127,252,183,130,218,155,36,238,120,244,59,172,143,231,100,106,10,85,175,27,160,121,243,97,204,147,54,24,138,208,176,134,130,210,83,104,150,17,62,32,153,135,136,116,146,66,
+0,25,95,40,20,202,93,63,156,192,128,249,130,50,87,179,112,94,85,143,136,52,193,77,0,91,104,6,236,191,159,236,45,252,14,254,203,94,218,201,244,47,123,131,16,72,144,139,220,3,213,149,176,15,46,1,152,116,114,113,161,2,60,92,98,33,21,21,23,48,92,106,25,50,163,194,190,47,163,31,14,64,41,119,191,196,118,126,163,151,94,0,95,239,52,164,182,51,214,160,39,127,63,173,241,23,198,243,81,99,93,212,50,7,63,209,254,126,238,165,77,24,144,189,181,6,63,165,46,52,97,22,68,216,233,14,209,221,189,190,167,190,251,122,34,215,254,140,189,219,207,52,215,187,165,253,114,178,206,61,247,138,224,137,57,230,94,236,63,127,216,188,234,2,141,220,126,249,87,114,156,204,173,251,84,191,124,50,9,207,63,194,211,22,35,60,239,132,103,211,77,120,206,9,207,84,59,115,255,115,159,114,167,229,234,221,182,190,167,181,151,220,205,191,175,171,164,103,242,253,143,0,53,105,227,143,73,202,72,135,77,114,19,110,44,189,49,8,14,99,175,193,64,200,109,27,
+65,1,60,66,6,213,12,32,1,198,21,6,69,56,3,134,58,198,194,129,191,186,216,138,1,9,35,134,144,165,170,7,12,167,62,217,122,68,46,204,54,9,137,126,252,151,178,134,240,180,61,208,65,232,160,112,175,141,248,40,21,132,54,110,188,26,144,227,254,168,202,54,224,21,129,165,140,198,37,53,98,65,45,75,98,36,36,181,210,11,192,194,161,117,80,160,164,171,187,64,183,72,149,227,203,107,76,62,176,151,38,153,219,73,115,74,163,213,197,234,190,3,41,48,241,8,15,220,90,192,115,134,16,96,180,185,75,213,26,123,204,165,190,163,248,220,189,129,214,222,156,221,221,25,252,174,119,218,115,245,82,109,122,230,58,65,229,168,168,221,160,115,175,38,107,237,12,26,223,187,140,174,230,168,166,120,243,106,132,112,132,196,110,4,207,192,155,50,10,122,117,74,110,221,200,45,27,239,239,142,245,229,152,63,95,254,218,109,169,63,206,249,191,115,166,187,154,59,105,155,194,69,253,237,26,60,207,37,219,241,220,172,118,191,181,162,199,63,229,210,130,51,176,145,86,207,
+198,102,213,163,140,224,33,28,202,21,143,44,93,131,1,253,196,142,247,9,29,19,217,145,0,137,95,83,58,252,71,54,201,180,198,52,131,106,132,241,57,216,31,208,230,215,19,94,246,64,16,194,156,89,248,61,65,234,255,96,215,176,5,131,136,57,191,80,175,146,63,176,3,167,118,11,20,90,123,138,107,177,192,161,51,102,127,248,174,156,54,65,21,65,154,196,216,79,67,208,6,189,17,23,22,247,83,95,44,112,8,209,79,145,80,92,218,175,180,3,1,135,39,83,166,171,113,11,124,231,119,8,244,1,165,109,67,82,76,220,69,103,240,80,234,157,210,206,200,124,164,246,190,223,17,251,146,52,123,122,229,95,193,94,75,188,48,42,72,79,10,10,155,59,191,115,214,214,160,177,218,181,116,103,7,163,217,74,85,117,132,145,34,182,131,234,7,206,172,177,53,170,39,244,27,45,243,172,99,138,78,186,207,240,119,134,232,254,78,255,218,222,191,170,191,126,141,188,239,134,241,97,25,92,123,254,216,174,109,27,113,151,186,84,173,201,248,182,233,182,194,85,211,215,177,61,
+86,199,212,78,169,75,173,71,54,173,255,55,184,127,194,254,153,143,180,65,218,76,129,88,196,201,175,235,70,128,38,82,69,67,185,124,75,71,138,38,154,139,38,221,49,112,133,126,17,38,234,161,201,120,5,132,242,195,8,60,97,196,75,128,175,166,50,55,117,183,16,85,180,132,26,136,102,23,245,99,73,52,64,115,36,170,101,65,84,127,53,118,84,218,130,99,4,36,201,58,169,191,7,8,105,73,210,240,15,119,36,178,113,74,73,131,182,225,175,33,135,202,142,6,81,90,86,20,166,16,139,167,73,146,135,206,65,144,192,35,149,240,128,78,123,129,55,62,80,14,197,92,215,140,66,191,225,172,111,145,190,217,11,251,190,40,254,146,158,146,25,54,191,37,113,86,111,143,35,216,103,214,68,135,2,137,138,29,150,160,129,43,103,108,15,66,172,213,46,125,118,40,206,77,183,226,211,184,247,79,119,43,230,238,246,167,43,52,110,197,240,211,83,110,5,214,244,233,110,197,222,189,86,152,155,255,26,179,212,84,116,109,25,255,108,205,125,53,108,79,195,109,116,91,165,14,
+25,70,106,170,209,149,152,77,69,63,103,79,11,215,156,215,209,53,189,77,74,7,183,53,243,190,139,55,126,127,39,254,62,254,43,192,97,58,11,31,133,246,3,133,143,189,72,105,252,18,72,79,229,62,68,233,169,223,68,113,66,140,255,154,56,4,124,33,73,1,25,67,146,104,88,43,38,125,81,9,31,252,5,42,2,102,15,212,38,192,183,200,234,39,119,73,206,45,181,98,5,87,201,236,45,158,108,197,84,73,170,45,155,162,53,50,200,232,45,88,154,134,126,28,90,116,44,15,88,88,148,30,21,216,65,112,210,159,1,43,143,114,96,62,238,86,98,224,17,208,56,40,160,99,141,0,238,61,40,156,140,86,220,238,198,32,16,24,91,220,195,22,247,77,214,243,183,244,218,133,50,127,52,192,130,61,62,231,136,186,149,0,58,118,97,13,76,143,176,209,215,138,8,150,11,206,122,205,89,47,109,156,245,138,179,94,176,40,235,53,107,189,100,173,167,43,214,103,246,189,166,176,190,151,220,239,21,23,252,189,224,126,175,185,223,162,255,102,185,53,133,157,91,178,115,43,
+118,227,221,54,9,58,38,129,174,97,122,121,166,143,173,191,116,121,42,182,238,76,102,96,231,70,191,237,120,178,112,205,242,183,13,175,167,167,247,72,33,182,210,31,252,192,191,100,189,205,57,200,251,244,207,0,247,49,7,3,63,133,157,56,62,146,183,45,142,148,81,90,121,74,236,148,252,141,18,174,242,77,69,50,152,195,40,204,39,115,181,120,48,101,96,190,240,49,6,239,63,244,161,120,153,79,189,208,234,194,138,68,119,248,177,103,97,117,186,251,143,245,194,146,120,119,172,3,71,194,218,114,23,180,7,244,33,25,88,8,55,3,156,52,186,96,76,24,192,81,120,93,204,10,248,255,69,238,75,200,133,64,31,207,166,222,16,8,221,174,55,223,60,143,221,28,215,142,219,167,212,102,42,103,49,47,243,161,239,23,253,146,152,23,252,160,220,249,152,107,156,142,185,32,181,253,212,13,218,79,41,255,25,2,111,128,216,251,29,123,131,214,177,247,185,249,254,187,52,223,220,86,163,218,237,182,170,221,122,177,219,93,22,187,205,98,183,93,180,117,59,197,110,163,216,189,
+183,202,221,122,89,216,125,151,133,237,178,240,183,76,124,187,84,239,81,232,253,152,133,222,37,196,43,198,192,63,207,220,219,218,222,62,116,191,231,254,86,237,245,246,233,223,49,215,203,191,158,223,252,218,185,223,215,40,189,75,156,151,93,175,185,172,255,149,222,165,62,160,41,77,173,44,240,184,91,56,79,14,234,51,131,34,15,148,89,60,142,124,158,159,202,180,232,159,20,238,203,72,78,197,13,148,47,131,15,91,19,27,107,219,95,158,161,41,22,150,150,6,91,144,33,137,68,108,31,198,107,67,184,58,227,199,215,178,154,195,127,97,35,219,2,104,14,114,143,202,219,177,197,113,192,34,201,103,192,142,127,97,187,214,89,32,22,92,138,202,217,113,102,68,64,116,73,85,240,94,208,43,31,171,28,119,94,131,93,132,148,206,17,175,182,219,85,3,42,122,246,74,126,49,74,239,4,161,96,57,249,72,19,247,218,21,107,254,107,111,36,16,180,173,94,182,247,170,195,88,173,24,171,23,193,225,149,187,173,242,183,219,169,114,27,85,238,183,79,229,182,169,220,174,183,202,
+109,82,185,61,98,191,219,34,118,27,196,238,166,95,236,182,139,221,238,165,216,109,22,187,189,250,235,125,212,62,239,93,171,163,242,216,38,206,93,107,111,245,216,213,79,125,29,126,233,233,84,220,23,25,238,153,104,109,119,107,199,195,251,183,242,180,168,239,114,101,165,189,174,110,252,98,159,63,171,108,129,163,116,105,225,237,47,115,232,63,169,68,81,164,78,103,191,41,70,89,82,74,121,247,35,184,47,139,132,65,226,200,73,194,222,7,104,90,19,158,25,233,45,37,166,98,134,48,231,90,229,224,160,237,35,76,218,143,244,16,175,53,85,195,117,145,105,142,214,98,140,112,121,213,195,162,2,102,192,139,176,102,98,138,128,12,205,10,92,56,91,3,2,242,225,56,38,23,17,162,1,164,222,164,179,179,204,160,34,225,65,236,230,84,58,237,12,55,15,117,93,206,150,54,112,36,140,97,244,11,122,49,239,44,118,115,193,122,46,0,43,205,77,142,178,89,31,232,52,25,169,46,19,218,0,160,212,254,93,218,175,75,143,61,179,245,91,110,117,222,229,86,35,223,106,229,
+237,173,122,190,213,205,183,184,205,124,171,157,111,253,38,106,173,78,173,213,168,13,91,173,90,171,94,227,217,186,53,94,187,196,251,253,220,233,82,56,189,138,172,211,170,184,94,51,251,239,129,122,140,172,100,206,33,13,103,93,181,118,117,179,153,175,94,121,216,36,191,215,97,100,127,166,103,122,194,154,229,221,42,60,254,74,152,177,93,115,17,210,255,87,231,193,251,165,151,6,19,70,39,14,191,38,70,121,251,166,252,25,194,40,222,39,49,109,90,240,2,37,140,132,150,50,22,51,2,118,163,118,176,102,111,105,182,133,85,117,197,92,26,146,53,104,200,185,182,98,144,120,62,250,134,225,130,169,35,118,67,128,19,187,168,157,10,67,138,19,188,168,167,147,143,13,11,194,126,34,161,104,144,197,138,56,212,23,178,1,135,8,0,250,237,76,199,2,61,227,132,140,154,120,128,216,221,234,137,96,216,172,224,93,182,85,229,59,168,89,86,82,38,221,2,126,241,201,111,75,196,66,45,88,169,5,179,207,0,141,113,213,127,72,174,26,201,173,63,25,248,138,23,95,105,111,
+64,127,237,227,189,125,156,131,218,199,125,251,56,104,131,142,207,246,113,217,62,130,142,153,227,40,115,188,130,50,199,105,230,184,205,128,142,189,204,241,85,57,130,86,149,227,169,114,28,111,42,199,91,229,152,82,119,103,101,204,76,73,175,100,136,26,245,186,86,238,198,244,95,190,223,194,211,186,215,222,250,191,199,169,201,61,163,142,42,93,70,37,254,238,84,159,219,196,209,147,251,220,163,5,222,229,231,127,2,15,110,42,170,242,60,178,121,168,229,239,228,52,249,181,102,14,155,164,18,134,33,132,87,211,12,23,173,64,2,13,58,180,132,121,237,65,24,34,173,109,113,113,85,1,103,170,81,100,222,201,206,54,160,26,20,168,105,3,167,180,114,24,81,231,132,192,13,196,141,193,105,251,23,55,71,114,42,250,196,205,237,72,162,121,6,66,52,48,209,219,108,16,68,144,100,146,242,14,176,117,16,52,233,70,183,31,25,114,49,235,22,177,223,31,87,144,121,241,122,229,15,43,218,219,42,47,125,160,28,25,63,50,39,241,163,210,102,24,186,194,46,161,43,234,183,230,
+219,180,106,62,208,185,70,183,159,171,244,207,112,102,86,13,205,121,178,57,79,37,185,243,127,237,60,215,36,231,192,76,253,222,37,213,187,157,122,247,46,98,118,125,204,238,231,141,217,181,48,187,5,166,187,75,99,118,53,250,104,57,29,141,84,163,81,78,152,74,10,25,116,191,182,175,241,119,171,47,183,236,250,184,37,174,35,202,78,183,151,143,148,169,100,78,202,160,189,155,229,215,181,90,184,198,34,163,183,213,122,89,191,21,243,174,48,39,123,63,255,213,133,6,102,184,115,106,67,136,175,196,47,133,193,34,11,198,228,143,124,163,56,65,242,200,223,150,100,140,142,210,219,186,91,34,117,107,143,75,130,248,129,181,38,208,141,0,172,238,154,227,141,90,201,99,1,183,226,192,140,75,140,241,139,5,140,130,251,144,144,134,176,247,89,242,212,16,225,180,224,17,69,192,193,10,157,148,67,169,246,3,181,5,50,133,252,16,26,22,145,178,25,94,121,228,141,28,205,92,185,153,43,113,242,64,180,227,136,199,17,17,124,124,18,180,179,136,187,133,223,131,92,160,116,148,
+95,169,155,75,230,133,26,122,90,84,127,157,218,77,34,207,213,209,185,54,18,191,207,247,51,131,91,159,219,86,72,143,128,114,192,56,219,237,138,53,167,199,230,246,158,30,153,120,121,6,160,54,163,17,143,183,227,131,209,177,0,151,137,23,104,145,146,165,53,28,196,238,156,200,213,97,95,28,133,59,134,103,180,68,169,137,215,100,72,18,41,37,83,206,167,235,40,183,236,179,66,31,85,242,149,194,208,226,232,242,239,188,219,188,135,176,65,156,62,143,183,85,230,83,165,69,233,13,94,154,243,111,255,158,133,255,173,66,174,251,55,214,185,199,254,154,177,37,182,25,11,103,249,220,75,150,203,205,242,184,89,163,77,59,254,100,14,124,94,172,177,27,249,90,247,193,225,179,241,113,19,187,19,94,150,199,203,114,120,151,19,191,119,226,245,78,130,219,206,225,254,237,242,234,153,203,14,214,182,142,172,177,103,73,226,94,0,236,206,175,99,203,179,107,149,60,155,150,103,219,106,29,207,173,97,38,40,236,70,83,170,180,42,30,184,127,52,176,242,21,165,133,34,93,76,191,
+76,123,66,211,18,99,161,246,165,189,208,25,55,228,207,68,71,70,202,33,19,60,230,33,213,222,240,15,72,188,207,83,241,197,194,237,177,79,27,95,201,72,148,178,21,239,194,121,97,55,236,223,127,156,192,163,228,218,56,164,155,6,134,186,9,139,5,15,20,72,46,88,20,40,138,58,50,2,72,176,208,64,189,32,57,212,13,180,145,23,126,30,178,52,208,143,46,99,226,66,229,96,13,189,156,22,106,221,110,5,117,119,78,11,161,151,246,48,140,86,40,103,84,178,20,44,208,211,138,15,158,84,154,234,11,243,44,223,198,121,42,125,161,200,48,134,101,42,205,87,228,21,57,42,85,137,190,134,167,253,135,197,120,226,152,88,71,69,212,131,238,241,214,253,56,151,116,165,206,161,157,176,223,94,248,51,37,14,55,74,91,16,214,49,149,133,94,194,114,175,82,116,171,176,217,93,88,78,178,101,55,213,186,250,13,107,206,125,184,102,251,29,166,59,214,201,97,166,16,124,191,191,229,38,37,71,68,208,33,124,242,254,72,242,117,67,68,124,94,241,193,138,161,22,102,252,
+48,198,216,121,73,49,18,138,29,18,247,128,58,210,157,127,107,61,18,178,32,39,17,85,82,198,177,30,213,58,188,2,126,178,164,224,40,112,2,238,26,19,9,130,53,33,85,212,67,28,151,94,127,73,55,40,48,46,44,90,129,144,1,8,241,212,45,221,3,200,192,9,253,126,32,39,65,189,173,190,139,217,115,170,6,190,14,154,255,109,143,16,182,245,196,232,194,53,140,192,8,251,13,149,119,127,30,5,102,87,148,29,212,146,165,139,135,229,198,43,115,130,232,95,118,128,73,127,91,151,248,220,117,144,163,118,46,48,187,254,140,141,198,188,91,99,238,225,44,83,133,219,48,210,107,220,138,115,173,49,129,168,113,13,160,171,139,223,253,238,204,9,103,199,160,125,92,93,148,154,78,15,211,181,59,251,58,253,197,220,209,116,38,152,154,123,48,182,102,47,154,191,7,252,100,126,133,217,254,53,46,243,151,9,190,31,223,242,172,73,9,52,215,3,8,228,107,192,13,90,24,61,253,3,255,19,182,75,206,158,47,25,42,220,145,136,34,3,252,214,74,15,124,7,201,126,
+173,43,246,7,1,157,141,66,87,164,35,57,132,175,32,174,19,101,103,211,168,78,16,31,85,204,219,128,8,163,159,73,203,113,217,128,145,44,74,247,0,20,15,211,137,225,126,3,32,2,168,147,91,86,160,94,153,52,59,112,79,0,228,36,55,104,134,3,191,139,127,175,145,234,237,77,97,238,99,113,180,57,112,165,84,199,228,249,246,143,123,164,244,240,186,250,109,128,237,176,40,233,248,125,176,135,41,109,115,40,58,115,233,99,114,139,13,39,125,237,83,87,245,45,204,173,56,199,162,237,171,209,104,152,17,240,14,65,63,164,175,147,52,182,249,4,131,119,244,159,122,87,93,168,169,206,113,199,47,247,160,157,173,43,205,196,234,10,103,117,14,116,71,66,157,42,173,2,168,66,197,217,183,18,234,244,168,244,212,34,223,251,68,127,219,30,219,41,128,183,198,207,44,178,75,155,12,200,146,124,134,34,172,46,13,43,41,24,6,124,76,128,220,45,173,217,193,67,64,161,197,24,58,212,117,224,203,255,9,71,24,149,218,137,75,195,167,102,7,17,217,69,172,163,88,105,
+217,160,58,225,101,28,113,215,66,2,101,72,26,248,9,111,92,55,92,122,242,169,206,55,149,212,4,50,66,247,73,226,169,32,208,110,25,21,112,219,0,21,91,124,51,238,2,156,177,138,156,114,91,224,54,245,148,241,85,79,89,109,39,187,32,101,224,151,218,38,64,176,130,9,36,127,43,73,246,171,89,150,207,111,193,205,171,175,31,62,223,113,42,148,244,19,153,70,255,177,141,201,118,97,27,252,97,243,247,209,24,159,92,32,255,29,234,108,190,99,23,29,101,39,34,233,202,5,160,78,78,137,247,72,152,16,165,141,37,170,124,114,73,248,167,137,123,230,109,204,136,182,166,20,147,57,77,160,222,198,223,18,91,109,74,42,182,201,98,223,60,24,117,55,250,78,199,177,195,223,103,111,142,150,228,65,226,178,157,196,250,129,193,216,147,66,97,98,31,250,144,198,191,61,210,142,8,52,56,98,226,195,216,95,98,45,173,254,197,145,89,180,104,4,139,8,134,47,233,78,12,82,238,96,225,19,16,146,86,107,18,172,9,74,189,251,63,228,145,47,56,127,39,36,22,24,
+236,144,98,254,145,7,213,55,171,18,39,1,125,221,41,39,91,128,127,97,248,54,202,193,92,128,191,9,179,203,0,254,67,27,231,86,24,254,1,132,219,36,66,49,90,100,57,235,156,141,140,3,90,141,105,192,151,209,178,113,139,217,132,131,43,248,100,116,44,76,92,161,112,80,99,108,216,43,127,92,91,24,177,20,147,197,247,240,152,136,83,53,164,208,83,220,239,109,23,255,136,135,134,164,93,177,197,153,186,226,20,91,178,52,37,75,91,92,131,177,22,23,120,75,67,138,61,86,227,58,107,113,89,192,151,127,165,57,29,217,30,99,196,107,140,67,196,41,51,43,139,247,115,209,161,222,99,126,122,27,247,111,208,173,134,117,76,144,190,184,192,141,6,54,140,206,135,63,39,60,20,134,155,37,17,249,62,242,213,192,22,72,2,78,50,118,229,68,215,104,208,95,114,36,243,109,146,96,13,194,17,54,155,55,26,248,232,16,33,47,54,80,124,73,15,136,64,122,209,26,72,195,61,30,187,132,220,128,7,57,41,216,144,13,136,145,251,41,76,173,178,11,147,135,90,127,
+232,157,163,28,94,3,97,180,80,185,232,239,66,214,130,228,230,137,39,231,248,217,19,54,73,45,107,11,163,3,141,149,64,96,66,42,131,176,135,87,107,71,198,150,61,192,200,181,206,176,196,186,240,39,100,219,144,116,90,174,25,142,212,245,192,115,183,163,203,89,153,17,119,179,174,39,152,59,62,162,118,101,129,185,181,189,211,56,229,168,80,86,70,216,136,171,237,69,83,142,206,141,167,183,34,53,153,222,31,115,188,49,239,47,70,134,243,65,119,242,252,112,240,59,151,28,101,131,95,1,218,77,115,73,193,11,121,110,84,116,153,90,119,55,108,39,255,55,193,245,250,88,84,150,221,9,206,151,36,164,147,156,2,148,66,94,28,188,8,59,71,64,168,58,116,82,217,5,45,218,113,66,167,39,40,8,95,80,140,14,65,200,111,24,179,8,125,90,98,241,203,143,203,130,61,129,34,85,93,3,209,4,168,146,13,220,2,64,181,208,134,181,135,211,129,43,6,16,164,76,152,177,181,206,219,15,22,0,27,144,180,249,41,239,97,65,205,167,90,30,135,47,214,127,74,46,
+32,201,248,247,149,156,63,45,173,197,225,216,17,200,104,224,203,106,233,227,55,248,230,79,136,65,74,167,41,28,11,12,161,21,107,95,169,175,28,101,102,205,32,111,105,241,106,255,117,76,241,102,22,100,35,243,43,182,125,38,178,114,224,65,153,185,208,86,94,8,54,203,254,88,149,98,79,77,41,102,198,196,127,205,152,56,22,19,223,99,88,241,67,117,241,23,213,173,61,6,18,4,184,193,33,87,13,234,152,31,224,83,234,111,146,222,112,118,11,99,150,92,123,39,160,254,22,100,47,194,246,194,89,66,31,103,146,114,77,7,138,143,12,103,23,18,110,213,63,252,147,107,190,3,10,23,7,196,132,54,73,176,116,171,188,50,1,212,13,195,54,192,13,163,65,183,65,216,3,10,108,30,132,255,33,183,98,166,153,1,81,93,150,49,171,252,47,52,5,160,13,67,56,51,8,201,55,32,161,61,204,234,64,142,117,199,32,91,4,42,49,0,4,141,101,129,41,181,193,141,147,245,217,255,116,16,40,24,250,4,2,23,74,8,141,69,105,30,207,83,70,19,120,176,123,176,
+203,72,24,254,100,245,39,5,188,112,17,78,2,164,251,77,128,46,99,193,234,160,1,164,182,134,171,163,222,154,96,170,92,200,81,193,1,240,170,75,146,246,0,245,48,62,43,92,200,223,193,215,124,248,94,9,224,222,137,143,176,184,240,101,168,252,183,202,63,240,108,19,66,199,224,146,87,41,1,222,206,228,137,63,179,167,4,156,7,17,142,64,129,211,80,154,141,84,89,195,224,248,123,2,227,23,165,212,216,1,70,32,171,10,58,147,8,10,214,140,68,200,251,132,56,229,201,203,250,207,170,127,130,234,37,84,103,80,25,144,147,127,187,46,181,226,135,141,127,47,56,190,180,133,178,169,14,193,2,65,212,143,74,7,190,26,144,164,49,122,15,68,121,249,32,104,186,7,48,105,1,14,166,0,61,100,6,194,52,154,133,72,149,96,50,108,48,187,56,12,7,30,153,196,71,34,136,80,232,8,166,202,175,49,7,118,21,226,85,4,136,170,124,124,249,153,64,248,138,70,224,94,16,45,191,242,160,27,109,226,195,88,248,101,56,135,0,57,198,192,243,70,40,112,236,137,
+102,54,195,166,111,216,28,12,165,205,196,176,89,27,72,48,63,252,29,250,32,255,28,188,58,253,83,92,239,70,229,21,148,241,212,166,69,242,145,185,61,10,143,122,227,227,144,38,106,167,71,198,255,178,25,196,184,23,247,201,243,59,5,141,226,163,91,175,208,48,108,67,128,75,111,208,97,210,22,110,46,103,18,97,89,197,44,94,124,81,164,153,4,82,138,6,140,99,89,4,235,207,121,0,95,141,5,212,240,6,88,109,32,224,24,233,178,164,14,218,36,13,239,159,12,248,183,79,125,227,242,164,216,139,62,29,188,105,44,24,117,27,123,57,123,59,34,151,253,24,0,229,161,208,120,190,34,209,210,119,158,44,235,158,134,66,207,142,120,226,93,63,187,77,246,219,207,249,238,126,178,246,37,14,103,254,205,77,124,102,249,200,151,45,244,214,164,10,221,254,193,206,125,178,241,209,55,180,208,253,227,30,106,156,103,37,250,22,210,131,239,22,240,158,253,110,252,150,203,154,253,144,95,75,27,166,138,238,68,193,125,11,37,238,123,251,113,25,134,86,162,35,44,125,176,77,
+248,145,154,120,230,69,124,230,251,108,242,24,140,117,5,99,113,146,108,83,140,77,72,108,16,26,57,10,32,227,185,102,93,245,180,32,15,48,40,190,17,113,199,83,117,200,179,57,193,46,41,12,149,16,177,4,29,101,54,82,105,14,208,117,36,101,192,71,175,255,59,23,151,56,78,58,144,156,133,164,237,129,106,56,3,130,183,89,182,171,2,37,237,222,100,44,199,46,17,188,88,201,107,156,227,128,23,240,111,31,214,21,175,81,181,56,206,23,148,174,3,161,201,28,249,140,118,191,177,133,218,224,112,228,62,28,109,68,87,25,172,245,160,27,43,247,177,68,116,153,154,96,109,177,177,242,11,23,14,241,113,68,250,174,46,104,55,3,94,87,222,224,245,8,188,118,118,142,231,240,250,254,117,110,11,43,202,55,86,174,85,137,47,191,159,221,6,51,241,28,101,98,112,52,183,194,56,101,143,225,100,157,58,50,102,45,106,144,96,71,129,4,155,173,156,176,102,27,84,122,242,149,88,1,222,112,116,72,170,123,226,72,156,183,193,172,123,195,247,56,242,4,103,172,25,132,
+162,100,105,24,49,226,75,9,190,46,202,126,21,143,50,196,60,108,180,14,49,85,16,70,199,253,50,201,13,40,6,104,23,215,90,136,159,130,198,114,86,14,234,128,133,5,161,238,97,5,119,239,144,12,126,76,145,249,22,67,67,17,231,48,192,71,132,16,200,239,52,192,135,65,145,210,206,11,186,22,78,188,165,205,137,119,113,19,61,150,54,178,147,245,218,67,199,245,178,118,111,30,58,213,170,215,30,89,47,171,139,59,247,236,197,223,59,78,215,115,189,244,217,111,205,238,125,214,189,239,186,203,251,162,123,31,230,238,166,77,238,126,206,113,253,85,184,159,254,17,60,128,107,231,86,49,227,137,141,69,230,108,159,16,248,158,65,206,147,96,67,188,33,227,44,20,13,16,9,128,41,253,20,174,80,188,94,86,65,7,160,169,78,210,120,70,5,69,118,196,45,154,32,167,185,112,115,130,194,46,5,88,203,4,26,250,172,205,250,201,97,57,68,122,198,228,197,35,178,33,204,43,126,168,123,247,21,244,244,100,227,0,68,203,2,99,160,86,124,78,17,144,5,189,224,225,
+15,178,236,96,185,55,68,55,132,12,61,27,4,28,105,209,61,2,242,107,129,0,244,188,175,124,207,243,223,218,231,70,30,214,238,183,251,212,230,223,87,132,150,247,124,23,184,151,57,102,219,245,183,250,221,219,133,107,39,247,212,194,223,151,171,27,223,157,253,211,215,10,78,205,113,165,230,127,223,225,217,103,250,239,117,247,204,95,134,185,207,253,61,207,10,33,66,121,153,61,166,57,12,191,108,219,239,93,174,9,81,134,210,123,26,71,141,26,143,20,17,154,47,255,229,33,113,13,105,40,192,82,65,17,69,193,146,170,148,120,101,234,193,66,128,61,145,24,155,37,85,49,195,26,209,48,75,172,140,104,196,102,212,62,169,17,250,48,149,93,133,147,252,123,37,38,65,67,7,96,85,208,67,103,185,69,227,2,238,31,79,121,173,112,69,240,4,35,205,249,131,123,217,240,177,78,210,59,161,247,211,207,25,97,195,59,193,19,52,24,254,38,221,189,253,48,253,234,240,165,177,208,223,4,209,118,197,148,246,108,65,188,183,172,93,215,198,137,175,115,19,24,173,118,108,175,
+151,78,107,181,130,99,62,169,31,203,224,165,99,118,230,89,221,191,132,154,155,192,116,19,150,127,110,130,210,77,136,153,220,4,100,35,198,108,96,98,47,218,35,153,28,217,178,224,202,88,170,149,8,176,161,180,169,158,101,129,99,56,106,143,193,55,166,9,236,40,53,133,136,118,193,0,171,40,125,70,89,130,30,101,154,215,15,70,127,113,217,104,33,213,37,67,5,69,209,96,195,69,36,71,89,116,142,40,24,212,245,160,58,8,94,30,216,58,112,196,34,82,170,104,19,65,26,125,90,26,205,0,226,43,96,1,10,57,219,191,3,35,18,24,186,229,91,17,209,35,217,246,239,192,232,164,26,252,234,151,36,220,162,209,190,5,187,4,29,243,16,91,212,93,231,69,91,148,221,199,170,198,193,188,182,110,52,44,182,170,78,119,137,204,231,213,6,199,146,177,69,117,186,224,92,83,235,218,42,203,230,204,214,89,86,154,54,245,178,185,76,45,155,251,101,179,100,91,54,165,186,230,83,215,108,50,155,182,79,41,6,214,197,143,34,75,231,191,62,226,126,60,64,168,192,21,
+242,86,235,26,178,180,108,68,73,14,69,248,186,211,184,39,87,31,76,224,168,80,65,63,64,78,93,104,233,132,107,132,219,68,120,9,126,0,213,9,237,168,50,206,106,81,51,183,58,17,189,209,81,50,182,121,73,131,180,96,211,113,128,224,195,186,63,177,196,135,131,56,136,82,24,172,191,82,210,34,39,43,172,60,165,7,0,13,167,1,245,248,123,146,216,186,79,5,68,172,60,231,174,15,118,109,78,230,97,225,230,186,131,53,155,115,191,111,182,130,11,118,211,206,78,47,155,227,170,110,127,78,49,156,215,84,203,18,30,173,90,38,251,130,125,156,219,51,71,238,184,241,200,236,143,138,107,69,177,116,206,74,143,126,233,17,93,148,30,225,193,75,246,50,118,107,44,127,153,181,254,212,92,127,92,149,6,169,12,61,119,242,24,15,240,218,38,19,46,129,100,151,193,161,92,157,201,210,168,188,101,151,12,58,37,50,141,161,60,134,144,230,54,113,186,168,34,144,219,77,243,136,1,191,174,212,252,183,188,186,185,247,111,125,217,34,27,202,248,44,16,148,236,15,152,156,
+216,126,194,168,83,140,25,17,156,21,45,105,96,85,11,90,1,226,225,113,212,166,194,104,193,152,162,1,3,171,33,25,74,154,138,160,1,116,11,214,186,10,213,103,121,28,190,43,88,83,124,252,46,108,146,94,114,74,220,73,169,194,106,88,20,99,60,89,149,24,204,90,6,43,98,193,154,217,211,71,238,94,209,192,151,50,8,85,242,22,42,91,123,55,167,172,119,243,173,110,182,85,241,102,90,221,28,43,151,220,191,186,237,188,79,225,23,233,47,17,124,83,138,133,15,247,12,57,226,138,6,28,16,21,205,167,146,115,201,111,21,229,13,186,123,162,226,35,24,198,76,109,129,181,177,184,184,204,188,35,199,71,111,148,172,243,43,58,199,85,100,109,231,0,83,20,143,100,124,240,128,210,8,99,227,9,202,68,117,181,32,199,112,77,51,202,150,5,74,64,13,83,151,124,112,73,73,64,183,125,42,7,42,21,1,48,28,149,51,32,13,72,224,127,235,66,163,240,3,225,4,238,229,234,162,171,188,181,183,104,121,149,174,42,126,41,90,238,219,117,76,163,138,207,120,102,
+3,106,163,254,101,203,218,190,240,199,217,128,127,108,212,53,182,234,23,62,83,153,13,52,214,65,229,205,217,70,56,219,43,231,189,157,114,182,91,206,246,187,199,217,126,174,51,109,243,232,7,157,196,226,215,7,157,135,116,51,87,179,50,45,185,105,113,217,85,52,126,221,178,140,213,164,203,23,154,184,76,153,197,233,215,44,193,250,95,226,235,172,215,25,171,84,172,229,70,151,245,181,74,194,114,206,204,75,6,96,142,202,30,222,227,156,22,32,181,40,154,227,96,5,13,206,121,210,56,48,42,41,158,93,228,7,0,46,132,135,144,251,109,63,142,138,0,225,112,16,176,85,94,33,222,2,223,19,176,179,61,47,215,56,62,234,234,160,157,54,131,77,142,220,119,164,207,126,43,246,61,84,81,121,14,212,62,71,175,210,245,171,191,155,185,74,77,63,153,87,15,163,138,230,86,211,220,212,54,250,51,69,127,238,233,205,167,153,254,164,210,159,4,41,253,5,78,190,115,119,249,251,71,158,19,66,212,111,218,167,76,136,6,163,198,135,92,251,103,202,204,86,57,21,9,214,
+8,188,158,150,147,39,17,46,23,119,44,207,150,169,57,31,87,137,38,171,114,186,97,224,156,150,236,225,122,126,168,69,89,104,148,76,199,60,206,47,16,19,68,70,28,40,133,93,86,248,73,81,128,5,116,84,105,96,107,65,68,225,115,151,131,108,193,33,72,184,122,165,130,135,128,203,196,155,58,176,198,84,160,174,32,134,57,105,21,142,36,53,169,237,158,148,166,141,96,5,155,172,225,56,101,87,33,58,106,67,191,186,85,122,69,55,159,49,143,86,123,202,53,27,181,53,163,87,187,98,90,141,40,171,119,132,178,250,165,172,166,111,202,106,75,89,21,40,239,85,144,178,234,80,86,170,189,188,253,97,200,251,207,71,219,192,27,147,38,89,187,156,105,42,99,181,4,111,60,78,165,21,151,101,94,210,100,173,209,250,79,166,152,215,224,42,106,214,168,31,178,132,235,195,176,150,52,151,200,7,2,139,49,246,21,49,227,216,21,153,168,26,46,77,48,40,163,170,94,201,138,156,113,78,108,16,198,88,49,146,104,222,192,41,162,135,44,128,132,7,189,70,5,202,63,148,
+137,184,135,133,174,192,23,65,45,80,134,45,239,138,91,181,51,62,55,88,146,216,200,22,154,118,54,103,90,143,88,66,121,9,177,141,131,77,183,87,244,180,138,116,141,102,222,215,202,251,234,249,176,175,155,247,149,102,66,223,151,149,72,111,32,147,237,229,83,126,210,23,239,114,103,145,251,145,166,217,86,50,162,0,98,238,74,95,72,131,100,102,205,120,197,160,175,147,84,37,157,81,222,104,231,140,148,100,142,46,83,48,74,58,249,176,33,171,134,177,42,26,27,119,237,31,139,188,193,136,97,52,127,116,21,43,63,78,147,213,5,25,71,1,196,209,163,25,207,200,71,68,11,113,202,132,5,194,139,217,156,22,13,159,17,253,59,134,101,126,169,5,101,188,43,160,12,52,85,83,208,82,132,183,60,33,12,185,130,205,170,69,45,224,232,53,3,253,18,10,107,101,112,227,154,57,103,120,10,142,135,83,162,148,51,211,78,118,218,89,166,167,130,220,84,144,81,76,5,217,207,79,179,162,32,51,19,164,103,62,33,167,210,226,87,30,190,156,38,33,132,188,165,114,181,73,
+25,208,85,191,209,153,170,94,167,104,36,204,86,117,85,222,200,26,100,241,58,249,51,143,203,21,101,57,43,103,141,53,178,213,156,130,211,251,162,116,25,229,146,74,193,162,218,18,216,25,26,193,51,254,9,44,34,193,0,39,113,145,163,6,177,12,193,42,155,44,40,196,56,242,108,127,17,143,18,129,83,93,230,30,197,217,124,48,13,85,55,11,220,9,92,55,21,177,45,153,60,94,148,239,69,219,196,89,96,105,199,185,16,249,47,13,61,56,171,97,142,244,139,170,145,247,231,191,132,154,242,50,71,155,41,49,71,170,109,122,148,78,143,161,105,243,248,156,30,189,211,227,31,179,52,235,102,53,251,111,37,176,150,151,199,180,153,86,83,46,239,48,242,40,14,171,149,207,196,116,140,41,228,49,94,166,250,118,104,161,102,195,105,152,100,185,244,185,174,174,100,135,106,180,236,154,204,150,89,127,56,121,166,32,181,226,200,209,77,81,59,99,163,196,33,40,14,220,111,34,102,127,7,113,167,108,9,125,125,173,202,112,151,161,128,52,102,172,80,91,161,140,105,228,247,180,
+10,9,198,9,66,191,144,71,190,232,68,81,179,203,21,29,180,70,85,171,55,59,74,241,216,47,30,31,69,229,17,199,202,123,249,121,138,151,157,247,114,242,94,52,47,239,101,229,159,86,174,216,101,23,223,118,63,165,99,10,93,249,36,64,56,245,47,1,146,10,114,230,207,108,23,174,108,137,16,110,78,40,14,89,211,172,33,146,238,112,210,20,3,57,249,97,17,79,162,194,74,137,121,35,156,88,198,25,103,52,72,150,215,84,254,60,166,42,69,125,226,124,209,111,160,168,252,13,77,162,109,92,214,214,135,124,162,248,133,231,90,37,12,231,23,219,18,17,71,243,34,86,173,10,134,186,242,216,89,192,218,186,192,213,81,218,119,144,142,53,142,246,155,69,58,113,61,164,175,195,244,85,118,73,95,39,233,235,6,146,190,2,229,235,187,28,184,174,203,215,243,167,69,190,118,76,105,242,65,81,93,154,255,158,212,141,41,219,248,25,26,192,113,69,134,8,180,165,116,164,121,66,23,132,81,214,72,20,38,8,50,46,244,29,14,203,197,56,83,121,13,133,61,138,1,245,
+139,87,126,134,29,95,246,74,159,40,117,79,211,133,136,113,50,60,24,26,232,130,161,192,157,141,44,162,177,50,136,146,160,173,18,132,182,76,156,161,122,106,70,170,12,154,29,48,101,240,155,25,38,245,35,164,126,220,121,65,8,8,42,65,28,167,18,64,99,33,204,8,25,194,124,218,189,104,138,212,76,145,54,123,217,79,177,251,123,118,31,98,102,75,222,24,74,241,242,225,251,97,62,74,141,68,191,241,237,158,165,244,203,122,200,184,189,5,2,77,137,126,39,76,184,241,131,69,194,201,38,185,252,31,83,205,100,101,11,212,160,218,29,98,26,15,42,148,185,130,148,122,19,209,130,213,216,40,89,13,28,48,58,88,160,206,134,150,152,232,38,3,95,249,106,90,196,250,197,241,252,84,136,79,9,19,128,95,8,223,2,176,18,64,23,148,63,239,150,242,13,19,156,158,9,225,33,177,62,39,222,254,25,181,59,255,180,37,245,253,171,124,75,24,185,87,202,119,253,123,14,118,15,21,234,99,221,41,42,210,104,14,173,177,120,36,156,98,238,255,233,166,171,80,83,103,
+113,211,191,243,153,153,210,101,154,206,211,10,169,42,87,22,24,197,186,144,70,195,156,17,18,21,158,90,21,26,156,115,114,68,249,136,115,17,202,214,54,115,150,183,122,7,116,41,102,34,233,68,36,204,137,243,134,16,176,37,202,176,114,97,188,148,97,2,8,18,120,41,83,11,77,246,215,187,177,187,74,167,145,114,129,205,166,126,255,248,166,238,33,30,121,69,144,218,55,166,101,248,39,219,92,250,149,152,239,60,202,142,138,121,198,223,104,86,26,110,211,110,238,108,236,21,39,253,86,161,177,140,75,36,85,83,167,241,113,93,56,171,131,61,131,233,152,234,82,211,155,204,211,103,242,130,86,114,35,207,156,3,182,106,160,186,21,31,83,163,250,6,19,72,144,128,239,120,193,180,164,28,215,170,13,249,230,186,124,32,161,199,126,124,154,84,115,230,48,211,22,90,143,207,125,77,161,127,168,242,41,21,63,173,2,240,118,72,115,42,160,125,201,15,74,28,69,5,56,18,52,215,1,117,45,26,174,193,119,240,26,220,210,193,74,208,224,114,193,56,8,255,207,56,145,165,
+193,78,13,65,195,203,195,21,128,249,161,138,1,14,34,49,7,142,5,183,180,13,239,255,140,142,231,76,229,216,82,143,158,150,56,249,176,149,149,102,22,164,248,224,64,237,55,116,179,155,122,141,23,111,37,27,114,246,180,251,95,213,56,70,191,181,159,223,250,151,231,79,201,131,116,253,247,156,255,111,69,175,72,138,155,92,196,210,211,56,246,180,13,173,245,122,127,104,254,236,127,26,129,128,7,238,129,211,37,252,9,237,177,66,66,232,26,18,68,184,46,191,189,245,28,248,60,192,100,130,140,156,255,46,94,207,151,136,29,87,120,193,92,48,52,117,172,160,186,120,51,12,176,211,147,220,53,166,187,18,233,20,213,244,55,46,90,107,252,249,72,98,212,144,131,167,122,33,18,253,97,114,150,118,180,161,180,173,167,121,224,246,223,204,231,174,169,253,32,144,190,15,220,94,168,158,37,172,12,53,134,24,62,29,229,8,63,136,59,251,46,61,141,112,180,92,112,73,170,46,48,47,196,53,107,209,195,19,215,200,138,28,181,37,175,220,194,110,252,84,202,251,106,149,224,200,
+26,123,224,66,109,191,212,222,196,88,127,195,34,233,143,199,94,8,122,82,94,59,7,103,19,223,111,111,166,159,232,41,58,173,141,233,223,243,40,1,226,189,91,186,190,144,107,56,11,223,115,59,131,157,230,115,70,27,118,168,206,253,215,184,251,251,137,195,248,239,243,208,57,67,238,45,135,153,133,11,20,165,27,86,156,59,23,204,46,77,121,188,184,228,152,218,117,128,251,67,158,247,245,126,212,200,190,117,161,57,100,223,242,147,71,171,132,199,69,21,64,86,107,76,206,29,20,190,95,71,254,3,137,111,33,190,190,224,214,223,71,219,188,26,211,249,58,136,255,229,10,200,179,195,224,248,182,122,168,247,67,90,249,171,95,218,48,79,255,46,63,156,32,179,82,84,164,209,33,125,134,223,31,45,145,172,240,152,167,157,253,108,221,46,227,227,197,27,23,12,229,244,217,109,142,195,179,67,43,2,13,97,3,179,194,223,182,4,251,15,55,23,5,199,232,212,255,131,139,223,2,45,253,12,148,2,146,103,242,131,40,61,45,171,250,58,208,117,26,151,230,133,209,251,54,53,
+71,237,200,249,107,155,41,178,41,112,91,47,219,238,231,184,82,60,255,170,93,175,204,231,215,95,180,184,7,176,181,167,69,81,251,78,82,194,71,173,29,173,44,153,60,233,237,135,81,21,6,106,66,170,228,250,148,90,167,106,25,220,105,246,233,123,224,175,201,77,83,115,93,36,37,80,42,199,109,131,125,93,112,185,147,222,47,93,201,68,176,1,43,166,22,179,20,69,224,71,97,244,126,9,246,59,109,131,255,184,246,126,121,91,33,114,82,143,70,57,79,180,183,226,147,201,160,143,61,251,158,244,177,217,36,216,140,104,143,48,38,145,174,168,92,98,138,255,195,188,123,244,182,182,101,105,130,127,229,142,10,153,141,64,86,101,2,221,131,74,20,80,168,73,21,208,131,6,170,128,26,116,34,145,253,34,227,161,50,50,226,197,11,60,19,64,230,136,60,34,37,138,20,157,68,145,148,232,61,41,122,35,122,43,146,34,37,122,239,157,232,61,69,239,217,135,212,85,68,118,85,79,186,209,131,190,128,238,209,229,217,123,237,111,125,235,91,230,240,226,20,71,196,219,49,51,
+170,205,228,136,90,245,16,234,221,4,231,243,9,215,77,67,108,242,150,114,55,36,233,215,31,58,190,240,65,121,118,85,242,190,215,25,219,203,135,24,46,127,37,51,208,57,180,48,103,126,96,117,119,177,219,59,64,146,51,152,177,46,140,232,122,147,53,104,11,179,123,89,250,108,133,175,106,162,157,144,228,166,255,208,65,221,121,25,222,226,33,114,6,218,120,57,26,137,65,186,151,193,35,196,217,129,224,232,198,94,240,192,92,101,90,76,28,217,17,81,178,100,14,106,61,56,67,128,16,159,179,61,187,21,79,16,104,36,120,15,182,80,23,34,152,9,61,239,4,248,92,48,61,147,175,94,145,215,221,48,47,197,134,249,136,212,121,2,42,26,46,149,163,67,105,84,217,138,188,90,73,170,65,142,123,13,152,136,40,134,91,112,178,146,212,173,112,239,212,24,82,101,228,248,194,200,238,143,8,178,101,148,199,101,26,206,105,38,178,136,22,78,100,247,47,177,59,220,138,25,173,121,29,143,201,42,254,14,45,9,136,175,111,102,61,103,43,17,176,8,71,6,137,161,124,95,
+23,219,60,53,249,246,118,132,106,103,47,207,75,232,53,193,110,156,72,230,196,168,114,227,155,230,153,144,10,18,105,195,181,99,171,193,189,160,27,125,13,82,40,0,21,43,94,49,242,99,158,220,150,38,212,230,180,10,88,9,42,103,75,249,10,121,141,138,40,55,215,216,96,47,152,155,99,40,145,11,63,251,37,88,73,214,165,166,238,14,190,183,225,136,130,189,249,86,79,42,110,139,3,66,171,61,226,5,29,183,221,136,132,183,33,228,51,70,2,165,70,115,15,81,134,140,136,180,65,90,154,116,40,107,168,8,205,163,52,209,187,229,1,222,51,61,236,227,79,13,60,119,214,36,70,104,38,120,219,77,74,80,104,81,180,21,38,194,49,146,52,31,161,55,28,87,177,26,145,208,213,46,10,244,47,189,97,221,210,157,39,207,215,98,80,91,174,216,104,246,54,125,210,236,80,105,202,192,40,199,128,105,73,122,93,51,185,75,67,189,16,153,53,165,248,173,150,84,66,18,188,80,48,192,60,51,169,166,163,89,122,53,220,200,14,139,79,143,194,141,220,139,244,15,100,195,
+89,142,23,36,16,86,126,174,5,130,187,45,28,220,164,210,80,159,119,248,241,233,94,104,65,188,7,74,94,60,2,104,51,16,200,225,245,158,30,123,149,130,130,85,218,68,111,200,209,129,116,239,189,6,48,98,137,153,0,167,122,98,246,119,115,252,227,202,131,121,29,74,193,152,199,218,85,218,200,163,194,171,40,155,136,247,234,152,173,131,205,162,105,119,43,7,60,211,8,225,16,123,61,144,0,21,77,68,220,122,237,31,128,230,1,17,147,64,232,159,65,232,39,28,135,78,44,26,29,101,14,114,196,96,130,92,174,93,140,232,226,93,7,223,31,28,90,172,191,132,47,116,8,186,209,12,97,29,188,13,31,94,149,34,125,172,38,88,19,75,165,247,247,27,13,153,130,144,30,243,130,91,152,91,120,239,209,162,46,83,23,218,250,158,250,172,16,139,187,214,246,53,41,3,76,136,140,89,121,141,202,196,162,14,27,109,240,74,3,36,28,255,64,231,167,144,106,166,142,70,95,136,92,188,61,188,76,128,196,206,208,17,107,225,76,6,152,8,34,47,85,154,126,154,19,166,
+163,225,90,42,138,218,7,161,93,54,143,51,236,225,84,4,193,100,200,93,240,153,125,123,179,129,180,154,129,235,106,156,241,8,95,161,66,241,200,1,42,194,117,70,200,161,180,203,101,78,112,87,200,144,131,214,11,65,59,43,236,211,32,217,131,54,188,98,179,89,132,123,224,239,43,207,215,68,6,181,130,86,17,14,221,219,149,119,230,200,2,99,170,104,231,231,175,94,140,18,55,182,41,179,141,58,190,248,232,0,218,231,46,159,180,88,135,231,192,159,18,43,102,163,108,68,228,193,239,90,103,161,228,173,237,19,103,78,184,138,136,112,243,209,80,112,59,182,201,188,185,76,104,121,117,189,173,21,146,169,55,20,205,11,215,137,22,157,208,206,78,152,37,200,239,172,221,11,5,216,47,248,211,172,200,187,173,95,9,250,254,24,189,50,126,99,32,176,165,235,139,93,56,179,18,68,161,19,145,200,206,127,217,185,121,76,88,191,172,198,204,88,28,191,188,242,174,139,213,45,243,238,115,138,179,214,31,245,208,22,121,55,11,170,107,161,122,28,83,17,98,81,81,238,45,108,
+251,182,99,117,179,5,20,123,184,110,39,111,171,248,85,44,237,234,154,142,64,50,78,159,139,120,181,87,199,202,196,174,64,23,199,98,105,92,82,174,163,160,88,55,246,120,112,121,51,34,39,7,59,24,168,137,128,200,141,196,232,101,170,17,88,194,175,192,26,254,254,167,107,62,156,69,90,41,101,81,153,96,53,40,206,221,216,5,233,193,86,21,149,173,25,161,249,67,136,31,87,156,234,250,158,145,174,110,246,177,183,3,100,202,145,74,135,35,51,188,45,210,183,171,231,49,62,241,17,158,177,89,223,14,239,143,53,15,27,156,51,198,220,50,31,251,22,125,201,141,103,11,127,16,108,243,58,219,126,170,88,34,145,126,199,240,112,182,168,122,36,30,228,96,97,214,170,102,12,1,179,15,33,108,71,120,223,93,23,160,200,229,230,66,200,135,7,66,91,185,240,250,25,108,223,11,219,214,133,1,173,61,119,197,57,211,34,22,179,31,48,66,130,26,174,119,29,60,34,125,10,57,48,130,38,170,160,141,33,114,63,170,108,24,175,15,43,217,181,175,112,51,51,17,198,220,
+115,123,182,120,73,19,205,180,11,89,106,71,7,128,98,116,68,137,66,51,248,11,43,205,16,49,26,98,102,102,125,248,154,228,116,159,167,39,3,48,196,45,194,87,193,200,134,114,178,246,194,34,121,164,134,69,194,200,5,124,158,216,144,122,245,236,227,157,78,64,122,216,128,115,133,154,14,175,95,218,67,188,224,206,145,152,108,31,250,249,166,206,220,217,216,204,27,200,113,172,225,5,28,51,168,122,229,148,237,70,168,193,132,80,11,56,198,126,71,246,165,80,73,154,172,245,133,130,196,35,114,230,112,94,75,146,19,249,55,253,110,97,83,41,52,207,69,122,7,33,63,171,45,213,186,215,11,1,68,144,99,226,8,219,54,182,4,39,197,199,186,230,60,68,73,246,163,94,60,112,105,51,17,147,156,26,169,157,75,53,104,48,255,230,38,198,5,225,172,98,35,223,100,193,80,230,69,250,97,59,251,154,4,29,125,52,139,188,121,241,161,234,184,230,192,117,197,92,230,198,200,224,193,19,102,56,24,47,198,193,147,25,36,78,176,74,251,212,178,139,77,99,8,121,196,178,
+95,239,90,67,142,203,1,136,226,144,179,66,248,71,71,12,81,233,232,229,81,67,200,47,147,90,223,138,9,246,123,97,140,169,41,46,232,0,28,115,115,148,81,232,252,67,62,13,47,146,62,216,115,97,149,156,122,102,19,176,116,13,49,56,78,94,218,23,135,81,57,54,90,188,111,54,135,220,97,186,26,203,15,135,140,95,30,205,223,173,195,74,212,24,155,82,223,54,42,99,79,15,105,208,105,123,37,242,234,144,146,221,88,237,67,73,171,145,169,111,150,150,98,211,162,235,117,177,143,92,155,18,215,25,250,199,16,164,237,208,2,179,125,20,198,110,219,41,83,225,176,20,52,210,140,22,146,190,207,173,227,23,238,248,66,31,65,172,134,42,194,28,157,128,27,69,53,138,58,62,42,76,43,58,223,250,80,226,157,139,133,169,76,87,232,199,177,30,227,164,249,141,175,184,139,203,14,104,120,208,128,124,58,183,149,223,229,193,169,107,15,29,196,119,214,238,61,224,57,32,139,217,113,94,208,59,156,177,47,194,200,167,127,245,183,127,243,227,95,254,245,191,254,242,55,255,
+250,203,255,238,100,253,246,123,183,245,55,223,124,249,219,255,252,31,255,195,241,198,191,249,235,127,241,225,207,223,129,87,55,226,231,127,252,246,203,31,156,150,95,186,40,63,124,249,229,55,63,252,225,159,190,252,254,251,239,190,255,123,167,244,203,79,238,59,240,239,223,127,255,227,207,127,248,157,83,250,27,183,252,203,207,191,114,178,254,240,205,63,58,165,224,237,191,255,135,47,191,63,46,248,238,251,47,255,252,205,143,63,125,255,243,239,191,5,87,29,77,124,11,46,183,128,183,127,60,30,244,237,111,190,252,231,95,124,249,143,191,248,242,31,190,252,153,11,253,237,15,127,0,87,177,126,241,229,159,191,253,237,199,47,223,125,255,171,31,156,172,63,255,139,47,255,235,55,110,235,175,156,150,63,157,247,229,159,191,255,229,15,223,252,243,9,223,183,191,250,237,183,95,126,252,246,151,223,126,249,213,31,190,57,26,254,249,247,127,15,126,240,119,159,167,125,247,229,191,253,240,205,175,126,253,237,239,126,250,246,187,127,251,225,233,175,255,242,127,254,55,127,253,191,129,30,
+255,205,255,244,229,183,223,130,30,126,108,251,246,239,255,246,203,247,191,252,241,155,127,56,218,253,220,244,11,240,132,47,191,249,233,219,31,156,162,239,192,99,190,124,243,155,159,126,6,121,250,234,15,120,226,111,190,255,238,151,191,254,221,113,203,143,127,247,131,91,254,207,167,35,255,133,219,223,125,250,45,250,240,250,55,255,244,65,206,143,191,253,217,205,2,63,253,135,239,255,228,215,207,127,253,63,2,252,253,15,223,252,95,16,254,201,245,79,136,95,92,232,95,255,248,19,104,255,51,70,159,214,254,226,107,96,63,46,255,238,203,191,255,247,191,254,238,155,255,246,237,191,253,203,255,229,47,255,234,95,253,213,95,253,229,95,65,206,0,232,27,20,2,57,163,239,33,224,159,165,135,218,167,93,46,227,137,179,194,1,235,32,70,112,162,12,236,106,195,54,245,16,72,192,49,183,224,175,169,215,8,28,14,214,131,117,16,0,2,17,143,39,235,252,89,187,155,19,39,180,217,212,126,215,181,154,15,86,173,54,153,173,207,206,134,221,77,14,119,123,118,5,187,124,185,123,
+116,50,219,57,24,206,191,9,230,221,53,149,127,29,82,149,118,6,245,139,33,212,188,27,54,131,119,148,82,112,113,145,159,220,153,38,234,73,55,22,30,185,159,136,135,166,184,128,116,94,169,150,65,74,80,245,246,156,36,58,175,185,177,26,141,215,158,19,103,218,2,159,198,141,229,188,70,84,166,92,229,138,41,247,233,92,228,33,38,188,90,71,165,17,44,175,73,55,140,25,210,232,64,249,158,171,19,83,200,210,203,227,211,192,152,37,230,72,55,110,130,51,185,180,23,80,195,82,77,160,219,50,6,35,181,240,198,166,175,22,251,2,26,105,29,24,116,91,7,102,51,29,118,162,117,150,164,162,93,141,156,191,132,52,254,229,212,32,24,164,168,57,6,105,140,50,58,52,55,76,100,89,83,94,146,217,243,48,172,27,17,176,230,93,50,214,218,150,195,2,13,226,57,37,71,211,21,107,72,54,238,133,177,22,227,34,55,141,42,210,213,147,234,58,154,238,70,203,227,147,158,112,140,49,25,85,237,48,108,87,55,79,110,75,57,194,190,148,246,146,162,137,190,148,16,168,
+215,91,165,36,24,68,39,91,123,109,138,102,191,239,72,26,157,105,118,127,233,72,38,61,184,59,18,22,89,27,56,154,181,250,221,139,49,153,148,9,0,199,56,40,158,42,56,89,82,242,177,52,222,67,87,142,129,49,110,223,55,207,156,133,166,46,152,229,24,217,218,121,254,238,221,98,34,8,115,175,182,43,94,33,57,228,208,178,143,112,99,32,110,224,55,163,178,242,147,63,184,26,206,87,143,253,201,67,182,88,143,227,209,137,26,237,189,59,223,61,154,114,233,192,117,36,227,61,191,176,153,235,210,151,249,51,41,122,144,192,149,70,170,255,144,186,118,221,230,181,229,21,195,230,53,222,144,42,114,241,94,221,123,192,251,225,211,219,1,140,177,228,72,236,190,123,67,226,250,18,6,9,96,130,13,248,38,151,120,45,90,20,75,83,236,238,177,17,84,137,240,90,184,37,145,54,101,206,55,24,159,73,165,41,108,47,169,153,228,83,169,210,25,174,151,119,64,108,79,154,70,119,52,177,98,53,220,166,35,13,71,84,249,156,127,114,133,243,173,218,100,70,175,107,158,205,
+177,45,5,88,204,178,103,218,23,215,204,206,55,92,116,96,139,220,125,45,48,49,183,181,244,174,48,70,15,172,206,133,27,19,78,160,121,34,236,203,55,140,200,6,254,204,184,53,48,38,147,167,253,94,18,30,145,87,102,248,115,159,73,151,188,46,186,12,117,135,207,125,172,220,219,76,62,107,243,86,237,206,13,227,4,139,52,210,183,177,145,147,100,134,173,243,223,53,145,69,125,108,106,206,214,35,98,1,170,56,159,41,114,74,56,65,146,96,117,240,152,174,223,80,11,37,201,193,67,115,56,151,160,109,188,197,37,82,131,17,201,154,203,219,58,132,118,237,155,28,6,74,173,193,133,34,208,122,138,122,236,241,32,216,189,10,40,59,178,13,135,31,142,138,168,115,219,155,15,232,220,197,128,126,195,20,216,31,80,221,188,168,142,92,245,229,52,10,155,212,23,106,239,45,194,208,45,171,26,240,207,99,50,210,67,245,101,158,244,103,138,74,235,139,221,106,76,105,85,57,174,86,18,51,154,125,70,21,247,172,114,167,137,168,58,194,194,182,106,140,161,83,34,77,233,62,
+107,18,89,204,155,167,151,52,119,200,210,218,138,70,190,192,213,144,94,111,124,185,203,118,33,90,8,81,125,75,205,218,186,242,4,151,27,106,209,55,79,4,114,5,29,181,60,44,244,76,122,53,97,49,226,247,164,117,63,82,34,164,221,22,76,194,67,223,31,55,71,157,30,185,56,19,26,235,20,98,188,1,32,5,111,227,230,193,152,212,47,94,249,48,136,218,196,97,22,45,46,57,1,170,71,39,101,82,226,77,245,171,206,95,35,184,121,254,10,55,32,65,79,25,9,213,40,204,226,186,69,77,36,86,141,215,191,1,15,112,167,173,54,161,216,114,216,116,151,189,39,232,130,151,153,86,27,154,98,52,59,189,84,222,251,174,41,13,252,182,49,68,201,179,84,201,214,5,111,255,192,210,50,91,179,87,93,198,212,23,15,116,2,178,185,156,211,132,140,155,71,210,236,25,211,213,244,19,196,156,46,203,31,40,227,126,153,194,95,236,89,175,13,33,51,43,167,225,123,80,69,66,81,203,157,201,226,7,238,141,133,68,59,180,117,61,219,98,171,162,198,165,79,116,220,194,
+86,220,12,222,117,33,219,251,161,184,186,216,79,242,133,88,136,46,222,118,242,251,177,188,51,97,200,67,107,109,102,247,236,233,198,24,82,81,104,119,169,174,179,186,205,215,11,154,111,145,202,20,246,139,66,77,154,152,57,181,132,80,126,84,154,244,94,74,187,157,19,57,213,211,115,187,70,221,67,10,89,199,174,186,26,187,76,152,231,58,139,48,44,221,219,173,125,187,172,111,61,16,103,116,116,114,227,139,74,23,130,236,156,191,34,163,82,247,99,82,20,117,149,243,221,8,24,217,160,166,119,86,191,9,204,101,40,180,7,120,103,172,162,57,123,201,100,32,180,66,170,69,183,120,241,42,147,22,22,219,206,6,179,0,85,186,76,109,124,70,75,95,222,126,63,171,22,18,3,67,114,53,84,170,134,106,125,149,94,173,201,242,111,99,57,188,70,220,232,151,183,181,101,76,111,86,17,33,146,101,127,42,189,201,73,197,12,5,207,42,105,149,140,33,237,98,208,237,74,104,201,59,120,210,223,206,73,117,132,52,223,59,208,134,94,116,161,87,171,178,96,190,196,4,36,108,
+198,109,209,42,121,236,89,237,209,151,162,15,147,215,170,187,114,119,136,216,30,19,107,230,226,33,190,57,52,25,43,39,156,97,37,204,247,37,84,115,110,205,79,6,57,57,25,209,180,142,247,103,40,220,42,93,220,101,157,51,145,59,248,238,98,24,83,249,38,181,106,19,12,178,149,153,176,137,174,91,72,59,111,233,242,89,133,34,78,80,189,252,197,56,104,93,199,19,107,74,40,190,159,11,48,77,198,80,188,172,9,118,51,86,95,123,49,150,46,240,117,5,190,183,104,100,39,11,110,102,193,187,215,69,5,247,200,100,56,48,137,130,19,170,201,220,139,11,187,177,245,132,237,7,30,206,213,229,81,147,36,229,150,139,138,5,186,195,72,33,50,173,254,170,164,138,212,81,209,37,162,183,9,177,119,65,39,109,174,176,204,228,94,237,217,118,30,219,56,12,161,59,175,3,234,128,203,13,242,91,255,180,188,120,161,29,114,217,116,17,245,178,181,23,43,165,146,57,99,156,22,115,182,241,78,187,50,25,128,97,76,167,92,13,105,212,215,166,197,224,81,201,124,92,179,214,
+169,121,8,76,211,177,123,154,85,182,245,86,179,99,135,168,174,188,172,243,118,68,210,2,189,193,228,34,234,122,7,175,221,95,166,246,233,151,198,97,90,29,210,109,163,177,97,74,11,49,196,203,186,225,208,99,128,117,254,238,224,169,174,19,88,99,170,32,29,230,173,182,65,102,239,222,223,95,210,16,141,30,86,66,51,62,174,253,141,235,85,137,119,104,220,232,105,214,252,163,221,216,149,86,41,135,102,113,219,155,190,203,49,113,179,217,185,127,116,2,57,172,74,186,105,199,164,11,94,86,43,199,105,135,185,250,107,105,224,126,45,61,151,56,245,252,91,209,90,121,110,191,198,209,78,241,179,249,189,91,146,21,107,73,39,53,1,200,231,86,59,9,126,176,210,51,227,74,133,195,216,91,87,61,167,211,179,148,66,155,194,97,101,129,101,136,119,229,242,59,195,170,47,173,247,142,183,20,134,52,13,109,122,226,235,209,93,74,195,68,135,167,157,122,33,109,206,81,77,253,9,113,158,35,3,61,156,130,90,87,83,14,201,247,76,53,25,161,72,57,81,63,209,153,186,59,
+151,42,209,102,191,210,45,227,239,238,130,47,154,210,67,76,39,185,210,207,11,212,3,193,2,248,18,236,222,53,223,42,111,153,155,171,201,166,4,173,33,97,59,155,169,61,240,245,93,129,68,85,117,211,130,220,50,12,185,114,41,67,111,45,87,22,204,117,105,208,68,198,197,135,74,83,106,138,73,115,215,207,254,213,187,102,131,47,172,245,186,237,238,106,28,47,181,37,150,70,104,72,108,241,66,198,59,205,187,175,13,123,31,6,201,229,220,6,216,51,222,57,78,191,199,185,221,94,155,26,134,139,117,38,60,114,92,160,107,25,57,105,149,102,206,151,121,138,14,107,42,162,21,86,221,104,184,208,57,18,16,6,94,163,122,112,177,9,150,117,99,170,221,245,159,49,27,63,109,222,134,230,122,49,84,239,102,146,236,87,85,61,142,46,107,124,230,103,46,100,234,43,110,182,138,9,104,23,185,100,127,64,169,89,89,145,64,94,23,137,47,18,43,61,250,146,151,10,172,154,226,136,186,241,136,200,121,28,61,154,114,35,31,9,86,93,33,46,14,188,83,218,93,126,79,70,
+215,189,64,107,21,232,198,147,143,152,227,233,247,17,173,39,116,51,251,189,104,89,89,184,214,95,136,194,68,85,2,210,149,251,168,7,213,59,246,137,244,110,149,132,75,97,188,18,149,246,81,83,131,76,50,81,15,196,218,143,102,20,182,45,127,204,247,58,173,37,189,79,152,232,162,47,228,4,195,180,195,206,69,17,64,182,59,24,90,86,245,163,105,32,125,238,112,22,231,244,156,241,124,40,241,0,150,220,235,238,222,19,25,134,174,188,43,77,64,44,33,91,3,217,189,143,184,169,109,115,82,88,47,71,246,231,2,198,182,182,210,149,158,197,240,210,179,168,100,151,204,245,6,94,213,60,168,153,230,139,245,246,141,55,207,124,218,145,225,19,155,116,61,147,186,115,1,212,64,244,90,29,2,100,192,112,72,226,243,128,114,53,171,154,181,41,181,46,167,20,163,246,111,3,168,168,137,175,109,72,246,18,162,64,194,84,11,55,178,126,72,125,104,198,52,250,241,163,110,89,76,50,43,124,213,45,185,250,154,66,111,84,251,146,159,162,115,143,217,177,38,106,69,101,236,90,
+72,100,21,218,112,60,244,141,43,229,229,65,201,170,152,14,118,15,176,109,98,116,131,210,76,62,111,203,108,35,101,65,4,188,223,143,214,247,3,41,84,32,51,122,120,193,75,169,212,238,12,96,224,126,64,148,235,9,99,168,7,126,79,27,98,248,213,216,92,205,136,123,234,41,208,133,38,77,51,75,222,83,222,218,166,108,63,107,122,201,170,35,217,121,245,150,151,98,243,66,254,135,6,248,164,56,217,223,31,34,67,105,118,240,54,2,235,93,150,49,75,111,12,87,158,78,166,144,120,197,38,5,189,133,172,56,236,82,77,226,193,51,230,96,20,193,31,171,186,120,21,157,205,235,204,114,12,194,98,100,203,7,211,189,105,214,10,76,159,235,50,35,138,88,210,218,141,114,147,211,104,67,149,6,89,239,80,148,151,6,54,243,185,172,172,2,222,157,190,23,34,86,138,98,68,140,236,241,52,37,126,182,205,82,57,52,154,152,143,246,72,57,224,182,190,77,4,228,15,143,47,0,202,138,33,95,164,194,163,158,46,112,69,212,47,61,234,60,187,209,82,71,250,217,44,197,
+19,87,136,91,11,139,75,189,72,219,67,156,144,167,231,246,181,15,248,97,201,145,155,151,137,87,65,181,179,68,45,41,219,234,102,189,145,39,193,239,180,248,84,91,203,106,107,29,93,89,79,41,74,82,146,105,197,70,144,219,200,180,5,26,163,214,199,123,93,138,221,236,117,169,237,230,15,124,209,90,26,160,60,103,200,166,110,12,69,109,99,135,41,193,142,144,195,77,31,33,234,138,181,249,182,51,207,38,139,100,32,157,208,235,102,205,130,190,63,227,234,250,82,74,178,92,235,99,49,1,57,69,105,216,174,93,68,67,105,140,125,162,196,171,142,173,129,81,232,180,213,18,83,116,149,186,100,22,218,61,26,180,182,218,92,183,125,128,135,72,101,138,7,236,197,149,87,92,82,234,205,251,86,68,100,122,222,90,122,46,82,46,182,46,104,237,150,57,245,106,117,166,131,180,223,237,247,164,72,10,10,177,30,242,222,0,96,223,198,116,117,93,73,87,18,45,21,40,25,42,188,172,110,83,217,114,114,96,133,22,54,218,172,49,132,54,43,196,221,250,227,118,71,208,56,67,
+34,187,205,242,146,131,242,207,110,222,111,162,92,38,234,225,188,39,36,219,40,85,50,174,169,55,136,66,74,150,238,173,199,223,108,90,254,141,23,61,111,178,218,115,71,123,158,158,204,230,148,104,223,146,44,164,55,220,180,73,144,139,152,38,36,73,74,64,48,23,77,205,9,187,249,160,209,160,248,183,73,217,218,99,55,52,88,251,40,194,80,8,108,33,135,126,143,241,110,9,26,22,250,102,105,32,162,24,197,131,252,62,216,244,246,131,172,220,173,30,126,134,164,58,145,247,157,243,218,221,70,50,227,103,202,235,39,168,142,217,153,221,215,115,15,221,224,243,99,210,20,149,154,146,224,92,112,179,42,5,199,122,98,23,73,78,94,169,95,121,104,141,148,218,65,114,25,45,36,35,78,84,52,107,222,40,107,88,138,186,47,72,151,98,150,26,179,212,210,49,105,37,179,185,228,164,210,229,181,158,6,219,163,180,150,157,176,241,88,111,246,213,15,222,117,102,255,110,157,249,104,214,160,100,148,27,76,44,173,240,121,175,32,22,227,151,11,129,198,93,2,153,89,21,56,190,
+28,183,245,168,235,236,187,52,142,138,118,83,29,7,67,94,147,37,106,77,41,181,130,183,169,156,143,196,223,221,58,85,10,241,249,112,234,226,27,218,235,193,104,154,109,234,215,214,196,123,225,30,217,37,68,31,100,62,85,97,65,240,100,72,134,195,195,154,81,100,245,249,47,185,78,138,116,96,14,102,88,154,66,100,27,103,70,76,117,96,191,111,94,51,244,205,93,127,17,204,54,169,70,81,202,176,215,77,106,133,151,153,115,62,242,84,117,118,67,21,213,169,170,3,69,11,113,11,42,126,31,247,39,180,107,85,123,130,25,251,104,98,169,41,26,145,44,248,57,173,224,222,167,123,222,244,186,190,177,203,235,123,195,77,158,36,53,131,85,187,117,247,240,115,183,114,232,111,59,80,44,191,132,163,246,25,224,2,39,102,84,133,170,203,253,112,69,246,204,78,93,222,72,124,196,109,115,93,58,199,185,0,90,232,65,153,233,221,70,248,55,7,34,114,70,67,145,48,232,193,58,164,222,54,132,24,125,253,81,23,20,166,80,11,235,250,44,245,102,81,234,236,208,215,21,117,
+177,37,210,198,202,202,110,106,232,132,211,185,155,44,178,40,119,91,88,143,227,101,178,62,108,81,95,149,171,219,234,110,252,224,105,140,103,248,12,37,8,214,25,50,85,215,70,4,70,211,194,210,98,76,101,219,221,84,202,60,247,73,123,198,198,180,159,170,121,30,23,225,160,112,130,37,90,194,34,98,180,226,212,107,117,115,135,167,104,132,157,5,181,135,28,88,99,252,192,69,167,77,162,142,130,182,242,85,215,20,90,249,246,205,101,118,55,227,44,226,216,76,221,45,109,229,210,37,93,138,169,13,61,251,102,168,177,173,114,163,55,32,37,81,163,47,25,44,40,137,203,65,182,92,188,182,55,50,182,250,230,218,48,74,232,234,47,140,27,129,108,91,46,165,234,5,139,203,88,25,63,251,182,37,163,164,48,212,77,214,102,93,91,111,44,214,100,183,126,67,194,237,38,135,159,164,45,229,14,53,128,154,124,210,170,98,146,122,164,36,86,75,92,28,250,236,54,209,95,150,146,198,204,209,128,46,144,235,200,224,124,211,91,37,238,45,217,196,69,30,208,77,12,179,71,179,
+22,58,231,143,68,7,10,236,208,162,119,30,67,207,218,253,75,164,59,179,36,233,111,52,234,251,188,54,207,188,71,86,77,198,78,234,46,81,172,119,183,22,45,253,214,96,221,249,83,232,166,72,22,176,196,120,171,41,190,105,146,208,26,244,135,228,186,45,209,210,57,42,76,231,109,240,80,24,15,173,133,167,93,30,128,93,120,168,190,225,66,102,45,207,168,11,187,161,11,153,236,146,103,179,234,34,133,29,154,155,249,178,37,15,52,172,185,238,102,32,235,239,232,141,190,170,44,71,47,137,220,148,242,54,90,199,112,94,99,85,255,202,119,231,207,221,248,115,201,162,55,201,60,208,121,77,98,227,177,59,54,176,115,175,227,125,242,118,215,122,163,59,221,186,197,97,177,37,233,159,81,228,30,130,153,185,180,99,144,121,192,100,187,77,246,36,3,149,189,160,146,233,49,200,61,209,231,90,88,102,54,165,232,208,197,188,24,66,45,82,96,201,186,163,46,238,56,218,109,107,169,49,149,102,116,154,49,203,9,49,208,97,161,193,46,26,206,176,72,219,62,187,219,21,181,78,
+70,132,210,52,10,226,104,86,58,253,216,139,37,192,71,239,132,85,154,158,106,211,169,70,98,129,78,164,68,252,68,137,150,77,136,234,43,191,7,214,221,24,226,37,162,37,47,69,55,60,118,205,125,14,213,109,114,250,178,220,90,78,122,187,205,236,102,190,193,68,150,52,151,169,27,219,164,145,133,54,165,126,128,17,191,193,166,23,131,50,125,79,164,207,214,253,89,97,210,233,202,95,30,167,212,46,204,72,84,156,189,142,165,181,156,193,48,42,103,178,220,92,59,105,142,21,163,193,190,231,110,66,202,142,121,141,172,170,153,85,15,134,74,1,214,38,121,82,249,186,1,148,113,175,158,220,222,47,60,243,154,155,200,97,84,110,138,183,208,67,73,101,124,1,234,196,125,122,220,226,28,30,130,12,141,193,54,84,78,42,244,173,154,222,208,169,243,43,131,232,194,34,232,163,51,212,141,158,95,222,204,225,94,18,153,219,188,118,38,50,44,199,230,41,100,29,90,48,90,78,126,8,62,122,216,102,44,8,186,8,62,190,145,162,251,124,73,132,98,20,48,219,13,135,40,186,
+126,87,106,8,150,217,187,181,251,26,40,77,239,175,28,153,132,115,220,217,174,179,97,129,137,223,228,199,238,187,170,174,236,69,142,109,107,100,124,231,56,113,183,129,109,76,134,210,109,108,39,75,74,159,158,85,230,97,39,0,219,102,239,168,166,78,179,47,234,34,30,181,211,220,122,208,9,84,30,105,81,137,82,119,184,189,13,149,209,205,151,7,143,174,154,51,236,66,82,247,125,216,90,57,191,97,245,7,195,131,251,214,123,55,31,6,239,186,65,140,154,91,11,232,26,126,109,127,68,174,134,104,193,108,215,115,88,178,251,47,186,152,141,42,182,25,30,157,166,107,157,91,147,181,151,137,69,191,110,98,163,61,90,169,236,135,106,41,80,202,101,68,89,220,77,165,197,216,86,218,182,151,215,22,121,222,239,146,155,67,189,97,3,220,52,59,250,140,191,253,162,158,121,31,197,154,134,124,107,221,85,170,164,220,134,140,25,40,218,85,91,228,41,204,191,219,52,196,131,101,111,209,154,202,14,98,27,33,57,144,19,178,11,206,130,193,1,102,241,23,17,140,96,153,84,60,
+247,132,108,145,210,217,100,155,73,140,95,118,71,69,198,124,100,66,204,164,168,8,26,246,121,224,208,11,100,41,170,238,186,158,234,204,74,241,212,35,103,126,232,104,140,24,209,99,191,127,211,205,186,83,26,74,97,51,139,28,196,49,20,86,225,232,221,70,213,108,139,120,30,37,102,115,243,67,252,185,255,128,202,213,219,212,213,162,208,55,117,109,252,190,136,98,78,25,122,131,225,14,97,153,157,97,230,169,69,46,115,216,81,42,134,238,184,107,170,109,226,207,220,187,156,219,208,14,226,149,183,218,81,243,150,119,163,94,43,73,110,168,32,25,122,40,29,40,201,0,150,67,169,182,214,26,127,108,221,231,79,219,135,134,230,133,56,171,74,96,221,231,116,18,251,38,183,93,164,161,118,99,249,126,127,159,170,120,9,100,29,223,163,173,186,147,113,77,156,142,33,195,111,172,245,7,226,212,38,204,216,9,211,178,124,88,40,181,204,188,240,222,183,160,233,74,169,150,102,23,245,208,208,237,18,63,105,235,74,88,82,109,105,207,238,86,234,175,219,1,97,209,172,58,141,77,
+68,144,173,12,233,67,200,162,37,221,158,205,146,179,238,195,70,144,90,144,124,66,171,82,108,212,114,196,198,67,3,205,25,82,147,51,134,164,83,204,92,63,22,212,93,50,80,48,68,187,38,169,220,210,233,5,2,38,238,131,10,40,89,230,75,85,203,214,45,60,130,15,160,227,105,239,113,173,230,104,105,224,51,223,161,71,144,38,98,58,88,50,144,205,90,218,185,225,12,214,79,84,7,18,61,253,189,25,96,246,31,229,59,109,98,46,17,214,39,114,184,177,30,119,73,204,38,223,155,207,123,133,45,83,164,35,90,24,41,24,205,76,86,219,220,133,68,70,74,252,226,86,181,218,191,182,239,69,188,151,27,225,107,140,79,123,189,11,63,18,205,231,124,52,83,252,122,113,151,156,170,165,109,107,251,190,116,27,28,196,205,70,75,3,69,121,233,38,156,94,14,252,1,225,207,2,179,219,200,45,81,232,101,143,80,99,249,52,239,95,71,118,90,107,202,222,244,1,118,246,178,186,223,62,241,70,68,60,196,244,6,143,44,153,118,69,83,158,64,89,98,15,70,46,51,53,
+205,229,222,119,198,177,71,62,187,189,162,95,221,204,122,3,247,98,118,59,73,73,109,187,190,49,86,46,68,67,139,108,183,21,193,141,141,252,246,212,20,134,153,50,217,162,101,223,87,193,249,175,62,78,116,31,154,155,171,53,244,75,67,112,33,17,83,148,21,70,220,171,137,86,40,65,28,218,39,167,92,23,181,86,133,165,247,140,230,91,83,109,62,189,221,24,116,107,129,148,252,177,244,152,149,230,101,172,43,201,118,140,12,63,49,86,176,198,197,129,112,133,226,199,72,251,199,199,41,65,101,17,168,72,155,231,51,212,57,53,79,55,191,149,223,240,23,164,56,218,166,89,166,73,168,247,115,106,81,63,234,194,245,186,189,69,30,194,27,6,22,27,166,59,175,105,25,98,27,40,18,57,127,161,221,108,200,227,181,132,238,48,123,31,178,98,137,188,181,66,152,224,157,84,104,153,112,66,215,174,214,54,61,42,198,224,52,180,221,115,113,64,194,200,207,247,45,106,48,146,110,226,136,213,161,41,189,220,22,76,195,248,13,237,13,155,111,236,60,17,217,165,59,213,227,110,
+99,240,152,95,63,55,178,244,177,167,8,70,118,233,145,33,109,197,189,124,21,33,243,60,57,169,221,16,36,18,23,161,101,200,56,122,81,87,23,52,98,12,85,179,52,205,211,182,164,19,127,181,25,139,186,189,99,134,218,71,171,147,10,99,35,221,42,60,239,0,118,35,219,10,155,49,182,109,90,90,190,167,38,112,198,52,179,212,5,7,168,189,163,136,209,217,54,187,155,185,238,112,230,207,108,151,225,167,139,11,148,44,212,220,243,131,143,204,225,162,109,124,229,92,236,137,93,135,48,245,60,223,13,170,111,51,121,168,243,222,237,212,138,242,96,239,189,249,92,163,15,131,131,213,48,201,29,12,131,189,245,166,8,147,13,177,195,109,105,64,198,12,49,157,67,96,31,232,23,239,131,197,29,249,209,187,79,56,242,249,82,114,165,100,198,213,29,187,165,207,136,184,43,207,23,240,236,51,41,174,213,23,227,21,57,201,28,9,86,31,60,248,150,160,22,149,63,228,206,50,36,79,55,191,41,68,54,36,164,167,104,242,22,105,143,239,230,2,103,168,127,159,195,87,193,28,
+9,89,52,43,4,77,222,164,58,167,9,120,20,217,131,219,88,219,139,60,252,73,88,231,166,247,80,155,113,104,103,228,143,156,13,139,45,162,1,27,195,197,116,157,23,116,207,96,40,189,76,5,55,222,229,35,59,247,6,192,62,161,222,10,165,112,103,91,127,77,195,231,183,36,95,150,228,24,217,146,175,123,25,124,102,198,153,178,151,86,182,51,212,134,3,184,119,70,89,9,56,61,138,59,119,79,47,183,210,248,67,81,115,201,160,36,147,43,220,99,80,165,165,59,141,201,235,238,74,109,92,163,196,178,150,4,156,125,108,212,138,174,195,201,82,194,80,172,89,82,102,19,196,227,97,33,104,75,15,228,14,22,25,78,237,103,85,196,78,93,182,188,149,69,147,196,49,24,7,102,178,48,234,150,9,5,40,165,235,12,94,35,202,17,122,59,238,108,212,198,54,171,163,65,26,97,33,170,197,219,61,121,39,121,31,184,169,252,56,113,110,170,142,132,205,245,123,213,115,209,143,135,98,74,195,48,134,2,86,23,6,184,12,223,210,144,182,236,129,61,34,213,46,54,142,36,
+196,136,32,68,2,166,36,116,52,65,196,67,97,97,19,145,88,211,122,154,89,154,17,2,94,131,47,2,170,86,246,118,201,69,219,137,113,6,254,206,227,197,165,94,102,33,15,15,126,173,189,188,212,216,217,120,162,151,235,142,2,151,174,44,19,207,244,162,184,215,109,168,43,204,150,218,57,107,60,233,54,44,131,225,156,30,102,117,140,39,218,43,147,112,37,141,241,162,166,232,40,244,150,152,151,190,57,184,175,102,195,93,244,194,130,194,113,0,194,72,47,9,75,60,18,255,251,89,143,79,116,186,226,115,100,9,133,126,123,245,66,72,46,41,89,209,33,153,176,21,238,155,95,141,160,178,177,21,216,155,111,185,185,94,234,144,238,44,254,97,69,36,211,244,135,2,35,127,197,80,91,16,52,222,176,162,186,232,44,214,84,88,27,42,156,46,57,72,111,171,226,175,101,203,8,5,158,171,135,235,217,172,139,40,48,47,88,110,137,118,4,76,65,127,69,77,103,73,132,2,149,85,1,44,149,125,25,98,100,245,2,96,14,199,229,13,176,165,119,151,212,216,231,142,11,177,
+223,160,121,71,229,99,43,95,248,158,142,2,66,68,134,168,191,54,202,25,52,75,227,202,44,107,110,104,182,39,118,139,185,36,44,116,136,208,52,205,133,59,170,216,115,7,192,52,5,15,141,170,250,50,138,50,235,84,88,3,28,207,131,156,201,192,81,116,180,238,57,156,140,190,148,81,60,156,229,122,195,76,144,131,45,210,67,144,98,174,123,81,19,65,195,7,46,220,184,46,162,20,246,102,122,141,157,78,212,207,218,214,104,173,19,55,134,186,78,175,67,153,204,11,234,18,9,166,35,198,75,250,110,158,70,133,26,203,19,210,57,185,47,107,12,249,8,29,147,52,225,114,250,1,224,80,47,32,40,112,171,169,82,159,200,158,0,75,181,177,156,104,178,42,74,22,144,192,49,135,27,65,84,226,27,9,219,4,56,52,25,164,73,131,128,55,102,167,67,213,246,38,146,147,191,38,46,197,244,178,238,30,51,128,58,83,220,69,73,106,166,192,207,197,45,161,101,117,149,238,45,163,192,12,28,14,105,77,185,69,0,119,118,39,190,33,45,210,159,20,87,41,236,89,17,94,
+73,219,222,136,203,229,77,32,91,134,110,115,6,37,29,228,153,29,50,171,88,7,75,20,80,184,176,67,46,254,210,114,213,178,163,168,120,1,160,241,66,60,220,105,56,203,108,138,117,81,128,140,15,83,157,109,168,172,248,138,98,150,93,79,88,78,12,192,120,96,151,97,51,138,11,91,183,124,68,23,137,206,37,78,239,227,212,52,32,219,149,44,68,95,245,237,108,187,159,73,159,177,78,40,87,226,144,144,133,229,51,104,101,147,100,183,207,207,135,219,125,251,128,125,97,162,184,125,48,252,46,2,91,138,243,114,225,215,55,95,133,250,192,5,133,202,245,19,43,184,86,113,138,17,69,164,133,94,132,125,104,144,99,133,24,81,122,158,27,101,44,79,142,209,155,194,188,186,144,217,159,155,54,65,154,137,208,115,113,240,208,92,92,58,99,150,169,231,136,220,40,194,98,46,223,113,228,55,98,158,203,68,156,235,185,76,56,201,129,211,140,130,78,169,158,25,6,112,102,253,149,18,37,43,135,113,48,106,52,12,40,80,160,1,129,198,174,200,50,165,138,60,48,201,35,225,
+14,148,19,167,198,151,169,112,135,157,5,39,75,245,23,0,100,114,143,28,64,99,71,187,16,208,174,94,132,0,16,24,81,11,122,3,131,246,155,154,60,144,133,3,168,178,187,130,200,132,125,16,7,110,228,117,160,58,97,240,10,158,40,44,39,133,136,34,245,156,204,134,39,8,48,232,5,129,163,97,222,195,160,77,77,51,15,168,143,71,161,193,179,202,18,184,227,120,150,84,143,2,34,144,201,43,138,11,143,34,1,112,115,92,136,144,28,55,195,111,9,154,227,102,13,243,58,14,110,238,105,225,52,130,179,6,117,130,128,32,239,71,64,66,4,14,56,2,58,131,33,161,77,130,186,60,191,100,223,141,222,90,82,133,152,73,128,201,49,78,63,0,54,177,211,17,38,197,137,166,156,189,156,56,1,83,146,225,73,36,0,113,94,157,35,234,62,64,140,120,5,130,109,61,188,1,39,1,39,135,202,74,254,145,96,155,139,229,234,194,242,68,178,99,4,186,213,134,106,152,173,59,226,116,215,61,187,192,32,162,0,49,109,191,69,34,1,210,5,171,1,133,242,192,245,53,
+8,10,98,118,141,50,118,7,14,118,98,33,38,36,159,88,128,215,189,71,22,174,122,80,188,9,33,67,189,218,191,222,79,8,211,31,247,121,136,19,75,102,162,137,0,156,112,170,71,210,83,192,11,46,201,146,8,126,228,192,65,37,204,20,6,56,243,1,195,35,197,152,35,152,59,34,174,45,199,183,40,68,88,167,124,67,224,29,121,181,128,188,50,97,0,115,82,198,65,159,86,8,17,133,0,1,237,189,129,101,139,198,60,115,246,28,69,37,252,228,97,47,51,186,2,205,226,32,70,181,22,252,21,6,62,247,128,1,125,251,244,63,12,241,127,4,148,133,252,8,232,181,158,29,62,74,8,166,68,97,142,18,58,7,53,196,1,93,190,17,84,136,91,94,24,87,57,201,203,202,38,31,105,99,194,75,52,40,120,108,20,104,95,64,53,246,17,10,243,17,15,142,61,115,229,98,196,170,138,207,184,95,29,227,126,63,112,176,224,186,227,185,75,42,139,176,15,113,25,108,38,130,120,180,114,97,255,208,239,82,247,148,60,146,177,205,148,25,27,236,195,129,255,245,254,225,
+220,113,105,55,160,117,246,136,208,14,242,248,12,65,61,65,119,21,95,13,196,173,39,128,32,213,25,162,26,214,185,33,72,163,128,67,142,205,189,162,178,55,10,56,175,102,71,216,118,234,131,225,196,47,202,133,129,51,98,224,218,99,82,132,28,184,248,233,60,63,139,9,106,158,252,54,68,189,89,57,39,143,230,112,198,209,163,243,70,110,36,58,110,60,87,184,130,248,221,171,3,114,98,201,10,31,59,142,64,202,12,243,41,143,70,58,171,211,156,91,77,151,2,215,135,252,150,66,1,226,164,48,251,33,117,210,159,101,127,247,36,240,148,68,101,196,81,192,142,82,217,241,33,48,161,61,91,214,195,25,194,242,87,253,66,66,194,211,138,138,67,112,76,216,10,151,184,149,28,3,129,59,178,13,242,192,63,242,192,56,99,234,142,162,25,225,63,120,2,53,99,66,28,163,11,16,175,182,176,99,26,15,98,14,6,225,40,213,43,86,195,193,0,77,146,143,167,50,236,56,96,20,36,166,71,26,46,146,184,61,213,15,61,152,86,91,60,192,36,29,55,111,241,176,14,152,
+87,218,50,83,195,180,131,133,2,161,132,67,24,194,19,178,51,63,128,61,34,131,129,102,46,64,100,20,80,7,102,249,167,14,138,31,245,137,9,31,22,62,210,110,148,161,159,232,118,245,36,75,236,17,217,35,64,52,31,11,140,11,140,190,9,228,140,114,44,62,101,26,146,3,230,36,50,59,194,112,65,186,68,82,28,49,237,69,93,233,202,82,120,234,67,151,35,4,241,131,208,240,18,117,44,39,249,8,160,59,249,5,3,253,162,128,57,132,6,171,69,25,141,131,157,81,99,35,84,49,246,153,95,242,114,228,163,238,225,83,118,144,232,70,174,18,110,143,91,146,165,69,242,1,75,130,95,90,78,134,217,210,165,229,120,244,160,229,184,196,229,70,200,207,251,243,37,252,68,232,61,209,12,128,176,95,239,143,197,10,24,101,117,229,93,55,237,27,18,94,63,234,128,3,58,252,136,87,213,49,60,30,164,152,102,236,247,68,236,51,137,64,248,88,192,114,248,190,214,195,50,239,168,80,41,149,184,52,39,67,168,207,250,123,87,134,31,203,18,146,157,29,1,32,142,187,
+109,3,101,150,231,230,212,63,225,192,156,112,164,63,232,59,119,151,0,108,119,105,21,195,194,31,5,190,74,231,125,213,107,232,84,72,166,140,19,80,237,180,1,53,140,247,138,153,176,249,1,228,169,225,80,31,129,60,131,116,221,129,64,186,96,174,32,246,27,58,89,35,165,163,109,201,79,222,108,31,117,144,9,191,180,157,131,10,135,75,97,194,182,22,142,177,29,16,242,101,244,179,47,152,95,28,184,83,26,208,97,142,153,221,0,118,204,16,11,182,121,58,222,38,67,192,219,142,99,41,57,222,134,56,236,175,6,30,8,167,13,189,5,203,198,113,197,232,88,199,183,0,32,59,169,117,11,76,79,81,5,60,132,219,15,190,56,142,234,137,175,170,166,252,14,194,140,121,71,168,61,31,244,21,114,116,118,255,252,53,255,246,231,213,147,202,29,156,63,241,24,249,228,81,120,204,60,168,30,142,21,131,202,165,30,147,234,66,132,80,156,210,206,201,188,58,117,193,44,147,122,236,130,160,182,71,31,105,199,248,236,147,27,198,177,126,6,180,102,38,56,215,108,149,127,204,
+47,48,21,78,58,140,44,149,167,196,134,192,109,209,99,98,223,28,73,99,127,237,191,54,192,145,57,149,5,199,159,244,203,252,212,47,238,228,105,12,216,220,126,230,229,238,83,191,123,28,140,69,141,129,9,135,35,186,200,3,199,238,143,249,97,69,158,125,228,7,35,254,81,78,54,159,60,221,57,246,95,253,85,48,142,134,171,121,224,184,13,5,63,110,99,192,29,145,227,161,233,139,175,245,182,248,137,71,97,34,125,212,9,81,15,196,5,198,6,15,6,199,161,150,34,160,9,129,112,14,18,166,63,209,81,32,156,130,160,41,235,78,121,217,112,244,138,13,176,55,60,150,73,159,186,132,166,221,167,134,49,69,205,79,117,18,153,83,156,230,6,50,24,222,222,231,60,98,250,90,95,245,49,150,253,84,95,137,121,200,203,71,159,121,25,192,78,21,20,206,12,127,234,134,16,5,67,240,12,198,224,9,188,226,62,232,32,175,7,142,228,177,131,25,143,224,111,1,230,197,17,60,136,253,196,51,211,206,130,124,216,37,124,198,143,12,28,85,51,66,137,198,31,68,49,27,
+14,235,49,2,92,184,212,123,1,158,120,13,238,74,129,39,226,142,187,106,81,28,249,180,43,143,107,128,185,9,39,194,26,181,27,194,81,174,26,24,51,247,137,171,22,251,138,171,7,94,95,64,219,42,48,165,62,178,159,8,103,159,162,235,5,174,79,222,48,157,80,214,7,32,123,237,3,144,18,184,58,1,138,162,162,39,64,118,112,151,17,4,116,218,5,2,34,28,229,114,246,228,16,159,88,77,219,191,206,85,90,26,228,163,159,10,78,253,52,41,250,236,15,225,217,71,100,194,101,218,73,17,97,120,247,100,183,6,218,205,130,138,64,128,106,81,16,191,206,107,4,56,32,62,133,29,247,244,213,110,20,103,63,181,247,244,165,244,163,128,64,80,201,163,123,81,79,24,72,28,27,14,180,66,228,62,128,103,249,143,135,185,144,160,126,64,131,56,196,31,231,181,107,112,94,75,139,194,56,232,169,250,36,163,163,15,218,111,201,167,110,69,228,218,63,218,133,255,14,128,157,244,121,159,197,65,142,169,10,198,17,249,199,56,2,95,251,141,4,226,16,157,242,229,238,137,
+248,33,171,52,228,249,3,168,137,248,49,80,28,123,36,72,0,241,211,46,11,224,157,8,96,105,202,151,71,2,120,122,56,234,88,225,94,142,225,96,35,1,252,17,175,2,1,187,63,149,21,56,82,246,81,30,202,8,232,71,30,94,165,79,112,6,22,135,249,52,24,101,64,56,199,6,229,3,225,248,207,190,198,3,243,25,15,178,211,254,1,167,241,25,143,143,249,166,33,254,140,71,36,243,25,15,237,41,30,81,184,154,240,25,15,9,200,192,9,14,216,186,208,71,56,119,72,112,68,63,193,57,255,58,39,144,159,161,31,133,172,56,253,156,211,20,180,99,134,178,64,56,71,189,206,65,56,199,4,128,159,170,137,248,171,222,244,183,87,96,210,19,136,94,148,155,11,63,207,41,18,159,121,224,87,126,180,3,56,51,246,49,199,221,144,79,227,195,21,68,137,226,31,3,141,1,131,245,2,46,57,3,131,229,7,231,238,171,83,217,191,17,49,63,230,18,215,135,90,81,252,63,241,125,249,201,247,177,63,137,158,192,164,60,182,104,85,153,122,170,4,80,144,36,15,120,
+84,26,36,233,25,12,25,7,108,254,138,103,22,179,124,130,115,197,250,58,31,86,191,234,142,124,201,251,212,221,243,169,67,59,195,64,228,40,29,120,133,120,5,194,41,158,31,225,112,68,31,115,190,195,139,227,159,224,156,255,137,239,202,7,223,184,178,254,52,49,176,62,224,148,51,194,143,194,4,145,144,95,143,33,235,57,80,231,199,134,136,7,225,164,193,156,100,158,224,240,153,146,19,156,51,208,242,9,142,240,179,143,218,207,163,39,37,87,1,232,73,201,0,209,117,76,3,76,3,60,51,13,198,177,124,76,3,20,120,61,6,235,0,7,186,31,99,51,163,240,81,78,167,241,139,83,57,141,74,192,226,81,33,78,19,138,143,199,33,56,100,39,58,49,171,112,148,78,204,2,168,245,137,217,115,208,174,245,107,253,103,98,17,192,237,177,186,91,8,96,142,156,10,139,252,249,148,61,217,112,235,99,236,1,244,244,143,70,199,81,51,47,142,210,209,192,165,173,163,116,226,167,172,4,156,124,105,75,118,116,5,1,250,98,252,156,111,7,76,68,67,47,96,194,5,94,
+8,1,151,11,7,62,121,152,114,190,242,80,176,11,79,60,232,147,159,117,11,146,247,157,20,127,141,146,29,27,4,186,169,99,162,142,204,34,193,108,104,61,57,112,138,99,54,24,33,204,212,113,202,11,103,62,117,55,253,156,27,28,180,143,193,22,175,57,13,182,180,207,126,69,118,120,190,246,171,48,254,232,145,32,15,136,143,137,114,121,244,22,124,100,188,63,181,155,7,220,249,41,222,111,132,175,207,89,14,196,213,71,162,188,32,160,167,10,43,128,40,218,72,192,140,176,251,177,79,14,151,247,89,200,71,133,97,6,62,244,138,232,234,179,15,107,23,126,200,174,57,166,178,55,12,209,5,95,222,16,174,195,47,176,211,147,183,31,126,125,122,242,22,18,189,199,39,111,215,241,59,162,227,87,68,48,92,214,254,250,194,141,176,144,65,148,17,174,182,67,216,237,221,241,115,54,248,204,126,220,120,199,253,216,200,108,119,137,228,189,42,40,102,95,40,14,153,7,180,36,91,158,146,108,181,107,115,237,29,182,195,170,251,221,24,112,110,112,141,216,93,15,208,32,240,246,
+182,231,90,138,40,93,22,89,166,107,196,147,23,184,97,15,81,198,210,113,18,130,123,61,113,32,59,127,98,11,142,141,87,195,68,244,28,171,203,224,52,13,140,128,171,165,35,203,100,42,169,17,148,191,206,123,117,148,186,234,190,63,138,0,87,77,153,61,168,187,78,84,228,14,45,44,234,60,9,96,213,217,72,247,2,124,72,198,63,218,15,189,251,102,71,106,100,123,216,133,196,189,115,0,117,134,102,45,71,22,247,50,66,228,202,198,96,211,192,104,235,141,108,89,87,60,28,28,191,9,194,114,60,103,198,183,61,101,185,193,141,144,60,41,162,230,146,73,21,250,134,193,148,208,69,26,183,27,148,241,218,16,76,185,178,254,133,98,243,84,138,47,12,119,26,53,51,192,238,64,19,143,161,80,70,138,212,170,11,207,185,248,237,136,142,50,159,49,14,180,61,6,249,236,177,24,192,161,69,245,132,33,146,177,239,171,129,245,192,151,9,187,89,228,6,207,105,161,0,221,82,247,124,191,9,62,129,120,240,136,108,121,18,152,228,56,49,127,83,252,144,45,112,164,145,17,
+10,240,111,77,43,164,247,13,163,128,119,136,41,179,142,58,185,184,156,183,200,69,18,108,143,113,215,10,111,5,87,182,197,92,21,243,128,169,238,23,94,106,21,125,178,17,33,33,11,15,29,190,210,75,175,160,36,158,25,176,208,218,115,86,167,192,248,174,97,190,226,31,153,79,136,117,92,48,78,51,165,117,4,17,38,193,237,246,161,123,141,93,0,31,95,242,252,110,44,220,81,194,36,150,121,46,252,30,126,158,89,56,174,9,76,34,204,68,212,54,160,145,208,228,121,28,49,29,227,46,28,125,124,81,195,63,69,189,66,228,249,101,120,162,55,171,58,126,175,8,171,56,52,217,82,70,245,176,97,36,56,180,84,72,29,180,156,111,86,226,59,59,208,216,201,218,242,12,138,195,61,4,155,151,157,189,103,214,52,192,37,136,247,199,182,66,70,132,13,134,2,35,117,140,53,192,35,217,131,48,53,48,11,225,131,20,99,29,187,237,237,31,219,108,134,11,176,99,46,70,158,173,107,118,224,24,39,79,10,162,166,176,198,232,85,244,27,210,109,192,172,45,36,166,233,242,
+187,136,183,128,139,165,240,145,199,53,43,29,87,177,137,194,106,138,166,46,180,161,73,67,43,216,85,217,55,29,54,37,82,119,144,215,12,83,130,70,210,218,251,247,157,41,73,58,154,225,141,133,112,182,252,174,245,134,206,48,163,244,162,100,190,247,157,13,16,88,198,226,48,176,138,194,24,4,245,105,97,57,20,119,147,84,78,165,152,150,166,163,217,244,217,186,61,99,60,161,52,20,84,164,157,226,196,110,134,6,93,215,162,165,49,53,112,107,234,108,136,128,108,99,188,17,103,128,178,241,98,83,182,137,109,111,201,150,211,146,105,184,95,27,196,77,246,163,249,240,84,58,147,11,38,21,198,118,139,3,245,55,160,62,19,234,40,89,47,53,235,103,140,225,116,217,74,95,34,211,101,165,217,184,128,13,46,245,173,18,126,127,238,103,219,15,103,65,202,80,122,97,223,45,12,101,186,227,18,152,22,155,212,60,169,124,145,7,250,247,83,108,246,182,165,193,108,204,58,174,19,184,89,31,14,29,135,79,26,38,50,176,209,115,178,23,58,199,103,11,0,196,50,91,225,132,
+145,3,125,18,18,192,161,58,222,40,77,211,7,57,68,73,88,230,104,238,149,81,227,99,138,222,103,233,88,246,141,103,137,179,3,2,198,230,41,135,102,248,122,222,96,210,96,131,175,137,62,214,36,205,71,47,213,233,53,163,60,238,50,8,91,75,196,126,198,88,75,80,249,20,109,226,217,209,163,6,221,25,6,206,178,104,236,7,204,136,60,94,5,244,153,102,164,207,44,19,97,203,34,122,77,192,80,198,123,84,22,55,157,192,224,146,214,170,124,193,3,81,191,77,7,173,93,40,56,64,227,231,72,183,144,167,22,114,5,93,205,118,158,107,30,102,182,16,254,92,112,112,108,100,20,219,196,81,133,156,219,250,46,226,210,64,167,17,97,222,174,43,131,155,18,131,143,8,170,4,101,134,91,239,243,24,136,171,95,190,39,61,168,121,123,201,136,88,218,206,74,33,9,82,246,114,176,152,104,105,128,130,13,162,220,14,244,190,133,144,134,229,166,38,26,79,76,117,47,165,240,53,214,190,171,60,155,134,211,201,46,33,185,218,97,59,119,65,84,174,124,120,155,230,30,178,
+64,138,223,29,244,77,213,97,147,215,194,24,17,47,162,174,112,112,184,9,211,61,227,38,158,72,130,141,179,211,200,72,114,57,50,108,10,2,39,66,184,112,197,23,182,7,19,76,94,131,218,148,103,40,47,37,136,122,50,243,89,171,2,62,82,56,8,7,151,230,61,128,186,179,167,25,165,132,76,195,156,8,53,18,68,255,6,191,231,197,96,27,205,26,204,143,58,77,135,124,70,221,239,195,7,135,87,130,243,178,93,168,143,130,170,242,126,20,84,8,219,145,102,174,217,186,103,46,108,164,113,199,23,0,120,214,144,192,68,25,238,23,70,93,6,229,228,23,177,194,196,180,40,244,143,136,176,190,127,230,253,196,83,30,18,34,53,71,218,186,107,225,19,160,123,65,34,5,126,1,167,241,111,95,61,42,248,120,237,146,154,76,147,231,202,250,0,39,240,6,12,14,178,133,106,214,102,136,236,162,137,30,63,197,1,246,18,237,86,156,219,74,182,247,180,93,91,0,192,68,88,212,115,1,19,23,227,49,153,48,144,221,98,57,179,230,222,97,252,40,106,51,44,202,43,76,
+218,194,160,88,107,179,204,51,198,29,83,74,27,25,158,6,104,199,206,16,33,30,4,109,216,220,6,179,189,84,229,7,168,114,205,7,37,185,145,23,107,208,133,189,3,250,136,217,187,174,31,80,121,101,238,140,129,50,123,74,55,33,12,19,74,34,102,5,229,72,171,239,240,221,186,16,47,135,93,22,167,177,76,160,107,121,12,8,251,209,123,87,244,10,101,214,92,56,108,112,87,138,53,102,182,138,8,51,98,96,69,96,233,23,30,112,220,159,149,10,122,24,45,149,126,230,92,209,176,233,39,198,214,106,119,50,33,155,204,235,230,114,245,98,100,60,210,176,249,195,206,2,103,204,74,57,112,12,41,94,30,100,173,93,243,149,35,47,23,148,193,76,141,181,140,160,66,73,120,9,48,17,23,37,47,192,180,220,147,84,76,205,25,35,210,133,29,118,80,15,103,127,117,119,59,190,153,89,77,61,185,17,63,149,179,58,227,67,89,192,102,12,49,248,89,237,178,3,53,199,68,217,30,202,92,218,46,5,87,6,143,218,95,166,109,34,99,223,155,254,32,107,51,111,94,154,
+249,168,225,2,198,61,60,17,151,87,114,73,136,149,84,143,89,208,222,182,118,93,56,60,170,111,82,156,78,129,166,107,33,177,40,96,143,65,4,150,217,39,53,231,105,118,88,0,118,26,182,182,39,128,53,146,115,199,71,241,217,187,216,212,218,159,188,48,174,88,121,80,90,114,80,91,230,8,68,50,69,28,112,184,1,66,136,31,28,226,139,162,16,7,214,209,249,165,247,112,189,122,218,221,91,192,192,139,130,20,248,19,112,201,229,24,113,167,142,142,191,252,232,232,194,211,255,250,188,85,130,14,193,75,20,120,161,188,56,103,104,228,53,56,173,186,219,80,110,128,45,173,227,62,4,8,59,126,11,159,87,222,11,251,189,247,208,32,126,129,199,93,101,204,42,31,74,97,150,40,214,7,88,123,247,222,134,134,228,105,221,163,213,189,201,194,52,204,54,4,254,60,228,45,217,251,66,161,144,3,198,170,235,27,41,189,13,13,162,206,91,171,203,164,31,130,186,191,26,230,210,111,62,20,121,154,14,71,145,151,45,1,244,189,128,10,109,33,231,68,205,123,40,220,34,158,
+145,95,125,89,37,84,162,82,152,135,21,212,176,77,129,110,169,120,29,60,208,37,181,134,183,48,149,93,215,178,194,165,86,13,19,42,132,55,178,128,219,132,73,181,139,111,19,154,195,11,65,61,81,130,104,128,129,137,153,151,81,128,150,39,82,61,149,251,91,250,89,183,40,214,3,89,220,251,235,180,226,139,95,45,73,81,128,73,20,166,152,53,151,253,94,54,108,69,18,111,123,20,31,2,103,30,32,157,183,161,108,35,45,121,56,197,220,197,131,149,165,97,170,164,8,44,176,38,42,224,251,134,193,182,153,217,115,235,77,134,200,241,144,192,65,154,73,108,182,168,47,210,149,166,206,121,231,193,29,210,176,76,239,165,140,17,185,196,32,81,200,229,135,17,152,66,3,193,39,45,132,197,218,49,161,247,87,219,54,212,2,37,46,115,234,162,24,169,63,142,161,22,226,48,237,247,48,91,114,234,101,33,183,149,113,16,229,154,3,193,89,113,163,131,242,218,124,63,197,153,193,46,198,5,189,212,195,209,196,170,148,108,39,146,25,5,157,194,77,34,194,22,143,246,77,118,
+39,189,92,66,136,228,34,248,81,125,81,113,64,192,103,191,27,230,236,98,129,149,75,201,136,142,3,62,107,137,239,65,167,206,23,210,94,23,196,7,149,142,22,184,67,46,123,3,142,82,122,7,4,149,141,191,85,40,208,202,224,124,242,98,103,102,153,210,48,233,174,112,5,170,66,8,54,118,215,245,71,253,185,247,154,165,45,124,43,154,117,183,166,23,133,51,107,64,233,138,174,203,200,171,195,33,93,0,100,40,236,114,86,218,169,124,81,142,49,21,144,206,33,126,107,187,114,150,100,173,252,243,36,123,0,147,79,227,19,219,236,172,56,163,20,86,60,154,77,216,85,51,238,72,20,82,182,249,216,192,166,103,222,3,135,206,152,30,148,103,211,84,74,125,183,24,176,232,115,196,213,166,141,184,218,222,229,194,77,173,116,15,101,7,81,1,132,120,13,166,228,206,198,212,219,25,235,125,216,179,101,20,227,186,187,208,90,35,95,179,197,143,33,107,165,229,12,49,206,91,155,18,186,101,73,110,25,241,169,65,60,189,178,14,222,149,41,211,155,124,114,75,201,30,156,210,
+214,76,99,75,220,122,179,138,195,5,253,76,181,247,252,223,191,133,248,159,254,203,127,253,255,226,45,196,239,127,245,251,239,255,224,148,254,234,235,139,136,223,125,249,253,55,63,124,243,221,183,63,253,224,150,127,247,117,243,31,190,252,254,135,239,127,252,233,251,31,126,254,2,30,250,229,207,254,225,231,111,191,252,31,255,238,248,166,221,247,191,250,241,39,167,244,119,127,251,139,47,63,126,243,211,207,63,124,243,211,175,191,255,221,215,91,63,254,211,79,224,30,240,206,31,190,249,237,31,215,255,227,55,63,254,237,255,207,222,78,252,195,223,253,119,239,39,186,40,95,126,247,205,63,128,171,143,68,125,229,226,147,197,63,190,133,248,237,7,91,255,226,205,193,47,127,246,159,126,241,229,191,252,226,203,239,190,253,229,247,95,254,235,159,127,249,251,111,65,8,95,126,5,114,240,243,239,127,7,254,230,102,253,230,24,166,159,191,252,244,253,63,124,255,211,247,127,52,253,243,95,252,197,255,171,55,24,255,240,79,255,252,187,111,92,232,159,191,2,249,48,255,243,255,248,162,
+228,231,49,95,254,236,99,201,55,159,65,3,99,15,46,254,245,151,223,255,246,244,162,229,41,92,191,254,242,205,49,70,63,255,226,203,231,226,143,207,143,158,254,113,237,119,255,221,146,227,191,254,252,47,254,31,189,49,121,177,36,36,212,115,251,197,18,242,230,196,227,249,66,55,215,123,115,222,70,66,152,94,29,14,241,122,205,196,61,93,95,95,51,9,222,8,18,33,116,29,138,116,118,104,183,36,77,47,199,201,90,198,126,137,44,111,16,4,71,228,73,116,30,4,87,93,59,76,210,75,94,223,105,203,28,38,139,39,69,207,87,201,215,66,115,173,161,105,217,236,54,129,34,205,210,51,76,154,251,249,107,144,27,20,90,196,92,27,231,58,113,206,128,115,89,77,8,89,206,37,170,31,10,118,164,94,30,96,70,201,241,200,94,114,141,231,193,171,119,188,203,103,145,203,207,228,63,13,212,86,211,19,127,20,105,94,106,87,102,244,188,91,27,204,52,89,227,115,136,190,187,74,94,190,88,102,0,61,155,219,6,85,60,7,12,122,211,91,136,240,143,216,224,53,93,104,
+10,22,96,230,101,55,238,23,9,13,205,134,5,227,158,86,82,119,210,148,47,236,73,69,100,195,72,18,252,41,14,85,235,208,22,245,158,191,144,225,59,205,209,44,47,97,202,125,229,153,213,149,198,135,201,108,236,83,61,114,219,115,134,139,232,171,6,228,249,105,142,190,211,217,97,162,119,31,212,3,127,56,191,127,118,64,31,212,227,110,144,101,130,79,30,216,154,37,235,12,42,155,46,155,152,36,19,126,213,231,216,203,249,76,57,254,146,182,222,98,46,212,219,149,4,27,132,193,91,154,221,3,182,204,132,175,226,103,143,213,193,28,136,46,183,162,5,141,129,6,226,7,166,230,65,232,68,122,101,215,52,116,218,27,147,121,33,248,4,185,113,155,68,153,206,139,56,239,100,152,164,56,161,136,213,61,253,246,121,245,132,28,72,148,27,98,239,117,85,51,192,139,188,215,43,89,206,138,49,19,198,10,221,141,135,236,191,77,119,137,9,142,60,73,201,134,169,82,163,238,149,251,36,170,153,67,247,229,29,149,12,187,8,161,114,252,130,4,198,231,94,88,158,124,225,100,
+242,93,70,208,64,160,205,187,40,228,38,202,32,196,77,196,37,13,207,231,182,11,208,249,158,19,80,241,241,101,224,74,253,4,135,246,18,194,23,150,49,21,102,218,89,15,23,120,124,17,125,193,83,44,0,69,131,19,123,63,127,198,89,97,100,114,81,53,226,162,104,118,86,95,56,125,224,68,163,92,82,52,141,151,93,143,237,40,228,84,207,213,62,174,145,162,240,172,25,153,63,164,113,184,252,85,2,141,64,162,220,126,95,202,116,22,213,215,1,74,193,147,180,32,33,25,230,213,101,25,151,99,97,151,202,11,199,126,67,45,209,105,125,228,88,113,161,196,110,236,21,59,195,233,134,72,0,197,18,122,206,32,100,67,83,155,55,136,50,60,42,236,142,65,77,77,132,146,29,214,12,161,17,59,168,123,124,38,155,53,92,42,228,221,125,147,84,181,217,130,216,210,3,174,41,227,145,148,245,241,182,33,45,71,183,124,223,59,229,65,254,60,212,227,108,44,201,5,61,23,98,71,245,46,182,64,100,117,48,38,152,189,118,255,52,75,53,91,237,188,219,191,201,36,46,61,
+89,91,197,83,143,103,25,55,244,137,44,194,184,113,50,184,86,233,122,152,234,46,135,99,8,122,3,157,219,188,125,173,18,213,203,238,6,126,224,45,238,7,234,181,220,213,158,115,152,229,69,239,178,119,249,91,143,178,37,213,197,29,147,201,203,184,165,115,118,60,234,190,40,32,109,36,20,239,128,72,218,185,122,227,164,137,60,161,188,52,30,137,120,126,18,207,39,190,220,64,170,147,81,117,162,82,56,57,55,83,44,108,113,243,92,245,158,65,252,111,198,125,59,0,4,93,23,150,155,162,213,232,14,90,175,213,89,42,219,102,56,95,4,110,95,134,183,240,238,142,81,119,93,251,194,24,55,60,100,203,235,71,91,71,165,100,184,42,170,217,119,133,6,1,66,171,2,168,108,80,214,162,175,75,162,13,97,90,109,78,46,202,150,30,100,78,136,217,202,217,21,161,119,59,185,9,200,253,170,32,70,133,117,97,194,158,43,30,94,30,186,17,66,185,102,121,2,119,23,165,120,201,57,55,26,31,54,236,92,185,0,193,17,192,158,79,109,14,194,146,234,42,35,189,91,162,
+89,123,134,62,108,230,37,248,142,61,215,132,66,149,135,179,158,180,92,189,202,211,251,72,20,62,67,93,220,59,7,197,178,8,207,32,23,75,27,224,110,25,202,225,14,9,183,117,36,111,162,75,196,250,129,119,191,26,177,99,165,21,156,95,84,7,44,141,251,46,131,94,233,89,11,233,249,99,50,61,187,175,188,24,193,186,114,51,235,115,170,47,213,202,157,20,0,163,78,197,37,135,240,216,35,186,180,156,237,59,211,145,225,114,203,180,109,223,221,183,11,109,113,55,220,84,18,183,165,252,170,93,237,136,213,86,189,106,198,168,185,149,67,130,123,207,177,10,183,82,182,226,214,141,118,28,116,87,133,202,221,102,102,172,167,223,158,154,220,226,67,207,104,145,215,123,222,70,19,87,170,56,131,165,226,1,202,53,136,247,69,171,102,79,243,49,12,182,197,123,0,217,75,80,229,117,119,232,117,221,127,121,88,181,175,86,239,220,90,187,162,111,87,200,109,11,175,92,165,42,207,51,57,206,52,118,129,127,9,85,120,23,51,139,81,95,239,47,246,180,89,38,133,172,232,224,
+180,195,66,3,121,239,155,50,183,194,199,242,121,252,140,39,58,20,166,164,121,17,222,28,102,150,55,218,185,88,180,144,7,67,162,77,39,147,69,221,36,134,25,156,36,240,34,73,43,109,153,123,138,208,162,122,35,188,93,211,122,240,167,213,174,154,239,161,112,89,73,122,89,17,233,99,2,97,202,95,45,134,238,135,90,111,254,192,139,169,19,71,246,238,214,254,176,194,114,219,237,89,3,253,112,255,129,229,211,236,121,47,194,40,139,173,238,155,211,13,95,249,138,15,45,183,209,69,253,174,164,126,221,188,217,130,97,9,98,176,23,180,206,134,114,153,96,85,201,82,40,114,25,118,93,123,165,62,166,26,162,61,202,165,191,222,105,203,55,172,183,68,164,69,145,185,29,239,68,165,79,26,115,146,210,231,126,121,207,165,20,203,251,203,198,153,219,97,74,87,36,233,242,187,71,162,144,163,173,102,79,229,44,31,232,202,100,146,29,167,89,112,103,196,232,102,77,74,110,239,251,248,135,246,139,6,81,222,95,243,158,52,182,184,70,238,72,227,116,207,12,19,117,228,66,235,
+25,249,234,178,140,234,235,230,93,251,245,59,4,14,73,143,90,67,197,66,2,145,151,133,14,206,30,32,175,135,107,214,117,123,173,108,39,35,237,88,67,217,153,96,82,140,34,58,230,225,222,93,246,174,148,50,86,233,98,45,218,106,43,101,1,145,162,36,209,202,34,205,56,236,110,231,72,215,122,200,124,52,97,80,27,247,115,100,38,59,84,174,236,62,63,212,223,108,60,45,117,51,90,250,109,173,202,166,149,209,126,184,114,109,237,11,247,238,247,112,180,243,212,64,97,223,239,2,158,134,230,46,117,83,12,203,149,115,198,134,81,181,5,9,55,246,26,147,122,208,161,174,14,231,9,144,164,194,161,238,156,95,164,222,82,165,59,193,22,203,86,144,87,7,175,24,185,45,168,214,119,109,247,240,189,130,66,101,152,214,235,30,98,29,16,93,182,172,28,249,206,213,240,113,88,166,12,132,142,247,138,114,229,123,29,253,89,124,224,205,196,178,109,119,223,158,83,212,106,162,7,126,95,162,245,178,184,198,11,149,210,187,66,105,252,123,170,148,209,17,48,214,247,64,206,115,
+63,205,55,172,94,249,84,89,192,98,131,67,91,187,253,44,121,249,63,235,122,143,230,102,186,40,61,236,175,204,202,91,141,84,242,194,63,192,63,193,75,45,70,37,149,203,101,149,70,53,210,168,74,90,17,77,52,17,26,68,70,19,36,114,34,2,17,9,128,200,145,32,1,130,36,50,136,72,68,130,200,57,103,223,126,191,145,173,146,237,37,193,115,239,61,231,57,207,57,247,57,253,190,77,32,233,240,237,35,60,41,223,212,62,32,95,58,181,10,241,227,197,169,116,27,190,158,254,172,34,145,134,174,52,89,108,82,107,18,137,232,227,191,239,158,36,211,155,230,244,67,248,16,139,62,159,124,8,162,33,77,65,70,87,220,198,104,237,99,110,183,55,159,226,11,203,0,114,126,94,78,199,184,30,183,219,187,25,13,38,130,222,102,0,121,183,101,251,209,12,166,110,28,233,167,14,140,132,199,241,73,82,127,163,45,74,78,209,217,196,96,249,197,43,254,220,217,146,140,162,234,198,242,3,199,164,181,223,92,31,134,142,91,103,163,55,229,93,231,65,89,146,34,148,105,115,
+86,249,190,228,154,119,38,85,98,17,217,136,250,183,172,1,31,189,21,139,156,208,135,240,247,35,184,111,199,6,156,221,237,129,98,105,143,203,45,62,35,163,208,137,231,84,210,153,202,219,91,151,79,163,192,179,207,164,123,142,143,155,131,3,115,96,198,105,151,169,221,39,108,249,152,29,175,4,240,172,117,21,245,21,60,203,193,162,232,188,28,186,30,110,203,36,247,75,226,163,67,99,149,124,245,148,235,173,224,57,252,182,151,66,193,242,67,254,49,95,231,231,109,46,115,30,142,204,93,147,121,139,151,72,55,89,148,79,56,124,123,135,191,189,35,92,220,221,193,92,225,93,51,210,177,188,86,59,139,223,199,231,147,154,182,216,43,116,167,230,37,31,255,197,0,243,227,179,201,143,124,189,232,252,36,212,109,210,137,140,105,139,155,154,220,81,92,72,141,104,119,157,208,175,21,207,16,252,242,199,111,11,26,63,157,89,97,211,216,160,107,126,119,173,113,238,60,84,228,198,84,202,87,187,217,95,145,185,33,68,172,16,45,181,229,126,237,119,88,95,100,9,228,111,99,174,
+56,74,229,119,200,47,249,100,209,221,244,58,151,79,57,47,103,80,74,60,36,103,37,6,71,237,182,14,25,60,1,181,109,228,165,87,191,214,87,84,117,155,78,56,27,54,159,59,227,12,150,155,179,175,149,217,108,22,222,185,132,217,165,198,145,254,217,205,247,196,121,83,242,219,69,89,160,79,243,238,112,84,235,19,213,226,101,231,107,61,227,107,190,102,97,153,234,220,9,206,130,39,35,59,17,177,218,207,8,191,210,53,24,158,176,85,23,228,144,239,251,17,54,15,149,232,138,143,18,246,132,210,231,213,248,209,154,240,139,60,92,42,148,183,81,19,204,78,250,96,156,180,78,76,211,5,126,245,249,198,63,47,4,240,129,44,138,115,179,222,227,162,27,102,201,138,227,81,97,138,87,108,239,25,215,91,202,42,60,46,162,42,84,65,249,186,98,81,54,188,46,187,178,246,233,184,59,165,200,156,125,21,169,81,106,239,72,237,142,24,114,43,1,103,168,149,26,167,126,39,58,215,240,243,193,11,104,80,43,93,160,139,54,79,152,245,60,185,74,55,22,109,44,253,232,124,
+53,22,108,120,201,111,248,158,192,189,163,217,172,183,125,255,128,221,233,209,107,154,153,237,53,179,182,152,78,31,220,230,115,178,22,232,33,199,227,9,169,246,83,147,47,86,222,216,213,73,147,145,108,238,94,167,133,114,74,156,225,102,107,120,234,80,10,181,174,207,96,172,230,6,64,80,146,133,47,220,74,126,85,172,63,124,169,225,73,175,175,134,171,195,251,95,43,34,165,21,54,5,221,196,213,196,21,187,73,121,186,17,89,201,237,99,233,244,75,252,200,27,212,85,53,42,36,203,20,91,27,15,106,146,254,46,119,170,149,146,96,139,151,82,115,70,3,17,230,163,139,81,64,69,121,82,229,88,3,231,48,96,61,181,121,151,46,226,113,99,250,24,34,179,124,235,150,242,197,96,39,59,102,173,206,60,122,96,40,100,238,23,43,171,58,186,178,94,91,98,213,214,167,226,164,187,166,158,109,179,11,212,237,189,187,91,254,100,6,250,183,52,55,254,154,7,195,251,207,136,245,123,210,102,134,229,3,228,120,51,118,21,146,233,253,85,224,126,247,140,251,37,92,126,44,195,
+158,11,226,110,119,106,247,210,235,179,236,164,43,116,21,175,237,54,27,31,46,73,131,85,45,249,120,89,208,211,39,119,47,103,82,139,22,145,6,79,8,121,111,253,124,24,120,149,198,230,107,185,222,52,147,75,175,149,98,45,27,190,71,159,214,66,52,231,76,37,242,148,177,141,99,131,101,143,140,66,130,118,252,178,24,158,185,2,226,206,193,166,78,136,148,41,110,215,61,13,86,205,11,202,137,79,113,14,110,29,135,228,7,195,69,19,136,10,187,12,162,212,217,86,157,67,24,162,108,231,137,19,225,23,39,232,92,92,95,146,150,207,14,191,222,246,104,242,123,230,57,229,121,161,41,170,90,207,181,128,128,65,174,62,158,108,240,211,240,201,220,206,199,100,31,46,65,96,101,50,51,191,2,89,215,225,194,170,46,31,151,165,43,114,185,98,220,158,253,149,221,27,84,190,151,20,164,2,233,220,249,249,182,181,207,162,49,37,119,64,93,36,11,67,233,99,17,207,109,123,80,52,235,182,156,31,222,66,90,2,100,142,247,104,239,26,215,211,195,36,150,248,18,252,66,83,
+97,224,188,240,173,92,220,210,89,52,120,129,132,230,31,242,171,239,247,214,6,93,11,216,144,178,89,105,154,171,130,235,237,75,234,124,150,40,214,135,224,104,126,32,187,98,38,11,201,156,113,63,177,10,9,247,87,55,37,125,242,189,200,37,156,186,241,1,254,18,177,67,70,4,218,115,219,84,230,211,231,109,251,142,55,120,225,123,98,198,62,101,255,50,26,68,233,47,184,163,193,78,221,93,60,237,146,102,90,55,108,73,211,58,62,97,189,218,88,24,81,103,73,212,139,48,23,111,56,198,78,193,25,83,107,196,82,98,220,250,70,243,143,6,91,122,28,248,160,169,105,95,130,229,222,250,214,116,164,66,43,135,232,192,104,82,219,168,125,176,254,113,126,55,40,70,157,60,148,157,156,245,138,178,194,59,59,231,134,168,98,230,100,250,76,227,58,201,145,25,42,219,11,254,76,98,78,179,145,120,232,103,97,38,198,70,55,156,239,251,153,212,213,10,173,100,245,154,227,51,56,191,131,127,226,25,17,125,94,155,196,126,47,155,143,34,46,239,88,241,95,108,113,140,91,235,
+247,78,64,202,181,84,15,55,234,254,2,242,229,144,221,229,77,233,245,36,202,166,161,156,78,134,22,174,166,222,222,246,100,106,21,94,95,208,17,162,141,187,237,131,174,217,166,122,25,124,175,122,172,91,244,222,84,131,63,165,148,37,97,228,112,12,113,123,121,148,72,27,104,68,191,237,131,201,145,176,239,181,221,23,241,93,179,204,125,166,48,86,165,126,145,155,121,181,223,199,225,128,143,84,15,177,158,63,234,159,49,218,104,118,191,180,57,181,111,99,138,67,189,118,154,197,173,46,227,73,119,129,220,137,218,238,30,229,73,24,113,54,225,192,178,63,13,144,80,197,199,233,60,201,230,101,4,178,209,216,47,40,243,207,166,158,127,232,253,45,32,17,134,192,212,53,8,53,201,47,52,220,237,209,187,84,179,171,113,207,249,14,174,194,93,141,242,178,82,124,249,244,62,111,14,113,13,243,156,13,60,7,110,252,165,151,202,224,230,104,202,61,179,17,129,178,60,160,210,159,239,75,161,239,206,235,45,103,222,9,197,88,218,55,199,117,208,144,161,249,60,147,90,8,89,19,
+122,85,173,103,20,28,138,109,124,31,85,190,94,196,171,196,243,143,148,143,119,22,76,207,31,1,63,12,79,79,239,58,227,169,222,245,118,140,53,171,84,242,158,209,93,162,197,157,214,116,114,91,243,179,144,84,138,62,205,145,226,71,19,237,89,238,178,25,213,147,56,86,183,79,113,146,125,225,227,130,26,229,188,86,175,230,164,185,204,69,87,225,108,87,221,147,241,116,61,45,226,174,10,178,49,229,228,233,120,103,33,93,176,156,79,215,144,180,42,76,145,203,238,24,55,119,130,173,210,91,95,233,105,70,121,225,248,153,242,205,63,240,218,152,250,3,186,58,255,4,81,127,250,55,128,150,116,15,164,155,240,51,137,92,190,176,253,122,215,251,108,203,143,55,250,95,189,22,13,207,40,240,68,101,223,113,215,129,57,28,196,8,62,61,244,253,65,181,199,77,173,222,149,173,245,86,225,187,134,90,126,232,156,165,100,206,135,86,88,249,157,25,153,183,216,87,121,36,171,197,254,66,158,12,197,95,118,245,27,33,197,165,205,184,126,82,213,75,3,39,75,118,78,226,145,102,
+127,121,10,55,125,30,173,96,209,238,71,14,222,249,10,185,242,166,58,62,74,165,80,59,223,189,140,111,239,90,145,212,251,252,93,183,140,235,173,110,143,165,115,73,122,121,25,162,149,45,101,225,53,139,235,229,100,192,211,133,151,193,79,43,249,106,164,126,18,171,110,126,239,83,199,98,251,106,105,74,198,111,123,220,250,248,147,235,232,81,161,180,200,104,123,245,245,201,238,57,143,26,113,107,76,221,13,251,249,81,94,105,204,151,183,79,158,228,67,30,186,224,60,17,201,176,49,89,11,161,63,166,225,231,166,162,29,34,63,246,223,111,85,219,78,230,205,125,27,25,210,203,251,30,94,171,112,82,243,241,27,97,113,159,18,178,240,40,105,236,219,82,199,158,125,193,121,85,126,142,151,172,194,167,38,92,236,186,40,250,226,247,145,247,29,125,62,252,62,44,89,175,191,79,215,241,225,45,139,179,223,44,244,115,196,35,213,231,104,17,29,171,42,220,231,18,238,253,165,113,222,191,250,214,212,199,54,205,215,57,116,216,185,5,10,51,15,254,245,121,198,15,181,237,13,66,
+240,52,131,242,77,253,45,153,104,40,208,192,187,238,120,67,44,236,12,86,55,140,90,221,197,204,46,201,249,69,230,133,109,134,208,70,31,178,84,181,221,144,207,63,203,124,203,210,5,143,173,16,67,220,8,47,163,253,106,30,210,242,217,246,120,205,174,71,201,230,15,193,232,135,159,170,218,29,182,138,122,166,214,26,149,163,51,113,18,188,188,194,89,149,241,133,119,92,34,220,253,106,223,232,239,3,255,123,84,106,124,120,24,151,106,139,246,143,235,185,62,80,14,156,215,123,79,201,182,46,240,150,123,207,155,80,100,182,182,174,93,189,101,254,144,88,30,166,26,147,109,174,9,85,46,229,29,158,236,66,123,153,245,78,148,210,170,245,229,54,249,20,247,14,9,162,3,147,247,74,8,243,123,105,245,120,189,231,68,187,133,209,89,95,252,101,220,127,79,180,211,167,146,254,75,200,171,170,26,90,223,246,167,242,222,121,60,40,81,11,159,95,61,24,52,103,28,241,176,55,7,103,253,88,196,32,204,178,75,159,190,135,232,217,198,154,158,117,116,150,63,31,127,34,199,198,
+22,171,79,156,27,64,237,246,77,60,197,108,156,110,115,163,236,181,70,229,5,35,96,210,1,230,84,66,153,195,131,110,5,237,157,213,9,249,156,233,223,136,129,94,149,76,218,99,46,148,28,92,82,146,199,107,214,94,206,149,137,76,159,189,94,134,218,21,113,202,228,162,1,57,217,98,238,197,41,122,244,237,227,238,239,99,184,31,126,64,75,23,23,59,56,254,99,26,199,200,253,53,241,49,63,158,135,163,85,182,78,229,84,43,73,69,121,211,170,98,37,188,205,71,199,43,91,123,151,78,63,222,166,23,214,123,238,45,55,189,200,54,41,197,199,236,239,183,230,233,129,183,9,31,197,151,58,99,99,48,40,94,180,184,5,93,236,23,73,175,92,175,237,176,5,224,50,212,27,83,142,39,231,215,128,85,143,136,162,66,249,169,143,246,215,215,58,149,40,53,157,76,66,1,243,219,214,68,123,189,185,248,148,33,203,187,151,182,77,192,63,199,39,63,16,225,254,230,107,42,42,231,149,26,227,234,82,14,237,159,145,62,158,123,147,65,162,134,71,169,213,21,61,167,167,34,
+206,50,250,38,54,247,105,159,196,177,160,144,104,237,2,233,120,1,62,254,114,86,224,246,233,30,83,245,120,247,6,217,131,177,204,217,244,167,166,129,100,127,27,124,249,172,234,123,110,165,185,19,40,228,70,188,34,61,115,76,5,178,23,207,10,142,247,107,30,18,167,164,196,125,57,122,124,242,90,7,108,1,109,192,116,116,77,74,82,255,57,184,63,211,141,149,157,81,184,59,26,133,87,9,253,43,41,35,248,108,22,121,151,188,203,231,17,125,64,252,184,116,140,101,71,141,104,244,245,179,236,243,52,218,183,73,251,208,248,196,229,19,45,253,133,185,86,199,191,64,155,196,197,106,172,243,117,110,221,95,195,221,242,110,250,157,235,189,126,107,77,46,195,38,23,154,141,175,57,178,159,149,203,183,16,44,119,4,229,195,203,42,157,103,244,101,33,133,55,111,254,18,78,75,163,12,229,99,178,175,5,43,151,70,183,237,149,53,19,146,62,250,175,204,219,245,36,228,77,132,84,143,134,250,79,229,104,142,28,156,140,173,216,31,215,25,161,59,22,114,146,63,234,125,81,191,
+222,194,228,175,60,177,208,57,41,144,47,186,71,153,222,98,189,221,168,135,153,150,178,165,172,140,158,60,182,253,156,82,214,155,103,206,143,253,71,159,125,147,59,189,244,221,95,134,95,27,237,157,50,118,155,197,149,1,78,48,64,178,124,118,117,105,10,182,186,161,171,76,159,28,54,193,95,215,209,134,146,182,143,83,59,76,167,210,61,116,152,226,247,112,100,249,46,202,121,60,170,167,247,93,94,223,14,175,2,81,98,47,14,21,89,163,228,231,242,153,215,39,244,191,210,52,213,231,238,171,252,113,190,239,153,148,10,248,90,167,104,32,63,140,91,63,180,165,117,70,200,207,15,131,11,167,13,217,91,238,244,249,100,245,166,17,127,0,90,75,237,13,130,75,214,56,197,116,181,96,31,103,24,17,141,92,151,175,254,122,153,24,20,133,129,194,154,22,63,77,216,193,216,145,84,240,123,184,53,169,251,83,111,150,228,246,56,210,205,201,89,255,13,234,106,136,53,220,238,100,68,123,73,207,15,59,53,167,66,202,248,225,44,202,70,121,177,111,99,206,15,243,69,15,163,75,
+243,226,21,86,46,61,233,20,252,28,120,137,197,151,36,219,46,93,181,44,196,247,65,7,69,167,17,187,119,85,231,122,43,170,250,233,129,180,219,135,121,39,38,181,163,106,136,36,215,206,112,178,124,62,15,46,158,23,87,173,212,245,17,230,125,133,175,172,158,195,135,71,242,124,20,189,113,243,82,74,61,210,199,75,134,204,217,149,205,233,148,183,76,112,64,71,165,245,86,189,207,132,76,41,28,111,156,169,170,39,125,28,249,190,205,243,74,58,126,108,229,175,219,154,125,241,189,234,121,46,241,21,183,223,147,155,40,188,252,42,22,197,231,44,190,90,225,71,74,120,205,157,41,55,252,230,166,29,238,229,68,113,193,27,137,22,47,245,31,196,42,27,38,235,111,215,5,103,240,247,42,160,182,134,249,222,201,250,39,165,59,135,246,225,67,60,211,144,67,235,225,78,249,181,136,107,234,109,209,225,134,209,126,216,70,20,89,1,154,105,117,196,133,110,162,33,56,167,13,230,138,175,92,175,112,244,142,55,246,57,79,189,119,181,159,4,46,223,106,46,169,250,236,147,220,119,
+32,234,234,211,138,201,117,141,67,221,93,158,52,182,77,52,39,8,96,31,149,75,253,68,124,77,41,123,105,132,231,172,176,84,90,183,28,199,212,248,251,179,126,92,203,229,21,226,118,169,74,60,137,127,159,131,109,68,73,59,217,140,195,105,91,208,27,247,14,53,118,238,187,55,234,20,207,167,231,182,147,231,252,42,197,203,214,10,170,95,62,233,151,122,143,39,173,27,167,69,246,118,105,127,87,18,20,191,246,171,169,166,164,45,190,241,132,67,225,146,254,40,249,93,234,17,164,144,226,32,63,225,30,43,50,187,29,200,18,137,65,27,250,160,240,30,141,190,234,15,209,205,157,173,66,132,220,116,19,91,190,212,198,179,235,149,161,76,171,170,78,230,211,254,58,239,178,57,63,151,13,239,83,125,216,7,163,98,127,202,51,24,62,207,139,222,126,251,155,83,168,120,51,102,143,105,202,213,141,55,155,132,118,112,51,169,139,230,245,251,211,146,40,93,73,213,199,159,222,210,40,229,174,69,115,7,235,167,124,1,159,53,180,15,87,223,238,71,98,16,227,75,164,226,76,207,
+63,218,146,3,121,231,9,120,181,124,165,223,250,238,89,183,110,186,46,234,38,73,13,162,244,28,63,16,122,3,141,107,119,229,150,208,186,255,209,28,236,126,45,92,173,87,109,20,91,252,230,181,32,159,190,52,40,92,162,166,38,234,245,103,50,183,196,184,123,100,90,14,204,61,187,154,61,80,241,3,163,249,130,244,76,143,157,214,14,177,36,28,245,203,178,4,19,155,191,47,68,108,142,218,250,211,201,229,196,126,234,62,223,197,83,112,116,201,152,234,111,190,16,1,254,174,246,59,113,198,47,155,169,120,243,5,162,68,234,55,23,29,232,56,74,219,28,155,81,215,87,138,232,38,249,223,7,210,244,163,49,109,253,62,207,178,11,227,175,128,88,52,138,113,133,26,135,29,152,6,212,51,10,37,212,58,241,108,95,23,63,136,126,210,213,100,136,244,107,87,196,11,5,189,225,101,198,46,249,93,255,92,41,76,55,99,82,244,211,68,84,146,241,28,124,183,35,211,103,92,133,158,41,64,211,172,81,163,63,225,72,48,80,34,62,8,225,46,252,121,49,157,136,224,241,80,
+29,231,23,107,233,13,34,30,230,92,84,30,136,29,55,151,41,223,30,207,211,119,170,209,159,195,209,36,157,23,95,69,162,91,218,115,2,184,181,157,198,161,157,45,202,172,24,250,233,62,57,130,70,142,102,177,119,112,77,126,214,166,59,44,169,245,24,242,48,225,188,103,92,122,175,236,170,239,119,134,116,255,104,145,149,252,165,171,175,208,62,113,15,71,195,72,174,181,15,55,151,59,15,146,101,199,106,199,155,245,123,245,201,64,72,67,179,206,207,74,71,209,87,213,105,92,255,59,227,68,102,150,211,61,100,244,43,251,139,196,238,134,132,24,93,95,239,253,135,252,30,44,156,35,120,56,242,222,81,43,147,138,251,43,93,166,48,64,163,135,244,74,150,185,92,169,23,107,251,49,155,63,42,107,90,193,76,118,96,163,249,165,38,124,163,79,30,59,143,223,151,154,78,63,145,118,19,250,22,63,239,119,84,153,153,149,27,94,116,136,227,49,249,38,111,178,117,210,191,24,156,239,237,61,250,200,151,197,102,190,141,194,240,38,176,192,10,106,123,121,189,113,46,157,154,212,
+81,149,184,175,202,87,58,85,19,18,160,52,197,147,127,20,24,15,216,182,254,135,94,177,253,21,124,235,79,210,180,247,110,112,47,136,209,50,159,202,102,155,109,111,147,30,84,213,114,81,119,223,188,65,30,42,233,2,169,28,64,170,38,237,36,227,31,141,138,43,198,250,19,189,125,129,114,28,118,94,35,28,51,20,42,115,8,97,71,37,178,54,13,137,78,146,175,106,109,109,216,214,207,252,49,104,239,148,115,179,110,164,108,64,6,118,132,79,224,52,233,15,249,229,109,203,228,239,202,10,97,221,196,185,225,248,191,33,190,45,28,41,154,187,126,125,123,91,170,105,110,17,119,234,10,252,46,102,165,69,15,189,47,22,231,139,29,81,95,194,142,206,40,103,122,130,245,76,193,77,195,200,161,193,138,85,236,198,12,167,190,235,183,191,186,242,246,91,123,186,87,51,111,120,45,147,120,221,30,213,219,174,11,61,82,116,56,159,22,237,168,110,248,165,111,186,159,12,185,22,91,6,83,207,239,210,174,160,108,237,28,74,144,89,105,0,174,37,244,174,175,63,153,121,2,57,
+141,78,11,149,188,73,75,207,177,123,202,199,152,97,157,236,174,38,71,203,95,137,148,44,254,74,228,205,95,230,187,190,7,209,40,225,198,29,63,245,153,237,46,245,26,137,0,118,220,177,36,11,103,56,12,93,215,92,232,69,135,236,66,122,171,55,191,118,90,18,7,211,146,15,24,113,127,19,122,50,57,30,185,155,230,107,203,197,28,134,82,198,238,59,158,246,237,145,107,233,153,71,38,30,134,112,70,191,88,76,255,139,224,184,191,8,222,195,67,179,39,255,172,165,79,20,20,21,189,249,195,42,57,253,108,92,169,71,51,156,211,137,157,203,72,199,63,211,108,37,245,60,127,57,66,167,73,1,158,66,138,84,52,156,151,160,231,248,24,69,28,215,9,139,92,254,97,16,192,240,91,16,20,202,147,118,131,103,146,30,224,100,100,130,22,18,245,48,132,151,223,140,203,183,210,192,48,144,252,213,201,197,91,157,197,149,184,130,121,116,99,177,102,164,145,244,136,243,68,141,208,47,126,60,251,148,74,190,209,109,156,205,251,87,38,253,112,95,236,60,63,67,186,72,94,151,
+167,66,248,27,216,179,102,202,163,226,237,252,168,98,30,30,209,178,31,98,86,253,68,100,152,159,92,51,191,118,72,229,21,122,135,188,42,23,9,172,76,136,21,100,188,1,46,197,171,248,48,176,10,35,117,22,136,57,47,190,70,216,39,127,176,23,184,147,223,218,181,92,35,75,140,83,190,29,15,42,102,25,125,147,87,195,82,102,126,146,144,49,191,144,47,89,32,214,10,208,69,68,38,93,115,200,168,176,173,126,75,41,189,4,247,102,152,75,224,39,109,254,26,255,156,133,62,35,147,66,141,177,102,5,32,38,225,202,152,2,142,231,249,43,63,135,20,57,113,116,150,215,122,32,14,28,223,136,169,32,188,215,145,148,31,241,207,166,77,53,19,251,47,39,46,128,135,217,7,161,45,83,77,8,211,10,19,4,28,105,89,73,2,173,0,247,219,143,39,69,132,204,32,227,178,102,173,165,123,12,102,154,238,38,234,236,186,14,142,39,181,126,43,181,116,49,74,68,220,195,192,152,136,109,14,147,244,16,2,173,24,0,81,251,198,254,2,149,32,118,25,97,210,203,16,90,
+188,52,214,196,96,91,170,19,219,118,243,141,175,129,109,57,47,140,90,216,90,123,96,35,76,206,165,31,146,129,45,236,240,21,0,150,181,102,249,193,30,31,148,23,40,14,24,11,3,95,99,65,11,200,80,152,161,51,22,233,68,96,146,170,255,1,182,24,181,96,104,240,88,49,4,228,11,238,72,106,215,72,76,92,183,214,196,124,0,98,104,32,193,131,181,183,102,21,147,225,70,7,145,104,24,18,49,219,50,24,64,63,16,107,193,126,74,134,195,88,244,211,107,143,226,73,143,6,112,11,191,176,147,0,183,200,51,68,99,182,49,100,35,228,96,176,135,187,37,233,67,72,99,197,4,62,5,248,14,54,169,130,120,103,31,31,47,16,179,45,229,190,20,180,147,50,135,109,84,99,222,227,241,164,27,56,13,104,33,190,220,186,183,108,210,8,97,196,202,175,32,227,175,82,228,244,160,74,41,126,175,132,182,26,31,3,130,140,157,10,174,82,112,106,92,20,103,156,1,190,72,250,134,145,0,101,0,90,37,39,236,135,230,127,240,32,131,96,205,167,123,10,136,3,70,212,
+88,28,135,83,143,201,148,209,15,76,64,71,136,6,225,179,80,41,50,9,21,232,107,51,216,107,99,168,124,48,106,182,26,69,10,208,145,2,139,0,244,33,0,159,63,87,233,24,173,62,190,43,97,0,212,59,58,73,96,196,30,252,116,96,16,20,108,73,112,32,184,235,4,60,8,26,152,127,236,142,223,255,100,135,225,177,25,147,196,124,121,94,209,145,192,98,36,181,196,147,86,217,35,18,98,212,30,107,10,250,17,16,196,123,112,120,177,108,55,11,17,178,127,54,176,128,24,102,32,136,162,177,166,125,161,138,3,171,123,5,249,14,132,49,95,179,228,87,226,45,153,3,16,140,34,95,162,247,32,196,108,180,37,24,130,25,54,248,16,59,255,194,22,101,3,134,162,166,129,18,68,188,217,128,248,125,240,175,92,252,230,184,213,129,196,48,60,119,187,77,110,173,92,16,49,94,74,146,88,221,228,45,34,49,238,225,173,186,185,148,6,250,151,1,101,248,19,172,180,179,138,157,0,212,116,50,192,158,113,134,138,201,45,163,218,19,44,198,233,222,114,122,121,100,82,28,
+26,245,1,34,190,164,149,201,96,84,27,73,48,50,0,134,46,73,26,120,109,5,152,85,80,103,206,67,86,67,198,243,90,150,197,129,84,152,40,113,126,82,100,228,71,234,56,153,81,204,70,35,182,103,105,190,166,70,168,125,162,138,249,97,2,203,90,205,192,35,182,236,240,60,180,169,153,35,173,106,236,33,20,73,23,105,81,130,111,18,39,235,186,77,230,57,76,175,189,41,200,69,128,131,225,24,165,27,46,126,198,222,119,198,228,126,140,19,16,141,18,151,67,11,26,67,63,25,36,34,40,63,1,10,40,187,245,98,219,6,146,179,42,198,243,101,175,71,14,145,208,60,249,190,102,189,16,227,222,72,101,44,188,163,19,98,227,229,231,164,52,50,121,45,24,27,23,32,207,44,223,90,248,2,173,75,239,19,209,243,45,192,129,250,97,73,64,240,126,169,194,210,244,45,141,80,38,133,137,237,18,79,138,69,78,167,61,200,131,178,9,89,9,102,122,77,88,61,138,177,186,200,39,156,8,95,40,211,76,217,168,124,27,130,68,137,5,182,48,41,229,130,230,50,89,95,
+98,125,246,52,62,167,229,143,27,159,33,191,15,111,49,220,182,22,213,53,19,254,116,15,2,84,129,48,0,9,92,44,21,147,82,70,221,83,94,0,74,51,13,133,103,70,194,199,162,204,26,167,195,222,9,104,233,22,232,44,181,135,192,26,164,187,84,170,255,161,165,246,208,189,6,81,249,118,196,30,200,97,32,236,83,240,65,115,75,39,130,200,15,58,200,49,228,249,73,157,133,217,185,151,7,176,231,144,160,85,208,35,147,210,4,84,210,51,253,192,47,130,138,145,194,65,72,151,55,190,196,254,208,86,78,118,2,156,207,27,129,152,22,240,62,164,0,135,47,116,249,185,24,244,194,180,144,140,2,94,202,10,84,112,94,83,78,78,1,187,241,57,70,79,212,218,23,94,73,100,66,45,78,234,6,117,196,255,61,99,99,192,137,222,250,32,171,238,144,212,142,197,63,26,227,249,32,254,174,146,77,226,87,144,211,241,189,32,119,138,183,5,204,112,46,234,97,134,34,239,159,178,16,157,237,116,0,204,110,201,38,130,30,176,82,202,112,225,55,86,50,136,160,157,237,23,
+136,198,198,19,76,212,168,27,48,242,210,130,133,189,167,72,151,32,108,194,158,73,191,188,248,121,235,36,81,228,162,183,226,128,78,160,241,40,97,53,104,25,230,44,132,55,139,233,141,192,85,51,224,163,130,254,130,219,222,84,177,18,190,218,156,219,33,112,20,23,212,122,16,186,198,103,72,191,1,11,25,166,5,225,177,72,14,242,255,106,240,1,186,151,140,183,107,10,160,17,165,72,5,86,159,120,210,47,39,16,4,86,176,136,206,199,172,174,121,25,53,19,116,150,126,188,211,197,10,193,146,104,225,225,18,145,249,1,145,55,127,204,132,27,41,48,51,120,165,78,80,59,147,202,40,141,173,74,119,36,36,8,241,42,34,70,228,203,159,214,110,180,249,57,17,120,246,102,27,74,35,156,73,209,184,203,189,201,201,226,237,27,214,15,156,160,31,220,25,107,231,14,56,59,80,36,195,172,126,181,238,120,58,44,172,68,113,64,31,42,6,69,140,218,83,77,201,138,48,253,51,22,216,22,33,130,110,203,133,171,137,47,45,255,154,222,93,229,103,86,189,231,3,164,54,88,
+178,97,55,219,70,214,142,53,129,11,77,38,102,188,162,203,173,249,9,62,75,194,35,95,8,255,164,61,250,8,25,172,106,74,79,160,239,24,224,241,105,195,22,131,188,177,117,209,134,25,167,60,29,13,165,112,151,94,107,78,9,100,184,220,71,248,223,122,242,148,242,234,41,217,210,242,141,95,183,105,131,74,164,19,221,56,93,116,6,191,108,212,90,160,252,181,123,152,35,14,92,73,41,145,134,188,92,172,173,93,26,105,156,138,101,216,214,5,89,176,235,54,213,174,8,120,227,3,117,226,214,77,172,241,178,228,85,103,44,97,157,92,3,63,201,66,83,81,193,177,118,129,122,85,92,150,217,136,176,9,197,105,42,108,245,186,154,52,98,193,236,9,178,16,88,46,235,36,79,33,212,94,104,123,67,244,69,237,252,75,124,129,218,87,252,228,78,6,74,144,112,58,174,177,139,39,124,154,30,235,96,233,168,110,153,144,225,149,109,181,57,178,196,129,211,107,241,141,12,199,215,240,249,29,251,49,118,113,208,251,25,224,70,201,174,125,4,0,26,33,17,124,101,129,246,12,
+26,183,180,205,4,204,171,10,26,231,149,18,180,139,241,49,31,192,144,47,21,46,129,3,151,29,201,156,212,4,130,201,40,214,62,22,106,7,126,242,141,3,225,247,205,46,27,225,10,17,239,153,133,245,207,243,129,1,106,84,16,40,85,15,56,188,220,113,190,212,69,211,16,159,156,171,222,240,37,17,163,31,161,128,8,17,175,49,34,6,27,10,92,11,140,87,218,242,73,203,3,249,176,89,84,153,54,194,95,9,244,183,69,113,64,27,185,207,79,162,121,163,4,7,56,243,181,6,164,1,212,74,255,62,93,70,140,243,202,5,86,4,238,149,32,146,212,4,160,194,228,182,216,8,52,3,175,120,168,140,151,87,61,60,105,224,177,31,224,85,207,100,60,36,63,3,117,83,15,200,239,128,89,77,146,7,163,216,36,155,132,240,122,121,213,76,0,126,138,2,85,219,9,220,1,234,51,172,195,131,30,193,172,227,238,181,192,55,188,17,209,99,148,109,229,23,108,112,252,90,54,82,96,101,210,194,251,128,159,190,98,135,20,132,130,244,26,154,176,98,244,231,209,152,20,128,
+185,247,200,38,101,42,72,195,54,126,14,34,78,110,94,114,141,60,94,2,205,56,17,32,66,8,121,226,3,1,227,83,201,255,20,210,176,144,174,200,181,60,183,246,18,168,140,46,184,200,173,198,26,8,224,171,25,194,147,250,84,243,11,148,206,65,156,234,48,16,124,218,109,46,57,96,86,92,112,128,62,189,49,213,194,166,90,31,228,169,159,81,135,48,97,115,78,218,166,54,230,23,43,120,145,151,104,49,105,128,3,177,62,2,253,96,120,52,213,76,181,210,84,9,225,151,239,89,50,62,107,128,223,109,131,96,80,178,227,56,190,58,13,50,157,60,187,2,59,94,169,176,178,60,241,197,250,186,199,127,5,240,120,8,244,171,163,80,112,39,113,176,191,38,165,196,13,94,155,111,119,145,152,20,170,91,197,32,12,100,235,117,196,232,244,252,75,0,197,212,139,247,44,103,144,72,223,78,132,67,0,77,147,11,206,245,49,255,156,203,2,113,144,190,55,113,134,8,176,204,26,95,137,239,37,38,81,178,6,63,49,181,27,22,56,87,41,194,204,92,44,252,23,137,116,100,
+3,194,156,250,129,199,243,233,2,175,14,157,242,100,78,16,186,2,36,243,243,80,62,166,175,2,12,237,230,74,187,57,225,3,193,70,198,214,22,3,30,24,209,197,113,29,49,122,67,127,244,180,139,249,165,66,168,24,128,52,186,146,196,100,186,146,52,61,152,195,32,133,232,228,33,224,75,66,233,159,115,49,4,247,52,35,56,247,172,36,133,128,85,151,247,2,177,114,80,206,183,189,34,165,86,194,107,140,39,22,175,92,139,30,46,96,28,13,118,197,152,114,185,106,197,43,97,64,15,145,101,137,81,171,58,8,127,110,65,177,214,169,226,193,66,39,212,72,208,64,208,79,141,0,21,156,173,36,50,153,115,151,201,135,29,125,149,59,153,175,73,43,142,157,140,169,48,65,4,15,228,47,4,240,107,172,132,210,72,100,32,10,184,177,238,156,183,24,87,15,76,230,254,198,51,195,216,114,34,224,115,89,8,180,170,252,228,152,86,67,248,208,169,238,190,193,118,131,69,70,192,133,198,217,123,125,247,0,156,180,69,242,25,93,254,26,48,207,101,140,177,228,242,85,92,20,
+250,83,71,121,243,7,9,0,250,16,215,98,243,74,9,112,79,67,167,97,102,113,59,102,54,54,170,157,192,236,227,60,121,112,99,171,62,77,65,44,22,58,138,205,45,159,216,220,66,132,128,245,30,236,73,5,93,62,13,26,10,5,169,156,214,175,114,177,96,251,138,9,108,30,198,103,227,53,34,124,69,86,66,9,168,224,132,185,173,2,91,186,149,139,211,13,118,3,212,147,65,30,122,184,194,230,13,63,160,214,134,177,165,128,54,162,188,159,96,93,153,187,54,140,12,160,223,84,197,240,6,76,37,4,32,77,173,49,16,173,113,76,193,99,86,138,164,156,15,172,246,149,118,132,234,159,197,193,245,142,214,14,209,5,216,183,77,87,161,101,116,16,151,107,193,15,63,63,100,252,173,1,158,159,28,66,82,42,226,21,98,133,251,3,186,18,170,221,240,105,29,176,191,132,141,128,73,247,244,6,46,33,217,204,220,198,160,105,125,156,214,105,121,94,105,87,96,194,232,58,116,75,192,203,105,178,252,36,88,152,244,165,224,236,75,165,252,143,226,221,79,135,113,176,131,136,
+37,6,186,47,31,92,96,243,129,130,141,120,153,8,19,187,191,173,86,14,38,64,180,103,89,135,94,107,39,19,193,11,4,29,40,157,114,49,103,27,37,195,55,48,193,129,153,29,202,142,63,243,156,185,90,100,32,160,33,33,104,241,221,88,219,75,159,33,230,209,23,55,1,1,96,11,202,49,225,249,46,195,154,154,177,217,10,99,243,22,45,17,204,215,254,164,35,0,253,8,66,4,188,75,46,37,230,129,174,216,51,3,84,0,143,18,220,63,84,29,247,244,122,135,229,227,14,147,21,190,8,67,192,28,224,217,47,55,96,152,244,49,73,204,28,253,112,216,130,179,163,176,233,124,182,49,233,239,135,42,80,229,200,202,206,4,118,9,94,67,7,52,99,224,7,235,127,241,8,86,72,26,227,112,60,150,5,86,210,17,38,63,6,74,46,136,101,75,251,131,31,85,193,146,139,39,219,223,123,140,129,63,234,135,10,112,223,215,34,160,216,196,108,188,240,3,33,42,118,202,53,160,237,97,129,95,18,226,64,117,56,36,53,236,18,106,160,6,10,152,106,12,175,136,174,151,
+159,16,146,146,0,147,157,214,90,154,184,74,220,6,174,29,241,206,186,246,49,128,192,149,194,168,95,107,255,192,18,28,197,99,187,132,99,121,108,151,128,159,97,6,102,189,66,9,227,129,13,243,204,40,167,11,0,176,22,218,11,22,104,154,120,207,188,123,20,207,222,52,11,224,174,6,32,241,10,135,73,84,32,249,99,65,0,175,88,2,107,65,211,190,126,37,227,223,12,48,3,201,73,3,53,61,233,25,200,115,35,30,16,30,70,98,12,57,128,131,135,253,13,29,112,104,26,164,140,83,254,193,82,65,151,121,59,215,96,75,158,20,67,141,73,162,206,72,43,199,27,216,178,94,203,131,139,134,201,147,124,98,1,6,81,199,171,12,232,195,100,16,15,96,80,0,204,62,183,48,184,110,181,17,36,250,103,155,71,226,25,6,238,194,69,44,151,25,144,120,22,179,157,212,218,181,246,163,48,10,232,85,40,252,193,233,222,107,137,0,193,232,229,235,44,145,90,192,153,4,154,86,130,96,68,231,219,153,96,28,104,253,36,228,220,141,142,40,116,81,48,158,83,48,158,203,
+255,240,60,34,87,97,121,186,38,195,111,55,176,50,14,36,227,131,41,14,99,148,147,52,219,6,224,167,65,28,64,116,121,63,145,10,116,77,108,92,15,180,46,3,234,57,144,9,167,237,84,138,165,211,116,154,34,32,3,72,50,31,100,161,252,156,36,16,211,218,49,255,237,209,5,9,35,120,205,252,129,77,213,112,199,1,228,83,12,136,161,14,202,174,1,234,116,83,22,192,91,223,225,86,138,89,249,7,7,12,255,131,37,129,79,192,106,39,16,100,55,160,191,62,214,62,238,2,220,96,26,165,8,157,52,112,190,151,6,28,39,97,172,1,55,235,75,74,18,208,26,155,1,127,43,208,184,195,234,174,253,251,167,51,92,220,154,9,192,148,64,196,154,112,87,192,204,126,64,160,235,193,93,10,208,36,199,141,240,133,0,156,102,36,167,17,39,24,221,192,113,176,88,185,0,178,50,86,199,1,167,82,206,0,68,96,182,219,160,60,116,241,9,194,5,178,67,228,193,161,64,78,170,168,23,64,78,74,1,162,144,92,201,250,51,158,227,176,240,235,117,95,26,164,1,12,
+16,255,212,255,130,73,72,134,249,31,174,98,254,15,182,80,2,47,55,104,129,50,246,23,141,63,13,32,141,197,238,43,204,179,0,69,0,68,239,51,208,37,5,250,76,8,56,150,209,161,24,236,151,211,215,48,200,158,44,129,225,121,184,127,134,82,133,9,2,42,37,140,123,57,120,85,32,199,78,33,21,115,232,230,207,250,239,63,235,119,216,250,52,66,198,250,231,2,207,99,1,96,105,1,46,242,153,159,152,169,36,232,55,176,198,74,255,81,127,9,172,12,229,44,152,61,138,137,246,143,106,3,162,216,88,232,157,63,143,1,238,140,210,154,141,10,66,188,103,2,114,69,222,197,145,87,255,236,33,7,26,222,43,186,152,33,33,136,169,33,72,97,31,172,78,113,211,241,210,68,70,37,165,126,3,59,80,137,1,156,181,143,49,112,23,162,220,194,0,46,248,143,119,4,1,243,249,3,187,127,10,244,163,240,13,0,148,51,36,48,80,59,94,255,5,141,180,218,94,21,59,151,65,104,140,33,127,254,243,248,106,126,59,193,147,62,11,9,199,248,67,44,207,223,48,58,
+18,62,9,121,234,1,97,212,208,134,131,46,180,108,175,4,176,130,111,198,249,167,136,49,109,236,72,46,254,168,20,75,221,20,184,199,144,216,98,253,141,30,32,98,125,235,247,19,32,121,7,211,214,125,18,94,238,26,147,48,143,222,63,48,43,149,214,14,1,206,99,252,117,244,81,44,129,104,68,224,148,5,168,206,63,120,107,1,127,43,218,201,51,112,8,218,160,131,219,36,48,104,191,210,158,128,154,179,25,131,0,80,113,90,146,12,188,18,239,64,62,170,47,139,239,137,19,246,54,120,156,201,38,195,124,249,213,6,32,175,208,11,101,130,226,132,248,255,227,249,249,35,241,175,231,143,168,120,34,134,233,81,177,100,146,204,20,19,102,185,27,193,67,100,194,255,251,185,228,19,30,138,254,226,114,113,206,23,41,147,136,85,223,237,217,32,226,62,54,105,116,134,34,20,115,156,29,249,146,67,231,223,123,100,97,226,35,225,14,137,50,44,95,179,163,204,21,29,92,226,70,70,70,135,172,111,32,169,77,176,50,14,30,192,249,171,186,245,226,234,71,174,9,1,142,114,
+38,28,187,46,242,145,156,146,200,72,74,113,47,50,2,31,43,132,28,100,63,254,70,73,225,162,81,66,171,0,171,137,128,100,215,137,63,160,205,66,9,207,52,109,157,209,37,147,181,230,0,111,138,218,0,95,245,237,55,162,109,139,116,219,82,167,58,153,41,194,143,237,201,65,11,164,123,30,226,78,90,47,175,189,51,207,240,238,107,221,71,222,91,164,162,234,252,80,240,67,42,133,13,235,249,141,50,17,132,138,186,231,62,46,233,140,73,234,201,215,219,220,147,142,52,11,109,71,12,181,172,89,141,17,115,207,223,221,251,65,16,138,34,6,152,124,223,183,19,194,183,173,209,79,241,41,194,106,57,202,186,201,225,16,159,154,188,201,201,87,0,72,167,192,251,164,84,139,252,54,231,101,186,54,30,73,71,13,248,225,67,30,181,143,15,211,193,98,196,128,141,191,254,247,73,177,246,68,165,206,231,67,6,141,245,248,29,77,43,146,125,212,78,190,221,54,104,145,26,66,178,193,175,125,187,237,94,237,10,110,173,124,42,194,42,143,25,142,39,251,61,157,129,18,23,7,
+244,71,127,203,146,51,161,95,28,62,83,72,124,28,250,247,214,137,183,140,114,153,153,107,104,136,147,29,43,162,121,47,8,137,224,28,100,25,164,153,209,208,147,191,145,175,61,76,10,254,61,105,111,173,227,210,72,232,167,99,206,228,19,141,250,229,69,154,142,170,208,77,193,115,21,32,177,59,56,105,91,61,64,55,251,249,85,12,95,196,50,78,104,145,64,242,233,168,229,175,127,117,41,212,19,182,151,188,88,245,113,1,242,2,81,144,131,242,24,67,189,223,190,56,122,99,16,166,248,59,93,160,94,50,227,145,232,122,153,173,168,101,97,89,21,49,111,22,71,239,183,27,244,111,161,215,38,160,142,96,225,254,20,226,52,87,66,155,63,220,95,119,183,141,173,206,232,217,243,117,218,159,238,248,179,45,43,162,246,117,249,242,33,232,83,130,95,54,28,186,165,253,216,119,188,57,63,214,204,108,52,85,225,197,14,107,173,209,149,101,14,223,191,81,183,93,122,112,22,79,34,189,48,7,109,175,189,243,157,75,151,184,147,14,213,17,212,94,25,154,159,109,90,21,97,119,
+148,56,55,35,100,48,10,52,214,97,168,109,83,207,73,90,120,69,120,233,125,229,240,223,150,97,222,138,234,236,210,65,101,180,223,147,83,122,78,253,164,30,12,251,107,237,103,214,218,202,39,124,227,246,131,218,123,125,112,85,47,81,149,237,69,150,30,133,149,6,6,58,116,21,247,233,105,81,80,91,20,143,228,137,249,62,83,246,245,120,250,152,50,61,213,19,109,158,250,99,206,215,28,234,53,217,87,51,61,90,241,229,218,67,176,7,216,226,57,131,230,199,46,229,36,188,134,92,165,236,55,47,102,97,161,249,152,171,138,126,230,151,134,40,71,226,136,94,47,31,130,217,156,221,166,246,133,234,205,13,51,149,58,198,92,229,17,73,81,102,27,102,211,137,211,92,109,162,170,181,56,221,26,133,148,236,193,154,185,1,229,145,61,159,161,239,199,146,24,159,206,125,171,40,114,91,159,88,130,164,182,172,243,72,82,159,12,46,147,50,5,173,83,188,188,142,234,110,152,180,80,98,20,104,239,205,206,172,67,227,90,209,74,181,22,136,123,210,196,165,79,203,186,234,42,61,
+137,92,191,57,75,180,68,238,253,77,50,43,221,47,54,14,87,118,252,59,121,24,31,78,86,228,42,179,21,218,96,255,174,234,40,13,8,91,206,208,149,122,242,95,6,81,85,149,177,122,214,151,217,202,254,32,170,79,126,64,54,209,131,226,244,19,220,185,79,21,36,58,176,215,245,72,180,178,21,102,109,126,199,173,64,23,221,43,89,67,217,215,138,216,138,62,146,221,179,199,152,166,91,136,245,115,231,192,160,232,93,222,228,29,187,105,227,189,204,151,199,214,106,35,172,7,64,107,219,140,20,177,29,32,201,226,196,25,95,59,247,225,231,170,79,52,241,88,200,147,183,189,15,245,3,50,80,60,103,143,189,87,70,248,182,183,214,150,60,240,74,242,50,215,81,43,237,189,46,1,109,189,115,170,234,230,253,193,178,249,130,172,219,218,113,218,180,187,189,243,165,174,224,200,140,211,183,47,243,82,109,247,187,40,61,22,249,235,251,135,225,56,105,106,182,153,61,242,124,18,81,247,69,122,159,50,20,181,150,221,87,48,34,116,219,4,134,1,178,231,83,43,165,64,45,80,
+225,212,211,203,253,98,186,40,163,118,102,218,99,52,181,186,1,199,154,212,222,229,240,241,220,56,253,98,120,8,123,184,35,252,114,46,28,142,144,209,20,127,5,11,143,226,148,72,136,150,149,222,146,47,126,179,28,235,200,58,251,241,172,66,220,13,156,191,86,18,99,245,3,90,47,29,244,94,172,245,146,113,87,176,91,57,243,36,33,66,60,13,74,102,0,106,198,230,127,20,7,23,202,249,187,192,209,136,128,162,145,110,198,184,67,59,224,16,168,87,27,3,121,210,221,29,157,155,199,113,253,25,101,151,104,25,207,193,9,74,161,146,42,229,11,9,243,187,180,139,234,232,107,153,38,127,251,178,71,250,103,67,36,103,114,80,35,105,148,232,216,51,178,131,134,7,6,122,145,217,54,160,106,17,34,18,229,63,197,97,15,233,33,56,178,107,23,55,182,144,201,245,56,79,219,124,223,162,121,49,104,125,160,71,243,190,97,64,177,66,199,150,102,214,34,118,174,188,79,129,39,127,215,73,43,61,161,29,132,201,209,199,210,83,29,49,247,126,25,206,30,71,189,102,220,42,
+30,44,231,133,218,101,222,212,43,38,92,213,172,121,19,133,74,171,181,174,4,133,79,57,179,84,42,183,37,95,145,193,93,68,160,83,185,32,161,186,89,85,195,10,116,124,255,120,226,160,27,205,220,154,120,87,107,39,3,252,50,132,70,98,79,56,133,94,15,175,3,46,233,64,35,54,136,16,119,214,231,86,152,9,72,110,39,227,35,228,156,182,117,40,215,208,54,157,103,109,113,133,3,95,161,109,217,172,151,200,3,8,234,20,70,62,163,41,247,46,155,152,150,226,236,94,173,147,111,85,84,143,44,21,69,217,247,69,171,208,99,46,222,250,13,144,56,192,205,2,18,203,177,91,231,114,77,150,83,157,66,219,195,79,91,144,110,108,9,204,221,112,146,57,142,124,68,62,91,40,120,40,160,76,93,141,222,142,190,15,113,205,82,140,246,45,42,29,131,73,123,149,209,242,41,168,178,97,85,51,21,171,249,236,119,205,179,12,4,142,214,114,166,152,171,248,169,136,239,141,155,97,163,20,175,222,145,48,200,105,0,115,1,172,168,112,195,114,7,50,43,48,12,194,157,215,
+127,156,22,171,250,170,18,201,61,218,98,186,196,46,187,136,13,113,102,1,69,88,102,120,83,160,167,222,140,117,244,133,86,117,134,167,53,242,205,95,233,30,183,112,117,92,219,71,204,28,9,132,156,122,252,53,190,76,131,4,83,0,151,160,106,16,187,152,233,127,209,74,28,249,139,86,56,146,0,182,186,200,8,254,133,67,237,123,84,41,121,238,190,15,62,142,34,184,63,93,157,136,61,10,2,55,250,36,71,25,103,30,141,223,171,177,240,251,226,135,99,44,173,208,58,78,0,87,42,62,73,139,29,211,77,118,172,210,158,124,19,141,75,241,92,120,164,157,172,138,65,33,173,53,26,81,209,31,230,175,252,107,131,135,53,20,157,248,86,205,225,218,40,232,198,243,52,43,97,215,58,232,80,26,227,207,72,55,57,109,91,230,219,205,72,171,250,201,37,240,42,180,99,78,99,159,107,39,187,97,235,201,181,89,161,196,62,145,95,4,197,129,156,200,36,185,11,113,127,3,237,64,240,26,197,33,132,34,207,192,156,86,89,49,68,186,233,46,165,156,175,21,46,21,172,27,
+252,126,26,13,219,54,65,136,131,242,205,47,207,78,205,64,41,72,41,39,147,62,78,121,99,208,151,81,21,27,49,100,180,170,36,180,165,226,67,220,136,109,60,238,228,98,141,61,241,154,135,208,47,208,4,53,23,31,138,10,195,202,146,95,77,35,3,131,54,113,15,183,100,173,11,70,1,202,53,203,237,172,101,239,248,246,216,158,7,136,1,72,56,241,172,40,158,201,111,90,89,193,163,225,143,71,45,54,47,181,227,191,253,174,70,182,39,221,19,45,127,105,55,93,52,235,195,27,107,116,234,92,24,208,227,124,10,195,21,139,63,123,125,183,228,251,159,243,226,141,54,209,196,21,232,20,27,249,177,61,40,53,22,254,187,75,27,186,153,36,101,3,52,178,237,173,123,85,146,160,198,253,148,33,68,131,86,85,128,154,179,21,252,10,112,215,235,36,101,180,154,79,72,225,49,117,221,51,68,236,38,159,191,111,229,148,26,46,154,73,172,54,250,243,9,235,244,166,188,2,103,253,40,138,244,97,84,227,63,219,77,127,44,186,13,4,41,151,106,189,244,249,41,35,7,217,
+157,64,54,52,163,49,154,247,254,254,8,109,19,46,24,216,83,29,66,126,245,135,36,178,255,71,247,149,197,19,139,120,196,245,124,104,131,159,140,194,202,248,121,11,122,18,65,53,193,133,70,37,164,71,123,123,209,179,184,95,253,124,74,83,221,41,139,146,229,231,197,18,250,81,9,142,130,118,135,213,163,88,11,124,179,39,105,58,171,145,220,219,246,53,107,118,124,191,14,83,58,107,122,160,24,93,245,104,167,23,235,120,17,127,132,50,237,156,153,215,238,233,71,211,76,111,51,103,101,6,30,179,184,94,67,87,1,70,243,123,40,39,89,181,115,255,55,175,207,211,60,127,242,4,153,150,49,246,61,136,205,13,10,115,56,155,114,233,2,70,65,175,215,209,140,12,149,134,193,154,242,37,91,30,85,34,189,213,236,171,247,67,154,174,205,162,29,174,67,160,80,36,123,182,138,168,49,157,105,138,187,203,126,244,175,23,198,255,230,127,251,63,255,254,223,135,174,255,124,145,236,191,249,63,254,238,223,253,253,255,254,143,255,244,194,248,127,123,71,247,95,254,237,223,254,79,
+255,252,111,255,151,127,246,47,254,231,139,203,196,5,122,113,113,113,217,59,255,121,73,87,201,31,210,76,212,103,241,128,142,223,158,105,179,203,43,246,150,110,250,34,55,161,73,35,44,87,193,78,242,52,167,39,163,95,178,169,101,48,191,107,95,189,147,219,148,72,85,185,23,90,215,165,38,111,125,205,85,191,219,232,178,35,205,51,160,55,55,175,126,202,202,254,105,242,171,219,63,141,195,10,143,142,201,77,165,36,189,250,158,116,170,7,133,86,28,37,205,25,134,235,59,223,116,40,115,29,115,200,248,214,77,156,5,133,229,31,228,94,57,150,5,179,46,189,231,88,125,163,62,99,171,87,120,221,213,120,21,234,84,215,222,10,241,214,155,115,208,9,233,13,106,240,140,126,183,23,7,156,162,166,82,99,47,79,255,175,255,254,63,253,219,127,248,87,127,243,143,127,162,255,191,99,255,155,191,251,155,255,240,247,255,233,63,255,3,246,90,247,127,254,47,255,250,31,254,14,123,41,27,123,173,251,127,248,206,215,255,14,156,127,254,255,11,78,139,157,36,63,139,85,20,255,
+252,204,27,92,41,247,29,184,167,187,236,242,172,125,106,242,141,204,132,56,174,0,196,123,219,108,240,159,141,206,190,235,53,62,144,47,34,219,123,153,235,170,175,216,59,247,218,145,112,208,255,214,10,83,253,28,153,176,215,199,200,74,229,100,249,229,206,219,252,155,119,66,130,159,67,135,214,50,219,203,98,216,108,223,132,232,56,224,157,182,111,137,242,236,176,69,60,86,56,109,77,41,150,94,215,151,195,219,101,172,189,102,121,108,231,214,190,197,182,165,157,101,111,223,152,163,200,173,142,38,217,67,121,15,152,199,50,174,212,188,17,165,57,15,184,195,247,75,115,8,136,41,79,79,174,95,221,249,53,162,150,109,44,123,111,46,25,113,247,142,233,0,73,44,55,84,12,105,119,240,15,118,255,17,123,103,254,63,252,227,159,87,190,255,9,184,127,253,111,255,235,127,251,107,2,127,33,246,95,254,7,196,254,213,255,5,128,127,113,100,
+
diff --git a/uppsrc/CtrlLib/appdoc.tpp/all.i b/uppsrc/CtrlLib/appdoc.tpp/all.i
new file mode 100644
index 000000000..1c2d242e6
--- /dev/null
+++ b/uppsrc/CtrlLib/appdoc.tpp/all.i
@@ -0,0 +1,4 @@
+TOPIC("DlgSelectColor$cs-cz")
+#include "DlgSelectColor$cs-cz.tpp"
+END_TOPIC
+
diff --git a/uppsrc/CtrlLib/init b/uppsrc/CtrlLib/init
new file mode 100644
index 000000000..4932e041f
--- /dev/null
+++ b/uppsrc/CtrlLib/init
@@ -0,0 +1,7 @@
+#ifndef _CtrlLib_icpp_init_stub
+#define _CtrlLib_icpp_init_stub
+#include "CtrlCore/init"
+#include "RichText/init"
+#include "PdfDraw/init"
+#include "CtrlLib.icpp"
+#endif
diff --git a/uppsrc/CtrlLib/key_header.h b/uppsrc/CtrlLib/key_header.h
new file mode 100644
index 000000000..9ce95cf27
--- /dev/null
+++ b/uppsrc/CtrlLib/key_header.h
@@ -0,0 +1,30 @@
+//#BLITZ_APPROVE
+
+#ifndef KEYGROUPNAME
+#ifdef  KEYNAMESPACE
+#define KEYGROUPNAME #KEYNAMESPACE
+#else
+#define KEYGROUPNAME ""
+#endif
+#endif
+
+#define KEY(id, name, def)        KeyInfo& COMBINE(AK_, id)();
+#define KEY2(id, name, def, def2) KeyInfo& COMBINE(AK_, id)();
+
+#ifdef KEYNAMESPACE
+namespace KEYNAMESPACE {
+#endif
+
+#include KEYFILE
+
+#ifdef KEYNAMESPACE
+};
+#endif
+
+#ifdef KEYNAMESPACE
+#undef KEYNAMESPACE
+#endif
+
+#undef KEYGROUPNAME
+#undef KEY
+#undef KEY2
diff --git a/uppsrc/CtrlLib/key_source.h b/uppsrc/CtrlLib/key_source.h
new file mode 100644
index 000000000..31e4e6878
--- /dev/null
+++ b/uppsrc/CtrlLib/key_source.h
@@ -0,0 +1,41 @@
+//#BLITZ_APPROVE
+
+#ifndef KEYGROUPNAME
+#ifdef  KEYNAMESPACE
+#define KEYGROUPNAME #KEYNAMESPACE
+#else
+#define KEYGROUPNAME ""
+#endif
+#endif
+
+#include <CtrlLib/akt_.h>
+
+#ifdef KEYNAMESPACE
+namespace KEYNAMESPACE {
+#endif
+
+#define KEY(id, name, def)         KeyInfo& COMBINE(AK_, id)() { static KeyInfo x = { name, { def } }; return x; }
+#define KEY2(id, name, def1, def2) KeyInfo& COMBINE(AK_, id)() { static KeyInfo x = { name, { def1, def2 } }; return x; }
+#include KEYFILE
+#undef  KEY
+#undef  KEY2
+
+#define KEY(id, name, def)         RegisterKeyBinding(KEYGROUPNAME, #id, COMBINE(AK_, id));
+#define KEY2(id, name, def1, def2) RegisterKeyBinding(KEYGROUPNAME, #id, COMBINE(AK_, id));
+INITBLOCK {
+#include KEYFILE
+}
+#undef KEY
+#undef KEY2
+
+#ifdef KEYNAMESPACE
+};
+#endif
+
+#include <Core/t_.h>
+
+#ifdef KEYNAMESPACE
+#undef KEYNAMESPACE
+#endif
+
+#undef KEYGROUPNAME
diff --git a/uppsrc/CtrlLib/src.tpp/ArrayCtrl$en-us.tpp b/uppsrc/CtrlLib/src.tpp/ArrayCtrl$en-us.tpp
new file mode 100644
index 000000000..c26ed99e8
--- /dev/null
+++ b/uppsrc/CtrlLib/src.tpp/ArrayCtrl$en-us.tpp
@@ -0,0 +1,147 @@
+TITLE("ArrayCtrl")
+COMPRESSED
+120,156,172,189,137,87,98,89,154,47,250,175,184,186,239,237,138,168,202,204,142,33,179,50,43,115,189,181,58,111,85,117,119,174,238,174,234,91,213,221,119,189,85,43,214,13,34,36,50,124,101,72,92,209,204,138,234,215,189,112,86,156,69,68,69,192,9,16,20,81,68,84,70,103,25,100,16,84,84,4,156,16,80,25,5,153,225,237,125,14,32,70,68,102,86,247,235,200,204,8,57,103,239,111,127,251,27,126,223,176,55,145,191,123,84,244,223,254,219,131,15,30,252,249,131,31,248,245,249,47,176,47,48,149,165,21,79,126,87,242,241,199,159,125,129,121,244,201,23,191,255,187,95,255,236,139,31,255,213,189,159,126,124,31,82,121,8,168,60,254,244,225,227,207,62,121,252,240,227,71,63,5,191,61,124,252,240,209,39,143,30,127,252,240,179,71,63,251,248,179,199,143,63,123,240,249,243,82,12,30,255,228,119,165,143,62,251,236,11,56,233,17,152,244,232,211,79,30,61,252,244,227,207,62,254,236,225,227,79,63,123,4,230,62,122,240,224,209,131,79,31,125,242,240,227,199,
+159,61,250,228,243,98,44,254,249,147,223,97,62,123,252,197,143,127,243,83,48,233,49,92,9,16,127,240,240,167,143,62,254,244,227,71,15,30,63,120,244,49,88,234,225,103,159,125,252,240,211,79,62,123,252,179,159,254,244,243,231,152,215,21,37,184,178,236,90,37,15,31,62,122,248,197,179,135,159,126,1,120,254,247,127,255,247,143,30,126,252,0,229,224,99,64,236,225,131,143,1,171,15,193,179,7,31,63,250,244,225,39,63,123,240,179,79,62,123,248,217,131,199,128,248,39,159,62,248,228,243,215,152,114,204,171,239,222,250,39,63,184,245,79,31,124,94,82,129,5,36,126,252,147,135,15,63,5,83,126,250,193,79,255,252,225,199,159,130,141,126,246,248,227,79,62,251,244,1,88,252,209,163,71,143,31,63,122,248,248,209,207,126,246,232,147,159,126,242,233,231,47,177,152,98,108,249,147,223,253,235,255,254,183,255,254,203,95,125,248,207,191,45,250,29,254,147,47,254,238,175,30,20,253,238,191,63,120,240,225,131,7,69,95,150,151,99,222,252,188,162,188,244,201,95,60,
+249,29,254,193,23,69,217,63,254,234,175,74,94,97,190,198,126,254,232,241,79,31,253,197,195,143,63,126,76,172,9,85,235,170,8,185,95,81,246,128,199,58,237,189,148,58,6,89,134,43,254,165,178,154,46,168,245,13,54,251,181,12,49,207,34,172,25,237,238,27,212,214,28,198,234,212,182,69,234,137,96,197,191,207,62,59,232,113,27,58,171,116,156,201,160,103,127,248,156,71,76,14,170,131,153,68,218,151,73,234,51,169,46,69,166,153,48,213,163,111,35,180,184,173,178,154,153,145,176,87,74,232,225,70,100,145,150,205,109,201,53,161,109,111,204,102,157,153,50,145,124,186,154,163,161,120,68,163,95,220,148,73,218,9,13,117,23,112,56,153,180,17,236,59,26,63,163,142,238,53,236,215,15,118,121,12,71,180,51,42,65,41,90,171,10,119,120,8,195,251,220,250,221,37,81,85,227,153,146,138,14,24,244,160,3,154,69,232,128,157,125,116,64,199,25,58,96,171,11,12,232,63,163,42,40,20,138,176,222,31,201,88,108,44,138,94,175,119,164,210,12,179,103,206,226,147,
+41,20,12,29,91,125,204,150,203,229,222,3,162,112,187,73,51,100,89,20,91,14,25,158,182,141,211,233,241,46,191,250,90,238,156,235,77,165,82,142,206,115,215,141,112,177,118,34,148,76,10,146,151,145,49,203,98,112,71,41,154,106,139,56,169,206,72,36,114,194,60,38,167,206,83,58,254,190,47,34,35,111,147,106,215,136,237,53,186,68,155,131,186,215,102,5,124,29,167,175,72,33,93,224,234,70,18,221,208,219,105,61,234,235,131,177,153,181,99,191,210,57,168,107,103,155,156,78,103,90,62,205,158,79,140,88,22,237,34,54,96,226,176,207,19,14,54,113,166,226,108,133,34,115,34,220,6,107,36,28,194,205,46,198,158,42,194,151,117,122,142,248,164,61,176,61,239,166,200,61,185,186,97,177,88,162,190,214,232,92,58,194,215,105,52,204,107,29,249,136,196,180,206,204,197,186,4,173,201,120,88,208,58,177,66,219,79,179,90,131,12,6,195,105,203,152,77,235,153,93,214,10,51,232,73,37,147,181,58,5,157,193,48,41,199,166,21,84,90,91,67,199,74,228,164,78,
+18,168,234,224,132,78,170,234,235,18,241,120,11,151,216,193,176,171,249,85,44,146,225,216,99,190,100,208,184,177,120,60,78,87,132,26,214,250,217,102,10,207,165,1,26,152,103,95,91,206,72,198,21,221,241,136,81,184,125,48,200,168,177,16,217,169,73,57,117,183,174,111,88,107,104,148,186,233,227,238,90,163,127,116,51,220,184,190,118,113,169,105,191,32,174,81,119,93,33,106,221,192,158,157,67,173,163,59,184,243,196,68,68,191,200,221,164,172,159,113,136,77,237,28,215,133,112,155,190,182,98,180,15,249,14,83,17,87,72,188,83,173,237,158,108,247,241,6,26,84,204,205,35,170,204,9,22,188,78,74,205,173,61,103,187,113,137,77,188,53,184,112,50,86,227,133,230,100,237,191,238,100,143,177,70,135,199,105,38,99,236,60,24,10,204,132,173,82,181,131,173,29,92,238,143,165,82,173,62,199,154,106,120,172,110,232,132,208,98,60,200,164,153,126,209,193,124,218,37,39,106,20,246,227,213,184,206,50,70,50,116,92,213,92,78,73,78,45,45,58,37,57,181,178,226,18,
+110,199,35,161,155,113,118,208,75,52,174,232,85,173,182,101,146,215,165,174,211,15,214,13,10,55,151,22,156,61,125,167,23,115,91,62,190,239,202,83,205,83,246,3,243,152,153,209,138,47,155,187,236,142,46,166,42,65,217,114,115,132,188,45,253,62,35,46,49,137,153,205,33,181,171,165,175,85,74,27,97,40,118,118,174,76,111,207,91,107,22,12,56,85,148,75,119,155,78,195,244,180,234,156,233,109,59,111,160,125,131,208,209,187,172,86,93,27,207,214,200,245,51,90,206,30,63,54,177,27,51,11,180,124,153,124,102,174,89,56,108,1,230,179,169,17,173,52,216,59,196,103,243,188,157,140,125,119,167,171,182,118,138,109,247,93,79,153,56,203,23,129,125,191,163,250,180,219,16,59,87,132,253,70,213,165,111,130,239,191,36,234,200,163,17,232,169,77,181,245,228,192,2,207,212,50,144,217,13,210,167,229,86,206,216,225,180,56,57,48,47,208,172,209,109,241,46,163,194,176,186,48,117,34,212,243,153,103,145,109,74,84,219,178,230,52,74,18,245,231,86,110,109,13,81,237,
+38,37,151,3,42,111,172,109,122,94,158,145,111,154,20,215,3,252,161,233,218,238,174,12,39,236,86,11,149,107,147,113,122,40,162,59,223,98,157,72,237,44,207,164,34,102,72,169,171,188,92,190,159,175,33,122,199,1,11,170,205,237,1,141,169,45,195,78,178,70,53,230,181,109,106,79,159,108,151,109,26,191,24,50,182,204,37,220,53,237,238,229,243,110,219,186,57,70,39,74,29,11,171,238,157,234,51,224,97,171,34,109,85,184,183,211,179,206,136,93,74,132,241,70,233,117,47,237,52,229,224,133,52,153,109,191,53,185,124,30,61,221,240,111,27,133,129,136,105,52,120,189,26,171,237,81,94,213,100,104,64,195,181,83,35,150,237,243,155,224,200,90,251,100,107,162,61,30,182,7,77,22,138,151,180,46,206,68,90,140,66,233,64,237,152,218,41,157,148,37,183,23,50,91,13,77,97,26,192,21,126,135,231,232,140,230,213,138,230,180,86,231,232,206,185,73,57,179,209,16,79,174,106,14,142,149,105,131,59,124,44,26,62,209,95,12,170,105,6,183,32,226,118,219,99,244,
+169,160,94,40,242,115,58,162,65,41,35,53,31,154,63,213,92,243,237,7,246,35,138,234,2,232,123,238,156,74,61,157,92,208,110,13,49,122,200,253,178,93,189,116,225,114,62,218,96,74,47,169,219,183,186,55,72,124,18,157,62,50,163,62,213,211,147,231,59,102,74,212,177,118,108,59,134,66,231,182,57,174,199,55,210,253,113,246,225,246,184,44,126,118,148,88,175,139,107,150,70,20,137,153,96,178,231,40,93,183,217,77,84,246,208,23,164,220,171,67,87,47,67,151,145,57,37,36,138,93,84,165,88,190,132,94,203,177,28,118,8,135,200,173,140,150,164,204,185,151,9,4,58,79,130,155,209,145,81,226,252,185,65,163,232,222,153,184,57,153,61,189,92,22,175,212,223,4,36,86,110,38,122,234,25,247,240,210,77,91,196,57,42,79,48,224,167,158,81,233,123,13,84,129,150,177,67,90,104,38,14,2,100,218,165,137,58,60,198,1,83,103,119,19,231,104,230,140,122,179,215,176,227,164,154,220,115,221,231,228,117,62,169,170,179,17,2,116,216,57,67,149,94,152,125,29,
+213,19,34,29,224,100,79,55,43,10,24,235,199,72,158,137,35,218,46,205,115,34,91,58,229,243,249,36,95,123,127,181,104,19,14,184,136,136,170,122,193,208,97,52,28,212,147,209,112,240,78,188,88,170,10,71,171,143,54,125,60,111,95,47,39,226,172,210,78,25,100,18,231,17,235,210,70,107,88,92,14,123,27,232,85,125,241,8,157,176,222,188,3,37,120,113,108,141,17,38,182,125,222,197,190,61,158,172,133,48,101,100,9,90,9,83,44,65,55,242,123,43,129,57,133,62,224,160,143,91,213,232,227,255,228,56,237,184,65,79,152,88,241,85,85,109,232,132,85,187,113,134,250,156,144,116,201,6,13,125,106,145,65,237,91,233,35,12,51,100,13,181,98,83,253,201,129,59,53,86,227,31,33,69,8,139,206,131,197,241,33,89,187,131,144,14,209,135,59,92,155,84,23,115,254,82,160,35,36,123,246,235,181,3,34,3,241,170,198,80,213,124,181,162,163,186,214,118,68,85,174,53,209,16,155,219,10,176,128,16,26,102,91,58,76,245,7,157,158,110,66,188,211,163,116,215,
+204,240,148,34,130,76,41,218,56,3,235,3,137,117,216,206,168,65,64,191,83,208,186,200,23,180,46,112,61,131,100,32,80,202,220,126,61,66,185,190,198,128,80,222,6,84,33,101,238,16,27,161,76,11,13,35,148,183,58,61,8,229,1,119,13,15,224,142,158,176,3,244,230,243,249,204,32,216,180,123,72,226,190,49,115,114,155,70,141,155,13,193,197,46,165,232,204,4,150,165,119,122,186,244,102,179,185,225,166,89,97,212,139,170,250,187,60,202,81,48,95,42,180,212,242,37,86,239,144,108,133,207,147,44,236,43,69,139,142,209,181,200,86,98,113,112,166,30,240,21,171,9,164,50,177,211,64,244,230,166,135,215,179,239,56,219,246,118,242,22,150,69,85,188,14,143,74,9,9,12,91,90,86,57,182,90,69,127,200,85,213,204,178,16,174,149,58,17,220,40,157,114,14,163,250,225,121,204,20,91,88,99,76,29,10,106,91,167,218,225,190,226,46,71,96,159,37,223,171,114,135,226,153,76,38,198,141,53,53,215,42,150,51,215,43,205,102,179,192,238,171,58,205,216,237,246,
+13,231,177,132,75,165,165,46,119,21,97,187,112,109,249,216,127,189,231,185,25,186,98,110,123,35,238,122,65,146,118,60,127,169,98,47,45,111,248,246,121,225,14,185,197,64,219,9,237,52,136,219,210,59,228,69,62,9,202,189,142,23,82,137,142,67,58,213,105,98,82,58,63,48,191,113,77,30,173,18,55,173,216,67,33,65,171,60,124,57,19,119,166,168,27,167,129,140,80,189,229,39,94,134,148,187,141,67,43,237,58,126,38,12,4,197,244,76,6,210,226,177,61,249,201,216,254,21,180,22,145,161,81,29,56,179,198,165,187,85,61,32,24,0,145,91,98,151,199,66,153,112,245,106,227,184,106,203,35,83,72,20,237,147,192,161,167,195,211,87,35,62,171,56,205,234,179,175,187,228,125,123,91,205,29,137,115,179,216,195,171,214,16,249,253,81,135,99,109,104,31,202,119,55,222,174,189,154,163,183,243,200,14,227,224,225,192,25,81,57,146,84,74,221,87,1,173,158,223,109,118,158,117,174,53,215,196,7,54,155,156,153,115,231,30,171,135,167,144,39,87,195,250,168,232,200,
+120,17,79,36,18,105,79,90,199,111,56,96,243,170,187,245,213,92,53,217,206,217,212,132,221,22,181,221,181,105,74,31,155,220,227,87,109,117,243,194,174,35,74,148,44,243,251,134,200,186,75,160,21,226,200,229,174,231,52,16,178,78,181,156,39,157,212,224,86,242,250,90,55,211,202,93,99,50,98,227,170,214,164,120,148,231,52,70,21,59,253,146,246,6,251,74,55,34,167,181,56,123,242,38,36,91,161,205,45,243,46,153,253,186,144,66,59,17,142,115,155,221,215,231,0,149,194,220,249,170,246,157,208,162,172,97,21,58,209,1,167,173,110,34,182,113,186,54,45,92,98,95,158,108,176,227,203,250,230,149,222,206,221,217,129,228,162,106,37,226,10,146,89,39,237,242,249,64,138,212,104,150,88,73,198,86,51,185,107,146,72,167,69,213,186,153,154,113,197,10,163,167,102,194,53,149,104,111,12,173,177,90,133,198,129,253,235,149,182,13,13,215,185,220,150,216,56,245,207,142,80,92,51,163,179,173,62,15,135,127,104,231,220,184,154,73,230,81,69,96,54,124,172,29,90,183,
+158,205,241,173,220,29,143,203,201,222,22,243,22,196,182,171,248,14,161,129,203,142,111,218,106,170,105,238,96,13,175,123,99,87,122,186,63,221,177,190,3,114,210,69,253,90,171,34,26,214,70,73,138,160,41,56,199,138,53,114,234,232,243,155,177,75,123,200,20,61,168,159,243,159,204,114,118,28,228,113,210,197,90,61,157,61,223,107,128,76,1,158,90,4,190,94,170,108,194,230,76,29,117,111,37,110,130,86,68,219,49,141,111,180,105,180,169,239,52,61,112,96,183,30,118,159,212,244,182,239,12,180,0,104,49,66,177,244,205,109,170,180,244,30,126,218,175,94,24,147,37,98,91,115,222,27,107,166,197,33,87,40,172,215,252,24,248,53,151,177,120,34,137,149,227,14,147,157,149,210,115,188,169,83,27,129,57,22,63,178,141,66,230,1,239,242,141,93,222,198,41,175,161,63,152,138,83,187,171,188,18,153,141,165,168,18,27,83,162,56,177,119,62,221,212,48,174,117,232,201,116,111,43,83,197,169,31,87,217,205,97,215,217,224,84,173,96,175,117,1,120,178,93,183,46,138,
+28,178,103,147,109,227,222,99,127,163,207,17,241,159,90,185,150,244,230,226,245,150,120,243,48,99,216,241,250,70,4,139,50,38,55,101,103,147,229,23,145,8,45,162,62,174,106,59,163,10,32,88,41,6,60,66,150,220,126,30,82,241,22,86,36,113,35,167,73,42,32,180,200,71,157,3,178,184,198,111,132,12,164,134,18,2,237,78,98,116,163,158,201,85,212,141,201,172,93,153,157,149,153,51,55,219,122,172,151,17,20,235,97,17,4,178,160,38,178,127,62,208,170,61,110,239,178,48,52,3,93,139,155,19,171,199,83,186,76,114,122,222,46,119,244,78,209,231,219,104,164,204,238,25,115,173,5,112,213,226,27,201,44,202,253,234,208,144,117,52,97,30,145,94,57,248,108,115,223,132,122,164,110,67,195,236,200,48,57,141,117,59,53,204,235,83,125,122,135,216,39,230,2,105,213,84,171,16,105,109,236,234,129,180,90,78,99,55,1,159,138,172,58,50,6,199,41,94,165,186,33,148,160,237,42,78,45,202,57,171,170,211,222,75,178,109,182,115,142,198,187,251,206,132,45,39,
+102,197,5,219,51,200,119,158,116,32,30,63,12,226,3,244,120,177,84,39,25,112,166,218,102,162,46,189,187,157,126,67,232,149,175,176,108,55,18,241,193,85,223,37,35,224,57,59,140,79,104,211,55,231,75,70,223,88,139,102,54,57,51,84,171,113,204,135,118,198,20,77,162,41,194,218,150,10,241,118,207,160,157,124,162,20,135,163,3,161,212,234,70,195,190,131,100,155,5,160,189,146,168,78,17,61,117,209,78,214,64,3,209,78,155,72,38,147,250,85,114,67,167,204,58,23,146,30,92,197,46,21,66,75,61,113,123,148,157,113,58,26,151,195,167,41,211,62,153,172,137,200,28,215,23,67,20,245,14,103,37,26,77,165,9,103,254,186,90,178,185,151,88,205,236,240,40,15,209,184,160,56,117,111,57,44,65,107,149,58,140,192,33,143,163,20,105,38,37,83,222,45,1,98,16,251,198,115,85,184,97,87,155,139,47,19,246,5,239,162,88,133,198,139,51,42,211,60,79,219,67,66,146,4,196,164,153,51,113,13,237,146,133,196,159,213,253,180,168,106,111,124,159,138,134,171,
+154,108,184,114,113,209,112,53,180,131,134,171,144,14,13,87,157,99,104,184,114,159,215,160,129,176,77,132,6,194,33,2,26,8,231,199,51,211,150,36,57,120,83,189,173,130,175,4,187,116,194,94,189,173,70,128,152,125,72,174,237,174,138,194,128,36,5,50,36,219,26,4,139,4,69,28,122,162,14,192,67,194,80,127,20,223,0,193,29,196,118,23,12,238,32,182,79,32,112,61,229,80,221,200,9,151,167,33,203,158,32,193,32,132,167,197,34,79,159,172,125,49,222,219,110,21,109,218,26,142,82,91,45,94,203,185,175,102,74,40,95,159,227,205,68,170,146,123,140,17,75,207,126,194,75,152,104,223,242,104,174,164,41,194,238,134,75,244,95,70,231,248,38,77,210,19,154,183,119,36,145,171,115,77,120,131,108,243,13,71,124,117,83,169,201,136,111,79,219,115,57,215,38,179,175,250,108,205,210,163,67,159,109,154,202,139,153,105,9,69,147,77,70,167,44,206,219,100,167,115,106,203,164,4,144,144,109,39,248,132,128,44,177,33,240,138,14,35,87,41,214,28,81,119,214,98,
+104,186,146,146,60,11,222,189,132,22,212,201,139,203,74,209,150,162,231,18,80,172,189,90,173,153,168,189,2,239,204,240,37,120,23,135,47,193,187,13,248,18,188,139,94,161,19,185,90,116,98,102,11,157,216,120,133,78,228,47,160,19,195,139,232,196,246,54,116,98,160,22,157,184,147,64,39,166,69,232,196,206,90,116,162,13,101,71,121,129,178,211,195,64,217,169,57,65,217,241,82,193,75,152,191,164,97,254,146,72,165,21,151,151,151,67,214,163,171,166,153,241,132,243,70,33,23,200,189,135,53,19,212,252,190,38,64,174,113,54,228,140,134,164,114,225,204,192,113,36,51,163,5,117,252,245,181,249,58,229,110,4,118,60,211,132,202,131,75,239,247,84,79,177,248,34,158,45,153,22,45,100,46,90,167,234,4,90,161,99,77,124,234,155,11,56,69,135,125,169,8,136,159,138,21,59,219,97,179,217,14,92,225,116,107,50,109,236,24,243,28,17,247,89,7,65,189,117,58,66,141,174,138,118,154,150,151,85,205,188,139,109,35,105,191,190,71,149,167,47,166,83,60,213,0,167,
+253,148,68,58,45,151,88,38,46,215,69,85,142,46,143,99,152,135,104,76,214,112,78,61,114,56,152,222,73,128,234,11,241,128,179,189,189,189,55,125,147,72,167,210,75,38,119,40,109,74,211,229,244,116,99,102,176,149,111,227,109,246,183,41,19,169,148,118,78,60,98,247,135,29,167,219,22,41,93,25,117,103,236,180,221,68,183,223,189,185,234,89,78,236,162,250,98,0,243,24,1,117,170,56,76,218,160,132,2,73,189,237,194,227,225,241,58,198,188,19,220,90,74,67,96,144,201,223,108,236,93,219,48,17,149,33,211,241,184,102,201,73,233,38,175,155,14,251,90,248,125,34,214,188,209,27,143,180,89,175,22,188,26,40,119,234,13,123,146,207,48,106,188,115,212,129,180,84,218,155,110,227,208,199,228,137,112,56,204,185,18,173,174,145,174,141,151,12,0,79,35,26,138,217,146,56,180,239,119,216,46,206,152,45,179,147,114,42,213,58,111,221,235,63,81,186,23,172,146,155,25,135,248,116,218,55,55,237,219,147,185,245,177,227,229,88,143,105,52,174,50,246,81,41,20,74,
+168,251,116,153,225,14,159,156,94,208,146,158,161,245,213,250,253,33,191,47,221,230,84,223,28,111,80,244,151,186,3,246,208,50,93,101,87,236,58,155,167,180,64,65,62,135,248,122,181,230,240,192,88,167,181,204,203,4,3,163,83,106,246,234,50,129,195,153,180,54,101,180,129,243,120,200,198,102,236,16,141,49,135,56,86,45,86,8,72,148,221,14,117,47,209,190,104,175,153,218,14,109,200,212,13,125,136,71,132,83,172,248,57,245,216,103,20,212,38,187,236,253,178,35,143,212,22,61,92,237,173,81,31,24,141,253,214,52,93,125,124,233,96,68,125,91,146,171,26,19,16,173,29,177,218,85,251,196,213,140,212,199,161,185,87,251,82,253,129,232,180,60,70,85,180,79,9,68,241,206,160,137,168,16,39,137,196,163,45,239,156,100,160,141,58,18,241,107,45,195,87,1,18,106,255,211,9,173,84,108,105,209,29,155,182,229,233,176,150,172,25,221,62,139,113,46,149,113,231,70,16,88,246,200,230,208,134,168,138,115,70,61,112,1,167,183,249,78,34,91,251,172,52,99,187,37,
+58,203,31,178,12,100,104,196,78,181,47,200,237,166,116,41,53,162,169,186,43,18,29,53,119,169,92,108,25,77,8,86,24,221,38,121,218,44,208,110,143,73,143,166,40,246,228,200,165,101,177,27,218,243,44,98,207,174,43,61,105,61,213,116,154,74,5,227,212,80,143,107,247,146,224,177,217,237,206,238,116,34,30,60,54,129,154,128,19,11,207,71,14,143,107,152,150,81,203,42,192,144,45,0,34,237,90,145,155,50,180,186,166,175,50,203,187,210,250,148,113,101,163,103,206,204,32,38,121,61,20,55,69,79,177,108,27,183,57,38,154,147,120,68,61,155,165,162,140,203,78,2,251,231,137,132,228,220,65,112,235,235,233,81,122,146,186,229,220,233,110,146,93,72,143,205,19,231,59,41,81,215,162,113,214,36,16,183,30,170,69,192,87,88,208,89,64,225,97,151,203,229,65,134,69,189,225,172,97,37,165,153,180,211,207,211,51,219,44,196,153,38,87,84,202,98,215,250,245,138,75,225,180,32,230,224,47,143,178,135,54,204,251,166,245,13,62,141,78,27,115,213,12,67,127,180,
+67,127,156,159,177,140,29,206,74,83,65,122,7,163,245,226,82,26,74,24,35,35,230,208,110,15,127,252,146,34,10,146,182,187,25,195,28,181,175,151,95,221,23,232,232,110,216,2,8,234,160,162,254,56,170,169,137,107,173,6,102,104,8,36,44,91,222,139,185,243,243,84,91,52,16,189,26,72,115,5,73,235,206,144,177,45,115,45,85,249,22,137,146,246,180,48,169,94,156,107,161,110,15,0,123,74,108,32,246,212,153,98,77,182,186,230,194,193,165,186,14,247,242,17,93,154,110,150,4,3,106,150,107,121,140,216,57,72,35,246,54,45,13,79,92,95,24,23,212,12,201,245,205,141,232,224,160,62,126,220,224,24,39,117,223,248,231,207,216,126,195,201,208,6,155,110,148,214,247,233,12,85,91,129,22,203,141,151,38,217,15,90,125,112,91,194,193,204,230,80,70,236,95,28,182,116,175,162,0,191,35,104,157,234,0,10,214,56,160,130,135,44,74,66,243,16,84,156,17,190,4,239,196,240,37,120,215,4,95,130,119,28,11,58,145,75,66,39,154,133,200,196,233,190,106,128,
+195,53,63,140,195,227,104,88,88,78,161,48,35,27,65,195,194,127,56,158,152,129,19,145,22,135,195,30,116,123,211,250,8,213,101,77,84,181,92,95,162,64,1,153,218,146,68,170,119,123,205,72,4,220,133,70,5,34,96,168,110,10,137,128,89,63,244,5,108,205,72,4,92,67,244,199,32,204,130,152,11,67,110,2,196,92,24,114,27,65,204,133,33,151,9,98,46,12,185,167,32,230,194,144,27,1,49,23,134,220,115,16,115,97,200,213,128,152,11,67,247,42,136,221,130,255,66,58,97,148,142,125,22,217,173,151,150,64,118,27,161,94,35,187,189,180,30,162,176,232,211,33,187,237,53,255,169,241,126,1,177,214,225,153,142,133,26,80,233,175,90,152,147,168,194,195,83,168,194,187,78,81,133,27,135,80,133,111,167,81,133,79,106,81,133,15,35,214,96,89,205,230,9,130,11,212,140,28,76,212,140,8,163,168,25,73,56,168,25,117,88,81,51,242,173,162,102,244,255,219,254,188,164,107,129,214,180,115,153,184,188,76,43,50,241,120,52,238,154,219,83,59,157,3,206,49,
+143,70,163,225,214,101,188,115,137,76,70,209,74,211,141,104,20,226,134,102,117,223,85,15,48,164,118,20,238,134,155,145,232,46,149,215,9,103,164,27,74,123,140,54,218,23,143,70,123,211,187,106,81,85,67,167,103,56,136,186,115,131,13,132,87,16,89,251,90,3,231,10,187,158,147,105,219,155,136,14,94,213,180,27,135,81,70,166,210,164,200,57,117,43,146,81,40,20,215,103,254,160,47,104,156,188,190,60,77,245,165,100,124,219,177,95,89,93,117,21,18,167,210,105,203,185,243,154,56,51,39,88,109,144,54,66,123,222,64,217,0,114,24,58,62,36,54,164,246,29,117,84,122,143,42,120,18,237,177,195,131,130,68,205,109,28,62,21,104,253,161,249,129,147,19,189,94,191,23,137,36,180,87,55,146,149,241,37,150,218,233,11,14,50,29,212,104,199,62,75,118,128,152,69,52,232,18,45,56,3,71,215,173,215,215,161,83,128,199,93,211,201,110,213,105,72,172,144,41,20,236,246,6,197,250,164,85,178,221,205,162,117,248,98,48,17,232,111,163,181,111,184,3,227,201,180,
+148,199,21,44,76,113,211,123,203,106,55,103,127,39,196,217,237,242,186,185,19,243,67,77,205,181,93,108,158,162,94,191,75,105,144,231,241,121,238,4,4,22,154,184,239,92,22,238,212,183,203,100,215,50,102,221,242,88,99,85,96,168,195,54,176,78,150,250,167,220,99,122,162,178,155,50,41,92,136,27,89,68,27,83,42,92,232,32,213,75,234,54,77,134,212,14,231,112,87,32,174,223,74,120,216,43,205,35,150,100,220,103,82,214,174,113,14,46,124,20,104,156,64,244,115,208,56,23,102,155,79,197,226,51,53,95,98,93,247,70,3,66,89,119,109,168,187,219,222,122,26,116,53,15,14,116,143,196,226,178,62,197,242,60,133,161,83,165,45,3,169,40,77,120,96,59,110,35,18,253,83,18,186,56,214,60,178,196,226,244,121,87,53,78,22,203,43,236,236,25,118,129,90,216,129,192,236,133,108,114,238,250,240,0,196,126,226,188,253,132,40,84,137,237,199,254,96,176,107,253,56,144,92,93,157,166,117,243,119,121,171,189,243,158,174,244,156,118,102,195,239,152,113,166,157,65,
+173,76,38,91,75,132,107,27,41,187,3,236,217,249,4,119,70,220,101,152,227,8,187,230,105,17,33,103,158,196,211,38,29,205,107,13,93,44,254,217,22,101,80,177,100,4,105,66,195,26,146,38,184,134,135,125,162,62,93,11,147,212,221,125,156,228,157,108,200,149,13,194,120,88,39,31,31,38,51,183,228,204,49,203,246,229,1,71,215,121,28,212,118,205,113,116,126,230,202,165,196,109,146,170,156,172,9,110,51,99,102,65,114,108,30,173,245,158,1,217,95,132,27,144,132,99,231,76,169,100,175,29,209,8,154,149,24,253,148,123,105,208,212,164,14,228,199,162,189,62,175,119,62,152,224,134,102,14,85,83,29,181,132,179,237,209,190,16,39,204,12,95,250,235,45,181,117,29,23,30,152,56,246,187,152,84,79,61,105,197,189,169,208,184,76,45,38,242,104,42,166,106,82,31,212,107,130,115,155,34,147,77,204,38,136,73,102,163,210,121,222,124,225,176,31,213,144,151,54,96,144,141,184,78,198,161,218,247,148,206,213,11,47,177,193,76,25,19,103,70,163,17,214,192,20,111,
+154,48,163,17,5,70,108,115,30,26,91,197,218,81,246,164,183,182,86,19,145,4,146,5,26,86,19,210,128,55,30,12,39,82,163,231,19,177,221,33,197,68,116,78,235,219,148,154,247,199,130,237,209,148,131,170,136,118,82,111,116,166,179,3,211,110,189,130,227,26,38,203,208,128,184,234,58,177,69,231,82,49,87,200,126,19,61,85,111,100,168,181,85,234,224,136,254,210,178,48,170,237,219,225,91,26,250,172,162,38,198,66,155,219,119,40,30,63,94,136,16,189,99,16,241,78,129,239,104,187,105,42,30,207,106,216,97,154,6,146,134,52,125,52,24,136,31,15,108,137,155,67,151,225,30,145,187,51,62,114,125,182,65,25,189,12,58,157,212,19,160,206,0,179,78,200,246,251,91,72,19,3,104,60,50,172,174,44,129,28,88,101,60,92,168,63,136,69,101,115,61,173,38,198,188,36,222,115,126,50,235,83,57,244,139,212,94,234,102,189,111,86,166,191,88,222,91,58,222,214,52,59,119,217,234,35,125,135,103,88,13,165,28,61,20,5,84,12,167,185,229,138,92,213,174,79,
+14,110,166,231,146,161,3,139,223,198,216,18,217,103,212,25,215,177,113,149,208,184,196,202,28,218,36,171,203,237,118,49,91,108,114,147,53,157,1,105,207,117,91,144,215,166,191,30,181,69,154,27,174,23,187,64,29,11,209,64,43,61,25,182,36,83,41,230,126,108,224,88,52,31,15,36,41,85,178,57,57,101,254,74,56,190,222,56,53,225,84,16,72,251,87,195,124,91,148,53,215,18,229,68,107,219,245,245,139,164,76,175,169,179,182,131,91,199,72,93,222,28,133,215,205,93,92,178,90,79,170,214,154,50,206,193,181,224,44,219,64,225,246,94,240,125,102,230,222,224,240,185,228,2,9,160,75,226,21,210,154,83,192,239,111,230,246,210,249,243,122,102,227,122,56,108,139,87,209,88,161,30,150,60,25,50,187,205,131,68,83,70,67,13,26,45,10,127,194,200,95,171,137,78,122,183,84,34,106,15,7,250,217,218,6,106,247,76,215,230,121,120,137,60,221,31,10,57,169,147,94,111,147,173,221,233,36,169,84,41,71,237,26,211,190,219,50,182,108,236,151,13,204,25,183,162,
+26,159,204,27,89,84,49,38,107,201,26,139,180,83,40,157,88,218,218,77,68,208,50,194,144,94,221,234,219,188,172,174,159,29,113,54,182,146,19,161,5,214,213,100,237,112,42,237,100,100,174,78,247,156,59,59,163,221,39,90,241,118,148,225,241,120,46,100,203,129,105,22,43,57,202,216,104,226,50,38,70,135,213,199,227,44,159,118,92,55,180,61,57,101,87,141,221,48,7,142,247,29,199,164,152,239,116,215,115,89,103,85,1,217,238,3,225,130,250,176,121,36,200,110,110,31,21,104,217,32,232,172,20,196,195,237,21,52,254,233,180,232,139,92,188,227,136,209,23,52,1,250,34,23,207,70,224,135,113,88,199,138,17,32,223,110,67,235,86,29,170,199,124,126,196,185,68,95,208,80,184,207,231,63,166,30,244,133,56,155,239,228,234,101,54,58,61,95,31,47,2,155,168,154,48,250,204,40,110,246,231,242,130,1,36,47,88,33,113,100,104,1,159,211,135,17,38,5,32,39,208,195,164,160,77,27,146,120,101,132,117,144,87,92,194,188,162,138,16,230,116,122,8,132,217,78,
+143,26,249,157,64,48,206,162,15,186,209,199,4,38,250,120,246,63,58,142,136,252,126,16,35,84,31,245,193,134,10,141,133,54,84,194,71,104,67,101,171,10,109,168,236,187,208,254,183,17,57,45,97,200,148,200,105,201,129,59,138,156,150,68,8,103,200,105,201,90,231,97,184,254,104,78,41,58,27,65,143,57,108,74,244,152,67,208,136,30,115,120,118,208,99,142,255,178,190,209,240,56,122,128,178,189,128,30,160,120,41,232,1,74,203,21,74,249,138,234,114,232,174,174,83,237,41,153,221,103,183,217,22,140,253,55,18,235,177,63,62,79,211,105,219,83,234,121,65,172,106,217,206,19,17,91,253,6,200,95,98,144,156,16,104,45,150,132,197,84,7,194,58,131,202,96,120,218,83,154,230,155,129,246,141,147,203,99,242,9,139,90,31,29,219,175,183,130,69,212,87,87,215,164,120,60,206,217,27,213,102,78,180,59,2,16,203,197,20,75,43,255,80,97,37,19,54,144,134,155,19,118,225,134,132,163,246,246,171,72,34,41,85,157,154,205,102,122,194,203,208,12,136,15,68,194,
+161,217,136,197,115,194,96,49,9,219,138,37,164,51,186,41,224,91,70,187,3,110,97,139,138,56,23,97,44,83,57,20,30,163,131,184,80,205,77,121,14,136,123,242,8,178,61,181,52,122,117,29,142,129,194,50,48,191,216,184,192,107,75,165,182,34,166,218,109,139,101,214,178,32,169,85,10,187,215,166,146,72,135,111,129,220,224,160,142,107,146,103,233,52,235,90,34,177,118,77,210,207,251,82,202,212,145,204,189,204,181,89,72,92,150,134,107,50,198,136,123,10,185,156,158,182,198,24,82,187,143,45,165,210,250,219,26,12,231,254,248,97,181,32,217,41,216,9,4,26,183,184,123,141,177,181,170,230,224,181,134,66,108,186,170,170,66,212,230,32,218,68,170,233,179,121,191,80,223,57,188,60,109,237,232,105,215,205,57,169,201,101,239,197,124,146,233,230,8,205,139,145,72,36,46,161,111,220,44,196,189,123,78,98,84,184,50,228,31,229,141,30,145,212,107,147,226,76,179,122,125,237,162,202,195,141,147,58,144,246,124,205,2,108,218,174,158,78,95,210,13,209,254,48,63,162,
+247,139,88,221,85,235,205,132,45,142,101,122,136,108,229,211,122,212,35,202,184,196,126,214,58,238,163,235,216,58,245,84,211,242,28,201,204,33,5,205,45,158,133,237,153,101,225,214,17,149,216,230,28,133,7,120,225,64,164,110,159,197,232,138,105,123,13,110,227,249,133,117,171,42,22,218,220,91,57,148,31,39,45,82,174,51,180,151,102,76,242,122,59,136,147,103,58,141,131,218,207,106,78,168,37,177,238,120,58,157,214,241,157,115,245,14,115,23,133,57,184,61,176,164,230,93,250,162,181,43,71,252,77,216,94,94,25,167,33,253,85,157,200,105,104,118,30,45,15,55,242,39,236,253,179,166,208,230,212,121,244,204,169,90,111,79,137,78,98,91,77,156,147,17,201,136,201,232,182,30,95,221,108,165,172,221,204,122,198,77,191,172,150,69,107,82,239,235,7,103,165,234,254,104,231,37,234,32,180,200,25,245,90,49,45,99,183,28,141,204,204,142,152,206,150,57,139,45,78,65,240,198,121,222,66,79,172,5,187,57,251,14,243,66,183,197,223,199,91,57,56,118,173,9,150,195,
+145,241,122,199,0,175,117,122,164,170,97,143,149,181,11,90,231,62,107,129,222,206,96,76,50,214,86,136,227,108,121,160,222,185,61,73,107,88,144,111,139,132,220,99,169,81,225,184,50,196,14,186,13,227,41,235,113,223,10,161,169,155,195,228,71,229,139,234,104,202,237,225,236,197,38,136,61,83,90,104,56,205,131,228,221,125,22,101,249,80,215,111,106,190,158,9,135,90,181,122,209,138,189,131,35,62,235,29,62,239,30,34,80,244,59,59,233,224,240,174,125,126,254,106,62,88,37,152,158,90,90,243,109,37,130,72,151,155,172,94,155,79,182,11,105,166,195,192,185,116,196,220,34,239,21,121,183,197,92,235,124,40,164,239,235,74,158,92,117,233,183,28,167,171,251,220,27,139,139,41,95,220,237,150,229,250,183,210,93,238,105,112,167,38,16,88,63,153,9,174,185,154,87,77,105,206,76,191,77,16,148,140,180,108,165,87,169,117,236,140,211,182,124,210,116,194,113,248,231,55,23,166,26,23,248,55,227,12,85,3,35,45,28,86,92,200,6,155,33,72,169,3,103,71,218,133,
+94,182,124,158,239,160,171,234,77,107,20,250,241,174,36,57,109,15,26,87,119,166,201,142,115,39,213,40,92,234,30,214,250,37,117,20,121,239,228,149,206,156,172,210,38,233,85,59,164,32,210,37,223,84,246,139,220,58,134,250,52,188,200,183,238,25,99,87,86,103,40,49,202,146,155,35,51,70,17,152,173,182,52,186,219,188,81,111,250,152,126,157,92,177,218,23,71,157,8,92,245,117,182,121,130,156,62,205,245,248,146,251,108,45,112,172,114,44,44,197,221,46,69,191,167,141,165,187,26,245,144,247,105,39,157,251,231,198,148,49,226,204,208,151,136,245,148,16,161,202,50,10,230,94,193,201,30,93,230,34,165,179,69,37,140,1,173,154,97,76,8,69,17,123,55,67,222,24,89,106,112,110,41,230,211,231,161,189,211,246,140,118,235,88,205,243,174,187,103,98,221,70,88,59,81,164,188,169,209,157,49,41,89,214,170,37,233,200,179,146,208,138,121,81,178,171,68,144,50,124,238,160,94,223,156,245,204,16,183,72,221,177,144,150,235,61,137,81,133,107,51,76,199,238,136,48,
+213,163,95,214,236,140,91,98,145,147,89,237,254,74,131,249,140,65,154,72,46,46,76,205,174,145,124,200,241,175,135,49,72,62,81,246,167,149,50,224,107,201,43,173,161,218,113,238,136,178,195,202,9,53,137,97,141,152,244,166,142,118,121,223,188,109,63,19,151,80,188,122,181,62,96,107,225,51,213,227,231,199,94,223,32,39,222,149,63,183,186,217,216,229,53,156,71,34,7,145,192,160,196,31,113,204,69,70,131,237,231,115,180,212,154,187,127,124,255,156,197,109,226,184,162,103,71,9,190,64,27,179,171,122,187,15,78,151,25,67,241,128,54,28,102,16,213,227,178,240,14,123,128,64,38,161,231,221,135,125,30,250,122,168,55,194,91,191,38,155,37,99,4,30,120,62,225,134,1,66,49,216,144,154,96,55,113,6,217,185,243,247,46,186,39,36,102,198,166,155,21,237,77,103,192,213,246,97,48,210,174,56,36,118,158,100,148,80,125,53,136,156,222,139,98,148,177,164,36,108,172,31,163,161,98,59,139,80,27,136,145,14,153,116,68,58,47,35,246,118,161,231,220,19,92,75,
+45,225,138,248,167,156,203,111,186,209,128,149,163,183,76,69,3,214,234,34,26,176,198,208,227,151,122,235,32,26,176,250,212,36,130,198,144,88,140,13,162,7,28,4,1,122,192,241,31,139,199,255,117,121,193,219,227,8,32,71,128,41,130,11,61,254,52,114,224,161,11,96,169,189,10,189,80,161,85,163,23,42,200,125,232,133,138,53,2,122,161,98,181,30,189,80,193,30,65,47,84,156,131,28,1,166,8,127,178,92,136,104,32,55,32,106,170,130,121,2,34,241,48,188,100,1,36,190,10,149,12,36,46,64,252,86,41,186,129,151,44,0,229,70,36,251,56,163,118,33,217,71,235,226,48,31,61,240,10,35,217,71,253,192,57,122,125,163,121,16,9,99,76,85,149,40,22,139,169,46,27,185,153,57,217,77,70,107,74,239,140,153,45,22,139,179,206,233,180,120,102,247,169,97,255,6,114,46,117,179,235,213,139,54,78,167,149,123,170,40,51,214,238,175,111,190,216,103,129,146,93,231,153,231,37,204,117,201,19,43,186,142,61,49,163,77,36,18,232,125,70,250,17,133,187,185,
+41,90,242,206,93,142,204,242,88,204,134,244,88,22,175,83,0,175,181,202,186,78,133,36,29,216,96,51,47,236,53,203,129,104,50,145,208,240,53,194,254,129,106,209,38,25,61,47,117,142,139,84,236,81,29,219,180,18,79,240,117,26,109,108,180,203,40,109,202,36,119,249,11,132,157,46,176,119,47,226,22,198,90,233,246,192,165,201,144,161,0,98,172,100,19,71,227,2,57,73,230,96,137,160,153,237,66,36,100,65,70,109,15,88,71,154,50,5,247,17,87,21,3,83,72,224,111,161,181,53,88,189,20,27,65,63,125,26,109,48,113,157,123,32,97,217,34,36,219,147,70,102,245,206,118,143,135,106,156,82,171,89,219,243,180,61,18,220,194,165,65,45,3,17,182,35,217,79,231,82,88,76,163,188,218,110,183,187,125,194,206,53,83,102,110,98,134,73,105,24,74,118,217,67,203,213,238,222,214,229,106,206,110,200,114,37,182,93,110,173,89,89,148,9,65,87,220,42,169,10,115,226,68,91,77,23,10,19,27,85,187,218,13,7,8,244,94,43,8,244,27,201,144,49,162,164,
+154,237,50,90,189,142,156,236,0,140,146,86,195,219,172,118,99,147,195,180,222,172,53,115,7,228,187,84,70,175,152,115,212,74,246,236,40,250,142,82,12,98,219,48,180,180,125,36,27,13,155,22,183,246,55,149,107,102,182,147,25,212,182,54,120,213,50,52,188,235,2,252,76,42,37,147,203,51,235,115,193,6,253,168,212,184,5,130,252,101,123,223,238,89,40,172,38,155,46,56,74,125,131,245,96,74,115,109,225,102,102,22,227,202,27,209,25,61,218,226,110,112,158,185,106,183,3,194,182,81,157,134,25,217,224,143,42,56,82,234,240,182,223,196,31,161,24,106,103,87,205,67,193,25,229,144,111,149,162,111,104,63,26,207,52,29,251,106,98,238,110,233,202,97,63,160,5,73,157,46,198,187,225,77,140,14,242,238,201,13,208,105,255,120,61,133,52,218,50,117,37,230,145,69,32,35,136,68,46,36,38,113,99,104,13,189,166,184,118,222,63,41,230,36,54,149,34,209,220,46,45,58,114,118,72,141,214,238,131,82,95,54,209,171,163,143,54,135,229,64,209,70,17,145,51,59,
+196,241,245,180,109,156,198,26,171,134,152,163,28,198,208,48,209,125,192,229,241,148,100,137,34,96,188,18,183,121,213,107,50,115,243,238,94,38,160,182,86,145,59,46,60,71,157,32,52,28,251,125,74,171,96,160,135,27,244,93,94,168,150,231,21,124,187,239,122,211,192,89,62,8,236,251,83,110,97,152,74,172,229,213,123,218,72,13,91,210,106,109,166,115,79,63,61,76,1,126,190,152,84,111,175,219,137,209,80,138,204,33,38,106,116,145,11,7,53,52,4,2,54,51,24,56,153,32,75,210,17,142,126,149,127,76,175,246,195,73,96,142,10,78,2,115,50,118,162,122,191,105,153,151,160,92,237,218,180,140,120,123,48,228,59,212,40,39,186,134,152,3,109,13,28,138,77,228,92,163,167,165,50,63,231,188,251,42,222,188,216,73,36,211,206,1,242,29,236,14,207,11,88,3,45,150,152,76,65,153,108,225,236,77,204,72,44,163,77,172,84,199,64,189,69,22,90,82,134,142,175,197,68,215,250,8,235,242,188,123,83,84,53,163,19,180,74,215,91,174,108,215,238,5,121,93,
+172,125,67,57,46,181,196,198,173,83,93,179,201,57,197,212,2,39,61,45,37,11,153,71,29,228,25,34,203,66,112,30,239,215,211,79,215,69,156,113,253,213,168,187,171,155,227,107,231,81,131,94,7,175,95,51,55,66,203,36,234,7,57,253,182,234,130,241,251,112,252,238,21,201,60,188,220,205,88,214,141,31,107,157,23,32,49,72,46,33,183,17,13,238,12,114,27,241,98,112,107,92,17,10,207,218,34,66,10,96,10,240,164,147,174,243,128,203,7,8,155,177,180,53,110,176,25,228,188,89,137,101,83,234,90,184,140,82,111,210,75,157,77,10,67,154,212,87,215,70,181,238,94,85,19,50,196,237,45,77,136,222,113,20,103,18,71,46,47,58,123,79,117,85,155,177,27,175,75,65,170,186,180,112,21,9,159,59,61,145,28,85,249,39,247,171,99,90,53,89,121,120,163,23,206,207,30,9,186,91,253,61,158,163,105,239,146,90,52,167,85,174,173,92,177,107,236,36,144,95,76,234,186,70,133,29,233,198,129,125,230,228,66,112,101,107,33,118,49,222,121,165,115,141,6,76,
+75,103,212,163,9,139,101,241,244,176,219,147,94,25,83,91,183,9,52,149,81,228,111,180,40,69,238,9,167,44,37,23,77,141,197,128,88,151,47,102,180,28,119,72,125,125,66,182,147,107,170,163,41,240,204,185,44,158,209,218,102,213,6,154,145,96,85,138,252,172,70,139,74,164,59,32,76,104,70,44,139,35,19,146,102,203,170,101,6,212,95,115,172,195,233,54,191,230,108,21,216,113,216,73,37,16,153,36,96,137,103,212,37,8,214,192,180,137,8,60,211,151,102,145,232,90,181,177,213,129,196,211,163,198,78,20,207,183,193,24,56,100,12,140,129,67,106,192,152,40,8,76,99,32,88,78,117,201,218,27,145,219,122,29,71,46,38,122,15,96,27,154,93,72,222,125,142,92,31,32,144,3,46,180,96,189,189,146,255,167,253,138,130,255,252,27,73,61,53,147,82,200,154,9,132,83,3,168,48,9,19,77,189,200,239,87,53,92,66,210,157,105,55,9,171,14,206,11,190,17,240,240,139,191,122,80,132,124,247,226,127,231,191,49,128,190,254,113,81,238,207,220,87,6,30,126,
+246,241,227,191,248,244,241,67,66,13,187,42,12,86,171,105,206,32,11,43,6,60,52,125,219,225,106,91,199,186,147,108,160,143,212,178,109,132,145,134,182,67,213,53,193,127,220,74,8,52,18,22,86,15,59,50,203,163,202,142,166,70,181,96,72,155,180,14,79,13,55,81,215,180,231,188,142,181,198,249,186,186,243,137,240,166,57,66,149,112,19,98,205,100,102,154,161,30,247,241,172,51,205,169,133,140,69,54,115,211,162,141,72,237,67,29,141,87,181,213,211,109,209,107,218,84,123,103,227,42,179,113,201,19,169,174,30,36,246,215,174,234,64,112,235,160,232,50,138,185,46,250,114,159,213,212,79,10,116,15,82,15,247,44,42,253,241,166,87,235,118,207,201,231,253,110,207,80,68,161,158,96,89,237,52,171,60,165,35,120,253,99,62,166,172,110,70,50,43,97,91,186,156,39,94,159,166,93,172,160,55,80,72,233,73,95,250,192,183,235,160,47,207,197,20,81,189,81,37,188,62,141,176,18,226,136,97,114,54,196,178,139,66,23,107,134,129,136,73,123,115,210,198,225,203,61,
+70,202,116,196,202,155,115,154,175,8,214,19,243,234,230,77,40,52,90,223,115,173,210,47,136,46,121,180,99,139,227,106,36,238,74,143,184,218,79,157,20,175,66,181,193,231,41,210,230,153,122,87,253,116,132,152,16,91,38,103,183,253,245,134,133,102,185,93,10,138,208,125,179,46,54,219,151,214,123,205,134,186,176,153,122,186,121,117,181,234,105,83,11,165,215,145,209,13,195,26,253,56,94,123,126,194,211,144,71,106,196,199,75,206,232,233,146,181,167,207,110,146,213,122,3,29,109,214,121,249,186,106,178,87,124,45,36,133,60,62,90,155,236,104,132,213,62,236,140,83,231,188,170,140,236,76,26,240,48,117,181,251,124,247,132,171,129,98,116,116,46,44,89,57,28,138,143,22,150,78,119,152,55,58,124,55,231,98,211,154,110,213,112,211,177,39,136,118,167,204,11,213,12,215,188,62,33,152,209,102,198,250,220,93,186,131,253,198,233,16,195,154,60,155,56,57,210,90,110,182,118,84,132,73,217,250,73,204,189,187,199,115,218,110,54,41,115,230,78,102,203,50,109,49,50,215,
+173,59,239,53,201,72,181,94,255,234,254,49,163,238,116,211,60,32,230,155,82,243,0,133,232,46,171,82,227,118,82,36,109,154,192,144,69,173,191,222,116,75,117,170,88,104,221,55,185,57,96,79,173,119,172,176,88,151,2,233,128,211,232,220,227,222,108,79,208,250,189,19,42,5,155,154,212,89,227,141,115,171,53,215,45,93,115,122,119,189,157,178,227,216,233,92,176,106,92,116,86,235,200,120,205,228,190,80,50,169,245,240,37,123,234,198,227,85,50,199,125,45,54,93,234,221,147,62,218,232,72,202,127,45,230,14,5,219,231,166,181,134,131,147,76,146,187,72,17,177,37,178,225,132,227,82,162,24,29,241,247,17,187,19,85,67,117,206,185,224,166,91,199,151,133,110,54,23,22,38,230,169,26,133,68,17,228,203,164,177,161,20,169,182,186,179,153,238,236,177,218,28,254,192,233,210,117,99,237,112,79,223,181,107,196,25,91,168,15,55,171,199,26,137,186,209,109,223,73,90,60,59,54,47,220,222,209,184,198,106,55,250,198,228,102,89,194,189,59,216,107,11,121,24,77,147,
+4,90,143,210,150,10,1,19,72,236,219,12,254,232,9,47,50,226,97,218,27,44,237,238,53,134,205,38,233,144,7,19,11,245,251,117,222,245,89,171,211,151,14,17,72,23,94,61,133,160,27,11,128,210,142,100,104,146,179,111,44,53,19,203,102,144,80,54,205,57,155,69,33,103,187,78,170,107,234,145,109,243,119,162,196,110,149,75,188,165,34,115,46,59,142,93,205,242,253,140,186,137,19,26,80,120,102,65,110,21,201,140,215,212,212,36,34,190,67,133,116,39,16,152,30,236,179,240,66,84,237,185,32,54,51,209,87,239,141,235,253,52,246,77,29,109,197,115,233,114,53,26,102,123,221,23,4,171,212,97,136,199,3,27,36,157,114,200,98,55,95,236,204,217,152,85,174,40,129,182,81,63,36,185,169,90,9,48,156,118,201,220,238,149,169,165,91,156,174,110,105,94,118,54,74,22,22,164,85,33,114,15,229,116,156,27,149,109,166,232,62,35,3,12,142,167,78,41,140,21,107,119,138,47,28,209,215,121,109,178,68,219,100,75,111,72,79,151,213,132,184,179,131,84,18,89,
+51,145,94,171,31,74,92,232,70,14,229,245,106,169,71,62,74,50,44,80,2,4,47,171,193,176,181,224,235,20,180,240,173,20,123,90,94,107,94,157,113,38,217,156,80,170,207,194,90,114,209,125,117,115,174,3,125,72,211,117,204,118,77,94,201,6,54,22,41,3,20,202,178,57,35,164,119,212,122,245,60,2,237,186,135,226,6,27,12,146,120,9,219,252,137,75,64,175,17,175,172,172,12,134,122,51,158,58,151,127,93,45,63,0,235,158,156,251,174,7,58,150,35,194,157,128,97,151,205,102,123,215,6,66,22,163,184,73,119,124,227,208,239,18,218,204,163,163,163,142,94,241,248,220,205,66,184,179,149,54,226,117,155,154,217,132,54,131,202,209,171,1,79,189,254,106,243,188,237,188,209,64,86,114,233,161,121,205,32,151,0,18,215,137,101,54,121,144,196,106,50,144,27,35,109,237,156,165,64,253,69,157,75,109,170,29,34,147,6,84,99,209,174,80,59,61,41,171,239,241,123,57,138,134,88,253,206,128,138,90,227,82,31,210,70,84,97,50,93,237,231,12,44,181,156,19,
+196,93,67,17,87,112,167,249,202,182,68,208,137,1,182,52,249,19,66,55,65,220,210,94,219,50,175,27,172,191,38,44,91,155,144,39,35,45,203,171,3,206,94,6,191,109,156,177,91,191,82,111,54,144,231,55,72,162,65,14,169,135,117,50,191,50,177,188,57,154,62,160,182,80,5,231,6,143,136,170,218,140,159,232,151,46,88,173,214,166,17,21,213,160,106,38,85,7,6,142,123,88,70,133,149,215,90,223,122,178,185,65,171,157,76,141,79,38,132,139,238,26,177,251,120,184,237,102,102,115,121,245,130,61,59,178,52,181,63,16,186,110,90,89,129,179,2,3,131,200,44,94,107,107,189,54,225,96,90,199,73,70,230,233,149,229,114,234,120,183,145,205,184,170,242,214,145,110,218,89,158,69,246,54,111,115,53,80,191,223,59,160,164,17,15,182,232,226,9,181,169,131,175,114,117,209,60,134,70,99,172,97,136,124,56,127,216,87,175,59,48,247,54,158,182,204,76,117,142,138,187,103,79,89,134,186,125,59,91,213,158,81,27,184,117,22,61,220,144,105,16,221,208,217,196,230,
+104,219,154,167,183,165,41,212,148,58,149,16,152,226,184,122,12,44,225,0,107,192,37,14,167,231,92,210,33,250,232,73,80,64,91,52,143,181,4,16,241,212,53,81,182,135,198,104,51,169,17,163,35,216,17,239,238,22,31,173,54,183,239,182,211,132,181,83,157,27,125,231,199,195,29,225,177,139,134,73,37,167,58,132,176,205,227,162,108,43,79,83,66,81,175,136,48,233,89,149,245,11,171,178,227,15,19,11,179,189,80,107,35,170,155,26,195,241,100,205,193,202,100,61,34,248,250,241,65,18,209,160,106,104,117,15,142,7,218,89,26,95,231,178,237,196,15,116,26,134,74,141,108,51,98,43,210,26,221,168,150,211,95,101,85,215,246,155,167,217,75,125,181,64,189,134,166,72,176,177,109,198,192,31,92,52,15,111,71,189,117,67,174,213,234,16,83,64,164,211,228,136,93,93,2,187,162,108,245,42,15,47,171,236,7,164,142,193,248,120,231,177,107,180,174,169,73,218,115,98,8,16,73,190,89,215,16,119,91,222,196,157,237,108,58,63,149,48,171,133,242,197,131,248,132,157,
+93,63,4,4,23,60,56,238,88,158,155,220,220,30,86,52,112,141,52,55,119,217,111,14,206,155,192,187,109,248,178,113,105,67,202,1,47,27,184,7,132,154,80,140,231,63,235,157,130,218,231,215,245,174,135,6,150,87,121,241,177,115,46,25,168,57,177,213,192,60,58,219,94,179,244,214,250,70,7,155,229,187,116,61,25,93,64,13,137,0,26,27,128,200,69,59,141,57,204,81,82,50,41,215,172,165,171,126,50,224,234,59,20,64,37,247,42,47,149,67,245,52,246,212,86,179,145,206,189,0,106,182,123,34,202,211,35,218,114,195,230,228,188,94,125,40,33,203,145,93,129,77,33,187,154,117,173,12,113,207,171,173,39,153,181,163,54,18,169,199,201,242,52,207,42,41,96,12,187,14,221,121,18,14,2,99,8,245,214,142,158,182,16,95,145,206,24,91,174,131,29,13,26,77,175,128,72,138,109,242,70,7,169,19,155,219,12,192,87,191,135,202,153,62,93,57,185,92,94,229,18,167,231,109,173,178,93,127,245,92,91,203,10,155,183,105,57,155,237,168,105,51,245,30,143,173,
+181,239,56,220,68,74,247,21,229,124,95,208,34,161,9,167,58,205,203,163,235,161,38,68,14,171,92,170,193,161,223,169,187,18,180,32,111,122,170,39,101,155,202,250,144,241,64,64,164,121,5,99,83,92,160,192,113,131,106,185,14,81,224,242,12,237,116,197,63,80,21,31,174,18,119,29,187,214,106,253,206,174,229,217,169,101,65,143,238,66,127,76,175,114,142,27,17,195,112,181,24,83,76,118,215,128,83,220,81,179,64,152,92,149,237,244,31,238,84,75,40,131,67,164,54,234,162,249,132,222,173,237,39,180,217,29,6,110,98,15,25,63,109,36,132,250,234,154,230,107,116,71,150,4,192,131,106,4,15,106,196,46,232,180,192,103,229,208,105,151,166,220,23,245,86,86,122,109,220,221,145,188,154,59,111,225,167,107,108,11,119,198,157,172,138,87,133,141,214,62,247,100,95,72,114,65,20,247,67,240,0,10,101,66,240,216,28,173,62,89,214,236,81,67,14,158,55,230,221,26,109,117,141,54,131,53,117,83,205,36,39,135,96,16,108,247,80,184,33,217,6,37,211,228,201,136,
+217,230,237,142,209,134,137,25,203,169,164,192,95,71,81,127,117,117,3,155,0,38,49,35,232,219,52,16,220,38,165,126,110,253,76,55,21,50,230,252,147,141,248,103,213,228,80,212,214,176,54,152,218,141,182,52,92,240,103,143,6,106,199,131,119,112,100,19,58,249,52,201,101,236,74,52,204,185,228,73,235,13,59,182,28,20,140,228,252,120,30,248,241,198,225,96,243,81,245,176,213,38,176,108,208,130,2,22,132,200,52,92,4,172,49,12,65,128,169,92,166,251,245,171,241,142,73,123,218,157,88,218,141,122,183,100,112,115,96,111,157,112,115,156,149,173,14,137,127,77,61,244,46,14,158,46,77,85,133,152,183,227,25,186,163,3,205,210,192,226,48,208,17,84,209,89,164,111,155,14,240,130,9,241,130,64,219,206,225,247,96,66,184,159,166,220,116,213,212,156,182,156,76,57,91,118,173,254,76,239,160,102,190,153,157,30,56,239,243,179,226,158,182,57,147,44,184,94,59,219,63,86,223,211,125,49,108,91,171,117,118,113,133,205,38,222,234,88,98,161,150,9,114,10,202,185,
+184,171,102,104,249,154,191,200,238,50,130,159,247,235,218,236,189,14,195,78,175,91,125,214,70,22,131,109,218,154,125,209,93,122,237,148,137,220,167,4,194,5,15,132,205,211,174,249,186,166,131,161,144,97,135,231,20,107,103,131,150,22,82,44,64,118,106,154,228,87,189,118,178,74,106,65,60,115,90,121,185,68,180,206,79,113,183,154,233,92,117,164,249,124,53,106,208,210,187,246,46,170,12,42,50,192,157,142,75,212,113,195,224,53,17,4,188,22,148,124,243,1,74,62,212,8,200,15,81,235,21,82,235,164,113,231,244,76,116,168,141,107,52,170,141,38,157,167,249,16,134,154,35,16,53,98,188,213,193,206,211,110,214,197,214,202,14,105,182,97,178,94,51,191,210,71,26,224,214,184,2,2,237,82,131,3,178,60,4,137,2,154,205,144,168,97,103,102,167,106,178,117,103,125,115,99,51,214,189,197,157,29,91,89,50,160,132,70,6,81,66,196,29,79,173,56,83,229,108,168,149,47,220,173,93,138,126,247,227,130,47,66,23,149,188,122,93,138,125,133,45,171,192,23,61,195,
+224,75,158,23,125,93,94,82,92,244,162,178,236,57,252,66,56,166,180,164,226,205,71,69,95,85,20,149,224,139,42,222,188,46,121,142,41,45,125,83,84,137,199,130,49,184,242,162,226,18,252,235,82,204,155,34,76,89,113,17,182,184,164,2,3,39,21,225,94,20,97,224,10,120,248,211,55,152,210,74,44,248,169,188,232,222,75,108,5,182,28,247,53,182,12,139,171,196,223,47,42,199,62,199,149,23,227,63,42,250,167,151,216,220,135,34,240,123,57,22,255,26,7,8,86,224,138,202,113,223,226,139,74,202,138,42,192,8,132,228,7,200,143,37,101,197,37,223,148,20,87,98,74,139,94,148,96,75,193,180,111,75,42,94,130,113,88,204,243,151,89,82,69,207,49,101,69,207,176,69,88,240,6,91,94,244,12,87,137,146,124,142,43,173,124,85,134,48,4,62,97,202,222,20,65,134,202,193,206,129,96,16,153,60,253,17,30,46,83,137,47,194,87,190,126,141,43,175,40,41,251,58,43,156,87,24,60,216,194,211,15,139,177,21,152,146,210,187,98,66,120,40,122,93,142,1,
+143,80,49,149,1,250,197,64,42,200,8,176,48,190,226,163,187,95,60,135,27,199,87,0,225,97,0,191,197,128,137,111,128,92,145,202,19,72,12,251,135,10,44,96,249,27,76,121,9,16,87,17,6,255,26,251,188,2,17,41,20,65,94,133,111,235,10,236,226,183,255,167,20,121,253,4,46,143,71,134,151,85,130,169,80,75,207,112,165,224,167,50,44,182,56,171,66,168,54,184,193,223,254,207,191,127,250,33,216,37,120,92,129,121,86,138,5,50,248,22,8,14,139,193,67,146,255,136,123,93,249,250,159,224,243,39,96,35,149,192,102,240,223,199,6,42,11,56,160,184,28,247,26,200,11,247,109,89,209,43,236,243,151,152,178,18,252,171,162,111,176,229,111,138,240,37,175,74,74,49,136,22,224,64,92,25,22,181,43,160,198,215,112,53,48,190,172,18,177,14,96,123,184,215,216,50,116,197,98,28,96,26,50,158,183,92,200,125,193,50,207,113,101,21,229,184,82,124,81,105,201,239,177,144,247,95,128,119,127,95,130,175,120,82,116,15,243,123,76,209,239,254,18,12,121,245,
+12,7,68,241,135,39,247,161,29,100,199,252,252,37,174,228,57,216,223,189,74,124,229,173,153,87,0,131,69,44,8,217,18,38,71,62,167,7,48,247,151,64,130,127,13,205,176,232,73,150,24,166,2,243,143,149,120,48,233,73,209,11,12,216,229,27,184,201,172,49,161,226,131,60,151,1,111,249,6,108,8,140,46,112,30,100,153,130,237,224,177,165,88,68,176,64,31,37,197,216,66,239,3,130,169,192,1,73,130,31,193,142,94,225,202,114,47,95,151,3,245,190,40,41,195,22,103,221,15,245,177,156,231,255,35,166,4,112,86,2,52,12,148,91,2,205,1,243,10,139,200,179,4,170,29,83,244,26,12,128,27,188,3,21,192,45,178,50,40,7,110,89,244,172,178,162,2,7,116,242,12,91,241,45,22,139,184,232,171,34,32,54,220,183,112,111,96,191,223,148,100,197,136,238,0,236,255,25,30,139,26,48,144,34,182,28,120,16,220,93,69,209,179,55,69,175,112,223,192,89,144,23,108,30,142,110,9,23,85,124,139,3,234,196,87,224,239,58,16,250,247,67,252,83,14,28,
+80,81,226,202,191,6,86,246,71,68,154,159,35,80,241,28,139,218,126,214,245,223,241,193,114,44,132,55,12,128,62,44,166,2,248,33,6,209,110,22,22,160,53,103,85,7,196,9,120,189,107,246,136,68,32,98,193,45,62,195,65,171,199,33,251,192,227,42,203,159,103,181,11,23,135,207,80,145,64,245,224,193,22,17,14,63,42,250,57,174,236,57,246,117,5,34,43,20,222,178,83,11,246,132,176,247,10,83,81,94,242,135,172,94,254,5,234,21,234,228,163,194,29,224,1,199,88,68,196,175,128,209,226,128,243,67,59,193,60,7,18,192,35,106,129,190,84,192,25,186,30,138,109,192,1,161,208,225,48,136,33,88,224,47,144,111,240,243,223,128,159,179,40,13,241,24,3,86,3,192,2,54,129,71,37,82,82,86,129,253,26,120,72,78,214,247,254,8,96,190,8,193,146,251,232,10,57,208,205,98,242,237,236,28,58,191,75,4,152,230,183,216,210,210,15,160,117,99,74,1,234,162,238,82,250,6,193,236,236,30,80,186,121,178,96,147,95,67,163,7,31,1,219,95,21,3,
+35,47,134,0,1,130,68,57,178,153,187,108,87,100,193,5,252,139,40,176,4,49,215,151,216,210,215,47,42,75,33,14,125,23,38,162,54,9,159,228,56,128,30,148,223,94,222,65,179,0,1,24,65,20,245,101,222,177,178,218,249,32,43,221,127,196,225,11,133,13,198,127,112,135,22,132,200,114,76,25,190,20,83,129,172,141,71,61,34,187,118,118,83,80,113,175,112,197,208,217,191,42,203,74,189,24,12,196,150,191,42,41,195,149,226,190,126,115,87,23,217,176,90,104,167,89,11,131,10,134,17,12,172,12,192,50,171,144,39,249,112,0,103,101,45,249,30,174,178,226,117,101,197,253,60,209,130,169,120,8,40,111,80,184,69,94,62,121,79,244,203,210,185,245,39,124,69,121,229,243,138,74,132,12,26,191,129,254,202,161,218,1,31,88,16,5,160,66,115,224,91,200,59,50,177,28,78,188,7,204,229,37,174,242,235,151,64,195,16,180,0,254,20,227,94,229,245,10,132,249,10,243,123,84,135,175,48,175,95,67,185,1,248,4,193,164,2,177,174,242,103,37,64,216,229,111,
+238,127,84,244,63,160,99,160,126,137,100,22,5,230,246,18,3,160,27,252,153,31,14,66,236,171,103,88,68,187,57,19,70,48,56,135,107,5,188,126,84,244,235,23,48,12,148,227,177,168,74,94,129,212,32,11,225,128,56,30,113,102,24,15,225,150,255,80,244,26,91,158,93,249,214,94,49,165,120,28,42,97,44,152,90,129,203,25,193,7,64,100,207,49,149,120,108,129,170,111,93,10,8,7,251,127,160,188,179,49,183,80,126,217,65,31,21,253,45,238,91,44,8,208,31,0,225,0,71,195,33,254,9,3,102,73,25,2,88,40,153,215,56,96,112,192,254,179,130,1,155,254,246,101,9,148,16,170,52,16,231,139,161,198,110,113,190,4,0,28,50,253,243,59,70,80,242,240,147,7,95,252,26,124,252,10,217,42,68,83,96,82,72,152,133,172,127,254,142,120,178,154,127,250,103,89,135,125,250,103,136,196,16,161,32,190,242,10,44,7,212,8,221,15,134,169,146,98,104,2,224,3,186,17,136,50,0,73,160,159,3,225,1,76,199,0,107,66,246,159,91,58,107,145,229,216,
+187,40,141,164,106,48,76,62,195,2,213,131,140,172,60,183,87,220,51,184,67,20,82,128,97,65,125,99,110,37,15,200,65,57,125,244,214,118,127,142,190,207,239,183,44,171,235,123,72,126,2,24,7,214,148,37,242,228,254,231,40,110,3,85,227,239,88,201,91,16,145,75,198,97,226,8,247,136,238,235,94,25,14,196,94,144,39,160,169,85,30,185,128,121,191,197,211,63,84,150,86,148,188,46,189,69,8,252,75,144,123,34,81,35,187,119,132,199,44,55,223,177,248,123,210,85,76,214,189,254,144,141,207,207,254,31,24,43,209,252,59,55,45,191,196,93,147,44,122,149,227,233,91,88,78,220,195,126,244,245,71,48,65,169,192,190,2,94,129,65,112,2,96,82,49,226,100,101,69,63,199,150,226,75,42,209,96,255,215,152,151,229,216,178,151,32,192,0,63,4,145,29,139,191,255,61,74,184,93,40,235,7,159,127,215,6,75,202,128,105,189,66,115,181,175,49,208,168,32,216,151,3,128,201,147,40,220,67,86,150,183,158,155,15,14,37,101,48,245,127,14,87,44,250,10,100,
+149,191,192,34,152,12,12,237,171,95,252,242,206,138,240,164,169,32,146,225,223,202,73,193,79,32,170,224,75,254,136,205,131,58,204,149,110,151,44,244,33,144,227,61,199,192,76,6,177,160,28,88,188,193,85,162,136,6,147,151,92,94,13,243,9,232,100,47,208,218,232,23,40,59,79,16,230,241,149,207,97,50,140,108,249,233,135,168,237,102,49,234,46,200,131,137,191,194,85,96,63,127,146,99,237,121,37,40,240,0,241,127,126,250,147,167,63,129,149,0,30,201,109,145,178,46,183,114,190,140,68,8,63,253,48,107,249,168,85,222,203,214,150,200,222,239,218,250,187,166,158,85,5,26,216,238,67,97,148,35,58,43,194,124,251,251,111,65,213,149,171,109,193,206,202,202,80,69,3,163,65,212,130,88,249,11,44,106,100,89,114,47,42,145,79,192,211,97,97,7,140,46,151,212,223,166,89,8,137,59,92,125,83,2,50,192,108,34,136,12,193,101,113,232,5,230,57,54,235,14,57,103,188,147,216,222,70,197,191,249,231,175,62,47,172,4,242,229,194,7,136,173,151,226,64,148,
+66,234,165,187,194,71,8,160,73,91,214,154,81,26,96,163,149,248,156,103,191,194,65,11,0,60,253,30,251,230,25,14,145,73,126,97,36,124,102,183,136,36,183,112,86,41,246,233,135,121,94,138,238,1,209,65,160,7,209,12,87,126,31,97,7,177,138,219,17,48,41,41,189,19,243,32,48,223,190,207,178,150,45,172,96,234,0,37,6,89,123,93,142,251,186,28,243,10,122,219,243,108,58,124,43,184,108,130,152,133,230,60,53,36,209,71,152,1,65,18,65,13,252,107,144,58,101,243,8,68,24,31,128,128,12,149,14,205,37,23,200,138,238,229,176,24,214,41,48,44,192,200,15,18,182,138,231,47,191,197,149,255,254,62,82,194,161,149,12,82,104,229,34,91,65,63,161,160,45,241,28,112,134,127,79,190,115,171,210,66,173,0,40,192,194,242,2,85,44,146,192,194,126,0,204,72,242,41,114,161,44,208,148,4,172,8,5,149,141,8,192,68,110,107,167,123,168,82,33,153,156,86,11,205,231,214,94,238,231,29,32,39,7,152,75,192,116,27,117,159,92,115,226,150,239,219,
+185,5,54,4,188,252,127,189,196,150,253,15,12,168,43,33,119,207,48,207,127,255,221,64,128,44,8,132,10,236,9,168,0,165,1,10,175,59,11,222,22,196,96,3,96,67,48,141,70,164,244,164,232,233,255,133,70,118,228,35,178,159,108,231,230,233,79,126,9,173,3,25,113,59,63,155,87,163,3,126,129,8,21,25,129,200,23,12,184,143,36,52,208,22,64,184,43,134,57,115,30,61,238,248,1,160,241,119,88,0,127,104,238,142,32,214,27,100,234,43,88,17,188,196,85,32,140,230,210,126,144,178,98,191,129,201,69,129,188,224,95,106,8,34,1,148,20,130,184,176,29,242,53,246,221,149,110,167,160,184,120,187,151,220,42,217,153,0,78,112,229,16,135,74,223,188,37,237,47,139,178,249,17,172,211,115,152,119,155,241,32,224,159,107,211,21,208,7,122,1,233,7,30,237,121,61,65,178,47,180,180,44,195,221,198,130,188,142,160,201,161,251,197,0,0,251,234,5,178,41,32,145,178,167,63,170,64,220,25,226,124,182,43,86,224,200,89,242,104,52,47,194,188,128,198,6,
+251,59,104,230,84,12,152,198,125,141,84,125,200,155,82,28,26,222,243,45,64,4,73,65,93,249,254,152,133,199,129,36,162,144,177,91,156,248,234,54,29,69,82,198,28,12,60,199,225,144,140,56,151,53,3,69,255,45,242,119,73,162,29,210,172,109,127,137,248,78,78,253,168,155,148,66,28,203,238,230,150,63,16,29,158,131,40,139,100,130,56,212,144,208,191,155,50,135,21,95,188,85,208,34,182,128,65,10,57,24,115,145,120,146,237,166,229,50,117,148,114,129,45,129,221,101,93,246,13,178,103,180,46,5,249,15,64,50,164,241,133,201,234,169,20,22,18,104,179,38,103,214,168,136,239,191,213,75,201,250,23,178,104,57,96,31,164,64,207,176,64,138,0,175,17,77,160,161,6,113,82,236,243,114,108,65,43,242,53,44,203,254,30,228,192,119,109,16,86,161,184,98,136,192,21,32,32,34,86,134,43,71,75,104,212,254,43,222,188,134,124,150,97,191,5,185,109,5,178,4,170,17,176,254,55,37,104,153,130,199,98,179,53,119,46,121,133,180,190,45,41,45,69,251,154,249,
+185,69,95,227,110,51,30,80,28,221,169,131,128,81,86,160,101,19,18,17,128,228,144,174,44,76,218,179,93,166,219,166,23,72,109,144,118,9,176,44,148,50,62,187,241,74,132,52,180,37,180,178,203,182,64,243,56,4,60,4,7,252,224,203,124,203,55,215,207,65,151,207,98,61,8,151,207,81,132,1,73,227,109,41,251,162,164,28,36,104,217,173,228,141,31,201,229,48,249,23,31,100,171,172,50,152,148,32,69,12,98,131,104,107,30,102,35,208,248,17,1,101,225,20,105,180,62,195,126,93,82,134,120,23,108,247,150,21,191,5,21,8,28,101,55,1,187,146,64,162,217,182,251,29,219,203,181,85,225,150,192,184,108,27,168,8,84,191,32,192,195,150,8,180,153,55,239,83,193,7,69,149,101,136,73,22,106,16,181,134,15,114,41,33,146,19,101,35,50,42,32,128,67,89,221,60,65,154,29,5,106,65,99,56,4,54,48,8,247,13,68,252,219,142,34,120,121,203,4,46,151,115,128,109,193,217,176,78,207,213,255,48,134,228,154,223,183,89,0,224,0,139,226,70,238,216,
+1,186,0,210,102,70,236,165,128,121,96,22,24,180,173,130,201,230,69,57,253,65,75,3,38,85,129,123,5,251,106,104,189,147,235,158,20,158,102,100,205,29,216,30,14,98,37,218,127,202,21,75,5,157,16,80,54,131,132,30,209,224,11,180,44,207,247,91,96,162,128,212,74,48,182,220,47,168,222,17,47,43,65,114,126,44,62,123,150,82,24,51,75,96,188,195,35,162,133,37,51,208,31,174,18,182,184,114,61,225,146,108,169,0,187,168,239,41,217,127,134,68,244,135,31,61,249,240,255,69,19,136,59,2,46,6,161,162,24,139,216,227,75,176,44,224,5,9,64,57,143,133,172,32,46,252,53,14,170,16,243,12,40,241,9,210,137,135,74,7,22,253,164,208,46,160,70,223,93,250,17,178,116,25,218,131,129,178,68,2,13,32,0,236,5,53,16,52,120,65,51,133,79,159,254,228,225,147,91,61,67,36,69,187,25,72,230,158,231,234,30,10,121,104,8,7,159,255,252,193,7,69,127,254,176,232,163,143,62,42,250,243,123,8,153,15,31,62,65,179,220,183,60,20,140,190,
+143,26,37,146,30,162,140,20,35,106,3,218,207,110,37,191,236,91,62,248,235,111,178,164,222,96,49,16,34,139,43,243,133,119,49,80,103,41,238,245,171,108,219,11,41,155,128,118,1,214,255,1,148,192,37,240,57,48,203,187,53,44,2,114,64,13,208,55,158,35,152,128,244,12,129,177,162,73,109,57,14,200,0,166,34,95,66,227,43,199,226,193,68,20,136,74,80,185,21,54,228,208,244,31,14,124,1,132,148,235,43,23,118,250,33,22,62,253,176,162,178,236,86,110,183,160,152,63,245,201,101,154,72,235,234,189,217,95,86,91,217,224,92,8,25,185,124,229,123,27,178,112,93,144,14,97,17,209,193,133,242,173,185,236,105,17,108,230,231,131,24,246,15,24,160,151,167,63,202,169,228,233,143,208,94,69,206,18,138,113,88,60,146,200,32,96,129,244,156,177,96,83,72,26,129,84,191,119,114,136,194,244,185,28,139,64,88,214,44,145,14,106,86,24,79,110,227,122,254,128,12,218,63,18,64,11,94,98,95,189,6,190,89,242,199,156,13,188,128,172,230,115,228,92,135,42,
+183,93,164,171,80,118,155,220,161,59,68,16,236,86,9,176,4,130,137,106,105,190,116,205,110,21,61,44,205,66,125,246,19,30,251,246,73,229,95,67,47,65,235,110,160,18,52,10,33,167,118,57,6,242,203,23,250,29,4,151,156,45,226,113,165,223,96,115,59,70,189,17,238,32,23,138,241,192,87,128,77,190,194,252,0,216,252,6,17,110,78,48,104,202,242,150,84,111,67,121,238,57,62,215,112,201,198,184,91,45,35,128,3,61,254,73,209,95,34,170,120,129,20,16,133,141,138,239,129,159,127,201,29,113,161,103,181,239,164,129,121,73,191,198,99,43,139,113,79,63,68,129,15,177,124,216,183,202,54,8,160,170,224,201,87,89,241,23,217,222,26,60,136,202,166,23,57,105,1,7,123,153,131,145,156,208,222,6,93,36,120,97,178,169,17,230,27,76,73,41,114,70,113,215,33,191,11,131,178,135,6,104,34,2,141,59,103,219,136,195,22,26,120,182,12,70,173,32,155,191,220,210,191,21,122,14,76,179,98,5,37,52,112,37,60,60,254,2,1,30,11,123,44,247,238,208,
+128,230,130,201,206,197,131,90,188,20,166,103,183,39,247,119,234,195,130,122,16,45,138,238,103,163,254,237,5,2,124,110,18,24,251,63,16,78,190,132,108,124,149,51,131,252,145,11,242,24,29,81,240,50,139,116,185,254,194,115,120,37,33,215,156,207,30,113,100,137,223,38,192,40,73,40,51,176,141,111,48,217,19,67,224,78,249,18,1,96,47,128,237,194,19,114,164,237,9,207,143,222,110,23,100,243,20,84,159,240,140,234,27,108,25,154,107,33,77,16,44,146,17,124,144,235,210,33,133,65,238,128,61,119,122,147,19,210,151,89,132,129,156,229,205,34,151,8,161,230,250,2,196,99,196,88,193,66,24,252,27,248,103,78,231,217,146,245,118,79,57,12,5,201,93,121,22,189,240,5,78,149,197,41,244,128,12,188,203,22,16,200,185,39,62,123,190,152,173,212,239,33,55,50,94,189,42,169,40,176,34,176,2,140,166,96,25,180,105,143,216,47,88,160,18,36,84,185,246,7,244,45,108,46,8,103,97,29,22,145,119,111,53,100,109,226,86,48,176,184,168,44,135,163,128,165,
+2,213,20,163,255,163,6,52,112,151,228,147,116,16,183,17,230,223,82,30,210,195,184,43,209,188,62,145,51,186,74,236,251,14,168,127,14,132,246,53,174,188,228,143,240,120,2,45,31,241,149,0,234,202,223,188,219,32,122,129,203,7,86,132,3,116,32,210,219,189,141,201,249,32,156,171,255,243,101,34,122,14,93,0,125,232,117,12,164,87,145,107,228,189,125,163,1,45,18,202,75,176,47,138,224,255,60,162,188,228,53,122,228,1,49,31,77,237,95,226,202,145,243,180,98,220,243,202,59,253,217,138,187,151,113,114,124,193,162,13,201,227,10,164,81,244,175,255,250,232,241,227,79,63,255,244,167,63,125,252,225,195,162,92,201,89,2,179,222,236,105,125,246,144,190,236,69,201,215,160,188,65,2,230,231,159,35,35,139,242,63,252,6,36,50,21,249,79,207,75,97,190,148,59,109,121,250,23,217,83,20,244,224,45,79,18,186,10,216,7,146,180,20,72,49,171,251,156,10,75,176,248,60,221,175,240,240,82,71,254,35,84,44,108,25,161,158,2,48,8,194,44,106,141,104,211,
+36,27,43,144,83,202,59,133,5,236,125,22,80,205,66,214,127,158,110,65,72,47,164,252,91,108,5,132,159,159,191,201,63,65,174,90,96,114,253,223,162,151,216,146,175,95,86,20,221,251,186,20,247,12,94,111,184,211,172,68,83,224,108,9,3,61,47,79,229,111,222,161,11,42,89,224,63,248,124,46,249,238,18,200,141,147,220,197,14,20,235,145,251,69,57,82,121,234,159,63,5,255,220,54,190,192,135,252,114,79,239,1,136,123,122,31,22,62,21,159,231,184,248,191,223,97,2,196,198,55,79,110,163,33,188,180,81,2,65,18,201,228,65,174,131,94,176,129,190,129,122,115,174,16,190,221,224,211,223,253,10,247,244,73,1,128,223,190,40,198,193,252,244,233,147,130,75,110,133,215,185,10,67,122,254,76,231,142,138,10,244,254,158,5,114,123,0,168,10,117,128,74,237,246,82,81,97,76,201,97,204,173,186,65,81,245,30,146,192,119,1,122,224,11,192,247,155,18,0,201,111,29,179,161,120,13,85,82,122,119,195,80,18,183,241,239,61,130,64,27,94,239,182,10,222,49,
+240,194,249,63,176,207,130,128,251,206,54,223,27,180,115,47,223,102,6,233,89,220,77,56,10,83,184,162,123,57,119,7,254,134,14,187,181,130,247,38,0,255,21,11,161,121,79,158,212,91,193,35,247,24,21,48,226,249,232,50,119,34,95,118,5,36,72,34,12,228,202,205,247,90,218,47,81,224,121,7,98,238,97,96,19,9,206,132,253,192,44,96,162,106,184,255,190,106,15,251,22,29,212,60,126,81,153,109,10,124,159,129,32,213,83,101,190,123,80,192,220,251,166,255,128,125,20,78,121,215,66,190,204,217,242,91,218,186,181,241,239,202,73,222,113,206,239,225,9,5,230,183,125,243,59,56,2,74,252,207,115,245,1,154,23,221,230,84,89,59,192,149,21,70,145,247,175,241,93,76,67,134,239,76,120,151,105,84,185,191,193,162,215,240,190,91,179,21,249,114,162,252,237,177,95,225,223,153,254,3,82,204,143,255,46,126,190,196,255,30,25,243,94,80,6,115,94,189,174,64,51,80,36,135,4,89,67,249,171,91,222,48,165,133,2,123,135,210,15,105,56,63,225,93,230,254,
+225,238,46,111,109,30,255,109,246,54,209,189,236,117,70,12,242,248,45,168,40,131,97,18,212,52,229,89,44,185,95,192,231,63,252,135,4,248,15,223,47,62,244,12,227,251,2,26,170,206,151,111,143,131,147,255,169,28,243,252,247,239,53,132,178,146,87,200,45,52,56,224,54,77,125,158,187,74,81,92,241,18,255,22,173,127,1,204,253,77,121,73,241,247,177,146,157,255,12,20,190,191,127,123,254,223,226,202,255,248,67,243,17,65,191,111,242,15,77,68,78,181,225,157,119,80,174,230,24,45,122,250,147,162,220,162,5,185,16,248,244,115,92,41,238,86,84,48,199,65,174,203,195,64,10,183,80,240,238,151,32,15,249,13,238,219,187,19,224,177,232,215,229,72,61,139,140,70,75,149,108,198,114,203,249,175,139,139,255,180,169,184,226,226,187,51,193,180,191,70,110,167,228,159,160,151,85,240,5,7,144,232,1,119,73,69,37,18,76,208,132,233,91,216,245,201,29,93,194,27,131,69,79,127,4,8,63,253,81,33,229,95,129,26,245,110,126,137,222,49,43,131,61,113,144,8,
+229,78,60,191,205,54,148,242,235,96,17,210,89,138,249,43,42,183,103,89,112,254,237,30,126,133,251,57,210,229,120,59,60,190,4,126,83,138,164,152,183,125,225,183,148,253,15,240,212,27,184,5,246,45,10,119,43,71,232,215,249,43,2,185,219,49,240,168,8,190,192,195,235,223,240,212,29,158,77,2,86,111,47,190,191,147,52,2,162,127,91,82,140,253,237,179,239,179,47,52,39,3,234,43,71,251,194,72,91,62,223,182,185,5,21,216,186,253,45,210,87,201,63,195,150,161,21,32,122,110,15,139,137,92,127,23,189,134,91,113,219,62,168,40,41,80,13,122,173,233,127,221,117,69,68,95,185,164,253,142,183,102,143,241,49,89,83,129,213,55,190,162,28,105,45,32,66,120,250,103,15,139,62,41,122,248,0,254,11,254,124,250,103,79,254,237,223,126,160,172,251,50,123,85,3,214,98,160,40,203,46,119,123,160,241,10,83,134,249,26,57,84,121,183,192,67,46,2,126,85,246,2,247,14,12,230,50,198,98,228,109,1,57,180,106,125,134,236,34,127,145,46,95,131,22,164,
+121,197,197,8,245,91,187,40,206,247,45,208,89,239,185,23,137,94,29,42,172,136,16,26,63,7,174,88,241,14,139,119,238,128,230,175,68,1,155,250,193,75,183,119,106,174,175,138,223,161,92,112,145,25,105,83,163,126,155,221,43,250,1,185,210,140,71,47,82,151,99,74,209,151,119,232,194,123,198,217,143,63,134,162,204,19,191,51,5,57,4,45,188,55,149,83,224,189,39,191,251,241,95,162,99,192,79,69,247,111,153,66,218,92,64,246,79,10,56,255,237,157,125,228,241,226,221,139,217,104,249,121,103,67,119,242,211,183,46,113,21,170,19,94,200,184,179,66,229,235,130,38,102,94,167,176,125,14,251,89,229,37,176,233,2,111,148,20,221,195,129,104,92,118,91,185,253,246,127,254,125,246,72,225,142,196,192,2,239,81,70,33,161,130,141,220,203,95,174,205,221,227,190,247,224,254,147,59,12,163,190,249,182,1,162,219,205,221,163,67,186,215,89,75,68,163,235,61,152,179,23,92,39,252,0,73,226,209,187,215,217,71,239,89,229,203,138,247,175,115,219,81,189,35,245,66,
+2,16,237,43,95,125,31,179,239,185,186,154,151,229,157,235,111,119,196,137,82,252,33,223,185,135,158,112,220,222,42,47,188,183,154,159,247,215,96,217,28,212,85,188,44,48,109,180,195,13,219,231,133,169,201,157,94,89,161,177,161,235,126,7,217,2,229,255,48,85,148,222,173,65,188,133,200,95,190,187,231,92,186,121,219,4,249,60,43,244,247,195,27,202,247,243,187,122,65,19,61,16,163,190,139,252,237,109,150,247,210,207,197,253,239,33,254,107,228,12,251,221,196,20,252,244,2,91,142,180,242,111,123,237,133,151,103,178,135,223,232,18,37,248,183,84,248,91,108,57,210,253,195,190,149,171,226,115,207,115,23,103,64,36,133,182,86,120,247,246,222,221,32,134,173,120,254,209,93,31,128,235,223,53,221,50,232,50,72,45,141,92,101,248,79,248,27,152,12,233,190,179,208,59,174,246,214,82,127,186,203,253,32,215,239,58,222,211,15,81,24,131,231,211,232,119,29,158,220,47,122,215,17,11,129,57,119,151,247,14,118,230,82,150,66,60,190,99,236,240,123,102,216,210,210,66,
+135,126,155,80,206,50,178,51,254,18,153,144,163,92,200,193,157,141,162,205,202,252,23,48,11,173,230,121,37,30,228,110,111,125,185,52,103,170,111,49,243,79,184,10,76,233,123,122,149,21,240,121,65,143,242,237,246,102,129,246,80,39,47,40,116,145,124,13,93,14,126,171,232,110,195,241,61,61,198,10,220,235,187,136,7,111,130,189,5,164,111,9,233,22,248,144,206,14,114,119,12,91,156,15,186,191,170,4,18,44,121,145,127,14,116,143,135,151,43,176,127,200,222,9,129,217,224,187,107,254,166,32,59,206,45,8,55,244,29,171,33,157,171,255,228,82,133,216,155,91,234,31,113,32,169,184,119,87,0,247,238,127,80,200,222,189,251,247,127,56,149,252,5,242,221,158,236,25,12,200,37,1,253,242,18,108,97,121,127,199,170,238,68,22,196,172,110,247,251,206,151,137,11,103,254,75,73,57,44,178,255,99,4,222,115,7,253,110,180,251,254,56,119,167,116,251,57,60,202,184,147,157,101,15,55,110,47,61,126,144,141,45,207,209,36,227,73,110,195,48,203,200,111,229,37,72,
+221,111,43,119,60,242,17,255,190,111,121,101,17,239,85,9,168,232,43,95,21,28,37,195,111,18,20,110,227,157,29,160,238,128,124,3,49,119,229,248,125,223,200,122,55,115,254,117,121,201,215,37,101,5,186,187,75,177,128,214,123,248,205,246,81,242,72,80,168,189,187,26,123,135,218,255,215,222,215,118,185,109,28,233,254,21,220,100,215,34,29,206,140,44,39,251,193,114,124,86,150,100,71,39,142,236,107,73,201,201,241,161,76,12,137,153,65,68,18,12,0,206,104,206,250,254,247,219,245,214,93,221,104,128,224,171,148,120,63,236,198,226,0,141,238,234,170,234,234,122,121,106,243,204,180,33,233,79,202,51,26,89,38,127,251,208,166,82,182,88,240,178,210,216,184,147,7,197,124,102,46,194,214,213,169,63,209,186,74,107,61,53,198,179,227,136,94,244,12,195,100,224,219,40,120,67,128,99,131,107,223,2,251,108,121,139,1,88,255,83,222,101,97,195,231,200,203,101,198,158,223,75,233,219,152,135,117,206,4,115,170,199,244,19,57,204,54,111,152,57,46,99,119,56,229,81,
+133,202,121,24,199,51,55,130,232,27,185,207,245,203,54,229,209,127,175,225,59,36,71,129,127,70,106,111,196,171,187,116,245,102,229,46,242,239,41,95,27,94,81,39,139,36,0,184,24,89,56,198,179,226,110,217,119,148,37,36,38,122,3,20,106,173,21,58,245,237,107,238,210,47,76,110,38,0,39,159,175,142,158,166,211,27,247,19,235,35,182,139,150,92,186,147,76,189,135,94,44,13,127,228,230,153,204,127,57,183,191,87,33,217,108,146,87,56,230,198,195,129,220,60,112,44,168,106,147,14,223,130,225,112,242,177,108,210,204,46,238,106,11,102,130,64,215,43,249,160,35,207,77,54,53,154,86,114,29,33,99,204,150,75,219,81,6,158,6,167,107,162,154,210,96,152,124,149,60,84,87,198,192,37,68,227,84,198,174,90,47,229,191,93,200,147,194,184,182,4,60,58,227,108,214,54,97,55,78,94,217,9,251,252,16,89,52,241,132,206,151,170,26,15,193,57,229,59,228,88,128,40,177,152,54,17,109,99,22,68,251,220,159,243,249,60,120,85,164,79,37,136,166,119,96,181,
+66,9,94,83,118,159,66,45,87,56,198,20,127,172,124,171,82,197,240,20,213,194,55,125,154,185,204,101,125,69,141,238,50,13,4,27,60,249,163,183,197,223,54,168,99,237,67,158,145,243,119,142,140,177,255,25,251,16,117,76,232,219,226,107,136,109,7,244,85,36,98,189,70,126,145,166,194,250,182,120,174,66,98,109,111,163,193,24,121,89,22,240,106,26,189,129,74,194,153,40,118,183,28,129,109,9,2,214,70,98,212,109,101,26,80,167,25,229,134,68,166,130,147,11,213,224,246,158,111,39,16,253,156,99,21,72,165,45,123,127,77,246,126,105,13,169,217,108,158,169,69,226,222,121,95,120,133,131,189,48,111,116,140,15,101,196,108,147,165,11,80,10,145,220,117,39,171,92,95,28,249,196,198,133,244,249,144,34,103,248,37,208,92,56,102,43,223,114,6,19,62,4,14,112,217,135,96,178,175,21,53,50,123,74,117,188,6,46,154,22,183,12,76,20,46,202,105,190,212,231,27,219,130,222,8,109,90,41,224,251,62,195,202,65,245,185,95,197,217,122,110,233,90,189,200,61,
+166,158,125,237,174,2,156,4,78,41,5,97,25,144,82,84,127,41,102,232,137,13,85,213,2,127,103,1,176,33,68,190,209,146,2,214,215,232,87,117,90,214,94,242,19,100,213,217,45,117,233,62,42,203,78,179,4,188,218,98,167,210,25,79,30,72,132,25,113,167,44,149,61,218,55,158,21,222,12,34,41,157,42,122,52,121,0,15,27,123,90,82,222,212,48,129,197,183,105,32,122,188,107,40,74,18,217,114,64,54,234,187,198,197,12,148,109,135,69,83,59,62,106,144,97,178,105,64,122,60,62,84,96,253,110,26,138,30,143,15,37,201,28,253,71,179,111,196,7,36,131,228,201,92,187,146,200,42,162,75,0,150,252,250,119,253,39,83,64,219,161,244,83,55,11,72,174,241,204,24,203,148,116,171,48,215,9,91,110,135,105,100,149,74,197,131,187,144,75,216,217,108,182,190,44,106,39,146,82,46,27,81,4,144,117,251,93,118,69,14,19,167,240,204,47,28,176,68,63,141,62,213,252,165,202,251,207,176,178,39,54,192,12,255,210,99,24,67,104,101,61,97,114,49,90,33,
+172,40,1,17,192,90,224,160,100,214,104,129,222,229,179,107,168,124,163,123,139,55,160,175,122,49,247,94,141,155,73,61,76,80,55,35,67,37,227,193,12,0,58,16,202,96,132,149,155,60,203,161,247,149,166,253,24,126,73,127,133,173,210,166,53,217,247,115,13,251,56,186,174,134,161,188,237,170,144,121,213,253,121,19,245,248,92,83,6,118,223,47,189,89,193,141,77,95,213,249,51,116,203,95,195,159,109,166,139,247,38,137,153,126,83,229,78,162,57,65,215,65,45,2,62,45,27,7,145,247,105,204,239,77,197,41,25,241,151,184,73,180,15,146,226,223,241,40,226,29,80,30,250,198,138,64,40,158,4,215,159,128,232,156,200,171,241,63,120,224,129,76,27,53,247,5,87,247,155,255,128,153,251,68,215,135,127,0,66,2,233,121,80,34,72,78,113,165,41,37,134,211,148,92,240,168,87,241,105,27,3,48,40,110,182,202,136,66,216,22,43,135,10,82,102,182,8,212,211,113,149,228,185,63,67,84,68,151,228,174,178,201,27,165,198,221,121,223,218,156,250,195,227,63,39,63,
+253,231,195,135,103,15,31,254,247,224,225,249,195,243,71,127,248,195,48,185,45,242,217,152,127,78,126,150,255,250,239,135,156,32,46,127,25,12,199,48,198,35,190,192,122,46,16,78,13,199,216,195,92,50,153,93,50,56,159,71,121,105,173,47,198,210,219,99,114,65,226,110,115,150,240,64,71,162,113,152,47,200,149,25,236,175,31,105,87,86,197,73,132,153,173,157,193,5,134,179,87,179,150,217,92,22,197,220,206,121,240,95,191,31,122,75,224,212,120,239,239,131,161,125,2,139,85,107,75,116,255,186,236,28,231,94,110,59,89,131,116,220,226,252,126,15,37,86,23,102,43,193,112,36,178,143,207,126,49,188,10,217,172,8,222,144,202,34,221,40,104,167,42,171,20,97,33,174,210,121,197,111,200,119,115,184,59,151,11,128,70,0,54,144,44,253,253,233,194,198,230,78,148,241,54,46,164,140,84,197,244,164,141,25,9,11,6,92,41,77,59,185,53,145,216,173,80,251,120,177,187,241,185,173,27,176,44,62,110,190,110,20,76,228,237,207,147,169,123,205,9,134,228,143,72,122,
+245,176,81,122,64,21,43,170,14,156,106,213,45,202,10,84,195,150,224,153,17,20,199,250,206,136,213,42,45,211,5,0,211,10,22,145,20,194,178,22,179,68,167,25,125,250,148,38,120,246,139,170,121,0,200,210,252,125,54,175,62,24,201,114,251,235,40,57,4,165,213,226,116,56,216,21,215,11,49,43,239,126,234,213,126,96,125,40,84,6,239,66,226,156,41,204,185,37,10,81,114,155,253,64,246,134,168,38,10,6,90,188,60,83,247,244,102,193,87,212,107,202,253,183,225,190,109,16,252,31,249,54,236,95,233,21,23,183,11,121,15,142,219,113,246,127,15,38,63,238,241,178,98,58,250,211,166,21,183,85,235,56,10,12,48,28,2,235,194,202,121,132,225,242,96,96,139,21,214,182,161,23,211,189,134,101,156,23,102,58,88,35,139,110,210,252,60,59,135,218,57,120,156,72,70,80,116,115,6,94,66,200,1,226,65,200,193,222,141,3,155,59,4,25,196,84,98,175,86,73,190,200,149,219,51,63,111,128,171,133,109,109,210,145,248,241,40,91,10,155,194,28,169,2,130,184,
+149,12,91,85,83,97,254,228,204,194,7,57,46,6,8,43,6,170,0,25,29,121,170,196,61,118,176,221,105,151,159,214,195,238,173,87,163,246,86,193,33,11,93,38,159,104,234,199,140,187,136,62,214,166,132,71,255,75,247,235,228,143,63,195,145,110,245,50,84,135,186,225,93,225,169,197,187,110,90,89,156,119,83,5,22,229,228,65,42,254,30,87,96,4,254,15,116,240,15,160,48,125,72,170,62,66,248,203,192,218,176,213,113,182,184,5,5,208,179,189,110,32,137,36,175,105,180,79,65,86,189,157,49,207,158,253,50,158,124,10,226,120,160,125,120,89,116,154,217,144,183,29,41,134,107,6,110,220,40,3,92,206,112,44,220,184,213,50,118,176,38,155,243,239,121,176,88,247,66,180,106,201,175,40,236,105,81,54,247,56,114,41,145,144,187,112,223,129,118,210,21,228,29,90,160,158,83,126,253,133,173,246,142,130,32,41,113,26,44,33,42,130,8,63,132,91,16,65,57,209,193,211,168,226,10,229,135,179,252,125,52,59,39,58,118,110,167,149,158,8,213,45,221,158,209,148,
+170,160,32,185,33,59,118,140,83,139,78,99,242,123,74,78,164,70,181,167,224,248,20,2,12,7,220,237,142,107,215,129,78,160,147,200,11,195,155,88,97,105,120,39,250,179,127,169,203,35,15,41,2,59,107,222,195,177,79,164,242,178,175,151,67,159,169,213,6,254,105,243,75,109,205,64,94,177,232,161,153,232,21,148,43,81,79,17,69,23,64,223,160,202,215,21,227,243,227,170,4,69,65,165,119,161,199,182,18,196,15,206,144,182,69,178,219,178,96,50,70,192,95,138,235,99,29,24,57,130,250,49,217,62,60,22,35,242,174,124,214,94,225,219,147,207,194,1,146,177,64,216,100,254,74,119,229,169,104,37,127,243,100,121,194,8,51,97,205,108,128,124,97,207,90,141,10,75,40,64,170,186,127,151,195,102,103,153,137,1,8,28,107,125,4,42,112,194,213,233,26,252,163,31,42,1,122,192,57,162,6,39,12,126,6,72,107,114,239,33,20,230,216,229,199,15,27,67,209,171,130,147,98,88,127,223,178,115,145,20,15,167,26,20,11,70,135,82,76,145,188,133,247,0,184,20,
+163,131,170,57,148,154,47,140,139,48,156,164,147,238,82,2,106,198,55,32,186,162,160,132,116,60,92,66,38,70,51,194,7,160,120,241,42,175,183,56,64,213,20,62,14,11,50,202,52,161,13,25,238,118,211,136,84,195,156,218,140,140,172,160,167,134,174,9,169,172,222,8,100,209,83,63,107,220,223,171,43,64,164,13,232,118,68,123,50,192,44,57,142,252,87,78,1,16,245,160,98,123,114,70,246,143,86,136,32,24,228,187,171,56,118,94,104,240,90,172,79,233,35,53,34,20,122,109,238,59,129,4,201,21,173,38,7,165,4,32,78,195,133,2,232,210,143,3,195,176,146,6,125,17,28,95,42,198,14,128,94,0,138,143,222,105,2,90,2,202,238,10,112,120,83,47,243,11,57,111,184,197,77,72,62,165,134,63,34,227,90,124,145,163,31,89,132,36,47,86,186,159,58,178,141,10,103,64,250,143,67,127,55,201,215,80,222,118,221,42,168,222,80,224,50,206,169,181,119,56,255,61,47,113,77,180,154,45,24,95,118,54,122,131,75,198,135,246,0,88,240,154,131,95,222,32,
+52,168,45,45,132,223,89,172,43,64,201,93,174,25,190,154,144,120,92,120,70,86,207,201,10,16,29,36,214,64,26,141,0,0,5,50,142,115,184,24,74,180,186,46,16,134,145,90,96,140,168,237,34,12,75,86,2,247,8,88,21,43,168,248,111,140,75,178,51,114,229,23,210,74,195,199,1,113,133,180,247,201,213,186,164,132,126,245,153,62,162,219,1,67,212,38,206,148,248,195,222,69,236,52,50,191,63,173,103,188,201,31,77,223,30,174,200,35,58,71,178,44,47,3,218,129,185,205,204,49,211,187,240,80,147,78,238,43,15,87,180,175,199,166,9,255,212,83,218,155,100,203,109,183,85,132,232,181,155,31,176,69,131,87,243,197,194,156,151,41,244,164,59,208,206,255,229,68,199,161,198,194,106,147,249,166,145,129,53,21,169,142,6,175,87,4,111,15,93,80,1,136,85,224,181,242,218,171,157,187,197,126,99,23,182,0,78,112,128,253,204,185,50,35,168,106,59,60,250,246,83,213,165,180,46,83,8,13,26,235,6,26,67,129,66,91,102,101,31,29,128,38,57,206,88,218,
+152,134,8,71,161,10,0,180,241,19,57,51,255,114,200,67,48,68,28,219,254,250,98,205,78,205,36,1,121,160,99,27,131,175,31,136,243,25,94,226,224,199,33,36,235,93,80,116,147,40,244,182,46,86,249,212,204,238,98,114,1,243,249,46,191,156,92,84,229,116,114,161,48,56,254,35,91,78,206,214,213,219,205,64,25,125,184,175,186,177,192,124,4,150,241,17,196,94,67,122,7,113,87,53,217,200,41,66,47,239,117,132,236,58,115,66,189,59,52,155,60,97,200,60,239,254,85,102,132,239,175,90,208,122,132,240,97,167,183,225,171,201,111,97,213,26,243,101,242,5,46,108,50,128,217,79,134,111,121,157,206,149,230,249,194,220,155,125,216,175,204,86,105,190,172,213,251,230,23,76,22,70,176,179,28,174,9,101,122,125,141,110,52,141,216,18,158,127,25,246,91,6,58,161,61,72,142,55,244,241,145,143,20,70,129,74,95,104,141,13,228,2,132,231,234,198,38,69,158,136,179,3,14,113,118,19,67,184,118,109,117,132,215,113,184,15,194,234,22,148,241,152,74,241,86,210,
+161,136,30,22,43,177,2,71,14,100,5,82,116,71,17,171,159,247,6,117,158,29,220,13,27,83,125,134,49,23,39,101,145,38,101,125,245,23,153,119,132,51,100,148,15,194,28,22,113,243,152,204,113,3,136,248,80,83,57,239,102,140,222,62,61,228,138,232,168,31,5,95,52,137,234,243,69,11,61,154,231,35,143,243,65,56,227,232,92,129,120,172,138,20,112,3,232,39,49,150,46,151,195,115,43,61,151,142,62,155,121,199,97,185,18,222,72,140,109,32,131,212,77,227,164,12,212,147,121,250,83,236,131,114,17,193,219,54,88,9,135,194,191,189,77,252,71,188,188,117,251,107,179,64,192,193,227,186,197,71,147,248,13,11,64,90,65,128,224,187,61,25,154,125,12,52,248,239,100,96,87,244,133,89,186,119,17,115,47,125,242,179,126,103,128,255,95,47,120,149,174,148,65,13,18,244,181,217,200,217,224,21,62,249,39,129,198,29,37,244,195,15,240,184,170,4,248,60,121,244,232,161,163,217,40,105,124,0,64,163,244,240,52,206,107,115,167,110,82,24,39,67,157,110,150,239,
+146,129,130,38,134,223,32,178,77,255,28,134,40,199,78,161,55,187,113,90,139,23,90,128,94,33,170,96,221,142,122,12,31,178,192,201,230,46,49,95,81,147,41,108,243,117,117,47,61,178,140,84,216,118,37,218,200,5,105,224,174,57,130,201,235,12,88,104,139,167,155,236,145,104,60,210,45,108,49,223,17,62,127,33,24,204,136,154,156,47,11,104,8,72,168,136,182,160,153,187,53,42,207,6,1,205,224,205,183,42,26,233,236,212,132,213,140,59,214,29,55,11,106,44,100,254,2,31,30,187,123,3,246,32,94,214,37,130,115,208,23,33,27,26,250,164,101,213,204,97,187,218,108,105,252,174,107,155,22,126,254,38,21,132,168,135,49,177,33,78,60,251,165,177,53,220,65,21,187,131,227,116,71,230,191,193,173,106,22,153,191,7,156,180,122,122,238,190,19,25,26,120,240,236,23,199,63,49,144,236,19,106,41,13,195,189,163,158,106,138,45,201,21,32,24,59,241,236,55,214,177,37,20,197,202,9,232,142,91,143,220,132,117,87,37,48,64,126,181,231,198,11,196,249,73,79,
+90,46,25,63,180,157,243,26,157,107,5,106,141,171,43,7,104,206,88,24,186,215,229,166,240,117,59,36,122,35,220,64,229,20,151,217,77,10,158,210,50,25,40,76,151,28,27,173,221,161,114,204,17,125,139,79,193,234,148,249,69,33,108,251,113,60,212,94,142,129,138,4,105,140,155,234,46,175,167,232,121,240,128,225,189,58,250,226,214,171,177,104,19,150,112,203,252,216,19,125,168,125,219,208,241,177,94,21,92,219,91,249,173,220,151,102,43,175,109,161,244,201,196,162,117,159,26,145,225,141,228,109,26,163,193,224,31,196,46,85,144,254,135,230,193,120,24,4,216,200,218,234,14,241,136,179,88,75,20,109,98,179,108,118,141,157,7,185,20,3,27,216,105,211,37,196,184,5,184,192,44,155,85,138,83,17,91,75,74,101,91,66,166,104,108,216,121,88,245,32,61,37,33,72,219,251,58,165,60,227,106,105,170,83,112,51,209,1,171,76,242,58,89,47,193,128,176,109,180,79,27,30,141,48,129,102,112,156,99,108,211,20,141,98,193,81,59,236,7,97,109,221,96,226,56,250,
+85,69,0,117,163,10,7,115,210,171,156,140,218,233,244,237,121,17,211,154,144,234,196,101,73,41,62,180,3,149,155,87,186,151,197,215,214,234,17,71,250,23,187,51,153,27,236,240,222,20,49,2,25,125,135,0,234,202,116,89,173,82,188,84,65,146,59,128,134,43,51,78,90,175,131,43,159,251,123,190,86,111,120,13,77,205,155,210,51,122,4,185,19,228,169,151,87,141,157,145,243,165,69,190,95,9,116,220,200,117,141,54,167,26,34,27,194,84,204,244,86,101,113,139,222,21,115,235,210,211,170,49,118,238,117,170,141,238,206,15,197,234,205,234,249,251,189,55,134,199,57,124,8,136,169,71,250,20,8,80,45,64,95,172,160,187,140,33,212,114,6,220,141,81,109,4,76,199,166,58,203,154,212,59,217,32,92,115,79,88,41,240,12,103,201,228,220,130,187,182,81,219,25,52,5,175,176,195,111,242,140,205,63,189,131,27,169,249,178,176,244,220,139,201,27,212,108,84,129,240,19,172,17,123,76,236,155,98,186,174,44,114,223,158,243,243,7,139,76,243,37,226,132,204,239,185,
+72,217,142,152,92,19,96,253,21,12,128,59,178,44,20,22,40,28,171,3,220,39,251,19,50,190,235,156,91,226,126,122,217,153,224,129,26,142,212,55,82,213,99,41,2,226,9,207,75,123,91,130,254,3,160,154,212,50,26,70,145,175,50,240,61,100,27,9,75,129,125,138,252,237,45,68,122,176,125,37,41,34,65,65,56,17,29,32,20,76,110,178,251,230,149,131,85,171,215,190,23,67,197,87,222,224,122,253,88,95,214,127,50,159,191,162,106,131,189,230,232,134,137,204,239,197,21,176,220,40,225,39,6,67,114,47,221,22,239,184,177,75,58,159,91,170,15,168,1,51,151,249,115,65,11,60,131,209,218,218,227,75,219,49,59,92,231,174,203,240,90,92,117,177,24,165,183,52,121,76,61,113,147,106,15,205,167,138,13,171,38,27,90,224,170,172,242,195,217,4,62,0,151,251,20,251,153,113,15,45,141,26,122,57,79,151,239,38,103,28,224,202,0,31,107,154,3,14,17,185,3,43,213,111,235,247,201,127,153,255,251,108,242,155,152,177,93,25,147,73,154,129,240,87,168,225,
+113,24,98,223,215,188,124,133,131,191,77,232,127,35,84,124,168,26,206,157,114,23,190,225,166,118,76,106,72,14,211,61,237,204,250,254,179,26,187,36,49,188,254,40,4,10,108,112,167,91,210,13,210,74,131,214,64,186,47,183,187,179,57,18,67,231,112,181,125,142,194,218,33,234,175,215,182,101,102,84,38,213,228,108,158,191,203,100,239,188,78,121,29,25,85,7,186,8,200,202,78,185,95,214,36,221,180,19,241,220,61,130,187,131,118,64,1,62,168,246,185,55,122,161,187,102,119,100,75,105,108,2,130,138,162,244,219,105,198,199,59,20,94,221,164,58,11,209,114,208,60,175,112,128,108,177,154,23,247,25,68,148,225,105,152,39,40,54,197,49,131,201,111,228,161,201,111,134,206,131,175,250,47,222,229,116,83,132,204,144,20,145,107,44,162,43,196,163,236,235,15,70,80,201,70,25,163,238,199,49,186,83,91,120,12,239,159,64,211,88,251,69,235,175,162,38,140,110,70,253,245,132,224,164,184,255,125,26,246,246,51,2,115,93,166,11,179,47,215,189,56,22,254,65,45,253,
+222,74,107,191,56,227,186,198,128,93,172,219,10,144,149,55,217,82,210,29,227,109,172,186,251,12,122,216,69,126,215,186,246,30,127,81,32,27,64,178,145,128,13,30,33,192,197,246,84,240,216,150,62,212,174,34,104,202,106,53,126,107,47,251,118,100,83,120,185,189,73,254,150,246,13,246,44,78,239,217,177,233,29,37,230,140,133,224,39,238,50,24,116,100,59,29,233,108,175,201,131,80,238,73,75,163,74,34,7,86,194,87,85,126,189,196,186,120,158,242,79,97,163,197,86,130,185,97,251,80,234,73,199,238,37,227,232,238,97,20,20,81,9,201,104,164,253,67,68,35,55,86,8,117,106,206,99,133,89,196,173,218,74,65,231,236,135,118,208,91,185,52,183,171,157,246,3,221,129,205,18,108,216,132,217,220,158,126,45,220,31,167,95,64,129,29,128,194,84,39,83,239,177,141,9,226,94,159,211,124,154,249,64,57,29,139,151,182,168,230,147,27,167,47,130,66,115,114,210,18,95,74,240,231,190,120,103,59,0,158,117,182,98,53,27,132,8,22,149,180,99,109,87,237,251,28,
+7,255,92,67,155,151,217,166,3,33,148,106,184,160,253,36,136,136,57,13,69,207,64,212,127,89,4,10,96,63,238,130,182,112,241,61,233,187,179,90,25,246,223,31,77,61,193,225,235,58,79,201,204,179,251,184,89,95,234,119,251,104,76,61,33,221,115,212,235,230,2,185,255,235,229,108,155,51,230,149,102,251,205,214,80,158,7,41,7,91,30,66,214,138,111,233,221,171,207,230,168,29,15,42,29,195,168,51,72,209,137,142,36,245,60,17,85,183,155,160,216,227,18,99,93,141,79,110,115,36,34,28,7,137,142,237,192,211,129,54,216,173,231,45,54,246,109,22,105,197,10,104,150,12,103,185,195,89,169,48,172,133,219,231,230,86,208,118,112,236,127,116,66,151,187,67,218,57,102,249,170,39,222,216,183,121,168,50,6,9,210,120,174,74,254,1,197,168,130,8,180,4,135,155,208,84,247,132,30,40,193,15,248,230,161,186,233,211,96,70,55,46,103,247,212,158,108,201,165,144,97,239,104,97,66,106,33,125,142,1,63,162,11,149,199,94,102,2,186,206,49,42,179,137,140,65,
+207,82,227,1,162,147,154,38,40,115,52,239,216,191,38,8,34,16,39,161,37,74,83,140,74,208,184,228,64,30,160,143,129,230,65,166,205,136,255,37,29,128,233,35,210,42,119,200,49,225,159,62,245,45,3,106,73,150,140,121,6,232,142,198,80,103,193,46,102,158,192,72,35,250,38,87,105,62,231,128,70,138,99,62,121,245,234,249,143,175,199,173,58,53,222,82,123,43,233,210,34,21,181,168,132,19,188,111,157,64,34,66,246,110,124,63,137,90,148,13,134,143,213,9,89,70,195,230,173,195,241,225,13,207,141,212,218,211,114,163,22,235,219,217,159,45,13,216,131,234,185,22,146,137,16,253,164,154,180,119,144,173,185,91,173,70,82,59,223,144,204,189,101,119,73,59,223,4,127,63,184,115,14,252,165,94,152,242,229,155,239,190,219,10,50,252,206,123,93,253,225,97,84,157,243,205,105,67,135,123,82,231,162,74,164,167,231,128,92,40,67,38,59,94,115,151,201,128,250,141,74,119,120,252,217,70,202,248,73,70,37,199,222,193,228,134,17,217,167,151,28,107,80,146,23,52,
+66,46,22,11,4,223,34,253,5,214,8,41,84,9,120,68,175,119,74,141,33,105,193,51,79,77,157,225,232,25,184,108,29,175,196,142,194,85,49,36,243,59,51,130,56,46,45,72,180,118,234,111,43,222,157,237,228,195,123,165,71,156,222,54,134,144,182,57,146,245,126,186,54,79,240,89,46,253,52,59,223,166,120,121,218,189,197,99,11,91,35,202,236,135,147,169,99,202,82,213,95,152,98,122,15,249,143,112,207,227,141,15,46,215,245,8,171,226,121,155,71,236,185,70,137,176,34,214,240,43,5,12,32,189,98,186,157,116,93,62,167,109,133,234,99,21,39,93,216,216,223,196,216,238,168,120,210,29,121,235,225,14,255,183,17,8,79,8,200,106,206,161,175,92,94,235,182,78,218,45,127,176,203,37,36,232,164,149,127,214,228,18,33,254,53,178,117,183,2,143,49,237,175,81,133,31,146,99,65,169,250,158,201,141,28,26,59,178,127,141,204,186,187,14,134,160,239,122,113,82,163,253,3,113,39,89,232,17,19,143,29,199,204,88,200,111,2,239,147,86,213,122,65,214,163,196,
+213,205,74,176,167,156,182,205,161,22,176,170,33,20,206,76,171,25,30,74,225,145,27,24,33,101,36,9,113,152,234,168,85,180,43,172,67,104,161,180,170,92,235,51,182,152,30,84,196,63,80,233,82,143,147,11,196,229,36,78,150,130,58,76,212,227,198,38,112,45,72,87,14,156,20,1,156,48,101,21,16,94,17,119,5,234,0,189,37,217,52,32,76,224,183,83,194,122,71,61,243,55,147,223,77,126,39,150,215,72,156,126,196,79,114,229,128,126,124,75,240,12,27,51,156,155,145,14,214,149,112,57,228,46,204,160,26,68,60,72,88,195,234,90,154,91,52,203,104,156,225,223,94,168,219,162,178,94,106,76,80,206,135,9,52,173,185,51,159,39,83,253,167,214,0,225,228,76,178,179,26,166,249,99,165,148,223,101,217,170,106,240,187,220,152,44,87,201,88,146,120,4,128,229,51,144,175,154,68,210,37,140,130,155,18,106,155,112,28,76,248,190,194,204,60,215,63,169,153,146,208,250,61,26,156,109,255,50,22,184,223,198,159,29,15,94,122,37,181,164,50,174,139,2,151,8,
+196,193,36,21,74,38,167,188,127,236,229,11,32,129,87,134,212,82,36,12,190,78,189,70,178,212,202,123,213,220,26,9,86,148,149,93,236,85,153,101,40,62,210,8,207,226,72,83,93,178,148,211,218,252,31,61,202,136,155,127,0,56,109,90,6,101,56,92,84,7,112,169,236,28,182,221,8,27,31,182,216,213,105,233,96,169,189,74,155,32,75,169,246,182,219,47,40,243,208,115,53,42,118,207,14,183,172,88,204,126,168,158,185,67,238,145,57,57,203,150,118,244,133,109,24,4,62,19,160,126,58,125,167,202,145,23,0,240,149,154,165,96,54,99,126,133,153,82,119,41,221,65,161,62,27,251,158,7,45,137,80,151,16,54,38,102,199,35,130,246,149,191,24,164,244,44,19,140,122,214,177,211,188,156,174,23,68,162,234,49,194,111,175,161,178,46,5,0,111,155,210,197,22,16,36,90,243,176,203,104,19,102,118,155,75,95,84,219,105,23,163,251,102,59,13,227,223,67,17,165,154,186,171,172,148,25,9,47,69,244,38,106,16,151,190,9,86,94,93,167,102,190,172,37,130,108,
+147,184,6,141,228,207,112,250,69,255,236,129,195,105,205,109,109,246,19,169,90,197,145,26,145,214,57,65,196,235,97,133,156,248,203,170,21,171,118,154,196,99,227,38,191,94,98,74,127,196,37,18,22,42,117,38,43,249,46,127,206,228,17,240,128,166,79,165,157,173,98,234,197,63,53,62,6,30,235,211,13,147,89,238,144,222,141,3,241,157,18,221,246,171,155,59,229,145,187,136,226,190,15,225,60,249,59,103,144,130,98,210,177,51,8,81,224,126,227,48,48,44,102,143,171,51,78,230,192,30,241,180,188,204,205,129,85,222,123,86,248,33,252,26,151,120,252,22,226,205,192,175,238,203,126,42,182,237,174,180,199,97,149,15,169,159,118,231,147,30,25,40,29,23,253,246,45,187,176,227,92,216,77,51,155,209,119,223,212,60,213,231,199,121,91,202,74,207,189,227,43,244,49,173,242,232,250,154,151,91,101,105,227,165,11,75,16,65,33,47,239,35,62,152,228,217,186,84,192,13,96,89,45,194,190,34,35,54,66,215,149,111,152,241,69,244,85,86,63,51,3,142,149,224,67,148,
+197,177,134,92,22,245,61,82,207,84,82,11,32,143,252,158,141,237,148,58,35,129,117,102,117,139,190,137,114,143,94,255,46,107,205,255,57,213,51,96,117,10,172,21,198,228,107,225,166,43,44,153,93,98,172,185,155,171,77,147,112,87,211,65,45,37,112,174,43,53,84,208,205,51,51,101,48,78,129,18,181,164,27,240,213,151,175,215,211,119,104,71,66,231,2,185,178,192,163,233,117,22,189,231,178,106,178,119,235,177,104,190,198,29,160,40,181,184,236,151,250,70,183,217,93,50,43,53,129,157,82,14,98,158,189,211,45,221,8,252,226,158,75,251,198,240,190,212,94,213,55,237,9,126,221,73,151,171,240,189,109,179,250,72,21,97,242,37,251,28,172,219,5,24,163,151,195,20,38,113,246,75,252,252,211,199,104,59,113,227,239,90,183,216,173,216,69,58,63,20,176,149,236,12,123,228,255,237,183,65,173,73,177,167,75,192,60,196,86,225,145,167,247,164,87,134,208,41,182,103,79,15,242,126,33,188,230,153,167,55,97,147,79,77,162,11,202,139,22,105,177,172,183,210,150,183,
+108,123,113,232,227,222,211,147,217,44,3,158,59,61,96,218,214,189,160,231,252,13,161,223,186,119,229,216,13,180,183,220,41,123,175,93,24,42,207,239,197,174,48,150,128,220,104,37,233,19,175,185,100,91,60,22,131,64,101,116,64,14,249,125,44,145,227,240,44,129,243,3,23,208,161,121,227,104,2,184,79,125,83,191,77,181,222,114,107,248,111,188,189,117,153,254,184,171,205,8,159,31,213,251,21,138,235,241,142,186,125,216,122,227,246,123,9,106,246,59,39,144,240,163,240,216,105,228,223,199,188,23,5,160,127,253,162,83,27,208,147,175,211,110,244,175,157,207,227,125,65,252,57,165,2,224,58,242,229,100,96,230,1,88,254,177,229,109,136,198,132,199,137,206,207,195,189,209,190,38,15,157,221,70,80,92,10,31,50,233,103,95,124,134,80,166,214,101,42,89,232,134,125,16,209,25,227,54,243,59,64,94,181,126,81,40,167,160,11,140,127,99,26,24,9,255,35,64,65,225,223,104,125,223,99,240,119,48,164,71,241,33,104,137,58,159,85,94,196,36,94,82,117,64,59,38,
+74,109,75,225,109,51,39,89,184,152,152,60,175,1,198,77,116,44,149,196,167,4,132,165,10,64,85,151,124,197,55,63,7,50,104,136,80,67,227,227,122,122,62,60,128,90,142,10,20,61,216,33,85,49,37,221,16,173,99,26,85,27,244,77,247,30,198,165,228,127,217,170,133,173,78,165,128,15,96,143,237,160,41,229,202,106,93,129,31,157,165,214,205,57,255,82,58,224,131,89,106,255,242,140,177,135,186,235,39,206,94,175,170,46,217,165,115,218,137,111,4,251,97,89,44,49,108,219,103,198,109,125,177,226,229,144,210,196,81,52,36,86,61,70,20,163,223,128,202,252,139,0,10,243,121,94,223,143,228,119,70,144,71,176,68,44,49,41,146,238,110,183,79,54,173,140,62,235,22,199,107,235,81,199,191,133,144,54,68,115,179,68,250,123,182,193,79,237,149,70,246,191,155,160,23,205,86,64,106,129,132,2,54,11,89,228,136,134,57,132,229,6,249,5,95,157,17,192,172,156,223,195,93,161,65,90,206,212,97,246,168,111,164,104,211,94,141,212,249,201,219,158,47,175,138,176,
+255,103,108,175,247,222,230,109,194,100,175,178,146,64,199,218,64,245,4,174,43,75,23,8,215,101,254,183,37,88,22,69,103,42,5,210,12,108,105,69,129,100,69,29,26,20,170,146,46,96,74,6,11,243,71,118,65,65,231,75,0,55,171,125,12,178,97,143,42,188,192,196,183,243,25,84,195,49,231,161,65,155,136,213,186,92,21,21,39,240,168,202,83,70,194,100,228,216,186,40,85,141,17,182,226,188,94,151,54,129,19,163,101,24,91,154,17,190,54,164,106,201,69,147,251,202,178,222,213,169,159,46,145,237,125,205,185,89,175,195,57,44,177,59,234,170,204,166,156,171,145,92,165,183,5,234,120,187,164,87,212,228,162,21,36,44,114,83,52,83,229,107,34,109,172,235,31,200,27,45,204,142,54,33,127,199,187,164,21,23,144,236,21,240,95,19,98,176,49,73,106,93,194,95,253,68,161,14,110,197,179,50,218,191,20,215,170,206,27,212,149,196,108,98,85,148,242,216,174,92,121,60,118,164,221,221,77,185,212,146,3,189,159,219,99,171,204,244,127,116,191,214,146,47,143,28,
+195,179,125,155,132,211,246,121,166,11,193,66,229,125,107,11,195,71,178,128,164,79,206,83,37,188,179,70,11,152,226,110,105,14,189,155,124,37,124,38,240,224,60,38,103,18,72,46,46,108,50,66,12,50,30,102,152,192,139,124,0,167,29,120,246,147,85,1,136,202,37,157,115,18,211,103,135,32,57,107,196,102,145,35,87,160,215,232,37,76,161,141,76,202,8,205,45,214,130,204,11,234,115,96,241,216,147,193,218,216,165,115,37,49,8,0,191,174,169,7,175,152,163,144,11,43,88,237,144,98,126,109,150,117,155,167,22,117,65,224,1,28,99,13,49,119,224,42,133,244,125,44,182,229,223,109,22,18,206,172,226,198,184,210,36,150,162,130,211,98,133,135,123,138,185,177,56,16,246,230,193,252,78,249,35,143,87,9,197,211,4,123,138,99,54,241,170,4,40,216,41,89,113,0,70,205,62,209,37,158,216,149,145,41,108,72,0,77,127,48,225,223,152,197,198,28,176,35,162,231,10,127,195,236,211,210,16,207,220,245,231,41,98,252,16,192,129,51,34,40,179,58,67,56,79,219,
+54,136,255,199,76,124,33,51,199,252,159,187,98,61,159,145,6,160,4,122,232,11,145,94,101,156,4,184,94,168,20,68,217,67,94,31,90,49,235,229,220,236,155,191,91,118,166,130,199,141,215,254,145,74,4,110,75,114,73,24,235,219,236,50,62,12,182,21,117,12,72,9,196,40,169,140,178,29,142,160,74,148,57,81,81,250,46,175,178,128,210,228,141,6,32,8,56,10,233,169,44,47,103,9,122,1,209,108,75,184,7,147,159,196,203,57,184,139,244,29,166,2,79,203,44,91,86,55,133,153,15,246,244,74,87,55,152,204,153,189,167,78,194,54,145,89,60,149,184,64,143,250,27,60,55,182,51,82,228,217,127,244,240,242,168,199,225,122,39,178,65,57,199,155,205,190,189,117,29,166,156,236,163,195,13,1,118,211,226,211,34,146,121,213,1,243,23,168,34,223,213,22,104,221,128,178,48,199,254,219,6,19,59,144,123,206,159,115,15,51,254,195,239,231,49,182,165,213,15,186,43,169,219,111,80,252,62,207,170,135,221,90,227,127,98,68,100,132,255,79,242,6,141,213,58,138,
+161,153,111,200,41,68,163,40,158,146,120,90,139,168,125,178,186,183,223,50,187,131,52,183,232,215,188,254,240,159,39,130,236,202,227,64,211,140,102,243,8,93,167,167,210,37,185,132,84,82,242,10,193,236,130,194,145,121,166,197,55,121,73,45,239,0,57,223,134,123,244,189,60,200,14,108,142,106,219,126,184,81,171,104,255,144,35,234,114,38,43,223,202,20,33,92,138,109,83,117,69,198,17,134,135,199,41,249,210,216,107,72,13,182,230,236,143,52,161,199,80,52,131,176,240,35,245,39,126,30,38,11,21,48,217,114,99,75,119,158,63,201,143,32,246,238,147,213,248,26,122,12,61,189,247,159,217,156,209,136,157,137,184,43,145,135,190,55,48,54,142,242,128,230,183,249,12,76,47,172,99,164,231,43,11,59,175,122,1,119,104,111,190,230,225,167,224,110,150,191,207,230,251,230,60,154,133,127,103,102,180,99,62,80,64,173,54,98,125,135,73,183,218,152,195,22,54,26,211,154,81,93,47,204,144,230,93,202,110,171,51,32,34,20,163,217,119,204,3,229,24,201,70,206,47,66,
+57,130,21,252,125,80,14,147,47,141,196,223,27,253,97,52,136,254,121,242,59,249,231,211,123,248,247,87,230,43,209,96,234,189,33,179,109,126,132,244,213,147,49,211,164,244,225,246,61,106,41,217,5,132,234,67,39,67,66,172,24,186,167,197,66,19,27,217,86,43,7,97,210,57,20,5,98,67,54,173,61,84,38,46,180,80,64,101,1,207,24,203,121,101,68,21,107,145,107,247,62,44,26,242,33,41,65,92,92,156,128,222,213,225,112,140,166,84,210,77,112,158,221,166,75,113,76,104,97,223,131,98,63,58,131,240,80,228,34,197,252,241,209,106,3,138,217,15,112,11,103,167,58,254,247,102,226,53,211,162,163,196,139,79,222,136,43,126,102,224,51,239,192,92,188,212,230,12,134,12,89,198,243,215,136,236,207,176,178,94,154,233,98,253,102,93,230,102,225,97,94,251,150,78,34,47,155,125,59,115,180,195,19,227,178,115,177,193,151,207,33,232,98,5,83,4,42,102,192,40,45,243,133,87,50,45,69,204,202,137,193,48,134,174,78,30,237,64,199,14,114,202,248,37,189,105,
+133,134,204,12,74,93,175,174,192,68,17,127,30,122,51,176,70,66,215,54,32,160,35,134,207,215,211,26,235,168,32,96,104,254,124,207,253,149,90,154,77,3,67,199,208,143,183,220,139,191,230,37,220,243,79,181,37,126,67,4,15,240,64,90,16,165,239,176,133,243,178,202,84,69,180,164,230,152,51,233,169,32,48,16,158,37,252,2,251,2,255,246,108,2,112,183,192,17,86,220,45,93,177,70,0,15,55,43,178,10,29,69,171,155,251,138,235,159,193,207,10,7,79,163,90,135,89,164,90,165,28,84,194,200,21,205,215,125,214,140,118,147,47,223,65,103,132,26,61,30,102,14,211,49,17,96,80,115,0,3,45,180,53,244,72,117,46,51,185,43,253,0,254,22,243,60,116,32,201,70,248,51,87,6,93,184,14,120,224,0,74,175,165,254,217,139,41,250,181,240,126,161,141,45,154,78,9,149,203,141,119,53,79,175,93,86,159,226,110,234,150,103,104,249,46,91,217,154,36,212,166,228,106,67,138,150,4,233,233,156,57,206,149,195,230,62,154,225,234,115,210,244,164,138,112,194,
+200,200,196,52,181,56,51,16,229,171,124,77,142,173,177,96,172,108,134,173,224,168,61,32,21,239,184,136,52,187,220,230,82,135,100,69,51,97,201,212,190,205,128,20,93,162,55,121,112,75,82,99,54,217,103,241,3,152,25,59,86,250,116,106,63,235,50,69,254,43,213,107,139,244,125,190,112,182,179,27,101,242,160,204,112,129,190,126,36,54,246,155,220,136,70,55,252,9,48,141,23,9,183,32,161,136,173,138,128,104,186,89,245,197,163,193,96,129,58,26,158,39,95,131,95,56,155,190,19,13,236,243,175,213,172,244,37,215,73,37,75,171,220,72,242,149,64,62,140,168,157,251,253,200,243,163,62,133,205,72,148,3,224,11,151,18,200,121,240,147,255,145,71,207,126,57,251,133,8,7,52,27,240,66,112,5,35,157,123,136,111,15,31,203,107,147,255,23,56,15,155,231,244,203,142,157,219,67,183,63,157,103,105,172,117,24,254,174,21,86,11,148,135,69,233,227,165,170,29,51,98,243,112,175,32,244,77,169,91,144,171,182,102,248,135,8,148,9,89,109,249,121,118,14,21,138,
+44,208,10,154,147,175,208,139,124,137,220,92,66,128,24,98,36,139,108,81,64,49,51,168,236,158,96,179,136,17,196,102,218,95,181,139,35,42,174,59,221,228,130,36,68,231,109,217,240,218,14,21,33,116,235,79,93,47,15,36,29,6,21,219,128,92,250,100,40,186,235,86,236,225,240,105,54,157,189,42,170,118,121,176,83,118,78,145,205,147,254,248,247,246,184,133,114,187,236,51,85,225,82,28,203,97,71,185,188,51,76,187,198,19,148,59,81,112,204,49,203,75,85,54,23,61,41,183,227,151,157,138,242,254,197,217,100,103,89,86,141,66,60,154,49,37,92,25,52,181,173,84,77,211,59,128,191,205,50,240,154,72,13,211,205,13,49,207,33,97,230,111,1,24,145,27,252,50,147,98,103,176,192,106,109,83,107,243,98,242,192,216,75,230,180,167,169,15,180,41,106,87,35,81,232,140,230,235,23,80,179,210,95,21,208,120,45,71,251,156,62,26,177,117,67,136,34,158,52,152,163,216,71,245,142,65,233,255,207,139,74,22,58,30,6,147,223,10,109,254,64,122,174,77,100,221,
+50,78,200,182,167,80,83,39,98,225,217,176,189,73,192,49,212,205,113,247,235,251,50,191,6,190,58,153,186,153,60,40,248,147,86,128,247,217,184,80,151,64,122,82,8,107,166,147,158,124,53,82,204,103,118,22,220,63,2,174,231,14,8,162,46,138,119,201,106,46,118,222,201,77,146,15,186,249,199,21,218,8,35,12,64,43,143,84,179,137,123,217,70,155,199,131,73,102,70,79,239,195,52,255,62,210,171,186,120,108,113,169,247,206,72,5,225,2,168,47,170,153,196,6,173,216,221,148,194,35,13,81,244,183,15,79,203,213,187,17,71,152,178,63,149,24,103,199,42,141,14,195,197,163,10,164,69,194,248,58,163,18,180,152,167,189,208,78,105,23,136,74,4,162,123,179,132,36,71,217,180,45,93,195,59,185,131,119,76,89,216,17,69,94,49,157,207,111,65,6,231,109,135,147,250,163,191,34,171,247,110,237,222,75,31,50,157,59,32,89,3,31,193,150,31,9,131,253,67,237,119,223,124,145,189,238,184,31,253,62,159,92,70,255,2,253,253,242,172,231,190,109,107,109,42,213,
+159,47,22,230,15,105,13,137,179,162,175,221,55,197,37,187,130,2,176,18,30,11,110,169,123,155,156,29,91,127,232,141,254,248,36,115,247,93,198,147,180,184,205,202,121,145,2,86,168,20,142,89,148,188,38,156,42,36,40,147,59,203,15,228,111,168,179,220,94,100,143,97,48,69,211,79,250,221,0,203,48,15,163,175,215,89,101,128,238,113,207,247,16,135,40,239,172,114,40,199,24,208,229,38,68,11,35,102,104,165,85,80,254,150,87,55,102,95,41,4,28,109,162,197,85,156,127,115,89,233,148,61,194,205,31,57,250,155,212,247,43,184,181,96,124,210,102,170,123,205,6,192,219,25,122,131,48,192,171,205,66,26,113,156,216,142,71,4,172,45,115,226,246,175,156,198,232,55,50,216,96,106,178,249,10,171,207,102,1,128,75,227,19,54,167,209,159,126,203,71,92,235,3,140,117,37,99,208,90,82,213,36,19,192,152,180,194,81,227,33,63,92,254,180,71,150,190,184,45,81,5,212,16,34,108,218,144,245,233,144,119,218,52,247,14,201,145,22,159,170,114,139,247,75,181,161,
+32,78,89,101,37,22,176,65,26,116,153,165,149,145,209,145,183,207,151,176,249,228,204,135,140,7,43,74,110,164,201,23,95,124,131,53,112,2,40,74,113,128,105,58,189,193,131,204,34,124,2,55,178,94,118,197,71,156,222,110,81,137,205,84,242,213,122,46,48,196,216,253,148,244,52,14,168,18,108,228,99,93,8,55,46,94,235,1,220,248,184,79,16,227,124,10,131,79,6,128,108,227,254,141,57,35,102,161,102,207,246,252,198,139,165,161,103,110,140,196,140,63,196,40,58,193,239,81,23,228,105,36,200,17,27,146,31,48,75,9,255,212,243,100,50,123,88,148,114,52,225,63,252,115,224,203,200,209,223,122,144,125,165,133,240,199,44,157,53,243,2,123,122,50,183,59,140,72,247,209,236,147,86,189,71,137,89,94,220,139,185,154,100,16,141,13,216,88,99,252,129,171,106,36,242,162,49,132,108,40,3,190,108,91,139,208,61,223,33,198,55,155,226,218,55,121,6,150,203,250,222,50,55,21,162,72,202,149,191,80,94,125,184,206,143,228,254,216,215,224,36,38,13,248,51,202,
+154,193,161,240,85,95,179,116,102,53,49,208,218,232,76,155,16,233,49,141,177,92,152,162,102,163,249,191,184,115,16,147,216,117,73,52,86,196,109,60,52,177,133,86,184,13,182,214,125,93,221,23,35,185,29,251,237,241,147,153,106,19,31,32,100,47,147,108,177,170,41,119,188,245,251,205,176,157,216,233,152,52,196,29,154,24,105,195,214,163,182,116,23,190,50,231,24,85,185,10,234,245,117,182,204,74,56,105,46,36,89,21,159,75,141,193,36,20,130,91,32,53,24,200,241,147,68,231,234,60,249,83,113,103,30,47,81,184,43,43,32,112,240,97,30,34,214,151,204,200,133,8,115,250,246,205,11,217,39,40,2,46,104,1,22,130,27,114,104,102,5,85,54,154,83,251,94,41,0,32,34,63,134,185,203,144,182,180,204,28,22,19,102,98,169,22,8,141,20,44,124,16,18,73,17,39,100,185,134,50,90,90,100,229,119,42,89,0,15,223,251,55,29,172,128,129,67,25,203,59,247,201,227,241,152,225,35,146,92,5,216,142,181,15,68,81,115,229,136,181,5,19,15,207,235,155,
+14,188,4,154,165,195,75,144,19,197,201,52,159,45,149,62,89,168,42,95,112,66,108,99,246,76,54,88,146,210,201,240,111,115,44,222,114,214,225,225,229,247,64,183,251,201,79,7,115,20,76,198,231,231,231,27,246,241,178,168,235,98,209,189,149,220,174,133,210,30,225,70,150,149,140,218,227,186,220,15,68,87,204,130,6,72,206,30,53,178,250,252,253,202,72,178,17,215,116,90,22,67,174,132,169,49,231,215,235,151,225,50,39,211,242,122,13,41,138,208,1,10,74,224,228,159,168,73,90,152,33,110,124,104,29,32,225,176,29,247,157,149,211,126,199,179,221,24,26,77,239,141,121,217,211,248,156,120,250,4,241,52,92,38,145,91,246,140,99,30,80,129,49,102,129,17,33,108,57,11,108,178,54,234,211,199,210,16,42,174,57,165,207,77,67,91,26,22,185,205,37,106,20,168,203,25,60,232,171,198,13,39,244,170,168,114,151,138,26,249,248,135,222,179,143,202,164,234,224,27,206,217,119,126,63,161,44,49,69,149,153,57,207,156,190,29,145,17,53,210,205,236,186,101,170,109,
+131,14,98,135,37,183,72,45,101,135,109,53,169,67,88,223,63,102,208,56,228,80,18,78,163,85,106,118,90,209,10,217,98,118,220,147,234,29,79,37,102,197,41,128,46,193,26,66,115,228,238,198,152,67,224,224,32,96,27,193,223,97,220,154,234,6,1,46,86,197,42,89,175,146,12,139,11,48,40,91,223,16,240,14,118,133,195,3,183,196,111,39,52,71,109,210,185,174,72,20,136,229,46,112,204,126,202,152,131,205,198,81,210,249,99,153,182,172,72,70,32,252,217,82,17,9,82,142,179,74,52,142,57,100,160,67,61,97,121,176,159,4,226,194,102,5,232,220,52,171,64,0,143,230,90,251,176,163,95,138,70,10,142,230,66,252,211,168,208,221,234,22,119,151,174,222,172,34,70,254,243,247,58,50,162,114,236,108,219,51,0,172,202,208,73,107,126,30,113,145,5,161,145,152,201,193,239,121,109,150,190,87,234,184,153,221,179,226,110,185,245,252,174,10,128,79,218,48,55,0,167,217,107,118,197,6,125,221,165,120,61,239,210,247,229,44,51,74,88,23,39,224,79,45,81,149,
+194,251,155,139,121,34,172,137,83,175,84,203,163,75,129,69,219,226,0,240,155,217,195,25,120,24,51,123,24,55,231,32,162,43,23,48,202,198,8,7,120,44,238,73,80,2,41,104,71,240,117,176,40,115,41,133,249,43,128,6,80,238,38,72,42,190,99,100,162,170,149,109,61,176,250,117,75,15,14,106,129,33,156,17,140,111,147,114,175,144,224,52,137,9,29,145,244,236,151,99,178,67,155,66,6,32,154,93,253,203,186,142,111,235,195,255,104,60,152,38,0,177,163,65,29,185,157,149,110,75,17,97,194,200,198,32,113,58,20,34,113,143,181,251,202,58,234,82,5,50,233,174,70,40,26,116,97,131,119,178,89,7,75,196,249,221,250,189,65,110,88,66,152,219,47,51,139,247,132,24,67,113,169,194,170,27,122,1,98,154,37,20,170,241,249,227,137,144,120,14,94,171,51,45,42,86,201,120,123,177,106,243,106,17,64,199,148,240,240,182,17,171,147,200,206,192,235,114,62,45,22,0,65,229,120,177,135,42,38,115,247,75,180,104,193,144,189,253,172,143,240,52,222,122,52,220,
+66,249,90,62,98,77,42,245,21,4,102,133,190,199,8,155,65,61,41,47,208,93,117,17,232,140,77,206,75,48,127,174,231,197,165,185,229,4,193,64,134,201,236,163,115,193,190,254,204,24,216,169,195,237,89,86,121,37,16,134,17,133,203,193,160,152,210,173,35,38,60,90,240,143,198,134,13,67,154,204,178,10,171,183,100,241,241,118,108,76,131,54,113,124,156,252,236,167,120,248,68,218,238,0,34,98,244,89,212,128,86,53,108,238,116,184,170,211,73,135,54,245,183,201,207,59,128,84,129,96,244,151,38,121,250,209,240,231,201,31,127,126,85,207,240,151,167,244,225,45,5,171,237,72,177,53,206,158,150,227,200,125,188,189,234,223,4,74,36,123,15,225,215,28,146,149,173,136,218,88,80,48,221,177,199,122,26,156,72,252,209,68,208,188,2,156,209,174,3,175,103,171,85,111,61,182,85,34,28,102,102,253,27,5,136,159,211,116,226,233,127,145,252,218,228,104,223,20,169,255,21,34,191,247,236,7,23,160,56,84,254,175,85,96,146,195,73,76,43,59,69,38,65,123,214,193,
+75,180,248,120,239,170,86,196,111,248,176,77,150,87,120,69,77,112,63,74,247,129,231,25,223,15,5,199,122,51,209,8,223,26,155,218,13,186,211,113,60,245,83,144,118,139,163,240,61,205,253,247,46,23,180,75,105,255,71,121,122,224,211,75,24,51,150,118,64,218,217,215,116,133,129,183,28,78,7,109,31,163,252,113,194,137,205,100,114,41,121,40,100,3,7,165,159,129,162,64,252,155,197,37,192,126,241,253,112,129,88,34,192,0,25,99,223,58,112,165,40,104,35,76,134,97,97,104,107,3,164,198,158,217,11,110,152,163,216,86,26,64,209,123,17,26,132,100,216,62,216,253,217,168,110,4,238,107,230,175,79,126,195,170,103,242,27,155,28,102,52,1,165,114,61,43,28,71,178,244,72,190,130,208,223,236,180,247,212,38,250,190,46,174,175,231,89,72,226,237,136,27,142,177,47,125,29,85,242,69,62,79,75,6,137,118,31,96,112,97,175,83,43,228,132,206,169,193,181,161,201,72,145,29,33,95,40,98,72,204,251,56,65,0,106,4,176,137,60,198,25,22,184,65,201,0,
+239,63,41,229,132,216,71,97,143,54,243,174,222,8,72,85,219,138,168,250,229,30,42,25,82,87,248,204,82,108,195,147,39,28,105,157,221,2,73,241,128,166,195,177,72,66,188,223,3,28,94,229,224,53,231,234,146,230,104,198,119,55,197,156,111,186,184,35,148,41,56,182,61,203,221,111,8,224,99,161,204,33,3,66,69,27,218,210,25,165,22,139,2,52,22,234,136,232,68,88,225,24,149,184,138,167,83,146,65,131,135,54,33,206,8,56,213,167,94,166,161,160,210,192,159,105,174,70,123,98,28,26,66,161,139,180,124,71,38,77,113,89,153,213,214,153,197,201,81,41,157,220,223,61,152,254,93,110,134,4,189,73,109,80,2,148,164,136,10,78,185,151,8,38,1,34,4,16,3,164,12,214,21,227,145,187,196,22,108,5,0,232,113,0,68,53,30,238,23,118,246,147,33,119,18,251,88,28,209,177,139,206,206,98,94,141,240,77,103,98,236,110,140,3,143,42,230,81,108,163,209,178,82,154,66,216,228,3,118,223,159,187,212,47,34,163,40,174,120,44,177,171,84,144,158,164,
+83,67,108,179,233,227,42,241,196,110,176,74,213,181,123,43,40,99,22,170,93,164,127,189,178,177,37,191,210,69,82,228,21,139,90,204,125,155,223,144,94,131,143,80,103,99,161,22,66,64,121,12,253,83,15,122,137,250,219,212,197,141,161,87,13,78,72,133,254,12,85,212,68,69,219,152,228,186,17,137,235,21,142,186,63,30,151,0,149,217,88,20,239,2,85,46,180,231,109,198,70,200,192,170,174,224,200,161,253,129,120,23,176,251,228,167,135,201,249,185,74,71,157,140,199,61,218,54,122,144,206,13,26,188,168,94,9,97,123,18,224,41,96,117,169,96,238,82,238,149,101,102,23,113,158,60,143,212,189,42,98,15,0,51,246,97,87,245,171,189,59,1,230,52,128,207,225,209,94,155,27,18,224,195,65,59,6,77,243,17,124,2,143,106,255,133,165,121,112,191,86,74,115,175,65,217,78,42,109,59,67,209,44,203,179,16,3,192,237,57,138,225,69,178,94,86,252,223,74,193,236,155,231,0,223,246,73,159,206,108,122,13,71,92,241,122,96,165,49,32,60,71,230,177,112,26,
+110,16,246,185,143,114,15,246,8,176,29,101,251,72,214,183,206,14,240,131,97,56,172,250,194,86,145,177,62,111,55,153,132,223,226,211,164,10,120,66,134,178,127,63,148,206,202,2,156,139,195,86,23,132,122,78,155,32,149,210,116,96,117,160,154,175,108,6,8,230,122,250,88,152,197,74,192,8,172,175,195,213,11,32,252,161,148,26,48,182,13,53,53,206,183,75,33,71,191,9,14,134,94,46,45,124,155,181,108,3,115,211,219,69,66,88,162,63,5,27,216,188,242,224,14,241,29,18,137,250,197,110,155,124,204,253,37,60,105,58,38,220,62,241,161,123,151,207,174,225,250,104,107,248,32,210,106,110,154,178,11,248,25,159,90,238,50,25,190,196,105,42,116,126,121,35,236,123,213,106,156,221,113,12,200,134,214,134,214,77,86,255,64,144,79,29,165,85,227,50,176,195,222,17,23,239,102,81,168,204,158,188,106,26,83,157,208,26,34,61,63,127,101,84,111,167,125,177,249,64,106,81,241,132,110,237,173,111,223,171,142,117,251,200,70,53,170,220,109,128,182,95,169,59,157,8,
+211,98,177,200,107,215,44,67,76,165,26,70,132,115,122,166,105,205,186,136,147,54,85,181,173,123,85,53,226,160,177,91,113,225,156,234,160,18,9,78,234,165,228,45,253,85,169,252,62,80,29,148,214,103,252,5,128,103,190,204,100,197,78,171,81,226,4,234,53,66,141,163,37,213,114,67,94,149,217,109,94,172,43,139,70,71,86,77,154,155,219,120,91,91,235,62,220,243,103,115,175,15,217,71,213,35,221,250,185,109,233,157,217,116,191,103,213,233,88,162,253,227,167,231,139,29,246,58,54,127,125,170,29,117,255,219,21,55,248,38,218,57,128,254,92,41,212,51,149,3,74,136,140,14,77,139,38,70,41,248,146,24,185,72,103,214,161,167,1,236,201,29,200,16,246,120,91,43,179,127,144,13,179,255,61,122,43,125,175,175,208,77,141,55,210,157,61,150,93,151,103,175,90,86,193,65,82,45,62,140,226,56,131,49,34,53,240,242,30,123,248,109,241,117,118,157,199,78,221,134,0,179,90,117,54,186,158,66,50,104,28,98,246,112,129,128,215,94,126,185,111,139,231,203,88,33,
+95,219,20,17,120,221,169,148,174,169,41,12,237,201,89,242,89,100,162,59,243,208,171,233,14,92,196,221,183,93,167,153,160,98,67,113,135,116,79,12,111,180,208,188,208,75,183,27,193,78,233,160,21,70,190,129,12,83,230,246,145,180,118,88,219,176,175,253,112,152,158,124,99,212,6,118,128,213,169,173,216,232,138,231,30,78,57,112,36,209,190,224,36,219,5,2,252,249,203,58,187,198,100,51,232,71,127,105,147,104,119,160,140,251,228,62,151,247,233,30,166,82,218,52,149,60,28,25,179,196,98,62,191,76,75,183,172,170,72,108,23,204,166,110,1,215,46,90,197,170,6,165,73,154,118,66,32,88,253,172,16,170,186,124,243,10,42,3,192,231,76,8,114,212,177,183,250,194,179,74,13,103,243,65,219,202,39,252,119,159,201,4,240,62,157,222,96,169,171,60,158,89,212,156,38,119,81,59,78,100,44,247,84,39,55,41,187,43,221,155,149,6,245,253,74,58,109,136,151,212,214,204,95,194,143,114,186,218,246,175,1,165,246,58,97,51,0,175,232,176,177,14,194,66,76,202,
+69,62,155,205,51,63,227,217,18,118,103,161,129,73,189,88,214,197,78,98,3,29,209,98,146,115,219,88,51,39,4,144,79,213,16,160,202,33,128,148,46,176,3,64,206,73,65,88,99,156,190,203,84,178,144,59,37,12,147,229,62,56,79,248,132,138,200,242,195,129,109,8,86,32,28,206,55,146,231,21,176,35,46,167,205,225,225,209,157,93,96,56,89,254,214,65,118,161,135,185,190,15,77,21,115,89,114,182,94,114,221,172,52,18,178,205,141,217,43,24,130,67,239,97,196,89,213,208,148,170,142,83,235,7,108,11,23,106,147,230,88,231,201,15,242,204,67,118,166,240,131,80,225,181,34,228,113,248,15,21,105,179,248,28,87,107,80,70,76,222,189,204,42,162,210,235,221,68,179,138,116,82,114,76,100,215,204,77,59,44,21,85,17,79,131,160,218,51,59,109,37,167,162,226,235,27,43,29,241,130,13,182,106,44,134,144,217,247,105,182,226,78,209,192,222,169,237,213,82,213,233,244,157,237,185,70,110,100,180,147,240,146,105,246,34,157,231,215,8,148,194,40,171,230,39,217,
+96,232,22,13,183,64,87,154,245,211,5,44,129,251,48,38,235,213,93,90,206,42,47,233,107,15,6,255,38,95,182,250,139,189,244,171,224,213,62,200,55,45,69,177,251,181,254,128,232,129,250,243,195,45,70,133,59,111,247,235,109,98,29,225,42,15,244,110,14,16,220,224,101,240,48,101,116,62,223,129,146,155,49,24,145,150,211,155,200,120,145,234,32,207,5,110,184,178,172,57,131,18,134,192,23,250,221,35,253,25,45,210,26,209,176,154,215,210,127,125,102,220,29,79,252,72,172,167,155,154,162,17,73,133,99,112,252,167,165,236,228,37,220,187,169,136,201,6,148,64,111,32,75,128,222,21,244,134,144,159,24,229,83,18,132,209,12,53,239,153,181,81,44,6,123,184,153,135,198,136,214,66,93,82,197,126,193,238,162,45,30,45,80,116,141,200,156,202,134,102,22,106,121,219,240,84,27,28,200,158,34,183,29,22,237,199,39,81,219,184,84,65,154,250,57,229,247,5,54,117,232,252,59,67,95,183,9,71,143,1,187,100,203,217,19,167,151,35,144,129,64,165,131,104,229,219,
+137,150,246,48,97,108,77,50,223,60,224,22,4,60,186,245,12,103,224,79,59,104,84,156,210,249,255,158,97,255,78,18,119,208,226,157,143,85,170,118,56,157,62,114,17,250,160,103,82,144,80,102,43,102,208,209,154,50,25,147,129,228,231,50,97,170,172,30,198,98,70,97,166,162,252,239,27,0,42,65,240,212,171,212,44,51,163,78,150,97,202,203,86,247,205,122,246,117,26,145,49,148,1,243,151,183,137,254,179,47,61,230,219,235,38,43,191,190,113,165,58,116,111,3,31,225,28,159,62,247,254,234,126,151,202,96,155,64,107,168,191,156,153,251,153,10,84,165,2,186,69,152,123,32,6,23,232,46,163,108,249,139,100,182,102,100,91,196,3,32,140,14,110,160,193,255,196,252,49,245,111,255,95,156,71,196,189,96,171,97,114,149,207,13,165,93,77,53,173,134,33,105,192,197,151,45,1,95,154,62,158,87,252,223,120,251,76,75,116,63,126,251,230,133,221,36,192,142,206,22,140,24,8,11,50,47,153,191,225,127,102,245,244,124,232,90,4,32,131,34,117,169,80,204,48,8,
+236,130,64,2,148,217,170,204,42,224,109,11,122,107,72,72,209,59,139,72,214,255,94,187,41,219,66,80,44,219,110,20,7,105,27,197,89,26,169,175,184,252,222,195,65,172,20,82,138,41,42,217,171,228,117,203,248,62,7,56,205,36,84,216,119,198,229,134,97,58,168,76,23,253,182,100,175,112,103,25,195,200,117,143,235,220,158,123,112,248,238,77,219,237,135,115,144,110,218,149,157,122,47,133,251,226,13,208,177,61,46,9,99,159,124,28,56,8,158,155,117,238,228,146,83,90,119,163,17,240,189,209,101,109,113,107,157,123,225,154,235,94,21,211,181,3,223,54,10,101,60,57,171,111,164,4,47,66,255,217,78,48,208,154,254,78,33,155,35,29,26,143,147,239,147,64,202,130,196,190,32,5,194,115,153,230,75,66,197,74,103,223,47,231,247,99,216,61,44,34,224,150,231,203,130,190,132,37,39,4,92,223,35,27,125,147,15,26,182,49,218,1,161,151,31,154,104,213,146,37,209,207,120,246,194,10,222,128,210,8,147,19,11,250,89,208,29,133,93,62,199,110,205,99,251,248,
+176,45,144,237,46,2,51,245,141,126,59,113,76,137,160,153,195,169,234,142,81,172,77,82,0,159,97,215,143,40,242,7,125,196,223,27,27,202,116,56,127,123,2,234,9,33,190,198,118,131,145,221,232,185,168,75,101,79,75,107,178,67,108,208,19,232,8,176,243,180,46,179,57,68,196,14,57,173,39,104,206,237,78,168,6,76,111,223,30,232,173,218,255,89,17,162,34,218,57,253,64,197,96,118,86,214,208,32,228,191,176,157,92,180,183,80,11,218,161,43,16,181,170,87,110,14,136,85,56,229,52,46,210,34,13,4,192,94,233,113,193,198,73,14,19,213,88,116,233,179,48,171,219,30,192,252,170,119,48,4,182,18,77,31,222,160,37,112,70,160,2,76,220,139,127,158,241,21,32,182,93,246,111,85,99,233,64,142,2,21,163,57,125,14,166,4,41,125,250,137,139,121,234,208,46,21,239,205,231,202,116,74,85,222,255,30,28,251,100,10,225,180,231,203,184,104,91,166,133,111,47,51,216,39,192,30,6,161,146,11,150,31,20,182,39,55,238,220,10,187,120,219,206,72,244,21,
+105,32,217,149,69,136,238,2,74,129,204,16,217,124,100,141,73,35,52,64,119,184,37,167,2,88,140,122,0,116,50,148,22,170,162,214,151,162,185,72,81,120,18,195,93,154,9,111,106,38,208,153,54,75,0,49,144,125,168,88,222,118,134,237,176,150,77,255,186,49,143,139,172,28,120,134,145,93,116,159,123,254,203,2,76,97,62,134,192,157,114,153,26,43,60,180,123,30,122,93,54,158,242,99,108,252,203,63,91,236,32,84,61,223,101,87,245,83,35,12,239,220,157,157,189,57,240,166,242,236,88,100,17,167,121,224,181,74,65,122,101,243,121,35,57,224,32,19,124,86,172,141,241,183,253,12,103,248,222,30,243,252,44,152,232,103,254,76,191,52,87,241,201,39,95,249,19,134,235,249,54,51,37,215,7,77,13,111,239,192,60,84,115,91,102,246,14,143,9,97,82,80,91,123,227,98,204,94,1,106,136,174,191,144,50,99,201,235,2,224,24,76,148,50,55,5,0,61,87,78,23,65,77,225,212,235,215,214,211,48,249,100,108,65,199,169,15,86,153,225,135,166,54,107,13,7,
+160,9,187,233,30,156,15,80,191,252,88,220,109,162,109,128,231,27,100,121,187,126,124,62,209,194,76,142,13,243,255,214,172,145,231,254,173,58,98,98,243,38,29,28,78,252,26,234,152,163,147,246,178,237,7,97,174,253,16,1,202,133,63,164,110,125,166,179,162,96,228,198,49,111,123,54,193,243,57,66,28,21,160,152,112,75,171,202,108,47,42,68,132,46,167,204,243,17,105,166,188,214,131,161,194,27,37,212,249,44,124,15,117,93,54,131,217,72,179,38,66,115,9,153,117,134,44,89,38,197,221,82,79,41,157,95,23,101,94,223,44,42,215,94,194,83,210,80,53,14,229,234,156,95,136,99,168,30,86,135,231,185,55,43,160,110,15,166,179,2,237,237,158,61,5,214,43,222,165,118,186,100,231,215,231,176,90,179,47,255,144,18,70,159,87,83,115,3,134,243,209,48,3,137,25,123,216,1,249,230,61,245,208,34,216,0,114,137,28,158,26,170,158,100,27,253,230,242,226,99,181,18,174,110,221,131,255,118,93,193,152,15,217,63,171,6,28,32,201,184,237,152,234,177,96,227,
+18,201,152,244,223,112,196,253,206,90,234,46,40,155,207,155,169,152,175,254,52,25,96,214,124,67,145,2,77,7,108,21,111,77,10,184,131,88,133,131,159,166,252,34,80,171,37,181,155,143,107,41,161,145,141,177,4,100,143,209,26,77,165,203,251,201,153,225,156,217,122,90,31,126,223,251,237,121,124,69,165,109,99,107,185,121,144,25,241,205,74,103,77,110,34,251,200,2,74,176,67,72,21,222,52,213,120,179,64,96,111,2,96,197,233,19,42,127,220,142,10,186,127,5,99,122,8,21,84,226,50,53,227,195,115,66,183,248,198,181,41,140,92,32,3,61,75,193,2,9,87,28,97,197,206,209,185,141,164,59,205,231,60,131,234,156,177,126,65,104,101,226,85,52,136,242,131,139,238,122,69,237,53,148,217,174,194,44,190,187,140,209,68,24,50,100,132,40,74,57,54,9,73,102,230,157,201,25,64,176,155,139,3,68,147,86,68,72,6,145,19,178,6,197,74,16,124,57,60,251,208,45,108,91,106,54,174,77,120,1,178,252,111,47,19,71,216,125,91,236,187,195,124,37,165,212,
+86,0,75,8,128,51,141,151,211,249,122,102,118,82,113,121,204,78,75,171,64,55,248,145,101,12,18,206,48,34,183,130,224,172,196,10,229,171,71,208,130,117,57,175,250,41,1,75,22,100,100,158,90,128,124,67,190,101,104,62,214,136,154,223,230,105,200,228,68,19,136,239,167,0,17,125,63,102,128,54,198,196,39,46,195,169,185,78,96,190,136,193,245,29,242,51,0,45,71,71,102,236,213,27,176,156,108,205,222,18,92,87,208,236,8,132,146,160,53,167,73,149,215,107,42,55,113,128,140,220,215,134,243,57,187,221,20,180,92,231,168,208,160,229,220,143,141,6,225,177,108,255,158,70,175,54,219,30,203,215,12,10,69,154,99,11,220,118,54,66,12,80,53,113,21,227,43,138,134,6,111,243,199,52,17,239,105,222,111,101,254,177,192,249,67,175,57,81,151,143,252,240,141,178,95,223,100,22,239,29,2,72,140,210,36,17,249,72,214,136,235,117,167,58,222,84,174,132,0,105,139,125,80,236,217,78,145,86,241,208,230,149,118,142,14,230,249,187,204,239,143,213,232,123,71,153,
+31,144,2,48,205,134,82,143,220,225,199,49,251,120,93,166,11,39,76,100,37,90,195,13,155,229,153,49,109,91,168,241,80,58,244,5,141,253,160,110,21,220,72,176,168,182,204,201,118,90,209,11,159,130,200,122,110,35,243,221,179,95,198,147,79,193,248,63,33,35,57,54,249,54,91,50,167,152,255,106,97,150,235,94,204,146,138,50,194,77,226,155,63,144,89,168,210,64,252,255,55,229,29,251,67,216,98,140,29,145,32,186,134,30,113,54,186,198,134,79,13,159,10,9,156,16,181,88,10,173,185,31,196,157,249,189,186,201,87,182,232,151,119,130,191,200,173,66,49,87,133,143,165,199,236,96,53,7,84,153,44,160,19,185,33,13,232,82,60,155,222,27,19,73,170,10,245,120,210,85,233,166,44,214,215,22,113,134,149,225,186,212,46,210,83,242,58,88,84,243,78,117,217,1,154,77,169,60,142,197,55,189,62,28,122,231,125,68,101,122,226,15,118,252,156,251,107,136,43,142,118,77,255,69,53,26,251,231,58,159,190,155,83,106,84,77,184,69,138,177,223,101,247,151,5,100,
+63,153,255,16,151,123,180,143,9,173,10,152,9,208,244,110,210,242,27,252,37,25,59,96,6,243,93,51,10,14,194,207,91,104,234,15,184,123,157,228,181,203,183,196,147,149,196,147,1,137,210,147,7,220,151,111,242,0,214,5,212,176,248,130,66,121,182,129,74,195,233,96,192,150,233,178,154,31,134,159,251,180,141,143,106,107,75,137,55,42,174,18,239,94,168,225,16,41,232,25,57,175,229,166,45,125,113,174,242,247,102,225,222,57,151,48,37,233,31,168,154,149,182,25,118,132,63,144,254,182,231,165,205,215,20,19,43,0,87,151,29,107,182,202,109,177,31,157,193,174,141,160,185,81,108,109,70,58,39,115,120,195,193,30,62,83,189,114,198,54,61,132,144,56,133,43,244,199,93,16,198,62,12,60,37,223,241,155,237,4,0,196,94,63,97,44,102,166,206,158,12,81,41,110,76,66,197,134,126,158,210,163,62,98,157,26,138,253,115,13,222,4,48,242,157,125,58,178,183,10,202,240,5,59,37,157,87,248,14,121,169,224,254,96,231,40,95,56,31,247,22,98,90,211,219,36,
+88,91,32,196,27,90,191,182,229,116,76,126,94,21,85,211,190,224,158,207,8,109,229,53,7,180,73,184,24,42,201,43,188,234,5,173,98,60,134,131,151,124,253,192,196,111,207,132,162,57,109,155,116,127,80,197,185,59,205,183,200,80,255,56,168,141,121,127,162,220,140,69,213,221,74,225,131,80,249,5,124,249,120,164,246,168,236,226,207,41,60,154,215,27,200,127,137,217,227,248,12,96,49,121,212,70,69,229,91,217,54,27,213,104,78,42,144,117,91,165,154,106,116,237,147,218,32,95,141,123,223,248,24,54,234,195,80,125,143,149,243,2,253,117,65,0,131,207,165,93,61,2,252,254,219,36,28,200,191,232,69,106,196,45,66,92,19,147,57,16,116,199,115,64,17,122,66,153,181,130,153,173,4,154,175,130,3,91,239,109,253,252,205,190,219,67,239,38,4,13,35,170,213,60,189,199,3,206,108,219,133,36,105,192,191,47,165,39,61,184,170,16,79,133,93,103,252,82,114,225,123,138,227,221,102,221,165,170,129,220,61,86,235,131,251,21,90,139,230,198,86,170,75,86,96,235,
+115,56,191,132,150,160,149,249,116,70,93,11,49,174,37,75,227,209,109,171,191,23,68,64,123,171,187,41,170,90,7,56,225,119,0,168,143,188,12,229,239,183,136,244,61,47,176,115,128,74,232,25,172,141,248,18,166,188,51,11,220,130,140,161,82,151,197,61,158,121,84,241,32,151,209,42,62,81,243,63,243,188,102,195,207,44,31,172,79,114,71,74,246,241,167,154,135,217,2,49,55,240,23,75,234,83,107,14,88,40,184,48,139,19,100,116,57,116,185,19,104,65,9,60,208,231,6,80,215,139,213,61,87,58,225,69,22,26,122,20,216,135,151,79,161,232,40,140,139,111,190,2,120,244,186,95,34,188,98,158,204,167,100,79,226,29,62,47,237,103,112,143,141,113,8,30,0,99,118,45,209,172,173,160,209,80,28,53,100,138,151,46,148,70,136,88,55,174,242,1,241,204,175,16,253,141,201,210,233,85,168,217,38,134,164,223,65,211,232,39,110,84,101,208,207,254,117,123,81,119,104,25,132,208,175,193,108,102,127,171,166,141,127,83,161,71,49,23,79,138,158,67,218,114,174,164,
+188,63,229,230,29,161,10,242,183,152,124,37,142,117,95,10,72,191,189,56,223,33,122,43,254,249,2,215,227,50,98,116,211,90,169,243,114,19,53,131,215,16,199,142,94,216,23,181,220,214,229,139,147,51,108,10,85,35,96,70,115,148,35,156,51,207,72,65,238,124,206,240,251,111,147,112,32,255,156,137,216,69,150,3,100,147,121,4,159,7,48,83,208,153,54,172,214,229,81,129,15,161,246,166,51,206,148,145,208,158,75,246,170,36,75,64,105,168,183,117,177,202,167,102,13,23,147,11,16,153,239,242,203,201,69,85,78,39,23,78,138,254,35,91,78,206,214,213,228,183,177,46,65,60,9,110,17,228,90,64,201,236,160,249,147,223,238,86,209,91,162,52,27,14,34,158,173,172,247,40,135,16,15,254,152,147,122,122,158,62,193,148,218,79,159,182,202,147,136,207,211,31,243,208,220,30,47,219,33,107,201,236,143,81,148,208,71,62,206,191,17,144,171,87,202,255,135,251,235,31,97,138,139,243,37,101,174,170,187,191,151,84,28,16,39,139,19,199,15,31,30,137,70,24,227,108,
+35,146,77,137,108,102,67,38,95,122,143,126,191,204,222,38,223,43,104,176,47,55,145,251,43,200,162,20,167,83,51,230,80,69,130,14,174,190,217,25,53,107,240,155,121,182,15,24,162,120,75,65,43,5,55,234,65,229,23,80,53,204,217,204,169,119,180,4,117,167,21,204,128,148,144,239,136,38,49,50,19,131,194,205,247,217,116,77,216,235,220,63,217,60,70,62,221,129,61,109,188,136,133,153,210,216,54,99,30,122,103,136,103,175,74,145,23,95,83,114,180,109,104,134,209,147,133,99,196,103,191,216,216,180,245,120,162,173,198,60,36,222,190,211,155,29,45,124,214,154,75,31,56,240,121,125,206,131,111,120,237,75,24,211,176,81,183,183,254,180,236,51,106,118,78,30,133,13,28,45,143,144,23,55,16,243,126,140,179,43,123,52,251,58,91,62,9,230,241,209,176,74,184,187,232,156,171,179,133,57,56,234,76,109,179,245,59,171,16,37,45,130,235,235,116,42,6,22,14,209,54,214,247,171,236,60,121,238,103,113,57,14,177,201,183,204,21,177,77,195,162,3,185,41,209,77,
+18,70,133,125,123,77,80,9,236,54,241,179,62,6,29,59,172,155,26,253,222,140,66,126,25,219,137,147,190,197,179,192,111,29,250,96,248,112,89,10,47,56,75,166,138,223,95,177,229,26,164,149,65,43,40,109,48,66,94,75,51,222,236,119,162,165,203,0,224,93,140,207,147,1,114,20,117,228,170,40,18,109,30,214,181,92,94,56,154,118,75,142,39,140,70,123,49,104,200,36,27,113,126,255,221,228,108,158,221,102,134,51,36,196,156,149,96,235,35,187,204,27,67,135,131,54,227,206,70,107,220,165,247,149,191,244,152,23,197,66,9,191,92,207,231,208,254,45,218,252,252,150,25,202,6,113,192,116,137,4,112,154,193,155,234,164,140,182,119,22,195,15,68,254,118,94,146,238,163,196,31,102,17,246,27,158,38,241,47,166,58,74,223,149,229,16,203,120,180,65,188,245,50,255,167,25,235,205,155,23,207,224,136,129,6,115,101,190,128,51,232,93,118,47,1,97,51,192,247,101,58,53,183,195,87,207,255,239,155,231,47,159,62,215,174,185,84,191,210,225,128,111,73,57,144,165,
+202,144,246,44,104,91,237,233,15,131,151,5,150,42,181,212,51,63,67,220,13,196,226,160,208,182,53,156,105,115,176,172,156,0,248,97,20,121,160,225,54,60,108,66,67,191,83,174,165,147,229,243,37,173,200,157,13,212,209,15,65,105,138,178,165,105,159,88,173,98,147,0,148,52,237,225,168,209,206,17,198,99,175,23,163,38,23,87,87,22,52,22,179,2,249,65,124,177,66,136,146,101,157,227,157,114,118,191,76,23,249,244,177,185,43,222,101,232,145,195,131,179,184,170,41,89,27,243,108,110,105,91,96,76,4,73,201,194,213,140,18,220,129,156,26,11,218,172,112,247,61,204,12,39,164,108,184,200,66,169,241,64,39,247,140,162,111,65,240,20,219,99,186,210,9,243,215,37,103,165,6,30,106,92,227,240,3,236,252,7,74,101,209,215,87,47,99,37,234,226,127,194,255,182,73,35,205,102,234,138,158,160,176,204,201,246,14,194,38,84,237,160,147,55,250,37,175,216,142,165,103,85,125,63,87,5,204,234,98,109,191,163,118,253,131,111,224,142,20,126,89,68,151,3,228,229,
+70,163,54,125,236,148,139,251,139,185,72,228,187,245,87,94,116,251,76,22,56,50,180,191,50,6,74,71,96,169,129,76,237,87,251,180,187,241,254,132,45,134,155,126,60,245,187,165,2,187,244,104,181,220,77,236,109,98,127,177,25,133,108,206,175,151,102,132,249,61,167,5,210,128,175,211,203,104,7,181,5,119,128,218,102,223,58,59,158,169,25,115,227,238,193,166,214,243,237,155,223,145,202,98,24,129,63,176,147,161,223,187,141,124,192,38,125,215,12,123,100,148,225,100,24,46,127,242,73,202,158,88,245,211,165,121,110,127,122,104,223,57,205,99,87,197,61,237,214,217,1,117,121,17,63,167,81,136,193,150,135,47,135,219,17,244,200,244,25,234,220,126,136,208,131,197,133,8,12,210,70,220,8,151,51,201,5,15,231,222,217,106,5,193,105,81,235,112,168,12,59,79,126,72,141,53,159,153,163,99,14,41,141,162,51,209,141,35,70,235,95,57,203,109,70,231,22,153,30,175,234,25,254,254,20,194,45,165,148,74,246,149,185,103,52,116,79,146,109,36,19,15,215,118,132,232,
+59,45,229,215,241,173,47,236,191,62,160,8,135,215,184,222,35,106,43,24,253,219,54,189,248,54,209,191,118,239,184,83,131,205,133,104,232,36,171,49,253,65,109,236,215,239,1,210,158,106,16,201,152,3,207,143,43,233,96,178,168,202,14,74,26,231,223,233,228,161,42,28,232,103,82,73,42,228,33,15,21,241,148,171,10,157,183,94,181,142,120,104,135,154,7,55,165,65,250,133,52,97,30,36,105,91,111,56,169,164,161,63,133,201,26,120,119,180,165,123,204,85,156,104,110,100,106,94,164,144,42,111,94,23,127,20,236,44,64,132,84,226,36,16,78,92,149,230,182,5,222,76,246,140,19,210,7,103,191,235,182,48,242,2,159,171,102,255,102,32,198,11,8,148,208,155,202,39,183,74,115,105,29,11,3,78,30,128,180,79,30,184,34,36,185,193,138,67,76,150,16,210,242,243,196,35,217,109,94,214,216,204,137,254,55,22,215,238,198,226,19,122,24,114,120,207,108,84,233,81,172,245,12,252,11,2,182,142,255,240,31,247,131,40,27,160,217,191,82,194,9,132,11,128,43,54,
+31,36,167,159,226,35,255,207,195,216,126,196,166,168,176,244,146,135,58,118,212,224,202,115,63,38,64,65,26,66,55,112,224,74,92,104,92,113,35,53,27,10,26,24,235,13,9,57,4,38,196,3,167,190,73,153,157,51,51,177,89,227,217,71,230,217,86,38,149,35,41,102,52,226,119,176,53,18,201,165,203,71,83,89,154,170,176,6,51,41,112,186,174,167,23,185,169,233,128,139,127,226,209,182,159,160,116,58,238,125,19,12,189,17,27,234,179,228,75,252,104,216,199,27,254,242,21,253,199,35,214,86,227,255,15,232,82,65,180,
diff --git a/uppsrc/CtrlLib/src.tpp/Bar$en-us.tpp b/uppsrc/CtrlLib/src.tpp/Bar$en-us.tpp
new file mode 100644
index 000000000..3e3136324
--- /dev/null
+++ b/uppsrc/CtrlLib/src.tpp/Bar$en-us.tpp
@@ -0,0 +1,14 @@
+TITLE("Bar")
+COMPRESSED
+120,156,237,92,123,115,219,184,17,255,42,152,203,93,70,114,21,135,79,137,146,174,55,119,151,166,87,79,154,107,39,246,77,255,240,88,17,69,66,22,206,20,161,18,144,28,167,211,124,246,238,130,15,129,20,37,91,178,228,83,154,36,51,38,37,98,23,216,223,62,176,11,128,186,180,200,183,223,26,45,227,153,113,207,191,222,95,232,216,159,71,242,234,146,57,142,215,247,45,183,127,243,230,31,221,254,201,143,141,182,211,68,46,38,112,177,59,166,237,185,182,233,88,109,248,99,218,166,229,90,182,99,122,86,215,241,108,219,51,122,65,228,11,113,117,25,89,158,215,71,34,171,101,61,179,58,174,101,118,28,207,241,76,187,227,89,64,107,25,134,101,116,44,215,116,108,207,114,123,33,21,193,213,165,239,217,253,147,119,109,32,178,177,39,96,110,152,109,203,233,56,150,97,27,150,3,93,153,158,231,152,29,215,179,187,237,118,47,240,103,146,241,56,235,139,153,166,101,246,71,102,167,15,99,254,244,233,211,169,233,24,233,8,28,96,102,26,14,12,213,132,239,12,199,234,152,
+110,215,232,186,158,233,25,54,48,119,59,134,219,155,249,137,63,93,47,186,123,175,232,29,163,199,36,5,22,39,127,50,205,14,144,180,91,237,103,166,211,1,65,61,219,113,189,142,1,157,91,150,101,219,150,105,91,221,174,229,182,221,78,111,66,253,144,38,32,130,99,182,213,96,59,173,206,51,215,117,29,104,239,56,110,199,115,44,27,116,227,216,14,64,225,152,93,215,233,186,86,47,166,66,210,112,248,34,133,45,21,191,24,56,142,27,57,121,45,239,89,219,105,119,77,64,223,233,118,28,163,219,54,59,54,130,103,2,236,109,219,177,186,110,193,41,211,218,127,222,255,247,187,215,191,190,248,237,156,92,10,179,255,166,55,132,255,63,251,9,94,84,139,222,0,111,95,201,36,26,144,203,239,12,227,133,97,12,6,63,54,140,83,227,212,114,221,38,201,216,228,79,200,251,229,253,143,6,1,78,250,179,158,254,116,201,99,54,31,69,44,168,99,66,176,227,171,231,87,151,194,234,147,139,9,37,254,72,200,196,15,36,25,249,130,166,157,147,49,79,200,91,26,207,161,51,
+226,199,33,185,224,60,130,251,22,241,35,193,201,44,225,11,22,178,248,154,76,169,31,11,34,57,73,64,5,228,134,222,141,184,159,132,196,15,2,26,209,196,151,192,6,190,4,126,9,159,18,9,157,33,195,132,207,37,3,204,78,113,16,70,159,224,197,235,235,48,157,129,13,224,21,6,54,15,100,47,71,73,147,47,125,114,85,60,0,11,211,68,68,122,37,98,7,69,100,34,107,62,79,40,129,15,115,65,67,28,51,42,62,97,35,64,32,12,25,58,129,31,161,104,51,154,72,70,5,225,99,194,226,144,129,164,115,120,48,130,129,163,105,138,83,0,70,78,120,40,64,102,224,24,147,225,137,196,46,128,161,31,69,252,150,4,19,159,197,8,14,48,8,224,171,92,78,101,97,74,88,55,189,127,83,39,178,186,159,250,215,116,216,8,120,44,228,242,243,243,97,179,64,98,80,161,28,16,245,65,221,23,40,12,159,23,136,128,221,40,38,197,179,198,213,42,166,170,191,162,197,210,174,138,33,12,8,116,81,243,245,10,119,189,103,155,176,233,117,241,164,153,171,229,156,74,
+161,44,130,33,101,170,147,91,38,39,233,119,32,198,86,168,93,208,15,50,3,12,241,79,134,39,26,88,100,193,18,137,58,188,90,139,222,6,220,144,245,46,176,233,45,38,75,159,37,239,135,39,26,54,82,231,190,10,78,246,228,36,111,169,140,114,91,112,222,208,187,97,3,111,194,91,158,132,219,1,115,175,89,1,243,85,116,6,69,111,3,162,46,53,240,216,24,25,54,136,174,199,16,13,6,36,58,85,250,18,224,93,49,153,248,11,74,166,28,60,91,78,224,163,0,199,139,104,53,0,145,6,143,163,59,197,22,194,155,36,60,86,129,32,100,98,22,249,119,96,121,163,185,68,239,37,126,130,180,146,45,104,115,43,136,223,209,25,245,193,2,71,16,39,247,102,121,41,211,141,182,135,253,213,98,155,148,105,223,15,255,252,30,66,32,45,96,62,139,179,38,128,93,72,91,74,104,30,167,113,58,11,246,8,138,4,219,70,164,48,142,1,76,41,9,13,1,203,219,9,141,129,22,252,22,159,79,120,20,146,144,223,198,132,47,104,130,64,111,103,162,175,38,52,184,217,
+51,124,138,231,110,232,5,37,210,2,180,183,254,13,21,69,128,34,195,111,84,59,152,249,191,57,37,191,1,16,42,126,241,248,37,31,143,9,87,105,85,129,33,216,225,20,230,211,108,10,217,202,180,252,144,241,125,91,22,242,60,52,52,156,11,26,35,52,231,108,202,34,176,39,152,33,21,117,43,5,106,193,4,10,32,228,29,56,108,66,5,157,66,202,2,211,230,57,60,13,38,91,97,244,58,246,71,17,221,51,72,41,211,221,80,26,190,167,101,234,21,7,76,185,107,144,53,194,180,114,64,119,74,137,195,237,98,208,5,155,29,106,10,100,179,3,206,128,26,243,2,157,159,66,200,175,124,176,24,30,193,115,180,28,196,41,15,76,91,207,128,127,163,209,161,176,65,214,135,3,103,162,115,175,162,163,205,138,170,29,1,247,161,57,86,59,165,81,69,166,0,55,103,241,152,67,206,217,64,172,224,111,243,113,217,231,250,52,33,235,106,64,178,27,157,65,163,4,70,41,95,104,52,43,112,192,236,189,44,53,0,244,49,187,158,39,232,70,165,100,128,65,15,53,144,172,
+77,197,245,175,0,132,30,136,82,71,33,94,79,103,18,177,107,42,117,247,96,180,165,210,164,106,98,107,98,72,165,142,193,188,58,229,92,110,208,104,214,154,145,110,104,25,39,136,58,5,100,70,94,244,189,83,117,11,132,30,136,71,132,141,85,77,134,65,7,59,210,107,178,138,144,231,20,203,123,0,49,5,226,225,18,46,56,11,215,75,88,176,93,145,177,118,240,153,237,231,147,71,78,156,155,61,140,117,131,8,191,178,168,208,100,225,254,66,250,146,5,187,121,127,198,112,105,218,205,42,200,62,76,109,99,154,208,56,80,174,25,206,167,211,187,108,142,124,161,140,118,170,170,201,180,82,132,228,129,168,98,82,53,192,100,148,93,199,144,219,134,155,212,2,89,112,234,180,175,128,197,200,15,110,204,225,247,249,243,231,195,31,134,173,218,212,191,34,245,253,147,26,104,10,122,90,227,196,69,215,3,82,220,22,77,191,87,35,249,65,159,31,161,204,46,22,39,72,171,140,253,14,117,3,224,141,131,19,170,74,207,151,23,200,132,129,211,39,193,4,18,127,42,36,166,22,
+99,158,92,158,144,162,187,188,158,208,35,4,212,22,99,226,199,119,74,235,80,93,136,84,33,90,11,72,150,133,224,1,195,68,56,207,155,115,161,243,250,12,253,137,197,11,126,131,77,226,48,87,114,162,121,222,6,149,254,156,80,255,166,100,164,107,188,169,164,30,69,85,99,137,106,1,36,27,192,8,219,64,58,63,79,192,34,165,130,75,77,26,13,240,160,128,71,243,105,220,84,227,5,235,72,36,26,111,76,111,177,90,218,48,216,95,124,152,90,89,44,183,28,45,144,109,156,54,129,99,173,242,5,251,88,206,170,180,103,222,170,89,148,195,197,181,63,67,13,105,234,87,236,200,140,125,160,145,120,88,12,129,129,191,99,215,19,185,181,126,114,194,26,21,101,163,196,225,65,21,139,165,40,248,125,154,27,66,98,44,115,171,82,107,82,249,42,154,62,217,39,200,87,201,178,97,224,208,73,22,39,100,18,149,86,147,30,50,122,160,94,231,251,106,33,83,173,42,214,5,73,40,25,244,71,169,204,247,12,77,133,172,115,16,231,15,26,100,37,34,225,72,6,228,188,100,
+121,186,73,126,220,82,58,244,150,214,246,46,179,127,233,30,224,111,193,135,29,233,150,49,186,226,165,198,3,208,82,133,92,107,191,198,250,144,186,141,198,235,108,96,95,86,190,34,217,94,109,253,41,101,60,128,147,172,130,179,79,87,249,99,192,57,10,31,179,234,138,70,53,96,114,203,194,107,42,243,153,100,148,205,125,86,58,133,192,229,108,92,93,137,78,233,48,53,10,233,24,102,161,144,76,120,194,62,242,88,250,209,203,5,238,158,64,50,75,34,126,173,174,51,46,212,230,10,153,227,218,44,249,59,29,203,127,114,241,242,130,207,224,210,82,188,99,30,15,95,124,164,9,87,83,24,78,114,43,196,165,109,155,177,154,250,128,48,111,158,201,192,226,98,254,38,4,114,18,194,225,99,66,48,145,132,158,238,248,92,173,24,11,148,54,39,30,221,169,204,91,173,59,81,249,142,6,178,97,180,136,129,75,84,161,156,180,160,176,198,169,181,185,138,9,101,138,247,82,114,92,226,43,132,223,36,135,170,179,90,154,208,58,180,31,174,74,31,33,55,205,50,55,181,181,74,
+37,77,132,170,11,16,140,154,65,45,104,172,146,215,52,79,80,105,168,234,2,243,187,152,75,200,187,169,192,196,15,176,201,248,134,52,136,176,132,130,193,53,91,228,23,42,223,178,24,157,184,209,84,155,128,43,106,207,20,113,154,45,96,53,180,6,224,59,77,109,177,24,201,17,231,165,129,165,203,90,8,84,200,132,186,101,242,190,132,37,13,9,165,165,155,214,202,198,88,75,175,65,54,46,84,108,168,229,30,17,51,74,75,125,181,46,188,191,77,162,109,216,87,182,238,54,111,210,233,207,170,177,47,131,118,89,221,213,199,163,209,86,49,190,110,145,233,179,209,237,227,214,174,142,89,137,213,135,235,85,121,12,94,249,101,56,214,150,58,81,249,152,76,96,86,67,53,28,149,98,6,203,177,65,182,168,174,107,128,251,63,84,206,49,68,189,175,129,235,222,57,232,56,103,156,3,7,189,39,153,35,62,215,25,225,208,193,250,104,34,243,81,38,139,159,75,78,120,252,24,27,69,181,152,46,7,196,233,110,5,212,102,234,116,138,218,71,227,17,46,2,96,57,153,209,46,
+79,159,65,113,151,85,144,173,98,155,195,15,195,180,46,71,14,125,220,79,212,200,82,33,42,116,37,42,189,191,17,212,235,170,186,45,26,215,178,82,11,1,190,32,44,192,130,58,78,135,14,124,212,206,69,221,152,115,130,172,175,236,80,78,126,186,224,148,252,75,157,101,202,143,231,32,133,160,17,13,112,127,103,137,72,78,53,155,139,9,13,75,67,3,152,181,13,159,83,253,81,102,43,184,232,160,157,245,192,205,183,185,168,142,87,109,69,49,165,149,234,249,53,184,248,225,239,115,160,171,221,208,38,63,69,17,89,248,9,243,99,89,156,75,173,236,60,170,253,172,219,9,11,38,106,21,100,68,139,5,149,241,60,81,107,25,105,15,213,147,3,100,135,2,125,195,110,228,103,228,172,251,155,49,118,218,22,221,101,78,125,26,176,63,55,188,182,95,67,250,66,141,246,233,39,176,131,122,198,49,232,248,139,87,211,114,235,65,204,71,56,201,158,146,191,46,103,213,22,17,108,58,139,238,48,33,72,15,113,21,27,221,218,204,168,216,62,120,94,221,176,164,140,239,180,148,
+207,49,109,179,171,84,162,94,106,189,214,28,213,219,51,59,157,227,40,40,31,208,195,142,135,47,50,210,141,134,187,143,3,24,245,35,222,237,248,132,78,124,15,50,96,111,216,250,113,167,29,144,195,42,64,123,220,11,94,25,226,35,118,130,247,54,216,189,111,234,174,74,185,251,150,238,1,164,60,138,221,217,117,168,61,233,222,87,61,184,95,179,149,67,172,252,232,234,125,250,53,225,3,104,250,235,162,114,170,210,99,241,213,175,238,182,70,55,203,221,167,131,238,140,237,170,160,45,118,199,14,173,161,233,99,181,179,69,106,112,12,241,239,75,11,97,233,219,255,130,102,7,129,210,99,69,244,223,115,182,240,35,138,203,136,106,73,55,125,132,239,235,241,185,36,151,39,36,5,239,228,37,33,87,217,113,171,216,159,210,150,122,131,118,70,147,49,79,166,120,102,121,70,213,91,180,4,223,166,87,135,139,240,221,6,40,243,150,175,155,168,82,112,125,165,134,239,122,237,94,169,149,168,151,186,174,181,68,245,86,217,78,149,90,65,249,128,30,118,172,212,50,210,141,177,228,
+0,149,90,214,237,110,149,154,78,124,15,50,224,141,216,250,113,149,218,133,158,174,28,162,82,91,25,226,35,42,181,189,13,118,239,149,218,170,148,187,87,106,7,144,242,40,42,181,29,131,102,10,199,30,130,102,190,91,182,113,79,166,242,123,15,235,166,205,7,170,114,79,63,240,112,176,77,226,141,239,172,30,76,246,61,36,10,143,194,161,48,196,98,215,47,228,234,132,175,31,134,217,18,42,152,98,156,157,82,174,108,238,166,134,7,4,216,184,250,91,61,27,108,235,76,100,191,9,164,189,232,186,4,178,128,182,238,117,208,123,95,115,205,56,151,155,104,47,186,102,201,212,230,87,88,81,206,205,238,113,38,178,151,200,15,32,66,198,249,113,34,220,239,225,103,2,223,117,4,187,19,7,144,33,103,253,56,33,84,212,18,192,74,253,14,82,245,215,92,116,43,187,250,31,156,148,212,162,
diff --git a/uppsrc/CtrlLib/src.tpp/BarCtrl$en-us.tpp b/uppsrc/CtrlLib/src.tpp/BarCtrl$en-us.tpp
new file mode 100644
index 000000000..b93295b05
--- /dev/null
+++ b/uppsrc/CtrlLib/src.tpp/BarCtrl$en-us.tpp
@@ -0,0 +1,9 @@
+TITLE("BarCtrl")
+COMPRESSED
+120,156,189,86,107,111,219,54,20,253,43,4,210,22,118,230,36,36,69,61,44,111,67,155,244,137,62,50,36,30,246,193,176,35,90,162,99,33,178,168,74,84,138,96,88,127,251,46,41,235,97,103,137,189,172,88,2,36,18,117,239,225,185,231,62,200,9,69,207,158,225,1,62,192,59,126,252,215,98,193,203,68,77,39,49,99,222,136,83,123,116,243,241,124,56,58,124,217,115,88,95,163,16,64,177,92,98,121,182,69,24,117,224,15,177,8,181,169,197,136,71,135,204,179,44,15,251,97,194,139,98,58,73,168,231,141,180,19,29,208,3,234,218,148,184,204,99,30,177,92,143,130,47,197,152,98,151,218,132,89,30,181,253,72,20,225,116,194,61,107,116,120,225,128,147,165,119,2,112,76,28,202,92,70,177,133,41,131,173,136,231,49,226,218,158,53,116,28,63,228,153,138,101,186,222,43,38,132,146,209,156,184,35,224,252,253,251,247,99,194,112,197,128,1,24,193,12,168,18,88,195,140,186,196,30,226,161,237,17,15,91,0,110,187,216,246,51,158,243,213,195,161,219,59,67,119,
+177,31,43,1,16,135,63,17,226,130,139,51,112,14,8,115,33,80,207,98,182,231,98,216,156,82,106,89,148,88,116,56,164,182,99,187,254,82,240,72,228,16,2,35,142,33,235,14,220,3,219,182,25,216,51,102,187,30,163,22,228,134,89,12,164,96,100,104,179,161,77,253,84,20,74,68,193,81,37,91,21,126,67,92,243,214,72,222,192,59,112,152,51,36,160,62,27,186,12,15,29,226,90,90,60,2,178,59,22,163,67,187,65,90,103,237,207,171,191,158,191,249,114,244,251,37,154,20,100,244,209,15,224,247,148,231,103,42,79,244,163,177,242,103,250,81,47,189,5,201,196,12,77,158,99,124,132,241,108,246,178,135,143,241,49,181,237,62,90,227,213,95,208,85,251,252,18,163,53,100,247,187,223,181,104,113,178,114,158,196,225,63,2,173,185,205,52,90,199,96,128,254,37,16,106,66,153,190,152,78,10,58,66,227,101,92,84,17,160,44,151,183,49,200,140,66,185,90,201,20,173,132,90,202,168,64,11,153,163,207,34,45,97,111,196,211,8,141,165,76,224,249,24,189,22,121,
+124,43,34,180,200,229,74,51,27,160,88,33,30,129,75,81,102,153,204,149,113,253,22,71,215,66,161,44,225,161,88,137,20,44,10,52,153,41,153,197,33,132,117,18,156,104,78,103,50,23,193,73,145,135,145,12,131,147,87,115,89,42,67,179,8,158,137,52,56,42,139,25,236,162,105,27,6,133,226,170,44,208,82,36,25,74,226,84,28,235,96,240,8,233,127,246,253,84,254,177,20,233,123,176,245,33,29,93,69,207,120,146,204,121,120,67,102,166,246,81,243,94,203,85,45,255,220,190,182,57,151,105,161,54,205,174,46,85,30,167,215,193,139,95,91,185,235,157,55,213,94,111,131,214,207,160,224,55,176,67,151,34,141,180,241,39,136,8,129,112,103,137,224,121,179,160,99,142,195,38,41,185,248,90,66,61,163,40,46,64,217,59,216,24,169,165,184,175,12,108,201,211,155,2,41,137,100,38,114,174,0,88,222,138,60,145,60,26,128,75,151,79,200,83,52,23,0,153,139,80,37,119,144,168,34,190,78,129,158,70,190,52,200,186,6,98,8,157,167,225,62,170,127,18,11,117,
+6,181,120,243,144,244,91,202,111,41,186,161,99,131,85,139,121,214,209,174,44,68,14,101,12,95,11,4,165,59,215,165,154,11,190,131,226,59,161,214,111,191,129,117,170,130,94,221,238,193,97,208,247,107,198,181,246,219,237,168,13,103,219,13,142,174,130,195,38,12,140,182,183,104,204,122,27,104,21,212,131,56,22,250,218,172,247,235,248,47,132,42,243,180,48,217,89,196,57,20,67,102,182,64,114,81,147,66,234,46,19,166,11,31,23,162,91,122,123,138,208,105,134,91,25,71,45,237,78,240,93,216,31,24,248,135,69,77,234,208,24,160,37,239,148,60,138,196,34,214,85,219,43,11,221,22,85,140,126,211,72,85,7,245,7,168,0,118,133,30,89,208,27,90,67,109,168,235,91,206,21,55,0,243,59,211,27,26,100,59,141,168,23,47,96,20,221,245,155,22,111,218,104,71,205,109,116,245,15,212,122,3,247,7,138,125,105,84,18,171,76,221,161,106,194,253,191,122,189,74,96,6,5,189,24,186,179,21,232,241,14,12,94,116,133,49,0,247,5,233,104,26,119,218,242,170,
+163,6,223,240,236,40,162,170,166,107,143,52,232,56,61,114,234,81,20,233,51,206,156,87,131,110,165,86,120,245,152,149,122,202,55,157,10,21,90,91,162,211,87,23,193,213,233,249,120,124,254,185,217,29,142,250,135,44,199,231,191,237,99,118,241,225,221,251,241,62,134,159,222,188,109,237,244,41,111,174,202,232,150,39,165,208,103,86,189,233,241,244,241,204,53,165,13,255,199,50,131,90,127,90,2,193,183,77,95,155,5,80,87,203,108,210,219,171,57,245,119,84,211,169,84,74,174,158,76,165,114,223,143,77,149,192,93,132,244,169,246,100,58,218,121,63,50,58,167,187,168,92,196,215,203,167,115,49,222,251,145,49,149,184,139,13,76,144,117,235,7,125,115,219,242,59,29,91,111,211,233,220,173,43,67,117,244,110,244,126,101,209,235,183,215,138,234,22,183,117,156,134,101,110,38,150,241,133,67,66,41,24,104,187,238,58,57,207,254,203,140,210,254,79,26,81,237,192,190,10,126,233,126,32,143,204,45,115,74,246,224,82,16,202,164,92,165,230,126,0,87,66,56,113,120,162,
+231,88,209,71,223,128,16,90,201,8,46,144,4,5,71,237,187,30,0,60,84,112,239,31,32,220,124,105,22,13,150,153,124,117,196,3,48,186,15,145,74,181,246,104,7,12,44,67,240,107,156,56,173,96,118,149,201,23,89,105,255,68,225,43,247,71,202,86,127,238,65,4,13,143,233,223,87,76,205,106,
+
diff --git a/uppsrc/CtrlLib/src.tpp/Button$en-us.tpp b/uppsrc/CtrlLib/src.tpp/Button$en-us.tpp
new file mode 100644
index 000000000..1178c48f6
--- /dev/null
+++ b/uppsrc/CtrlLib/src.tpp/Button$en-us.tpp
@@ -0,0 +1,220 @@
+TITLE("Button")
+COMPRESSED
+120,156,197,88,249,83,98,89,150,254,87,94,84,87,27,153,
+57,149,153,172,74,106,76,68,78,87,215,76,84,244,116,215,
+68,103,247,252,98,152,5,42,153,73,164,130,1,152,57,25,
+51,83,241,88,84,18,148,69,193,21,21,112,1,87,220,21,
+197,5,196,84,20,16,149,116,67,5,84,16,119,196,5,21,
+193,185,224,146,149,57,53,81,21,53,213,213,252,240,222,227,
+190,123,206,185,223,119,190,119,207,121,47,17,5,125,254,57,
+226,11,196,111,16,63,242,139,255,61,241,25,33,51,141,158,
+148,72,194,96,112,9,4,20,54,225,229,31,190,121,148,112,
+239,241,157,88,204,93,224,4,9,156,160,227,144,104,28,22,
+141,196,160,98,193,1,137,70,162,176,40,52,6,137,67,61,
+194,224,208,104,28,34,62,37,141,64,163,37,37,166,161,112,
+184,132,72,100,20,48,66,197,97,81,200,56,12,14,131,67,
+162,227,112,40,96,139,66,32,80,136,56,20,22,137,65,227,
+80,216,248,84,34,45,37,41,145,128,67,39,220,251,115,44,
+48,66,71,34,1,231,8,100,44,10,19,135,65,33,208,8,
+20,6,132,66,226,112,24,100,28,22,135,126,20,27,27,159,
+66,200,160,147,40,228,235,88,36,36,18,133,76,72,70,198,
+37,128,37,127,247,221,119,15,144,24,196,213,10,48,192,25,
+18,129,1,75,69,130,49,4,6,21,135,196,62,66,60,194,
+226,144,56,4,26,56,199,198,33,176,241,25,4,42,33,253,
+135,145,71,124,96,127,20,122,28,34,158,68,39,2,23,247,
+254,1,137,140,3,38,177,95,196,254,6,137,137,3,64,113,
+104,12,22,23,135,0,193,81,40,20,26,141,66,162,81,143,
+30,161,176,177,216,184,248,23,68,66,42,145,154,148,248,159,
+223,254,247,111,191,250,211,253,191,62,129,18,105,232,4,232,
+119,153,116,58,133,28,147,148,72,67,36,160,161,200,25,155,
+240,135,199,8,40,241,183,8,196,125,4,226,241,29,196,3,
+196,3,20,22,123,23,186,166,251,102,60,146,168,111,111,254,
+94,187,73,138,216,163,18,160,235,211,227,199,164,116,194,115,
+98,60,6,27,27,3,184,132,89,70,88,10,195,48,107,253,
+18,28,225,211,28,233,110,177,110,130,57,85,43,28,13,22,
+135,132,150,124,157,117,142,195,220,211,181,91,235,38,132,182,
+17,251,162,76,228,42,82,13,179,139,199,116,203,185,189,236,
+114,221,52,71,173,171,43,230,142,115,229,134,197,213,221,186,
+82,119,243,66,75,200,165,86,11,142,91,183,114,197,44,237,
+64,56,167,164,123,242,120,49,156,43,59,52,141,91,170,165,
+138,202,157,222,138,241,29,195,190,122,50,139,193,116,78,157,
+204,169,91,250,188,138,202,202,197,210,242,178,2,135,206,112,
+52,126,225,183,22,170,54,154,60,230,225,188,224,185,143,217,
+231,226,141,13,25,21,133,13,185,61,163,251,74,99,127,104,
+66,197,184,220,239,114,203,179,61,138,82,135,143,155,149,63,
+205,25,108,172,108,106,206,154,234,115,216,187,250,223,91,87,
+143,26,121,149,173,89,141,170,221,30,182,96,170,107,153,85,
+202,46,205,235,172,148,243,182,66,118,187,104,192,182,184,59,
+166,22,9,109,139,77,60,129,145,211,102,51,239,154,4,217,
+178,217,139,29,223,80,206,194,98,71,187,83,111,21,111,95,
+216,52,50,255,110,222,22,187,89,41,229,108,85,237,31,215,
+231,136,213,230,178,114,135,242,208,93,207,86,119,110,149,25,
+25,199,219,166,153,209,188,51,191,132,25,92,108,88,112,193,
+231,157,230,186,130,158,10,191,76,37,239,215,150,73,173,218,
+46,201,110,110,177,208,86,255,238,236,45,171,126,174,118,107,
+160,100,59,55,143,89,58,21,14,59,21,97,117,93,89,115,
+91,187,105,95,174,146,84,214,241,20,50,149,100,175,61,23,
+156,220,109,221,138,77,239,68,222,97,185,109,207,152,63,167,
+128,23,125,135,117,170,162,78,211,81,177,253,244,96,69,24,
+30,210,173,183,231,78,218,155,36,156,94,201,112,143,103,214,
+20,240,206,29,193,172,176,110,91,231,238,102,105,213,194,182,
+77,215,233,76,157,160,243,104,111,205,177,127,120,206,14,49,
+149,69,239,27,207,28,65,216,34,133,195,149,14,86,75,110,
+33,119,111,171,211,192,102,12,106,84,138,147,15,170,64,35,
+99,144,184,56,152,53,2,87,68,84,177,122,165,10,1,80,
+197,228,4,83,87,40,30,13,182,159,15,247,178,179,116,151,
+122,225,17,111,129,105,89,102,202,154,43,142,250,78,56,227,
+219,138,57,5,63,196,88,238,101,179,141,89,146,98,46,119,
+170,120,173,121,112,126,166,96,217,22,168,30,104,17,78,152,
+44,7,218,185,205,222,150,225,13,86,75,240,162,125,127,64,
+43,86,239,239,110,205,242,57,155,167,129,182,186,83,255,158,
+96,245,228,124,73,230,115,205,46,217,231,178,26,247,246,52,
+22,245,174,217,210,84,50,168,211,251,45,231,39,43,125,11,
+227,154,229,90,25,139,111,238,129,79,205,109,142,205,198,11,
+75,232,188,181,222,63,247,86,124,52,36,219,183,114,122,189,
+210,115,102,209,186,209,113,184,177,125,233,189,16,246,235,89,
+141,172,147,114,185,122,216,149,163,51,28,84,185,150,236,53,
+172,211,94,167,181,155,211,62,83,96,238,183,168,3,123,194,
+234,50,254,218,81,137,233,180,208,112,89,116,184,238,169,173,
+11,204,108,118,104,100,10,207,232,177,192,55,89,117,188,168,
+219,45,204,177,173,123,194,43,204,176,171,218,98,111,96,232,
+24,146,247,7,129,179,181,25,173,72,51,218,201,43,100,213,
+205,236,204,75,173,27,162,2,231,202,52,103,204,163,41,229,
+84,76,111,116,134,87,214,96,110,253,105,96,37,127,122,157,
+163,29,145,8,170,152,182,214,109,9,63,168,82,9,122,39,
+207,57,121,91,42,199,112,72,126,188,190,245,158,199,170,31,
+87,143,174,56,85,138,243,177,242,138,113,205,144,33,40,152,
+178,100,101,85,178,165,103,69,103,66,163,126,75,220,168,109,
+211,9,123,103,93,11,178,149,177,114,229,104,135,206,107,61,
+110,41,112,207,188,101,109,112,70,248,239,123,139,89,227,45,
+142,254,37,71,169,161,81,87,221,214,147,159,127,220,216,178,
+212,199,170,247,244,157,153,12,222,85,49,107,64,62,228,174,
+18,103,251,125,146,114,227,200,196,136,244,104,206,90,245,246,
+114,198,201,84,15,12,141,108,118,185,39,173,149,176,206,203,
+191,28,224,87,186,245,89,161,101,230,9,243,157,185,200,47,
+172,135,149,183,10,65,98,17,49,96,91,134,89,197,112,105,
+68,33,158,43,133,244,75,131,135,254,119,101,83,157,236,50,
+247,113,115,21,187,70,151,119,54,201,24,114,179,44,155,246,
+74,207,78,168,216,144,203,172,55,172,241,173,6,70,43,71,
+149,63,200,209,40,247,181,85,217,162,230,142,13,195,113,183,
+65,214,199,244,72,7,207,75,139,249,6,171,180,106,110,69,
+223,42,12,44,105,164,121,117,133,122,240,191,200,1,59,69,
+86,30,91,215,83,92,173,96,155,53,23,7,37,139,108,93,
+167,162,85,206,145,203,52,57,106,45,163,74,212,115,194,209,
+23,42,188,118,11,227,80,32,18,45,245,8,59,14,152,158,
+157,65,121,80,152,199,200,211,137,77,213,94,203,64,187,128,
+83,168,99,135,142,207,179,91,203,57,62,109,229,192,88,238,
+130,126,159,223,233,239,171,107,131,23,164,91,146,28,86,246,
+74,203,12,135,1,251,115,102,194,198,15,152,145,184,24,176,
+221,195,172,2,88,28,193,188,115,133,89,41,237,47,24,228,
+234,91,198,197,57,2,111,185,150,89,215,80,228,59,224,112,
+115,124,62,213,30,63,92,199,175,224,47,170,202,59,172,162,
+153,142,247,227,67,62,230,1,67,57,89,209,106,102,158,20,
+183,92,12,159,186,67,70,173,76,221,54,111,116,76,85,143,
+103,133,44,89,182,160,201,214,39,26,89,17,118,205,244,14,
+191,11,58,153,13,58,85,171,161,90,166,241,216,253,97,107,
+23,67,218,208,108,171,229,205,231,157,237,212,86,133,56,61,
+250,154,102,247,106,237,124,251,146,227,162,188,122,243,162,254,
+162,176,149,87,194,213,43,103,247,75,121,198,13,14,239,212,
+237,92,23,157,123,243,149,83,89,205,78,158,115,169,134,63,
+167,208,56,207,215,248,75,171,103,181,239,61,236,138,30,195,
+240,148,63,215,58,92,144,61,94,208,125,234,95,147,28,188,
+229,31,30,248,102,194,163,129,45,233,200,201,190,114,41,172,
+177,177,199,90,149,199,226,62,217,232,150,102,174,193,126,201,
+191,12,143,42,243,25,130,203,206,143,139,202,95,94,16,161,
+103,132,116,74,38,13,122,70,201,36,167,18,34,149,25,162,
+60,131,8,228,55,208,191,252,245,235,7,208,215,116,232,5,
+129,6,145,41,208,191,19,210,50,137,15,190,103,143,72,120,
+74,167,100,144,82,240,241,248,135,248,135,95,210,169,105,255,
+74,74,198,63,164,81,83,240,15,255,45,147,246,130,72,197,
+127,78,36,227,239,103,210,158,66,137,15,159,62,133,126,79,
+164,146,94,17,83,161,103,84,10,40,184,96,0,186,45,121,
+87,243,147,62,41,157,55,133,243,41,8,17,127,85,21,159,
+222,84,199,27,75,124,204,109,225,4,149,246,9,145,254,117,
+36,245,183,183,239,36,253,64,241,165,144,105,244,219,25,183,
+230,209,40,81,235,167,208,199,78,64,12,82,250,243,187,55,
+21,25,4,161,65,116,64,93,84,101,81,74,48,9,55,107,
+189,247,229,99,52,184,241,60,233,254,127,125,253,209,237,123,
+15,161,63,19,233,153,84,50,244,42,194,36,184,143,191,71,
+127,65,138,48,79,133,82,94,16,72,100,18,249,249,131,95,
+130,129,63,82,200,148,95,145,133,116,16,46,229,5,200,41,
+80,79,202,53,39,87,166,16,64,151,66,73,163,80,65,210,
+9,41,41,20,106,42,128,8,209,41,80,74,38,149,74,36,
+211,35,18,131,210,40,148,151,248,152,103,68,98,218,223,142,
+73,68,66,252,7,2,35,87,95,165,62,39,62,161,191,73,
+35,226,239,36,83,40,105,248,187,241,208,199,221,215,247,72,
+189,7,221,206,254,64,104,196,234,195,12,176,208,228,15,84,
+226,255,241,91,58,53,147,120,203,212,63,165,208,73,175,8,
+116,34,13,122,69,162,101,18,210,32,90,196,23,68,203,36,
+209,9,201,224,34,178,236,228,104,84,26,148,73,3,92,145,
+200,52,82,42,24,7,189,45,49,242,52,82,0,205,84,40,
+242,132,209,190,128,210,72,47,137,80,42,149,146,129,191,159,
+74,121,77,190,181,36,145,163,163,105,36,26,157,246,224,147,
+166,17,29,139,138,1,5,0,102,245,194,197,145,141,208,123,
+179,17,238,206,154,193,70,88,33,204,118,173,76,246,157,242,
+217,221,21,186,178,83,46,59,176,215,185,58,82,83,111,43,
+148,176,26,46,133,188,108,157,150,145,157,173,55,123,188,37,
+243,250,65,185,171,122,185,122,166,185,162,215,219,223,144,95,
+183,181,53,176,221,120,124,14,187,189,14,231,113,195,98,83,
+143,182,55,36,108,87,134,54,220,139,171,171,190,233,128,194,
+187,225,31,54,110,230,236,10,217,179,117,162,89,209,238,142,
+186,167,229,108,115,121,126,118,101,78,223,183,220,223,35,185,
+232,42,118,111,42,237,236,173,14,183,221,179,111,25,234,152,
+10,120,154,103,90,184,252,61,47,219,208,199,223,23,187,224,
+133,32,215,208,183,232,80,153,179,141,53,106,134,183,108,248,
+125,77,185,124,241,176,77,184,235,59,107,155,182,153,2,28,
+255,64,121,35,255,88,58,52,224,150,11,165,252,161,14,17,
+71,35,247,54,92,110,87,154,2,238,237,1,198,196,244,172,
+196,158,195,105,104,97,55,253,128,200,146,129,132,34,25,139,
+72,147,112,157,172,95,82,109,79,82,168,148,180,180,159,174,
+183,239,205,255,213,20,119,29,52,153,64,253,95,234,1,37,
+52,6,29,41,163,98,184,35,162,30,211,173,122,10,250,249,
+204,161,49,225,187,104,25,205,107,42,106,57,224,148,10,196,
+78,221,78,227,133,110,130,205,203,146,140,155,91,106,167,57,
+76,121,235,1,243,116,194,232,245,180,55,174,217,70,184,235,
+198,134,174,246,195,147,66,189,105,62,196,63,62,41,88,8,
+26,11,150,187,27,85,123,147,109,246,101,151,188,170,95,197,
+90,176,137,119,150,217,58,151,184,166,123,53,88,27,20,142,
+22,142,59,197,69,1,69,167,189,218,162,109,222,144,77,31,
+28,100,27,123,22,86,28,103,23,58,71,112,182,112,73,90,
+235,221,83,204,52,116,75,198,24,219,77,231,221,133,67,213,
+146,117,217,154,69,202,147,175,27,244,134,146,128,150,91,3,
+91,197,237,206,101,171,175,158,255,86,163,239,169,202,115,151,
+200,114,249,76,81,133,107,25,86,154,70,46,231,54,246,68,
+163,118,71,105,95,195,200,201,100,85,121,131,184,212,86,237,
+107,63,57,240,9,71,103,251,38,47,119,78,166,106,2,69,
+188,66,245,138,41,119,211,188,209,98,210,40,21,67,172,241,
+112,251,224,113,160,106,98,103,127,116,187,168,196,184,86,58,
+215,83,243,174,179,249,160,97,99,128,11,155,67,193,162,191,
+189,220,126,86,153,248,230,229,7,101,221,202,230,143,132,151,
+64,50,87,194,128,240,159,165,94,125,88,136,108,221,196,12,
+58,254,51,8,127,31,34,209,161,116,210,243,23,145,174,224,
+21,216,134,72,207,158,17,163,59,249,181,206,168,196,12,42,
+145,6,6,174,58,9,2,57,53,98,1,86,127,131,51,21,
+74,126,3,125,69,166,131,253,236,5,133,254,146,248,230,215,
+6,254,37,129,156,66,76,251,233,224,83,162,243,127,73,240,
+180,148,191,19,244,175,254,131,68,255,233,192,137,96,246,47,
+8,59,25,20,177,40,118,0,233,239,153,255,63,81,168,233,
+132,31,205,255,29,0,233,21,9,244,197,105,111,64,127,3,
+32,147,192,189,215,36,0,225,155,151,95,92,107,40,138,4,
+144,116,23,144,70,142,122,197,127,246,255,170,26,63,124,254,
+89,159,144,158,100,144,200,87,52,208,254,143,239,72,72,116,
+28,104,9,98,97,86,33,92,18,217,212,55,174,54,245,208,
+213,251,160,60,40,240,247,206,137,114,156,211,181,23,74,158,
+179,213,53,115,212,36,104,239,26,208,151,177,96,174,175,12,
+158,210,177,114,24,18,97,135,171,224,180,179,219,183,94,62,
+199,226,155,178,20,171,166,30,133,255,44,139,205,232,28,158,
+23,46,177,57,156,86,215,154,243,76,57,196,158,226,85,153,
+96,217,170,105,62,48,229,97,84,24,172,236,241,183,107,171,
+214,145,218,106,216,44,42,57,18,152,79,165,98,197,225,102,
+65,217,80,214,89,142,197,49,194,242,10,185,21,28,246,88,
+173,117,101,232,93,158,128,13,235,182,152,235,121,31,227,120,
+66,74,207,0,149,44,210,20,253,115,180,79,138,102,135,254,
+154,2,209,64,38,210,110,203,27,129,30,109,82,169,81,1,
+19,65,35,23,109,168,94,71,232,143,26,63,184,150,11,237,
+74,221,209,3,72,62,224,150,244,156,28,169,140,17,182,104,
+17,163,204,140,168,182,163,77,23,129,74,165,188,166,125,252,
+54,4,94,114,62,126,197,185,45,241,183,139,252,244,5,231,
+67,98,191,47,224,171,100,126,172,226,79,19,76,34,167,220,
+36,246,47,148,140,107,180,159,62,29,63,223,125,42,241,214,
+253,239,40,96,98,250,167,17,146,254,7,134,153,173,170,
\ No newline at end of file
diff --git a/uppsrc/CtrlLib/src.tpp/ButtonOption$en-us.tpp b/uppsrc/CtrlLib/src.tpp/ButtonOption$en-us.tpp
new file mode 100644
index 000000000..dff50e954
--- /dev/null
+++ b/uppsrc/CtrlLib/src.tpp/ButtonOption$en-us.tpp
@@ -0,0 +1,9 @@
+TITLE("ButtonOption")
+COMPRESSED
+120,156,213,86,251,83,19,87,20,254,87,238,248,154,64,33,236,222,221,205,46,201,116,134,169,58,157,142,51,181,163,211,254,146,9,102,129,69,118,12,73,186,187,161,237,116,234,4,20,121,137,60,131,130,81,113,8,180,40,15,19,197,42,229,81,228,81,30,181,181,66,81,6,124,128,17,121,8,56,49,8,162,149,222,37,36,38,224,115,58,237,76,243,195,238,236,221,123,190,115,190,239,156,239,110,180,16,108,218,132,69,96,27,177,183,252,212,219,184,68,214,98,144,116,90,158,36,25,13,11,41,205,190,29,59,163,53,225,49,10,21,25,38,163,224,8,133,160,113,130,161,8,156,132,42,116,193,9,28,82,144,32,113,6,70,147,12,65,48,152,58,222,192,138,162,78,107,128,12,163,145,131,32,10,130,52,5,113,154,100,72,6,39,104,6,162,88,136,97,16,163,33,133,147,4,3,41,117,2,39,198,235,180,44,67,104,194,119,169,80,16,33,103,66,224,24,174,130,36,77,66,140,192,32,137,82,225,12,67,226,52,197,16,209,42,149,58,158,53,75,188,201,184,154,139,199,
+113,136,107,226,112,90,131,106,222,191,127,191,18,39,49,95,5,36,2,195,49,18,149,138,163,53,140,132,52,78,69,99,209,20,131,51,24,129,192,41,26,163,212,102,86,96,147,95,79,157,122,43,117,26,83,243,18,135,32,194,63,192,113,26,133,168,34,84,27,113,146,70,68,25,130,164,24,26,67,201,33,132,4,1,113,2,70,71,67,74,69,209,234,36,142,77,224,4,157,246,219,61,223,109,222,254,105,228,231,187,129,86,36,52,224,35,139,36,153,140,59,87,248,109,209,105,69,76,3,124,55,98,229,78,105,118,196,96,64,187,25,195,34,49,44,70,129,41,49,37,164,168,48,176,170,189,127,29,213,14,246,248,31,67,48,117,50,10,244,129,162,91,76,12,159,204,238,229,212,16,82,91,16,43,235,1,135,181,216,106,181,30,120,184,140,174,214,197,122,251,45,91,95,111,251,207,85,197,135,30,31,107,201,60,235,106,123,100,59,216,118,162,220,121,201,83,145,217,88,93,238,169,203,158,237,112,92,116,230,29,239,168,76,155,45,110,43,60,154,93,152,222,57,237,248,179,
+220,118,122,226,248,237,26,219,194,112,246,208,192,169,35,249,71,218,199,93,206,202,179,55,50,78,141,58,236,203,45,19,151,51,60,215,39,158,15,95,157,191,214,220,232,173,121,214,229,158,94,188,219,94,235,118,151,23,61,173,189,153,153,158,118,108,234,120,239,19,111,94,235,143,13,11,25,213,231,31,44,122,239,186,27,31,142,55,21,213,31,45,169,233,72,43,59,83,215,221,120,97,46,199,54,54,57,179,48,59,191,220,157,155,90,224,105,109,30,47,93,234,171,173,202,61,81,90,105,239,255,163,104,124,118,113,233,254,137,161,9,251,64,246,116,83,106,241,208,204,144,215,222,94,215,91,99,237,169,110,42,176,86,228,220,59,125,123,224,119,247,179,150,170,201,23,139,133,174,195,135,93,165,233,182,146,201,214,156,214,83,203,29,142,121,247,232,80,102,126,127,67,253,179,231,39,175,121,198,238,151,60,200,250,190,239,206,193,44,103,75,235,237,30,239,176,39,251,230,201,250,233,153,249,138,210,142,177,236,137,60,119,119,207,112,89,215,210,82,77,94,129,195,89,86,121,
+104,234,197,224,76,203,175,115,169,191,116,28,27,178,93,79,157,188,105,239,41,126,252,83,119,246,133,246,153,185,102,111,206,211,134,84,199,124,103,175,123,212,53,57,50,114,231,135,251,101,143,71,154,114,238,28,113,62,169,122,48,56,144,102,187,59,218,127,185,43,211,243,219,194,64,111,193,228,210,141,185,180,161,115,3,69,131,23,103,26,170,188,179,87,93,215,174,60,170,168,190,149,94,112,176,199,218,149,101,189,210,105,205,173,114,229,207,95,109,119,89,51,166,28,109,181,237,157,86,103,142,115,234,156,179,175,211,126,248,82,214,153,177,137,123,75,143,70,75,198,250,237,115,131,87,106,10,158,143,228,159,191,48,118,186,46,163,212,187,60,53,88,152,91,90,58,183,148,186,236,78,93,254,43,116,46,118,243,201,102,3,7,160,62,82,148,88,137,3,91,37,193,0,244,145,64,228,147,121,3,43,0,201,4,124,243,20,1,226,44,18,248,138,151,146,64,10,47,90,88,3,96,205,102,14,89,202,24,207,1,83,226,234,236,41,193,103,22,49,137,75,0,62,52,94,4,
+102,78,16,121,81,226,140,18,80,88,140,18,111,0,70,238,107,9,205,49,31,191,47,12,176,198,4,32,112,102,129,19,209,6,17,72,130,133,83,130,47,88,131,37,8,211,151,95,198,226,80,118,78,0,56,48,9,0,83,6,17,193,52,177,146,201,204,199,235,213,250,40,125,148,204,97,171,73,224,244,81,162,16,239,123,212,111,226,140,250,72,139,168,223,136,182,168,87,86,208,125,197,76,43,148,99,129,54,42,54,22,108,227,4,62,5,85,159,40,152,144,205,209,2,8,120,75,222,165,91,227,80,191,63,99,101,176,224,98,99,67,173,232,199,208,111,9,120,21,153,123,55,39,125,34,123,50,240,90,161,123,133,223,77,70,81,10,236,8,132,175,100,92,137,142,5,161,32,193,57,8,192,39,239,13,188,9,243,31,9,40,49,146,58,9,181,71,142,244,147,8,223,186,186,95,238,121,28,7,18,120,209,108,96,191,65,106,240,198,16,58,74,176,139,147,44,130,81,4,250,112,41,137,23,149,255,59,85,146,3,235,17,224,95,64,199,223,75,242,228,245,130,39,162,249,150,
+55,235,55,36,178,6,145,211,111,88,181,147,236,150,144,80,28,232,94,31,43,155,201,31,170,12,250,196,4,181,40,136,116,138,137,79,88,207,25,53,196,132,28,204,74,38,65,255,225,127,62,168,219,191,180,240,41,172,65,62,59,16,77,255,100,40,180,129,81,13,123,221,236,189,11,49,132,247,70,70,113,38,147,225,21,129,4,136,123,67,127,67,142,44,84,116,112,187,226,116,107,203,13,202,230,135,12,206,186,230,251,142,106,254,248,101,205,190,151,138,176,151,159,127,95,11,100,104,82,19,240,168,92,148,111,122,214,28,168,255,68,186,119,156,137,247,81,112,93,175,87,219,28,183,190,201,235,85,243,105,225,175,234,165,34,235,197,124,181,94,235,242,35,157,21,97,202,144,255,101,64,247,55,140,252,19,49,
+
diff --git a/uppsrc/CtrlLib/src.tpp/ColorPopUp$en-us.tpp b/uppsrc/CtrlLib/src.tpp/ColorPopUp$en-us.tpp
new file mode 100644
index 000000000..88ce72e95
--- /dev/null
+++ b/uppsrc/CtrlLib/src.tpp/ColorPopUp$en-us.tpp
@@ -0,0 +1,3168 @@
+TITLE("Color widgets")
+COMPRESSED
+120,156,188,187,215,143,115,91,150,31,246,175,92,64,1,246,
+88,35,124,223,119,239,237,123,187,27,6,4,135,39,3,182,
+97,91,79,141,129,212,30,181,172,134,103,212,141,233,25,232,
+193,144,80,85,100,49,135,98,14,197,80,204,57,20,115,102,
+49,23,201,98,206,185,152,115,206,217,167,238,55,163,7,89,
+198,64,26,216,124,56,251,236,125,246,222,103,255,248,91,235,
+183,214,170,240,171,47,223,252,253,191,255,233,31,125,250,123,
+159,254,150,207,47,254,187,223,252,203,95,255,213,159,253,229,
+159,252,234,183,223,125,247,227,47,127,253,229,251,95,254,159,
+255,195,255,244,243,95,254,209,63,249,47,126,246,221,127,9,
+108,242,25,216,228,219,31,62,127,251,227,247,223,126,254,238,
+203,207,128,203,231,111,63,127,249,254,203,183,223,125,254,241,
+203,207,191,251,241,219,111,127,252,244,139,63,253,179,95,255,
+225,15,127,242,171,63,251,242,227,143,191,252,120,243,23,96,
+209,151,31,190,255,242,249,135,239,126,252,238,199,207,223,254,
+240,227,23,96,237,151,79,159,190,124,250,225,203,247,159,191,
+251,246,199,47,223,255,226,95,252,230,15,127,250,39,191,250,
+245,143,223,254,242,143,254,151,159,1,139,190,253,120,19,176,
+249,167,207,63,251,242,221,15,223,125,249,244,237,167,47,223,
+1,175,250,252,227,143,223,125,254,225,251,31,191,253,249,207,
+126,246,139,63,253,245,239,255,242,183,191,251,215,127,253,174,
+223,126,254,252,229,243,47,255,247,207,63,252,18,56,242,191,
+251,119,255,238,31,127,254,238,211,215,19,124,7,108,246,249,
+211,119,192,81,63,3,99,159,190,251,242,195,231,239,127,254,
+233,231,223,255,248,249,199,79,223,2,155,127,255,195,167,239,
+127,241,251,95,255,197,175,255,252,63,142,252,99,143,239,255,
+86,232,63,124,250,197,111,255,242,55,192,22,127,244,95,125,
+254,252,3,176,228,103,255,232,103,127,239,243,119,63,0,64,
+127,252,246,187,239,127,252,225,19,240,242,47,95,190,124,251,
+237,151,207,223,126,249,249,207,191,124,255,179,239,127,248,197,
+191,250,205,175,255,197,111,254,226,79,126,245,127,253,179,127,
+251,15,254,251,255,241,143,255,233,255,250,205,175,254,240,237,
+47,191,249,213,63,248,244,233,143,63,125,250,230,191,253,221,
+159,253,238,47,254,231,223,253,254,175,126,255,143,254,250,254,
+175,254,240,175,126,243,23,127,221,249,111,254,234,47,255,18,
+192,255,15,255,228,87,127,248,244,203,63,250,155,69,127,244,
+205,79,20,252,179,63,249,15,55,249,167,191,255,235,169,223,
+126,243,209,126,249,229,55,255,219,191,250,237,31,190,206,254,
+230,183,127,254,251,63,251,205,159,255,230,95,255,229,31,190,
+249,253,239,126,255,207,255,248,175,126,255,205,191,249,237,191,
+254,23,191,251,55,223,252,203,223,253,197,55,127,250,177,197,
+63,255,227,63,252,230,207,126,243,167,31,223,249,63,254,186,
+193,127,253,205,63,249,39,191,253,243,95,255,31,191,249,197,
+231,207,159,62,253,195,207,223,254,252,231,55,32,254,237,226,
+246,230,6,132,185,220,0,159,157,138,49,170,116,151,196,237,
+145,53,61,179,202,177,137,96,9,45,103,46,134,227,102,99,
+180,101,134,243,188,120,9,57,250,89,143,207,10,20,1,229,
+34,251,193,46,130,22,6,230,194,192,239,124,48,254,206,7,
+78,231,95,221,102,25,105,25,77,73,72,75,76,229,44,209,
+19,44,210,229,36,54,102,117,162,243,190,65,95,62,217,131,
+67,218,225,50,144,87,74,218,13,244,144,148,109,215,116,58,
+100,44,237,230,186,36,162,239,204,148,149,12,227,210,246,74,
+152,172,122,241,253,145,133,191,186,91,83,197,217,40,123,20,
+137,175,141,87,186,207,52,142,56,13,6,52,134,202,180,92,
+83,75,196,48,112,29,95,209,47,137,235,65,135,211,35,138,
+116,91,74,183,1,109,85,239,59,78,224,234,139,74,6,208,
+244,126,58,38,173,46,39,58,1,175,71,28,92,45,21,154,
+107,16,58,135,246,107,107,123,109,5,174,117,47,244,81,227,
+79,56,97,118,121,34,157,93,117,47,74,195,66,20,151,4,
+233,44,159,93,227,124,95,190,78,183,53,43,176,243,194,169,
+113,146,244,211,43,103,83,224,137,35,199,225,245,253,52,78,
+181,91,104,238,232,242,112,182,227,16,69,15,29,56,220,56,
+162,90,27,252,80,12,211,89,215,239,83,89,49,226,112,116,
+173,64,195,171,50,83,204,165,88,155,234,196,168,125,135,168,
+22,87,121,49,21,99,109,70,71,103,125,172,202,116,161,216,
+140,102,92,41,201,138,173,34,194,120,180,75,217,215,211,125,
+41,90,77,96,183,211,106,111,117,246,61,86,174,178,98,110,
+116,32,212,50,194,92,142,125,66,92,108,215,117,168,132,99,
+79,11,213,78,143,93,115,134,177,187,196,54,134,221,231,86,
+185,154,68,182,107,127,44,232,150,90,135,154,249,154,184,178,
+174,33,109,33,118,69,75,61,217,87,122,129,87,30,182,208,
+114,156,94,3,241,255,212,29,42,191,118,253,160,175,221,86,
+238,107,55,235,250,218,69,111,229,103,94,225,184,100,57,100,
+69,0,129,252,120,61,88,3,58,209,57,11,26,245,143,3,
+241,96,40,230,14,137,122,125,226,40,124,45,166,46,195,205,
+85,107,215,63,168,22,38,131,125,122,121,185,158,247,30,118,
+126,121,42,218,15,55,75,227,16,58,100,229,166,130,204,189,
+185,226,60,206,159,107,219,221,188,188,173,94,207,209,242,249,
+96,63,98,110,175,219,110,0,58,116,178,98,87,246,182,112,
+151,43,137,16,215,147,56,25,3,30,238,112,172,28,123,26,
+57,93,39,247,85,22,35,198,102,159,71,255,30,7,11,192,
+81,188,154,91,177,143,222,184,133,182,126,12,118,214,216,252,
+211,199,132,241,114,114,26,219,120,0,244,247,175,112,228,250,
+159,208,189,210,213,95,187,123,243,250,230,167,141,236,63,141,
+30,231,239,199,73,63,118,44,106,65,211,255,40,62,167,200,
+176,185,30,230,101,246,117,120,93,54,76,211,235,52,130,108,
+58,174,97,164,10,184,162,41,129,243,240,106,6,174,87,244,
+226,227,234,71,54,85,14,103,199,55,175,65,81,71,0,109,
+162,202,200,108,207,26,224,17,27,217,5,70,115,251,121,183,
+188,29,87,25,219,115,91,13,140,58,167,190,232,188,134,180,
+155,90,232,225,87,26,254,31,231,158,125,237,226,232,95,187,
+5,211,215,174,30,253,181,251,239,191,151,139,63,107,168,210,
+41,221,220,49,192,181,143,251,211,107,132,229,16,65,184,6,
+183,16,48,247,18,193,94,130,242,237,99,99,231,122,106,14,
+85,246,40,235,216,107,142,175,76,251,214,238,140,13,71,230,
+233,185,138,239,198,206,236,179,229,120,158,28,39,31,35,253,
+99,21,24,137,217,182,192,92,150,74,219,197,154,187,234,206,
+222,206,240,101,109,206,42,102,200,90,199,68,80,125,44,135,
+172,121,232,221,243,75,61,194,92,94,154,192,4,167,105,153,
+95,214,156,27,139,30,250,159,118,254,255,23,251,44,85,167,
+145,240,242,220,76,0,254,163,219,118,98,181,151,148,7,128,
+83,224,77,197,10,120,213,147,100,217,55,37,109,173,165,197,
+9,217,155,50,123,104,197,54,142,147,35,27,184,223,111,47,
+14,0,6,47,116,6,206,179,60,231,47,203,218,118,175,238,
+58,86,221,19,48,224,129,14,236,49,59,0,96,200,174,3,
+167,94,47,242,137,229,201,97,150,239,29,196,42,35,107,155,
+66,49,217,33,107,251,8,76,112,30,105,30,250,241,162,159,
+177,49,127,23,28,255,222,207,174,63,177,116,12,172,127,98,
+41,194,170,253,196,146,80,51,251,137,37,40,223,240,193,146,
+51,216,157,240,92,35,179,51,187,153,188,111,202,91,135,107,
+84,3,72,186,43,44,107,182,0,84,219,117,116,33,49,224,
+58,69,118,98,150,115,12,12,220,6,188,234,35,235,8,240,
+114,204,121,234,145,229,176,29,0,96,157,22,249,165,244,100,
+55,201,247,85,44,226,3,150,17,51,4,96,105,161,250,237,
+153,62,116,49,254,46,56,254,70,47,218,242,177,93,175,138,
+109,247,88,223,177,152,170,62,222,216,207,49,52,32,140,152,
+214,135,240,30,176,233,224,177,56,141,92,8,149,152,223,244,
+1,8,182,81,126,48,164,116,3,87,39,112,139,59,246,62,
+6,148,2,138,125,123,102,83,236,164,173,221,211,142,157,177,
+94,229,127,26,158,247,97,25,243,159,227,55,255,33,206,235,
+87,55,58,14,191,186,81,196,249,213,141,132,245,175,110,4,
+29,243,191,18,84,238,242,82,31,120,42,155,254,7,65,41,
+231,135,23,9,11,203,125,45,240,65,77,215,17,253,32,232,
+177,179,6,156,232,13,184,133,7,116,63,1,218,178,190,2,
+194,182,191,2,202,44,191,2,34,98,191,2,202,254,53,32,
+253,121,152,98,252,221,253,167,21,70,127,37,104,185,253,74,
+208,237,227,87,130,24,145,175,4,137,177,95,9,178,18,98,
+254,23,214,177,249,58,134,126,240,163,238,118,29,91,16,112,
+231,232,1,78,211,189,179,75,0,118,0,199,209,46,222,1,
+114,212,93,115,224,171,28,100,27,95,229,32,118,248,42,7,
+158,233,87,57,88,98,190,202,193,18,245,33,7,16,204,223,
+106,71,127,155,254,29,62,186,0,53,181,15,231,1,168,185,
+124,56,15,64,13,242,195,121,0,106,38,31,206,3,80,227,
+239,56,11,93,158,45,91,255,80,131,157,220,156,153,158,95,
+154,145,243,52,15,101,13,39,199,222,44,253,33,7,174,102,
+132,123,174,253,52,82,134,216,178,229,237,13,214,162,143,217,
+143,115,27,171,246,33,7,119,250,24,169,75,0,212,160,250,
+222,140,44,47,55,0,39,167,199,252,210,198,118,209,101,128,
+22,220,252,29,112,252,13,143,51,64,219,126,146,54,64,219,
+62,164,13,12,104,219,135,180,157,0,109,251,144,182,9,160,
+109,31,210,150,26,93,141,118,172,126,43,11,20,29,17,0,
+72,102,170,253,104,166,8,227,71,195,182,175,63,154,24,179,
+115,125,238,124,152,219,243,176,227,232,10,247,114,51,105,250,
+12,60,89,98,73,89,155,10,42,223,95,152,246,247,200,114,
+15,30,106,89,42,202,7,18,213,11,64,20,36,107,99,78,
+1,34,29,215,113,150,254,159,135,227,111,236,49,242,181,91,
+202,31,134,85,214,148,141,140,109,116,34,187,241,120,176,179,
+232,64,154,246,74,239,1,154,176,98,225,55,83,93,141,126,
+22,178,209,242,25,112,72,64,223,138,74,0,156,29,75,113,
+6,232,199,42,54,220,220,3,160,34,237,231,206,210,209,93,
+0,51,166,214,163,233,131,32,20,150,2,76,96,149,89,116,
+64,18,54,215,166,69,198,202,129,62,66,81,238,195,141,62,
+248,202,33,63,100,225,39,190,64,0,95,38,237,135,225,249,
+239,255,83,245,236,63,196,189,198,125,53,60,39,253,171,225,
+157,199,95,13,143,2,249,106,120,229,210,87,195,139,252,164,
+218,60,215,135,57,177,135,71,117,228,3,86,76,141,21,2,
+77,77,141,213,39,182,231,21,208,108,79,118,35,21,64,226,
+112,168,62,26,22,60,214,1,136,11,168,177,26,192,254,0,
+94,254,86,251,203,1,246,247,174,254,207,231,233,111,116,131,
+58,108,141,135,138,253,126,239,248,200,78,89,27,104,245,107,
+130,23,31,126,77,128,222,142,95,19,160,194,227,201,208,240,
+52,35,236,243,179,225,56,203,47,99,181,227,14,104,106,162,
+227,254,163,9,16,62,6,129,0,203,2,124,109,122,60,237,
+160,64,67,99,179,134,227,201,79,243,202,17,16,16,100,111,
+135,172,215,154,10,200,12,29,174,28,189,59,188,7,148,206,
+0,253,144,135,91,189,53,118,164,1,75,106,243,229,237,255,
+175,241,213,207,83,1,153,202,85,222,29,127,180,181,227,208,
+22,253,112,171,237,192,2,144,116,94,13,29,31,86,87,206,
+237,167,31,176,170,221,231,37,224,87,64,211,201,57,2,67,
+91,214,182,221,0,238,116,0,124,40,147,67,102,109,236,152,
+122,216,217,31,110,245,177,99,232,22,48,195,233,123,100,190,
+188,64,0,121,201,205,170,208,255,47,112,85,155,149,34,246,
+194,66,112,175,23,200,121,119,204,189,130,233,190,179,29,160,
+142,211,110,95,5,192,230,172,68,117,149,187,98,134,175,169,
+161,243,98,127,90,23,41,78,93,245,234,127,180,31,36,219,
+74,120,229,116,22,231,160,220,48,118,80,145,174,141,24,167,
+63,170,30,5,184,233,69,97,56,159,157,213,213,128,221,117,
+178,77,206,78,255,60,189,154,139,83,249,249,166,196,12,231,
+10,86,237,88,91,30,42,69,169,246,204,100,31,109,40,145,
+205,226,250,172,207,151,59,218,112,107,181,160,161,149,32,151,
+32,149,179,174,44,148,236,176,84,204,207,36,25,37,41,28,
+18,164,45,68,4,133,91,158,20,107,219,96,75,168,132,123,
+5,100,171,151,197,205,21,233,200,122,121,114,119,139,140,109,
+21,74,151,37,155,45,135,195,74,166,207,151,115,223,13,39,
+230,168,222,58,164,211,230,224,72,196,44,20,85,8,27,130,
+242,249,57,215,19,243,135,45,175,94,215,162,235,24,171,249,
+78,121,185,156,114,83,149,76,20,200,76,51,237,193,104,165,
+55,6,172,197,98,89,161,80,206,133,194,92,147,39,115,152,
+171,153,210,80,42,153,131,51,25,179,84,90,110,251,219,202,
+100,50,55,127,238,202,196,175,153,248,123,232,28,94,182,91,
+38,141,38,95,166,209,148,58,93,110,140,164,40,91,173,220,
+50,208,85,130,193,185,147,173,37,83,70,73,204,49,98,142,
+90,249,188,38,183,27,86,198,178,128,166,92,219,78,204,147,
+242,188,18,179,180,23,219,109,197,62,28,88,78,133,245,197,
+118,28,174,250,185,121,83,217,244,64,43,80,140,105,83,24,
+47,207,23,243,48,87,85,230,142,83,235,101,94,68,230,174,
+39,40,37,91,115,172,132,236,98,100,221,220,90,115,215,153,
+116,158,246,51,171,35,119,73,97,217,89,65,206,158,95,149,
+59,204,144,183,54,59,24,136,104,243,14,184,186,171,6,129,
+140,156,110,53,102,40,47,54,235,99,241,56,118,205,233,145,
+40,33,248,212,215,89,208,16,81,85,53,77,247,25,69,197,
+18,211,244,72,18,166,140,84,32,74,246,211,98,198,66,98,
+94,158,43,18,130,57,35,72,138,242,35,34,28,199,24,14,
+163,144,57,98,127,31,117,212,204,150,193,77,185,48,87,170,
+172,20,13,133,137,68,70,247,123,81,183,204,88,118,252,102,
+140,125,204,160,47,162,111,81,83,32,192,108,54,163,76,28,
+174,59,83,47,103,230,184,89,253,62,154,110,155,155,181,249,
+120,96,84,2,149,104,52,10,20,114,78,173,34,82,40,14,
+70,55,147,141,65,111,126,164,211,24,235,117,180,88,236,178,
+214,122,173,38,89,72,60,215,229,178,37,153,104,194,153,203,
+221,58,71,235,116,214,104,143,195,183,232,102,215,233,88,82,
+41,166,36,32,137,18,137,221,36,222,67,240,204,133,124,19,
+123,228,88,251,253,22,30,207,199,140,177,76,60,46,3,85,
+175,71,227,241,238,172,175,214,170,227,251,46,230,184,236,68,
+186,235,97,52,34,203,49,41,74,115,140,196,222,178,28,99,
+219,230,252,182,223,169,151,67,85,151,121,220,152,157,215,242,
+217,60,164,44,207,91,102,204,185,187,79,201,134,20,167,189,
+207,46,21,183,198,83,146,94,125,117,151,246,170,124,212,167,
+10,207,47,12,129,67,238,195,64,78,215,52,138,57,206,103,
+238,171,21,123,62,131,173,128,20,121,253,29,179,185,235,149,
+241,86,225,188,206,168,178,106,47,42,138,250,76,98,76,145,
+229,213,217,88,236,30,93,170,97,116,26,101,179,53,29,117,
+129,145,213,202,60,141,57,53,130,1,17,130,117,157,5,5,
+97,66,171,211,56,192,140,89,209,108,122,56,9,19,41,61,
+128,38,251,113,49,159,177,48,55,207,21,78,134,96,230,39,
+161,222,134,251,1,14,48,131,129,172,230,176,123,204,237,203,
+51,200,50,200,23,230,114,213,198,74,38,51,144,72,12,115,
+191,15,148,25,205,141,57,251,108,31,83,233,11,234,91,212,
+226,7,152,217,52,49,137,68,96,166,110,53,123,175,207,234,
+247,119,251,156,113,62,99,170,213,83,32,134,229,201,194,137,
+102,161,223,155,110,117,250,23,115,177,200,136,68,48,115,191,
+63,112,182,243,148,230,104,34,213,20,75,23,249,116,214,18,
+10,51,5,1,1,166,209,8,36,112,87,158,58,142,99,79,
+95,111,35,235,86,215,170,209,178,152,253,62,38,157,14,96,
+66,136,230,126,25,104,108,185,205,130,54,144,18,53,49,84,
+106,32,77,108,142,131,132,0,47,128,129,218,176,76,14,7,
+243,254,206,15,188,63,241,158,94,230,211,165,176,121,88,7,
+72,3,25,38,76,97,116,163,94,115,148,185,96,88,59,39,
+211,41,63,95,231,48,131,243,145,193,190,78,242,87,115,106,
+126,57,98,140,245,218,102,215,86,120,31,217,23,32,234,95,
+183,107,58,163,26,245,90,37,59,181,19,100,93,168,181,55,
+35,54,165,169,93,140,148,75,63,203,114,74,128,237,83,69,
+62,119,123,174,228,9,57,168,10,170,158,82,125,71,255,243,
+244,238,40,42,205,124,242,205,91,115,155,231,58,74,174,192,
+105,148,38,54,2,244,42,165,89,174,72,170,213,67,109,84,
+51,156,225,53,149,217,86,182,94,67,244,202,64,79,45,201,
+55,218,194,68,83,42,160,253,86,215,123,110,56,28,91,152,
+21,153,158,63,29,229,245,116,107,81,62,206,73,70,136,251,
+10,75,105,84,169,74,109,141,196,154,30,80,94,71,13,201,
+115,133,175,209,162,42,110,177,14,9,222,56,106,60,135,101,
+80,171,26,84,120,69,129,66,25,35,145,214,141,217,124,28,
+201,207,141,142,223,161,111,179,25,123,93,236,45,31,8,140,
+167,60,222,6,135,59,198,225,15,231,89,220,161,126,119,78,
+167,198,237,186,112,116,28,70,149,202,38,26,61,29,3,80,
+187,34,82,197,21,7,211,137,193,168,15,22,30,233,163,245,
+122,51,47,22,143,107,189,93,234,10,85,19,117,149,76,235,
+164,16,243,72,228,216,231,247,109,238,238,142,85,86,217,46,
+10,176,72,237,88,237,85,45,18,20,106,182,130,90,36,42,
+177,157,70,155,72,88,108,54,199,115,255,124,67,165,30,91,
+252,230,121,222,60,238,76,231,115,221,115,60,31,55,79,142,
+167,99,197,186,185,185,25,30,209,143,155,97,110,212,201,41,
+243,170,170,142,29,183,118,157,235,208,101,180,165,158,227,156,
+227,229,252,184,177,31,199,236,115,167,86,51,167,46,213,227,
+198,105,172,25,174,71,231,241,84,87,68,31,47,52,121,238,
+60,191,192,95,174,16,228,251,120,118,146,34,216,109,111,179,
+187,60,225,17,170,152,118,118,180,141,100,10,119,78,144,175,
+193,65,34,253,78,120,11,125,156,43,196,76,168,117,102,162,
+60,4,118,38,13,140,199,99,152,108,24,15,193,164,67,130,
+64,203,93,231,22,234,33,63,95,73,53,184,58,135,117,77,
+125,187,242,93,54,150,125,78,221,98,137,188,29,137,62,157,
+190,59,153,70,127,89,168,171,53,2,243,201,73,50,52,32,
+131,190,142,161,244,38,124,116,37,122,90,234,232,96,223,68,
+68,218,190,222,128,230,162,31,253,205,148,108,76,151,146,34,
+18,157,132,24,54,172,215,143,111,29,194,107,104,140,135,71,
+228,6,5,220,107,208,235,31,227,79,61,2,108,116,114,140,
+49,235,140,65,211,40,21,225,26,133,178,72,38,143,166,203,
+165,161,80,40,189,193,81,227,67,209,160,111,95,31,169,106,
+52,182,228,127,246,143,120,60,67,189,222,45,197,31,198,239,
+47,254,105,179,112,56,140,236,246,166,129,197,42,229,40,10,
+172,54,149,173,78,134,67,167,86,175,203,211,233,35,44,26,
+109,56,28,74,21,44,83,33,244,103,51,109,167,76,174,35,
+81,74,161,151,240,88,32,48,40,115,187,108,190,23,142,25,
+219,211,78,81,163,29,211,104,60,195,106,85,26,72,21,74,
+129,143,76,108,53,103,212,17,28,110,216,237,74,248,50,67,
+97,41,146,105,151,62,18,166,190,135,150,24,44,155,186,226,
+156,34,149,8,13,16,132,172,103,123,105,211,132,140,139,250,
+218,163,74,53,110,248,74,216,130,214,64,16,141,3,75,108,
+17,195,212,140,107,142,105,201,154,219,20,186,90,3,211,58,
+158,218,187,131,227,113,252,152,203,38,107,128,46,122,138,236,
+233,144,129,220,121,216,165,105,165,97,228,228,247,84,118,194,
+219,136,221,109,132,77,179,108,117,98,130,64,247,105,83,25,
+53,13,207,117,100,122,96,56,227,194,69,186,210,92,10,18,
+89,231,247,22,172,8,58,59,80,235,162,192,252,112,39,18,
+61,204,7,100,81,119,222,208,192,3,185,25,17,59,13,222,
+155,228,110,23,220,145,34,215,101,230,141,244,121,17,64,199,
+116,121,137,143,60,93,229,39,39,231,116,163,186,86,107,77,
+236,53,6,143,88,151,160,97,109,26,214,211,35,89,32,190,
+13,116,69,52,68,86,85,78,51,125,121,81,177,6,2,171,
+52,145,207,12,56,178,80,59,35,85,32,104,247,25,165,49,
+212,202,202,36,105,41,46,239,107,112,100,175,173,74,73,171,
+217,163,50,79,234,197,62,203,204,100,134,33,196,122,31,40,
+88,76,189,74,94,125,140,198,74,221,142,92,187,213,102,251,
+253,97,154,8,94,47,146,22,199,132,57,121,212,98,48,69,
+40,148,166,240,120,178,46,151,236,140,237,142,167,198,205,122,
+87,56,30,228,149,74,118,30,141,14,3,80,189,34,16,41,
+22,7,227,137,225,221,160,7,60,83,190,14,172,179,197,226,
+112,173,135,234,165,161,98,162,174,152,200,180,100,114,17,137,
+164,41,124,190,236,221,221,112,81,101,233,141,57,58,211,49,
+142,188,233,132,162,82,43,149,82,72,36,89,126,139,47,131,
+54,207,155,55,209,97,37,209,27,178,116,42,115,124,94,120,
+233,56,88,29,141,212,58,118,239,101,52,252,185,106,237,218,
+15,203,192,97,72,206,212,182,181,65,183,187,94,235,185,85,
+211,187,253,152,61,76,23,252,117,47,49,116,213,64,217,243,
+81,113,220,218,138,206,227,219,33,17,184,102,183,85,173,227,
+108,224,100,100,195,242,244,16,200,25,55,129,99,231,209,102,
+219,211,167,135,134,167,84,223,85,30,28,88,79,21,241,186,
+179,249,110,49,152,169,253,197,72,51,145,161,113,130,207,148,
+65,104,73,35,83,14,180,68,155,226,78,20,114,108,74,223,
+135,217,118,211,155,167,205,41,119,88,174,246,188,204,242,154,
+5,180,50,221,227,243,201,203,121,255,62,195,32,16,222,223,
+232,81,248,220,173,64,52,135,187,236,173,103,36,101,196,95,
+2,72,123,222,114,154,188,76,223,118,158,248,221,118,188,91,
+34,137,87,227,22,143,220,118,219,169,90,78,222,209,250,6,
+45,13,21,77,6,185,120,220,92,105,101,65,102,49,195,66,
+94,221,211,145,69,250,34,55,89,32,134,10,72,119,29,23,
+86,12,21,67,178,36,205,197,229,239,189,13,228,107,171,80,
+106,107,213,40,159,88,55,219,238,201,153,76,56,132,96,180,
+247,5,141,174,85,152,148,117,111,177,82,167,83,149,107,181,
+100,26,45,76,72,19,219,139,164,230,217,84,167,177,141,40,
+76,113,231,247,203,61,30,178,235,226,10,191,220,8,156,53,
+107,50,215,237,143,245,43,212,182,100,177,200,153,204,38,121,
+179,9,15,101,2,172,192,151,76,183,250,35,163,46,157,43,
+13,6,114,148,94,79,30,12,194,109,172,64,96,43,39,179,
+157,149,68,242,60,51,147,221,175,238,176,235,86,160,138,89,
+241,132,102,48,164,105,161,90,249,100,82,174,170,26,242,120,
+130,34,198,46,253,212,176,10,172,137,67,239,245,230,185,92,
+175,60,198,202,179,236,26,15,248,190,224,246,40,92,97,23,
+249,184,149,111,39,182,252,164,162,217,29,75,200,211,73,78,
+81,149,148,144,178,154,97,110,154,247,206,228,98,108,36,131,
+160,61,133,195,65,86,57,212,142,211,134,214,230,97,229,41,
+192,103,247,199,49,178,152,203,14,108,125,118,110,15,248,236,
+104,59,243,183,40,187,45,108,195,240,100,2,151,60,225,230,
+188,93,206,215,60,6,202,111,124,142,205,108,112,81,114,198,
+23,62,118,17,51,14,149,66,9,213,75,104,217,58,108,42,
+130,157,217,242,112,249,178,158,148,167,160,107,244,230,4,173,
+59,33,215,34,124,23,107,30,228,74,178,234,189,136,63,101,
+103,238,204,141,12,117,242,153,52,124,215,61,45,26,156,55,
+252,240,212,128,81,123,161,25,45,140,116,115,200,187,110,104,
+207,1,4,118,92,203,215,95,172,74,197,126,163,159,28,187,
+47,141,10,182,144,166,23,90,154,199,51,186,3,114,201,115,
+143,173,181,69,155,29,86,243,51,245,80,215,209,23,229,228,
+36,141,20,210,186,235,53,114,56,50,28,118,104,149,55,57,
+142,234,107,104,95,94,91,213,146,86,139,186,41,124,4,214,
+142,3,90,179,105,26,213,170,129,175,82,208,40,148,8,114,
+131,236,152,205,203,145,220,187,239,248,109,246,49,107,206,0,
+2,43,53,16,40,68,154,205,14,14,183,36,204,212,251,222,
+171,77,125,121,239,204,223,206,231,206,188,90,93,198,176,102,
+153,49,92,46,244,39,61,117,215,168,167,149,74,145,72,32,
+210,17,10,151,30,80,192,236,168,150,75,67,37,78,105,200,
+101,104,50,41,251,173,221,238,36,147,75,214,252,217,44,126,
+45,231,55,189,104,204,216,237,208,175,90,109,132,70,235,172,
+94,87,203,129,212,44,240,201,24,196,86,103,246,6,247,195,
+59,187,221,178,204,0,155,133,126,6,173,127,185,158,242,167,
+30,110,95,127,245,44,123,98,179,41,255,194,160,246,48,48,
+117,45,99,235,59,46,149,211,218,40,221,47,218,203,123,100,
+176,163,237,190,137,162,212,173,243,156,61,205,158,10,170,64,
+224,228,163,116,98,59,167,254,186,194,237,115,118,167,193,185,
+38,23,100,229,225,184,186,194,246,198,25,172,113,121,109,108,
+75,132,231,38,239,180,35,57,52,14,140,157,50,23,56,81,
+24,112,99,6,98,156,151,119,132,185,137,0,91,94,36,38,
+234,109,216,108,106,37,97,206,100,89,117,243,112,69,3,98,
+149,213,134,38,70,222,19,242,214,174,50,121,60,76,78,153,
+118,116,49,231,101,154,155,73,166,149,105,129,23,238,93,132,
+60,127,196,150,220,229,77,25,228,164,230,4,51,110,41,64,
+186,87,202,102,155,4,104,89,100,36,154,46,62,46,16,49,
+141,92,252,219,71,199,234,29,75,200,179,65,108,183,158,137,
+9,43,118,231,114,88,85,173,48,35,10,26,202,79,136,184,
+222,147,195,136,133,201,13,202,244,227,17,85,199,165,19,138,
+227,164,228,109,16,18,4,57,234,96,59,44,92,175,9,111,
+29,60,44,20,105,60,7,249,26,138,66,65,163,250,249,68,
+28,29,124,71,96,79,139,179,138,94,161,122,36,147,171,111,
+72,164,240,254,62,69,56,217,250,155,172,78,235,111,210,89,
+134,72,132,182,19,138,0,166,133,207,209,231,84,79,220,223,
+229,95,116,64,49,200,208,205,253,59,225,229,146,170,177,107,
+18,81,32,93,25,15,230,3,205,122,69,45,150,88,17,133,
+66,72,38,167,88,41,130,228,57,145,174,109,166,82,153,54,
+147,166,30,165,178,8,137,36,92,236,22,169,2,77,194,247,
+178,189,109,58,2,241,118,239,191,23,218,108,169,40,134,33,
+145,133,137,180,126,136,17,51,10,132,244,100,242,253,45,24,
+20,98,2,196,241,195,59,2,107,244,249,183,116,46,47,130,
+195,9,231,48,88,106,103,234,215,29,158,212,249,40,124,122,
+226,167,222,159,36,79,47,43,32,255,237,31,214,169,204,84,
+38,12,83,222,186,49,210,99,148,109,96,154,234,195,195,166,
+148,50,214,168,47,167,211,91,237,84,63,8,86,169,84,128,
+77,187,180,207,195,84,105,74,179,97,53,254,165,240,106,26,
+218,107,149,153,243,125,86,34,236,58,231,147,29,89,211,78,
+252,20,32,207,37,98,48,187,198,76,193,64,30,253,146,25,
+3,237,190,223,237,202,23,140,76,98,90,147,239,175,167,114,
+171,33,222,208,238,164,51,35,198,121,139,54,229,16,79,24,
+24,120,203,51,97,57,32,24,140,230,127,165,186,133,242,7,
+13,250,161,0,150,83,159,118,112,151,12,134,23,188,179,64,
+47,184,73,8,252,240,228,25,155,39,210,88,93,229,215,163,
+203,25,80,93,115,75,121,51,13,11,126,137,12,83,152,231,
+131,112,144,114,4,218,120,208,102,228,102,91,63,34,21,228,
+235,222,234,176,171,112,246,221,214,160,239,232,164,84,212,193,
+158,16,105,149,3,189,31,141,230,249,229,205,180,12,45,37,
+37,234,18,157,148,232,55,151,173,38,199,132,24,68,37,19,
+146,132,220,128,240,250,37,122,61,207,67,189,119,239,121,47,
+239,173,37,90,182,149,249,73,164,102,18,95,158,207,19,38,
+245,59,3,205,54,70,35,180,110,183,134,78,165,252,18,73,
+147,208,226,207,27,110,147,65,221,97,48,245,24,20,245,10,
+133,162,65,32,255,173,238,150,135,237,142,134,90,222,102,67,
+63,30,80,21,127,197,31,141,54,143,86,246,179,34,146,79,
+54,128,122,212,96,208,211,128,122,20,181,94,251,139,197,38,
+80,143,62,75,67,249,132,186,46,87,25,201,100,250,22,137,
+68,151,149,207,106,99,156,202,158,190,69,244,214,78,139,170,
+213,160,104,6,154,95,167,107,34,41,71,127,171,213,92,118,
+253,99,175,183,169,237,250,69,142,24,250,249,217,47,22,63,
+54,9,34,63,12,214,196,228,169,115,23,168,249,218,135,61,
+139,95,119,91,101,105,190,25,55,129,156,147,60,204,161,114,
+74,170,10,92,209,176,156,83,219,217,94,220,157,76,243,87,
+220,186,9,144,239,60,132,186,187,99,237,209,121,78,139,118,
+165,26,253,122,30,206,155,0,251,215,113,77,102,83,27,38,
+145,107,222,153,189,204,194,133,253,246,125,182,129,70,175,8,
+66,252,56,31,57,29,118,148,216,211,157,191,97,69,119,220,
+217,196,161,244,191,24,123,144,11,124,22,243,71,88,171,114,
+212,197,116,131,73,228,39,241,157,75,15,123,239,191,244,180,
+44,93,189,87,167,176,54,92,20,20,173,230,128,177,79,39,
+134,164,158,130,177,93,59,155,217,77,198,25,238,160,167,55,
+27,177,225,162,187,125,119,48,28,119,199,116,33,52,96,233,
+44,0,42,21,177,229,180,167,6,115,106,137,39,133,169,231,
+49,67,221,81,243,12,101,2,231,202,23,211,198,189,145,200,
+103,214,247,11,212,127,61,145,142,118,143,10,176,1,58,96,
+4,241,33,218,114,207,116,201,244,163,17,213,171,163,131,138,
+227,184,36,141,10,9,92,28,245,43,165,13,89,175,65,111,
+29,220,67,8,141,135,187,248,66,141,252,195,241,159,158,136,
+128,227,131,216,211,124,190,162,151,203,169,100,59,5,141,68,
+66,238,239,69,158,147,173,62,137,170,81,214,33,149,246,252,
+22,121,161,9,69,104,2,1,194,156,207,61,61,113,189,117,
+235,85,219,70,84,186,230,6,133,162,238,108,158,171,211,201,
+49,230,226,169,38,168,55,49,172,54,116,139,218,130,26,143,
+33,217,236,201,19,70,114,36,193,248,56,223,19,171,140,233,
+204,140,54,24,160,50,25,200,60,20,242,236,205,28,249,237,
+91,60,217,16,43,13,55,68,18,13,129,64,237,253,123,72,
+185,236,217,24,24,28,109,234,129,53,121,29,69,244,124,62,
+21,143,231,163,24,24,14,199,245,48,98,79,97,72,173,215,
+43,164,114,185,168,24,139,74,5,98,58,248,158,230,142,123,
+208,28,14,228,184,229,163,182,83,250,164,102,144,149,77,117,
+211,38,50,155,182,17,245,164,192,99,158,44,33,41,17,58,
+128,189,123,196,48,158,25,166,247,199,221,64,230,153,94,167,
+200,93,139,0,180,67,209,110,173,66,79,237,109,213,44,84,
+180,25,207,32,127,225,56,73,94,33,215,249,118,118,166,156,
+54,239,190,80,206,116,122,160,96,143,141,83,144,97,134,105,
+83,23,19,21,86,131,154,214,27,240,101,110,242,185,224,76,
+10,236,205,27,103,225,221,136,135,34,4,154,113,195,100,158,
+29,143,165,63,112,185,32,172,117,206,127,199,198,32,15,102,
+212,235,203,179,55,202,93,208,113,201,37,172,252,210,194,179,
+40,242,6,252,6,75,243,150,96,179,215,187,217,26,140,144,
+204,94,224,113,189,155,104,120,224,123,158,110,183,197,55,83,
+251,214,73,202,33,71,179,117,131,59,35,167,77,240,110,34,
+143,117,115,14,36,249,241,189,120,127,246,28,227,231,209,116,
+117,225,59,87,141,74,33,61,166,87,69,169,161,254,144,65,
+163,237,126,94,78,166,95,75,73,85,73,90,182,34,30,204,
+101,167,67,73,161,4,87,73,73,149,251,152,64,122,15,122,
+189,61,231,233,221,187,237,47,79,215,238,114,45,147,29,72,
+24,210,121,161,185,244,131,87,167,250,137,205,206,197,8,145,
+62,144,247,106,181,214,67,191,127,110,241,47,15,13,55,176,
+11,251,241,154,194,162,122,80,232,250,205,227,57,184,92,118,
+236,85,52,157,230,182,235,254,233,120,88,85,42,7,165,73,
+121,14,64,29,246,138,168,150,21,78,251,9,35,222,56,124,
+124,92,163,209,205,131,197,114,30,43,28,115,75,177,150,17,
+168,196,177,56,133,50,12,135,215,32,159,239,160,204,213,242,
+87,113,44,150,235,182,251,173,229,98,85,40,28,80,48,212,
+185,72,119,232,51,34,54,158,27,11,37,151,126,211,1,12,
+62,159,108,239,14,101,148,205,84,96,83,168,180,243,34,191,
+174,48,175,215,25,199,161,75,163,216,12,185,115,27,187,78,
+187,152,75,86,97,119,110,157,213,88,108,58,148,205,157,187,
+196,117,194,184,140,211,146,243,115,243,224,89,66,215,80,76,
+207,121,178,36,157,93,236,133,16,171,173,156,103,197,37,231,
+156,38,175,167,238,65,37,55,192,129,236,206,87,220,14,115,
+123,195,228,124,243,226,141,205,182,72,240,9,61,44,65,231,
+75,211,41,182,4,190,251,242,250,126,26,138,236,238,93,78,
+134,241,153,59,19,177,182,248,135,24,3,114,44,236,226,55,
+183,234,134,77,26,240,234,145,172,52,79,67,75,140,65,176,
+137,251,77,213,216,247,97,76,119,89,220,240,143,112,198,123,
+83,193,27,121,231,77,112,115,25,172,141,226,101,97,84,189,
+55,252,250,32,240,240,25,49,226,24,22,111,38,32,110,93,
+103,247,20,56,243,238,34,247,166,174,143,249,56,49,231,222,
+167,119,236,119,100,238,237,222,20,125,217,48,200,9,143,250,
+138,110,82,226,171,235,221,24,26,183,157,219,219,29,171,118,
+152,79,76,163,65,68,148,25,24,122,134,21,29,29,85,100,
+37,146,180,69,144,20,197,173,189,214,162,114,176,68,165,194,
+84,80,96,129,123,25,34,242,48,155,93,161,234,60,2,98,
+125,119,139,97,199,114,10,229,32,155,173,174,194,97,139,64,
+80,1,53,184,147,75,213,104,188,138,30,153,153,200,91,175,
+41,20,173,83,41,11,28,3,175,236,76,147,209,27,223,104,
+145,62,210,18,232,59,116,31,2,93,131,64,77,203,229,82,
+169,177,149,103,99,46,151,226,13,7,240,228,122,51,176,88,
+86,128,26,88,178,217,202,114,171,85,74,130,185,248,147,83,
+166,202,101,50,253,129,109,176,202,100,44,161,16,163,178,55,
+43,229,111,57,124,146,43,83,102,73,164,121,31,129,88,237,
+247,22,92,185,92,217,24,148,218,104,138,130,227,132,195,41,
+129,125,199,9,71,179,118,252,85,25,126,75,219,143,62,225,
+241,144,166,60,202,68,72,76,214,231,31,112,109,220,85,189,
+110,129,98,29,235,237,116,120,7,90,79,111,111,45,55,55,
+21,197,172,100,185,94,153,108,246,50,154,203,109,231,220,137,
+98,84,168,72,82,150,38,41,176,130,98,135,24,134,34,126,
+222,11,38,49,214,184,34,98,247,54,163,184,245,60,200,89,
+216,215,242,176,75,210,75,140,231,21,69,113,158,123,32,53,
+174,238,4,117,59,60,160,115,17,118,134,108,177,220,86,149,
+120,23,173,87,5,229,148,29,113,115,45,35,94,40,138,163,
+137,112,123,124,190,129,5,95,122,8,86,231,230,201,70,193,
+249,118,201,20,66,28,242,230,184,134,25,110,174,216,21,111,
+119,140,137,109,232,209,222,242,213,40,94,29,5,39,188,250,
+24,254,6,3,79,121,8,152,80,224,12,31,54,211,162,92,
+218,231,134,96,231,177,96,76,247,141,12,12,158,125,10,33,
+69,22,47,140,250,48,113,123,144,110,198,24,246,220,100,17,
+182,180,155,210,108,239,217,147,236,155,176,154,5,218,19,197,
+111,129,250,14,98,57,135,243,59,212,128,25,191,144,22,83,
+192,155,195,42,100,21,72,16,251,70,195,90,71,71,103,21,
+89,41,49,93,20,36,101,241,30,179,189,24,31,44,89,33,
+41,21,18,20,225,94,89,25,223,207,101,117,40,222,138,132,
+208,223,221,146,99,129,156,82,57,0,70,166,225,112,81,32,
+24,55,92,220,77,221,101,53,138,106,76,102,38,250,214,19,
+105,69,250,84,170,24,12,66,199,59,211,102,244,102,197,91,
+164,76,90,2,131,133,13,161,80,61,8,84,60,177,98,165,
+154,106,60,222,102,54,171,158,213,170,199,50,153,69,12,102,
+124,220,90,13,250,76,41,201,5,143,7,73,131,97,240,168,
+161,235,214,235,98,177,200,24,175,245,6,105,168,180,72,112,
+20,170,28,153,60,25,32,145,250,178,210,48,87,199,75,241,
+167,72,120,155,234,180,122,90,141,14,75,163,21,87,43,32,
+207,148,26,4,190,71,34,191,221,158,233,224,240,226,14,182,
+27,151,25,6,161,159,248,72,18,0,5,253,35,30,199,65,
+35,83,142,157,231,201,126,173,1,243,192,104,84,26,2,238,
+77,173,213,116,213,169,180,31,108,153,227,94,179,113,223,215,
+198,5,109,145,32,210,115,3,216,1,150,153,188,168,206,250,
+77,88,165,63,74,54,61,231,37,111,109,30,161,155,156,51,
+121,57,157,187,69,149,92,98,239,219,68,147,177,53,124,220,
+246,189,163,192,42,0,43,178,209,175,170,89,235,129,213,98,
+123,188,125,155,229,134,58,171,217,108,16,168,145,58,119,222,
+184,110,97,7,194,205,187,8,134,246,80,67,80,108,114,110,
+66,226,40,123,88,135,107,96,204,217,25,152,42,160,21,242,
+73,58,206,51,129,81,181,113,186,156,62,44,200,123,77,179,
+2,11,34,190,139,19,218,176,45,1,95,245,4,162,97,249,
+144,32,215,70,160,220,240,60,92,6,252,38,100,75,241,46,
+160,185,219,226,165,63,140,189,124,63,13,171,216,181,2,84,
+46,136,163,4,131,110,103,73,200,203,156,96,24,170,151,59,
+247,234,214,159,138,67,216,160,205,131,174,230,178,235,31,17,
+88,181,131,105,73,146,177,250,75,89,228,8,12,129,168,65,
+247,139,20,89,113,154,46,72,182,121,113,219,155,50,39,79,
+168,134,45,13,58,205,197,227,144,122,46,174,51,198,71,60,
+106,58,39,206,91,61,244,118,167,200,64,106,234,180,125,90,
+155,188,112,87,76,202,149,3,160,94,208,45,151,244,66,33,
+2,122,67,117,14,69,173,30,43,160,49,210,111,111,189,163,
+223,175,227,241,232,56,12,46,50,83,119,122,175,101,173,250,
+169,62,215,157,3,103,186,195,17,137,97,143,66,107,41,149,
+17,244,167,189,184,206,56,44,22,169,58,133,130,222,233,68,
+48,41,130,144,227,74,213,156,42,137,34,147,78,247,142,82,
+169,142,68,162,47,76,139,72,129,38,228,123,249,169,178,92,
+34,77,18,71,196,222,98,169,55,155,121,244,209,40,146,37,
+11,203,60,15,129,44,220,207,163,110,2,67,30,12,37,81,
+51,19,29,12,142,156,92,54,161,50,74,32,240,68,112,84,
+218,118,145,239,113,171,87,96,30,28,109,204,128,193,189,187,
+59,221,98,59,29,76,106,217,114,192,38,49,95,42,75,160,
+78,236,44,218,145,123,228,45,93,219,213,137,98,131,54,134,
+149,97,88,248,251,241,97,24,113,156,233,149,185,85,207,190,
+202,11,207,126,207,82,182,213,59,175,30,179,95,54,244,79,
+15,54,73,233,56,41,94,64,13,248,244,169,46,98,141,67,
+46,27,150,197,242,151,201,112,47,203,247,38,240,122,107,62,
+162,147,59,109,62,7,43,94,112,61,113,14,128,239,235,117,
+34,203,87,104,206,241,220,36,142,96,5,153,220,94,202,123,
+1,118,143,31,190,244,95,146,14,36,190,132,75,162,41,249,
+243,238,249,38,93,231,115,208,156,49,190,159,122,93,179,61,
+135,187,36,5,183,52,32,116,156,100,246,129,43,245,35,37,
+85,57,47,233,187,109,145,240,186,247,104,15,39,14,104,121,
+13,67,4,166,125,242,67,196,48,40,203,58,135,237,96,146,
+220,217,116,247,238,68,42,134,99,234,185,110,67,40,60,130,
+94,180,209,4,179,211,80,206,234,246,132,125,105,89,57,123,
+40,151,12,117,134,15,93,187,147,94,155,70,133,217,180,148,
+228,46,2,73,4,113,96,190,148,237,14,37,57,152,110,36,
+37,69,110,2,233,179,12,112,175,118,131,176,19,162,234,227,
+98,50,44,221,56,57,14,235,140,93,227,226,86,171,89,149,
+66,210,162,80,50,72,228,96,143,217,175,203,140,67,199,207,
+176,219,21,44,122,50,182,136,74,69,194,116,179,105,29,60,
+63,175,95,97,135,135,93,222,174,227,179,24,244,244,114,55,
+184,92,214,147,26,219,98,204,85,42,1,197,100,144,220,110,
+164,45,171,37,61,30,15,178,166,236,122,169,181,72,130,181,
+74,94,172,84,229,114,203,140,100,56,72,103,50,205,129,84,
+186,246,221,91,112,182,114,165,40,85,42,25,217,165,121,224,
+118,175,27,174,91,139,42,198,36,4,120,209,104,182,219,145,
+58,83,169,140,68,50,160,92,84,233,96,112,208,141,77,51,
+112,56,208,164,59,49,182,180,217,204,36,182,137,193,235,235,
+186,25,56,14,102,179,181,7,58,152,199,227,235,153,250,80,
+221,216,215,76,235,160,100,164,101,140,19,177,170,146,194,212,
+204,92,199,42,120,158,94,108,135,55,218,26,110,32,12,120,
+129,12,20,179,149,108,167,185,105,73,116,172,218,75,231,121,
+96,176,195,58,211,206,163,242,192,140,24,51,215,229,245,0,
+169,71,38,17,103,97,152,188,238,72,138,54,147,47,24,121,
+23,44,254,56,192,73,226,108,78,120,212,220,227,87,253,119,
+108,86,5,40,80,111,88,85,79,249,6,214,96,63,9,25,
+137,20,118,206,135,224,224,176,120,208,85,134,52,150,184,89,
+28,28,165,225,165,15,119,101,40,37,242,58,246,233,138,162,
+228,241,193,229,73,116,30,52,1,156,30,3,151,75,90,49,
+238,145,117,95,8,191,86,93,6,182,174,128,210,120,95,137,
+79,154,20,4,101,78,146,94,111,82,188,53,72,181,122,37,
+26,158,130,96,12,13,158,205,122,75,184,174,23,37,68,226,
+94,154,38,79,253,233,122,83,130,201,183,239,126,196,77,29,
+178,186,196,253,85,72,135,145,22,113,46,166,187,245,249,97,
+114,107,219,137,178,213,219,217,180,187,148,149,194,170,42,83,
+25,81,72,136,33,146,219,200,193,135,51,195,161,148,70,123,
+19,144,164,124,60,137,148,151,227,225,233,33,127,40,133,36,
+224,247,82,230,237,139,175,43,203,230,242,25,153,76,218,110,
+103,128,146,115,48,79,232,213,219,39,58,59,23,137,72,118,
+157,110,38,149,146,74,48,146,76,139,63,104,184,189,122,135,
+146,254,152,66,99,49,82,32,171,246,120,142,82,151,43,243,
+114,131,152,230,84,131,97,106,189,113,73,15,135,116,165,34,
+157,71,163,153,0,84,106,199,84,50,69,233,160,159,0,235,
+141,50,250,99,6,237,71,75,45,150,204,88,209,148,10,253,
+153,140,64,122,150,167,73,20,89,40,68,77,11,4,210,70,
+35,51,73,224,164,79,47,36,246,86,21,138,100,218,45,113,
+83,163,73,211,104,82,29,76,151,1,44,74,224,195,146,136,
+252,198,44,13,247,195,165,187,93,166,204,120,2,246,33,145,
+4,7,220,194,75,194,113,16,88,106,206,126,122,178,92,107,
+94,18,67,142,64,165,43,93,51,207,178,14,183,167,77,149,
+101,19,89,183,17,199,65,82,144,217,47,165,205,148,40,35,
+138,138,29,133,115,118,61,123,26,92,55,151,140,227,44,173,
+88,29,25,231,145,57,240,96,149,153,169,67,118,88,70,236,
+36,74,150,81,122,143,152,156,237,97,9,247,76,144,211,142,
+15,14,118,63,176,127,216,224,37,93,220,32,130,164,228,30,
+22,132,224,97,251,64,4,119,57,239,28,48,231,249,14,142,
+219,25,200,104,209,28,214,124,82,59,72,240,194,123,139,39,
+145,80,37,237,87,133,107,87,4,105,232,184,2,96,15,202,
+214,150,211,189,17,153,61,175,76,79,149,111,92,8,113,78,
+232,201,199,105,169,120,87,210,222,77,104,41,56,49,84,89,
+162,92,228,112,188,23,3,66,93,160,183,6,56,78,32,67,
+199,73,58,252,252,195,91,11,20,184,5,83,26,231,91,147,
+137,91,135,129,137,138,187,172,154,234,169,103,81,119,23,140,
+206,248,252,52,71,15,106,226,152,103,117,193,107,120,15,35,
+104,185,135,165,50,223,167,215,151,82,33,181,223,26,244,18,
+97,90,76,92,152,23,226,143,223,134,75,4,73,189,192,203,
+37,34,73,92,28,110,49,142,4,213,33,14,39,46,121,16,
+239,79,129,246,64,186,104,251,204,32,155,188,92,76,42,149,
+59,41,133,76,92,46,67,76,179,185,61,146,47,14,166,162,
+89,47,96,48,210,166,232,155,56,16,32,53,55,205,80,34,
+209,126,133,61,45,122,175,102,147,152,161,163,198,23,187,208,
+229,82,110,79,85,26,81,160,128,173,40,70,131,228,102,21,
+21,151,74,164,241,56,52,39,147,219,75,173,70,226,8,22,
+226,79,114,85,174,153,253,16,16,98,38,144,9,133,66,109,
+223,61,79,35,127,43,20,165,114,147,50,187,48,135,220,110,
+111,219,117,171,81,197,104,88,2,239,45,154,237,116,162,210,
+84,138,212,239,135,78,20,21,49,24,12,117,157,49,18,28,
+30,2,131,193,237,147,77,163,140,210,48,4,30,10,145,116,
+92,124,242,211,234,149,70,22,106,78,179,151,253,213,161,121,
+16,191,210,168,98,20,204,17,175,90,4,171,109,142,119,216,
+75,206,103,18,69,174,146,198,152,41,150,99,174,176,93,202,
+251,177,209,26,2,65,73,199,173,108,185,157,100,46,23,243,
+98,177,117,166,46,59,206,98,93,217,146,166,14,201,106,233,
+166,239,31,109,125,145,166,63,198,178,33,173,243,17,92,182,
+191,86,176,140,3,239,213,12,31,45,95,5,11,95,118,221,
+170,186,57,254,74,11,204,59,223,198,146,110,220,129,170,226,
+86,30,240,200,150,104,199,138,223,68,241,166,254,107,232,201,
+21,226,36,195,184,170,7,254,86,108,233,185,86,22,201,204,
+124,29,186,46,239,78,4,36,161,190,115,195,230,196,8,167,
+71,246,149,150,239,202,91,235,157,242,245,198,135,66,120,197,
+120,223,83,28,114,103,70,16,57,175,57,222,20,100,182,240,
+91,143,15,109,183,240,222,222,207,242,139,184,134,23,143,127,
+185,197,191,159,16,233,163,92,158,80,219,32,68,9,3,2,
+141,223,55,237,77,101,218,248,100,195,160,239,85,217,152,231,
+128,151,112,121,239,27,143,26,90,144,177,235,123,202,245,108,
+208,94,23,221,217,100,212,27,68,56,20,64,31,192,36,13,
+205,45,205,188,130,249,136,231,60,7,47,33,100,179,68,20,
+239,1,81,38,221,221,222,197,114,242,186,82,10,140,132,195,
+86,132,64,224,107,112,27,179,186,235,217,169,162,62,66,82,
+111,81,105,167,67,28,165,82,136,96,208,231,117,129,27,167,
+242,179,65,152,167,50,51,40,148,24,98,135,146,64,32,196,
+237,109,245,30,43,234,77,115,171,250,90,114,56,16,43,149,
+38,66,169,244,117,69,92,166,189,146,200,10,123,99,117,70,
+7,8,8,157,136,69,163,17,135,131,175,18,96,114,13,217,
+68,69,225,17,75,147,233,180,56,100,15,147,4,2,4,30,
+15,185,167,200,196,63,229,33,226,197,146,4,228,33,8,6,
+195,151,37,115,25,60,15,142,165,124,141,24,50,124,190,24,
+143,39,122,98,108,25,158,64,138,181,89,18,150,35,227,245,
+111,164,92,30,9,135,67,32,3,88,18,22,24,67,57,210,
+96,136,212,237,166,18,93,46,132,117,75,122,187,189,69,60,
+26,73,185,177,74,118,58,17,29,14,45,2,73,33,117,163,
+18,110,148,153,100,56,149,38,212,194,59,143,24,17,108,7,
+219,87,181,35,98,78,75,238,52,161,52,64,88,37,113,106,
+227,237,150,145,245,61,37,107,48,184,30,29,151,187,236,101,
+54,191,72,18,24,226,216,143,195,70,17,216,167,25,31,17,
+181,242,94,40,251,28,238,250,246,184,191,125,69,187,38,120,
+80,203,230,222,16,90,239,62,158,22,67,139,61,24,89,48,
+29,159,47,124,2,11,64,146,253,171,202,93,238,208,52,50,
+92,10,107,183,117,90,70,206,19,50,235,179,191,99,110,172,
+40,82,227,153,248,198,109,209,57,130,165,184,226,237,107,240,
+161,189,152,196,93,161,239,5,13,226,107,130,27,192,61,227,
+203,122,211,163,56,156,228,190,96,79,188,133,241,237,245,153,
+91,194,188,185,161,201,202,235,125,242,61,25,186,227,225,12,
+93,117,202,235,98,160,155,132,94,154,237,58,222,208,31,196,
+151,59,142,9,189,30,62,220,30,220,39,214,80,196,1,219,
+238,28,216,236,166,201,232,67,59,215,162,19,230,216,245,125,
+86,173,68,47,218,31,44,101,33,33,236,19,44,224,94,37,
+57,108,243,113,247,69,58,163,222,110,185,57,229,167,135,229,
+118,191,200,100,246,33,4,245,180,47,56,116,252,218,162,76,
+84,201,95,187,221,66,123,185,92,20,10,123,32,95,61,13,
+66,14,243,69,194,166,62,96,177,225,107,192,223,226,241,22,
+64,190,186,159,169,79,189,215,157,67,253,212,157,183,128,124,
+117,225,112,236,167,170,146,205,90,170,102,4,211,229,136,184,
+93,189,150,138,236,150,66,177,32,147,247,147,20,193,246,156,
+168,198,47,79,42,25,33,151,13,181,134,131,86,38,179,8,
+153,66,123,223,189,77,254,246,84,45,74,85,74,242,50,96,
+94,184,221,123,215,109,222,166,138,177,8,188,216,50,74,238,
+118,66,169,84,176,221,239,47,40,170,86,44,24,92,240,249,
+102,232,142,23,123,125,8,4,194,221,102,163,245,252,188,16,
+27,196,123,130,104,1,131,49,246,59,211,169,238,217,187,123,
+98,155,41,127,153,110,89,167,40,115,63,46,237,23,143,198,
+86,78,21,206,168,170,164,154,67,238,220,205,92,151,141,252,
+148,38,75,246,207,205,5,47,176,108,213,78,188,237,28,119,
+185,206,239,79,218,88,43,99,221,4,157,187,151,75,37,106,
+93,176,207,111,19,193,189,126,111,216,165,98,199,72,145,125,
+121,177,140,44,32,226,25,146,84,197,193,7,170,64,148,88,
+176,14,2,135,216,129,105,148,214,239,144,187,199,59,46,244,
+78,140,122,169,243,17,13,222,195,149,184,135,191,158,9,152,
+114,171,229,124,201,158,44,26,237,3,13,59,194,55,90,217,
+39,21,228,62,142,22,143,110,141,32,95,166,34,238,7,250,
+79,33,170,63,238,192,44,36,233,212,27,183,193,34,133,197,
+196,178,75,112,67,66,73,163,62,241,3,183,193,108,103,17,
+68,89,92,232,146,60,145,5,7,226,227,139,94,196,137,223,
+221,61,46,24,207,175,107,238,227,43,88,54,96,70,41,106,
+145,231,96,97,116,192,84,150,251,225,9,84,225,27,184,79,
+151,29,172,13,107,221,62,84,82,144,150,197,235,120,143,238,
+60,51,188,12,250,188,202,147,200,14,79,25,74,189,238,101,
+23,234,177,45,187,142,62,202,157,145,85,200,35,133,248,120,
+90,30,44,39,192,91,195,161,70,6,36,87,247,154,219,23,
+168,191,27,206,230,218,178,141,76,211,110,23,146,248,252,104,
+158,48,168,159,30,217,108,74,36,18,236,116,243,109,173,86,
+211,151,20,64,45,254,168,225,54,56,118,202,199,71,2,26,
+19,218,249,253,45,143,71,195,185,112,10,47,55,168,0,161,
+182,222,134,15,135,150,61,96,215,176,88,133,28,229,81,174,
+77,101,19,156,33,107,74,209,27,66,197,34,171,21,137,104,
+132,194,2,198,3,146,59,170,217,92,84,36,147,224,50,185,
+240,187,84,214,38,145,52,64,157,83,232,75,228,124,47,219,
+223,14,33,16,173,123,255,189,230,116,42,76,148,121,185,40,
+64,38,9,194,236,215,7,129,40,156,76,229,219,18,137,166,
+213,42,76,151,93,141,215,91,208,118,186,26,81,172,253,252,
+220,212,244,122,133,52,113,52,158,55,11,188,128,70,189,81,
+23,64,80,205,113,91,109,187,92,154,151,151,2,137,105,213,
+148,140,45,99,118,242,170,172,16,42,230,6,215,122,42,108,
+234,119,199,209,168,80,8,18,52,210,102,160,5,197,134,49,
+7,198,195,121,77,26,33,91,170,22,251,44,44,233,179,225,
+141,11,170,217,86,115,184,243,168,171,185,158,95,115,217,225,
+27,96,56,228,88,8,48,28,68,54,146,57,138,15,224,204,
+17,22,223,195,72,162,248,254,132,33,57,196,38,12,194,85,
+18,99,189,123,88,72,195,226,202,239,4,56,113,2,238,11,
+218,16,4,151,58,226,78,32,16,201,184,145,122,123,39,111,
+181,159,36,198,135,189,64,44,246,130,19,76,83,68,220,247,
+240,251,162,208,49,225,242,68,218,15,82,127,92,15,167,13,
+250,233,24,167,131,171,234,195,226,58,207,15,187,167,235,211,
+175,113,158,71,160,103,100,66,105,73,2,164,191,13,49,165,
+40,113,212,200,77,163,240,50,211,195,134,104,78,188,187,89,
+174,7,80,151,204,160,169,3,2,23,254,46,133,71,65,225,
+241,128,231,17,25,121,226,167,113,113,155,247,176,129,241,111,
+31,106,254,98,111,13,59,187,156,208,118,158,144,183,129,247,
+103,170,228,12,78,77,235,13,149,249,26,46,95,75,72,202,
+67,55,53,76,194,189,210,29,57,236,227,82,20,138,155,32,
+205,47,37,134,238,189,119,18,182,170,82,33,89,149,242,87,
+10,69,16,222,132,147,62,95,223,125,247,178,186,84,45,70,
+17,115,202,36,69,223,94,69,194,26,159,64,72,194,225,125,
+208,206,180,26,189,89,44,48,41,147,134,195,96,195,108,40,
+132,15,2,37,89,155,88,177,166,26,15,9,205,205,38,116,
+60,240,43,129,74,50,26,237,7,160,143,58,123,165,152,21,
+142,27,125,156,193,24,126,164,179,249,104,116,242,112,232,99,
+42,76,157,33,91,172,96,20,10,41,62,155,13,117,195,97,
+65,187,157,196,155,240,253,249,179,78,252,186,43,230,197,145,
+24,165,51,111,7,151,11,126,161,192,75,190,189,245,253,16,
+29,67,17,57,52,238,117,130,172,143,78,228,183,103,252,17,
+28,158,220,237,250,169,128,40,153,207,247,87,186,157,78,147,
+60,236,158,87,184,4,175,159,167,234,116,47,105,58,158,139,
+70,224,223,33,144,16,232,142,111,60,77,130,231,179,32,167,
+148,6,85,101,92,213,194,159,217,175,213,67,7,181,58,183,
+130,253,4,47,233,105,66,5,80,204,171,243,96,8,29,124,
+148,100,204,97,36,76,202,146,115,100,186,229,3,241,233,92,
+136,225,248,213,124,169,8,153,62,30,250,249,163,167,38,77,
+40,143,208,181,53,190,205,222,15,28,174,241,115,154,196,242,
+141,219,233,170,135,20,81,164,193,92,11,248,57,131,77,144,
+110,165,98,127,218,207,213,176,72,240,190,248,213,189,71,18,
+5,9,158,142,32,40,136,131,119,32,227,141,207,39,150,198,
+61,115,125,104,144,200,54,81,139,77,122,195,147,70,177,25,
+144,152,230,26,119,76,3,97,220,136,60,32,246,105,21,167,
+78,66,63,221,233,212,189,7,158,43,140,56,172,211,178,184,
+104,224,102,66,244,197,116,79,156,24,123,73,112,18,89,70,
+44,197,59,47,112,164,203,247,130,43,223,207,90,77,23,11,
+61,20,190,245,133,106,199,141,3,110,241,222,141,188,30,38,
+178,77,36,181,112,15,118,48,31,188,231,190,168,141,47,78,
+136,150,20,206,91,144,247,77,36,245,12,73,213,222,23,85,
+138,191,234,122,173,237,52,57,226,199,143,101,71,55,131,8,
+151,28,246,114,177,193,34,29,92,231,187,205,28,239,211,195,
+108,175,42,151,42,36,185,252,149,252,12,216,78,24,239,243,
+65,131,238,187,214,165,170,97,24,69,52,38,233,45,182,9,
+11,133,128,233,224,153,112,120,112,103,106,141,94,222,52,22,
+160,200,194,229,81,216,48,4,48,157,0,8,127,123,27,188,
+58,75,124,85,44,89,146,245,155,125,220,106,27,182,88,168,
+124,38,19,191,217,4,39,165,71,190,62,147,44,195,228,253,
+1,94,103,8,189,211,233,252,245,26,95,52,21,131,17,52,
+95,26,218,37,11,18,137,248,129,88,39,5,67,97,129,207,
+119,131,87,230,146,105,190,4,35,126,104,117,195,139,37,75,
+80,40,224,229,242,96,195,15,225,219,43,120,58,76,26,12,
+226,248,162,176,143,229,164,240,133,33,214,196,78,240,6,194,
+141,70,158,255,252,140,23,139,131,104,130,8,15,131,5,119,
+1,83,171,238,9,246,196,51,62,223,187,152,178,90,243,73,
+37,248,114,211,234,56,34,112,167,211,27,139,33,27,67,153,
+121,151,88,0,117,116,107,213,15,194,133,4,60,47,0,152,
+78,47,136,97,60,156,246,130,105,107,235,164,156,14,18,68,
+171,27,13,78,47,60,107,193,81,89,104,217,193,161,77,109,
+208,163,171,171,28,65,179,33,211,55,79,242,62,150,238,240,
+55,19,33,29,203,223,20,232,14,90,78,93,72,159,112,57,
+13,240,26,155,96,223,30,88,226,180,143,59,161,13,220,102,
+113,196,31,145,74,153,169,4,243,94,202,72,231,58,60,238,
+67,187,76,132,146,158,116,119,109,189,248,97,250,210,150,73,
+173,113,109,10,84,100,13,32,113,63,144,15,195,117,81,30,
+172,143,137,32,123,85,127,75,203,142,184,117,200,56,81,238,
+210,162,34,11,29,89,146,224,251,155,16,186,101,37,54,62,
+69,193,197,19,114,32,23,27,120,73,26,124,65,9,221,224,
+77,143,102,53,197,77,198,134,227,152,183,130,154,239,161,128,
+16,232,86,207,20,183,75,64,92,242,48,241,224,191,123,57,
+61,188,193,192,219,224,243,129,16,190,228,109,83,176,57,69,
+53,35,36,36,213,179,3,202,179,170,155,171,108,109,20,105,
+84,2,64,212,202,243,241,42,143,2,78,243,203,137,8,216,
+253,221,51,91,85,173,92,72,42,57,140,66,241,141,194,225,
+134,207,55,119,223,222,237,46,85,155,81,116,100,49,73,177,
+55,152,72,43,242,165,82,141,96,16,58,247,130,119,167,178,
+237,221,32,4,158,96,81,49,24,20,234,243,120,26,103,151,
+107,254,114,67,13,68,9,219,53,252,120,244,161,236,246,198,
+100,50,207,25,41,38,109,170,92,85,154,38,67,130,209,128,
+40,105,138,222,72,164,225,247,51,230,30,144,201,81,45,163,
+74,50,165,4,151,203,5,145,50,153,143,68,106,204,23,139,
+121,95,98,226,223,120,203,101,185,82,138,183,81,200,136,229,
+210,183,247,239,27,12,198,124,99,160,2,219,49,88,202,40,
+56,76,112,238,56,209,32,12,39,18,192,205,140,249,196,125,
+183,43,104,231,128,238,52,242,249,57,160,59,38,77,242,180,
+123,222,205,19,188,121,158,186,115,57,64,243,243,177,241,254,
+30,158,219,143,13,235,214,75,50,78,145,211,42,177,214,118,
+42,29,135,204,104,216,144,57,118,137,211,132,81,218,173,250,
+115,56,161,225,158,58,73,108,11,255,162,56,12,231,148,26,
+226,106,191,30,231,34,54,98,59,158,16,175,29,99,99,60,
+44,249,166,54,206,198,157,42,190,127,164,59,222,117,145,93,
+181,27,236,88,180,33,150,216,144,138,216,38,111,77,44,170,
+158,214,84,105,113,242,212,198,20,41,119,137,197,77,4,215,
+155,99,188,75,57,157,197,233,194,65,254,150,78,200,53,113,
+64,232,130,56,230,123,171,220,14,16,241,18,202,76,79,166,
+41,60,41,30,74,210,139,39,238,200,163,117,96,137,215,144,
+144,91,190,14,195,235,51,34,169,80,143,230,27,218,138,20,
+81,220,128,48,220,22,169,34,29,60,33,244,149,44,137,34,
+177,151,225,100,64,111,100,5,125,221,211,112,83,9,20,68,
+54,24,139,149,203,39,255,253,224,9,239,82,46,76,161,186,
+12,226,211,195,58,119,212,37,39,21,131,24,64,244,180,56,
+135,231,180,94,46,40,77,40,15,227,61,147,111,235,24,208,
+12,244,188,128,134,31,140,234,43,73,75,81,139,207,8,2,
+244,121,67,58,67,156,190,151,99,239,122,8,87,131,142,213,
+87,59,234,141,35,94,175,154,203,137,243,31,96,204,221,41,
+49,144,246,218,16,159,206,38,47,22,241,94,133,18,65,38,
+123,151,219,37,215,108,78,140,228,47,189,142,95,103,87,208,
+113,116,124,36,138,16,10,171,222,102,147,251,252,156,0,245,
+196,189,150,87,103,123,145,211,233,120,52,6,49,131,64,188,
+54,150,88,101,136,165,75,178,65,31,87,94,111,145,22,139,
+151,9,212,77,24,76,162,244,248,40,214,103,210,73,238,224,
+97,66,214,235,225,116,58,203,187,94,115,45,150,4,38,130,
+22,91,138,233,204,70,32,21,63,144,40,200,102,40,228,21,
+8,184,13,112,3,71,145,73,229,196,50,137,8,91,44,188,
+230,128,153,59,26,37,178,100,170,152,231,33,178,148,161,83,
+132,36,224,195,240,4,140,47,198,70,226,9,62,20,28,206,
+221,237,18,229,91,134,88,232,39,146,4,32,4,138,104,191,
+200,15,174,213,43,145,44,60,204,110,94,136,120,46,2,129,
+47,223,67,16,147,50,174,226,179,8,44,115,207,106,188,165,
+247,6,153,68,59,92,231,34,41,222,110,12,225,142,50,241,
+76,167,242,112,222,148,18,46,16,87,85,112,146,207,123,65,
+47,86,101,37,0,51,114,28,46,175,171,203,145,59,46,233,
+62,204,104,225,46,246,187,31,102,20,40,18,55,171,137,187,
+91,93,241,89,222,238,124,197,242,20,160,42,203,41,129,187,
+225,96,158,86,182,151,35,207,167,11,112,237,228,241,188,211,
+107,62,41,104,10,137,187,23,121,9,27,138,11,65,188,124,
+211,81,210,67,138,120,30,2,65,164,115,90,142,3,178,94,
+139,135,51,255,217,74,183,38,210,86,108,199,165,195,112,199,
+233,187,113,170,199,246,4,202,92,11,37,17,12,136,184,15,
+76,238,42,24,151,132,60,34,6,51,180,146,138,18,207,183,
+27,102,17,197,232,105,57,153,187,206,99,138,62,234,173,184,
+44,177,13,52,120,151,223,217,239,234,89,77,62,244,222,112,
+191,199,111,42,44,131,134,147,138,222,104,72,139,214,43,196,
+244,224,245,16,145,194,6,254,46,144,63,223,8,30,158,228,
+224,247,40,91,107,117,80,109,208,121,147,234,48,195,92,246,
+247,177,219,55,173,45,68,19,149,157,250,241,231,38,254,211,
+150,3,118,251,159,222,119,39,111,103,77,42,20,234,228,0,
+133,38,16,116,230,184,93,33,255,222,233,210,204,38,115,103,
+67,166,209,234,88,161,136,38,145,116,22,91,60,141,250,238,
+15,208,112,207,207,157,21,145,70,99,213,33,80,26,135,211,
+185,155,61,0,15,118,54,182,208,201,238,143,219,135,205,129,
+58,153,8,101,200,102,127,212,2,162,215,6,179,17,234,73,
+253,126,125,74,127,164,9,133,194,231,45,78,162,234,14,6,
+212,115,177,40,180,208,37,210,124,67,42,163,33,16,194,166,
+28,37,81,180,17,72,48,77,73,145,72,27,8,63,80,241,
+157,132,70,202,49,24,172,107,52,212,55,216,155,208,206,12,
+134,155,141,170,237,61,153,164,242,253,124,136,167,142,39,208,
+38,221,24,85,20,163,229,77,121,161,16,2,71,52,234,44,
+91,157,203,165,206,252,179,78,221,35,212,17,119,112,120,253,
+238,142,106,53,108,105,55,55,157,172,98,234,175,177,205,27,
+180,217,176,184,55,159,104,230,89,240,214,124,36,155,215,8,
+190,249,194,48,47,192,230,203,238,161,224,100,23,140,78,108,
+65,11,221,183,8,206,14,15,75,221,214,186,197,203,62,220,
+65,27,169,187,107,123,15,189,86,156,248,113,30,50,61,72,
+242,195,227,132,94,125,153,66,157,189,10,154,117,238,153,143,
+8,150,182,103,6,179,170,195,158,25,253,241,15,147,24,223,
+214,100,97,63,81,173,144,202,188,23,242,206,114,26,75,42,
+65,187,53,71,71,171,22,135,119,99,31,151,117,148,39,5,
+3,169,32,245,20,254,176,194,73,31,38,210,48,63,89,174,
+91,115,5,80,133,173,173,67,243,154,40,38,97,216,163,187,
+114,54,11,37,16,215,34,88,183,135,108,63,46,243,171,136,
+246,33,169,151,120,10,160,89,232,171,69,223,75,242,194,176,
+94,84,107,145,247,180,60,109,230,150,76,161,223,248,157,166,
+65,93,124,175,160,71,200,33,106,184,46,191,189,101,33,199,
+183,186,125,156,209,246,224,110,215,233,215,32,129,19,245,22,
+109,96,196,243,187,211,181,48,145,159,60,207,87,172,214,248,
+12,91,163,9,20,245,1,242,234,9,60,171,217,103,171,54,
+113,230,88,106,187,229,165,134,188,142,125,72,109,91,162,231,
+188,60,181,150,208,123,153,76,85,42,224,118,74,21,146,66,
+6,35,183,72,247,253,125,253,100,123,153,77,162,38,171,140,
+81,167,225,162,49,36,144,55,131,9,4,55,192,5,144,55,
+207,70,111,38,203,141,148,241,145,55,35,175,80,8,24,4,
+114,223,234,110,57,88,209,104,74,1,242,102,196,241,0,6,
+242,102,183,82,89,239,138,30,213,60,79,190,170,28,141,198,
+36,131,14,246,248,72,187,143,68,220,126,127,29,227,177,171,
+149,209,124,9,34,147,75,112,217,12,188,37,147,221,147,72,
+110,160,238,170,247,37,106,190,247,38,95,150,203,165,120,50,
+227,35,140,221,239,247,60,119,153,81,223,24,212,40,89,152,
+138,227,188,197,252,20,161,16,145,74,130,175,193,160,187,27,
+187,103,192,188,117,247,157,218,81,165,82,41,34,20,154,228,
+87,7,144,60,222,61,150,173,70,178,237,120,200,61,156,202,
+182,61,84,157,42,148,28,67,174,90,69,182,163,45,183,59,
+26,102,157,8,155,227,116,198,99,177,221,180,141,152,37,5,
+245,61,97,233,214,118,193,162,216,29,2,203,36,176,204,220,
+227,169,243,88,191,156,221,152,243,17,108,221,34,157,227,189,
+119,151,8,184,183,246,26,229,178,160,184,141,235,234,195,5,
+105,213,39,29,227,153,144,13,211,111,101,174,35,213,118,126,
+103,14,238,166,252,131,234,233,90,148,30,166,220,171,242,112,
+240,196,217,16,71,160,151,65,250,107,169,149,128,107,51,194,
+237,18,64,131,242,83,195,97,17,79,193,210,19,165,37,156,
+200,96,204,74,233,42,251,164,197,220,48,209,189,169,187,164,
+117,20,75,241,226,253,198,225,93,161,158,150,224,74,19,217,
+163,185,99,140,3,165,27,55,162,46,142,195,253,125,143,114,
+43,186,141,65,50,44,198,89,186,26,198,51,42,31,155,101,
+135,172,82,212,120,211,69,65,51,123,152,149,41,129,209,185,
+19,25,84,151,48,66,171,65,89,87,25,212,36,161,40,237,
+56,169,1,66,174,67,28,226,254,161,235,33,223,220,6,165,
+222,224,59,30,237,186,34,72,61,185,253,214,239,166,118,60,
+234,243,11,133,96,4,194,152,135,65,81,239,42,185,3,108,
+98,63,198,215,207,197,90,230,140,148,195,237,214,71,91,145,
+48,219,223,101,50,1,87,8,241,190,47,168,235,58,126,190,
+124,42,0,121,208,251,229,255,38,235,171,154,85,231,186,102,
+255,58,238,238,238,172,133,187,187,187,187,187,59,11,247,143,
+253,188,85,231,230,220,77,72,101,18,146,102,116,143,73,186,
+211,209,89,127,155,140,175,122,78,33,126,244,191,208,98,17,
+244,213,65,254,16,164,247,108,233,190,58,232,187,5,131,137,
+32,96,112,104,48,8,250,234,32,191,15,0,136,194,200,199,
+11,250,254,128,126,117,16,104,179,241,127,117,144,192,88,204,
+229,133,140,217,150,110,50,35,27,174,6,36,157,6,253,252,
+112,252,67,177,64,232,207,173,170,191,50,53,181,84,138,32,
+20,74,104,185,12,218,163,80,254,155,93,160,2,164,114,5,
+145,76,67,195,237,236,160,64,192,239,215,3,5,218,44,129,
+173,4,199,226,196,209,24,105,112,25,161,243,57,200,100,98,
+251,209,116,16,133,226,199,21,72,128,32,81,242,3,66,241,
+220,100,215,75,209,68,160,201,161,16,66,132,20,65,178,60,
+132,72,196,131,244,251,32,56,30,138,23,10,65,4,130,63,
+215,39,8,116,185,221,20,215,236,157,215,126,44,27,4,94,
+86,161,239,55,168,251,238,250,195,104,208,97,42,129,78,51,
+136,12,143,226,227,56,127,108,207,218,174,159,182,130,248,124,
+127,7,239,6,181,157,80,254,103,162,186,174,183,208,173,123,
+242,123,29,107,161,159,83,172,11,210,170,198,91,176,197,250,
+178,54,31,27,208,180,19,202,225,48,107,191,62,7,196,112,
+131,185,186,2,115,27,228,248,96,32,134,129,9,244,192,223,
+211,214,211,161,192,123,70,12,232,243,145,96,157,158,192,193,
+117,173,118,127,62,165,205,231,165,191,164,51,173,44,218,165,
+222,23,185,230,18,206,131,29,77,66,39,3,218,94,207,86,
+190,233,202,234,120,228,221,16,94,34,127,204,136,182,176,23,
+248,208,83,247,123,80,176,4,132,209,244,115,24,63,76,14,
+27,49,74,131,28,25,235,199,98,102,186,222,4,144,69,188,
+141,119,21,127,102,22,71,145,27,186,193,1,196,217,154,189,
+217,18,168,70,210,96,140,133,166,39,3,122,80,141,191,212,
+44,33,28,4,242,128,248,201,21,51,10,51,209,91,3,141,
+32,233,88,0,224,216,166,138,244,53,32,157,17,175,99,66,
+246,0,60,230,234,125,42,110,211,121,254,129,105,195,115,250,
+59,92,237,204,29,39,252,215,233,207,245,239,6,170,125,137,
+245,57,81,189,134,120,160,219,153,104,213,251,17,157,126,67,
+163,159,95,29,251,110,113,62,231,243,191,245,159,231,124,254,
+38,150,40,159,63,146,87,127,243,243,249,83,60,118,63,138,
+70,111,98,241,179,31,233,191,115,132,207,142,224,242,234,124,
+211,253,245,5,123,61,59,157,119,22,255,241,58,217,221,114,
+120,123,88,141,46,199,93,179,201,188,173,215,207,74,229,253,
+60,24,189,114,100,183,118,139,109,103,189,106,245,48,90,46,
+111,102,243,115,177,91,188,203,223,195,32,141,186,157,140,86,
+57,164,243,105,127,104,244,173,165,153,122,101,136,110,206,151,
+229,103,167,211,241,254,240,199,191,214,235,207,84,234,189,139,
+192,188,106,44,159,21,79,100,227,253,223,223,131,148,239,157,
+254,254,252,145,61,164,235,126,255,180,217,4,239,149,202,235,
+96,241,89,204,248,231,201,224,19,227,126,60,126,234,125,198,
+158,120,236,24,14,217,129,189,160,43,16,248,4,0,146,111,
+117,243,201,182,94,181,85,205,94,219,25,119,171,158,148,247,
+74,252,108,44,156,207,113,254,70,146,155,79,113,244,6,199,
+31,158,120,78,239,113,221,93,62,155,241,182,147,254,92,11,
+195,247,246,147,252,108,55,238,247,231,222,125,126,202,119,173,
+135,94,33,89,15,126,246,27,85,233,132,151,179,40,227,69,
+18,195,99,250,59,74,76,215,47,134,240,124,147,129,12,197,
+96,47,12,100,40,33,137,237,122,198,13,70,156,50,12,25,
+255,206,1,51,234,224,28,180,16,132,217,235,97,37,148,255,
+15,83,233,35,117,48,240,137,49,131,156,180,76,87,229,104,
+21,235,181,228,87,123,182,246,115,240,120,119,112,198,7,199,
+182,40,176,145,209,242,97,115,6,216,141,65,27,128,66,16,
+34,50,50,98,32,242,189,16,148,136,141,152,77,140,202,176,
+134,16,238,140,48,53,67,7,156,162,124,94,180,219,135,111,
+49,218,187,99,160,131,91,194,148,169,180,206,18,232,234,240,
+107,172,69,33,208,128,225,6,202,159,102,4,21,19,70,3,
+53,58,112,92,239,138,186,63,14,58,155,210,241,209,245,88,
+10,10,26,14,60,17,176,254,121,69,131,223,51,39,130,215,
+40,206,92,24,139,246,163,249,12,58,15,39,246,120,88,30,
+220,159,88,202,197,49,30,170,156,214,239,41,127,177,191,28,
+214,108,179,189,222,56,219,25,123,115,240,71,91,67,155,52,
+21,148,115,200,216,167,18,66,64,10,145,229,3,18,160,0,
+144,7,149,4,160,191,177,129,20,96,12,227,12,247,246,116,
+98,57,43,206,218,225,181,61,188,119,90,235,229,254,20,24,
+77,185,79,124,102,228,41,94,171,213,116,75,120,8,159,120,
+147,122,173,210,2,195,78,83,251,224,194,58,219,253,147,209,
+174,170,68,75,148,250,255,236,144,48,223,62,149,113,164,126,
+224,224,252,76,199,224,144,201,13,28,235,60,59,169,134,238,
+33,142,155,17,150,29,37,19,11,254,239,126,209,51,71,44,
+198,73,11,194,82,206,54,250,131,167,38,126,66,130,251,125,
+7,89,15,233,93,43,129,12,94,168,173,4,113,120,108,180,
+99,112,142,255,156,146,40,32,220,215,19,32,224,90,254,118,
+182,60,236,174,79,156,166,154,47,14,123,174,29,167,221,198,
+101,50,207,104,20,46,118,183,243,224,198,98,54,223,155,172,
+62,39,139,205,197,98,113,123,135,35,186,86,139,29,246,70,
+190,60,150,201,118,96,10,221,249,207,7,25,145,226,68,162,
+168,31,248,20,123,187,68,246,50,6,204,156,71,19,199,87,
+193,113,230,115,28,133,18,37,21,72,98,161,159,72,143,78,
+17,200,189,235,181,16,35,48,71,215,123,133,192,224,47,16,
+152,131,231,210,237,32,112,231,166,181,135,183,92,115,4,234,
+175,85,117,47,108,199,248,126,115,225,12,143,243,232,126,8,
+199,5,225,92,56,222,241,56,111,47,171,250,240,250,26,160,
+163,221,207,230,122,40,242,57,64,27,237,190,82,66,2,143,
+211,122,10,251,53,35,183,186,61,34,64,254,213,239,153,100,
+235,78,183,231,147,251,12,4,0,196,133,59,152,71,24,117,
+198,201,65,5,73,95,167,10,208,0,61,188,187,231,103,214,
+20,108,67,87,131,53,242,208,119,224,123,5,200,1,156,193,
+132,210,172,80,42,32,250,196,97,61,3,179,128,150,196,185,
+168,92,88,240,187,129,88,1,178,97,60,86,48,78,153,206,
+131,126,185,102,210,116,78,41,168,250,182,128,114,7,228,198,
+222,237,199,163,86,247,38,13,181,130,104,19,120,54,155,182,
+130,18,172,228,147,117,100,187,64,3,214,150,119,226,187,34,
+41,128,38,101,225,122,144,27,160,6,177,95,181,226,50,188,
+176,210,156,122,107,13,118,251,73,85,134,99,7,204,130,74,
+81,125,190,22,160,136,195,48,115,181,223,32,29,174,151,97,
+136,176,224,158,95,104,50,240,30,140,176,200,112,65,210,126,
+235,236,129,119,153,243,175,108,23,132,184,56,50,19,107,125,
+85,81,38,47,37,74,123,160,103,167,127,206,48,125,54,211,
+72,71,126,156,249,153,149,177,186,146,201,103,150,101,121,74,
+158,247,123,103,102,90,77,44,214,44,236,107,149,26,107,42,
+205,178,226,49,195,202,218,114,147,146,114,118,218,91,26,114,
+93,90,248,125,196,16,109,145,30,159,192,55,229,9,13,173,
+73,135,195,86,34,226,107,23,207,105,40,141,239,248,13,2,
+186,189,221,204,116,219,124,220,87,46,30,151,159,52,95,206,
+13,59,231,249,184,88,221,202,100,103,159,239,111,183,86,171,
+249,86,111,54,86,233,244,121,255,243,243,8,130,221,158,125,
+167,211,92,106,229,250,81,181,92,87,42,215,227,232,248,108,
+48,60,226,72,184,219,86,235,212,102,90,158,76,55,29,215,
+15,127,204,85,189,126,78,165,30,127,119,135,219,252,21,41,
+215,85,54,101,138,70,155,207,225,112,157,207,159,101,103,217,
+131,252,123,142,226,235,235,126,255,76,32,60,204,96,248,249,
+113,89,93,154,155,218,182,99,234,122,23,27,239,95,248,189,
+23,53,95,45,251,67,94,60,107,135,209,53,28,223,196,55,
+120,166,207,133,251,202,190,121,143,41,191,249,121,107,46,15,
+254,123,244,241,42,223,15,173,131,246,86,22,190,48,186,172,
+201,140,169,7,60,151,165,166,245,31,151,109,174,73,9,117,
+129,176,143,1,30,138,48,146,185,206,211,198,252,245,105,42,
+152,158,19,81,48,234,203,222,12,34,164,194,76,56,134,163,
+63,11,135,4,252,31,68,10,3,224,49,32,110,8,11,212,
+1,149,221,148,225,31,70,41,76,21,253,74,88,5,156,70,
+217,76,176,217,143,126,3,6,118,96,119,22,249,160,210,169,
+2,58,204,208,232,96,84,251,45,72,30,9,20,163,97,86,
+12,47,101,186,250,183,223,82,183,247,241,143,239,25,16,251,
+68,45,174,165,90,121,16,21,225,180,20,30,178,69,1,180,
+130,59,220,224,0,80,47,33,188,83,95,74,103,37,219,181,
+153,175,165,180,77,88,125,45,216,140,210,211,254,82,52,163,
+23,30,229,66,247,166,25,73,72,70,1,13,32,67,46,102,
+221,24,30,108,209,129,33,177,161,6,206,221,7,252,68,198,
+43,116,223,128,123,209,212,85,149,230,23,60,233,129,158,153,
+182,192,120,125,38,199,196,76,89,200,226,252,68,247,237,177,
+106,43,211,186,184,92,15,95,67,11,55,243,83,110,180,76,
+172,102,141,145,86,55,45,242,146,37,159,103,251,10,243,162,
+108,245,103,63,166,127,140,113,169,133,24,32,178,67,3,54,
+207,66,202,83,210,42,11,22,107,175,135,68,205,158,32,77,
+146,153,176,152,26,4,132,105,126,188,88,193,234,117,125,89,
+120,217,200,184,177,187,63,214,28,156,218,121,105,86,202,227,
+229,202,212,53,91,155,141,198,74,29,85,91,38,147,102,145,
+28,85,235,243,149,238,86,249,249,231,66,169,41,148,140,117,
+185,108,65,161,154,188,155,93,109,42,85,90,177,149,82,97,
+160,82,106,143,191,195,218,110,183,172,98,171,102,133,166,22,
+7,197,52,218,36,25,215,75,7,210,58,137,180,218,239,31,
+150,90,173,89,252,181,236,99,177,102,8,178,206,219,196,223,
+175,177,238,7,241,205,215,195,242,189,242,102,235,182,185,105,
+233,218,101,231,196,249,23,62,247,173,160,245,170,222,148,23,
+165,150,97,116,229,125,141,90,206,157,239,220,190,88,98,238,
+199,138,255,217,60,198,215,97,19,206,175,189,169,15,173,243,
+220,175,34,248,144,203,172,145,125,44,196,19,109,207,131,56,
+200,165,12,173,255,73,78,189,88,186,126,79,84,147,128,252,
+100,208,15,56,165,97,140,2,58,105,79,225,47,41,6,6,
+32,89,205,88,249,163,35,250,207,67,23,255,5,35,1,113,
+64,81,64,73,73,48,20,12,137,1,149,234,98,253,220,32,
+160,132,34,245,185,198,236,68,207,45,133,86,208,68,71,235,
+67,253,192,161,42,229,63,232,212,253,63,40,121,182,236,89,
+124,43,96,253,16,25,29,82,30,192,252,40,77,105,123,45,
+104,127,101,254,233,0,96,95,229,178,220,69,208,213,97,13,
+151,247,43,67,73,123,7,21,219,183,64,107,84,83,38,177,
+192,244,63,62,133,31,56,230,209,30,186,46,24,202,60,219,
+26,189,37,30,32,165,185,207,69,57,231,7,37,204,66,45,
+224,249,130,98,25,139,241,1,76,204,38,123,8,182,129,214,
+21,249,250,245,57,17,116,158,54,199,156,117,216,243,101,178,
+183,207,84,85,140,98,177,130,14,47,44,144,38,51,226,176,
+207,205,108,166,42,34,46,247,122,93,38,67,87,48,149,181,
+81,43,14,223,60,57,148,148,202,178,60,83,13,135,184,138,
+185,161,40,212,163,139,168,58,33,45,11,117,205,196,184,194,
+76,41,168,178,70,52,162,34,33,79,131,107,45,145,175,232,
+107,59,135,105,68,69,170,192,88,112,69,152,115,232,122,45,
+42,66,245,122,85,64,112,221,249,84,191,185,148,47,250,114,
+189,54,159,143,153,154,211,169,254,255,124,167,115,189,224,159,
+239,148,173,198,70,176,21,135,99,185,86,71,205,63,145,70,
+121,172,222,170,76,52,122,51,153,96,170,164,210,202,96,176,
+252,235,11,205,222,46,139,142,155,166,227,250,201,184,254,52,
+26,213,243,121,165,20,43,45,255,12,102,121,252,193,34,244,
+176,104,99,132,26,170,241,61,230,72,228,218,16,139,84,253,
+126,229,149,203,45,131,240,74,175,211,91,182,157,149,166,53,
+175,178,110,106,218,182,81,209,241,172,220,59,255,125,123,86,
+157,70,241,165,158,54,172,240,223,6,158,205,211,107,91,179,
+247,180,117,89,201,122,173,239,167,126,121,2,227,85,64,219,
+249,176,215,18,16,219,170,25,138,215,153,233,197,168,14,113,
+162,21,171,186,19,156,83,20,50,80,190,18,198,254,67,210,
+83,97,242,85,34,53,30,42,24,197,177,150,161,128,73,121,
+180,31,71,173,209,155,67,160,224,220,183,27,247,164,64,12,
+40,84,71,214,21,117,73,183,47,230,143,249,49,3,75,1,
+27,215,51,76,58,60,54,40,131,247,65,100,194,15,67,165,
+171,235,236,51,236,4,151,2,165,146,82,157,11,60,230,210,
+210,153,26,71,103,235,237,131,209,1,176,142,158,192,83,166,
+101,234,222,251,11,2,42,169,30,150,231,217,175,6,139,253,
+2,163,45,239,146,152,128,26,158,68,253,162,32,108,74,37,
+238,34,143,6,97,128,212,51,177,43,25,227,158,131,124,182,
+152,82,102,127,11,31,95,84,24,9,161,22,166,225,107,210,
+7,204,143,159,136,8,205,49,48,177,142,2,18,250,157,132,
+86,176,91,151,31,121,254,106,199,4,207,52,62,217,59,169,
+230,114,23,205,232,122,42,160,99,211,226,113,116,124,164,143,
+177,212,48,240,120,16,96,5,138,52,119,199,224,169,108,242,
+243,154,169,129,222,69,134,76,182,81,86,134,209,168,9,131,
+99,145,143,41,212,40,104,88,99,101,198,70,52,121,201,96,
+48,12,136,177,127,198,213,45,202,128,8,211,72,38,53,34,
+68,243,251,209,185,216,236,11,68,4,132,38,124,191,209,254,
+218,245,153,64,227,167,253,63,181,251,215,77,227,241,208,240,
+33,124,190,48,28,207,13,135,203,161,90,175,105,149,202,51,
+153,68,75,237,245,194,190,54,155,207,116,165,170,175,185,88,
+170,205,102,218,254,159,185,85,42,21,249,3,133,202,68,174,
+54,51,40,244,38,10,165,130,70,160,180,231,51,185,209,180,
+164,206,38,137,58,142,227,99,58,137,180,94,40,240,84,241,
+56,45,20,74,146,158,46,169,165,66,226,226,214,72,148,193,
+117,27,192,110,207,26,137,183,65,130,144,122,215,181,135,196,
+85,45,45,251,208,126,74,202,72,148,145,253,94,254,219,206,
+73,227,231,45,201,140,24,105,228,95,117,20,127,253,103,71,
+127,238,192,138,113,215,147,180,118,107,111,207,35,245,183,143,
+210,142,120,143,14,210,107,104,235,103,161,160,163,92,242,147,
+254,183,123,245,219,243,178,16,15,108,13,220,199,207,225,110,
+212,217,86,35,255,244,179,0,55,253,28,176,215,18,125,37,
+68,77,195,90,34,181,142,134,202,197,234,78,193,10,186,201,
+143,172,94,58,84,159,234,39,41,96,101,144,146,82,12,253,
+165,176,131,4,22,157,131,209,184,170,161,174,120,237,97,122,
+24,6,39,148,31,81,24,206,148,81,71,76,13,23,200,10,
+181,150,174,246,154,128,53,218,210,89,215,120,193,51,168,194,
+167,235,60,129,146,70,149,241,48,186,0,224,79,31,101,13,
+76,125,75,150,243,51,220,45,122,121,159,218,24,57,228,87,
+73,189,116,24,134,65,150,3,21,106,172,147,132,2,222,201,
+93,164,43,162,163,86,21,55,169,115,181,33,236,190,10,3,
+109,35,247,133,25,42,40,76,140,47,186,81,28,76,8,249,
+57,208,188,77,3,3,249,189,192,77,88,181,203,8,134,15,
+211,243,78,179,45,105,95,30,67,107,152,204,136,203,62,159,
+88,152,169,136,24,237,183,244,120,12,93,209,84,231,106,173,
+120,60,251,228,144,27,43,203,202,44,53,108,13,255,185,105,
+11,76,77,89,60,201,231,141,5,217,188,34,75,253,217,235,
+182,31,99,82,58,33,18,253,198,208,128,199,179,160,163,225,
+137,80,104,140,179,56,97,209,161,39,168,203,16,38,60,134,
+1,5,29,42,31,47,83,144,122,122,14,204,168,241,96,159,
+116,108,255,236,178,204,160,94,114,185,176,157,206,52,55,194,
+157,156,207,135,38,155,111,151,134,91,173,213,102,183,48,88,
+77,140,229,146,153,62,157,38,44,214,129,119,50,219,21,137,
+86,126,215,215,104,173,116,26,107,148,76,164,194,225,73,32,
+22,56,188,61,118,109,150,205,33,15,51,9,195,244,61,97,
+21,139,105,185,92,60,161,80,14,5,146,125,32,244,115,232,
+83,28,82,167,247,190,22,56,140,41,20,13,49,248,110,3,
+252,0,101,6,3,169,203,214,202,222,182,141,93,251,240,228,
+185,21,159,47,199,109,189,40,31,164,201,201,161,57,77,79,
+51,140,44,199,167,227,187,23,158,99,172,249,12,226,39,238,
+71,186,222,125,14,223,43,227,193,28,229,51,189,87,31,39,
+143,88,250,17,136,207,69,227,241,222,63,170,206,77,14,229,
+247,38,203,20,103,25,72,205,83,45,255,209,183,78,121,71,
+73,216,47,87,172,231,2,230,165,148,109,218,119,240,211,140,
+236,137,62,116,176,138,39,134,97,19,57,178,127,156,58,112,
+27,60,231,113,32,28,21,120,135,232,49,64,195,30,3,39,
+231,252,213,168,15,157,178,95,245,253,128,41,105,124,19,162,
+130,213,6,105,198,64,55,134,133,13,40,52,184,104,212,105,
+146,62,11,230,161,224,44,93,187,85,160,15,9,66,129,81,
+180,205,181,187,246,233,93,224,218,172,218,234,162,227,104,211,
+155,49,118,106,186,235,58,160,1,106,81,63,187,2,158,238,
+112,229,191,248,195,254,146,216,139,63,85,92,239,192,140,71,
+66,21,74,231,5,212,249,214,106,24,172,134,23,37,237,94,
+163,183,136,132,222,238,99,57,71,51,58,113,52,241,141,48,
+237,75,102,212,18,40,54,179,212,228,228,43,162,179,62,182,
+18,254,233,220,196,11,20,127,171,95,154,35,180,107,166,46,
+8,125,113,68,82,128,140,225,135,60,52,25,190,237,172,81,
+239,207,153,184,232,78,22,131,55,58,96,92,113,217,192,194,
+26,59,150,136,172,140,73,132,197,24,156,33,33,21,231,8,
+186,63,187,152,172,47,196,228,70,67,32,38,73,229,119,186,
+96,30,83,75,233,48,88,189,36,142,8,129,83,61,129,152,
+98,0,59,192,24,159,239,120,49,226,32,254,221,45,213,229,
+179,131,99,131,219,157,202,90,240,193,190,174,221,78,61,171,
+244,98,222,255,237,191,140,235,117,106,169,44,14,91,41,147,
+89,143,197,246,82,47,119,177,26,45,97,43,134,114,57,85,
+166,114,138,245,56,133,110,28,251,198,169,56,178,216,74,1,
+40,52,3,20,154,234,224,120,100,118,114,52,53,246,234,245,
+84,4,70,166,89,35,146,31,67,60,158,218,13,68,100,126,
+54,20,129,25,242,249,84,137,66,254,99,198,93,239,20,4,
+254,54,10,133,169,32,60,245,121,61,82,109,103,106,125,105,
+166,176,236,212,105,249,72,81,149,169,48,58,245,178,31,82,
+243,98,10,105,33,167,136,226,20,222,123,55,116,63,217,85,
+59,217,120,190,204,135,250,52,149,139,242,245,159,167,248,96,
+237,190,155,95,69,68,217,0,247,94,7,173,247,92,142,63,
+185,167,215,126,174,16,39,231,193,6,49,49,103,250,27,199,
+100,51,240,105,40,135,172,142,158,196,210,240,25,233,80,3,
+167,29,160,12,101,184,37,165,178,221,252,101,168,133,182,77,
+156,186,38,182,222,49,166,254,244,74,223,74,80,154,196,83,
+5,6,215,175,87,97,140,137,148,76,247,103,132,49,185,63,
+39,6,156,231,51,17,113,100,78,3,179,162,213,126,123,198,
+184,223,130,125,112,56,104,44,163,227,79,177,38,150,136,206,
+9,173,211,39,109,39,227,212,171,160,153,85,60,163,30,54,
+225,113,94,229,10,128,125,203,175,42,115,109,172,27,130,170,
+8,106,22,210,186,219,142,187,56,174,95,132,158,164,60,116,
+92,103,0,73,81,232,129,100,2,211,171,1,220,43,126,169,
+77,181,25,171,32,64,8,61,138,143,230,8,67,25,154,201,
+41,208,34,97,210,179,113,213,187,5,7,19,254,144,143,208,
+135,232,162,113,104,196,235,12,135,133,23,188,181,10,24,216,
+129,29,189,144,42,124,103,206,138,207,70,122,1,35,69,38,
+255,176,44,218,249,233,103,191,39,103,2,211,194,162,110,98,
+21,149,53,70,92,253,213,212,232,159,124,158,92,152,23,16,
+255,170,82,252,199,168,137,75,127,136,68,114,72,48,96,241,
+44,121,74,60,247,79,84,51,99,5,136,132,196,132,193,211,
+129,184,112,222,243,73,8,140,225,253,145,134,244,7,135,94,
+250,245,250,209,84,75,216,230,114,49,215,239,109,195,159,205,
+166,88,165,203,241,226,96,169,179,89,44,113,70,179,133,213,
+104,164,48,233,244,79,36,82,12,226,193,114,77,166,212,92,
+138,21,114,125,185,204,84,232,254,179,121,27,12,174,226,92,
+46,183,213,74,189,210,72,161,50,141,167,126,246,223,33,109,
+183,255,16,85,170,226,228,71,238,134,183,41,172,69,34,174,
+135,72,165,76,18,41,181,143,236,127,106,181,226,209,244,148,
+43,18,199,17,114,78,220,15,139,87,155,92,146,13,29,123,
+192,239,68,157,227,69,51,175,168,139,101,44,251,103,89,77,
+209,69,90,182,166,99,226,58,103,83,199,171,113,124,218,154,
+243,24,177,136,247,178,182,158,79,199,116,209,206,147,75,109,
+154,255,94,220,169,51,113,145,255,153,161,140,33,179,10,18,
+122,28,246,235,162,234,141,135,14,113,53,27,2,202,174,33,
+244,145,128,141,38,210,17,192,120,40,69,53,26,8,5,120,
+116,184,38,139,6,158,102,218,66,159,131,64,9,22,213,113,
+32,132,163,123,46,21,161,198,240,129,16,8,244,32,149,212,
+105,151,97,23,232,160,72,225,85,253,14,250,182,79,165,53,
+189,12,194,30,79,25,216,12,115,175,130,98,178,93,19,14,
+131,231,63,186,28,19,154,206,137,178,159,110,169,237,160,131,
+188,77,221,140,15,240,70,103,124,30,208,27,55,229,142,172,
+88,236,20,160,8,0,111,107,171,235,58,140,131,106,51,12,
+23,39,132,22,243,0,217,222,131,243,109,129,227,152,126,26,
+90,134,210,164,210,26,165,151,193,48,97,68,103,173,129,172,
+93,53,171,191,72,13,233,192,166,135,233,92,41,88,78,111,
+43,174,24,74,16,7,143,108,100,176,156,16,2,239,248,208,
+141,205,1,206,19,222,96,53,61,191,227,88,204,93,177,75,
+128,181,120,255,235,218,52,204,39,22,54,12,65,136,63,142,
+250,241,62,188,218,242,243,95,227,63,39,121,68,103,179,76,
+254,57,201,229,212,253,145,18,150,155,106,255,185,201,101,100,
+7,83,90,24,198,16,121,159,72,143,195,179,229,9,155,140,
+198,134,195,48,18,215,156,130,196,128,193,17,176,48,103,211,
+245,40,136,42,230,245,138,128,190,69,236,22,225,101,99,99,
+22,228,241,192,186,221,17,156,53,90,107,175,87,11,131,237,
+124,102,53,155,216,117,100,29,169,84,134,73,52,95,111,175,
+215,106,179,21,102,166,171,84,217,95,158,195,154,205,145,197,
+98,200,27,75,245,162,64,173,163,219,168,212,102,26,133,241,
+65,163,177,80,104,4,20,3,13,59,60,189,181,202,102,112,
+215,169,148,105,242,28,49,138,5,204,151,231,254,249,198,7,
+34,253,192,211,97,208,167,152,47,207,121,94,11,12,198,228,
+139,252,199,115,48,226,63,158,195,224,121,22,198,151,231,58,
+246,97,216,117,74,50,40,35,215,253,156,190,222,12,251,64,
+7,58,172,27,35,197,95,56,38,138,103,227,249,150,43,207,
+53,107,121,187,87,254,218,26,209,122,12,111,239,93,190,23,
+227,49,31,242,83,172,39,84,21,132,55,97,27,52,91,181,
+207,2,46,217,29,220,4,52,74,182,127,51,208,182,125,232,
+13,72,227,15,237,44,114,18,89,203,4,255,44,86,218,65,
+223,2,141,81,10,85,181,103,7,38,213,146,218,38,250,103,
+165,221,211,117,72,136,4,72,130,87,53,86,160,160,163,117,
+8,26,197,159,10,59,136,219,177,82,53,45,162,143,193,134,
+121,64,152,76,99,154,84,53,93,47,12,226,98,15,184,84,
+182,183,161,153,141,104,70,51,242,52,10,84,171,222,30,141,
+214,120,84,118,253,200,79,162,219,209,206,90,43,12,194,159,
+14,239,20,208,184,203,110,125,83,159,134,171,85,149,119,141,
+94,191,103,241,119,198,0,114,100,98,171,112,205,215,159,72,
+226,123,241,198,140,143,211,132,27,134,238,8,139,63,133,244,
+165,119,253,69,56,100,61,210,215,57,139,175,13,24,215,176,
+35,42,129,226,227,16,240,121,11,172,224,147,32,65,108,108,
+102,120,116,5,124,75,181,169,19,89,235,228,37,94,40,78,
+151,57,175,109,237,34,114,39,157,107,174,162,57,24,130,144,
+129,63,216,187,187,255,164,183,4,69,166,169,65,11,126,33,
+101,153,228,148,35,172,130,218,63,150,4,132,18,139,130,2,
+183,54,67,66,28,83,144,39,99,64,132,95,164,199,224,217,
+3,89,66,64,99,195,96,57,140,100,78,248,34,10,11,134,
+9,115,58,93,175,70,64,124,17,5,3,193,116,199,19,243,
+234,2,175,233,203,217,218,124,60,246,24,54,78,240,98,21,
+226,149,201,220,191,200,53,152,213,100,102,54,154,88,140,90,
+13,155,76,130,67,188,88,40,244,231,186,219,166,76,105,44,
+149,24,10,189,18,91,46,195,80,40,215,127,46,244,84,14,
+240,159,11,157,66,221,253,231,66,191,193,136,173,86,48,131,
+19,42,225,73,2,115,30,203,90,193,146,127,41,20,152,120,
+36,14,131,64,130,79,87,72,104,169,16,184,107,132,255,63,
+245,125,125,2,107,4,222,6,129,53,203,92,207,153,237,211,
+221,109,183,188,254,121,29,76,103,217,176,101,21,91,213,18,
+88,154,182,129,227,221,30,109,135,200,238,79,210,127,213,244,
+193,126,16,6,94,193,177,143,11,219,243,170,86,118,229,42,
+236,243,238,22,119,125,56,204,251,44,251,9,136,165,26,129,
+240,94,70,13,190,222,1,143,43,189,253,147,170,162,21,13,
+78,184,74,176,54,249,1,42,245,181,116,96,49,115,84,14,
+186,70,172,242,72,104,43,250,48,84,137,196,214,214,225,197,
+111,229,105,175,141,245,246,83,121,6,180,48,245,138,136,2,
+4,81,26,206,243,122,62,212,15,131,169,220,202,145,81,211,
+247,194,16,42,44,167,164,169,154,250,85,180,252,103,162,77,
+116,38,56,48,124,83,105,6,123,168,45,185,172,117,66,6,
+50,78,153,213,255,129,148,90,178,254,15,165,116,214,222,65,
+236,216,90,3,209,250,23,126,148,109,119,241,252,210,140,201,
+117,190,170,174,164,190,255,0,107,254,172,222,76,157,48,202,
+194,189,128,204,164,66,37,211,253,14,131,38,200,89,207,86,
+216,244,248,30,9,0,132,155,220,112,71,6,99,30,148,77,
+196,63,7,166,164,15,77,41,177,0,226,144,243,243,113,29,
+210,125,144,239,223,32,107,225,204,1,190,56,148,50,7,186,
+192,255,203,217,224,118,175,75,110,76,255,235,234,138,102,81,
+67,59,101,242,127,79,24,71,67,41,53,179,238,139,21,166,
+162,156,83,81,161,241,145,82,81,204,161,23,16,45,57,103,
+98,104,145,196,156,72,108,136,132,78,56,124,142,18,133,7,
+144,251,12,241,19,111,72,24,3,38,71,2,13,52,54,2,
+193,227,49,7,9,94,183,167,67,139,159,236,93,51,13,125,
+179,150,62,174,247,25,14,190,217,252,108,157,142,89,38,227,
+112,199,185,155,165,184,217,156,115,105,52,135,157,185,89,212,
+69,108,214,236,126,119,124,52,56,141,90,170,84,58,231,10,
+133,195,64,210,120,180,191,201,196,172,80,248,117,216,24,26,
+133,8,29,65,207,159,255,102,254,100,226,66,163,113,158,138,
+165,28,98,112,38,41,198,20,11,179,209,200,161,255,16,113,
+248,223,225,96,134,101,48,238,243,162,195,144,37,225,16,2,
+190,91,180,13,6,102,4,194,221,95,3,127,39,242,60,232,
+107,207,139,237,217,131,61,150,55,215,243,7,245,28,227,72,
+207,135,231,57,192,70,158,27,201,115,198,188,211,243,223,187,
+15,120,255,220,223,247,238,71,228,125,210,73,239,169,119,142,
+247,70,37,159,29,220,65,168,186,174,8,196,23,66,81,94,
+173,139,62,137,107,222,11,254,180,172,121,225,102,144,78,21,
+30,168,113,75,140,188,150,12,53,120,15,9,96,165,230,44,
+203,181,131,50,218,48,86,26,58,99,37,92,153,168,78,125,
+189,154,191,12,168,136,181,164,88,103,1,153,237,21,94,68,
+255,19,97,209,150,173,45,148,225,99,17,179,95,126,122,5,
+239,147,176,201,232,228,165,135,117,149,167,50,213,57,0,212,
+176,95,165,26,222,168,202,37,174,214,14,24,215,174,195,207,
+48,13,54,107,43,231,199,110,101,230,221,116,139,117,20,165,
+195,88,209,187,156,186,119,193,105,39,251,216,31,75,187,186,
+110,194,125,11,180,137,177,96,86,210,108,189,60,172,163,195,
+34,243,36,162,23,195,135,2,72,5,69,35,145,3,44,198,
+195,127,209,151,213,82,150,198,178,42,230,49,169,185,27,166,
+212,151,112,88,191,232,108,90,118,127,76,247,98,142,10,183,
+196,54,38,184,240,205,83,104,217,226,149,11,133,19,93,174,
+90,195,251,70,196,158,22,82,221,245,119,121,223,55,246,238,
+204,111,117,113,106,177,176,201,26,163,163,110,86,148,165,123,
+62,239,38,21,228,85,217,241,207,174,70,167,126,232,137,147,
+56,36,190,35,67,94,151,138,250,43,115,215,84,124,214,111,
+129,44,233,72,10,248,51,110,1,13,188,124,0,87,71,144,
+187,92,150,200,119,32,59,93,62,238,199,183,139,199,75,150,
+47,231,249,226,251,130,131,243,188,156,205,110,89,186,93,125,
+74,86,235,178,217,56,226,213,234,59,141,246,58,92,140,30,
+121,188,91,147,121,181,218,106,181,60,95,26,150,39,179,249,
+174,80,112,94,99,169,71,20,232,254,85,126,180,234,50,157,
+242,153,161,81,71,40,244,78,4,129,94,29,158,199,250,174,
+242,185,234,108,162,240,156,142,102,197,226,73,30,149,223,41,
+148,87,129,212,243,8,253,124,190,22,127,192,150,163,209,165,
+88,148,62,102,121,51,177,232,232,198,243,230,193,192,81,248,
+39,188,195,241,199,203,230,51,223,182,242,93,135,116,239,221,
+7,63,107,214,219,157,160,190,194,232,251,161,58,61,254,102,
+151,89,142,61,199,119,43,62,243,223,199,11,8,190,111,61,
+197,229,103,217,189,107,189,165,237,231,192,191,227,63,63,143,
+79,144,127,252,156,188,226,183,97,41,1,13,220,69,251,25,
+105,185,12,15,4,155,69,59,56,192,44,249,237,208,200,97,
+103,245,48,38,62,93,90,77,250,79,35,159,29,94,201,147,
+194,52,107,101,233,25,161,92,54,183,182,138,252,208,243,236,
+231,10,165,179,35,76,105,61,123,221,37,12,2,65,32,150,
+106,49,213,220,185,62,56,18,105,74,1,83,18,123,178,74,
+245,139,65,24,22,254,197,20,205,3,63,65,85,218,190,108,
+205,92,42,175,103,140,59,107,209,77,66,247,67,86,229,245,
+69,146,43,23,58,16,209,84,94,181,207,9,108,238,49,159,
+202,93,68,61,60,145,206,180,30,152,11,158,194,54,240,214,
+202,98,251,213,205,35,119,152,132,231,110,187,230,170,246,92,
+167,245,171,80,69,15,170,38,97,144,0,196,177,177,185,36,
+131,48,7,180,112,28,104,255,251,75,116,164,38,152,124,45,
+240,53,15,133,132,123,83,240,133,13,221,148,76,81,241,109,
+44,103,5,234,25,186,127,108,205,61,137,183,40,153,104,231,
+203,189,45,159,49,240,191,250,20,109,55,115,139,19,11,43,
+219,172,82,191,149,101,169,162,104,207,100,232,130,156,80,252,
+135,170,204,79,251,95,236,2,145,200,53,132,2,6,151,74,
+44,27,115,107,42,54,171,64,140,75,50,146,2,22,183,224,
+66,2,109,31,32,35,200,230,78,151,37,34,16,253,162,234,
+126,63,186,120,94,92,178,124,58,47,238,182,127,168,210,56,
+155,159,106,89,186,92,149,204,219,127,166,233,163,90,61,116,
+208,104,237,131,81,243,146,199,171,53,153,82,139,255,47,93,
+97,121,194,152,205,142,197,162,61,142,74,53,162,64,181,163,
+121,42,213,101,42,101,134,114,163,79,80,168,3,4,10,181,
+223,30,141,181,74,231,147,197,201,68,97,60,137,46,10,197,
+211,124,238,32,82,40,237,63,131,70,127,205,211,249,90,52,
+186,168,13,135,102,60,79,57,76,139,44,120,174,188,251,125,
+83,161,241,85,40,108,241,228,121,74,109,175,214,121,189,100,
+47,15,203,102,98,75,183,115,132,205,162,140,111,143,147,14,
+52,253,120,153,102,230,25,126,133,27,176,9,157,127,161,203,
+236,151,176,129,243,143,221,215,229,183,105,140,94,198,116,187,
+35,235,201,191,214,91,169,195,251,244,211,17,75,9,234,171,
+202,255,214,7,137,13,239,187,145,50,73,196,106,249,61,251,
+54,190,48,200,196,78,69,156,57,100,55,9,214,1,83,164,
+147,67,221,85,2,117,68,106,170,228,112,87,82,119,158,12,
+255,5,78,1,156,158,200,38,183,69,123,20,180,145,121,249,
+101,101,212,100,206,112,151,241,205,7,30,58,79,109,77,226,
+177,136,38,110,149,238,45,113,166,38,186,214,8,76,80,46,
+75,85,111,135,97,79,130,213,106,48,100,179,55,174,213,77,
+55,14,87,112,113,75,103,184,196,90,94,233,26,160,178,159,
+96,181,184,170,222,9,170,38,175,65,59,128,126,184,122,192,
+169,53,252,161,97,211,84,0,125,205,220,159,131,208,211,33,
+163,56,104,164,55,35,75,42,222,231,1,145,114,144,31,242,
+2,152,32,230,146,235,76,1,185,200,19,177,90,192,18,42,
+194,33,159,20,65,218,161,125,254,120,36,202,106,144,242,29,
+2,150,21,149,93,1,47,82,51,230,133,168,200,156,152,27,
+0,201,130,247,181,52,253,31,156,212,127,17,49,151,93,84,
+148,67,42,5,245,124,44,41,115,165,5,21,165,110,101,22,
+34,242,92,90,88,199,144,136,138,40,143,195,47,123,242,132,
+146,182,132,195,168,38,137,156,138,172,193,80,112,115,64,120,
+238,249,108,74,194,236,241,48,67,240,194,241,193,252,122,53,
+48,188,108,114,188,120,60,252,102,183,187,129,139,54,249,109,
+245,250,63,127,228,172,217,52,175,215,141,125,165,178,78,162,
+45,246,76,189,89,146,172,87,165,71,165,186,92,46,76,230,
+168,185,193,98,173,79,102,177,197,80,104,230,133,106,156,182,
+74,163,206,147,9,190,41,28,110,136,68,235,129,31,104,241,
+118,217,116,252,111,58,158,159,76,151,35,163,209,204,100,54,
+76,8,211,122,161,176,216,235,83,54,69,146,142,229,34,251,
+240,124,56,52,231,243,226,134,76,182,30,73,44,28,81,224,
+49,35,90,84,178,20,155,36,122,237,124,24,54,71,229,126,
+84,31,219,135,229,28,193,174,79,95,120,43,171,102,186,166,
+54,215,182,114,60,183,114,231,62,37,30,79,219,89,29,35,
+174,133,193,6,255,253,206,109,154,191,109,35,45,250,8,211,
+27,89,207,37,255,94,111,27,221,79,168,195,70,44,29,144,
+80,233,11,166,164,237,13,209,47,77,173,106,207,129,53,87,
+131,54,81,15,213,127,61,20,142,66,63,1,60,41,9,154,
+130,77,81,43,91,64,154,159,51,231,231,164,36,107,120,182,
+123,15,188,128,39,17,116,36,189,25,174,172,109,163,29,150,
+26,48,71,38,253,246,221,101,89,247,89,144,36,102,95,165,
+180,206,182,159,126,149,21,62,187,44,116,253,175,27,179,46,
+175,180,253,209,131,155,73,219,172,58,250,24,116,128,90,186,
+3,251,131,218,114,214,206,125,121,19,255,171,131,126,126,44,
+207,101,173,29,204,40,170,174,228,78,21,112,103,139,30,242,
+129,197,62,171,56,233,126,25,51,142,91,32,64,227,239,244,
+194,224,108,134,58,92,64,20,149,8,40,48,148,9,201,37,
+56,134,47,198,26,236,130,103,196,92,65,195,103,209,115,176,
+236,187,210,167,12,239,178,66,199,33,199,194,113,35,146,82,
+68,96,0,9,165,248,252,142,93,175,198,9,103,22,210,43,
+186,199,147,190,86,17,70,219,230,142,105,163,229,39,175,12,
+153,21,212,201,177,36,22,149,12,50,10,203,222,90,136,201,
+115,73,33,29,243,35,34,162,62,147,87,33,229,40,17,85,
+5,131,5,204,99,5,49,105,14,67,252,195,209,164,231,99,
+136,9,179,251,23,71,112,97,255,31,142,84,95,158,131,37,
+203,199,115,111,97,227,164,47,214,159,151,50,89,172,203,231,
+51,235,255,98,28,76,95,158,99,209,104,233,47,207,253,200,
+227,197,154,140,47,215,86,75,223,138,164,91,154,205,102,214,
+98,193,73,151,169,63,162,64,241,175,163,145,43,139,148,111,
+89,65,161,205,225,48,139,24,8,164,223,158,31,237,59,75,
+102,43,227,153,138,111,52,158,27,12,166,121,116,206,42,149,
+210,9,212,245,59,29,153,33,67,226,241,213,80,120,62,24,
+80,76,89,254,66,36,50,15,190,116,199,243,86,32,64,248,
+50,16,52,227,191,173,254,166,91,109,57,127,247,246,67,244,
+176,164,77,212,17,108,218,188,100,41,71,85,19,93,243,173,
+72,232,42,199,46,182,223,10,157,195,138,49,217,245,211,117,
+188,119,225,249,116,140,184,45,127,194,222,154,186,154,167,240,
+54,34,167,187,221,143,226,246,218,154,129,70,91,68,32,232,
+144,151,228,174,239,133,216,24,119,180,46,244,129,107,9,119,
+5,47,208,73,219,140,108,29,99,47,3,117,34,54,111,131,
+77,217,211,192,157,119,230,198,98,115,246,54,184,49,30,101,
+135,238,240,242,128,27,114,209,181,10,55,27,117,167,236,85,
+124,4,55,206,138,181,18,55,51,216,6,221,170,156,121,217,
+236,235,156,217,226,54,77,171,66,21,116,163,46,29,22,79,
+59,188,253,240,12,206,253,147,173,153,238,208,175,135,251,98,
+189,226,150,54,192,218,181,31,156,84,63,231,74,191,13,158,
+170,168,90,90,191,1,57,36,112,236,237,54,194,93,117,138,
+61,20,52,189,207,196,216,250,100,80,143,99,251,96,52,42,
+227,43,169,4,113,252,240,137,96,249,153,50,72,238,168,159,
+214,156,112,167,174,4,243,79,240,199,170,88,139,114,143,129,
+51,197,224,209,180,140,137,2,13,179,172,151,189,154,160,0,
+97,212,242,223,41,229,243,164,156,18,134,142,79,50,98,201,
+242,13,166,92,141,188,172,56,205,18,255,72,173,34,43,5,
+254,236,141,159,98,82,74,80,137,197,11,100,200,93,113,169,
+126,100,230,154,74,198,99,125,149,18,58,214,151,240,56,37,
+52,116,113,2,2,205,62,193,102,219,170,146,33,172,108,245,
+50,60,201,111,46,51,93,233,220,172,203,151,163,204,110,227,
+156,46,86,135,50,217,109,215,229,155,89,206,250,177,42,155,
+141,210,151,215,22,52,218,191,196,135,47,175,253,151,248,144,
+249,170,37,249,114,89,254,242,218,98,177,56,149,163,84,135,
+40,208,238,104,108,26,101,145,78,83,36,13,137,82,56,188,
+8,4,66,167,255,5,63,224,217,202,76,60,63,29,223,228,
+70,99,121,62,95,16,77,166,83,2,229,176,227,234,92,134,
+44,19,203,77,163,97,249,191,220,135,104,126,33,147,157,70,
+18,219,119,186,215,140,232,200,169,82,92,146,232,189,99,248,
+184,28,149,231,81,229,189,30,150,251,36,125,218,228,8,247,
+134,249,52,190,36,23,104,122,121,154,169,202,179,156,60,223,
+37,223,121,206,169,215,85,119,127,245,252,167,75,87,121,185,
+109,202,159,3,246,126,248,100,203,159,43,252,174,117,125,202,
+159,247,101,241,57,60,172,221,115,26,8,248,92,63,109,51,
+159,76,144,242,220,43,129,47,91,255,185,106,252,7,58,47,
+215,186,138,250,72,240,47,211,181,230,172,226,224,95,132,157,
+247,119,85,244,229,83,246,99,114,109,212,35,224,58,175,115,
+189,238,16,61,3,209,47,158,44,87,238,167,225,74,217,201,
+250,121,104,192,152,217,24,31,41,201,170,211,49,66,241,216,
+61,111,126,157,244,153,240,209,20,201,163,94,121,126,168,17,
+151,253,113,101,174,83,203,126,96,239,216,252,249,12,240,9,
+205,126,203,42,209,253,118,1,90,95,28,195,183,108,103,198,
+85,109,132,146,39,215,21,102,158,42,107,157,64,197,69,177,
+76,244,22,44,149,189,165,253,232,124,189,74,72,179,97,52,
+35,122,41,52,41,134,197,145,72,102,4,39,205,33,132,52,
+191,124,8,192,224,227,90,152,99,160,175,225,252,198,251,66,
+157,111,98,53,127,38,186,93,104,199,159,152,178,4,32,82,
+231,56,97,18,107,140,194,188,16,143,88,61,96,74,220,51,
+132,143,93,125,74,47,16,85,90,224,62,236,108,23,177,56,
+197,233,95,136,132,144,148,148,213,71,6,106,73,193,210,49,
+243,113,137,162,223,127,82,195,122,68,88,33,140,9,169,113,
+69,72,84,6,247,4,9,89,9,139,249,226,25,68,123,191,
+169,17,191,236,250,44,119,249,7,84,180,184,183,43,58,182,
+78,57,139,71,5,243,173,211,69,233,112,148,184,81,174,2,
+135,43,63,156,78,133,58,253,47,33,98,55,207,255,75,136,
+96,241,74,88,172,226,126,47,227,218,92,133,165,82,46,70,
+197,10,77,165,92,150,95,21,202,242,120,172,48,216,12,229,
+185,92,33,9,65,202,37,137,66,85,162,110,254,249,188,203,
+118,187,88,193,225,148,207,22,5,199,88,164,18,133,137,164,
+167,40,253,81,144,200,101,76,60,174,128,64,202,79,191,235,
+59,29,149,44,22,221,239,37,42,83,126,231,254,133,78,87,
+189,194,133,104,81,89,10,20,50,31,114,95,5,40,92,165,
+29,117,43,29,175,230,105,120,129,45,238,167,114,89,25,85,
+36,233,101,186,70,166,204,112,139,92,143,218,113,221,7,78,
+71,217,226,119,207,47,193,241,138,243,214,83,93,183,149,247,
+251,210,91,158,242,149,239,61,254,85,254,86,168,123,123,235,
+41,1,109,22,8,224,90,225,107,94,212,206,182,31,114,131,
+182,246,179,76,80,190,240,92,253,93,36,176,99,195,183,40,
+23,115,247,152,232,211,16,247,120,23,173,248,154,128,45,218,
+117,231,238,206,193,36,148,158,192,111,1,46,209,53,76,223,
+225,124,74,248,133,50,234,152,93,141,235,105,183,96,245,204,
+254,37,172,138,79,76,102,110,227,170,128,15,58,125,29,232,
+189,170,174,75,19,78,224,150,102,117,53,119,30,120,21,203,
+213,194,87,173,51,247,234,233,6,31,7,237,135,228,122,227,
+59,182,253,221,222,57,91,234,219,211,74,71,70,11,151,212,
+204,120,149,211,244,214,56,165,113,5,227,5,64,212,195,36,
+229,103,247,172,189,4,254,91,80,127,204,24,113,46,41,21,
+114,129,13,140,20,17,55,0,99,87,194,161,94,230,5,65,
+184,93,51,119,105,2,54,44,19,93,108,182,51,78,55,89,
+38,212,186,161,80,3,2,27,41,199,232,36,221,224,234,180,
+114,217,225,57,177,237,145,81,107,94,1,253,186,194,255,111,
+89,83,78,85,160,164,173,140,136,44,231,74,11,227,24,162,
+32,18,252,35,185,2,165,0,80,85,112,88,121,188,16,146,
+147,244,24,156,2,138,11,140,125,128,130,32,55,60,95,148,
+200,64,124,186,81,62,238,20,23,143,180,78,142,231,235,242,
+249,216,147,217,57,227,139,213,240,229,185,122,93,190,154,157,
+115,150,127,21,138,242,229,185,196,191,72,137,139,209,160,207,
+215,115,2,182,74,91,253,23,41,97,88,82,205,230,196,151,
+231,198,101,170,193,80,168,15,58,26,149,178,72,163,93,21,
+201,4,37,28,78,124,121,238,95,178,132,215,211,101,178,149,
+169,120,222,54,153,42,141,6,10,51,194,76,28,143,227,133,
+194,102,144,134,153,20,73,106,149,42,69,162,202,225,128,73,
+209,235,19,179,217,24,84,162,124,167,99,18,195,194,255,229,
+75,244,48,216,178,231,41,115,93,63,221,219,150,247,151,161,
+113,199,234,102,130,109,165,83,170,90,165,182,149,135,117,28,
+18,215,167,115,219,158,85,127,37,249,24,89,33,39,196,81,
+170,247,149,151,184,118,62,251,199,155,252,107,110,169,221,143,
+250,241,92,25,199,221,143,230,241,76,118,41,222,7,55,100,
+32,84,45,4,194,182,249,37,83,189,147,238,44,68,245,15,
+158,211,95,171,186,225,109,221,42,162,255,35,83,207,69,29,
+27,58,110,63,87,180,161,21,228,90,203,92,77,64,155,198,
+92,157,123,116,112,91,51,58,35,87,184,30,61,116,214,64,
+219,196,85,66,127,118,162,218,250,213,66,167,8,26,161,104,
+39,121,21,133,70,113,84,39,110,213,79,245,166,60,39,186,
+102,169,71,50,198,51,110,135,158,174,95,66,178,83,227,93,
+217,244,67,63,142,30,114,110,181,83,186,211,99,228,123,1,
+157,62,150,110,214,186,107,167,33,21,189,208,114,175,122,100,
+181,185,140,58,167,181,86,228,30,17,241,210,195,27,12,45,
+194,165,234,250,33,240,219,252,169,173,166,34,163,36,247,235,
+96,47,153,233,239,129,193,246,40,32,78,8,26,3,132,32,
+161,22,166,178,243,109,1,86,104,155,129,93,61,38,52,148,
+137,68,17,255,240,199,117,89,47,227,239,184,12,98,2,141,
+4,179,61,16,152,128,185,118,107,185,81,203,199,98,191,161,
+223,35,6,79,8,66,219,30,211,66,186,76,57,50,64,75,
+10,198,136,217,39,198,40,193,224,29,133,42,32,194,40,97,
+73,72,35,149,16,33,20,213,239,135,230,100,12,134,46,135,
+128,168,94,47,148,27,148,219,221,80,30,79,6,138,255,237,
+253,81,221,83,55,138,199,131,194,197,224,217,166,114,60,201,
+29,58,39,149,203,69,157,207,173,112,147,45,50,151,243,224,
+130,232,187,197,100,246,201,89,108,42,22,139,218,255,11,161,
+224,138,44,182,74,190,40,150,105,42,190,82,89,174,80,82,
+199,209,49,202,96,8,207,229,98,145,36,148,111,169,100,61,
+85,137,242,175,68,49,168,183,219,191,40,138,193,217,34,82,
+38,137,68,189,48,150,173,74,164,242,107,161,64,137,199,81,
+33,68,40,28,0,137,60,29,14,145,173,68,224,42,46,220,
+75,129,192,148,92,183,176,232,250,172,17,121,26,6,2,91,
+134,64,100,188,158,43,7,129,43,55,29,94,185,229,81,219,
+110,69,12,145,34,177,157,211,251,237,24,53,24,132,195,55,
+241,1,101,156,82,126,51,1,57,142,255,149,84,162,157,237,
+24,219,247,0,131,165,115,75,233,190,149,215,242,66,25,158,
+242,229,239,211,251,18,238,190,69,87,103,123,75,1,218,38,
+17,133,207,133,175,122,64,91,4,255,25,237,59,241,93,23,
+225,233,223,65,131,116,29,180,235,122,202,87,71,157,180,235,
+113,226,2,213,29,176,139,125,98,119,230,105,160,234,63,15,
+143,251,114,79,220,35,7,162,129,72,84,159,70,60,255,174,
+168,72,159,13,206,194,249,10,44,159,232,137,91,174,95,174,
+31,42,221,79,163,118,151,14,90,17,93,20,237,153,173,141,
+224,91,180,86,107,221,223,171,159,165,213,21,89,126,197,5,
+189,186,255,91,187,39,22,30,111,171,151,83,212,211,154,165,
+235,55,134,85,169,225,121,79,83,251,152,122,63,168,15,60,
+145,104,226,31,219,156,113,20,68,5,108,101,152,193,17,139,
+9,69,0,67,232,71,250,73,140,98,79,207,85,218,185,61,
+184,73,36,38,170,205,179,190,204,151,70,42,254,234,182,120,
+229,38,143,97,162,169,4,101,16,36,82,49,102,157,160,229,
+196,47,163,182,253,134,143,123,6,104,5,246,255,110,112,146,
+140,10,242,213,8,18,38,137,136,88,124,82,150,144,252,208,
+140,24,108,252,91,162,126,72,113,24,124,204,9,8,147,62,
+64,74,144,37,156,46,73,68,32,130,159,254,139,19,112,241,
+238,104,186,114,185,166,158,130,199,152,141,83,191,88,155,42,
+101,178,82,151,47,63,51,130,217,154,252,151,43,160,86,27,
+104,180,250,230,96,84,201,227,149,218,85,182,156,17,202,213,
+228,99,177,24,153,205,6,150,141,85,63,153,85,138,68,175,
+146,23,42,181,116,42,248,159,223,119,44,149,14,13,131,65,
+61,79,84,173,5,62,26,95,155,76,122,201,227,73,194,96,
+28,99,234,117,67,42,85,191,235,29,42,117,154,198,82,72,
+146,25,154,84,26,39,185,72,163,253,222,96,251,30,67,10,
+179,154,23,235,184,18,101,21,39,215,67,81,200,42,47,174,
+215,24,87,149,169,116,222,9,87,234,247,171,238,126,24,156,
+165,203,200,186,137,111,90,84,66,219,171,113,222,203,157,243,
+205,176,10,64,235,80,251,193,96,156,142,126,105,217,4,142,
+75,230,122,104,170,199,62,250,21,227,214,152,231,145,57,107,
+63,151,184,231,158,56,207,127,157,6,188,151,246,26,107,171,
+134,238,187,114,222,126,146,99,122,187,233,247,185,18,95,20,
+193,62,252,103,36,218,247,2,62,132,103,212,191,146,205,63,
+148,39,127,191,251,13,240,161,159,133,231,41,221,85,117,226,
+183,252,139,34,107,160,43,64,122,225,111,222,19,242,122,6,
+44,84,42,31,148,251,64,222,208,167,226,170,141,214,200,156,
+55,203,237,188,15,166,61,171,111,155,4,119,129,31,85,243,
+38,237,119,65,31,232,219,204,189,90,123,223,17,219,251,182,
+86,123,192,46,218,253,193,117,92,17,182,245,124,29,70,217,
+174,241,122,237,237,108,93,237,77,77,253,65,225,217,105,254,
+10,176,237,47,193,236,229,245,215,2,162,74,85,233,97,232,
+77,51,226,108,43,93,175,222,235,235,230,16,34,12,166,6,
+111,48,67,69,30,163,16,240,253,223,202,97,217,139,160,4,
+146,128,117,237,237,125,243,80,116,166,108,176,243,53,52,43,
+133,42,81,4,18,254,45,80,143,37,194,11,215,128,41,38,
+80,113,187,30,164,4,23,206,64,25,126,152,155,127,213,30,
+123,237,219,155,48,252,35,188,56,37,26,145,144,144,199,171,
+160,150,200,171,6,250,227,108,22,75,144,10,68,4,96,188,
+203,41,40,9,184,3,38,1,1,77,222,238,46,65,80,61,
+61,38,237,247,188,15,227,246,214,124,179,213,154,126,163,137,
+62,46,230,116,74,219,109,21,158,203,45,224,112,243,135,213,
+105,82,167,27,13,69,104,253,191,224,1,47,235,95,240,0,
+12,198,153,191,220,38,77,166,193,105,42,213,114,98,165,26,
+75,42,149,82,42,181,176,255,251,155,215,153,255,242,2,26,
+5,145,90,67,235,209,168,113,52,74,114,139,222,10,46,215,
+124,163,169,153,156,77,22,85,154,30,166,40,147,81,172,88,
+224,75,228,242,2,133,50,7,21,72,38,125,158,197,247,104,
+177,104,114,36,146,152,138,197,210,124,190,16,179,197,230,33,
+200,113,63,132,204,175,54,147,169,196,66,252,183,74,192,226,
+12,254,173,18,220,31,150,225,113,146,158,231,8,71,117,195,
+60,167,42,11,201,33,93,66,215,196,178,60,48,149,231,81,
+187,247,129,206,125,197,56,238,250,243,60,222,155,248,92,253,
+142,197,150,127,204,242,230,244,89,55,225,125,149,238,251,101,
+180,224,253,212,239,205,113,55,241,73,2,52,110,251,75,140,
+135,92,134,44,236,25,24,5,160,125,4,23,1,3,1,115,
+183,60,15,94,2,226,22,153,120,33,5,64,245,169,107,183,
+130,78,237,251,245,245,155,40,44,24,0,1,32,115,113,0,
+101,21,228,82,155,55,30,192,161,139,254,98,45,189,44,187,
+94,91,60,13,182,218,95,36,5,86,207,173,13,160,211,235,
+246,159,39,135,186,107,152,213,148,253,232,21,64,91,143,118,
+222,56,107,198,253,198,14,185,214,236,214,235,156,240,206,193,
+113,160,66,179,240,44,58,11,140,74,85,233,212,253,55,207,
+104,220,129,108,53,50,152,134,102,0,96,17,241,140,229,224,
+66,76,44,89,41,39,19,208,169,32,145,143,68,64,61,253,
+132,47,112,250,2,172,145,172,86,207,86,33,223,90,173,80,
+228,10,32,224,243,57,26,11,205,84,252,126,143,64,5,174,
+54,50,8,76,164,64,208,244,251,110,197,56,175,131,209,170,
+119,197,50,233,174,191,145,37,169,223,71,134,245,120,68,152,
+36,20,34,227,181,68,72,68,243,251,145,132,156,140,201,32,
+32,32,231,47,137,145,64,132,221,239,141,228,241,32,241,191,
+192,254,95,253,254,144,186,117,110,18,46,90,104,171,225,243,
+5,233,120,78,56,92,14,201,122,77,178,88,90,241,165,82,
+34,13,23,136,173,255,5,14,236,18,255,11,28,216,59,28,
+241,181,90,242,179,139,124,119,146,43,72,190,82,37,161,80,
+72,190,60,70,50,24,226,115,57,88,34,9,21,90,42,249,
+64,65,162,80,98,95,30,147,222,110,164,86,43,62,200,224,
+36,202,36,137,233,145,199,99,4,201,111,178,87,40,74,229,
+114,210,8,49,138,15,68,18,161,223,70,162,255,34,177,212,
+16,37,154,228,121,168,161,48,42,206,115,17,93,111,21,232,
+118,140,145,104,63,72,17,146,232,122,202,236,31,87,247,95,
+10,65,134,203,143,175,155,36,182,85,90,242,251,73,203,170,
+132,174,211,38,53,29,10,199,219,211,218,31,149,191,5,229,
+49,10,33,227,121,49,41,204,127,147,56,46,217,77,253,126,
+196,61,47,146,187,247,144,116,223,242,219,113,82,140,71,249,
+201,247,51,48,141,111,63,74,100,108,106,230,2,174,90,205,
+45,171,207,226,197,239,214,110,34,142,225,123,222,192,139,141,
+248,19,119,240,37,239,199,240,140,93,196,33,252,21,229,117,
+142,84,121,252,181,226,117,188,122,87,127,243,96,116,123,160,
+111,194,245,157,123,99,174,194,157,39,56,142,50,248,107,228,
+61,240,232,31,193,251,224,118,0,79,103,121,72,102,242,100,
+52,135,146,111,21,255,170,159,68,97,252,166,236,125,70,175,
+63,206,246,243,169,100,126,210,159,247,64,212,226,173,188,209,
+202,211,98,249,34,7,72,101,76,107,13,255,147,52,233,78,
+251,12,104,26,136,86,96,49,208,72,60,23,105,207,102,152,
+185,128,5,6,12,40,226,191,156,88,32,144,35,226,132,192,
+14,225,218,93,103,35,129,25,12,199,170,101,235,80,24,107,
+74,40,8,93,144,234,233,151,76,132,30,106,126,63,64,224,
+3,59,27,8,148,219,11,17,209,236,176,139,201,63,93,23,
+186,119,124,140,255,99,51,153,21,32,164,21,131,65,74,156,
+81,16,17,147,61,129,52,71,41,128,193,20,159,111,88,232,
+102,137,144,240,212,87,124,189,84,46,94,24,59,46,184,221,
+165,44,158,29,238,231,218,237,82,85,71,79,78,127,203,121,
+63,216,108,45,174,215,165,37,76,89,46,4,190,227,94,58,
+93,26,138,203,57,152,175,92,45,158,78,37,192,90,93,46,
+6,203,85,64,177,92,46,141,165,101,76,222,79,165,23,199,
+99,64,105,46,255,238,65,197,208,139,80,104,201,15,108,82,
+249,217,241,56,111,215,219,75,25,28,149,26,6,140,39,5,
+38,179,116,183,56,168,172,132,84,146,27,198,227,165,129,136,
+74,176,248,194,209,162,94,95,194,164,48,167,163,156,74,245,
+133,195,145,2,145,88,2,138,163,165,171,141,202,130,37,160,
+144,28,158,151,251,248,253,165,182,179,196,181,56,75,234,102,
+9,203,254,148,78,203,82,89,89,218,142,147,37,40,186,100,
+63,31,74,76,99,41,78,238,150,246,195,18,81,92,90,11,
+131,37,32,184,244,238,190,74,29,119,201,218,221,229,186,79,
+255,235,192,23,150,162,252,252,231,78,158,158,216,221,28,208,
+62,121,227,16,151,63,215,36,184,242,240,113,247,93,7,46,
+17,240,65,47,196,69,24,76,192,175,252,194,43,134,253,19,
+118,225,36,190,226,171,237,247,194,60,188,114,229,59,158,189,
+171,239,160,4,238,252,51,240,28,204,28,15,217,146,196,139,
+81,62,245,83,112,46,222,116,197,71,248,77,139,111,160,4,
+167,225,112,188,209,243,73,61,116,179,32,10,111,83,31,90,
+23,189,84,152,109,106,247,79,115,199,117,137,36,171,215,19,
+203,253,113,89,149,117,54,223,155,244,105,248,218,231,213,222,
+70,211,181,187,167,212,114,236,246,150,246,138,117,159,88,161,
+213,252,214,19,70,189,81,83,154,128,30,47,111,98,30,139,
+99,1,21,22,67,143,146,35,12,35,205,51,202,126,79,228,
+28,21,75,70,95,125,36,169,248,8,61,44,32,40,0,131,
+209,21,28,203,153,179,22,65,40,24,165,36,120,120,65,220,
+13,151,5,71,94,85,33,169,192,197,211,251,243,8,84,240,
+246,184,218,238,220,71,102,40,158,136,189,87,121,17,24,22,
+56,219,100,60,22,25,143,21,84,255,26,50,148,26,26,216,
+251,190,5,120,34,216,108,233,100,8,67,157,157,206,151,228,
+195,181,54,208,84,91,77,229,166,63,39,30,108,170,118,123,
+56,208,104,246,211,95,27,86,28,108,117,52,155,37,238,191,
+180,138,70,109,202,98,135,255,5,86,216,34,255,11,172,168,
+181,170,191,26,53,181,202,47,33,148,202,112,185,60,28,36,
+18,251,48,212,6,116,181,90,149,31,141,250,77,165,83,16,
+104,84,8,15,133,14,64,160,253,91,239,177,105,179,28,182,
+82,156,137,19,167,99,164,209,96,12,51,153,131,227,49,180,
+111,176,108,210,48,7,200,81,101,18,164,95,73,22,49,28,
+134,247,251,1,145,193,216,31,77,54,133,46,193,97,202,113,
+8,130,207,251,86,225,240,116,56,25,138,12,6,66,120,190,
+21,181,237,210,187,206,223,189,231,16,125,62,44,215,253,36,
+189,207,17,174,141,138,121,79,85,14,146,116,123,136,174,65,
+100,121,84,32,223,163,246,220,10,207,237,138,113,141,17,247,
+194,191,224,0,12,15,61,46,86,244,191,7,149,164,173,167,
+129,214,67,248,28,248,198,1,222,67,250,204,179,151,65,247,
+25,121,242,63,146,3,64,179,134,132,30,229,120,112,51,216,
+106,112,244,205,224,169,1,157,247,182,45,189,239,68,52,194,
+251,167,166,112,38,154,209,204,103,155,178,21,13,232,10,179,
+115,86,11,39,53,24,199,217,95,135,94,190,159,175,113,134,
+64,45,40,221,140,38,182,99,23,61,221,129,214,183,103,103,
+63,127,27,208,129,227,220,26,230,220,107,3,135,112,35,203,
+185,154,155,194,92,85,117,219,171,227,42,23,29,212,14,158,
+226,90,206,221,118,235,59,156,55,251,105,229,183,210,230,94,
+223,239,13,72,219,233,212,61,192,245,212,252,221,234,6,245,
+15,82,75,183,215,134,154,166,153,115,202,55,112,16,30,132,
+233,132,233,158,255,44,184,224,49,140,140,219,48,84,130,244,
+10,172,89,233,193,77,96,65,19,166,198,24,178,60,225,15,
+131,198,0,8,96,37,104,154,3,112,33,13,219,108,214,139,
+164,225,138,70,13,136,238,220,204,49,69,52,113,214,15,14,
+4,42,82,23,161,180,208,193,156,36,115,129,247,103,237,149,
+27,199,195,103,95,131,95,21,46,162,234,204,89,223,30,31,
+130,193,145,2,66,187,206,238,19,17,8,175,151,4,228,39,
+60,61,201,46,127,26,31,18,91,154,122,19,158,44,20,131,
+127,182,17,230,98,173,151,195,231,179,158,196,229,170,214,235,
+209,170,201,174,55,18,22,83,148,144,78,143,138,228,250,190,
+22,179,152,8,167,147,111,212,230,214,155,201,10,190,68,40,
+151,71,101,106,175,94,143,87,74,132,49,112,60,170,51,191,
+123,240,105,20,66,56,60,202,251,136,245,90,236,59,30,222,
+110,163,14,143,201,198,37,39,35,66,189,62,90,77,126,152,
+68,255,207,175,159,60,159,143,18,40,230,158,147,250,145,18,
+145,72,223,232,233,98,210,163,145,79,132,148,207,143,138,191,
+181,209,72,114,27,33,111,216,171,254,54,35,50,105,153,8,
+12,70,194,243,73,79,60,143,224,247,143,218,86,231,136,235,
+28,169,155,143,17,150,61,58,45,71,159,178,114,52,78,142,
+194,31,244,232,118,24,213,141,205,145,188,56,66,146,71,159,
+188,120,212,15,142,240,9,47,201,251,244,189,47,30,238,109,
+109,29,85,187,98,50,255,147,121,255,33,189,183,62,124,196,
+127,135,196,239,137,117,228,211,168,23,208,208,163,222,61,12,
+70,77,45,238,186,207,160,215,203,78,235,32,74,161,85,49,
+237,192,21,219,139,140,69,180,75,139,114,203,240,23,81,4,
+13,211,58,51,14,107,16,189,209,218,42,157,157,155,177,11,
+140,188,208,90,210,210,160,63,126,235,157,208,66,107,234,12,
+103,110,221,181,255,103,56,169,111,170,78,205,205,72,239,7,
+25,52,84,75,115,127,219,121,131,244,201,62,119,44,231,125,
+19,61,229,117,108,238,157,107,164,245,108,163,232,106,135,223,
+150,61,144,215,231,206,219,167,85,61,107,238,185,105,213,185,
+106,135,97,57,204,227,122,234,181,80,139,53,201,85,250,221,
+9,91,198,104,79,123,44,160,31,247,26,80,154,167,194,58,
+32,203,1,255,220,17,19,65,153,19,22,6,190,72,70,252,
+59,64,229,213,3,184,198,107,217,229,115,104,214,38,75,177,
+138,109,204,219,105,24,83,69,18,246,1,74,67,96,162,117,
+152,86,82,25,57,213,56,15,144,184,42,188,158,53,239,251,
+58,247,229,56,195,87,31,209,150,34,191,159,152,147,249,88,
+12,2,242,219,209,155,95,34,16,97,127,83,245,94,47,17,
+47,27,26,3,81,247,71,253,126,15,109,56,56,153,179,89,
+42,91,164,139,213,104,62,35,116,205,86,116,163,17,82,71,
+213,34,26,45,127,48,178,101,246,120,169,36,89,236,86,20,
+179,9,177,88,50,194,167,147,168,209,248,127,57,40,17,169,
+66,69,41,151,16,195,68,50,60,30,139,10,182,66,62,142,
+148,217,106,128,210,191,245,71,10,21,71,65,252,29,194,183,
+155,88,212,106,229,207,22,217,234,223,99,114,228,137,152,135,
+32,253,69,23,10,33,140,92,46,26,141,242,5,32,73,166,
+207,83,248,218,7,10,77,14,71,80,162,155,56,156,229,163,
+68,34,76,232,63,59,121,168,141,231,33,3,193,176,208,42,
+252,254,30,242,96,248,69,244,184,132,47,27,100,243,95,56,
+138,71,237,16,220,138,20,138,196,113,118,165,143,99,212,172,
+32,85,230,161,104,209,97,26,162,253,179,149,115,73,220,158,
+87,227,184,151,142,197,72,86,4,134,135,189,79,139,160,97,
+205,30,191,253,26,210,243,110,28,111,211,190,40,235,33,190,
+174,194,195,12,140,15,121,223,230,145,76,80,229,0,247,188,
+201,194,116,190,238,106,96,187,145,215,58,244,52,112,161,144,
+23,186,19,166,126,170,1,206,228,141,110,185,242,200,111,135,
+151,121,165,202,35,183,242,59,225,237,18,239,236,248,237,130,
+129,101,56,183,36,57,251,6,104,96,10,44,133,47,240,236,
+230,239,181,5,70,226,1,41,158,142,151,186,245,218,135,94,
+35,120,54,51,192,23,29,220,95,117,93,233,19,191,3,206,
+230,217,120,238,213,186,127,160,175,172,239,97,215,43,190,125,
+32,26,182,255,224,109,178,182,243,86,120,162,84,121,151,33,
+35,125,69,180,74,3,235,212,182,127,6,23,223,75,157,90,
+199,5,50,68,80,198,68,175,199,238,3,108,83,113,21,28,
+75,11,72,3,50,22,17,86,126,124,18,152,15,233,193,16,
+221,164,35,94,248,34,184,211,160,210,69,232,160,3,199,109,
+217,34,218,49,90,12,75,98,11,106,51,0,66,52,161,137,
+126,49,2,118,106,228,116,184,183,213,64,143,192,187,235,29,
+20,63,243,255,250,255,253,127,169,21,0,169,223,219,141,17,
+2,30,126,83,170,205,198,134,72,187,175,213,223,106,147,89,
+124,144,16,36,158,47,104,39,209,81,115,56,161,92,238,48,
+112,62,247,155,108,221,214,76,149,74,195,181,22,64,181,90,
+124,101,54,234,201,102,65,78,167,128,227,234,232,175,213,186,
+31,88,80,234,104,212,202,82,85,95,69,169,148,16,201,36,
+19,58,30,7,10,133,62,46,142,212,217,106,181,18,64,162,
+82,81,104,20,196,231,112,128,218,237,1,14,226,191,84,11,
+101,178,201,96,202,83,49,194,15,247,23,93,44,64,228,114,
+113,96,52,234,23,72,186,149,62,207,32,8,48,232,200,183,
+41,67,13,7,144,251,23,69,98,17,132,120,33,6,16,136,
+254,48,42,14,236,118,253,26,67,247,148,132,174,59,225,238,
+109,123,245,119,186,221,166,189,237,175,155,129,166,21,130,176,
+110,16,218,46,189,19,118,43,92,207,250,117,127,17,237,158,
+183,126,221,136,15,20,127,161,191,89,20,240,127,49,23,174,
+235,49,118,221,9,118,143,237,22,250,56,35,63,167,128,182,
+95,237,34,189,143,73,234,138,255,32,62,231,128,181,15,231,
+35,62,175,216,178,239,211,232,129,251,165,103,33,108,219,70,
+145,21,211,170,113,236,163,88,21,193,202,179,17,151,17,189,
+129,205,220,140,28,249,240,40,194,100,151,55,165,95,103,126,
+53,153,6,191,4,151,95,70,248,108,80,200,10,107,51,254,
+134,53,107,58,67,202,219,132,127,154,224,48,98,99,155,216,
+185,136,149,97,109,62,50,217,5,44,136,101,90,255,143,168,
+171,88,80,101,219,146,191,142,187,187,59,69,225,238,238,238,
+238,238,238,78,53,231,190,65,51,32,7,144,48,88,177,67,
+118,66,228,100,223,170,157,134,247,245,162,58,138,52,142,23,
+74,122,62,57,218,248,195,38,52,63,213,220,62,26,65,125,
+178,31,154,217,219,143,246,247,16,179,117,123,71,115,228,89,
+188,95,212,173,115,161,119,135,210,248,195,204,18,201,76,91,
+216,132,179,143,169,82,246,104,125,206,8,238,78,90,242,149,
+90,82,96,240,249,125,139,16,76,135,21,238,49,11,65,34,
+39,204,2,59,114,71,19,150,183,64,38,254,18,252,42,86,
+224,199,238,223,254,34,176,97,27,88,4,88,11,94,83,184,
+228,97,78,76,184,25,245,22,142,113,70,50,200,97,60,72,
+17,34,100,238,127,129,132,173,66,190,198,26,34,4,247,142,
+208,127,14,251,202,3,36,169,167,139,1,124,58,33,108,28,
+255,213,107,21,40,209,82,99,49,152,203,11,255,85,88,224,
+205,122,147,5,213,104,240,254,87,99,225,255,252,171,177,0,
+74,61,186,78,238,191,38,11,118,169,244,95,147,69,164,12,
+74,36,252,97,40,88,224,106,229,42,63,191,43,53,149,66,
+65,160,208,12,104,56,252,175,208,98,224,7,10,188,93,2,
+221,34,139,165,169,163,17,98,104,48,66,235,117,80,10,145,
+242,71,96,2,119,27,76,160,253,196,226,68,201,74,134,38,
+145,32,72,164,24,4,129,248,91,28,65,207,82,33,144,197,
+8,28,128,22,10,35,69,98,40,232,75,71,60,47,205,213,
+123,72,16,104,50,4,6,64,241,60,20,215,77,80,67,224,
+104,45,167,204,118,59,70,119,75,90,111,98,75,251,115,132,
+94,195,172,244,83,149,160,36,29,82,251,218,165,12,151,204,
+241,217,197,182,115,98,55,184,66,122,53,189,191,31,132,130,
+130,112,8,28,135,104,94,182,244,85,91,89,91,27,163,187,
+114,21,148,93,121,200,175,33,31,228,197,190,211,187,168,23,
+245,161,190,151,254,191,71,22,216,180,253,160,17,215,242,180,
+186,13,224,53,156,75,95,138,66,91,219,183,89,160,15,65,
+235,53,18,59,161,188,9,224,208,80,13,133,234,200,141,3,
+92,116,186,163,49,217,115,243,0,126,135,126,107,46,58,77,
+78,1,45,64,19,80,57,186,119,160,59,171,147,84,24,103,
+25,84,157,189,93,63,92,128,26,209,69,77,237,208,102,92,
+250,151,53,10,110,194,134,215,170,237,16,113,102,47,155,181,
+235,0,95,140,255,28,219,153,75,212,251,24,91,154,18,3,
+217,153,174,248,31,127,154,251,113,138,175,168,158,58,186,5,
+93,230,94,96,39,252,126,189,152,77,156,0,91,218,217,239,
+134,74,44,120,74,201,104,77,216,50,239,114,42,96,251,25,
+96,179,184,18,83,175,92,242,117,2,64,130,229,224,159,141,
+254,132,21,69,113,25,16,209,148,159,137,242,50,95,168,236,
+77,220,127,87,51,127,70,86,104,18,75,98,4,163,17,42,
+13,250,8,249,134,222,75,88,50,112,89,63,26,122,49,185,
+111,196,18,244,111,3,105,69,220,130,179,178,199,131,81,187,
+185,64,73,233,195,247,79,213,16,56,56,123,182,249,113,124,
+185,232,226,68,226,112,34,55,23,48,91,14,231,107,105,227,
+210,64,76,38,34,57,210,55,251,39,119,130,197,117,137,116,
+56,68,22,218,243,87,46,84,40,145,138,139,130,150,72,136,
+68,160,219,175,86,150,72,32,10,184,130,72,2,249,213,252,
+108,81,40,68,32,32,18,92,1,177,172,236,112,64,236,91,
+45,145,12,30,203,240,126,12,6,68,42,37,2,137,193,223,
+23,10,69,49,146,66,17,217,153,49,93,66,68,34,35,33,
+16,142,72,131,67,96,165,131,200,0,49,155,137,20,40,52,
+2,35,225,185,132,188,158,247,135,231,22,5,130,98,100,46,
+247,253,134,155,117,7,176,253,241,109,215,38,222,246,164,219,
+222,236,181,237,78,182,237,193,54,203,135,107,123,80,109,175,
+38,211,118,66,218,118,64,137,237,138,179,29,97,54,210,157,
+100,251,112,108,15,59,197,246,98,220,246,209,231,224,75,55,
+239,39,178,236,126,34,183,30,161,103,251,34,221,78,197,193,
+118,245,39,251,60,170,3,60,231,79,242,137,254,9,64,187,
+67,154,72,216,46,95,115,22,25,206,177,205,67,59,169,108,
+99,223,251,144,250,104,38,228,36,206,66,80,22,185,158,161,
+216,242,212,65,72,74,54,103,76,52,71,126,17,146,145,57,
+0,217,45,67,200,96,108,35,225,1,116,24,132,226,4,92,
+178,232,16,94,2,209,101,200,70,38,103,24,77,75,77,19,
+161,169,45,193,181,120,136,54,54,25,213,102,32,64,163,89,
+244,83,3,178,156,182,64,189,81,15,48,141,93,109,3,99,
+55,52,75,107,222,109,83,35,180,218,188,25,227,254,205,125,
+200,173,61,193,198,114,117,85,132,72,171,170,218,13,105,167,
+51,238,14,92,212,242,252,161,97,17,186,175,192,13,6,72,
+233,16,189,66,224,206,38,130,115,152,240,64,137,70,157,51,
+145,31,249,0,188,62,132,230,50,219,196,51,50,69,124,134,
+96,41,11,81,248,151,227,67,2,65,36,141,193,30,91,250,
+6,44,180,136,189,179,193,240,38,197,78,9,161,31,246,4,
+3,26,94,216,223,3,44,129,134,8,12,59,219,248,225,245,
+188,191,187,104,31,13,189,219,76,110,231,143,126,127,119,107,
+183,95,88,141,134,150,201,124,162,31,184,215,205,237,86,34,
+178,66,35,177,157,247,173,56,235,145,205,170,177,216,204,59,
+22,251,122,60,62,175,54,215,107,161,73,127,238,176,110,59,
+173,85,12,70,213,202,65,169,184,141,225,227,151,193,240,153,
+203,101,94,9,164,219,74,21,72,165,144,86,53,162,83,178,
+187,227,241,126,191,191,128,173,214,39,131,243,58,255,216,124,
+106,56,27,235,253,201,100,199,98,225,38,135,203,95,20,202,
+231,96,112,121,229,72,62,35,150,229,197,122,209,240,126,56,
+100,222,245,250,215,108,246,217,149,40,94,3,233,111,100,67,
+122,69,160,191,25,81,226,117,113,248,180,8,222,128,236,123,
+95,49,239,95,157,207,231,164,188,79,122,227,111,138,251,171,
+168,63,107,44,251,37,16,124,204,134,229,75,89,189,209,53,
+245,189,182,51,226,123,179,37,239,147,246,247,48,253,169,71,
+241,143,126,248,18,179,162,55,239,59,228,189,93,9,127,65,
+252,235,143,28,118,56,255,18,198,244,117,9,253,163,115,230,
+219,118,215,237,84,40,149,10,42,34,81,30,243,200,195,1,
+109,192,153,222,125,64,42,128,250,125,132,243,37,64,40,79,
+201,75,68,34,36,140,32,65,64,2,8,83,92,113,116,101,
+143,189,232,196,31,98,144,141,217,107,241,154,46,83,141,217,
+203,189,154,104,132,55,109,203,219,241,104,240,187,239,42,15,
+126,198,246,63,155,191,167,227,245,174,222,110,103,85,221,182,
+195,194,163,37,214,245,106,54,78,212,76,166,227,156,134,32,
+151,202,8,166,62,44,84,44,96,231,136,127,214,60,33,18,
+160,24,193,244,39,16,66,67,36,167,3,125,16,4,69,84,
+192,3,158,32,196,3,241,55,154,211,131,184,107,4,13,35,
+152,66,136,110,113,205,3,162,138,33,53,51,200,44,54,217,
+31,159,33,194,210,137,226,134,207,218,153,255,220,14,239,190,
+55,199,131,23,95,57,115,88,68,254,180,61,121,252,233,118,
+24,120,47,166,166,199,222,251,174,110,52,249,172,10,248,244,
+154,82,76,102,36,215,118,48,116,239,63,6,126,155,103,114,
+217,211,235,126,224,233,92,219,81,246,211,68,92,182,223,218,
+168,65,78,12,156,123,206,214,7,13,172,46,77,129,195,218,
+254,166,123,79,133,232,54,9,183,105,188,32,227,117,183,208,
+136,177,109,219,131,13,223,58,7,190,243,202,141,106,95,233,
+186,33,200,194,19,255,236,91,203,204,32,173,151,170,28,32,
+42,92,255,138,241,31,87,241,20,78,19,173,160,23,178,163,
+226,63,219,97,135,50,65,3,160,215,64,137,206,238,153,3,
+10,130,21,122,193,65,168,22,97,128,137,205,108,107,146,204,
+102,77,121,106,76,79,90,102,148,141,147,9,83,149,220,139,
+179,174,47,7,230,70,187,186,98,152,188,236,197,193,254,114,
+246,16,141,245,122,115,105,218,50,57,73,26,81,156,151,213,
+139,67,19,131,147,44,211,29,231,135,97,132,28,20,101,71,
+77,103,181,178,111,46,11,115,70,163,17,139,242,54,167,147,
+187,224,155,141,226,160,188,96,207,54,155,92,52,205,78,253,
+77,76,155,236,162,112,39,182,88,28,205,6,231,160,181,27,
+237,117,57,217,222,101,179,56,88,108,70,238,45,213,115,61,
+149,246,170,74,72,50,14,135,172,86,93,169,228,123,84,40,
+67,92,44,166,101,106,241,119,119,170,148,108,201,36,247,3,
+2,26,77,165,248,116,230,76,38,56,46,158,209,248,27,171,
+215,102,163,3,159,123,191,103,90,45,217,22,62,76,101,46,
+134,186,56,147,74,77,31,14,35,79,157,102,178,22,35,3,
+147,27,143,103,32,144,41,233,229,50,90,42,76,174,117,141,
+65,236,96,80,59,31,12,230,2,129,25,239,199,43,179,90,
+139,197,162,118,222,239,115,140,81,251,226,248,115,76,80,166,
+55,242,62,163,31,114,52,227,105,122,78,250,43,121,137,188,
+231,206,13,255,125,198,232,30,120,234,25,227,71,226,113,157,
+2,150,55,98,136,176,190,9,47,94,51,128,138,254,9,27,
+180,98,234,65,93,42,56,99,195,74,107,6,174,175,226,69,
+162,217,96,77,151,42,126,3,45,182,88,107,187,131,220,154,
+23,3,14,218,12,81,204,48,104,179,167,142,26,93,166,45,
+133,13,248,182,191,70,219,131,86,94,117,127,243,188,21,2,
+116,130,75,149,233,142,16,188,166,118,91,196,197,238,113,168,
+146,236,59,31,95,212,55,1,213,235,254,162,233,68,176,249,
+31,13,6,100,69,118,138,73,53,123,187,115,191,169,26,143,
+111,60,117,218,110,144,55,126,214,92,30,79,239,135,49,10,
+239,237,70,4,248,54,31,107,135,220,85,221,17,101,137,180,
+67,147,207,202,134,142,243,179,195,51,210,134,243,251,47,140,
+55,188,215,112,160,131,154,153,69,188,172,161,75,236,188,5,
+151,166,43,243,61,31,22,75,213,189,127,245,194,46,32,165,
+224,146,204,136,130,191,170,7,50,13,85,195,228,116,86,123,
+216,230,104,130,138,12,109,174,170,154,127,181,177,192,203,139,
+154,135,179,170,169,112,30,15,188,46,72,61,158,220,31,242,
+16,88,55,12,76,142,199,163,196,129,129,135,243,130,72,90,
+117,210,84,251,217,201,138,11,163,185,237,118,8,168,60,159,
+206,118,19,139,18,157,202,130,234,203,9,112,178,149,20,209,
+167,51,83,55,197,132,37,71,227,222,224,160,160,98,115,185,
+155,47,12,8,73,110,250,157,198,49,83,249,210,104,55,91,
+157,98,82,28,236,6,139,190,221,98,77,134,146,111,46,9,
+104,174,57,101,198,17,99,249,246,250,248,171,56,32,160,56,
+20,2,21,189,219,131,130,29,154,66,181,223,94,209,120,22,
+41,182,213,254,157,255,171,58,237,236,184,151,237,21,237,240,
+192,193,125,115,52,178,25,12,28,230,148,137,195,96,224,232,
+113,45,150,62,75,36,54,82,154,204,69,34,113,176,32,135,
+72,255,215,204,19,234,133,237,34,17,71,40,28,226,122,189,
+168,15,16,236,86,171,253,245,186,166,155,251,244,91,222,16,
+199,110,12,35,152,40,69,142,91,238,135,220,238,223,246,230,
+60,242,219,49,86,93,42,254,251,245,52,130,59,150,33,112,
+35,144,224,4,15,27,210,18,238,96,57,15,8,146,39,72,
+130,51,150,35,176,36,52,224,57,123,16,18,14,214,28,144,
+161,130,144,10,234,112,126,79,2,50,37,84,112,253,55,129,
+96,193,246,151,132,139,9,211,191,18,176,61,247,104,7,135,
+123,63,217,22,216,191,119,218,206,240,105,117,211,107,113,79,
+248,129,124,32,80,23,186,238,180,45,45,220,182,2,233,166,
+186,20,91,102,180,220,168,42,2,219,239,112,220,204,238,121,
+129,107,55,189,114,131,235,98,134,154,126,215,246,79,138,173,
+104,177,75,120,103,216,104,182,222,105,161,150,160,241,68,255,
+140,101,206,19,100,196,239,22,9,32,238,239,197,227,254,80,
+188,247,158,229,130,235,189,175,216,149,13,165,166,63,245,115,
+81,133,31,109,180,141,59,30,232,109,83,17,162,125,15,100,
+248,81,89,219,224,176,51,111,199,226,215,236,188,3,152,246,
+78,130,3,200,76,154,80,15,123,103,225,149,89,160,207,68,
+123,125,192,217,47,111,113,113,181,102,148,238,239,26,111,203,
+242,130,55,71,6,208,246,68,92,81,54,222,247,131,51,28,
+120,60,31,171,137,209,109,165,155,25,169,203,56,185,138,100,
+196,243,185,158,141,185,132,165,201,245,195,93,55,100,67,154,
+98,157,174,181,220,174,87,178,186,210,41,59,198,213,217,138,
+203,253,126,82,163,147,247,151,20,165,231,211,249,206,139,156,
+132,194,124,187,52,42,41,226,75,165,242,76,162,219,36,141,
+213,106,109,142,13,174,103,145,236,214,231,53,71,106,131,205,
+90,157,207,145,11,50,212,169,78,181,94,181,25,29,190,176,
+88,118,103,108,164,213,88,170,145,114,29,26,120,134,161,83,
+183,171,165,33,212,146,207,196,234,229,113,75,66,130,78,107,
+165,85,24,232,7,90,3,141,90,221,239,197,139,203,229,132,
+15,179,198,184,126,58,174,215,87,163,103,4,230,118,183,121,
+121,218,36,27,215,27,153,226,139,68,242,12,128,220,95,41,
+224,177,151,120,220,221,18,141,52,130,193,245,74,40,188,8,
+4,78,175,215,219,174,86,55,227,241,164,171,243,121,182,188,
+118,49,157,246,12,97,239,195,101,244,180,237,47,91,111,213,
+234,164,152,213,201,15,106,239,174,77,241,162,81,132,176,7,
+199,216,161,76,79,128,130,231,45,8,5,202,95,194,138,246,
+4,181,31,156,195,5,220,136,117,66,64,195,136,166,4,55,
+25,172,195,12,194,107,219,105,51,76,175,85,78,236,22,107,
+213,143,45,150,110,54,146,105,214,142,236,231,100,59,236,173,
+57,247,155,129,188,160,101,90,162,179,20,109,180,206,250,158,
+191,42,160,3,107,123,226,77,143,91,211,22,188,49,96,128,
+85,119,35,95,225,187,251,31,141,215,10,12,155,167,219,131,
+141,163,120,92,179,176,108,215,193,228,246,111,0,222,107,130,
+135,204,13,188,9,56,62,176,23,217,125,247,143,212,145,113,
+66,247,196,82,43,243,124,48,223,208,70,124,218,110,21,250,
+115,219,203,170,87,94,23,114,93,213,143,21,24,75,39,224,
+64,215,142,1,28,206,88,219,147,104,206,225,204,13,226,129,
+107,107,3,190,209,206,109,1,132,131,178,97,17,238,221,211,
+69,69,180,160,38,86,163,223,22,142,99,44,96,150,136,170,
+88,194,62,150,185,94,166,233,143,76,167,39,23,198,186,241,
+173,82,146,203,150,151,93,95,91,157,222,239,208,202,114,190,
+204,27,169,31,195,138,153,222,204,76,231,19,1,236,167,90,
+78,242,180,86,150,60,210,106,39,71,115,16,126,90,54,27,
+81,185,225,184,59,86,44,172,218,88,84,255,84,200,56,28,
+59,129,24,47,183,86,117,99,228,43,42,214,235,181,5,138,
+7,153,44,141,70,99,213,57,216,213,246,250,15,217,90,103,
+177,86,88,172,101,43,47,85,114,61,165,150,105,141,75,44,
+14,71,243,176,86,167,85,150,114,169,95,11,137,154,101,170,
+154,108,40,252,80,26,10,133,101,53,30,91,128,190,10,166,
+50,25,30,215,82,41,217,50,24,176,241,83,165,65,101,162,
+82,106,182,214,168,217,225,169,173,85,218,155,60,76,102,44,
+250,250,208,146,74,53,31,14,172,55,108,144,254,52,24,169,
+81,243,96,80,235,243,17,92,175,54,24,172,244,122,177,229,
+247,183,25,130,168,65,170,20,141,52,64,99,240,166,251,179,
+249,122,173,94,104,122,99,146,181,166,169,220,37,219,221,180,
+188,205,142,245,97,212,180,237,225,150,188,120,173,25,167,141,
+27,210,95,171,210,218,2,132,59,128,30,28,99,42,124,21,
+128,13,220,195,35,124,54,192,30,192,130,169,115,46,128,5,
+248,11,67,230,204,128,54,0,3,198,212,44,0,15,176,6,
+151,235,14,128,12,80,197,29,250,30,192,21,203,87,201,0,
+87,54,100,219,170,231,95,135,217,31,182,237,84,35,71,55,
+131,26,150,117,214,94,30,176,76,199,247,103,95,206,188,56,
+116,213,53,235,150,169,74,219,229,77,109,24,58,31,41,252,
+218,118,179,25,118,36,252,98,221,143,126,120,237,144,24,205,
+190,157,201,218,237,179,183,62,187,188,23,249,125,173,215,184,
+163,97,171,218,196,28,183,148,156,119,21,88,204,238,14,72,
+220,196,29,32,194,77,231,171,212,167,187,224,250,85,129,230,
+210,10,84,216,181,19,13,187,212,246,214,97,219,245,169,63,
+168,84,178,60,231,10,74,226,252,59,134,218,1,158,53,208,
+229,13,218,180,246,29,43,166,149,28,114,227,66,150,190,238,
+0,186,65,141,234,132,130,24,205,224,65,52,192,103,147,142,
+174,27,237,21,254,50,205,58,223,15,202,240,38,240,120,168,
+38,70,115,213,74,103,164,42,227,164,19,145,159,173,231,122,
+22,5,51,154,23,148,157,237,166,109,128,204,78,149,240,22,
+173,254,170,151,210,12,184,156,235,102,214,114,10,149,149,213,
+63,92,110,37,75,77,52,58,155,182,169,25,83,148,72,22,
+139,114,23,248,202,131,217,98,18,213,198,135,229,209,88,6,
+253,24,255,107,218,113,171,11,114,179,208,223,160,116,183,212,
+152,234,124,78,86,26,13,101,109,165,182,202,245,168,80,101,
+177,112,45,203,84,179,161,160,216,81,26,74,133,106,60,142,
+84,128,190,70,99,49,54,30,213,255,21,241,136,148,248,169,
+90,101,162,133,40,53,123,107,217,225,181,204,214,106,162,95,
+51,26,141,234,122,189,146,74,189,150,17,24,53,108,248,217,
+75,235,197,130,42,30,23,87,36,146,101,0,100,254,242,15,
+139,189,196,226,246,150,200,63,254,81,227,133,194,74,175,183,
+244,121,1,229,108,118,177,94,71,207,39,211,227,86,107,203,
+218,106,227,180,41,203,134,173,25,214,136,235,172,112,28,15,
+211,57,169,109,95,99,172,156,244,239,79,149,125,115,23,198,
+170,109,152,131,189,182,130,3,140,84,218,8,142,176,195,70,
+0,189,193,18,91,223,9,108,39,177,103,14,96,133,189,153,
+121,129,25,246,204,51,0,190,177,140,173,224,234,112,208,186,
+81,212,114,135,107,69,89,203,218,149,155,96,107,135,199,243,
+202,217,197,113,171,250,39,235,2,107,7,129,75,219,9,155,
+137,106,7,183,242,35,187,120,61,80,153,150,176,79,51,189,
+233,251,62,105,61,204,122,31,76,171,166,231,174,148,91,118,
+88,127,153,45,149,123,254,243,162,9,62,158,28,231,212,237,
+206,195,106,53,253,116,217,177,253,187,244,233,151,143,23,133,
+201,221,224,199,237,238,62,49,103,188,146,235,152,30,229,23,
+208,176,32,190,182,239,65,158,155,254,117,211,94,185,192,107,
+171,94,112,7,176,183,189,118,89,169,178,99,162,97,149,45,
+137,31,79,243,79,84,132,68,206,241,195,87,225,201,188,137,
+62,59,166,77,64,94,188,196,44,62,19,81,58,246,138,111,
+230,3,71,25,51,9,229,120,226,79,254,198,210,5,167,131,
+74,85,245,207,93,79,230,127,75,35,35,45,177,86,41,3,
+3,113,156,84,69,178,98,169,12,206,192,208,190,250,133,236,
+108,235,6,111,72,84,36,134,209,106,118,187,77,83,211,78,
+103,65,221,196,74,78,101,225,254,63,20,209,168,9,99,161,
+179,169,155,16,191,116,42,205,98,65,7,250,173,249,218,108,
+50,213,70,186,67,242,104,36,198,85,170,116,154,22,137,160,
+75,182,197,127,181,59,205,157,132,148,108,115,165,22,96,69,
+68,107,46,22,42,158,136,40,117,52,10,229,205,88,174,50,
+33,160,180,61,10,149,188,219,165,42,125,170,208,88,244,143,
+234,148,84,74,27,12,208,120,196,244,251,58,133,82,35,218,
+90,201,14,79,106,181,86,3,253,154,193,168,222,213,235,52,
+75,147,68,180,245,227,89,171,68,250,93,49,69,117,234,71,
+42,135,199,73,140,89,95,167,194,236,247,52,6,35,89,66,
+82,164,162,0,137,54,129,32,145,122,8,180,14,194,128,84,
+30,15,77,171,253,67,203,100,255,122,248,169,155,13,211,156,
+52,172,207,172,113,65,146,172,233,163,180,188,88,173,25,99,
+247,107,18,221,83,244,146,215,248,191,198,145,21,208,216,129,
+123,172,74,217,107,37,194,249,50,165,29,46,55,202,165,14,
+244,164,24,125,170,66,23,10,167,156,141,29,168,118,153,161,
+9,244,78,212,119,181,239,68,185,169,213,254,235,182,222,15,
+161,158,160,165,237,167,25,148,181,15,212,169,233,249,179,227,
+198,195,123,99,34,59,106,190,59,4,14,93,230,166,126,152,
+99,7,196,142,244,157,135,79,127,22,246,99,144,249,202,183,
+53,66,92,12,76,147,83,6,121,68,229,237,6,197,215,181,
+57,163,96,90,253,157,60,3,203,110,227,230,69,122,125,211,
+254,142,103,179,95,121,211,206,160,196,78,115,94,208,161,118,
+119,170,49,113,94,191,63,122,130,26,250,89,196,5,59,148,
+62,9,22,204,160,168,254,83,121,145,230,234,124,176,170,116,
+64,107,208,35,99,247,159,96,48,114,142,43,138,86,137,39,
+14,228,112,240,142,158,130,54,178,193,91,255,54,48,6,236,
+175,169,129,198,145,85,212,30,163,70,156,192,166,6,250,202,
+75,73,160,151,231,250,191,27,227,61,211,63,228,73,221,146,
+90,153,72,60,26,207,232,247,209,52,102,217,242,60,145,38,
+17,153,212,180,227,98,156,174,108,161,185,113,172,210,243,179,
+107,138,203,157,152,27,45,255,63,211,115,124,58,19,247,188,
+200,88,136,55,158,141,20,10,106,55,151,217,173,194,128,150,
+140,31,253,198,250,143,209,106,102,158,216,236,116,65,110,23,
+230,253,173,238,150,22,75,125,169,103,210,104,24,107,179,212,
+98,145,18,17,237,96,69,162,85,159,211,80,245,52,149,58,
+57,28,140,61,95,79,163,52,210,105,67,214,253,117,140,35,
+237,96,91,173,85,26,105,84,12,19,157,194,176,183,142,135,
+14,207,110,173,166,250,72,198,241,144,170,215,39,56,75,147,
+67,236,103,178,44,171,177,54,41,149,140,64,242,60,147,177,
+200,126,238,44,50,41,181,223,79,136,181,218,241,100,178,27,
+128,5,14,111,131,195,154,71,112,56,27,12,78,127,246,159,
+9,159,111,164,211,27,119,63,232,232,186,79,70,246,99,202,
+56,101,201,102,105,99,150,51,251,204,27,178,227,181,203,108,
+39,154,44,126,242,35,172,179,49,79,38,144,78,124,50,39,
+114,58,241,204,108,37,177,189,46,108,103,88,104,142,226,143,
+97,68,23,218,158,152,75,114,230,130,108,88,201,92,23,180,
+39,61,76,218,254,93,170,178,65,220,81,169,202,3,225,107,
+13,131,96,184,129,173,61,8,68,167,102,80,133,62,166,81,
+243,31,8,119,25,186,118,222,239,115,237,254,203,250,121,44,
+56,220,55,196,254,164,69,130,109,207,32,219,70,111,58,190,
+245,17,109,59,18,131,244,223,47,245,128,147,183,19,114,149,
+213,244,235,97,151,173,142,168,210,119,63,252,237,237,195,132,
+65,141,2,35,207,33,235,244,67,77,206,207,19,43,214,238,
+111,246,21,206,19,254,200,106,199,7,194,201,203,161,225,106,
+118,208,84,48,246,45,159,8,207,183,96,239,90,193,62,234,
+11,96,162,251,173,209,241,160,31,147,35,139,22,28,25,13,
+124,112,255,0,24,222,191,93,44,203,199,37,108,160,127,100,
+155,108,73,52,195,228,74,130,105,25,237,29,82,235,179,205,
+189,156,84,191,222,7,96,84,55,39,6,86,60,146,197,199,
+123,130,36,93,201,58,253,139,233,241,179,76,140,166,179,29,
+78,70,186,161,158,47,12,243,142,73,98,44,74,42,108,128,
+195,145,82,80,231,91,192,63,147,83,80,196,23,77,118,92,
+168,51,91,128,255,74,79,14,246,185,105,99,137,143,126,126,
+126,32,197,161,56,174,48,155,105,38,194,227,65,14,13,158,
+10,165,177,92,97,133,16,131,98,26,27,151,24,90,229,42,
+91,161,72,81,177,212,31,97,174,148,239,247,20,90,43,18,
+242,99,176,25,138,115,57,50,107,133,83,41,140,155,171,152,
+199,19,229,186,92,41,215,235,15,14,233,251,253,167,101,106,
+145,225,195,68,92,143,25,143,153,181,85,113,82,255,145,187,
+219,161,1,179,87,248,215,230,244,51,138,141,138,5,146,92,
+232,231,134,122,140,193,32,165,143,232,127,126,127,139,33,8,
+68,174,74,81,72,3,212,14,101,128,66,24,175,23,47,213,
+233,252,64,209,233,238,113,202,158,100,204,246,164,157,57,201,
+152,210,92,199,130,101,203,159,138,217,235,207,214,99,180,19,
+204,80,230,46,238,181,44,141,48,141,239,10,18,105,5,194,
+61,200,160,17,92,65,182,27,93,96,3,44,208,217,95,39,
+32,130,158,217,3,128,49,244,212,242,85,47,208,217,163,63,
+139,26,120,159,211,57,216,192,63,75,222,202,121,152,190,171,
+28,78,60,118,170,191,187,180,22,110,20,119,172,157,41,184,
+103,166,255,87,231,136,92,232,224,116,55,194,224,113,220,200,
+190,104,187,51,72,211,140,240,15,163,161,115,195,229,163,109,
+143,91,128,167,250,90,22,27,75,110,207,67,9,31,255,228,
+239,109,124,71,219,237,237,226,233,211,221,131,211,185,242,194,
+78,227,109,151,236,213,242,156,191,172,216,152,197,187,252,194,
+234,215,47,131,158,252,97,182,216,176,90,12,67,161,5,219,
+99,30,221,223,244,126,190,46,102,229,73,57,93,211,86,131,
+143,189,243,102,160,69,218,128,190,235,52,205,215,206,40,110,
+244,75,153,119,90,112,214,194,59,220,203,223,14,212,127,217,
+89,8,130,171,216,80,17,238,107,102,17,119,103,238,195,182,
+225,179,138,217,82,102,113,147,116,237,223,206,142,53,86,144,
+70,220,60,213,171,62,40,205,99,131,112,51,242,207,23,179,
+156,70,7,34,50,92,173,76,94,69,89,34,14,254,22,120,
+204,102,51,46,10,71,240,210,66,173,18,161,160,92,195,165,
+82,47,13,255,210,233,228,201,68,156,154,248,86,11,131,197,
+194,146,90,10,133,127,251,58,86,76,66,18,113,56,134,107,
+189,58,175,178,84,74,140,93,88,52,60,155,245,10,127,162,
+86,159,83,80,88,98,0,53,12,219,243,130,136,142,70,101,
+38,147,88,222,203,163,151,132,106,173,204,106,180,199,132,195,
+145,125,32,48,244,3,137,201,136,121,50,102,30,143,216,3,
+7,167,151,69,25,212,215,120,100,196,50,153,17,228,233,36,
+70,143,83,73,154,241,71,194,96,166,134,134,2,73,175,207,
+199,122,31,198,112,128,209,235,35,196,217,108,56,146,232,93,
+192,22,131,181,192,224,44,55,24,140,245,126,99,61,123,79,
+100,187,21,203,100,211,124,48,104,187,106,242,223,188,101,27,
+194,246,9,26,101,8,65,70,248,127,7,19,142,53,126,13,
+208,226,110,138,69,214,220,225,184,201,186,186,108,237,120,3,
+225,148,248,199,147,79,245,196,55,14,58,245,121,31,240,190,
+29,145,21,246,87,156,209,84,96,131,95,26,199,153,11,190,
+57,230,176,252,96,54,202,247,77,17,125,59,186,89,111,60,
+113,59,158,255,75,179,87,49,172,195,219,122,176,235,169,76,
+63,52,93,184,1,40,175,88,187,146,224,153,106,65,110,16,
+71,247,167,144,13,155,242,188,65,83,210,135,249,190,141,77,
+231,35,219,121,135,89,179,3,105,166,190,232,191,254,56,254,
+115,226,115,162,101,51,202,65,157,233,178,129,171,78,153,188,
+156,107,146,111,217,191,164,109,213,133,149,180,222,168,208,106,
+219,177,228,207,206,32,139,94,61,152,48,110,86,183,38,90,
+112,94,95,228,89,179,166,176,90,17,7,92,187,163,101,22,
+182,174,21,220,82,205,167,215,203,179,145,37,185,91,23,248,
+66,206,113,130,240,21,130,133,11,184,26,252,128,187,183,13,
+249,115,150,209,54,178,128,133,196,127,24,130,140,166,58,181,
+223,100,161,203,86,225,43,211,172,254,188,0,238,144,178,52,
+149,126,118,26,9,247,131,224,213,154,95,16,176,95,91,44,
+214,159,92,23,146,185,145,203,251,115,37,69,240,233,236,231,
+13,34,81,233,75,45,152,30,10,250,159,147,9,48,70,135,
+224,215,201,232,227,152,116,26,22,137,248,193,165,4,139,133,
+57,99,207,48,100,40,87,157,62,127,213,102,68,24,198,210,
+177,68,36,166,66,137,85,149,203,176,68,2,156,179,204,126,
+127,117,20,58,123,7,1,5,235,76,161,9,94,242,77,217,
+137,4,134,28,14,195,120,217,92,169,55,250,85,153,118,118,
+24,241,245,10,118,120,66,43,188,234,235,51,14,7,204,215,
+207,192,44,77,2,51,247,175,244,68,87,131,237,77,166,96,
+2,5,140,3,76,18,25,155,68,198,98,144,72,216,237,22,
+92,33,85,194,159,8,129,58,102,35,16,58,8,148,25,112,
+5,48,126,63,12,0,248,3,243,249,254,104,180,119,31,143,
+107,58,95,175,175,235,239,174,214,20,111,45,101,232,131,186,
+49,170,143,13,64,130,120,47,43,130,197,26,108,4,179,167,
+213,62,224,179,172,38,243,38,229,251,75,76,9,223,175,158,
+48,71,92,255,158,169,66,100,196,15,211,34,227,20,239,77,
+35,153,208,181,197,226,138,51,7,54,108,149,233,79,20,140,
+172,231,241,64,199,50,221,128,178,226,200,244,15,73,133,135,
+14,61,200,181,27,168,89,202,244,154,251,149,13,167,105,71,
+117,83,198,133,59,12,3,197,182,27,228,225,35,115,156,1,
+236,45,3,225,5,255,246,45,135,255,182,230,110,57,34,79,
+120,9,150,237,175,166,13,23,28,137,205,93,174,244,91,75,
+230,243,68,17,178,150,150,237,157,247,46,123,228,176,6,123,
+56,119,105,182,24,240,227,109,59,220,147,218,233,101,151,171,
+71,252,28,197,88,220,97,90,116,89,187,17,150,81,221,165,
+197,171,116,161,67,156,155,72,171,121,0,71,44,99,172,237,
+207,199,42,15,226,174,249,156,56,210,38,129,202,247,13,245,
+37,110,132,121,6,34,46,194,155,85,120,184,8,142,74,146,
+213,38,92,184,95,213,192,186,95,254,83,44,97,213,111,112,
+169,23,181,117,81,213,251,143,92,30,155,141,87,84,94,56,
+191,220,50,21,111,87,146,133,217,99,21,131,127,75,143,203,
+229,108,152,17,59,242,146,245,108,38,66,3,221,134,98,183,
+157,11,15,118,143,157,83,215,146,137,63,63,111,210,80,220,
+81,148,173,166,229,87,142,220,33,145,214,171,44,86,43,139,
+240,224,84,40,138,233,200,83,57,90,126,40,20,239,177,116,
+212,249,45,85,75,179,164,51,121,6,1,61,170,148,235,251,
+89,211,227,89,58,145,62,6,3,55,94,38,209,42,10,116,
+218,2,141,66,157,90,26,143,183,235,229,211,101,217,116,249,
+24,177,61,86,171,119,133,54,229,165,43,211,201,162,136,46,
+158,85,52,143,58,61,229,179,20,83,195,57,30,141,63,66,
+161,119,0,244,29,84,231,123,10,158,140,204,255,235,165,16,
+243,207,253,254,35,151,123,131,118,58,207,111,140,79,200,10,
+174,231,242,243,185,124,209,53,165,44,95,203,207,89,179,222,
+41,238,83,249,168,222,167,249,35,78,214,158,135,209,229,223,
+205,239,242,46,40,29,168,42,94,236,147,254,86,149,143,59,
+88,130,202,136,23,18,198,78,142,57,145,28,242,111,200,134,
+252,196,17,89,1,116,2,89,100,125,23,144,90,45,211,205,
+32,37,25,85,224,6,74,163,125,91,26,55,142,230,175,156,
+74,109,88,219,99,44,19,149,197,3,51,71,245,159,95,149,
+133,231,159,136,107,151,28,195,137,27,86,133,43,139,7,225,
+134,235,255,0,28,28,207,151,7,219,238,107,198,164,204,247,
+162,208,207,232,111,117,127,30,218,74,119,144,53,155,131,96,
+244,125,178,233,60,244,35,79,46,7,80,22,253,34,142,209,
+225,4,149,226,219,238,13,217,226,135,111,255,166,219,96,173,
+224,23,15,63,186,177,214,206,48,103,168,211,111,162,87,31,
+152,26,155,213,125,136,21,79,215,183,120,154,228,227,176,135,
+160,2,207,156,208,113,202,218,183,225,164,85,97,216,13,57,
+67,85,14,188,186,98,36,112,3,239,253,186,196,129,238,8,
+183,231,33,175,163,219,157,4,203,129,139,81,35,154,8,232,
+112,249,41,242,225,227,176,210,252,88,85,78,104,250,118,233,
+112,34,43,202,229,125,33,98,97,53,70,178,246,183,236,192,
+225,68,5,254,188,241,79,135,28,124,41,201,100,254,10,73,
+175,189,84,206,231,249,248,116,44,177,215,101,228,57,153,197,
+138,13,197,25,197,189,108,54,205,22,75,228,39,36,82,42,
+139,229,138,120,17,26,124,161,66,118,127,177,82,118,40,20,
+146,246,88,154,249,45,149,43,37,194,225,192,245,9,94,223,
+119,81,105,139,155,237,213,142,35,53,182,90,55,58,156,127,
+49,2,157,254,43,149,224,210,149,222,100,182,58,30,207,109,
+8,78,59,243,175,175,162,74,167,74,135,198,51,115,202,116,
+156,78,92,180,244,149,76,22,165,63,11,6,34,245,175,102,
+66,30,135,211,9,130,161,238,180,143,236,29,181,90,251,100,
+18,104,12,5,58,81,136,254,160,139,80,200,12,4,138,156,
+128,64,199,223,31,119,139,199,103,146,201,233,60,40,103,123,
+187,214,171,70,156,73,167,173,199,159,205,187,97,106,143,226,
+142,253,125,120,246,190,4,207,139,167,217,230,127,78,236,250,
+163,24,148,122,225,42,59,132,31,244,233,67,252,160,240,160,
+31,241,130,29,61,120,135,243,239,40,229,168,45,255,164,20,
+196,4,62,43,220,204,255,226,2,199,5,164,29,21,120,65,
+60,130,88,199,141,116,251,53,18,62,248,65,224,130,53,193,
+27,177,196,15,222,126,213,202,5,72,195,117,231,142,215,178,
+13,102,222,53,187,153,254,188,244,124,157,12,167,142,31,194,
+119,143,135,32,243,21,171,160,205,245,130,84,113,189,72,158,
+219,114,160,252,98,134,3,136,122,70,245,7,10,30,142,31,
+236,137,46,119,224,120,156,118,121,1,37,184,117,59,2,30,
+131,119,109,128,94,1,47,111,65,134,134,110,118,7,203,229,
+202,243,65,98,179,250,143,28,91,241,68,22,209,157,203,9,
+120,123,84,193,25,187,15,154,19,220,224,147,104,40,122,178,
+76,85,129,131,13,177,124,98,89,255,227,192,50,203,242,231,
+253,101,136,3,92,9,247,39,65,106,135,199,157,68,55,182,
+3,100,247,61,125,47,219,97,230,126,83,147,106,254,235,173,
+84,233,21,177,144,205,229,134,212,149,203,137,69,160,38,154,
+157,12,205,161,46,40,168,18,117,26,171,204,17,254,85,64,
+120,208,196,164,57,157,110,128,153,152,47,110,216,236,190,185,
+32,159,207,114,21,127,117,41,37,21,170,178,63,181,186,140,
+10,55,88,187,175,238,204,149,74,243,87,119,26,137,132,58,
+103,253,85,255,10,198,227,6,17,232,107,86,126,212,106,126,
+249,112,111,144,72,107,222,94,79,139,22,105,84,196,28,141,
+54,67,161,141,151,166,202,230,107,211,73,120,113,50,89,216,
+57,235,65,6,103,113,54,217,212,180,116,252,95,113,4,243,
+116,82,163,165,233,36,189,248,243,179,96,166,214,131,131,193,
+34,143,179,9,113,193,88,103,218,239,27,223,124,180,62,153,
+44,138,88,130,77,20,98,241,213,39,12,182,0,131,205,192,
+43,176,1,0,168,249,124,101,37,26,117,238,132,151,183,31,
+164,134,195,43,109,94,123,57,249,225,218,139,37,231,89,113,
+41,72,214,99,219,190,241,117,22,221,192,71,121,22,46,35,
+182,245,136,207,51,119,181,21,234,82,23,192,129,247,12,216,
+28,78,124,51,160,124,246,95,217,11,65,5,9,21,46,104,
+68,96,225,242,50,20,232,32,80,51,175,29,110,104,0,206,
+241,1,196,61,224,129,23,108,189,100,213,115,174,116,15,249,
+157,202,54,216,112,215,172,95,233,189,244,138,155,21,187,14,
+93,59,117,67,89,231,178,13,125,218,54,87,7,30,189,12,
+74,30,78,186,157,85,95,181,220,80,148,10,182,125,16,96,
+184,104,247,36,164,85,174,39,20,17,57,120,108,33,35,123,
+202,231,132,140,224,155,221,195,215,94,251,95,184,185,218,224,
+171,83,30,173,241,46,128,102,103,152,156,57,87,15,48,86,
+171,163,110,160,21,143,216,120,46,226,162,39,132,223,1,82,
+123,158,51,55,122,200,157,207,182,195,61,192,161,145,23,147,
+232,241,216,212,34,133,138,247,88,38,112,154,161,168,50,159,
+23,5,10,226,173,15,192,252,233,191,214,176,58,238,174,241,
+56,242,223,42,207,56,12,29,127,233,196,196,87,26,27,69,
+241,191,13,94,172,43,17,254,143,64,120,172,255,17,8,14,
+85,104,40,230,115,97,230,96,255,177,215,197,228,224,87,108,
+210,67,49,81,151,48,99,177,172,199,163,33,34,206,22,11,
+147,217,110,14,169,42,165,210,108,23,18,253,247,71,15,98,
+161,84,89,64,2,105,66,24,42,215,86,17,144,33,203,96,
+72,207,229,176,109,182,74,161,204,80,104,129,217,197,147,43,
+10,20,31,109,129,66,153,90,154,219,143,183,75,166,203,226,
+198,116,121,103,99,113,56,174,116,133,6,75,87,70,189,201,
+226,95,29,196,220,198,162,37,201,180,159,184,35,158,215,49,
+89,163,81,40,93,32,253,8,253,193,85,111,54,24,154,245,
+122,49,139,193,72,151,40,63,4,67,129,204,211,32,209,214,
+34,228,31,141,152,122,64,32,203,235,197,106,175,218,72,179,
+57,156,203,133,76,111,215,184,229,77,220,25,78,122,85,103,
+49,17,70,83,81,182,248,201,160,75,24,174,146,105,140,136,
+143,105,43,139,110,152,0,225,201,143,172,126,244,46,1,0,
+48,194,1,144,120,192,177,26,190,245,254,245,54,240,223,224,
+217,202,206,149,8,236,115,198,116,49,206,124,218,26,252,208,
+126,214,158,220,58,92,112,163,116,27,255,150,87,187,160,131,
+14,246,165,125,250,117,28,207,25,85,27,121,14,56,117,125,
+167,101,29,220,78,212,53,11,213,105,57,12,187,56,78,11,
+41,238,59,119,3,124,102,235,223,222,221,54,29,158,126,77,
+14,27,31,86,225,182,36,0,96,248,222,12,144,126,165,190,
+68,3,127,238,85,55,126,122,116,179,192,55,218,75,175,172,
+89,232,226,175,13,188,179,133,91,132,160,199,109,253,192,99,
+47,91,253,198,92,241,132,140,139,233,206,5,126,35,143,42,
+124,239,14,232,60,37,58,92,17,151,105,11,250,142,141,255,
+77,70,107,140,226,51,106,68,207,237,246,192,202,75,145,21,
+172,104,20,20,78,124,69,24,116,56,225,220,43,186,8,56,
+61,122,203,250,71,173,63,139,95,51,155,102,57,254,243,31,
+139,203,69,248,245,31,121,69,121,125,90,135,132,57,171,133,
+52,166,209,204,173,12,139,13,44,27,152,243,69,193,106,178,
+144,228,165,118,206,119,93,44,203,36,164,67,195,199,149,42,
+138,240,160,240,40,138,105,200,82,185,44,94,40,20,133,186,
+156,102,64,149,169,212,197,225,240,18,17,126,147,137,146,212,
+47,93,120,186,237,130,104,167,209,252,184,120,142,95,68,236,
+95,237,195,111,14,119,180,47,94,175,115,103,207,115,88,171,
+233,254,239,235,120,40,213,235,11,149,75,101,102,171,51,169,
+146,107,58,250,45,22,203,170,61,205,97,46,115,73,162,215,
+196,80,142,199,23,18,155,228,28,0,177,252,57,89,52,170,
+28,14,203,223,124,252,191,158,7,129,67,20,224,210,126,112,
+4,100,30,14,87,130,193,209,242,231,179,232,118,205,90,60,
+190,145,76,186,123,81,96,35,24,116,127,245,165,145,78,187,
+151,180,199,250,113,58,83,228,11,228,131,92,30,70,21,222,
+191,74,231,157,182,46,254,254,182,215,110,170,1,179,141,162,
+87,194,151,62,110,253,74,7,178,9,183,120,18,243,198,95,
+225,141,182,126,245,158,71,217,70,206,27,89,105,13,59,89,
+89,215,71,80,143,94,59,5,157,4,116,157,153,93,6,243,
+88,134,113,21,92,225,143,169,37,232,224,42,45,126,181,158,
+154,81,215,140,208,149,119,27,121,164,107,182,28,177,105,233,
+79,105,43,116,29,5,110,238,70,240,44,110,27,146,183,77,
+182,189,252,207,170,89,251,203,27,183,205,3,135,237,58,224,
+14,218,249,220,95,241,217,205,218,31,227,185,90,159,244,240,
+135,183,9,28,207,220,155,29,172,181,246,219,235,138,171,9,
+194,179,183,0,172,239,129,191,221,121,220,138,11,120,164,114,
+88,90,185,19,124,150,115,11,211,245,27,49,68,208,170,29,
+240,70,99,186,10,162,30,236,5,248,187,17,96,239,44,9,
+61,127,37,30,203,95,172,163,7,69,108,204,139,84,13,99,
+238,43,198,6,70,180,225,208,171,243,15,133,7,29,6,186,
+127,215,39,21,151,11,185,44,10,135,228,146,245,107,173,128,
+130,190,252,60,106,52,16,255,112,1,248,31,46,204,255,225,
+162,156,243,13,255,195,133,92,201,251,122,13,197,215,106,36,
+138,98,18,50,118,54,139,21,138,68,185,46,39,217,80,241,
+48,84,225,106,97,164,4,130,193,80,158,95,229,168,108,149,
+74,249,101,163,208,72,188,76,161,64,20,168,52,5,10,85,
+26,180,52,10,111,151,74,143,202,18,233,242,222,166,32,254,
+175,150,65,137,74,134,39,74,131,177,156,98,50,21,167,19,
+21,189,151,38,254,25,14,5,161,80,40,165,126,20,118,92,
+157,202,248,77,196,114,24,61,67,113,187,149,87,126,149,226,
+39,66,229,170,135,40,76,41,28,250,13,184,3,37,161,80,
+209,235,133,202,57,130,66,224,27,227,167,178,195,62,127,191,
+239,229,52,77,41,205,215,218,89,214,236,120,163,57,184,142,
+197,52,71,206,178,252,166,205,119,195,34,0,177,151,179,94,
+185,231,175,51,61,159,171,10,186,193,162,66,107,238,239,81,
+122,13,146,189,46,162,131,140,4,187,130,204,100,187,51,103,
+214,129,95,220,223,26,144,153,199,197,44,226,189,115,59,106,
+230,45,216,117,19,54,51,186,46,202,83,115,174,63,161,49,
+205,156,211,196,124,179,251,109,8,117,192,214,31,192,21,117,
+116,185,56,215,156,184,101,245,208,63,62,86,93,68,59,200,
+214,253,25,113,235,112,92,191,182,217,177,83,203,113,248,194,
+181,90,200,100,207,185,95,203,54,171,208,93,221,102,180,144,
+66,110,202,68,186,125,50,174,90,26,24,109,238,71,108,158,
+102,29,68,171,111,102,166,106,107,233,175,35,174,238,6,175,
+122,74,133,171,5,244,90,59,211,148,221,161,62,172,172,117,
+5,91,38,238,193,247,221,16,73,126,204,119,229,55,250,14,
+209,58,231,65,124,243,97,151,20,26,158,99,154,175,158,32,
+169,116,159,23,15,34,27,99,118,104,5,41,41,241,194,35,
+225,141,11,136,54,59,94,205,82,81,29,46,190,129,230,163,
+178,128,44,210,128,255,171,36,131,36,186,160,145,165,211,189,
+208,79,209,98,38,70,2,17,233,191,64,75,25,158,207,33,
+81,190,82,70,19,27,13,105,45,181,48,44,40,34,162,92,
+83,17,84,202,114,165,18,153,147,253,170,126,115,21,138,242,
+154,76,82,65,64,131,138,144,170,55,18,183,215,120,19,71,
+26,108,181,248,112,72,20,137,198,125,161,97,45,240,197,199,
+138,227,177,78,189,223,19,173,86,96,223,255,61,30,40,245,
+250,49,161,82,73,217,234,84,63,85,154,252,99,138,48,85,
+69,51,168,211,204,35,75,49,50,80,227,113,113,66,34,25,
+15,68,134,145,208,31,239,253,14,7,252,127,125,11,12,198,
+24,116,50,253,215,183,160,23,98,208,69,24,76,49,5,131,
+169,126,127,2,224,1,72,189,222,66,181,90,157,175,213,45,
+91,206,142,235,1,11,193,160,253,122,214,28,50,156,241,170,
+46,79,48,141,148,162,76,49,147,165,11,56,190,246,245,222,
+71,199,179,124,66,251,246,86,62,123,188,151,201,54,7,119,
+241,173,100,153,246,118,142,175,53,162,65,135,49,212,177,78,
+2,93,236,219,155,121,19,84,218,106,10,90,32,150,154,80,
+90,69,138,147,152,85,108,91,147,75,236,156,157,104,109,96,
+115,107,129,7,68,143,156,75,54,217,150,187,164,253,97,154,
+141,90,117,235,211,179,30,216,63,87,5,198,174,12,154,142,
+21,172,129,119,179,119,59,241,25,183,18,217,33,50,235,95,
+78,208,254,168,109,166,22,182,106,237,63,44,45,124,11,214,
+108,238,166,108,238,102,19,116,171,77,60,231,173,79,99,201,
+110,39,22,153,183,13,37,177,183,186,155,183,173,228,109,192,
+27,126,249,153,123,87,183,158,15,171,92,111,117,175,130,249,
+209,41,60,133,67,92,113,81,21,60,99,240,87,203,185,45,
+206,157,150,133,48,182,21,207,1,23,214,181,210,2,239,80,
+137,139,86,248,203,183,79,103,212,115,228,16,15,113,162,230,
+28,49,229,61,85,223,56,20,255,48,8,188,45,151,37,170,
+82,41,20,68,67,66,50,254,239,66,141,141,146,78,75,244,
+196,88,84,138,130,193,10,93,109,159,16,139,181,185,114,53,
+175,140,8,75,126,34,194,8,137,184,88,132,203,212,171,200,
+64,66,64,81,40,4,170,208,209,16,16,148,213,120,44,49,
+149,252,211,158,50,145,136,237,245,32,96,180,72,161,202,81,
+232,86,220,15,4,37,203,163,245,84,121,56,80,236,246,38,
+36,152,31,141,126,13,64,35,181,94,71,89,154,93,34,83,
+30,139,229,36,126,153,178,166,250,250,88,155,200,92,38,146,
+68,61,215,63,48,160,36,18,72,120,32,18,9,253,196,13,
+95,139,64,23,67,17,159,98,48,160,228,243,40,98,44,22,
+14,65,68,42,68,138,200,82,32,144,121,31,4,42,7,129,
+169,159,253,7,213,237,66,241,248,103,32,153,236,207,229,140,
+157,183,171,223,242,2,95,223,217,159,252,48,204,201,146,254,
+237,24,44,74,97,170,36,142,218,15,41,94,237,231,247,182,
+113,134,187,195,143,104,39,92,202,250,77,82,183,92,249,217,
+130,164,213,31,200,58,240,250,17,74,54,144,167,248,96,197,
+131,172,192,11,166,178,177,3,110,238,69,85,60,79,185,27,
+149,124,62,89,190,102,103,47,102,195,156,3,171,129,31,236,
+163,50,164,50,201,147,178,206,214,43,180,145,212,139,170,129,
+20,154,113,171,221,96,201,26,175,106,104,183,183,184,130,251,
+131,203,253,10,156,249,217,132,152,105,155,23,153,162,91,135,
+135,73,171,9,197,176,217,251,165,17,150,179,14,103,70,152,
+181,207,252,252,184,106,136,40,251,190,27,185,121,234,32,122,
+200,223,47,212,29,173,159,210,148,117,156,187,190,212,173,3,
+233,60,240,177,26,155,218,234,86,212,71,71,225,251,195,56,
+100,57,143,34,50,13,254,70,114,151,24,94,125,205,159,224,
+231,170,117,62,11,140,207,13,239,50,238,196,188,208,61,51,
+63,186,168,135,248,145,125,13,121,227,6,79,65,211,223,185,
+66,209,148,167,102,227,207,95,45,157,14,25,126,200,214,47,
+29,68,96,34,106,130,205,138,189,19,110,98,108,116,62,75,
+188,22,26,34,124,96,177,56,34,82,92,169,140,151,183,84,
+215,63,0,28,128,168,127,0,160,35,90,177,58,211,101,42,
+101,162,83,50,137,116,223,235,135,156,168,56,28,62,4,108,
+129,187,31,200,73,74,241,247,251,193,229,186,111,162,26,78,
+80,104,183,31,246,171,213,189,66,227,164,227,180,233,36,97,
+52,140,134,243,249,129,150,228,209,110,63,217,52,85,38,137,
+17,153,169,251,193,224,146,71,226,60,198,111,54,70,192,24,
+25,135,219,237,222,2,114,92,150,10,143,171,150,225,81,164,
+104,36,33,54,136,70,253,254,33,151,131,220,99,8,215,111,
+140,247,98,252,94,175,244,231,253,30,127,191,70,157,206,65,
+10,69,143,209,180,152,251,225,26,29,167,137,105,138,78,204,
+242,212,252,111,254,240,172,89,175,4,229,110,13,33,15,251,
+225,200,171,126,9,254,54,206,123,183,255,17,93,133,75,122,
+111,73,234,102,43,31,247,42,99,95,246,172,56,226,50,73,
+216,25,11,159,200,197,155,237,125,48,3,51,225,172,10,151,
+89,136,170,224,244,193,178,42,226,48,82,98,145,53,170,126,
+55,74,208,198,169,58,72,55,87,14,163,234,52,62,45,53,
+242,78,234,95,246,74,195,174,155,64,43,218,208,36,1,183,
+56,245,79,243,69,171,246,11,205,182,135,49,147,81,5,231,
+103,155,53,194,123,47,247,115,176,198,178,241,157,177,54,59,
+80,109,181,246,50,143,86,155,138,127,46,117,6,28,94,243,
+23,25,154,111,14,152,58,91,29,66,201,90,206,226,102,36,
+109,43,61,112,12,91,195,157,222,190,109,203,201,232,6,118,
+172,71,152,94,123,113,218,89,97,228,3,186,68,103,79,128,
+152,246,156,177,34,111,130,54,4,254,117,64,253,233,95,74,
+23,124,69,25,180,5,225,26,68,202,8,7,7,204,43,211,
+207,236,189,233,135,248,70,161,211,255,237,123,145,205,95,0,
+128,34,204,127,122,16,131,188,255,7,128,63,201,63,0,24,
+88,140,111,206,252,50,64,189,85,166,202,85,20,36,20,44,
+17,5,42,157,12,196,7,170,215,153,114,53,21,191,191,75,
+36,161,74,107,162,26,238,99,121,162,202,168,35,80,40,49,
+91,107,84,255,120,84,90,252,40,56,73,216,56,245,12,110,
+164,114,178,71,227,120,13,177,170,79,126,84,226,32,153,198,
+211,12,245,163,185,101,110,40,149,72,36,209,109,104,24,199,
+227,6,9,66,82,31,136,84,66,127,59,210,139,13,6,35,
+125,84,111,96,48,234,39,147,79,165,72,208,152,114,52,31,
+65,128,66,227,129,32,99,44,20,26,4,130,250,160,39,80,
+9,124,147,105,70,118,60,83,239,207,228,136,166,161,220,31,
+137,9,62,75,79,179,101,199,235,150,110,183,199,39,105,18,
+58,205,16,178,29,101,203,226,95,253,5,164,94,19,235,13,
+250,225,72,28,177,254,215,115,1,247,150,95,147,202,38,32,
+245,86,149,170,247,99,204,83,30,136,54,86,94,73,28,21,
+66,14,178,93,153,211,149,80,82,101,110,227,163,106,192,3,
+234,111,23,249,211,112,142,148,57,11,104,189,177,252,170,103,
+13,220,166,62,174,13,252,5,207,169,124,26,48,145,180,78,
+45,249,236,181,112,231,10,171,99,178,165,113,92,220,42,208,
+134,130,51,156,14,118,56,84,238,23,216,140,170,235,191,155,
+109,54,26,189,90,29,52,26,173,26,218,8,52,51,90,104,
+161,217,197,232,128,159,202,125,47,102,230,217,247,35,42,143,
+102,223,181,50,69,90,247,208,220,95,236,157,107,191,20,212,
+234,48,179,59,94,38,221,254,58,143,87,229,230,228,6,60,
+236,13,190,82,180,214,143,240,121,83,17,244,120,18,186,225,
+50,141,75,233,70,226,0,20,101,35,152,178,10,90,49,118,
+46,18,61,136,55,220,133,39,251,83,102,249,135,254,224,159,
+113,44,192,0,95,210,207,74,72,5,66,53,186,88,74,7,
+250,161,92,46,252,103,0,234,180,74,153,152,72,200,125,185,
+152,66,17,187,219,123,37,129,96,60,46,20,96,133,192,52,
+153,76,196,112,123,61,229,223,138,15,22,2,129,66,78,48,
+198,29,164,247,187,68,155,69,179,216,202,241,46,150,209,227,
+254,87,56,65,26,27,227,147,31,147,120,18,100,241,52,99,
+189,100,53,159,23,254,13,252,38,26,27,164,241,120,129,40,
+145,204,7,34,147,240,224,79,244,98,195,161,20,179,223,23,
+106,181,121,10,136,49,57,26,44,166,188,139,69,16,96,240,
+100,208,27,144,8,133,133,94,15,50,207,17,76,186,28,235,
+69,16,156,143,228,199,3,151,112,187,165,157,78,129,147,205,
+206,95,247,2,158,135,159,183,236,5,251,113,40,49,78,147,
+211,12,5,149,225,107,184,134,176,67,49,39,157,94,183,121,
+214,229,141,71,49,68,28,139,38,125,47,148,114,116,61,192,
+134,37,63,219,250,115,120,30,184,171,162,26,142,195,112,146,
+214,177,26,48,158,65,81,106,185,129,120,183,1,150,43,8,
+186,152,220,1,253,160,71,239,28,159,161,255,165,59,16,75,
+86,42,199,210,219,224,15,1,248,129,49,189,226,147,171,104,
+14,90,62,117,254,58,72,93,89,233,250,87,30,106,101,29,
+230,18,156,202,185,7,1,203,170,253,113,75,113,114,238,227,
+72,157,50,211,186,14,126,200,106,107,165,159,81,180,206,195,
+30,15,44,86,238,115,98,92,84,57,171,92,141,54,101,167,
+182,83,224,127,88,90,143,177,239,38,234,252,128,201,83,245,
+193,175,117,205,89,167,40,155,132,73,90,193,13,118,39,155,
+78,238,192,27,140,216,138,11,11,134,195,73,193,136,136,61,
+154,205,74,220,115,133,241,42,241,136,244,211,221,189,251,199,
+123,219,201,43,218,127,191,247,248,185,223,106,95,82,255,46,
+233,104,152,196,250,183,164,129,139,69,161,28,86,40,107,210,
+128,80,254,43,24,191,199,36,32,128,66,37,34,11,5,36,
+63,155,72,120,36,225,48,36,74,166,192,168,196,64,224,171,
+233,204,254,255,6,76,203,146,216,202,254,46,246,175,23,226,
+223,29,146,68,225,218,234,59,96,9,78,12,150,200,146,53,
+85,40,222,96,73,204,101,146,159,36,234,27,226,7,3,67,
+34,143,147,24,191,113,67,140,160,99,144,110,55,72,188,197,
+145,88,42,36,14,89,140,196,209,66,97,95,92,36,150,18,
+137,36,226,110,23,175,49,36,18,95,136,196,81,33,81,36,
+6,4,150,120,189,165,159,221,135,212,237,34,173,86,118,40,
+153,28,204,229,117,181,206,55,232,11,153,214,72,118,176,209,
+236,143,100,116,138,37,101,234,131,134,197,154,53,58,140,226,
+161,36,146,180,31,74,188,159,203,239,253,243,140,91,187,151,
+196,231,53,141,123,223,241,230,118,178,214,183,14,31,103,170,
+161,173,110,205,17,142,48,73,92,2,139,100,16,198,179,123,
+228,122,142,8,146,57,118,255,26,66,254,21,104,196,100,97,
+23,179,141,95,9,76,72,69,185,249,156,23,166,227,148,237,
+118,77,17,212,242,244,73,108,109,30,98,141,51,181,46,58,
+61,89,45,181,65,205,184,182,12,251,97,74,92,109,247,130,
+102,140,106,31,211,153,105,238,167,121,92,242,210,50,14,243,
+48,46,248,210,234,0,9,78,165,110,21,124,43,67,188,218,
+126,102,231,93,149,125,57,51,251,220,31,108,204,14,123,95,
+1,92,75,143,87,14,216,246,85,51,112,214,81,248,0,143,
+63,74,147,71,162,73,99,59,89,121,90,122,19,42,0,145,
+220,7,47,189,230,57,59,56,167,25,99,0,228,71,216,64,
+43,60,161,222,46,205,187,202,127,201,158,46,91,142,159,102,
+221,44,195,114,137,64,68,148,96,85,242,191,160,31,7,66,
+2,251,127,91,63,62,25,8,40,87,146,233,119,26,201,195,
+167,80,16,75,244,55,207,69,81,168,110,8,10,149,8,124,
+41,248,152,244,122,237,59,60,112,60,77,61,218,36,50,75,
+148,195,85,103,18,34,210,202,98,51,146,71,35,45,226,235,
+221,85,52,27,79,141,149,252,187,1,119,56,148,250,177,217,
+235,28,34,37,68,34,135,145,72,223,0,22,228,240,181,56,
+46,154,28,253,247,135,69,126,40,159,31,252,254,238,65,35,
+137,77,20,224,240,118,26,28,154,12,135,161,94,193,64,200,
+239,31,8,108,130,189,15,80,235,118,217,171,169,236,114,166,
+62,63,79,180,219,21,226,241,226,3,40,250,123,24,240,238,
+199,208,102,51,176,122,172,251,85,125,192,52,242,195,69,25,
+90,150,161,162,178,44,9,79,231,119,109,46,170,27,156,31,
+18,111,162,104,239,61,242,26,51,233,3,186,225,66,210,212,
+239,239,201,186,218,220,113,244,194,20,196,54,238,81,52,65,
+24,145,195,163,208,79,130,16,192,255,165,30,77,24,203,35,
+73,9,245,133,160,137,161,109,76,172,185,62,6,198,101,78,
+171,115,160,11,29,183,117,235,89,175,26,156,251,178,40,119,
+109,22,170,144,47,230,211,0,207,124,62,119,194,95,124,84,
+109,211,115,180,50,250,176,117,56,53,97,251,56,74,89,105,
+117,225,56,118,114,191,180,195,82,106,198,34,184,227,111,232,
+236,189,128,142,79,221,42,131,144,145,231,210,245,198,84,158,
+246,124,107,98,137,215,182,79,150,3,170,112,15,188,197,58,
+187,99,133,117,101,172,235,59,96,126,205,217,220,29,1,130,
+111,126,237,120,208,87,51,2,225,8,87,183,21,110,62,63,
+1,77,112,186,232,54,71,250,191,4,26,125,230,215,85,72,
+133,50,92,222,148,37,255,124,152,100,43,2,81,232,100,32,
+32,251,93,179,133,2,145,239,203,254,231,195,251,251,125,40,
+28,150,232,8,171,239,140,109,45,18,255,162,77,36,197,118,
+59,196,29,36,142,71,132,213,42,151,175,208,250,198,48,211,
+202,20,97,48,36,158,134,52,208,199,26,172,95,51,172,76,
+33,137,6,134,248,224,96,248,149,199,41,12,193,55,164,11,
+48,176,223,158,167,67,161,203,80,88,15,53,28,66,136,196,
+97,76,62,47,138,197,242,33,32,228,215,213,162,208,126,110,
+40,44,21,10,65,128,244,224,176,223,47,242,249,90,121,31,
+32,214,237,142,176,75,229,97,79,188,63,175,104,215,191,177,
+138,110,223,177,30,167,232,201,59,253,77,225,232,73,138,70,
+76,243,212,172,175,47,51,13,97,179,134,41,159,166,200,69,
+72,114,120,184,140,162,63,143,248,41,152,193,139,182,30,242,
+251,61,53,207,146,218,240,223,163,171,245,50,205,215,93,188,
+191,181,47,55,201,190,211,70,233,63,66,115,127,11,8,194,
+112,109,14,138,138,17,217,91,19,38,194,37,224,151,248,219,
+50,86,201,50,91,0,90,208,74,88,101,242,234,140,92,7,
+14,123,58,5,90,208,166,149,194,113,168,218,32,108,82,171,
+175,3,214,238,218,88,28,242,140,109,179,0,49,67,198,93,
+7,37,109,134,203,216,119,48,232,73,11,102,25,42,152,214,
+135,190,154,67,55,127,90,250,190,116,99,104,25,7,18,120,
+12,143,189,185,40,89,250,177,103,199,105,157,123,5,3,189,
+117,236,53,96,254,187,241,199,76,214,30,192,95,88,221,236,
+254,122,126,109,201,13,153,217,33,217,70,254,194,8,227,115,
+59,28,128,243,140,49,96,199,18,98,15,70,56,161,221,55,
+123,231,188,88,19,44,107,236,223,133,36,8,191,171,252,223,
+64,187,128,255,6,26,128,255,243,213,133,86,10,112,115,21,
+74,18,149,170,38,129,66,33,73,233,221,122,15,184,92,36,
+118,178,103,227,244,51,184,120,198,71,155,140,137,150,38,99,
+207,140,27,12,144,249,252,9,9,147,126,164,196,146,173,212,
+79,160,8,113,9,62,30,15,72,36,253,129,79,20,143,17,
+12,140,64,255,118,235,183,56,72,236,133,26,9,33,196,98,
+232,119,158,129,88,172,255,157,167,206,213,98,208,126,106,24,
+44,21,6,65,128,141,96,168,223,31,248,206,179,239,3,228,
+186,221,217,122,42,59,157,169,143,27,14,225,118,67,209,116,
+20,228,223,129,134,112,111,92,144,227,4,57,205,192,168,25,
+166,248,244,229,227,12,75,202,209,7,109,95,62,222,37,40,
+125,201,33,30,64,146,33,195,72,8,249,247,202,219,38,24,
+214,174,244,219,175,118,209,75,239,45,48,11,84,118,238,138,
+212,219,252,90,46,14,253,232,232,43,195,181,14,125,224,240,
+149,4,98,33,249,1,62,58,125,197,162,208,196,165,162,115,
+106,177,132,152,32,65,37,234,46,33,46,36,136,131,192,215,
+70,74,179,4,75,64,231,152,91,171,67,203,13,168,170,137,
+73,59,86,109,37,136,251,88,213,81,96,4,140,99,233,213,
+240,153,235,169,103,34,78,49,179,137,117,64,34,86,49,182,
+106,5,204,118,219,198,190,190,0,24,76,234,85,209,251,91,
+122,19,4,197,225,205,77,20,54,106,92,51,101,40,137,115,
+109,162,77,146,180,163,156,141,116,163,32,224,228,150,108,231,
+191,133,242,89,89,114,249,230,30,227,142,7,120,50,30,24,
+199,20,3,184,227,247,186,43,241,2,247,88,245,141,105,111,
+123,78,121,199,244,48,244,191,121,242,149,42,12,229,203,181,
+221,47,217,18,6,131,0,252,223,70,73,161,22,155,125,35,
+52,61,121,56,10,160,95,53,181,210,119,186,47,215,70,9,
+220,244,210,96,64,176,213,177,84,77,194,100,130,190,88,133,
+13,136,38,147,127,161,216,197,227,68,29,19,52,130,141,72,
+20,73,44,37,1,32,145,32,88,144,192,191,100,7,3,136,
+94,15,234,51,24,254,147,9,137,2,144,66,17,148,72,4,
+193,247,251,32,157,206,63,3,254,10,36,33,2,39,245,4,
+129,32,64,32,8,224,1,0,249,124,95,181,202,238,13,197,
+187,11,237,6,184,35,191,78,249,246,128,161,38,89,250,237,
+134,104,78,210,100,219,119,97,166,83,68,155,29,57,73,211,
+72,41,134,144,225,105,151,116,103,69,239,48,242,243,67,72,
+208,126,8,29,206,163,168,207,205,191,123,39,175,160,188,24,
+242,119,159,162,123,104,45,228,239,208,209,122,185,230,169,230,
+94,114,79,215,197,150,163,7,84,6,106,206,1,93,24,169,
+35,79,150,145,146,96,237,162,68,180,221,248,183,183,141,140,
+201,33,236,175,111,237,11,186,27,172,60,65,19,172,162,79,
+40,85,166,24,40,224,168,10,21,160,48,92,203,44,167,62,
+23,77,107,126,131,147,94,122,81,71,252,92,156,138,236,223,
+75,109,102,200,20,123,178,105,163,80,183,198,162,245,151,165,
+54,15,164,4,118,180,58,24,39,186,177,183,178,175,38,198,
+124,24,8,102,92,149,161,92,131,202,54,247,1,100,53,129,
+114,205,253,78,102,167,100,5,157,125,107,56,162,218,17,30,
+212,137,46,216,254,71,10,103,137,127,24,117,61,75,248,32,
+226,120,29,225,201,239,7,119,220,110,128,227,247,246,193,127,
+245,127,225,200,88,31,194,254,84,255,191,14,67,40,52,226,
+235,133,250,135,248,231,226,137,255,199,171,250,127,233,246,181,
+90,45,73,212,175,19,34,49,175,241,108,76,48,159,67,188,
+225,129,236,187,12,75,112,18,41,48,253,26,161,152,193,43,
+71,74,126,14,55,50,9,1,246,227,241,252,105,52,76,172,
+213,62,132,20,198,235,96,133,194,241,189,88,124,39,18,95,
+95,31,68,162,69,240,216,191,255,238,14,15,190,99,252,254,
+151,207,247,241,125,0,251,235,244,121,223,67,222,239,187,199,
+243,210,226,180,159,0,244,149,205,62,63,32,232,235,126,188,
+159,120,188,239,225,182,33,111,94,246,239,97,147,126,213,141,
+55,227,244,112,150,101,167,89,110,130,31,48,64,189,115,210,
+95,192,2,249,216,246,47,254,39,249,149,181,32,223,205,250,
+251,91,91,95,90,207,96,248,55,207,190,170,134,203,219,39,
+245,30,85,237,63,120,183,237,126,53,8,10,68,52,101,36,
+141,98,203,4,200,73,180,23,40,165,180,184,6,50,52,74,
+165,190,32,1,137,99,89,75,160,96,229,155,138,79,6,227,
+41,214,223,64,205,88,21,78,90,49,13,221,168,51,219,161,
+75,99,185,220,108,77,233,7,106,56,27,96,64,175,206,204,
+246,13,36,250,216,56,45,247,241,61,90,217,104,45,3,88,
+154,166,85,232,233,200,65,198,2,115,237,121,80,248,239,32,
+99,72,217,250,118,173,160,166,7,23,165,79,57,139,59,150,
+94,155,43,242,148,0,101,95,248,153,164,184,131,123,54,197,
+213,8,108,208,58,190,120,77,146,147,120,226,137,48,208,136,
+246,142,219,42,251,62,111,122,152,158,229,185,142,87,237,81,
+168,88,95,216,251,154,219,150,38,158,181,255,73,190,105,116,
+66,242,224,224,163,127,58,216,235,92,104,90,37,58,106,153,
+144,83,41,18,209,191,44,20,145,232,112,161,240,115,147,203,
+37,82,168,206,202,116,141,190,75,46,212,35,145,239,72,36,
+196,207,239,133,163,100,155,173,195,89,169,144,200,126,56,10,
+63,138,68,177,145,68,75,18,129,232,196,12,26,143,159,66,
+161,251,64,240,78,16,10,37,54,6,157,18,15,161,49,35,
+232,119,132,175,247,253,243,113,117,47,93,30,30,191,191,76,
+36,247,251,158,166,25,169,47,53,31,219,203,159,246,209,126,
+182,21,111,189,106,254,178,109,238,116,18,97,7,220,108,235,
+146,182,141,116,48,157,211,220,53,47,166,110,197,159,221,79,
+122,240,147,230,196,216,94,158,53,117,81,109,163,252,123,247,
+123,194,115,227,236,88,183,221,221,215,224,118,188,231,63,231,
+246,239,173,237,62,51,13,46,253,245,49,218,47,252,235,168,
+12,232,105,144,162,5,33,135,46,49,244,105,104,74,30,249,
+40,164,40,133,143,46,8,216,1,13,33,75,33,36,176,197,
+98,92,251,92,83,176,161,114,100,146,221,223,22,129,70,170,
+215,218,23,3,72,77,90,63,234,188,176,149,186,44,20,204,
+181,85,11,192,225,130,83,24,190,49,172,105,217,38,136,48,
+199,184,214,218,119,166,162,54,138,157,147,123,165,53,251,26,
+210,181,161,43,24,81,112,245,173,133,145,213,210,183,159,48,
+250,225,42,42,130,108,125,167,50,68,186,9,4,192,228,67,
+63,187,163,159,230,200,245,99,65,226,228,90,194,14,131,200,
+103,9,47,68,7,239,254,240,178,204,195,160,113,251,166,210,
+22,158,202,255,201,30,14,177,205,70,182,226,224,226,113,97,
+189,206,145,40,209,186,186,196,88,255,122,81,194,151,31,45,
+255,248,145,196,74,64,10,5,91,234,39,158,233,253,196,227,
+18,61,145,237,39,248,24,24,18,63,203,198,162,197,122,189,
+228,103,15,99,115,255,175,189,43,125,74,51,203,215,255,10,
+53,247,222,174,164,167,59,157,238,158,158,165,187,110,85,207,
+244,84,77,77,221,91,51,183,110,247,212,124,232,74,70,162,
+36,161,198,136,37,152,220,174,154,15,32,139,34,200,170,178,
+200,34,139,160,8,8,34,10,10,34,139,11,130,224,14,184,
+178,9,46,168,32,138,32,2,247,125,193,24,77,39,115,123,
+170,186,231,206,135,249,144,188,203,57,239,249,253,206,243,91,
+158,231,80,149,202,156,88,108,96,210,233,82,113,83,151,32,
+229,1,6,68,162,13,12,141,118,148,212,16,91,173,97,2,
+225,4,219,212,82,176,88,124,94,234,193,1,213,117,150,10,
+93,228,211,205,102,147,129,196,58,49,135,205,70,82,103,50,
+238,77,197,47,178,201,248,92,36,238,225,187,206,206,227,158,
+52,199,126,150,142,120,4,164,57,190,145,57,22,33,92,156,
+95,156,30,45,247,109,144,251,150,12,76,89,74,222,233,137,
+82,132,94,254,152,176,51,31,161,110,104,35,17,131,100,58,
+61,221,22,94,43,22,244,231,174,1,227,104,233,82,226,235,
+80,110,46,158,59,45,174,213,162,217,214,231,85,224,86,197,
+226,169,166,212,206,140,26,75,58,160,42,195,209,78,81,183,
+1,189,99,106,201,210,90,69,243,98,71,94,63,186,47,209,
+72,59,167,136,23,92,119,240,0,39,33,30,112,15,181,91,
+148,57,149,127,117,175,117,179,53,113,104,199,176,135,121,171,
+97,54,67,62,215,110,80,57,140,61,23,194,14,67,175,163,
+99,120,163,233,192,222,134,39,172,105,117,254,38,145,145,208,
+149,210,90,136,84,110,170,23,163,165,246,100,215,72,113,189,
+50,27,104,243,217,76,116,76,144,47,20,102,39,48,58,90,
+30,19,56,158,184,112,97,163,190,150,146,115,233,146,135,21,
+218,210,169,237,192,158,168,172,71,117,1,101,170,168,226,241,
+214,25,252,57,144,186,180,5,224,20,232,156,233,166,2,189,
+111,82,188,183,199,147,234,59,164,82,154,44,192,148,202,153,
+82,41,67,196,158,97,128,157,15,27,142,24,83,41,233,240,
+72,167,195,145,20,75,156,188,229,118,34,57,234,112,96,105,
+201,164,199,207,38,142,183,237,224,112,180,96,176,219,51,79,
+3,6,112,38,92,242,178,64,20,10,75,211,62,86,36,98,
+79,105,51,178,173,45,30,158,68,49,10,4,192,197,96,79,
+199,211,38,147,33,93,136,165,98,158,29,195,216,120,58,230,
+14,25,140,169,98,204,27,115,115,39,57,54,35,83,23,33,
+196,215,4,67,158,229,62,94,223,146,13,140,142,204,19,221,
+33,11,189,156,17,74,186,103,201,203,19,22,131,151,155,37,
+115,124,236,216,176,77,185,180,231,92,219,134,109,79,209,153,
+139,8,141,37,125,186,84,204,172,94,108,30,158,120,219,245,
+219,199,46,186,4,87,52,225,58,196,62,2,201,97,146,158,
+208,70,232,248,141,68,50,61,175,89,65,59,181,220,220,60,
+183,117,190,207,17,86,176,155,28,187,29,145,28,127,53,51,
+171,25,197,28,72,253,62,127,139,106,206,47,178,119,28,1,
+135,198,41,171,145,73,153,73,109,80,150,78,188,60,122,196,
+196,99,69,45,134,101,114,255,156,65,125,96,159,147,109,236,
+59,186,119,219,237,109,6,185,181,192,30,53,209,34,244,22,
+175,75,145,116,183,176,154,76,75,225,200,153,118,171,51,232,
+40,8,104,109,81,116,159,252,152,158,237,212,14,208,83,153,
+214,226,64,48,149,160,30,159,227,74,222,173,226,89,255,120,
+151,62,51,208,97,5,117,225,204,197,197,132,92,217,9,48,
+86,159,183,79,8,134,133,153,168,132,133,61,95,9,75,88,
+27,113,130,178,176,135,6,20,13,200,71,24,173,68,226,116,
+224,136,26,170,60,20,74,204,207,227,0,30,163,80,100,214,
+22,43,112,184,224,211,38,154,47,11,129,98,49,177,61,190,
+29,142,216,51,153,88,34,159,163,227,73,1,65,90,144,192,
+147,252,233,184,159,73,165,102,76,185,132,217,152,14,28,29,
+37,140,39,105,63,112,9,232,250,3,186,152,54,238,137,14,
+120,217,86,193,56,223,188,123,200,205,207,182,103,162,93,206,
+132,147,233,103,202,125,131,211,212,56,181,107,218,85,220,147,
+103,168,22,77,255,52,57,68,21,204,9,138,250,214,194,153,
+47,49,208,55,30,46,165,240,121,42,175,20,28,99,232,153,
+106,75,46,62,187,54,48,50,140,150,119,109,37,112,59,221,
+232,193,182,84,223,140,199,102,200,112,179,156,222,25,235,233,
+161,128,219,218,29,20,105,177,212,67,206,233,142,159,32,195,
+245,180,246,59,252,177,21,172,62,156,232,181,147,99,196,225,
+149,136,207,140,207,12,7,39,176,20,87,52,181,220,202,92,
+228,117,30,132,149,237,133,54,131,95,133,238,63,51,172,82,
+187,120,12,242,114,104,152,125,222,178,159,244,225,242,43,236,
+48,61,28,50,10,88,33,71,159,208,155,203,6,208,126,95,
+46,203,196,158,115,176,89,26,65,138,73,9,195,180,28,197,
+122,28,58,155,225,166,183,138,155,194,99,95,201,233,58,94,
+137,235,34,83,23,254,189,61,161,116,64,198,104,111,247,178,
+221,93,12,158,155,193,24,119,38,221,82,144,102,178,151,210,
+113,129,3,80,6,26,63,131,105,7,234,131,12,214,135,20,
+16,6,82,19,15,135,167,207,163,231,87,103,90,136,20,25,
+205,10,6,162,131,54,53,81,14,132,163,228,3,84,156,198,
+100,94,34,178,88,7,33,91,39,71,46,15,104,208,250,82,
+113,220,101,199,186,187,166,11,220,49,214,206,145,135,235,209,
+53,239,196,166,98,222,173,216,28,119,146,107,100,206,235,35,
+132,131,139,211,213,182,161,61,101,223,82,96,201,46,211,0,
+108,51,199,35,205,112,53,24,125,209,52,123,144,240,175,122,
+45,90,66,49,139,209,199,200,7,170,211,221,213,222,5,229,
+177,106,60,84,216,25,80,14,168,44,209,194,158,87,89,218,
+204,143,172,150,178,66,75,154,175,199,170,115,114,23,117,173,
+80,50,175,13,90,218,5,197,133,150,54,180,196,214,202,33,
+183,75,237,180,52,129,235,158,209,45,48,68,164,140,122,104,
+114,190,35,34,105,166,166,57,202,29,158,63,128,89,233,240,
+251,142,241,109,43,126,5,144,106,220,132,218,58,174,165,4,
+90,83,14,114,36,204,203,180,71,200,236,184,195,176,56,143,
+117,233,13,10,155,249,108,127,67,105,83,205,246,146,87,131,
+189,60,251,14,213,224,157,198,134,77,10,163,141,169,22,236,
+132,39,103,134,183,98,225,51,238,86,88,22,49,99,133,98,
+116,102,126,226,216,28,179,228,125,93,3,184,203,140,81,147,
+217,232,247,198,218,56,60,235,165,115,145,225,116,95,70,165,
+34,140,134,45,116,80,65,150,247,134,35,6,167,155,76,164,
+20,165,131,138,86,199,20,163,165,133,205,16,120,108,182,153,
+93,77,47,145,40,2,176,31,236,109,193,17,24,104,116,62,
+124,236,189,188,108,1,244,216,210,116,115,54,207,188,28,24,
+136,217,240,142,165,37,166,49,136,225,88,132,235,123,33,107,
+108,46,226,217,228,187,54,54,57,233,88,81,179,185,49,147,
+8,184,9,1,29,91,23,31,140,27,221,65,143,208,195,27,
+22,181,25,207,20,233,217,246,227,88,212,233,118,50,217,19,
+76,249,160,220,29,164,0,84,198,27,161,24,51,171,202,52,
+248,63,60,95,18,39,120,58,130,241,98,104,52,189,220,27,
+27,217,30,220,182,20,185,185,21,159,251,98,96,60,88,76,
+81,221,251,165,130,47,86,42,29,203,1,57,126,168,206,197,
+143,221,107,37,190,65,136,183,182,16,209,253,228,220,2,49,
+168,155,239,32,59,21,5,174,174,219,221,196,197,114,142,76,
+202,29,219,114,203,16,137,154,97,40,195,17,205,33,103,184,
+69,99,228,205,173,247,107,250,155,242,120,169,161,219,17,18,
+81,90,149,41,91,203,146,141,215,97,23,91,154,88,253,73,
+163,130,231,195,25,22,8,24,242,248,17,43,72,161,158,243,
+72,41,42,137,110,50,45,69,131,169,78,65,44,72,203,41,
+182,164,145,14,172,236,88,156,82,147,143,177,231,104,124,182,
+68,27,44,25,178,77,110,240,223,131,144,35,151,202,108,150,
+193,34,158,59,19,9,185,86,107,146,142,94,48,123,123,189,
+104,113,185,237,80,1,189,166,36,227,8,69,54,208,119,154,
+176,206,249,9,128,13,164,24,140,48,2,96,108,177,132,15,
+252,46,0,245,145,17,59,214,69,82,110,204,0,121,239,108,
+194,71,139,151,132,179,230,102,206,8,213,205,23,185,146,231,
+242,116,76,99,217,0,225,38,7,232,32,220,12,142,174,147,
+189,36,215,201,230,34,173,110,254,172,204,29,114,179,4,110,
+246,16,81,155,58,21,71,108,184,169,108,170,135,156,138,176,
+35,211,131,197,226,5,49,21,161,146,123,181,17,246,118,201,
+203,14,155,185,218,253,246,200,122,242,152,179,93,154,203,238,
+199,250,167,88,219,131,197,211,11,249,148,176,56,145,101,93,
+150,66,151,35,165,204,122,34,176,126,192,40,109,41,155,11,
+219,196,200,133,72,46,70,155,52,203,14,209,112,76,208,70,
+220,157,195,180,234,240,106,183,210,217,164,53,53,23,140,154,
+29,251,66,15,90,143,247,251,112,115,126,83,66,53,69,97,
+36,196,64,214,143,83,78,82,231,56,106,228,146,23,141,240,
+220,68,79,71,208,166,85,168,83,201,158,22,31,32,143,117,
+232,145,19,45,91,66,18,241,200,241,80,145,44,19,104,146,
+189,120,239,9,35,53,36,240,74,146,167,131,228,1,108,114,
+245,192,92,218,156,45,70,182,56,36,240,231,223,78,126,7,
+241,204,25,141,202,233,116,139,16,215,204,212,104,188,19,54,
+187,5,204,100,172,85,136,195,23,24,108,205,76,83,211,120,
+234,92,206,3,122,137,239,156,41,204,8,195,135,115,38,211,
+140,16,76,102,166,210,79,152,136,121,229,2,65,20,179,101,
+26,60,87,167,206,79,1,112,29,99,70,250,64,64,231,84,
+6,22,116,131,32,184,98,185,87,38,95,146,77,2,7,142,
+54,153,155,40,48,25,47,66,139,210,193,84,248,20,167,38,
+46,68,166,167,169,93,52,150,57,147,56,245,90,58,39,75,
+217,200,41,213,114,226,160,114,152,133,194,185,100,65,50,61,
+93,58,223,236,58,237,93,88,216,190,100,82,129,110,191,176,
+93,232,160,22,118,88,192,51,221,91,152,46,13,240,199,72,
+199,196,253,214,136,225,72,210,77,176,18,216,65,66,96,147,
+93,216,142,15,166,49,120,140,17,157,92,32,44,179,113,142,
+201,41,195,196,246,121,126,94,186,199,61,21,245,236,217,89,
+67,135,220,97,215,112,155,118,138,27,33,171,86,216,109,214,
+221,161,125,214,178,66,229,82,29,28,156,28,30,198,18,220,
+241,226,202,172,133,151,148,107,136,22,95,79,107,172,152,206,
+13,176,89,78,183,49,94,108,74,31,187,83,222,133,5,51,
+117,106,73,34,213,15,44,183,231,182,214,93,202,35,126,143,
+204,180,209,234,27,235,75,77,141,108,173,53,157,79,231,147,
+86,244,184,192,38,139,247,107,118,216,235,83,41,77,68,149,
+81,217,89,246,3,237,49,150,146,112,24,179,189,20,106,120,
+151,237,165,80,67,81,182,135,154,15,37,128,191,195,54,127,
+175,250,208,209,209,102,48,143,10,124,190,80,108,173,112,105,
+104,18,18,82,233,89,197,6,223,118,140,205,242,37,212,243,
+206,96,113,164,84,220,119,108,171,178,241,241,190,45,151,76,
+53,58,157,10,68,15,231,246,19,209,137,209,209,40,160,83,
+15,181,135,27,235,93,190,181,217,12,59,194,112,170,123,240,
+187,7,71,50,34,206,183,204,113,232,135,25,4,130,88,219,
+186,81,48,247,245,75,74,122,189,84,70,232,87,27,100,43,
+224,47,137,203,236,101,154,149,22,78,49,72,36,250,110,187,
+67,188,136,54,184,109,34,6,121,86,133,65,167,242,61,66,
+239,225,201,5,113,90,98,220,76,51,92,61,70,62,195,190,
+111,77,100,156,49,166,114,109,213,25,166,187,99,206,213,40,
+131,60,229,12,210,56,167,23,78,57,115,118,54,44,85,173,
+42,122,105,39,199,233,158,92,90,184,177,230,151,77,110,145,
+87,7,73,138,124,15,102,64,158,138,21,199,182,142,108,249,
+205,108,91,47,171,171,51,148,182,56,135,41,225,60,45,163,
+62,118,28,173,248,199,200,5,205,65,50,137,107,94,52,200,
+25,83,218,33,143,52,181,168,104,211,237,241,92,145,212,58,
+125,99,3,235,178,231,178,69,189,90,229,104,91,19,109,112,
+29,135,197,13,70,128,176,125,145,58,24,41,22,143,109,194,
+67,3,43,238,40,16,226,75,129,101,246,69,207,14,83,175,
+31,230,26,157,82,223,162,248,224,228,40,198,32,170,251,136,
+184,131,68,148,203,53,44,108,71,247,15,140,163,163,234,227,
+225,206,254,62,209,202,10,122,99,165,195,23,112,42,22,21,
+45,221,201,148,129,136,153,156,25,154,21,211,25,10,10,115,
+190,5,135,149,38,105,221,69,75,42,215,194,244,185,76,130,
+112,70,55,198,34,25,248,238,80,247,101,102,76,23,96,175,
+204,106,148,157,139,91,30,119,140,29,27,212,74,232,28,114,
+147,123,32,62,202,239,87,173,238,76,78,186,251,119,240,120,
+188,91,18,202,229,148,82,185,60,125,25,23,232,155,245,25,
+138,120,96,241,128,196,153,156,243,228,157,151,58,63,197,59,
+154,202,137,209,9,103,104,125,32,163,236,159,84,143,39,2,
+148,2,167,96,208,160,83,86,158,76,224,88,232,48,140,55,
+41,229,190,224,105,183,135,146,14,95,162,213,167,145,69,222,
+201,165,175,185,223,149,162,155,89,35,75,217,16,93,122,116,
+30,246,140,29,201,250,233,57,186,55,211,227,46,231,9,143,
+123,145,189,8,108,242,149,195,157,205,253,125,244,21,95,122,
+37,179,50,56,59,171,22,55,209,152,56,181,32,30,214,226,
+212,220,29,49,93,205,179,198,192,240,159,96,134,129,240,27,
+133,212,108,179,217,17,17,29,141,164,154,141,45,75,78,30,
+37,188,50,194,236,154,27,90,35,170,38,109,179,174,73,93,
+128,50,196,105,89,232,229,146,55,194,1,78,175,143,201,215,
+120,148,125,116,18,105,18,163,90,85,42,24,164,214,69,71,
+219,212,134,102,194,189,57,215,17,159,235,26,221,201,43,155,
+61,42,179,108,166,139,228,91,91,61,26,159,75,6,211,140,
+245,117,141,57,139,29,235,73,28,217,182,132,147,254,237,54,
+108,31,143,49,27,154,105,157,190,72,46,138,241,75,125,60,
+103,104,104,99,100,60,64,38,109,238,24,148,161,217,102,181,
+190,47,52,197,24,97,176,219,252,133,185,117,126,111,98,208,
+58,44,115,123,76,106,18,115,178,40,225,118,76,138,67,131,
+73,127,103,171,179,73,99,13,116,119,167,243,198,54,161,55,
+118,118,34,160,138,226,153,180,154,21,63,157,63,161,52,199,
+129,189,228,219,116,107,196,73,91,199,38,139,169,227,176,221,
+14,244,174,148,128,237,235,103,154,79,47,196,75,244,197,69,
+172,72,234,232,85,203,214,48,170,249,101,105,123,103,107,20,
+143,111,154,146,68,227,65,82,46,103,59,82,211,204,76,137,
+155,223,21,88,107,62,202,158,202,57,251,135,171,110,122,32,
+189,99,226,75,118,101,49,111,83,126,109,40,217,77,76,17,
+236,100,233,52,103,60,108,112,38,167,70,137,3,235,201,113,
+76,142,115,156,139,245,179,141,184,94,43,24,33,190,106,71,
+167,15,49,85,115,147,174,195,48,254,162,157,179,166,203,171,
+69,242,140,72,173,8,108,5,18,97,215,241,104,199,28,143,
+163,234,139,10,14,237,242,117,151,27,127,72,231,174,152,207,
+5,165,253,246,149,85,193,12,225,216,107,26,232,91,94,234,
+93,81,153,199,141,129,226,0,31,124,0,238,115,103,11,243,
+61,184,181,181,35,166,136,32,187,232,238,219,91,149,109,245,
+46,43,74,230,21,123,129,37,166,140,170,246,77,158,75,82,
+115,161,9,191,241,206,131,175,145,31,125,6,185,186,124,129,
+168,69,52,252,23,162,254,15,245,144,106,104,109,45,18,242,
+245,187,144,63,62,133,213,253,178,26,5,71,212,61,128,124,
+129,106,168,45,143,60,130,86,255,25,2,173,171,129,32,97,
+40,36,228,25,162,6,254,248,27,200,227,90,232,19,200,11,
+96,58,236,57,172,1,24,169,133,85,163,96,53,144,106,112,
+81,72,245,83,104,221,19,24,18,114,7,245,20,138,130,192,
+193,165,63,128,212,52,54,192,235,158,60,184,154,11,152,184,
+123,15,114,195,163,251,159,61,68,33,234,225,213,85,159,86,
+125,80,245,1,104,252,11,68,3,172,234,3,100,67,117,229,
+177,234,95,97,117,85,239,55,34,171,254,5,152,242,105,249,
+13,112,173,174,133,34,145,101,95,31,66,190,254,224,225,67,
+200,175,97,13,240,231,128,39,143,27,16,207,30,124,13,188,
+128,60,248,250,223,238,223,127,255,254,253,242,172,7,21,91,
+31,151,109,126,242,217,127,64,174,6,63,191,115,255,222,253,
+123,31,125,242,201,93,200,115,4,188,230,250,155,63,189,188,
+251,252,62,164,12,214,245,200,157,151,119,15,95,250,243,176,
+98,225,250,211,170,119,175,63,254,24,130,120,81,7,107,184,
+30,123,15,114,251,107,16,182,135,149,144,188,193,244,199,144,
+234,27,171,254,251,159,254,248,20,142,130,221,125,112,133,222,
+239,235,97,117,200,155,225,132,34,33,245,136,122,0,171,122,
+200,11,120,93,13,226,197,61,112,230,79,62,123,185,215,119,
+191,184,246,231,253,191,252,30,188,150,29,191,119,107,141,250,
+122,24,180,1,9,121,4,171,173,69,188,128,0,65,133,62,
+66,60,135,65,80,79,225,21,184,223,180,102,53,176,222,111,
+235,224,40,56,180,246,42,19,30,3,127,128,44,129,213,150,
+19,168,1,250,172,254,42,254,136,6,228,189,215,66,113,35,
+4,223,198,230,243,59,63,253,201,221,219,0,85,94,221,12,
+208,111,96,168,219,131,119,238,94,15,3,14,213,33,81,15,
+94,122,13,36,228,127,195,80,141,13,117,144,231,208,218,70,
+24,224,120,229,17,9,169,110,108,104,128,213,161,174,54,240,
+50,179,95,119,246,219,46,150,113,123,120,3,195,107,203,85,
+239,220,116,242,119,8,212,239,26,107,107,191,157,71,55,246,
+255,8,129,168,125,99,30,60,186,149,7,168,134,198,87,105,
+240,37,224,127,61,18,68,27,245,20,136,40,104,227,85,1,
+162,26,160,117,200,122,40,184,177,187,215,69,138,128,87,195,
+192,65,88,29,244,81,45,176,69,192,119,0,162,134,70,48,
+58,96,177,163,128,122,5,199,175,60,190,243,24,90,139,132,
+221,125,83,224,31,1,248,129,206,64,106,224,72,112,45,100,
+197,252,77,67,149,98,127,51,244,85,239,130,105,245,253,65,
+252,101,121,6,242,135,134,248,10,65,196,99,8,242,27,36,
+10,246,172,178,95,36,8,25,20,172,154,191,2,233,149,135,
+223,5,210,74,116,144,111,179,118,239,239,7,43,24,211,175,
+96,255,131,250,171,184,86,202,236,219,192,222,152,241,20,218,
+240,150,38,249,42,100,175,99,142,2,236,150,187,201,27,18,
+235,77,24,131,83,43,124,1,194,93,245,163,59,55,43,160,
+234,71,111,66,28,9,64,246,59,216,139,191,102,234,111,197,
+26,0,237,22,218,87,108,250,178,155,93,61,190,165,161,149,
+217,248,11,104,93,53,172,246,37,24,95,129,221,247,154,147,
+129,123,120,221,115,196,159,1,182,3,153,248,102,251,46,79,
+3,191,4,198,238,192,238,61,185,7,121,244,13,164,186,22,
+94,253,103,16,28,68,35,10,9,175,185,202,187,239,213,221,
+47,203,237,242,187,185,91,65,22,94,206,108,36,172,238,30,
+0,41,178,177,182,28,189,43,208,161,117,0,255,64,16,143,
+80,80,120,29,240,21,176,5,160,195,223,185,237,246,171,235,
+187,215,209,132,148,85,193,43,207,42,192,52,34,129,162,189,
+197,255,215,46,150,69,68,3,172,190,1,6,56,130,170,16,
+28,192,157,168,167,149,79,43,81,190,7,249,45,10,210,136,
+132,221,226,90,20,2,2,171,129,163,42,188,88,153,118,91,
+102,125,254,57,252,25,244,9,236,211,143,127,241,243,119,62,
+252,197,47,208,88,13,154,141,70,163,177,187,37,224,111,116,
+214,204,203,167,79,166,186,22,112,142,22,85,64,155,14,150,
+22,74,165,210,194,134,125,87,147,68,239,162,149,71,11,57,
+203,4,154,154,223,101,11,13,14,67,220,194,95,90,232,205,
+79,109,234,246,55,5,11,231,228,209,248,114,147,121,249,132,
+186,137,41,26,207,201,45,19,251,2,76,231,30,203,70,231,
+230,9,27,138,40,205,58,65,152,201,206,91,209,148,45,118,
+8,114,237,200,135,247,63,250,240,157,15,127,14,120,82,64,
+179,64,79,246,42,158,200,121,135,108,51,197,166,41,146,241,
+70,139,163,213,129,110,99,27,104,235,49,169,254,40,200,158,
+223,17,178,248,99,115,107,178,179,37,130,151,49,74,41,244,
+12,55,157,46,46,246,165,247,114,6,81,220,31,162,209,237,
+197,13,231,217,106,188,176,168,141,45,41,228,232,76,220,90,
+60,228,91,105,54,255,0,247,212,46,209,122,151,210,7,9,
+129,45,201,91,93,86,76,233,227,164,21,161,210,173,8,232,
+138,138,152,214,235,28,137,182,231,118,73,199,155,68,27,118,
+166,77,184,223,67,58,84,242,75,1,238,164,100,241,220,86,
+84,242,79,54,181,216,160,157,208,205,206,239,30,172,17,54,
+91,215,142,56,99,43,167,251,45,135,179,150,253,83,99,70,
+223,175,195,29,225,247,167,41,107,106,234,166,34,57,47,207,
+22,52,88,67,150,146,93,207,27,11,100,202,38,46,55,164,
+152,208,142,170,148,230,34,165,117,243,144,128,21,121,230,11,
+67,67,153,28,249,60,195,76,173,163,49,242,233,253,193,232,
+165,86,174,237,216,107,62,216,156,157,92,90,83,122,118,130,
+43,39,134,194,250,116,33,145,30,245,237,219,70,84,226,253,
+62,246,102,203,216,180,170,105,193,158,162,168,56,174,98,6,
+107,36,46,39,44,147,163,60,115,179,125,60,101,110,50,48,
+103,21,103,131,5,10,38,62,104,78,222,78,130,95,150,187,
+208,31,170,126,92,245,99,8,18,5,72,33,104,67,205,123,
+55,115,11,28,6,90,87,89,37,61,129,129,105,6,150,1,
+208,251,126,13,69,65,203,111,127,115,117,255,28,222,128,106,
+4,244,213,51,128,131,16,53,47,147,237,149,112,191,45,217,
+175,212,58,184,244,35,216,83,232,115,56,162,177,1,82,3,
+3,20,99,13,18,2,76,6,186,34,48,19,152,5,100,55,
+184,198,141,23,55,148,1,228,206,87,224,235,59,101,50,188,
+251,222,77,107,87,5,14,204,121,205,92,99,61,48,10,173,
+251,230,234,48,0,242,86,165,170,239,192,235,170,107,27,107,
+192,253,61,67,60,175,92,128,170,2,42,168,1,209,248,228,
+233,141,226,186,251,70,159,16,143,31,191,7,129,163,94,179,
+12,154,68,212,213,126,3,129,62,70,1,212,92,7,244,241,
+47,94,246,151,91,26,238,31,227,184,113,131,124,203,109,233,
+225,173,30,245,143,69,191,128,154,169,112,34,208,235,30,149,
+37,94,125,45,244,27,96,207,240,199,175,167,48,232,226,247,
+202,199,224,126,191,15,133,243,221,65,254,167,58,255,225,65,
+254,167,62,255,129,128,253,35,32,89,110,183,136,215,177,185,
+170,222,178,10,124,92,41,235,107,221,3,45,119,244,151,141,
+250,239,234,120,153,95,126,168,124,184,73,114,111,137,119,133,
+223,254,134,104,223,88,243,237,56,125,175,125,233,53,136,94,
+109,18,250,12,6,254,228,243,198,45,124,167,216,189,241,4,
+112,147,49,64,210,123,155,234,47,187,254,171,70,20,10,81,
+247,186,182,190,86,156,159,220,127,231,195,143,127,134,198,178,
+209,157,160,224,220,191,37,125,69,11,120,54,155,221,27,158,
+33,73,46,246,218,187,38,59,112,233,110,194,4,173,103,106,
+127,97,146,103,16,205,144,69,152,193,230,185,129,192,84,24,
+120,142,110,206,160,41,203,18,154,132,200,164,211,246,40,69,
+123,203,72,171,139,37,159,57,225,90,59,38,28,220,201,201,
+116,55,26,103,211,75,90,152,24,52,121,94,98,13,190,60,
+26,124,91,238,131,194,0,254,12,94,11,109,0,137,237,70,
+4,222,131,60,106,4,218,114,29,10,16,73,0,203,85,88,
+15,80,40,0,225,213,65,190,2,210,240,87,208,134,242,89,
+0,217,88,95,143,104,64,221,42,170,74,83,173,200,183,223,
+130,187,7,190,71,92,9,143,207,239,124,244,209,79,239,125,
+248,209,207,238,1,136,220,125,139,12,249,79,248,163,151,42,
+228,90,8,189,166,69,94,185,122,67,146,220,76,167,255,83,
+153,188,229,60,116,255,179,79,175,13,84,66,250,250,227,157,
+170,187,159,66,222,16,250,27,201,250,110,229,125,121,243,175,
+210,181,172,75,254,84,126,121,115,46,80,90,240,103,79,222,
+34,59,224,87,248,189,196,247,170,47,85,130,88,25,4,110,
+106,26,160,47,234,64,85,9,40,72,24,164,26,232,99,64,
+235,71,60,190,233,221,221,202,89,238,246,175,212,111,42,115,
+208,151,247,255,82,246,242,123,104,127,21,227,15,111,149,200,
+219,165,221,107,128,125,119,109,87,54,88,254,250,33,228,246,
+34,55,141,252,77,64,215,93,235,131,127,36,148,190,4,25,
+170,250,255,17,39,100,217,129,151,112,93,137,55,104,237,11,
+232,55,200,27,178,248,213,239,6,149,6,0,30,79,174,3,
+252,189,225,249,224,127,1,63,239,193,13,
diff --git a/uppsrc/CtrlLib/src.tpp/ColumnList$en-us.tpp b/uppsrc/CtrlLib/src.tpp/ColumnList$en-us.tpp
new file mode 100644
index 000000000..6ad6c492b
--- /dev/null
+++ b/uppsrc/CtrlLib/src.tpp/ColumnList$en-us.tpp
@@ -0,0 +1,24 @@
+TITLE("ColumnList")
+COMPRESSED
+120,156,229,59,249,83,218,89,158,255,202,183,166,167,187,180,215,56,128,103,204,118,87,207,164,123,119,187,122,118,186,171,211,189,251,67,202,180,8,95,13,213,8,14,96,142,217,218,46,64,190,70,131,26,79,32,94,193,24,53,81,84,60,162,38,42,34,36,241,138,71,212,24,240,132,196,11,69,165,189,53,168,251,222,247,203,105,60,240,232,217,169,221,36,165,240,142,207,251,220,215,123,185,76,65,126,255,123,146,15,233,35,210,17,127,66,190,68,35,168,49,76,94,232,101,134,191,127,240,5,42,37,224,194,207,223,124,123,254,194,167,95,120,5,250,123,67,40,100,0,197,47,136,236,23,28,224,71,246,167,4,130,31,100,63,50,37,128,226,231,79,14,166,156,247,15,246,243,11,38,133,208,152,84,46,55,244,50,147,18,28,124,1,110,162,248,80,62,162,4,5,80,200,65,254,193,254,193,100,191,160,96,10,216,75,33,145,40,164,32,74,0,217,223,47,152,18,16,66,71,185,180,208,203,212,96,191,11,159,126,31,8,54,249,193,147,0,112,18,57,144,226,31,228,79,33,
+249,145,40,254,224,40,114,112,176,63,57,40,32,216,239,124,96,96,8,141,26,205,99,176,89,182,179,24,100,50,133,124,33,156,28,116,1,224,252,203,47,191,248,146,253,73,4,6,254,0,24,153,228,15,80,37,131,49,146,63,37,136,28,112,158,116,62,32,152,28,76,242,3,192,3,130,72,1,33,209,84,14,53,234,96,210,3,142,36,61,136,20,194,224,161,0,196,167,255,68,38,7,129,45,129,62,129,31,145,253,131,0,161,193,126,254,1,193,65,36,112,56,133,66,241,243,163,144,253,40,231,207,83,2,2,3,130,66,174,162,84,58,202,9,189,252,95,63,253,247,199,95,253,229,220,143,151,144,203,92,242,133,111,66,194,192,223,139,108,102,76,20,235,207,12,46,15,126,195,249,26,114,5,159,224,113,152,87,144,203,31,147,72,231,72,164,43,87,190,240,34,249,146,124,41,1,1,222,136,141,249,246,25,228,39,231,231,47,72,136,19,160,235,146,16,215,69,78,80,209,49,225,76,6,109,63,88,8,60,63,244,147,208,203,92,202,5,196,246,235,139,47,24,81,212,72,
+52,132,28,72,10,252,36,136,20,200,143,21,8,126,229,243,249,177,119,118,193,79,254,70,93,206,124,174,49,109,162,104,33,17,123,255,236,137,118,71,223,149,186,20,107,109,155,159,189,59,37,123,162,41,153,202,73,158,40,209,21,202,30,108,138,148,26,93,217,122,102,213,220,96,87,236,154,118,203,176,208,115,103,72,181,251,222,184,158,158,93,107,214,41,215,140,218,184,178,137,181,214,201,123,205,149,70,113,253,107,181,164,141,47,138,149,180,189,177,46,175,143,23,247,24,173,137,70,172,120,124,104,85,39,217,216,110,157,171,201,149,165,220,23,104,198,251,54,86,251,244,252,100,77,107,107,70,107,255,194,238,84,195,76,34,28,30,219,232,147,12,243,23,118,147,218,239,182,229,60,149,75,23,115,155,176,14,213,250,253,172,132,21,217,120,133,117,109,70,149,53,168,31,196,250,87,210,68,197,226,114,179,17,107,194,68,99,227,187,69,75,61,109,175,42,238,53,239,212,183,203,176,121,75,173,42,59,161,191,66,163,55,232,183,186,139,230,21,226,98,133,248,73,117,28,214,
+183,56,220,82,35,110,126,144,106,41,154,24,154,126,220,98,78,95,5,160,222,141,189,16,86,104,222,230,73,18,245,213,153,121,233,51,250,233,174,244,218,97,227,173,59,133,162,133,185,214,119,207,235,234,45,85,235,37,29,121,194,29,172,112,125,100,51,165,97,68,84,55,57,41,210,155,203,86,39,167,138,135,31,36,20,111,231,38,97,170,146,241,142,87,203,59,111,146,140,85,115,197,235,195,41,239,90,122,31,166,198,181,232,243,231,13,173,218,244,4,169,168,51,77,48,210,80,151,244,98,179,243,153,46,173,201,58,108,236,95,42,204,152,237,171,126,163,125,246,250,126,135,184,70,115,175,211,144,81,183,166,87,151,46,40,215,151,141,115,119,170,243,83,149,165,214,44,108,123,165,73,185,221,22,43,127,222,50,184,49,41,142,111,202,93,29,43,47,168,84,223,189,155,84,21,255,232,105,241,132,172,91,175,46,175,149,37,60,149,138,238,85,242,139,238,37,222,29,54,190,87,24,242,94,239,154,140,235,130,241,230,181,156,212,247,61,253,181,235,139,125,214,184,222,154,12,
+109,79,193,173,169,84,157,164,252,78,115,242,86,233,200,189,231,75,205,113,230,55,121,26,83,82,251,72,195,140,25,211,166,148,91,11,6,198,211,167,42,155,83,103,95,220,73,46,206,217,158,43,209,174,52,25,18,116,69,194,37,105,65,150,214,216,20,159,218,253,186,64,248,106,97,183,62,94,187,166,142,95,44,47,44,51,117,84,99,165,131,37,43,47,214,178,176,66,108,169,245,254,182,162,42,35,79,88,163,155,45,209,223,122,161,41,50,246,155,71,214,106,242,86,141,111,52,221,230,100,129,197,40,28,126,86,247,94,147,85,186,24,175,20,62,94,106,20,104,51,141,29,51,249,35,10,165,161,116,100,247,237,66,65,113,173,168,127,98,86,211,45,153,17,151,54,118,13,27,154,148,9,13,211,245,10,139,72,46,182,22,155,31,136,50,167,198,212,177,189,69,230,229,1,190,130,111,21,188,212,169,76,203,74,245,246,50,54,101,85,118,73,13,217,253,226,173,142,188,90,161,184,81,89,56,110,168,171,221,20,190,94,41,124,62,59,35,185,165,204,146,108,116,168,212,11,
+203,214,101,204,32,200,182,52,101,88,5,163,230,78,105,193,140,105,235,245,238,150,180,96,203,244,56,99,75,38,148,17,203,94,46,22,117,85,47,164,172,244,181,60,236,174,214,182,190,87,153,249,10,11,220,178,108,238,150,26,22,231,181,233,219,3,191,14,246,168,164,243,124,44,47,173,66,153,93,48,186,41,44,149,200,167,117,98,177,108,9,44,44,29,213,117,103,247,220,199,202,39,10,183,242,171,159,152,76,106,97,79,187,84,151,212,217,94,179,185,54,217,35,173,236,19,106,180,181,165,250,9,131,96,66,60,177,112,183,175,194,128,83,84,247,114,116,9,27,225,99,241,202,174,242,88,211,146,49,179,101,194,244,82,215,22,127,191,180,145,47,158,208,188,16,105,116,70,172,49,126,50,213,34,207,144,128,157,175,82,42,82,36,117,86,193,212,216,203,153,247,51,89,186,228,56,163,126,21,75,22,190,16,203,166,197,53,133,218,137,13,217,154,188,174,242,54,86,215,160,168,176,136,116,237,234,198,113,195,104,89,138,118,173,2,126,85,91,27,199,229,235,85,99,143,166,
+134,51,139,179,134,170,243,235,159,220,159,175,215,12,90,101,2,125,67,195,187,56,69,137,33,175,162,87,156,246,244,246,66,118,218,96,178,121,185,97,40,243,245,203,13,69,69,170,186,67,54,56,118,91,161,1,243,242,86,97,83,195,179,170,174,184,215,107,250,77,245,224,134,190,98,116,180,224,189,41,1,168,99,69,139,37,79,162,148,170,50,18,249,226,28,77,227,184,218,178,40,232,74,24,46,139,109,196,36,88,245,251,45,77,91,143,65,176,108,21,116,77,119,41,147,239,213,214,234,219,148,115,183,245,121,229,213,252,197,109,65,139,112,123,253,233,104,155,66,169,126,100,93,23,52,8,172,2,101,78,102,135,180,62,187,77,26,31,39,46,106,159,4,60,186,173,144,41,114,19,178,19,250,140,152,212,0,244,1,176,10,112,234,86,254,72,98,158,72,35,180,10,182,18,151,48,205,219,102,149,84,61,247,254,205,219,186,4,113,201,170,85,176,146,93,150,213,175,22,238,108,10,11,183,151,76,88,108,234,187,230,57,149,186,139,143,89,151,101,152,72,172,92,221,86,86,
+246,72,55,110,43,249,211,122,149,122,180,121,44,117,86,89,55,111,202,93,147,75,179,148,61,82,121,83,210,170,46,87,32,177,180,75,31,78,206,213,164,86,232,248,121,11,243,21,101,79,176,193,229,26,108,38,95,110,149,139,23,12,2,160,17,53,150,87,66,44,171,103,117,167,60,11,240,66,93,50,35,74,93,83,245,54,10,176,181,174,105,113,175,70,47,94,105,26,90,120,204,111,182,244,119,169,133,13,203,96,239,163,165,77,117,185,97,39,195,84,105,218,22,136,53,185,38,176,118,90,60,48,89,190,58,49,144,170,76,124,56,48,52,93,138,245,21,26,205,77,101,75,119,251,141,221,153,106,97,155,180,77,62,158,33,87,224,191,107,228,10,89,145,20,56,188,39,74,67,213,74,145,57,13,216,204,152,92,242,80,93,161,157,55,22,228,43,214,45,194,49,97,215,178,186,243,87,249,106,53,63,79,180,58,150,173,23,174,204,246,151,61,170,106,45,88,191,133,245,213,104,238,140,148,37,169,117,66,173,56,35,107,178,185,253,110,109,143,182,253,93,202,188,85,82,214,
+91,186,94,87,168,238,221,176,152,87,107,181,166,215,43,202,44,133,124,185,146,223,56,159,151,100,156,127,222,219,156,128,21,45,137,176,135,115,130,68,113,253,128,114,78,240,108,167,173,68,156,48,86,167,228,103,170,226,115,134,117,134,212,120,137,101,35,181,111,122,168,241,197,136,176,112,106,206,32,85,188,172,180,102,12,77,11,154,42,45,91,15,76,155,165,213,247,187,226,7,23,118,170,186,146,38,180,109,175,69,6,193,99,189,176,195,180,188,213,243,68,48,213,170,228,47,23,99,194,121,21,63,201,60,180,220,61,104,126,155,93,54,34,172,25,168,239,230,75,100,41,67,234,234,249,157,178,178,116,101,90,133,69,47,212,200,22,251,71,95,109,53,25,102,5,56,128,197,23,211,130,231,86,129,206,48,208,50,178,49,202,239,206,206,145,42,122,69,43,253,10,189,60,99,236,206,132,82,41,236,76,215,139,227,51,13,93,130,213,34,85,234,219,226,55,93,213,235,214,217,228,193,33,241,64,71,205,72,254,142,168,185,117,60,254,81,122,161,46,107,46,190,101,124,96,48,
+109,88,190,30,159,191,124,183,94,103,152,17,24,107,54,71,239,165,172,214,169,205,170,66,126,209,216,195,254,178,41,229,29,129,120,70,150,37,159,108,233,206,110,206,107,202,174,87,40,51,198,18,31,168,118,84,197,11,125,213,183,100,237,243,57,18,117,205,147,193,21,225,227,36,75,171,248,93,142,64,193,111,239,211,138,31,53,214,1,77,78,169,202,79,7,74,13,62,229,166,212,223,109,137,237,213,165,43,85,234,184,77,161,209,82,57,62,46,55,189,157,152,93,53,117,154,183,21,211,43,226,198,129,12,37,191,167,112,75,216,52,107,158,44,232,148,1,187,206,48,8,58,71,231,196,43,183,223,15,78,212,99,131,210,248,206,133,166,85,108,182,60,43,119,172,103,242,233,110,209,147,237,206,193,219,90,48,178,158,61,59,91,147,63,63,159,174,30,203,83,170,147,87,177,153,181,87,179,115,195,139,109,153,102,211,227,45,73,102,220,166,70,168,233,238,215,247,118,44,215,14,9,20,134,70,85,129,250,41,182,85,103,124,254,52,113,25,155,200,157,170,206,20,150,140,62,
+80,222,82,236,130,57,190,177,152,63,85,6,176,204,170,204,170,79,187,7,44,96,78,188,189,242,86,214,244,86,171,78,149,47,234,141,178,10,67,239,164,192,122,123,195,160,122,173,82,191,221,121,222,121,127,77,170,235,88,77,176,72,50,50,139,192,190,220,146,212,178,55,111,75,1,188,106,254,42,86,213,250,70,170,168,127,156,166,228,15,74,95,181,229,232,199,13,201,218,182,120,177,33,107,36,174,127,119,66,35,108,239,187,171,20,164,166,12,110,8,36,252,216,22,1,166,182,24,4,252,148,28,29,95,116,75,18,199,39,6,248,2,98,224,129,132,223,98,82,240,147,186,135,213,243,27,187,83,241,150,36,152,198,44,40,115,183,239,200,223,149,63,118,79,162,126,184,202,224,34,215,25,244,72,148,135,208,25,220,104,38,245,38,23,225,93,69,17,46,53,10,69,120,55,163,81,132,29,129,192,44,19,97,176,16,46,122,13,229,80,153,8,13,207,234,184,190,96,59,138,176,98,162,194,81,14,92,102,27,70,104,84,22,18,142,34,84,38,15,229,160,116,36,252,38,18,
+195,5,43,168,52,152,59,131,77,55,163,25,52,0,5,12,34,224,116,30,219,126,50,126,48,19,228,138,16,88,4,131,137,114,125,33,154,36,2,219,128,125,115,212,255,188,138,178,190,98,129,131,190,6,56,134,128,140,211,158,61,226,75,169,76,102,56,149,246,243,21,60,169,70,236,95,237,89,37,49,234,76,50,221,96,217,178,205,63,32,151,255,128,92,140,225,112,217,28,4,101,17,4,81,17,22,122,29,103,138,47,18,234,69,71,163,57,40,141,202,67,233,62,56,73,16,202,37,148,233,237,17,234,223,48,152,76,2,250,25,224,238,4,182,15,242,76,52,130,135,0,193,156,9,218,127,6,192,46,130,92,253,231,51,192,218,1,203,158,223,255,8,149,133,6,71,0,175,161,74,216,244,243,58,131,119,149,80,17,72,74,20,27,98,29,30,195,227,177,89,62,142,229,184,166,94,165,18,58,76,195,41,247,76,135,28,88,124,199,230,30,68,20,121,15,85,100,119,178,254,57,212,117,211,119,108,6,139,103,219,128,127,118,95,252,249,1,76,0,199,219,249,112,137,17,197,
+96,82,57,208,64,220,150,64,162,129,113,113,217,72,52,135,125,141,1,10,89,96,121,108,14,157,193,2,210,228,226,108,2,182,138,115,132,193,138,36,4,238,49,15,190,100,131,34,12,61,35,177,18,192,220,228,74,199,135,194,206,29,75,190,158,161,255,39,234,129,70,116,148,228,192,214,176,79,246,136,4,140,217,49,183,111,131,162,176,241,156,80,48,54,240,8,55,120,192,47,178,184,12,30,227,26,138,68,161,172,24,196,43,38,154,205,194,23,112,24,145,87,221,73,33,228,226,237,139,0,81,2,127,2,64,0,88,208,97,114,1,7,120,208,27,211,236,135,57,248,1,129,122,198,2,96,192,40,238,101,207,64,128,14,88,174,206,196,49,136,112,121,84,94,12,23,122,106,155,248,160,213,209,174,82,89,145,40,253,212,254,5,44,60,27,10,28,18,36,156,32,248,199,245,140,130,35,209,252,87,148,71,12,192,96,193,13,243,10,243,6,218,192,229,133,184,244,51,236,184,124,96,252,14,52,1,141,238,112,220,215,121,121,59,9,194,161,219,201,249,30,229,197,112,8,21,
+115,134,95,104,232,208,241,81,121,32,120,242,236,126,0,15,230,192,15,48,81,91,124,70,192,60,240,140,28,168,125,92,198,223,80,95,4,241,156,216,139,55,194,188,0,57,167,38,246,226,141,61,148,134,122,176,223,15,97,236,153,10,251,204,117,150,228,62,235,1,243,236,124,0,10,0,108,205,145,194,120,36,253,239,168,145,232,233,101,239,128,114,44,201,115,15,23,61,56,148,237,70,223,53,6,72,88,112,97,123,66,25,196,7,16,101,15,98,97,222,33,136,3,57,7,129,46,132,237,165,9,79,159,236,115,94,251,68,69,247,128,232,38,225,104,199,168,247,126,36,219,50,81,58,122,3,137,0,198,12,135,34,129,223,101,33,209,16,34,100,5,78,42,149,131,82,17,47,42,141,198,142,97,241,184,248,82,46,141,195,134,46,131,3,150,66,103,13,61,52,155,237,237,49,67,190,7,94,227,8,221,199,41,132,235,108,62,10,126,60,84,248,118,184,103,97,11,158,40,12,206,61,156,65,192,53,243,168,208,41,120,230,232,112,239,121,58,31,71,228,165,199,87,114,187,10,
+19,201,156,67,120,190,200,215,17,112,158,131,215,16,44,182,109,222,7,80,70,236,101,161,145,84,60,36,95,163,50,99,60,32,243,146,147,204,3,117,254,26,155,65,223,87,233,47,237,37,208,41,196,35,77,198,15,161,125,168,243,0,224,209,228,219,118,125,138,131,128,108,96,199,224,38,192,129,33,204,7,129,142,128,139,132,253,46,130,113,3,165,135,253,14,241,114,176,36,28,165,177,163,64,170,72,242,65,62,199,93,50,176,18,47,111,199,176,203,80,216,57,132,236,129,141,56,43,15,168,36,199,98,157,75,209,226,224,157,183,51,241,98,209,80,230,241,178,249,175,185,30,168,107,56,155,205,60,88,95,237,32,60,84,215,31,80,46,144,214,245,171,40,212,71,187,164,0,235,169,176,224,186,105,171,184,46,193,130,154,202,117,218,2,224,238,231,97,159,33,36,143,44,240,82,56,40,12,78,101,128,56,132,19,216,223,135,126,211,35,91,178,33,124,34,83,114,67,245,88,150,116,243,16,75,58,33,33,255,194,1,130,35,162,33,188,132,34,190,126,114,124,162,240,141,7,
+68,69,7,224,43,136,227,163,99,105,216,39,174,20,134,253,20,225,54,251,33,157,116,96,197,28,194,206,241,165,208,35,56,169,242,37,90,62,224,31,7,253,107,12,3,239,207,128,52,29,102,232,206,69,120,38,204,141,70,105,12,42,19,249,27,202,97,219,66,174,151,19,182,183,13,184,75,69,244,61,240,25,244,75,32,201,64,216,209,132,143,250,114,47,42,176,200,9,191,73,212,57,81,192,92,216,116,136,9,56,156,238,24,182,31,203,129,208,96,253,138,239,60,90,84,23,153,40,245,248,222,7,223,181,143,227,249,42,10,144,128,18,12,117,97,158,11,22,135,251,32,22,168,117,109,233,130,15,110,90,112,244,63,96,36,2,186,227,3,189,207,49,17,37,32,158,200,40,24,142,76,1,241,65,246,217,71,152,254,7,59,175,56,80,190,130,224,191,14,208,72,16,95,15,135,239,234,107,221,227,30,149,69,84,99,123,180,249,68,60,117,140,124,73,52,19,255,255,241,249,48,248,54,166,92,65,108,31,14,56,131,190,103,246,108,228,9,236,137,96,171,189,255,8,35,163,
+35,11,119,201,98,0,7,125,247,228,53,14,144,208,81,68,80,153,92,60,177,1,32,192,12,139,205,131,125,102,98,1,236,58,128,189,184,251,136,96,192,174,131,11,24,59,93,14,111,179,167,233,140,67,244,98,195,248,125,157,193,133,149,114,84,20,64,205,190,4,122,67,194,115,1,47,107,227,160,29,148,7,217,209,247,104,20,251,26,122,146,96,72,236,60,173,54,186,84,82,16,28,215,19,49,28,73,212,31,233,244,48,175,51,113,109,0,210,161,20,254,3,249,39,4,36,108,60,78,12,122,152,159,58,128,49,103,228,159,254,183,153,245,143,236,100,0,111,156,186,109,235,128,184,102,62,255,7,93,139,189,84,59,101,255,49,102,239,138,99,149,230,123,251,80,182,174,35,115,79,198,116,32,5,71,181,20,221,116,110,15,5,46,138,77,204,184,105,55,49,228,170,126,56,193,123,104,13,245,128,81,158,245,91,246,39,145,29,141,130,44,24,84,164,151,195,66,255,190,180,186,158,252,155,17,189,95,147,9,191,187,32,138,6,215,192,226,216,237,27,234,65,29,239,184,108,
+56,85,41,239,188,199,240,76,195,97,53,239,40,230,237,245,59,23,182,20,157,238,192,179,106,196,13,255,227,151,37,31,32,238,218,24,129,11,136,178,214,190,202,147,106,22,46,253,150,101,75,69,78,18,126,28,32,78,150,147,156,208,231,3,26,15,41,120,63,184,209,129,237,222,67,243,27,15,210,27,187,222,160,244,163,44,214,51,253,67,233,127,47,251,251,128,29,167,229,194,25,48,224,183,164,221,181,15,236,164,221,22,131,136,155,61,103,87,24,38,111,8,35,194,157,15,206,157,48,182,59,67,245,222,77,110,157,189,99,114,242,18,27,214,174,238,105,225,183,28,58,202,57,126,47,137,125,68,125,122,100,10,136,159,107,203,3,241,207,7,36,106,108,183,57,167,225,1,4,184,132,87,244,192,17,18,111,130,246,22,63,87,220,87,94,217,231,161,248,158,80,102,3,116,34,191,19,246,19,235,16,255,241,193,3,38,95,196,235,71,231,131,37,252,118,158,184,22,222,127,57,76,222,232,28,106,100,36,236,86,17,207,2,240,123,214,112,216,193,162,114,110,18,247,76,14,
+27,13,251,20,246,185,60,176,61,192,224,127,67,225,3,130,211,51,207,9,235,132,252,163,29,214,89,37,30,221,224,224,161,221,69,51,110,160,76,238,241,9,182,93,136,217,105,62,69,66,251,33,185,199,200,106,241,251,34,123,82,238,132,228,65,153,111,239,127,134,121,237,137,172,199,23,152,3,214,161,242,58,48,96,134,59,71,195,62,251,201,89,177,218,95,252,69,193,87,39,215,24,220,24,42,147,121,211,166,220,158,116,143,17,46,155,184,101,38,60,46,204,137,88,108,4,141,138,230,221,196,239,92,113,207,8,193,132,179,121,60,118,148,227,62,214,11,94,64,0,106,188,188,125,105,55,145,143,221,101,228,229,237,13,91,197,248,255,4,194,111,177,34,34,142,175,60,127,97,187,176,255,84,172,119,129,180,79,226,101,191,198,113,172,241,194,43,199,19,216,55,254,150,11,222,126,157,129,186,56,96,157,185,186,124,205,178,117,235,129,198,248,192,32,24,227,120,157,7,36,197,114,185,110,199,245,130,206,70,225,109,44,15,127,26,69,5,206,192,145,64,251,184,132,79,26,
+126,173,7,203,234,211,139,221,133,141,167,20,251,62,76,252,64,236,142,53,39,22,187,179,204,119,73,7,156,61,161,211,144,224,4,125,226,252,192,211,22,206,33,209,192,222,217,176,103,225,64,242,49,44,38,202,37,82,134,176,115,182,54,10,205,177,208,126,233,3,91,43,48,126,252,145,78,135,15,181,136,150,241,241,25,252,239,64,159,24,103,96,83,56,156,51,183,39,7,155,112,23,124,29,119,163,81,240,164,104,38,106,171,52,109,207,167,157,189,167,227,27,197,159,168,180,159,35,241,27,180,51,96,132,43,184,223,142,31,182,55,120,196,211,37,14,149,197,141,166,226,205,37,156,79,97,231,144,112,7,14,196,131,15,80,212,0,255,194,131,207,177,193,208,15,46,59,96,126,14,50,183,107,240,237,33,220,73,5,137,60,23,176,216,7,58,35,248,38,46,210,177,53,28,5,95,221,30,161,130,205,32,46,50,194,153,192,219,129,224,200,190,14,151,211,92,222,106,186,92,120,66,223,230,138,22,15,97,161,40,221,147,212,142,107,83,210,83,84,85,110,234,121,156,251,124,
+199,171,71,28,2,206,95,59,198,161,255,3,161,66,228,135,
+
diff --git a/uppsrc/CtrlLib/src.tpp/DataPusher$en-us.tpp b/uppsrc/CtrlLib/src.tpp/DataPusher$en-us.tpp
new file mode 100644
index 000000000..498d081a7
--- /dev/null
+++ b/uppsrc/CtrlLib/src.tpp/DataPusher$en-us.tpp
@@ -0,0 +1,127 @@
+TITLE("DataPusher")
+COMPRESSED
+120,156,197,88,255,83,83,217,21,255,87,238,204,186,78,66,
+33,188,111,73,30,201,116,134,14,116,58,157,237,88,71,235,
+246,135,76,66,94,146,27,121,53,188,151,121,239,5,215,89,
+235,224,119,59,162,184,26,21,129,177,212,21,209,174,32,160,
+133,21,151,237,106,69,215,214,46,6,237,178,138,96,117,101,
+20,81,108,183,139,90,209,210,115,223,151,124,51,172,107,235,
+236,50,195,123,201,189,231,124,238,249,242,185,231,220,27,31,
+131,22,44,160,138,169,55,168,151,252,121,42,113,84,72,196,
+52,191,79,228,56,222,43,48,78,239,138,183,126,94,230,45,
+42,183,185,56,59,128,208,0,194,186,105,150,119,178,52,199,
+184,224,65,179,52,227,100,88,142,230,153,50,142,103,89,158,
+242,132,99,130,170,250,125,49,134,231,189,100,101,6,148,24,
+183,147,161,221,28,207,241,52,235,230,25,208,101,40,138,161,
+220,140,147,230,88,158,113,122,34,88,13,251,125,2,207,122,
+139,150,184,64,137,37,43,1,56,69,187,24,206,205,49,20,
+75,49,28,44,69,243,60,71,187,157,60,91,230,114,121,194,
+66,92,19,101,201,92,75,164,105,134,246,134,104,183,23,76,
+94,179,102,141,131,230,40,195,2,14,192,104,138,3,83,105,
+24,163,56,198,77,59,203,168,50,39,79,243,20,11,224,78,
+55,229,244,196,5,69,168,41,236,57,193,112,190,212,117,55,
+229,17,53,12,16,69,63,160,105,55,168,184,138,93,111,208,
+156,27,28,229,89,206,201,187,41,88,156,97,24,150,101,104,
+150,41,43,99,156,46,167,219,83,141,133,8,86,252,190,119,
+171,126,253,230,143,23,149,44,91,138,124,42,235,69,149,130,
+38,44,78,168,213,88,89,232,247,169,148,23,25,47,86,127,
+59,189,111,149,83,200,247,38,69,149,80,84,185,141,114,80,
+14,198,233,180,35,51,242,214,56,201,89,149,245,53,11,209,
+79,48,24,3,18,94,229,229,98,141,176,28,123,232,50,202,
+181,16,210,81,183,190,123,237,222,186,186,186,245,147,115,240,
+172,123,242,199,150,7,45,169,142,51,93,173,245,131,167,186,
+103,63,154,24,109,220,188,123,255,217,237,19,95,55,12,118,
+63,255,178,55,249,65,211,163,150,177,134,157,135,78,247,54,
+127,53,121,112,199,208,174,185,243,187,126,183,97,199,153,127,
+118,79,207,61,222,112,105,237,72,207,158,150,181,127,111,237,
+218,114,240,147,35,93,240,127,154,60,62,158,186,240,217,100,
+211,231,219,158,245,181,159,216,52,48,178,125,203,211,145,147,
+201,189,131,159,37,251,6,182,78,222,235,191,185,161,190,227,
+206,201,203,143,254,209,177,111,242,90,242,249,244,237,219,109,
+219,90,15,31,59,249,56,213,57,216,183,103,243,174,212,213,
+157,169,228,218,246,222,219,205,91,70,30,141,239,170,111,123,
+112,164,231,218,84,239,64,234,211,206,67,163,163,245,71,175,
+238,111,190,51,253,228,252,181,47,39,146,87,166,198,55,142,
+246,118,14,237,217,244,222,224,253,167,247,15,60,255,253,212,
+244,173,254,161,225,155,247,187,47,253,246,217,229,225,143,31,
+140,165,26,78,117,95,111,124,116,96,227,135,253,39,14,54,
+119,221,109,108,63,158,122,58,214,121,116,235,204,246,241,190,
+222,230,173,135,15,254,121,255,145,77,237,247,142,247,181,117,
+252,105,236,243,228,182,27,183,46,92,28,126,255,102,251,249,
+255,124,114,238,242,177,142,63,140,157,191,53,219,191,169,233,
+250,190,19,115,55,46,165,246,76,93,27,222,176,251,111,103,
+59,155,118,92,239,235,235,249,98,252,98,106,184,171,241,240,
+212,208,222,134,206,15,154,70,27,59,246,77,252,230,86,67,
+251,248,185,212,245,186,127,207,52,239,30,152,184,120,113,104,
+239,250,245,51,23,158,29,155,108,72,245,140,93,158,249,235,
+149,135,231,142,78,207,246,159,252,215,71,15,219,79,157,238,
+189,113,167,123,228,248,204,217,187,35,167,102,111,212,125,56,
+214,254,213,195,185,198,195,93,87,235,175,220,249,203,208,215,
+27,159,188,255,120,221,198,129,187,61,95,236,108,77,62,59,
+119,96,119,107,146,124,186,217,217,246,222,153,205,247,102,7,
+231,218,214,237,56,179,229,249,190,150,241,117,141,135,158,230,
+38,63,195,10,36,170,72,48,40,132,180,106,65,211,191,135,
+98,24,105,50,170,144,165,90,172,104,72,144,34,168,82,84,
+227,49,97,21,82,229,26,140,222,22,98,9,172,15,11,49,
+85,134,71,76,94,169,162,132,10,112,160,22,142,137,225,21,
+0,6,72,181,186,160,45,161,38,64,102,21,18,37,36,43,
+17,83,170,90,144,150,99,36,106,118,7,90,36,107,216,88,
+61,36,107,213,5,215,141,137,81,172,137,176,118,77,66,213,
+16,126,39,140,113,4,84,112,102,66,142,102,187,101,203,250,
+172,106,178,130,85,244,43,162,73,84,20,28,197,10,150,194,
+186,147,48,80,99,119,228,134,103,25,177,23,252,129,253,129,
+226,130,166,97,69,34,113,209,45,204,194,141,24,182,169,70,
+80,34,48,97,136,132,5,9,133,176,233,97,4,133,204,168,
+133,229,154,120,12,191,3,106,66,76,94,238,64,191,32,17,
+178,224,77,29,145,136,212,96,73,3,61,44,106,100,21,80,
+135,144,137,181,162,180,28,73,120,165,153,171,168,34,215,100,
+217,82,140,100,8,153,34,70,136,84,165,252,163,48,169,144,
+168,6,107,213,114,68,143,99,66,37,51,75,177,70,116,204,
+105,193,8,7,134,105,8,158,168,145,112,232,9,48,115,67,
+38,141,12,230,198,150,224,137,82,173,188,130,132,50,46,136,
+146,70,176,201,232,47,171,177,100,128,131,65,10,129,36,126,
+1,49,192,5,189,199,100,108,75,123,42,24,182,228,104,131,
+90,44,22,18,128,70,182,136,140,36,89,211,7,242,204,7,
+54,233,36,11,11,42,206,201,32,229,13,104,114,92,12,7,
+61,193,210,96,105,133,166,196,126,38,134,130,165,170,18,14,
+150,26,46,4,23,96,41,88,146,80,3,200,87,26,8,160,
+74,18,95,136,56,9,170,223,7,3,40,93,63,179,106,167,
+85,135,41,175,7,144,61,153,128,228,125,179,133,101,73,213,
+200,160,73,228,224,194,96,113,122,204,36,52,140,217,61,86,
+49,47,202,46,211,214,202,6,76,85,26,35,93,211,139,202,
+89,224,146,62,154,22,46,70,134,116,26,61,71,218,36,106,
+90,218,110,245,130,10,5,11,26,108,141,172,228,174,4,214,
+33,53,142,195,98,84,132,144,20,218,139,144,207,72,78,125,
+32,76,145,210,211,132,54,111,191,72,155,23,182,121,56,11,
+58,242,221,109,115,206,155,14,123,69,86,36,75,86,155,238,
+20,18,178,2,88,178,218,116,210,241,127,18,226,53,166,190,
+42,248,195,170,69,178,41,107,179,191,26,19,136,242,82,45,
+98,10,219,236,223,11,51,138,13,104,171,68,232,37,71,53,
+87,90,69,74,139,24,129,58,33,106,171,76,223,85,171,96,
+168,26,60,5,37,77,31,7,250,190,19,252,170,187,251,181,
+239,215,108,243,95,201,71,56,93,90,210,168,86,84,52,210,
+1,205,119,149,255,197,67,103,173,44,70,50,44,178,170,186,
+205,110,86,202,52,212,98,5,54,125,24,218,153,195,242,65,
+111,123,214,10,102,135,130,17,163,161,68,208,74,66,24,253,
+40,161,159,35,212,156,10,98,222,84,144,96,118,0,85,63,
+73,144,214,80,160,119,204,231,94,32,55,123,129,66,233,201,
+74,8,156,185,161,239,84,228,237,58,91,129,152,232,41,205,
+4,197,159,189,158,169,31,64,249,64,217,43,177,40,88,149,
+191,189,211,185,7,35,84,125,7,145,67,192,55,80,57,3,
+81,178,122,81,1,209,162,82,180,4,107,9,56,115,232,27,
+13,164,130,69,122,31,141,66,199,134,206,47,74,176,229,242,
+99,151,229,165,101,88,142,183,121,215,142,28,151,141,185,60,
+191,141,193,220,48,255,228,133,48,27,82,54,123,230,62,99,
+172,106,134,196,240,3,78,0,9,5,10,189,246,45,92,173,
+40,32,249,186,40,82,153,183,107,95,149,34,166,126,0,229,
+3,229,83,100,222,242,144,67,145,111,168,4,25,8,131,34,
+249,162,223,25,69,44,151,141,185,60,191,231,161,72,65,169,
+111,77,145,151,187,90,81,64,178,0,69,230,173,133,121,164,
+72,159,87,255,103,94,232,29,51,96,52,206,121,56,81,155,
+51,151,230,195,79,245,154,170,90,118,216,116,49,187,222,58,
+245,190,188,44,14,151,22,108,152,183,4,71,225,244,84,109,
+131,235,216,50,21,71,19,49,163,18,135,18,98,204,184,84,
+100,221,123,204,227,178,126,19,41,196,47,43,148,243,254,122,
+97,212,7,179,78,91,5,194,252,58,223,47,25,164,194,47,
+86,76,107,115,154,73,250,178,144,213,70,66,24,184,138,211,
+215,13,71,222,239,41,254,255,2,171,242,194,79,
\ No newline at end of file
diff --git a/uppsrc/CtrlLib/src.tpp/DocEdit$en-us.tpp b/uppsrc/CtrlLib/src.tpp/DocEdit$en-us.tpp
new file mode 100644
index 000000000..2d4b9d4c4
--- /dev/null
+++ b/uppsrc/CtrlLib/src.tpp/DocEdit$en-us.tpp
@@ -0,0 +1,12 @@
+TITLE("DocEdit")
+COMPRESSED
+120,156,165,87,251,79,83,121,22,255,87,110,226,140,1,151,97,239,189,109,105,41,217,68,179,206,100,205,108,102,147,85,51,63,16,144,82,46,210,88,122,73,239,69,198,221,172,225,37,143,218,130,32,47,139,5,236,67,40,84,1,41,104,97,160,64,165,173,149,34,133,130,229,81,16,129,2,173,20,121,43,8,236,247,182,60,202,232,74,226,66,210,126,243,253,158,243,57,231,124,206,249,158,239,105,36,10,125,247,29,28,2,159,130,79,248,99,159,199,226,57,201,124,50,42,146,71,167,179,34,56,40,35,226,218,207,255,8,143,56,115,54,40,140,30,76,161,32,0,133,198,68,104,44,6,13,161,163,97,224,3,161,33,40,3,165,209,17,22,26,78,103,209,104,44,152,205,229,115,8,34,42,146,143,178,88,17,148,18,26,130,158,66,153,12,20,97,210,89,116,22,66,99,178,80,160,139,194,48,10,51,81,6,66,167,177,80,6,59,14,35,184,81,145,28,22,45,226,204,63,195,128,18,141,178,4,192,97,36,12,165,51,233,40,76,131,81,58,48,133,176,88,116,132,201,96,
+209,194,195,194,216,92,78,18,201,195,5,251,182,120,8,130,34,17,177,8,51,2,248,124,243,230,205,80,132,14,251,61,160,3,48,4,166,3,87,17,176,7,211,81,38,194,8,135,195,25,44,132,5,211,0,56,131,9,51,216,73,28,33,39,241,127,135,206,56,49,116,38,204,230,145,24,128,56,243,39,4,97,2,149,176,144,176,83,8,157,9,2,101,209,232,12,22,19,6,198,81,20,165,209,80,132,134,134,135,163,140,48,6,147,157,128,113,226,48,97,84,228,191,175,252,231,251,31,127,249,225,242,69,40,146,160,69,64,231,113,238,143,113,60,242,116,84,36,129,68,252,204,142,1,255,251,91,212,210,71,49,59,154,90,94,194,126,35,255,74,10,249,209,80,228,247,48,252,3,12,71,71,159,13,130,67,225,80,148,193,8,134,246,115,113,112,2,93,57,90,159,133,15,140,4,158,179,3,37,142,112,146,146,99,249,60,238,151,128,160,3,7,162,40,95,209,67,207,33,30,1,197,227,194,68,8,143,135,132,156,20,136,4,98,16,6,14,112,33,68,38,112,192,185,128,196,
+132,73,66,140,36,32,62,79,128,17,16,135,128,168,28,92,21,114,146,18,8,40,40,5,124,19,64,20,75,12,14,221,135,222,255,58,123,150,151,200,185,138,177,89,76,198,105,58,147,145,158,33,78,237,77,77,77,205,208,238,129,207,212,15,77,247,23,157,99,121,99,13,121,226,222,220,205,138,246,238,190,165,254,124,249,235,181,180,119,187,101,34,215,3,75,137,120,209,107,72,43,80,22,230,232,228,186,194,66,79,154,105,233,117,190,126,114,93,53,168,111,233,126,91,100,252,168,180,73,103,77,11,69,149,235,50,99,253,230,59,137,108,184,180,229,249,182,94,86,178,163,92,205,202,124,172,200,235,109,216,179,78,23,84,244,109,246,244,58,154,114,26,138,189,198,166,188,123,205,242,182,137,201,177,28,175,182,116,44,115,217,227,212,111,189,180,20,212,180,184,45,57,89,243,67,185,149,59,142,135,15,69,11,93,115,165,246,28,67,213,171,145,7,18,119,79,211,180,186,70,83,92,61,181,218,244,184,246,237,188,73,58,60,227,53,223,238,104,218,150,213,87,235,95,116,223,
+221,90,105,153,233,106,29,121,95,43,213,213,90,50,108,245,29,181,94,131,102,74,35,26,94,121,244,204,248,208,51,52,214,92,249,108,204,84,208,210,178,41,215,73,236,101,142,237,34,163,204,176,190,56,242,118,42,219,62,183,144,105,205,157,175,169,146,75,103,39,76,139,69,203,170,133,188,234,141,93,155,189,40,237,105,169,69,247,82,227,42,20,235,109,183,181,47,106,108,202,182,214,57,243,116,254,64,141,222,162,248,100,172,145,172,24,22,158,235,211,74,139,39,36,174,140,15,15,218,13,61,79,102,250,238,52,27,122,58,87,151,188,214,142,76,215,102,111,209,210,189,198,21,113,227,120,230,172,116,78,182,182,158,213,37,169,40,23,77,201,251,245,149,139,123,86,183,183,91,209,150,182,168,206,111,45,219,22,229,213,43,155,149,203,202,220,180,244,143,253,133,38,187,109,234,67,153,75,54,149,83,144,222,214,95,38,201,21,149,180,54,214,190,237,40,207,176,153,155,123,22,228,221,245,230,137,186,236,92,141,205,124,107,198,114,191,212,163,85,102,189,107,87,117,107,85,
+138,187,93,51,179,79,85,5,179,157,143,87,7,204,26,137,162,64,100,152,41,51,186,100,61,45,233,183,135,158,172,137,221,107,85,123,226,93,103,111,79,67,249,184,71,252,98,88,227,176,138,223,59,84,163,19,75,221,253,247,157,162,123,111,59,139,229,83,58,113,177,212,91,155,97,215,25,20,85,163,163,53,69,198,252,42,237,150,238,85,63,72,116,97,83,227,144,170,127,114,252,86,157,169,207,147,55,146,245,194,59,91,84,255,194,174,150,20,90,197,179,13,238,222,226,37,111,243,70,254,98,121,83,254,162,109,99,109,101,90,237,168,144,123,77,226,236,180,252,86,143,124,101,178,113,163,247,77,241,162,56,215,53,231,49,119,230,182,127,108,168,144,14,246,217,29,14,209,148,243,83,137,59,179,87,43,150,181,148,142,246,171,51,171,156,133,29,93,94,77,189,237,247,103,118,165,221,216,149,170,22,61,234,168,213,180,15,14,253,62,53,169,180,221,233,242,204,172,185,52,25,74,237,142,180,85,210,218,151,243,122,92,52,63,52,239,46,25,49,165,15,122,151,167,135,68,
+6,93,157,180,184,228,190,90,90,95,110,46,239,179,61,106,211,89,26,198,149,21,13,47,173,166,204,42,241,144,44,171,174,99,173,189,103,112,78,124,215,208,41,106,115,107,106,222,81,73,5,57,21,41,138,141,235,170,30,219,128,191,172,93,26,93,181,195,177,171,116,58,205,111,196,67,214,156,118,207,210,135,153,154,213,44,137,222,234,110,207,50,103,56,245,38,241,130,213,149,173,208,201,11,30,75,134,141,107,35,50,237,68,241,244,166,73,219,175,24,92,145,45,15,59,164,205,0,117,218,61,250,212,240,126,91,250,228,225,92,199,163,229,97,203,78,198,251,17,83,117,163,178,118,107,32,187,113,88,209,42,150,204,45,223,107,236,200,86,123,205,83,183,139,84,182,93,251,200,170,61,255,141,43,115,79,151,63,183,62,33,30,168,233,214,15,184,159,111,234,183,222,221,125,60,80,231,237,186,227,234,186,149,169,175,90,144,201,165,139,221,89,211,154,150,201,189,55,175,94,175,126,152,217,253,88,91,100,221,150,170,68,139,15,211,92,109,247,27,107,231,53,233,109,233,155,
+250,241,87,67,170,113,171,123,235,142,219,220,90,161,109,116,110,85,75,26,77,205,207,246,140,31,107,11,116,159,58,21,15,222,60,31,245,244,102,76,238,228,101,87,86,139,74,44,189,158,225,249,129,249,237,87,59,230,162,254,77,185,202,114,87,86,216,95,218,100,90,191,183,177,60,237,174,19,173,108,220,234,88,208,25,186,165,221,98,181,215,161,174,168,84,171,11,156,89,165,146,117,119,197,35,163,126,111,71,99,172,27,186,37,45,94,145,231,105,45,190,27,211,230,99,87,161,213,91,242,235,171,247,122,86,75,156,5,158,250,206,217,233,212,74,170,79,193,254,118,197,248,188,121,159,139,7,141,47,38,8,244,191,152,96,246,97,215,14,16,138,254,99,99,134,98,78,31,246,91,208,182,47,98,228,79,184,224,232,52,40,42,16,132,58,138,134,142,9,28,41,211,160,248,195,221,224,131,142,125,145,234,193,160,209,130,126,45,32,33,18,135,98,49,40,153,192,226,160,216,27,80,10,47,238,42,70,134,126,61,34,202,33,30,255,48,170,160,152,51,49,193,190,37,196,5,
+139,111,15,210,135,249,121,152,1,239,18,47,48,74,96,247,203,129,158,168,201,13,62,36,227,96,239,144,20,110,2,120,148,184,192,17,40,222,239,207,129,200,25,159,145,80,232,28,159,127,36,68,64,215,176,27,4,41,196,175,81,47,154,16,112,202,19,18,36,196,161,52,253,140,146,9,212,203,152,44,224,82,163,11,196,17,196,249,185,198,5,252,27,16,47,222,103,82,136,17,96,12,163,94,80,1,78,66,255,194,132,248,9,9,56,151,76,226,127,227,197,97,23,99,99,130,98,113,156,255,141,156,31,193,124,149,116,202,194,23,107,235,72,237,74,204,95,174,144,194,100,236,144,214,11,130,0,116,40,17,143,195,66,32,130,43,196,249,252,88,142,144,138,212,23,255,117,30,193,139,229,99,80,74,2,38,128,252,51,132,0,195,226,0,61,65,190,249,33,1,227,93,77,240,109,199,242,174,94,197,124,147,132,192,71,217,254,9,238,39,48,133,39,136,195,83,130,67,161,75,20,217,148,53,74,7,36,136,119,29,163,114,16,231,31,116,79,96,245,114,210,121,60,69,240,119,
+140,115,29,251,191,104,13,192,249,54,94,147,191,202,107,0,252,62,177,151,147,168,42,132,192,144,69,145,65,226,73,62,94,40,2,193,240,69,9,7,30,199,226,36,137,39,30,20,91,146,16,231,98,196,254,229,223,15,43,4,228,131,199,77,0,87,6,34,147,133,2,40,17,227,8,136,253,33,14,92,113,144,1,208,48,142,41,130,57,14,3,183,159,26,11,67,41,23,47,225,73,191,250,82,18,226,47,255,20,30,184,51,137,56,112,216,223,118,184,201,4,213,119,192,52,120,157,135,131,245,159,65,218,127,243,235,251,237,92,32,126,229,8,64,215,3,130,39,36,237,23,252,88,218,190,49,101,199,80,142,146,118,212,50,57,137,24,53,176,6,72,5,197,115,248,4,22,124,130,123,23,136,63,184,199,197,5,4,201,14,168,130,3,99,129,213,224,251,21,2,5,58,120,12,231,184,88,80,240,209,112,238,67,63,112,250,18,70,144,196,103,229,114,224,112,212,127,1,182,100,50,32,
+
diff --git a/uppsrc/CtrlLib/src.tpp/DropList$en-us.tpp b/uppsrc/CtrlLib/src.tpp/DropList$en-us.tpp
new file mode 100644
index 000000000..003ed226e
--- /dev/null
+++ b/uppsrc/CtrlLib/src.tpp/DropList$en-us.tpp
@@ -0,0 +1,16 @@
+TITLE("DropList")
+COMPRESSED
+120,156,221,90,143,143,20,87,29,255,87,94,10,197,189,115,111,153,153,221,189,221,219,171,4,122,8,18,20,13,80,141,185,236,50,179,51,111,111,167,55,59,179,206,204,222,113,26,201,9,141,6,82,137,63,248,113,77,9,65,219,90,32,162,7,52,70,3,8,5,163,177,18,20,35,144,82,196,82,84,138,177,233,217,250,11,66,197,239,251,49,191,246,246,118,247,246,126,20,109,19,110,118,230,189,239,251,126,63,223,159,239,251,222,160,132,150,46,21,226,194,18,161,197,127,185,213,184,164,212,12,55,63,168,167,82,217,126,69,74,247,15,175,255,116,95,127,247,202,88,111,170,139,80,17,129,74,50,35,38,179,233,164,152,146,122,225,31,49,41,74,105,41,153,18,179,82,95,42,155,76,102,133,156,106,40,142,147,31,52,164,108,182,159,76,146,226,210,18,41,147,150,196,76,42,155,202,138,201,76,86,130,185,146,32,72,66,70,74,139,169,100,86,74,231,52,236,168,249,65,37,155,236,239,222,216,11,147,146,100,37,32,46,136,189,82,42,147,146,132,164,32,165,96,41,49,
+155,77,137,153,116,54,217,215,219,155,83,149,170,171,91,38,95,75,23,69,73,236,47,138,153,126,224,121,219,182,109,9,49,37,48,14,82,64,76,20,82,192,170,8,239,132,148,148,17,211,125,66,95,58,43,102,133,36,16,79,103,132,116,174,170,216,74,101,102,209,211,45,69,207,8,57,221,197,64,162,251,163,162,152,129,41,189,241,222,37,98,42,3,130,102,147,169,116,54,35,192,226,146,36,37,147,146,152,148,250,250,164,116,111,58,147,43,99,69,195,118,126,240,75,91,190,252,248,199,55,244,60,181,9,13,58,98,255,250,156,12,255,175,182,173,234,39,117,199,37,207,20,213,92,129,60,14,88,230,8,182,221,2,26,124,92,16,122,4,161,80,88,25,19,18,66,66,74,167,187,16,71,223,251,130,182,4,207,43,5,228,81,12,15,200,133,135,4,132,170,181,162,161,171,13,41,121,188,61,105,109,45,32,254,16,26,24,71,179,36,136,184,68,249,101,249,65,71,234,71,252,207,202,149,122,69,25,194,57,128,118,25,152,201,248,142,31,141,239,31,31,31,223,113,247,33,
+252,59,254,239,31,30,120,231,218,175,119,158,159,188,57,241,181,91,127,189,179,123,247,27,111,94,121,238,198,185,35,167,47,221,187,178,107,239,209,203,199,143,28,158,56,125,100,239,241,137,157,63,251,250,43,83,175,30,222,249,250,91,215,142,253,103,251,196,205,235,23,190,181,239,254,111,46,60,124,233,237,27,119,31,94,249,221,219,123,254,177,253,226,55,111,238,120,254,204,31,246,191,246,206,177,223,159,249,198,212,137,59,231,159,249,251,221,191,92,250,243,197,61,83,223,253,193,251,7,38,206,127,231,153,147,47,158,250,219,206,169,211,151,15,220,124,118,215,7,23,79,222,123,253,214,183,79,252,116,234,254,237,131,87,247,188,116,224,216,123,71,175,190,123,231,250,79,206,238,216,243,243,95,189,112,242,151,111,30,190,126,255,212,91,231,110,77,158,185,188,239,143,87,46,30,57,52,53,249,227,235,231,191,255,236,209,131,219,119,189,112,227,222,213,139,239,29,248,224,208,159,38,207,190,113,234,185,131,103,39,118,62,56,248,207,239,157,186,244,234,185,127,189,246,226,222,
+151,15,253,118,114,223,145,151,247,76,62,216,253,238,243,39,46,236,255,234,196,47,30,92,187,125,231,254,248,237,175,92,125,255,120,20,160,205,101,221,65,163,186,54,132,93,84,181,173,17,29,188,8,185,101,140,28,108,96,149,184,6,178,74,104,68,49,106,240,190,100,91,21,250,81,3,133,201,61,154,53,106,34,100,128,45,36,16,177,8,4,164,44,123,72,49,245,47,98,13,233,38,26,198,99,114,15,157,139,170,138,110,59,253,104,180,140,77,68,76,156,140,101,75,96,45,78,105,194,96,178,20,249,232,160,34,86,173,10,231,196,196,163,190,209,49,78,80,76,113,80,205,129,69,138,99,104,19,118,87,43,174,178,124,45,251,11,235,186,216,46,41,42,238,74,128,116,152,207,0,202,62,13,205,2,202,166,229,2,101,21,59,142,98,235,198,24,42,43,35,24,185,22,172,76,56,39,235,18,193,16,44,4,140,197,209,152,85,67,170,98,34,156,24,74,192,75,71,31,50,145,194,105,195,44,159,246,168,238,150,17,174,84,221,49,62,223,212,80,73,55,140,128,162,161,0,
+127,137,168,22,158,180,96,22,1,128,12,103,68,21,155,50,61,132,77,108,235,42,250,44,91,105,172,138,19,232,243,156,23,96,195,82,117,32,135,156,42,86,245,18,12,91,173,59,85,67,97,116,184,71,48,150,2,129,224,139,91,86,224,53,12,3,12,3,214,65,12,27,87,109,236,96,147,12,27,163,171,249,218,71,49,213,50,44,219,137,3,25,19,19,147,113,203,113,84,178,76,215,65,216,85,19,137,174,58,153,124,186,138,225,88,72,175,84,13,92,193,100,52,181,46,221,28,50,48,152,144,110,115,43,243,184,245,213,23,39,198,2,32,172,177,236,138,66,109,75,195,37,88,90,227,58,145,123,86,112,248,109,197,116,0,85,160,82,199,194,6,203,197,57,47,186,16,10,62,23,116,52,42,99,163,138,109,22,239,152,61,1,6,78,153,64,239,128,249,33,213,210,48,24,132,59,138,193,106,3,121,0,65,71,175,232,134,194,167,98,39,17,94,4,98,177,62,2,180,168,183,12,184,182,65,185,18,24,87,233,6,113,249,115,224,20,228,119,14,162,107,56,62,14,40,134,
+81,84,212,225,2,205,32,200,251,233,133,60,246,54,136,128,30,153,124,216,181,85,62,9,241,103,224,107,176,27,100,42,89,54,206,7,86,65,216,102,166,131,181,4,26,48,116,98,3,84,124,98,104,49,27,119,169,54,38,150,22,204,96,78,226,209,111,71,70,32,171,14,207,131,144,148,78,43,41,105,164,241,93,73,33,118,76,162,150,39,173,74,104,128,172,45,216,94,165,105,50,24,190,201,126,81,39,148,151,201,241,105,111,186,114,168,62,179,17,18,133,105,217,18,201,203,124,97,0,9,160,239,127,137,5,50,7,169,152,44,228,143,136,166,79,186,118,129,69,134,134,228,147,196,77,252,47,65,74,157,63,250,35,145,111,93,158,78,64,42,7,162,35,9,220,52,214,131,87,121,118,19,247,112,234,230,236,129,187,128,195,87,192,177,89,100,240,195,53,153,25,25,205,22,139,152,170,103,133,33,61,19,239,12,5,240,206,20,252,136,170,115,6,184,55,41,16,171,32,40,194,234,49,58,36,206,70,118,181,18,126,192,192,138,77,127,196,66,34,135,248,29,177,116,109,58,
+187,32,168,63,51,16,215,103,135,126,115,218,214,0,29,222,25,3,173,23,103,193,26,67,214,9,167,185,13,53,163,101,80,38,207,179,230,138,134,223,233,76,65,10,83,113,136,41,96,65,126,140,214,80,143,181,98,131,84,55,244,39,248,135,28,131,228,216,177,109,134,41,53,53,82,88,164,129,112,73,164,53,176,60,204,243,185,89,171,20,33,147,130,219,26,212,147,193,3,137,124,85,112,209,118,108,0,232,172,51,53,188,181,94,194,118,48,247,230,118,36,147,222,68,38,63,18,177,156,65,2,89,40,26,233,121,94,45,210,44,88,179,109,146,49,233,148,86,194,174,245,133,149,187,104,64,200,133,24,245,216,9,49,92,151,2,65,228,181,117,34,179,17,177,174,32,77,178,64,195,37,218,136,221,154,109,50,161,116,50,143,8,21,97,57,82,30,135,163,39,45,161,88,189,56,77,78,136,196,164,136,182,241,23,106,80,197,105,211,139,231,56,251,1,115,85,5,10,77,185,71,36,193,219,166,220,180,78,189,159,80,156,245,80,229,53,8,206,51,130,86,180,44,99,102,212,
+24,193,58,204,234,16,107,60,57,20,159,217,151,72,144,102,175,234,18,111,244,227,76,154,217,140,29,48,54,40,85,0,50,155,110,0,194,217,145,230,186,136,54,54,211,141,153,98,171,101,242,169,164,128,182,98,131,5,215,170,234,42,176,184,92,94,62,0,101,157,188,220,177,85,121,57,181,16,87,94,138,77,185,167,230,200,75,136,12,204,238,252,7,48,192,2,98,150,132,138,160,34,173,101,198,88,3,246,51,91,173,52,53,101,78,240,145,210,74,67,127,105,160,156,64,51,253,220,170,29,102,228,37,186,187,44,89,53,83,123,68,116,54,191,10,123,164,180,229,85,63,220,146,98,195,45,1,129,240,57,0,186,113,231,20,128,41,133,14,2,176,74,230,5,141,142,89,148,170,155,109,189,210,73,130,36,243,58,74,142,230,244,228,72,104,181,146,131,36,130,144,167,152,249,54,244,65,99,10,21,109,70,133,204,167,113,81,13,54,9,59,77,148,31,170,25,218,143,34,180,181,227,242,96,18,41,34,218,192,134,57,108,115,116,218,1,160,78,252,6,35,22,14,0,190,65,
+155,35,4,11,46,127,59,162,148,116,219,239,67,250,13,81,102,247,164,212,41,43,129,202,161,50,82,12,111,247,59,99,193,149,64,177,104,149,197,59,153,203,55,213,119,52,35,101,90,205,193,254,74,45,67,222,166,136,25,53,235,95,180,89,114,71,183,169,157,149,220,11,210,145,152,30,179,54,226,170,161,168,120,238,134,24,128,184,24,248,205,63,16,254,206,38,108,194,145,192,221,161,1,183,192,205,170,98,91,113,45,91,30,148,243,243,28,199,194,164,23,50,150,121,69,134,23,55,98,122,75,151,91,165,61,93,235,160,179,194,166,53,234,108,148,177,58,28,108,22,194,26,169,59,29,129,50,211,111,227,211,86,121,116,19,177,142,228,108,50,136,20,169,164,63,226,245,68,201,111,122,116,17,231,22,18,108,124,67,167,53,237,202,61,71,31,169,199,97,254,61,100,120,186,135,44,42,198,193,134,219,225,39,74,164,57,31,222,98,180,145,25,189,238,93,231,101,211,103,172,234,83,213,205,74,209,240,92,46,120,209,162,128,10,55,155,102,145,64,87,217,182,50,70,206,69,
+252,147,18,171,248,52,152,86,112,250,164,155,67,254,49,35,61,100,100,160,162,214,241,153,159,34,133,172,207,123,211,121,83,55,32,219,177,53,250,199,237,245,132,162,22,169,54,11,218,42,155,74,176,225,120,149,44,155,217,21,63,158,149,123,34,63,201,49,22,159,68,78,163,168,71,179,131,31,248,67,200,68,218,232,88,167,38,63,162,227,81,255,192,196,183,80,88,72,247,180,224,169,82,238,118,203,186,211,78,255,146,45,83,95,122,120,175,231,164,24,78,100,177,11,17,190,108,1,213,175,31,213,103,179,142,41,7,159,42,177,65,111,49,18,77,58,135,124,241,209,94,96,216,84,171,82,177,76,31,189,16,104,90,222,199,50,186,29,165,103,234,158,89,79,3,147,132,106,255,248,156,147,117,2,215,98,228,98,30,67,211,65,168,171,54,26,219,93,203,186,163,181,5,54,10,221,30,158,236,91,67,198,102,64,150,87,59,1,208,196,197,3,223,143,209,188,217,182,164,139,202,40,9,107,252,38,0,189,56,50,134,92,101,152,181,225,33,125,168,88,195,166,138,19,249,214,
+78,66,78,66,6,198,230,124,168,194,200,116,20,129,12,117,172,137,169,211,123,22,101,172,15,149,105,159,37,56,121,167,5,153,137,170,250,86,108,56,243,28,29,226,115,61,98,90,236,16,209,208,115,102,7,56,175,237,3,238,99,90,87,60,80,109,12,102,117,205,22,230,176,3,205,107,24,110,228,153,31,70,32,246,34,48,175,69,216,225,15,189,67,3,166,217,176,138,152,45,132,156,183,85,134,33,199,200,201,78,199,144,5,132,154,2,22,62,61,138,88,77,49,120,43,127,108,139,107,215,176,15,199,58,146,103,160,126,175,88,26,142,147,198,127,211,141,178,183,1,8,237,28,188,157,118,228,216,44,104,84,232,46,108,187,74,100,158,119,61,169,136,27,92,127,8,178,27,191,127,75,175,226,149,74,179,134,28,158,215,88,106,205,153,43,226,30,157,5,6,156,158,49,211,82,150,236,18,34,25,95,53,44,114,201,140,108,195,98,188,182,45,142,121,183,26,249,254,130,70,82,72,124,170,2,41,195,240,222,250,55,31,129,67,27,94,250,74,42,90,138,13,133,52,145,203,
+235,137,176,155,147,81,216,205,217,162,190,202,24,133,154,131,93,56,152,19,236,1,161,206,112,199,77,112,47,5,184,211,13,43,32,52,194,53,128,138,53,215,133,162,12,94,99,147,236,27,53,132,71,176,201,174,96,133,175,152,241,141,175,98,24,214,168,135,182,26,186,107,6,160,66,102,47,241,157,55,157,69,175,157,145,187,122,53,216,22,178,91,148,222,61,183,153,238,158,1,16,228,169,183,223,223,3,7,61,83,160,161,187,58,118,194,229,129,64,46,145,129,67,210,202,194,161,87,4,249,64,168,206,107,38,187,158,72,10,66,114,143,147,176,237,235,238,35,78,96,111,159,82,170,124,115,215,72,221,244,154,81,68,239,145,91,100,96,111,150,13,20,228,39,130,134,73,60,120,92,209,65,247,164,193,69,164,217,24,83,146,74,214,249,14,201,23,169,128,252,71,127,232,19,173,91,53,161,11,224,51,142,89,209,224,118,84,16,113,130,219,55,160,54,230,195,190,29,208,190,189,207,87,83,133,5,122,253,208,84,22,176,80,8,153,217,76,61,132,186,175,255,31,154,11,196,
+158,141,238,26,58,91,68,161,255,99,94,53,39,75,104,233,16,141,67,24,252,201,255,23,250,111,248,99,
+
diff --git a/uppsrc/CtrlLib/src.tpp/EditField$en-us.tpp b/uppsrc/CtrlLib/src.tpp/EditField$en-us.tpp
new file mode 100644
index 000000000..7ea9c5306
--- /dev/null
+++ b/uppsrc/CtrlLib/src.tpp/EditField$en-us.tpp
@@ -0,0 +1,14 @@
+TITLE("EditField")
+COMPRESSED
+120,156,189,26,253,143,27,71,245,95,25,181,229,100,31,174,181,187,182,207,62,155,160,124,180,9,81,154,20,229,66,139,100,173,207,235,221,241,121,122,235,93,107,119,246,124,87,68,116,4,82,68,42,209,80,138,2,8,132,130,34,69,105,85,218,3,212,95,162,0,5,170,86,45,130,74,149,104,37,20,145,84,20,85,124,20,161,244,7,132,144,224,205,204,206,238,218,107,159,215,151,11,249,225,98,207,204,123,243,190,63,230,185,169,161,7,30,80,10,202,253,202,140,127,245,135,112,215,8,108,170,55,73,185,92,107,24,90,165,177,126,226,209,229,198,226,193,220,82,57,207,176,168,128,165,84,85,75,181,74,73,45,107,75,240,71,45,169,90,69,43,149,213,154,182,92,174,149,74,53,165,110,218,134,239,235,77,91,171,213,26,12,72,3,32,173,90,209,212,106,185,86,174,169,165,106,77,3,88,77,81,52,165,170,85,212,114,169,166,85,234,22,246,77,189,105,212,74,141,197,211,75,0,84,98,55,1,114,69,93,210,202,213,178,166,148,20,173,12,87,169,181,90,89,173,86,
+106,165,229,165,165,186,105,12,40,113,157,240,46,162,170,154,218,232,168,213,6,208,124,246,236,217,162,90,86,4,5,101,64,166,42,101,32,85,133,53,165,172,85,213,202,178,178,92,169,169,53,165,4,200,43,85,165,82,31,24,158,209,159,206,122,101,38,235,85,165,78,40,6,20,139,159,84,213,42,128,44,21,150,238,87,203,85,96,180,86,42,87,106,85,5,46,215,52,173,84,210,212,146,182,188,172,85,150,42,213,122,15,27,22,246,244,230,23,86,191,136,154,126,169,129,30,182,8,61,74,176,109,45,232,77,95,109,156,104,181,235,237,250,17,234,217,45,212,108,181,14,230,148,162,82,212,42,149,60,10,229,220,106,161,85,246,247,160,18,131,138,213,186,88,143,33,6,65,199,38,102,8,194,80,178,43,180,6,10,255,107,126,226,225,83,15,126,110,5,29,60,72,250,198,26,174,151,149,165,5,80,207,246,151,95,221,190,180,29,253,251,215,75,223,251,251,165,87,191,182,253,242,149,139,95,121,233,206,11,59,23,223,191,190,115,254,242,141,15,223,122,229,245,143,222,191,
+125,238,169,155,255,124,239,246,15,46,255,105,231,87,255,57,191,243,193,123,79,159,251,198,83,31,220,252,240,217,111,253,246,249,191,94,185,245,242,79,158,185,126,227,214,175,47,124,253,55,231,223,125,243,47,31,125,247,250,246,133,157,23,159,251,195,235,151,174,189,248,194,191,191,122,245,226,223,238,92,251,233,63,158,121,247,157,219,63,255,206,219,111,220,248,243,47,47,95,124,238,202,219,55,223,184,122,238,218,173,159,93,190,242,251,111,254,110,251,249,143,127,248,253,243,59,31,95,189,240,139,119,110,126,233,71,119,254,248,202,155,207,126,251,233,31,191,182,243,95,125,50,47,103,122,196,71,67,98,173,97,138,224,83,224,99,11,13,123,216,193,27,216,67,180,135,61,204,150,13,68,183,6,24,185,93,180,97,216,1,134,13,131,34,211,112,80,7,35,12,66,5,32,226,32,66,125,68,241,38,13,12,27,121,120,224,97,31,59,212,96,22,88,68,143,118,145,233,6,158,143,11,12,43,234,187,62,69,120,131,88,112,98,12,55,92,151,123,60,191,66,61,226,172,21,80,
+39,160,177,218,228,149,156,74,234,242,171,145,225,108,33,151,81,42,240,216,100,29,163,135,12,10,23,17,135,22,144,229,130,82,113,17,29,178,192,25,56,49,236,170,24,37,227,206,236,17,224,215,66,157,45,64,13,215,34,61,20,143,176,45,215,1,97,208,22,10,63,200,77,132,58,6,35,196,237,60,129,77,202,232,161,158,225,248,93,215,235,163,199,132,152,92,46,15,32,17,112,27,230,122,145,43,65,17,74,168,52,78,212,25,250,136,20,246,229,24,166,143,17,60,252,12,38,107,61,218,206,177,165,163,174,67,219,249,58,242,25,245,38,106,38,236,21,24,212,87,155,96,216,35,96,122,174,217,146,128,45,196,254,178,67,37,212,229,159,218,7,86,87,168,197,86,115,249,124,104,12,167,49,13,60,199,231,154,49,93,207,99,236,244,56,46,0,242,18,194,218,128,75,192,90,104,15,53,23,37,198,72,26,92,43,236,124,104,17,140,117,189,40,56,46,237,202,50,16,180,7,142,35,168,123,200,240,60,188,50,131,51,237,192,98,6,196,16,3,249,142,101,120,150,228,163,
+11,241,19,207,54,129,227,142,15,70,214,206,1,171,237,130,233,58,62,101,171,143,11,135,104,47,48,193,76,148,136,128,3,89,164,55,75,104,224,250,122,97,4,142,99,134,205,86,2,123,11,133,31,244,246,2,7,227,42,148,66,19,23,248,66,28,124,39,18,7,68,3,157,47,179,123,228,234,56,171,251,79,182,164,122,26,209,149,198,190,222,153,92,234,25,30,152,214,226,221,11,9,157,97,17,2,162,144,41,162,139,136,108,129,67,76,215,194,97,56,98,214,100,137,218,131,223,236,99,58,219,142,78,227,190,187,129,67,59,34,194,163,146,44,108,184,196,18,226,16,39,51,139,35,218,114,244,216,159,24,134,144,107,39,102,153,17,107,152,20,123,126,54,19,153,238,13,179,29,33,230,103,146,122,247,108,238,17,47,250,100,149,154,144,212,32,14,0,87,132,103,186,249,57,218,7,134,102,59,194,44,66,184,170,218,139,123,163,97,14,199,152,87,156,247,204,61,146,97,118,46,166,35,243,55,123,94,202,237,13,196,40,178,113,68,33,231,146,157,188,43,155,57,25,123,114,
+199,117,237,233,4,159,156,238,200,14,30,166,125,153,97,19,219,62,182,33,11,70,12,157,228,254,204,243,163,32,150,186,99,170,11,241,197,129,236,120,55,220,9,81,69,231,65,123,212,11,160,32,19,27,172,4,131,37,208,18,212,114,116,136,177,3,213,162,201,10,193,49,185,240,186,105,242,101,51,37,182,2,245,129,188,45,75,12,76,158,159,34,64,155,215,18,236,147,50,45,34,246,248,145,227,167,206,180,87,79,30,250,188,148,37,224,22,162,76,240,223,21,150,97,199,82,250,84,200,106,79,231,162,28,223,6,185,132,251,81,117,138,240,166,137,153,67,0,106,99,195,32,182,1,149,46,130,26,116,13,163,28,47,209,65,204,79,98,207,101,46,99,99,103,13,106,25,168,125,153,207,229,121,25,190,133,12,168,239,59,110,224,112,175,34,20,110,214,211,87,127,186,125,32,162,77,46,142,41,19,10,115,19,190,91,9,149,217,163,6,0,52,130,18,231,55,253,99,41,69,46,8,85,66,188,228,241,167,62,102,206,77,222,146,178,158,47,44,19,35,181,134,59,57,29,192,
+195,207,16,41,117,161,219,112,161,128,38,236,246,228,110,126,85,231,119,78,42,35,3,40,35,193,134,35,177,112,45,70,29,148,227,198,59,208,213,64,195,50,230,78,9,113,141,203,26,220,131,221,51,114,205,252,105,199,79,136,49,139,232,18,0,145,228,166,241,239,177,190,173,155,236,23,19,98,136,249,202,86,178,140,208,89,159,24,174,100,205,146,112,217,40,18,79,21,186,23,82,219,53,108,214,134,242,158,113,72,124,56,73,97,79,20,48,226,120,88,208,115,99,246,18,60,22,103,49,112,196,29,108,165,169,142,163,12,219,143,73,133,111,36,117,39,248,161,105,147,65,199,133,206,97,230,125,16,89,88,126,156,175,60,10,129,238,170,62,26,171,172,99,228,238,0,123,6,117,189,246,129,61,224,247,245,241,144,185,91,185,144,41,9,140,137,103,63,164,51,165,216,218,165,210,26,165,99,102,169,181,43,9,211,106,173,148,232,184,176,98,239,187,87,117,212,49,201,219,132,152,194,23,226,160,50,162,123,177,42,13,96,36,224,242,176,205,37,48,41,238,76,164,66,154,29,
+154,224,8,147,40,75,154,170,30,81,184,43,189,74,154,216,169,241,80,74,127,150,240,34,111,137,77,51,59,181,35,214,200,204,102,132,186,153,180,253,63,44,227,17,94,116,76,228,41,206,178,145,202,197,233,44,12,140,22,51,179,195,178,141,193,227,118,139,203,236,64,28,152,35,23,194,253,1,221,202,118,199,105,12,66,217,237,14,126,32,190,131,127,245,19,79,77,32,116,41,98,246,96,52,59,217,124,214,240,253,161,235,89,237,92,212,19,180,70,14,181,18,15,222,60,74,41,72,194,140,198,150,184,11,24,12,45,94,194,178,108,39,41,149,118,18,73,101,16,34,65,125,176,16,40,115,156,209,21,100,216,246,72,231,15,201,216,34,254,192,54,182,88,129,8,11,62,172,19,127,189,24,233,180,189,72,123,196,207,20,208,143,18,27,160,69,37,152,99,81,52,108,225,178,241,31,33,152,80,227,231,68,36,237,234,249,212,94,62,101,25,17,127,168,203,241,141,37,170,110,162,47,58,52,42,142,117,188,229,83,207,93,199,66,50,93,226,65,74,48,24,14,241,2,205,36,
+129,186,129,99,70,45,16,127,108,116,29,123,43,172,177,160,38,241,153,153,240,10,135,242,10,127,79,162,12,223,179,19,233,81,174,44,100,150,166,124,19,159,158,46,83,207,231,97,194,52,245,169,6,38,94,207,101,60,242,138,232,240,86,34,16,249,3,108,146,46,49,227,3,126,33,61,35,48,216,123,127,226,145,150,65,179,81,193,200,176,193,23,15,188,188,240,26,159,88,156,114,105,56,232,136,113,251,16,128,1,232,137,192,103,231,187,160,50,104,123,152,231,234,130,163,184,59,226,53,40,220,141,249,84,196,38,93,76,73,31,163,62,131,76,180,109,209,70,114,38,177,39,101,30,119,192,190,200,6,222,15,165,142,225,218,95,229,146,16,121,90,203,43,129,217,139,191,71,227,40,16,47,155,169,128,34,226,40,34,70,69,108,80,37,134,64,0,5,62,101,35,203,197,194,41,220,161,232,151,186,174,25,248,123,243,14,145,231,196,72,162,179,69,113,118,159,16,144,114,44,193,96,91,136,253,13,223,141,252,233,194,1,123,114,249,0,161,253,160,240,248,68,224,136,13,148,
+181,249,196,65,107,32,69,39,6,97,209,4,66,175,59,20,211,184,132,57,197,166,204,131,75,36,36,210,31,0,238,24,3,24,161,40,34,164,119,136,230,135,121,145,231,246,99,140,5,65,27,192,250,60,158,59,98,254,38,34,225,108,225,30,10,168,123,148,107,116,158,212,21,67,77,75,94,157,84,234,130,212,20,131,241,228,84,16,70,195,205,2,173,49,65,184,1,101,140,51,51,234,10,230,38,132,131,145,241,36,119,108,64,40,226,181,236,200,67,15,96,154,163,147,42,42,97,238,209,40,80,76,94,121,190,228,35,72,238,18,128,46,172,1,138,81,66,153,215,116,79,185,73,249,102,147,109,18,38,81,6,25,16,152,64,191,241,94,142,247,206,249,44,125,41,31,226,141,140,243,178,101,103,54,102,219,109,158,151,202,196,233,233,220,252,238,126,196,38,230,186,120,76,152,199,36,19,96,115,217,100,2,46,52,74,86,50,201,202,60,53,159,22,15,4,194,112,77,6,42,12,175,239,66,120,76,241,58,251,221,155,208,35,198,192,159,135,79,9,51,23,147,18,40,228,144,
+192,87,98,216,80,186,83,30,205,152,203,57,162,232,17,111,45,16,189,130,1,52,57,38,27,170,207,205,214,169,192,182,39,244,216,5,145,164,108,104,177,178,57,66,136,102,254,57,7,151,64,27,138,200,251,114,161,11,231,219,247,229,11,72,230,73,32,129,101,73,248,79,200,140,56,235,28,230,176,7,169,42,33,54,73,65,40,54,209,129,196,230,16,166,192,221,231,40,242,71,12,139,225,61,241,60,142,221,95,212,231,21,238,73,99,147,231,180,120,90,50,83,144,18,100,202,91,122,63,46,16,30,33,125,86,34,245,141,77,210,15,250,200,9,250,29,200,37,96,30,137,212,151,26,62,244,205,196,51,208,188,236,176,120,182,66,158,196,115,176,35,65,166,177,99,108,154,155,19,223,254,161,205,3,48,17,169,134,196,18,77,107,172,78,195,52,161,109,226,149,173,59,161,179,5,143,152,192,59,191,44,90,228,88,179,164,133,195,144,118,214,60,246,216,63,143,239,39,225,178,251,127,170,176,145,63,49,114,228,207,100,6,6,207,154,60,1,66,202,236,68,151,200,182,102,96,
+192,225,112,162,112,38,1,33,179,37,207,191,0,105,132,237,80,129,149,247,160,127,144,165,4,237,96,248,106,141,220,239,163,13,226,19,40,160,10,162,86,98,199,33,166,242,39,117,70,10,144,55,240,92,246,195,36,222,45,36,201,162,200,129,178,61,67,54,57,22,119,169,147,30,115,68,64,0,227,22,135,194,151,176,120,65,31,127,23,25,93,30,127,23,145,162,150,78,16,77,8,198,58,212,76,116,71,221,67,198,215,60,89,255,135,60,200,31,72,165,94,243,198,118,166,189,237,68,180,71,77,65,22,89,139,74,99,154,164,121,21,33,174,229,165,68,74,186,137,197,89,116,177,50,67,146,164,255,15,34,247,224,250,
diff --git a/uppsrc/CtrlLib/src.tpp/FileList$en-us.tpp b/uppsrc/CtrlLib/src.tpp/FileList$en-us.tpp
new file mode 100644
index 000000000..22700504d
--- /dev/null
+++ b/uppsrc/CtrlLib/src.tpp/FileList$en-us.tpp
@@ -0,0 +1,55 @@
+TITLE("FileList")
+COMPRESSED
+120,156,237,188,249,83,99,73,150,38,250,175,96,221,51,101,153,53,57,249,98,205,140,202,236,105,171,55,61,221,99,245,166,172,199,172,179,103,230,135,124,153,29,100,4,145,137,85,100,68,24,16,85,93,239,217,107,99,23,32,144,64,18,18,18,66,151,69,72,108,90,208,138,16,210,101,21,8,45,23,73,32,132,132,144,208,138,246,21,173,87,247,190,43,1,17,16,25,145,91,213,204,179,103,214,10,179,208,197,175,251,241,227,199,143,159,243,125,238,14,159,223,169,251,55,255,230,214,7,183,254,242,214,15,124,62,249,79,13,79,234,95,62,109,249,226,243,198,123,247,30,124,90,127,231,254,167,191,251,47,255,245,87,159,254,242,215,239,125,116,239,253,170,148,219,152,148,187,31,223,190,251,224,254,221,219,247,238,124,132,253,119,251,238,237,59,247,239,220,189,119,251,193,157,95,221,123,112,247,238,131,91,159,60,122,90,223,220,252,197,231,79,239,60,120,240,105,181,209,157,15,238,252,229,157,143,239,223,185,253,241,189,7,247,30,220,190,251,241,131,59,88,219,59,183,110,
+221,185,245,241,157,251,183,239,221,125,112,231,254,39,143,27,154,31,125,241,121,253,131,187,159,254,242,31,62,194,26,221,173,246,132,9,191,117,251,163,59,247,62,190,119,231,214,221,91,119,238,97,93,221,126,240,224,222,237,143,239,63,184,251,171,143,62,250,228,81,253,139,150,198,231,207,46,251,106,188,125,251,206,237,79,191,186,253,241,167,152,206,255,242,47,255,242,225,237,123,183,46,52,184,135,9,187,125,235,30,166,234,109,172,236,214,189,59,31,223,190,255,171,91,191,186,255,224,246,131,91,119,49,225,247,63,190,117,255,147,23,245,77,245,223,190,123,232,247,127,112,232,31,223,250,164,177,165,1,19,241,203,127,119,251,246,199,88,147,143,62,248,232,47,111,223,251,24,27,232,131,187,247,238,63,248,248,22,214,249,157,59,119,238,222,189,115,251,238,157,95,253,234,206,253,143,238,127,252,201,55,13,245,143,27,154,190,248,252,255,254,167,255,231,223,254,237,223,255,251,255,246,89,221,231,205,183,63,253,47,159,60,196,254,253,93,227,211,134,223,54,54,183,84,159,107,
+86,253,228,203,234,227,223,60,127,250,242,219,103,213,23,95,214,125,254,111,111,221,250,247,183,110,125,249,229,175,223,187,245,225,173,15,239,220,191,255,126,221,229,4,92,189,169,251,167,215,207,191,190,85,119,37,244,122,133,79,174,87,121,45,232,197,203,175,158,54,62,122,155,164,186,215,58,124,241,139,47,62,111,190,243,105,221,229,215,175,127,221,248,109,253,215,13,159,220,185,115,239,214,47,176,113,222,106,239,88,109,235,105,107,109,237,40,32,173,216,167,32,103,198,198,64,177,95,131,163,107,206,187,122,152,166,210,214,89,66,232,23,184,79,59,39,57,211,89,225,26,151,115,146,236,102,151,135,188,221,158,142,168,65,193,100,12,173,186,151,180,212,182,131,92,43,129,122,72,208,173,83,109,35,222,128,123,197,177,186,190,122,30,62,25,139,56,130,7,32,186,95,26,179,152,193,112,240,208,217,157,47,73,236,203,203,165,173,172,58,172,222,46,5,129,140,11,9,6,103,102,90,103,46,62,178,153,50,21,45,202,243,173,166,61,236,35,210,117,120,0,76,187,213,238,74,
+18,226,174,100,18,196,14,194,73,151,112,192,151,62,94,19,88,218,143,74,173,118,116,185,171,45,212,190,227,242,181,159,1,152,168,89,85,2,137,40,53,209,138,202,101,207,107,243,80,123,92,63,4,16,122,70,98,109,189,170,240,26,101,22,71,155,142,196,11,99,204,196,150,27,80,45,230,252,197,41,23,146,46,226,105,4,143,92,173,114,45,103,45,186,20,196,106,237,209,22,118,7,59,50,129,64,192,60,183,87,241,173,111,17,79,186,144,80,251,26,88,14,45,250,19,68,176,16,162,7,115,197,210,41,174,18,131,244,168,126,205,49,63,105,104,167,17,198,215,59,134,197,114,72,23,83,115,210,33,5,159,65,158,114,91,124,172,133,209,184,108,82,26,218,69,41,68,94,101,236,76,102,162,196,195,120,82,63,82,12,118,11,78,80,117,158,12,69,211,209,252,17,174,35,214,189,144,18,7,125,67,251,91,237,232,40,181,3,23,240,207,168,2,35,129,177,160,186,192,29,47,180,102,214,69,22,240,36,120,14,56,44,210,222,19,125,150,161,137,48,83,90,91,160,228,101,
+24,66,37,130,124,53,11,169,17,87,133,11,78,251,35,174,179,130,50,164,88,138,245,31,21,203,65,74,121,214,155,58,159,1,203,185,232,249,193,161,43,225,56,65,202,201,88,184,146,80,157,91,131,73,145,160,159,7,1,81,16,205,24,228,101,106,151,26,5,169,21,87,42,57,181,225,63,235,157,239,57,24,224,173,182,103,194,172,188,92,46,223,240,26,42,97,24,209,164,161,50,105,104,123,227,32,202,69,139,165,114,128,74,50,218,149,67,253,121,209,222,198,4,224,118,198,20,125,28,203,0,193,84,8,107,131,16,97,169,103,96,224,132,206,151,194,135,22,81,220,159,56,21,109,139,102,188,40,44,209,81,79,86,112,235,163,120,101,41,232,238,77,184,200,206,3,186,62,147,82,153,144,117,16,57,23,228,207,149,39,169,238,200,84,98,30,142,251,102,54,53,106,226,188,213,214,222,142,50,44,189,231,157,139,86,9,151,114,228,40,174,216,43,92,185,221,157,159,192,155,75,132,49,26,107,171,84,84,162,172,144,114,102,177,11,54,56,182,149,37,30,48,28,62,2,32,
+117,193,176,55,121,86,36,76,203,104,231,16,155,205,223,116,47,102,237,71,226,33,111,71,112,35,51,0,45,21,36,71,64,164,75,50,61,25,227,10,207,33,73,97,122,212,156,51,231,194,189,72,40,235,34,123,198,96,75,116,72,46,100,159,157,43,16,209,12,74,69,18,21,168,68,138,81,197,179,249,46,164,216,94,146,160,253,222,98,217,153,115,133,132,209,8,64,22,59,78,5,25,79,30,118,33,71,188,2,34,214,83,134,182,142,219,97,139,87,28,5,0,242,6,92,48,206,72,166,103,80,130,216,159,230,230,55,55,116,204,4,184,141,120,52,221,187,206,169,109,98,247,108,201,37,220,142,68,219,138,249,41,179,103,130,70,139,5,96,14,34,81,160,230,152,104,209,165,139,84,7,90,9,6,17,117,160,12,121,125,230,41,194,168,204,28,163,44,144,34,220,142,82,49,152,71,225,136,58,187,103,85,236,123,122,121,195,3,48,178,159,215,35,224,84,95,133,139,130,225,67,135,15,4,182,52,84,33,189,34,158,45,230,5,211,157,60,237,32,35,53,23,159,43,198,169,
+253,106,111,60,119,196,154,29,8,231,216,142,179,138,206,238,15,169,148,156,148,159,140,20,231,19,74,125,22,82,226,36,10,252,200,218,40,153,57,44,212,120,241,51,109,71,211,8,223,190,158,58,5,4,21,22,180,2,85,50,92,37,109,73,146,69,32,32,167,174,116,57,211,9,212,222,239,157,31,215,168,129,210,16,162,93,203,140,14,201,100,21,177,116,24,191,62,6,128,37,19,132,196,5,52,56,72,92,149,142,155,23,187,240,227,100,252,25,45,147,80,169,114,83,122,251,226,169,217,117,34,48,172,163,200,216,62,190,221,34,235,26,212,118,249,211,130,197,182,229,53,247,178,123,110,219,66,3,179,135,172,194,104,116,62,239,95,167,185,134,20,243,157,122,109,190,59,85,4,29,29,216,18,141,135,80,138,158,140,40,226,226,29,244,136,81,168,204,238,116,153,56,51,219,123,80,200,144,153,36,200,33,7,45,177,190,52,182,134,224,33,235,42,2,209,246,240,244,25,234,190,110,123,204,90,202,116,162,113,35,9,66,51,42,0,206,1,129,112,200,194,5,224,0,138,208,
+13,196,68,130,233,64,15,136,0,226,177,110,36,18,10,185,32,54,15,156,151,19,160,203,72,80,13,74,247,201,168,133,99,66,73,240,174,101,71,163,4,142,193,144,11,95,100,144,80,202,148,94,189,55,235,8,135,243,170,1,143,28,51,142,22,61,230,121,209,96,187,240,100,151,77,99,193,128,172,232,88,194,77,199,247,193,142,178,103,182,71,166,9,234,97,241,96,124,55,170,183,109,91,32,209,44,79,150,21,102,35,197,41,45,186,80,130,45,1,50,23,58,41,120,229,3,167,253,59,44,17,124,232,101,141,7,17,61,127,77,182,209,213,11,110,229,176,48,164,157,74,83,10,121,47,226,161,110,202,3,76,187,110,172,131,182,45,13,108,21,10,22,117,171,105,115,229,28,237,215,19,212,171,210,20,32,217,226,72,17,130,47,217,157,146,116,47,241,85,109,231,133,96,4,16,168,172,96,116,44,61,184,211,47,26,9,140,91,102,64,57,80,26,161,131,35,69,225,228,41,119,103,90,85,4,7,206,44,237,37,181,17,146,176,188,211,7,241,181,74,102,170,60,51,4,159,
+56,2,101,110,96,114,175,23,47,25,19,32,69,181,110,128,34,3,58,74,29,48,153,160,6,84,187,110,20,166,184,56,137,157,73,168,95,168,214,110,18,138,60,147,22,129,182,16,53,157,45,110,63,247,149,55,70,172,69,221,65,18,45,250,142,99,22,38,136,219,140,154,10,115,243,86,144,139,248,135,251,136,5,17,45,156,130,146,232,232,222,58,8,178,72,51,211,189,142,144,39,112,10,204,207,90,217,104,144,129,82,228,81,225,201,102,94,200,83,58,50,208,225,4,126,186,164,12,238,173,193,149,158,248,220,0,114,212,83,130,51,209,17,84,147,152,43,135,220,176,91,19,244,33,190,68,174,167,19,152,196,249,188,40,91,52,61,74,143,204,2,69,149,165,20,132,33,4,9,35,131,132,64,86,177,79,162,171,78,129,41,251,132,113,157,19,34,30,162,250,9,22,10,35,101,184,232,38,58,43,52,45,160,245,64,109,83,25,32,232,221,38,226,18,123,162,50,14,203,129,73,11,232,27,132,129,182,45,123,47,1,53,23,100,49,192,112,102,204,150,77,162,66,172,127,99,
+111,62,102,92,233,67,123,1,179,208,101,209,158,24,93,235,224,97,249,60,120,90,4,201,150,213,253,179,232,160,44,131,166,99,68,115,17,71,222,6,22,134,78,97,197,142,72,108,211,194,61,93,176,88,168,76,109,148,120,153,54,244,132,33,41,194,156,60,170,150,168,81,166,174,247,96,254,4,72,35,189,225,206,98,113,227,120,21,112,249,240,224,10,176,84,118,183,234,144,35,70,18,162,245,236,184,44,222,99,219,104,146,6,89,91,209,229,86,209,128,162,21,123,211,163,79,210,86,57,180,104,174,236,55,181,1,3,59,209,204,2,160,108,31,222,163,199,139,34,69,18,231,96,39,55,42,128,21,191,212,89,56,226,226,73,232,126,194,84,81,81,11,65,132,146,9,66,149,132,203,190,98,56,231,164,113,113,15,64,38,245,241,105,114,148,180,80,57,63,46,6,182,201,133,217,96,172,123,31,220,154,25,22,111,29,89,45,228,157,202,224,134,169,28,228,158,8,97,47,222,25,5,12,252,202,198,42,11,5,213,221,209,205,200,164,98,226,104,120,29,204,148,89,171,122,65,
+28,208,72,156,89,136,112,2,101,53,6,137,170,216,214,169,216,207,192,1,151,8,6,42,174,9,151,120,39,233,14,28,187,29,140,132,74,186,18,157,223,240,225,211,56,130,16,93,233,89,236,115,57,123,248,37,46,236,93,211,91,217,184,118,69,72,16,95,131,35,99,252,67,179,34,29,20,239,103,6,43,150,168,34,116,8,180,105,215,136,172,132,72,127,72,26,166,239,47,59,251,1,91,212,230,21,211,86,226,20,204,61,142,182,17,104,141,228,181,66,156,211,142,142,162,90,205,61,179,207,96,29,44,48,105,32,126,49,80,96,39,196,193,197,104,180,13,212,185,79,32,133,123,108,241,84,91,16,207,76,38,121,5,194,156,38,220,22,90,62,193,85,74,135,241,148,65,21,65,20,11,40,87,174,86,50,53,157,139,168,175,219,63,150,94,66,57,243,250,200,57,52,62,54,12,123,139,61,231,219,11,40,66,78,198,121,22,138,122,183,111,234,64,48,156,234,9,239,235,104,157,37,88,188,176,91,65,123,177,121,221,77,108,130,145,36,148,194,107,121,56,82,132,48,88,17,
+47,208,51,105,90,106,120,215,4,91,40,237,8,125,110,94,139,42,36,43,10,46,63,103,100,130,163,185,130,220,115,60,49,15,162,253,59,150,33,182,134,161,218,31,208,106,2,165,224,9,164,83,196,123,12,96,168,11,0,251,231,147,83,148,44,203,180,137,56,74,193,244,158,34,55,215,199,101,161,178,99,42,42,70,243,83,19,62,194,216,76,22,53,71,204,147,138,224,2,202,158,72,198,24,234,100,251,30,219,9,34,20,233,164,46,218,161,140,138,37,254,88,40,59,157,55,146,123,214,245,10,63,2,73,217,220,195,65,211,25,229,24,76,108,183,15,187,208,64,122,127,243,168,66,117,47,7,17,41,36,93,5,79,1,233,201,94,188,104,216,232,72,166,23,134,178,184,52,78,178,211,77,178,44,181,138,20,221,23,110,72,235,193,220,112,21,11,217,142,42,120,243,181,23,86,131,145,113,161,179,149,126,114,220,10,3,188,83,56,143,142,14,117,129,190,118,102,44,148,1,139,25,92,37,141,202,186,3,64,170,91,54,50,65,192,171,168,124,19,103,180,92,70,248,97,193,
+50,25,145,91,226,254,25,46,202,53,172,211,163,168,149,137,228,166,12,168,54,5,169,183,100,123,165,129,109,176,139,146,230,7,64,90,104,110,155,198,241,24,3,187,60,214,148,125,202,162,49,22,7,103,143,104,97,45,170,61,183,211,231,71,147,80,135,30,237,87,46,119,113,230,120,199,0,80,224,246,20,208,4,193,143,246,119,23,185,134,14,35,106,183,168,142,182,109,137,248,10,47,203,29,39,13,7,229,100,221,201,30,93,201,162,193,49,233,33,107,16,68,86,178,120,200,207,211,112,247,188,115,100,98,123,122,25,57,171,108,164,219,224,76,186,115,50,62,113,170,104,239,230,68,204,44,74,116,47,58,171,158,69,151,73,131,54,157,212,179,236,84,31,49,218,35,184,72,82,202,96,36,226,193,140,91,78,23,133,112,116,121,162,167,100,94,237,39,45,36,216,193,179,29,238,114,15,159,199,159,221,4,59,36,21,4,78,251,180,131,113,143,119,103,90,180,116,42,38,149,151,83,1,163,155,179,215,110,176,134,152,90,84,202,246,149,184,249,101,246,132,167,160,140,13,201,
+199,247,248,165,51,40,226,233,156,94,214,36,33,255,28,191,123,178,196,157,33,39,180,254,232,98,239,110,202,137,235,33,132,84,219,58,167,165,40,70,57,231,132,53,154,60,176,96,94,82,22,131,27,162,29,194,169,129,227,119,197,204,203,78,207,144,129,15,122,221,150,64,27,154,234,155,103,68,142,16,173,196,33,153,62,246,26,65,148,92,129,82,16,143,56,64,79,204,157,67,169,196,252,41,208,97,2,55,10,7,8,146,63,236,197,35,50,18,162,80,16,224,204,216,78,60,127,102,154,74,181,33,124,78,251,240,97,72,206,28,70,232,156,245,228,169,25,220,218,30,222,102,86,200,41,251,0,152,100,171,117,170,109,14,92,30,34,46,238,225,241,57,49,98,7,25,211,204,165,146,218,135,50,150,217,152,13,82,219,96,145,100,92,154,53,219,136,96,119,74,57,182,195,65,193,246,34,97,33,159,135,146,73,91,209,175,129,196,6,33,97,153,23,228,218,248,209,152,143,204,246,68,151,9,144,3,156,39,147,80,212,76,72,110,194,78,147,98,120,72,28,88,177,40,151,135,
+124,232,110,116,192,0,103,22,187,58,41,160,171,232,91,225,104,52,99,100,165,239,192,86,18,151,200,85,79,12,14,97,193,72,49,224,118,1,116,166,183,104,40,24,185,105,28,179,159,205,113,39,219,124,216,228,138,41,210,193,17,126,171,158,63,221,138,249,103,187,165,75,137,193,149,36,134,45,204,110,44,232,42,90,139,61,152,143,23,65,103,146,75,112,17,141,196,52,122,32,235,78,99,241,184,40,4,157,123,65,4,130,115,73,68,239,39,195,128,55,210,22,150,109,251,209,49,31,219,161,61,114,43,5,30,43,29,37,83,188,187,21,4,18,118,108,251,229,40,243,152,208,78,49,67,218,204,40,156,166,3,74,101,116,94,2,37,11,104,32,34,0,145,232,81,81,188,122,156,47,102,130,11,27,125,202,165,179,21,174,7,118,49,252,216,82,133,6,43,73,142,236,108,194,119,58,163,54,193,71,162,78,243,116,26,229,108,159,15,81,195,176,133,204,109,221,73,208,28,59,147,40,20,69,172,30,224,116,97,135,229,102,17,19,189,212,101,81,182,135,174,222,130,39,226,27,
+172,193,147,117,12,28,38,43,17,202,64,70,32,75,209,44,158,189,36,180,19,139,216,41,210,245,137,67,24,200,13,27,246,6,150,114,39,2,190,4,23,50,99,222,68,228,26,209,73,74,36,55,69,148,199,243,253,54,243,248,104,80,144,210,245,147,227,196,98,36,44,219,81,23,193,216,244,44,3,13,240,103,88,115,122,123,107,90,78,26,59,152,61,67,123,122,209,190,74,144,89,10,22,160,5,106,132,131,165,45,55,0,211,128,156,153,132,204,162,65,187,184,16,4,17,216,207,69,17,226,73,152,30,2,193,82,246,108,4,212,16,81,192,116,140,207,40,242,122,2,29,132,236,102,185,58,122,52,91,73,159,160,230,229,25,251,241,168,227,0,91,128,158,153,101,159,63,186,111,39,112,89,188,20,215,128,210,57,72,20,44,97,124,135,236,2,136,37,154,39,177,61,174,62,37,195,218,94,197,180,155,183,194,10,149,205,184,93,193,192,252,58,56,187,111,5,201,164,34,74,162,69,167,44,82,45,126,210,234,9,166,247,233,121,99,26,212,243,227,46,162,108,148,137,198,153,
+40,121,30,191,75,21,110,32,80,140,151,82,56,34,71,241,74,134,129,90,115,146,24,189,34,156,166,48,208,238,212,48,115,207,107,229,175,131,242,147,83,28,12,120,236,116,231,168,189,104,229,158,162,166,160,60,162,116,179,42,212,204,124,138,59,67,101,175,113,170,142,181,166,152,198,126,34,119,114,240,36,12,28,11,145,232,128,25,123,198,30,7,45,168,184,230,113,81,61,223,182,13,166,166,70,86,85,227,40,23,79,33,211,227,113,171,231,60,217,77,153,174,144,233,248,200,100,213,235,90,209,236,202,154,9,101,14,47,10,5,164,165,249,10,73,239,23,96,190,230,137,182,203,143,210,69,28,77,96,97,21,108,218,19,123,134,198,44,200,73,242,209,140,21,151,17,154,65,57,51,229,63,6,108,203,187,112,158,62,164,242,74,247,246,65,229,97,122,117,213,167,89,95,110,221,37,45,121,198,22,188,36,204,47,77,67,6,134,82,81,97,204,219,148,18,103,190,211,114,82,154,177,9,50,137,195,9,156,32,131,151,149,22,138,184,220,116,116,27,72,116,81,42,232,20,177,
+27,93,63,209,172,91,150,173,190,193,174,45,162,120,120,224,144,152,155,58,85,174,248,153,11,122,84,65,9,185,36,254,54,52,108,26,80,36,130,2,127,34,63,82,176,226,214,225,76,155,102,6,62,103,45,172,149,75,253,43,237,146,17,207,216,232,46,97,98,105,18,68,241,217,76,56,157,63,91,233,0,137,34,228,200,176,172,63,80,104,66,60,39,98,142,245,184,43,27,133,19,15,205,203,84,75,164,99,71,43,40,201,118,166,203,9,117,155,233,133,104,182,130,40,246,12,116,48,179,65,99,200,195,58,41,207,48,16,247,172,73,236,26,59,16,179,231,215,9,8,191,56,74,91,20,142,120,3,59,106,202,250,225,169,115,152,45,23,217,39,81,70,162,82,17,137,209,176,119,127,224,188,149,162,23,238,75,101,28,86,191,102,52,236,231,26,212,33,218,244,160,25,237,27,75,71,227,107,243,125,50,253,49,184,85,34,250,163,110,96,66,224,221,59,21,58,23,103,71,119,35,129,206,21,88,60,193,60,70,195,202,69,61,72,118,76,167,86,180,46,40,102,237,156,63,6,
+149,195,46,31,218,29,218,24,243,3,220,221,237,115,70,124,11,77,130,147,212,210,232,216,162,114,80,166,47,5,143,75,235,123,199,34,89,152,23,148,185,201,240,249,10,11,213,210,201,180,94,59,180,155,141,73,140,170,53,137,188,164,238,27,0,81,125,255,9,35,213,10,73,143,188,139,131,12,229,160,27,176,120,17,58,101,209,59,97,91,157,236,182,143,16,65,137,101,32,169,246,157,47,64,180,125,126,2,57,98,163,99,99,185,164,116,138,23,143,180,129,146,125,138,203,100,47,76,197,251,173,220,160,147,71,156,216,172,232,100,125,39,199,91,3,113,173,211,25,153,138,119,44,29,38,245,80,170,76,243,110,245,237,15,117,69,142,86,252,106,19,107,106,40,184,184,129,96,81,138,85,73,0,56,5,134,30,45,153,209,8,83,70,64,247,109,40,113,114,13,91,199,109,197,141,77,123,71,239,236,113,43,125,243,184,21,141,14,116,114,178,85,111,118,3,60,95,106,64,47,64,67,252,220,74,242,232,48,177,219,229,17,168,211,135,61,35,199,177,88,63,108,193,34,233,161,
+117,36,7,105,87,78,181,128,178,3,205,174,21,201,46,23,30,241,14,80,225,193,14,242,137,205,98,57,28,13,110,177,21,69,117,20,166,33,10,113,25,77,161,41,119,27,22,128,51,227,109,138,98,217,181,197,95,57,5,148,83,88,74,20,133,172,154,46,132,206,99,18,115,58,191,4,62,215,76,123,161,56,144,141,36,182,86,232,104,95,132,193,17,30,44,168,194,71,240,208,80,28,16,139,66,35,113,145,198,31,9,59,56,17,235,134,78,141,34,193,97,218,161,244,12,54,239,81,79,92,27,243,97,215,220,90,69,220,31,76,105,251,189,89,227,38,88,84,173,109,131,49,187,117,179,179,88,14,110,179,122,70,245,74,142,82,187,239,19,244,84,208,126,71,57,104,88,152,225,230,0,171,185,34,30,68,123,54,71,183,116,194,99,5,89,76,220,63,114,31,120,161,53,197,108,145,144,170,88,250,15,12,157,219,67,78,13,234,157,208,173,109,117,170,80,68,149,148,155,233,71,217,162,176,147,211,134,241,111,187,126,154,23,233,61,179,83,82,189,49,31,53,191,47,67,15,
+225,78,241,208,14,171,157,206,209,232,115,62,123,162,47,124,14,0,206,141,129,172,29,37,197,128,182,174,97,219,184,184,151,202,218,108,157,244,22,184,162,3,154,9,78,90,246,183,29,115,69,238,206,88,132,24,195,82,127,88,231,52,13,163,125,4,50,173,63,118,54,149,107,227,24,150,123,203,211,86,199,124,107,153,27,12,143,70,43,136,58,4,172,164,78,203,254,115,129,64,194,89,247,176,177,192,29,176,28,28,192,150,168,112,123,184,139,133,159,54,147,19,102,123,18,92,27,177,158,87,184,163,167,125,90,103,143,103,195,156,93,78,120,84,93,75,147,168,186,207,185,96,2,99,56,2,156,159,42,4,179,234,51,132,158,22,133,4,212,28,228,155,134,197,84,102,165,18,68,124,107,198,136,126,1,103,233,145,103,70,54,65,151,211,225,75,187,89,27,211,116,83,134,230,114,13,172,118,160,241,124,23,6,10,22,247,96,106,116,153,110,218,192,241,166,139,19,116,241,102,72,56,136,10,20,40,52,52,239,236,135,186,9,99,10,216,48,189,100,106,69,187,61,139,128,150,
+94,65,233,21,1,106,246,109,17,16,133,29,239,168,69,114,129,153,221,211,182,67,143,106,59,93,51,91,100,247,113,59,87,39,86,86,214,237,4,16,99,193,156,36,89,223,221,235,41,136,39,251,3,224,116,132,50,51,48,84,10,12,46,7,187,205,20,1,213,198,50,41,253,250,8,210,59,2,77,160,229,25,40,57,94,6,193,94,5,122,220,138,193,219,238,99,12,219,163,105,196,141,143,183,181,249,136,169,182,121,88,44,221,20,88,133,118,173,96,160,192,197,187,137,0,175,109,53,219,230,211,87,65,3,22,193,61,85,208,176,100,73,236,109,143,227,24,35,242,163,28,115,105,35,214,14,3,97,62,6,36,52,30,32,86,50,116,29,182,163,199,1,192,135,185,189,1,33,211,153,35,138,96,175,49,52,173,37,161,20,212,81,201,119,122,115,209,2,105,24,28,34,39,34,80,154,25,158,195,152,129,123,42,109,40,22,15,32,80,92,226,173,130,114,92,153,107,91,140,209,42,228,62,147,81,11,245,164,226,109,102,80,207,150,193,64,113,148,222,134,178,134,81,203,232,212,
+129,207,133,131,146,155,59,182,208,38,74,41,247,157,35,179,221,97,74,55,74,157,118,242,135,145,65,192,36,144,27,99,69,80,145,231,20,29,139,37,161,211,78,53,14,40,253,182,176,133,14,70,60,189,225,240,250,232,80,7,121,211,74,32,128,177,9,14,181,178,230,41,25,157,145,182,9,53,23,6,196,246,180,108,74,193,8,154,161,148,217,187,49,187,13,118,140,6,211,4,157,205,183,189,38,52,38,68,233,50,164,69,247,187,75,233,20,151,56,48,56,48,203,70,185,75,113,253,88,88,195,76,99,158,56,140,209,166,214,115,87,44,31,41,34,181,212,104,195,13,153,64,242,162,155,139,210,15,143,66,128,127,114,53,9,25,43,69,43,184,37,183,9,199,204,39,103,82,73,16,144,235,78,49,116,67,155,45,4,167,101,103,136,118,30,158,206,56,219,135,198,139,8,221,125,172,153,176,174,27,138,227,96,7,222,28,227,193,250,32,97,4,212,101,51,142,96,98,173,119,215,199,24,93,61,28,72,66,253,86,5,1,196,21,36,198,17,222,41,219,188,57,216,106,59,233,
+30,246,161,62,165,70,37,165,202,201,251,3,106,186,55,126,196,58,154,205,8,108,149,217,93,112,141,192,140,166,209,96,96,159,180,76,56,79,170,97,0,47,21,6,179,82,183,9,180,42,53,165,152,108,163,43,5,37,214,87,141,197,116,15,202,111,197,248,122,199,80,45,10,30,183,14,213,162,32,126,188,82,139,130,109,171,238,236,77,60,137,175,102,119,7,164,138,206,128,81,143,172,119,121,17,43,155,137,1,242,182,29,155,141,142,241,167,36,198,159,40,231,80,100,176,34,160,231,97,141,140,153,63,44,159,56,215,19,108,59,111,180,51,128,76,208,252,120,73,110,89,236,238,154,214,231,6,144,253,246,126,100,190,124,236,14,29,1,130,51,0,0,11,10,40,4,64,172,202,146,110,5,84,166,37,171,126,217,241,122,218,37,88,2,201,218,53,41,13,145,116,194,68,178,154,125,40,57,161,45,210,207,119,98,19,195,91,168,5,240,100,23,40,90,163,26,80,180,219,199,144,104,8,195,99,114,240,92,57,70,68,138,90,54,122,162,174,36,59,212,193,156,18,203,255,25,
+189,214,198,217,57,52,103,245,84,70,239,225,174,55,73,62,92,4,249,235,109,204,197,148,223,140,193,176,227,213,246,12,37,128,241,30,187,135,153,48,99,244,188,224,235,144,110,116,40,121,163,58,10,209,54,69,211,182,158,167,80,161,100,225,208,13,184,16,36,168,82,103,115,182,115,162,112,118,94,99,150,79,231,117,184,184,24,206,80,195,115,198,161,138,120,145,163,183,91,108,243,103,193,252,144,74,42,84,179,3,129,37,238,148,56,88,217,84,237,157,249,112,251,73,40,227,117,151,87,132,14,81,190,8,143,69,54,29,91,71,49,118,36,197,226,69,114,210,66,208,61,81,177,141,138,228,107,188,172,14,7,100,152,17,128,78,199,79,119,136,134,7,71,189,58,164,212,221,89,228,118,170,73,126,181,213,30,228,241,115,152,241,181,83,167,192,129,93,54,198,178,197,142,206,142,57,6,70,172,99,154,42,85,77,162,198,185,83,21,1,237,94,233,239,90,155,88,62,235,118,46,109,68,45,167,64,247,180,218,214,177,128,198,141,1,209,26,120,172,19,22,130,9,176,140,158,
+21,19,72,100,43,81,70,203,68,8,13,18,245,2,164,178,5,128,69,212,69,3,144,16,222,85,174,20,33,16,213,1,9,52,121,136,150,139,114,20,68,66,7,46,36,157,200,131,104,12,64,11,142,178,208,19,79,108,111,138,214,51,98,170,153,202,4,32,201,246,140,189,59,120,52,70,130,73,158,172,29,91,87,152,15,102,6,195,12,17,35,179,182,120,114,76,153,86,115,8,195,38,6,184,181,12,91,2,242,49,84,223,55,178,184,23,141,44,170,82,34,40,202,57,31,3,181,118,54,201,175,163,219,91,199,237,125,78,60,200,30,51,199,245,35,33,221,220,73,217,78,216,54,238,244,150,105,162,233,145,153,209,5,94,228,96,31,236,223,88,65,216,236,82,140,101,156,24,200,240,150,85,59,7,73,175,12,203,229,11,248,221,114,176,21,164,168,169,147,199,185,83,192,45,129,176,252,158,75,65,123,123,196,29,253,105,251,78,23,198,241,171,20,159,237,172,122,63,26,101,15,92,0,90,192,125,17,24,11,24,232,45,186,92,169,163,129,188,51,138,2,228,137,182,174,218,
+14,65,210,177,209,175,103,112,164,220,72,36,47,24,98,225,58,69,179,22,117,190,163,253,124,180,175,146,201,100,218,232,46,210,74,145,195,85,247,76,23,221,154,32,157,239,52,106,251,168,229,105,212,59,152,222,178,43,67,131,134,243,53,227,192,132,37,32,181,204,104,132,195,174,45,171,128,63,25,98,199,132,185,181,221,34,23,203,233,62,41,167,35,194,135,21,125,189,133,160,57,173,88,88,39,118,23,55,120,217,240,136,205,192,50,195,35,157,20,138,129,115,54,146,147,117,59,203,201,116,23,247,208,185,40,63,89,96,76,87,198,50,129,120,199,193,26,154,11,88,212,30,51,203,190,155,43,204,121,100,192,50,203,137,176,18,43,110,226,166,213,101,16,115,13,145,197,227,141,101,69,97,104,185,245,120,126,191,157,191,27,25,20,13,0,231,116,253,90,103,9,177,176,98,198,110,49,67,17,39,219,15,100,48,138,133,233,200,86,121,89,47,99,227,251,121,93,113,237,153,101,181,195,194,146,206,113,245,42,118,55,218,195,192,129,253,196,178,49,146,29,59,225,44,165,245,
+158,35,213,40,57,107,241,14,114,66,51,103,11,75,72,38,47,65,172,177,185,180,17,226,83,172,35,46,251,81,31,212,173,84,251,21,54,164,93,130,234,245,22,217,114,126,144,129,204,198,50,228,50,55,118,88,98,246,157,112,124,201,144,183,127,157,179,97,107,159,178,157,121,135,9,142,84,160,144,76,81,197,161,195,131,60,192,63,158,29,215,249,70,120,14,216,178,154,129,124,200,50,139,34,225,37,161,74,100,15,22,251,252,22,39,22,120,185,142,83,0,183,142,162,138,67,78,172,148,88,173,186,225,41,144,235,232,237,34,156,42,162,142,252,212,17,50,187,197,151,80,93,78,109,176,117,114,62,141,57,237,58,205,207,179,12,248,118,4,73,136,31,219,210,38,21,243,185,224,185,222,69,115,6,150,121,90,245,226,104,14,97,143,71,84,11,140,74,167,24,57,45,7,61,101,90,191,200,54,213,73,237,48,207,133,82,126,235,241,121,169,127,75,35,144,161,156,233,76,8,153,118,180,107,117,126,171,81,119,56,61,204,145,40,231,183,65,121,59,208,77,110,157,100,107,34,
+102,218,209,176,70,186,189,158,231,110,137,198,142,73,27,156,240,22,115,120,151,157,182,198,100,198,0,192,55,78,123,241,169,178,219,125,228,221,155,218,20,232,39,131,7,132,161,226,70,13,161,146,46,220,243,138,111,185,201,0,111,168,67,44,86,216,114,220,182,42,32,69,33,235,56,114,132,22,81,59,216,173,115,165,4,86,18,46,62,213,138,150,2,110,0,69,197,164,98,42,75,159,193,157,67,39,122,153,119,98,21,36,6,237,62,16,24,27,30,131,137,153,92,91,117,227,42,77,237,199,120,25,12,200,248,182,35,176,76,149,246,81,119,19,150,174,12,221,80,228,246,174,29,185,58,41,28,221,86,124,172,120,168,147,77,140,75,6,186,210,86,212,142,115,146,103,185,39,65,93,52,1,156,118,225,187,214,193,67,49,11,21,158,204,17,45,133,72,82,146,157,233,94,52,151,22,196,168,111,244,20,159,86,59,180,179,179,20,52,163,242,205,79,102,103,148,101,174,71,37,92,212,72,237,91,230,253,232,198,33,23,195,34,109,7,202,30,47,180,57,46,243,170,184,66,233,
+26,223,104,44,144,231,73,43,229,252,225,194,104,16,149,200,55,214,108,235,147,130,145,210,230,192,10,79,123,100,89,0,103,101,158,149,236,230,218,57,87,25,177,174,160,140,165,49,92,10,153,14,119,176,246,215,51,237,98,95,62,66,146,68,214,28,50,155,154,38,211,163,69,231,222,186,198,71,143,149,32,176,122,74,16,28,103,117,161,253,187,227,98,126,223,176,119,233,128,218,203,59,93,103,10,121,83,198,126,111,250,204,50,158,11,56,244,189,251,91,17,28,154,238,219,246,163,108,154,128,103,157,37,241,216,109,222,50,87,150,168,158,191,229,117,187,42,68,161,35,209,10,251,92,215,162,129,34,176,242,249,83,6,159,134,147,154,0,76,254,244,44,156,9,96,54,66,141,203,211,231,86,15,179,53,9,205,137,97,178,139,188,69,245,117,108,49,169,39,137,193,88,27,172,96,6,16,193,153,42,234,221,167,21,185,212,3,82,44,146,153,216,67,64,8,94,211,48,89,33,217,88,38,223,129,97,0,91,222,152,90,30,202,90,99,83,105,137,228,200,7,87,0,98,143,220,
+130,155,117,118,132,206,204,3,189,222,86,161,158,82,60,91,57,48,245,240,188,24,245,93,156,216,234,161,154,56,188,224,105,154,63,134,128,115,171,115,24,22,176,17,101,199,244,74,134,57,177,23,9,242,143,49,99,6,179,65,170,39,24,148,147,35,204,81,27,192,68,125,83,204,242,153,84,204,7,92,157,103,232,36,186,115,68,207,250,160,84,183,45,54,195,242,12,87,81,35,44,30,148,138,112,178,17,1,51,135,175,209,31,43,123,245,98,35,169,227,98,219,116,117,133,67,139,122,129,145,110,200,218,113,142,38,212,173,8,179,3,231,45,229,167,152,213,4,133,97,131,185,81,6,106,118,232,226,249,33,206,249,217,32,106,97,119,109,85,50,126,205,122,223,94,59,19,237,183,40,178,221,100,250,166,106,57,154,196,57,90,131,65,24,216,155,72,216,240,7,164,190,80,9,227,45,203,35,163,19,139,131,187,195,147,22,176,171,35,62,177,207,152,154,75,196,90,187,212,178,237,128,18,237,12,211,41,25,72,61,151,143,193,253,93,217,92,116,3,183,108,14,15,204,168,215,
+100,52,38,42,9,117,79,122,240,75,59,90,33,29,157,75,12,89,71,145,253,76,18,6,232,78,53,131,168,20,33,179,250,36,127,115,89,179,7,112,141,129,8,231,156,105,112,216,125,102,48,99,241,165,44,154,149,121,231,220,148,82,150,229,156,119,31,28,43,252,104,112,112,82,215,175,102,165,112,146,19,134,89,137,22,130,177,201,254,46,216,186,62,187,229,29,204,154,180,26,161,29,197,198,138,101,99,175,111,181,39,159,208,154,226,217,112,156,185,129,146,115,228,141,132,217,13,22,117,248,221,152,91,11,156,154,52,235,94,216,164,5,187,178,122,28,2,133,218,199,50,40,99,76,57,96,152,140,247,161,200,202,230,38,56,70,94,20,46,153,132,40,124,20,88,49,78,2,195,8,93,79,134,152,126,192,99,159,232,159,241,133,173,6,111,6,181,5,242,186,8,111,86,154,26,197,162,14,138,76,207,110,42,182,38,54,150,226,30,165,186,223,18,150,105,39,75,104,255,230,66,73,116,54,51,196,53,182,41,240,162,110,78,160,39,228,202,225,247,143,21,104,112,100,158,183,
+53,74,198,122,236,38,231,180,174,109,169,177,243,108,174,19,197,89,118,229,93,173,6,56,19,100,236,171,44,33,4,178,82,150,193,72,102,148,23,26,129,92,198,204,104,57,226,183,140,142,51,140,128,43,106,88,159,245,17,67,3,63,188,223,152,174,185,201,56,60,159,72,228,229,135,201,229,240,82,95,23,138,110,179,20,74,92,55,5,40,14,238,24,206,219,176,176,102,32,129,22,165,119,135,39,34,41,19,19,61,73,136,75,219,247,2,17,205,74,143,42,5,239,151,105,164,114,79,159,129,71,218,178,3,154,212,144,149,48,51,95,49,145,231,151,138,182,204,228,170,224,168,115,0,35,194,35,72,101,165,253,80,161,31,102,208,237,171,219,112,154,6,91,78,218,99,238,77,195,244,152,48,9,141,230,242,112,121,238,140,225,96,109,57,13,104,107,108,207,204,4,19,253,235,249,77,75,116,143,25,238,89,102,157,219,233,139,49,122,14,178,196,215,183,82,108,204,95,22,48,242,61,53,102,95,29,1,58,244,89,63,47,72,108,47,6,231,206,250,244,58,2,147,190,233,147,
+111,118,59,165,153,60,171,146,219,216,52,173,118,116,31,33,195,179,142,153,197,253,126,47,243,156,83,177,16,118,237,167,80,72,65,31,53,186,216,94,221,224,230,144,84,71,162,246,206,119,111,58,253,126,100,86,45,97,14,171,103,241,54,28,147,14,2,107,116,235,172,204,168,97,142,217,48,62,219,54,144,166,26,5,233,18,74,113,136,207,182,230,23,109,54,3,165,95,101,0,183,74,202,238,125,164,18,52,174,116,171,206,150,112,24,242,9,187,206,33,159,63,116,112,66,134,203,80,12,158,245,72,34,219,249,221,5,249,134,195,239,66,211,218,46,152,153,153,206,13,28,77,225,229,134,145,245,12,93,178,213,182,226,60,158,223,241,26,1,189,75,94,65,50,102,11,39,26,79,171,198,230,228,12,16,159,233,219,84,244,13,79,108,39,122,250,11,50,79,134,50,139,178,35,14,19,109,173,119,105,211,58,225,19,184,166,119,140,244,201,60,62,107,116,24,55,189,166,98,217,221,215,189,56,103,94,89,60,90,240,196,15,198,89,104,103,121,188,192,8,14,238,142,166,246,6,
+206,151,208,147,234,196,159,142,176,208,156,16,242,14,183,85,119,149,55,236,147,23,219,44,199,147,23,219,44,248,18,150,196,250,10,65,90,170,118,106,30,157,231,212,78,205,21,243,238,78,253,112,190,187,45,196,175,158,190,56,43,22,166,8,42,4,141,151,248,108,111,29,36,135,198,230,84,170,226,201,137,158,52,26,212,229,79,7,0,165,55,11,114,34,252,1,172,254,186,11,85,165,203,154,206,242,110,201,81,61,54,39,140,140,140,203,229,242,195,137,101,198,24,234,61,182,98,254,121,60,35,71,124,136,22,69,78,244,228,66,208,99,105,91,61,33,114,15,219,137,109,122,245,156,64,154,35,159,159,157,155,70,98,178,240,44,155,232,162,72,250,42,103,171,54,30,185,96,11,142,146,64,43,82,76,138,204,125,197,224,30,107,116,121,153,233,199,5,143,55,193,190,152,113,198,62,87,112,219,115,41,19,80,222,89,177,226,53,17,67,150,220,54,227,30,113,19,208,244,64,190,189,109,88,20,195,72,141,216,136,35,155,178,240,248,236,18,87,10,105,193,225,174,144,90,68,
+153,174,172,104,80,242,118,201,56,163,194,132,84,50,27,32,161,162,80,169,198,24,137,233,56,183,79,78,111,163,175,105,24,33,180,24,156,138,66,61,162,158,156,78,187,102,179,114,24,107,185,30,125,23,169,195,110,183,216,79,142,130,27,75,220,242,176,12,95,12,110,231,247,220,9,5,70,48,67,5,182,238,140,79,196,243,209,217,141,33,115,110,117,168,221,50,202,156,227,38,189,128,141,60,110,210,44,14,102,248,184,30,9,139,236,231,122,39,84,250,222,211,240,248,76,160,196,177,114,77,131,32,163,44,26,58,201,48,231,236,180,115,200,120,32,51,196,138,74,48,25,162,9,103,87,97,18,18,154,234,90,8,48,15,108,122,141,110,219,188,100,6,139,120,218,198,57,133,148,152,39,159,247,168,24,123,107,253,139,177,30,222,226,254,86,94,94,82,177,54,252,147,72,113,110,55,187,184,137,50,151,109,126,16,240,31,243,181,147,138,136,235,100,54,35,4,176,52,53,114,186,178,184,34,45,235,38,163,251,64,91,16,61,102,198,252,230,117,125,240,104,111,13,156,242,67,
+112,230,64,101,32,4,216,181,115,239,60,100,231,45,8,145,227,193,98,17,215,75,26,165,37,163,163,84,184,122,3,37,188,149,89,58,73,139,172,187,70,73,8,3,231,1,162,113,71,154,103,172,0,59,121,157,36,110,194,52,64,233,20,83,30,216,45,156,139,71,129,254,222,158,221,189,163,161,245,65,130,24,46,89,54,9,122,182,207,149,7,217,91,140,216,194,249,84,240,148,154,159,80,247,123,44,169,115,76,28,59,121,116,60,185,57,40,177,156,217,55,15,247,151,109,193,202,198,198,150,106,119,122,91,1,12,157,194,90,118,103,92,57,142,160,41,239,96,104,97,151,161,158,58,136,218,236,179,43,187,18,18,177,127,14,72,87,184,75,131,41,34,177,187,212,191,48,220,94,160,132,166,89,7,252,114,9,230,160,254,74,207,4,177,71,51,190,216,133,95,174,250,127,0,93,193,69,186,204,82,44,129,182,98,172,98,28,77,71,6,107,167,141,175,121,184,161,198,86,244,190,225,72,27,186,72,199,143,247,146,49,66,195,21,81,67,214,106,148,29,212,250,170,121,52,174,
+89,215,50,79,231,64,60,77,175,241,144,87,245,62,146,116,234,108,97,155,149,6,64,89,152,58,44,234,197,85,236,252,98,196,15,16,125,101,127,187,106,142,96,6,199,64,34,218,25,195,228,96,176,109,157,181,160,38,157,88,10,206,78,86,113,203,212,58,176,165,153,114,206,77,11,205,28,85,37,227,181,22,87,79,248,182,169,177,240,76,16,216,95,161,217,130,11,122,246,41,27,31,45,64,200,16,148,220,55,217,24,54,247,201,72,215,169,128,223,71,35,74,115,33,90,94,86,62,70,88,163,233,66,80,196,211,219,103,217,35,60,141,189,59,71,58,13,195,227,78,62,26,118,206,31,91,193,225,89,112,185,231,108,160,119,225,52,180,16,50,159,86,218,39,115,12,94,176,16,162,219,54,115,158,17,73,216,68,205,103,153,225,76,192,11,116,105,75,244,192,22,57,49,191,120,72,154,18,132,2,177,252,10,110,87,89,8,30,238,246,119,217,117,37,244,220,199,51,129,3,200,137,117,182,154,121,69,168,136,18,49,152,60,101,104,35,62,163,245,238,81,152,104,116,74,85,
+94,24,234,63,222,206,37,33,161,73,19,88,47,4,57,209,242,214,178,221,220,131,30,247,145,134,93,168,125,141,38,214,28,30,88,205,203,171,224,225,26,130,108,46,100,13,154,236,58,18,115,36,0,83,59,143,92,236,76,40,200,237,243,160,13,95,164,73,229,234,157,51,116,119,199,206,209,246,38,192,216,41,71,227,216,140,233,227,86,151,122,90,17,199,59,97,177,166,118,139,105,217,156,160,245,90,101,97,54,201,229,167,219,135,157,202,174,222,184,75,196,63,62,182,134,248,179,78,63,115,72,234,39,173,231,5,6,13,77,101,154,212,208,172,107,234,117,96,253,104,159,95,65,149,176,127,135,68,218,201,39,151,96,87,216,174,140,209,214,6,142,170,121,21,93,205,140,38,161,214,85,222,2,17,11,116,62,98,79,53,249,38,95,239,219,77,86,43,141,192,25,74,188,55,9,201,199,133,190,170,23,13,86,50,128,35,177,146,55,36,42,14,110,109,63,161,220,167,78,66,9,204,199,170,124,162,202,252,85,253,149,226,25,13,128,93,136,103,218,198,75,36,14,104,4,39,
+181,16,52,72,65,64,170,233,64,23,181,244,109,204,83,187,209,68,116,155,170,82,33,110,144,11,56,252,33,28,48,155,85,5,139,220,52,170,180,118,143,140,12,206,202,68,181,90,43,98,197,6,77,224,42,107,131,43,185,34,6,197,214,100,132,141,54,24,32,142,113,9,198,94,166,184,139,118,6,119,176,70,240,22,137,89,164,241,142,201,77,18,233,168,85,231,91,97,70,113,42,250,38,26,141,184,208,131,146,67,121,204,148,57,246,65,101,154,141,241,187,20,36,180,102,6,60,197,141,9,231,248,138,48,168,237,100,179,28,250,196,38,69,30,20,79,232,97,191,175,164,220,241,69,1,32,231,247,71,92,133,242,204,230,12,201,17,192,8,116,185,111,13,129,236,198,109,1,42,89,119,132,92,122,228,116,178,151,237,176,28,35,136,217,163,179,205,72,247,247,91,203,194,210,176,94,27,111,35,110,247,225,135,22,142,165,135,150,84,152,79,12,193,11,187,59,20,206,164,33,160,15,22,213,123,40,7,78,175,37,74,243,76,247,174,11,232,139,209,99,100,32,176,239,60,75,
+200,156,118,2,221,219,153,67,139,112,172,59,20,114,50,25,153,133,238,206,213,227,9,5,121,102,215,51,169,161,22,211,210,105,188,121,153,166,159,2,241,231,162,233,78,233,202,208,122,200,152,169,184,198,145,162,42,15,134,86,116,18,61,251,132,230,215,213,238,103,36,152,206,126,169,125,114,32,153,30,147,143,203,6,105,240,97,175,101,57,49,219,198,19,70,14,185,33,41,113,124,169,171,107,107,222,193,147,2,218,226,17,133,164,205,238,199,45,172,96,89,152,131,196,68,28,41,150,89,91,49,10,98,186,234,125,13,11,170,29,13,22,131,1,86,46,80,147,227,180,148,198,130,195,212,17,191,206,215,142,82,39,153,18,125,174,92,213,67,128,233,225,4,208,229,24,245,140,37,73,105,19,123,219,155,89,37,6,12,7,188,161,81,108,229,46,119,77,11,164,106,223,84,232,72,149,17,9,134,208,17,241,14,85,187,98,180,183,149,40,229,196,25,160,38,244,194,11,50,202,172,143,233,42,102,198,170,138,248,33,151,41,157,96,77,85,168,82,132,78,129,203,92,26,137,202,
+222,25,88,18,72,229,122,136,89,50,83,149,74,141,114,240,156,143,55,81,25,194,142,140,25,207,33,8,237,237,71,12,255,8,51,34,29,64,136,49,120,193,170,99,171,247,121,147,227,204,248,138,11,151,43,161,65,34,128,172,247,243,51,9,180,223,68,233,55,147,232,132,201,32,16,14,196,184,9,199,26,119,135,178,71,154,138,45,88,82,44,82,89,145,22,219,226,219,156,165,35,197,24,55,224,176,183,169,209,236,20,23,168,28,243,241,44,112,143,49,136,227,109,183,163,9,223,2,37,52,51,172,42,49,139,71,209,34,28,200,205,66,153,202,56,4,38,242,57,27,81,184,213,121,166,171,148,193,108,42,163,76,140,179,6,71,214,107,248,117,7,220,103,180,86,201,13,22,154,77,40,183,181,53,218,159,119,67,148,234,71,95,17,185,221,125,237,237,237,104,123,237,35,114,136,96,112,202,232,206,220,188,214,252,143,223,52,54,95,92,172,174,195,30,90,190,105,184,118,3,186,174,249,69,195,163,198,250,167,141,255,87,125,245,58,122,221,147,231,77,117,143,27,155,95,60,
+173,255,99,227,179,175,235,158,98,85,154,235,158,63,169,123,210,248,180,1,123,104,170,107,110,252,182,241,105,125,83,93,245,186,120,243,135,117,53,25,143,158,63,107,190,170,88,189,162,93,215,220,210,244,242,81,203,203,38,172,201,31,26,91,190,169,107,120,218,240,109,195,51,172,66,253,139,23,77,207,95,52,53,214,183,52,212,181,60,175,171,222,156,111,106,252,170,161,174,254,217,227,171,110,235,26,159,61,110,252,125,227,227,151,245,79,47,122,253,176,58,140,91,23,163,185,253,105,237,186,252,119,175,152,87,159,171,223,23,61,127,242,235,91,87,183,203,175,93,9,191,120,247,197,171,23,31,221,123,255,218,173,240,215,210,106,194,46,175,134,63,189,247,0,235,250,179,171,241,212,189,108,110,120,92,213,252,155,231,79,31,99,154,98,230,250,246,194,112,245,95,61,127,217,82,51,110,213,50,31,214,125,246,252,219,139,199,230,15,48,43,254,174,161,54,150,186,167,13,207,190,110,249,230,131,186,122,76,84,35,102,237,250,71,45,117,207,158,183,96,99,111,106,120,212,242,
+244,143,23,242,191,250,227,43,109,106,150,169,214,126,254,12,123,139,25,15,179,204,133,6,223,214,99,66,95,85,123,217,92,255,117,67,117,114,94,60,109,104,170,205,98,35,102,110,204,210,223,214,55,253,177,106,246,167,141,143,106,138,54,215,189,215,240,225,215,31,94,168,211,140,77,204,163,150,231,77,205,239,95,26,185,102,221,154,165,239,255,144,165,27,155,49,165,223,110,232,175,158,63,127,250,46,51,215,154,221,48,238,111,158,212,97,230,109,248,160,102,173,170,47,181,212,55,98,106,94,152,228,121,211,31,127,134,106,152,144,107,154,213,126,241,224,55,213,155,253,95,94,104,83,123,126,167,130,88,227,27,250,213,60,186,90,250,211,21,121,86,255,109,195,155,138,96,190,132,173,172,75,77,46,126,120,151,42,213,230,223,81,165,90,248,211,53,121,130,153,245,77,77,254,14,43,187,212,163,250,248,46,45,170,77,111,106,129,21,188,90,8,87,171,182,234,249,79,126,182,122,141,207,126,247,166,118,88,140,122,222,116,169,94,237,249,157,19,246,236,119,55,212,171,85,254,
+51,235,119,177,110,223,238,237,141,239,54,221,69,179,27,218,253,182,86,116,21,82,127,186,38,45,141,223,117,169,127,196,202,46,45,85,125,124,151,54,213,166,55,117,169,199,34,199,31,154,26,171,193,184,241,231,152,165,225,159,91,254,148,153,187,104,254,19,38,175,218,162,1,203,53,63,103,45,86,115,205,159,176,22,107,191,228,117,93,211,255,253,241,227,198,106,64,197,210,212,69,26,171,253,62,215,213,196,126,112,165,59,54,144,250,39,45,88,76,254,211,28,176,218,197,159,176,134,175,154,191,99,29,87,243,69,253,91,199,243,211,53,125,254,162,161,169,30,139,219,53,84,208,242,218,202,15,127,241,240,189,135,239,215,10,63,185,182,122,110,40,124,213,246,181,226,181,250,239,24,213,143,155,194,135,191,120,239,253,55,229,93,183,194,63,52,96,137,29,203,55,111,157,151,91,55,190,238,191,101,216,255,227,155,134,103,255,208,240,182,64,255,55,245,79,159,126,85,255,232,119,119,174,150,194,213,207,55,245,251,171,47,190,27,82,222,54,234,43,43,126,80,247,19,27,252,
+245,235,209,191,86,246,234,55,223,46,176,225,165,102,117,151,207,152,71,252,1,171,249,202,93,235,254,80,223,92,215,84,123,172,129,19,204,103,154,62,196,146,81,83,21,159,52,125,253,178,138,237,174,160,229,243,166,198,175,27,159,93,98,183,106,139,15,48,148,129,169,247,24,67,48,13,87,149,158,53,252,225,205,181,240,78,3,127,214,82,223,212,242,183,152,111,86,221,231,147,183,196,223,223,63,111,124,252,106,132,175,198,138,77,198,171,150,175,222,190,247,254,213,184,107,239,46,148,105,192,106,212,95,173,221,106,193,163,151,77,77,181,17,85,241,72,117,105,52,253,40,69,255,246,217,227,159,165,230,101,187,183,40,137,189,121,139,138,53,124,249,3,186,252,166,249,74,149,119,45,184,239,3,105,152,82,23,2,110,190,127,215,58,170,251,71,12,190,213,53,62,185,166,38,54,207,24,180,109,252,253,15,26,237,191,254,238,103,217,236,162,217,143,51,89,21,65,87,189,186,249,154,251,87,147,11,166,32,198,49,48,84,221,116,89,244,221,0,253,78,181,255,115,3,166,51,
+150,248,191,199,190,63,24,185,222,12,158,87,97,188,74,62,222,136,96,215,135,142,117,253,198,180,92,67,66,239,234,240,215,119,235,26,111,190,122,215,92,94,133,195,87,41,183,182,10,94,17,186,186,250,75,202,248,164,177,161,74,128,30,55,252,243,15,217,234,42,168,63,252,252,225,23,255,95,25,237,186,14,255,51,173,247,89,213,145,176,96,137,77,210,123,151,21,126,89,107,253,254,15,174,216,103,88,80,189,116,170,15,190,155,58,95,23,213,200,75,181,228,42,253,95,60,213,128,211,195,15,170,171,250,225,7,141,87,165,85,56,120,227,253,91,36,223,148,243,223,235,159,190,108,248,137,171,241,66,247,215,171,241,45,9,234,154,113,111,218,245,149,97,235,126,56,177,189,61,245,191,145,245,111,204,252,221,11,14,245,179,187,184,96,141,55,9,227,27,29,212,248,226,171,214,15,255,195,63,253,253,203,167,79,95,119,244,26,165,221,0,104,55,140,240,228,198,11,76,196,103,45,143,171,149,223,123,255,13,57,23,200,250,38,168,190,105,78,12,78,223,16,84,171,250,143,
+24,108,190,46,235,29,84,253,166,164,26,79,191,46,235,73,253,211,230,134,183,10,121,215,228,94,210,159,235,66,174,189,189,245,150,105,121,77,103,110,48,153,27,82,91,110,188,120,187,193,127,208,80,151,212,227,221,98,254,156,62,120,241,7,34,254,36,23,121,5,224,191,43,166,182,98,235,30,215,183,212,215,61,252,15,117,213,178,87,217,240,98,97,98,185,248,21,226,186,8,231,55,130,248,139,231,205,141,215,160,254,59,35,20,70,120,30,190,247,255,179,200,132,233,252,189,97,233,95,195,203,191,134,151,127,13,47,63,55,188,96,171,235,173,177,165,134,191,171,140,239,73,237,0,225,71,128,233,191,185,160,92,127,143,173,166,239,35,45,63,113,211,230,2,45,95,147,253,6,244,251,177,24,184,70,15,46,153,215,197,129,6,70,17,155,159,99,28,248,55,53,198,216,84,35,182,207,158,95,22,127,128,49,138,11,1,13,223,190,104,249,227,165,142,63,100,133,191,195,192,244,101,124,173,123,244,77,125,211,195,95,190,61,214,189,125,53,84,207,47,158,253,172,88,119,189,
+6,214,237,53,15,248,229,187,226,220,251,175,119,15,26,46,56,192,21,117,126,109,161,215,249,229,26,14,174,73,169,158,34,61,107,248,186,190,74,15,235,126,95,243,46,140,59,86,79,65,26,159,213,132,212,124,166,238,179,134,250,166,71,223,84,13,251,180,241,25,246,252,99,236,247,89,109,182,177,41,248,49,134,124,71,108,186,176,228,43,73,255,171,77,250,155,235,110,246,166,233,62,196,172,113,205,72,213,173,149,203,77,140,11,207,171,210,218,198,139,51,163,43,23,188,56,90,121,94,245,210,63,52,54,55,188,42,175,133,219,31,220,123,121,94,165,36,175,50,243,13,226,222,244,184,161,9,75,210,63,113,75,230,249,15,240,132,239,11,134,223,233,254,203,186,218,215,59,194,226,243,27,239,94,239,252,60,191,218,248,185,240,179,154,136,215,199,78,205,216,82,197,66,217,239,27,155,170,187,3,117,223,54,180,124,243,252,98,131,180,38,175,122,40,250,198,17,231,15,50,59,76,246,255,104,124,220,242,205,37,249,253,164,238,109,131,250,242,59,127,220,234,13,10,251,74,
+204,247,218,239,93,185,242,15,111,49,196,149,239,52,191,168,127,84,117,12,12,43,254,254,114,51,248,5,102,139,150,234,88,95,111,3,60,250,97,132,136,5,219,107,131,253,30,154,255,61,84,187,22,178,191,51,214,159,16,176,47,34,10,182,48,170,59,149,175,4,253,144,234,181,109,161,42,236,124,175,134,83,127,238,36,93,137,249,222,57,122,39,40,250,234,70,250,173,174,220,107,72,254,98,155,170,58,39,223,62,127,140,45,233,234,38,108,109,159,237,233,211,231,127,184,56,46,169,238,121,93,236,175,94,79,88,239,97,118,168,30,87,95,52,197,154,213,125,245,178,165,165,186,151,248,251,203,99,137,106,181,247,63,188,190,61,246,174,29,225,90,167,245,143,30,53,188,104,121,189,147,251,99,54,204,254,143,151,205,151,217,253,79,178,239,149,152,255,25,246,189,146,125,105,223,198,39,175,115,255,171,232,240,249,47,235,30,254,159,181,12,134,61,253,111,95,212,194,123,253,163,150,134,166,230,15,46,78,232,171,54,121,81,223,212,114,121,232,243,180,122,194,214,252,18,203,
+99,175,106,86,77,122,237,108,168,249,173,123,142,151,95,119,63,125,181,100,94,157,244,55,61,127,137,173,204,134,230,47,46,234,93,27,247,117,219,255,246,121,61,134,38,110,204,194,47,222,189,175,116,149,39,47,73,218,245,211,139,187,15,255,234,162,240,29,252,236,138,244,253,245,37,93,195,122,251,236,143,205,152,67,253,230,217,147,231,239,202,15,239,76,189,85,181,191,59,183,63,197,71,238,214,194,250,207,167,100,63,14,113,95,227,46,63,165,135,31,7,12,94,212,183,96,126,242,172,249,45,93,124,89,181,220,151,239,246,112,76,177,230,27,78,254,6,171,186,113,48,117,247,203,87,103,82,119,95,53,250,171,239,235,234,207,103,205,15,234,46,29,231,175,175,171,95,141,64,191,121,147,240,254,205,223,255,183,223,254,246,77,58,115,195,205,46,92,226,245,207,239,152,181,218,109,162,90,165,239,176,225,27,205,223,123,255,253,27,199,99,79,94,62,123,84,59,73,120,138,121,103,243,117,80,86,115,181,11,168,246,138,0,213,16,218,181,58,85,95,249,240,122,193,171,233,
+189,10,43,175,66,120,77,198,183,245,205,191,195,96,72,67,245,111,122,182,92,156,183,53,55,124,139,165,223,167,152,6,23,119,119,30,254,197,195,95,126,248,232,197,139,79,177,175,111,30,254,197,251,53,30,114,179,75,76,122,227,37,200,251,224,242,242,214,53,224,88,187,81,244,58,8,213,6,240,240,47,176,130,250,175,176,80,255,240,47,234,30,213,142,225,223,195,194,253,147,151,79,47,47,133,93,94,199,185,188,52,132,217,227,253,27,195,122,53,119,175,160,127,115,13,52,96,33,174,185,241,235,103,181,51,194,218,189,164,155,215,187,170,145,175,185,238,189,39,181,195,196,170,179,85,195,103,3,6,187,46,34,101,53,72,223,232,31,19,123,179,223,107,179,122,173,231,87,184,229,226,85,21,113,52,52,61,193,112,206,219,18,85,21,18,254,199,63,94,146,207,155,33,243,167,195,219,11,65,127,214,32,246,14,236,90,117,141,154,249,222,61,166,191,253,231,150,63,203,144,48,57,255,171,70,244,234,138,71,243,27,9,241,139,255,23,174,109,17,45,
+
diff --git a/uppsrc/CtrlLib/src.tpp/FileSel$en-us.tpp b/uppsrc/CtrlLib/src.tpp/FileSel$en-us.tpp
new file mode 100644
index 000000000..650e03a0b
--- /dev/null
+++ b/uppsrc/CtrlLib/src.tpp/FileSel$en-us.tpp
@@ -0,0 +1,88 @@
+TITLE("FileSel")
+COMPRESSED
+120,156,132,186,233,111,43,107,158,30,246,175,52,48,182,97,79,198,131,115,206,189,183,239,237,238,32,152,15,73,190,56,72,128,56,129,63,52,122,38,237,153,78,220,72,219,51,152,25,195,8,130,12,142,68,81,20,119,137,59,197,77,220,197,125,39,197,165,72,137,164,184,83,20,247,189,184,239,75,137,164,88,92,138,75,120,206,109,207,36,136,3,83,128,88,111,85,189,191,183,170,222,231,247,252,158,231,45,254,242,211,79,254,209,63,250,240,71,31,254,224,195,127,230,243,243,255,250,55,255,235,175,255,253,239,254,246,87,191,252,237,183,223,254,240,139,95,127,250,238,23,255,251,191,248,31,126,246,139,63,252,147,127,250,211,111,255,217,151,40,31,79,81,190,249,254,227,55,63,124,247,205,199,111,63,253,244,244,239,227,55,31,63,125,247,233,155,111,63,254,240,233,103,223,254,240,205,55,63,124,248,249,159,255,238,215,127,243,55,191,250,229,239,62,253,240,195,47,190,116,250,244,71,159,254,224,211,247,223,125,250,248,253,183,63,124,251,195,199,111,190,255,225,211,169,239,
+167,15,31,62,125,248,254,211,119,31,191,253,230,135,79,223,253,252,47,126,243,55,127,254,171,95,254,250,135,111,126,241,135,255,227,79,79,157,190,249,50,210,41,248,135,143,63,253,244,237,247,223,126,250,240,205,135,79,223,158,134,250,248,195,15,223,126,252,254,187,31,190,249,217,79,127,250,243,63,255,245,95,253,237,111,255,242,223,253,126,172,223,126,252,248,233,227,47,254,245,199,239,127,113,186,230,191,251,187,191,251,227,143,223,126,248,241,10,190,61,5,251,248,225,219,211,165,126,60,237,251,240,237,167,239,63,126,247,179,15,63,251,238,135,143,63,124,248,230,20,252,187,239,63,124,247,243,191,250,245,95,255,250,223,254,255,223,250,119,255,217,91,255,254,195,207,127,251,183,191,57,133,248,195,255,226,227,199,239,79,93,126,250,71,63,253,131,143,223,126,127,186,209,31,190,249,246,187,31,190,255,112,26,252,211,167,79,223,124,243,233,227,55,159,126,246,179,79,223,253,244,187,239,127,254,111,126,243,235,191,248,205,95,255,234,151,255,231,159,253,95,255,248,191,249,239,
+255,249,255,252,47,127,242,203,191,249,248,139,127,241,243,255,229,244,247,223,254,246,119,191,249,151,191,249,221,151,205,175,15,245,231,63,249,229,63,254,240,225,159,127,248,240,39,255,244,195,31,127,248,227,79,223,125,247,207,126,242,251,167,253,227,254,159,252,217,127,220,250,147,15,63,249,125,239,127,56,246,243,127,56,250,15,253,255,234,223,255,235,223,253,246,207,255,191,1,254,244,203,168,255,234,183,127,251,111,126,31,230,55,127,254,183,127,249,215,255,221,175,255,143,191,252,247,127,251,167,63,249,79,239,255,251,32,255,229,255,43,200,255,244,151,127,245,175,126,251,239,254,226,47,255,195,159,254,228,239,55,255,254,212,255,234,207,126,245,79,126,245,203,191,249,244,139,159,252,254,235,79,254,228,183,255,246,215,255,219,111,126,126,154,228,239,254,201,105,242,191,199,161,50,103,198,179,207,159,207,95,14,159,79,159,53,147,59,225,97,31,120,207,40,30,236,212,171,29,100,194,65,68,106,158,147,238,135,218,7,217,157,232,250,243,205,249,88,72,97,92,37,207,175,16,81,
+57,80,49,202,72,219,248,146,27,72,46,49,189,203,36,237,30,53,215,191,136,12,162,121,88,66,160,220,220,25,35,146,115,33,94,45,148,189,45,220,139,85,165,114,113,113,173,197,62,109,149,9,94,249,76,254,50,169,238,183,246,67,182,10,33,174,132,253,176,84,170,84,200,187,167,51,90,13,115,171,124,17,101,68,143,111,184,241,26,108,29,100,232,153,36,86,148,240,187,59,203,180,41,130,136,77,249,160,96,196,33,119,9,134,124,152,105,32,5,22,1,17,153,200,127,238,145,252,216,133,124,184,123,9,20,162,100,223,18,220,192,250,49,175,67,202,165,65,210,75,143,143,190,170,201,201,22,10,106,67,188,216,151,67,108,183,95,232,16,122,172,113,255,11,132,105,238,168,1,241,117,43,55,25,96,52,182,169,111,202,103,122,156,249,241,82,55,93,229,219,150,241,145,138,16,109,215,182,65,37,36,59,162,216,187,119,226,188,29,55,200,65,25,23,97,65,236,56,78,254,232,46,82,140,15,229,214,116,91,60,27,105,46,107,88,33,217,115,203,21,35,198,42,77,152,161,
+221,87,16,16,192,55,109,183,103,59,143,114,189,114,66,200,197,249,202,166,18,20,241,163,244,81,34,181,31,154,228,109,100,28,169,219,44,199,116,148,246,28,107,190,203,8,190,183,190,76,253,222,98,212,140,23,70,247,235,189,79,100,139,211,106,175,198,241,220,196,72,65,14,203,234,121,216,231,78,58,201,164,134,244,246,254,20,61,18,187,240,115,79,187,100,191,15,2,195,254,28,140,199,104,62,103,205,217,221,175,236,78,5,81,60,77,0,15,200,242,226,54,42,29,168,18,109,44,99,100,239,201,143,33,103,60,172,150,16,124,112,194,129,217,146,245,80,119,214,120,125,107,181,91,252,247,142,248,165,170,221,31,86,42,50,191,186,79,245,100,213,134,30,112,28,71,239,134,99,96,20,180,165,108,113,34,23,31,224,184,87,234,225,65,106,55,5,56,168,10,221,140,217,170,137,73,112,230,193,203,180,19,195,203,106,107,236,183,18,182,123,87,239,222,209,191,152,45,89,20,150,189,171,127,178,204,82,142,104,133,233,62,71,249,244,149,155,154,139,207,64,188,68,170,150,107,
+171,78,92,55,195,181,131,152,183,163,12,61,162,25,142,11,35,187,238,182,64,51,33,10,121,188,192,81,241,140,86,55,24,208,197,5,201,55,247,49,108,198,30,201,173,183,151,205,221,59,24,41,34,221,91,89,19,189,155,159,219,246,216,170,70,179,136,69,109,207,132,142,191,238,115,111,47,110,46,27,242,180,57,210,149,178,178,175,142,167,60,86,17,152,155,10,169,84,202,33,48,41,111,29,230,65,6,7,226,42,67,143,243,168,97,175,235,199,192,74,109,101,21,162,154,153,21,255,34,68,23,136,228,5,246,98,223,173,93,233,9,58,223,19,123,85,127,38,173,38,49,55,240,210,7,4,99,153,240,204,192,12,185,34,85,184,35,95,61,84,149,79,213,240,145,234,243,192,175,71,18,232,210,79,187,16,231,224,11,130,143,7,13,98,135,208,109,63,201,50,117,112,134,226,131,22,194,248,14,44,65,42,169,247,116,121,247,133,109,98,193,138,143,197,128,171,130,3,121,163,252,212,182,43,201,3,90,79,221,214,167,154,46,117,92,67,228,173,24,222,51,15,247,158,99,179,
+133,36,4,1,15,208,168,136,239,17,183,121,91,24,155,106,105,167,169,165,25,121,118,151,244,76,143,239,222,44,149,184,106,141,229,34,0,152,35,232,146,77,163,238,235,201,241,232,91,79,50,82,231,227,190,208,133,98,249,128,191,240,82,199,7,203,108,199,162,228,236,13,109,151,222,211,236,175,120,58,125,48,55,187,246,214,196,73,113,240,49,26,71,244,173,7,219,1,94,172,142,3,67,244,184,107,237,202,182,220,216,53,51,137,107,110,24,126,199,231,9,187,165,186,35,22,120,250,235,133,161,71,62,78,95,222,122,15,93,114,117,149,124,26,221,245,72,149,217,252,136,62,6,223,95,110,141,205,11,208,118,200,191,175,8,4,203,116,12,35,181,89,249,72,7,102,253,139,194,96,201,51,121,67,209,88,64,204,46,190,46,70,215,79,47,206,151,215,37,137,175,54,46,79,0,80,77,29,239,237,122,54,14,226,166,16,81,22,28,243,54,35,126,212,86,153,105,122,12,218,1,217,213,220,70,184,152,174,77,118,165,165,184,96,171,152,230,207,170,203,252,17,146,210,60,226,
+252,67,237,193,5,185,26,137,101,130,207,69,2,143,244,133,28,174,237,42,219,34,22,170,45,35,101,38,119,3,247,222,171,44,32,195,161,1,199,67,153,129,48,20,68,114,49,187,91,227,137,124,242,46,105,57,131,60,52,160,217,113,175,193,136,192,90,43,47,189,134,71,61,161,55,27,160,94,38,117,158,65,8,163,152,128,79,224,198,164,86,139,197,196,54,117,108,116,21,219,97,73,21,215,28,195,121,27,207,36,28,59,42,174,48,17,231,223,34,248,92,221,34,39,87,12,185,125,29,151,110,38,175,96,60,169,248,54,189,1,30,4,192,46,171,192,104,187,187,218,193,128,212,108,5,165,181,5,113,152,231,97,64,79,240,77,172,166,139,85,127,202,110,217,246,135,233,120,36,144,215,171,105,195,123,126,246,178,52,153,48,90,251,162,142,99,235,246,76,238,235,241,128,25,219,118,187,16,209,68,182,221,109,202,140,253,61,4,229,218,242,196,46,1,5,220,115,146,128,183,249,172,227,3,186,253,115,133,250,234,30,102,119,228,139,73,10,74,199,109,133,232,128,186,157,171,
+2,211,245,218,129,113,102,108,245,6,47,0,109,99,178,64,157,132,170,117,247,211,186,142,0,175,186,233,6,57,126,127,171,210,175,222,34,108,14,224,217,77,2,186,3,58,49,153,205,203,172,219,58,9,48,156,0,161,88,27,16,247,246,33,1,57,145,22,47,33,152,105,107,130,248,171,129,73,180,191,246,224,20,183,197,89,201,117,188,236,131,166,9,235,145,209,106,90,130,155,169,221,242,88,24,85,143,240,49,181,247,152,223,228,228,151,73,105,142,201,131,107,27,205,15,178,60,26,123,234,254,115,141,117,137,178,149,217,0,138,201,215,207,129,103,85,83,120,121,68,122,131,55,151,157,107,218,155,153,252,252,17,204,16,87,61,151,14,13,146,93,123,41,212,21,2,114,143,161,181,50,145,246,73,140,11,20,152,86,87,89,195,97,80,179,138,52,181,232,77,17,217,182,210,6,36,28,116,35,65,184,116,176,208,22,135,5,100,219,77,71,43,124,144,196,182,213,216,238,253,212,163,169,45,246,21,226,12,90,185,110,13,73,131,234,172,198,178,95,170,90,55,64,186,172,25,
+243,14,42,252,165,199,117,76,238,182,3,50,249,161,138,48,48,147,203,197,146,60,62,91,5,56,219,165,76,80,177,181,174,193,13,27,66,222,51,182,234,106,115,150,183,20,17,112,159,221,194,47,99,188,1,8,59,128,30,73,195,155,20,159,163,105,62,196,23,200,53,149,86,115,54,4,182,112,53,205,129,183,233,26,249,30,41,202,114,93,82,208,198,214,109,171,233,197,172,149,238,141,37,181,17,56,199,79,198,201,166,102,229,102,122,66,149,43,253,30,9,250,156,253,161,238,86,54,173,110,48,28,148,246,182,133,175,179,216,151,123,51,180,127,17,180,155,23,164,51,4,76,174,124,2,62,175,22,123,19,20,23,151,90,14,240,64,94,197,206,84,110,17,160,12,39,143,219,242,54,145,67,90,151,233,227,206,167,35,160,242,2,56,212,218,203,185,243,214,202,35,155,60,131,185,37,240,238,49,182,224,212,85,58,70,221,111,57,60,48,217,229,18,200,76,130,105,123,143,72,139,212,56,2,30,212,181,104,17,185,227,176,48,248,98,74,117,156,223,196,115,187,30,73,222,47,
+217,118,234,45,73,166,91,115,200,82,121,108,235,142,239,40,72,195,97,197,94,168,22,187,46,245,184,59,163,202,166,98,108,205,149,241,32,3,243,178,202,143,89,181,135,233,54,76,240,157,65,155,119,226,132,127,85,180,58,145,189,47,207,117,187,119,213,162,79,112,11,48,223,195,38,140,14,16,147,14,222,230,156,90,110,89,60,61,79,171,30,179,53,201,49,215,186,30,56,219,161,76,224,235,234,6,53,230,123,54,119,2,207,106,157,53,32,114,45,145,116,216,25,139,75,233,30,172,237,221,185,0,136,125,51,6,122,208,196,96,51,92,3,164,30,84,161,50,162,41,103,237,141,16,39,92,65,135,41,89,225,233,206,129,242,195,162,132,138,151,99,97,15,238,101,112,102,220,166,6,9,211,59,8,66,128,5,73,231,124,111,122,194,8,24,177,25,34,249,27,135,44,227,90,182,157,58,53,141,57,52,197,106,97,226,240,190,214,181,187,196,56,208,122,27,182,217,41,207,170,159,227,164,49,47,15,253,55,177,110,42,224,206,182,68,185,123,113,152,81,193,83,61,216,129,55,
+166,213,189,187,79,190,7,89,0,180,115,113,166,171,20,236,110,100,99,132,118,4,44,82,199,18,192,195,167,76,38,161,28,85,66,28,164,225,41,99,211,89,140,99,79,93,1,132,78,24,222,163,32,241,72,23,93,117,3,130,87,168,81,137,248,222,170,202,253,139,181,48,178,93,49,93,232,243,209,126,0,121,32,207,122,253,164,114,207,189,10,167,121,21,123,122,27,37,32,225,42,165,0,213,179,224,36,65,16,128,203,215,183,88,158,24,63,22,60,71,218,94,176,22,188,170,166,183,187,99,243,12,62,188,61,56,224,61,66,168,173,52,196,83,178,244,142,92,19,211,77,156,20,157,145,71,142,105,101,163,244,122,58,82,16,9,36,216,203,61,14,28,190,83,161,82,184,118,240,201,60,199,173,20,115,52,205,90,122,185,105,212,76,241,205,208,10,39,99,65,147,37,82,78,191,177,73,210,222,45,186,241,64,71,95,157,167,223,150,47,158,182,205,199,85,160,152,2,243,124,189,12,94,234,216,197,230,57,68,23,220,58,222,243,253,6,190,180,178,19,246,177,93,252,77,161,
+27,238,60,51,79,54,232,218,45,228,208,110,64,5,50,9,243,42,90,140,58,31,67,6,132,211,226,16,92,101,179,2,156,239,84,218,252,222,39,235,241,107,86,87,179,190,50,229,166,7,123,22,31,205,123,30,6,64,89,27,137,1,114,77,175,180,24,86,185,66,166,235,232,113,87,224,234,49,87,221,82,80,110,7,52,193,204,182,91,221,190,121,76,65,147,138,121,66,206,213,14,69,124,18,157,224,167,109,91,199,100,192,162,95,54,160,157,182,254,66,175,23,103,30,36,113,180,173,31,221,11,48,127,20,39,49,151,90,15,187,21,128,223,112,100,114,245,48,122,18,70,73,183,238,62,2,136,23,96,209,11,25,21,8,137,239,73,80,173,193,253,32,81,115,247,76,49,144,106,11,178,58,171,53,111,254,136,7,210,120,76,243,12,115,185,94,45,60,111,118,235,203,155,108,144,152,148,173,243,171,172,105,225,235,232,220,219,189,198,150,126,52,214,220,245,4,123,196,7,253,53,15,101,191,186,239,12,248,193,98,133,94,221,54,107,47,252,35,14,62,107,61,163,74,78,16,
+110,239,0,210,114,107,127,94,171,116,101,29,255,178,113,235,116,212,115,204,177,128,125,177,178,116,132,107,88,112,255,192,119,57,224,227,82,238,25,81,125,246,96,106,55,61,114,234,83,150,139,201,183,137,214,3,12,70,199,118,224,222,147,55,62,102,140,13,218,87,175,201,34,36,154,108,156,83,251,190,45,41,50,137,92,132,34,7,203,182,96,2,52,150,169,16,144,161,1,65,66,160,159,40,152,131,220,109,115,94,75,185,122,92,3,115,117,198,132,151,138,149,139,241,214,2,33,132,196,153,2,5,4,192,195,142,118,23,217,141,158,242,128,38,116,227,88,113,60,252,52,106,133,242,112,222,151,25,193,202,105,132,249,193,71,79,232,134,167,115,172,107,35,167,192,131,237,24,231,183,25,51,33,95,52,11,157,231,200,132,212,94,196,56,76,23,233,208,129,226,239,190,156,192,178,241,61,7,61,175,158,222,240,72,220,164,145,30,215,162,191,233,161,80,11,208,179,174,129,180,147,176,110,173,7,99,95,224,101,235,11,173,98,249,215,23,232,109,102,60,150,60,75,114,144,156,
+47,79,130,16,159,102,226,172,50,147,184,86,215,57,66,237,35,182,136,148,152,29,46,208,148,219,46,143,80,133,103,198,59,123,160,156,227,241,6,14,98,15,145,109,178,45,91,233,68,222,90,89,166,111,47,253,141,7,124,246,60,221,140,107,14,199,232,225,88,57,142,242,188,109,78,254,162,93,175,210,38,210,8,96,34,111,167,180,69,60,102,199,102,31,172,101,109,189,209,235,193,68,30,8,48,155,203,179,116,205,244,102,79,29,80,193,73,218,19,152,232,64,49,92,222,208,167,253,39,142,88,134,232,217,7,5,82,100,249,222,156,8,251,80,92,90,72,128,14,124,14,176,154,203,183,219,66,212,160,126,126,209,141,57,206,131,209,55,126,43,48,222,156,250,129,226,185,35,247,44,7,55,123,68,195,131,29,157,224,84,96,222,249,125,12,65,126,221,237,200,93,131,231,36,22,170,108,188,79,42,191,123,87,111,9,14,213,117,75,176,205,182,130,83,104,85,200,48,129,195,89,156,233,130,65,79,113,211,225,135,61,14,243,182,49,73,66,87,167,44,55,145,38,227,42,52,
+18,33,144,152,108,11,32,27,205,184,99,60,211,141,224,11,91,241,245,12,7,106,5,92,3,235,178,65,200,97,198,2,45,199,179,223,205,30,232,43,193,49,119,92,219,17,55,190,102,130,200,83,185,167,73,82,232,92,207,45,64,87,120,232,120,92,130,120,17,122,9,235,156,199,1,2,219,71,85,88,183,47,58,87,135,193,94,136,28,222,53,206,99,124,172,161,78,119,105,243,232,173,111,35,184,29,59,148,81,119,226,115,72,247,208,211,33,213,253,121,79,217,12,242,234,61,206,197,121,215,189,101,154,56,68,15,35,6,179,151,236,6,185,86,217,11,77,44,18,16,154,228,171,205,232,36,135,196,138,179,162,205,150,190,161,221,178,202,207,79,38,103,112,80,46,7,144,174,20,126,233,199,36,181,196,110,131,205,161,166,154,186,32,194,56,162,15,56,50,143,170,165,197,87,107,103,115,168,25,11,157,7,251,134,149,171,46,77,231,132,220,110,186,152,245,111,159,86,86,51,164,119,34,76,123,159,203,51,12,154,139,156,105,70,102,0,70,198,197,106,80,22,165,109,173,160,
+110,172,16,212,233,17,181,193,22,128,160,93,54,250,20,212,8,222,119,11,92,213,205,229,28,193,173,1,81,180,215,249,107,119,15,14,92,117,77,56,155,202,163,19,190,56,46,87,62,125,85,254,238,5,163,108,202,155,67,104,14,218,52,68,57,79,204,119,12,26,131,209,45,68,230,145,244,81,161,46,232,102,39,144,171,108,124,192,45,168,43,14,154,185,4,243,27,54,87,23,66,121,184,244,199,146,233,220,176,217,188,55,158,11,62,83,221,203,2,55,148,177,20,79,216,57,16,25,171,218,123,51,221,118,16,158,187,155,237,230,73,16,48,170,22,20,161,225,105,194,30,238,238,130,114,128,202,179,200,24,142,62,169,239,57,126,46,32,13,214,101,212,80,48,226,79,62,203,253,4,146,78,103,205,121,14,36,161,219,71,120,39,169,105,46,69,31,214,205,36,38,147,215,58,161,1,4,213,103,102,77,44,31,118,115,167,217,34,7,38,245,224,171,243,225,29,22,160,149,47,50,139,46,248,214,94,13,242,147,227,26,141,237,240,183,185,158,110,19,187,33,250,80,137,233,122,
+26,137,50,150,79,224,213,121,240,60,71,177,148,167,246,132,51,241,108,150,36,11,230,168,83,68,227,103,200,70,183,107,190,63,234,247,159,203,123,148,152,172,217,120,104,115,234,22,205,115,226,141,106,60,236,189,166,157,153,89,153,106,44,74,241,161,129,232,17,33,79,6,150,212,218,1,205,100,105,142,231,9,209,155,27,55,15,83,218,32,135,70,244,194,43,92,137,118,79,222,232,248,43,3,22,64,214,130,131,112,98,153,150,20,22,213,48,175,69,77,229,192,146,243,78,79,213,235,186,90,158,254,172,189,77,212,71,221,16,56,19,36,164,187,187,162,234,160,189,220,44,186,225,40,217,125,92,215,103,179,153,203,90,151,78,147,177,118,50,149,149,70,7,47,169,109,127,52,114,44,71,253,23,145,232,25,191,38,197,77,77,3,179,10,179,227,197,149,176,182,103,170,11,119,185,195,124,55,11,166,165,239,112,54,34,167,27,149,107,151,104,210,105,246,154,162,229,134,7,136,68,175,69,79,238,120,128,142,252,189,114,167,44,154,186,6,212,197,139,239,142,239,144,33,84,245,
+2,160,42,149,17,106,166,230,54,116,155,120,63,18,110,221,69,45,233,60,151,151,240,232,182,141,41,185,139,31,75,39,189,142,181,64,201,41,128,121,115,185,232,64,160,43,254,68,26,105,16,49,134,125,204,137,176,155,69,79,85,91,75,67,41,175,18,175,152,79,250,180,207,102,43,13,135,185,204,221,250,106,51,41,55,66,184,149,221,101,95,207,25,13,246,249,197,209,157,50,63,244,245,190,8,169,165,50,62,15,59,16,165,96,237,131,55,187,36,9,188,73,246,235,163,197,59,253,104,222,2,62,155,251,243,149,229,142,244,222,71,35,26,145,127,31,103,181,56,85,110,8,100,10,38,133,25,215,15,42,68,102,53,193,86,13,213,206,158,151,248,38,20,56,68,24,79,32,51,189,154,153,154,207,67,195,204,156,191,46,83,39,83,130,61,117,110,48,60,37,43,65,239,222,150,230,40,170,34,171,145,15,90,178,182,16,235,53,180,9,201,238,67,103,196,48,238,30,207,226,23,73,164,145,146,77,194,215,164,17,143,27,206,23,69,73,203,124,50,25,167,123,224,242,125,174,
+196,156,83,137,147,99,102,77,162,68,207,249,185,235,125,212,115,27,70,116,143,85,71,57,143,74,149,243,163,116,107,114,111,167,170,123,49,222,51,132,221,190,138,197,177,116,175,23,107,13,44,65,33,190,198,9,97,31,174,149,111,200,82,68,37,165,203,24,65,53,176,136,180,116,218,168,30,104,216,155,229,173,37,152,98,201,165,219,3,175,232,44,40,249,252,0,63,186,73,188,107,208,104,171,223,2,137,233,101,123,233,213,156,148,102,186,162,161,237,94,218,23,119,105,87,157,125,120,194,40,26,22,237,183,107,228,126,204,208,192,58,67,185,103,88,96,44,125,229,109,107,78,170,62,62,15,27,2,255,218,117,215,236,136,252,186,206,103,46,25,4,151,111,224,139,243,65,224,146,168,70,140,189,224,9,167,39,82,134,182,169,7,189,158,16,25,45,206,250,230,78,54,140,100,106,199,41,235,246,165,201,96,3,217,69,229,38,192,21,193,174,162,55,53,71,93,223,194,165,187,123,224,230,209,56,25,49,142,67,243,30,100,182,159,72,160,133,101,190,207,54,250,19,54,19,14,
+188,247,21,75,63,187,168,194,17,21,171,98,9,136,202,96,1,158,151,245,5,57,207,173,119,3,208,158,48,110,222,139,120,81,104,80,188,245,89,67,254,27,255,230,217,249,16,103,40,232,248,230,59,138,244,110,89,137,153,253,232,169,252,173,14,59,241,166,196,26,248,100,211,215,42,242,89,99,177,243,3,88,25,101,201,144,14,195,40,21,134,109,31,75,231,102,147,24,177,167,244,27,102,191,24,127,138,14,163,101,227,134,74,69,228,229,147,198,126,208,92,193,61,92,202,107,82,82,0,43,27,1,148,183,133,55,74,45,144,211,93,56,85,23,72,177,167,161,56,242,103,50,250,198,203,205,190,46,86,152,108,127,187,78,97,110,146,83,62,83,190,24,184,131,186,224,182,239,46,39,143,188,117,199,187,52,160,250,30,102,249,36,86,98,79,70,141,223,71,95,60,216,174,7,250,213,25,76,223,87,184,246,88,211,47,98,194,86,80,60,227,89,90,176,113,251,128,196,131,54,98,202,191,42,154,71,181,100,25,54,142,172,19,117,66,198,63,142,203,15,228,51,28,140,42,114,
+159,25,134,240,43,189,120,235,185,174,162,147,221,97,210,214,135,182,37,141,49,62,106,142,233,75,231,243,89,180,161,14,114,239,235,192,49,103,154,167,62,127,158,48,183,26,34,68,50,212,104,154,16,137,80,178,227,31,22,220,86,229,148,204,64,101,216,8,226,232,195,215,32,124,53,141,157,49,32,30,79,8,143,38,230,212,164,116,205,97,148,162,47,108,7,158,178,156,189,138,57,254,197,91,100,227,125,38,217,175,39,155,155,44,208,18,251,50,207,166,122,62,30,36,61,76,238,182,111,18,148,14,11,16,52,90,152,253,114,204,81,158,54,113,82,51,218,240,185,247,230,165,225,50,17,40,85,158,101,190,96,61,107,80,185,92,233,83,222,192,66,89,86,131,59,14,158,23,124,217,154,195,42,247,25,251,206,245,141,174,212,13,229,201,146,240,138,117,84,32,143,65,70,54,226,214,180,195,179,126,39,69,34,107,46,132,150,225,78,59,187,71,18,238,187,237,74,189,190,214,65,123,92,47,59,7,154,111,164,152,101,76,151,106,159,45,86,133,230,62,9,213,172,224,206,136,
+214,221,178,113,64,133,138,241,76,44,38,216,105,180,4,46,17,5,158,219,212,49,35,237,80,227,189,219,36,193,55,86,194,14,143,96,167,239,57,254,217,155,61,82,238,221,112,228,74,201,220,177,189,242,238,45,207,216,109,84,10,172,181,112,79,199,19,241,236,134,85,255,142,236,184,18,192,12,200,60,214,212,40,253,101,241,2,246,106,203,184,32,151,161,134,13,236,40,208,165,81,97,206,177,192,113,229,30,47,229,108,197,162,167,83,112,138,106,238,114,66,71,188,96,247,234,28,151,219,145,139,78,10,93,107,213,219,160,88,189,61,185,205,106,143,142,219,116,179,134,128,26,130,8,25,56,180,35,195,126,177,68,77,87,231,192,250,250,162,195,13,18,230,145,197,176,40,216,247,195,71,49,89,187,182,136,61,173,131,6,226,33,240,82,32,57,213,184,60,26,225,10,175,148,244,140,93,178,42,186,72,182,234,142,88,41,67,251,174,87,16,11,218,88,112,73,225,210,37,92,7,78,102,76,10,99,72,121,141,254,84,35,23,151,22,70,113,230,23,75,200,36,216,19,222,132,
+29,136,94,187,16,164,193,131,10,221,35,245,172,250,133,61,237,4,109,202,241,25,186,193,130,205,82,161,96,114,229,88,113,7,141,8,41,161,30,13,137,176,194,171,39,48,33,61,179,115,42,194,187,232,184,26,64,230,212,186,142,224,243,190,37,47,191,148,224,65,116,85,130,225,189,183,45,37,248,222,30,95,110,4,192,0,50,161,238,174,18,74,241,35,120,59,108,136,200,221,21,194,188,107,175,133,177,167,171,75,5,138,149,68,159,195,185,84,255,41,243,116,213,192,121,185,38,160,86,93,215,106,7,52,50,141,94,161,170,145,96,148,230,3,7,74,236,227,148,203,10,137,163,226,151,128,107,119,99,141,17,149,138,7,36,99,206,104,134,6,56,117,159,210,13,98,60,110,217,149,45,19,160,110,90,170,46,36,199,203,236,75,49,255,26,196,84,82,225,242,125,89,70,92,8,214,51,197,133,26,239,63,71,80,215,45,221,100,146,78,153,15,243,103,86,176,74,86,151,2,81,6,246,17,100,178,221,73,109,140,40,120,127,141,76,50,151,52,87,60,67,11,79,253,154,33,
+51,122,65,93,249,36,166,41,28,111,222,98,110,128,82,107,228,121,47,219,253,153,74,214,113,181,49,216,46,7,93,205,202,172,17,88,144,170,35,251,66,176,75,222,14,80,243,38,105,187,188,29,107,94,82,67,241,148,47,197,22,108,1,23,175,174,131,63,27,28,230,94,16,150,41,157,2,107,251,149,226,149,72,14,2,229,32,91,106,97,70,161,172,218,64,95,1,15,164,230,88,58,168,233,93,70,209,118,203,221,168,83,47,212,148,148,104,239,74,142,219,203,26,250,24,84,179,214,209,114,187,57,192,220,138,27,204,167,64,43,24,140,123,180,50,13,112,33,149,212,28,169,174,34,247,20,17,79,207,86,182,89,243,89,77,221,191,185,171,100,18,0,235,162,28,11,123,180,120,206,91,56,53,195,165,66,63,80,157,77,156,97,127,1,43,8,86,89,105,141,162,49,156,25,10,213,234,118,156,34,156,221,112,46,75,133,74,95,53,137,161,151,28,221,174,234,161,160,149,60,64,231,171,236,130,142,231,24,12,21,163,199,242,205,126,83,23,151,253,143,206,59,165,144,84,155,
+144,159,75,5,101,3,203,15,31,222,68,73,78,17,51,40,140,212,60,240,90,50,145,203,120,184,225,34,107,29,235,0,65,1,5,16,244,33,229,139,243,237,161,28,113,235,186,119,110,11,181,144,26,160,144,88,121,101,161,227,181,74,63,172,45,89,59,126,245,62,4,36,86,28,6,144,226,164,172,230,110,84,109,202,52,21,250,216,214,120,50,99,219,9,62,2,190,60,115,181,233,29,224,199,146,20,19,252,58,203,134,83,12,95,49,52,82,212,100,145,186,174,110,13,150,125,65,213,168,154,166,83,67,32,194,12,145,82,139,118,100,48,244,188,20,156,249,118,182,254,25,178,180,155,186,129,128,178,184,170,45,49,210,26,15,150,229,196,238,229,32,141,100,91,16,173,225,42,51,37,88,156,245,82,31,205,75,96,152,116,165,127,227,213,25,139,148,97,69,126,156,23,162,1,10,99,104,241,55,250,15,221,199,89,116,164,106,124,81,42,61,83,3,93,10,208,42,167,187,214,89,176,235,187,9,229,33,50,211,104,166,43,24,103,88,84,24,122,69,176,32,145,139,223,120,1,
+174,145,176,138,212,206,203,37,109,16,52,208,97,198,224,235,21,2,2,221,64,46,99,117,98,216,41,191,165,65,170,30,157,37,73,73,89,172,23,160,123,86,226,84,147,76,32,23,48,141,238,156,49,68,234,172,181,100,29,87,136,88,73,5,44,150,149,92,243,148,146,1,44,22,21,138,243,194,198,236,166,15,116,101,58,235,216,104,232,64,163,48,72,204,193,204,16,40,175,57,100,186,198,58,212,163,73,111,76,36,163,121,24,18,237,222,120,36,242,118,179,11,110,252,29,87,57,185,89,95,51,53,179,3,136,140,5,155,200,244,125,181,114,192,17,48,117,136,143,50,41,123,16,51,166,163,15,61,156,125,24,6,29,219,103,251,43,54,97,217,231,186,29,42,44,71,180,119,26,20,34,244,160,195,195,210,249,181,151,118,225,23,110,184,247,165,65,34,183,196,7,111,19,76,25,103,159,56,27,107,184,175,247,89,212,151,195,56,238,62,72,248,218,54,160,94,85,49,29,40,95,192,23,129,4,169,154,201,91,243,1,198,69,227,130,71,201,214,119,64,29,202,118,46,224,75,
+97,27,230,12,31,241,48,67,237,225,32,64,213,174,190,148,146,112,249,211,72,100,234,43,25,19,125,125,179,138,57,226,243,213,136,119,85,217,132,149,111,7,80,189,42,175,74,243,59,237,213,226,108,117,41,52,196,154,106,179,159,100,163,223,213,209,18,36,202,52,31,161,253,77,52,200,73,51,136,186,76,201,122,210,93,235,59,222,44,243,124,137,8,54,24,165,25,225,86,166,122,106,116,229,42,58,222,7,47,251,174,47,44,58,118,143,144,37,186,31,57,41,137,199,155,45,160,68,158,111,242,178,53,26,30,150,241,236,253,99,135,147,70,76,197,136,63,230,242,216,60,55,64,167,82,43,95,77,211,205,89,156,234,233,87,229,246,136,96,131,76,94,230,58,33,101,198,44,222,70,105,242,164,63,246,242,82,197,2,46,229,68,38,148,204,155,202,12,61,79,136,87,25,235,74,89,148,66,130,187,189,108,157,68,139,158,49,60,152,229,244,113,36,242,35,121,116,5,176,122,83,186,187,83,108,159,83,225,97,182,187,163,3,67,252,20,21,64,250,155,9,177,20,87,25,194,
+57,186,76,232,114,171,201,244,18,148,21,60,146,66,160,9,193,82,72,22,165,117,226,102,137,40,172,183,145,136,123,154,72,136,73,123,48,159,43,47,145,197,170,186,170,109,25,41,13,61,78,241,213,163,94,169,235,125,144,202,5,140,47,11,93,233,218,208,208,189,228,248,177,218,104,96,151,200,238,36,10,133,188,106,125,24,211,79,9,57,56,15,93,188,169,228,0,18,139,95,48,50,79,177,114,44,15,185,113,215,140,197,72,37,28,234,243,227,247,197,139,64,87,107,103,221,16,221,122,207,207,72,246,165,139,52,227,158,227,98,171,60,182,22,76,169,22,163,66,90,102,245,250,162,210,219,193,112,71,167,100,80,230,154,22,201,111,191,111,12,149,236,28,4,40,239,176,100,242,186,167,188,52,159,124,194,182,232,218,44,22,5,127,59,213,190,206,186,74,122,155,216,197,78,122,108,120,196,98,49,251,117,169,83,24,76,112,3,50,67,254,120,49,186,195,245,79,233,102,57,203,2,104,197,237,184,179,95,131,110,171,19,114,35,92,10,154,194,96,35,89,139,185,233,5,53,
+14,227,252,168,99,201,20,20,243,108,188,84,41,228,226,199,179,32,23,236,115,189,151,1,144,113,29,16,170,199,5,11,111,168,8,135,58,179,147,220,207,162,128,86,180,213,34,104,146,45,61,63,127,203,98,134,141,11,19,116,142,198,23,174,12,128,84,21,245,95,0,37,243,178,115,0,69,230,180,149,9,227,82,35,179,105,42,81,190,158,84,71,122,21,117,158,164,138,204,133,13,198,0,137,100,31,179,100,119,51,77,161,156,85,192,240,228,0,14,104,75,99,59,247,186,228,122,112,249,253,61,255,248,48,113,122,152,209,52,52,185,191,107,103,113,179,124,91,152,67,176,41,40,124,224,239,31,240,99,203,61,63,193,160,97,94,192,232,26,122,40,101,31,34,157,104,66,8,123,15,184,197,224,34,39,92,178,155,75,18,70,169,157,242,253,39,1,194,158,126,41,104,240,73,234,239,179,181,83,91,241,181,237,165,69,47,30,193,80,181,159,121,252,90,86,15,198,160,141,27,29,190,150,232,210,5,234,225,53,128,109,156,24,63,199,92,61,240,187,202,51,0,105,29,64,180,
+242,106,76,244,82,144,81,220,86,183,17,96,6,70,39,42,56,39,147,119,231,227,132,103,178,237,144,120,204,161,53,229,22,71,114,215,11,250,175,186,228,154,22,201,219,180,237,192,25,113,85,163,32,76,231,46,212,214,89,233,69,212,25,5,138,169,174,207,153,139,77,24,76,77,119,192,163,4,133,140,44,74,17,51,214,123,221,94,197,227,224,168,147,226,226,235,58,47,18,198,93,164,59,186,72,231,254,41,10,90,38,226,80,182,210,44,157,93,151,31,66,121,152,146,73,124,166,173,172,71,221,190,3,46,32,61,6,189,65,159,125,241,167,72,148,26,82,99,22,71,163,98,108,154,124,41,88,41,253,234,185,149,32,203,204,34,112,125,45,157,151,110,205,29,78,174,37,165,195,59,253,166,193,28,20,85,26,14,59,4,138,46,124,174,207,219,97,99,166,153,248,67,148,86,188,36,16,145,38,180,160,61,251,126,167,92,95,34,78,142,135,217,72,208,18,145,168,178,93,31,86,95,175,131,186,238,161,212,137,60,116,239,38,114,18,35,160,220,40,49,106,145,229,190,60,83,
+41,32,236,248,76,17,60,232,12,174,139,103,34,218,129,235,76,151,34,191,121,191,204,53,84,128,188,127,2,144,142,23,175,169,154,105,105,55,77,177,238,154,232,179,132,114,52,166,231,194,209,57,40,114,170,50,100,177,43,142,145,140,91,64,179,57,33,61,37,243,97,61,119,171,18,78,182,151,183,18,102,56,91,215,13,250,217,3,168,183,105,140,164,224,106,251,8,78,136,169,21,38,37,67,81,24,192,107,170,150,223,71,243,179,213,9,131,143,159,1,191,215,4,195,167,7,20,77,21,51,215,186,241,67,119,93,127,26,161,123,135,248,240,1,140,82,74,2,43,147,135,195,148,148,18,77,9,169,70,134,233,179,240,198,15,26,132,238,142,10,184,15,98,89,40,145,198,46,208,33,82,221,252,209,134,18,41,111,199,147,241,9,213,171,209,132,133,216,152,138,59,36,38,225,222,83,151,105,67,158,86,106,201,209,66,122,191,91,204,35,64,137,133,141,98,149,243,66,250,57,19,103,146,107,202,140,230,241,53,3,109,34,224,125,121,177,194,117,111,222,183,69,35,42,64,231,
+107,174,188,236,160,11,225,101,53,38,135,114,68,12,7,97,138,180,214,16,101,153,164,28,229,81,6,234,243,24,250,42,118,62,203,115,234,217,82,138,166,246,20,241,27,69,140,158,162,92,92,203,238,50,161,115,196,64,46,118,46,104,1,222,215,118,177,80,113,140,68,168,39,60,168,196,18,29,87,194,245,73,54,142,209,21,116,230,199,227,109,174,28,217,123,212,185,132,171,120,144,179,84,40,85,181,251,234,86,246,18,183,15,151,114,114,81,5,100,81,119,102,212,121,177,221,220,234,60,89,172,244,172,102,159,70,56,50,126,96,207,97,199,109,68,36,249,184,170,79,35,9,88,6,44,131,49,174,63,191,39,44,148,59,77,195,30,69,87,1,115,144,84,227,34,111,85,244,179,242,125,173,50,55,134,104,49,69,30,127,207,139,179,179,90,225,48,131,134,237,245,163,198,186,154,83,1,73,103,7,12,155,106,147,117,164,207,251,69,167,219,53,29,164,244,251,78,69,160,207,171,162,19,136,102,242,16,172,247,179,190,172,48,58,218,148,166,236,141,149,249,98,171,190,211,79,
+243,38,157,38,19,180,104,205,162,126,98,242,27,39,130,222,51,43,234,194,35,110,38,71,47,54,4,220,142,238,199,36,240,40,254,133,48,104,7,244,54,67,79,172,121,18,111,97,73,164,32,221,37,21,222,73,120,18,200,222,200,211,104,181,133,242,180,52,61,177,97,241,242,233,188,79,40,116,19,45,194,66,20,20,198,100,40,245,115,183,223,82,89,99,34,7,94,245,106,156,132,162,185,89,178,123,161,193,233,5,204,254,22,192,51,52,132,102,186,166,223,44,89,243,147,54,164,89,18,234,97,84,77,221,68,84,25,107,5,59,166,119,66,96,139,78,77,141,178,139,231,16,247,84,119,158,169,155,221,188,84,118,160,24,151,43,224,178,129,214,152,199,206,236,101,56,126,243,170,140,91,34,19,7,21,221,142,155,241,24,84,46,91,76,169,164,226,231,97,138,201,205,14,181,169,130,74,147,52,218,142,105,22,129,67,166,166,97,238,117,167,201,215,65,239,165,236,25,98,183,168,74,57,163,41,223,136,27,158,149,253,44,206,7,164,122,171,6,4,38,131,206,241,38,10,78,
+86,224,57,16,227,2,18,209,62,38,60,88,204,248,234,82,83,224,56,135,222,29,104,245,181,119,155,69,209,210,34,149,176,59,75,90,149,169,176,139,81,74,242,246,77,132,88,204,57,5,188,164,150,215,25,119,242,81,165,37,2,213,17,254,139,56,59,105,179,246,23,113,150,173,155,201,42,167,41,79,97,42,30,190,102,237,80,82,118,184,148,252,238,105,98,50,206,36,69,103,57,35,186,98,197,98,84,70,194,56,183,217,129,87,59,224,67,122,25,165,180,243,237,38,19,66,214,58,186,59,114,172,60,128,82,133,214,134,5,150,235,208,50,210,142,203,59,199,204,250,190,239,191,209,31,193,109,108,83,43,111,58,94,144,68,200,190,250,85,43,126,113,205,247,208,20,170,84,182,169,42,6,133,202,59,239,162,224,180,58,234,86,7,53,126,58,209,238,74,19,42,21,194,35,24,204,150,91,236,166,222,166,26,163,208,59,154,108,128,245,126,190,74,95,159,35,194,213,141,48,137,17,94,40,174,142,103,192,181,243,245,30,85,250,34,171,78,20,127,113,226,248,47,20,255,126,
+226,120,38,51,187,235,210,186,16,209,155,125,72,230,114,155,77,8,92,114,212,143,155,38,86,127,172,64,215,222,29,240,20,2,191,128,253,132,117,147,39,95,125,88,165,148,81,230,6,49,225,147,166,189,234,148,196,74,202,16,158,41,244,238,167,37,149,7,72,124,59,224,117,214,136,184,143,186,204,185,227,209,114,132,154,64,95,242,36,218,117,116,179,163,12,44,236,111,187,137,243,244,243,69,225,18,48,238,222,44,79,24,93,217,70,186,18,250,249,2,65,47,29,178,204,159,39,136,104,90,30,198,233,39,121,217,220,145,30,13,10,147,196,218,72,76,46,215,101,71,80,233,188,218,32,82,241,173,178,63,28,102,177,242,207,183,38,93,252,134,129,94,185,222,231,232,66,180,36,14,51,79,222,226,100,45,114,181,207,137,87,21,47,138,65,226,108,223,76,53,198,206,28,144,37,75,90,176,240,138,11,179,165,134,71,46,227,22,118,169,31,207,144,95,119,0,12,249,162,199,140,223,91,68,169,202,59,159,125,226,109,104,85,238,237,56,43,155,176,135,135,52,177,36,141,43,
+132,219,185,192,151,50,96,21,172,254,178,102,187,84,246,208,39,237,155,162,34,188,92,62,195,87,202,46,239,79,116,16,109,69,55,218,88,168,169,179,198,186,240,155,155,205,69,202,43,127,145,145,86,157,1,79,247,42,238,73,220,69,241,245,149,238,144,206,161,1,51,175,230,220,68,48,153,85,217,11,162,156,62,48,122,100,249,190,160,146,149,67,33,123,139,155,17,80,115,185,89,186,1,147,97,142,230,182,37,41,99,239,157,168,114,48,201,164,248,162,146,31,244,235,114,125,205,96,35,83,200,71,1,165,190,86,22,33,207,155,13,18,62,201,255,86,145,236,1,29,185,64,45,55,212,89,158,40,115,246,218,89,61,23,211,196,214,215,142,161,166,20,107,59,90,213,57,32,242,195,17,25,236,10,198,136,152,22,58,67,241,196,226,29,202,52,65,135,189,47,46,162,110,231,206,117,131,30,91,185,183,65,178,166,243,33,225,81,122,210,119,37,85,125,50,89,146,86,155,133,115,181,133,205,19,241,117,144,31,242,29,116,131,35,187,107,81,100,131,23,72,97,145,196,46,86,
+195,124,105,174,86,182,100,42,49,50,23,40,224,201,103,204,9,75,130,45,112,109,59,243,74,52,95,240,230,247,30,224,47,6,224,247,60,124,33,57,232,218,90,243,240,110,112,161,71,11,207,5,154,187,207,136,74,126,106,207,190,180,143,69,188,25,127,127,184,90,172,46,199,66,31,171,201,137,100,74,39,239,190,137,129,177,203,135,33,71,127,132,174,93,95,100,139,109,28,143,88,90,247,76,127,23,49,151,239,53,115,182,39,191,71,106,132,91,197,193,131,18,95,234,140,46,172,212,3,88,142,181,182,81,232,152,88,180,156,41,206,168,49,218,130,71,115,149,140,168,31,34,91,141,4,244,27,4,109,13,34,110,200,158,104,126,118,240,57,43,149,4,228,113,31,79,113,68,118,64,233,170,77,169,41,68,101,35,110,207,196,167,248,117,89,124,21,29,68,118,36,205,20,127,27,200,209,243,189,153,71,239,102,103,39,173,170,48,226,173,67,96,218,177,177,182,206,247,194,169,137,132,123,27,73,173,143,169,164,120,69,154,168,168,72,11,215,31,190,88,104,39,100,119,253,239,
+88,59,79,159,207,211,6,70,59,82,130,75,188,244,212,129,79,21,128,114,203,224,112,148,10,163,171,169,73,169,9,101,116,178,140,82,210,186,175,86,146,0,62,214,203,46,168,150,50,198,205,195,181,106,144,67,61,38,82,46,215,204,76,241,246,114,160,58,86,192,219,204,92,178,215,70,115,104,71,131,71,46,193,29,55,153,109,77,139,248,231,153,207,239,79,117,102,167,24,165,73,217,11,210,107,237,246,97,88,26,10,112,22,41,11,174,151,188,243,146,167,164,226,225,104,174,30,212,180,177,131,100,172,5,82,106,233,210,145,86,196,72,79,66,12,177,175,56,82,8,180,145,105,87,103,23,180,198,44,253,205,136,106,205,202,128,87,182,154,99,225,89,167,55,143,186,12,218,144,47,211,31,209,116,158,186,79,166,82,35,224,164,180,216,100,95,192,166,181,117,111,184,166,100,35,229,23,28,19,172,124,6,40,184,150,238,109,96,115,180,116,102,90,92,32,159,34,3,199,83,255,52,238,201,62,51,139,125,119,198,86,24,173,197,15,66,171,205,115,34,100,218,78,11,243,103,
+153,155,88,184,13,149,204,134,209,53,163,119,59,87,10,173,149,238,117,38,61,173,69,111,74,207,165,130,252,146,92,166,176,225,11,211,100,233,40,71,102,174,188,225,44,219,39,175,75,254,178,136,164,232,96,174,10,229,71,9,34,29,245,184,217,70,183,207,81,12,32,88,193,82,38,163,87,42,103,98,150,203,232,174,242,246,89,76,56,112,172,101,226,150,70,243,180,31,97,101,50,24,207,32,62,79,140,207,244,89,241,61,159,241,103,128,46,188,86,92,88,181,52,106,74,102,44,237,57,175,83,122,129,163,67,252,88,178,180,30,197,71,210,90,210,40,151,199,247,223,47,66,82,74,23,66,7,141,170,93,79,117,61,154,147,218,38,132,109,174,165,189,118,85,180,83,215,117,195,29,72,232,127,4,189,143,109,15,34,60,94,100,194,63,26,96,233,143,114,251,233,241,139,220,174,235,218,89,109,78,124,88,186,13,111,114,243,118,62,150,89,233,128,213,122,183,243,149,228,198,71,240,238,171,78,143,116,117,36,87,125,14,133,191,32,63,49,25,107,222,135,159,51,103,243,181,
+152,1,185,69,162,70,125,114,158,67,67,57,173,243,9,164,100,15,80,191,227,229,221,95,192,211,16,176,177,20,202,68,44,143,232,152,193,47,178,53,249,9,76,73,59,186,46,199,7,199,165,49,97,241,157,143,72,23,225,131,21,54,101,55,99,250,22,32,156,188,235,201,186,210,1,120,152,167,75,212,77,95,89,229,8,250,85,116,39,160,232,250,94,164,16,162,214,142,148,26,235,238,184,162,2,77,133,80,182,139,83,202,110,150,88,22,52,221,107,123,17,245,205,8,144,236,219,79,145,118,45,67,47,168,100,213,194,251,40,207,19,139,232,17,44,24,90,167,140,51,171,125,92,41,17,17,92,125,170,155,225,1,64,193,47,61,10,10,209,16,184,242,104,153,44,197,126,200,140,191,52,123,226,10,93,209,216,131,196,229,243,155,149,104,202,151,99,241,207,208,139,46,7,71,52,90,52,230,129,182,225,150,48,83,188,193,55,46,12,91,194,247,72,197,124,74,23,89,81,194,85,244,101,57,153,237,178,192,167,114,119,237,11,93,186,100,192,80,145,132,180,94,114,130,140,207,
+52,60,146,138,228,35,162,38,146,55,75,188,15,116,124,43,118,178,101,225,9,41,172,16,42,136,215,20,180,180,161,107,172,159,84,4,42,98,73,26,52,22,200,144,7,115,178,121,231,171,62,73,119,10,2,149,84,154,145,83,76,146,120,173,146,50,76,192,219,65,122,121,29,1,179,77,77,91,217,34,97,199,133,172,73,14,90,193,44,201,95,21,93,223,83,17,26,175,231,179,158,242,163,126,71,76,90,106,198,75,14,101,168,13,15,112,230,140,207,83,228,72,5,208,153,229,250,148,32,87,245,119,123,195,191,79,203,70,240,29,29,208,93,95,113,22,38,38,253,245,164,39,116,64,39,228,63,165,210,142,3,39,199,116,240,188,12,248,117,48,220,222,8,209,138,38,208,24,247,26,55,64,92,121,243,78,34,73,13,43,244,101,147,253,186,46,122,111,209,175,16,101,161,55,167,244,54,93,254,235,234,210,82,192,39,150,13,217,123,30,31,88,201,6,41,0,171,175,117,235,35,22,42,122,23,8,35,88,154,162,199,211,108,115,72,226,166,16,21,93,192,145,41,7,90,150,
+221,65,245,12,79,25,63,198,165,78,68,234,4,69,45,6,203,47,186,72,1,74,255,158,146,229,127,238,76,58,220,53,135,125,196,221,192,181,108,29,210,234,83,103,164,112,10,70,232,118,243,30,172,174,184,205,140,89,157,222,227,50,134,184,193,252,140,41,184,119,184,155,251,71,16,187,141,250,200,157,217,92,0,9,208,142,251,83,137,184,116,33,206,235,196,24,189,83,81,183,49,195,22,227,187,102,174,200,77,111,197,225,250,42,215,165,60,82,200,255,120,14,157,35,69,212,43,118,252,204,165,60,209,111,110,151,215,94,86,246,252,186,128,183,227,137,119,39,109,31,123,10,245,84,48,99,39,64,209,238,45,134,228,234,65,133,119,178,42,137,198,225,148,49,85,216,59,165,20,70,238,219,129,185,163,183,237,26,226,211,206,76,22,142,88,229,244,168,253,50,173,191,75,126,113,161,161,57,118,228,62,170,166,33,172,187,6,10,36,169,121,219,116,0,73,74,69,118,133,57,19,140,233,9,162,101,50,17,233,109,87,138,241,141,133,96,233,23,85,151,20,81,10,64,238,25,
+226,208,85,60,178,57,25,170,62,34,173,235,48,227,73,33,236,60,234,20,182,78,249,176,47,159,201,105,248,26,131,1,148,40,37,216,56,228,216,201,196,173,50,68,27,73,51,152,104,214,253,30,239,148,79,242,159,31,171,142,12,180,36,124,242,66,211,194,194,161,210,158,184,175,237,238,214,3,56,51,28,211,231,69,41,40,115,157,15,28,116,84,0,63,26,218,253,182,38,132,82,96,68,135,56,167,198,81,6,165,124,13,188,150,158,144,233,84,229,134,122,230,253,190,188,164,171,76,179,215,59,161,252,92,217,90,67,34,36,238,144,102,15,186,146,250,206,165,77,116,161,44,156,63,74,205,82,158,114,201,106,110,93,254,213,249,250,232,141,79,228,136,184,67,216,229,99,170,136,170,166,186,142,251,42,37,56,178,63,63,9,230,154,84,140,8,45,103,231,72,118,227,17,29,117,48,149,151,17,111,219,165,249,35,216,12,88,145,172,46,121,122,34,38,246,41,189,51,182,38,72,100,4,58,47,224,96,167,98,61,81,218,139,221,6,240,15,36,50,75,101,163,120,209,119,235,
+79,44,26,202,96,238,15,106,156,171,101,245,28,118,220,183,70,30,102,120,159,207,164,202,38,138,215,199,33,159,59,58,55,242,147,144,116,46,100,129,82,153,76,179,110,104,3,93,215,95,14,113,222,60,139,141,146,128,236,133,20,90,116,15,216,61,81,170,172,77,86,218,10,71,8,99,36,123,215,221,59,65,207,112,210,52,204,27,209,120,153,11,242,223,221,105,194,103,165,18,60,149,109,222,189,123,204,155,7,138,136,179,123,173,126,98,233,195,209,255,7,110,30,191,226,230,106,44,63,121,194,47,82,68,33,251,194,174,83,239,147,152,228,61,73,231,185,77,0,60,104,187,100,2,133,249,58,115,226,106,222,35,235,252,132,211,201,19,147,32,230,127,49,148,253,47,168,43,195,86,197,52,62,127,224,112,85,220,149,177,12,141,180,125,149,24,84,50,3,147,3,46,148,125,150,237,102,61,231,29,161,97,172,93,40,176,151,143,39,39,50,105,73,21,11,215,3,18,180,22,160,120,27,114,44,85,245,72,11,146,184,208,169,176,43,158,121,144,87,144,187,34,133,211,45,41,
+18,80,241,51,208,44,207,144,245,107,124,68,31,94,151,88,168,73,129,182,83,40,157,186,83,60,65,98,88,184,136,15,244,121,109,64,0,122,246,112,117,180,117,97,168,69,36,164,236,12,204,237,147,1,123,26,185,141,173,251,7,198,128,91,190,102,148,220,98,13,207,173,117,227,58,101,193,213,85,207,121,140,154,226,246,251,167,208,32,3,240,226,104,167,176,91,32,13,154,10,121,20,105,135,63,99,36,214,90,135,47,19,185,174,72,234,37,193,57,85,83,150,36,102,11,90,49,195,96,48,158,140,32,86,115,201,149,218,57,104,244,156,10,11,132,125,120,101,207,60,166,215,85,12,179,69,253,28,235,221,1,214,81,234,144,157,122,171,159,5,47,142,241,49,86,50,206,178,190,97,67,215,169,43,48,235,250,34,59,109,17,72,67,66,102,55,1,6,169,210,48,236,8,226,5,6,102,131,9,15,20,254,203,184,44,202,94,71,15,109,93,139,32,246,191,149,33,178,149,234,161,39,186,90,202,225,221,152,87,243,180,82,121,150,123,151,185,48,35,210,24,30,137,191,46,47,
+183,95,2,154,27,70,180,172,22,72,177,109,235,25,44,51,42,242,120,192,63,9,36,69,28,196,40,235,222,149,31,41,68,184,148,241,63,138,130,39,247,55,39,83,11,205,242,5,11,177,17,181,48,187,246,0,47,100,242,160,141,160,59,118,23,199,162,181,119,41,168,58,92,224,190,28,232,89,161,146,103,86,97,244,142,250,165,173,183,40,215,10,246,214,42,175,229,233,220,15,120,143,134,117,9,240,98,45,134,172,145,223,7,146,134,99,16,109,131,221,6,5,224,205,200,169,91,114,22,117,119,28,118,184,33,201,187,130,172,144,170,25,71,107,195,50,40,41,174,26,218,13,255,213,152,231,92,110,145,9,238,28,160,88,40,38,210,112,49,174,196,249,106,31,158,253,2,12,98,26,97,195,95,78,7,103,190,50,253,157,204,30,100,175,3,19,209,164,145,37,28,160,156,93,179,160,203,102,100,118,235,42,101,213,48,28,193,104,25,166,208,248,206,167,148,122,145,127,121,162,171,44,151,219,91,102,67,182,191,59,105,102,190,80,80,140,74,14,232,23,166,164,57,196,32,194,
+166,17,253,85,72,167,240,27,113,44,69,185,72,93,255,8,244,115,239,143,64,255,106,18,79,30,113,254,197,36,158,60,162,238,139,73,60,9,147,228,197,174,171,211,146,214,42,217,252,120,113,51,124,252,143,126,146,54,224,88,30,226,115,63,51,77,180,245,75,213,204,75,147,21,177,183,168,70,158,170,57,142,239,43,169,123,136,153,168,244,209,137,82,207,146,92,244,42,183,131,12,125,124,139,9,239,153,215,74,124,108,227,61,107,200,201,169,73,209,219,214,173,37,20,41,162,118,227,26,194,234,51,77,156,230,161,45,180,47,76,123,119,162,218,84,211,23,75,169,150,27,174,62,31,121,31,240,25,216,2,124,53,91,199,29,57,44,38,19,5,246,94,81,172,209,76,232,45,137,203,137,199,117,61,188,160,230,79,53,122,95,238,111,35,32,223,220,167,162,175,23,11,63,204,133,134,6,137,130,191,124,167,79,120,212,231,91,29,47,235,148,211,176,231,37,105,125,201,238,218,39,66,101,124,252,126,42,195,20,110,243,42,115,151,209,196,196,99,49,204,144,137,16,178,172,0,
+70,227,227,254,83,110,57,186,113,122,138,170,40,13,142,61,69,193,91,75,110,200,246,115,7,248,27,169,85,228,12,43,111,197,150,100,25,195,148,208,165,128,132,1,151,72,33,247,192,51,214,106,108,157,121,163,9,128,204,236,147,24,190,49,233,179,143,175,37,81,191,104,216,143,248,115,135,210,160,34,32,217,236,61,199,184,41,35,173,34,229,10,183,136,111,245,239,232,118,83,215,50,111,162,3,178,2,13,200,92,142,44,140,219,200,140,123,58,153,154,25,88,162,170,20,86,58,17,234,205,70,198,172,156,122,126,104,97,23,201,133,146,230,244,220,20,57,138,150,171,89,34,168,44,17,63,183,137,31,221,63,129,248,216,152,158,13,112,175,26,183,29,189,198,198,101,23,162,149,174,199,247,194,4,176,155,122,85,215,27,79,194,157,192,46,201,4,75,72,64,214,196,61,129,50,172,71,125,53,88,193,26,13,29,153,198,53,96,198,42,198,213,14,53,37,253,80,226,228,63,215,94,186,62,153,87,112,3,125,6,100,116,234,13,39,145,109,245,228,72,130,45,138,121,230,205,
+222,235,176,201,6,99,239,211,187,240,40,174,30,34,87,218,44,133,7,240,106,45,87,119,32,23,93,165,14,164,165,234,205,246,50,177,206,141,71,57,93,59,30,115,232,227,53,153,13,92,152,176,15,57,133,70,171,186,151,12,111,156,67,189,77,166,83,200,175,37,17,125,221,222,144,80,11,121,142,96,168,205,84,103,99,12,106,65,147,198,68,75,32,69,160,230,178,68,94,225,66,53,214,82,110,52,169,101,195,173,46,101,97,213,54,251,208,72,41,149,6,221,130,13,92,67,94,201,231,175,238,210,91,79,253,104,39,47,174,78,168,215,51,231,76,43,148,185,201,86,171,97,239,151,101,234,147,190,214,106,111,128,247,206,182,54,162,116,71,8,157,171,45,78,197,95,94,28,9,38,69,213,82,198,21,92,233,46,112,212,16,136,171,188,78,147,117,40,159,53,60,140,38,89,122,111,92,149,184,132,140,203,131,83,101,121,63,169,238,46,68,172,120,207,12,204,110,251,233,70,183,197,219,104,185,137,101,76,47,65,202,179,154,108,160,176,22,218,64,139,93,163,60,249,25,52,
+253,225,168,219,235,57,222,182,53,101,124,193,225,1,73,5,117,120,2,199,67,40,185,178,82,169,62,146,134,54,213,155,208,202,230,137,81,145,108,132,246,60,237,157,212,135,178,127,0,177,99,255,115,154,74,191,246,34,19,158,50,10,69,164,239,82,173,70,172,213,114,220,150,247,246,80,60,17,122,242,94,109,194,105,222,13,211,189,136,180,166,122,11,248,183,12,139,53,210,220,31,64,100,161,207,148,238,158,243,229,171,225,60,119,97,80,190,22,84,145,151,131,245,62,158,67,186,119,18,134,181,225,218,27,142,90,146,121,197,194,214,221,244,217,40,117,143,93,24,43,146,93,218,167,91,89,119,183,145,147,61,205,177,136,36,77,148,2,105,207,21,242,234,67,133,152,61,162,0,255,171,189,131,175,135,16,142,77,147,234,6,175,225,0,216,27,28,153,236,14,80,193,175,27,123,203,75,240,129,53,127,98,129,89,116,188,166,58,64,51,118,233,54,131,202,92,190,141,199,217,197,3,210,213,116,124,89,75,129,19,193,201,79,174,183,106,120,226,27,9,18,43,98,87,165,226,
+221,73,167,68,33,98,163,79,160,90,217,231,28,64,127,234,118,174,110,203,63,23,202,108,88,25,172,61,151,184,131,103,230,27,215,82,245,177,183,0,48,214,171,86,219,185,49,204,120,239,141,45,150,222,97,27,148,43,206,187,208,203,18,186,255,242,2,74,100,232,94,51,16,44,170,187,180,28,69,97,116,188,169,113,76,6,19,169,0,235,89,121,75,65,77,136,156,122,50,251,165,67,230,197,0,242,166,252,50,99,83,149,117,57,211,240,198,129,88,236,140,128,136,88,163,42,36,102,250,85,190,81,58,239,233,50,231,227,29,57,118,242,77,160,3,190,209,81,232,239,59,32,11,39,175,148,225,5,76,191,205,52,111,206,75,115,109,67,87,50,121,93,17,107,238,53,65,67,1,238,229,9,116,113,236,56,219,57,228,71,19,147,78,121,174,103,190,124,33,78,214,202,14,223,191,29,35,146,21,250,4,55,61,243,113,206,252,79,233,216,163,15,110,214,242,199,54,178,224,53,177,13,126,66,59,87,245,71,147,229,77,226,56,126,38,136,221,97,191,27,156,193,158,103,86,183,
+102,47,127,93,151,195,149,225,46,119,70,83,74,188,218,177,52,188,216,17,34,141,84,64,53,63,188,213,113,169,236,124,7,148,253,26,39,241,62,60,79,48,128,155,55,115,180,180,102,7,111,58,231,237,16,225,164,225,116,172,219,232,2,111,181,193,254,188,182,54,125,169,225,239,237,145,67,2,198,201,35,205,247,174,137,132,219,43,45,248,184,180,12,200,18,22,217,25,29,143,104,170,119,19,39,201,186,232,164,32,203,253,216,251,146,215,223,86,33,129,39,111,40,196,203,121,158,103,108,217,249,36,252,172,228,138,213,195,188,50,115,244,180,182,231,3,16,250,201,212,13,186,153,102,204,6,133,237,164,8,57,175,229,106,27,230,40,196,247,48,251,37,134,181,188,180,48,175,211,75,252,138,118,74,178,74,146,192,17,15,153,102,133,134,250,88,141,197,247,242,244,102,180,189,239,195,17,54,86,205,211,91,8,209,177,18,20,196,41,61,136,142,111,14,56,160,8,201,114,223,29,254,200,2,166,144,212,93,238,41,53,179,98,244,231,197,99,181,14,93,95,40,55,7,48,218,
+136,26,44,253,213,193,200,188,151,201,99,77,179,137,20,1,146,43,104,149,91,28,239,4,171,78,91,103,56,15,89,233,136,101,116,147,58,145,127,41,96,114,46,138,43,7,147,122,186,158,74,230,122,76,31,31,200,88,182,191,58,9,123,67,26,213,244,192,144,240,176,216,101,6,134,41,194,194,172,89,110,246,53,165,99,189,156,61,167,74,111,47,160,144,110,137,237,134,23,182,21,5,14,41,216,169,217,105,220,24,104,100,162,222,2,210,2,110,250,84,74,217,94,195,175,171,187,72,165,80,54,14,89,113,237,99,15,210,148,37,59,117,87,71,133,85,150,87,83,118,194,125,99,70,77,130,231,78,48,170,189,13,220,154,94,123,184,17,67,17,61,22,191,86,238,200,215,215,28,23,48,238,164,81,191,84,238,199,31,203,177,48,244,227,242,238,153,231,199,229,221,235,103,47,237,75,229,118,94,163,3,113,95,53,133,97,123,216,153,238,244,41,134,190,140,138,250,241,3,86,126,114,85,157,166,110,39,94,81,222,56,233,48,226,191,186,209,219,174,179,168,37,80,220,150,30,
+81,78,27,97,197,10,175,8,37,125,75,168,49,210,147,90,165,177,227,19,25,141,121,52,177,222,108,172,6,251,73,74,228,127,61,97,4,67,174,222,15,178,145,130,35,237,167,247,62,59,43,232,194,72,247,164,174,15,86,73,56,64,130,75,82,40,214,187,86,88,164,241,254,74,219,61,124,94,94,235,116,227,137,161,176,167,169,100,253,145,179,80,90,216,238,148,9,77,87,213,6,224,210,76,53,9,14,175,156,121,237,30,156,232,154,209,216,181,32,78,111,162,84,221,76,24,135,152,0,139,76,116,225,235,120,124,76,127,243,203,76,30,153,138,214,145,146,97,72,70,144,166,41,70,171,205,243,166,142,237,97,104,253,218,1,249,69,132,76,88,154,82,204,217,206,196,148,118,146,253,141,43,194,15,112,86,56,37,154,224,224,139,137,214,59,206,186,57,150,215,66,5,103,37,218,21,145,153,38,142,43,234,39,221,230,40,219,149,59,79,24,225,169,34,193,123,187,243,196,4,77,102,67,112,209,3,99,229,119,126,108,156,149,141,196,158,120,81,101,110,240,45,154,219,72,20,
+100,90,99,111,17,146,36,233,5,186,238,164,49,191,45,111,238,123,183,110,112,52,92,13,59,76,50,239,33,95,122,223,207,218,42,4,49,146,87,28,229,241,250,12,96,119,178,158,129,135,232,33,249,204,164,33,43,134,207,236,54,147,146,63,159,127,102,241,125,238,22,128,109,204,135,90,89,34,31,68,27,244,171,234,251,227,10,50,180,168,247,163,135,112,201,58,190,42,74,14,119,231,234,156,4,198,141,176,16,54,45,180,68,26,116,48,59,205,94,145,28,59,219,197,192,59,127,161,103,250,172,87,84,82,20,42,137,165,220,110,36,43,170,26,178,11,20,240,106,79,233,153,251,126,37,97,109,19,223,62,143,159,191,2,102,46,93,33,226,207,54,100,247,117,245,104,140,254,188,163,126,121,93,240,247,120,186,250,17,79,27,124,16,204,67,84,196,43,21,203,131,211,97,121,196,109,225,189,30,155,20,127,70,252,74,84,247,83,22,252,245,151,22,52,245,151,106,171,71,51,132,181,130,10,140,251,115,207,79,229,11,53,14,140,107,86,231,128,84,245,170,22,52,212,156,19,
+114,237,109,14,130,157,190,108,232,241,61,138,230,170,67,200,32,101,29,242,249,252,199,220,157,72,112,220,185,42,83,239,201,97,65,227,124,22,36,107,0,235,211,84,165,183,181,210,33,119,157,255,18,11,15,197,50,153,198,193,78,77,231,147,138,102,200,28,48,16,5,66,112,132,34,25,198,217,121,168,171,31,144,145,18,198,174,235,28,220,153,24,131,111,100,178,248,193,209,46,208,63,119,216,245,121,131,86,121,233,162,102,2,74,222,44,24,186,213,60,92,78,67,26,140,154,114,75,191,65,243,181,227,172,234,100,7,140,151,138,24,252,36,115,8,148,50,114,241,74,117,32,91,147,249,11,129,142,4,220,10,177,62,22,179,116,159,134,149,192,120,88,122,254,220,163,108,51,99,52,226,3,214,179,67,147,81,76,175,123,214,114,80,152,164,194,44,246,20,204,122,25,198,139,62,128,234,39,20,172,57,81,71,45,156,143,227,132,43,217,228,213,156,75,141,199,155,158,15,9,215,197,99,191,240,203,194,147,213,172,205,145,216,0,35,48,228,133,93,134,251,141,210,27,40,196,
+48,254,193,173,165,191,92,63,81,182,59,44,58,21,122,142,105,46,42,113,119,236,217,28,197,107,130,44,35,38,76,9,15,207,238,134,155,145,82,252,156,123,173,58,50,216,146,145,117,155,212,226,128,180,147,204,13,126,81,74,248,180,61,103,192,44,241,249,197,123,54,76,11,156,3,41,152,125,107,129,226,197,35,189,144,147,196,8,227,88,118,145,209,231,140,254,197,230,50,220,150,21,238,60,87,22,44,59,151,178,202,178,147,156,70,170,186,25,119,160,34,114,142,125,208,219,145,226,25,98,177,138,153,186,65,35,57,202,14,227,107,182,81,27,201,44,239,195,136,199,52,83,17,95,189,229,136,234,28,241,47,242,238,134,209,34,176,191,220,242,10,209,142,252,13,169,245,239,24,103,204,185,84,146,188,162,3,50,163,12,123,128,72,169,26,221,127,83,90,154,6,193,13,175,50,138,242,0,25,239,8,100,185,56,69,107,207,162,20,57,5,255,88,13,52,210,86,74,2,211,107,104,184,36,67,4,28,24,243,243,242,90,39,212,212,56,22,65,40,133,149,212,31,196,87,194,
+91,150,234,12,40,21,57,150,54,125,133,196,98,147,140,90,50,86,234,172,89,55,254,102,167,9,15,57,244,116,60,160,103,191,221,163,207,139,253,102,47,146,164,100,189,153,199,131,59,38,57,135,200,70,219,152,46,29,116,86,74,249,89,230,156,224,241,208,139,32,23,192,113,136,14,49,56,46,37,31,113,134,24,155,222,164,101,247,109,93,199,197,28,10,69,222,93,193,226,207,41,216,73,225,165,66,236,141,18,140,208,88,74,149,163,49,91,140,207,70,34,43,50,178,47,118,234,186,35,187,107,11,17,182,114,179,69,243,204,39,2,190,253,178,168,235,234,232,106,109,225,87,35,197,160,253,248,131,138,223,255,78,241,64,55,49,81,228,195,149,39,235,101,125,125,15,205,50,33,134,214,61,228,61,251,209,142,41,23,103,0,178,244,131,102,171,137,228,120,39,103,157,28,179,48,19,145,38,163,140,83,89,23,25,1,146,184,181,173,148,39,116,131,54,86,242,241,115,211,81,217,46,32,123,203,36,152,29,114,110,162,96,104,221,214,74,117,236,224,19,120,70,72,201,112,253,
+189,96,162,28,104,252,98,29,90,42,255,191,171,187,210,167,196,178,44,255,175,16,245,161,35,171,35,167,98,34,58,230,75,71,119,199,212,244,244,76,84,68,47,17,93,211,51,31,38,170,70,51,37,187,136,178,52,67,200,238,202,249,48,145,238,184,225,46,162,8,110,128,128,128,178,8,136,15,220,81,22,17,68,64,86,65,1,1,5,89,4,241,33,204,125,15,23,204,205,204,172,172,89,50,35,128,247,238,189,231,222,243,59,231,220,115,238,185,239,93,253,221,140,29,39,67,55,117,48,168,57,140,113,40,201,165,115,199,18,45,155,98,129,53,78,157,244,96,129,162,102,204,112,122,6,120,108,198,238,202,110,45,171,135,34,66,18,4,3,59,92,110,164,94,221,41,25,11,237,242,142,121,59,57,22,239,48,158,49,43,189,61,66,73,159,150,228,231,13,105,143,55,76,217,209,190,229,136,178,105,196,95,216,155,138,12,186,183,53,218,93,56,212,55,122,18,172,239,75,108,107,187,86,86,215,196,209,182,102,238,100,174,64,89,234,23,234,121,102,14,197,109,102,106,212,30,
+227,158,117,165,143,35,97,203,211,205,18,49,207,192,9,8,18,123,29,83,240,150,187,29,240,63,148,16,138,172,116,189,247,88,210,215,233,186,88,19,89,53,199,237,208,174,61,197,51,175,158,11,54,52,7,236,222,193,241,193,168,109,93,124,102,134,70,235,186,252,114,120,115,75,20,35,213,65,242,41,79,237,224,42,187,247,88,175,93,179,182,103,236,195,35,90,79,204,38,30,96,131,144,210,171,143,156,212,229,69,186,86,25,39,31,12,4,5,74,22,47,165,234,28,218,121,193,64,86,237,81,207,14,49,60,174,205,106,230,68,154,118,142,111,193,74,59,144,173,82,79,160,150,221,150,161,204,38,157,164,93,210,207,88,133,48,20,48,81,229,163,202,254,173,94,184,121,181,177,161,55,166,135,180,173,219,187,219,80,96,96,35,6,73,166,195,186,181,192,46,199,200,17,113,70,135,96,93,143,131,204,80,139,28,74,93,227,113,176,94,207,214,244,65,126,129,87,102,236,154,110,84,70,76,158,204,26,11,210,122,100,139,33,21,26,0,250,130,105,97,72,33,166,9,137,199,
+140,35,115,190,197,134,40,141,136,156,104,82,15,78,50,64,141,98,94,180,17,76,28,136,250,172,218,224,97,75,195,49,143,177,205,69,87,237,13,178,60,172,82,156,42,85,151,145,180,171,175,158,185,195,96,136,219,109,142,224,152,113,21,157,214,103,211,67,232,83,175,35,212,36,250,212,107,96,135,197,152,30,28,134,173,107,173,205,78,75,22,68,154,196,157,142,66,195,236,234,216,130,110,137,56,75,78,135,142,216,246,130,220,167,139,18,213,22,222,4,67,123,192,23,4,98,103,122,251,122,127,199,76,150,9,40,166,103,211,235,163,174,133,51,171,210,63,145,22,56,164,146,214,49,114,159,193,109,94,73,102,182,250,116,178,145,58,231,150,56,213,62,109,58,30,62,83,239,76,183,81,36,3,188,64,207,206,60,123,28,30,156,142,245,38,199,168,234,120,218,148,18,208,44,148,89,197,102,200,100,59,26,110,49,16,25,91,158,45,173,221,208,48,29,108,219,86,12,132,167,36,70,22,169,181,55,109,155,79,244,111,52,156,90,73,94,147,71,195,12,172,144,194,193,152,101,
+230,44,37,79,218,234,4,195,193,190,117,119,220,188,22,218,207,187,103,61,199,117,146,150,22,137,39,119,22,158,22,52,18,205,195,94,199,240,120,40,63,16,28,90,77,228,186,132,198,69,38,113,102,179,153,74,231,74,124,93,38,123,232,192,174,20,94,116,169,149,253,173,196,197,222,205,176,100,119,222,16,211,118,111,184,215,180,77,230,169,0,37,52,180,167,163,177,251,33,139,183,81,79,205,70,152,35,124,126,31,44,33,103,4,189,71,180,253,245,140,92,117,217,197,36,26,131,196,222,185,169,30,74,45,79,34,83,155,109,137,73,214,138,60,193,238,59,134,116,61,68,71,108,124,92,24,204,202,123,246,224,250,152,105,41,76,114,176,247,245,46,37,242,4,145,201,170,215,29,179,124,164,126,118,208,239,174,159,83,211,206,185,81,14,213,146,100,230,186,216,198,32,61,176,185,151,127,33,145,164,196,188,121,158,58,56,65,215,152,26,27,55,181,7,26,154,39,232,159,26,129,234,117,97,170,188,119,255,36,64,134,12,110,147,49,7,133,197,1,78,122,222,210,59,151,83,
+163,132,210,201,36,85,44,9,111,45,207,55,164,7,38,125,203,135,44,131,64,151,117,147,86,235,211,249,220,166,74,218,236,16,12,238,165,37,115,222,88,195,172,193,163,53,157,154,103,200,105,13,228,139,103,120,236,246,237,22,42,105,185,46,235,209,21,186,213,58,185,206,126,112,60,255,130,107,79,200,133,210,233,9,10,93,35,111,106,145,81,11,217,240,8,50,148,56,52,188,42,93,116,12,248,119,120,105,77,90,165,78,235,52,221,67,50,70,71,200,17,177,24,230,227,188,72,72,119,236,169,101,37,45,219,186,248,82,122,125,100,121,144,185,177,237,232,88,110,50,141,55,76,192,186,77,249,57,128,31,184,184,32,108,49,183,110,248,183,246,146,137,73,183,7,46,164,38,12,123,174,192,37,196,110,104,54,207,244,249,162,179,155,126,186,233,132,101,31,182,212,27,216,221,222,4,107,153,186,98,14,16,87,152,0,108,243,214,224,249,172,36,212,202,10,154,213,33,95,242,68,181,151,157,204,186,24,42,235,250,228,201,233,244,153,117,95,192,1,203,163,176,165,15,72,70,
+194,54,7,68,107,253,11,100,131,182,91,70,175,95,179,112,79,246,194,241,141,164,39,100,226,235,130,47,178,102,52,91,214,197,60,28,53,219,22,2,145,113,126,253,18,250,36,209,41,26,253,204,100,19,48,242,54,215,104,110,172,95,128,60,190,238,101,170,131,107,110,240,29,144,41,150,144,111,125,162,35,141,60,242,206,137,205,144,145,71,222,69,245,200,193,5,254,225,137,227,70,239,32,223,179,223,39,104,95,57,205,54,193,58,228,245,179,140,61,29,224,231,150,114,131,124,154,179,101,108,105,36,56,22,109,77,186,166,215,166,38,96,145,34,127,89,187,34,119,156,249,109,214,12,187,7,158,114,74,89,51,25,187,157,55,67,230,203,87,14,109,34,34,236,148,2,218,171,199,25,34,181,45,78,151,68,2,160,195,19,18,187,251,96,44,154,116,181,119,130,81,184,198,18,211,35,171,151,252,97,48,178,236,156,98,149,212,40,51,152,207,68,182,182,149,116,243,240,198,108,87,70,30,109,106,135,189,182,104,151,124,160,195,167,180,234,247,5,237,33,199,200,184,122,217,25,
+4,97,23,24,177,98,69,127,104,67,123,234,134,102,208,158,44,113,58,218,19,227,132,132,246,4,185,218,209,158,82,137,105,180,167,67,247,32,218,211,138,204,112,150,236,129,173,212,181,102,119,116,195,93,103,91,234,223,37,6,179,68,10,32,230,7,136,81,0,56,8,98,210,38,47,138,24,7,125,75,160,201,235,146,229,154,183,220,17,213,121,130,213,190,50,35,229,175,206,192,138,75,74,111,221,212,232,134,96,134,92,55,218,49,149,171,133,186,26,150,58,252,109,199,141,163,68,206,186,39,43,148,134,201,218,122,175,96,95,208,176,212,101,217,137,30,235,251,59,211,51,203,93,102,131,92,148,105,141,33,173,166,88,121,134,40,243,194,33,156,217,182,14,37,187,154,39,22,83,64,138,97,174,115,111,128,107,220,21,135,29,117,194,60,34,215,133,93,45,229,210,125,166,161,218,94,180,45,109,67,187,66,184,173,45,192,179,129,223,137,174,240,0,108,140,53,210,70,167,182,150,37,115,68,67,221,104,2,168,0,148,16,130,210,46,169,198,218,13,117,143,131,174,136,163,27,
+220,20,60,70,108,171,211,144,145,146,45,179,146,163,7,138,177,224,141,157,108,184,33,166,94,64,106,67,52,226,124,108,62,16,51,75,150,71,23,2,200,235,16,167,94,47,250,58,132,86,35,181,161,111,36,202,81,109,74,140,172,206,195,138,124,119,111,83,218,107,243,181,138,164,142,241,204,233,82,87,67,168,209,155,94,238,106,240,91,123,206,145,151,10,21,134,181,37,241,100,45,232,182,110,36,209,85,207,105,11,109,142,215,161,21,198,210,26,115,179,181,83,33,51,17,211,77,179,157,20,87,116,246,140,215,199,246,115,55,180,160,242,170,113,92,157,79,183,204,146,201,214,100,236,100,254,76,36,178,54,230,7,234,70,55,122,24,242,112,140,230,56,242,93,116,11,173,12,4,128,163,237,180,113,92,153,58,26,32,38,193,188,123,110,223,213,111,106,221,153,172,142,63,153,230,168,200,2,210,169,166,111,86,215,221,13,81,236,179,205,74,122,120,147,9,224,157,214,152,61,39,200,75,93,190,1,138,28,218,77,82,247,134,47,56,164,205,213,180,166,173,149,114,209,161,239,
+135,56,137,227,77,147,202,42,14,115,27,132,114,195,212,114,87,223,210,208,148,145,238,148,111,200,117,94,46,131,2,249,108,177,110,235,81,235,190,160,103,74,178,133,72,172,7,240,99,73,37,147,35,135,194,182,182,5,95,204,228,94,208,31,10,90,104,180,16,12,217,1,199,174,93,75,223,84,27,125,207,50,58,84,111,213,8,58,218,160,133,32,151,207,75,202,117,75,140,201,70,238,96,79,242,197,232,84,255,148,113,13,121,233,71,216,40,168,29,218,19,194,12,146,118,109,165,77,222,41,235,91,170,115,215,69,78,186,26,40,202,85,244,117,30,126,19,159,4,165,135,200,226,224,114,215,6,98,248,107,190,190,78,249,244,222,137,213,231,220,27,166,248,99,129,254,122,160,142,141,252,198,115,154,136,193,117,57,155,2,42,41,183,9,30,235,34,114,244,141,186,131,166,89,84,12,211,97,16,255,53,121,109,14,107,111,63,34,253,177,161,171,249,160,103,14,206,12,1,81,205,228,218,201,209,65,104,199,34,94,111,118,146,138,246,128,152,153,87,47,203,161,51,72,135,127,
+24,109,97,244,160,234,146,157,41,170,139,212,133,168,75,115,222,103,52,54,163,111,170,134,99,177,22,115,42,24,50,169,103,114,139,128,64,116,37,85,223,86,72,120,200,133,152,103,32,191,159,15,156,50,21,250,140,59,127,25,154,146,76,5,117,80,193,187,177,35,112,20,78,105,109,245,73,179,72,9,215,110,6,163,212,161,243,132,81,157,116,232,232,221,199,214,70,239,190,110,111,13,42,164,55,155,97,171,224,200,122,177,53,41,116,121,231,119,29,199,5,222,218,17,75,213,93,71,190,88,106,182,42,248,49,122,52,221,46,75,134,204,210,153,196,118,207,145,154,13,179,61,54,121,219,74,138,2,84,153,20,220,18,71,54,90,44,103,82,215,145,13,12,79,13,205,244,141,22,68,59,180,35,65,99,76,42,183,203,231,162,243,217,97,113,70,27,232,101,26,108,148,180,91,120,102,21,8,84,57,238,193,14,211,37,241,107,214,40,106,106,242,172,223,154,151,158,69,21,244,163,11,119,50,171,138,157,18,153,133,14,121,179,245,160,95,159,25,163,229,27,180,181,26,55,124,
+65,87,156,196,149,231,73,31,127,241,50,194,243,64,147,244,177,196,241,136,180,16,11,76,116,42,47,218,2,158,220,150,43,227,202,196,185,30,40,151,113,181,5,85,41,70,65,30,158,90,227,42,11,89,71,110,150,26,59,29,157,171,231,18,85,10,96,204,145,70,242,70,186,41,124,81,187,51,203,145,174,102,117,83,206,45,159,226,36,217,9,165,84,78,131,50,123,24,43,20,50,48,139,118,193,145,130,127,2,65,44,155,80,15,133,242,100,229,104,75,252,34,164,58,53,239,41,41,194,124,11,155,76,78,39,105,91,114,120,102,133,159,140,198,173,25,81,131,181,217,1,25,84,133,230,197,147,230,85,119,42,185,17,152,164,173,144,244,244,188,194,32,132,251,169,209,78,65,118,56,231,238,207,240,47,47,10,39,139,139,139,219,219,219,46,206,46,55,100,130,163,234,238,88,106,187,176,40,135,137,34,173,93,234,110,218,114,166,121,186,250,193,174,125,182,149,30,59,58,11,239,237,70,134,198,61,254,72,198,42,240,204,140,117,119,147,186,103,172,80,83,180,211,166,170,11,
+198,72,35,6,22,67,104,139,109,42,162,81,31,136,72,201,75,110,186,216,44,44,12,229,214,83,158,124,214,122,164,74,154,219,163,158,236,190,66,148,43,8,225,161,53,43,85,42,222,159,84,12,56,151,104,14,159,205,102,235,144,50,156,105,189,68,202,81,108,108,215,193,107,151,7,251,71,35,71,71,147,99,90,37,241,236,116,35,178,223,6,171,67,241,73,79,208,158,158,8,156,21,86,155,35,3,81,50,179,125,241,144,155,164,112,151,93,75,130,9,88,47,141,121,2,209,139,197,23,188,152,104,254,228,100,205,35,178,174,53,10,51,118,143,152,27,157,143,40,45,133,3,198,254,101,124,177,83,22,115,103,146,103,157,174,166,194,170,138,62,43,158,239,18,43,149,121,207,101,167,153,158,113,58,79,72,167,43,174,46,217,244,156,41,190,196,211,28,195,201,129,140,76,95,23,243,1,184,227,187,144,49,99,19,115,87,195,187,45,220,11,191,70,180,187,219,97,12,243,93,29,10,203,113,138,36,57,212,249,98,62,239,89,124,109,201,198,21,46,93,56,72,150,145,61,197,
+137,67,20,237,102,54,47,236,102,151,185,1,65,47,100,15,119,132,172,67,34,123,167,209,183,45,89,219,97,58,115,92,79,14,210,13,123,33,109,44,206,128,220,77,238,182,1,139,43,21,109,140,185,141,29,10,159,118,128,199,181,116,76,43,19,27,134,35,149,190,238,114,130,41,52,41,249,126,122,86,25,63,21,250,211,166,211,104,104,67,188,26,227,236,234,29,86,173,238,40,206,81,158,237,25,169,210,29,190,48,202,175,63,23,208,195,251,251,192,235,197,39,108,17,217,252,0,11,178,215,18,217,205,12,163,176,211,34,19,102,34,76,209,176,75,223,41,99,207,210,55,167,153,129,41,255,130,46,34,87,136,227,110,217,137,99,110,164,150,221,202,112,92,234,102,173,158,203,189,140,175,85,234,81,93,42,224,222,1,234,234,34,156,53,173,176,160,203,180,52,211,217,209,9,170,158,72,243,48,217,126,49,96,167,117,181,208,183,150,221,188,192,164,4,102,154,200,245,78,105,220,35,86,59,93,23,148,29,210,48,137,211,104,128,90,224,109,215,14,127,221,20,22,22,168,230,
+211,188,201,56,49,212,10,217,99,59,182,190,9,168,99,215,59,122,148,76,168,56,107,45,179,214,33,98,151,154,213,51,25,14,80,167,79,15,165,177,1,253,65,148,169,134,109,140,23,109,221,125,19,158,129,217,67,153,108,52,157,229,4,19,82,27,220,114,104,200,157,105,61,23,100,145,82,169,108,149,22,156,142,4,93,157,131,187,197,39,106,237,18,236,233,188,204,147,27,29,233,19,71,65,26,141,229,207,162,206,66,68,28,91,228,24,198,122,78,52,126,207,36,77,112,0,41,55,179,204,145,89,122,198,177,122,217,73,132,196,144,130,91,71,238,72,37,10,20,27,215,207,186,76,78,49,105,189,39,181,102,154,250,112,223,198,13,104,58,195,245,34,106,147,79,66,59,165,34,138,127,206,60,52,102,118,38,142,53,65,107,79,43,91,30,230,48,101,194,180,149,6,137,15,150,179,102,163,149,231,201,15,76,69,114,237,164,118,126,127,204,181,117,177,208,23,37,69,44,211,44,45,153,199,188,216,80,214,83,246,34,45,246,96,200,51,72,149,77,159,187,210,250,20,213,229,
+75,219,204,178,163,116,171,51,35,57,157,152,143,31,28,173,95,152,165,115,135,238,157,216,174,112,79,179,169,149,185,79,182,142,142,251,105,253,86,147,182,47,222,45,27,130,213,235,205,174,17,122,151,55,194,212,58,146,186,243,221,16,87,42,19,195,41,170,80,152,153,30,169,133,216,185,203,51,41,53,221,102,15,90,120,118,104,110,116,110,78,169,228,47,159,100,214,219,13,151,241,54,143,87,82,104,56,43,136,121,23,134,225,13,103,112,43,61,164,215,54,168,93,27,11,240,28,219,146,210,244,113,77,246,83,147,49,172,116,28,110,115,210,118,77,29,148,27,135,215,58,6,116,238,29,99,119,45,224,124,154,162,236,23,37,53,241,184,135,146,201,204,75,253,253,237,60,138,65,39,64,158,139,49,170,61,151,43,29,195,82,87,198,179,194,181,20,166,149,133,60,35,229,81,102,237,92,243,50,239,48,9,47,196,188,148,89,242,165,107,68,207,6,162,162,58,87,70,102,173,36,3,17,134,248,92,86,94,237,98,157,69,51,153,176,96,77,178,73,57,232,61,88,168,243,11,
+51,231,71,43,28,111,219,241,172,95,211,54,89,39,12,219,77,155,106,114,20,10,116,77,136,104,212,88,198,153,220,151,88,157,166,115,103,60,217,185,144,24,234,77,33,226,54,103,10,35,193,97,19,71,6,119,14,196,61,154,206,198,36,157,233,236,23,76,199,55,199,154,154,220,42,113,159,200,42,153,107,25,182,47,234,167,24,12,222,17,217,223,225,115,70,55,250,213,61,225,115,73,152,105,235,81,17,251,201,253,0,102,56,213,220,108,105,14,59,247,246,29,13,212,197,65,219,90,215,56,204,62,223,27,220,58,31,135,47,103,232,199,187,57,139,195,222,161,36,29,91,70,108,167,169,81,210,212,154,7,68,195,153,25,58,105,37,91,56,216,224,31,13,37,215,160,150,192,48,220,79,183,195,182,209,38,216,238,149,93,240,55,169,61,196,203,250,9,46,221,209,19,155,82,101,32,7,213,150,130,95,0,207,187,36,59,36,37,89,6,40,34,234,234,228,101,83,187,19,157,150,134,176,160,16,113,168,217,180,75,8,84,216,61,77,140,228,69,196,203,192,236,150,94,90,56,
+176,56,130,170,80,66,116,154,31,140,167,207,217,231,130,133,124,112,216,28,142,53,185,146,5,81,204,147,20,57,212,241,69,224,44,119,250,11,157,60,221,82,158,197,134,183,66,49,105,68,149,219,115,213,134,58,201,117,25,117,46,233,48,123,52,237,123,41,24,13,20,89,6,166,121,124,100,189,103,90,122,180,53,156,159,28,20,31,54,141,47,34,145,99,199,213,58,68,28,86,174,43,154,226,110,37,184,39,212,173,159,183,236,109,215,175,131,208,97,172,73,43,50,210,86,155,138,231,96,72,109,243,128,24,85,33,57,160,44,28,12,198,64,160,193,228,155,194,131,130,117,56,7,138,21,17,229,217,66,100,55,173,244,181,215,54,55,121,160,173,97,125,42,180,48,15,226,115,170,37,223,183,16,203,49,54,220,231,151,91,206,100,66,68,155,203,135,54,13,249,205,102,155,149,53,63,52,199,95,98,137,243,166,5,222,230,206,158,85,46,19,92,110,218,183,182,125,238,245,173,249,133,233,236,136,119,97,174,207,48,10,241,189,28,94,159,252,226,100,131,225,204,83,169,84,63,
+13,74,144,116,110,136,62,207,234,77,94,114,253,227,153,220,248,252,41,188,56,11,123,206,130,11,20,230,225,177,131,213,179,119,57,172,168,79,218,45,181,217,113,153,160,131,145,15,59,247,57,241,133,139,102,39,13,222,119,46,135,246,87,71,206,227,113,62,253,226,5,117,74,105,204,118,48,22,45,100,74,27,52,95,155,84,248,130,74,58,203,157,25,137,13,66,2,42,93,181,44,6,177,21,227,162,80,223,65,49,13,57,239,158,1,250,143,184,242,202,234,63,99,158,84,215,96,240,232,9,163,184,42,112,133,171,196,226,49,224,86,5,174,6,61,116,20,135,197,127,134,65,155,252,109,177,229,223,189,122,108,234,191,125,131,173,250,226,113,117,213,207,255,254,111,49,165,103,146,254,186,188,178,242,81,249,227,111,127,246,53,122,192,43,230,230,250,246,132,84,228,246,237,65,166,143,170,171,43,175,234,34,63,239,86,123,136,121,205,193,170,160,87,60,225,110,189,187,135,171,126,73,168,1,124,93,17,45,94,220,173,94,246,147,91,194,95,127,129,156,138,122,85,25,253,253,
+114,221,95,221,80,199,92,115,125,125,180,234,191,124,131,195,99,30,95,177,8,126,84,97,30,97,49,207,240,216,10,12,161,26,83,94,73,192,214,96,112,200,112,81,196,81,156,63,195,252,19,174,6,79,192,160,135,226,98,145,10,21,88,60,238,207,85,229,4,32,131,107,1,60,127,8,196,3,218,85,96,0,121,194,55,88,180,105,21,168,255,25,230,215,149,56,108,21,1,96,80,129,69,251,43,118,130,142,27,208,196,35,93,151,35,109,112,53,21,183,125,124,246,118,89,126,137,173,1,122,129,251,79,108,217,131,43,248,176,229,223,149,253,164,236,211,215,29,139,251,151,106,92,197,107,79,197,189,161,114,83,250,224,101,169,0,178,95,99,138,223,55,149,202,126,114,75,228,103,152,219,3,119,63,189,198,248,134,46,64,250,89,77,13,194,61,30,75,64,52,23,40,237,147,235,195,120,63,3,178,40,39,96,112,85,143,43,159,85,148,84,45,129,244,234,86,229,243,43,221,7,80,33,184,98,8,207,159,98,1,224,160,135,18,122,152,191,162,199,233,62,196,252,246,143,127,
+194,84,226,128,196,64,217,95,112,120,28,210,172,196,80,48,229,64,74,101,159,124,89,93,67,192,60,122,94,246,9,6,255,87,28,225,241,55,24,60,1,72,244,30,220,127,243,61,246,241,51,2,246,15,79,177,85,101,15,80,173,198,60,254,166,188,166,236,167,175,71,190,212,60,238,32,95,66,231,85,236,223,100,56,152,215,157,89,140,116,127,91,161,236,167,37,146,33,224,8,149,216,146,178,95,254,199,239,255,244,219,223,222,72,233,106,12,120,128,5,50,14,20,89,128,70,5,58,225,124,118,205,205,79,111,8,161,202,139,127,138,125,140,123,242,188,168,196,136,9,96,174,14,158,70,192,190,110,250,197,19,196,162,174,39,44,0,248,149,212,170,49,213,160,163,135,152,26,44,225,89,13,48,49,66,205,179,119,4,252,203,242,191,96,63,199,127,12,200,139,148,254,47,128,142,140,4,88,254,143,5,57,48,41,96,113,229,104,69,4,254,15,130,29,165,246,143,184,154,143,130,252,53,177,255,125,240,111,166,152,107,159,10,48,250,191,165,247,255,140,37,128,169,253,83,20,
+141,159,151,48,255,94,78,179,84,8,128,224,221,194,7,159,222,58,201,34,232,87,40,253,241,122,148,223,32,254,137,240,13,194,97,209,163,213,160,26,80,141,191,154,44,80,134,65,73,13,22,113,122,85,213,85,37,58,134,253,238,41,225,249,213,160,238,245,101,132,43,245,186,101,234,3,92,25,225,67,212,170,20,199,151,32,124,23,55,7,100,92,162,46,248,175,16,81,131,112,2,65,171,4,167,159,99,112,79,48,56,36,2,168,34,148,227,170,80,189,120,86,89,137,130,251,176,168,34,248,171,195,227,49,127,174,6,234,9,168,32,36,74,28,225,117,52,129,0,253,244,25,226,52,175,234,160,173,209,18,108,5,14,33,0,132,117,135,226,123,129,255,175,104,147,178,95,148,8,226,87,255,163,162,40,14,224,107,76,241,251,13,135,232,191,65,94,191,122,55,129,149,99,254,92,83,253,236,233,53,80,248,43,153,21,229,117,15,90,192,140,107,202,17,132,110,241,121,139,145,22,237,236,186,205,123,6,188,111,52,207,47,17,97,131,128,17,24,244,131,79,223,117,188,191,252,
+225,22,118,75,235,127,222,208,174,88,6,242,123,112,199,222,222,153,255,255,250,184,147,233,45,221,31,83,104,191,0,255,63,162,224,126,241,139,255,79,162,3,72,253,186,250,89,213,91,189,32,50,13,190,213,227,161,20,222,211,237,149,131,219,160,21,50,63,148,204,225,248,251,135,139,92,149,61,0,67,250,200,110,27,161,251,18,15,95,189,3,0,63,195,224,238,22,189,3,227,183,252,150,250,53,220,87,239,170,177,255,94,246,213,71,71,160,148,248,143,9,67,137,137,34,172,61,184,3,192,125,218,250,235,74,108,121,13,114,141,71,244,245,189,204,243,182,233,173,113,222,152,15,90,136,58,250,219,64,245,218,113,221,175,145,127,196,150,87,252,161,170,242,249,91,109,232,213,20,206,75,250,119,77,229,3,194,71,100,73,253,12,93,243,215,0,34,101,127,83,13,200,0,129,34,108,124,134,121,240,39,252,179,242,74,112,131,128,164,100,138,119,145,248,230,58,25,83,125,189,40,197,3,249,162,4,48,104,251,239,170,43,176,239,48,123,124,14,208,250,11,22,93,187,124,100,
+131,188,161,252,1,136,148,163,109,75,22,32,239,25,175,221,116,255,47,207,159,98,127,208,220,120,75,230,195,217,184,73,198,128,222,42,176,223,191,47,51,168,214,63,199,19,176,223,21,211,88,104,17,122,253,69,213,147,234,247,118,116,183,228,222,144,207,186,75,255,107,204,221,235,55,56,181,39,128,228,27,66,201,155,0,188,216,43,26,73,214,84,255,21,15,86,70,87,127,62,172,184,48,170,249,174,188,18,83,89,253,24,124,150,84,127,55,143,114,131,207,219,117,248,37,214,138,162,124,61,127,215,73,210,215,184,153,187,232,189,135,62,148,162,128,218,47,174,234,189,52,161,168,205,119,114,12,15,223,144,113,248,186,164,233,215,175,252,97,175,187,108,149,106,247,199,207,54,32,203,174,155,162,251,243,222,239,75,30,251,61,225,85,189,251,188,162,226,54,175,128,24,94,5,14,255,180,178,252,121,49,137,92,226,179,208,193,221,201,102,32,244,74,215,160,120,44,225,198,96,191,43,199,127,139,7,119,144,252,51,146,46,125,244,28,131,127,90,254,24,73,126,255,230,251,242,
+239,158,34,139,88,4,204,7,72,222,244,89,205,227,162,196,241,101,159,60,196,148,125,82,246,211,207,30,99,192,199,55,101,159,220,55,47,127,94,89,137,234,217,245,236,245,65,82,45,37,242,26,159,121,237,200,175,198,11,106,191,52,88,160,78,247,15,244,214,123,188,45,254,126,175,97,191,236,54,126,156,32,188,226,45,147,213,189,222,7,243,224,182,236,175,104,102,231,110,49,112,232,53,4,252,187,129,87,148,49,26,13,254,0,188,238,53,225,18,63,247,250,176,239,205,56,220,88,209,61,252,92,77,230,191,249,158,240,198,60,232,251,48,118,75,238,199,155,155,94,59,121,220,117,90,160,10,182,10,143,4,93,200,206,87,69,5,186,227,245,106,90,26,73,94,33,185,61,196,149,21,179,160,56,108,197,61,128,253,14,176,135,43,123,128,132,150,31,136,17,74,225,173,240,188,33,221,252,51,204,163,18,72,126,249,31,72,174,245,6,128,47,170,138,193,38,18,66,62,4,159,53,72,174,14,201,238,2,115,170,188,130,229,106,75,240,122,195,233,142,43,127,82,94,137,191,
+79,89,174,195,229,63,160,1,237,15,2,225,46,169,143,142,198,239,202,191,69,55,34,254,120,29,90,3,153,95,133,225,200,182,217,163,74,236,123,51,255,187,111,193,252,246,17,56,47,161,243,163,177,141,124,223,78,133,128,247,71,207,8,132,55,240,254,14,25,251,223,87,223,97,254,3,25,191,67,229,45,206,173,164,214,3,84,48,247,205,201,255,80,142,199,190,109,35,231,125,6,121,69,235,199,155,189,42,74,136,191,49,221,142,84,42,73,184,63,2,131,186,21,231,245,102,76,197,195,171,37,228,75,102,93,92,74,130,64,8,87,129,45,206,9,119,219,99,30,128,201,16,7,58,196,63,123,84,178,119,252,41,186,121,124,119,51,26,73,227,131,120,10,204,37,53,216,202,114,212,177,128,81,225,8,247,57,73,252,183,104,254,248,7,88,73,145,196,199,159,37,159,92,57,200,151,55,39,208,32,241,17,246,73,53,202,43,18,253,35,15,163,148,238,19,97,191,199,225,111,158,80,65,22,1,175,219,230,44,177,171,98,63,247,90,214,53,86,31,108,84,47,35,245,138,61,
+21,43,188,155,41,253,166,2,135,174,150,126,15,218,254,32,249,149,18,250,161,82,124,157,244,208,205,72,68,241,209,149,194,117,42,5,40,231,205,118,18,178,105,4,174,176,149,21,31,34,150,187,64,124,176,112,94,15,195,43,34,42,173,246,110,130,250,252,233,211,223,85,87,148,87,254,48,35,187,34,242,113,205,236,245,106,126,51,222,15,87,244,87,70,251,170,98,128,32,191,40,234,79,31,222,196,120,120,76,205,179,42,4,229,242,167,79,43,113,143,139,143,13,124,135,80,186,198,248,171,255,6,223,193,29,214,
+
diff --git a/uppsrc/CtrlLib/src.tpp/HeaderCtrl$en-us.tpp b/uppsrc/CtrlLib/src.tpp/HeaderCtrl$en-us.tpp
new file mode 100644
index 000000000..ee1e25eb0
--- /dev/null
+++ b/uppsrc/CtrlLib/src.tpp/HeaderCtrl$en-us.tpp
@@ -0,0 +1,29 @@
+TITLE("HeaderCtrl")
+COMPRESSED
+120,156,237,60,11,115,28,197,153,127,101,138,36,120,215,72,98,119,37,89,178,116,185,194,49,112,118,197,54,148,237,35,87,165,90,188,189,59,189,187,19,205,206,108,230,161,135,207,71,201,112,132,224,4,87,46,60,12,135,129,11,5,137,83,224,224,212,165,18,30,38,135,177,169,16,30,6,2,69,133,132,112,103,23,38,84,46,16,159,41,12,33,132,220,247,125,221,61,211,243,88,73,150,196,163,174,142,162,44,105,102,186,251,123,191,250,235,158,168,24,159,255,124,169,175,244,185,210,2,255,141,93,204,155,44,180,131,234,132,53,52,52,58,206,42,195,227,147,95,190,108,237,248,234,139,10,107,134,138,56,75,25,102,25,28,41,15,142,14,15,150,135,42,107,224,159,242,96,185,50,92,25,28,42,143,86,214,14,141,14,14,142,150,198,26,54,243,253,234,132,93,25,29,29,199,65,21,24,84,25,25,174,148,71,134,70,135,70,203,131,35,163,21,24,91,41,149,42,165,145,202,112,121,104,112,180,50,60,102,114,191,81,157,96,163,131,227,171,183,174,129,65,131,184,18,76,
+94,42,175,169,12,141,12,85,74,131,165,202,16,44,85,30,29,29,42,143,12,143,14,174,93,179,102,172,193,186,129,229,58,114,45,171,92,174,148,199,235,229,145,113,128,249,170,171,174,26,40,15,149,4,4,67,48,89,185,52,4,160,150,225,89,105,168,50,82,30,94,91,90,59,60,90,30,45,13,194,228,195,35,165,225,177,46,243,88,167,55,234,195,11,162,62,82,26,179,2,14,83,172,190,160,92,30,129,33,107,250,214,124,174,60,52,2,136,142,14,14,13,143,142,148,96,241,74,165,50,56,88,41,15,86,214,174,173,12,175,25,30,25,107,115,102,114,175,58,241,143,59,254,233,11,151,108,233,255,251,109,198,132,63,56,110,76,124,161,84,234,47,149,140,13,244,122,125,224,217,213,243,171,19,126,105,220,16,63,86,27,19,171,13,162,244,142,106,252,13,190,171,136,79,224,199,69,23,89,29,214,226,99,229,193,225,210,249,229,225,210,213,215,252,106,238,214,185,185,185,107,222,252,43,252,59,247,254,3,251,223,186,237,200,13,143,31,122,230,91,79,220,118,235,163,183,
+238,158,187,225,131,199,94,61,114,114,247,61,123,191,245,216,158,39,127,187,251,254,227,47,253,215,177,183,127,249,240,237,123,111,252,232,191,175,63,250,175,127,249,253,71,31,237,187,230,165,255,57,242,238,254,221,115,115,31,190,114,230,174,227,115,47,237,126,253,244,187,55,60,126,219,190,125,71,127,255,199,27,95,185,243,197,211,255,124,250,235,191,254,237,191,28,253,254,217,63,188,255,242,131,103,222,124,106,239,179,31,237,121,238,217,19,111,255,199,131,167,126,179,103,223,45,143,189,253,189,147,127,126,231,216,35,223,185,246,167,63,124,250,225,211,167,95,188,239,207,7,223,62,188,255,173,215,30,255,193,157,183,191,119,234,71,207,159,186,250,236,169,19,251,95,127,253,208,158,91,238,184,229,185,231,175,253,217,153,3,79,238,189,255,196,55,190,249,218,205,39,95,254,198,235,119,63,250,135,175,63,245,179,3,111,254,252,165,247,223,251,241,187,247,255,248,174,123,126,119,244,208,245,239,60,244,225,225,227,7,30,57,241,206,155,15,252,244,201,171,95,126,242,206,39,30,
+121,253,224,145,127,127,252,166,131,247,29,123,234,221,191,30,61,114,211,205,111,239,249,211,59,207,223,123,221,153,159,220,125,221,247,238,251,221,161,135,239,185,227,55,191,60,114,248,153,61,199,62,248,225,27,199,79,253,228,204,129,147,143,222,184,251,201,239,158,124,232,254,235,63,252,224,190,183,190,253,204,47,254,120,219,137,61,183,220,124,247,53,239,239,63,126,246,195,59,159,126,245,240,137,155,30,61,118,240,219,103,239,57,241,111,167,110,61,240,235,239,62,125,251,119,238,125,246,251,7,223,120,233,244,13,199,239,248,197,95,14,62,247,252,243,199,94,188,249,181,187,95,125,228,204,131,143,237,61,253,212,45,15,237,251,222,189,135,95,125,239,133,195,255,121,246,228,207,223,184,246,87,223,124,232,195,87,31,152,187,245,186,35,167,78,159,189,109,238,208,61,71,31,220,247,194,129,167,31,159,219,251,194,157,123,30,58,246,167,39,14,252,224,186,187,14,237,127,101,238,65,141,143,165,241,139,10,165,129,210,64,101,120,184,104,76,92,120,81,201,184,152,123,214,20,55,
+141,166,231,130,176,193,3,3,89,223,103,84,241,199,165,32,196,60,33,41,154,8,25,150,111,132,62,12,237,48,203,177,103,141,166,235,25,1,171,219,220,16,82,232,15,24,27,3,163,193,28,163,206,13,159,7,70,216,53,2,215,96,70,131,123,1,12,49,26,174,29,118,28,195,15,188,176,17,132,30,55,10,240,48,104,115,120,97,114,35,224,94,199,114,92,219,109,205,246,209,83,203,49,173,41,203,12,153,45,23,144,19,248,6,131,177,13,102,219,0,203,196,133,8,131,95,45,194,231,13,59,52,45,167,69,131,241,97,109,149,49,101,249,56,190,209,6,245,108,192,10,150,31,88,13,223,40,192,107,35,176,2,128,221,1,140,253,62,195,106,184,48,49,15,26,3,69,131,57,38,160,208,102,83,150,235,225,96,120,19,120,128,64,32,7,78,91,102,208,54,108,171,99,5,190,0,149,213,45,219,10,102,17,93,191,237,78,27,23,26,109,203,76,96,128,240,20,7,146,164,221,222,78,127,34,166,22,8,154,188,105,57,128,97,29,166,109,123,156,27,117,230,91,13,163,235,
+185,93,160,167,197,253,49,90,26,8,0,36,179,26,250,4,85,192,7,128,133,87,64,81,171,19,118,170,132,19,254,205,102,240,111,163,107,205,112,91,126,60,64,128,200,47,233,67,245,85,140,44,2,4,224,192,34,98,228,20,179,67,238,11,24,145,228,58,141,80,46,186,237,89,159,96,42,208,168,162,226,189,192,111,192,184,76,48,222,133,127,60,163,13,107,10,58,102,48,17,164,104,129,196,58,64,42,248,163,110,193,50,222,172,17,58,68,252,233,182,213,16,208,117,192,245,88,93,219,18,20,139,133,206,135,249,16,194,38,240,31,0,155,110,115,135,79,193,162,184,92,36,86,78,224,185,36,223,54,179,76,195,13,3,228,100,211,10,232,171,41,139,79,27,190,181,147,19,161,60,14,248,129,216,184,94,7,36,16,121,195,45,15,4,192,7,4,3,0,131,181,0,178,208,68,226,184,78,109,85,0,79,2,16,188,62,227,171,161,31,200,175,61,6,142,199,207,145,134,20,64,168,75,200,109,22,160,160,0,97,67,207,48,173,102,19,128,112,2,37,219,29,80,30,160,232,
+37,12,8,129,191,27,28,62,104,4,64,50,128,78,8,145,111,160,80,234,4,246,184,205,240,147,52,165,1,231,0,40,8,216,147,94,134,158,92,73,82,96,44,1,178,5,94,97,252,50,248,19,156,201,229,32,150,174,135,254,148,217,213,49,165,130,250,212,93,237,11,128,140,153,72,16,88,107,218,2,249,242,184,223,5,160,113,225,46,252,14,198,67,200,157,46,87,196,18,219,206,66,70,159,142,103,97,218,202,205,176,193,55,49,63,0,136,144,233,192,45,171,3,218,170,9,54,240,28,87,67,169,39,152,221,64,23,63,131,207,52,56,55,253,164,28,8,89,109,186,182,237,78,147,189,137,17,69,251,224,43,242,121,86,171,29,20,9,121,143,64,49,145,139,244,180,214,31,184,181,126,155,55,3,195,245,144,229,133,58,111,89,14,233,18,17,36,26,223,113,81,108,88,189,152,47,146,189,176,222,194,103,62,83,88,35,170,2,105,122,63,15,214,56,47,233,10,107,6,82,79,241,81,157,227,87,74,106,22,77,141,117,82,49,243,101,82,152,2,208,26,171,137,134,131,133,
+129,11,234,138,26,98,207,38,45,146,212,76,41,149,210,199,161,5,128,135,96,86,90,30,103,2,90,38,44,27,88,27,84,78,205,118,124,69,183,60,231,64,113,101,19,228,154,13,48,12,118,172,162,82,132,4,213,73,125,224,59,52,254,96,29,44,244,205,82,231,136,190,210,221,66,172,170,116,39,101,131,46,133,160,64,124,226,185,45,136,5,58,220,171,173,242,97,14,80,64,195,109,210,16,1,149,22,22,4,108,18,44,76,195,237,116,109,30,240,200,120,185,10,87,19,156,174,103,213,67,2,3,38,33,97,81,162,7,1,133,7,242,1,180,3,3,141,12,225,166,64,78,112,26,191,233,8,7,213,70,69,208,45,35,12,205,179,226,133,96,182,43,56,104,152,161,135,66,3,126,111,19,155,5,171,94,69,74,193,95,151,163,65,169,146,12,185,117,242,18,109,215,179,118,194,4,145,131,235,186,190,133,0,251,4,113,214,81,215,129,225,147,2,13,9,71,135,168,47,135,209,139,46,46,35,3,28,242,126,38,11,88,138,226,27,155,198,102,119,10,161,148,82,232,169,48,
+171,79,167,49,67,173,35,21,243,184,80,29,162,98,232,227,72,211,99,45,163,118,62,252,116,187,210,95,0,8,3,198,122,240,134,78,32,162,43,36,24,132,36,78,96,53,103,133,235,165,89,196,4,127,199,131,237,172,190,209,49,249,140,209,225,65,219,53,149,103,245,56,4,106,142,144,203,218,121,64,164,22,186,243,218,121,72,14,248,152,66,64,161,86,57,222,76,15,29,81,56,58,156,204,184,8,90,154,24,106,198,156,175,142,147,107,54,192,89,130,35,147,34,160,36,85,177,86,64,43,39,88,103,154,20,174,86,35,144,193,28,196,108,3,29,224,118,51,169,210,48,187,212,190,174,98,171,154,218,3,239,195,156,22,40,76,129,213,65,116,165,14,241,233,116,208,182,17,96,52,77,193,100,169,131,62,140,52,153,103,26,113,84,217,12,157,134,112,117,16,22,10,141,145,43,132,54,243,208,246,48,84,25,15,253,158,235,136,168,213,205,145,51,159,24,7,198,196,128,239,187,62,15,77,176,160,160,74,1,161,232,76,185,147,100,21,163,104,39,177,174,160,104,195,182,26,
+147,220,148,17,130,84,22,132,180,13,83,50,164,36,90,166,117,52,172,74,97,117,157,53,38,37,59,208,75,16,39,28,8,102,250,157,208,150,161,95,95,158,230,1,29,60,225,167,129,131,141,73,146,142,142,139,234,65,48,8,109,225,51,188,1,246,88,200,129,90,45,25,150,165,232,2,160,130,74,68,104,32,180,34,15,129,133,136,4,104,228,186,97,23,194,65,80,242,132,105,0,228,132,108,111,5,226,43,65,193,113,38,23,233,6,215,141,181,237,54,152,50,82,49,73,53,138,33,252,64,217,150,48,163,168,110,166,59,237,68,248,167,35,25,229,112,98,217,82,43,232,50,53,60,254,101,149,175,95,89,27,171,141,33,168,87,26,4,176,74,227,119,168,223,32,93,211,240,81,175,11,209,235,56,215,67,3,151,29,62,104,88,209,211,98,85,230,137,91,53,29,175,187,161,160,122,221,157,73,146,1,17,41,80,18,7,150,3,140,0,178,48,142,34,221,180,83,16,170,3,102,192,242,149,235,34,158,65,108,46,201,229,107,234,44,105,92,176,45,96,230,58,207,99,179,56,
+73,49,201,41,105,68,201,242,70,148,244,209,164,195,164,228,29,88,23,18,0,245,156,210,16,105,14,132,149,76,178,11,194,22,134,97,50,195,32,52,4,105,19,34,38,244,137,2,174,52,122,100,247,129,46,154,43,21,128,19,59,135,48,222,88,79,36,238,223,181,29,133,150,76,100,97,39,247,92,204,221,32,104,137,191,187,80,82,93,104,19,12,208,173,131,88,71,99,132,182,96,76,226,1,85,202,145,178,4,193,206,6,224,250,88,21,193,37,242,8,17,173,245,167,176,230,3,173,1,161,49,160,16,78,232,231,35,26,9,173,208,42,200,134,197,107,143,57,62,144,182,35,109,26,34,1,244,139,69,28,83,224,6,164,171,9,73,73,10,2,36,70,156,216,195,103,24,250,5,77,16,226,240,146,188,150,239,88,221,46,15,146,105,199,122,163,127,215,86,82,49,86,175,212,118,192,106,181,29,184,190,81,251,34,57,162,88,67,10,149,162,81,187,64,61,220,70,96,93,1,130,89,40,14,108,119,187,155,32,116,42,20,101,222,48,40,117,113,12,85,48,38,50,254,5,147,
+213,64,242,131,90,145,178,145,49,80,194,9,77,211,232,97,117,130,74,125,168,106,164,196,235,73,86,175,20,15,197,31,234,147,218,249,59,170,48,165,252,171,80,157,72,107,109,52,19,201,82,113,7,45,144,163,171,88,244,244,172,46,49,14,153,175,1,45,215,175,106,181,22,82,102,145,72,199,22,77,241,5,87,96,24,18,114,207,71,3,168,107,44,197,28,16,192,241,169,76,16,20,215,34,6,140,75,129,159,160,55,16,72,185,97,171,29,3,39,99,190,54,193,152,1,171,15,60,12,88,29,14,76,159,79,137,50,26,183,88,181,98,70,65,33,135,98,78,153,115,35,146,243,60,136,36,228,117,173,144,52,112,14,34,66,210,209,91,4,148,157,22,130,16,243,250,92,4,34,37,10,128,34,57,231,121,240,92,65,73,73,10,134,74,34,23,22,16,163,16,49,154,84,159,65,168,2,193,196,34,197,164,184,2,22,86,198,48,145,172,47,78,26,84,132,43,232,145,21,134,164,239,78,74,133,148,128,20,243,201,0,196,254,28,194,216,121,29,185,52,47,25,87,174,125,209,
+102,94,252,65,109,181,230,237,3,172,2,168,87,125,70,206,96,211,13,33,75,204,13,21,40,141,208,38,254,162,254,178,148,141,35,0,19,148,70,7,178,87,10,150,40,125,47,232,85,1,96,113,17,83,25,48,252,88,136,5,13,139,5,204,23,89,158,10,96,163,204,99,17,226,189,176,72,139,100,70,10,111,51,244,168,236,168,11,49,248,66,21,213,103,109,91,66,246,136,164,66,252,10,20,235,23,169,132,156,252,72,144,174,127,215,166,116,61,115,197,229,51,101,173,128,248,84,91,163,36,250,99,22,214,149,100,60,152,22,252,159,18,84,34,152,43,235,234,152,138,41,175,20,149,136,176,232,143,108,128,60,170,21,98,86,25,229,41,142,193,59,93,200,124,176,226,128,129,156,168,122,11,118,168,143,74,159,50,19,244,29,25,73,203,132,146,71,230,126,33,94,205,231,90,116,174,137,146,128,235,213,38,106,213,228,119,145,193,209,243,133,212,250,122,210,32,94,21,163,119,18,240,172,71,234,161,173,61,253,74,30,243,129,113,98,250,72,0,98,15,1,234,167,210,185,21,
+113,13,189,25,158,1,120,97,110,206,67,75,202,223,214,67,108,159,250,162,176,16,77,245,162,183,19,118,234,88,118,108,38,181,136,242,123,44,121,130,146,226,110,24,214,24,40,207,6,226,18,166,152,39,97,232,77,90,129,133,98,80,8,210,10,172,150,144,102,128,214,82,9,2,12,33,147,153,254,124,116,219,18,1,66,16,244,48,54,26,133,166,92,203,204,241,53,37,9,75,214,180,208,115,95,15,252,168,198,226,82,121,70,193,9,156,131,92,167,224,241,14,88,11,159,236,140,190,221,182,36,128,182,181,221,105,20,178,229,229,216,185,46,183,238,186,118,238,56,220,58,76,248,91,48,48,60,34,5,66,68,217,46,110,45,250,185,5,138,172,42,4,185,170,144,248,140,86,237,223,213,180,89,139,194,55,204,159,177,30,223,230,228,37,85,62,8,159,133,182,73,37,232,54,230,147,5,144,32,132,175,90,148,48,129,250,210,195,38,179,125,120,186,28,226,111,0,12,151,79,252,136,114,27,122,19,44,223,250,0,22,146,255,5,171,79,32,84,172,158,11,113,231,199,187,135,
+0,148,140,141,62,44,121,133,40,220,175,20,242,235,177,20,39,170,33,180,37,32,54,170,211,165,157,197,34,55,143,49,136,88,143,121,184,144,135,62,67,9,9,62,35,185,89,150,78,138,196,62,17,150,174,160,94,46,58,20,142,85,82,217,166,204,190,53,88,35,28,82,212,147,169,249,201,156,27,63,102,230,93,132,247,73,162,145,235,128,210,84,252,152,130,1,74,9,147,174,75,33,36,136,148,145,66,74,1,178,196,212,123,74,226,45,128,213,9,129,80,197,221,130,235,101,62,74,126,65,233,167,163,167,170,189,18,8,183,254,85,222,8,138,178,196,136,219,44,45,173,44,160,246,128,226,213,168,216,125,206,70,56,163,73,105,98,69,132,88,182,238,124,133,26,62,62,6,221,233,53,172,49,51,143,214,164,67,43,185,231,19,181,142,208,78,92,49,106,189,176,208,181,251,174,218,40,75,106,94,65,213,48,139,122,215,74,163,65,37,200,150,61,187,36,215,8,208,139,239,196,158,32,2,178,48,11,242,73,161,244,110,37,56,144,91,185,207,144,77,83,177,108,208,189,149,
+119,56,197,110,65,155,5,70,33,116,108,238,251,233,26,62,186,69,39,82,35,218,120,174,82,139,73,49,185,162,182,169,142,154,218,104,51,167,197,227,108,77,219,110,150,188,92,103,183,92,15,94,119,132,95,178,93,167,85,235,199,50,191,209,97,142,213,13,109,166,237,21,211,24,95,223,214,245,185,7,97,159,181,147,190,42,170,200,132,217,211,108,22,107,153,33,238,85,59,61,250,137,150,175,157,25,66,199,198,217,216,226,6,92,144,148,162,238,168,152,97,249,212,10,20,101,52,125,96,206,26,172,199,6,118,232,83,180,98,179,157,144,68,42,74,81,81,159,205,138,222,164,204,152,62,138,233,229,118,183,218,88,147,145,140,46,119,24,231,119,96,22,95,244,3,169,237,80,220,103,196,157,119,28,81,87,249,171,106,133,74,187,156,156,242,231,182,105,214,221,142,13,119,84,3,237,19,133,208,115,178,78,114,130,37,41,70,211,242,252,5,170,92,189,134,250,28,8,104,230,152,40,128,199,23,116,145,239,86,71,11,137,244,41,126,42,231,72,109,233,229,80,105,51,100,39,
+81,161,120,9,68,146,227,151,70,35,234,246,92,10,137,130,156,184,103,51,229,89,202,98,59,162,139,79,237,181,45,76,8,173,221,64,85,205,207,217,142,210,232,149,182,163,57,29,14,96,131,182,39,155,27,242,113,186,20,62,39,152,180,173,128,115,64,74,31,190,36,172,28,51,199,211,226,172,148,248,200,128,34,234,78,145,150,149,76,180,66,89,34,172,73,54,206,217,99,167,122,81,74,141,237,0,219,186,144,111,92,12,145,211,146,176,242,115,84,83,54,25,36,43,2,137,22,24,177,191,16,5,221,34,78,75,26,126,31,12,185,216,72,214,77,63,36,41,212,79,229,99,243,174,164,81,105,49,153,236,60,178,74,4,88,18,242,57,12,221,68,219,186,25,236,5,38,153,118,18,69,3,112,59,51,85,109,59,54,14,150,84,145,43,233,77,122,236,219,107,190,60,218,76,142,122,61,244,114,129,236,249,8,61,31,43,3,216,7,230,203,74,46,211,192,21,251,208,88,175,82,251,253,85,225,250,146,174,51,187,130,139,29,101,93,116,134,4,122,220,185,5,216,91,59,105,
+239,152,150,78,109,26,97,44,151,105,243,90,60,81,18,59,242,243,229,193,27,149,221,208,80,149,97,148,71,129,81,109,162,52,48,160,202,128,133,98,77,84,80,106,253,101,209,114,131,72,114,140,189,28,87,155,66,206,48,101,53,176,234,53,171,199,117,212,157,183,2,101,73,25,225,37,115,194,94,233,157,222,90,41,218,142,93,199,158,29,139,182,109,4,121,221,102,19,147,182,168,77,92,79,5,133,221,81,53,221,66,23,66,39,7,203,121,24,224,201,38,199,162,234,175,160,221,101,170,204,139,87,56,151,222,254,220,151,18,26,25,11,42,96,74,196,129,212,120,26,24,247,80,42,157,39,39,47,246,49,196,36,212,240,227,199,225,108,226,107,45,182,93,92,161,148,232,226,163,58,137,61,169,28,65,67,205,19,52,210,72,161,4,64,147,96,211,194,174,7,234,244,219,174,135,227,25,117,39,89,65,140,184,217,74,201,185,14,191,210,119,152,163,129,33,184,208,122,63,172,7,120,118,66,176,47,42,37,99,64,65,69,88,21,98,247,210,36,36,23,245,48,75,44,17,134,
+140,73,205,145,86,189,72,150,21,215,141,254,57,73,171,44,130,233,70,106,62,162,211,177,1,93,78,64,126,6,248,64,95,52,1,132,209,137,228,40,86,5,77,42,41,80,180,168,33,46,191,217,55,211,94,95,148,221,109,48,99,132,96,36,196,170,148,214,167,22,141,85,86,85,54,122,181,109,232,106,167,9,144,192,177,206,82,177,91,207,242,94,92,201,139,136,35,168,72,117,62,42,254,25,85,120,157,82,52,173,71,106,121,6,106,3,199,189,196,69,178,252,98,213,55,38,211,99,178,71,109,46,119,35,115,68,32,174,5,243,175,133,241,46,148,58,11,131,74,36,15,31,164,154,28,196,164,144,161,154,188,203,133,139,144,233,167,214,15,10,107,8,121,128,213,68,70,59,159,189,208,146,112,29,240,69,110,231,94,169,159,251,83,196,73,110,9,110,116,166,22,81,102,238,185,83,97,57,83,217,224,132,68,87,30,203,34,107,201,226,242,175,218,168,237,3,122,78,38,3,24,138,188,36,99,176,131,149,250,130,133,210,41,26,130,179,111,80,247,176,225,65,66,74,60,245,
+3,60,10,50,237,122,147,70,61,153,18,203,198,95,143,227,49,53,95,86,162,211,13,36,0,127,82,164,233,188,86,60,75,44,209,81,233,26,38,150,147,172,70,19,155,224,24,124,220,191,171,90,91,141,6,114,197,120,180,29,204,238,228,210,248,83,219,17,36,6,103,55,147,176,6,167,155,67,189,215,92,154,45,189,110,131,58,66,221,219,241,54,80,109,21,115,172,14,186,137,218,42,85,122,240,184,222,113,153,91,39,21,193,161,30,175,199,70,79,129,173,206,167,136,2,134,102,245,36,139,147,16,162,159,23,173,246,22,254,250,181,144,211,185,34,237,232,75,28,148,138,29,66,173,80,146,3,72,188,178,16,128,204,210,217,64,216,104,241,64,65,1,75,99,40,164,29,95,73,36,39,24,166,64,48,228,183,177,151,121,35,193,60,109,249,92,53,162,104,46,54,99,78,196,17,139,25,25,254,209,204,44,96,114,63,174,182,170,206,29,206,130,54,112,67,239,147,11,209,31,9,159,6,222,65,235,173,69,76,228,196,124,6,91,150,169,91,193,67,76,218,204,51,167,241,124,
+140,94,165,34,214,8,197,4,16,59,33,29,55,163,230,135,14,19,96,166,251,159,17,222,48,96,170,169,6,57,1,239,128,106,26,253,29,222,224,190,143,39,250,228,1,62,174,232,152,42,213,41,217,72,170,173,199,91,128,53,29,144,203,149,13,195,156,117,88,39,121,28,68,103,71,74,207,53,198,89,1,158,124,137,88,245,137,106,254,22,55,165,251,145,222,110,167,80,0,194,106,141,29,189,55,49,105,150,66,114,255,242,19,66,33,113,30,48,139,199,54,144,21,72,235,50,37,231,184,245,67,63,46,88,149,120,110,116,18,143,233,105,230,172,112,143,51,164,81,74,160,133,183,24,0,231,150,205,41,64,87,39,71,3,60,219,35,140,23,54,138,116,58,160,53,234,180,169,60,48,32,15,151,98,58,35,14,231,196,135,211,166,219,174,29,251,38,71,34,24,159,91,252,100,217,162,29,14,92,10,83,196,129,62,80,90,108,190,18,60,185,100,222,19,134,20,34,163,185,80,241,176,56,126,243,127,232,184,225,39,204,58,58,205,186,12,214,217,56,254,51,205,186,149,63,31,
+251,137,177,40,74,3,151,194,32,22,229,144,5,145,59,21,99,171,23,51,66,201,231,255,31,98,77,29,98,61,71,38,231,239,207,128,120,213,10,24,85,107,213,251,115,23,3,49,209,210,34,247,122,239,152,125,157,60,173,36,37,65,20,11,213,17,193,58,234,16,243,168,194,104,166,187,21,58,3,134,188,156,71,148,45,232,220,19,79,100,147,57,242,79,125,117,86,67,254,200,235,60,159,175,236,29,152,201,116,61,209,212,23,111,91,71,103,39,83,245,24,153,16,22,180,146,40,201,186,43,111,234,80,6,41,26,79,25,182,186,161,4,131,221,68,23,96,126,154,157,46,73,148,18,60,95,47,15,39,170,62,91,249,103,143,18,5,169,134,60,102,172,130,53,81,68,151,71,28,177,176,32,206,62,154,243,222,66,209,194,212,44,186,135,162,144,248,148,146,225,232,136,43,96,126,161,235,69,91,239,180,237,158,45,173,45,27,41,89,100,90,62,82,145,218,23,18,230,46,170,30,127,108,176,95,17,53,190,45,132,133,31,99,97,69,16,99,133,140,117,187,160,94,212,127,105,
+90,190,250,43,201,29,79,147,46,173,87,57,46,229,169,50,29,113,42,115,29,140,248,33,174,127,202,105,71,50,10,142,72,108,233,222,38,117,10,72,142,5,130,38,46,246,137,116,120,19,171,115,251,75,12,242,155,228,98,219,23,117,110,2,82,49,188,141,3,115,236,100,199,148,222,75,162,121,51,129,160,175,174,6,130,17,62,247,162,243,240,220,180,68,54,104,196,189,28,146,102,44,221,120,109,209,245,53,10,34,66,57,121,138,131,244,156,98,54,200,84,77,95,220,28,66,151,22,8,255,195,60,11,50,254,188,163,28,73,34,96,168,163,192,206,7,6,11,19,228,66,170,198,184,128,76,158,198,143,50,214,212,81,39,209,69,17,119,171,65,138,110,209,217,200,245,181,11,106,23,136,118,101,170,102,201,132,185,203,197,25,84,63,146,26,211,13,162,174,253,62,3,55,202,178,71,32,5,11,26,120,18,116,157,105,22,138,3,155,45,167,80,46,193,79,54,83,168,208,79,15,28,64,97,48,125,196,113,217,167,64,96,161,37,109,104,214,118,116,180,145,201,90,148,186,126,
+40,217,109,37,118,54,76,233,187,132,98,89,190,234,83,199,111,85,68,209,246,66,103,50,186,31,200,194,52,222,17,5,241,72,93,129,109,129,219,18,37,47,22,104,157,135,29,23,185,17,59,10,185,3,190,62,2,185,127,215,102,13,60,25,37,59,114,47,103,5,67,204,197,115,128,45,173,247,1,208,97,189,58,242,244,75,159,22,228,0,224,186,113,203,246,218,142,205,235,254,161,74,237,99,120,25,150,222,31,156,164,33,195,205,215,205,153,91,165,62,93,26,90,206,82,201,184,196,86,154,94,178,95,119,129,22,189,238,223,138,89,161,110,175,240,177,64,142,89,155,44,252,224,61,14,209,115,113,249,19,222,22,1,164,35,147,208,17,22,193,209,58,216,53,230,116,22,37,220,137,33,206,103,143,151,151,194,202,243,31,163,236,217,24,181,76,158,168,43,64,144,246,242,102,12,253,254,173,14,155,212,43,225,218,165,86,204,9,32,3,87,59,77,146,89,200,168,102,159,209,204,231,85,19,8,79,152,126,86,200,30,181,86,207,71,249,37,182,213,207,215,216,219,171,79,188,
+16,217,119,242,172,137,102,115,186,200,71,116,170,5,250,5,68,138,199,241,221,120,153,155,199,138,81,94,129,69,109,85,62,20,69,14,237,78,60,146,7,88,132,227,57,44,106,32,80,237,199,233,251,212,100,244,164,237,21,231,177,91,29,2,200,222,213,102,20,152,65,117,111,200,206,154,182,75,7,118,106,253,226,150,38,113,104,235,211,17,6,17,113,44,211,164,38,197,64,219,174,70,244,59,180,130,86,88,112,210,157,21,116,101,72,51,98,80,144,184,127,37,158,205,158,213,110,127,138,57,89,59,79,187,170,169,118,94,60,148,202,48,120,235,80,212,172,212,23,205,47,129,18,151,250,96,150,170,100,37,190,0,170,229,65,62,103,211,206,165,18,60,203,129,188,1,227,62,159,219,92,157,121,86,128,66,234,23,53,161,137,85,224,97,131,219,249,22,25,141,248,134,158,132,90,158,141,88,194,62,125,82,12,22,121,192,81,233,134,6,252,10,88,184,229,103,144,242,98,164,40,111,228,82,181,3,113,79,134,152,32,185,115,184,66,183,37,69,197,46,203,143,110,31,194,5,
+101,135,220,18,238,78,90,176,139,85,40,56,254,134,248,124,137,121,99,61,8,88,78,81,176,156,36,225,223,192,208,218,249,127,155,164,36,60,83,100,188,220,115,167,196,161,188,14,228,57,114,55,135,246,152,103,2,186,148,134,168,161,39,153,42,101,171,254,47,9,219,7,117,
+
diff --git a/uppsrc/CtrlLib/src.tpp/LabelBase$en-us.tpp b/uppsrc/CtrlLib/src.tpp/LabelBase$en-us.tpp
new file mode 100644
index 000000000..fc4487cc6
--- /dev/null
+++ b/uppsrc/CtrlLib/src.tpp/LabelBase$en-us.tpp
@@ -0,0 +1,17 @@
+TITLE("LabelBase - basic label routines")
+COMPRESSED
+120,156,237,27,107,115,219,184,241,175,96,114,47,201,39,41,36,37,89,138,61,157,185,196,121,121,146,179,83,219,185,233,140,107,155,16,5,89,108,40,82,37,64,63,174,238,253,246,238,2,36,8,74,36,37,249,113,185,246,154,15,22,73,0,187,139,125,97,31,200,169,67,190,253,214,106,89,223,88,43,254,237,188,102,19,154,4,226,236,212,239,245,134,187,212,233,239,126,249,112,248,98,119,235,167,198,118,175,137,80,108,128,210,29,216,221,97,191,107,247,156,109,248,99,119,109,167,239,116,123,246,208,121,209,27,118,187,67,107,199,11,40,231,103,167,129,51,28,238,226,34,7,22,57,131,190,99,15,122,195,222,208,238,14,134,14,172,117,44,203,177,6,78,223,238,117,135,78,127,103,204,184,119,118,74,135,221,221,173,163,109,88,212,69,76,0,220,178,183,157,222,160,231,88,93,203,233,1,42,123,56,236,217,131,254,176,251,98,123,123,199,163,115,225,71,97,138,203,183,109,199,222,29,217,131,93,160,249,183,223,126,235,216,61,75,81,208,3,96,182,213,3,82,109,248,102,
+245,156,129,221,127,97,189,232,15,237,161,213,5,224,253,129,213,223,153,211,152,206,170,183,222,95,185,245,129,181,227,11,6,32,182,126,180,237,1,44,217,110,109,127,99,247,6,176,209,97,183,215,31,14,44,64,238,56,78,183,235,216,93,231,197,11,167,191,221,31,236,76,25,29,179,248,236,244,95,23,255,254,238,205,65,251,243,49,57,229,221,93,242,145,142,88,64,226,40,17,126,200,248,247,103,167,220,74,63,190,162,156,117,166,196,139,66,65,253,144,147,73,18,122,200,5,78,104,56,38,220,159,205,3,70,166,44,152,179,152,72,81,48,78,18,206,198,68,68,68,14,206,88,40,200,158,136,3,78,174,125,49,37,130,221,136,22,12,209,75,166,96,80,207,99,1,139,169,136,98,242,133,221,242,78,138,254,29,11,225,107,16,220,182,200,36,138,103,84,144,104,34,87,43,248,163,219,156,64,50,161,158,31,248,194,7,144,62,39,12,240,0,57,41,113,51,208,49,223,109,7,176,51,2,40,78,207,69,52,247,61,119,199,125,238,62,63,242,189,233,9,128,116,159,243,216,
+27,71,158,251,252,175,39,111,221,111,89,232,182,19,126,78,224,229,108,71,145,227,219,125,107,247,208,217,37,251,19,50,241,99,46,136,55,5,17,122,2,16,101,116,1,106,247,7,247,239,182,251,67,75,127,0,16,164,193,5,141,129,179,151,138,3,33,14,233,213,205,206,106,4,0,231,224,240,100,25,120,201,14,229,144,68,131,179,67,247,7,197,45,202,137,28,230,12,21,15,88,157,113,121,63,36,163,8,102,123,192,70,222,194,69,223,195,26,224,19,46,31,193,35,141,153,6,129,162,226,220,109,131,152,200,36,160,151,188,131,212,166,107,248,52,74,2,144,11,208,48,101,4,208,104,129,129,184,5,16,9,91,130,65,176,60,58,87,224,220,103,176,240,123,247,89,135,156,76,97,55,169,148,179,39,144,60,9,233,12,166,186,207,142,103,0,78,10,234,89,70,248,65,36,24,161,1,143,0,29,172,250,236,254,232,254,72,194,108,225,216,231,34,246,71,137,96,5,170,225,37,17,17,96,241,61,156,214,33,159,226,232,202,31,163,104,204,189,1,9,98,154,160,34,39,18,
+90,18,134,12,71,105,124,155,162,239,18,252,237,239,126,32,167,223,89,86,219,178,206,65,161,118,142,1,103,120,121,78,212,239,89,58,68,46,178,167,159,44,242,154,189,156,205,245,72,67,143,52,172,142,213,113,250,253,38,154,26,23,37,107,141,25,160,24,249,4,119,75,79,233,18,174,191,55,207,144,66,208,39,201,219,212,180,83,238,3,27,130,128,68,158,151,196,49,11,97,103,40,169,84,140,134,214,133,132,71,73,236,129,214,200,253,164,106,149,10,45,251,8,118,78,175,34,127,12,204,194,87,144,116,137,162,72,174,245,118,51,102,109,237,73,82,219,119,251,225,60,17,41,36,61,103,235,57,57,98,34,137,67,114,69,131,132,193,180,55,169,206,24,19,51,17,88,187,59,200,249,119,76,104,29,57,246,127,101,110,3,191,190,142,233,53,208,218,146,44,149,59,115,183,220,22,142,188,5,127,182,147,145,67,112,133,102,244,22,89,4,150,139,75,1,204,167,194,54,174,245,104,75,137,238,2,241,24,82,193,73,104,5,198,60,196,94,0,50,129,15,134,68,255,114,113,
+44,198,56,169,209,212,98,84,44,225,210,184,102,126,8,14,52,0,251,255,149,161,232,52,181,210,30,51,239,144,186,5,52,248,203,152,206,167,210,23,41,123,188,246,199,32,74,195,111,33,84,253,17,30,24,240,43,95,136,130,7,5,34,227,72,90,74,120,171,156,201,40,102,244,11,39,13,61,145,75,111,161,236,88,128,188,224,9,180,104,2,212,138,20,124,179,76,19,174,65,196,200,217,178,49,201,185,246,157,222,225,162,178,24,83,37,19,219,119,200,55,137,57,140,192,141,103,123,174,209,174,227,37,46,174,80,176,247,204,191,156,138,58,21,243,67,81,166,103,190,41,118,178,12,242,225,138,198,141,73,254,130,146,121,55,143,168,130,83,73,48,178,237,210,191,98,97,206,60,201,122,245,77,74,188,35,213,174,86,69,4,122,40,53,121,67,237,224,107,170,6,108,189,125,119,196,254,153,248,49,224,172,68,117,95,13,122,175,153,81,171,67,184,139,252,36,43,168,143,84,152,252,207,42,135,133,14,215,208,164,2,224,74,37,90,208,33,83,61,96,232,166,122,232,182,122,
+168,160,83,165,90,185,194,251,213,106,94,139,236,69,65,20,155,147,253,240,75,113,238,171,128,122,95,150,232,82,7,16,28,63,133,201,198,4,107,249,160,252,4,1,174,224,134,38,195,209,6,129,219,37,19,164,74,255,234,116,243,166,5,140,107,223,125,138,184,143,1,243,3,212,114,209,7,110,164,186,181,171,144,155,237,59,185,89,15,57,189,193,210,156,195,237,187,151,198,113,239,182,179,240,53,130,224,130,207,163,80,134,87,121,88,113,237,67,236,49,194,8,17,216,45,183,13,167,78,18,66,90,130,135,74,109,124,53,186,21,236,156,224,223,210,216,234,205,141,64,28,138,154,15,134,236,159,48,204,106,145,51,147,194,138,8,176,104,133,1,230,45,203,250,119,236,81,112,174,190,17,18,73,113,24,177,212,70,97,148,49,71,33,108,223,29,38,194,0,14,146,146,188,55,131,181,152,205,162,43,54,174,241,117,47,23,200,41,145,149,193,195,81,20,5,165,178,218,139,102,112,38,176,26,89,173,150,120,153,153,47,200,99,124,29,197,227,115,34,127,74,33,152,107,181,36,
+82,226,178,56,22,39,161,51,80,57,6,187,194,140,22,63,73,150,96,184,27,67,118,0,39,158,76,74,63,224,128,31,11,200,28,200,140,65,220,52,222,192,122,202,166,170,73,165,184,107,196,116,18,3,105,254,68,189,67,44,72,133,55,125,136,109,237,77,163,136,215,137,235,65,166,197,55,21,27,102,164,107,91,16,79,124,65,71,144,40,63,130,41,73,196,237,187,87,190,112,219,156,201,51,159,6,16,7,143,111,211,44,217,72,54,59,68,78,155,81,254,5,231,241,57,243,252,137,239,45,166,154,99,6,17,178,82,158,66,113,2,139,38,123,81,204,100,113,66,189,102,165,9,247,27,228,146,252,2,191,90,42,136,174,129,34,116,155,231,68,141,22,6,207,84,137,102,81,47,107,141,28,107,1,22,106,82,24,149,50,18,56,12,206,59,203,202,11,63,90,209,64,127,150,117,0,120,156,120,34,87,142,237,94,51,23,177,60,113,101,125,39,147,173,153,205,170,165,9,4,146,144,163,78,192,229,147,127,96,117,1,82,89,58,231,73,64,49,235,191,196,242,17,48,91,250,
+62,117,216,160,62,100,137,176,44,26,68,88,39,186,246,57,36,39,178,118,49,165,87,240,72,209,216,35,72,159,188,169,140,91,129,91,44,230,85,1,157,36,178,248,210,112,155,58,84,219,50,118,162,109,70,43,108,90,2,85,22,131,123,138,226,142,254,152,154,46,198,203,227,200,75,176,144,6,90,2,59,134,200,57,171,109,96,33,51,246,101,93,146,47,154,247,50,137,152,113,200,228,24,131,204,166,68,186,99,72,164,112,144,193,188,115,37,20,51,5,94,16,19,8,54,133,89,156,160,189,2,198,101,85,107,33,176,185,17,121,0,153,14,67,152,182,127,112,226,94,252,252,242,111,205,92,29,148,75,41,201,67,178,20,88,137,121,68,209,6,163,144,168,202,6,24,114,106,162,154,99,29,45,24,141,63,51,76,150,38,215,244,198,159,37,179,98,142,108,234,55,42,244,3,153,38,67,205,10,150,157,103,98,75,33,225,99,113,106,69,76,175,6,115,79,90,244,195,11,68,72,44,71,204,19,41,22,124,172,195,18,87,98,49,143,248,20,201,149,207,125,112,19,224,37,192,
+65,160,68,65,183,89,149,52,211,176,27,89,175,132,8,26,174,242,71,56,86,5,13,47,3,182,105,232,29,203,176,186,102,113,129,192,162,191,227,70,33,83,102,172,170,84,72,166,144,226,5,152,230,129,130,53,116,184,58,110,214,120,209,99,83,55,23,173,243,191,67,133,106,205,247,230,126,203,110,239,183,108,209,83,172,189,174,26,223,31,80,117,49,107,132,76,26,126,60,51,123,76,187,45,74,159,106,129,255,17,84,187,236,184,47,225,181,102,234,60,225,211,140,167,170,21,149,19,154,165,137,178,95,128,19,217,216,125,70,26,51,134,161,158,28,4,58,38,210,207,195,177,62,247,111,176,145,37,203,49,200,178,113,116,29,54,243,35,21,123,11,52,224,75,89,230,198,20,79,224,64,230,107,145,44,83,44,21,146,202,69,72,188,100,54,25,97,246,160,101,41,35,65,80,10,16,117,140,17,149,98,237,83,208,62,246,57,6,113,227,181,200,79,39,35,213,116,50,1,98,211,90,49,4,73,211,232,218,236,227,201,82,50,6,43,233,250,150,70,68,80,88,184,236,86,142,
+131,234,221,54,171,119,33,157,151,180,44,227,120,210,239,149,42,132,19,144,153,133,182,135,254,74,178,23,140,179,217,212,71,122,181,213,138,172,114,158,191,202,54,226,108,46,192,22,51,171,203,246,71,85,204,14,49,225,76,134,237,212,64,211,73,163,161,198,170,253,237,35,223,210,189,201,231,170,125,5,254,236,82,11,138,77,132,226,248,10,232,178,106,150,66,151,207,149,208,101,213,39,79,123,177,4,132,86,141,136,102,81,24,121,211,88,117,203,82,180,228,32,9,2,162,108,79,70,208,200,68,57,132,76,145,192,214,82,207,106,135,77,2,62,247,116,62,55,167,30,3,121,137,107,6,62,53,208,219,215,250,38,165,134,52,181,114,42,230,1,44,2,177,8,181,128,141,47,165,248,62,214,123,42,179,122,147,30,191,133,18,206,34,153,178,38,151,169,26,106,198,106,103,120,158,213,113,83,4,111,163,106,46,200,114,94,10,94,214,244,178,158,186,242,120,203,133,233,71,80,6,44,6,22,52,225,254,56,215,86,239,216,80,239,35,233,21,31,85,191,227,114,253,46,170,118,
+108,224,253,29,20,60,174,84,112,196,101,16,179,166,150,231,171,50,79,181,66,213,215,35,147,194,33,21,102,116,190,143,98,255,87,188,2,18,168,239,152,139,118,200,30,120,117,56,47,94,126,220,127,119,224,94,124,124,243,246,164,149,189,28,237,191,123,127,130,165,131,244,125,239,205,193,201,155,163,135,210,116,85,32,234,23,22,203,62,126,53,73,39,135,159,52,69,175,14,79,78,14,127,126,116,146,242,66,94,74,213,114,125,116,147,162,72,122,155,169,28,151,190,239,82,86,19,81,149,157,66,9,4,178,97,80,111,93,1,72,203,38,184,155,72,118,224,242,122,14,26,121,0,71,58,37,113,20,72,29,194,76,58,133,9,111,239,62,239,19,166,238,242,44,149,25,242,166,84,90,245,76,127,203,234,126,216,183,42,45,47,74,2,63,207,199,212,40,63,54,138,87,24,138,69,85,105,142,16,189,130,13,64,172,59,37,194,159,65,84,50,101,161,108,79,23,82,126,172,54,134,16,165,212,150,63,53,111,207,13,54,103,148,152,217,146,69,142,153,192,147,184,224,215,54,169,
+131,26,30,178,232,28,17,207,104,54,183,243,12,165,92,7,11,233,13,122,19,253,125,101,143,11,104,79,243,149,98,44,177,144,68,32,21,88,12,173,26,71,164,144,4,60,194,241,188,236,179,202,19,14,119,75,164,119,132,80,156,126,184,120,15,228,97,242,92,10,47,55,150,103,30,176,46,199,170,136,111,30,23,101,160,39,161,237,129,199,82,161,127,26,154,202,107,19,92,48,58,206,75,91,162,162,15,55,199,98,135,134,246,181,24,88,108,60,63,74,79,192,172,19,154,208,23,116,57,141,189,116,52,95,211,64,61,169,239,226,63,45,135,204,104,111,161,82,35,99,194,66,56,88,176,240,66,127,188,184,123,28,194,221,151,95,84,48,56,96,180,135,191,26,7,246,141,214,125,145,1,42,158,43,134,114,228,66,70,91,203,158,203,203,162,184,194,166,73,105,127,93,2,108,223,237,233,184,237,107,236,91,198,181,79,118,90,56,191,199,105,17,47,132,230,203,199,133,243,103,58,46,94,202,48,180,78,152,85,252,167,133,149,69,70,79,203,130,236,178,222,177,132,209,190,59,
+12,37,43,54,140,117,191,6,191,126,121,26,134,93,45,39,0,255,19,236,122,26,95,97,48,117,100,92,65,126,74,247,65,103,242,122,132,25,48,55,0,119,11,225,44,87,200,150,26,34,117,117,125,217,120,44,168,85,218,3,41,173,213,151,75,113,47,109,18,86,26,222,195,168,251,229,145,200,171,80,243,213,189,164,77,139,168,138,236,138,89,247,161,92,131,90,183,249,181,118,253,77,145,106,70,157,247,167,114,33,190,94,77,230,122,53,60,69,226,242,132,251,144,56,137,214,22,250,186,181,49,69,158,17,147,221,159,58,161,239,15,214,255,239,8,108,109,22,186,154,203,13,205,133,139,18,5,199,38,27,154,133,94,102,85,27,179,220,169,213,57,77,149,185,45,38,109,6,236,184,30,118,197,61,183,110,222,108,49,221,166,236,227,108,6,71,182,200,30,8,67,53,173,30,8,228,138,22,47,224,202,254,232,66,67,84,55,67,49,118,124,234,94,190,230,48,192,80,143,149,255,229,68,50,17,178,101,248,169,156,163,152,132,169,18,252,86,206,66,46,64,192,11,121,39,108,
+191,85,248,63,108,121,35,205,232,171,222,183,149,250,135,50,160,170,168,224,230,126,203,202,46,109,174,177,204,187,39,58,111,5,190,255,155,240,83,153,240,194,157,134,63,175,53,63,194,93,59,105,223,37,23,238,54,56,182,203,72,36,103,255,1,210,108,70,215,
+
diff --git a/uppsrc/CtrlLib/src.tpp/LineEdit$en-us.tpp b/uppsrc/CtrlLib/src.tpp/LineEdit$en-us.tpp
new file mode 100644
index 000000000..139d03d7f
--- /dev/null
+++ b/uppsrc/CtrlLib/src.tpp/LineEdit$en-us.tpp
@@ -0,0 +1,15 @@
+TITLE("LineEdit")
+COMPRESSED
+120,156,205,91,141,114,219,54,18,126,21,140,219,203,72,169,170,138,148,100,201,114,219,233,212,73,83,95,147,54,19,39,215,233,104,100,139,34,33,9,19,138,96,73,202,138,115,119,125,246,219,93,0,36,40,137,38,29,103,230,218,78,19,138,196,254,125,88,236,46,22,232,212,101,95,126,217,235,244,190,232,213,252,51,121,198,151,222,54,204,102,83,49,24,140,207,61,119,120,254,254,151,223,206,206,159,254,208,58,29,180,145,139,3,92,250,35,167,63,30,246,157,129,123,10,127,56,125,199,29,186,253,129,51,118,207,6,227,126,127,220,155,248,161,151,166,179,105,232,142,199,231,72,228,118,220,47,220,209,208,117,70,131,241,96,236,244,71,99,23,104,221,94,207,237,141,220,161,51,232,143,221,225,36,224,169,63,155,122,227,254,249,211,55,167,64,212,71,73,192,188,231,156,186,131,209,192,237,245,123,238,0,68,57,227,241,192,25,13,199,253,179,211,211,137,239,197,153,144,145,150,37,28,199,117,206,23,206,232,28,116,254,235,175,191,186,206,160,167,52,24,0,51,167,55,0,
+85,29,120,215,27,184,35,103,120,214,59,27,142,157,113,175,15,204,135,163,222,112,18,123,137,183,169,54,125,88,107,250,168,55,17,25,7,22,79,191,114,156,17,144,156,118,78,191,112,6,35,48,116,220,31,12,199,163,30,8,119,93,183,223,119,157,190,123,118,230,14,79,135,163,201,154,123,1,79,102,211,127,223,252,151,77,83,231,252,151,201,28,254,125,41,34,254,60,16,25,62,19,158,147,107,124,124,203,63,100,23,89,18,94,179,233,245,245,15,173,94,183,215,117,135,195,54,211,144,95,95,179,27,252,243,135,30,51,12,212,203,137,122,93,16,196,219,69,40,124,77,97,184,62,153,77,83,247,156,225,95,206,121,232,186,131,35,202,252,44,86,235,16,254,163,31,105,150,108,253,108,194,166,22,103,245,110,118,51,181,148,152,79,10,186,25,40,51,61,212,228,102,74,6,190,146,183,220,91,132,252,154,153,167,217,183,200,169,32,255,30,213,27,54,82,47,246,98,158,76,128,90,241,190,144,161,76,174,105,66,25,61,207,166,234,199,205,140,70,54,103,44,162,247,141,216,
+194,184,230,76,151,50,202,10,174,63,193,47,205,20,31,11,158,56,172,57,83,127,109,1,176,243,215,158,209,148,158,11,174,48,14,153,246,20,83,102,61,11,231,12,124,226,237,90,164,122,106,183,9,103,1,95,130,68,120,115,23,101,222,7,182,54,34,69,180,98,113,34,1,204,76,192,103,185,100,41,188,10,57,67,105,158,159,241,132,249,60,12,187,236,138,35,147,212,79,4,173,96,28,105,27,101,249,71,115,91,81,172,151,201,100,254,29,252,219,242,101,148,102,213,227,159,204,219,52,98,98,137,90,72,25,230,136,160,215,217,28,13,86,173,25,209,21,227,174,43,133,104,168,11,223,213,68,243,39,200,190,207,214,230,69,251,70,49,85,11,208,130,125,250,143,231,191,126,253,238,138,61,255,115,235,133,34,187,99,190,220,64,156,18,169,140,186,51,53,73,204,250,107,120,31,68,248,114,222,18,81,54,239,224,251,127,113,31,45,251,182,26,162,239,1,164,14,142,111,147,11,41,85,111,69,146,129,46,108,102,175,225,91,41,130,194,151,74,18,115,212,236,241,194,118,104,
+68,34,132,145,230,77,135,105,76,149,134,26,68,245,195,140,249,246,83,96,255,254,0,247,14,187,95,173,88,166,249,20,177,217,124,10,174,157,129,30,60,152,207,116,172,52,19,68,235,99,195,179,181,12,152,239,69,108,193,25,196,175,36,17,65,192,35,150,73,230,5,193,209,213,2,159,178,53,207,35,101,151,93,102,12,88,249,94,24,242,128,201,200,231,108,41,19,198,61,127,77,40,177,216,3,53,233,19,17,194,18,226,60,234,130,33,79,115,28,181,78,200,7,135,16,153,136,2,254,129,181,150,34,73,51,253,38,101,189,118,71,19,174,11,170,132,199,9,79,121,148,165,123,171,54,5,38,57,195,115,200,57,2,6,129,71,6,160,197,90,110,195,0,199,71,43,14,99,128,183,151,36,222,29,89,238,175,5,191,229,68,105,155,110,68,19,200,123,42,43,109,33,40,20,26,44,19,185,161,111,11,190,18,81,132,216,193,247,12,82,87,247,208,6,17,137,76,0,132,184,96,0,115,17,65,44,2,147,55,18,98,87,26,123,190,29,144,50,80,218,200,245,229,22,76,178,
+229,238,25,173,76,11,96,166,32,106,193,50,176,16,82,179,190,77,97,110,192,234,148,103,68,230,197,49,135,33,56,143,168,46,188,1,112,73,4,77,130,183,84,42,0,127,15,94,231,236,186,236,15,185,101,94,152,42,207,33,197,45,157,180,215,236,219,221,101,186,130,99,98,19,135,124,3,243,227,81,120,5,165,249,38,206,238,74,65,227,88,180,248,149,239,174,252,68,134,225,107,153,206,91,15,93,249,54,181,89,248,53,11,231,66,57,250,110,13,203,36,37,218,133,151,176,21,7,239,139,248,14,157,131,160,126,188,101,47,120,134,137,244,74,124,228,104,216,65,240,87,1,5,63,235,248,129,143,179,82,58,176,88,228,217,160,28,186,115,179,222,112,200,147,145,114,170,20,198,227,132,99,230,222,91,82,172,101,84,100,252,67,12,8,65,16,145,145,84,46,186,10,239,226,117,202,230,95,51,98,179,19,65,182,46,175,9,12,20,40,220,139,178,118,19,0,94,208,172,82,10,160,184,126,0,2,188,221,183,24,105,138,220,87,30,0,1,39,178,98,233,254,71,63,60,158,
+224,14,80,154,159,172,18,47,94,11,136,122,243,147,124,206,209,86,29,214,162,98,105,171,101,19,5,250,19,202,48,159,124,25,110,55,224,42,20,140,51,239,61,199,197,75,17,72,173,107,47,130,128,228,45,182,33,230,244,242,18,207,242,53,222,4,199,87,18,150,185,90,33,240,226,181,108,12,166,33,44,0,85,110,71,44,180,223,209,243,94,30,170,193,241,133,14,54,248,159,92,46,49,246,148,252,36,14,193,159,2,230,101,38,228,22,17,163,129,181,23,4,107,81,62,84,173,157,123,141,32,243,11,78,213,30,101,231,220,250,181,149,123,131,154,123,202,149,20,200,115,219,11,163,237,60,163,93,2,179,8,146,148,60,35,237,50,165,40,174,175,15,144,213,55,11,224,3,128,66,228,134,8,132,52,100,94,39,207,163,141,162,79,97,252,167,120,78,137,250,161,238,243,32,72,243,229,135,192,172,196,45,4,102,13,46,226,76,38,31,2,10,241,89,194,114,51,43,141,166,161,192,179,1,58,151,152,241,63,135,143,229,140,62,187,139,29,41,74,172,218,32,119,61,5,89,
+37,68,145,204,62,7,76,159,226,67,54,241,223,214,133,30,129,143,170,61,222,197,84,184,176,131,50,133,90,18,102,204,172,213,222,51,64,125,81,6,96,89,105,182,174,164,238,54,110,40,253,153,220,69,245,242,113,212,3,53,8,128,164,137,135,224,207,43,218,20,188,129,122,226,254,213,132,35,244,156,227,227,193,90,42,243,186,167,10,176,150,91,117,138,82,134,121,139,20,92,33,51,59,23,8,170,62,212,47,104,230,145,188,111,111,103,106,141,127,43,227,139,109,146,194,166,246,30,252,243,65,13,224,135,210,129,50,103,177,198,119,2,74,48,159,232,49,238,171,221,148,14,2,183,130,239,106,117,188,128,194,149,39,245,106,218,227,30,173,169,167,170,3,159,120,154,109,72,35,117,177,9,247,46,86,62,77,101,35,182,72,170,181,46,134,207,90,251,27,235,27,116,148,104,214,41,145,34,59,245,37,229,240,48,255,238,102,9,123,30,190,111,47,242,213,27,52,101,145,114,143,189,170,48,133,85,138,241,108,239,147,192,157,196,10,118,11,183,188,205,128,150,22,18,187,52,
+62,134,130,75,219,207,100,203,59,248,150,170,113,171,72,92,240,108,135,14,11,229,118,66,69,0,198,50,30,5,248,168,213,202,119,43,77,112,125,201,151,176,60,235,1,197,113,101,56,239,67,173,74,218,27,106,233,52,16,71,3,31,47,15,163,112,19,103,121,188,36,229,157,245,178,14,221,242,83,164,189,246,86,13,109,83,35,63,143,196,166,54,154,177,143,151,250,179,220,240,38,18,113,220,227,165,61,143,130,38,194,96,216,227,101,225,105,199,143,216,67,106,34,49,31,252,121,228,54,180,83,15,109,46,19,66,205,215,255,57,136,146,144,152,210,152,251,98,41,96,243,23,8,204,180,152,94,91,56,103,223,0,127,230,37,86,59,237,27,136,101,166,47,213,238,230,177,247,255,27,40,47,163,148,39,217,5,48,87,213,110,176,147,73,160,186,23,71,115,145,1,169,199,10,74,128,241,58,167,189,102,244,151,2,242,61,191,219,75,72,121,166,162,2,148,80,198,95,78,101,222,242,189,8,27,189,187,68,100,188,58,129,41,101,82,102,154,22,84,221,230,104,90,216,169,239,
+168,87,177,85,205,14,80,43,38,165,36,254,112,118,242,111,108,131,109,218,150,151,82,99,114,113,135,125,74,96,8,59,90,172,49,181,126,40,183,109,55,50,107,167,231,25,204,126,198,245,244,84,186,116,49,234,176,148,81,223,210,242,134,253,161,94,242,163,231,191,167,158,217,125,90,228,131,14,149,184,220,107,170,225,30,164,84,219,97,145,213,97,129,214,85,100,228,210,27,90,111,90,87,108,47,231,5,236,2,68,53,196,78,109,121,235,176,163,253,108,37,118,222,97,201,215,18,75,84,83,219,66,125,161,40,188,51,71,1,185,77,245,93,195,139,109,86,167,162,30,114,164,76,133,93,91,161,30,212,168,126,40,226,133,244,146,64,181,108,60,172,97,11,3,155,236,110,74,205,233,79,238,17,228,92,30,210,198,5,239,192,246,183,106,82,55,247,77,16,135,89,217,244,157,39,118,163,89,245,152,111,180,86,102,216,33,144,182,26,48,193,9,158,187,96,253,174,90,203,48,159,123,7,53,245,123,213,50,146,69,27,161,114,219,106,131,214,178,113,214,16,223,168,62,229,129,
+11,152,109,223,30,108,152,104,208,130,14,227,221,85,215,156,103,220,122,225,22,60,117,129,39,54,144,178,32,76,217,147,213,4,106,124,188,223,59,108,2,61,90,251,138,254,117,224,45,123,239,155,248,10,199,142,126,110,171,181,224,208,210,133,58,3,130,181,17,176,208,163,195,158,231,165,241,120,200,155,136,180,8,46,184,90,138,195,17,51,174,209,52,231,128,28,61,15,55,95,159,220,59,243,6,128,82,57,66,252,204,181,141,99,160,218,183,63,12,135,249,147,27,211,77,170,244,148,50,118,182,51,96,192,192,108,85,204,9,101,194,98,63,142,177,206,218,141,235,211,53,5,54,157,56,210,91,188,201,64,96,2,215,20,29,15,50,142,138,149,150,12,229,117,151,81,38,213,38,252,1,88,95,45,62,7,218,87,139,191,37,222,239,162,80,188,231,150,158,29,64,93,227,153,82,65,25,243,100,41,147,141,58,6,93,241,172,168,70,205,42,111,210,121,216,199,191,190,167,86,140,61,12,160,175,149,78,41,219,136,72,108,138,40,174,53,44,213,204,182,150,108,126,242,74,81,
+204,79,216,134,123,180,188,209,93,108,175,155,159,44,56,112,231,48,196,16,30,241,52,96,139,5,131,161,211,82,138,243,248,14,203,83,246,252,132,28,119,126,210,209,47,144,48,48,36,116,80,220,244,164,234,2,102,36,83,177,253,49,9,179,96,83,23,5,161,196,173,171,40,66,126,127,185,72,3,142,84,19,198,97,41,142,54,59,244,253,13,234,223,223,177,254,125,5,229,111,221,206,171,52,184,106,239,37,169,200,199,234,186,114,179,119,153,238,137,109,114,213,104,143,168,14,230,203,168,172,46,213,247,224,46,81,188,205,236,253,68,194,139,190,32,94,133,192,202,65,0,59,238,209,94,111,193,113,125,11,170,254,27,148,251,111,248,18,130,233,26,43,249,84,163,217,154,63,157,183,169,57,200,124,120,168,4,215,38,61,134,45,240,161,72,5,73,81,248,144,20,103,237,195,14,162,223,222,247,137,11,42,33,245,89,66,78,154,251,34,29,237,133,225,222,109,142,82,5,133,169,149,46,31,192,74,75,76,6,135,217,133,31,164,48,36,225,86,234,175,121,176,13,225,17,25,
+2,164,120,5,7,128,107,31,92,107,83,151,119,96,235,180,220,134,74,122,112,139,119,63,2,117,77,6,67,173,4,37,90,84,244,104,9,180,45,198,123,131,52,33,192,142,142,173,217,219,53,191,124,246,92,147,212,215,233,111,189,133,42,49,77,25,87,202,19,69,114,80,41,161,199,244,248,202,62,109,245,234,203,15,208,177,248,108,18,131,114,213,154,157,82,25,205,26,150,91,102,54,31,168,215,143,50,9,120,162,78,85,173,91,113,116,129,179,9,126,54,125,5,136,48,169,216,54,176,46,137,234,251,161,234,43,5,146,43,122,243,19,76,122,235,192,185,139,110,129,213,120,209,175,172,23,245,117,9,94,90,81,85,62,61,53,176,78,19,153,74,159,46,163,170,123,168,164,251,178,218,61,240,146,75,151,149,174,0,82,71,161,8,68,120,110,34,241,244,124,45,119,28,98,88,167,116,73,102,239,126,12,12,14,96,123,152,108,76,77,146,211,179,22,84,123,92,165,227,139,127,254,194,68,192,229,42,241,54,170,8,201,118,242,224,246,218,14,134,180,187,100,134,185,176,182,
+224,197,125,155,160,91,220,71,121,138,98,138,59,71,36,15,228,94,200,109,34,120,210,114,78,27,93,183,209,184,87,165,221,202,43,190,214,93,163,135,108,58,8,250,218,11,94,242,103,153,124,188,50,155,9,43,39,214,184,196,30,97,85,126,92,148,243,99,57,101,209,228,81,39,106,13,5,249,71,188,154,23,90,27,27,58,169,1,143,192,217,217,217,87,190,240,38,241,178,190,100,4,42,8,30,105,115,155,12,69,101,163,53,107,146,237,11,185,205,18,125,46,181,62,199,23,128,129,243,98,165,26,136,20,214,209,93,106,29,139,171,190,207,18,115,18,211,215,168,210,7,99,247,59,240,200,91,61,77,225,179,136,170,221,161,18,184,95,101,185,183,84,235,127,149,125,166,99,64,169,230,146,38,81,25,190,104,121,66,134,197,255,223,97,254,213,31,120,32,168,30,95,150,49,43,26,59,179,255,1,53,61,134,19,
diff --git a/uppsrc/CtrlLib/src.tpp/MenuBar$en-us.tpp b/uppsrc/CtrlLib/src.tpp/MenuBar$en-us.tpp
new file mode 100644
index 000000000..c855e88c4
--- /dev/null
+++ b/uppsrc/CtrlLib/src.tpp/MenuBar$en-us.tpp
@@ -0,0 +1,15 @@
+TITLE("MenuBar")
+COMPRESSED
+120,156,205,89,249,83,19,89,30,255,87,186,202,25,11,92,164,210,157,206,1,204,78,57,235,56,238,212,236,236,78,141,107,237,15,22,12,33,105,164,107,66,58,149,3,199,217,218,169,96,12,225,12,18,8,3,18,8,32,167,92,10,2,137,136,28,1,2,200,33,81,144,1,185,140,225,144,0,29,57,228,102,95,39,33,4,133,97,152,113,203,5,170,211,116,127,223,231,125,63,223,243,189,151,75,8,244,209,71,52,31,218,9,218,17,63,254,159,99,161,28,41,95,18,120,9,71,81,118,0,7,97,4,124,255,213,63,252,2,78,157,241,98,162,222,20,10,12,80,232,44,152,206,102,208,97,20,97,130,11,76,135,17,6,66,71,97,54,226,135,178,233,116,54,205,159,203,231,136,197,129,151,248,8,155,29,64,13,66,124,144,19,8,139,129,192,44,148,141,178,97,58,139,141,128,177,8,141,134,208,88,8,3,70,233,108,132,225,207,195,196,220,192,75,28,54,61,224,212,183,76,48,136,78,205,4,192,105,48,19,65,89,40,66,163,211,16,20,76,5,179,217,40,204,98,176,
+233,126,76,166,63,151,35,148,224,132,192,53,23,14,195,8,28,16,2,179,2,128,206,63,253,244,147,47,140,210,156,26,160,0,12,166,161,64,85,24,60,163,161,8,11,102,248,209,252,24,108,152,77,163,3,112,6,139,198,240,23,114,68,156,240,195,169,51,142,164,206,162,249,227,18,12,64,156,250,19,12,179,192,16,166,15,243,4,140,178,0,81,54,29,101,176,89,52,48,57,130,32,116,58,2,211,17,63,63,132,193,100,176,252,195,48,14,15,19,1,10,40,204,116,40,203,242,97,157,96,48,24,40,144,71,81,6,139,141,34,116,224,27,148,142,2,83,160,176,31,3,245,99,32,254,2,76,44,193,120,193,167,157,102,115,210,119,43,78,233,77,33,177,125,216,39,152,40,211,15,6,214,71,253,88,40,205,143,9,179,232,148,241,96,96,118,38,29,69,252,24,110,36,151,215,254,253,221,127,62,62,247,247,211,23,47,64,151,196,112,192,87,254,193,224,247,107,76,32,253,11,71,68,221,58,164,252,131,168,91,240,228,172,68,196,15,130,46,125,76,163,157,166,209,130,130,
+206,120,209,124,105,190,8,131,225,13,185,208,118,223,64,223,237,221,159,161,65,46,64,207,247,254,158,18,123,56,66,105,8,31,231,30,4,4,185,230,15,60,25,120,73,140,4,64,174,143,51,103,240,112,206,101,204,31,112,60,201,68,233,215,228,10,217,148,76,38,147,167,239,128,171,108,53,81,59,151,217,59,155,220,180,157,98,170,93,30,35,117,91,228,237,209,210,193,184,250,246,53,205,194,181,230,166,7,243,171,201,175,242,21,49,115,237,125,183,215,201,220,188,37,121,138,220,212,55,155,84,250,160,76,221,34,83,167,166,12,199,190,200,87,172,220,24,90,43,55,230,206,218,54,135,198,58,182,211,222,168,55,27,178,30,52,87,166,103,174,45,148,63,220,24,77,123,249,106,101,253,126,166,94,117,43,110,56,185,207,218,179,148,95,181,24,111,105,184,127,255,150,109,178,118,94,215,173,178,53,87,111,245,79,78,109,215,70,106,98,173,153,145,170,71,111,106,215,75,42,27,26,30,26,55,179,19,244,131,233,228,157,74,195,248,184,181,177,169,83,59,175,127,113,47,62,
+65,253,172,168,207,222,162,110,110,203,168,207,175,54,43,242,227,135,71,175,43,55,122,126,206,24,28,184,185,113,61,53,173,125,181,60,201,58,161,182,220,74,108,209,146,215,107,155,181,243,145,201,6,178,72,83,186,150,91,93,163,155,169,121,185,180,62,80,57,220,208,20,155,146,91,183,165,222,210,103,200,75,173,154,251,121,201,134,169,138,222,106,99,82,210,188,198,212,50,151,117,235,229,214,235,249,170,222,151,89,186,157,137,235,175,19,111,27,239,181,213,63,120,181,146,18,103,156,72,139,223,209,174,117,37,149,146,157,50,101,150,173,93,191,148,160,126,164,48,238,60,126,179,147,160,150,119,218,13,198,68,125,202,112,180,254,193,189,214,114,107,91,84,219,141,164,222,188,231,181,69,115,250,250,201,197,173,178,62,211,211,138,25,115,157,110,172,215,218,186,54,27,213,63,165,154,144,205,201,83,149,234,74,75,156,204,146,235,96,188,113,167,50,71,213,150,49,181,121,71,93,53,17,157,51,158,165,126,242,80,95,153,147,17,77,222,232,212,173,40,76,185,203,113,209,93,
+53,227,227,42,202,42,106,173,41,219,100,42,44,44,220,218,110,216,177,217,108,155,155,90,153,126,218,222,50,19,169,92,47,83,77,86,25,170,171,179,243,27,181,58,93,220,245,156,226,104,147,57,190,67,94,95,107,152,36,187,183,6,200,98,123,190,126,224,217,179,151,138,164,72,227,211,178,216,40,178,101,104,33,183,171,171,203,94,80,179,105,182,44,78,25,90,244,106,109,73,201,98,73,66,155,113,124,122,185,124,29,76,211,111,25,127,110,109,51,189,158,40,154,239,239,32,135,102,171,135,234,109,163,133,77,57,47,239,219,179,38,75,238,117,254,66,230,21,204,228,78,61,106,77,207,218,84,155,38,75,135,114,203,199,238,119,26,170,140,91,186,103,171,45,173,169,202,187,218,212,65,117,82,179,54,181,204,172,170,173,82,140,220,50,69,79,148,116,215,212,244,15,90,236,182,52,147,86,149,62,209,251,230,121,146,106,184,251,197,141,198,122,133,169,164,255,69,108,195,74,218,226,216,64,113,193,82,106,250,195,213,188,148,153,95,230,21,109,145,150,229,107,183,98,95,140,
+180,27,21,83,147,237,170,129,40,109,82,105,60,48,95,161,106,190,40,239,101,111,102,219,88,106,93,246,13,115,165,92,223,51,109,141,145,111,86,13,202,174,15,171,180,143,211,170,163,162,26,52,114,101,114,164,76,89,18,73,253,141,83,31,213,100,241,142,54,89,38,215,200,228,207,52,205,227,143,107,34,127,158,24,92,180,215,218,84,73,119,87,181,241,166,152,250,116,115,221,82,122,179,142,180,214,229,205,233,211,100,198,213,10,115,149,209,220,26,109,172,140,121,62,152,30,175,104,37,31,62,30,186,89,81,105,136,189,219,173,143,127,82,166,155,153,94,48,244,232,11,134,200,62,210,54,171,44,211,229,52,198,153,186,70,74,109,51,79,204,153,170,174,177,130,193,188,58,219,84,164,49,85,179,153,31,163,207,30,169,75,76,169,109,182,144,207,51,212,109,77,164,62,118,165,114,172,191,109,185,53,179,169,115,165,168,173,68,251,243,96,155,178,219,54,150,185,48,159,144,24,167,153,110,48,107,31,198,230,26,50,12,197,50,149,197,82,240,248,73,213,120,251,226,182,252,
+90,81,158,76,174,212,144,9,229,128,147,204,73,175,164,115,237,69,246,152,193,208,52,145,42,87,166,180,53,54,213,116,130,184,1,127,195,206,143,132,244,165,172,145,241,108,13,105,189,163,142,213,148,40,58,202,85,150,196,170,245,12,245,160,73,251,68,209,161,218,169,42,206,122,93,4,4,91,175,235,227,51,54,180,253,143,109,55,83,226,149,246,39,245,170,205,236,133,178,155,205,145,125,169,37,91,137,26,82,38,83,234,238,62,175,235,204,211,190,177,165,108,207,145,211,182,216,254,158,222,28,178,49,63,166,164,111,171,67,109,55,152,150,238,43,22,74,31,15,22,23,15,24,187,115,114,147,182,147,227,205,29,250,149,233,157,108,89,108,181,77,38,83,13,1,117,13,55,201,198,246,174,104,139,253,169,213,248,160,32,113,102,84,190,97,40,187,89,90,81,177,90,81,90,218,213,219,27,215,99,177,47,220,221,144,199,12,91,102,229,49,242,194,196,231,186,30,217,200,195,229,170,148,130,142,150,252,230,174,23,141,247,162,70,31,61,106,176,204,222,154,232,55,42,251,171,
+91,135,231,214,154,150,99,85,27,242,173,17,107,242,178,121,202,172,150,21,141,90,147,159,86,140,149,118,203,234,245,183,119,10,203,59,10,201,245,161,161,245,244,140,165,158,168,234,68,187,109,165,238,181,101,90,171,209,42,149,101,61,125,137,21,99,111,70,183,182,173,75,43,139,198,39,118,242,141,101,99,50,239,151,170,66,123,226,80,106,113,228,240,205,84,77,82,123,92,83,243,211,132,219,219,13,186,7,139,3,99,77,246,13,50,35,219,108,28,25,214,244,63,34,211,83,108,27,91,175,202,76,133,10,107,82,227,78,164,49,75,22,221,186,191,78,255,51,12,23,59,187,4,36,20,17,17,56,104,100,144,36,12,131,194,65,107,128,194,112,76,196,17,113,195,174,250,66,95,74,32,46,71,0,133,96,144,84,140,241,32,12,7,66,34,136,35,134,190,0,221,26,131,8,199,189,8,187,44,229,115,68,16,213,15,32,47,92,0,144,56,212,56,49,6,225,18,240,86,40,194,196,152,64,2,102,32,132,193,167,249,88,4,198,119,76,228,237,67,1,0,108,33,245,92,42,
+164,176,248,4,151,227,124,11,121,125,67,8,47,10,41,145,115,63,96,92,169,4,243,246,165,180,167,57,73,48,222,237,142,231,49,201,5,9,239,175,24,126,57,76,18,236,69,61,249,130,16,72,130,189,253,119,123,36,36,150,112,36,56,23,218,109,98,30,157,14,23,72,220,173,205,221,228,64,175,244,196,116,11,120,185,59,226,238,36,65,16,117,61,0,129,14,133,238,123,17,252,231,239,0,30,37,236,229,237,29,232,246,6,6,133,57,166,128,136,208,183,173,4,44,143,11,46,59,188,227,66,57,181,139,122,132,61,206,242,9,49,70,253,15,140,177,103,4,15,210,17,4,206,59,144,181,123,228,30,101,183,178,95,16,34,46,70,5,15,225,208,139,35,184,10,17,66,76,0,137,165,33,193,167,41,133,197,71,168,117,1,115,121,231,44,135,207,15,225,112,191,135,131,63,113,173,104,130,79,6,127,122,76,85,1,218,33,126,113,195,7,65,238,91,183,232,39,142,217,62,245,116,84,184,39,95,55,93,128,239,76,13,15,183,120,248,193,49,200,23,186,8,98,61,20,68,
+234,219,190,11,225,136,196,16,33,224,95,61,194,38,223,16,226,247,105,20,10,238,61,89,37,100,111,161,184,103,148,207,169,156,230,114,192,202,21,10,62,13,241,8,72,64,72,168,10,225,235,81,101,14,100,9,18,218,69,19,212,138,224,83,193,62,206,199,32,251,156,183,23,240,31,177,99,115,5,160,135,145,117,172,144,29,235,212,189,12,60,229,193,142,184,34,192,246,248,249,64,251,70,59,244,10,130,28,31,7,166,182,240,176,145,20,141,32,136,186,30,56,78,252,227,190,130,112,212,80,47,143,161,180,3,166,220,247,120,175,170,124,227,172,170,30,133,29,84,101,143,208,21,66,129,142,90,189,175,174,56,13,2,69,224,216,21,136,35,194,56,190,158,47,129,222,16,238,196,19,3,5,169,98,69,225,250,64,120,40,244,35,38,34,124,32,1,134,241,64,80,56,222,82,29,134,8,23,130,194,205,243,117,236,57,118,91,9,15,11,197,5,64,42,228,42,144,17,75,169,42,130,11,120,56,232,66,82,80,251,63,227,241,0,170,36,140,224,137,129,48,72,42,12,140,227,
+243,41,41,135,171,143,204,36,119,140,57,227,234,253,69,211,49,226,97,175,124,80,109,18,244,53,7,174,23,232,38,159,113,37,120,4,246,47,64,152,184,226,5,58,160,240,168,174,182,75,232,15,241,120,71,31,144,191,17,56,33,21,187,76,237,3,93,1,173,29,132,132,24,147,128,34,230,112,49,87,42,18,129,182,13,133,3,49,170,71,139,113,106,183,127,132,182,174,86,125,88,146,31,143,132,11,236,67,39,247,251,205,40,208,49,121,144,16,19,129,200,14,119,33,17,60,16,247,124,130,16,58,122,8,46,57,142,141,223,191,93,255,72,152,187,144,15,10,116,79,59,5,30,21,244,123,20,255,32,179,15,31,248,135,52,244,3,147,226,87,22,168,31,36,73,142,187,88,0,123,9,238,255,54,225,66,56,212,62,132,16,236,11,39,106,214,99,185,231,195,186,228,3,27,245,208,76,112,110,52,222,73,93,74,214,17,37,239,193,196,255,183,118,253,173,214,249,93,181,225,75,241,185,112,161,228,234,97,213,44,132,32,248,7,242,117,141,59,160,154,125,139,73,164,34,1,
+200,11,145,20,163,86,95,174,201,160,48,160,185,128,128,168,131,240,163,182,97,103,249,24,184,57,254,206,16,243,216,16,120,42,20,78,68,128,109,33,48,188,115,118,40,84,68,132,239,234,117,132,42,127,195,66,37,231,57,96,145,179,63,245,130,60,196,130,222,62,181,134,130,79,122,234,229,130,56,96,205,124,212,30,159,14,113,127,120,55,12,190,198,5,120,184,52,220,185,146,165,206,47,68,17,206,186,67,85,34,62,152,12,188,225,185,87,192,187,148,169,238,205,37,128,95,192,50,64,136,255,128,241,197,190,144,235,91,29,40,130,195,151,58,22,197,48,211,215,237,191,224,83,146,48,252,55,108,152,29,7,25,7,29,105,28,199,70,46,156,223,121,140,241,43,91,99,234,48,130,106,158,187,199,68,128,253,174,227,221,244,1,113,144,241,2,30,71,196,131,206,95,252,210,49,230,152,118,56,239,182,131,55,101,100,137,191,135,111,223,97,226,248,230,104,31,29,231,147,183,14,119,222,21,240,242,222,251,146,195,49,205,59,57,183,203,248,109,174,46,237,3,255,11,87,217,
+138,255,
diff --git a/uppsrc/CtrlLib/src.tpp/Option$en-us.tpp b/uppsrc/CtrlLib/src.tpp/Option$en-us.tpp
new file mode 100644
index 000000000..0fc852d84
--- /dev/null
+++ b/uppsrc/CtrlLib/src.tpp/Option$en-us.tpp
@@ -0,0 +1,9 @@
+TITLE("Option")
+COMPRESSED
+120,156,205,87,249,79,84,87,20,254,87,110,234,146,25,10,227,91,103,30,51,49,193,170,109,26,19,109,74,151,31,38,163,115,153,185,48,47,62,222,155,188,247,6,99,23,51,50,168,145,86,187,138,198,165,85,22,101,17,92,10,90,182,162,182,17,181,110,32,180,138,162,213,128,181,90,163,49,160,66,106,236,121,219,128,136,181,214,154,8,201,60,230,206,61,231,251,206,119,238,249,230,18,100,208,212,169,84,38,53,133,122,202,143,127,14,201,199,9,73,15,5,69,142,19,2,152,225,3,139,231,45,200,14,100,228,184,188,156,219,200,66,67,22,214,71,179,2,207,210,28,227,133,23,154,165,25,158,97,57,90,96,178,57,129,101,5,202,31,145,176,166,133,130,18,35,8,1,35,136,129,32,198,199,51,180,143,19,56,129,102,125,2,3,177,12,69,49,148,143,225,105,142,21,24,222,31,37,90,36,20,196,2,27,200,120,219,11,65,172,129,4,201,41,218,203,112,62,142,161,88,138,225,0,138,22,4,142,246,241,2,155,237,245,250,35,56,174,139,138,108,99,137,52,205,208,
+129,60,218,23,0,206,203,150,45,243,208,28,101,49,224,32,25,77,113,64,149,134,53,138,99,124,52,159,77,101,243,2,45,80,44,36,231,125,20,239,143,99,21,23,62,185,116,254,169,165,251,40,191,168,19,72,145,241,42,77,251,32,196,155,233,157,66,115,62,40,84,96,57,94,240,81,0,206,48,12,203,50,52,203,100,103,51,188,151,247,249,99,4,71,137,26,10,126,184,232,227,105,115,231,103,189,155,139,130,26,27,64,11,204,202,166,135,130,26,31,152,151,67,161,224,52,138,202,162,168,28,23,229,161,60,12,207,187,145,45,179,179,14,52,209,34,231,173,29,30,50,226,153,0,50,30,84,0,229,228,136,133,184,128,248,125,52,51,29,200,39,83,119,146,235,146,201,100,234,198,67,120,77,222,223,191,249,230,134,155,165,169,3,119,63,93,217,126,230,86,227,239,53,103,207,52,252,88,94,188,243,118,249,149,47,206,29,235,254,246,236,154,213,235,54,29,31,184,82,124,182,245,235,47,47,14,252,208,220,51,240,205,87,127,221,110,219,85,242,221,207,131,119,154,215,222,
+59,253,199,208,229,174,142,206,229,35,23,139,175,92,186,182,237,102,201,173,198,237,127,244,237,235,124,208,124,126,247,167,39,135,171,86,247,44,223,113,188,162,231,96,93,103,107,67,219,232,72,106,116,180,248,104,231,249,254,171,169,61,201,149,201,27,45,215,46,238,184,62,124,174,170,122,127,217,72,223,72,217,250,174,229,253,15,187,183,30,174,57,86,118,100,253,161,85,149,63,13,151,108,238,220,209,119,96,221,253,239,139,219,127,59,242,121,241,214,210,174,223,71,246,157,25,108,255,229,224,218,138,186,59,87,247,213,31,106,73,118,143,12,180,182,12,54,214,116,28,223,82,85,122,117,69,109,101,117,87,85,211,238,27,149,231,107,246,214,183,15,14,141,150,14,108,109,27,221,176,165,175,173,178,184,241,122,71,221,233,170,181,187,15,244,84,30,188,156,58,117,169,113,176,248,66,211,233,19,253,155,187,170,106,207,84,15,86,149,86,54,108,170,60,212,52,216,247,75,247,186,21,29,229,203,79,157,252,100,227,23,181,85,107,202,75,246,212,93,170,62,214,52,188,161,172,
+162,183,255,147,147,189,3,219,106,106,238,246,255,122,111,111,123,79,235,143,163,171,238,158,108,236,173,111,190,254,217,129,182,189,13,21,27,79,244,126,115,111,77,203,181,238,251,37,67,247,74,247,117,164,142,212,15,183,28,43,235,174,45,173,216,118,240,104,125,243,224,229,234,84,223,159,199,207,213,38,135,54,14,109,111,237,221,123,238,198,181,129,7,195,23,30,38,203,26,215,31,222,245,231,157,230,11,13,169,95,203,55,213,85,238,188,240,104,51,223,23,163,5,68,71,113,85,41,18,163,162,92,128,244,24,65,26,145,72,196,232,60,82,242,17,131,20,21,97,73,39,170,140,117,177,136,72,75,17,139,52,29,235,68,67,46,93,77,144,76,148,143,37,13,30,243,19,146,228,246,160,247,176,148,32,70,164,117,122,144,168,33,34,66,90,21,81,153,136,206,52,210,25,59,61,232,253,24,145,1,75,215,13,92,43,74,87,236,168,76,128,80,141,245,240,43,116,248,21,35,135,40,3,133,184,74,116,18,69,88,67,6,178,69,3,50,154,217,101,69,14,103,25,153,237,80,
+205,216,102,82,243,160,57,36,78,100,179,62,32,180,36,70,204,128,49,126,162,140,230,43,186,25,91,168,68,237,82,38,1,53,179,57,5,88,232,30,68,25,27,177,180,4,47,157,124,191,157,77,78,20,230,1,40,78,171,97,174,186,198,227,186,141,212,22,6,172,63,242,73,186,72,51,139,230,40,224,177,219,104,63,130,51,160,82,21,154,20,69,249,170,82,24,114,230,29,189,149,208,32,58,100,109,99,237,237,254,48,252,90,34,140,251,203,21,118,251,157,184,12,199,1,156,60,46,183,99,6,111,202,162,46,98,73,252,0,142,129,35,164,12,237,179,89,103,34,38,156,101,10,100,43,106,149,85,100,118,25,203,81,67,60,57,138,85,144,41,30,39,224,153,114,196,41,198,162,7,126,53,137,91,21,41,98,52,77,38,237,83,96,108,185,68,31,35,25,122,60,16,184,77,18,199,162,188,244,106,186,50,72,149,46,9,10,50,7,34,78,34,98,190,72,162,86,207,145,203,56,201,206,57,112,155,188,185,64,90,180,217,102,222,172,143,114,205,243,49,161,168,113,156,28,228,
+113,220,38,24,48,20,246,6,153,240,161,203,61,230,207,17,69,214,244,144,3,159,49,3,189,77,244,132,42,91,50,3,131,217,9,85,37,178,110,179,78,143,228,211,57,89,80,74,156,168,88,87,212,49,192,199,168,62,11,27,40,197,229,126,142,30,59,116,194,51,255,183,86,227,66,98,140,18,180,220,149,247,108,125,116,118,45,28,27,157,133,19,167,37,60,125,60,253,215,36,28,89,60,23,236,246,31,217,231,41,138,244,20,250,139,194,51,23,25,195,159,46,99,22,152,117,145,105,200,69,162,150,192,210,184,153,66,90,66,212,113,158,68,80,62,28,215,56,80,48,76,208,62,221,166,23,194,101,3,229,1,179,2,85,73,192,92,186,114,103,43,146,162,190,133,65,108,112,29,73,92,76,12,123,148,68,77,207,52,164,82,226,113,69,131,65,128,201,136,90,247,60,164,18,112,60,13,206,25,54,179,78,138,40,234,6,90,20,28,67,41,112,48,94,199,17,242,68,209,77,127,7,16,108,215,230,121,242,185,10,103,232,49,176,96,3,46,18,195,162,12,120,207,223,173,220,
+37,162,30,137,189,105,220,116,94,124,191,38,40,168,199,48,124,37,67,37,96,68,134,253,216,237,2,70,49,243,189,197,109,162,115,190,132,34,190,19,83,9,49,199,231,5,106,168,27,32,227,191,108,60,104,150,164,141,21,173,161,71,191,75,95,86,177,108,142,255,77,41,89,254,55,82,141,151,1,133,179,172,43,136,117,243,130,255,2,196,2,217,26,108,251,188,185,138,68,108,88,227,28,172,99,247,147,110,67,147,169,9,100,94,6,57,31,19,116,82,69,158,77,147,199,85,48,239,178,255,165,54,20,250,27,107,85,77,91,
diff --git a/uppsrc/CtrlLib/src.tpp/OptionTree$en-us.tpp b/uppsrc/CtrlLib/src.tpp/OptionTree$en-us.tpp
new file mode 100644
index 000000000..b84d99a3f
--- /dev/null
+++ b/uppsrc/CtrlLib/src.tpp/OptionTree$en-us.tpp
@@ -0,0 +1,13 @@
+TITLE("OptionTree")
+COMPRESSED
+120,156,229,87,249,79,91,87,22,254,87,158,148,54,10,25,138,222,234,141,95,50,202,140,70,163,74,237,168,157,209,252,128,160,56,248,37,88,37,128,108,39,173,102,52,17,9,134,64,19,112,12,132,221,56,96,192,193,16,8,91,128,96,108,72,76,204,254,72,204,190,216,9,94,48,139,227,4,12,198,27,158,251,108,48,164,73,155,46,154,105,59,3,210,91,238,185,231,187,223,249,206,245,185,239,196,161,208,7,31,192,209,240,9,248,61,127,156,63,144,231,185,151,82,68,241,113,124,28,103,197,114,81,34,246,203,143,63,101,199,158,62,115,138,129,71,209,40,8,64,193,152,8,198,34,48,4,71,25,224,130,96,8,74,160,24,142,176,80,54,206,194,48,22,204,73,74,225,10,133,241,113,41,40,139,21,75,59,161,209,232,9,148,73,160,8,19,103,225,44,4,99,178,80,224,139,194,48,10,51,81,2,193,49,22,74,112,120,164,48,41,62,142,203,194,98,79,127,198,0,78,24,189,18,0,135,17,6,138,51,113,20,198,96,20,7,75,33,44,22,142,48,9,22,198,102,
+48,56,73,220,116,17,63,45,245,96,45,62,130,160,72,236,57,132,25,11,56,95,185,114,37,6,193,225,48,3,28,128,33,48,14,168,34,96,12,198,81,38,66,176,97,54,193,66,88,48,6,192,9,38,76,112,210,185,2,238,197,239,14,157,120,111,232,76,152,195,23,145,0,226,244,239,16,132,9,92,24,209,140,19,8,206,4,129,178,48,156,96,49,97,176,56,138,162,24,134,34,24,202,102,163,4,131,96,114,146,73,46,143,20,128,16,112,132,17,34,203,140,102,158,32,8,2,7,243,113,156,96,178,112,20,3,185,193,49,28,72,129,35,108,2,103,19,40,39,149,20,138,72,94,226,71,97,217,194,225,71,136,211,188,105,36,86,52,235,4,3,103,176,17,160,62,206,102,226,48,155,129,48,49,90,60,4,200,206,192,112,148,77,68,144,14,178,246,207,47,254,245,225,31,63,249,232,111,159,67,113,66,44,22,250,52,36,240,95,5,36,121,50,62,78,136,196,126,124,230,20,28,3,199,160,4,17,5,157,57,195,191,200,189,64,114,64,128,39,17,64,49,39,243,85,198,
+157,140,140,140,107,207,131,224,154,177,167,172,116,200,94,172,47,222,247,150,102,111,43,43,107,75,158,206,245,100,247,14,190,188,47,150,247,82,57,138,162,145,254,220,234,162,145,50,243,102,171,188,190,169,94,188,51,223,88,108,153,45,110,234,147,44,123,158,54,54,56,212,183,231,172,195,78,241,237,26,241,248,173,219,19,171,84,107,139,111,65,57,47,47,20,7,53,15,28,235,122,157,117,43,224,233,121,237,247,251,183,180,91,91,94,185,222,60,208,40,175,121,216,170,126,110,112,86,168,77,78,159,215,181,68,57,215,50,55,199,10,76,212,168,206,80,162,12,154,59,37,148,111,38,111,110,103,123,120,107,77,85,103,175,49,140,250,125,62,5,101,223,94,217,55,55,120,213,251,198,150,133,197,2,74,34,147,72,158,174,54,141,239,86,184,55,139,39,140,237,189,170,60,183,58,48,222,101,17,207,104,124,174,138,169,193,42,233,93,185,73,27,232,44,106,49,212,44,175,101,183,27,166,149,206,150,6,221,84,123,221,202,88,179,67,221,81,39,117,244,238,90,95,106,12,53,
+148,169,176,134,210,46,120,115,182,116,141,138,87,70,101,123,123,94,112,245,118,115,189,81,185,86,146,171,81,7,41,241,198,106,211,228,235,162,246,198,158,26,106,104,57,179,92,222,181,56,238,90,243,172,214,216,188,18,207,244,188,51,96,115,110,46,117,42,247,92,101,11,211,129,192,74,107,181,211,246,112,32,56,53,219,221,92,188,96,49,153,114,75,125,82,95,247,118,157,91,92,43,238,203,45,8,218,187,186,125,183,52,55,42,55,64,100,193,224,162,196,53,239,106,90,119,116,175,247,150,153,221,133,250,167,207,164,213,157,170,25,107,125,173,248,86,198,174,93,215,118,103,82,89,236,213,21,40,118,135,253,181,5,218,89,107,79,135,113,85,211,54,242,224,89,203,92,11,53,161,223,206,94,223,87,122,198,134,38,245,235,227,166,169,154,225,201,213,39,154,182,122,74,43,125,93,20,176,89,20,230,105,111,209,232,13,171,98,89,102,14,142,213,249,124,70,139,166,192,232,8,234,124,179,75,165,146,155,43,134,233,219,67,250,135,171,107,15,44,133,3,54,133,98,210,166,
+121,181,181,212,189,175,127,228,89,170,107,114,229,102,105,90,157,181,222,218,224,125,87,110,29,120,126,30,104,11,174,100,185,123,246,52,109,21,211,212,192,150,180,155,42,12,72,236,133,179,27,211,247,250,42,119,151,22,220,254,92,231,146,178,161,248,73,125,95,239,216,242,112,198,171,157,137,86,121,243,3,249,211,189,182,154,204,13,125,83,166,183,40,219,100,235,122,32,247,236,232,246,186,197,129,170,229,250,110,213,164,118,185,183,71,91,244,90,101,83,100,231,91,164,170,107,154,193,178,242,246,169,13,240,174,42,41,51,169,110,82,139,14,155,243,165,166,121,172,212,111,177,15,247,211,97,45,106,54,228,166,114,171,63,191,172,79,242,202,159,159,181,61,250,104,206,94,120,35,176,82,189,68,133,121,207,222,215,138,235,158,41,103,27,50,117,5,230,194,206,170,33,157,179,205,57,57,191,177,63,224,87,155,93,158,142,60,203,118,135,90,97,238,187,55,212,228,156,108,203,163,94,216,100,170,64,95,206,238,108,189,99,220,178,94,178,109,201,127,188,238,189,101,54,216,239,
+238,88,179,3,249,134,230,125,85,209,206,13,155,183,174,171,124,188,177,222,153,179,177,185,219,223,31,240,150,184,60,99,70,169,209,113,181,36,199,73,41,239,93,111,85,25,70,218,203,20,77,215,239,12,151,203,95,247,13,169,70,27,204,227,205,215,115,51,181,50,211,243,61,217,246,224,181,48,207,134,60,199,118,71,176,36,176,242,162,154,106,218,9,236,206,154,180,170,151,237,237,254,218,160,152,218,115,142,90,173,119,20,247,130,114,201,75,195,98,101,238,55,99,242,205,49,191,126,65,113,151,154,206,109,84,168,253,98,205,224,248,234,237,10,73,135,175,181,113,108,69,83,82,222,93,33,117,151,142,171,253,181,86,143,233,217,250,14,141,243,196,235,155,159,215,60,11,152,247,141,224,214,23,28,8,189,249,167,236,224,182,172,212,59,139,199,29,218,78,64,197,2,52,163,37,11,0,205,104,201,118,30,82,54,89,99,209,132,183,119,106,200,60,46,219,238,202,159,41,154,145,183,152,203,140,82,155,92,157,233,91,155,232,207,47,119,223,156,159,218,47,30,233,157,219,87,
+25,172,187,237,10,103,233,204,188,242,222,11,99,107,150,205,43,235,124,110,188,154,101,238,112,23,100,107,90,39,149,51,96,243,62,146,207,217,175,21,142,218,61,186,181,39,210,81,197,136,193,238,169,148,168,250,164,59,154,34,111,101,149,190,34,115,67,118,183,204,173,206,247,186,122,156,55,247,170,244,247,53,55,250,60,18,243,156,252,170,169,234,197,245,96,149,94,149,85,229,214,87,219,13,43,149,59,147,234,252,204,128,215,178,218,38,253,70,83,231,29,85,212,143,60,126,221,91,60,209,178,245,34,20,70,150,141,94,20,172,105,120,180,95,80,108,147,45,22,15,220,211,230,172,202,214,165,55,171,149,235,129,193,59,131,206,185,101,7,213,63,99,49,233,108,50,133,207,165,233,154,206,86,63,110,30,25,185,251,42,119,161,198,28,152,26,124,98,108,45,167,130,165,171,65,131,213,38,219,21,107,21,190,165,229,160,52,79,238,214,185,229,15,159,203,71,189,55,106,213,143,213,154,153,146,205,251,251,143,170,148,119,251,215,228,165,54,217,173,185,238,125,165,248,214,35,
+75,78,53,184,182,121,114,174,107,180,42,215,219,245,248,96,132,147,8,254,143,234,54,253,22,170,237,156,4,250,145,30,58,43,18,164,36,64,113,31,194,240,71,48,156,144,112,12,226,224,16,56,180,64,95,28,61,159,129,143,29,6,199,167,112,142,79,58,130,74,191,116,46,133,159,244,46,44,232,144,67,60,205,24,141,133,62,79,39,147,248,220,20,254,63,72,94,196,6,9,200,116,1,41,36,83,69,252,212,11,16,23,18,129,113,40,237,60,148,22,226,32,140,129,254,194,21,0,35,148,154,198,35,15,6,33,161,136,43,186,36,132,248,66,8,11,61,147,209,223,66,73,73,129,146,146,249,41,60,136,62,167,133,0,238,124,244,27,3,23,249,95,3,10,220,84,222,219,83,83,99,14,194,15,51,1,246,180,175,132,16,249,181,136,20,164,114,83,14,109,95,241,121,23,72,145,16,18,165,65,231,72,232,146,144,70,19,134,56,2,8,1,148,46,72,187,204,167,159,249,169,239,246,227,159,7,147,223,66,5,1,9,105,137,206,243,73,94,12,173,25,28,27,74,54,241,
+206,100,255,61,153,76,13,143,112,64,206,14,245,167,45,103,1,235,115,220,164,47,19,66,31,53,208,225,235,97,94,194,163,71,105,58,2,138,36,42,237,98,68,236,100,16,88,82,50,55,245,194,15,225,244,57,41,250,44,45,77,148,120,42,9,228,78,68,143,252,153,254,116,72,60,153,24,125,52,153,126,11,217,105,92,65,226,233,196,40,14,20,161,22,217,87,151,211,248,188,8,197,8,89,16,233,193,26,17,219,169,248,183,157,67,240,111,123,39,68,24,37,64,161,91,100,74,226,201,163,37,48,136,127,241,66,196,18,13,189,225,29,14,33,225,32,101,223,225,15,164,123,135,255,251,249,29,159,1,164,57,154,144,120,250,24,186,8,236,155,136,41,42,254,7,100,227,63,175,253,143,210,230,184,241,215,32,207,219,155,245,183,184,61,127,97,253,254,235,106,253,228,104,232,2,23,42,222,201,36,36,0,139,135,74,255,251,107,219,239,121,188,196,83,160,160,31,236,142,159,85,220,0,204,59,229,0,107,124,175,20,239,246,195,160,244,208,33,121,76,227,31,179,45,254,207,
+170,226,81,30,127,197,89,251,13,171,250,83,170,233,255,208,239,225,151,86,254,183,163,243,207,41,224,128,176,16,124,192,135,75,55,244,222,218,253,39,82,20,214,40,42,196,133,115,108,233,67,232,99,33,126,235,3,25,232,3,252,223,52,70,68,250,62,63,176,69,120,111,218,162,142,190,186,195,162,28,132,243,25,41,186,36,72,13,31,73,135,77,14,41,10,53,51,231,65,63,65,15,211,145,130,254,65,148,12,64,99,34,14,72,52,4,211,29,199,39,151,64,35,19,234,42,64,155,196,63,232,112,222,127,166,157,77,33,193,102,57,245,35,15,237,144,215,209,126,137,58,138,226,98,218,101,208,245,208,77,85,168,157,58,36,16,255,111,169,144,223,126,
+
diff --git a/uppsrc/CtrlLib/src.tpp/Progress$en-us.tpp b/uppsrc/CtrlLib/src.tpp/Progress$en-us.tpp
new file mode 100644
index 000000000..5aca9729c
--- /dev/null
+++ b/uppsrc/CtrlLib/src.tpp/Progress$en-us.tpp
@@ -0,0 +1,31 @@
+TITLE("Progress")
+COMPRESSED
+120,156,213,122,249,83,226,89,150,239,191,66,76,207,244,171,170,151,83,225,150,149,89,89,243,58,186,163,95,79,191,142,233,232,233,168,174,137,249,161,162,170,210,202,164,43,141,177,52,67,205,170,233,247,98,58,16,68,84,4,113,67,100,17,101,7,81,217,65,145,77,20,1,149,69,22,101,23,69,80,118,81,144,157,247,69,115,49,171,178,58,43,115,58,38,222,211,136,239,23,238,189,231,220,243,57,231,220,115,206,229,222,79,155,64,127,251,183,13,183,26,126,210,240,154,191,123,255,19,252,199,214,39,237,61,159,125,218,214,210,114,247,163,214,166,219,31,253,219,63,253,243,135,31,189,247,243,119,62,104,121,23,96,210,8,48,105,190,211,216,124,247,118,115,99,75,211,7,192,163,177,185,177,233,118,83,115,75,227,221,166,15,91,238,54,55,223,109,184,247,160,189,181,187,251,179,79,219,155,238,222,253,168,62,115,211,173,166,159,52,221,185,221,212,120,167,229,110,203,221,198,230,59,119,155,0,218,166,134,134,166,134,59,77,183,27,91,154,239,54,221,190,247,16,220,253,
+224,179,79,91,239,54,127,244,222,199,31,0,68,205,245,153,0,230,13,141,31,52,181,220,105,105,106,104,110,104,106,1,166,106,188,123,183,165,241,206,237,187,205,31,126,240,193,189,7,173,143,123,218,58,59,158,206,213,214,216,216,212,248,209,151,141,119,62,2,68,254,243,159,255,252,126,99,75,195,181,4,45,0,179,198,134,22,64,212,70,160,173,161,165,233,78,227,237,15,27,62,188,125,183,241,110,67,51,192,252,246,157,134,219,247,30,183,118,181,126,253,106,228,117,30,183,95,11,253,78,195,189,182,30,48,192,226,189,255,222,216,120,7,32,249,224,214,7,63,105,108,185,3,0,189,219,220,114,251,238,157,6,96,242,166,166,166,230,230,166,198,230,166,15,63,108,186,253,193,237,59,247,30,129,91,31,130,187,62,251,244,255,124,241,31,127,247,171,223,253,253,191,252,1,244,105,119,243,71,160,223,119,117,126,213,5,238,238,254,233,103,159,118,55,126,244,79,247,238,3,255,207,218,234,159,175,148,124,15,244,233,223,53,52,252,125,67,195,207,223,105,120,191,225,253,166,
+219,183,223,5,61,213,254,117,59,232,139,103,159,126,222,240,156,229,139,206,123,47,186,95,48,120,252,228,203,246,182,7,223,231,240,121,125,218,127,109,235,121,244,140,207,111,91,255,212,249,164,231,115,208,247,219,158,19,255,195,75,196,159,116,62,254,215,182,142,135,157,223,126,14,122,254,241,249,208,159,125,241,89,29,107,211,11,232,160,182,110,80,119,219,215,143,219,193,160,71,224,246,199,224,46,208,195,182,214,246,206,175,64,61,143,90,123,64,15,90,59,64,95,130,65,79,186,193,15,65,61,157,160,238,71,157,223,130,90,65,143,159,209,118,254,17,212,222,217,241,21,168,19,160,107,173,59,9,168,181,227,106,32,64,247,0,220,14,106,235,121,255,233,116,79,95,63,255,121,219,215,173,95,129,239,53,126,208,210,242,211,219,77,13,16,152,161,247,4,242,252,47,191,73,76,144,144,118,251,241,184,82,45,197,12,231,156,71,190,161,140,43,26,246,184,182,183,121,228,129,212,70,111,159,21,99,25,88,23,185,53,107,123,248,48,219,150,115,74,29,156,133,164,216,189,74,
+50,154,21,155,49,163,223,44,62,9,22,162,98,172,139,105,90,154,199,69,6,134,70,250,167,195,149,244,76,63,206,15,245,214,182,164,170,160,57,28,54,95,240,88,2,169,182,166,10,85,99,75,169,218,249,206,169,191,164,204,165,106,42,133,34,146,154,19,139,125,253,188,51,166,118,204,8,25,99,36,161,65,235,198,212,244,160,145,177,60,86,240,238,104,67,167,167,162,208,228,249,160,65,32,24,137,77,243,182,169,236,144,100,52,76,211,229,247,49,107,43,189,146,179,224,114,73,20,8,158,141,177,220,2,212,158,144,5,95,240,64,92,18,6,199,191,195,181,96,102,213,185,112,150,86,237,29,156,150,184,220,81,42,203,58,170,142,197,142,61,110,10,153,17,83,164,2,131,90,127,40,73,202,234,98,246,24,127,193,90,139,146,114,12,252,92,46,177,182,125,89,86,175,17,102,73,57,251,82,113,237,66,213,71,75,39,49,196,40,86,154,133,243,231,248,138,3,22,100,77,87,224,166,250,229,211,44,178,86,161,64,251,130,125,75,20,237,158,60,228,89,210,96,183,76,201,
+57,249,224,236,114,94,91,242,65,78,39,250,170,116,232,44,9,202,89,180,230,133,118,11,222,112,198,62,35,90,12,100,250,129,51,99,113,244,186,24,70,44,196,48,31,60,244,78,157,18,166,43,99,6,59,131,111,152,210,102,182,33,66,161,211,216,187,163,149,100,86,180,18,113,111,124,187,215,182,16,244,184,123,221,115,253,236,61,3,82,36,16,28,158,139,245,69,17,93,1,77,247,113,85,253,22,203,73,202,114,201,146,77,212,48,101,134,133,168,227,109,174,186,121,196,77,189,132,61,238,114,237,172,154,76,28,33,39,232,116,140,39,40,231,163,167,115,54,150,193,40,94,214,101,44,48,218,30,107,122,57,50,189,15,87,122,18,121,219,246,209,164,36,121,208,87,20,143,70,241,104,168,109,32,172,156,29,95,90,99,156,133,100,24,90,223,224,4,147,219,231,128,133,49,14,6,110,21,86,8,141,57,241,104,12,103,34,219,107,218,29,155,31,28,29,52,206,174,47,30,96,37,108,61,157,151,52,226,46,242,138,194,132,77,5,89,207,147,42,138,194,164,29,109,82,198,
+161,17,41,211,35,67,50,231,125,233,73,103,108,129,134,170,229,161,6,25,159,50,192,60,88,172,34,184,27,193,45,251,50,178,52,236,222,114,4,166,12,235,229,141,228,204,113,158,202,181,109,199,71,207,240,142,225,254,228,242,9,103,219,171,52,44,14,149,44,4,141,86,27,217,133,161,78,230,233,25,174,95,98,131,69,209,208,89,127,186,48,101,38,163,131,195,50,235,244,72,137,161,100,239,6,171,137,196,233,17,58,94,9,139,236,62,165,151,32,183,248,132,81,116,120,176,128,215,76,10,33,217,240,240,236,176,91,210,139,89,245,179,157,228,5,156,74,70,43,204,88,75,27,187,222,61,78,0,199,34,15,110,29,41,121,33,29,118,76,140,32,91,176,187,30,42,75,194,220,21,154,79,20,165,44,206,172,36,217,189,44,104,144,89,69,43,136,43,195,235,134,124,90,161,45,162,168,201,152,94,133,149,206,240,149,53,158,52,154,38,199,11,165,128,68,197,223,185,88,48,234,108,200,130,110,202,148,65,153,151,36,171,242,173,221,116,28,27,244,172,224,171,91,2,159,110,
+61,81,241,31,225,227,211,70,187,252,100,12,174,85,14,144,93,75,98,241,138,125,166,56,51,57,90,204,145,120,92,9,83,200,223,152,59,87,56,28,140,204,46,124,89,147,220,155,246,78,186,18,8,10,214,143,160,247,5,49,124,31,213,160,49,77,56,134,19,187,243,178,241,136,69,232,201,175,153,28,163,151,57,34,188,148,168,241,61,165,76,248,60,188,39,193,29,250,253,7,101,190,153,55,49,143,136,75,146,251,199,230,125,229,26,79,236,147,30,158,178,37,42,205,249,186,202,107,188,48,208,145,186,190,154,44,56,147,201,160,208,209,145,138,195,147,200,12,225,77,102,151,75,199,81,10,224,51,71,54,91,185,247,114,192,155,198,44,22,145,148,137,9,138,156,62,186,187,46,53,172,200,46,194,98,106,232,112,112,150,25,60,136,225,245,9,213,69,255,86,54,49,181,93,146,16,140,126,163,52,233,61,202,39,143,176,213,211,139,10,67,55,225,235,167,37,252,171,22,73,106,116,154,18,49,171,237,17,147,109,177,36,146,137,130,219,65,90,117,221,158,144,89,251,197,228,
+124,204,177,32,209,43,133,118,78,118,107,186,60,41,35,44,111,231,115,48,119,121,158,147,15,81,102,14,156,88,189,143,222,55,42,51,184,189,57,255,150,163,79,34,222,203,18,176,110,127,217,89,18,164,10,233,21,229,9,13,177,43,164,251,84,115,110,23,129,185,199,117,205,234,93,203,30,18,127,135,100,87,194,163,49,116,141,214,111,68,113,244,51,181,220,200,217,254,8,3,69,137,158,152,57,89,54,42,226,158,159,205,85,2,24,215,209,161,209,144,205,200,104,106,58,135,188,55,63,28,194,91,125,164,194,122,66,190,39,159,158,37,46,163,89,40,174,141,165,157,79,106,228,185,221,82,76,152,117,226,177,225,84,209,54,164,83,187,202,85,221,10,130,182,110,65,114,178,37,113,182,176,155,57,159,39,236,148,102,54,160,229,29,31,36,162,48,163,109,92,34,220,63,175,192,42,140,142,121,172,50,234,229,95,120,93,203,83,211,110,81,12,230,182,8,165,200,10,148,11,87,68,167,167,146,249,203,190,113,119,223,162,177,50,203,181,41,170,181,17,31,181,60,117,233,65,
+22,87,121,123,9,169,176,20,222,239,149,159,74,80,23,164,60,103,83,145,63,241,217,163,19,168,154,112,48,95,34,65,47,152,213,41,135,51,204,133,8,99,113,1,58,48,121,180,63,179,177,225,226,186,196,123,194,11,138,147,36,49,36,178,137,67,43,103,157,111,164,209,249,145,227,35,37,126,37,101,161,231,96,244,132,64,32,97,230,198,228,209,139,176,214,72,64,159,44,31,157,209,83,107,227,166,50,95,58,139,197,82,177,196,130,92,2,97,145,249,140,217,129,195,181,224,254,16,18,225,159,158,46,241,8,73,93,105,161,18,200,84,135,15,22,197,28,212,197,110,62,234,217,148,218,60,105,175,100,42,88,112,132,86,196,218,99,21,31,126,62,109,226,86,124,254,45,196,252,33,194,195,9,81,39,6,71,102,188,91,249,244,17,27,54,96,117,143,47,13,205,163,180,238,42,111,236,98,91,228,95,24,141,245,98,153,85,171,119,134,127,180,126,118,142,202,138,184,132,44,17,155,18,144,150,153,229,234,210,65,225,162,196,140,158,12,249,213,10,235,102,50,123,148,16,228,
+28,101,31,211,18,192,28,239,238,172,138,119,44,146,193,227,9,41,71,182,144,164,73,13,252,4,186,220,223,119,148,195,178,202,149,99,70,80,191,130,92,64,24,5,118,117,133,189,97,27,22,146,237,22,99,223,160,164,95,230,37,45,69,250,146,204,234,34,46,185,143,183,155,22,97,42,33,212,164,16,100,9,99,226,24,214,84,242,206,82,12,120,186,204,37,216,38,165,33,238,162,82,148,49,12,156,35,79,116,101,65,193,63,229,94,21,157,141,20,198,88,168,73,180,121,89,63,51,74,53,177,61,161,149,105,177,103,85,103,150,150,134,43,243,186,109,85,193,165,237,119,112,143,70,214,68,222,99,136,219,172,21,12,47,205,204,71,16,46,81,164,218,203,223,95,153,200,213,178,80,197,230,212,228,34,73,80,242,150,220,169,160,215,196,174,248,146,103,135,217,76,66,165,194,72,205,5,199,66,121,208,227,209,233,42,130,108,223,156,107,67,170,58,93,27,199,78,212,42,253,68,157,152,193,173,92,184,203,176,24,45,179,233,88,176,41,221,99,165,193,29,19,181,56,180,216,
+167,31,167,157,151,44,250,49,102,148,105,118,66,82,122,65,220,149,204,219,87,124,170,194,114,242,200,187,155,57,50,186,101,166,106,44,145,225,187,67,163,82,247,250,156,187,80,113,239,20,14,28,135,115,199,35,135,168,66,232,80,69,201,161,68,91,139,235,40,151,220,150,17,231,162,210,194,14,129,203,173,94,122,24,209,9,214,54,219,43,26,102,38,220,21,132,114,18,123,196,158,53,96,189,195,35,243,155,80,232,142,127,74,121,230,198,141,135,143,136,40,2,235,92,32,74,14,147,20,50,223,154,46,108,78,46,236,209,179,229,112,57,163,95,30,27,114,99,81,85,115,242,242,152,130,244,210,243,5,51,137,170,71,141,71,87,210,218,113,226,176,200,38,167,136,205,186,24,217,216,107,77,249,195,121,142,67,172,58,101,39,21,94,170,32,22,179,109,70,167,208,211,214,133,25,214,248,136,253,128,57,204,245,240,210,54,214,224,229,168,248,104,98,61,152,8,30,211,128,21,5,135,109,1,89,206,42,247,137,119,18,147,33,195,184,254,56,37,181,156,229,151,225,139,189,101,
+142,84,164,113,77,15,45,18,202,167,235,62,183,91,186,54,239,213,106,51,74,216,165,112,218,129,75,70,132,156,101,23,198,71,94,76,96,79,153,121,68,86,52,125,224,10,158,36,24,155,147,39,36,241,133,237,64,189,48,126,90,160,177,29,179,80,25,124,9,122,113,160,90,242,102,48,225,201,193,194,74,22,169,137,122,42,140,144,79,71,147,38,172,203,124,81,122,231,116,141,71,27,230,211,208,22,225,86,41,134,205,170,120,54,102,32,98,173,173,217,217,51,14,67,124,134,57,219,31,13,156,99,173,132,48,114,208,205,136,138,173,37,202,206,145,143,64,56,201,228,209,229,60,219,108,145,50,115,53,203,118,36,184,174,243,72,242,219,235,85,234,145,56,135,15,36,48,83,209,208,126,156,41,247,8,146,102,138,213,197,31,207,169,39,171,185,222,33,32,75,165,199,85,254,210,130,55,83,56,113,50,47,231,208,103,83,178,224,160,96,52,53,101,189,204,205,234,207,11,213,129,67,100,14,170,93,44,45,14,147,231,76,67,14,199,162,143,229,81,237,75,177,115,214,68,214,
+79,172,76,154,46,180,209,203,201,140,255,232,80,209,223,87,197,239,201,244,72,97,74,86,36,164,23,214,19,174,126,198,152,238,216,73,216,149,90,29,4,82,217,182,20,36,175,120,109,56,188,141,197,59,148,216,68,36,126,86,200,20,169,48,153,2,124,50,64,67,234,23,6,247,3,123,171,145,121,108,49,154,36,149,66,39,213,162,71,69,202,145,68,8,67,242,98,143,121,16,215,85,227,250,69,1,85,204,233,69,67,28,163,91,67,171,248,65,172,222,236,59,157,115,17,140,83,144,248,156,150,215,119,114,8,201,66,124,121,132,80,61,64,89,22,20,210,80,15,211,9,229,105,247,182,233,170,192,164,196,32,44,102,209,185,196,17,113,99,69,181,90,40,138,133,217,152,232,112,120,158,137,23,204,36,115,30,197,137,201,183,170,240,44,174,151,131,39,90,217,232,122,130,135,115,147,144,21,5,80,249,40,166,97,40,161,95,139,13,147,243,131,169,98,138,188,179,232,20,41,66,113,85,34,116,202,193,47,91,103,36,35,165,234,12,140,87,99,225,225,139,135,151,163,2,55,
+90,49,178,108,10,137,100,190,168,223,54,144,142,68,20,56,19,26,10,39,7,6,82,6,206,225,30,18,59,82,32,198,147,199,240,181,125,216,88,209,52,46,146,57,12,214,221,11,39,141,32,70,145,23,3,53,46,101,116,30,23,15,211,80,209,60,247,92,110,179,17,112,162,114,198,87,52,114,171,147,74,195,145,125,218,166,78,30,69,46,107,76,127,100,187,230,56,222,118,46,12,58,8,75,51,135,122,180,36,156,69,243,233,35,136,98,113,174,166,8,121,243,242,28,222,25,64,142,175,169,72,222,73,163,29,45,28,23,47,49,113,122,212,252,98,111,100,121,168,156,113,227,81,112,206,142,2,237,185,156,84,96,118,42,68,218,105,121,145,89,40,76,100,197,22,84,82,88,193,197,183,144,123,219,43,184,220,112,216,225,75,79,7,250,194,1,42,201,130,215,184,120,19,240,176,65,99,133,207,100,253,103,199,65,185,103,87,90,57,220,222,226,225,35,155,101,88,86,202,85,34,80,161,2,117,4,226,205,84,204,50,202,46,4,93,24,128,140,16,83,220,131,208,193,42,187,
+146,196,141,239,49,214,39,217,66,70,84,112,40,62,152,63,18,187,248,110,110,128,237,230,26,86,38,173,129,226,48,191,255,152,58,188,198,134,5,69,104,182,167,200,75,141,224,247,211,2,211,224,28,121,120,248,140,93,68,13,18,236,232,226,244,40,171,18,224,51,37,42,201,49,108,111,148,128,159,13,137,109,112,77,164,72,37,26,136,34,127,133,186,236,38,248,46,12,166,244,234,82,28,47,102,28,31,218,134,135,88,145,170,116,122,216,71,92,180,174,225,2,23,26,197,132,38,73,212,104,46,130,76,149,172,144,11,244,70,208,92,51,174,114,124,122,74,157,100,143,79,108,209,200,14,134,142,61,181,161,119,44,18,152,70,18,149,102,152,153,51,16,185,59,27,178,61,57,111,87,126,105,148,236,12,79,103,140,39,147,211,155,184,17,4,127,157,154,232,195,31,74,89,59,51,136,80,194,193,200,141,171,196,231,248,131,62,183,88,149,243,239,30,46,72,106,10,121,138,168,79,236,161,215,203,249,65,191,123,15,183,180,148,168,173,173,235,134,87,71,102,78,220,98,111,92,
+178,30,128,99,12,135,137,75,169,211,157,41,242,173,3,27,54,10,50,60,204,130,207,72,105,178,228,250,217,158,87,127,8,215,110,29,218,250,73,46,30,237,162,186,89,137,68,70,100,42,102,53,224,226,234,207,249,82,250,212,78,162,84,61,92,88,140,232,16,101,94,63,59,139,83,238,219,18,250,189,209,124,84,56,157,60,79,32,241,114,106,134,160,128,215,34,35,58,248,106,210,200,28,81,233,166,249,199,56,92,40,74,201,90,42,22,19,182,98,238,157,245,65,9,7,250,213,75,18,222,227,119,25,2,17,148,178,236,179,36,224,71,41,238,128,103,37,166,191,240,109,234,70,3,14,28,169,96,189,128,133,54,173,151,68,82,141,238,137,28,37,21,185,180,144,76,61,162,160,209,104,153,92,194,9,29,5,183,83,193,11,13,227,124,99,89,83,34,174,69,231,151,197,134,83,17,215,163,153,61,133,201,157,116,217,113,69,24,129,207,12,150,212,210,105,81,184,220,71,169,186,136,125,148,29,183,111,247,220,183,186,141,52,179,182,42,231,234,108,140,169,141,157,154,168,190,
+216,64,96,55,161,28,223,203,89,60,38,165,96,60,85,220,128,95,38,78,9,201,128,47,84,11,159,158,248,109,122,37,147,167,57,76,76,105,71,209,214,37,215,166,177,207,90,195,140,57,231,132,214,172,143,171,32,107,178,59,123,153,21,6,97,97,6,2,183,187,25,49,182,83,76,135,163,105,34,14,67,99,98,92,56,142,244,86,209,78,233,96,142,150,27,46,201,71,248,27,230,109,239,33,166,64,159,219,56,31,244,214,224,67,163,220,121,86,72,138,15,69,119,46,109,33,191,106,90,3,169,153,80,26,25,150,213,55,58,21,154,91,34,147,48,130,61,205,140,29,122,184,229,193,157,185,196,242,121,22,202,13,179,157,78,13,208,108,139,43,73,18,2,202,219,214,132,52,226,8,150,51,46,118,201,151,53,240,185,57,212,128,183,228,39,108,143,162,221,116,253,192,218,217,17,35,39,86,88,39,172,138,181,197,210,69,70,21,47,123,200,246,12,242,108,141,2,157,85,144,24,97,154,64,24,26,24,47,172,204,115,80,179,154,62,102,14,19,176,19,52,208,129,140,232,80,
+121,50,11,180,13,107,250,235,61,131,11,204,28,153,181,197,146,176,161,125,40,150,4,10,108,43,137,110,1,11,201,74,231,46,47,149,218,1,129,96,183,90,220,112,245,207,156,89,173,10,18,37,87,177,178,114,16,146,67,185,98,138,78,247,218,75,210,243,92,242,64,225,128,122,78,45,11,217,136,10,185,143,208,82,147,129,83,51,194,33,65,139,168,201,53,63,93,33,219,78,113,163,1,87,86,147,129,32,80,177,60,197,203,202,153,123,29,104,152,136,90,142,177,88,19,217,169,113,133,141,67,142,83,150,112,6,152,65,89,221,242,39,99,48,5,190,36,118,153,106,100,215,30,47,192,208,98,161,10,230,190,195,111,30,153,83,170,197,73,88,130,149,11,158,234,145,108,117,108,53,146,242,74,18,53,4,58,149,24,188,44,231,15,106,142,222,237,241,162,155,147,218,129,149,7,228,192,246,47,71,182,159,121,106,155,217,204,106,182,84,180,99,69,187,53,206,193,130,127,17,113,66,68,140,187,253,200,209,9,86,122,90,172,240,103,171,39,82,164,192,165,71,240,132,19,243,
+219,179,90,86,110,147,148,204,158,59,114,142,192,220,165,187,119,137,130,225,38,6,173,74,245,86,153,132,224,150,23,84,66,132,2,77,84,201,15,93,218,68,180,118,4,89,133,161,199,86,133,238,114,28,167,167,148,61,236,68,45,65,218,149,27,230,139,186,52,253,194,171,86,109,199,151,207,85,156,125,146,122,179,96,50,42,139,186,25,108,160,68,187,36,18,42,11,91,102,206,234,74,180,156,194,29,140,193,55,165,198,218,216,170,51,130,137,108,244,38,37,7,1,124,65,180,41,94,130,153,214,19,68,12,85,207,211,196,228,214,9,135,14,115,128,239,5,158,179,125,228,242,136,6,120,93,42,114,146,186,25,97,165,181,164,232,164,110,97,1,34,55,180,12,52,193,53,253,76,137,95,167,53,96,14,160,169,185,77,140,120,182,239,138,144,178,68,157,211,91,160,81,61,85,111,57,172,169,253,66,183,219,189,159,150,78,85,115,137,109,173,90,141,49,229,246,19,185,92,212,156,177,228,11,171,52,222,65,45,157,75,120,84,27,106,185,26,147,131,184,201,181,173,234,242,136,
+24,222,31,154,194,44,157,18,18,56,156,12,55,134,198,92,108,76,65,2,195,222,132,108,34,13,241,79,237,35,225,167,225,115,170,199,159,216,80,171,69,39,64,253,203,203,174,72,237,253,82,213,146,11,190,16,183,164,104,112,180,14,43,89,73,56,248,165,209,52,76,235,62,203,70,29,104,167,51,25,115,122,170,7,203,103,252,145,164,4,123,134,74,150,28,113,244,122,73,141,113,122,101,238,163,73,147,238,172,16,138,139,146,11,118,158,53,177,52,116,238,27,197,225,118,135,250,55,251,251,157,4,155,156,10,41,111,232,10,88,185,239,88,179,100,11,158,75,21,16,78,110,243,240,64,63,95,32,154,34,49,20,187,82,75,245,43,212,170,83,223,178,197,85,228,207,123,252,148,73,57,149,207,163,77,22,121,130,68,98,213,125,193,222,90,42,86,118,226,102,38,164,183,119,142,104,183,24,120,226,180,24,137,172,42,36,149,82,46,89,140,14,160,97,176,163,21,216,106,122,129,43,35,202,220,11,11,33,157,77,155,167,178,25,253,253,19,176,97,56,151,51,44,233,95,148,
+64,103,103,21,19,117,51,140,13,92,61,195,58,78,193,83,139,174,139,71,89,180,188,26,8,32,86,125,205,111,59,243,28,23,76,6,250,97,45,57,51,116,44,32,175,96,147,6,158,231,152,51,207,60,160,170,215,17,163,10,97,105,57,190,109,230,207,186,119,123,105,89,139,3,187,122,153,171,193,135,247,171,99,194,74,76,58,66,37,151,247,220,123,249,17,188,136,14,57,33,213,92,91,65,59,118,206,125,48,6,217,157,201,147,86,132,231,149,218,196,20,178,50,67,94,207,174,23,134,96,254,120,25,45,29,57,112,30,96,73,118,207,46,176,45,192,44,169,74,59,103,11,98,166,110,235,82,85,65,15,145,53,209,21,110,49,162,201,101,44,9,67,111,4,206,225,113,19,167,167,253,129,125,153,91,40,43,138,35,236,69,9,94,9,245,97,220,115,197,8,48,102,22,24,228,34,172,158,232,40,214,125,216,105,218,105,119,238,185,182,211,163,28,81,220,104,149,11,167,180,131,85,62,166,100,206,91,245,9,182,218,145,60,97,197,83,39,172,216,153,125,207,34,143,17,37,
+243,6,4,36,186,213,11,8,98,65,136,99,209,168,43,186,190,131,8,226,212,4,57,73,238,64,115,132,174,217,53,179,152,14,41,169,178,20,184,123,108,118,39,193,217,202,100,153,7,121,171,235,114,185,232,10,31,160,72,166,77,4,213,24,146,216,41,211,238,93,136,3,59,145,88,137,194,24,235,19,234,222,109,132,220,81,13,115,37,102,137,132,99,76,138,78,153,147,44,201,196,65,106,142,177,41,166,67,29,4,225,44,93,173,86,7,178,162,248,106,184,144,168,136,207,230,84,33,77,52,26,207,77,17,52,44,173,152,222,187,204,89,96,179,220,68,118,186,23,10,237,223,133,4,98,219,114,6,166,191,202,78,45,74,92,220,34,76,146,131,58,176,80,150,132,134,2,178,110,225,116,69,45,21,87,86,225,142,164,107,11,179,169,77,151,18,134,75,11,67,66,98,177,249,56,248,192,252,172,202,232,102,231,2,84,25,81,67,79,149,40,43,238,168,48,234,30,118,207,215,37,154,178,235,54,181,52,160,12,37,8,233,105,181,70,181,40,22,197,85,192,76,115,213,51,25,
+215,137,116,186,150,216,155,117,21,64,45,17,141,221,67,177,104,196,193,16,82,70,116,82,76,26,242,22,210,153,38,103,203,130,37,105,94,148,67,246,113,56,200,13,238,145,131,109,77,24,212,236,137,133,241,34,115,85,47,101,218,24,146,249,193,28,119,143,195,217,198,10,117,76,172,19,112,35,200,229,200,26,0,80,105,79,152,78,39,32,193,62,74,90,138,187,156,204,201,173,241,93,98,204,161,162,2,35,168,128,50,237,9,231,4,195,54,162,77,10,113,195,244,73,188,131,238,76,24,43,117,171,194,84,130,56,5,80,15,86,104,18,196,157,80,44,116,113,19,2,241,196,104,254,128,147,138,37,83,97,35,4,99,224,194,20,63,230,69,143,188,199,34,246,172,114,215,110,50,43,99,242,128,137,131,229,24,39,246,76,14,127,223,242,8,124,166,55,30,77,193,41,23,151,72,166,106,86,118,6,85,174,161,180,122,102,221,173,100,226,153,99,43,75,146,63,153,183,34,207,3,203,178,147,115,141,114,68,169,116,58,51,23,182,145,195,178,97,36,66,64,214,10,23,91,75,
+216,106,210,75,168,185,75,38,165,91,120,66,114,109,205,45,94,82,249,170,147,161,232,240,86,47,53,73,220,190,44,41,47,131,230,138,75,27,201,46,213,246,18,11,108,170,210,196,168,207,176,38,19,159,169,23,225,92,42,99,43,23,219,64,105,149,129,136,8,112,93,66,41,202,193,71,229,51,140,26,99,101,17,46,77,71,83,186,254,104,127,17,225,43,23,55,234,136,14,232,203,64,82,164,95,229,71,122,61,63,226,232,235,137,85,4,81,195,135,162,77,137,176,255,208,204,43,45,210,221,28,25,37,62,104,192,132,231,96,235,26,12,27,230,87,149,143,23,182,18,85,242,248,232,216,114,208,226,153,179,17,131,153,29,230,148,152,53,14,245,110,102,202,137,104,100,222,83,242,102,231,200,94,181,25,49,148,140,50,207,2,123,65,165,127,215,181,126,236,137,172,196,151,73,17,83,184,54,183,132,216,223,50,34,128,32,12,177,150,34,201,75,253,132,6,115,96,59,172,245,178,119,93,67,55,126,141,111,184,126,221,126,197,177,199,31,192,61,255,252,109,7,184,235,254,59,
+245,111,191,236,233,106,191,255,222,253,119,95,117,14,242,77,103,219,195,87,30,131,60,99,241,188,243,157,151,14,41,234,60,63,7,213,159,47,168,239,191,247,156,190,25,116,255,139,206,151,200,223,125,118,110,1,48,238,6,245,60,2,131,174,250,65,223,94,157,111,212,15,34,158,29,74,188,255,76,204,247,110,176,121,118,144,241,224,81,91,251,195,250,232,151,168,123,58,59,223,7,253,174,179,7,124,125,232,209,246,172,187,173,27,212,209,217,3,234,126,12,126,208,246,199,54,240,195,91,160,7,79,186,186,192,29,61,160,214,7,61,109,223,128,159,209,3,227,174,78,72,90,187,175,9,223,127,141,126,127,217,5,110,237,1,3,218,125,51,157,94,147,189,208,232,115,157,252,99,103,215,3,112,247,243,131,155,78,80,235,227,199,224,214,46,80,103,199,149,166,186,31,116,129,193,29,175,21,234,234,200,230,205,133,186,34,123,133,80,191,108,239,236,6,95,155,234,169,96,245,179,161,238,186,249,218,122,94,156,17,1,106,251,186,243,33,248,117,210,1,102,191,255,78,91,71,
+207,253,91,245,199,27,251,226,247,221,240,6,33,192,241,21,116,205,160,199,157,47,78,241,110,129,222,128,176,167,179,167,181,253,47,184,238,51,47,122,126,142,6,204,212,86,63,62,251,17,90,248,125,103,247,181,34,222,88,7,191,191,1,231,109,213,240,28,11,232,230,42,171,143,248,17,49,229,19,240,191,3,70,124,208,217,209,221,3,44,196,214,174,183,9,42,117,30,127,17,197,21,251,87,80,223,24,1,76,253,3,81,231,187,64,95,15,228,170,165,167,171,173,227,171,251,63,253,175,67,243,249,139,105,63,7,93,191,159,15,186,255,211,47,254,2,162,155,110,216,3,204,94,95,136,95,214,87,104,247,227,246,214,63,1,139,177,173,227,233,114,253,17,190,248,73,221,207,223,210,27,63,121,105,141,188,137,63,190,110,117,221,112,204,235,161,160,142,39,95,127,9,132,243,27,73,2,212,221,3,126,220,253,90,136,192,160,183,130,7,208,189,21,180,43,169,110,248,230,255,184,217,217,248,125,204,191,120,248,77,61,136,118,191,192,245,229,159,110,226,191,230,247,62,232,55,
+127,188,86,197,13,77,92,117,213,51,215,255,6,119,117,222,2,221,255,155,174,39,29,29,128,31,129,190,4,22,230,223,212,59,158,251,196,235,212,244,235,167,81,233,254,187,87,238,122,239,6,208,103,18,223,0,124,125,203,229,166,186,126,253,82,108,186,238,127,231,221,231,35,158,46,130,167,144,63,6,247,60,233,234,120,57,142,190,173,125,127,253,220,133,255,19,162,191,228,200,111,32,252,171,13,242,14,80,67,0,57,242,202,142,239,213,125,26,244,89,103,215,211,143,215,51,189,251,99,80,93,5,168,31,6,117,51,126,92,139,252,114,16,121,53,208,27,193,234,77,112,214,163,12,128,239,153,136,63,174,14,1,63,252,161,74,228,203,206,206,246,87,174,186,103,132,175,168,69,254,240,168,243,219,110,80,235,211,33,160,47,159,244,244,0,181,17,80,231,93,149,119,64,103,7,232,79,224,158,235,117,242,8,112,253,103,3,234,11,11,16,171,94,249,93,21,46,47,42,172,151,139,151,23,128,187,158,128,235,124,159,14,252,22,176,230,179,145,63,34,158,190,128,254,151,43,
+157,31,84,193,13,30,255,111,84,60,173,95,131,235,85,49,32,215,59,223,169,23,110,125,63,78,191,123,235,185,13,223,121,173,151,95,23,52,47,107,236,141,149,117,131,195,95,175,52,186,1,26,224,255,93,220,111,6,18,136,9,255,41,136,55,232,255,75,18,210,15,24,252,154,205,27,65,255,24,220,13,238,121,227,221,200,21,213,43,2,192,85,251,205,245,251,240,250,14,102,125,89,247,0,129,239,245,169,162,171,181,227,73,123,107,87,91,207,159,222,166,34,184,65,254,86,118,248,250,135,234,184,250,133,188,175,159,60,120,4,68,216,30,112,71,61,150,61,1,54,184,79,113,118,129,255,8,200,255,232,117,216,126,209,222,246,85,199,117,202,120,115,100,207,137,223,10,87,107,157,250,135,106,185,122,226,184,26,240,53,144,228,223,7,102,106,239,252,22,136,184,223,180,182,63,1,74,158,214,46,48,232,23,191,253,205,175,127,119,255,139,223,254,234,31,63,185,245,236,203,47,127,245,187,79,126,245,241,213,102,243,105,203,199,191,249,245,255,250,228,117,74,184,190,194,216,
+217,117,101,108,96,155,221,116,255,31,158,7,225,159,253,144,31,62,35,250,226,138,226,251,23,50,127,64,3,175,13,173,63,187,233,185,215,153,165,21,72,36,237,237,95,182,62,248,183,43,247,189,50,240,253,255,214,125,51,228,131,190,6,247,60,234,124,109,162,121,233,251,75,192,94,113,123,245,133,32,79,111,45,95,39,250,174,39,15,0,216,111,56,211,43,127,75,122,213,156,127,141,159,138,94,47,207,75,27,209,239,38,219,191,36,214,95,107,183,217,243,239,111,224,18,63,156,109,191,19,149,27,222,88,17,55,12,115,235,173,149,242,118,182,122,37,236,255,15,148,90,255,125,171,179,227,27,112,71,27,24,88,123,55,215,4,16,158,186,218,90,59,122,174,10,191,171,82,254,10,241,173,167,225,236,234,122,244,43,10,255,103,247,164,63,251,191,206,37,207,22,
diff --git a/uppsrc/CtrlLib/src.tpp/ProgressInd$en-us.tpp b/uppsrc/CtrlLib/src.tpp/ProgressInd$en-us.tpp
new file mode 100644
index 000000000..ea06f100b
--- /dev/null
+++ b/uppsrc/CtrlLib/src.tpp/ProgressInd$en-us.tpp
@@ -0,0 +1,9 @@
+TITLE("ProgressIndicator")
+COMPRESSED
+120,156,221,86,251,79,20,87,20,254,87,110,226,35,128,235,230,222,59,51,59,179,187,49,161,105,251,131,49,177,70,237,79,155,5,102,119,175,48,233,50,179,153,153,213,106,83,179,148,74,41,41,173,86,124,20,75,43,62,17,197,82,186,70,13,34,96,75,149,226,99,211,34,40,213,108,213,250,66,81,171,210,5,41,164,119,246,141,187,138,75,76,154,116,38,59,115,51,247,158,115,190,115,190,239,220,187,14,12,230,206,133,38,56,7,206,112,217,222,34,171,68,191,87,119,58,36,150,21,236,34,230,236,239,45,121,199,106,47,40,204,179,176,249,134,23,68,189,48,60,98,4,142,65,44,182,208,7,98,16,230,48,195,34,1,91,89,129,97,4,104,115,123,69,77,115,58,188,88,16,236,134,17,54,225,57,152,231,48,226,89,129,21,16,195,11,152,218,98,8,49,228,49,135,88,70,192,156,205,67,52,183,211,33,10,140,189,96,185,133,26,49,70,36,234,28,34,11,102,121,22,67,6,98,150,134,66,130,192,34,158,19,24,171,197,98,115,139,62,93,82,228,120,44,9,33,
+140,236,46,196,219,41,230,245,235,215,155,17,11,99,8,88,234,12,65,150,66,69,244,27,100,49,143,56,43,180,114,2,18,32,67,157,115,60,228,108,62,81,21,203,95,156,58,55,99,234,60,180,73,58,161,46,10,22,32,196,83,19,139,201,50,7,177,60,77,84,96,88,78,224,33,13,142,49,102,24,140,24,108,181,98,206,194,241,182,50,34,122,136,234,116,124,80,252,225,188,183,151,46,124,119,5,112,104,140,29,44,83,149,82,149,104,218,98,217,35,185,69,93,81,231,59,29,26,180,51,192,120,35,251,18,91,9,189,51,22,25,31,163,229,183,21,25,195,55,117,213,91,4,28,243,32,92,8,97,81,81,97,30,52,67,51,230,184,124,16,231,40,49,3,138,83,227,66,152,25,60,125,165,45,125,109,202,163,207,239,242,74,238,108,46,129,1,195,105,224,198,89,242,2,146,6,68,160,233,162,46,185,193,26,201,83,74,116,224,215,136,7,232,10,240,72,154,207,43,174,5,122,25,1,190,184,33,80,86,1,47,145,75,245,178,181,64,241,17,85,52,20,96,142,123,143,
+191,10,11,165,114,177,148,216,168,198,44,243,41,73,129,202,238,138,186,64,242,26,219,255,245,72,125,247,47,63,118,213,215,85,61,220,115,167,163,46,28,217,123,184,163,251,80,112,160,229,120,224,89,205,211,77,145,251,109,145,47,175,86,135,90,47,110,104,233,111,11,117,157,223,115,106,108,251,39,223,111,124,220,95,89,177,191,50,124,250,239,211,219,31,221,222,212,51,113,172,247,204,173,163,29,225,198,174,93,209,107,106,160,175,229,200,221,182,43,103,119,222,222,22,104,125,240,248,68,215,195,193,99,231,174,223,56,219,223,16,248,108,199,129,71,91,235,111,142,212,244,61,25,252,174,247,76,197,31,63,157,233,221,29,106,26,30,188,212,124,53,18,58,58,222,219,62,249,104,227,169,170,250,161,234,111,71,154,182,5,71,119,212,244,221,28,220,251,197,147,191,30,255,240,91,79,100,164,189,50,24,234,143,76,60,237,14,53,55,183,29,30,239,233,28,24,251,243,218,253,175,130,215,38,159,221,218,89,59,28,28,237,8,180,214,77,5,182,156,188,212,112,164,227,202,231,
+13,247,174,95,236,174,191,83,49,60,17,184,214,116,243,242,248,208,212,150,111,14,237,223,188,121,244,120,251,249,29,247,38,67,189,187,107,13,147,125,173,117,187,154,238,119,214,52,132,79,132,107,6,47,132,43,135,15,76,53,55,214,6,123,162,238,198,59,239,181,77,28,60,212,185,229,233,190,137,109,15,219,55,4,30,116,6,27,127,29,56,220,210,16,236,187,113,54,60,57,244,81,99,32,188,171,227,220,230,177,150,11,85,125,219,107,183,6,2,55,126,174,111,190,240,251,221,137,131,145,150,203,213,213,213,157,244,87,125,242,159,143,63,189,93,85,187,41,141,34,24,123,113,47,147,241,10,162,151,228,73,178,94,98,50,30,249,182,132,140,211,36,183,90,145,60,73,145,37,229,70,245,75,109,147,223,243,156,153,134,212,99,22,59,6,136,110,221,47,122,147,83,38,144,131,173,174,232,105,166,249,9,189,83,40,218,116,253,82,93,199,87,21,164,66,210,6,32,190,168,182,211,230,98,46,99,83,102,176,56,203,92,34,60,6,73,168,70,63,173,35,170,98,202,210,106,
+241,126,50,26,206,37,170,70,211,169,186,36,151,2,81,7,62,233,125,226,5,62,69,147,140,126,74,122,43,200,172,10,109,82,189,12,168,68,212,20,89,116,121,9,208,164,117,196,236,204,153,215,255,132,210,217,241,98,6,43,141,114,3,217,95,238,34,170,193,82,140,46,90,106,15,89,37,201,116,183,114,173,165,158,200,106,73,241,107,192,45,122,189,81,119,5,81,216,128,86,62,54,140,122,113,254,111,168,140,109,191,116,188,104,54,140,166,172,103,69,172,148,133,83,177,156,0,81,51,42,157,151,150,180,228,204,55,231,156,210,2,122,231,101,207,40,59,162,180,132,168,109,42,165,36,186,197,178,91,37,229,68,166,186,139,209,144,33,39,170,33,69,38,179,196,250,66,2,114,131,59,3,3,201,108,150,41,154,94,178,80,74,228,4,86,19,85,75,28,196,57,130,127,153,122,94,1,252,107,147,207,27,30,143,6,166,233,38,206,11,109,229,56,99,137,166,202,57,77,3,199,52,61,37,51,40,158,1,116,74,64,203,137,238,87,229,216,174,229,246,171,170,81,246,231,113,
+129,92,206,215,232,118,244,124,241,139,178,90,20,189,248,63,33,40,153,255,220,70,189,114,218,81,152,11,43,51,29,162,122,182,109,248,149,201,88,70,84,55,49,120,112,41,138,247,53,166,28,247,251,210,140,141,144,89,83,118,165,190,150,44,42,214,85,63,137,165,205,217,95,23,188,165,74,6,192,180,77,201,56,154,18,243,160,92,241,16,83,90,125,125,177,137,232,65,23,59,112,232,81,39,201,153,161,19,28,56,255,5,255,3,227,184,
+
diff --git a/uppsrc/CtrlLib/src.tpp/Pusher$en-us.tpp b/uppsrc/CtrlLib/src.tpp/Pusher$en-us.tpp
new file mode 100644
index 000000000..18c94e02f
--- /dev/null
+++ b/uppsrc/CtrlLib/src.tpp/Pusher$en-us.tpp
@@ -0,0 +1,10 @@
+TITLE("Pusher")
+COMPRESSED
+120,156,221,88,91,111,219,54,20,254,43,68,219,181,118,150,56,186,218,138,253,210,174,151,33,104,177,22,189,96,15,158,93,209,18,29,113,145,69,131,164,146,165,235,250,219,119,14,73,73,182,19,167,93,219,1,195,242,16,81,20,121,46,223,185,123,26,144,123,247,188,67,239,174,247,153,191,241,19,182,164,117,169,103,83,30,69,201,132,6,241,228,252,249,203,147,201,193,195,222,48,234,35,21,31,168,132,35,63,76,226,208,143,130,33,252,243,67,63,136,131,48,242,147,224,36,74,194,48,241,198,89,73,149,154,77,203,32,73,38,120,41,128,75,193,40,14,252,81,148,68,137,31,142,146,0,238,6,158,23,120,163,32,246,163,48,9,226,113,206,84,54,155,210,36,156,28,188,30,194,165,16,57,1,113,207,31,6,209,40,10,188,208,11,34,96,229,39,73,228,143,226,36,60,25,14,199,25,93,107,46,42,199,139,251,126,224,79,22,254,104,2,50,127,250,244,105,224,71,158,149,32,2,98,190,23,129,168,62,236,121,81,48,242,227,19,239,36,78,252,196,11,129,120,60,242,
+226,241,154,74,186,218,175,122,252,89,213,71,222,152,107,6,36,14,126,244,253,17,92,25,30,14,239,250,209,8,20,77,194,40,78,70,30,48,15,130,32,12,3,63,12,78,78,130,120,24,143,198,5,163,57,147,179,233,159,239,255,250,225,233,47,71,239,222,144,169,10,39,228,85,173,10,38,239,207,166,202,107,94,8,87,132,146,5,85,140,24,136,201,82,72,187,98,138,232,130,106,178,102,18,246,86,68,241,213,186,100,132,102,136,14,185,44,88,5,231,120,118,206,114,178,184,34,43,81,3,9,184,11,107,37,86,140,156,179,171,133,160,50,39,188,210,64,129,102,140,244,106,85,211,178,188,2,26,25,3,86,112,164,63,104,228,40,104,149,151,192,19,14,56,98,188,90,215,154,192,54,201,10,150,157,43,228,169,241,104,75,154,93,176,74,43,178,162,58,43,28,157,244,129,218,32,127,72,10,113,9,167,228,166,56,72,53,163,21,89,128,50,165,18,100,45,5,158,183,122,0,108,252,2,150,13,4,200,30,14,252,206,50,205,140,46,98,131,145,210,84,51,188,197,81,10,
+16,78,228,138,244,158,179,43,60,114,72,158,241,138,171,2,215,160,230,35,16,170,100,146,106,97,132,49,56,111,152,64,41,126,86,1,7,198,141,138,186,144,162,62,43,224,201,72,73,23,172,68,240,120,117,70,210,7,233,253,244,1,2,13,171,223,22,233,131,67,162,24,35,211,185,22,107,158,165,227,244,56,61,126,172,101,249,130,47,210,99,37,179,244,248,5,94,255,9,12,156,222,99,85,122,84,171,57,105,183,102,253,129,243,134,95,209,158,157,60,107,92,229,70,123,103,12,244,6,56,34,65,9,138,88,93,22,28,188,161,16,0,46,202,133,79,123,75,30,146,87,214,101,30,89,87,185,224,82,131,221,29,64,72,137,87,23,226,220,145,71,232,0,199,42,55,198,65,23,91,129,81,169,185,105,207,225,121,162,107,89,25,33,29,209,12,252,100,65,179,243,1,121,233,0,3,139,162,191,30,154,83,168,137,33,143,47,175,217,154,81,221,94,1,180,37,152,254,130,114,64,182,100,13,2,246,17,154,103,60,121,254,208,35,211,31,60,239,200,243,30,246,188,129,55,8,
+226,184,79,92,22,106,246,33,138,201,251,230,213,161,55,195,251,65,67,110,215,44,143,133,100,206,46,248,218,152,36,189,11,71,198,102,7,158,54,16,241,109,78,166,199,243,57,121,226,156,114,41,5,100,2,216,32,51,252,186,41,177,55,25,227,85,231,155,221,170,151,246,199,100,122,208,8,215,235,59,241,78,43,174,57,45,249,7,128,215,126,27,144,103,162,210,104,30,5,6,32,224,232,173,89,126,126,119,10,254,90,1,182,116,199,139,225,116,6,14,33,89,62,216,193,239,6,244,46,4,207,91,180,90,220,0,104,23,49,237,183,94,127,214,36,41,41,180,9,189,129,147,251,109,193,155,80,3,119,211,170,245,89,140,204,244,142,243,91,8,201,38,224,211,59,54,76,7,228,84,19,85,136,186,204,49,242,107,244,97,170,192,159,93,66,131,235,187,202,237,166,131,193,173,128,159,42,92,91,192,23,66,148,239,1,117,187,231,80,191,166,78,52,1,203,28,147,215,204,56,247,5,45,107,54,59,250,168,101,205,108,122,5,183,119,250,88,13,62,143,48,242,189,17,225,83,
+245,165,24,255,67,161,224,29,29,73,111,131,254,45,162,118,89,243,43,101,125,38,36,228,115,194,32,250,197,114,91,88,147,112,92,82,217,78,82,206,165,122,185,237,86,246,101,162,54,36,110,72,69,253,111,9,129,167,85,254,165,33,176,95,191,125,2,180,41,216,61,59,198,95,32,217,107,182,148,236,102,131,236,196,163,139,46,105,47,16,232,125,52,74,152,137,42,147,12,208,111,130,201,133,172,77,115,166,199,0,26,11,134,101,228,76,210,117,193,51,211,37,100,144,210,207,174,71,41,42,220,132,244,147,155,173,133,247,85,35,120,215,3,152,190,164,41,236,189,146,159,51,242,210,244,122,125,83,190,74,65,115,16,7,43,157,32,43,240,194,21,100,71,96,189,166,144,92,176,102,80,232,129,62,252,171,32,63,19,89,173,254,19,40,219,109,36,108,27,166,37,74,246,63,2,124,43,250,63,131,56,22,57,80,208,52,61,144,1,109,149,129,186,2,251,75,147,172,32,54,247,33,211,36,142,46,95,236,83,103,222,149,147,121,83,174,27,185,210,251,155,178,191,97,26,75,
+117,39,245,108,147,4,126,154,147,173,3,221,229,144,44,55,246,91,109,129,162,233,239,76,149,183,206,178,83,42,49,237,163,89,208,125,240,224,173,238,214,54,245,208,220,177,114,73,114,1,8,84,66,35,41,107,112,195,135,86,87,0,168,100,135,100,1,30,182,18,74,95,107,191,115,209,37,250,199,78,122,204,240,149,190,165,0,164,7,142,135,108,44,8,222,12,134,170,206,190,11,246,166,123,190,14,254,102,155,40,42,117,19,250,27,39,10,218,113,120,159,30,108,24,72,179,63,110,179,16,126,110,243,190,252,174,72,147,183,72,27,71,35,80,64,3,98,215,167,13,35,56,100,9,38,77,208,66,181,228,21,219,24,184,212,224,120,203,94,70,153,163,143,251,109,245,13,37,243,149,98,117,46,246,212,165,83,23,119,54,88,9,91,213,165,9,200,244,78,11,217,37,135,81,147,66,214,193,206,160,25,184,76,97,193,121,140,112,72,125,154,92,54,81,208,117,150,104,5,128,23,230,28,94,101,101,157,99,72,216,4,136,195,225,86,87,209,235,194,190,191,119,48,217,117,202,
+110,242,48,110,185,184,210,108,110,103,13,92,238,155,62,172,13,192,4,123,251,134,71,173,149,186,113,19,36,70,117,220,4,112,187,32,111,52,78,122,78,20,251,178,79,24,51,178,238,239,225,209,205,190,74,4,147,219,44,179,205,4,183,203,30,125,254,150,246,169,250,74,238,143,93,163,231,36,104,94,247,73,209,152,123,171,164,52,205,226,230,24,108,170,138,141,103,114,134,1,140,115,30,120,110,93,89,167,131,82,179,49,220,180,3,205,119,23,214,186,99,35,110,122,199,197,9,173,97,32,50,159,128,117,122,100,211,202,166,30,107,72,37,34,119,253,196,150,82,24,38,208,13,148,185,114,63,35,64,250,209,16,23,230,215,2,71,30,40,66,156,217,0,101,170,251,161,166,99,75,122,108,112,54,128,134,64,138,75,71,193,252,38,160,50,41,80,10,217,254,138,49,251,27,174,35,146,78,
+
diff --git a/uppsrc/CtrlLib/src.tpp/Slider$en-us.tpp b/uppsrc/CtrlLib/src.tpp/Slider$en-us.tpp
new file mode 100644
index 000000000..2e509dc2a
--- /dev/null
+++ b/uppsrc/CtrlLib/src.tpp/Slider$en-us.tpp
@@ -0,0 +1,8 @@
+TITLE("Slider")
+COMPRESSED
+120,156,165,86,255,107,27,101,24,255,87,94,232,86,146,152,133,247,125,239,46,119,185,32,20,156,72,25,83,104,245,167,144,52,215,228,109,114,120,95,194,221,165,85,196,18,55,181,84,22,176,142,109,165,235,104,215,161,86,221,152,29,157,248,131,3,59,52,14,55,54,97,142,41,90,41,136,191,84,183,142,138,82,183,33,62,119,151,47,215,53,146,108,189,192,221,229,125,223,231,243,124,158,207,243,60,239,123,41,138,246,236,193,81,220,131,59,92,242,126,54,162,148,53,39,157,82,121,94,74,42,84,72,190,124,224,133,68,50,210,23,138,243,97,23,133,0,10,39,18,78,18,56,194,211,56,220,8,71,168,64,57,158,72,52,193,75,28,39,97,57,167,41,182,157,78,105,84,146,146,174,17,141,210,30,42,10,148,136,188,196,75,132,19,37,10,182,20,99,138,69,42,16,158,147,168,32,231,153,157,75,167,20,137,75,70,6,226,96,196,185,158,0,28,147,56,229,69,158,98,14,83,30,92,17,73,226,137,40,72,92,34,30,151,115,74,201,81,77,163,238,75,37,132,146,228,
+48,17,147,192,121,124,124,60,70,120,236,51,224,1,140,96,30,168,18,24,195,60,21,137,144,192,9,65,34,18,230,0,92,16,177,32,151,20,75,209,255,63,116,161,99,232,34,150,85,135,1,68,228,41,66,68,48,137,71,227,61,132,23,33,80,137,227,5,73,196,224,156,82,202,113,148,112,52,145,160,66,92,16,229,34,83,242,204,74,167,94,27,122,125,239,179,207,239,123,105,16,165,108,46,137,6,53,21,134,159,113,44,173,55,157,178,73,242,128,156,133,95,107,212,253,231,9,45,103,220,87,119,40,131,82,123,49,222,135,113,38,211,23,194,49,28,163,130,16,70,245,108,52,102,208,80,235,189,15,7,220,4,151,200,193,69,45,168,82,121,88,83,115,237,176,144,135,224,50,165,65,234,72,181,145,130,198,212,124,129,57,200,41,42,14,82,52,205,28,179,17,51,28,102,169,70,1,41,6,82,225,189,192,44,52,170,104,101,134,134,95,69,121,75,41,20,188,73,176,41,235,195,177,58,110,253,209,112,217,215,167,234,74,129,201,113,137,244,66,17,85,14,223,169,156,168,
+52,175,173,243,179,119,166,47,77,126,57,191,248,110,237,212,234,197,11,43,19,239,252,177,54,243,209,207,243,247,215,142,189,117,237,141,55,31,174,205,31,159,249,188,186,241,235,230,177,227,115,55,206,223,187,188,242,217,219,149,202,244,196,131,175,143,220,159,155,154,218,248,229,159,7,91,181,235,211,103,111,94,95,252,123,246,167,163,95,92,249,160,86,173,205,44,47,76,157,172,222,58,251,231,247,147,63,110,84,215,207,221,189,114,233,208,199,181,155,223,92,152,185,120,245,211,213,169,219,191,85,215,143,46,44,125,251,221,137,229,218,221,219,239,221,90,92,93,63,245,215,196,39,15,87,126,159,61,180,124,117,97,105,110,235,200,191,239,111,46,157,59,243,195,230,242,201,201,175,78,87,22,239,85,62,60,124,237,242,108,58,16,33,246,31,66,219,140,247,27,185,108,40,27,150,27,34,4,146,51,106,170,249,102,58,154,137,129,20,131,77,115,60,20,110,184,130,81,139,233,144,7,27,217,158,139,150,254,169,8,26,116,88,41,29,235,72,103,63,123,124,58,96,211,134,14,
+140,238,158,206,65,213,56,168,188,146,13,65,69,101,163,238,173,197,44,179,125,117,166,77,225,163,108,111,144,167,15,214,162,154,222,25,35,184,104,19,34,135,178,67,186,106,52,103,162,232,241,76,3,78,155,242,12,50,16,198,41,50,4,192,170,94,214,81,200,235,12,128,65,26,27,113,116,211,118,80,201,180,85,119,55,12,67,83,229,17,192,60,178,208,82,11,197,71,87,122,34,219,49,52,192,156,178,101,216,40,27,113,138,170,221,89,233,1,197,40,48,95,232,221,104,236,193,60,145,196,237,85,82,116,134,20,187,158,186,16,142,54,152,69,234,22,225,206,145,61,199,28,48,119,171,58,103,26,182,35,7,184,52,252,5,56,121,167,195,182,242,246,237,183,207,135,194,173,141,210,67,109,16,110,200,222,200,170,151,142,238,56,186,117,190,27,142,45,253,186,229,88,47,168,46,57,186,45,91,239,196,97,211,212,118,85,38,94,251,63,73,149,216,65,195,182,125,232,114,107,107,106,181,70,179,79,15,57,86,153,237,108,70,23,30,149,109,150,119,219,11,54,84,175,241,96,
+39,67,58,115,138,102,30,250,170,127,36,88,130,86,218,61,16,93,172,104,240,144,180,204,178,145,247,17,253,77,207,49,125,104,29,190,197,212,146,166,50,56,48,71,153,129,198,138,112,107,158,142,238,122,191,185,97,147,212,77,224,209,85,229,248,137,217,69,233,4,179,209,101,237,228,202,150,5,123,187,23,85,103,146,253,246,128,171,72,71,162,193,220,237,100,26,64,233,146,237,139,204,134,196,130,200,160,172,229,103,192,75,141,43,182,251,33,147,115,212,209,166,198,233,255,0,90,219,139,106,
+
diff --git a/uppsrc/CtrlLib/src.tpp/Splitter$en-us.tpp b/uppsrc/CtrlLib/src.tpp/Splitter$en-us.tpp
new file mode 100644
index 000000000..b1f87f5d1
--- /dev/null
+++ b/uppsrc/CtrlLib/src.tpp/Splitter$en-us.tpp
@@ -0,0 +1,9 @@
+TITLE("Splitter")
+COMPRESSED
+120,156,213,88,255,111,218,70,20,255,87,78,106,27,1,37,236,238,108,99,3,153,148,173,155,186,169,106,87,37,235,38,13,65,57,240,1,167,26,31,178,143,144,102,90,254,246,189,51,216,62,136,19,219,164,251,97,65,2,231,238,222,183,207,251,220,123,15,134,20,189,124,137,219,248,5,46,249,235,255,196,231,108,19,168,209,80,216,182,55,96,212,25,124,121,247,91,111,208,186,108,116,237,166,214,66,64,139,229,18,203,115,44,98,211,46,188,17,139,80,135,90,54,241,104,207,246,44,203,195,253,89,192,226,120,52,12,168,231,13,180,16,5,33,234,58,148,184,182,103,123,196,114,61,10,178,20,99,138,93,234,16,219,242,168,211,247,121,60,27,13,153,103,13,90,87,93,16,178,180,37,80,142,73,151,218,174,77,177,133,169,13,166,136,231,217,196,117,60,171,215,237,246,103,108,173,132,12,247,182,4,33,148,12,166,196,29,128,207,247,247,247,29,98,227,157,7,54,40,35,216,6,87,9,172,97,155,186,196,233,225,158,227,17,15,91,160,220,113,177,211,95,179,136,173,30,
+15,221,41,13,221,197,125,161,56,168,104,189,38,196,5,145,110,187,251,130,216,46,4,234,89,182,227,185,24,140,83,74,45,139,18,139,246,122,212,233,58,110,127,201,153,207,163,209,240,239,207,255,188,250,249,195,249,167,107,52,140,173,1,186,94,7,66,41,30,157,141,134,49,25,188,235,79,224,149,174,233,231,4,228,254,88,63,190,81,81,48,70,195,87,24,159,99,60,30,95,54,112,7,119,168,227,52,209,62,19,233,14,250,156,63,95,226,204,132,121,160,111,30,201,21,173,55,211,64,204,138,52,33,109,125,164,189,164,185,211,72,196,136,161,173,240,23,92,33,181,100,10,205,100,168,152,8,99,164,182,18,201,8,173,100,196,209,108,41,2,127,127,12,4,162,136,133,11,238,35,46,212,18,116,44,101,36,238,180,88,16,124,213,34,55,60,82,98,166,255,235,160,79,49,28,152,177,16,148,243,16,177,64,219,132,71,228,139,88,69,98,186,209,172,64,114,14,58,57,67,83,174,182,28,142,137,208,23,55,194,223,176,32,179,57,253,138,252,136,45,22,34,92,160,152,107,
+6,40,176,52,101,81,220,209,33,225,1,210,31,78,1,254,215,92,77,26,41,250,147,179,73,219,120,110,246,211,108,24,16,222,72,225,103,160,101,240,233,52,112,149,173,55,50,136,243,196,38,0,167,7,38,103,185,168,133,242,245,54,170,39,153,37,29,53,179,228,105,64,20,138,211,28,42,153,102,45,73,218,65,178,42,160,243,81,198,147,134,8,213,164,173,223,114,72,198,230,217,241,3,18,30,248,153,128,3,138,30,226,99,0,11,234,11,112,181,80,200,183,107,67,52,71,168,130,44,80,133,223,230,59,147,239,205,77,252,24,118,64,64,176,40,82,242,25,132,218,51,48,163,186,74,209,104,101,198,16,11,253,130,213,201,107,68,128,239,161,0,49,208,105,28,56,138,15,241,219,117,196,227,24,129,73,33,219,136,232,138,174,47,162,118,107,190,9,18,210,171,165,190,73,75,46,22,75,213,25,149,36,241,173,145,196,38,80,33,86,125,3,186,212,174,1,97,82,43,15,184,253,246,32,125,187,253,44,135,79,137,30,165,96,191,253,72,30,118,187,205,188,38,37,206,166,
+185,185,226,106,19,133,255,101,122,202,113,124,35,55,161,174,23,167,195,152,104,56,2,178,74,196,225,102,53,133,203,12,241,214,186,192,250,245,151,148,171,125,246,107,21,52,45,119,210,141,21,15,47,214,123,246,133,199,105,39,49,225,31,237,234,19,52,5,180,93,202,128,231,117,43,169,249,13,153,244,144,188,183,112,180,20,190,207,195,102,89,228,31,228,46,238,154,65,239,196,242,176,155,121,50,116,227,138,181,187,161,140,86,208,124,228,154,39,119,20,26,215,92,59,172,5,43,112,40,117,235,100,10,153,14,214,96,80,194,116,77,160,59,144,231,41,131,116,29,9,249,2,226,184,225,232,134,5,27,56,56,135,8,67,222,65,168,188,59,188,23,97,97,119,168,216,48,65,252,153,12,171,213,14,182,79,84,252,149,8,197,138,101,213,117,158,226,243,144,173,198,194,22,42,71,11,214,84,38,248,221,174,96,87,104,172,16,251,71,113,203,131,226,246,90,29,192,157,146,255,59,140,235,36,138,50,216,254,128,43,120,112,165,235,77,33,90,188,224,106,39,206,155,243,82,58,
+162,194,120,235,115,52,57,63,154,41,145,30,165,150,208,146,147,237,164,38,101,51,110,39,187,115,147,150,62,83,22,209,47,50,186,123,70,68,90,188,74,68,185,131,149,99,74,65,168,27,209,15,190,127,48,81,215,227,52,72,159,58,69,175,89,200,143,152,89,228,223,174,108,203,104,114,1,175,98,71,235,229,32,85,120,113,241,13,61,135,36,2,20,251,222,207,183,230,109,73,78,87,228,85,217,23,155,231,176,173,230,119,28,62,87,5,229,166,226,215,28,61,232,22,84,29,182,2,174,198,154,238,13,3,160,196,84,219,132,108,39,223,28,160,40,161,114,82,8,26,205,65,181,106,243,109,49,60,172,65,245,96,80,114,125,50,132,83,169,148,49,216,148,97,168,77,153,8,238,197,115,8,53,23,202,33,252,145,69,127,234,78,112,60,127,214,195,44,213,114,82,147,123,170,91,101,93,234,160,24,62,232,78,101,151,237,215,56,45,227,143,14,117,83,41,131,220,233,227,169,110,167,160,202,80,87,108,62,237,139,39,155,55,89,89,50,83,254,206,99,64,111,187,228,201,100,
+110,254,84,100,52,25,227,119,158,50,240,174,120,204,85,237,57,61,145,42,28,211,99,157,220,107,163,247,249,187,95,67,81,172,152,226,123,111,172,116,182,29,253,11,102,70,36,34,
+
diff --git a/uppsrc/CtrlLib/src.tpp/SplitterFrame$en-us.tpp b/uppsrc/CtrlLib/src.tpp/SplitterFrame$en-us.tpp
new file mode 100644
index 000000000..2814004cd
--- /dev/null
+++ b/uppsrc/CtrlLib/src.tpp/SplitterFrame$en-us.tpp
@@ -0,0 +1,7 @@
+TITLE("SplitterFrame")
+COMPRESSED
+120,156,221,87,109,111,218,72,16,254,43,43,37,141,128,35,100,223,140,23,251,75,212,187,190,156,154,54,167,132,126,66,166,54,102,41,171,51,54,178,151,52,151,211,229,183,119,214,6,99,167,70,117,123,151,156,20,64,182,97,103,158,153,231,153,177,119,152,80,116,124,140,251,248,8,127,231,229,252,38,23,193,38,210,222,68,113,46,220,128,90,238,159,239,46,71,110,239,188,51,228,93,131,66,0,133,217,132,9,139,17,78,135,112,32,140,80,139,50,78,4,29,113,193,152,192,78,24,5,89,230,77,34,42,132,107,156,104,159,30,81,219,162,196,230,130,11,194,108,65,193,151,98,76,177,77,45,194,153,160,150,51,151,89,232,77,2,193,220,222,213,16,156,152,137,4,224,152,12,41,183,57,197,12,83,14,161,136,16,156,216,150,96,163,225,208,9,131,181,86,73,188,141,165,8,161,196,157,17,219,133,156,239,239,239,7,132,227,34,3,14,96,4,115,72,149,192,111,152,83,155,88,35,60,178,4,17,152,1,184,101,99,203,89,7,105,176,58,76,221,250,46,117,27,59,74,
+75,128,232,253,66,136,13,46,195,254,240,136,112,27,136,10,198,45,97,99,8,78,41,101,140,18,70,71,35,106,13,45,219,89,202,96,46,83,111,242,247,167,127,94,188,250,112,250,241,26,77,50,230,162,235,117,164,180,150,233,107,72,74,158,120,147,12,187,200,156,136,251,206,241,225,93,91,55,63,228,170,59,83,115,249,171,78,163,41,154,188,192,248,20,227,233,244,188,131,7,120,64,45,171,139,182,165,217,173,160,79,251,235,115,92,143,89,181,114,170,118,123,180,245,102,22,169,176,17,110,151,70,14,53,69,229,101,197,184,143,154,65,83,117,19,104,217,132,154,195,120,70,5,234,162,241,82,101,5,31,20,132,26,14,240,137,81,42,51,117,23,204,34,137,22,38,28,10,82,25,12,182,30,21,21,173,67,42,94,203,84,5,145,186,147,126,39,255,170,193,127,229,159,248,93,103,167,103,37,213,155,68,205,203,220,202,44,141,144,59,148,114,181,83,83,166,128,157,162,226,92,26,249,39,123,16,134,202,58,161,238,142,115,137,155,115,222,4,81,189,100,8,184,203,65,59,
+154,186,32,104,20,5,122,125,21,235,226,176,39,58,213,201,90,133,96,116,230,159,25,179,11,53,243,207,178,52,244,207,234,112,199,50,246,79,55,217,180,185,125,106,164,140,50,250,128,38,69,211,230,21,110,214,163,108,180,74,231,84,138,1,201,55,212,130,229,154,252,156,167,254,107,45,155,106,0,205,86,151,93,39,40,76,98,29,168,120,167,93,47,207,23,125,81,243,207,82,247,225,172,151,16,70,105,168,94,213,196,228,134,188,14,248,173,213,173,140,178,238,160,178,88,196,71,115,9,113,86,42,134,154,235,165,68,235,36,83,230,153,135,252,83,164,52,10,161,231,103,18,61,40,176,51,233,161,139,87,175,199,94,191,105,229,234,247,55,111,15,44,141,47,255,64,94,146,54,45,189,188,28,143,47,223,123,173,218,235,66,46,26,250,235,145,91,203,4,253,63,123,107,223,33,249,131,39,51,157,210,169,247,67,255,97,241,27,170,96,234,214,109,165,114,169,47,156,199,201,250,201,5,135,152,207,64,111,104,249,118,114,95,169,207,203,167,239,234,60,234,51,144,57,127,232,
+180,19,250,101,162,117,178,122,114,165,139,176,207,64,234,226,73,221,78,235,247,42,190,206,167,157,7,2,127,99,220,78,195,45,220,183,34,182,145,226,238,192,102,107,182,61,216,0,213,10,54,207,246,19,14,24,66,54,255,21,177,45,220,227,18,67,201,2,197,242,86,111,103,87,24,11,140,69,164,50,141,96,79,94,168,24,236,110,148,252,130,212,194,172,164,96,146,161,56,137,165,25,6,180,153,135,193,101,1,147,225,195,161,97,21,220,170,213,102,85,6,169,49,110,37,231,27,169,199,48,142,192,77,217,133,81,39,211,78,133,247,142,92,133,127,254,175,169,54,18,111,1,234,6,157,238,126,182,207,97,119,242,92,73,189,73,227,34,121,51,6,161,234,140,212,50,223,162,175,255,69,190,213,78,254,129,124,195,77,154,202,88,255,208,48,222,116,15,182,251,163,161,31,231,126,203,59,165,65,116,239,43,28,27,181,172,
+
diff --git a/uppsrc/CtrlLib/src.tpp/Static$en-us.tpp b/uppsrc/CtrlLib/src.tpp/Static$en-us.tpp
new file mode 100644
index 000000000..b41b6b829
--- /dev/null
+++ b/uppsrc/CtrlLib/src.tpp/Static$en-us.tpp
@@ -0,0 +1,11 @@
+TITLE("Static widgets")
+COMPRESSED
+120,156,205,89,107,83,219,56,20,253,43,154,210,118,3,13,25,91,182,99,39,153,206,148,150,150,50,109,217,93,160,179,31,88,130,21,71,73,60,56,150,199,86,72,233,206,246,183,239,149,252,146,19,231,1,100,167,133,25,18,91,210,209,61,247,165,123,197,21,70,207,159,107,77,109,79,219,240,211,61,166,35,50,11,248,245,149,111,154,78,143,96,171,119,251,233,247,78,239,224,77,163,109,238,11,20,29,80,12,91,55,28,203,208,77,220,134,63,186,161,99,11,27,166,238,224,142,233,24,134,163,117,189,128,36,201,245,85,128,29,167,39,22,225,38,222,195,182,133,117,219,116,76,71,55,108,7,195,90,172,105,88,179,177,165,155,134,131,173,238,144,38,222,245,21,113,140,222,193,121,27,22,25,98,39,0,215,244,54,54,109,19,107,134,134,77,216,74,119,28,83,183,45,199,232,180,219,93,143,68,220,103,97,182,151,175,235,88,239,13,116,187,7,50,255,248,241,163,165,155,90,42,129,9,96,186,102,130,168,58,188,211,76,108,235,86,71,235,88,142,238,104,6,128,91,182,
+102,117,35,18,147,233,106,234,214,70,234,182,214,245,57,5,136,131,87,186,110,195,146,118,179,189,167,155,54,16,117,12,211,114,108,13,54,199,24,27,6,214,13,220,233,96,171,109,217,221,9,37,67,26,3,5,83,111,75,97,237,166,189,103,89,150,9,243,77,211,178,29,19,27,96,27,211,48,65,21,166,222,177,204,142,133,187,33,77,56,29,186,135,169,218,82,250,133,224,66,110,129,228,52,157,189,182,217,238,232,160,125,179,99,155,90,167,173,219,134,80,158,14,106,111,27,38,238,88,5,82,102,181,127,110,254,125,241,254,236,240,235,5,186,74,140,30,186,224,132,251,30,154,251,195,49,229,201,203,235,171,68,239,125,234,186,240,155,142,92,210,111,92,60,201,213,221,190,248,250,153,12,104,240,150,36,180,143,174,94,104,218,161,166,245,251,111,26,90,75,107,97,203,218,71,217,62,249,8,186,41,191,191,209,80,137,170,78,233,170,147,74,168,104,54,8,124,175,22,75,8,242,142,199,65,31,137,191,202,148,38,122,32,20,42,248,92,11,250,184,208,9,7,33,91,226,
+149,214,67,226,195,170,85,204,5,229,31,88,200,221,134,120,144,223,246,187,72,149,178,156,222,175,97,143,220,151,133,36,66,61,41,90,49,218,168,16,22,67,125,84,153,80,46,54,208,72,29,216,47,216,128,93,17,159,208,92,168,131,124,38,98,163,237,57,158,134,183,41,197,119,44,96,241,83,57,2,218,10,138,18,30,140,42,62,106,73,122,149,145,181,44,211,169,15,162,121,20,248,227,208,109,248,79,55,163,68,90,38,169,184,164,191,194,140,164,178,178,202,80,142,77,105,200,85,158,233,130,22,58,10,2,54,167,67,116,71,130,25,133,185,49,69,71,159,79,79,206,220,155,207,239,63,92,54,243,135,119,239,207,46,223,159,23,143,231,167,39,31,47,183,243,129,41,25,83,183,225,177,48,145,175,210,231,151,110,115,7,234,146,88,107,213,37,183,93,86,88,191,144,164,143,170,32,234,30,6,242,167,227,98,164,204,17,91,152,35,137,188,242,189,251,90,29,210,214,248,161,148,5,113,134,6,20,13,253,36,10,200,61,152,102,64,71,12,204,34,38,72,159,84,205,40,
+54,66,126,2,159,196,163,48,147,207,41,13,139,169,136,132,195,20,116,43,91,201,175,169,169,144,55,33,177,123,240,84,11,85,70,31,96,32,117,6,8,162,232,242,64,81,37,87,209,83,109,214,115,99,17,141,9,135,20,244,122,135,244,74,208,255,143,97,178,194,89,20,15,144,74,104,33,247,153,251,183,238,62,67,132,75,235,15,232,216,15,67,63,28,231,153,12,17,143,251,119,132,67,140,255,121,249,65,117,135,234,71,126,146,203,3,110,225,16,87,213,243,240,83,92,34,62,233,0,87,109,146,105,227,132,134,96,133,32,184,71,179,4,66,5,66,39,16,219,32,6,74,136,243,10,165,133,142,253,209,136,198,9,26,197,108,170,160,160,193,61,196,120,20,80,145,29,133,178,38,140,223,210,123,20,197,204,163,73,2,111,90,232,163,124,149,102,70,160,7,89,19,246,33,51,206,166,2,69,110,13,40,95,221,87,238,43,20,248,131,152,196,247,77,192,153,211,59,16,0,164,184,71,30,9,33,221,38,76,204,139,98,90,128,204,196,6,200,253,13,178,225,111,210,9,192,
+68,52,174,139,212,194,24,91,5,169,156,221,175,234,251,23,10,205,130,204,182,81,185,5,159,159,25,139,101,94,62,29,135,144,168,147,220,164,185,71,78,73,124,155,121,86,178,201,186,233,247,29,152,183,58,188,115,101,4,131,96,131,58,154,185,26,4,253,164,142,255,154,196,243,150,125,171,107,32,30,157,118,0,239,105,153,39,85,103,198,243,156,122,156,132,227,89,64,98,148,168,189,80,97,242,59,63,153,201,212,48,142,217,44,90,200,70,171,92,32,35,253,160,176,128,53,253,37,138,191,70,112,28,201,60,87,58,132,56,137,114,73,55,187,193,31,144,111,67,46,250,52,241,148,240,120,230,241,174,210,193,213,217,47,157,181,210,19,74,200,167,249,130,68,200,72,94,78,160,248,146,14,40,171,176,89,20,177,204,5,160,132,147,222,64,18,20,176,177,56,41,80,36,5,128,162,17,37,62,159,17,113,75,129,230,19,168,215,166,162,190,203,220,67,30,52,233,122,233,60,18,13,6,192,131,90,176,29,69,44,4,191,26,202,3,141,134,80,244,201,51,77,200,36,36,224,
+19,40,0,74,162,202,169,127,25,147,48,41,37,144,214,22,234,98,241,102,99,164,39,166,112,251,133,168,92,109,139,109,58,122,1,184,59,83,252,149,134,160,199,196,129,206,41,40,105,228,7,1,168,111,238,243,9,18,103,109,64,211,246,110,117,49,156,83,92,126,147,182,176,13,73,107,213,104,109,53,41,166,244,107,8,47,4,105,181,121,173,141,79,85,163,104,245,90,181,217,112,111,86,180,190,194,145,82,93,160,236,126,79,120,207,133,68,250,0,173,196,102,159,144,109,69,30,159,59,112,137,2,111,119,30,113,156,182,80,40,38,9,20,86,89,35,148,53,89,34,108,33,20,32,134,134,34,28,68,146,202,114,120,156,102,247,160,182,103,170,176,94,211,222,46,184,66,177,172,191,204,243,39,244,181,238,141,218,217,46,159,223,254,98,203,184,34,71,251,30,159,197,116,71,14,144,161,237,220,252,9,58,142,201,92,212,242,53,246,84,40,188,37,222,173,200,184,225,112,205,165,85,54,191,191,40,237,130,17,75,172,101,51,62,253,202,106,80,160,47,223,92,85,226,121,62,
+241,121,173,27,43,180,63,81,26,157,139,179,200,109,12,24,11,30,73,184,64,89,235,182,98,131,90,182,183,176,188,114,97,2,71,19,45,72,159,142,210,115,140,54,115,41,228,130,212,87,73,18,65,192,66,140,195,230,162,196,200,141,173,234,129,133,27,148,112,198,20,53,60,82,5,10,70,169,132,130,195,49,67,33,227,82,238,138,200,27,4,3,123,43,217,37,227,182,156,95,182,20,17,208,30,157,86,178,189,251,185,130,87,166,150,104,65,132,106,247,167,112,91,42,116,119,65,241,105,197,238,46,152,46,148,190,53,201,103,69,145,69,197,63,155,64,244,29,30,170,21,204,221,101,214,143,44,246,191,179,144,67,77,203,98,116,71,99,121,19,130,146,124,55,20,248,33,21,183,46,226,44,21,85,238,144,70,52,28,138,64,220,232,252,75,106,248,66,226,177,191,226,126,93,157,219,175,103,187,224,31,41,218,90,223,88,117,169,59,95,115,98,6,116,196,221,195,216,31,79,56,106,140,64,3,147,82,69,133,90,246,133,182,56,139,220,195,1,227,28,170,246,169,20,166,76,
+85,242,18,94,36,44,188,149,102,96,247,11,255,59,221,149,106,50,184,157,235,38,1,80,168,170,32,84,32,36,6,247,232,132,242,47,126,40,182,66,238,33,32,122,193,108,152,246,76,4,154,26,47,189,192,156,67,221,54,97,243,188,40,19,173,77,76,161,145,145,213,218,91,34,121,212,40,206,94,136,179,235,255,0,56,57,23,189,
+
diff --git a/uppsrc/CtrlLib/src.tpp/StatusBar$en-us.tpp b/uppsrc/CtrlLib/src.tpp/StatusBar$en-us.tpp
new file mode 100644
index 000000000..a34193d87
--- /dev/null
+++ b/uppsrc/CtrlLib/src.tpp/StatusBar$en-us.tpp
@@ -0,0 +1,15 @@
+TITLE("StatusBar and related widgets")
+COMPRESSED
+120,156,221,90,251,83,20,87,22,254,87,110,229,65,129,2,233,238,153,97,6,72,82,238,98,54,177,146,184,41,101,55,85,75,33,211,51,115,97,122,211,211,61,213,221,3,178,235,90,188,196,103,64,163,68,37,40,198,7,106,80,67,76,130,16,133,104,34,62,162,70,204,38,198,199,26,9,74,192,104,162,150,10,110,86,139,61,247,118,247,76,15,52,160,32,38,187,254,192,204,244,237,123,239,57,223,61,231,59,143,107,14,135,158,122,138,73,102,158,100,198,248,151,49,29,231,243,17,81,203,205,17,156,78,79,38,207,185,50,223,120,249,143,233,153,83,166,37,166,57,147,96,17,22,22,113,184,89,135,199,229,96,157,92,26,252,97,29,44,231,226,28,78,214,195,165,59,61,14,135,135,201,240,139,188,170,230,230,136,156,199,147,73,118,230,96,18,231,118,113,172,219,233,113,122,88,135,219,195,193,92,142,97,56,198,205,185,88,167,195,195,185,50,2,88,245,231,230,240,30,71,230,148,89,105,48,201,65,118,130,197,25,54,141,115,186,157,28,227,96,56,39,108,197,122,60,
+78,214,237,242,56,210,211,210,50,252,124,88,19,100,201,216,75,96,89,142,205,244,177,238,76,16,121,254,252,249,169,172,147,209,37,112,194,98,44,227,4,81,89,120,198,56,57,55,235,74,103,210,93,30,214,195,56,96,113,151,155,113,101,132,121,133,15,217,107,78,214,112,141,169,186,155,201,16,52,12,75,76,153,202,178,110,152,146,150,156,246,36,235,116,131,162,30,135,211,229,113,51,176,57,199,113,14,7,199,58,184,244,116,206,149,230,114,103,4,49,31,192,74,110,206,223,243,254,241,244,11,51,83,254,52,27,229,168,142,76,52,91,227,181,136,250,123,94,65,10,22,121,13,7,16,133,21,171,136,151,2,72,145,35,154,32,97,53,33,55,71,101,50,17,249,112,101,190,60,141,65,57,79,51,76,10,195,76,75,100,82,153,84,206,229,74,66,198,105,152,207,201,57,230,153,63,209,12,41,95,206,210,20,49,151,172,192,233,11,193,199,180,105,66,136,47,192,25,105,78,71,2,156,79,73,121,111,201,234,146,146,146,242,43,131,240,183,228,238,251,117,63,125,115,98,113,
+73,83,201,178,5,93,91,251,171,15,111,187,81,94,221,189,111,215,134,238,219,11,151,172,175,88,217,252,65,67,243,79,155,246,221,168,106,122,235,139,193,246,237,159,92,90,53,176,232,171,247,174,238,222,180,229,202,221,235,173,231,6,86,119,245,238,219,95,94,219,121,188,165,178,239,227,206,202,198,35,173,11,171,55,156,248,236,70,107,201,150,117,155,250,238,29,187,55,216,187,248,64,125,199,145,15,111,110,190,84,177,179,121,237,185,246,190,15,62,190,188,174,189,175,227,64,99,103,229,206,187,119,170,118,44,106,219,120,244,70,247,217,230,115,183,79,31,252,186,243,254,123,235,191,95,255,207,170,53,253,27,107,187,87,124,85,127,255,230,207,221,87,62,90,125,235,106,249,183,23,106,206,246,220,61,125,160,233,210,194,55,75,107,59,183,150,244,191,127,227,163,234,183,222,90,213,242,197,143,117,205,155,151,237,217,218,188,253,204,206,120,221,77,72,144,0,80,35,85,8,133,69,140,84,56,13,193,143,232,115,45,200,107,112,40,97,5,171,88,210,84,36,192,4,37,196,
+19,67,68,249,2,22,3,169,104,134,70,102,171,145,112,88,86,225,228,52,25,249,48,138,144,175,188,138,254,0,102,134,145,156,111,57,98,111,10,10,129,219,9,100,43,115,127,21,249,121,137,204,227,3,1,203,68,149,172,166,5,113,108,118,50,236,42,138,130,84,128,4,13,229,43,114,136,14,139,56,95,67,50,88,143,80,16,212,82,109,116,3,223,225,125,34,21,36,32,168,97,145,47,38,75,168,184,16,43,188,8,159,126,162,144,138,138,4,45,136,2,56,31,172,45,0,63,2,90,48,57,250,19,195,24,86,136,104,127,230,197,8,38,219,193,247,215,120,65,210,102,193,124,19,7,94,84,101,68,247,2,209,141,189,16,56,74,88,86,120,165,24,249,101,73,3,32,17,160,72,37,55,87,231,67,114,4,30,131,124,154,16,194,169,150,83,2,139,207,121,6,77,199,138,80,8,239,17,149,115,77,195,215,65,122,101,214,179,68,205,231,115,227,253,195,198,59,10,101,33,16,245,134,168,95,128,35,205,198,90,244,121,98,238,240,137,160,163,205,60,7,210,120,95,244,121,
+50,178,153,8,234,170,54,83,231,120,51,188,25,81,232,230,196,80,140,190,234,77,176,238,67,172,110,244,141,70,146,144,30,98,116,36,41,247,127,5,28,106,99,115,116,83,123,44,160,128,181,129,162,42,74,244,43,24,24,24,60,61,31,73,24,131,55,38,81,67,53,124,132,90,104,48,230,184,212,82,157,153,38,158,83,178,12,197,83,230,205,144,2,120,46,121,221,152,105,247,38,85,33,101,94,150,225,20,150,151,13,39,51,221,133,184,176,44,129,183,106,58,195,16,17,52,60,87,3,158,33,142,252,59,117,182,166,192,23,187,61,116,101,83,230,189,78,62,45,91,192,230,40,44,204,197,162,154,138,102,226,2,160,180,66,140,10,233,174,130,20,16,252,20,4,74,127,230,4,53,40,71,196,0,97,41,112,106,63,8,82,0,83,36,36,69,66,62,32,6,88,89,95,46,70,75,148,142,144,79,86,2,250,248,48,224,184,73,241,214,201,112,186,73,241,156,71,233,0,241,86,76,45,22,12,66,140,25,46,61,74,191,12,54,164,15,23,5,101,113,116,59,30,217,58,199,
+207,180,217,102,36,120,236,39,56,54,67,144,200,35,67,174,149,231,125,206,186,10,228,174,204,196,236,96,226,74,79,42,29,82,189,35,150,177,49,245,183,154,217,176,216,158,108,134,125,96,8,1,84,130,148,151,230,29,70,164,55,147,141,177,45,206,150,91,141,51,130,183,178,225,171,26,230,117,74,30,42,196,4,76,244,5,41,96,115,96,81,197,103,132,66,56,32,0,59,138,197,144,41,202,97,213,154,81,141,37,135,101,127,115,101,203,169,12,73,216,65,150,23,177,150,205,251,178,72,110,20,255,82,98,82,44,175,215,13,199,4,107,202,51,104,22,214,34,138,164,147,57,1,10,78,41,70,210,113,248,143,15,33,57,12,105,163,38,43,222,231,198,109,208,122,188,154,131,244,207,17,76,90,181,49,59,146,78,67,222,9,230,151,168,38,217,89,136,58,132,178,226,89,144,18,32,61,41,123,10,28,14,8,21,215,124,103,78,172,136,178,19,153,82,126,180,172,158,76,104,2,163,120,100,64,23,64,79,16,160,218,208,130,144,62,24,145,93,213,43,19,139,95,206,140,136,
+162,62,170,162,48,41,58,163,9,6,44,136,66,88,11,202,1,59,156,3,128,243,116,203,78,169,35,27,160,119,10,21,129,228,252,254,32,112,182,153,169,76,20,236,87,160,236,25,87,106,90,52,2,122,145,112,172,106,210,235,56,35,211,201,153,66,107,172,92,48,25,200,120,226,139,52,155,170,201,54,15,179,230,96,195,194,238,227,3,109,22,73,202,30,27,106,52,5,252,13,193,198,100,102,88,209,138,251,158,232,77,202,136,238,61,28,198,88,8,200,34,222,171,68,252,64,129,169,58,4,217,65,65,154,33,169,88,211,85,139,234,200,208,6,142,247,137,89,224,108,197,222,39,200,192,80,15,141,151,14,13,137,23,15,221,228,137,118,10,70,232,242,176,92,154,39,129,117,176,101,229,199,74,106,72,155,231,170,222,230,217,83,247,211,218,182,170,207,55,44,90,126,232,254,224,59,215,214,54,110,57,219,125,236,224,23,167,26,155,207,52,92,57,221,93,181,249,203,21,71,55,46,187,181,178,164,105,217,153,250,95,58,46,95,62,95,217,190,175,107,85,197,166,193,139,37,
+251,223,57,125,103,213,157,250,207,59,239,221,27,92,95,186,182,186,174,180,235,235,207,154,6,62,88,86,85,209,248,118,105,217,246,253,77,181,27,174,172,89,82,209,8,223,107,90,150,54,239,88,250,159,69,87,58,246,55,213,212,30,120,123,251,182,154,234,174,166,178,158,11,155,142,236,250,250,112,207,209,147,203,251,191,218,118,113,105,77,105,217,205,91,59,170,122,119,245,55,31,216,125,170,243,122,219,158,142,29,219,143,29,237,61,180,226,126,237,149,119,215,244,44,104,216,178,183,254,250,162,142,203,239,86,31,249,100,83,235,174,95,246,180,236,57,122,169,175,188,99,160,233,124,207,189,189,117,125,39,63,255,113,119,79,67,203,185,203,239,53,86,46,121,187,119,121,251,142,198,47,203,142,46,188,211,191,103,71,217,133,91,101,71,119,156,95,185,186,185,235,135,131,107,250,23,108,92,243,237,169,158,193,139,219,15,253,235,64,243,225,157,45,235,142,239,190,186,253,212,130,147,187,214,156,187,121,103,101,221,241,187,255,6,241,234,239,53,175,95,209,191,173,119,119,95,
+99,83,71,123,219,194,182,117,119,111,151,14,84,172,188,118,178,113,111,217,206,202,165,215,183,84,45,238,109,24,232,232,57,249,75,205,193,178,197,183,54,151,181,94,107,169,124,247,204,247,205,155,47,44,175,216,187,254,187,238,129,214,218,107,23,27,62,108,104,236,90,120,186,188,236,195,149,55,119,94,123,179,249,253,229,213,215,150,183,12,126,243,209,199,37,203,143,111,233,111,56,63,80,182,160,189,178,28,190,127,87,115,173,237,231,31,207,150,111,61,113,100,201,15,125,135,154,62,169,31,248,244,250,138,141,235,90,63,109,43,61,113,251,112,93,252,233,198,186,75,180,145,165,27,159,222,252,33,145,48,48,172,47,101,233,99,241,34,242,193,68,168,14,136,105,250,100,77,131,242,205,168,214,66,224,65,136,15,135,69,82,15,146,248,89,4,181,161,92,148,58,202,238,130,20,132,8,171,25,189,154,24,51,208,78,38,214,96,65,210,36,18,233,242,249,17,201,175,139,32,104,197,230,158,62,94,197,186,141,211,158,18,176,134,10,30,164,10,127,195,222,148,2,69,8,131,
+27,17,239,86,48,60,34,145,220,152,166,75,134,18,161,110,167,189,56,90,42,251,138,233,24,240,145,70,244,77,162,82,0,47,72,5,164,194,215,76,55,245,225,32,95,40,200,17,37,158,191,134,65,66,102,132,121,133,164,22,6,16,40,91,38,18,162,144,172,96,189,33,104,215,179,3,212,99,64,0,213,21,0,103,60,104,143,43,174,107,251,255,159,175,69,81,179,97,237,232,24,249,97,42,133,178,192,154,124,188,255,13,214,251,44,213,32,38,174,55,193,251,124,28,171,71,145,200,139,78,210,231,228,153,19,158,55,88,222,62,184,252,14,249,141,121,180,156,78,214,227,154,32,21,202,111,224,64,50,29,164,170,70,219,155,182,218,12,13,221,209,151,230,88,216,219,62,120,191,132,199,29,189,189,121,254,226,17,2,56,145,52,72,87,54,157,41,94,238,33,39,70,87,210,203,10,125,214,163,203,98,30,2,138,153,242,108,160,132,23,129,16,108,34,244,116,25,73,178,22,237,63,235,244,129,116,246,152,112,242,16,103,134,177,31,241,233,195,112,241,71,203,31,44,39,64,
+232,15,18,115,137,62,243,71,20,202,54,106,49,228,235,161,104,222,144,15,254,2,228,72,207,74,161,89,189,36,163,2,81,246,1,151,191,14,38,249,18,22,195,70,110,158,152,20,179,89,51,217,50,173,147,114,147,254,144,176,33,82,101,189,75,68,152,188,72,0,142,38,188,21,35,119,75,67,255,85,44,69,40,151,102,203,178,72,137,63,46,158,144,188,70,125,196,137,205,107,138,92,0,156,175,18,62,52,129,204,38,167,69,103,161,176,34,23,10,1,208,195,184,196,209,64,48,170,168,165,58,15,27,75,196,221,226,8,82,188,197,163,68,152,84,128,37,114,51,34,22,39,147,113,147,130,147,104,64,2,194,144,160,154,164,60,31,37,117,217,247,87,120,102,4,57,26,62,244,248,98,54,112,105,178,107,217,159,54,88,229,81,105,193,170,240,156,120,245,237,61,34,27,80,127,252,4,31,235,3,65,181,169,135,207,88,255,199,200,119,69,222,135,69,218,33,182,71,192,38,36,100,63,210,146,114,92,88,190,30,119,77,240,48,92,235,159,59,10,80,69,102,53,67,179,127,
+244,23,172,200,80,102,243,146,209,109,143,189,18,228,85,19,80,172,97,37,68,125,55,70,15,86,128,44,224,193,222,102,197,20,235,240,255,122,64,142,31,68,8,51,15,4,163,141,77,33,179,49,1,154,113,12,51,66,16,251,109,1,245,26,33,141,16,150,198,27,221,53,222,39,12,135,43,75,191,86,142,24,109,29,202,76,54,136,145,49,53,140,253,66,190,224,183,94,117,141,118,61,96,108,153,50,111,118,244,66,41,128,231,166,70,117,53,188,30,48,139,165,211,57,177,121,201,118,98,196,191,130,188,83,17,59,225,112,109,197,222,172,247,189,137,230,47,90,249,39,88,115,196,184,247,99,71,164,119,4,98,135,19,109,27,88,94,161,162,143,112,45,163,163,139,13,178,228,21,168,1,198,128,215,232,134,71,95,66,175,70,84,13,225,185,130,10,46,16,136,68,219,152,162,144,143,73,95,156,28,152,85,248,95,147,62,101,141,23,199,107,200,113,115,109,2,13,25,183,222,58,154,102,4,41,82,216,246,90,193,92,19,162,138,101,238,175,8,207,120,175,212,189,121,97,57,
+22,131,31,234,146,103,108,92,37,92,100,155,33,217,35,74,4,129,194,205,200,79,205,121,15,142,254,40,39,55,145,243,152,204,255,208,16,143,254,36,1,136,134,130,68,177,161,255,195,8,8,195,87,108,140,91,250,242,19,186,93,26,255,173,146,237,209,79,106,127,98,164,115,9,219,156,137,165,237,16,78,122,20,162,77,245,78,181,169,228,172,251,0,154,80,108,145,144,149,100,191,95,172,251,48,134,114,137,73,176,238,40,208,211,157,30,32,210,197,253,142,47,79,109,73,202,190,66,125,232,125,172,61,245,132,7,216,117,132,72,154,111,147,205,12,17,107,136,83,229,19,142,177,137,172,163,75,239,157,63,34,78,200,59,63,247,65,33,155,142,109,106,122,122,185,70,250,129,163,73,229,64,185,255,5,204,176,58,93,
diff --git a/uppsrc/CtrlLib/src.tpp/Switch$en-us.tpp b/uppsrc/CtrlLib/src.tpp/Switch$en-us.tpp
new file mode 100644
index 000000000..72574500f
--- /dev/null
+++ b/uppsrc/CtrlLib/src.tpp/Switch$en-us.tpp
@@ -0,0 +1,17 @@
+TITLE("Switch")
+COMPRESSED
+120,156,229,57,249,83,26,121,190,255,74,87,205,108,214,56,137,225,84,162,111,95,101,43,153,221,154,218,173,183,85,51,179,251,139,207,4,196,86,187,6,193,5,116,39,187,243,82,136,7,42,42,120,161,17,197,219,168,81,17,143,120,227,17,188,21,143,104,196,27,239,43,26,188,69,133,126,223,166,1,193,104,146,183,179,147,157,169,199,15,77,247,183,63,247,253,253,182,55,9,250,252,115,194,45,194,103,132,15,252,60,31,192,254,140,16,22,223,199,27,161,80,104,94,12,18,213,235,187,63,252,233,174,151,235,61,23,119,202,77,140,10,17,80,33,123,16,201,52,42,153,72,33,185,131,11,145,76,36,81,73,100,10,145,70,186,75,161,145,201,52,130,39,147,197,224,241,124,188,89,36,26,205,11,67,34,1,36,146,7,149,68,244,160,208,40,52,34,217,131,70,2,184,36,2,129,68,240,32,81,137,20,50,141,68,245,244,131,121,76,31,111,6,141,236,229,250,181,59,64,34,99,156,0,113,2,209,157,68,241,160,144,8,100,2,137,2,88,17,105,52,10,209,131,74,35,
+223,117,119,247,100,50,130,249,8,135,109,229,133,16,137,36,162,151,47,209,195,11,200,252,228,201,19,55,34,133,128,75,64,1,196,136,4,10,16,149,8,214,8,20,146,7,145,122,151,112,151,74,35,210,8,100,64,156,234,65,160,122,6,51,184,140,160,235,85,167,126,80,117,15,130,39,194,135,1,9,215,47,136,68,15,128,226,126,203,253,51,34,197,3,40,74,35,83,168,52,15,2,96,78,34,145,200,100,18,145,76,186,123,151,68,117,167,122,120,6,194,12,63,152,235,227,253,143,71,255,243,171,47,255,235,246,159,191,129,188,121,100,47,232,155,191,33,124,102,224,13,31,111,30,213,235,15,247,8,144,247,175,8,132,219,4,194,61,23,130,27,193,141,68,165,222,132,172,102,182,173,3,49,161,71,182,71,43,186,15,134,79,240,114,133,240,127,235,42,20,204,229,132,34,192,224,16,15,102,193,76,204,130,16,199,31,10,10,225,135,48,88,172,199,16,252,61,147,21,194,67,66,97,136,99,49,47,15,114,97,50,120,48,239,166,155,149,204,189,123,72,16,35,0,246,36,
+146,104,30,55,128,21,132,225,90,65,170,64,32,8,223,66,193,85,112,34,201,220,78,27,220,202,104,239,74,239,50,161,123,209,203,165,41,121,5,162,153,230,8,201,80,67,145,72,63,214,156,19,165,82,20,20,12,183,53,172,247,174,87,70,190,24,110,235,216,235,77,140,91,172,20,27,59,94,102,200,10,107,234,218,37,99,186,246,232,149,230,196,246,230,227,246,200,149,238,201,201,172,172,181,238,252,162,229,40,145,126,181,213,140,158,169,135,6,154,148,163,130,138,146,81,236,151,131,93,94,21,142,161,155,103,167,167,211,157,157,104,219,204,140,188,176,80,191,212,213,53,215,104,50,150,22,9,138,50,246,171,74,122,164,219,59,69,205,10,125,115,164,98,160,112,111,98,162,110,126,227,160,243,232,168,187,78,214,84,89,123,104,232,19,36,91,192,6,26,170,76,234,30,53,154,63,83,86,49,241,124,124,170,252,245,150,114,66,30,223,149,107,216,145,239,171,210,99,202,251,83,87,22,27,170,151,54,50,119,4,155,131,181,170,222,48,89,213,74,205,226,234,73,218,154,122,
+125,183,165,191,41,34,126,105,234,77,163,46,33,163,112,237,229,74,238,244,128,90,167,110,121,33,31,124,253,92,119,120,60,209,49,50,176,154,149,17,158,148,216,39,24,30,205,142,91,8,211,205,103,74,166,101,75,11,5,67,233,163,157,7,153,81,241,202,168,213,226,29,221,225,184,118,185,108,101,239,112,122,115,61,111,124,185,229,72,49,171,168,13,155,222,238,28,57,58,82,215,70,118,156,101,74,227,180,241,175,194,139,195,54,19,186,52,103,149,153,130,250,184,183,53,197,245,145,77,241,146,205,92,221,112,244,110,134,58,55,97,100,102,124,54,238,69,211,230,134,162,192,92,144,119,60,63,98,84,238,151,163,229,10,237,179,228,254,217,50,101,187,104,50,39,190,182,227,172,109,80,105,56,21,188,204,105,143,138,172,92,169,20,72,27,90,7,37,241,209,201,51,81,166,168,169,62,145,172,179,126,37,242,165,48,177,164,32,18,93,57,80,76,165,158,119,189,204,171,95,19,79,190,217,89,45,29,124,109,46,31,156,82,12,201,182,58,119,234,150,167,203,100,50,217,249,
+139,176,152,162,141,167,170,26,193,122,249,240,102,153,180,120,71,175,175,20,234,84,210,138,141,234,72,89,255,134,33,169,119,60,121,59,44,114,116,178,170,49,94,81,243,234,112,177,119,171,230,64,179,62,222,86,54,105,42,205,91,47,125,49,177,191,218,82,157,189,150,210,154,48,186,117,168,29,66,195,170,222,148,44,247,60,85,233,106,4,166,148,154,54,85,82,248,240,211,129,124,77,195,178,81,147,153,146,166,26,232,142,206,171,58,204,48,37,197,12,109,152,81,69,227,98,106,77,169,190,185,185,69,179,63,162,217,137,146,103,205,161,217,194,234,249,183,111,119,102,204,49,162,121,85,125,124,237,74,231,186,32,234,176,254,52,69,80,158,90,142,118,71,182,149,204,108,100,142,29,200,179,135,103,215,52,27,58,65,226,206,177,32,75,53,165,75,53,168,235,178,197,135,243,194,70,121,88,245,168,49,95,156,191,182,102,84,53,148,20,10,244,235,225,157,209,221,109,137,245,11,251,165,82,217,171,156,87,245,197,197,234,151,170,210,238,131,55,50,185,188,36,182,107,254,236,
+60,113,20,211,202,16,95,210,176,54,51,25,163,89,202,54,245,244,247,140,230,103,215,8,251,10,219,4,225,225,13,130,222,5,125,152,44,189,184,118,186,108,75,181,222,182,184,251,106,173,241,101,99,194,129,52,253,108,181,183,115,81,36,80,12,73,129,24,169,111,206,129,193,151,38,58,43,246,42,251,170,12,45,245,213,109,226,253,4,121,85,76,88,140,66,116,84,180,159,85,17,187,189,180,149,88,30,59,111,206,171,79,174,109,107,146,52,108,40,86,135,181,130,76,141,42,46,236,213,129,232,232,72,59,52,216,105,210,8,85,162,217,62,240,211,99,151,190,104,115,108,120,209,97,69,203,165,164,166,16,220,111,128,194,38,8,111,23,84,97,57,173,197,115,90,156,185,61,57,212,47,111,175,72,31,68,151,218,13,5,51,165,167,134,36,241,201,145,116,83,146,84,187,92,156,20,221,18,49,82,60,220,28,153,55,53,218,49,93,156,151,166,235,207,201,75,28,155,95,214,232,183,39,59,199,6,94,135,117,109,235,103,203,250,139,21,241,97,59,229,146,178,217,37,153,73,
+165,93,125,54,89,23,169,53,68,203,7,119,206,246,230,234,230,143,183,155,37,113,198,179,180,18,233,146,57,69,156,189,186,170,144,44,72,148,113,241,45,242,244,10,93,102,246,124,89,170,246,36,111,173,83,82,88,120,30,174,211,45,86,76,20,203,204,207,159,61,91,43,28,221,69,167,166,228,35,35,145,169,181,169,19,137,251,249,203,173,155,45,45,51,229,230,138,241,168,205,216,188,154,140,248,113,237,184,124,176,168,96,118,33,251,124,179,84,18,171,201,139,104,63,153,94,203,65,165,90,84,222,58,149,117,124,172,56,206,40,218,104,52,27,23,141,226,33,73,130,182,217,156,148,89,147,159,42,56,223,236,54,215,27,183,102,119,15,117,89,81,11,101,202,214,190,193,103,243,154,73,225,102,105,154,81,98,174,59,148,207,164,161,38,209,220,102,173,186,52,117,191,183,55,110,98,66,152,220,208,159,240,42,103,198,84,184,144,33,109,67,27,219,77,83,70,165,41,107,71,134,102,207,230,246,215,233,243,243,75,250,98,230,74,234,118,83,95,30,159,14,183,14,142,160,153,
+187,34,163,188,8,109,154,85,55,158,38,9,106,196,67,90,81,123,202,243,238,152,158,194,23,35,173,229,35,104,243,174,8,213,190,125,86,173,218,85,39,79,202,98,147,244,242,181,103,133,163,134,222,108,121,186,240,160,20,61,24,58,200,126,30,129,102,158,111,29,190,61,57,120,107,168,60,149,20,24,146,38,146,7,213,26,180,27,45,213,160,237,166,70,227,208,193,96,249,218,158,178,165,174,81,170,16,171,87,222,52,214,174,78,107,101,134,243,142,113,0,131,129,188,200,67,19,91,163,91,149,207,81,157,112,72,121,128,46,143,85,156,74,230,18,81,249,220,249,110,167,244,108,33,37,54,90,19,214,161,212,108,105,91,39,90,245,81,91,89,219,231,211,105,253,74,125,124,203,148,172,191,198,156,59,22,151,173,78,202,52,231,150,25,70,211,141,245,201,234,104,237,179,227,228,166,180,166,216,136,86,105,146,100,62,166,84,219,42,48,159,77,205,141,152,167,213,103,89,89,102,77,229,128,65,188,172,158,211,103,138,167,14,79,134,206,26,21,201,11,103,145,85,99,25,93,
+231,229,230,234,249,181,54,209,177,104,101,60,97,175,89,188,108,174,88,202,169,238,141,120,110,74,211,181,87,138,77,194,61,101,14,90,182,111,238,221,220,211,207,10,182,71,170,132,231,194,133,179,241,141,206,221,41,77,163,105,162,227,168,243,197,158,104,183,66,132,154,182,76,194,249,188,156,243,8,101,204,65,105,230,140,121,97,97,183,125,116,160,240,185,57,197,156,187,215,163,169,154,52,9,23,226,95,103,20,101,206,214,13,175,162,73,70,212,24,169,144,14,25,226,122,82,99,163,165,83,185,231,29,203,231,79,143,70,211,58,106,158,170,77,49,39,70,52,119,64,178,151,218,221,214,220,42,205,142,25,88,57,19,71,148,197,86,183,237,26,90,138,242,7,204,194,153,183,61,103,173,3,75,211,39,243,57,203,145,111,75,149,111,38,98,82,150,203,43,183,147,148,7,237,194,150,216,138,195,51,241,72,81,82,239,242,64,218,192,34,218,179,208,183,48,121,40,94,169,120,218,145,174,52,8,247,171,231,218,84,130,48,84,112,46,92,13,203,182,230,227,159,172,189,151,201,
+96,67,190,48,20,138,240,240,238,204,96,33,1,108,216,15,10,228,112,145,191,115,216,124,203,34,135,11,133,194,92,62,194,180,60,209,111,67,127,166,127,65,255,2,98,6,114,64,223,198,81,130,96,54,31,242,5,125,220,15,2,253,158,135,252,29,198,154,190,173,195,51,216,126,208,125,62,151,5,113,193,64,192,96,7,176,96,55,232,75,6,152,21,112,0,176,28,204,133,121,128,4,0,133,176,105,0,2,163,68,32,4,38,16,14,19,97,240,1,81,62,252,61,223,66,38,148,193,10,1,216,214,89,195,42,62,0,196,197,102,176,31,67,127,193,32,32,23,54,135,15,68,97,89,159,121,142,196,44,196,153,33,92,46,38,52,62,124,120,65,136,63,196,15,132,185,48,132,240,32,54,199,65,10,156,30,252,87,96,32,136,207,193,128,172,75,64,65,92,140,91,118,4,128,27,136,4,4,2,139,4,2,70,110,206,3,210,67,62,39,24,97,210,61,233,119,232,119,48,107,220,231,112,97,250,29,30,151,137,63,210,63,135,217,244,219,33,188,135,144,247,157,135,15,161,7,
+48,23,12,73,126,144,63,151,3,134,62,176,0,217,199,47,12,218,58,124,145,173,180,61,1,89,79,92,26,135,59,23,250,77,79,219,108,231,106,155,218,108,84,92,110,90,104,144,188,160,251,192,71,124,110,8,147,207,225,186,189,151,44,253,201,21,132,33,250,19,159,15,243,120,0,95,201,2,140,159,54,58,15,47,120,61,188,76,135,126,195,62,124,130,105,245,27,152,255,71,134,47,204,186,96,227,243,238,0,139,176,249,246,247,23,200,100,8,177,175,222,130,174,64,99,98,182,184,2,209,1,34,144,193,189,0,160,187,58,208,198,162,212,254,202,174,58,16,151,135,7,48,136,152,139,184,226,5,195,76,196,31,1,46,70,216,126,240,247,144,183,171,69,58,55,232,91,12,20,139,108,38,150,128,8,27,162,255,154,254,223,190,244,95,67,254,32,17,25,76,38,204,227,209,111,127,7,63,182,134,61,150,122,110,23,33,105,139,67,30,204,199,194,213,78,245,43,127,219,61,246,54,128,11,131,84,224,130,104,198,248,88,83,129,29,18,228,11,214,172,68,120,183,32,56,40,
+152,255,24,127,128,24,32,53,24,126,126,88,46,114,108,233,103,209,35,20,207,47,144,32,8,184,197,232,224,89,130,112,113,197,96,158,197,227,20,47,123,36,222,183,136,113,251,135,175,44,122,115,44,137,103,225,114,21,160,197,166,183,127,248,214,106,191,119,64,93,239,64,95,195,252,16,46,27,23,4,128,210,93,249,129,64,69,204,90,192,87,8,27,97,7,124,162,152,251,169,130,7,11,4,204,176,246,138,99,45,159,44,132,109,241,185,197,177,150,8,243,113,40,165,28,54,236,16,110,161,182,50,230,236,37,107,240,1,34,24,177,247,56,224,254,133,12,24,154,85,142,79,239,133,79,152,244,22,185,44,137,245,16,207,175,43,165,34,99,42,255,63,44,42,152,214,191,220,178,130,73,127,251,7,187,130,191,140,10,244,51,143,253,75,193,233,56,40,125,100,144,2,20,167,152,6,70,12,97,51,88,32,164,172,211,212,79,229,238,79,228,195,223,250,249,253,51,13,228,231,92,136,128,74,216,212,206,134,255,134,187,204,218,86,46,245,135,95,116,230,253,147,94,251,233,172,
+10,189,99,61,44,83,236,91,20,4,100,159,37,179,126,50,155,94,99,82,7,141,67,57,200,133,209,30,125,201,102,248,178,224,251,128,207,191,176,114,249,114,56,23,225,254,8,182,176,120,68,255,205,35,176,207,128,237,134,196,57,243,176,61,172,31,194,195,239,47,42,17,166,253,117,213,232,99,203,13,102,113,176,7,197,249,251,57,48,186,178,98,225,96,128,14,46,24,228,207,98,4,64,46,152,200,216,14,212,230,74,39,146,55,175,139,224,107,205,237,16,187,15,112,89,48,211,255,200,238,113,81,221,25,65,216,150,27,114,112,42,114,11,242,103,176,120,240,143,18,21,167,231,92,223,254,29,69,210,57,174,28,48,173,190,187,200,227,143,141,53,251,193,8,150,153,248,9,198,199,23,198,75,241,117,231,231,24,94,159,212,105,239,11,68,0,247,175,8,197,175,193,22,202,97,218,178,115,252,26,14,226,132,194,78,27,178,75,205,206,129,161,3,35,27,37,39,43,92,250,170,102,49,197,111,185,92,198,227,135,248,27,203,189,51,240,127,56,1,95,28,204,96,186,91,177,
+28,51,29,95,249,79,231,110,246,123,152,143,193,92,250,184,231,114,243,226,243,30,46,165,85,101,219,34,104,10,92,4,198,148,71,216,160,21,4,49,108,95,246,24,44,150,117,150,7,187,10,7,107,248,92,223,81,44,154,89,54,174,151,207,196,254,136,248,90,143,196,172,202,89,15,197,232,159,189,171,48,246,143,31,42,89,148,182,53,113,186,167,229,45,132,191,10,1,187,97,159,15,123,6,55,2,39,24,230,50,248,28,238,133,41,28,202,226,7,236,244,13,18,20,204,194,251,8,190,157,114,216,208,252,5,63,180,252,210,105,47,227,2,104,223,4,206,120,192,224,51,92,236,95,63,173,24,65,33,60,254,165,147,77,76,22,56,0,108,164,156,11,200,187,214,253,202,10,119,233,148,242,186,124,176,153,237,198,35,48,182,255,14,4,182,11,118,121,228,127,49,139,96,243,55,62,207,251,115,112,217,129,100,33,60,75,199,252,192,176,231,15,228,249,157,51,210,143,155,222,222,117,157,37,21,48,30,214,4,192,110,175,73,49,60,250,223,5,184,214,169,23,65,111,215,254,
+61,122,255,95,20,130,156,254,222,87,164,240,56,190,40,83,78,81,238,244,13,30,8,252,45,198,206,30,249,88,173,231,90,36,2,50,251,62,118,144,25,160,219,234,0,20,4,243,3,57,126,239,24,154,224,60,40,3,67,176,3,172,38,198,31,174,49,50,196,178,156,147,217,4,186,106,206,188,158,13,222,10,112,138,78,253,224,50,19,220,194,86,38,87,111,38,174,228,114,245,200,115,153,58,158,193,223,193,143,237,57,128,167,52,88,249,40,210,142,35,196,101,218,214,182,235,60,52,88,26,181,155,207,255,2,135,51,170,137,
diff --git a/uppsrc/CtrlLib/src.tpp/TabCtrl$en-us.tpp b/uppsrc/CtrlLib/src.tpp/TabCtrl$en-us.tpp
new file mode 100644
index 000000000..e9b057a0b
--- /dev/null
+++ b/uppsrc/CtrlLib/src.tpp/TabCtrl$en-us.tpp
@@ -0,0 +1,77 @@
+TITLE("TabCtrl")
+COMPRESSED
+120,156,148,187,249,111,114,89,154,38,248,175,132,84,221,173,238,154,154,82,124,95,68,100,68,102,254,82,210,204,252,212,210,140,52,211,243,83,170,178,59,50,43,166,42,212,217,89,165,202,40,181,102,70,93,2,108,188,0,54,152,125,223,108,204,206,53,24,176,129,11,24,140,217,23,179,239,23,131,89,204,110,46,235,101,157,203,247,101,77,183,70,26,181,218,150,140,223,195,121,207,57,247,108,239,243,60,47,252,234,227,23,255,236,159,125,249,103,95,254,201,151,255,149,159,95,252,143,63,252,31,223,255,195,239,126,250,203,95,253,248,245,215,223,253,242,251,143,223,252,242,223,255,235,255,229,231,191,252,211,191,248,151,63,251,250,95,237,91,249,128,182,242,213,183,31,190,250,238,155,175,62,124,253,241,103,232,159,15,95,125,248,248,205,199,175,190,254,240,221,199,159,127,253,221,87,95,125,247,229,47,126,251,187,239,255,240,135,191,252,213,239,62,126,247,221,47,247,78,31,255,236,227,159,124,252,246,155,143,31,190,253,250,187,175,191,251,240,213,183,223,125,68,125,63,126,
+249,229,199,47,191,253,248,205,135,175,191,250,238,227,55,191,248,171,31,254,240,219,191,252,213,247,223,125,245,203,63,253,95,127,134,58,125,181,239,9,109,252,203,15,63,251,248,245,183,95,127,252,242,171,47,63,126,141,118,245,225,187,239,190,254,240,237,55,223,125,245,243,159,253,236,23,191,253,254,239,126,250,241,111,127,255,199,190,126,252,240,225,227,135,95,254,230,195,183,191,68,199,252,143,255,248,143,127,254,225,235,47,63,143,224,107,180,177,15,95,126,141,14,245,3,90,246,229,215,31,191,253,240,205,207,191,252,249,55,223,125,248,238,203,175,208,198,191,249,246,203,111,126,241,119,223,255,253,247,255,225,255,255,209,191,249,175,62,250,183,95,254,226,199,159,126,64,155,248,211,255,238,195,135,111,81,151,159,253,217,207,254,228,195,215,223,162,15,250,221,87,95,127,243,221,183,95,162,157,127,252,248,241,171,175,62,126,248,234,227,207,127,254,241,155,159,125,243,237,47,254,230,135,239,255,234,135,191,255,203,95,253,223,255,246,63,253,243,255,233,127,254,239,255,247,255,
+237,139,95,253,225,171,95,254,226,223,161,191,255,230,251,223,252,15,63,253,253,239,246,255,126,154,211,95,124,241,199,146,127,241,151,191,250,195,151,191,252,98,255,242,225,151,255,250,215,251,10,251,226,95,127,241,171,95,255,250,47,254,229,151,127,254,229,159,127,252,230,155,127,245,197,31,23,226,215,191,254,226,223,238,255,254,197,151,255,228,255,185,236,23,159,75,255,115,253,191,251,135,223,252,238,199,223,254,209,225,159,250,249,248,203,47,254,205,223,252,248,135,47,254,227,143,127,245,215,63,252,244,197,111,191,255,253,23,191,249,225,139,127,248,195,15,127,245,197,79,127,251,197,223,254,253,95,127,255,251,31,255,175,31,190,248,233,111,126,248,226,175,126,252,254,119,127,251,215,95,252,246,111,127,255,211,15,191,255,233,139,31,127,143,86,248,195,15,251,121,253,233,135,47,254,238,251,191,254,225,15,95,252,225,63,254,248,211,111,255,6,245,253,205,255,137,14,239,199,223,254,251,31,127,255,215,95,124,158,130,47,126,250,254,55,127,248,243,63,118,249,199,151,191,248,139,
+31,255,3,234,247,139,143,31,190,249,230,95,124,248,250,235,175,78,14,156,56,44,22,243,79,63,139,44,191,47,32,210,249,79,86,100,88,244,131,252,215,131,138,231,138,111,59,234,41,122,175,182,197,197,161,168,244,242,128,137,132,188,126,49,147,140,53,136,15,251,48,214,197,38,121,3,103,207,52,39,85,116,62,36,29,110,94,123,247,142,209,96,167,187,16,116,61,160,71,23,60,73,7,47,8,152,187,211,180,110,102,74,4,123,53,153,246,106,227,52,109,98,72,111,16,30,64,59,149,50,47,228,234,6,119,66,192,214,189,150,207,177,219,233,182,21,141,69,28,243,105,54,157,174,12,93,234,214,172,57,208,1,48,59,196,101,150,159,61,132,27,221,234,96,188,9,33,76,70,223,27,233,123,29,44,27,41,109,175,141,242,113,251,129,183,179,125,173,16,237,94,193,102,93,117,69,145,129,232,144,17,131,111,20,165,204,20,75,88,121,185,4,152,246,120,86,198,13,182,247,154,187,219,131,103,65,254,37,118,107,98,132,172,103,93,219,125,207,142,117,246,27,211,236,121,152,
+157,237,241,198,10,119,51,47,47,177,108,211,184,137,115,235,48,205,229,187,72,12,25,190,142,69,139,236,168,68,21,69,180,72,81,110,9,9,235,154,205,145,165,69,168,220,75,51,66,12,131,20,122,199,16,143,133,207,199,162,19,193,148,237,63,153,179,201,209,119,86,182,254,200,247,188,4,103,214,134,203,56,102,233,151,117,121,71,71,27,116,172,173,166,181,237,210,39,13,34,94,163,203,221,90,93,115,209,125,184,42,90,210,3,231,77,3,182,116,170,193,96,196,238,170,129,34,240,199,240,7,158,158,63,115,255,116,152,14,198,240,154,121,248,144,196,150,59,168,224,227,205,64,116,163,211,70,34,46,82,44,203,33,169,173,36,30,25,40,16,108,254,155,129,77,242,82,151,22,215,207,235,209,227,105,50,220,242,222,53,153,19,167,213,71,9,245,226,22,13,157,40,133,233,62,102,51,239,137,104,78,49,88,197,3,211,126,79,84,41,56,250,163,67,193,33,55,120,72,20,178,29,237,254,60,85,91,189,18,179,231,20,109,129,118,55,16,222,169,29,108,4,124,229,219,179,
+145,140,134,19,133,91,15,148,93,221,164,62,54,232,231,188,252,217,43,51,122,240,170,106,190,182,187,209,32,20,226,146,0,97,12,208,91,179,139,132,147,2,114,146,108,12,49,140,85,110,85,196,64,189,207,190,71,55,217,3,2,83,178,45,161,235,105,78,226,251,39,89,231,193,46,87,43,207,132,209,224,64,19,142,6,113,188,162,69,93,24,176,137,204,59,110,246,206,2,147,203,108,145,235,5,104,90,21,208,98,117,171,47,149,88,131,22,96,48,32,229,245,61,177,14,248,147,213,252,182,6,30,27,243,72,229,212,113,222,35,133,159,219,147,3,140,202,205,106,94,19,57,49,65,111,221,109,217,157,221,225,187,48,104,217,76,220,74,103,105,245,104,166,1,61,232,134,57,104,54,107,81,115,109,29,72,230,241,177,215,236,40,198,182,250,67,23,30,169,6,122,204,80,158,69,182,146,246,73,67,207,17,208,133,72,220,180,188,207,48,189,243,116,204,99,6,202,171,250,112,178,90,117,95,104,149,183,29,79,104,178,147,53,61,228,101,139,204,237,162,190,181,181,184,45,87,
+28,214,238,160,17,226,8,230,80,240,141,119,63,125,229,243,128,183,65,113,235,202,116,161,116,115,50,246,249,10,179,242,110,117,240,234,165,10,74,137,76,43,203,27,238,152,182,80,23,61,21,180,172,143,165,5,195,213,64,148,214,137,172,23,142,187,152,187,216,12,83,82,215,77,203,27,158,113,114,223,63,136,99,44,66,67,179,96,28,243,157,113,211,228,213,233,229,35,145,152,119,183,106,198,30,157,235,245,187,239,172,194,95,184,30,15,118,147,249,110,55,31,246,119,246,34,48,221,76,203,27,199,206,110,29,242,212,75,72,100,55,181,36,140,50,99,190,211,117,35,140,254,189,26,232,89,103,118,224,72,107,19,175,94,84,234,22,48,79,189,247,237,211,74,209,91,20,85,99,172,233,192,209,230,170,193,251,59,225,225,85,24,95,190,37,82,212,37,129,211,158,10,152,136,24,197,131,59,118,202,17,79,22,182,140,224,128,131,63,175,234,146,208,237,166,82,182,45,109,149,50,201,190,10,85,119,171,238,177,68,238,52,45,60,211,203,3,242,78,187,27,14,7,195,85,180,
+208,4,118,91,167,69,62,4,6,250,206,170,151,142,61,222,189,79,157,239,143,89,22,112,223,169,76,227,142,174,115,183,152,248,182,135,206,0,249,169,62,173,22,210,208,120,221,191,65,10,38,43,181,162,8,138,161,46,109,48,188,107,12,104,5,136,164,34,109,98,91,138,245,82,210,138,81,164,146,214,75,148,162,203,87,3,70,55,39,116,31,126,216,144,231,229,168,209,100,24,248,248,242,237,182,236,18,57,102,134,247,205,241,210,185,113,50,28,59,139,117,206,179,168,151,34,135,172,213,93,223,205,42,78,205,106,75,238,34,103,30,83,118,146,135,144,64,81,43,170,12,230,143,72,108,11,247,253,37,136,149,30,35,118,189,205,44,7,174,111,213,166,89,195,233,61,56,179,99,199,161,219,171,157,30,9,5,68,140,170,136,165,63,19,32,120,161,25,139,129,48,135,254,179,50,210,132,10,80,128,195,202,14,245,143,119,103,118,36,251,8,59,87,197,166,174,62,40,101,23,145,75,245,210,185,158,141,231,155,144,205,177,134,251,217,178,104,0,182,94,169,209,52,235,118,89,
+60,173,56,179,122,56,48,30,161,155,103,187,62,150,139,108,245,158,14,136,57,7,161,96,119,19,131,175,145,77,123,55,18,148,139,86,242,174,73,9,208,244,125,235,37,48,29,11,149,238,10,41,89,201,199,196,160,27,194,96,104,188,2,214,47,54,50,0,96,42,60,102,146,183,47,18,139,75,180,21,68,44,225,134,165,30,158,150,179,229,155,172,97,60,45,45,71,149,91,199,235,53,153,239,140,181,47,35,33,6,114,106,226,176,104,44,181,197,32,27,143,150,69,131,136,108,205,167,91,193,110,100,216,218,57,72,42,96,0,232,75,217,2,126,154,117,214,6,4,129,200,127,92,124,199,161,7,123,119,31,20,168,87,125,211,102,55,183,58,157,197,133,192,180,209,237,76,133,73,42,107,95,103,167,101,147,113,60,19,198,154,225,41,66,158,8,52,247,206,190,151,124,215,3,156,59,75,76,192,152,51,178,34,83,35,2,150,194,72,153,157,55,177,110,179,20,37,48,218,53,110,228,59,36,71,17,236,242,101,211,213,227,80,212,217,189,179,114,237,246,112,139,245,81,138,104,
+143,148,5,61,15,133,224,122,250,114,174,69,187,93,201,178,219,69,78,96,39,151,133,181,130,106,28,13,193,229,102,97,235,56,111,12,245,237,220,22,42,18,156,253,226,238,81,100,223,41,111,230,48,178,145,62,65,126,72,109,189,159,27,146,57,93,30,186,54,31,118,193,89,248,148,149,177,27,184,237,96,40,181,238,172,198,184,216,50,51,213,55,46,134,118,65,43,212,171,102,139,216,182,218,121,231,94,10,243,6,181,229,133,231,123,92,119,29,153,243,19,85,246,137,32,77,56,158,96,101,70,159,31,61,234,131,118,95,146,201,220,154,182,90,78,121,104,190,82,60,196,139,239,21,243,165,209,213,59,71,47,64,113,216,135,100,13,80,178,90,186,127,158,151,51,243,156,106,183,189,112,59,65,245,124,20,79,219,201,149,210,198,153,142,197,26,44,29,15,114,62,79,241,243,25,84,121,31,68,27,195,246,46,224,70,142,117,206,225,38,250,52,244,7,67,97,71,44,10,52,225,26,211,166,190,199,239,118,160,104,86,63,171,59,221,157,200,13,79,102,74,14,136,250,237,216,
+202,176,189,245,231,157,250,176,56,54,22,23,249,237,144,236,135,173,243,170,245,236,14,52,188,78,230,200,206,3,110,224,249,92,83,158,108,118,180,16,171,231,120,95,208,212,153,91,17,222,28,213,211,6,111,203,139,74,250,41,3,46,202,170,138,33,104,31,242,155,20,198,181,158,3,223,201,223,200,158,86,126,115,188,211,45,230,246,213,202,177,67,230,197,124,208,185,204,15,3,153,241,153,124,230,58,241,111,203,211,146,102,210,110,187,214,29,99,216,91,120,229,57,119,247,189,120,133,146,207,29,110,171,32,6,227,110,120,93,107,237,194,67,10,117,211,79,27,123,197,166,31,198,139,187,165,67,175,154,95,20,215,75,161,245,116,167,134,183,155,44,71,215,118,244,139,143,229,59,167,115,245,180,93,89,89,162,164,125,61,41,11,68,206,249,75,171,31,45,239,78,111,45,96,79,103,161,11,214,122,78,62,203,137,213,3,93,72,88,242,150,95,13,248,195,147,48,116,121,154,143,35,150,96,171,155,119,191,229,142,225,20,241,78,7,221,158,55,117,235,107,245,92,247,232,176,
+186,182,29,157,200,58,121,172,234,195,252,134,189,228,88,171,119,66,234,58,72,109,24,231,27,220,34,29,220,6,86,120,49,242,122,112,171,217,90,121,238,173,253,237,201,86,28,27,34,172,62,173,8,151,165,37,115,196,3,7,241,161,152,66,235,143,149,153,7,145,8,138,166,14,27,174,70,238,60,80,213,228,169,179,18,92,157,87,52,243,238,102,169,181,147,75,149,194,124,202,64,87,56,155,26,191,192,161,146,210,59,111,172,86,67,235,93,168,53,110,77,53,78,181,111,124,116,123,14,173,50,239,68,209,138,199,202,202,20,253,18,52,180,251,91,108,40,12,13,11,45,141,183,223,128,11,22,0,88,217,144,249,186,121,245,152,119,30,47,150,244,227,235,7,118,83,70,203,207,16,101,79,164,115,200,47,198,83,151,96,173,198,53,228,119,230,80,241,28,94,77,183,149,109,116,144,140,45,143,37,201,160,129,181,86,243,188,215,189,158,140,53,27,193,141,113,196,114,115,237,74,49,9,222,154,142,120,129,14,223,101,217,224,56,24,141,5,127,102,200,109,174,251,59,247,177,
+213,81,95,79,99,89,103,204,24,75,175,222,35,232,249,18,176,199,153,130,172,86,53,154,29,153,121,200,178,113,168,161,188,109,221,47,239,178,206,205,89,140,111,217,86,3,187,23,216,106,16,9,86,221,75,109,9,170,237,224,164,14,152,209,145,80,247,129,77,12,117,95,212,150,152,126,204,129,73,220,64,56,164,190,52,28,154,171,129,245,161,94,14,1,163,200,12,78,22,141,141,113,53,146,77,89,242,218,94,117,20,233,215,206,153,149,183,133,177,104,198,180,32,67,135,136,191,52,95,132,106,15,41,1,206,189,123,175,88,209,139,96,182,198,235,235,69,115,111,14,70,211,33,219,112,181,237,197,14,68,67,164,80,33,240,45,131,93,120,184,43,132,150,14,250,202,104,174,238,8,243,73,249,61,209,204,78,91,198,210,168,122,156,22,33,183,172,172,79,190,34,133,108,48,124,83,75,222,232,128,176,246,36,88,213,49,119,87,200,78,48,121,232,213,128,235,251,40,114,19,89,180,205,99,29,105,37,130,222,207,58,45,100,3,238,150,141,186,206,60,174,37,111,75,135,158,
+102,132,254,184,237,220,217,214,234,44,210,100,65,149,105,8,216,153,87,17,253,153,57,156,97,159,174,90,166,87,67,255,44,175,218,105,2,68,38,251,173,20,117,174,142,43,43,172,99,184,88,144,205,183,204,105,46,83,75,155,240,175,228,131,91,233,136,225,140,232,243,94,41,110,17,217,97,7,141,126,97,70,192,72,49,15,183,243,32,155,224,47,114,94,111,234,171,117,156,59,182,14,118,245,172,137,229,72,110,42,173,240,117,108,90,218,69,134,27,145,104,176,9,202,54,149,221,210,243,208,33,215,215,157,233,70,52,45,109,152,165,59,221,230,64,69,22,200,221,141,39,80,182,158,238,170,51,62,200,156,194,240,234,136,51,214,115,232,166,222,165,68,123,180,144,220,134,42,169,249,41,107,11,152,29,44,251,178,211,168,153,194,3,11,160,17,236,46,158,90,134,117,247,44,210,239,33,129,8,173,187,237,44,118,244,178,185,57,111,63,221,205,116,136,179,153,127,186,97,212,195,75,146,93,112,27,246,132,141,128,6,94,57,173,81,143,204,155,134,238,144,248,244,60,38,128,
+149,29,36,50,27,63,198,245,219,248,57,142,213,161,118,174,250,130,212,154,27,194,189,28,195,228,211,41,83,128,195,172,185,47,154,192,65,208,155,27,104,4,45,67,154,230,29,245,193,178,200,6,247,45,253,187,173,17,189,208,201,108,103,173,120,55,26,223,105,237,170,86,95,190,138,57,12,198,121,136,53,119,106,45,55,187,232,248,56,154,177,147,211,242,59,224,174,187,235,21,109,0,104,67,119,163,112,237,62,30,68,107,176,117,112,24,90,117,107,216,45,16,204,23,139,71,2,175,193,181,165,232,138,94,168,22,209,45,205,69,234,188,198,190,121,139,34,87,43,90,160,86,56,166,199,156,87,65,48,49,41,48,76,68,17,87,252,170,89,190,103,82,55,253,139,211,186,60,26,146,159,64,41,217,68,206,140,122,161,184,91,21,131,50,239,245,118,240,37,131,198,86,108,197,209,62,135,226,91,36,40,191,115,34,189,67,249,162,177,218,118,50,245,66,1,165,27,93,254,249,172,58,12,47,147,117,127,239,81,248,248,148,102,34,101,44,102,237,218,226,38,120,49,177,109,36,
+185,19,185,140,125,153,23,221,149,180,54,96,195,148,9,38,243,181,170,59,77,232,108,54,214,76,235,48,174,228,83,185,53,91,73,141,91,89,188,125,190,190,31,250,204,227,229,16,201,238,26,132,249,77,59,91,73,59,118,207,166,73,253,64,20,182,181,55,43,86,163,129,125,186,174,132,161,208,140,132,134,187,182,48,9,173,154,198,144,191,75,63,70,228,233,49,231,100,89,106,199,118,78,250,229,36,132,151,139,225,72,28,131,169,99,150,250,52,59,100,229,107,89,246,169,63,221,130,4,246,234,129,111,176,76,142,95,213,206,204,172,120,233,43,102,116,109,219,148,25,88,105,69,253,28,162,219,102,35,173,169,118,177,204,206,207,134,111,219,222,146,83,206,218,101,93,184,150,44,234,28,237,161,104,205,139,57,179,232,69,0,85,113,43,98,32,84,130,204,97,22,235,61,59,235,61,114,199,119,4,139,5,164,35,150,149,58,172,175,54,24,203,43,34,245,249,29,224,99,30,222,20,91,75,199,161,79,190,91,200,187,129,99,65,42,179,156,219,113,44,221,26,88,6,125,208,
+158,181,239,98,166,242,176,107,29,216,87,64,202,62,175,152,90,252,251,215,166,224,216,49,110,186,172,234,216,253,205,68,123,172,113,78,151,216,24,216,150,13,241,68,200,82,89,36,155,134,121,190,49,245,70,105,6,144,100,131,135,110,164,225,144,12,227,57,231,101,222,194,166,89,220,167,67,189,212,124,39,199,46,208,203,219,55,219,86,81,210,192,102,59,114,70,94,187,67,222,206,30,135,94,100,134,115,46,155,129,118,113,59,175,138,118,131,36,238,206,190,170,114,98,189,242,194,59,14,109,111,230,29,220,93,111,241,198,107,86,214,254,118,186,37,58,79,76,93,79,192,246,101,30,31,15,111,133,246,222,186,124,176,154,151,86,183,247,122,27,98,226,192,84,128,76,204,146,70,11,186,88,211,220,70,161,147,176,239,102,161,86,50,46,110,229,108,19,54,120,189,182,77,251,24,204,123,96,245,94,243,206,94,121,242,202,69,246,126,46,234,111,67,89,196,62,33,203,134,155,192,56,23,168,176,99,246,22,212,184,200,194,97,114,128,210,216,37,13,243,52,143,133,114,182,70,
+85,122,27,225,64,19,12,227,114,12,197,31,195,190,179,7,252,128,182,108,9,30,78,14,131,142,245,131,226,38,166,197,4,90,206,170,194,33,215,236,138,238,123,123,160,186,32,170,95,189,103,250,94,251,50,119,99,25,165,238,85,213,67,39,33,155,7,175,66,97,147,38,87,159,154,219,77,150,142,53,48,239,116,133,219,183,206,53,109,167,171,190,139,228,225,27,254,27,162,198,236,10,178,230,152,143,168,95,59,228,104,51,88,193,146,49,10,247,131,174,127,192,56,219,29,226,144,227,234,123,90,205,217,81,23,222,4,162,75,56,249,155,101,3,148,94,28,217,33,248,100,60,162,134,102,234,179,60,110,37,172,171,12,140,108,122,69,188,7,13,91,3,163,201,32,230,176,175,58,160,79,57,81,241,245,148,135,6,214,112,146,2,159,248,47,172,90,87,98,16,153,193,216,244,245,56,182,126,89,240,140,12,223,241,178,136,153,160,49,0,246,222,79,4,55,163,193,144,116,187,21,31,34,104,28,62,33,232,41,44,244,29,63,246,249,147,201,31,140,96,46,207,2,57,198,252,
+29,121,91,187,180,199,252,235,123,141,117,59,202,7,226,217,109,88,122,106,143,3,104,117,250,233,96,10,215,154,220,109,154,74,86,114,137,173,14,64,140,17,83,33,81,77,127,115,232,119,15,213,104,149,109,3,103,3,207,117,54,13,210,25,63,141,129,202,11,83,167,57,98,6,134,132,142,217,142,136,0,28,87,218,53,111,29,179,33,243,128,167,39,112,207,205,93,134,227,128,40,56,144,249,54,207,192,53,230,33,224,120,103,101,105,187,229,46,155,104,231,97,204,83,66,144,118,214,167,93,143,170,107,225,179,121,139,182,73,122,212,36,86,207,204,37,215,242,92,131,30,222,85,21,125,14,198,211,97,29,50,17,107,218,240,100,54,35,27,56,231,161,78,239,85,127,187,123,147,120,41,147,174,8,198,137,165,39,99,10,216,108,38,56,84,54,142,158,80,182,61,61,214,58,176,91,92,52,166,188,153,127,9,76,4,185,179,30,187,62,147,0,24,130,138,112,18,232,46,151,14,2,133,67,242,121,125,213,227,227,240,40,60,54,200,30,106,254,125,83,33,177,244,166,49,93,
+230,37,161,46,108,192,158,92,137,104,163,83,125,149,118,32,181,95,223,95,203,105,68,182,230,40,180,66,199,52,97,224,119,204,202,173,232,2,150,3,151,78,138,137,238,169,36,165,128,71,218,102,250,195,135,39,196,146,104,206,29,20,19,197,107,33,149,76,38,159,157,159,111,102,83,118,205,63,17,234,239,206,73,108,6,147,125,240,214,127,132,48,41,186,23,219,104,60,62,46,27,3,89,241,54,103,225,232,172,87,114,147,93,55,180,185,95,164,247,154,221,246,126,234,41,225,216,252,232,117,51,73,217,207,4,233,101,134,228,175,107,157,84,37,188,81,170,193,92,16,226,178,2,87,134,17,176,91,20,131,201,163,14,55,57,40,46,203,78,241,72,180,200,229,222,30,94,42,12,219,213,249,41,32,80,28,56,59,151,194,26,9,30,191,154,87,147,130,73,86,216,248,137,24,130,123,152,234,63,230,93,19,110,109,23,38,110,100,17,152,17,37,21,75,50,175,38,52,184,224,78,7,49,65,65,123,215,15,206,100,114,83,199,174,5,156,29,219,57,38,41,187,100,242,4,2,
+83,91,244,214,167,121,244,203,104,251,161,152,59,17,140,154,192,81,232,78,49,61,51,187,84,251,39,19,167,232,203,22,116,52,23,34,202,179,231,198,83,28,79,94,157,133,8,233,108,111,220,33,56,146,64,247,104,165,29,73,128,218,177,193,218,15,101,120,182,146,28,231,39,74,223,252,196,75,12,65,90,66,226,140,16,243,130,21,203,70,111,58,204,58,62,148,44,178,54,225,224,173,66,155,31,0,238,4,125,165,75,153,186,237,238,74,171,231,176,23,108,14,103,208,29,6,66,167,143,225,69,212,87,231,76,217,101,107,42,73,210,68,229,33,251,200,180,41,239,31,83,202,175,7,159,44,59,191,244,2,17,4,79,51,56,240,5,161,118,86,212,81,190,129,223,200,143,202,217,43,96,248,104,242,214,215,235,197,226,196,51,172,204,71,73,126,173,233,158,91,165,128,79,251,70,63,205,162,11,96,98,174,94,59,232,194,191,160,187,241,212,113,35,121,210,13,117,47,249,60,49,14,130,141,66,177,33,63,229,159,34,140,4,20,245,122,15,80,136,255,232,186,168,167,131,6,
+184,166,92,119,115,94,10,65,6,173,55,121,200,147,56,73,118,205,102,32,206,27,89,149,14,126,221,53,77,9,95,216,34,167,126,45,149,103,129,21,251,234,252,98,158,59,215,176,121,125,171,25,22,52,128,35,249,163,254,249,44,209,223,239,112,64,122,66,1,61,14,213,242,36,52,164,167,9,135,187,172,189,75,200,36,162,187,92,238,249,84,50,128,238,116,151,215,247,225,195,74,193,64,64,79,219,198,127,189,127,108,55,204,197,136,68,66,158,45,78,89,49,189,74,117,251,137,255,206,162,183,55,64,159,36,57,63,63,59,155,205,39,243,166,199,181,36,231,176,122,171,98,70,98,206,36,15,0,70,69,72,66,114,182,214,146,154,161,227,199,116,79,158,217,2,1,127,192,237,117,218,61,134,231,122,36,245,8,114,61,54,78,243,121,255,14,46,168,44,127,22,227,62,243,251,119,47,15,173,185,196,119,145,228,55,221,149,251,27,125,174,112,12,98,70,10,133,244,10,136,199,159,177,15,245,250,253,80,92,1,236,234,87,138,242,220,29,118,87,158,209,42,68,180,206,190,
+74,22,112,185,6,94,138,220,124,124,255,176,84,138,90,227,233,99,223,55,231,213,10,148,169,172,251,32,125,122,23,155,89,251,6,113,159,106,3,104,188,198,48,2,171,213,5,43,106,190,86,4,137,152,55,204,67,195,29,78,165,240,247,103,48,74,201,41,15,18,241,254,70,187,192,29,124,50,45,226,207,230,129,235,179,89,210,54,166,29,42,211,79,204,161,172,212,82,85,0,152,241,167,10,13,28,161,142,199,96,196,48,230,1,66,77,233,49,246,179,249,240,71,179,142,249,108,66,226,207,38,254,102,111,46,88,89,9,193,187,244,222,121,30,205,234,231,232,124,167,61,226,96,168,175,231,177,148,163,33,57,110,82,250,213,110,71,47,227,19,181,158,208,91,102,216,45,40,199,239,237,19,101,106,30,127,139,78,223,83,183,41,35,216,188,121,126,14,230,74,13,198,225,108,146,193,33,79,186,45,232,87,75,235,166,122,21,43,192,44,158,174,230,59,97,117,2,153,57,214,29,83,153,229,210,138,92,202,53,167,200,163,21,103,83,159,57,43,87,117,107,27,82,196,20,56,
+3,124,149,236,240,196,52,11,71,244,120,45,80,137,55,203,36,67,171,188,176,19,100,8,141,165,23,38,66,106,218,4,235,130,208,155,68,69,63,60,103,19,11,199,165,38,121,30,30,12,91,24,232,197,40,136,220,9,95,57,74,155,49,89,164,170,106,189,123,246,86,102,209,110,42,103,73,147,237,122,224,102,177,128,55,45,252,210,233,111,30,223,123,57,159,196,108,190,20,8,124,43,171,205,182,92,90,143,199,71,75,159,247,200,235,125,240,6,53,64,16,148,196,252,106,207,190,39,5,11,131,246,148,211,12,143,44,98,217,173,125,222,207,145,110,49,20,151,46,203,156,156,31,180,5,17,7,191,137,99,241,238,207,171,185,67,249,4,65,8,216,12,4,69,79,145,218,160,22,62,6,73,143,55,225,9,81,61,186,2,230,179,197,250,244,225,60,120,119,9,18,46,114,241,134,236,108,190,126,16,52,173,20,61,172,210,0,182,139,35,41,130,173,73,38,239,133,250,56,17,174,113,207,175,78,57,248,67,211,113,34,76,192,58,135,124,125,213,234,92,0,229,106,12,92,223,
+60,117,47,1,214,33,95,77,246,105,96,195,85,226,254,10,97,144,124,6,128,127,203,102,81,194,89,237,166,187,160,178,200,15,165,98,186,45,212,218,52,117,111,182,49,96,240,10,245,156,76,200,186,1,19,74,35,135,208,70,12,101,245,189,61,18,2,174,19,41,86,93,203,47,132,140,57,199,11,38,128,162,155,209,193,173,119,61,9,86,158,104,145,51,238,252,74,88,142,61,92,243,133,153,243,26,237,225,206,20,129,109,67,133,239,118,14,157,95,135,25,108,156,217,120,197,49,149,206,148,250,151,171,131,144,68,148,128,171,143,214,151,214,153,188,118,89,8,153,142,195,176,118,229,142,94,223,211,56,72,67,151,9,247,184,244,208,121,48,8,164,239,122,13,79,230,130,222,92,240,169,42,123,145,167,70,47,215,142,66,57,20,220,82,47,132,205,132,226,37,15,233,144,251,97,58,176,166,93,205,103,80,44,46,111,42,23,111,15,182,110,74,235,134,128,122,67,122,77,196,139,1,251,136,228,134,96,236,176,31,46,27,242,36,182,95,227,60,109,141,244,172,170,238,5,100,
+190,220,112,59,164,11,15,27,106,200,116,204,249,140,11,60,249,140,42,80,80,162,193,169,212,213,211,57,212,156,248,164,0,130,231,122,233,44,116,78,96,36,64,99,78,149,253,64,208,131,92,88,131,23,175,68,37,27,113,9,233,211,64,249,42,154,76,105,139,41,110,239,21,105,249,86,6,202,134,75,141,166,226,160,65,99,98,162,104,212,22,204,229,96,170,86,115,9,248,31,211,3,123,30,145,141,93,134,244,5,167,222,112,4,145,252,150,222,201,51,121,250,222,211,186,237,139,156,117,12,133,226,201,42,154,190,38,120,167,175,212,219,126,235,254,120,225,235,221,18,78,46,115,214,146,232,5,113,234,26,150,163,198,214,53,107,210,99,175,50,47,61,127,73,58,120,153,232,18,202,22,180,116,72,211,141,134,144,82,75,42,219,105,136,105,164,2,173,221,163,53,96,234,84,134,253,230,211,169,175,210,13,135,40,198,70,157,160,38,57,198,210,105,106,34,65,78,125,242,34,251,213,112,155,66,44,166,30,63,0,25,110,195,190,208,157,76,219,101,65,225,80,140,193,66,82,
+82,13,171,229,48,9,198,120,22,75,198,93,9,174,106,93,22,47,116,20,173,177,147,84,158,35,107,106,176,122,218,237,75,145,190,10,154,207,252,54,89,159,229,91,242,168,209,190,15,79,60,215,104,188,55,44,14,43,248,44,133,38,111,105,196,34,159,215,57,156,137,139,195,122,131,144,120,77,18,12,97,12,141,19,5,144,240,197,242,229,12,173,76,179,86,64,120,59,99,239,84,197,168,91,35,48,63,55,182,141,248,153,22,76,93,216,128,160,26,72,18,44,243,177,161,174,46,78,212,101,93,115,132,151,121,203,0,192,13,167,77,2,110,76,95,198,19,151,165,90,241,98,222,45,158,39,235,135,81,193,27,68,43,123,202,187,84,246,41,50,63,159,212,137,108,157,63,65,33,170,148,228,157,29,16,181,226,42,24,142,249,111,137,183,183,50,38,186,176,78,2,152,106,96,96,41,110,74,63,71,56,65,201,56,24,106,62,54,188,172,68,131,42,179,133,12,227,37,60,76,248,67,116,22,160,81,81,3,161,104,225,90,167,204,205,104,114,35,127,192,195,172,184,248,57,177,
+83,195,3,5,61,57,156,217,164,13,15,109,154,152,93,191,162,216,199,53,85,31,183,139,150,220,147,157,43,211,76,101,154,154,135,115,179,41,60,132,23,197,152,50,17,12,249,140,45,21,88,162,25,138,170,161,7,150,122,104,4,240,221,47,104,200,1,250,36,82,61,147,130,176,232,8,156,36,24,7,96,234,54,250,116,193,106,232,106,141,72,201,76,111,69,226,116,144,37,171,38,147,247,125,38,198,193,211,190,225,69,139,194,104,215,81,70,240,58,57,160,202,210,0,35,58,211,252,240,168,131,93,108,125,131,208,118,114,180,182,43,105,170,101,251,76,100,26,61,55,26,151,133,171,52,52,56,69,162,209,32,148,16,205,44,173,64,211,4,227,64,162,216,95,38,82,201,125,187,11,113,180,93,197,35,88,237,89,162,187,92,69,1,195,220,70,242,217,209,104,76,41,82,23,20,189,59,211,154,19,180,213,115,223,11,167,25,217,2,141,243,24,237,104,121,49,217,185,222,121,83,236,230,253,242,68,251,166,173,142,191,102,120,116,153,81,213,176,3,99,217,59,34,8,29,221,
+70,222,203,230,174,170,171,38,14,68,181,155,179,231,54,165,4,116,4,181,139,167,75,243,186,193,147,23,142,59,92,119,180,235,97,141,232,49,155,157,187,176,156,238,134,48,208,122,56,191,62,232,56,154,81,175,189,61,61,139,41,167,211,36,175,147,214,205,47,96,221,121,49,86,226,113,169,218,20,23,184,146,229,140,121,116,127,185,234,22,153,220,38,0,150,183,87,206,211,167,96,253,106,65,24,222,69,14,216,57,161,254,70,238,172,211,17,126,236,156,124,47,245,45,16,159,36,251,60,186,182,147,112,114,13,5,140,234,147,114,32,114,192,92,122,84,246,0,17,19,99,59,172,185,196,131,147,81,219,172,28,91,192,129,211,34,17,229,53,142,53,187,126,99,247,164,143,147,247,146,83,167,84,9,58,103,247,138,59,132,113,121,72,52,19,121,180,64,165,159,115,123,209,109,125,234,130,140,229,161,249,16,36,136,129,77,168,120,118,155,109,51,176,172,106,86,12,80,158,250,135,231,194,188,80,173,75,138,84,237,240,104,40,27,179,229,77,242,46,252,104,57,34,165,167,201,
+48,158,22,203,94,87,114,122,161,207,10,226,158,120,252,205,28,78,112,78,77,65,162,146,191,149,0,111,254,16,144,20,227,193,135,197,9,40,224,183,249,26,200,98,50,35,217,69,68,119,234,166,205,38,175,253,210,141,76,98,246,54,245,97,60,231,216,74,147,132,212,185,144,145,194,170,227,17,198,35,11,68,35,110,198,125,204,96,101,113,136,11,210,82,178,121,20,70,80,27,175,82,192,112,8,227,24,160,24,48,208,179,204,110,161,125,45,244,245,41,3,192,78,57,202,99,99,186,219,216,229,180,48,187,1,20,138,42,94,255,110,52,86,28,19,44,112,27,171,16,40,247,238,182,221,143,15,13,30,30,161,234,217,245,173,253,205,97,75,222,30,94,185,59,117,12,19,199,75,90,79,55,39,42,204,165,234,64,2,168,40,172,28,38,126,0,19,196,148,99,214,96,227,134,48,158,224,153,95,141,123,128,172,216,57,17,193,82,76,98,44,112,130,67,24,61,57,113,66,134,177,132,171,194,211,165,126,2,50,233,254,173,26,247,70,101,121,135,97,179,102,36,97,244,90,100,
+91,99,46,50,41,136,115,219,125,72,221,123,211,68,241,232,190,117,75,20,99,144,41,52,69,177,32,253,249,185,20,140,189,47,13,195,98,184,28,74,117,199,145,64,63,66,35,105,187,103,1,173,237,149,215,133,105,233,233,200,123,93,168,160,145,238,181,59,247,128,133,213,117,211,205,204,234,223,223,76,91,150,152,217,82,140,232,37,168,145,153,197,227,82,58,44,21,168,7,237,20,193,203,61,33,235,45,56,52,190,43,222,177,196,177,107,245,208,115,86,133,249,77,191,68,20,145,174,47,219,222,203,91,247,244,184,217,41,38,72,19,193,49,146,189,31,3,231,20,254,14,175,105,179,227,172,165,241,232,52,243,160,132,251,221,46,15,247,122,230,59,55,153,4,241,93,164,231,160,209,250,132,233,17,78,52,195,232,133,65,196,44,102,218,177,109,209,211,160,45,108,82,109,248,49,9,133,69,18,241,226,77,215,99,62,150,158,19,52,14,180,234,29,229,31,244,39,47,217,80,83,46,196,243,44,97,60,112,55,234,8,110,78,163,165,28,124,72,160,106,159,80,36,113,143,212,
+62,33,9,209,227,141,159,152,93,140,242,135,43,112,155,232,52,161,238,35,227,242,93,1,220,224,4,233,45,92,243,113,180,1,136,115,45,6,250,221,231,99,240,57,40,153,131,25,62,253,150,125,36,190,108,55,177,174,62,86,189,61,184,220,35,137,97,181,82,113,216,214,28,105,150,242,214,64,44,87,163,250,2,108,94,176,214,10,26,245,137,154,117,45,146,117,141,24,79,163,146,231,3,216,160,8,211,192,19,194,60,229,48,213,71,211,122,232,234,134,25,41,87,181,245,124,166,18,204,156,80,66,120,127,72,168,26,195,6,39,18,32,91,171,117,89,229,205,65,61,24,202,181,41,17,119,162,183,250,232,239,33,243,117,96,182,109,245,223,154,209,226,216,69,63,77,62,48,143,142,140,151,215,18,25,115,125,235,15,25,174,112,59,182,180,65,121,139,160,231,156,83,175,27,36,193,174,227,246,177,17,10,210,64,5,103,148,163,30,112,214,138,59,216,208,108,27,64,255,90,192,160,130,254,149,12,98,248,67,217,112,232,146,1,6,53,100,127,23,43,167,107,207,2,102,226,
+69,148,198,105,204,65,93,147,96,8,227,195,56,82,6,78,10,244,184,71,53,40,44,29,29,15,37,212,171,147,66,114,127,65,118,168,29,170,20,8,149,194,67,173,60,132,94,141,196,3,48,156,207,5,151,42,133,79,231,76,11,217,42,46,43,41,128,221,235,212,149,37,16,48,41,219,190,108,39,173,237,21,70,185,10,177,31,14,37,228,230,39,187,177,210,211,201,213,143,12,198,37,128,244,90,130,179,150,141,195,218,0,16,66,103,85,41,148,240,106,38,128,79,150,111,198,22,67,178,150,244,243,30,243,134,108,214,139,15,139,6,20,230,230,182,64,215,196,169,114,42,55,118,139,236,105,161,212,55,50,39,220,203,197,34,22,106,132,37,76,199,167,17,98,57,229,41,126,200,227,150,19,96,8,244,142,167,111,194,22,68,95,128,209,42,72,10,20,189,14,183,235,237,22,141,174,12,106,50,11,122,224,35,3,95,196,151,249,67,202,70,76,14,27,250,180,144,12,84,147,111,114,154,94,195,116,100,23,192,193,102,184,57,17,49,12,178,113,199,168,237,39,245,26,199,82,
+29,197,55,26,87,170,208,25,139,120,149,154,242,185,19,90,62,67,37,213,211,14,224,41,133,125,58,105,26,110,199,184,167,227,38,190,231,230,236,60,8,222,178,242,58,164,166,146,65,83,17,88,229,251,72,127,13,203,91,231,26,154,203,163,55,188,110,47,27,246,53,211,67,171,47,122,195,214,170,209,151,85,110,163,240,155,212,69,10,155,227,74,31,162,21,11,74,76,62,100,54,150,149,212,236,184,181,219,163,128,214,184,10,70,213,19,234,169,125,218,218,118,198,183,2,67,151,206,82,105,96,38,107,93,184,100,225,206,66,93,227,125,95,237,144,210,31,43,74,29,145,55,228,7,216,204,155,50,69,38,73,31,37,69,246,11,150,7,34,97,99,118,50,138,60,236,22,121,61,159,207,83,31,67,68,102,172,138,112,22,75,149,113,44,13,18,113,84,54,115,31,239,181,193,80,249,121,48,68,2,202,226,140,153,111,23,199,119,12,37,64,116,75,223,20,64,48,58,162,178,100,253,14,37,139,48,89,169,46,109,61,110,82,175,185,68,179,89,110,54,183,154,211,27,101,117,
+153,212,209,196,48,97,11,109,60,45,117,48,100,151,220,106,31,80,90,80,0,37,254,13,145,202,70,241,75,47,151,125,134,58,241,139,70,94,118,244,112,193,146,209,86,182,225,220,133,174,196,61,45,133,228,59,202,5,122,46,34,231,174,70,67,38,229,133,58,209,162,149,153,70,31,74,185,180,235,71,193,241,210,231,226,79,1,225,203,188,110,238,245,98,195,28,205,160,84,209,68,80,142,39,34,138,123,128,182,85,70,1,235,10,133,17,48,95,0,50,194,82,185,201,226,133,252,207,217,25,139,165,21,238,232,33,221,109,72,119,247,124,150,68,68,57,113,0,75,164,230,92,72,36,164,18,188,25,77,40,254,226,59,114,82,240,90,48,240,240,184,72,98,108,181,228,59,1,141,30,44,57,108,236,59,63,76,93,202,199,67,101,233,114,14,174,217,9,10,18,201,111,82,73,8,78,149,125,239,207,183,103,178,11,19,77,209,247,89,123,241,25,71,54,217,193,37,245,41,139,183,160,237,102,240,121,253,197,106,82,12,154,189,18,15,122,173,80,10,21,167,93,242,154,41,174,
+160,232,235,51,221,96,38,8,180,42,160,56,63,4,229,254,16,110,197,165,43,216,231,226,167,212,227,27,45,115,146,63,127,103,179,245,201,118,223,218,165,151,195,174,81,108,73,41,37,221,136,137,219,194,56,211,36,196,242,90,201,174,79,79,19,239,177,224,189,2,75,76,186,152,71,182,173,150,94,156,143,118,216,41,163,215,143,234,47,136,160,241,238,233,133,198,241,93,31,180,102,145,116,191,63,89,23,111,248,82,83,184,100,168,15,169,26,193,25,248,54,58,20,3,132,11,79,24,143,224,117,64,253,81,73,97,5,175,66,220,219,226,43,26,128,77,253,51,37,218,226,56,53,239,85,69,72,142,34,217,168,182,92,203,11,82,64,234,68,155,183,229,102,210,88,228,55,101,246,194,178,197,191,177,88,94,80,85,202,66,169,114,130,80,143,203,42,80,50,121,117,226,195,231,184,14,49,64,239,98,26,254,86,125,26,37,235,35,54,111,119,22,105,177,111,228,188,238,43,142,122,102,210,155,137,85,157,238,62,197,97,143,211,46,205,169,247,210,251,182,41,185,44,203,144,194,
+246,164,135,180,19,141,218,228,242,31,18,241,178,186,172,132,92,33,90,10,139,160,124,72,65,85,63,26,174,95,19,198,245,35,57,156,52,170,182,186,146,29,15,171,78,69,104,216,44,65,79,135,167,128,134,154,89,48,186,233,64,149,97,24,50,59,207,110,245,216,161,84,148,168,9,3,30,52,30,191,179,50,167,106,144,208,33,214,111,130,156,121,72,65,172,50,16,81,42,117,106,80,230,221,16,247,145,120,160,62,100,64,79,83,120,144,147,133,109,50,250,251,56,8,198,84,170,67,250,125,79,2,68,170,248,116,196,77,0,164,86,139,230,40,209,44,83,131,139,134,11,146,51,210,238,160,121,236,170,155,158,176,198,132,216,56,210,146,207,168,146,248,204,218,127,90,34,87,135,66,141,94,159,80,186,11,11,110,76,23,117,112,6,215,67,118,97,229,241,142,38,103,54,128,5,206,90,143,98,179,79,32,49,194,131,248,178,54,189,28,205,107,163,103,254,166,116,20,161,172,223,142,67,37,114,60,199,117,65,199,76,149,12,116,239,20,44,197,3,143,159,200,188,97,45,158,
+5,17,201,215,14,64,41,44,6,198,76,7,232,206,111,99,92,122,80,53,168,194,4,155,181,139,5,99,61,244,93,49,32,114,99,147,60,141,159,115,189,36,210,223,24,194,234,100,183,23,19,152,202,44,121,47,38,92,115,138,137,189,152,224,51,103,161,189,152,64,138,152,118,123,49,33,59,60,225,237,197,4,188,22,200,84,226,77,6,156,157,181,25,126,40,181,48,54,184,36,21,239,4,5,0,239,174,18,102,31,151,59,186,48,190,127,112,123,76,90,53,231,119,99,224,102,206,61,191,230,145,195,169,35,1,23,37,135,250,153,149,95,175,84,163,78,183,245,125,203,50,240,13,47,61,116,157,255,75,61,97,190,215,19,58,228,114,155,149,131,174,208,246,73,36,50,44,61,60,66,22,248,17,182,142,199,213,14,108,55,121,210,216,21,34,181,150,67,61,167,137,53,72,112,101,45,71,180,132,123,205,27,22,88,242,184,167,15,215,247,227,106,72,16,202,26,103,48,28,148,248,105,180,87,71,189,113,200,246,234,138,6,117,171,226,56,47,30,128,4,143,242,85,253,248,206,
+78,45,147,100,24,38,107,72,13,177,76,52,125,64,148,130,177,34,139,143,95,176,222,174,143,71,111,45,113,1,75,69,36,135,26,192,36,215,62,105,174,171,126,110,126,241,240,188,194,236,94,252,163,33,175,21,94,204,239,56,195,243,93,179,161,46,208,121,40,8,64,49,192,249,30,4,168,169,81,9,171,246,128,48,206,229,6,39,173,190,75,184,3,239,49,148,77,20,218,70,185,37,168,126,121,129,205,253,188,142,42,92,82,179,146,181,203,114,36,115,170,154,34,122,158,55,227,152,31,19,141,134,13,238,157,183,212,207,74,189,72,126,189,189,54,137,175,137,24,103,114,222,106,171,89,21,126,193,115,26,204,103,140,1,222,16,20,68,74,136,109,196,54,84,9,185,4,133,219,76,25,175,60,238,40,238,120,124,240,190,236,36,226,222,153,177,32,60,66,248,178,160,40,222,172,24,152,154,10,26,121,234,134,190,107,108,48,6,154,220,11,83,126,86,240,109,34,188,83,77,216,238,189,188,187,28,56,88,110,210,249,51,247,128,102,14,6,67,75,60,119,167,185,66,226,100,
+82,203,224,91,111,199,49,87,164,81,203,204,99,133,129,131,208,72,188,75,233,83,24,222,217,228,47,74,45,71,101,216,67,8,11,138,33,246,16,2,70,49,196,30,66,164,80,12,177,135,16,20,20,67,236,33,196,28,197,16,123,8,241,40,169,201,11,40,19,57,148,215,245,81,23,18,152,140,245,171,165,21,4,187,222,87,225,17,151,145,196,171,241,141,39,130,166,178,69,233,54,138,207,55,150,230,149,44,235,231,190,71,218,1,68,217,86,200,173,248,209,27,71,161,74,102,178,136,146,79,42,88,120,239,117,217,252,32,73,62,165,123,161,163,71,247,205,244,241,61,40,233,92,38,133,153,35,248,216,216,160,9,230,246,130,23,67,29,76,243,159,5,2,184,241,89,32,16,210,63,11,4,73,18,101,197,58,189,6,18,150,172,62,111,125,99,0,252,158,144,146,84,182,159,211,80,135,105,90,120,118,254,172,135,142,50,117,124,118,113,125,114,11,152,222,84,110,208,129,50,191,87,208,16,235,195,226,206,145,70,13,246,200,242,236,209,35,141,37,91,21,225,139,251,69,225,
+6,196,139,253,64,177,203,35,70,125,75,245,60,112,138,66,5,16,197,10,123,168,192,65,177,194,30,42,32,40,86,216,67,5,46,138,21,198,56,20,245,160,24,97,43,77,195,28,195,202,45,228,4,88,118,62,210,70,41,201,130,80,170,55,70,61,116,103,94,224,146,245,70,60,35,122,131,169,43,207,186,179,89,153,159,113,44,22,173,236,235,199,112,5,121,227,80,9,152,188,58,60,143,200,202,142,10,153,141,199,173,60,78,148,89,119,21,170,133,170,125,177,138,67,204,71,213,181,227,109,5,181,205,166,39,114,38,16,168,162,32,110,54,51,123,86,48,204,37,211,192,210,193,37,44,1,18,47,214,64,189,161,192,43,0,158,247,108,220,104,40,68,245,46,69,208,224,32,74,183,159,80,134,228,16,27,167,7,123,177,231,195,250,19,39,96,137,194,134,242,89,4,86,197,224,90,31,215,249,196,230,93,25,209,39,54,127,110,190,71,217,124,65,86,61,200,241,36,30,117,189,62,159,31,134,205,42,61,8,198,189,73,3,114,129,187,173,208,178,244,9,202,229,239,192,43,
+79,69,76,211,210,96,195,26,62,80,0,152,16,110,78,6,72,200,66,160,85,0,96,76,243,124,255,90,236,183,237,33,202,59,44,242,123,12,166,8,103,34,127,57,54,227,198,161,208,211,29,51,205,151,153,167,42,15,250,172,155,233,178,198,104,78,206,71,7,22,200,254,48,244,11,251,121,17,116,35,111,176,19,105,167,93,111,118,196,88,113,108,242,125,202,26,178,152,227,129,186,112,117,78,10,221,161,83,160,43,210,104,114,57,245,154,105,118,246,26,177,251,70,121,183,69,166,76,80,85,211,40,133,211,199,41,211,190,129,27,217,61,225,39,37,147,1,220,243,193,152,101,6,35,91,70,236,192,165,58,167,10,6,14,174,68,254,224,96,213,176,210,107,96,74,162,131,12,124,47,42,141,111,175,244,116,122,10,234,184,26,90,197,243,142,110,57,187,146,6,182,221,232,224,18,102,202,35,29,235,209,193,64,115,150,84,112,60,253,100,131,108,51,135,20,18,86,11,218,70,208,203,107,119,199,58,25,139,143,147,174,233,237,182,245,10,77,150,71,169,187,229,178,125,102,202,
+207,91,23,39,232,74,29,51,77,250,248,26,189,46,225,66,204,63,38,128,225,147,115,206,233,137,124,225,239,231,18,173,52,62,34,171,63,60,17,194,93,3,11,246,73,197,243,210,66,108,160,193,9,227,130,160,0,216,116,122,12,223,126,9,45,15,118,25,66,127,181,232,58,151,4,20,169,177,123,39,80,129,87,187,57,157,145,146,174,177,237,90,197,158,53,135,158,120,11,194,55,46,180,105,136,30,172,43,129,68,246,164,19,126,115,166,208,101,59,0,217,82,53,240,40,121,128,84,138,11,69,172,71,78,79,179,177,180,241,122,113,87,72,132,147,183,199,187,102,169,250,120,164,90,182,155,106,92,171,75,3,122,108,189,136,88,132,28,210,8,137,121,77,58,12,16,122,197,68,40,106,10,170,233,47,117,7,30,169,54,241,46,156,91,237,179,202,213,193,249,121,31,50,65,183,204,174,251,208,94,206,241,248,172,158,226,76,159,39,65,99,151,36,234,41,229,104,48,204,208,162,23,66,185,125,128,18,219,103,169,48,239,254,196,216,215,46,136,139,5,39,1,213,30,4,160,
+148,253,28,229,236,224,36,97,198,194,170,183,227,24,197,119,120,41,128,183,52,163,170,160,6,223,103,188,43,137,113,243,220,22,4,10,199,86,208,228,138,216,89,226,104,226,80,47,63,3,228,155,3,227,139,73,84,130,167,3,102,13,35,150,206,143,8,56,52,92,30,139,89,64,77,186,83,60,160,157,68,53,245,198,138,244,246,0,85,5,98,148,177,97,253,234,251,55,145,234,137,146,197,220,18,17,228,80,120,64,201,230,228,39,1,24,198,192,42,221,210,116,76,168,51,94,194,238,25,228,240,61,228,131,93,165,81,166,221,43,14,111,72,219,183,123,198,130,86,28,63,239,15,205,217,39,10,39,98,210,45,144,75,252,54,174,123,198,222,95,159,45,208,93,118,194,204,194,251,254,97,58,51,155,219,5,14,18,121,236,83,25,170,250,90,218,125,35,166,231,198,147,141,204,241,24,82,244,42,195,250,112,154,105,115,162,218,97,159,167,236,114,150,125,173,197,162,109,83,245,120,147,222,210,152,247,198,230,141,212,170,139,230,82,45,94,105,177,92,111,206,123,185,110,44,85,
+154,85,220,219,254,241,26,141,189,101,209,219,248,224,106,123,215,169,82,136,165,144,85,76,244,94,142,156,70,220,116,150,162,148,114,186,128,25,102,11,72,255,45,113,125,246,206,66,210,119,146,128,32,20,51,18,192,66,177,90,161,240,109,51,133,54,219,63,89,190,206,101,204,9,75,41,188,169,55,156,202,75,49,224,39,194,238,55,37,92,189,101,55,113,49,102,116,2,189,222,134,79,112,238,67,91,193,224,244,77,115,225,170,110,97,105,157,118,49,145,247,166,187,197,100,137,222,4,245,70,146,78,145,95,123,215,126,73,232,134,20,218,190,154,112,80,61,45,22,86,144,170,233,157,116,136,32,237,136,226,185,193,152,235,112,203,106,146,94,151,41,99,107,9,64,199,52,76,205,227,43,246,147,145,31,184,165,16,79,58,228,119,17,191,143,108,94,73,167,187,173,115,246,41,29,224,201,117,229,251,116,0,121,228,211,88,242,91,211,73,83,26,80,191,131,200,106,105,56,136,207,81,238,146,20,185,215,115,122,99,104,155,148,222,242,165,246,251,12,14,49,207,198,49,124,141,
+137,215,222,32,141,51,122,189,2,195,40,199,109,192,132,197,106,39,52,207,96,228,41,64,87,208,215,253,8,109,29,45,198,99,97,193,221,129,146,118,141,197,104,207,218,222,200,35,63,168,89,80,88,13,191,225,112,189,143,208,42,203,94,117,13,132,173,233,153,133,182,24,45,233,57,116,158,142,203,241,58,182,65,222,9,210,6,36,158,239,177,197,23,25,92,28,36,144,142,250,130,198,91,28,146,101,142,235,166,1,38,152,241,94,241,158,200,39,167,97,120,37,100,29,142,57,77,92,19,123,116,167,86,70,217,216,106,186,4,233,30,31,231,207,35,3,77,43,5,80,110,193,54,153,2,123,197,116,120,157,73,162,129,214,151,202,67,150,155,43,167,118,215,240,55,228,87,15,205,88,163,1,92,106,86,177,108,17,40,60,153,173,209,113,37,104,222,22,133,44,7,139,31,165,247,45,99,110,193,149,123,134,97,235,243,133,206,20,21,52,147,135,113,168,222,184,191,58,196,140,129,168,197,179,153,216,10,193,231,45,197,220,11,213,28,190,34,251,217,221,212,242,186,52,205,46,
+59,52,133,111,194,64,14,18,240,107,96,138,109,232,90,14,47,214,96,171,97,240,95,135,88,251,145,93,30,242,131,17,22,216,127,127,83,228,239,134,137,107,226,90,98,107,235,133,173,1,146,111,166,75,71,243,230,106,252,92,241,41,97,123,208,97,74,18,46,151,23,244,243,20,217,181,125,4,142,237,247,41,155,32,152,244,241,75,14,56,232,205,219,165,103,175,189,36,2,200,234,235,203,7,109,64,223,28,74,239,164,25,249,11,49,254,12,69,85,134,215,212,189,63,88,246,41,169,46,86,95,235,122,128,36,141,100,88,144,35,189,60,232,110,1,133,245,230,184,170,16,237,233,186,107,46,109,220,172,187,66,202,85,171,153,232,9,66,120,177,154,217,3,210,22,47,29,44,152,97,119,18,116,153,57,143,1,110,38,214,45,156,152,56,254,196,187,225,130,45,83,205,29,112,201,74,185,173,148,104,202,108,255,168,3,81,19,94,208,204,211,27,105,149,54,107,86,141,143,13,114,194,46,24,234,207,65,48,100,11,109,60,10,123,85,10,3,172,168,90,15,166,220,92,11,189,
+87,130,124,244,118,113,122,33,227,7,83,211,114,105,221,242,155,91,152,54,78,115,166,228,18,150,99,47,127,135,224,183,224,212,37,141,4,221,160,93,18,139,70,153,185,4,68,95,40,96,195,180,83,87,107,199,105,43,216,6,143,154,106,178,220,1,24,82,247,242,72,145,107,47,158,165,237,234,86,188,147,97,47,140,118,66,240,145,206,146,185,139,136,5,16,37,209,91,36,96,185,254,20,197,97,85,242,83,20,223,69,151,159,162,120,51,117,252,41,138,155,194,181,97,129,145,130,92,49,238,234,230,237,214,240,30,51,249,123,106,106,136,72,213,196,20,104,60,98,203,64,118,12,166,210,132,242,67,196,210,168,207,145,188,178,48,33,3,134,70,131,167,190,149,6,66,102,75,244,144,197,34,14,52,106,186,165,223,77,157,38,206,135,178,206,212,163,142,180,223,4,199,99,112,137,169,176,46,138,6,167,189,26,59,14,94,169,182,203,215,254,122,173,195,128,70,254,28,126,137,55,27,85,33,133,213,234,213,101,187,42,112,35,111,165,165,112,208,19,70,226,53,125,93,24,138,
+233,90,172,242,128,23,60,3,168,141,198,229,77,218,15,233,54,141,52,212,188,179,136,67,106,37,255,130,60,237,221,243,75,175,216,81,32,100,87,20,245,157,48,244,106,211,50,145,8,7,229,234,123,170,46,64,185,250,158,170,219,80,174,190,167,234,107,148,171,239,169,186,8,229,234,123,170,174,68,185,250,158,170,243,80,174,190,167,234,66,148,171,239,169,250,17,202,213,13,230,32,251,164,159,97,238,19,5,7,23,172,167,59,188,228,58,172,139,141,158,103,145,37,135,206,218,52,101,192,141,134,188,232,216,169,119,76,176,141,228,59,97,223,136,215,238,40,214,52,67,208,246,224,158,220,200,176,59,166,250,105,182,89,87,54,135,248,34,47,25,62,4,218,253,136,62,231,57,106,31,188,88,202,201,180,205,222,174,152,53,183,232,140,143,196,207,65,36,238,40,250,111,14,145,54,145,4,227,19,0,80,55,48,41,152,71,37,151,220,55,92,120,198,199,176,251,52,39,180,239,197,115,145,170,109,221,139,231,108,121,83,184,23,207,143,72,233,187,189,120,30,203,94,27,42,57,
+189,131,21,119,121,12,23,60,185,46,137,147,196,217,154,2,171,70,167,78,90,119,53,170,228,206,239,183,17,58,219,192,38,227,61,18,166,166,102,69,216,14,106,15,213,128,72,246,72,130,221,74,50,60,189,26,27,150,173,92,51,88,126,53,217,174,195,185,121,242,204,52,114,29,21,188,108,222,211,13,139,223,201,132,195,40,59,124,137,211,221,208,39,97,29,43,73,189,157,102,33,8,71,68,13,23,212,120,87,3,152,32,137,8,78,131,20,244,218,199,129,167,193,103,8,103,112,18,56,181,173,92,249,140,6,188,190,211,19,189,134,240,207,75,26,203,4,6,152,39,133,211,231,121,200,14,89,34,167,201,177,229,29,243,184,15,190,15,208,118,136,5,131,107,197,201,138,140,7,113,135,199,136,75,5,81,178,241,98,242,76,86,79,55,125,174,18,16,175,51,174,64,180,135,10,14,36,64,220,1,14,179,214,15,165,122,151,68,102,164,121,230,101,182,39,44,245,98,239,147,53,17,237,57,190,166,7,78,165,141,250,64,226,245,31,100,244,1,13,200,173,223,122,133,158,46,
+38,11,105,11,117,31,29,81,24,47,231,237,240,210,213,242,103,120,55,233,73,165,49,169,211,242,81,255,181,185,169,0,98,33,14,152,113,65,148,196,167,44,2,213,223,82,231,244,50,9,202,100,67,234,79,74,125,192,211,94,31,9,115,146,183,183,208,97,61,221,203,205,196,0,94,2,220,236,54,180,35,153,129,96,3,125,238,243,104,1,13,129,47,161,249,194,202,59,4,23,207,207,107,214,127,3,31,47,254,145,143,115,95,226,176,162,210,207,41,84,72,251,204,39,23,156,76,230,244,253,140,63,64,10,235,94,145,223,61,244,62,41,242,155,18,241,147,34,127,114,121,251,89,145,79,144,62,41,242,171,49,240,73,145,55,80,26,12,77,65,163,57,44,20,63,69,236,138,66,251,41,98,71,101,76,150,99,97,12,137,67,93,223,254,3,3,162,58,94,122,139,82,240,23,148,131,239,41,56,5,229,224,123,10,78,67,57,248,158,130,239,57,248,158,130,95,161,28,92,157,51,34,167,134,247,224,158,130,11,29,245,39,231,133,173,2,65,26,47,13,156,120,150,175,17,50,
+71,129,11,250,67,73,31,35,10,129,130,150,41,16,210,29,92,70,229,128,120,147,167,88,30,31,219,232,35,96,67,212,110,36,160,39,182,239,227,212,38,147,146,18,190,240,157,247,240,202,203,161,237,182,155,190,45,98,9,15,215,24,114,43,142,139,227,223,46,11,158,117,201,171,173,215,247,97,124,172,148,92,81,95,175,225,97,212,75,209,85,194,195,119,39,247,222,68,132,71,148,155,152,193,81,165,174,176,93,98,24,30,200,142,75,80,55,240,224,41,185,7,54,5,24,165,172,92,221,122,116,60,172,134,14,152,157,198,84,54,82,204,121,16,17,110,155,249,75,89,45,33,55,4,1,0,124,17,61,40,121,136,210,217,158,180,238,119,39,6,80,231,190,32,64,34,49,105,179,181,29,49,175,249,194,94,166,176,167,231,195,200,103,122,206,190,255,76,207,155,130,61,61,199,145,17,69,222,106,94,112,38,23,28,173,10,13,199,154,109,40,24,148,160,148,69,110,117,213,159,78,125,212,222,125,164,21,175,55,134,67,127,15,246,225,47,129,26,184,149,0,184,87,73,184,93,
+79,191,231,237,119,111,97,45,183,33,187,139,250,41,33,93,145,71,235,49,217,151,215,134,208,16,41,49,194,13,54,145,141,103,95,106,174,173,175,135,71,217,12,162,220,244,108,165,222,219,167,236,114,93,121,166,12,160,116,225,162,216,215,85,16,64,35,5,117,138,209,189,95,189,202,246,38,224,112,216,41,114,236,44,89,19,7,75,167,118,186,233,212,50,57,141,248,89,202,211,231,134,9,145,43,251,203,14,59,163,195,36,108,90,221,93,215,22,200,66,98,216,192,15,191,60,129,182,168,220,221,40,121,142,47,88,136,130,96,231,39,82,44,210,186,45,225,54,212,65,27,19,180,93,122,95,247,185,250,226,62,89,255,74,189,61,223,39,235,125,189,219,145,181,49,222,224,26,187,162,149,201,97,34,248,226,25,47,73,98,113,147,205,254,217,13,110,162,163,138,238,56,172,36,172,191,76,15,247,201,122,148,135,191,226,238,206,206,100,221,96,156,12,125,18,240,31,163,159,5,124,158,251,36,64,46,197,241,119,245,70,42,59,232,156,198,28,18,73,201,108,76,153,121,218,113,
+172,225,76,68,72,107,34,122,60,124,248,161,57,37,5,144,212,242,57,154,173,186,0,205,0,13,128,220,85,153,118,124,196,165,41,17,111,164,191,128,178,244,138,33,82,120,53,71,44,64,175,232,188,183,194,124,129,89,193,215,210,123,225,19,102,242,254,152,121,201,14,133,137,239,13,5,176,52,170,192,126,137,6,135,195,214,23,109,56,4,128,138,17,5,105,200,228,216,23,88,42,157,210,35,133,113,172,109,144,49,179,144,40,236,244,167,91,85,233,3,100,222,148,7,197,113,231,52,154,31,6,134,176,65,83,28,53,139,65,135,254,80,98,206,68,243,202,192,205,237,233,121,3,47,247,246,230,111,213,34,193,123,57,204,150,205,2,185,95,96,125,22,216,175,59,50,171,110,112,225,24,95,21,31,38,174,87,230,81,42,178,17,207,121,160,113,34,32,191,165,151,200,103,225,254,104,31,140,201,79,208,59,60,51,76,252,196,140,39,206,69,25,188,108,49,60,106,94,22,218,6,119,143,212,110,202,8,33,76,17,188,106,36,94,228,175,107,52,70,170,7,202,28,105,70,43,
+122,251,44,66,91,151,127,151,235,2,145,83,117,38,133,119,65,48,1,209,155,93,206,150,14,87,181,190,116,199,157,174,98,156,57,230,113,175,239,36,125,66,5,229,113,105,209,126,93,242,25,153,114,255,225,128,231,250,147,171,171,224,33,113,24,5,96,103,217,174,165,255,150,210,1,161,178,199,15,17,204,97,81,142,110,120,165,37,244,94,141,218,100,214,169,235,115,242,198,201,56,39,120,69,96,175,2,215,42,51,57,32,138,88,39,198,39,146,175,92,218,140,149,114,51,75,8,170,64,40,6,38,248,208,40,115,227,83,31,47,4,22,179,118,149,228,205,174,194,115,85,71,126,151,241,182,24,135,231,97,98,30,49,94,18,164,101,104,139,142,167,142,142,167,229,137,242,162,206,102,68,154,41,144,116,227,34,163,124,66,149,147,215,116,64,45,50,226,111,234,12,234,97,243,84,158,176,3,61,218,245,202,200,52,21,149,247,146,208,157,136,29,138,150,107,51,5,85,224,96,189,225,155,118,26,53,20,154,61,43,82,45,57,160,166,59,140,19,206,203,161,80,12,182,84,13,
+199,21,240,154,15,142,34,242,232,62,67,79,37,50,103,37,238,116,105,98,36,134,244,24,255,138,192,53,41,139,247,90,1,169,193,19,38,173,113,96,30,251,156,160,175,15,63,39,232,55,157,207,9,122,225,217,231,4,253,170,85,121,66,129,81,227,145,206,48,238,117,48,156,124,159,152,103,49,86,130,209,91,68,221,200,104,226,142,120,65,94,224,65,26,59,24,148,135,70,181,88,240,147,162,223,103,30,125,82,244,241,163,221,39,69,95,163,191,248,164,232,243,105,156,79,138,126,52,221,231,59,47,124,66,46,194,120,50,34,46,42,203,105,0,234,202,135,150,23,180,54,210,25,65,35,67,243,171,75,54,58,156,219,131,5,20,43,200,117,159,19,237,45,217,231,68,251,248,241,115,162,253,26,255,57,209,206,119,176,204,40,45,226,29,45,183,164,66,38,255,12,62,64,141,130,140,194,82,5,31,224,61,20,200,162,88,96,15,5,64,20,11,236,161,192,29,138,5,246,80,192,136,98,129,61,20,40,1,206,248,145,208,121,25,103,166,153,116,74,214,162,153,41,235,248,68,
+141,154,213,129,32,19,141,207,142,130,2,38,248,124,202,147,171,154,177,246,154,170,77,140,4,19,109,25,75,97,113,132,43,161,136,230,41,213,140,220,184,213,29,62,57,88,234,138,53,23,177,72,206,72,184,241,237,205,202,58,15,165,207,160,77,52,99,0,9,35,225,227,53,247,174,126,20,144,107,250,131,42,187,205,55,142,122,236,179,178,175,8,113,174,92,183,146,169,161,158,110,215,175,40,16,5,15,210,141,228,219,231,232,107,14,121,205,12,133,40,134,184,81,222,190,29,193,134,227,44,12,59,43,254,208,152,126,67,108,128,71,166,129,109,218,228,248,213,124,3,246,160,41,6,86,98,32,182,91,225,65,212,151,186,119,70,125,201,123,103,212,119,182,119,70,125,131,123,103,212,215,176,119,70,125,89,123,103,212,247,125,239,140,250,42,193,207,29,195,185,207,29,87,131,159,59,134,246,206,149,147,160,66,109,14,30,172,237,207,6,64,29,231,122,206,185,35,217,131,61,183,100,95,41,132,195,156,32,124,56,123,208,189,249,92,17,177,213,43,25,178,238,143,38,231,214,
+88,255,145,94,224,110,173,147,115,133,65,25,200,18,117,25,137,138,181,148,251,229,181,43,191,69,117,101,169,63,238,5,18,62,223,202,249,164,32,8,208,185,78,240,178,146,4,224,15,201,81,100,246,188,71,99,255,197,235,123,186,135,162,144,144,164,77,147,236,249,56,46,128,250,216,17,6,124,128,3,39,251,207,67,224,63,161,185,255,252,122,246,116,157,219,33,23,180,98,246,100,96,108,82,202,167,143,182,43,227,76,144,203,250,159,143,8,229,96,213,35,138,35,23,34,9,182,29,50,99,40,217,55,185,231,129,118,79,192,92,248,147,234,197,3,244,116,12,227,8,27,250,27,46,139,125,17,227,16,134,200,175,230,160,197,18,17,46,82,125,81,97,60,98,160,246,124,240,169,120,34,77,138,79,75,120,204,137,190,158,94,163,197,7,53,148,250,16,140,88,117,9,67,193,130,4,114,61,183,47,126,142,97,197,215,239,12,140,148,146,37,143,208,226,24,5,221,253,181,75,186,219,102,117,38,30,78,226,207,182,228,17,176,146,233,245,65,119,124,39,162,22,36,66,124,181,
+169,127,232,105,53,146,35,170,72,236,226,47,104,203,43,133,77,118,57,239,232,51,2,161,158,135,159,8,242,9,201,145,124,234,1,25,85,5,5,3,138,45,128,1,7,27,134,204,83,127,8,11,19,12,30,15,58,77,234,7,47,202,195,131,239,90,218,92,91,55,221,190,9,85,20,22,225,140,146,165,72,8,136,216,5,97,13,212,122,186,143,235,114,192,174,150,83,112,205,159,177,96,15,147,4,113,164,56,58,193,76,2,229,66,12,80,75,201,80,189,220,141,144,172,178,99,66,189,113,80,103,36,234,39,40,114,206,98,56,164,67,132,241,82,184,190,24,22,186,205,103,123,138,34,6,120,98,64,252,120,78,71,151,19,87,191,10,249,213,135,89,3,146,229,23,110,15,6,18,28,34,201,99,16,60,71,202,160,2,192,162,199,62,28,141,223,41,167,13,103,125,76,191,15,31,177,161,155,51,10,89,224,119,143,159,130,39,97,177,81,177,49,132,15,251,55,164,144,131,201,155,92,187,51,252,182,245,153,174,3,236,7,232,93,169,244,96,31,6,245,14,133,32,19,26,10,
+241,231,227,75,176,233,180,184,3,12,75,1,48,250,137,96,82,240,9,181,163,71,194,31,106,161,12,237,109,250,200,131,85,46,204,225,167,253,114,64,134,111,247,111,162,99,3,15,168,123,1,238,220,10,126,118,136,3,84,146,31,253,87,150,176,189,239,21,31,116,7,160,135,79,44,89,162,155,110,248,112,0,90,197,64,194,79,44,100,219,87,245,104,204,95,199,102,92,7,247,201,78,252,237,68,200,46,52,158,230,106,24,41,81,111,15,32,65,36,97,146,143,21,147,93,65,82,173,134,187,70,83,114,182,233,56,8,207,209,32,222,84,156,88,117,96,92,66,101,90,143,21,245,222,147,112,255,201,30,217,219,93,181,19,243,83,88,174,225,24,187,223,233,184,207,219,215,37,56,199,161,35,240,251,174,176,200,197,177,182,142,231,34,237,8,187,112,75,245,161,252,162,244,0,81,220,159,235,81,132,89,202,37,186,252,192,69,34,254,0,213,93,196,23,180,112,73,187,158,5,246,42,147,131,245,255,214,35,176,234,140,186,66,12,220,250,137,19,58,214,145,118,59,38,163,115,
+12,70,124,36,197,130,24,12,198,227,62,247,19,49,152,135,250,1,230,147,121,94,253,108,98,92,159,77,255,251,103,115,111,161,102,11,225,11,76,209,35,212,34,96,232,151,251,175,110,28,96,252,216,253,87,55,158,78,248,159,190,201,225,250,108,158,212,62,155,126,241,103,147,255,255,249,158,7,133,253,217,68,222,62,153,231,240,81,129,48,52,31,98,48,255,79,121,71,254,211,198,149,254,87,230,151,237,154,136,77,145,162,253,37,109,165,173,218,170,138,42,85,85,89,237,106,85,1,30,236,33,140,106,108,214,99,147,102,127,88,25,115,6,19,2,133,4,211,196,156,9,71,56,12,132,64,32,28,230,52,87,3,1,26,72,0,199,96,206,64,33,220,135,73,216,119,216,227,25,99,124,0,73,91,173,80,98,191,153,247,190,247,221,239,251,190,55,126,163,30,44,68,143,48,199,194,135,150,1,158,170,117,252,68,179,58,193,183,231,157,205,176,153,145,49,90,80,130,38,174,118,126,190,58,218,214,28,196,205,117,21,110,234,139,113,19,254,90,26,54,85,25,252,38,160,27,
+55,203,82,235,239,204,110,141,60,138,179,150,32,142,25,178,212,62,209,93,140,155,153,201,184,25,157,129,155,170,120,220,84,253,8,127,12,179,222,144,144,7,39,27,76,57,150,78,21,110,170,82,249,77,85,34,191,201,242,115,98,253,81,239,210,250,179,110,21,68,122,79,237,17,143,36,220,244,40,231,201,169,50,125,65,87,253,146,10,63,158,158,232,73,62,222,226,157,154,111,108,221,211,197,239,153,193,100,197,15,38,102,146,182,182,135,225,140,215,84,240,233,55,86,44,170,56,44,150,84,67,189,235,231,233,157,229,109,64,205,164,222,244,165,17,88,248,86,1,155,168,110,123,106,2,89,203,124,139,54,19,65,30,52,249,192,215,99,244,212,152,220,186,55,245,248,122,180,170,65,149,113,187,98,189,45,51,122,3,128,46,54,30,171,119,149,176,169,238,214,128,121,85,137,154,195,183,69,175,74,222,88,95,46,190,138,222,41,132,35,114,87,202,180,245,217,251,251,139,141,237,171,141,166,225,95,250,71,51,71,243,218,127,94,174,30,140,135,200,168,111,15,110,84,109,108,
+213,62,220,106,218,185,147,219,167,41,191,145,8,47,119,142,90,219,210,111,131,59,215,183,227,154,90,51,161,192,212,131,241,8,195,222,252,132,18,253,176,62,22,219,123,140,165,124,253,153,101,121,43,53,51,22,206,239,89,31,12,117,113,131,47,173,185,75,187,205,22,235,211,134,218,103,147,250,206,220,45,115,105,67,229,189,241,153,167,219,119,74,231,87,166,30,152,103,45,209,141,29,240,188,20,115,210,194,193,226,234,254,179,129,195,141,162,198,241,230,213,137,237,177,133,187,143,54,246,118,86,172,35,47,7,182,182,126,181,116,183,26,161,29,25,226,250,12,133,149,253,19,165,45,55,222,44,29,154,54,54,43,158,228,207,26,214,154,111,189,206,124,121,112,176,163,221,139,222,133,191,163,152,233,156,203,159,24,255,105,124,190,96,164,109,174,246,97,246,212,84,78,174,246,81,89,142,6,253,222,225,102,27,64,105,222,82,109,156,155,27,74,174,233,239,185,217,82,50,178,153,156,95,251,164,45,187,126,45,119,162,249,214,176,105,119,229,117,187,74,53,54,86,153,21,159,
+249,192,80,163,31,78,83,77,85,103,223,206,209,101,111,154,167,110,164,212,245,24,239,169,245,115,64,160,73,234,214,238,165,245,234,250,122,77,86,98,108,207,204,193,116,225,242,110,135,225,198,76,156,22,204,163,73,29,205,207,79,235,171,76,75,109,175,140,83,215,77,63,105,108,110,214,214,54,60,26,27,141,222,75,4,196,116,86,235,245,154,188,248,53,189,118,40,77,59,240,166,102,250,218,238,65,229,242,242,166,185,82,175,203,130,170,150,52,107,42,54,245,39,77,104,178,205,89,247,239,143,21,232,198,150,107,54,55,239,30,230,214,93,127,142,238,119,118,15,247,109,170,117,115,37,153,131,189,27,13,133,45,119,71,179,138,75,83,179,180,218,172,102,248,171,34,224,202,135,128,206,165,173,87,55,253,100,72,216,51,150,12,189,221,238,41,175,154,140,126,178,123,184,251,250,245,53,83,243,74,140,5,74,109,164,236,201,189,244,204,123,67,21,169,102,168,4,3,253,125,234,165,216,170,170,170,254,162,145,2,157,181,119,239,94,95,93,117,131,122,180,203,56,144,157,156,
+179,176,184,212,28,15,253,150,161,51,127,102,100,118,191,53,189,191,181,182,230,225,122,211,172,78,93,90,153,49,179,188,188,208,49,152,177,179,58,10,226,6,85,165,234,254,173,60,253,218,90,246,92,197,84,85,85,186,169,37,109,245,237,181,162,91,251,9,227,69,181,15,59,186,140,154,132,248,248,199,214,134,188,5,160,197,197,19,115,179,171,55,117,35,25,45,5,5,179,49,237,49,147,77,186,242,104,140,94,91,175,169,48,115,65,187,221,121,119,88,243,86,155,181,152,147,114,103,97,121,229,209,180,62,70,255,32,15,12,29,75,219,77,220,155,109,172,76,93,190,214,21,111,141,223,127,81,245,184,33,101,118,230,151,138,88,40,116,32,139,85,117,234,232,160,121,192,60,102,174,179,36,14,15,215,78,86,38,90,235,235,83,234,106,117,147,3,69,201,237,186,152,245,42,168,247,131,11,121,155,217,227,111,230,214,247,86,151,173,77,21,150,221,199,173,181,22,235,248,13,93,174,89,51,171,209,172,238,90,150,154,11,86,107,26,107,114,183,74,53,214,233,50,99,108,243,
+45,232,231,239,239,196,174,108,55,237,188,53,143,151,44,229,236,61,95,205,126,113,184,102,30,78,169,158,175,54,12,47,37,108,55,190,152,251,229,205,208,124,206,126,79,71,204,192,65,67,246,237,140,123,55,226,144,4,45,121,45,243,45,214,131,237,146,150,198,55,166,95,95,214,13,86,88,203,126,172,172,31,189,30,211,178,191,51,182,156,91,158,165,189,5,187,238,131,190,83,29,134,169,155,105,233,198,162,174,253,116,221,90,122,79,71,247,204,244,193,102,117,73,250,226,98,236,139,138,187,115,198,162,66,227,116,81,186,165,160,40,165,7,219,203,177,235,206,212,82,111,223,174,49,123,78,111,172,155,28,41,207,216,126,149,145,25,159,168,205,209,197,24,160,237,39,60,24,61,48,154,158,244,46,245,207,63,216,203,188,179,254,236,103,253,80,70,204,214,76,82,186,193,248,188,51,175,187,106,119,225,97,197,86,231,171,103,237,107,27,229,27,134,167,93,201,69,61,43,247,83,76,93,234,166,107,207,243,211,246,103,77,41,99,85,25,37,170,233,212,242,156,210,178,68,203,
+118,221,193,225,148,238,176,119,118,203,216,126,216,150,3,143,173,50,46,188,62,140,94,124,251,147,106,153,127,208,213,23,164,40,28,30,128,69,200,194,236,135,116,225,163,182,148,10,66,44,163,24,66,42,83,16,82,10,31,186,5,15,216,34,105,41,65,18,140,132,140,162,236,71,115,9,148,140,146,148,72,174,218,174,218,78,227,138,36,165,148,159,211,177,90,255,32,37,74,138,59,149,128,20,137,40,134,193,231,114,125,73,41,62,39,21,164,192,143,248,144,8,100,191,203,228,132,156,98,34,41,145,130,6,192,153,112,153,92,33,2,200,201,34,41,57,169,144,201,25,63,130,102,208,41,96,180,84,76,253,0,129,147,184,43,160,234,60,231,192,178,128,143,208,97,109,232,251,95,63,250,202,249,160,179,127,134,83,82,48,233,197,191,5,16,223,253,41,32,224,47,1,1,248,120,51,64,88,40,41,250,62,24,157,199,70,216,155,65,182,62,248,106,136,189,73,216,160,4,113,15,48,19,217,198,64,60,105,105,148,236,123,64,237,21,208,143,131,39,33,10,39,165,151,41,134,
+139,175,11,28,63,21,139,133,2,161,223,69,30,134,156,251,151,20,84,68,48,193,94,64,109,22,53,225,7,44,154,128,70,0,138,189,35,240,179,227,11,174,2,225,74,169,43,8,41,32,113,27,172,243,196,183,148,66,41,151,50,224,174,156,10,163,228,148,84,68,193,251,223,121,133,2,32,151,6,106,230,116,132,27,3,64,70,194,137,132,127,102,136,72,57,20,168,130,246,142,7,64,17,25,5,100,154,92,120,238,29,240,195,33,93,199,145,118,112,70,182,71,136,171,30,0,27,71,7,225,57,182,203,5,66,65,253,224,24,203,50,59,144,140,160,8,146,129,83,11,252,252,145,197,145,18,6,241,5,43,180,109,196,57,59,4,168,219,78,74,237,150,65,136,5,240,24,59,225,7,66,255,223,13,203,130,89,180,130,9,244,225,18,252,5,194,49,173,63,241,126,4,2,8,130,10,14,85,159,148,138,177,28,104,248,15,98,137,46,73,200,80,74,226,149,145,218,78,70,124,143,156,231,156,198,136,143,90,116,201,85,228,162,127,75,206,94,161,21,225,206,218,141,145,178,47,
+39,144,209,71,84,255,228,156,255,45,172,224,93,203,226,15,97,67,30,37,237,207,177,44,103,129,123,16,245,37,41,3,86,11,161,128,150,42,206,70,140,24,160,91,127,6,230,114,193,171,11,4,237,196,5,15,232,190,3,29,60,19,228,223,139,134,120,197,155,119,108,177,239,157,91,191,83,107,245,36,139,119,187,134,157,177,20,126,183,171,159,207,92,254,99,105,255,255,239,74,135,25,201,112,242,37,82,65,68,202,24,26,158,12,78,112,23,52,58,232,188,139,53,208,150,181,114,115,102,127,110,183,8,212,5,175,144,32,91,10,69,185,239,21,41,144,14,27,161,30,137,146,32,76,112,207,155,96,233,91,42,66,22,69,57,175,160,28,134,68,201,104,177,11,142,5,16,120,228,153,44,149,128,141,24,26,230,5,196,221,137,113,238,137,248,146,82,124,38,83,2,10,64,86,140,68,124,145,131,132,125,42,14,50,78,233,58,32,198,14,129,223,67,224,231,72,233,177,234,176,216,226,52,24,98,43,85,70,132,82,114,91,82,6,83,123,54,91,246,136,52,180,79,239,130,23,
+55,150,108,131,115,118,130,112,153,225,67,153,248,40,18,14,117,199,10,133,103,144,78,98,113,201,9,220,135,75,48,190,226,150,39,54,105,6,121,161,10,28,158,224,91,238,85,0,176,9,93,37,165,138,211,241,43,144,58,18,198,122,99,132,176,200,116,70,130,15,68,245,6,136,54,66,152,8,34,25,91,105,234,60,241,47,153,18,149,109,80,97,66,201,80,246,186,28,33,144,201,217,18,220,199,31,11,63,241,243,172,22,167,50,210,19,216,167,171,122,224,81,130,190,116,65,144,240,191,30,201,145,125,13,28,46,175,24,231,141,212,240,48,135,224,156,100,0,157,10,184,143,253,187,67,8,151,194,88,239,8,28,188,132,100,64,230,196,22,137,194,104,57,136,16,100,82,202,35,198,223,200,169,168,19,96,12,135,185,195,56,18,220,167,101,74,198,61,214,8,77,14,218,144,10,47,176,254,76,22,17,169,84,80,129,244,127,40,156,218,163,111,78,78,19,94,11,38,224,255,46,73,224,192,56,106,50,158,1,92,64,149,236,163,102,99,3,203,0,243,255,183,146,150,83,98,
+130,137,32,37,18,10,208,197,192,23,83,112,170,220,128,254,80,250,50,65,73,101,202,203,225,208,73,132,195,53,95,36,161,225,219,42,72,57,69,194,206,28,167,129,38,68,80,124,172,120,248,38,219,83,148,46,68,71,249,129,50,127,91,9,135,67,139,40,8,237,28,56,104,61,79,124,45,83,192,247,118,144,10,20,203,224,18,57,67,249,219,7,179,219,14,32,136,145,73,47,195,225,164,244,42,187,206,194,192,135,198,29,200,176,48,74,164,128,91,7,248,245,30,240,157,30,64,185,34,60,112,141,53,243,143,193,159,107,246,113,151,160,96,199,219,75,92,174,195,14,55,120,134,220,228,22,135,121,220,244,115,212,226,133,231,32,243,60,169,136,72,68,69,42,62,83,202,193,10,5,28,86,168,76,38,57,33,157,60,72,110,23,31,56,137,75,75,34,29,148,134,8,63,9,81,200,149,148,35,158,14,227,207,0,133,108,243,220,2,49,126,63,16,43,119,116,217,207,159,53,48,60,144,136,160,20,225,50,49,65,162,22,3,220,139,228,42,114,54,34,27,68,222,174,21,13,
+150,13,138,20,163,5,66,34,65,234,5,85,231,36,220,253,84,34,57,118,95,198,59,174,2,8,174,124,172,93,9,184,124,17,132,129,181,139,242,180,64,5,42,174,74,108,46,19,109,186,129,175,32,129,180,69,26,39,68,21,193,60,70,199,209,36,193,120,131,207,33,99,1,47,143,114,192,245,243,20,178,248,29,93,103,162,104,184,203,72,144,145,145,20,41,39,97,180,229,240,176,167,98,134,63,141,18,136,63,20,123,92,38,185,188,152,143,15,59,226,140,89,207,113,73,146,32,228,146,129,237,201,105,17,195,207,96,61,230,160,12,229,123,16,133,70,185,176,22,116,157,97,125,2,88,54,236,110,3,92,87,128,181,193,147,49,115,155,60,164,2,142,72,94,192,9,3,128,31,145,43,69,96,1,224,239,54,219,223,146,117,164,250,3,179,163,139,246,55,107,57,182,155,143,190,63,139,23,14,59,138,59,44,18,40,211,225,238,52,75,65,240,1,226,16,52,28,132,37,32,50,99,128,195,224,110,174,66,155,1,113,49,29,69,139,161,68,125,75,92,237,152,203,174,72,41,
+249,201,243,214,191,243,66,96,31,75,65,129,64,203,164,151,65,176,134,62,143,89,79,133,33,199,236,184,58,162,79,16,91,216,183,83,125,243,248,118,38,192,191,111,104,17,24,105,243,44,223,144,192,138,190,5,241,200,105,114,122,27,196,99,188,8,59,69,48,193,126,117,185,206,138,221,208,206,49,80,113,16,92,93,108,214,109,127,123,218,169,184,2,102,193,181,203,163,59,208,167,224,138,29,170,47,90,3,171,160,120,102,190,102,208,17,110,120,195,86,219,176,171,3,17,4,86,23,42,12,6,245,98,202,198,28,248,192,2,82,33,59,164,243,65,39,102,151,205,219,216,131,80,207,85,94,247,124,226,123,41,79,97,40,191,206,41,226,222,114,171,56,176,39,17,228,224,19,136,165,32,119,28,239,211,59,185,250,56,241,227,180,122,227,27,63,188,14,203,109,144,5,194,15,78,21,156,179,116,195,192,244,204,180,128,87,108,247,81,7,248,149,122,183,74,192,219,203,61,33,225,95,81,87,49,217,226,43,50,185,248,52,84,3,72,199,208,140,64,7,19,232,195,165,183,20,
+134,124,207,25,204,167,153,228,82,12,187,225,196,21,101,32,36,204,254,79,174,236,95,72,201,80,24,150,186,73,201,188,162,28,195,57,89,66,38,12,161,164,199,167,100,24,50,243,161,152,102,208,151,83,16,251,57,6,225,197,227,107,110,40,181,1,113,147,41,97,140,189,75,145,236,168,93,98,240,40,177,219,2,37,151,133,71,43,148,44,12,126,23,207,117,74,192,110,130,14,179,87,201,40,12,196,135,16,196,249,178,83,220,202,223,32,112,23,180,6,253,15,7,88,207,0,
+
diff --git a/uppsrc/CtrlLib/src.tpp/TabDlg$en-us.tpp b/uppsrc/CtrlLib/src.tpp/TabDlg$en-us.tpp
new file mode 100644
index 000000000..a7f76fa23
--- /dev/null
+++ b/uppsrc/CtrlLib/src.tpp/TabDlg$en-us.tpp
@@ -0,0 +1,7 @@
+TITLE("TabDlg")
+COMPRESSED
+120,156,181,86,127,111,219,54,16,253,42,7,180,11,108,47,49,72,138,178,100,105,24,210,53,197,48,120,88,134,46,195,254,16,36,139,150,104,155,136,126,65,162,155,102,69,243,217,119,148,100,167,105,227,216,29,146,4,176,69,234,238,189,119,199,187,163,3,6,175,95,147,83,242,138,28,248,243,46,228,82,108,50,29,6,138,115,215,23,204,246,175,103,151,83,127,116,62,152,240,33,130,80,4,177,28,106,185,182,69,57,155,224,7,181,40,179,153,197,169,203,166,220,181,44,151,120,73,38,154,38,12,50,230,186,190,97,102,232,196,28,155,81,135,187,220,165,150,227,50,244,101,132,48,226,48,155,114,203,101,182,151,202,38,9,3,225,90,254,232,253,4,157,44,195,132,224,132,78,24,119,56,35,22,97,28,169,168,235,114,234,216,174,53,157,76,188,68,84,90,149,69,207,165,40,101,212,95,80,199,71,201,119,119,119,99,202,73,167,128,35,24,37,28,165,82,220,35,156,57,212,158,146,169,237,82,151,88,8,110,59,196,246,42,81,139,252,241,200,13,134,125,48,116,135,120,
+74,75,132,24,253,72,169,131,46,147,211,201,43,202,29,12,212,181,184,237,58,4,201,25,99,150,197,168,197,166,83,102,79,108,199,91,75,145,202,58,12,62,205,63,67,208,88,190,23,227,255,149,88,92,100,43,243,212,38,211,131,110,227,36,12,26,234,207,162,214,164,172,254,81,69,90,222,68,16,68,209,249,128,140,201,152,217,246,16,250,244,71,17,204,205,231,57,233,157,187,45,175,219,188,55,175,54,139,76,37,189,253,14,212,48,49,31,130,31,222,253,113,246,247,95,61,2,168,6,68,135,15,170,208,178,72,101,10,186,132,70,229,85,166,150,183,144,212,82,152,3,129,114,9,141,22,69,42,234,20,114,44,40,21,159,105,177,88,160,121,170,68,86,174,26,136,207,118,143,55,74,175,65,104,200,203,70,3,135,170,150,169,92,170,2,141,23,27,173,203,2,73,139,212,72,120,171,235,108,28,26,105,196,7,243,101,251,179,175,210,133,44,9,90,121,24,117,16,245,175,140,91,212,85,112,191,10,131,110,57,15,123,251,111,195,53,102,176,105,80,132,42,122,165,99,248,
+179,150,141,196,192,219,77,147,129,122,41,18,105,82,32,178,172,188,193,8,82,181,84,201,46,7,85,93,86,178,214,74,54,7,100,151,215,247,138,127,105,131,238,5,119,139,123,189,229,245,227,0,137,40,18,153,29,9,210,25,63,14,36,63,42,125,36,140,49,125,28,68,84,85,118,123,36,74,107,251,85,254,47,218,124,111,143,255,5,243,254,38,77,227,193,85,124,18,159,38,72,164,33,89,139,58,30,197,67,15,176,145,171,76,104,57,255,41,248,166,183,230,193,57,135,171,240,231,239,197,124,80,145,230,241,55,100,137,96,183,209,174,195,248,4,241,9,32,76,56,8,162,43,124,223,109,89,128,197,26,158,194,3,61,134,193,232,249,98,11,233,194,121,60,106,29,228,71,29,14,143,146,217,202,201,197,74,190,104,50,158,100,121,185,244,68,59,222,8,218,175,173,139,202,87,223,151,209,66,228,178,203,232,23,229,138,90,26,8,251,213,168,87,178,125,217,15,15,168,68,209,86,172,94,203,221,124,65,187,22,49,125,232,109,78,109,235,126,10,101,123,199,97,161,223,118,
+147,18,239,151,94,249,214,102,12,87,8,218,168,127,165,41,254,158,239,166,157,227,102,100,167,18,27,38,239,6,42,206,104,68,82,197,10,126,149,250,189,76,244,96,8,203,178,198,166,74,213,7,149,110,68,182,55,144,6,6,69,169,49,134,53,206,106,35,255,119,113,91,110,52,44,55,69,98,20,54,208,72,141,111,145,177,15,19,239,116,181,50,180,70,218,240,208,8,196,142,21,186,172,227,65,60,124,246,158,60,2,124,87,125,232,18,109,175,204,190,216,182,238,131,225,139,182,228,62,149,47,212,155,255,139,238,185,211,244,124,173,169,183,137,197,206,188,236,149,192,7,89,55,109,109,98,99,4,163,118,106,180,245,158,151,181,68,192,188,18,9,70,87,166,114,252,100,113,94,206,76,146,158,142,254,114,22,14,246,28,236,219,246,194,61,12,209,217,237,133,185,156,29,11,180,181,220,11,245,14,239,238,195,48,198,106,47,196,27,115,113,31,198,104,205,122,16,60,25,156,84,141,132,92,234,117,137,67,83,164,247,63,242,112,104,108,127,103,237,102,103,63,50,44,8,255,
+3,242,208,243,181,
diff --git a/uppsrc/CtrlLib/src.tpp/TextCtrl$en-us.tpp b/uppsrc/CtrlLib/src.tpp/TextCtrl$en-us.tpp
new file mode 100644
index 000000000..8a0d656f9
--- /dev/null
+++ b/uppsrc/CtrlLib/src.tpp/TextCtrl$en-us.tpp
@@ -0,0 +1,20 @@
+TITLE("TextCtrl")
+COMPRESSED
+120,156,229,92,141,119,219,182,17,255,87,240,210,54,149,83,69,211,167,165,72,93,23,199,118,51,191,56,78,94,228,44,219,243,228,16,34,33,139,51,69,106,252,176,163,246,181,127,251,238,0,16,4,41,74,164,232,143,102,175,235,94,44,137,196,1,247,59,220,225,238,112,192,69,155,124,251,109,179,222,252,166,89,240,191,225,17,155,209,200,9,39,23,118,183,59,24,209,118,111,116,253,230,221,139,209,179,151,181,253,238,30,82,105,1,149,78,191,213,25,244,58,173,110,123,31,254,105,117,90,237,94,187,211,109,13,218,47,186,131,78,103,208,28,154,14,13,130,201,133,211,30,12,70,216,168,93,111,127,211,238,247,218,173,126,119,208,29,180,58,253,65,27,218,182,155,205,118,179,223,238,181,186,157,65,187,55,180,88,96,78,46,232,160,51,122,246,97,31,26,117,176,39,32,222,108,237,183,187,253,110,187,217,105,182,187,208,85,107,48,232,182,250,189,65,231,197,254,254,208,164,203,208,246,92,217,151,221,106,181,91,163,105,171,63,130,49,255,254,251,239,141,86,183,41,70,
+208,5,98,173,102,23,134,218,130,223,154,221,118,191,213,123,209,124,209,27,180,6,205,14,16,239,245,155,189,225,146,250,116,177,153,245,94,33,235,253,230,208,14,25,144,120,246,67,171,213,135,38,251,245,253,111,90,221,62,48,58,232,116,123,131,126,19,58,111,183,219,157,78,187,213,105,191,120,209,238,237,247,250,195,57,163,22,243,39,23,191,126,254,237,187,227,179,231,31,199,228,34,232,140,200,197,119,205,230,243,102,147,156,179,47,225,97,232,59,147,167,147,139,160,53,122,51,52,224,191,248,71,252,204,209,30,94,226,71,252,233,50,110,121,121,249,178,214,108,52,27,237,94,111,143,72,145,196,79,200,231,228,243,75,173,15,237,133,161,254,74,66,104,25,77,29,219,204,163,68,212,40,219,35,114,64,166,52,96,162,91,18,206,105,72,236,197,210,97,11,230,134,1,241,150,204,167,40,183,128,152,222,98,225,185,100,230,249,228,130,179,112,228,153,199,150,29,94,18,249,97,66,106,62,189,37,33,140,144,48,248,14,47,222,206,153,207,136,99,187,44,32,198,115,114,250,
+51,177,152,99,47,0,122,139,4,204,20,132,225,1,133,183,44,59,88,58,116,5,79,104,64,80,192,87,62,93,206,249,227,91,248,180,132,7,64,206,133,33,178,21,177,60,226,122,33,153,217,33,126,39,183,182,21,206,247,8,117,45,57,182,83,232,82,12,46,254,52,105,212,244,209,96,143,1,50,186,138,127,128,182,248,163,203,110,152,31,247,184,215,80,128,147,91,207,191,14,136,237,146,143,103,39,135,239,142,142,235,100,26,1,86,208,114,234,48,2,56,1,50,11,219,189,2,160,92,32,17,112,222,66,15,8,175,136,55,35,75,159,89,108,6,93,89,196,156,83,63,96,97,0,196,97,236,255,160,78,196,240,13,213,147,141,96,187,33,229,47,35,156,35,0,43,12,145,182,205,123,68,150,3,186,96,136,84,20,224,239,99,22,146,5,11,231,158,85,39,62,204,82,254,110,64,216,127,35,251,134,58,32,74,28,201,107,245,82,67,202,30,255,244,70,111,96,94,201,153,161,77,159,32,244,35,51,156,168,7,160,91,228,115,50,155,135,106,50,125,116,45,239,136,134,84,
+78,40,167,211,110,142,128,51,232,94,144,136,0,85,201,15,226,135,48,201,41,69,167,30,64,24,65,251,191,0,58,30,188,79,67,14,133,148,233,21,11,27,228,36,36,38,117,201,20,127,9,231,228,189,109,94,199,61,114,161,1,235,218,111,12,25,13,96,238,49,254,208,103,226,115,166,15,206,127,115,228,180,218,131,24,4,62,236,117,149,141,187,226,58,235,48,234,27,53,99,111,152,3,215,141,103,91,10,18,165,105,128,44,111,165,158,212,246,98,152,122,45,16,0,127,40,4,186,97,136,28,77,41,167,181,209,141,153,35,180,232,112,78,221,43,102,241,193,233,210,68,161,221,216,126,24,81,135,76,182,15,90,74,88,141,52,75,59,253,30,240,17,191,72,140,139,165,239,133,240,50,12,96,18,155,21,213,28,228,96,206,193,22,192,255,205,200,15,224,207,28,166,173,41,136,54,72,205,164,142,3,243,28,212,206,85,10,14,18,131,233,227,2,20,49,149,58,249,79,20,132,146,2,168,229,201,140,172,188,136,120,160,105,190,109,129,212,97,190,213,249,79,193,220,139,28,
+80,50,32,203,45,155,241,92,152,54,169,147,168,193,8,247,212,179,86,18,227,141,240,114,233,160,1,9,238,19,216,132,234,142,144,162,181,64,69,66,117,190,5,12,125,182,0,254,45,82,99,141,171,134,32,139,40,159,122,212,210,12,247,99,129,117,226,6,204,15,37,90,182,27,26,117,252,231,222,80,211,200,103,96,203,33,4,61,111,160,243,178,195,237,125,250,105,61,111,48,91,105,152,94,148,125,92,36,61,249,244,153,106,29,47,60,161,254,136,15,142,44,189,192,230,186,115,203,85,129,179,142,202,242,40,130,252,192,167,213,131,9,82,35,255,103,19,164,84,216,71,146,227,123,159,9,165,145,82,4,211,17,132,248,224,211,56,244,193,65,48,158,222,159,80,85,95,119,20,41,224,85,66,162,156,147,13,68,46,53,14,47,197,51,249,45,221,192,120,170,247,139,94,214,110,179,224,80,44,91,83,54,19,190,198,74,23,62,39,71,192,125,9,148,242,102,166,7,48,218,152,60,210,60,240,130,240,241,38,130,234,236,207,54,19,232,44,132,192,97,109,18,224,66,253,21,
+204,1,159,9,187,251,16,22,93,17,127,20,145,111,37,17,216,191,176,187,232,177,38,29,78,138,199,106,20,90,128,147,14,234,172,92,174,153,239,45,56,248,105,113,78,30,203,180,131,150,61,160,60,21,245,255,99,129,174,169,227,154,60,117,23,122,179,60,31,203,231,154,65,168,58,71,175,72,72,52,137,49,203,74,49,21,116,106,244,146,208,115,59,246,41,216,109,245,235,94,18,125,64,72,22,143,69,164,17,120,166,66,234,207,74,203,148,200,40,78,5,43,16,209,163,59,164,131,107,79,120,227,56,10,124,20,144,63,193,184,94,81,95,83,19,145,138,3,210,83,106,94,183,228,34,161,190,167,231,221,143,169,117,5,232,92,146,87,73,96,31,47,37,63,37,106,36,187,75,225,103,74,218,200,188,237,222,120,215,113,86,43,130,21,130,248,246,213,60,68,6,109,243,58,208,146,32,60,149,33,129,8,150,204,180,103,43,226,120,38,151,131,27,241,20,9,167,7,174,38,117,96,154,115,113,72,1,136,28,12,132,133,161,199,127,26,135,22,12,42,206,3,17,82,2,179,
+49,230,35,54,161,150,1,109,147,77,81,116,202,193,193,51,92,240,122,20,224,228,145,40,136,217,18,8,101,117,61,64,106,225,89,246,204,198,44,153,71,212,231,154,241,196,130,105,186,50,158,236,97,56,140,244,11,3,125,106,206,25,152,189,172,238,149,202,239,200,182,149,244,76,179,144,25,77,195,244,25,23,181,109,66,48,31,218,11,251,23,30,207,147,185,45,178,121,218,244,8,232,10,19,126,60,121,59,243,28,199,187,197,175,90,238,246,214,70,237,81,89,74,0,201,197,100,193,154,141,20,38,239,163,235,216,215,204,89,97,47,208,8,166,166,21,171,25,76,77,84,104,211,179,88,17,166,152,134,48,106,60,75,21,250,140,46,192,203,172,227,183,233,42,100,59,66,140,164,214,225,189,76,104,95,18,241,87,189,148,246,233,18,140,147,5,232,50,30,203,37,193,127,115,165,35,19,181,201,51,227,175,159,15,255,126,240,97,124,124,110,124,62,58,254,249,224,227,233,185,146,26,14,82,40,45,207,128,171,21,37,224,35,19,201,203,56,3,172,135,144,178,143,34,56,199,
+20,23,251,77,112,114,69,31,106,88,170,197,99,243,58,15,192,34,209,13,107,188,142,174,120,148,134,56,207,119,222,184,218,39,96,139,39,58,226,57,49,121,26,118,249,66,30,246,137,125,17,129,64,156,123,4,182,52,81,72,101,41,43,8,114,152,248,8,92,165,76,234,226,102,195,20,3,248,37,44,171,160,1,66,35,130,232,10,236,81,152,79,71,108,49,208,27,177,161,97,124,255,55,227,251,34,25,191,102,16,59,221,128,9,183,112,8,220,30,149,16,241,22,255,169,73,214,72,110,19,247,227,73,232,3,11,35,223,21,50,82,57,18,153,248,159,217,126,16,38,142,218,54,25,228,138,239,100,166,167,144,93,134,59,34,162,55,151,93,129,65,188,97,228,6,247,92,10,23,133,57,51,175,15,5,217,82,130,152,122,158,179,89,18,58,185,175,67,8,99,185,133,180,54,71,106,234,117,209,5,56,63,164,217,152,20,89,40,132,41,55,183,176,139,173,31,107,246,54,111,37,77,69,252,27,130,253,108,156,191,113,57,16,198,187,152,25,197,75,213,21,236,46,92,197,76,
+149,228,233,1,151,184,49,38,180,148,89,149,46,129,220,167,43,54,109,101,116,72,103,88,173,58,107,25,155,140,129,251,58,180,233,245,29,193,81,113,124,137,101,253,62,97,170,28,194,239,26,184,255,97,238,128,146,204,146,250,60,24,173,36,161,79,122,170,101,171,96,74,228,28,51,162,249,244,71,203,230,14,208,105,37,17,229,80,124,112,244,42,104,232,14,76,240,125,214,35,30,96,86,42,5,224,77,147,197,64,25,87,89,10,192,67,87,50,115,232,85,131,156,121,88,207,128,238,15,142,20,194,219,25,184,53,174,201,192,13,10,111,25,132,201,42,210,229,13,120,154,192,120,18,7,194,241,175,32,53,81,86,2,46,147,63,163,38,19,37,36,64,53,211,28,203,44,120,156,141,35,17,73,4,44,74,72,2,201,122,18,156,11,8,131,184,192,194,138,157,108,207,183,175,108,151,58,178,150,163,6,254,151,12,51,181,18,22,136,202,161,247,4,141,189,194,189,229,64,1,94,209,251,146,20,74,206,148,115,224,10,66,240,153,98,51,198,94,198,117,198,147,152,79,192,238,
+94,57,189,215,26,19,114,188,88,134,182,22,10,149,80,80,76,25,170,76,200,211,59,132,29,146,80,105,203,150,246,103,214,108,91,153,72,130,39,25,69,149,87,18,62,80,180,91,51,144,73,54,209,129,115,215,182,88,48,90,123,128,69,93,14,180,21,211,90,214,46,165,99,21,140,34,69,206,69,116,91,2,89,133,234,246,37,164,16,216,93,64,45,187,93,94,180,73,238,68,11,119,119,121,72,220,193,0,165,196,161,193,45,118,201,121,221,158,22,202,137,238,96,76,22,251,34,145,174,4,244,215,128,113,137,224,75,139,184,20,38,117,210,44,180,21,82,201,238,202,235,233,218,152,171,250,31,27,121,181,23,182,67,125,89,131,40,13,131,168,159,180,60,22,240,82,78,174,112,107,154,200,11,125,25,60,41,129,197,199,112,54,40,131,71,225,158,113,161,99,173,155,42,14,97,220,117,37,24,237,221,21,43,111,55,5,28,152,243,159,141,231,3,2,30,130,135,5,160,101,188,177,18,120,85,117,202,190,2,60,74,123,165,199,8,25,179,18,52,30,42,6,211,58,186,15,
+108,254,176,144,170,0,124,31,11,143,113,249,220,97,46,34,38,167,204,189,10,231,247,97,208,4,165,71,155,127,188,183,252,125,206,146,172,31,98,41,217,86,7,183,12,219,135,235,229,108,27,157,92,157,1,55,90,76,193,252,74,6,130,18,99,198,84,225,93,5,133,52,30,112,229,201,27,185,136,101,60,223,184,48,38,119,26,190,78,232,97,87,79,93,78,210,164,109,244,167,248,162,41,220,174,50,243,78,170,219,93,38,93,158,158,149,225,36,244,66,136,18,147,121,167,21,102,216,238,46,1,203,33,47,9,191,19,19,130,68,5,38,244,173,11,81,154,94,122,192,98,173,201,143,243,242,119,139,181,161,166,235,58,246,114,124,74,124,163,166,222,47,116,37,199,44,84,5,251,169,146,162,29,147,220,138,72,50,186,73,89,254,58,242,164,64,242,8,22,36,237,105,83,61,40,42,35,74,175,117,41,225,114,162,39,103,176,194,189,61,248,231,122,98,91,157,55,224,219,72,154,98,201,161,97,64,175,71,42,130,54,223,234,195,163,44,48,13,124,172,81,168,139,83,74,248,
+179,241,100,102,127,193,100,76,188,49,37,126,134,5,146,58,245,184,142,38,174,108,168,54,167,78,2,77,118,119,200,144,172,9,175,84,150,4,226,109,220,110,75,237,185,25,207,217,98,25,174,52,56,139,213,34,51,255,158,138,25,184,45,3,177,157,159,215,57,179,113,199,36,68,134,250,182,112,57,221,48,99,16,203,152,18,5,21,113,188,91,180,235,16,19,71,75,88,100,128,205,200,181,202,44,201,250,44,88,223,166,218,182,151,84,132,91,222,166,202,61,237,41,173,99,32,15,189,225,50,112,101,227,169,32,93,225,74,86,75,232,76,232,41,231,102,229,168,38,133,203,90,198,89,189,85,36,96,141,185,93,242,205,121,10,158,119,104,175,240,220,209,70,29,223,192,193,33,24,62,230,100,141,99,169,19,36,169,49,231,45,36,186,254,102,170,23,83,237,115,86,186,35,120,22,178,172,230,148,241,24,198,137,199,80,105,133,75,251,10,59,45,111,153,149,72,49,243,222,161,38,240,34,79,199,129,67,231,178,91,181,12,20,150,2,211,0,212,188,244,190,251,38,215,130,147,
+217,202,213,61,108,188,235,181,245,26,251,216,117,176,94,57,79,249,113,63,158,116,151,208,148,197,164,248,180,195,14,200,164,79,51,84,174,238,43,62,190,80,17,211,60,72,197,152,211,152,74,72,51,193,130,132,82,88,129,221,240,44,91,20,241,181,1,91,170,158,66,135,245,1,43,42,54,9,138,137,60,145,40,86,91,95,255,200,228,222,36,201,73,26,207,190,122,209,233,111,104,105,3,128,247,217,253,105,131,60,77,111,137,187,53,98,180,203,45,119,149,195,166,244,81,139,251,5,115,83,67,189,2,128,104,190,24,142,164,252,118,225,25,124,198,3,242,59,239,87,198,13,115,86,246,183,212,151,181,239,83,118,101,187,46,175,100,158,193,146,248,69,220,20,64,166,142,103,94,55,200,129,227,8,79,138,111,28,100,234,157,107,182,20,185,184,3,128,115,181,199,227,46,159,153,158,111,241,242,205,208,147,4,35,220,219,229,245,156,241,149,20,98,15,145,81,115,158,252,166,234,14,3,130,147,196,97,162,102,159,202,112,49,102,9,6,229,128,191,164,14,67,168,237,123,55,
+127,176,192,166,227,185,87,65,188,129,142,107,127,16,199,160,73,1,128,34,175,54,76,76,159,225,190,51,213,91,144,218,138,133,123,35,94,87,47,119,160,195,91,219,20,87,39,96,128,138,231,20,115,198,96,187,170,164,32,115,189,132,70,201,3,79,176,104,70,84,154,13,27,102,194,123,81,172,30,112,41,21,235,96,133,142,177,209,182,142,241,54,134,226,224,59,230,185,114,220,173,243,95,33,228,230,117,198,222,66,220,32,33,39,120,97,184,120,18,196,136,85,30,182,142,222,93,134,205,239,188,40,57,108,30,195,84,154,100,170,101,142,192,101,233,13,30,49,226,24,10,171,81,126,84,250,157,36,169,129,93,230,233,7,190,117,153,220,154,146,235,141,107,4,243,38,40,63,31,148,55,212,134,58,60,2,198,105,22,201,179,88,210,94,197,165,78,129,56,210,1,6,7,175,233,33,55,212,183,189,40,224,214,180,206,79,94,33,18,222,45,55,73,34,51,165,93,78,34,33,17,158,137,90,40,200,91,188,157,99,202,228,241,19,81,60,196,108,46,238,244,5,45,20,83,104,
+74,24,241,185,75,237,250,28,52,81,27,12,123,137,216,46,45,138,37,124,51,62,111,18,66,149,218,228,124,201,136,126,210,110,102,73,177,167,221,78,75,127,180,158,158,92,19,67,131,100,218,162,116,113,52,120,14,202,2,173,243,189,21,179,246,136,21,249,113,181,74,105,52,15,163,112,119,45,139,194,109,6,21,30,23,246,234,45,43,20,214,65,163,173,253,194,243,146,129,244,142,61,103,226,230,245,174,249,11,197,19,23,83,24,224,210,236,220,191,106,153,51,6,241,76,30,36,156,123,78,57,167,78,28,16,20,41,68,252,176,179,146,240,246,235,238,108,238,177,201,204,244,199,227,140,57,9,2,223,187,193,66,173,248,84,160,107,81,223,146,7,32,53,7,158,55,46,147,254,89,63,210,177,115,18,40,19,227,237,150,30,205,57,242,167,52,220,118,151,145,126,248,37,222,64,79,142,65,74,19,159,188,18,164,109,186,197,76,60,65,123,59,183,193,123,213,118,213,228,37,90,120,112,198,79,78,136,114,31,150,251,194,187,108,185,41,4,183,87,71,148,172,71,80,123,193,
+235,39,99,202,100,206,249,97,30,142,2,240,148,8,167,204,76,240,156,56,15,88,23,182,7,191,239,62,27,176,89,165,248,45,57,102,157,201,49,112,146,151,36,77,57,53,137,54,204,33,172,66,197,141,35,108,168,205,9,113,183,94,90,198,185,110,225,217,27,227,243,217,187,15,111,15,78,49,193,12,175,145,95,127,237,118,187,157,97,175,215,235,255,136,87,55,254,52,216,239,142,8,66,251,236,135,126,79,41,32,73,200,36,87,195,105,228,38,147,225,144,183,194,70,103,120,7,156,140,223,248,80,27,241,211,146,52,143,78,198,7,175,78,143,143,82,84,207,21,57,225,246,36,254,14,240,143,183,244,129,123,180,99,63,227,227,211,227,195,243,76,63,227,84,38,127,215,241,191,63,120,127,252,97,27,42,75,138,187,62,21,201,126,56,62,56,122,119,118,250,175,20,225,247,9,197,44,50,120,89,160,241,220,115,157,213,238,125,109,7,167,26,27,135,239,78,223,1,233,195,119,31,207,206,211,194,205,214,11,112,110,120,137,40,11,26,147,223,126,211,212,189,192,122,37,90,
+191,221,124,9,37,148,231,219,117,77,204,55,96,235,111,220,111,193,145,58,190,32,88,223,170,219,5,33,250,56,100,203,181,195,238,41,175,245,114,237,166,209,76,213,163,34,83,201,240,185,27,204,23,50,177,160,95,236,69,180,208,100,205,35,157,0,59,43,190,231,198,51,89,16,156,211,169,81,195,248,181,50,123,9,161,173,252,109,216,194,234,144,164,25,230,127,67,63,98,73,58,114,198,147,70,55,12,61,116,158,104,220,171,171,139,30,76,147,45,1,7,48,61,231,7,175,200,53,91,161,11,127,205,180,148,150,241,189,241,239,208,248,190,176,164,227,204,211,193,168,12,132,78,38,207,199,148,121,162,228,165,218,140,58,1,43,49,188,87,212,188,190,242,113,115,251,142,178,210,73,221,187,180,212,180,84,7,133,208,87,242,169,27,44,41,223,155,90,120,224,109,25,207,249,61,19,98,12,162,8,34,4,11,104,243,83,202,24,163,159,107,45,48,192,198,9,64,241,33,222,126,139,39,17,96,26,212,49,246,21,199,10,226,166,83,6,95,173,84,255,120,9,75,96,195,106,
+86,23,97,58,191,114,54,185,150,1,77,194,82,56,204,60,148,214,135,133,59,139,172,76,110,104,195,204,41,179,119,171,55,206,153,47,233,76,80,242,170,128,49,70,38,21,48,193,159,201,255,0,167,177,223,165,
diff --git a/uppsrc/CtrlLib/src.tpp/ToolBar$en-us.tpp b/uppsrc/CtrlLib/src.tpp/ToolBar$en-us.tpp
new file mode 100644
index 000000000..0f6f2c490
--- /dev/null
+++ b/uppsrc/CtrlLib/src.tpp/ToolBar$en-us.tpp
@@ -0,0 +1,12 @@
+TITLE("ToolBar")
+COMPRESSED
+120,156,181,86,105,79,27,105,18,254,43,45,101,38,74,178,9,234,110,119,251,98,52,202,78,102,63,141,246,208,102,246,195,10,193,208,64,39,88,99,236,200,54,25,101,86,27,25,108,14,7,115,54,152,203,7,183,57,28,192,64,2,9,196,92,230,48,49,152,96,46,67,48,230,8,71,48,96,192,156,182,241,190,230,78,102,71,209,126,88,91,234,126,85,111,213,83,245,84,149,170,58,4,133,190,250,10,190,13,95,131,191,240,99,127,79,62,32,98,185,162,208,16,14,134,49,131,9,20,15,254,249,135,191,178,130,111,221,189,65,199,110,6,80,16,128,66,99,32,52,38,78,67,48,148,14,30,8,13,65,113,148,134,33,76,148,133,49,105,52,38,204,142,228,18,66,97,104,8,23,101,50,131,3,70,232,109,244,26,202,192,81,132,129,49,49,38,66,99,48,81,96,139,194,48,10,51,80,28,193,104,76,20,103,71,145,194,200,208,16,130,73,11,190,245,119,58,48,162,5,60,1,112,24,161,163,24,3,67,97,26,140,98,192,21,194,100,98,8,3,103,210,88,116,58,59,
+146,120,36,226,240,121,103,190,56,8,130,34,193,17,8,35,24,196,252,244,233,211,32,4,131,79,35,192,0,24,2,99,32,84,4,200,96,12,101,32,56,11,102,225,76,132,9,211,0,56,206,128,113,246,35,66,64,196,252,62,117,252,139,212,25,48,155,35,34,1,196,173,63,32,8,3,152,208,111,211,175,33,24,3,16,101,210,48,156,201,128,129,115,20,69,105,52,20,161,161,44,22,138,211,113,6,59,154,36,162,72,1,160,128,33,244,147,96,25,183,25,215,112,28,199,128,62,134,225,12,38,134,210,64,109,48,26,6,82,129,33,44,28,99,225,40,155,71,10,69,100,84,248,157,211,180,157,210,191,8,60,16,119,0,137,121,155,121,141,142,209,89,8,200,62,198,98,96,48,139,142,48,104,129,228,33,32,237,116,26,134,178,240,11,164,179,170,253,235,167,127,127,253,167,191,220,249,199,125,40,68,72,11,134,66,190,134,225,59,48,12,253,200,231,115,191,35,4,161,215,67,67,132,72,240,15,119,111,192,65,112,16,138,227,55,161,51,9,59,28,252,207,180,2,199,19,
+56,118,88,224,8,36,247,68,2,110,216,57,88,88,216,21,243,51,183,231,55,208,79,151,231,187,151,110,175,220,179,175,106,92,226,60,138,141,224,114,34,255,27,16,116,230,255,36,118,52,24,58,123,221,189,203,137,33,30,146,236,64,118,175,131,38,19,75,92,113,5,98,177,88,178,228,7,79,241,65,186,114,93,53,184,65,233,199,51,196,190,227,54,73,122,95,71,206,154,253,80,210,210,187,227,16,103,100,117,189,175,46,170,236,17,199,87,230,20,21,149,12,101,103,52,149,204,119,101,86,119,140,230,200,83,170,100,91,190,86,181,167,102,130,114,235,44,239,150,102,91,213,147,118,85,93,218,88,235,96,110,95,74,121,247,98,189,188,187,94,174,80,173,217,102,146,246,55,236,134,174,221,210,228,177,158,49,231,174,253,32,113,110,165,72,217,83,212,226,61,114,121,219,146,178,28,37,105,227,99,238,23,51,110,111,205,196,70,198,114,153,167,190,209,172,216,40,89,141,239,24,108,204,206,247,57,42,244,41,213,149,213,243,203,125,210,92,111,91,151,203,48,247,50,62,254,
+21,101,175,173,238,252,72,189,125,231,49,27,107,171,75,170,237,78,159,121,105,115,98,98,211,224,151,22,165,101,59,169,215,5,201,187,171,246,44,71,243,244,64,141,124,168,84,53,174,61,176,234,102,124,241,182,126,93,185,180,96,162,172,220,65,205,168,146,63,246,31,154,12,197,98,85,253,168,36,123,100,192,253,186,107,112,65,185,97,232,92,84,172,175,82,157,201,141,115,47,215,15,125,199,197,243,212,114,74,249,102,198,164,86,106,43,200,209,180,80,25,11,148,95,183,29,175,44,25,118,153,250,87,151,242,53,43,171,101,106,141,47,222,37,107,209,164,15,40,13,5,246,118,143,191,89,42,118,201,146,115,199,10,214,94,84,198,207,150,15,54,228,91,23,115,235,15,54,39,215,53,14,105,185,103,45,33,141,50,171,90,141,77,89,213,133,91,29,206,238,236,197,113,179,86,242,98,98,117,203,179,168,86,28,26,15,54,189,206,214,202,74,131,180,205,231,73,141,223,56,150,101,245,47,187,115,166,103,39,83,212,218,153,109,183,178,163,226,48,78,54,36,109,170,183,204,
+215,104,223,246,103,59,19,186,246,222,180,228,101,85,187,52,139,141,233,153,182,242,151,22,121,239,124,186,127,181,239,67,158,115,66,167,212,104,154,182,77,84,115,159,170,224,109,110,93,193,186,223,104,217,209,52,233,37,181,94,69,125,218,204,146,211,218,107,220,53,234,91,6,74,109,85,53,22,107,125,106,167,163,179,183,166,252,229,210,74,110,113,225,136,246,121,67,77,118,107,123,230,86,126,127,67,150,193,230,243,85,14,171,252,163,43,218,99,245,198,78,41,85,240,214,61,170,89,244,212,76,143,41,115,19,155,26,141,250,206,213,161,169,130,228,124,75,85,142,97,107,92,49,164,124,183,209,112,156,213,184,35,51,79,149,244,106,11,203,243,19,188,190,161,225,165,138,44,185,101,111,175,189,127,197,220,172,90,31,124,83,105,113,77,20,80,213,38,73,79,154,193,212,150,154,228,92,253,40,201,244,206,43,199,109,110,89,175,220,34,183,184,143,100,84,75,178,166,120,50,110,250,131,194,168,237,210,131,96,12,135,109,141,251,54,199,235,26,189,223,54,186,127,28,175,48,
+213,63,171,125,175,237,108,138,179,91,23,231,189,166,197,148,166,228,210,201,194,188,252,180,65,173,70,186,241,106,43,105,205,218,182,75,121,186,143,63,122,156,113,210,42,179,78,167,176,36,54,102,121,170,50,41,141,217,238,107,208,207,44,237,237,237,207,180,231,219,123,181,37,245,210,210,150,233,193,227,97,241,212,236,178,164,216,33,79,218,122,54,44,137,79,72,167,228,147,77,227,9,137,35,154,254,205,231,229,149,147,53,133,101,21,141,202,30,77,203,250,187,138,204,173,66,147,172,108,129,234,171,107,73,87,142,230,250,84,170,3,223,200,225,7,207,88,156,57,174,199,187,158,181,157,224,72,242,141,100,207,217,230,61,59,67,254,36,93,234,98,69,179,46,177,194,160,159,216,27,154,175,107,24,63,146,77,216,18,61,101,133,190,228,101,243,246,178,118,143,26,25,104,200,92,220,104,63,60,152,153,151,72,211,52,251,201,122,79,153,226,217,6,101,116,44,120,11,29,189,29,121,173,198,148,225,85,74,103,30,26,72,122,189,157,215,93,243,198,99,81,62,115,57,187,189,
+139,227,174,157,180,241,228,125,181,178,108,39,191,223,183,172,111,60,140,239,202,245,20,218,134,115,10,141,153,118,219,81,235,174,181,216,216,223,175,237,201,60,86,81,205,109,157,229,43,91,82,229,252,171,131,149,214,246,113,217,152,186,125,218,88,167,49,191,159,202,200,207,113,203,94,202,230,250,7,135,202,242,53,206,214,161,253,98,151,111,111,90,222,59,157,239,72,115,77,165,100,37,91,167,150,158,25,106,171,6,117,147,71,58,245,78,135,179,102,196,101,26,127,229,247,109,13,122,150,20,90,107,217,102,170,175,193,174,46,124,215,216,210,233,209,173,169,75,220,251,166,233,246,163,58,123,182,38,91,145,250,124,71,182,96,29,168,118,172,76,152,221,242,212,206,247,109,166,220,5,202,106,165,54,52,99,91,142,99,137,180,245,80,90,52,99,141,155,155,107,112,91,40,233,145,199,148,61,116,236,239,16,31,26,13,229,137,115,181,105,71,38,143,218,239,123,95,44,30,240,206,150,118,215,231,38,213,233,219,211,11,230,242,82,20,9,254,118,121,226,92,229,139,157,164,9,
+121,222,236,167,67,241,199,104,142,240,116,36,67,143,4,252,199,28,176,94,32,17,152,193,225,119,34,8,129,48,40,160,5,159,42,227,191,29,249,247,184,36,56,220,8,191,201,62,159,244,87,230,243,99,62,39,234,98,34,95,204,102,48,226,239,147,162,11,249,141,139,249,125,130,71,112,185,17,68,228,207,72,24,116,113,188,80,253,38,224,244,250,183,151,72,52,40,226,114,81,64,55,67,175,50,138,33,69,209,252,40,72,72,138,0,157,104,18,226,145,191,64,145,124,158,136,228,137,0,189,19,209,25,143,32,232,222,153,92,24,205,143,229,70,65,4,247,23,226,137,16,138,32,207,19,2,68,194,192,74,129,4,252,88,17,135,71,66,225,119,160,192,218,23,158,91,240,200,199,164,32,96,240,199,168,40,40,138,35,32,35,69,220,39,65,208,63,249,177,231,26,145,128,13,112,10,2,35,137,200,104,72,196,137,33,33,161,136,16,197,10,33,254,3,136,224,61,57,143,6,138,136,21,137,248,60,40,50,154,224,61,36,133,65,23,242,64,240,4,135,7,124,198,16,2,17,
+36,32,31,8,72,97,52,196,229,63,228,68,66,194,0,35,66,4,241,121,220,39,103,161,17,145,162,88,224,244,201,25,18,224,32,32,129,213,35,128,1,150,255,23,234,250,55,190,80,4,202,122,181,34,225,223,156,45,246,240,235,225,223,254,143,5,15,192,253,63,43,254,61,249,8,228,156,0,188,2,165,137,226,67,60,190,8,138,21,146,95,96,9,250,240,187,147,108,255,153,195,187,207,249,149,60,101,124,114,186,228,23,118,197,40,236,243,175,19,40,252,250,103,141,253,9,224,239,112,14,92,133,65,159,40,92,165,40,252,245,183,12,239,159,247,113,12,135,7,62,98,184,144,16,88,7,90,7,52,17,47,138,16,68,125,214,63,87,153,131,87,232,127,0,130,162,182,149,
+
diff --git a/uppsrc/CtrlLib/src.tpp/TreeCtrl$en-us.tpp b/uppsrc/CtrlLib/src.tpp/TreeCtrl$en-us.tpp
new file mode 100644
index 000000000..fe70cc888
--- /dev/null
+++ b/uppsrc/CtrlLib/src.tpp/TreeCtrl$en-us.tpp
@@ -0,0 +1,29 @@
+TITLE("TreeCtrl")
+COMPRESSED
+120,156,237,61,249,87,19,105,182,255,74,157,211,111,122,208,71,211,73,8,139,250,222,156,238,209,153,62,158,233,233,158,51,206,242,131,71,155,144,20,80,175,67,194,164,2,202,188,243,230,160,136,44,17,21,12,81,1,69,3,200,26,246,125,85,33,178,137,200,190,42,139,108,97,21,89,101,125,223,87,85,73,170,66,66,86,108,237,233,110,15,132,170,239,222,239,110,223,189,247,187,223,146,179,28,228,63,254,131,229,204,250,140,101,230,191,227,167,80,31,94,160,80,122,238,44,198,229,122,158,224,113,220,78,252,248,135,239,143,157,56,250,149,147,59,247,8,196,194,6,88,92,61,216,174,158,110,174,108,46,199,29,252,96,187,178,57,110,28,87,46,219,147,115,140,235,233,234,234,201,58,206,23,242,112,252,220,89,33,199,211,243,4,4,226,56,115,62,227,120,184,113,216,30,92,79,174,39,219,213,195,147,3,96,57,44,22,135,229,193,113,99,115,93,61,57,110,199,5,40,206,63,119,150,231,233,122,226,232,159,221,1,144,43,236,9,32,103,177,221,57,92,15,46,135,229,
+202,226,112,65,87,108,79,79,46,219,195,205,211,245,152,187,251,113,62,47,64,138,137,69,84,95,24,155,205,97,159,240,102,123,156,0,52,255,235,95,255,114,97,115,89,36,5,92,128,140,205,226,2,82,217,224,25,139,203,241,96,187,29,99,29,115,243,100,123,178,92,1,114,55,15,150,219,241,0,158,132,231,111,154,117,55,179,172,123,176,142,99,82,20,160,56,250,159,108,182,7,0,113,119,118,255,140,205,245,0,140,122,186,114,221,60,61,88,160,115,14,135,227,234,202,97,187,114,142,29,227,184,185,187,121,28,247,67,121,2,84,2,88,224,178,221,9,98,61,156,61,62,115,115,115,227,130,246,92,174,155,135,39,151,227,10,116,195,117,229,2,81,112,217,199,220,184,199,220,56,199,69,40,46,69,5,94,95,144,98,35,217,215,17,14,233,134,152,60,157,61,63,115,231,186,31,99,3,233,115,143,121,112,89,199,220,217,30,174,80,120,108,32,118,119,87,46,231,152,155,14,19,165,181,255,253,225,255,126,245,187,239,190,248,235,25,228,44,238,122,2,249,139,4,69,79,
+74,37,194,207,207,157,197,89,39,144,175,190,194,252,121,190,232,113,32,72,206,231,108,182,155,123,84,232,211,144,242,144,144,144,203,13,123,224,103,200,70,105,226,252,189,166,142,161,162,2,121,200,114,234,139,39,247,210,203,66,100,37,67,33,209,207,26,66,198,66,178,59,230,66,250,242,174,244,200,101,141,161,33,217,15,212,119,50,67,215,238,238,62,79,185,121,83,190,145,191,146,23,181,178,178,178,154,61,85,58,62,181,53,163,236,110,86,205,110,40,106,114,43,43,231,107,43,234,66,134,71,38,198,55,215,23,171,98,118,46,61,233,106,24,111,111,158,189,61,154,53,18,179,161,122,162,124,27,170,30,105,72,42,157,150,215,183,47,111,71,61,76,234,159,120,155,40,191,36,155,84,245,119,77,15,215,245,164,206,40,59,234,122,114,75,210,203,202,250,138,66,195,242,34,182,229,170,230,90,133,188,181,56,125,38,45,123,72,62,59,249,88,185,144,81,92,169,184,183,187,119,175,174,246,74,216,88,248,219,177,103,29,227,147,217,171,209,145,117,173,3,242,218,228,184,150,
+250,186,119,229,138,140,234,219,225,219,37,37,225,171,211,13,202,216,233,219,239,250,11,83,66,100,13,41,27,189,237,67,19,89,213,3,121,195,74,89,230,76,95,151,74,177,213,171,216,104,123,84,46,235,152,108,158,171,140,79,202,41,141,90,10,137,108,76,155,29,223,174,157,8,75,174,91,46,122,27,90,161,30,9,151,61,110,107,86,42,194,74,83,70,215,71,214,98,54,0,39,133,217,187,106,77,103,209,228,240,19,117,66,90,94,73,117,226,200,171,203,138,214,234,187,111,218,151,158,151,171,91,90,223,102,231,212,201,22,202,6,174,183,247,103,191,217,27,233,27,74,145,247,40,38,238,39,149,47,191,206,123,52,158,155,156,93,93,181,81,166,104,106,79,82,174,141,198,164,189,141,150,43,110,101,38,15,22,149,134,103,167,196,79,238,106,94,230,228,61,156,27,223,88,186,156,28,214,93,176,189,210,145,243,112,116,79,25,177,51,171,170,223,189,175,106,72,184,158,51,62,91,54,190,167,136,156,208,12,183,22,71,119,36,60,173,40,13,215,108,62,202,234,158,95,84,
+45,36,246,86,118,244,84,247,148,230,44,60,95,26,202,171,126,217,147,162,6,146,137,106,145,247,68,169,219,39,170,223,100,100,79,221,42,108,92,92,76,43,83,13,229,206,189,219,125,49,214,214,171,124,152,154,161,214,92,142,91,238,207,95,27,24,111,122,28,219,86,20,86,89,56,157,94,209,156,53,247,102,32,37,241,250,196,157,149,234,75,247,118,250,139,50,210,147,10,146,103,70,53,205,89,37,221,143,42,170,151,238,47,223,141,8,157,145,205,204,104,226,102,149,67,157,245,49,201,57,247,213,49,175,6,170,138,18,215,203,86,242,179,223,204,214,104,54,203,148,209,242,154,134,194,161,136,119,209,41,189,205,154,137,201,100,197,219,39,189,192,42,52,245,87,149,217,131,69,125,87,118,139,129,190,71,218,23,202,115,159,246,118,92,85,68,150,22,78,68,181,190,187,247,124,102,107,226,201,114,248,251,198,140,248,156,190,209,156,164,186,247,29,89,178,119,53,207,103,226,182,42,211,230,91,11,162,42,166,118,19,82,102,18,149,57,17,47,54,58,86,0,130,141,193,185,
+142,236,170,198,142,120,121,103,95,74,93,114,85,245,106,95,155,50,175,170,116,93,214,113,187,189,92,173,12,203,152,236,75,201,188,150,149,144,22,166,9,111,15,75,169,238,109,147,215,101,102,84,100,228,62,212,148,104,6,154,115,179,242,246,74,20,247,54,155,98,222,46,110,14,206,151,111,205,39,134,54,87,132,203,212,113,179,113,9,189,195,13,183,139,166,86,59,90,91,213,195,227,41,119,30,246,189,31,127,214,157,147,181,178,149,213,27,171,76,221,237,74,207,110,221,232,234,207,109,138,142,235,172,124,80,182,221,242,40,115,252,78,89,233,222,68,202,203,129,222,176,193,234,126,121,229,205,222,149,185,198,213,233,161,248,87,99,241,221,253,101,207,50,47,105,214,42,212,171,138,249,166,165,129,162,184,244,168,200,167,169,21,87,91,84,173,249,105,113,106,101,113,71,247,171,164,214,238,254,206,226,233,188,161,161,215,79,227,203,99,243,239,150,151,149,151,135,189,220,172,185,25,158,183,146,220,219,95,159,210,45,123,58,86,188,52,123,83,182,51,115,171,187,105,170,122,
+118,242,206,237,212,240,251,11,83,107,25,137,15,90,218,151,10,6,199,171,98,215,210,30,95,206,24,139,89,137,188,172,184,148,148,125,185,182,111,229,202,46,144,248,220,238,114,105,215,72,234,211,184,249,210,169,117,153,98,189,181,176,160,126,181,90,81,61,185,89,61,213,59,48,159,57,181,184,212,85,174,232,31,24,184,221,253,104,58,38,255,82,127,107,190,122,110,56,86,166,172,188,251,182,186,79,94,56,49,216,165,120,255,172,160,100,96,48,77,185,162,124,53,26,243,174,111,233,186,76,166,122,183,211,18,177,152,49,150,62,86,55,154,30,62,17,177,20,85,31,151,113,179,50,246,70,122,124,166,90,211,147,148,62,49,113,107,32,97,247,129,106,183,229,129,170,106,123,105,178,99,166,107,179,41,190,41,167,251,197,141,166,244,240,136,161,157,165,250,39,170,87,153,229,242,27,99,155,10,245,102,90,115,81,185,172,243,225,218,208,76,111,123,222,100,127,74,79,204,237,236,178,245,188,246,199,106,205,118,83,239,112,89,204,114,67,73,71,89,172,186,185,60,239,117,105,
+247,208,235,18,133,102,46,65,243,176,224,89,115,162,188,33,85,209,180,60,216,245,226,121,65,223,123,165,98,226,238,187,252,251,139,55,107,71,211,234,54,91,247,90,90,167,183,219,151,42,95,40,203,111,213,204,21,165,47,100,151,14,222,47,218,46,45,107,78,127,86,19,183,250,190,45,191,68,93,175,217,84,20,93,213,68,133,70,77,181,116,165,85,76,104,228,133,141,115,123,121,170,225,154,165,130,155,147,138,212,144,241,152,142,170,103,59,37,133,242,208,238,119,9,169,47,203,6,230,195,107,83,123,106,163,86,11,243,215,139,170,10,198,71,47,111,231,110,189,138,125,181,92,95,21,85,18,38,187,251,248,6,208,192,139,236,39,99,185,77,37,209,138,75,33,80,27,243,170,138,250,212,165,237,162,30,245,251,213,204,213,241,231,61,201,15,39,213,133,143,214,171,59,229,169,91,171,178,149,215,213,235,217,117,115,141,202,228,107,197,173,175,138,214,174,77,220,237,205,47,88,175,27,105,31,123,51,213,95,249,84,89,171,233,172,80,78,116,60,168,109,109,189,59,216,254,
+126,115,60,125,179,119,176,163,161,121,248,241,234,141,219,207,138,162,183,74,235,215,150,101,245,239,150,114,7,218,235,139,227,74,59,42,20,229,241,205,99,21,151,10,95,20,134,143,245,13,166,188,95,47,46,26,139,236,168,41,81,239,140,21,183,198,170,242,159,78,215,200,227,243,210,135,85,155,27,237,45,9,17,205,19,178,236,194,196,46,133,102,87,211,219,222,255,96,168,184,232,222,203,133,246,7,187,229,173,215,251,202,211,149,234,184,236,241,138,120,69,91,204,230,221,200,156,237,250,200,103,77,225,133,29,149,173,235,19,87,186,54,175,171,22,22,175,78,63,121,165,28,213,188,159,155,153,143,157,172,110,88,148,191,200,46,27,80,76,140,174,21,173,85,238,228,181,200,70,26,71,74,8,191,26,170,110,133,238,246,6,37,23,224,23,38,160,95,0,239,122,136,240,17,46,139,36,228,151,125,249,37,124,9,45,120,132,4,140,87,83,128,164,121,95,105,222,37,1,169,184,19,126,75,70,2,62,184,76,2,246,111,147,128,197,161,36,160,118,92,200,175,144,128,131,36,
+57,35,143,72,172,73,143,73,114,242,10,72,114,148,179,36,57,143,175,144,228,212,166,147,228,56,140,143,135,4,214,24,117,249,155,171,79,158,71,37,170,43,23,239,213,44,247,84,38,21,95,79,45,191,179,126,125,245,213,163,221,168,213,200,177,43,137,157,155,179,207,194,122,218,7,30,134,76,183,151,173,95,139,149,213,14,85,151,47,15,87,87,109,71,79,188,121,93,247,184,184,101,39,61,182,85,147,48,159,80,91,18,21,117,105,237,106,147,178,189,48,255,197,194,212,240,253,233,165,133,237,182,254,252,71,213,53,163,73,97,29,149,165,187,11,113,113,153,151,35,20,209,9,201,115,107,83,53,229,49,234,172,220,249,234,187,53,85,27,75,219,115,181,197,203,171,91,17,75,9,17,245,123,91,215,52,205,185,139,175,119,139,187,35,100,211,241,170,29,249,252,11,101,201,210,155,206,229,222,186,59,221,91,229,245,93,239,182,203,198,158,239,188,24,123,62,23,55,219,91,219,184,55,127,255,206,235,59,157,242,215,149,203,229,205,221,41,178,248,156,29,185,74,53,211,94,
+156,113,121,55,127,55,247,121,118,69,207,104,211,184,106,38,105,48,190,51,78,94,83,182,94,220,221,181,25,241,160,111,165,169,127,88,126,61,127,53,47,46,81,169,42,72,31,24,108,26,207,94,155,185,127,7,160,218,141,223,221,27,200,106,84,77,239,101,94,82,43,111,212,214,188,174,120,214,181,246,182,224,218,84,163,178,232,233,141,152,194,39,233,239,199,198,158,119,110,222,126,251,164,181,231,97,246,116,78,74,104,171,50,43,60,34,127,224,117,100,114,254,116,243,141,240,152,210,244,157,5,77,21,104,51,61,170,234,73,141,25,124,217,21,42,83,191,77,218,89,125,31,149,17,94,156,151,87,144,62,212,221,214,63,158,77,244,184,40,223,93,154,94,200,74,191,118,243,113,241,116,199,157,39,29,181,109,45,177,178,156,213,130,187,123,21,201,219,131,163,219,0,207,70,219,150,170,72,249,234,229,138,38,121,174,50,110,75,157,148,180,149,209,22,149,159,244,118,98,165,54,62,93,213,246,60,90,211,156,145,84,181,219,151,89,31,150,21,173,168,105,238,41,95,239,220,
+153,88,175,157,142,121,213,93,153,211,147,54,215,185,153,220,123,171,118,64,29,22,210,170,84,135,79,37,191,185,39,111,47,89,186,187,208,87,179,184,16,125,63,57,99,53,114,99,172,190,115,115,69,115,43,189,167,29,106,60,178,179,109,101,176,182,115,111,45,122,78,147,149,126,243,193,212,76,76,123,73,125,154,166,65,245,48,103,176,81,25,18,213,252,84,22,161,172,24,144,141,95,171,28,93,108,76,31,9,233,160,50,68,234,151,54,111,68,252,48,84,194,147,240,253,130,17,127,158,8,164,142,254,168,72,138,96,56,226,205,195,81,1,34,22,33,152,72,138,250,162,18,4,19,32,162,64,127,111,84,130,187,32,191,227,241,253,16,145,88,128,130,183,136,20,160,66,156,96,102,125,4,241,227,225,8,72,83,197,124,140,7,146,86,58,108,160,8,251,71,32,138,248,136,37,136,212,15,37,128,92,144,147,126,152,80,64,32,194,17,177,15,2,113,32,60,9,138,136,37,190,60,17,246,79,128,1,226,19,129,103,18,94,176,139,158,232,0,137,56,8,35,128,2,0,245,
+112,138,129,72,197,160,55,28,149,72,17,62,13,41,79,138,224,1,40,31,243,193,32,46,136,5,9,16,227,24,1,193,19,9,32,20,160,74,18,76,1,193,71,96,154,1,69,64,192,187,32,127,22,139,165,36,93,144,53,31,236,34,228,74,128,176,92,152,226,132,191,216,39,254,112,220,11,252,175,165,18,126,254,14,96,129,191,137,228,253,248,87,44,228,236,175,88,172,47,88,172,175,156,88,46,44,23,142,155,219,17,132,202,235,181,207,193,108,6,249,65,251,39,162,199,69,160,58,7,251,225,0,237,249,1,13,17,128,136,4,13,144,160,56,160,24,39,228,202,23,3,145,3,242,33,39,188,128,0,20,204,153,68,124,20,10,23,199,68,190,66,84,47,67,200,20,157,11,183,3,200,63,45,194,164,94,78,94,71,104,28,156,39,158,195,201,198,121,146,104,226,179,41,62,136,89,137,150,250,239,8,195,1,148,90,218,189,63,79,226,139,137,140,139,15,152,152,169,78,73,48,109,175,103,2,120,64,16,222,168,244,2,138,138,136,238,9,33,5,241,132,129,132,124,160,244,
+160,76,156,129,245,17,31,188,126,141,35,23,48,129,47,42,117,65,168,137,55,14,13,134,99,41,217,63,162,193,134,2,251,27,236,141,18,24,241,217,20,237,0,86,75,248,105,104,125,224,111,23,82,237,224,159,8,216,164,0,195,3,132,188,96,84,96,41,53,4,163,54,211,67,64,51,40,34,158,88,218,57,69,173,137,17,32,22,225,166,148,72,80,121,138,132,166,232,164,254,50,0,240,58,170,163,149,234,76,75,45,213,30,9,132,14,13,232,15,12,111,48,161,167,232,103,104,246,187,191,126,251,173,51,114,193,15,3,222,205,31,229,137,112,228,140,84,160,5,199,136,38,222,40,129,199,82,190,113,224,196,12,101,126,6,60,163,88,129,31,77,73,28,130,234,108,23,124,134,54,74,26,43,112,80,60,3,194,3,133,66,196,235,11,194,27,251,1,159,199,7,206,219,153,214,154,64,6,57,16,160,82,84,226,143,137,128,36,188,131,181,130,242,250,226,55,223,160,82,192,42,236,198,137,128,58,2,7,1,31,50,67,188,251,35,38,34,222,129,225,230,67,141,9,194,147,
+19,142,17,160,181,70,36,16,171,161,72,254,36,149,80,18,1,159,152,2,249,47,134,37,64,100,84,75,248,145,217,244,55,122,225,193,78,180,194,251,59,73,47,45,44,93,192,164,126,86,249,63,62,79,4,34,141,9,15,228,45,22,11,77,41,145,2,100,12,28,240,12,154,17,124,110,133,212,128,53,162,66,148,47,181,137,6,18,212,24,21,228,27,203,233,56,131,74,9,71,239,229,68,140,90,93,16,240,250,28,68,7,134,78,13,161,207,19,126,95,71,149,215,231,58,10,1,71,90,180,186,215,78,231,204,248,9,3,23,65,70,34,102,16,98,244,225,10,98,144,175,238,205,17,221,200,66,193,8,34,162,147,21,18,160,49,79,56,77,251,153,183,153,111,210,129,51,125,183,1,223,65,38,184,246,22,131,81,0,226,10,45,12,2,87,66,181,61,74,0,218,39,19,231,79,83,74,206,136,227,177,75,77,232,128,33,126,43,164,77,5,37,154,208,181,79,236,22,178,65,120,181,90,214,218,96,109,24,167,13,36,34,48,33,17,42,38,89,33,11,24,153,64,114,74,69,
+86,123,217,167,135,100,61,239,250,192,205,136,217,8,157,35,252,159,38,88,130,193,215,10,126,136,71,78,218,104,103,191,66,233,129,210,128,35,34,156,50,34,169,129,150,188,126,224,211,95,50,249,162,146,99,11,57,59,201,19,125,15,66,158,151,19,140,85,118,241,68,97,58,208,66,233,1,145,161,37,111,253,83,175,255,254,65,42,1,185,14,131,41,42,98,35,62,66,158,175,21,172,157,33,226,168,99,152,35,113,217,203,222,62,182,200,80,111,21,99,70,159,59,209,248,3,4,51,120,113,210,245,74,165,167,164,171,144,4,242,165,98,137,125,189,238,203,55,14,10,47,251,232,58,220,116,226,48,66,134,145,176,253,53,142,99,190,96,86,2,39,175,206,182,197,14,155,101,251,111,35,237,15,20,254,15,95,151,142,215,147,125,86,123,152,60,30,166,117,126,204,214,227,64,153,26,77,56,76,202,206,178,244,193,120,242,160,37,222,186,252,193,82,207,69,227,195,25,19,73,201,31,31,129,175,178,65,98,70,141,137,86,240,100,68,126,254,69,70,102,67,123,195,178,17,97,
+176,121,132,38,220,25,85,34,130,150,137,17,57,189,63,42,194,49,32,85,11,203,230,100,185,156,38,49,173,12,207,155,42,156,159,63,79,211,211,249,175,244,149,115,122,131,227,244,38,122,68,1,129,222,66,140,111,12,19,169,41,109,209,29,174,115,208,108,150,99,218,102,255,238,135,18,41,170,97,157,235,36,79,40,244,230,241,127,100,107,107,88,218,191,245,106,97,214,188,128,110,168,166,251,234,220,180,106,151,182,59,6,165,68,109,238,2,15,167,10,77,206,8,177,127,10,214,255,136,82,38,85,237,70,48,129,11,130,152,25,130,16,255,73,161,24,223,87,202,60,68,126,136,254,140,51,196,135,175,236,102,232,91,212,71,122,74,12,84,111,146,43,3,166,152,228,50,169,213,35,51,78,178,128,120,7,55,113,97,252,31,81,1,226,196,15,148,224,176,128,42,64,69,82,184,58,181,191,9,177,160,102,206,57,194,190,127,203,147,216,170,23,0,234,245,185,129,224,193,51,45,15,127,197,137,146,16,30,24,16,32,12,38,151,150,46,74,17,48,150,3,45,161,11,76,99,
+28,32,89,128,69,75,206,73,82,102,224,31,57,149,129,139,120,112,85,142,239,199,19,249,66,161,98,34,190,48,80,128,137,124,145,63,96,66,33,217,220,34,17,146,77,29,64,45,137,200,128,96,11,104,4,211,165,0,9,202,231,89,80,137,165,132,66,242,239,24,1,147,184,244,243,69,35,194,181,134,66,48,225,132,203,166,180,224,188,47,110,51,114,12,189,39,14,18,99,2,35,177,136,40,99,64,148,54,71,237,253,83,112,195,149,85,227,225,88,95,100,96,78,167,233,75,173,98,31,68,162,91,37,102,86,80,69,231,92,144,223,195,181,25,1,138,6,0,128,128,96,216,154,209,0,250,174,0,84,226,35,150,248,219,34,89,70,218,67,230,190,31,86,178,246,229,67,70,179,95,75,138,215,68,201,222,96,222,196,208,132,11,179,146,173,93,165,34,171,222,112,237,202,170,212,217,34,193,255,92,117,0,215,162,109,214,31,227,141,181,58,180,79,43,7,205,2,62,122,173,252,108,103,10,180,210,49,181,160,206,147,210,135,237,247,34,144,107,72,80,31,84,130,194,157,43,
+76,135,74,48,13,199,50,46,21,75,192,104,246,250,226,55,90,92,98,239,255,129,229,77,33,230,131,74,193,124,3,241,15,196,165,8,122,145,143,130,102,58,163,249,53,174,107,0,34,154,110,90,2,173,142,66,131,251,137,3,133,2,72,22,189,219,139,231,156,25,127,7,3,199,126,218,7,65,49,16,8,36,6,45,97,130,194,108,75,236,105,250,39,42,17,59,35,250,197,116,253,172,200,210,21,244,211,196,254,38,47,39,157,61,59,91,29,96,141,107,144,133,144,168,15,52,117,83,202,39,247,75,209,198,144,85,166,131,29,12,246,33,98,186,69,162,254,212,164,105,5,107,206,7,198,52,131,5,141,79,131,123,171,109,233,176,179,24,198,27,163,212,153,92,209,129,155,85,196,244,229,46,232,98,125,120,66,28,117,152,142,127,81,247,199,154,48,125,60,166,178,47,153,250,197,84,28,146,197,125,66,41,156,149,198,40,54,101,134,32,9,212,190,33,45,2,167,182,95,107,103,208,212,22,108,253,206,109,239,96,162,172,119,10,195,165,152,8,36,121,65,60,9,198,131,91,
+158,113,148,252,67,28,8,247,122,75,37,152,119,160,20,37,182,68,26,228,2,196,246,114,160,101,208,27,85,91,115,57,103,38,221,250,90,32,160,134,133,195,210,44,128,242,16,173,255,167,74,150,116,130,250,105,100,97,1,97,142,78,113,126,58,61,254,204,18,21,11,53,244,139,178,62,245,52,195,156,162,29,145,94,124,170,138,254,185,149,122,28,107,77,7,103,11,60,41,81,139,71,69,2,24,225,133,32,65,128,191,73,141,194,106,143,190,41,238,130,252,137,204,43,96,249,232,167,77,45,254,140,250,139,131,208,3,130,166,201,162,36,9,105,147,153,239,11,153,64,178,36,58,156,90,168,132,199,34,168,38,71,73,0,196,71,34,246,215,31,216,179,136,45,226,80,159,4,238,244,180,149,61,45,6,135,179,201,19,10,233,22,65,114,71,101,155,166,68,96,142,233,111,80,41,65,239,73,113,160,136,154,71,29,33,124,197,113,26,177,90,138,76,159,86,3,204,51,48,49,155,233,4,112,16,6,58,239,228,187,35,250,165,62,210,125,233,228,33,13,148,136,200,101,44,242,
+80,39,52,98,186,100,116,131,200,110,185,208,139,104,246,201,197,33,34,209,59,39,51,112,214,75,82,183,152,79,147,38,240,79,152,72,128,94,68,24,210,59,231,24,249,146,254,204,94,155,35,177,124,48,123,211,178,109,68,88,182,73,193,12,255,86,157,115,36,37,114,120,178,48,198,2,121,134,89,44,241,58,235,117,206,193,188,208,81,31,30,83,172,19,52,74,141,104,28,46,240,105,79,119,219,166,98,50,247,119,184,158,141,180,56,68,195,215,173,111,218,42,136,51,90,91,183,103,161,217,222,152,234,200,5,96,189,84,224,250,175,157,102,98,76,58,159,146,160,14,107,149,221,161,66,6,131,230,91,76,132,82,185,142,117,211,51,58,172,94,184,58,98,191,209,237,171,9,148,144,55,48,232,18,19,33,0,195,225,249,230,32,12,199,188,133,40,149,163,144,7,158,181,228,89,64,58,60,248,250,53,65,132,13,245,42,6,188,109,198,177,95,67,58,166,49,129,254,2,12,41,193,48,130,89,168,140,175,9,186,108,227,72,15,239,176,92,91,199,18,193,196,65,182,6,87,
+208,181,39,200,225,149,6,148,118,157,17,9,229,53,69,168,47,79,138,5,161,150,237,209,1,29,147,123,194,205,135,137,125,213,80,210,139,211,235,160,70,3,198,254,6,135,20,47,104,19,78,251,92,162,94,34,214,87,177,15,242,142,102,247,208,91,229,33,127,162,93,124,122,41,155,221,122,129,147,103,23,15,206,180,15,56,133,15,87,191,112,250,169,197,67,49,159,191,160,56,220,92,227,135,18,219,82,180,99,203,178,155,6,244,12,30,80,122,51,105,18,102,15,100,218,106,15,38,235,70,251,106,70,140,179,156,144,30,156,184,196,2,110,22,199,17,39,140,177,239,146,0,134,178,33,11,77,180,17,134,193,77,69,136,63,239,71,35,229,2,202,65,153,147,36,177,117,221,150,234,7,185,231,221,81,142,248,12,207,31,133,247,39,65,81,56,97,2,103,138,87,75,236,224,20,138,6,216,103,11,16,195,71,103,15,95,82,198,96,178,218,69,220,154,4,148,78,248,92,102,241,208,18,157,235,197,102,131,222,29,33,49,163,186,135,136,157,152,140,90,106,11,127,4,195,224,
+111,164,209,219,194,23,13,220,97,156,145,3,27,42,137,86,63,57,48,74,194,146,45,28,207,160,129,165,35,24,158,154,39,118,230,155,201,21,15,138,144,122,4,142,74,22,201,131,220,212,193,17,145,174,42,171,223,69,73,79,143,201,244,139,46,9,139,42,118,52,174,237,41,215,237,227,157,10,119,230,242,158,125,28,152,163,89,127,136,194,212,116,196,164,142,244,160,70,102,35,218,138,49,37,110,178,12,110,65,9,92,167,120,187,172,198,113,126,128,102,50,240,134,60,171,83,113,218,16,6,49,228,8,124,207,7,131,15,21,32,62,152,4,55,123,120,243,27,189,56,236,54,39,43,77,137,54,163,34,239,196,34,167,149,194,96,242,88,139,238,44,17,115,146,1,47,184,130,201,19,74,74,194,188,1,158,198,45,96,208,92,98,104,19,131,48,190,49,200,221,239,26,44,80,207,25,190,68,44,20,30,68,61,121,67,151,88,127,116,143,248,124,160,194,72,164,214,242,3,136,198,9,64,253,29,141,240,94,62,75,70,29,1,246,23,49,121,138,153,160,207,218,161,71,97,216,
+63,242,104,236,51,57,103,12,62,156,111,100,240,17,56,113,210,73,195,99,88,112,8,146,86,22,32,65,131,224,202,34,177,213,29,178,79,174,68,234,68,103,81,217,251,48,107,222,230,148,181,175,142,164,31,80,196,101,116,214,14,35,125,145,247,208,43,188,102,99,208,254,58,173,157,204,253,30,19,9,72,211,60,160,22,105,170,74,3,129,77,88,165,85,53,197,35,7,56,72,195,144,0,225,140,251,70,24,28,124,196,129,34,179,211,73,72,54,45,24,154,97,222,68,86,79,114,127,64,88,180,67,12,127,18,242,248,40,61,56,18,1,205,180,60,244,101,41,173,227,181,72,14,103,196,186,221,181,204,59,42,190,151,8,80,9,220,242,98,195,12,11,34,253,224,213,23,61,213,148,172,137,207,38,74,46,98,198,59,235,102,114,222,193,204,122,246,254,13,33,144,127,220,112,189,218,100,254,31,8,175,190,101,204,254,9,226,16,160,119,41,124,3,156,177,0,131,39,91,137,52,136,214,78,75,136,174,80,224,76,245,6,207,243,64,104,210,107,3,235,192,157,9,167,0,12,
+195,25,62,33,192,204,206,25,33,23,180,153,182,99,205,227,208,38,224,191,152,136,35,77,4,249,218,7,94,96,64,245,3,129,129,155,129,62,9,120,93,120,230,158,7,19,8,173,62,137,115,171,6,69,41,43,252,15,70,172,217,28,245,58,178,255,2,157,32,246,254,43,116,130,56,160,229,71,229,157,24,112,78,250,27,127,225,190,52,177,63,172,7,232,221,188,5,167,53,41,62,127,8,98,91,98,232,186,214,156,35,208,218,206,72,5,196,147,147,100,199,135,97,190,164,165,226,152,127,128,144,220,171,166,179,66,198,249,66,138,115,43,189,205,135,52,134,67,243,69,255,102,6,65,248,0,135,27,197,111,131,105,219,43,76,68,33,235,117,78,97,253,148,66,144,233,221,203,90,225,31,142,168,104,152,127,62,226,98,138,202,22,111,243,113,217,220,71,236,106,172,181,219,15,163,140,195,182,234,143,94,33,240,2,32,177,40,8,21,97,196,69,6,186,141,229,48,167,131,245,3,76,2,191,100,5,227,3,220,129,34,144,4,2,72,226,102,4,224,222,169,112,128,160,255,8,
+228,9,225,220,20,166,141,230,151,160,80,158,245,85,112,2,74,175,32,163,91,166,105,155,165,45,173,44,158,198,117,215,8,217,85,25,213,223,78,196,104,100,113,113,20,23,251,163,244,140,92,123,221,61,226,244,157,24,132,76,162,50,188,175,206,67,21,193,69,40,31,197,113,160,54,144,136,107,1,205,46,153,17,242,100,240,110,189,58,246,49,77,211,11,209,0,126,41,78,176,254,22,44,243,139,18,176,225,247,218,165,44,155,210,56,45,138,67,25,203,38,243,34,192,162,65,188,209,93,80,133,127,25,72,93,105,140,107,191,219,134,190,138,111,169,129,162,2,123,119,117,104,241,24,88,168,142,110,199,110,36,165,236,218,228,76,22,30,110,177,240,59,29,8,210,29,192,253,97,50,254,37,114,246,203,3,152,215,194,28,253,146,66,249,37,66,151,0,120,127,20,209,222,192,70,150,16,205,9,229,84,160,127,128,213,163,22,2,25,25,171,167,48,158,175,72,140,75,129,143,23,128,22,218,213,12,221,205,97,240,110,61,41,79,36,224,73,4,136,80,236,235,130,252,238,34,
+6,55,240,96,34,68,128,122,7,250,34,254,196,241,34,145,208,130,235,240,181,133,214,131,46,32,63,191,239,86,76,131,203,199,181,104,14,28,228,182,92,173,78,220,134,40,16,163,164,99,5,49,69,124,129,82,136,121,206,200,43,158,236,228,203,236,77,78,182,112,165,255,114,48,42,98,224,126,226,11,102,189,241,183,104,16,42,60,121,209,112,129,216,58,142,40,36,54,121,99,218,161,64,29,43,167,69,240,60,6,249,85,106,1,176,32,69,122,84,253,183,195,9,97,135,186,111,29,210,46,8,224,8,219,29,9,192,46,162,66,179,133,168,63,2,48,204,146,107,242,205,242,78,195,228,112,149,126,13,77,19,167,93,48,73,85,13,205,178,247,157,248,183,60,254,143,190,18,184,38,96,183,181,234,81,57,156,193,191,251,1,118,136,213,72,178,3,157,83,162,76,56,128,7,204,70,31,59,206,253,63,93,235,91,97,
diff --git a/uppsrc/CtrlLib/src.tpp/ValueEditors$en-us.tpp b/uppsrc/CtrlLib/src.tpp/ValueEditors$en-us.tpp
new file mode 100644
index 000000000..505b884ae
--- /dev/null
+++ b/uppsrc/CtrlLib/src.tpp/ValueEditors$en-us.tpp
@@ -0,0 +1,12 @@
+TITLE("EditField derived classes")
+COMPRESSED
+120,156,237,90,249,143,219,54,22,254,87,136,30,129,103,234,78,117,90,26,57,93,4,155,30,8,178,73,129,58,187,249,193,176,199,28,137,30,115,107,75,134,68,79,50,8,146,191,125,31,169,139,146,169,195,71,144,105,187,1,38,150,69,242,241,189,79,223,187,40,79,13,244,205,55,218,80,251,90,235,248,231,253,68,150,120,183,102,179,41,181,44,119,140,13,123,252,199,203,223,174,199,151,207,6,35,235,130,75,209,65,138,233,232,166,107,155,186,101,140,224,63,221,212,13,219,48,45,221,53,174,45,215,52,93,205,243,215,56,73,102,211,181,225,186,99,190,200,128,69,134,99,27,186,99,185,150,171,155,142,107,192,90,67,211,12,205,49,108,221,50,93,195,246,2,146,248,179,41,118,205,241,229,239,35,88,100,242,157,64,184,166,143,12,203,177,12,205,212,12,11,182,210,93,215,210,29,219,53,175,71,35,207,199,91,70,163,48,219,139,234,186,161,143,111,117,103,12,58,127,250,244,233,74,183,180,84,3,11,132,233,154,5,170,234,112,79,179,12,71,183,175,181,107,219,213,
+93,205,4,225,182,163,217,222,22,199,120,211,108,186,221,105,186,163,121,148,17,16,113,249,157,174,59,176,100,52,28,125,173,91,14,24,234,154,150,237,58,26,108,110,24,134,105,26,186,105,92,95,27,246,200,118,188,21,193,1,137,103,211,15,55,31,191,253,249,245,247,255,158,160,105,98,142,209,207,1,101,191,80,178,14,16,140,210,123,18,32,1,43,73,158,204,166,137,54,70,111,105,112,71,88,130,8,204,163,225,29,186,199,235,29,73,16,13,17,35,239,25,138,201,54,38,9,9,25,230,0,33,28,19,116,139,19,144,2,95,74,209,56,132,191,237,54,142,182,49,197,140,160,233,124,225,45,188,231,81,120,79,98,54,71,217,197,44,221,250,10,189,194,255,141,98,202,30,80,180,68,108,69,54,66,108,64,150,52,4,193,187,132,171,145,208,205,118,77,196,22,255,225,26,13,197,229,43,26,190,194,239,197,118,229,215,215,17,123,189,91,175,65,95,88,194,119,207,12,244,184,133,250,248,37,202,62,61,174,83,33,144,127,17,19,61,52,253,86,211,190,215,180,66,192,205,
+211,89,118,235,217,64,187,210,174,12,219,190,64,25,25,179,169,55,197,12,11,253,132,25,126,243,176,37,197,224,16,29,176,222,68,207,239,139,219,255,152,117,232,10,211,59,68,11,158,73,242,181,18,195,218,20,239,70,161,230,118,119,187,166,126,131,176,121,174,149,120,234,243,116,180,248,94,93,164,4,161,85,58,7,130,155,111,140,209,155,21,77,82,179,16,144,234,158,130,83,35,63,218,108,163,132,10,26,2,111,170,228,75,182,196,167,75,234,119,49,239,205,138,32,28,220,99,224,243,29,225,98,132,83,112,194,45,227,104,147,79,71,176,59,91,97,134,48,208,42,191,151,16,182,219,162,13,97,171,40,72,208,96,77,255,32,252,158,112,154,13,13,127,216,0,49,133,243,92,164,116,166,49,241,217,250,1,225,123,76,215,248,22,200,252,142,194,218,29,203,24,190,220,197,192,253,24,221,193,18,48,46,32,87,153,71,242,15,91,69,129,104,75,98,204,162,120,241,227,98,224,71,97,194,10,234,45,158,44,46,10,30,207,43,11,231,251,207,31,45,158,200,252,40,197,22,
+19,6,42,2,243,29,251,57,128,44,223,68,229,162,139,202,243,93,145,53,236,92,108,207,193,142,222,37,25,112,8,30,23,189,11,55,16,121,248,99,18,192,34,6,155,32,22,241,152,33,226,85,20,247,198,172,132,106,176,184,16,166,120,146,109,21,66,230,75,218,76,76,103,14,46,74,242,166,240,244,183,47,38,44,166,4,236,170,153,39,120,120,128,129,213,27,3,137,7,42,215,7,149,115,29,159,115,133,227,157,47,84,19,96,39,237,222,131,6,144,20,150,216,103,67,180,184,100,96,33,16,61,17,170,150,190,232,167,43,72,69,239,234,135,28,221,210,0,254,88,66,177,213,30,138,155,148,237,33,89,147,210,85,57,220,35,0,43,98,111,163,87,63,237,9,68,213,204,155,156,15,111,99,200,224,192,215,244,89,47,129,21,197,195,204,163,48,15,91,96,196,16,229,73,56,79,189,60,243,195,76,74,146,38,190,150,224,29,26,197,210,149,115,21,130,127,253,56,86,194,86,187,163,112,244,26,56,165,167,103,213,120,106,121,234,241,135,239,87,60,164,97,113,213,169,65,
+27,182,50,178,144,62,37,162,230,83,43,51,36,177,85,244,37,163,120,58,134,24,118,201,57,58,19,252,228,215,176,242,32,126,194,149,100,237,41,132,124,37,153,117,20,22,169,165,246,248,4,21,142,122,28,123,96,159,162,66,22,35,90,125,242,54,138,214,74,85,194,18,140,155,197,143,170,120,9,207,158,236,83,99,34,49,97,88,208,32,163,68,174,145,76,11,244,34,207,109,220,41,163,16,10,183,237,46,134,130,147,100,77,10,92,228,181,31,175,14,35,228,175,112,8,53,36,159,14,185,124,23,67,250,204,188,59,117,108,63,138,179,10,144,187,123,144,229,204,67,242,98,166,231,159,42,61,54,234,124,96,150,172,179,230,145,37,203,9,221,64,81,31,243,103,45,245,165,213,14,116,136,110,119,82,208,77,16,208,139,222,139,246,120,159,131,15,237,129,73,130,245,184,252,153,9,152,183,64,252,119,201,166,18,150,234,129,198,220,186,23,202,142,79,177,221,74,244,79,184,205,17,246,160,188,123,124,122,248,44,185,88,66,168,103,74,62,152,227,103,75,208,109,186,87,138,
+167,51,234,126,174,204,222,162,123,193,69,158,159,207,168,251,255,75,130,189,146,192,80,149,4,240,241,79,249,176,181,237,248,115,200,207,101,169,159,109,152,198,193,164,114,176,202,155,117,190,45,89,166,71,163,233,38,232,195,7,0,205,244,28,203,114,158,13,12,205,186,64,98,40,199,47,77,214,51,207,171,222,206,36,241,129,103,134,24,42,104,4,12,20,39,19,217,148,178,106,201,7,247,164,245,41,42,159,242,149,101,144,146,15,42,248,72,113,88,33,54,40,171,148,124,171,138,118,18,197,27,149,204,25,177,167,235,65,188,63,155,214,17,84,58,45,168,138,225,227,112,13,196,218,6,29,197,88,169,101,186,77,167,158,157,248,202,179,78,69,248,172,250,191,8,89,163,214,48,118,28,194,52,100,106,245,64,98,161,27,151,222,174,88,23,170,229,148,83,33,61,135,194,111,232,166,153,175,124,240,56,44,249,74,181,110,124,164,80,78,108,208,161,93,23,158,210,156,83,1,61,82,235,143,31,27,187,69,248,152,68,27,162,8,247,97,196,170,175,232,218,178,134,215,208,128,
+78,88,76,195,187,19,186,184,84,192,231,111,223,196,212,183,233,110,115,244,182,182,173,26,243,124,118,229,171,162,201,43,237,224,249,189,9,215,91,226,227,29,148,2,20,106,95,130,3,94,27,64,137,72,55,120,45,32,135,146,75,92,167,239,85,135,136,50,36,94,109,242,30,38,65,139,175,196,248,110,131,194,221,230,150,247,61,75,94,69,196,80,118,144,56,89,124,149,149,212,24,60,178,169,90,46,31,85,209,51,137,69,18,48,208,24,30,254,214,163,218,218,169,222,4,230,176,167,99,53,236,211,155,139,39,95,240,29,201,62,50,69,207,92,5,71,81,217,230,28,81,112,249,156,125,114,59,125,171,29,115,0,149,125,75,245,222,97,237,99,49,54,223,235,80,83,5,99,120,201,93,163,76,146,114,6,225,243,28,17,148,40,214,238,40,14,5,106,38,28,117,26,208,188,31,184,124,247,150,10,240,105,168,58,143,17,189,223,154,212,91,215,230,206,61,157,118,89,46,228,253,67,30,172,224,251,29,91,137,96,21,133,12,139,246,130,255,92,164,219,74,136,152,255,34,97,
+221,186,195,153,152,202,57,43,16,147,19,236,86,44,251,61,235,0,247,207,125,213,200,116,54,219,189,177,249,130,237,117,6,195,158,10,229,49,231,172,215,1,120,106,223,222,97,242,30,22,57,70,243,166,194,100,62,151,226,207,188,226,69,53,29,249,76,79,158,219,84,167,200,34,229,135,177,255,219,21,225,73,60,230,212,222,147,62,136,159,87,137,3,129,194,237,58,24,210,118,0,220,51,153,85,10,85,37,4,143,44,181,61,34,59,254,20,89,75,113,166,92,29,104,204,97,103,57,216,238,171,68,75,98,235,19,185,30,75,126,107,14,94,208,25,79,182,52,84,132,45,209,63,31,23,179,50,161,167,71,43,222,183,203,208,164,204,66,56,8,32,96,193,14,252,173,21,3,184,114,230,101,107,178,95,208,53,60,123,201,228,201,42,122,39,174,27,19,89,54,121,174,178,171,230,186,185,176,227,114,153,212,158,66,42,227,121,171,76,87,32,56,249,97,37,126,89,40,91,221,195,192,250,45,133,87,213,141,106,247,39,52,145,97,231,61,124,20,30,163,7,119,172,161,210,187,
+246,244,57,196,175,212,47,137,122,57,100,95,111,228,60,171,184,36,127,105,84,117,209,89,214,65,119,162,213,236,151,233,241,95,131,107,230,71,133,199,121,103,41,250,116,7,205,78,41,207,238,163,85,243,161,94,123,17,250,139,65,122,124,170,114,211,114,254,188,193,198,186,179,10,145,173,36,11,170,39,176,50,93,168,180,180,82,121,154,72,43,6,174,164,187,186,178,8,21,120,8,140,64,96,44,142,89,250,1,242,107,6,72,243,65,73,77,251,253,95,90,255,90,1,160,227,55,162,121,127,224,239,226,152,167,253,99,116,238,142,181,135,63,196,199,18,113,171,150,42,238,238,83,183,209,25,191,16,23,19,21,25,15,137,246,189,49,24,214,62,63,3,38,157,121,160,109,173,148,10,14,93,123,142,103,209,93,3,166,47,133,107,25,71,188,28,46,239,113,77,250,100,161,217,255,0,141,229,20,200,
+
diff --git a/uppsrc/CtrlLib/src.tpp/WithDropChoice$en-us.tpp b/uppsrc/CtrlLib/src.tpp/WithDropChoice$en-us.tpp
new file mode 100644
index 000000000..245ab0ed3
--- /dev/null
+++ b/uppsrc/CtrlLib/src.tpp/WithDropChoice$en-us.tpp
@@ -0,0 +1,13 @@
+TITLE("WithDropChoice")
+COMPRESSED
+120,156,205,88,251,83,19,251,21,255,87,190,163,247,50,193,70,186,187,73,72,8,109,71,71,251,184,115,239,220,206,212,219,222,31,152,96,150,205,6,118,220,100,211,236,6,75,59,117,64,65,16,16,24,161,162,87,81,34,32,168,40,79,17,184,42,2,87,16,180,136,128,60,148,43,143,139,242,84,196,170,188,165,103,55,97,9,16,20,40,211,86,103,242,37,223,253,158,215,231,156,239,231,156,77,16,129,62,251,12,83,98,219,177,79,252,211,239,165,205,164,131,21,12,65,140,90,173,11,36,9,77,224,129,47,127,31,16,184,99,151,194,95,237,43,106,193,65,139,74,139,171,116,26,21,174,38,252,225,3,87,225,132,134,80,169,113,29,17,160,214,169,84,58,76,79,177,36,207,27,130,88,66,167,11,20,133,8,37,177,157,208,106,8,92,171,214,169,117,184,74,171,35,64,150,192,48,2,211,18,26,92,173,210,17,26,189,137,230,41,67,16,169,83,5,238,248,131,63,8,169,68,75,160,28,195,253,9,181,86,77,96,42,140,80,131,41,92,167,83,227,90,141,78,21,224,
+239,175,167,72,155,192,112,86,183,45,6,199,9,60,48,4,215,6,130,207,135,14,29,242,195,213,152,203,3,53,40,195,49,53,184,138,195,30,166,38,180,184,38,0,11,208,232,112,29,166,2,229,26,45,166,209,219,72,59,105,89,59,116,205,39,67,215,98,122,70,160,65,197,142,159,225,184,22,68,252,149,254,219,113,181,22,2,213,169,212,26,157,22,3,227,4,65,168,84,4,174,34,2,2,8,141,191,70,171,15,163,73,19,109,55,4,253,109,255,223,63,255,245,215,59,255,184,15,5,241,120,224,151,122,35,252,255,150,17,194,246,218,57,219,158,48,142,161,104,113,71,194,86,143,130,62,199,176,157,24,134,192,156,141,37,5,122,255,47,12,238,173,93,10,204,15,243,35,52,26,95,228,206,131,251,232,126,249,132,10,125,35,239,254,202,224,99,248,180,61,16,249,132,122,9,38,15,27,24,90,174,107,197,57,253,126,47,254,218,28,33,44,67,173,161,17,124,22,61,37,2,145,123,217,181,139,177,144,161,180,30,87,105,48,31,149,10,63,124,164,51,242,122,100,100,228,
+145,251,11,240,25,57,85,112,246,229,217,162,166,167,119,234,78,69,254,171,241,102,125,207,63,157,201,205,206,209,43,117,241,71,143,94,203,44,126,158,215,252,188,186,38,63,35,175,49,42,46,190,186,230,234,133,154,200,184,199,143,47,37,21,93,159,143,190,151,19,83,150,53,155,88,155,214,113,235,251,220,193,91,245,239,155,134,102,223,30,31,44,43,74,205,156,239,126,62,147,121,113,97,250,82,114,220,213,184,218,243,183,231,18,58,91,139,235,146,106,35,79,56,75,107,243,14,39,159,47,56,147,48,222,52,150,86,82,91,121,43,186,63,229,78,211,236,194,5,233,91,116,127,79,74,229,220,149,158,178,39,133,147,157,103,138,115,198,143,45,92,142,109,123,252,114,190,120,240,81,113,237,212,135,233,139,241,67,11,67,115,113,109,73,85,151,70,199,222,180,215,37,214,100,188,72,200,184,221,251,106,230,251,155,167,167,134,38,74,122,135,158,86,21,247,197,54,14,12,100,244,60,190,56,145,125,115,248,214,240,155,169,212,239,74,207,167,116,215,143,140,116,47,116,199,157,
+232,190,83,125,109,238,195,192,137,201,216,153,247,177,113,209,137,29,167,11,26,238,205,148,94,200,63,219,146,94,156,62,119,246,84,76,238,216,201,228,7,133,207,202,10,114,251,230,22,242,74,146,142,205,220,238,205,75,78,153,105,173,110,202,41,31,127,93,63,144,118,183,167,176,102,161,231,242,213,216,218,236,244,202,202,146,202,233,252,210,150,142,225,27,163,63,150,63,138,110,156,104,104,31,188,255,224,126,225,119,151,70,83,71,167,39,239,30,107,174,186,88,222,55,158,92,95,144,95,149,118,60,59,230,232,243,202,177,156,236,187,151,251,198,154,167,242,22,30,70,245,151,143,70,21,206,246,101,101,212,76,228,116,191,27,154,46,107,113,118,167,197,158,191,17,117,249,68,87,155,179,191,97,36,163,125,46,178,177,190,179,239,65,234,208,201,254,225,22,103,101,111,70,103,210,63,38,83,91,23,238,87,79,101,94,63,155,220,154,120,242,94,209,169,198,202,31,158,165,167,13,220,76,157,175,58,222,154,52,151,245,236,245,216,145,30,103,113,235,149,51,15,106,251,79,53,
+54,188,26,191,241,118,122,170,240,221,204,243,172,152,236,161,174,190,185,27,241,29,15,203,19,134,178,178,111,180,150,61,25,122,117,237,126,124,229,143,5,47,123,156,183,167,18,139,146,146,227,202,26,223,68,37,36,188,107,120,84,119,119,246,116,102,73,98,236,196,145,15,111,227,186,210,6,94,12,230,191,232,56,153,254,228,233,153,230,226,235,37,5,63,181,165,61,29,24,41,56,87,53,61,223,56,50,56,31,159,52,88,119,252,106,107,98,122,230,197,225,174,46,103,191,19,28,78,236,109,137,29,174,170,62,234,76,201,168,140,78,207,172,205,124,29,37,173,239,95,71,21,101,180,151,167,54,101,196,199,78,164,116,71,54,38,85,199,12,193,90,12,107,103,110,100,66,91,225,185,195,9,205,206,242,236,59,45,177,145,57,89,147,85,121,67,25,99,227,47,203,134,59,218,207,128,107,211,213,21,93,21,231,139,38,223,13,207,182,166,205,55,205,190,126,213,123,165,162,226,90,238,213,169,252,130,134,210,184,138,43,233,61,5,185,167,166,234,139,227,219,26,143,181,140,140,
+206,78,213,214,53,253,208,253,120,188,180,167,125,44,166,254,77,78,245,165,182,163,15,42,142,23,157,139,251,105,225,97,95,193,196,225,193,23,149,203,111,208,55,97,12,47,51,136,235,58,35,210,100,130,15,196,50,188,128,56,51,162,164,203,203,43,209,65,184,205,200,4,215,25,153,184,131,86,20,226,16,4,206,138,64,146,162,77,136,20,144,157,9,13,19,16,207,152,104,81,76,8,163,145,25,216,148,86,34,129,67,164,53,2,228,77,161,180,224,82,3,118,56,138,1,155,38,20,78,178,14,26,145,20,216,224,153,16,150,70,225,12,137,246,209,194,94,82,32,127,254,91,215,138,24,171,64,219,205,96,201,207,195,127,204,181,104,214,100,174,111,195,104,171,184,163,7,46,114,115,72,176,184,191,135,100,217,16,146,58,16,236,34,152,197,175,107,209,206,162,26,131,39,104,148,91,8,193,223,140,53,156,59,0,161,28,132,131,82,224,18,74,110,128,224,185,205,193,135,193,99,69,8,109,230,236,180,7,134,18,198,164,205,70,147,118,222,215,15,237,97,25,218,42,32,138,
+3,8,41,210,138,28,60,141,24,65,196,143,178,211,98,130,56,59,34,89,64,66,50,34,10,251,173,27,135,125,52,75,83,194,22,32,225,82,180,38,22,226,223,98,61,152,69,55,33,0,59,226,37,1,113,15,192,128,90,131,178,224,44,18,8,198,157,30,40,88,77,16,21,40,112,213,195,65,146,23,139,132,9,181,130,32,0,32,6,28,66,2,30,174,42,90,95,220,123,88,0,246,43,208,110,84,24,125,245,94,250,87,56,199,152,188,116,71,12,201,146,242,83,133,239,98,200,210,51,94,206,179,71,16,235,243,106,183,201,228,242,137,226,172,176,192,206,159,196,144,141,62,27,244,209,173,103,201,67,111,253,95,52,177,90,58,88,182,26,140,164,69,62,98,244,241,28,18,76,112,247,228,71,50,0,187,69,130,112,239,238,88,60,181,152,164,77,65,178,143,182,51,36,203,252,149,118,39,75,220,18,160,228,45,27,6,101,153,166,213,208,4,47,169,14,70,174,117,141,208,249,213,113,203,186,189,38,95,196,90,128,235,187,238,34,248,29,8,113,246,8,163,2,200,109,227,
+169,119,75,127,52,251,160,216,235,236,103,33,255,178,180,111,252,165,231,35,156,88,29,183,116,199,45,180,16,198,153,128,202,4,87,244,174,107,186,120,51,233,80,198,42,178,254,202,236,163,47,204,238,147,160,130,100,1,111,83,4,184,37,243,151,82,228,55,120,100,167,45,92,56,220,116,51,99,7,36,21,146,8,239,121,16,145,64,156,14,43,243,103,7,237,43,105,133,7,118,73,171,69,164,84,33,12,200,197,163,36,197,8,37,178,225,151,91,147,84,137,45,207,206,88,44,180,201,111,89,108,34,147,155,104,146,117,241,120,4,231,0,22,178,74,244,123,128,166,109,146,150,48,23,234,98,168,54,59,29,206,112,14,55,97,241,235,75,187,248,205,198,88,67,141,138,16,142,99,61,178,30,188,250,124,240,26,243,243,178,66,197,208,162,202,143,86,130,104,205,107,41,132,44,43,4,193,14,240,46,166,253,11,171,139,144,45,208,142,148,43,91,90,56,35,53,107,232,89,0,124,8,45,50,189,139,167,97,150,224,236,164,157,97,35,220,73,245,126,87,72,27,25,194,176,140,
+16,225,135,220,111,156,162,86,206,186,62,24,191,230,150,128,220,18,16,151,20,122,33,252,125,48,197,64,51,146,145,86,152,73,150,135,50,220,128,171,191,225,40,7,191,165,190,74,26,189,56,11,87,195,227,128,116,237,40,129,9,135,12,154,23,55,172,156,128,92,215,13,18,230,209,84,93,117,239,117,118,89,150,37,144,146,19,43,41,93,39,229,193,156,99,53,73,57,147,59,31,80,176,184,225,99,84,26,183,109,9,56,178,145,77,183,69,151,75,82,119,240,84,179,86,119,16,175,141,113,155,18,25,183,201,41,64,158,76,196,27,214,55,171,138,19,47,108,124,197,88,105,126,101,75,216,60,28,158,90,55,213,42,172,222,218,160,187,5,0,201,50,22,135,5,133,209,210,228,191,154,254,165,201,159,162,56,11,80,136,56,190,122,192,98,53,192,9,112,10,41,120,202,206,137,227,163,125,113,16,70,140,87,118,135,15,97,157,119,78,140,154,225,225,205,196,221,92,149,114,189,45,110,251,108,25,186,46,133,155,194,150,145,119,149,104,131,69,234,54,27,140,86,218,95,49,
+191,125,36,123,110,73,137,3,220,252,45,191,225,121,230,80,26,217,61,50,199,24,54,158,132,255,45,254,255,31,64,42,97,124,97,225,29,87,2,212,184,147,183,209,20,99,102,40,89,156,89,122,225,89,55,192,226,189,222,179,106,130,252,143,0,117,169,220,84,61,179,84,196,71,96,18,175,187,119,170,48,185,16,216,146,178,82,110,37,115,254,183,107,203,43,13,108,12,109,247,168,178,228,189,194,228,235,39,167,85,1,66,235,228,208,221,236,65,50,130,23,247,182,112,86,93,82,186,245,211,170,89,30,116,188,143,170,136,14,135,233,198,213,91,228,247,0,152,86,133,8,164,160,86,252,240,98,102,88,86,124,51,113,240,48,2,200,191,255,200,191,115,200,16,26,254,13,48,19,15,125,
+
diff --git a/uppsrc/CtrlLib/src.tpp/all.i b/uppsrc/CtrlLib/src.tpp/all.i
new file mode 100644
index 000000000..b31fc946b
--- /dev/null
+++ b/uppsrc/CtrlLib/src.tpp/all.i
@@ -0,0 +1,144 @@
+TOPIC("ColorPopUp$en-us")
+#include "ColorPopUp$en-us.tpp"
+END_TOPIC
+
+TOPIC("Switch$en-us")
+#include "Switch$en-us.tpp"
+END_TOPIC
+
+TOPIC("LabelBase$en-us")
+#include "LabelBase$en-us.tpp"
+END_TOPIC
+
+TOPIC("Pusher$en-us")
+#include "Pusher$en-us.tpp"
+END_TOPIC
+
+TOPIC("Button$en-us")
+#include "Button$en-us.tpp"
+END_TOPIC
+
+TOPIC("Option$en-us")
+#include "Option$en-us.tpp"
+END_TOPIC
+
+TOPIC("DataPusher$en-us")
+#include "DataPusher$en-us.tpp"
+END_TOPIC
+
+TOPIC("HeaderCtrl$en-us")
+#include "HeaderCtrl$en-us.tpp"
+END_TOPIC
+
+TOPIC("index$en-us")
+#include "index$en-us.tpp"
+END_TOPIC
+
+TOPIC("StatusBar$en-us")
+#include "StatusBar$en-us.tpp"
+END_TOPIC
+
+TOPIC("ArrayCtrl$en-us")
+#include "ArrayCtrl$en-us.tpp"
+END_TOPIC
+
+TOPIC("ButtonOption$en-us")
+#include "ButtonOption$en-us.tpp"
+END_TOPIC
+
+TOPIC("TabCtrl$en-us")
+#include "TabCtrl$en-us.tpp"
+END_TOPIC
+
+TOPIC("TabDlg$en-us")
+#include "TabDlg$en-us.tpp"
+END_TOPIC
+
+TOPIC("EditField$en-us")
+#include "EditField$en-us.tpp"
+END_TOPIC
+
+TOPIC("ValueEditors$en-us")
+#include "ValueEditors$en-us.tpp"
+END_TOPIC
+
+TOPIC("Splitter$en-us")
+#include "Splitter$en-us.tpp"
+END_TOPIC
+
+TOPIC("Slider$en-us")
+#include "Slider$en-us.tpp"
+END_TOPIC
+
+TOPIC("ProgressInd$en-us")
+#include "ProgressInd$en-us.tpp"
+END_TOPIC
+
+TOPIC("Progress$en-us")
+#include "Progress$en-us.tpp"
+END_TOPIC
+
+TOPIC("TextCtrl$en-us")
+#include "TextCtrl$en-us.tpp"
+END_TOPIC
+
+TOPIC("DocEdit$en-us")
+#include "DocEdit$en-us.tpp"
+END_TOPIC
+
+TOPIC("SplitterFrame$en-us")
+#include "SplitterFrame$en-us.tpp"
+END_TOPIC
+
+TOPIC("LineEdit$en-us")
+#include "LineEdit$en-us.tpp"
+END_TOPIC
+
+TOPIC("DropList$en-us")
+#include "DropList$en-us.tpp"
+END_TOPIC
+
+TOPIC("WithDropChoice$en-us")
+#include "WithDropChoice$en-us.tpp"
+END_TOPIC
+
+TOPIC("ColumnList$en-us")
+#include "ColumnList$en-us.tpp"
+END_TOPIC
+
+TOPIC("FileList$en-us")
+#include "FileList$en-us.tpp"
+END_TOPIC
+
+TOPIC("FileSel$en-us")
+#include "FileSel$en-us.tpp"
+END_TOPIC
+
+TOPIC("Bar$en-us")
+#include "Bar$en-us.tpp"
+END_TOPIC
+
+TOPIC("BarCtrl$en-us")
+#include "BarCtrl$en-us.tpp"
+END_TOPIC
+
+TOPIC("MenuBar$en-us")
+#include "MenuBar$en-us.tpp"
+END_TOPIC
+
+TOPIC("ToolBar$en-us")
+#include "ToolBar$en-us.tpp"
+END_TOPIC
+
+TOPIC("TreeCtrl$en-us")
+#include "TreeCtrl$en-us.tpp"
+END_TOPIC
+
+TOPIC("OptionTree$en-us")
+#include "OptionTree$en-us.tpp"
+END_TOPIC
+
+TOPIC("Static$en-us")
+#include "Static$en-us.tpp"
+END_TOPIC
+
diff --git a/uppsrc/CtrlLib/src.tpp/index$en-us.tpp b/uppsrc/CtrlLib/src.tpp/index$en-us.tpp
new file mode 100644
index 000000000..42de400fd
--- /dev/null
+++ b/uppsrc/CtrlLib/src.tpp/index$en-us.tpp
@@ -0,0 +1,821 @@
+TITLE("CtrlLib widgets")
+COMPRESSED
+120,156,188,185,103,115,179,89,154,30,246,87,222,42,217,91,146,188,82,245,251,118,247,116,79,79,169,106,37,217,31,92,14,114,89,150,253,97,106,101,245,206,180,118,187,220,187,61,53,221,35,91,165,178,10,36,64,228,64,16,68,36,2,145,137,12,34,103,16,25,68,38,34,145,137,156,136,156,179,31,188,220,145,118,71,218,90,75,91,54,63,60,231,57,233,62,231,122,174,251,190,206,125,192,159,127,120,247,95,252,23,159,252,254,39,127,235,147,191,230,239,171,255,250,155,127,249,245,111,190,251,241,15,127,254,237,103,159,125,249,179,175,63,124,254,179,255,227,191,251,39,63,253,217,223,253,131,191,253,147,207,254,206,201,202,123,192,202,167,95,188,255,244,203,207,63,125,255,217,135,159,0,143,247,159,190,255,240,249,135,79,63,123,255,229,135,159,126,246,229,167,159,126,249,201,87,191,248,238,235,31,126,248,195,159,127,247,225,203,47,127,118,154,244,1,152,244,225,139,207,63,188,255,226,179,47,63,251,242,253,167,95,124,249,1,152,251,225,147,79,62,124,242,197,135,207,
+223,127,246,233,151,31,62,255,234,151,223,252,240,139,63,252,249,215,95,126,250,179,191,251,63,255,4,152,244,233,105,37,192,248,39,239,127,242,225,179,47,62,251,240,201,167,159,124,248,12,88,234,253,151,95,126,246,254,139,207,191,252,244,167,63,249,201,87,191,248,250,87,63,126,251,253,159,253,249,90,223,190,127,255,225,253,207,254,232,253,23,63,3,246,252,111,255,237,191,253,251,239,63,251,228,109,7,159,1,198,222,127,242,25,176,213,247,64,219,39,159,125,248,226,253,231,63,253,228,167,159,127,249,254,203,79,62,5,140,127,254,197,39,159,127,245,171,175,127,253,245,159,254,213,208,63,255,107,161,127,241,201,87,223,254,248,13,96,226,239,254,87,239,223,127,1,76,249,201,239,255,228,111,189,255,236,11,0,232,151,159,126,246,249,151,95,124,2,44,254,225,195,135,79,63,253,240,254,211,15,63,253,233,135,207,127,242,249,23,95,253,201,55,95,255,242,155,95,255,225,207,255,205,255,254,127,255,151,255,205,255,248,247,254,217,63,125,247,243,31,62,253,217,187,127,248,
+221,175,254,228,235,63,250,230,199,111,127,241,245,119,239,190,251,246,135,31,223,125,255,47,223,253,227,31,127,253,221,127,255,237,31,189,251,63,191,253,229,31,127,243,227,15,191,247,135,63,127,247,111,254,13,240,89,126,242,213,167,192,71,250,234,51,96,15,255,252,15,254,246,135,79,62,251,59,128,145,79,126,246,238,127,251,56,238,221,27,33,95,125,245,15,62,182,254,131,119,255,235,183,63,252,6,176,250,245,175,126,245,13,128,249,207,126,241,13,208,247,207,223,102,252,211,63,249,254,215,63,190,59,145,241,235,111,223,190,237,87,95,253,193,135,183,190,127,248,235,95,127,253,175,79,91,248,11,166,254,224,15,190,253,211,175,255,248,155,175,128,79,255,225,247,62,251,236,3,8,44,60,155,131,64,32,48,234,8,60,65,43,59,189,207,136,98,11,110,236,165,183,69,140,49,185,16,97,9,196,133,97,11,143,83,208,168,130,1,141,225,32,163,187,112,121,116,242,252,151,8,120,64,197,14,239,138,28,37,7,113,227,9,55,101,151,30,184,225,226,162,41,157,135,50,203,
+27,179,120,107,10,202,143,247,172,128,100,40,43,170,81,123,227,49,111,85,47,208,225,165,165,204,190,132,191,66,206,239,177,171,41,67,137,195,195,221,124,184,163,191,60,63,191,69,210,32,238,200,62,210,191,36,71,142,118,253,21,211,73,45,38,104,132,241,245,237,77,225,57,255,24,173,132,6,225,78,71,111,51,140,58,125,246,210,30,144,10,138,101,70,209,182,143,128,6,163,187,33,223,122,161,54,107,205,194,252,85,171,58,24,6,113,38,59,19,70,38,28,228,195,67,110,152,110,48,157,250,181,125,21,141,63,106,166,181,165,96,107,90,198,228,218,153,160,172,155,117,61,49,250,50,17,94,84,177,34,133,173,31,39,223,47,139,50,125,43,243,10,42,86,51,238,208,98,54,227,65,73,211,199,168,81,215,147,49,42,249,198,43,119,211,62,112,219,184,90,139,60,176,63,250,20,50,251,33,163,134,182,161,247,75,228,214,148,151,107,147,35,104,204,136,178,149,45,102,166,47,155,137,172,181,212,67,116,144,137,93,204,51,55,181,208,235,171,187,143,13,104,44,211,37,207,
+23,243,48,43,27,72,179,42,11,18,185,96,83,197,209,90,213,28,69,18,181,156,176,66,6,227,75,108,209,96,243,62,202,41,166,169,134,48,235,15,25,88,235,11,87,128,227,180,54,55,250,193,227,209,90,183,140,251,252,8,36,171,232,72,219,48,114,188,129,55,58,138,34,17,121,200,152,91,238,47,51,190,203,225,162,105,74,120,34,238,216,226,242,89,181,186,222,103,140,231,172,182,33,186,85,169,195,199,59,106,231,42,146,203,194,239,103,172,226,174,46,173,190,132,243,139,167,212,35,72,110,245,86,215,157,244,179,172,85,90,132,200,250,12,158,143,118,50,30,150,250,235,72,147,146,176,18,32,131,145,59,91,97,93,212,66,25,186,73,145,216,27,34,146,10,179,93,244,7,59,45,178,25,27,28,179,243,129,232,52,212,177,68,30,215,51,239,80,30,162,151,247,222,75,151,64,208,83,89,232,173,120,235,89,188,72,74,25,180,129,244,209,46,188,217,69,138,27,184,222,13,158,162,175,244,209,14,180,76,78,53,82,120,99,49,216,102,10,48,92,9,88,158,213,152,229,
+225,190,194,252,28,128,87,220,68,81,103,106,74,244,162,29,249,144,193,227,238,71,83,147,152,61,193,233,239,195,177,92,245,184,19,63,144,117,66,179,149,179,109,244,204,118,30,119,68,69,94,111,207,216,23,45,253,36,212,137,40,172,179,69,200,104,148,26,110,130,118,179,125,162,176,90,214,236,61,1,114,142,71,49,91,164,98,169,49,26,215,28,83,56,132,67,162,78,219,220,214,218,8,157,163,2,119,112,100,132,151,28,86,15,38,237,157,65,147,76,5,219,119,16,31,245,206,150,177,110,59,233,91,74,105,214,103,33,228,32,6,201,95,218,207,0,23,216,102,75,177,209,170,42,91,114,251,252,50,44,143,235,120,88,165,146,249,210,54,217,26,161,217,139,129,87,91,108,13,15,51,16,161,59,136,146,65,145,187,113,177,53,35,196,16,54,225,34,15,150,58,51,9,55,20,161,111,161,116,179,22,46,98,137,32,72,214,164,34,181,66,94,63,182,77,79,143,68,81,239,178,210,70,217,178,199,0,66,52,163,219,251,90,187,253,184,60,74,192,96,240,118,57,44,216,45,
+169,241,248,254,150,154,151,205,110,194,77,213,90,45,165,66,7,155,232,136,33,92,92,48,92,253,94,187,13,143,105,41,157,46,168,104,105,196,54,155,177,143,16,241,179,243,229,76,55,165,47,241,207,218,43,16,195,7,101,155,23,103,174,49,171,85,54,235,211,175,9,244,181,233,112,142,70,57,91,112,179,209,104,57,155,17,73,228,154,68,188,178,134,246,204,97,156,5,12,222,236,107,100,150,171,120,189,87,104,184,209,139,65,201,186,197,202,209,148,89,148,105,5,207,196,218,219,27,2,49,40,61,120,160,236,109,55,194,45,216,160,1,75,223,198,35,196,140,228,49,104,32,128,197,158,140,67,188,10,173,40,146,203,7,27,36,227,86,183,118,66,209,108,79,205,11,28,109,230,240,66,223,206,69,103,193,171,138,176,45,127,181,210,125,15,100,58,153,236,204,28,53,204,75,200,32,42,3,49,166,36,114,7,0,56,33,200,182,37,67,181,173,98,130,77,46,151,235,118,70,57,246,47,218,35,111,192,150,3,214,173,54,135,83,250,165,115,169,73,141,99,105,161,80,56,240,
+208,103,249,184,9,17,169,44,26,209,52,8,155,225,241,120,13,138,73,162,95,24,231,120,12,131,59,232,36,80,66,16,54,246,216,160,4,129,214,193,232,60,99,40,53,225,49,162,95,204,156,25,130,183,98,80,145,139,144,58,133,196,91,130,0,17,35,194,151,88,156,200,49,134,118,47,218,129,4,132,77,36,208,31,239,86,87,51,28,115,103,133,146,70,3,145,29,182,134,166,232,143,55,224,118,160,192,224,62,206,137,204,192,72,68,119,160,155,32,211,21,123,217,158,164,80,175,37,7,40,98,2,180,5,49,218,106,58,32,19,26,7,65,27,34,183,208,41,200,89,68,124,108,225,162,157,110,122,139,194,82,96,37,172,52,212,5,205,196,136,6,31,65,119,43,34,144,4,85,131,75,234,12,241,14,185,27,244,141,170,25,235,235,110,30,67,155,106,212,209,21,96,138,8,238,227,77,236,17,69,56,31,211,43,36,65,220,94,148,97,160,152,106,200,199,128,200,247,18,249,86,243,208,1,155,58,21,14,118,161,14,57,221,93,161,150,235,80,102,233,179,41,194,229,58,205,
+26,211,111,63,206,146,97,48,208,240,182,193,47,74,8,113,126,237,53,223,83,86,210,112,33,235,245,108,112,65,88,224,4,253,7,97,82,22,114,143,161,89,10,221,207,64,230,158,152,38,105,32,113,169,120,108,95,49,250,49,120,124,13,99,19,11,134,2,21,26,201,101,40,240,26,90,173,196,243,76,215,218,154,32,118,145,45,11,31,113,199,64,76,124,145,143,158,0,37,110,223,0,213,165,33,30,214,211,167,160,17,51,196,190,102,6,241,77,155,192,29,176,68,3,88,227,180,68,225,94,223,182,176,153,188,234,68,197,120,200,220,161,199,31,63,207,5,130,156,100,223,49,212,123,110,188,49,185,220,92,95,155,94,220,40,92,26,199,208,64,148,120,31,181,89,225,92,206,239,186,48,185,95,116,62,251,184,109,153,248,109,219,254,218,94,163,163,232,64,242,190,219,74,211,156,253,249,248,194,214,168,165,156,88,227,62,46,192,177,138,28,156,115,201,161,31,63,60,84,114,75,64,198,30,97,152,206,173,100,140,19,4,135,120,103,169,58,2,56,157,159,72,93,38,89,107,
+151,5,28,225,133,69,180,179,98,0,66,203,220,11,29,84,8,64,111,12,177,156,192,177,234,152,226,246,33,195,73,174,6,23,236,182,251,124,198,87,33,153,12,219,71,191,234,1,126,69,126,162,248,11,189,179,114,142,112,121,187,145,224,43,109,222,5,2,97,33,85,99,99,36,97,168,109,179,197,73,27,66,172,197,35,154,53,51,255,92,99,123,200,109,164,101,33,148,13,124,184,73,174,114,233,212,203,67,73,142,29,38,142,51,58,98,231,40,51,49,36,128,190,228,169,19,238,240,89,68,64,39,76,156,3,129,103,107,217,168,78,81,158,216,87,92,80,188,51,186,211,45,219,220,53,197,68,128,230,237,19,140,255,82,79,122,242,20,200,144,119,139,178,165,153,81,226,219,2,129,147,17,192,134,15,48,210,197,49,248,28,145,159,124,220,183,181,249,43,168,124,220,166,22,84,39,146,41,254,158,159,13,101,8,149,79,168,56,83,220,5,104,46,247,151,254,218,11,195,9,11,201,13,209,64,193,76,180,125,68,5,128,250,136,74,219,118,177,197,205,243,98,245,232,121,193,
+18,8,164,150,160,143,210,250,201,192,24,225,197,27,242,221,105,16,48,6,4,45,94,146,176,51,133,253,112,140,163,167,147,75,88,48,72,81,33,9,235,144,140,119,123,35,13,37,89,192,190,104,253,27,209,125,205,85,237,57,221,98,228,189,161,132,177,166,71,231,122,44,218,37,148,133,242,117,237,37,24,155,160,84,238,60,184,84,163,131,36,95,191,146,155,89,21,218,204,208,40,241,25,39,207,59,67,124,252,14,110,241,77,172,17,77,93,188,170,208,31,123,72,231,114,107,200,15,157,197,115,42,36,99,160,186,83,138,1,2,37,177,71,231,197,71,2,157,106,70,205,53,162,159,109,56,103,166,171,74,219,3,25,181,174,156,90,165,83,69,138,116,163,21,230,89,75,18,255,232,24,109,116,124,207,23,94,209,91,166,75,176,17,36,119,91,83,180,66,234,220,76,190,101,19,176,55,15,153,42,243,58,76,3,97,203,141,152,120,251,252,113,252,125,28,52,163,94,32,12,224,200,75,126,11,232,193,249,71,61,0,155,218,167,160,5,98,214,118,10,90,135,178,211,133,22,
+5,7,143,164,115,185,123,213,55,209,138,3,184,100,252,75,227,170,110,147,91,3,47,82,59,114,234,204,220,69,154,104,39,241,0,8,229,159,196,35,196,59,175,58,131,207,55,179,134,108,176,30,60,241,48,109,30,10,88,51,162,68,17,90,34,80,76,149,36,145,197,51,171,143,124,68,244,143,38,97,38,121,201,131,73,213,249,154,249,47,196,43,239,45,94,219,215,128,79,0,46,161,86,81,67,49,80,39,225,143,234,189,245,136,114,22,255,109,124,10,63,198,231,153,156,189,42,193,60,183,251,244,10,13,235,42,180,47,116,136,100,242,151,116,36,116,10,242,123,66,59,126,181,133,233,219,182,93,113,33,92,59,39,42,238,111,227,216,0,196,177,175,112,139,122,57,231,20,75,170,188,143,49,81,9,78,18,121,56,45,2,172,193,57,137,0,223,239,100,142,162,238,205,165,188,124,232,108,29,233,213,224,201,122,2,7,96,195,159,192,137,92,79,151,230,145,39,192,254,15,117,176,230,80,158,205,248,255,126,60,43,242,146,11,58,232,15,28,128,163,19,69,245,37,53,201,
+4,244,130,127,210,11,16,35,249,91,253,190,221,106,178,7,242,226,10,12,174,161,171,202,22,58,93,28,29,41,183,65,3,74,120,160,55,169,35,193,166,143,213,39,172,19,47,68,75,187,131,146,174,187,156,146,7,210,186,18,107,80,9,153,251,110,107,132,240,129,156,130,220,52,93,129,217,206,169,226,65,120,21,7,222,179,23,216,50,165,17,75,81,58,129,58,150,104,2,96,150,80,195,85,154,9,81,38,136,84,63,240,113,129,6,13,234,190,109,184,64,228,216,179,88,74,214,50,133,181,147,60,154,176,30,19,91,65,132,237,149,82,38,62,90,242,31,35,243,222,223,115,32,139,6,165,248,9,197,20,7,150,168,166,123,21,11,51,175,158,187,103,177,71,34,160,59,151,189,183,192,157,3,221,72,224,192,67,191,153,71,229,222,204,207,224,128,121,246,13,212,110,41,202,227,169,90,93,87,8,111,130,193,71,31,34,210,71,21,78,71,205,11,112,106,172,101,238,91,124,237,90,208,125,114,165,8,90,152,28,26,52,184,168,4,186,24,220,30,171,194,14,88,227,180,101,
+246,201,40,96,19,117,50,26,75,169,83,103,114,76,202,27,242,133,214,215,79,98,237,157,203,17,123,51,196,189,125,51,132,76,245,33,166,227,89,11,6,177,25,255,253,45,231,31,127,255,167,191,250,238,155,255,235,221,143,95,255,209,111,190,251,250,215,127,126,159,250,251,192,128,183,254,127,244,245,175,255,194,29,231,47,205,251,211,239,255,236,221,31,125,253,195,55,111,151,170,119,255,242,251,95,191,251,31,190,249,179,223,0,51,222,125,253,103,191,124,247,191,124,255,253,119,192,251,95,48,245,155,31,127,252,120,139,250,221,27,211,103,159,255,228,247,128,139,44,8,252,8,162,159,46,76,245,183,11,19,140,222,167,56,130,231,79,130,75,223,150,178,191,140,92,57,98,25,248,249,192,161,142,137,130,151,128,178,230,110,241,21,242,157,11,66,241,59,138,104,19,132,225,136,195,21,14,17,5,25,64,178,221,185,106,95,68,107,200,179,202,125,69,161,192,205,239,187,232,107,176,197,118,128,81,245,209,121,238,128,190,157,134,2,17,30,157,195,122,53,49,3,175,238,161,34,
+122,113,118,254,242,180,200,40,148,230,54,135,197,202,209,24,55,132,178,195,61,11,236,38,49,210,93,75,214,12,187,48,219,205,232,220,92,65,249,31,30,57,36,9,218,224,27,10,31,173,251,224,221,217,113,168,107,176,161,77,14,173,60,66,94,92,197,225,118,41,75,38,191,120,50,151,243,58,107,42,86,157,73,81,172,251,11,233,93,223,0,193,61,233,138,96,26,132,134,209,178,216,168,238,62,159,199,219,146,185,190,95,129,191,76,230,100,40,220,35,92,149,12,247,67,56,232,109,122,247,58,122,128,101,115,26,245,139,51,118,221,219,37,141,183,147,62,166,11,145,11,233,240,46,119,56,23,195,174,21,225,27,70,89,56,109,136,33,10,109,247,230,241,108,222,11,37,124,152,245,132,120,190,205,73,178,21,208,70,27,22,17,12,204,201,237,29,219,106,185,161,199,44,58,98,31,77,185,76,138,189,107,4,88,156,17,116,109,212,30,26,115,78,123,58,28,94,56,7,133,232,70,174,82,135,134,236,59,34,75,132,226,220,222,17,7,106,52,80,52,84,122,78,167,29,196,
+76,25,201,193,227,85,134,3,202,141,166,162,59,178,54,52,163,228,87,227,210,229,225,193,81,87,163,163,121,25,17,110,34,186,12,205,116,104,217,206,204,64,224,131,163,231,104,232,193,22,197,165,170,83,89,37,68,56,237,108,80,43,15,167,27,200,254,92,72,78,73,215,229,45,40,66,7,29,88,101,176,18,77,66,14,186,90,55,228,204,110,188,227,44,254,189,139,253,163,175,127,248,246,23,239,254,232,163,215,252,174,23,253,147,223,222,200,127,215,151,62,124,248,252,247,222,127,0,124,137,7,186,62,249,210,235,155,47,41,232,69,98,48,224,122,16,92,67,167,20,27,92,162,114,140,136,16,7,227,246,222,48,225,194,77,162,219,137,28,57,112,243,116,247,184,27,55,255,124,112,237,184,34,35,175,46,60,61,94,234,150,200,110,223,148,164,196,101,30,153,77,178,176,151,88,87,83,117,207,151,100,96,172,10,143,126,180,181,141,176,73,188,189,203,135,231,49,171,105,38,221,122,235,189,213,139,75,86,175,223,2,161,247,12,191,56,167,116,111,2,139,25,206,174,215,46,
+97,34,117,107,53,123,169,155,94,155,22,130,130,76,146,186,207,105,98,185,223,164,25,162,136,213,78,127,57,152,31,253,152,51,252,196,110,109,82,55,65,153,0,195,160,242,233,137,39,66,115,176,218,52,24,217,54,61,137,236,89,206,174,179,253,236,140,238,146,7,164,160,71,145,5,15,226,162,106,236,82,50,90,223,218,4,157,195,234,74,133,70,171,168,23,68,82,199,142,178,179,142,110,222,188,94,201,194,47,19,90,197,118,199,140,77,170,13,82,11,33,12,150,33,136,123,155,189,244,56,203,79,144,207,76,69,175,63,231,82,221,85,100,27,87,247,63,230,105,222,205,70,138,195,243,238,105,124,104,247,144,238,219,66,195,51,159,155,146,37,198,207,58,207,244,199,235,169,217,143,212,184,250,67,235,12,181,214,158,241,230,158,64,189,162,234,20,10,229,187,6,109,90,176,160,202,216,251,133,160,149,78,158,19,95,42,9,163,23,62,137,44,147,1,124,103,147,25,158,103,149,73,66,90,215,215,10,102,131,176,42,230,28,113,69,197,11,60,228,17,228,69,128,156,30,16,
+70,160,186,156,135,93,42,16,172,203,115,200,92,30,208,61,234,190,171,188,15,122,232,104,3,66,92,109,215,54,163,10,169,154,160,15,211,78,41,126,87,184,84,107,170,108,57,140,58,59,118,211,87,24,42,117,184,57,59,214,207,142,251,191,240,11,206,183,39,109,123,247,225,95,252,189,31,126,252,250,199,111,62,254,102,244,238,95,252,189,119,63,124,251,167,223,158,180,238,199,239,223,189,249,209,239,159,188,12,144,190,31,255,228,221,191,250,221,31,132,78,63,54,253,163,223,241,193,127,252,253,119,223,255,250,175,148,179,247,159,127,242,123,239,63,253,2,4,166,128,72,39,23,236,190,185,160,149,190,157,78,188,55,236,167,11,10,133,114,87,245,163,184,155,206,245,141,135,8,153,222,66,31,46,249,222,238,147,135,110,96,251,209,236,51,21,44,172,200,122,171,64,189,94,244,131,176,73,238,37,23,65,192,95,118,176,7,23,92,143,12,146,133,254,9,205,65,124,112,211,60,158,233,45,8,226,212,114,225,132,51,16,58,198,117,188,252,69,129,6,246,248,238,95,125,253,
+221,111,190,249,40,199,63,124,243,221,55,191,56,129,125,247,155,31,190,253,179,63,126,235,255,159,190,255,213,63,251,213,239,191,251,225,55,191,250,213,247,191,254,241,135,119,191,252,246,135,95,125,247,245,191,62,245,255,226,227,252,183,177,255,237,9,215,239,192,255,43,126,253,250,244,19,0,252,231,159,128,192,74,16,229,4,190,253,151,192,63,65,220,112,89,246,126,250,114,124,58,30,143,79,5,87,91,57,2,181,65,210,193,211,218,254,0,194,109,219,20,150,193,109,104,217,25,137,167,187,173,183,168,238,22,153,79,75,180,169,149,60,183,38,39,184,226,217,193,184,68,195,31,186,204,51,82,135,236,196,211,182,208,130,184,126,233,120,128,250,87,49,7,8,91,162,84,254,223,227,255,211,239,127,9,240,252,203,111,191,254,238,251,63,254,29,104,31,191,202,127,4,219,79,222,127,249,123,95,124,249,19,64,91,206,38,103,0,54,236,225,207,181,229,181,216,154,94,47,183,204,225,158,89,136,14,248,83,88,33,117,208,109,23,11,189,37,213,27,63,223,77,161,91,47,243,
+230,94,134,38,160,29,36,47,196,65,80,195,33,28,56,228,133,7,185,58,247,64,146,207,126,167,81,66,156,70,18,34,226,20,91,220,139,180,4,147,120,58,136,246,153,205,200,184,163,211,22,118,214,199,30,117,115,232,74,139,121,245,2,182,137,75,150,115,26,13,218,23,183,50,45,226,181,103,207,144,228,117,253,252,242,72,24,204,218,177,245,150,121,117,116,214,135,178,189,94,114,35,188,59,86,253,52,143,161,31,182,235,116,24,44,133,97,58,38,166,200,158,239,216,63,98,30,158,142,27,13,94,139,204,209,44,9,205,2,188,84,188,172,216,190,163,39,34,234,194,146,235,97,159,56,59,236,104,132,43,45,114,227,168,43,48,28,157,192,222,179,30,235,203,99,221,119,172,184,97,55,42,239,147,29,110,149,62,37,211,179,214,65,174,155,8,99,162,71,26,211,99,85,217,95,166,254,225,178,108,6,44,79,236,42,59,81,59,60,178,23,89,238,93,120,219,59,190,236,250,137,70,29,195,121,61,92,238,173,120,100,206,69,3,54,215,15,43,230,58,47,12,203,176,87,180,
+235,68,250,14,185,217,58,102,224,222,81,158,202,101,18,204,69,105,160,87,191,64,21,147,163,52,151,136,50,23,175,91,123,165,175,72,181,96,184,148,170,95,204,75,114,245,28,82,191,181,138,89,199,221,69,62,82,122,194,45,135,165,246,108,239,185,41,30,37,185,204,235,134,80,78,9,50,25,214,14,121,176,28,231,129,60,158,53,204,150,154,109,86,217,30,196,173,158,150,81,220,58,51,203,148,69,146,85,227,52,161,149,175,111,202,70,192,51,153,199,128,58,27,61,98,196,174,180,159,150,229,22,122,117,140,20,175,85,65,189,31,171,61,249,91,213,11,126,171,214,51,111,213,180,227,173,138,89,74,247,220,236,118,202,180,73,114,0,2,233,246,184,49,251,52,194,125,26,252,218,217,118,239,186,189,59,78,239,90,171,125,218,10,252,185,196,161,183,56,170,173,218,75,197,196,160,179,14,15,15,199,253,218,197,122,158,238,114,214,13,104,170,239,193,122,204,204,144,159,186,48,22,237,219,241,125,121,185,26,23,150,165,227,62,82,216,111,172,91,236,217,113,217,242,193,122,
+118,102,244,200,90,102,207,51,121,33,242,184,187,139,71,129,206,21,158,153,97,13,195,187,227,224,162,196,164,71,89,172,253,235,191,195,193,4,112,228,142,198,122,244,84,235,215,49,230,83,99,115,142,123,190,61,13,232,79,7,187,190,133,11,64,127,121,131,35,213,126,68,231,167,41,223,170,107,227,28,244,209,144,245,99,235,118,252,178,29,116,162,219,156,26,60,252,143,226,179,11,117,139,227,102,92,96,29,123,199,105,213,48,60,14,195,168,154,237,24,68,41,128,39,134,236,219,247,142,70,224,121,196,76,78,79,47,170,166,176,217,155,158,113,25,134,222,2,104,159,74,244,212,114,175,2,186,88,168,22,208,154,89,143,91,133,101,191,68,95,238,27,74,160,213,62,244,68,198,101,148,213,80,199,244,222,104,248,15,246,61,122,171,226,105,111,213,172,225,173,170,197,188,85,255,221,119,57,120,211,186,18,141,220,202,108,125,28,107,191,51,60,134,153,54,33,148,163,115,10,0,119,207,19,172,121,24,207,218,215,55,143,187,90,79,97,141,48,183,237,90,255,200,176,46,173,
+246,104,239,213,56,220,151,174,90,209,61,107,111,218,238,7,219,193,169,165,179,45,1,45,81,203,18,24,203,84,168,91,56,99,75,217,92,91,233,158,180,197,94,194,246,152,243,168,16,166,141,102,80,101,23,173,181,127,168,132,25,211,67,13,24,96,55,76,159,167,101,251,194,164,133,253,167,237,255,175,240,207,124,105,24,14,78,247,181,39,32,126,52,203,102,180,252,144,112,1,112,178,220,225,157,12,81,114,197,153,214,69,94,93,174,171,241,2,214,162,192,234,153,113,213,237,96,203,2,222,215,203,131,13,128,193,13,236,129,253,76,247,207,135,105,121,185,86,182,108,179,214,14,104,112,193,186,214,168,21,0,208,99,85,128,93,207,39,207,79,211,157,205,40,93,219,174,75,244,180,101,8,195,166,123,204,229,13,48,192,190,165,186,104,219,131,118,196,194,254,77,112,252,187,56,59,126,100,105,235,155,127,100,41,204,44,127,100,73,160,26,125,100,9,198,211,157,88,178,63,182,6,92,199,171,209,158,94,12,94,22,133,165,205,241,90,6,72,58,207,78,203,22,31,76,221,
+178,181,160,81,224,57,68,53,163,166,125,20,2,188,250,220,202,45,115,11,240,178,205,184,42,225,105,175,225,3,96,237,38,207,83,241,206,106,144,174,75,56,228,9,150,30,219,3,96,169,97,218,229,158,214,115,208,255,38,56,126,171,23,13,105,223,170,85,68,151,107,156,103,155,75,148,110,64,214,125,20,3,8,35,182,126,18,222,13,46,249,184,205,13,195,7,66,49,234,53,156,0,193,23,242,19,67,114,39,240,180,3,175,248,109,251,212,32,231,147,173,203,61,139,108,37,46,173,174,70,116,143,115,203,255,211,240,188,244,10,216,255,156,184,249,93,156,199,183,48,218,246,222,194,40,108,127,11,35,65,229,45,140,96,125,222,27,65,133,22,55,113,194,83,92,116,78,4,37,236,167,40,18,100,167,235,178,239,68,77,203,22,57,17,116,211,156,3,65,20,2,94,17,62,205,71,64,75,230,27,32,92,227,13,80,106,250,6,232,26,247,6,40,253,231,128,180,251,94,130,254,55,143,159,122,16,243,70,208,116,249,70,208,217,205,27,65,244,240,27,65,119,184,55,130,204,
+132,168,247,129,185,173,249,251,176,19,63,202,86,203,182,4,3,111,182,54,16,52,173,115,171,8,96,7,8,28,245,228,5,32,71,217,50,250,222,228,32,93,125,147,131,232,230,77,14,92,195,55,57,152,98,223,228,96,138,62,201,1,20,251,215,250,209,95,167,127,155,83,21,160,166,124,10,30,128,154,195,41,120,0,106,80,167,224,1,168,25,156,130,7,160,198,219,180,103,91,92,75,186,114,82,131,149,212,152,26,238,31,106,225,253,240,25,198,236,13,182,237,81,242,36,7,142,90,152,179,47,127,108,41,64,45,233,194,18,132,51,105,163,214,237,216,194,44,159,228,224,92,27,37,182,8,128,26,148,94,106,225,233,1,4,112,178,187,121,158,90,88,14,154,4,208,2,208,223,0,199,111,121,28,1,218,246,81,218,0,109,59,73,27,4,208,182,147,180,237,0,109,59,73,219,0,208,182,147,180,37,94,143,122,43,78,187,148,248,114,182,48,0,36,53,84,159,138,33,82,127,42,88,214,249,169,136,50,154,199,251,230,201,221,238,123,77,91,75,176,150,26,137,195,123,160,
+103,138,35,166,45,10,152,116,125,96,88,95,194,211,53,164,167,102,42,200,39,36,138,7,128,40,104,218,194,24,2,68,218,142,253,52,237,63,15,199,111,253,49,252,86,205,63,111,122,37,230,144,133,138,46,52,66,171,126,187,177,50,105,64,154,230,167,181,1,77,152,49,175,22,67,77,153,182,23,176,48,210,17,176,73,64,223,114,114,0,156,21,71,182,251,104,219,18,46,88,91,3,160,194,141,251,230,212,214,154,0,35,134,230,173,225,68,16,26,71,6,6,48,11,76,26,32,9,139,99,205,36,97,102,192,167,163,40,115,10,163,19,95,25,212,73,22,62,242,5,6,248,50,168,79,142,231,189,248,79,213,179,223,197,61,199,191,57,158,157,246,230,120,251,254,155,227,145,161,111,142,87,200,191,57,94,248,163,106,115,29,39,119,98,245,182,202,240,9,86,84,137,19,0,69,89,137,211,62,45,247,51,160,88,238,172,122,10,128,196,102,83,156,10,38,34,218,4,136,243,41,113,42,192,255,0,94,254,90,255,203,0,254,247,162,252,207,231,233,183,186,65,233,213,251,61,
+217,122,189,182,157,178,83,230,2,86,122,75,240,98,189,183,4,40,180,125,75,128,178,55,59,93,213,85,11,179,246,247,186,237,232,121,26,45,111,87,64,81,22,110,215,167,194,71,56,53,2,7,44,19,136,181,225,118,183,130,1,5,149,197,236,245,7,31,199,21,194,96,224,144,61,235,49,253,101,5,144,25,218,28,25,90,171,119,1,40,157,14,118,146,135,51,173,57,186,165,2,83,202,227,233,217,255,175,231,171,151,171,0,50,149,163,180,213,63,149,229,109,207,18,57,133,213,178,107,2,72,218,207,122,182,147,215,21,50,235,225,9,86,169,117,63,5,226,10,40,154,25,155,175,103,73,91,150,11,32,156,54,64,12,165,50,168,180,133,21,85,246,154,235,205,153,54,186,13,156,1,110,56,124,9,143,167,7,40,32,47,153,81,9,246,255,5,174,82,173,152,195,29,152,72,206,241,0,221,175,182,25,63,132,230,217,91,1,234,216,141,198,145,15,24,103,62,149,102,153,35,182,231,79,244,236,7,235,237,60,71,182,107,74,71,239,141,117,35,90,22,131,51,187,61,55,
+6,103,122,209,141,130,120,172,70,217,157,215,210,150,143,31,30,100,186,253,222,94,154,117,89,45,59,203,96,111,118,246,195,163,49,55,148,238,65,121,70,48,147,53,171,251,234,66,79,46,76,52,70,6,235,235,130,28,94,76,142,247,218,231,66,83,29,172,207,38,84,140,28,236,224,39,50,230,153,137,156,238,229,115,207,35,81,74,78,12,6,248,73,211,53,146,204,41,12,114,229,229,99,93,32,71,184,249,36,179,155,201,201,228,104,168,74,97,112,126,134,138,46,101,114,135,41,157,46,4,131,114,134,199,147,113,158,247,6,198,136,214,220,163,81,199,144,112,216,40,16,22,9,11,130,252,254,62,211,190,227,245,234,110,173,166,78,211,208,103,227,149,252,112,216,101,134,10,137,208,151,26,166,26,221,215,153,86,239,51,231,114,5,153,76,62,22,8,50,53,174,196,102,44,165,242,61,177,104,12,73,165,140,98,113,161,225,109,200,227,241,204,248,190,37,185,243,167,98,47,129,125,112,218,168,27,84,170,231,2,149,42,215,104,50,125,20,89,94,175,103,166,190,150,28,2,
+201,236,44,117,137,60,66,100,244,145,99,244,204,227,54,56,157,240,2,142,9,20,133,242,114,96,28,20,198,197,168,169,49,89,46,139,214,94,215,180,203,206,15,150,109,111,214,201,140,107,242,154,11,86,132,97,13,139,108,127,186,63,24,123,153,146,60,179,29,154,15,227,28,42,115,220,193,200,233,178,109,38,96,229,194,243,218,210,156,57,142,196,227,164,151,81,122,117,230,101,166,149,25,108,111,123,21,153,205,8,117,102,177,66,128,19,109,220,132,148,86,165,71,32,35,167,153,245,41,242,131,197,124,147,219,246,29,99,90,56,66,120,188,237,104,76,24,168,176,164,24,38,59,244,156,108,138,173,185,68,79,134,148,152,47,140,119,146,119,244,137,200,56,221,23,69,4,99,138,31,23,62,191,94,35,240,244,94,47,2,29,35,215,23,17,91,217,104,234,130,10,217,177,92,97,38,171,200,12,20,42,178,94,11,91,5,250,180,233,53,98,173,125,58,109,18,9,69,12,62,31,163,86,139,48,240,248,214,72,57,29,25,99,70,229,203,235,112,89,91,204,141,219,13,189,232,
+43,70,34,17,224,34,103,87,203,194,217,92,247,21,52,88,232,180,198,27,26,149,62,159,71,114,185,22,115,174,85,171,226,217,167,251,138,84,50,37,93,27,240,198,66,171,194,86,219,237,101,234,77,47,20,89,172,154,77,83,34,193,16,249,68,145,235,235,86,252,202,69,112,141,5,60,3,235,213,54,247,122,77,92,174,135,17,101,26,184,28,58,186,82,137,196,98,173,81,71,169,86,198,214,45,236,118,218,12,183,230,189,72,88,146,97,144,229,198,40,145,181,100,218,250,150,197,62,180,94,41,167,61,69,139,177,93,24,237,199,194,222,216,35,79,247,75,70,212,190,186,72,72,122,100,187,181,195,202,231,150,250,93,156,86,242,59,243,107,197,115,196,163,8,142,15,116,190,77,234,193,66,119,199,36,154,209,127,78,93,148,138,214,231,20,174,8,150,61,107,207,25,181,85,187,112,101,22,140,43,244,18,179,252,160,32,43,247,68,250,16,85,152,237,245,185,214,214,161,232,69,134,17,22,75,213,84,102,233,105,181,196,85,29,83,194,88,48,225,177,162,49,161,161,12,88,
+105,24,3,152,49,202,106,53,23,251,201,64,76,118,97,241,78,236,142,71,159,24,107,251,34,59,69,48,242,226,48,119,213,121,137,0,152,193,66,103,99,248,5,246,236,225,30,108,234,62,103,199,82,197,194,76,34,209,81,40,44,99,189,246,21,232,181,133,49,125,111,237,83,104,19,74,40,98,242,2,204,44,106,216,167,39,223,72,89,175,181,253,247,202,151,23,235,152,190,223,99,75,165,157,47,138,227,74,130,79,181,108,167,61,92,106,180,15,198,92,142,30,14,99,199,94,175,111,111,229,202,141,145,167,68,237,78,60,121,78,166,77,129,32,131,239,227,99,171,85,223,19,254,200,85,198,240,172,161,255,44,60,175,183,204,42,53,147,209,233,96,147,73,31,54,128,172,173,167,190,234,146,83,203,170,125,9,97,13,75,161,248,146,215,181,254,35,193,199,245,97,97,22,28,131,205,198,190,188,240,124,47,183,220,219,135,241,112,42,168,109,230,62,98,87,130,13,146,233,173,136,219,24,97,76,232,230,230,206,176,123,30,207,51,216,238,126,75,103,29,7,207,71,99,98,124,
+216,98,245,149,242,98,213,144,185,111,88,7,224,212,63,46,231,52,122,41,226,54,139,86,74,59,216,60,81,170,65,175,44,114,77,61,121,149,79,189,76,211,238,9,98,29,202,158,51,103,251,226,51,33,3,83,192,148,67,138,103,235,189,31,158,111,133,249,145,71,186,8,213,150,207,28,91,222,225,219,189,38,175,171,62,90,137,92,43,20,69,165,210,166,252,90,214,237,17,101,133,209,82,48,31,3,180,98,87,75,201,75,23,234,236,64,149,207,98,188,102,199,75,166,215,235,155,24,69,137,150,55,124,125,214,210,204,57,105,63,35,122,69,94,20,153,114,189,66,145,111,168,68,230,100,151,236,127,173,138,238,139,60,149,26,93,116,222,105,80,144,133,173,204,181,153,186,229,146,78,113,37,203,146,201,125,20,202,188,48,26,183,175,210,125,181,233,181,105,27,44,250,90,19,13,61,251,124,253,33,151,187,192,227,183,49,196,229,126,20,179,41,95,236,195,161,126,57,207,110,109,155,215,98,113,17,137,236,182,62,152,85,22,46,225,115,221,225,64,167,215,62,102,111,104,175,
+243,249,98,156,203,109,231,90,171,216,17,40,61,85,20,18,181,157,124,253,140,66,245,61,94,207,226,252,124,91,98,22,172,66,31,147,216,136,150,253,74,33,63,91,182,100,149,66,97,158,101,215,91,132,130,92,173,214,31,123,199,11,10,101,91,231,213,246,227,218,118,101,216,239,43,174,237,126,187,184,181,221,110,139,230,5,8,212,219,98,110,22,189,204,107,51,35,127,86,148,52,172,152,185,101,159,7,14,175,75,202,62,198,222,30,246,55,11,235,182,207,218,55,203,101,99,226,80,218,46,236,250,178,238,184,181,111,119,21,89,228,230,64,149,102,246,227,3,226,225,8,69,189,244,71,59,49,146,213,112,215,90,211,221,21,82,17,85,143,182,150,87,137,204,153,225,63,151,17,96,161,118,37,56,131,221,140,101,119,12,152,121,100,32,95,250,86,6,21,156,203,165,27,44,88,23,193,160,65,129,193,211,85,243,12,230,34,221,31,137,101,132,50,131,115,12,61,171,194,121,58,154,190,79,156,225,174,185,43,34,109,56,124,177,51,244,222,130,64,83,174,250,198,131,157,168,
+167,67,61,122,154,186,124,72,112,227,120,106,171,41,175,27,235,34,44,84,119,180,58,12,7,115,227,173,37,36,125,154,152,24,22,105,68,215,65,221,124,126,19,106,18,252,129,254,21,34,44,213,201,16,110,157,86,123,19,187,109,19,224,175,59,91,31,59,79,233,84,213,124,14,161,146,201,115,36,210,235,112,58,213,101,179,249,16,2,221,223,228,116,218,198,241,134,162,196,224,242,222,123,239,43,151,171,171,84,90,249,216,101,255,229,193,59,172,101,55,155,87,171,181,166,99,50,243,25,178,12,167,78,164,75,131,94,207,174,214,106,158,105,180,87,28,6,163,219,108,242,69,28,67,38,240,166,83,13,187,68,170,33,146,243,129,135,96,159,207,215,201,51,171,244,115,59,24,213,55,134,205,156,74,221,167,82,185,186,217,44,223,21,203,228,124,15,233,186,94,27,81,94,17,8,221,106,149,191,42,208,101,166,28,137,122,232,160,224,202,11,88,158,206,180,40,139,246,33,74,142,84,1,135,144,121,111,205,47,106,208,126,78,91,190,81,40,250,85,79,30,151,85,235,8,194,
+190,111,138,203,97,25,170,126,217,54,204,155,51,139,108,75,173,99,152,251,67,107,171,187,221,246,111,50,233,120,25,208,69,87,142,53,236,209,81,43,23,43,63,44,86,245,236,231,53,133,245,228,174,70,207,23,130,154,81,50,219,49,192,224,139,164,161,128,30,6,199,26,18,205,215,27,113,16,66,77,126,44,6,11,205,227,11,19,78,8,27,109,40,21,161,111,188,57,23,10,47,199,93,146,176,53,174,170,16,190,204,232,26,55,124,188,48,72,157,14,132,45,65,170,72,140,11,241,253,196,135,137,106,158,69,30,210,112,246,60,216,217,135,11,197,177,84,174,225,142,81,68,216,60,5,247,202,195,160,150,22,78,3,231,91,87,147,195,64,37,37,249,48,213,145,230,100,115,224,96,21,63,61,167,186,108,73,160,145,18,203,144,212,139,148,92,31,168,167,37,162,164,24,255,236,169,178,37,254,122,49,175,86,173,209,169,91,229,100,157,102,164,82,189,0,114,190,246,101,77,134,118,241,89,185,141,68,243,173,166,84,189,84,167,59,157,94,242,26,50,159,196,77,182,1,99,
+112,163,198,98,115,48,24,85,230,114,165,29,14,201,30,215,234,15,245,139,249,42,187,221,72,139,197,244,56,18,233,249,96,90,153,47,156,203,117,251,3,221,139,78,11,68,166,116,238,155,167,115,185,222,92,11,211,138,3,185,167,138,108,32,81,147,72,57,20,138,42,243,120,210,231,231,189,73,137,169,213,103,104,12,91,63,28,210,8,132,249,122,34,33,19,137,210,188,58,79,2,171,237,23,33,225,102,38,210,234,210,52,10,163,191,159,184,105,120,120,5,131,82,219,86,47,5,12,226,190,100,110,89,55,83,223,166,71,74,149,151,229,110,171,53,159,107,57,37,195,139,117,155,222,12,39,188,121,251,169,231,40,131,211,251,173,108,187,180,228,236,219,208,230,201,119,76,47,75,106,219,94,199,78,73,122,133,225,198,151,209,47,124,219,230,141,197,178,166,13,55,85,87,190,178,42,94,218,112,174,18,210,191,178,120,206,176,216,161,245,65,79,53,144,96,49,130,199,144,66,170,137,175,134,12,120,138,49,196,236,104,84,223,144,188,8,178,172,134,144,171,193,46,52,153,142,
+198,184,192,116,27,249,212,2,205,229,241,72,11,207,222,117,138,78,32,188,132,104,17,196,216,41,67,214,122,171,244,153,235,85,76,143,61,248,80,214,103,211,110,240,48,12,173,92,177,243,101,127,53,69,93,31,245,203,43,212,178,213,72,148,51,210,166,218,211,173,171,40,24,18,216,193,229,100,242,51,19,42,141,237,101,159,149,109,13,73,168,205,113,226,217,235,64,22,229,172,224,131,178,158,172,71,18,37,57,248,231,11,119,21,229,175,103,243,13,181,18,237,185,211,140,150,107,82,42,21,12,32,233,141,117,86,165,169,103,7,5,77,40,154,111,54,75,82,181,154,68,165,6,9,201,235,198,36,174,186,55,84,168,44,61,26,155,91,121,189,82,151,139,228,56,56,130,15,32,190,189,108,142,103,90,157,190,118,134,94,230,77,38,41,131,81,35,45,22,193,158,132,143,227,123,226,201,122,231,85,175,73,102,242,221,174,20,173,213,146,186,221,96,3,199,231,91,10,241,116,115,38,18,221,143,140,36,167,223,25,116,156,241,21,81,243,21,161,246,24,80,213,209,245,231,120,
+92,170,40,233,158,175,8,178,40,43,255,177,96,102,153,3,155,214,237,126,230,112,220,210,40,243,153,105,85,185,32,23,89,167,75,230,8,58,72,219,165,116,57,176,60,15,138,170,213,54,143,218,237,164,100,69,94,14,45,40,233,198,154,113,109,143,79,250,122,18,24,214,150,217,108,36,133,77,105,219,45,168,13,46,78,154,0,98,118,189,237,163,114,153,116,215,210,97,101,214,64,204,190,46,71,222,58,121,181,132,47,232,174,148,239,240,76,0,237,151,211,241,156,75,71,123,245,247,209,145,5,33,140,143,120,130,155,22,114,196,166,144,201,129,74,30,35,153,7,13,57,136,61,93,232,77,31,230,131,194,16,124,140,128,118,176,138,29,122,204,33,86,209,218,70,42,39,41,94,114,87,187,244,200,153,2,73,208,59,143,65,197,115,92,80,35,143,227,170,23,145,232,210,203,15,84,189,137,158,172,245,184,199,5,245,222,135,196,245,203,207,149,7,179,92,182,94,104,7,219,214,67,181,136,203,38,105,217,186,234,102,143,105,130,29,210,204,77,125,110,82,167,123,165,231,145,
+178,167,105,106,115,82,82,156,74,12,168,157,149,50,41,24,238,245,154,212,98,72,138,167,120,170,234,7,127,189,148,87,171,209,160,236,233,96,109,218,96,101,139,170,90,42,233,120,10,25,149,76,14,163,22,168,166,209,56,125,149,186,215,77,175,197,218,103,142,233,192,193,74,241,249,178,225,90,173,137,199,79,9,35,229,186,237,183,40,15,47,205,113,104,191,111,142,75,165,105,20,103,148,232,131,133,108,103,208,86,182,244,90,106,62,31,14,251,194,77,129,96,234,2,251,140,182,82,33,223,147,227,229,186,76,138,42,17,179,66,141,70,51,30,159,50,199,247,198,59,127,225,121,209,142,68,245,173,38,237,168,86,135,169,212,230,204,63,155,118,197,70,190,71,66,191,174,55,71,33,132,23,209,92,173,166,5,58,196,40,240,210,169,157,195,113,247,188,107,227,215,21,191,107,218,190,51,26,158,31,232,148,54,22,174,44,167,44,29,219,161,184,155,235,197,235,73,99,122,129,122,108,170,91,33,97,132,178,180,239,211,187,209,109,86,225,243,237,60,228,102,116,101,215,30,103,
+248,117,198,106,215,217,231,164,172,164,208,235,151,102,184,118,63,133,211,79,143,213,101,158,112,95,227,238,86,68,155,202,134,181,146,199,124,59,26,11,169,142,192,244,253,244,156,48,54,16,224,211,131,200,64,57,11,26,13,245,56,220,30,47,40,64,151,71,12,32,86,105,117,96,160,231,222,162,206,172,10,131,203,197,96,23,168,91,7,99,92,160,58,25,36,106,129,234,123,224,156,135,73,227,27,92,222,89,88,20,192,118,74,134,63,226,228,125,196,11,185,100,180,120,2,79,115,244,167,154,131,135,247,133,13,175,14,222,217,141,109,246,130,35,60,179,192,44,167,150,129,13,202,86,251,66,80,81,42,50,194,50,42,218,75,8,59,94,226,189,176,137,193,121,148,104,251,175,20,13,135,70,200,245,227,162,80,55,192,127,100,43,31,27,65,193,124,78,8,53,175,224,129,112,245,254,145,167,34,203,100,84,138,151,119,141,167,65,206,9,172,97,110,84,212,202,20,55,36,82,41,132,66,9,46,46,18,132,157,165,179,72,107,212,222,26,141,169,11,135,169,43,129,16,96,90,
+112,31,185,79,180,239,58,171,231,7,13,112,25,164,107,198,222,149,224,112,72,148,89,101,145,208,151,44,246,187,227,174,106,62,163,228,242,204,176,76,38,32,145,18,204,4,65,116,255,148,44,47,134,98,137,58,149,164,108,197,146,48,145,40,152,172,38,137,44,85,196,115,179,220,13,26,18,25,186,240,94,8,44,150,68,4,75,23,73,130,215,212,78,128,30,213,243,5,180,120,252,37,244,248,40,192,250,174,251,151,47,72,156,222,227,93,210,56,220,48,30,47,24,195,225,137,149,161,83,177,185,18,251,173,224,246,150,151,120,185,21,221,62,204,128,252,183,179,153,39,82,67,137,32,72,14,181,162,196,155,8,75,199,48,84,122,155,69,62,161,47,83,30,118,187,80,121,87,217,240,103,137,132,143,69,61,52,246,189,68,126,72,181,224,84,222,169,224,104,232,89,203,197,145,253,101,148,39,172,154,251,157,21,85,86,15,188,100,32,207,189,198,98,87,213,145,140,142,218,122,69,35,58,198,121,177,90,21,14,88,137,200,48,39,93,28,119,133,122,245,110,65,61,23,143,244,
+88,251,25,198,144,65,222,98,225,144,37,215,128,99,131,225,112,170,215,79,113,10,164,151,42,204,101,22,34,165,220,174,16,14,9,252,138,255,194,4,63,224,7,1,200,229,173,171,111,28,136,163,21,133,87,139,41,164,192,21,213,25,57,100,232,101,189,34,9,54,59,126,126,68,128,229,175,224,133,11,99,68,45,150,149,45,74,70,58,174,205,54,171,2,111,93,45,117,218,166,70,76,65,111,172,79,66,181,188,171,245,98,48,92,175,180,150,148,96,196,196,167,138,72,35,190,246,26,11,102,131,109,112,253,136,142,63,137,158,164,58,164,219,43,210,106,185,46,202,133,115,205,125,120,169,79,49,146,165,196,75,36,214,226,87,133,241,248,201,160,124,161,99,88,250,72,152,218,106,149,49,137,132,87,36,170,17,234,188,113,213,105,208,41,155,116,134,22,139,166,28,97,48,12,24,236,61,211,156,113,113,173,215,158,154,187,88,208,182,27,116,209,91,244,70,34,181,173,153,117,47,11,63,199,171,192,125,84,167,211,82,129,251,40,122,62,247,230,114,53,224,62,122,47,14,60,
+63,41,43,82,133,158,68,162,45,81,40,76,65,126,175,212,199,40,172,97,40,172,53,55,235,20,181,10,77,213,81,189,26,77,13,69,222,122,235,245,218,180,229,237,187,221,53,117,203,43,180,69,49,247,247,222,187,187,155,26,65,232,133,195,107,216,103,202,216,1,174,249,59,240,251,59,255,106,41,207,143,23,253,26,144,115,146,122,25,116,70,78,81,64,138,42,166,125,104,217,91,115,171,157,97,236,199,207,107,0,249,246,77,160,181,218,150,111,236,251,164,112,149,47,211,142,251,222,184,6,176,127,236,151,37,22,165,110,16,62,62,219,211,135,81,48,187,94,190,140,22,176,200,17,73,136,109,199,175,118,155,21,125,231,106,141,67,56,225,57,103,52,176,201,189,15,250,54,244,128,24,69,189,97,230,172,16,113,48,156,16,34,233,246,238,220,161,133,191,116,30,218,106,166,166,210,174,144,153,11,14,26,134,81,178,33,184,219,29,93,84,73,192,89,142,149,197,232,36,225,117,231,176,93,200,114,93,117,208,156,158,115,56,158,179,98,56,144,42,136,120,228,3,231,115,184,
+66,210,85,134,219,213,215,59,153,161,237,50,194,156,17,227,8,109,128,100,10,7,195,194,185,16,73,71,230,151,3,204,123,220,17,183,86,151,2,240,1,26,224,4,177,30,198,116,193,112,72,180,175,175,20,183,134,6,206,245,99,162,36,58,192,119,176,149,126,114,3,58,159,131,67,77,252,101,0,115,133,112,240,4,42,233,41,240,111,111,175,129,192,7,179,134,207,207,69,173,84,74,33,89,201,24,20,10,122,113,33,116,237,44,149,65,68,137,54,247,40,212,251,80,248,129,42,16,98,8,4,40,99,60,118,181,239,42,245,51,183,210,242,74,161,169,64,104,52,101,101,113,29,237,118,182,62,19,75,212,192,237,129,110,182,160,153,148,38,116,191,15,77,167,119,174,32,138,45,122,140,245,159,219,119,10,125,50,53,162,118,187,232,84,10,58,14,4,92,107,35,91,122,22,138,197,171,119,114,29,232,154,72,69,34,209,107,239,26,90,40,184,22,58,58,91,157,184,100,14,252,175,97,45,143,71,185,186,226,161,233,88,54,219,113,249,202,26,194,81,106,183,91,64,225,112,
+208,81,38,133,2,156,233,144,11,170,51,230,194,176,217,208,237,146,135,94,14,105,131,178,78,82,48,84,12,139,240,104,216,64,86,226,124,151,113,48,133,38,132,24,31,238,252,6,75,191,167,27,94,110,86,93,137,107,120,28,162,86,117,2,80,246,132,171,185,2,51,180,54,20,163,64,206,162,223,131,189,217,237,32,126,132,30,199,203,209,158,188,91,188,120,2,25,195,238,146,140,219,86,119,143,116,35,92,157,56,24,40,240,50,204,48,95,64,14,99,131,199,129,96,144,225,33,119,140,121,229,68,94,230,160,176,148,19,46,113,173,184,76,237,134,195,1,227,204,99,222,11,46,10,189,52,162,253,15,247,238,8,103,66,195,199,167,240,194,67,253,138,73,150,86,17,32,28,213,157,135,143,252,231,163,57,4,41,26,61,32,98,90,231,181,238,146,231,186,61,91,230,66,134,198,153,157,152,65,189,142,230,85,206,136,148,52,32,90,79,207,56,39,123,67,148,110,95,114,23,123,215,54,182,127,29,206,14,60,251,172,90,204,38,251,180,146,48,209,211,110,82,24,140,213,203,
+205,72,180,115,49,177,36,74,74,102,215,27,99,193,110,147,147,201,143,179,184,168,196,185,121,66,185,55,90,173,53,227,106,95,56,173,15,183,199,214,116,46,145,108,136,88,226,126,162,58,116,30,143,118,229,45,139,149,137,18,194,29,32,239,85,171,205,155,78,103,95,231,29,46,171,78,192,10,235,230,152,192,161,219,48,216,60,228,114,109,28,14,43,238,40,28,14,51,203,121,103,183,221,204,138,197,141,220,32,223,251,96,54,107,81,88,78,11,134,157,39,253,149,190,119,115,51,199,96,106,27,147,105,223,151,217,198,166,92,57,197,87,220,69,99,100,114,47,24,156,131,61,158,141,60,83,126,62,222,69,163,153,86,163,83,159,78,102,217,236,6,13,71,239,115,52,155,54,37,100,93,113,162,129,248,212,107,216,64,32,251,157,229,197,38,143,176,24,50,92,2,157,180,31,164,199,25,214,127,28,177,109,154,36,154,69,151,218,151,209,227,176,133,61,164,101,86,251,210,94,138,70,135,61,201,216,190,122,58,14,232,135,126,82,180,191,175,109,92,83,216,28,134,109,219,119,
+166,184,189,133,59,16,162,229,153,125,47,59,100,236,195,248,113,215,218,40,164,58,4,144,221,121,114,203,94,102,173,27,236,65,15,238,232,104,137,130,236,48,189,60,108,60,53,236,162,83,224,219,23,230,23,195,64,120,117,225,176,211,245,247,156,145,144,185,188,186,140,210,161,219,236,42,6,58,83,86,45,98,159,91,139,98,38,185,42,234,83,31,12,31,56,67,138,234,186,3,103,56,11,119,85,239,43,94,127,97,200,186,195,47,220,1,126,44,129,55,208,220,52,156,162,117,7,253,151,124,23,143,30,189,238,195,99,181,39,168,83,211,92,221,250,246,220,243,240,133,161,229,97,220,12,140,153,151,225,57,235,5,149,9,93,24,34,15,11,58,233,201,165,60,98,106,228,216,236,120,222,135,197,44,251,198,114,197,44,111,198,3,195,107,55,44,76,117,117,109,221,140,134,137,200,210,34,81,210,196,143,11,99,230,118,125,82,220,152,34,98,65,226,145,111,66,184,233,66,82,47,157,158,161,43,92,2,114,126,126,134,101,69,51,50,121,55,157,46,205,130,65,19,159,95,4,
+87,57,131,67,73,175,63,10,111,24,169,112,168,93,19,8,231,137,132,9,129,69,20,87,134,193,107,136,167,55,137,111,168,79,152,115,76,7,10,155,131,193,53,211,225,80,44,179,228,123,125,38,147,224,246,186,136,248,124,209,53,153,102,128,26,152,210,233,226,116,169,150,139,30,51,177,91,187,68,145,73,165,58,93,75,119,150,74,153,2,1,122,113,109,148,75,67,153,171,56,71,34,79,19,137,227,14,18,57,91,175,77,248,66,161,184,208,201,213,145,4,25,207,14,6,19,124,235,138,29,140,164,173,87,71,121,48,148,180,110,61,130,237,38,73,190,145,8,81,216,180,199,219,229,88,56,179,74,197,4,195,217,230,203,97,239,28,60,31,158,157,153,64,160,162,108,148,55,29,143,12,22,107,26,201,100,150,99,206,64,246,154,45,138,18,166,26,209,55,131,225,122,88,186,44,182,95,243,7,81,102,191,40,100,181,23,175,49,243,190,155,49,177,142,133,94,139,168,21,233,247,51,178,108,63,118,65,203,28,205,14,230,180,185,192,251,28,124,15,93,226,56,245,210,245,121,
+164,82,226,23,18,86,36,232,88,64,62,144,101,91,3,225,108,123,15,130,63,62,180,145,204,38,232,214,66,198,123,86,241,4,242,46,224,206,112,116,35,252,88,182,202,157,173,232,3,75,207,165,62,227,41,209,220,10,26,65,240,123,232,222,42,253,138,124,233,51,160,33,41,30,124,164,70,59,212,247,85,254,202,101,194,26,46,170,41,56,34,125,27,64,9,77,110,56,229,114,224,116,161,156,244,62,252,190,198,36,44,169,160,252,104,237,90,19,173,139,160,146,9,94,95,223,133,124,149,21,212,180,15,62,175,208,93,70,236,64,156,12,129,104,14,42,80,37,32,65,236,232,117,115,13,13,147,150,165,197,215,201,28,63,46,137,181,25,141,73,127,99,74,11,136,137,0,63,135,112,75,10,87,157,76,90,131,230,206,136,72,237,249,25,41,234,203,200,229,93,160,101,24,12,230,248,252,126,213,193,89,84,28,102,189,176,204,96,164,34,161,182,80,45,212,38,18,185,199,71,88,127,101,88,188,134,204,87,38,49,131,250,132,197,193,123,48,152,22,12,206,237,152,209,124,89,
+209,239,47,83,139,89,219,108,214,226,24,140,28,22,219,223,46,205,58,109,42,31,231,64,250,221,184,78,215,189,81,209,52,243,121,46,151,163,247,231,90,157,56,144,159,60,177,101,138,12,137,52,232,162,80,218,130,92,55,86,198,242,177,219,112,112,153,104,214,219,106,149,6,71,165,230,102,51,32,207,20,235,248,158,155,107,94,163,49,210,32,16,185,21,124,213,47,208,117,2,239,245,13,145,15,92,232,111,174,240,108,12,42,97,91,185,110,173,199,50,48,14,130,65,39,161,144,246,208,92,74,150,236,114,235,198,146,218,174,85,11,231,69,185,159,85,231,8,66,45,199,135,235,226,24,241,131,98,175,93,4,21,218,173,104,209,182,31,158,205,181,45,108,145,177,199,15,187,125,43,167,144,138,172,29,139,112,208,55,7,183,203,142,251,213,55,243,193,115,44,140,95,49,170,95,50,235,44,151,187,99,49,129,40,163,178,197,2,133,233,41,99,59,200,113,6,223,16,64,47,66,56,198,69,9,192,112,241,177,1,133,39,175,225,77,142,142,62,102,165,224,10,159,90,192,35,
+106,216,247,4,122,201,194,110,177,59,240,71,174,63,201,244,77,174,175,90,120,129,5,87,231,243,20,183,96,42,142,7,125,228,88,8,100,16,215,197,161,35,64,1,75,130,123,0,143,157,38,55,237,178,239,230,121,169,56,217,170,238,163,112,192,108,57,4,124,54,138,67,31,198,4,93,79,57,93,57,103,103,222,68,12,202,2,47,46,53,101,135,85,123,131,196,41,109,12,83,156,132,211,30,10,66,155,175,7,156,26,52,175,80,150,190,75,210,248,241,6,55,102,9,201,51,210,39,69,175,174,194,36,57,87,120,148,150,131,111,246,175,194,46,37,141,29,227,206,46,219,171,93,184,43,54,52,27,30,181,69,154,61,207,197,165,242,46,112,95,208,76,167,180,108,54,12,14,161,155,155,156,90,139,227,83,233,201,80,168,189,245,122,53,92,46,13,143,197,135,71,202,102,219,95,80,43,111,43,99,205,222,183,167,217,108,225,40,110,43,48,231,19,41,126,103,216,142,105,244,189,92,142,162,145,201,104,205,102,24,155,32,8,216,142,68,217,174,16,201,82,201,100,123,43,22,
+107,136,68,218,196,48,9,103,169,2,158,155,151,40,72,69,226,248,245,235,117,123,50,213,26,141,92,218,235,107,56,77,18,20,184,46,2,73,176,30,71,156,4,186,244,49,16,71,143,12,52,8,36,188,115,88,4,242,8,129,192,21,34,208,73,203,65,186,198,207,252,192,56,4,70,159,130,64,218,231,231,154,201,114,216,29,148,211,5,159,69,100,60,20,167,192,61,177,57,105,132,47,80,103,52,117,75,35,140,118,27,88,102,138,110,226,173,251,155,94,216,182,167,21,199,102,45,235,40,205,222,123,93,83,201,82,107,63,186,140,94,73,207,59,220,88,68,249,237,32,119,0,87,17,195,219,138,144,217,15,56,44,56,38,211,91,32,33,220,76,79,136,239,118,151,61,215,118,206,176,118,255,88,116,67,42,79,123,31,228,162,82,185,102,122,178,181,241,21,39,142,39,152,193,6,167,155,252,146,133,95,92,245,30,58,15,113,27,234,42,143,143,99,200,207,251,213,61,40,89,225,177,49,236,254,85,39,225,159,179,92,155,243,56,25,63,213,33,53,236,120,250,146,35,246,162,
+68,37,41,55,238,57,171,19,175,52,47,145,54,254,206,167,230,86,117,97,184,250,214,11,189,131,195,152,230,49,124,5,23,101,246,134,243,23,59,74,214,235,83,246,21,11,82,230,226,183,35,213,26,132,149,132,177,103,103,59,220,67,221,204,94,195,56,36,152,61,184,105,89,237,180,242,48,34,72,39,197,68,103,14,72,34,174,187,198,67,193,106,147,147,30,147,213,184,40,199,121,66,121,76,93,188,223,170,19,52,3,20,109,236,142,4,79,86,119,182,205,60,101,85,57,56,165,82,90,33,19,213,201,228,20,10,213,93,99,215,243,2,125,211,244,210,173,86,25,147,22,143,78,34,98,161,32,89,171,153,187,247,247,115,63,124,115,185,122,182,106,120,76,58,45,57,93,117,15,135,249,160,204,50,233,51,197,162,79,54,232,198,151,11,113,221,108,74,246,251,221,180,33,61,159,170,77,162,199,114,241,249,78,174,200,100,166,41,81,175,155,76,165,106,93,177,120,238,185,48,225,45,133,98,78,44,151,211,211,83,99,215,233,156,87,29,103,38,69,148,65,240,113,35,145,116,
+171,41,182,39,18,41,145,168,75,62,40,146,143,143,221,86,116,152,66,32,128,34,217,140,178,196,181,90,234,105,249,212,245,251,231,53,223,182,59,26,205,93,176,238,56,22,155,143,148,155,210,194,58,103,152,187,121,61,53,165,31,220,41,138,9,108,217,200,177,205,30,247,195,131,101,19,162,206,17,58,66,151,235,75,193,176,75,209,114,152,25,230,133,219,146,53,191,31,251,186,43,156,61,105,223,202,55,140,176,62,117,156,30,55,208,74,120,16,182,103,123,241,227,138,40,107,48,120,252,87,247,132,201,235,251,216,113,188,197,142,136,24,219,188,146,247,156,197,44,2,23,84,16,179,228,42,128,224,85,214,173,128,254,148,192,141,121,80,60,2,30,123,116,20,160,213,41,126,20,131,68,168,87,226,203,243,2,140,28,246,247,61,154,156,48,190,189,116,184,158,154,151,42,31,94,139,69,72,69,245,40,103,203,188,200,6,253,37,135,142,165,201,162,85,110,255,245,173,42,1,69,27,227,68,63,40,193,157,131,21,51,255,181,238,246,17,130,165,34,210,105,119,30,223,114,163,
+5,40,252,67,205,224,170,220,30,65,121,184,116,249,226,69,130,42,208,217,33,230,45,65,155,244,164,144,125,48,156,207,247,151,131,51,203,74,152,46,157,141,134,173,169,36,31,84,148,24,242,176,76,116,29,32,58,245,236,171,96,170,215,19,83,169,33,62,81,204,187,34,18,159,165,87,136,100,143,215,19,67,159,16,23,98,198,217,131,167,37,73,103,158,83,18,137,184,209,72,1,87,206,238,248,73,171,92,222,210,88,153,112,88,180,106,182,82,137,132,88,132,21,165,234,188,110,213,233,214,218,228,180,155,4,6,135,21,3,89,181,203,181,21,59,28,169,7,16,114,152,81,116,123,137,249,194,33,222,108,146,197,162,120,28,137,164,124,48,177,21,91,76,229,196,221,206,19,68,171,151,208,110,82,24,47,70,108,50,165,250,178,154,88,224,77,165,248,226,189,52,73,36,75,2,1,74,146,207,23,87,171,169,193,19,94,124,251,64,100,45,21,129,112,170,81,191,171,169,84,73,42,85,172,129,107,82,128,71,241,61,56,226,53,175,58,74,34,188,8,241,106,149,42,208,111,
+1,59,68,34,127,131,159,184,137,120,54,18,71,201,88,119,183,166,99,217,77,164,75,145,232,100,177,101,228,154,230,193,198,176,166,48,45,194,243,6,114,219,141,243,83,235,169,184,150,16,166,132,145,59,91,118,159,158,143,110,187,199,197,33,101,219,139,139,102,91,202,190,101,116,93,56,121,106,104,147,108,166,97,43,145,156,166,231,95,194,6,123,163,151,199,223,19,164,212,237,165,141,213,241,173,47,23,87,162,22,190,27,70,145,51,151,19,194,227,102,121,121,13,105,177,95,216,16,246,253,57,2,191,210,145,48,194,49,188,118,171,180,17,17,217,151,58,87,36,162,136,26,126,153,99,149,3,171,104,248,44,224,15,242,250,146,221,2,9,141,46,63,195,85,226,233,39,2,188,29,182,243,176,235,10,238,145,184,118,18,234,50,118,20,93,16,201,39,25,60,247,65,135,84,102,105,245,46,158,237,75,209,240,162,38,239,249,50,84,7,251,206,32,228,234,254,204,96,224,84,224,144,107,217,121,90,73,113,85,210,232,243,3,86,163,191,191,29,99,186,229,187,168,107,118,184,
+82,113,47,95,97,133,54,142,194,120,25,30,31,242,217,196,122,169,211,138,4,201,187,235,137,113,114,119,250,111,184,136,31,215,242,221,156,107,20,145,131,199,79,250,225,71,101,128,205,142,137,46,239,214,59,95,163,43,158,52,60,70,176,69,90,200,197,229,242,149,152,76,186,158,78,3,12,163,177,241,42,157,108,12,57,163,150,79,167,39,13,145,208,157,207,71,172,45,106,129,167,167,134,31,126,59,105,251,141,134,59,186,134,18,155,172,2,135,67,161,49,84,168,132,190,44,174,40,123,237,198,23,179,200,93,62,79,236,247,3,99,18,169,49,85,171,68,182,199,108,236,86,170,200,212,210,39,1,185,78,249,82,129,64,160,225,185,224,170,164,161,108,78,44,53,200,211,19,99,192,233,116,55,28,103,42,69,148,138,35,112,67,145,116,179,25,17,39,18,196,78,39,176,35,43,174,31,31,3,45,123,148,136,64,4,32,16,72,99,103,81,201,35,84,44,129,139,70,198,109,7,143,116,55,243,83,73,2,213,110,244,176,62,218,84,151,119,126,42,229,14,13,183,197,74,38,
+254,108,153,225,110,214,162,253,158,72,150,42,196,81,70,130,105,27,203,44,135,194,186,175,55,7,192,48,226,118,41,153,46,7,169,195,193,56,153,44,237,137,195,138,61,153,23,151,196,161,77,52,155,58,105,235,27,75,71,168,234,244,113,44,104,125,191,133,20,172,254,34,142,190,225,250,141,136,215,169,159,63,241,164,231,245,146,147,237,45,214,33,220,253,89,52,238,196,111,40,10,78,241,242,10,85,23,174,152,49,80,228,202,208,241,7,110,29,1,118,60,136,47,185,16,161,92,93,203,49,51,137,70,134,191,231,56,188,216,145,208,39,229,185,19,62,190,14,179,219,36,79,126,250,34,63,51,159,203,253,32,15,26,233,190,187,242,220,198,160,231,70,228,53,219,159,225,14,193,70,19,175,126,115,217,112,10,46,172,157,52,47,135,175,186,175,174,30,206,174,94,118,200,228,86,42,125,82,90,160,215,34,58,20,22,187,168,89,107,242,164,254,214,130,197,92,40,210,81,215,230,74,196,225,190,44,92,74,88,86,194,170,172,201,199,189,78,125,156,180,70,131,215,118,55,204,
+38,3,250,0,33,170,168,78,113,202,15,225,33,239,159,217,87,34,66,58,125,141,230,94,34,11,196,243,179,243,104,70,90,145,139,129,150,96,208,140,228,243,61,85,78,117,84,113,220,219,21,148,27,104,34,20,17,55,155,215,175,137,4,242,241,209,227,118,64,170,187,194,189,78,240,76,97,164,208,232,59,168,21,70,4,131,145,103,103,165,11,156,176,61,204,204,42,115,209,102,115,93,44,214,144,114,185,167,37,228,48,172,197,167,180,160,221,87,166,52,128,128,208,174,113,24,12,114,179,241,20,125,12,142,46,253,84,148,185,238,196,241,100,242,46,96,13,18,249,124,228,213,21,244,130,44,185,251,152,135,220,77,166,68,32,15,65,210,233,158,52,137,67,231,186,240,76,185,63,172,75,241,120,119,87,87,215,174,40,75,114,69,32,70,27,76,17,211,150,114,123,23,98,14,151,136,199,35,81,62,28,17,7,180,161,109,73,8,84,236,116,82,174,29,14,164,121,73,12,157,157,33,111,244,196,76,95,33,217,237,174,109,54,53,18,69,38,182,34,34,78,132,17,167,219,229,
+6,244,196,61,14,235,145,44,27,203,83,178,34,163,118,83,102,55,32,87,193,56,249,245,208,194,93,77,195,243,11,114,90,167,115,220,216,14,231,233,195,104,124,16,61,97,175,251,94,60,46,130,196,221,142,120,200,136,153,251,64,94,103,240,199,208,205,250,204,143,113,12,174,192,117,139,115,65,168,191,120,184,106,44,53,122,169,103,194,53,60,158,224,22,194,7,139,214,126,133,179,208,164,170,36,248,4,206,106,105,214,245,236,91,84,218,99,125,193,130,204,104,98,245,254,58,196,169,211,216,252,233,93,209,221,81,93,5,214,119,68,206,12,115,193,175,94,251,159,56,62,252,253,85,65,107,184,185,11,198,57,15,184,29,119,162,15,249,239,57,121,108,200,9,139,23,253,23,241,151,120,224,156,139,215,181,148,9,183,131,142,169,17,218,73,150,99,11,162,93,222,29,206,217,6,204,188,119,121,182,113,238,152,61,33,27,98,57,183,225,210,139,26,189,3,107,30,115,118,184,109,213,241,152,213,34,173,112,189,49,21,4,132,160,135,63,65,184,229,164,160,197,195,89,231,104,
+244,74,163,238,100,23,110,47,167,203,245,36,149,90,7,144,148,221,58,107,211,240,202,147,194,181,66,234,111,181,178,141,233,116,146,205,174,129,124,117,215,13,216,140,7,17,139,114,137,195,5,143,62,111,157,203,157,0,249,234,122,164,220,181,253,43,155,242,182,53,174,3,249,234,196,102,91,15,21,121,139,57,95,74,241,135,211,215,235,229,204,159,207,177,234,50,217,132,68,90,15,18,4,203,253,83,41,118,184,85,72,8,153,116,160,222,235,214,83,169,73,192,16,88,123,46,44,210,208,109,41,39,86,200,73,83,159,113,226,116,174,29,103,207,22,69,148,73,224,70,167,17,82,171,25,72,36,30,27,157,206,132,172,168,71,31,31,39,60,158,17,182,226,70,253,151,62,95,176,85,171,214,239,239,39,119,186,187,53,65,56,129,195,233,235,149,97,87,113,173,157,237,59,139,225,249,48,92,50,119,17,198,186,159,95,79,110,254,31,50,174,170,89,149,166,221,253,117,220,221,221,97,225,238,238,44,220,221,221,93,23,122,216,239,119,121,238,128,174,234,130,153,212,147,100,232,
+196,54,170,234,146,101,93,135,218,245,170,125,183,93,224,125,81,63,75,52,197,159,97,120,16,199,142,163,238,83,124,221,19,223,159,61,244,105,202,142,202,174,75,220,119,243,191,219,25,215,129,255,74,109,164,80,203,159,245,86,204,62,210,13,254,219,239,92,57,193,148,23,172,160,203,65,238,12,233,79,254,192,187,75,189,114,47,110,208,60,247,96,32,54,72,4,7,201,49,254,190,4,53,16,19,62,148,63,228,239,139,140,107,141,70,62,127,229,233,52,154,8,76,252,138,52,24,85,4,58,24,52,135,149,175,128,54,112,164,220,150,207,99,115,65,130,17,205,121,113,7,69,169,152,18,13,120,212,164,156,210,10,72,1,84,140,50,19,145,19,68,3,238,184,130,162,168,114,178,128,66,64,147,222,41,108,191,229,71,152,3,129,216,7,142,225,247,44,98,255,66,84,11,110,134,174,255,9,221,157,156,9,132,193,11,18,4,224,182,196,42,18,188,111,136,49,98,4,36,180,139,176,145,51,236,237,101,110,161,29,73,5,55,156,106,84,154,55,212,130,51,62,127,170,55,227,
+49,86,125,86,255,236,206,202,37,19,83,19,18,18,179,6,81,147,145,163,229,210,168,250,138,43,168,17,232,135,71,167,201,74,117,172,186,168,140,227,113,189,64,170,173,246,121,171,94,192,230,243,233,233,116,124,50,173,141,77,38,227,92,81,7,143,36,171,65,208,234,189,105,217,108,50,22,151,184,69,163,163,80,200,40,124,11,235,126,0,38,70,238,158,175,201,251,125,228,137,121,140,60,94,189,74,103,171,77,197,74,94,184,228,109,233,22,107,162,209,224,141,210,105,163,76,86,199,133,192,106,111,167,82,205,252,168,20,196,114,53,217,83,170,198,84,170,241,235,115,234,115,133,90,18,230,71,199,9,20,106,4,141,66,141,207,103,125,163,173,169,127,98,52,170,52,201,255,37,72,127,146,133,98,109,172,80,24,71,163,250,246,56,53,134,195,117,211,100,106,252,201,142,13,134,161,113,54,171,151,40,171,245,126,88,23,199,140,250,139,190,14,134,27,31,215,206,56,16,48,250,253,117,42,215,101,108,218,70,182,202,230,87,219,38,183,29,3,145,235,89,191,244,65,143,213,
+170,94,143,147,141,202,97,108,4,199,39,113,119,14,225,117,166,174,208,35,221,136,255,146,53,45,149,228,37,0,55,94,59,85,226,107,53,53,126,94,191,213,202,50,245,5,14,45,155,248,2,7,85,73,151,31,242,59,164,252,64,228,254,16,212,159,220,223,19,71,245,202,237,56,84,160,41,199,135,255,16,9,35,79,164,6,73,137,242,60,50,18,119,163,200,1,125,58,152,71,161,10,57,27,3,8,82,143,198,2,133,141,240,39,149,203,195,144,60,215,158,150,207,67,146,249,79,226,145,15,132,210,99,130,50,154,179,32,153,139,121,41,43,156,16,59,150,164,188,47,142,34,160,44,75,233,55,39,14,73,45,156,114,162,164,200,131,45,192,4,87,137,145,103,108,162,18,134,164,178,19,46,20,71,190,23,228,5,8,224,41,141,195,212,199,164,1,18,168,72,194,192,145,185,88,136,141,78,11,36,37,98,206,29,190,95,16,18,32,161,27,109,204,206,136,87,192,7,31,215,200,53,55,228,239,197,80,188,32,197,109,127,160,115,124,146,173,79,19,77,39,76,139,203,2,50,
+172,188,209,146,17,17,93,163,1,196,153,81,37,37,1,13,131,20,124,93,187,77,117,105,213,191,116,186,52,121,73,22,34,145,121,16,228,63,189,59,78,219,15,119,203,165,102,82,191,63,178,174,132,76,46,32,145,115,240,205,126,90,165,156,78,132,146,203,36,226,240,73,62,28,38,1,131,11,188,75,182,209,213,173,151,228,225,229,146,120,220,37,237,88,187,144,201,204,99,112,182,217,211,110,84,100,235,193,156,104,181,37,217,44,190,4,139,45,220,239,115,92,155,107,182,86,26,109,156,70,163,36,85,42,137,105,50,41,29,143,11,36,59,105,190,55,152,229,191,183,70,77,158,206,210,39,251,113,252,120,144,212,235,226,66,42,53,143,194,204,28,77,250,62,128,154,165,149,8,139,34,25,239,36,43,36,178,112,187,205,139,177,159,66,173,54,63,153,111,102,99,225,126,51,156,136,121,241,188,198,48,155,253,37,22,73,132,69,145,122,48,88,2,12,146,216,158,155,248,235,37,173,106,149,113,93,139,216,113,74,118,158,79,231,62,193,156,94,163,248,60,47,46,132,134,112,
+41,28,247,235,187,91,19,247,8,189,144,245,218,200,155,150,226,149,222,94,37,95,126,122,213,179,68,73,167,214,108,192,182,236,251,188,246,8,117,149,121,237,3,126,118,229,174,21,232,194,27,88,27,74,84,94,100,61,46,117,66,212,180,166,4,17,57,33,134,50,62,79,5,42,229,209,82,84,100,228,81,145,115,249,111,240,15,77,145,230,197,102,178,180,46,143,131,192,54,64,36,34,87,230,66,123,75,98,145,175,12,49,135,75,233,34,86,102,240,101,176,156,25,88,79,236,11,89,206,134,190,163,254,74,58,97,159,138,21,128,204,250,25,65,28,72,162,238,231,146,42,247,179,8,114,97,150,70,105,38,207,175,195,84,36,149,166,162,52,115,19,63,18,29,136,248,137,45,232,110,52,12,240,176,75,89,106,46,211,123,1,94,164,51,12,90,133,67,92,244,152,66,29,17,9,30,136,4,242,39,242,235,109,126,31,204,68,77,214,156,104,232,16,205,120,193,138,221,222,161,67,143,118,2,191,221,155,177,74,249,247,88,118,5,88,164,69,180,100,88,132,143,55,88,144,190,
+36,232,16,134,5,132,221,159,174,213,108,83,213,234,95,154,225,139,157,36,41,18,129,199,131,160,209,187,99,228,216,126,152,92,106,42,123,73,202,100,95,232,144,184,72,100,252,102,31,173,252,41,163,243,107,178,136,53,12,62,9,251,66,39,6,38,1,129,241,143,175,41,209,101,11,77,213,124,56,39,158,174,73,167,147,33,225,114,73,151,75,124,211,100,75,44,229,66,11,161,158,47,72,102,107,162,199,98,73,206,103,82,195,222,136,167,177,18,101,226,86,168,43,20,114,2,165,79,141,39,146,210,72,4,64,210,86,11,37,137,2,39,39,140,166,201,195,145,39,173,215,73,106,117,124,16,133,73,60,109,18,11,161,140,199,137,146,159,100,132,231,163,75,100,9,222,198,67,14,199,146,131,65,77,98,48,144,228,242,56,150,252,67,66,32,226,183,152,125,212,15,197,103,242,157,68,18,62,108,121,163,253,166,29,247,3,70,19,111,26,233,243,133,179,89,244,96,169,114,220,242,135,175,143,30,157,230,113,164,140,76,18,199,190,208,153,197,113,28,194,243,79,186,29,93,125,
+244,231,93,129,26,77,51,241,237,91,236,170,123,219,7,19,63,190,116,235,173,22,108,231,84,37,27,47,52,214,69,160,158,227,89,222,232,48,159,48,243,162,67,169,249,110,18,246,101,172,141,72,56,128,156,241,121,62,240,206,147,151,34,162,13,115,17,116,200,211,209,180,82,201,45,230,185,80,37,167,84,157,136,69,132,113,139,2,167,10,204,160,177,69,78,216,250,199,42,165,43,103,42,130,27,188,5,44,23,253,234,97,164,57,35,70,204,113,105,244,172,19,29,153,248,233,160,25,157,163,168,3,38,76,250,96,166,41,242,146,232,16,198,114,158,228,54,65,6,210,120,162,23,106,185,85,92,96,34,15,244,4,128,100,103,59,244,244,32,13,159,204,225,82,117,189,36,68,7,163,176,163,153,61,231,81,128,69,180,101,158,16,5,249,159,132,20,2,114,141,27,238,228,228,187,230,222,66,28,69,134,3,165,160,234,12,94,184,216,165,31,158,42,221,85,122,208,142,125,89,171,38,33,233,66,26,36,51,170,166,160,16,80,144,129,175,235,180,223,84,157,26,65,167,71,86,
+201,228,32,18,217,7,129,160,219,187,227,182,253,60,120,92,106,54,133,248,49,253,68,138,197,65,60,14,223,135,33,183,103,203,221,179,202,190,43,120,76,22,1,135,71,66,161,193,43,16,216,251,1,140,88,134,124,61,35,31,143,8,198,227,25,108,54,251,170,141,110,55,21,91,29,173,125,179,36,219,172,168,166,177,17,78,167,7,209,40,103,31,2,219,189,157,22,166,169,210,42,136,213,106,28,173,82,69,168,212,193,254,112,216,207,21,118,9,32,220,106,169,181,74,146,155,78,67,29,143,145,191,232,223,128,195,217,95,172,140,239,118,28,158,54,3,73,146,125,55,97,38,142,32,254,72,145,14,206,126,19,4,221,234,166,253,119,238,12,106,181,253,119,238,216,141,133,231,205,112,219,231,197,251,26,227,22,240,130,247,175,199,160,215,75,238,61,143,129,235,26,166,218,182,232,109,135,210,29,251,180,222,123,121,181,28,168,188,183,252,115,195,105,222,78,243,61,146,60,8,110,125,84,190,83,242,214,220,151,123,122,23,245,241,124,30,251,31,62,234,186,222,80,62,19,219,
+96,189,108,70,182,110,225,37,88,108,244,254,201,157,240,185,193,239,120,172,30,60,214,154,205,95,168,13,252,80,124,166,52,116,130,51,67,217,216,8,198,184,6,29,148,63,0,210,196,217,30,23,62,170,89,60,225,20,9,142,142,204,50,145,93,8,198,214,229,217,72,170,13,92,160,114,77,140,131,85,40,209,197,74,18,156,106,145,111,130,105,182,107,225,204,117,209,48,160,196,140,19,207,57,233,98,98,198,140,44,221,13,250,79,206,138,178,2,27,140,31,51,50,47,139,52,157,249,6,101,86,22,150,193,41,154,134,117,158,25,69,197,60,6,166,90,172,229,218,163,32,10,93,8,72,1,237,193,158,232,171,96,17,11,98,2,98,28,133,197,44,204,10,102,149,228,85,146,112,228,127,99,140,137,26,66,108,160,1,251,56,240,14,108,56,192,147,4,155,254,67,53,209,245,242,23,138,12,55,92,168,47,152,47,226,127,204,62,247,100,39,238,61,253,15,71,179,117,58,28,214,139,132,57,9,1,193,189,61,243,11,229,108,12,139,152,221,234,70,131,20,214,104,81,52,90,
+248,120,61,138,28,142,252,74,237,159,77,162,102,143,134,69,100,145,210,25,148,76,214,9,15,135,34,131,33,15,158,201,103,163,176,217,237,87,179,88,36,44,14,181,131,193,194,110,158,92,103,205,150,154,170,197,156,216,58,95,209,78,103,152,251,245,77,56,92,190,201,102,203,45,229,82,65,180,32,108,104,22,11,146,197,226,133,207,103,145,211,153,199,165,177,114,103,163,84,190,72,149,114,2,149,142,30,38,18,97,169,84,52,128,12,136,116,149,82,77,105,81,41,136,195,33,236,136,57,68,171,85,190,66,99,200,197,33,10,79,155,120,166,169,82,9,130,68,198,69,178,124,52,137,28,193,32,145,162,219,45,223,2,114,228,178,40,133,42,5,163,48,20,207,91,125,15,156,126,41,52,217,125,7,240,83,72,34,20,138,212,130,194,80,155,22,177,29,113,74,157,251,208,105,125,101,205,22,229,252,56,217,23,161,233,225,105,22,21,204,112,73,92,159,246,254,186,52,243,1,176,72,87,247,209,94,127,210,89,182,195,203,127,97,228,189,191,127,79,239,135,104,221,52,255,131,
+209,33,216,152,79,255,193,40,214,160,92,78,155,224,180,115,146,240,194,211,253,137,23,170,195,117,206,103,158,8,16,226,4,39,183,255,33,142,152,99,34,15,109,189,159,204,134,2,13,83,163,8,206,210,254,164,181,113,144,230,90,128,137,150,149,208,228,106,48,24,170,84,53,9,189,176,243,89,190,220,69,95,46,150,43,95,114,225,39,1,51,78,180,46,129,214,197,25,63,20,107,137,156,244,124,60,246,35,34,112,69,167,120,78,145,8,253,112,184,137,147,242,39,111,0,94,184,13,12,103,102,18,150,65,19,118,145,181,154,157,68,60,185,27,188,232,169,65,30,80,191,98,172,37,122,131,96,47,7,104,243,172,70,97,49,3,48,82,15,163,95,152,157,16,14,81,208,178,1,9,20,171,189,0,82,130,64,13,233,101,248,38,151,151,225,134,239,135,12,175,3,17,240,244,214,193,200,182,123,248,217,232,60,140,127,199,77,162,207,171,16,18,140,10,122,183,103,120,114,166,214,235,125,90,140,206,148,74,39,123,226,173,94,235,77,166,76,135,221,49,185,208,152,204,62,94,
+246,195,84,40,38,135,43,137,201,232,69,99,76,162,193,48,57,81,152,76,94,31,6,103,10,133,19,208,142,240,93,184,185,249,50,31,127,190,30,223,47,119,198,102,35,83,161,135,243,213,232,203,94,23,220,69,102,161,206,231,253,45,139,205,148,201,100,134,43,81,161,155,46,22,140,87,163,33,115,178,20,202,218,64,169,98,162,80,178,161,26,163,208,140,81,104,8,83,75,87,40,7,168,232,215,241,61,101,54,250,35,30,239,27,141,140,20,34,37,243,112,227,201,225,160,227,238,21,10,12,73,84,2,11,245,73,100,230,102,154,101,252,100,153,53,123,77,38,131,33,81,131,62,207,221,23,137,24,187,232,110,210,15,201,204,148,27,18,217,7,129,24,46,235,149,9,0,76,42,154,109,180,203,119,92,176,14,235,1,234,120,50,29,187,56,208,241,160,57,206,40,137,227,205,113,28,32,142,247,141,80,247,241,235,54,31,190,110,130,255,141,200,190,137,24,207,184,118,167,141,247,95,114,130,181,49,110,159,241,31,252,211,246,145,214,53,216,246,174,168,45,31,27,86,199,191,
+133,251,102,109,44,239,53,115,60,80,60,211,204,1,225,117,150,51,7,246,95,96,18,23,185,218,157,124,1,195,5,107,239,103,137,240,174,106,116,22,243,76,160,35,179,58,141,132,98,128,103,221,50,211,5,26,14,90,67,157,105,162,73,141,143,181,204,151,16,81,154,218,124,22,73,225,26,247,216,140,21,15,49,92,242,114,198,10,84,221,78,122,44,103,66,241,128,247,202,60,167,138,234,40,158,37,117,150,23,196,176,60,236,199,105,153,21,196,73,196,44,99,114,170,103,38,177,169,12,164,209,89,128,168,207,190,232,203,161,26,86,154,150,96,36,251,106,32,144,135,94,3,205,127,57,206,56,68,4,158,75,191,113,178,48,19,110,184,33,40,67,207,23,56,216,105,130,144,225,131,55,217,12,136,51,150,76,215,223,97,191,161,152,65,207,127,185,76,249,151,208,217,189,29,223,93,244,103,29,65,155,198,10,139,208,47,24,29,225,80,149,74,215,172,19,111,90,29,154,78,131,160,175,232,32,20,218,127,186,253,187,77,198,238,82,113,250,76,98,38,139,254,234,102,8,153,
+28,252,222,139,175,110,222,173,82,118,39,64,201,249,167,155,209,31,56,12,2,6,7,129,102,160,16,255,179,218,210,191,186,25,245,184,67,190,186,57,168,213,246,167,63,108,189,56,84,235,104,87,171,53,213,106,70,176,217,76,104,58,29,140,70,251,184,144,71,175,205,212,154,48,149,90,65,172,148,145,35,149,10,74,165,6,191,190,171,63,87,232,37,97,64,173,165,86,43,73,52,206,63,26,131,254,253,137,131,45,78,255,98,213,99,84,73,6,81,152,202,70,233,50,25,170,88,128,124,226,241,224,52,11,229,32,194,253,32,72,239,237,48,24,244,31,12,150,26,213,199,208,98,49,20,207,215,163,249,30,18,12,138,100,240,221,132,142,79,135,81,227,104,29,215,143,251,225,174,222,30,214,221,36,205,23,250,124,185,108,246,182,29,163,118,5,105,255,143,124,12,154,166,144,159,44,8,133,231,146,121,14,209,227,57,97,247,223,175,32,238,245,128,184,174,104,223,250,47,124,203,199,130,87,79,151,254,62,208,131,182,115,135,240,70,187,44,5,239,122,39,227,35,44,87,85,
+224,193,112,191,122,220,5,104,43,185,235,4,159,134,242,190,21,125,180,247,123,40,199,135,121,99,179,50,58,218,45,158,164,34,183,13,233,81,124,103,80,109,107,189,31,114,69,68,105,163,117,38,243,101,156,67,171,60,85,4,38,28,128,139,157,109,131,77,147,183,209,204,53,160,23,111,248,132,17,28,33,237,33,122,198,12,102,57,119,250,52,103,195,188,189,119,40,116,70,7,254,0,179,176,50,143,243,82,158,150,185,178,46,194,231,121,96,167,34,35,55,12,208,177,220,25,238,100,207,227,204,193,124,25,51,37,175,176,122,112,37,208,2,15,169,24,250,56,71,29,128,209,231,132,144,242,71,152,134,104,0,96,92,25,142,247,72,216,192,7,69,157,169,61,192,104,144,49,9,233,95,126,58,217,246,165,177,16,135,174,191,181,171,119,196,198,243,200,157,13,141,110,249,133,86,35,61,46,182,187,65,222,253,129,202,229,88,32,129,234,253,213,245,125,179,164,214,122,214,191,58,168,247,238,232,109,63,77,198,87,61,167,16,50,195,15,180,88,4,125,117,80,32,12,233,61,
+91,250,175,14,250,174,96,48,81,4,12,14,13,133,64,95,29,20,240,3,0,49,24,249,116,69,223,31,208,175,14,2,109,54,129,175,14,18,152,138,185,188,144,49,219,210,205,22,100,195,221,128,164,211,32,153,140,19,24,138,5,194,64,110,85,253,145,107,168,165,82,20,161,84,65,203,101,208,30,133,10,252,57,4,106,64,42,87,16,201,181,52,220,206,1,10,6,3,1,3,80,160,203,18,216,42,240,111,156,56,26,35,141,110,19,116,62,7,153,205,236,0,154,14,162,80,2,184,2,9,16,34,74,100,32,20,207,67,118,191,148,77,4,154,28,14,35,68,72,17,36,203,67,136,68,60,72,191,15,130,227,161,120,161,16,68,32,4,114,125,130,64,159,219,77,113,205,222,101,29,192,178,65,224,101,21,250,126,131,186,239,110,32,130,6,29,167,18,232,52,131,200,240,40,126,142,75,102,127,214,118,253,180,13,196,231,7,58,120,15,168,237,130,242,63,19,245,109,189,133,110,61,147,159,219,88,7,253,156,127,187,32,157,122,188,5,91,109,47,91,243,177,1,77,59,225,
+28,14,179,14,24,114,64,12,55,148,171,43,49,127,131,28,31,12,196,48,48,193,30,248,123,217,122,122,20,120,207,248,5,250,253,36,88,167,39,112,114,221,171,221,193,175,178,251,125,244,151,116,166,147,199,186,212,251,34,215,92,194,121,176,147,89,232,98,64,219,235,217,202,63,93,217,156,143,188,7,194,75,228,79,25,209,22,246,2,31,123,154,126,15,10,150,128,48,218,126,14,19,128,41,96,35,70,105,144,35,99,3,88,204,76,223,155,0,178,136,183,233,174,230,207,44,226,24,114,67,55,58,129,56,123,179,55,91,2,53,72,26,140,177,208,246,228,64,47,170,113,72,205,18,194,65,48,15,136,159,221,191,38,97,38,246,215,64,35,72,122,22,0,56,182,171,163,125,45,72,111,194,235,153,144,61,0,143,185,249,158,202,191,233,60,255,192,180,225,57,195,29,174,113,229,78,19,254,235,124,112,255,59,64,181,47,177,62,103,170,207,24,15,118,59,19,157,102,63,162,211,255,208,232,231,87,199,190,91,156,207,229,242,239,249,207,115,62,127,19,75,148,207,129,228,51,
+252,5,248,252,41,30,187,31,197,98,127,98,241,179,31,237,191,115,132,207,142,224,246,233,253,211,253,237,5,123,61,59,157,119,22,255,241,185,216,221,114,100,123,92,141,174,167,93,179,201,252,91,175,159,149,202,251,121,52,249,20,200,110,237,239,119,59,235,85,171,199,209,114,249,103,177,60,23,187,197,187,252,253,26,164,81,183,147,209,169,134,116,62,237,128,70,255,181,180,83,159,28,209,205,249,179,252,236,116,58,222,31,15,252,91,189,254,76,165,222,187,40,204,167,193,242,89,241,68,54,222,255,249,57,74,249,190,233,143,236,64,246,146,110,251,253,211,110,23,188,87,106,159,147,197,103,49,227,159,39,131,79,140,7,240,248,169,239,249,251,196,99,199,112,200,14,236,3,221,128,192,39,0,144,124,107,154,79,182,237,166,171,106,247,186,206,184,91,245,166,124,55,226,103,99,229,124,78,243,55,146,220,124,138,99,127,112,252,241,137,231,244,30,183,221,245,179,25,111,59,233,207,173,48,124,111,63,201,207,118,227,121,127,238,221,231,167,124,215,121,233,21,146,237,24,96,
+191,81,149,78,100,57,139,49,94,36,49,252,215,112,71,137,233,134,197,16,158,111,50,144,225,95,216,11,3,25,74,72,98,135,129,241,7,35,78,25,198,76,96,231,132,153,244,112,14,90,8,194,236,13,176,18,42,112,192,84,250,72,61,12,124,102,204,32,103,29,211,93,57,217,196,6,29,249,213,158,173,3,28,60,222,19,154,241,193,191,91,20,216,196,104,249,177,57,35,236,143,65,27,128,194,16,34,50,58,98,32,242,189,48,148,136,141,90,204,140,202,176,134,16,238,76,48,13,67,15,156,162,252,62,180,199,143,111,49,218,187,83,176,131,91,194,84,169,180,222,26,236,234,241,107,172,85,41,208,130,225,70,202,65,59,130,138,9,163,129,6,29,60,173,119,69,253,129,131,206,166,244,124,116,253,55,5,5,13,7,222,40,216,240,188,161,193,239,153,11,193,107,20,103,110,140,85,247,209,126,6,157,135,11,123,58,46,143,158,207,111,202,205,49,29,171,156,214,207,57,127,117,188,156,182,108,179,189,222,184,218,25,71,115,112,160,173,161,77,154,26,202,57,102,28,83,
+9,33,40,133,200,243,65,9,80,0,200,131,74,2,208,97,108,36,5,25,195,56,195,179,61,159,89,174,138,171,118,124,109,143,239,157,206,118,189,63,5,38,115,238,19,159,153,120,202,215,106,53,221,18,30,194,39,222,172,89,171,117,192,136,203,220,62,186,177,174,118,255,108,114,168,43,177,18,165,254,191,56,36,204,191,79,101,156,41,25,28,156,159,233,25,28,50,185,129,99,93,102,103,245,208,51,196,113,51,194,178,179,100,102,193,255,157,23,189,112,196,98,156,180,32,44,229,236,163,3,60,53,9,16,18,220,239,39,200,122,216,224,94,9,228,240,66,109,37,136,195,127,71,59,6,231,244,47,41,137,2,194,253,61,1,2,174,227,111,103,203,227,238,246,196,105,171,249,226,176,231,222,113,218,109,92,38,243,140,197,224,98,79,59,15,110,44,102,243,189,217,230,119,177,216,92,44,22,183,119,58,99,107,141,216,233,104,228,203,99,185,124,7,166,208,93,255,114,144,81,41,78,36,138,5,128,79,177,175,75,100,47,127,129,153,203,104,226,252,42,56,206,124,142,163,80,
+98,164,2,73,44,12,16,233,177,41,2,185,119,191,22,98,4,230,228,126,175,16,24,252,21,2,115,242,220,250,29,4,238,218,180,246,240,150,123,142,64,29,90,85,207,194,126,138,239,55,87,206,240,52,143,237,135,112,92,8,206,133,227,157,143,203,246,186,170,15,111,175,1,58,214,253,108,110,199,34,159,3,180,211,238,43,21,36,248,56,175,167,176,31,11,114,171,223,35,130,228,31,195,158,73,182,237,244,123,62,185,207,64,0,64,92,184,147,121,130,81,103,156,28,84,144,244,119,170,0,45,208,203,187,123,101,179,166,96,27,190,25,109,209,135,161,3,223,43,65,78,224,12,38,148,102,133,82,1,209,47,142,24,24,152,5,180,36,206,197,20,194,66,192,3,196,10,144,13,211,169,130,113,201,245,94,244,203,61,147,166,115,42,65,213,191,5,148,59,32,15,246,238,56,157,116,250,55,105,168,19,196,154,192,139,197,188,21,148,96,37,191,188,35,223,5,27,176,182,162,19,223,21,73,65,52,41,11,55,128,60,0,13,136,253,170,21,151,145,133,141,230,50,216,106,176,
+63,89,170,50,28,59,97,86,84,138,234,247,183,0,69,28,134,153,171,253,132,232,112,131,28,67,132,133,246,252,66,147,129,247,98,132,69,134,27,146,14,216,102,15,188,219,146,127,101,187,32,196,213,153,153,216,234,171,138,42,121,45,81,218,3,3,59,45,187,192,12,217,76,35,29,149,185,242,51,27,99,117,35,147,47,44,235,242,156,188,236,247,174,204,180,154,88,172,89,216,215,42,53,214,86,154,101,229,99,134,149,183,21,102,21,229,226,114,180,180,228,186,180,240,243,248,69,180,69,6,124,2,223,84,36,180,180,38,29,14,91,137,136,175,93,60,167,165,52,190,175,223,32,160,199,215,205,76,183,205,199,125,229,230,113,249,73,203,245,210,112,112,158,143,171,205,163,74,118,246,249,254,118,107,179,89,254,234,205,198,42,157,190,236,101,178,71,8,236,241,238,59,157,230,82,167,48,140,170,229,186,74,181,30,199,198,23,163,241,17,71,194,61,246,90,167,54,211,241,228,250,233,184,126,60,48,87,245,250,37,149,122,28,238,78,143,229,43,82,110,171,108,202,28,139,53,
+159,195,225,58,159,191,200,47,242,7,249,231,18,195,215,215,253,254,133,64,120,88,192,240,203,227,186,186,54,55,181,109,199,220,245,45,54,190,67,228,189,23,53,95,45,199,67,81,188,232,134,177,53,28,223,196,55,120,230,207,149,251,202,190,121,143,41,191,249,121,107,175,15,254,123,244,241,169,222,15,157,147,246,86,21,190,48,186,174,201,140,169,23,60,151,167,166,117,153,219,62,215,166,132,250,96,196,207,0,15,69,24,201,92,239,109,99,14,125,154,26,102,224,68,149,140,250,178,55,131,8,169,48,51,142,225,236,207,34,97,1,95,134,72,97,0,60,6,196,3,97,129,58,160,178,135,50,60,96,84,194,84,49,160,130,85,192,105,148,221,12,155,201,12,27,48,176,3,187,179,200,71,181,94,29,212,99,134,38,39,163,218,111,65,242,72,160,24,13,179,97,120,41,243,45,176,253,142,186,189,159,127,122,207,128,216,39,106,113,43,213,202,131,152,8,167,163,240,144,45,10,160,21,218,225,6,71,128,102,9,225,157,251,82,58,43,217,174,205,252,45,149,125,194,234,235,
+192,22,148,129,118,72,209,76,62,120,140,11,221,155,103,36,33,25,5,52,130,140,185,95,219,198,248,96,139,142,12,137,29,53,112,237,62,224,39,50,94,161,251,7,220,171,182,174,174,52,191,224,73,15,12,204,180,21,198,235,51,57,102,102,202,74,22,231,39,250,175,199,170,173,204,235,226,114,61,124,13,173,220,140,172,220,104,153,89,205,26,35,173,105,90,21,37,107,62,207,246,23,230,69,249,234,224,56,165,101,166,184,212,74,12,18,217,225,1,155,103,37,229,41,105,181,21,139,117,212,195,162,102,79,144,38,201,205,88,76,13,2,194,52,63,62,172,96,245,186,189,172,188,108,116,220,216,221,31,107,14,78,227,186,54,43,229,241,114,101,238,90,108,205,70,99,165,137,105,172,147,73,179,72,142,105,12,249,74,119,171,250,252,75,161,212,148,42,198,186,92,182,162,80,77,222,159,67,99,46,85,90,191,43,149,210,72,165,212,30,135,227,218,225,176,174,126,87,205,10,77,35,14,137,105,180,73,50,110,144,14,164,117,18,105,181,223,63,172,181,90,179,248,99,221,255,
+254,54,195,144,117,222,46,254,254,140,117,63,132,111,190,30,214,239,157,183,216,182,205,77,75,223,46,187,38,174,67,228,210,183,129,214,171,122,83,81,148,90,135,177,149,239,53,106,185,118,254,75,251,106,253,245,60,86,252,207,230,49,190,13,155,112,126,237,77,125,232,92,151,126,21,193,135,92,103,141,236,99,33,158,232,122,94,196,81,33,101,232,2,79,114,234,197,210,247,123,162,154,4,20,32,131,100,224,148,150,49,10,234,165,61,101,160,164,28,24,129,100,13,99,21,136,141,232,178,135,62,254,3,70,2,226,128,162,128,146,146,96,40,24,18,3,42,213,255,246,115,131,160,10,138,52,228,26,179,51,61,183,20,218,64,19,61,173,15,13,0,135,234,84,224,168,215,244,15,80,242,108,217,179,250,87,192,250,49,58,58,166,188,128,249,73,154,210,245,90,208,254,202,34,235,0,96,95,229,178,220,69,209,213,97,13,151,15,168,194,73,71,7,245,187,111,129,214,168,166,92,98,133,25,100,126,101,0,56,230,209,30,250,46,24,202,188,216,27,189,37,30,32,165,121,46,
+69,5,71,134,18,102,161,86,240,124,65,177,142,197,248,32,230,215,46,127,8,182,193,214,13,249,250,241,187,16,116,158,46,199,156,117,216,243,101,178,183,207,84,213,140,98,177,130,142,44,172,144,38,51,234,116,204,45,108,166,58,42,46,247,122,93,38,67,95,48,151,117,49,27,14,223,60,59,85,148,202,178,60,83,15,135,184,138,165,161,44,212,99,139,152,38,33,45,11,245,205,196,184,194,76,41,169,242,70,44,170,38,33,207,131,91,45,145,175,24,106,59,167,121,68,69,170,193,88,112,69,152,115,234,123,45,42,66,253,122,85,64,112,253,229,92,255,115,171,94,244,229,122,109,185,156,50,53,151,75,243,255,114,167,115,131,224,95,238,148,173,193,70,177,21,167,115,185,214,196,44,178,104,163,60,214,108,213,102,26,189,153,76,48,213,82,105,101,48,88,30,250,66,139,175,203,162,227,166,233,184,97,50,174,63,77,38,205,124,94,41,253,150,150,7,163,69,17,127,176,8,61,44,218,20,165,134,107,124,175,37,26,189,53,196,34,117,191,95,121,229,114,203,16,188,210,
+235,244,150,109,87,165,105,203,171,109,155,154,174,109,82,118,188,43,207,46,112,223,94,212,231,81,124,105,160,13,43,252,183,145,103,247,246,218,182,236,61,109,91,86,178,62,219,251,105,88,158,193,120,53,208,126,57,238,117,4,196,182,106,129,226,245,22,122,49,166,71,156,105,197,170,254,12,231,20,133,12,148,191,132,113,200,72,6,42,76,177,74,164,198,67,37,163,56,214,49,148,48,41,143,38,115,214,26,189,57,4,10,206,125,221,184,55,5,98,64,161,122,178,190,168,79,122,252,191,129,223,0,102,96,45,96,227,6,134,89,143,199,134,228,240,62,136,76,144,49,212,250,186,222,49,195,78,112,41,80,42,41,213,187,193,99,46,45,157,169,113,244,246,222,62,20,27,0,235,232,9,60,101,94,166,238,189,67,8,80,73,245,176,60,239,126,53,88,236,23,24,93,121,151,196,4,53,240,36,234,7,5,97,83,42,113,55,121,52,136,0,164,222,137,67,197,24,247,156,228,139,213,156,178,4,90,248,248,162,194,72,8,117,48,45,95,155,62,98,100,1,34,34,60,199,192,
+196,122,10,72,24,112,17,90,161,110,93,113,226,5,170,29,51,60,211,248,100,239,164,154,219,83,180,160,235,169,160,158,77,139,199,209,241,145,225,151,165,129,129,199,131,32,43,88,164,121,58,70,111,101,147,159,215,204,13,244,46,58,100,178,77,242,50,140,70,77,24,157,139,252,175,82,131,130,70,180,54,230,239,136,166,40,25,141,198,1,241,247,95,112,117,139,50,34,34,52,146,89,131,8,211,2,1,116,238,119,246,5,34,2,66,19,190,223,232,64,237,246,76,160,241,211,254,65,227,249,241,208,120,60,52,124,8,159,47,140,167,75,195,233,118,170,215,107,90,165,242,76,38,209,82,71,189,176,175,205,230,51,125,169,234,111,46,150,26,139,133,182,255,23,110,149,74,69,129,96,161,50,81,104,44,12,10,189,137,66,169,161,81,40,237,249,76,110,180,45,169,171,73,162,142,227,248,95,189,68,90,47,20,120,234,120,156,22,14,39,73,79,183,212,90,33,113,113,107,36,202,232,254,27,192,254,158,53,18,111,131,4,33,13,238,91,15,137,171,90,91,142,161,227,156,148,
+147,40,35,199,189,124,216,206,73,227,231,95,146,25,53,209,200,63,154,24,254,246,47,142,254,220,129,149,227,174,55,105,235,214,222,222,71,234,176,143,209,78,120,175,30,210,107,232,234,23,161,160,163,90,242,147,129,183,103,245,211,243,177,16,15,108,13,220,199,207,225,30,212,197,94,35,203,250,89,128,135,126,9,58,106,137,190,10,162,161,97,173,209,90,71,75,229,98,245,231,80,5,221,228,71,87,47,61,170,79,13,144,148,176,50,72,69,41,134,15,41,236,32,129,69,231,96,52,174,122,168,47,222,122,152,30,134,193,9,231,71,20,134,43,101,210,19,83,195,5,178,66,173,165,171,189,38,96,141,182,118,214,53,94,232,2,170,240,233,122,111,176,164,85,103,188,140,46,0,40,235,163,108,193,169,127,201,114,125,134,187,69,47,239,215,152,162,199,252,42,105,144,14,35,48,200,114,160,70,141,245,146,112,208,55,185,139,244,69,116,204,166,230,38,245,238,54,132,221,87,99,160,109,228,190,48,67,133,132,137,241,85,63,138,131,9,225,0,7,154,183,107,97,160,128,15,
+184,137,168,119,25,193,240,97,126,222,105,246,37,237,203,99,104,45,147,25,117,59,230,19,43,51,21,21,163,3,214,30,143,161,47,154,235,92,157,13,143,103,159,157,10,83,101,89,153,165,134,173,225,191,52,109,129,169,45,139,39,249,188,169,32,159,87,228,169,131,163,110,151,153,146,210,9,145,24,48,133,7,60,158,21,29,139,76,132,66,83,156,197,137,136,142,61,65,93,142,48,227,49,12,40,232,88,249,248,152,130,212,211,123,100,198,76,71,199,164,99,255,23,151,101,134,12,146,235,149,237,114,165,185,81,238,228,114,57,54,217,124,135,52,210,106,173,54,187,133,209,102,102,44,151,204,244,249,60,97,177,142,188,179,197,161,76,180,242,187,190,86,103,163,211,88,163,100,34,21,137,76,130,191,193,227,219,235,208,101,217,28,242,48,147,48,78,223,19,86,177,152,86,40,196,19,10,229,88,32,57,6,194,0,135,62,197,33,245,6,223,107,129,195,152,195,177,48,131,239,49,194,143,80,102,40,152,186,110,109,236,109,219,212,117,12,207,222,191,226,243,229,252,91,47,202,
+71,105,114,114,108,78,211,211,12,35,203,241,235,249,158,133,247,244,219,124,134,240,19,207,35,93,239,62,135,239,149,233,104,137,241,153,190,155,159,147,71,44,3,8,196,231,170,245,250,238,31,117,231,79,1,229,247,38,203,20,103,25,76,205,83,173,192,201,191,78,249,70,73,216,15,87,108,224,2,230,165,148,125,218,119,242,211,140,236,153,62,116,178,138,103,134,113,19,61,177,101,46,61,184,13,158,243,56,16,142,26,188,67,244,24,160,97,143,129,83,112,14,53,234,67,175,234,87,253,50,48,37,141,111,66,212,176,218,32,205,24,232,199,176,136,17,133,6,23,77,122,109,210,111,197,60,148,156,165,123,183,10,246,33,33,40,48,134,182,187,119,183,62,189,11,92,91,212,91,125,108,28,107,250,50,166,78,77,127,91,7,181,64,29,74,182,43,224,233,78,119,254,139,63,236,15,137,189,56,168,227,6,39,102,60,18,170,81,122,31,160,206,183,85,35,96,13,188,40,105,247,26,189,69,52,252,246,156,202,57,154,201,133,163,137,255,8,211,190,100,70,45,129,126,103,214,
+154,130,124,67,116,214,167,86,34,48,157,155,121,193,226,79,245,75,115,132,118,205,220,5,161,175,206,104,10,144,49,202,200,67,179,241,107,103,77,134,64,206,204,69,119,178,24,188,201,9,227,138,203,70,22,214,212,177,70,229,101,76,34,34,198,224,140,9,169,56,71,208,31,28,98,178,161,240,171,48,25,131,191,146,84,126,167,15,229,49,181,148,30,131,53,72,226,136,48,56,213,19,136,41,70,176,19,140,241,251,79,87,19,14,18,216,253,165,186,124,118,104,108,244,120,82,89,43,62,212,215,183,219,169,103,149,94,204,7,190,254,203,180,94,167,150,170,226,176,149,50,91,12,88,108,47,245,242,20,171,177,18,182,98,44,151,83,101,42,167,88,143,83,232,166,177,127,156,138,35,139,173,20,128,66,51,66,161,169,14,142,71,102,39,71,83,83,175,94,79,69,97,100,154,45,42,145,25,227,241,212,110,32,34,243,179,225,40,204,152,207,167,74,20,242,129,25,119,191,83,16,248,219,36,20,166,66,240,212,231,245,72,181,93,169,245,181,153,194,178,83,231,229,35,69,85,
+165,34,232,212,203,113,76,205,139,41,164,149,156,34,138,83,120,223,221,216,253,100,87,237,100,227,249,178,28,235,211,84,46,198,55,124,158,226,163,173,251,110,126,21,17,101,3,220,251,156,180,222,115,57,254,228,158,62,199,165,66,156,92,6,27,196,196,146,233,111,156,147,205,192,175,165,28,179,122,122,18,75,195,103,164,67,45,156,118,132,50,84,145,150,148,202,246,240,151,225,22,218,62,113,233,155,216,122,199,148,58,24,84,254,149,160,52,137,167,10,12,110,192,160,198,152,18,41,185,254,96,130,49,185,178,51,3,206,243,155,137,56,50,167,129,89,209,106,63,61,83,60,96,197,62,56,28,52,150,209,9,164,88,19,107,84,239,130,214,233,147,182,139,113,238,85,208,204,42,158,81,143,152,241,56,159,106,5,192,190,21,55,181,165,54,214,15,65,85,4,53,11,105,221,237,167,93,28,215,47,66,207,82,30,58,174,55,130,164,40,244,64,50,129,25,52,0,238,13,191,212,165,218,140,85,8,32,132,158,196,39,75,148,161,10,207,20,20,104,145,48,233,217,185,154,221,
+130,131,137,124,200,39,232,67,116,213,58,181,226,117,134,195,194,11,222,58,37,12,236,196,142,94,72,53,190,51,103,197,103,35,131,128,145,34,147,101,44,171,110,126,150,237,247,228,76,112,90,88,212,205,172,162,170,198,136,107,190,154,26,45,203,231,201,133,121,1,241,111,42,197,101,38,109,92,42,35,18,201,97,193,128,197,179,230,41,241,220,63,81,205,252,45,64,36,36,38,12,158,14,198,133,243,158,95,66,96,12,239,143,52,164,63,56,246,210,175,151,76,91,45,97,155,203,197,220,176,183,15,101,155,77,177,74,87,224,197,161,82,103,179,88,226,76,22,43,171,209,72,97,210,105,89,52,90,12,225,193,10,109,166,212,92,138,149,10,67,185,204,84,234,255,139,121,27,141,238,226,92,161,176,215,74,189,210,72,169,54,143,167,1,246,225,152,118,56,100,68,181,186,56,145,41,60,240,54,133,181,72,196,13,16,169,148,73,34,165,246,209,189,172,86,43,158,204,79,133,50,113,26,33,231,196,253,176,120,179,43,36,217,240,169,7,252,110,212,57,93,181,243,138,166,88,
+198,178,101,203,106,138,46,210,177,181,29,51,215,53,155,58,95,141,211,211,222,156,255,18,139,120,31,107,235,253,116,204,87,221,60,185,212,165,249,239,197,157,58,19,23,249,159,25,202,20,182,168,33,225,199,113,191,46,170,223,120,232,16,87,179,35,160,236,26,194,16,13,218,105,34,61,1,140,135,82,212,163,129,80,128,71,71,106,242,88,240,105,161,45,12,57,8,148,96,85,159,6,66,56,186,231,86,19,106,12,63,8,129,64,15,82,73,189,110,25,113,131,142,202,20,94,221,239,160,255,246,169,180,182,151,65,56,226,41,35,155,97,233,85,80,76,182,123,194,97,240,2,39,183,115,66,211,187,80,142,243,95,106,59,232,32,255,166,30,198,7,248,71,103,124,30,208,63,110,202,19,93,177,216,41,64,17,0,222,214,86,183,117,4,7,213,101,24,110,78,24,45,230,1,178,189,7,231,107,129,227,152,126,26,90,134,210,164,210,26,165,151,193,48,97,68,87,173,129,172,221,180,171,67,180,134,116,98,211,195,116,174,20,42,167,183,21,247,47,74,16,7,143,236,100,176,
+130,16,6,239,248,208,141,221,9,206,19,222,96,13,61,191,227,88,45,93,177,91,128,181,250,254,115,109,90,230,19,11,27,134,33,68,153,179,126,186,15,111,246,252,252,199,244,47,73,30,213,219,173,147,127,73,114,5,117,127,162,68,20,230,218,127,105,114,57,217,201,148,22,134,191,136,188,95,100,192,225,217,138,132,93,78,99,195,97,24,137,123,78,65,98,192,224,40,88,152,179,235,123,20,68,21,243,122,69,65,223,33,246,23,229,101,127,199,44,200,227,129,245,120,162,56,91,172,214,94,175,22,70,251,229,194,106,54,177,235,232,58,90,169,12,147,104,190,193,81,175,213,102,43,204,76,95,169,178,191,60,135,181,88,162,139,197,144,55,150,26,68,193,90,71,191,81,107,44,52,10,227,131,70,99,161,208,40,232,23,52,236,240,12,182,42,155,193,93,167,82,230,201,115,196,40,22,48,95,158,251,151,27,31,136,12,3,111,135,65,159,98,190,60,231,125,45,48,24,179,63,250,31,207,193,136,255,120,14,131,231,89,25,95,158,235,56,134,17,247,57,201,160,140,220,247,
+75,250,246,103,220,7,59,208,97,221,20,45,254,192,49,49,60,27,207,183,222,120,238,89,203,215,189,241,215,182,168,206,107,124,251,238,138,189,24,143,249,144,159,98,3,161,170,36,188,9,219,144,197,166,123,22,112,201,238,224,79,64,163,100,251,127,70,218,182,15,253,3,210,248,67,7,139,156,68,214,50,161,131,213,70,59,26,90,160,49,74,169,174,246,28,192,164,70,82,219,196,14,54,218,61,93,135,132,73,128,36,120,85,99,5,11,122,90,135,160,85,30,212,216,65,220,129,149,106,104,81,195,47,108,152,7,68,200,52,166,89,93,211,247,34,32,46,246,136,75,101,123,27,154,197,132,102,52,163,79,147,64,189,234,237,209,104,173,87,237,48,140,2,36,186,3,237,170,181,34,32,252,249,248,78,1,77,187,236,214,63,245,107,185,58,117,121,215,232,245,123,214,64,103,12,32,71,39,246,10,215,114,147,69,19,223,155,55,102,124,92,102,220,48,124,71,88,3,41,164,63,189,235,47,34,97,219,137,190,206,89,253,109,192,184,134,29,81,9,20,63,135,128,207,91,97,
+5,191,4,9,98,99,51,195,147,59,232,95,106,204,157,232,90,175,40,241,194,113,186,220,117,107,235,22,209,59,233,82,115,23,45,161,48,132,12,148,97,239,158,254,147,222,18,20,153,230,6,45,244,133,148,117,146,83,141,176,74,106,255,84,18,16,74,44,10,10,220,218,12,9,113,76,65,145,252,5,34,2,34,3,6,207,30,200,19,2,26,27,6,203,97,36,115,194,23,81,88,48,76,152,211,235,123,53,2,226,139,40,24,8,166,63,157,153,55,55,120,77,95,206,214,150,211,169,199,176,115,66,87,155,16,175,74,230,254,85,174,193,108,102,11,179,209,196,98,52,26,216,100,18,26,226,197,66,97,32,215,221,54,229,42,83,169,196,80,26,84,216,114,25,134,66,185,255,75,161,167,114,128,255,82,232,20,234,238,191,20,250,31,140,216,106,133,50,56,161,10,158,36,48,231,191,89,27,88,242,175,133,2,19,143,198,97,16,72,232,233,14,11,173,21,2,119,141,8,252,167,190,111,79,96,141,192,219,32,176,22,185,251,57,179,127,186,187,237,150,215,191,172,67,233,44,
+27,182,172,98,171,58,2,75,219,54,114,124,219,147,253,24,221,29,36,253,87,205,16,234,135,96,224,21,28,251,184,178,189,175,106,101,87,174,194,62,239,110,113,215,135,195,124,207,114,128,128,88,106,16,8,223,117,212,224,27,156,240,184,202,215,63,171,43,58,209,224,140,171,132,106,19,25,80,101,168,165,131,139,153,179,114,212,55,126,43,143,132,174,98,136,64,85,72,108,109,29,89,252,84,158,142,218,216,224,56,151,103,64,43,211,160,140,42,65,16,149,241,50,175,231,195,253,8,152,202,173,156,24,53,67,47,2,161,194,114,42,154,186,105,88,197,202,7,51,109,162,55,195,129,145,63,181,118,176,135,218,147,203,90,39,108,36,227,84,89,195,1,164,210,145,13,7,148,202,85,123,135,176,99,91,13,68,235,95,249,49,182,195,205,11,72,51,102,247,229,166,190,145,250,129,35,172,41,91,189,153,122,97,140,133,123,1,153,73,165,90,174,255,25,134,204,144,139,129,173,180,27,240,61,18,0,8,55,123,224,206,12,198,50,40,155,137,7,39,166,100,8,79,41,191,65,
+196,49,23,224,227,58,164,251,32,223,255,131,172,133,51,39,248,234,84,201,157,232,2,255,144,179,195,29,62,183,194,148,254,231,234,138,22,81,67,55,101,242,127,206,24,103,67,37,181,176,238,139,21,166,162,154,83,81,225,241,137,82,81,206,161,87,16,45,57,103,98,104,209,196,156,72,108,136,132,46,56,124,142,18,69,6,144,251,12,33,139,55,36,140,1,147,35,129,6,27,27,129,224,241,152,131,4,175,191,167,83,135,159,236,221,51,45,125,179,150,62,110,247,25,14,190,217,200,182,46,231,44,147,113,122,226,220,205,82,220,108,206,185,52,154,211,193,220,44,234,34,54,107,118,191,59,63,90,156,86,35,85,169,92,115,165,210,105,36,105,189,186,159,100,98,86,40,252,56,237,12,173,82,132,142,162,231,207,127,59,127,50,113,161,201,52,79,253,166,156,98,112,38,41,198,20,11,179,209,200,105,248,16,113,248,159,225,96,134,101,48,238,243,162,211,152,37,225,16,2,190,71,180,13,5,103,4,194,61,80,3,127,55,242,62,232,107,239,139,237,221,131,189,214,55,215,
+123,128,122,79,113,164,247,195,243,30,97,35,239,31,201,123,193,188,211,243,159,187,31,120,255,220,223,247,238,71,228,123,210,73,239,169,111,142,247,197,36,159,29,220,73,168,186,111,8,196,23,66,49,94,173,139,62,139,107,190,43,254,188,172,249,224,22,144,94,29,25,104,112,75,140,162,150,12,55,120,15,9,96,165,225,44,203,181,163,42,214,48,85,26,122,83,37,82,153,168,207,125,131,134,191,12,170,137,181,164,88,111,5,89,28,21,94,212,32,139,178,104,203,214,22,202,240,179,136,217,47,63,189,66,247,73,196,108,114,241,210,195,186,218,91,153,234,157,0,106,36,160,86,15,255,168,170,37,174,214,14,154,214,238,163,108,152,6,91,116,149,203,99,183,178,240,254,244,139,117,12,165,199,216,208,187,156,166,119,197,233,38,251,223,3,75,183,186,109,34,125,43,180,137,177,98,86,210,108,189,60,172,163,35,34,203,36,106,16,195,135,2,72,5,69,35,145,131,44,198,35,112,53,148,53,82,150,214,186,42,230,49,169,185,7,166,50,148,112,216,128,232,98,94,118,101,
+230,123,49,71,133,91,127,55,102,184,240,205,83,234,216,226,149,27,133,19,93,111,58,227,251,143,136,61,47,164,250,219,207,242,190,111,236,61,153,159,234,226,220,98,97,147,53,70,71,211,172,168,74,247,124,222,67,42,40,170,242,211,193,161,65,167,100,244,196,89,28,22,223,145,97,159,91,77,253,145,123,106,106,62,235,167,64,150,116,36,5,252,5,183,128,6,95,126,128,187,35,200,93,175,75,228,59,152,157,46,31,247,211,219,205,227,37,203,215,203,124,241,125,195,193,121,95,174,102,183,44,221,174,62,37,155,109,217,108,156,240,26,205,157,70,123,29,175,38,175,34,222,173,201,125,58,93,181,90,158,47,141,203,179,197,114,87,42,57,175,177,212,43,10,118,15,21,153,78,83,166,83,62,51,52,234,4,133,222,137,32,208,171,195,243,218,222,85,62,87,147,77,20,158,211,209,172,88,60,43,98,138,59,133,242,42,144,122,94,97,128,207,215,225,143,216,114,44,182,20,139,210,167,44,111,38,22,157,60,120,222,60,20,60,9,15,194,59,28,127,186,110,62,243,109,43,
+223,117,74,247,190,125,232,179,102,189,61,9,234,43,130,190,31,171,211,211,79,118,153,229,56,114,124,143,242,51,255,121,188,128,224,251,214,91,92,126,150,221,187,206,87,218,126,142,252,59,254,35,123,124,66,252,211,231,236,19,191,141,75,9,104,224,41,58,46,72,235,117,120,36,216,173,186,193,17,102,205,111,135,38,14,59,107,128,49,241,233,210,106,210,127,154,248,236,200,74,145,20,166,89,43,107,207,4,229,178,185,181,85,84,70,207,179,159,43,148,222,129,48,167,13,236,117,151,48,8,134,128,88,170,213,92,243,228,250,224,104,180,41,5,76,73,236,201,42,213,47,134,96,88,248,23,83,52,47,252,12,85,235,250,242,53,115,169,186,93,48,158,172,85,63,9,223,143,89,181,207,31,77,174,220,232,96,84,91,121,213,62,103,176,165,199,124,170,118,81,205,240,76,186,208,122,96,46,120,10,219,192,91,43,171,253,71,63,143,222,97,18,158,167,237,158,171,219,115,189,46,160,70,21,189,168,154,132,65,2,16,199,166,230,146,12,194,28,209,194,113,176,253,239,47,209,
+145,134,96,246,183,192,183,60,20,18,233,77,193,87,54,116,83,50,199,196,127,99,5,43,88,207,208,3,99,91,238,73,252,139,145,137,14,190,194,215,242,155,130,255,155,79,177,118,51,183,56,179,176,242,205,42,245,83,89,150,42,202,246,76,142,46,40,8,197,127,168,202,200,218,255,106,23,136,68,174,49,28,52,186,213,98,249,152,91,83,179,89,5,98,92,146,145,20,176,184,5,23,18,108,251,1,25,65,54,119,190,46,17,193,216,23,85,247,251,201,205,243,225,146,229,243,101,113,183,255,67,149,214,213,252,84,203,210,229,170,100,217,254,11,77,159,52,154,161,147,70,107,31,77,218,151,34,94,173,201,85,58,252,127,237,10,203,51,198,98,113,46,22,237,113,76,170,21,5,171,29,237,83,165,41,83,41,51,148,7,125,134,66,157,32,80,184,253,246,106,109,85,58,159,44,78,38,10,227,73,108,81,40,158,231,115,39,145,66,105,31,140,90,195,45,79,231,235,208,232,162,46,18,158,241,188,229,8,45,186,224,185,243,158,247,159,26,141,175,66,97,139,39,207,91,106,
+251,116,174,219,53,123,125,88,55,19,123,186,157,35,108,22,101,124,123,156,116,162,233,167,235,52,51,207,240,43,220,160,93,232,58,132,175,179,31,194,6,206,63,117,95,215,159,166,41,118,29,211,29,206,172,55,255,90,111,165,78,223,51,64,71,44,37,168,175,42,63,172,143,18,59,222,255,71,202,36,17,171,229,247,234,219,249,194,16,19,59,21,113,230,144,221,36,84,7,76,145,46,14,117,87,9,214,17,169,169,138,195,93,73,61,121,50,252,7,56,5,112,122,34,187,194,30,235,81,208,38,230,245,135,149,209,144,57,195,93,198,63,31,120,233,60,141,45,137,199,34,154,184,85,186,183,196,153,155,232,90,35,56,65,185,173,85,131,3,134,61,11,86,171,193,144,205,222,184,87,127,250,113,164,130,139,91,59,195,37,214,250,74,215,0,149,253,4,171,195,85,13,46,80,53,121,11,57,0,244,227,205,11,78,173,225,15,45,155,166,6,24,106,150,254,28,132,158,14,25,197,65,35,189,25,89,83,241,62,15,136,84,128,2,144,23,192,12,177,148,220,23,10,200,77,158,
+136,53,2,150,80,25,9,251,165,8,210,14,237,15,196,163,49,86,131,148,239,16,176,172,152,252,6,120,145,154,191,62,136,154,204,249,245,0,32,89,240,190,150,166,255,131,147,230,16,21,115,217,69,101,57,172,86,82,47,167,146,42,87,90,80,81,154,86,102,33,34,207,165,133,245,47,18,81,17,229,113,248,101,79,145,80,209,150,112,24,213,44,81,80,145,53,24,10,110,9,10,47,61,191,93,69,152,61,30,22,8,94,56,62,90,94,175,6,134,151,77,142,23,143,71,192,226,241,52,112,177,38,191,173,89,255,151,143,156,53,155,150,245,186,177,175,84,214,73,180,213,145,169,55,75,146,245,170,244,168,84,151,203,133,217,18,179,52,88,172,245,217,34,182,26,11,205,188,80,131,211,85,105,212,121,50,193,55,71,34,13,145,104,61,8,0,173,190,46,155,142,255,73,199,243,147,233,114,100,50,89,152,204,134,25,97,94,47,148,86,71,125,202,166,72,210,191,185,232,62,50,31,14,45,249,188,184,33,151,175,71,18,43,71,20,124,204,136,86,181,60,197,38,137,94,59,
+63,134,205,81,123,30,213,199,246,97,189,68,177,235,243,23,222,170,170,133,174,173,205,117,173,28,207,163,218,121,206,137,199,211,126,209,252,18,215,194,80,131,255,126,231,54,205,159,182,137,22,123,68,232,141,172,247,154,127,175,183,141,238,39,220,97,35,150,78,72,184,244,5,83,210,254,134,24,150,230,86,181,231,196,90,170,33,187,168,135,234,191,30,74,103,161,159,0,158,85,4,109,193,174,172,149,173,32,173,236,194,145,157,85,100,45,207,126,239,129,23,240,36,130,142,164,55,35,149,181,125,180,195,82,131,150,232,164,223,190,187,173,235,62,11,146,196,236,171,148,214,197,46,235,87,89,145,139,219,74,55,252,120,48,235,242,74,215,31,61,184,153,180,221,166,167,143,65,71,168,181,59,112,60,168,45,87,237,210,87,52,241,63,122,232,71,102,125,46,107,237,80,70,89,117,39,119,234,160,39,91,244,146,143,44,246,69,205,73,247,203,152,113,220,10,1,154,126,166,87,6,103,51,212,227,130,162,152,68,64,129,161,204,72,46,193,57,124,49,214,96,55,60,35,230,10,
+26,126,171,129,131,101,223,85,126,85,100,151,21,58,143,57,22,142,27,149,148,162,2,35,72,40,197,231,119,236,122,53,78,184,176,144,62,209,61,158,244,183,138,48,218,54,119,74,155,172,178,188,42,108,81,82,39,167,146,88,84,50,202,41,44,71,107,33,38,207,37,133,244,111,0,17,21,245,153,188,10,41,71,137,170,43,24,44,96,254,91,16,147,230,48,196,63,28,77,122,126,134,152,48,187,127,113,4,23,246,255,225,72,253,229,57,88,178,124,186,244,22,118,78,250,106,147,189,84,201,98,93,49,159,217,254,87,227,96,254,242,28,139,70,75,127,121,78,166,136,23,107,114,190,66,87,45,125,39,146,126,105,177,88,88,139,5,39,93,166,202,68,193,226,161,163,85,168,138,148,239,88,65,161,45,145,8,139,24,12,166,223,94,153,238,157,37,179,85,241,76,197,63,26,207,141,70,243,60,54,103,149,74,233,4,234,246,221,142,204,144,35,241,248,106,56,50,31,12,40,230,44,127,33,18,89,6,95,186,227,249,42,16,32,124,25,12,89,240,95,171,191,233,86,91,174,
+159,189,227,24,59,46,105,19,77,20,155,182,44,89,170,81,213,76,215,126,39,18,186,202,113,136,29,127,133,206,113,197,152,236,250,233,58,222,183,240,126,58,38,220,150,63,97,111,205,93,237,83,248,55,34,167,187,221,143,242,239,181,181,0,77,246,168,64,208,33,47,201,93,255,11,177,49,237,104,93,232,3,215,18,238,10,62,160,139,182,25,217,59,166,94,6,234,66,108,222,70,187,170,167,133,187,238,204,141,213,238,234,109,112,99,60,202,1,221,225,21,65,15,228,170,111,21,254,236,212,157,170,87,241,19,60,56,27,214,70,220,204,96,27,116,171,114,225,101,179,175,75,102,139,219,52,109,74,117,200,131,186,118,88,60,221,240,79,198,51,186,246,79,182,118,186,67,191,30,158,171,237,134,91,218,1,107,247,126,112,86,203,46,149,126,27,60,85,83,117,180,126,3,114,76,224,216,219,109,148,187,234,20,123,40,104,122,159,249,101,27,146,33,3,142,237,135,209,168,140,175,164,18,196,241,195,39,130,21,96,202,33,185,147,97,90,115,193,93,250,18,44,48,193,159,170,
+98,29,202,51,6,206,148,131,71,211,58,38,10,180,204,178,65,254,106,130,130,132,81,43,112,167,148,47,147,114,74,24,62,61,201,136,37,203,63,152,114,181,138,178,242,60,75,252,35,181,138,188,20,60,56,26,178,98,82,74,80,139,197,11,100,216,83,113,171,101,114,75,77,45,231,177,190,74,9,253,219,151,240,56,37,52,116,113,6,2,45,126,193,102,219,170,146,33,172,108,245,58,60,43,254,220,22,186,202,181,89,151,175,39,185,195,206,57,95,109,78,85,178,219,174,43,54,179,156,237,99,83,53,27,165,47,175,45,104,180,127,141,15,95,94,251,175,241,33,243,85,75,138,229,178,252,229,181,197,98,113,46,199,168,78,81,176,221,209,218,181,170,34,157,166,76,26,19,165,72,100,17,12,134,207,255,43,126,192,179,85,153,120,126,58,254,83,152,76,229,249,124,65,52,155,207,9,148,211,129,171,115,25,242,204,111,110,26,139,40,254,245,62,196,242,11,185,252,60,146,216,191,219,189,102,68,103,78,157,226,146,68,239,29,195,207,229,168,189,143,42,239,245,176,222,39,
+233,243,38,71,184,55,44,231,241,53,185,64,211,203,211,76,85,145,229,228,249,110,197,206,123,73,189,110,250,251,171,23,56,95,187,170,235,223,166,252,57,98,239,199,79,182,252,185,193,239,58,247,167,252,121,95,23,159,227,195,214,189,164,129,128,207,237,211,182,240,201,4,41,207,179,18,248,179,117,217,77,27,56,210,121,185,214,77,212,71,130,127,152,238,53,103,21,7,255,32,28,188,195,77,217,87,76,217,143,201,173,81,143,130,235,188,206,237,182,67,244,140,196,128,120,178,92,121,158,198,27,101,39,239,231,161,65,83,102,99,122,164,36,171,78,199,4,197,99,247,188,249,109,210,103,194,71,83,36,143,122,227,5,160,38,92,86,230,206,220,166,214,253,192,209,177,7,242,25,224,19,154,253,142,85,162,231,237,6,180,190,56,134,111,217,174,140,187,218,8,39,207,238,27,204,50,85,213,58,193,138,155,98,157,24,172,88,42,123,75,147,233,253,189,74,88,187,97,52,163,6,41,52,41,134,197,145,72,102,20,39,205,33,132,180,128,98,8,192,224,227,58,152,115,96,168,
+225,2,166,251,66,147,111,98,181,7,51,221,33,116,224,207,76,121,2,16,173,115,92,48,137,237,151,194,188,18,79,88,3,96,74,220,51,132,143,93,125,74,47,16,213,58,224,62,226,106,23,177,56,229,249,95,137,132,144,148,148,215,71,70,106,73,201,210,51,243,113,137,178,223,127,82,35,6,68,68,41,252,21,82,227,202,176,168,12,238,9,18,242,18,22,243,197,51,136,246,126,83,163,1,249,237,89,238,242,143,168,88,113,239,80,118,236,157,114,22,143,10,229,91,231,171,202,233,44,113,99,92,37,14,87,126,184,92,74,77,250,95,67,196,110,158,255,215,16,193,226,149,176,88,229,253,94,198,181,185,74,107,165,92,140,137,149,218,74,185,172,184,41,85,229,241,88,105,180,27,203,115,133,82,18,134,148,75,18,165,186,68,221,252,203,121,151,29,14,177,146,195,41,95,172,74,142,169,72,37,10,19,73,111,81,42,83,146,200,101,76,60,174,132,64,202,207,128,251,187,29,149,44,22,221,239,37,42,83,113,231,30,194,231,155,65,233,70,180,168,44,37,10,153,15,123,
+110,2,20,174,210,142,121,84,206,87,243,60,188,194,22,247,115,185,172,138,41,147,244,50,93,43,87,101,184,69,174,87,227,188,237,131,231,147,124,241,179,231,151,224,120,229,101,235,173,174,219,170,251,125,233,43,79,249,170,247,30,255,42,127,39,212,189,189,245,150,128,118,43,4,112,171,240,181,47,106,103,219,15,123,64,91,199,69,46,40,95,121,238,254,46,26,220,177,225,91,148,155,185,123,76,12,105,136,103,188,139,85,252,77,192,22,237,190,115,119,151,80,18,74,79,224,183,0,183,232,22,161,239,112,126,21,252,74,25,117,44,238,198,237,188,91,176,122,150,192,18,86,197,39,38,51,143,105,85,192,135,92,254,14,244,94,213,212,165,9,23,112,75,179,185,155,59,47,188,138,229,234,224,171,214,133,123,243,118,67,143,163,238,67,114,191,241,29,251,254,238,232,92,172,245,237,121,165,39,163,133,75,106,102,188,202,105,123,107,156,202,180,130,241,130,32,234,113,146,10,176,123,182,94,2,255,29,168,50,11,70,156,75,74,133,92,96,3,35,69,196,141,192,223,27,225,
+88,47,243,66,32,220,174,153,187,54,1,27,150,153,46,182,56,24,231,63,121,38,220,250,67,161,6,4,54,82,129,209,75,186,161,213,121,229,118,192,115,98,251,35,163,209,190,130,134,117,133,255,223,99,77,5,85,137,146,182,50,34,178,130,43,45,140,127,17,5,145,224,31,201,21,40,5,128,186,130,195,42,226,133,176,130,100,192,224,148,80,92,112,236,7,20,4,185,225,229,170,66,6,227,211,141,234,113,167,184,121,164,117,114,60,95,151,47,167,158,220,193,25,95,109,198,47,207,213,235,138,213,236,146,179,254,155,80,148,47,207,37,254,85,74,92,77,70,67,190,158,19,176,213,186,234,191,74,9,227,146,106,177,36,190,60,55,46,83,141,198,66,125,208,209,170,85,69,26,237,166,76,38,40,145,72,226,203,115,255,154,37,124,222,46,147,173,74,197,243,246,201,84,101,50,82,152,81,102,226,116,26,47,148,118,163,52,194,164,72,82,171,84,41,26,83,13,7,76,138,193,144,152,205,198,160,18,229,187,29,147,24,17,254,175,95,162,135,193,150,189,79,185,251,246,233,
+254,109,121,135,12,141,59,214,52,19,108,27,157,82,213,169,116,173,60,172,227,148,184,63,157,191,237,69,125,40,41,198,200,10,57,33,142,81,125,175,188,196,189,243,59,62,190,228,161,185,165,118,63,154,199,115,101,26,119,63,218,199,51,217,165,248,30,220,176,145,80,181,18,8,219,230,151,76,13,46,186,171,16,51,60,120,174,64,173,234,129,183,245,171,168,225,64,166,94,138,122,54,116,220,126,174,104,67,27,200,189,150,187,155,128,54,141,185,186,244,232,224,182,118,116,65,174,112,61,122,248,162,133,182,137,171,132,225,226,66,181,13,171,133,94,25,50,65,209,46,242,42,6,141,225,168,46,220,170,159,234,77,121,46,116,205,90,143,102,76,23,220,14,61,93,191,132,100,151,214,183,178,27,134,1,28,61,236,218,234,166,116,151,215,196,247,1,58,125,44,221,162,243,212,206,67,42,122,161,227,222,12,200,106,115,25,115,77,107,173,232,61,42,226,165,135,127,48,180,8,151,170,27,134,192,175,249,211,216,204,69,70,73,17,208,195,94,114,243,225,129,193,246,40,32,78,
+24,250,11,8,67,194,45,76,101,231,223,2,108,208,54,3,187,122,76,104,40,51,137,34,150,241,199,117,121,47,19,232,184,141,98,2,141,4,179,63,16,152,160,165,246,215,242,160,150,143,197,126,67,191,71,141,222,48,132,182,61,165,133,116,185,106,100,132,150,148,140,17,179,79,252,165,132,66,119,20,170,128,136,160,132,37,33,141,84,66,132,81,212,64,0,154,147,51,24,250,28,2,162,126,189,80,30,80,110,247,135,242,122,51,80,252,79,239,64,245,76,61,40,30,15,10,23,131,103,155,202,233,172,112,234,93,84,46,23,117,185,180,34,77,182,200,82,206,131,11,162,239,138,217,226,87,176,216,84,44,22,181,255,87,66,193,21,89,237,149,124,81,44,215,86,252,165,178,66,169,162,142,99,99,148,209,24,153,43,196,34,73,56,223,82,203,123,234,18,229,223,136,98,80,255,254,254,85,81,12,46,86,145,42,73,36,26,132,191,217,170,68,170,184,21,10,148,120,28,21,70,132,35,65,144,200,219,225,16,217,42,4,174,226,198,189,148,8,76,201,253,23,17,221,158,53,
+34,79,203,64,96,203,16,136,156,215,115,231,32,112,213,166,195,43,183,188,26,251,95,17,67,164,72,236,151,244,126,59,70,13,6,145,200,159,248,136,50,77,41,63,153,160,2,199,255,74,42,209,206,126,250,221,247,0,131,165,107,75,233,190,85,183,242,66,21,153,242,21,239,243,251,26,233,190,69,55,87,123,75,1,218,39,81,165,223,141,175,122,65,91,4,255,25,235,187,240,93,55,225,25,216,65,67,116,61,180,235,126,42,86,39,189,180,235,117,225,130,213,29,176,139,125,98,119,150,105,176,26,184,12,79,251,114,79,220,35,7,99,193,104,204,144,70,60,15,55,84,180,207,6,103,225,124,37,150,79,244,198,173,183,47,215,15,85,158,167,73,183,75,135,108,136,46,138,246,204,214,70,240,45,90,167,179,237,239,213,207,210,230,142,46,191,226,130,94,221,31,214,158,137,149,199,219,26,20,20,205,180,102,237,6,76,17,117,106,120,217,211,52,126,166,33,0,234,3,207,36,154,88,102,159,51,78,130,152,128,173,138,48,56,98,49,161,8,96,8,3,200,0,137,81,236,
+25,184,42,7,183,7,55,139,196,68,141,101,214,151,251,211,72,229,161,110,143,87,254,20,191,152,88,42,65,25,132,136,84,140,69,47,104,185,240,203,152,125,191,225,227,158,65,90,129,253,191,3,78,146,81,65,177,26,65,34,36,17,17,139,79,202,19,18,25,205,132,193,198,191,35,74,70,138,195,224,99,78,80,152,244,3,82,130,44,225,124,77,34,130,81,252,244,95,157,128,155,119,71,211,85,203,53,245,28,58,253,218,255,143,167,179,108,78,165,107,151,240,95,199,221,221,157,16,220,221,221,130,187,187,187,59,28,246,243,86,157,124,72,77,213,176,32,21,154,238,190,23,53,215,112,106,23,107,67,165,76,150,107,242,197,103,74,48,91,147,255,184,2,106,181,129,70,171,173,15,70,149,60,94,174,94,127,23,83,66,169,146,124,204,231,67,179,217,192,178,177,106,39,179,74,145,232,150,115,66,165,150,78,5,255,187,222,119,36,149,14,12,253,126,45,71,84,173,4,62,26,95,155,76,122,201,163,113,194,96,28,97,106,53,195,223,95,237,174,119,168,212,41,26,75,33,
+73,166,105,82,105,156,228,34,13,119,59,131,237,251,55,252,97,150,179,66,13,87,164,44,227,228,90,40,10,89,230,196,181,42,227,170,50,21,207,91,225,82,253,126,213,220,15,131,179,120,25,90,215,241,117,147,74,104,121,53,206,123,169,125,190,25,150,1,104,13,106,63,24,140,147,161,140,150,73,224,184,100,174,135,166,122,236,162,223,50,110,141,121,30,233,179,246,115,137,123,238,137,243,76,230,52,224,189,180,215,72,91,49,116,222,229,243,230,147,28,209,91,13,191,207,149,248,170,8,246,225,63,35,209,158,23,240,33,60,163,254,229,239,236,67,121,242,119,91,89,128,15,253,204,61,79,233,182,162,19,191,229,95,21,89,3,29,1,210,11,127,243,158,144,215,51,96,161,82,249,160,236,7,242,134,62,21,87,109,180,74,230,188,89,110,231,189,63,233,90,125,155,36,184,3,252,168,26,55,105,175,3,250,64,223,102,238,213,218,253,30,177,189,111,107,165,11,236,160,221,31,92,219,21,97,91,207,215,65,148,237,26,173,86,222,246,198,213,90,87,213,31,20,158,157,226,
+47,1,155,222,2,204,94,92,101,22,16,85,170,74,13,66,111,154,17,103,91,234,186,181,110,79,55,131,16,97,48,53,120,141,25,40,114,24,133,128,239,255,58,135,101,39,130,18,72,2,214,181,187,243,205,66,209,169,178,206,206,85,209,172,63,84,145,34,144,240,111,129,90,44,17,158,187,250,76,49,129,138,219,118,33,69,184,112,10,74,243,195,220,220,171,250,216,105,223,222,132,225,95,224,197,41,209,136,132,132,60,94,5,213,68,78,213,215,31,167,211,88,130,148,39,34,0,163,109,86,65,73,192,29,48,9,8,104,242,118,182,9,130,234,233,49,105,191,255,247,65,220,222,156,173,55,90,147,44,154,232,225,98,78,167,180,213,82,225,185,220,60,14,55,123,88,157,38,117,170,94,87,132,86,255,3,15,120,89,255,192,3,48,24,103,246,114,155,52,233,58,167,161,84,203,137,229,74,44,169,84,74,169,212,252,110,191,159,213,152,255,120,1,245,188,72,173,161,117,105,212,56,26,37,185,69,111,121,151,107,182,214,84,77,206,6,139,42,77,13,254,40,227,97,172,144,
+231,75,228,242,60,133,50,3,229,73,38,125,142,197,247,104,177,104,114,36,146,152,136,197,210,92,46,31,179,197,102,33,200,113,55,128,204,174,54,147,169,200,66,252,183,75,192,226,244,255,237,18,220,31,150,193,113,156,154,101,9,71,117,221,60,163,42,243,201,1,93,66,215,196,50,60,48,149,231,81,187,119,129,246,125,201,56,110,123,179,28,222,155,248,92,253,142,249,134,127,204,240,102,244,105,39,225,125,21,239,187,69,52,239,253,212,238,141,81,39,241,73,2,52,110,251,75,140,135,92,6,44,236,25,24,5,160,125,4,23,1,3,1,115,55,60,15,94,2,226,22,152,120,33,5,64,245,169,171,183,188,78,237,147,249,122,13,20,22,12,128,0,144,217,56,128,178,12,114,169,141,27,15,224,208,69,101,88,75,55,195,174,85,231,79,131,173,186,143,252,129,213,51,107,29,232,244,186,253,231,241,161,230,26,100,52,37,63,122,9,208,214,162,237,55,206,154,118,191,177,3,174,53,179,241,58,199,188,115,112,20,40,211,44,60,139,206,2,163,82,85,58,117,239,205,51,
+26,183,32,91,149,12,166,161,25,0,88,68,60,101,57,184,16,19,235,183,152,253,21,208,169,32,145,143,68,64,61,253,132,175,112,122,2,172,145,172,86,79,151,33,223,74,173,80,100,243,32,224,243,57,28,9,205,84,252,110,135,64,5,174,54,50,8,76,164,64,208,244,251,118,201,56,175,130,209,138,119,201,50,233,174,178,200,130,212,235,33,195,122,60,34,76,18,10,145,241,106,34,36,162,249,253,72,66,246,151,201,32,32,32,231,111,136,145,64,132,173,236,70,242,120,144,120,25,176,183,175,221,31,82,183,206,77,194,69,243,45,53,124,54,39,29,207,9,135,203,33,89,173,72,22,75,51,190,80,74,164,225,60,177,249,63,224,192,54,241,63,224,192,206,225,136,175,212,146,159,109,228,187,72,174,32,249,138,229,132,66,33,249,230,24,201,96,136,207,228,96,137,36,148,111,170,228,125,5,137,66,137,125,115,76,122,187,145,154,205,120,63,141,147,40,147,36,166,71,30,143,17,36,178,100,55,95,144,202,229,164,33,98,24,239,139,36,66,191,141,68,151,33,177,212,16,
+37,154,228,121,168,161,48,42,206,115,17,93,111,21,232,118,140,145,104,63,72,17,146,232,122,254,218,63,174,206,63,10,65,154,203,143,175,26,36,182,85,90,244,251,73,139,138,132,174,211,38,53,109,10,199,219,213,218,31,229,253,156,242,24,134,144,241,156,152,20,230,191,73,28,215,239,77,253,126,196,61,47,146,187,251,144,116,222,242,219,113,92,136,71,249,201,247,51,48,137,111,62,74,100,108,98,230,2,174,90,205,45,163,207,224,197,239,230,118,44,142,225,187,222,192,139,141,216,139,219,248,162,247,99,120,198,46,226,16,254,138,242,58,135,170,28,254,90,246,58,94,221,171,191,113,48,186,61,208,55,225,250,206,190,49,87,225,214,19,28,69,25,252,21,242,30,120,244,142,224,93,112,211,135,167,50,60,36,51,121,50,154,67,201,183,138,127,213,143,163,48,126,227,247,125,70,175,62,206,214,243,169,100,126,82,159,119,95,212,228,45,189,209,242,211,98,249,42,7,72,101,76,170,117,255,147,52,238,76,122,12,104,10,136,86,96,49,208,72,60,27,105,77,167,152,153,
+128,5,6,244,41,226,125,86,44,16,200,17,113,66,96,139,112,109,175,211,161,192,12,134,99,213,191,171,80,24,107,74,40,8,29,144,234,233,151,140,133,30,106,110,215,71,224,3,91,27,8,148,221,9,17,209,204,160,131,201,61,93,23,186,119,116,140,255,75,179,95,43,64,72,43,4,131,148,56,35,47,34,38,187,2,105,150,146,7,131,41,62,223,32,223,201,16,33,225,137,175,240,122,169,92,188,48,118,148,119,187,139,25,60,59,220,203,182,90,197,138,142,158,156,200,74,57,63,216,108,45,172,86,197,5,76,89,202,7,190,199,221,84,170,56,16,151,178,48,95,169,82,56,157,138,128,149,186,84,8,150,42,128,66,169,84,28,73,75,152,156,159,74,47,140,70,128,226,76,254,93,65,197,208,11,80,104,209,15,108,80,249,153,209,40,103,215,219,139,105,28,149,26,6,140,198,121,38,179,120,183,56,168,172,132,84,146,29,196,227,197,190,136,74,176,248,194,209,130,94,95,196,252,97,78,71,57,149,234,11,135,35,121,34,177,8,20,71,139,87,27,149,5,75,64,33,
+89,60,47,251,241,251,139,45,103,145,107,113,22,213,141,34,150,253,41,158,22,197,146,178,184,25,37,139,80,116,209,126,62,20,153,198,98,156,220,41,238,6,69,162,184,184,18,6,139,64,112,241,221,121,21,219,238,162,181,179,205,118,158,254,215,129,47,44,70,249,185,207,157,60,57,177,59,89,160,125,252,198,33,46,123,215,56,184,244,240,113,247,109,27,46,17,240,65,47,196,69,24,76,192,175,252,252,43,134,221,11,59,112,18,95,241,237,246,59,97,14,94,190,242,29,207,238,213,119,80,2,183,254,41,120,6,102,142,6,108,73,226,197,40,157,122,127,112,46,222,116,197,71,248,13,139,175,175,4,167,224,112,188,209,243,249,123,232,166,65,20,222,166,62,52,47,122,169,48,211,208,238,158,230,182,235,18,73,86,174,39,150,251,227,178,42,107,108,190,55,233,211,240,181,207,171,189,133,166,107,183,79,169,229,216,233,46,236,101,235,46,177,68,171,249,205,39,140,122,163,254,105,2,122,188,188,129,121,204,143,121,84,88,12,61,74,142,48,140,52,199,40,249,61,145,115,
+84,44,25,126,251,145,164,236,35,116,177,128,160,0,12,70,151,113,44,103,214,90,0,161,96,148,162,224,225,5,113,215,92,22,28,121,85,133,164,2,23,79,239,207,33,80,193,219,227,106,187,115,31,233,129,120,44,246,94,229,5,96,88,224,108,145,241,88,100,60,150,87,253,27,200,80,106,104,96,231,251,26,240,88,176,222,208,201,16,134,58,51,153,45,200,135,107,181,175,169,52,27,202,117,111,70,60,216,84,173,214,160,175,209,236,38,50,27,86,28,108,182,53,235,5,238,63,90,69,189,58,97,177,195,255,128,21,182,200,255,128,21,213,102,69,166,81,83,43,252,34,66,169,12,151,74,131,126,34,177,11,67,109,64,87,179,89,254,209,168,223,84,58,5,129,70,133,240,80,104,31,4,218,189,245,30,155,54,195,97,43,197,233,56,113,50,66,26,13,198,48,147,217,63,30,67,187,58,203,38,13,115,128,28,85,58,65,146,73,50,136,193,32,188,219,245,137,12,198,238,104,178,41,116,9,14,83,142,67,16,124,222,183,10,135,167,195,201,80,100,48,16,194,243,173,168,
+77,135,222,113,202,118,158,67,244,249,176,92,119,227,212,46,75,184,214,203,230,29,85,217,79,210,237,33,186,6,145,225,81,129,124,143,218,115,203,63,55,75,198,53,70,220,9,247,193,62,24,30,122,92,172,232,127,55,42,73,89,79,125,173,135,240,57,240,141,125,188,135,244,153,101,46,253,206,51,242,228,127,36,7,128,102,5,9,61,74,241,224,186,191,209,224,232,235,254,83,3,58,239,108,27,122,207,137,168,135,119,79,77,254,76,52,163,153,207,22,101,35,234,211,21,102,231,180,26,78,106,48,142,179,191,6,189,124,95,95,227,12,129,154,80,186,25,77,108,197,46,122,186,3,173,111,77,207,126,254,38,160,3,199,185,85,204,185,219,2,14,224,70,150,115,57,51,133,185,170,202,166,91,195,149,47,58,168,29,60,193,53,157,219,205,198,119,56,175,119,147,178,172,220,226,94,223,239,53,72,219,110,215,60,192,213,196,252,61,235,6,245,14,82,75,167,219,130,154,38,233,243,159,175,239,32,60,8,147,49,211,61,251,153,115,193,35,24,25,183,102,168,4,169,37,88,
+179,212,131,27,192,188,38,76,141,49,126,115,132,61,6,141,1,16,192,74,208,36,11,224,66,234,182,233,180,27,73,193,21,245,42,16,221,190,153,99,138,104,226,172,239,31,8,84,164,46,66,105,162,131,89,73,250,2,239,77,91,75,55,142,135,207,188,250,50,21,46,162,106,207,88,223,25,31,130,193,145,2,66,187,206,238,19,17,8,175,151,4,228,39,60,61,201,14,127,18,31,16,155,154,90,3,158,204,23,130,123,219,16,115,177,214,74,225,243,89,79,226,114,85,171,213,112,217,96,215,234,9,139,41,74,72,165,134,5,114,109,87,141,89,76,132,211,201,55,108,113,107,141,100,25,95,36,148,74,195,18,181,91,171,197,203,69,194,8,56,26,214,152,223,21,124,26,133,16,14,15,115,62,98,173,26,251,30,15,110,183,97,155,199,100,227,146,227,33,161,86,27,46,199,63,76,162,255,71,230,39,207,102,195,4,138,185,227,252,253,72,137,72,164,111,248,116,49,233,209,200,39,66,202,229,134,5,89,117,56,148,220,134,200,27,246,170,191,77,137,76,90,58,2,131,145,
+240,124,210,19,207,35,248,253,195,150,213,57,228,58,135,234,198,99,136,101,15,79,139,225,167,164,28,142,146,195,240,7,61,188,29,134,53,99,99,40,47,12,145,228,225,39,39,30,246,130,67,124,194,75,242,62,125,239,139,135,123,91,89,135,149,142,152,204,255,164,223,123,164,247,214,131,15,249,239,144,248,61,182,14,125,26,245,28,26,122,212,58,135,254,176,161,197,93,119,105,244,106,209,110,30,68,127,104,85,76,219,119,197,118,34,99,1,237,210,162,220,191,248,139,40,130,134,105,157,105,135,53,136,94,107,109,229,246,214,205,216,6,134,94,104,53,105,169,211,31,178,90,59,52,215,154,218,131,169,91,119,237,237,13,39,245,77,213,174,186,25,169,93,63,141,134,106,105,238,239,56,111,144,62,217,231,182,229,188,107,160,39,188,182,205,189,117,13,181,158,77,20,93,105,243,91,191,15,228,245,185,245,246,104,21,207,138,123,110,88,117,174,234,97,80,10,243,184,158,90,53,212,100,141,179,229,94,103,204,254,101,180,38,93,22,208,143,123,245,41,141,83,126,21,248,205,
+2,247,238,136,137,160,204,10,243,125,95,36,45,150,245,81,57,117,31,174,241,90,182,185,44,154,181,206,80,172,98,27,243,118,26,196,84,145,132,189,143,210,16,152,104,29,166,153,84,70,78,85,206,3,36,174,8,175,103,205,251,190,202,126,51,206,240,237,71,180,133,200,239,39,102,127,125,44,6,1,249,157,232,205,47,17,136,176,187,169,186,175,151,136,151,9,141,128,168,251,163,118,191,135,214,28,220,175,179,81,44,89,164,243,229,112,54,37,116,204,86,116,189,30,82,71,213,34,26,45,119,48,178,127,237,241,98,81,50,223,46,41,102,19,98,190,96,132,79,39,81,189,254,255,28,148,136,84,161,162,148,138,136,65,34,25,30,141,68,121,91,62,23,71,254,218,170,128,226,191,253,71,10,21,71,65,236,15,225,219,77,44,106,54,115,103,203,239,242,223,109,114,228,137,152,135,32,149,161,243,249,16,70,46,23,13,135,185,60,144,244,171,207,81,248,218,7,10,77,14,71,80,162,155,56,156,225,163,68,34,76,232,191,203,201,67,45,60,15,25,8,134,133,86,225,247,
+243,144,3,195,47,162,199,37,124,89,35,27,255,224,40,30,181,67,112,43,80,40,18,199,217,149,58,142,80,211,188,84,153,131,162,69,135,73,136,246,239,178,114,46,137,219,245,106,28,247,226,177,16,201,136,192,240,176,247,105,17,212,173,153,227,119,94,67,122,222,245,227,109,210,19,101,60,196,215,85,120,152,130,241,33,239,219,60,252,21,84,56,192,29,111,60,55,157,175,219,42,216,110,228,53,15,93,13,92,40,228,133,238,132,137,159,106,128,51,121,195,91,182,52,244,219,225,37,94,177,252,200,46,253,78,120,171,200,59,59,100,29,48,176,4,231,22,37,103,95,31,13,252,3,75,225,115,60,187,33,187,54,193,72,60,224,143,167,227,253,221,186,173,67,183,30,60,155,25,224,139,14,238,175,184,174,244,177,223,1,103,243,108,60,247,114,213,59,208,151,214,247,160,227,21,223,62,16,13,219,127,240,54,88,155,89,51,60,86,170,188,139,144,145,190,36,90,165,129,213,223,166,119,6,23,222,11,157,90,199,5,50,68,80,198,88,175,199,238,2,108,83,97,25,28,73,
+243,72,3,50,22,17,150,127,124,18,152,15,233,193,16,221,164,35,94,248,34,184,83,160,226,69,232,160,3,71,173,223,121,180,109,180,24,22,196,38,212,102,0,132,104,66,19,253,98,4,108,213,200,201,96,103,171,130,30,129,119,199,219,47,124,102,255,205,255,187,255,168,21,0,169,223,219,137,17,2,30,126,67,170,205,196,6,72,187,175,217,219,104,147,25,124,144,16,36,158,47,104,39,209,81,117,56,161,92,238,32,112,62,247,26,108,221,198,76,149,74,195,213,38,64,181,156,127,107,54,234,201,102,65,78,167,128,227,234,232,173,212,186,31,88,80,234,168,87,75,82,85,79,69,41,23,17,201,36,19,58,26,5,242,249,30,46,142,212,217,170,213,34,64,162,82,81,104,20,196,231,112,128,218,237,1,14,226,63,170,133,50,217,96,48,229,127,49,194,15,87,134,46,228,33,114,185,56,48,28,246,242,36,221,82,159,99,16,4,24,116,228,59,148,161,6,125,200,253,171,34,177,8,66,188,16,3,8,68,111,16,21,7,182,219,94,149,161,123,74,66,215,173,112,251,182,
+189,122,91,221,118,221,218,244,86,141,64,195,10,65,88,215,8,109,135,222,14,187,21,174,103,237,186,187,136,182,207,91,175,102,196,7,10,50,168,44,131,2,254,15,115,225,186,30,99,215,173,96,251,216,108,160,143,51,242,115,10,104,123,149,14,210,251,24,255,93,241,31,196,231,28,176,246,224,124,196,231,21,91,244,124,26,61,112,183,240,204,133,45,219,48,178,100,90,53,142,93,20,171,34,88,121,54,226,34,162,55,176,153,235,161,35,23,30,70,152,236,210,186,40,115,230,150,227,73,240,27,112,185,69,132,207,6,133,172,176,22,99,63,168,90,83,105,82,206,38,220,107,130,131,136,141,109,98,103,35,86,134,181,241,72,103,230,176,32,150,105,29,239,154,213,227,224,182,154,87,134,145,250,225,76,73,205,198,7,27,127,208,128,230,38,154,235,91,35,168,141,119,3,51,123,243,214,254,238,99,182,78,247,96,142,60,10,183,179,186,121,202,119,111,80,26,127,144,94,32,153,41,11,155,112,242,49,85,202,46,173,199,25,194,221,73,75,174,92,77,10,12,62,191,111,30,
+130,233,176,194,29,102,46,72,100,133,25,96,91,238,104,192,114,22,200,216,95,132,95,196,10,252,200,253,219,155,7,214,108,3,139,0,107,194,171,10,151,60,204,137,9,215,195,238,220,49,74,75,250,89,140,7,41,66,132,204,189,175,144,176,21,200,183,88,67,132,224,238,1,250,175,97,95,120,128,36,245,120,54,128,143,71,132,141,227,191,120,173,2,37,90,106,44,4,179,57,225,63,132,5,222,172,55,89,80,245,58,239,127,24,11,255,251,31,198,2,40,245,232,218,217,255,72,22,236,98,241,63,146,69,164,4,74,36,252,97,40,88,224,106,102,203,63,191,75,53,149,66,65,160,208,12,104,56,252,15,104,209,247,3,5,222,14,129,110,145,197,82,212,225,16,49,48,24,161,181,26,232,15,241,231,143,192,4,238,22,152,64,251,137,197,137,146,165,12,77,34,65,144,72,49,8,2,241,55,57,130,174,165,76,32,139,17,56,0,45,20,70,138,196,80,208,215,142,120,94,154,171,123,151,32,208,100,8,12,128,226,121,40,174,171,160,138,192,209,154,78,153,237,122,136,110,
+23,180,238,216,150,242,103,9,221,186,89,233,167,42,65,73,58,164,250,173,75,105,46,153,227,179,139,109,167,196,182,127,129,116,171,122,127,47,8,5,5,225,16,56,14,209,56,111,232,203,150,178,186,50,70,183,165,10,40,179,244,144,159,3,62,200,139,125,165,182,81,47,234,77,125,45,252,159,123,6,216,176,253,160,17,151,210,164,178,9,224,53,156,115,79,138,66,91,91,215,105,160,7,65,235,53,18,59,161,180,14,224,208,80,13,133,234,200,142,2,92,116,170,173,49,217,179,179,0,126,139,126,105,206,58,77,86,1,205,67,19,80,57,186,187,167,59,43,227,191,48,206,210,175,56,187,219,94,56,15,53,162,11,154,234,190,197,56,247,206,43,20,220,132,13,175,84,155,1,226,196,94,52,170,151,62,190,16,255,57,180,210,231,168,247,62,178,52,36,6,178,51,85,246,223,63,154,219,97,130,47,171,30,58,186,5,93,226,158,97,71,252,110,53,159,142,157,0,91,202,217,235,132,138,44,248,159,146,209,28,179,101,222,197,68,192,246,51,192,102,113,57,166,94,186,228,
+171,4,128,4,203,194,223,107,253,17,43,138,226,210,32,162,41,55,21,229,100,190,80,201,155,184,253,46,167,254,180,44,223,32,22,197,8,70,61,84,236,247,16,242,53,189,155,176,164,225,178,94,52,244,100,114,95,136,5,232,223,6,210,146,184,1,103,100,247,59,163,122,117,129,146,210,187,239,95,170,33,112,112,246,116,253,227,248,122,209,217,137,196,225,68,110,46,96,186,24,204,86,210,250,185,142,24,143,69,114,164,111,250,47,238,4,243,203,2,233,112,136,44,180,199,175,92,168,80,34,21,103,5,45,145,16,137,64,215,95,173,44,145,64,228,113,121,145,4,242,171,249,217,160,80,136,64,64,36,184,0,98,25,217,126,143,216,53,155,34,25,60,150,230,253,24,12,136,191,63,17,72,12,254,158,200,23,196,72,10,69,100,103,198,116,9,17,137,140,132,64,56,34,13,14,129,149,246,35,125,196,116,42,82,160,208,8,140,132,231,18,242,186,222,31,158,91,20,8,138,145,217,236,247,21,174,214,45,192,246,225,219,46,13,188,237,65,183,189,216,43,219,141,108,219,129,
+109,150,55,215,118,167,218,158,13,166,237,136,180,109,129,18,219,5,103,59,192,108,164,27,201,246,230,216,238,118,138,237,201,184,238,162,143,254,215,110,94,15,100,201,253,64,110,60,66,207,230,73,186,30,11,253,205,242,35,123,223,43,125,60,231,35,121,71,63,2,208,118,159,34,18,54,139,231,140,69,134,115,108,179,208,86,42,91,219,119,62,164,62,154,14,57,137,211,16,148,69,174,165,41,182,28,181,31,146,146,205,105,19,205,145,155,135,100,100,14,64,118,77,19,210,24,219,80,184,7,237,251,161,56,1,151,44,56,132,231,64,116,17,178,145,201,105,70,195,82,213,68,104,106,75,112,37,30,160,141,13,70,165,17,8,208,104,22,253,196,128,44,165,44,80,111,212,3,76,97,151,155,192,200,13,205,208,26,55,219,196,8,173,52,174,198,184,127,125,27,112,171,15,176,177,84,89,22,32,210,138,170,122,69,218,233,140,155,3,23,181,60,126,104,88,132,238,27,112,253,62,82,58,64,47,17,184,147,137,224,28,36,60,80,162,81,231,76,228,134,62,0,175,7,161,185,
+204,54,241,148,76,17,159,32,88,202,92,20,254,229,248,144,64,16,73,99,176,199,22,190,62,11,45,98,111,109,48,188,73,177,85,66,232,251,29,193,128,134,231,119,183,0,75,160,33,2,195,206,22,126,112,57,237,110,46,218,91,67,239,52,146,155,217,189,215,219,94,91,173,39,86,163,161,165,211,239,232,27,238,117,115,59,229,136,44,95,79,108,102,61,43,206,122,96,179,170,44,54,243,134,197,62,239,247,247,179,197,245,90,104,210,159,27,172,211,74,105,21,253,97,165,188,87,42,174,35,248,232,105,48,188,103,114,153,87,2,233,52,255,242,164,98,72,171,26,210,41,153,237,225,112,187,221,158,192,102,243,157,198,121,157,31,54,159,26,206,196,186,31,153,236,80,200,95,229,112,249,147,66,121,239,13,46,175,28,201,103,196,50,188,88,55,26,222,13,6,204,155,94,255,156,78,223,219,34,197,107,32,125,134,54,164,87,4,250,76,137,18,175,139,195,167,69,240,6,100,207,251,140,121,63,53,62,159,243,231,125,208,235,159,9,238,83,86,191,87,88,246,83,32,120,155,
+13,139,167,178,114,165,107,106,59,109,123,200,247,102,138,222,7,237,115,55,125,212,195,248,91,63,120,138,89,209,171,247,21,242,94,47,132,79,16,255,252,144,195,14,231,39,97,76,93,22,208,15,157,51,219,180,58,110,167,66,169,84,80,17,137,210,136,71,30,244,105,125,206,228,230,3,82,1,212,239,79,56,87,4,132,114,148,156,68,36,66,194,8,18,4,36,128,48,197,21,7,87,230,208,141,142,253,33,6,217,152,185,20,46,169,18,213,152,57,223,42,137,122,120,221,178,188,28,247,58,191,243,170,240,224,39,108,239,189,254,60,28,207,87,229,122,61,169,106,182,45,22,30,45,178,46,23,179,113,172,102,50,29,167,20,4,185,80,70,48,181,65,190,108,1,59,135,252,147,230,1,145,0,197,8,166,63,129,16,26,34,89,29,232,141,32,40,162,2,30,240,8,33,238,137,191,209,172,30,196,93,33,104,24,193,4,66,116,139,171,30,16,85,12,169,154,65,102,177,201,126,127,15,16,150,118,20,55,120,84,79,252,199,102,112,243,189,56,30,188,248,194,153,193,34,242,
+135,237,193,227,79,54,131,192,107,62,49,221,119,222,87,101,173,201,101,84,192,135,215,244,199,100,70,178,45,7,67,247,250,48,240,155,28,147,203,158,92,118,125,79,251,210,138,178,31,38,226,162,245,210,70,13,114,98,224,212,117,54,223,104,96,101,97,10,236,87,246,23,221,123,204,71,55,73,184,77,227,5,25,47,219,185,70,140,109,217,238,108,248,198,217,247,157,150,110,84,235,66,215,13,64,22,158,248,103,215,92,164,251,41,189,84,229,0,81,225,250,103,140,127,191,136,39,112,154,104,9,61,147,29,101,255,201,14,219,151,8,26,0,189,10,74,180,183,143,44,80,16,44,211,243,14,66,165,0,3,140,109,102,91,131,100,54,107,74,19,99,106,220,52,163,108,156,116,152,170,228,158,157,53,125,41,48,51,218,213,101,195,248,105,47,244,119,231,147,135,104,172,213,26,11,211,134,201,73,210,136,226,156,172,86,24,152,24,156,100,137,238,56,221,13,67,100,191,32,59,104,218,203,165,125,125,158,155,211,26,141,88,148,179,57,157,220,57,223,108,20,7,229,121,123,166,
+209,224,162,105,118,234,111,98,210,96,23,132,91,177,197,226,104,212,57,123,173,221,104,175,201,201,246,14,155,197,193,98,211,114,111,177,150,237,170,180,23,85,66,146,118,56,100,213,202,82,37,223,161,66,105,226,124,62,41,81,11,191,219,99,185,104,75,38,185,111,16,208,104,42,198,39,83,103,50,193,113,241,140,198,223,88,173,58,29,238,249,220,219,45,221,108,202,54,240,193,95,250,108,168,137,211,127,127,147,187,195,200,83,167,152,172,249,208,192,228,198,227,105,8,100,66,122,186,140,150,50,147,107,93,97,16,91,24,212,206,7,131,185,64,96,218,251,246,202,172,214,66,161,160,157,245,122,28,99,212,62,63,252,28,18,148,201,149,188,75,235,7,28,205,104,146,154,145,62,69,47,145,247,216,186,225,191,143,24,221,3,255,123,196,248,145,120,92,167,128,229,140,24,34,172,103,194,139,87,12,160,162,119,196,6,173,152,90,80,247,23,156,178,97,197,21,3,215,83,241,34,209,76,176,170,251,43,124,7,90,108,161,218,114,7,185,85,47,6,28,180,25,162,152,65,208,
+102,255,59,104,116,233,150,20,214,231,219,62,245,150,7,173,188,232,62,179,156,21,2,116,130,139,229,201,150,16,188,252,109,55,136,179,221,227,80,37,217,55,62,190,160,111,0,42,151,221,89,211,142,96,115,63,26,12,200,138,108,23,146,106,246,102,235,126,81,53,30,223,104,226,180,93,33,47,252,180,177,56,28,95,119,99,20,222,221,14,9,240,77,46,214,10,185,43,186,3,202,18,105,133,198,239,165,13,29,231,103,6,39,164,13,231,247,159,25,47,120,183,238,64,7,53,83,139,120,81,69,23,217,57,11,46,69,87,230,186,62,44,150,170,123,253,234,133,29,192,159,130,75,50,35,242,254,138,30,200,52,84,12,227,227,73,237,97,155,163,9,42,50,180,190,168,170,254,229,218,2,47,205,171,30,206,178,170,194,121,60,240,154,224,239,254,224,254,144,7,192,154,161,111,114,220,239,69,14,12,60,152,229,69,210,138,147,166,218,77,143,86,92,24,205,109,181,66,64,229,233,120,178,155,88,148,232,68,22,84,159,143,128,163,173,168,136,62,156,233,154,41,38,44,58,234,
+183,58,7,5,21,155,75,157,92,190,79,72,114,83,175,20,142,249,151,43,14,183,211,229,49,38,197,193,174,176,232,203,45,214,164,41,185,198,130,128,230,154,255,204,56,98,44,215,90,29,126,21,123,4,20,135,66,160,162,55,123,80,176,69,83,168,246,235,51,26,207,32,197,182,234,191,245,191,170,227,214,142,123,218,158,209,54,15,28,220,53,134,67,155,193,192,97,78,152,56,12,6,142,30,85,99,169,147,68,98,35,165,200,92,36,18,7,11,114,136,244,127,100,158,80,55,108,23,137,56,66,225,0,215,237,70,125,128,96,167,82,233,173,86,85,221,204,167,223,240,6,56,118,125,16,193,68,41,114,220,98,55,224,118,62,155,171,243,192,111,197,88,53,169,248,243,235,169,7,183,44,67,224,74,32,193,9,30,54,164,41,220,194,178,30,16,36,71,144,4,167,44,71,96,65,168,195,179,246,32,36,28,172,58,32,3,5,225,47,168,195,249,61,9,200,132,80,198,245,94,4,130,5,219,91,16,206,38,76,239,66,192,118,221,195,45,28,238,125,103,154,96,255,206,105,59,
+193,39,149,117,183,201,61,226,251,242,190,64,157,239,184,83,182,148,112,211,12,164,26,234,98,108,145,214,114,163,170,8,108,183,197,113,211,219,199,25,174,93,119,75,117,174,139,25,106,248,93,155,143,20,91,214,98,23,240,246,160,222,104,190,82,66,45,65,227,137,126,140,37,206,3,100,196,111,231,9,32,238,243,228,113,127,40,222,91,215,114,198,117,95,23,236,210,134,82,211,31,250,153,168,204,143,214,91,198,45,15,244,178,169,8,209,158,7,50,120,171,172,45,112,216,153,179,99,241,43,118,206,1,76,121,199,193,62,100,42,77,168,7,221,147,240,194,204,211,167,162,157,62,224,236,149,54,184,184,90,51,76,245,182,245,151,101,113,198,155,35,125,104,107,44,46,43,235,175,219,222,25,14,220,31,247,229,216,232,182,210,205,140,191,243,40,185,140,164,197,179,153,158,141,57,135,165,201,213,221,93,51,100,66,154,66,141,174,181,92,47,23,178,186,220,46,57,70,149,233,146,203,253,62,83,189,157,243,23,21,197,199,195,249,202,137,156,132,252,108,179,48,42,41,226,115,
+185,252,72,162,91,36,141,213,106,109,140,12,174,71,129,236,214,231,52,7,106,157,205,90,158,78,145,51,50,212,174,76,180,94,181,25,29,62,179,88,118,103,108,168,213,88,42,145,82,13,26,120,132,161,19,183,171,169,33,84,147,143,196,242,233,113,75,66,130,118,115,169,85,24,232,123,90,29,141,90,222,110,133,179,203,229,132,15,50,198,184,126,50,170,213,150,195,71,4,230,118,183,120,57,218,56,19,215,27,153,226,179,68,242,8,128,220,223,40,224,177,23,120,220,205,18,141,212,131,193,213,82,40,60,11,4,78,175,215,219,170,84,214,163,209,184,163,243,121,54,188,86,33,149,242,12,96,175,253,121,248,176,237,206,27,111,197,234,164,152,213,201,55,106,231,174,78,240,162,97,132,176,3,199,216,161,116,87,128,130,231,44,8,5,202,95,196,138,118,4,181,31,156,197,5,220,136,85,66,64,195,136,38,4,55,25,172,195,244,195,43,219,113,61,72,173,84,78,236,6,107,213,143,44,150,78,38,146,110,84,15,236,199,120,51,232,174,56,183,171,129,60,167,165,155,162,
+147,20,109,180,78,123,158,79,5,208,134,181,60,241,134,199,173,105,9,94,24,48,192,170,187,146,47,240,237,237,67,227,53,3,131,198,241,122,103,227,40,30,215,52,44,219,182,49,217,221,11,128,247,154,224,33,115,29,111,2,142,246,236,121,102,215,249,144,218,50,78,232,150,88,104,101,158,55,230,59,180,17,31,182,107,153,254,216,116,51,234,165,215,133,92,85,244,35,5,198,210,14,56,208,213,67,0,135,51,86,119,36,154,115,48,117,131,120,224,234,202,128,175,183,178,27,0,97,175,172,91,132,59,247,100,94,22,205,169,137,229,240,183,137,227,24,243,152,5,162,34,150,176,15,37,174,151,105,250,144,233,244,228,220,88,51,190,84,74,114,201,242,180,235,171,203,227,235,21,90,90,78,231,89,253,239,199,176,100,166,214,83,211,233,72,0,251,169,150,163,60,165,149,37,15,180,234,209,209,232,135,31,150,245,90,84,170,59,110,142,37,11,171,54,22,212,63,101,50,14,199,78,32,70,139,141,85,93,31,250,10,138,213,106,101,129,226,65,38,75,189,94,95,182,247,118,
+181,189,246,67,182,214,88,172,37,22,107,217,200,139,229,108,87,169,101,90,227,18,139,195,209,216,175,212,41,149,165,84,236,85,67,162,70,137,170,38,27,242,63,148,186,66,97,89,142,70,22,160,175,140,41,143,7,135,149,84,74,182,244,251,108,252,68,105,80,153,168,148,170,173,57,108,180,121,106,107,133,246,34,15,146,105,139,190,54,176,252,253,53,238,14,172,55,108,144,254,212,25,127,195,198,222,160,214,231,34,184,110,181,223,95,234,245,98,203,239,111,35,4,81,131,84,127,52,82,31,141,193,155,110,143,198,243,185,124,162,233,245,113,198,154,162,114,23,108,119,195,242,50,59,86,251,97,195,182,131,91,114,226,149,102,148,50,174,73,159,102,185,185,1,8,183,0,61,56,198,84,248,202,0,27,184,139,71,248,108,128,29,128,5,83,103,93,0,11,240,23,134,204,154,1,45,0,6,140,169,90,0,30,96,21,46,215,237,1,105,160,138,59,240,221,129,75,150,175,156,6,46,109,200,150,85,207,191,12,50,63,108,219,177,74,142,174,251,85,44,235,164,61,223,97,233,
+182,239,99,95,76,189,56,116,197,53,237,148,168,74,219,249,69,173,27,218,111,41,252,210,114,179,25,118,36,252,108,221,13,127,120,173,144,24,205,190,158,200,218,205,163,187,58,185,188,103,249,109,165,215,184,163,97,171,218,196,28,53,149,156,87,5,88,200,108,247,72,220,216,29,32,194,77,167,139,212,167,59,227,122,21,129,230,220,12,148,217,213,35,13,187,208,118,87,97,219,229,161,223,171,84,178,28,231,2,74,226,252,91,134,218,1,158,214,209,165,53,218,180,242,29,202,166,165,28,114,229,66,22,190,78,31,186,70,13,107,132,188,24,205,224,65,52,192,71,131,142,174,25,237,101,254,34,197,58,221,246,202,240,58,112,191,171,198,70,115,197,74,103,252,149,71,73,39,34,55,93,205,244,44,10,102,56,203,43,219,155,117,203,0,153,30,203,225,13,90,253,77,47,165,25,112,62,213,204,172,197,4,42,43,169,127,184,220,114,134,154,168,183,215,45,83,35,166,40,146,44,22,229,54,240,141,7,179,197,36,170,142,246,139,131,177,4,250,49,254,71,218,113,171,243,114,
+179,208,95,167,116,54,212,152,234,116,74,150,235,117,101,117,169,182,202,245,168,80,121,62,119,45,74,84,179,33,175,216,82,234,74,133,106,52,138,148,129,190,122,125,62,50,30,212,255,129,120,68,74,252,68,173,50,209,66,148,170,189,185,104,243,154,102,107,37,209,171,26,141,70,117,173,86,254,251,123,46,34,48,106,216,240,179,147,214,10,121,85,60,46,46,75,36,139,0,200,252,245,31,22,123,129,197,237,44,145,127,254,163,198,11,133,229,110,119,225,243,2,74,153,204,124,181,138,158,142,166,251,181,218,146,181,212,198,73,67,150,9,91,211,172,33,215,89,230,56,238,166,83,82,219,186,196,88,89,233,231,163,202,188,184,115,99,197,54,200,194,158,27,193,30,70,42,174,5,7,216,126,45,128,94,97,137,141,239,8,182,147,216,83,7,176,204,94,79,189,192,52,123,234,233,3,95,88,198,70,112,113,56,104,157,40,106,177,197,53,163,172,69,245,194,77,176,181,131,195,105,233,236,224,184,21,253,131,117,134,181,130,192,133,237,136,77,71,181,253,107,233,158,153,63,239,
+168,116,83,216,163,153,94,244,93,143,180,26,100,188,119,166,85,211,117,151,75,77,59,172,183,200,20,75,93,255,105,222,0,31,142,142,211,223,245,198,195,106,53,189,84,201,177,249,156,123,244,243,219,139,194,100,175,240,195,102,123,27,155,211,94,201,101,68,143,242,243,104,88,16,95,221,117,33,143,117,239,178,110,45,93,224,149,85,47,184,1,216,155,110,171,164,84,217,49,209,176,202,150,196,143,38,185,7,42,66,34,103,249,225,139,240,104,94,71,31,109,211,58,32,47,156,99,22,159,137,40,29,121,197,87,243,158,163,140,153,132,114,60,241,39,119,101,233,130,147,126,185,162,250,215,174,199,179,207,194,200,72,73,172,21,74,223,64,28,37,85,145,140,88,42,131,51,48,180,111,126,33,219,155,154,193,27,18,21,136,97,180,154,221,106,209,212,180,227,73,80,51,177,146,19,89,184,247,79,69,52,106,194,152,111,175,107,38,196,47,157,74,179,88,208,129,94,115,182,50,155,76,213,161,110,159,60,24,137,113,149,42,149,162,69,34,232,162,109,254,31,118,167,177,149,144,
+146,45,174,212,2,44,139,104,141,249,92,197,19,17,165,142,122,190,180,30,201,85,38,4,148,182,67,161,146,55,187,84,165,255,203,215,231,189,131,250,79,42,165,245,251,104,60,98,242,61,79,161,84,137,182,102,178,205,147,90,173,149,64,175,106,48,170,183,181,26,205,210,32,17,109,189,120,198,42,145,126,63,49,5,245,223,143,84,14,143,147,24,211,158,78,133,217,237,104,12,70,178,136,164,72,69,1,18,109,12,65,34,245,16,104,13,132,1,169,60,30,154,86,251,65,203,100,255,56,252,212,245,154,105,78,26,86,39,214,40,47,73,86,245,81,90,78,172,214,140,176,187,21,137,238,41,120,201,43,252,167,126,96,5,52,118,224,14,171,82,118,155,137,112,174,68,105,133,75,245,82,177,13,61,42,134,239,138,208,133,194,41,167,35,7,170,85,98,104,2,221,35,245,85,233,57,81,110,106,165,247,188,174,118,3,168,39,104,105,249,105,6,101,245,13,117,106,186,254,204,168,126,247,94,153,200,182,154,239,14,129,67,231,153,169,23,230,216,1,177,3,125,235,225,211,31,
+249,221,8,100,190,240,109,245,16,23,3,211,100,149,65,30,81,121,189,66,241,53,109,214,40,152,84,126,199,143,192,162,83,191,122,145,94,223,164,183,229,217,236,23,222,164,221,47,178,83,156,39,116,160,221,30,171,76,156,215,239,143,30,161,134,94,6,113,198,14,164,15,130,5,211,47,168,63,42,47,210,92,153,245,151,229,54,104,5,186,167,237,254,35,12,70,206,114,69,209,10,241,200,129,236,247,222,225,67,208,66,214,121,171,223,58,198,128,253,53,213,209,56,178,138,218,101,84,137,99,216,196,64,95,122,41,9,244,226,84,251,119,99,188,71,234,135,60,174,89,254,150,38,18,143,198,51,250,125,52,141,89,182,56,141,165,73,68,250,111,210,118,49,142,23,182,208,92,63,84,232,185,233,229,143,203,29,155,235,77,255,191,210,115,120,56,19,183,156,200,152,143,215,31,245,63,20,212,110,46,177,155,249,62,45,25,63,248,141,181,31,163,213,204,60,178,217,169,188,220,46,204,249,155,157,13,45,246,247,181,158,113,189,110,172,78,255,230,243,63,17,209,14,86,36,154,
+181,25,13,85,75,81,169,227,253,222,216,245,117,53,74,35,157,54,96,221,158,135,56,210,14,182,85,155,197,161,70,197,48,209,41,12,123,243,176,111,243,236,214,202,95,15,201,56,236,255,106,181,49,206,210,224,16,123,233,12,203,106,172,142,139,69,35,144,60,75,167,45,178,159,27,139,76,250,219,237,198,196,106,245,112,52,217,13,192,60,135,183,198,97,205,67,56,156,13,6,167,222,187,247,152,207,55,210,233,245,155,31,116,112,221,198,67,251,225,207,56,97,201,166,41,99,134,51,125,207,234,178,195,165,195,108,37,26,44,126,242,45,172,177,49,15,38,144,78,124,48,199,114,58,241,196,108,38,177,221,14,108,107,152,107,14,226,183,97,72,23,218,30,152,115,114,234,130,172,89,201,108,7,180,35,221,77,218,222,77,170,178,65,220,81,169,202,3,225,107,13,253,96,184,142,173,222,9,68,167,166,95,129,222,39,81,243,7,132,59,15,92,91,239,247,119,245,246,203,250,185,207,57,220,23,196,254,160,69,130,45,79,63,211,66,175,219,190,213,1,109,59,16,131,244,223,
+175,245,128,147,215,35,114,153,209,244,106,97,151,173,134,168,208,183,63,252,205,245,205,132,65,141,2,35,207,33,107,247,66,13,206,207,3,43,214,238,174,246,37,206,19,126,203,170,135,59,194,201,203,162,225,106,118,208,148,55,246,44,239,8,207,55,103,111,155,193,30,234,43,96,162,251,165,209,241,160,111,147,35,131,22,28,24,117,124,112,119,7,24,94,191,29,44,203,199,37,172,161,31,178,77,182,32,154,97,114,37,193,180,136,118,247,127,171,147,205,189,24,87,190,221,7,96,84,55,198,6,86,60,146,193,199,187,130,36,93,201,58,254,27,211,227,39,153,24,77,103,59,156,140,84,93,61,155,27,102,109,147,196,88,144,148,217,0,135,227,79,65,157,109,0,255,74,78,94,17,159,55,216,113,161,206,108,1,254,131,158,236,237,51,211,218,18,31,254,252,252,64,10,3,113,92,97,54,211,76,132,251,157,28,234,63,20,74,99,169,204,10,33,250,133,20,54,46,49,52,75,21,182,66,241,71,197,82,127,132,217,98,174,215,85,104,173,72,200,143,193,102,40,204,228,200,
+140,21,78,165,48,174,174,66,14,79,148,235,178,197,108,183,215,223,167,110,183,159,166,169,73,134,15,18,113,61,102,52,98,86,151,133,113,237,71,238,110,133,250,204,110,254,31,205,233,103,24,27,22,242,36,185,208,207,13,117,25,253,254,159,62,162,255,249,253,45,132,32,16,185,234,143,66,234,163,182,40,3,20,194,120,62,121,127,237,246,15,20,157,234,28,38,236,113,218,108,79,218,153,227,180,41,197,117,204,89,182,220,177,144,185,252,108,60,70,59,193,12,101,110,227,94,203,194,8,211,248,46,32,145,86,32,220,129,12,26,193,5,100,187,210,5,54,192,28,157,249,117,2,34,232,169,61,0,24,65,143,77,95,229,12,157,222,123,211,168,129,247,62,158,130,117,252,163,232,45,159,6,169,155,202,225,196,99,39,250,155,75,107,225,70,113,135,234,137,130,123,164,123,159,26,71,228,66,7,39,219,33,6,143,227,70,118,5,219,141,65,154,164,133,31,140,134,206,13,151,14,182,29,110,14,158,232,171,25,108,44,185,57,13,36,124,252,131,191,179,241,29,45,183,183,131,
+167,79,182,119,78,251,194,11,59,141,215,109,178,91,205,113,62,25,177,49,131,119,249,133,149,111,95,6,61,248,131,76,161,110,181,24,6,66,11,182,203,60,184,191,211,251,233,50,159,150,198,165,84,85,91,9,222,119,206,171,129,22,105,1,122,174,227,36,87,61,161,184,209,175,101,222,104,193,105,19,239,112,47,126,219,80,255,121,107,33,8,46,98,67,89,184,171,154,69,220,173,185,7,219,132,79,42,102,83,153,193,141,83,213,127,59,59,214,88,94,26,113,243,84,207,90,191,56,139,245,195,141,200,191,94,204,114,26,29,136,200,96,185,52,121,21,37,137,56,248,155,231,49,27,141,184,40,28,193,75,243,213,114,132,130,114,13,22,74,189,52,252,75,167,147,199,99,241,223,216,183,156,27,44,22,150,212,146,207,255,219,215,177,98,18,146,136,195,49,88,233,213,57,149,165,92,100,108,195,162,193,201,172,87,248,19,213,218,140,130,194,18,3,168,65,216,158,19,68,116,52,42,51,153,196,242,158,30,189,36,84,109,166,151,195,29,38,28,142,236,2,129,129,31,72,76,
+70,204,227,17,243,112,192,238,57,56,189,44,202,160,62,71,67,35,150,201,140,32,143,71,49,122,244,151,164,25,127,36,12,230,223,192,144,39,233,245,185,88,247,205,24,244,49,122,125,132,56,157,14,134,18,189,11,216,100,176,230,24,156,229,10,131,177,94,47,172,103,231,137,108,54,98,153,108,146,11,6,109,23,77,238,59,111,217,6,176,93,130,70,25,64,144,17,254,103,111,194,177,70,207,62,90,220,249,99,145,53,55,56,110,188,170,44,154,91,94,95,56,33,126,120,242,137,158,248,194,65,39,62,239,29,222,179,35,50,194,222,146,51,156,8,108,240,115,253,48,117,193,215,135,44,150,31,204,68,249,190,9,162,103,71,55,106,245,7,110,203,243,127,109,246,34,134,181,121,27,15,118,53,145,233,7,166,51,55,0,229,21,170,23,18,60,93,201,203,13,226,232,238,24,178,97,255,60,47,208,132,244,102,190,174,35,211,233,192,118,222,96,214,76,95,154,174,205,123,207,15,199,127,74,188,143,180,76,90,217,175,49,93,54,112,197,41,147,151,178,13,242,53,243,73,218,
+150,29,88,81,235,141,10,173,182,45,75,254,104,247,51,232,229,157,9,227,102,116,43,162,5,231,245,69,30,85,235,31,86,43,226,128,171,55,180,204,194,214,53,131,27,170,249,248,124,122,214,178,36,119,227,2,159,201,89,78,16,190,68,176,112,1,87,157,31,112,119,55,33,127,214,50,220,68,230,176,144,248,131,33,200,104,170,99,235,69,22,186,108,101,190,50,197,234,205,242,224,54,41,67,83,233,167,199,161,112,215,15,94,172,185,57,1,251,173,197,98,253,209,117,38,153,235,217,156,63,91,84,4,31,206,94,206,32,18,21,191,214,130,233,162,160,255,53,153,0,99,184,15,126,155,140,62,142,73,165,96,145,136,31,92,76,176,88,152,19,246,4,67,134,178,149,201,227,87,109,70,132,97,44,29,75,68,98,42,148,88,85,169,4,75,36,192,89,203,244,247,87,71,161,179,183,16,80,176,198,20,154,224,69,223,132,157,72,96,200,225,48,140,151,201,22,187,195,95,149,105,107,135,17,159,207,96,155,39,180,194,43,190,30,99,191,199,124,251,12,204,210,32,48,179,255,
+160,39,186,42,108,103,50,5,19,40,96,28,96,146,200,216,36,50,22,131,68,194,174,215,224,18,169,18,254,68,8,212,17,27,129,208,65,160,204,128,43,128,241,251,97,0,192,7,204,231,251,163,209,238,109,52,170,234,124,221,158,174,183,189,88,255,120,43,41,67,31,212,141,80,61,108,0,18,196,123,89,17,44,214,96,35,152,61,205,214,30,159,97,53,152,87,41,223,95,100,74,248,126,245,152,57,228,250,119,76,21,34,45,190,155,230,105,167,120,103,26,202,132,174,13,22,87,152,58,176,97,171,76,127,164,96,100,93,143,7,58,146,233,250,148,37,71,166,191,75,202,60,116,232,78,174,94,65,141,98,186,219,216,45,109,56,77,43,170,155,48,206,220,65,24,40,182,93,33,119,31,153,227,12,96,175,105,8,47,248,217,53,29,254,235,138,187,225,136,60,225,5,88,182,187,152,214,92,112,36,54,115,185,82,47,45,153,207,19,69,200,90,90,166,123,218,185,236,145,253,10,236,225,220,164,153,66,192,143,183,109,113,15,106,187,155,89,44,239,241,83,20,99,113,135,105,
+209,69,245,74,88,68,117,231,38,175,220,129,14,112,110,34,173,234,1,28,176,140,145,182,55,27,169,60,136,155,230,125,228,72,27,4,42,223,55,208,23,185,17,230,9,136,56,11,175,86,225,254,44,56,40,73,86,155,112,238,126,86,2,171,94,233,163,88,192,42,223,193,165,86,208,214,68,21,239,63,115,185,175,215,94,81,105,238,252,122,203,68,188,89,74,230,102,143,85,12,254,45,222,207,231,147,97,74,108,203,139,214,147,153,8,13,116,234,138,237,102,38,220,219,61,118,78,77,75,38,254,252,188,72,3,113,91,81,178,154,22,223,56,114,135,68,90,175,178,80,41,207,195,253,99,190,32,166,35,143,165,104,233,174,80,188,70,210,97,251,183,88,41,78,147,206,228,9,4,244,168,254,92,223,231,154,28,78,210,177,244,222,239,187,241,50,137,86,145,167,211,230,104,20,234,216,212,120,188,29,47,159,46,203,164,74,135,136,237,190,92,190,202,180,9,47,85,158,140,231,5,116,225,164,162,121,212,169,9,159,165,152,24,78,241,104,252,30,10,189,2,160,239,27,213,254,
+46,193,147,145,185,127,92,10,49,255,212,235,221,179,217,23,104,171,243,252,198,248,132,140,224,114,42,61,30,139,39,93,83,204,240,181,252,172,53,227,157,224,222,229,183,234,117,156,221,227,100,237,105,16,93,124,174,126,151,119,78,105,67,85,241,66,143,244,89,150,223,238,96,17,42,35,158,73,24,59,57,230,68,114,200,191,33,27,242,29,71,100,4,208,49,100,158,241,157,65,106,181,76,55,133,20,101,84,129,27,40,141,246,108,41,220,40,154,187,112,202,213,65,117,135,177,140,85,22,15,204,28,213,191,127,85,22,158,127,44,174,158,179,12,39,110,80,17,46,45,30,132,27,174,255,0,56,56,158,47,7,182,221,86,140,113,137,239,69,161,31,209,223,202,238,52,176,21,111,32,107,38,11,193,232,123,100,211,105,224,71,30,93,14,160,44,250,85,28,163,205,9,42,197,215,237,11,178,193,15,94,254,117,167,206,90,194,207,30,126,116,109,173,158,96,206,80,187,215,64,47,223,48,53,54,163,123,19,203,158,142,111,254,48,201,71,97,15,65,5,158,58,161,163,63,107,
+207,134,147,86,132,97,55,228,4,85,57,240,234,178,145,192,13,188,118,171,34,7,186,37,92,31,251,156,142,110,119,18,44,123,46,70,141,104,32,160,131,197,187,192,135,143,194,74,243,125,89,62,162,233,155,133,195,137,44,43,23,183,185,136,133,213,24,201,218,223,146,3,135,19,229,249,179,250,191,28,114,240,165,36,147,249,27,36,221,214,66,57,155,229,226,147,145,196,94,147,145,103,100,22,43,54,16,167,21,183,146,217,52,157,47,144,239,144,72,169,44,148,202,226,121,168,255,149,10,217,253,213,74,201,161,80,72,90,35,105,250,183,88,42,23,9,251,61,215,39,120,126,31,69,165,205,175,182,103,43,142,212,216,170,157,232,96,246,213,8,116,242,15,42,193,165,43,189,201,76,101,52,154,217,16,156,86,250,31,175,162,66,167,74,7,198,19,115,194,116,28,143,92,180,244,153,76,22,164,63,115,6,226,239,31,102,66,30,135,211,9,130,129,238,184,139,236,28,213,106,235,104,18,104,12,121,58,81,136,126,163,11,80,200,20,4,138,28,129,64,199,231,195,221,224,241,
+233,100,114,50,11,202,217,222,142,245,162,17,167,83,41,235,225,103,253,170,155,90,195,184,99,119,27,156,188,79,193,227,236,105,180,248,239,35,187,118,47,4,165,94,184,202,14,225,7,125,250,16,63,40,220,235,135,188,96,91,15,222,226,252,91,74,41,106,203,61,40,121,49,129,207,10,55,114,191,184,192,97,14,105,69,5,94,16,143,32,214,113,35,157,94,149,132,15,190,17,184,96,85,240,66,44,240,253,151,95,181,116,1,82,112,221,169,237,181,108,130,233,87,213,110,166,63,206,93,95,59,205,169,225,7,240,237,253,46,72,127,195,42,104,115,61,33,21,92,55,146,227,54,29,40,191,152,225,0,162,30,81,253,158,130,135,227,251,59,162,203,29,56,28,38,29,94,64,9,110,94,15,128,123,255,85,237,163,151,192,243,75,144,166,161,27,157,254,98,177,244,188,145,216,140,254,45,199,150,61,145,121,116,235,114,2,94,30,85,112,202,238,129,102,4,55,248,40,26,136,30,44,83,69,224,96,67,44,239,88,198,127,223,179,204,178,220,105,119,30,224,0,23,194,237,65,
+144,218,225,113,39,209,141,109,3,217,61,79,207,203,118,152,185,223,169,73,53,251,245,150,43,244,178,88,200,230,114,67,234,242,249,200,34,80,19,141,118,154,230,80,231,21,84,137,58,133,85,102,9,255,16,16,30,52,49,105,78,165,234,96,38,230,171,27,54,187,103,206,203,103,211,108,217,95,89,72,73,249,138,236,163,86,151,80,225,58,107,251,205,157,153,82,105,254,230,78,61,145,80,103,173,191,234,95,193,104,84,39,2,125,141,242,143,90,205,47,237,111,117,18,105,197,219,233,105,209,2,141,138,152,161,209,102,40,180,254,212,84,216,124,109,42,9,47,140,199,115,59,103,213,79,227,44,206,6,155,154,146,142,254,3,71,48,143,71,53,90,154,74,210,11,63,63,115,230,223,170,191,55,88,228,113,54,33,46,24,233,76,187,93,253,59,31,173,142,38,139,34,150,96,19,133,88,124,229,1,131,205,193,96,51,240,2,172,3,0,106,62,95,89,142,70,157,91,225,249,229,7,169,225,240,114,139,215,90,140,127,184,246,66,209,121,82,156,243,146,213,200,182,171,127,155,
+69,39,240,86,158,132,139,136,109,53,228,243,204,29,109,153,186,208,5,112,224,29,3,54,131,19,95,12,40,159,253,41,121,33,168,32,161,204,5,13,9,44,92,78,134,2,237,5,106,230,165,205,13,245,193,89,62,128,184,3,220,241,130,141,151,172,122,204,148,238,1,191,93,222,4,235,238,170,245,27,189,231,110,97,189,100,215,160,43,167,110,32,107,159,55,161,119,203,230,106,195,163,231,126,209,195,73,181,50,234,139,150,27,138,82,193,182,55,2,12,23,109,31,132,148,202,245,128,34,34,123,143,45,100,100,79,248,156,144,17,124,181,123,248,218,75,239,43,55,87,11,124,113,202,163,85,222,25,208,104,15,146,83,231,242,14,198,106,117,212,53,180,236,17,27,79,5,92,244,136,240,59,64,106,207,99,234,70,15,184,179,233,102,176,3,56,52,242,66,18,61,26,153,154,164,80,225,22,75,7,142,83,20,85,230,243,162,64,65,188,245,14,152,61,252,151,42,86,199,221,214,239,7,254,75,229,25,133,161,163,175,157,152,248,74,99,189,32,254,183,193,139,117,37,194,255,
+25,8,143,245,63,3,193,161,242,117,197,108,38,76,239,237,63,246,154,152,28,252,134,77,106,32,38,234,18,102,44,150,117,191,215,69,196,233,124,110,50,219,205,33,85,185,88,156,110,67,162,255,46,244,32,230,139,229,57,36,144,34,132,161,114,109,5,1,25,176,12,134,212,76,14,219,100,42,20,202,20,133,22,152,93,60,185,34,79,241,209,230,40,148,169,169,185,254,120,59,100,186,44,110,76,149,182,54,22,135,227,74,149,105,176,84,121,216,29,207,255,225,32,102,54,22,45,73,166,253,196,29,241,156,142,201,26,14,67,169,60,233,71,232,15,46,187,211,254,192,172,215,139,89,12,70,170,72,249,33,24,242,100,158,6,137,182,22,32,255,108,196,212,5,2,89,94,47,86,123,209,70,26,141,193,76,46,100,122,59,198,13,111,236,78,115,82,203,26,139,137,48,154,10,178,249,79,26,93,196,112,149,76,99,68,124,72,89,89,116,195,24,8,79,190,101,181,131,119,1,0,128,17,14,128,196,3,142,85,241,205,215,175,183,142,255,14,158,205,204,76,137,192,62,166,76,
+23,227,196,167,173,192,119,237,123,229,201,174,194,121,55,74,183,246,111,120,213,51,58,232,96,159,91,199,95,199,225,148,86,181,144,167,128,83,215,115,90,86,193,205,88,93,181,80,157,150,253,160,131,227,52,145,226,158,115,219,199,167,55,254,205,205,109,211,225,233,151,228,160,254,102,229,175,11,2,0,134,239,78,1,169,231,223,215,104,224,143,157,234,202,79,13,175,22,248,90,123,238,150,52,115,93,252,185,134,183,55,112,139,16,116,191,174,238,120,236,121,163,95,155,203,158,144,113,62,217,186,192,47,228,65,133,239,222,0,237,135,68,135,43,224,210,45,65,207,177,246,191,200,104,141,81,124,66,13,233,217,237,14,88,126,42,50,130,37,141,130,194,137,47,8,131,14,39,156,121,69,103,1,167,75,111,90,63,212,218,163,240,45,179,41,150,227,191,254,49,63,159,133,223,254,145,83,148,86,199,85,72,152,181,90,72,35,26,205,220,76,179,216,192,146,129,57,155,231,173,38,11,73,94,108,101,125,151,249,162,68,66,58,52,124,92,177,172,8,247,243,247,130,152,134,44,
+150,74,226,185,66,145,175,201,105,6,84,137,74,157,239,247,79,17,225,55,153,40,74,253,210,185,167,211,202,139,182,26,205,143,139,231,248,69,196,254,97,31,126,179,184,131,125,254,124,158,218,59,158,195,90,73,245,126,159,135,125,177,86,155,171,92,42,51,91,157,254,43,186,38,195,223,66,161,164,218,209,28,230,18,151,36,122,142,13,165,120,124,46,177,73,78,1,16,203,159,149,69,163,202,193,160,244,157,143,255,199,121,16,56,68,1,46,237,7,71,64,230,224,112,37,24,28,45,189,223,243,78,199,172,197,227,235,201,164,187,27,5,214,131,65,247,55,95,234,169,148,123,65,187,175,238,199,19,69,62,71,222,201,165,65,84,225,253,148,219,175,148,117,254,249,108,46,157,191,58,204,54,140,94,8,95,251,184,246,202,109,200,58,220,228,73,204,107,127,153,55,220,248,213,59,30,101,19,57,173,101,197,21,236,104,101,93,238,65,61,122,229,20,180,19,208,85,122,122,238,207,98,105,198,69,112,129,223,39,150,160,131,171,180,248,213,122,106,90,93,53,66,151,222,77,228,
+158,170,218,178,196,134,165,55,161,45,209,53,20,184,177,29,194,51,184,77,72,222,50,217,118,242,143,85,179,242,151,214,110,155,7,14,219,182,193,109,180,243,177,187,224,51,235,149,63,198,115,53,223,169,193,15,111,29,56,156,184,87,59,88,107,237,181,86,101,87,3,132,103,111,0,88,223,29,127,189,241,184,101,23,240,64,229,176,180,114,39,248,36,231,230,39,171,23,98,128,160,85,218,224,181,198,116,17,68,61,216,51,240,119,45,192,222,88,18,122,238,66,60,148,190,90,71,247,11,216,152,23,169,26,196,220,23,140,13,140,104,193,161,23,231,7,133,7,237,251,186,127,223,79,42,206,103,114,73,20,14,201,37,171,231,74,1,5,125,253,121,88,175,35,254,233,2,240,63,93,152,255,211,69,41,235,27,252,167,11,185,146,247,237,26,138,111,213,72,20,196,36,100,236,100,22,43,20,137,82,77,78,178,161,226,97,168,194,213,196,72,9,4,131,161,52,187,200,81,153,10,149,242,203,70,161,145,120,153,66,129,200,83,105,10,20,170,216,111,106,20,222,14,149,30,149,
+37,82,165,157,77,65,252,31,150,65,137,74,134,199,74,131,177,244,199,100,42,142,71,42,122,39,77,252,43,28,10,66,62,95,252,251,81,216,113,53,42,227,55,17,203,98,244,12,197,245,90,90,250,85,138,159,8,149,171,30,160,48,197,112,232,55,224,14,20,133,66,69,183,27,42,101,9,10,129,111,132,159,200,246,187,220,237,182,147,211,52,197,20,95,107,103,89,51,163,181,102,239,58,20,82,28,57,203,242,155,50,223,12,243,0,196,94,202,120,229,158,79,123,114,58,85,20,116,131,69,133,214,220,94,195,212,10,36,123,158,69,123,25,9,118,1,153,201,118,103,214,172,3,63,185,191,85,32,51,135,139,89,196,59,231,102,216,200,89,176,171,6,108,106,116,157,149,199,198,76,127,68,99,26,89,167,137,249,98,247,90,16,106,159,173,223,131,203,234,232,98,126,170,58,113,139,202,190,119,184,47,59,136,86,144,173,251,24,113,171,112,92,191,178,217,177,19,203,97,240,196,53,155,200,100,215,185,91,201,214,203,208,77,221,98,52,145,66,238,159,137,116,125,167,93,213,
+20,48,218,216,13,217,60,205,42,136,86,95,205,76,213,198,210,91,69,92,157,53,94,245,144,10,151,115,232,165,122,162,41,59,3,125,88,89,237,8,54,76,220,157,239,187,34,146,252,152,239,194,175,247,28,162,85,214,131,248,206,135,29,82,104,112,138,105,190,121,130,164,210,125,94,60,136,108,140,217,161,101,164,164,200,11,15,133,87,46,32,218,104,123,53,11,69,101,48,255,14,52,111,149,5,100,145,6,252,223,36,233,39,209,121,141,44,149,234,134,126,10,22,51,49,18,136,72,255,13,180,148,193,233,20,18,229,202,37,52,177,94,151,86,255,230,134,57,69,68,148,107,202,130,114,73,174,84,34,179,178,95,213,111,182,76,81,94,146,73,42,8,104,80,17,254,106,245,196,245,57,90,199,145,6,91,53,62,24,16,69,162,81,79,104,88,9,124,241,145,226,112,168,81,111,183,68,179,25,216,245,126,15,123,74,173,118,72,168,84,82,182,250,175,247,87,28,255,115,138,48,85,69,51,168,83,204,3,75,49,52,80,227,113,113,66,34,25,245,69,134,161,208,31,239,254,
+14,250,252,127,188,5,6,99,4,58,154,254,227,45,232,133,24,116,1,6,83,76,192,96,170,223,159,0,120,0,82,175,55,95,169,84,102,43,117,211,150,181,227,186,192,124,48,104,191,156,52,251,52,103,180,172,201,19,76,35,165,32,83,76,101,169,60,142,175,125,190,118,209,209,52,151,208,190,188,229,247,14,239,101,178,205,193,109,124,35,89,164,188,237,195,115,133,168,211,97,12,117,172,157,64,23,122,246,70,206,4,149,54,27,130,38,136,165,38,20,151,145,194,56,102,21,219,86,228,34,59,107,39,90,235,216,236,74,224,1,209,35,167,162,77,182,225,46,104,31,76,163,94,173,108,124,122,214,29,251,113,149,97,236,114,191,225,88,194,234,120,55,123,187,21,159,112,75,145,29,34,179,126,178,130,214,91,109,51,53,177,21,107,239,110,105,226,155,176,70,99,59,97,115,215,235,160,91,109,226,57,175,61,26,75,118,61,178,200,188,77,40,137,189,214,220,188,77,57,103,3,94,241,139,247,204,187,188,118,125,88,229,106,163,123,230,205,247,118,254,33,28,224,10,243,138,
+224,17,131,63,155,206,77,97,230,180,204,133,177,141,120,6,56,179,46,229,38,120,139,74,156,181,194,95,190,125,50,165,158,34,251,120,136,19,53,103,137,127,222,99,229,133,67,241,247,253,192,203,114,94,160,202,229,124,94,52,32,36,227,255,190,168,177,81,82,41,137,158,24,139,74,81,48,88,190,163,237,17,98,177,22,87,174,230,149,16,97,201,79,68,24,33,17,231,243,112,137,122,17,25,72,8,40,10,133,64,229,219,26,2,130,178,28,141,36,166,162,127,210,85,38,18,177,157,30,4,140,22,40,84,57,10,221,140,251,129,160,100,105,184,154,40,247,123,138,221,222,128,4,115,195,225,175,1,104,164,214,106,40,75,163,67,100,202,99,177,172,196,47,83,86,85,223,30,107,19,153,75,68,146,168,235,250,39,6,148,68,2,9,247,69,34,161,159,184,230,107,17,232,66,40,226,83,244,251,148,92,14,69,140,197,194,33,136,72,133,248,35,178,20,8,100,206,7,129,202,65,96,234,123,247,70,117,58,80,60,254,17,72,38,123,51,57,99,235,237,232,55,188,192,183,119,
+246,198,63,12,115,178,168,127,57,250,243,98,152,42,137,163,118,3,138,87,251,254,189,174,157,225,206,224,45,218,10,23,178,94,131,212,41,149,127,54,32,105,229,7,178,10,60,127,132,146,53,228,33,222,91,241,32,43,240,140,41,175,237,128,171,123,94,17,207,254,220,245,114,46,151,44,93,50,211,39,179,110,206,130,213,192,55,246,94,30,80,153,228,113,73,103,235,230,91,72,234,89,85,71,10,205,184,229,182,191,96,141,150,85,180,219,91,88,194,253,193,197,110,9,78,255,172,67,204,148,205,139,252,163,91,7,251,113,179,1,197,176,217,187,133,17,150,181,14,166,70,152,181,199,124,255,184,170,136,40,251,182,29,186,121,234,32,122,192,223,205,213,109,173,159,210,144,181,157,219,158,212,173,3,233,60,240,145,26,251,183,209,45,169,247,182,194,247,193,56,100,89,143,34,50,9,254,70,178,231,24,94,125,201,29,225,167,138,117,54,13,140,78,117,239,34,238,196,60,209,93,51,63,58,175,133,248,145,93,21,121,229,6,143,65,211,231,84,166,104,74,19,179,241,231,83,
+77,165,66,134,31,178,245,107,7,17,152,136,154,96,179,98,175,132,155,24,27,158,78,18,175,133,134,8,239,89,44,142,136,20,87,42,227,165,13,213,245,79,0,123,32,234,159,0,232,136,102,172,198,116,153,138,233,232,132,76,34,221,118,250,1,39,42,14,135,247,1,91,224,230,7,114,146,82,252,237,182,119,185,110,235,168,134,19,20,218,237,251,221,114,121,43,211,56,169,56,109,50,78,24,13,195,193,108,182,167,37,121,180,235,79,38,69,149,73,98,68,230,223,109,111,112,201,35,113,30,227,55,19,35,96,140,140,253,245,122,107,2,57,46,75,153,199,85,203,240,40,82,52,146,16,27,68,195,94,111,159,205,66,110,49,132,235,55,198,123,50,126,47,23,250,227,118,139,191,158,195,118,123,47,133,162,71,104,90,204,125,119,13,15,147,196,228,143,78,204,240,212,252,239,252,225,89,177,158,9,202,205,26,66,238,119,131,161,87,253,20,124,214,206,91,167,247,22,93,132,11,122,119,65,234,100,202,111,247,50,109,95,116,173,56,226,34,73,216,26,243,239,200,217,155,233,
+190,49,125,51,225,164,10,151,88,136,138,224,248,198,178,202,226,48,82,98,145,213,43,126,55,74,208,194,169,254,143,173,247,250,113,232,235,174,195,254,149,239,201,111,9,228,24,105,10,12,24,240,63,96,4,200,83,144,32,130,45,56,2,100,73,144,172,60,179,247,222,123,239,189,12,219,176,247,78,14,201,25,246,222,57,172,151,228,176,151,112,126,95,0,7,65,48,0,15,121,15,57,156,179,215,218,107,175,125,135,60,183,141,246,242,213,8,186,201,16,48,210,99,247,180,249,230,42,215,93,166,49,188,108,140,140,83,72,187,219,124,181,29,140,250,160,216,230,188,88,115,57,93,120,246,227,116,196,4,247,57,48,131,26,236,171,192,15,222,233,2,235,29,142,110,238,210,108,209,137,215,185,201,66,32,26,158,177,129,237,244,142,208,231,43,3,56,213,200,251,62,89,41,235,114,23,154,192,87,9,251,123,96,221,116,179,58,161,13,231,18,101,86,111,188,86,94,28,123,64,14,241,233,21,36,101,92,167,156,216,157,100,140,64,85,239,240,96,86,69,235,64,143,24,139,177,
+40,94,66,40,57,113,127,139,187,229,122,57,192,159,189,72,79,52,38,243,247,188,23,213,246,34,0,36,198,254,173,7,9,216,253,207,4,120,202,126,9,96,225,176,94,125,230,75,1,106,205,47,186,90,71,67,195,161,50,73,168,220,206,193,2,144,90,141,173,214,211,137,192,89,38,139,148,155,99,221,0,72,20,200,58,171,137,68,163,37,156,205,97,237,225,211,25,137,195,240,56,229,228,213,114,132,161,206,205,29,142,146,85,212,162,54,86,232,164,97,42,67,96,24,152,135,51,251,204,242,249,73,161,72,78,3,203,40,153,180,200,80,178,90,95,162,19,7,91,177,110,162,223,31,154,227,102,11,139,85,219,191,5,116,154,20,131,173,198,10,81,36,56,60,25,10,179,70,98,177,69,36,170,245,187,34,157,40,48,158,228,148,187,31,250,249,154,30,50,12,180,243,37,53,38,230,153,89,174,114,119,92,51,93,174,228,56,75,193,102,89,98,238,251,151,253,251,119,251,11,88,173,42,53,91,204,131,161,52,230,248,99,159,11,164,255,235,54,46,175,66,114,127,69,171,187,
+95,70,2,237,150,236,228,20,180,228,97,49,242,78,117,105,63,76,159,24,185,246,99,21,160,27,160,125,186,170,131,86,212,221,67,237,135,29,178,92,217,85,250,105,157,176,170,141,170,253,96,209,183,255,218,247,217,104,70,187,154,190,118,155,132,159,50,167,253,230,204,18,248,132,69,168,5,135,230,120,109,252,96,160,5,190,241,57,93,39,120,182,57,157,12,102,165,210,175,215,155,85,172,21,108,99,53,177,98,155,135,213,134,94,181,64,55,97,19,184,128,33,93,192,112,109,154,185,18,163,179,109,0,7,87,251,216,251,12,27,77,184,233,153,168,148,175,85,238,221,81,187,218,123,65,23,87,93,168,149,44,205,67,98,225,173,4,185,92,73,157,232,23,131,79,235,196,146,32,12,109,37,154,112,138,70,41,126,38,145,92,200,39,194,65,160,124,106,243,194,109,175,255,107,28,139,8,208,75,244,243,50,74,145,84,137,127,207,229,125,243,64,173,22,255,26,128,26,163,252,69,78,165,212,129,143,132,70,147,56,187,186,159,34,209,104,84,44,34,138,161,73,58,157,74,16,
+0,51,237,55,227,195,197,80,168,248,33,26,17,182,242,243,89,102,204,99,57,92,237,104,147,200,153,9,127,222,112,130,50,178,38,199,138,55,233,56,204,17,24,70,102,217,98,54,43,254,2,126,146,140,44,242,100,178,72,150,201,102,125,201,155,120,27,76,117,19,131,129,28,7,0,197,106,117,150,1,227,222,222,235,28,182,186,131,71,145,16,200,116,216,31,146,137,197,197,110,23,54,251,32,189,153,62,56,55,146,232,103,71,189,92,8,41,175,87,222,110,23,121,249,252,236,118,46,18,5,196,89,211,85,116,237,6,50,235,36,61,201,209,48,57,161,129,111,137,190,107,102,148,253,237,52,203,123,252,201,56,142,76,224,48,228,247,111,173,26,91,11,113,17,233,199,186,118,29,252,244,189,21,73,149,192,99,185,41,203,68,21,156,204,97,104,213,143,190,116,179,2,127,149,81,76,41,181,13,81,96,135,247,15,33,203,172,98,190,163,230,156,204,7,199,236,68,94,68,208,11,238,237,150,28,31,37,51,200,252,106,10,214,32,250,242,194,212,59,10,48,11,199,224,35,197,
+43,255,116,97,80,101,165,55,106,106,246,110,32,137,54,105,115,205,99,95,65,213,59,202,189,156,166,249,51,232,10,160,82,45,240,33,37,196,181,211,242,209,234,212,182,171,27,13,81,193,49,250,172,61,47,217,20,4,141,175,186,7,113,105,106,76,219,37,229,56,74,49,138,78,136,51,245,109,239,13,221,161,168,181,180,248,205,122,119,211,112,18,114,151,225,116,144,1,190,56,89,33,239,208,65,166,183,123,126,248,79,27,117,217,248,251,121,15,197,249,84,125,137,250,43,165,227,81,10,231,55,165,193,223,223,197,175,168,70,91,149,135,196,106,149,104,116,31,81,192,32,26,157,140,46,22,209,194,124,42,229,147,69,163,176,56,149,134,160,147,67,161,87,77,103,247,254,12,48,35,79,225,106,123,155,196,239,190,16,191,87,72,146,68,171,139,23,192,50,130,20,42,83,166,171,186,72,178,206,145,217,190,40,65,138,164,103,73,110,45,44,153,58,73,97,169,146,150,4,201,196,162,156,78,176,100,147,39,179,151,41,60,170,20,77,96,68,162,129,164,68,42,39,147,41,228,
+205,38,89,101,201,100,129,8,133,167,67,99,40,44,24,34,117,187,203,31,155,7,165,211,65,59,28,220,72,58,221,159,169,107,122,83,160,223,19,179,29,177,124,127,101,0,118,84,108,134,35,103,155,195,150,239,37,103,184,29,38,35,105,52,5,24,200,252,143,131,234,252,184,38,29,157,67,234,113,155,36,253,247,100,99,61,94,154,155,219,135,59,83,55,86,214,182,24,79,156,38,207,193,37,42,4,231,219,92,62,186,239,49,52,123,228,85,89,34,193,5,100,200,230,224,191,167,171,160,22,156,146,75,62,102,51,65,148,73,208,182,90,85,77,216,40,48,167,241,213,89,132,51,202,85,59,216,236,120,49,55,134,13,163,234,60,26,68,104,9,213,205,13,158,179,234,3,108,119,174,1,76,10,132,244,161,105,29,20,16,124,232,161,217,6,147,220,90,211,34,124,215,70,4,85,96,234,18,28,181,61,53,59,127,5,182,78,118,155,11,148,65,199,207,203,237,3,220,10,84,114,72,206,78,124,129,142,30,218,55,159,204,144,197,183,243,234,172,252,36,214,128,98,31,15,162,
+252,88,224,109,144,188,70,130,5,82,239,16,125,163,120,143,185,123,12,247,138,240,166,188,122,156,31,194,44,231,100,31,124,125,146,200,168,79,68,133,250,219,232,39,193,176,16,240,123,234,39,160,132,128,213,90,42,243,204,160,248,132,52,26,106,142,125,245,115,113,12,166,19,129,195,101,162,64,6,57,162,220,110,64,91,0,77,102,233,59,167,76,105,143,243,248,250,92,74,66,89,216,157,86,234,112,104,68,189,188,187,142,225,20,232,241,178,223,11,112,71,35,25,133,211,85,227,145,105,17,10,53,138,70,7,250,136,48,79,104,36,240,177,212,248,239,23,22,133,145,66,161,175,82,1,144,161,204,41,9,241,4,27,3,1,75,69,34,48,183,112,40,18,12,246,69,78,17,16,0,85,59,29,238,98,162,60,252,208,175,143,43,214,235,137,8,4,201,62,28,251,26,250,130,243,46,178,90,245,29,62,7,176,168,245,217,86,97,180,164,196,42,115,116,76,158,35,19,152,130,158,213,65,119,66,10,35,210,85,28,235,63,199,110,35,54,179,207,180,28,40,134,218,249,62,94,
+86,26,27,158,89,156,129,57,71,93,154,33,140,32,243,4,52,230,94,20,1,5,95,210,99,136,226,5,20,57,169,246,45,106,224,24,171,55,206,204,156,128,18,114,251,197,79,168,3,31,181,76,203,105,183,18,158,5,242,24,111,117,26,41,83,15,182,125,159,200,190,94,55,98,21,49,174,119,154,121,70,37,115,208,220,238,27,8,32,137,209,150,155,29,36,129,155,6,230,46,68,70,207,250,14,111,132,43,38,23,16,49,137,153,83,185,31,177,10,60,166,238,136,46,48,254,156,26,120,242,177,21,80,126,128,117,132,11,209,238,152,158,241,226,154,54,209,9,108,113,42,91,254,227,140,130,32,87,42,23,17,242,170,25,161,104,140,111,90,139,87,15,69,200,16,158,124,119,26,67,243,51,133,197,254,8,107,58,180,70,27,253,90,125,201,126,125,152,108,45,129,208,152,84,48,40,255,202,217,98,145,44,12,228,255,240,225,61,0,136,68,163,50,19,105,241,194,216,217,164,8,15,198,84,90,234,114,193,188,97,242,104,72,90,44,62,10,101,70,207,26,101,59,216,18,28,
+142,34,48,80,250,230,68,157,163,178,33,190,104,20,73,223,146,236,111,45,42,117,146,198,18,189,154,116,17,14,161,234,250,218,52,166,18,131,247,209,163,17,148,68,26,197,21,10,146,68,162,16,1,195,84,158,38,141,161,56,97,240,116,56,12,5,49,67,163,193,160,36,16,104,22,2,160,68,167,51,196,207,181,91,128,124,190,30,177,158,95,88,37,167,23,172,187,9,118,124,207,190,186,112,236,56,195,32,103,5,122,206,203,151,189,13,16,211,250,91,33,75,83,75,208,212,232,96,30,199,62,46,201,125,56,71,148,172,125,212,251,125,98,155,166,141,209,231,165,99,244,179,109,199,77,178,183,118,205,87,233,158,219,73,235,93,34,179,96,19,12,193,241,157,239,52,29,43,6,56,82,111,164,67,40,40,11,182,148,156,79,251,244,27,212,132,151,163,186,55,191,201,202,127,39,224,247,251,80,19,222,112,208,120,239,186,22,4,159,54,154,107,160,165,183,58,146,70,124,35,231,52,68,206,81,9,199,254,167,49,199,103,1,109,28,118,220,68,216,7,26,182,227,98,174,124,
+96,27,138,166,185,39,95,89,154,214,190,12,153,32,226,79,30,90,158,185,235,186,8,70,55,160,97,97,215,239,128,1,42,188,215,159,236,116,245,2,86,33,106,54,239,203,243,27,63,189,176,169,11,150,175,23,14,172,40,241,99,67,0,241,174,9,22,98,247,137,2,160,40,55,188,115,231,110,220,7,71,138,227,72,252,254,35,9,38,236,104,255,12,104,7,244,7,160,33,228,175,175,46,54,51,160,147,167,248,41,211,233,170,50,56,28,150,150,159,29,231,144,199,67,225,166,187,78,94,47,71,72,230,2,140,241,136,108,111,176,0,118,210,98,129,205,102,87,88,148,162,144,147,63,157,159,189,20,134,148,148,17,147,201,144,76,214,235,7,36,201,4,201,194,10,245,78,167,94,147,135,198,31,232,177,8,74,42,133,191,240,12,37,18,189,23,158,38,79,147,197,80,84,113,120,58,2,134,130,90,161,240,96,48,244,194,179,23,0,125,116,58,211,229,68,185,255,161,95,78,4,148,215,11,199,50,49,176,223,129,129,242,174,60,176,221,24,61,201,33,232,57,182,116,255,210,
+227,28,71,206,51,135,157,47,61,222,164,104,61,217,54,25,66,83,97,131,88,4,253,188,21,156,99,28,103,243,169,234,85,58,216,185,255,20,154,134,202,27,111,89,238,111,188,44,23,143,185,123,239,105,163,213,54,179,255,30,248,20,73,197,212,11,116,231,14,148,74,226,55,62,29,251,161,151,202,200,41,10,92,166,239,144,146,98,146,52,12,190,173,228,12,123,248,19,236,30,241,171,53,248,87,29,174,107,224,178,239,139,150,22,194,191,44,106,24,40,10,193,179,119,171,196,220,113,223,125,35,79,112,211,177,163,79,33,87,112,206,74,25,202,245,58,71,129,158,8,28,78,155,117,241,243,93,126,18,133,165,209,213,73,18,181,26,60,83,109,36,77,240,172,226,13,138,188,173,157,14,77,195,48,104,239,149,173,103,170,226,215,143,246,211,19,152,249,172,27,1,232,202,186,224,222,39,56,208,153,8,152,142,228,3,210,231,48,215,39,221,245,79,198,63,98,70,225,127,224,41,212,234,112,180,151,214,118,94,98,75,234,247,67,200,223,19,37,197,106,98,250,106,161,153,233,
+237,78,4,127,85,83,7,115,99,122,105,109,156,196,207,206,45,22,20,87,159,200,84,101,108,54,228,197,85,68,159,252,246,22,252,214,108,146,73,178,137,13,25,34,134,20,154,44,145,145,129,208,104,8,34,76,18,30,242,253,62,204,108,134,244,88,172,224,254,13,141,1,81,34,49,140,68,2,35,246,122,16,147,41,56,5,171,68,178,8,137,151,185,66,32,48,48,24,2,242,129,192,66,97,160,82,225,118,7,210,205,129,113,2,157,209,47,167,124,186,32,48,227,60,243,116,66,53,198,89,170,243,149,152,217,12,217,233,66,143,179,12,74,134,37,102,249,90,159,166,31,77,119,59,12,10,35,104,8,48,128,15,102,113,204,227,20,220,220,211,71,72,65,10,123,158,39,216,46,214,8,123,110,219,70,63,223,54,49,156,63,189,147,101,169,249,222,5,107,67,85,119,159,41,142,213,208,123,251,80,75,114,116,48,18,198,102,164,234,174,99,35,106,4,175,10,44,3,97,111,157,83,32,25,194,21,236,30,163,203,149,66,69,2,93,163,3,21,7,75,165,125,223,227,99,25,
+141,87,227,100,150,31,244,177,32,159,160,163,6,1,185,211,6,155,224,247,78,99,28,238,53,216,141,193,47,185,211,7,251,132,190,55,219,56,55,182,14,56,184,199,55,214,108,16,10,231,60,229,129,218,128,201,55,128,16,186,146,194,120,102,65,55,187,253,233,128,252,4,150,72,84,165,45,222,234,83,29,168,235,73,137,230,201,79,156,190,150,39,61,80,73,162,137,116,21,246,194,27,126,39,196,11,250,123,208,103,237,183,57,178,214,6,136,167,238,191,228,97,4,131,69,189,188,80,111,155,124,28,124,201,63,116,213,252,219,221,222,22,139,57,133,254,114,66,20,246,49,153,79,136,102,51,152,63,218,87,190,210,240,19,73,161,132,38,47,35,148,176,248,213,104,153,98,123,162,82,80,208,32,145,40,156,196,163,228,106,245,65,202,224,252,239,156,72,52,9,72,165,103,50,249,246,242,65,20,70,140,136,127,254,113,117,120,232,25,23,12,222,2,129,71,224,1,2,142,147,235,25,128,221,239,103,159,239,102,36,24,31,33,248,45,159,191,62,32,240,219,121,119,222,11,4,
+175,225,180,162,174,110,174,215,176,202,222,106,214,147,117,178,253,81,230,39,121,126,74,24,178,192,253,51,202,51,100,135,61,156,192,77,248,72,191,202,90,88,232,229,60,159,75,199,205,232,235,15,158,179,252,173,98,57,220,3,114,255,78,215,122,34,59,45,239,173,78,210,160,226,25,43,101,152,152,167,32,110,178,171,72,251,204,74,171,16,75,253,243,179,39,74,193,146,120,206,28,44,90,4,38,210,189,197,186,79,244,86,112,27,94,71,144,151,223,6,94,204,15,247,221,148,197,243,249,249,170,54,8,54,240,86,224,144,89,159,155,2,117,52,118,87,223,207,129,36,128,213,214,155,243,16,158,97,104,22,187,38,106,152,245,141,59,118,125,24,226,11,200,4,90,185,60,29,203,152,201,214,67,235,209,126,164,109,123,183,197,151,248,62,65,95,129,232,53,77,243,134,1,46,205,83,15,173,176,38,161,116,73,81,83,4,210,177,56,84,143,119,119,235,10,247,60,107,248,216,190,249,79,141,168,3,48,152,68,79,220,125,153,219,166,33,153,119,61,101,175,110,116,76,241,17,
+144,195,223,58,216,109,31,24,70,45,54,110,31,83,51,25,10,57,56,47,150,208,216,104,177,168,56,169,213,50,57,220,228,96,123,134,175,148,139,116,41,212,51,26,13,11,10,187,209,56,213,233,108,243,22,58,52,186,23,141,35,119,18,73,98,40,51,82,36,16,38,57,135,37,18,39,112,56,16,10,159,73,98,177,204,201,98,210,146,17,44,110,8,127,65,120,187,159,31,15,79,231,208,17,16,137,192,97,44,59,159,1,134,97,168,63,84,3,92,191,112,210,195,6,185,14,162,227,104,120,230,91,252,201,56,198,13,121,185,142,57,99,29,107,227,218,251,153,103,86,202,156,74,138,141,34,219,87,100,121,9,174,95,224,200,28,116,235,184,240,220,121,189,224,186,114,183,29,235,206,230,101,112,219,254,159,167,123,253,188,27,59,215,92,157,207,188,61,172,174,131,240,56,252,2,117,13,104,201,55,233,3,251,201,50,103,225,25,117,236,161,145,99,52,1,166,40,228,2,213,197,28,141,152,196,149,74,9,173,159,170,134,11,87,163,211,220,222,186,4,182,210,253,142,158,20,
+68,105,48,122,113,247,129,171,53,229,225,80,190,179,82,4,15,190,121,197,193,29,199,153,124,57,69,49,246,136,208,92,6,126,232,152,149,102,227,230,31,25,141,158,129,114,172,155,138,86,12,82,127,106,226,148,213,236,73,17,197,94,60,37,77,152,107,110,151,7,104,47,137,4,26,63,152,63,222,248,163,49,244,40,236,104,130,218,72,218,224,80,133,60,233,134,106,19,189,15,65,158,189,237,215,79,175,174,180,73,164,11,21,249,237,54,177,90,41,23,60,66,50,41,174,213,120,50,45,214,84,147,89,107,47,47,74,122,233,163,253,87,31,41,156,20,172,88,116,102,20,201,92,87,145,76,202,204,100,110,144,20,96,225,40,194,60,23,143,149,154,205,50,5,128,224,242,179,18,137,147,74,38,203,36,16,174,0,200,189,38,196,226,38,152,68,90,109,76,104,76,176,143,64,108,161,16,212,221,239,175,228,137,243,57,49,253,3,244,46,215,29,210,235,113,98,153,91,111,223,235,194,50,54,147,60,48,185,156,54,147,236,96,146,227,167,127,142,147,220,142,29,254,217,13,114,
+2,108,150,239,162,186,7,136,203,241,178,95,125,170,155,56,117,201,73,85,0,74,70,110,72,16,230,249,110,33,227,58,32,54,205,131,129,83,26,223,197,241,253,250,227,110,59,166,141,174,247,231,77,90,161,235,90,197,99,210,159,46,63,188,33,117,94,3,43,75,36,49,8,48,74,24,160,216,57,81,215,31,50,196,34,39,104,228,65,157,72,24,241,135,36,114,181,189,127,75,77,50,70,12,125,225,100,186,115,152,20,61,231,44,205,109,66,86,95,45,207,48,45,204,98,25,6,179,236,188,114,159,69,81,102,105,78,125,196,37,191,8,233,78,85,132,110,111,66,230,97,60,28,81,55,91,171,16,177,11,193,5,204,126,52,145,3,168,192,102,162,252,84,199,78,108,186,83,13,95,9,121,200,224,46,95,40,60,5,192,86,210,21,92,91,7,46,105,232,176,130,122,38,75,55,30,84,24,218,1,157,218,76,252,135,31,181,214,116,192,67,207,227,53,40,252,236,111,233,50,223,95,93,96,50,33,34,190,180,47,42,153,205,120,50,27,93,38,35,41,106,84,153,146,42,147,
+81,196,172,4,229,87,249,160,253,129,11,0,100,118,7,35,18,217,72,164,73,222,39,13,141,27,70,34,80,210,102,147,171,178,208,62,252,8,6,35,117,187,162,220,7,233,53,1,243,192,54,183,59,90,40,124,198,43,204,193,32,12,152,15,138,118,155,7,199,18,92,2,193,107,112,134,119,147,157,199,227,220,221,199,192,56,55,114,186,125,187,113,166,231,116,1,143,113,126,156,225,68,217,33,23,213,58,64,76,234,130,183,220,167,154,167,46,133,126,209,81,228,134,35,156,48,207,118,16,118,242,82,158,39,124,116,111,173,167,119,226,94,59,59,132,91,248,156,238,56,59,185,71,242,60,16,186,158,182,221,243,113,40,95,90,203,109,158,102,235,172,211,100,41,236,225,129,209,37,21,4,54,226,145,109,73,14,50,188,185,216,236,62,76,95,160,164,153,115,254,224,96,62,212,145,190,134,5,137,76,233,131,51,191,124,72,153,222,193,115,89,181,82,69,233,179,85,113,152,190,122,53,141,177,160,139,74,72,0,77,66,105,155,231,145,7,30,30,115,232,119,126,226,180,89,167,
+97,30,206,42,154,223,17,209,148,22,198,59,149,193,59,235,221,67,26,144,81,249,180,102,147,65,49,33,158,82,127,240,99,110,51,186,145,187,128,132,31,130,212,202,53,249,196,48,27,201,192,1,243,48,118,129,5,113,125,132,61,243,237,199,143,214,199,181,29,140,244,224,175,47,76,92,46,1,165,142,241,170,88,234,188,90,248,11,11,117,241,103,88,88,31,127,134,165,111,30,36,127,109,161,156,244,74,154,223,122,4,54,75,165,201,8,12,109,34,42,123,189,197,199,7,236,85,199,8,4,69,16,21,124,53,23,124,82,0,121,187,215,30,143,69,199,215,233,15,194,135,195,120,113,61,147,225,216,154,96,39,88,192,177,213,221,164,74,37,18,15,158,243,194,235,218,213,86,171,133,107,187,171,190,134,154,85,91,179,142,205,147,220,208,152,103,5,5,62,190,119,186,228,92,83,180,195,144,155,92,36,169,85,170,178,98,137,19,39,68,110,60,253,152,41,15,68,191,73,27,199,245,136,130,172,224,97,195,220,127,42,11,163,218,215,127,2,240,43,145,247,236,186,41,54,170,
+193,127,158,164,234,70,135,29,164,228,182,23,176,145,8,100,193,3,234,68,46,228,60,112,78,108,85,34,184,95,10,56,24,81,87,108,134,18,151,236,253,168,138,80,192,228,24,109,164,58,254,130,218,250,11,85,24,55,70,219,191,6,21,47,252,96,239,6,160,132,244,16,248,196,80,139,60,198,188,175,163,221,241,206,170,30,164,253,113,150,137,92,30,5,247,217,179,179,142,168,239,77,5,118,253,98,245,201,253,158,75,192,236,69,212,194,252,249,84,3,85,43,231,19,21,122,100,67,79,36,132,12,12,8,251,164,51,33,184,238,253,36,56,187,246,163,37,92,87,158,201,244,250,107,98,29,196,46,213,217,76,40,51,42,40,52,90,158,149,225,82,120,25,10,197,151,220,100,100,191,101,230,116,147,249,4,145,151,51,48,85,41,212,240,43,63,112,191,249,33,123,25,3,153,135,7,131,147,63,64,31,229,4,10,77,80,144,130,191,64,208,73,177,192,31,64,68,158,149,151,139,51,121,188,37,52,147,57,239,133,24,108,165,178,102,2,217,158,15,95,58,12,205,112,227,119,
+142,155,57,90,229,56,57,43,114,52,142,141,243,237,113,150,19,229,184,168,31,182,1,98,126,217,151,241,111,51,157,186,84,43,133,21,166,87,181,201,242,176,9,142,9,108,123,120,82,243,69,181,156,247,155,17,143,19,216,54,198,205,245,251,105,89,85,208,173,245,190,222,125,100,212,25,245,254,225,125,150,215,61,91,87,71,249,121,18,250,119,124,27,212,112,86,166,137,245,251,211,91,183,248,105,130,71,1,133,7,73,67,24,54,142,38,11,147,118,8,78,38,97,45,80,196,216,131,225,45,250,65,31,72,145,196,29,91,55,226,85,107,224,47,122,181,178,134,227,191,170,154,23,213,56,11,67,208,103,38,212,48,64,4,55,232,243,14,180,1,142,53,137,56,139,31,208,180,205,169,9,121,127,190,155,186,144,62,165,194,149,187,42,94,120,68,116,230,227,208,190,71,227,10,81,13,130,81,63,154,176,183,199,253,31,78,187,175,24,120,161,66,9,232,240,17,88,123,199,254,107,133,107,132,221,14,46,211,161,169,205,143,241,108,94,240,150,44,82,146,153,219,80,38,6,155,
+88,194,8,241,183,202,231,251,3,103,50,131,67,19,30,50,139,6,19,137,81,80,40,22,69,144,11,133,18,83,147,10,141,22,191,98,111,81,161,96,8,10,8,116,237,175,243,183,27,234,229,199,74,113,228,233,74,189,25,141,227,16,60,82,42,81,93,93,48,219,47,108,204,122,193,113,118,144,107,241,211,205,22,123,55,126,152,90,205,196,162,150,65,212,172,44,235,196,50,113,101,186,57,97,142,103,23,227,93,63,154,93,138,182,30,15,147,153,36,149,21,160,42,45,202,76,151,240,42,101,60,7,193,117,40,235,118,191,87,120,190,161,3,60,43,194,117,121,123,223,125,170,198,142,142,165,227,127,112,206,95,149,204,197,232,235,62,0,98,230,251,121,175,140,159,207,181,242,101,199,151,134,243,100,157,169,63,249,78,33,60,136,66,131,180,184,115,1,221,181,126,208,113,73,205,157,99,21,101,32,28,40,123,229,209,141,66,159,168,55,44,241,64,209,245,7,166,37,219,142,50,185,120,217,134,214,164,133,92,225,50,167,40,210,19,19,48,58,32,132,42,133,120,244,176,196,
+15,97,106,55,46,13,175,2,115,22,16,96,156,111,197,236,18,136,71,30,22,32,98,201,30,79,105,216,5,24,130,113,151,116,214,180,101,3,58,84,177,150,0,6,220,26,122,4,193,79,79,146,229,233,60,65,50,191,223,7,193,13,110,186,211,137,194,68,31,147,139,133,210,108,246,200,222,47,84,149,42,15,146,252,33,59,196,151,95,211,225,96,136,7,235,165,59,16,104,242,35,240,170,6,50,48,88,56,120,197,216,239,239,207,171,233,87,212,29,142,48,52,141,213,53,19,47,222,39,33,240,225,227,134,248,65,34,217,14,98,134,47,78,111,142,202,221,216,228,111,254,134,27,87,35,255,134,155,194,182,50,88,37,165,85,145,29,96,50,252,148,34,211,203,48,5,25,214,27,218,12,236,37,131,16,44,118,2,228,56,96,192,26,196,45,143,199,5,13,12,136,56,149,121,192,234,60,243,172,190,151,99,254,166,13,26,155,53,187,243,204,158,190,199,218,24,179,99,121,236,47,202,152,240,17,56,49,111,207,222,205,241,60,52,22,181,198,156,242,108,235,144,247,14,122,112,
+17,43,37,32,143,233,51,34,182,143,5,120,244,52,11,198,88,225,134,140,46,9,49,123,144,119,151,105,20,46,200,65,54,120,181,2,203,86,61,11,125,140,64,89,72,94,172,247,17,182,192,17,70,28,220,120,195,1,47,131,206,209,187,33,179,198,0,108,228,168,202,203,30,91,65,142,173,153,37,197,138,121,184,73,239,129,83,8,76,27,21,60,191,165,0,111,130,188,116,179,183,224,140,208,77,121,238,125,182,82,143,65,155,141,253,61,253,203,224,211,209,63,201,225,80,73,38,251,133,48,36,213,100,202,7,66,97,255,47,147,161,65,33,12,126,167,176,76,9,8,196,7,28,149,188,151,150,84,142,84,225,65,216,95,102,61,158,132,240,151,204,84,93,21,17,24,231,149,2,193,16,220,246,88,142,6,224,184,127,5,55,226,118,145,141,53,107,82,87,43,88,45,191,193,149,40,243,10,101,73,17,125,53,28,120,69,6,45,240,184,46,189,162,204,2,244,247,48,3,186,48,136,199,137,92,18,211,123,88,236,243,126,70,244,121,26,236,137,254,109,132,200,166,222,239,71,
+105,65,26,143,63,143,45,238,94,85,40,116,110,84,226,75,237,11,157,59,157,120,31,49,95,143,201,249,123,252,105,228,187,177,107,244,55,102,224,92,73,69,136,32,130,213,69,212,90,172,123,103,98,217,129,225,96,23,104,83,64,124,178,96,145,104,204,25,232,28,175,31,178,25,103,47,150,207,194,204,183,37,199,158,182,227,205,49,206,0,167,255,98,225,131,211,183,111,230,167,70,159,214,207,231,219,229,114,188,224,248,30,95,41,63,111,163,52,161,253,21,57,102,252,216,157,141,44,102,50,227,154,60,32,187,117,6,200,23,10,94,98,172,36,149,217,140,159,180,115,187,145,214,173,248,114,133,167,137,169,184,213,64,204,209,174,67,142,241,235,38,8,242,9,66,138,137,214,52,98,53,98,128,105,160,63,232,195,204,240,220,188,134,18,22,17,215,73,69,32,246,167,172,60,129,216,27,178,114,196,107,111,241,186,237,135,170,42,195,50,66,199,59,189,239,130,74,165,55,174,223,111,78,136,16,1,236,82,154,38,63,180,134,158,248,82,226,145,209,125,56,158,143,239,72,71,
+127,154,248,212,237,180,66,255,30,7,106,195,101,246,123,49,12,188,191,15,95,62,117,105,94,54,27,220,74,61,117,96,13,40,73,131,28,62,157,175,20,104,88,229,147,29,177,217,41,8,132,196,140,105,222,189,106,173,244,105,179,201,20,8,173,193,169,248,250,61,147,248,201,250,36,5,73,125,128,130,197,146,167,180,136,164,8,114,102,66,98,10,46,165,7,131,128,171,92,152,95,110,47,232,184,212,213,218,81,210,114,23,159,18,254,14,46,14,201,49,85,87,47,39,251,228,204,56,89,30,82,112,177,100,151,196,222,95,146,74,106,42,213,151,233,203,26,21,105,187,222,201,207,59,97,179,94,85,68,219,184,178,5,171,185,202,193,70,37,48,126,184,219,171,208,181,117,194,171,152,92,70,111,231,79,218,9,253,43,233,96,88,71,86,95,85,55,238,110,154,111,54,48,100,209,169,164,196,204,111,57,25,80,212,224,173,51,94,122,0,52,200,205,38,52,29,62,159,30,54,131,62,130,175,139,155,156,200,242,209,164,212,16,157,11,48,119,60,30,235,144,112,233,100,78,34,
+119,196,164,84,251,100,93,228,35,170,205,102,231,184,146,178,74,81,50,223,174,198,20,180,65,141,134,205,23,67,14,199,89,232,12,191,231,174,247,119,195,218,206,208,170,197,95,95,160,230,23,189,82,75,106,138,26,148,104,3,56,209,224,104,226,45,37,33,83,52,4,234,7,10,6,149,109,72,162,135,31,56,163,168,149,180,71,208,63,88,221,76,172,147,159,233,137,110,7,183,181,198,250,74,153,116,140,98,59,151,25,179,198,22,179,148,204,198,65,50,198,201,59,95,171,47,143,162,209,140,118,4,135,195,51,210,222,249,172,147,41,149,187,219,68,96,67,218,14,4,137,177,56,199,178,163,217,220,53,121,179,86,9,249,119,224,44,1,45,146,189,134,241,160,211,70,13,190,69,141,112,103,223,157,38,16,16,228,41,4,145,2,221,233,131,232,148,149,238,94,148,35,236,250,55,144,97,63,40,242,182,183,10,82,155,6,200,94,166,163,116,234,145,101,171,99,63,231,94,41,180,228,51,57,127,144,103,254,224,9,143,115,57,93,106,45,190,206,206,64,106,213,228,175,202,238,
+235,240,101,73,165,12,18,8,137,10,51,8,38,125,51,204,192,25,73,200,6,94,112,252,11,255,22,108,127,193,239,18,18,79,72,111,100,32,94,57,0,164,11,85,74,242,8,253,47,7,149,155,125,171,163,245,209,80,42,29,181,214,8,111,108,84,65,197,193,53,251,53,182,170,66,229,155,114,58,53,25,139,141,130,245,101,157,134,130,197,20,35,248,88,211,20,200,180,178,244,73,150,251,62,186,234,144,57,189,87,145,224,98,43,245,242,202,151,221,116,119,148,70,195,228,61,65,221,242,197,42,212,22,70,171,29,60,84,205,163,164,122,9,76,252,178,41,74,224,37,53,47,217,123,107,58,124,53,28,182,53,114,234,122,41,164,193,166,238,197,40,14,10,11,95,189,103,27,124,213,194,18,180,43,50,57,143,1,75,141,62,164,28,122,84,210,179,108,170,12,76,18,98,10,214,68,162,221,213,133,23,230,199,63,91,1,81,60,57,236,12,204,201,254,99,75,64,78,94,107,185,226,173,117,116,52,68,111,49,169,86,54,43,19,1,77,101,8,168,90,75,245,238,47,146,18,
+185,88,132,138,101,17,149,65,81,7,235,63,62,101,52,6,102,8,135,67,98,210,225,164,139,61,159,67,43,3,201,75,149,102,248,220,90,29,185,58,237,149,236,239,101,57,67,174,237,70,30,190,116,170,24,231,33,215,250,219,70,132,6,16,97,156,44,206,246,245,157,201,77,236,29,109,108,108,124,224,51,123,125,30,107,89,46,152,42,248,139,16,95,63,178,218,122,84,125,54,154,94,246,225,23,26,187,110,189,26,196,202,131,216,160,169,181,107,139,126,122,253,78,207,242,216,122,245,80,176,12,43,27,233,12,124,73,230,124,121,143,130,231,55,237,171,44,72,32,214,121,143,81,253,89,82,125,233,189,62,87,237,97,228,255,62,120,221,63,255,20,62,228,176,122,125,69,21,35,20,23,145,122,86,86,180,85,159,154,167,247,43,124,103,74,8,239,250,111,79,238,134,69,222,33,240,230,255,246,151,127,249,191,255,233,127,253,167,191,248,159,254,244,239,254,254,31,254,143,255,234,159,255,225,79,255,254,239,255,246,239,255,241,79,255,244,215,127,251,215,255,254,63,255,205,223,
+255,221,159,254,195,223,252,213,223,254,253,127,252,175,95,79,252,243,243,254,237,239,252,191,251,231,127,250,63,255,250,31,95,199,254,245,31,7,255,245,159,254,205,191,249,155,255,244,87,255,241,175,255,242,95,253,197,95,252,139,127,249,223,254,5,8,106,2,177,64,32,16,116,250,124,221,130,78,94,222,117,183,141,113,11,176,8,74,95,51,239,186,207,194,243,249,44,52,195,83,211,6,52,5,233,86,133,179,63,0,34,94,167,44,161,51,226,156,248,249,165,130,234,26,107,89,191,91,130,194,17,247,62,249,132,120,63,183,196,22,248,225,58,226,80,129,111,1,152,49,99,134,200,156,43,162,169,25,146,130,1,68,226,244,17,4,17,218,172,222,127,89,206,31,127,230,159,254,175,191,250,219,127,254,235,63,253,213,223,253,135,255,215,130,254,249,159,254,230,239,254,227,255,179,140,191,255,135,255,229,31,254,63,75,251,159,255,234,63,253,195,191,253,207,255,248,183,255,63,139,251,239,255,155,255,241,95,252,119,255,242,127,128,64,161,160,245,239,226,200,127,94,92,158,183,248,
+154,236,56,115,174,100,114,245,179,253,3,228,56,147,113,237,14,109,223,121,233,133,44,233,11,157,209,56,225,237,24,139,183,90,57,231,122,221,19,69,40,33,145,5,63,5,217,178,36,212,235,135,34,130,160,36,236,233,150,30,59,106,87,173,70,105,115,76,77,172,198,92,211,175,217,105,243,216,21,211,210,250,249,188,207,213,135,179,167,114,187,157,128,196,215,211,26,191,190,74,233,241,184,61,146,158,199,176,224,9,59,29,127,132,98,249,131,8,8,197,15,226,29,240,35,79,194,227,122,245,48,61,133,239,91,255,213,250,180,69,158,229,137,245,105,126,186,35,113,105,240,169,166,199,9,104,50,46,35,163,0,39,11,227,45,29,147,34,141,189,141,201,66,75,33,160,201,192,88,52,59,42,239,62,25,179,194,221,159,40,66,159,71,214,50,200,74,236,61,197,73,57,92,139,227,180,222,247,20,190,213,169,227,254,174,56,76,113,240,201,231,253,46,11,146,62,103,65,74,125,185,93,27,213,181,130,236,75,35,43,178,27,205,86,54,53,74,178,219,58,151,149,74,75,80,64,
+125,96,123,117,171,105,57,133,195,78,129,4,41,193,120,122,181,82,184,120,220,97,44,70,137,166,44,0,59,201,202,21,103,201,193,207,143,12,165,168,148,245,20,16,73,246,65,145,89,138,148,64,162,15,36,113,58,59,58,40,171,148,201,20,213,39,5,157,49,56,13,10,50,106,216,108,118,183,99,133,203,70,231,225,89,9,2,94,30,143,185,40,225,112,18,12,30,46,214,107,139,219,93,171,153,217,139,121,218,254,38,27,114,185,212,159,159,36,199,204,25,142,70,22,157,46,82,107,242,116,170,196,24,63,86,116,188,233,241,208,39,43,21,41,121,161,242,213,209,228,218,110,166,103,250,163,61,143,82,219,230,209,53,84,151,146,131,248,153,218,121,242,111,247,117,183,132,2,108,116,36,60,124,122,234,200,24,57,196,21,140,136,72,155,43,21,231,235,132,230,217,147,39,136,38,10,41,171,99,72,60,203,56,121,104,183,151,211,179,202,219,254,124,21,174,71,99,229,61,139,220,136,139,69,30,143,80,183,156,152,254,160,245,118,51,210,193,252,152,82,190,127,56,33,117,102,
+177,82,208,220,24,88,83,80,173,37,191,19,114,52,90,102,246,194,249,36,52,37,212,11,221,68,137,205,25,157,205,182,97,76,110,181,154,48,145,107,104,133,53,216,149,65,167,123,24,76,30,48,113,130,82,185,234,19,6,178,203,18,67,24,153,37,2,145,40,206,102,255,199,22,6,7,101,229,50,37,237,79,163,229,242,72,40,212,237,63,124,102,55,151,213,19,228,50,57,69,44,254,160,74,165,232,94,47,178,236,118,37,126,127,161,129,228,78,191,83,251,189,236,90,175,83,178,89,116,204,28,139,180,90,146,247,119,88,161,64,86,233,179,52,28,83,185,221,81,93,46,57,250,184,166,172,219,50,110,241,143,176,9,60,222,84,211,205,116,158,247,86,96,148,234,55,93,238,136,186,132,30,196,169,176,87,216,18,234,72,140,161,121,224,73,192,244,77,32,64,71,194,189,147,170,74,35,34,6,224,64,83,185,38,94,111,128,209,49,89,1,17,255,13,229,254,106,1,76,237,106,19,201,47,15,206,44,227,249,92,248,86,182,152,158,225,4,106,60,7,103,112,189,190,3,80,
+177,161,18,255,153,188,159,218,237,166,20,173,213,126,1,116,141,225,51,27,163,99,156,77,1,51,156,236,23,103,77,9,250,85,145,0,178,202,64,203,199,28,246,254,237,193,195,198,177,59,23,64,80,90,125,102,242,196,220,207,224,198,60,196,96,127,185,157,238,94,2,4,176,217,62,157,160,136,154,230,68,163,104,74,202,224,116,227,61,177,120,163,33,86,152,118,157,24,122,92,50,192,250,177,0,28,126,186,221,2,183,131,221,231,229,11,133,60,28,145,24,143,199,253,131,112,24,0,131,79,139,78,199,163,84,182,191,78,244,245,154,232,176,199,38,92,238,0,143,7,234,230,250,233,231,199,35,145,116,219,117,142,81,131,153,236,38,241,221,182,207,102,215,0,199,186,111,108,71,163,66,47,214,127,161,249,167,71,227,99,55,190,165,28,244,147,107,7,80,149,254,65,156,24,247,95,52,122,65,17,149,250,188,113,35,226,62,57,161,227,17,224,240,144,185,107,98,160,58,145,219,131,149,103,238,54,151,129,32,191,8,35,169,172,6,127,231,234,231,234,147,204,138,88,91,152,
+165,199,245,160,60,207,244,153,104,118,214,76,85,143,57,111,49,28,130,213,22,66,75,179,126,125,185,88,127,27,21,229,248,167,134,117,123,165,106,11,159,28,213,205,108,157,221,74,165,130,18,253,62,176,184,186,121,10,74,212,110,239,67,114,65,92,28,187,92,197,214,206,102,53,22,195,101,225,4,51,219,140,144,198,164,202,184,72,133,128,152,89,28,125,76,30,3,137,154,49,69,28,21,97,129,17,164,112,175,95,93,224,158,80,180,94,23,97,48,3,131,196,112,1,152,17,132,64,100,60,238,91,173,66,179,90,93,141,68,22,160,133,206,110,161,112,57,46,12,30,23,185,92,250,194,86,203,156,203,85,175,246,171,78,46,47,127,210,158,90,35,241,171,28,211,220,53,253,209,200,76,161,4,170,133,194,75,75,25,94,62,63,157,193,121,31,111,252,235,143,230,176,168,61,23,5,105,181,229,54,79,185,142,62,211,24,207,33,5,120,190,135,237,62,28,116,135,175,138,185,115,127,55,192,73,124,245,201,129,11,189,104,55,85,209,22,120,132,20,28,248,92,151,136,151,91,
+193,232,248,6,254,160,221,123,11,83,96,106,191,247,49,190,146,160,106,9,238,79,223,246,251,151,118,170,26,142,103,99,75,98,131,125,230,233,215,188,104,247,238,82,149,185,173,6,246,155,246,86,160,107,52,159,49,216,241,40,197,68,63,21,71,236,106,17,145,23,85,158,8,165,213,38,96,34,161,130,216,164,33,69,206,95,55,21,145,57,218,74,61,188,28,45,75,176,84,73,5,133,21,19,46,188,143,189,239,62,1,60,56,37,215,235,52,144,132,150,162,211,34,24,10,186,224,137,249,48,209,88,165,34,101,77,247,52,56,198,96,204,197,153,12,9,22,91,32,158,207,211,197,98,127,121,217,127,23,155,47,36,94,9,132,24,18,41,133,18,161,133,199,99,186,94,115,223,220,238,122,141,189,36,204,177,246,183,8,151,235,151,254,252,20,56,156,41,238,235,235,205,227,169,23,157,20,189,14,55,30,69,153,86,171,116,221,137,117,226,126,130,239,198,190,95,14,111,151,77,111,191,106,93,167,120,110,33,205,148,90,38,249,88,94,128,19,240,220,140,251,183,118,154,186,136,
+99,37,192,143,56,97,158,79,44,249,67,69,113,226,98,16,48,170,35,28,188,172,107,123,29,25,200,209,183,19,9,112,75,121,134,74,100,134,115,242,138,100,183,183,111,141,234,148,101,84,148,98,230,74,247,138,82,100,138,91,172,51,113,28,2,149,99,22,68,223,210,235,149,140,87,156,37,229,56,45,149,88,121,86,17,49,42,49,34,39,217,58,9,61,38,163,144,81,85,30,25,45,9,153,122,195,185,54,52,137,175,78,158,196,120,12,11,155,209,139,69,164,186,64,129,169,236,158,73,178,191,244,97,16,137,136,37,46,128,36,159,223,48,144,100,136,217,194,34,24,18,138,156,225,25,32,209,152,137,101,77,164,82,48,56,70,68,36,147,163,81,20,132,220,97,115,177,153,92,76,113,87,74,169,84,50,0,64,19,211,233,240,228,180,220,156,172,217,154,184,223,199,34,239,239,18,62,159,60,176,219,19,187,157,204,188,49,23,43,76,181,26,93,253,44,199,82,41,73,148,24,37,67,32,137,213,138,37,211,106,183,135,165,108,225,245,110,183,163,225,76,88,74,132,145,100,
+247,49,32,113,172,34,134,14,1,204,243,114,93,128,100,203,95,84,135,90,163,68,141,134,87,83,209,158,67,194,227,97,224,208,224,70,148,35,29,174,97,95,167,74,158,227,175,158,30,81,200,14,173,142,213,17,198,61,226,247,144,210,133,3,217,94,218,55,215,99,15,59,149,47,236,200,172,194,132,47,176,218,29,34,23,119,233,121,125,186,47,196,81,122,8,113,178,85,61,65,173,253,236,201,45,186,143,60,108,180,53,101,24,109,113,13,157,150,245,204,78,171,199,203,103,160,67,141,125,163,7,22,101,38,72,152,195,17,110,174,78,3,141,52,51,70,214,116,166,44,148,140,232,153,96,112,100,165,18,126,171,159,150,32,61,14,212,195,200,51,4,9,28,29,49,9,132,194,88,47,164,213,246,222,16,239,30,11,165,221,38,200,140,122,56,147,17,66,129,34,167,149,193,99,165,14,4,28,76,62,3,139,239,98,33,169,180,39,22,55,54,129,128,211,104,108,46,75,212,213,55,198,225,56,35,27,141,112,54,219,27,32,16,155,86,203,249,14,122,111,22,200,6,45,118,200,
+100,34,177,152,144,139,232,234,233,116,155,88,172,234,244,122,111,253,232,201,56,43,109,160,200,158,91,112,12,85,140,72,99,11,130,17,122,185,62,64,114,185,45,170,39,173,49,228,83,195,3,202,190,137,212,19,119,77,52,20,236,198,124,144,242,204,237,37,124,19,228,167,97,36,169,17,225,111,93,161,220,36,161,239,161,106,75,49,87,159,222,63,238,137,111,252,171,201,18,83,213,195,55,68,248,112,12,35,194,9,99,145,56,219,139,245,118,153,176,0,251,252,38,165,232,213,162,38,236,118,139,93,56,143,140,10,63,28,66,160,226,44,161,35,44,215,120,100,68,66,250,96,81,76,168,208,237,129,138,99,251,128,75,76,80,190,153,97,228,190,57,148,25,163,196,136,240,254,130,130,132,112,34,150,164,16,250,252,22,161,64,161,225,22,21,9,96,200,40,49,207,0,195,70,17,38,22,137,195,135,132,196,161,196,112,10,216,205,111,38,18,71,72,236,100,115,8,133,50,76,245,83,197,0,240,49,157,6,166,39,231,155,147,245,125,95,19,127,14,136,119,183,47,204,231,139,
+15,135,143,69,58,173,82,171,63,63,98,36,141,30,255,85,65,158,52,154,144,92,46,150,128,37,31,143,135,74,169,12,191,114,85,37,149,210,102,2,193,5,144,236,135,190,228,52,8,253,224,187,43,226,121,37,204,52,192,177,57,30,154,239,36,191,223,46,111,251,17,83,76,67,132,64,106,167,46,98,210,145,80,151,123,80,104,220,77,127,16,94,65,23,73,35,6,29,238,233,22,190,230,231,68,97,242,91,227,12,181,55,54,247,171,136,254,197,121,171,66,20,37,246,199,20,183,90,35,241,59,132,168,45,252,156,65,68,245,229,102,109,84,149,51,200,47,141,168,200,110,138,91,120,13,45,200,214,105,157,47,123,151,130,82,72,201,15,221,75,246,130,75,177,201,105,163,15,119,65,168,167,189,217,89,19,228,30,204,97,135,44,14,80,82,18,103,97,5,89,32,66,232,99,115,247,38,248,82,120,165,12,1,145,228,178,15,136,172,72,74,196,112,253,87,211,107,112,178,223,57,17,41,84,171,21,6,71,163,110,177,184,25,2,102,84,0,54,25,159,33,86,107,80,173,238,
+130,135,195,205,205,243,226,21,135,39,32,16,8,136,231,245,10,245,122,131,43,243,170,27,143,155,244,250,112,181,72,89,44,112,101,114,5,57,159,67,191,190,226,193,237,182,59,155,153,150,42,21,75,40,204,36,41,104,223,149,153,57,81,65,153,52,214,247,20,220,150,91,217,169,27,220,28,58,203,238,207,60,152,102,202,33,147,28,44,207,67,57,5,94,206,109,155,238,162,82,98,231,111,0,211,129,53,241,116,3,27,17,142,46,0,243,221,80,90,103,11,204,212,118,247,77,4,143,0,106,9,76,203,26,100,221,65,234,202,84,80,148,98,98,67,98,160,65,247,233,239,154,96,202,253,5,148,99,126,124,127,64,175,87,48,94,33,242,20,225,180,84,96,181,170,7,126,101,15,204,30,234,68,116,132,140,2,202,84,121,213,54,1,5,207,131,245,122,208,239,37,126,118,80,46,23,108,112,52,2,61,88,117,1,194,6,232,93,11,212,196,19,225,75,208,249,28,76,194,113,117,122,184,234,19,4,98,192,18,67,208,203,239,137,72,16,103,19,132,197,139,186,38,240,219,59,
+40,36,128,147,18,129,98,177,219,237,137,77,126,33,139,111,199,103,50,48,133,2,114,163,82,193,102,115,32,1,74,116,167,42,147,137,212,152,206,177,251,61,236,29,120,135,240,249,224,114,153,21,216,237,68,102,243,7,174,194,84,169,209,47,241,67,164,210,80,185,28,12,13,133,2,237,182,200,173,112,147,216,236,211,78,81,34,49,24,167,135,103,115,63,1,221,199,61,176,196,54,192,243,10,132,105,180,35,94,4,124,5,78,216,157,22,2,204,14,2,250,248,233,148,80,226,212,44,218,19,223,124,194,14,117,254,115,245,60,136,66,239,109,229,232,140,182,238,37,255,129,12,175,29,215,230,210,254,188,30,31,218,214,215,218,124,202,142,253,194,194,180,211,57,114,113,143,135,183,109,44,157,109,171,250,179,45,232,72,129,171,246,235,33,47,250,221,234,121,69,117,219,186,58,2,197,110,189,56,201,41,119,127,117,209,105,31,176,229,200,67,175,247,7,186,199,201,238,238,17,8,211,236,159,157,243,129,199,251,75,216,209,196,114,199,33,232,194,220,49,76,18,194,228,247,55,
+206,115,153,37,38,64,15,76,52,47,57,3,232,136,95,176,142,247,38,55,173,246,241,86,247,151,44,253,215,175,147,146,7,143,104,212,15,233,9,159,220,93,62,119,81,42,59,119,42,245,1,0,79,234,84,245,60,85,253,206,231,171,246,30,143,135,203,211,237,190,243,249,143,195,233,240,156,107,253,174,154,191,243,209,53,106,119,21,74,229,170,213,222,71,35,233,131,66,121,246,196,254,135,49,47,228,47,243,153,249,222,127,30,60,127,82,157,231,205,245,4,6,207,227,253,250,104,56,110,149,157,225,108,108,239,159,135,10,247,201,236,220,226,68,225,197,127,43,10,139,40,83,84,67,192,246,118,151,230,93,64,92,135,145,194,116,99,185,115,221,114,202,78,190,183,169,45,125,220,78,246,248,240,230,191,127,88,53,157,207,90,155,188,41,47,135,227,29,1,205,79,140,199,217,222,167,47,19,29,142,73,105,122,251,190,219,242,242,237,114,117,217,211,48,194,230,138,154,52,221,220,110,159,250,83,153,99,92,237,142,187,132,12,203,171,246,104,152,207,71,236,196,7,231,215,17,
+11,143,176,30,132,227,227,221,149,149,17,66,123,80,103,79,8,59,151,43,247,162,104,218,104,236,10,234,225,203,175,196,21,87,148,39,34,4,119,195,189,219,165,170,35,66,1,113,97,225,163,165,144,145,11,195,204,184,97,177,190,243,89,217,105,242,214,227,152,227,97,27,113,89,155,151,51,62,199,226,247,112,216,7,4,131,157,167,223,232,120,86,42,173,229,124,177,71,218,108,231,122,253,150,141,101,125,8,68,103,169,87,26,223,235,149,66,79,75,209,238,232,204,43,6,211,190,185,92,62,157,174,211,105,56,124,21,227,221,200,104,159,5,222,157,247,50,31,186,143,249,227,156,209,88,127,127,117,224,88,223,189,243,216,221,183,216,181,244,186,190,119,110,189,244,86,13,51,188,218,182,141,236,226,105,19,133,158,149,209,81,25,109,223,249,109,44,50,60,119,92,151,118,199,250,122,108,107,191,230,63,191,236,51,38,135,241,86,231,200,193,181,189,149,182,246,197,190,250,250,218,22,84,164,128,230,139,208,166,167,180,159,23,250,5,99,108,174,232,73,79,213,237,110,171,63,
+181,100,195,201,225,240,74,200,21,136,106,191,90,158,225,16,159,145,56,105,53,247,219,137,171,141,199,27,185,203,242,200,236,201,40,152,8,155,119,255,206,132,120,68,198,169,188,224,249,212,48,235,32,207,208,194,140,108,183,20,116,219,211,198,134,85,231,74,197,59,125,59,10,70,81,183,103,17,149,40,189,88,108,27,22,114,11,252,107,62,255,39,151,79,92,149,74,47,149,218,230,155,205,235,4,234,56,61,39,220,166,238,114,190,115,31,246,39,247,187,135,31,227,183,237,246,117,26,59,113,152,11,141,206,90,15,213,255,148,191,206,90,141,208,35,151,183,37,146,245,54,8,118,56,42,92,250,125,116,191,150,175,23,91,227,56,74,175,173,147,182,32,78,244,28,87,231,181,187,181,109,123,191,189,27,71,240,218,88,183,133,79,239,225,241,244,30,177,198,187,71,13,55,201,250,166,16,73,240,27,62,71,37,62,218,58,249,2,100,52,60,112,92,23,246,124,227,122,20,104,191,6,230,203,41,51,38,22,166,181,65,231,200,194,9,188,237,185,180,116,126,171,231,219,94,65,
+92,10,168,190,4,72,122,74,250,249,226,230,208,187,117,197,21,187,197,215,226,36,43,18,35,125,10,25,251,10,95,92,5,222,47,150,103,24,132,216,17,174,107,205,253,198,229,17,16,226,86,115,175,119,254,13,31,50,184,217,125,204,4,168,173,206,232,188,78,223,242,117,14,178,10,242,208,48,200,204,97,75,66,11,32,65,104,88,114,54,85,95,157,101,112,38,245,170,104,72,244,30,164,211,159,25,12,15,42,9,155,172,114,86,235,32,206,230,108,51,185,75,204,27,247,74,165,130,94,239,153,239,138,148,254,78,73,216,152,207,86,135,253,225,112,169,55,188,122,189,0,24,143,243,3,169,210,112,206,149,74,3,181,102,11,165,49,175,169,180,55,26,139,10,110,183,124,142,32,157,180,220,249,24,66,249,240,182,118,91,249,100,230,43,229,195,72,129,251,248,225,117,172,47,134,246,207,184,233,236,186,238,245,157,127,151,23,172,253,199,155,22,128,43,229,36,195,231,130,199,8,45,183,46,190,47,231,8,247,236,13,162,183,186,88,29,215,173,50,85,219,232,31,184,153,149,
+80,90,240,250,215,118,22,189,121,241,54,148,187,121,197,182,242,122,29,177,65,185,172,109,105,232,13,117,110,191,94,189,211,49,142,92,102,220,174,1,105,249,120,133,142,232,25,110,71,218,209,10,137,175,243,116,70,79,114,158,111,14,162,118,50,222,182,120,132,171,125,16,206,142,221,236,12,193,1,237,33,122,14,152,209,245,74,52,209,180,141,106,236,74,234,21,104,67,165,38,87,148,100,86,36,117,2,39,7,99,222,246,180,126,164,133,21,157,206,60,110,45,92,244,222,184,53,188,147,81,199,155,103,120,61,148,189,222,165,0,224,108,243,25,103,60,86,107,74,165,43,177,248,248,236,138,220,254,78,171,17,159,175,86,135,227,225,125,210,104,180,244,250,149,226,164,56,134,161,110,67,174,217,106,45,13,186,61,115,199,116,167,83,77,56,124,176,186,221,142,57,194,149,220,114,31,99,8,183,215,223,186,247,225,215,89,169,115,12,35,87,238,99,43,227,88,191,27,155,128,112,235,95,251,238,245,251,46,159,95,173,253,187,39,64,135,187,229,36,240,39,143,193,8,141,246,
+239,60,66,135,217,90,89,106,205,245,177,227,214,149,153,209,190,197,194,109,41,168,233,105,110,191,92,187,113,8,102,174,189,46,206,154,117,253,109,190,206,203,11,206,79,204,55,51,53,42,106,90,13,183,219,0,15,201,153,226,87,139,216,44,170,211,30,9,128,142,26,150,75,56,51,49,164,96,90,144,10,24,155,63,2,39,195,57,155,101,34,7,245,234,120,99,174,25,24,233,232,119,215,217,173,70,149,238,148,40,1,135,24,56,217,114,84,254,14,10,68,197,128,51,33,99,146,167,33,245,160,229,228,97,177,63,166,158,201,240,86,135,135,220,46,82,162,82,164,204,15,189,32,60,224,28,143,171,77,171,213,48,155,85,168,67,217,252,214,180,189,7,191,57,108,0,143,119,117,17,136,230,253,110,16,156,4,149,10,83,43,13,35,191,202,227,239,25,96,91,217,92,223,243,150,205,54,48,124,127,87,162,112,45,85,151,249,106,46,52,58,223,126,52,114,89,172,45,36,155,109,112,172,155,179,208,204,192,52,54,243,2,192,41,240,237,91,222,249,207,59,16,254,25,97,230,
+247,219,185,50,43,25,132,167,199,246,126,228,207,119,250,124,235,57,120,202,72,4,9,3,19,14,57,249,15,130,178,181,122,171,241,230,235,142,91,95,86,70,151,253,55,46,95,65,45,225,166,251,213,218,141,71,120,149,237,245,231,140,87,119,233,119,235,188,186,224,164,127,125,43,83,163,79,141,131,239,118,231,224,33,117,129,233,30,89,148,159,223,116,90,130,215,55,239,174,133,134,154,226,130,135,38,198,50,131,154,63,110,79,187,92,54,171,100,206,135,195,133,179,182,80,98,71,251,161,133,111,90,200,74,81,62,105,216,236,28,139,227,105,206,102,83,210,191,109,178,15,222,208,66,77,116,247,20,84,206,211,70,23,162,239,149,10,127,250,230,217,141,162,46,207,34,146,147,240,177,216,28,44,212,116,249,215,188,151,0,242,51,78,165,130,71,165,186,115,102,243,100,170,218,109,79,85,151,115,186,88,191,184,119,120,119,187,249,68,62,63,119,56,76,230,79,173,213,85,171,85,167,13,157,241,88,46,59,181,86,13,143,78,207,21,139,183,9,96,182,138,2,108,34,119,158,
+201,29,198,99,251,123,199,3,40,228,46,177,208,127,244,157,251,183,235,38,112,158,16,118,177,3,126,66,215,230,118,19,63,223,255,248,190,205,148,163,201,177,227,242,63,155,119,118,8,21,33,19,213,25,167,14,22,126,181,110,185,5,225,184,230,151,181,181,112,31,96,101,9,84,115,178,247,246,126,56,242,53,8,104,216,120,156,238,31,4,125,217,236,152,124,168,166,188,111,91,88,190,53,168,232,132,86,11,25,82,246,72,105,190,133,29,238,106,126,18,50,130,185,202,52,123,151,36,52,47,132,22,15,230,105,49,201,121,59,121,226,99,5,52,205,250,217,56,9,120,60,50,140,29,117,45,124,28,130,2,69,188,34,88,237,40,142,32,209,96,153,13,162,127,105,24,84,184,79,9,25,146,60,13,12,134,124,39,111,240,243,5,14,6,157,229,50,79,69,131,64,209,123,157,222,197,72,48,120,40,216,96,149,227,153,173,3,150,224,144,193,229,222,99,113,254,96,224,38,144,201,241,15,210,224,209,13,20,42,147,233,18,244,179,63,186,223,95,113,92,46,9,229,114,188,148,
+167,74,197,193,215,76,88,165,6,62,191,92,41,111,154,47,151,19,36,146,97,60,8,150,58,42,228,43,125,116,186,150,129,203,209,54,248,210,198,119,19,36,33,78,228,19,5,206,235,170,9,52,157,61,231,229,86,3,86,188,65,229,212,225,251,239,195,211,138,224,142,79,132,238,34,106,72,126,223,154,95,5,249,106,106,44,14,199,245,242,240,210,183,190,153,155,29,31,94,130,244,86,63,206,143,75,4,180,101,116,156,231,251,131,190,236,115,104,38,149,233,226,219,214,114,203,45,90,250,161,213,114,185,67,61,102,122,105,153,177,239,147,184,129,92,229,71,251,215,131,189,37,107,89,176,240,131,94,239,190,5,186,147,221,146,203,245,28,12,149,92,175,234,184,216,23,11,59,63,249,182,177,178,14,44,123,105,38,61,252,252,184,81,245,25,236,205,77,255,70,130,220,53,120,95,73,94,68,36,120,126,192,52,216,28,116,194,50,33,88,45,76,221,36,204,168,211,182,27,245,234,26,147,185,68,193,238,253,71,219,231,158,11,217,73,115,62,91,83,42,22,235,193,224,80,40,
+92,55,104,211,125,243,225,51,117,159,235,185,245,184,175,186,173,239,191,155,191,219,237,183,107,26,235,85,39,219,252,151,29,212,219,42,149,115,67,171,93,142,70,7,50,133,114,45,144,189,254,99,71,64,29,228,83,22,192,127,159,63,239,245,199,250,155,126,175,89,175,3,127,252,112,61,46,29,107,109,195,216,113,116,124,139,166,255,152,123,204,213,215,59,209,95,247,223,203,15,228,121,114,160,133,110,206,243,31,81,52,121,35,207,181,181,190,100,96,179,217,133,157,157,177,75,145,5,187,127,109,101,45,234,23,111,86,105,157,217,176,118,175,151,27,27,148,102,218,165,134,158,85,191,41,151,171,58,13,195,109,34,94,30,112,225,118,219,119,232,136,130,209,176,59,100,75,9,57,171,122,91,74,150,53,24,132,43,92,239,6,192,162,105,192,135,217,230,229,162,90,93,112,193,216,209,192,180,48,45,160,210,210,146,52,132,6,37,92,252,184,209,176,130,221,32,124,200,76,78,218,45,146,66,76,84,221,156,68,92,198,188,209,178,245,16,38,59,157,206,197,140,186,97,201,50,
+157,182,195,55,112,46,164,199,229,90,59,217,76,85,161,92,82,143,84,59,0,52,170,44,216,114,24,177,191,13,185,2,222,219,207,177,113,185,10,150,173,150,61,151,107,60,174,110,189,237,171,220,60,45,230,139,183,175,74,227,244,61,95,126,125,217,49,39,76,163,198,214,59,171,167,114,117,154,78,91,71,194,97,181,237,181,142,134,241,106,177,180,52,118,234,81,129,215,234,189,12,221,151,103,231,112,181,47,47,246,159,134,60,109,183,78,190,151,202,92,237,113,43,116,14,75,135,61,239,179,210,229,164,208,97,56,208,176,94,238,250,126,213,49,172,218,218,194,198,214,197,208,210,159,103,231,219,84,149,255,92,180,185,201,215,55,160,191,94,203,248,152,134,84,110,124,105,180,197,89,188,213,178,105,104,101,87,180,169,161,214,142,7,29,165,136,254,210,217,87,235,68,35,42,209,126,76,91,225,186,5,3,43,251,58,233,212,160,230,106,106,145,190,65,171,106,178,212,202,49,70,58,53,172,247,170,219,148,178,33,78,188,251,8,43,121,65,55,159,151,67,154,47,12,168,108,
+169,161,82,146,26,58,162,21,248,214,209,158,78,171,45,35,112,49,76,172,81,80,77,230,91,203,207,44,249,14,56,167,81,145,110,183,115,151,107,181,121,6,247,3,249,78,189,155,123,124,225,209,65,32,212,145,72,61,46,28,46,131,193,243,142,95,104,83,198,235,95,35,225,114,106,178,219,106,13,75,67,159,205,150,17,8,207,188,197,183,41,98,245,219,215,72,175,50,49,24,185,58,22,171,135,195,203,100,143,103,126,176,219,172,241,18,135,220,203,230,29,128,239,54,187,95,62,47,235,41,249,167,237,157,235,223,27,229,121,69,199,52,8,106,121,129,77,240,62,114,223,129,248,220,209,169,175,252,215,204,197,248,220,38,136,97,22,225,150,137,154,122,98,221,216,26,29,218,44,44,60,242,112,212,191,35,160,81,163,99,186,111,51,244,101,139,99,82,152,78,117,223,182,168,220,242,210,65,70,171,133,13,41,122,228,180,222,194,30,105,38,113,9,185,26,233,43,211,7,123,84,102,65,49,225,12,189,30,27,232,82,123,59,189,71,48,218,33,75,161,94,213,110,215,181,23,
+118,120,212,98,98,211,24,136,112,72,217,16,197,19,22,223,10,28,76,87,234,28,120,202,6,2,225,225,33,51,41,193,144,128,11,161,23,13,157,216,13,99,94,107,217,68,5,55,131,78,79,111,45,112,40,250,77,103,168,51,24,237,87,12,25,46,87,154,154,193,141,46,117,139,203,55,99,179,76,56,124,237,20,139,233,194,97,70,240,20,76,63,253,114,71,197,93,108,45,103,223,150,61,110,95,173,215,117,122,253,128,161,80,164,195,80,249,192,144,123,205,168,117,200,55,26,179,145,74,235,113,209,40,3,2,73,175,92,6,185,187,65,97,207,4,231,93,140,194,24,159,159,64,104,187,87,143,122,229,112,218,123,101,52,28,49,93,197,80,51,180,44,61,158,119,238,58,23,183,182,48,145,177,246,219,110,218,3,91,14,39,105,164,93,97,9,168,162,172,73,231,208,206,201,94,175,99,33,52,168,171,112,127,222,123,214,242,181,187,206,235,152,5,214,215,183,53,53,106,150,53,89,183,123,12,207,134,116,76,238,200,98,253,252,252,102,36,50,125,243,240,124,109,232,40,108,
+56,33,180,43,51,106,34,211,110,119,30,11,242,30,23,102,54,222,102,185,220,177,221,222,200,244,217,236,12,198,250,235,7,173,176,60,187,82,201,138,166,138,116,33,243,169,97,131,50,49,26,230,37,31,84,244,109,12,9,226,226,92,179,161,186,251,214,176,161,102,164,81,199,42,168,172,148,192,172,93,183,24,13,28,30,25,181,187,121,206,7,115,217,243,114,133,28,203,45,159,97,197,227,89,233,81,58,238,245,118,31,164,230,185,27,104,86,38,43,242,204,124,60,114,221,110,97,118,185,28,151,203,59,193,206,234,50,23,154,157,216,218,240,43,135,220,161,86,155,29,141,198,148,4,101,87,32,187,252,157,6,143,59,207,165,44,254,211,125,254,184,215,121,140,219,248,241,104,222,134,232,235,185,23,222,181,220,99,123,195,145,169,24,57,70,88,251,77,232,26,248,206,149,226,45,76,28,175,125,58,243,243,192,118,193,73,96,138,244,143,8,114,169,133,105,189,227,96,223,112,10,111,91,86,98,183,222,234,165,182,32,41,61,152,213,95,10,122,74,22,250,228,28,142,89,12,
+124,154,52,56,146,67,5,159,194,167,126,126,83,18,25,74,223,60,187,54,100,20,55,27,22,42,149,25,201,140,200,4,156,21,130,60,246,205,53,235,111,179,60,38,1,157,181,155,171,138,178,162,20,233,178,186,85,65,68,201,45,191,34,136,152,74,10,153,249,92,17,0,153,10,42,133,165,6,139,72,216,40,24,85,96,95,135,122,25,173,86,193,192,197,96,49,238,135,138,89,218,90,208,232,55,125,223,192,97,48,50,175,60,86,184,92,165,12,110,6,185,212,95,239,192,17,18,28,120,60,59,22,203,16,195,97,69,48,88,122,250,253,106,71,229,179,52,24,124,127,91,126,246,172,186,185,158,209,235,21,10,133,167,20,134,170,13,185,79,92,105,160,209,88,190,62,143,172,84,42,19,141,42,200,161,80,233,225,83,43,253,241,253,138,63,91,54,140,165,121,69,81,49,102,136,121,33,87,224,49,123,63,79,221,247,107,101,191,59,42,102,223,95,165,40,54,168,176,78,50,202,60,167,253,56,5,247,89,135,34,145,247,219,228,164,254,110,144,136,191,204,118,200,89,240,175,
+223,88,184,139,119,91,80,90,191,109,49,111,223,43,141,13,62,181,248,111,13,189,160,126,91,173,18,28,58,70,218,92,209,6,73,156,219,29,83,127,126,171,200,172,104,127,112,232,217,11,50,11,6,30,27,233,245,210,64,119,184,27,225,61,2,96,87,74,136,71,28,23,79,202,93,30,134,102,92,70,65,14,18,76,33,19,57,231,8,169,73,100,24,254,141,3,164,150,217,132,156,3,14,4,18,10,110,82,38,37,27,166,145,1,222,201,35,7,177,182,190,41,246,86,135,58,45,253,102,219,46,57,146,99,114,249,32,4,225,144,193,166,92,150,61,241,77,240,165,82,76,173,86,14,34,48,224,214,116,130,222,191,121,2,59,1,159,96,35,17,184,251,61,6,180,219,131,163,195,108,69,150,170,237,213,98,105,115,219,223,88,92,14,14,31,195,255,238,6,156,197,35,205,150,226,107,70,7,210,219,24,76,46,22,83,195,157,207,177,197,98,128,127,181,41,56,220,224,226,120,7,70,233,129,117,66,140,197,137,120,162,128,213,88,55,205,109,207,204,115,185,124,157,122,16,32,
+115,96,15,208,212,216,32,110,197,119,110,131,219,190,148,24,96,196,211,184,79,209,232,155,72,8,127,222,184,125,105,32,66,95,54,69,95,94,112,138,251,182,109,131,114,139,138,142,104,89,90,208,208,203,10,226,139,22,118,111,18,23,209,19,28,25,5,90,93,84,71,109,59,42,130,16,127,64,77,182,17,9,133,187,33,125,224,184,117,177,226,204,156,77,40,114,80,173,246,77,166,42,66,81,10,168,126,73,24,80,114,87,162,132,201,183,18,21,68,184,249,28,161,249,191,89,186,170,182,214,150,37,248,215,227,238,238,238,110,196,221,5,18,226,238,238,238,118,195,62,247,9,62,134,144,149,78,117,85,245,172,161,82,4,32,0,48,84,196,47,98,78,17,97,48,176,227,239,14,48,21,77,247,88,4,4,2,140,82,9,243,241,133,192,15,17,106,153,180,56,29,139,128,116,95,45,134,193,53,103,48,141,223,157,31,166,76,142,253,248,66,152,209,24,138,35,186,189,75,197,96,159,76,214,48,219,225,200,188,221,48,152,102,19,134,195,133,238,62,151,240,171,248,219,88,48,
+38,11,75,161,204,158,185,231,216,127,129,184,238,208,213,33,148,132,127,59,133,129,66,97,24,140,78,44,211,95,44,50,108,139,193,132,110,206,238,240,148,10,153,199,176,24,222,138,61,175,217,171,134,81,253,103,18,119,145,13,191,11,234,218,218,24,249,32,205,192,241,109,143,101,111,13,251,32,241,145,162,249,222,33,194,64,204,255,253,107,106,79,90,14,45,207,142,247,59,220,50,99,121,106,218,178,242,32,74,74,95,231,178,254,119,62,25,238,60,223,178,182,186,154,77,73,111,200,176,91,79,155,219,108,71,81,130,216,82,20,214,203,233,5,10,242,240,245,227,109,236,192,102,223,116,229,76,190,59,177,89,15,26,26,156,151,40,152,25,55,198,184,148,159,222,16,57,253,94,63,159,90,158,53,214,23,47,89,4,3,120,65,112,150,156,184,137,178,153,168,96,178,189,120,104,106,72,187,89,236,27,110,150,91,13,31,156,210,233,199,94,92,242,218,102,125,134,183,128,207,47,103,126,166,143,241,248,144,207,223,148,56,229,51,12,121,61,26,18,159,83,197,231,149,240,38,
+236,20,14,59,60,159,253,91,171,245,60,219,188,92,115,190,157,21,174,231,239,188,205,50,97,179,14,24,44,246,230,116,62,127,98,88,175,42,249,89,113,235,213,121,58,101,130,246,162,143,215,235,173,209,8,63,75,52,175,57,255,238,143,176,94,237,207,187,103,131,190,166,249,167,56,214,190,221,207,71,219,122,110,93,55,126,219,14,145,79,243,110,189,235,235,27,249,37,63,196,240,243,247,233,101,123,202,249,179,247,117,199,135,251,185,87,6,106,25,10,78,44,181,102,203,195,75,139,179,202,162,115,72,77,202,11,188,74,147,88,84,82,156,142,134,60,68,158,158,78,135,156,242,145,22,101,145,17,231,18,181,228,198,37,100,212,113,82,175,59,129,254,216,248,58,191,184,155,35,25,206,156,42,110,237,78,44,22,198,69,75,251,166,35,70,10,195,193,142,7,39,238,7,116,152,207,157,132,2,94,171,157,42,10,92,128,113,162,160,112,153,26,241,132,116,132,128,112,248,114,183,187,113,106,74,240,128,107,242,49,73,73,212,234,112,173,194,195,51,26,13,112,64,163,157,144,
+160,237,101,147,179,185,197,159,239,243,68,38,59,144,201,78,238,118,219,172,48,86,131,120,216,230,214,176,57,5,254,241,60,191,221,14,158,168,199,169,211,53,199,114,151,206,211,44,215,84,243,221,170,244,101,157,205,230,188,227,215,151,115,54,107,226,134,82,157,187,81,174,37,84,106,93,137,74,155,245,119,187,131,195,225,212,188,52,205,186,205,89,214,35,142,211,169,147,174,63,140,50,252,25,207,147,107,198,92,114,215,179,126,126,158,157,171,221,176,121,221,159,157,121,249,209,247,16,93,92,167,239,179,205,55,157,121,175,97,122,16,49,245,255,39,47,203,123,139,87,18,103,63,166,173,246,183,31,56,59,39,207,95,40,104,73,87,22,38,7,240,211,201,146,187,42,75,162,44,42,82,163,46,151,218,184,132,138,202,126,213,235,53,160,63,181,29,207,175,238,229,72,6,167,165,138,59,123,205,74,170,167,122,83,230,183,118,12,22,66,187,90,174,142,11,21,44,111,78,26,68,251,101,97,209,146,69,144,11,64,11,102,73,137,154,128,148,72,253,65,112,161,197,201,35,189,
+47,245,86,93,179,212,92,38,17,45,34,180,196,37,167,105,58,225,178,43,34,2,203,122,191,175,57,28,203,239,0,230,116,171,185,28,74,62,151,241,139,195,78,99,222,216,87,40,84,19,10,219,75,63,192,170,207,212,249,117,245,114,85,58,157,226,51,151,211,178,92,214,182,52,218,50,79,182,26,47,217,122,91,175,213,22,59,165,242,92,173,254,26,198,134,181,92,110,153,37,222,173,2,63,155,46,255,57,167,75,222,187,252,39,174,254,245,190,180,207,99,178,125,127,56,78,9,242,242,28,130,215,238,103,139,173,176,154,234,219,229,150,183,171,241,188,91,247,155,197,117,162,183,45,49,220,84,253,190,149,151,114,254,132,146,71,100,207,31,191,237,198,161,133,215,123,97,22,193,38,165,89,213,151,75,234,98,65,131,98,250,156,51,48,253,164,113,81,85,182,24,151,176,140,21,115,202,163,37,34,45,193,238,28,168,213,98,253,130,238,117,255,229,230,193,82,197,239,141,157,133,197,98,217,67,109,215,104,249,150,193,218,129,95,191,1,150,46,7,253,132,209,179,9,6,17,
+88,172,159,144,116,6,160,248,67,194,73,124,128,13,33,37,66,210,215,197,125,130,193,243,29,35,171,24,47,98,97,226,106,53,187,20,252,178,134,195,159,220,150,52,218,102,205,6,1,159,201,47,127,255,76,71,238,241,87,62,207,82,42,225,63,97,200,232,209,48,147,156,42,38,51,139,193,110,166,48,248,215,243,201,218,122,189,63,25,188,76,157,78,229,171,202,233,186,204,182,88,103,44,246,215,79,244,135,5,131,253,52,185,125,153,44,154,47,74,149,120,197,47,133,58,77,38,25,150,72,132,245,120,252,244,86,58,153,171,78,102,250,148,137,248,175,68,62,151,181,188,5,247,91,119,125,238,194,251,141,112,180,42,53,127,180,117,214,188,188,179,208,117,211,52,55,223,228,120,181,215,235,248,167,105,236,179,124,175,226,94,154,144,179,40,193,2,95,255,233,229,80,80,81,4,169,190,114,215,206,185,172,213,254,42,134,187,175,111,185,172,245,199,128,179,237,223,182,160,218,102,131,22,69,196,218,135,1,123,75,37,20,244,197,215,243,71,219,2,155,61,211,165,255,178,29,
+109,214,66,122,97,101,69,114,102,38,225,239,227,152,67,51,39,163,137,13,204,142,199,175,29,66,53,181,28,107,44,11,11,80,160,160,88,223,160,18,57,62,19,101,127,130,2,197,214,254,69,83,3,90,127,60,56,251,240,32,54,168,164,211,139,31,30,188,109,179,30,67,66,16,21,20,246,251,25,183,90,61,126,99,110,51,68,210,227,80,242,248,229,49,30,171,140,69,11,161,115,104,22,8,28,253,128,187,83,159,105,214,213,43,226,170,116,62,42,93,78,102,97,185,252,208,192,17,183,55,59,141,217,102,59,166,215,105,139,229,178,250,161,86,23,135,195,89,206,158,59,110,141,78,195,47,159,203,215,167,19,217,113,110,168,52,155,139,235,86,230,47,140,82,223,86,9,249,158,188,239,165,121,93,55,254,231,89,119,27,149,126,142,95,243,89,138,174,47,140,211,202,247,179,216,126,238,51,51,113,172,216,122,63,213,55,114,166,176,126,63,218,239,46,162,241,255,126,166,226,114,202,90,243,195,129,57,149,163,33,37,115,43,202,106,54,33,85,33,195,28,41,77,109,181,21,
+69,1,98,82,241,185,68,229,5,2,162,242,245,189,109,244,83,69,149,174,28,9,117,21,86,107,97,97,37,163,34,57,35,83,5,131,132,160,33,149,179,9,141,6,84,199,35,21,161,226,76,44,197,26,11,5,248,254,84,17,245,93,34,250,227,42,81,54,34,80,16,55,23,42,77,93,107,250,139,93,131,202,82,131,166,131,74,26,253,131,121,251,108,154,248,50,8,130,238,191,42,170,170,85,120,241,27,51,187,213,190,86,14,37,139,241,139,197,6,148,209,88,81,44,86,61,133,194,98,71,160,242,121,219,197,186,122,54,205,134,143,71,165,211,85,92,198,150,170,82,169,152,66,223,85,202,68,241,87,160,122,170,243,197,130,66,165,226,21,168,84,213,110,87,196,37,144,42,69,188,248,123,22,36,83,249,225,64,161,110,121,242,158,79,73,154,251,26,149,38,187,109,189,193,227,65,57,219,246,241,197,231,93,229,58,23,48,182,181,74,215,42,54,251,110,133,243,94,58,206,225,122,21,255,93,226,122,202,170,219,109,94,108,191,214,162,219,250,109,15,63,255,95,199,225,124,
+165,203,9,127,147,195,91,146,249,237,48,139,41,168,36,149,132,204,105,188,54,131,71,75,65,82,130,64,225,110,158,82,18,20,215,235,67,138,151,127,116,173,176,115,36,113,49,71,221,40,28,152,169,26,26,152,148,40,152,24,73,70,180,148,155,38,17,57,157,80,175,14,252,38,196,31,19,92,162,0,4,146,95,44,101,96,34,133,115,36,35,50,9,10,32,99,234,166,177,50,156,169,72,224,86,86,148,77,82,169,67,244,206,68,66,22,116,90,197,7,148,84,4,100,183,121,181,28,54,57,135,185,201,166,51,106,185,140,178,32,147,147,219,237,176,18,96,236,6,97,135,91,227,231,112,10,56,140,226,238,187,81,60,158,228,106,213,24,142,229,38,113,168,10,46,201,22,211,172,213,118,81,179,217,212,227,49,185,173,213,134,63,88,147,10,145,172,102,133,26,117,222,69,163,40,208,40,10,52,10,77,54,26,195,147,181,191,107,186,134,81,216,78,123,156,15,213,229,36,29,165,167,100,248,42,190,135,151,107,249,244,238,125,172,117,237,195,118,179,226,112,29,65,39,205,99,
+170,60,254,65,229,45,113,61,180,21,187,185,158,250,190,70,208,38,40,161,205,191,142,255,181,245,96,7,1,155,152,189,113,76,152,165,170,36,36,104,69,147,170,180,74,136,48,74,136,251,53,126,252,57,2,215,223,92,81,188,140,209,33,86,118,118,84,14,174,7,233,135,2,35,117,69,3,131,146,149,29,3,197,32,215,8,242,84,130,164,194,105,151,1,2,80,52,15,250,85,162,0,191,191,10,63,202,84,13,136,148,8,119,24,10,20,248,251,212,158,157,211,251,219,46,116,42,126,39,145,36,10,228,128,230,4,68,148,84,10,143,244,68,189,110,192,184,242,233,25,236,252,119,58,170,146,201,169,249,60,138,155,72,68,46,246,222,2,241,109,116,170,24,188,146,31,131,85,194,96,148,103,236,137,106,181,34,25,188,75,164,78,101,171,202,9,102,93,182,88,85,181,26,131,242,243,131,130,193,34,184,38,87,100,45,101,155,54,173,66,83,160,208,213,151,100,138,26,137,160,130,136,96,228,229,21,217,202,124,34,85,26,255,46,12,52,3,69,46,79,213,183,130,74,158,175,
+236,190,138,118,151,203,239,118,205,235,105,79,203,8,150,141,82,119,202,20,186,78,145,230,56,179,28,167,244,50,149,219,34,231,182,218,251,170,193,183,116,159,34,135,216,226,7,133,24,133,67,10,202,116,228,196,249,52,200,5,148,13,145,67,64,75,209,109,182,161,136,216,80,32,41,235,101,2,10,114,60,255,204,224,128,205,182,239,254,246,7,227,14,25,123,135,197,58,216,218,211,216,56,248,150,113,2,122,66,200,192,73,211,67,93,194,227,217,76,139,19,244,114,105,80,80,113,0,203,1,5,197,249,166,145,253,241,157,40,155,22,196,129,219,139,3,39,111,55,3,212,190,97,103,169,121,175,38,81,76,56,72,165,92,59,169,244,218,19,61,14,221,0,206,31,31,143,218,3,179,121,199,100,94,193,5,202,99,151,243,26,47,66,62,155,140,199,37,7,177,232,32,20,218,5,236,129,235,219,231,214,103,92,173,188,120,189,162,157,73,167,164,203,57,88,46,251,59,26,237,186,55,187,187,198,108,171,173,215,171,223,228,114,33,174,86,13,48,84,234,206,100,186,38,224,72,
+183,34,222,250,21,188,51,41,242,120,16,55,223,77,131,117,59,217,118,175,137,114,121,170,237,165,252,250,238,178,247,46,252,90,111,132,143,150,231,186,108,215,119,243,242,176,172,99,198,245,13,2,223,33,174,248,174,185,87,62,179,59,175,125,244,247,147,250,88,232,223,68,57,169,119,237,255,171,162,213,44,18,147,147,67,18,242,59,167,161,45,215,169,176,8,2,14,10,23,243,148,76,70,136,95,30,76,188,156,94,111,80,182,14,19,78,22,179,26,133,125,243,144,167,161,97,18,20,35,131,99,98,208,178,83,19,2,79,210,234,83,254,223,104,70,156,40,253,85,208,128,1,124,42,136,249,6,211,136,241,191,189,66,152,32,190,185,48,113,242,108,168,55,100,96,48,216,12,77,171,137,255,42,170,236,157,9,131,164,104,117,194,36,141,54,64,64,22,157,87,203,234,82,179,153,72,226,79,38,37,147,15,63,125,108,218,110,171,19,160,98,49,8,91,221,154,1,155,67,193,98,226,55,207,109,224,241,152,62,125,92,45,211,53,226,80,105,219,210,205,151,212,47,75,44,206,
+98,13,176,88,211,246,118,171,46,181,26,167,191,86,170,42,213,122,58,159,74,75,162,208,195,72,52,98,122,60,170,43,221,69,227,170,159,86,220,197,115,89,175,206,203,38,75,201,82,69,211,77,227,76,114,128,231,167,120,110,2,186,233,81,187,142,169,211,250,233,92,236,134,213,171,109,111,106,191,200,92,247,73,121,223,198,170,231,182,45,245,23,47,55,246,217,82,175,250,251,30,19,114,146,94,217,128,64,200,141,145,3,64,69,211,108,229,105,168,240,135,32,157,217,47,41,21,33,121,188,42,64,94,198,233,80,14,81,59,41,7,119,248,52,113,114,148,170,106,148,228,184,114,104,144,24,52,210,80,94,74,144,52,219,244,51,72,64,137,146,117,90,80,66,89,80,2,226,202,1,69,201,212,72,137,146,83,88,68,241,19,122,91,70,142,147,70,69,146,70,63,67,201,210,54,171,68,172,232,55,55,28,42,73,8,101,179,65,209,105,226,28,34,98,250,112,31,86,155,180,211,44,230,242,104,157,244,79,66,46,147,244,207,253,156,209,56,141,35,0,135,75,197,105,145,112,
+113,12,194,233,156,186,223,153,82,143,39,183,90,77,87,99,185,197,211,172,149,16,178,229,148,104,181,165,30,108,182,244,120,204,57,237,206,233,15,214,162,74,118,106,89,161,86,79,167,61,105,73,52,90,10,133,138,115,143,199,116,165,179,44,212,41,22,83,249,19,23,19,254,239,19,111,61,232,97,154,159,74,197,177,28,28,47,57,87,215,201,117,147,212,114,245,100,158,71,245,246,114,227,15,182,182,68,158,73,214,222,143,236,173,121,206,189,245,94,210,235,154,201,73,10,65,203,227,59,33,68,8,37,61,227,224,94,7,136,72,92,2,74,90,183,212,73,64,127,112,156,122,92,220,137,145,12,146,114,80,55,118,18,22,11,110,45,172,144,191,19,56,4,18,44,4,10,145,62,126,6,20,32,29,143,200,13,34,57,177,36,62,115,29,36,73,5,0,32,65,56,145,144,32,145,18,65,128,36,137,128,32,121,122,118,160,43,81,171,73,24,80,20,20,77,149,74,18,145,130,50,184,86,65,97,216,7,127,18,52,154,212,129,4,77,62,61,147,109,35,127,167,147,50,185,116,
+145,207,147,18,137,196,5,104,31,44,190,77,78,21,132,201,163,97,176,9,152,27,46,125,62,73,94,111,35,177,214,75,92,245,220,179,40,157,78,8,22,219,38,85,171,75,127,126,72,91,153,44,17,2,75,188,155,86,174,174,86,234,104,128,66,41,169,82,73,134,209,33,233,115,57,89,98,93,34,240,147,232,242,4,56,65,28,12,19,38,179,69,186,110,197,115,121,169,82,223,74,240,124,116,119,252,169,186,30,226,187,247,217,59,72,115,19,63,108,42,105,94,150,208,117,9,124,154,75,254,88,69,199,98,27,220,133,240,164,245,221,75,126,28,169,131,140,236,77,147,144,122,147,190,33,137,67,10,91,45,218,20,29,238,9,127,221,95,10,41,13,17,126,188,128,154,191,205,65,229,104,23,137,112,112,151,126,232,91,52,66,87,53,70,178,82,50,50,132,13,15,64,26,66,15,17,46,207,38,198,8,234,177,126,220,86,153,84,150,139,0,4,178,95,108,120,96,98,132,73,228,45,178,247,183,81,136,254,232,240,118,166,98,128,121,68,113,182,71,165,26,253,40,233,231,217,
+196,68,87,79,42,221,6,65,140,39,144,144,201,160,63,60,24,54,155,123,211,233,246,195,131,151,93,206,109,220,8,121,127,60,136,250,240,96,56,20,234,5,188,129,173,31,96,215,103,216,141,143,57,156,18,207,187,35,210,229,138,124,120,176,103,181,110,83,104,251,210,81,109,84,20,58,125,154,94,46,34,231,179,48,166,88,236,37,147,219,43,220,97,183,20,26,13,141,93,167,161,140,199,232,125,107,31,169,86,123,231,181,39,188,110,163,218,110,34,93,46,69,126,232,208,55,185,203,94,187,240,99,115,22,94,90,158,237,178,62,237,177,109,225,178,30,133,208,55,73,124,151,220,123,121,214,30,61,200,5,62,226,135,219,47,245,107,135,75,109,249,47,73,90,138,15,63,254,49,34,67,66,225,85,106,36,228,6,34,242,182,195,125,228,198,106,139,52,116,136,144,204,97,48,10,123,230,8,78,67,67,252,241,31,67,244,199,127,34,4,238,195,127,104,255,111,56,35,70,150,74,225,130,10,128,0,224,126,21,34,19,162,26,150,160,16,16,226,55,79,31,236,134,43,154,203,
+228,88,132,4,16,191,186,73,54,137,66,64,73,139,207,195,8,241,108,46,75,154,116,3,16,63,162,63,26,71,246,123,81,21,87,205,126,99,38,179,100,197,242,103,8,9,88,48,30,29,141,69,196,98,151,168,219,205,118,4,147,69,199,95,104,235,103,75,47,245,120,64,56,93,17,60,151,43,194,225,178,117,27,91,241,85,44,52,52,157,217,140,244,101,65,204,60,179,240,215,151,104,54,227,100,135,82,133,40,88,0,148,100,42,37,145,74,13,32,81,168,240,245,42,34,114,56,217,18,77,97,150,229,41,68,225,237,89,203,83,254,220,97,240,176,94,48,39,219,126,54,164,134,139,238,231,176,109,45,69,175,26,132,166,71,181,117,94,178,135,147,102,114,60,76,179,122,31,2,119,225,211,159,119,237,36,85,249,203,242,34,43,168,32,130,154,159,223,197,17,177,110,137,246,43,32,236,174,215,32,111,237,31,201,250,132,20,117,103,15,98,7,88,33,91,59,48,66,130,223,35,32,44,132,8,117,130,206,38,34,16,60,250,143,66,4,106,106,233,198,106,44,66,146,10,2,
+48,9,65,226,167,109,73,128,68,92,130,66,66,132,13,158,62,220,133,84,52,149,205,177,136,8,32,178,186,201,95,12,22,148,52,209,233,209,196,120,55,71,36,109,186,1,132,31,49,30,143,161,251,125,240,83,191,238,55,102,115,171,85,236,14,37,135,65,192,113,241,232,88,20,242,169,95,176,219,237,254,18,54,159,250,85,218,250,197,252,68,62,29,16,46,23,20,211,108,6,113,184,238,221,230,50,124,21,43,57,145,127,49,35,89,173,168,185,121,14,61,30,131,44,22,167,91,164,26,76,185,10,160,165,211,104,169,52,122,28,141,70,67,161,208,32,209,237,238,166,113,6,181,44,197,96,42,31,251,104,158,193,211,61,142,201,203,186,7,221,76,243,221,126,62,22,132,227,33,231,181,4,245,71,131,62,221,214,189,139,92,182,162,13,119,81,237,234,125,168,247,245,26,185,60,236,155,122,111,13,109,191,132,143,252,155,15,121,31,125,175,126,148,80,192,43,29,18,72,166,179,238,239,161,110,30,163,179,207,251,135,40,59,142,19,136,70,129,214,122,194,223,67,50,190,129,
+224,156,16,208,5,114,117,0,172,0,60,159,131,8,148,159,223,9,232,235,11,72,37,168,0,0,32,84,36,96,146,161,18,18,32,78,233,16,16,32,119,11,16,114,34,13,149,192,76,5,240,128,137,130,44,136,74,5,0,81,210,74,139,38,56,19,65,82,105,32,8,170,1,128,132,239,12,122,228,25,65,204,102,16,147,9,15,28,44,157,93,206,208,49,10,25,124,250,103,46,70,70,99,208,80,8,244,153,75,2,29,129,192,103,109,255,150,229,147,37,181,114,56,163,157,78,8,55,198,5,157,78,129,58,155,45,144,70,126,27,154,73,103,65,177,124,96,56,227,65,190,190,64,179,89,0,55,148,10,68,193,223,18,64,166,80,18,41,84,228,5,133,134,94,175,160,134,189,17,56,89,59,77,23,62,80,183,129,108,107,200,247,116,10,162,235,161,25,40,31,205,115,19,221,183,158,196,254,110,111,206,186,123,167,164,13,28,231,160,80,138,14,165,235,16,233,39,135,248,184,169,59,227,37,31,26,195,163,189,215,82,116,19,161,131,124,207,93,130,144,68,148,98,20,55,135,
+4,202,244,183,182,164,237,218,88,1,113,112,155,207,24,24,155,175,154,18,141,159,112,251,59,155,90,151,145,145,239,133,136,152,207,155,134,7,188,88,101,180,93,239,231,149,15,59,192,238,23,110,18,3,153,23,25,150,147,174,16,14,136,143,31,247,55,15,175,134,230,115,38,99,157,238,101,98,121,15,161,120,94,112,75,167,95,227,18,247,123,75,244,25,252,49,175,224,178,223,63,28,14,241,107,161,121,143,96,62,158,231,135,207,25,100,190,51,155,88,236,218,239,63,176,217,236,107,99,120,79,18,8,159,61,206,103,116,228,231,227,246,126,191,122,96,158,135,78,247,26,203,125,62,49,184,93,138,174,119,203,161,205,182,103,179,152,23,44,246,113,187,189,56,75,173,79,6,107,23,223,17,189,162,67,167,239,31,169,212,53,18,121,136,252,162,87,0,232,211,227,125,124,114,40,147,236,141,77,163,157,217,116,209,183,51,251,124,238,162,111,109,164,124,79,223,119,13,190,231,23,194,251,237,125,167,91,220,215,15,251,49,47,167,46,116,253,94,223,232,12,249,142,144,239,136,
+122,159,247,153,71,63,118,105,235,30,161,119,15,253,226,155,223,241,140,20,210,233,95,62,122,18,168,55,6,187,173,195,253,169,158,145,26,232,155,241,134,138,187,36,35,199,58,155,14,227,20,147,239,5,19,255,13,224,196,67,174,22,214,186,182,196,198,164,59,0,32,29,19,110,226,3,30,18,24,22,147,254,206,121,197,240,227,238,198,173,57,237,253,51,21,30,220,21,94,179,110,10,202,230,254,238,132,68,215,84,202,29,25,69,90,65,16,30,216,105,255,100,246,163,209,197,108,51,187,153,204,214,193,34,89,239,72,54,99,128,205,227,143,177,216,109,52,86,185,138,197,110,161,176,181,237,8,214,29,64,185,253,206,204,151,195,227,97,115,119,186,174,92,174,27,183,193,181,238,46,253,23,85,94,206,5,231,179,222,23,206,186,155,205,175,199,99,200,205,98,181,142,95,122,178,137,84,206,6,212,106,95,159,74,217,160,208,23,60,20,234,126,60,90,43,187,78,239,98,159,87,220,250,122,89,111,177,109,110,237,225,208,82,151,221,116,134,254,146,225,239,120,190,234,200,243,
+136,187,206,248,218,249,110,93,71,177,173,114,81,237,78,209,47,227,122,102,255,186,99,207,179,21,101,45,231,95,98,184,247,214,123,133,157,175,99,174,219,247,34,210,147,136,113,245,79,78,64,169,110,119,99,179,226,12,85,76,131,134,78,13,118,204,13,70,135,225,11,242,14,19,33,220,108,143,65,130,38,61,218,215,105,183,202,106,1,12,240,75,127,237,133,191,211,130,61,18,146,211,0,1,209,177,253,54,110,215,209,82,205,230,112,211,51,52,44,44,151,201,19,140,8,237,169,84,131,39,33,185,44,225,102,35,48,208,105,54,68,196,138,248,112,159,87,56,151,11,159,226,50,187,233,204,126,32,151,59,200,228,198,54,186,93,85,24,231,3,69,226,50,5,185,172,222,167,78,59,56,204,254,124,134,26,94,239,42,131,183,189,93,236,122,49,178,156,156,59,86,219,190,94,179,99,180,218,198,104,180,234,167,197,54,33,176,94,142,197,180,218,97,169,188,87,155,85,118,42,181,177,219,217,87,83,165,205,206,168,239,10,97,173,162,51,26,198,183,251,157,189,90,109,116,191,
+191,87,81,216,249,104,152,175,106,172,243,48,213,94,237,199,13,121,198,209,197,243,182,124,119,167,85,246,164,60,79,246,189,111,133,157,103,197,149,52,245,108,236,199,118,223,51,218,240,92,73,247,124,166,81,20,199,28,239,59,251,92,222,103,28,239,135,248,108,227,191,166,124,248,239,3,244,241,134,66,59,155,253,205,177,178,255,142,224,8,191,193,24,24,28,230,152,28,156,112,144,125,62,255,229,16,220,126,241,182,4,44,217,11,42,56,192,110,249,59,45,56,34,196,15,28,209,22,0,244,7,186,125,135,157,3,71,15,193,26,221,206,192,192,177,170,63,213,106,87,240,203,33,14,135,56,82,162,90,3,246,62,11,52,154,157,128,128,140,95,60,179,205,23,99,114,135,223,223,155,187,236,175,126,28,100,20,153,190,216,199,11,140,196,236,76,50,153,93,12,0,191,135,193,29,96,112,136,243,122,165,219,124,249,91,14,207,55,127,166,51,99,239,112,218,213,234,14,204,114,201,41,149,210,251,151,89,174,68,230,127,253,124,165,126,92,40,237,102,134,153,189,88,228,36,147,
+246,244,213,33,215,96,242,164,92,80,169,234,81,104,167,221,110,239,112,56,56,192,197,34,93,162,201,205,107,50,153,24,184,62,89,103,50,45,122,221,130,246,203,5,115,156,32,167,197,233,24,231,126,118,156,215,139,221,170,217,107,248,210,69,199,14,186,223,138,198,207,134,35,61,205,115,200,12,185,195,247,138,59,110,25,202,222,230,219,122,223,112,206,30,238,219,228,144,233,238,141,65,10,5,13,147,170,198,74,190,2,2,168,78,200,192,78,143,67,177,95,224,241,104,69,152,52,83,203,169,198,98,39,37,67,176,31,136,130,254,244,100,230,132,196,74,140,135,101,132,202,197,205,134,115,250,125,227,162,88,180,78,96,123,0,118,164,215,48,13,89,197,105,103,98,19,145,3,189,214,72,167,11,171,104,244,2,2,242,172,124,25,30,187,159,73,103,76,114,121,53,159,95,96,19,137,83,24,114,127,32,57,30,107,148,199,29,190,241,24,3,28,94,5,195,193,11,32,240,244,246,189,93,122,124,179,158,90,17,87,163,243,209,232,114,241,171,203,229,194,106,61,61,230,106,151,
+20,218,44,108,195,171,197,160,92,54,143,231,179,202,215,215,98,182,153,157,134,82,151,8,4,105,150,162,58,237,144,206,163,155,209,168,10,20,10,94,184,221,167,52,206,181,114,177,159,43,238,125,105,173,159,216,182,197,225,144,58,169,203,11,186,190,2,207,240,140,124,223,200,87,122,196,189,103,252,115,124,194,221,71,63,167,227,60,177,80,151,43,116,189,73,157,225,13,249,222,31,239,107,11,122,246,241,139,245,211,55,126,31,245,139,140,198,219,127,119,241,139,130,61,104,255,55,224,105,52,50,114,164,99,232,20,25,17,57,31,32,40,1,111,78,52,164,106,97,89,230,203,37,128,154,4,105,0,52,104,80,68,174,66,36,36,116,220,237,23,244,13,155,11,13,23,11,126,247,170,106,181,6,3,131,66,163,230,82,169,162,168,80,230,87,38,52,108,186,211,104,21,52,90,3,181,67,105,160,0,139,63,134,255,252,24,71,227,170,217,106,214,76,167,165,2,69,50,223,145,190,140,1,22,231,143,255,140,31,254,171,138,197,154,110,183,244,225,191,121,7,80,108,159,51,179,
+121,255,120,50,245,157,174,106,179,169,73,111,210,165,24,92,173,197,194,139,181,228,108,218,253,2,125,25,89,236,42,22,27,210,56,157,165,165,86,189,119,178,138,197,136,74,131,27,80,233,230,100,170,138,145,74,53,34,81,169,123,17,170,125,124,42,59,37,78,166,71,195,161,209,180,49,87,153,76,77,89,207,168,78,167,26,186,190,138,207,240,205,60,239,208,83,123,125,223,54,128,227,250,196,155,159,150,165,31,118,81,51,255,171,159,121,162,107,116,184,158,212,77,123,44,151,144,100,13,127,242,234,60,223,158,185,94,241,30,62,79,204,57,222,242,238,72,73,193,179,177,36,133,67,58,126,3,216,144,246,1,2,152,227,145,0,67,152,38,22,240,28,49,199,168,168,64,0,38,136,130,6,100,124,1,49,206,8,139,192,254,78,199,177,197,112,112,192,136,9,80,42,227,59,6,140,69,207,50,154,130,126,33,99,159,74,97,36,36,163,5,24,174,52,6,26,141,1,67,64,68,31,238,254,202,129,51,186,62,86,172,91,249,206,152,101,50,6,217,70,198,32,145,209,139,93,
+210,95,96,140,206,36,3,240,233,93,172,17,6,103,48,193,96,204,235,21,125,180,249,98,27,61,155,135,135,38,179,79,235,154,46,78,39,99,185,196,148,54,165,104,10,45,118,48,99,217,74,124,50,233,20,128,101,243,108,206,252,250,10,97,84,170,232,80,42,38,139,64,217,82,84,161,4,116,41,116,51,10,205,196,64,161,24,183,59,154,182,227,196,46,246,246,163,35,253,101,61,202,182,97,62,58,18,85,151,49,116,141,158,241,65,32,207,93,233,186,111,97,251,155,95,219,158,117,253,211,50,250,131,101,99,212,101,38,93,163,51,166,249,99,142,163,28,186,28,203,81,189,207,109,120,93,128,219,230,89,142,209,251,70,143,19,211,214,63,251,198,31,123,8,190,198,132,162,143,195,166,196,17,140,52,92,136,40,180,218,240,192,6,128,197,193,244,218,64,65,133,249,5,192,21,20,198,55,140,146,144,48,226,16,36,196,201,192,251,0,161,64,5,166,113,59,81,125,131,129,195,194,234,53,126,5,37,239,118,99,196,68,56,13,78,235,68,34,151,46,16,19,21,116,174,215,
+203,42,141,227,113,161,227,81,167,59,157,94,102,40,30,135,9,145,203,58,219,237,101,179,192,124,22,224,240,143,116,11,47,27,2,207,203,0,220,239,93,175,247,110,183,209,87,83,160,203,230,236,164,211,118,49,120,176,90,195,235,245,46,45,74,179,59,152,171,25,104,193,102,117,110,55,187,238,133,211,41,129,106,117,23,251,161,62,17,72,167,175,194,83,169,110,175,103,223,42,16,58,5,96,191,15,117,27,13,187,139,157,54,39,65,102,115,23,131,1,95,142,115,187,22,251,74,92,73,175,23,231,117,147,80,94,15,198,235,66,72,120,223,124,239,30,238,149,28,209,222,23,215,123,3,81,189,7,164,247,205,243,123,247,48,239,17,245,90,94,199,151,203,246,226,106,175,59,122,31,204,247,124,81,94,207,117,247,77,130,5,17,248,191,193,68,128,152,60,185,160,0,248,251,211,178,86,88,86,137,32,0,56,130,95,129,73,194,20,17,5,31,169,192,2,1,221,45,1,7,95,117,141,191,51,21,36,192,225,248,197,66,42,21,129,135,130,104,116,161,132,52,168,213,254,190,
+129,62,160,8,32,96,52,22,118,29,142,201,137,198,98,242,129,50,185,80,169,156,60,118,36,22,3,16,141,129,133,70,227,228,64,97,121,153,64,24,92,40,20,118,38,27,194,103,225,102,187,11,189,94,133,141,254,158,77,129,78,167,32,29,77,43,196,224,217,26,190,174,213,4,52,154,194,17,103,206,102,32,22,91,184,188,221,20,58,156,74,219,134,170,212,66,149,74,65,20,129,84,122,120,50,197,22,146,72,10,59,67,229,213,64,118,123,161,219,125,81,200,225,201,36,168,245,246,128,91,94,104,203,221,6,230,242,66,139,101,178,28,166,38,215,253,100,106,205,79,178,226,73,0,92,159,180,60,147,52,119,178,28,253,76,110,199,73,210,74,157,244,34,147,134,99,61,177,181,5,121,185,96,201,127,195,112,124,184,119,121,199,221,110,243,73,30,151,17,182,223,188,164,178,18,150,124,58,22,240,246,123,89,216,70,29,172,4,20,8,127,131,173,64,202,196,144,226,2,226,37,1,240,3,182,23,2,220,10,54,86,192,106,181,192,13,3,139,178,157,36,138,139,8,2,83,
+41,1,9,112,237,76,145,141,6,164,67,167,249,33,32,14,159,7,31,143,252,213,234,102,49,130,113,120,48,185,12,236,79,36,54,61,16,199,205,135,199,162,254,108,214,191,25,64,62,11,112,56,204,31,8,108,58,128,251,98,13,191,223,252,45,107,203,224,98,47,62,120,114,185,2,56,156,193,227,231,46,230,224,122,205,143,29,141,12,74,228,98,209,130,204,231,1,167,211,176,180,210,52,58,152,90,197,246,39,147,6,55,71,99,80,131,83,73,127,175,23,50,40,16,154,15,208,224,59,127,163,241,249,83,253,239,63,160,5,48,48,204,230,56,55,120,184,164,199,17,245,216,130,30,137,19,230,177,131,60,14,36,132,251,205,119,223,233,9,247,147,237,222,130,221,146,19,214,253,96,186,55,0,160,251,78,115,63,89,21,247,149,244,152,202,55,203,138,113,83,95,7,244,83,47,200,119,133,60,154,244,181,159,18,188,228,118,154,56,162,86,99,97,147,82,41,240,79,79,163,40,89,62,46,1,135,69,220,191,155,155,91,11,39,176,2,208,82,245,166,116,211,53,88,44,44,
+171,41,28,12,9,113,26,125,30,75,136,215,114,164,229,22,78,180,26,252,33,193,164,189,223,91,28,14,240,199,15,91,152,204,218,193,18,94,206,80,86,71,130,253,102,8,176,248,124,52,218,154,136,197,22,34,177,70,220,24,150,19,132,213,126,137,179,25,130,227,57,223,191,221,38,30,143,101,181,89,213,202,116,173,153,220,47,101,3,243,181,252,171,255,149,173,213,38,63,63,33,139,76,86,235,139,181,125,33,176,84,142,169,181,62,105,177,240,171,82,77,240,84,170,5,133,170,85,113,76,173,133,82,106,124,15,212,42,17,149,242,187,243,236,167,14,135,133,195,169,212,74,180,101,211,85,139,213,109,22,219,122,50,61,79,45,22,75,45,69,31,91,198,153,105,134,159,11,243,124,178,63,167,60,123,243,79,99,220,178,100,213,214,176,108,139,186,156,156,210,245,121,93,67,32,252,136,132,235,201,58,53,123,144,191,219,196,177,55,46,235,125,210,78,197,93,217,146,241,10,159,43,222,217,242,126,240,243,8,105,55,254,49,124,10,128,115,3,8,10,73,137,2,138,52,5,
+16,227,82,66,86,113,113,83,225,46,0,49,146,43,151,149,12,12,139,138,245,26,76,193,72,70,168,72,165,10,18,82,200,249,231,134,221,134,173,193,31,17,40,246,123,118,193,225,152,45,52,199,222,8,230,244,252,112,89,1,81,58,157,147,203,20,235,126,191,96,52,206,38,8,197,113,0,113,186,191,33,92,150,8,135,203,193,189,48,197,243,89,240,122,47,179,181,254,75,14,175,113,155,63,203,153,232,116,186,228,92,78,197,114,89,232,90,173,179,20,250,203,17,99,214,10,225,229,66,114,177,90,126,231,51,197,23,252,171,192,98,205,142,159,175,38,82,45,27,208,226,244,114,26,45,151,74,50,21,145,72,33,24,156,109,94,222,47,61,158,69,230,133,126,210,50,239,61,6,255,249,150,140,6,191,237,140,79,38,147,231,219,158,190,200,123,9,60,79,152,250,109,128,60,102,197,179,47,48,188,112,63,43,206,213,213,239,186,37,105,249,84,105,207,14,122,155,146,234,199,199,117,198,52,23,190,219,111,41,207,30,120,122,182,177,89,86,92,88,207,189,194,215,85,122,36,
+167,51,10,223,157,251,37,141,18,100,127,115,135,64,240,11,48,49,5,68,192,236,207,6,3,58,219,79,247,158,1,104,104,73,80,6,98,96,126,49,190,175,209,0,20,20,131,251,129,17,16,253,185,28,16,24,137,116,186,64,191,32,4,184,94,59,43,28,195,200,133,142,198,0,38,147,209,185,177,24,44,144,12,38,7,34,145,157,7,167,195,96,131,163,49,32,17,64,236,92,24,159,133,5,12,14,4,2,5,190,40,127,50,7,223,238,192,37,143,39,112,177,39,179,10,200,233,2,226,112,2,160,231,195,61,208,90,141,13,24,141,4,74,228,196,176,128,176,88,0,167,179,46,176,210,20,74,160,202,166,6,38,147,2,17,168,163,248,99,57,32,9,70,18,216,25,10,13,4,131,66,1,220,110,129,237,68,143,167,97,38,19,96,249,253,221,89,214,59,63,0,182,192,195,141,167,192,201,150,23,194,243,193,121,0,47,148,231,131,241,188,86,200,170,13,95,181,160,185,85,27,182,106,65,116,144,38,88,215,0,234,90,86,72,154,11,78,115,128,185,52,23,244,186,66,47,
+203,109,172,51,201,118,216,179,53,64,239,131,188,118,40,122,167,253,166,198,149,85,136,236,195,119,2,178,34,62,248,55,56,124,198,178,132,189,1,212,148,105,110,103,50,218,137,227,38,7,32,149,106,66,9,34,173,150,236,35,160,111,26,45,142,70,15,160,6,168,9,20,224,241,125,21,131,45,198,227,74,51,252,111,130,92,158,200,231,217,131,68,98,23,134,92,65,15,142,219,122,234,28,182,20,183,41,248,242,213,202,98,114,37,124,254,242,181,251,158,69,105,185,95,75,60,161,162,163,40,151,185,232,227,107,216,188,69,0,163,223,176,190,129,97,96,130,129,102,70,162,3,126,235,151,229,74,165,162,167,180,217,62,107,148,193,142,246,81,34,5,10,7,39,135,160,209,56,145,164,204,229,36,241,172,36,78,44,138,226,213,112,53,156,4,136,114,180,44,45,91,40,42,99,244,67,243,16,83,169,10,79,233,34,157,73,241,35,239,99,219,221,238,179,217,57,69,193,233,117,235,160,96,169,90,157,91,8,126,157,110,205,245,217,150,162,209,185,235,21,185,17,36,189,237,233,
+193,114,57,236,114,193,109,110,27,222,34,67,201,88,76,138,15,133,114,129,192,244,237,243,13,182,148,211,41,217,118,185,164,92,46,9,101,163,89,109,41,54,91,58,128,40,29,13,41,92,204,182,24,179,166,122,202,10,170,39,102,218,170,70,154,255,251,47,109,26,6,134,36,165,203,185,89,138,37,249,73,72,85,74,170,84,239,112,91,44,5,82,220,250,119,91,65,104,144,168,8,148,139,155,68,175,131,122,230,212,247,104,58,194,202,194,82,154,76,158,226,139,197,82,161,48,215,246,182,149,106,117,161,86,235,171,212,234,34,165,215,62,21,7,64,66,196,119,221,176,127,21,148,253,181,103,226,191,0,59,71,79,127,244,81,204,213,205,62,211,140,124,203,46,249,76,132,114,96,73,114,17,60,191,142,74,12,182,207,59,97,17,167,180,61,234,104,191,30,177,173,209,198,202,118,250,195,38,96,105,235,181,11,77,140,111,87,58,6,1,71,95,175,209,54,27,52,242,171,248,219,23,207,193,208,229,114,196,47,176,95,174,213,195,29,77,199,209,255,182,105,3,148,113,38,141,
+242,182,183,135,173,229,178,203,133,183,61,230,118,75,12,161,98,49,126,228,111,151,59,176,93,189,125,147,45,229,124,242,161,92,174,8,151,43,226,162,104,54,27,186,94,143,71,32,74,103,35,34,135,155,237,127,199,100,245,207,218,34,242,245,37,138,96,114,22,54,58,218,223,174,142,95,138,50,253,171,70,238,37,147,89,173,78,199,208,211,169,40,209,119,9,74,73,162,123,219,172,196,160,210,105,40,215,135,136,138,47,15,54,168,197,9,77,12,40,114,147,8,10,40,253,252,61,14,87,107,199,97,169,247,27,170,137,107,70,104,180,94,179,57,222,86,205,168,224,99,94,69,185,9,162,205,244,42,122,116,241,111,128,163,145,239,210,219,168,170,230,210,191,142,131,178,252,101,218,149,7,157,216,156,50,120,132,227,161,3,211,230,101,240,196,37,168,117,139,234,235,109,131,117,27,180,66,194,184,175,121,68,20,77,63,159,161,113,201,230,124,40,35,224,159,50,117,250,35,25,1,69,213,233,157,232,64,167,59,83,17,0,8,138,78,143,126,189,225,221,158,104,243,106,9,108,
+136,96,181,26,24,171,193,28,30,45,157,70,217,253,45,187,87,215,169,116,241,19,69,231,72,195,225,78,168,251,29,138,151,27,150,182,114,165,169,93,44,26,148,95,139,193,211,172,24,107,42,65,60,48,84,189,236,92,40,22,27,188,153,110,129,149,94,163,165,102,52,37,80,181,97,96,158,80,106,53,20,44,20,0,243,212,82,9,197,250,201,5,164,42,5,21,234,56,186,5,100,170,36,7,66,84,26,4,36,10,20,8,119,95,94,131,173,220,33,108,80,154,18,48,173,39,254,78,160,40,169,193,123,104,9,200,104,48,24,218,111,181,130,227,177,80,154,149,254,214,235,10,69,88,238,83,196,193,194,221,123,122,9,121,233,96,223,67,77,202,140,246,190,55,102,100,98,62,50,190,97,62,57,37,36,135,190,71,156,39,39,95,207,235,128,104,72,124,159,117,124,252,120,222,246,66,141,149,215,207,149,253,176,176,124,190,12,38,38,234,172,116,124,92,98,188,94,239,109,182,43,225,87,241,126,114,241,48,228,190,92,190,250,5,111,247,21,249,120,61,34,145,254,235,225,206,
+16,174,230,140,217,157,161,251,60,63,114,62,103,176,117,227,187,237,171,88,252,232,118,91,251,249,223,62,226,249,28,216,243,50,175,181,222,231,115,177,219,213,132,120,98,127,221,93,190,47,106,44,67,112,167,168,103,231,222,143,139,189,158,158,181,237,57,94,90,221,69,150,45,87,217,201,242,173,201,247,132,141,185,122,188,250,162,118,244,197,114,215,184,109,81,43,173,166,92,153,154,181,207,66,161,199,119,232,8,250,42,52,232,9,131,219,213,237,166,179,249,92,232,143,153,121,117,122,124,47,15,151,207,74,226,241,215,113,44,186,3,131,175,159,58,61,198,99,175,180,34,109,215,217,122,69,56,234,83,254,213,201,231,121,128,76,213,70,198,87,29,155,152,155,124,198,65,57,56,233,73,32,158,95,219,37,6,171,79,191,189,226,131,150,39,21,233,139,29,182,117,64,67,187,95,247,50,58,118,180,90,223,246,68,132,221,149,130,250,66,142,122,189,241,243,35,209,81,146,205,54,184,131,48,156,143,84,52,100,135,166,211,29,62,223,121,155,32,186,124,25,98,120,197,93,104,
+198,251,97,58,35,216,203,229,14,78,134,27,228,143,13,154,243,129,114,112,185,191,175,30,7,248,12,110,188,94,233,126,226,189,92,14,27,171,198,103,30,198,69,246,245,186,163,174,213,114,64,131,134,46,198,201,51,247,246,221,124,56,119,184,60,99,243,176,173,41,113,34,36,51,219,191,143,246,63,61,39,119,149,199,7,103,35,153,76,167,181,105,101,193,33,93,152,228,244,241,192,196,65,21,88,100,244,94,148,181,175,186,194,216,120,124,209,186,57,112,114,223,188,247,99,162,171,145,44,38,13,140,100,242,125,191,239,208,19,137,13,191,31,23,118,36,143,135,1,139,189,215,127,125,57,80,193,129,170,185,243,35,22,25,31,248,251,91,118,207,103,4,92,116,90,150,171,226,249,126,149,137,249,124,123,217,241,38,224,188,54,109,47,167,233,178,78,64,15,219,110,110,34,42,174,222,239,4,15,114,176,94,153,186,27,240,233,100,189,239,193,193,152,112,113,60,90,25,223,155,86,115,8,6,46,134,233,97,105,157,105,53,0,253,253,94,19,24,100,210,76,147,183,125,58,88,
+238,222,29,41,178,93,108,183,35,90,200,20,139,85,67,153,144,166,204,246,216,227,247,213,122,124,62,153,92,71,87,213,230,114,153,201,184,72,118,113,58,157,230,57,53,90,80,165,171,231,246,195,136,139,91,68,163,203,210,42,83,91,84,191,214,95,154,8,233,139,109,6,68,251,167,227,215,220,176,24,28,157,154,18,187,8,154,152,84,197,211,213,177,85,255,14,134,166,69,14,145,43,137,18,58,221,232,12,13,106,252,4,46,95,158,73,255,12,29,28,13,25,77,29,26,76,150,26,148,22,76,164,211,163,216,43,102,14,133,170,192,87,101,145,201,88,197,226,250,187,193,209,42,19,175,11,160,15,21,146,168,87,65,41,60,202,191,110,74,178,41,13,46,168,246,221,16,75,198,132,172,219,99,82,12,249,237,58,11,120,153,231,199,143,35,35,126,118,208,198,156,88,246,111,62,22,25,246,55,155,50,14,60,221,104,141,86,43,127,75,65,113,120,211,16,240,152,169,86,127,11,8,14,163,27,242,122,143,122,162,195,254,197,19,34,190,171,222,106,116,156,226,240,70,132,116,
+218,100,231,57,188,204,116,167,50,154,40,246,176,11,99,123,51,195,225,111,230,243,137,137,145,171,235,122,106,177,26,53,86,161,239,116,26,22,49,215,245,117,166,86,139,1,13,120,13,29,38,207,220,218,9,38,54,155,233,242,244,177,230,97,169,100,162,165,150,209,69,154,241,205,44,250,138,152,0,33,59,53,93,106,203,168,56,161,40,174,153,195,33,38,199,36,10,83,230,84,138,169,180,108,196,180,113,88,244,29,228,5,97,153,204,230,194,36,232,108,102,23,187,107,2,152,15,183,209,205,25,234,10,7,50,153,73,44,142,49,187,221,239,247,91,198,149,203,243,45,222,116,6,79,22,10,3,21,138,184,87,125,218,45,199,167,137,146,82,223,3,144,24,204,111,159,230,138,75,218,79,79,42,214,255,56,35,202,65,67,123,237,97,97,188,120,122,191,31,36,160,245,106,149,235,110,110,167,142,245,249,65,143,240,0,60,30,157,140,239,118,179,43,5,3,55,87,230,105,127,207,211,233,211,253,222,109,9,72,50,233,156,119,195,183,255,221,177,144,108,182,238,231,131,19,53,
+212,15,217,236,237,51,91,236,143,50,60,46,119,191,223,166,120,185,199,70,111,61,155,63,174,230,148,203,125,89,80,50,155,53,199,38,178,167,144,132,171,49,165,202,205,203,141,196,102,77,228,78,247,218,40,165,127,107,165,218,146,165,202,145,89,153,185,104,191,214,41,197,231,199,169,214,234,97,155,72,37,117,94,85,12,214,148,223,106,202,148,185,248,112,186,76,74,58,0,123,189,154,226,27,13,105,79,175,215,67,163,193,194,134,18,230,234,84,102,230,120,204,100,30,47,157,225,253,72,99,177,252,96,119,185,77,20,205,50,125,245,92,165,109,54,57,155,213,206,21,139,83,84,176,179,249,96,40,60,11,193,25,5,19,178,229,203,72,147,36,229,121,237,119,243,84,183,59,45,220,83,218,44,235,92,86,97,255,240,114,68,164,116,185,8,56,160,124,181,206,219,108,130,205,31,237,200,65,129,80,161,88,252,168,23,61,66,87,250,124,199,45,17,224,252,208,14,196,238,186,165,174,15,101,62,95,152,38,18,168,88,62,22,19,40,49,41,46,87,138,51,224,243,173,245,172,
+35,192,127,249,248,187,75,238,254,186,43,155,77,74,157,139,174,85,19,194,201,236,238,117,125,125,81,107,141,239,111,97,60,57,76,58,184,55,37,92,252,229,229,153,128,245,188,181,62,91,106,95,195,47,217,247,136,146,0,82,76,172,60,44,148,60,234,51,211,131,146,74,45,82,162,228,156,50,151,26,166,148,80,145,148,46,7,127,166,9,82,34,169,113,166,145,97,37,20,74,193,243,249,189,109,174,177,82,204,78,214,72,79,202,224,98,40,88,154,40,151,127,147,201,74,163,177,16,223,196,103,27,67,177,76,119,205,86,233,175,47,41,203,205,206,23,139,74,121,198,162,70,0,11,31,203,196,79,156,215,100,36,228,226,56,235,152,120,176,109,205,38,27,43,187,143,7,250,193,202,214,235,128,132,116,119,187,82,176,80,231,52,177,94,247,100,12,212,255,193,141,137,241,221,106,118,254,195,205,193,124,39,211,233,137,253,254,225,39,36,204,102,73,198,72,119,123,126,120,28,9,96,235,190,62,48,6,13,228,122,160,184,221,223,55,159,39,1,6,15,94,47,118,174,159,88,
+45,165,103,208,153,188,58,239,198,242,55,82,148,88,46,7,37,66,105,183,55,35,5,9,40,93,61,61,124,144,68,39,205,231,9,151,103,202,53,75,203,37,82,105,158,200,45,210,172,239,132,120,99,156,26,36,199,155,4,148,166,55,170,137,153,197,153,248,114,58,220,156,2,72,69,222,93,115,178,212,44,41,77,24,237,14,59,146,65,65,145,65,129,157,225,229,117,216,232,131,77,149,180,56,145,18,223,57,225,52,193,210,38,132,146,129,92,70,234,247,19,68,27,113,208,233,152,108,54,120,181,72,253,75,14,108,88,101,106,53,153,10,213,252,150,63,213,65,158,165,107,210,214,126,185,91,163,68,52,208,182,38,101,163,127,160,9,139,144,192,63,208,124,48,3,14,252,252,136,40,201,70,240,163,85,134,237,145,122,65,64,72,116,186,127,109,200,52,26,146,116,134,140,129,0,211,105,146,183,221,239,29,44,219,29,201,127,217,110,30,28,191,33,188,204,102,123,27,67,247,104,144,225,112,164,251,29,249,196,203,141,54,122,165,25,253,177,55,59,99,57,208,39,66,106,181,
+225,209,168,3,10,144,116,229,224,244,242,23,47,136,197,134,165,183,91,112,149,169,44,124,200,175,175,191,131,47,68,54,89,150,15,126,116,157,129,65,122,188,194,188,78,106,169,65,162,228,95,173,154,156,74,33,165,38,163,240,87,50,48,65,10,102,22,33,78,66,163,145,79,162,194,104,32,116,246,21,178,187,5,74,253,124,79,211,178,138,6,2,38,134,24,204,196,119,70,46,219,202,72,100,50,50,155,5,135,55,155,94,71,16,88,136,164,78,39,73,171,125,35,97,176,240,188,140,204,162,130,191,234,143,134,101,46,117,219,182,130,113,91,174,100,124,52,240,124,10,220,36,224,249,188,221,164,25,141,86,116,189,234,53,133,4,187,23,7,7,139,59,51,21,15,17,214,239,244,253,151,207,110,71,140,249,252,24,18,196,225,54,35,79,239,101,58,125,120,6,18,92,191,115,177,63,113,221,173,88,124,233,166,187,141,57,150,207,1,172,159,79,123,140,220,174,191,209,235,85,180,185,186,108,211,105,78,164,95,175,243,183,90,237,101,52,226,236,2,61,93,185,49,197,60,92,
+156,45,22,123,185,177,110,141,21,190,190,216,94,213,95,43,99,248,103,36,182,39,40,54,86,31,198,9,53,244,248,249,97,251,212,90,117,217,112,113,38,180,39,169,101,85,31,21,143,52,100,104,189,54,18,149,146,236,21,14,29,217,237,5,187,13,1,34,195,207,196,198,163,30,39,77,231,252,224,204,204,173,243,225,73,139,35,202,194,5,56,24,60,30,238,180,204,23,131,195,122,207,231,22,67,82,182,170,204,245,114,138,181,89,194,109,31,142,83,38,128,14,70,17,94,14,69,120,174,100,116,20,252,169,137,230,83,146,221,217,184,249,43,73,231,163,73,10,138,203,203,130,5,58,139,153,138,230,69,0,82,41,70,155,95,119,217,1,227,177,17,68,71,112,185,64,190,254,100,184,177,92,14,100,215,62,248,84,175,91,89,76,126,21,167,11,99,127,11,116,3,129,197,219,55,218,218,194,167,83,207,229,50,254,216,92,86,51,57,148,13,85,78,167,197,92,109,157,58,152,33,2,163,135,154,59,56,70,184,216,106,180,19,235,109,124,117,105,212,178,181,86,43,205,92,155,
+244,105,169,239,5,142,25,254,54,138,141,35,67,88,126,184,49,210,244,252,108,211,103,253,124,107,113,202,66,193,40,53,201,126,195,248,193,174,146,203,125,171,222,88,100,196,24,137,48,0,191,12,50,162,247,120,157,49,49,244,214,97,172,66,171,12,52,181,111,232,53,204,102,227,116,202,128,190,72,108,14,6,139,141,116,162,209,94,40,100,124,25,95,149,76,70,35,22,187,74,57,210,95,164,31,173,24,225,185,175,61,4,124,26,67,185,41,162,155,229,35,213,127,74,125,177,112,96,54,91,150,109,96,19,80,17,189,62,160,49,48,60,78,16,208,127,63,236,72,151,103,22,61,70,79,174,14,1,98,178,172,86,11,99,176,92,94,206,146,201,10,92,12,127,196,3,97,17,60,78,132,134,195,179,122,58,135,131,11,159,207,98,94,230,240,189,214,59,93,236,163,171,43,118,185,0,17,113,221,87,207,106,181,147,209,104,64,9,136,116,229,194,244,138,113,114,178,88,236,228,235,118,43,172,240,181,69,59,251,245,165,40,178,190,114,21,209,104,95,152,96,204,58,93,20,11,
+83,180,112,252,226,84,84,91,22,244,98,164,170,152,165,170,140,170,66,148,138,82,52,20,188,102,13,149,148,102,127,144,18,167,157,65,69,2,255,66,250,188,62,39,199,199,231,178,209,59,59,34,107,117,37,7,81,102,17,163,192,210,164,57,241,35,159,207,34,145,147,9,96,114,24,252,61,130,191,156,163,79,135,176,107,231,20,105,181,217,219,173,50,41,22,45,32,194,169,139,167,94,21,225,193,234,162,35,225,192,159,113,112,250,131,69,64,69,229,178,68,192,192,52,154,64,255,70,176,251,155,12,226,196,8,212,238,195,19,194,243,193,2,115,121,16,243,231,124,60,129,244,111,227,142,237,22,18,242,103,179,236,193,198,208,59,70,113,39,156,255,245,10,247,145,224,197,50,114,58,139,87,60,91,165,138,20,76,6,139,187,203,244,69,173,54,28,24,65,60,60,68,217,191,184,68,184,216,100,36,54,170,109,124,101,73,100,211,180,38,43,205,88,19,91,104,169,240,2,199,248,102,17,197,70,147,147,101,236,48,68,183,103,88,142,54,107,52,97,11,11,81,131,112,179,74,
+81,114,24,214,255,75,241,99,106,118,255,82,252,226,61,68,47,44,65,125,126,103,5,1,197,31,15,72,204,131,222,56,136,213,42,2,136,166,254,203,239,27,66,162,232,95,5,49,81,78,196,47,23,200,55,206,143,193,199,96,48,145,7,239,33,174,86,241,251,61,36,113,56,254,18,248,246,42,84,129,16,188,27,15,34,60,20,209,110,193,58,235,191,190,241,254,235,155,203,12,5,57,129,186,169,84,231,12,215,232,117,254,235,149,33,168,251,171,213,202,24,205,95,243,64,100,178,1,7,190,247,251,6,24,20,143,99,251,187,221,202,135,73,188,28,200,249,12,140,145,239,173,250,135,73,96,205,209,202,96,38,71,179,155,238,233,116,153,171,221,142,6,51,74,48,164,160,28,91,218,16,34,182,42,136,183,94,15,95,158,12,63,2,218,231,1,117,109,55,139,254,47,152,15,108,200,50,90,77,44,251,128,233,114,117,154,34,44,92,46,253,11,230,203,225,254,11,230,227,253,254,23,204,7,165,37,67,164,68,69,67,194,161,195,93,161,65,163,35,64,174,15,3,158,62,28,
+237,66,156,52,227,7,242,97,149,174,211,227,198,252,217,24,92,230,7,9,149,203,130,253,126,183,99,114,184,45,148,213,218,137,39,199,187,58,221,6,115,191,219,29,142,70,217,66,127,29,85,143,16,126,210,198,16,47,21,34,156,21,132,120,151,55,39,37,138,1,169,213,4,4,100,161,211,3,219,124,167,157,246,97,17,33,8,48,62,140,133,124,60,135,7,187,164,211,0,28,28,135,175,132,24,48,28,46,8,143,192,133,127,237,2,233,159,206,33,30,190,82,127,161,151,43,88,99,245,235,72,227,252,217,223,211,137,49,153,171,45,14,102,240,76,32,124,170,145,38,44,67,196,90,5,161,213,243,225,139,19,225,135,86,83,212,209,85,173,16,45,61,12,172,240,111,25,33,11,96,212,154,88,38,70,248,244,120,37,121,168,165,150,255,77,38,227,98,164,146,95,20,14,135,132,28,19,144,83,4,119,215,184,140,130,78,72,133,72,137,132,69,251,47,104,175,67,250,47,104,111,133,254,249,129,218,57,191,216,197,2,17,65,25,25,101,33,147,73,248,56,151,77,46,148,207,
+11,183,91,240,239,100,50,25,72,44,26,59,99,182,198,19,227,49,97,58,253,55,145,7,148,202,66,157,125,59,94,84,133,0,162,18,67,33,62,164,114,153,150,203,129,128,31,208,104,193,158,155,215,102,11,76,103,192,156,63,221,5,121,249,12,187,7,203,227,0,56,0,60,143,15,55,98,56,6,46,20,143,7,150,217,21,183,29,241,81,111,188,85,110,183,209,27,77,104,103,117,222,140,229,8,81,165,115,119,217,191,168,13,99,3,35,138,255,14,65,152,244,248,183,139,88,45,210,144,114,25,124,186,255,106,70,104,157,22,170,45,221,58,70,200,207,72,144,176,83,44,44,176,90,29,248,1,11,21,101,248,209,169,20,148,216,133,9,104,6,57,254,74,81,58,61,124,76,77,10,130,68,74,138,8,78,165,2,74,139,130,75,132,68,122,130,56,5,66,65,129,209,232,128,215,224,179,251,248,28,54,186,181,115,4,170,85,1,59,206,29,152,192,135,27,1,17,69,231,148,1,148,212,111,119,48,63,203,36,95,34,208,237,118,252,254,186,65,175,175,228,201,11,236,2,99,
+181,194,216,236,54,248,235,43,64,215,131,173,84,72,252,161,137,135,220,66,208,159,253,192,99,26,13,192,126,239,39,176,129,102,115,103,15,77,143,50,129,68,2,16,11,124,248,2,240,199,23,251,206,134,112,241,0,193,52,176,193,199,223,92,64,130,251,189,115,182,117,78,101,48,151,11,64,193,172,64,219,135,141,58,123,179,18,32,248,151,123,199,2,193,197,6,35,177,162,249,163,11,32,91,123,55,88,97,154,18,32,18,38,25,216,96,89,222,255,61,193,104,116,48,12,140,9,104,241,127,167,160,154,97,217,25,74,5,89,8,188,48,3,36,169,149,22,5,167,160,254,157,67,195,146,161,52,26,40,55,173,248,69,72,68,4,72,4,40,4,20,216,231,39,128,199,171,243,183,51,19,164,119,118,96,78,26,128,252,193,25,152,64,152,152,241,105,87,6,15,247,235,85,0,149,74,127,56,12,232,28,44,6,19,137,129,97,161,14,103,248,237,238,5,55,155,64,220,135,78,230,243,191,24,187,252,129,124,185,154,54,207,243,167,95,178,183,79,191,236,130,23,189,238,49,30,
+63,1,2,127,149,217,30,183,62,90,242,34,147,1,237,143,233,168,224,187,29,241,36,254,190,32,220,45,215,59,0,172,180,207,247,139,187,179,206,248,92,115,222,217,21,72,227,248,145,113,224,100,125,207,83,190,188,99,26,35,116,118,87,44,55,237,11,1,173,86,219,99,62,127,185,154,235,183,249,90,46,1,138,179,47,91,229,49,50,183,7,205,29,27,251,42,22,125,237,64,167,60,127,58,185,222,182,250,168,215,92,190,102,44,95,109,89,86,62,92,169,212,75,154,211,255,170,47,195,157,239,123,212,158,213,118,41,233,11,25,182,249,236,19,58,242,17,188,10,223,221,64,102,124,63,127,46,249,47,207,174,251,151,103,103,173,103,122,189,43,19,227,227,174,232,242,236,163,160,122,207,18,73,159,177,203,231,127,204,123,226,213,237,190,59,25,129,207,215,206,136,174,111,151,243,177,92,190,104,23,218,59,4,246,201,162,237,119,15,234,3,17,222,192,71,63,194,67,5,30,247,90,149,217,221,3,243,132,252,102,23,236,216,237,126,47,140,17,229,112,129,216,80,40,56,135,
+194,225,243,240,203,187,185,32,60,86,143,193,149,250,88,81,211,24,238,207,26,60,63,140,197,71,36,216,128,64,20,65,255,48,59,82,206,36,111,236,8,44,182,231,126,114,43,75,200,79,84,172,209,18,75,106,67,165,132,48,51,13,76,132,24,72,172,52,165,24,88,208,168,135,59,185,194,34,105,160,86,67,162,33,69,17,8,73,70,52,122,114,18,36,21,254,18,118,14,161,144,76,204,41,133,68,130,166,103,52,218,227,136,112,0,242,27,71,64,32,252,104,230,59,67,118,243,2,196,33,137,131,11,140,200,16,13,45,208,33,28,156,181,128,152,152,207,67,160,155,224,119,250,99,224,195,192,137,194,104,10,98,176,126,34,24,28,110,243,179,192,124,232,112,34,45,151,128,240,222,156,109,103,10,130,50,89,223,34,224,249,141,183,49,236,251,0,98,8,15,94,210,159,94,104,34,241,177,192,214,232,135,25,218,89,162,221,13,89,181,244,235,14,96,177,102,222,221,60,131,13,126,218,156,159,171,143,116,110,185,66,69,165,117,90,46,141,87,171,13,8,186,52,146,186,206,
+225,198,193,181,183,81,216,7,46,213,229,205,203,198,106,180,87,205,170,196,143,244,204,108,96,63,49,48,179,158,106,117,203,11,14,200,63,205,132,79,203,139,183,82,233,225,100,97,51,218,147,178,160,246,14,135,252,220,52,31,255,75,51,204,200,246,26,173,246,42,201,241,195,95,61,50,250,137,70,123,249,196,184,205,208,33,35,36,143,135,119,253,106,217,162,182,113,127,247,228,224,240,248,159,147,177,226,149,97,243,49,249,125,52,122,144,243,121,47,42,98,251,122,255,23,175,119,229,198,7,237,141,97,189,121,255,150,219,235,249,242,8,57,158,239,78,215,115,25,93,122,101,178,246,211,115,95,31,231,237,253,216,203,65,5,31,245,143,231,176,40,32,175,105,44,6,128,135,54,98,241,231,13,95,186,91,143,191,215,95,3,227,225,237,58,216,133,119,249,151,209,243,9,128,71,245,62,60,48,71,155,219,13,8,2,228,106,140,253,211,48,23,103,48,102,128,122,125,255,228,50,208,171,155,175,175,198,12,74,160,161,87,214,190,140,172,89,89,64,197,98,163,67,246,31,111,
+13,57,184,150,214,122,77,160,185,197,110,173,97,213,133,203,206,20,209,21,122,40,168,142,238,232,155,152,94,11,36,117,151,218,195,32,116,228,66,236,137,116,164,110,80,24,243,26,0,104,136,157,95,199,239,47,151,6,39,157,31,246,56,184,244,168,79,209,208,210,131,222,193,41,241,154,193,153,76,191,16,87,121,191,160,153,116,15,223,239,95,38,10,175,9,9,194,99,187,96,240,133,208,230,167,69,221,102,211,126,137,193,91,53,148,109,247,213,61,30,47,243,114,236,178,31,95,160,194,23,60,244,231,67,65,46,183,19,4,135,51,202,104,205,135,59,254,16,95,55,120,62,136,71,55,126,87,139,49,92,160,168,248,90,81,171,213,63,146,121,96,2,255,48,200,73,3,59,155,14,155,221,121,190,184,230,58,240,7,166,37,106,187,127,112,55,28,255,62,84,130,145,69,244,181,186,30,12,252,59,159,25,185,184,252,204,72,141,82,5,217,206,236,75,214,200,125,252,10,35,135,180,40,41,140,6,46,49,136,119,166,72,114,210,136,228,64,200,232,143,191,254,142,74,130,144,
+224,183,192,223,189,60,22,47,94,127,235,50,56,28,152,84,196,158,230,96,126,162,21,13,6,158,8,79,14,139,17,76,44,206,26,84,84,241,47,216,144,72,44,30,28,54,140,29,138,15,22,23,198,131,205,9,223,238,198,214,169,165,145,195,231,139,240,186,86,55,210,104,26,227,139,168,214,70,84,42,131,117,156,49,196,240,94,6,179,231,123,126,228,65,8,116,195,225,157,55,255,98,248,240,28,126,177,186,97,155,31,67,4,254,165,92,22,235,187,237,243,130,171,50,122,0,240,113,0,209,180,254,143,230,220,182,249,220,191,58,215,22,133,206,242,103,254,5,250,92,243,220,10,38,39,230,27,203,173,92,6,6,58,242,226,220,227,228,254,206,182,158,15,230,177,81,245,163,4,166,38,93,238,5,165,168,242,160,160,101,157,248,156,28,116,166,9,117,150,122,147,146,244,149,197,119,179,113,64,133,91,194,204,175,203,208,161,34,220,187,135,247,252,106,165,250,187,171,163,161,135,247,185,25,238,209,84,109,209,82,211,84,231,50,61,172,191,213,24,122,116,159,83,182,118,168,
+136,203,49,229,50,202,27,28,246,154,24,172,201,127,97,136,113,151,161,253,23,134,72,138,183,182,171,213,58,6,183,105,51,63,245,198,98,57,217,220,75,165,155,90,229,206,16,121,87,53,98,219,246,150,74,3,33,129,151,169,63,63,216,254,64,251,212,95,44,0,20,104,189,14,248,96,251,83,6,130,19,98,111,248,167,7,187,129,211,233,131,53,250,251,116,113,234,152,175,165,210,250,195,237,198,10,160,234,89,24,153,128,236,164,58,105,66,97,224,152,254,124,157,28,252,234,163,70,131,184,88,88,130,210,189,0,83,101,118,166,95,149,199,132,130,198,116,231,248,0,205,147,74,241,5,148,36,73,194,87,22,213,198,225,138,8,243,132,191,102,131,176,67,68,184,31,222,241,234,213,10,245,175,159,70,118,55,116,240,208,246,123,152,190,85,22,120,242,148,208,53,184,15,206,241,136,25,53,123,150,194,156,135,68,65,141,119,57,179,209,209,101,178,247,24,220,237,18,141,186,67,33,94,224,18,200,188,125,114,91,249,157,207,247,167,179,157,5,104,187,215,234,158,159,159,62,
+239,118,203,252,96,199,63,69,117,6,239,187,121,207,247,21,90,248,170,199,152,31,212,7,159,83,87,229,51,29,125,36,173,242,83,3,253,209,121,195,160,163,111,156,192,16,208,109,181,54,254,222,106,8,220,202,190,47,177,149,189,214,223,219,178,127,252,241,193,71,208,58,199,226,101,105,0,120,90,218,252,11,168,45,121,76,189,210,108,2,168,45,75,74,63,122,103,170,43,15,106,202,108,229,224,196,7,43,105,77,106,251,75,166,105,8,122,198,74,227,128,14,123,87,194,95,143,161,67,75,34,26,15,239,253,213,242,253,244,29,227,81,163,113,214,177,67,219,76,218,201,172,46,108,232,225,200,244,211,196,192,216,233,115,126,52,89,77,167,54,234,236,41,251,109,144,201,43,100,26,121,174,48,238,135,2,228,243,164,60,222,233,127,116,189,197,142,187,81,240,37,246,54,89,103,54,121,145,44,242,4,35,101,49,210,108,242,0,102,102,102,102,187,205,109,106,51,51,51,51,51,179,199,191,255,140,52,201,72,145,37,187,173,239,235,214,61,183,170,78,157,99,185,235,226,121,
+56,199,227,209,122,189,158,107,82,172,213,90,173,185,203,163,245,215,222,168,243,155,88,236,218,225,184,172,79,191,143,81,226,82,56,200,215,95,166,195,227,183,95,123,5,113,184,176,154,245,10,152,74,1,4,96,239,8,148,150,111,109,1,239,63,2,143,172,56,223,48,3,127,127,187,131,95,17,13,173,103,3,209,49,8,235,139,151,10,249,101,0,218,248,163,67,84,84,67,213,106,69,56,15,46,206,139,82,63,29,77,7,230,145,42,138,23,160,141,140,140,199,25,242,68,141,3,131,32,84,40,48,237,139,84,36,160,208,75,104,85,189,80,16,5,155,137,76,38,57,30,126,193,101,7,236,77,74,0,224,251,190,181,176,71,64,67,86,70,30,233,179,24,7,151,203,244,205,204,211,227,157,37,205,102,149,122,229,215,248,114,25,94,93,36,156,205,229,40,73,94,248,107,112,125,190,35,166,11,88,45,2,49,9,219,44,135,175,230,254,63,139,35,91,46,127,133,250,117,53,245,46,230,217,138,73,151,163,235,178,242,204,42,183,241,188,250,136,15,249,100,248,58,39,175,27,
+156,250,239,56,193,255,129,19,126,110,255,233,107,222,58,75,255,174,3,67,32,70,202,11,24,130,194,226,106,43,164,193,192,4,223,54,133,91,229,230,190,56,74,148,219,3,126,89,57,165,119,159,55,138,138,32,40,136,136,78,0,147,48,205,143,80,146,87,18,162,4,3,3,80,107,66,68,68,17,37,250,245,191,8,47,224,186,125,14,223,188,222,142,128,181,219,33,95,218,226,16,134,103,90,207,68,164,121,209,61,35,17,6,22,210,11,68,38,243,219,249,197,50,57,81,69,21,102,193,4,165,114,184,39,49,157,252,72,56,76,200,229,188,195,33,132,201,11,195,172,48,2,16,40,241,240,7,179,85,232,126,39,104,97,90,137,24,60,91,4,150,245,58,65,38,147,184,207,60,229,63,62,35,72,232,58,130,60,67,64,97,252,207,39,255,27,219,9,100,80,248,18,245,189,237,208,255,227,229,50,252,43,198,80,26,90,87,242,101,41,36,3,219,21,157,74,189,111,230,242,102,255,163,94,235,128,175,203,47,225,168,89,148,70,247,71,137,11,150,89,128,189,41,36,3,127,
+165,210,175,84,37,68,161,128,234,178,250,133,8,36,6,20,71,141,6,176,1,122,125,147,191,241,132,193,117,242,24,236,195,54,102,199,225,34,134,191,197,190,107,226,106,104,224,88,244,168,103,0,210,151,100,47,105,155,154,225,212,249,191,239,18,23,10,184,88,58,22,9,66,6,207,38,197,96,25,11,200,92,241,89,140,235,245,34,93,193,115,208,245,230,58,155,233,106,117,58,30,109,142,63,30,151,203,197,157,207,145,247,66,45,182,215,114,85,235,84,161,62,20,139,182,134,74,197,201,240,255,120,54,231,238,121,72,209,3,147,231,229,95,5,191,1,51,11,187,218,0,151,89,223,230,3,168,97,146,12,89,247,95,195,237,82,254,129,252,98,212,169,127,117,154,47,70,182,162,228,149,26,117,58,63,88,74,82,80,206,118,209,183,58,191,60,172,77,81,65,200,160,150,6,150,134,66,127,81,8,196,15,127,248,65,45,1,224,121,115,191,222,237,244,0,168,180,219,255,232,139,201,246,179,52,153,0,41,139,169,90,61,203,10,233,110,213,53,59,62,146,24,110,88,6,46,
+20,206,170,82,154,47,172,202,101,75,50,249,239,188,219,61,170,140,23,233,88,76,203,26,145,112,103,25,8,156,125,190,199,199,11,112,121,58,237,198,115,33,39,46,91,173,243,46,157,126,68,224,174,159,72,170,157,239,111,230,198,161,213,92,93,44,86,165,71,233,92,209,45,51,188,84,237,115,245,181,99,8,236,167,78,132,251,171,63,4,90,247,63,34,200,252,22,227,111,178,11,224,220,93,217,25,160,140,150,148,203,26,53,75,29,78,14,74,106,96,28,74,3,255,171,71,10,74,96,160,55,70,70,189,25,34,149,228,213,65,80,176,111,210,219,166,84,36,32,219,157,182,170,0,16,144,154,202,192,15,135,50,47,19,117,88,225,182,166,26,30,30,140,146,245,201,228,167,189,180,80,67,70,35,243,3,240,233,243,179,50,243,200,84,99,199,92,158,133,148,87,150,81,33,199,111,20,42,147,255,144,201,101,215,110,183,152,42,168,201,139,5,135,169,254,143,185,107,62,223,226,227,241,252,234,50,245,198,34,178,154,25,206,151,198,159,201,161,225,114,203,22,203,215,30,168,
+127,237,181,250,171,58,253,209,89,203,69,78,181,227,177,184,159,179,255,152,163,118,233,52,116,158,247,61,33,124,31,182,95,85,222,123,154,75,250,82,247,27,65,119,18,248,213,76,63,213,26,144,193,194,102,255,1,132,211,254,59,64,148,128,14,102,98,52,63,121,166,52,47,32,2,12,0,134,70,203,10,137,4,52,10,8,10,21,123,1,95,253,160,247,108,134,59,190,183,201,33,126,251,55,19,183,59,151,163,99,48,140,150,136,14,89,76,140,200,43,103,79,198,24,179,140,197,224,89,242,202,112,31,21,178,253,142,56,156,173,57,253,111,144,23,54,57,24,132,115,57,49,19,176,228,48,13,56,60,251,3,135,97,192,224,48,240,10,28,124,60,6,93,166,27,21,49,31,119,76,43,210,10,167,211,131,8,156,111,248,73,85,235,243,101,119,109,177,88,88,139,5,31,251,251,27,158,207,7,235,18,117,23,66,15,10,31,249,191,193,73,84,200,224,250,239,3,46,200,186,129,47,252,35,152,108,254,219,55,90,178,60,80,58,26,9,254,17,12,56,58,242,202,190,222,216,
+235,85,65,73,72,2,218,228,235,139,8,223,184,121,17,52,218,17,4,236,122,14,190,167,19,23,1,115,14,7,192,191,17,52,136,238,185,28,25,131,105,160,68,100,8,130,5,34,19,57,152,201,228,98,101,38,54,15,86,84,225,252,177,92,42,53,147,201,125,224,32,100,253,108,90,45,55,25,155,91,34,198,28,92,34,177,181,213,175,167,209,168,213,166,96,51,178,157,255,49,87,102,231,114,144,98,149,130,88,190,152,231,79,231,185,67,239,56,174,86,142,114,185,217,58,152,180,202,88,229,147,21,168,255,141,84,104,77,219,158,178,235,169,188,63,222,205,203,81,185,94,237,6,95,243,247,25,201,8,31,247,151,112,179,192,207,78,245,181,185,48,73,124,196,244,3,135,251,176,128,76,253,249,1,42,189,148,168,196,171,129,161,129,104,175,4,228,23,86,183,255,178,177,123,240,189,158,206,238,238,27,171,1,235,27,44,28,131,203,129,254,27,204,1,74,70,100,44,31,224,232,96,64,153,185,194,180,123,175,195,82,82,149,146,162,255,141,72,121,156,98,38,9,224,238,118,
+167,42,227,126,172,22,83,50,48,145,120,2,111,245,247,105,212,101,219,41,120,140,236,229,162,230,63,238,69,151,107,78,114,199,90,5,241,122,93,30,254,199,180,141,226,42,178,154,91,44,167,133,250,207,97,175,181,138,146,53,103,154,173,148,148,139,69,167,84,42,205,85,170,211,47,154,62,159,100,138,25,48,79,193,119,229,43,164,70,191,83,252,42,38,84,58,67,78,36,134,70,189,210,92,148,125,169,3,194,70,132,70,232,47,22,6,200,223,171,249,65,4,51,2,192,199,143,39,192,31,60,124,60,6,208,209,2,27,231,43,163,171,75,165,183,175,100,36,189,93,6,192,193,77,38,21,83,134,89,239,250,17,228,129,43,40,72,38,163,144,201,130,110,223,111,112,107,25,24,54,88,44,70,25,107,12,131,17,4,131,83,3,231,0,202,231,11,121,1,108,145,135,127,60,41,239,182,7,85,66,18,201,35,252,92,235,103,58,207,31,1,103,149,195,65,89,173,6,168,114,57,148,64,139,184,255,72,83,49,157,194,178,197,146,114,190,160,110,74,37,148,74,21,74,100,232,
+168,73,134,154,225,155,85,239,171,111,215,186,116,80,157,215,250,91,112,130,209,183,224,132,212,40,59,30,236,235,109,85,25,230,219,179,245,203,30,176,139,128,140,158,110,6,191,10,119,182,107,77,78,23,178,7,194,193,95,92,68,54,182,170,241,14,65,152,175,184,159,117,199,48,95,246,27,21,86,86,57,2,248,137,233,20,48,6,136,233,13,66,46,31,142,25,12,242,223,110,38,179,37,34,97,239,86,127,4,76,17,24,92,28,14,235,72,94,47,193,151,33,152,13,181,148,40,113,185,6,255,254,201,186,66,55,99,77,133,122,78,184,218,68,232,150,223,88,163,33,197,252,252,228,199,227,89,1,78,54,27,114,245,142,174,243,163,38,151,203,113,117,65,45,45,149,242,21,93,78,162,107,71,249,46,114,214,125,19,189,158,213,251,103,101,205,119,222,231,4,72,248,158,253,67,20,121,154,161,80,1,129,242,216,221,70,223,82,137,208,212,108,182,122,176,7,26,254,161,72,84,151,39,111,159,250,85,176,62,198,191,228,98,2,205,180,122,237,104,254,198,227,245,47,30,222,
+161,228,186,237,131,48,120,176,33,107,208,59,80,209,97,15,24,69,48,120,176,64,32,224,247,249,244,122,193,210,176,129,191,94,254,118,187,47,68,66,238,119,72,11,222,242,107,181,189,137,188,49,157,18,44,86,116,195,83,135,252,252,248,105,180,102,239,96,210,43,99,213,94,85,177,156,18,202,149,40,122,177,128,254,254,250,119,243,121,175,68,221,150,202,234,30,154,238,159,100,164,144,12,31,245,165,252,206,117,74,220,178,55,144,101,231,117,26,17,160,168,224,215,156,89,173,149,47,61,211,118,182,145,201,116,0,164,180,3,67,156,225,248,230,18,37,55,27,13,191,109,41,172,102,243,166,223,106,23,100,227,50,235,191,197,51,24,128,193,96,208,93,98,48,184,43,200,200,196,96,0,61,111,239,219,12,96,112,223,202,11,208,253,203,36,50,176,221,230,125,151,254,188,95,91,45,129,26,29,168,212,144,14,199,117,117,89,125,149,111,182,30,31,46,102,189,95,235,129,229,98,93,177,88,39,12,102,107,191,92,58,45,174,194,107,36,212,202,94,169,146,58,180,61,227,82,
+105,167,109,187,135,174,171,239,177,57,99,190,52,176,137,189,201,237,65,196,185,113,255,14,94,175,95,29,137,96,82,254,179,151,161,161,157,102,96,240,191,235,237,154,76,35,243,119,175,231,223,205,78,40,40,70,188,82,105,140,125,115,6,144,179,184,219,22,11,12,17,142,0,153,77,139,145,247,205,126,95,150,192,232,114,52,108,6,224,245,98,11,116,248,227,25,68,178,34,75,5,176,227,207,135,169,208,167,203,225,233,248,7,56,159,179,229,240,92,191,130,254,252,104,190,37,87,46,144,191,23,126,113,102,253,124,81,59,157,6,154,122,61,91,8,168,78,218,177,235,157,82,169,230,125,215,51,118,223,129,26,167,167,125,81,51,149,35,5,185,70,158,169,118,238,159,204,253,136,56,165,222,86,77,231,195,59,85,44,159,215,136,64,68,57,113,20,208,61,146,83,140,36,133,2,63,149,166,165,222,73,10,22,79,199,98,61,84,44,142,70,140,141,24,98,241,40,16,24,5,146,129,17,24,220,237,10,58,26,143,71,243,93,170,253,187,86,229,215,130,46,143,23,176,86,155,
+173,1,190,187,235,125,252,77,157,11,240,207,143,64,10,197,152,173,96,153,108,62,184,138,167,83,65,185,2,238,57,28,243,213,143,66,217,19,150,43,133,142,71,102,46,151,128,21,157,66,199,232,228,59,78,129,251,227,76,191,206,152,251,81,137,62,197,200,115,188,39,27,228,123,100,238,123,240,133,61,55,230,149,78,225,51,122,52,230,155,247,65,14,131,63,31,57,1,36,199,254,170,6,194,231,44,6,137,249,88,252,199,98,182,21,45,182,107,205,235,133,212,62,159,201,235,53,2,187,92,35,73,190,150,1,100,106,151,75,173,82,1,212,38,147,90,36,82,3,124,215,184,80,47,86,219,239,118,142,82,41,129,65,137,52,91,64,48,216,183,67,224,231,243,175,81,252,174,17,88,42,13,3,21,157,175,68,189,158,172,168,231,94,122,11,161,27,219,167,253,86,51,237,177,120,15,137,239,134,102,62,60,130,231,195,123,94,203,134,91,78,188,191,116,62,68,207,13,246,60,85,60,195,206,11,247,44,85,58,67,207,93,237,113,117,219,157,39,255,213,34,172,111,255,210,228,
+24,57,181,142,207,114,235,245,153,125,230,119,141,233,96,194,225,113,95,53,225,89,44,62,15,205,239,201,68,163,125,140,227,113,134,197,138,15,89,236,196,247,101,206,95,36,230,243,248,124,225,251,190,120,79,167,218,103,81,17,168,84,203,146,76,189,221,75,175,59,16,194,249,193,241,92,96,15,242,29,189,223,41,206,219,19,244,190,2,143,175,75,71,18,193,251,196,17,73,97,227,22,191,30,63,51,31,123,19,237,124,82,247,198,107,19,243,188,126,102,13,181,46,234,185,97,103,97,221,103,159,9,60,79,169,140,251,205,165,17,252,231,234,119,99,159,142,184,250,34,23,190,211,232,204,7,143,119,162,158,161,143,86,29,212,189,129,111,75,38,200,183,92,225,144,215,249,55,200,87,7,59,158,213,220,227,213,9,223,68,191,240,173,161,190,177,59,23,30,179,155,168,182,11,37,226,243,68,123,42,149,171,71,26,240,220,63,107,219,7,156,123,40,229,255,235,25,142,255,243,228,198,255,231,191,254,215,255,242,191,156,214,248,127,254,199,197,255,250,255,62,138,242,127,254,254,
+255,247,214,255,235,255,254,207,255,249,191,252,255,158,236,248,159,254,183,255,227,63,253,239,32,48,16,176,250,119,178,35,249,191,159,236,184,225,44,157,183,66,227,98,117,109,58,159,238,155,250,184,192,31,27,142,189,208,107,204,28,242,84,195,124,216,5,215,123,150,205,208,98,203,112,43,77,187,63,191,254,251,246,103,31,138,172,194,116,85,216,64,48,237,130,97,201,254,185,20,211,140,233,104,47,8,248,128,16,8,245,28,136,208,37,248,17,66,225,209,166,185,255,93,56,246,142,37,191,42,154,87,153,203,216,232,132,247,32,247,169,248,50,123,61,159,109,221,106,116,187,219,233,230,245,39,113,191,193,95,69,79,172,240,242,225,223,91,252,135,199,248,120,222,55,53,253,177,245,40,174,139,202,135,180,120,210,161,31,47,202,240,110,224,63,94,63,254,247,77,122,202,37,221,134,202,115,240,60,201,111,67,241,123,209,191,4,238,122,61,15,24,250,113,250,211,169,167,30,202,63,109,153,3,109,123,58,146,131,177,207,33,130,31,189,245,184,24,62,254,32,142,189,55,87,62,
+138,242,145,119,85,30,35,225,193,197,226,103,223,191,253,126,157,246,134,91,143,168,163,236,250,28,169,71,215,27,193,218,178,91,156,102,105,175,134,205,5,190,113,175,89,162,45,75,207,130,53,166,210,179,50,178,205,237,163,81,250,202,248,90,75,100,78,84,231,180,11,45,124,4,202,17,63,234,227,55,161,58,246,174,183,73,250,62,35,231,186,112,19,162,233,52,222,118,47,182,56,199,230,133,93,87,218,177,29,192,246,178,255,64,111,78,30,189,24,205,117,45,57,142,238,132,224,33,27,11,226,112,122,119,78,27,3,200,88,99,110,89,92,15,86,90,103,122,75,69,203,26,83,67,227,92,14,164,26,184,238,249,218,96,249,196,39,178,65,64,226,63,79,43,202,253,134,76,110,57,185,164,29,237,77,172,187,91,9,214,240,244,79,119,103,91,209,183,74,151,116,77,119,197,106,207,186,208,74,161,189,24,92,228,206,199,189,218,200,180,125,171,54,191,247,202,181,233,63,166,138,175,173,60,39,95,166,7,236,98,94,178,12,3,46,120,195,174,206,54,61,235,193,217,155,156,
+80,80,139,118,175,182,122,206,141,62,116,244,158,109,68,129,160,213,200,123,28,134,98,247,147,171,184,222,87,3,110,15,142,116,94,223,80,143,211,95,102,59,39,188,240,57,121,30,238,33,103,224,198,61,190,216,219,15,245,85,240,85,214,147,171,13,154,113,84,43,224,208,187,141,195,108,187,68,4,56,143,139,218,244,135,52,48,134,83,84,117,225,49,31,150,57,62,53,134,73,64,204,103,212,254,98,153,245,223,198,113,107,212,66,56,107,131,126,109,217,19,101,190,231,120,232,243,187,157,179,194,243,139,30,127,158,252,237,243,202,150,229,183,167,203,7,207,111,115,187,210,129,115,79,75,118,58,125,236,240,44,105,236,31,143,101,124,156,97,4,220,138,161,56,239,6,42,187,31,44,156,109,27,20,147,147,21,103,61,140,70,241,145,135,221,17,77,25,136,56,236,46,153,78,26,160,17,153,205,145,74,229,152,184,228,254,138,235,101,48,28,227,46,27,47,190,217,124,219,117,10,92,226,105,181,65,143,78,239,116,30,85,131,159,173,166,62,239,216,74,249,166,236,36,241,239,
+52,77,116,94,183,133,215,173,85,212,149,47,54,15,244,251,74,211,234,92,25,90,192,121,238,144,86,147,218,77,186,25,182,39,23,174,219,150,225,70,236,203,204,164,107,48,193,227,246,102,40,231,128,226,190,33,67,203,29,56,91,45,164,108,167,241,144,237,29,1,81,34,141,81,146,44,202,144,248,66,206,217,175,252,151,147,223,145,242,25,36,153,223,176,25,221,153,220,31,156,203,225,236,119,217,212,91,234,150,181,199,96,234,249,113,43,91,189,105,65,35,224,140,88,124,52,132,46,244,113,106,47,65,143,206,123,183,60,175,109,229,245,254,87,122,147,61,111,226,143,174,179,143,55,156,103,67,3,142,223,254,65,206,173,174,125,83,114,59,67,238,163,6,55,222,213,192,56,167,178,95,69,242,61,189,161,12,43,95,196,166,227,228,150,61,249,179,87,2,183,248,59,141,39,217,252,125,16,3,185,39,81,37,42,99,140,35,203,5,110,53,118,58,179,75,71,107,166,249,68,35,169,218,86,221,209,16,196,215,237,147,1,13,81,199,191,217,166,147,123,7,128,175,84,255,210,
+45,173,222,131,214,191,200,137,74,151,42,210,145,110,239,71,21,81,189,129,119,147,222,67,42,56,243,62,143,116,155,127,104,39,156,157,63,108,199,21,107,252,89,171,118,126,43,82,123,168,105,120,173,201,3,205,32,54,7,27,120,208,217,137,68,248,66,72,66,217,53,100,164,195,47,103,51,156,161,105,90,243,193,128,54,38,92,77,94,119,79,8,198,242,164,161,36,69,192,152,99,36,148,228,55,182,172,107,23,182,101,151,116,64,126,111,76,30,160,13,238,33,157,182,219,6,102,89,15,89,72,112,170,127,189,170,10,94,185,154,197,209,55,129,191,210,95,12,228,86,238,236,103,47,41,235,193,96,228,247,140,117,47,207,231,231,167,91,247,63,175,60,229,245,189,219,127,206,5,119,203,15,12,126,122,29,156,251,14,199,225,207,198,73,193,237,176,198,222,7,206,157,36,182,89,109,111,58,153,41,249,25,238,101,128,3,62,38,123,250,161,115,109,233,64,183,51,37,22,237,113,143,254,101,47,94,77,182,100,124,131,12,13,249,161,36,170,136,230,72,198,20,138,13,27,214,
+72,167,166,9,182,79,37,75,234,202,210,41,177,219,156,94,105,104,170,189,70,143,251,116,4,192,244,32,129,105,152,189,226,78,19,245,112,209,82,141,223,19,151,194,59,206,69,228,66,62,208,44,13,9,242,72,183,153,207,223,150,214,159,224,130,240,13,29,13,170,50,223,120,100,196,211,61,90,210,235,9,251,96,181,91,216,98,254,96,95,115,227,120,189,2,11,130,107,118,175,165,180,189,37,18,114,77,53,9,201,61,244,11,233,241,24,88,213,141,255,84,216,177,230,90,40,229,46,90,205,203,116,52,6,88,97,182,172,84,90,10,207,33,74,90,65,162,138,114,133,165,112,66,133,107,192,214,204,149,109,214,11,59,43,43,174,68,67,112,70,75,86,99,133,22,173,143,243,40,61,189,28,107,14,150,14,47,82,152,94,109,159,100,149,120,171,92,14,14,129,173,229,76,190,179,79,171,153,102,53,56,209,53,79,58,223,195,85,27,89,124,159,155,142,234,235,62,192,14,218,211,247,47,158,187,54,109,210,25,53,219,233,224,51,233,247,165,185,99,87,112,135,227,247,134,82,
+61,41,111,123,176,131,152,188,118,188,181,243,117,232,158,189,158,222,83,43,11,188,45,23,252,41,231,255,116,246,86,138,251,94,227,102,36,139,191,206,152,13,12,18,117,180,66,210,202,138,173,192,93,51,187,231,55,24,9,211,190,24,225,196,220,70,58,223,106,238,155,135,1,114,145,144,60,54,182,249,36,1,160,131,139,77,12,145,49,94,66,102,16,133,188,103,203,5,174,65,28,233,205,56,185,230,144,142,116,75,123,87,208,187,23,106,131,254,160,159,223,125,62,70,224,158,14,9,164,91,213,61,100,188,17,58,236,108,79,242,116,165,61,72,224,99,117,113,70,26,104,58,227,244,167,220,198,247,214,14,28,249,139,20,100,55,157,9,65,94,86,225,109,87,68,142,82,218,84,116,203,88,151,149,109,59,80,204,231,191,60,127,167,163,99,128,189,53,126,215,137,203,48,173,36,210,40,139,230,137,156,223,0,141,166,177,27,151,216,33,203,182,233,185,145,88,12,252,66,139,118,100,146,84,128,171,179,190,176,205,122,47,172,82,46,204,205,198,36,206,144,96,37,218,53,9,
+49,65,202,92,250,27,8,43,134,224,222,196,102,166,14,215,184,23,145,120,154,246,9,228,219,180,230,231,233,98,79,217,213,90,185,31,232,4,28,190,101,233,3,254,211,229,247,147,210,218,19,155,127,26,205,122,32,133,183,165,119,128,5,60,102,79,239,126,11,77,87,128,62,145,218,159,192,68,197,254,132,162,213,51,201,228,224,106,224,217,33,9,109,39,255,35,153,29,121,118,116,90,27,189,225,204,214,240,52,34,186,162,21,241,16,195,36,154,210,90,80,83,186,179,207,247,191,195,121,180,80,34,47,36,17,127,122,233,236,212,98,103,210,40,45,42,164,94,82,35,141,16,235,8,87,212,63,96,56,15,110,98,118,47,176,114,136,168,136,154,48,180,113,201,147,239,97,91,165,181,140,55,157,25,94,160,235,201,239,53,192,151,21,198,185,49,94,85,104,93,163,127,229,119,116,147,169,11,141,239,48,65,213,4,244,45,103,122,164,7,245,230,98,37,239,30,235,213,92,250,34,231,221,163,117,58,183,230,116,207,32,37,124,98,59,65,173,218,93,235,149,32,145,237,103,54,
+119,193,108,38,123,103,160,243,194,39,191,33,152,57,126,93,33,151,146,103,182,219,158,137,174,122,62,0,8,15,191,42,164,153,240,239,27,114,43,12,213,138,2,67,232,77,248,56,183,245,183,64,135,141,152,9,191,203,250,2,80,158,102,65,90,8,35,9,11,126,168,241,92,192,67,13,241,91,159,45,189,85,220,20,55,135,142,166,248,46,21,18,19,203,167,111,202,241,249,32,32,121,213,21,55,197,229,154,143,63,223,214,53,61,145,95,238,164,28,91,122,70,239,207,27,15,78,11,173,238,111,51,31,241,58,31,252,59,14,38,255,12,215,242,9,119,15,111,79,212,175,33,95,116,90,48,152,114,251,71,183,30,114,38,237,80,158,156,142,254,197,91,148,117,103,48,44,183,242,38,251,195,4,56,70,134,20,66,109,235,59,255,216,177,67,203,102,171,7,59,181,251,135,69,65,216,78,33,126,67,31,21,81,230,179,18,73,178,154,50,192,250,220,80,248,142,194,82,106,10,22,91,158,77,11,201,17,237,25,213,28,234,136,214,36,49,64,221,87,98,53,113,245,47,58,70,
+96,176,121,191,213,206,150,82,215,198,10,211,31,46,249,99,154,99,103,184,114,170,63,241,90,60,246,140,108,121,126,188,9,31,186,212,174,112,67,228,188,108,24,222,148,194,225,114,208,5,211,198,32,133,239,54,65,117,123,205,84,141,183,20,182,184,55,116,67,246,224,157,25,108,244,47,29,40,56,109,219,192,90,100,167,95,231,52,84,45,54,108,9,76,236,175,242,180,209,211,119,129,133,121,27,210,136,45,125,56,77,197,207,163,139,178,204,131,141,112,41,231,121,182,152,217,17,240,210,6,37,170,96,10,142,40,125,158,58,50,81,82,249,164,37,194,4,26,77,82,68,57,190,162,216,20,181,69,119,39,10,241,80,78,20,229,126,29,202,61,222,123,155,0,95,12,33,177,1,142,192,148,130,243,200,82,91,72,138,95,97,194,254,16,84,65,52,253,124,54,98,131,73,200,171,142,2,238,97,106,62,182,238,6,254,197,29,91,7,53,62,106,23,218,160,65,153,254,243,138,163,56,173,158,63,169,46,111,228,146,46,245,235,211,141,191,228,158,65,102,40,162,116,164,122,182,
+26,239,229,19,39,40,182,166,212,3,117,126,245,143,51,5,54,239,55,187,96,73,86,179,15,233,132,195,129,1,207,68,213,66,157,0,232,151,83,126,11,185,102,40,198,151,146,226,74,152,146,47,109,166,201,4,40,53,174,42,22,167,127,138,98,78,41,207,7,229,80,40,234,166,90,58,155,187,252,90,212,76,213,218,36,105,130,162,201,58,235,241,28,11,186,160,64,50,209,70,215,39,179,19,226,88,230,178,61,16,99,79,217,85,121,99,164,249,13,243,82,89,107,122,66,21,137,201,142,63,222,217,222,104,126,175,26,121,62,214,213,182,207,204,13,168,63,201,215,225,210,151,254,21,6,129,78,220,119,248,248,76,125,52,117,147,223,181,31,60,103,134,252,162,80,62,225,219,46,158,46,208,206,184,60,154,34,201,105,247,212,72,69,233,14,197,114,92,84,225,118,228,151,64,154,253,33,250,240,98,193,145,33,53,159,245,5,123,63,161,148,115,45,189,152,201,198,117,252,161,220,51,36,249,184,20,163,194,33,85,114,69,57,103,18,5,82,154,223,67,145,97,80,26,10,3,
+105,56,12,254,5,207,233,165,181,170,65,87,52,101,254,136,61,193,55,2,164,62,30,60,172,104,11,244,126,31,133,224,188,122,205,240,40,77,215,123,104,228,100,103,224,213,165,189,23,87,109,159,149,242,31,128,161,131,134,204,9,239,56,141,73,117,119,233,189,249,131,77,238,224,65,174,209,44,79,57,92,192,186,158,6,247,147,17,162,56,241,158,249,103,30,90,109,20,55,54,171,227,42,46,197,119,147,138,137,47,156,88,170,67,145,213,22,24,145,168,133,211,106,247,145,139,241,77,126,124,198,231,147,113,183,8,39,161,247,225,20,106,54,91,13,246,152,161,18,5,90,44,212,147,55,118,166,196,203,213,18,37,64,73,30,40,98,242,106,121,90,230,227,146,238,191,39,86,148,117,52,79,103,250,92,188,43,236,241,238,240,211,30,93,252,201,79,132,229,112,2,139,159,123,74,106,75,81,187,27,114,247,122,161,148,24,183,40,97,126,159,8,186,116,15,197,244,94,182,2,49,213,254,34,189,121,171,156,175,185,125,165,252,111,51,102,211,118,207,78,248,203,124,136,24,246,
+79,216,140,15,115,77,67,237,240,131,61,126,135,106,199,14,245,55,212,94,148,80,248,93,97,235,252,136,179,87,52,171,35,223,109,229,216,199,244,10,129,213,3,69,190,252,109,62,69,38,138,63,111,139,244,27,169,40,92,190,148,170,68,152,21,39,89,106,104,116,197,81,241,138,232,36,22,22,199,209,138,87,50,214,37,199,23,138,141,64,244,128,198,113,170,63,229,44,37,94,19,238,68,86,152,54,229,8,118,40,25,149,145,50,153,51,121,103,164,96,34,142,77,169,50,171,183,50,255,205,246,185,33,86,182,67,134,71,172,114,72,209,145,106,189,41,2,116,78,160,178,139,203,60,137,39,165,240,76,181,96,105,72,236,61,203,124,189,143,22,16,160,63,48,183,204,236,84,94,215,250,235,0,11,149,112,232,122,238,44,112,103,29,118,24,56,158,241,128,212,92,211,243,76,244,230,142,116,140,231,106,205,196,84,209,220,157,77,152,70,241,38,157,250,240,29,79,88,234,109,209,239,200,197,123,7,11,25,206,237,142,145,203,167,238,122,226,0,101,145,166,142,126,120,128,101,
+109,10,132,105,56,0,59,213,138,19,92,246,66,168,131,230,40,151,82,43,115,80,226,251,167,74,165,80,72,85,200,221,188,60,255,83,46,132,180,30,32,44,100,133,103,38,218,161,232,67,147,104,162,223,31,86,253,100,102,154,167,166,220,88,152,10,195,217,224,50,180,78,159,121,118,217,254,72,137,31,19,60,41,32,171,50,173,26,228,218,228,10,50,87,48,74,89,159,153,19,85,194,216,33,8,10,73,35,212,175,8,15,156,170,161,69,77,213,120,224,197,174,224,176,156,138,94,110,248,56,128,137,26,70,158,229,215,3,23,101,29,159,245,52,224,243,31,153,197,176,163,21,134,29,3,155,254,152,81,197,238,96,198,135,79,204,170,254,200,217,209,86,75,95,129,239,125,239,15,229,76,54,115,133,171,50,186,78,154,186,194,139,42,182,190,41,144,194,137,249,139,55,62,152,233,227,190,147,133,154,170,68,187,169,1,59,42,122,132,90,19,169,62,159,207,149,43,157,76,139,133,105,89,119,203,140,182,61,66,104,6,86,61,50,99,75,90,161,89,4,195,53,29,211,185,242,
+76,82,72,78,156,92,243,217,193,61,58,166,91,116,193,16,124,24,87,106,143,89,155,55,134,11,39,3,43,96,94,101,245,177,121,139,82,87,140,77,164,20,86,14,73,84,63,201,99,157,168,134,106,134,6,50,7,109,101,103,94,180,86,161,106,195,14,96,150,225,162,74,210,191,128,189,41,230,32,103,186,226,201,60,80,230,9,222,180,168,195,10,179,233,45,35,157,29,19,244,120,34,224,160,218,164,145,189,36,142,159,59,186,181,41,252,210,181,181,215,145,43,91,64,50,139,55,117,130,116,254,37,27,38,245,177,45,48,81,237,105,179,99,93,32,166,138,15,237,234,102,118,137,228,63,140,50,169,30,159,145,149,221,25,53,245,107,174,148,114,85,111,160,192,122,58,166,107,153,148,95,118,251,234,18,115,98,154,229,103,149,67,38,75,139,29,182,28,14,236,145,61,109,88,178,43,113,195,119,25,131,90,232,227,109,186,255,219,39,35,114,62,14,240,187,242,213,253,102,216,44,129,204,114,164,72,22,34,84,38,42,133,205,144,98,6,234,218,129,164,103,232,117,229,245,82,
+1,50,186,248,199,174,188,56,179,106,58,111,104,123,159,212,65,123,116,68,78,223,212,20,13,89,132,231,86,147,125,86,71,222,136,31,116,201,81,103,122,182,44,226,42,36,177,220,125,83,181,221,147,108,216,175,191,105,99,157,234,68,142,92,209,229,110,115,33,143,60,249,133,69,114,85,102,246,116,166,171,114,205,142,147,44,23,144,186,104,91,183,163,75,217,175,25,50,241,153,70,39,55,145,112,243,250,194,61,83,203,127,137,229,241,181,94,159,205,36,191,240,218,25,232,128,205,56,210,242,130,179,142,57,74,71,114,50,251,151,232,112,94,238,240,61,121,76,21,54,108,121,38,198,71,187,173,230,87,226,168,45,152,252,163,139,170,181,56,254,20,88,76,217,0,124,78,213,83,66,40,171,182,28,138,237,188,236,207,162,164,41,141,140,245,116,92,153,8,113,52,46,63,23,174,166,31,39,150,51,102,92,208,183,36,125,7,174,167,114,28,19,211,140,137,236,61,214,119,50,156,240,202,184,109,215,225,139,222,136,245,33,55,36,101,176,109,228,243,248,110,42,168,90,240,228,
+135,91,42,172,19,220,163,112,36,60,145,19,220,231,41,49,165,100,194,176,5,162,94,42,44,207,176,45,66,222,214,221,52,205,252,136,60,116,183,243,206,235,229,42,201,141,210,53,130,30,139,249,66,234,194,213,183,176,199,223,221,82,249,224,254,28,205,133,55,166,132,115,243,98,83,150,48,216,8,111,32,175,194,113,156,41,232,122,94,120,240,3,8,66,130,113,1,54,232,131,131,209,81,26,241,168,17,238,140,93,113,71,147,249,0,220,2,151,144,235,176,78,81,91,77,188,15,55,147,87,210,61,69,178,37,47,176,144,5,98,93,28,232,130,21,156,181,74,201,24,208,248,106,20,30,32,162,127,208,11,216,96,252,199,216,24,232,254,220,146,106,166,51,221,240,208,158,66,142,48,61,81,117,21,30,237,244,166,41,39,172,45,220,192,59,66,220,253,55,248,85,120,215,11,146,88,97,212,98,209,33,47,124,54,60,25,189,34,25,195,239,93,209,48,34,153,145,30,79,101,129,228,133,225,136,100,105,224,163,29,51,54,92,17,62,74,95,34,141,242,244,89,101,204,139,125,
+157,142,86,113,190,146,236,160,93,43,236,241,152,109,197,42,214,114,235,117,196,228,212,210,98,38,237,1,33,73,49,22,6,92,135,141,25,22,130,113,57,190,242,136,127,0,113,58,220,196,60,24,167,179,113,57,136,102,186,123,21,233,87,178,56,194,241,51,116,246,47,134,63,58,136,171,161,9,140,181,68,253,63,16,54,210,108,52,214,35,113,108,130,170,169,187,124,45,148,154,49,169,139,151,183,228,164,27,67,250,175,95,165,114,180,74,115,50,113,218,127,130,254,146,191,193,1,46,245,58,177,97,227,128,199,210,174,123,71,60,145,110,188,72,160,221,253,188,161,250,131,207,135,56,48,176,205,11,174,161,133,121,5,171,3,57,134,59,49,3,115,133,3,166,221,63,170,196,73,43,195,149,154,58,242,160,164,196,30,229,139,126,210,93,9,131,152,15,199,29,76,237,208,6,235,57,132,48,22,115,62,214,67,135,49,54,9,7,227,229,124,157,84,71,247,2,31,167,88,147,30,54,228,248,202,74,152,140,89,214,139,250,1,85,100,222,47,198,193,10,108,14,62,208,134,77,
+45,140,214,224,192,28,251,208,153,74,12,132,129,231,24,40,163,233,53,198,230,94,138,123,58,50,177,79,81,147,159,171,177,26,200,101,255,220,244,14,63,21,167,235,98,91,52,86,145,105,191,18,215,95,66,175,85,126,63,238,35,196,158,77,135,201,202,180,251,74,199,146,76,43,180,225,25,78,223,51,65,204,48,43,79,4,176,117,92,203,219,234,49,242,57,213,165,218,66,70,63,96,205,111,203,164,129,206,240,254,11,183,46,70,55,127,39,198,148,248,195,167,102,143,142,98,61,65,30,200,73,189,181,89,251,71,212,227,63,35,0,53,160,81,52,148,146,49,84,83,57,86,197,142,196,39,140,197,88,199,244,204,212,217,159,152,139,193,28,13,205,64,150,31,96,190,48,113,2,70,175,128,12,174,32,162,52,255,219,18,215,195,99,2,147,72,103,18,51,98,171,248,162,16,117,130,107,223,58,4,93,7,198,17,90,87,131,142,126,55,83,47,38,178,97,98,12,8,50,245,0,137,110,203,29,113,34,114,151,146,44,206,67,237,156,77,9,172,166,212,211,98,125,37,164,137,
+243,64,134,202,162,36,148,193,23,232,62,168,218,99,154,207,22,228,162,100,111,159,8,51,116,130,63,244,81,18,72,71,8,75,249,70,215,186,120,196,135,223,250,219,24,101,11,207,250,175,238,49,51,81,188,6,48,86,193,51,154,233,161,86,230,113,244,247,132,111,194,39,163,93,35,49,52,162,84,68,217,102,112,7,15,185,4,95,177,255,109,231,166,113,46,26,28,200,226,204,150,98,232,100,237,28,225,45,155,185,9,183,81,78,5,183,38,55,174,195,119,17,115,49,57,2,102,130,91,190,23,150,96,162,68,73,218,40,243,91,192,79,36,109,231,26,200,100,26,128,98,169,224,40,154,138,175,123,165,101,53,226,234,178,215,167,238,126,195,149,9,17,78,88,233,45,72,6,37,220,101,164,124,22,39,12,113,49,181,19,245,183,85,205,213,152,77,77,100,60,111,90,135,155,167,176,77,109,168,24,59,184,209,200,32,243,99,110,83,255,62,55,54,28,240,37,63,87,182,54,238,176,55,239,40,76,102,166,187,91,183,237,5,159,222,16,19,234,223,180,147,78,168,205,194,55,
+148,38,60,75,220,254,127,217,220,14,158,178,139,226,95,110,69,197,45,88,115,132,170,160,72,111,68,78,196,30,21,95,72,20,3,122,218,17,79,230,40,118,5,95,244,12,2,138,134,194,40,89,210,27,75,169,34,151,140,77,54,45,166,26,74,196,13,21,77,148,86,242,104,204,233,50,54,200,78,56,20,227,163,146,104,152,193,142,160,44,208,39,107,135,37,103,29,20,152,44,149,76,49,76,163,136,29,176,39,254,74,225,82,186,20,175,36,120,10,64,25,88,225,87,37,33,76,188,0,47,10,129,13,162,188,72,12,201,193,17,49,196,153,60,213,133,58,216,13,179,125,222,59,127,52,22,83,22,145,19,227,26,191,101,84,114,57,98,160,153,143,224,178,27,48,219,147,19,212,6,41,140,142,158,142,65,5,199,176,71,179,53,88,154,152,123,4,109,93,238,227,62,107,197,14,58,229,167,137,110,138,171,196,195,46,214,203,228,182,78,26,67,120,147,154,54,250,131,118,106,226,27,15,202,249,160,167,32,103,229,168,63,233,11,87,211,177,21,27,81,43,237,229,98,239,192,
+121,26,36,67,51,180,163,123,30,89,40,37,43,198,150,24,160,98,150,208,170,243,188,200,85,252,229,206,162,218,114,18,247,23,9,100,142,56,137,19,17,12,66,200,164,15,66,74,81,191,106,178,41,57,203,177,178,201,90,182,198,56,235,87,117,255,42,236,130,220,153,163,25,85,86,201,253,8,187,245,8,115,60,7,199,186,41,138,222,87,76,203,2,24,108,206,47,134,192,121,85,178,190,158,137,235,10,137,150,230,212,95,71,34,37,144,137,249,0,31,160,191,85,149,222,237,235,28,80,90,68,10,120,93,238,84,75,153,137,97,67,83,151,178,252,176,55,138,214,73,179,132,224,97,227,78,248,249,179,48,211,145,250,122,216,249,39,54,114,6,13,254,165,190,245,188,38,77,20,39,224,172,174,95,185,211,139,184,5,63,159,245,117,242,52,35,114,177,17,103,84,125,49,221,48,197,169,8,27,105,129,15,87,60,150,223,140,207,77,40,98,101,176,0,150,117,121,41,178,233,39,105,14,27,10,177,164,213,228,2,43,30,185,68,22,111,202,254,140,238,20,42,166,164,178,197,
+145,50,25,179,56,55,72,125,210,65,29,208,169,99,234,113,12,55,5,2,177,66,102,158,185,13,48,187,205,111,51,112,188,0,41,2,10,43,3,71,22,160,140,80,242,50,237,37,48,229,154,193,215,39,253,42,129,189,39,233,57,123,93,31,187,163,169,138,140,249,217,56,218,50,165,170,206,13,165,174,98,24,210,114,86,131,49,138,89,75,15,84,112,100,114,120,153,249,77,12,119,186,171,162,222,117,249,3,109,66,144,207,60,201,132,155,229,188,20,172,96,213,143,19,138,180,130,89,127,75,75,223,253,100,162,222,225,102,103,145,124,241,236,120,70,249,47,218,52,140,73,140,97,98,184,54,30,42,140,202,95,172,217,26,27,179,172,145,248,1,208,2,90,107,131,163,10,45,1,181,8,86,139,235,8,31,51,118,230,106,96,1,215,180,152,241,131,185,138,168,125,241,63,76,25,53,198,96,69,156,148,205,132,42,22,196,10,106,50,99,250,9,149,93,17,12,17,11,253,65,98,107,112,147,246,184,126,126,5,1,45,247,35,168,54,70,103,108,237,100,246,246,204,196,177,37,
+23,64,152,115,82,162,210,66,89,64,194,200,56,18,211,123,208,141,198,164,17,34,229,189,155,46,155,99,123,198,116,23,129,59,229,32,110,133,29,199,82,178,44,192,35,91,198,144,2,157,101,56,187,78,182,1,19,206,173,81,244,71,151,229,90,208,103,113,137,24,88,102,12,204,92,201,27,60,119,190,51,161,5,229,173,97,188,81,230,93,143,173,212,33,94,55,143,225,141,74,13,206,152,63,253,27,227,235,153,48,242,32,43,132,217,2,3,116,70,94,47,148,244,163,116,45,87,120,25,87,71,61,68,205,82,36,97,70,12,149,190,104,235,79,189,29,140,155,90,124,193,239,147,233,35,59,185,136,233,122,107,144,3,166,216,13,199,253,145,156,154,202,152,220,126,25,74,42,99,207,176,148,134,133,112,213,201,166,242,241,92,25,115,166,244,220,35,235,126,124,159,116,34,124,79,128,55,210,253,86,159,116,41,171,43,88,140,94,187,144,130,161,182,148,5,154,172,73,233,85,147,17,18,51,82,182,133,78,18,169,249,178,61,244,158,193,206,13,78,168,101,213,9,99,238,173,
+160,45,168,19,200,174,34,201,6,188,96,156,103,228,244,202,120,185,89,28,147,234,160,107,157,120,230,20,144,186,41,249,123,122,197,212,241,202,166,49,84,59,243,62,168,8,247,243,151,14,238,147,79,230,181,240,77,240,155,122,53,230,50,46,221,54,254,247,134,24,23,24,153,94,206,45,201,171,198,108,198,107,211,197,133,104,53,198,146,143,184,164,155,24,59,130,82,128,202,230,201,83,130,193,210,255,118,231,145,72,17,169,100,23,248,50,63,16,19,96,68,244,184,122,159,50,96,120,245,200,185,15,217,134,182,83,28,32,204,254,227,224,58,192,152,195,248,120,96,112,24,205,22,163,197,160,233,111,32,253,205,0,213,67,13,59,237,0,51,64,8,240,8,35,220,33,170,139,88,68,255,220,175,2,197,65,15,242,85,190,141,237,112,134,62,179,183,67,64,129,28,206,171,234,48,156,251,233,117,36,235,111,146,77,162,83,178,104,226,30,88,222,120,142,34,214,117,143,103,96,160,134,9,247,31,227,191,99,147,16,211,157,179,9,167,43,50,80,206,91,184,236,47,127,239,162,
+4,150,130,173,250,182,91,57,66,134,65,113,215,203,176,114,91,210,65,55,120,129,216,11,120,21,223,119,9,97,191,192,133,168,44,9,104,98,213,205,87,153,103,239,252,5,174,236,212,8,161,85,254,224,39,82,23,35,127,105,11,112,121,76,214,252,84,255,244,231,94,102,22,202,227,71,132,132,31,65,203,105,140,154,1,144,33,55,168,13,153,193,49,63,200,119,89,33,69,37,160,136,116,131,93,223,123,26,24,6,157,136,144,28,28,66,143,160,9,85,140,246,171,89,84,253,12,175,85,191,234,67,192,211,72,173,104,48,36,162,129,137,131,245,59,43,127,245,85,210,232,76,147,48,151,187,66,75,228,128,171,15,15,115,19,106,66,13,129,76,147,101,74,77,89,144,137,71,160,9,230,210,215,252,32,140,98,198,200,196,195,203,251,186,23,166,14,64,232,97,252,137,153,165,170,60,223,123,50,240,56,13,201,17,140,106,203,62,193,211,190,143,34,244,35,112,69,63,192,47,16,30,158,167,71,239,193,188,176,234,229,166,255,65,60,132,166,37,127,224,1,191,64,171,179,186,
+170,27,120,176,89,23,247,65,59,55,151,252,91,21,173,167,247,63,38,144,139,213,224,234,111,86,11,99,180,136,156,49,201,6,222,82,149,42,124,42,11,38,133,74,193,86,51,206,13,122,40,36,213,51,70,101,80,234,114,67,119,7,60,132,15,33,106,124,72,12,85,195,141,128,21,53,251,38,29,191,170,143,103,21,84,5,37,225,74,6,126,128,237,34,251,94,24,57,39,38,186,122,126,123,121,130,156,35,20,149,157,122,155,234,149,186,85,230,36,23,6,81,34,121,253,129,164,49,176,13,36,120,192,116,92,77,27,207,172,85,136,178,39,75,219,164,211,87,70,153,17,59,225,19,182,159,165,68,109,53,23,215,48,183,229,212,27,234,68,87,216,3,214,208,132,194,21,93,197,95,139,52,242,177,135,46,120,210,245,161,102,238,157,38,147,239,38,130,248,253,76,19,116,176,218,46,3,234,19,50,233,113,228,161,2,52,115,67,78,74,156,166,117,219,246,49,133,70,43,54,13,23,245,250,154,80,184,6,51,209,110,101,123,119,73,72,243,77,165,89,213,51,73,162,206,253,
+40,135,64,23,13,32,17,4,3,103,199,33,57,133,168,173,248,125,152,171,176,137,33,211,179,118,77,222,190,201,180,233,189,121,128,27,220,66,63,227,207,121,29,142,202,81,219,202,227,173,102,128,24,116,188,13,55,18,59,70,214,171,32,179,169,39,25,10,108,144,72,151,86,194,170,231,59,90,73,147,234,241,188,18,41,125,51,99,251,28,64,196,13,16,208,29,90,35,255,31,99,54,114,48,137,95,93,59,39,84,140,249,122,120,107,32,69,142,85,23,165,214,78,99,234,145,245,246,8,195,86,148,37,87,112,100,143,103,246,191,87,61,222,221,235,173,149,198,79,34,76,91,63,65,15,12,237,175,171,114,111,159,98,168,78,111,163,162,67,92,205,122,180,243,48,209,145,29,55,124,226,213,42,163,102,204,182,238,121,227,100,228,165,130,211,38,157,77,168,45,190,165,178,7,42,210,78,174,166,185,160,238,80,9,166,38,7,43,86,173,187,105,64,171,108,152,4,42,1,83,183,44,90,178,141,162,81,88,106,89,189,62,225,231,8,208,48,90,210,150,178,253,254,216,198,187,
+170,225,47,184,211,244,155,253,30,179,8,245,104,1,90,129,22,64,64,179,53,193,109,24,183,3,112,83,55,81,153,234,31,151,83,26,102,21,201,29,140,104,35,108,66,53,111,198,119,238,52,210,181,52,142,165,12,184,225,28,207,94,12,13,172,12,77,158,89,40,153,156,121,129,170,190,52,113,137,177,8,75,76,117,18,57,62,57,177,155,59,244,144,60,20,110,20,165,133,19,211,179,63,80,56,178,173,66,118,123,220,230,186,203,69,191,191,168,173,158,22,167,22,196,101,131,240,141,132,217,13,57,117,189,27,59,151,129,95,113,125,59,110,40,7,102,232,87,210,246,79,210,141,133,200,56,121,182,64,241,56,111,87,84,103,75,233,43,189,5,44,81,206,203,144,121,52,231,197,128,48,39,108,224,117,140,81,176,33,30,144,75,151,177,182,175,161,235,170,4,234,192,62,96,86,90,202,138,179,242,66,98,116,113,76,251,209,212,183,181,238,206,94,171,118,125,216,75,34,209,71,161,213,182,159,202,86,55,192,153,24,128,222,142,76,215,16,78,48,146,193,212,19,15,165,215,
+169,172,27,212,69,228,214,128,58,100,10,244,205,121,180,161,145,2,166,112,148,17,166,128,128,249,142,121,131,220,70,99,29,145,156,232,206,8,221,201,134,165,83,84,205,84,117,5,15,74,91,228,216,207,162,63,82,41,89,118,156,23,164,202,116,47,70,146,118,64,89,138,128,146,183,195,63,177,39,192,108,181,159,100,172,88,135,39,139,224,22,12,4,190,19,245,101,208,187,55,108,243,119,245,212,41,32,211,102,114,205,108,186,46,192,5,213,94,112,174,155,129,11,110,69,143,54,96,39,244,138,222,209,105,189,31,138,61,186,97,129,219,99,231,207,245,143,187,61,15,86,1,53,113,161,21,90,199,130,248,182,131,27,112,131,106,18,253,52,203,47,251,37,131,132,55,137,69,73,76,169,26,144,176,56,113,206,180,115,173,109,162,109,46,27,157,188,187,214,80,122,202,80,166,12,230,97,9,246,21,45,178,245,136,41,58,91,149,246,227,202,43,77,13,82,251,53,245,135,53,157,46,61,47,119,243,131,162,165,199,14,178,76,79,227,17,147,239,225,34,32,18,146,233,46,182,
+146,39,253,36,135,210,48,103,224,232,108,16,87,205,212,226,191,1,3,7,170,243,179,28,80,232,229,154,175,11,187,0,55,175,166,180,4,159,53,198,206,39,159,16,199,43,62,246,130,83,58,91,252,40,51,16,122,121,252,207,183,234,233,59,23,178,185,161,187,241,187,23,140,187,129,184,77,87,45,170,242,194,110,96,238,191,43,202,184,29,13,30,138,249,6,232,142,136,56,125,245,79,176,130,214,17,59,133,226,115,117,117,236,78,232,197,180,72,71,231,224,59,36,22,101,205,89,133,26,164,116,195,250,246,251,31,159,219,254,132,61,101,180,228,143,38,99,90,78,106,186,152,17,61,10,57,121,55,103,66,115,219,106,141,21,103,120,239,112,235,19,99,34,77,124,237,33,21,96,120,84,212,163,11,229,20,223,31,240,246,164,237,80,50,29,48,195,209,254,188,210,204,101,193,63,102,163,228,16,180,134,63,58,175,25,88,200,236,45,115,8,114,71,209,102,112,84,30,2,216,232,124,166,150,124,254,56,233,136,40,126,103,30,133,216,90,113,156,13,223,224,70,54,165,35,173,
+117,69,248,52,233,5,154,63,248,187,199,64,187,129,247,227,236,230,213,206,195,160,134,255,100,205,245,14,253,156,159,155,222,103,14,249,244,158,242,29,95,25,248,32,63,191,79,171,124,215,9,125,248,159,74,233,202,239,235,130,29,80,206,195,249,80,223,14,226,134,117,177,118,55,145,207,20,243,193,191,223,79,176,235,26,217,70,250,165,93,233,137,122,198,159,6,157,63,4,254,148,151,156,55,186,122,238,133,249,13,159,247,239,45,127,211,213,232,155,230,90,221,25,141,24,202,6,42,116,188,47,203,158,17,228,174,142,11,9,56,12,158,21,249,232,192,188,92,125,126,30,174,169,232,181,223,96,181,171,12,56,131,139,191,53,104,82,137,12,122,223,29,13,85,204,19,114,18,68,179,74,196,157,241,9,87,255,196,136,31,140,5,149,207,103,100,212,76,124,166,235,205,238,66,44,94,249,66,169,106,15,63,248,116,149,225,47,218,221,150,84,155,68,221,182,24,55,208,188,6,77,136,139,110,61,89,170,123,187,172,158,198,127,3,38,160,201,58,219,69,79,143,31,196,82,166,
+199,123,41,68,144,28,193,145,111,3,76,239,175,48,130,150,144,136,182,140,0,238,229,1,129,254,28,11,239,36,146,75,62,47,23,40,3,9,126,32,14,196,17,153,196,140,186,0,47,1,168,132,0,153,192,29,241,23,234,47,250,119,152,41,114,138,64,48,190,143,42,2,88,69,216,16,26,66,117,46,233,10,187,82,125,114,52,71,169,223,193,71,32,238,0,234,69,108,69,28,167,186,34,181,132,154,172,181,28,181,2,117,145,218,136,214,216,170,22,195,240,228,91,249,71,94,97,0,44,11,177,208,182,162,232,243,46,96,197,84,33,205,32,98,245,247,128,93,123,18,118,16,206,250,162,127,232,37,187,78,78,181,12,248,66,254,72,205,180,188,144,30,41,225,50,235,66,136,20,238,253,240,218,3,181,58,225,23,62,47,20,145,21,191,61,241,233,231,254,225,252,147,94,247,182,51,171,45,100,152,72,119,234,30,94,121,37,250,42,42,228,90,96,139,28,253,34,8,158,228,76,109,157,106,95,2,66,70,182,69,37,134,76,50,243,113,64,165,27,4,141,160,145,52,12,65,
+53,165,231,117,201,82,95,25,196,133,252,33,160,103,34,133,192,145,41,188,82,133,216,230,219,162,48,93,13,136,43,180,169,47,156,168,32,87,205,9,182,165,165,212,39,183,9,164,224,53,40,1,161,35,161,90,194,145,140,17,212,125,61,63,196,74,88,33,111,250,176,217,43,227,99,157,84,127,162,95,5,52,128,77,135,91,222,254,227,193,212,90,70,101,68,73,83,214,154,162,62,211,205,82,12,86,232,25,196,100,70,85,202,66,32,25,37,156,78,194,85,95,1,6,54,203,119,246,84,69,55,170,65,52,20,43,174,84,75,69,14,190,220,78,25,198,243,140,112,251,103,79,114,217,63,204,191,137,253,102,103,45,34,118,51,255,176,124,216,126,193,98,157,145,186,105,160,166,134,73,164,240,79,238,108,7,254,99,3,185,145,56,233,219,60,208,31,65,242,101,156,181,66,210,235,13,253,74,49,164,128,156,144,210,212,188,241,119,75,236,229,253,36,42,100,129,168,144,215,44,89,51,110,35,111,173,167,158,219,79,242,7,32,144,8,50,129,84,6,73,12,185,249,167,95,205,
+106,212,172,18,25,101,63,210,218,254,3,100,9,161,5,161,22,18,106,165,109,251,1,110,255,219,15,244,251,166,193,198,145,145,29,222,178,224,234,196,20,13,3,192,122,254,137,191,104,151,227,174,107,95,54,0,226,7,220,208,141,166,169,98,217,201,133,33,34,90,97,185,247,25,17,196,202,233,25,63,147,57,5,217,27,22,73,225,7,99,29,206,103,99,29,117,43,117,44,246,10,245,64,1,122,146,34,138,116,100,174,51,211,186,67,204,161,156,76,142,19,198,198,89,172,25,151,252,220,204,116,252,254,13,24,200,47,251,161,252,97,85,27,39,141,227,55,3,228,240,255,216,0,144,144,184,10,158,73,181,68,104,8,32,14,130,36,4,65,66,138,137,72,162,225,163,79,60,10,41,216,97,159,20,147,231,147,18,76,60,10,205,174,130,44,68,214,76,158,137,243,49,137,183,81,36,136,73,162,64,51,24,70,70,145,10,4,75,129,76,162,33,233,224,83,222,175,35,144,8,40,44,154,180,95,8,53,2,247,252,107,12,134,141,236,179,231,250,233,131,177,41,163,231,46,95,
+24,176,115,19,147,42,237,185,232,52,72,245,168,39,160,149,125,54,144,27,11,214,194,92,205,29,107,42,76,41,73,156,154,65,18,51,66,238,76,82,1,233,185,37,45,236,241,148,111,133,39,38,228,15,214,95,43,118,124,182,20,147,26,162,140,11,6,74,226,77,179,207,252,29,18,159,230,255,145,144,178,228,88,92,176,99,200,179,248,237,81,247,184,24,163,19,246,159,91,106,70,108,93,127,12,254,155,1,10,241,9,173,240,81,158,11,92,144,60,193,61,105,70,204,66,100,164,140,152,34,9,89,113,51,119,74,227,230,154,66,22,150,70,214,255,136,235,49,51,108,26,7,231,198,162,149,63,24,39,172,100,245,200,145,16,154,34,114,185,92,22,153,85,5,211,118,149,76,133,18,170,196,42,249,156,84,218,173,138,225,162,175,104,12,21,83,230,241,66,83,22,143,15,16,4,12,57,129,85,155,221,3,57,5,83,176,131,239,254,103,85,131,244,173,112,129,160,155,165,211,30,246,177,213,110,220,253,85,183,93,125,111,103,234,26,122,121,113,69,46,44,8,114,166,159,96,
+79,233,21,70,220,241,233,25,17,0,71,239,211,197,154,182,199,166,45,117,150,115,182,22,8,97,172,248,94,21,87,168,101,54,0,243,217,220,155,162,113,185,204,69,45,82,242,164,40,35,46,49,0,33,3,206,251,207,11,188,212,254,200,29,110,163,122,39,111,164,128,174,192,253,36,67,151,25,112,199,247,216,2,112,16,31,72,52,210,34,243,85,66,75,61,35,64,237,164,44,32,171,167,251,164,134,34,130,200,78,101,97,15,110,22,251,66,176,238,1,132,66,41,138,80,172,58,10,226,233,14,15,173,129,28,154,130,167,5,181,77,33,109,17,246,255,88,157,91,43,52,114,224,128,78,32,2,8,107,56,102,242,68,113,127,0,206,38,159,70,167,220,187,137,76,4,131,25,242,162,129,29,148,189,109,215,212,51,116,221,70,97,5,205,81,135,75,224,58,54,143,244,3,97,205,116,149,33,22,99,194,184,124,39,115,177,114,249,92,243,111,174,153,12,0,192,191,191,197,114,190,220,13,239,12,80,232,112,60,32,81,191,222,65,169,196,75,36,4,74,176,47,210,35,145,156,
+191,48,16,220,112,126,220,158,7,183,97,181,236,200,27,185,192,243,69,9,134,230,44,161,84,141,57,122,41,224,34,55,7,141,210,230,130,10,70,44,151,23,73,194,49,48,158,68,149,90,85,65,246,51,148,139,139,138,225,137,18,153,39,80,65,254,147,69,193,205,57,196,71,72,136,137,49,146,70,102,173,106,254,135,82,196,21,167,185,130,165,112,40,162,229,95,182,72,212,26,163,241,125,68,31,21,106,230,60,52,145,255,244,1,187,218,114,203,57,151,242,60,81,242,55,32,161,214,252,188,6,109,255,40,108,0,124,82,192,16,44,6,106,151,32,105,124,24,94,7,155,247,44,40,201,14,202,73,236,95,176,184,130,92,39,252,195,167,215,117,199,55,158,98,33,147,5,187,170,22,10,181,192,134,177,131,250,251,67,44,46,133,185,208,197,99,62,31,171,198,133,6,36,36,136,163,72,183,93,198,134,223,229,78,218,150,213,80,222,240,120,168,160,246,117,139,197,90,4,126,11,226,79,108,90,98,183,2,191,1,1,64,18,73,98,73,40,10,70,18,88,66,151,191,172,134,
+52,17,55,34,74,156,162,132,20,136,44,89,88,21,126,137,201,130,224,250,137,14,177,191,35,69,102,245,156,158,25,228,4,245,69,32,163,104,142,101,169,16,14,196,29,33,67,132,104,136,3,145,67,36,98,239,53,12,2,112,189,5,192,84,108,217,90,109,76,187,175,128,230,185,172,175,58,207,55,96,75,57,101,17,139,94,185,82,67,30,67,203,47,122,189,77,158,244,147,162,202,148,14,209,221,117,89,145,141,175,57,161,132,248,179,26,133,195,162,20,162,114,70,9,160,215,68,140,170,98,98,214,34,57,30,211,133,108,98,39,195,202,115,150,178,163,144,107,96,125,212,190,159,136,253,136,212,252,35,171,153,99,208,73,225,60,76,133,140,73,36,59,13,150,8,150,215,30,197,36,238,88,181,208,233,231,39,71,13,109,125,5,140,179,38,210,55,2,75,140,105,108,77,2,245,145,0,167,142,67,203,230,18,125,204,217,203,7,36,240,24,198,71,102,203,60,201,28,163,151,215,83,123,115,127,17,8,159,225,208,175,213,4,204,88,235,95,61,73,207,3,11,96,96,68,120,
+14,12,97,162,12,92,63,153,210,183,64,220,16,131,132,110,252,28,132,75,33,237,233,215,192,182,144,45,108,179,133,110,225,136,160,101,193,33,84,111,91,68,212,126,128,27,224,136,174,76,10,196,62,123,207,197,181,83,217,106,140,211,129,175,173,54,170,14,104,81,192,189,50,163,65,25,13,83,140,37,206,92,5,147,2,52,134,152,7,199,184,66,73,149,24,239,225,25,79,40,43,248,23,252,84,11,89,188,100,11,241,144,137,44,61,81,74,228,142,79,181,86,78,97,137,140,220,242,11,31,38,73,249,104,197,25,154,13,113,237,241,143,247,118,230,141,39,196,141,101,61,137,60,220,84,60,72,251,141,254,206,247,67,168,128,151,8,163,220,20,125,11,34,96,14,110,187,119,43,88,117,50,24,218,68,145,104,146,111,135,73,19,158,130,144,47,135,232,20,137,18,71,244,149,32,200,4,63,62,7,8,115,132,66,155,5,18,165,135,178,206,190,52,141,4,8,10,190,162,47,247,202,241,177,70,122,144,17,84,113,130,172,32,47,200,236,83,98,217,75,118,8,166,211,192,26,
+200,14,142,244,104,144,84,252,77,198,78,248,38,20,141,79,128,162,124,10,77,121,66,184,115,41,254,0,9,124,65,14,54,214,203,248,49,61,172,151,31,206,185,27,199,96,16,27,141,191,17,72,249,162,32,75,84,48,57,33,158,204,202,197,137,120,196,79,248,1,251,203,157,14,38,116,130,79,127,149,171,140,72,129,123,206,247,188,30,161,230,175,11,173,251,117,52,221,219,191,210,157,196,232,152,194,181,7,31,154,244,204,25,68,148,109,156,203,143,63,191,212,208,11,119,215,131,119,40,130,159,42,169,251,3,248,3,107,251,130,36,17,32,7,25,56,248,173,221,251,11,128,90,65,18,104,240,179,161,165,1,78,0,20,24,247,130,156,200,44,151,224,2,104,83,192,58,200,191,43,181,169,2,171,215,11,88,9,1,121,64,214,131,85,193,25,24,1,74,128,11,9,176,2,116,23,129,200,247,37,82,193,220,128,3,0,208,64,26,248,10,66,92,193,125,124,173,70,189,203,46,158,245,39,55,201,249,12,234,28,81,187,255,192,118,26,147,45,236,183,171,20,202,42,205,160,
+201,246,246,131,173,240,128,248,244,61,117,84,60,40,217,1,119,92,227,15,97,86,199,42,25,12,201,133,83,211,26,28,18,51,38,167,55,123,91,186,82,230,186,203,167,99,104,40,118,200,46,33,211,217,71,38,74,82,247,202,194,10,111,239,186,169,211,157,73,177,133,198,53,135,157,210,185,51,233,255,152,150,246,219,196,90,249,44,70,75,4,126,244,53,109,234,183,229,17,190,101,50,242,55,238,193,179,207,38,28,126,226,253,209,222,190,63,105,249,174,199,219,189,63,100,51,11,33,159,228,153,90,213,173,125,97,34,207,101,208,55,254,217,147,121,30,175,15,232,253,150,205,32,248,65,131,103,240,166,188,41,253,119,241,45,12,51,79,106,241,101,112,28,156,77,143,77,132,247,71,123,217,108,229,224,189,110,2,93,124,208,17,95,237,6,101,254,6,195,170,194,210,155,4,14,157,124,240,106,221,201,150,8,174,250,60,177,205,193,213,10,179,227,91,154,66,83,34,244,83,131,98,204,184,226,65,241,163,160,36,253,44,171,108,16,132,7,4,172,183,212,133,146,243,176,5,
+119,56,129,208,97,193,197,83,161,20,152,221,76,241,122,232,50,225,6,194,110,213,232,77,213,94,18,246,91,53,57,187,216,142,132,67,141,147,52,117,183,92,183,221,247,152,87,170,111,98,37,29,38,4,124,141,231,53,140,226,181,207,59,25,190,229,198,185,207,200,91,92,254,100,115,78,187,92,164,196,119,90,159,205,29,177,71,30,172,214,248,151,115,191,75,85,35,118,124,156,255,123,117,179,94,162,135,34,37,139,200,241,107,254,203,173,145,184,133,16,222,9,153,54,76,33,120,37,191,208,117,143,159,211,87,242,230,208,95,245,33,109,103,84,25,211,13,186,65,51,92,249,77,138,232,248,202,245,196,118,235,16,158,50,173,27,82,112,218,52,166,176,49,61,4,149,209,106,4,141,177,170,49,38,201,153,111,184,85,93,67,122,8,246,6,211,237,248,58,93,99,74,203,86,126,156,181,219,11,175,135,197,204,150,162,33,97,9,233,75,198,154,83,10,82,233,66,78,203,130,43,169,217,90,100,120,179,226,255,110,197,48,57,32,31,90,9,57,53,101,108,106,42,6,115,67,
+149,142,182,61,0,228,218,242,121,198,227,55,166,69,213,177,105,247,70,232,221,62,155,37,253,251,164,170,197,127,220,176,244,139,243,253,156,142,8,244,140,139,205,217,237,125,9,170,78,87,113,53,207,251,76,66,76,163,195,219,40,39,229,248,80,30,242,51,105,88,150,0,211,199,186,159,246,222,225,60,62,102,7,20,104,12,16,234,242,58,227,94,55,104,203,92,10,154,18,98,73,155,36,67,223,233,46,197,36,24,116,253,83,219,59,116,183,221,227,21,193,63,228,176,145,84,201,8,255,144,128,82,34,5,139,10,137,38,82,11,196,37,130,12,12,180,104,121,217,111,18,168,201,6,203,81,254,77,170,25,149,85,86,135,38,207,155,138,114,75,193,73,214,25,214,37,234,164,47,10,130,251,45,233,231,101,18,129,37,180,1,170,140,100,141,204,168,168,146,41,203,251,107,99,126,168,69,57,110,5,243,82,114,96,171,100,86,70,150,182,178,149,82,208,188,16,39,54,57,52,113,251,209,174,231,216,72,246,72,54,229,253,30,57,41,22,115,4,190,145,116,67,70,188,238,118,
+109,4,224,89,30,238,110,91,11,125,202,0,157,71,114,74,174,218,232,137,176,22,22,196,82,153,103,248,80,236,179,214,185,208,31,248,133,223,175,248,20,47,135,169,172,217,194,68,74,199,126,91,111,224,117,184,137,177,19,15,127,80,231,37,158,50,27,216,76,107,221,154,157,49,67,103,220,64,148,77,80,170,116,62,29,211,178,73,232,193,154,134,182,191,31,233,161,253,189,148,98,205,216,39,107,47,68,12,9,171,207,182,153,92,74,152,31,144,6,172,76,208,119,230,97,64,181,114,52,120,254,18,9,12,124,22,130,202,104,16,81,117,61,200,36,253,8,164,15,252,162,56,238,191,71,101,72,189,111,36,36,169,65,49,33,86,208,242,134,224,12,96,9,185,134,23,98,195,71,26,163,25,73,82,61,179,141,255,198,50,87,17,37,5,17,225,38,59,61,92,143,55,222,254,176,149,181,111,215,223,59,41,230,16,247,31,122,104,200,16,90,31,38,162,7,189,86,240,68,115,116,121,139,99,190,236,106,33,35,186,49,215,230,155,205,11,113,80,23,101,66,66,52,137,62,158,
+194,116,251,220,68,20,200,133,10,244,149,54,71,255,134,136,228,138,145,80,244,128,86,162,29,106,25,178,102,210,1,41,86,184,46,65,17,101,88,61,150,107,96,192,127,72,161,140,100,117,160,184,94,157,103,28,28,141,43,186,152,148,78,65,94,8,164,71,19,18,24,173,90,21,244,21,20,38,118,169,247,40,169,65,202,88,47,59,97,44,139,228,143,241,15,52,206,215,154,131,184,245,202,206,34,229,255,141,189,247,250,113,119,73,243,251,254,149,115,97,172,108,64,194,238,104,181,187,178,239,12,200,50,12,8,130,97,233,82,16,230,104,230,172,246,192,179,115,6,51,103,188,242,29,51,155,177,153,83,51,231,156,155,77,54,115,206,57,103,178,153,115,206,201,253,155,35,236,172,164,209,72,107,192,48,96,47,9,116,55,223,247,173,226,91,159,250,214,243,124,171,154,93,173,183,102,78,105,179,140,175,203,72,36,23,60,37,129,153,101,109,249,183,140,148,59,103,202,117,171,72,80,74,23,106,57,116,27,91,135,238,222,173,221,145,170,54,22,90,176,228,104,158,169,25,108,
+17,215,32,170,204,9,54,52,241,210,137,163,58,156,218,218,254,103,235,125,240,69,81,216,130,39,76,230,83,80,69,172,39,28,43,228,203,8,46,97,49,55,235,78,56,156,151,188,49,107,148,21,161,77,242,14,217,181,247,83,87,88,10,211,221,196,136,228,53,193,96,206,248,111,230,124,24,78,236,170,37,246,4,140,201,159,38,71,62,119,105,42,55,110,181,237,86,4,40,111,245,181,172,225,199,93,64,170,31,241,176,23,220,115,146,62,208,197,80,8,232,168,115,34,151,59,193,9,12,151,7,228,225,19,236,172,192,130,204,166,165,114,238,170,230,30,213,221,114,208,103,6,242,132,215,90,190,12,96,228,115,10,169,151,66,175,124,240,247,197,170,197,87,197,150,104,198,169,190,37,46,186,138,204,234,176,51,101,241,78,12,29,76,54,22,75,73,89,146,41,178,210,62,11,109,245,169,192,250,130,78,204,253,198,85,71,86,124,49,139,115,81,75,36,65,217,136,142,58,142,237,227,224,197,222,95,226,20,244,253,104,150,176,145,227,207,41,27,37,187,124,40,245,245,24,198,
+121,43,38,130,123,236,115,249,84,75,208,173,212,248,180,166,67,181,187,111,206,153,176,26,214,19,39,12,73,51,129,103,101,172,231,228,52,87,149,26,210,166,174,192,31,176,98,6,71,211,121,186,45,227,74,114,154,137,247,202,67,205,172,201,141,180,15,149,229,160,113,84,50,221,33,55,178,87,166,31,242,26,48,188,132,86,165,120,73,165,156,150,86,73,131,241,57,169,128,53,197,227,119,247,73,128,175,96,171,126,208,107,248,92,11,64,116,114,79,115,106,209,166,232,99,144,213,211,204,159,160,225,98,222,135,126,134,151,249,153,53,20,198,10,245,71,6,86,170,243,65,7,238,89,87,85,133,145,203,201,164,69,118,55,12,17,233,145,40,97,247,25,111,117,21,222,53,163,122,109,222,58,79,21,69,134,37,149,164,163,25,14,77,43,69,231,120,200,155,57,112,97,107,109,122,202,69,253,161,41,34,180,98,199,85,134,108,120,25,131,157,98,81,61,205,92,114,152,142,109,32,24,91,162,116,132,64,238,170,21,111,74,97,217,178,96,136,130,17,54,217,163,120,123,86,145,
+170,50,99,70,60,17,185,229,149,94,213,162,218,150,70,250,204,36,200,107,122,90,211,168,137,171,29,187,251,237,154,114,119,134,147,250,226,184,244,41,62,140,197,24,254,140,208,189,112,13,113,72,117,185,186,73,71,249,208,103,49,84,3,37,163,20,148,94,65,169,172,62,209,203,48,173,238,180,248,120,223,86,95,98,243,39,92,213,142,74,108,25,145,188,184,24,162,53,3,38,97,69,192,253,140,42,239,126,103,191,189,176,213,251,239,104,227,106,236,79,62,192,176,10,122,36,39,147,20,71,155,67,45,94,116,49,56,195,36,116,3,102,206,150,60,192,191,182,134,85,66,19,6,159,74,234,198,88,199,164,13,206,52,212,31,187,235,181,17,65,16,65,114,201,113,41,145,30,221,202,29,108,181,208,26,130,49,218,253,243,11,83,191,233,36,98,34,67,49,94,51,106,55,193,24,140,62,37,25,158,99,36,154,204,52,205,142,249,30,223,43,194,245,78,140,139,43,49,163,245,101,104,68,36,218,142,35,17,28,128,161,209,62,128,205,39,88,131,137,48,51,222,36,219,73,183,
+30,74,66,69,247,42,136,8,126,194,203,236,219,55,48,46,51,80,11,164,145,181,134,30,17,177,53,133,17,25,211,45,248,156,232,193,140,233,197,147,131,74,114,100,139,251,64,10,158,134,74,83,48,255,241,173,77,197,178,151,82,42,254,217,91,70,161,149,169,1,14,99,141,178,10,149,184,145,102,26,50,4,115,202,152,206,150,139,253,62,214,7,148,6,93,179,209,4,123,108,17,224,210,48,7,1,252,161,72,154,115,9,139,164,199,28,119,67,172,139,66,85,202,38,176,4,19,37,188,246,52,152,164,92,160,254,37,206,77,12,87,67,36,180,23,88,209,87,244,20,103,64,36,105,230,68,167,5,2,106,48,194,16,45,244,138,155,227,4,136,143,53,186,75,151,26,167,169,15,110,205,69,6,58,42,96,90,45,173,164,162,139,53,56,123,112,62,55,183,219,9,62,134,104,114,83,239,18,143,200,146,224,24,179,79,88,108,57,199,175,228,42,125,99,108,108,79,77,160,174,156,156,40,234,5,37,141,92,199,238,57,219,206,215,115,122,33,127,30,250,195,134,109,141,18,120,
+151,145,95,225,125,147,203,142,24,131,101,90,20,113,18,83,242,154,61,219,20,58,210,47,97,34,36,251,92,223,154,79,125,145,164,195,46,160,226,98,240,170,61,222,229,70,178,105,49,203,231,47,9,54,0,98,221,237,70,194,28,128,56,239,137,112,154,251,204,134,151,141,169,237,233,118,108,128,185,214,162,234,123,196,68,93,41,130,43,170,242,81,68,29,133,142,246,151,95,175,155,130,19,249,230,122,199,62,247,205,98,115,80,103,33,244,67,7,102,103,205,44,246,205,48,75,176,110,209,111,187,152,201,145,43,112,73,196,141,1,121,44,77,165,85,39,65,34,40,192,74,12,68,99,28,9,46,189,42,216,103,203,229,213,243,198,201,23,248,121,173,216,173,46,181,175,1,99,33,38,115,249,51,167,115,101,88,59,13,250,190,112,154,239,207,152,80,29,10,53,49,204,218,41,91,229,164,148,86,233,222,163,21,229,164,34,243,48,248,201,252,44,6,19,16,90,89,60,233,5,142,134,227,224,116,20,119,182,51,216,64,93,250,93,47,106,211,15,22,200,134,149,234,119,100,228,
+128,65,185,11,200,119,185,88,6,37,231,29,25,32,209,243,148,212,125,38,234,2,245,22,126,142,93,205,0,209,147,93,184,199,167,220,186,80,1,107,90,185,237,78,184,166,189,67,222,11,12,179,19,250,153,225,147,169,231,37,136,162,170,236,135,214,178,170,199,161,120,43,199,196,216,162,232,241,41,70,69,69,61,177,168,68,232,122,84,76,97,170,78,41,6,242,213,86,72,169,195,188,140,23,19,64,235,77,35,6,175,7,51,209,165,239,29,94,26,109,31,163,206,249,80,14,157,20,140,88,253,28,52,230,55,131,9,8,153,88,146,142,223,120,105,222,75,128,27,64,41,3,239,224,186,32,39,120,70,49,108,159,79,238,149,193,123,32,98,184,167,28,49,99,208,197,125,17,255,246,68,196,16,95,58,252,89,140,114,111,64,137,150,192,18,128,104,66,138,3,187,14,151,246,14,134,252,25,202,104,134,8,98,169,5,47,224,235,77,157,88,214,167,13,242,208,53,107,113,152,78,240,114,223,178,189,26,187,119,214,218,138,48,75,41,89,102,11,19,142,206,210,122,169,104,74,
+245,16,246,221,84,72,174,60,196,163,76,138,168,61,63,144,32,77,114,109,143,210,27,180,118,157,222,119,48,219,217,215,96,126,45,148,134,115,168,176,223,18,30,207,229,22,133,24,237,141,155,24,240,49,50,159,35,249,77,197,17,59,21,203,190,170,98,117,112,22,217,47,209,132,4,183,56,37,33,204,69,246,72,240,44,193,197,116,198,112,51,36,12,125,68,197,184,76,242,169,111,16,129,118,138,13,229,217,158,9,37,135,74,249,52,107,22,67,251,250,132,138,130,180,245,186,163,130,184,156,215,137,67,31,117,89,14,240,66,108,77,29,139,215,75,99,19,124,11,15,97,2,30,108,2,226,203,108,15,114,99,78,126,167,142,106,252,58,35,142,138,30,35,152,189,99,60,144,233,151,190,144,83,198,230,151,234,10,60,142,99,175,250,3,194,131,71,98,150,9,202,145,76,70,139,32,16,206,230,198,33,46,97,93,75,1,235,52,121,18,0,155,133,0,202,114,111,106,26,171,235,229,184,33,217,164,31,197,154,124,47,47,41,62,156,105,164,64,158,144,153,21,146,46,159,160,
+136,168,21,198,112,30,233,86,211,35,132,53,201,150,91,75,251,47,53,177,244,133,255,17,105,198,242,242,23,225,138,128,239,135,43,100,163,226,152,21,115,47,30,180,101,136,230,80,89,13,239,58,64,235,134,122,124,169,89,141,38,190,238,71,43,35,81,54,36,121,238,29,54,33,54,54,91,9,80,17,106,24,177,125,62,121,1,224,38,137,112,103,82,110,236,16,180,52,167,96,62,29,231,173,198,199,32,41,138,46,79,75,192,221,220,28,188,116,182,71,181,121,238,89,163,98,55,106,50,175,102,23,203,123,140,147,175,5,93,79,93,10,9,152,22,118,130,32,224,109,186,149,43,38,7,45,6,85,22,125,192,143,79,96,183,171,49,64,96,159,46,184,31,11,184,181,122,218,161,13,154,194,195,79,34,109,2,112,167,215,93,28,92,79,61,194,140,56,101,128,187,130,48,54,190,190,66,50,49,93,50,183,44,243,220,175,208,55,114,45,253,180,76,186,41,30,52,249,45,206,225,46,65,65,226,130,20,4,177,87,242,160,208,15,168,152,213,1,52,231,53,226,23,146,19,244,
+122,189,179,197,166,157,17,34,128,244,233,121,5,161,72,16,23,165,51,137,51,237,195,176,238,7,161,32,114,194,8,244,3,227,60,148,207,162,134,226,32,154,161,172,84,208,234,221,227,154,121,210,81,70,17,225,83,137,214,217,52,43,88,16,189,214,109,121,99,62,224,176,78,5,123,222,139,198,81,147,183,163,247,69,122,70,157,191,213,96,161,113,220,62,50,56,77,121,187,148,16,54,239,143,125,4,116,229,98,168,165,87,31,27,228,132,88,163,16,73,230,136,71,27,132,91,178,185,100,208,62,61,7,210,251,125,99,132,120,220,110,206,198,59,232,184,84,141,73,54,99,98,210,185,54,230,76,123,103,202,25,132,67,102,73,208,162,24,40,64,76,77,239,67,122,48,200,153,70,203,161,119,109,136,58,64,52,168,196,213,11,4,66,202,225,57,125,180,136,197,172,60,38,19,51,71,12,164,130,108,134,22,108,177,169,87,37,76,158,220,98,210,206,39,31,202,19,226,234,219,226,0,45,21,73,63,243,89,157,113,2,150,134,149,19,54,6,211,202,148,48,253,22,0,219,210,
+176,56,232,247,87,250,112,132,194,234,213,67,145,141,15,209,167,7,131,248,97,27,244,91,140,133,1,88,141,99,185,43,123,176,241,60,218,35,86,230,250,46,154,51,203,182,227,244,253,81,181,46,36,25,121,114,135,121,88,7,238,131,125,32,238,139,203,104,4,177,196,240,237,133,176,0,6,132,73,187,185,86,99,10,42,244,242,195,47,196,198,101,97,87,157,249,89,45,48,3,193,99,227,153,139,213,244,60,9,162,86,221,110,162,161,19,223,251,137,46,125,49,88,60,94,14,142,98,236,160,170,31,110,243,9,157,215,227,236,56,97,234,90,196,18,191,70,236,120,15,236,73,200,116,165,37,211,181,181,244,188,186,218,109,243,24,219,106,206,71,94,251,91,58,249,90,13,174,198,142,55,245,241,149,226,147,22,81,143,55,168,188,58,218,62,243,234,126,139,90,125,56,175,4,168,108,209,137,95,39,166,239,171,177,79,69,32,46,18,39,4,116,135,15,189,213,125,240,86,163,211,169,132,199,146,87,22,102,107,210,87,186,6,189,223,153,151,86,69,42,18,244,53,149,142,229,
+137,175,86,76,238,53,195,21,134,113,225,42,177,30,183,13,227,120,227,58,107,26,61,222,153,227,150,16,172,75,132,26,123,125,89,230,198,64,203,137,176,74,181,143,176,208,139,87,240,110,143,176,155,230,175,250,172,167,241,100,128,199,51,70,47,88,150,99,165,12,201,188,58,66,174,130,80,242,50,117,111,64,95,201,229,64,220,120,246,159,109,50,131,80,27,39,190,133,183,19,167,159,210,89,231,89,70,116,189,201,109,220,204,118,255,104,132,223,219,75,245,224,101,187,203,84,45,53,207,206,34,54,190,164,164,183,66,254,172,216,162,114,154,69,78,215,234,236,177,111,11,65,54,1,221,111,171,74,237,216,171,196,76,76,14,102,165,235,239,165,229,172,230,234,174,170,205,68,175,74,255,253,35,96,196,33,154,158,140,33,165,49,100,25,161,49,255,45,157,192,6,144,36,146,84,54,209,112,249,108,249,187,124,226,148,41,68,58,118,1,182,127,39,213,22,194,55,250,35,24,223,190,45,149,100,89,219,20,168,10,153,58,65,58,145,179,26,102,4,52,233,148,15,100,94,20,
+47,170,140,218,214,80,34,172,139,89,96,84,173,46,20,173,214,147,143,95,127,145,230,225,185,105,218,228,93,133,41,254,151,174,134,72,183,202,165,65,180,63,51,165,134,24,196,186,138,198,144,1,213,112,204,230,160,71,63,240,87,216,242,200,21,115,232,216,164,246,174,131,148,159,3,245,225,65,190,230,97,88,125,236,27,116,189,186,89,75,203,228,193,126,126,166,92,47,24,106,202,19,166,36,140,155,103,25,125,18,167,189,117,12,105,244,140,248,246,178,164,204,60,6,68,83,12,210,50,16,115,161,18,31,162,137,116,145,15,178,240,213,139,171,184,206,246,242,110,10,2,198,52,246,15,174,59,159,170,196,79,100,242,133,156,203,241,148,60,139,130,178,127,127,127,25,166,179,107,105,250,61,5,103,248,104,227,254,201,208,137,247,8,25,198,180,253,14,157,149,251,253,23,209,167,185,201,9,111,155,9,102,186,150,150,199,45,9,214,222,175,180,53,76,118,251,105,43,117,10,183,156,143,186,82,208,168,83,152,178,254,65,21,150,101,198,4,28,187,215,25,32,232,162,117,148,
+161,13,131,154,132,37,1,212,76,219,224,43,150,162,187,7,152,146,186,163,2,189,242,170,157,173,204,146,58,120,55,151,35,3,66,220,89,120,144,135,109,201,152,204,160,92,133,62,125,52,44,19,13,200,181,92,122,109,0,102,97,74,6,67,59,193,225,95,230,245,221,49,47,144,74,180,19,108,235,189,60,71,43,1,100,208,250,138,9,191,34,60,188,184,198,225,209,129,10,132,162,219,109,241,195,123,36,82,186,33,238,86,165,231,8,67,62,84,4,197,6,10,124,103,83,230,59,97,59,100,7,39,167,208,10,122,126,237,9,183,124,130,108,164,79,34,88,94,42,41,125,201,181,126,183,43,118,202,162,174,172,138,238,95,93,139,189,92,110,57,34,34,254,52,208,6,189,116,103,56,131,10,126,140,125,42,177,24,166,85,196,119,60,13,202,239,13,186,196,183,35,210,181,69,144,58,71,76,123,95,97,74,120,83,118,59,47,120,30,101,231,142,143,72,65,51,88,108,228,68,21,224,51,35,158,222,80,158,118,238,179,254,84,125,121,203,190,59,148,157,237,36,178,48,86,78,
+25,131,124,224,87,194,56,19,173,102,226,182,192,222,198,54,69,170,7,114,183,200,174,146,202,171,64,40,133,98,15,19,11,38,70,122,83,91,209,142,142,101,244,209,144,81,37,118,134,222,75,145,11,74,38,231,169,209,1,237,186,34,135,144,178,117,181,104,133,10,190,18,2,239,12,105,79,138,29,236,78,132,42,91,67,172,45,141,91,150,97,23,43,70,160,176,177,44,240,33,156,212,242,32,91,89,222,146,128,153,117,253,104,100,183,121,60,89,132,64,123,224,180,167,117,253,33,212,36,4,176,96,225,171,165,139,97,148,9,27,241,18,106,233,205,158,152,110,29,226,32,142,150,55,107,182,255,222,131,112,224,218,23,151,52,144,116,56,119,156,79,108,112,141,245,100,220,176,210,219,162,140,34,108,200,28,11,119,83,158,146,122,6,86,164,33,95,147,251,200,92,66,39,18,83,116,11,28,63,15,68,93,215,94,162,43,117,80,19,75,184,108,158,8,66,35,210,191,64,104,31,31,200,176,50,193,183,224,140,32,253,218,16,142,8,36,84,144,77,28,89,203,204,32,209,235,
+134,148,170,201,241,40,181,121,205,206,45,181,4,9,63,191,45,234,74,241,101,227,85,144,183,73,251,252,13,67,54,238,203,233,10,245,7,15,233,143,80,20,230,146,106,96,71,199,51,61,83,180,36,235,107,112,50,240,21,251,12,192,116,11,44,156,46,88,81,135,81,85,80,6,91,149,244,95,200,33,178,135,250,116,34,248,91,182,187,225,152,164,119,28,178,23,39,182,99,208,63,122,14,244,138,59,135,105,30,79,142,222,116,220,49,94,210,71,87,83,243,222,40,131,0,187,72,40,142,202,29,108,5,24,179,64,111,146,86,55,25,153,26,181,164,145,97,89,141,34,42,145,90,37,116,44,170,155,251,143,212,48,37,246,228,242,128,80,79,37,5,151,207,25,218,62,186,235,112,136,39,131,231,62,148,25,3,52,199,160,134,226,43,108,239,148,27,180,178,205,80,22,175,242,195,61,152,247,102,100,65,31,60,71,135,138,1,151,233,231,33,217,69,109,193,189,62,66,181,66,113,148,46,84,13,28,49,62,52,234,22,121,46,21,5,229,120,42,247,121,213,211,180,191,208,113,
+188,109,188,120,155,127,162,90,31,144,100,35,198,155,163,134,24,126,161,251,84,37,187,225,64,212,235,81,213,178,195,47,104,154,58,171,39,132,250,204,52,42,29,11,152,117,62,122,111,112,109,6,223,146,245,212,217,167,99,31,178,185,166,136,234,177,103,154,124,80,126,230,148,125,248,184,248,119,127,77,218,29,183,120,111,40,173,10,7,220,151,76,39,115,191,67,160,195,47,236,134,69,186,214,63,197,120,230,23,173,50,198,255,156,8,10,77,96,224,113,75,200,134,19,60,152,128,92,219,34,13,178,179,245,195,84,232,241,99,11,137,8,176,247,188,35,253,67,217,71,90,151,68,178,70,26,60,247,186,68,228,5,34,155,20,31,122,208,114,8,131,63,70,70,177,218,35,221,83,207,83,160,161,32,142,55,188,130,135,34,178,148,123,189,37,164,24,44,159,10,209,15,96,114,117,201,108,36,198,3,40,238,49,61,53,4,203,10,212,79,104,104,150,28,68,176,71,9,142,166,146,184,238,138,24,161,230,88,227,122,71,67,129,135,232,254,146,255,156,100,59,13,175,119,185,234,
+154,83,52,239,61,224,56,193,233,173,222,243,106,180,48,23,247,119,157,112,47,51,102,208,101,99,20,129,35,168,164,39,158,187,108,224,1,134,172,109,65,25,243,139,220,142,28,29,50,79,49,254,123,7,111,134,16,136,66,148,203,102,245,123,200,162,209,83,174,155,34,250,189,166,101,220,66,120,76,99,157,216,221,97,63,217,212,220,182,198,229,130,122,161,158,213,140,166,232,218,112,8,198,151,207,175,199,7,142,52,167,120,34,172,107,97,9,158,89,61,83,94,232,145,169,36,218,234,58,161,116,176,160,251,106,100,5,107,28,156,37,104,103,141,138,15,171,53,236,122,71,138,243,54,234,170,233,235,173,129,65,139,5,251,202,188,16,86,91,88,103,248,156,228,93,152,89,239,117,247,134,78,158,31,168,187,60,206,179,229,21,205,9,240,50,238,51,232,204,88,55,111,69,111,245,169,100,176,171,101,101,141,202,172,54,19,247,235,160,84,82,45,74,88,69,60,111,248,135,7,66,167,225,9,18,21,80,143,215,249,252,120,142,212,59,102,210,17,93,17,63,205,140,157,228,249,
+81,137,112,154,198,132,34,148,29,171,124,55,140,194,120,170,188,72,172,157,55,116,122,172,103,166,166,107,141,108,119,173,47,74,43,89,130,133,96,104,134,62,116,29,84,47,134,184,170,69,112,29,62,82,208,91,195,175,83,145,150,19,108,227,225,102,214,147,119,228,198,22,203,228,48,251,94,205,80,80,195,87,241,44,165,142,69,245,224,232,158,29,205,149,99,18,29,211,247,24,138,206,154,227,156,68,148,10,134,232,91,224,150,47,200,45,178,226,162,245,217,158,123,83,200,101,121,234,244,238,150,144,78,122,124,90,124,214,167,36,106,179,136,32,143,61,48,215,18,31,43,180,91,194,112,14,165,32,129,229,242,156,98,46,249,30,4,138,107,33,34,209,180,117,71,26,195,112,141,248,136,112,156,69,67,70,21,102,160,250,222,100,141,106,73,238,27,17,30,164,111,123,200,246,120,47,69,225,149,109,27,122,59,208,227,101,70,20,125,187,69,92,53,66,29,77,22,89,35,21,97,165,4,174,167,187,246,76,171,206,50,245,175,150,217,35,200,50,103,227,204,240,38,150,224,168,
+234,135,161,25,171,60,200,51,41,186,178,207,183,6,102,79,232,65,90,198,9,44,64,134,206,240,241,188,242,111,154,106,167,57,194,167,238,198,44,213,232,40,101,199,143,198,142,208,76,132,55,148,103,29,129,22,104,49,48,126,18,181,128,47,5,91,219,103,122,113,105,243,44,177,254,2,30,244,168,35,226,16,0,156,72,140,124,152,71,90,124,55,24,118,233,132,234,194,218,145,71,228,36,224,12,205,55,209,179,100,62,207,113,26,38,167,226,24,162,241,156,165,197,58,98,51,102,48,2,213,78,89,122,164,139,204,202,98,91,177,129,35,108,63,68,12,72,216,169,241,71,32,177,173,2,57,123,218,123,85,229,231,222,114,248,4,127,220,225,25,252,194,142,130,6,177,234,170,121,214,226,56,97,59,36,26,104,204,212,125,75,224,205,178,45,245,205,6,232,30,194,160,119,174,198,179,67,185,84,103,52,141,56,40,47,32,99,253,60,58,98,15,169,13,248,41,43,252,110,78,108,153,116,200,7,219,211,124,118,151,234,189,61,238,176,133,89,161,173,17,156,248,12,2,64,121,
+64,223,18,138,231,40,121,129,152,126,185,230,75,145,66,101,148,33,167,185,159,165,157,36,36,144,102,115,151,140,2,28,177,21,175,205,8,139,67,8,35,64,78,175,6,130,111,200,239,32,98,91,161,150,204,189,226,45,56,51,229,163,140,110,91,20,140,124,168,32,40,161,161,84,243,48,161,189,184,93,76,72,72,141,226,44,245,54,215,44,249,190,89,92,23,157,183,240,243,132,182,211,124,232,249,44,208,185,169,73,189,12,98,202,138,46,59,76,172,167,189,75,61,221,20,61,219,207,59,86,130,114,173,66,83,198,179,55,133,165,140,44,239,33,119,13,211,13,0,2,135,59,237,212,22,185,10,71,42,124,193,180,153,59,94,32,220,122,111,64,46,124,92,59,88,3,132,221,221,46,132,72,228,67,110,43,194,82,206,151,34,132,125,7,82,60,172,8,70,47,79,60,43,133,93,98,87,253,107,33,246,110,102,183,253,58,166,34,23,213,1,74,110,110,60,96,96,157,226,83,210,6,111,67,230,112,204,75,132,38,204,4,222,64,101,244,135,21,0,169,59,247,55,179,153,241,
+54,244,177,188,204,253,42,91,242,238,225,10,85,140,102,210,54,6,1,121,177,74,77,215,187,86,168,241,49,72,49,219,165,220,165,156,105,138,176,152,243,142,91,85,166,236,161,6,74,127,103,230,150,21,42,138,233,168,237,3,46,148,96,154,140,213,117,75,239,185,139,221,39,204,239,237,190,0,173,81,184,217,144,75,48,12,121,241,65,71,119,72,23,74,224,248,86,218,112,143,151,131,102,168,176,130,158,73,185,24,131,41,19,217,13,14,1,57,142,23,172,80,67,0,134,220,29,36,214,167,103,184,81,194,39,241,92,71,78,196,140,180,13,79,9,209,210,78,177,53,78,1,84,94,94,12,188,86,20,206,210,188,238,109,165,195,167,146,120,74,250,30,94,90,116,240,58,197,70,131,49,233,224,165,214,154,65,45,152,131,118,95,184,120,213,105,230,149,208,229,243,214,209,126,242,121,247,162,58,110,66,102,204,179,99,237,13,22,201,139,197,50,236,247,44,113,111,139,206,20,64,47,177,10,166,82,121,25,44,176,23,85,136,25,55,126,143,144,172,43,182,240,248,66,28,41,
+108,24,207,195,24,1,203,208,252,190,26,137,113,123,2,99,12,30,144,170,29,164,246,182,45,131,236,132,105,183,54,136,187,101,97,201,204,70,9,244,212,225,197,96,134,219,132,90,230,210,253,203,136,190,57,20,42,28,202,243,194,48,15,139,173,85,245,131,64,106,88,227,238,52,115,233,12,71,233,172,150,196,22,140,179,16,234,90,176,210,189,236,182,133,83,109,76,199,248,15,138,187,237,229,203,126,53,135,143,36,112,140,224,88,214,158,30,112,49,53,79,80,234,233,107,81,105,158,3,241,38,186,88,92,122,233,116,179,80,9,230,190,135,52,231,98,15,189,100,245,148,24,161,3,183,138,186,46,120,200,155,172,152,154,5,243,44,39,6,104,132,100,90,236,80,17,247,12,26,66,48,4,244,164,137,3,115,221,104,152,142,16,26,146,185,128,98,243,140,98,209,166,1,30,64,8,93,68,40,246,210,30,151,9,139,42,44,224,235,180,222,7,7,217,245,151,112,156,115,103,99,204,190,33,110,162,186,212,202,100,122,104,208,123,19,250,214,31,152,228,176,112,127,190,229,65,
+52,149,180,184,136,130,242,94,185,83,231,139,50,103,28,180,121,230,57,85,107,250,15,223,227,61,240,166,125,23,64,5,178,57,229,88,25,226,187,94,179,61,141,85,10,205,248,177,71,172,224,158,230,164,83,170,31,86,137,168,175,13,227,241,41,137,114,230,169,88,104,157,139,60,147,108,153,165,79,236,118,130,6,72,216,117,126,154,71,105,207,157,134,57,118,212,245,194,104,248,105,51,87,154,245,67,207,77,79,84,96,149,85,67,96,228,53,145,173,148,41,139,190,94,102,185,69,53,141,181,188,63,103,173,195,249,66,240,26,150,76,156,29,226,93,254,138,206,43,236,135,33,112,108,9,206,111,220,182,139,122,102,190,47,98,116,212,176,209,10,136,123,49,77,251,64,180,26,222,150,38,145,139,153,170,41,248,42,132,65,84,198,179,209,193,53,83,186,28,136,125,80,100,81,94,103,73,55,146,52,139,242,140,169,216,135,107,146,241,244,162,145,112,237,156,179,126,208,114,115,225,130,57,186,252,142,146,173,69,10,226,82,29,179,26,38,62,219,94,160,153,150,245,100,153,118,
+53,41,76,105,134,158,32,178,87,237,23,250,199,27,198,43,88,5,153,150,77,55,231,104,206,121,186,164,87,167,106,38,31,100,27,9,54,206,95,94,91,213,182,132,186,149,12,210,201,51,133,216,92,38,224,239,147,129,54,239,239,235,157,137,207,64,13,228,224,69,110,113,205,32,8,120,74,199,226,168,0,122,68,159,13,130,16,80,31,148,27,23,217,137,144,91,16,15,7,149,250,112,201,171,174,160,108,42,251,125,233,99,250,67,241,36,147,190,38,246,45,196,206,27,253,16,232,122,128,50,43,112,240,26,47,27,90,126,62,180,30,237,43,25,218,185,143,213,199,180,105,211,90,63,144,164,130,55,32,82,203,44,28,178,150,163,251,37,241,56,221,249,216,98,238,69,113,152,187,171,129,107,124,101,145,60,111,252,47,160,106,243,99,135,13,214,85,53,117,91,145,76,237,84,30,52,226,221,111,67,116,101,78,92,59,161,22,157,82,210,168,82,166,229,9,42,148,179,149,49,27,38,117,146,58,91,125,153,71,171,217,73,178,115,97,151,43,134,86,144,203,242,54,77,232,202,
+210,83,41,21,89,68,74,236,197,112,57,131,55,98,219,187,159,144,227,41,138,229,236,160,83,32,188,188,79,57,157,67,160,186,127,181,152,177,28,204,6,254,244,8,0,237,47,187,241,65,223,154,9,252,91,163,249,84,235,3,163,213,209,114,160,108,12,162,43,103,40,68,230,171,109,248,11,75,248,34,124,145,225,103,49,135,204,239,148,166,250,1,178,229,149,34,52,150,50,221,176,130,140,99,21,182,213,116,71,84,205,221,37,148,109,121,45,136,129,120,155,64,140,214,185,0,87,89,49,154,46,212,127,244,197,155,98,185,104,14,124,144,41,26,253,252,204,126,53,76,135,218,162,40,158,88,237,141,119,135,121,213,84,222,152,231,234,206,90,89,154,240,226,29,167,179,121,102,58,2,245,14,9,185,48,95,176,188,37,202,215,20,182,245,42,89,49,108,11,204,119,60,122,174,248,17,130,226,15,249,55,233,155,56,77,203,81,136,149,248,208,216,246,59,16,118,177,77,223,199,200,116,183,55,154,241,99,80,194,13,222,232,214,4,47,58,137,53,122,103,189,221,64,165,59,93,
+138,77,76,121,11,70,100,5,231,186,127,227,76,239,64,231,226,202,81,125,190,249,56,240,172,253,164,192,188,123,177,10,177,67,242,148,171,136,183,36,188,4,234,20,49,174,236,109,93,175,81,17,30,136,15,5,169,142,16,69,154,125,152,145,134,72,117,93,10,32,11,102,219,190,44,93,0,56,108,171,15,242,146,28,160,66,138,174,183,187,4,1,117,126,226,69,125,39,119,37,154,96,246,231,36,84,101,173,100,183,194,68,178,243,250,160,125,54,248,32,52,157,119,240,242,103,131,89,114,100,161,219,64,124,220,28,226,21,71,56,198,245,79,140,154,129,196,22,132,183,23,121,34,123,3,182,206,117,198,110,148,22,172,235,207,9,251,124,146,129,43,162,2,148,205,158,52,60,14,54,107,112,73,55,176,57,253,24,124,245,248,208,175,94,179,18,90,62,124,229,140,86,207,252,123,244,133,60,150,21,31,218,12,212,57,12,218,96,225,44,67,200,145,92,20,107,95,50,163,84,121,153,10,82,34,173,240,130,177,241,204,187,241,30,133,99,235,204,119,91,170,221,150,177,33,15,
+47,199,4,150,208,155,87,36,190,131,30,175,25,30,176,19,60,117,86,23,117,201,56,15,55,182,98,143,203,74,28,121,149,26,142,160,113,124,252,58,68,229,248,126,148,73,245,78,125,53,107,194,73,170,109,147,57,90,94,6,73,193,226,90,69,157,23,187,241,46,217,2,190,139,175,97,19,244,225,23,93,169,231,199,110,96,108,61,220,59,28,231,225,95,20,155,148,192,117,57,209,160,28,199,205,142,10,229,92,207,81,25,232,249,46,83,30,169,208,74,223,22,255,91,236,71,249,235,191,252,249,63,251,246,87,223,255,142,13,38,255,251,127,248,39,127,240,143,254,232,71,0,48,16,184,250,178,193,228,243,15,27,76,190,49,103,172,54,161,43,158,163,161,23,159,197,123,47,199,241,107,240,53,52,27,211,251,52,139,71,222,103,98,187,242,146,136,38,60,65,180,158,146,234,64,214,79,10,113,240,222,123,110,205,147,207,21,199,227,242,25,236,94,76,211,146,118,223,246,194,84,221,125,176,199,113,234,218,40,115,222,69,9,1,32,96,74,168,120,221,28,154,146,100,251,138,
+110,67,37,205,202,174,68,57,222,130,19,35,139,134,227,3,61,205,204,113,151,41,3,176,158,96,144,20,204,206,31,125,235,16,253,229,112,227,152,161,84,1,243,7,38,76,15,49,223,185,212,5,203,14,141,56,14,124,6,98,75,107,106,174,251,161,131,81,40,23,160,217,45,1,34,249,204,101,109,168,29,10,105,52,31,226,117,50,148,214,112,156,119,115,152,6,157,45,77,142,23,68,86,227,41,183,202,231,132,120,166,68,73,148,40,139,1,6,205,44,170,110,35,202,41,196,47,197,221,202,224,213,61,37,238,62,171,234,52,2,32,141,231,131,77,65,151,13,100,54,113,88,30,196,137,166,106,27,254,44,130,204,39,193,142,255,205,188,212,31,228,17,54,232,14,21,29,106,39,156,181,6,121,235,245,32,229,169,106,215,235,75,170,66,132,228,198,194,64,29,242,102,36,189,185,23,49,109,253,68,114,168,226,58,238,148,20,15,115,151,121,179,86,208,75,68,80,33,81,2,176,102,125,195,4,78,81,95,137,96,191,86,219,217,181,136,52,206,24,138,94,95,158,31,65,25,
+61,156,104,139,244,182,47,187,20,115,237,97,211,158,60,27,120,120,173,226,202,128,222,182,118,237,45,4,230,250,221,133,99,15,245,100,103,237,26,106,129,206,69,167,99,244,79,178,119,73,151,150,40,187,212,38,26,226,157,10,225,232,0,98,14,154,94,109,95,148,45,118,254,49,106,31,128,77,231,158,137,191,36,179,166,195,34,115,133,165,140,36,111,82,0,239,227,75,20,245,179,19,123,86,212,56,254,181,19,54,45,178,61,35,76,184,102,29,78,161,94,156,250,42,200,53,137,125,157,19,255,25,20,176,18,230,109,34,247,110,237,45,68,73,12,90,83,5,12,111,219,254,132,79,228,5,160,244,252,97,126,242,238,93,79,11,181,72,53,138,24,160,138,130,124,27,216,51,160,34,232,58,200,191,41,245,36,54,200,88,26,203,203,240,128,71,220,206,78,107,123,35,123,215,46,122,18,83,44,112,217,6,85,125,111,23,15,67,177,120,210,130,94,215,54,160,151,220,142,12,121,53,165,182,165,168,61,62,230,2,137,9,146,237,142,61,9,202,16,165,176,197,171,45,187,22,
+97,29,152,149,75,8,23,117,149,76,133,16,114,191,225,2,167,196,211,77,14,160,4,92,129,177,146,99,180,209,186,110,27,104,255,170,141,83,91,47,89,212,57,194,54,129,80,54,173,168,217,122,51,157,64,249,173,200,63,30,82,224,90,6,229,24,113,184,230,155,235,6,218,2,190,44,237,164,43,176,62,141,82,5,195,209,57,255,56,83,5,231,209,43,233,76,3,209,126,184,44,182,16,199,13,115,220,54,227,150,38,12,222,224,197,49,5,40,151,95,138,108,166,9,106,107,49,243,18,111,185,85,33,233,160,206,0,80,54,65,163,125,17,212,79,32,5,133,59,40,161,80,180,245,231,133,138,122,41,241,146,228,67,213,93,209,153,103,176,140,70,46,80,50,76,45,97,162,97,227,105,223,75,82,117,25,144,199,107,82,148,187,45,96,23,213,157,211,51,154,214,111,90,244,22,171,175,161,53,0,244,73,27,87,131,71,235,54,217,221,29,197,74,161,39,190,194,6,64,117,61,1,136,167,212,134,218,158,122,248,37,151,68,249,44,153,198,105,112,148,183,43,176,223,136,13,
+47,67,70,9,11,107,151,119,80,44,40,128,162,13,80,70,145,183,123,164,237,185,111,58,36,244,205,170,212,44,33,165,176,203,214,108,213,85,56,239,94,243,229,165,235,106,107,114,15,250,134,172,95,37,75,24,21,3,207,108,225,207,204,158,194,149,6,44,91,173,29,152,82,222,98,107,82,40,194,59,114,254,66,40,96,167,27,107,133,156,143,29,149,26,188,43,66,43,52,144,74,207,231,121,110,16,100,183,250,244,113,88,126,95,62,125,206,69,202,154,122,93,112,25,33,62,229,168,113,47,217,20,45,213,65,66,3,80,76,143,173,233,90,46,128,113,68,85,5,182,65,41,208,207,116,237,9,125,6,202,205,21,24,31,196,181,88,142,201,84,14,105,39,200,50,91,109,0,44,110,64,55,232,118,120,175,135,148,90,151,236,122,0,90,129,87,160,150,73,142,80,205,47,33,234,19,12,37,14,247,62,25,33,149,52,37,11,241,130,200,180,161,212,214,167,30,62,81,125,146,130,243,106,104,54,196,3,186,2,207,232,53,212,243,225,116,80,93,147,75,241,227,13,129,146,239,
+174,192,237,139,138,145,117,129,238,39,144,232,182,30,65,193,248,142,115,226,112,197,1,208,235,134,6,133,160,180,187,155,86,151,164,30,145,90,192,160,236,112,213,157,13,252,88,251,54,27,177,246,92,42,67,155,164,114,237,152,93,137,5,164,44,195,84,105,111,98,196,107,74,0,246,124,166,81,89,160,133,141,17,58,228,113,175,92,212,188,5,252,84,132,113,153,6,65,25,201,221,93,205,248,100,225,146,15,33,248,189,35,101,3,66,247,241,1,42,229,41,163,182,246,202,252,21,224,92,102,227,46,144,117,243,89,86,182,62,185,212,173,59,105,164,27,221,128,40,15,107,244,121,237,0,149,235,169,119,221,28,94,139,150,230,42,3,5,52,35,106,79,237,170,53,61,219,78,144,93,160,16,53,196,109,146,184,202,223,124,55,114,149,52,49,245,51,224,89,180,45,253,86,60,37,124,142,153,6,151,34,117,105,188,179,182,128,167,60,44,65,13,80,124,227,138,174,184,59,3,128,13,217,53,94,202,160,237,56,171,146,233,131,130,3,28,154,49,122,158,107,42,140,171,4,242,
+162,72,140,158,51,76,55,37,189,225,14,110,118,165,168,82,138,195,155,200,149,58,46,167,59,147,119,148,223,106,25,74,238,70,7,176,205,216,152,246,204,159,114,34,160,226,53,4,42,157,0,209,40,115,78,59,1,250,238,33,57,10,209,120,211,2,200,142,39,102,181,212,194,63,81,150,71,124,102,80,177,5,106,32,81,127,210,162,42,99,186,43,169,50,0,218,117,203,179,112,116,82,24,248,241,167,194,252,174,143,99,186,222,80,30,210,2,190,150,65,145,209,230,156,180,0,251,65,45,96,35,129,130,102,14,0,102,90,217,36,10,211,143,23,85,13,100,204,153,19,0,10,13,87,113,25,102,119,149,138,168,37,104,150,101,144,135,182,200,214,211,103,123,107,12,252,77,5,139,192,0,232,191,2,75,173,156,187,118,172,3,18,47,76,170,50,5,217,102,149,101,46,169,241,220,213,106,65,81,98,25,245,68,110,197,129,59,177,3,255,33,41,198,13,135,235,24,91,168,160,114,17,99,141,119,135,56,131,205,39,25,81,84,98,76,158,220,205,92,129,80,229,30,158,120,27,
+186,185,212,26,2,219,198,83,157,131,219,189,185,166,14,17,64,220,144,102,85,125,237,51,16,53,164,49,184,61,119,226,197,201,182,191,152,149,90,82,3,45,116,220,29,146,121,198,0,167,133,103,76,138,203,104,41,108,65,175,152,101,16,213,97,2,149,128,112,198,139,146,217,222,62,149,140,211,243,136,159,162,254,252,137,133,51,211,221,224,84,137,168,117,184,96,39,80,123,169,107,54,185,163,143,238,120,55,138,78,111,202,193,22,101,203,145,180,128,164,232,12,178,143,167,61,65,148,246,57,174,73,45,96,180,62,65,109,145,151,66,215,12,45,80,159,162,115,251,14,58,86,51,88,141,100,239,253,33,182,220,162,5,164,247,243,200,225,101,60,54,242,102,51,162,171,193,214,186,176,59,232,112,159,30,79,170,139,16,121,58,122,61,83,200,176,147,7,228,73,100,203,169,200,198,84,1,42,91,54,135,192,245,14,61,191,181,253,239,232,13,180,203,234,27,200,32,121,93,168,133,43,31,159,231,0,109,9,160,175,250,188,75,134,142,97,38,112,62,71,192,4,117,219,126,208,
+236,31,94,23,158,187,40,183,105,154,86,170,7,188,34,143,45,71,222,225,250,184,251,163,252,61,181,20,217,33,150,20,18,89,252,89,142,37,199,171,138,31,138,207,250,12,128,29,84,31,44,82,149,230,87,130,22,80,160,166,67,204,114,179,133,245,134,158,80,45,70,13,150,125,116,61,160,112,134,174,5,226,113,133,35,144,2,0,187,129,80,215,178,5,4,224,152,37,0,4,78,129,1,126,56,0,0,254,112,64,72,1,184,71,74,0,38,81,117,205,142,143,254,211,18,243,197,198,204,181,172,219,51,183,163,126,253,173,229,250,159,191,249,249,55,191,252,246,39,95,253,229,175,127,246,253,183,63,249,141,195,250,234,103,159,22,235,183,182,235,159,124,253,253,215,255,235,175,127,245,23,223,252,141,61,192,255,245,247,223,253,226,219,159,252,248,127,248,241,31,254,248,15,191,236,248,253,207,190,253,55,63,254,195,95,253,242,39,63,254,195,111,127,254,211,111,254,221,143,255,155,111,126,254,227,127,240,235,95,253,235,191,182,103,63,250,163,63,251,179,63,248,179,127,12,0,
+235,128,212,47,246,108,244,131,61,147,48,103,204,244,220,203,61,226,124,183,143,154,128,58,26,157,214,208,136,5,236,222,80,121,251,61,215,156,70,240,78,201,13,24,54,236,81,117,129,140,160,129,186,171,223,32,56,207,147,166,247,126,189,242,33,137,64,206,216,197,2,36,64,136,8,40,6,69,65,177,51,148,2,161,33,31,175,222,174,105,214,17,112,226,11,149,43,137,1,235,239,11,224,150,141,177,153,124,177,165,99,233,54,170,78,58,126,71,160,42,103,71,179,115,175,155,8,178,219,149,34,134,51,106,218,150,10,86,108,26,86,2,159,87,218,110,25,164,134,16,108,236,104,64,19,145,151,79,251,174,64,65,211,211,9,229,245,106,123,11,171,21,112,63,74,58,13,200,35,221,138,222,46,167,27,196,228,114,162,43,10,201,110,107,177,138,130,133,186,56,239,219,38,97,69,235,178,237,107,87,136,214,71,16,55,198,81,216,146,50,48,18,3,223,136,209,199,42,215,59,39,127,107,164,111,149,65,207,218,86,33,52,241,253,81,36,192,209,57,186,73,126,252,45,152,77,
+192,98,243,184,252,184,51,24,153,31,177,10,199,169,87,6,15,149,12,228,21,83,198,214,16,121,105,217,98,213,4,251,125,77,145,80,98,188,61,204,88,99,251,185,170,175,138,80,139,165,132,109,28,213,164,119,62,87,15,201,66,149,161,106,178,41,234,4,243,249,5,73,29,254,108,170,222,41,97,88,7,146,119,198,158,121,185,201,87,50,14,97,200,228,83,119,86,46,52,106,68,244,68,57,160,239,80,98,10,156,228,86,14,192,132,96,32,79,20,194,39,205,123,7,169,229,146,75,132,150,92,40,50,227,61,146,241,237,17,133,64,120,16,92,37,113,128,152,180,133,200,111,197,244,79,190,253,213,47,126,246,245,255,249,171,175,254,143,175,127,246,235,111,190,250,250,231,63,253,234,39,95,255,252,171,95,126,243,245,79,190,255,234,211,207,255,228,103,223,254,228,127,255,213,223,144,214,119,63,249,159,126,250,237,239,178,243,255,248,207,62,237,252,159,253,9,8,140,6,196,190,232,197,248,131,94,12,204,89,189,138,173,106,177,232,24,226,192,182,123,18,139,212,51,191,184,
+5,78,239,52,100,159,23,161,160,103,115,47,16,47,36,60,89,248,22,2,97,2,12,46,138,207,206,230,78,148,117,154,60,31,164,192,73,152,102,244,130,35,18,103,199,10,104,14,83,12,171,64,53,249,46,78,22,229,38,220,192,32,106,1,54,166,125,196,59,120,118,226,224,143,149,12,79,90,242,60,96,192,210,95,249,214,70,179,250,52,55,82,171,144,213,164,238,60,71,35,120,169,105,28,121,130,13,243,8,206,173,36,22,35,71,238,1,53,247,228,229,38,203,60,204,216,111,232,200,164,74,178,164,189,49,168,229,31,195,32,163,208,157,135,80,14,195,133,165,145,56,195,30,226,121,109,234,186,223,203,75,57,195,34,143,128,211,26,135,124,238,85,182,149,200,194,90,101,14,136,39,249,234,43,199,92,13,226,77,166,3,223,130,201,209,74,23,82,128,229,221,205,202,31,109,120,110,48,130,196,17,67,41,151,207,232,53,130,51,210,74,52,194,74,246,247,116,142,4,124,163,70,44,81,101,159,128,118,166,81,198,176,52,45,180,190,15,66,157,231,140,212,25,17,92,3,
+82,204,218,59,242,57,129,84,114,3,211,7,31,121,118,175,95,223,77,224,94,189,126,215,102,49,143,59,32,253,67,140,180,160,235,214,104,93,13,210,99,12,88,219,29,204,141,97,191,32,219,252,148,147,51,123,196,199,115,143,192,10,156,201,158,223,105,23,36,86,35,124,21,174,132,8,32,232,148,34,4,115,233,246,145,214,103,181,159,240,32,107,138,134,65,32,41,239,58,249,135,227,5,156,14,189,250,71,124,143,38,212,80,192,17,202,116,8,218,141,48,169,19,163,16,54,181,139,60,70,145,128,232,238,246,222,68,248,158,75,189,201,132,148,24,1,30,233,237,210,2,125,150,255,211,209,230,245,91,244,120,203,125,160,239,245,152,95,251,82,155,160,195,5,101,41,142,94,150,68,149,198,194,147,98,214,145,244,15,23,153,223,182,160,201,140,185,28,156,179,120,5,220,74,69,74,10,60,115,141,103,75,50,245,217,209,4,131,46,47,74,53,107,80,69,48,49,193,150,97,225,121,143,164,9,231,100,24,66,28,221,211,142,99,228,197,252,117,255,60,123,49,60,207,210,251,
+237,186,35,43,177,249,243,32,26,14,124,126,159,240,215,77,221,62,214,34,207,208,136,254,96,18,114,33,236,39,45,155,145,77,228,74,37,100,187,126,165,140,33,49,35,154,101,162,86,82,50,8,183,78,112,184,231,74,77,218,102,206,9,115,1,55,64,134,84,57,228,74,123,54,111,107,55,133,105,156,123,210,221,246,149,96,161,241,198,120,199,188,39,158,138,53,228,48,63,28,83,202,65,80,118,190,234,228,145,94,139,130,65,166,48,101,12,205,75,232,37,145,86,89,45,17,109,77,200,214,70,227,65,8,23,157,103,193,20,142,173,221,159,29,160,137,94,23,210,58,86,74,167,95,58,245,179,79,145,2,114,96,39,242,167,51,63,200,186,175,180,72,74,165,187,176,94,15,181,208,249,248,147,125,178,56,118,165,27,24,198,25,31,219,97,33,112,221,25,68,143,226,125,184,192,194,199,171,49,133,192,182,204,50,54,200,157,67,208,152,18,100,215,172,85,161,196,120,253,172,181,51,174,188,121,151,23,134,94,60,112,168,86,133,200,13,188,44,7,37,58,161,252,156,129,235,
+10,130,119,52,102,176,162,235,28,112,217,60,212,70,145,68,233,123,174,188,201,61,183,250,144,135,229,121,176,107,160,51,82,143,51,51,246,29,156,231,41,81,157,81,204,221,184,190,27,10,113,114,71,44,62,99,230,129,117,148,166,230,163,149,44,110,142,221,251,73,78,138,95,24,34,228,76,12,236,91,153,58,249,80,9,178,130,14,206,90,50,47,170,197,199,103,220,56,244,206,54,234,234,103,9,70,23,124,53,63,2,39,57,222,114,117,9,120,45,95,101,18,3,55,111,88,56,71,130,164,68,98,147,194,48,51,188,36,111,33,82,234,192,23,69,136,44,66,138,106,8,238,232,251,85,103,172,64,174,247,80,199,200,226,245,48,60,104,217,188,36,99,115,100,50,124,29,70,197,236,198,108,85,192,249,184,41,3,138,60,148,65,94,243,177,198,200,111,70,140,245,55,116,5,70,103,228,89,35,121,248,55,148,58,126,162,113,245,58,0,206,111,131,221,255,246,245,95,125,245,253,55,255,238,251,175,190,249,12,97,223,253,242,239,127,245,139,95,126,247,139,239,126,249,101,225,
+226,235,159,125,245,231,223,253,252,251,191,255,213,143,255,222,143,255,213,207,127,252,247,190,250,246,87,95,125,255,23,223,124,245,205,103,64,252,238,207,191,250,197,215,191,252,250,223,254,242,235,95,252,197,223,136,132,159,101,255,51,43,27,127,252,199,127,246,7,63,250,71,127,12,0,155,0,127,51,117,106,152,179,98,18,225,209,54,104,240,246,116,128,197,86,91,121,122,205,37,179,37,78,121,36,89,158,214,201,164,52,155,140,172,163,33,124,24,227,210,45,69,148,63,138,170,59,136,214,168,120,9,148,115,202,251,16,13,107,163,71,62,55,36,237,64,49,124,3,252,98,111,82,35,51,85,221,142,91,234,7,30,200,118,52,78,244,99,164,37,95,189,97,210,60,60,136,65,104,93,33,150,182,52,179,129,70,222,98,134,83,185,77,212,59,150,231,14,187,64,18,49,85,107,121,97,49,168,88,156,96,82,32,42,48,132,91,210,202,217,250,225,106,107,237,105,74,55,31,147,113,151,90,115,197,163,68,203,217,32,164,160,118,42,196,214,204,27,183,167,117,86,173,116,182,147,
+134,184,178,247,98,107,194,237,58,68,132,100,9,55,163,165,200,36,36,237,21,187,120,209,123,169,48,90,240,90,236,12,206,128,14,176,176,209,253,22,254,255,248,179,159,125,247,87,191,250,27,75,69,159,88,191,16,254,33,241,252,249,47,191,251,203,223,188,252,233,39,214,31,255,131,159,126,247,87,255,177,169,249,146,118,62,141,205,55,191,131,247,159,254,233,63,252,131,31,253,201,159,2,192,99,0,253,11,239,193,95,243,166,85,49,0,110,140,228,165,151,236,181,192,244,84,115,251,88,75,111,222,39,165,6,121,1,190,196,52,130,147,140,109,72,211,54,124,143,41,148,81,129,102,167,77,232,135,82,151,93,3,36,216,3,252,93,48,180,165,1,183,76,215,198,189,41,246,75,14,103,17,182,167,251,125,117,9,52,118,104,144,71,126,178,4,103,119,48,158,224,221,11,138,190,77,87,43,243,104,47,86,65,17,156,207,233,40,206,71,108,134,53,154,142,105,199,180,219,16,106,211,121,112,168,224,246,252,176,119,44,14,26,170,30,20,214,51,246,111,233,161,93,190,122,37,
+216,87,122,166,239,130,119,55,7,37,75,209,91,208,239,169,249,140,65,228,42,64,104,194,83,230,92,104,9,223,207,104,223,51,126,168,235,71,210,68,183,225,177,68,247,202,243,57,102,106,4,112,123,127,35,145,127,162,249,247,44,127,80,247,127,74,238,159,127,247,253,63,255,245,207,126,215,255,122,249,59,128,191,11,224,87,95,104,253,234,171,159,127,247,253,87,95,127,17,239,55,63,253,143,152,126,247,235,127,243,179,223,169,199,63,254,209,39,206,63,2,128,123,0,218,23,156,195,191,182,206,52,55,214,203,93,226,192,167,213,35,157,116,111,87,246,87,201,25,213,231,199,222,27,17,190,16,245,218,243,66,90,171,128,210,149,162,20,55,186,25,230,18,115,212,57,38,93,246,67,94,224,118,34,97,186,57,163,87,147,124,181,129,136,180,107,43,166,0,6,88,55,200,242,39,5,11,171,45,51,155,100,218,62,27,241,101,27,7,60,158,79,11,18,46,108,170,107,33,97,221,9,69,3,65,254,110,77,135,99,75,169,12,170,131,57,118,190,59,166,53,238,119,233,171,77,
+221,0,213,0,81,139,163,91,103,104,58,143,179,183,161,9,103,147,120,200,111,179,47,127,1,248,148,150,210,67,128,181,76,60,193,180,248,64,76,190,116,215,164,113,58,80,209,157,191,64,137,244,228,178,175,141,140,97,65,197,129,27,144,52,214,42,135,168,19,217,132,127,115,131,239,117,243,244,163,243,88,84,95,30,253,183,43,69,35,248,45,227,127,250,179,239,190,254,254,219,159,255,219,175,126,241,221,183,63,255,254,247,201,245,55,104,127,143,96,255,142,240,223,158,240,127,157,158,255,61,244,127,241,139,111,127,254,59,192,255,163,63,249,211,31,192,135,255,3,240,118,230,101,179,14,188,164,245,70,36,140,19,153,212,204,111,83,156,184,120,127,30,162,180,36,251,254,92,192,195,233,85,78,219,237,106,64,31,112,113,145,139,165,6,193,0,228,253,185,60,211,176,156,123,24,214,150,236,68,240,22,151,207,150,46,210,104,52,109,197,237,2,128,143,190,33,16,240,164,118,174,79,80,8,16,120,131,186,151,120,46,223,18,152,28,153,200,190,224,166,228,27,55,21,247,6,
+153,4,60,125,200,186,48,23,36,205,158,28,73,169,89,101,114,73,216,92,224,36,76,93,148,150,60,31,194,131,132,161,100,173,25,247,155,13,38,129,240,248,160,102,10,64,70,61,244,150,90,114,162,113,163,110,31,161,240,243,32,37,90,22,131,28,231,112,246,26,1,160,30,182,121,223,5,109,12,65,198,77,241,33,4,122,56,13,40,119,19,206,200,175,240,23,238,71,251,221,89,2,164,122,240,196,189,233,7,127,190,5,204,180,138,114,66,128,252,132,236,133,165,31,232,15,82,42,141,2,2,58,249,51,224,240,95,213,37,95,253,183,127,245,237,247,127,241,213,175,62,89,127,245,245,47,127,249,153,31,255,187,255,202,94,250,187,238,249,127,169,123,254,131,190,248,167,223,126,243,179,159,254,237,194,83,20,9,208,106,209,190,203,199,162,221,243,216,152,138,122,222,71,210,165,174,198,146,202,125,34,199,60,186,120,150,39,107,251,79,140,193,19,200,209,17,170,57,92,111,77,77,67,147,90,84,148,116,95,21,145,42,18,45,200,138,173,49,43,228,125,165,87,56,10,211,
+38,32,166,250,174,102,116,235,16,77,176,94,13,192,12,10,181,147,170,87,12,83,231,202,86,163,46,68,43,219,119,105,12,67,243,168,149,189,168,147,131,97,33,13,62,217,184,98,116,229,253,22,199,139,59,134,4,83,225,154,39,85,99,241,65,152,157,220,21,245,172,174,99,220,206,140,180,90,247,146,66,67,27,23,234,205,76,125,190,85,220,42,76,26,84,195,87,135,172,165,226,0,44,91,107,62,221,68,224,218,170,169,252,58,142,119,72,63,22,222,71,22,132,133,248,7,227,255,116,157,234,139,227,254,241,63,248,243,47,168,126,79,196,255,95,126,254,187,156,244,159,254,195,63,249,193,73,119,1,255,209,34,212,23,144,92,28,201,95,95,93,134,134,136,74,157,198,78,113,16,255,241,84,135,200,216,3,220,18,126,119,117,185,14,151,142,125,17,118,19,20,192,78,16,64,22,17,239,237,86,4,94,124,55,103,184,167,45,217,35,125,167,130,3,79,69,116,49,174,58,251,173,111,19,194,219,32,31,161,5,201,234,121,224,88,123,213,232,16,214,235,21,14,86,111,137,
+125,52,20,248,94,170,34,139,123,133,72,128,237,27,57,25,204,9,234,191,32,199,203,142,8,172,96,213,70,185,133,250,9,159,116,170,17,206,14,83,87,58,205,127,203,224,179,85,223,252,219,111,126,249,251,219,253,123,210,220,255,23,155,255,95,10,112,159,133,254,159,137,110,72,232,67,182,103,128,193,72,112,252,10,32,186,152,233,103,56,144,124,229,232,159,26,214,251,12,195,60,25,130,100,193,6,248,20,234,105,116,46,64,1,15,124,94,87,240,81,13,247,137,62,212,60,129,80,128,79,3,217,240,110,240,226,16,211,117,154,181,78,18,215,7,100,69,210,131,65,48,141,177,184,103,157,0,240,45,166,174,73,43,32,62,14,177,8,51,22,181,157,37,134,142,110,129,132,182,252,146,99,108,128,169,151,9,142,192,73,112,29,203,49,135,121,194,200,161,15,235,195,93,209,184,163,167,249,103,148,139,137,244,75,146,228,9,54,111,39,113,123,52,169,136,101,57,144,62,120,218,63,1,131,134,147,236,154,19,3,40,138,42,24,134,255,160,249,165,43,62,5,4,96,167,106,
+64,242,239,39,253,95,12,95,255,226,251,95,126,6,190,191,139,95,191,59,126,253,203,47,43,5,255,249,129,251,3,188,255,91,22,245,255,207,12,255,75,163,255,95,126,251,151,127,55,197,255,221,51,212,47,104,126,143,32,191,156,254,187,41,254,223,10,224,223,255,125,106,252,167,223,254,236,155,255,204,2,223,143,254,232,51,19,253,233,143,254,49,8,236,2,62,1,63,105,30,239,127,253,217,37,167,161,23,128,211,3,59,232,19,51,125,246,15,23,218,158,166,213,134,240,197,162,173,214,45,17,55,150,48,225,5,223,129,125,128,167,113,11,147,129,119,181,204,97,10,48,191,7,96,41,69,108,212,67,41,209,58,253,150,173,234,242,184,118,227,6,107,82,29,228,157,143,220,153,149,205,56,199,131,98,29,118,56,27,43,239,239,103,255,214,49,118,4,207,3,206,166,121,31,12,164,82,128,244,135,135,73,122,161,60,78,111,7,64,58,245,249,208,71,193,31,156,207,187,115,193,110,203,164,196,182,89,60,131,177,13,168,22,211,93,215,220,154,44,168,124,6,84,30,239,80,
+224,8,20,106,118,65,67,206,103,85,50,251,226,62,177,6,166,55,123,179,114,8,31,146,160,121,12,207,193,62,209,102,64,132,125,236,38,201,224,84,209,100,126,100,49,23,254,22,199,174,219,247,78,130,230,125,125,66,81,177,31,111,14,123,243,125,155,141,174,146,108,192,83,248,24,193,129,55,253,126,63,35,79,221,186,30,255,115,3,122,31,129,220,206,203,72,215,91,60,59,143,35,250,96,127,58,183,225,183,89,50,246,136,185,171,10,126,28,68,197,114,61,96,178,225,45,25,157,57,196,235,145,69,205,32,10,90,217,46,91,249,50,55,241,95,71,145,7,233,89,117,99,13,77,105,210,124,140,34,160,239,167,1,76,211,120,56,14,196,228,116,61,61,148,225,224,25,76,185,50,12,186,248,156,31,244,120,161,128,225,253,158,212,222,167,245,89,3,199,81,194,61,2,54,30,125,214,217,24,236,56,213,236,43,162,17,219,50,2,19,230,42,92,234,159,59,140,248,232,140,125,115,109,147,142,123,243,38,113,138,122,147,230,240,104,29,89,204,51,116,249,116,25,144,46,178,
+206,106,39,117,94,246,211,93,190,216,92,84,27,247,203,114,54,190,45,236,187,194,96,169,215,160,85,73,206,212,249,216,196,223,46,20,168,227,225,164,220,154,171,165,192,219,27,34,20,79,121,140,202,5,218,140,217,135,183,183,55,111,39,126,27,95,239,129,117,242,66,192,7,189,249,169,228,113,58,95,250,20,66,162,98,197,163,15,250,148,151,199,105,213,103,22,164,56,139,193,166,143,227,240,32,137,53,63,97,48,13,186,250,245,90,204,234,231,189,69,91,31,212,75,59,143,171,49,74,105,216,224,158,23,148,245,60,104,33,22,77,98,61,79,143,109,86,246,244,221,227,188,239,52,135,157,181,177,130,77,4,11,197,117,222,149,250,2,142,103,69,161,4,2,61,24,89,196,14,162,43,24,37,164,114,245,100,171,220,36,111,149,214,129,135,202,156,177,44,42,219,127,62,89,31,236,145,85,170,131,94,227,213,160,245,172,226,144,199,101,78,210,113,140,167,248,195,19,86,100,162,238,146,66,161,218,215,210,109,43,101,3,190,3,30,120,55,152,164,249,104,44,115,38,80,163,
+136,63,147,104,119,73,227,81,244,146,217,103,246,99,196,125,180,109,18,63,88,215,236,20,255,166,21,14,119,150,187,94,250,160,220,23,183,228,153,48,163,24,100,7,232,253,4,58,27,31,232,206,233,82,223,55,71,218,233,132,67,52,84,219,154,205,199,225,218,188,151,85,199,187,33,70,194,251,107,160,107,182,99,152,114,56,68,239,245,152,144,26,69,210,7,214,208,91,75,14,62,111,148,185,112,6,239,31,1,88,164,46,8,62,195,100,231,166,54,56,153,2,79,7,65,230,131,71,165,206,250,87,241,221,104,121,100,102,122,93,51,58,249,210,208,219,96,112,119,244,47,201,78,55,35,192,190,152,50,51,146,146,48,145,128,207,167,193,225,113,157,56,182,169,130,37,247,129,80,145,49,215,123,238,16,187,59,5,200,155,228,225,28,23,171,93,39,199,31,160,104,233,55,131,236,116,208,136,32,170,48,142,177,146,207,229,167,57,5,237,232,204,247,101,182,12,51,222,11,171,195,91,180,210,27,217,173,226,85,143,120,63,41,22,214,216,54,105,133,27,45,40,154,251,133,200,
+36,107,3,29,148,20,88,22,221,213,21,207,170,205,209,220,216,73,91,242,182,145,88,169,102,227,246,158,228,236,29,55,104,125,189,120,84,208,29,5,55,224,224,156,241,247,176,123,243,130,55,153,110,134,87,50,202,195,226,56,207,233,228,125,174,161,94,7,207,174,87,110,70,7,69,113,137,168,33,117,179,176,219,247,130,88,69,215,206,52,27,154,184,231,113,103,229,80,160,172,9,138,11,67,123,107,141,14,248,238,110,189,183,228,193,44,213,185,45,178,143,47,83,197,161,231,161,54,241,22,5,36,22,62,192,86,39,103,21,252,57,68,231,163,7,41,70,188,91,230,134,208,163,204,56,222,100,33,104,90,44,13,166,146,163,248,134,143,125,75,86,169,11,143,153,229,190,163,146,5,215,61,73,77,161,232,82,74,46,26,100,21,206,27,200,99,158,32,36,31,27,59,231,186,231,244,199,163,172,132,115,237,63,238,244,248,243,98,193,172,62,242,207,156,251,71,193,187,88,88,222,52,51,5,103,119,89,56,155,9,172,29,247,154,35,62,178,226,244,131,112,141,100,67,1,43,
+167,230,28,53,81,39,6,225,65,18,196,28,41,89,117,60,62,216,49,31,111,159,112,194,143,154,170,243,24,128,180,141,136,144,202,190,114,76,167,170,25,46,154,231,156,224,203,135,236,201,20,24,196,174,6,220,60,50,141,149,130,217,164,94,166,50,109,181,219,201,73,16,126,40,207,215,108,159,40,73,54,142,157,55,76,27,29,98,235,175,197,14,155,59,184,199,212,110,147,23,138,112,250,247,159,97,40,44,88,147,142,135,206,253,131,226,123,235,51,43,81,22,152,26,124,237,251,143,199,172,3,144,246,217,118,15,116,12,235,112,189,174,56,70,191,248,245,142,237,46,97,43,35,204,172,182,3,119,199,193,132,163,177,23,156,83,214,26,23,66,235,105,125,110,86,234,124,227,156,105,116,39,237,164,229,183,37,33,145,253,228,196,12,179,160,179,35,145,52,178,59,162,252,220,125,219,8,46,82,252,181,81,237,95,36,125,126,10,129,50,178,52,247,147,35,138,33,153,56,224,51,248,74,196,58,56,246,72,235,113,37,53,197,139,16,63,137,214,58,194,62,236,73,149,14,223,
+147,254,187,131,46,52,128,118,221,139,151,86,56,69,243,203,199,169,91,155,101,153,78,184,111,154,62,202,21,5,167,228,222,35,35,159,143,122,234,120,149,92,62,94,82,30,167,147,77,144,138,16,213,209,71,191,205,81,200,10,194,199,128,241,32,189,77,181,13,223,65,171,178,86,55,201,34,15,37,58,91,7,41,247,245,246,52,151,99,238,229,167,243,117,51,165,61,2,11,249,101,212,186,182,2,131,238,189,187,216,63,65,56,124,120,183,243,16,234,69,47,244,137,140,115,178,103,207,131,107,242,126,31,223,113,216,254,214,146,35,208,237,109,142,160,194,75,120,196,163,231,226,35,198,99,63,174,247,203,245,212,122,174,223,168,97,78,248,35,9,20,108,56,131,78,240,25,190,72,233,47,240,207,28,184,204,58,187,184,43,7,232,175,32,176,143,204,209,52,227,196,135,137,237,37,173,63,206,208,222,148,98,150,176,33,31,8,78,70,219,204,134,27,137,166,199,89,188,236,6,237,147,147,152,117,229,134,83,156,105,243,88,207,158,51,39,56,49,200,81,226,219,87,75,72,111,
+40,133,175,79,208,171,65,107,93,121,207,170,13,240,209,96,24,79,87,241,225,225,48,58,30,204,40,34,175,104,112,214,119,196,24,114,58,121,107,46,78,179,139,114,218,56,230,75,11,16,189,151,25,203,36,245,41,212,204,118,106,165,151,37,53,89,0,60,222,1,122,140,5,240,121,230,41,182,164,186,196,212,233,254,210,75,3,57,152,208,116,163,228,88,65,228,20,125,126,210,91,150,240,170,112,233,189,113,10,40,51,228,88,150,160,8,143,220,34,125,179,83,142,131,59,105,51,72,222,22,205,138,45,190,19,175,225,243,15,14,145,128,84,83,223,30,4,229,109,87,59,245,131,196,163,108,48,131,229,156,126,41,217,224,47,23,178,196,208,13,231,77,95,6,146,134,246,218,65,213,167,156,184,250,230,117,177,31,78,7,108,234,155,240,45,188,50,217,227,220,92,216,174,152,102,206,9,24,235,219,36,182,145,220,6,226,70,251,9,8,177,228,54,215,126,83,127,229,220,154,188,166,33,180,108,245,107,173,42,99,97,127,181,77,21,222,46,106,13,199,106,31,182,39,29,178,
+89,127,82,159,37,215,142,59,86,16,194,65,150,145,102,238,190,78,88,234,98,198,178,30,24,114,27,220,45,59,181,140,138,28,96,216,253,204,94,232,99,69,2,153,158,123,175,163,57,165,105,169,99,160,218,230,164,79,121,148,131,247,164,155,208,41,36,197,109,48,248,228,112,72,134,21,233,231,27,40,153,84,39,74,215,63,10,23,134,129,110,58,5,58,163,173,70,210,210,98,233,218,225,163,65,202,95,170,142,88,121,96,12,28,189,55,224,183,115,113,190,138,219,39,119,139,242,33,121,115,88,153,1,136,238,209,133,245,88,107,243,67,172,136,77,118,73,46,139,124,237,156,158,118,65,229,227,78,92,206,85,89,146,35,130,20,228,53,228,213,211,56,23,165,66,206,87,131,50,114,123,32,62,251,53,178,240,57,39,203,228,10,21,86,193,9,19,44,238,102,80,210,55,107,234,138,28,73,95,179,36,208,157,46,87,132,31,22,163,205,34,81,239,19,76,231,203,254,248,246,81,227,41,156,15,116,40,139,23,6,24,246,28,38,28,232,159,7,141,100,212,50,127,138,59,71,
+80,142,19,173,88,10,72,91,118,218,119,175,158,7,235,148,101,47,71,74,216,15,83,141,242,48,60,14,2,94,23,203,146,110,31,153,73,134,111,25,40,31,66,222,114,198,112,44,65,41,97,221,121,39,189,242,163,83,176,117,106,48,246,102,163,173,232,144,32,62,121,98,150,222,61,249,42,148,20,113,233,33,169,230,92,4,65,228,230,163,191,206,249,202,55,74,235,125,112,127,77,190,186,156,109,206,107,35,53,63,197,189,224,229,90,137,223,194,215,112,99,8,70,200,154,1,122,11,236,7,25,82,159,62,101,232,250,12,217,213,47,230,173,11,58,186,6,19,174,182,14,160,55,106,128,43,71,213,190,30,30,47,120,168,179,11,98,206,70,27,231,105,3,191,173,31,38,88,159,179,130,153,104,60,44,202,78,81,167,197,47,151,203,93,61,214,188,19,239,111,217,121,79,42,121,72,226,30,250,244,81,96,222,247,130,248,35,188,74,58,252,166,212,25,19,116,66,73,107,117,223,73,29,201,131,84,241,71,162,31,81,177,5,21,65,54,144,56,225,100,101,234,56,252,8,239,
+42,116,197,203,50,9,142,61,208,214,119,168,88,174,170,113,56,71,201,211,241,177,192,246,30,104,216,73,18,7,39,30,149,172,189,28,44,45,230,54,213,86,194,37,144,7,111,196,104,35,69,183,178,169,215,217,107,145,141,115,222,109,91,84,178,167,10,72,82,29,57,241,25,180,126,191,15,111,222,53,240,186,89,67,254,47,194,222,171,183,121,176,221,210,251,43,251,40,72,14,230,44,152,36,63,34,71,249,3,19,96,127,3,12,144,2,76,128,28,91,150,45,217,170,182,122,167,213,173,222,37,171,210,182,154,213,173,222,123,175,84,111,148,200,232,125,191,4,59,3,4,136,143,68,155,160,40,114,221,247,186,214,243,60,162,37,11,113,219,121,143,83,76,51,34,198,236,119,166,242,169,80,23,237,165,20,179,117,92,117,95,153,119,63,197,79,151,54,30,15,90,12,55,45,7,215,60,198,115,29,208,211,57,243,73,162,105,33,217,112,244,163,116,61,233,117,122,85,0,196,90,175,200,101,221,139,188,44,58,221,31,185,249,163,109,161,193,174,213,32,217,82,252,222,39,10,
+99,65,4,181,201,122,103,229,193,37,19,119,142,238,249,171,227,237,87,127,30,165,166,157,7,185,43,180,76,245,213,122,156,228,172,124,167,67,145,254,204,244,28,93,213,241,79,148,177,55,28,171,103,79,22,84,177,163,124,177,29,3,109,230,195,125,26,250,205,63,148,118,66,209,111,206,51,174,122,231,53,161,7,187,173,236,0,131,174,8,26,222,180,140,68,172,85,171,188,214,77,130,40,253,154,90,165,116,84,50,23,82,239,82,43,72,211,6,176,105,208,127,204,35,200,161,248,76,68,236,52,196,233,164,92,54,194,159,197,97,148,150,174,48,136,94,113,207,44,142,29,2,38,194,85,124,47,219,25,48,24,102,134,5,87,250,170,66,6,151,50,95,204,27,86,92,224,87,170,233,151,72,220,91,144,10,200,147,11,62,206,190,30,202,115,201,110,215,96,21,6,79,180,228,135,42,83,162,130,184,149,91,248,163,64,193,251,19,69,123,56,164,150,203,210,169,31,74,89,18,70,138,75,55,84,150,244,179,121,143,46,235,204,92,148,84,21,212,208,105,40,154,161,44,3,151,
+122,218,201,124,181,12,60,89,183,235,181,135,70,103,228,196,101,99,122,124,96,128,205,83,207,163,8,133,132,116,119,47,95,58,91,206,244,63,74,28,190,222,154,145,147,220,106,2,92,65,247,148,56,38,149,107,188,128,36,83,180,150,152,222,237,230,90,24,182,23,142,254,46,174,151,223,221,244,121,159,125,116,223,112,101,121,99,139,76,235,214,116,157,119,167,167,155,198,79,96,125,169,164,52,169,73,234,26,205,219,113,235,91,63,62,25,193,250,239,16,73,93,246,75,36,222,167,95,128,238,20,51,177,135,251,168,176,39,171,70,202,45,183,161,83,224,162,116,70,55,122,69,82,70,108,184,239,64,5,53,202,61,35,147,138,108,248,151,53,23,112,187,103,26,107,106,121,68,7,83,3,136,204,202,39,203,103,237,112,218,12,181,126,130,251,99,228,81,118,46,77,94,255,86,170,169,151,235,82,97,31,137,123,237,119,95,250,82,54,63,100,228,107,84,17,222,189,178,38,151,44,93,121,247,3,177,171,63,18,52,53,67,10,29,160,173,253,17,181,68,84,232,153,229,50,111,
+159,184,190,224,69,188,240,139,94,26,223,55,56,92,94,167,12,242,198,96,95,177,179,157,223,101,234,103,62,173,48,108,223,226,226,5,216,51,19,191,228,143,125,195,160,183,226,199,153,155,154,168,202,36,42,97,76,247,82,170,99,113,32,149,50,111,252,161,97,21,35,209,23,212,211,116,98,255,241,157,192,185,92,197,67,7,250,119,145,58,94,185,91,59,104,194,188,106,132,62,61,163,132,235,80,112,30,30,83,90,214,84,113,179,173,22,112,97,3,251,12,13,81,161,195,138,229,56,4,145,75,95,137,34,212,198,132,59,6,193,243,118,196,1,67,84,20,72,215,136,27,231,33,78,225,130,169,74,198,225,155,149,85,215,117,3,205,184,222,43,53,126,53,127,43,192,206,187,171,215,159,229,42,20,165,72,183,82,38,80,174,2,153,129,231,91,222,161,55,1,234,153,221,129,194,111,190,54,253,18,121,118,202,91,58,143,104,12,103,240,81,3,89,243,13,170,114,5,144,78,59,161,52,246,76,154,181,69,136,146,66,103,184,206,113,15,201,53,24,215,47,154,84,59,95,128,
+46,4,40,93,67,140,178,140,126,36,53,215,173,156,213,105,121,113,221,240,208,194,222,58,231,94,141,114,6,15,197,173,152,130,223,110,65,255,13,58,26,109,252,5,232,84,184,117,126,229,84,80,182,209,244,208,49,117,183,68,87,214,70,179,82,190,179,100,95,138,63,194,250,114,202,111,91,244,7,5,145,118,131,99,35,50,35,103,110,175,111,47,95,178,168,229,175,226,102,113,125,41,12,174,164,156,79,239,27,170,36,50,232,220,197,162,208,217,45,113,12,249,149,206,37,78,37,127,84,119,135,110,61,95,105,84,192,52,25,13,180,15,205,149,22,239,27,110,90,235,204,238,29,229,245,9,207,54,100,69,199,82,164,81,217,176,5,71,7,205,193,223,20,240,27,99,6,116,8,86,253,26,80,114,69,47,7,238,171,183,107,251,205,129,238,226,250,243,179,23,250,118,221,69,105,31,29,161,182,75,187,233,50,253,154,224,185,157,87,158,166,228,182,214,15,15,217,198,249,189,100,216,64,69,49,222,176,33,218,207,218,19,126,47,159,133,1,232,145,113,69,165,84,28,250,221,
+8,125,103,93,133,222,203,99,144,106,97,146,139,212,189,180,237,246,244,5,218,56,234,100,140,155,214,62,6,157,164,201,78,104,104,232,67,7,206,177,128,255,190,108,48,161,247,203,78,164,253,130,207,36,207,189,149,211,17,242,163,20,241,135,4,68,137,219,205,100,125,24,121,176,32,213,140,148,19,174,120,222,25,26,235,234,72,102,254,212,186,250,143,141,14,187,43,240,89,109,194,178,7,165,149,70,177,189,49,22,88,107,103,219,43,226,252,77,112,193,141,159,205,115,76,98,54,93,130,188,232,124,89,43,161,10,48,175,28,190,41,136,254,196,103,155,140,156,238,224,199,199,248,46,182,235,76,153,195,92,145,160,60,232,122,53,91,208,73,55,71,222,221,49,226,198,156,205,174,16,145,66,252,73,95,153,240,141,217,242,151,12,74,16,174,103,139,47,13,193,30,175,129,193,51,181,63,107,1,98,67,247,183,109,172,155,84,252,232,116,240,224,185,88,196,130,26,58,113,155,226,32,189,42,95,121,34,205,212,188,240,160,169,129,110,102,179,135,226,198,126,97,31,80,70,195,
+59,222,34,136,46,65,9,235,204,23,154,220,47,246,248,121,88,59,127,255,214,204,246,137,110,104,111,209,47,59,143,8,141,112,233,236,231,74,42,186,157,91,147,222,47,171,227,236,35,144,65,52,78,106,240,86,119,41,91,185,107,122,225,185,95,90,64,182,139,112,25,166,174,184,244,41,193,85,56,84,208,154,37,47,125,189,157,54,197,206,233,33,164,44,67,133,194,253,210,38,213,45,166,24,208,154,99,52,211,149,163,116,65,42,40,135,117,29,85,28,184,198,236,132,70,45,72,94,68,234,245,169,116,129,253,40,46,227,169,21,204,238,6,9,185,215,199,105,217,211,247,165,69,210,215,161,201,143,220,186,148,232,10,1,120,231,141,30,179,27,254,84,96,167,160,185,18,74,149,124,221,234,24,115,242,7,42,216,103,85,237,142,27,168,221,161,51,242,131,98,251,71,205,45,64,215,91,145,227,6,116,172,223,123,150,229,34,20,125,236,24,124,235,226,19,167,54,159,147,46,217,91,39,45,22,56,251,84,196,211,142,0,110,44,186,253,58,209,155,77,34,210,37,179,46,47,
+88,122,163,148,205,22,249,195,160,204,121,242,205,46,108,196,105,129,209,21,186,106,97,110,13,120,243,134,113,158,224,102,80,239,105,3,110,233,205,18,205,227,66,232,17,225,234,4,212,125,172,111,189,236,66,242,110,106,1,108,167,80,208,195,69,9,83,158,194,152,215,122,39,229,203,235,235,2,176,152,199,156,133,57,212,159,78,170,138,105,193,31,243,161,200,144,201,46,218,70,151,204,47,171,209,244,107,38,77,245,215,213,66,26,174,34,164,238,54,25,0,79,222,175,48,56,175,20,2,15,39,120,24,22,61,241,227,110,133,59,146,235,25,158,174,40,169,10,15,19,218,119,229,30,40,100,174,150,23,244,41,192,15,198,140,53,39,221,66,205,149,91,249,110,234,203,169,58,81,86,215,44,41,159,120,8,191,214,67,104,87,28,251,10,62,120,81,196,187,116,100,184,229,237,201,248,160,192,220,242,119,37,46,215,77,159,71,21,198,234,121,222,99,29,114,118,180,120,121,176,188,254,136,238,185,138,80,124,223,171,64,132,201,14,0,234,126,242,182,130,210,230,0,230,145,89,
+122,179,60,179,68,129,59,73,247,168,52,231,217,233,203,50,155,11,87,213,39,229,143,112,74,157,223,172,127,18,171,167,153,40,129,66,103,147,230,35,233,30,163,72,184,158,97,121,161,170,185,131,149,195,9,127,118,69,124,99,192,179,106,195,253,157,193,96,85,124,119,100,183,198,61,200,230,243,151,236,204,24,102,62,138,136,242,12,29,202,84,150,224,23,167,176,187,42,249,109,66,164,254,212,241,103,182,46,168,227,125,252,144,160,62,66,93,155,6,231,120,202,229,32,61,14,183,190,17,194,93,155,199,6,214,62,213,147,95,44,44,193,245,58,68,122,95,201,105,92,139,207,62,57,54,156,0,216,172,87,123,235,150,200,47,231,166,55,236,102,147,252,137,69,23,135,199,27,20,152,126,47,172,153,139,155,246,227,117,242,147,152,107,9,140,141,47,168,193,137,166,94,53,117,82,10,71,17,58,47,9,249,71,250,14,197,117,76,64,132,123,69,185,87,3,154,233,5,41,136,179,66,172,254,237,228,134,140,236,9,243,195,157,69,30,154,239,65,122,171,118,175,140,89,220,215,
+239,10,5,188,165,96,197,146,30,199,61,119,142,22,9,105,0,202,167,140,119,242,235,121,240,226,26,226,50,12,3,171,36,74,187,251,241,41,242,204,73,137,81,248,61,181,124,131,65,240,217,137,214,238,110,120,139,171,221,216,30,93,35,45,226,2,131,233,81,87,24,205,197,98,11,24,10,198,74,196,64,62,42,137,45,42,160,195,124,110,49,189,248,31,104,184,117,240,206,31,104,248,200,66,191,225,55,60,143,227,40,239,5,31,254,249,253,5,152,232,111,32,17,234,0,243,115,226,177,120,143,214,6,64,239,38,251,4,66,231,10,56,206,225,115,114,44,143,208,80,6,90,189,30,30,186,251,217,145,198,4,95,233,208,52,181,22,76,212,183,100,208,146,174,19,167,83,62,5,90,206,186,79,208,129,135,149,37,211,156,125,165,19,210,201,72,234,105,181,192,100,192,184,204,126,1,78,124,46,6,21,49,209,44,95,154,239,53,241,169,101,224,167,52,14,160,12,152,176,67,84,184,9,3,135,178,228,117,61,19,121,1,210,6,71,114,126,2,157,7,197,169,106,58,27,235,
+21,86,146,236,238,151,38,89,46,56,237,60,79,38,223,252,87,44,61,80,160,80,192,185,88,193,186,126,117,206,201,250,20,35,246,41,47,128,165,178,182,75,157,188,97,38,181,202,116,253,170,48,136,229,15,215,148,88,169,23,254,50,38,33,243,26,78,69,208,28,238,188,94,41,169,228,23,178,74,134,42,63,22,113,225,36,36,88,223,148,200,188,197,166,187,93,115,126,152,158,144,191,214,88,194,191,166,65,186,169,165,68,185,197,242,24,232,75,62,151,169,228,245,84,0,131,142,146,81,152,105,140,108,214,33,224,136,181,111,116,195,86,29,135,114,251,8,137,104,46,242,77,253,254,245,237,132,112,91,181,144,184,240,157,56,189,129,88,98,102,174,187,196,135,20,14,24,219,110,170,67,232,235,57,218,227,241,63,139,228,101,138,84,112,82,64,252,209,154,228,232,218,178,76,224,229,174,212,192,49,123,104,207,29,242,218,88,14,122,142,236,227,118,23,101,81,89,181,49,148,174,170,40,248,69,17,204,214,232,112,144,163,185,40,187,165,239,2,16,109,198,225,214,214,74,131,
+5,119,232,60,183,251,31,87,41,232,251,51,121,90,63,161,250,187,91,94,199,190,254,237,130,181,187,215,191,93,144,248,118,253,219,5,49,159,173,237,127,201,147,196,63,238,94,77,121,103,239,224,172,99,127,118,153,110,191,123,159,3,14,204,79,169,196,189,229,167,229,45,63,49,118,169,233,203,213,192,61,92,66,118,193,161,8,55,234,223,144,172,162,227,63,12,16,49,187,79,180,238,93,150,214,163,60,190,39,35,185,123,18,162,129,107,173,113,25,48,140,0,0,60,58,83,99,32,37,186,126,196,60,160,123,109,253,236,219,107,223,235,166,225,3,164,71,190,108,108,196,250,112,161,210,125,178,162,181,193,54,113,119,63,115,49,51,136,102,129,206,86,203,136,36,125,128,243,190,34,68,102,227,27,143,57,192,157,91,72,69,78,17,25,218,240,93,151,88,223,112,239,190,249,255,38,30,41,41,126,138,153,109,156,197,123,46,70,187,75,122,209,4,234,191,49,2,211,170,159,185,97,88,237,243,126,195,24,220,114,79,165,35,128,50,183,120,126,236,97,109,126,172,91,199,143,
+49,168,37,41,59,114,183,91,161,70,171,182,216,2,154,8,50,244,250,182,251,210,142,106,84,105,66,25,135,252,16,195,47,44,151,13,107,162,78,190,94,45,38,69,188,146,45,105,70,195,195,171,215,102,244,201,6,131,15,165,212,50,188,6,188,191,163,30,62,183,76,109,186,45,216,99,172,154,15,167,139,112,26,168,6,203,115,217,116,37,210,77,247,182,227,176,37,190,150,248,102,199,151,110,27,195,3,27,193,20,224,114,137,114,172,153,249,194,239,198,144,51,238,225,164,124,240,209,250,190,66,101,168,211,239,111,23,63,34,109,3,249,138,93,40,42,205,203,163,154,34,193,155,99,229,44,155,87,130,38,213,109,47,5,197,121,72,143,95,98,215,8,87,255,240,207,178,109,0,39,247,149,176,90,116,145,28,152,191,192,90,204,120,28,66,32,140,142,78,16,50,13,66,48,10,83,83,232,144,26,55,32,215,32,0,158,208,38,27,64,198,196,38,124,61,165,64,52,6,64,232,178,136,194,39,7,10,34,227,124,19,89,67,7,16,157,3,232,177,10,27,59,11,40,28,48,
+127,111,44,172,12,75,0,164,172,225,247,10,110,88,22,210,46,180,206,182,114,171,171,155,6,55,47,19,158,153,183,249,50,53,106,12,185,79,65,97,166,121,96,208,117,201,14,28,66,52,78,224,152,126,103,83,147,119,101,78,205,20,59,33,24,169,200,104,253,24,183,114,247,86,33,212,137,160,76,152,89,196,57,227,152,186,1,87,40,225,228,207,51,204,54,203,57,239,124,173,110,154,207,129,36,191,7,145,201,206,115,81,82,76,222,232,92,222,159,252,178,107,191,121,185,150,24,133,135,119,32,195,199,146,212,246,109,160,101,77,221,252,125,191,74,253,254,82,127,226,237,251,159,199,91,198,255,19,241,101,245,63,234,71,103,50,242,63,129,22,104,253,179,49,30,111,208,123,106,54,87,101,242,161,62,67,1,186,24,243,248,119,132,96,89,245,147,226,60,133,77,57,157,30,12,175,34,252,131,89,149,245,29,176,247,59,62,225,186,217,108,48,220,38,205,115,82,40,125,79,242,83,43,52,228,234,235,201,8,129,5,203,209,238,203,58,88,113,143,95,18,187,175,36,89,156,
+29,216,178,239,33,35,179,25,44,24,244,146,177,108,110,220,127,69,79,202,155,167,247,108,10,236,84,127,113,18,158,143,195,204,218,169,253,166,226,78,126,221,118,194,41,37,68,153,11,231,129,193,72,40,70,156,189,29,87,135,151,235,71,101,177,110,114,52,180,60,249,85,184,25,44,176,249,47,116,63,200,250,58,25,81,37,186,63,170,59,118,192,37,170,35,34,200,211,162,6,10,205,132,69,153,152,154,106,126,151,243,248,234,186,171,105,114,247,250,232,244,197,76,6,118,220,248,215,195,25,201,138,230,73,156,133,231,92,208,43,121,251,5,189,181,233,105,16,118,197,237,50,34,73,247,184,136,140,178,159,216,172,200,166,86,198,189,50,28,250,196,195,131,36,42,156,156,110,133,13,197,199,58,222,41,123,249,244,109,182,251,162,24,191,143,180,31,200,230,96,69,10,115,245,58,153,210,51,10,156,102,165,76,72,225,220,190,190,179,132,220,91,209,120,60,107,119,29,94,120,136,106,190,161,195,202,121,241,44,32,52,20,189,229,184,75,250,86,248,75,247,210,210,168,203,164,
+84,87,131,227,114,197,178,140,139,249,3,160,175,169,222,98,61,142,174,122,201,126,110,82,61,196,37,98,88,117,203,212,117,250,123,177,244,250,217,250,173,241,42,171,109,0,255,141,162,206,162,98,126,134,62,255,200,176,13,236,177,207,143,148,182,115,86,61,72,203,136,42,168,183,178,154,245,200,240,78,162,89,223,68,251,205,238,235,178,228,222,143,97,153,210,207,131,145,165,83,179,31,238,226,77,118,125,224,210,69,124,38,254,30,145,189,77,189,90,222,245,193,130,180,225,97,7,102,147,204,37,233,3,11,155,81,143,87,253,66,109,119,38,5,67,6,59,170,144,111,198,136,188,122,31,137,245,11,201,88,81,206,84,88,221,154,48,232,184,7,112,244,59,137,44,52,205,176,203,204,144,45,252,125,80,6,205,194,26,205,175,152,4,5,204,168,108,93,152,219,147,3,64,159,148,119,137,43,184,213,42,119,127,165,1,67,92,50,204,83,94,79,254,191,132,74,251,167,60,255,159,188,213,162,3,186,87,172,197,226,44,237,149,152,63,64,138,166,10,111,72,25,61,161,21,16,
+23,107,174,12,5,26,126,33,189,67,207,131,22,128,162,22,218,105,181,229,190,227,119,169,70,220,222,21,127,130,212,97,165,7,2,66,166,240,66,221,236,49,127,6,174,214,44,210,45,151,93,0,187,190,84,6,97,150,141,192,138,66,217,199,13,55,113,82,62,127,149,155,15,12,69,44,184,16,158,138,49,187,248,205,74,126,92,23,208,10,190,78,87,41,27,195,216,12,2,218,143,196,199,111,176,104,17,161,198,134,154,154,61,78,151,214,237,59,206,148,57,107,45,104,143,223,38,174,125,213,136,74,197,64,55,222,158,70,178,125,119,195,202,142,215,104,10,217,42,193,76,110,230,47,42,111,44,130,201,187,159,186,169,192,155,189,235,85,26,109,95,250,100,242,72,215,208,60,240,161,168,229,15,81,171,195,255,85,250,150,24,56,231,0,217,163,139,148,179,90,80,101,239,120,182,129,175,157,210,61,45,120,80,222,135,16,191,66,228,19,172,40,247,189,185,183,244,14,83,154,117,250,85,181,151,124,108,123,28,61,213,127,191,67,61,238,252,156,2,255,204,18,12,223,68,143,
+40,41,250,102,209,19,152,221,143,60,235,89,215,254,22,24,117,210,36,169,187,30,101,223,246,131,106,252,57,23,156,226,209,53,33,220,71,101,108,131,174,160,162,233,100,152,46,172,180,67,127,230,223,14,177,168,23,113,198,104,236,99,78,217,52,37,24,134,130,94,47,77,244,66,138,149,24,72,247,215,170,203,102,112,187,70,104,210,37,223,21,58,130,187,101,74,109,185,208,155,244,32,171,135,13,10,88,13,232,101,142,185,56,5,3,196,48,242,206,186,57,246,73,201,202,211,230,211,141,248,23,1,83,151,175,144,64,52,182,11,55,7,236,141,1,74,135,228,202,245,186,45,204,165,107,171,181,220,187,92,1,234,147,35,139,87,213,177,227,81,134,252,220,189,51,198,25,167,145,39,159,126,210,117,111,209,215,36,14,62,177,210,10,221,176,189,214,11,17,80,253,169,190,177,64,137,106,175,113,175,27,129,248,119,58,212,215,110,23,115,184,29,178,58,195,161,131,62,21,240,75,128,0,237,73,5,240,200,102,209,3,205,135,17,42,65,127,202,220,109,47,181,194,149,230,239,
+162,14,243,15,53,94,44,47,54,51,222,206,49,8,246,196,191,241,167,32,251,252,231,64,18,246,159,195,166,159,30,5,123,214,5,56,184,84,1,187,67,33,223,29,34,192,226,187,231,131,84,240,199,160,110,108,160,230,243,208,76,53,182,56,188,42,118,163,23,52,43,123,12,94,55,253,208,55,225,247,94,128,146,178,206,45,142,206,13,120,93,179,37,190,122,55,28,94,128,95,49,84,34,230,105,132,241,249,150,91,92,28,190,216,244,18,101,74,178,224,35,118,33,206,241,164,106,104,126,247,232,179,135,7,110,244,97,194,101,108,82,62,245,97,126,33,61,110,247,51,63,222,149,153,144,223,125,95,118,182,0,181,142,113,146,14,241,227,39,98,228,162,106,232,181,192,71,114,155,229,5,224,214,125,60,170,219,140,168,226,75,125,192,21,250,5,148,201,193,84,177,19,36,170,149,94,6,220,100,123,171,108,200,163,169,171,165,110,251,86,177,195,229,107,206,62,58,124,145,196,72,62,209,10,111,109,240,50,110,244,56,156,75,72,143,151,194,183,42,216,125,217,166,35,33,99,
+5,189,125,214,155,27,119,123,159,79,7,40,146,94,108,39,11,129,31,165,239,233,126,40,211,2,79,49,98,116,222,138,0,237,116,232,187,123,73,71,192,199,109,28,143,164,198,247,194,13,202,19,186,201,9,201,130,128,34,158,64,0,20,210,77,198,143,180,17,189,148,7,158,164,4,96,34,220,56,61,37,232,3,157,138,152,244,222,155,20,18,221,13,90,26,28,98,83,157,202,182,226,223,186,14,138,200,85,1,103,80,236,255,88,116,220,62,82,118,98,143,72,206,40,41,160,61,155,71,239,175,202,36,198,73,52,227,20,131,167,113,115,79,204,213,156,232,144,163,209,5,249,244,219,59,226,232,251,72,51,108,75,62,140,212,15,40,62,27,117,60,222,37,46,155,33,47,231,205,142,145,84,129,225,2,167,27,190,110,204,73,53,147,27,62,60,237,103,249,111,188,36,208,156,37,190,85,61,234,152,252,255,63,222,184,254,43,147,183,139,6,130,14,142,226,210,53,249,32,60,162,104,88,228,116,227,113,12,224,244,242,147,216,97,110,109,45,65,3,179,238,238,143,206,76,115,
+67,226,167,101,74,201,206,117,129,105,200,243,228,93,93,114,48,155,6,63,17,18,58,90,176,2,132,86,175,5,202,187,230,154,166,107,62,78,165,141,228,211,80,126,32,223,130,48,7,185,122,238,139,206,56,147,199,173,124,134,47,107,246,37,219,184,159,183,2,9,185,208,184,76,241,247,135,11,172,30,241,170,162,96,61,129,222,205,127,51,2,16,34,125,31,2,217,217,175,96,242,228,18,237,42,92,211,156,187,79,101,23,223,193,149,236,166,23,237,45,124,75,133,149,79,14,128,141,111,251,186,33,245,254,52,84,143,8,241,24,69,192,13,244,28,1,92,221,182,57,136,174,123,127,32,253,137,197,149,17,166,170,250,110,202,145,186,130,157,226,154,165,68,43,237,212,216,201,229,39,155,178,110,236,37,240,106,139,209,88,207,26,92,160,222,239,35,42,159,85,192,244,169,136,37,188,128,11,2,95,220,130,202,158,12,9,132,165,91,158,197,144,215,172,164,97,125,70,25,85,203,40,168,49,149,74,9,6,201,155,0,131,103,55,46,135,92,135,73,15,206,59,250,192,223,200,
+103,210,220,165,122,253,113,190,65,191,192,169,249,69,213,177,78,195,135,168,214,225,175,246,155,232,58,242,120,17,108,228,123,114,89,74,116,36,56,223,27,174,53,136,241,212,107,154,159,110,18,136,55,29,87,100,147,201,42,102,139,181,87,168,118,240,64,226,134,16,112,18,152,226,48,244,68,58,218,59,27,134,10,149,77,171,105,246,215,243,71,160,32,238,25,154,242,159,36,87,114,32,110,147,213,100,160,155,62,193,45,2,206,164,206,120,76,101,109,103,145,127,19,161,15,240,219,145,55,124,137,242,87,191,228,221,7,218,248,115,227,219,28,17,186,55,166,186,76,204,159,81,101,127,69,242,207,97,150,154,228,159,195,44,196,243,205,196,8,199,33,123,245,119,214,124,166,81,252,157,53,119,106,90,15,113,230,1,135,25,235,255,204,190,212,175,89,129,57,117,28,38,255,111,62,251,253,6,233,99,161,218,235,61,53,26,113,26,127,24,59,180,201,128,187,187,5,21,83,61,249,182,255,119,19,245,174,225,208,3,28,61,87,255,76,155,83,56,156,55,135,195,81,20,187,120,
+66,180,91,43,220,244,89,123,119,32,61,36,130,34,141,56,253,56,236,100,49,159,13,170,178,120,79,197,196,125,106,131,109,79,223,141,118,105,206,220,62,81,201,168,77,134,149,112,29,125,150,116,244,99,105,200,167,129,5,228,180,52,103,8,167,225,175,136,239,114,9,250,248,97,45,0,18,230,201,247,138,250,216,170,236,87,105,0,254,241,20,136,161,105,98,75,199,188,183,56,45,10,186,38,31,238,49,76,243,252,22,106,44,73,60,61,189,189,188,169,62,148,182,84,4,100,62,142,125,102,134,252,234,9,161,244,240,57,249,238,189,29,228,186,241,131,148,171,211,235,21,242,32,249,66,73,112,112,49,220,175,16,111,140,158,134,210,89,234,201,252,180,143,69,190,74,5,5,239,107,255,20,127,164,97,43,149,108,165,81,30,250,63,148,48,211,78,60,13,195,135,223,22,228,188,5,204,241,81,22,27,233,169,68,61,170,242,191,102,246,159,175,247,89,190,64,173,92,118,129,18,253,45,29,50,189,108,244,248,39,171,136,222,87,118,197,222,248,115,123,242,246,62,56,43,10,
+202,244,11,200,131,205,175,141,141,64,93,97,239,82,201,188,61,49,63,185,193,229,152,109,84,125,94,104,200,88,250,168,29,8,242,165,120,40,22,206,124,100,192,19,145,237,223,49,104,144,134,190,123,242,242,126,191,72,166,249,147,206,148,11,30,28,103,175,200,223,151,32,39,117,116,107,10,160,2,87,169,15,2,253,154,62,34,113,78,155,13,213,198,8,220,108,138,211,246,152,60,54,56,38,153,229,0,204,16,173,9,230,253,204,119,124,88,254,253,2,165,253,212,101,147,247,38,40,3,217,223,121,239,67,170,162,211,26,145,218,203,233,132,127,166,241,217,203,25,159,117,249,179,2,101,18,220,124,52,214,230,66,52,105,29,223,224,124,64,77,254,216,14,60,15,240,115,136,89,23,233,219,25,160,92,70,250,0,68,143,59,11,31,32,61,63,69,127,203,175,223,47,20,203,229,156,13,80,226,178,94,243,0,202,130,188,185,118,39,29,182,89,7,177,143,212,201,174,118,183,195,201,150,229,154,36,240,98,205,142,42,129,98,206,85,26,94,253,254,160,55,42,15,59,129,215,
+246,37,34,123,88,184,223,16,116,213,125,25,107,163,60,159,52,63,43,85,84,158,168,149,70,37,169,129,245,85,249,241,178,162,82,113,103,146,150,121,127,100,140,229,162,188,30,62,95,20,104,255,250,36,166,62,133,222,76,143,68,215,31,253,15,80,15,126,250,152,177,221,12,244,238,150,42,222,208,245,244,229,239,108,227,191,229,240,196,223,180,18,239,49,167,24,212,196,37,190,61,211,111,129,70,105,102,141,11,127,186,236,75,164,247,199,71,23,161,239,136,160,173,6,137,236,120,168,67,255,140,247,104,54,233,72,27,22,173,1,208,62,97,49,205,207,248,107,69,127,154,246,1,106,15,238,223,123,213,148,12,40,4,169,232,195,252,118,156,27,182,125,139,180,62,90,35,123,172,63,136,78,193,244,29,57,24,146,214,213,114,99,70,225,189,110,186,133,211,103,67,95,146,10,39,239,67,32,231,97,151,134,218,184,172,45,35,206,142,41,228,53,181,204,165,75,188,82,171,193,121,108,27,244,4,54,213,182,31,179,15,118,184,134,136,248,235,227,208,172,139,87,84,50,142,46,
+84,193,237,105,237,201,229,173,174,71,39,117,77,173,0,50,85,160,235,105,68,126,214,182,199,218,113,166,125,189,151,236,121,186,225,113,204,45,5,246,29,142,117,146,102,29,182,130,201,102,208,5,30,35,103,238,32,72,135,52,166,34,77,106,24,15,230,7,15,62,234,62,14,139,81,210,99,37,118,70,119,61,93,26,36,35,141,130,234,143,243,154,81,51,99,154,72,119,224,148,127,241,30,233,254,50,4,232,76,234,133,181,175,164,90,120,191,76,25,211,161,193,247,113,168,152,193,65,87,37,243,132,214,8,52,102,19,173,124,177,45,161,98,190,144,113,125,130,197,47,4,9,104,183,137,208,246,27,153,87,33,32,125,175,163,159,30,32,39,253,94,3,150,136,39,182,205,225,251,25,161,209,159,138,34,242,12,129,243,182,34,84,13,204,227,139,66,211,39,119,46,136,245,139,37,244,119,21,147,43,3,177,159,11,246,137,140,214,236,115,43,204,186,251,241,121,209,52,235,107,181,194,88,175,170,247,5,175,182,62,237,251,96,72,132,216,222,180,36,196,46,124,249,190,129,239,
+114,78,127,69,221,151,254,15,141,246,115,88,126,92,154,147,138,123,206,254,34,151,255,248,42,250,185,225,47,83,119,159,58,45,245,214,232,122,212,167,63,230,187,252,183,113,59,201,159,157,56,151,13,99,241,188,76,57,222,140,189,63,42,122,185,110,128,42,228,57,36,160,107,85,249,119,60,1,38,248,150,41,232,166,177,63,121,226,79,242,247,146,174,167,17,27,184,52,145,142,188,164,131,160,60,155,82,103,29,135,9,27,8,216,66,88,212,20,225,134,111,74,197,161,208,44,204,242,122,145,22,168,4,170,253,49,30,80,109,189,195,147,114,141,186,11,56,14,231,69,101,55,255,221,203,99,113,250,217,134,38,28,25,122,246,167,27,138,125,217,41,126,204,5,160,10,149,148,228,179,192,242,200,30,93,176,34,14,49,107,205,152,67,93,161,35,109,181,241,11,177,158,71,48,195,123,185,1,116,54,109,162,249,115,213,93,19,216,171,57,208,189,150,221,242,221,42,101,44,108,200,157,147,95,92,127,243,24,135,145,7,153,168,26,135,2,12,199,208,34,142,95,250,189,179,251,
+167,55,3,128,125,191,63,109,30,225,247,192,59,173,58,184,5,104,152,240,133,164,42,201,176,1,181,126,87,199,205,56,210,150,60,203,170,217,26,130,100,58,177,210,187,45,151,187,131,141,103,102,60,178,192,80,195,4,226,171,182,102,43,102,87,19,61,117,124,209,70,127,24,10,73,98,16,31,158,124,191,168,226,178,254,130,206,26,65,43,218,4,8,115,238,156,14,12,114,245,17,100,175,87,40,220,238,195,30,61,93,230,184,241,184,46,224,109,180,184,135,207,154,216,73,127,143,118,36,33,214,105,109,147,19,51,46,118,92,10,18,119,102,249,131,205,243,250,61,78,110,174,205,55,228,228,61,128,99,79,204,26,151,53,216,253,216,223,245,25,144,160,78,178,85,36,228,229,90,232,120,179,191,176,47,197,231,172,11,82,97,116,198,105,81,57,182,81,223,62,30,31,131,154,170,206,6,68,78,101,6,45,178,205,45,178,162,33,108,220,167,44,84,60,109,190,249,242,36,13,243,216,159,245,26,89,52,194,31,158,134,3,209,126,240,247,56,245,236,89,56,100,178,56,253,88,
+239,30,101,73,4,214,248,30,254,115,30,134,219,121,212,1,212,53,103,141,68,214,85,4,250,13,7,182,238,27,24,146,187,99,254,173,114,93,143,114,131,205,215,147,142,203,222,141,217,240,138,114,44,63,172,136,39,89,193,156,25,48,52,2,124,148,231,139,214,206,80,245,4,205,211,70,248,231,68,250,169,102,122,13,137,164,87,150,13,225,50,46,176,146,77,99,201,126,200,31,6,155,35,158,18,156,51,44,183,59,228,126,217,233,137,105,22,207,136,221,100,136,10,138,177,114,95,230,245,57,130,169,141,140,80,231,23,109,33,38,243,229,116,146,55,193,194,211,196,239,207,232,144,10,32,223,36,253,6,66,73,105,6,41,67,227,82,36,67,96,50,152,43,161,234,151,242,135,241,75,147,206,181,217,149,136,6,59,215,150,210,34,172,248,40,59,133,202,65,181,130,241,161,91,169,18,184,214,244,68,17,248,203,123,193,235,194,247,40,212,211,50,198,239,76,239,89,112,42,207,78,151,193,94,149,218,92,223,82,32,116,216,151,168,198,224,195,40,118,133,193,237,106,227,134,222,
+68,47,156,239,191,252,250,3,230,120,119,127,194,205,173,53,167,81,229,221,221,140,116,104,165,24,127,126,226,87,115,171,69,184,191,191,71,239,255,254,152,171,230,11,40,77,182,54,255,182,36,250,127,252,243,16,161,255,240,239,254,95,143,17,250,151,255,248,191,255,231,127,249,215,127,62,22,230,207,215,226,254,227,127,250,95,254,241,31,254,221,255,246,63,255,175,255,248,63,254,229,191,254,215,127,252,231,255,244,127,254,227,95,255,249,117,253,127,123,186,227,127,243,95,174,154,254,159,254,241,255,181,2,253,127,248,111,255,253,127,245,223,255,119,255,158,128,205,97,204,152,187,187,251,228,63,215,76,179,5,115,225,243,135,48,136,21,238,221,70,173,139,74,66,36,148,206,61,229,125,162,255,80,188,73,94,238,94,239,103,98,26,235,41,125,255,4,75,170,161,154,89,65,57,39,118,130,80,122,135,31,226,210,140,119,236,218,152,148,152,36,235,136,140,68,123,125,51,71,101,247,98,162,86,172,88,110,124,155,67,173,246,240,240,162,127,254,58,171,83,194,42,70,153,156,215,
+175,103,39,146,175,67,176,39,229,68,118,106,141,6,222,130,253,233,97,82,56,20,203,88,243,227,236,85,144,104,238,237,227,28,51,151,126,150,164,2,190,254,46,107,137,194,82,75,49,12,76,249,212,1,201,84,140,176,77,148,208,38,36,161,146,69,193,33,37,240,188,81,78,46,201,80,41,70,245,239,26,167,189,113,38,236,83,10,217,6,37,57,20,61,62,53,149,84,27,13,123,34,63,92,171,63,92,95,64,236,18,131,246,68,32,9,225,59,23,122,72,250,210,45,204,199,120,157,99,225,95,136,216,160,187,56,219,25,22,135,98,207,54,67,233,48,217,241,226,24,215,126,20,40,150,123,217,146,215,189,132,73,217,80,8,96,14,196,77,16,148,159,190,50,205,252,81,237,46,206,101,204,84,135,107,62,139,169,32,79,32,133,205,117,134,56,199,120,175,193,13,47,177,227,224,97,46,160,250,120,112,67,240,195,253,193,161,1,202,196,105,22,149,201,157,72,135,122,142,206,162,45,135,13,205,198,24,193,120,103,171,32,249,151,35,133,118,219,101,53,205,15,102,223,239,187,
+95,226,72,48,154,191,230,217,218,194,202,64,46,219,33,56,25,221,176,39,157,214,81,150,219,175,24,74,30,236,131,67,253,142,187,29,135,38,163,117,35,17,103,248,221,77,247,224,122,112,186,85,100,233,34,229,253,128,119,15,188,152,124,172,73,245,158,89,83,231,80,137,254,184,19,17,173,140,228,223,167,92,248,51,213,8,13,86,237,223,101,183,215,21,109,251,210,100,93,127,69,14,26,170,168,126,205,12,21,245,182,209,235,66,167,91,19,26,154,134,29,25,71,130,44,32,134,248,190,131,118,130,200,157,150,16,31,91,99,90,241,103,45,57,221,88,129,68,133,126,110,74,30,110,249,177,155,114,188,123,134,239,174,209,195,106,199,161,113,156,3,227,151,109,149,113,197,106,108,223,61,214,111,172,189,54,61,34,22,252,77,166,235,5,142,250,220,243,58,57,186,200,69,39,214,52,36,91,247,9,113,244,50,56,151,24,22,88,165,76,148,248,26,161,217,238,107,132,12,9,32,189,244,161,17,235,51,74,237,46,147,167,183,109,35,90,134,7,60,69,231,241,178,190,119,92,
+159,235,58,221,38,30,115,4,73,253,64,203,239,59,63,188,226,218,202,172,53,58,144,115,242,191,174,175,226,179,42,116,43,248,76,38,227,2,44,106,158,203,58,206,17,26,132,218,4,116,163,58,238,177,133,134,14,90,59,167,20,211,173,236,196,164,248,177,68,166,110,158,31,174,131,230,147,145,100,240,127,113,15,173,32,229,48,143,251,188,201,145,23,152,41,196,24,19,251,199,19,173,239,251,202,195,71,93,253,85,143,160,116,63,184,255,69,41,13,143,113,49,128,248,136,63,220,248,68,116,176,19,122,236,5,40,182,133,139,63,145,34,122,8,239,71,56,64,38,109,4,7,194,247,210,57,181,225,36,110,156,225,169,17,26,194,105,113,225,184,84,148,33,61,216,114,140,232,22,156,65,96,138,46,203,145,43,27,121,7,209,78,23,78,1,33,208,219,174,73,223,97,159,245,92,154,89,154,89,183,165,171,155,130,23,28,51,55,20,249,78,59,53,161,222,228,120,72,94,60,218,240,40,22,49,223,203,28,69,253,199,121,78,238,254,188,150,6,80,188,24,10,148,146,45,98,
+184,202,117,109,42,238,225,196,129,251,190,221,253,131,208,96,12,23,86,47,223,77,105,90,26,254,140,37,96,99,247,195,129,236,55,7,116,108,138,161,151,238,165,234,40,204,60,43,139,180,233,219,239,183,196,34,233,178,211,246,165,0,56,58,110,76,67,42,186,72,46,135,31,3,106,253,144,254,154,190,13,41,181,213,26,125,68,195,219,36,207,220,121,104,56,144,226,246,64,34,217,22,179,61,220,92,85,81,166,119,53,122,40,141,119,66,203,247,79,44,30,146,114,203,191,155,233,203,87,210,157,252,221,81,68,90,243,238,38,0,205,194,181,237,181,242,137,6,97,1,145,21,225,153,240,52,21,197,28,181,149,110,200,98,32,240,165,233,51,239,203,217,230,252,82,217,73,75,142,154,101,29,212,224,138,40,36,103,128,210,226,71,243,195,3,121,218,169,93,74,36,128,67,159,204,141,114,223,188,212,206,229,103,168,185,139,86,217,130,211,126,184,173,115,188,57,62,195,139,34,85,22,204,82,145,169,229,252,229,72,36,139,168,151,180,13,3,129,12,111,167,239,59,54,162,128,
+189,89,221,125,155,62,141,164,225,106,140,77,206,91,66,147,120,143,101,123,253,128,15,159,57,108,54,115,199,194,117,50,212,28,200,142,46,109,186,38,235,30,145,77,66,251,26,129,56,149,16,241,96,98,161,101,83,82,107,166,194,181,69,200,118,210,79,123,34,165,188,92,188,122,63,0,239,37,175,194,235,7,55,106,50,193,77,71,73,109,239,66,124,246,125,196,107,36,249,231,118,203,195,97,180,224,118,111,49,123,49,155,2,202,86,61,107,218,22,87,201,157,197,130,215,59,55,45,2,215,112,101,11,126,81,4,63,115,92,46,63,100,11,213,241,118,170,178,174,239,16,84,232,41,83,151,20,20,242,173,41,128,240,116,103,16,121,13,215,96,141,254,235,155,228,47,212,135,121,6,202,38,28,165,216,152,126,94,107,66,139,227,209,133,119,231,28,173,182,48,4,157,227,138,80,139,130,109,14,174,139,150,129,180,63,12,178,109,106,226,157,167,49,30,150,81,46,223,11,94,230,33,3,242,152,154,175,214,85,14,175,69,241,154,110,130,80,29,77,176,239,252,145,130,220,112,
+87,152,2,86,250,38,144,248,53,177,201,206,223,225,62,35,232,242,15,74,131,48,255,161,235,236,141,240,244,176,168,236,59,153,203,14,45,77,235,232,30,205,92,65,235,82,73,77,206,43,107,124,177,113,116,48,2,13,14,168,115,102,222,239,154,28,28,214,81,229,122,177,108,145,113,237,13,106,58,98,28,10,15,199,75,143,83,96,185,90,217,162,34,218,200,145,15,67,143,225,177,65,245,92,229,208,64,236,85,130,166,238,193,66,185,166,241,158,6,96,57,60,229,77,200,184,105,151,232,154,177,215,50,124,238,102,77,112,36,236,131,195,251,10,98,99,108,144,13,228,184,44,166,7,98,152,194,117,52,185,190,235,2,212,53,55,215,26,121,5,29,60,60,83,218,164,193,52,57,78,156,166,251,234,205,86,117,51,33,162,33,226,64,15,154,190,156,199,84,234,71,29,102,225,231,184,205,142,58,195,28,66,252,243,78,1,212,28,221,151,198,137,11,193,219,156,163,126,56,97,138,182,50,220,184,230,207,251,228,140,104,242,70,92,222,33,69,39,156,151,131,177,172,8,18,1,
+74,93,173,219,89,77,188,231,125,61,203,223,159,179,77,234,59,92,86,20,6,148,176,131,107,56,215,179,155,85,55,59,156,201,154,211,198,154,56,159,165,59,186,131,143,13,254,212,158,140,87,56,236,119,143,38,6,158,98,81,63,225,249,88,61,175,75,108,113,184,184,171,21,186,38,129,94,231,129,130,129,27,233,131,31,16,9,155,241,37,80,222,224,244,124,239,7,245,16,199,104,124,18,175,58,146,70,207,213,115,170,0,119,113,89,244,226,55,144,176,69,96,255,211,189,42,5,235,238,1,84,204,131,141,194,206,187,5,205,221,125,230,41,27,167,95,207,124,97,35,61,16,144,168,108,146,229,252,14,203,203,244,4,220,64,180,205,88,25,126,227,115,240,196,114,70,131,174,95,19,133,203,144,162,28,85,28,23,237,153,162,48,28,249,84,185,50,126,246,37,46,52,184,237,178,63,63,104,54,151,1,29,189,96,232,138,133,244,185,233,201,129,240,216,186,171,139,226,118,61,178,56,71,72,126,12,116,218,146,231,162,167,178,221,13,95,253,69,129,207,119,169,151,253,0,207,
+203,222,70,44,120,131,87,74,65,190,59,107,122,181,107,3,135,96,183,21,119,116,168,113,207,177,21,194,92,176,150,198,239,225,21,59,19,129,167,55,0,60,28,243,38,88,169,39,83,144,139,185,188,147,95,27,205,171,175,16,106,60,47,205,161,33,52,55,57,76,47,94,202,16,170,209,89,177,140,187,185,36,37,72,79,16,178,160,170,192,193,218,91,253,216,84,176,137,106,60,2,18,146,99,140,249,156,25,167,44,219,70,3,242,218,224,108,193,191,52,146,166,222,41,151,37,81,46,249,84,133,192,118,238,183,232,89,60,210,145,106,197,41,100,123,52,244,6,228,132,183,187,156,244,184,25,240,48,42,240,179,248,228,199,104,41,53,44,0,193,234,76,86,250,54,200,138,222,184,249,193,165,241,106,57,188,251,70,212,247,6,199,11,93,60,252,197,33,179,247,181,243,113,82,47,218,40,211,103,50,47,40,162,205,231,63,5,186,140,60,206,238,23,172,83,127,51,139,127,13,0,232,49,101,218,198,26,100,148,41,121,26,132,128,95,168,93,139,250,151,117,245,53,105,47,77,
+29,79,108,207,227,253,244,58,134,64,8,60,30,191,52,190,245,183,202,109,61,196,191,150,211,20,36,62,100,84,13,237,42,60,79,145,128,198,238,119,25,47,146,19,104,9,68,25,87,224,8,252,106,22,188,11,218,193,236,145,229,135,107,127,133,73,205,131,142,124,43,150,33,42,176,176,125,228,121,217,29,253,228,91,14,14,218,112,104,160,132,225,80,138,187,187,18,26,147,45,29,170,68,154,136,95,1,162,103,57,30,181,172,186,70,165,101,218,201,136,172,208,129,160,224,64,243,29,92,205,46,185,20,249,144,247,216,254,96,62,62,221,103,151,187,36,216,115,248,5,42,44,27,176,174,143,187,48,206,192,45,119,238,33,38,192,115,109,139,163,54,177,114,112,146,174,241,75,98,169,50,76,46,224,10,204,135,61,151,141,18,186,140,233,222,92,202,122,136,149,99,238,207,31,19,204,239,242,73,158,170,85,213,88,95,52,250,226,213,175,24,138,154,118,79,167,117,176,20,22,136,51,79,140,21,193,143,177,183,170,143,198,189,74,221,176,178,153,212,5,98,182,7,5,125,181,
+125,29,45,212,207,52,172,207,5,205,241,171,243,217,112,237,160,25,104,94,179,206,169,133,38,82,38,166,31,83,162,172,227,236,154,143,57,76,92,27,186,232,91,73,102,171,188,2,225,20,234,56,126,250,54,141,34,42,77,227,113,122,144,219,13,237,151,4,42,181,142,76,191,196,49,10,207,55,130,189,210,77,163,252,13,153,85,48,69,4,166,232,246,240,117,156,106,250,134,150,120,131,238,8,115,250,135,163,112,253,73,244,102,137,248,14,6,143,59,30,54,224,210,105,79,46,21,227,212,188,106,95,63,229,45,27,127,223,224,59,95,117,142,236,167,185,233,107,165,184,83,81,35,208,4,105,215,195,123,127,44,10,151,107,204,250,185,211,76,138,80,194,30,211,13,98,43,238,198,190,119,241,82,118,103,103,240,168,49,84,13,34,92,155,231,118,181,10,236,25,192,125,56,216,250,226,227,30,120,255,16,121,92,123,116,167,4,167,116,191,51,156,185,44,80,126,107,193,241,176,69,14,201,113,140,199,27,184,46,194,54,253,234,103,199,185,13,231,225,55,93,134,36,243,147,123,
+225,188,246,100,101,54,89,0,211,148,141,170,35,156,106,152,171,116,200,155,99,120,195,164,208,40,85,178,134,5,231,206,186,153,241,12,5,38,246,1,195,222,239,84,7,15,107,217,109,64,48,133,191,240,150,96,47,113,239,234,13,224,203,244,171,232,213,253,188,186,14,124,80,148,197,30,176,32,127,187,203,1,7,183,121,47,10,127,130,63,175,66,131,235,216,156,186,1,240,185,111,94,243,114,86,82,177,108,21,187,239,225,57,165,183,137,243,217,30,10,210,135,18,91,127,1,176,157,252,193,48,248,11,14,39,40,249,148,133,135,2,155,241,117,136,197,110,26,224,177,217,96,220,192,186,123,28,207,252,161,228,217,255,115,136,23,127,147,208,114,101,70,43,224,142,26,166,22,171,243,48,36,98,88,248,135,220,60,161,55,244,111,225,13,125,46,195,21,118,95,224,237,40,29,56,20,170,9,173,68,247,176,161,228,131,223,33,68,10,146,185,22,199,174,155,77,21,237,181,93,150,135,11,180,63,136,249,251,108,39,161,67,208,24,130,214,208,105,81,120,46,40,147,250,227,33,
+107,161,76,189,108,120,121,43,91,24,180,186,78,215,112,51,239,24,78,127,17,11,117,12,224,79,56,76,182,105,89,58,51,8,54,60,207,130,161,185,161,33,221,87,79,204,197,232,139,47,85,192,70,46,162,130,203,28,255,210,13,115,145,242,206,70,241,26,26,193,16,167,179,91,242,74,49,147,54,152,52,204,248,110,196,236,159,45,75,172,165,219,56,86,5,251,74,112,55,126,189,194,58,225,222,213,15,47,0,235,37,224,103,1,197,227,160,175,244,140,131,233,103,168,118,250,254,210,4,124,151,86,23,64,234,199,46,112,206,119,195,11,232,80,202,177,189,8,38,193,246,236,27,96,249,212,23,69,64,151,245,220,158,167,161,167,91,149,91,40,243,89,29,154,74,96,72,74,117,132,224,147,110,214,55,99,12,211,253,131,163,252,139,33,52,244,128,192,196,193,181,73,5,252,12,208,243,193,235,101,245,193,60,0,104,1,61,58,97,31,177,105,129,168,11,37,216,161,168,12,158,96,215,107,40,125,244,65,15,144,40,67,201,136,193,141,142,225,189,115,90,223,27,174,101,247,
+1,25,95,197,48,178,213,185,209,196,76,71,95,92,178,214,233,114,228,32,249,92,23,172,217,112,235,231,144,225,99,104,128,235,215,251,161,186,19,22,182,134,252,135,251,129,239,204,182,240,201,32,43,190,231,238,184,109,106,179,118,21,91,56,20,239,207,188,88,239,196,230,5,56,94,94,149,29,142,236,43,131,199,169,6,191,44,238,240,184,90,13,193,3,249,62,57,138,203,154,169,203,233,185,128,93,232,90,64,148,133,62,34,4,170,144,174,103,36,14,71,119,103,162,155,137,221,136,243,196,41,212,119,150,123,82,225,178,216,172,70,188,175,131,221,10,25,221,48,219,57,18,8,77,227,206,166,96,89,81,89,94,51,235,225,48,174,74,178,142,110,216,48,83,1,45,102,84,107,114,132,32,232,146,143,125,133,117,192,246,178,33,212,125,2,62,218,56,155,96,85,239,88,124,241,13,247,161,167,129,133,224,208,128,6,113,210,133,59,248,141,117,229,246,187,17,227,210,150,46,177,53,236,208,145,149,66,169,200,53,110,143,167,60,136,42,164,24,99,98,67,216,199,77,193,79,
+249,196,88,80,210,214,92,12,107,101,47,106,59,60,3,8,11,10,152,159,21,203,189,233,116,218,182,131,37,191,165,245,205,105,156,104,51,57,145,116,113,193,10,78,125,184,180,240,250,176,208,55,200,15,138,20,200,59,173,151,84,63,147,219,13,251,120,123,11,43,189,116,161,77,193,114,141,40,35,16,189,43,193,109,14,46,102,42,153,137,183,156,229,251,106,80,110,123,173,133,46,56,101,184,70,133,55,212,180,86,98,31,199,78,26,159,43,234,221,208,24,130,90,43,171,46,94,140,248,4,139,124,153,191,167,12,247,79,247,147,183,103,47,163,250,144,219,12,26,203,222,97,92,156,163,199,199,231,190,232,92,24,26,78,241,87,178,31,155,90,28,23,209,24,107,247,213,120,186,15,223,23,104,182,234,194,153,114,167,130,86,89,186,100,141,185,37,12,81,142,106,246,121,214,87,212,120,189,171,94,177,82,170,238,4,50,214,244,243,163,208,77,52,107,137,251,239,23,6,198,202,201,213,227,49,154,255,209,27,67,97,234,124,108,203,28,93,208,74,145,229,131,95,176,209,218,
+126,253,88,48,198,133,71,216,40,126,34,84,24,239,212,147,65,116,48,61,123,225,35,128,136,231,182,69,69,101,211,76,138,122,236,66,233,221,241,183,204,76,171,101,104,22,153,65,61,47,213,154,14,126,26,43,32,37,191,188,149,53,136,30,119,218,12,34,49,170,15,61,182,86,171,149,199,222,146,47,210,241,94,58,147,151,199,198,201,204,121,52,157,186,118,211,81,82,34,9,18,143,148,132,165,99,98,215,247,220,68,249,32,110,94,217,218,210,91,1,89,95,86,225,172,124,187,207,71,149,76,179,250,232,145,204,251,157,97,71,178,59,9,189,18,201,111,25,44,160,8,132,138,174,234,139,186,108,25,152,176,15,73,255,155,200,165,128,233,218,141,151,174,86,71,233,185,166,207,52,232,16,3,112,164,251,22,179,101,139,2,97,10,52,156,219,11,234,128,56,147,207,135,125,123,137,86,80,121,215,157,221,166,15,53,60,137,47,202,84,7,75,241,92,180,32,121,62,109,134,154,230,81,254,147,249,86,19,85,235,249,136,113,103,181,51,8,120,92,129,231,111,174,228,130,40,
+137,167,120,203,255,222,179,218,220,251,7,212,151,177,126,140,140,254,40,165,171,49,7,39,125,136,86,178,143,26,175,151,52,165,241,154,30,181,166,155,45,19,181,158,189,126,135,239,238,201,246,70,217,142,30,97,157,36,112,77,112,186,252,186,224,167,193,6,230,165,149,32,208,80,73,172,90,146,163,254,211,196,4,119,196,14,20,66,162,172,175,6,59,123,88,89,58,193,137,105,101,45,190,84,233,243,5,201,153,185,55,153,190,210,181,240,247,213,145,229,171,234,18,187,89,212,176,229,29,63,156,223,159,211,143,226,253,7,67,142,16,222,137,28,81,153,66,153,170,185,20,98,83,30,5,125,251,98,89,146,182,173,231,243,89,118,216,216,109,215,106,252,61,157,60,71,115,71,10,45,118,47,42,188,92,99,32,47,2,27,62,235,174,106,17,155,169,22,167,217,238,252,221,73,215,14,227,194,32,244,124,254,149,74,227,217,225,48,222,29,219,194,98,98,147,255,243,252,241,162,94,194,59,9,157,146,173,226,129,122,104,19,237,26,244,49,163,183,237,236,84,207,182,112,134,163,
+148,159,17,97,217,93,82,139,68,33,81,236,148,218,234,30,31,237,1,27,36,101,86,157,149,95,107,90,158,27,72,38,142,119,249,72,58,96,60,245,175,145,57,171,108,218,244,150,47,240,251,140,165,219,27,76,213,161,105,131,183,141,212,188,238,154,82,255,12,78,218,64,224,232,121,235,244,37,1,67,255,78,64,109,52,118,203,70,210,253,1,120,100,154,41,235,10,124,17,140,100,218,196,177,0,31,143,115,50,171,203,63,190,190,41,38,209,92,19,93,112,120,201,14,139,235,205,111,106,175,33,129,100,239,41,127,103,214,216,23,222,190,242,246,238,125,253,52,207,167,44,116,98,189,54,216,189,47,74,195,198,177,190,231,219,163,57,151,189,15,109,71,170,93,128,91,214,16,200,170,67,185,226,141,41,246,0,81,152,247,135,249,193,238,214,228,237,205,89,175,219,50,81,242,51,46,243,252,246,159,192,107,224,20,116,127,36,88,42,38,177,179,197,82,182,182,131,148,61,138,221,236,239,128,92,164,167,10,103,236,87,44,126,235,240,157,206,230,20,133,158,21,180,29,75,62,
+137,96,53,120,174,115,38,95,91,45,82,216,153,49,158,216,163,114,226,43,54,137,85,205,39,58,29,86,86,111,140,253,161,123,218,15,9,153,111,139,154,230,181,115,97,175,154,87,90,210,154,161,130,225,193,173,121,128,203,67,29,205,85,196,40,152,167,111,65,254,119,115,192,231,71,231,99,6,255,154,94,136,216,202,205,216,23,54,132,207,35,95,53,141,10,143,253,239,157,9,59,2,217,213,27,172,196,191,204,186,128,159,185,249,112,188,140,141,7,204,158,121,173,9,156,241,78,64,194,222,219,27,210,149,208,214,221,155,207,31,112,34,236,32,103,2,135,178,117,218,76,87,247,230,169,125,174,77,41,68,232,172,250,65,197,16,246,216,178,32,200,50,69,126,153,101,30,248,82,127,76,15,38,105,199,8,58,87,116,230,196,180,51,99,238,220,65,76,172,173,13,11,222,91,94,180,96,89,103,238,238,230,236,179,142,12,81,76,77,134,238,135,66,170,56,137,31,27,65,183,118,43,102,111,109,210,14,19,152,147,223,240,254,105,17,199,176,32,161,80,188,159,206,173,153,121,
+229,133,207,170,196,146,92,23,145,182,91,253,74,249,129,205,50,122,250,14,82,156,47,243,211,107,222,219,149,250,115,65,75,171,152,8,83,62,230,111,231,165,12,107,120,246,146,116,250,61,55,137,22,104,95,167,4,165,19,107,251,125,87,235,206,132,75,133,42,181,160,194,31,110,229,77,26,143,39,123,171,155,189,88,145,215,17,208,113,112,35,82,28,249,156,234,136,117,237,191,188,26,42,131,159,34,85,22,57,112,80,21,252,25,102,229,163,62,93,47,178,26,245,51,20,170,238,65,108,155,92,244,171,119,56,229,123,59,31,180,199,23,3,116,37,12,243,107,111,103,73,137,219,102,76,185,62,104,179,171,116,239,105,168,105,111,92,204,143,6,30,151,224,173,209,241,224,220,102,217,187,205,182,16,14,86,17,5,29,3,59,218,251,105,111,7,29,202,254,213,78,186,16,225,231,197,182,32,194,44,157,209,234,240,149,175,84,203,214,174,243,211,247,213,22,124,62,199,228,222,163,126,63,52,8,37,66,167,233,48,122,163,186,158,128,61,11,178,206,116,77,218,104,87,126,216,
+127,235,171,132,176,128,165,221,155,184,49,239,128,65,223,243,209,18,223,83,248,196,41,185,170,205,208,160,226,151,181,130,221,156,9,127,55,6,79,247,132,194,133,90,118,211,152,122,187,209,1,197,91,189,57,47,175,71,93,188,108,167,9,55,116,36,9,60,118,233,167,166,235,102,135,93,28,238,189,199,151,135,190,32,76,90,71,55,147,50,112,29,69,80,41,85,127,180,73,193,46,162,131,132,240,126,7,200,110,30,87,124,132,5,226,39,53,51,231,148,29,202,30,138,163,126,33,215,170,208,117,240,13,196,195,14,206,190,162,242,24,82,30,132,159,155,81,34,120,74,81,103,188,121,228,6,103,99,149,87,1,169,140,74,217,131,145,83,196,5,27,245,27,32,219,64,52,143,67,202,208,110,220,56,179,238,134,67,61,195,60,182,57,123,171,92,12,204,159,92,7,193,184,29,165,164,180,211,9,121,175,250,54,146,216,144,145,221,191,153,240,37,54,171,135,224,53,189,101,32,249,191,151,105,220,31,11,30,199,14,149,253,254,250,221,147,147,252,203,207,228,43,224,29,67,22,
+236,219,83,74,45,253,108,240,38,109,9,117,112,128,217,111,189,163,56,254,245,132,83,97,57,233,199,251,125,33,51,250,202,125,61,181,9,223,2,139,183,89,63,54,155,200,35,188,136,61,97,235,209,112,140,225,111,140,213,207,159,11,1,231,71,26,147,38,67,158,203,171,61,78,86,171,62,224,156,53,167,155,152,246,153,247,140,97,28,23,10,170,158,124,149,4,13,178,114,109,41,61,219,229,147,229,226,111,24,95,203,68,170,239,85,5,121,3,28,87,170,7,45,49,112,15,99,95,186,134,249,60,155,177,34,235,32,39,92,167,106,43,161,24,235,249,179,193,230,250,210,250,56,25,216,254,70,231,57,28,195,147,200,49,34,139,128,110,194,142,61,208,15,126,153,101,177,79,116,120,248,87,111,165,59,5,183,85,103,32,87,203,187,158,78,38,7,110,60,208,29,172,58,192,6,215,93,249,36,201,41,91,34,80,231,53,237,192,241,102,186,100,102,34,93,136,228,207,37,71,200,35,108,25,246,119,38,151,117,24,222,43,212,110,192,222,251,165,125,203,100,8,160,30,231,43,
+93,252,244,39,175,53,49,15,222,15,74,103,38,31,55,141,30,179,228,124,22,156,180,153,36,61,35,39,59,7,50,244,140,107,62,162,97,45,231,24,171,246,58,99,60,79,218,102,127,133,186,225,112,2,212,43,116,222,7,185,172,233,202,12,84,133,175,168,116,129,57,56,86,157,160,150,126,93,250,234,84,138,119,111,136,241,109,220,233,38,88,180,241,155,38,156,202,56,214,96,230,238,72,160,244,12,132,235,156,172,78,213,158,172,76,165,122,253,60,203,144,48,175,124,92,165,84,27,105,230,241,199,29,223,112,169,131,180,71,181,208,107,240,215,46,97,87,48,190,135,202,49,180,250,122,61,181,164,213,192,167,251,77,45,166,52,231,212,96,165,164,110,63,139,34,200,82,146,230,151,241,227,210,84,43,108,188,200,230,74,133,144,48,217,228,237,51,131,23,40,97,189,36,227,143,58,233,94,126,84,163,62,195,224,205,103,163,151,50,99,44,28,175,30,108,76,162,94,29,216,235,43,246,126,64,123,253,241,166,14,124,150,55,195,207,216,173,131,152,214,146,235,168,140,241,179,
+249,22,198,206,115,98,180,145,12,10,244,217,139,55,240,76,81,205,137,199,60,119,159,97,249,203,63,83,85,83,17,109,25,90,246,112,213,31,214,76,235,89,38,253,167,1,179,127,40,153,77,47,58,158,128,201,146,187,216,203,183,238,32,91,175,99,24,3,180,205,83,115,135,151,55,133,123,69,65,234,219,141,179,112,190,11,49,218,158,42,91,246,76,176,227,140,177,162,108,191,167,60,25,151,194,22,107,147,49,29,168,159,235,82,44,68,99,77,108,129,246,232,99,240,185,138,77,53,237,63,164,50,180,180,31,43,33,70,237,246,169,13,182,231,227,219,156,246,17,93,233,116,139,195,158,96,218,212,88,70,85,184,36,83,74,151,194,144,192,76,58,68,155,247,213,138,62,220,48,49,247,172,241,223,51,244,2,134,177,82,193,233,199,159,23,162,174,14,174,131,6,91,154,150,177,217,31,26,190,85,133,95,79,179,189,133,144,101,250,230,142,195,114,119,179,171,232,123,126,200,181,76,200,102,59,40,117,95,25,133,151,195,161,67,9,97,196,156,63,141,188,3,133,193,62,51,
+155,250,208,52,210,32,23,246,236,159,134,178,233,82,24,218,199,159,33,67,254,106,161,152,173,147,31,201,101,41,164,80,207,167,75,248,20,232,123,170,233,211,241,133,173,91,33,13,120,6,156,162,139,237,225,224,218,71,27,25,36,49,205,101,156,97,252,140,249,136,12,9,206,73,164,225,58,7,157,191,207,41,219,181,48,232,211,247,74,88,255,166,195,194,98,240,49,50,169,220,191,124,51,30,2,226,147,224,189,50,78,21,118,196,48,47,197,86,240,175,41,204,76,39,248,125,207,99,255,252,153,32,184,134,73,127,183,77,216,95,77,220,208,80,110,246,15,161,20,165,158,43,218,139,33,214,67,251,65,72,203,183,46,222,22,148,239,63,236,113,226,222,158,63,249,36,238,89,90,144,15,123,235,78,45,78,78,33,20,111,239,68,165,255,82,241,177,223,165,93,202,151,222,31,166,194,167,218,41,162,94,34,13,237,161,122,168,172,223,244,79,27,204,1,39,54,197,59,90,107,128,226,96,190,181,30,101,112,140,109,69,161,235,107,44,204,207,178,200,134,92,197,126,227,174,227,
+155,112,149,11,226,96,224,132,87,91,97,65,109,97,164,199,14,158,178,107,59,78,94,7,254,136,4,29,160,144,45,118,157,186,105,169,207,215,179,87,13,7,95,139,138,227,227,126,82,37,114,175,159,125,126,22,182,148,163,129,184,7,116,128,175,222,126,237,207,63,121,200,118,86,9,58,56,170,43,157,81,224,4,207,147,107,131,152,182,98,151,121,49,134,50,29,136,39,147,245,103,175,71,61,87,136,101,235,142,58,199,44,146,18,117,214,177,86,149,100,224,240,229,170,56,166,31,37,65,188,112,207,113,251,249,50,37,74,157,62,121,57,195,5,211,215,47,247,238,233,251,73,126,112,97,122,39,196,5,54,4,143,78,115,114,37,161,49,69,10,76,133,216,227,211,82,153,21,40,15,124,82,126,26,22,248,153,70,177,169,237,115,31,71,66,227,44,167,18,193,237,70,66,108,198,135,245,94,141,131,55,135,250,161,121,102,101,116,204,4,205,223,138,125,203,61,219,113,166,16,50,39,55,134,202,139,169,109,72,22,68,241,230,116,236,148,41,222,100,42,149,178,110,255,152,49,
+111,5,57,190,255,121,88,106,148,94,56,158,120,96,229,190,226,213,120,17,242,17,94,88,155,169,70,60,49,22,103,219,77,18,48,52,123,121,31,196,180,191,139,114,178,107,229,33,203,122,231,123,184,26,208,209,221,211,234,229,152,152,145,59,252,38,53,70,103,35,210,55,168,89,180,181,174,75,9,56,223,219,19,53,183,0,121,213,111,207,84,234,113,168,198,89,111,57,225,92,246,156,54,155,82,160,151,233,189,228,61,21,163,67,234,225,166,65,7,17,182,217,172,1,67,230,118,24,124,248,212,96,255,4,18,229,216,133,48,186,149,155,13,147,247,62,170,120,179,254,245,216,240,217,221,144,15,22,208,30,105,44,46,156,183,89,59,223,13,157,203,188,70,13,28,133,138,102,93,205,118,26,149,82,250,137,9,11,26,35,193,55,46,212,96,189,132,196,218,89,201,38,156,168,34,63,253,213,13,247,243,88,111,55,214,237,146,116,233,174,81,84,228,113,216,17,243,198,2,221,63,18,75,79,38,175,92,19,11,60,120,43,214,93,31,105,72,172,89,59,123,79,200,76,173,150,
+133,76,253,123,163,142,236,33,230,190,161,138,194,243,28,142,123,101,178,107,220,150,191,172,116,165,106,94,181,223,207,145,198,152,177,51,247,10,191,59,1,72,40,94,223,69,232,199,220,13,178,99,89,104,254,254,214,203,19,86,197,158,184,0,63,103,160,8,34,186,126,16,103,182,119,81,138,197,192,39,27,177,35,244,81,201,127,68,251,177,148,120,255,141,16,54,227,135,130,120,199,237,236,40,120,181,126,33,10,220,0,132,187,248,99,104,251,27,234,95,243,205,219,182,234,239,246,55,35,246,240,217,248,169,143,114,159,127,109,21,49,135,29,130,216,228,183,194,148,111,176,31,191,161,231,246,173,227,23,216,135,15,209,64,141,241,194,93,164,241,168,126,154,145,191,105,240,52,225,104,57,72,123,22,222,32,41,185,231,243,173,251,115,46,180,56,46,112,34,238,210,91,10,27,148,58,248,110,4,158,6,212,166,30,46,58,244,189,16,134,124,104,210,96,182,251,242,211,51,216,153,101,44,134,6,197,53,47,247,236,205,41,210,200,44,46,222,79,25,22,158,218,212,18,118,124,
+248,123,126,74,36,26,211,126,70,64,108,25,190,225,8,225,33,219,55,68,251,239,95,177,134,109,46,253,201,215,58,21,204,75,245,227,167,184,167,229,82,119,140,131,29,53,92,251,141,13,100,196,63,158,30,49,127,242,41,28,163,255,104,241,27,212,172,154,89,230,127,12,43,99,60,4,187,41,170,194,42,105,28,95,228,235,10,207,218,231,23,186,114,230,254,98,60,181,217,227,178,70,199,231,254,52,36,15,126,207,221,121,210,94,233,230,129,31,90,55,81,1,36,148,57,35,236,204,111,223,212,71,28,236,230,131,236,118,138,145,138,198,212,189,214,164,254,251,18,54,12,144,74,63,250,49,120,155,43,41,172,144,250,164,198,107,37,182,247,234,74,163,130,158,103,24,85,24,49,152,60,15,65,242,163,139,208,95,236,36,1,235,117,87,104,107,188,202,209,77,64,6,97,162,169,233,100,229,131,44,205,126,233,60,98,82,234,233,140,89,136,196,214,13,137,91,147,163,74,61,9,188,108,214,245,118,58,115,202,87,186,24,49,10,206,26,241,252,140,227,201,216,145,124,203,48,
+30,229,145,134,209,161,51,83,194,135,243,103,99,78,206,28,240,25,5,150,198,242,254,102,154,197,107,172,184,58,220,52,248,121,231,13,124,91,246,251,219,5,138,101,202,185,23,195,236,99,112,108,125,77,31,135,72,98,242,209,136,209,42,128,157,45,36,224,43,106,153,174,2,215,163,147,44,38,114,10,52,76,98,95,95,227,125,15,63,115,176,18,157,19,48,192,114,195,250,211,129,253,191,216,122,143,222,6,158,56,58,236,171,228,228,179,129,192,73,124,206,37,223,32,103,35,49,130,0,70,28,56,6,114,149,88,68,82,172,98,167,216,196,222,123,47,75,138,77,236,164,88,150,189,83,236,101,197,46,114,89,66,233,239,216,62,88,16,64,145,187,156,217,157,121,191,247,123,111,118,102,36,86,191,206,23,243,59,170,15,179,5,27,118,176,84,111,112,74,202,83,210,118,5,83,153,94,235,43,208,34,198,120,88,45,195,64,141,141,75,226,212,235,74,33,82,76,179,200,109,117,81,247,254,89,132,142,137,150,178,190,57,60,15,95,182,167,170,25,249,193,16,232,176,65,78,
+212,11,243,65,157,197,173,158,17,227,209,61,85,214,238,138,65,22,169,68,125,151,183,140,101,12,227,144,66,172,202,220,14,88,203,211,181,254,42,254,168,74,49,242,84,20,69,254,86,140,33,96,19,185,58,64,209,63,248,127,239,171,149,134,123,38,70,6,240,45,53,142,232,198,138,126,238,178,113,142,110,160,139,255,28,255,226,41,224,139,95,91,202,122,171,87,5,91,131,212,52,135,159,62,245,40,251,234,124,82,144,171,26,0,68,190,89,145,136,234,87,239,100,240,131,56,217,99,219,181,76,112,229,130,143,11,151,147,118,16,225,220,251,161,179,76,100,247,114,96,23,77,241,194,229,11,97,163,62,235,186,174,36,186,9,88,163,164,54,15,254,110,162,35,234,237,143,198,218,157,162,37,84,69,122,91,150,128,171,118,229,186,130,166,95,63,239,58,251,97,77,3,164,131,51,48,237,105,45,246,153,177,28,22,223,111,215,114,149,49,148,131,134,208,88,214,36,23,16,221,226,39,216,149,171,177,188,50,187,57,212,22,240,197,206,202,56,154,91,198,189,223,100,203,92,150,
+158,108,219,180,1,150,160,123,39,232,11,171,161,173,188,63,175,20,232,205,145,240,124,102,132,49,89,60,82,128,18,69,93,128,209,97,26,73,116,1,201,105,47,77,84,100,231,156,42,184,136,47,62,192,23,69,1,173,181,81,3,59,75,128,179,151,236,2,136,49,161,50,204,246,9,27,113,84,148,146,35,181,145,225,184,175,177,167,196,110,188,230,211,188,136,37,75,171,220,16,165,123,54,10,89,227,19,128,103,234,8,189,66,219,120,220,177,215,119,109,72,183,101,181,211,164,150,118,76,104,138,246,6,110,206,24,196,90,125,6,45,63,3,55,145,24,239,158,119,34,180,227,121,93,171,187,145,204,167,3,240,212,69,235,172,115,15,248,20,79,191,124,170,211,182,196,194,77,67,127,165,173,120,12,178,4,86,243,26,153,36,50,205,179,120,224,84,159,175,104,116,57,179,227,86,96,19,184,100,90,97,207,163,12,122,2,3,180,173,129,143,176,203,166,169,149,204,150,114,55,109,138,168,199,224,115,8,200,143,14,93,168,149,139,122,230,199,100,107,113,104,33,128,20,15,144,
+138,47,41,209,213,102,197,55,119,186,10,215,51,13,158,91,246,208,215,249,184,169,218,250,164,26,238,108,43,104,138,13,78,53,73,205,189,126,139,97,155,181,164,218,239,104,245,159,162,47,247,174,209,19,129,230,12,255,43,206,238,218,236,235,87,156,129,29,43,89,227,177,148,169,44,149,243,47,106,167,210,186,219,171,22,12,239,29,83,244,228,168,6,219,35,209,155,170,86,147,114,18,198,115,2,39,65,253,68,0,25,229,212,218,57,116,94,44,8,160,125,246,118,227,218,249,0,181,9,253,152,54,56,158,91,207,44,184,159,222,220,43,251,246,50,254,102,188,183,78,169,99,187,126,28,4,91,36,2,248,25,214,28,4,213,31,129,159,174,210,228,193,158,166,26,21,169,223,130,155,138,199,238,238,216,221,180,244,253,68,151,183,64,104,52,8,239,173,40,88,239,115,122,70,135,102,142,68,159,233,242,9,46,248,128,45,80,16,176,232,240,34,202,97,68,40,21,246,246,8,80,60,159,74,100,237,87,86,221,41,30,117,231,248,95,138,223,222,57,158,197,2,207,67,250,16,
+34,6,65,103,174,84,58,30,99,173,29,87,251,126,236,225,140,183,6,68,9,158,129,64,172,245,11,246,59,214,45,254,114,211,121,200,171,147,172,35,108,193,231,44,23,205,61,136,213,212,233,126,165,50,250,2,59,26,31,144,134,206,192,231,170,155,240,221,12,69,132,251,221,118,131,122,192,88,26,16,159,7,134,213,77,222,170,92,94,135,89,68,33,130,170,60,1,230,243,183,45,128,49,212,29,36,172,40,44,16,10,71,133,152,109,29,89,192,226,101,125,154,102,220,229,101,239,76,122,55,169,44,82,123,55,187,120,250,169,187,163,106,15,246,8,203,36,175,234,241,116,10,226,20,15,175,22,67,250,133,137,62,120,183,107,116,37,89,147,196,89,119,111,113,183,22,165,246,67,246,83,195,79,98,224,52,39,180,210,204,113,43,55,100,3,73,27,54,94,133,178,218,218,120,248,41,109,227,212,198,233,34,249,243,12,236,161,80,242,86,12,7,171,72,77,253,28,114,45,130,93,189,198,119,154,131,242,5,103,122,45,16,107,178,180,74,116,90,11,67,121,19,78,197,30,239,
+218,142,39,245,8,125,215,190,121,26,204,47,149,139,2,181,252,73,121,167,131,100,63,121,212,167,98,61,131,61,53,220,127,251,56,60,184,126,8,87,153,5,205,35,16,80,106,120,119,113,151,196,119,14,134,107,161,132,6,172,252,182,231,152,192,20,15,245,96,11,233,9,181,146,55,118,232,23,149,236,18,18,190,216,124,204,15,45,143,7,50,76,152,34,107,182,118,236,72,69,215,232,78,149,147,69,49,47,16,215,194,173,176,161,52,214,77,142,114,149,98,246,161,54,182,235,98,56,114,60,194,241,187,252,239,87,201,254,150,187,244,209,46,77,13,182,0,117,205,249,241,52,17,18,186,196,254,57,48,181,213,18,253,64,175,65,0,226,240,62,33,223,123,163,41,34,166,143,46,82,253,169,244,128,186,204,50,246,193,140,151,104,56,251,74,195,168,223,81,31,29,97,208,130,152,18,222,101,119,125,87,211,116,22,139,29,233,112,220,120,14,167,189,117,33,161,68,5,177,208,213,48,185,113,134,54,21,24,69,193,149,77,14,183,57,76,203,181,181,86,221,151,107,36,240,90,
+168,218,47,30,48,119,44,9,79,0,197,241,24,148,234,126,241,22,14,94,247,191,6,224,63,241,48,74,122,53,124,233,173,211,183,9,202,136,22,33,132,186,183,7,88,163,184,191,95,253,190,191,85,241,86,188,242,138,221,28,158,230,162,16,187,199,77,20,107,119,239,126,76,181,82,79,206,41,215,120,131,40,222,95,217,226,152,167,19,182,190,146,21,30,194,214,186,82,183,230,248,203,23,184,77,120,85,93,253,72,201,147,193,236,197,201,252,128,237,214,254,50,139,220,11,155,158,187,124,54,235,204,142,232,205,218,36,195,90,103,226,164,147,182,194,38,225,151,14,150,116,229,1,122,152,19,141,128,50,233,135,34,29,226,171,110,240,25,168,97,191,168,109,149,184,110,126,190,176,240,121,65,71,158,62,36,39,137,51,73,183,196,191,126,148,24,229,209,202,111,244,113,192,69,191,41,74,4,59,80,171,224,62,218,251,136,139,104,105,33,61,127,207,100,246,247,124,78,114,32,45,52,52,184,255,60,158,102,108,244,59,178,135,225,45,206,197,55,150,203,244,137,217,5,215,246,
+53,126,97,233,198,231,43,64,189,111,114,187,107,149,25,118,105,81,235,98,69,131,188,168,150,246,149,205,70,14,192,167,70,224,134,102,171,99,124,252,231,126,27,114,107,231,68,234,211,15,171,88,125,125,154,104,110,141,214,107,113,45,189,232,147,37,180,187,203,39,215,246,3,31,153,99,47,136,5,136,226,195,54,208,97,13,170,73,186,140,179,33,125,182,95,157,211,218,84,248,108,147,177,247,157,90,112,93,243,215,52,252,103,186,119,4,245,28,156,40,25,103,131,212,122,134,108,166,23,51,11,139,24,83,18,170,206,84,66,125,98,57,52,184,132,253,57,219,248,50,163,217,65,57,240,201,209,114,109,124,251,242,229,221,80,68,155,202,117,198,59,154,193,215,142,201,52,90,162,181,168,109,142,96,166,213,179,247,149,38,10,21,76,212,51,207,172,86,227,1,160,62,247,13,223,19,135,187,111,176,210,211,66,197,18,158,184,3,227,123,189,119,251,204,170,142,125,69,71,101,246,35,113,138,236,14,255,157,144,233,103,253,94,176,42,190,164,226,95,80,205,106,154,81,152,163,
+215,181,90,100,111,12,41,197,194,178,157,124,169,69,106,21,197,19,185,78,229,236,81,150,197,206,93,79,172,188,101,211,35,56,38,255,212,194,117,49,73,53,192,96,43,245,119,41,44,155,141,120,96,119,56,230,170,38,208,94,197,86,231,146,88,141,39,187,42,21,13,216,178,107,149,18,77,220,63,114,73,95,167,11,92,102,56,185,124,143,103,18,35,11,115,132,177,170,110,203,197,112,17,24,238,127,84,40,187,158,78,203,203,205,181,11,247,115,201,168,112,13,112,24,71,150,117,146,248,68,65,79,154,149,202,248,241,22,21,147,81,135,16,58,106,214,156,71,26,202,108,77,250,178,192,28,107,187,16,116,105,146,131,142,97,24,31,64,162,240,123,43,248,254,229,135,69,55,84,49,254,143,1,150,253,35,183,3,239,191,114,187,99,248,2,245,37,201,117,231,51,125,43,172,167,245,92,110,103,0,118,251,219,57,84,83,152,223,91,111,127,58,61,49,52,144,188,157,53,20,255,69,126,118,49,215,109,167,15,197,199,245,143,132,9,249,196,226,110,103,129,40,161,161,146,222,
+19,104,81,193,43,52,30,4,249,74,212,126,25,3,142,182,74,157,136,227,19,221,171,125,70,254,67,14,180,242,178,129,97,200,13,237,211,178,148,168,186,21,192,178,77,252,106,223,91,192,227,156,113,2,8,119,239,122,183,174,12,96,63,45,51,164,218,94,168,174,113,71,195,26,134,7,80,13,67,25,25,4,107,245,51,181,206,126,190,29,104,64,79,37,146,159,211,212,186,143,45,145,71,45,74,253,40,161,125,153,1,210,203,87,32,241,213,46,50,42,26,121,179,178,157,149,249,18,49,35,129,107,197,126,242,230,149,221,53,111,212,136,240,115,103,105,88,225,1,64,37,168,189,11,43,201,88,235,224,215,179,216,170,203,148,149,206,244,70,146,6,67,213,189,180,136,187,200,183,157,104,41,215,83,233,7,40,99,40,237,19,58,61,26,227,164,31,121,53,204,18,111,10,205,43,211,190,104,155,104,88,239,225,34,175,74,121,170,177,188,36,119,60,85,4,52,222,249,11,101,40,212,76,24,26,156,149,117,106,158,22,243,129,142,135,243,137,114,66,220,131,203,86,105,208,201,
+192,247,83,119,91,22,95,144,226,42,145,138,72,161,162,101,93,67,247,39,160,33,208,96,91,206,164,179,65,166,114,171,36,95,15,254,244,73,97,80,17,106,100,178,162,130,106,145,166,219,141,188,105,209,122,157,20,118,148,68,11,236,233,190,212,125,18,110,94,1,45,138,150,189,5,146,194,77,49,69,73,131,233,252,81,200,126,143,143,206,27,49,103,107,155,159,184,212,169,62,62,121,182,22,67,254,42,87,38,132,30,109,148,123,128,96,59,91,87,55,124,41,200,103,251,55,6,96,160,96,185,27,11,139,241,121,215,19,6,96,16,11,223,67,233,204,221,231,230,140,22,162,14,132,13,251,253,215,81,132,86,245,128,238,124,212,125,1,210,234,151,45,137,36,51,29,208,79,61,206,231,79,53,248,138,254,132,168,27,163,53,111,116,24,202,127,163,75,59,161,128,88,55,129,74,190,0,56,200,39,121,0,103,108,15,59,51,54,50,249,246,17,135,113,116,213,136,175,59,149,224,236,75,37,41,70,237,19,75,46,180,171,251,162,218,21,158,58,127,79,203,60,176,204,211,18,
+247,153,236,176,24,149,7,212,225,11,21,20,60,12,22,3,222,15,151,115,123,126,217,183,193,14,164,55,230,31,73,241,252,30,102,184,172,151,86,243,192,235,21,173,218,194,229,185,104,74,155,172,17,76,197,119,126,126,81,190,183,112,167,100,136,60,88,173,133,144,16,237,86,222,83,196,147,23,246,80,178,115,244,89,67,59,165,76,39,76,136,194,58,144,123,193,134,219,251,39,215,101,124,82,44,252,142,128,16,112,21,249,137,155,71,120,212,0,227,229,117,71,9,178,65,4,165,130,119,225,137,111,119,109,159,10,196,70,154,61,243,44,68,210,149,54,83,238,224,212,224,61,236,70,182,123,189,71,76,115,31,92,82,43,51,223,235,196,58,48,58,206,93,201,253,195,34,184,79,216,21,140,164,235,169,96,124,203,253,186,208,216,26,55,243,221,52,203,24,206,215,110,9,165,249,245,151,229,218,34,169,85,224,1,243,40,156,51,178,68,219,98,33,54,58,176,170,249,139,141,96,27,87,53,79,84,113,30,128,149,76,73,12,155,78,28,239,134,106,12,203,58,6,204,124,81,
+137,123,110,6,149,99,80,191,94,234,143,10,58,190,205,100,2,53,106,109,111,158,114,93,100,226,73,29,163,207,100,69,76,18,244,109,211,131,250,93,254,11,82,205,153,137,158,219,223,189,208,178,178,113,107,244,119,238,251,242,13,59,31,207,214,125,202,88,22,231,161,34,165,252,113,53,208,0,252,108,234,10,59,122,16,82,133,17,95,211,220,54,87,29,149,9,116,251,31,217,29,153,30,77,105,106,100,41,47,245,29,67,99,89,125,190,137,20,8,117,255,7,18,195,105,183,12,188,26,106,218,55,175,62,59,132,192,125,249,38,179,202,248,234,29,187,119,242,134,15,136,159,91,48,189,80,192,146,1,225,92,78,105,18,154,182,134,146,14,53,106,251,196,5,113,23,204,109,153,4,22,217,30,17,48,120,244,139,111,134,61,141,95,148,156,190,106,235,247,86,239,195,14,131,134,220,189,69,44,156,123,120,23,29,189,22,145,249,49,200,180,38,103,13,59,64,253,218,156,143,64,120,34,149,219,26,71,85,198,56,236,4,216,116,164,201,58,158,180,185,216,93,19,177,119,43,
+251,51,63,43,126,41,23,243,117,11,53,24,226,146,17,238,193,139,226,46,36,61,27,249,71,173,78,166,219,143,244,137,97,24,174,199,184,223,254,205,81,77,128,47,34,42,61,121,1,92,254,36,77,254,69,86,59,42,55,8,99,38,7,127,134,111,194,145,233,174,105,88,47,226,249,174,20,21,108,125,5,194,131,90,221,186,167,109,190,210,55,231,175,63,170,176,103,72,209,6,216,198,120,242,191,194,205,251,31,110,176,115,197,221,19,254,74,17,149,252,151,93,151,193,128,132,20,188,75,231,181,67,8,56,245,67,50,129,202,250,92,121,158,219,193,27,27,113,199,233,34,192,34,72,4,191,134,114,252,139,186,250,222,174,90,166,215,78,46,79,195,59,152,235,208,76,63,214,72,90,106,214,199,226,250,28,3,35,242,243,106,228,121,35,116,205,109,148,10,247,244,126,119,34,139,190,76,181,241,58,225,168,189,2,165,191,32,247,78,211,73,244,33,169,23,157,143,123,211,69,167,162,1,191,85,169,220,97,77,149,133,170,15,64,175,190,130,127,62,211,51,198,148,82,99,35,
+23,21,250,89,165,246,24,238,229,9,179,211,10,42,61,49,150,245,31,194,150,255,178,111,206,78,94,12,173,10,199,212,131,137,245,235,110,192,2,51,159,185,175,116,50,39,188,58,133,89,243,73,116,124,159,222,247,60,168,11,177,216,145,231,150,180,164,93,202,64,108,82,4,248,105,180,71,52,172,144,38,61,149,34,9,127,197,31,48,82,123,123,32,144,139,189,88,146,118,71,240,44,181,212,29,137,213,135,14,172,120,43,154,206,37,96,187,181,230,205,159,221,116,70,73,131,3,226,33,188,122,100,157,51,58,26,166,213,166,141,164,70,111,128,125,150,191,130,203,96,243,65,152,113,207,111,169,154,121,5,134,166,93,195,160,163,194,252,116,54,224,178,79,32,77,9,197,243,2,152,228,107,211,184,59,138,23,154,88,93,214,126,162,10,63,165,229,73,206,79,242,250,101,232,19,36,225,239,58,68,182,211,252,140,236,80,79,189,110,205,101,45,95,47,83,128,188,183,34,202,10,203,82,120,56,253,185,123,58,253,22,104,237,154,209,242,246,71,158,227,248,89,237,229,102,85,
+25,15,132,23,31,57,49,23,54,203,135,111,245,119,42,113,95,43,134,223,197,209,187,251,91,147,105,149,94,29,197,134,29,68,253,158,211,118,238,55,114,69,212,65,48,220,134,155,91,213,62,122,18,54,221,222,214,165,254,49,178,67,53,255,170,193,28,221,140,59,199,104,83,111,87,92,253,67,89,207,55,248,156,120,191,142,253,4,240,83,125,166,188,91,190,124,228,76,183,40,218,177,247,153,84,64,176,168,160,157,200,32,242,237,54,29,240,98,210,173,138,172,146,105,153,55,123,215,54,169,169,176,93,253,81,240,105,46,115,159,78,240,226,25,1,80,109,84,11,105,186,153,55,210,2,109,8,207,201,0,147,148,78,212,13,215,11,209,85,168,206,216,146,57,19,144,242,177,16,47,186,32,225,10,149,92,186,13,67,190,34,115,250,216,188,93,199,116,71,147,245,61,149,46,240,4,242,218,77,57,19,96,104,108,79,167,87,86,87,126,121,187,107,102,129,72,88,77,74,175,232,12,75,218,155,98,96,81,207,140,254,19,210,121,252,81,146,202,83,81,121,202,63,64,71,4,
+255,1,250,159,73,188,123,196,245,175,73,188,123,68,195,175,73,188,11,147,28,234,60,52,232,73,63,26,249,250,134,122,153,190,255,255,126,146,62,225,218,156,233,117,152,85,32,58,198,181,102,49,211,99,39,92,125,154,153,175,233,205,211,151,70,94,9,177,178,141,49,58,91,27,217,114,155,81,227,117,82,100,204,95,49,241,11,139,162,198,167,142,193,199,174,130,156,95,84,131,95,134,31,41,85,6,107,125,207,93,81,51,66,151,20,248,104,27,253,151,105,223,238,84,155,239,133,82,121,205,238,200,51,150,19,219,137,128,137,171,236,177,171,159,180,187,132,195,20,147,192,37,40,78,117,123,89,163,45,251,180,240,123,41,83,20,173,124,207,209,151,250,248,148,104,9,172,99,26,154,178,217,132,247,60,104,106,146,170,4,187,45,99,193,167,69,94,13,124,208,163,160,227,16,53,89,103,199,25,186,22,34,117,122,190,189,167,97,42,175,135,45,190,21,117,41,201,92,178,103,202,197,48,89,94,105,37,211,243,113,160,180,155,189,120,252,85,77,146,190,79,5,146,173,87,91,
+105,202,9,243,38,248,23,153,93,236,137,171,95,37,182,92,29,195,146,50,100,128,148,185,175,145,98,190,137,127,174,215,57,6,235,110,15,104,177,192,128,100,255,98,49,130,239,159,53,241,184,106,186,204,4,107,183,218,164,33,192,32,168,228,154,143,117,184,95,165,98,159,55,233,147,113,139,254,234,25,250,214,99,114,66,86,161,1,185,215,13,238,159,143,114,243,133,65,166,21,39,182,164,38,143,147,45,68,70,171,153,185,170,231,35,206,62,110,147,219,168,233,30,255,75,149,171,234,123,123,53,130,198,150,8,243,122,248,153,50,208,194,167,230,12,240,131,135,237,190,14,140,58,7,143,83,73,54,134,254,80,134,5,224,142,157,166,97,52,95,196,7,31,231,28,171,85,131,63,228,189,231,64,75,142,243,107,177,147,195,94,167,99,192,203,180,174,85,180,75,158,219,215,182,154,113,173,113,203,15,237,204,48,36,15,10,95,160,7,64,206,160,189,112,179,96,127,164,128,179,28,113,202,191,238,141,62,167,61,78,43,181,93,190,197,103,105,237,20,198,234,65,42,31,224,183,
+251,222,225,68,33,198,230,175,164,157,230,219,145,89,216,215,230,155,130,161,159,207,185,140,249,15,153,3,160,44,56,103,73,165,211,107,148,210,233,139,103,106,116,200,13,42,5,69,154,48,118,92,93,41,173,82,230,10,167,250,98,115,53,199,32,55,116,89,74,188,3,242,4,90,9,36,242,43,40,205,92,79,125,209,229,119,93,159,182,6,238,53,39,208,217,205,171,213,38,195,134,3,80,160,160,244,225,207,93,6,59,249,127,236,36,10,123,71,189,145,181,102,217,161,226,11,216,108,198,131,191,195,212,119,125,173,215,191,0,219,193,169,61,163,14,103,48,131,167,175,46,37,191,15,142,132,139,170,102,39,231,9,177,6,212,51,45,214,122,110,124,46,115,29,168,12,154,156,179,5,200,24,205,155,82,175,136,249,116,245,104,108,219,187,234,30,66,196,70,240,209,196,26,126,5,94,12,39,188,131,94,90,216,230,140,26,164,126,108,203,39,42,123,229,11,232,115,218,212,64,152,73,55,94,111,134,139,145,27,252,178,231,205,153,103,60,32,109,32,175,129,214,124,10,229,14,
+118,26,45,68,210,209,151,70,11,90,221,187,51,42,12,38,232,145,229,232,174,62,212,227,107,11,55,15,71,10,52,6,37,8,47,248,234,36,148,144,109,101,122,157,68,175,231,250,108,219,175,169,100,33,242,151,131,250,172,199,122,158,22,70,9,89,91,243,253,17,62,49,109,246,68,239,114,109,193,27,99,177,246,22,41,215,177,211,117,9,101,82,127,86,52,137,204,213,174,76,151,224,225,155,148,105,239,122,47,166,155,158,100,61,176,113,29,31,99,53,203,43,113,27,115,67,122,46,132,12,7,251,249,53,113,183,167,37,54,145,164,75,82,33,61,66,165,104,58,27,68,240,134,4,194,159,174,1,190,19,131,185,14,93,126,24,165,236,63,90,163,201,141,197,25,0,13,252,79,247,98,203,68,157,236,117,128,221,2,209,233,182,230,10,173,56,181,215,34,178,248,244,61,159,131,27,39,60,212,13,66,160,173,194,77,60,43,238,174,183,105,10,8,204,4,169,29,118,105,242,233,225,98,80,163,18,113,201,64,75,171,30,115,175,173,112,254,117,173,253,82,60,84,234,156,189,
+58,218,142,212,120,147,8,235,155,103,107,134,56,39,0,152,27,53,135,211,218,28,103,110,71,115,155,109,116,61,69,21,42,196,16,202,236,32,229,239,3,40,177,105,72,97,194,56,228,112,103,187,137,227,232,116,79,231,94,76,22,50,33,206,127,8,214,162,186,24,57,31,176,134,101,83,22,106,2,5,243,97,185,185,167,1,189,158,194,254,232,134,109,46,230,135,152,216,166,169,164,86,6,182,220,173,33,70,134,34,98,126,38,167,238,190,169,229,222,191,24,168,140,237,25,0,247,57,172,58,190,217,51,94,139,189,23,68,109,173,239,26,106,150,160,55,97,47,125,102,233,72,192,183,187,131,46,141,155,131,131,107,121,182,176,24,212,8,35,43,243,75,156,236,131,107,175,252,190,37,164,7,244,29,110,70,214,251,154,245,223,210,177,183,208,190,215,46,223,190,224,13,191,135,235,10,178,250,181,102,60,91,236,94,178,183,121,132,32,241,197,195,190,214,106,239,143,176,135,109,87,253,111,92,238,185,190,31,242,86,116,181,52,168,159,203,226,155,51,33,209,205,127,104,214,215,
+239,206,115,30,92,159,129,122,88,231,33,42,227,235,44,19,120,249,182,38,107,63,156,232,203,0,241,21,35,220,53,156,129,253,154,220,224,237,142,125,184,172,111,47,51,109,188,210,149,184,102,247,207,138,68,111,59,180,144,158,47,106,27,62,45,171,3,242,172,77,254,200,192,195,186,230,219,194,67,178,111,6,121,200,166,156,7,51,101,227,107,19,18,250,203,166,74,186,94,230,251,231,182,115,72,42,0,165,88,246,8,243,201,42,49,10,250,81,8,128,25,119,83,55,25,22,123,41,7,20,119,145,18,228,178,158,167,239,90,147,144,192,207,26,215,152,246,250,206,198,162,20,118,248,3,253,30,100,141,28,129,43,153,178,172,42,29,237,189,153,74,95,20,133,227,236,164,28,239,19,28,156,150,111,180,17,146,115,117,75,152,166,142,32,6,190,55,225,182,196,48,200,219,186,195,137,205,158,74,210,14,121,247,208,4,37,232,135,205,123,179,3,81,80,234,227,181,149,236,38,77,182,241,225,106,102,41,229,138,84,207,106,33,37,128,220,1,58,148,54,183,55,225,97,240,101,
+48,33,98,118,6,108,155,189,228,239,228,95,251,176,120,54,213,131,155,69,187,95,79,163,72,153,51,230,87,50,142,19,110,46,226,193,152,78,179,188,50,165,124,28,110,87,220,239,169,162,202,170,87,239,141,117,181,91,167,14,34,104,178,87,20,20,51,236,112,195,248,198,113,160,238,99,42,78,126,117,175,55,213,50,179,144,223,31,178,202,243,50,80,203,59,62,227,159,135,183,68,163,82,55,79,217,105,253,251,8,210,213,165,103,237,208,64,219,107,108,159,22,112,193,251,102,37,45,194,200,32,154,212,191,126,188,90,62,71,207,51,166,42,121,171,254,101,238,196,223,99,14,212,254,249,174,81,127,51,247,251,63,233,88,20,251,103,120,247,209,255,207,240,46,37,18,164,255,102,110,15,5,253,145,14,53,243,24,142,159,83,28,46,3,41,244,83,82,60,78,95,113,138,187,171,26,244,12,103,201,129,250,205,45,196,225,48,246,197,232,160,128,200,29,80,61,213,222,145,30,7,225,192,142,31,8,53,99,95,164,51,51,114,122,181,121,16,18,155,205,101,52,177,211,235,30,
+38,151,69,94,28,254,188,99,4,67,110,42,39,96,162,226,46,132,25,163,7,79,3,93,153,25,2,218,206,228,144,219,127,144,246,53,25,148,26,81,84,54,89,122,124,208,15,175,15,59,138,193,48,95,152,42,23,186,70,62,158,121,42,181,141,227,77,157,213,13,53,95,192,190,182,210,44,162,83,172,167,172,191,180,22,134,94,50,69,17,166,25,61,164,102,88,140,63,195,22,192,38,23,163,66,3,127,136,21,238,253,246,228,141,165,234,223,168,69,166,116,6,233,122,18,180,214,186,238,25,56,126,166,62,172,159,144,51,98,120,193,214,213,82,158,175,98,74,237,34,185,190,121,98,252,228,217,190,207,139,23,207,123,212,66,31,156,131,62,174,237,179,210,120,182,19,93,170,196,74,151,126,174,26,23,195,222,12,28,42,60,119,140,240,53,137,168,210,229,185,51,65,143,213,21,162,70,173,84,125,43,72,205,65,249,76,226,79,87,53,214,174,192,166,123,77,36,91,44,123,234,59,65,146,230,130,192,208,151,51,151,79,245,163,114,244,234,107,205,166,135,233,128,69,230,59,
+203,181,237,101,245,165,129,97,51,249,192,85,223,40,143,0,103,0,250,39,126,162,159,20,178,146,166,236,20,190,120,62,46,106,225,114,57,194,22,132,124,125,0,215,93,79,245,242,108,57,138,54,25,15,205,237,251,1,50,245,105,202,153,51,94,179,207,177,85,233,245,13,161,45,73,247,207,51,28,132,43,136,108,137,46,163,5,46,65,44,201,125,118,160,38,193,117,134,81,28,179,63,145,57,113,172,38,145,241,134,9,80,220,52,129,27,36,240,233,202,27,89,151,113,35,107,255,34,126,63,204,35,127,128,89,203,14,176,228,193,1,159,255,70,143,230,232,135,51,237,247,113,193,127,198,19,246,31,60,29,241,209,86,25,162,193,65,153,68,17,93,78,235,51,94,31,31,244,59,100,248,71,226,31,81,41,151,236,253,223,76,11,186,246,55,219,26,209,76,81,187,162,105,165,195,165,72,160,142,210,62,183,210,186,3,2,144,105,62,181,194,174,150,123,71,174,235,139,11,227,150,153,35,35,125,65,210,189,29,8,158,228,237,83,129,64,240,94,122,19,11,111,103,111,99,25,
+188,59,44,104,94,6,91,100,29,96,15,44,53,70,71,191,16,243,117,4,153,84,124,42,145,203,117,110,78,126,185,94,52,116,83,214,132,9,171,96,130,59,150,40,50,31,17,177,161,113,66,134,107,24,151,97,112,245,21,83,76,129,153,197,22,68,103,231,143,49,194,237,50,150,77,122,245,147,151,86,252,80,243,87,209,216,171,206,249,180,140,233,48,90,234,43,227,5,45,208,207,65,205,221,14,152,159,84,169,125,64,238,22,170,229,228,42,86,115,37,219,115,101,148,208,64,2,94,69,184,16,155,85,83,22,246,106,96,62,173,69,30,70,212,83,113,142,134,67,192,207,234,218,99,86,11,63,35,123,61,42,202,209,246,108,206,178,5,6,153,102,212,24,64,142,179,42,246,154,104,160,85,16,243,52,1,43,95,124,90,75,249,249,252,56,10,193,241,142,100,30,22,253,14,60,217,173,250,18,137,3,48,63,166,252,184,215,164,60,170,131,31,149,20,38,60,121,181,141,119,63,1,234,233,140,67,231,99,145,148,14,213,72,251,82,17,107,18,175,139,178,205,152,56,53,62,
+125,124,155,30,103,106,73,164,244,217,116,23,113,53,51,251,53,167,127,6,10,30,50,47,250,171,148,240,5,87,201,132,217,225,203,155,45,24,167,127,32,128,252,158,243,106,131,210,213,27,163,82,146,166,8,243,20,184,41,26,75,230,240,230,248,20,255,146,87,222,252,88,27,142,83,202,219,229,224,162,164,147,105,94,230,3,168,10,35,112,78,163,11,174,62,194,54,187,132,101,152,116,115,51,112,154,254,225,152,245,137,226,78,25,135,253,150,149,134,248,25,172,39,52,8,56,188,41,251,186,102,155,208,149,121,229,87,146,3,197,55,220,30,191,49,31,89,107,153,52,135,101,0,114,179,28,119,133,72,249,54,35,252,82,219,89,38,209,35,191,49,75,242,1,57,255,6,128,188,103,85,255,194,166,86,185,149,240,92,11,116,11,118,106,22,51,234,234,120,36,83,162,53,49,151,215,245,31,131,72,215,230,218,132,177,60,78,218,113,74,176,162,87,182,230,17,168,85,185,182,47,198,1,78,165,22,69,173,116,174,54,216,65,31,254,229,172,139,79,185,140,66,250,195,200,249,
+86,162,17,213,113,111,148,200,81,193,96,241,253,234,75,73,17,16,217,236,152,51,100,147,193,65,173,120,44,34,8,126,63,163,218,226,1,207,92,162,91,210,154,215,114,239,207,166,20,135,209,163,131,151,47,195,192,203,154,138,196,193,115,197,22,46,169,56,57,209,147,74,18,76,18,204,208,92,70,83,160,49,39,76,200,65,34,171,138,242,95,59,69,25,200,223,190,68,48,71,125,60,161,249,214,59,1,191,254,14,234,122,7,134,246,151,232,207,72,49,233,255,76,168,248,79,243,20,175,12,11,11,73,190,98,253,96,144,253,247,28,154,109,129,77,125,37,20,124,252,199,142,169,55,143,0,188,11,183,172,118,11,201,189,37,131,30,174,85,84,76,200,114,73,230,61,173,139,205,0,73,210,63,53,234,11,134,73,159,170,133,4,165,229,172,238,18,146,131,117,210,158,19,243,28,147,173,216,207,151,94,102,224,68,3,173,71,66,94,254,60,190,8,23,234,137,46,44,49,160,101,138,193,139,172,208,144,165,148,125,118,226,11,82,115,54,129,159,122,64,112,220,42,238,30,7,
+225,232,123,57,81,153,81,77,101,234,84,50,48,4,62,42,168,28,203,239,0,1,179,160,209,204,144,81,178,77,52,1,117,115,93,225,172,208,125,173,14,69,95,151,106,182,209,147,164,129,238,53,57,143,229,143,111,244,224,204,247,196,31,220,170,202,25,187,245,153,72,130,240,132,254,182,24,33,233,235,207,36,37,20,142,88,151,120,140,70,122,190,113,2,12,115,90,87,84,115,90,69,121,34,218,206,85,203,33,186,218,166,114,237,49,54,171,46,171,30,26,214,85,162,18,206,180,8,247,251,127,93,155,45,101,97,186,59,183,209,201,205,83,196,82,78,204,9,0,88,219,234,138,225,31,67,44,209,87,209,216,98,246,178,242,97,221,21,129,55,4,101,224,130,227,25,11,68,66,0,46,101,251,145,29,86,209,230,233,100,164,76,56,212,184,252,100,27,170,88,153,170,187,164,236,166,103,11,196,213,146,122,118,170,175,163,225,200,224,83,232,182,126,242,107,225,65,246,235,218,151,237,2,118,42,78,30,19,118,75,130,160,238,121,203,130,190,51,204,91,0,56,16,247,122,136,
+11,73,201,64,218,88,54,195,192,48,207,115,189,249,24,25,26,140,9,163,81,52,40,13,36,159,63,193,79,96,200,140,65,128,77,59,77,69,134,160,58,167,182,168,223,94,225,20,181,206,146,69,45,117,95,10,61,31,33,211,170,4,29,24,24,186,206,28,69,139,246,205,242,237,67,68,1,36,219,206,247,137,255,79,0,246,70,123,243,196,99,21,152,177,115,217,184,120,197,85,126,65,99,97,173,159,162,108,169,236,126,198,63,227,162,232,59,113,252,194,39,92,129,185,37,212,92,39,251,212,252,185,118,148,243,10,251,61,223,62,255,101,182,111,210,145,242,130,76,102,37,84,234,35,81,46,252,71,235,166,253,235,223,172,87,62,111,243,55,235,117,88,80,200,180,108,46,92,142,60,99,26,165,227,93,105,98,11,196,27,202,20,22,121,83,1,172,137,181,159,140,85,181,155,171,151,90,98,163,37,157,68,150,236,235,13,67,104,151,174,125,48,136,198,163,252,94,226,222,180,255,120,107,122,119,101,223,64,178,55,212,29,182,103,17,139,158,109,21,67,155,67,134,158,114,242,
+17,141,140,117,75,208,230,231,220,93,180,160,197,115,108,76,221,144,90,112,171,196,48,91,11,209,54,34,94,116,181,207,111,13,130,18,199,228,137,79,242,149,49,23,151,197,202,50,237,76,178,150,69,105,71,248,79,15,115,170,180,229,20,164,103,218,190,226,94,51,98,168,239,50,169,155,111,39,228,195,16,105,58,130,74,198,221,214,181,169,32,12,220,17,253,163,181,42,70,38,157,107,203,212,158,35,108,56,156,173,125,222,77,181,6,52,182,200,237,214,185,226,201,149,57,122,13,175,207,20,115,238,93,142,53,198,49,60,161,198,214,163,228,107,147,126,205,103,62,81,162,62,198,51,246,157,22,159,218,64,119,22,74,190,196,90,145,228,83,81,57,228,76,94,171,41,129,138,1,148,186,232,52,239,56,147,243,245,122,58,108,99,29,12,180,177,160,243,113,112,249,47,20,57,54,55,194,210,236,74,42,231,81,103,115,70,139,149,181,84,17,114,173,85,244,57,144,162,98,235,144,88,108,30,29,93,212,42,140,132,242,129,41,169,174,234,164,155,190,223,25,68,249,114,58,53,
+87,244,72,12,213,104,208,66,218,163,130,31,205,82,205,43,109,228,103,138,42,55,18,14,227,213,235,131,205,182,181,234,220,186,232,72,34,76,228,209,232,120,178,159,16,180,71,3,37,31,64,166,166,60,23,173,179,24,178,128,108,43,159,59,3,83,235,80,189,119,151,104,246,115,244,175,160,253,102,195,179,218,166,153,160,27,181,103,74,123,193,47,69,214,144,58,182,72,97,228,254,122,142,251,29,152,186,129,93,221,219,236,93,8,101,202,182,147,249,239,162,145,181,79,0,189,213,65,167,34,124,226,120,164,32,226,216,78,221,94,162,41,87,170,214,159,187,31,52,181,181,203,236,208,74,56,194,132,235,9,231,228,221,142,83,254,239,165,172,0,110,216,241,94,103,14,10,186,125,98,239,143,238,83,137,151,87,167,140,56,169,207,74,89,247,74,55,155,164,230,237,71,197,166,244,153,90,5,246,31,252,32,91,30,251,172,19,131,79,121,49,74,2,167,226,174,159,123,243,223,83,220,8,46,21,159,99,131,76,117,179,150,182,218,240,109,43,201,86,155,195,11,160,66,97,138,
+70,122,111,105,138,15,132,249,133,162,198,45,33,179,170,151,238,90,17,228,133,138,67,108,72,126,111,236,98,134,253,99,178,77,158,21,163,98,116,210,219,44,252,213,163,244,216,148,249,203,31,210,197,183,118,87,238,24,212,119,123,52,45,209,239,61,99,83,21,135,150,8,195,203,202,38,95,156,66,100,164,164,89,84,167,171,216,166,61,201,235,83,163,135,99,241,111,180,140,34,255,122,43,86,188,195,153,88,143,12,252,205,36,250,254,83,63,198,227,26,254,93,205,245,118,22,49,12,191,211,215,187,242,232,40,210,186,191,14,157,158,192,239,107,122,77,220,255,78,121,87,67,70,214,239,148,119,11,242,119,227,130,1,87,50,71,119,217,250,118,135,110,32,132,190,143,79,112,234,119,249,217,161,182,31,234,207,129,51,91,47,104,224,68,1,254,72,180,124,222,52,181,17,165,4,182,120,174,151,199,144,171,190,27,84,202,7,21,21,86,54,28,10,227,161,86,211,25,89,122,87,232,171,98,193,194,13,199,189,236,240,252,128,229,225,87,66,219,108,120,175,112,65,82,189,244,
+69,203,77,147,64,190,95,69,83,180,214,242,195,23,61,247,126,101,71,187,39,76,66,59,179,197,157,165,130,15,237,49,220,152,137,114,112,45,159,8,112,183,178,164,184,152,196,158,175,156,238,24,8,147,58,95,28,13,54,70,119,217,117,191,98,79,40,253,85,249,171,233,5,48,254,213,84,90,9,255,106,146,45,72,127,53,1,77,194,95,77,219,181,246,175,166,175,22,251,175,166,144,51,187,219,80,225,50,47,130,105,45,99,45,68,37,192,0,177,163,35,150,115,47,108,112,111,49,206,189,113,126,91,204,241,212,253,107,49,245,223,42,129,167,110,211,121,198,100,90,51,255,207,90,65,8,25,29,250,176,17,246,92,56,52,132,242,45,102,48,178,16,111,68,229,249,17,160,160,2,196,1,126,142,126,195,170,63,218,71,179,99,202,74,34,187,134,142,1,21,160,148,10,203,121,154,65,222,27,131,148,98,214,101,57,60,67,191,223,82,42,174,50,203,225,161,110,54,126,150,95,55,20,140,228,125,123,239,197,169,166,81,101,106,114,160,117,90,71,152,175,191,253,234,5,147,
+156,75,107,151,224,85,30,240,129,79,0,52,195,120,252,80,87,185,255,189,166,76,153,112,14,66,11,222,148,153,160,205,142,205,34,222,214,119,8,0,107,243,253,40,197,145,40,191,0,47,226,123,85,216,183,152,102,11,139,176,120,68,130,245,123,36,83,244,169,211,119,96,120,187,208,34,214,2,228,105,3,9,255,139,136,31,145,123,8,21,109,193,55,239,240,119,57,196,119,183,251,183,28,34,153,112,84,254,86,36,186,254,208,180,230,135,221,176,231,250,66,123,218,119,43,189,103,139,163,46,62,124,7,40,168,9,186,187,15,82,80,131,50,245,231,119,81,161,39,27,9,88,165,143,247,106,17,252,53,5,169,198,79,226,98,196,223,9,162,125,162,136,41,147,61,206,60,118,255,100,34,115,154,75,211,78,71,87,13,52,177,228,253,228,112,78,28,189,238,113,38,22,171,188,129,22,238,157,197,82,70,95,153,136,183,24,85,230,154,66,130,250,184,119,122,49,151,101,191,13,48,254,220,231,196,190,237,152,137,221,220,121,247,167,6,166,227,201,214,225,152,210,75,247,106,63,
+203,64,250,78,208,77,169,151,23,128,83,51,97,124,194,105,92,126,111,94,109,162,216,94,252,46,234,234,49,57,46,0,220,240,170,220,147,154,20,15,239,19,248,103,206,137,152,102,0,234,245,60,158,247,151,173,83,13,202,236,202,42,131,20,122,224,85,153,19,54,92,49,87,170,171,145,113,128,94,5,122,41,143,159,59,6,170,210,150,249,237,49,234,253,126,74,219,205,134,255,101,198,227,189,61,40,223,242,166,191,12,56,129,96,2,3,181,251,29,55,193,18,93,137,23,86,75,111,175,200,114,194,64,196,3,222,145,70,175,219,184,82,1,153,20,173,97,83,55,15,111,74,134,50,23,249,93,244,99,70,27,30,95,171,102,88,70,74,70,66,120,23,217,73,15,32,90,136,217,130,130,226,248,194,127,203,121,244,79,122,18,176,127,101,89,71,65,74,236,55,240,35,61,58,217,165,173,46,202,189,70,149,203,25,64,67,6,242,14,71,180,30,253,35,176,200,52,205,198,211,208,239,208,60,193,34,10,86,157,70,167,250,79,166,191,110,208,78,239,250,239,169,91,169,151,105,
+140,223,222,23,189,254,39,62,160,218,225,195,235,189,171,140,103,2,107,201,6,10,37,235,7,166,65,250,39,30,126,195,172,155,118,158,255,24,132,56,224,254,125,35,215,254,131,203,209,248,15,92,28,205,95,184,96,174,189,92,14,243,183,82,117,10,65,184,226,118,52,201,71,141,231,247,123,1,203,208,22,137,191,173,219,172,27,212,102,94,59,215,225,183,220,147,62,180,174,151,137,210,166,28,165,128,91,55,86,48,212,111,223,2,60,114,83,180,248,224,199,248,104,201,123,253,89,231,162,155,122,74,248,50,47,163,187,157,84,53,2,220,246,113,12,92,54,140,203,167,140,212,220,236,186,193,250,252,166,139,140,21,254,23,4,235,20,192,148,61,122,72,184,220,19,156,155,73,209,97,92,127,82,199,81,21,172,106,87,92,248,208,150,115,135,50,105,148,177,206,98,184,210,206,209,28,87,238,151,23,5,140,244,183,155,165,32,24,27,208,144,195,85,115,217,151,238,35,215,122,72,14,105,242,108,133,179,111,153,119,101,131,193,127,214,244,11,242,166,109,144,136,112,162,188,205,
+142,81,190,58,118,75,143,112,124,106,109,142,126,232,27,43,191,17,93,152,114,159,145,62,136,4,87,84,242,49,209,130,79,66,207,98,229,251,217,244,244,239,151,153,174,13,72,133,162,245,156,239,184,65,67,9,217,119,194,15,219,231,76,243,208,60,172,52,109,224,124,104,226,71,254,173,236,230,154,42,35,26,223,237,88,63,155,120,208,247,155,29,169,193,250,61,247,96,158,161,89,177,253,211,244,244,88,48,169,29,225,99,74,217,200,244,60,139,13,25,216,250,27,89,223,241,11,186,221,14,176,66,112,82,59,238,63,6,3,116,92,71,95,39,87,150,239,13,183,58,77,252,223,197,170,143,99,190,226,84,44,214,126,35,200,184,96,99,72,191,89,174,202,7,11,170,140,169,3,89,255,13,243,190,192,132,91,219,77,108,40,21,132,72,105,225,213,147,53,195,12,222,146,108,56,114,207,45,198,65,127,57,221,22,239,239,239,159,159,159,77,53,168,153,228,225,101,244,5,218,126,222,222,93,48,214,146,172,57,90,79,153,198,94,151,66,178,41,29,85,89,8,141,119,211,42,
+56,123,21,183,7,179,67,217,208,54,138,94,94,72,47,198,50,240,180,36,87,252,136,17,68,226,103,21,50,115,5,138,123,150,203,222,93,145,178,2,45,161,181,104,190,189,158,63,182,237,235,177,60,246,111,138,132,101,251,216,241,88,206,55,51,252,26,41,243,28,214,142,212,195,108,4,4,245,94,165,82,33,58,100,141,125,218,230,80,123,98,159,8,56,114,233,119,198,252,241,88,42,74,250,176,187,239,216,172,131,135,163,147,149,180,61,170,237,37,195,221,45,140,153,49,151,44,57,225,253,75,179,225,104,130,205,128,65,2,167,29,80,123,184,60,189,63,232,32,139,123,177,136,180,45,229,8,218,124,168,181,173,154,165,123,230,43,221,250,178,206,101,245,78,118,66,173,195,102,71,110,62,221,194,126,161,201,234,166,88,125,191,255,232,152,92,20,30,26,141,5,233,59,212,164,56,181,246,252,42,160,75,204,225,13,243,224,76,35,160,222,189,185,87,32,144,59,84,172,154,240,20,196,105,78,131,132,5,4,137,185,169,190,73,244,148,230,91,146,237,43,213,131,122,221,221,
+42,18,168,104,204,129,83,157,84,226,87,61,139,186,101,249,34,199,120,193,99,80,51,52,208,128,218,148,56,41,191,90,106,228,92,239,211,22,41,200,27,103,77,251,12,164,184,93,32,9,173,100,64,235,169,133,103,150,154,219,37,26,106,229,136,158,94,146,169,211,148,136,90,223,58,150,29,251,211,136,139,68,110,206,251,244,3,225,209,183,250,54,15,246,249,239,229,36,102,13,67,106,48,93,47,39,83,227,149,218,183,171,230,120,142,130,222,188,212,35,127,12,194,105,167,115,207,122,43,73,101,230,116,51,21,64,237,17,171,194,200,114,102,114,201,105,62,204,228,22,110,51,77,118,170,76,194,184,86,62,84,14,188,169,153,203,99,93,181,156,139,186,157,255,168,122,150,213,47,41,83,185,125,169,30,122,207,142,182,255,226,129,105,76,94,248,29,62,230,67,10,224,178,119,28,200,68,242,253,212,133,227,10,179,106,39,102,77,64,193,9,51,193,150,110,40,181,193,242,60,11,217,112,172,218,214,104,163,121,226,20,72,92,146,26,157,5,112,240,103,179,160,255,200,79,205,
+55,94,241,251,154,207,73,94,159,129,26,84,168,208,37,0,17,236,190,141,55,107,191,58,130,51,149,95,177,148,168,130,42,157,14,121,218,239,47,7,196,76,247,151,242,40,92,145,61,224,95,232,146,54,211,244,229,116,190,237,143,234,209,218,81,129,113,95,217,243,46,217,62,177,44,62,159,239,217,113,107,212,215,194,232,25,126,177,46,162,201,0,220,38,95,174,44,116,125,191,168,223,28,75,232,186,91,54,110,51,43,244,174,206,138,168,139,196,160,45,21,24,250,128,47,126,148,243,77,194,67,61,124,33,99,1,43,224,209,32,88,196,237,250,198,169,104,6,138,203,70,41,23,208,22,143,69,65,244,171,83,209,12,19,228,41,210,194,123,234,217,4,223,188,95,224,255,200,191,114,135,130,100,158,24,149,169,207,42,215,84,45,119,154,247,101,1,96,237,7,143,197,92,89,215,190,50,149,179,51,129,68,208,51,160,102,230,228,165,47,73,179,146,86,145,100,233,228,167,152,15,201,169,206,112,181,209,164,205,230,57,181,63,205,125,122,203,107,246,246,149,162,115,188,127,110,
+28,108,223,18,247,170,63,254,56,21,29,246,175,86,1,2,205,213,68,60,233,108,45,50,227,57,67,192,40,231,147,244,213,139,243,21,142,126,96,154,124,33,165,59,147,39,235,155,212,15,56,209,56,156,86,120,203,51,155,15,90,254,35,160,58,95,118,14,222,30,95,27,149,116,53,192,254,102,183,251,124,250,224,226,240,65,200,94,86,248,118,215,118,67,237,110,86,221,41,203,141,53,70,153,253,107,58,137,138,54,99,94,216,174,42,109,19,116,77,190,246,157,207,77,125,245,175,79,245,190,150,64,0,103,49,28,33,50,83,173,66,238,229,241,126,231,90,142,143,97,217,36,86,171,54,231,112,112,59,6,12,130,142,147,77,25,126,231,197,228,162,237,75,136,200,117,52,15,237,144,166,116,211,250,110,87,217,182,237,59,214,52,197,160,238,107,3,123,161,46,199,196,186,52,249,105,213,189,171,120,141,16,223,84,38,101,177,48,160,215,40,174,209,166,98,183,60,28,166,134,136,45,206,233,211,250,94,196,192,124,248,25,135,212,93,252,220,52,72,224,165,8,243,180,150,143,
+71,89,75,96,72,145,88,4,60,232,208,216,116,108,229,70,254,167,177,218,144,189,235,87,218,246,183,187,139,135,27,127,196,205,171,157,48,153,185,106,39,200,232,141,80,222,96,24,180,171,184,232,233,169,229,183,210,45,101,155,29,199,173,189,167,149,50,153,110,204,26,16,123,141,101,140,17,165,78,127,108,83,121,133,234,199,50,88,140,123,51,195,91,12,166,132,153,54,170,157,58,138,247,206,174,68,40,98,88,245,83,101,103,126,196,240,197,40,156,131,231,82,189,70,244,145,230,37,126,229,123,251,70,82,70,218,119,53,124,48,10,73,161,227,173,31,211,143,95,55,17,0,55,228,194,12,97,13,174,188,61,193,181,174,243,164,143,243,168,216,11,82,162,17,214,169,144,210,127,0,234,188,202,22,126,184,103,222,128,243,139,180,81,100,129,153,133,66,214,29,183,160,132,92,66,77,13,183,89,61,170,18,92,128,251,9,224,247,154,127,181,96,47,67,83,38,237,184,245,75,245,145,127,178,182,124,95,217,171,253,143,234,199,224,189,142,184,197,41,244,212,220,220,44,80,123,
+99,169,71,87,239,247,100,89,96,220,200,186,84,224,170,80,193,153,9,228,152,249,207,213,230,227,132,204,66,28,162,231,77,189,216,78,16,170,91,248,79,40,42,178,242,162,152,255,65,213,58,198,25,238,85,202,182,126,61,137,223,127,149,35,241,63,249,16,235,212,247,225,121,90,181,124,247,207,204,169,143,31,92,245,19,249,113,151,14,162,167,164,37,39,8,63,253,179,15,134,163,226,190,23,198,243,216,250,28,111,159,13,221,133,134,92,159,159,178,13,31,240,249,126,216,51,243,237,188,51,112,239,235,17,30,49,79,109,32,195,77,111,39,94,247,93,159,243,74,87,186,23,58,203,98,173,159,75,166,177,89,91,4,246,235,36,158,189,198,49,149,178,194,253,106,215,7,20,214,107,222,171,139,23,170,101,151,211,112,137,215,50,159,189,214,71,198,237,213,30,249,93,175,157,158,125,3,244,93,181,142,238,58,45,98,178,198,149,199,227,13,4,192,154,148,106,1,66,183,130,182,185,104,6,226,195,89,236,254,134,223,77,112,123,55,242,114,228,95,243,186,130,90,189,112,61,
+200,77,173,244,120,20,59,13,68,217,117,218,232,168,87,222,19,166,33,128,59,141,224,164,19,230,255,172,86,122,225,233,129,167,244,229,142,68,217,123,137,197,193,3,238,199,141,167,55,242,9,21,173,3,31,98,3,6,158,208,31,180,222,181,149,236,116,67,18,57,249,215,198,127,217,96,244,119,63,208,255,238,255,249,183,255,238,223,254,111,255,241,111,95,209,127,243,239,254,253,255,241,95,118,11,253,95,254,237,191,249,223,255,237,127,248,159,255,227,127,248,111,109,24,250,63,252,235,127,249,47,254,213,255,248,128,164,63,178,30,30,30,144,147,219,223,126,161,24,222,130,155,76,160,76,53,202,19,96,82,124,247,191,95,232,100,35,62,192,71,40,177,48,75,240,222,0,93,84,20,34,128,255,241,62,19,76,30,53,53,65,56,8,192,13,203,31,122,202,178,151,241,75,225,134,167,78,48,128,159,134,250,185,171,255,221,231,228,88,177,161,2,156,215,159,209,20,255,248,254,133,158,241,95,150,150,14,114,113,96,213,162,84,85,76,139,199,228,23,152,195,27,37,30,116,226,
+184,101,24,227,228,247,91,143,239,114,28,230,122,35,208,32,62,237,246,50,184,53,229,100,199,19,165,159,42,78,166,186,56,234,176,208,137,59,221,179,247,34,104,182,188,94,95,4,94,184,15,116,199,243,83,95,166,46,198,134,35,76,34,173,147,113,206,141,250,242,243,59,3,197,237,100,124,214,201,111,153,6,238,202,124,74,140,189,123,142,217,81,85,250,220,83,172,108,206,8,66,187,144,241,40,199,29,182,4,197,0,91,17,175,154,235,234,185,26,186,229,242,126,112,73,244,188,61,32,242,28,182,181,183,205,14,66,169,235,90,218,197,112,204,218,245,121,212,76,153,251,92,144,155,161,245,234,198,63,34,42,173,223,19,7,155,44,41,76,147,41,108,230,41,156,198,232,87,94,26,183,176,248,74,254,212,204,71,72,41,117,136,108,222,172,132,245,92,92,234,92,222,19,229,121,196,55,135,15,222,98,94,221,90,81,157,243,71,158,26,226,199,163,201,96,36,75,196,202,119,155,121,233,235,194,44,188,174,161,159,184,149,64,34,130,85,75,68,231,254,70,77,12,19,167,237,
+173,162,49,64,82,56,197,155,233,232,72,146,74,86,62,40,73,208,69,54,71,132,122,31,144,181,96,169,45,36,6,1,172,146,54,202,240,91,72,212,223,241,213,213,169,57,101,83,81,200,13,137,209,43,185,127,132,186,160,235,52,53,234,107,148,232,80,206,254,122,193,212,231,163,2,84,68,85,80,129,26,237,229,27,118,68,13,103,162,209,93,131,62,174,112,222,134,143,102,109,66,42,108,187,158,58,37,141,20,150,124,55,233,223,161,167,23,241,213,191,17,16,145,165,20,240,95,128,248,95,97,238,223,253,223,255,235,255,249,127,253,239,255,254,255,253,111,109,82,251,63,253,247,255,226,95,253,235,127,249,140,100,62,110,239,104,67,16,254,51,232,248,248,31,58,88,120,61,104,140,15,110,50,160,127,137,130,47,73,10,15,253,18,232,14,137,4,22,22,133,127,167,212,41,121,84,48,130,237,50,191,76,226,192,0,229,213,254,20,234,224,106,200,115,46,235,75,231,53,59,87,244,210,41,167,208,98,201,120,185,105,183,197,147,125,69,73,56,185,128,2,64,73,101,124,60,
+234,65,212,228,51,41,249,118,253,178,207,248,50,211,18,216,4,155,254,102,252,118,59,11,175,50,117,150,239,222,169,213,133,93,18,206,240,221,77,250,231,77,25,48,155,47,31,237,15,2,242,107,144,232,180,139,89,15,125,175,181,62,15,150,47,131,214,84,46,243,51,253,22,166,48,3,174,103,12,120,198,16,70,118,211,96,207,110,96,59,159,20,31,196,239,160,197,107,36,237,91,53,191,167,73,186,165,44,213,150,104,183,57,45,198,1,174,175,246,102,16,209,39,160,39,241,53,5,173,111,215,136,14,44,40,132,224,7,79,72,55,214,224,91,82,249,181,55,221,105,124,121,88,218,142,103,8,131,196,181,175,169,157,45,251,180,50,192,62,103,207,213,113,97,133,168,168,87,233,22,194,24,117,212,63,159,190,100,30,60,75,252,134,148,142,246,203,134,249,200,182,186,122,45,239,97,5,199,12,118,182,214,71,108,138,212,152,186,174,188,64,202,204,89,69,137,1,236,221,79,48,139,52,159,91,39,246,131,179,153,102,64,159,83,184,223,214,105,175,114,38,26,172,220,135,15,
+38,155,118,103,209,106,152,192,178,159,25,129,240,234,197,134,140,176,169,3,3,225,91,216,149,83,93,229,143,248,230,107,16,152,12,230,198,64,192,56,8,222,212,105,139,154,225,106,15,180,15,238,143,82,73,56,162,221,219,157,117,116,67,222,159,100,170,96,231,65,190,162,43,54,28,156,232,56,133,247,29,7,56,108,249,32,54,234,234,58,117,60,154,201,199,216,55,206,189,47,206,75,10,179,255,168,213,45,205,18,127,210,170,240,27,23,80,69,24,248,164,131,9,109,13,141,55,148,28,237,66,84,104,103,108,2,188,66,158,226,42,194,49,26,74,103,19,162,66,86,147,151,95,227,241,138,30,82,84,182,151,4,4,96,234,252,182,70,123,119,138,175,47,209,138,154,159,78,105,245,50,53,110,98,112,163,67,198,70,0,125,176,41,91,87,109,223,117,204,77,87,47,96,203,181,69,219,212,27,111,119,79,123,173,108,200,74,65,10,12,100,98,186,178,188,205,208,0,43,241,70,96,251,222,37,21,9,6,132,87,255,188,30,225,157,14,245,50,95,150,187,73,202,59,141,135,
+135,211,5,15,41,210,155,246,167,2,78,151,251,29,108,144,67,19,194,23,130,254,65,208,240,241,111,53,54,248,161,238,206,63,152,171,103,239,245,109,69,109,50,237,93,252,59,51,114,45,101,67,120,26,238,90,190,92,199,65,227,188,75,180,21,233,137,119,2,89,182,145,185,45,229,239,46,59,67,60,56,203,246,250,183,164,223,234,183,123,24,9,125,17,169,127,184,235,49,50,105,199,22,90,158,181,67,112,207,46,212,114,223,61,157,67,116,74,4,5,238,70,127,142,77,53,37,87,165,120,22,19,67,244,0,12,34,154,56,216,34,65,128,92,234,67,234,51,137,40,47,198,157,115,100,129,217,227,216,91,202,254,83,252,254,196,127,181,69,145,252,26,218,144,4,89,112,22,58,202,106,131,234,230,209,171,56,67,46,242,73,225,155,123,38,155,64,59,99,111,59,159,116,234,232,50,15,76,127,46,150,227,79,109,24,120,210,112,97,131,203,116,90,238,34,1,191,61,103,231,100,232,102,13,85,172,63,4,203,85,201,32,42,0,154,249,91,204,92,75,83,142,182,217,6,64,
+23,48,26,86,187,122,105,103,60,187,252,234,75,29,233,59,226,140,205,93,105,120,86,94,241,225,251,40,189,202,49,67,146,111,53,126,11,7,82,17,22,77,59,155,54,25,77,214,153,92,107,83,167,229,185,121,73,235,90,81,5,78,196,152,15,38,59,73,18,29,253,125,109,222,144,168,174,114,78,183,183,168,157,231,174,96,121,182,13,208,109,222,209,17,48,100,188,71,72,199,36,123,107,249,237,58,137,236,30,144,104,3,170,52,57,247,59,147,205,227,217,56,66,226,15,240,200,127,155,8,119,236,155,126,161,241,173,200,63,31,250,153,203,61,92,129,223,145,27,241,237,39,206,9,6,23,188,15,181,180,123,196,100,111,222,107,48,46,188,188,205,86,12,5,25,184,189,183,115,138,103,210,82,173,141,183,115,159,254,75,164,105,13,37,103,130,132,1,230,117,186,139,225,209,22,193,88,188,232,3,104,224,186,219,47,142,245,251,215,108,119,237,159,190,161,156,197,213,101,207,199,183,49,14,47,183,59,6,15,90,191,48,165,239,7,178,86,82,107,147,210,14,198,39,45,144,
+175,46,78,252,86,85,181,184,223,80,200,8,26,13,168,214,117,148,210,240,253,46,120,43,176,144,241,55,235,96,163,209,113,165,215,216,121,82,221,101,195,234,27,211,47,172,172,139,169,78,183,112,117,145,171,240,200,59,21,86,230,7,143,76,57,249,206,171,43,80,250,202,178,239,228,69,138,184,178,101,116,118,86,79,137,127,238,15,10,78,184,61,57,143,20,119,143,126,254,169,88,184,228,15,159,75,116,45,119,155,22,137,6,219,219,145,181,47,6,77,43,239,216,117,235,233,15,87,203,102,81,211,32,238,207,87,87,135,97,40,136,45,203,180,62,125,19,133,141,230,151,185,167,127,43,100,140,189,218,15,25,217,125,60,108,3,199,58,27,120,241,88,121,5,126,180,163,111,15,141,132,230,44,117,184,34,110,223,91,218,94,112,155,165,72,174,114,221,206,176,106,47,50,213,96,224,127,90,227,220,206,27,133,125,96,223,128,125,230,182,93,248,38,180,58,40,23,69,50,125,186,221,65,110,181,239,90,240,8,50,10,73,112,249,238,204,199,150,12,154,118,189,156,33,122,101,
+92,121,33,240,95,67,252,168,224,82,221,110,87,182,93,187,88,175,58,116,254,125,50,27,172,17,55,83,123,10,183,103,102,14,204,76,129,92,103,36,63,202,58,1,187,96,186,109,3,156,208,108,223,58,203,106,177,180,18,3,90,2,79,11,27,69,86,137,158,227,186,24,101,225,198,62,133,84,80,217,125,24,121,135,183,177,183,93,183,251,229,212,17,188,195,235,146,202,200,65,250,213,89,234,111,75,9,249,26,143,248,112,245,115,172,111,183,183,107,225,212,124,34,112,249,142,97,55,114,216,157,101,136,205,220,160,121,248,128,205,129,47,66,80,188,7,102,248,9,65,82,89,124,184,136,6,189,175,248,157,223,7,203,158,183,185,31,164,167,241,218,153,35,181,99,14,75,73,3,175,1,108,131,96,87,108,2,241,144,108,107,41,200,32,112,72,116,18,188,135,31,225,144,116,249,156,165,218,125,196,5,126,0,108,106,46,252,121,145,145,226,38,49,104,147,100,3,219,162,249,141,93,174,243,200,135,158,190,111,165,157,63,132,103,125,219,215,98,219,215,243,12,228,30,211,54,
+194,29,11,104,188,173,111,202,239,218,170,65,76,138,159,95,247,79,88,66,187,240,124,57,204,229,193,243,241,3,26,11,124,128,254,88,121,29,138,102,153,115,168,244,179,108,20,16,214,173,15,98,251,62,92,232,176,148,109,167,216,13,8,80,155,6,246,69,79,206,52,90,42,198,201,175,47,82,119,150,216,229,43,30,108,251,30,185,248,217,54,225,10,145,178,46,217,42,235,250,64,245,75,69,233,11,33,191,196,18,53,225,183,7,130,94,57,8,193,185,55,194,236,198,106,88,82,70,188,254,204,59,38,92,215,83,99,37,23,90,172,141,205,211,109,3,223,12,244,39,143,113,114,211,243,206,20,195,55,28,83,31,75,151,66,242,42,41,60,194,2,114,234,100,43,250,23,162,91,24,243,116,174,114,207,14,150,173,113,187,11,223,39,155,111,22,208,92,202,140,159,167,12,253,244,164,159,188,154,253,98,119,150,112,24,176,191,83,122,169,56,96,69,167,173,47,41,207,116,125,185,232,131,182,213,207,88,93,119,247,206,47,254,211,17,31,158,202,170,32,126,41,88,70,203,169,
+153,122,84,34,170,216,192,54,235,106,133,90,110,29,185,22,11,233,48,197,86,243,246,246,16,34,200,177,118,207,22,246,14,81,5,131,152,142,91,38,131,72,93,136,210,160,161,36,159,120,166,220,174,251,57,224,225,249,62,122,89,7,190,89,142,208,116,116,231,75,70,86,35,89,68,35,89,244,16,200,48,217,174,166,127,192,173,221,130,165,54,59,237,3,114,145,116,168,116,124,242,24,86,77,79,141,5,18,59,92,103,237,112,233,98,10,187,3,216,6,154,111,73,99,14,123,177,41,45,168,210,20,207,105,101,132,70,55,134,5,46,218,143,162,235,178,89,172,91,173,217,55,205,116,197,222,7,207,131,86,221,5,104,126,204,135,78,68,59,187,9,188,253,147,176,189,223,5,216,29,7,223,44,175,160,181,9,155,44,246,102,46,137,216,213,77,156,18,120,125,45,150,153,53,172,93,173,131,118,167,243,198,49,100,160,204,75,151,80,189,131,172,3,254,101,5,41,206,94,38,211,57,56,108,132,42,182,208,168,127,36,51,39,52,166,95,229,223,122,86,101,220,73,58,136,174,
+107,134,35,131,16,122,93,189,46,149,117,135,227,108,56,39,252,95,156,247,27,85,1,146,14,46,79,252,108,17,238,178,199,74,209,209,229,66,169,82,59,59,78,251,68,220,75,25,214,29,154,150,210,141,111,183,93,181,193,246,187,45,150,70,150,139,13,219,101,128,164,4,8,207,34,195,19,19,253,89,91,136,232,92,228,160,164,98,215,214,45,184,89,66,79,145,209,15,12,171,184,108,85,44,137,149,254,208,76,165,207,231,18,0,187,167,30,195,77,245,186,226,171,27,218,177,228,64,62,159,107,239,226,118,99,13,122,2,206,34,129,187,230,50,58,168,176,57,193,107,240,159,223,17,65,67,246,35,107,124,156,154,90,112,31,103,187,158,251,242,139,116,244,121,227,134,160,254,213,89,76,159,85,103,45,161,187,79,188,181,200,178,204,185,135,58,235,252,135,203,45,225,140,214,55,69,3,56,54,64,245,117,102,69,155,114,224,35,156,187,121,161,135,225,97,97,207,215,6,123,147,182,161,234,59,32,4,219,121,73,31,138,186,8,55,109,57,28,161,99,222,21,97,93,50,85,
+25,73,31,231,175,177,183,96,72,120,53,69,124,185,250,69,26,114,192,152,197,118,180,95,124,31,234,35,200,207,41,249,59,139,201,163,102,57,213,59,53,200,192,151,60,56,214,68,68,214,210,91,61,118,207,250,140,142,22,15,169,154,70,207,82,180,1,118,117,102,105,89,118,43,228,99,146,91,175,222,237,232,143,6,8,64,132,128,13,230,56,26,72,143,27,248,254,91,38,102,120,223,145,38,242,218,91,21,24,83,81,117,144,76,176,13,161,46,59,66,234,0,194,197,187,241,26,221,213,81,197,97,101,150,245,205,233,230,216,197,70,111,84,63,149,211,119,138,106,195,243,9,76,11,10,59,123,119,165,219,227,114,220,220,11,15,38,195,162,103,234,233,18,134,131,157,250,105,23,56,128,66,75,127,32,229,13,175,219,212,246,184,99,95,19,141,215,239,22,242,150,58,54,133,188,71,242,83,161,177,205,130,196,70,217,123,129,125,153,35,249,158,69,95,98,49,216,107,28,153,110,203,107,230,86,132,142,80,195,177,244,95,186,183,241,2,119,237,146,79,152,5,238,68,168,208,
+199,150,92,219,55,66,250,179,181,161,239,152,156,233,185,39,81,162,70,148,4,17,162,40,237,99,248,135,7,209,185,74,4,135,93,239,139,173,101,43,204,32,97,185,234,153,92,155,151,163,237,202,29,21,181,89,48,172,238,216,142,200,233,136,96,80,114,170,10,185,35,219,7,9,190,118,106,185,185,36,115,44,21,154,160,155,22,63,74,74,148,103,104,196,219,158,36,136,157,159,161,236,17,177,76,150,38,27,96,194,160,203,180,92,131,105,248,246,181,58,100,148,175,98,244,232,182,117,227,66,58,101,1,125,25,9,228,219,163,65,205,45,106,27,155,217,233,12,233,250,18,148,243,113,198,253,246,50,166,243,253,71,20,149,70,46,253,252,161,4,69,80,100,240,153,195,41,80,32,238,66,129,77,102,104,111,167,248,215,96,38,219,136,94,44,56,159,103,140,40,28,126,20,203,111,237,200,63,245,79,60,55,71,37,244,24,136,60,62,62,212,145,101,232,185,81,165,210,157,235,197,134,145,76,204,110,203,68,84,132,120,231,208,131,109,221,179,40,105,171,5,215,25,149,165,149,
+205,7,95,60,144,146,225,51,40,134,205,84,47,83,190,167,15,91,196,194,170,7,238,9,128,85,91,94,20,211,33,81,201,253,217,237,22,75,6,88,48,232,207,73,126,249,60,53,132,219,42,116,74,89,176,45,157,226,224,252,99,205,103,116,218,39,95,194,8,159,212,212,185,242,217,128,150,165,213,18,226,136,161,251,201,43,78,213,229,72,77,139,254,64,40,177,224,177,239,211,234,10,129,109,118,99,190,137,183,47,72,67,124,56,121,240,182,30,220,144,109,60,224,2,75,219,143,74,182,229,66,77,3,76,169,237,14,231,47,35,94,183,177,179,111,209,234,251,55,65,238,153,116,28,207,133,106,253,85,225,243,247,184,174,130,129,172,252,136,133,236,152,39,160,72,94,243,123,239,96,29,161,44,207,9,219,86,225,156,157,80,221,248,117,176,219,165,197,69,247,200,81,120,160,109,182,218,245,111,28,152,219,158,127,229,30,176,168,240,61,26,234,88,212,139,22,162,235,138,41,158,176,194,16,46,154,64,211,54,188,164,94,137,150,126,109,5,254,140,22,234,89,125,86,178,250,
+241,218,170,112,7,54,9,26,245,70,177,245,89,175,121,135,8,211,164,203,217,28,241,167,41,96,124,254,40,34,198,252,255,143,142,247,236,113,46,77,207,196,254,74,127,26,216,128,22,152,81,222,175,2,188,182,97,217,11,99,247,7,108,107,212,35,53,220,219,45,244,204,120,165,253,196,156,115,206,57,231,88,36,139,169,152,51,89,204,169,152,67,145,69,178,152,89,204,52,235,109,65,51,214,142,0,2,135,188,207,19,175,251,186,211,33,158,83,236,185,8,158,2,159,29,26,49,197,75,128,172,164,72,151,195,233,138,79,89,35,36,171,187,33,58,103,213,66,4,111,6,214,48,233,89,181,217,45,205,122,250,240,214,202,240,112,222,198,177,224,108,229,93,176,7,125,87,251,152,17,31,166,31,55,79,100,210,2,11,239,20,189,240,12,196,123,6,135,75,109,86,182,109,125,117,28,138,14,67,39,127,211,216,34,208,25,70,187,133,198,156,205,118,105,107,153,104,205,119,227,216,11,193,110,23,128,15,108,244,228,148,70,32,161,25,25,52,121,178,212,12,219,236,77,194,189,
+74,144,206,75,239,99,63,15,139,64,86,170,127,98,101,66,159,5,244,114,18,141,133,203,183,234,151,197,218,185,69,57,221,234,57,73,117,210,43,57,5,231,17,231,159,197,141,91,245,123,252,145,229,213,112,187,249,133,105,178,210,93,19,149,238,220,115,9,100,172,4,129,82,94,168,24,131,225,242,213,195,109,231,39,69,128,172,143,104,81,82,68,27,113,234,42,22,220,10,95,101,54,83,59,122,51,94,213,100,122,115,181,137,81,176,246,213,198,58,188,59,46,183,155,112,0,191,246,166,29,222,21,245,168,219,240,243,185,222,212,201,217,200,215,224,163,65,127,181,215,153,115,234,199,170,122,213,245,201,129,87,248,139,237,156,131,94,248,157,169,201,192,17,168,19,233,237,234,120,55,132,129,63,111,183,209,30,240,213,194,153,245,106,52,250,96,211,185,215,177,235,208,60,33,237,71,171,150,91,197,142,180,55,244,124,242,110,244,62,168,235,251,231,125,223,73,32,85,107,126,26,63,75,187,168,108,167,214,187,125,165,142,78,217,106,26,94,88,71,28,174,250,157,160,152,208,
+176,42,230,55,127,202,22,159,214,168,182,146,118,195,174,122,247,209,44,244,80,206,29,219,54,125,241,33,227,14,158,34,208,155,205,225,136,232,245,19,154,228,174,124,196,110,146,141,110,95,38,118,106,85,137,189,226,162,160,176,172,226,26,225,42,230,70,249,146,155,93,134,31,153,212,155,152,147,131,24,77,25,117,40,97,233,209,68,122,178,211,153,81,203,245,238,48,212,19,75,184,87,30,89,73,148,45,163,77,205,183,158,103,99,127,101,92,40,235,184,123,124,208,127,184,28,91,110,250,16,78,122,41,107,161,27,118,11,246,157,224,14,132,121,93,239,238,251,215,238,14,231,252,20,92,86,232,209,141,135,152,210,113,82,235,79,234,218,109,10,246,212,121,27,107,35,55,101,59,82,222,246,166,222,110,47,5,183,8,24,168,126,128,155,208,171,154,167,202,24,25,53,55,71,253,133,133,153,62,3,122,193,8,74,136,209,217,75,96,71,102,70,207,167,3,171,168,139,88,68,55,223,213,233,140,174,201,170,53,184,222,18,251,198,198,217,110,52,150,84,60,73,210,177,90,231,
+107,251,210,114,93,11,16,9,64,211,212,189,178,139,85,183,167,196,40,206,232,96,83,129,226,31,114,112,240,78,176,99,32,222,10,200,221,44,112,1,181,69,128,30,136,188,125,217,151,184,133,22,72,206,147,120,147,6,227,161,181,207,58,103,183,101,211,160,78,76,60,37,118,153,176,142,55,110,61,152,176,147,30,91,69,172,173,205,149,17,145,193,115,231,237,208,240,147,197,37,174,135,229,190,22,16,219,148,93,252,96,105,216,141,227,124,244,146,2,207,189,141,244,173,55,86,63,88,62,114,205,122,50,229,109,38,92,233,15,231,135,132,84,175,43,49,89,57,117,33,217,16,136,81,238,227,128,212,240,166,167,61,166,113,15,153,175,61,39,251,188,64,13,185,197,234,85,184,176,76,242,151,253,43,150,58,61,4,84,175,56,13,111,82,108,57,123,170,121,225,181,217,68,210,203,248,201,190,184,156,216,50,30,181,120,234,8,35,201,24,97,240,51,217,236,71,64,111,198,96,1,68,229,205,18,142,43,231,102,138,234,181,41,33,252,73,90,7,77,187,15,218,7,99,235,42,
+229,212,208,244,151,117,142,132,97,127,40,157,87,250,250,105,60,153,247,14,190,201,1,126,106,93,246,111,117,87,0,252,174,229,216,229,251,168,64,74,45,235,22,158,85,234,58,0,156,83,241,235,129,90,214,111,175,77,226,124,230,150,12,165,164,80,19,77,47,156,25,189,102,42,156,140,15,188,57,254,49,115,214,10,174,21,14,84,1,124,49,121,214,205,222,235,71,195,58,183,79,75,205,65,79,183,110,242,205,237,27,5,56,57,201,49,53,239,161,54,5,231,117,135,233,10,240,10,38,31,47,158,241,27,63,51,119,117,209,206,163,234,198,187,196,232,182,6,123,127,72,181,246,211,253,50,124,195,101,155,46,55,215,91,139,78,135,56,8,124,114,209,36,13,131,236,211,201,203,136,116,221,101,50,47,187,154,174,15,176,25,157,233,17,185,109,47,217,112,112,66,132,145,95,63,138,183,174,119,81,84,170,125,107,175,103,127,190,237,250,67,215,173,42,201,13,18,114,247,169,154,118,206,220,114,119,249,180,58,113,233,233,99,187,27,227,107,26,150,241,7,189,127,182,190,172,
+253,145,70,228,38,165,24,175,189,193,20,238,190,188,122,156,183,231,101,168,246,112,245,163,174,221,90,15,68,165,236,89,222,166,125,49,225,248,188,78,125,167,235,14,152,91,28,208,178,202,22,235,111,61,226,126,112,138,236,174,147,107,127,206,199,219,55,179,75,135,126,123,11,163,155,73,230,206,87,15,28,61,37,183,253,228,44,15,206,135,115,109,48,159,93,240,202,235,225,230,75,200,147,11,68,73,136,8,243,27,9,58,55,167,133,245,82,188,14,206,88,230,247,242,109,118,126,238,73,226,90,225,118,100,118,108,161,56,104,207,123,118,97,53,74,194,221,150,51,76,209,103,143,37,203,204,5,165,112,212,239,70,151,192,243,252,98,58,203,34,87,65,59,82,151,139,117,146,14,167,243,170,142,52,82,220,163,143,98,129,36,176,169,50,243,194,123,219,50,246,210,135,216,142,159,32,221,50,218,236,66,227,189,81,82,145,94,101,183,128,167,33,141,221,77,82,140,205,142,212,245,12,211,60,195,156,239,106,42,84,251,182,48,65,79,114,234,233,28,7,1,36,111,181,232,164,
+36,86,214,175,125,104,167,42,167,66,152,242,66,166,169,126,148,122,44,37,66,18,90,113,67,31,203,155,224,133,9,113,192,31,83,57,237,85,188,70,220,112,177,75,200,40,169,82,85,163,2,179,120,10,240,78,146,11,115,193,61,30,200,176,124,44,70,86,183,95,83,46,166,225,125,245,46,167,169,243,239,49,130,185,238,122,87,215,23,101,103,45,169,220,176,28,195,68,209,198,67,133,188,184,216,124,71,214,63,99,144,15,75,111,220,160,34,4,33,17,76,138,201,43,160,207,57,216,66,68,76,150,225,187,23,230,130,215,229,60,169,195,115,170,119,105,142,170,119,31,172,192,165,72,157,176,245,81,242,122,145,217,7,12,152,155,220,68,85,202,41,70,68,75,9,110,62,31,189,52,56,200,103,224,52,97,66,95,155,145,110,129,219,24,3,70,174,247,25,24,101,88,190,220,64,181,81,101,83,126,251,248,100,152,26,5,92,57,195,187,156,101,31,118,175,209,119,142,82,108,34,115,91,66,217,106,251,241,232,95,148,45,176,126,155,30,246,25,60,68,153,247,56,18,79,64,
+80,48,216,39,89,36,193,106,49,80,191,23,132,35,131,222,78,6,190,23,212,186,69,69,90,217,57,114,31,39,249,146,128,169,134,62,72,38,161,82,228,27,9,125,66,142,56,124,161,144,32,176,210,18,222,198,168,77,213,39,58,198,57,178,83,144,50,115,66,88,119,128,21,21,9,195,233,227,88,18,16,31,1,224,91,216,81,143,67,208,184,74,125,7,251,42,233,21,102,89,151,2,43,103,109,20,221,6,96,26,29,195,148,70,233,9,24,76,103,87,22,103,212,149,56,38,73,83,18,122,120,231,9,0,3,119,94,53,78,64,135,81,74,67,196,34,134,213,41,236,222,135,77,227,144,209,179,149,97,149,246,194,100,58,180,127,6,182,13,91,78,63,194,1,67,59,197,182,194,7,113,50,72,84,35,7,39,245,117,85,16,195,89,50,244,99,96,196,128,174,22,48,160,195,134,51,179,232,101,240,122,64,35,81,115,221,89,163,230,61,137,43,15,106,192,4,131,131,4,246,181,237,182,3,142,217,238,164,182,59,14,154,214,198,25,212,99,173,201,153,18,75,43,71,164,76,
+63,67,70,120,150,246,196,111,40,235,101,10,204,135,53,18,51,44,52,66,82,100,74,78,250,250,59,43,3,210,94,194,65,29,24,36,127,2,6,158,104,144,128,156,129,113,2,186,17,4,77,167,146,32,156,144,53,173,49,59,113,91,99,132,114,143,28,86,205,84,36,200,183,88,97,103,2,159,31,90,11,119,197,200,118,57,16,217,157,196,195,129,104,95,39,73,97,29,70,65,182,128,150,3,186,234,18,20,178,172,205,83,20,31,26,3,88,138,23,180,169,180,18,151,163,219,9,34,208,200,203,88,160,45,107,169,32,163,51,58,112,96,33,95,135,24,237,203,147,129,1,235,229,51,2,6,38,48,182,79,8,24,88,103,99,165,220,149,185,56,178,32,62,112,199,126,153,133,13,121,145,252,134,251,252,191,173,251,32,96,84,49,21,4,1,226,83,10,8,152,30,72,80,120,198,204,34,79,2,4,204,247,252,134,240,10,55,111,205,15,254,30,60,40,211,102,225,90,130,112,120,50,32,64,185,56,20,163,95,149,169,86,108,83,206,194,172,57,35,17,217,202,193,66,192,2,
+133,125,27,12,138,246,40,0,124,235,3,194,38,183,35,101,193,31,64,124,2,4,35,206,37,18,17,14,138,103,224,246,222,20,86,119,128,7,126,75,19,48,160,188,128,66,36,99,104,77,231,201,210,220,109,206,221,96,42,206,216,202,32,206,62,224,115,180,49,233,25,81,146,39,247,221,68,7,9,131,176,203,186,141,226,242,57,77,84,203,67,130,168,239,234,1,26,116,54,134,30,239,75,37,61,171,98,132,233,199,128,96,237,3,117,41,19,115,3,73,128,166,105,157,254,70,236,60,196,52,12,238,146,245,58,28,14,251,253,61,133,66,153,86,205,145,155,47,128,87,213,210,60,1,89,65,149,16,147,234,180,48,145,160,229,159,12,143,18,196,220,226,114,185,62,240,17,113,172,240,2,198,82,58,5,69,118,37,130,74,37,199,119,173,82,153,37,126,248,90,90,51,194,187,49,153,76,13,231,199,35,57,8,73,109,234,225,184,6,18,130,199,24,150,238,129,17,179,203,9,119,6,66,78,31,228,55,19,218,135,162,67,66,40,196,150,6,201,54,104,84,106,76,154,177,56,
+225,74,179,158,195,128,56,173,93,29,83,99,38,112,66,53,20,52,214,109,162,161,171,7,59,158,12,153,188,144,16,79,165,193,140,160,65,138,220,206,100,43,106,178,195,93,142,23,35,57,239,99,33,195,1,3,9,193,141,17,45,156,186,208,247,192,200,134,91,29,133,86,26,118,131,47,251,113,75,51,107,27,120,73,17,35,12,118,57,68,1,103,178,203,19,76,167,211,164,19,52,126,169,237,10,143,150,22,34,115,182,90,44,20,8,216,27,100,156,111,215,105,226,101,194,198,198,62,20,151,230,147,1,146,184,186,25,207,52,136,56,123,202,246,241,177,100,210,82,141,86,85,213,123,102,219,213,25,18,148,18,105,30,34,9,142,138,184,137,131,1,229,104,99,109,246,68,20,84,16,38,138,217,167,240,147,215,220,38,4,123,24,3,72,225,194,134,138,117,214,100,6,12,122,90,10,167,1,51,177,135,104,208,4,173,249,254,131,50,32,234,251,32,42,153,123,69,123,221,66,170,42,186,94,202,209,194,156,210,181,254,17,104,26,227,7,66,160,122,41,83,121,28,202,39,67,
+63,169,120,0,101,177,10,30,241,130,100,250,49,243,87,118,60,57,57,60,104,117,97,29,78,107,218,189,169,77,66,0,79,0,131,142,146,188,122,133,82,189,48,56,230,77,1,38,118,138,182,60,242,82,1,148,142,233,207,226,27,215,162,45,30,24,52,59,52,222,73,148,125,78,177,89,112,160,240,48,33,217,126,8,7,103,124,36,97,5,17,254,96,161,27,50,31,14,136,151,134,0,172,84,144,32,235,119,49,239,45,17,210,121,213,171,226,21,141,86,22,81,149,160,207,169,224,102,223,189,192,166,101,184,115,67,192,46,7,107,78,20,110,164,93,9,136,214,234,214,129,109,241,216,24,225,81,19,108,43,245,21,68,127,104,23,37,215,226,88,194,72,240,120,59,12,218,16,1,26,175,85,67,83,210,3,222,77,242,28,82,197,115,43,188,66,136,193,3,233,16,18,228,49,168,33,177,218,31,97,181,81,237,158,218,58,183,103,144,75,96,132,10,198,174,23,218,132,150,215,52,166,163,184,66,206,216,225,66,154,123,236,168,213,214,49,115,37,238,61,151,61,152,143,169,223,
+72,173,62,225,20,222,52,242,133,70,33,134,2,130,124,240,99,101,77,154,89,186,103,12,233,21,206,57,221,110,217,103,11,5,182,149,158,222,2,115,210,243,33,208,171,170,61,231,241,102,46,203,136,18,84,186,135,193,22,117,226,156,181,175,79,240,243,91,215,85,222,207,120,83,59,196,216,25,197,127,137,210,6,228,154,6,111,85,99,241,84,44,117,230,32,58,217,36,36,70,148,37,167,96,56,113,226,88,69,245,243,207,93,87,37,8,98,102,36,120,24,72,218,68,138,133,12,82,204,88,8,167,71,51,107,192,63,221,245,163,249,54,121,137,9,106,82,120,1,178,58,73,101,139,60,178,195,134,193,67,42,246,240,41,75,215,152,197,68,104,91,115,69,26,149,135,160,33,128,1,181,231,225,53,24,216,70,210,25,92,89,229,21,243,224,142,240,226,21,101,126,131,209,179,125,65,3,33,208,12,139,3,17,236,48,20,3,234,193,4,119,247,84,0,117,220,200,162,73,175,7,100,32,61,214,56,188,4,27,146,166,192,78,66,30,96,186,6,226,228,38,112,217,16,67,221,
+180,149,23,103,73,241,119,96,117,122,201,6,53,24,110,45,238,73,169,20,53,213,209,116,213,194,116,99,52,233,180,205,83,196,114,179,143,209,75,35,207,246,130,236,138,76,149,170,199,172,110,8,113,175,8,92,33,44,1,185,72,113,237,85,180,109,48,86,131,5,170,49,255,88,63,208,112,111,90,81,10,171,64,152,246,238,151,142,65,145,2,151,90,8,62,186,195,89,60,97,132,117,179,112,99,234,219,94,70,226,102,41,234,71,248,40,185,22,82,204,112,21,8,73,178,227,57,47,243,21,51,34,135,19,77,205,68,216,13,31,97,38,234,22,252,45,202,185,208,77,142,85,207,152,87,73,133,216,143,14,177,121,30,79,30,105,17,67,61,168,66,164,231,160,125,30,136,143,100,150,4,137,154,138,241,4,101,238,253,31,252,144,204,77,121,175,192,80,228,118,210,196,239,50,27,242,10,13,134,85,212,136,162,236,14,103,217,80,176,59,142,31,34,205,246,105,201,82,34,79,178,33,247,8,130,23,218,197,250,142,192,182,20,89,12,150,17,80,75,108,38,94,154,71,205,78,
+34,251,18,236,206,232,216,33,134,79,12,57,3,194,30,7,8,102,164,203,152,110,217,166,11,174,193,121,107,231,249,69,250,166,65,90,166,83,30,57,37,134,120,83,226,128,34,141,36,116,249,220,42,79,7,68,53,169,240,0,28,153,54,8,236,212,57,230,78,133,85,242,232,140,210,184,231,68,105,236,63,131,236,45,189,121,163,100,10,75,195,199,129,198,108,176,103,95,225,203,81,42,45,100,85,61,228,228,180,146,194,137,138,170,181,136,136,127,183,106,21,72,111,92,139,146,206,48,226,35,170,133,240,229,4,81,34,209,135,129,19,129,62,100,209,37,174,25,124,6,4,10,217,181,152,39,0,66,28,210,189,28,212,8,8,248,81,18,4,26,116,87,198,219,235,139,10,78,65,132,108,1,225,51,2,182,205,198,26,23,160,239,217,230,1,25,202,37,74,107,250,56,131,76,236,86,210,189,61,193,2,208,59,68,128,117,98,137,204,44,16,32,95,35,203,226,225,35,201,222,219,107,159,224,161,8,136,68,220,59,255,162,90,86,14,72,112,15,158,121,224,57,182,55,209,113,
+163,100,13,101,195,199,214,184,119,109,45,111,128,91,159,73,147,153,21,175,231,22,31,203,113,234,62,118,231,195,218,69,5,124,134,75,21,2,34,188,71,173,11,20,228,163,17,40,30,208,61,238,5,227,45,96,155,0,145,246,244,28,17,99,88,6,190,8,20,7,20,190,61,0,8,24,16,159,14,245,111,182,55,234,191,196,217,50,35,77,196,244,238,242,110,220,243,69,32,40,127,118,28,171,57,247,216,41,216,80,17,209,251,180,71,20,4,204,248,28,38,75,33,232,32,82,125,87,84,177,199,69,149,73,9,98,62,53,148,3,99,124,41,54,61,43,30,124,39,136,32,218,213,126,25,94,15,37,5,12,125,30,17,1,128,249,26,17,29,41,185,107,14,150,251,61,92,29,10,214,174,161,108,252,149,175,151,74,165,103,244,69,186,137,37,86,14,86,177,244,240,97,127,205,240,154,107,241,86,103,177,146,38,189,112,2,10,133,158,169,24,207,184,58,117,5,8,69,10,66,138,240,69,67,147,80,40,94,159,219,215,248,213,123,195,121,40,86,97,85,166,140,168,186,242,223,
+171,222,120,154,183,221,155,76,117,168,15,73,83,166,188,10,136,109,80,89,82,244,176,56,40,40,80,64,153,43,41,63,217,148,30,95,135,4,133,68,2,233,123,34,88,150,52,183,14,172,86,144,28,195,74,81,137,244,164,151,118,187,34,34,99,136,146,222,115,55,71,119,37,169,249,2,105,191,94,57,176,88,172,47,250,140,120,53,78,16,32,8,73,248,138,24,186,120,103,141,10,20,3,18,16,9,28,104,166,125,168,138,16,3,185,25,18,68,19,117,200,48,73,216,119,163,159,152,213,151,128,175,156,181,189,73,4,89,92,94,144,68,196,113,119,72,2,150,6,91,215,37,69,129,132,138,33,142,169,9,25,216,121,8,231,211,236,124,82,108,85,170,189,79,76,75,61,161,12,9,2,57,31,2,245,8,148,164,212,67,241,217,47,81,82,86,209,206,34,204,10,21,227,130,169,177,94,8,201,24,60,102,52,163,179,50,56,173,125,196,93,186,140,44,28,215,145,181,208,190,103,112,151,146,131,244,56,203,157,205,131,1,57,204,104,177,147,29,100,27,96,215,179,161,73,171,
+195,74,206,39,194,4,10,176,66,87,74,112,226,202,121,123,152,176,16,32,146,176,32,100,220,2,240,195,83,176,253,90,36,249,196,112,104,215,82,8,76,51,34,240,140,161,33,117,24,33,29,40,199,211,187,115,70,112,90,6,102,243,230,119,253,214,4,74,191,225,2,78,77,33,46,134,52,223,203,235,118,242,135,101,219,247,96,172,16,68,24,115,37,100,160,104,135,249,205,51,212,40,225,97,64,47,69,17,242,82,114,20,42,149,40,195,224,143,184,33,82,202,83,207,128,32,105,131,155,156,36,240,172,66,66,208,10,149,241,41,240,14,188,103,94,10,42,4,228,35,80,160,95,216,26,111,25,127,162,211,19,230,11,91,5,140,224,39,57,239,220,4,127,146,243,206,77,228,39,57,239,220,52,65,63,123,121,64,194,47,189,128,109,204,151,94,6,4,248,75,47,136,111,249,165,151,96,35,248,210,235,168,2,110,145,67,59,214,3,49,248,198,170,215,3,129,38,128,160,97,55,136,115,82,120,129,86,136,224,182,1,165,14,23,1,92,35,66,4,115,118,63,69,197,187,236,
+83,68,184,203,62,69,111,95,154,245,27,115,231,141,65,221,146,72,196,216,225,112,219,238,155,120,121,208,100,114,59,28,64,170,76,174,101,60,206,88,67,185,69,97,220,166,79,229,27,236,229,20,32,95,245,62,141,70,147,56,140,179,185,102,51,138,127,117,24,71,9,51,56,232,110,159,74,195,97,83,162,0,121,181,158,202,180,187,94,212,237,86,44,104,86,237,172,235,48,186,150,78,179,122,82,137,160,89,32,109,54,167,132,136,210,197,205,23,87,69,129,193,96,135,249,233,130,104,246,166,37,95,86,247,129,2,66,96,96,42,168,212,216,16,13,219,170,226,145,16,13,5,55,147,128,35,80,116,133,66,238,80,136,241,66,35,212,114,80,232,122,134,133,222,108,126,74,82,214,65,10,125,222,155,174,166,217,114,72,211,130,102,197,228,99,182,220,165,203,240,75,249,218,21,230,163,142,67,49,251,194,98,243,123,126,4,74,33,247,91,153,12,63,20,106,67,87,210,75,115,100,12,201,226,55,15,104,88,61,167,181,179,186,28,71,136,205,241,35,219,15,136,33,13,17,27,
+23,93,201,89,60,144,154,42,8,73,0,74,40,83,26,105,73,244,16,91,74,163,198,7,21,35,228,227,100,217,84,122,70,54,56,102,37,131,184,240,193,80,170,246,159,83,148,39,132,232,102,229,0,25,226,170,210,86,33,242,218,176,250,234,85,77,54,40,9,111,71,181,18,60,0,183,119,72,135,172,53,200,182,164,177,232,120,122,166,118,181,56,236,7,6,61,123,211,198,71,206,187,2,1,126,198,82,148,169,61,36,52,62,43,81,246,98,122,33,86,101,6,89,181,132,123,138,63,198,223,183,23,151,143,53,144,51,124,174,120,139,130,24,133,96,51,98,242,60,181,62,26,107,247,66,166,162,37,36,143,1,50,189,247,100,167,50,49,219,5,106,61,10,241,41,98,40,245,222,168,43,39,34,241,178,150,74,51,101,135,232,128,179,64,88,195,61,162,236,89,152,47,30,247,188,98,42,100,190,215,183,103,168,173,146,109,40,7,141,49,166,47,112,93,247,176,87,61,79,197,140,77,95,148,95,167,130,65,75,18,166,44,105,163,205,4,180,28,126,70,89,94,74,239,96,180,
+24,250,94,168,61,21,72,105,147,207,208,30,61,46,37,163,214,160,95,0,173,224,84,233,112,8,11,49,12,119,247,234,48,238,184,171,5,57,3,2,29,189,19,36,140,119,126,30,31,170,227,82,39,221,96,229,239,69,91,124,152,65,122,96,45,95,20,98,198,191,208,12,177,126,222,15,228,182,49,54,130,102,123,183,126,159,174,114,45,26,218,205,108,62,189,125,244,5,148,35,2,102,23,2,237,116,160,136,147,50,217,101,33,195,35,180,83,64,88,190,208,25,90,252,194,122,117,24,116,103,253,242,141,168,17,176,231,187,15,106,79,21,121,194,217,39,36,12,200,40,72,139,63,237,164,15,89,95,248,112,140,250,9,224,236,126,142,39,181,163,12,98,152,175,61,44,99,212,119,17,133,32,173,232,9,154,60,59,90,6,238,130,2,198,212,135,90,82,219,17,12,168,166,220,13,33,48,242,2,9,167,55,119,123,30,249,69,31,90,57,225,34,188,63,47,152,76,207,233,36,175,171,213,35,59,205,233,250,189,113,149,38,226,15,104,100,89,59,24,216,121,72,112,27,64,63,
+221,246,204,206,96,136,102,212,158,31,189,189,224,185,105,126,141,73,247,147,250,21,203,109,74,25,156,188,47,48,193,118,97,190,36,162,84,59,29,31,134,126,84,56,92,40,143,133,232,180,152,168,53,120,93,187,129,116,6,128,177,83,60,169,37,162,85,147,88,165,176,139,107,81,86,130,102,152,81,201,1,223,6,177,224,254,33,232,143,119,14,196,49,80,157,223,66,227,6,225,99,212,144,118,224,163,54,182,208,81,203,199,14,143,24,75,74,106,237,49,106,253,197,46,40,18,13,84,239,151,166,27,45,143,18,50,76,112,8,26,4,142,112,232,124,183,255,134,215,106,113,24,16,211,42,58,188,145,184,34,90,230,45,100,185,37,18,39,53,163,135,118,191,18,192,189,83,0,221,212,163,235,168,119,25,147,209,59,191,82,105,180,165,125,42,171,72,32,67,215,154,34,119,99,96,50,131,190,221,198,206,143,60,28,150,149,179,27,195,232,110,76,101,76,1,77,177,96,212,197,232,19,223,95,135,111,111,70,164,222,170,145,32,93,98,183,7,99,206,199,139,131,183,181,169,92,
+55,62,130,64,3,86,192,194,114,49,135,112,26,13,6,246,37,187,6,7,64,29,86,30,158,69,114,206,196,194,111,158,202,143,39,59,170,41,218,160,108,65,222,248,162,157,135,129,188,20,144,42,143,82,62,212,145,46,247,5,73,155,1,89,93,140,201,2,239,154,147,86,132,19,245,96,14,213,12,143,253,199,69,214,201,200,212,133,82,40,149,144,236,112,18,131,193,9,133,102,127,44,33,217,46,92,202,106,120,251,220,192,208,214,76,36,109,15,73,221,61,78,21,252,169,216,59,4,141,126,120,10,96,30,212,47,28,51,69,20,159,26,35,52,54,97,37,97,6,90,159,195,20,68,12,92,100,124,202,83,132,12,105,164,189,194,99,132,84,241,120,195,111,238,171,105,127,198,83,121,152,132,80,131,18,205,198,15,237,125,222,44,215,147,72,44,116,206,161,71,6,18,182,59,222,231,102,178,104,161,45,201,62,119,44,109,21,105,3,105,240,22,106,207,242,104,217,210,61,141,15,36,100,122,13,176,61,188,180,109,88,172,222,100,178,147,123,152,167,80,56,227,17,75,110,251,
+206,192,41,86,242,55,54,87,206,40,247,218,42,187,196,232,5,174,23,251,13,237,186,156,81,173,2,87,221,32,239,108,174,51,213,226,93,31,46,157,182,48,175,134,103,157,214,85,205,120,182,38,15,200,223,5,189,3,3,19,16,129,201,99,33,104,77,136,3,220,48,234,64,224,87,168,73,205,79,222,13,97,29,178,163,112,188,152,238,249,124,55,231,10,181,39,83,61,225,24,16,112,131,117,111,53,69,248,12,214,187,236,46,178,135,6,136,146,158,9,1,167,5,138,124,180,234,145,200,160,62,142,150,128,242,221,237,136,32,190,135,60,88,25,162,6,56,68,4,5,102,21,250,20,153,238,178,79,209,211,93,118,23,173,88,197,231,23,162,66,71,240,233,134,116,58,34,92,51,187,157,86,181,154,218,162,3,147,137,201,118,95,75,43,141,26,141,85,46,111,21,37,16,65,104,156,167,186,70,72,103,242,89,80,98,244,17,57,116,187,135,142,147,51,6,247,169,38,97,190,88,94,106,53,150,228,184,116,90,71,72,37,151,253,210,205,217,251,81,144,152,125,207,234,70,58,
+123,46,120,4,241,180,129,103,165,142,48,45,40,168,24,115,144,141,59,60,6,23,207,51,115,193,66,2,95,31,65,76,174,63,153,108,150,76,102,234,220,98,122,201,24,46,38,88,173,36,149,250,184,117,1,163,170,121,146,202,215,38,171,154,129,181,25,95,56,126,61,192,205,16,10,35,8,89,136,230,51,232,212,132,228,213,227,219,168,239,185,60,244,249,138,81,220,119,6,185,59,139,142,218,52,194,226,219,93,117,120,228,101,132,41,53,226,29,17,227,221,201,138,62,250,145,100,200,16,216,137,31,153,83,171,105,202,180,77,141,46,91,253,33,79,198,175,19,205,49,20,4,13,224,9,98,7,41,95,104,201,222,81,120,153,32,136,18,131,20,80,226,171,207,208,128,30,96,218,4,33,41,46,114,176,81,162,148,225,107,186,98,71,173,168,159,0,247,150,253,193,64,122,3,122,149,247,196,96,21,180,11,42,43,10,153,156,63,151,74,180,243,69,166,41,60,25,162,196,123,238,129,82,251,139,0,14,241,158,7,56,68,47,208,40,177,120,151,125,138,40,156,108,156,52,5,
+17,128,154,60,186,12,92,5,53,202,136,225,161,117,140,62,152,124,193,209,221,255,228,103,234,0,141,92,136,54,29,85,38,83,123,218,97,130,110,90,241,184,15,3,229,20,196,125,40,2,72,163,192,109,71,84,4,142,116,206,186,30,251,213,247,54,220,168,55,98,194,34,184,79,160,120,0,182,91,146,110,119,97,56,31,56,131,112,0,168,236,22,7,17,80,64,73,241,46,221,140,138,17,85,137,154,249,120,100,5,179,122,134,201,120,135,76,224,117,64,186,238,85,124,16,168,148,123,204,129,125,15,103,234,132,163,126,40,207,253,83,189,172,160,201,61,192,89,100,133,220,164,187,47,93,76,3,249,64,51,189,209,36,184,5,33,3,34,152,169,34,97,82,65,194,236,185,72,2,32,20,76,71,12,147,229,123,61,146,56,193,188,239,170,150,100,218,218,22,55,31,159,213,52,13,239,89,217,130,118,154,140,107,139,226,71,150,102,93,132,228,94,31,221,113,1,135,231,254,92,155,60,133,78,176,189,234,6,131,76,14,25,84,228,0,75,79,128,132,21,68,156,150,213,21,158,
+37,62,5,189,234,207,229,154,228,48,86,46,99,148,130,11,58,236,4,52,34,148,13,34,2,86,249,228,117,128,90,21,37,205,163,158,225,178,18,24,40,2,35,105,70,32,99,252,18,148,8,2,40,140,213,42,36,189,189,4,155,28,87,250,112,155,166,40,135,128,251,54,226,176,234,151,231,146,227,215,53,24,41,163,218,122,73,11,217,88,147,51,108,132,192,97,125,160,238,115,93,130,101,26,130,213,107,181,35,68,140,83,90,82,150,0,81,98,212,219,157,172,132,23,29,112,47,80,171,25,186,36,41,48,41,133,26,36,161,163,135,45,43,25,184,237,154,7,223,39,141,25,183,29,175,51,158,81,64,200,129,132,34,159,65,206,13,24,201,91,147,5,5,179,222,102,209,14,143,43,71,44,113,80,26,64,34,187,132,53,62,137,87,3,135,197,226,52,204,235,232,104,239,209,3,122,17,48,250,132,71,187,79,155,75,40,75,36,76,132,57,62,81,5,20,18,2,73,11,223,45,57,42,126,38,252,100,216,125,241,63,27,54,224,39,195,254,98,236,241,42,232,73,186,113,221,
+211,85,238,48,156,94,9,223,65,14,133,217,6,165,244,59,42,210,19,238,14,248,11,49,165,3,245,17,119,110,146,168,29,213,167,104,124,151,125,138,40,119,25,53,86,22,146,121,184,234,75,74,167,123,32,36,123,99,62,43,204,118,1,25,22,78,80,244,168,112,107,152,228,60,107,191,100,189,229,222,27,157,105,85,182,199,78,155,104,111,8,86,10,204,7,182,71,99,126,35,240,192,218,195,161,90,164,130,191,129,52,241,79,128,153,146,42,200,88,9,22,110,199,229,65,148,68,25,89,241,125,88,124,61,176,228,36,119,251,195,182,53,15,42,62,202,92,168,211,82,135,168,23,108,105,135,28,50,156,108,36,133,200,19,188,82,39,207,40,181,21,241,160,213,189,140,79,53,18,50,41,27,202,179,131,9,159,129,240,39,219,26,252,85,129,1,11,83,177,1,3,138,31,137,245,173,169,66,11,122,74,189,120,96,80,30,106,57,53,101,185,55,210,91,116,168,206,17,54,27,214,27,115,0,126,4,5,73,62,195,136,187,161,130,218,160,44,20,202,149,65,195,29,24,97,103,
+127,8,145,95,71,168,157,4,19,244,52,115,55,171,43,37,60,250,247,199,202,69,134,135,177,215,27,39,203,48,151,161,53,89,137,62,39,13,164,188,90,68,105,112,161,10,64,238,199,143,203,70,222,60,88,125,145,228,220,66,91,73,238,54,145,16,94,21,60,126,145,232,27,162,204,253,66,16,164,96,134,7,59,164,172,53,29,208,134,210,249,137,8,26,132,57,206,75,87,80,96,72,40,8,16,145,165,140,182,138,5,11,103,244,104,74,175,69,200,210,234,240,80,16,48,44,113,148,63,1,67,251,196,79,85,192,56,84,163,147,140,176,112,162,181,19,171,97,160,170,144,138,28,83,17,32,123,246,28,2,28,219,79,102,176,213,235,182,227,87,194,199,180,193,233,62,44,143,36,204,43,200,250,30,59,225,81,109,216,44,178,1,191,69,210,233,204,149,37,228,18,20,15,82,80,219,29,228,160,76,205,214,45,81,168,241,50,62,171,92,132,244,229,222,44,80,107,214,39,74,7,82,135,13,216,123,83,204,71,41,195,184,33,100,88,116,121,58,162,77,160,152,73,65,67,178,
+182,159,231,143,19,248,83,85,78,198,136,107,61,47,33,210,139,197,227,43,165,147,182,43,86,245,160,24,165,47,37,181,183,125,252,248,16,114,9,52,57,251,147,225,149,122,247,131,253,82,105,184,211,78,85,68,115,19,170,136,197,57,51,95,252,163,72,210,84,94,45,201,207,199,216,186,168,230,211,27,74,113,168,182,87,173,22,162,251,176,49,45,38,168,148,105,216,79,50,146,98,134,164,190,14,80,99,91,29,200,134,160,81,223,61,228,102,21,68,138,43,78,190,161,128,70,159,99,72,193,232,222,246,11,111,239,109,85,85,225,153,176,141,198,136,32,233,43,235,29,213,174,219,75,210,214,6,220,102,229,68,52,136,0,207,33,232,199,97,154,116,210,97,198,232,136,151,187,243,12,98,225,39,250,34,239,173,214,219,174,2,131,168,153,155,144,52,52,196,161,4,9,211,168,2,4,121,101,224,116,102,179,217,201,8,247,192,237,227,179,188,208,13,247,111,196,143,215,86,173,222,78,2,61,108,72,158,228,181,225,66,134,217,101,201,75,40,244,205,161,165,5,170,136,18,75,
+54,252,202,73,87,139,67,80,2,200,28,248,132,152,100,239,18,141,173,242,23,10,197,66,163,113,88,24,19,21,95,155,26,222,111,250,79,151,42,128,215,10,101,32,168,139,203,119,155,104,201,83,182,67,25,216,153,80,105,158,86,3,127,136,200,126,3,9,1,18,152,67,86,219,2,122,175,55,9,106,84,123,114,53,124,22,160,113,11,197,234,107,51,96,241,252,203,17,212,120,136,80,19,132,201,246,35,139,150,170,217,126,3,198,57,145,251,203,6,124,31,212,40,185,6,234,196,43,215,51,25,233,244,94,99,135,16,128,82,151,60,117,222,8,70,174,237,137,215,147,70,199,205,232,180,137,93,16,171,168,116,211,21,151,116,84,159,179,29,93,98,122,128,172,151,69,218,27,132,216,85,58,114,29,164,11,216,183,235,55,231,155,255,96,227,60,195,60,242,13,226,212,144,86,168,222,50,29,254,160,186,106,103,194,218,208,59,28,239,81,115,25,27,222,83,58,252,62,174,155,214,26,150,168,39,115,42,190,108,160,17,240,18,21,222,123,84,216,185,13,214,205,141,116,233,187,
+243,71,249,203,9,140,254,144,169,188,58,221,203,133,236,166,182,233,116,5,223,192,194,4,198,163,27,254,21,192,29,177,126,119,180,227,167,211,28,95,253,234,203,1,163,95,255,195,119,95,255,211,183,223,255,221,87,255,247,127,254,15,95,253,242,135,239,127,243,205,247,191,249,189,3,71,255,233,151,63,254,240,221,119,127,245,245,143,127,224,240,199,95,254,217,207,127,246,139,159,255,57,8,140,0,16,63,79,28,205,255,229,240,7,35,145,246,251,166,132,80,185,255,248,2,198,160,23,237,2,214,190,244,163,195,82,198,43,238,28,18,136,123,79,190,129,4,23,60,67,240,103,222,13,3,244,33,104,15,74,117,191,216,168,140,185,4,148,93,47,215,143,223,234,31,132,197,60,186,231,22,230,7,210,141,70,157,113,11,222,112,169,89,27,234,96,129,41,72,246,194,71,88,73,179,194,170,132,196,49,103,81,55,141,92,250,104,144,63,158,56,59,174,38,248,198,223,27,234,195,75,26,160,34,10,193,207,228,164,30,167,39,29,250,166,177,236,25,54,1,251,234,165,64,207,247,
+121,103,81,66,131,76,57,186,53,188,94,197,31,27,195,117,117,152,145,234,62,158,182,77,174,13,86,123,96,103,74,153,37,44,220,29,140,237,5,49,161,145,149,197,129,156,60,142,147,76,82,221,123,80,61,161,150,175,180,248,113,246,33,175,170,133,164,48,89,111,48,38,136,117,84,8,231,200,67,53,11,170,230,166,121,62,90,168,179,109,188,132,68,48,103,120,142,140,207,85,68,50,72,240,214,191,35,106,167,244,20,254,65,223,64,237,138,150,231,126,193,68,159,128,209,38,64,220,38,185,24,154,146,39,225,86,196,191,143,219,82,215,7,128,244,72,179,104,233,165,27,120,150,166,16,209,73,40,186,155,238,229,205,224,245,11,236,75,79,189,137,126,89,139,64,199,233,99,223,253,172,69,149,156,104,89,164,222,17,204,90,84,4,225,110,181,208,0,135,149,10,234,161,88,160,158,230,154,235,71,206,220,113,86,11,221,215,186,25,140,219,173,9,57,169,112,131,211,89,233,233,154,32,30,237,207,59,215,219,170,30,98,179,208,116,233,7,144,47,122,45,219,214,180,78,235,
+228,125,3,251,240,117,219,242,249,142,88,190,87,196,38,5,154,249,86,43,75,118,232,13,124,34,149,133,251,167,114,242,210,88,20,249,113,158,55,254,121,125,234,143,55,93,27,213,78,160,67,90,47,150,148,126,79,38,134,225,104,12,236,112,253,29,251,254,183,31,126,252,246,191,223,121,246,245,119,95,253,250,11,185,254,230,235,31,127,71,184,255,253,147,89,255,234,128,219,239,250,254,167,223,124,253,155,111,127,249,213,127,251,246,111,255,238,155,223,252,62,121,191,16,242,247,70,249,254,87,63,252,27,167,228,254,226,207,255,242,103,191,248,179,63,7,128,79,0,230,39,105,95,127,34,173,156,51,163,54,80,0,129,129,0,115,46,63,70,38,51,87,174,134,52,125,60,51,68,177,107,4,206,232,206,176,199,91,145,125,217,220,195,28,41,148,84,134,184,1,148,102,191,128,1,130,123,103,68,242,227,44,171,202,79,205,171,47,128,42,60,216,32,226,115,82,135,233,152,50,12,234,243,212,213,234,180,8,186,157,126,81,89,91,69,175,2,242,25,187,216,42,120,65,230,212,
+35,118,33,22,61,153,204,175,70,101,222,182,173,110,126,228,209,119,98,220,211,56,204,194,188,16,60,111,224,5,77,101,196,194,0,207,48,240,85,169,1,104,126,135,194,231,238,126,252,175,119,36,126,248,254,14,226,175,190,253,230,187,191,253,234,135,95,125,1,231,183,191,254,171,223,71,243,255,248,230,159,254,13,24,126,241,139,191,248,247,63,251,197,159,252,123,16,56,10,96,124,226,48,250,23,28,88,89,28,68,176,199,64,221,198,143,74,130,58,61,236,80,236,61,92,121,54,199,133,33,161,175,24,77,54,233,185,112,175,33,9,247,118,183,25,100,79,48,165,75,25,58,97,40,67,186,80,128,98,155,66,221,3,202,109,96,211,10,132,203,202,9,228,11,136,124,121,46,168,109,124,140,58,206,239,195,214,94,232,198,255,161,58,240,169,57,35,101,155,231,145,156,194,197,27,229,253,64,173,195,52,75,213,217,220,76,113,159,204,122,156,79,42,183,49,174,81,180,92,72,159,33,37,117,22,118,249,118,179,22,146,234,62,132,104,180,53,143,34,108,124,235,55,179,233,47,
+162,141,128,42,44,39,168,102,85,37,220,140,193,246,86,84,211,186,142,43,81,73,245,33,171,60,240,45,110,83,43,7,95,190,149,120,23,239,56,151,138,210,34,86,83,51,19,123,78,112,241,46,28,214,99,3,195,247,208,28,175,253,101,197,20,96,19,8,207,169,253,54,150,228,148,217,66,8,132,149,218,41,180,209,252,191,239,53,191,144,238,139,215,252,230,87,223,126,255,73,187,175,127,249,203,111,190,251,230,199,175,63,207,106,254,63,223,252,211,175,127,135,252,95,127,253,55,223,252,33,220,255,228,47,254,236,39,250,185,254,127,244,211,115,102,244,44,22,32,72,98,130,204,138,251,37,172,57,188,248,32,220,77,57,54,91,82,20,160,24,91,121,50,228,22,75,55,31,221,51,70,232,19,146,54,51,9,23,185,4,19,63,111,121,36,63,174,41,73,97,167,26,226,171,102,182,112,95,23,94,12,201,67,70,185,221,135,244,115,111,26,189,75,11,101,14,171,40,207,218,118,76,219,185,97,50,127,208,64,32,199,240,126,154,97,14,224,165,1,115,243,38,90,15,211,186,
+18,75,52,63,123,240,125,10,12,208,15,188,67,29,242,162,121,66,229,206,225,232,77,82,152,21,155,171,120,241,235,21,123,120,44,222,40,101,193,35,160,6,37,126,136,254,7,179,252,205,55,255,248,155,63,250,234,151,95,255,195,215,127,243,221,55,159,140,252,87,240,124,245,15,63,254,240,203,111,126,253,235,59,114,255,10,168,191,250,225,31,255,32,71,127,254,199,63,251,227,63,253,99,0,152,1,244,126,130,229,251,9,44,60,103,198,206,76,216,17,30,37,178,189,245,9,11,148,206,247,176,20,210,91,31,160,140,67,246,220,174,136,253,145,54,39,128,93,122,5,192,103,178,208,135,133,75,160,36,25,37,135,185,162,194,62,44,185,13,86,178,105,76,50,163,90,162,80,171,33,162,138,46,204,188,61,110,74,158,157,226,86,73,226,109,98,38,53,97,81,159,225,120,95,19,208,58,154,231,30,231,28,33,149,142,40,32,0,96,116,159,124,49,38,36,182,23,54,212,107,154,103,131,143,65,63,103,122,227,38,54,27,174,132,60,134,245,37,166,201,145,99,174,103,125,56,
+122,44,131,0,204,44,64,252,84,79,226,49,136,128,49,120,25,85,77,118,34,189,68,244,108,65,66,29,79,141,247,67,10,160,148,228,29,172,147,161,227,77,176,8,86,127,5,96,98,96,30,188,231,27,164,37,184,90,220,124,227,104,29,59,97,142,146,212,72,89,139,49,63,230,155,136,137,38,175,243,166,40,68,137,85,33,108,53,82,130,41,229,24,195,162,215,247,208,60,38,171,187,199,39,154,174,88,108,137,43,157,132,9,110,86,115,235,4,55,4,3,51,170,198,77,60,130,91,201,233,242,166,221,208,106,30,144,106,70,124,55,208,245,63,220,68,250,112,201,16,93,168,54,227,143,234,62,216,34,187,153,90,166,98,178,111,116,118,91,46,67,66,90,229,20,136,130,51,167,179,102,41,166,226,81,150,80,62,204,95,215,186,90,140,83,59,25,6,103,140,143,144,30,1,198,5,241,221,255,161,92,160,39,254,30,18,2,120,23,8,192,173,157,36,2,174,79,98,192,89,9,140,0,246,96,60,128,184,128,243,128,109,188,139,116,111,5,199,235,94,50,251,36,204,243,129,
+5,232,121,157,97,182,89,137,79,164,57,95,69,69,141,123,179,217,236,252,102,11,167,196,64,252,147,60,100,58,242,136,190,141,188,36,198,188,232,34,231,113,64,231,205,49,38,22,91,223,131,122,127,163,141,115,0,187,184,55,204,42,167,146,228,192,241,130,211,133,29,25,201,186,177,141,94,82,251,120,127,29,94,32,238,245,3,59,210,101,146,72,86,104,194,65,138,238,55,43,212,138,132,196,11,136,209,41,202,134,143,10,86,80,176,134,40,17,141,140,111,70,107,141,123,144,208,222,200,53,148,186,122,111,128,136,18,108,248,17,147,148,228,33,169,34,210,246,237,131,184,1,29,118,227,13,250,16,221,0,198,98,0,60,189,47,108,103,23,200,176,144,38,250,110,48,173,51,191,85,28,107,27,97,240,41,55,33,74,64,200,143,222,144,88,75,115,33,82,44,230,168,158,114,61,79,124,99,115,148,89,238,54,8,18,240,189,61,205,170,151,203,165,187,41,87,53,211,164,209,220,176,85,50,117,189,244,124,164,1,204,73,161,148,248,88,9,166,242,207,78,14,153,116,121,33,
+63,204,62,12,73,223,227,240,224,0,239,14,209,83,45,125,146,60,120,228,10,0,6,192,227,17,131,216,212,48,159,19,3,96,122,106,243,236,73,59,9,79,109,45,0,12,190,206,81,216,159,20,177,56,187,106,141,203,56,76,196,234,117,13,22,139,213,121,244,60,60,92,214,67,106,195,223,25,180,78,253,97,76,6,142,240,243,176,129,57,98,123,215,226,113,246,180,94,163,209,232,222,161,174,163,181,161,152,234,12,58,15,131,201,124,188,88,156,96,117,229,222,116,202,207,35,216,17,138,248,134,68,86,181,90,254,71,224,227,3,143,199,171,169,181,184,181,166,45,190,133,160,221,122,205,227,157,187,120,217,147,208,114,131,227,36,220,134,79,187,159,69,98,239,177,1,144,73,179,177,62,198,3,208,163,13,87,98,250,125,98,21,109,116,13,151,211,217,166,175,137,62,166,143,135,75,245,252,96,118,58,235,34,247,68,53,209,159,8,50,120,7,79,7,233,97,218,135,253,60,161,7,112,99,59,167,191,103,243,236,196,62,94,175,71,16,114,92,34,210,137,173,130,18,197,84,
+250,94,93,190,185,88,173,164,17,239,101,222,206,195,101,66,156,69,128,218,227,113,180,227,185,101,44,241,183,157,100,44,141,100,219,161,10,196,137,99,239,211,213,119,138,107,135,189,171,74,83,231,59,137,130,204,146,24,37,224,120,217,181,186,71,125,233,74,69,72,94,148,231,109,92,103,135,247,121,227,37,52,215,149,110,23,133,141,157,194,98,103,249,4,253,245,156,163,104,245,130,66,249,77,151,7,202,206,139,28,164,7,122,221,184,114,104,119,162,45,78,215,247,143,233,77,215,100,186,108,98,207,244,176,240,41,96,223,91,44,27,110,138,87,87,246,155,122,221,50,31,151,72,30,119,19,182,117,157,73,207,11,31,184,154,182,148,78,143,247,150,125,142,45,30,91,31,84,169,115,115,166,203,67,252,109,208,60,99,48,70,154,35,144,213,47,195,242,248,49,207,120,102,33,214,158,194,234,67,127,157,186,189,121,142,18,69,162,71,16,220,81,96,177,217,58,3,229,65,25,129,207,241,121,229,157,53,216,57,150,206,63,13,95,158,49,233,125,38,211,114,237,161,222,136,52,
+194,234,178,234,227,113,120,208,227,40,247,163,206,244,45,99,200,47,106,190,74,210,109,10,141,106,82,105,56,125,162,212,243,85,155,71,70,21,64,34,0,225,231,194,29,135,194,199,114,233,211,150,196,118,142,251,184,70,196,29,111,53,100,84,244,58,231,93,179,184,116,58,253,254,18,59,236,134,195,196,182,239,144,2,251,57,137,44,215,117,182,113,188,16,152,158,120,207,37,23,231,118,173,9,96,156,12,227,205,44,239,48,154,31,148,158,35,69,174,88,46,239,88,135,121,89,247,123,191,175,90,84,206,234,171,234,40,92,47,133,21,45,138,138,120,90,109,22,139,224,137,95,243,182,76,88,234,163,75,91,171,6,229,130,146,248,156,15,75,218,161,91,211,48,203,24,102,11,153,154,229,204,240,51,91,197,14,82,92,141,122,34,100,220,126,230,152,32,245,143,72,123,189,110,165,146,201,247,215,119,26,72,64,240,126,92,223,95,71,113,106,21,74,135,234,173,49,99,50,63,88,44,99,218,1,208,43,232,196,79,100,100,115,163,26,176,17,210,94,65,77,25,129,105,176,200,
+166,59,0,125,42,238,35,204,184,239,255,198,235,92,111,215,235,104,180,201,229,34,129,187,242,143,239,210,15,210,157,112,143,89,230,108,216,81,69,55,139,209,180,135,90,30,46,141,90,162,54,57,95,121,110,35,3,135,207,228,188,133,21,83,77,205,102,162,74,109,51,224,99,63,246,14,196,19,229,99,73,120,154,187,69,192,159,28,97,240,39,119,9,16,253,228,46,137,195,159,220,37,48,121,119,151,129,19,132,170,2,32,164,37,138,2,66,3,224,165,226,174,1,128,7,32,61,78,12,0,0,3,40,206,112,105,221,1,228,253,15,161,247,51,203,251,146,154,252,191,223,254,250,183,95,127,247,221,63,125,245,119,63,254,240,219,127,248,204,81,126,248,205,223,127,243,227,151,6,191,159,158,124,251,253,55,255,203,223,126,251,155,63,84,213,221,51,148,63,253,139,63,3,129,49,128,228,103,208,181,252,20,116,193,156,217,75,236,189,96,124,35,92,202,93,206,11,240,29,108,136,210,208,134,14,8,133,16,11,118,26,6,4,164,14,130,72,2,53,21,129,0,155,8,7,9,
+0,25,123,124,75,62,50,56,249,1,29,62,223,121,247,81,183,219,122,172,111,231,106,222,36,228,109,224,214,20,165,19,47,163,44,52,28,21,64,200,235,4,118,110,63,252,8,193,191,61,241,182,141,178,177,206,206,39,25,91,109,206,253,22,215,17,72,165,122,193,105,78,54,230,22,29,27,26,41,139,211,112,219,190,27,127,139,64,22,91,34,254,197,63,119,209,111,216,39,107,185,216,206,142,14,130,23,175,45,218,76,190,37,138,123,83,29,227,216,54,20,171,85,178,138,7,156,80,115,93,228,61,26,173,172,54,134,228,161,151,204,170,170,14,118,54,44,45,251,54,215,33,161,16,10,32,115,240,117,214,190,222,148,30,18,148,13,215,101,98,98,35,129,29,80,146,53,46,250,230,200,4,166,59,59,249,185,16,193,201,218,31,10,52,24,193,17,239,122,222,196,195,92,230,145,101,188,120,84,12,199,163,66,253,33,150,150,145,212,25,50,226,223,73,192,66,92,98,62,11,177,249,170,162,249,163,116,138,153,37,108,117,23,185,117,225,248,177,55,162,167,32,62,43,30,35,
+251,103,252,66,200,171,118,2,95,118,238,199,111,17,252,234,13,110,165,102,23,179,35,63,204,55,111,87,102,65,151,121,123,203,50,8,239,196,6,168,228,136,212,93,26,203,158,138,69,3,11,219,56,6,55,160,37,14,229,66,124,226,110,250,56,66,124,68,196,237,27,87,194,78,59,44,170,71,73,169,164,44,20,103,14,138,43,80,0,93,102,83,147,2,78,252,148,216,154,45,17,58,73,223,210,9,6,186,206,1,223,31,168,173,205,23,62,117,248,46,222,36,76,4,234,197,158,12,138,171,246,226,166,164,96,80,171,222,18,127,203,20,118,61,105,21,90,201,118,76,202,250,5,145,55,73,225,249,13,126,196,1,163,29,40,92,146,202,205,244,147,149,175,143,248,156,126,93,230,233,175,23,4,38,104,51,80,245,210,228,112,118,113,52,204,2,37,94,213,121,178,201,64,73,46,216,245,168,113,191,62,125,42,56,118,223,230,39,4,159,24,124,66,144,88,124,106,223,237,167,126,222,188,223,251,183,240,33,225,127,234,168,252,231,142,100,252,162,227,174,189,156,14,122,136,228,
+99,212,188,244,198,245,15,62,234,166,165,55,146,44,6,91,200,114,224,195,229,91,233,120,142,246,104,22,230,190,31,126,199,190,122,53,211,247,105,255,100,227,50,109,102,113,207,64,217,91,8,151,250,158,205,103,155,5,177,128,195,235,54,237,152,213,215,253,220,54,72,167,83,12,113,116,179,183,212,46,206,99,253,203,253,160,78,188,14,51,236,151,225,156,187,56,98,235,239,3,190,223,255,162,143,46,206,40,35,22,51,159,52,106,175,23,103,189,197,206,215,73,150,92,243,30,154,250,208,166,139,219,88,143,77,62,204,40,162,67,67,187,234,211,115,223,185,91,67,143,55,109,197,95,244,218,230,230,2,195,53,118,185,49,193,254,147,184,152,144,179,3,124,223,48,251,166,181,194,220,170,146,191,120,203,24,108,57,6,52,181,59,30,55,253,97,29,177,91,52,157,38,209,18,145,228,238,58,81,49,74,250,18,185,180,62,202,108,115,225,104,105,190,85,197,17,125,161,140,153,53,196,9,186,49,40,230,61,39,9,17,12,53,97,63,226,241,15,79,172,252,136,53,222,39,157,
+226,1,145,235,164,53,100,38,60,109,98,156,102,47,86,146,238,42,14,104,171,97,140,21,107,171,237,34,163,172,90,154,56,233,9,206,168,107,37,63,154,182,253,108,232,222,162,23,17,55,194,154,209,234,201,42,14,209,211,176,4,49,48,204,118,67,77,123,247,120,208,70,213,183,126,196,117,237,173,100,203,29,137,78,108,206,35,153,87,175,138,200,194,188,75,15,215,143,96,207,55,222,242,121,83,206,131,204,54,150,184,175,65,201,7,167,51,112,66,240,166,152,35,96,225,113,177,165,91,117,188,236,41,104,150,195,200,169,55,171,205,225,224,156,169,97,234,108,230,190,43,141,136,144,196,89,47,131,243,48,220,249,200,240,242,233,229,148,58,159,159,239,120,12,21,188,134,50,140,143,79,82,226,164,100,27,5,162,149,72,239,153,162,60,35,49,92,236,110,243,123,79,25,190,253,187,191,191,123,193,95,254,246,215,191,249,225,191,126,251,223,191,84,36,63,126,253,223,190,212,40,95,125,115,247,124,63,252,248,71,95,253,245,127,248,234,219,95,127,117,247,143,95,125,243,253,
+151,18,250,187,187,91,252,163,123,69,253,143,223,252,237,231,67,134,223,252,253,221,167,254,254,227,176,191,254,191,254,215,127,163,158,254,211,159,255,252,103,191,248,243,123,169,242,4,96,125,122,205,225,239,234,186,6,10,100,120,164,0,78,222,166,48,50,25,61,188,142,176,111,158,3,90,39,2,33,222,227,229,103,133,65,164,140,62,214,223,240,81,210,8,91,114,182,159,42,236,120,150,122,125,111,119,156,21,92,125,114,166,204,30,13,139,0,30,196,49,104,121,234,114,113,210,232,49,118,117,215,200,107,84,41,22,242,70,185,16,105,185,61,108,48,4,13,171,229,2,55,194,33,240,84,127,27,123,23,174,22,131,112,149,206,219,186,152,16,251,162,214,169,48,24,233,41,131,23,194,2,46,239,153,238,3,204,213,252,23,244,249,245,36,167,195,94,46,98,112,45,197,248,0,62,235,10,149,234,32,173,56,202,235,202,61,203,89,135,67,85,160,103,7,213,204,28,122,31,189,44,95,242,86,119,130,147,149,138,2,252,54,247,174,68,62,8,102,72,240,221,212,38,135,145,241,
+240,212,98,31,145,94,98,201,223,191,232,11,215,210,49,30,88,247,161,103,221,149,113,1,189,186,30,209,207,7,7,255,80,190,240,131,26,78,11,196,184,137,7,72,48,251,161,213,74,108,141,163,200,100,110,231,193,220,151,97,234,118,75,178,77,222,135,229,226,42,243,243,249,168,20,196,235,165,83,250,200,54,216,167,207,32,126,167,215,191,254,250,251,191,251,237,29,240,127,126,71,210,183,63,124,255,37,180,253,78,69,255,231,55,223,255,246,15,63,174,252,139,63,251,147,159,253,217,95,254,2,4,134,2,94,63,85,196,252,151,106,146,155,153,144,125,87,74,196,182,109,45,248,151,133,170,169,169,160,221,209,3,117,14,242,251,92,239,123,242,155,20,138,156,69,179,170,227,66,36,217,128,41,224,72,246,158,60,186,180,164,32,128,68,163,212,81,93,41,116,71,168,29,116,1,209,100,122,174,181,98,87,198,7,233,236,229,185,252,38,38,247,48,215,121,78,77,70,255,109,119,124,228,218,113,98,116,157,156,29,164,55,82,243,26,211,243,62,62,138,167,67,219,59,63,133,
+155,250,173,151,226,240,245,106,3,82,81,3,46,16,151,248,176,29,213,38,175,215,19,56,11,176,246,10,115,97,48,57,218,237,193,147,47,206,121,183,119,45,24,44,169,172,200,46,131,36,127,152,237,150,90,115,80,41,166,222,132,192,79,105,58,187,82,98,157,32,52,70,116,175,35,14,58,164,158,24,31,228,44,32,54,63,231,29,72,118,44,20,84,205,65,100,125,224,143,31,250,155,99,201,84,247,250,80,20,145,243,66,186,216,217,96,205,128,250,40,33,59,94,245,25,107,128,72,124,167,70,130,51,158,184,127,89,189,155,51,125,30,255,214,129,172,240,170,128,37,236,118,189,237,40,232,64,135,129,185,113,14,73,162,102,17,7,192,121,211,168,125,131,37,37,160,129,219,243,199,13,75,2,199,151,142,0,222,78,169,35,236,46,75,72,55,8,195,194,4,98,70,242,98,83,204,236,238,225,250,162,205,70,10,250,113,206,201,111,101,6,161,195,4,86,124,197,117,0,51,48,13,78,50,245,208,128,158,232,203,142,79,6,147,16,23,102,191,158,13,36,115,7,33,108,243,
+72,121,143,221,36,100,35,22,132,56,127,7,141,136,182,104,68,242,161,221,198,125,162,66,226,68,4,145,136,92,46,191,92,189,183,233,116,122,62,115,0,246,209,50,56,6,194,143,90,220,208,236,176,90,5,210,39,14,159,143,134,8,149,136,72,14,19,3,187,109,142,225,34,117,41,45,148,75,169,189,84,46,247,161,68,96,160,160,69,193,22,193,218,92,148,76,38,151,178,135,115,174,183,126,117,4,237,36,142,90,189,86,99,195,129,246,104,171,59,222,167,41,246,218,47,131,112,100,213,81,188,23,99,139,218,196,90,115,79,155,114,159,176,255,184,228,13,213,150,120,117,33,145,141,69,175,137,16,147,119,38,69,134,154,154,72,215,122,140,59,204,129,11,191,188,15,134,104,112,35,135,86,33,17,253,28,154,54,135,179,153,161,13,113,4,209,81,167,30,30,138,149,222,114,202,136,112,112,204,78,230,227,133,136,171,167,186,132,39,55,52,162,46,118,81,222,29,99,221,42,41,101,27,26,211,179,151,80,198,213,119,104,24,216,219,130,196,168,110,35,26,128,190,14,163,184,
+18,140,67,212,96,238,240,201,113,239,10,73,63,195,13,183,104,78,1,33,103,2,219,211,163,187,221,157,205,21,0,164,142,227,60,51,172,48,152,151,10,134,147,129,0,184,26,248,249,105,127,94,172,11,229,141,67,6,128,169,0,112,153,234,111,63,63,0,233,157,202,122,105,155,226,136,198,61,7,19,65,186,153,57,231,134,233,231,47,6,78,201,204,206,0,4,246,250,156,57,144,11,33,2,38,228,75,133,137,129,134,22,158,231,26,75,111,114,160,140,41,59,38,175,229,143,71,115,71,218,46,171,45,178,139,233,4,174,229,11,159,208,145,100,67,51,29,231,115,92,92,178,37,171,72,156,211,87,96,128,70,61,75,145,118,65,195,137,167,216,252,189,197,11,155,20,254,60,63,180,51,181,138,225,109,136,235,139,239,20,97,53,135,94,9,195,83,211,22,119,254,142,197,163,169,35,111,142,227,65,137,28,108,135,18,128,235,245,100,207,121,115,59,186,190,130,65,10,9,0,12,167,46,176,186,251,158,0,63,109,79,29,63,116,5,45,135,195,215,161,129,225,148,240,147,239,
+33,126,231,205,253,83,255,233,130,101,110,120,141,182,128,186,24,24,72,40,170,26,26,211,225,122,120,243,145,77,170,68,56,121,104,12,119,51,43,121,43,197,189,97,8,98,199,176,79,156,226,243,148,69,193,192,151,121,55,238,44,152,107,89,126,96,150,166,190,224,169,11,0,0,206,55,190,56,227,18,206,199,148,114,157,221,203,4,84,49,157,17,46,158,164,72,117,246,18,35,45,29,145,205,35,116,174,121,174,40,149,165,64,74,40,34,94,201,152,92,204,190,27,221,4,0,148,117,10,0,224,106,247,229,58,88,139,167,104,18,209,91,22,6,1,151,12,63,110,130,79,14,45,75,163,215,239,239,69,122,50,147,65,167,123,203,185,241,4,70,214,123,19,48,18,44,199,191,240,211,128,134,103,107,166,200,98,65,169,63,217,125,178,192,154,137,132,183,55,17,119,138,1,120,209,26,170,207,14,190,45,10,119,2,95,26,3,242,54,247,154,35,1,20,205,1,185,160,111,105,82,0,183,93,117,147,235,98,242,197,177,86,59,50,217,155,52,204,138,95,78,119,206,85,111,196,
+161,114,224,112,109,58,139,215,183,62,154,151,235,96,179,91,7,242,203,197,71,239,52,148,84,205,242,37,190,70,83,2,235,44,26,149,24,69,251,252,5,172,234,234,229,187,214,165,150,111,121,90,176,5,185,64,163,78,45,38,22,76,202,244,116,121,211,70,228,208,1,241,233,6,12,240,0,136,208,239,220,250,167,215,254,157,15,255,143,255,240,233,216,255,208,43,238,126,241,151,63,251,197,159,254,9,0,220,3,252,254,59,238,228,247,40,219,65,131,158,30,48,176,75,230,34,191,6,87,81,132,64,40,2,185,17,193,130,45,44,233,193,246,206,242,56,247,204,46,207,233,155,93,221,237,129,125,212,122,30,207,139,46,66,79,108,3,143,28,156,139,118,113,103,244,104,65,136,99,95,185,188,107,10,99,80,45,22,7,212,25,177,254,168,192,160,8,214,102,74,12,138,155,48,103,185,37,202,19,69,84,219,164,173,208,122,198,251,162,2,7,34,155,165,228,210,207,216,8,138,50,186,209,213,225,2,112,238,21,124,40,158,82,97,150,2,202,37,208,21,219,134,205,169,152,161,
+201,93,231,178,4,215,248,136,34,154,88,22,92,24,49,129,183,9,52,22,127,77,37,48,157,190,107,248,180,69,37,11,106,128,235,48,148,22,31,149,106,0,237,185,47,137,141,31,183,92,191,6,100,181,239,182,20,233,147,129,35,101,217,59,218,142,88,220,119,66,116,12,228,142,35,100,177,28,79,29,156,118,48,151,225,79,65,132,234,33,98,141,187,234,79,74,138,226,1,145,165,130,189,219,39,127,239,169,183,15,169,176,136,2,173,105,173,129,48,153,128,224,237,17,23,177,205,36,155,94,133,88,232,66,30,98,7,72,191,58,124,50,120,130,152,56,175,81,235,68,82,148,119,142,26,237,17,211,82,115,136,21,188,206,137,20,213,71,168,225,176,43,167,140,0,81,63,126,105,213,159,46,194,214,61,186,37,6,43,135,253,90,207,92,182,251,213,239,244,248,31,191,255,47,255,238,135,95,253,234,171,255,233,94,138,254,240,211,247,255,242,239,190,255,237,119,223,253,207,95,253,240,69,169,255,90,201,255,249,199,111,190,249,67,177,250,51,157,250,249,207,127,142,0,47,190,
+252,197,2,106,255,139,166,185,157,183,186,225,200,128,173,229,28,9,61,91,113,192,156,161,119,3,132,239,204,32,196,148,248,19,82,72,137,51,123,83,35,95,166,145,65,182,85,53,173,95,166,105,220,248,198,33,171,86,206,92,212,202,32,54,135,80,69,144,20,129,154,126,205,24,245,167,154,188,202,39,67,110,158,135,217,91,36,56,88,93,14,142,229,249,124,94,121,87,171,35,63,210,243,169,249,162,71,163,171,157,159,179,93,173,249,233,184,121,201,204,199,224,105,146,212,202,36,130,121,186,252,214,179,226,51,167,18,182,178,93,199,86,99,149,116,36,202,39,206,167,147,56,51,90,119,175,61,229,209,117,109,234,107,117,82,6,207,197,227,179,175,154,212,142,253,49,165,165,155,102,167,10,251,225,186,164,108,125,72,201,115,218,176,11,33,30,81,193,111,121,47,86,138,62,47,106,140,97,230,124,81,62,215,43,131,5,179,180,155,212,205,92,22,41,113,230,220,13,222,61,121,81,166,69,22,101,188,181,35,98,21,84,139,23,77,185,217,140,189,189,82,117,178,166,124,76,
+71,122,92,183,12,100,242,170,121,94,82,204,106,135,40,19,109,128,89,124,91,61,181,25,31,94,69,195,35,254,80,172,206,239,37,204,244,197,42,223,111,152,181,226,229,210,53,10,231,195,71,223,173,80,182,235,104,181,126,171,133,100,156,136,39,251,90,250,1,145,64,220,72,210,109,100,179,159,8,30,52,103,114,223,217,237,86,199,111,170,27,205,219,204,254,230,100,246,62,200,145,108,142,40,180,170,74,3,153,4,66,0,236,70,65,147,224,89,78,59,6,73,226,93,236,44,33,121,203,3,135,165,249,234,49,197,31,114,250,138,62,147,142,172,97,111,87,249,33,25,125,142,188,165,90,5,81,236,249,53,236,49,201,50,94,226,146,114,25,246,197,189,226,145,146,64,15,196,13,110,239,150,148,158,78,205,190,135,212,156,221,130,167,242,11,3,143,233,230,139,212,104,228,241,245,158,189,144,125,67,177,248,121,232,89,172,94,236,215,136,255,240,34,213,108,144,80,143,113,46,57,74,110,134,13,82,122,255,222,190,152,110,93,232,135,99,239,49,177,139,25,223,138,104,207,144,
+47,248,17,185,60,41,106,221,156,221,75,237,227,140,156,191,200,149,180,176,204,237,76,54,98,128,197,54,109,228,235,30,248,217,189,73,4,158,68,52,224,35,5,214,26,218,30,248,135,109,112,111,135,92,120,13,153,93,245,236,109,56,29,94,202,82,53,20,195,112,125,162,10,228,9,49,89,230,194,228,254,91,69,103,182,84,152,76,125,54,156,191,123,116,73,198,185,63,138,61,125,110,171,238,153,240,91,172,193,25,199,116,227,23,103,28,116,157,240,87,70,100,244,165,43,124,201,252,180,238,178,193,11,145,230,228,101,37,56,72,234,145,173,188,104,112,110,154,63,87,39,87,223,217,213,219,28,44,216,254,218,226,18,247,220,218,168,102,254,108,194,102,58,67,174,234,226,70,236,202,178,89,170,255,70,95,247,113,129,183,35,161,151,31,41,182,3,216,5,151,215,93,85,148,45,122,120,148,218,88,41,181,108,142,152,76,119,79,79,151,35,125,115,72,54,137,205,25,144,142,152,103,228,90,184,81,149,143,155,153,98,13,92,16,99,241,151,238,168,42,161,236,165,116,112,36,
+216,203,109,181,247,220,117,8,244,211,58,149,216,217,218,114,163,95,186,29,97,70,179,189,236,202,45,175,234,221,108,62,75,110,144,204,126,158,24,12,4,98,237,141,143,127,207,215,57,72,84,146,63,77,158,35,53,177,34,83,68,170,197,174,51,196,19,74,189,82,217,120,203,201,168,78,118,61,116,150,157,77,252,96,164,92,103,201,224,208,202,189,109,63,199,9,31,79,213,170,39,119,233,93,155,247,139,251,230,251,242,235,92,24,221,47,13,121,100,78,75,205,188,214,251,82,250,119,204,62,33,187,220,49,251,132,108,251,152,25,114,213,148,244,209,89,136,246,82,220,181,13,87,162,148,248,250,30,179,73,28,242,93,224,211,56,253,132,99,125,96,170,133,43,45,238,172,92,85,249,193,206,44,158,51,74,85,185,182,211,52,66,135,71,174,181,221,4,66,123,150,15,18,204,99,124,150,151,238,228,245,243,43,35,16,57,49,58,4,199,97,98,66,28,207,143,14,28,188,202,77,220,122,40,71,14,47,194,6,79,184,10,230,135,11,119,220,56,230,152,61,47,98,240,160,221,
+7,124,175,194,7,182,120,29,248,141,23,81,65,121,31,17,225,40,223,229,108,159,93,56,240,229,216,127,53,17,81,30,233,49,33,150,197,3,75,39,45,173,95,117,190,108,3,58,252,156,244,62,103,222,127,37,209,134,220,58,205,167,245,34,94,185,111,68,140,80,254,118,9,9,66,243,74,99,150,121,42,245,91,193,33,87,124,218,120,108,69,152,43,160,139,199,21,139,255,143,179,247,248,117,175,201,18,195,254,149,134,22,179,178,1,43,142,188,180,32,192,208,78,48,36,175,213,158,249,32,53,60,158,30,116,247,88,246,142,124,36,31,243,99,206,57,231,156,115,38,31,115,206,153,143,57,231,28,252,126,223,39,245,140,199,173,141,55,151,23,117,234,214,173,115,170,78,62,117,9,175,241,191,30,133,80,184,165,163,167,95,212,209,43,63,24,178,142,96,143,224,214,104,190,112,104,206,41,120,226,216,59,156,248,21,41,116,6,156,238,18,101,174,125,250,217,18,169,119,194,161,14,89,216,138,245,41,1,99,253,125,24,239,251,170,191,192,160,110,143,252,239,185,207,63,196,
+242,15,135,248,23,161,253,247,2,135,255,246,215,191,251,233,175,255,240,223,76,208,255,2,254,57,18,249,199,0,228,47,217,250,223,255,234,55,127,253,171,127,247,235,255,237,231,72,229,175,191,221,237,223,255,230,255,248,205,95,253,250,119,223,191,127,248,219,95,255,195,183,252,230,47,254,240,183,191,251,233,79,190,226,191,89,3,240,175,191,253,251,255,87,106,241,223,254,246,111,254,253,223,252,187,31,174,255,159,210,48,255,244,207,255,236,159,254,249,159,191,129,16,128,200,15,83,194,246,71,111,144,249,195,27,44,17,35,167,246,148,211,225,122,184,45,151,140,47,41,135,64,92,62,140,146,77,78,125,88,163,140,143,227,86,64,102,122,32,152,231,42,109,228,25,82,20,91,198,163,62,152,135,47,115,73,177,153,35,53,110,55,240,172,137,225,208,117,57,25,170,137,84,237,52,88,103,143,146,213,208,69,27,165,83,243,163,65,248,90,220,2,47,79,211,126,242,203,201,196,80,214,41,135,130,240,194,134,251,179,223,85,158,251,197,235,227,241,21,199,120,136,4,182,95,216,
+230,142,227,193,171,246,200,42,157,233,185,201,163,201,167,230,55,26,30,75,191,164,244,18,17,143,57,230,121,146,2,41,93,215,73,51,176,180,144,124,23,20,111,114,237,56,5,96,205,219,15,213,106,221,0,48,78,72,250,95,118,30,130,145,135,87,137,118,77,166,237,140,161,248,2,182,100,175,76,230,238,227,101,45,82,2,191,137,98,27,228,37,15,61,140,48,12,141,9,127,215,46,132,187,169,150,93,69,203,243,58,66,110,178,183,187,90,43,192,106,181,210,82,43,101,181,89,252,69,75,169,106,196,169,170,124,50,151,174,229,230,162,176,199,111,131,78,30,46,207,203,211,20,155,4,194,203,152,169,150,129,209,201,202,234,119,54,215,46,52,69,251,32,165,112,77,135,69,142,68,206,94,138,164,134,211,138,174,250,216,198,4,235,162,125,224,9,172,47,73,138,229,113,63,22,5,82,15,82,15,23,239,50,46,139,37,202,53,216,131,68,36,38,201,100,164,70,58,250,232,232,168,216,40,172,61,76,1,74,247,149,176,52,33,1,4,236,177,38,159,213,194,84,169,41,158,
+145,207,50,245,221,189,24,116,229,32,251,178,52,154,107,196,195,152,42,185,108,247,203,126,158,39,70,8,212,4,124,159,91,89,84,146,130,218,75,125,246,236,60,228,4,8,86,34,88,125,77,67,232,140,194,182,68,87,102,240,26,39,164,52,51,237,70,130,237,247,254,74,121,210,215,135,163,78,227,139,251,204,26,73,251,189,215,78,16,25,224,199,124,244,139,39,184,91,166,251,211,141,195,99,159,198,25,92,212,195,40,30,73,212,71,158,135,239,83,73,12,114,181,151,80,130,107,22,241,138,103,228,54,200,232,136,255,211,195,133,10,124,229,209,115,106,194,194,57,85,73,189,204,113,170,221,143,152,161,81,238,196,160,83,151,117,139,66,1,54,249,138,148,255,208,153,236,99,84,86,58,71,81,188,9,199,82,211,138,83,81,13,239,140,105,63,235,51,24,103,195,96,12,251,25,34,66,78,119,196,166,129,112,170,47,138,138,197,36,172,181,20,42,76,127,117,50,5,104,227,53,67,191,117,181,153,148,108,143,87,15,246,254,72,53,130,62,249,177,166,186,147,246,173,240,124,
+148,4,132,117,229,225,9,197,111,147,93,211,114,207,61,167,215,48,39,130,101,250,16,210,144,164,98,101,62,68,165,185,163,253,69,206,134,153,154,171,111,170,183,111,9,38,189,62,180,17,232,201,98,138,116,83,169,120,76,228,14,14,141,124,188,209,121,40,8,145,5,217,34,78,229,51,170,137,70,17,25,249,7,20,56,200,127,111,52,217,62,160,92,33,42,110,18,175,125,147,238,98,136,3,23,10,243,180,225,149,132,132,217,215,177,176,161,189,31,79,254,222,135,121,191,196,37,237,59,225,19,176,50,33,177,95,25,252,23,156,121,37,238,83,201,215,139,53,217,239,243,129,152,164,102,62,168,41,41,252,132,74,221,25,182,111,67,38,123,47,39,10,173,75,220,22,234,28,4,175,61,64,81,41,36,246,115,205,132,228,43,195,115,212,53,129,55,196,27,113,35,83,9,88,73,62,90,114,150,106,236,118,181,85,249,36,98,23,193,99,78,245,185,69,173,242,117,159,64,203,18,214,50,148,89,188,180,14,63,47,224,8,73,49,46,66,89,57,234,212,126,86,217,248,152,86,
+220,30,243,149,139,174,172,206,156,230,96,252,87,8,212,234,189,248,115,49,137,238,212,243,131,5,13,247,46,146,194,223,171,1,212,224,42,65,76,25,238,96,103,6,235,25,190,136,90,97,179,109,234,47,157,71,150,68,54,94,25,49,244,65,30,247,213,119,79,201,233,144,115,102,21,116,126,70,188,225,47,129,151,212,222,224,174,30,71,136,252,199,35,249,72,73,242,115,115,124,53,216,126,219,155,192,193,61,212,51,134,168,72,220,149,242,133,121,76,221,218,80,115,85,119,212,21,42,210,224,170,170,201,149,234,54,108,18,38,219,120,132,220,231,197,53,13,61,151,17,115,40,39,1,44,148,72,75,169,196,232,137,250,183,120,3,12,57,74,131,44,37,238,133,70,108,117,130,231,11,144,216,177,242,127,39,55,255,167,223,253,238,215,63,87,3,253,234,47,127,250,221,111,254,207,159,254,242,87,127,248,57,42,250,251,191,253,205,47,55,255,160,30,240,47,127,247,219,191,249,15,255,253,95,254,246,63,255,245,175,254,234,55,191,255,195,223,151,206,191,251,237,127,252,221,79,
+191,255,253,159,44,217,248,231,255,252,207,254,233,191,248,103,0,80,24,248,163,92,2,68,253,187,15,66,195,51,196,242,87,203,123,227,106,233,170,76,159,16,85,162,203,78,44,154,173,56,131,164,108,56,12,23,78,249,176,65,191,17,0,198,240,179,6,86,184,111,184,137,114,85,115,82,153,163,174,30,137,72,163,64,169,9,108,137,144,61,194,95,62,196,10,210,140,178,33,172,253,39,46,76,107,112,81,160,220,41,247,141,123,123,237,222,237,150,100,35,209,201,26,94,95,175,162,198,222,186,125,165,103,22,87,242,53,132,187,158,251,211,126,191,7,71,27,5,72,116,143,3,122,67,45,129,82,110,2,227,234,62,81,97,27,71,23,27,118,178,90,164,152,163,26,118,118,93,62,96,228,246,66,66,41,186,221,146,114,81,149,95,52,118,99,223,6,192,236,33,35,129,11,214,125,154,200,164,29,158,191,222,17,225,207,56,17,81,231,138,189,239,87,162,73,232,246,122,147,79,245,68,75,144,126,62,89,10,186,232,178,0,174,142,71,231,186,13,238,174,212,7,84,171,133,219,
+119,223,35,153,8,139,231,128,95,187,14,184,225,84,131,88,75,94,230,74,20,129,222,178,47,196,18,116,96,47,120,126,157,200,5,3,104,155,64,29,112,93,120,141,147,140,207,36,132,101,138,151,170,35,26,123,127,132,85,243,154,230,26,51,29,234,101,208,165,8,80,46,124,157,168,64,159,204,47,255,198,255,8,0,73,109,126,62,137,112,100,20,96,198,119,48,36,36,23,232,64,116,196,231,174,6,12,171,109,64,164,233,84,74,55,152,28,107,69,68,9,174,3,248,34,100,173,176,78,165,29,203,202,46,206,183,157,165,53,243,230,34,53,45,30,16,247,82,121,232,185,201,12,247,117,101,223,50,161,60,29,246,38,254,44,53,2,0,187,162,40,213,23,40,8,161,101,81,148,40,66,22,73,214,110,81,180,240,217,160,10,228,9,169,76,234,252,170,230,203,18,163,82,19,142,88,74,146,177,56,70,130,20,56,192,0,112,249,18,216,18,169,19,93,179,189,57,125,179,24,27,40,166,89,169,41,228,29,190,89,9,161,171,127,244,139,149,140,48,92,114,189,113,155,188,117,
+204,212,13,145,250,19,8,48,252,9,160,145,232,177,18,246,91,80,100,12,36,124,38,10,83,1,96,66,61,196,242,233,27,230,45,149,62,101,236,92,148,156,229,149,52,107,59,75,141,23,18,42,101,237,158,253,92,211,174,22,84,112,44,9,109,71,78,207,217,35,103,211,27,53,35,152,192,104,216,210,155,192,153,120,70,229,243,230,213,13,189,170,93,54,245,77,70,188,213,33,237,51,68,29,81,98,199,40,62,40,125,127,77,99,137,11,60,129,88,213,117,244,110,87,167,131,123,33,246,9,75,77,170,12,175,46,16,23,214,6,29,204,254,20,37,5,59,126,41,244,167,105,125,173,32,21,191,229,121,123,135,231,53,53,229,126,44,125,158,67,166,164,93,49,175,73,148,53,28,136,20,151,243,3,7,57,161,63,238,15,34,170,212,80,16,131,229,131,163,150,120,220,161,111,107,70,111,41,60,11,2,122,133,209,114,174,59,140,57,55,200,217,41,156,17,54,32,33,252,89,26,253,74,231,142,27,90,22,77,99,239,42,156,141,127,243,254,65,193,189,215,131,170,48,171,11,
+67,187,194,139,195,49,105,241,212,91,217,211,37,98,130,182,60,138,154,59,187,126,218,235,129,213,118,191,234,207,154,237,154,172,238,108,88,250,182,166,69,23,98,112,46,194,42,37,62,114,42,65,41,106,147,135,81,215,222,181,119,77,150,112,9,148,145,209,113,183,141,163,216,56,79,70,184,37,164,190,149,198,132,238,196,184,193,144,233,113,103,171,171,29,66,243,142,15,161,210,131,67,98,133,56,52,217,155,78,189,145,88,106,69,245,51,170,163,170,94,18,69,123,249,217,186,190,129,76,150,151,203,116,29,49,138,83,78,159,209,170,43,94,225,230,199,210,82,229,154,228,207,56,162,201,136,239,177,140,156,241,178,185,47,203,198,43,233,66,146,229,231,49,50,250,210,203,237,226,253,32,13,197,62,165,38,181,241,22,161,154,115,161,249,67,161,141,112,189,86,18,201,122,216,53,39,45,56,243,216,37,184,113,155,246,228,18,48,102,219,80,112,49,18,82,88,103,17,96,109,206,194,163,53,116,238,203,249,150,92,158,78,114,179,202,226,100,40,42,47,71,254,52,219,47,22,
+51,89,205,25,76,214,168,86,183,4,145,174,6,145,225,46,205,80,156,240,136,164,40,33,206,7,33,9,226,163,32,28,136,26,143,212,71,207,102,200,118,234,231,57,62,15,233,174,149,146,14,5,8,23,190,71,4,16,194,182,223,74,125,14,57,42,123,16,214,27,177,131,155,230,158,44,219,194,88,225,217,174,167,104,156,150,234,214,129,60,62,52,26,103,16,188,47,65,140,203,226,181,77,127,88,12,223,14,91,155,188,80,192,22,99,123,152,133,233,59,231,100,24,121,154,138,58,79,54,86,77,224,253,137,19,72,200,84,212,251,101,55,214,94,33,132,96,126,147,193,235,191,208,109,178,112,93,138,155,16,172,44,237,120,19,67,169,15,248,124,10,234,131,74,132,174,160,11,191,156,139,115,238,225,20,126,181,27,13,65,62,51,100,121,52,99,55,48,216,78,127,6,196,219,143,9,226,96,83,100,47,244,70,181,120,155,201,103,102,215,187,203,192,136,33,204,83,166,172,197,254,48,218,21,4,177,193,170,167,62,239,151,59,56,174,127,83,8,38,28,116,56,80,18,54,206,
+28,117,240,203,24,108,32,150,109,153,184,46,181,125,62,105,43,186,81,222,171,39,145,119,14,235,89,169,204,66,172,225,77,150,44,171,107,88,250,125,25,88,1,61,22,216,8,148,130,136,174,19,24,223,213,227,108,97,91,88,101,61,54,114,76,128,84,156,30,237,220,44,85,123,203,146,163,57,191,25,160,92,136,251,11,209,124,178,98,215,176,85,40,180,178,11,99,156,162,228,243,32,142,2,138,5,109,249,212,150,139,24,4,95,168,21,146,197,143,55,170,24,211,204,226,188,229,36,246,115,182,28,97,76,90,30,177,255,188,203,246,174,211,225,54,251,138,66,220,113,121,144,214,63,47,34,83,187,145,150,62,222,202,87,3,225,45,53,54,110,207,60,167,209,46,71,126,75,33,169,97,191,82,9,227,104,164,172,118,128,39,186,214,254,204,60,83,50,120,40,55,93,76,68,43,97,15,209,100,187,143,183,147,84,177,23,197,206,77,235,227,20,181,14,66,117,6,244,242,147,54,159,74,47,83,242,43,126,31,177,236,27,142,13,50,20,117,37,227,136,251,37,93,60,113,35,
+181,183,255,144,44,243,150,98,237,52,53,219,184,201,154,212,36,219,62,22,16,222,81,45,177,192,80,230,187,23,187,133,215,103,149,22,25,143,172,162,14,31,17,38,208,119,113,244,221,126,141,219,176,63,152,208,220,0,155,143,253,94,175,64,115,95,5,161,249,176,24,52,112,157,74,85,59,18,125,236,152,139,151,129,22,130,150,105,25,81,169,13,215,116,129,223,167,161,22,185,76,144,126,133,21,169,175,119,5,191,93,136,186,222,139,97,148,83,63,126,245,203,249,43,3,37,126,52,247,157,54,44,203,205,31,247,185,45,133,60,129,112,209,98,69,200,48,157,77,100,123,205,134,227,13,108,251,85,19,205,134,41,222,136,228,65,236,154,185,124,79,253,117,251,74,38,50,137,214,94,67,197,238,3,195,153,164,60,134,104,196,251,38,143,131,105,88,15,244,247,81,98,252,24,74,96,169,184,249,137,124,40,221,39,102,117,159,2,20,195,161,167,235,139,119,188,32,9,163,2,158,250,210,175,144,81,75,100,223,61,175,252,252,15,124,39,230,33,165,193,119,201,113,215,196,169,
+249,215,13,8,104,101,108,138,77,94,19,107,214,217,7,244,227,194,198,84,191,224,203,3,113,182,184,138,232,135,77,31,97,39,20,113,137,209,19,24,181,186,187,68,142,35,142,162,160,135,131,0,241,11,9,109,61,46,227,242,52,127,197,11,2,106,70,210,62,25,11,64,238,177,179,183,151,164,26,219,186,229,246,204,198,66,96,209,242,128,24,118,133,246,83,93,139,185,27,166,19,74,16,17,187,134,200,126,241,236,56,92,120,100,17,219,163,95,19,203,87,13,14,241,206,71,78,54,126,220,39,237,185,106,101,253,95,11,255,212,239,20,138,153,187,161,232,235,131,6,66,82,99,213,204,221,241,192,181,133,145,207,89,18,230,92,138,3,147,96,231,89,180,75,23,51,120,237,16,109,219,203,253,154,243,156,220,210,105,33,142,138,132,137,231,194,152,162,146,45,237,226,208,133,16,198,105,175,117,58,22,194,21,43,184,7,20,176,108,64,131,239,187,233,223,27,202,15,89,202,96,217,109,74,64,153,17,24,110,252,177,205,155,129,22,250,36,43,35,215,39,202,136,203,212,180,
+95,212,44,79,5,61,57,76,170,181,104,215,13,211,176,196,68,45,189,130,126,53,33,73,190,83,173,70,56,27,210,240,47,35,61,89,116,250,203,97,79,226,77,101,49,230,86,224,146,184,219,139,10,45,92,50,245,230,82,131,58,107,53,42,71,83,60,7,238,225,193,218,91,87,25,20,110,149,75,25,145,109,10,212,112,177,52,21,103,120,232,116,221,131,142,7,143,2,242,113,109,50,234,167,58,119,222,254,38,171,2,94,96,18,136,193,241,200,195,23,134,3,56,234,130,251,109,220,11,12,245,171,210,97,15,212,109,231,208,161,5,15,184,237,235,0,67,37,242,71,141,251,141,238,53,94,198,147,95,46,94,118,208,81,78,210,6,122,226,253,161,216,180,180,53,84,155,105,87,116,234,51,236,241,114,96,25,252,214,131,87,174,244,204,3,132,91,35,35,65,208,185,144,201,151,244,177,111,166,129,13,57,25,202,45,237,15,244,215,199,26,33,197,201,247,123,237,179,232,79,210,67,101,186,73,55,100,237,134,211,169,97,56,45,209,71,26,251,65,247,56,100,31,142,34,14,
+40,50,112,108,120,243,51,218,219,51,89,124,138,220,200,64,179,76,53,93,205,234,151,216,3,175,44,181,218,35,20,249,229,140,37,155,170,190,194,59,75,244,197,189,232,183,70,250,58,233,113,248,94,207,100,221,188,170,77,20,180,234,75,248,181,195,120,14,215,209,202,87,183,162,152,228,29,148,145,229,43,223,99,248,189,233,112,242,82,238,0,170,31,57,53,19,118,163,215,82,242,48,186,250,192,73,37,144,121,235,21,0,86,47,99,101,46,194,184,75,63,29,48,116,152,156,56,192,151,211,153,235,105,245,23,249,117,128,106,60,139,241,68,43,137,72,129,143,69,230,98,40,146,46,7,196,192,245,236,49,20,144,236,98,226,117,152,214,198,154,15,244,97,46,9,131,156,133,105,167,153,31,10,4,198,254,167,124,81,160,93,27,95,42,104,69,117,123,205,13,7,116,76,71,185,46,133,132,220,160,47,188,158,213,87,116,5,220,241,234,72,15,7,82,21,249,196,86,52,232,61,152,82,92,150,172,56,3,4,75,30,189,62,209,13,205,121,103,138,94,187,44,237,210,240,234,
+75,54,230,15,95,110,92,31,220,111,117,158,255,178,61,86,253,241,247,201,24,100,236,61,34,161,224,222,138,218,154,131,176,162,67,133,140,118,100,39,107,95,31,176,221,119,103,79,204,10,191,201,141,88,172,125,178,39,183,97,169,234,206,88,221,239,140,180,110,141,148,103,30,104,190,171,209,27,56,196,96,48,203,235,161,21,63,187,249,251,121,53,43,229,31,110,218,34,128,98,124,56,163,40,246,146,91,46,211,168,225,102,108,27,38,234,251,181,169,177,24,170,158,14,77,175,253,11,153,22,230,83,11,62,134,40,169,54,97,151,150,129,133,137,239,234,188,49,191,216,183,46,2,143,33,171,188,143,186,34,60,28,35,23,106,7,33,147,53,232,129,169,5,85,187,64,219,184,76,87,207,228,97,55,250,185,96,86,44,30,29,237,172,47,96,63,108,176,128,246,200,162,224,54,192,189,230,18,196,139,109,89,230,76,127,101,93,152,40,153,83,65,0,21,100,134,122,97,210,157,14,186,83,222,62,227,126,188,115,220,248,164,65,89,97,216,83,16,75,95,232,222,192,80,47,27,
+15,84,74,190,32,75,123,98,53,21,114,52,128,72,52,17,14,88,208,194,48,148,37,10,123,214,52,28,237,219,202,240,141,110,47,103,105,12,147,217,58,29,221,3,143,3,133,71,201,52,167,58,26,2,173,76,184,68,221,82,76,150,99,206,150,254,182,173,162,95,1,251,19,25,114,250,81,243,144,39,136,19,158,34,149,61,253,99,145,219,79,210,175,91,203,171,183,141,117,158,200,75,222,160,187,101,189,104,31,113,225,102,66,185,204,32,7,134,139,156,25,150,54,199,98,59,192,152,101,90,131,170,119,70,46,17,91,164,154,81,151,249,187,98,137,212,117,153,58,187,29,248,25,68,135,243,217,83,89,192,145,21,130,99,102,201,122,174,154,209,218,93,93,85,69,31,149,135,7,97,61,10,187,64,237,134,132,32,233,35,228,55,232,115,154,224,10,192,148,15,119,69,121,186,72,97,207,59,55,181,132,153,10,247,228,13,10,161,68,136,41,140,212,197,52,117,122,119,30,5,38,136,180,80,204,195,198,227,131,241,63,187,33,36,225,157,28,68,185,241,58,77,39,214,112,151,
+3,160,128,26,236,122,28,194,171,130,34,207,150,178,165,151,30,15,235,176,239,96,34,93,22,200,129,161,135,185,87,114,148,53,74,142,233,225,66,183,175,89,251,102,143,104,7,186,159,105,73,202,51,143,9,120,18,223,78,146,25,185,229,191,108,83,108,255,169,181,221,83,134,86,61,115,51,141,53,187,93,228,238,62,202,222,8,240,52,27,61,221,9,9,103,155,128,112,35,130,51,208,59,141,185,46,102,182,134,136,216,125,88,128,83,18,12,102,117,80,102,28,175,10,181,253,37,16,189,183,209,29,196,240,67,247,108,184,169,46,69,139,124,200,146,18,99,251,62,249,144,74,176,41,123,182,175,53,13,146,12,8,123,224,172,123,45,180,227,10,70,230,62,47,244,222,114,127,161,137,12,73,204,69,116,106,165,90,59,69,32,116,8,150,45,131,149,244,100,64,218,6,110,140,89,187,175,13,157,158,111,157,73,126,219,133,190,134,17,74,11,193,57,210,242,242,40,220,4,54,91,119,87,2,179,75,96,192,198,47,72,242,196,85,133,140,36,114,107,27,217,107,20,34,203,151,
+173,63,124,235,247,209,193,111,147,107,18,53,160,162,86,187,250,42,174,230,236,101,94,68,204,210,67,132,228,48,148,206,145,96,213,165,207,164,67,74,107,243,250,4,95,199,131,19,208,112,50,105,31,7,211,83,72,23,245,98,38,49,188,193,86,196,0,182,227,27,67,252,92,75,181,90,69,48,118,196,126,73,198,253,82,18,170,150,68,104,45,77,141,193,100,94,25,14,207,199,147,148,93,224,221,66,238,104,146,130,81,243,83,24,102,136,134,173,186,13,92,226,106,175,111,36,38,14,209,228,96,108,120,143,144,0,181,114,38,69,11,55,108,91,78,250,140,245,99,55,187,69,227,114,228,65,4,123,59,75,27,209,49,122,57,198,169,59,216,128,145,238,115,2,134,128,253,234,199,13,7,177,205,185,198,121,35,221,239,115,130,126,52,88,225,195,189,134,59,27,251,141,111,103,251,216,248,22,60,19,18,227,73,70,166,83,132,119,204,17,87,90,67,213,238,81,154,153,69,189,228,187,250,15,7,231,166,187,108,148,150,8,223,14,25,157,96,73,177,178,100,142,138,30,16,110,
+137,143,21,64,61,123,65,243,184,200,251,106,41,39,50,100,218,171,195,204,57,28,241,37,184,13,29,55,205,116,230,195,5,69,206,150,122,60,131,185,202,11,19,181,183,106,50,218,40,181,180,120,220,238,176,193,139,139,169,171,249,198,5,223,123,203,74,94,55,111,49,114,173,96,169,132,104,162,21,75,217,233,20,25,69,118,131,84,240,33,198,70,205,86,59,41,141,71,69,197,244,248,105,174,250,124,206,199,109,53,64,101,83,153,39,210,118,150,65,233,150,250,141,234,58,243,189,109,44,219,135,90,14,218,157,241,204,167,148,87,226,251,194,105,180,181,28,20,244,197,100,210,252,136,183,27,56,215,82,195,58,121,48,245,84,77,148,244,99,243,163,238,80,102,245,65,133,44,70,51,137,84,83,229,11,131,143,242,174,54,187,25,19,90,54,133,1,163,152,175,116,165,30,162,38,78,207,10,32,44,56,17,65,6,251,72,176,236,218,156,117,202,92,86,0,77,4,205,71,116,19,220,100,35,155,161,167,146,111,97,46,177,230,178,15,222,204,223,213,74,20,99,254,185,25,79,
+125,148,0,162,164,39,201,23,172,116,41,114,51,125,177,147,67,69,169,166,169,54,154,27,115,189,120,39,126,212,221,105,1,112,1,89,60,141,183,149,11,204,85,251,81,102,11,109,26,198,6,65,216,198,22,130,8,11,96,17,16,241,251,106,1,158,166,120,46,204,194,59,191,140,91,58,154,203,198,92,232,64,93,231,199,114,178,113,95,13,203,119,83,43,243,102,160,143,190,31,253,64,142,143,246,37,216,199,117,194,126,192,225,62,38,45,128,93,189,161,169,97,236,138,95,207,158,52,62,206,49,78,224,99,189,224,77,192,155,142,11,42,35,25,179,33,3,126,43,236,219,209,173,240,100,101,104,56,65,28,33,120,133,105,164,12,18,174,83,75,135,0,5,160,44,86,156,217,79,30,90,203,175,160,55,17,179,67,219,221,46,94,96,188,125,186,127,198,63,30,196,218,155,2,1,35,189,250,55,4,65,204,59,165,93,90,187,66,208,69,250,235,157,144,174,183,193,204,219,93,127,255,9,148,65,195,208,19,56,223,31,35,149,210,210,29,87,93,40,18,212,134,231,224,242,142,
+213,32,65,134,172,172,100,149,103,65,189,76,162,106,109,47,191,155,238,37,136,87,177,51,27,189,133,19,44,34,230,44,156,6,71,25,248,120,248,139,72,18,127,247,216,109,225,7,4,193,137,32,250,14,13,26,180,12,236,177,156,116,88,111,195,205,194,84,189,228,247,181,151,20,175,13,49,251,139,129,151,161,195,88,12,20,125,188,42,212,205,167,238,236,39,200,252,187,215,41,211,97,124,117,5,48,55,131,211,27,161,210,78,175,160,137,125,91,3,63,211,55,13,83,168,246,180,251,36,246,61,82,233,137,19,232,122,219,116,63,12,235,7,190,100,149,136,144,135,70,34,13,77,102,140,59,222,81,185,19,121,41,212,133,89,60,248,44,75,102,209,40,102,150,102,122,80,97,208,254,84,103,132,218,52,140,82,53,54,222,0,130,210,110,204,242,141,116,139,249,242,82,179,221,190,198,50,20,79,112,77,221,231,190,47,65,19,170,165,135,213,172,140,195,98,177,92,164,46,232,199,2,136,1,132,163,72,24,125,225,206,8,194,62,168,227,84,119,17,15,111,158,69,68,16,130,
+52,239,177,143,77,121,152,221,142,179,221,176,197,216,40,110,50,153,113,214,39,224,53,161,195,253,110,183,168,83,58,224,104,241,224,88,46,170,162,235,216,56,38,81,191,145,255,158,235,122,184,207,231,65,59,192,125,255,129,56,193,21,42,13,47,203,7,133,29,24,77,98,252,254,126,29,1,209,147,134,252,149,97,68,32,130,80,228,220,180,208,39,11,178,86,176,42,182,149,123,54,54,213,98,138,207,93,83,55,104,255,112,33,77,76,40,154,204,50,110,106,143,78,184,220,84,54,142,223,112,26,162,240,158,71,194,14,44,40,78,56,242,10,66,223,116,78,113,168,89,147,233,125,180,4,78,230,161,170,94,74,28,178,116,173,80,139,181,138,112,179,252,192,178,48,243,190,34,14,104,98,28,158,130,82,23,175,61,178,245,209,79,76,93,153,168,72,134,89,128,48,242,3,101,160,175,10,88,214,16,98,244,165,29,152,207,17,183,73,124,231,20,130,180,226,55,182,186,86,242,34,148,209,23,31,90,193,97,91,35,197,97,208,216,81,247,70,214,84,11,186,214,43,206,23,19,
+190,95,225,9,160,200,181,203,227,219,111,194,249,80,165,53,169,195,70,208,85,246,183,89,220,158,29,227,186,225,93,84,190,149,116,231,162,209,189,252,234,124,119,7,217,191,105,145,24,115,72,222,178,147,104,172,237,215,65,154,120,9,50,213,162,172,89,92,195,60,101,220,192,75,159,67,87,169,195,81,193,102,152,80,1,4,209,0,222,194,178,189,108,95,253,87,250,38,117,28,101,75,116,91,15,65,147,133,184,161,209,72,253,38,56,173,135,148,140,191,141,168,227,242,121,206,240,92,100,237,219,129,203,61,189,47,88,59,203,28,184,150,193,130,124,191,154,102,112,23,144,196,111,114,206,40,207,87,65,170,1,101,51,228,60,242,73,245,178,1,42,151,97,220,184,59,62,112,28,166,148,159,24,51,17,7,7,168,243,182,95,251,49,175,75,7,163,240,189,194,130,84,239,109,148,173,193,126,217,232,228,95,182,59,86,34,216,124,179,253,134,204,160,102,27,47,36,247,32,226,156,217,87,21,90,151,175,128,235,21,12,23,118,97,188,217,49,47,104,180,62,118,183,113,93,75,
+183,255,109,97,136,62,234,190,219,65,252,110,131,41,22,134,74,189,80,158,213,31,175,118,192,60,137,182,12,55,139,76,221,219,138,237,223,156,13,77,128,26,194,54,229,35,7,125,149,151,164,104,187,107,192,211,214,42,44,245,209,120,234,131,8,108,80,113,198,148,25,111,211,191,119,210,247,95,255,252,239,149,255,48,174,252,55,255,37,122,252,115,189,237,79,127,253,31,255,240,159,254,239,95,253,246,111,126,156,18,252,7,57,192,255,210,239,223,252,245,95,254,230,47,126,28,33,252,147,225,230,255,241,159,252,217,191,248,115,0,200,13,196,255,136,54,47,255,88,117,91,211,193,3,90,38,54,220,77,244,77,185,242,59,170,3,201,65,245,240,119,203,39,46,235,244,122,75,176,51,52,180,230,246,248,149,148,168,235,59,45,207,73,150,198,230,195,64,117,217,237,69,35,140,38,241,194,215,229,154,42,159,226,180,62,48,185,105,64,17,139,175,103,28,240,17,142,126,140,166,231,157,52,190,203,219,146,221,111,23,86,127,244,76,112,128,7,11,31,176,147,26,178,228,188,155,
+32,255,104,66,63,189,156,185,240,148,112,126,81,9,34,101,115,37,178,123,50,18,71,148,21,202,97,195,125,217,236,196,96,44,49,251,104,106,139,72,79,136,63,26,44,167,31,13,240,147,92,157,17,184,119,64,246,101,179,162,141,113,197,254,206,14,7,50,105,42,6,140,186,244,224,35,71,69,212,44,140,126,79,237,14,120,235,129,116,140,63,125,52,245,255,7,161,255,246,247,255,233,167,223,253,201,92,235,191,250,245,239,127,250,213,95,252,213,175,191,7,249,49,248,127,248,71,127,243,221,247,63,252,163,63,166,116,255,234,55,255,251,79,191,250,87,127,251,135,63,252,246,175,255,187,255,82,208,243,171,159,254,240,23,127,55,246,255,242,155,191,248,79,255,238,167,255,235,31,38,140,255,184,126,255,195,191,248,199,127,246,79,254,252,95,190,129,108,0,221,143,5,76,255,49,11,75,119,77,137,221,119,226,251,9,209,95,121,105,199,55,165,217,242,89,99,43,22,115,124,74,63,145,206,3,136,25,118,30,144,56,129,88,198,231,39,26,15,206,49,224,48,238,39,182,131,
+5,227,130,254,246,243,17,237,158,31,201,244,45,149,154,235,87,107,237,242,126,123,140,28,43,166,117,55,52,23,23,183,24,248,231,180,55,140,87,4,99,145,58,134,139,77,77,136,45,101,138,207,133,157,138,79,229,198,245,48,189,124,92,81,205,156,58,109,93,142,161,2,103,253,92,215,116,137,95,2,139,215,231,154,38,228,155,217,172,235,99,20,190,230,120,229,81,36,83,114,137,65,238,124,31,27,239,190,38,24,253,33,180,27,69,225,237,3,68,168,127,211,102,48,65,30,24,40,163,140,29,226,124,36,234,45,80,12,248,152,84,136,105,150,89,116,185,178,56,27,185,247,47,188,148,47,227,32,67,134,188,149,30,131,113,248,82,129,184,133,219,173,115,182,179,98,246,118,234,53,228,84,171,99,39,183,232,71,186,249,84,228,175,72,64,251,64,141,70,26,195,76,247,119,157,56,85,16,222,123,95,26,15,194,196,67,141,159,214,242,137,34,17,48,132,122,167,41,247,197,227,117,185,51,145,206,153,74,183,120,168,180,119,79,245,241,223,86,190,42,151,43,183,115,238,116,
+128,41,81,221,40,156,208,83,35,99,46,129,17,147,137,139,46,36,117,101,36,68,54,128,70,245,85,70,178,101,53,15,36,177,210,140,155,100,43,148,167,54,190,109,48,90,207,159,173,153,186,13,167,129,208,176,238,76,74,138,29,94,118,127,163,0,182,120,76,122,156,96,173,106,217,54,242,192,233,141,29,93,244,91,83,161,54,133,126,238,103,97,51,65,118,222,67,100,48,35,129,228,223,135,44,215,53,39,7,35,187,101,81,163,25,133,216,237,5,117,182,133,94,249,148,40,220,222,44,47,81,190,207,152,113,77,73,221,140,201,99,204,98,152,199,67,43,155,248,232,16,238,83,96,104,7,36,152,219,23,61,196,31,218,107,86,197,112,30,207,171,198,205,124,104,142,45,187,106,159,64,178,154,90,103,129,191,51,224,112,137,159,122,21,250,170,149,152,225,45,47,55,78,42,76,195,192,210,123,86,74,22,52,242,82,2,222,14,243,112,164,65,149,47,240,209,116,65,103,95,208,1,65,236,203,93,11,144,227,151,26,19,79,64,132,164,108,169,35,238,106,12,95,106,124,125,
+253,89,183,81,184,22,130,189,77,126,20,133,24,17,15,255,8,85,99,53,185,0,144,207,243,136,208,54,147,178,26,205,146,156,231,62,191,14,61,183,212,225,25,239,170,80,252,255,117,95,253,184,58,207,248,149,113,80,63,172,108,141,149,1,123,167,27,7,239,78,171,150,236,78,119,91,181,182,133,20,243,199,77,248,87,44,84,141,36,209,43,116,148,199,218,236,62,118,6,124,156,97,66,233,166,147,114,13,34,83,6,8,53,101,221,161,178,21,122,11,14,76,149,240,223,227,12,86,81,248,66,136,115,204,46,239,60,189,49,57,219,7,59,245,2,62,92,219,186,87,47,175,142,166,201,237,123,11,228,26,25,234,28,137,132,211,179,41,24,158,151,118,135,110,159,196,39,249,86,60,155,237,106,80,146,131,121,118,50,222,11,228,100,182,165,51,19,27,80,17,73,152,203,168,63,215,80,98,189,30,219,137,204,247,243,122,48,84,93,65,113,44,194,232,59,22,181,233,251,19,180,93,119,92,5,98,218,224,146,28,72,59,111,135,217,247,251,100,196,68,230,198,206,45,210,230,
+83,103,129,70,155,132,50,35,41,247,212,158,49,57,25,69,241,234,76,224,119,136,145,48,51,131,30,231,43,129,118,114,187,55,21,171,219,80,88,217,225,114,67,1,63,192,150,236,178,184,104,138,245,1,74,25,249,158,8,171,105,246,114,200,211,150,103,156,122,197,187,233,35,167,155,204,86,239,203,182,151,47,247,177,92,137,234,109,69,26,226,199,100,0,61,92,86,91,11,83,201,92,98,182,120,41,180,79,196,89,105,241,202,59,134,216,249,57,0,80,252,23,130,246,161,44,195,183,204,16,113,76,2,92,53,243,25,252,227,195,190,201,139,190,153,86,1,232,159,72,117,61,202,232,155,245,242,30,252,35,232,3,71,195,208,145,172,178,195,137,211,73,238,100,10,60,55,222,58,189,43,46,102,59,82,210,17,195,165,106,94,169,168,15,129,102,176,247,91,21,43,36,128,148,11,147,60,114,214,114,234,239,111,91,67,131,253,64,209,69,198,234,156,108,171,75,160,252,96,253,48,106,255,94,247,52,216,90,190,3,155,114,16,53,251,119,66,244,191,202,192,255,245,55,63,253,
+231,63,230,94,127,17,170,191,254,171,63,252,244,187,31,153,216,223,254,87,193,253,171,255,249,223,255,155,159,15,169,252,254,255,43,68,127,12,240,39,149,224,63,254,151,127,246,207,255,217,255,136,0,249,129,157,31,181,146,220,95,132,104,249,71,206,149,74,42,98,104,39,5,131,70,32,36,147,194,93,130,192,98,5,239,98,142,219,64,71,71,194,40,122,208,56,70,29,237,122,24,131,175,212,163,227,195,252,28,125,180,24,244,32,164,163,162,55,178,185,92,61,200,202,229,194,81,241,194,241,49,185,6,64,45,11,253,186,34,187,10,167,49,232,64,42,126,73,90,246,226,225,86,106,187,138,175,246,206,253,112,49,111,83,230,201,57,122,200,94,101,151,100,218,10,151,197,202,7,228,29,4,244,117,216,9,8,0,0,233,144,165,82,0,96,253,30,67,126,56,76,36,185,21,1,0,180,3,144,205,205,55,93,124,181,47,48,246,249,149,250,208,235,187,137,76,54,4,70,98,252,223,27,3,15,80,91,189,139,202,172,206,27,11,117,193,45,5,213,215,113,70,96,139,60,69,
+220,117,244,14,222,251,165,98,3,235,197,241,120,74,163,210,96,67,20,153,166,19,185,232,224,227,98,214,16,184,146,166,240,120,125,80,9,201,74,30,249,75,177,31,166,32,194,118,237,61,1,149,245,61,220,61,183,98,227,171,119,198,172,118,43,101,101,76,35,4,72,48,203,162,7,197,188,147,186,69,177,151,112,184,118,42,110,110,188,242,174,9,53,116,27,43,54,11,130,68,253,128,40,244,70,168,198,22,28,73,253,62,139,48,33,40,248,80,226,133,167,225,237,21,112,205,145,30,119,247,222,95,178,197,13,179,244,118,69,130,118,168,232,176,228,147,89,101,166,5,107,97,134,2,63,169,51,171,38,155,117,51,180,95,219,225,81,190,161,82,153,26,210,253,152,69,193,207,78,216,93,101,152,186,46,226,64,212,99,158,150,165,0,74,64,10,167,73,72,145,169,138,151,203,134,60,199,199,159,194,173,17,207,156,177,60,122,220,25,42,211,243,9,193,163,201,182,0,180,117,11,26,13,170,1,81,80,239,164,162,75,10,133,175,69,54,115,29,3,55,235,96,183,79,99,87,
+235,80,150,34,112,145,34,129,242,158,41,203,80,229,77,218,108,119,161,139,175,79,51,116,82,207,71,6,197,201,81,165,135,124,64,232,75,8,68,57,140,235,75,78,73,147,23,99,76,215,246,230,74,77,6,106,37,158,237,110,236,48,148,38,58,248,173,79,87,243,245,74,221,97,133,107,213,206,7,90,247,211,198,183,140,147,197,16,235,138,69,249,125,110,248,85,42,188,201,123,179,164,71,57,49,68,178,102,207,126,151,74,207,89,59,63,68,89,33,51,40,156,65,96,18,181,156,187,142,15,252,34,134,25,121,28,219,210,33,105,53,58,78,227,65,91,42,7,203,9,240,217,94,94,27,72,105,132,204,242,154,72,1,20,82,27,175,39,70,238,33,44,85,46,34,63,242,60,198,198,30,114,4,139,119,48,54,56,98,67,149,158,204,15,0,142,180,204,178,97,136,101,25,199,14,212,117,120,166,160,247,34,79,182,126,0,11,97,33,105,213,100,184,99,0,240,74,80,46,147,3,199,11,15,143,161,72,143,53,79,134,44,115,89,71,12,136,74,45,42,143,83,142,162,203,193,
+59,117,129,26,85,100,77,20,11,133,252,238,212,168,134,109,49,27,30,144,227,217,238,125,91,1,35,132,182,125,227,66,21,154,42,97,204,250,206,17,201,156,234,94,229,52,94,37,91,160,60,67,220,90,34,240,230,98,199,70,133,69,165,205,7,5,206,164,85,77,246,46,91,37,246,142,103,89,16,197,74,80,163,224,188,75,74,143,231,22,40,230,115,22,41,245,72,12,151,240,146,202,174,189,64,4,51,36,18,2,0,153,23,131,71,85,231,23,182,219,133,160,63,157,84,40,11,49,156,244,223,13,24,134,27,42,71,164,248,224,48,33,19,130,34,119,86,58,11,134,209,132,238,193,79,235,88,110,231,94,202,106,131,152,234,132,242,104,100,16,9,2,208,2,12,118,82,146,135,238,200,191,25,106,104,188,177,67,150,85,82,168,114,6,78,200,55,128,119,207,107,185,28,251,36,144,96,28,65,70,85,81,91,251,216,239,69,70,142,199,122,20,134,231,169,48,196,191,136,245,236,90,157,79,185,82,200,55,235,194,184,194,23,25,89,197,245,251,23,221,124,221,53,179,42,44,
+49,37,206,176,5,35,126,244,160,54,67,218,189,224,86,82,205,174,157,145,21,242,179,91,202,150,189,33,213,86,126,53,137,113,50,254,30,199,6,9,209,42,254,137,231,202,203,248,238,188,40,234,8,170,166,195,124,62,61,45,152,218,77,113,67,163,201,147,85,22,197,201,59,150,162,124,159,150,103,72,56,8,152,23,202,253,98,62,197,64,113,48,91,126,138,5,15,32,221,17,149,129,149,133,29,162,132,11,59,128,128,252,229,55,254,85,205,12,20,141,214,113,73,71,133,134,26,220,184,85,89,122,224,152,70,245,174,95,122,20,57,60,145,99,92,143,87,140,155,71,206,26,28,242,58,102,240,252,22,130,4,226,176,81,45,201,113,47,216,248,174,162,167,87,197,217,125,254,48,121,168,239,169,65,44,164,239,136,91,250,48,35,91,1,147,17,174,19,66,155,186,116,126,18,223,45,167,248,164,176,39,17,35,89,91,11,156,162,148,216,172,175,177,9,171,238,244,167,213,65,140,189,82,12,205,70,170,156,76,10,72,88,178,168,70,19,191,219,111,195,130,109,219,24,196,118,
+151,34,9,82,148,145,68,166,226,192,100,50,143,102,51,121,170,92,94,183,173,237,219,166,119,137,197,41,234,109,13,167,176,240,229,227,54,131,98,32,124,226,160,126,186,243,122,215,6,96,84,237,109,56,241,188,175,222,107,126,109,51,169,81,189,215,142,204,218,32,101,138,46,235,135,205,167,25,117,53,178,142,161,242,154,216,10,249,45,184,109,22,46,137,203,147,192,83,115,152,155,127,153,165,22,225,188,54,133,9,223,202,200,111,223,69,175,195,59,62,194,222,74,219,133,5,230,179,215,254,194,96,130,104,6,174,138,250,37,195,176,153,16,225,94,105,108,220,240,221,184,101,160,44,38,196,158,189,102,145,22,232,183,195,61,58,115,128,12,62,236,73,28,202,22,51,167,236,228,83,40,58,54,58,105,60,4,8,132,144,139,253,91,250,54,253,38,231,251,95,118,57,43,180,175,200,17,20,210,82,132,200,66,157,114,233,53,81,107,52,99,164,60,39,85,187,234,138,59,186,132,134,248,72,69,49,51,131,183,233,129,93,6,242,108,30,247,51,37,105,120,157,35,134,107,168,
+98,165,166,5,44,169,198,25,19,248,188,200,167,91,165,164,226,33,32,21,168,44,193,45,185,90,121,239,185,252,76,63,163,216,175,129,67,131,181,140,134,207,138,42,25,228,81,148,175,250,162,34,185,51,118,162,5,213,147,162,108,199,129,208,104,126,204,199,85,145,31,181,26,118,45,32,26,21,241,35,21,243,187,221,150,232,85,148,31,177,15,10,74,187,141,22,249,54,43,109,88,43,249,42,239,67,68,177,236,93,23,140,218,30,214,64,46,248,235,131,190,216,10,224,73,240,17,170,118,219,3,33,194,196,16,226,195,243,5,183,96,129,25,24,79,78,238,6,129,161,247,111,174,2,104,176,222,16,16,224,69,102,96,217,111,165,245,86,32,6,1,0,39,86,75,18,93,87,224,245,30,110,44,10,23,152,165,127,187,16,174,152,28,126,254,196,6,43,204,112,172,125,42,228,229,248,13,243,49,207,11,210,190,170,157,1,150,10,100,183,195,193,54,124,156,59,202,167,169,162,244,126,214,231,154,205,122,183,44,10,107,90,254,215,123,200,77,61,79,141,248,152,47,180,57,128,
+163,33,136,37,181,173,53,19,241,118,156,183,254,214,91,28,205,69,106,112,219,121,114,63,188,247,242,155,49,195,86,22,228,21,236,7,203,194,185,192,145,99,246,218,202,213,188,6,107,230,217,10,162,231,239,190,161,4,19,152,119,34,183,105,190,2,224,145,222,14,165,170,119,29,108,162,73,118,11,111,253,101,149,190,182,143,101,194,90,28,31,197,189,227,82,111,47,33,95,30,66,41,236,112,26,137,44,104,218,154,26,160,223,110,180,248,13,113,93,184,239,196,145,224,69,241,224,170,104,11,36,108,93,156,41,55,3,63,159,41,172,13,145,119,199,21,68,28,220,219,252,152,206,45,141,101,234,141,143,248,90,20,176,170,26,201,130,157,150,183,70,176,128,201,78,189,169,248,239,70,94,46,3,86,244,38,211,74,241,221,167,92,131,8,10,210,97,94,23,40,18,221,227,107,34,102,201,192,218,94,126,8,232,203,99,70,124,138,104,233,231,8,66,161,83,94,149,105,190,4,44,148,175,130,208,54,35,93,131,152,70,213,57,247,176,118,183,201,123,93,213,72,101,110,223,94,
+68,172,157,185,177,74,50,81,116,5,123,144,227,198,119,43,16,245,90,145,136,184,248,243,20,130,118,102,177,168,222,125,100,158,78,40,44,80,179,42,255,216,232,124,136,210,37,40,241,59,220,140,32,138,160,250,12,138,214,180,10,181,80,152,115,136,210,244,41,165,239,89,157,19,68,59,167,196,231,207,171,155,191,202,22,238,129,133,184,121,81,228,10,225,47,138,48,189,57,201,187,60,76,110,88,241,107,234,124,188,132,91,76,68,81,74,97,116,131,51,203,247,130,229,114,152,204,216,107,235,36,246,250,53,38,130,133,117,34,13,209,37,117,37,2,102,234,237,136,172,241,62,196,111,25,169,203,172,232,41,37,226,116,198,212,156,22,225,172,177,161,154,244,213,14,89,57,52,63,214,104,35,149,147,2,64,136,13,59,104,210,162,21,241,54,164,36,203,10,65,232,47,77,103,26,135,200,127,94,108,120,142,154,19,0,211,65,58,58,135,199,207,151,22,85,147,244,13,85,207,132,134,188,170,104,80,129,208,205,198,118,82,243,139,1,132,192,254,108,0,129,24,247,217,129,185,
+198,60,241,95,157,184,230,77,183,143,162,35,66,76,90,24,57,147,85,99,143,240,126,185,61,115,139,27,194,178,92,170,106,118,203,58,206,86,188,165,143,163,151,217,225,94,237,212,141,164,99,75,49,175,146,168,163,70,230,220,189,105,153,254,42,164,16,138,84,232,104,62,63,211,187,243,109,102,233,155,72,246,179,1,50,9,40,248,63,204,15,138,24,165,70,188,1,0,72,168,21,161,7,231,179,93,42,48,25,210,140,85,133,12,17,0,216,143,139,196,86,19,217,106,174,102,134,181,239,7,63,33,0,211,38,178,182,160,190,55,246,11,88,252,6,199,182,94,156,3,204,169,192,18,91,243,66,122,60,118,53,88,225,49,189,197,194,92,168,59,222,126,182,122,90,10,201,47,229,110,5,158,131,107,133,167,250,67,179,228,6,226,227,162,17,108,92,179,72,232,180,35,155,59,151,130,112,34,240,19,245,174,202,169,67,36,66,74,160,96,52,171,44,146,6,49,124,42,148,210,125,42,106,249,116,240,234,196,143,27,105,45,237,230,27,124,161,86,171,200,234,45,252,208,28,215,
+84,235,220,254,100,165,128,4,30,10,20,209,122,120,244,162,222,22,246,238,46,107,151,152,23,229,40,70,149,240,190,91,68,193,10,77,97,159,226,70,93,166,116,70,98,216,20,100,74,119,243,41,108,202,144,114,49,179,68,185,87,38,236,110,160,143,200,227,204,131,121,51,107,243,131,49,122,30,30,190,11,172,252,64,81,156,0,140,38,137,194,154,105,90,208,135,53,102,21,18,67,147,127,89,215,94,10,153,140,131,104,212,109,71,111,222,212,98,106,48,69,45,44,0,86,29,59,2,143,73,54,173,192,231,90,225,158,139,155,216,200,122,98,71,199,194,114,173,23,216,135,144,42,16,117,98,148,122,27,39,141,242,124,187,174,126,69,137,198,169,190,232,253,168,217,72,76,226,53,37,74,166,148,124,99,196,155,34,154,167,154,254,33,186,7,82,142,223,106,81,248,14,141,146,4,202,161,233,241,212,111,62,19,14,219,241,32,9,244,142,19,86,69,124,80,201,233,37,200,66,32,227,74,194,21,117,40,193,151,164,141,187,68,214,72,136,140,160,253,181,98,43,16,86,41,252,
+102,240,130,89,218,69,9,71,203,58,152,248,193,35,26,104,186,124,119,22,150,162,247,242,71,31,127,160,99,158,77,175,3,17,227,132,14,219,96,173,121,66,171,34,124,249,65,139,144,124,206,88,124,188,186,241,41,184,36,98,71,33,223,15,60,144,26,186,150,144,196,70,100,162,75,187,195,39,4,23,11,97,144,75,16,212,158,250,215,105,145,92,172,92,122,243,9,73,108,0,164,132,10,59,29,91,7,89,240,201,51,135,124,229,154,236,252,78,26,128,247,35,225,82,1,115,74,203,138,150,38,220,123,109,184,134,116,172,14,37,51,227,37,161,7,125,176,175,146,211,40,216,240,124,233,41,131,115,23,10,36,104,143,213,9,190,205,76,28,61,229,164,222,122,215,112,34,205,102,29,137,227,120,197,186,233,165,146,79,136,237,35,152,216,83,29,116,172,105,151,237,18,243,59,118,215,223,197,177,183,208,227,122,33,76,8,171,69,49,116,173,88,87,220,14,250,134,186,18,192,139,25,72,68,5,15,195,172,40,16,2,219,5,2,196,126,234,188,84,243,186,105,105,50,126,140,
+251,182,210,78,171,8,122,148,143,107,159,208,10,224,45,78,165,92,189,2,183,136,6,0,248,19,62,239,83,7,254,190,225,162,10,223,28,225,4,0,126,214,46,222,144,216,86,153,3,0,86,80,74,30,3,126,51,80,35,131,211,146,76,109,179,114,52,200,211,74,150,77,13,222,122,79,16,193,0,227,7,228,77,194,31,186,136,116,119,179,115,163,130,154,31,241,10,22,49,171,1,6,116,182,47,159,85,24,23,221,109,118,138,200,51,81,19,5,53,134,129,55,1,43,0,32,235,205,103,174,217,122,98,33,186,155,244,210,46,2,144,17,194,110,108,4,126,53,134,43,164,49,127,72,117,239,177,214,46,128,23,205,71,200,145,37,71,92,254,233,68,23,47,250,105,204,161,191,73,129,0,48,213,43,31,131,214,181,55,64,80,153,97,103,37,79,29,18,12,240,101,8,218,31,83,7,104,65,127,82,63,130,127,32,247,13,241,254,64,238,27,194,69,102,126,134,96,127,65,155,4,248,5,109,224,219,143,135,190,33,190,31,15,253,61,130,192,126,25,46,11,254,101,56,128,255,
+91,221,226,73,34,247,235,217,60,50,186,129,245,105,177,81,191,148,249,123,242,22,107,5,180,55,2,101,191,42,167,63,240,192,172,131,145,142,132,232,166,180,193,223,6,162,23,2,179,218,222,56,171,192,96,202,61,6,162,173,228,177,164,242,66,203,243,80,146,32,170,80,64,250,138,89,50,246,168,208,189,193,71,129,3,108,161,168,193,22,13,199,245,74,207,155,219,101,45,234,160,73,82,20,28,63,167,41,68,78,94,251,69,51,219,205,160,115,242,9,159,212,173,42,61,204,233,7,0,6,165,174,155,60,104,151,74,5,153,247,172,52,255,64,219,88,206,49,100,59,182,167,44,155,166,187,7,166,150,137,41,151,28,197,82,32,145,133,220,119,236,90,93,53,105,175,76,88,217,156,98,101,77,34,103,208,40,202,243,78,48,94,239,91,44,230,66,195,68,15,59,177,40,182,6,65,85,170,11,126,169,26,181,34,175,81,107,144,9,230,49,31,9,118,19,162,159,112,182,29,150,137,182,19,79,240,4,186,50,63,248,142,112,194,122,79,88,6,200,106,248,107,219,59,54,211,
+224,188,185,48,23,232,22,241,35,63,244,224,131,229,177,61,90,239,22,242,148,154,59,246,24,112,87,73,89,123,209,153,128,63,242,174,140,102,233,87,156,147,175,65,51,135,247,221,108,152,66,62,11,184,217,104,3,104,208,158,245,166,144,85,118,195,102,254,88,212,241,115,250,82,183,82,59,162,14,146,73,166,166,9,230,92,237,56,50,244,130,15,170,218,135,200,89,61,186,240,48,2,9,129,111,10,110,11,182,233,169,86,56,172,14,60,236,181,47,236,39,138,169,237,144,74,107,46,75,249,167,186,85,78,245,161,166,224,207,3,167,160,162,190,243,86,149,148,90,134,165,139,97,172,211,144,83,188,13,31,97,161,57,48,231,8,203,140,61,123,56,185,235,170,120,153,231,205,111,49,145,42,11,81,11,149,157,191,40,232,203,232,152,149,196,214,248,137,1,182,227,235,56,191,5,196,214,82,182,27,162,49,91,65,55,34,166,169,25,162,231,69,29,199,41,133,104,189,33,181,17,28,63,247,34,27,50,104,230,101,62,185,194,219,254,106,244,39,20,129,247,57,69,120,104,97,
+88,147,34,150,204,143,42,105,124,191,66,14,50,163,107,135,72,37,183,169,252,200,184,227,253,67,31,183,110,58,139,35,239,193,49,152,157,238,105,55,16,151,169,204,203,95,39,148,18,92,209,202,131,72,95,27,86,5,253,254,32,23,42,252,53,172,207,199,81,224,57,235,123,233,128,75,226,236,139,184,188,99,222,213,98,140,230,233,83,8,56,53,65,0,0,37,207,229,3,0,29,136,20,32,5,0,206,64,57,130,10,0,180,0,223,12,158,4,80,126,134,108,33,237,98,33,219,229,191,47,165,254,111,110,58,149,130,111,8,68,62,53,235,127,43,81,77,80,137,200,213,154,55,165,115,68,5,170,165,175,149,225,187,135,85,164,47,22,244,121,139,20,237,215,203,67,121,239,92,174,30,3,1,173,40,12,76,18,105,28,42,30,187,148,127,73,81,37,4,105,50,74,174,109,136,28,96,253,41,148,74,89,226,168,66,90,236,94,165,64,34,1,128,149,243,27,173,208,196,210,53,151,25,249,173,26,0,240,178,112,47,25,95,222,32,99,73,70,121,109,34,233,34,62,168,239,
+0,128,114,221,12,1,3,240,32,30,128,221,126,188,105,248,149,208,27,0,108,148,3,203,223,252,154,24,23,126,158,255,27,68,250,51,102,63,251,155,223,152,25,191,231,253,3,51,196,15,164,165,128,95,144,254,134,228,127,32,253,13,145,253,66,142,63,66,18,191,144,3,48,252,133,28,16,59,64,49,158,150,12,24,22,70,117,183,0,69,101,209,73,241,10,221,7,154,7,180,252,186,73,107,47,247,167,252,134,17,94,25,76,2,99,94,188,50,34,179,114,91,123,117,162,204,76,70,27,82,173,163,231,71,21,250,45,90,25,16,94,234,231,21,124,157,65,47,229,166,199,120,164,108,90,38,15,74,227,86,187,57,195,118,79,254,60,116,120,3,205,123,161,121,219,94,139,6,201,169,117,240,91,98,169,64,249,166,226,119,114,224,74,168,142,74,52,114,173,79,196,162,116,238,167,31,177,167,83,186,133,73,2,51,53,173,116,178,44,96,246,25,180,220,124,26,156,71,58,207,84,38,4,203,45,131,244,253,29,129,196,21,95,198,15,49,96,82,244,208,42,151,131,172,189,43,
+159,100,175,77,0,163,231,156,20,131,35,71,64,65,104,166,185,189,184,24,121,123,45,57,148,200,109,47,123,77,30,125,180,207,13,189,151,112,50,241,155,146,239,89,25,34,169,203,84,154,115,7,38,22,166,98,47,135,79,242,37,242,110,75,19,165,109,138,156,35,49,169,202,247,99,69,209,78,145,178,16,117,210,135,182,134,160,43,173,216,119,67,5,99,39,223,90,172,204,241,142,138,225,71,146,162,251,49,28,76,234,22,57,231,238,210,143,14,133,88,41,159,106,14,109,252,254,200,133,216,127,68,56,185,143,148,251,180,26,105,123,156,67,210,163,124,141,75,92,217,141,176,9,63,108,219,196,7,14,20,173,71,196,75,150,173,116,221,173,113,28,231,235,22,43,151,77,21,65,227,230,250,106,47,155,115,139,15,241,137,235,144,138,75,223,45,55,57,84,38,156,162,108,159,202,219,41,161,234,94,90,170,173,178,108,80,91,176,87,229,236,20,170,156,133,32,30,47,49,151,163,65,101,14,188,243,203,220,54,148,48,136,143,209,200,123,247,33,83,46,213,110,243,96,204,166,
+146,47,165,52,94,171,81,176,231,154,197,42,50,167,247,142,216,72,220,55,209,43,19,165,199,62,108,54,179,171,141,77,21,38,37,217,172,93,242,41,23,141,200,69,79,149,172,231,205,83,20,106,110,2,15,229,161,237,17,122,178,243,16,196,150,198,182,224,30,88,234,105,98,91,185,173,135,132,79,152,30,209,218,161,115,102,249,98,196,194,152,63,29,149,246,36,1,85,221,146,199,101,125,83,94,56,34,205,231,140,50,146,46,164,41,169,102,216,110,202,52,175,146,149,239,128,146,167,38,135,82,210,53,113,82,199,152,135,119,242,81,173,140,195,36,61,240,247,71,139,170,120,160,194,35,226,80,81,9,221,106,148,173,171,210,66,18,53,45,142,248,111,97,197,191,2,239,188,226,171,233,185,203,78,253,121,31,147,210,9,134,43,149,234,181,186,93,118,232,118,163,114,43,94,30,167,19,147,163,215,171,151,201,158,77,130,55,16,34,20,78,211,56,74,70,211,140,64,74,157,144,177,62,221,246,87,199,16,250,26,93,41,78,147,222,113,170,190,152,140,146,45,164,241,19,98,
+139,182,212,162,154,108,190,145,250,198,105,215,114,68,38,164,203,108,67,57,38,235,27,159,35,187,114,59,250,159,42,217,67,134,48,152,93,171,23,252,178,155,145,40,72,182,145,83,46,44,182,209,8,11,202,180,139,155,81,69,9,109,115,151,125,143,0,102,75,148,24,252,138,164,204,130,81,79,173,131,61,61,193,32,60,145,66,37,189,112,108,16,12,228,168,84,4,202,203,91,236,234,166,126,217,46,234,65,58,27,218,83,44,151,237,131,251,214,150,215,111,68,79,204,53,44,108,161,164,121,124,188,63,28,218,108,187,243,204,253,234,181,8,20,247,137,109,181,30,87,148,123,235,42,232,77,132,113,182,252,218,101,196,145,4,238,173,176,108,53,109,139,84,96,211,247,145,56,30,118,249,185,52,206,151,24,37,139,81,146,133,52,123,207,192,172,33,50,248,94,251,168,208,81,140,57,31,78,69,154,237,150,172,202,131,93,217,233,82,29,120,170,227,67,61,146,95,51,229,219,208,51,182,180,38,199,12,209,104,149,228,199,87,87,217,101,24,153,221,192,106,58,165,188,158,251,
+130,146,43,176,181,123,138,150,117,164,123,41,31,148,204,177,107,184,7,9,118,129,186,167,104,62,5,178,83,215,35,109,164,113,94,154,190,213,169,112,12,21,178,5,98,57,45,55,166,98,127,150,240,181,123,106,203,202,113,26,14,81,190,128,54,75,140,67,109,158,5,171,245,219,16,131,146,183,207,1,110,94,89,65,82,250,57,182,97,91,19,91,88,118,117,196,183,106,219,162,75,195,176,176,122,111,80,92,116,98,89,126,193,23,210,213,144,70,99,115,94,94,237,199,41,56,242,189,158,29,177,99,223,150,124,246,110,4,68,45,217,142,93,118,159,111,30,76,219,217,40,37,31,72,26,150,64,85,246,84,161,237,177,186,170,22,89,146,194,221,237,113,139,7,227,105,194,243,161,118,63,188,135,130,234,161,88,77,30,230,244,130,154,143,42,20,85,79,22,190,42,166,171,153,138,167,231,107,122,47,166,96,115,84,248,104,231,218,171,9,26,97,142,74,240,226,50,179,110,181,153,58,132,245,78,180,66,117,228,236,154,225,134,140,97,40,41,74,216,148,154,239,226,183,13,79,
+99,30,19,84,233,198,134,181,125,121,246,198,95,182,147,59,143,85,59,235,21,123,151,133,28,196,201,232,251,106,155,67,78,154,117,204,121,43,112,240,31,218,83,80,87,249,176,233,88,105,209,87,50,125,191,7,233,185,54,207,25,178,198,162,200,179,161,142,105,221,166,185,64,15,162,248,64,211,111,163,147,117,50,49,144,89,22,170,238,188,206,249,243,141,47,138,16,67,191,156,125,205,195,132,48,122,222,48,117,118,132,248,49,170,22,47,27,89,245,43,247,33,94,212,112,14,215,1,139,140,115,140,175,241,54,118,170,189,47,46,137,112,66,86,123,149,203,77,101,165,189,157,214,162,200,20,106,67,187,9,55,93,25,240,115,197,172,187,221,139,192,109,100,139,238,62,30,156,222,200,253,56,246,158,190,254,151,200,64,230,76,247,233,26,14,168,225,116,161,67,119,133,233,120,182,124,45,91,252,67,164,142,50,234,238,49,119,87,213,77,140,153,68,61,49,140,172,188,138,114,75,89,110,1,148,209,202,143,15,232,215,92,206,82,245,162,154,126,216,8,179,119,73,1,93,193,
+23,202,147,225,226,17,189,152,44,104,185,141,183,178,216,200,209,75,84,49,85,84,179,89,217,65,163,174,170,111,124,217,80,35,184,40,94,14,231,16,82,37,31,210,238,106,81,47,75,89,46,15,58,250,171,125,74,45,14,149,40,209,231,46,114,52,154,230,41,228,41,138,11,120,107,36,109,48,57,121,170,165,140,28,4,33,136,30,102,225,25,158,49,218,114,126,8,59,45,238,53,213,152,3,223,191,181,170,182,199,147,63,197,173,146,246,175,61,57,17,185,38,166,52,79,255,145,2,182,195,71,57,198,53,105,221,182,141,158,175,47,131,96,146,206,83,95,80,48,124,81,134,247,67,185,18,77,201,76,12,75,108,24,73,215,92,215,22,8,126,153,233,71,74,155,230,58,189,43,225,241,173,229,107,200,108,153,84,157,211,210,1,125,22,47,214,116,206,52,228,69,15,74,179,211,112,242,196,232,198,254,202,19,127,137,187,29,14,215,178,27,106,156,186,143,87,49,122,150,221,94,129,235,62,91,82,94,154,152,203,128,211,79,181,206,226,121,236,77,64,160,244,83,234,42,213,
+117,207,151,124,231,211,174,46,30,158,46,212,211,49,73,102,234,22,43,38,103,253,140,6,235,33,10,198,245,218,28,129,141,65,100,168,177,25,217,247,161,174,76,25,232,72,28,21,148,141,186,168,61,148,203,166,109,247,10,93,202,111,225,44,51,71,107,85,36,252,144,78,171,72,11,131,96,24,176,80,214,31,253,102,227,121,128,132,204,134,217,146,153,187,101,53,154,178,147,94,192,10,156,195,55,7,157,147,211,220,74,181,107,87,118,80,105,148,242,153,221,227,214,60,93,59,85,91,115,237,24,117,158,203,224,113,205,6,171,54,214,202,99,73,60,163,197,146,105,160,25,98,164,207,254,100,128,31,195,47,154,198,81,255,106,16,84,189,56,209,35,178,202,78,247,133,5,241,169,197,141,73,46,149,81,67,120,157,220,85,150,228,101,185,110,193,23,214,117,181,166,105,251,197,56,24,243,177,66,165,145,172,181,12,35,110,135,234,132,89,93,153,86,222,57,217,201,169,139,150,62,132,188,221,112,212,162,121,216,27,119,196,179,111,64,223,89,206,89,170,210,221,17,210,30,2,
+251,60,247,225,36,108,6,179,126,62,117,152,230,60,61,198,126,45,206,38,205,147,20,218,187,215,12,48,3,169,116,126,139,219,170,254,133,72,143,46,22,180,211,249,24,41,138,39,12,33,106,125,85,134,77,16,45,255,229,160,232,122,95,99,115,171,166,147,41,138,125,197,203,163,80,223,116,73,29,132,37,25,122,216,43,106,200,105,162,179,142,193,241,182,37,128,211,78,119,148,237,17,180,190,69,6,248,148,33,240,104,197,182,159,212,203,57,19,100,65,64,67,246,189,59,101,63,78,180,188,235,253,2,124,11,65,100,46,141,212,213,81,155,101,183,241,52,20,55,19,166,117,97,25,125,175,103,111,41,201,65,32,104,105,110,235,222,66,115,249,154,62,115,143,70,96,0,135,68,25,234,141,96,8,26,150,80,103,135,249,126,138,45,144,187,41,213,147,120,150,51,8,104,196,52,50,160,155,140,245,48,91,202,159,136,30,183,80,178,46,170,47,205,165,106,72,43,13,19,185,91,131,58,122,238,248,39,129,10,247,94,148,98,216,185,103,222,147,95,145,112,252,78,75,126,245,
+87,21,55,38,199,198,123,77,234,80,230,252,210,239,183,34,225,121,250,81,212,222,191,13,44,167,145,177,199,84,172,175,87,240,232,41,40,235,85,231,80,51,12,30,229,203,221,49,71,27,234,30,47,67,86,25,143,26,62,32,72,157,107,74,63,168,102,135,18,207,83,181,108,43,249,229,72,205,153,102,171,112,101,64,29,31,13,212,21,202,76,218,198,182,125,147,173,70,114,109,193,22,247,42,173,110,152,110,219,112,55,165,74,91,34,103,181,43,202,179,78,167,231,245,143,69,190,141,178,77,140,133,125,168,14,117,42,168,135,91,73,199,28,54,201,241,42,175,189,151,93,164,231,66,73,163,107,31,212,143,131,131,113,21,182,37,155,234,10,191,74,165,31,51,40,65,79,117,83,58,189,214,178,118,92,9,189,241,116,202,121,218,69,76,243,186,99,216,174,169,36,183,114,51,221,46,171,226,167,90,202,86,118,49,56,135,51,213,249,84,60,175,235,253,240,145,237,59,165,207,184,70,44,78,56,34,153,235,241,161,90,53,161,229,105,9,164,90,185,211,91,203,236,195,121,94,
+60,158,55,77,173,58,146,57,110,61,5,201,211,151,122,79,129,208,35,60,97,159,68,198,100,185,54,136,84,157,21,98,253,144,48,36,151,163,151,108,20,50,116,90,197,132,225,139,122,144,40,63,38,37,214,46,71,60,36,202,97,195,199,96,165,91,108,43,237,234,86,193,138,125,113,18,200,135,237,184,79,72,12,104,234,130,180,219,189,4,16,169,73,171,46,126,155,94,131,134,231,42,155,126,240,6,30,204,71,234,86,151,54,158,223,74,48,118,155,73,227,119,40,126,203,161,211,78,167,250,217,80,62,74,77,70,231,53,54,49,53,235,169,199,198,43,107,5,226,238,169,101,156,31,62,180,208,135,158,187,20,0,157,32,203,97,230,145,45,120,237,111,69,157,85,58,53,88,209,253,249,173,139,167,65,196,183,133,63,127,0,39,150,67,116,197,126,157,148,23,44,33,9,149,156,61,90,253,23,16,71,203,96,132,125,139,167,39,65,210,49,214,226,221,138,162,146,249,12,114,243,46,237,37,82,239,163,166,249,108,73,12,65,122,122,100,226,33,183,238,36,212,16,36,201,49,
+78,158,75,36,94,165,121,110,125,235,118,132,42,63,21,48,34,176,132,204,42,106,194,211,197,85,122,4,142,2,202,34,242,200,42,204,143,49,137,9,80,28,137,195,81,164,211,212,106,235,231,144,100,197,62,119,177,91,7,235,249,245,243,83,89,133,158,19,253,108,144,163,246,59,245,25,79,182,60,83,3,232,18,39,39,81,149,190,227,216,103,152,39,56,38,71,162,156,84,202,237,204,189,209,88,15,80,181,129,86,96,184,96,164,210,215,235,44,229,79,34,30,230,227,17,171,144,56,74,130,69,127,202,13,181,2,38,194,104,22,73,88,29,94,126,193,144,160,74,84,146,121,31,245,131,84,141,132,118,85,117,32,99,72,178,129,203,199,65,124,33,205,105,89,51,119,23,57,232,177,204,61,211,38,14,2,13,210,8,85,115,58,17,180,208,2,196,231,179,43,119,30,216,190,100,255,15,107,111,246,219,92,150,228,137,253,43,137,121,104,216,128,103,48,229,110,119,207,60,27,48,252,108,24,126,238,234,234,156,233,196,84,85,22,42,179,166,49,126,186,36,37,82,220,68,138,
+20,247,85,20,247,93,226,190,147,162,184,111,226,190,239,59,41,238,251,238,75,165,171,59,107,166,122,252,98,1,2,244,157,123,79,220,56,17,241,251,69,28,124,231,222,80,38,164,117,169,20,67,4,238,189,2,235,49,220,239,251,103,241,58,187,67,235,191,249,170,151,201,75,145,104,255,136,223,189,113,121,225,240,91,55,66,109,145,19,221,81,49,243,130,214,160,196,227,9,183,244,204,131,25,165,168,99,235,51,175,81,121,60,38,147,169,31,62,91,105,47,239,113,183,229,137,172,42,2,36,172,118,137,145,154,151,179,207,89,164,73,160,162,230,166,54,5,21,76,202,57,1,217,141,70,193,233,222,115,204,105,64,176,245,200,51,236,96,251,213,29,102,104,216,166,216,60,247,38,231,133,11,34,81,132,161,31,151,143,230,117,62,144,8,4,110,3,242,200,60,145,76,226,243,116,41,184,77,9,59,61,161,208,28,199,206,221,154,26,187,68,71,62,67,127,250,163,226,222,13,111,155,138,11,145,159,65,98,87,160,27,38,148,176,227,5,245,216,222,244,211,183,51,153,32,52,
+213,181,118,242,146,134,246,18,86,96,26,42,111,25,153,126,148,153,5,196,136,82,252,217,22,151,74,204,100,66,44,134,247,130,76,75,49,147,57,17,22,173,169,114,53,180,102,38,133,101,125,214,100,28,112,156,91,148,151,199,132,147,210,21,19,35,5,123,16,229,133,177,69,224,189,149,144,4,122,222,194,49,90,161,80,234,20,137,176,112,63,77,66,149,209,209,39,225,177,47,58,132,94,91,196,161,4,209,86,223,123,110,81,80,33,58,185,138,107,4,38,207,109,159,66,235,35,162,156,160,44,33,11,216,103,75,11,113,134,98,167,206,134,242,4,234,23,244,204,82,105,159,15,234,169,222,231,231,209,198,96,57,243,13,243,121,99,62,95,64,62,135,111,239,160,216,81,154,228,121,252,136,215,40,183,183,166,42,173,127,72,222,159,68,197,188,189,92,196,72,11,151,19,48,183,196,78,247,239,41,148,184,215,204,85,186,125,88,191,143,200,173,130,149,119,58,163,173,111,166,192,121,104,134,227,52,222,198,223,76,232,110,204,148,145,183,43,203,180,12,66,113,121,158,177,156,
+244,195,35,86,194,8,251,245,9,125,89,238,23,139,167,172,219,81,81,111,235,54,46,19,246,4,140,44,56,4,39,165,43,224,164,219,184,253,227,227,3,223,230,185,140,98,112,164,191,189,136,121,249,190,165,43,122,15,23,237,159,174,86,129,193,204,79,62,143,29,217,161,18,135,57,0,148,84,251,17,71,14,173,146,100,74,248,137,195,232,63,243,217,121,29,193,81,86,29,222,140,230,61,235,59,105,169,125,210,154,2,84,157,94,79,186,151,138,159,23,65,171,99,17,224,238,59,16,132,211,102,39,74,83,65,145,62,186,173,42,158,160,14,254,133,86,24,12,81,67,52,106,177,136,118,165,61,125,237,252,41,22,99,167,15,98,49,93,33,29,238,179,75,55,145,123,140,156,5,236,218,230,48,63,48,166,96,224,242,203,246,215,224,228,216,34,200,206,199,113,229,1,245,170,179,184,148,240,205,168,152,125,172,84,162,132,207,246,32,53,144,58,242,143,130,237,41,190,26,102,102,197,121,108,199,18,28,93,162,51,230,149,143,43,106,72,109,220,112,161,137,48,56,151,151,227,
+196,118,176,190,19,94,208,100,167,7,194,113,206,65,125,51,241,4,156,130,160,110,147,204,146,53,180,211,248,143,231,195,249,243,35,209,223,224,202,12,42,39,56,151,242,194,36,247,206,29,12,123,116,17,117,56,26,237,188,6,38,26,79,55,166,153,49,251,60,108,15,61,181,222,195,206,201,56,161,81,82,112,236,35,227,37,182,209,93,72,231,62,57,167,173,145,223,83,143,219,187,84,10,75,45,144,218,82,63,167,148,108,224,132,51,86,11,117,9,122,146,92,30,253,54,28,244,164,225,170,167,120,95,233,49,209,231,115,196,211,144,17,240,132,208,139,33,122,30,147,151,23,227,91,189,98,152,231,173,158,174,114,144,160,156,247,40,41,109,167,232,168,213,117,180,60,189,175,104,214,31,182,103,131,181,53,97,85,105,5,31,191,84,187,221,45,158,159,142,190,234,52,159,159,73,135,212,243,216,244,96,232,134,111,81,71,40,7,130,146,198,37,20,94,93,155,164,29,54,221,201,17,117,134,19,21,68,154,150,232,203,85,79,204,251,139,36,182,28,251,10,247,147,226,206,149,
+56,221,178,162,139,100,135,109,122,176,162,65,134,128,74,243,210,55,207,72,46,190,80,123,253,25,124,130,19,195,226,94,33,11,188,194,135,72,193,43,176,198,205,53,46,63,226,186,26,42,173,53,28,46,221,74,49,179,61,31,74,15,231,230,49,59,228,242,156,66,10,151,55,120,148,138,41,68,244,78,146,20,70,163,219,200,81,147,143,124,224,43,12,205,126,216,101,12,167,38,241,20,45,22,15,232,44,169,249,152,135,238,65,246,32,147,58,78,127,70,94,189,177,237,107,192,51,40,28,44,142,209,77,184,78,128,141,109,186,115,149,78,196,94,164,66,213,230,227,188,122,183,74,150,115,150,61,24,239,254,7,9,105,4,33,173,240,28,25,73,145,182,97,209,210,178,42,120,113,190,191,30,36,54,98,144,131,43,182,119,79,23,201,135,184,37,238,209,157,158,52,55,46,22,39,61,103,55,199,116,124,250,80,50,11,48,125,228,184,19,142,40,206,155,29,164,122,139,151,162,106,80,0,180,58,19,21,29,56,224,114,155,61,6,173,12,176,82,148,243,110,115,181,166,140,39,
+3,50,202,46,178,115,88,119,206,94,140,192,94,125,37,119,202,244,20,185,131,236,179,77,139,194,150,236,30,84,230,238,189,246,16,178,201,124,22,65,216,67,100,112,157,49,208,18,75,149,180,247,73,75,18,8,89,68,177,226,15,164,82,154,13,195,196,40,18,136,42,196,231,246,248,44,22,43,174,198,0,109,161,10,182,30,108,151,236,165,148,79,18,117,237,80,247,157,109,91,42,174,49,117,11,170,21,37,181,79,217,218,94,101,122,158,40,193,189,95,231,209,106,113,179,114,189,86,151,125,99,67,65,175,176,141,251,148,188,35,92,116,94,36,8,85,83,193,188,213,219,244,150,152,131,70,171,134,116,115,237,37,120,172,66,4,56,41,10,10,75,205,83,216,51,169,93,240,171,28,74,90,85,18,36,141,211,69,73,23,121,166,220,135,148,147,4,130,116,219,135,128,142,246,154,80,43,178,222,90,239,22,196,182,114,33,54,81,118,13,142,187,57,99,186,75,75,30,29,143,106,195,234,35,14,169,169,64,71,153,211,246,101,252,216,159,168,114,19,127,10,166,86,93,54,98,
+98,199,106,235,55,17,181,130,185,182,238,93,40,215,120,185,186,52,103,78,47,103,60,211,112,146,81,118,170,234,75,254,210,193,81,103,19,114,214,128,105,47,84,156,108,165,63,111,20,132,25,224,228,40,239,202,217,253,219,91,93,35,237,244,196,71,50,111,125,228,94,205,240,254,101,134,178,189,242,233,90,143,64,18,77,215,17,56,109,144,241,33,173,204,27,71,67,103,107,14,140,178,248,109,140,71,44,158,121,132,75,164,117,178,197,116,245,13,73,155,230,212,231,104,125,233,169,200,115,250,174,145,121,43,19,95,158,162,240,164,79,35,159,92,162,209,3,19,185,61,197,124,11,108,171,85,8,94,82,247,232,141,116,239,174,210,155,133,64,232,118,109,185,175,176,251,151,123,86,182,174,228,220,21,60,39,11,220,54,25,127,130,65,94,229,242,114,131,143,212,163,140,119,153,42,154,202,113,32,16,48,208,27,253,244,99,119,33,49,34,78,247,66,170,85,158,180,60,30,109,116,131,190,2,119,47,182,19,249,219,194,80,135,129,56,210,222,126,153,119,144,156,244,116,237,166,
+74,87,189,1,109,175,123,61,218,7,196,238,244,237,104,166,17,171,245,57,42,204,72,238,110,101,14,190,202,235,137,207,181,192,118,81,121,191,40,243,15,160,45,129,159,204,158,186,24,45,218,133,69,69,171,98,212,142,210,246,137,28,84,127,42,103,110,43,194,77,234,182,183,158,83,32,12,86,33,83,168,220,133,149,77,13,116,98,37,254,82,197,111,24,157,136,112,246,169,132,92,192,152,142,198,149,60,250,118,159,194,40,139,171,197,73,197,86,75,81,60,34,24,137,54,150,84,106,123,206,218,85,130,165,81,212,60,68,171,37,117,63,198,184,95,20,188,4,188,245,25,113,246,67,73,233,231,146,71,87,138,240,206,15,194,51,177,126,55,17,245,15,99,248,45,107,57,18,196,122,69,197,52,95,173,34,60,142,203,32,53,201,78,146,79,152,19,124,56,25,69,165,55,160,19,177,160,15,57,40,212,96,147,161,29,87,184,74,81,145,184,31,248,12,55,75,100,198,174,84,66,198,216,137,108,134,21,10,35,138,53,12,128,231,82,143,0,168,78,251,252,165,206,58,162,91,
+21,215,225,198,235,146,103,120,160,43,85,171,3,110,72,247,206,135,241,81,105,83,41,70,178,250,161,29,171,228,242,184,72,88,11,84,47,233,185,181,152,67,5,184,153,156,65,149,238,54,9,29,107,115,242,232,45,213,183,198,189,200,28,165,113,75,145,108,137,177,123,125,198,149,5,248,92,31,100,135,94,54,30,244,62,8,137,86,47,20,168,189,121,92,55,80,210,252,75,204,164,135,214,97,159,206,209,210,72,181,77,165,86,176,57,198,178,47,155,171,134,6,135,99,75,120,228,115,108,44,187,183,88,202,14,234,68,212,131,168,64,73,98,110,54,62,218,4,46,79,119,162,11,159,216,30,196,62,25,51,91,130,79,153,220,24,250,184,215,126,140,95,234,227,154,139,152,127,213,97,44,11,205,15,43,224,182,83,207,139,170,170,143,220,99,79,10,160,218,172,239,99,179,29,237,212,181,40,239,217,1,4,10,122,127,117,150,43,30,223,141,198,2,27,234,245,166,191,46,11,142,79,123,227,201,104,180,23,149,163,184,114,24,123,91,52,172,152,143,11,175,34,19,166,235,178,
+189,23,189,40,236,69,112,119,122,178,42,30,246,194,148,67,49,17,59,107,88,197,212,80,80,64,172,240,51,59,179,119,193,72,188,219,243,151,39,163,158,21,206,61,188,152,120,230,23,247,158,20,25,168,182,99,161,178,108,25,204,10,130,84,92,17,94,31,224,19,125,124,12,75,172,170,72,110,186,181,43,28,21,144,193,70,170,164,84,242,110,10,167,55,121,244,36,238,105,233,148,202,122,7,22,14,87,74,248,184,6,167,209,167,58,143,44,67,67,106,85,45,214,195,33,59,241,21,177,153,56,22,162,182,174,155,28,235,180,23,97,197,193,200,170,70,190,97,164,90,241,94,88,177,189,58,172,137,101,139,187,26,150,142,8,134,62,187,245,13,242,97,139,254,66,188,137,101,25,206,151,6,161,227,51,167,143,223,42,170,26,205,35,45,102,92,224,217,113,125,59,153,190,242,208,243,23,32,160,75,111,177,89,13,209,125,214,253,233,145,170,17,243,196,211,107,134,184,71,145,86,28,177,24,12,166,119,225,71,156,36,165,67,78,96,81,100,135,146,238,211,79,188,248,228,255,
+157,255,255,195,120,189,246,188,93,7,110,81,175,94,135,203,3,193,57,31,193,88,232,45,25,169,198,87,89,240,255,57,126,19,142,121,88,116,20,9,235,61,195,80,80,14,146,47,65,41,115,182,209,209,226,231,188,140,180,175,235,199,13,9,130,130,123,185,60,150,211,7,21,241,194,108,11,77,208,238,82,200,217,205,93,232,49,171,126,182,2,212,148,150,10,170,84,179,19,172,164,118,150,230,15,243,29,213,106,176,248,92,129,29,114,1,113,15,80,99,174,89,124,139,146,6,249,15,229,209,184,94,204,134,139,94,175,171,28,18,60,241,32,106,49,25,180,151,83,42,14,37,62,203,197,247,34,201,118,184,69,193,193,253,132,211,238,131,202,120,183,225,194,227,138,230,34,210,251,166,183,143,56,151,6,98,89,237,255,72,47,67,108,168,94,72,45,229,232,12,187,26,33,165,243,65,213,229,28,164,20,117,214,91,24,28,154,144,1,215,106,110,197,61,252,245,201,116,190,81,74,247,69,136,232,216,68,176,12,218,83,128,214,127,53,32,1,147,34,149,173,178,172,70,30,121,
+91,209,64,217,119,87,225,254,105,186,166,245,77,176,132,61,12,197,252,73,192,205,145,143,151,22,10,149,167,151,211,68,56,50,86,255,105,62,184,218,152,242,180,128,212,110,70,219,181,196,15,124,141,90,73,96,37,232,215,60,180,178,77,198,155,106,214,216,125,66,123,41,155,15,7,0,204,58,215,89,237,223,0,84,224,250,135,10,197,5,128,7,244,44,141,122,134,185,106,234,226,225,114,203,9,110,86,255,205,75,53,63,123,161,230,143,231,176,191,249,251,239,127,245,135,223,124,251,219,31,127,248,55,223,252,239,191,252,225,155,127,234,145,249,245,93,195,223,127,251,203,95,253,248,195,245,72,247,63,252,151,223,125,251,251,191,253,215,191,254,238,183,255,233,103,167,185,255,123,29,53,127,241,111,255,250,47,254,234,218,29,238,1,8,92,95,135,49,252,116,146,251,153,57,202,132,162,110,53,245,209,74,236,214,238,153,47,192,109,81,233,132,203,236,220,123,32,247,82,75,222,229,158,200,31,64,217,213,241,236,196,17,127,145,111,237,39,19,9,188,20,35,221,189,237,95,
+89,148,247,222,157,71,28,23,191,122,245,147,79,255,68,30,110,168,30,14,51,243,198,228,188,16,202,182,66,38,234,122,246,174,207,100,53,154,14,125,114,81,123,118,75,5,138,31,56,158,239,94,66,55,109,190,11,85,139,78,248,86,141,220,203,34,241,101,46,123,78,180,46,107,96,207,233,193,49,125,14,41,166,246,23,51,83,54,20,48,8,176,134,167,129,66,112,217,206,64,122,94,210,94,4,119,123,104,45,77,9,196,73,176,187,96,255,21,211,227,235,101,47,72,26,51,46,64,80,88,64,92,163,197,227,49,209,68,88,239,38,112,85,221,204,234,153,102,85,165,78,232,151,226,65,179,221,4,172,246,154,250,62,99,174,189,236,66,182,140,51,208,118,56,85,211,237,160,64,185,247,7,35,13,81,228,179,89,188,17,16,159,237,114,18,81,188,185,37,140,178,200,0,114,64,45,180,219,167,121,233,214,149,24,205,23,236,242,92,255,10,212,131,194,131,231,88,89,124,92,216,119,71,81,189,214,126,12,46,189,207,93,197,242,217,56,187,16,118,201,192,180,188,102,123,53,
+189,103,182,95,24,176,114,68,203,57,133,196,39,164,8,23,110,65,114,225,236,38,68,121,18,37,191,145,9,50,209,112,143,40,167,23,76,139,143,34,50,19,84,36,232,164,72,80,205,211,17,140,101,147,214,37,92,165,161,217,116,149,2,141,137,160,55,239,36,242,207,62,84,249,229,232,191,253,215,127,210,223,242,159,188,255,195,159,125,225,234,103,205,49,175,177,244,159,191,253,253,143,223,253,234,231,157,50,191,249,31,254,183,223,255,242,55,223,254,143,63,147,248,237,239,126,249,213,98,239,95,238,154,249,221,111,126,119,253,208,219,159,124,56,243,15,63,124,251,247,223,128,193,251,195,31,167,127,53,191,248,153,216,95,127,247,247,223,254,185,24,253,235,159,186,190,2,176,222,159,116,125,85,49,71,84,87,244,205,121,198,195,57,129,108,163,166,77,110,235,36,12,174,86,55,238,156,183,177,119,88,34,65,74,10,160,4,53,144,232,73,30,209,137,144,106,233,35,4,244,225,146,245,51,16,126,239,132,42,3,243,65,116,88,209,63,193,138,179,80,113,56,218,176,150,118,
+189,60,174,115,68,101,235,230,233,46,168,113,157,226,69,25,31,171,197,87,153,170,59,199,220,218,165,222,227,181,216,23,34,108,70,204,36,38,61,194,80,110,56,79,72,208,244,118,192,195,191,64,46,114,25,41,197,56,171,180,65,236,104,252,14,245,54,124,17,100,84,164,67,46,71,148,62,95,68,154,195,73,49,10,57,4,205,34,4,33,239,88,156,158,56,110,198,195,24,20,146,121,173,172,224,242,87,131,157,109,189,141,116,239,51,225,9,133,22,49,144,3,140,84,12,87,169,184,159,192,129,98,215,112,143,110,69,164,75,209,36,126,148,147,228,72,67,150,156,103,84,99,138,10,249,65,69,74,22,219,171,142,147,183,35,14,146,129,226,252,37,29,204,132,139,213,134,143,160,121,165,224,13,105,159,152,180,168,95,214,237,21,26,178,166,79,102,210,4,106,87,129,24,207,91,249,141,89,101,62,122,67,10,106,55,201,146,83,20,132,238,28,200,39,31,222,186,73,62,210,161,123,205,30,240,43,179,37,30,172,76,132,243,146,65,113,156,33,100,7,56,6,113,124,242,253,
+204,199,95,238,250,6,244,229,143,95,189,64,255,24,102,255,181,67,255,197,23,241,254,242,111,254,226,23,255,203,191,133,194,132,127,210,14,20,244,106,206,133,188,85,91,241,158,248,178,10,97,49,140,234,187,144,250,246,201,107,195,64,156,78,130,255,60,96,214,44,238,122,83,61,183,103,97,244,137,236,3,6,206,146,189,106,118,11,155,68,48,85,212,146,136,198,96,48,75,152,46,71,253,16,252,39,162,223,24,136,43,204,131,144,91,203,89,143,50,209,229,221,172,96,223,116,114,199,222,37,25,211,244,103,211,249,162,3,51,139,246,90,152,49,16,174,90,247,207,88,21,210,49,204,212,94,119,49,163,20,37,123,2,19,73,83,38,163,162,208,144,65,181,12,1,0,178,109,3,48,139,48,236,207,236,240,237,143,63,126,117,189,250,15,223,124,247,219,31,191,253,143,160,77,254,243,47,127,253,135,111,193,120,191,14,95,123,189,252,237,191,250,241,31,254,240,155,191,251,219,127,245,51,219,252,238,187,223,254,244,26,227,159,253,168,225,151,109,192,136,39,255,73,207,206,19,
+243,176,152,123,25,79,7,220,220,156,125,64,212,18,194,163,8,93,123,169,39,151,10,156,70,111,127,99,192,0,212,148,1,196,93,48,4,132,132,215,214,137,91,157,97,218,98,101,97,247,225,91,94,35,108,228,205,119,183,55,16,157,59,135,47,221,220,221,189,212,155,181,157,200,121,19,71,63,135,1,110,35,156,219,196,59,16,246,251,199,77,16,217,108,124,120,132,124,32,242,64,91,226,34,91,230,35,111,209,39,50,156,183,59,68,180,234,129,245,240,40,246,221,141,95,248,81,113,122,177,184,27,192,53,128,182,126,102,143,255,245,251,63,252,238,167,102,156,63,128,107,252,169,105,233,239,127,255,253,63,254,240,103,136,228,119,191,254,238,199,31,255,44,230,255,253,47,254,242,47,254,234,175,254,103,20,236,19,50,189,190,97,132,255,201,2,62,230,168,140,204,165,186,62,155,111,6,75,69,18,251,33,221,223,72,155,61,115,42,246,101,224,161,82,221,92,227,228,225,133,203,5,8,164,135,219,7,18,239,101,28,210,10,117,166,252,241,179,217,76,240,109,194,181,62,150,
+60,36,233,250,106,63,25,97,80,133,186,74,159,8,198,23,234,110,12,129,231,243,245,14,211,90,143,143,15,81,87,189,67,141,50,77,196,238,170,26,198,56,46,139,93,167,77,51,57,235,204,90,104,54,156,118,58,131,71,191,122,144,124,152,237,47,118,26,211,44,32,160,237,156,242,43,23,87,235,84,158,250,29,202,234,78,209,109,40,101,198,174,174,244,234,82,91,177,249,118,135,16,89,148,22,240,177,9,201,198,228,207,201,132,244,78,76,211,225,213,4,12,94,125,44,93,130,230,115,201,67,66,46,151,218,66,205,33,122,214,112,158,40,163,98,155,39,51,153,10,40,230,195,19,5,187,60,48,53,108,131,142,107,27,78,153,53,145,190,20,222,196,116,121,114,197,148,117,111,116,243,203,165,61,200,65,214,90,31,78,239,179,230,217,168,153,209,54,199,147,86,178,27,250,62,172,152,177,90,220,15,255,81,226,170,118,197,231,50,180,210,63,7,218,68,226,192,184,66,12,132,6,25,161,1,125,164,152,186,112,61,97,166,244,52,170,81,172,200,61,240,178,204,111,239,80,
+182,89,245,244,148,37,51,90,182,59,22,141,179,167,123,130,178,243,182,200,242,39,60,174,40,3,2,56,223,233,143,146,185,93,44,204,149,222,24,232,254,138,203,96,9,85,168,221,10,207,8,251,192,114,43,58,13,49,250,198,192,45,11,203,57,51,117,20,89,189,17,122,107,130,139,30,143,176,119,253,165,85,30,162,147,203,153,55,105,116,100,103,147,109,201,232,93,55,32,105,230,159,183,222,82,110,145,36,99,95,49,148,42,17,184,59,202,90,110,236,221,35,163,145,13,97,248,57,63,16,247,119,66,189,194,130,144,131,11,228,138,39,254,198,19,84,124,182,216,6,23,71,57,228,83,44,122,24,63,181,206,85,34,49,77,128,252,190,240,177,212,203,22,250,225,35,16,177,122,252,30,210,90,111,221,19,172,155,99,94,212,130,65,40,3,194,33,26,84,154,120,182,13,204,78,42,121,5,8,45,28,0,122,212,198,74,167,147,74,91,38,146,105,121,139,228,94,48,177,146,84,68,88,177,80,126,166,103,70,74,125,170,77,15,132,100,48,162,90,9,46,148,229,145,70,208,
+222,28,27,121,101,117,34,236,187,125,151,104,53,152,163,179,171,9,151,164,185,184,39,108,114,217,92,192,245,50,27,97,79,156,174,179,202,196,251,195,128,179,117,19,208,162,95,178,229,48,225,164,73,24,138,35,45,215,203,120,100,80,11,88,167,135,53,116,66,163,166,68,196,186,13,221,107,28,73,135,208,199,51,246,139,70,88,200,208,39,207,19,247,13,136,52,16,205,10,243,199,8,184,93,228,188,239,173,170,144,163,32,144,200,250,163,205,220,239,171,62,224,108,105,22,83,121,25,188,228,236,230,251,116,127,153,75,177,207,126,238,66,182,62,139,84,228,149,142,218,82,109,222,29,189,136,214,119,34,49,102,4,184,254,248,80,13,233,74,115,89,126,234,51,176,18,188,145,154,51,234,245,18,250,137,239,130,118,94,76,161,243,4,126,142,149,172,19,200,38,81,213,147,6,59,229,228,156,37,207,133,48,252,214,109,239,168,28,131,9,101,229,213,15,229,5,86,70,194,144,4,24,113,177,72,159,187,155,209,220,228,135,161,220,157,73,213,34,185,98,101,170,123,224,29,229,
+147,53,65,246,180,147,141,9,83,50,42,33,145,26,244,140,181,136,250,174,23,12,52,205,101,223,183,208,202,58,189,108,204,151,80,50,223,82,74,78,237,189,71,6,247,38,56,168,12,71,203,155,15,254,74,229,120,99,230,65,9,185,25,125,250,82,199,113,38,188,149,125,227,81,86,199,147,190,71,188,120,210,212,202,140,168,76,161,47,236,227,243,116,39,138,13,156,203,23,77,109,75,18,37,247,96,145,169,78,88,38,55,16,180,188,105,56,85,223,214,153,9,3,119,185,188,236,156,151,156,254,108,121,35,175,194,228,89,114,254,116,82,60,173,124,111,163,160,225,182,101,184,225,19,47,13,10,167,214,172,110,58,156,114,147,101,78,111,205,231,83,83,221,38,45,154,228,139,43,19,182,79,242,200,19,155,248,74,172,14,96,197,65,229,34,163,156,179,136,97,213,246,81,90,77,101,187,180,124,49,58,99,146,246,101,146,125,78,53,163,36,47,43,112,240,42,2,112,166,103,191,147,231,202,94,77,225,209,33,105,35,155,139,14,102,117,8,45,141,44,147,192,216,100,217,247,
+161,49,54,38,218,152,115,176,115,172,127,31,194,141,101,39,220,103,57,59,169,236,86,74,9,43,123,152,40,109,155,101,172,207,161,168,42,26,132,166,165,100,9,74,81,125,60,54,18,148,58,188,206,216,0,9,169,8,70,236,229,125,117,43,216,122,4,43,37,100,62,160,168,233,211,135,185,208,38,96,98,15,201,133,229,50,218,69,70,134,136,229,220,15,69,119,89,253,236,78,162,54,43,70,34,173,83,118,255,129,146,85,40,132,74,123,77,177,189,169,114,161,24,171,52,102,81,211,198,121,167,221,134,45,162,15,56,205,42,18,245,187,159,251,44,119,228,144,24,56,140,182,204,116,94,46,92,206,28,197,254,67,41,53,204,105,97,132,158,190,238,82,171,27,225,3,134,177,86,77,95,199,213,122,137,192,87,196,42,252,80,137,91,110,216,52,188,126,195,117,148,61,56,118,13,151,153,168,75,76,161,218,227,147,170,103,97,68,165,118,29,183,218,116,81,91,135,214,105,154,31,159,236,20,146,111,48,10,227,66,146,222,203,4,201,140,117,245,157,4,37,249,89,234,251,150,
+37,125,103,44,175,206,178,26,156,143,128,46,45,186,51,191,10,5,108,77,9,199,173,192,209,8,108,113,103,67,206,58,57,21,133,27,243,39,109,82,204,28,115,71,176,176,62,61,224,167,173,87,206,134,192,177,249,122,230,11,206,214,188,145,67,56,207,11,57,81,175,237,223,23,210,249,73,197,23,210,50,237,249,64,88,112,202,77,155,100,1,191,34,94,137,238,51,204,124,118,184,218,11,23,50,154,16,74,201,82,55,124,134,62,37,162,189,18,151,140,230,113,73,139,155,49,187,165,163,66,122,148,144,66,207,174,16,37,38,206,169,7,138,86,242,212,139,178,165,49,238,59,28,103,148,228,243,83,116,91,32,66,161,128,88,89,110,74,127,188,209,99,146,134,249,182,36,79,136,207,161,113,188,186,216,160,47,143,197,37,3,170,9,34,17,104,211,109,181,200,171,3,181,174,255,52,38,219,194,147,99,76,159,239,222,140,38,5,183,62,242,8,6,37,236,237,232,60,219,59,6,71,215,210,88,237,59,195,150,190,253,210,151,39,202,161,45,86,69,190,91,145,103,67,122,195,
+43,26,32,20,219,119,131,169,30,181,204,182,89,165,63,203,42,125,26,159,172,135,248,234,137,149,158,204,38,79,16,74,244,4,107,140,3,129,215,79,76,118,223,126,239,101,195,113,101,154,89,49,201,95,95,251,236,254,171,173,223,196,233,104,200,135,246,172,169,84,14,152,167,122,139,219,135,75,47,23,162,249,149,147,74,56,113,253,167,75,85,29,173,198,214,107,242,109,161,146,172,102,185,117,192,128,143,49,143,33,126,246,37,115,216,201,155,122,202,103,23,221,77,25,70,33,127,40,184,19,64,110,142,99,238,250,92,184,71,26,87,182,55,111,200,184,34,191,140,134,242,231,108,222,39,15,105,238,203,89,227,94,215,86,62,59,18,150,89,78,57,253,210,215,126,214,8,7,105,185,52,251,81,229,202,166,62,75,241,14,102,207,90,230,116,100,218,216,153,221,248,214,145,60,239,165,141,246,86,48,183,15,3,227,182,138,234,163,140,249,215,200,185,212,96,190,9,178,241,105,199,130,164,244,44,250,210,100,66,114,184,38,244,125,58,191,238,149,178,209,216,12,218,198,192,0,
+7,207,70,159,104,146,244,89,178,80,137,105,57,57,66,149,72,62,89,121,239,227,118,119,18,104,117,199,58,239,232,181,96,39,181,119,174,253,144,210,188,42,90,224,216,35,134,251,160,250,190,226,202,26,165,105,203,212,69,239,119,87,198,69,212,250,166,47,173,68,6,134,178,16,98,52,11,28,215,100,253,150,103,116,74,236,79,235,246,50,146,210,10,164,66,156,20,226,12,48,219,221,155,79,247,242,28,108,106,189,85,12,109,85,215,12,96,253,40,91,201,243,124,158,229,170,144,185,20,87,77,141,247,195,126,108,69,45,30,14,178,163,217,234,104,110,211,106,227,162,46,148,125,226,136,46,47,4,235,172,34,119,145,93,210,239,183,249,39,158,252,154,35,197,79,95,213,83,28,215,177,65,56,78,104,93,98,78,92,189,145,219,225,204,126,232,95,101,124,153,187,2,39,106,184,175,14,143,39,249,243,236,37,93,232,64,226,74,236,230,243,166,83,122,204,35,119,178,97,35,202,179,48,198,37,146,176,81,34,6,99,6,249,135,166,37,48,242,202,38,169,245,85,83,123,193,
+245,34,60,78,230,29,163,194,73,79,242,169,171,233,56,228,58,78,159,155,35,39,148,198,91,57,188,99,8,120,183,154,186,34,17,154,125,40,95,47,179,118,199,29,146,245,97,59,22,122,78,125,215,0,192,133,27,127,102,48,155,129,61,169,170,154,153,213,13,221,94,116,241,111,79,199,55,219,113,84,42,103,250,22,249,195,188,40,39,206,229,207,154,161,2,55,86,223,135,90,143,156,130,207,193,172,179,52,118,229,108,43,181,95,38,75,209,26,30,250,103,125,231,81,191,217,42,36,192,233,123,79,171,73,230,239,13,211,128,158,4,103,242,83,167,181,117,124,122,163,72,117,86,253,56,62,90,184,220,82,138,53,69,91,72,167,158,133,91,21,225,224,206,7,228,201,2,250,71,233,1,19,158,158,105,121,103,126,50,159,117,42,220,91,63,41,53,234,74,209,202,112,207,169,162,208,84,155,143,94,161,205,238,248,198,193,101,10,41,193,253,252,1,81,35,159,29,102,59,1,162,231,12,244,17,188,211,210,101,94,108,44,139,228,102,78,212,23,173,162,207,151,251,104,221,151,
+104,45,112,147,22,66,21,234,34,90,115,183,134,49,129,11,7,7,123,81,0,3,225,247,68,105,175,149,111,224,182,146,120,32,34,224,73,184,40,162,253,188,197,104,58,242,151,113,148,250,250,89,224,197,10,239,25,78,95,179,86,62,215,72,102,193,243,106,246,188,20,188,224,134,13,248,176,49,131,247,200,247,182,227,167,229,163,234,200,83,198,252,172,244,17,45,31,231,80,72,226,106,187,101,148,233,11,251,163,93,66,158,195,107,147,163,72,165,93,135,220,234,71,248,152,118,74,192,21,43,206,19,7,112,158,81,200,194,118,69,238,153,41,10,164,106,138,190,188,139,249,118,158,124,79,99,225,118,72,206,134,231,0,154,56,199,142,226,168,59,17,142,14,195,209,208,240,213,75,162,90,205,224,132,140,15,28,106,159,102,164,7,171,221,74,181,111,242,8,214,137,177,35,236,185,45,71,253,197,242,166,241,118,41,35,246,162,192,27,121,91,54,247,220,104,36,22,30,65,99,85,124,250,234,149,210,55,188,27,229,109,55,22,249,140,65,195,243,3,202,125,202,135,145,91,75,
+234,233,156,9,185,208,183,60,92,57,192,199,10,13,18,166,254,152,107,67,204,247,34,44,39,225,220,185,163,116,118,175,52,141,102,14,167,58,155,110,119,244,123,166,15,48,238,87,178,237,254,136,140,21,159,144,47,8,128,76,214,23,93,6,55,111,189,53,211,219,153,251,225,219,201,250,142,156,28,101,71,102,32,48,57,215,43,246,115,71,109,183,15,84,151,22,155,112,14,43,235,239,235,186,164,71,174,59,133,79,213,34,249,67,149,76,108,4,15,245,195,194,161,49,148,74,13,81,139,23,142,250,183,224,98,8,57,167,39,153,38,106,72,49,155,210,95,182,133,28,231,39,73,220,240,100,169,112,72,89,3,109,172,21,207,194,88,194,16,246,82,23,191,172,35,192,147,144,179,62,59,228,50,205,254,252,210,56,88,151,162,36,182,164,69,57,232,179,23,129,182,142,147,157,31,245,204,18,31,235,53,36,15,238,140,190,48,216,212,94,106,239,197,206,202,93,133,11,91,4,248,1,253,46,114,220,58,19,139,89,136,194,21,199,29,13,181,80,239,25,233,195,146,226,168,188,
+37,84,149,239,186,230,250,238,121,93,40,176,11,202,101,85,190,84,68,200,111,217,252,184,24,172,91,187,228,19,114,100,236,136,208,155,69,92,53,154,45,54,51,205,122,70,33,110,102,177,17,145,137,183,60,77,86,101,100,31,216,54,96,166,36,219,22,183,190,154,130,134,53,123,127,118,191,157,188,185,40,9,232,134,213,252,136,190,47,92,179,41,13,212,232,125,82,250,200,90,12,214,121,111,112,226,96,77,34,226,115,253,38,143,181,208,75,81,114,75,91,239,152,87,209,106,30,132,118,227,160,205,81,90,227,206,94,210,105,86,111,149,118,252,129,158,9,223,200,159,140,226,71,0,112,184,161,58,254,214,147,76,230,201,52,78,81,30,27,235,131,134,254,209,83,223,42,139,53,213,72,127,41,125,90,46,150,231,15,75,121,94,230,143,221,177,254,90,160,101,108,88,225,170,44,92,12,117,99,21,95,236,130,228,12,181,184,11,65,123,236,64,191,194,234,141,156,92,32,193,170,242,115,109,175,69,18,34,173,68,115,179,28,114,86,199,245,201,230,253,116,23,250,112,221,134,
+136,145,196,232,68,159,113,217,57,158,79,251,124,209,166,10,239,199,62,28,122,195,183,208,138,190,133,81,209,57,30,187,44,172,7,167,255,176,36,50,137,12,133,208,179,140,62,56,227,128,106,131,60,178,216,199,232,122,77,71,79,145,41,203,27,133,124,211,169,204,239,2,159,79,70,237,240,225,134,186,0,166,38,165,64,128,181,179,18,142,115,45,16,105,106,228,15,140,119,185,70,31,50,28,83,3,118,241,217,242,9,211,167,139,108,112,89,27,152,106,52,78,147,217,104,172,224,41,57,10,245,60,150,240,140,157,101,201,39,157,19,161,87,116,208,50,170,28,111,252,217,158,251,9,96,46,238,94,132,144,24,131,33,137,49,148,85,98,174,237,63,21,168,175,149,180,246,248,104,234,63,188,234,203,219,34,50,105,61,84,86,201,177,125,158,194,229,28,86,122,33,62,133,242,180,199,190,230,196,143,205,124,39,9,125,143,10,88,67,67,15,28,33,76,133,16,2,234,91,134,129,124,97,15,195,182,44,253,80,85,202,120,153,193,94,89,79,38,135,43,91,98,133,224,169,229,
+140,122,158,229,84,61,120,26,247,192,103,232,46,196,223,146,253,39,62,59,87,210,90,73,118,195,221,153,22,33,139,21,135,140,88,113,228,43,50,141,174,62,47,26,27,238,99,85,23,174,242,132,169,106,149,152,188,112,25,123,240,141,99,175,39,131,187,103,122,104,32,177,89,196,123,62,143,147,204,2,81,63,92,5,109,47,95,46,35,214,28,214,142,187,101,132,20,79,74,177,61,71,238,99,9,37,38,33,140,37,180,2,199,115,136,45,174,102,94,42,234,79,237,44,112,51,77,190,225,147,159,23,211,235,157,33,186,87,234,17,82,95,91,244,118,113,120,121,55,227,150,43,233,75,36,152,90,107,163,170,21,213,171,177,149,150,121,83,179,126,146,38,23,133,65,69,86,175,20,54,77,113,187,111,87,39,38,73,147,153,126,245,100,63,150,120,172,97,99,207,85,51,162,110,218,145,134,0,204,56,53,61,251,140,56,219,171,207,231,108,246,194,125,62,195,144,43,44,88,206,129,236,222,195,228,114,70,189,206,50,75,161,177,238,106,169,71,39,148,83,151,231,79,129,53,153,
+176,148,19,116,153,64,178,220,237,149,5,175,219,147,16,49,151,187,64,148,137,222,241,144,171,77,133,101,154,22,160,161,135,170,124,239,202,55,8,196,118,72,248,40,242,98,31,85,247,226,156,53,3,33,26,131,12,71,137,1,38,16,3,215,49,174,188,24,199,157,201,232,177,114,106,199,16,157,11,112,40,71,212,202,231,122,195,171,12,184,61,135,132,89,15,45,133,141,163,173,55,20,136,97,71,141,161,56,41,1,54,67,227,209,251,116,255,33,62,187,111,167,12,108,111,160,194,133,149,232,198,69,249,233,108,228,63,20,93,157,155,146,197,228,42,241,179,127,142,170,7,46,244,167,0,221,21,160,127,64,100,171,19,113,85,95,203,150,27,101,178,108,19,166,46,172,155,147,255,205,138,53,28,26,248,219,203,205,66,123,36,111,222,40,187,133,100,100,166,15,187,38,14,107,55,238,79,23,242,36,188,21,165,211,45,242,205,118,92,122,48,45,188,236,0,195,34,191,68,85,31,208,60,76,21,97,111,167,125,111,53,148,124,91,170,60,229,195,142,102,97,170,108,59,214,113,
+246,164,184,80,61,167,245,28,191,48,19,141,33,10,28,177,113,212,65,114,62,191,53,131,141,68,169,132,221,184,194,159,107,197,46,234,147,5,75,101,103,250,210,104,65,0,99,238,192,140,229,100,125,170,105,27,158,232,36,23,211,37,211,183,191,104,64,44,173,37,118,150,38,122,27,59,243,143,162,104,255,208,185,20,14,167,117,119,19,62,31,149,248,124,119,31,189,200,63,227,131,238,83,50,54,37,98,236,172,215,105,106,28,207,96,119,185,98,53,176,63,196,20,13,119,178,250,114,202,84,162,135,133,252,161,236,56,91,55,129,217,70,113,209,243,98,136,38,103,183,173,149,56,196,166,123,235,96,114,206,150,187,67,201,78,207,30,112,205,73,108,151,164,90,236,244,52,98,241,252,80,191,236,181,183,173,13,110,42,18,225,142,47,148,142,208,81,174,93,132,245,246,61,28,45,226,214,37,216,199,50,190,72,53,7,149,133,15,33,202,94,172,22,88,219,216,99,51,59,197,139,83,142,103,51,161,166,239,61,84,130,108,233,96,166,194,43,221,151,76,184,245,236,247,85,116,
+131,104,165,63,120,9,182,185,8,131,124,50,126,32,200,249,156,209,124,47,146,164,71,252,154,141,61,148,124,206,47,198,144,187,73,251,84,61,38,102,115,171,108,233,178,47,61,131,172,80,15,23,232,150,92,155,127,211,123,192,121,102,222,89,217,42,246,172,154,119,30,39,99,192,209,0,40,138,228,92,134,162,20,147,188,176,250,122,120,17,47,179,211,185,32,82,34,176,123,69,233,71,43,204,187,53,40,197,158,228,12,227,62,150,108,6,238,61,27,181,156,172,74,144,241,155,160,92,215,54,219,75,82,190,210,233,192,195,65,52,171,16,137,103,111,213,104,228,82,66,138,83,144,119,18,156,214,241,42,42,31,61,216,238,238,225,20,40,3,104,0,105,106,227,213,254,76,252,185,124,12,116,200,201,132,136,198,231,141,233,137,68,98,54,43,68,26,0,121,78,207,135,109,101,98,106,166,149,52,22,21,200,67,35,164,63,118,148,230,145,209,214,188,39,132,214,132,42,100,110,117,36,213,136,55,224,193,209,195,139,241,111,92,174,250,216,169,225,57,67,21,155,146,56,59,12,
+217,27,130,157,246,160,219,8,42,50,61,169,87,150,88,137,151,243,114,101,82,93,224,4,63,182,230,30,243,230,110,147,179,63,130,3,114,211,222,77,138,12,107,66,210,212,125,239,168,189,85,151,99,35,102,39,123,96,158,184,175,74,165,168,122,147,174,241,152,210,122,145,174,64,96,177,230,6,4,100,114,163,122,108,0,106,65,147,3,50,166,71,121,177,183,247,16,115,39,117,188,13,151,145,181,74,228,178,209,89,156,62,90,115,219,210,243,141,133,226,77,23,222,92,191,184,107,234,176,79,224,160,129,247,103,6,45,193,49,240,198,95,175,86,213,71,211,178,165,222,141,252,15,81,163,129,105,96,192,45,48,19,182,217,195,133,57,238,0,138,37,231,79,42,181,82,120,214,244,5,206,145,84,69,81,111,140,62,215,44,152,171,70,197,182,159,29,115,172,104,194,109,173,37,167,77,244,60,105,88,64,193,122,189,238,69,7,5,212,141,30,110,77,63,43,124,246,186,66,173,80,0,0,198,56,180,108,203,61,99,227,97,210,218,46,52,88,0,120,72,41,177,56,105,27,126,
+122,36,96,55,235,22,99,28,215,32,193,251,182,73,205,116,200,13,216,235,80,231,228,22,168,189,239,220,142,244,121,40,187,220,31,17,110,69,70,8,0,94,205,199,180,200,217,193,139,47,116,58,196,218,96,122,93,43,25,12,114,131,117,192,86,15,147,109,178,105,51,1,62,126,153,208,133,132,90,166,225,182,252,224,185,239,25,223,192,43,205,165,155,5,94,41,18,116,93,72,107,151,156,234,109,120,126,117,186,55,211,165,0,206,111,16,196,96,56,255,130,87,31,141,184,100,240,225,43,93,26,88,178,77,85,142,114,79,98,65,0,158,181,62,162,50,13,207,213,105,97,160,249,163,124,85,235,169,110,176,207,177,110,149,242,21,186,125,55,3,138,29,219,201,6,23,61,4,239,147,106,32,58,231,115,98,20,88,0,135,185,181,111,220,199,62,124,109,14,184,74,253,192,15,88,231,118,71,105,37,6,213,126,47,187,15,97,207,227,83,221,222,55,190,196,63,144,128,243,110,120,235,70,88,38,219,161,76,234,39,76,140,46,17,196,130,247,5,176,131,44,170,2,133,206,225,
+134,70,137,133,57,186,87,133,57,16,6,188,95,150,64,195,135,210,16,0,80,125,51,97,93,1,90,14,81,111,87,31,33,128,26,1,133,107,198,219,126,192,9,1,128,231,158,113,232,130,83,202,102,52,224,124,185,163,96,179,7,129,3,125,34,135,221,58,115,18,90,175,56,32,0,117,231,152,216,56,79,117,12,253,204,38,169,71,96,232,188,237,186,118,208,3,173,209,168,233,19,42,242,10,34,191,174,80,68,184,129,201,107,125,215,141,169,242,243,61,222,184,108,77,103,17,48,54,14,0,176,45,225,243,16,34,208,29,135,237,65,173,254,174,103,52,78,24,103,193,20,83,169,21,195,96,192,53,91,46,48,12,236,190,76,173,193,175,65,171,49,110,221,101,31,25,93,227,244,188,24,122,249,10,168,55,44,18,19,192,34,239,137,93,184,193,0,227,111,238,176,8,192,56,42,209,169,103,10,253,30,14,115,202,106,92,176,76,14,98,199,230,186,189,174,199,223,68,224,48,96,96,213,91,25,166,60,156,240,49,5,140,31,44,250,120,1,175,166,190,96,166,53,113,33,224,
+170,158,30,158,72,18,151,251,84,153,206,35,50,66,32,143,224,53,157,243,148,3,64,2,80,76,34,245,166,215,21,113,41,250,210,195,242,145,131,60,67,169,3,11,16,176,175,34,7,51,224,68,106,8,213,118,182,135,29,48,201,139,27,87,13,186,211,54,204,73,74,23,237,241,229,8,107,171,215,231,118,7,111,241,252,252,116,110,121,121,32,25,145,198,66,245,163,139,129,19,195,139,222,173,191,254,74,159,80,56,231,225,36,53,29,251,16,7,25,59,232,104,43,235,198,214,115,30,82,117,214,166,106,106,103,113,220,198,133,103,86,108,183,194,50,178,159,250,186,158,1,16,184,45,16,62,21,95,77,125,189,254,26,90,116,99,60,208,27,149,76,11,14,70,5,61,106,14,128,193,121,69,82,112,27,159,66,16,129,249,35,232,69,18,227,133,58,13,171,113,244,168,181,14,29,56,222,111,129,155,23,148,150,185,114,167,47,131,143,18,112,215,24,211,43,201,211,118,234,170,185,8,208,35,56,74,149,0,250,155,23,162,82,133,180,90,252,163,69,76,202,14,198,28,237,167,
+250,128,99,55,222,3,174,48,3,94,28,184,8,224,157,14,89,24,1,64,169,20,144,45,175,65,85,151,94,252,6,8,56,64,143,194,172,245,65,213,6,220,189,55,122,70,220,196,29,128,193,23,25,52,24,98,249,49,163,242,153,152,178,139,6,40,31,132,167,130,26,185,194,94,127,20,168,195,110,80,132,187,237,86,128,176,199,112,97,117,57,99,220,31,220,88,65,116,163,225,178,19,206,128,171,18,64,228,2,77,216,87,160,250,14,240,44,12,80,67,97,215,240,109,186,89,61,112,52,200,80,238,21,156,234,137,124,116,51,76,131,33,228,177,198,244,230,175,184,127,43,187,7,7,172,207,125,74,78,147,32,150,175,80,54,182,149,80,99,114,180,43,160,203,134,82,226,134,64,250,152,26,87,119,250,227,214,2,130,0,158,77,215,50,176,237,59,93,185,167,175,0,231,13,92,51,233,109,35,36,192,167,173,115,7,85,196,221,123,69,155,40,157,124,252,157,104,135,131,103,51,84,136,149,119,131,205,158,204,78,238,155,201,157,55,88,133,133,27,83,237,161,111,28,100,33,
+81,232,131,5,190,185,84,224,111,104,193,3,127,215,147,110,73,15,206,231,194,20,185,161,64,74,179,203,209,190,53,128,171,211,2,204,115,200,94,79,119,158,109,0,33,234,67,200,206,198,54,247,131,11,218,192,89,105,235,1,144,41,19,17,55,195,9,154,28,25,17,218,0,107,116,192,75,57,50,120,252,199,20,217,193,26,6,32,174,19,46,240,193,165,86,202,8,210,42,72,68,17,113,4,11,90,211,141,253,40,128,100,248,232,232,46,72,131,216,106,108,104,221,48,198,169,44,120,143,162,17,1,29,173,95,144,46,32,191,193,162,176,249,87,248,216,235,91,210,213,250,117,249,61,67,153,37,131,6,222,92,249,193,168,124,125,196,128,100,220,198,78,160,159,98,68,160,103,4,46,98,15,3,46,187,12,14,156,51,232,119,250,28,41,3,231,137,29,246,65,105,149,218,43,118,112,1,165,106,129,2,78,191,155,2,143,61,97,29,16,14,252,160,175,103,131,202,171,126,87,145,136,109,154,87,2,85,19,124,76,51,88,149,121,249,72,254,73,126,82,172,186,13,204,177,142,
+183,212,116,2,94,254,160,131,151,29,212,13,28,5,94,222,96,55,182,180,254,227,250,0,154,9,62,92,10,173,139,139,17,1,146,143,109,115,118,195,225,154,193,54,245,214,214,171,162,228,202,118,143,111,130,179,43,246,245,248,179,64,0,51,74,108,207,96,131,89,149,174,128,34,144,110,223,61,199,33,60,63,90,113,0,128,171,95,113,185,237,140,119,207,239,195,235,255,4,190,172,86,58,110,159,159,42,186,85,143,236,248,16,173,15,184,3,3,166,149,164,4,156,93,63,138,121,211,41,213,134,72,109,201,128,193,138,252,138,224,217,244,164,111,170,169,24,205,83,250,225,73,242,228,114,185,239,79,197,41,231,56,133,232,129,154,222,229,142,79,1,224,174,212,51,210,239,95,1,72,200,229,150,185,166,4,250,61,32,93,148,44,96,146,192,183,198,19,19,61,139,138,181,56,14,32,50,118,130,26,251,115,45,255,224,241,24,209,36,149,122,58,223,100,209,123,240,254,168,29,79,163,184,159,247,16,63,128,127,44,243,8,122,69,126,255,81,231,202,50,243,207,167,65,72,178,
+44,18,176,34,71,248,139,141,170,237,247,47,54,90,220,120,190,216,200,156,164,126,177,17,65,90,217,97,112,3,201,178,118,52,70,87,67,112,157,144,214,250,89,54,37,76,125,58,71,148,138,17,82,99,221,143,7,119,75,87,81,41,107,47,107,48,177,173,207,111,149,233,74,5,231,192,44,112,34,182,117,251,121,134,93,233,55,18,2,147,252,65,114,136,6,101,233,100,159,57,117,20,131,198,176,59,224,213,53,29,111,87,49,221,11,191,209,101,43,100,146,200,28,161,173,24,98,39,196,141,8,94,5,125,196,7,115,244,112,40,77,189,249,18,138,93,165,60,143,98,29,247,46,176,212,184,131,131,184,124,161,134,155,181,123,3,214,32,187,111,15,205,210,42,231,65,4,131,131,68,162,38,56,27,216,9,123,228,8,24,189,71,119,17,52,52,124,148,7,137,109,160,49,67,123,47,182,81,252,150,206,0,165,164,232,192,128,99,172,206,83,211,12,176,4,163,253,10,192,39,185,50,58,0,49,98,214,177,233,21,148,171,102,87,135,189,12,56,195,137,35,136,224,6,16,80,
+49,40,252,185,14,224,141,183,31,211,14,118,210,135,148,190,120,38,75,11,94,65,86,44,208,213,96,90,184,250,79,12,250,175,162,45,221,209,8,86,173,213,68,3,116,215,40,5,115,121,228,74,95,6,67,81,13,252,116,95,237,203,207,11,248,83,241,6,116,163,181,199,48,230,239,8,63,171,87,240,83,152,255,205,13,113,82,21,215,187,208,86,208,217,207,101,198,25,123,207,104,233,65,220,195,190,242,56,119,10,220,95,209,7,226,75,124,163,212,50,119,238,157,19,196,213,51,168,128,139,255,5,59,113,239,22,219,45,79,217,6,35,240,133,243,78,157,200,6,89,197,152,214,94,193,70,129,251,2,1,86,81,188,151,158,156,100,48,206,6,46,247,13,200,10,131,17,20,168,212,222,25,240,161,147,128,70,192,139,244,175,58,128,87,247,178,252,115,119,106,234,189,226,12,5,226,204,144,163,67,114,215,229,208,12,86,164,228,225,11,113,170,73,90,81,23,62,223,3,252,221,96,11,82,111,227,170,12,154,208,138,50,42,169,20,0,56,93,96,157,96,232,185,8,48,4,
+220,112,37,170,107,61,49,217,218,128,47,146,6,85,152,65,208,87,133,189,79,112,243,149,136,12,183,165,158,248,6,92,9,15,16,223,130,158,135,224,185,211,213,104,171,27,223,126,168,202,250,82,21,9,138,102,84,62,170,232,215,43,31,129,9,189,224,172,189,93,41,245,29,14,170,51,161,43,151,16,144,29,84,42,25,23,242,85,246,97,241,123,236,151,93,115,160,93,193,148,224,214,179,208,67,179,193,40,219,168,244,110,214,155,174,78,132,129,252,46,130,4,108,224,44,153,2,110,49,51,3,114,11,107,219,194,118,241,198,143,169,150,137,201,185,221,16,214,132,206,175,64,8,86,157,21,197,26,79,215,97,243,248,65,38,58,144,125,94,138,66,85,54,88,138,166,82,124,245,197,83,10,201,14,106,185,74,64,235,26,187,118,177,85,37,206,198,206,235,131,25,166,250,125,55,38,95,122,16,51,235,92,161,188,240,25,35,251,194,152,20,79,94,140,149,34,4,44,60,28,248,110,17,30,154,48,95,198,218,107,0,100,155,140,250,189,79,51,236,236,120,219,202,142,60,46,
+178,234,247,89,65,61,25,84,183,25,149,123,208,6,254,74,114,4,62,10,57,24,109,20,141,101,181,193,201,245,94,5,135,245,166,97,65,88,80,96,34,143,215,211,66,160,221,35,214,108,35,200,212,233,206,67,13,165,187,141,48,58,136,90,237,34,139,2,32,232,190,244,85,190,110,127,202,7,102,91,112,142,7,75,209,206,199,243,87,60,89,241,24,208,161,70,8,144,5,30,148,88,135,112,81,217,211,165,162,196,36,0,55,88,131,159,0,80,187,187,185,122,135,59,21,61,213,195,140,113,2,86,250,137,182,141,176,60,31,113,181,124,215,173,163,79,156,4,145,27,62,4,163,41,94,17,77,131,168,225,53,227,184,177,87,71,151,238,117,71,229,24,116,212,205,149,205,13,180,213,231,79,105,190,51,29,242,54,19,163,240,136,145,250,65,188,42,128,155,107,218,174,196,51,175,80,16,96,37,238,45,243,11,135,151,164,23,115,173,214,62,208,190,57,156,114,73,222,16,32,32,150,180,41,40,64,87,55,60,110,85,25,66,13,176,233,74,213,13,64,189,70,65,40,168,122,
+128,241,99,216,44,0,84,212,13,101,221,198,67,165,74,244,115,164,47,192,163,174,233,173,2,3,176,78,127,54,251,174,92,209,247,152,152,1,94,85,168,111,174,2,146,128,245,203,60,217,32,79,9,5,5,168,0,252,87,88,133,66,75,212,149,8,86,102,60,234,11,206,91,234,204,238,159,127,76,71,248,219,175,66,227,236,210,137,113,87,11,118,247,170,2,6,112,5,189,101,183,133,83,220,234,114,98,10,255,169,14,112,33,228,49,118,115,56,110,155,1,18,250,90,25,193,164,63,213,93,72,144,61,236,71,54,31,125,189,137,60,161,231,206,247,95,247,19,200,237,107,26,36,191,242,3,134,210,138,66,51,67,1,174,16,84,140,128,114,192,65,11,102,159,78,2,41,192,189,219,101,147,83,213,85,51,184,44,136,2,41,106,134,206,78,43,77,144,72,186,187,6,229,250,28,151,212,161,83,2,215,226,45,86,204,5,177,102,85,93,89,167,160,206,88,216,21,87,153,61,146,247,5,163,179,10,123,221,215,12,179,232,41,228,234,189,233,155,228,248,37,54,13,92,130,74,
+176,34,172,132,181,214,9,7,20,136,174,75,29,44,52,112,67,127,105,127,229,225,159,244,19,65,65,39,95,245,187,37,154,46,192,85,191,246,169,206,7,240,239,37,182,206,122,152,213,111,41,126,59,226,58,124,82,63,129,89,235,253,209,129,245,138,46,111,93,110,128,2,22,137,28,251,61,176,117,133,119,238,69,244,194,103,125,9,116,247,56,16,112,117,241,233,122,193,185,50,171,236,237,156,195,128,203,104,191,97,99,182,13,157,31,64,25,142,141,49,13,0,232,87,103,228,99,78,44,168,236,66,117,188,175,128,60,49,135,87,183,233,125,243,186,162,244,112,162,68,0,220,78,161,62,117,141,25,231,243,48,141,187,22,170,139,152,139,13,7,61,91,119,151,192,189,204,78,21,133,92,248,155,202,129,102,129,51,136,197,200,234,34,4,122,78,252,98,233,19,214,49,113,100,209,110,44,110,53,227,80,146,219,31,53,15,215,93,77,217,86,231,52,70,194,189,138,10,48,239,26,247,103,227,112,75,57,239,146,67,61,155,175,190,103,153,142,96,157,30,127,29,35,16,115,6,
+190,90,2,104,22,28,65,33,85,64,23,238,153,5,210,3,146,202,211,44,59,45,200,110,187,203,66,35,1,231,189,74,249,178,245,212,239,58,195,8,140,143,26,107,136,188,110,187,97,103,32,195,60,52,149,245,79,190,175,165,224,207,71,53,170,193,61,102,82,0,15,122,106,169,171,169,25,75,179,23,219,192,55,249,60,159,168,169,12,77,26,184,111,233,134,0,78,5,148,95,107,218,87,227,237,112,98,18,108,4,143,101,210,226,115,182,17,82,118,138,247,136,73,120,183,147,107,12,201,199,91,158,82,98,105,202,134,130,207,164,100,98,234,24,118,240,77,61,38,90,228,149,143,231,209,122,220,205,102,235,58,243,38,82,117,158,119,170,197,33,45,74,46,221,141,162,126,56,150,149,119,75,6,126,219,96,27,246,196,49,110,122,208,214,79,23,95,129,243,233,102,25,119,94,106,54,42,174,89,98,134,188,127,115,92,245,31,203,61,168,232,104,144,221,102,53,199,155,174,253,176,151,246,173,183,71,95,214,224,84,114,171,167,33,116,211,157,13,214,23,115,117,150,47,24,76,
+49,71,236,180,107,176,86,118,155,166,214,69,107,235,56,171,59,6,185,3,184,192,201,65,59,195,236,249,255,230,60,239,143,223,127,243,117,28,242,122,126,247,155,223,127,251,195,119,255,247,183,95,221,111,127,243,135,95,255,248,221,239,126,249,219,111,191,249,199,239,126,251,247,223,255,227,207,79,236,126,29,156,252,63,190,253,213,143,255,194,241,202,223,254,199,95,127,251,183,255,250,87,223,255,250,251,223,255,241,148,229,239,193,187,127,121,29,255,175,197,92,15,16,255,247,250,154,95,191,253,252,63,129,58,252,248,15,223,255,225,199,111,126,249,171,95,125,251,235,111,127,58,159,249,159,190,253,47,215,111,250,255,234,219,31,126,248,147,54,231,215,137,127,248,225,207,31,40,254,155,191,254,119,63,29,93,59,252,201,209,53,17,115,68,42,163,0,174,26,15,183,204,54,189,87,13,75,36,187,169,184,216,154,27,241,186,236,62,162,235,157,38,123,78,116,197,19,250,9,242,137,159,235,220,183,111,201,198,19,12,52,43,88,130,134,55,71,97,94,116,168,156,93,110,84,74,
+111,184,121,62,134,149,152,250,107,140,74,250,248,180,86,235,85,188,114,173,154,230,22,58,94,151,75,60,98,167,43,49,251,157,246,105,127,182,222,77,155,66,225,155,12,21,27,172,170,141,100,207,174,170,7,88,135,190,151,142,41,225,237,3,216,148,44,125,193,194,129,15,56,236,44,145,3,242,159,119,145,248,167,3,216,223,253,246,63,124,255,251,223,252,212,191,224,155,95,254,248,117,154,239,239,190,255,241,199,239,127,115,61,224,246,147,223,126,102,23,208,136,191,250,135,63,119,154,237,47,127,241,23,191,248,203,95,64,97,36,128,116,53,202,240,159,154,14,80,98,33,134,235,254,209,183,184,108,241,214,34,18,197,182,182,120,108,159,173,0,123,199,154,80,181,119,156,235,81,250,200,246,67,21,253,39,197,99,188,143,22,224,31,252,3,92,151,0,211,181,41,18,194,99,107,84,130,103,4,237,12,242,22,127,112,180,250,213,215,207,112,52,42,36,214,249,79,154,35,50,48,62,183,54,154,201,97,29,217,51,100,149,87,62,159,223,5,127,189,197,252,167,163,75,34,117,
+53,154,161,149,72,140,117,58,153,172,57,187,89,152,66,15,208,35,181,18,197,98,151,97,90,120,47,37,5,58,232,99,54,155,53,149,60,209,75,180,216,239,235,20,138,151,236,51,84,109,101,58,91,133,82,73,78,118,144,119,161,118,36,41,77,75,17,202,161,174,16,137,159,17,181,237,90,127,43,39,160,145,211,18,109,81,64,176,129,181,135,53,115,32,84,168,96,223,199,92,231,91,31,40,124,244,158,80,73,177,113,56,28,188,78,157,9,119,135,226,91,62,185,75,170,88,37,15,205,125,96,127,66,140,170,82,119,150,62,230,128,179,104,44,201,13,159,32,40,171,37,99,130,156,40,143,179,199,79,168,129,16,103,175,214,15,106,249,112,179,41,91,25,103,222,102,109,130,188,118,41,52,65,44,52,67,191,109,151,226,253,118,145,163,11,128,220,225,230,38,216,55,158,114,208,184,119,100,209,110,184,52,71,196,251,242,28,23,151,98,49,145,112,171,236,75,30,162,27,245,250,180,128,57,45,77,93,211,120,210,176,172,161,155,232,153,137,65,59,219,182,41,128,175,74,68,
+251,222,163,248,85,96,19,144,196,216,48,106,68,36,215,14,22,12,227,2,199,46,145,34,91,74,167,213,145,230,104,18,127,76,112,30,91,51,96,30,100,79,88,151,81,121,190,105,207,158,197,179,116,118,7,57,82,115,126,112,247,238,129,163,178,47,235,91,168,16,165,104,168,10,162,141,25,226,219,186,6,122,70,183,91,61,111,9,156,86,75,27,75,64,62,216,186,84,184,24,183,244,94,204,235,115,248,125,144,59,2,159,112,169,247,132,9,216,80,143,110,41,157,253,204,111,188,156,24,90,123,143,227,95,66,207,9,89,186,80,60,224,237,126,107,235,37,54,185,187,119,56,93,17,200,64,8,169,88,182,155,249,134,208,66,113,241,82,181,100,255,137,23,215,215,79,207,234,227,200,53,68,175,3,202,116,107,204,15,182,41,81,25,155,69,2,213,130,60,77,83,151,196,210,115,6,75,94,136,249,206,235,228,67,5,37,187,152,118,124,186,29,161,11,85,109,204,155,131,150,253,104,52,99,40,73,49,230,170,20,161,16,61,183,114,101,1,32,67,64,172,254,90,13,34,38,
+83,197,240,83,43,25,83,67,78,55,10,145,254,78,209,59,197,237,117,164,211,75,243,73,156,230,221,237,109,212,8,191,87,79,109,81,39,46,247,70,38,246,139,100,57,184,130,169,4,249,26,37,67,187,94,68,202,160,10,173,96,220,34,234,9,199,76,21,226,64,236,44,185,254,232,36,245,84,53,206,143,3,205,127,6,229,255,245,117,166,246,7,144,155,126,117,69,227,63,131,238,255,252,229,223,253,139,71,140,255,253,223,252,197,95,255,226,223,1,48,57,212,12,1,97,231,61,255,241,136,113,57,52,47,121,17,100,239,108,47,240,57,158,224,156,218,186,18,109,120,201,165,61,173,99,178,160,145,212,13,181,60,217,103,234,161,122,38,71,207,139,81,178,163,44,174,54,201,19,161,199,136,146,214,33,133,6,186,189,39,144,225,192,235,159,214,58,87,35,131,16,157,167,216,241,237,46,126,3,73,65,114,171,144,189,225,185,205,102,15,96,117,250,245,115,4,200,155,195,101,75,233,176,197,28,4,224,124,227,132,167,142,147,170,140,115,221,61,1,70,73,247,82,61,87,7,
+241,230,235,73,147,83,170,211,91,146,13,43,233,164,56,65,0,181,162,138,38,142,138,109,60,68,176,68,131,145,252,225,108,65,164,99,245,121,36,133,119,59,233,18,156,140,61,37,136,55,234,74,215,228,56,83,36,21,100,112,160,121,199,171,205,172,176,85,182,193,92,47,8,91,248,61,17,229,228,47,88,97,112,196,122,240,28,176,65,76,179,106,67,17,73,29,63,183,182,178,155,195,92,135,227,68,179,183,225,47,42,112,190,88,211,2,231,19,48,140,194,105,17,97,185,38,232,203,154,120,157,64,178,253,52,129,176,186,161,165,240,194,182,178,88,198,202,13,170,215,8,92,28,86,101,36,165,198,101,192,78,14,131,89,19,229,24,236,25,94,84,103,35,68,146,164,78,28,234,157,166,158,37,154,177,138,201,131,19,181,164,186,188,151,67,91,37,233,112,134,241,226,110,174,99,124,178,173,142,81,106,37,162,157,188,231,200,19,137,213,122,10,118,18,27,179,4,146,123,189,203,177,26,152,185,243,172,237,78,182,33,30,205,224,211,244,34,170,108,78,210,17,209,98,250,82,
+48,104,15,24,59,231,226,66,50,140,189,98,78,116,170,123,145,21,247,71,137,130,166,194,18,144,67,99,50,248,184,240,233,244,49,162,6,227,203,89,22,25,29,147,2,220,106,229,130,197,55,214,248,124,111,114,198,92,204,33,91,177,50,22,214,217,207,150,217,186,138,55,89,36,195,3,39,62,207,220,109,8,175,152,236,73,210,253,168,116,151,77,121,198,64,180,93,104,239,99,205,230,174,230,9,234,236,56,84,231,163,71,176,212,55,46,199,113,213,30,121,39,196,143,124,163,162,158,58,44,114,228,88,52,41,101,44,148,105,100,90,56,47,64,107,80,214,24,142,141,236,154,52,171,219,41,52,105,193,174,57,231,194,147,157,150,218,197,188,75,134,195,7,200,94,151,97,120,160,233,95,46,170,251,206,237,77,190,190,76,122,167,245,65,224,99,124,33,164,162,54,22,102,172,179,110,79,1,6,31,115,215,172,206,43,66,214,100,99,151,237,59,86,155,64,7,174,17,92,162,60,130,119,213,177,71,248,201,183,234,118,9,157,73,220,206,112,35,234,132,105,114,179,134,91,172,
+186,78,239,16,125,6,245,224,104,165,129,160,122,45,232,142,170,137,89,199,34,157,120,105,197,226,192,212,98,67,34,114,127,209,17,240,223,250,238,45,157,45,188,124,129,154,218,99,158,96,140,35,115,224,195,240,41,213,25,70,194,108,30,40,1,205,209,6,130,224,58,142,235,251,182,143,49,145,34,236,180,112,86,127,81,197,235,54,104,238,225,190,202,22,213,59,34,17,205,109,90,239,208,11,67,153,113,59,102,191,145,18,22,218,164,12,51,8,143,167,20,14,78,99,241,193,56,178,206,161,54,27,150,77,75,76,136,71,209,188,51,23,34,168,3,253,2,7,172,51,124,55,102,191,19,109,46,140,96,88,4,85,132,165,17,91,82,24,233,88,55,160,119,219,49,175,30,7,174,212,57,88,178,168,174,172,234,204,239,110,171,236,88,129,15,63,96,233,199,251,149,108,243,234,195,156,60,81,127,54,98,251,186,139,234,82,32,22,143,187,209,231,208,187,225,37,48,180,27,121,33,138,160,45,147,85,54,131,27,86,175,211,150,120,163,15,199,64,51,34,247,7,38,225,16,13,
+117,152,249,105,21,77,209,251,45,146,19,226,95,81,93,0,7,192,238,146,23,187,122,177,143,113,1,167,151,234,225,238,150,142,11,23,246,8,0,161,103,24,0,16,10,126,176,44,33,191,98,192,170,239,22,3,5,222,123,79,224,104,193,127,243,53,122,7,192,190,70,123,79,15,95,163,92,224,233,107,148,219,86,16,105,252,179,94,109,36,72,134,123,166,212,97,235,64,178,121,175,166,71,190,229,145,37,71,120,127,99,233,102,247,156,84,78,58,126,189,227,149,246,219,86,160,227,184,92,186,72,141,187,163,88,195,211,235,67,213,82,61,201,222,27,177,75,169,178,239,155,100,145,124,110,13,183,109,38,27,43,196,180,160,190,52,11,147,55,185,132,237,34,149,47,244,192,174,252,178,62,192,78,196,102,185,84,178,178,15,235,207,157,106,181,226,173,116,83,248,42,29,131,196,202,35,56,237,6,179,251,76,93,212,14,114,143,206,135,13,204,145,112,118,171,201,94,182,117,68,47,184,44,155,72,59,58,124,195,137,168,170,201,88,111,29,86,15,253,25,166,100,34,131,90,200,
+147,134,50,74,179,85,95,97,170,241,91,151,144,161,165,46,111,106,6,251,160,133,149,186,188,113,126,41,45,18,197,189,210,131,37,237,184,156,103,164,247,25,156,230,211,72,167,79,215,39,232,92,196,197,69,174,201,198,56,177,88,153,178,113,48,181,195,165,185,195,102,180,75,180,84,50,198,239,180,14,40,11,129,45,110,176,87,207,178,176,1,117,136,29,184,65,98,101,154,3,253,84,120,165,204,55,88,7,59,47,57,231,13,136,36,18,138,161,219,79,119,37,165,42,196,165,143,35,140,150,86,245,57,234,177,246,103,163,22,147,113,215,105,234,41,60,189,212,84,161,112,210,42,173,33,8,170,85,7,63,58,13,63,11,168,24,250,242,3,229,58,58,225,10,10,107,176,185,56,76,175,149,75,205,109,171,175,141,124,16,211,91,29,168,136,130,198,124,235,40,43,44,25,83,17,23,142,199,227,22,173,53,57,1,81,219,211,46,191,45,159,64,58,70,68,158,248,118,75,53,27,63,238,195,43,50,59,215,35,4,166,219,36,66,98,154,102,123,136,184,224,212,197,251,142,55,
+22,145,102,117,14,60,227,58,59,23,18,182,173,109,149,8,89,190,72,114,119,203,43,107,100,92,104,86,91,130,53,205,182,177,244,130,57,54,107,64,190,28,247,62,55,102,250,20,58,83,149,125,146,235,121,237,46,247,193,21,180,134,66,209,174,62,185,47,100,14,150,251,167,68,18,220,252,73,120,73,174,110,26,77,205,28,180,19,98,23,9,15,36,175,50,245,179,33,158,11,172,168,249,129,194,145,94,170,69,240,36,101,90,34,81,45,48,196,28,201,204,155,46,208,158,15,23,36,184,226,239,181,128,130,86,126,114,60,145,91,93,137,253,133,106,201,167,29,167,99,130,238,85,24,55,197,1,232,161,147,89,71,76,158,14,74,92,253,246,84,159,170,23,213,213,234,229,166,138,208,117,131,92,250,249,85,85,193,39,21,1,109,63,248,202,35,44,68,163,37,57,72,125,21,31,79,120,115,31,46,139,112,3,34,235,229,238,121,197,190,65,232,170,65,184,137,84,94,72,245,227,68,17,126,121,67,179,208,3,206,113,213,80,99,200,139,208,41,69,196,208,185,99,74,247,35,
+98,232,220,205,189,62,153,68,147,237,87,153,195,58,70,218,111,248,114,97,23,60,205,113,11,36,52,45,157,28,223,72,24,5,233,69,119,183,171,120,58,58,125,103,139,182,24,3,93,197,94,216,211,84,159,235,174,8,197,235,162,177,222,55,7,198,234,204,70,96,6,88,22,108,176,97,219,54,216,103,93,185,88,145,194,74,210,172,31,140,142,209,210,182,176,90,153,103,195,248,190,155,49,248,10,118,24,138,116,144,248,185,129,207,126,102,78,110,209,30,81,208,246,81,30,153,8,242,48,17,223,16,95,164,107,218,71,141,159,96,124,166,241,9,1,65,10,222,166,188,117,209,172,1,231,178,11,111,155,222,189,81,77,116,196,34,202,126,38,28,221,232,55,67,55,142,242,217,203,157,54,242,221,5,135,138,216,161,49,57,71,58,190,23,89,71,229,254,178,199,69,35,66,167,108,28,137,165,209,9,115,204,220,113,22,4,184,189,236,91,209,175,183,106,230,170,42,109,126,123,190,124,116,30,104,46,211,131,253,44,100,61,146,40,174,137,0,28,26,12,2,135,124,53,207,215,
+17,4,230,214,114,156,248,96,52,118,107,233,101,217,246,36,145,209,87,177,144,89,220,152,233,241,253,233,120,82,208,148,139,190,66,197,97,91,10,152,138,232,243,255,97,231,61,158,19,138,22,60,189,127,165,87,222,205,202,174,169,242,218,246,206,75,255,1,243,122,186,103,170,171,94,187,93,238,158,42,47,81,0,68,144,64,4,33,50,34,103,68,206,32,4,136,120,201,57,138,156,115,142,215,23,152,105,191,121,221,46,187,237,141,203,53,155,43,234,214,229,112,238,9,223,249,126,231,34,238,222,115,146,243,164,54,174,112,137,155,128,184,167,50,252,50,99,107,117,95,181,10,43,122,29,199,174,170,153,30,188,192,30,65,179,166,248,15,92,17,224,155,217,94,93,226,134,72,189,103,179,29,111,93,254,236,161,176,194,136,115,235,248,198,69,210,235,35,253,251,147,246,110,213,196,123,225,105,82,22,119,223,31,58,244,15,48,175,124,48,67,138,207,203,199,82,167,40,9,67,120,148,226,93,144,226,40,154,120,216,23,30,67,125,132,197,190,17,205,59,152,110,168,121,72,185,
+193,229,147,168,85,198,101,220,43,145,232,215,82,244,119,17,61,208,137,237,47,83,82,182,171,80,222,105,245,21,145,222,128,198,146,185,98,99,164,127,34,116,223,206,34,93,220,190,66,37,23,89,186,11,17,119,145,138,235,82,104,57,223,158,103,250,50,196,52,231,5,106,16,211,114,16,212,76,89,172,125,97,177,20,76,15,150,126,86,212,81,26,30,176,220,177,216,24,150,159,63,157,3,232,94,46,68,251,12,103,181,217,81,26,253,208,204,226,208,89,122,217,91,151,140,59,75,33,233,177,12,23,214,178,240,77,68,81,245,88,51,17,25,9,98,89,135,32,164,238,83,211,223,208,68,58,55,252,242,162,167,13,42,169,159,54,41,147,150,34,159,90,111,72,25,106,30,154,112,27,21,191,80,118,46,196,237,90,62,175,160,210,25,135,6,213,188,63,143,207,99,135,141,173,124,215,240,108,237,18,81,29,219,228,47,52,67,91,29,87,154,241,100,233,84,167,202,232,124,242,70,81,172,180,20,216,150,158,170,26,138,109,247,141,0,21,50,168,190,195,226,235,131,199,133,128,
+207,146,204,93,76,50,132,6,22,120,248,174,188,100,106,200,126,104,44,40,190,69,56,39,218,185,29,226,104,148,149,190,144,218,76,111,251,114,172,145,202,29,69,107,149,31,25,219,171,183,244,197,45,77,55,195,125,200,108,203,237,76,21,108,7,215,123,240,1,135,44,214,178,4,67,54,14,200,217,113,85,81,107,6,74,250,5,69,252,2,77,56,186,139,78,223,33,118,78,206,215,98,226,63,175,179,213,22,110,51,169,105,37,81,119,36,155,214,177,147,246,0,92,100,176,240,109,149,143,84,45,248,98,219,215,184,203,64,91,35,222,155,156,40,150,187,206,123,235,140,98,211,73,173,191,94,127,76,243,27,230,132,88,86,13,233,242,148,131,183,89,82,202,212,132,196,42,3,190,79,39,94,13,97,18,183,156,88,202,146,224,138,92,122,175,87,201,85,173,188,244,249,165,33,94,165,150,207,17,105,183,4,16,163,8,8,44,135,23,28,157,154,74,180,178,143,181,73,156,168,167,113,145,187,244,188,232,197,37,65,19,82,210,145,126,125,231,168,124,91,51,181,35,70,216,164,
+102,158,9,48,40,41,66,156,60,167,7,199,107,86,159,88,208,132,113,242,243,114,22,26,188,135,26,149,145,108,132,32,247,79,61,153,21,66,25,8,177,236,130,178,45,196,178,11,202,236,16,203,46,40,43,218,14,243,7,77,251,179,175,235,245,151,158,22,165,213,204,18,59,177,237,62,245,177,74,100,40,174,185,93,53,233,115,50,4,215,113,236,221,48,208,138,148,202,80,115,146,234,212,60,239,20,200,170,16,238,207,133,177,20,213,135,57,117,148,234,208,50,182,231,63,220,43,197,170,140,194,149,98,190,220,246,74,49,129,228,243,66,177,218,172,157,52,4,65,5,119,243,26,201,43,20,45,109,215,161,69,162,15,49,66,103,123,204,35,158,199,249,34,170,97,68,78,1,141,88,118,214,104,247,21,94,71,41,173,241,15,33,250,185,76,102,100,140,107,75,165,226,169,188,56,139,27,223,160,87,108,40,216,46,239,233,157,132,125,11,224,123,115,217,13,95,199,10,162,101,36,12,93,137,77,177,107,150,198,214,96,29,249,108,144,216,154,230,63,227,88,130,138,110,181,87,
+190,170,195,183,120,127,101,41,135,132,130,139,92,93,6,199,128,164,185,4,141,142,227,116,19,120,201,108,124,4,48,0,114,38,31,198,15,94,112,1,173,57,209,229,183,218,180,161,49,11,223,168,96,178,154,206,53,133,100,1,180,38,158,161,21,5,23,87,193,141,163,109,155,220,172,58,52,218,118,140,173,235,76,167,110,149,207,186,148,105,123,28,110,20,60,126,124,195,43,132,34,62,39,245,26,243,45,173,186,107,120,11,88,61,79,48,244,198,171,168,182,51,111,224,18,34,90,134,250,73,58,53,149,73,133,117,95,6,186,118,135,227,173,18,206,238,150,153,104,180,4,105,202,248,192,15,103,40,114,1,241,201,178,114,90,14,189,140,219,238,201,136,32,239,78,142,100,205,205,119,17,158,94,135,173,23,186,101,251,69,225,201,105,18,86,53,251,141,226,140,235,231,31,240,22,44,119,47,179,58,215,180,243,54,199,37,98,251,167,180,130,115,191,193,240,164,87,220,104,239,98,23,184,65,108,251,189,192,13,98,219,230,2,55,136,109,248,11,220,32,182,193,111,112,83,192,
+46,112,131,216,246,125,129,27,196,54,219,5,110,16,219,186,23,184,65,108,67,95,224,6,177,45,112,129,27,196,54,199,5,110,16,219,50,23,184,65,108,187,191,192,109,127,16,129,186,155,183,5,57,15,226,160,194,170,52,9,44,59,167,137,54,158,0,205,227,56,119,56,249,206,1,181,82,169,44,125,15,16,149,114,89,193,8,187,202,171,11,10,159,32,22,146,138,237,12,215,153,171,134,160,249,180,215,151,219,66,25,85,150,95,247,225,243,1,18,46,147,61,43,103,164,141,22,111,33,174,201,20,254,32,157,72,187,202,33,99,30,121,90,180,206,5,230,118,57,115,18,117,97,14,77,189,129,77,182,220,179,186,216,218,187,230,132,9,89,98,62,227,211,32,53,143,59,93,192,70,171,180,125,250,237,5,108,70,234,13,108,165,243,13,108,228,119,8,108,140,102,179,20,128,22,31,118,0,112,249,201,27,129,45,238,53,217,125,89,113,212,97,70,69,106,63,50,108,127,30,53,116,66,28,193,194,181,163,139,154,49,75,48,140,236,71,29,118,63,169,217,141,189,27,201,56,
+114,112,60,6,174,166,150,235,50,207,166,102,69,83,24,93,230,75,199,129,197,74,7,210,182,52,232,249,169,247,177,217,72,3,109,134,10,100,80,83,186,227,18,211,138,201,189,103,132,194,18,150,59,64,28,64,94,157,145,236,23,186,209,45,80,56,112,52,127,217,81,133,230,31,237,195,220,87,197,153,47,153,88,210,104,52,66,11,237,240,76,168,87,240,103,188,149,175,97,79,42,238,54,43,193,102,170,100,93,199,157,112,143,137,14,151,1,214,214,38,113,147,24,219,232,210,221,37,232,219,120,114,113,119,246,187,147,89,221,46,54,239,216,21,83,182,190,172,202,206,89,99,59,223,144,247,58,2,65,245,72,187,223,196,201,18,35,217,98,149,150,178,78,29,173,13,43,174,221,211,105,64,116,21,198,40,163,13,183,91,11,163,214,196,132,8,2,217,46,155,143,142,216,83,150,56,206,123,106,138,98,64,8,32,151,225,118,111,52,245,214,125,106,102,67,19,242,210,30,174,177,132,44,217,207,189,246,236,16,131,103,68,18,135,23,34,5,59,252,218,71,20,233,161,201,8,
+63,34,8,76,209,158,200,127,147,107,101,206,83,241,34,105,144,163,213,251,116,87,171,186,15,26,160,118,92,130,142,1,103,91,3,77,140,112,41,119,58,201,33,125,85,172,47,221,51,113,148,94,81,41,109,135,182,212,175,247,220,121,104,46,11,188,107,111,158,54,30,132,57,225,0,166,210,245,219,191,105,140,84,106,223,177,219,30,74,232,177,216,76,46,74,70,110,112,47,241,66,4,34,170,154,21,44,162,54,54,179,251,253,119,151,183,186,9,178,160,207,195,190,100,146,134,182,210,97,206,124,83,29,169,36,238,147,122,143,189,147,58,67,73,109,87,55,150,127,55,128,33,25,36,21,60,19,174,182,80,196,75,169,252,157,41,195,74,146,154,230,202,155,139,71,59,172,215,245,209,71,233,4,205,65,41,212,145,157,77,215,60,120,239,85,22,115,4,72,17,165,21,32,83,73,161,80,220,147,106,166,28,223,175,115,33,88,39,54,115,194,169,252,60,213,12,68,8,182,7,91,194,133,143,114,142,153,59,130,221,191,167,219,179,12,120,251,100,53,141,181,232,27,222,2,255,
+17,111,232,240,13,111,11,222,13,111,174,209,13,111,205,212,13,111,129,195,13,111,32,255,134,183,69,235,138,183,173,233,134,183,187,100,235,134,183,102,226,134,183,184,239,134,183,102,2,194,91,193,137,11,54,157,223,125,156,116,239,233,178,165,165,174,194,252,28,16,36,150,196,178,225,97,56,110,188,234,66,88,78,120,154,77,205,161,58,136,125,85,27,185,75,118,173,226,190,182,166,108,129,168,137,205,12,6,131,192,124,201,140,78,78,203,146,55,221,158,58,80,164,150,44,83,142,26,89,99,65,201,178,99,63,210,198,157,38,164,63,229,216,110,245,78,217,118,12,18,133,226,53,153,198,161,35,97,226,199,162,21,219,122,48,204,79,10,213,67,206,150,171,120,171,243,40,143,7,16,90,125,255,45,230,218,184,222,72,173,76,192,62,49,28,56,47,16,110,104,117,234,222,245,245,172,104,227,27,159,239,43,251,75,154,77,97,193,6,67,136,95,95,176,28,252,18,68,93,183,120,250,224,191,197,83,152,249,13,104,227,247,108,214,164,198,191,2,240,227,98,119,116,128,147,29,
+129,72,23,51,216,90,106,253,86,171,51,115,8,241,127,50,175,46,82,203,11,125,90,244,123,50,113,63,102,138,78,251,70,31,163,66,28,53,183,124,1,189,71,52,161,100,147,81,40,67,85,153,3,231,174,234,52,103,188,94,248,249,0,196,100,50,25,92,168,133,214,184,253,184,223,215,250,57,232,121,40,76,238,35,15,3,200,104,113,98,97,49,188,212,47,90,233,138,226,235,124,226,24,166,250,184,128,85,63,219,126,58,223,202,122,255,83,10,88,164,166,193,78,152,180,230,200,139,62,206,230,54,177,3,180,118,76,214,223,252,68,70,46,71,7,232,46,156,109,169,194,136,77,42,199,218,80,213,9,62,245,157,144,88,29,103,135,44,225,89,213,98,250,11,166,13,196,137,241,9,215,106,247,119,59,243,224,48,63,155,234,47,211,52,109,70,16,201,249,15,172,254,158,154,194,150,102,132,236,55,49,93,90,44,217,240,253,144,222,96,180,65,93,144,19,212,150,215,17,236,99,244,4,113,237,14,99,214,116,203,173,54,124,213,169,178,248,104,141,69,188,146,138,183,130,120,
+226,98,1,5,202,250,126,173,123,113,150,230,42,109,222,112,13,160,143,213,107,0,37,59,4,183,0,90,75,110,189,84,29,17,33,166,234,6,175,46,153,242,71,43,155,128,139,150,157,13,186,144,238,209,52,208,113,79,30,250,208,28,238,222,116,141,178,187,233,26,29,118,213,53,212,236,119,242,4,250,19,121,220,252,166,107,145,218,77,215,224,205,155,174,165,240,55,93,91,206,2,52,173,184,112,236,250,8,71,158,127,27,227,217,163,251,141,217,137,41,159,222,15,155,129,222,134,76,208,37,192,90,61,209,188,36,14,216,74,121,217,26,7,5,99,37,122,179,178,226,16,212,223,183,211,103,161,148,144,62,216,144,225,40,225,63,247,54,61,228,109,14,12,111,241,173,210,95,18,232,206,35,73,37,33,109,139,3,234,55,101,227,100,40,12,107,109,253,49,19,119,211,72,227,90,223,44,253,20,13,38,15,124,31,169,186,34,84,89,102,241,81,155,115,148,222,35,119,93,146,160,105,12,12,197,249,93,79,26,237,7,32,226,200,146,62,149,162,134,61,104,141,138,75,188,41,
+50,180,230,178,115,66,171,220,229,216,47,72,72,172,248,236,208,246,20,147,97,113,144,92,89,85,27,238,74,80,32,116,19,233,110,17,21,84,5,84,194,232,134,51,93,185,251,124,197,143,250,225,81,164,88,96,125,181,246,78,175,69,146,51,96,6,137,105,81,155,195,204,50,90,19,186,145,130,56,4,57,136,113,209,11,228,32,198,201,175,144,35,184,54,86,11,133,77,46,211,204,1,42,83,33,12,151,134,167,133,28,174,21,11,191,216,53,109,178,211,35,158,180,124,20,33,204,8,147,38,38,75,250,60,120,245,217,49,225,254,72,193,158,187,168,13,198,201,226,183,225,164,11,121,20,123,111,11,92,125,46,208,110,251,241,46,230,27,245,33,253,167,121,212,150,157,10,67,235,129,104,208,138,182,90,83,235,106,163,3,28,246,204,156,154,42,197,162,46,68,64,24,36,218,181,252,40,231,254,213,164,181,144,155,56,66,229,135,28,77,223,229,65,101,68,62,247,204,145,99,55,22,78,224,71,186,136,64,194,34,33,187,118,112,82,221,14,101,146,25,37,106,107,183,249,72,
+140,117,87,164,15,105,215,149,97,117,165,221,75,134,117,165,29,103,34,185,210,46,145,164,94,105,183,161,41,33,218,189,38,170,233,252,149,118,212,230,242,74,59,21,60,126,165,93,213,193,215,44,64,135,88,59,189,91,202,8,39,18,10,247,45,221,51,46,200,139,64,204,187,32,239,17,98,222,152,168,218,7,147,108,114,148,213,87,42,161,62,228,169,88,193,57,228,38,250,127,134,119,207,233,118,120,239,64,105,39,45,97,147,131,102,69,62,73,171,1,104,89,77,149,170,120,224,192,79,45,45,214,170,245,131,108,31,58,199,11,102,126,63,236,191,104,161,184,83,142,133,34,172,84,41,122,234,203,94,86,155,108,4,199,14,209,160,242,21,22,120,74,61,61,207,46,200,203,67,204,187,32,47,10,49,239,130,60,42,196,188,11,242,28,16,243,46,200,187,187,228,81,8,121,127,190,79,23,190,236,211,65,200,59,64,204,187,32,239,101,118,11,180,22,136,121,23,228,9,32,230,93,144,87,133,152,119,65,158,220,117,5,108,148,1,49,239,130,188,71,136,121,23,228,1,16,
+243,46,200,59,66,204,187,32,47,12,49,239,130,188,13,196,188,11,242,140,16,243,46,200,75,64,204,187,32,79,9,49,239,130,188,221,53,197,23,195,98,136,121,23,228,25,32,230,93,144,215,128,152,7,33,47,117,24,56,117,19,233,175,50,219,162,15,235,148,55,233,143,115,90,63,11,123,239,77,151,214,238,93,187,42,32,55,122,234,174,30,154,9,65,85,186,56,113,164,118,16,234,128,197,164,218,14,232,44,231,24,224,110,104,52,16,65,54,62,155,102,177,58,30,75,167,175,157,179,164,246,109,1,130,41,160,205,66,93,164,62,133,251,63,74,147,76,86,67,73,199,102,203,55,226,180,6,102,47,218,194,87,43,150,69,178,28,155,9,37,12,15,167,251,98,231,25,170,47,164,112,159,144,195,197,22,152,119,124,102,61,16,138,78,181,210,196,55,152,186,5,155,59,194,8,211,137,1,206,59,104,125,202,103,245,84,33,127,119,22,172,16,50,178,118,242,178,120,87,39,57,8,189,206,135,0,10,231,102,76,10,149,116,232,85,75,249,9,56,173,229,166,214,82,98,109,
+145,250,168,173,197,10,42,209,72,149,173,9,233,90,151,163,95,45,22,188,40,71,54,241,113,198,207,181,40,195,47,61,204,198,246,225,89,184,202,239,44,232,118,165,33,53,78,61,63,148,206,163,143,110,9,7,238,30,125,78,172,50,223,67,140,81,209,53,223,167,105,138,56,205,232,190,88,235,43,172,85,85,203,94,242,175,71,26,204,137,72,46,188,116,150,99,174,44,41,125,95,109,210,38,21,168,59,133,97,198,33,178,70,192,94,187,65,107,158,1,152,195,70,87,168,218,102,88,50,77,25,15,244,201,204,131,100,197,69,35,15,129,161,115,216,78,36,66,228,178,183,147,51,137,35,166,15,158,143,82,144,94,247,217,224,7,253,251,94,137,14,211,92,24,98,100,125,230,135,45,104,242,55,22,45,140,244,49,129,46,122,247,44,176,222,71,87,1,69,190,157,81,130,251,173,64,143,157,109,38,134,180,225,33,232,0,151,228,11,88,207,172,83,118,250,125,158,154,38,239,230,253,62,247,61,113,61,20,90,80,115,86,130,39,179,139,218,15,112,249,129,44,79,36,117,242,
+173,78,154,237,225,59,139,155,72,136,134,26,150,192,176,23,167,196,105,179,137,123,131,86,210,10,203,53,62,223,98,170,33,123,139,169,167,248,45,166,26,119,183,152,170,122,188,197,84,223,235,45,166,14,20,183,152,26,182,221,98,42,53,119,139,169,6,201,45,166,230,27,10,5,75,227,63,255,2,175,236,171,193,245,93,188,171,193,45,63,74,87,131,99,203,29,87,131,139,246,42,87,131,3,211,138,171,193,129,238,201,213,224,238,115,161,171,193,253,82,249,84,57,100,112,115,219,195,213,224,224,199,204,213,224,62,237,217,171,193,17,106,245,80,230,125,41,237,61,130,20,74,148,17,111,99,9,124,104,229,153,47,49,87,17,109,160,85,236,93,216,143,163,188,24,2,156,160,106,223,162,66,119,97,113,22,217,26,40,61,248,6,214,198,33,0,130,120,99,140,46,195,199,205,61,201,88,132,188,109,187,97,106,200,254,41,91,35,82,105,41,66,7,127,144,4,150,8,175,243,173,98,168,29,168,175,224,46,24,62,33,193,135,121,167,56,39,228,208,44,195,28,100,147,62,11,
+115,122,72,208,21,82,173,67,68,249,135,219,219,81,222,93,53,165,184,197,134,6,45,206,177,149,218,227,210,7,46,46,220,26,89,86,34,25,85,145,157,100,179,132,158,133,93,113,94,211,220,239,201,70,184,196,57,246,152,96,191,236,86,57,80,17,125,121,189,142,116,237,196,213,109,35,171,14,165,183,13,56,58,54,166,106,15,148,24,164,176,226,23,156,234,137,143,59,204,212,161,253,208,247,191,113,208,82,137,146,253,200,75,229,250,136,59,76,190,152,109,196,78,61,148,73,20,49,188,67,249,51,205,229,220,30,36,124,223,30,47,252,19,127,251,188,158,133,99,241,215,179,255,242,231,19,181,91,177,112,206,173,88,24,255,86,236,219,251,173,216,251,167,91,177,5,212,173,216,39,196,173,216,46,247,227,191,212,235,191,212,235,255,243,245,154,191,67,26,240,37,79,80,31,155,111,180,232,29,236,179,38,75,33,160,63,176,239,207,203,111,135,193,126,251,158,163,243,83,184,252,147,111,110,253,79,127,248,203,191,252,235,191,250,139,191,255,15,127,249,111,254,213,95,253,205,
+31,254,248,119,255,254,63,254,136,221,127,246,181,131,255,254,143,255,254,159,251,174,207,127,243,175,255,171,127,253,95,255,183,176,7,221,253,233,242,165,131,135,219,151,14,40,140,81,25,67,98,164,145,246,201,44,200,69,109,181,111,149,133,199,44,182,125,63,54,63,28,47,40,63,194,106,251,118,7,238,81,232,0,236,233,241,17,245,203,244,112,196,156,186,89,137,196,133,90,175,43,133,25,16,115,74,188,121,57,68,19,220,111,167,245,116,92,252,26,241,124,241,241,95,41,150,123,204,167,54,133,150,142,176,67,8,52,93,245,251,154,122,147,157,4,78,172,96,90,89,182,202,26,82,217,122,3,110,246,61,121,94,159,78,167,193,168,116,124,6,19,118,38,91,249,241,97,71,24,119,131,158,88,18,122,156,220,23,211,14,76,17,1,12,122,211,246,112,234,136,183,58,64,239,213,233,3,6,170,69,155,100,135,188,113,156,125,59,161,100,27,211,157,141,173,232,193,20,157,216,90,85,136,108,211,206,229,134,253,174,36,31,217,51,226,65,74,20,4,31,121,91,189,166,51,23,
+109,230,103,74,52,188,117,174,157,219,69,116,178,136,28,159,106,226,182,223,79,59,28,78,47,51,163,77,13,170,40,200,202,98,226,224,245,28,234,229,114,131,252,49,129,157,238,113,131,140,200,236,73,227,12,233,208,242,38,47,2,202,151,76,29,182,9,98,114,52,152,177,127,224,227,162,59,44,2,190,210,190,176,5,7,98,248,149,247,228,161,30,26,229,1,151,101,155,129,152,10,34,217,149,5,185,239,235,159,170,105,85,234,84,249,164,144,116,107,25,22,53,142,215,24,251,88,121,250,122,77,39,166,66,24,231,96,70,201,241,247,206,32,242,233,181,163,209,104,72,12,181,118,43,195,146,189,180,246,243,231,88,104,124,196,77,230,163,74,143,39,50,196,42,121,112,35,28,9,150,109,57,85,239,172,26,167,202,170,28,197,160,137,180,211,150,218,56,122,43,244,90,167,241,179,218,136,199,162,230,133,99,74,107,108,61,50,204,235,182,17,238,237,81,74,132,175,69,152,190,106,208,187,250,57,98,70,1,170,235,115,207,153,186,47,243,58,78,11,177,141,96,54,218,19,102,
+65,191,105,77,250,163,202,59,180,194,171,114,194,115,157,201,210,110,126,115,228,13,253,200,174,71,228,14,84,205,248,224,101,212,218,94,145,177,231,157,212,15,120,191,1,168,244,79,117,226,233,201,108,175,232,91,1,106,146,251,193,119,138,206,245,173,17,77,32,237,166,197,59,152,162,70,164,27,142,139,61,212,109,116,241,41,157,159,58,145,83,238,206,56,201,244,222,159,116,204,222,15,162,170,123,49,212,82,169,245,228,123,77,7,23,216,126,227,153,219,123,143,20,134,204,45,231,157,29,38,178,150,19,50,53,175,107,0,159,95,54,186,228,145,182,150,140,120,198,84,120,96,60,132,30,229,15,175,10,49,150,35,176,62,117,81,18,79,204,81,163,172,43,155,172,89,215,233,233,77,81,189,231,25,28,140,187,185,142,92,192,171,120,4,231,79,148,255,76,168,172,146,53,148,214,13,142,65,131,74,72,151,144,98,172,221,194,115,239,154,63,28,22,247,250,208,157,231,17,166,163,174,16,57,146,237,131,102,136,51,62,145,229,77,39,58,126,158,140,78,213,115,105,183,166,154,
+237,198,104,191,242,121,210,47,203,62,75,155,105,76,174,2,11,171,210,17,113,119,109,115,93,173,33,18,248,14,109,70,86,141,91,189,175,23,47,101,131,187,241,168,24,169,74,27,39,176,170,108,157,187,90,101,57,156,216,120,172,57,69,219,59,57,179,173,36,156,98,160,167,88,112,46,40,17,205,37,115,150,189,148,8,48,125,31,43,241,83,71,94,64,30,65,196,135,34,96,71,74,93,186,76,95,10,250,184,64,181,108,95,133,162,14,227,246,176,152,224,74,135,231,115,121,114,254,152,208,49,135,157,99,237,222,201,178,228,157,115,14,76,40,202,241,228,148,96,84,84,225,177,211,220,74,140,225,201,160,206,120,180,13,198,84,230,76,43,148,91,193,39,112,109,221,153,18,85,153,155,156,95,110,217,199,212,190,113,112,110,145,142,46,120,180,204,2,221,197,119,94,213,20,225,194,28,114,108,177,216,255,180,35,249,131,162,169,164,73,97,180,162,181,54,122,133,79,193,66,72,167,214,168,227,8,34,37,40,156,103,59,56,71,101,186,201,32,199,204,237,46,58,25,89,22,
+161,147,170,234,16,76,232,108,137,18,28,33,42,32,83,117,168,75,142,7,91,165,8,42,251,167,227,112,76,223,42,37,138,247,196,42,176,13,208,219,236,229,55,92,229,59,206,183,155,29,88,250,37,228,151,31,29,174,47,223,4,37,210,109,66,170,19,201,137,126,2,136,233,16,192,62,109,71,156,71,15,142,74,13,132,153,124,31,232,9,209,95,237,213,0,194,142,30,225,73,56,47,19,77,180,25,90,76,58,42,138,68,215,42,158,39,227,179,43,123,168,78,76,230,201,0,19,236,129,243,209,132,210,89,250,143,227,117,20,208,90,151,78,173,125,233,110,38,108,207,148,253,100,14,216,145,218,69,48,105,85,218,67,53,184,196,231,88,214,119,119,103,3,83,151,139,18,133,27,187,150,0,112,181,138,200,177,182,13,177,137,158,5,112,74,187,57,53,150,199,0,119,34,106,120,144,224,62,84,82,219,29,242,17,150,138,46,19,150,138,75,167,79,26,69,61,250,126,108,105,38,153,232,106,97,153,205,122,62,237,163,194,188,122,102,20,235,237,205,177,253,211,67,148,37,229,
+44,171,186,90,21,243,204,44,163,96,62,248,155,106,240,192,6,245,202,89,102,11,161,228,112,152,113,113,167,126,234,193,124,26,90,102,240,218,112,110,233,127,56,233,149,69,83,228,84,68,14,46,176,163,99,249,61,179,44,185,63,68,159,73,223,63,68,43,167,222,219,106,239,155,103,98,140,38,228,193,3,180,84,193,74,183,80,194,236,17,216,254,62,91,29,63,178,200,123,106,157,186,175,246,238,149,178,40,193,181,209,205,18,196,212,241,25,69,57,110,79,2,246,46,55,235,243,233,205,29,113,231,23,170,59,242,96,199,21,238,100,28,123,181,149,15,141,209,34,238,184,15,199,116,244,227,150,182,115,178,4,186,217,18,168,234,38,131,201,78,145,83,124,194,96,117,170,86,162,155,128,199,121,118,60,173,130,193,67,118,103,55,2,158,184,58,165,159,36,178,176,52,209,170,114,206,248,234,119,165,101,223,208,53,246,86,33,216,245,74,124,224,185,79,122,64,104,123,63,15,161,181,101,146,200,163,117,246,121,246,108,24,73,19,121,62,88,77,59,78,108,6,30,17,101,41,
+237,5,82,211,105,166,120,247,182,128,181,188,137,77,190,201,38,56,236,139,236,18,14,105,182,172,97,117,214,237,198,147,172,114,6,178,206,103,52,11,174,77,227,223,87,149,93,223,255,105,3,78,224,79,0,57,201,51,246,77,159,14,39,143,190,207,239,144,209,157,42,206,6,216,163,100,39,25,210,61,159,229,169,8,173,115,159,231,39,2,150,141,2,85,158,11,217,167,157,86,20,20,154,59,44,39,104,47,85,14,180,220,253,230,221,177,234,20,189,59,34,230,125,59,220,201,136,132,113,89,126,70,247,212,139,206,103,116,50,119,242,177,245,12,219,150,86,114,116,29,68,213,73,10,137,59,68,135,161,53,59,140,91,177,183,241,110,216,153,234,79,14,67,50,130,26,11,92,54,133,20,91,102,6,97,95,30,166,29,24,167,226,168,22,50,150,22,229,55,231,179,1,172,217,34,69,85,223,220,90,111,222,1,109,144,237,232,118,15,147,184,254,212,85,98,64,92,151,49,119,68,36,118,228,196,180,245,147,41,21,214,110,64,172,216,25,103,96,158,234,229,170,187,124,158,255,
+221,111,26,192,51,61,116,34,10,29,181,214,68,79,179,226,11,133,70,110,176,121,218,28,199,239,105,181,253,128,137,86,231,166,65,167,94,127,97,51,117,112,109,15,61,96,103,109,191,123,209,230,84,5,55,77,21,165,124,62,198,212,68,80,46,194,177,145,198,118,119,1,74,132,31,153,245,144,186,154,21,94,119,240,96,61,208,136,166,109,161,112,105,94,119,186,25,146,251,248,211,121,178,217,183,71,147,167,29,184,89,108,193,146,69,174,107,252,98,64,18,166,186,208,249,156,239,227,173,81,192,211,16,14,108,90,165,93,234,98,250,89,83,79,253,164,87,207,170,170,12,101,124,186,67,253,100,183,152,45,252,107,44,220,76,0,165,243,121,174,237,173,3,74,59,155,90,57,132,90,42,59,155,94,94,44,90,249,50,70,53,3,145,99,239,138,34,22,75,202,107,213,71,2,203,11,38,95,186,42,192,206,215,173,98,187,103,10,211,208,111,32,141,167,61,15,185,205,47,71,253,144,91,20,169,219,104,61,112,50,33,3,135,206,125,192,186,47,126,6,72,33,46,221,48,217,
+186,113,145,82,231,91,80,175,59,126,67,17,181,232,184,206,134,75,138,126,77,221,89,29,79,75,120,232,193,185,144,246,226,20,21,37,185,57,56,38,145,201,252,78,120,56,155,66,194,23,70,182,241,98,243,133,177,30,133,175,66,65,245,38,167,125,57,236,92,217,14,54,52,181,92,15,64,51,69,68,24,236,55,179,31,110,48,31,112,52,64,40,64,127,79,179,110,93,129,201,128,197,188,114,5,239,222,132,18,236,123,63,84,226,57,200,166,149,22,121,170,201,110,172,22,14,249,124,215,110,44,39,78,141,148,53,70,141,68,229,188,253,81,105,150,31,184,15,22,189,136,149,50,183,56,233,85,135,189,172,250,156,110,74,84,152,180,28,135,150,126,157,12,86,248,154,30,51,70,177,161,70,103,131,8,40,16,1,8,111,6,186,204,178,105,201,90,150,13,174,60,149,114,218,85,52,131,144,60,48,151,43,133,122,177,126,209,237,251,178,227,132,249,124,150,174,152,231,33,28,4,116,184,144,99,42,207,217,199,217,26,199,237,176,150,25,194,41,138,206,202,53,163,94,153,224,
+193,61,148,90,84,112,41,89,220,51,91,80,48,90,201,193,84,140,8,252,15,4,60,238,55,142,75,71,151,50,202,42,118,78,61,140,71,186,42,89,116,188,67,109,249,234,159,209,156,241,136,109,55,103,103,42,84,228,42,114,120,155,68,83,15,86,165,45,49,93,153,145,199,246,145,13,78,181,61,249,243,217,102,59,241,203,81,225,134,114,66,178,129,122,214,169,165,239,155,159,187,252,50,48,242,99,81,191,137,188,93,183,243,209,221,249,84,47,32,153,89,226,187,41,181,226,55,4,38,223,56,223,89,202,204,16,39,102,220,175,217,4,119,255,84,229,133,194,84,224,196,20,117,70,156,131,43,76,239,190,146,177,37,38,45,123,69,37,231,62,238,6,125,64,158,55,181,135,174,228,48,22,145,186,2,38,17,55,24,50,180,234,229,201,87,182,76,108,226,131,54,25,249,185,239,33,22,251,246,129,93,57,0,254,206,114,18,76,86,202,214,22,76,160,196,172,39,214,5,251,141,13,41,11,196,92,162,53,107,29,53,252,134,56,138,40,118,210,165,147,4,59,248,75,80,8,
+241,125,128,71,177,153,219,201,137,234,217,62,91,213,94,12,206,45,106,234,213,227,42,231,126,231,76,31,86,85,59,156,115,188,153,50,67,117,79,191,169,107,142,245,50,104,64,140,150,118,17,238,32,99,31,234,229,244,2,212,20,35,164,36,171,126,7,20,171,216,177,201,183,27,122,7,213,99,122,169,55,195,95,121,7,57,115,233,83,224,182,29,116,197,8,158,162,117,204,87,93,177,27,44,49,163,231,150,177,249,35,58,13,22,70,3,33,255,5,238,225,213,144,199,224,222,160,61,176,39,171,230,75,144,58,201,153,247,93,193,32,138,181,54,27,45,209,186,108,91,68,122,123,156,236,29,236,59,106,54,214,32,202,30,155,215,186,202,192,161,40,24,59,110,222,108,185,171,57,87,236,131,33,237,19,157,220,60,54,99,128,232,16,159,62,168,81,98,153,197,8,8,3,246,51,159,190,39,255,18,58,174,137,203,244,42,225,251,7,17,66,101,67,143,236,146,99,166,115,184,158,48,183,95,162,215,10,111,4,158,235,116,87,73,27,174,30,118,211,189,250,52,193,13,49,166,
+77,28,92,156,40,170,200,62,223,141,146,58,130,178,157,193,169,223,113,194,122,112,182,55,122,98,241,167,47,146,214,185,140,206,11,175,201,122,187,144,96,42,113,140,61,239,20,153,29,220,211,128,190,254,197,122,3,31,224,206,227,190,146,213,17,244,3,35,6,195,230,194,64,85,87,212,59,11,151,34,88,216,230,52,171,120,43,63,126,239,56,169,196,180,19,122,83,52,87,27,89,230,234,215,138,232,177,123,182,121,10,255,26,85,57,119,69,39,253,189,29,237,179,192,117,114,163,39,30,148,102,243,121,51,126,156,147,125,235,19,112,118,190,59,7,27,235,134,226,92,175,19,121,237,65,225,152,177,65,203,207,94,199,6,40,195,89,86,219,107,58,64,240,247,252,226,20,25,227,244,82,117,2,194,101,4,96,206,199,133,235,165,128,35,110,17,206,187,67,192,77,1,117,100,10,180,32,45,205,32,111,82,216,12,157,179,231,188,137,143,181,204,114,128,217,215,36,145,142,91,253,120,63,12,224,130,245,37,145,216,104,27,48,112,234,196,220,245,118,147,7,2,205,57,126,63,
+252,236,75,246,60,132,164,82,216,203,21,29,131,47,78,110,8,192,142,92,71,41,138,66,53,214,92,250,234,161,69,202,197,85,181,102,204,231,222,32,57,210,153,103,18,215,233,200,57,178,234,113,14,186,192,189,181,107,21,178,205,181,246,54,31,145,69,122,52,173,26,57,232,163,202,139,136,108,5,152,5,186,14,127,188,146,9,151,165,217,71,69,22,122,145,71,109,58,27,56,42,215,249,146,77,233,12,118,105,166,168,180,49,246,129,123,113,220,157,111,242,35,76,143,225,25,196,208,217,192,100,87,105,229,137,150,30,33,175,91,119,132,229,248,111,162,121,116,189,98,116,42,70,124,171,12,9,165,191,214,55,152,27,70,235,18,131,186,52,219,64,172,156,65,33,51,173,91,7,213,3,229,14,236,64,214,50,49,13,49,143,47,249,134,85,201,84,57,107,9,220,144,177,50,12,179,88,158,85,200,60,23,104,243,113,194,183,142,169,128,125,49,75,109,108,45,17,150,253,200,182,51,170,172,218,46,175,107,169,173,236,40,151,222,60,108,247,135,14,17,43,170,9,162,206,225,
+142,29,197,153,133,126,3,181,17,152,209,164,116,180,138,223,35,81,207,245,59,188,168,107,59,145,13,78,245,178,225,243,203,205,59,80,208,177,53,54,187,5,238,112,190,63,243,216,206,95,113,39,250,6,130,26,204,75,238,220,59,215,84,140,141,63,200,94,84,172,115,198,67,134,205,212,131,65,212,164,90,95,5,207,50,231,254,173,218,242,61,239,39,13,123,12,25,117,234,24,192,129,4,90,223,129,10,153,247,14,78,104,187,238,86,172,254,24,83,29,68,52,70,37,252,198,189,11,70,214,50,18,6,147,234,38,227,82,121,179,89,223,165,67,205,243,97,172,118,130,191,212,34,203,50,102,179,24,11,240,5,41,180,45,238,156,141,202,44,246,120,2,143,250,26,136,244,129,141,23,158,207,62,50,178,119,214,1,143,93,217,188,54,242,62,199,60,252,238,195,57,88,171,233,193,142,140,236,157,186,137,119,145,45,123,245,105,10,192,148,210,23,205,168,122,97,220,31,165,68,49,179,255,208,212,96,68,124,53,251,172,8,150,51,242,168,57,214,71,215,193,1,253,107,188,222,
+183,75,158,169,136,187,54,207,235,157,149,51,117,236,212,147,11,241,104,127,178,48,39,163,114,167,62,226,77,193,9,186,149,76,5,125,222,111,132,234,213,52,247,195,95,47,49,175,109,236,144,52,135,212,253,167,85,53,255,176,7,69,155,98,236,30,13,110,241,243,183,236,86,251,98,38,170,207,186,205,170,22,109,7,44,56,124,213,144,180,30,205,80,108,14,23,106,128,183,170,62,38,35,226,228,28,105,151,20,143,236,57,63,51,123,227,71,73,223,243,239,252,178,208,250,134,211,136,148,45,145,197,94,129,99,77,188,179,59,202,74,207,25,44,173,160,220,125,82,216,164,87,161,82,154,32,219,17,245,105,49,41,191,211,25,23,214,216,92,118,84,49,112,187,174,200,173,63,84,233,202,112,233,208,192,234,221,78,150,126,129,100,240,206,172,61,193,57,105,26,106,170,56,17,65,172,139,252,220,145,129,1,236,43,81,97,208,54,145,60,38,8,152,109,234,48,191,35,199,239,155,68,24,82,209,34,65,56,73,179,83,115,43,70,202,166,38,233,155,111,218,195,155,6,59,180,
+14,70,194,57,158,14,131,193,231,145,162,189,193,92,195,140,224,70,226,23,194,96,60,191,48,8,131,13,46,47,25,131,161,166,103,220,84,112,237,251,111,28,25,198,89,178,211,218,192,227,119,12,125,98,97,158,68,176,238,252,181,61,44,108,21,200,54,6,199,231,196,113,114,13,90,143,182,143,21,153,239,112,77,165,131,233,37,118,26,160,114,104,0,230,131,38,74,170,252,240,208,147,117,231,27,87,59,123,57,248,232,87,163,103,26,86,164,54,196,143,126,26,197,230,59,53,50,41,129,85,207,30,117,120,141,100,197,196,3,112,103,9,150,227,246,77,195,125,43,203,113,17,226,179,216,86,0,135,145,220,134,187,103,79,75,146,60,63,19,0,235,250,107,236,210,72,95,208,170,1,31,95,247,11,57,119,241,109,21,123,152,70,147,172,38,209,184,17,111,12,175,163,227,78,11,189,247,233,242,102,232,189,254,187,103,62,113,24,196,143,53,129,204,188,152,127,153,2,8,41,23,192,8,164,164,242,185,100,255,81,40,123,78,27,0,188,253,80,234,95,117,216,15,243,167,189,
+56,81,41,68,133,84,33,236,243,54,79,156,15,147,174,100,176,219,236,42,227,75,78,184,46,132,207,181,64,216,48,174,24,51,163,214,128,91,231,0,202,165,192,234,151,96,80,86,109,146,134,230,208,97,8,77,66,52,68,219,189,162,156,232,123,161,75,166,181,194,158,111,61,103,168,95,101,110,5,85,217,114,6,25,203,192,194,162,87,86,191,136,100,100,111,173,48,33,190,104,133,190,84,184,36,249,102,139,209,248,245,107,236,246,175,39,64,92,199,75,8,19,83,234,168,80,70,12,11,14,133,232,133,158,187,175,9,25,49,103,241,97,225,78,126,164,185,137,98,102,204,215,193,221,155,114,218,114,236,10,99,47,247,241,103,15,212,100,207,3,181,78,149,60,164,244,73,10,207,126,70,244,251,207,151,187,72,53,4,182,0,29,72,119,114,84,150,113,84,45,140,62,227,137,143,135,197,61,209,213,47,166,25,163,53,119,32,67,140,47,223,102,61,123,129,80,65,53,201,59,229,235,42,233,213,244,105,42,195,102,244,116,134,109,220,127,237,33,109,118,126,220,23,22,246,251,
+238,147,50,209,36,158,108,168,189,129,255,188,206,227,233,169,72,89,92,109,180,197,175,12,37,209,56,139,253,72,199,111,182,217,92,175,32,248,40,222,59,96,38,235,129,45,32,45,80,9,117,122,153,105,103,184,212,8,77,98,1,113,212,194,128,24,149,19,61,247,16,216,91,63,206,207,17,84,229,200,23,221,47,26,111,242,147,101,54,34,172,67,89,151,46,200,32,35,13,190,142,66,120,210,103,201,14,240,61,150,169,183,139,37,22,15,134,192,119,58,31,178,250,183,216,212,92,13,105,180,220,187,111,146,82,79,146,253,108,87,163,175,12,155,185,196,39,124,68,152,64,101,64,69,188,90,76,159,86,196,250,48,136,43,165,39,53,194,151,225,31,85,241,195,99,12,31,72,116,146,44,143,253,225,131,110,197,166,132,136,54,133,38,122,32,186,20,158,12,229,169,232,79,43,30,221,111,186,170,99,236,117,103,126,234,98,211,167,25,198,251,80,164,237,154,143,116,39,76,206,81,26,21,151,196,116,107,225,41,52,78,70,121,155,227,59,195,29,8,114,50,129,180,48,209,17,
+185,0,189,20,159,225,193,248,244,227,251,93,131,234,114,164,116,239,154,9,38,220,205,100,245,75,168,95,55,157,162,237,160,32,120,254,117,214,172,3,245,49,248,44,54,249,252,35,152,41,141,205,31,161,105,241,19,18,158,97,107,190,150,128,244,102,57,9,191,186,73,140,125,233,104,74,186,97,163,112,77,175,179,128,143,167,93,103,129,174,212,53,144,207,30,26,5,77,124,248,150,73,248,239,62,219,154,1,123,70,132,132,75,216,23,49,127,72,104,235,223,141,54,17,198,9,28,158,56,80,82,196,189,226,1,24,108,3,29,126,96,217,203,203,172,250,122,196,3,37,232,248,174,237,149,90,91,131,6,5,195,107,81,185,161,229,113,120,15,171,147,30,160,163,9,241,126,61,14,239,127,174,71,152,105,118,61,10,5,108,141,100,170,74,123,67,111,61,121,167,86,83,69,197,156,110,13,211,74,226,125,15,175,161,207,78,50,126,72,195,125,13,135,56,78,148,251,133,8,119,91,238,175,104,183,209,137,177,128,199,135,94,200,76,64,82,150,217,207,219,193,176,57,88,7,87,
+10,22,69,38,239,211,20,84,160,65,73,217,224,57,98,148,154,111,253,140,158,4,152,168,208,73,74,163,95,44,82,205,164,80,40,100,82,63,150,249,106,96,24,230,98,230,115,135,20,106,49,180,129,188,100,95,82,74,123,248,28,240,149,214,20,157,69,172,225,215,253,58,12,38,39,138,143,1,250,92,76,226,146,188,145,165,242,251,190,174,32,226,69,32,36,90,72,68,253,40,62,148,27,202,243,34,41,161,164,95,157,164,46,129,126,67,151,14,125,196,108,146,184,231,119,146,123,36,215,221,192,113,1,225,175,204,146,23,100,131,6,254,107,254,139,208,52,130,237,149,144,78,68,105,3,54,182,162,131,42,52,147,180,190,215,215,31,201,176,241,73,177,40,42,62,136,30,236,228,248,66,63,160,85,232,1,13,76,2,216,245,228,134,202,51,75,191,33,165,51,128,89,128,247,179,104,186,209,69,79,56,240,84,22,113,216,53,180,168,148,182,21,131,8,65,37,239,91,116,231,243,99,158,31,49,138,116,11,98,11,42,185,233,245,145,69,247,154,214,74,106,148,164,66,163,137,
+117,18,53,211,19,169,100,205,57,12,102,210,180,183,102,119,225,32,110,30,7,96,10,29,16,46,125,124,91,223,144,182,58,95,129,220,115,112,125,16,101,72,13,65,96,49,78,38,227,75,51,68,0,65,64,168,212,65,237,40,221,143,90,102,13,87,145,197,186,90,46,215,1,2,87,28,65,97,124,238,112,159,39,180,253,227,128,123,35,110,88,131,147,52,209,110,151,10,163,248,131,140,73,44,87,171,166,178,46,63,27,21,85,5,243,51,29,88,147,112,158,41,199,103,87,50,11,34,243,41,82,64,180,30,247,207,62,10,49,153,237,103,126,161,105,130,152,46,69,173,89,49,85,9,48,215,181,102,116,125,48,58,29,57,217,211,143,82,31,168,242,22,154,160,208,184,147,81,116,208,141,120,100,22,169,233,245,201,80,47,237,140,36,125,221,146,85,26,30,122,86,87,9,171,41,160,6,234,161,243,179,16,6,4,2,185,244,88,40,166,77,40,89,44,249,249,190,83,140,198,153,33,173,255,230,147,222,113,65,77,128,241,139,128,3,21,164,161,31,41,52,137,17,3,170,222,
+78,149,191,156,54,46,240,211,232,123,116,227,166,177,170,179,21,191,19,35,187,78,97,38,120,128,158,148,204,212,111,167,59,237,138,27,171,86,29,170,253,200,16,252,180,89,38,65,41,84,157,198,195,54,123,46,5,12,26,138,36,40,20,208,112,5,73,186,210,39,2,113,176,159,245,48,117,194,144,176,71,99,61,45,60,165,25,78,93,202,239,91,201,233,119,215,200,160,116,102,3,221,15,200,21,67,3,239,193,44,15,197,129,10,122,81,33,5,12,146,158,39,155,39,9,11,241,184,254,9,106,236,248,100,147,170,252,68,160,51,172,208,103,157,208,76,238,121,169,175,129,33,253,252,58,202,2,207,197,208,49,215,157,28,190,63,115,134,249,145,193,175,0,190,228,225,241,185,138,99,182,34,25,21,221,131,165,199,199,107,241,121,193,120,26,206,159,135,107,82,212,150,165,242,11,167,167,238,57,147,39,49,80,59,141,4,208,107,6,111,169,160,96,101,60,253,134,2,229,60,117,215,73,214,253,123,66,147,8,76,2,240,166,56,223,73,150,190,4,239,7,201,78,65,87,96,
+114,169,204,42,39,248,162,25,224,133,216,182,31,32,165,244,244,97,66,170,108,208,195,218,56,41,63,74,130,154,165,251,169,187,162,196,169,47,71,132,13,216,232,185,60,4,40,84,109,42,124,130,98,67,14,102,63,65,16,40,128,106,4,253,13,23,44,69,151,97,203,82,84,104,143,243,150,92,34,43,24,225,103,5,32,225,160,223,27,243,202,38,113,173,126,82,208,31,237,154,53,174,170,129,203,32,105,118,107,51,159,219,215,83,37,173,211,126,108,135,52,246,2,164,215,49,109,172,241,28,16,43,11,51,221,66,90,41,151,156,104,63,123,184,198,169,58,189,207,154,223,32,144,16,12,185,149,55,196,124,119,188,127,246,44,171,70,65,108,87,102,211,186,109,197,242,196,145,230,71,236,156,189,212,118,191,78,224,126,93,114,116,63,65,47,150,9,158,44,59,166,237,251,189,108,116,126,118,216,45,57,86,13,73,213,246,170,111,203,60,223,254,14,103,21,162,26,84,192,63,6,69,89,111,104,100,34,0,156,124,26,67,250,102,3,154,142,238,128,172,178,29,76,122,201,189,
+193,107,9,34,220,219,158,53,231,76,151,77,226,67,28,231,90,53,232,48,93,65,65,135,157,74,186,204,226,115,74,177,137,240,186,79,178,6,21,132,197,240,23,143,74,92,109,106,224,39,9,111,98,21,135,13,10,144,186,131,48,49,169,16,108,216,113,48,12,184,187,119,97,138,17,57,29,125,6,249,216,102,134,218,30,74,45,22,193,180,91,162,232,105,228,67,222,243,155,195,190,237,149,149,39,134,83,162,148,90,179,253,153,89,42,172,209,35,194,246,73,153,69,208,121,153,143,162,233,217,55,115,68,85,0,212,39,78,165,20,107,48,24,244,86,178,122,92,182,252,234,215,149,80,107,30,201,55,99,169,107,3,45,3,121,221,76,177,121,202,175,60,191,88,108,220,205,14,143,232,215,6,237,72,50,177,149,215,73,126,201,194,63,157,231,228,146,167,150,46,190,9,217,100,94,47,226,91,11,17,4,41,45,48,13,14,233,239,116,150,31,236,67,72,20,38,137,150,118,242,94,84,251,216,37,37,184,123,195,175,232,177,26,67,209,96,250,83,225,67,64,44,51,147,60,241,
+199,126,171,149,177,140,121,127,127,15,244,66,172,55,137,12,154,104,40,133,198,227,28,77,38,104,28,235,69,44,123,203,239,43,33,21,209,128,215,56,89,52,180,154,98,146,42,66,15,100,83,123,116,191,234,105,213,44,95,140,35,83,107,36,173,31,174,61,243,17,181,61,173,168,154,170,68,141,232,214,162,42,227,208,248,202,161,115,213,85,210,92,66,208,20,226,227,120,11,5,27,154,251,21,64,250,43,88,206,35,35,161,110,149,82,209,9,142,52,89,72,207,31,101,9,251,248,169,147,240,106,209,118,4,98,117,142,170,68,50,222,107,212,144,94,221,225,129,103,187,7,7,138,251,222,60,205,214,49,48,244,76,38,113,180,154,172,159,23,131,172,162,43,166,112,171,193,208,179,175,120,82,190,63,60,60,172,243,30,210,158,167,50,213,22,124,214,239,126,255,189,97,149,20,194,113,102,159,22,176,1,192,84,224,34,51,114,171,200,226,156,89,123,89,109,163,80,213,47,104,99,7,93,23,101,143,212,57,224,168,27,106,3,101,252,97,169,54,43,198,207,91,37,177,224,77,
+50,73,53,239,40,121,216,20,224,104,42,28,11,246,79,170,209,26,205,85,135,230,217,64,151,225,187,76,225,44,151,135,38,222,253,134,106,100,208,29,231,41,7,242,190,245,221,192,46,108,200,8,221,10,122,161,240,9,133,132,68,134,172,176,1,7,142,20,129,217,237,213,139,66,161,172,43,253,124,43,32,28,250,52,161,192,60,230,97,70,15,50,166,126,151,30,16,197,169,113,36,13,15,203,10,252,161,77,25,249,97,185,139,203,169,55,100,21,164,87,21,119,50,97,200,147,22,195,143,104,30,186,239,137,43,74,151,16,239,206,233,243,57,62,49,166,17,179,214,46,9,129,69,248,192,138,157,224,15,58,160,210,8,240,165,82,100,240,197,230,179,189,159,12,94,53,88,126,221,196,104,66,43,125,200,222,152,152,163,25,105,136,126,25,189,53,168,117,249,184,220,141,254,40,238,220,203,169,136,178,50,72,164,129,144,139,174,81,133,133,30,220,33,216,199,122,125,105,67,73,237,121,112,150,227,84,115,39,41,161,237,229,152,0,30,160,247,112,9,69,62,165,111,123,184,135,
+65,46,116,44,65,44,188,160,112,82,10,8,247,118,248,189,220,58,88,20,162,111,0,58,109,100,20,252,93,204,42,14,45,102,34,68,87,82,187,129,208,116,234,158,17,236,164,172,37,45,228,87,33,1,225,176,167,159,63,91,99,57,18,123,212,74,102,118,148,133,134,1,136,129,166,184,118,165,224,187,22,23,176,189,1,111,195,254,74,182,151,19,252,29,48,103,76,43,42,243,88,138,6,221,16,65,220,55,240,242,252,116,201,64,237,152,52,104,6,23,9,182,172,61,4,62,222,231,105,35,218,128,144,132,219,7,241,208,154,255,124,6,170,113,123,64,80,28,203,200,47,53,16,164,127,107,221,94,102,178,232,116,19,178,50,222,232,211,101,77,27,44,139,208,11,209,33,237,130,175,8,157,38,42,252,197,2,134,60,255,36,255,62,13,126,112,216,147,155,114,12,127,228,249,101,74,55,81,67,57,194,5,31,212,191,204,180,225,81,207,245,107,221,11,196,178,39,208,148,189,218,118,18,175,84,73,109,239,25,82,153,164,225,129,208,60,107,132,196,150,97,147,12,20,58,186,
+182,35,141,176,42,187,46,51,52,92,13,101,227,241,92,146,249,90,82,90,25,97,166,163,247,14,187,121,15,159,37,34,158,46,148,102,157,33,131,9,88,33,120,85,204,171,176,96,149,59,36,17,12,182,121,80,149,160,137,51,169,138,214,192,254,180,167,218,132,205,158,183,153,180,110,90,80,182,234,36,151,212,118,207,44,106,18,221,250,215,26,40,61,204,230,244,248,75,51,153,73,223,195,169,226,129,193,140,24,214,197,124,150,98,101,111,126,37,107,144,223,241,88,15,175,3,227,93,79,87,48,20,238,204,87,35,132,169,162,144,17,202,90,36,72,66,63,254,25,239,196,66,71,93,202,64,54,159,227,98,29,233,103,47,103,189,157,231,143,247,111,149,76,64,72,161,201,233,196,43,37,51,84,243,149,146,211,46,234,66,201,244,208,240,197,252,54,168,223,121,188,162,192,65,249,214,79,208,180,197,197,30,251,180,71,136,211,53,109,147,14,26,107,254,77,79,32,89,102,150,169,52,57,158,49,102,12,66,77,70,81,204,80,108,63,3,115,41,114,54,211,25,82,168,161,20,
+52,196,149,184,29,136,141,23,52,218,46,139,13,132,198,53,196,198,11,26,223,33,54,94,208,136,134,216,168,23,109,37,30,37,138,18,72,163,198,234,194,153,60,153,132,20,142,150,190,129,26,72,2,142,151,60,169,109,205,104,149,54,152,42,51,63,9,237,135,154,243,173,182,7,206,216,13,18,226,151,220,92,105,242,220,131,138,48,124,46,8,229,80,157,14,134,32,254,100,176,219,223,237,91,11,71,153,107,250,119,10,39,61,211,38,50,128,94,95,34,121,63,136,80,50,141,45,134,26,8,50,74,188,131,56,152,201,177,207,125,38,64,181,41,209,171,144,208,182,224,150,83,29,191,240,135,198,45,35,157,118,77,245,231,222,48,68,255,196,130,162,224,107,176,127,53,198,141,166,5,25,227,61,197,154,8,253,169,47,42,11,221,36,161,241,50,13,242,199,37,92,163,139,239,28,13,130,202,160,164,145,16,149,15,195,126,247,99,111,222,38,101,193,68,211,12,26,37,189,46,67,30,153,208,165,17,85,85,207,125,224,161,207,50,149,158,245,61,50,215,177,47,47,133,99,39,
+217,101,18,127,31,147,45,186,84,50,64,149,149,7,221,187,169,56,200,74,200,6,99,163,143,97,157,115,35,70,247,252,51,234,8,129,151,1,152,142,204,123,194,33,122,252,186,155,62,121,112,189,32,83,95,155,32,230,30,202,98,61,47,17,203,128,71,81,63,245,34,193,186,65,98,87,90,71,223,216,111,4,216,208,59,40,7,120,60,151,16,236,6,203,23,94,126,112,213,40,47,234,252,245,217,10,58,63,196,193,215,236,74,207,12,23,35,184,198,91,60,88,194,193,205,24,129,68,210,74,103,227,5,29,82,218,55,153,223,41,90,149,160,12,144,67,138,20,52,195,197,197,230,4,104,251,4,99,144,74,12,68,10,182,190,90,31,32,25,69,253,251,187,54,121,100,96,101,69,115,94,20,154,87,220,22,189,76,232,79,62,122,146,93,113,24,92,199,68,242,35,212,87,191,29,32,53,67,125,129,160,179,107,44,23,165,238,185,77,34,155,66,217,34,218,117,220,111,153,18,128,13,161,113,5,177,241,130,198,39,136,141,23,52,98,98,52,9,29,139,76,50,172,175,155,112,
+160,217,161,13,70,136,53,36,106,163,130,194,231,205,151,44,155,56,27,123,15,141,140,102,84,57,72,164,136,20,201,189,177,245,14,160,216,206,205,37,232,72,71,122,115,253,233,108,229,105,222,230,17,104,101,203,189,41,136,28,122,130,45,40,12,180,146,254,147,103,147,5,63,223,118,234,88,5,78,168,169,135,102,50,96,104,71,27,164,11,34,19,16,35,47,136,20,67,140,188,32,50,42,186,44,159,182,236,247,69,22,33,68,202,32,70,94,16,89,129,24,121,65,164,19,98,228,5,145,91,136,145,154,128,176,195,104,206,73,67,173,68,41,228,132,243,205,74,168,253,136,49,232,211,246,12,202,122,9,135,143,150,99,38,18,205,15,53,1,110,72,154,111,18,51,179,188,176,201,10,136,167,79,44,223,153,34,160,127,123,100,20,92,36,204,135,178,141,183,123,93,254,183,41,227,105,37,36,15,205,76,85,10,113,2,39,232,15,0,187,138,140,64,108,41,80,194,25,118,143,147,159,84,49,172,160,71,246,90,41,215,75,75,4,29,131,139,52,66,206,232,189,72,35,228,140,
+159,144,52,170,243,58,195,72,54,68,23,37,238,71,81,141,74,60,119,244,207,14,215,115,55,28,99,124,76,203,133,94,118,134,205,11,117,124,140,84,37,212,203,189,70,175,31,124,98,33,207,91,194,11,61,223,154,16,215,84,106,84,239,218,41,101,133,241,215,23,204,0,100,21,108,200,169,162,144,84,189,186,13,102,223,195,4,254,203,103,157,1,107,19,83,28,154,230,102,59,190,39,85,108,140,94,239,238,181,86,113,32,43,19,165,76,207,63,74,151,115,215,61,143,136,58,218,181,18,139,200,60,82,17,243,30,191,237,24,109,229,84,149,241,37,104,146,165,5,14,158,97,84,219,222,13,60,129,3,201,144,139,25,16,87,82,141,196,244,36,228,60,103,66,239,66,142,241,121,101,147,187,143,45,212,163,98,40,224,64,241,89,247,120,241,198,95,26,20,184,127,19,215,35,77,227,185,28,23,134,209,217,234,80,80,161,108,61,194,125,127,8,32,213,236,64,174,121,81,77,100,112,131,55,22,13,228,228,9,244,191,43,52,225,89,62,181,92,213,226,166,169,170,175,147,105,
+80,174,252,39,21,226,49,94,169,59,37,25,131,149,169,20,76,39,57,244,119,44,93,120,181,70,71,244,120,181,70,165,116,114,181,70,178,58,114,181,198,74,136,121,181,198,148,157,116,177,70,8,229,105,119,251,137,117,30,22,3,176,231,171,151,88,17,74,217,94,97,147,58,31,79,43,58,23,147,182,51,137,4,19,75,106,143,187,66,51,50,43,44,45,5,167,217,181,108,107,57,202,136,130,234,204,179,90,165,248,200,97,176,79,167,252,52,12,191,206,214,200,20,245,47,200,140,143,194,88,169,108,122,171,78,212,162,118,198,219,143,212,116,141,62,108,110,129,181,169,67,93,41,161,169,102,176,223,176,104,199,222,176,184,35,65,88,164,200,1,131,74,32,17,9,235,67,129,72,25,156,127,9,148,121,189,245,107,31,150,251,212,4,157,120,99,16,28,73,102,141,93,19,103,225,59,145,202,99,29,55,236,203,229,208,108,78,202,14,163,23,190,95,104,2,153,2,212,89,148,188,160,209,124,77,211,82,99,21,98,227,5,141,24,136,141,23,52,10,33,54,94,162,180,3,202,
+210,169,103,58,103,64,239,243,221,67,233,32,193,161,211,246,80,75,136,82,104,141,110,23,25,77,251,22,139,200,189,128,114,244,45,216,141,161,117,130,66,195,25,126,75,106,4,18,57,210,182,37,203,72,96,250,61,119,0,100,210,234,113,108,183,21,194,37,197,74,22,12,209,233,51,189,23,39,143,173,35,75,176,177,78,42,219,62,189,179,223,209,125,38,13,189,141,180,207,16,45,180,161,121,71,182,70,61,252,70,167,75,74,46,180,89,95,201,184,81,212,175,100,180,74,236,87,50,62,35,192,43,25,49,241,220,133,140,17,13,36,105,251,239,102,62,10,57,92,221,195,201,173,231,173,106,44,245,52,40,90,10,89,181,129,253,243,162,224,145,77,172,5,197,20,76,38,130,82,221,40,168,176,132,187,153,17,220,135,240,134,7,189,77,146,52,199,232,89,178,71,244,105,119,32,2,44,90,71,251,222,161,175,51,165,231,103,174,150,119,114,209,213,175,237,52,86,86,24,218,122,87,123,92,78,13,87,123,172,184,173,73,2,239,210,2,207,241,248,3,219,152,20,57,238,79,
+167,19,183,58,62,201,176,161,133,80,174,121,151,0,246,143,3,122,141,228,155,8,195,102,34,29,72,63,180,88,141,74,216,225,160,115,65,229,147,53,211,5,72,192,27,50,201,254,156,196,211,64,136,150,185,124,40,87,59,234,105,37,38,93,241,69,57,226,158,211,74,250,41,176,188,192,229,220,212,192,148,94,253,78,178,77,178,132,249,166,224,208,9,168,47,157,9,153,36,86,237,185,154,100,179,147,188,152,164,132,168,247,181,33,130,113,49,63,49,17,32,203,148,23,215,84,253,253,121,206,25,194,121,210,104,163,238,229,29,232,54,175,214,208,42,107,157,231,242,215,46,198,29,106,36,253,183,95,55,93,173,99,107,2,18,23,52,112,136,209,149,6,33,201,176,105,236,116,197,0,63,123,9,29,189,8,202,214,151,104,13,64,217,250,18,173,61,80,182,190,68,107,57,144,13,92,162,245,79,242,254,45,183,82,208,223,20,183,96,109,137,77,134,210,94,175,175,212,138,148,16,207,60,235,52,36,142,138,186,134,28,176,17,227,191,120,187,250,168,10,25,31,159,50,99,54,
+179,231,239,248,147,177,148,204,210,159,78,246,129,62,32,205,207,171,18,37,246,0,86,73,52,234,164,207,40,156,169,4,211,146,53,90,160,42,18,3,147,90,52,144,150,105,239,51,70,199,39,159,12,240,183,9,68,237,81,227,53,86,48,238,155,67,182,99,218,156,155,38,154,146,100,36,93,132,163,202,16,211,153,118,172,211,79,17,44,228,14,9,1,121,77,230,69,223,1,183,26,244,71,95,172,105,139,72,221,255,210,67,97,232,24,64,54,111,211,252,159,112,146,125,225,100,231,176,71,7,153,243,76,187,67,148,217,194,84,236,199,78,73,204,215,13,244,151,163,138,230,161,245,7,27,96,86,13,156,169,163,182,49,155,55,231,211,73,191,147,222,177,249,253,139,206,160,76,34,190,3,150,63,225,164,254,194,73,56,195,88,33,155,180,171,49,10,43,110,51,255,31,249,35,251,93,43,9,40,15,152,39,88,247,105,63,180,184,127,154,201,83,19,186,134,132,87,144,1,56,72,58,162,21,2,53,11,9,47,59,109,119,28,184,226,205,3,120,65,39,225,71,6,195,46,12,
+228,114,121,107,208,141,49,52,0,61,132,213,63,135,63,161,147,138,252,56,168,146,58,133,127,228,95,203,221,246,27,160,26,47,38,201,80,18,154,91,76,153,148,167,80,140,128,96,75,94,52,42,183,207,207,217,185,153,177,48,152,127,210,184,80,90,255,172,49,162,92,159,84,46,210,9,117,207,117,227,145,149,188,110,60,202,102,42,116,13,60,9,187,195,122,186,243,200,87,138,194,253,168,120,101,177,82,43,89,242,175,114,148,157,205,151,148,117,208,217,64,37,33,135,124,201,167,68,40,21,35,250,169,31,69,71,177,138,51,112,206,169,52,45,211,153,232,62,125,244,47,225,26,202,214,218,75,184,134,178,53,245,178,186,66,217,250,227,18,174,161,108,93,187,132,235,74,40,26,106,147,7,68,200,33,23,23,137,132,28,50,117,145,72,200,33,61,23,137,132,28,242,149,9,68,152,248,110,244,206,175,85,97,179,184,230,157,201,9,13,128,125,235,112,217,119,36,237,188,28,65,50,35,179,72,109,132,87,188,34,107,15,144,15,54,82,229,178,99,181,96,237,91,73,141,52,
+161,108,18,129,93,164,244,170,140,80,81,43,19,2,97,130,50,28,162,255,10,124,173,152,205,164,27,23,79,186,217,133,248,155,48,250,106,6,0,95,167,121,96,150,139,238,227,62,45,171,88,164,93,227,60,209,56,196,223,100,63,191,191,28,44,52,118,43,6,84,228,156,115,240,8,26,86,204,110,247,97,80,86,253,121,154,238,45,180,74,67,183,122,151,142,160,198,147,82,101,92,24,154,214,217,81,154,33,12,9,67,190,15,187,176,99,2,34,133,77,248,193,204,197,236,14,74,89,64,41,172,103,102,203,237,109,187,145,249,185,174,253,124,184,157,133,73,21,99,191,239,14,9,212,163,222,226,187,245,199,21,144,163,220,13,144,155,129,165,240,34,28,33,231,179,80,87,160,244,125,206,78,93,181,158,76,210,248,165,35,54,70,73,28,77,240,5,59,166,24,182,197,223,214,70,133,49,54,104,169,131,156,130,65,112,178,57,236,110,237,247,60,46,255,100,51,104,47,175,45,143,161,71,20,67,25,59,120,9,217,80,198,214,221,48,233,45,222,48,153,116,92,66,54,148,177,
+207,151,144,13,101,236,242,37,100,67,25,155,118,9,217,80,198,118,92,66,54,148,177,253,80,200,86,242,233,84,40,173,172,190,168,157,119,7,69,27,21,118,157,178,90,253,165,128,105,19,129,31,53,78,73,176,119,219,20,166,66,79,207,117,146,143,211,219,198,163,107,240,3,94,34,234,51,210,121,221,121,196,86,208,21,82,205,32,248,62,151,174,29,185,49,180,208,31,251,209,139,53,232,191,228,128,134,39,31,190,31,6,65,82,164,15,8,165,31,132,50,173,234,46,180,125,223,7,22,5,225,213,180,230,134,81,222,41,25,110,50,109,186,158,45,167,75,199,230,172,238,53,246,198,13,17,160,70,127,134,34,210,118,167,212,250,245,251,216,177,137,117,138,178,41,189,38,121,195,226,73,120,195,98,135,123,195,34,240,214,184,98,49,121,188,132,109,40,107,199,47,97,27,202,218,123,2,84,143,225,38,69,153,255,166,150,79,114,167,89,212,137,112,33,151,236,93,100,18,114,201,27,239,41,130,237,69,38,33,151,76,92,100,18,114,73,255,69,38,33,151,44,92,100,18,114,
+73,226,69,38,33,151,124,188,200,100,160,20,125,95,222,54,32,189,249,97,50,75,86,36,70,248,12,164,219,182,64,68,72,215,225,188,221,242,166,251,170,6,183,4,137,109,99,240,142,238,119,241,248,167,217,132,98,69,214,90,208,41,25,71,240,74,138,66,39,219,254,12,105,171,132,151,76,73,210,184,112,122,189,121,153,25,54,136,141,207,114,77,160,122,8,135,69,133,223,236,47,89,177,249,253,253,18,26,7,25,220,197,175,214,16,237,62,232,37,215,199,230,251,147,128,3,203,60,141,119,100,96,236,42,204,39,93,218,178,6,102,62,101,186,49,79,3,15,211,33,4,26,4,40,17,13,111,251,141,248,203,126,227,253,176,14,187,226,7,103,62,198,76,144,189,137,125,141,223,61,240,69,83,188,225,129,175,49,109,176,203,241,182,33,226,83,33,23,188,203,63,66,164,107,18,191,97,95,122,136,115,95,248,235,81,223,124,36,222,78,124,220,78,235,159,110,167,255,127,127,157,249,75,15,197,130,140,245,227,242,96,138,244,48,196,222,30,79,193,26,183,199,83,255,228,121,
+149,250,118,250,31,175,227,221,78,255,160,216,0,113,231,176,195,248,95,181,235,198,173,228,182,125,251,143,207,197,255,124,63,87,112,59,61,232,93,143,225,124,93,247,2,149,211,124,249,191,250,188,255,179,122,189,222,158,163,9,181,244,204,30,9,146,134,79,208,221,220,255,11,238,227,207,175,35,64,133,65,11,243,135,132,14,131,121,57,116,88,16,166,252,128,94,42,19,215,227,7,157,4,187,157,16,220,78,95,175,187,188,252,79,215,105,174,199,120,199,155,164,142,46,235,41,94,252,255,174,127,224,205,51,20,108,98,79,146,91,188,249,39,121,135,116,59,13,19,220,78,211,254,211,117,220,91,12,10,113,12,119,176,57,133,14,32,46,141,3,181,141,250,254,255,94,187,254,121,59,109,76,63,12,160,241,99,220,189,66,246,192,232,105,25,189,250,129,53,249,16,93,110,119,199,251,151,183,211,187,186,67,172,138,144,176,184,191,122,52,204,202,42,52,12,86,191,136,73,227,166,39,248,247,219,246,22,12,13,203,242,67,208,80,241,245,165,153,33,1,131,201,165,97,48,177,
+172,160,133,238,27,198,200,117,136,164,219,199,195,188,202,120,94,55,190,207,251,31,97,211,251,205,143,245,103,51,61,93,219,149,249,207,183,255,39,116,212,61,167,101,185,55,69,117,223,17,68,171,71,199,221,211,189,55,47,249,96,66,245,227,152,205,79,47,170,176,185,71,47,139,34,206,214,23,177,221,214,63,162,180,19,251,218,128,169,142,36,118,221,224,181,243,59,173,66,99,216,211,125,169,63,122,30,137,170,207,110,190,69,183,236,27,72,6,155,30,106,137,250,111,42,124,158,111,51,224,15,217,235,117,166,238,75,136,181,179,155,154,13,130,43,181,108,167,206,134,241,209,181,241,230,101,196,247,167,49,38,255,168,129,1,174,102,242,78,84,11,19,59,225,137,109,198,216,63,236,102,56,80,76,9,190,132,132,142,40,110,8,163,209,194,194,120,243,171,122,24,109,30,118,221,38,197,153,104,18,171,171,95,52,244,198,86,82,70,81,57,18,95,208,231,116,187,117,41,125,61,42,184,169,48,202,123,63,162,17,2,233,203,99,104,33,40,212,244,90,20,99,118,31,244,196,
+150,217,88,120,105,185,220,38,74,34,28,22,28,167,129,194,35,199,230,35,97,70,254,113,10,3,194,173,164,65,129,47,246,5,117,255,103,114,96,207,82,108,146,189,204,191,230,165,161,174,143,125,120,82,134,231,113,62,197,145,189,202,102,218,7,163,15,222,246,40,98,68,205,17,5,163,189,7,133,119,100,224,164,39,80,9,70,185,118,75,164,189,0,88,224,165,48,161,65,21,64,8,161,10,36,171,147,178,194,35,244,64,171,172,138,207,204,40,7,184,225,30,170,155,80,35,81,157,75,82,178,159,210,85,177,93,236,248,14,1,239,127,125,27,238,190,136,201,188,42,85,76,82,191,166,167,47,179,94,180,76,118,107,244,174,5,53,166,12,239,79,215,183,89,117,157,143,59,104,148,196,60,80,244,37,91,178,89,15,49,249,92,48,18,114,195,47,3,51,12,149,224,126,73,230,117,202,83,235,225,118,187,129,97,190,144,147,26,21,165,146,252,235,60,39,30,252,194,24,172,155,225,210,133,17,156,109,37,241,202,42,91,237,56,128,152,103,203,155,103,246,42,127,153,192,25,
+157,160,21,2,229,170,229,228,220,193,57,192,198,152,13,78,63,170,71,127,123,86,199,6,30,147,247,230,34,40,126,84,5,34,208,60,251,74,230,236,245,102,124,147,13,113,233,30,74,30,234,204,240,224,105,113,189,76,201,124,125,248,190,142,131,82,151,198,117,99,136,120,250,7,130,198,253,141,125,242,71,92,104,244,142,255,201,252,96,197,243,77,251,97,247,250,18,157,152,248,124,98,223,90,242,158,222,108,184,17,7,14,227,104,185,239,142,198,113,59,53,48,167,159,86,208,187,119,28,54,225,117,115,124,46,164,62,96,162,135,1,39,2,207,177,119,226,253,80,107,96,90,20,213,140,157,37,125,67,174,164,142,254,156,211,231,207,114,148,149,125,92,134,35,238,251,156,120,37,185,170,28,185,231,48,123,59,201,157,206,6,251,194,119,54,69,161,121,53,3,239,176,78,65,115,249,167,63,205,253,183,255,203,31,255,230,223,253,205,229,191,199,254,238,143,255,225,242,83,181,127,241,239,254,238,127,189,253,216,247,191,249,87,255,240,135,191,252,139,219,63,148,253,201,127,146,
+253,245,255,246,15,127,246,11,182,255,71,121,255,221,223,253,237,223,66,69,252,229,31,254,254,175,255,226,223,254,241,15,127,255,247,215,210,254,199,191,249,159,255,250,127,248,171,191,249,135,191,248,223,91,123,211,31,215,178,227,78,240,95,121,240,7,161,13,180,5,149,36,75,30,55,208,192,76,27,152,47,158,49,198,70,79,127,50,160,103,213,179,85,152,114,61,117,213,147,13,163,209,6,247,61,153,220,201,228,154,220,153,92,146,251,190,37,215,36,153,220,215,228,190,239,91,114,75,38,247,97,190,87,146,74,106,121,6,3,204,39,38,239,141,136,243,59,17,113,34,226,220,12,222,243,246,171,207,223,252,197,251,159,191,254,253,29,129,239,223,127,249,135,95,206,253,217,103,63,254,233,247,126,250,99,0,248,9,72,127,125,15,117,231,55,239,161,102,69,38,68,117,22,7,56,28,109,224,203,251,59,242,176,178,1,155,252,139,26,0,71,112,151,164,215,18,31,0,36,33,95,95,243,162,36,156,142,215,112,227,165,119,105,50,6,125,131,156,29,172,236,157,44,71,92,202,
+99,137,78,213,202,126,172,176,148,216,140,53,66,189,71,11,61,45,21,198,163,194,80,88,195,124,25,190,158,84,28,238,21,31,145,241,101,70,171,202,11,172,222,187,102,250,174,77,251,237,211,222,6,39,212,120,216,108,102,169,47,47,247,178,220,4,215,21,236,84,218,48,101,194,235,131,238,34,90,210,213,161,38,82,163,165,18,105,163,123,15,161,238,109,238,39,71,221,0,2,153,137,149,91,169,107,64,124,72,236,194,222,91,41,79,90,25,29,194,157,105,46,55,117,156,32,215,88,210,136,104,161,35,86,253,10,161,102,44,134,100,152,40,159,149,21,191,164,228,229,195,57,248,201,133,16,122,78,32,172,17,203,44,196,32,176,9,58,184,0,150,42,13,38,37,67,75,139,59,210,100,78,28,174,22,101,220,39,186,16,218,186,97,188,57,28,185,13,98,23,45,156,226,30,197,144,60,157,204,49,17,113,77,226,73,62,7,49,121,241,167,96,160,223,185,226,244,250,2,54,231,0,122,66,154,56,151,33,166,131,94,113,238,78,198,115,144,69,34,168,25,250,80,47,1,85,
+133,17,205,85,170,69,85,157,157,104,204,169,65,132,187,33,20,75,12,179,172,94,29,65,202,152,221,141,60,164,86,54,44,6,235,115,253,217,174,197,166,108,188,47,211,253,200,42,145,56,32,182,195,238,2,52,57,34,9,129,238,146,92,172,62,162,217,226,242,124,201,188,19,109,128,200,40,68,167,138,53,100,226,135,0,105,4,117,63,219,77,52,130,244,137,211,210,94,226,243,66,67,12,227,111,92,158,250,247,109,218,40,39,103,114,56,186,121,144,104,188,103,209,31,168,74,250,248,228,141,45,56,58,53,248,118,79,81,97,203,157,81,202,239,93,121,213,166,16,63,127,35,139,165,84,23,174,154,203,47,19,26,58,61,42,151,145,20,43,52,50,146,213,137,159,93,5,52,4,71,254,112,144,196,89,167,116,79,124,100,79,22,124,34,253,97,153,230,180,118,178,98,134,73,133,233,180,94,181,171,31,45,208,17,87,177,27,178,99,150,165,68,153,137,137,230,72,208,46,144,225,2,207,47,102,8,175,160,251,67,52,222,17,17,48,177,231,103,103,160,23,54,178,198,17,187,
+36,246,148,163,19,165,65,176,15,235,8,218,46,224,163,254,0,140,223,55,152,217,252,18,233,199,196,48,177,229,22,73,52,33,56,220,71,96,177,77,241,138,221,234,51,24,199,198,166,93,231,107,22,153,250,148,79,175,143,32,74,80,133,186,45,137,93,58,96,37,213,106,236,131,45,180,14,193,127,100,208,174,176,17,49,7,50,49,207,224,195,148,109,69,220,121,142,131,221,8,8,185,9,203,229,148,24,76,75,216,221,224,137,156,112,229,160,81,151,59,207,207,235,178,243,170,226,23,243,84,16,190,169,24,57,198,1,133,106,23,204,173,97,224,51,84,28,12,130,94,18,49,143,186,44,20,150,228,4,166,10,161,228,81,198,16,136,180,76,31,199,52,78,136,240,51,70,16,41,104,18,239,149,166,75,102,154,122,96,177,94,14,201,77,123,151,1,134,129,190,253,152,48,135,214,224,135,36,169,158,111,236,22,209,19,92,126,209,18,25,229,48,145,67,157,123,142,54,148,154,236,22,153,203,195,118,2,198,1,209,13,207,187,226,103,98,50,164,193,183,38,206,205,75,185,1,
+134,96,57,107,132,122,39,160,160,38,68,111,173,185,103,212,252,119,52,171,23,29,239,19,229,225,104,8,110,153,211,60,50,251,46,198,68,61,141,60,251,86,246,105,129,205,34,214,108,166,96,113,21,56,116,213,218,13,200,77,221,49,242,113,50,195,139,175,228,183,214,85,138,235,13,4,196,62,252,145,69,52,218,92,194,222,12,194,108,152,95,122,86,103,22,153,97,59,139,94,37,39,92,42,224,174,200,75,164,1,89,15,68,162,130,43,206,200,26,93,115,159,14,207,69,140,191,120,85,195,62,21,208,4,68,170,208,65,57,110,111,34,242,199,173,156,189,184,27,201,146,79,193,172,249,116,152,69,118,29,138,56,37,152,94,28,52,21,54,35,161,53,185,118,242,33,155,183,92,7,139,206,173,178,66,226,144,40,23,138,5,178,153,10,73,107,189,92,120,137,185,112,149,108,65,106,147,152,74,17,39,156,204,172,118,4,67,172,27,200,117,57,5,172,215,53,203,24,17,178,221,5,73,209,227,233,14,176,241,58,132,176,250,45,118,27,220,177,79,135,18,23,16,218,87,249,
+30,21,21,174,84,59,47,233,117,26,154,2,61,57,49,176,186,68,191,128,231,48,180,234,119,126,223,123,142,144,231,152,250,245,239,197,204,95,125,248,240,254,171,63,16,54,127,248,103,63,253,222,103,63,249,33,0,124,11,248,110,216,180,51,119,139,185,159,145,72,64,24,44,135,170,190,195,119,132,195,108,88,128,228,1,245,0,125,50,119,117,188,91,54,54,158,24,7,228,220,139,233,0,50,152,172,191,91,38,31,132,119,25,37,48,34,168,92,4,232,0,9,94,194,42,220,106,128,48,109,144,11,164,64,52,119,227,244,18,185,89,68,1,0,186,25,2,20,153,0,247,66,47,93,181,128,184,33,167,26,174,174,38,212,113,34,126,191,229,208,177,48,34,98,98,185,119,111,104,251,205,2,29,192,120,87,84,128,108,189,175,58,157,4,160,164,88,145,2,116,36,199,105,231,189,131,241,38,15,253,167,140,142,93,197,208,41,43,130,4,196,7,72,18,101,224,226,119,53,241,179,63,57,171,226,205,223,125,156,253,119,52,242,245,187,119,255,230,139,213,127,242,217,247,62,251,
+193,15,126,138,2,187,1,230,179,42,64,247,159,52,98,60,39,146,96,178,164,211,144,0,11,97,212,197,146,152,0,104,67,9,112,225,191,7,52,0,242,228,8,240,168,130,100,73,232,0,24,32,191,246,209,164,224,231,171,99,88,128,195,145,94,212,75,21,106,185,92,174,228,93,99,171,187,27,240,50,33,197,240,133,226,80,90,173,99,167,197,3,168,214,218,173,237,122,106,195,31,128,174,244,125,43,17,26,82,235,178,26,254,69,225,226,61,129,125,181,123,142,177,71,242,38,22,123,20,151,147,111,63,49,73,64,116,71,145,79,247,170,158,172,112,192,75,122,178,74,131,196,100,122,212,129,161,42,196,158,164,8,57,41,164,136,94,50,16,203,75,164,97,231,142,55,185,209,91,41,172,227,137,229,113,66,160,13,248,83,195,159,108,117,228,171,11,164,39,82,32,57,249,228,7,175,103,110,166,220,216,169,240,189,193,0,95,245,238,121,132,30,117,158,215,10,0,232,123,193,75,46,81,106,203,236,5,85,149,135,150,14,30,211,10,202,46,71,121,137,137,204,232,100,39,52,
+178,210,57,183,70,212,12,128,12,136,135,173,189,179,13,229,123,22,186,39,176,197,87,131,163,239,98,33,30,5,106,20,212,215,181,103,252,203,121,38,90,249,209,215,79,233,58,85,151,143,33,86,25,236,204,90,25,68,137,216,175,154,137,89,216,236,123,136,60,201,111,61,232,137,169,128,77,228,229,205,83,237,177,36,32,101,41,109,54,199,188,168,168,68,45,37,95,110,183,189,152,40,193,4,135,247,92,199,139,159,46,72,20,162,148,95,212,25,225,114,1,189,115,236,199,111,85,220,81,235,101,6,226,67,51,154,253,50,121,203,173,159,120,136,215,154,246,200,86,220,51,176,183,173,161,169,117,162,32,219,253,106,68,127,145,100,184,45,70,120,127,43,146,101,198,83,197,132,153,179,38,179,246,172,241,118,18,158,149,84,246,120,86,224,59,107,6,245,64,202,162,124,137,182,189,121,35,239,18,181,129,233,84,108,82,148,148,163,249,49,218,136,229,120,92,225,141,175,15,34,47,242,234,231,66,43,120,71,136,233,160,86,109,79,98,9,201,70,205,130,128,137,109,211,150,118,
+32,235,144,215,221,72,56,26,254,160,222,15,201,12,25,145,197,62,99,47,174,16,224,1,122,48,232,147,135,188,82,202,139,231,223,178,125,248,114,193,166,99,174,77,75,181,188,57,116,244,183,38,222,5,201,113,175,45,33,230,23,130,92,168,223,238,240,41,79,174,220,217,43,250,94,24,79,94,212,61,66,142,250,179,189,107,137,137,89,233,206,37,97,20,164,81,219,70,69,230,172,240,96,215,118,45,224,155,192,13,253,246,177,126,203,241,108,146,50,244,220,17,30,144,119,86,241,56,162,65,89,186,71,134,96,192,228,221,34,162,47,201,229,89,192,75,113,148,148,219,2,73,58,41,245,40,240,240,109,246,213,99,140,167,178,25,215,232,36,53,97,246,241,160,55,157,71,129,20,35,99,136,161,125,120,2,42,176,231,98,36,143,244,198,114,163,228,246,13,253,66,72,41,83,157,12,20,214,54,136,127,154,110,139,99,243,110,204,4,135,44,112,180,143,60,36,51,114,213,123,170,174,187,74,70,34,190,106,75,64,227,62,110,90,254,204,173,108,121,46,171,8,60,225,49,45,
+145,71,94,210,121,101,240,130,156,178,158,11,166,7,145,180,69,51,25,79,109,65,188,144,131,22,237,121,146,21,151,91,142,2,171,94,137,94,110,208,51,121,147,95,10,236,63,91,124,43,202,56,56,43,232,200,18,20,210,45,180,192,30,20,17,181,152,236,227,233,147,153,50,39,146,201,167,244,61,85,169,84,113,211,205,4,245,149,217,100,54,67,227,91,7,14,174,90,242,115,121,175,32,131,118,55,244,179,33,14,125,24,16,51,193,174,125,216,161,81,133,112,246,164,251,124,195,188,126,72,204,52,197,150,141,240,44,190,3,221,52,240,75,36,136,2,228,200,65,206,199,37,228,120,214,248,232,184,48,166,107,66,55,121,108,236,174,209,148,117,68,171,241,174,236,20,123,103,107,239,230,10,99,105,119,58,75,155,41,249,66,129,154,17,245,240,106,96,62,162,246,141,170,4,52,207,122,245,100,127,36,105,219,197,52,101,227,215,24,10,69,49,111,201,43,215,241,243,199,25,22,141,86,204,15,15,136,233,77,67,210,240,212,37,240,54,98,134,242,146,111,112,86,194,165,132,
+46,245,245,179,28,73,187,77,44,48,142,215,138,227,195,181,194,182,159,117,146,131,244,54,72,15,222,102,162,151,65,9,28,81,58,204,188,46,69,89,106,38,93,54,182,20,223,86,28,210,153,209,41,238,115,105,144,75,168,58,121,65,22,79,149,155,214,170,196,157,175,191,15,230,170,38,252,226,222,144,52,17,124,33,179,170,98,204,148,42,6,74,127,196,232,115,53,254,16,147,116,47,164,4,23,197,116,52,172,121,220,240,40,237,171,185,154,61,197,57,235,98,207,54,114,122,136,244,246,137,153,53,202,51,19,29,35,157,100,34,55,22,217,186,189,209,20,146,248,29,228,213,38,166,54,248,188,253,45,69,7,235,163,192,168,238,67,90,108,105,247,73,218,192,232,164,82,84,29,51,13,174,67,17,2,90,248,164,205,127,48,104,73,224,204,156,33,140,155,10,99,184,83,152,117,162,86,90,245,90,103,211,180,234,160,189,114,87,38,148,23,94,27,202,0,69,95,221,93,158,45,16,149,187,26,202,160,225,130,2,4,188,90,99,172,176,120,133,179,189,46,235,219,172,164,171,
+86,56,203,231,118,124,90,209,218,158,34,9,119,43,244,178,98,95,203,61,163,0,143,143,209,71,202,186,103,76,251,42,167,214,172,61,181,68,163,217,205,91,221,60,103,63,101,225,181,147,215,206,72,228,170,152,216,108,91,146,109,174,152,188,15,85,239,86,151,84,191,238,98,103,244,62,47,208,222,249,76,89,72,120,245,100,99,210,66,49,211,67,13,11,80,27,213,194,27,143,69,193,102,173,215,53,144,73,135,193,119,104,232,35,4,133,218,221,115,144,232,42,73,85,177,125,73,60,48,16,161,54,90,174,101,166,41,253,99,63,151,200,95,151,244,58,86,124,146,184,62,154,35,216,71,179,132,231,35,203,91,22,58,37,134,223,94,33,111,247,94,164,63,8,215,38,173,145,117,27,146,222,98,21,147,41,172,231,42,243,234,253,205,104,48,38,116,236,247,83,82,84,110,42,80,218,245,103,221,179,245,160,122,64,215,2,53,195,199,184,10,246,69,94,195,237,229,183,122,57,199,133,246,107,92,56,223,203,126,76,31,112,52,242,163,254,228,160,248,235,205,87,15,174,125,98,
+164,251,190,101,252,228,222,144,208,241,19,227,183,121,7,78,68,127,98,188,6,125,98,204,239,63,49,234,193,159,24,127,189,46,72,144,79,140,197,79,112,106,162,79,82,57,119,159,224,168,52,159,224,240,134,159,224,220,65,62,193,113,74,62,193,249,255,109,30,220,143,82,241,62,115,19,230,10,163,152,62,235,148,229,88,100,173,28,61,86,104,166,173,177,171,178,232,136,90,33,27,16,102,106,59,244,67,179,137,2,23,208,75,152,214,24,2,218,89,178,155,23,85,187,109,127,209,110,86,60,119,250,135,131,132,16,233,51,198,12,167,1,133,2,62,195,130,188,132,86,29,157,116,171,236,222,108,178,143,229,213,34,187,163,206,129,38,173,198,227,132,76,150,130,16,148,11,6,127,244,220,117,152,241,62,153,114,108,191,114,216,94,102,251,145,83,191,88,237,16,51,6,194,123,218,97,250,33,229,180,114,212,103,16,232,30,93,113,32,141,163,60,195,172,153,90,228,60,180,204,206,236,77,207,247,166,70,248,16,109,132,71,228,97,206,25,56,141,217,180,10,45,69,170,88,23,
+230,80,70,128,166,223,30,72,10,197,32,161,191,1,29,213,71,101,88,110,201,214,131,45,197,128,83,164,167,200,36,135,105,173,207,164,183,136,235,199,101,48,95,37,97,213,43,21,153,201,83,104,36,133,98,176,37,127,30,176,105,103,81,71,250,241,84,144,5,20,189,147,20,232,227,93,58,29,21,139,63,253,252,164,193,116,3,60,157,251,18,175,117,73,54,141,70,56,181,165,62,185,34,89,174,188,119,43,0,71,120,50,56,66,93,168,32,249,234,94,232,18,142,55,74,14,147,190,237,76,211,171,43,178,66,124,49,158,6,163,125,79,156,195,106,131,186,129,235,85,42,141,164,148,137,229,91,242,143,35,78,73,199,89,111,34,147,96,112,119,250,94,146,230,74,58,99,15,4,244,237,74,115,117,178,240,247,197,250,254,44,231,37,182,83,232,120,229,248,178,207,31,89,201,59,31,135,179,187,137,161,212,156,167,246,210,73,151,40,98,225,139,126,232,134,99,59,62,74,189,80,217,5,197,17,202,154,215,169,67,123,237,236,225,203,25,235,109,86,60,74,109,249,57,162,179,
+224,131,2,34,60,31,188,203,111,178,72,9,195,236,106,242,232,152,78,46,216,252,155,21,242,165,225,77,109,151,125,162,36,155,120,181,56,50,21,91,22,157,169,211,243,197,168,47,147,224,174,187,3,124,194,224,21,247,239,21,220,219,98,128,7,64,133,220,104,4,207,82,64,183,48,214,250,52,32,169,1,146,223,169,40,207,117,227,255,240,182,156,255,243,111,126,254,245,251,47,255,173,167,18,63,248,201,247,126,252,122,100,24,30,16,124,45,175,141,159,138,73,62,115,156,125,136,122,84,52,146,141,216,173,97,153,106,0,180,120,123,7,147,57,174,177,128,71,117,45,133,120,228,82,226,128,178,171,227,219,72,34,129,162,192,214,79,37,147,56,41,70,186,113,111,53,44,170,183,135,240,73,18,18,141,223,48,29,5,166,242,112,67,137,223,205,44,107,243,221,137,80,182,23,178,81,23,223,255,124,164,168,208,116,16,215,69,235,57,172,21,16,110,224,228,35,212,15,144,182,192,133,170,69,167,2,155,86,238,103,145,5,50,151,227,81,252,92,214,130,249,153,193,62,115,124,
+80,60,57,212,22,166,108,40,100,16,192,13,95,3,5,191,102,223,5,51,243,146,238,36,68,108,65,181,12,53,152,32,131,17,161,190,6,211,19,24,100,106,228,21,51,33,132,83,89,128,132,86,135,195,97,162,201,176,193,67,184,86,118,179,43,254,149,77,153,62,160,213,197,157,246,101,29,180,57,106,42,108,214,82,83,111,30,236,217,187,96,219,121,167,124,122,25,20,168,216,64,40,210,16,71,70,205,34,68,72,228,59,228,100,162,100,13,37,140,115,200,32,114,64,43,180,219,135,121,9,234,74,142,231,11,118,121,110,208,0,234,33,209,206,183,175,44,226,39,54,98,47,174,215,218,164,208,210,207,239,42,150,124,211,236,68,216,164,130,79,229,103,182,95,219,227,179,3,162,160,141,35,94,206,169,100,1,33,77,56,93,23,110,78,156,205,148,40,79,161,228,16,153,48,27,13,247,136,114,122,193,188,136,23,145,217,144,34,73,39,71,66,42,158,158,96,42,155,117,46,209,42,3,202,101,170,84,80,76,12,130,120,201,148,239,156,211,244,238,235,15,95,252,252,237,151,
+111,190,249,104,241,223,217,100,253,151,95,188,123,247,229,95,191,253,199,95,254,127,124,220,245,159,94,207,185,251,200,252,202,248,241,161,215,199,75,191,22,245,157,17,190,248,240,139,191,248,250,253,47,255,211,47,222,127,241,243,119,127,240,9,216,79,255,244,123,231,253,28,8,252,8,208,191,58,219,195,233,215,103,66,49,213,209,226,157,159,6,88,132,108,247,213,8,247,50,206,29,202,252,40,24,236,246,90,211,150,196,219,46,183,156,37,9,1,17,40,151,91,193,115,3,16,153,204,13,86,173,63,64,2,66,168,129,191,195,120,72,57,187,85,220,181,223,63,71,123,187,229,69,215,160,38,94,31,74,237,237,181,232,180,185,185,68,40,16,30,142,99,143,126,76,105,252,88,15,128,192,213,121,36,160,75,142,146,129,158,70,71,36,173,199,98,135,52,112,119,209,221,137,247,241,27,164,81,197,89,246,178,170,161,160,90,63,50,52,194,41,242,36,133,167,51,227,131,166,155,208,120,94,142,27,17,170,119,234,237,17,105,172,243,102,56,154,103,253,24,55,171,131,102,57,106,
+147,173,213,118,245,210,155,105,107,189,162,83,83,135,135,90,45,86,53,35,154,157,23,135,189,63,127,33,210,117,28,92,233,126,48,40,157,74,8,66,233,206,117,187,63,182,8,107,248,246,25,142,128,96,114,87,202,96,96,171,227,201,153,73,170,134,186,103,210,160,226,17,229,50,172,170,24,148,226,250,254,36,209,98,145,91,71,77,114,137,219,166,92,81,161,105,250,116,223,34,249,170,42,247,169,42,85,192,61,2,170,197,162,181,108,228,186,100,174,111,28,150,77,9,72,104,22,204,118,31,194,15,42,250,205,144,56,220,172,125,200,184,83,100,170,79,47,239,149,114,39,233,66,0,133,181,45,35,161,192,39,173,143,226,47,146,83,12,216,48,13,129,170,93,157,207,114,207,132,165,85,111,99,72,114,75,36,56,199,8,148,18,242,105,110,35,56,96,101,247,128,208,253,99,61,76,236,81,26,253,36,215,82,99,61,98,201,107,98,234,244,224,122,185,214,51,47,83,24,74,64,77,11,89,188,21,42,169,101,35,30,156,23,41,236,158,95,121,26,129,171,92,77,74,198,8,
+123,26,180,80,112,50,53,46,55,47,170,213,182,205,135,10,122,249,250,222,136,202,197,76,232,30,95,96,76,25,10,189,201,237,3,202,82,86,142,171,92,199,11,70,141,189,68,24,66,115,32,26,189,10,38,252,190,221,213,181,22,3,159,129,143,75,68,158,212,234,116,229,157,28,133,90,40,50,226,26,189,86,217,76,147,138,173,129,146,237,220,28,66,131,238,1,133,237,250,47,20,41,12,245,90,212,207,231,185,13,238,25,48,166,150,132,247,157,46,24,23,199,178,64,168,215,158,235,39,224,199,207,231,39,160,154,149,53,17,163,44,20,124,134,43,1,66,88,23,180,119,254,212,156,63,31,197,0,116,90,197,6,161,227,92,147,224,46,9,7,8,249,107,167,164,199,26,77,199,134,126,46,203,56,67,219,184,204,121,51,71,189,94,245,119,41,210,33,186,123,154,212,100,102,243,173,88,241,34,87,6,117,8,179,140,90,85,138,105,47,247,26,84,58,132,76,14,134,187,23,143,63,234,45,101,166,186,106,118,4,189,159,11,93,55,105,88,216,124,161,102,35,154,167,88,93,
+57,3,117,59,150,239,196,244,119,255,248,203,47,223,126,120,247,230,195,47,222,126,120,243,246,243,207,191,121,243,79,175,231,177,253,236,79,126,115,32,219,155,215,101,247,151,95,124,243,241,188,203,183,95,253,203,183,41,224,155,239,255,237,127,255,239,223,251,219,87,41,63,122,243,251,159,127,253,197,207,127,241,241,49,246,47,223,254,252,255,58,175,206,95,243,124,186,255,74,246,230,191,253,183,31,254,248,179,159,252,249,143,126,248,227,159,254,249,143,127,244,163,159,126,2,244,175,255,250,175,159,253,228,7,255,250,31,127,242,131,63,251,15,31,165,252,245,175,190,124,247,7,83,203,15,127,242,167,223,251,236,179,255,9,4,126,2,80,95,151,123,255,55,203,157,94,31,131,85,82,28,52,15,204,107,64,137,197,18,118,76,226,53,21,23,68,26,189,163,29,198,30,0,222,2,214,67,60,144,154,137,209,28,53,171,86,135,88,140,96,98,101,174,238,165,138,37,66,114,64,203,222,250,224,41,45,242,122,37,198,3,45,250,159,172,247,71,26,236,201,134,121,88,134,23,170,
+12,181,104,168,93,81,122,240,72,140,195,169,170,74,160,113,140,103,135,155,215,1,13,27,36,183,60,44,232,133,254,29,134,44,2,176,27,93,1,80,155,190,118,183,94,12,206,36,96,161,129,63,246,16,8,66,222,21,18,186,118,49,69,120,146,185,173,51,40,225,133,3,117,46,37,130,24,6,190,44,213,135,119,215,36,124,93,54,103,117,249,218,198,57,248,219,217,155,102,174,39,203,39,189,149,57,50,142,165,171,163,231,33,150,12,64,40,96,149,205,39,10,93,45,175,157,56,112,72,129,165,183,52,245,229,248,212,93,19,101,159,179,226,164,89,191,231,34,98,215,54,87,87,177,154,50,231,30,23,98,221,37,132,102,105,62,162,139,210,6,14,38,5,162,203,168,47,92,67,6,145,106,73,67,81,38,125,194,124,116,216,33,27,20,221,147,182,136,125,139,249,21,108,161,40,14,99,179,157,123,17,98,202,3,35,5,77,23,210,197,193,229,178,22,139,163,137,192,53,71,91,73,126,113,29,18,242,101,27,247,216,214,0,58,251,192,144,58,68,239,147,20,15,188,78,76,
+190,116,56,124,220,115,196,66,124,198,119,205,37,85,130,60,60,88,12,143,195,201,137,43,123,26,70,163,133,220,176,223,76,66,225,93,6,136,18,172,161,95,44,23,177,26,33,11,107,122,180,167,32,45,123,209,108,219,198,218,195,211,29,169,185,214,71,154,32,216,161,90,148,218,228,181,142,14,203,191,73,229,244,171,252,181,149,125,9,207,143,51,43,214,152,249,168,133,240,92,90,243,41,165,211,156,182,213,194,186,195,65,143,20,40,196,111,253,251,163,251,124,76,53,255,252,254,235,207,127,246,39,223,30,122,250,254,235,223,158,201,250,59,46,247,159,191,250,226,195,171,227,254,1,143,251,241,79,126,248,233,89,97,232,119,158,21,138,153,99,218,3,202,173,82,225,238,118,206,105,13,159,40,109,97,211,218,77,9,105,38,147,92,62,40,149,193,67,160,79,228,44,136,38,229,221,14,239,106,8,160,34,10,190,225,19,53,96,155,175,133,88,178,111,48,65,6,89,145,190,198,101,94,136,138,104,140,225,144,21,218,21,72,220,250,2,59,12,159,47,33,42,174,132,58,132,
+31,196,3,95,15,64,156,7,159,239,31,232,169,84,207,16,225,94,67,203,19,142,3,23,247,48,151,80,149,14,237,72,64,55,94,134,121,5,213,145,157,246,42,112,169,33,26,189,254,232,200,164,217,184,59,214,200,92,248,164,227,163,49,146,52,109,52,232,231,181,125,171,59,106,78,63,31,139,245,19,100,162,154,118,184,93,3,67,94,33,3,24,200,171,235,100,110,236,95,144,18,98,16,244,22,128,21,187,55,185,77,194,199,182,214,71,130,26,80,191,64,152,216,29,32,83,150,193,246,142,170,155,50,62,96,100,248,208,60,80,162,218,56,158,248,238,71,191,210,58,125,50,3,249,8,8,237,5,236,131,95,223,215,126,107,135,87,157,158,141,240,243,183,191,252,120,66,238,251,191,127,243,243,247,95,253,211,107,69,241,213,63,124,76,251,159,255,246,104,214,15,255,242,203,247,255,240,245,219,95,254,226,99,181,241,171,179,69,254,13,99,253,58,202,252,193,130,227,175,223,254,243,239,219,252,247,139,215,255,55,97,191,141,53,63,254,236,123,63,253,236,167,40,240,45,112,
+251,250,80,20,246,201,244,156,215,255,174,97,153,62,170,5,54,164,152,160,147,43,96,177,118,79,87,60,240,41,149,109,145,174,174,161,39,181,151,24,136,59,36,66,32,254,158,95,251,236,224,131,49,25,195,61,101,123,29,238,209,192,151,23,112,53,156,208,238,67,16,135,135,36,187,119,180,120,142,137,25,117,70,117,174,54,182,109,38,132,69,237,57,243,7,9,66,204,59,49,165,187,245,242,136,109,10,49,106,63,173,105,147,176,171,199,167,100,203,92,227,96,102,58,24,132,214,148,96,144,106,255,112,46,146,186,38,5,28,174,57,187,98,58,164,15,110,138,120,129,99,39,15,16,58,12,19,194,200,164,171,196,238,212,148,3,32,197,113,22,105,101,86,125,201,54,86,112,97,125,238,177,37,12,114,51,0,94,99,165,140,124,169,148,163,236,76,217,232,38,21,15,98,88,220,75,57,57,92,187,194,67,38,135,232,28,21,148,60,11,163,229,73,217,39,195,212,97,20,123,26,204,89,95,13,59,1,117,67,39,144,100,14,39,79,164,80,74,163,138,250,141,109,39,8,60,
+201,101,160,171,208,20,18,176,23,173,221,235,54,65,159,200,103,235,185,192,85,175,236,59,93,65,61,167,12,109,122,168,219,215,194,227,211,92,74,75,219,108,182,195,112,84,14,177,143,147,21,16,198,23,57,186,206,186,198,112,233,18,223,27,219,41,85,38,230,6,60,114,84,252,151,170,113,90,247,196,26,162,164,89,222,134,39,22,119,139,85,62,179,112,3,105,114,1,145,24,47,168,135,47,249,106,51,90,148,206,214,41,236,120,53,222,42,75,172,147,216,225,172,195,34,149,106,113,206,88,128,177,107,159,137,111,127,208,137,185,145,35,40,179,49,114,185,27,253,176,28,93,251,162,46,38,113,27,164,33,8,166,7,183,222,171,207,4,228,177,146,172,126,101,142,183,246,92,198,94,130,92,77,51,160,91,206,206,102,187,204,219,232,171,77,198,233,16,99,214,40,122,103,176,72,86,159,242,218,28,17,28,95,165,5,186,106,85,223,206,23,78,13,36,203,198,98,245,115,241,193,121,251,27,38,12,156,15,65,133,4,166,51,143,142,55,42,225,141,138,36,128,92,83,83,144,
+11,186,246,134,182,46,141,99,72,251,240,108,3,229,20,227,169,5,122,67,25,1,22,66,121,120,148,181,209,230,125,80,86,241,144,74,24,29,52,93,34,67,35,10,158,48,233,99,54,253,226,240,158,46,57,82,192,17,212,140,229,74,211,116,104,125,75,147,123,202,88,185,155,82,178,34,155,62,111,74,80,236,152,234,137,76,238,98,67,250,38,130,28,238,24,183,136,103,15,193,79,70,54,214,119,119,178,219,11,136,203,134,192,167,189,235,137,68,33,141,20,152,241,233,113,20,3,147,9,42,144,181,68,34,192,122,36,43,254,10,61,21,14,227,86,13,79,156,54,233,145,253,113,239,121,8,147,160,152,142,61,107,104,169,56,212,253,129,21,166,64,228,171,213,194,147,218,56,142,18,217,138,103,139,51,101,202,106,71,253,16,22,167,238,163,218,211,50,106,169,28,95,36,84,90,145,25,25,97,25,2,110,186,153,75,21,192,185,158,164,166,216,122,144,201,157,232,48,50,98,106,37,8,133,133,155,10,185,159,211,173,214,10,44,203,241,168,206,6,163,79,53,5,220,83,10,
+229,42,123,146,204,167,148,89,92,178,234,24,68,54,86,78,180,21,171,169,68,41,106,16,176,250,221,45,193,194,31,88,134,54,110,38,137,82,67,58,184,3,160,132,6,123,20,49,10,35,226,22,109,25,101,171,56,61,102,182,111,187,147,180,232,105,122,104,200,197,25,156,202,120,150,222,200,17,227,165,102,156,4,117,149,73,188,230,142,28,10,188,72,213,49,191,61,21,3,174,214,49,204,122,179,40,119,64,2,204,99,199,117,163,23,218,85,234,185,236,161,142,216,29,9,73,65,189,87,68,207,32,48,26,145,125,109,220,41,144,196,42,189,43,126,149,71,136,3,124,85,10,108,173,8,118,123,9,217,65,62,184,18,221,12,88,68,145,97,65,43,18,58,102,218,106,230,47,246,30,120,117,9,201,72,197,85,58,151,49,36,58,114,85,159,28,125,231,194,101,35,19,142,14,167,181,199,55,25,111,128,89,96,249,50,25,115,59,81,134,21,180,49,188,175,44,86,57,40,92,202,232,249,48,51,61,207,62,163,28,68,93,61,218,97,167,202,16,215,245,0,55,30,173,174,105,
+59,230,83,78,231,180,215,133,22,170,100,118,4,147,77,219,60,117,64,126,92,16,175,235,29,18,184,44,19,212,163,112,71,30,61,4,197,241,87,171,2,122,7,159,8,110,184,117,150,4,28,62,67,183,101,99,84,224,182,47,40,105,50,215,151,77,140,79,6,185,230,250,105,57,58,129,208,192,168,5,94,90,83,255,49,222,116,178,117,120,129,214,220,215,176,247,37,60,20,231,134,243,132,65,177,144,214,196,168,19,231,187,114,199,113,73,157,137,57,123,220,110,75,185,87,240,178,76,219,230,128,81,223,26,121,87,243,29,145,195,222,175,157,49,78,42,54,150,132,6,228,116,126,61,47,223,201,158,218,80,231,17,25,155,108,194,39,158,103,117,167,215,171,82,97,153,53,167,200,106,210,178,152,3,241,132,114,201,45,155,188,216,171,96,180,8,79,3,204,232,130,22,114,175,152,12,61,195,162,19,102,109,225,233,132,244,132,142,61,149,20,229,135,251,211,254,232,60,29,89,78,146,140,94,38,9,98,242,176,74,33,155,246,104,22,38,33,186,9,150,174,161,249,177,161,56,
+92,45,140,107,73,51,102,5,7,232,4,3,21,32,240,1,165,29,35,20,41,211,34,70,195,0,173,65,212,187,23,224,186,204,59,141,194,79,221,166,96,7,68,218,25,15,137,102,231,208,141,222,176,113,16,253,149,1,163,23,132,87,131,64,47,25,217,235,144,101,100,61,139,72,185,179,205,219,229,22,215,1,147,120,247,84,112,117,146,180,113,145,67,156,38,204,164,34,47,31,171,88,98,28,85,203,62,57,9,241,114,143,22,219,60,178,151,30,173,175,214,126,185,141,57,250,43,172,245,24,87,14,221,94,48,68,83,64,177,141,142,141,249,193,103,23,44,9,215,243,117,31,67,172,103,123,170,73,168,20,178,47,220,47,167,35,172,3,153,116,146,55,240,129,109,241,194,116,25,238,151,37,149,73,118,141,170,247,48,245,91,149,34,203,44,152,5,152,101,206,42,223,202,40,103,28,166,170,147,236,92,69,125,151,246,17,197,27,236,25,204,55,149,73,50,74,190,122,238,92,96,227,200,231,18,51,208,235,148,118,221,86,102,21,96,105,186,254,34,118,100,108,192,204,94,135,
+185,7,162,193,10,182,77,46,37,124,20,114,173,61,182,161,123,226,61,72,117,125,171,68,144,78,46,95,208,123,153,56,132,186,105,120,54,41,69,208,105,49,164,233,167,2,70,11,67,184,51,141,108,212,108,193,30,211,52,20,196,46,99,172,100,143,140,104,208,219,0,60,222,142,195,0,44,220,229,9,17,10,93,132,98,157,101,239,109,92,42,36,139,111,232,89,2,25,206,200,187,95,237,46,125,244,103,121,86,99,58,167,23,160,49,214,30,230,58,143,56,195,157,187,217,194,5,178,180,77,138,35,184,185,223,195,120,220,85,144,226,26,170,228,7,216,211,150,233,138,43,116,247,66,65,154,125,198,52,154,240,199,23,23,84,245,38,139,66,94,218,47,170,25,253,75,27,13,51,55,189,242,153,140,121,31,160,185,247,220,192,161,199,170,33,61,41,168,233,116,251,48,6,8,153,198,148,54,180,33,196,215,162,75,110,185,68,100,139,51,37,211,28,123,247,18,180,3,207,246,238,69,61,220,20,93,147,221,132,200,215,68,237,220,67,200,182,174,104,86,127,195,211,202,10,4,
+203,221,169,84,65,192,179,154,34,41,56,126,84,220,171,167,114,13,58,77,38,95,144,217,247,12,213,189,76,65,55,105,192,125,101,210,212,165,48,77,36,152,253,182,124,172,229,93,125,191,34,236,108,52,40,137,180,238,165,13,203,123,4,130,52,143,197,227,166,99,147,50,181,205,102,221,207,64,105,14,203,201,171,142,204,15,101,239,160,4,41,66,58,87,238,167,172,104,105,142,209,2,110,44,127,209,84,145,236,183,149,109,150,123,118,16,29,61,79,151,51,85,30,121,189,33,38,155,200,212,144,59,142,151,44,9,126,194,204,12,202,214,114,152,37,47,205,32,168,168,96,115,164,204,206,139,145,155,139,224,34,193,98,238,216,213,216,12,9,89,103,115,173,71,155,40,108,91,149,9,22,217,192,255,44,156,51,136,32,142,218,188,0,62,20,140,116,118,232,193,45,63,239,14,86,110,166,108,105,47,94,210,113,113,75,139,89,216,28,150,51,208,2,34,145,87,196,107,9,179,250,176,155,65,4,242,160,74,49,221,232,203,180,9,218,149,208,160,178,34,188,73,113,55,143,170,
+5,163,91,54,204,71,108,115,3,143,90,102,46,175,102,140,118,158,103,2,155,3,38,93,45,128,217,13,107,85,64,32,5,98,106,76,156,102,188,12,55,115,31,208,218,129,100,130,147,213,10,23,54,115,240,3,221,188,117,233,217,248,169,216,221,85,102,206,16,100,169,206,83,178,214,101,167,81,234,10,188,125,234,31,156,135,173,237,46,105,179,115,154,54,236,66,202,97,169,252,47,247,167,212,198,251,26,134,252,37,90,108,80,2,227,49,54,117,133,3,183,108,48,21,46,132,194,63,199,168,244,199,187,180,28,145,182,187,85,249,47,236,221,77,204,132,178,149,236,84,19,113,74,247,191,232,36,197,230,201,148,194,123,104,1,161,220,25,147,22,29,246,227,78,238,211,195,220,110,73,120,193,175,187,10,68,222,45,231,216,113,150,70,139,89,117,20,171,232,232,8,174,38,114,234,95,191,204,130,141,155,108,76,117,161,159,2,11,108,103,48,254,178,219,98,74,70,96,137,44,240,246,14,210,227,117,80,238,119,132,6,224,115,12,185,121,14,74,156,38,180,211,2,130,32,240,
+231,244,20,108,157,244,27,127,80,35,83,43,53,212,237,188,88,70,237,130,131,94,244,50,18,9,120,38,236,21,7,135,227,174,110,130,15,132,122,29,33,200,104,233,59,169,140,81,5,239,153,13,37,82,15,208,120,148,226,203,99,101,50,139,40,220,110,72,86,220,195,5,33,176,10,33,124,28,140,100,114,199,203,118,115,243,40,148,83,203,4,252,210,92,167,250,107,112,9,18,95,224,135,9,143,48,140,250,78,83,36,28,193,199,12,177,29,124,204,35,143,203,7,91,46,204,43,207,27,42,48,4,161,24,36,232,2,138,66,74,195,10,174,50,143,185,124,153,225,92,63,202,19,93,5,17,173,61,47,164,26,188,247,73,14,13,105,120,125,231,72,182,89,170,182,87,249,242,125,129,78,7,52,22,138,37,1,48,137,145,183,84,2,207,167,115,152,5,234,77,227,40,252,52,255,135,243,154,74,89,54,50,147,205,235,30,38,85,141,64,173,229,126,116,185,33,250,172,4,45,232,64,164,3,47,33,127,113,32,103,22,250,226,165,92,214,42,115,220,1,102,28,82,103,214,193,
+172,179,30,47,52,141,0,79,77,227,6,229,206,87,97,3,5,231,46,201,116,90,40,128,80,27,162,114,248,2,136,120,121,219,194,123,153,68,88,56,112,86,231,73,35,142,218,29,156,134,9,9,69,3,237,68,55,150,192,67,234,252,100,220,25,175,243,212,42,172,103,118,82,112,93,81,171,163,52,24,14,114,158,16,7,21,160,156,217,170,207,114,250,84,255,52,111,163,115,40,52,164,50,31,159,249,130,58,191,226,144,215,153,245,201,88,123,59,219,41,205,183,100,164,189,93,176,229,201,104,110,122,19,48,117,76,15,196,194,105,183,178,108,128,59,206,217,69,73,14,28,220,164,34,93,62,156,171,116,140,186,130,227,111,46,163,175,174,151,63,231,71,12,195,180,222,196,9,77,76,174,91,167,221,198,248,144,120,82,151,218,8,72,175,158,249,120,78,159,29,236,53,38,42,94,183,140,27,14,34,235,25,199,202,13,90,236,224,162,190,8,199,79,40,32,46,126,52,63,82,12,178,227,131,11,51,179,228,96,97,183,188,155,194,228,78,102,52,225,105,222,79,17,4,161,103,
+213,81,135,84,98,186,211,139,24,177,85,215,52,8,131,193,170,128,241,150,22,161,50,7,137,29,62,207,226,129,158,67,127,185,38,32,86,158,231,107,17,248,132,125,230,136,246,40,36,28,199,139,71,60,187,88,82,254,196,144,204,231,212,176,123,186,230,3,100,11,142,130,32,242,143,17,235,104,144,15,145,7,184,34,2,105,124,64,117,238,227,138,50,206,101,149,242,205,248,112,76,117,77,4,25,59,89,136,249,145,81,112,237,199,148,160,155,28,52,219,231,249,236,192,46,144,44,219,70,43,137,142,46,193,164,37,181,88,53,50,62,139,196,113,38,115,78,67,64,42,8,238,69,230,68,42,59,96,178,149,83,56,28,227,227,225,184,88,3,88,4,59,248,167,19,243,6,85,126,233,108,186,36,116,169,52,55,222,87,204,180,138,153,100,38,202,216,68,255,179,218,43,119,79,153,26,54,131,241,44,213,133,206,46,239,71,76,247,0,250,69,5,39,173,207,153,54,253,112,3,215,143,119,240,187,66,178,174,197,152,172,96,112,54,53,215,61,7,123,101,131,141,196,97,115,183,
+230,225,75,38,148,232,161,149,28,22,138,156,90,106,138,60,201,211,66,102,26,66,165,39,120,152,169,226,26,29,84,126,19,132,72,46,219,183,248,1,126,34,172,51,211,242,253,130,144,25,72,122,32,66,33,210,158,172,84,225,194,181,251,188,101,222,31,99,167,20,74,149,47,115,0,57,204,97,201,170,238,225,84,37,91,50,36,156,158,197,39,139,16,68,49,30,110,243,174,146,12,145,54,55,162,68,138,151,136,184,204,230,237,128,198,40,194,75,79,3,50,145,173,55,137,24,227,128,185,104,120,27,188,17,148,32,205,64,71,90,113,234,178,189,187,36,201,114,156,170,189,143,205,72,129,130,46,53,75,161,172,126,218,54,5,175,136,216,177,232,30,58,241,62,174,34,200,8,237,17,42,24,237,160,38,72,128,24,236,133,138,138,165,117,162,19,236,207,137,48,52,70,79,59,69,144,17,19,111,107,75,69,115,35,241,58,120,128,229,244,46,106,1,11,111,153,104,152,185,89,32,178,59,21,150,204,220,162,194,107,231,26,91,123,2,187,188,9,247,10,158,136,148,106,50,109,
+100,69,40,55,196,13,104,197,204,130,182,30,160,157,153,60,28,49,243,178,187,83,223,221,228,194,128,228,35,245,180,150,18,142,21,235,225,78,3,98,196,139,146,39,153,68,174,83,44,111,123,33,86,23,73,210,242,107,193,146,85,92,90,158,39,134,92,39,40,143,80,238,58,130,234,144,145,25,54,84,215,184,145,163,202,246,149,7,5,149,79,160,100,232,174,2,157,151,205,205,40,130,90,139,189,48,227,204,43,3,115,79,140,58,114,133,225,177,122,17,76,204,14,36,142,134,245,132,77,153,155,182,102,29,231,169,137,238,201,185,33,34,46,100,138,75,126,150,159,249,20,177,152,141,185,246,75,5,21,155,232,49,87,162,249,61,243,73,20,136,65,184,195,11,156,33,153,219,218,234,47,118,227,253,121,187,106,34,117,249,9,9,74,89,117,72,158,158,224,200,110,24,231,3,249,30,133,37,189,65,31,217,220,87,179,50,81,61,187,79,239,210,183,84,167,249,156,107,216,33,232,140,36,139,29,85,93,240,108,45,57,180,131,10,231,129,122,206,57,182,27,114,83,113,206,57,
+175,43,91,86,153,189,102,30,90,232,117,241,190,36,187,22,54,182,142,153,109,109,220,82,132,143,224,234,72,129,136,227,198,119,94,242,201,215,178,25,211,109,168,131,167,189,154,88,221,98,107,204,70,208,170,154,28,123,67,34,107,11,105,243,94,44,0,228,140,117,9,27,216,228,197,33,175,94,246,116,221,180,202,164,61,168,198,39,150,9,159,10,103,96,248,162,75,204,21,176,138,142,236,16,202,45,215,118,157,26,242,184,71,146,63,171,220,113,136,189,20,102,171,5,88,208,43,131,45,63,118,190,72,168,189,155,10,68,120,119,99,148,31,111,35,114,4,225,116,49,41,216,219,23,197,235,23,54,144,192,35,227,159,172,231,60,84,152,183,246,87,90,175,149,5,17,97,60,145,156,136,166,171,54,121,166,164,126,199,112,49,68,92,7,239,202,6,130,142,148,54,99,84,91,105,74,118,227,137,206,10,239,186,36,182,245,253,128,71,146,227,231,137,38,244,170,128,185,66,58,247,207,221,124,252,165,71,238,68,144,190,185,181,169,202,83,117,110,108,109,218,75,77,87,135,100,
+74,137,64,54,247,218,4,101,103,238,184,82,212,209,189,70,215,235,74,139,121,113,35,4,209,88,42,199,181,113,179,88,148,231,193,123,180,70,175,33,84,30,94,58,221,28,200,163,133,9,88,144,1,76,98,168,118,33,13,214,148,219,34,227,129,61,232,181,21,3,76,109,200,201,214,106,58,110,227,72,13,230,48,170,61,5,125,87,247,29,15,204,189,214,170,156,202,64,237,229,186,112,134,244,146,218,222,12,185,220,124,18,51,136,62,178,22,119,36,145,152,155,70,214,227,76,5,108,70,26,131,46,51,76,163,177,110,41,58,1,33,221,73,215,188,231,65,0,47,122,5,50,242,76,86,121,159,156,104,217,13,183,89,7,246,218,130,253,158,37,19,223,66,33,157,32,135,184,128,104,18,114,2,153,94,210,84,154,30,19,148,154,158,93,139,144,214,68,151,148,231,221,111,169,222,20,143,54,126,12,187,7,147,147,83,222,110,215,158,15,25,164,203,237,73,228,207,155,201,67,165,153,179,185,221,90,65,70,223,212,163,185,125,65,88,65,4,243,40,185,25,108,187,241,246,20,
+151,30,183,140,152,159,5,105,238,235,10,236,4,129,243,207,230,209,26,173,151,58,242,161,149,241,143,28,100,171,88,135,55,75,30,90,252,34,207,76,171,3,145,214,195,144,72,224,66,3,52,233,20,10,159,70,184,228,115,28,32,15,194,126,113,253,246,84,57,58,232,51,80,88,1,198,64,238,215,236,193,144,9,147,50,218,161,188,64,169,43,141,79,214,209,44,20,48,45,110,35,94,80,139,52,42,99,216,210,60,105,31,53,105,29,17,66,54,117,17,150,218,181,225,141,230,146,103,47,240,238,189,159,204,97,197,31,238,138,205,184,156,244,64,197,199,129,183,154,45,208,224,97,179,186,208,43,74,125,72,22,164,21,29,158,66,124,143,91,251,141,59,188,62,158,130,245,51,47,20,123,5,119,67,198,27,159,206,201,89,23,49,251,184,249,219,82,216,157,119,225,204,151,204,113,148,38,103,183,32,10,227,21,241,88,208,154,110,123,143,217,188,96,152,135,208,7,104,38,91,25,72,159,117,101,90,238,157,62,156,106,30,27,114,249,9,57,202,12,161,201,107,52,129,55,2,
+212,105,8,199,227,94,137,246,249,4,163,76,171,245,32,148,60,56,46,68,188,106,221,80,25,47,66,173,42,101,221,153,138,90,64,38,158,192,195,235,69,132,16,118,41,167,103,163,37,15,122,123,13,30,219,33,227,136,156,25,202,134,67,52,17,102,151,146,220,111,1,13,72,224,165,87,32,98,144,11,223,2,185,24,199,245,181,233,198,91,236,178,74,181,6,10,201,153,248,15,16,210,30,59,176,213,229,197,91,228,101,136,120,165,133,42,11,196,117,77,92,138,19,215,98,140,250,198,255,169,144,236,52,49,179,176,109,211,167,135,48,106,118,41,85,69,122,253,8,110,94,210,86,12,30,159,22,40,140,58,91,129,104,3,61,222,178,217,235,33,206,123,104,42,126,82,34,176,199,67,70,224,112,77,246,211,148,238,199,72,192,180,185,137,98,192,179,129,157,72,64,97,0,101,12,246,128,37,114,243,16,84,192,148,31,249,144,145,96,207,141,195,240,128,16,127,234,10,9,205,142,110,84,36,197,163,28,109,228,108,137,247,121,176,11,12,137,247,164,86,75,84,11,231,142,132,
+104,136,20,41,220,98,6,214,39,30,66,216,6,70,174,245,234,110,211,76,246,61,15,173,88,151,198,109,136,104,210,51,167,169,35,16,54,98,53,73,219,88,20,246,21,60,115,81,176,40,38,75,17,89,61,220,1,250,250,183,2,29,22,1,133,129,103,120,213,90,89,50,104,56,148,50,97,91,211,171,35,138,88,10,149,162,228,219,99,0,183,151,231,243,143,25,2,119,59,83,180,58,176,165,225,46,66,32,83,172,108,199,118,123,175,205,6,9,190,131,102,28,142,116,128,122,205,121,226,215,83,38,97,226,176,165,23,170,218,216,50,124,224,29,77,26,35,52,102,32,168,136,92,180,198,142,231,183,236,92,157,234,72,224,162,75,97,103,202,41,50,198,174,173,22,113,180,67,80,144,173,147,242,208,40,224,31,248,72,97,223,88,100,151,9,21,123,148,229,202,84,90,13,33,210,163,188,10,86,138,86,206,131,219,200,173,198,239,239,149,207,74,49,8,178,138,180,242,37,196,165,90,94,178,116,227,205,21,122,97,102,93,190,228,13,58,185,158,190,188,177,144,174,73,194,254,
+152,16,180,70,143,132,219,114,120,49,27,67,23,227,238,13,230,68,217,40,242,42,224,117,1,113,160,216,35,109,188,97,233,190,233,191,72,160,30,205,208,198,133,129,175,111,76,152,182,236,246,9,169,200,11,194,5,124,215,61,53,249,5,37,180,179,132,128,172,112,51,195,131,70,113,67,88,50,84,204,174,44,152,122,136,135,123,59,179,54,40,194,245,217,23,140,99,2,99,152,249,245,169,224,133,68,160,75,145,210,164,67,235,210,215,149,247,137,73,243,26,197,65,58,160,126,65,3,34,134,105,184,114,130,197,74,37,203,72,34,41,166,136,189,146,22,167,243,108,93,58,51,204,162,36,239,8,202,104,73,10,45,89,62,10,180,203,186,71,191,29,171,214,18,194,145,155,53,88,153,10,154,58,119,211,200,94,196,137,226,130,131,228,234,92,151,211,121,176,82,77,82,12,33,55,4,118,230,112,128,84,166,23,196,181,245,198,40,90,19,109,237,250,217,19,160,172,46,22,178,10,250,233,178,185,92,100,172,245,98,176,219,79,242,228,161,206,66,48,4,23,92,51,59,126,238,
+100,85,0,52,104,112,242,12,212,50,123,152,246,194,76,107,117,42,3,72,60,62,7,137,13,108,24,89,160,211,128,46,96,8,110,157,4,140,50,47,48,195,75,44,151,91,115,247,116,23,46,55,130,210,230,35,5,164,176,252,101,76,183,163,59,115,56,154,74,119,218,26,55,106,24,149,52,72,54,110,37,226,140,208,203,52,103,16,128,39,145,184,30,136,104,116,137,139,228,126,74,33,180,22,174,155,91,97,7,68,75,150,67,97,124,138,21,166,155,40,231,25,234,180,212,36,39,27,191,199,250,185,29,208,235,45,81,91,72,63,7,246,208,18,214,196,92,102,249,28,4,220,119,6,146,177,1,196,204,186,135,214,44,213,155,165,187,178,115,251,146,79,197,28,136,48,56,3,182,74,163,147,167,161,71,210,150,241,32,113,224,124,27,148,224,196,123,229,84,53,113,108,159,114,15,153,219,204,109,133,60,192,225,10,92,29,162,77,136,71,14,107,82,239,182,82,246,113,20,3,9,253,188,241,138,124,188,204,218,31,164,249,106,245,52,227,148,77,25,214,131,152,170,156,223,7,
+80,23,2,13,39,82,228,200,217,246,157,72,73,31,174,114,85,142,165,133,79,243,64,4,105,78,235,44,111,6,91,197,154,118,91,16,90,58,136,252,21,151,187,28,102,21,122,235,109,117,191,136,220,16,13,121,204,109,201,204,43,112,70,99,99,149,109,193,243,210,188,36,193,145,200,238,105,36,6,148,143,87,213,107,72,155,196,55,117,50,78,142,193,45,154,170,52,68,89,129,134,160,16,98,232,105,3,227,13,209,101,18,74,249,117,114,209,185,65,234,97,62,139,141,173,132,224,171,238,71,50,151,91,199,37,23,140,76,169,49,96,107,87,60,52,222,71,119,202,40,169,69,223,117,230,121,101,137,87,167,246,108,22,160,83,82,200,12,92,252,116,53,42,96,201,114,143,210,126,255,76,55,15,231,244,16,180,144,167,230,6,121,242,46,100,25,212,119,83,39,213,232,150,206,87,147,117,212,1,199,47,10,210,23,177,117,234,144,77,131,54,81,156,44,115,102,204,198,154,81,123,149,79,100,78,235,30,255,50,105,200,48,242,2,1,127,42,205,216,226,186,108,74,25,84,233,
+50,140,1,218,2,90,179,45,20,37,46,22,183,86,99,74,86,168,88,234,29,229,82,97,253,18,182,61,22,72,12,33,78,85,201,58,152,205,164,80,123,186,72,214,163,150,176,77,2,96,5,164,162,244,163,174,111,20,197,142,72,199,121,241,60,234,195,237,192,176,143,54,65,231,196,69,99,106,101,135,74,9,1,101,109,41,218,131,150,160,41,165,79,25,43,47,158,139,90,194,29,2,180,67,150,176,253,50,221,139,156,199,99,205,243,18,130,247,146,58,139,68,206,233,252,97,86,227,183,161,246,124,60,11,19,54,137,241,117,193,120,162,231,133,205,162,126,123,227,92,47,250,115,126,251,54,24,77,7,37,195,104,66,124,26,216,164,64,73,227,33,205,28,53,153,52,1,193,33,201,185,132,244,186,57,217,192,198,144,55,6,156,88,182,234,166,156,1,114,21,102,245,79,90,212,150,211,171,6,163,237,147,244,227,139,97,75,36,249,91,75,142,155,161,149,67,70,1,242,80,23,100,165,181,197,96,228,81,82,187,209,116,134,120,148,253,202,178,93,63,128,76,218,70,89,71,
+34,19,158,234,37,236,88,73,243,170,27,51,136,40,105,54,70,109,115,50,197,237,141,82,161,22,209,21,6,5,222,62,243,192,112,127,167,61,164,136,83,247,42,17,100,201,85,113,245,228,161,239,106,71,247,152,111,33,247,162,125,137,10,94,123,199,87,193,16,22,58,4,233,175,178,210,161,41,55,147,95,4,229,94,205,124,198,75,115,133,142,171,242,97,16,117,58,34,165,11,197,242,165,13,117,72,173,156,167,2,235,148,187,47,63,31,221,32,16,69,152,29,29,140,157,40,226,241,42,20,121,212,81,144,173,94,218,142,194,172,238,238,236,9,188,116,27,51,166,175,138,100,239,21,132,250,116,251,184,155,87,3,243,6,203,39,47,82,204,176,134,4,68,230,10,202,233,72,251,54,54,219,52,245,16,169,64,199,183,86,157,229,126,221,176,198,242,183,1,19,137,124,240,183,148,126,251,180,49,217,49,130,196,89,224,49,195,137,113,159,97,202,71,95,71,28,29,92,7,65,165,155,94,61,218,85,210,179,217,182,134,140,183,138,73,7,141,27,217,41,39,2,180,208,44,180,
+67,207,102,134,176,129,108,7,232,219,108,183,48,61,87,102,17,89,82,208,228,6,150,81,55,145,84,111,146,91,23,26,149,248,141,78,80,66,81,102,84,107,243,204,86,169,130,237,41,134,92,211,15,10,48,194,212,101,30,231,49,185,205,193,12,11,219,184,32,250,42,47,238,7,251,195,24,31,20,249,84,83,56,138,113,240,164,101,30,199,193,44,8,26,194,228,231,157,19,48,119,114,91,241,128,97,126,50,101,184,2,163,103,122,92,137,17,163,85,39,160,172,36,246,15,122,68,55,17,246,185,13,61,9,59,202,38,102,58,42,18,230,156,152,59,193,254,161,142,55,35,103,165,104,186,53,0,59,178,106,109,141,92,72,216,61,205,199,80,188,55,170,11,229,163,98,22,69,65,180,90,221,200,232,69,124,177,117,238,220,23,53,138,87,22,89,118,122,101,101,206,226,243,93,215,147,233,59,55,25,200,222,144,131,3,102,154,176,173,42,0,93,15,33,238,102,234,147,250,11,243,82,193,204,186,174,87,202,107,177,180,63,188,206,162,116,67,8,149,137,24,86,229,125,180,27,
+191,147,114,87,17,17,8,174,247,77,237,171,87,255,75,27,115,208,200,58,162,125,86,108,147,26,236,181,236,113,66,141,175,250,41,51,142,80,215,232,42,92,163,199,53,61,230,9,152,1,255,201,39,65,103,79,12,165,87,148,191,240,187,215,6,13,238,65,163,21,130,122,57,183,253,98,166,79,99,199,81,67,84,49,172,20,23,79,105,128,113,170,89,148,42,112,124,95,120,51,85,155,53,169,164,203,34,60,197,44,252,152,85,81,177,8,202,45,121,158,10,242,145,24,174,17,202,8,42,250,146,47,208,10,198,126,185,107,87,170,88,48,213,41,190,34,198,7,196,201,54,178,86,200,188,227,231,50,183,199,56,236,8,246,3,227,129,106,85,104,104,68,13,5,121,101,244,182,14,7,157,135,101,132,220,74,238,37,216,0,240,154,94,238,72,71,67,49,170,45,105,86,110,19,206,148,138,58,157,160,167,50,99,80,237,35,6,69,203,34,206,73,230,58,64,114,209,128,59,89,85,236,9,18,170,57,105,25,42,92,54,247,184,118,218,156,247,64,136,241,33,25,14,34,58,162,
+123,182,9,148,189,9,32,134,26,210,156,135,225,250,72,72,2,79,30,156,9,193,49,137,75,70,20,120,111,243,3,251,230,138,43,68,160,8,60,8,78,224,181,32,184,27,66,220,98,36,232,31,16,92,146,44,16,68,224,220,231,116,0,9,118,130,238,40,145,7,1,250,73,2,47,130,251,155,235,119,215,92,55,194,229,134,192,112,32,8,130,11,65,94,227,221,136,87,73,215,31,169,16,56,194,71,170,107,110,252,35,21,14,4,252,72,117,38,66,124,26,47,240,145,202,141,131,124,164,114,35,116,31,169,32,8,192,39,42,2,232,35,21,130,75,8,124,26,16,8,249,52,224,5,228,211,128,119,200,79,3,222,225,62,13,40,248,4,235,250,91,88,56,123,168,129,149,50,135,248,160,198,141,224,134,200,184,234,211,54,113,207,57,206,23,174,246,165,18,42,175,0,50,171,51,105,239,102,21,18,114,221,204,185,179,234,176,110,122,174,242,84,46,56,7,250,181,144,254,58,15,133,219,44,208,164,23,118,168,69,182,38,173,103,50,139,84,36,192,125,186,156,182,192,157,131,
+236,122,125,170,239,197,147,204,125,6,178,58,131,242,73,0,144,197,96,53,93,179,253,10,216,16,139,35,187,17,25,163,148,4,137,145,170,91,98,151,39,239,13,9,129,43,4,174,128,59,215,253,158,246,115,12,181,109,232,1,114,195,195,43,16,132,235,156,172,206,185,202,145,205,246,180,20,50,247,238,124,205,117,206,25,193,203,198,197,221,2,195,54,147,61,110,72,28,148,238,248,221,78,166,51,153,5,208,116,104,238,153,230,35,145,39,37,46,208,74,178,87,29,83,160,55,163,163,123,184,14,30,89,198,245,217,110,71,138,64,83,165,149,76,172,117,185,180,247,67,184,10,221,245,204,218,132,224,92,141,188,238,188,95,143,153,187,103,162,120,104,41,171,95,158,220,180,38,152,183,118,133,9,231,74,159,117,46,214,195,167,75,63,12,145,155,254,182,161,224,191,252,15,205,4,31,126,241,230,195,175,127,101,245,255,212,13,245,55,255,245,83,123,227,31,108,134,250,209,119,187,161,126,250,167,127,246,227,63,208,8,117,22,240,87,191,124,237,197,250,77,115,194,155,79,223,
+223,124,254,238,235,47,254,233,221,231,223,138,252,247,111,190,126,247,203,175,223,125,243,238,171,15,223,188,249,240,245,175,222,189,121,251,205,155,111,62,124,253,218,85,241,179,63,250,236,103,127,244,177,213,226,239,223,126,249,205,199,59,63,251,163,31,156,47,253,187,191,123,247,225,195,183,77,50,223,124,120,255,145,248,139,175,222,252,227,107,171,215,95,252,47,255,219,223,252,241,247,127,163,131,223,7,245,63,127,253,245,219,127,249,45,166,143,95,63,206,244,247,97,125,167,239,227,203,247,111,63,63,15,241,239,191,219,241,241,138,234,221,231,95,124,106,6,121,243,249,219,15,111,95,41,255,230,255,248,203,143,0,190,255,230,111,222,253,211,187,175,223,126,249,155,33,127,173,193,179,220,175,222,252,221,187,55,127,247,254,87,103,9,31,222,159,175,253,226,221,183,150,249,199,183,223,156,103,245,179,63,249,252,221,135,183,95,124,121,86,204,151,111,95,53,246,205,155,127,247,91,152,223,178,255,234,155,51,212,179,62,206,204,223,178,189,126,251,231,119,95,126,249,253,63,254,
+55,231,254,23,31,229,254,118,242,255,235,215,239,127,245,203,179,182,191,133,250,107,132,223,138,253,22,197,199,31,140,255,46,176,207,254,252,179,239,130,251,14,134,47,190,249,142,70,207,140,191,158,253,31,255,33,95,251,223,223,127,120,247,231,111,254,234,171,47,255,229,211,52,222,127,243,225,205,223,127,253,238,191,254,234,236,11,231,107,31,167,248,27,76,95,191,123,243,213,251,127,126,181,242,43,237,95,190,253,151,247,191,250,240,230,47,222,125,243,197,63,124,117,30,247,31,223,125,245,171,239,191,249,171,87,85,254,70,195,95,124,245,205,187,175,63,124,82,211,207,254,232,63,159,191,124,234,226,253,217,31,125,255,219,158,190,191,253,191,1,66,127,194,25,
+
diff --git a/uppsrc/CtrlLib/srcdoc.tpp/MenuCb$en-us.tpp b/uppsrc/CtrlLib/srcdoc.tpp/MenuCb$en-us.tpp
new file mode 100644
index 000000000..35a853281
--- /dev/null
+++ b/uppsrc/CtrlLib/srcdoc.tpp/MenuCb$en-us.tpp
@@ -0,0 +1,12 @@
+TITLE("About Callbacks and Bars")
+COMPRESSED
+120,156,165,88,139,142,219,198,21,253,149,65,214,117,164,53,87,224,188,248,144,154,34,155,141,3,27,69,210,162,118,16,20,139,69,69,73,163,21,107,138,84,73,106,31,72,236,111,239,185,51,164,72,106,229,181,139,218,176,173,165,230,190,206,61,247,204,165,175,5,123,241,194,247,252,51,255,11,191,166,63,154,117,178,207,234,155,235,76,68,209,44,229,92,248,179,132,135,179,191,197,179,79,159,62,77,184,242,163,25,57,227,112,198,125,37,185,224,120,230,43,17,114,29,251,177,142,120,228,203,80,9,29,250,122,186,75,202,100,123,115,157,68,114,118,254,143,0,86,194,211,103,146,75,238,243,64,40,156,242,165,47,20,23,154,71,145,226,161,142,100,28,4,211,101,178,171,211,34,191,185,94,144,157,130,153,132,153,31,70,129,226,48,82,90,200,80,43,24,43,133,244,36,2,135,65,24,78,235,180,206,204,205,117,74,121,35,219,43,202,82,121,193,25,178,19,33,44,149,80,129,146,145,144,60,18,34,136,165,138,21,210,230,98,154,214,6,73,46,148,152,37,248,67,102,26,
+241,148,86,92,2,17,21,106,137,99,33,254,85,126,204,5,130,70,190,214,136,103,30,90,152,22,0,136,64,34,219,0,33,69,168,201,34,82,17,151,97,36,148,8,4,146,240,67,20,74,25,232,233,202,84,75,216,74,193,103,53,210,154,93,125,175,103,28,198,161,23,158,9,63,246,69,16,198,8,138,132,81,179,140,99,46,35,4,85,92,251,92,78,151,197,10,117,46,132,246,165,141,24,161,21,1,60,91,88,116,192,145,180,144,17,66,134,92,74,252,173,85,20,78,43,67,205,168,139,242,230,250,252,251,145,63,241,39,66,235,49,153,199,48,143,164,146,82,5,177,226,190,68,24,248,80,132,89,224,163,157,92,139,104,186,72,42,196,172,241,40,116,200,114,98,19,176,151,145,150,8,29,224,47,244,21,5,74,224,35,98,21,73,25,249,211,101,150,84,85,3,18,1,116,78,69,114,238,113,126,22,18,182,90,10,21,19,56,82,0,100,17,232,152,3,101,29,40,95,76,75,243,159,125,90,154,173,201,1,115,10,122,204,218,22,53,92,68,50,142,138,194,227,2,100,212,
+65,224,19,94,26,132,16,82,3,112,159,71,10,25,225,55,218,92,55,108,92,116,53,72,143,203,179,88,40,137,76,98,165,128,0,28,240,152,115,238,71,248,141,202,128,139,229,7,111,136,213,132,119,230,202,227,234,44,4,141,209,169,88,81,248,88,18,126,2,240,139,192,215,232,131,112,230,130,80,23,47,128,59,23,17,253,177,200,115,237,113,204,3,82,228,90,163,110,9,168,69,132,218,53,176,151,150,226,60,140,166,191,152,251,234,199,164,54,13,97,206,175,94,56,166,241,192,227,193,153,79,246,58,138,209,64,174,8,63,169,84,44,98,41,181,136,181,12,124,224,88,185,129,38,99,26,41,59,142,7,39,161,199,67,12,23,106,213,26,213,91,51,84,30,114,74,69,68,113,64,40,52,78,230,23,89,154,83,30,96,198,204,145,225,252,234,21,231,33,57,138,48,52,81,20,248,50,6,24,192,192,215,96,58,4,33,66,163,209,103,129,49,32,69,88,126,72,110,205,252,162,153,86,155,2,49,80,75,29,17,111,97,137,212,145,4,252,196,190,31,224,73,20,97,154,166,
+183,201,110,64,64,225,123,194,7,139,160,63,26,67,137,88,160,159,31,147,150,64,25,208,1,72,81,172,29,3,231,23,185,169,106,179,66,243,181,111,203,22,220,19,28,216,129,127,90,71,74,5,200,23,177,67,146,38,106,33,6,88,135,114,250,247,4,243,242,251,191,62,254,233,245,47,23,191,190,99,215,149,152,177,203,69,177,175,217,85,146,101,11,20,83,177,36,95,177,31,146,178,122,121,115,93,249,51,246,126,147,226,89,89,167,203,204,176,85,90,45,247,85,101,42,182,108,206,179,250,113,103,156,209,122,159,47,73,232,88,113,103,202,172,72,86,21,75,243,187,34,187,51,43,124,32,159,172,216,25,12,45,206,84,108,244,179,201,247,120,230,177,247,69,145,225,195,120,194,16,204,216,115,182,74,70,129,25,77,106,243,115,177,166,47,175,234,50,99,247,155,116,185,57,117,160,241,106,19,106,28,79,154,74,14,5,25,74,58,69,5,108,151,212,181,41,115,246,88,236,81,81,206,42,99,40,213,95,231,175,230,175,24,233,18,91,23,37,219,192,25,136,114,107,97,97,
+89,81,0,165,44,253,0,55,192,102,218,243,30,206,216,93,145,174,216,27,147,101,197,111,69,153,173,230,211,169,197,119,52,110,190,159,255,222,124,184,248,99,50,153,180,15,63,54,31,62,235,228,167,52,51,84,218,8,41,204,95,162,230,242,132,67,60,157,92,174,86,163,249,55,54,230,100,50,255,6,232,190,121,251,238,135,203,171,191,142,236,179,241,120,54,56,254,174,149,209,209,209,23,206,207,235,135,180,30,56,185,202,138,202,116,78,190,62,113,209,101,238,1,226,154,221,37,217,255,95,66,186,102,35,56,98,243,239,230,223,49,62,62,60,239,121,124,166,206,255,165,82,248,252,248,153,162,7,245,118,63,156,106,57,196,127,223,4,36,96,6,1,91,164,250,49,143,206,11,24,180,231,249,193,64,120,190,51,233,56,254,198,148,230,224,153,109,147,101,89,48,243,176,3,143,43,86,23,108,120,248,226,143,235,243,195,60,223,140,136,212,30,155,191,60,217,198,241,208,180,111,104,167,177,27,126,12,125,14,45,216,154,237,194,148,12,119,198,46,131,230,119,34,225,38,120,
+147,84,61,185,168,55,73,205,224,175,184,199,71,211,218,30,76,22,134,134,144,2,194,185,19,159,2,30,238,12,69,50,30,131,6,122,146,97,96,21,4,235,118,79,55,109,5,81,121,99,242,165,177,14,219,42,58,151,52,244,199,30,60,235,193,222,174,6,234,224,196,141,204,147,221,174,44,118,101,74,117,180,73,147,230,12,80,184,79,179,12,153,66,74,50,179,132,70,35,129,223,54,38,183,14,106,164,101,234,65,5,135,76,210,170,125,62,50,147,219,201,33,215,177,231,98,47,235,61,136,126,168,171,193,10,109,222,65,249,96,5,40,210,230,65,89,220,165,132,255,226,209,154,154,59,24,144,116,67,237,150,27,0,234,160,255,144,23,247,21,219,0,235,109,146,63,246,60,195,77,110,140,99,10,57,183,26,152,16,32,184,4,246,25,196,213,122,68,97,111,93,89,230,33,65,119,145,227,2,168,184,116,59,242,64,70,243,170,46,247,75,12,159,173,176,178,7,122,152,177,155,35,82,44,75,3,136,73,219,219,91,137,21,139,127,3,77,54,42,92,196,141,73,118,99,242,
+92,39,105,78,164,160,135,168,57,199,53,252,72,45,233,161,125,112,222,77,24,85,134,22,57,188,155,107,167,29,181,238,124,133,140,141,203,54,89,173,240,177,106,61,31,167,229,210,110,59,191,111,218,65,238,63,67,187,123,98,4,168,231,90,131,214,215,101,122,123,139,161,109,178,65,23,169,147,21,190,47,209,245,85,186,94,227,89,222,93,211,238,194,51,21,105,233,50,219,175,90,12,218,239,249,207,166,222,20,171,203,134,229,116,216,235,46,77,155,33,117,213,214,70,93,67,178,149,105,144,56,142,97,83,177,169,23,205,48,236,43,112,49,123,116,147,147,60,153,211,28,131,179,98,175,31,204,114,95,27,71,212,142,221,39,73,73,233,111,205,18,23,109,90,109,145,198,79,77,110,207,150,67,7,218,32,199,41,212,201,7,36,142,153,238,230,152,141,190,52,24,227,14,161,110,168,142,230,118,56,180,109,103,159,174,24,128,140,244,48,171,10,0,116,208,108,39,197,109,39,172,210,85,172,218,153,101,186,198,62,226,150,167,53,35,102,128,113,41,253,140,238,227,130,219,119,
+48,14,51,59,41,37,67,1,17,227,231,232,246,116,55,58,206,150,22,162,142,39,237,172,127,221,109,194,191,112,157,8,143,249,227,167,41,28,190,62,110,104,125,95,244,132,217,81,96,157,150,85,77,176,29,154,87,237,119,187,44,125,70,0,91,65,175,12,36,132,20,106,11,223,235,178,216,182,195,62,132,222,111,91,228,22,89,171,53,88,108,187,134,29,16,3,117,47,217,174,168,170,116,145,89,33,104,166,44,181,203,44,176,234,46,183,99,117,234,75,146,203,101,139,55,148,148,176,198,205,185,52,213,196,99,38,65,129,93,165,86,239,144,21,73,54,174,155,53,2,182,58,208,171,225,128,87,111,174,6,189,244,78,106,90,183,186,59,217,195,154,127,56,211,159,198,203,242,150,79,28,160,116,210,25,15,165,115,136,230,200,119,32,90,73,192,138,213,84,62,228,245,9,6,60,171,153,111,215,118,135,39,196,201,252,152,194,247,105,189,57,33,84,118,166,90,169,128,158,145,94,180,247,32,249,201,79,35,211,1,242,57,68,190,82,15,68,155,94,95,14,136,227,61,208,250,
+155,204,251,19,75,145,213,114,91,95,235,213,235,182,26,223,235,237,68,221,224,52,76,56,160,228,157,92,183,182,123,204,149,147,248,154,101,38,161,41,27,8,170,125,233,235,249,17,39,221,28,146,57,149,200,16,167,183,235,147,30,108,137,205,224,13,151,90,59,86,189,141,115,168,124,35,188,103,140,199,93,35,237,11,221,125,145,207,191,173,105,230,119,56,54,113,59,76,195,69,203,33,155,43,104,72,92,74,168,190,251,164,92,185,11,234,4,123,96,153,23,117,47,135,9,27,253,211,189,77,82,24,43,69,143,61,82,217,183,101,75,101,138,69,220,59,94,48,158,208,212,209,219,74,93,111,89,236,34,186,238,81,107,40,163,249,183,168,101,131,119,151,156,173,204,206,144,70,23,253,237,211,99,139,125,61,152,192,190,28,181,28,237,97,90,217,197,178,169,7,131,138,60,173,48,140,143,155,119,226,154,112,169,209,86,117,12,158,123,151,127,250,206,112,56,64,228,114,115,49,88,202,90,208,45,39,142,10,44,77,189,199,203,188,147,153,102,85,27,236,230,61,68,91,37,60,
+236,102,39,150,216,198,159,157,244,231,220,81,62,135,77,229,207,246,61,247,47,160,193,219,230,63,18,188,167,27,85,5,184,107,55,181,32,136,41,93,31,174,108,209,79,182,140,202,81,18,226,208,30,92,142,39,45,234,55,255,5,131,13,84,198,
diff --git a/uppsrc/CtrlLib/srcdoc.tpp/RoundingDoubles$en-us.tpp b/uppsrc/CtrlLib/srcdoc.tpp/RoundingDoubles$en-us.tpp
new file mode 100644
index 000000000..1f1f8eef4
--- /dev/null
+++ b/uppsrc/CtrlLib/srcdoc.tpp/RoundingDoubles$en-us.tpp
@@ -0,0 +1,140 @@
+TITLE("About rounding double values")
+COMPRESSED
+120,156,165,88,139,110,219,200,21,253,149,193,58,222,149,109,
+90,153,23,95,82,11,108,234,56,133,129,54,27,36,187,192,
+182,134,107,142,197,145,60,48,69,170,36,21,219,187,221,124,
+123,207,29,82,15,63,148,71,43,195,182,68,206,125,157,123,
+238,153,161,206,37,123,241,130,7,124,143,127,225,53,122,109,
+167,102,89,180,23,231,133,76,146,177,139,185,30,27,17,143,
+127,74,199,159,62,125,26,166,169,28,147,43,1,87,130,107,
+37,164,16,154,115,45,99,17,166,60,13,19,145,112,21,107,
+25,198,60,28,45,76,109,230,23,231,38,81,227,195,247,17,
+172,100,16,238,41,161,4,23,145,212,88,197,21,151,90,200,
+80,36,137,22,113,152,168,52,138,70,19,179,104,93,85,94,
+156,95,145,29,172,20,172,120,156,68,90,192,70,135,82,197,
+161,134,173,214,66,224,189,8,227,40,142,71,173,107,11,11,
+27,17,197,99,163,229,248,132,178,212,65,180,135,236,100,12,
+83,45,117,164,85,34,149,72,164,140,82,165,83,141,180,133,
+28,185,214,34,201,43,216,144,29,153,133,8,168,67,45,20,
+240,208,113,168,176,44,198,127,205,83,33,17,53,225,97,136,
+128,246,110,5,18,225,67,118,17,194,201,56,164,213,137,78,
+132,138,19,169,101,36,145,0,143,81,36,69,15,71,185,109,
+38,176,83,82,140,91,164,52,62,249,49,28,11,24,199,65,
+188,39,121,202,101,20,167,8,136,100,81,176,74,83,161,18,
+4,212,34,228,66,141,38,85,78,69,202,144,171,49,108,18,
+116,33,130,99,15,73,24,9,228,43,85,130,136,177,80,10,
+127,67,157,196,163,198,82,31,218,170,190,56,63,252,113,192,
+135,124,40,195,240,128,242,77,97,158,40,173,148,142,82,45,
+184,66,20,248,208,4,87,196,209,73,17,202,100,116,101,26,
+132,108,53,1,123,66,157,39,22,1,118,149,132,10,145,35,
+252,65,71,81,158,2,50,50,213,137,82,9,31,77,10,211,
+52,91,240,28,82,137,66,4,66,236,197,132,106,168,164,78,
+9,26,37,1,175,140,194,84,0,223,48,210,92,142,106,251,
+239,165,171,237,220,150,0,216,129,24,227,85,115,122,18,34,
+151,142,132,50,16,18,52,12,163,136,19,90,33,184,32,85,
+8,184,185,72,52,50,194,15,26,220,246,60,244,220,240,188,
+16,42,16,106,47,149,90,33,147,84,107,0,0,7,34,21,
+66,240,4,63,168,12,176,120,102,8,164,224,139,232,194,119,
+230,58,16,122,47,6,129,209,167,84,83,248,84,17,124,18,
+232,203,136,135,104,131,236,204,37,129,46,95,0,118,33,19,
+250,61,32,251,48,16,24,4,100,40,194,16,101,43,0,45,
+19,148,30,2,121,229,201,45,226,100,244,214,222,54,175,77,
+107,123,182,28,158,188,232,104,38,162,64,68,123,156,236,195,
+36,69,251,132,38,248,148,214,169,76,149,10,101,26,170,136,
+3,198,166,155,99,50,166,89,242,115,184,118,18,7,34,198,
+88,161,212,48,68,241,222,12,133,199,130,82,145,73,26,17,
+8,189,147,236,184,112,37,229,1,94,140,59,42,28,158,28,
+9,17,147,163,4,211,146,36,17,87,41,176,0,4,60,4,
+205,161,4,9,250,140,54,75,204,0,73,193,228,198,204,108,
+118,220,207,233,239,151,127,236,159,190,61,254,229,3,59,111,
+228,152,189,186,170,150,45,171,171,101,153,187,114,198,242,106,
+121,85,88,246,209,20,75,219,124,127,113,222,240,49,251,208,
+154,50,55,117,206,78,216,220,180,215,172,112,87,181,169,239,
+89,110,167,200,173,97,237,109,181,113,48,93,150,19,18,145,
+102,212,91,247,255,166,69,85,213,44,59,238,86,194,168,98,
+237,181,101,165,53,40,180,101,101,85,102,199,179,218,2,244,
+154,214,154,150,221,186,246,154,114,203,237,196,205,77,193,114,
+55,115,109,19,48,55,180,195,103,124,15,178,99,57,68,147,
+179,63,111,125,214,254,115,118,172,130,254,226,246,130,100,40,
+31,124,234,238,37,15,125,79,172,43,190,144,118,81,221,254,
+15,73,147,227,173,156,215,31,87,41,203,160,187,182,202,178,
+255,176,181,58,245,111,211,135,110,207,74,102,242,220,81,11,
+250,100,27,203,154,85,7,215,221,9,216,47,217,81,118,180,
+238,225,192,149,236,164,170,237,203,101,235,138,225,245,1,51,
+108,106,111,89,53,101,72,159,85,183,229,118,59,227,49,59,
+223,231,252,152,115,230,202,150,77,61,54,131,158,58,119,7,
+227,139,231,22,117,40,127,97,145,175,235,209,154,77,109,63,
+251,98,38,213,252,10,57,111,40,55,120,212,20,120,178,51,
+91,7,159,227,216,243,55,187,78,174,237,113,99,97,129,215,
+71,91,220,31,248,214,178,182,6,130,198,163,11,108,186,158,
+195,83,111,50,220,13,146,43,170,153,224,171,218,242,167,245,
+247,119,220,162,186,197,58,111,178,115,81,89,213,32,151,251,
+205,174,253,5,20,36,251,158,217,187,69,85,66,190,119,96,
+183,238,63,155,152,146,93,89,182,108,108,78,5,204,77,233,
+22,203,2,208,120,84,170,58,7,16,115,51,43,93,187,204,
+237,186,214,102,216,23,2,108,218,101,13,63,180,186,195,116,
+131,60,115,172,89,78,0,214,53,208,17,60,251,151,99,127,
+2,83,41,73,95,29,130,23,19,31,172,233,111,15,26,76,
+77,145,83,70,181,197,13,15,57,155,154,166,13,24,124,20,
+22,239,216,20,2,130,72,77,85,26,170,121,85,106,115,16,
+108,0,65,131,76,217,96,229,188,33,10,251,254,228,171,94,
+211,101,170,180,117,77,99,88,118,232,131,175,220,4,236,246,
+218,214,118,115,127,64,38,93,153,192,168,3,250,0,226,135,
+164,49,44,116,179,177,115,151,29,79,138,138,64,164,218,107,
+232,38,203,206,69,0,207,7,59,200,208,119,204,179,183,126,
+216,191,94,45,118,182,221,143,208,55,218,208,68,125,214,100,
+55,69,124,138,108,134,94,148,27,166,251,126,251,75,229,114,
+126,133,94,131,26,217,101,118,137,202,93,78,111,122,239,80,
+20,72,222,186,155,126,72,112,117,77,169,131,71,114,248,170,
+40,8,86,83,20,65,135,173,155,47,138,173,33,191,175,150,
+12,147,202,76,115,227,183,25,112,193,129,197,203,186,70,239,
+192,149,178,106,217,2,3,235,59,121,5,5,118,109,246,67,
+179,205,38,48,231,222,167,65,142,231,126,157,29,206,134,143,
+246,169,94,203,64,169,173,189,33,103,47,87,131,73,151,143,
+24,31,134,7,68,160,245,197,135,78,254,130,248,72,184,6,
+71,141,47,99,208,113,107,85,196,178,161,26,60,191,30,239,
+155,157,154,64,191,59,58,99,74,45,212,156,77,157,45,114,
+16,29,53,55,80,232,130,53,213,220,182,215,100,105,216,149,
+163,158,78,167,182,238,121,108,218,117,168,220,206,209,75,76,
+69,75,107,125,22,240,65,147,96,218,182,51,255,108,111,187,
+110,14,217,217,212,187,4,28,55,196,161,170,219,45,222,120,
+63,195,235,128,110,102,63,32,47,108,39,121,63,108,5,228,
+116,231,145,96,139,169,22,209,30,179,55,251,253,241,149,227,
+255,188,121,157,93,126,56,251,235,91,70,47,244,134,223,113,
+76,218,203,151,32,205,173,185,111,168,253,11,139,232,141,155,
+149,108,144,29,97,6,159,119,242,254,244,111,108,203,137,244,
+78,214,76,93,109,221,139,194,76,104,103,244,204,94,205,204,
+238,172,178,203,211,95,223,245,30,245,206,180,0,220,74,112,
+216,64,216,236,72,238,112,121,242,234,29,60,110,146,76,188,
+75,60,161,185,22,185,157,250,1,216,242,116,186,179,216,127,
+158,190,255,105,83,44,158,33,200,207,141,181,11,146,74,87,
+80,131,126,179,117,133,66,5,30,79,112,114,220,225,231,205,
+217,175,91,160,73,190,93,226,146,116,195,221,65,5,49,134,
+221,238,56,232,168,241,186,147,205,231,93,18,96,27,151,250,
+137,203,85,125,152,133,175,117,156,253,241,68,8,63,180,53,
+21,185,122,109,155,191,246,77,125,86,29,187,247,211,194,204,
+154,29,123,235,215,133,248,146,115,95,123,255,25,115,157,93,
+34,138,191,246,77,81,222,184,187,175,10,244,77,78,79,239,
+22,255,111,246,27,73,252,7,196,131,206,28,212,215,238,80,
+138,81,88,216,218,239,201,166,152,87,216,224,77,121,15,117,
+54,51,215,109,240,131,205,102,127,208,139,212,70,183,134,148,
+42,196,11,71,219,26,226,133,199,145,7,168,223,5,171,137,
+13,216,25,78,35,139,69,229,3,147,126,118,71,141,188,218,
+210,80,236,54,174,48,53,229,228,117,251,239,247,239,73,152,
+59,103,195,39,219,100,109,105,111,233,132,216,128,153,215,164,
+149,254,187,147,94,218,79,161,217,189,49,59,107,217,181,161,
+211,8,5,171,114,58,252,20,152,148,119,168,195,214,37,201,
+181,195,89,169,177,109,179,62,164,244,210,220,116,189,161,81,
+127,219,85,215,47,118,205,250,224,54,179,165,173,87,199,54,
+250,102,100,137,97,129,226,116,91,225,250,164,234,143,186,94,
+212,135,236,231,254,113,141,204,205,106,110,55,130,255,232,201,
+197,15,34,246,201,231,181,123,83,40,12,241,254,233,49,132,
+174,14,251,98,7,217,119,251,186,204,190,123,194,142,193,138,
+30,166,104,170,21,71,216,28,91,12,169,84,247,56,131,156,
+78,178,227,166,189,47,214,32,217,26,9,22,238,198,178,125,
+61,195,161,149,237,171,105,183,251,147,249,126,185,89,71,144,
+121,119,211,194,222,57,98,212,144,61,76,225,109,229,65,4,
+198,125,178,100,98,38,132,39,14,15,125,239,128,207,73,85,
+126,180,117,95,116,176,105,8,164,129,110,211,151,54,204,127,
+7,99,253,54,187,77,133,46,146,98,23,255,5,245,137,37,
+33,
\ No newline at end of file
diff --git a/uppsrc/CtrlLib/srcdoc.tpp/Tips$en-us.tpp b/uppsrc/CtrlLib/srcdoc.tpp/Tips$en-us.tpp
new file mode 100644
index 000000000..407ef47ae
--- /dev/null
+++ b/uppsrc/CtrlLib/srcdoc.tpp/Tips$en-us.tpp
@@ -0,0 +1,7 @@
+TITLE("Tips & tricks")
+COMPRESSED
+120,156,133,84,93,111,227,70,12,252,43,11,56,61,180,169,18,44,201,229,126,72,47,87,228,10,244,233,174,232,7,250,96,24,141,108,239,37,106,20,217,149,100,164,65,209,251,237,157,149,125,45,250,84,27,118,12,133,67,14,135,67,174,217,92,93,217,202,174,236,255,188,234,119,249,99,123,234,231,205,186,231,24,155,142,136,109,211,82,104,62,164,230,211,167,79,183,228,108,108,74,50,66,50,178,78,136,9,207,172,227,64,154,108,210,72,209,74,112,172,193,106,125,108,199,246,121,179,110,163,52,215,63,120,160,184,210,149,144,144,37,207,14,81,86,44,59,98,165,24,29,5,141,146,188,175,119,237,113,238,14,195,102,189,45,56,7,152,0,102,67,244,142,0,114,202,18,212,1,236,28,232,9,10,7,31,66,61,119,115,159,55,235,174,240,6,219,187,194,210,85,126,5,118,28,128,116,236,188,147,200,66,145,217,39,113,201,129,54,113,221,205,25,36,183,142,155,22,159,2,83,212,115,234,72,160,136,11,42,8,11,248,235,108,34,70,209,104,85,81,47,255,241,89,166,45,
+4,42,34,21,172,71,73,14,90,16,209,69,146,16,217,177,103,144,176,1,141,22,6,90,239,243,180,3,86,152,154,25,180,154,187,183,218,16,192,161,10,43,182,201,178,15,9,69,65,24,61,75,74,36,17,69,29,169,37,169,119,135,61,250,220,178,90,89,42,70,140,194,35,243,34,139,122,2,105,150,136,146,129,68,240,173,46,134,122,202,101,24,243,97,220,172,175,223,126,105,111,237,45,171,126,85,224,9,240,40,78,196,249,228,200,10,202,32,135,43,154,121,139,113,146,114,172,183,237,132,154,51,30,133,179,178,84,220,4,237,37,170,160,180,199,23,230,138,6,5,250,112,114,81,36,218,122,215,183,211,116,17,169,8,116,93,154,36,170,136,86,161,104,171,194,46,21,113,132,33,50,123,77,4,149,213,59,203,245,152,127,63,117,99,126,206,3,100,238,96,143,230,243,136,46,94,4,153,179,21,185,34,134,25,213,123,91,244,82,24,130,69,33,184,165,232,192,8,111,140,121,190,184,113,251,111,15,82,145,172,18,59,1,147,228,28,20,64,2,74,68,100,35,222,232,12,
+186,44,254,160,139,177,46,229,207,112,87,145,91,5,216,24,147,74,174,148,79,82,244,99,200,207,222,42,230,192,103,56,23,213,249,10,186,19,199,242,89,148,39,173,8,251,0,138,164,138,190,5,82,115,68,239,10,237,101,177,56,133,88,191,207,47,211,187,118,206,23,195,92,223,93,157,157,70,190,34,191,178,5,175,49,97,128,228,138,126,226,92,226,36,162,156,84,188,133,142,211,121,161,11,184,172,212,178,142,255,36,9,21,5,44,23,122,85,69,247,11,12,157,7,42,84,56,38,95,84,184,36,185,191,233,187,161,240,128,51,154,179,25,174,239,190,38,10,37,81,196,210,196,232,173,36,136,1,13,172,194,233,56,8,17,131,198,156,25,107,80,46,194,238,169,125,200,247,55,151,109,93,40,20,7,170,104,44,190,5,18,212,65,2,121,146,181,30,79,98,196,54,213,15,237,241,63,6,100,91,177,133,139,112,127,20,75,137,90,176,159,77,229,150,224,50,96,2,56,69,73,207,14,188,191,25,242,52,231,61,134,175,118,105,155,169,98,130,118,240,159,106,116,206,131,47,
+106,135,114,154,202,8,177,192,26,164,254,190,197,190,252,249,235,95,95,124,251,254,230,231,31,205,122,226,198,252,212,29,39,115,255,198,204,99,183,123,154,222,108,214,147,197,157,68,222,15,130,127,30,204,148,231,211,209,236,207,119,212,244,237,235,225,52,155,195,71,243,205,56,182,175,119,243,216,155,199,220,238,243,88,153,118,255,219,105,154,77,55,155,151,199,174,207,102,126,204,166,61,30,251,110,215,150,3,104,186,201,140,167,97,232,134,7,211,13,200,184,61,61,152,103,44,191,105,135,125,9,30,204,14,177,79,6,161,223,45,41,151,236,47,221,252,184,164,234,243,199,25,241,167,41,155,237,105,158,17,85,112,75,204,83,126,53,71,204,116,202,123,115,127,131,159,135,99,30,205,221,161,63,61,15,191,116,251,249,113,42,13,116,67,183,240,120,233,250,222,108,179,153,112,62,0,152,15,75,122,212,62,110,15,237,184,95,210,238,218,225,76,9,113,199,182,136,13,206,136,68,247,163,41,23,235,118,243,55,116,23,170,232,
+
diff --git a/uppsrc/CtrlLib/srcdoc.tpp/Tutorial$en-us.tpp b/uppsrc/CtrlLib/srcdoc.tpp/Tutorial$en-us.tpp
new file mode 100644
index 000000000..d1190581a
--- /dev/null
+++ b/uppsrc/CtrlLib/srcdoc.tpp/Tutorial$en-us.tpp
@@ -0,0 +1,987 @@
+TITLE("GUI Tutorial")
+COMPRESSED
+120,156,196,187,7,115,99,89,118,38,248,87,24,106,173,162,187,85,170,77,186,52,85,187,27,154,209,76,236,78,236,202,132,76,108,108,116,84,168,178,171,216,234,140,201,206,172,169,204,82,171,119,118,20,32,65,2,52,32,64,194,145,32,28,9,194,16,132,35,60,225,65,130,36,60,64,120,239,8,194,123,239,241,246,49,89,213,234,214,76,72,179,171,154,24,146,0,136,251,238,57,223,57,223,249,238,189,15,247,6,126,50,55,243,187,191,251,228,163,39,63,120,242,207,252,124,242,111,150,126,246,242,155,215,239,63,251,201,235,185,231,207,63,125,53,59,59,247,228,211,151,179,207,62,253,211,23,159,254,253,223,255,253,199,179,11,79,158,127,250,224,108,22,116,54,251,100,97,126,118,110,22,108,123,178,48,247,108,118,241,197,147,23,139,207,103,159,63,153,127,182,48,183,248,236,201,226,39,95,189,252,250,229,47,62,251,201,203,231,243,159,254,248,207,159,130,86,115,31,45,254,96,126,118,126,246,201,236,211,185,5,176,215,147,249,39,115,11,179,115,139,179,207,159,47,204,
+62,91,124,62,255,226,233,211,79,190,120,249,213,251,87,111,223,124,246,147,159,62,216,45,128,102,243,160,217,147,103,207,159,46,204,130,70,11,139,115,243,207,22,23,64,227,133,5,48,188,121,16,248,217,211,103,207,62,121,255,234,253,235,165,207,126,242,234,33,110,48,218,63,122,136,114,225,163,167,63,0,163,155,123,6,90,46,204,45,60,93,152,127,62,55,63,251,124,110,238,233,139,249,133,23,11,96,216,179,115,159,188,122,191,4,6,249,211,133,185,79,95,130,143,7,179,69,16,111,97,113,97,118,30,100,100,225,217,226,60,216,237,25,248,186,240,228,197,236,28,8,250,252,201,226,34,136,183,244,119,223,209,244,83,144,160,7,146,30,108,159,130,144,115,207,22,31,44,158,47,60,159,157,127,246,124,110,97,238,233,28,24,196,147,103,96,162,15,17,44,126,242,229,210,187,47,64,219,249,185,217,79,223,131,97,125,250,71,127,184,248,233,44,104,252,236,163,103,63,152,123,242,226,201,220,211,103,47,64,80,48,96,48,231,249,23,47,102,231,159,131,160,11,179,139,79,
+102,231,63,249,226,237,151,96,158,63,157,91,124,50,255,1,241,57,88,138,167,160,231,15,180,44,62,157,5,131,158,155,127,14,66,62,155,157,159,7,159,23,23,158,63,251,228,221,210,67,49,222,191,253,250,179,159,252,248,15,127,248,228,227,39,31,207,45,46,254,232,193,252,5,104,254,124,126,97,126,126,225,233,139,133,217,39,243,32,12,232,99,225,129,179,167,79,192,114,206,46,206,61,255,228,167,47,223,129,152,239,193,166,103,143,204,206,62,168,9,228,126,254,249,226,60,8,253,20,124,2,235,10,38,56,15,242,51,247,98,225,249,252,252,243,39,159,124,241,250,229,187,119,223,146,244,64,208,143,31,146,156,157,253,104,118,246,7,207,30,184,93,156,159,91,120,241,64,206,252,28,72,242,220,211,197,23,179,32,203,139,79,23,158,204,125,242,245,210,127,248,230,213,215,75,191,88,122,3,210,252,10,148,199,167,223,149,232,91,45,130,193,60,74,113,238,163,217,57,80,140,139,79,159,62,121,224,107,17,20,196,220,252,34,72,248,147,217,231,11,96,68,224,47,88,230,
+247,223,170,241,167,255,144,195,252,71,179,243,63,120,49,183,48,15,70,242,98,97,1,100,0,116,48,251,98,118,118,246,201,115,240,23,204,12,228,229,131,62,102,191,21,214,183,240,143,230,11,31,205,46,252,224,25,40,99,176,82,47,22,30,224,95,204,63,240,55,7,210,63,247,244,201,34,88,135,185,71,243,185,7,214,231,126,23,228,125,118,238,249,195,227,3,243,179,139,31,205,130,227,1,12,113,118,113,17,204,123,30,164,122,238,57,152,251,34,200,253,252,7,137,207,62,123,254,201,159,44,253,242,221,191,121,249,126,233,91,193,252,248,143,126,247,81,105,179,79,63,154,125,250,131,39,15,246,139,207,95,128,5,156,93,120,224,111,126,97,225,197,220,139,249,249,197,185,23,139,243,79,159,128,60,190,123,28,208,15,198,15,67,234,195,112,252,181,147,103,31,205,62,3,7,23,152,235,226,34,152,253,7,51,48,243,103,179,15,161,204,61,127,241,244,129,133,111,157,124,254,7,175,95,189,121,136,3,84,198,167,143,98,248,241,31,253,254,236,236,179,7,71,207,193,65,
+243,252,249,211,39,243,47,64,50,64,14,158,44,130,74,7,39,132,231,96,161,193,58,207,129,195,224,97,70,248,226,223,191,252,155,165,207,255,224,219,209,250,33,132,7,5,46,206,47,62,127,208,45,104,9,134,14,6,1,250,121,241,228,201,83,176,229,249,115,112,52,125,242,55,47,191,250,45,1,206,61,249,104,238,9,168,34,112,254,89,4,7,37,136,5,202,239,201,139,135,185,4,156,25,192,10,128,83,209,139,197,71,5,126,254,7,111,150,222,189,95,250,18,44,254,226,147,15,105,207,205,126,52,55,11,114,7,234,111,113,241,249,194,194,83,48,94,16,251,217,195,212,244,80,66,112,0,47,62,155,255,228,207,94,130,227,229,63,254,245,127,250,31,254,237,159,252,193,95,253,197,204,79,222,205,125,58,243,191,254,213,191,155,249,203,111,192,145,244,234,229,235,223,251,236,39,239,230,63,157,153,253,248,161,241,229,87,95,189,126,245,197,203,135,185,107,230,23,47,95,189,153,249,217,55,111,190,120,120,247,208,107,241,211,153,191,124,59,243,243,87,95,46,205,124,245,
+250,229,251,159,189,253,250,23,51,239,190,90,250,226,213,207,94,125,49,243,229,171,159,253,108,233,235,165,55,95,44,189,251,104,230,175,62,255,253,207,127,127,230,159,116,56,243,234,221,204,151,75,63,3,107,241,229,204,55,239,94,189,249,155,153,159,252,248,193,226,243,191,254,87,127,246,103,159,255,245,31,255,171,127,247,39,159,129,22,95,124,253,246,147,111,177,31,94,158,125,58,243,131,87,111,190,120,253,13,24,195,255,244,71,239,191,126,253,127,188,250,233,255,248,237,235,199,63,255,95,190,237,242,237,203,163,219,55,47,127,177,244,14,172,217,210,204,95,125,245,213,167,191,221,227,191,0,249,249,127,252,246,218,31,252,63,127,246,245,219,95,124,245,254,79,255,247,31,126,254,59,255,219,210,235,215,111,103,126,249,246,235,215,95,126,254,59,63,250,206,203,231,255,233,55,220,45,126,250,63,207,252,225,31,190,250,5,40,141,79,64,193,252,30,56,81,111,66,207,32,203,16,8,100,5,0,192,103,72,31,78,170,144,183,110,177,198,225,1,4,190,126,72,111,31,163,
+119,130,7,137,70,101,82,223,189,144,159,111,210,238,242,171,190,157,219,250,114,234,16,189,225,114,29,103,97,232,214,57,61,19,42,218,212,105,218,158,82,176,103,60,81,96,68,46,140,134,181,127,181,117,99,47,186,151,41,46,23,246,10,213,65,166,18,86,139,97,176,138,196,42,116,242,220,104,20,167,138,245,85,145,152,127,163,233,248,188,206,90,237,186,106,235,201,129,158,115,79,230,14,230,165,13,97,58,55,185,19,172,68,189,40,206,122,97,77,221,216,212,242,143,246,137,156,59,55,79,218,175,237,85,147,110,67,39,26,229,201,19,40,25,186,101,167,239,109,94,152,9,1,179,107,64,140,8,182,164,218,113,31,113,48,169,164,37,204,213,48,182,1,49,120,28,8,244,214,137,255,232,112,25,41,61,193,235,194,122,187,169,132,45,5,207,96,203,86,206,202,216,47,95,85,187,250,101,230,104,61,78,60,24,213,16,21,196,232,80,88,54,6,210,193,202,122,200,113,85,88,117,174,94,172,169,17,30,76,171,176,77,175,111,235,118,160,68,104,121,77,127,97,207,109,75,
+56,16,94,150,116,94,214,158,92,172,17,38,69,1,20,88,209,56,77,73,29,87,148,183,159,67,79,204,216,188,98,35,184,236,71,140,111,87,242,158,229,35,49,129,7,247,14,117,48,237,149,125,179,38,10,69,109,171,38,58,106,167,225,65,215,71,43,23,133,208,54,100,111,188,183,181,123,182,186,89,189,11,241,85,252,85,235,121,117,207,149,220,172,91,107,105,253,182,20,130,243,45,135,58,73,209,122,175,104,208,23,111,86,32,172,148,83,212,88,161,231,96,252,33,36,181,22,217,107,167,198,120,77,189,41,234,91,27,107,233,112,228,166,159,241,141,114,94,253,218,189,127,237,222,59,220,101,248,90,91,181,122,171,105,31,13,122,201,29,39,194,204,73,19,106,87,35,179,201,44,170,147,183,239,209,144,13,11,191,40,98,101,57,162,254,78,139,66,188,28,89,87,16,104,124,225,72,72,76,174,193,20,71,103,144,33,206,177,177,227,186,48,231,59,120,226,110,33,198,56,219,129,6,145,135,29,97,84,4,219,165,103,19,203,176,27,125,16,5,177,93,36,73,151,206,248,
+21,196,46,184,76,95,138,174,130,171,132,155,201,77,103,72,219,52,239,76,15,52,155,231,90,122,52,119,132,61,244,251,235,234,177,113,197,188,31,29,18,113,71,12,172,127,89,83,131,218,43,208,4,187,0,197,224,20,70,143,245,180,120,176,122,3,27,95,70,28,168,155,228,9,126,139,84,38,161,151,37,14,8,37,100,103,49,41,144,235,214,230,50,117,93,134,70,30,146,78,32,172,3,40,219,171,72,91,9,148,196,106,180,208,222,70,105,134,99,18,45,215,175,12,123,119,52,55,79,80,12,164,88,133,0,163,32,186,79,20,247,152,108,55,139,13,193,59,253,60,18,234,68,152,51,66,24,98,248,81,17,13,59,189,135,110,50,229,237,243,253,51,181,250,12,38,200,37,110,246,109,52,210,242,165,46,55,36,235,227,218,118,40,103,130,227,176,6,234,58,20,11,11,95,120,16,222,82,102,101,195,27,136,67,189,123,61,61,59,21,192,154,54,246,239,61,144,36,170,167,108,148,90,202,166,64,203,13,202,53,199,229,0,204,205,43,213,183,137,129,253,184,221,155,208,181,
+208,83,251,181,50,19,216,43,198,157,62,30,197,238,226,83,120,161,93,12,203,49,118,225,100,23,194,93,236,84,168,236,245,130,66,195,209,105,93,219,14,43,97,182,124,29,223,118,31,228,111,187,14,96,147,199,67,157,92,55,84,152,48,199,189,141,183,121,75,166,195,108,77,132,58,222,100,110,156,244,4,66,226,109,255,18,6,77,66,167,100,39,98,115,66,245,82,130,50,95,183,103,191,169,212,132,216,106,168,18,60,139,146,129,42,179,90,65,220,138,46,117,218,88,47,188,130,137,29,96,237,93,110,231,210,207,45,54,188,13,75,224,68,93,128,106,73,221,60,226,224,12,130,130,58,80,193,17,4,134,111,215,181,38,95,218,111,76,54,174,182,40,202,160,114,29,174,157,172,246,160,134,227,29,8,181,15,207,99,163,136,205,149,176,87,206,36,216,180,39,9,113,167,235,232,181,45,114,129,72,77,101,140,129,210,70,21,197,14,143,3,30,73,104,227,32,195,106,20,109,251,157,108,155,229,133,210,237,183,14,170,129,179,175,81,11,100,237,45,189,201,97,130,239,171,53,
+16,148,147,44,236,67,236,48,155,41,77,189,188,140,92,163,141,72,44,58,233,133,106,176,215,199,33,248,69,227,2,75,160,172,221,133,124,126,145,9,183,46,238,162,194,229,208,77,69,112,72,212,77,49,247,39,26,105,79,108,9,145,105,49,29,229,208,129,229,224,175,92,28,188,195,235,32,114,214,109,132,237,65,15,80,95,6,209,216,46,39,149,239,100,8,80,36,178,2,139,142,247,9,198,17,36,61,133,215,83,161,180,105,199,188,174,150,88,33,168,84,137,147,43,174,221,208,131,238,77,218,170,206,216,48,168,224,209,72,7,130,89,137,179,90,37,11,231,224,10,81,67,142,252,187,91,101,207,138,20,117,6,227,198,56,231,180,118,203,178,142,128,210,133,54,145,205,199,91,70,172,18,44,89,20,75,58,96,136,97,137,3,41,234,94,20,117,192,73,84,158,30,110,218,144,216,205,54,140,221,16,192,146,163,130,254,5,57,14,175,179,42,73,201,205,13,156,190,170,41,44,143,100,181,211,90,150,80,149,123,55,118,82,65,247,69,33,18,87,173,185,55,147,152,124,160,
+131,217,232,35,77,87,122,163,182,115,34,166,165,36,16,101,107,67,46,110,11,24,104,31,51,192,48,178,241,166,52,214,124,204,19,217,242,251,9,244,222,233,58,181,173,15,81,134,117,91,32,238,129,231,4,225,107,248,29,197,160,14,151,161,187,58,147,237,80,43,9,69,97,194,139,35,90,114,121,23,70,28,167,136,85,69,133,183,227,91,185,207,187,225,231,180,229,70,228,106,243,86,187,125,21,28,28,142,142,237,67,184,120,35,40,32,176,154,177,93,211,42,196,181,114,126,13,27,80,209,251,241,41,163,169,221,60,207,9,46,174,180,64,222,182,119,111,53,172,95,26,181,122,1,100,213,94,216,68,58,198,27,73,21,18,3,163,219,125,61,118,30,131,70,80,169,84,238,53,124,71,239,188,50,218,119,72,88,179,109,11,158,231,49,3,71,152,42,149,98,19,80,149,50,59,98,186,101,134,67,13,65,52,227,78,114,181,233,37,231,183,110,46,218,203,118,37,205,207,131,236,66,153,101,213,197,196,130,32,106,239,227,184,68,66,42,150,135,69,93,5,67,29,104,80,109,
+218,129,103,52,213,92,159,138,107,80,228,238,81,35,113,76,213,35,92,107,134,252,222,45,150,132,24,107,197,21,137,8,34,177,16,32,18,99,210,125,138,56,54,31,37,24,150,164,214,157,137,244,164,59,241,177,161,27,82,20,18,151,119,236,99,32,106,116,90,27,53,194,158,8,69,231,15,111,156,170,156,150,174,56,185,80,216,215,14,91,109,175,140,111,82,180,59,50,96,165,124,52,89,190,184,170,173,178,5,131,219,226,246,102,117,207,4,199,186,194,25,99,67,233,107,181,207,142,214,131,82,163,248,14,63,68,159,74,219,167,187,23,154,112,110,71,121,68,85,242,25,123,225,120,140,87,115,133,69,199,185,139,45,141,238,148,226,218,29,156,117,15,110,169,180,67,237,106,89,216,106,94,112,161,242,29,32,43,165,19,180,245,86,245,240,118,59,224,143,79,32,12,22,117,235,74,71,247,95,122,253,48,164,110,101,176,70,71,220,195,109,90,167,61,167,31,182,60,157,126,104,187,95,138,228,48,68,244,10,74,105,198,225,79,238,56,135,83,11,218,224,91,17,24,243,1,
+102,49,208,179,251,121,182,149,2,236,38,75,136,50,181,121,204,96,88,200,117,188,182,60,230,116,183,231,187,233,242,128,245,234,208,126,198,218,57,65,237,110,222,27,106,43,54,44,85,15,167,12,72,21,238,250,96,231,190,123,81,167,27,244,195,237,4,250,82,185,133,10,117,246,183,104,168,130,148,110,39,166,85,25,152,34,198,47,101,55,136,99,132,89,17,170,155,19,88,183,227,194,124,84,66,161,119,204,189,235,171,157,187,235,53,72,199,163,62,109,29,22,27,247,118,14,77,172,95,173,116,87,178,155,215,234,107,40,130,224,168,170,79,248,94,70,215,91,185,238,184,44,42,54,115,216,83,42,217,233,221,179,51,221,33,149,182,181,139,246,27,54,119,80,206,241,106,120,12,49,220,67,151,173,13,200,56,232,206,81,151,69,245,172,33,171,217,33,234,233,218,164,243,80,27,196,159,67,161,40,114,122,163,77,246,56,148,94,132,26,119,125,148,55,198,141,240,213,18,72,4,86,56,137,224,216,162,142,187,112,176,159,17,75,172,105,174,72,114,239,112,103,17,30,30,71,
+100,19,180,27,228,206,178,144,236,243,24,54,89,135,234,70,191,126,214,76,201,105,200,173,19,112,30,234,44,175,12,146,69,226,25,29,113,107,96,82,243,248,58,42,218,165,30,159,111,203,154,135,123,206,168,79,175,141,175,93,102,124,89,162,69,193,171,70,132,109,113,193,112,158,202,104,177,193,132,176,164,171,40,43,48,254,216,106,167,248,225,71,20,5,21,112,67,116,248,138,110,141,117,4,153,8,113,40,73,139,189,142,51,71,125,16,175,147,199,142,109,90,209,198,83,188,221,141,21,76,118,37,26,102,75,186,217,45,92,85,208,235,170,24,109,23,230,189,192,15,25,76,29,155,16,157,34,139,87,105,56,28,70,171,82,15,11,66,116,138,117,207,211,234,251,82,5,54,212,198,6,97,144,64,213,238,210,38,165,18,235,84,48,56,164,53,123,38,181,191,169,245,55,91,89,31,138,85,201,68,118,163,43,138,46,197,151,50,160,144,142,226,109,196,56,118,246,100,218,115,132,221,17,7,206,113,134,225,200,165,26,237,33,143,66,28,196,53,180,157,229,164,187,81,168,0,
+31,25,249,133,77,60,219,169,103,196,122,202,32,66,49,242,15,233,99,7,67,122,236,63,39,132,216,231,201,233,186,141,119,177,81,188,246,24,119,17,4,215,65,14,177,113,192,16,85,104,114,151,82,82,159,140,111,207,13,22,170,73,48,73,93,160,166,97,120,231,94,37,229,28,71,198,158,4,213,55,56,147,146,6,103,97,34,132,98,105,76,174,55,108,225,24,193,134,58,222,216,71,64,242,16,22,162,191,155,194,196,241,62,25,31,47,63,31,225,77,101,249,217,88,55,197,9,82,133,29,76,107,151,58,204,105,68,144,149,27,242,13,252,98,47,141,76,145,32,252,100,128,10,77,172,100,26,180,91,123,244,232,254,82,123,94,139,224,245,121,113,91,5,191,90,179,230,119,48,52,207,134,121,51,239,33,166,183,40,48,254,241,185,208,70,87,212,16,167,62,102,216,123,226,97,220,156,120,140,71,224,163,128,95,45,105,114,219,110,123,129,227,188,46,47,147,215,86,225,49,235,189,209,39,146,173,25,116,99,93,53,7,46,20,183,71,43,227,245,17,110,64,168,151,249,141,
+11,230,249,234,106,54,96,208,67,48,245,60,97,253,60,33,218,84,150,215,214,92,17,107,32,223,200,175,73,10,169,19,36,18,216,42,14,143,187,24,189,61,36,136,90,14,60,204,125,113,116,23,203,92,222,39,251,213,35,147,57,236,62,57,61,18,156,242,237,112,165,76,60,12,175,51,149,167,154,226,120,231,110,79,2,48,246,206,5,35,74,203,4,15,170,76,27,184,250,114,111,207,175,77,14,25,59,40,66,135,142,34,233,69,193,65,50,186,113,38,56,30,90,55,78,174,108,62,187,97,176,7,39,37,137,228,102,117,188,23,29,152,53,45,86,215,78,30,132,5,114,165,243,154,61,208,8,174,123,54,162,123,95,3,88,246,198,102,242,250,22,205,208,204,144,55,123,55,18,43,181,17,100,152,143,166,58,120,51,177,141,43,165,74,80,155,156,189,66,173,211,108,36,90,125,25,171,111,109,18,57,254,163,214,174,193,4,115,149,74,54,120,35,216,184,39,153,79,78,56,231,253,118,211,12,153,64,35,212,253,225,238,125,32,229,172,160,128,234,16,184,101,33,87,225,73,
+18,2,165,192,118,175,156,169,163,10,10,177,49,29,119,235,17,195,209,50,252,28,190,58,142,36,106,183,124,106,85,127,78,129,113,42,10,133,209,74,30,28,174,30,106,147,154,233,121,193,180,137,245,169,113,251,173,123,46,20,197,47,235,115,60,68,122,107,111,87,97,16,244,186,166,139,162,123,119,75,125,168,204,93,13,210,87,91,242,245,83,133,14,143,134,27,3,225,27,148,140,166,53,217,57,154,126,38,204,195,195,113,248,53,13,175,189,89,180,13,247,61,203,65,8,171,76,153,142,206,169,174,155,81,156,92,99,223,45,211,109,236,250,189,190,229,216,182,241,119,118,210,144,141,220,24,167,51,234,55,46,199,107,123,17,228,86,183,239,91,135,157,31,250,130,201,180,97,181,32,20,111,151,73,123,184,146,60,55,160,1,216,213,129,113,117,56,109,210,16,225,179,228,113,32,236,207,4,5,145,200,17,176,221,73,209,194,184,56,108,130,101,215,9,26,215,117,62,103,210,123,179,217,113,103,122,230,142,35,28,203,147,96,105,189,230,90,27,59,241,59,16,166,70,162,53,
+80,105,205,221,93,20,147,177,142,67,178,47,214,118,232,234,206,77,173,6,117,70,75,253,13,200,5,39,190,59,141,87,132,7,137,213,109,93,92,88,226,112,43,238,237,99,173,115,167,97,186,188,142,230,96,195,106,238,82,155,212,250,207,16,54,56,76,122,197,128,119,193,215,62,132,8,117,86,85,4,20,2,134,104,45,95,24,198,121,18,177,187,61,208,39,181,87,103,249,125,20,226,224,174,110,184,13,30,181,150,151,179,227,188,99,156,172,75,92,50,20,128,14,94,233,220,117,152,33,108,134,187,71,85,150,131,44,2,236,109,178,136,176,239,190,74,71,181,231,46,253,198,62,205,28,128,66,211,33,234,1,190,182,162,193,209,2,107,30,67,222,69,61,180,175,25,15,136,233,131,141,203,75,125,157,196,26,86,206,214,17,168,74,172,117,97,130,209,61,134,8,45,138,102,151,143,68,209,62,141,31,209,83,228,147,58,205,176,117,62,78,90,214,145,35,45,68,162,200,230,179,192,69,30,151,181,172,195,26,23,64,166,1,109,37,147,151,36,152,246,44,197,8,214,119,69,
+196,104,47,48,169,123,43,151,169,177,225,104,165,207,62,218,172,142,110,189,58,123,92,212,128,14,98,71,160,254,14,181,231,178,179,105,62,155,75,29,160,218,182,141,154,97,18,159,172,212,71,73,221,102,71,123,207,103,8,134,185,126,145,81,143,168,199,72,187,82,233,204,66,91,23,66,20,139,207,133,167,180,231,227,226,48,174,131,103,201,44,84,102,64,223,210,74,114,205,169,139,70,53,141,47,9,80,109,61,107,31,68,10,193,61,204,80,2,167,90,211,117,78,94,19,115,235,89,147,51,153,224,74,114,97,130,211,12,214,201,217,86,130,36,167,182,132,97,207,61,20,99,32,141,201,41,236,100,125,179,23,131,231,153,134,171,214,228,16,234,132,178,238,160,198,241,89,189,48,100,201,207,137,4,203,221,168,110,176,83,17,97,222,88,104,85,224,248,44,243,45,29,229,88,129,237,181,46,210,218,36,167,88,160,17,243,55,55,214,36,34,68,37,97,115,218,115,93,251,194,158,80,197,2,138,75,50,225,160,6,85,25,26,224,71,91,249,100,199,130,164,132,1,61,255,182,
+37,237,184,170,150,228,89,176,90,41,82,170,92,82,81,178,99,23,102,135,201,202,152,179,170,189,70,55,34,23,24,237,206,86,101,186,49,52,71,227,118,194,126,130,114,57,25,172,105,110,71,204,43,224,168,227,163,7,244,84,174,220,197,185,191,220,101,73,199,103,238,146,175,66,222,76,9,150,49,182,11,154,4,141,218,87,26,121,5,23,115,107,11,125,196,240,77,14,215,7,135,226,97,70,92,174,247,251,68,119,168,71,192,37,181,109,19,94,50,117,111,119,188,103,188,169,18,131,182,101,225,230,187,12,21,145,197,110,176,91,23,7,183,90,102,191,6,64,83,6,19,195,76,219,68,221,136,209,108,90,66,107,128,9,199,249,164,9,147,133,66,97,240,129,254,48,165,61,203,187,30,84,9,54,160,96,143,13,180,252,99,3,21,250,216,240,173,110,179,15,54,68,192,48,6,71,153,136,186,111,131,51,96,56,80,239,219,5,245,68,250,65,232,151,201,219,51,234,190,228,170,3,63,4,187,14,244,153,179,155,59,109,84,211,236,89,25,45,80,209,3,220,5,107,217,10,
+221,194,166,53,104,42,158,122,200,103,65,188,229,237,116,58,192,237,29,80,170,105,19,186,16,224,133,84,62,142,22,226,143,120,142,134,62,143,69,27,61,3,38,113,179,111,0,145,163,76,144,178,38,60,25,235,3,57,160,54,44,48,157,245,58,17,182,69,173,106,54,180,144,86,175,88,186,22,20,225,219,151,240,245,147,29,130,158,8,115,106,85,201,81,89,19,111,183,53,219,170,163,91,139,68,38,219,140,251,86,80,91,168,157,192,145,40,174,175,72,219,192,9,70,56,133,105,203,33,37,234,146,127,230,42,106,219,123,13,9,106,39,118,1,135,181,96,35,45,172,127,214,242,165,161,54,120,96,124,238,232,9,226,198,164,246,60,148,54,196,98,53,45,236,246,106,178,159,104,223,246,243,183,145,136,231,96,7,24,77,29,76,143,118,223,152,208,29,12,146,72,148,207,229,235,105,144,146,38,6,93,24,25,156,23,227,58,220,8,87,245,56,154,45,177,68,116,139,156,160,39,16,161,243,200,71,173,154,70,221,1,189,98,32,91,104,77,231,202,54,15,155,46,80,243,219,
+251,168,42,232,215,85,109,115,111,253,201,75,197,121,42,161,23,187,77,81,248,6,31,56,244,78,78,84,149,58,247,182,17,189,84,244,87,11,103,21,4,124,151,143,138,69,85,195,81,40,222,184,200,111,220,14,240,109,22,108,149,210,204,239,149,183,6,155,199,89,168,74,187,223,46,22,80,208,74,236,62,60,45,220,122,64,79,129,169,127,42,15,140,111,11,56,54,111,121,48,77,98,10,176,132,45,157,224,185,168,34,110,137,74,175,64,111,238,98,229,244,25,53,218,112,92,240,212,153,180,41,122,3,223,64,81,171,248,12,97,180,143,238,166,142,246,73,78,124,22,200,166,207,72,212,104,43,149,148,231,73,82,87,124,205,163,133,213,250,103,29,167,194,6,191,195,15,14,173,209,94,33,29,199,220,118,180,102,216,134,61,113,229,8,9,236,101,106,184,83,99,40,110,70,160,28,234,155,158,30,82,86,141,139,58,212,171,187,0,117,153,6,53,237,140,164,83,1,68,226,247,196,144,130,75,64,27,89,33,61,136,103,235,166,115,191,61,134,156,28,13,155,150,62,10,186,
+187,124,127,130,226,177,119,252,195,209,70,99,4,209,199,46,42,233,94,6,199,143,71,146,238,32,157,1,173,64,87,141,18,20,162,118,156,105,208,13,134,209,131,30,109,121,80,164,205,139,83,157,164,39,86,163,64,165,74,12,227,164,50,183,130,166,57,237,238,52,103,37,203,61,88,143,74,44,55,199,197,101,211,89,159,21,135,231,144,240,91,253,138,208,232,34,237,220,161,214,244,132,102,245,114,29,39,30,6,79,53,151,2,87,45,145,182,174,37,205,110,42,7,209,184,101,109,77,176,226,77,100,243,104,191,165,236,5,43,102,158,110,204,228,103,170,91,216,124,83,126,111,72,121,128,235,17,204,112,181,12,44,19,247,1,242,119,187,126,223,238,160,206,125,60,243,175,126,99,183,243,151,175,222,124,249,246,151,223,238,93,254,230,133,247,111,191,250,252,15,94,47,253,237,210,235,111,251,188,155,121,249,245,210,204,219,159,61,108,71,254,229,219,175,254,207,15,141,159,205,124,216,246,253,120,230,255,122,251,205,204,23,47,223,204,124,253,205,155,153,95,188,253,242,229,235,
+25,208,244,205,251,153,215,111,223,126,53,243,179,183,95,255,35,171,199,77,207,247,63,95,122,104,255,243,111,222,124,54,243,216,229,223,254,221,210,23,223,188,95,250,108,230,23,75,239,127,254,246,75,208,241,191,126,251,254,231,223,189,155,121,251,213,210,155,15,86,143,33,205,188,250,217,204,171,247,15,123,180,111,222,190,159,249,213,210,251,199,14,63,252,213,183,193,188,124,253,238,237,99,19,216,235,215,219,183,127,10,54,124,135,247,240,255,31,191,124,245,230,179,31,125,60,243,87,111,94,191,250,247,191,14,232,163,223,10,231,131,167,47,94,191,125,183,244,238,55,241,95,190,255,240,110,233,205,151,15,196,60,230,253,144,241,199,255,40,93,48,194,127,240,240,229,204,79,127,53,243,229,210,187,247,95,127,243,197,251,183,95,127,252,223,96,199,248,183,183,139,127,115,183,248,183,227,250,229,167,191,190,240,203,143,191,77,252,135,255,104,227,120,241,63,223,56,158,125,49,247,228,247,102,231,231,22,32,80,8,20,189,2,129,64,171,147,15,91,199,1,82,37,54,65,248,
+58,1,178,62,37,62,19,73,8,219,85,14,207,117,26,132,121,189,119,86,242,24,190,14,119,97,177,169,122,127,149,176,186,188,235,141,91,218,184,211,112,119,68,145,197,11,7,254,3,111,69,133,179,119,197,27,116,51,102,202,9,135,37,145,88,153,146,197,116,81,204,130,180,26,228,174,87,111,225,132,11,69,43,7,187,114,121,215,124,155,101,69,139,159,27,198,33,76,28,95,158,78,247,8,106,133,162,103,43,51,90,134,168,184,69,128,39,6,228,22,146,66,50,180,119,37,234,184,120,52,216,240,138,90,5,27,183,81,193,217,43,230,49,121,205,204,35,155,173,138,132,209,207,205,219,195,67,52,37,98,49,187,41,229,140,175,112,180,213,189,56,147,199,225,48,225,117,236,12,209,220,158,20,212,253,92,43,21,141,178,35,50,236,168,238,183,76,56,5,131,246,156,183,77,54,35,28,182,99,37,90,195,205,69,114,23,109,102,160,166,233,99,133,40,245,232,134,23,15,196,84,41,96,223,73,26,167,147,123,226,220,180,147,28,42,122,84,238,40,123,17,81,214,72,164,177,
+158,73,157,170,8,28,93,207,75,24,96,146,253,161,184,134,175,245,35,129,142,102,125,15,233,74,213,10,106,221,222,102,198,117,175,16,5,237,7,66,182,164,120,19,203,12,178,7,122,115,76,224,71,161,168,187,214,161,91,209,39,52,114,241,240,232,6,69,119,114,209,249,113,35,32,46,172,145,123,188,245,105,1,153,129,85,87,15,33,231,248,66,237,30,118,167,181,137,153,84,140,153,37,166,239,84,73,253,179,162,115,239,50,46,102,135,71,157,145,199,76,219,195,184,217,19,232,133,89,170,155,218,15,194,152,129,211,111,228,70,113,22,191,142,186,111,141,228,239,149,129,155,6,31,56,230,209,238,41,169,201,177,156,100,203,148,116,5,81,112,95,112,79,180,24,99,147,195,174,33,195,35,64,212,147,98,85,125,10,49,4,166,20,7,84,118,44,216,138,218,195,114,209,13,119,60,185,63,152,112,143,3,85,94,104,106,177,52,75,86,51,111,98,189,98,8,24,40,78,4,111,173,177,131,74,85,132,121,23,57,24,113,224,14,183,136,199,94,35,155,219,44,42,102,232,159,
+78,11,125,135,90,145,81,76,121,25,221,189,140,162,94,115,111,30,89,50,188,54,54,148,195,120,246,188,65,197,30,68,151,20,36,187,49,2,46,164,42,250,219,200,160,63,135,177,100,41,130,162,101,40,217,59,117,159,153,237,199,9,66,161,104,245,73,124,50,166,56,44,86,216,140,215,216,172,100,202,7,232,177,102,211,16,26,219,98,195,76,55,36,1,178,103,186,136,240,112,121,115,179,119,218,207,91,39,155,219,78,14,213,73,17,159,41,189,201,126,105,249,176,232,102,168,9,52,65,7,25,169,5,133,197,136,134,17,147,0,202,176,45,123,60,225,112,135,55,145,134,135,18,118,22,169,214,59,150,221,64,241,194,101,126,63,63,52,168,116,29,1,215,208,199,58,163,15,68,188,130,5,211,196,92,132,97,106,86,86,109,129,64,166,180,201,181,201,161,95,38,51,3,93,58,187,226,131,102,198,242,174,172,170,172,81,90,20,39,95,144,136,69,1,169,76,40,41,194,28,22,92,160,27,159,198,114,41,158,199,67,182,178,232,132,240,94,156,68,0,92,211,72,90,193,11,
+80,167,226,171,177,53,30,212,118,2,190,0,197,90,156,146,97,107,206,171,4,61,87,115,58,134,57,46,149,194,182,1,74,84,80,119,221,242,35,76,148,102,130,208,240,101,46,50,30,132,241,226,170,238,45,79,206,72,153,82,26,56,139,226,106,185,128,182,207,46,216,152,149,90,89,11,96,4,227,164,45,34,152,214,85,35,109,9,240,197,122,0,173,55,44,149,134,58,9,51,103,216,226,12,181,189,72,207,206,170,85,166,109,107,143,206,194,239,201,185,229,112,42,224,13,183,210,185,166,145,19,57,96,105,132,233,129,13,40,157,159,120,71,195,33,3,112,244,81,92,250,216,209,31,131,148,163,66,134,161,241,38,170,3,9,20,93,154,85,44,226,201,33,78,51,33,70,32,48,148,155,28,175,66,156,234,201,233,180,180,133,12,186,100,35,150,166,198,112,104,80,84,26,48,212,202,207,155,215,112,157,188,167,107,245,122,227,82,160,231,215,213,9,177,94,37,111,152,20,99,154,68,216,195,154,172,225,10,43,157,113,180,123,221,99,225,59,137,145,234,188,52,81,187,195,189,
+16,89,238,76,40,250,64,147,39,118,76,92,215,74,170,137,57,166,79,90,132,105,13,89,163,150,139,192,173,254,130,138,167,168,163,221,230,64,125,60,46,90,92,192,178,224,152,210,42,157,14,169,181,58,226,148,51,29,109,33,175,125,0,127,112,33,60,145,56,245,201,138,217,192,172,236,87,199,163,61,70,166,117,201,68,141,168,64,117,175,55,1,210,213,184,128,91,25,196,198,228,24,112,235,214,246,115,141,193,100,133,175,234,101,241,126,9,214,111,147,91,144,235,60,157,50,157,40,220,203,214,246,202,228,43,77,163,149,97,229,38,211,214,160,38,154,14,110,179,181,225,136,197,163,113,20,114,63,191,73,170,170,174,175,25,100,56,253,54,124,175,131,178,226,57,177,64,138,58,159,122,58,137,40,30,162,175,75,229,146,147,250,244,64,37,130,15,89,118,245,52,94,133,107,53,189,81,4,252,152,146,147,118,140,83,92,37,116,118,62,29,7,198,238,131,27,135,73,149,109,199,135,118,99,4,109,38,111,9,76,242,128,110,76,69,201,229,129,178,70,14,208,88,57,146,0,
+168,223,11,67,64,212,40,147,186,117,185,154,35,49,204,65,1,28,206,5,199,242,66,161,100,161,87,97,36,148,2,160,121,121,66,216,215,173,209,150,79,229,185,195,2,21,162,35,223,181,82,228,35,1,245,162,54,241,72,101,141,64,32,225,175,12,111,140,35,29,81,36,59,215,112,4,211,251,108,55,174,228,109,83,123,221,181,61,108,36,146,227,199,234,81,245,22,181,60,84,115,129,102,131,42,25,2,110,158,103,232,216,221,76,220,202,99,195,70,207,173,157,182,250,3,82,252,92,23,90,233,36,196,134,254,202,50,196,152,116,118,163,206,66,6,65,17,240,46,204,200,209,36,149,233,145,89,225,77,111,33,42,108,104,90,161,137,145,102,229,12,211,57,135,162,98,143,99,34,89,10,112,159,150,95,193,5,106,158,91,23,164,78,239,110,251,78,23,87,215,26,105,219,126,157,78,181,85,26,220,7,200,120,101,181,171,81,88,214,208,188,136,230,214,111,69,115,215,33,125,206,126,80,23,223,134,14,89,35,177,85,168,210,245,34,50,117,15,97,30,196,86,104,125,229,4,
+239,168,162,168,55,226,76,152,232,200,215,72,183,61,127,59,165,179,77,235,227,227,0,229,160,227,100,176,34,168,168,206,94,9,201,149,247,80,29,124,152,219,187,111,106,174,7,8,75,237,240,104,34,86,169,206,247,219,194,29,111,116,11,98,174,227,113,199,250,237,12,138,182,34,50,133,186,62,93,15,188,29,199,168,181,57,5,87,157,106,4,134,206,1,3,101,39,52,165,2,131,67,145,107,199,219,55,89,99,25,213,145,80,114,194,22,115,195,105,63,144,215,211,86,39,187,237,52,105,87,37,141,189,16,160,160,31,181,175,187,101,7,171,17,74,58,107,25,138,141,48,201,96,20,237,206,164,224,226,244,50,238,142,150,187,220,116,50,97,116,218,142,26,234,157,24,225,227,245,106,149,127,33,74,25,14,185,0,62,17,215,142,75,213,30,140,168,170,169,67,81,237,40,203,239,244,90,34,206,33,159,18,138,234,246,242,217,150,181,181,225,228,75,201,174,34,41,31,40,170,53,19,71,95,93,145,35,129,6,131,165,204,76,196,3,130,101,71,112,27,34,98,132,189,109,98,
+145,122,141,235,155,171,45,94,212,206,221,162,106,215,35,67,220,196,227,189,13,2,43,188,4,145,107,198,86,245,120,110,24,10,33,213,109,7,189,46,241,150,127,17,90,230,173,97,44,122,106,229,4,24,95,12,140,213,181,24,181,198,23,180,168,129,78,46,189,211,136,81,155,173,80,102,144,166,170,178,36,191,175,31,78,24,203,30,153,253,188,50,102,237,81,247,59,78,236,72,198,5,28,81,252,118,15,0,7,241,208,79,143,105,165,37,106,214,48,57,242,236,233,142,3,234,112,182,101,44,29,251,181,113,102,79,229,147,223,240,38,107,154,4,69,207,137,243,14,238,123,49,13,195,73,233,95,66,188,86,218,94,202,65,166,233,86,226,54,6,101,91,220,98,182,148,181,156,142,95,74,183,220,77,10,91,64,77,72,171,85,10,208,229,114,157,1,100,79,45,146,143,46,250,85,59,211,99,221,102,245,28,76,229,160,80,114,14,11,91,177,68,110,34,174,228,10,120,253,158,44,59,105,217,151,1,219,144,53,217,191,232,56,107,20,93,8,24,35,78,168,209,195,105,97,13,
+83,229,170,115,250,53,215,133,74,207,200,46,159,108,241,47,112,88,153,45,2,24,86,145,248,161,187,72,33,42,171,36,79,39,48,246,0,99,174,66,166,6,154,167,213,200,208,9,176,139,5,37,99,212,53,119,200,98,99,89,55,212,196,80,241,122,149,11,240,39,5,7,83,210,235,57,117,132,200,112,200,170,5,207,35,20,93,65,0,81,81,144,215,78,227,84,114,39,174,44,183,21,69,135,252,6,181,199,114,197,47,10,38,157,153,97,93,134,196,211,167,12,40,22,231,85,23,5,56,153,173,21,64,221,150,18,237,80,174,18,240,225,253,137,32,221,17,72,28,148,172,28,1,59,129,20,50,70,50,235,40,82,228,231,157,135,161,90,9,80,86,251,44,150,58,215,114,181,110,50,19,12,179,232,160,232,49,211,80,98,172,219,206,148,147,129,35,211,113,226,122,140,224,82,107,225,206,8,190,175,168,158,39,195,70,246,129,180,134,162,163,113,35,207,96,125,127,249,22,103,110,202,83,7,231,86,67,222,126,161,40,73,250,0,230,90,192,200,110,183,140,5,22,120,15,52,
+74,25,221,230,194,74,77,211,180,82,115,13,113,185,57,12,88,74,202,106,230,68,144,0,167,242,230,142,89,99,101,117,249,218,56,39,54,13,235,106,69,170,34,181,234,150,244,52,43,147,80,67,167,200,93,53,252,58,113,194,52,204,245,54,227,229,211,117,92,58,156,0,39,104,126,249,166,237,74,0,136,13,170,228,170,117,3,222,160,248,84,136,20,80,209,192,69,196,195,211,136,187,176,194,40,218,171,234,29,75,100,29,226,63,181,0,216,181,222,202,13,109,115,120,122,82,217,143,146,3,26,29,47,117,153,114,172,117,200,86,126,121,90,102,215,212,82,173,56,154,177,176,51,22,183,181,147,137,89,153,184,61,82,44,49,105,173,82,214,88,188,158,132,236,22,151,38,64,44,160,97,137,167,231,234,202,30,170,223,8,73,117,184,41,193,69,236,56,129,152,64,60,29,36,241,82,26,0,67,76,17,97,21,112,179,123,151,219,177,8,129,242,121,80,200,79,28,249,122,0,36,217,87,182,239,214,24,219,226,73,115,19,51,205,13,11,170,172,145,58,50,14,168,3,62,106,
+112,39,35,10,10,37,23,191,20,9,202,91,41,214,90,197,142,81,229,156,133,124,89,169,145,140,176,13,247,118,218,226,65,213,58,164,112,164,123,189,158,136,2,244,129,139,96,246,91,64,90,28,232,147,10,64,29,247,3,201,169,57,140,57,17,229,20,231,217,137,52,5,164,38,173,220,24,179,14,19,156,214,250,109,8,137,162,103,228,122,36,221,52,173,64,197,132,130,172,144,205,170,42,170,242,49,158,128,145,217,212,218,145,21,33,166,236,15,34,217,90,14,145,24,78,228,231,44,190,174,195,46,185,157,97,89,197,230,233,32,88,101,85,51,230,140,105,134,61,157,238,36,27,64,98,48,112,190,114,146,103,1,8,69,45,9,208,167,214,97,14,104,83,187,76,45,125,5,70,26,43,55,239,198,222,9,128,128,220,236,251,145,253,195,178,111,210,139,199,197,149,13,42,54,209,171,162,156,170,105,167,117,93,27,157,84,175,212,112,150,6,184,216,114,12,162,234,130,205,128,185,65,168,221,189,184,81,160,36,78,89,123,218,81,110,47,132,152,182,239,78,140,78,24,121,32,
+110,21,41,10,37,39,52,246,21,52,64,45,40,42,70,70,40,111,95,87,185,6,238,173,150,216,218,182,120,249,112,2,237,59,166,2,199,184,72,60,39,75,174,166,7,91,30,114,54,181,127,58,61,170,141,32,73,152,125,141,111,27,172,104,171,102,14,103,186,87,96,64,129,148,177,0,244,136,28,173,180,119,30,35,198,139,84,64,76,239,3,224,122,59,210,229,146,242,51,114,253,40,127,71,194,239,15,214,14,81,131,246,177,46,87,58,188,191,189,54,39,124,186,17,18,137,54,251,156,0,36,237,98,131,247,240,200,139,3,37,96,77,112,73,45,28,117,50,158,182,56,102,90,32,44,42,88,90,218,251,234,177,214,34,74,176,109,19,153,144,48,185,148,217,116,90,213,40,99,129,56,119,154,134,33,203,122,40,163,143,166,194,251,33,254,160,148,162,236,55,38,76,130,52,170,9,120,130,7,214,131,116,88,100,43,22,5,251,199,58,49,160,145,215,171,149,14,120,223,157,149,92,80,206,240,177,226,228,164,166,75,23,120,161,74,216,35,238,192,65,231,205,186,61,124,52,
+192,183,21,131,18,193,134,139,112,228,147,85,75,192,157,9,171,140,189,50,181,16,17,77,11,20,235,33,109,5,121,2,28,92,50,251,83,8,176,142,51,132,181,199,250,51,95,28,106,136,2,105,36,26,72,0,180,218,88,16,110,90,41,154,66,133,226,218,176,171,186,189,50,28,146,239,195,173,76,53,17,113,2,156,17,90,246,9,148,14,89,61,2,32,144,188,176,141,130,236,108,79,151,97,16,154,75,7,209,75,216,67,56,100,253,6,128,192,32,174,60,21,114,120,176,59,129,66,174,142,1,200,53,36,255,161,39,97,186,252,161,39,93,47,249,208,179,0,58,113,97,39,173,38,255,161,227,142,119,87,206,76,203,139,84,200,213,33,242,131,37,246,1,4,180,204,62,128,128,150,59,15,32,160,101,230,1,4,196,216,121,0,1,123,186,31,64,192,158,251,143,225,64,12,143,225,12,199,32,8,51,79,117,193,58,206,135,120,86,254,185,120,8,31,188,62,224,31,252,147,248,140,71,124,44,123,226,137,200,99,0,196,4,217,189,159,136,29,160,210,33,203,15,64,180,71,
+115,96,243,209,124,71,252,104,174,51,61,154,175,139,30,195,167,174,63,134,127,197,126,12,31,101,123,12,159,118,244,24,62,220,2,121,4,58,202,63,38,74,135,60,38,250,255,151,247,115,189,228,26,64,248,117,231,16,61,194,236,245,223,103,202,204,135,158,71,255,82,158,177,143,240,16,28,88,76,15,7,128,240,32,251,232,33,217,124,254,16,199,42,237,251,227,123,99,34,14,131,255,8,167,244,14,207,28,220,254,128,107,0,27,12,143,105,79,76,143,105,67,238,30,225,166,136,71,56,189,251,17,238,161,62,174,127,170,62,103,32,28,116,152,35,52,62,200,177,227,164,157,63,38,240,125,213,145,6,210,163,50,3,144,19,200,17,189,163,250,208,111,243,251,168,119,234,1,220,211,118,58,243,202,202,195,165,205,67,118,205,247,144,247,201,127,93,222,255,92,62,121,200,142,221,165,147,98,12,148,7,248,213,95,215,251,95,202,187,231,3,62,123,136,205,181,99,221,15,250,218,177,217,71,57,204,131,78,238,110,255,191,235,228,31,235,21,253,72,31,204,218,118,138,63,228,
+167,255,239,51,238,254,165,121,252,115,227,238,251,210,255,127,239,249,233,91,158,152,24,130,242,152,192,121,184,174,255,94,121,172,94,97,188,224,18,243,129,199,245,239,129,199,203,131,199,129,119,227,228,125,80,236,247,93,63,44,136,107,46,246,232,171,31,86,197,67,228,247,188,126,221,155,31,22,45,112,205,250,190,235,199,34,132,79,65,63,183,223,247,120,145,60,4,135,102,171,182,209,13,226,7,221,194,191,31,221,6,63,204,158,249,201,248,113,218,15,122,182,135,31,86,150,239,107,188,84,217,67,150,172,170,154,222,130,255,155,138,17,204,205,99,248,240,239,75,215,234,15,225,43,115,23,15,94,47,18,192,101,217,11,246,36,125,111,243,131,242,195,236,223,70,237,64,118,46,69,82,41,225,250,97,17,131,52,190,183,249,73,253,112,91,194,247,232,32,16,253,186,121,82,18,101,171,199,223,235,120,186,252,128,103,247,95,233,210,157,135,161,255,125,241,126,255,192,123,211,130,63,149,44,59,72,1,11,39,113,210,101,198,229,76,197,121,74,0,209,39,248,146,242,148,223,
+175,89,0,210,81,219,36,170,166,169,246,14,220,31,159,18,227,167,241,162,58,44,244,221,226,28,129,17,94,39,240,13,228,52,99,91,19,107,227,149,190,92,5,0,91,182,125,183,228,154,213,231,181,166,141,46,108,32,194,211,238,141,101,28,135,214,207,224,197,152,167,170,2,170,36,194,121,0,70,137,186,213,3,90,178,85,200,186,39,13,64,118,125,156,131,223,56,183,153,255,116,102,254,227,153,63,126,251,229,171,159,253,234,225,216,232,215,167,63,51,95,125,253,246,171,165,175,223,191,90,122,247,109,247,239,206,240,126,241,161,243,111,92,159,121,249,230,203,153,159,46,253,252,229,223,190,122,251,205,215,255,249,25,224,227,129,212,231,191,243,193,240,213,210,215,159,255,206,63,156,223,253,201,219,247,75,51,239,127,254,242,253,204,119,87,223,129,253,191,121,249,250,245,175,102,190,94,122,255,205,215,111,102,62,255,241,251,159,63,156,144,189,251,174,225,111,95,190,254,102,233,163,153,95,254,252,213,23,63,159,121,252,66,204,187,153,87,111,102,222,189,250,197,87,175,31,
+124,124,57,243,238,87,111,222,191,252,187,127,56,119,252,112,188,246,14,52,255,234,195,137,220,187,87,255,247,127,225,172,242,215,71,128,127,177,244,254,207,151,190,120,255,217,204,15,223,252,58,188,111,222,188,94,122,247,0,243,120,48,7,98,188,5,61,125,253,203,87,239,150,190,251,170,200,47,95,189,126,61,243,197,210,155,247,75,95,127,64,249,234,237,187,87,31,14,75,65,164,199,19,193,31,125,252,223,238,107,32,191,125,168,247,221,25,221,63,28,237,253,67,101,255,241,177,222,95,126,248,10,208,15,63,255,157,63,254,213,111,126,213,229,243,223,249,209,195,213,63,126,245,230,213,47,64,190,254,245,219,191,251,236,135,31,90,254,2,124,247,242,167,15,38,63,250,71,158,190,35,238,135,79,62,154,1,255,230,158,128,79,243,79,158,252,86,183,63,255,230,205,127,205,25,226,147,133,39,191,55,251,244,233,139,21,232,45,196,177,12,129,64,69,211,239,190,126,18,219,8,98,115,57,138,177,177,130,93,189,186,199,72,79,78,104,43,235,119,172,117,227,45,86,141,195,
+26,170,138,218,253,237,97,177,159,194,29,55,68,154,184,217,150,37,217,197,161,242,61,26,67,56,63,56,177,110,16,109,55,4,12,198,108,118,200,48,102,60,74,124,114,114,126,216,182,111,239,79,32,148,242,168,43,61,181,123,154,39,132,169,80,224,108,165,7,234,137,55,190,231,243,249,98,137,68,250,148,70,44,212,106,205,43,198,234,36,137,27,227,207,119,253,177,172,31,127,192,94,243,173,239,202,87,251,57,246,14,119,71,192,115,227,188,151,34,203,122,96,61,180,113,170,221,13,30,201,84,195,148,167,119,187,225,57,215,70,185,84,62,223,121,154,60,55,221,8,160,88,28,108,131,144,90,137,73,215,108,27,167,104,191,69,209,149,93,8,78,251,99,92,180,152,50,15,186,20,173,245,202,86,22,75,187,68,122,77,85,45,82,71,146,72,174,107,27,97,247,194,29,13,74,54,210,249,171,246,158,40,7,148,170,230,84,73,131,222,235,159,180,85,34,169,110,143,58,81,164,11,173,208,93,235,106,15,23,105,135,48,20,99,224,158,75,132,249,238,85,133,62,222,234,168,
+79,179,85,99,144,139,241,114,101,37,145,125,187,27,169,157,49,186,118,179,66,107,21,22,169,76,141,119,35,195,18,73,169,27,186,104,185,131,99,19,18,56,241,174,145,84,23,66,49,50,207,248,20,181,191,185,17,68,165,3,205,62,113,247,142,184,182,38,37,67,201,59,125,242,78,221,207,190,138,75,45,167,55,217,213,114,120,183,228,20,50,245,37,79,240,102,115,138,149,69,101,161,168,195,185,238,41,187,37,30,146,119,39,23,198,199,82,134,200,241,57,189,125,89,244,8,200,240,205,115,243,221,150,236,84,123,64,227,168,101,156,18,215,79,36,109,219,55,253,199,190,83,191,169,96,65,223,109,239,109,216,203,187,167,13,71,145,236,186,107,110,235,238,91,52,223,13,130,44,36,26,174,124,27,5,43,127,125,154,33,107,14,214,38,135,87,123,189,59,44,188,80,56,21,106,252,2,242,186,60,0,157,198,26,50,51,51,180,93,223,226,237,185,12,12,159,24,42,235,200,106,233,190,112,88,227,146,182,240,4,225,142,227,170,28,164,164,224,131,100,10,231,63,202,92,134,
+87,69,83,91,77,185,150,212,9,237,0,60,217,94,14,160,236,57,206,52,230,23,69,238,125,199,226,123,219,181,143,144,145,117,68,246,132,141,159,177,238,27,167,27,183,174,139,68,208,129,7,174,36,85,11,251,248,132,136,228,219,174,244,193,88,31,161,42,183,128,248,250,241,245,141,40,125,163,73,79,72,235,99,36,21,211,133,223,18,55,174,211,99,164,62,162,87,187,236,178,200,101,182,145,88,86,159,192,227,87,161,148,179,36,81,78,34,26,114,180,211,190,14,87,175,171,17,33,37,68,149,240,138,119,61,34,125,135,42,181,58,246,37,132,123,73,211,72,164,27,247,181,67,51,188,131,62,238,216,209,199,82,240,175,220,113,151,48,222,117,238,61,148,176,230,83,94,249,72,247,218,216,232,48,210,204,53,15,224,12,93,221,173,134,235,82,203,131,9,179,127,48,54,141,136,227,105,111,162,49,171,42,118,239,254,122,40,187,105,112,154,176,251,49,139,120,91,142,218,112,122,206,128,250,142,17,161,167,144,180,177,0,83,5,104,50,219,120,47,116,40,205,39,10,151,221,
+162,63,82,115,243,99,252,152,182,105,80,245,183,228,103,235,35,162,216,108,176,57,60,103,253,108,49,138,46,78,174,197,28,71,162,116,39,191,199,5,238,124,39,145,97,220,65,6,144,69,197,154,221,39,110,122,61,242,147,164,90,228,171,22,44,230,76,193,18,240,222,164,208,3,90,29,28,125,91,123,168,237,45,12,50,36,32,159,225,66,82,174,36,170,88,107,54,83,86,92,60,212,205,140,119,180,8,163,63,222,61,230,14,7,188,83,84,140,189,73,203,15,226,140,245,178,161,88,8,187,221,133,155,102,193,114,199,212,159,54,142,60,4,49,220,179,69,138,237,222,133,100,214,203,76,153,94,155,20,78,7,120,18,202,94,174,132,220,236,120,120,135,21,82,198,113,137,14,16,31,178,215,50,53,245,137,144,211,247,116,10,69,7,193,156,143,193,83,30,157,147,42,159,48,198,215,121,169,188,46,211,150,1,113,134,225,192,240,4,228,242,36,11,171,91,101,242,200,102,92,84,51,15,174,117,41,134,101,50,4,242,30,100,81,135,161,6,140,19,21,95,145,37,196,130,30,
+165,116,115,36,177,202,10,19,153,91,166,96,248,237,142,49,137,72,220,186,194,153,180,140,147,136,58,70,86,59,79,201,202,132,180,185,215,196,53,252,140,196,110,115,42,213,222,197,153,107,181,155,237,53,39,229,146,21,208,38,57,17,173,216,147,197,225,249,100,116,180,112,208,59,79,151,239,21,233,176,85,155,246,79,121,125,223,230,180,81,51,203,232,217,53,160,210,169,105,188,245,105,178,212,169,169,61,147,75,188,76,74,215,107,116,198,72,199,11,243,81,218,153,138,3,155,113,220,103,100,55,231,215,217,253,193,197,254,42,55,183,45,233,152,175,81,18,103,8,87,5,16,185,3,187,252,138,148,96,30,2,163,94,109,236,44,17,215,237,41,227,181,203,57,193,105,148,165,131,137,227,174,4,237,198,137,106,21,178,108,162,136,118,157,241,102,43,56,232,220,34,57,163,203,172,59,114,199,185,100,227,221,41,249,101,240,214,26,182,107,219,57,170,61,59,29,164,137,35,156,152,31,119,235,166,230,18,209,67,149,106,70,146,78,160,172,226,17,19,121,51,224,149,90,249,140,
+210,53,101,24,13,111,13,233,185,182,169,129,142,93,45,199,234,221,120,76,116,87,25,175,32,153,78,236,169,139,227,28,52,210,77,161,252,88,138,109,109,225,82,35,223,46,210,201,9,148,221,107,213,29,15,255,212,61,196,157,132,114,53,183,195,238,233,3,89,75,238,222,164,17,15,239,197,34,186,199,125,26,87,99,56,209,187,83,99,214,136,71,133,71,133,221,179,235,28,189,214,188,176,107,215,239,52,108,138,165,24,62,111,14,211,240,154,119,164,233,148,237,86,213,169,145,154,224,78,153,9,169,87,103,84,200,183,24,44,120,152,204,228,58,220,213,214,54,102,239,198,212,92,145,50,8,214,234,149,93,71,213,249,91,121,146,107,124,107,13,214,16,165,202,93,77,78,214,8,87,66,46,40,185,207,92,25,157,202,214,166,134,96,223,113,114,78,225,220,83,197,161,241,244,62,185,75,212,178,238,247,116,117,235,37,26,18,200,216,46,227,230,102,175,35,215,180,178,34,206,165,18,176,168,189,35,119,130,217,157,90,174,167,68,36,174,75,189,20,250,89,241,18,59,52,180,
+91,227,28,30,161,5,28,57,179,219,19,34,90,91,44,196,250,218,216,246,45,165,18,214,140,81,33,43,76,174,179,31,36,244,118,123,188,224,115,112,60,192,101,34,99,176,4,123,187,65,110,52,115,16,227,156,30,106,78,51,145,193,85,121,171,25,42,88,168,178,114,134,203,189,110,183,57,3,137,151,144,67,151,105,22,116,187,57,198,149,208,101,156,213,198,104,93,233,174,243,135,238,139,105,34,107,142,115,209,151,167,87,134,56,54,146,14,21,58,49,120,252,100,210,241,248,58,78,28,27,117,207,166,92,219,188,85,147,191,188,113,238,193,222,152,91,134,12,73,113,33,34,73,199,40,57,81,73,63,117,9,104,163,155,222,248,44,0,111,213,72,125,188,77,229,220,72,104,132,105,121,117,56,234,233,154,34,79,78,64,154,40,235,29,239,128,51,6,208,170,203,220,25,39,167,19,140,133,244,182,184,165,15,104,217,108,205,80,123,87,156,110,233,54,143,18,2,154,124,154,231,221,21,2,49,135,60,210,37,221,105,132,25,93,20,109,233,202,15,157,249,227,94,233,242,178,
+91,242,227,75,80,249,74,126,178,41,221,218,12,222,103,15,168,246,131,218,54,112,16,82,108,123,60,12,98,26,234,36,118,252,242,19,94,4,119,102,151,182,247,84,155,215,221,58,239,186,85,187,185,177,24,87,19,227,62,183,95,188,133,8,118,24,53,139,93,195,222,204,31,23,227,241,80,171,56,166,224,137,211,145,174,217,85,16,211,216,193,174,104,131,180,83,200,90,10,22,122,210,183,146,240,69,87,252,50,221,64,96,60,61,54,104,172,199,185,196,58,185,9,46,15,227,158,102,123,168,177,27,213,107,185,129,89,193,35,194,183,81,178,158,70,83,161,72,88,58,125,96,208,171,229,248,50,184,35,206,148,129,90,19,31,216,143,166,154,160,38,228,47,85,183,60,140,140,168,98,115,70,83,186,251,40,35,182,218,131,105,228,184,50,105,153,44,214,164,252,251,33,55,74,70,63,27,167,42,84,202,181,236,116,28,220,59,35,92,51,59,128,61,96,139,159,16,118,1,14,129,194,33,239,114,224,100,66,68,162,49,100,123,101,251,25,218,188,59,44,177,9,69,29,173,115,
+153,165,117,86,198,62,170,70,173,184,54,145,46,57,148,219,45,30,241,160,174,67,83,228,25,102,60,168,184,76,72,233,135,67,5,43,88,48,101,149,19,201,149,172,104,57,64,235,239,56,8,77,67,106,23,32,246,93,87,20,97,235,210,212,211,112,54,70,30,63,145,136,17,37,251,161,205,8,225,224,100,84,146,158,173,219,36,42,56,153,156,72,25,247,173,53,124,4,14,228,186,33,138,192,137,180,3,29,214,45,202,95,18,172,59,229,229,45,106,49,72,186,112,120,226,244,178,125,92,6,186,14,231,38,155,164,26,123,53,166,74,160,39,141,195,100,161,76,49,146,205,104,52,122,203,212,210,133,11,162,236,140,177,196,109,201,184,123,17,52,213,39,21,232,14,81,17,78,164,163,242,200,203,68,191,238,202,164,18,232,197,165,99,68,55,204,247,139,35,42,88,6,234,231,24,85,154,45,249,6,185,171,130,3,154,184,66,59,57,138,107,108,118,169,238,112,120,161,109,14,171,55,29,170,102,219,128,220,209,225,143,200,246,246,112,107,124,211,196,95,66,189,68,110,137,161,
+10,215,210,42,151,38,100,185,11,222,123,194,110,73,198,93,165,3,167,193,1,89,40,93,115,176,17,173,211,245,1,117,122,116,85,10,166,27,142,177,21,143,109,42,229,76,74,69,164,37,12,233,91,114,77,144,203,139,28,87,42,242,17,53,209,244,78,71,118,230,24,78,164,209,13,40,175,10,157,62,106,113,78,137,229,28,233,108,143,42,29,249,130,164,33,156,5,109,107,8,213,16,182,211,212,177,247,183,2,228,62,173,224,128,114,237,247,172,46,126,120,75,181,79,87,18,24,166,41,232,22,18,181,109,84,213,231,69,198,146,126,94,98,55,237,151,235,197,233,99,63,68,28,80,41,34,170,130,1,234,215,68,84,82,22,189,80,132,181,163,59,33,125,205,216,175,181,100,167,211,73,235,52,119,223,140,107,152,185,19,38,243,68,29,69,251,48,119,56,190,240,212,146,219,95,243,96,155,50,47,221,45,92,169,85,234,198,155,147,27,184,56,206,230,163,54,250,9,115,68,100,49,176,52,8,13,59,220,99,156,134,66,39,170,189,232,193,225,201,186,104,205,120,131,244,43,
+211,91,132,124,148,32,97,139,174,52,81,90,185,136,186,240,160,198,58,173,35,24,137,186,9,213,209,22,231,30,234,5,72,162,99,185,172,10,155,156,243,155,113,117,212,181,30,217,6,196,92,7,65,89,63,116,168,123,131,210,58,32,184,226,228,106,226,147,120,12,215,224,171,134,228,44,77,128,181,75,38,57,14,125,204,4,4,118,43,34,200,26,221,109,109,97,173,162,59,82,35,82,158,104,11,169,120,78,28,103,218,156,176,115,32,225,178,242,206,207,84,136,17,255,88,200,26,149,229,35,81,72,119,202,7,186,4,205,176,143,179,239,39,210,27,215,181,112,81,218,227,202,106,227,139,51,28,55,204,117,164,88,212,50,93,82,80,135,166,72,61,50,122,25,233,21,253,21,55,172,26,185,29,86,124,195,170,95,226,16,120,29,33,122,39,98,245,216,109,62,187,165,231,82,230,100,10,150,213,101,92,157,164,194,14,191,42,114,69,239,112,73,197,74,45,10,230,121,106,57,60,14,73,217,230,12,154,33,104,34,61,90,89,60,175,56,13,23,246,175,123,41,217,49,45,216,
+20,237,122,142,0,18,169,223,51,131,125,181,218,53,111,131,120,130,198,11,61,206,105,17,173,212,108,144,21,230,228,214,113,134,104,136,168,202,83,179,129,101,10,40,78,124,107,78,238,38,161,173,77,147,71,215,210,42,203,153,69,21,202,118,210,221,68,173,77,107,132,245,224,200,134,115,27,146,55,9,68,86,90,226,245,228,114,213,52,112,77,60,171,133,240,53,230,253,10,165,186,163,51,202,3,241,190,170,211,173,23,182,0,47,142,195,10,95,197,203,126,234,22,95,21,52,49,237,137,59,163,39,66,81,75,243,205,73,9,79,149,137,168,253,150,123,37,83,59,171,81,52,170,168,21,95,14,210,169,113,167,140,165,187,195,100,106,20,144,201,80,142,54,110,21,240,68,98,127,55,131,194,149,39,44,157,140,51,241,89,19,97,110,99,226,24,23,148,209,180,51,108,205,94,31,192,204,24,7,71,48,181,200,85,137,180,185,230,103,81,50,221,210,40,230,107,93,230,188,215,83,209,233,240,140,8,239,23,107,155,13,13,138,21,141,140,87,236,253,233,113,108,152,235,151,203,
+162,241,157,14,96,215,78,99,58,165,158,172,92,187,14,83,19,188,112,129,216,161,16,215,148,230,129,114,131,120,214,225,15,148,1,117,182,18,104,15,242,210,172,70,41,69,58,185,20,188,111,85,44,86,101,253,221,109,19,167,24,134,13,139,7,23,225,227,107,13,59,84,129,162,233,93,199,173,14,127,205,162,40,226,26,26,140,135,154,26,104,94,195,241,37,206,96,224,80,182,251,167,142,102,36,13,143,247,219,181,70,11,55,72,89,116,246,18,174,188,42,201,171,52,234,195,21,192,43,111,142,112,108,89,104,88,216,21,153,80,161,32,61,100,54,173,134,214,173,153,147,82,137,33,229,179,178,72,70,54,114,151,96,246,99,16,33,178,81,30,183,198,5,173,181,6,147,183,107,58,141,124,156,32,73,145,214,145,159,41,117,153,146,103,212,253,157,187,82,119,18,59,217,219,58,61,41,74,6,29,77,136,175,157,88,80,163,64,136,148,67,78,153,25,241,112,37,114,120,153,8,89,122,50,88,77,104,31,120,114,90,101,210,37,34,180,80,52,237,36,163,45,105,186,200,130,
+112,255,160,200,21,151,224,78,249,165,164,88,201,1,245,26,167,117,93,104,80,66,171,5,85,79,150,168,14,107,135,48,254,121,71,208,203,175,79,125,81,180,29,177,62,234,223,244,81,48,41,193,130,63,67,106,139,81,212,32,87,163,246,61,251,229,229,172,150,40,189,112,22,51,199,200,252,221,148,129,10,107,15,115,44,206,209,168,218,230,80,189,188,216,241,65,68,98,205,169,12,242,110,90,229,72,111,197,165,69,83,45,122,210,114,4,148,138,92,129,228,185,63,166,248,169,41,129,40,197,128,162,143,237,105,76,81,221,22,151,152,185,128,195,102,228,103,52,25,159,211,110,61,233,154,56,93,43,39,66,217,119,167,73,222,244,46,54,40,22,105,179,253,59,146,160,145,183,117,110,241,38,223,109,7,135,92,70,232,76,113,254,174,46,237,49,251,253,132,204,177,245,118,219,173,222,101,156,108,154,92,218,93,187,35,144,201,16,47,149,200,90,101,51,152,71,93,175,114,212,94,122,136,114,23,197,149,199,55,5,70,203,216,186,169,39,121,161,32,155,203,77,70,52,138,216,
+93,154,88,82,217,51,106,212,78,7,47,171,196,35,118,67,35,50,164,106,112,147,92,207,175,46,3,7,204,52,213,154,219,200,117,201,233,35,89,104,43,125,237,247,235,90,155,0,171,148,216,27,17,57,249,222,158,255,190,88,139,180,153,181,73,7,96,144,203,107,162,77,236,65,171,110,207,43,91,27,181,176,72,212,157,214,106,227,40,47,7,174,137,237,158,100,26,73,106,179,196,46,79,119,103,27,41,141,20,255,200,157,211,28,36,118,25,145,96,54,126,70,116,70,50,135,33,173,129,56,196,26,144,56,252,64,191,231,144,13,35,130,196,4,91,29,132,60,74,64,163,84,220,142,218,226,110,65,179,57,234,240,35,157,244,102,59,239,88,27,178,212,246,60,12,123,125,235,75,28,12,113,105,206,238,248,112,192,109,240,171,205,97,204,203,149,42,11,161,142,90,190,29,30,135,143,143,253,188,99,83,246,46,188,221,42,110,143,61,150,138,137,30,78,105,55,198,42,104,32,128,196,32,249,131,54,185,125,123,147,220,184,39,119,213,183,218,147,213,150,198,183,221,33,122,232,
+4,43,56,179,32,66,133,205,75,211,224,162,222,207,101,67,211,187,43,44,185,114,44,178,248,8,38,153,99,247,142,30,43,169,219,131,66,30,19,55,136,7,248,213,211,53,8,81,166,86,16,50,106,185,171,38,168,199,131,190,56,177,117,80,195,120,174,88,28,163,51,184,31,137,196,71,100,191,242,116,181,195,188,99,251,38,131,208,57,204,203,59,9,9,43,56,11,158,220,144,14,75,137,211,50,109,143,140,215,9,175,179,154,77,162,226,168,126,127,200,19,244,174,8,52,15,199,43,77,94,247,152,133,214,241,224,78,66,244,85,75,229,233,40,112,100,30,179,180,71,69,181,81,239,24,41,37,212,154,112,127,96,81,218,122,121,161,250,186,98,163,66,84,138,209,80,60,1,240,246,98,44,124,27,159,40,187,85,109,182,236,115,141,202,101,66,144,235,166,138,175,117,202,219,26,113,159,67,192,211,219,65,237,20,166,179,192,112,166,170,246,22,133,168,236,239,59,195,201,221,208,153,84,117,180,140,147,118,12,208,220,1,30,92,203,241,46,57,77,120,220,29,15,201,158,105,
+56,102,194,14,83,102,93,167,172,66,221,248,84,232,171,0,50,204,218,223,167,247,253,205,42,180,198,99,28,80,1,239,170,34,192,103,140,172,162,128,85,238,92,179,180,12,202,180,213,31,58,53,133,233,182,218,190,90,231,91,219,118,193,224,40,60,191,201,141,137,196,229,52,1,121,19,223,135,201,44,132,97,26,74,158,212,236,118,163,19,203,20,32,227,87,2,153,65,95,11,120,2,21,158,0,208,196,148,89,128,43,14,135,9,28,91,213,150,73,27,173,141,59,182,182,122,86,37,115,52,37,78,5,182,28,135,13,200,104,119,164,64,152,80,99,162,82,81,13,111,48,243,21,193,192,197,47,247,199,119,147,52,66,84,6,63,129,241,4,29,7,80,67,229,202,70,135,46,96,29,15,43,70,46,167,42,67,244,117,101,23,61,35,118,142,235,196,147,74,10,156,21,180,48,93,11,183,142,218,154,88,187,187,123,57,212,89,9,127,24,180,233,246,187,173,141,27,179,189,181,41,177,202,171,165,64,217,223,77,68,174,49,195,94,140,135,217,68,68,40,17,183,72,157,136,234,
+250,208,236,238,249,26,173,114,152,26,139,185,87,119,77,110,38,104,75,247,201,216,27,57,226,134,29,98,109,115,79,216,196,3,245,149,76,162,204,73,29,97,224,54,137,246,37,73,33,86,18,235,58,19,241,26,182,224,38,192,159,68,143,37,177,182,166,114,226,102,238,213,87,238,53,134,117,18,206,14,224,125,218,187,75,116,166,172,46,12,221,33,114,247,192,163,177,182,252,238,19,17,20,71,216,194,217,11,45,159,89,172,196,228,35,170,168,118,92,207,136,215,80,99,181,29,95,83,153,79,135,20,252,62,105,25,80,187,141,181,139,77,182,86,108,79,81,195,164,41,185,222,92,95,115,110,95,215,71,200,4,95,212,227,113,215,140,3,21,55,173,113,70,114,49,161,165,52,77,175,114,35,76,86,88,61,2,136,253,112,72,43,158,18,206,91,183,18,3,242,14,195,191,174,220,17,187,227,177,185,44,173,87,239,128,86,15,149,152,74,60,131,91,54,142,152,132,187,50,50,161,239,238,32,40,93,166,170,238,91,161,109,86,37,75,73,110,245,36,124,93,89,74,220,222,230,
+145,203,247,87,18,68,63,113,9,143,243,247,246,248,130,129,66,92,155,80,131,178,88,167,141,98,235,164,83,155,1,35,183,140,25,181,253,233,41,78,160,109,218,160,14,20,108,155,35,76,100,244,99,37,235,178,200,243,131,179,134,234,90,234,100,217,92,125,92,1,143,159,246,18,196,0,5,111,238,168,194,55,123,114,68,216,229,22,221,123,182,38,48,110,54,137,184,28,154,9,117,67,109,204,64,167,121,26,104,250,128,140,38,198,0,55,49,42,58,24,141,91,3,98,108,220,210,231,139,55,196,91,169,47,137,34,162,19,133,213,43,255,145,0,89,219,152,18,146,237,157,227,113,214,71,163,90,171,142,145,143,165,150,113,179,153,38,87,63,96,234,188,180,201,178,200,103,196,1,121,6,146,104,203,150,216,64,219,36,29,174,115,169,250,105,83,189,76,181,107,132,178,238,205,89,28,223,58,25,56,39,219,35,15,222,50,141,72,132,157,59,102,205,207,150,202,216,155,13,34,130,145,38,178,69,118,187,63,146,245,183,66,104,81,36,170,216,227,17,217,231,23,124,17,251,60,
+125,229,73,142,219,146,45,148,118,215,89,8,94,65,86,233,107,212,11,52,54,43,142,16,244,123,181,117,1,199,25,27,163,174,21,248,96,121,28,119,208,60,119,87,91,250,51,183,135,147,215,197,10,184,41,15,73,236,90,36,212,148,188,185,15,228,212,21,75,141,87,141,173,200,234,156,70,170,203,86,87,35,242,158,41,176,51,109,251,199,176,172,231,174,121,119,103,183,245,130,30,235,101,236,14,144,141,46,248,20,175,105,63,219,107,219,167,55,190,244,245,1,48,225,133,1,158,114,45,18,145,160,106,1,135,192,47,31,150,111,237,137,163,94,87,224,87,149,3,168,80,136,75,141,223,54,77,72,196,52,121,122,163,116,87,143,50,181,115,157,148,123,149,105,186,34,199,194,131,221,192,198,129,176,112,176,65,240,253,191,180,189,231,143,179,203,149,39,246,175,92,47,176,11,205,98,70,24,175,237,197,120,13,127,88,96,97,195,128,7,48,188,11,24,176,97,64,215,163,59,59,194,206,232,10,87,119,52,35,96,22,232,102,106,178,217,204,205,156,201,110,198,102,206,153,205,
+156,115,142,205,102,142,15,115,14,102,191,175,164,189,146,37,89,243,97,128,110,176,78,61,167,78,157,115,170,234,84,61,224,143,167,162,4,141,246,33,76,218,118,92,185,197,54,210,81,168,168,52,191,90,199,215,107,116,110,181,22,156,78,233,214,193,82,217,136,122,138,46,53,217,128,46,91,125,243,6,1,157,181,180,247,156,129,238,158,135,83,143,200,123,126,200,34,41,54,102,125,181,67,235,93,215,105,214,4,233,104,204,188,236,236,214,160,31,23,81,86,77,215,35,112,27,234,90,11,70,211,180,92,123,241,12,28,211,20,227,117,72,96,229,142,97,208,130,142,114,51,134,209,3,154,94,43,23,240,105,224,237,69,191,166,116,182,214,243,158,30,245,209,245,208,209,120,13,53,140,145,15,7,7,145,115,142,129,16,57,163,99,161,217,65,153,163,253,142,133,226,227,247,67,65,191,109,35,11,228,208,201,236,172,96,30,18,18,183,107,192,36,12,108,61,13,173,211,214,70,138,236,66,207,34,78,30,210,38,194,230,156,142,184,4,76,133,144,86,97,247,214,5,241,136,69,
+80,204,34,225,180,210,38,174,14,52,158,213,17,140,77,137,183,138,89,252,14,126,221,178,238,143,97,185,164,223,59,42,210,162,150,64,37,142,94,154,41,58,35,77,247,37,5,58,77,172,31,229,35,175,101,129,1,19,246,12,59,42,211,211,112,4,199,107,193,57,67,217,251,168,191,127,29,109,54,175,206,121,1,160,245,195,221,26,198,164,143,236,246,202,100,215,193,239,16,253,241,103,113,1,40,227,198,85,16,174,121,226,119,58,237,176,150,172,77,85,105,29,14,15,201,226,151,199,34,99,89,95,48,23,228,239,228,219,149,169,232,74,26,20,175,5,58,229,234,160,112,133,189,30,71,35,232,205,134,148,238,88,250,36,205,246,160,179,234,45,251,211,208,102,98,41,21,132,11,155,168,62,189,216,202,108,233,70,109,237,231,222,247,249,141,177,238,138,215,48,241,83,170,55,57,8,160,100,139,92,202,38,87,139,19,90,189,207,218,186,83,124,241,117,142,161,12,213,86,40,223,10,33,130,26,98,51,213,226,19,218,94,116,112,206,69,168,15,164,194,238,70,100,202,246,128,
+103,229,59,40,220,99,227,35,54,34,219,164,147,32,197,37,174,121,31,24,93,86,211,45,13,55,203,50,31,248,4,167,60,135,145,34,21,44,90,226,208,195,31,101,238,138,172,58,50,68,157,148,210,48,80,98,74,19,58,165,96,80,104,194,185,6,125,64,80,27,189,151,231,110,90,28,8,144,141,103,199,182,18,204,205,243,248,236,228,89,250,102,13,229,98,118,75,136,62,174,132,242,11,169,96,91,169,168,38,239,169,100,146,12,98,40,246,24,83,125,105,60,121,77,224,216,37,170,223,75,201,211,87,45,143,92,43,27,5,225,26,128,142,211,55,130,243,33,133,50,122,16,124,70,107,92,147,182,87,116,148,145,95,139,171,86,187,86,80,109,133,237,24,170,49,63,60,73,198,15,34,187,110,83,113,120,238,28,189,145,241,160,75,106,58,195,246,107,248,108,60,238,186,90,126,238,216,110,221,167,125,124,18,123,94,153,149,208,179,118,215,157,59,170,4,91,47,25,45,181,211,210,218,227,112,13,122,211,64,91,97,233,115,29,137,188,117,76,17,182,108,170,212,15,79,164,
+242,86,169,198,41,67,129,161,223,91,93,25,144,166,150,99,114,175,117,247,250,124,46,153,169,51,166,124,118,109,70,78,95,222,143,123,217,91,238,56,63,2,201,11,10,147,253,93,183,167,41,121,203,90,161,231,5,93,70,211,165,68,189,94,111,23,176,134,57,220,117,84,39,187,252,89,251,202,142,177,206,254,219,13,156,111,231,99,108,17,214,140,139,105,170,106,108,127,179,230,182,179,72,182,109,43,114,23,239,176,30,246,133,240,186,25,127,166,199,5,5,38,251,37,119,52,6,188,167,102,144,220,72,175,108,203,92,35,58,136,90,181,193,113,203,187,117,10,85,57,97,137,177,12,123,214,250,13,1,196,22,24,245,246,204,222,233,40,236,225,166,150,161,173,30,153,109,209,94,123,136,68,121,71,185,145,222,226,91,181,106,243,210,201,154,158,207,245,173,150,76,167,191,190,67,167,123,252,138,70,88,50,54,199,120,70,115,236,5,244,251,49,49,135,12,202,142,79,6,141,42,203,245,134,241,135,36,86,102,170,2,216,154,163,208,222,70,121,6,236,208,221,141,161,216,105,
+89,74,127,146,55,186,10,184,144,122,241,213,99,244,237,50,54,64,219,124,104,2,95,113,23,5,132,96,71,158,192,62,153,250,18,213,52,107,125,125,235,62,29,171,254,141,42,234,218,51,39,88,105,183,224,209,194,80,152,204,251,179,177,129,47,214,56,144,252,34,60,115,91,4,96,61,146,100,59,204,90,146,173,48,68,110,16,11,50,199,208,6,98,105,78,44,242,86,250,22,63,26,156,46,201,150,52,59,26,196,15,91,0,158,200,174,27,91,2,121,95,215,171,223,27,174,218,201,203,97,233,7,69,234,229,197,120,215,172,55,102,89,114,51,123,131,126,103,172,161,253,13,180,156,24,28,119,229,204,209,193,202,102,61,99,32,28,218,2,48,111,43,146,93,133,43,55,83,141,12,88,187,239,80,238,173,145,37,201,97,216,149,243,209,250,126,40,190,119,119,125,10,222,82,151,250,249,139,1,204,91,87,148,146,68,208,49,140,144,10,232,80,104,30,154,231,75,65,205,215,37,236,132,234,219,110,159,151,176,199,132,147,158,112,1,78,132,77,251,153,164,43,63,200,32,207,
+176,63,92,185,16,155,206,83,93,240,112,185,179,221,210,110,63,61,78,96,63,113,223,62,163,62,147,174,202,39,238,215,154,36,159,160,47,217,75,24,248,83,45,224,76,33,62,119,112,251,153,68,136,63,147,47,190,189,102,33,247,2,9,216,229,193,22,117,94,249,110,127,157,239,119,233,197,249,76,222,210,158,127,93,15,41,178,6,227,26,122,113,131,213,224,109,187,182,238,126,15,5,231,24,56,16,119,237,6,191,7,135,122,75,148,136,123,37,107,220,207,36,234,40,42,46,97,27,13,135,81,167,214,226,102,121,4,123,213,225,246,59,246,4,62,139,93,194,62,147,128,254,195,60,43,27,122,57,13,228,142,205,109,109,197,97,255,154,188,253,103,241,55,137,15,114,123,176,196,156,125,249,133,141,176,57,95,29,191,87,127,161,250,120,64,218,123,40,217,62,233,7,20,28,3,134,115,243,73,227,212,85,230,135,200,59,200,103,3,196,159,201,22,55,73,63,215,97,123,34,248,108,215,252,54,255,254,194,111,83,235,110,254,161,14,62,240,73,59,17,151,245,73,59,252,254,
+233,51,105,0,62,145,181,120,5,20,250,240,216,22,127,176,56,193,191,199,126,214,213,158,218,244,76,210,45,249,191,119,28,126,87,251,167,95,144,191,107,94,252,99,199,251,15,237,199,245,65,186,129,188,16,58,187,218,253,225,95,200,111,245,111,255,51,233,65,31,22,254,67,209,9,249,255,91,23,18,203,199,186,248,221,122,193,63,147,110,59,144,135,206,0,142,1,253,59,198,245,23,253,66,234,87,82,101,64,124,204,83,206,111,155,87,216,207,164,232,116,37,51,179,13,243,54,73,79,56,127,143,223,70,9,245,217,86,61,94,2,1,39,232,247,249,167,124,181,229,104,171,246,72,121,95,205,124,190,60,17,175,102,221,255,30,255,10,62,140,183,0,169,211,149,175,43,119,0,249,135,218,167,149,240,155,246,128,63,147,36,178,173,113,130,246,242,204,205,245,243,229,234,131,223,101,215,234,99,114,39,233,204,22,102,15,62,183,142,135,16,178,137,185,86,221,252,174,245,43,17,125,110,96,168,197,65,103,232,38,206,189,253,221,254,250,80,45,170,50,28,79,80,206,237,239,
+146,119,255,65,46,55,128,147,207,107,189,207,215,67,76,166,179,197,223,56,112,58,228,216,71,238,216,80,111,181,213,170,144,49,185,27,52,41,24,20,142,206,246,142,240,16,93,157,214,88,178,73,232,178,175,238,95,234,238,60,84,150,91,87,234,244,220,193,117,122,1,6,147,232,25,129,121,191,156,89,60,182,178,115,120,60,168,15,149,242,233,84,223,200,161,93,54,81,64,101,147,4,86,255,129,94,59,49,28,184,16,115,192,166,244,188,92,249,190,250,182,61,214,247,245,218,187,205,190,191,200,219,18,244,121,149,244,243,149,70,190,167,182,90,40,101,164,222,165,234,152,244,109,14,168,229,48,79,179,84,118,118,114,126,56,190,87,46,179,104,205,119,134,213,65,88,232,246,210,80,122,87,191,14,29,250,111,191,255,197,255,246,229,143,126,252,237,47,127,173,255,179,31,125,245,119,31,121,0,190,252,5,219,255,242,227,47,190,254,230,135,31,112,152,175,191,248,225,143,126,250,147,191,254,242,231,95,252,244,235,15,240,207,71,139,31,253,248,167,31,105,88,127,29,132,243,
+43,17,127,252,197,199,239,244,255,234,203,159,125,245,209,250,47,174,53,223,126,245,197,85,214,143,126,246,213,15,63,167,21,248,132,59,250,250,103,95,125,243,205,47,196,124,210,229,151,201,1,254,9,51,174,126,134,0,125,241,231,63,255,183,63,249,37,166,230,223,124,7,57,245,75,208,205,191,252,226,79,254,225,103,63,250,230,219,191,253,242,175,191,248,217,215,63,250,225,103,253,190,247,239,190,249,242,239,126,240,47,190,248,187,63,250,53,198,15,104,204,199,147,15,252,204,247,254,231,175,190,253,0,217,124,239,143,254,248,139,127,255,127,252,213,143,190,253,234,151,128,153,239,114,254,135,175,254,254,219,239,253,171,79,48,155,63,254,226,215,178,187,254,87,63,248,103,127,252,197,191,253,200,139,251,189,255,230,79,175,50,254,252,203,255,248,213,143,191,253,242,187,66,126,149,245,245,79,254,225,87,133,239,216,243,189,63,250,46,116,232,79,254,225,19,68,232,183,34,132,254,207,175,191,254,155,15,48,208,247,254,232,251,191,196,5,125,23,22,244,171,126,126,240,159,255,
+145,120,165,239,122,247,203,255,50,4,127,242,15,87,226,251,191,0,26,125,23,103,244,95,255,26,206,232,131,233,31,129,52,250,215,255,250,191,191,7,39,110,96,31,121,110,247,255,37,207,45,34,243,152,151,154,253,72,172,119,177,156,226,131,71,243,59,232,158,130,247,128,225,60,206,125,54,36,160,115,64,28,36,31,174,6,64,146,201,219,136,33,228,39,103,209,237,226,189,245,172,162,146,169,156,39,26,161,142,111,134,115,2,95,43,226,155,69,26,28,10,17,119,141,102,149,27,3,199,98,126,85,121,235,155,131,222,155,180,109,18,213,196,115,164,114,161,239,216,230,172,97,114,58,175,164,131,124,221,166,107,105,69,68,155,7,122,114,182,112,103,104,4,90,111,121,208,178,148,69,130,70,222,155,194,178,199,132,56,243,110,213,21,170,158,103,184,54,37,245,102,82,252,54,45,56,152,31,23,206,225,2,124,219,133,4,157,3,245,102,186,178,222,36,185,5,151,22,69,144,118,232,16,9,117,43,146,32,114,67,14,8,18,80,130,93,246,251,228,46,65,208,121,149,41,177,
+155,162,161,171,35,226,241,76,120,34,169,218,138,186,151,101,45,143,76,99,71,234,196,78,1,39,81,234,128,85,3,37,122,0,137,233,107,229,103,37,231,69,168,139,135,128,248,145,178,220,63,114,212,16,246,164,35,9,195,211,24,22,108,228,116,226,82,209,26,193,137,158,95,10,73,130,62,220,242,221,200,162,106,133,119,125,74,211,69,65,78,215,120,71,181,136,232,103,101,249,134,157,211,91,176,219,41,45,150,81,232,15,124,31,172,11,98,60,220,54,69,173,139,197,35,82,250,142,55,99,15,210,242,154,57,210,219,228,52,179,39,186,132,51,111,25,27,49,61,198,213,238,31,4,106,160,9,62,80,114,80,181,212,133,230,68,177,146,190,86,146,3,5,103,214,8,213,101,5,71,144,227,123,150,107,239,153,232,16,171,2,15,232,55,110,212,19,188,157,187,13,92,223,200,90,203,130,64,101,40,183,131,178,84,153,242,146,106,103,36,185,65,244,121,64,43,220,179,179,131,103,49,38,19,51,223,237,4,9,124,249,105,2,103,114,33,86,235,109,233,88,71,205,101,253,142,
+108,148,16,14,218,99,67,3,11,144,114,240,34,120,160,44,224,14,230,7,146,139,224,163,8,13,88,204,94,17,55,221,89,205,84,216,0,147,216,220,38,11,182,218,43,132,33,205,208,157,46,62,76,101,163,192,118,201,155,21,9,167,203,244,80,33,218,66,67,190,185,161,199,243,117,113,146,205,47,48,172,114,206,179,179,28,25,234,74,47,45,202,32,243,28,155,140,245,105,202,238,157,157,109,184,237,111,21,65,160,98,185,21,162,85,111,37,154,113,133,203,122,19,196,230,3,37,1,133,145,26,116,160,173,187,213,219,156,15,199,148,101,64,69,93,194,61,90,230,14,24,63,152,30,184,120,209,205,155,34,147,46,140,125,245,4,232,61,61,182,165,40,135,153,165,211,56,249,205,106,249,100,137,200,129,86,217,3,173,213,211,172,24,1,201,208,155,45,43,164,184,176,241,137,84,211,216,163,129,161,46,103,151,164,118,149,139,231,198,196,120,150,10,88,30,107,116,231,44,208,1,144,204,170,122,216,169,148,4,233,4,11,103,29,176,190,86,249,246,125,46,24,99,24,205,7,
+110,195,77,245,211,134,16,230,254,217,79,20,31,90,42,130,131,199,95,39,184,229,80,11,169,15,129,244,193,16,233,145,115,120,228,198,129,16,1,84,157,63,197,238,135,207,4,60,123,223,201,230,178,181,9,116,117,160,8,225,15,125,62,118,4,103,110,134,180,186,162,159,174,208,36,242,123,98,155,227,129,107,92,16,41,25,132,200,65,224,57,217,141,213,240,180,187,25,54,59,49,174,223,152,245,26,243,75,72,204,136,111,238,148,89,9,30,235,86,54,106,102,1,211,253,132,42,160,101,54,201,190,119,40,170,221,216,48,157,119,191,240,214,18,6,179,216,162,124,222,118,241,29,59,43,126,44,100,208,247,195,54,106,238,119,251,12,143,119,113,195,145,109,75,219,15,152,251,4,10,16,223,163,197,106,53,58,172,65,135,210,231,165,180,174,139,179,230,102,188,181,97,88,86,38,230,254,32,187,15,234,139,46,43,74,141,169,228,130,193,4,106,18,188,220,86,50,1,199,107,198,38,132,152,152,134,75,211,189,193,216,47,251,183,30,184,105,161,171,54,64,111,47,227,244,223,
+186,185,102,209,215,212,235,181,193,78,22,31,21,83,241,40,196,251,187,49,137,127,125,84,14,17,156,213,177,81,125,241,19,57,193,92,29,102,66,208,205,153,248,46,186,226,9,0,81,187,155,125,213,143,210,171,33,57,52,56,55,195,99,41,151,14,148,199,118,219,195,113,24,133,143,117,124,139,161,206,210,155,74,147,155,180,46,91,105,167,75,188,40,49,147,44,123,51,122,31,145,100,95,82,187,117,205,43,187,254,246,34,220,179,31,217,7,235,105,75,40,162,109,108,29,176,83,230,147,199,10,238,2,35,36,120,1,199,77,175,56,182,213,89,214,60,107,250,78,179,141,200,76,59,24,94,171,72,22,146,222,138,84,203,78,83,9,83,193,107,184,128,110,128,6,28,99,240,169,151,126,54,171,48,52,237,142,175,23,96,102,218,244,194,139,161,23,22,181,44,232,155,78,16,191,126,2,207,81,229,252,99,56,68,120,30,18,60,6,104,24,98,106,128,116,124,36,32,216,102,97,102,200,69,59,124,126,132,108,157,96,48,64,80,172,23,15,48,136,171,135,118,120,162,55,110,
+220,97,35,217,24,37,217,41,52,228,24,112,178,149,126,21,178,200,55,197,199,123,173,236,101,234,177,8,158,230,18,80,13,199,183,44,58,46,255,0,220,175,223,45,227,102,35,5,213,149,156,243,90,231,66,125,201,28,138,135,251,91,158,129,104,242,63,14,111,46,210,248,173,245,44,115,213,207,18,102,53,118,39,24,19,160,19,55,147,79,108,61,3,239,226,110,141,45,13,15,96,73,110,253,142,175,169,40,94,121,180,138,18,192,175,102,206,82,213,77,56,0,142,100,206,111,53,136,250,249,88,179,187,214,93,71,235,29,239,129,204,26,243,228,89,43,82,74,35,20,226,253,94,88,200,64,81,193,218,42,54,99,17,27,114,97,23,241,224,123,237,100,120,77,91,237,237,40,64,25,46,245,76,142,33,181,174,38,232,210,202,20,26,104,189,67,59,52,244,214,108,203,70,10,169,36,86,179,173,30,119,222,172,159,136,170,121,15,23,1,79,129,175,1,145,215,178,58,223,143,202,0,145,158,233,100,180,180,172,212,147,171,110,40,179,88,26,2,186,16,186,235,18,67,199,112,
+171,6,213,164,76,80,39,60,195,23,196,7,44,233,42,60,233,205,162,132,7,228,5,134,139,210,45,1,5,255,184,159,96,229,53,15,52,172,155,48,75,71,32,160,71,220,68,207,187,67,38,133,98,112,98,24,92,199,203,131,231,96,136,220,206,48,125,218,27,158,34,208,249,65,175,136,103,253,230,124,216,103,172,34,151,182,182,210,22,179,0,142,35,12,210,182,178,67,203,49,114,185,43,100,99,207,106,247,241,70,154,174,41,242,45,242,248,184,90,27,80,209,110,132,11,222,137,26,59,215,241,149,196,14,89,102,202,163,119,124,103,196,220,114,15,207,1,140,127,168,161,48,202,148,154,123,58,164,50,37,226,231,113,250,41,224,242,73,200,224,209,107,250,89,91,87,57,5,11,76,132,108,110,135,186,173,167,112,85,211,214,168,219,41,141,166,92,205,195,179,65,81,15,153,146,2,149,8,167,106,125,213,185,22,143,67,104,244,144,127,237,120,154,18,233,27,146,244,82,157,131,11,131,166,149,218,156,239,219,154,1,57,58,182,146,184,40,67,133,189,5,1,137,119,161,153,
+92,3,49,197,52,195,154,152,50,221,168,158,153,161,182,50,173,181,110,21,57,53,106,143,31,82,21,46,116,61,132,97,108,139,234,165,150,102,87,222,217,177,46,7,162,170,53,108,91,168,48,112,72,220,217,40,68,153,212,64,27,11,28,13,78,6,210,91,143,211,132,132,30,16,64,250,225,67,22,172,15,191,113,160,140,221,19,59,241,52,194,41,100,133,103,76,233,245,110,82,20,144,1,236,142,20,84,117,30,3,245,32,49,170,137,147,76,221,144,160,189,10,84,212,45,121,81,86,144,247,65,119,83,135,70,181,248,24,31,235,204,11,94,206,4,17,12,232,57,73,27,248,54,79,225,99,40,77,217,131,178,200,28,52,104,71,205,22,102,65,3,201,200,177,219,169,57,121,188,151,185,218,25,167,245,238,177,53,33,242,210,195,182,212,54,167,187,69,101,237,66,125,35,19,150,66,237,230,105,39,27,34,199,229,92,210,81,124,246,74,39,162,53,247,174,237,91,173,48,163,206,9,68,220,208,98,180,199,7,186,197,134,188,212,40,40,80,76,232,227,241,4,235,247,216,173,
+192,3,225,156,90,30,217,138,109,29,59,6,198,32,161,14,110,144,172,198,57,157,105,69,172,235,247,138,133,28,191,35,5,88,221,86,136,161,105,167,61,234,54,65,221,138,81,239,212,100,77,169,94,227,51,40,116,95,27,133,0,153,217,43,200,237,115,133,163,111,84,173,65,253,83,168,248,54,120,20,12,9,222,1,52,76,117,190,105,115,86,84,217,243,184,87,6,95,87,184,216,42,169,184,172,25,231,185,112,225,147,236,119,244,234,51,211,32,242,93,207,14,248,167,170,245,109,213,11,207,108,140,197,33,23,149,215,38,220,187,64,27,129,119,84,49,83,75,206,230,186,220,221,143,39,243,50,231,76,177,142,36,182,237,246,108,230,61,206,239,169,94,162,14,147,204,106,244,36,21,155,35,130,62,12,65,51,68,13,98,106,71,218,167,182,147,142,93,104,167,187,157,95,13,169,80,5,201,67,121,25,27,227,78,178,238,197,67,88,213,77,10,63,187,193,134,217,188,105,242,35,134,251,28,55,201,12,81,108,166,117,86,61,202,25,141,198,94,181,195,208,106,110,110,64,54,
+191,99,90,189,229,142,35,216,177,213,58,137,226,203,66,246,24,13,71,9,209,24,87,216,73,107,62,188,81,148,197,82,125,158,170,81,87,143,199,45,200,45,102,15,114,194,83,19,108,0,192,161,38,112,73,107,55,221,33,148,114,151,65,224,14,68,11,25,10,63,130,202,172,251,143,156,61,237,173,223,234,194,166,8,20,142,48,201,200,87,102,214,96,89,122,27,70,12,128,209,107,130,50,188,214,219,109,130,50,125,74,60,27,150,20,226,194,75,63,59,98,167,83,109,37,21,133,157,116,48,134,81,151,98,166,103,11,109,127,4,72,141,236,29,216,254,52,164,91,148,192,54,199,205,243,215,58,231,189,85,3,239,24,70,142,76,215,208,166,116,199,82,4,151,128,137,85,143,12,40,169,102,219,177,7,107,171,14,49,211,52,178,72,189,114,81,19,102,141,29,178,162,61,218,221,160,58,122,244,69,140,126,103,155,228,229,149,20,76,150,145,88,85,151,80,224,39,185,59,128,26,145,125,14,78,178,152,59,187,51,90,211,212,79,169,251,12,38,161,205,56,50,26,4,155,176,
+184,26,57,98,55,58,46,75,221,99,68,7,173,187,71,98,128,191,73,73,215,33,126,225,205,60,18,154,173,13,186,149,184,174,71,12,135,199,144,53,31,174,56,144,125,49,116,249,116,228,236,143,114,27,247,110,205,141,244,23,17,2,170,212,76,129,13,107,236,86,20,16,194,95,218,176,164,45,61,133,109,195,83,124,183,229,15,223,231,3,111,160,168,182,7,21,189,81,205,244,33,157,26,113,10,42,227,134,228,129,42,121,160,169,159,30,40,138,235,73,104,206,238,111,155,136,102,63,93,228,39,176,117,90,40,124,32,153,189,175,103,77,234,98,187,3,36,119,251,58,108,65,186,116,136,97,164,8,153,19,203,50,188,135,125,227,230,254,146,56,199,82,104,132,100,216,83,21,103,214,116,57,179,219,138,193,150,132,250,80,135,166,165,216,97,130,27,75,33,208,251,114,150,39,186,172,119,107,28,119,17,215,108,235,158,99,215,178,190,99,171,133,17,187,168,119,12,59,223,239,162,142,1,206,93,54,158,70,91,19,43,235,47,67,168,5,243,163,162,108,62,191,238,39,166,154,
+91,31,56,195,135,46,98,4,235,96,103,203,153,132,183,41,41,192,242,210,85,211,232,24,207,203,148,176,210,236,151,107,71,150,212,104,39,55,79,242,115,83,161,58,55,166,30,68,39,161,91,159,70,234,147,142,133,33,193,162,247,168,2,122,95,252,60,247,243,168,38,55,119,140,141,91,146,173,0,51,135,244,193,94,25,254,110,177,140,125,126,29,204,179,121,108,33,20,66,241,246,126,124,103,176,35,31,224,26,183,103,168,32,33,145,239,79,195,247,126,99,158,125,36,115,71,143,226,217,40,51,83,251,245,201,39,176,200,197,229,30,42,13,31,214,45,212,168,125,60,142,125,245,24,31,48,223,199,115,212,99,61,124,99,64,16,225,174,183,137,140,20,45,55,179,219,168,140,92,187,63,111,138,104,252,62,157,213,238,21,240,246,243,124,39,190,201,154,16,11,239,126,127,113,251,234,170,4,70,9,228,138,181,58,152,32,6,66,40,170,183,126,201,222,8,139,1,158,143,227,211,169,14,171,35,42,163,147,21,173,179,157,200,93,155,104,252,172,130,196,132,33,62,120,36,221,
+125,174,210,203,244,72,43,104,127,133,28,109,81,51,102,93,224,87,18,246,203,135,190,83,80,220,182,168,40,172,103,196,179,241,111,137,204,57,86,189,221,207,168,99,11,152,21,183,161,88,42,175,93,39,200,76,140,53,187,62,0,178,155,157,118,179,223,188,30,16,183,228,215,186,152,183,77,227,33,246,1,194,3,10,155,94,223,203,162,251,94,166,92,173,154,171,65,165,192,249,72,71,60,53,16,200,166,7,154,172,94,40,207,135,119,170,80,205,35,5,231,254,96,166,48,159,121,122,175,189,30,157,136,244,49,103,23,232,125,245,93,193,61,78,120,173,80,39,199,169,213,204,15,181,45,24,3,55,8,50,53,161,220,117,39,205,23,196,206,120,8,93,211,86,60,181,91,107,3,188,170,87,171,153,46,214,44,88,30,32,134,24,207,217,237,57,14,142,76,49,114,129,153,28,42,40,212,136,163,174,160,221,81,165,230,133,250,11,17,42,13,191,69,200,168,93,114,115,23,144,164,124,68,233,65,32,56,214,179,206,73,141,119,217,200,73,197,54,99,48,226,244,35,36,211,202,
+52,164,45,223,10,85,177,44,106,128,120,104,234,44,169,24,27,72,117,125,159,126,151,97,71,239,17,207,115,213,115,118,158,188,110,226,163,126,119,17,196,55,110,187,73,80,49,135,123,154,11,153,219,92,236,142,156,68,134,232,189,93,123,201,80,155,30,9,16,210,28,124,3,180,85,189,99,154,220,201,132,177,239,210,200,3,174,93,243,222,207,249,230,70,56,80,122,138,177,21,193,33,194,110,31,63,208,248,136,2,251,25,174,87,148,182,212,99,87,3,19,239,192,41,55,169,185,5,123,238,224,219,161,107,183,200,14,19,100,160,192,148,120,132,180,48,243,217,127,238,80,199,27,76,120,185,86,122,215,165,214,194,144,21,54,137,78,211,163,129,211,100,238,6,219,130,248,61,26,139,182,33,196,18,90,126,121,94,6,175,147,233,136,120,33,191,59,22,96,23,145,156,106,154,49,153,213,219,153,21,162,238,141,199,211,155,163,202,52,79,20,44,96,126,167,150,107,98,18,36,216,128,164,146,238,227,154,75,6,33,203,104,188,137,53,100,141,181,214,167,242,232,235,42,137,94,
+143,150,136,110,77,235,30,52,239,8,229,235,14,76,30,175,30,101,69,73,58,86,214,175,77,105,146,119,155,106,123,47,36,81,45,64,206,97,226,88,59,153,163,135,206,242,207,2,230,171,75,189,9,184,215,137,219,118,80,123,49,141,211,190,56,11,86,51,131,156,169,9,3,27,192,171,122,181,92,109,252,182,221,111,77,160,177,214,235,138,60,71,114,17,111,241,246,61,114,153,109,75,236,96,105,36,120,100,81,171,1,168,157,115,127,164,156,211,93,83,92,128,44,115,56,175,24,92,9,66,49,45,237,41,50,192,104,188,103,168,114,151,66,48,70,207,45,218,84,55,10,4,0,91,207,204,14,142,109,140,242,97,172,142,63,40,180,145,221,0,39,75,223,10,82,22,170,59,63,182,107,192,108,11,221,184,235,206,184,213,37,65,70,9,250,83,232,8,44,24,114,12,203,166,51,16,187,36,193,14,119,93,11,101,26,243,112,141,242,37,108,184,31,58,113,111,111,240,187,180,232,142,56,238,94,216,176,144,57,196,71,91,237,231,12,239,6,137,99,10,208,181,156,124,51,232,
+204,218,165,67,188,251,50,222,222,151,4,67,164,56,7,72,29,61,99,118,132,231,0,39,174,147,141,97,178,241,220,36,71,2,159,89,64,135,26,89,156,161,8,247,15,82,76,172,39,165,83,159,87,114,188,188,38,201,198,232,97,189,247,234,215,251,217,243,61,57,16,122,228,207,31,221,249,90,64,214,244,144,144,241,87,233,86,163,133,151,43,45,78,112,156,1,189,79,101,236,51,31,240,197,71,161,192,28,214,106,145,237,29,167,242,89,65,122,62,56,144,185,253,125,186,19,18,165,108,52,66,133,134,175,10,156,166,163,148,128,242,112,249,144,179,27,136,89,84,231,37,237,153,102,24,40,167,122,3,162,186,178,103,55,194,85,47,175,157,205,174,209,133,36,222,64,95,82,222,220,240,233,141,76,215,161,244,212,168,94,81,140,6,168,46,250,40,130,155,11,18,102,55,164,50,206,78,51,18,231,73,187,214,222,220,249,242,75,172,82,243,148,124,80,23,210,60,74,21,190,118,76,213,143,236,92,89,17,159,154,17,254,4,58,64,189,128,208,241,130,63,171,234,198,166,189,
+39,119,47,153,191,220,155,67,175,202,156,82,48,83,148,33,213,214,136,92,245,93,64,242,135,180,183,162,151,149,61,56,151,70,174,204,183,226,205,1,101,75,236,32,205,146,97,64,119,52,172,40,235,193,208,107,212,11,181,75,206,104,80,195,101,54,182,200,195,198,54,214,188,234,129,13,63,34,205,116,84,8,222,186,250,180,145,16,227,175,5,17,59,253,114,225,210,156,179,10,169,98,206,82,6,84,190,122,154,173,226,75,235,48,246,70,143,136,156,54,147,200,5,103,142,103,44,225,42,29,223,197,34,82,71,168,244,8,125,17,219,93,143,59,215,227,139,34,169,190,51,38,179,121,181,75,60,219,65,122,79,17,174,41,8,98,17,80,219,82,157,210,222,237,85,18,232,61,190,38,136,157,103,78,250,225,26,169,224,245,156,210,122,59,82,86,30,210,54,69,173,65,188,28,10,2,165,91,175,44,167,5,129,147,20,114,60,209,161,62,163,245,192,28,30,65,147,161,41,54,0,30,50,75,138,73,6,115,80,26,33,231,252,117,130,122,28,243,38,150,39,187,117,89,91,244,
+136,47,254,164,102,94,182,46,74,21,212,162,84,93,148,187,36,191,222,252,50,92,149,242,29,61,87,57,142,216,51,20,187,255,158,201,25,15,238,232,237,144,63,227,177,89,218,168,218,184,71,230,160,35,248,151,57,109,118,32,171,220,204,105,247,34,231,29,158,245,235,92,245,190,28,55,23,54,102,227,6,97,153,105,134,205,42,100,164,138,129,68,8,215,116,174,114,97,15,141,247,134,23,4,213,175,22,50,69,210,238,58,105,169,169,69,24,134,3,215,166,151,82,150,96,120,96,188,203,164,68,183,0,64,156,79,168,21,40,10,54,156,2,125,185,186,23,41,74,122,221,219,187,152,253,61,112,234,176,100,17,226,109,155,225,168,44,206,15,186,233,171,240,184,8,201,78,169,146,106,163,210,161,165,67,38,222,52,137,69,229,116,252,50,176,153,135,108,205,208,233,178,125,220,171,164,16,126,45,5,89,7,121,56,132,194,197,157,241,184,97,175,158,132,91,101,222,116,8,42,174,174,178,174,84,112,125,8,47,142,67,54,150,214,165,244,126,220,201,79,183,109,104,83,10,98,
+72,233,32,166,4,36,204,65,82,81,19,222,186,27,96,173,205,246,71,154,200,230,76,161,160,173,220,241,179,193,12,192,233,11,88,237,196,182,181,36,116,239,70,46,207,248,23,66,14,231,144,76,177,172,69,71,76,214,65,93,122,48,161,113,193,104,143,230,37,83,70,66,148,106,88,242,194,254,108,163,220,220,49,253,119,162,72,189,195,89,173,18,22,219,186,2,78,82,1,93,58,47,41,51,154,231,24,197,62,13,147,65,231,136,85,61,29,146,193,241,6,234,193,216,101,111,81,242,83,130,205,198,28,215,161,237,219,198,13,82,20,222,161,199,155,230,65,10,221,213,139,47,199,219,249,238,184,118,181,76,247,146,131,76,57,169,131,91,199,90,27,182,11,111,211,235,183,180,143,168,0,49,28,148,152,253,248,84,70,178,45,117,204,49,209,244,98,170,114,31,107,169,116,180,27,142,11,226,176,96,155,80,5,135,102,81,232,106,70,71,251,66,181,139,20,7,226,69,159,196,142,112,99,241,24,59,177,92,120,125,69,28,137,105,205,170,172,224,134,56,59,64,170,67,216,101,
+74,183,42,236,226,10,37,215,144,213,214,162,69,6,253,238,113,133,33,9,96,28,153,134,229,166,202,128,21,36,142,107,241,94,10,200,220,120,136,53,208,203,47,249,112,210,59,145,164,44,171,123,107,115,67,25,251,238,76,27,200,219,88,83,43,149,154,71,223,174,33,115,173,106,226,253,94,87,237,116,12,144,106,193,129,109,94,222,21,210,17,184,78,80,163,14,5,243,106,166,75,188,0,239,227,41,117,71,101,19,88,144,216,192,79,134,79,163,204,251,73,221,107,72,74,3,61,73,13,253,160,81,201,83,143,226,233,99,92,137,64,159,61,80,135,39,61,180,62,82,149,179,72,131,130,226,230,239,106,146,58,182,210,192,77,189,106,44,153,186,99,146,207,8,10,119,79,44,100,152,46,124,250,132,119,181,151,116,85,114,207,202,217,90,207,147,100,245,117,5,14,79,215,80,247,82,59,152,161,246,85,38,120,84,110,67,179,132,1,230,92,245,61,43,243,43,59,212,106,8,157,250,133,71,135,226,206,172,53,204,245,70,208,76,224,66,162,185,49,233,12,218,42,10,236,67,
+239,109,199,250,84,7,135,72,224,120,199,91,169,31,173,200,58,187,142,22,43,87,47,44,226,97,225,148,175,209,170,234,163,22,135,227,242,92,165,146,136,61,8,205,220,33,235,153,221,64,5,42,60,168,21,55,19,163,1,183,8,1,120,58,143,239,168,7,185,220,103,11,111,249,222,247,87,136,129,103,247,2,141,104,236,68,106,160,196,129,35,239,131,85,236,162,227,216,215,146,234,163,149,126,146,237,95,185,22,193,104,217,181,253,252,32,116,229,249,40,73,62,113,187,232,104,28,251,125,218,241,111,33,124,181,16,11,32,7,183,162,153,16,14,120,172,101,248,212,231,17,26,173,82,220,140,142,43,62,211,0,71,149,235,35,212,224,204,45,182,129,130,199,113,228,26,124,251,120,103,152,55,108,206,86,174,111,197,96,61,91,190,154,15,7,50,158,99,232,8,148,73,173,244,96,115,104,243,65,222,101,184,245,202,37,172,239,51,121,73,199,210,163,165,227,26,56,0,206,66,6,6,23,157,77,123,176,138,139,123,108,13,38,133,113,48,192,6,14,92,64,230,171,94,181,109,
+230,205,210,146,177,129,187,37,95,11,16,1,81,125,149,78,229,183,10,67,123,211,134,248,32,73,54,213,245,234,113,10,230,117,12,37,227,40,209,133,89,233,81,252,30,10,167,108,101,200,62,177,197,121,148,92,234,200,18,80,222,71,142,157,29,208,22,138,109,128,97,29,178,74,96,68,84,165,157,124,243,100,224,233,51,89,177,171,25,70,138,26,69,145,42,192,192,2,185,146,37,130,203,3,78,165,253,116,102,184,251,185,135,151,128,184,83,69,83,30,95,229,83,146,78,143,205,233,170,50,234,40,16,177,186,135,86,185,237,52,96,174,139,219,125,238,213,207,16,56,78,242,219,72,217,93,106,142,187,46,242,28,182,184,129,117,139,249,66,85,201,89,64,196,160,60,44,113,30,53,180,224,104,208,141,138,248,168,203,247,145,70,70,241,142,0,78,250,6,33,59,220,139,83,249,163,118,141,69,111,155,81,198,184,105,224,71,72,22,100,160,97,230,108,7,154,182,155,1,1,56,192,232,161,92,196,53,174,175,182,167,0,8,111,236,67,145,236,148,184,194,158,197,200,105,63,
+245,221,218,117,105,10,199,187,144,38,158,53,31,116,102,253,109,89,132,52,244,143,227,119,59,249,36,50,223,134,233,139,106,222,252,124,255,22,131,91,108,148,106,128,190,32,230,105,212,163,9,199,240,60,11,5,150,78,103,218,44,158,4,10,13,188,40,66,68,223,188,107,168,57,16,165,90,0,225,200,14,230,51,158,107,43,20,225,192,187,13,27,232,114,174,142,148,195,25,44,183,86,213,9,158,139,242,40,49,93,13,169,108,123,151,204,8,131,177,132,40,59,219,145,154,201,163,17,72,175,94,72,71,185,56,240,76,234,81,152,229,63,35,103,157,82,91,150,44,186,23,196,181,33,47,119,214,40,128,110,217,59,208,64,46,235,35,129,105,89,102,90,88,231,14,98,223,240,183,7,23,163,103,232,12,221,163,12,164,163,235,57,158,4,128,184,35,113,62,188,43,168,53,136,15,85,24,66,9,41,158,226,214,186,42,41,221,229,118,108,57,44,108,11,96,92,26,20,195,49,44,152,252,104,70,65,68,149,36,129,129,176,121,172,95,6,150,40,239,244,184,223,168,173,157,109,
+125,94,191,53,116,58,55,144,244,109,44,168,219,106,27,105,88,90,177,74,47,84,119,187,235,97,254,214,75,151,211,43,190,222,36,25,111,217,215,194,240,104,107,196,244,109,213,151,208,152,41,238,71,149,76,146,225,68,79,16,176,79,64,53,95,58,225,96,70,0,220,62,10,46,123,240,235,84,54,32,209,140,168,123,253,116,66,152,8,137,45,21,131,80,176,9,178,147,49,151,193,222,200,150,155,216,195,0,166,178,218,168,71,219,13,159,234,14,129,73,134,78,175,103,59,19,5,151,121,212,25,72,238,1,15,101,59,66,210,78,141,98,109,17,131,6,22,228,240,48,104,224,202,169,190,185,111,185,41,65,22,186,3,137,1,208,248,202,235,210,184,131,156,136,10,60,222,122,96,217,75,150,3,53,64,79,109,224,213,68,231,8,188,117,47,33,52,76,56,90,43,193,192,120,136,234,141,52,241,135,54,202,134,48,82,4,15,211,81,20,91,163,100,17,210,165,45,46,201,55,140,183,19,35,16,73,7,110,171,250,65,238,134,208,120,53,150,27,142,118,102,178,87,212,10,29,
+138,115,79,63,236,228,157,100,218,69,76,28,25,232,86,141,254,40,209,184,118,2,245,93,206,234,191,54,12,237,170,74,55,87,181,97,242,40,114,237,193,39,219,89,10,173,107,43,122,106,231,79,151,78,241,225,69,59,222,185,223,29,24,136,172,251,104,167,192,106,111,68,64,167,238,3,252,254,195,253,230,68,11,62,220,17,0,221,70,223,56,61,117,249,36,23,7,82,130,141,232,253,192,33,0,198,189,25,120,188,40,238,35,158,60,126,138,39,155,143,120,114,45,85,226,184,79,165,197,71,229,181,20,251,252,184,102,249,252,56,206,20,111,45,238,253,133,173,186,198,53,205,253,212,231,246,124,132,171,163,4,51,220,220,124,4,68,209,53,14,189,167,33,134,227,53,54,54,162,164,233,212,215,138,125,87,14,251,42,103,15,120,55,226,147,131,127,141,131,69,145,247,51,127,228,202,127,186,176,33,133,107,184,188,138,245,52,62,139,29,66,78,225,79,129,147,248,57,92,226,158,217,41,7,16,100,41,66,216,25,239,227,193,61,239,115,128,158,181,78,97,158,70,50,212,109,
+212,0,254,218,31,250,83,152,156,109,49,154,177,227,210,245,120,80,79,98,212,70,134,0,140,215,40,254,241,36,141,171,131,241,51,49,202,125,49,132,63,34,103,226,163,187,208,241,210,117,176,224,129,107,236,236,184,205,103,59,190,129,146,6,94,62,245,96,250,232,236,125,234,67,201,201,240,136,100,126,130,133,62,27,126,248,80,86,152,177,94,61,136,131,127,220,158,116,149,221,159,235,231,51,42,150,223,181,104,17,214,113,134,64,49,98,96,212,66,231,24,238,140,183,242,233,106,17,30,222,201,170,38,157,199,113,63,94,90,75,130,178,146,215,168,9,19,105,251,70,251,226,64,187,226,33,70,207,167,131,68,46,237,154,171,175,79,90,48,135,70,133,59,104,185,91,77,116,71,145,212,61,148,36,201,226,240,62,221,222,163,116,231,147,167,92,22,197,19,80,240,188,137,144,83,109,246,100,250,184,151,98,134,209,253,208,183,208,63,95,196,134,12,20,193,154,180,21,70,250,46,53,148,89,130,98,206,162,126,218,108,81,210,202,144,126,152,123,246,245,118,125,147,140,20,234,
+252,154,178,118,36,68,17,136,93,121,118,1,47,162,47,250,223,184,192,224,191,251,254,23,255,251,87,95,254,197,103,72,194,215,95,252,232,199,63,249,219,111,63,95,54,240,211,223,2,74,248,230,131,245,163,240,183,63,189,86,124,249,233,82,215,159,126,241,41,209,255,223,124,125,173,251,226,47,254,250,71,127,241,159,126,250,113,29,192,127,250,234,231,255,207,215,95,126,243,195,95,8,251,117,120,194,175,80,8,95,254,228,35,47,202,55,63,250,0,43,252,242,187,255,95,37,59,249,15,87,125,126,250,211,191,253,234,19,86,226,155,175,126,242,75,232,196,215,127,249,93,216,195,71,183,191,188,250,224,171,191,252,230,171,159,254,213,47,33,13,255,20,119,1,252,129,88,134,143,155,100,191,190,170,251,197,23,223,249,38,254,223,127,251,205,39,55,127,245,247,223,254,15,191,1,39,248,255,96,31,254,215,175,254,242,219,127,247,245,223,253,248,123,159,197,252,228,235,171,7,127,248,119,215,129,248,226,47,255,250,203,255,248,211,223,4,67,252,228,139,31,252,143,31,76,191,
+134,123,248,133,59,190,247,219,128,12,255,242,139,223,209,241,159,127,140,227,159,95,7,232,15,236,249,195,154,143,206,255,167,175,191,249,155,47,191,253,222,15,254,217,15,254,175,127,254,195,127,243,207,127,248,131,255,251,3,85,113,109,253,253,191,255,252,241,243,63,250,131,149,251,226,87,222,249,131,240,32,127,48,28,228,55,209,32,63,249,164,219,247,127,254,199,159,198,228,151,24,144,127,245,91,48,32,191,85,185,127,10,0,200,117,40,191,255,247,159,6,243,251,63,255,248,248,211,127,114,108,200,31,8,251,248,179,63,253,211,127,241,103,127,246,167,32,112,2,244,246,145,95,134,243,57,191,140,159,49,174,34,143,153,118,157,121,153,17,32,88,37,246,82,129,182,185,115,49,36,143,123,197,123,18,156,219,10,128,7,221,226,57,30,16,151,131,224,58,177,229,155,10,49,169,131,15,10,36,133,108,165,150,101,38,23,139,148,151,27,230,88,142,154,100,168,31,150,177,47,88,47,24,246,252,196,165,70,240,19,124,7,175,119,6,46,187,14,149,65,134,5,91,174,8,230,
+253,112,178,214,235,121,107,236,196,48,45,34,84,202,116,122,180,45,58,2,222,123,132,151,27,9,27,132,117,81,84,104,58,50,84,118,191,25,63,178,116,43,101,101,149,231,18,71,90,114,161,177,8,203,90,248,97,72,46,212,73,61,138,72,94,18,121,224,67,180,234,22,67,248,132,123,22,83,80,88,223,227,219,69,166,160,159,55,11,53,194,93,111,248,204,39,36,186,14,114,155,7,101,66,249,13,165,22,103,146,200,189,36,205,85,176,211,3,84,212,158,42,225,9,20,75,159,18,166,37,151,118,169,100,8,170,72,117,68,199,49,0,22,134,249,68,131,61,137,199,157,182,222,165,134,120,6,179,51,136,29,53,134,73,200,178,190,145,51,96,106,6,81,14,57,164,18,61,87,102,14,184,11,52,72,173,242,153,200,102,125,108,175,146,171,183,119,145,176,196,225,149,60,105,175,176,46,10,53,188,23,83,84,4,136,4,56,187,37,230,33,162,166,94,33,127,65,98,231,203,37,34,63,152,22,48,179,230,73,45,51,231,74,206,20,136,28,255,4,193,186,2,27,41,118,112,
+54,32,172,131,193,51,216,212,121,27,220,48,153,58,245,84,34,190,95,195,35,151,4,162,52,143,73,189,180,89,136,246,56,238,111,80,195,109,93,182,181,30,135,131,91,101,134,47,144,228,142,77,129,228,160,245,180,204,124,18,35,233,66,121,74,107,57,79,26,114,121,95,164,225,195,51,188,168,148,210,229,54,54,134,216,174,227,175,61,185,179,16,153,57,30,104,118,17,59,166,150,96,166,174,162,81,151,58,6,17,54,89,232,192,198,251,196,122,123,8,207,202,139,208,139,206,114,36,107,194,153,172,227,66,123,108,158,35,230,170,68,145,165,121,82,151,0,82,53,64,133,92,183,60,221,92,35,21,108,92,151,58,252,148,49,15,19,65,232,147,69,182,123,22,232,15,162,92,131,103,241,79,116,73,131,164,170,38,184,246,215,94,225,220,122,51,88,57,101,186,19,28,91,105,122,110,92,5,147,151,38,154,230,126,137,247,49,207,34,94,67,189,66,40,99,71,86,168,80,81,201,117,246,60,123,209,63,177,65,146,144,239,198,241,86,28,215,146,39,247,245,221,9,103,207,174,
+80,226,208,221,17,33,98,172,135,166,105,247,181,8,45,72,101,93,118,186,12,33,49,156,46,90,62,4,231,66,18,25,122,86,8,122,151,224,189,68,115,178,40,146,184,14,80,102,90,153,177,44,19,84,218,216,59,154,187,252,68,84,86,147,145,167,235,157,58,229,156,63,29,88,143,131,61,140,201,81,160,185,121,17,42,66,55,103,241,224,117,81,203,41,92,149,134,100,184,184,167,141,41,117,62,123,102,168,209,200,251,156,222,100,30,55,192,205,140,101,194,223,155,170,151,55,222,60,180,63,151,210,94,52,127,85,161,117,155,220,192,171,29,42,192,157,186,85,229,222,100,31,175,234,220,131,79,145,175,195,6,116,40,215,127,128,85,85,160,1,140,144,222,160,139,93,111,212,235,182,215,92,129,38,188,118,170,96,176,62,236,162,227,120,128,64,158,198,253,49,190,226,55,181,227,68,162,208,58,137,30,201,241,231,10,152,53,27,86,248,247,57,163,95,54,199,20,21,157,56,231,217,108,144,79,230,226,101,112,186,50,150,253,217,217,26,113,94,220,45,212,14,73,122,3,172,
+40,51,150,56,219,244,12,135,234,89,103,58,193,97,252,36,226,75,116,38,31,69,95,66,240,197,19,202,44,101,88,120,211,73,82,6,93,192,40,143,17,218,240,9,239,24,231,152,226,245,105,254,190,111,161,39,65,99,119,224,32,152,138,50,201,188,167,110,236,125,254,46,211,220,175,156,28,224,108,135,120,210,117,242,245,109,239,205,206,165,67,169,125,226,122,72,41,239,35,141,246,220,123,215,24,49,89,107,239,133,132,224,122,159,84,221,80,124,252,36,199,9,120,188,119,47,114,214,46,215,28,167,8,221,38,100,239,54,243,67,109,45,138,87,74,172,243,163,214,48,70,110,106,142,189,173,107,149,19,142,20,67,180,159,140,107,253,214,217,35,102,55,169,116,89,251,58,219,2,184,212,114,205,249,126,31,217,19,154,189,70,17,70,23,218,235,247,222,120,186,201,56,189,123,117,8,178,225,120,42,119,171,104,199,38,128,19,78,114,210,42,165,104,230,218,10,173,83,41,104,222,121,49,210,238,22,95,57,214,95,241,154,97,41,217,177,218,249,167,152,235,145,187,59,33,78,
+155,135,254,252,110,92,176,163,83,154,115,179,68,183,217,197,37,195,242,73,170,184,189,51,224,195,243,136,69,169,234,162,40,133,180,95,110,189,193,207,7,186,71,233,217,161,129,200,33,237,251,184,2,2,193,117,62,172,195,249,242,81,64,92,182,150,235,49,243,169,82,238,234,109,199,227,62,170,159,191,116,219,33,242,37,146,133,206,235,25,246,64,194,81,111,206,8,96,20,173,61,161,94,89,98,204,65,96,125,235,80,77,41,27,71,243,226,240,51,64,67,255,40,243,180,1,148,51,201,117,158,4,247,25,69,189,180,47,205,253,11,255,101,156,246,38,133,121,198,238,69,218,93,226,188,207,244,20,50,192,14,100,137,238,238,216,81,121,39,106,144,100,161,149,40,163,190,7,40,137,216,118,19,112,7,193,234,131,127,179,221,229,134,171,189,81,2,136,68,246,89,148,31,151,12,233,121,217,169,180,57,237,43,23,77,189,35,237,72,29,3,61,127,47,37,13,23,138,154,131,92,158,159,21,242,18,250,196,41,74,192,185,28,41,150,38,222,189,180,77,213,92,73,72,36,185,
+235,107,78,253,182,50,219,65,45,88,103,165,47,70,105,9,46,17,98,239,139,91,119,18,174,117,54,232,175,82,10,146,226,164,183,54,15,253,249,225,156,165,191,32,239,95,227,86,4,102,87,200,8,28,61,68,181,27,98,57,98,14,163,122,41,176,111,156,47,121,135,55,211,182,117,73,90,234,198,58,121,171,111,245,205,76,124,141,122,111,107,50,105,180,81,117,66,52,29,101,235,165,181,72,165,238,52,177,208,196,33,220,102,213,79,139,34,126,17,4,133,216,201,247,32,122,89,240,183,247,219,19,47,28,74,236,64,69,240,66,176,10,167,89,137,171,159,244,89,195,26,213,115,12,53,193,75,244,142,36,117,64,161,165,139,134,52,209,169,55,176,2,114,227,107,181,253,75,121,54,124,144,121,45,142,85,27,95,117,235,205,138,151,135,42,255,60,54,69,201,51,164,121,16,221,223,208,187,147,143,0,181,171,11,6,32,214,28,91,235,174,20,161,252,56,95,121,110,156,9,109,49,102,176,35,176,102,177,234,219,10,81,30,82,53,41,89,70,125,164,30,222,240,121,195,152,
+42,97,25,247,114,236,220,171,88,174,138,211,186,58,111,117,173,9,53,100,122,113,16,205,6,54,168,65,227,49,206,160,18,253,224,213,212,10,37,133,216,60,251,180,103,74,232,204,90,245,242,156,111,61,43,77,228,248,234,201,79,156,213,52,190,110,108,10,26,83,193,217,125,26,176,251,73,236,130,193,161,218,15,19,25,59,59,58,90,109,6,206,245,158,113,46,206,205,2,96,121,13,40,40,31,166,158,70,181,18,65,253,25,64,14,252,136,3,218,193,14,85,169,54,208,165,219,189,91,119,216,244,4,217,124,88,209,86,45,221,225,194,94,119,173,68,219,230,82,182,44,106,187,152,156,50,245,116,115,76,79,28,180,247,89,14,11,27,147,100,30,179,185,216,82,110,40,95,92,140,254,21,220,31,59,53,73,132,11,233,80,106,151,209,237,2,7,124,245,75,108,212,114,129,248,130,158,113,121,103,165,150,195,192,106,194,196,81,174,51,45,50,99,111,9,172,165,68,253,164,90,63,119,11,164,242,188,253,134,223,56,188,114,145,29,89,181,145,141,123,173,108,186,169,189,217,
+219,163,215,162,194,194,60,179,50,216,1,163,116,240,193,61,31,147,61,233,171,8,113,40,170,95,95,47,219,246,83,152,205,166,24,181,31,100,12,77,196,251,168,68,241,47,115,197,81,188,179,97,162,166,182,198,184,76,156,220,140,186,40,197,49,28,55,182,244,93,70,28,57,168,28,131,122,34,56,52,56,12,194,151,137,61,188,32,235,102,43,245,88,39,144,248,145,228,133,37,94,180,158,58,99,214,173,238,152,109,228,215,65,82,38,207,174,167,224,131,149,97,193,236,142,165,43,30,253,186,223,186,90,161,167,79,171,56,90,180,54,115,150,52,59,245,124,230,174,132,237,32,221,42,75,179,215,62,199,27,53,236,40,105,230,246,77,132,149,98,158,169,114,182,162,182,172,91,157,213,166,157,112,240,105,55,241,229,38,169,128,94,103,52,81,79,160,79,207,111,117,56,163,43,204,217,113,239,140,16,223,222,8,48,211,106,110,172,234,120,152,59,7,51,98,168,117,144,67,23,126,18,41,134,78,154,18,122,180,96,21,96,111,155,231,218,49,110,13,218,236,200,205,112,55,96,
+142,37,227,71,250,32,170,172,119,55,219,167,199,194,57,184,215,6,20,175,80,119,109,33,7,120,239,214,146,104,149,151,222,185,132,23,221,155,133,216,89,182,19,67,12,235,197,76,42,2,155,142,130,20,142,150,6,209,236,88,207,178,51,46,177,142,240,229,205,33,26,32,200,165,16,49,2,143,154,39,42,112,62,211,252,152,223,220,39,185,202,198,109,207,144,128,85,184,148,138,53,88,195,158,192,154,199,42,209,46,213,18,210,28,77,131,195,219,39,75,219,181,235,248,145,140,150,215,216,102,19,91,108,232,7,192,46,182,141,4,22,43,18,128,175,86,144,132,161,41,146,234,30,248,19,44,74,21,115,214,69,53,29,33,101,157,176,236,149,152,61,77,165,190,145,31,130,160,34,25,61,122,20,61,171,113,121,157,67,191,176,158,43,6,235,150,110,111,179,167,233,225,166,194,89,248,77,54,191,1,73,215,173,43,203,253,125,213,16,19,28,54,185,188,204,190,16,139,140,229,197,12,213,88,214,207,68,213,46,173,128,23,237,113,96,153,205,163,237,210,80,20,189,44,81,142,
+225,240,230,253,126,103,50,79,151,11,18,0,105,163,117,163,218,88,101,52,100,79,56,215,146,48,127,158,174,168,26,95,69,255,184,29,68,162,195,108,179,174,188,112,58,167,251,57,217,161,167,75,195,184,61,29,157,217,192,111,171,53,197,84,82,60,147,129,161,49,146,213,97,183,112,189,226,20,60,141,50,134,183,215,67,236,99,199,199,210,116,155,135,216,252,249,60,94,70,106,35,166,77,16,100,151,77,43,112,119,252,14,102,169,134,21,247,60,111,186,147,231,251,100,69,123,162,243,156,154,60,218,134,252,16,199,144,182,49,179,208,98,145,137,134,57,189,66,52,30,221,221,190,157,248,83,198,74,7,35,205,50,50,174,47,121,58,242,115,27,212,53,118,13,175,177,187,191,225,188,220,81,198,145,144,164,164,214,100,85,211,119,175,247,94,73,56,16,99,118,213,212,151,34,131,16,14,9,60,57,60,110,83,134,83,211,98,177,217,57,50,7,48,172,144,8,102,192,211,85,13,193,143,65,47,241,4,109,70,68,110,6,249,89,211,132,42,164,215,21,37,61,181,95,36,192,
+139,93,61,64,3,214,115,230,210,189,243,182,39,199,42,209,90,94,150,150,40,229,108,118,240,77,140,92,210,24,67,207,204,93,109,192,203,90,85,37,142,218,51,199,116,157,36,253,226,165,47,95,13,229,241,208,202,207,20,10,72,165,19,183,185,35,218,15,235,221,101,187,75,141,138,195,189,179,221,34,42,88,41,36,93,31,97,103,154,192,182,89,183,208,80,236,59,204,254,176,144,97,40,90,120,113,220,237,135,47,221,227,59,178,180,215,94,44,61,156,101,140,217,157,208,179,114,134,235,58,92,36,218,38,22,126,157,131,58,95,148,17,0,171,171,4,195,86,112,118,240,194,48,51,67,189,125,189,148,242,5,29,75,218,144,218,192,57,115,214,180,151,109,54,161,249,210,94,127,239,91,11,233,70,153,43,108,194,132,105,159,76,28,91,220,151,234,125,221,222,7,159,101,178,180,168,47,105,128,81,132,57,80,31,13,60,62,161,166,18,57,171,194,208,217,182,251,235,182,209,95,242,34,123,241,62,237,232,96,116,205,48,172,217,113,248,151,147,26,90,92,101,206,152,206,235,
+63,99,198,92,84,132,235,253,123,44,118,61,158,229,246,174,186,242,206,106,220,219,101,7,152,100,196,26,180,41,174,250,171,15,117,210,77,110,79,252,67,135,81,221,30,237,112,221,182,42,1,10,196,143,68,61,49,170,111,166,212,1,158,214,216,17,151,133,236,150,126,57,63,136,118,75,119,117,36,253,2,61,149,56,249,70,86,161,47,110,39,169,97,121,93,207,48,84,45,254,101,19,20,238,230,200,141,205,31,235,50,53,236,88,198,32,3,136,150,214,16,99,111,23,155,66,43,46,105,25,32,237,181,23,186,63,131,188,12,146,217,189,192,118,94,3,132,91,203,112,14,71,221,230,163,164,1,247,93,231,17,158,253,75,84,167,0,96,245,125,206,133,193,99,57,30,142,181,86,8,218,9,93,194,87,223,154,117,66,220,10,21,244,251,50,215,109,159,72,150,70,197,87,5,75,224,77,242,128,153,45,235,13,29,122,63,226,217,85,238,139,237,118,84,61,248,222,187,194,13,196,127,193,227,230,151,20,77,236,224,228,104,218,217,209,11,44,103,212,212,226,133,211,127,189,72,
+130,97,150,202,161,62,241,145,65,231,38,11,67,56,142,182,118,125,89,243,223,73,87,16,187,46,32,51,120,118,93,133,157,162,62,133,237,151,126,109,146,118,158,30,46,214,129,186,244,118,193,231,202,10,25,133,24,39,47,225,89,84,106,200,225,195,236,88,46,4,91,73,85,51,47,201,13,119,46,93,159,55,46,55,75,208,191,188,71,143,5,139,169,205,141,127,28,113,169,155,131,239,101,241,80,179,240,211,0,81,184,185,15,197,55,237,90,44,108,27,142,73,219,146,108,173,149,133,167,58,122,57,51,143,86,216,171,35,107,192,32,221,215,203,77,41,221,191,171,210,174,81,215,142,83,176,19,121,21,39,183,51,3,160,69,95,251,126,40,17,152,97,65,65,199,151,244,106,111,154,105,172,122,234,68,70,19,70,74,204,232,189,91,120,198,53,116,78,40,157,84,130,42,240,50,25,139,253,212,71,64,143,10,165,79,252,48,57,190,223,94,207,235,76,141,115,133,72,158,248,42,37,11,96,172,152,142,100,120,92,47,236,23,213,6,1,237,64,81,134,136,240,204,90,222,244,
+173,132,235,12,128,97,135,25,225,182,53,48,91,59,232,243,229,122,20,139,194,28,192,0,145,41,245,215,139,142,77,193,242,84,181,209,122,246,40,83,117,7,240,164,69,126,136,148,110,135,209,249,204,69,96,133,75,245,217,76,195,69,132,79,158,1,140,47,94,225,192,108,56,118,237,58,82,103,247,88,206,88,84,108,118,180,121,145,60,59,65,12,109,18,110,40,3,153,151,205,113,96,173,171,77,164,215,189,187,119,0,10,131,49,161,223,25,19,26,3,155,127,183,141,55,29,203,21,42,193,109,70,114,167,38,120,115,170,236,227,129,21,139,162,189,91,142,62,66,16,213,23,180,138,121,36,52,43,110,54,93,143,255,94,6,82,40,17,52,42,234,67,182,134,234,30,113,177,219,12,133,120,136,206,92,100,225,251,150,206,152,141,99,247,126,195,110,238,25,230,12,252,75,16,163,177,114,11,180,117,33,143,46,87,230,171,186,241,44,174,134,12,153,108,213,16,90,193,135,188,69,100,89,28,102,139,137,93,167,168,97,63,67,132,163,220,201,237,89,232,208,27,251,102,131,146,
+161,128,126,19,134,113,248,87,245,168,217,214,222,179,124,153,104,57,3,147,40,165,117,243,56,30,136,2,190,115,245,69,187,243,218,239,204,207,203,209,101,89,47,41,142,192,123,50,60,25,216,108,182,226,197,53,83,108,116,128,65,12,83,173,214,82,120,197,103,157,201,207,109,161,247,148,210,215,99,18,219,75,3,135,5,251,225,12,143,85,193,206,62,70,214,3,4,12,58,14,38,212,253,7,149,171,77,193,186,104,227,140,229,37,57,174,137,41,109,132,124,54,172,18,216,15,182,170,97,175,216,172,107,236,238,216,110,62,250,165,94,219,152,188,43,43,102,81,125,233,205,220,89,207,236,89,254,89,212,221,12,0,31,213,248,74,56,112,246,221,209,62,14,95,177,216,175,246,66,83,84,118,151,31,248,123,164,2,104,37,189,107,105,0,61,139,84,216,121,109,207,213,231,21,99,208,38,179,207,103,28,196,224,236,125,119,101,0,242,100,143,65,198,74,236,204,211,145,148,193,205,11,173,201,131,228,82,79,132,168,143,23,46,176,220,165,93,249,171,247,184,143,25,83,155,120,
+114,27,155,3,75,34,201,92,132,245,166,243,243,177,84,119,167,89,113,41,164,202,111,198,49,58,38,137,173,95,108,118,45,166,37,26,18,209,251,134,178,88,152,149,7,27,211,13,248,4,113,26,34,2,101,220,182,15,84,15,230,217,42,175,113,228,97,93,57,58,126,84,141,204,37,4,181,241,198,109,86,7,41,89,190,251,182,156,30,210,227,74,117,143,75,211,99,12,71,163,104,76,142,100,7,250,162,32,157,233,89,90,122,151,196,24,15,237,231,205,160,46,209,31,60,144,110,140,98,89,208,108,247,140,150,41,223,93,68,179,254,203,48,209,196,244,232,79,83,176,115,218,190,6,155,167,156,72,94,228,187,71,233,147,166,80,229,231,140,64,101,88,65,155,250,53,193,222,149,62,213,38,195,144,229,69,255,114,233,182,219,121,121,122,173,15,44,78,156,160,173,184,220,222,221,106,178,77,89,19,114,175,66,15,72,50,123,243,233,206,183,81,4,216,73,199,180,6,31,250,143,150,42,219,33,227,230,30,101,148,252,163,221,84,50,93,140,11,214,171,79,226,93,76,164,209,
+73,89,150,59,212,79,209,254,235,211,69,78,189,140,147,42,17,169,142,222,191,210,43,6,67,182,249,96,227,250,165,80,49,227,228,48,239,18,134,119,230,222,251,8,49,181,7,23,88,25,195,58,168,219,156,168,236,78,62,201,145,193,96,141,120,32,146,193,94,238,217,184,119,38,107,102,127,105,62,44,238,137,251,152,215,42,172,184,87,152,169,37,148,41,131,204,153,240,58,68,156,150,217,230,241,245,172,230,61,3,52,221,107,114,152,92,89,237,61,97,17,238,160,104,235,172,87,250,170,181,15,213,51,59,255,192,159,147,138,14,58,192,129,49,5,123,14,136,109,127,105,41,49,17,223,32,229,29,149,3,254,140,148,174,121,168,211,183,126,36,12,49,27,119,38,239,142,119,231,138,78,112,5,222,94,102,143,0,28,113,79,11,203,74,79,76,243,115,85,55,152,138,135,158,208,134,226,211,77,146,67,43,63,127,222,195,20,11,79,5,96,155,170,100,251,230,112,56,201,165,128,89,96,61,213,67,243,33,153,88,183,57,68,214,93,85,30,232,111,98,83,238,229,186,240,3,
+48,90,55,215,39,234,20,83,135,187,196,96,29,107,225,215,151,91,243,252,9,133,158,61,161,228,33,166,185,248,104,182,246,88,148,124,215,90,206,222,167,247,27,82,100,80,164,101,116,102,45,247,212,247,12,195,43,95,117,76,201,29,195,192,25,231,176,168,42,117,163,33,147,169,27,109,25,251,101,64,190,172,30,143,107,233,26,110,207,122,242,18,131,43,141,246,61,25,65,252,137,60,215,223,199,209,193,244,238,57,74,102,24,146,84,160,103,230,4,212,93,59,95,45,11,60,185,120,139,163,167,227,45,72,121,11,137,100,155,161,153,210,216,57,50,62,232,183,108,92,131,124,163,2,232,207,229,112,53,71,112,161,3,124,212,174,174,113,157,65,252,142,122,40,96,170,6,250,248,133,30,100,22,194,85,213,199,223,218,6,158,44,234,42,87,197,246,246,108,1,36,152,80,72,145,253,136,128,1,102,126,91,238,236,20,196,232,203,229,213,108,80,95,207,68,118,157,232,197,7,108,236,120,24,77,168,190,53,48,24,199,106,109,20,54,184,17,73,168,6,120,20,69,208,98,6,
+33,45,163,88,3,184,227,29,191,178,115,38,71,118,73,12,67,181,221,11,55,210,96,177,87,192,215,245,173,227,157,206,203,63,39,40,4,246,206,43,107,40,54,152,116,186,25,49,182,29,158,50,119,239,91,178,87,245,225,182,49,177,0,34,245,35,78,149,39,176,246,102,51,239,20,241,184,52,209,46,153,129,40,205,229,253,102,106,33,73,22,187,188,48,137,141,121,40,178,113,251,108,35,222,129,102,166,249,59,193,186,225,167,31,6,251,245,197,92,236,10,243,195,115,55,88,231,64,120,216,57,134,161,35,87,25,204,203,75,53,66,176,213,39,231,189,191,95,175,135,205,211,150,195,43,228,243,200,68,175,66,110,105,183,130,197,248,97,101,174,162,15,146,38,62,61,38,247,45,165,182,177,244,100,218,241,82,49,104,125,165,83,19,201,0,42,211,149,237,181,25,163,217,176,221,215,124,177,27,169,131,86,204,79,222,32,172,139,165,189,240,223,225,129,40,189,230,84,40,84,102,160,180,148,53,250,134,150,112,157,153,136,25,37,153,210,206,47,52,93,101,191,49,135,238,227,
+100,247,119,158,118,213,206,178,111,252,185,240,117,211,190,212,149,68,247,170,132,90,236,67,222,147,91,155,65,87,13,169,184,22,93,93,162,6,116,115,145,221,149,172,81,52,169,95,139,74,174,56,146,186,116,31,237,48,21,205,245,90,106,91,114,113,102,133,208,226,137,17,47,100,8,214,234,26,160,155,91,19,11,28,188,43,69,205,75,119,250,157,27,219,180,55,244,243,202,120,24,89,229,154,45,122,19,140,1,143,12,114,253,149,76,239,24,75,34,161,165,20,149,155,247,108,1,127,247,192,19,32,182,222,6,97,33,75,178,207,43,198,246,50,178,207,194,99,191,202,31,100,248,147,177,211,190,139,169,26,14,134,146,174,5,171,242,7,230,49,171,60,222,20,242,19,139,127,89,213,232,233,225,154,138,169,246,111,104,137,162,97,15,59,241,183,165,139,234,37,107,167,92,164,14,35,127,103,47,147,105,163,49,97,93,183,169,100,121,216,38,211,140,64,214,213,140,161,100,35,201,10,134,23,106,123,205,29,161,23,143,252,190,175,175,120,203,225,218,142,247,164,189,90,52,190,
+95,178,240,201,245,76,3,228,58,151,122,74,211,117,6,89,233,158,125,162,90,98,242,104,249,222,209,238,109,20,116,135,77,211,22,49,101,190,131,35,63,136,28,242,15,213,179,243,217,219,195,40,238,105,167,164,38,201,54,148,152,231,134,39,129,113,207,96,231,17,106,207,105,110,60,76,203,2,45,182,168,13,1,99,63,110,137,246,235,129,67,238,116,68,210,108,23,147,196,15,0,87,241,252,184,78,225,137,26,142,98,96,165,88,229,250,38,62,32,205,31,196,250,189,108,79,35,26,14,123,237,118,65,146,214,234,131,234,8,197,138,214,171,61,220,44,135,106,40,82,43,221,250,97,82,216,199,119,19,173,48,158,75,163,13,243,145,189,33,231,63,164,98,131,30,152,41,87,95,134,202,226,18,21,236,94,39,113,182,201,122,81,154,244,174,64,51,72,132,92,218,36,172,107,16,155,183,74,69,93,62,191,95,175,241,18,134,63,38,206,89,36,22,131,211,24,215,153,249,221,125,244,80,241,241,8,182,126,57,158,181,119,25,252,186,72,141,171,153,196,35,222,194,0,162,238,
+125,149,219,243,185,0,44,116,115,59,230,172,150,164,150,212,39,156,88,88,63,37,171,238,24,117,129,97,61,58,69,221,210,46,184,214,113,81,146,252,185,209,90,184,64,115,239,101,203,131,35,2,47,233,189,42,159,170,10,136,116,67,214,93,74,219,114,15,10,28,186,20,88,246,249,196,67,39,245,82,160,30,117,19,93,3,98,215,26,74,9,225,8,242,44,2,122,150,16,174,235,29,169,125,193,9,154,174,19,30,181,8,180,206,238,127,122,145,59,242,158,251,120,90,247,196,178,215,217,226,59,197,11,155,190,181,251,175,150,221,7,116,84,130,63,192,223,92,7,164,41,221,233,88,12,170,212,17,203,62,171,4,106,55,122,171,64,135,165,15,69,190,252,110,98,201,95,223,87,47,58,113,190,115,40,101,44,240,226,139,193,55,185,158,111,242,48,211,40,135,83,119,192,17,230,225,112,99,193,167,16,162,247,179,10,209,127,122,65,240,159,112,222,41,25,85,59,178,76,187,75,104,88,174,38,79,104,109,236,222,88,123,153,189,217,106,92,241,237,205,13,60,72,155,111,82,
+180,165,115,176,36,227,179,131,217,30,118,115,127,131,117,214,111,110,110,192,169,30,253,230,198,73,227,156,192,55,55,1,62,128,189,214,245,151,168,155,135,27,14,202,126,109,202,127,74,26,174,85,218,228,181,205,13,150,148,129,25,104,233,107,133,147,231,190,30,95,5,249,129,223,241,137,13,146,76,124,98,219,139,62,216,124,245,107,251,155,79,146,175,162,63,73,126,229,3,159,36,43,81,55,159,36,107,111,110,158,160,43,84,199,159,60,244,175,108,28,94,227,187,253,248,234,148,155,95,23,240,255,242,246,30,63,242,125,217,97,223,191,242,3,23,134,181,32,33,9,134,12,107,161,141,225,133,1,11,94,121,41,96,8,205,79,22,129,225,12,33,146,54,188,171,28,187,114,87,232,202,57,167,174,156,115,206,57,199,238,202,185,43,199,46,119,125,123,72,113,104,210,226,144,182,128,106,84,227,245,123,239,164,123,239,57,175,63,7,239,130,34,223,55,232,110,191,111,64,251,18,250,80,13,245,16,250,117,137,241,75,55,51,159,191,201,62,174,225,118,79,200,75,8,254,56,
+30,196,251,30,102,230,128,223,102,222,240,223,102,2,16,223,102,2,66,223,102,10,179,217,223,79,255,167,111,241,128,224,183,120,252,91,232,135,152,145,231,33,166,150,105,67,70,63,14,96,74,201,3,134,103,45,93,252,243,31,138,67,94,191,165,153,159,1,223,138,163,126,72,251,251,227,32,5,112,85,210,229,234,100,29,124,93,237,61,185,220,233,43,183,8,252,150,159,249,59,228,3,190,205,4,35,190,205,4,64,190,205,228,190,255,214,204,227,15,51,185,46,137,247,32,249,250,13,166,24,78,25,95,234,205,191,253,10,249,127,248,53,248,173,222,223,235,191,26,87,21,107,87,210,109,237,195,216,120,219,204,183,253,24,8,207,191,111,28,91,63,180,34,20,253,212,135,158,116,26,82,179,100,10,127,232,111,253,29,253,165,223,97,130,61,127,135,9,0,251,190,187,231,183,97,18,0,126,220,221,123,3,10,170,219,199,46,134,6,128,65,41,111,115,124,221,31,209,120,250,189,237,43,124,187,127,192,124,184,255,247,184,238,111,143,171,227,15,119,28,36,63,226,106,91,62,
+1,178,183,119,251,99,123,59,0,130,247,80,217,247,29,38,204,127,105,124,116,126,152,169,200,249,204,71,199,6,0,200,128,61,191,207,252,253,253,231,213,239,107,231,63,117,254,252,151,198,239,223,142,127,232,135,24,110,111,237,157,250,102,236,247,33,183,157,114,44,75,114,40,53,172,222,120,15,57,70,221,241,178,255,204,78,119,57,211,215,131,137,194,72,229,25,188,24,215,231,246,106,239,164,32,77,131,104,243,106,124,135,185,168,242,52,72,222,139,113,241,55,48,27,0,129,48,161,201,116,4,145,232,244,45,159,171,201,181,136,41,208,141,46,40,150,81,240,56,51,187,42,217,67,126,146,191,215,194,100,191,75,112,3,239,124,15,37,120,197,33,179,173,87,185,153,71,215,112,53,217,103,169,114,80,202,186,229,149,202,7,42,179,102,150,98,39,79,123,121,86,118,38,189,120,213,19,218,64,139,112,138,171,52,238,202,61,61,94,129,25,198,99,16,20,88,148,123,242,137,115,204,5,179,17,48,212,248,148,159,94,97,188,151,207,213,76,21,230,93,96,114,162,17,167,30,
+47,62,23,177,51,44,60,193,125,57,194,55,25,232,238,244,178,122,166,208,136,241,5,109,82,197,168,66,174,141,11,62,210,108,40,188,69,23,79,61,5,124,82,185,136,175,91,219,33,5,219,157,78,245,137,65,195,143,67,25,246,169,176,6,92,166,204,20,214,227,113,202,174,160,16,27,39,123,54,141,187,35,224,105,24,225,30,215,189,106,186,139,21,86,158,129,77,78,83,219,195,47,207,59,240,57,255,213,62,173,2,239,113,70,81,178,40,10,221,160,52,162,24,247,86,224,148,73,147,251,105,159,60,111,241,226,14,77,17,21,47,33,193,133,128,202,180,89,92,156,175,136,164,184,66,216,169,156,28,141,38,68,179,145,55,114,116,16,27,136,64,75,181,201,189,183,125,116,208,2,29,73,199,189,212,74,157,132,34,3,249,201,191,40,62,151,43,35,134,20,120,83,62,188,209,255,52,22,53,153,10,201,108,213,206,58,156,173,214,173,20,32,23,140,107,188,153,3,215,229,186,236,174,18,44,10,146,5,75,221,150,55,67,50,229,47,45,241,185,3,245,84,78,52,246,213,
+41,123,64,50,131,218,158,43,209,160,47,219,188,102,114,67,84,52,76,156,207,145,27,216,200,253,26,79,78,188,45,229,166,110,247,212,242,217,201,49,169,235,14,182,91,202,128,77,24,173,221,105,164,197,251,179,120,115,6,220,110,91,70,126,163,100,9,240,128,21,116,219,253,171,44,194,24,173,86,56,155,37,61,239,73,101,46,152,107,92,172,244,50,123,239,250,185,14,226,151,17,100,174,185,128,123,110,32,218,67,132,227,75,6,94,190,89,206,51,67,160,252,165,225,96,236,252,174,139,111,134,103,28,119,162,61,221,182,128,173,100,246,66,182,202,206,76,44,67,193,136,55,51,110,130,115,179,182,160,133,88,58,95,11,167,39,226,142,156,204,19,51,7,226,74,110,247,18,64,233,210,4,211,7,55,188,185,154,109,115,202,70,152,21,185,48,140,196,114,12,220,5,5,210,127,156,239,218,109,52,183,185,186,254,105,131,127,142,158,184,26,241,221,89,192,168,141,203,76,161,108,2,153,159,174,251,92,109,178,103,184,128,111,223,167,31,176,243,207,155,203,217,110,188,17,191,
+166,29,226,43,159,36,221,109,243,16,29,7,61,210,36,143,215,110,211,142,240,237,237,36,14,74,205,63,78,104,127,38,124,109,206,16,5,58,127,79,96,239,143,217,152,60,32,49,52,87,250,107,81,4,33,248,255,168,245,195,243,99,149,22,160,128,63,150,251,127,242,186,226,218,185,62,50,19,247,183,124,72,230,247,95,191,8,223,114,238,232,246,232,71,93,4,250,189,234,162,255,188,174,62,125,93,179,96,248,215,192,71,85,227,193,254,163,237,90,110,118,24,112,9,254,143,206,203,127,37,135,242,40,178,190,14,44,0,153,204,245,38,184,129,76,63,20,246,189,182,127,55,17,64,190,151,219,191,55,15,77,0,223,5,22,127,243,93,96,77,199,46,2,137,177,186,189,201,30,231,103,60,191,111,126,104,124,73,7,157,97,28,192,16,251,21,255,70,63,220,238,92,242,95,103,240,159,191,29,250,15,213,207,241,93,206,16,224,197,239,194,225,157,246,240,190,106,15,174,255,8,0,226,31,155,23,33,17,244,132,113,125,108,193,7,24,173,174,109,198,223,87,111,112,191,211,
+26,134,246,157,214,190,242,209,247,141,249,134,191,105,199,245,171,30,113,126,143,87,222,239,151,7,105,143,108,95,51,215,18,169,15,90,140,96,148,65,13,236,44,152,232,67,172,121,16,72,136,140,105,61,113,32,123,12,229,29,87,107,144,86,35,185,253,240,108,126,97,231,113,21,63,8,91,146,76,204,244,251,59,172,160,120,133,79,201,247,248,117,54,49,146,118,224,11,240,42,249,244,171,163,195,84,107,193,137,220,122,159,188,251,199,29,51,237,159,218,152,59,70,221,41,165,74,7,234,218,190,58,183,231,186,251,202,157,116,181,15,162,101,15,224,76,149,52,7,37,86,51,161,186,178,103,227,45,40,247,217,234,10,170,186,110,18,149,205,212,15,73,189,237,12,53,6,44,101,27,71,184,175,93,165,219,157,203,169,79,73,241,219,180,209,196,113,62,251,201,254,141,220,109,15,26,161,187,127,236,2,95,142,205,106,52,30,167,221,11,119,191,122,238,225,212,208,231,46,140,53,220,181,45,139,234,45,18,69,124,61,233,242,41,208,59,238,253,141,102,248,221,247,98,253,171,
+63,250,233,223,254,229,175,254,226,79,254,236,87,63,255,244,167,127,252,39,191,254,237,246,111,127,221,129,250,31,126,52,143,254,141,70,186,71,211,231,159,255,244,167,127,117,205,95,252,230,207,126,241,135,191,250,249,255,248,249,87,63,253,217,207,63,255,167,191,186,252,187,231,244,223,255,241,175,127,253,155,191,248,157,54,209,191,252,245,95,181,136,62,182,201,251,147,191,248,233,63,253,229,175,255,252,199,95,255,244,55,191,252,227,95,253,244,171,223,252,230,207,126,250,15,191,249,222,150,238,251,102,127,244,211,255,252,235,63,255,139,159,255,248,151,191,219,200,250,199,191,250,213,111,254,253,163,121,245,111,168,240,91,233,63,125,169,249,184,254,63,254,252,199,127,246,227,213,91,15,13,190,164,63,122,79,127,241,175,255,245,255,244,104,139,253,95,190,4,253,187,159,126,241,135,63,253,216,178,239,71,167,236,183,240,31,10,125,233,246,171,223,252,250,127,127,124,63,246,206,251,249,209,240,250,117,167,255,235,239,20,246,103,63,255,250,231,95,254,209,79,255,219,151,144,95,
+252,193,151,152,95,254,252,171,159,127,108,198,247,39,127,254,239,126,241,7,143,253,254,126,219,116,251,203,159,127,253,67,141,95,253,230,207,127,254,107,55,60,94,25,246,56,240,67,209,95,254,252,159,205,250,143,191,19,145,255,31,247,227,251,135,55,214,254,78,79,232,15,51,254,118,247,229,223,176,253,255,173,127,243,159,210,112,251,223,254,250,231,255,243,111,42,251,207,126,241,135,255,230,127,253,138,193,191,253,114,214,223,249,66,175,255,74,45,173,223,111,248,250,197,31,252,143,143,70,236,223,125,201,220,143,198,235,47,21,127,250,245,163,101,247,59,160,127,227,213,103,255,242,159,255,179,255,15,186,93,127,204,201,239,123,255,252,203,255,58,47,63,123,4,228,31,20,142,199,137,127,123,246,253,3,90,95,255,229,191,250,231,255,195,127,243,47,254,251,127,241,223,1,192,40,80,249,209,251,42,251,235,189,21,157,200,99,33,216,44,185,90,62,132,109,99,31,167,95,220,31,26,189,206,54,177,216,176,130,207,249,200,50,145,34,34,174,20,220,231,130,121,124,17,156,11,
+175,202,71,109,246,25,207,3,208,10,116,8,40,192,147,139,102,8,193,14,223,134,226,211,16,252,136,7,132,172,158,227,62,12,5,90,190,166,119,187,134,220,124,216,59,155,172,179,115,123,226,28,198,146,166,109,81,148,201,55,83,42,251,80,106,218,138,53,145,10,133,12,240,9,17,161,144,248,59,223,189,223,126,159,213,111,52,78,94,47,16,164,109,162,38,62,167,111,26,105,35,163,18,50,2,59,115,174,113,84,72,172,35,103,163,220,168,71,194,179,163,65,95,110,4,43,126,96,248,13,106,184,118,103,7,187,122,28,184,93,245,233,81,2,83,43,167,88,40,35,175,171,168,203,224,92,21,93,183,9,83,11,94,221,212,221,208,129,131,137,9,131,248,136,16,169,243,71,223,137,34,180,47,175,80,242,226,1,196,236,221,32,14,206,53,79,232,132,5,241,138,229,183,68,212,112,147,237,165,158,60,18,79,93,96,110,60,157,90,89,88,14,111,40,199,0,169,68,220,4,242,66,235,248,149,153,165,5,106,205,28,131,128,144,74,224,207,92,174,29,142,194,114,203,22,2,
+57,6,203,196,236,180,16,192,19,80,73,21,200,196,149,253,214,146,80,195,173,69,42,147,33,224,97,21,163,212,76,245,251,125,188,115,93,86,124,70,116,174,108,103,70,6,176,68,203,204,136,144,248,90,253,72,140,109,129,174,151,196,5,250,38,102,170,246,117,98,106,163,106,171,145,108,118,226,165,3,178,80,151,132,219,157,32,11,116,138,73,192,227,116,40,204,4,255,58,0,137,148,17,190,71,6,40,200,164,177,10,32,135,136,144,133,45,104,91,253,212,108,1,161,179,68,104,166,9,243,253,44,184,80,58,87,20,233,51,107,0,116,13,17,231,67,100,153,138,87,235,83,57,167,137,166,91,207,237,193,200,147,15,65,166,242,249,20,42,234,133,114,214,170,51,77,173,127,218,251,122,120,237,44,226,43,44,23,33,181,200,103,167,42,158,59,130,136,242,136,10,42,137,135,66,131,130,89,59,163,147,40,27,57,117,178,218,64,205,122,33,47,236,21,52,51,44,2,123,31,187,200,136,75,235,189,217,76,10,204,4,124,159,224,26,90,152,168,242,221,17,100,53,249,225,110,
+196,108,6,62,20,18,29,250,108,164,116,14,22,100,99,180,37,42,4,194,98,190,94,46,27,53,206,223,36,237,184,216,14,255,77,65,225,130,120,57,248,62,24,21,74,81,165,164,10,199,106,154,252,4,86,0,19,233,167,4,200,120,42,209,95,46,159,221,135,96,50,108,147,168,43,167,98,159,210,115,96,149,64,246,89,183,25,100,94,59,59,158,128,4,137,239,27,168,198,157,193,195,132,40,238,93,212,239,28,240,171,216,74,9,4,170,99,105,184,219,46,27,204,10,234,122,133,143,97,104,171,114,76,160,239,181,129,198,218,49,147,206,170,204,2,145,220,102,89,1,171,162,224,64,125,208,53,67,21,18,228,241,33,79,187,249,80,17,171,47,251,134,73,63,75,135,139,109,222,52,225,26,139,211,53,131,224,130,202,170,162,66,173,162,165,85,120,181,153,102,220,162,162,172,136,171,144,251,53,182,148,151,160,56,140,130,249,82,48,249,94,13,163,240,254,84,131,83,136,38,70,21,21,114,40,21,80,213,114,130,99,126,22,158,25,46,187,36,122,74,54,27,231,230,246,58,
+105,22,98,74,68,63,84,37,140,171,221,56,144,241,194,27,191,240,226,186,33,152,120,128,138,151,27,117,186,49,85,221,194,2,231,68,197,17,54,148,203,156,121,41,123,159,0,114,135,206,242,96,149,131,137,3,27,132,5,107,123,233,195,120,168,6,4,185,250,90,24,164,238,197,199,111,153,58,36,14,235,190,241,32,81,122,37,232,238,73,150,218,56,24,150,39,52,121,140,141,239,115,171,20,19,103,42,217,7,90,118,138,50,100,3,210,235,12,211,123,61,146,95,185,205,209,221,157,232,216,11,29,214,219,96,213,122,171,104,43,151,206,203,140,70,149,114,184,164,178,181,153,31,211,103,37,87,204,61,2,181,73,81,38,238,105,254,222,203,246,161,92,90,180,233,114,93,238,176,67,171,185,237,113,15,70,245,176,170,222,48,11,44,107,180,174,155,144,204,189,240,178,20,188,59,121,232,186,16,221,172,115,209,45,170,168,197,242,145,93,124,189,101,174,161,164,223,246,39,186,145,221,253,224,48,77,213,162,23,168,91,121,118,171,0,107,133,186,83,63,6,184,26,149,127,71,
+202,29,254,102,234,104,183,173,82,201,236,164,153,13,30,198,233,246,171,202,122,40,23,172,174,54,175,125,199,157,27,28,187,118,185,196,100,221,120,225,33,36,196,102,167,25,4,43,195,194,155,37,238,132,173,54,231,44,18,85,199,160,230,104,10,155,61,2,170,49,109,60,119,159,184,173,238,83,101,177,173,19,39,171,164,254,168,124,205,40,27,179,10,126,70,187,115,184,28,69,49,253,228,87,51,153,45,151,137,139,29,173,26,2,184,219,20,55,162,9,10,27,83,117,75,165,90,231,133,24,124,88,186,62,186,11,58,115,211,216,30,214,185,86,138,27,61,41,236,99,133,186,210,253,26,135,131,217,252,121,208,76,136,89,3,255,103,169,71,87,106,201,47,106,94,124,127,22,185,141,0,183,248,54,145,210,144,125,180,19,61,133,135,139,126,160,146,94,112,181,101,179,107,74,113,77,203,174,196,212,1,171,182,24,17,250,156,164,248,121,234,233,149,220,187,199,134,34,31,56,159,157,249,206,125,116,227,193,237,91,222,133,87,31,153,95,246,69,24,228,24,158,68,21,210,121,
+66,116,216,221,69,213,134,141,184,33,70,163,97,121,205,246,200,25,24,145,223,182,202,136,33,129,54,91,198,246,157,167,154,61,143,179,172,179,108,18,67,118,201,217,119,144,230,137,117,152,133,253,126,241,254,149,104,109,190,241,241,82,240,254,253,246,105,180,94,202,139,180,175,249,170,25,34,35,254,162,105,150,129,206,25,54,204,8,99,147,238,40,89,71,165,159,133,246,95,188,186,241,5,148,59,156,133,156,249,42,163,166,177,177,136,144,135,165,4,17,246,3,122,209,203,219,29,109,23,203,168,227,181,130,219,4,166,187,178,98,95,137,39,182,192,186,50,118,26,249,203,105,136,99,186,14,176,197,103,213,9,237,107,40,234,75,73,50,214,23,182,112,97,238,229,152,205,218,233,39,89,8,97,196,87,135,73,124,177,59,107,215,36,73,98,142,244,180,96,127,132,170,175,176,23,186,200,95,48,126,198,132,159,186,28,228,243,205,210,50,86,26,110,158,193,39,26,65,223,16,56,141,219,49,195,152,198,194,44,59,16,146,208,11,188,16,85,175,206,152,111,233,197,185,133,79,
+195,136,154,180,55,138,86,171,149,73,84,133,245,2,180,241,245,199,234,160,179,159,136,239,111,17,247,113,217,214,28,78,226,249,135,56,213,120,229,126,246,19,0,35,205,187,91,121,88,187,2,52,208,252,90,191,150,84,146,196,167,188,244,104,97,172,201,230,46,202,233,69,184,64,162,81,221,252,118,144,243,248,52,142,208,186,109,59,54,19,243,14,62,192,201,100,216,173,136,65,215,180,174,102,108,182,103,177,236,231,109,118,193,13,143,95,91,233,124,91,192,180,98,103,239,219,209,51,85,16,89,196,253,225,193,180,65,74,240,20,9,37,239,69,236,217,146,150,34,250,184,251,102,169,155,25,182,48,99,24,160,171,160,185,14,237,57,26,232,62,95,105,25,0,19,95,219,90,93,150,35,100,248,97,194,109,18,38,76,165,136,130,19,8,114,108,39,64,164,26,197,84,202,211,216,98,223,228,76,122,31,23,133,209,182,34,40,224,120,95,209,165,53,208,254,210,185,73,85,166,172,149,9,44,245,43,141,52,100,156,109,129,79,60,50,108,79,208,197,175,212,14,99,134,199,197,
+186,43,82,34,88,79,217,196,223,223,53,153,143,200,251,229,85,10,222,213,178,61,12,85,106,99,126,170,220,188,139,1,22,228,170,35,254,148,68,10,142,27,124,116,80,40,205,244,107,166,144,29,222,84,43,127,61,33,150,225,37,162,137,46,25,107,82,5,208,153,101,244,220,18,46,147,51,133,208,73,86,25,234,209,184,33,62,1,199,131,40,151,44,190,247,197,75,83,33,15,234,229,29,16,137,128,81,178,40,66,90,101,243,157,166,52,89,66,92,124,150,70,141,141,124,11,8,63,7,133,236,53,45,215,89,24,19,19,236,188,9,87,247,86,132,107,122,147,45,65,177,33,154,199,164,11,6,89,215,27,193,12,6,244,45,123,46,113,86,185,4,32,168,148,72,55,221,134,248,112,109,29,150,71,51,53,160,162,143,69,48,65,23,57,4,206,165,88,230,196,211,32,75,75,17,7,231,227,53,138,103,125,46,102,215,232,73,50,239,236,6,93,189,13,96,64,66,32,204,110,15,3,219,14,21,254,48,60,56,95,136,176,205,145,99,153,191,62,205,176,66,224,188,121,144,69,
+151,47,213,174,110,165,61,137,25,145,168,207,59,101,190,204,153,9,122,159,38,52,37,16,68,237,19,90,255,132,52,34,159,176,198,39,17,40,155,29,19,223,48,51,19,6,224,161,101,181,160,122,144,30,42,40,80,47,182,222,155,196,49,62,69,198,201,233,172,98,214,25,167,12,94,159,59,138,110,106,10,173,105,227,77,136,169,123,12,231,208,72,65,63,94,180,160,29,119,233,231,217,144,149,60,124,149,59,190,209,187,1,221,186,196,83,166,111,244,66,55,92,143,23,225,148,237,231,251,133,99,15,222,201,174,186,101,98,231,176,67,79,34,187,92,233,81,118,72,159,208,171,234,120,238,109,141,89,113,106,205,119,117,137,130,30,124,22,85,184,178,17,8,0,138,242,171,106,208,117,100,164,170,193,2,194,83,196,144,140,184,125,117,254,107,41,232,36,148,248,228,163,219,118,50,114,45,192,201,30,182,3,96,32,251,58,137,124,95,86,250,231,4,153,184,42,46,54,185,133,60,182,135,246,24,144,24,75,96,77,92,124,154,55,121,15,221,12,108,170,45,53,32,189,171,194,
+172,20,74,255,58,203,51,246,181,102,237,189,82,228,217,76,138,98,119,148,220,86,230,130,178,60,106,79,246,238,206,64,207,88,233,17,164,189,109,90,11,217,87,20,239,133,209,187,16,243,65,114,212,44,106,159,69,28,109,88,228,9,139,45,17,208,154,148,235,217,42,122,94,165,73,201,73,38,231,67,88,33,188,37,196,68,69,61,73,245,40,47,183,234,137,148,70,185,217,28,36,62,31,115,166,147,163,48,110,82,206,152,81,147,65,232,147,168,70,173,169,159,71,23,120,131,182,15,87,97,177,95,95,244,2,2,210,38,164,240,109,150,175,122,35,26,228,70,2,31,155,105,28,50,225,38,170,156,171,137,245,17,61,29,158,110,66,255,86,172,243,21,95,206,244,226,150,83,46,122,120,16,142,65,46,204,236,0,25,191,218,222,48,206,65,91,44,46,121,228,239,0,174,19,27,201,139,162,132,35,250,108,5,150,131,165,42,131,98,162,110,210,96,42,19,198,35,154,22,214,149,134,232,35,141,219,51,201,195,80,197,70,155,155,194,179,140,92,173,68,213,12,75,18,255,6,
+237,67,121,234,12,247,181,121,237,210,133,192,29,158,204,183,94,251,227,172,104,91,156,96,250,84,62,254,2,193,177,156,14,81,181,102,113,7,13,220,98,14,210,189,1,165,126,157,40,235,204,90,36,45,11,95,159,178,36,167,76,38,232,157,137,159,211,169,125,0,157,52,102,146,187,116,0,121,193,100,45,104,44,237,122,44,69,206,138,38,36,6,191,195,155,65,117,94,48,164,83,123,105,160,149,160,250,85,85,8,202,231,126,120,145,192,54,159,229,44,61,161,224,149,180,84,44,242,43,49,10,86,111,185,217,33,85,178,193,6,139,170,39,216,64,253,132,174,246,95,72,175,122,80,247,9,191,139,40,133,102,16,123,213,28,247,119,0,208,11,166,178,6,62,191,100,133,192,61,199,109,59,62,205,45,125,242,209,114,78,196,173,55,168,40,3,191,59,57,120,45,254,214,126,137,75,208,211,142,226,218,241,209,215,92,142,43,55,97,154,144,107,234,82,42,17,158,158,13,103,195,82,94,59,146,83,53,160,129,11,180,42,147,36,38,172,55,110,202,250,93,113,100,168,75,14,
+102,37,130,126,160,121,187,180,91,188,96,231,217,166,52,75,251,94,77,238,150,67,81,230,103,188,255,196,225,217,221,110,173,107,127,202,25,162,206,67,180,103,165,9,189,51,209,203,219,58,242,106,149,144,24,13,98,82,79,76,212,243,239,73,146,81,92,46,85,242,150,209,102,132,17,143,133,53,131,46,103,200,233,26,22,157,112,139,112,15,203,112,108,161,98,64,249,10,222,22,98,70,6,48,170,101,44,26,175,21,17,201,134,10,213,104,211,218,247,96,2,130,134,25,115,159,109,152,227,28,63,159,115,56,115,134,98,163,47,141,40,19,157,195,48,182,59,12,138,33,4,140,35,68,158,209,43,87,162,176,116,114,109,149,44,220,27,240,237,232,85,11,30,45,106,135,228,88,119,117,183,176,127,29,229,26,229,18,7,105,243,102,46,212,114,161,153,186,114,129,64,70,222,51,91,112,93,164,111,92,148,136,199,49,29,65,99,241,237,106,232,200,109,201,158,144,32,184,105,242,62,141,225,178,188,95,79,197,109,212,86,158,240,96,179,129,220,28,230,47,84,130,38,48,3,106,
+119,165,184,42,240,220,48,162,226,181,65,198,245,54,134,125,196,47,3,40,122,61,11,29,115,17,182,23,247,238,118,232,188,239,108,18,101,196,230,188,237,27,137,225,232,181,226,208,4,103,115,202,140,206,234,209,9,226,17,157,216,89,99,244,110,92,158,30,14,208,194,174,73,194,47,248,250,196,49,126,95,12,118,26,180,56,103,101,72,76,224,175,177,235,80,71,81,137,240,96,58,60,66,75,36,219,105,202,188,38,134,109,137,24,36,187,11,94,224,73,196,39,151,127,31,208,105,232,199,87,23,47,236,38,154,194,102,91,93,18,27,155,181,147,195,117,71,199,191,116,59,16,31,139,44,69,84,92,95,14,42,234,225,145,62,53,234,235,242,222,69,21,80,229,58,49,148,233,0,55,92,233,58,12,88,68,170,221,153,195,196,84,100,206,167,95,13,53,249,223,122,93,167,176,223,33,229,2,8,151,76,219,231,251,204,132,227,126,163,165,247,115,185,235,190,144,68,187,213,213,57,183,60,6,17,97,71,20,103,190,85,244,54,12,161,49,20,56,241,19,147,182,149,107,237,146,
+121,243,218,242,2,165,142,4,215,83,14,3,180,20,248,205,165,84,80,158,203,158,101,198,124,250,99,245,161,80,103,7,183,23,228,192,26,29,156,222,209,138,153,235,237,171,86,235,236,145,10,186,192,8,199,33,84,116,246,156,205,165,143,233,196,220,167,141,2,217,223,91,20,189,142,232,46,58,150,175,167,69,20,117,218,235,78,33,93,226,20,35,190,188,240,38,164,76,14,145,133,99,250,158,142,80,193,245,82,95,20,108,85,149,69,210,99,65,144,175,133,92,50,233,187,82,189,53,83,59,96,196,243,214,79,58,179,109,116,166,20,107,214,169,59,229,14,149,32,65,54,174,161,1,189,220,145,10,94,224,194,161,59,128,6,104,115,123,124,64,196,133,178,190,123,213,159,89,29,2,95,245,107,120,83,87,195,242,36,76,95,76,236,8,116,243,150,95,170,38,90,167,88,55,28,145,35,30,137,64,136,180,93,235,241,192,185,215,30,150,46,228,100,94,151,11,116,93,141,115,164,71,32,80,201,213,208,53,9,151,67,78,37,196,76,24,69,203,57,199,137,92,62,165,205,133,
+61,139,183,0,156,116,135,45,12,91,203,161,215,206,89,35,171,167,191,196,146,89,247,216,35,41,0,177,104,185,0,49,67,71,209,0,184,103,84,55,168,148,137,77,164,234,95,159,124,154,87,185,78,89,198,187,158,239,104,204,62,166,14,90,221,214,248,201,159,18,69,216,96,175,191,221,100,145,198,93,54,165,109,148,200,98,33,103,208,100,75,36,228,144,117,84,201,102,181,157,120,95,221,105,176,77,86,89,225,41,179,58,1,210,157,60,231,254,17,76,69,24,142,194,228,16,252,202,48,104,197,64,163,166,19,42,57,163,81,132,122,1,102,85,124,193,43,67,14,120,238,8,227,105,5,186,221,167,179,190,230,146,237,20,4,229,176,98,65,89,15,209,133,157,14,51,127,46,189,87,214,122,207,49,128,25,28,161,110,189,102,38,152,63,225,181,190,34,240,185,132,255,74,255,89,22,124,38,7,159,131,175,4,86,95,213,127,173,43,216,165,23,219,91,250,150,191,143,183,53,249,137,153,73,232,47,23,13,229,163,251,137,234,186,226,184,209,225,133,165,188,214,207,30,162,208,
+84,26,224,47,186,149,108,154,16,38,226,194,50,61,133,101,90,66,107,26,116,33,234,231,234,46,245,39,52,68,124,118,185,118,205,37,237,30,242,202,35,237,207,157,16,70,33,40,92,178,189,83,255,240,48,180,103,41,0,185,100,175,87,158,87,114,66,1,55,102,192,182,199,98,114,51,220,188,220,40,182,202,14,26,69,201,106,53,194,121,0,77,231,35,105,246,105,78,168,18,109,53,13,87,51,243,238,131,113,203,6,191,86,91,54,213,11,171,172,62,185,148,90,158,171,183,219,233,24,48,18,8,161,34,201,80,212,19,21,233,65,68,10,158,198,140,215,248,122,55,10,76,186,181,143,162,159,175,104,227,44,6,28,66,61,90,158,244,147,21,181,124,196,32,0,60,157,175,188,234,8,63,226,230,16,149,78,87,13,90,108,65,181,184,46,70,205,1,16,95,191,230,175,203,253,81,169,39,167,142,251,33,117,149,195,118,32,220,6,224,90,115,251,92,95,221,233,64,10,148,201,57,23,188,169,4,14,14,17,146,177,120,129,235,211,146,208,89,214,151,79,179,22,52,5,219,
+217,207,205,117,242,196,156,134,47,101,103,215,219,230,64,88,222,217,152,90,45,129,72,146,219,90,216,82,167,91,64,205,188,79,150,64,132,168,4,152,240,178,51,157,114,159,218,71,45,93,162,181,19,57,134,214,122,40,120,33,96,95,151,211,169,0,203,151,135,194,133,116,52,44,165,19,10,70,133,232,120,46,173,119,137,231,201,236,69,86,204,231,229,146,172,176,144,78,200,94,56,136,134,222,36,27,20,124,167,164,118,158,236,140,38,72,32,161,120,27,119,220,244,179,241,246,228,1,245,200,10,246,83,239,52,218,38,120,81,219,74,68,1,86,42,94,26,153,77,50,250,28,240,136,191,182,8,212,223,110,93,228,133,26,188,205,113,216,234,82,211,82,45,73,108,125,39,203,54,31,58,70,61,200,27,121,223,78,214,220,44,188,199,229,23,224,173,93,37,165,248,60,147,246,29,95,43,34,208,202,72,90,81,60,33,228,39,37,125,218,75,32,36,205,159,217,23,222,133,173,119,16,57,5,243,244,122,138,8,253,137,56,210,237,50,36,12,161,247,253,186,72,151,132,25,146,
+146,152,38,17,209,120,17,15,88,34,42,37,19,74,62,157,83,49,154,120,147,66,225,186,91,169,250,93,56,87,61,225,44,62,85,102,173,210,61,252,236,106,168,154,175,7,78,27,0,248,41,184,56,138,47,192,26,89,25,140,86,187,241,45,130,16,223,61,62,236,49,164,43,171,118,101,58,43,47,106,69,191,109,186,224,183,13,216,96,117,201,8,86,180,127,203,230,197,237,3,152,6,182,59,2,215,95,79,42,136,51,190,124,6,21,161,95,53,112,114,130,55,235,117,93,170,167,229,165,7,232,188,103,34,146,141,12,169,17,100,97,163,189,91,20,169,105,205,142,129,147,98,35,88,94,31,222,110,238,48,50,15,131,208,178,133,154,19,40,95,198,193,55,97,76,160,70,198,224,52,77,41,64,222,84,202,155,106,121,238,107,46,255,234,144,175,175,163,94,144,139,136,1,63,187,228,27,56,126,190,156,201,24,204,249,188,250,136,77,231,111,194,40,75,221,156,55,158,117,249,176,30,154,111,219,21,210,110,153,189,202,169,59,189,166,23,22,181,131,137,7,184,120,62,195,34,
+234,36,110,115,254,206,113,134,203,250,112,193,190,198,149,143,236,52,54,104,31,66,103,59,244,91,235,157,140,11,241,203,19,100,1,88,198,54,38,114,79,25,251,113,153,161,1,144,60,92,140,159,81,114,187,19,145,134,12,152,158,236,229,33,253,112,111,116,251,244,221,96,228,41,131,253,224,52,14,103,51,118,248,210,251,49,243,137,160,114,243,158,46,16,234,7,128,208,48,248,167,94,154,238,212,203,55,20,236,248,73,217,30,110,166,187,15,153,127,247,175,15,44,237,121,48,211,27,155,17,57,212,249,149,198,237,216,34,140,115,148,174,222,87,49,35,44,220,171,105,164,70,38,218,160,112,242,203,154,114,70,105,92,177,134,5,215,25,23,217,109,252,230,113,2,93,95,178,109,173,243,60,11,51,227,141,250,11,184,124,12,187,47,45,205,201,220,82,189,77,240,67,54,234,192,58,22,129,146,22,89,172,64,112,139,49,193,158,78,203,225,23,68,99,164,153,231,95,218,122,244,172,183,223,37,99,96,33,73,187,15,247,67,86,147,76,115,183,209,218,218,250,145,120,76,198,
+72,205,164,99,117,234,23,47,155,167,215,101,209,84,140,92,91,239,179,18,170,162,242,156,209,138,253,181,50,231,72,9,254,176,134,56,86,86,138,41,181,146,103,51,175,164,224,51,180,95,76,89,226,138,5,151,212,155,6,135,115,209,107,93,197,125,3,162,81,86,211,17,51,192,236,233,27,55,254,132,13,240,235,172,183,67,118,109,50,16,40,128,167,176,130,33,171,54,81,79,241,152,5,242,209,142,156,211,76,34,94,138,221,23,13,60,229,126,22,32,162,109,221,56,58,234,190,87,82,159,1,198,149,217,134,205,119,225,38,114,162,52,191,101,22,240,10,196,157,15,4,63,133,84,57,159,80,136,244,236,68,16,241,150,60,45,214,12,119,242,73,218,216,103,177,132,184,122,137,231,0,180,248,55,198,1,223,107,163,136,104,128,134,135,60,170,13,114,48,155,136,156,85,103,150,157,141,54,60,75,227,239,43,232,65,120,186,195,231,217,233,40,135,230,197,209,51,184,235,5,228,225,226,205,30,184,207,203,202,169,143,0,149,111,231,217,121,184,114,60,98,192,181,113,109,82,
+46,30,1,121,150,98,129,82,44,2,2,226,65,49,114,191,162,200,211,104,238,233,96,176,191,176,47,109,37,89,1,95,209,245,37,232,136,89,142,22,142,67,253,21,181,135,55,54,123,40,180,42,52,52,21,147,42,110,179,137,232,27,168,154,112,205,242,97,219,10,90,45,3,28,42,247,115,166,5,111,50,153,20,109,188,126,156,155,201,225,196,211,177,45,214,230,17,132,249,107,41,150,133,145,245,211,132,216,232,128,227,121,108,91,80,134,85,227,185,176,64,32,80,123,232,94,138,158,20,28,133,70,211,170,98,18,162,148,36,86,194,211,104,188,109,32,229,245,117,144,115,38,181,189,51,194,25,214,17,48,201,119,164,54,207,138,42,91,0,192,104,52,218,25,51,5,220,124,91,67,233,97,226,236,168,197,224,181,32,132,179,185,54,139,28,59,221,210,137,202,103,97,42,9,33,7,0,64,176,225,169,166,186,201,175,125,228,251,44,115,161,220,46,251,41,217,206,14,198,98,70,164,116,130,36,64,107,132,69,141,80,130,166,114,65,188,107,214,103,153,172,252,37,185,143,122,
+145,114,74,47,162,122,208,105,28,87,73,146,60,114,71,2,149,80,45,188,204,198,76,146,177,148,88,125,134,123,134,161,112,249,144,215,245,148,249,122,42,25,145,231,128,103,76,143,169,209,85,9,51,232,185,81,64,93,229,199,33,89,143,218,186,107,51,13,205,151,145,66,105,205,213,118,107,26,130,4,125,73,159,14,30,43,107,31,160,153,68,113,76,20,114,36,154,204,225,20,146,90,101,107,125,182,18,184,122,205,198,65,197,48,175,253,192,217,135,103,183,42,176,154,163,44,158,74,29,150,189,102,147,192,4,53,250,214,128,13,229,141,158,36,226,13,58,207,9,42,14,32,195,172,164,126,21,230,77,28,248,32,227,121,166,119,170,81,59,180,154,61,226,146,179,75,178,50,255,46,204,143,94,216,95,181,87,5,39,154,239,33,45,187,135,228,173,52,13,43,147,33,122,114,236,147,168,206,50,63,196,16,111,242,25,191,200,150,27,194,5,103,147,144,236,243,178,204,9,237,4,131,2,181,245,214,156,103,53,137,7,208,37,220,4,96,249,34,78,177,4,34,200,251,71,177,
+197,135,57,248,57,16,116,170,11,130,138,102,70,249,103,158,234,15,117,143,196,131,115,11,202,111,207,144,179,141,245,89,32,4,188,164,100,37,87,165,11,167,125,168,53,225,26,129,10,177,213,103,58,125,173,184,74,71,33,28,214,16,44,68,6,179,239,29,19,178,40,106,173,138,77,215,111,212,208,74,228,89,246,196,150,228,76,194,247,55,74,98,212,237,86,130,224,97,140,169,105,234,215,78,66,224,140,12,249,210,140,78,148,20,34,119,143,65,109,169,14,61,133,213,128,161,61,211,27,128,26,150,154,214,185,25,157,108,151,128,196,94,87,199,89,44,54,35,7,142,171,235,235,207,0,133,133,91,127,46,130,12,135,209,94,97,131,10,239,240,84,25,126,158,248,210,165,206,182,23,59,191,17,188,2,140,233,226,223,124,64,166,215,241,212,119,68,68,237,92,7,86,48,63,250,104,57,72,154,179,234,213,41,106,11,157,81,202,207,12,168,58,34,90,22,202,176,152,166,109,85,242,226,202,39,106,28,157,153,148,32,168,248,155,140,201,39,216,139,35,69,14,196,80,14,247,
+112,177,131,212,238,133,138,148,23,255,65,205,197,164,125,87,187,218,179,219,158,35,56,117,95,184,64,155,115,102,20,170,28,153,35,74,137,186,93,0,158,203,60,187,209,149,184,235,88,125,213,92,25,179,64,57,146,165,227,218,84,88,227,167,32,245,226,48,234,73,224,232,36,57,136,109,198,183,25,131,67,157,153,131,223,227,197,109,54,39,178,61,245,1,65,106,167,3,149,39,130,40,58,120,200,209,128,170,178,202,241,170,166,70,219,208,165,30,224,203,88,46,81,173,85,205,78,231,88,145,46,239,106,78,162,224,98,58,252,174,173,47,134,97,232,80,149,238,92,32,153,12,139,89,132,103,199,224,12,2,223,157,181,188,218,138,157,241,82,241,6,169,59,51,170,12,236,41,141,213,27,141,10,100,107,178,252,119,32,155,149,208,51,95,116,137,116,84,202,162,37,88,172,154,159,98,168,17,107,190,56,207,233,82,82,103,38,95,87,237,104,129,250,250,156,244,82,177,190,147,220,168,33,16,202,11,125,236,73,155,134,131,13,153,205,232,60,19,135,118,195,79,169,62,222,216,
+235,114,39,76,151,106,246,4,141,235,43,108,96,1,62,8,23,129,41,24,163,76,8,141,159,251,31,141,197,4,182,102,242,58,40,182,132,35,157,65,19,108,68,217,211,182,49,43,94,47,133,168,210,39,110,126,22,55,8,70,96,196,51,175,88,208,133,162,9,35,34,16,230,202,129,224,74,123,41,105,172,190,244,19,240,105,162,198,132,54,57,245,253,220,54,207,42,156,103,99,180,202,30,222,77,253,246,60,51,138,108,51,139,82,165,222,148,178,106,215,250,134,178,209,54,57,82,23,22,43,7,251,46,88,244,140,175,184,201,205,96,118,48,253,25,109,30,70,244,103,199,94,162,133,159,222,248,0,109,248,76,38,219,224,219,10,128,39,171,177,229,2,1,69,198,162,3,241,227,232,249,77,124,214,21,3,226,192,251,91,65,13,183,59,117,211,210,130,77,102,168,16,11,66,196,215,53,163,230,193,179,247,198,60,69,179,188,106,2,211,213,164,245,247,241,139,214,150,174,125,188,66,239,252,115,132,213,112,52,41,14,39,62,174,95,214,116,128,229,69,253,136,201,18,30,18,
+235,147,93,123,61,231,27,170,94,150,125,188,248,235,201,27,82,214,9,231,173,232,114,102,131,234,102,7,89,160,191,49,136,187,216,17,18,83,226,56,161,150,82,101,205,204,96,22,6,100,88,103,215,154,138,196,141,199,78,8,27,104,42,30,50,117,193,210,246,151,126,89,217,72,207,33,174,101,98,72,161,237,168,150,175,226,194,186,70,91,122,235,153,41,140,6,103,94,18,233,89,96,104,136,237,57,230,14,135,189,241,97,101,7,6,236,67,89,114,235,123,163,240,2,37,230,218,12,62,22,221,214,87,23,54,247,20,241,114,191,96,103,103,98,163,35,162,202,57,242,96,56,175,34,215,203,81,37,84,58,51,9,109,211,6,42,28,159,177,4,89,85,63,33,202,9,18,203,186,204,208,91,128,16,188,134,66,100,31,244,27,188,201,38,4,119,46,185,183,18,231,120,31,229,224,17,43,194,175,119,248,54,90,247,216,128,198,42,181,152,215,237,92,145,196,85,33,195,109,1,191,79,44,204,65,141,124,172,165,110,159,67,162,121,243,112,221,148,170,209,130,19,33,197,170,242,
+112,98,40,46,131,51,118,218,90,90,56,68,198,72,52,41,84,164,229,95,7,233,86,218,223,75,205,121,8,228,235,161,220,87,70,54,39,67,114,9,203,129,161,217,33,47,119,70,245,15,198,67,103,94,19,251,9,238,150,241,121,16,1,178,244,229,206,138,102,73,198,51,175,38,133,252,16,171,86,149,207,57,142,190,84,25,235,33,181,197,65,212,199,201,181,221,204,88,60,4,228,187,35,135,222,123,114,41,238,159,100,87,47,117,73,155,199,52,242,134,182,127,102,230,253,167,142,14,114,194,87,111,229,218,41,220,254,72,215,251,146,3,138,251,229,183,26,11,15,69,96,131,73,82,15,15,113,126,37,97,103,132,149,14,29,153,108,214,173,244,169,26,131,240,108,89,240,205,163,233,139,60,75,50,97,31,141,63,112,176,57,76,8,137,24,219,136,82,78,36,134,94,17,51,19,190,109,115,212,14,1,196,142,230,186,88,142,154,156,67,160,157,76,69,243,77,10,245,140,166,206,242,14,112,121,158,215,164,94,67,128,242,144,184,184,150,9,210,68,237,9,25,224,243,237,8,
+3,63,171,3,40,140,49,162,50,0,65,156,67,130,106,99,31,139,40,158,208,248,62,183,180,51,157,18,75,239,164,163,251,88,66,164,179,30,12,221,207,218,99,30,58,113,79,161,123,68,227,106,136,251,114,100,130,62,197,96,177,164,51,0,15,132,185,177,47,138,3,245,36,25,175,170,142,146,112,125,81,124,111,2,207,35,240,8,105,99,39,2,34,219,254,128,102,186,214,182,5,5,96,240,249,89,8,44,97,38,230,100,80,187,66,180,74,248,152,17,68,115,135,53,136,2,42,149,35,195,137,60,100,96,15,201,211,213,235,69,69,24,1,224,107,183,100,255,137,158,164,242,185,166,6,170,222,26,145,158,62,38,149,222,123,147,93,62,217,221,182,4,34,130,135,191,66,119,136,202,134,0,36,82,8,220,103,15,80,254,92,80,122,100,129,164,16,149,3,45,203,33,223,66,227,217,211,223,77,65,170,128,144,242,17,177,104,19,121,98,106,240,189,142,79,1,114,3,153,198,81,136,114,85,214,170,39,96,47,214,253,91,15,214,205,7,98,104,66,28,13,205,60,197,157,84,
+169,26,112,151,214,251,4,55,67,193,5,27,48,58,212,2,229,169,127,82,16,116,111,20,96,0,149,72,61,111,247,37,139,96,24,102,26,5,201,252,60,53,81,249,246,40,41,187,162,113,237,24,19,131,192,10,236,66,68,96,140,98,101,196,184,82,28,65,235,222,243,145,153,56,37,146,6,21,243,87,20,142,170,195,140,128,93,247,218,154,9,232,159,187,152,215,33,184,8,5,122,175,146,97,226,211,17,7,123,238,230,50,124,245,252,81,168,196,129,120,25,216,254,241,38,124,134,78,197,148,27,28,87,87,69,82,29,38,172,55,36,64,196,195,75,127,125,136,181,47,252,205,224,157,84,86,94,39,248,53,154,13,47,1,112,163,91,117,51,162,105,207,208,76,214,215,183,171,131,67,181,59,19,18,196,219,36,155,176,181,33,40,225,51,229,20,216,183,199,91,130,75,163,43,24,51,212,100,216,216,221,22,90,193,126,8,130,202,220,211,139,93,96,254,27,244,202,190,65,239,9,148,161,10,189,242,184,111,168,35,61,64,239,188,251,13,122,221,197,111,208,107,76,255,22,244,
+70,191,65,47,87,251,13,122,187,196,111,208,139,46,125,131,94,136,233,27,244,226,106,223,160,23,17,82,42,160,125,123,204,130,251,6,189,68,201,55,232,61,109,191,65,47,166,255,13,122,205,192,111,208,155,210,125,131,222,230,230,27,244,158,5,223,160,183,178,204,235,81,52,27,192,100,56,94,110,216,73,199,208,102,249,82,224,112,39,218,239,191,207,1,192,182,114,13,6,169,184,145,96,209,173,2,137,192,171,215,106,70,136,153,229,56,186,131,160,218,255,240,203,34,160,69,194,202,112,219,74,159,36,83,233,217,18,124,174,59,146,207,250,40,205,164,10,209,28,49,26,126,17,221,182,7,171,230,100,5,72,233,143,154,87,101,37,55,91,37,76,137,120,193,157,70,42,152,106,217,54,130,81,112,250,109,131,215,184,236,165,224,176,253,171,94,183,6,225,159,122,106,69,219,121,247,95,150,11,147,13,111,175,81,245,51,71,57,53,193,50,123,243,122,21,89,215,189,155,167,203,183,86,38,56,207,5,107,139,76,80,19,207,105,198,41,84,155,240,194,52,201,202,146,143,139,
+35,73,151,224,142,51,48,76,97,27,85,40,88,41,22,171,48,249,187,75,126,234,154,205,213,183,238,44,244,32,213,162,151,101,106,75,38,155,219,190,206,113,205,79,77,187,113,184,64,217,202,11,201,246,114,207,114,166,106,210,254,166,122,61,83,113,111,41,68,129,55,97,21,229,96,57,120,61,120,119,132,195,138,91,30,35,187,213,19,104,51,195,192,168,37,8,83,12,90,247,100,244,42,158,128,113,204,167,48,142,113,141,97,28,145,4,6,69,99,208,68,204,110,67,218,110,140,231,23,119,150,76,242,199,195,176,237,51,134,125,217,118,194,93,241,254,245,173,8,23,152,139,213,104,189,221,220,230,87,77,179,43,209,36,13,73,140,207,84,170,86,247,88,101,203,190,100,94,188,138,102,81,108,157,169,114,55,149,232,170,48,63,83,68,80,13,18,217,164,219,234,123,213,150,187,103,254,74,244,194,52,6,42,208,117,95,135,31,243,76,205,176,227,42,96,228,116,153,34,231,228,229,247,188,28,231,206,59,193,232,5,38,14,218,142,201,109,215,169,246,20,225,104,213,190,126,
+150,229,254,10,184,166,85,79,123,202,237,103,13,164,131,134,23,224,194,245,128,34,8,244,160,178,16,194,62,254,88,210,248,165,23,34,85,165,131,137,253,17,174,249,172,121,61,139,104,52,39,17,179,121,195,44,240,53,231,170,100,248,60,99,158,63,81,182,245,91,69,18,180,120,208,254,33,75,115,89,105,101,205,167,192,70,109,65,8,39,220,230,201,114,79,46,62,141,151,196,166,60,139,87,65,185,174,86,197,216,122,47,48,161,250,12,86,79,88,65,192,115,169,186,237,158,6,174,76,205,5,40,56,93,163,232,227,31,222,98,120,22,76,200,192,21,30,8,129,21,218,141,160,182,235,177,217,216,106,59,13,47,104,153,226,40,45,105,23,5,153,38,48,143,181,85,122,113,187,234,225,41,206,245,98,190,207,216,32,157,141,74,189,77,73,219,151,174,28,76,60,109,54,2,178,192,184,201,63,17,166,123,94,138,193,149,251,171,100,87,154,46,18,74,94,112,141,247,39,253,59,70,111,50,192,100,147,219,115,164,126,19,34,110,129,149,147,63,181,124,250,70,208,56,56,19,
+36,176,219,159,71,103,101,150,71,52,51,194,129,46,39,196,26,109,180,193,206,58,190,172,243,7,40,200,240,124,189,97,99,157,218,182,59,47,5,38,246,68,134,252,226,141,235,34,224,188,254,70,245,127,50,130,247,79,231,87,46,83,225,14,111,88,232,135,194,52,148,123,17,114,176,255,198,61,136,144,121,98,186,10,213,72,210,176,170,174,118,239,117,4,151,186,104,149,219,89,214,231,90,238,102,86,84,222,195,120,152,154,185,55,190,35,84,207,179,103,115,165,177,221,218,13,53,46,142,240,73,220,239,25,243,145,23,201,94,84,22,80,85,104,58,62,171,208,250,50,112,254,196,139,206,223,32,85,204,105,20,27,97,46,68,89,143,92,176,10,253,207,180,197,218,147,212,171,26,79,195,75,45,116,56,190,51,43,2,105,144,254,68,226,35,165,132,39,28,152,14,32,249,116,138,48,156,138,91,57,154,159,93,118,85,76,176,191,240,162,61,136,28,76,99,101,131,170,40,84,228,119,215,82,204,231,185,82,251,28,1,43,169,58,159,39,69,167,204,54,241,238,41,126,113,144,
+246,103,137,195,135,153,104,227,152,144,207,68,76,241,108,43,176,97,134,65,195,33,155,174,172,10,5,237,142,94,31,1,198,212,50,219,116,198,253,5,234,99,215,209,94,86,86,137,19,46,45,129,162,177,59,59,97,154,18,35,64,121,245,210,215,54,47,138,197,37,151,240,134,243,199,219,181,41,145,130,181,245,7,207,126,178,25,252,236,130,37,121,255,16,151,40,35,41,116,50,220,159,140,187,16,190,201,129,227,92,210,23,82,231,41,241,108,134,171,180,39,141,126,112,146,208,41,66,198,128,41,162,53,13,161,234,235,20,54,166,251,123,70,47,219,8,66,248,44,25,95,132,202,199,147,213,66,109,232,190,203,74,138,38,12,176,130,73,242,5,165,29,233,200,15,81,173,58,137,227,100,183,150,241,22,99,171,110,127,33,167,107,207,80,54,217,97,208,119,94,245,241,104,131,70,29,179,24,238,178,253,115,14,253,72,42,6,50,111,228,232,19,158,184,114,176,68,106,19,227,37,34,50,241,62,156,52,12,61,48,254,218,184,87,142,164,117,205,59,5,39,125,131,221,136,136,
+152,33,44,190,200,211,56,101,42,195,177,216,90,51,108,98,217,74,71,201,233,165,93,53,10,129,205,131,140,245,128,189,186,149,150,249,128,189,62,239,52,250,128,189,244,62,77,246,128,189,218,39,52,241,1,123,159,176,70,194,3,246,142,137,111,168,7,236,245,0,178,220,7,236,13,21,20,130,7,236,149,56,198,142,7,236,157,85,204,172,7,236,237,115,71,144,7,236,53,109,188,165,7,236,229,28,26,192,7,236,5,237,184,161,7,236,93,1,232,16,88,27,42,161,132,148,19,193,146,237,3,101,136,172,155,63,30,4,205,207,110,247,135,51,253,118,71,33,219,171,134,49,157,22,248,67,185,38,153,75,89,129,162,110,159,235,234,92,251,207,244,17,201,154,109,235,86,72,194,122,223,43,142,57,82,33,8,4,229,17,41,42,144,213,64,81,21,252,124,226,149,46,22,174,219,60,85,118,202,103,207,16,211,44,138,195,114,8,107,153,134,199,238,183,157,60,48,223,37,26,115,199,14,51,221,13,133,60,250,38,102,235,152,220,191,216,124,186,164,15,155,101,246,7,78,94,
+153,188,134,14,212,252,211,140,234,25,146,207,51,112,3,189,254,84,152,198,24,187,122,254,162,152,77,164,205,254,100,85,53,12,206,202,172,162,24,239,177,6,235,214,219,90,88,155,173,35,58,155,36,82,1,93,148,31,19,3,236,131,24,178,180,230,76,0,181,203,36,45,152,100,192,128,201,26,208,24,165,173,213,100,233,89,134,200,206,87,116,198,16,254,83,31,68,168,200,117,252,84,64,10,3,2,4,85,158,43,174,55,50,70,239,209,116,181,247,33,220,85,39,45,35,95,75,233,147,168,50,163,214,244,64,189,159,131,182,239,129,122,17,47,122,193,3,245,202,248,54,139,18,27,13,226,184,241,192,125,26,135,164,39,220,196,3,245,58,63,162,167,167,155,220,79,221,138,117,15,212,235,40,110,57,69,79,22,34,226,24,228,15,212,251,230,87,219,31,168,55,136,197,37,31,168,23,119,98,35,127,160,94,250,108,245,64,189,43,131,98,242,64,189,242,175,104,63,80,239,185,33,250,120,160,222,194,48,84,121,160,222,205,44,35,127,160,222,201,146,196,127,160,94,156,58,
+195,125,160,94,176,16,184,123,160,94,89,127,156,125,160,94,84,255,171,184,178,226,88,81,167,67,244,64,189,100,3,183,248,64,189,42,169,95,247,64,189,68,73,203,242,64,189,196,41,147,249,64,189,0,58,181,255,64,189,0,114,151,254,64,189,128,5,141,245,64,189,241,217,215,164,193,239,240,8,243,99,220,233,212,32,47,0,244,64,189,101,157,160,252,64,189,101,108,243,249,129,122,39,94,73,235,129,122,95,131,134,166,135,159,210,160,82,67,150,162,78,195,188,36,26,52,125,92,47,238,188,15,32,52,222,4,191,170,68,150,206,142,61,247,230,152,0,222,232,175,61,62,104,244,181,118,206,2,202,207,221,170,190,138,41,84,31,171,45,101,125,70,131,226,92,236,197,205,235,166,120,23,55,53,77,41,169,188,229,35,196,208,243,4,92,87,145,117,70,234,17,53,173,108,116,35,27,55,183,163,182,97,165,96,122,141,160,49,104,93,161,87,196,22,76,206,150,139,239,124,9,66,159,145,172,126,40,249,195,118,224,224,134,58,124,104,217,182,178,112,101,98,96,209,69,68,
+102,171,106,59,216,218,229,91,237,135,159,215,217,90,248,53,186,47,196,232,230,117,31,1,87,245,193,30,33,243,182,78,155,172,34,186,99,32,162,137,195,12,113,99,154,84,191,138,63,178,138,65,150,158,143,24,199,196,158,112,220,179,124,244,232,145,49,62,173,193,177,46,178,215,49,68,10,118,232,190,134,149,73,167,102,122,40,220,142,80,49,122,197,171,39,187,253,12,198,7,224,95,25,30,217,150,30,255,168,241,234,110,87,189,97,46,13,85,89,85,1,208,59,141,247,167,81,137,144,70,192,5,4,25,21,211,77,208,90,103,207,14,211,201,193,31,168,183,80,181,224,161,157,144,92,138,117,87,31,168,183,12,231,26,31,168,55,247,102,46,60,80,175,168,114,249,129,122,143,130,235,226,129,122,3,60,142,233,129,122,203,87,67,231,129,122,207,4,193,237,129,122,223,46,203,251,3,245,226,108,229,201,3,245,174,205,97,254,3,245,98,51,160,246,3,245,150,206,91,227,3,245,106,93,111,227,7,234,237,64,209,235,31,168,119,145,194,61,80,175,233,157,77,122,160,94,
+235,190,145,120,160,222,133,38,56,123,160,94,83,143,78,120,160,222,243,26,163,127,160,222,77,128,22,126,160,222,250,215,207,3,245,110,97,167,193,3,245,146,197,4,254,3,245,226,20,149,200,3,245,214,180,68,242,3,245,42,98,216,214,3,245,218,224,5,222,3,245,158,247,1,221,3,245,18,121,97,247,3,245,70,235,146,216,3,245,194,174,59,250,3,245,122,64,44,242,3,245,110,109,43,185,191,167,67,99,123,93,237,7,81,9,148,43,171,123,17,240,184,137,71,38,239,45,217,233,117,94,87,168,26,185,211,24,100,238,189,217,133,41,138,183,228,7,185,120,73,8,184,195,168,137,249,91,18,18,185,132,43,170,98,209,45,185,252,26,63,83,98,176,9,163,171,165,99,64,92,179,122,172,120,238,145,183,22,127,214,196,132,225,61,153,65,42,17,114,121,241,173,116,68,154,98,81,142,134,133,240,171,106,241,175,209,211,100,123,9,157,132,29,135,227,184,39,51,98,159,253,210,97,51,216,51,182,219,18,27,8,43,31,73,173,61,80,196,196,179,244,112,160,132,193,65,
+76,56,140,1,131,148,69,238,44,208,229,174,137,239,95,94,56,19,182,185,34,116,152,131,14,123,213,177,22,84,29,162,104,226,137,236,41,17,190,60,197,16,196,60,145,146,7,164,70,232,156,117,189,77,50,136,176,16,144,169,39,85,72,199,152,145,190,181,155,140,153,197,155,155,193,234,154,76,88,229,158,125,227,127,47,167,42,144,16,159,242,220,6,129,60,153,58,206,41,197,198,0,98,111,57,200,197,106,87,92,162,91,37,106,104,63,194,113,190,195,135,117,67,148,151,53,163,75,116,204,235,103,238,153,140,72,187,141,82,63,110,31,99,10,202,92,32,131,131,23,79,86,115,149,156,68,184,113,170,203,178,206,20,143,145,160,167,53,120,76,10,6,26,165,158,244,197,204,146,18,7,245,156,128,40,84,201,63,59,7,133,66,249,110,32,225,173,239,25,184,20,202,58,241,141,190,235,100,50,13,227,138,248,244,76,97,14,67,111,0,78,6,106,83,66,229,124,157,70,168,2,216,216,220,121,214,160,213,86,147,67,76,180,143,118,74,2,49,109,203,123,206,20,63,141,53,
+133,149,210,23,93,149,67,140,149,202,7,126,45,94,247,221,46,241,33,60,213,174,69,166,144,46,63,60,215,39,218,87,180,44,38,122,61,111,175,167,29,98,190,203,140,228,102,47,97,224,245,246,193,52,71,250,118,13,146,173,116,193,38,167,104,82,203,78,171,74,77,119,90,38,204,80,172,88,120,150,15,90,16,19,234,41,48,147,139,1,32,130,210,173,82,31,175,227,125,65,206,28,189,14,208,49,43,253,169,113,73,198,152,187,117,3,17,55,220,186,81,165,187,108,144,232,194,138,43,235,84,233,78,135,16,0,65,30,194,106,65,136,180,5,199,155,116,168,5,86,65,241,142,66,26,150,50,92,51,213,250,136,100,200,247,201,146,115,150,148,115,209,225,28,48,104,181,239,175,8,20,238,128,222,52,207,1,187,61,222,233,215,75,240,29,133,251,170,131,55,72,64,104,186,43,238,215,196,117,107,105,219,9,24,41,31,126,169,82,70,109,237,207,31,59,51,133,187,253,192,201,166,190,171,25,91,26,120,63,213,2,163,225,169,213,216,25,191,42,133,48,109,36,225,133,121,
+88,128,76,134,200,177,222,78,90,58,255,108,60,84,138,165,82,206,106,189,113,218,60,203,59,48,111,120,2,221,34,188,113,61,131,79,122,120,149,170,100,172,226,93,224,253,53,148,77,50,65,238,78,62,20,234,212,85,195,124,16,103,126,246,123,219,162,200,34,225,151,168,239,152,39,37,93,168,162,3,9,21,99,56,196,106,208,243,242,38,81,17,150,60,149,112,56,5,155,216,132,222,206,194,147,103,21,60,223,211,121,184,219,226,147,46,3,8,2,193,118,29,129,5,85,215,171,45,51,47,204,118,107,102,82,126,39,106,92,80,162,53,251,244,98,205,42,214,6,197,96,93,140,175,5,212,89,1,151,110,113,232,128,211,11,213,229,118,181,37,252,237,208,59,98,31,240,70,77,30,236,69,12,250,34,135,28,223,69,66,165,216,231,189,183,8,100,194,208,13,248,202,181,159,199,118,97,198,208,111,190,113,94,169,39,123,196,156,14,205,19,243,65,96,176,164,249,43,230,234,139,185,142,191,191,99,9,68,8,31,11,102,76,91,146,225,117,121,37,86,146,121,90,52,77,79,
+45,79,27,66,36,53,232,220,110,243,64,160,120,244,211,38,50,100,81,79,44,202,7,162,175,201,163,22,176,95,114,78,129,232,124,61,199,118,207,207,19,164,82,102,124,39,77,67,226,105,241,41,38,125,17,171,58,47,204,166,83,203,151,111,221,152,89,88,99,194,109,9,21,192,172,8,38,64,148,28,140,90,24,165,250,93,1,62,94,129,16,176,114,27,62,101,136,31,83,34,113,76,197,225,86,186,62,238,124,203,205,251,170,185,220,138,151,155,111,163,164,40,107,239,108,199,30,17,210,210,144,173,38,118,47,156,224,27,144,73,135,71,179,205,36,247,27,114,124,121,237,106,8,180,231,65,148,70,236,19,9,3,81,94,247,148,16,60,143,41,78,156,51,147,174,178,201,209,244,164,254,121,21,94,136,164,211,169,12,135,229,95,66,163,132,186,182,153,247,142,155,2,100,99,88,65,244,144,83,71,24,40,203,145,200,226,59,73,97,13,137,11,24,148,134,157,87,27,149,204,66,241,118,240,39,53,80,202,238,192,74,184,175,125,227,254,181,227,163,114,59,61,142,153,102,211,
+103,24,70,169,85,168,184,34,213,111,50,53,113,45,83,243,49,90,7,192,104,87,138,36,6,25,96,152,189,46,50,179,5,20,32,46,155,117,195,238,134,150,210,247,202,141,206,123,145,139,109,183,4,147,9,160,139,5,181,180,182,1,224,209,135,139,168,83,170,47,218,184,134,139,145,243,49,248,24,36,109,48,8,202,16,148,90,115,54,155,229,113,201,53,25,94,21,224,61,248,7,88,195,81,219,66,207,24,132,70,199,18,168,119,217,231,244,9,161,6,99,203,207,152,40,78,205,144,200,24,138,153,140,161,146,209,100,50,46,141,93,180,26,116,111,215,76,160,239,209,198,62,157,222,254,237,134,10,193,152,183,219,241,248,101,7,219,87,236,130,223,203,251,171,58,86,29,11,170,99,134,166,73,126,214,42,44,199,113,121,181,86,115,133,152,166,23,105,7,147,246,123,120,96,142,204,44,62,220,184,214,187,162,250,206,218,88,191,166,51,110,200,175,55,55,62,147,13,170,209,127,160,224,130,236,20,242,62,1,76,225,240,34,144,165,102,189,29,42,84,68,86,140,77,112,43,
+141,9,105,13,213,18,145,179,240,69,157,50,46,63,45,177,79,227,36,145,1,104,224,32,56,135,205,222,78,2,236,204,231,138,123,37,120,37,18,160,31,132,134,65,34,148,39,236,117,144,241,72,204,154,11,249,105,165,58,140,150,151,249,29,42,73,135,97,189,165,173,147,120,169,12,39,118,66,241,194,195,20,88,165,33,3,27,184,22,44,175,22,145,223,32,88,171,202,5,58,148,65,47,182,178,10,234,40,89,170,89,82,250,137,179,21,238,157,79,93,198,224,29,170,58,224,154,75,211,121,4,174,71,106,85,239,98,234,120,111,223,150,215,105,140,21,18,99,187,50,241,177,237,125,221,113,15,239,162,49,10,52,42,34,200,78,152,248,25,114,193,168,215,229,231,17,51,195,207,217,73,205,155,155,56,54,61,61,53,179,47,132,185,57,22,119,171,7,101,202,11,27,210,210,175,3,122,60,238,250,121,42,186,222,251,179,58,121,110,212,149,7,52,187,145,191,87,180,14,190,216,147,50,140,185,106,14,235,152,25,147,125,41,247,103,49,162,28,236,126,179,73,203,149,22,84,
+15,118,172,176,58,111,235,250,210,42,209,245,77,57,165,172,229,226,223,209,146,182,188,211,182,126,232,187,17,144,80,119,147,125,106,150,43,63,169,139,244,88,108,247,23,122,81,228,145,62,57,226,248,59,84,152,150,177,145,200,71,127,112,23,249,58,20,80,26,136,186,163,21,249,188,133,215,2,77,171,55,60,234,148,238,215,121,170,240,238,132,174,107,110,63,255,104,84,175,137,121,103,134,128,12,240,237,117,36,30,59,74,31,250,164,246,101,252,214,211,245,209,235,167,202,30,120,53,31,193,80,124,21,34,132,222,243,95,243,236,41,41,10,28,68,89,22,62,98,235,165,7,97,153,223,242,81,246,55,217,87,187,21,97,219,22,243,8,8,200,159,61,33,160,187,136,149,209,49,35,138,94,108,38,194,194,35,32,121,96,49,8,36,61,200,174,15,39,3,76,60,200,2,60,0,1,117,11,158,93,7,10,105,228,79,167,147,90,170,86,31,218,55,115,12,39,2,5,40,170,122,96,69,46,82,34,249,88,135,168,137,114,39,54,50,133,82,195,164,102,138,186,55,110,179,19,
+98,163,54,110,103,252,120,219,141,28,78,15,18,139,42,192,83,149,212,172,246,192,188,222,211,55,230,77,247,191,49,47,255,253,27,243,166,117,223,152,215,6,216,74,51,44,11,111,158,177,105,181,248,189,75,9,163,87,198,153,143,143,215,106,188,7,202,218,162,111,180,145,106,124,98,116,214,79,251,13,23,206,10,30,48,27,154,28,172,203,176,180,22,222,132,14,114,71,184,80,90,163,209,24,21,233,226,51,185,216,29,64,223,206,149,236,214,140,227,85,108,82,112,17,72,226,131,197,99,163,168,34,139,232,226,62,212,155,7,0,28,212,84,148,207,162,75,103,128,236,71,78,180,235,22,191,196,154,184,55,81,191,81,43,24,33,17,144,42,134,80,69,166,62,201,88,249,198,49,233,176,117,166,130,16,91,7,19,207,233,251,52,167,226,183,106,6,142,50,63,134,216,162,192,158,66,19,121,110,98,197,207,40,116,127,190,135,163,208,96,248,88,208,225,192,232,210,29,108,139,218,3,12,177,53,182,92,85,34,0,166,155,122,2,117,145,73,142,88,53,104,227,204,51,251,68,
+119,84,0,37,70,106,155,141,161,247,102,147,235,117,210,107,160,204,97,22,83,158,236,16,203,229,178,68,129,205,206,33,73,154,198,124,111,201,114,90,235,133,189,148,172,91,81,221,61,151,107,91,249,62,10,6,39,106,189,94,23,103,37,195,203,171,76,170,36,192,104,102,124,126,70,165,8,9,192,152,194,96,224,217,22,35,58,212,110,66,117,129,202,154,176,19,229,236,138,210,246,118,87,10,40,16,103,69,231,229,204,102,248,226,91,0,49,19,58,74,199,122,201,246,82,99,33,124,19,62,144,165,79,198,222,141,211,146,14,194,112,45,159,103,249,82,95,179,46,240,172,252,247,5,114,38,199,97,6,111,153,180,94,138,128,52,49,107,84,242,213,104,84,196,174,102,232,236,217,55,65,188,242,152,44,182,47,143,218,219,85,107,61,3,202,72,99,71,65,71,145,134,24,164,129,114,176,36,80,74,110,150,231,49,68,60,28,111,183,91,219,77,122,230,35,196,12,173,80,39,52,68,226,232,13,237,118,203,64,201,157,43,135,141,59,105,85,171,40,14,211,181,134,99,163,37,
+52,108,163,99,202,6,135,118,23,234,199,13,148,10,105,23,201,211,210,194,121,52,124,11,42,51,62,223,43,58,7,75,89,91,246,65,127,123,230,239,136,79,80,246,196,228,145,96,228,190,15,35,170,99,70,109,112,141,22,48,197,139,38,33,86,219,135,241,60,200,172,183,138,3,114,111,110,82,109,5,155,83,8,167,54,204,239,253,171,210,198,238,95,223,27,168,211,244,160,109,162,56,82,44,115,116,216,129,185,18,245,12,147,74,11,212,66,9,219,145,235,124,232,221,134,176,37,68,109,154,212,79,28,3,216,71,158,106,115,98,8,47,56,61,94,145,238,126,23,53,21,188,142,147,41,133,246,2,165,109,89,111,153,138,76,4,94,238,142,228,195,251,171,1,48,15,74,181,37,37,37,246,242,90,135,34,77,124,149,231,188,56,128,70,49,189,119,209,152,191,190,88,183,184,220,81,57,76,152,167,185,176,4,206,216,118,114,11,211,74,225,218,9,164,128,6,118,244,85,45,27,237,149,5,174,242,53,153,12,118,219,10,197,228,205,100,138,3,20,216,26,40,28,86,249,201,
+27,49,122,203,230,237,122,153,7,7,7,177,176,186,211,183,73,233,45,233,94,226,253,16,77,108,99,98,140,5,91,3,222,86,171,173,143,60,224,67,129,27,12,174,236,85,62,59,92,28,106,188,167,241,85,61,204,238,136,121,235,49,169,69,156,100,156,18,102,92,70,134,24,234,207,131,239,55,218,252,160,23,108,40,165,161,182,201,252,114,9,0,111,84,217,230,120,32,140,255,148,180,35,246,67,139,0,108,183,140,214,37,103,215,6,96,26,77,28,204,59,63,179,17,157,149,229,140,0,60,166,248,41,227,177,236,197,8,22,8,158,252,151,10,40,84,143,95,143,50,97,25,14,109,58,74,150,4,57,172,152,121,74,168,62,78,49,92,199,202,93,37,87,107,72,93,63,215,88,116,152,132,121,74,234,3,3,48,120,221,157,231,44,6,231,17,14,172,238,221,118,219,242,228,130,213,147,192,175,21,74,151,205,111,117,21,135,137,158,18,72,209,195,181,254,29,63,68,64,243,219,43,62,208,215,116,214,1,64,250,179,212,247,96,81,20,249,136,213,159,112,38,82,0,221,51,
+210,118,113,116,41,82,211,64,120,168,90,193,150,64,180,116,170,99,184,60,153,146,14,109,61,123,105,32,157,157,27,11,99,126,142,171,205,139,105,70,106,237,184,152,85,211,42,60,20,22,195,215,225,75,109,17,26,23,222,56,28,51,19,60,79,121,118,243,14,228,65,48,249,190,31,180,55,152,14,255,160,189,207,14,202,94,146,113,178,17,92,82,130,208,234,247,129,206,35,165,51,146,83,98,35,164,180,63,129,195,122,181,52,145,253,85,23,145,95,77,200,172,197,82,244,46,52,154,25,221,88,15,14,222,20,252,11,36,87,81,65,124,117,66,75,59,108,117,214,219,145,105,115,140,111,54,179,118,13,150,34,209,74,141,89,151,195,94,71,224,212,180,57,136,11,220,215,51,187,41,81,103,119,16,95,3,34,194,16,59,242,190,163,218,176,170,114,167,165,236,2,164,127,63,134,143,162,252,128,124,85,132,196,117,207,158,227,91,21,92,105,210,0,193,46,102,58,183,44,226,29,35,87,165,145,253,20,233,8,82,234,193,121,145,21,87,53,48,78,144,44,145,78,237,56,150,
+29,115,121,127,72,198,118,129,209,38,245,124,29,32,79,200,205,40,158,99,43,112,113,117,120,187,216,24,0,172,232,86,22,8,109,197,189,195,201,4,254,28,243,102,180,53,193,60,166,45,119,250,184,10,187,159,13,0,114,48,94,50,51,205,55,49,227,229,190,84,126,184,151,158,190,90,19,109,174,121,107,25,47,119,109,212,172,187,56,57,145,139,12,252,255,55,113,239,249,227,238,151,221,135,253,43,11,35,48,164,24,146,146,64,72,224,228,69,32,9,14,98,56,78,130,40,121,21,216,216,246,147,189,176,180,171,252,118,55,182,1,191,96,29,146,195,97,31,146,51,236,189,183,97,29,246,58,195,222,235,176,247,222,134,189,51,36,103,87,187,43,201,209,42,9,144,239,23,124,134,188,207,189,247,124,206,185,157,207,225,231,112,236,230,119,185,42,84,54,186,240,233,68,153,163,11,100,15,122,98,160,45,128,71,176,129,235,115,240,136,154,200,177,173,99,123,52,61,209,89,110,97,130,37,25,78,67,190,6,165,90,27,108,78,176,85,29,247,219,228,83,208,144,95,60,85,
+195,211,8,166,230,29,62,172,10,11,202,221,222,41,138,214,138,137,163,215,62,158,16,233,69,46,160,127,116,32,140,130,90,10,164,11,155,158,132,9,141,7,213,66,132,64,248,167,120,196,54,23,10,107,179,142,117,133,245,228,204,210,25,133,196,51,230,5,6,55,166,231,116,205,177,98,43,249,77,189,223,171,86,114,100,178,6,159,228,3,115,88,211,129,30,76,95,31,178,197,54,255,137,74,36,214,247,252,97,230,94,28,245,124,72,135,31,32,249,58,105,78,204,210,185,105,55,162,37,104,196,42,45,67,249,204,178,16,207,231,64,177,50,19,118,10,218,208,103,96,27,186,143,244,216,139,195,244,195,2,31,218,78,82,185,101,178,233,200,193,106,194,30,114,89,249,42,192,243,4,208,197,23,187,16,231,93,220,13,236,179,111,139,49,25,240,150,6,198,211,151,245,184,15,145,128,57,65,64,31,9,232,74,46,243,63,8,122,73,231,59,150,142,234,130,120,41,13,236,139,1,14,22,237,94,132,6,210,174,222,91,216,8,0,122,233,31,11,216,82,29,67,153,182,193,110,
+50,226,72,171,38,8,47,131,172,75,240,61,173,157,31,164,179,22,117,133,168,61,49,121,30,36,194,122,9,225,114,34,208,160,120,47,102,13,34,25,246,69,90,43,148,154,240,26,6,12,241,150,123,225,54,216,179,27,24,106,208,1,157,40,52,241,68,18,228,160,107,58,31,36,73,148,92,8,33,65,182,18,225,214,29,30,72,78,151,83,13,26,164,187,119,49,161,58,3,180,116,158,97,76,159,209,79,2,4,35,208,157,142,31,201,134,38,72,101,150,74,200,205,44,224,58,13,224,157,189,146,192,151,3,134,77,173,100,136,108,238,213,202,224,90,167,137,247,207,17,10,40,39,164,249,125,172,190,31,222,114,192,135,213,227,225,44,0,125,14,3,228,235,36,84,234,238,116,65,120,34,22,92,67,251,35,228,9,202,84,251,129,27,30,17,171,173,67,153,82,10,162,238,20,27,67,215,95,67,175,56,126,15,45,80,203,82,154,181,222,135,20,21,126,192,6,196,135,128,155,204,69,189,247,28,5,208,9,40,49,10,202,89,107,125,202,105,185,16,105,167,110,250,42,13,240,
+83,173,221,137,244,138,209,196,116,44,10,190,243,200,49,156,75,19,64,149,233,84,166,216,246,133,15,61,134,36,180,7,181,34,68,97,61,31,65,167,36,148,15,147,35,60,229,72,211,242,182,206,54,133,80,156,137,118,247,76,169,29,68,147,207,211,11,217,123,135,177,90,251,251,125,177,99,125,147,71,116,29,74,166,111,106,205,223,117,27,74,63,252,41,125,153,181,35,196,45,132,230,23,12,32,124,177,15,24,145,37,243,168,221,123,90,9,79,179,156,207,30,250,59,61,213,13,43,199,237,161,53,208,42,249,136,32,45,8,47,17,65,31,252,153,220,135,255,129,145,197,249,120,234,17,221,168,188,159,42,182,6,210,69,19,205,131,163,62,171,204,251,252,26,79,116,47,101,15,147,166,114,140,179,16,3,203,106,1,205,167,83,195,139,246,22,219,144,116,82,202,135,128,107,89,41,167,96,80,81,143,97,118,29,238,250,213,192,174,28,0,58,84,168,145,106,86,211,181,213,161,49,52,205,123,136,201,112,64,122,128,139,223,206,241,94,144,29,158,130,243,156,68,187,248,100,
+16,3,184,124,226,53,40,212,25,132,79,219,9,25,144,214,209,234,130,79,159,210,75,223,164,201,20,148,13,205,66,20,242,184,232,7,206,155,136,101,140,1,108,22,109,190,160,50,136,41,92,220,196,71,133,26,34,202,233,161,56,80,136,78,254,120,8,14,214,177,198,5,148,78,166,175,152,62,212,156,230,84,108,93,186,16,157,167,192,241,141,216,120,79,124,220,79,142,111,28,100,148,118,114,130,202,4,88,170,129,153,184,151,49,64,95,52,49,143,196,110,99,216,179,172,222,179,176,80,43,176,245,156,61,34,75,213,184,212,210,20,98,229,252,79,28,61,188,179,245,31,185,139,144,138,148,62,224,237,234,207,187,66,226,206,63,71,44,27,245,62,76,138,24,148,49,82,42,45,238,95,231,225,53,169,19,178,62,207,228,208,213,82,33,58,214,79,35,183,70,97,179,219,89,60,214,148,82,75,141,152,92,5,95,149,75,0,122,155,207,4,78,107,148,123,158,90,2,140,142,146,234,89,5,174,185,109,179,45,102,131,29,84,70,193,156,83,84,195,54,67,234,72,248,207,156,
+133,113,84,80,183,17,28,246,12,67,159,29,79,179,15,0,8,11,231,92,206,64,203,211,14,235,177,155,57,139,56,189,233,80,88,128,81,238,142,222,213,121,100,16,52,239,148,36,86,41,227,151,108,138,102,52,183,132,9,12,189,189,216,178,113,15,158,21,214,108,242,168,214,108,118,6,98,253,180,53,160,99,88,218,104,215,243,70,38,220,238,29,133,56,47,13,150,140,110,131,83,116,167,149,235,194,209,115,15,181,119,61,228,118,32,20,166,205,158,172,18,19,75,45,49,242,253,36,210,201,115,53,193,221,62,114,160,69,230,5,47,23,222,50,225,159,196,249,7,210,106,43,39,102,87,24,133,226,227,169,89,38,61,246,3,159,134,183,237,179,167,97,69,81,214,238,38,143,230,110,14,221,93,173,224,56,109,6,206,228,123,162,18,215,26,31,131,130,141,117,221,239,114,39,24,99,191,80,219,197,77,43,202,166,127,217,136,151,84,221,37,43,219,145,37,166,201,2,92,115,126,144,239,22,204,101,141,142,131,26,60,94,82,249,57,189,32,239,5,93,76,28,106,71,249,44,
+231,189,103,155,158,162,62,108,181,78,154,221,121,74,199,119,196,206,7,117,156,37,152,46,11,196,199,32,215,122,73,110,115,105,10,219,52,72,59,27,111,73,183,105,125,206,109,170,115,111,202,106,23,25,202,1,120,121,227,158,160,60,189,21,149,209,227,233,163,245,82,70,53,240,187,181,154,199,29,2,177,228,54,172,125,24,52,107,237,158,193,35,132,177,117,166,237,188,88,207,243,234,5,212,31,171,238,69,224,151,76,195,26,48,15,20,227,66,110,169,49,234,250,252,60,77,68,26,6,102,154,247,45,235,185,110,113,176,30,226,195,57,170,166,121,64,10,158,210,119,33,209,148,81,122,176,77,98,252,158,146,100,124,56,212,163,246,147,15,252,0,48,1,156,116,134,194,118,215,103,61,112,208,100,22,239,136,148,41,61,71,55,187,58,39,6,58,118,109,224,252,24,152,44,200,147,42,168,0,102,29,223,243,45,114,212,6,158,9,96,50,105,108,219,193,148,202,229,51,114,173,153,46,210,186,177,212,34,128,160,61,229,5,36,247,162,51,26,25,174,157,58,196,92,213,43,
+38,156,182,118,199,88,191,163,182,65,106,27,235,86,69,199,79,79,21,128,189,92,176,7,146,134,88,194,173,32,56,141,103,102,208,169,139,238,203,251,199,217,248,227,232,182,115,242,159,130,210,195,131,152,235,236,87,115,90,226,162,22,156,233,91,233,65,61,60,11,130,66,136,242,123,215,190,189,131,127,236,176,61,229,14,128,32,158,26,210,184,229,61,189,65,241,178,21,74,113,71,14,31,140,171,230,108,14,229,50,139,212,181,235,232,241,33,161,159,144,20,157,81,129,245,161,44,128,216,116,40,21,203,183,167,210,147,136,227,246,84,26,17,109,221,158,74,143,143,132,219,83,233,189,161,114,123,42,77,38,115,142,82,202,254,33,13,36,35,44,61,196,75,221,37,59,28,155,36,42,101,196,225,73,148,185,173,91,142,147,215,242,9,240,160,104,63,62,137,118,236,218,146,7,118,247,203,104,209,49,237,103,214,183,163,185,141,169,139,238,82,171,210,6,181,20,175,103,48,47,243,208,127,20,129,99,240,210,71,151,167,79,240,208,59,54,0,145,150,114,165,106,128,150,133,66,
+9,109,124,133,209,153,92,156,20,196,80,185,17,232,96,228,204,188,70,53,124,15,182,146,145,50,232,48,96,182,72,150,200,78,159,211,77,12,250,6,51,112,216,58,223,95,83,48,47,107,151,100,83,213,145,29,31,96,65,220,223,73,237,65,198,112,88,57,224,192,168,203,166,129,18,72,179,39,33,204,17,224,14,15,19,78,202,140,103,170,173,92,82,242,64,127,126,49,138,237,27,47,229,235,241,52,245,250,120,90,167,252,244,82,96,101,69,121,176,165,97,38,22,72,227,24,10,25,172,103,19,21,72,34,180,79,107,190,161,237,248,64,218,244,64,94,45,183,217,31,1,85,236,157,169,83,58,246,247,187,148,205,138,81,173,196,208,101,84,185,149,237,219,53,157,176,13,79,231,192,102,57,119,69,230,18,114,62,130,41,181,219,97,94,132,27,42,89,1,113,73,128,68,189,15,230,86,205,140,96,7,229,41,32,180,71,103,65,97,206,82,178,212,158,39,239,198,92,2,102,81,243,224,35,14,186,42,5,146,58,71,136,144,36,150,245,167,110,48,148,99,172,26,237,41,173,
+254,116,15,181,232,235,228,53,229,92,156,74,29,31,30,22,203,222,40,184,13,214,247,147,27,35,154,47,214,125,118,103,101,247,218,227,113,175,130,30,145,209,49,188,196,59,50,124,176,35,185,153,222,36,36,55,216,77,119,66,219,231,158,244,168,207,199,193,253,118,172,129,70,23,211,90,222,188,208,233,52,49,220,72,136,200,198,45,203,210,71,95,106,237,179,191,152,113,186,90,192,5,14,134,148,71,159,111,231,100,47,215,71,80,191,60,85,30,5,118,166,233,172,144,237,135,117,103,169,98,29,48,52,11,201,190,127,81,60,89,10,50,159,142,159,92,80,117,196,210,214,13,166,1,2,165,21,187,161,94,109,172,65,35,27,89,143,219,70,13,206,12,7,200,241,40,61,101,147,86,62,62,83,228,92,164,151,179,55,200,38,203,135,250,36,54,77,222,45,207,91,38,236,12,199,145,35,120,248,90,135,73,190,174,84,72,18,170,175,42,155,96,114,151,120,58,111,52,162,129,1,7,166,52,32,247,24,187,245,99,79,106,65,101,2,38,16,112,192,39,164,71,228,137,248,214,
+1,123,48,66,223,118,116,68,208,85,213,253,135,91,123,244,186,123,189,161,20,34,139,136,16,111,149,68,170,235,197,120,37,92,148,89,59,101,175,161,153,237,243,135,38,231,233,34,134,227,32,181,8,38,227,6,1,77,130,98,18,188,27,30,210,41,204,30,41,98,190,138,198,173,9,203,212,57,14,152,171,23,241,190,94,43,85,72,246,212,49,173,25,191,64,109,203,243,212,180,194,108,129,173,51,131,159,129,181,213,16,155,228,9,40,175,219,184,92,74,218,201,90,89,52,221,162,191,195,121,94,237,206,8,25,139,24,94,29,158,249,65,239,65,142,95,164,42,65,175,37,35,172,207,48,19,239,153,251,57,176,159,199,188,254,20,54,209,136,208,150,110,38,1,35,39,102,51,123,184,92,245,159,216,173,186,147,161,183,86,54,54,63,29,41,241,97,158,66,154,135,119,159,136,221,174,208,182,35,125,31,47,158,136,150,133,129,10,81,168,13,202,249,103,142,24,235,215,183,102,228,179,231,116,230,33,96,88,110,41,233,133,66,31,239,49,177,178,32,205,18,194,50,156,150,207,
+208,210,37,176,131,252,131,66,204,101,234,249,253,82,138,80,173,201,243,241,245,225,29,220,202,87,122,157,28,140,157,115,116,237,84,57,176,144,209,242,149,192,19,244,112,217,36,22,104,218,123,191,250,200,254,16,212,188,150,46,122,206,136,73,239,229,91,23,38,126,208,35,165,213,100,203,159,54,146,10,173,67,40,88,160,81,142,160,32,174,68,83,5,105,101,148,130,78,74,216,31,46,147,186,44,53,35,188,125,232,20,167,97,232,120,80,45,75,14,184,137,204,33,167,173,204,226,58,149,113,148,42,199,1,99,25,87,156,55,181,99,197,26,239,51,10,155,209,203,26,28,216,123,233,36,70,242,209,197,157,166,157,240,161,133,72,5,234,220,79,106,189,239,49,188,75,171,186,44,202,86,37,30,146,108,221,77,190,5,24,64,163,157,220,59,73,196,60,175,75,179,79,12,9,117,122,77,12,67,21,37,106,63,236,132,124,222,133,178,92,17,250,82,64,5,147,97,233,0,250,44,0,135,85,173,40,216,45,18,20,188,245,179,37,65,61,189,164,122,155,10,153,225,206,206,12,
+164,1,150,85,208,11,75,119,10,112,91,35,213,142,220,32,91,223,153,225,179,215,110,203,249,64,116,145,194,61,169,9,75,164,242,18,170,45,64,122,177,110,7,108,56,143,232,251,240,221,42,207,223,34,160,44,139,66,123,164,173,183,228,84,113,225,105,127,164,69,246,183,0,22,224,199,145,36,167,229,131,143,168,83,236,66,238,76,23,145,242,65,144,132,10,85,223,35,231,121,232,131,88,72,207,1,103,136,15,156,50,96,211,188,215,37,60,17,110,123,122,241,10,95,71,64,15,93,66,239,148,50,165,172,111,60,222,183,63,124,144,44,175,149,148,20,230,247,91,49,97,152,39,159,228,126,55,29,163,220,244,98,166,247,220,110,183,239,151,241,92,123,22,193,57,118,113,7,92,93,53,176,152,21,60,226,28,218,195,222,121,19,231,18,191,106,95,103,47,19,7,209,187,179,223,157,104,164,108,55,222,236,243,142,86,164,129,67,21,91,217,195,79,104,118,189,165,150,250,47,224,225,105,2,57,46,57,231,209,198,253,186,19,251,61,148,42,118,238,162,109,233,163,92,57,117,
+116,248,118,89,23,97,192,168,164,214,169,233,224,216,0,46,207,75,233,224,140,140,30,221,229,229,39,102,83,57,123,172,51,68,25,39,79,57,187,144,231,175,97,193,237,145,236,11,128,231,67,43,33,47,79,13,148,51,249,240,192,78,46,156,73,9,241,40,196,174,235,164,135,199,70,77,94,15,36,137,102,5,38,251,122,208,213,17,161,138,228,221,146,50,117,86,184,203,204,192,217,103,215,86,143,207,206,73,99,130,29,89,16,150,51,43,139,132,203,194,13,35,65,251,213,45,208,29,212,183,200,166,205,232,53,29,52,182,114,19,131,84,242,236,108,194,240,233,228,64,27,220,251,24,48,21,220,105,183,68,231,198,55,65,229,46,51,178,0,140,254,32,18,179,96,156,80,143,162,251,151,131,67,97,254,208,239,156,39,251,137,254,73,181,101,231,57,187,52,166,160,57,55,219,48,64,153,139,154,178,221,185,22,21,231,249,115,119,26,249,97,71,216,238,162,89,133,222,193,28,144,7,190,158,52,200,168,216,86,92,81,188,198,144,103,128,5,230,134,240,57,235,149,18,167,180,
+69,210,14,202,146,117,79,95,242,241,98,204,73,180,110,175,126,85,146,118,42,11,149,65,91,176,109,129,36,157,102,245,32,146,229,192,181,16,171,99,11,39,143,11,16,162,43,105,86,86,141,20,186,80,49,249,146,155,58,210,94,152,221,129,78,151,225,196,84,105,24,224,185,152,78,44,25,94,62,217,167,89,221,205,131,140,238,16,159,203,134,118,185,118,115,7,149,108,202,62,151,40,206,54,206,169,7,83,237,188,110,10,3,145,235,111,88,172,19,208,206,223,193,44,3,230,83,65,184,133,213,154,148,130,86,156,232,110,33,254,8,252,117,72,164,190,28,26,24,22,47,32,180,101,95,166,254,71,219,148,99,235,170,61,236,41,222,86,117,241,153,147,167,119,82,44,186,179,20,237,53,92,224,5,35,73,161,183,172,225,2,140,171,160,142,172,125,229,204,98,189,151,197,105,107,226,228,74,213,226,19,95,94,13,76,59,25,18,216,189,23,254,4,50,133,240,146,176,59,74,218,163,87,41,25,187,59,66,148,27,81,240,138,81,136,158,116,235,186,137,173,39,52,249,184,79,
+70,109,39,219,169,112,161,98,61,255,209,141,195,120,133,202,9,254,232,25,89,220,224,194,162,23,159,21,225,143,134,87,82,225,237,190,245,174,203,243,241,163,94,94,41,63,4,204,235,121,134,49,241,48,17,65,180,221,222,0,242,71,189,153,143,130,184,35,82,9,252,49,178,101,83,181,143,69,175,98,22,66,26,157,154,7,223,50,20,97,185,40,110,249,56,174,48,108,214,119,153,146,113,105,74,66,240,171,140,221,58,128,157,188,41,20,74,14,195,130,199,148,152,157,1,218,151,139,238,105,110,231,124,217,47,143,245,254,89,46,14,157,243,165,233,102,227,150,112,145,148,19,45,53,93,50,207,238,99,89,183,86,70,226,103,123,141,169,229,225,151,170,218,101,206,111,223,122,55,65,49,145,188,19,164,4,242,123,225,168,57,148,171,1,166,244,133,133,220,1,178,129,236,249,115,200,74,236,23,84,46,162,50,80,80,4,57,91,125,186,213,156,66,187,99,139,59,217,159,150,195,253,156,121,60,123,124,247,14,112,223,193,231,96,95,162,143,184,229,166,33,1,164,96,70,236,
+18,224,125,194,45,85,56,169,123,206,238,214,6,215,159,132,35,97,50,91,102,80,183,197,69,96,126,215,35,172,212,11,81,75,48,212,244,152,95,61,83,240,251,125,180,104,87,246,230,125,246,142,60,24,96,253,84,1,249,110,206,40,6,52,226,94,196,134,123,88,5,145,118,155,77,45,98,8,148,57,101,164,92,35,156,160,252,251,135,17,3,227,92,213,103,178,16,185,229,250,80,55,74,237,28,145,221,26,146,11,139,196,228,142,214,153,245,176,237,56,101,5,172,218,43,90,172,100,253,232,15,203,209,143,163,120,36,8,47,145,160,40,182,57,38,175,117,172,237,147,245,80,241,141,166,34,211,11,41,63,240,144,106,189,48,204,221,192,25,24,232,201,241,213,206,171,149,1,119,195,61,41,83,182,6,167,131,130,115,171,242,71,124,134,220,235,46,158,223,213,236,47,75,165,55,99,167,128,10,103,215,16,172,1,185,10,111,239,14,186,0,23,148,38,249,92,134,148,90,40,41,235,206,105,160,66,120,33,158,20,50,240,46,171,204,46,25,74,74,81,67,101,126,168,77,197,
+73,238,233,56,217,170,246,17,243,202,110,238,244,42,122,95,98,9,112,221,131,210,71,39,195,55,187,28,21,48,8,89,190,93,28,36,240,176,123,166,28,9,55,150,14,120,245,56,88,38,76,236,227,214,39,120,74,146,110,33,219,74,193,237,250,216,57,103,122,227,174,177,37,175,45,106,73,156,211,71,27,236,198,112,107,53,4,199,168,165,131,102,233,51,184,35,137,80,128,68,80,98,21,122,130,160,26,217,214,213,125,97,237,212,106,153,10,189,248,82,190,100,230,148,199,210,103,85,129,207,251,13,43,166,128,94,91,223,35,52,224,2,192,198,189,127,162,28,99,31,79,209,48,176,12,29,119,14,207,31,217,49,122,7,0,102,210,49,168,233,1,91,232,77,70,121,242,238,5,65,2,96,98,250,110,40,159,123,106,187,221,90,30,230,246,115,114,181,92,150,197,138,205,91,100,112,68,188,186,149,145,214,243,59,218,117,74,48,168,52,39,245,96,135,60,159,116,74,88,26,5,215,72,52,207,56,6,122,44,218,132,142,13,101,205,96,56,217,177,84,251,122,48,121,77,106,
+86,235,228,34,118,188,203,71,246,173,7,240,195,67,239,137,145,180,239,120,250,19,75,127,34,34,115,187,51,216,164,125,78,94,187,177,10,240,220,246,48,176,74,198,140,108,78,136,149,143,102,123,249,229,165,10,25,88,19,3,29,252,228,116,28,15,217,204,195,248,172,15,159,40,31,45,170,247,100,155,77,237,244,138,125,102,166,157,253,43,246,251,93,73,80,131,162,239,61,115,111,140,14,127,172,166,97,241,221,76,244,209,67,111,231,252,125,4,38,59,184,165,193,211,126,58,195,207,182,18,108,88,204,41,207,235,30,229,72,12,181,90,206,214,55,250,222,203,10,52,200,125,45,1,189,237,52,124,91,146,218,131,181,157,141,14,153,102,114,238,232,37,44,50,6,66,8,103,88,198,218,25,198,254,184,44,190,132,2,213,94,50,6,218,237,200,234,115,87,179,5,103,125,60,198,73,36,177,231,84,94,27,38,56,122,170,166,119,179,113,232,90,85,10,39,121,99,2,152,126,248,252,179,79,130,28,116,234,158,86,235,64,47,107,75,63,19,155,166,227,25,132,206,141,20,181,
+224,139,147,150,77,38,149,232,66,36,32,245,125,144,103,251,246,105,70,208,73,43,102,175,109,196,194,225,147,69,239,106,193,40,190,35,201,228,71,60,223,208,116,203,11,121,108,209,22,107,184,130,215,31,163,79,63,211,91,165,50,180,5,172,2,234,54,242,254,164,239,161,244,80,242,10,46,41,158,138,171,188,43,98,154,228,223,150,29,75,191,130,150,132,142,214,162,222,100,17,23,140,159,134,37,10,230,206,79,14,47,205,247,146,77,96,24,63,101,247,131,166,224,168,60,109,121,145,41,139,138,115,13,155,109,76,73,210,107,178,94,95,171,35,91,176,193,20,83,183,175,106,184,167,132,91,179,230,194,68,35,198,247,58,152,129,237,113,49,86,62,75,139,12,77,228,144,208,90,71,19,108,101,234,212,119,26,83,179,228,174,248,169,59,34,13,237,179,53,171,226,166,97,44,145,59,168,22,204,34,52,9,216,210,148,101,73,129,52,55,228,109,234,113,111,244,157,209,148,94,174,146,107,70,103,5,88,61,79,134,26,7,42,213,97,63,79,157,111,24,38,148,8,65,74,198,
+246,165,140,55,28,157,7,188,201,121,96,151,128,66,28,64,143,136,247,29,218,157,59,134,12,221,238,66,237,207,14,96,175,217,100,106,92,193,145,178,29,163,237,216,80,126,43,97,64,175,76,203,2,44,89,29,76,70,81,107,146,83,105,9,100,205,245,243,46,148,127,127,23,236,38,2,178,230,19,253,97,54,26,115,108,0,26,48,57,239,204,7,187,181,161,148,66,182,170,8,103,183,212,103,49,234,40,62,16,94,62,111,32,126,52,52,20,87,223,175,192,80,222,200,233,214,2,243,13,161,249,49,93,31,115,137,65,242,54,148,195,38,23,247,36,210,42,144,247,114,212,55,63,145,53,191,196,156,158,26,90,43,68,188,176,19,148,118,92,59,114,226,52,236,78,170,238,72,74,47,11,169,222,57,208,45,157,93,253,102,249,65,185,87,112,78,76,49,252,206,235,162,50,22,247,131,87,251,107,109,253,113,50,156,58,233,169,52,87,24,41,179,129,194,14,240,193,48,244,201,92,150,246,69,227,223,190,65,179,210,179,161,153,106,144,5,93,91,65,223,176,183,52,209,61,49,
+122,233,85,251,51,241,254,227,44,126,58,150,235,45,89,103,161,97,136,212,161,109,232,245,147,141,225,6,143,170,169,234,161,119,42,109,237,5,251,158,150,85,150,26,6,44,87,202,85,22,200,24,22,186,20,61,1,47,59,211,116,150,57,123,54,1,180,11,35,163,48,217,70,51,204,241,126,127,72,9,171,94,127,1,116,234,17,154,71,157,161,187,171,36,30,180,115,251,182,178,62,82,197,144,233,33,254,30,12,217,189,47,83,208,80,153,168,188,7,26,242,162,13,239,199,71,159,92,107,99,202,190,82,53,102,132,185,226,64,102,102,137,231,109,241,120,46,175,251,26,91,150,97,88,154,87,33,135,78,88,7,43,173,164,205,145,125,6,12,214,251,116,185,241,88,218,11,59,163,209,248,57,187,15,219,57,148,100,73,178,123,62,88,250,230,220,83,13,137,213,40,203,195,244,107,23,136,228,50,75,175,175,181,243,189,240,56,146,54,3,115,62,129,113,146,63,31,134,124,127,116,251,24,217,169,139,203,23,193,140,12,147,188,87,42,145,151,3,227,222,185,38,137,237,171,130,
+63,104,141,152,207,204,126,148,43,121,119,74,208,41,150,131,62,37,4,240,28,79,223,1,101,130,68,224,44,230,120,96,157,239,150,172,135,211,27,84,130,14,128,216,94,135,112,12,212,40,81,249,141,198,203,125,182,180,112,43,135,216,114,162,198,233,216,49,221,125,79,169,48,158,104,165,67,244,181,110,143,98,37,167,230,174,215,208,60,41,173,54,105,115,162,217,40,173,38,243,2,247,161,227,159,159,75,187,142,145,65,92,71,20,175,157,204,75,171,164,145,140,159,242,246,45,21,65,52,60,200,45,105,212,182,205,126,97,54,181,122,177,155,138,194,142,161,240,66,148,152,182,31,105,180,79,15,130,60,102,24,63,243,204,57,204,94,194,219,135,47,135,26,166,212,193,28,11,226,26,102,201,96,236,124,78,172,125,68,123,158,117,52,202,202,122,95,2,236,35,11,243,100,96,62,23,63,219,149,146,221,88,90,147,162,204,251,212,232,184,100,215,155,216,195,8,185,116,8,243,47,45,118,10,150,126,24,184,134,91,71,22,123,180,96,207,216,129,71,181,212,197,216,66,212,74,
+248,108,165,113,120,150,251,75,75,202,3,37,105,239,51,59,53,96,75,40,100,89,102,207,44,79,125,2,193,110,158,104,206,123,59,243,240,73,97,222,29,22,118,55,90,126,170,77,157,251,59,26,202,212,233,122,215,24,227,251,161,131,141,158,204,205,172,111,4,182,15,52,211,53,161,124,180,27,249,103,87,71,146,69,219,181,43,125,245,244,209,23,21,86,12,46,131,218,23,153,54,182,177,72,186,29,167,246,21,48,51,183,141,154,215,147,229,241,88,238,156,167,242,200,252,188,143,84,236,199,225,126,204,8,117,198,86,255,110,53,166,217,214,163,182,109,94,88,51,109,239,214,142,223,102,140,46,20,167,245,196,208,60,134,39,186,73,26,22,170,180,171,251,118,241,109,89,133,117,223,232,129,39,83,44,26,47,143,179,8,63,135,67,205,72,112,143,54,123,18,182,90,109,253,1,19,112,208,53,129,63,122,195,217,76,154,240,117,170,114,70,213,238,60,172,180,22,7,109,107,75,129,76,35,93,84,93,219,201,231,84,31,14,28,213,156,95,151,171,40,184,147,31,160,169,226,
+210,238,153,87,203,124,102,65,249,226,218,177,140,121,142,26,211,195,203,97,79,68,45,149,101,223,224,83,98,49,204,152,38,131,55,157,144,34,18,170,147,143,217,77,226,241,171,83,146,155,161,251,34,205,172,61,38,175,107,135,179,227,40,52,160,109,193,86,148,156,210,94,129,45,138,151,165,9,210,15,88,251,125,48,59,196,19,164,241,105,192,49,204,67,188,127,102,83,92,147,146,16,53,17,75,221,33,22,119,217,224,202,250,69,7,132,3,57,156,187,26,214,161,112,199,236,235,214,16,236,129,137,133,26,160,15,98,14,239,140,129,20,57,174,211,190,224,202,170,131,225,94,32,24,109,170,217,56,131,16,70,98,245,205,24,44,238,221,191,121,58,196,112,219,90,172,170,179,11,108,171,242,110,201,114,16,122,232,131,237,96,71,79,249,154,12,51,235,229,216,93,48,28,38,109,116,50,242,34,55,235,128,224,160,73,192,42,165,230,38,104,1,108,169,82,180,135,15,67,9,235,221,48,2,41,131,134,197,85,213,94,230,217,121,192,168,44,38,118,45,207,167,81,212,206,180,
+103,205,237,149,223,67,54,201,227,16,16,48,220,117,137,238,42,105,171,108,86,94,250,204,146,189,148,196,49,249,128,105,32,16,232,120,165,198,232,27,33,160,127,125,226,132,2,138,208,150,235,19,39,23,54,114,151,130,49,124,159,98,119,185,204,64,34,11,193,210,186,34,79,136,239,89,47,173,32,233,243,45,129,228,245,204,225,79,178,239,74,14,112,143,148,23,175,228,0,114,86,105,123,37,7,80,122,243,234,43,57,64,185,76,243,192,160,18,48,102,40,153,128,169,84,106,0,4,171,50,79,175,118,187,221,120,87,23,138,192,90,137,196,142,233,199,226,216,29,77,202,126,88,173,159,36,110,153,23,156,6,194,88,104,211,90,155,130,57,28,14,97,110,175,234,87,133,110,242,219,219,155,140,128,240,28,7,2,4,87,199,107,217,38,104,255,7,29,200,144,173,30,75,225,134,8,61,92,57,83,236,10,174,239,117,202,69,232,123,172,216,7,134,156,113,247,170,215,201,235,107,76,26,202,220,127,138,208,6,113,204,141,214,112,204,219,135,180,83,1,184,232,204,74,192,118,
+211,48,34,115,159,192,171,226,160,39,85,21,144,145,62,235,50,41,139,26,178,26,221,188,72,246,1,252,205,139,36,159,202,222,188,72,224,114,252,205,139,164,206,28,220,188,72,112,129,254,205,139,100,144,56,223,188,72,100,73,216,205,139,68,170,124,190,121,145,220,35,91,55,47,18,48,204,117,243,34,17,45,239,110,94,36,129,25,234,230,69,162,63,86,111,94,36,150,0,228,230,69,178,10,61,222,188,72,20,166,47,47,146,217,44,121,243,34,121,213,59,111,94,36,226,80,255,230,69,162,44,122,110,94,36,179,113,246,230,69,82,91,73,100,44,211,212,193,67,91,23,34,95,48,168,169,208,227,25,143,128,245,254,148,168,150,93,33,205,7,126,243,126,39,82,198,32,221,228,235,229,8,62,22,65,242,48,117,151,0,58,102,242,105,246,41,158,38,200,209,156,190,28,212,218,13,61,247,242,36,56,64,169,49,217,188,48,35,54,88,203,56,112,41,242,46,162,71,139,49,89,197,7,110,56,216,89,226,234,40,209,106,13,36,161,109,184,73,72,80,139,45,90,138,219,202,
+141,178,88,216,85,80,122,210,122,51,41,217,180,52,35,169,146,112,177,23,82,157,46,118,240,240,199,8,166,247,69,135,143,22,51,159,67,156,103,106,79,86,14,252,210,209,176,98,176,240,172,32,71,170,148,72,49,26,21,38,49,18,144,171,171,70,4,37,65,48,85,107,81,193,62,96,37,75,12,17,57,247,158,49,214,194,61,115,17,195,238,59,60,200,42,179,145,197,61,155,183,32,178,144,213,123,66,3,160,46,110,135,134,63,61,121,210,162,24,138,129,228,50,154,185,91,21,210,174,94,47,10,225,99,66,233,204,117,123,96,193,33,33,226,208,148,240,252,74,170,58,251,136,85,18,141,82,12,97,169,89,167,180,131,150,71,215,204,69,119,93,88,138,185,73,159,123,55,245,47,11,145,117,148,211,136,71,162,242,228,147,97,5,43,112,1,176,190,3,188,202,194,118,246,190,235,198,24,240,190,171,223,24,3,60,238,249,141,49,128,235,218,220,24,3,170,220,209,141,49,128,192,156,222,24,3,162,212,204,141,49,0,239,207,222,24,3,160,211,204,141,49,64,130,140,221,
+24,3,144,98,218,141,49,96,148,0,221,24,3,14,22,194,141,49,192,228,94,223,24,3,128,102,197,141,49,0,175,104,221,24,3,74,247,247,55,198,0,116,193,12,30,225,28,203,99,21,40,114,143,162,12,223,192,123,99,14,208,38,178,55,230,128,220,102,118,99,14,40,41,198,55,230,0,114,152,120,99,14,48,105,45,55,230,128,183,244,226,198,28,80,6,188,221,152,3,186,111,247,55,230,128,234,135,248,198,28,96,171,64,111,204,1,238,189,255,198,28,0,165,251,110,204,1,3,152,224,198,28,144,234,120,175,204,1,102,128,253,107,32,65,227,61,240,149,58,160,85,118,170,204,151,161,14,191,136,46,75,138,48,12,86,147,89,53,138,144,251,157,205,131,129,238,22,247,170,240,204,167,182,242,129,220,85,117,177,232,98,92,133,88,119,128,80,66,43,139,157,74,85,184,135,21,140,179,13,49,28,96,167,135,181,86,232,36,161,21,161,143,119,239,31,209,72,254,243,115,163,126,233,221,225,114,135,170,67,81,250,143,226,96,153,158,135,101,170,48,46,125,124,155,27,159,
+125,243,6,4,36,222,157,56,106,7,89,181,229,0,206,131,234,172,10,131,6,181,17,144,122,137,89,62,162,88,122,237,147,10,134,130,144,121,10,15,43,248,180,243,201,16,52,213,80,155,110,131,58,143,26,186,122,48,159,62,174,142,99,67,79,143,246,202,87,125,97,103,91,97,28,11,36,157,155,123,207,77,186,141,141,209,250,131,187,232,127,70,11,17,177,115,53,191,142,192,30,15,125,63,49,171,144,94,69,230,94,173,137,45,178,67,102,241,8,123,119,190,14,214,129,82,3,14,120,115,209,122,233,12,35,150,107,56,55,133,151,37,9,33,166,83,174,212,1,216,186,96,119,165,14,152,55,234,169,43,117,192,108,144,25,95,169,3,112,99,156,239,74,29,48,124,219,57,175,212,1,19,246,71,232,74,29,0,184,12,138,43,117,0,225,5,122,190,82,7,212,45,37,210,149,58,0,60,201,171,39,123,81,108,122,179,198,187,192,122,37,15,72,184,58,72,57,85,26,8,85,87,203,33,92,217,204,91,240,154,74,110,129,204,141,147,89,120,160,211,115,209,226,30,2,69,
+102,191,255,148,81,95,90,70,118,177,135,143,99,90,171,170,132,215,65,0,87,92,140,42,239,90,17,104,107,250,112,21,8,43,62,140,12,248,177,12,126,142,202,94,148,159,232,126,56,63,111,125,250,91,233,220,8,77,98,105,158,237,140,28,60,242,56,180,225,39,14,187,21,66,79,62,143,245,168,134,252,212,198,248,227,232,146,214,177,116,87,129,41,58,165,165,24,223,216,3,206,123,198,141,61,128,79,222,220,216,3,228,196,199,27,123,192,80,223,191,177,7,4,135,184,27,123,0,63,65,184,177,7,52,199,242,27,123,128,185,237,191,177,7,192,172,184,27,123,192,185,123,186,177,7,104,44,216,27,123,0,18,45,191,177,7,72,195,212,27,123,0,118,149,190,177,7,244,84,146,27,123,64,105,77,189,177,7,88,161,31,151,105,72,117,25,153,113,82,18,173,31,84,25,247,190,40,158,40,84,33,55,129,170,103,27,98,50,48,119,126,122,193,141,109,24,38,138,192,7,182,221,13,82,203,15,124,24,50,186,114,243,22,143,193,241,36,235,204,235,66,48,174,37,52,16,
+135,113,96,179,66,227,172,169,166,84,114,253,117,152,73,141,137,234,15,181,152,103,235,200,85,29,5,66,91,156,4,130,233,113,205,205,78,134,34,2,141,43,182,105,131,102,153,249,233,40,61,250,233,12,252,36,169,146,118,94,196,229,87,33,108,230,108,205,79,44,245,94,161,157,217,148,13,166,33,16,25,139,23,142,101,21,184,69,101,208,157,104,253,108,102,153,68,207,6,47,214,185,136,145,114,233,154,242,250,91,137,203,162,189,64,196,232,14,108,9,126,89,183,89,41,19,203,4,185,122,130,42,32,151,245,55,70,7,96,75,160,171,3,10,9,116,89,94,47,233,54,136,235,3,112,153,211,176,41,24,4,84,27,58,2,151,234,37,96,16,48,53,213,95,186,49,32,13,250,197,198,32,178,249,218,24,128,80,95,27,3,8,235,107,99,0,100,153,88,88,120,7,12,188,213,142,133,23,32,154,203,110,2,70,2,85,106,238,171,195,74,42,2,225,160,149,68,49,131,81,188,187,156,103,82,240,47,49,75,254,151,152,169,228,75,204,223,181,255,168,170,9,114,248,5,106,
+181,188,229,44,65,125,165,8,128,14,220,28,98,216,183,219,23,16,55,20,18,112,245,134,2,162,33,1,127,43,253,42,177,245,213,171,230,110,176,155,104,109,112,123,92,194,130,124,101,124,116,124,101,20,3,191,50,66,211,95,8,105,244,47,67,64,105,95,134,128,59,190,12,33,99,228,82,181,203,65,90,125,209,137,81,61,7,136,115,192,173,196,148,122,163,45,2,60,94,149,186,148,96,125,185,241,220,193,191,80,99,225,55,212,152,88,238,134,26,152,214,1,97,205,236,134,225,174,222,178,65,4,174,171,29,99,32,9,239,106,172,11,18,226,244,183,171,215,247,85,239,84,157,221,220,42,38,50,187,173,191,143,62,160,47,116,29,245,173,22,68,198,243,213,108,85,252,87,179,233,211,191,104,54,199,87,179,1,146,95,205,118,105,23,203,255,109,187,232,175,237,178,177,129,65,215,74,176,203,141,26,149,170,81,47,85,170,190,110,3,145,95,205,6,97,126,53,219,223,217,95,98,213,56,236,192,33,94,113,224,254,62,56,254,174,254,1,185,82,35,209,19,202,231,132,136,
+78,41,110,61,216,107,101,240,136,227,190,144,102,183,92,66,194,205,126,44,19,16,33,207,192,236,111,37,183,234,90,30,216,133,124,104,243,244,119,35,163,15,194,115,174,246,243,152,132,172,101,63,6,253,101,121,0,74,2,38,147,47,16,86,112,8,225,2,33,88,15,222,220,180,253,152,11,136,22,255,203,79,187,121,177,51,127,134,191,233,235,82,95,244,221,34,190,198,225,115,140,206,124,181,64,190,218,235,65,132,46,150,93,128,175,102,191,216,73,161,100,95,36,118,225,66,240,85,196,151,61,9,64,242,69,198,85,196,233,34,227,42,130,197,191,41,218,148,93,100,92,69,224,47,50,174,34,30,47,50,174,34,54,23,25,87,17,55,191,179,139,8,192,69,198,85,132,227,106,199,139,8,199,85,171,139,136,187,47,53,224,230,47,53,130,159,95,106,92,247,71,87,53,32,166,139,12,149,200,13,37,167,193,151,125,248,255,123,156,174,43,78,236,178,91,130,69,181,249,57,254,107,60,92,128,139,166,95,192,167,175,95,192,191,218,255,225,210,254,95,192,1,216,47,224,64,
+246,23,240,191,110,255,83,112,221,169,220,125,141,35,196,197,162,128,47,117,35,172,47,117,111,253,230,138,212,253,165,46,164,244,165,174,104,243,165,110,31,252,165,46,232,229,214,106,51,60,226,214,106,234,220,57,85,3,245,47,103,144,203,60,245,91,225,248,235,253,96,113,85,190,43,238,67,177,59,220,189,167,59,123,236,96,111,237,83,166,202,250,83,50,67,164,66,139,201,166,203,144,45,94,103,197,24,33,205,118,78,226,29,66,26,200,190,142,139,29,199,244,252,48,183,166,252,158,101,238,102,118,134,16,128,46,185,111,93,244,138,243,242,31,112,65,33,142,209,99,142,171,82,174,123,142,228,50,73,179,127,201,11,135,253,21,47,28,255,202,27,1,2,58,108,62,96,255,58,81,92,238,39,126,157,63,206,249,139,124,79,111,116,197,130,117,70,179,222,190,58,122,0,240,85,240,224,248,42,24,115,124,21,140,153,190,10,130,208,95,5,3,208,175,124,150,107,62,135,24,13,54,112,111,243,206,11,40,77,223,69,206,1,224,237,163,71,40,185,140,249,171,1,64,44,222,
+111,224,7,124,225,79,85,97,55,237,176,119,151,117,45,73,31,239,249,43,217,173,37,82,140,220,41,107,130,51,1,221,47,96,0,118,236,26,241,0,14,184,22,186,148,145,93,11,93,202,240,111,227,153,231,0,220,88,242,176,240,216,165,242,215,52,144,201,234,190,93,12,8,21,128,174,95,214,196,233,216,20,28,194,121,22,161,69,142,47,181,37,248,47,243,248,152,95,230,97,61,126,153,135,149,250,50,15,141,216,159,22,230,23,85,51,16,23,162,186,37,218,34,156,52,120,227,145,74,60,215,82,90,112,58,0,252,18,12,112,124,9,6,220,180,162,95,254,126,1,204,193,190,0,254,50,159,231,210,203,82,176,67,133,115,237,12,196,233,241,151,122,75,64,191,157,125,126,153,239,196,226,169,36,110,176,200,245,213,14,113,192,67,234,150,67,122,179,70,26,136,184,89,99,233,184,141,219,75,77,128,155,213,32,174,234,5,212,105,185,113,191,64,238,37,88,3,74,131,23,19,54,68,132,135,19,219,107,157,20,134,237,225,50,254,185,232,53,218,108,59,175,61,245,10,250,
+213,176,166,2,59,68,241,174,48,2,225,157,29,122,184,148,125,252,152,128,172,250,240,11,120,53,148,174,49,164,88,28,56,90,215,168,251,145,193,189,30,142,65,120,116,201,57,98,128,87,165,117,149,28,125,81,48,211,238,209,168,92,128,229,228,109,227,170,46,78,39,217,176,212,121,139,76,59,145,136,117,27,151,117,193,63,12,58,126,222,53,90,185,115,109,1,99,72,45,100,186,149,49,96,180,102,197,70,138,221,148,74,215,215,220,182,4,163,74,253,40,101,128,122,122,233,128,207,175,15,206,84,166,161,234,6,59,213,125,8,96,136,248,234,209,203,58,242,40,221,216,169,240,51,214,71,225,37,140,31,45,231,19,226,43,26,15,254,63,246,215,120,249,171,203,159,153,48,223,179,8,241,155,145,208,254,171,223,255,206,63,255,230,199,63,255,69,226,159,252,228,199,63,187,134,4,251,201,159,125,231,47,46,169,215,32,94,255,219,119,255,209,119,255,209,119,126,244,211,239,124,251,205,95,126,251,205,79,47,119,191,249,225,119,190,255,239,111,145,158,254,236,231,63,254,193,
+45,58,218,79,190,253,171,240,102,63,252,225,53,240,214,183,223,252,31,63,255,209,183,151,156,95,213,252,236,155,191,248,233,53,26,212,47,226,161,253,241,247,190,253,23,191,255,157,127,122,75,253,193,247,126,252,157,31,92,196,94,99,126,253,239,255,242,103,63,249,203,31,253,224,187,255,245,119,255,224,187,127,240,39,63,249,246,155,239,254,193,79,191,253,193,229,237,247,254,252,207,191,255,189,31,252,155,159,126,247,63,249,230,199,223,253,189,159,255,244,95,126,231,175,146,254,197,45,42,218,13,198,79,47,120,255,207,159,252,155,47,124,63,248,215,63,249,201,45,6,216,45,162,216,47,81,92,145,254,63,150,242,211,159,127,255,187,191,119,173,234,167,95,70,187,212,248,211,111,254,252,207,174,198,249,139,239,253,248,123,255,234,75,240,69,191,235,205,47,29,127,237,195,77,211,11,208,239,124,255,39,63,251,215,215,16,107,255,246,71,63,252,87,223,252,236,138,232,242,225,123,151,172,127,240,27,192,126,246,237,159,255,21,184,31,254,228,130,239,143,190,255,147,159,255,236,
+191,251,246,26,210,236,87,8,111,159,47,130,190,210,111,1,219,254,242,207,191,247,131,111,126,248,75,115,127,133,198,186,8,253,246,135,223,124,123,139,182,118,105,150,159,255,224,155,43,248,95,133,234,250,255,63,206,218,53,86,214,47,76,117,107,174,255,230,111,132,49,187,134,47,251,39,255,238,71,63,251,235,193,192,126,244,103,191,243,63,127,251,147,191,248,203,159,253,79,255,236,79,190,247,227,31,124,243,231,191,243,221,127,112,205,247,37,242,191,253,238,63,248,221,223,253,181,220,191,247,31,254,248,162,239,191,249,91,195,128,253,222,127,248,21,150,155,184,63,253,249,247,175,152,126,231,2,234,187,255,240,59,223,255,222,183,127,61,42,219,37,233,247,255,232,135,63,252,133,196,107,108,179,255,245,191,255,167,127,250,199,127,244,39,255,236,119,174,9,191,251,235,145,192,126,41,230,63,253,155,114,174,81,195,126,91,65,215,124,191,33,232,23,32,255,35,178,126,149,246,179,127,255,151,223,252,240,155,63,251,141,150,248,147,255,225,143,254,244,79,255,199,63,250,231,255,
+228,111,152,251,183,139,190,246,235,33,18,255,237,143,46,253,250,47,110,232,254,150,112,107,95,106,92,84,184,245,212,223,185,230,251,205,91,215,148,223,255,211,111,126,246,59,127,165,216,47,173,242,183,134,137,251,251,133,108,251,77,133,174,176,127,85,229,229,195,239,255,47,63,255,241,111,17,152,237,63,255,47,254,240,63,251,135,255,248,15,255,241,61,120,3,176,93,99,187,186,206,191,140,203,70,71,164,30,189,154,178,131,138,141,13,53,172,138,158,119,162,40,223,208,111,159,15,85,185,43,5,130,60,186,141,111,22,108,4,243,200,138,111,168,132,154,76,249,121,100,32,204,124,68,59,43,21,152,218,254,18,31,143,242,226,185,253,177,141,167,16,124,84,91,160,13,27,89,3,24,135,198,199,40,128,83,177,27,5,187,29,133,241,220,30,58,170,52,241,217,94,113,14,178,165,82,41,93,58,31,169,253,62,199,44,78,202,223,16,66,218,212,245,226,239,9,21,245,171,75,5,218,1,45,241,33,154,206,167,71,250,250,202,89,141,37,248,96,38,102,220,6,101,86,178,172,
+33,16,244,95,123,38,252,211,184,217,12,136,27,137,26,54,198,235,209,49,189,154,210,177,231,212,69,18,53,6,24,123,2,73,220,0,82,21,245,130,227,23,69,248,33,0,168,22,177,63,217,239,187,49,191,88,120,16,30,118,251,144,189,97,212,34,222,7,225,17,114,66,56,155,148,202,145,142,159,65,78,74,121,59,166,239,237,217,162,240,131,166,198,127,27,101,216,8,26,250,153,102,221,225,95,246,159,3,48,158,139,122,73,201,107,144,49,138,83,47,57,226,36,192,195,50,183,193,166,148,157,67,196,31,28,155,134,110,24,222,172,144,45,2,197,19,92,143,79,173,141,101,15,160,176,183,117,34,32,173,16,206,197,121,250,36,7,255,126,131,235,83,2,133,180,132,6,240,200,239,201,98,18,40,149,142,59,230,159,40,71,216,248,18,134,230,198,57,227,203,249,220,230,32,141,175,131,182,66,204,7,24,236,180,21,40,98,150,155,6,250,227,43,37,212,33,165,95,57,114,57,180,251,212,118,165,120,168,152,15,195,199,56,171,51,71,146,35,7,112,131,46,47,26,38,215,
+123,137,48,138,251,211,175,108,174,194,242,89,208,220,24,145,242,61,252,140,76,205,108,145,212,254,83,212,236,130,34,15,161,0,52,250,188,80,171,97,79,16,107,167,82,3,62,177,108,144,12,210,230,131,182,11,43,181,165,110,49,232,98,16,211,194,213,25,136,230,85,142,25,250,58,129,170,73,68,137,16,155,71,176,80,142,106,228,185,150,17,23,249,11,167,29,196,90,31,239,146,41,8,132,136,129,223,133,128,123,15,96,252,132,227,18,21,241,109,113,3,178,25,207,143,99,161,19,55,171,217,231,35,76,160,204,95,159,209,60,72,20,211,80,204,225,41,242,16,213,217,110,73,8,246,76,117,50,250,185,39,182,81,198,51,241,90,0,20,95,16,227,135,181,122,202,16,181,248,0,220,163,50,224,143,152,28,19,170,3,253,69,103,175,186,181,38,162,80,224,203,89,208,144,101,30,44,100,236,107,184,206,170,2,233,27,63,41,205,244,159,240,56,15,199,21,28,202,250,162,82,3,217,81,140,210,146,0,35,167,126,104,115,158,219,35,209,162,139,81,61,141,215,104,223,160,
+216,145,42,58,130,84,109,206,128,201,182,10,109,180,107,172,234,125,19,84,162,198,139,39,189,211,90,61,223,112,192,97,149,23,37,75,206,4,115,134,174,177,22,103,49,137,236,11,20,189,101,202,38,181,193,12,62,213,139,75,182,13,3,81,243,46,233,60,36,81,145,7,206,99,8,3,192,221,11,49,28,15,42,53,246,108,219,176,69,24,1,160,30,184,74,114,74,24,198,39,163,230,99,88,166,63,237,194,38,134,193,174,242,101,160,109,227,157,47,102,21,10,146,76,104,129,210,233,133,113,254,165,242,221,209,182,103,32,86,131,224,174,71,122,76,186,81,15,34,199,155,90,46,157,208,135,231,73,27,136,145,228,87,114,101,73,237,178,143,107,184,147,92,91,202,187,182,38,67,123,80,161,250,122,172,15,51,199,175,193,47,212,187,184,86,50,226,131,212,45,254,27,232,236,137,116,215,74,238,157,68,179,72,31,246,229,137,183,190,141,250,39,222,226,83,68,56,16,165,31,119,24,135,99,66,8,209,137,200,195,145,104,54,132,114,140,140,189,54,29,35,217,12,251,32,35,
+40,135,114,229,245,179,81,90,143,10,212,149,117,246,209,166,73,217,91,39,98,169,208,203,87,152,66,80,31,146,237,244,238,178,225,152,34,154,80,242,209,105,190,87,210,129,116,201,124,84,16,181,62,42,22,177,185,167,57,165,5,0,209,243,154,187,67,39,25,5,166,148,49,32,107,163,64,247,100,88,72,156,79,29,29,159,74,238,218,179,252,65,153,38,45,81,233,178,15,18,239,131,38,193,136,42,136,56,255,205,43,74,184,252,29,65,75,200,199,247,184,68,2,108,212,121,95,249,105,249,50,67,16,101,235,96,230,76,99,231,61,190,46,92,76,235,236,77,2,238,212,107,90,166,122,214,120,169,212,31,215,37,156,144,249,148,190,163,251,185,1,64,44,126,212,188,234,135,199,108,96,175,183,2,241,149,232,78,195,240,200,194,9,11,158,40,12,32,19,17,20,223,25,162,37,213,35,158,167,87,177,45,69,175,78,123,251,213,169,84,141,171,111,115,196,209,70,253,120,126,106,90,180,100,135,21,182,207,196,16,29,37,77,96,119,131,0,69,245,24,108,143,232,68,119,206,
+185,106,75,109,190,85,204,114,17,225,196,155,188,112,14,41,254,70,2,135,75,230,13,218,36,220,219,250,145,235,224,97,98,231,213,152,115,41,6,224,13,169,252,234,222,195,2,87,47,245,212,29,11,141,12,174,129,58,211,214,228,195,84,139,247,218,248,44,155,79,62,104,125,109,134,128,102,164,176,240,200,164,248,85,80,249,28,10,207,174,28,144,204,149,201,182,227,50,163,176,166,29,51,227,50,189,65,121,74,69,173,149,205,65,225,129,105,199,251,120,112,23,81,72,63,4,201,247,126,148,145,81,68,52,222,10,197,254,232,190,115,27,102,186,58,198,131,215,115,8,119,142,157,226,145,45,46,89,208,230,174,209,51,79,247,219,162,197,187,127,221,90,239,197,249,180,31,196,9,232,63,156,129,103,32,192,143,154,249,109,111,132,61,209,228,93,199,61,11,243,83,54,221,209,224,232,195,217,138,150,65,235,31,220,222,29,245,78,75,208,106,43,88,208,0,121,31,180,190,159,104,92,70,103,224,203,209,219,201,81,22,97,21,122,37,84,134,123,176,75,167,122,124,118,204,4,
+159,117,181,169,56,197,61,80,108,39,136,23,148,143,199,86,193,223,124,1,242,16,77,228,230,214,69,179,224,13,188,127,31,170,43,182,112,79,35,42,171,30,77,245,23,129,202,199,72,115,95,63,56,133,207,71,12,199,196,92,243,125,101,216,251,194,199,19,96,162,92,193,218,27,121,201,79,112,22,76,243,37,5,222,148,219,246,222,74,16,174,82,23,184,96,129,166,102,166,13,221,115,221,135,45,85,15,226,203,153,5,59,126,209,186,68,163,247,231,16,251,48,175,59,137,158,101,215,219,149,9,166,47,171,50,11,167,99,118,77,247,117,232,17,76,198,192,94,66,68,125,214,163,44,158,9,130,187,252,118,90,224,103,2,178,172,70,200,121,163,156,188,108,191,121,129,3,213,241,39,77,164,12,45,67,121,226,246,99,87,202,102,188,247,92,69,188,96,16,70,62,16,2,188,218,249,84,120,114,12,20,126,154,0,219,93,161,2,235,138,24,252,108,228,125,130,37,163,50,216,116,180,146,135,100,75,9,195,98,144,67,79,124,87,137,225,121,79,101,34,66,0,195,184,251,164,
+245,43,78,79,222,68,80,179,195,76,181,128,60,75,172,49,120,95,229,130,84,58,167,52,231,198,98,103,74,87,161,117,169,57,123,203,94,238,209,107,8,75,20,25,133,80,12,247,254,132,28,103,206,70,33,113,188,223,213,203,64,61,101,45,177,172,2,190,59,53,73,145,209,221,159,91,141,248,62,193,252,80,13,95,133,168,104,101,115,103,117,70,75,192,149,44,26,27,169,24,250,1,135,113,0,26,46,221,124,67,181,237,30,31,32,171,115,67,18,254,144,76,44,175,150,217,121,196,131,15,243,89,192,182,147,97,24,45,109,247,115,22,253,121,22,27,60,126,65,149,138,38,20,240,228,243,9,203,80,49,155,122,33,39,130,176,186,49,152,167,85,244,196,90,237,100,120,107,219,141,168,184,38,175,20,79,130,230,169,245,230,67,204,110,149,27,191,68,142,245,55,81,109,154,139,14,217,211,19,40,67,51,202,177,172,79,221,176,18,55,49,227,83,195,115,118,143,68,5,89,29,215,39,152,131,159,188,110,49,174,222,227,164,19,239,79,76,185,28,171,50,66,18,113,100,72,
+215,0,201,88,93,110,101,97,142,231,213,40,217,89,93,27,36,232,130,248,156,54,136,79,35,235,254,113,5,217,134,33,20,146,184,0,149,225,175,146,111,192,101,234,109,157,124,91,170,226,111,75,57,163,123,84,180,64,235,26,123,20,162,50,146,2,107,52,155,96,71,157,39,31,86,162,221,105,219,187,147,81,249,88,184,79,63,175,123,126,200,192,61,192,77,223,128,182,73,155,126,108,62,171,178,212,44,125,133,9,206,131,8,177,44,118,14,236,116,29,55,186,53,240,55,146,123,118,167,109,96,77,60,109,76,104,242,186,84,30,76,43,84,12,43,140,174,106,112,45,189,239,126,173,247,222,173,107,123,168,208,16,244,158,72,112,224,154,93,242,178,202,220,138,80,174,122,63,141,130,136,250,155,147,130,7,141,27,231,38,32,72,59,164,100,224,77,212,213,105,152,189,7,80,43,32,149,246,234,20,48,4,171,176,127,188,205,168,222,35,248,33,79,82,79,96,47,165,226,220,111,115,229,235,27,34,85,98,237,151,11,182,5,240,89,157,118,157,64,86,37,177,17,62,207,47,
+221,135,214,1,10,183,69,223,224,64,64,195,70,198,172,57,99,53,148,3,145,176,69,39,1,239,138,160,94,225,73,91,37,33,159,214,232,124,208,26,94,211,246,168,66,191,245,210,196,248,52,140,199,8,39,67,183,37,61,232,178,145,150,223,68,91,77,168,92,189,173,223,51,243,139,231,60,79,45,119,89,30,176,8,202,163,114,81,235,230,155,224,128,150,228,183,38,248,247,200,252,214,160,182,54,152,227,40,41,84,161,84,206,231,101,59,54,33,183,103,222,192,101,4,73,4,91,215,64,30,183,65,120,41,138,106,87,166,113,39,202,157,209,53,239,235,44,109,127,115,36,69,40,41,111,47,46,155,164,99,199,112,128,20,179,65,187,65,88,117,47,229,62,2,73,79,197,233,1,142,217,82,66,140,22,91,86,7,91,35,146,99,33,168,200,14,239,148,148,216,85,145,88,223,102,139,51,55,160,20,37,60,48,162,60,76,101,207,48,45,84,153,148,103,227,26,132,49,234,69,94,238,156,99,182,235,98,166,93,2,251,40,8,99,166,188,46,7,25,36,6,103,133,228,208,18,
+134,79,253,135,192,45,189,23,214,92,93,52,229,177,82,48,208,196,164,123,205,139,103,96,126,78,21,56,175,172,206,46,177,221,228,1,110,154,73,225,34,202,211,162,115,50,208,137,77,218,106,239,52,144,24,189,20,31,11,32,14,108,116,111,23,63,181,71,176,123,98,184,47,69,208,52,17,107,149,243,84,83,124,208,132,34,201,51,135,41,243,163,32,144,39,253,200,98,208,155,184,130,189,196,170,182,28,211,47,152,17,122,119,140,202,183,97,75,49,136,82,112,36,125,140,79,200,176,219,117,190,140,22,23,173,17,63,167,197,40,95,200,136,202,101,166,229,243,250,208,64,224,241,0,116,136,58,110,146,220,83,75,248,124,100,188,244,210,227,94,90,170,126,96,194,97,145,227,65,95,60,62,49,212,13,106,226,252,12,11,58,45,152,45,180,2,130,176,203,190,40,180,97,63,12,72,90,111,91,253,233,234,17,133,236,112,150,242,170,118,52,223,85,81,140,158,166,196,139,219,113,26,248,149,144,147,152,51,83,36,191,231,71,83,92,238,215,244,163,3,31,33,105,26,205,99,
+141,144,66,121,37,93,40,234,152,6,206,252,25,65,133,160,174,185,119,26,3,201,145,135,43,45,142,201,190,15,28,87,216,115,81,233,228,116,31,70,40,235,163,19,57,152,20,10,244,125,221,168,165,75,4,240,169,88,228,71,167,194,76,101,185,220,53,29,83,22,154,0,226,167,74,253,116,104,87,212,193,16,235,203,56,29,163,197,141,30,107,229,109,78,105,157,243,206,73,75,184,3,208,246,73,86,24,254,157,177,25,119,149,113,165,223,9,51,166,93,47,132,222,73,112,102,229,97,29,58,7,55,186,59,164,251,141,154,219,49,64,244,240,143,110,1,128,92,175,135,179,29,168,138,52,142,53,87,140,164,11,48,166,54,139,130,65,23,29,123,9,195,140,30,2,19,190,160,223,39,37,178,55,216,36,207,161,215,94,253,196,4,25,155,124,76,232,118,123,11,48,76,83,74,123,207,166,83,232,232,201,102,2,204,135,51,139,82,73,186,49,114,207,243,208,84,12,97,201,6,70,12,135,71,21,158,225,4,184,187,126,48,100,103,116,83,206,179,31,26,17,238,145,81,174,122,
+104,74,159,19,242,246,120,39,7,54,43,181,39,108,232,152,45,77,172,117,225,251,65,199,6,17,13,240,112,237,185,51,46,200,226,88,116,136,92,187,216,68,150,121,74,240,55,129,88,165,53,124,145,108,9,227,36,99,123,95,79,41,49,171,172,16,218,109,99,226,219,16,10,160,213,192,186,84,194,222,125,56,38,207,252,100,116,87,41,109,38,157,116,35,95,70,109,194,3,156,141,209,132,195,74,27,22,37,153,62,218,53,225,161,177,56,143,136,249,86,188,27,230,153,238,18,9,157,85,128,231,119,136,51,151,99,30,121,238,212,115,20,138,191,242,70,181,200,183,184,180,255,184,137,39,201,139,190,66,119,199,10,187,146,69,24,131,127,170,66,14,97,240,152,160,40,35,96,38,221,58,163,166,244,187,113,74,34,111,177,0,10,186,158,197,152,222,250,162,88,1,127,254,188,198,156,208,130,59,227,64,144,162,235,240,108,117,26,181,129,126,222,45,213,47,119,60,46,21,206,207,7,119,178,119,29,163,136,143,61,205,106,17,215,231,27,169,63,199,138,75,245,182,62,192,187,
+59,194,26,245,92,111,61,82,16,130,198,199,48,12,80,129,189,32,205,31,208,210,48,137,224,173,102,155,207,228,167,229,200,114,186,236,143,3,76,231,28,37,199,71,200,250,221,35,32,196,244,167,162,168,180,56,140,140,11,239,164,73,152,87,212,185,235,183,49,38,152,86,124,50,245,142,219,133,223,186,248,164,47,209,4,102,22,117,206,235,206,166,112,154,61,102,174,103,179,150,21,230,152,215,218,187,89,150,131,60,146,2,245,89,11,32,38,166,104,115,137,177,0,130,1,88,62,180,109,47,171,85,48,7,158,18,234,2,144,96,189,118,108,47,52,241,53,77,179,236,208,164,148,51,118,80,84,255,206,157,41,99,250,55,224,75,32,106,87,180,185,12,176,34,152,143,91,42,126,45,46,128,106,58,90,33,71,107,230,7,72,182,16,201,246,201,180,187,179,179,158,51,209,10,181,203,69,78,238,233,69,82,55,164,107,156,184,218,135,133,93,237,91,78,99,81,114,125,214,28,217,104,126,88,244,24,241,91,187,103,118,97,90,44,62,213,9,126,114,182,128,45,166,224,67,234,
+182,169,238,233,162,139,202,123,217,95,194,54,65,86,111,255,173,30,49,211,142,150,90,244,172,54,188,38,157,188,137,18,248,162,36,9,30,18,60,31,58,195,219,136,5,123,21,49,204,136,209,98,176,85,236,125,43,226,154,37,67,142,89,244,190,23,131,248,5,9,216,66,116,151,86,74,139,239,152,167,55,78,86,225,101,31,220,62,174,73,38,70,50,141,232,188,247,210,218,23,161,76,174,126,89,211,88,217,48,155,6,43,132,165,213,138,253,169,210,36,44,18,189,189,233,16,172,174,231,17,150,164,158,78,183,116,29,225,199,166,141,90,7,238,251,252,39,107,196,108,14,9,235,102,89,103,213,197,208,8,170,49,217,101,157,187,161,38,0,217,109,42,51,214,133,113,160,171,12,2,55,209,202,115,188,61,195,118,51,228,59,211,161,2,243,152,95,37,210,23,99,91,27,161,71,249,141,123,14,55,218,131,65,186,132,200,176,176,196,44,36,226,81,63,184,37,49,234,187,119,8,232,30,172,133,248,97,232,118,57,98,38,102,103,105,219,83,103,207,154,20,12,33,160,221,218,
+93,15,27,119,231,249,51,152,25,62,47,214,187,80,101,128,45,85,52,14,28,112,132,209,162,55,253,205,57,227,245,239,54,180,207,165,185,12,14,182,98,24,197,60,165,200,30,249,195,109,65,226,26,77,139,236,77,164,179,24,139,137,144,132,170,66,172,141,132,79,119,31,128,116,126,79,118,12,162,202,33,20,13,59,238,37,178,114,188,195,208,6,172,91,204,201,50,50,12,168,182,189,56,192,0,53,199,4,198,56,221,99,6,55,12,95,107,99,135,158,229,190,224,2,118,57,7,234,61,190,74,215,47,93,249,201,56,215,51,172,48,180,12,91,105,223,208,12,249,124,234,54,200,232,183,133,59,78,191,219,38,148,7,236,14,81,183,142,3,71,16,196,134,31,99,73,207,145,158,199,193,106,11,200,91,48,50,212,203,179,221,10,167,245,125,206,49,129,44,86,1,153,54,82,43,188,58,28,132,117,144,130,79,239,56,176,133,252,40,103,217,19,176,90,24,59,95,179,28,158,104,158,35,119,138,6,174,79,64,146,35,75,65,44,175,76,75,2,14,145,81,16,166,136,18,173,
+199,186,26,85,219,140,82,243,108,24,231,28,242,136,182,32,67,138,236,188,58,76,214,141,206,165,115,133,196,197,32,16,182,181,235,62,121,33,99,179,187,86,79,63,105,27,47,236,243,250,213,192,156,244,176,35,163,117,179,51,47,238,51,8,30,244,212,235,20,158,212,205,18,3,164,101,23,55,139,128,162,106,234,208,157,138,173,21,201,224,70,238,219,59,180,10,112,121,29,174,23,192,67,39,48,186,156,231,62,88,140,60,172,61,167,175,245,190,200,156,242,158,231,236,208,15,150,30,171,3,71,106,211,249,57,114,238,220,206,121,111,159,15,60,230,130,22,234,141,41,153,249,28,102,26,33,156,81,92,251,221,240,62,207,156,178,77,171,197,128,73,101,232,177,249,168,137,96,251,173,6,210,19,222,234,29,250,26,187,70,25,94,190,223,161,181,22,75,120,96,124,29,212,249,114,43,121,49,137,205,183,60,104,151,214,9,163,196,37,12,178,222,244,109,42,227,30,25,118,1,136,7,78,182,228,5,237,83,210,142,205,33,208,216,92,12,129,14,63,45,115,102,192,76,199,155,
+153,7,222,228,77,21,159,231,133,84,98,108,46,112,68,113,36,206,245,114,121,217,72,216,79,139,78,179,239,41,68,175,74,89,32,238,17,41,123,186,108,64,55,203,142,78,10,108,27,60,220,48,30,163,203,178,119,192,234,216,233,102,28,181,118,28,213,78,36,17,186,198,48,27,100,251,211,250,33,186,162,109,212,224,84,74,25,111,58,8,227,181,107,14,212,50,47,55,116,66,187,2,156,102,167,63,97,232,135,221,184,168,165,170,58,197,146,63,79,153,213,202,7,194,48,181,91,217,101,219,77,52,163,233,119,208,238,236,155,208,118,63,92,95,75,170,151,12,131,119,131,28,173,42,122,64,103,80,46,31,43,113,216,228,60,216,47,168,197,237,203,131,225,113,26,41,13,219,198,215,247,98,5,31,52,108,49,118,182,181,19,138,207,24,84,164,66,214,19,105,115,118,232,198,218,129,153,13,157,246,254,179,107,76,52,89,29,113,215,136,244,109,202,161,101,67,158,225,188,84,64,195,139,140,137,211,224,225,190,114,14,94,250,196,141,194,9,216,80,235,121,150,17,44,104,226,
+216,124,161,163,93,140,183,160,65,57,195,109,4,183,67,191,158,76,234,40,147,219,129,87,8,0,6,183,35,3,116,174,215,42,183,227,139,32,118,17,244,108,130,118,238,231,140,160,62,126,122,164,157,123,69,132,253,253,172,110,68,207,69,3,226,132,25,56,72,48,232,188,162,169,194,26,149,35,154,90,53,170,69,66,3,119,95,32,84,218,0,94,155,57,249,184,15,115,192,24,208,36,252,226,230,90,62,178,34,165,19,202,88,216,1,164,233,240,185,49,69,148,214,177,169,181,187,178,117,33,157,216,2,248,132,138,221,185,90,12,222,167,190,56,53,147,134,49,120,60,234,68,0,138,128,42,117,21,254,100,155,29,107,176,119,44,4,245,50,77,153,133,124,26,79,214,129,25,199,215,168,7,215,175,206,97,217,15,217,134,98,146,91,175,128,64,91,215,11,229,115,29,139,65,62,95,47,239,37,208,175,254,2,133,64,167,182,199,26,176,116,218,27,213,21,177,218,183,231,227,154,47,206,40,252,214,75,72,142,143,203,5,187,164,121,1,5,172,16,104,245,230,0,128,235,197,
+234,5,228,190,222,0,188,95,111,126,145,252,255,217,253,234,237,147,163,234,217,2,179,207,86,47,141,243,188,160,213,128,139,203,153,10,120,123,243,116,185,52,206,66,23,48,138,235,220,93,114,178,110,217,47,147,75,244,50,24,72,177,121,250,75,237,191,210,159,127,189,60,48,200,182,41,125,205,233,192,9,26,48,131,43,187,52,109,251,122,185,188,30,185,50,199,190,12,181,222,123,105,55,73,184,47,113,53,206,77,92,99,93,184,191,140,251,231,95,217,5,247,53,140,72,230,170,61,9,185,244,148,167,8,234,54,83,204,191,166,11,128,240,161,179,177,42,60,189,39,213,73,153,117,109,144,137,75,159,66,117,141,46,9,232,114,185,188,122,46,144,154,177,223,181,132,236,14,124,206,218,91,57,138,11,110,252,175,112,83,46,151,233,153,192,126,148,85,23,52,47,17,7,184,105,9,176,194,111,90,70,207,47,215,236,155,181,155,101,46,80,38,151,153,5,208,1,254,186,61,29,236,247,57,109,226,164,221,1,104,89,207,175,219,219,241,11,51,203,215,180,10,248,157,70,249,
+165,158,174,155,158,219,40,129,137,74,199,211,86,33,191,199,199,162,112,158,120,27,224,223,159,27,225,57,93,95,203,50,17,202,131,160,239,210,101,26,51,158,6,171,164,250,1,50,74,192,137,125,6,66,219,57,50,158,248,145,105,27,13,94,69,68,63,108,37,35,151,145,152,246,236,243,120,134,87,39,142,64,195,198,131,65,129,226,203,239,90,156,233,49,50,47,173,130,112,235,100,13,127,208,227,141,171,103,240,82,29,125,16,80,245,253,33,88,63,244,180,202,38,121,79,214,132,90,162,247,225,125,191,76,52,161,114,41,147,92,59,40,124,244,154,25,61,237,99,45,48,69,244,12,230,242,200,139,125,26,82,115,92,103,229,122,0,189,50,81,186,215,26,132,16,121,45,27,227,139,179,97,22,1,226,190,243,215,255,253,230,87,255,255,229,31,94,191,250,119,94,191,250,183,255,198,87,255,89,174,9,80,160,235,158,215,42,245,68,16,153,133,120,79,130,6,158,240,240,33,248,164,148,220,245,58,73,100,245,16,201,44,15,234,77,20,139,55,43,56,32,32,204,225,80,95,
+149,8,81,206,161,172,190,191,66,52,119,207,40,179,135,43,97,221,107,75,139,36,11,62,102,198,61,181,163,97,50,175,152,187,124,147,179,44,57,154,199,244,73,202,120,140,102,229,163,76,246,92,138,74,20,119,122,189,41,230,7,162,23,44,48,189,155,115,192,76,49,32,154,22,98,20,143,145,157,135,168,139,70,68,205,58,241,16,128,78,253,210,187,67,18,20,6,15,18,162,210,221,147,180,131,141,66,238,5,169,92,28,75,74,233,188,131,41,198,130,118,182,176,238,135,32,174,48,168,207,157,77,127,63,113,79,116,248,243,174,55,129,7,33,147,73,223,101,149,100,20,13,85,188,179,23,40,25,213,112,247,106,200,140,216,104,0,75,72,210,141,247,37,71,238,157,8,127,160,104,224,62,91,173,140,120,213,89,93,51,41,199,38,130,26,253,132,251,71,21,36,5,255,180,2,164,128,165,225,121,152,6,82,87,186,88,236,21,106,83,160,161,193,85,91,211,244,11,14,161,172,6,144,67,75,188,77,64,74,249,241,9,108,234,231,36,191,115,230,107,214,52,84,133,67,141,
+201,11,130,111,122,112,112,45,125,66,70,168,8,219,125,76,244,80,98,137,173,202,26,150,138,125,246,15,5,121,215,185,41,160,192,139,148,234,42,77,62,186,162,15,140,230,46,85,153,175,207,201,226,148,4,232,176,63,136,195,39,223,176,106,1,208,149,222,60,120,110,170,206,63,216,224,74,230,109,72,126,48,115,226,133,214,163,89,7,10,21,4,168,98,226,3,188,40,97,30,222,100,45,233,123,179,11,143,218,232,32,68,80,1,42,223,171,177,148,242,179,169,175,158,16,170,77,100,208,21,20,95,204,219,15,140,231,39,252,1,38,118,74,3,28,160,138,238,30,194,30,162,24,188,37,255,127,49,247,94,63,14,102,89,126,216,191,210,246,131,60,11,143,229,149,37,88,214,74,54,32,192,126,16,96,24,134,237,23,67,88,96,122,103,123,119,219,234,157,94,119,247,72,187,111,204,100,49,21,201,98,49,231,204,98,42,230,98,49,231,156,115,78,197,156,115,38,205,234,153,89,205,72,99,67,6,12,173,235,229,251,112,207,185,231,156,123,207,185,231,222,203,67,254,106,11,
+150,8,140,113,55,169,248,33,90,73,193,4,96,116,132,160,202,119,22,87,62,223,166,188,123,150,50,167,81,192,153,111,159,151,241,201,235,227,242,181,250,129,187,164,216,248,44,194,131,114,202,178,33,181,83,221,1,54,9,157,107,56,254,126,98,208,115,11,70,75,226,242,39,179,27,139,248,66,21,173,106,180,32,147,206,28,179,161,96,252,8,199,49,106,24,216,49,230,62,7,27,18,76,157,239,132,109,172,247,202,58,250,48,162,65,177,198,209,18,221,7,145,176,215,202,122,46,153,175,54,13,188,103,8,123,49,55,10,40,32,190,7,44,226,76,156,189,92,29,167,115,235,173,196,10,43,189,49,241,239,84,216,168,124,109,221,72,150,71,159,88,82,160,71,235,133,137,73,143,183,76,80,3,27,24,246,236,149,237,66,4,35,27,213,202,61,240,52,222,41,126,224,74,100,93,175,183,172,171,241,76,225,113,110,25,30,135,200,19,62,112,161,97,2,138,172,146,204,230,152,106,135,170,118,187,84,220,194,94,105,226,63,128,246,88,130,170,182,86,21,0,61,103,143,11,146,
+8,110,224,3,35,147,117,237,50,193,156,223,42,25,42,208,186,88,164,49,17,19,158,38,59,206,248,10,95,207,252,84,63,100,195,126,213,234,171,99,176,127,68,71,230,39,242,224,197,54,140,195,172,94,42,143,24,44,217,4,7,84,112,210,50,44,144,138,86,7,79,247,44,232,217,49,110,230,253,64,242,150,144,166,159,234,194,233,189,64,233,30,122,149,25,226,168,136,105,89,81,214,100,153,189,80,25,235,118,247,53,101,224,176,125,94,48,100,152,37,38,191,159,190,242,9,84,212,148,36,233,17,159,96,31,125,144,197,190,204,210,25,111,155,56,236,114,42,25,166,170,24,129,168,26,212,132,193,75,138,160,19,185,25,175,89,162,221,75,96,24,31,240,230,32,49,104,117,18,169,50,116,24,66,128,137,201,138,176,172,91,32,190,181,175,235,97,116,224,60,217,146,206,120,212,162,61,48,142,49,245,236,169,167,30,133,53,72,90,88,19,70,230,137,33,72,202,177,156,180,94,45,174,45,95,242,146,39,226,73,96,201,166,38,51,156,167,217,100,42,115,143,102,31,200,14,
+81,89,218,249,202,153,166,177,235,210,172,46,63,152,60,82,89,163,99,200,22,4,43,123,38,20,118,98,242,110,63,42,234,100,246,18,205,2,249,215,40,175,207,104,101,205,7,84,158,12,248,200,138,183,74,16,99,232,214,66,193,92,170,215,57,194,1,17,3,111,152,192,173,109,162,251,117,211,5,105,24,79,51,164,202,66,22,199,95,208,245,122,9,192,26,205,51,143,182,81,97,53,151,104,50,226,69,43,240,242,188,105,51,182,193,112,124,98,20,76,113,132,248,147,114,155,35,177,6,73,203,173,89,17,236,40,146,170,110,101,49,16,133,226,210,37,150,169,121,58,110,59,70,7,218,153,28,109,148,89,221,88,156,23,228,156,202,209,16,164,210,249,6,109,55,158,209,172,86,49,13,23,127,4,245,240,69,178,23,231,75,175,4,65,120,249,129,205,49,9,230,168,166,70,199,233,7,145,147,7,242,193,71,62,250,186,228,189,239,246,192,138,135,144,245,155,132,251,118,213,180,242,22,21,249,146,59,204,171,252,133,101,14,199,250,16,133,194,170,192,135,204,237,44,50,99,
+104,33,230,174,238,218,253,13,59,4,232,159,130,251,93,243,174,14,110,189,73,63,130,68,146,50,88,193,162,142,31,50,131,43,95,17,202,142,141,97,211,17,26,59,100,7,208,27,100,22,93,130,234,157,250,209,175,85,48,159,175,141,178,175,247,116,63,15,135,207,222,58,238,35,92,88,189,158,155,14,49,217,180,29,183,90,152,212,192,116,93,192,74,206,184,254,35,87,200,157,231,151,184,226,29,50,223,142,101,9,165,161,121,191,1,249,94,123,173,125,148,58,132,203,233,94,53,253,209,139,31,233,90,170,168,112,192,49,197,35,248,29,97,141,143,143,185,179,202,129,181,171,192,74,43,156,105,31,6,152,123,146,24,126,216,41,48,229,186,202,211,101,109,155,136,25,236,24,177,175,108,196,80,215,244,219,75,2,203,114,147,63,96,209,82,18,5,115,95,41,33,120,92,63,148,4,176,7,116,28,116,121,124,16,76,82,162,205,158,0,244,108,198,58,146,24,42,104,141,107,215,103,37,186,220,70,131,76,106,61,193,100,66,43,5,123,191,40,120,198,35,35,250,235,229,99,
+165,93,43,215,6,134,165,130,77,96,101,224,87,107,78,218,150,30,101,124,198,72,64,135,27,43,189,81,243,13,84,212,75,72,23,146,56,173,170,72,163,152,92,221,236,93,37,123,218,100,41,70,56,209,100,201,196,12,15,83,16,253,219,169,35,158,245,244,77,203,16,246,213,34,83,180,137,156,138,206,213,39,139,37,21,92,250,3,204,242,159,201,74,68,112,133,12,54,41,84,159,197,95,135,47,105,11,134,8,42,127,3,49,104,185,160,0,222,126,84,247,112,110,212,109,60,66,151,68,80,117,172,23,27,198,133,84,30,148,248,130,178,207,32,154,245,125,205,91,54,246,77,41,31,32,80,94,227,32,71,218,157,49,233,19,108,166,244,224,142,118,125,212,142,133,8,198,72,226,155,9,63,76,180,219,114,104,118,148,84,228,199,252,20,38,18,104,34,116,124,77,102,145,71,147,2,80,193,176,159,163,0,244,116,171,102,66,200,206,248,194,13,82,51,253,162,158,24,222,230,26,32,254,253,185,97,218,171,230,243,78,197,103,85,85,10,180,62,181,82,218,107,237,15,159,85,
+100,193,28,48,124,93,65,225,214,94,167,196,194,39,193,128,225,18,254,168,67,145,133,8,61,127,233,81,143,188,106,22,221,147,28,57,87,73,205,94,244,170,99,190,189,40,75,71,83,224,6,237,139,146,140,128,209,167,227,188,34,37,37,28,115,246,108,98,170,181,107,135,49,143,113,54,211,44,113,206,49,215,248,123,57,195,49,170,165,110,244,135,58,7,252,8,223,96,107,74,243,181,58,240,37,155,50,92,144,98,95,63,219,253,160,5,2,64,230,216,206,167,137,57,3,43,165,224,78,63,1,34,38,183,253,76,164,183,207,210,106,23,21,159,98,16,187,49,52,38,31,181,235,175,164,35,122,13,28,72,123,211,212,64,82,20,93,11,121,66,245,6,101,153,114,98,8,234,75,61,168,164,82,210,197,240,173,102,211,185,105,179,70,135,143,213,19,75,245,134,62,153,251,48,251,14,174,37,114,116,66,130,146,217,79,99,76,129,204,171,209,30,33,22,153,22,186,16,99,194,156,146,215,179,5,103,23,114,152,112,165,111,92,39,131,135,35,123,202,153,240,91,148,214,52,82,
+107,7,244,32,169,116,31,105,180,217,222,88,161,183,3,111,81,225,117,186,175,233,143,145,206,128,91,133,32,171,51,88,2,38,158,51,85,185,22,246,22,20,82,108,149,55,234,41,38,24,53,49,131,222,146,250,17,128,2,102,88,3,138,91,253,240,127,32,219,75,252,80,149,52,53,44,185,89,99,18,141,246,171,101,163,215,136,34,163,200,62,196,57,193,247,162,120,80,27,158,125,96,225,169,83,46,92,109,31,33,195,47,160,245,35,230,62,0,107,125,1,48,89,158,133,171,181,211,145,12,99,105,236,119,148,93,247,112,228,109,247,194,36,209,209,96,156,132,67,174,140,241,50,202,218,207,118,148,227,41,241,48,207,178,220,17,210,123,63,186,244,129,176,116,185,251,125,232,201,48,200,139,88,91,9,142,69,244,180,50,162,54,226,83,91,158,217,115,19,246,198,130,86,156,156,169,13,28,95,12,215,209,69,232,53,110,204,248,102,56,17,216,115,152,93,109,34,87,133,32,65,214,101,216,122,136,228,145,63,121,122,31,4,175,183,57,242,112,5,3,192,67,128,228,15,160,
+73,190,135,11,207,131,34,242,182,177,199,248,242,145,103,219,187,159,222,208,217,19,156,56,141,172,94,117,211,23,98,164,44,132,99,145,200,45,163,66,98,57,171,65,164,79,125,8,233,253,189,60,23,176,104,244,82,59,26,157,39,183,74,94,98,133,213,154,230,73,203,183,47,134,217,200,179,193,115,208,139,232,69,177,241,188,97,179,243,75,123,129,211,102,141,11,70,177,55,239,73,75,42,52,215,242,48,243,132,147,143,81,121,97,244,161,4,154,112,20,44,138,205,125,179,213,16,109,45,40,86,188,205,230,9,249,222,244,1,222,116,65,26,195,182,141,50,230,50,206,91,189,169,109,54,143,222,186,81,205,46,249,151,42,30,38,16,147,133,89,132,236,136,177,100,0,165,178,218,81,238,237,179,231,42,100,89,129,141,16,17,158,145,214,36,208,184,121,4,188,242,161,12,69,0,115,182,141,180,70,148,74,138,20,229,242,161,172,95,219,5,101,235,188,241,8,141,226,101,67,64,130,153,219,37,55,86,120,176,65,49,9,86,58,159,66,67,239,147,28,62,223,132,32,35,223,
+179,203,148,173,131,170,135,7,101,212,237,116,1,1,193,7,168,68,195,239,21,244,243,26,255,61,8,182,218,101,157,183,138,23,130,42,10,95,16,45,130,176,129,2,122,130,157,117,123,65,65,97,187,91,3,24,35,192,98,103,22,110,198,163,212,73,205,207,104,249,200,195,84,106,248,113,45,90,214,44,174,13,34,143,61,34,168,86,69,200,189,245,21,166,241,160,145,74,96,103,2,35,79,5,177,78,97,119,62,190,62,237,170,133,78,1,80,17,29,234,65,82,219,220,30,142,12,47,129,131,66,173,188,128,45,235,61,106,78,72,202,37,31,194,183,150,73,33,120,145,29,61,7,128,224,176,38,237,107,12,39,85,249,80,135,18,225,109,17,9,34,118,89,186,3,241,147,16,197,71,93,212,46,129,141,107,238,66,223,123,102,213,169,43,30,49,11,171,192,48,177,81,31,186,166,117,44,217,225,43,171,203,55,203,123,130,210,60,49,234,13,10,133,104,82,195,153,30,198,77,119,225,160,235,172,143,162,179,16,157,92,25,173,115,195,207,182,12,250,245,35,143,151,125,123,45,
+17,137,242,23,152,144,159,15,241,184,78,89,143,228,239,4,120,131,92,136,151,39,194,197,32,174,43,21,114,17,194,110,80,43,12,106,133,206,2,126,232,236,18,214,156,101,115,79,25,190,234,56,244,181,120,132,31,232,11,185,77,159,77,89,49,134,17,135,6,158,29,8,235,207,10,0,245,9,137,126,170,213,57,193,137,95,85,95,121,196,96,192,139,159,90,4,85,68,17,116,154,65,124,102,174,30,153,195,103,197,209,139,36,9,17,174,88,42,243,162,114,122,228,92,146,199,33,130,187,211,74,60,151,77,134,168,36,132,7,180,236,1,161,44,10,24,181,22,153,183,192,38,43,86,35,167,108,229,224,215,129,112,70,132,118,80,239,201,142,50,103,136,139,171,179,48,86,40,12,64,2,110,8,206,128,43,120,143,140,65,53,43,231,161,6,85,6,197,202,94,57,91,196,158,183,125,50,243,231,240,88,93,181,198,0,84,37,130,12,29,33,246,96,2,132,43,143,116,185,114,72,87,26,207,13,242,91,13,129,131,64,228,244,31,42,53,139,78,84,32,216,53,251,38,229,195,
+185,122,13,140,138,87,6,64,25,153,159,123,185,177,105,65,65,219,224,16,178,218,115,194,6,45,182,186,83,201,51,97,39,111,198,221,107,104,131,132,242,23,21,187,226,152,247,43,59,208,156,168,115,240,118,21,216,65,180,78,99,179,113,184,24,27,71,177,235,154,189,67,234,217,76,246,204,214,166,71,240,246,228,159,214,82,12,253,169,249,49,173,107,95,171,119,255,90,65,200,93,172,108,216,108,29,51,82,124,153,106,43,250,213,131,96,81,177,156,99,183,177,142,178,102,72,98,15,149,43,210,203,8,216,102,113,156,100,203,122,179,4,108,28,169,91,43,47,11,196,188,176,89,147,22,187,94,210,102,77,57,138,141,228,33,175,49,237,184,186,59,227,42,7,231,168,75,130,41,232,76,138,249,180,44,26,252,14,210,108,249,106,173,87,67,113,153,248,196,130,11,232,125,118,123,114,74,48,178,64,204,36,5,13,97,153,27,144,16,127,197,72,211,179,2,220,237,173,237,122,22,1,54,114,144,189,235,149,110,201,14,84,67,41,197,25,70,218,163,27,190,113,59,51,241,99,
+116,80,127,225,107,106,31,130,186,171,117,216,47,105,209,145,162,95,46,144,48,250,190,244,104,24,88,215,91,204,22,247,177,121,193,161,173,197,73,133,234,113,188,30,65,173,136,169,10,123,200,130,130,122,16,32,222,1,61,66,89,187,39,58,159,176,207,160,108,251,44,162,155,227,187,34,169,173,200,56,167,139,176,30,141,59,88,93,211,95,223,219,79,49,79,32,185,47,202,93,85,156,12,53,7,36,153,212,178,140,34,108,184,29,192,75,134,179,199,74,158,27,23,141,96,94,21,17,17,1,9,240,137,79,109,244,228,17,244,1,199,98,164,89,180,20,213,108,25,46,231,47,219,60,122,165,157,155,149,121,157,80,181,105,218,201,124,91,13,245,90,179,90,102,107,3,246,45,47,182,76,216,217,48,62,46,208,89,217,139,156,161,223,41,115,34,89,3,119,128,32,203,61,15,39,147,207,249,252,134,50,134,73,101,178,217,24,1,139,75,24,94,1,166,65,27,96,4,49,159,243,156,3,96,55,165,61,92,2,81,82,214,233,66,41,75,233,151,132,199,105,13,243,18,8,67,
+172,5,86,33,3,132,40,94,207,23,73,253,192,2,55,171,189,172,17,252,81,37,27,214,88,238,89,53,6,39,173,55,142,6,52,190,45,48,36,97,130,229,70,167,24,207,47,111,71,74,215,47,151,185,99,144,2,1,4,161,186,216,234,0,100,76,78,60,149,111,44,14,229,90,53,188,234,34,231,184,63,14,179,73,218,135,198,216,91,79,132,66,156,231,103,12,120,211,145,35,108,111,162,5,133,243,28,177,101,162,77,45,16,183,175,123,1,166,149,149,84,31,55,111,26,114,132,44,55,231,249,66,14,198,209,161,60,113,142,202,70,67,37,188,65,179,97,160,50,56,32,86,175,164,43,89,219,184,39,76,56,157,61,138,24,235,39,115,213,58,91,207,77,183,164,91,43,44,143,233,43,80,188,4,101,191,248,123,83,197,60,249,68,173,58,5,205,46,159,230,246,196,238,39,208,185,3,66,217,167,100,148,43,202,225,13,67,132,206,198,33,213,81,241,28,167,213,121,28,68,57,197,121,157,67,124,230,76,173,91,214,216,207,177,247,48,0,145,43,70,120,181,148,37,177,152,
+197,55,242,48,96,111,81,48,203,6,0,76,51,162,60,215,93,249,160,57,26,232,202,160,8,156,163,140,220,119,47,125,4,109,68,160,239,210,54,223,8,224,28,202,11,63,244,130,146,15,77,203,198,124,215,183,54,14,201,143,48,141,242,242,84,238,235,229,253,172,11,84,147,228,147,204,238,32,60,224,14,165,85,160,46,215,20,28,171,241,193,82,21,177,63,91,22,59,67,236,81,247,9,196,5,103,18,79,111,12,7,1,12,113,140,249,101,197,200,52,119,218,212,107,180,23,209,131,240,152,198,36,228,165,1,183,168,88,232,156,163,167,63,120,7,28,42,149,42,25,139,3,214,220,203,44,183,206,232,4,74,217,35,69,175,40,12,115,189,209,75,122,119,12,24,122,238,226,197,130,215,196,107,238,204,34,198,64,6,196,54,24,157,114,30,234,71,168,231,37,159,253,174,61,108,186,152,165,70,37,144,205,159,100,200,53,253,45,63,175,52,185,27,235,205,16,199,41,122,26,48,235,201,72,133,28,101,153,56,237,153,9,64,139,243,74,172,11,43,162,230,29,228,29,214,29,
+48,60,79,251,162,12,184,212,197,12,156,81,115,174,91,9,135,199,37,118,162,131,35,9,66,37,57,242,182,146,62,46,94,30,25,122,25,250,20,193,192,53,173,62,140,215,24,86,91,227,135,37,251,177,163,173,115,85,91,250,185,155,209,98,110,212,211,75,101,227,183,183,15,233,19,14,126,139,63,104,120,189,11,42,209,68,86,98,107,182,116,20,48,105,168,167,200,152,237,230,167,96,214,247,90,44,188,142,95,144,218,3,118,123,204,167,182,110,225,27,83,139,161,101,253,251,154,177,252,156,78,189,217,6,128,244,178,125,220,187,135,77,192,75,51,121,97,60,186,52,165,167,140,223,19,233,38,97,145,20,44,38,9,175,216,130,29,83,76,71,26,45,93,95,185,211,198,214,10,151,18,255,213,108,95,158,133,252,220,170,98,229,176,40,44,62,29,196,232,106,118,18,127,174,109,154,51,225,182,65,98,187,206,160,183,217,49,75,205,24,216,140,150,143,148,245,240,2,109,227,123,33,199,97,208,216,175,12,58,153,163,168,198,72,195,217,133,217,182,73,174,158,185,172,36,178,
+163,37,94,211,128,224,187,247,169,99,107,119,26,182,118,162,215,221,158,188,122,45,60,19,191,88,149,227,138,195,101,60,241,86,113,238,10,203,186,173,6,18,133,5,190,26,94,174,154,40,153,149,104,124,84,100,49,216,176,97,90,117,186,180,106,157,30,233,249,182,121,74,11,35,10,17,205,129,105,9,149,56,213,149,115,118,134,194,202,21,41,248,7,66,221,182,8,89,145,144,72,66,78,43,201,119,139,231,40,27,74,222,143,193,165,29,23,7,180,95,29,146,13,93,62,223,208,215,157,165,204,94,58,47,83,73,220,53,144,93,25,195,58,150,251,230,173,188,179,70,99,227,199,147,73,125,250,64,157,174,97,75,11,235,72,53,111,229,98,57,175,186,53,111,33,112,116,133,62,97,119,65,22,38,136,162,167,72,20,135,72,204,146,8,217,41,197,105,76,1,8,253,207,224,117,43,156,10,170,148,117,234,58,164,82,26,180,187,51,27,158,212,183,17,125,234,241,29,145,151,36,11,210,141,237,182,170,39,246,0,21,146,172,198,217,179,247,11,135,88,52,52,18,60,138,231,
+80,221,124,42,223,87,207,131,230,168,173,197,187,116,25,192,184,106,56,197,54,227,77,29,54,0,195,21,56,61,230,157,87,166,38,228,177,93,150,152,9,19,41,122,49,229,28,131,93,52,57,202,88,2,117,132,199,155,51,126,12,174,82,15,96,217,85,108,91,163,70,14,222,117,199,234,55,76,217,35,79,65,3,237,177,35,90,83,116,61,218,189,151,6,178,15,35,236,202,156,211,240,41,190,176,67,221,235,28,67,170,188,102,225,121,216,185,193,30,189,159,206,21,231,242,137,229,134,21,76,117,183,205,61,52,105,64,103,131,102,169,164,193,129,239,50,82,156,11,115,37,242,149,50,44,88,101,167,159,177,151,210,240,157,115,61,186,236,49,204,137,188,155,51,253,122,214,109,100,71,235,87,38,101,239,73,152,53,67,45,51,79,61,123,196,69,143,177,145,235,185,17,120,44,98,0,210,174,54,143,58,169,70,219,81,221,193,230,58,104,168,55,207,11,209,254,244,216,95,146,54,25,68,235,49,161,204,15,102,226,70,204,165,177,246,32,145,184,127,200,178,168,152,27,165,102,
+14,129,29,121,4,11,234,88,237,110,174,79,157,43,219,169,219,48,62,166,170,96,66,100,83,209,111,145,9,230,237,150,123,183,85,181,176,171,227,160,6,123,102,67,43,12,123,161,119,12,207,91,198,177,202,145,196,248,93,145,197,79,181,85,33,51,65,51,50,161,6,208,4,110,80,12,101,81,181,109,3,24,25,164,43,31,56,121,90,69,151,135,155,119,7,40,223,106,59,105,27,82,189,128,151,163,96,179,128,134,195,168,229,104,150,45,242,243,17,84,176,170,64,94,22,78,110,211,228,128,19,63,43,190,15,133,213,125,158,166,65,163,45,139,104,111,106,176,209,163,196,220,25,202,226,63,63,61,118,166,170,176,184,106,21,176,207,140,179,75,159,94,230,197,29,101,252,28,180,15,110,35,255,165,224,157,89,94,22,12,113,121,13,60,221,19,28,67,30,154,145,249,59,112,114,175,201,15,106,202,123,254,206,180,183,40,135,110,100,234,92,192,252,13,67,173,210,131,87,105,186,178,182,179,139,31,110,136,171,172,50,72,175,20,172,25,113,239,168,148,111,110,126,117,233,103,
+183,124,28,203,20,232,80,88,248,172,227,163,56,144,148,54,168,227,41,29,213,214,168,185,252,101,236,126,7,252,88,25,226,19,120,37,35,88,7,122,148,75,74,49,53,229,246,113,81,111,66,64,217,210,69,203,172,43,234,129,118,134,28,236,238,176,14,28,195,14,228,30,218,129,15,212,173,104,238,19,112,235,6,100,72,43,19,189,44,240,155,190,63,200,51,177,27,204,58,212,56,128,212,92,164,48,77,12,139,95,80,228,55,233,89,140,7,171,70,93,27,10,181,155,70,13,47,21,86,58,50,20,213,119,193,167,141,50,78,207,96,79,173,124,50,238,68,212,79,148,131,77,87,161,29,174,17,149,132,205,42,103,87,226,16,68,57,124,14,172,140,219,120,118,71,216,81,86,178,242,57,99,46,197,47,179,134,206,200,138,155,188,161,136,246,5,196,16,31,24,167,71,239,161,178,171,204,103,94,20,14,177,85,243,99,20,143,237,82,234,45,74,162,66,125,135,214,25,234,224,190,59,173,189,122,139,150,55,252,230,202,6,52,145,218,91,208,99,135,238,230,124,168,24,229,224,
+133,164,237,203,243,19,43,255,182,53,62,99,6,167,166,219,255,140,130,95,84,203,115,97,140,73,93,158,145,31,7,57,127,116,119,135,28,49,61,40,93,4,126,188,119,171,15,166,15,137,157,101,152,130,50,96,181,117,96,146,221,81,99,79,70,103,251,32,176,246,125,125,184,231,52,57,96,144,178,124,240,138,40,210,14,202,134,9,5,213,106,148,107,165,174,38,103,65,201,92,16,97,165,38,1,173,156,232,193,196,166,24,220,92,105,133,101,230,228,220,222,233,230,146,172,186,38,19,241,123,203,217,135,198,225,72,106,124,7,236,84,140,193,172,229,234,106,135,22,143,157,144,111,39,189,221,84,42,2,249,134,182,220,28,111,82,202,139,30,218,155,99,130,14,150,236,84,47,32,151,115,231,228,240,200,222,41,130,86,210,21,72,181,219,22,143,162,110,25,151,147,239,15,6,42,242,121,80,93,234,158,161,218,217,18,48,242,166,206,139,21,218,98,122,199,92,122,108,24,68,31,44,86,253,98,163,198,214,71,18,155,44,141,193,8,177,10,33,167,98,97,154,30,193,197,117,
+54,52,12,172,107,172,31,71,18,146,73,9,2,10,168,41,236,93,157,247,217,166,82,230,85,52,158,194,13,203,217,227,236,250,74,126,229,109,80,182,151,21,21,46,157,95,29,234,155,196,206,97,156,96,161,118,167,140,168,219,230,194,225,121,118,203,62,30,202,85,196,0,174,68,95,216,65,20,216,138,83,112,88,185,203,100,190,51,204,25,83,78,71,108,196,177,80,36,139,24,94,159,1,174,16,16,24,214,174,155,128,143,145,144,101,215,176,19,17,91,205,213,10,136,79,186,167,35,185,175,238,50,186,237,193,217,236,136,27,81,139,178,159,229,222,53,17,14,186,156,195,118,106,29,23,100,165,175,190,242,32,205,43,90,118,74,7,216,84,202,202,196,6,21,111,243,15,138,252,204,102,234,216,59,160,210,146,117,31,115,153,200,89,184,237,226,4,230,247,158,196,148,15,188,143,226,205,13,139,157,137,122,118,201,200,133,158,136,37,88,21,251,138,51,244,201,180,47,210,75,134,109,49,164,110,201,250,135,155,181,178,204,187,241,197,170,106,199,247,248,116,124,111,214,147,37,
+140,222,220,204,200,10,36,103,42,241,104,74,178,83,9,109,235,73,241,148,61,115,176,183,10,86,130,124,3,173,11,21,152,186,81,207,111,118,194,245,150,9,236,89,253,128,64,223,254,84,197,202,234,151,132,121,93,29,138,208,47,133,205,205,223,109,242,78,157,136,183,171,206,76,23,117,108,165,173,120,47,130,73,64,232,41,28,26,128,159,134,98,11,148,73,10,132,187,33,252,141,191,26,200,14,163,81,213,27,223,0,211,123,172,148,105,97,107,215,79,247,3,138,127,160,109,153,98,154,89,231,246,152,7,124,76,250,22,241,193,62,175,200,189,211,152,45,33,7,218,38,156,226,224,80,190,153,44,231,135,102,104,161,202,68,143,59,219,179,49,255,34,182,214,54,19,131,228,56,228,208,194,82,85,160,10,3,105,22,65,240,199,19,139,240,248,113,138,92,147,236,195,188,10,255,152,109,148,87,51,248,84,188,161,182,118,62,203,193,122,52,99,51,112,99,92,81,157,13,250,166,64,142,121,152,174,242,229,74,254,225,77,60,51,153,217,67,134,119,106,120,211,213,222,95,194,
+170,154,249,80,92,160,196,181,233,170,69,183,250,227,143,253,219,145,189,6,164,249,108,179,149,62,44,106,249,108,147,121,242,114,43,6,196,192,213,158,207,182,223,154,124,123,9,59,90,213,58,42,187,202,182,106,28,140,215,53,106,155,157,214,31,137,68,182,229,68,84,246,114,23,178,50,48,103,220,34,116,166,120,205,200,38,181,164,33,179,76,101,146,192,4,109,249,82,72,200,33,215,33,220,39,219,117,211,170,97,207,70,91,184,106,40,203,227,179,237,104,4,57,75,143,51,218,121,87,85,245,109,149,183,183,120,178,225,178,185,156,55,168,64,117,182,101,206,33,246,206,194,63,3,62,26,170,32,106,104,221,90,234,209,189,92,197,153,87,197,153,94,204,114,234,232,10,185,213,48,216,50,177,218,42,119,54,254,112,129,249,182,145,83,38,77,174,156,242,64,99,11,102,35,205,73,167,221,122,198,36,99,119,130,254,52,167,19,251,39,170,177,126,52,97,178,63,48,183,151,189,98,48,48,217,178,151,178,221,72,237,41,135,173,186,190,127,37,9,46,242,86,230,36,70,83,
+110,61,147,171,167,188,250,92,53,8,141,119,73,2,201,100,245,73,139,218,246,104,66,198,71,151,121,110,75,111,148,5,189,203,109,233,176,101,208,192,136,79,204,189,102,46,101,239,214,250,114,80,151,103,4,90,68,13,125,180,216,181,245,61,100,238,135,131,3,54,163,234,250,236,44,250,245,189,44,68,104,171,126,94,128,77,202,143,187,37,160,211,94,245,204,21,89,219,76,53,186,161,94,186,39,58,209,18,83,191,208,204,0,122,169,141,25,55,231,200,117,133,192,105,164,98,39,50,67,199,134,235,193,252,215,62,107,137,95,108,77,221,129,158,36,113,80,42,218,158,186,231,142,243,227,217,231,251,25,30,3,146,113,34,129,139,15,93,129,205,198,124,248,192,55,145,191,129,103,251,211,77,102,159,197,7,151,163,208,127,161,103,88,115,217,135,212,205,29,23,158,157,137,48,232,186,48,67,46,57,77,134,155,100,165,25,204,161,9,58,125,44,56,86,112,105,79,64,60,129,167,165,211,68,38,188,19,232,67,19,19,250,35,1,150,171,10,88,233,49,106,67,103,184,224,146,
+30,209,230,105,128,227,167,199,23,177,254,179,117,121,14,70,135,38,111,112,81,137,131,218,24,244,118,150,66,238,225,139,183,248,67,188,78,187,158,38,244,26,192,217,120,177,120,217,240,37,99,239,157,145,154,147,154,75,71,84,54,36,44,250,204,255,102,155,108,103,31,200,67,117,129,136,59,179,177,16,45,198,8,212,117,194,197,156,68,223,95,29,151,215,195,52,178,12,100,65,72,39,29,235,91,218,178,101,102,15,81,147,225,214,244,178,175,24,47,10,197,153,92,58,43,29,207,139,160,21,201,102,202,149,236,94,30,123,182,31,38,178,169,3,18,99,153,45,111,50,134,176,172,156,233,131,135,248,34,36,54,10,207,45,79,35,37,221,19,80,90,150,214,222,72,170,75,105,177,106,58,118,72,153,230,151,152,251,109,108,74,74,234,212,86,123,229,100,4,131,131,80,79,107,152,235,45,163,203,106,197,22,98,53,79,166,32,240,20,115,101,123,116,195,65,149,23,191,179,232,170,67,222,242,70,166,208,10,35,122,37,212,200,119,199,25,253,147,211,220,198,223,24,80,113,111,
+81,137,204,194,230,238,249,64,46,231,222,226,199,211,83,100,253,120,38,79,86,167,186,160,38,141,21,165,245,226,58,183,210,202,72,233,248,108,103,103,224,7,244,51,187,228,141,155,7,115,23,234,228,96,25,105,133,208,10,92,194,61,215,49,82,217,236,37,6,153,120,125,96,150,54,31,40,176,116,43,59,227,49,198,59,214,250,181,80,254,144,158,187,108,184,160,162,0,176,27,69,19,254,200,150,49,190,161,130,241,98,168,125,92,209,208,52,6,211,240,88,104,89,149,206,42,123,87,17,88,187,246,100,226,67,180,66,109,203,239,183,177,233,106,25,139,31,103,106,61,69,187,37,117,132,115,200,102,229,197,30,23,181,190,47,52,27,63,57,87,74,75,70,55,128,190,168,81,242,145,41,220,81,8,211,172,85,98,233,179,198,78,216,71,148,84,126,157,188,215,93,196,138,198,204,42,203,239,73,207,122,146,244,68,106,96,111,39,61,212,166,124,105,54,74,192,238,248,7,190,222,74,236,73,181,241,84,253,180,237,157,122,103,240,105,102,102,63,241,179,250,250,147,189,42,254,
+192,236,146,77,67,35,151,41,114,130,154,203,73,192,188,135,130,207,11,146,163,150,83,134,151,177,90,6,34,183,139,228,162,188,177,9,229,85,226,66,81,8,130,218,7,151,185,211,83,28,1,50,129,130,79,59,89,237,82,156,183,188,120,61,221,47,147,250,68,34,174,40,80,176,212,206,129,223,158,149,40,13,98,173,62,243,19,43,182,2,28,46,180,81,157,178,90,107,206,106,83,176,47,218,89,138,201,193,164,253,114,32,248,24,123,237,210,77,85,58,201,37,101,8,251,54,226,68,85,202,62,137,89,105,52,232,202,134,135,130,119,15,29,253,168,204,75,58,46,133,45,134,180,56,189,60,171,75,22,61,226,101,220,50,77,204,215,152,221,122,17,80,220,158,160,101,54,206,87,7,83,76,184,73,140,245,182,38,40,239,113,195,112,193,126,92,37,14,171,76,60,7,222,151,215,35,33,17,151,158,1,199,152,183,9,206,172,144,108,206,134,149,222,3,126,15,31,239,147,207,49,175,205,132,155,155,138,183,97,160,91,189,31,25,182,214,59,195,102,118,121,146,246,136,98,248,
+223,202,121,101,223,183,177,123,211,73,238,254,100,48,159,96,215,102,229,177,23,191,198,86,173,126,62,246,48,102,209,198,156,234,163,102,2,154,156,142,216,50,116,63,216,139,209,84,74,98,119,216,152,98,176,48,177,177,56,56,7,200,131,183,60,51,42,139,213,57,203,184,53,28,111,158,139,252,12,221,45,49,39,172,152,163,211,153,95,175,35,167,107,150,12,166,82,47,98,110,33,112,30,182,183,238,132,120,233,152,237,102,229,234,126,217,29,221,230,171,98,141,70,213,68,31,96,210,184,229,58,95,172,228,138,200,164,30,111,150,192,166,51,84,80,183,28,136,171,27,158,112,206,46,5,10,38,174,199,81,140,149,38,244,96,130,171,196,52,165,241,37,16,15,233,114,165,225,118,199,80,190,225,130,84,39,210,172,199,60,195,157,115,139,94,241,184,125,101,98,180,44,183,207,33,186,217,123,2,119,55,90,204,250,74,101,210,205,158,25,17,123,243,103,120,124,54,171,158,220,65,64,92,27,209,32,77,93,211,56,178,152,197,222,137,211,72,103,102,235,217,111,215,124,208,216,
+144,247,118,179,202,2,29,98,184,86,230,221,181,176,210,188,141,14,51,123,176,186,13,21,44,183,184,234,120,99,7,44,241,217,170,110,235,96,2,118,225,38,253,48,204,107,247,47,49,211,232,160,40,27,205,31,176,65,68,169,114,70,22,250,245,196,7,159,159,253,221,232,136,4,47,69,206,31,197,27,95,216,144,39,123,198,89,101,6,146,8,159,209,207,138,24,153,172,159,226,88,117,123,173,53,45,114,76,104,47,229,233,105,45,43,34,99,199,43,219,170,23,106,57,57,13,135,197,61,212,122,47,49,40,78,200,179,207,200,13,251,198,146,194,214,225,154,132,117,54,25,24,228,137,80,197,199,59,66,71,14,90,49,174,72,81,96,226,138,154,78,18,234,49,134,213,237,194,38,222,245,235,74,43,126,7,216,213,12,73,78,232,5,73,130,106,181,172,250,200,86,42,78,50,147,251,205,53,114,140,193,192,204,151,174,104,59,219,48,58,151,149,168,215,143,230,179,36,40,45,140,43,64,122,116,240,70,62,71,244,172,179,247,82,226,165,152,193,120,13,207,232,167,227,6,3,
+219,244,62,154,210,174,72,100,49,46,181,59,110,247,88,147,164,28,37,82,95,217,198,119,143,130,203,144,4,210,178,228,245,137,100,118,55,47,235,227,69,130,93,56,134,230,69,67,163,78,174,165,155,207,134,21,88,29,69,28,212,92,253,97,103,49,120,191,81,32,149,0,197,198,83,243,153,168,86,208,78,13,82,55,196,175,170,122,207,138,185,177,43,162,96,47,228,85,232,57,249,174,135,201,185,234,81,42,21,77,203,202,203,58,213,40,88,39,114,190,41,113,2,196,234,229,26,189,231,163,161,170,30,41,216,31,31,245,206,83,175,123,168,181,196,170,197,221,115,38,191,70,153,147,222,183,10,89,71,159,103,160,99,199,143,154,88,182,8,141,71,55,19,245,178,122,65,174,112,49,88,207,106,60,193,244,175,4,145,165,231,185,96,251,135,67,251,222,70,248,108,124,37,48,80,59,75,0,125,189,164,65,219,161,89,12,182,196,183,229,231,184,62,46,92,242,142,230,30,64,166,238,60,135,223,99,199,169,70,104,216,223,163,156,3,73,27,9,56,77,187,160,67,12,166,123,
+172,226,178,223,183,76,159,124,120,188,226,169,45,215,79,26,135,211,204,57,182,131,125,118,116,181,202,210,233,245,10,216,163,114,25,3,127,44,219,184,138,145,71,111,196,158,102,156,197,72,220,235,248,166,53,6,38,127,184,175,81,141,41,16,75,149,212,253,139,87,118,179,86,222,73,113,21,227,196,141,205,183,248,18,107,137,174,90,111,175,32,47,176,2,154,68,175,167,156,126,122,102,84,81,53,131,225,98,69,195,27,178,6,100,188,26,164,128,91,12,159,176,146,89,238,218,77,23,179,158,71,52,183,235,167,4,1,233,53,124,166,14,233,61,199,52,193,247,59,219,201,74,14,115,11,48,253,103,82,185,239,224,122,103,91,236,220,192,197,183,160,122,98,245,203,40,18,132,109,200,77,200,81,180,192,117,41,205,90,111,173,12,98,10,196,149,75,71,212,120,60,66,72,143,192,75,65,93,172,247,54,83,24,201,241,110,189,24,212,131,86,107,183,78,212,89,160,114,106,157,235,47,181,7,230,104,130,202,27,223,15,251,200,68,53,96,118,117,166,147,57,209,92,92,49,185,
+205,121,102,122,21,156,145,80,84,33,190,42,33,189,92,206,61,215,77,63,147,221,61,215,189,126,38,187,251,44,8,63,237,186,27,156,58,255,104,112,166,240,153,20,255,63,224,35,252,138,79,100,177,196,149,174,23,254,80,73,68,182,9,25,211,152,122,240,26,226,79,47,210,10,81,236,160,244,112,2,66,130,129,190,196,185,46,46,247,141,61,89,115,192,45,102,255,199,111,102,73,176,88,253,217,110,58,1,50,199,207,95,149,255,225,63,253,135,191,65,224,248,111,254,254,175,96,55,254,250,135,31,127,60,255,219,72,28,247,166,111,190,253,249,151,223,252,10,191,226,39,191,252,254,151,95,126,243,205,223,252,54,202,197,119,95,255,249,95,220,251,125,251,203,239,191,250,226,231,223,124,253,243,127,245,7,159,104,20,223,127,253,151,95,127,243,229,119,191,129,128,248,254,135,47,127,241,167,95,126,247,107,48,142,63,185,19,254,226,222,240,205,215,191,248,243,159,126,241,127,252,242,251,31,238,2,191,255,225,171,47,255,244,19,246,227,215,248,29,191,65,98,184,75,248,155,
+111,127,249,221,111,255,206,255,167,159,45,95,252,203,255,242,139,175,254,250,171,159,255,242,135,175,254,248,71,29,63,255,53,82,198,111,116,126,170,250,163,191,115,80,137,191,19,244,136,223,104,251,31,63,93,247,127,135,234,240,255,10,61,226,183,181,252,174,142,255,229,211,255,255,253,183,255,230,23,63,249,159,191,253,250,23,63,252,244,139,63,253,55,223,126,247,167,255,46,120,196,175,189,249,179,63,250,163,255,225,87,62,251,183,24,11,127,107,228,255,179,178,255,40,216,17,255,54,214,127,47,130,196,127,84,244,135,127,252,123,208,31,254,225,63,250,39,127,239,191,254,71,127,136,0,99,129,159,223,253,4,3,126,23,253,193,88,115,208,203,154,248,153,92,196,237,7,22,210,115,194,107,225,237,81,184,103,72,216,68,28,121,62,209,31,112,28,252,111,161,63,120,127,68,127,88,68,241,239,97,1,237,81,80,139,210,85,15,178,160,225,13,194,169,245,93,148,198,180,134,245,162,0,173,243,205,78,27,14,238,127,212,35,13,234,132,221,44,117,224,40,159,78,87,253,187,
+250,229,253,133,54,112,170,152,126,178,109,190,145,168,124,162,161,37,189,182,57,26,158,138,208,67,210,120,122,33,42,36,213,125,7,49,130,201,180,226,126,27,59,61,241,58,34,25,149,234,41,17,40,131,143,18,20,210,78,78,18,130,17,3,4,111,14,52,246,197,130,72,20,22,125,82,12,16,40,228,2,102,24,117,50,218,137,188,129,0,192,165,60,23,109,185,55,145,240,59,212,192,228,130,222,84,245,183,182,90,231,28,97,118,87,168,241,193,154,31,93,78,147,228,201,46,219,5,111,14,123,247,226,74,224,217,15,170,137,17,25,245,54,94,11,253,65,89,80,206,62,246,80,44,38,66,193,173,18,203,37,240,122,60,88,113,100,224,196,202,89,37,91,1,69,202,77,179,202,233,22,44,33,20,25,101,144,179,123,249,141,128,24,152,138,22,35,158,238,32,3,103,84,192,34,37,57,7,32,106,113,226,44,150,158,141,58,119,58,34,179,76,222,25,184,224,199,45,108,54,194,39,171,36,192,159,3,59,34,102,103,20,130,132,147,187,231,158,157,90,208,136,154,239,253,116,
+9,234,144,75,120,38,128,94,137,154,189,127,148,179,96,115,68,3,35,43,132,71,0,172,25,246,10,83,0,204,186,190,196,65,97,2,26,225,0,90,108,75,235,68,147,19,229,146,153,184,173,3,153,238,74,173,171,18,51,236,99,158,200,58,154,56,99,142,100,199,229,200,218,189,245,85,20,251,176,79,144,211,174,34,114,65,25,129,31,12,10,3,186,7,240,208,33,68,2,94,145,36,208,231,133,50,135,238,241,225,33,86,64,71,178,169,145,67,78,70,170,125,200,143,116,83,66,241,151,48,32,29,8,180,122,121,88,189,52,230,120,204,74,0,144,243,193,98,41,66,35,68,73,92,14,224,198,8,64,205,65,5,83,58,130,127,42,178,60,185,118,101,201,208,189,83,15,218,244,1,16,132,63,1,102,1,218,171,144,219,124,71,197,73,49,50,157,68,158,81,27,60,50,40,131,215,157,131,76,164,79,177,252,0,241,16,28,65,170,128,104,172,157,125,28,4,158,5,91,0,141,241,129,64,12,131,104,0,22,205,177,98,83,34,64,187,239,70,175,204,52,45,24,18,238,192,
+18,192,15,157,126,244,149,88,139,74,21,94,68,138,55,231,131,67,179,215,57,74,21,174,75,95,146,185,218,108,57,225,213,173,182,139,251,161,140,226,56,241,183,149,7,249,104,87,81,109,38,81,26,124,28,147,181,94,238,176,129,236,193,227,56,125,51,110,83,151,34,248,169,160,178,2,188,165,155,148,68,76,166,0,59,245,10,82,163,159,170,151,50,139,24,75,51,25,73,135,66,141,32,219,69,107,46,188,214,36,6,241,90,18,222,177,188,17,58,68,28,156,113,112,152,112,185,112,7,244,219,44,89,136,159,33,77,142,17,137,114,144,120,15,93,189,48,255,208,242,167,97,51,141,232,30,222,60,43,120,201,116,67,68,56,36,89,130,103,168,86,235,147,40,64,92,53,227,41,218,250,227,65,144,61,109,184,43,151,40,223,201,224,25,224,101,63,245,92,206,217,107,133,93,45,122,97,167,50,179,82,93,221,129,134,166,238,86,181,76,45,145,245,131,146,177,59,172,225,233,19,142,87,203,43,10,173,235,151,225,66,174,121,105,19,120,27,161,73,142,230,216,45,187,124,210,
+237,38,190,31,183,17,234,94,202,215,167,3,99,140,61,204,17,244,165,100,226,59,33,196,67,9,211,235,112,109,237,203,14,249,0,44,73,58,241,16,115,88,219,197,67,156,148,116,244,98,179,60,90,110,179,179,98,45,115,184,210,144,59,210,227,48,103,231,93,100,238,211,234,164,195,65,231,199,45,35,250,82,164,117,130,252,23,249,190,211,213,181,222,106,129,193,50,0,10,136,235,113,152,45,142,6,4,210,128,215,206,206,206,19,72,251,72,126,195,75,60,69,151,131,70,0,99,173,149,95,174,22,67,107,181,37,84,223,35,19,250,234,168,151,165,51,97,66,150,85,124,0,12,159,223,58,41,31,81,195,39,68,130,136,84,253,133,109,242,217,250,155,130,83,87,143,33,252,49,12,5,212,198,200,159,142,131,124,174,209,88,142,235,137,102,16,36,154,79,103,54,252,105,198,211,42,84,185,89,33,112,226,66,98,3,81,48,98,2,124,84,75,204,231,250,225,138,29,61,151,107,128,232,176,181,178,139,213,225,167,172,83,37,144,104,91,196,149,213,253,160,245,147,227,20,31,
+120,97,140,51,229,79,49,40,49,120,14,19,96,165,10,195,50,95,169,171,220,7,60,31,137,200,16,75,133,228,74,100,153,211,230,20,98,193,49,101,1,7,226,4,16,44,109,184,226,65,148,125,91,74,6,53,131,84,207,155,149,134,5,27,92,227,163,57,203,243,141,2,169,88,149,201,5,171,87,135,219,78,206,230,128,143,212,166,246,99,57,9,120,231,116,190,48,248,249,93,214,136,53,188,24,191,190,185,168,32,217,94,136,196,160,100,6,59,82,205,127,216,213,195,156,224,51,164,181,125,3,12,93,175,245,206,2,28,110,193,81,207,158,71,27,133,223,69,32,111,17,245,20,121,126,120,63,236,108,171,20,190,162,239,180,213,102,92,250,165,233,240,111,117,208,28,57,165,45,251,74,224,213,18,165,99,93,174,41,65,159,97,96,188,103,5,54,118,124,230,123,196,5,211,134,104,19,137,35,198,102,90,44,81,100,108,39,71,52,187,72,146,118,53,179,125,151,168,106,143,167,229,164,80,83,144,136,60,36,147,17,36,40,66,139,44,148,10,122,69,37,207,197,215,44,227,
+188,133,174,247,218,124,179,190,133,244,60,18,180,103,175,40,57,31,113,222,139,238,94,125,62,56,47,130,207,167,62,63,35,37,242,20,38,255,37,147,236,109,206,105,132,92,52,152,109,13,118,185,142,48,79,72,46,168,170,74,106,103,50,186,9,110,239,148,170,68,248,31,169,204,91,134,7,17,162,104,124,97,56,120,159,16,6,102,52,17,245,115,130,97,141,66,10,27,194,61,9,89,204,88,14,29,4,15,17,38,143,182,142,68,239,230,197,142,90,224,253,91,59,241,86,189,53,250,74,15,194,150,132,122,16,215,3,15,163,85,197,136,111,110,168,23,33,125,6,142,102,169,45,196,230,100,155,34,50,234,186,184,1,219,152,79,66,3,93,110,218,168,177,27,215,133,148,51,71,94,132,16,5,228,166,84,62,101,3,160,124,234,29,21,57,2,45,228,151,67,15,139,190,66,22,160,213,80,17,98,197,244,121,7,205,254,178,172,71,105,20,3,151,51,203,22,100,201,248,41,190,168,167,214,230,88,45,200,157,113,29,42,245,9,51,174,82,116,136,97,12,5,92,128,90,3,
+193,24,13,109,30,165,157,69,69,241,160,59,199,103,168,129,55,10,165,150,183,179,36,130,22,26,155,245,105,78,27,22,6,18,224,242,204,131,43,151,96,139,152,212,73,24,86,42,147,99,196,189,164,21,58,200,213,52,123,39,248,49,205,133,138,192,87,87,178,35,148,144,167,177,28,221,78,212,0,71,200,183,43,82,106,13,171,249,183,60,43,45,91,147,145,241,78,128,237,230,147,205,125,169,212,141,154,168,169,160,17,175,255,177,254,112,168,105,160,118,200,60,45,223,58,164,138,102,128,9,159,188,180,163,85,255,34,188,134,10,176,165,212,118,254,160,221,51,63,159,248,145,51,204,139,234,71,54,219,254,10,70,69,252,85,224,72,90,71,76,230,169,193,212,203,60,188,3,175,17,63,243,190,91,136,125,156,215,19,59,63,8,217,124,237,67,243,249,52,149,187,27,233,90,43,96,23,247,230,29,61,61,246,22,135,95,197,73,2,148,218,24,191,121,222,221,169,37,130,205,235,156,2,211,147,55,18,26,211,175,253,53,203,179,244,23,211,189,231,190,142,29,106,145,12,205,
+2,46,184,106,192,123,145,156,189,145,236,153,251,204,203,97,198,133,241,91,118,63,192,113,64,209,174,221,11,72,132,202,205,147,165,208,148,122,75,141,14,182,113,219,206,107,214,180,170,231,29,42,42,18,151,175,25,240,182,178,88,178,32,54,109,45,38,236,76,223,45,137,241,41,128,48,228,195,9,9,9,66,47,242,156,153,117,68,26,103,73,3,87,97,76,171,11,106,5,242,162,85,16,212,191,249,89,231,203,194,9,17,11,31,150,190,215,78,202,1,232,184,234,157,177,170,51,143,60,118,34,113,77,208,89,203,139,14,108,90,173,25,252,64,50,115,103,91,201,64,5,181,28,254,166,18,233,6,240,218,246,176,158,90,178,190,155,73,91,10,248,237,56,5,214,73,138,17,173,86,244,219,242,241,195,241,61,61,125,128,150,148,82,189,247,165,30,140,86,198,31,73,30,198,84,121,223,12,204,69,225,222,103,190,242,117,230,88,117,38,123,175,58,178,113,247,91,207,236,161,97,5,220,74,229,210,102,209,111,216,224,122,79,19,9,93,142,208,100,159,68,236,216,123,191,116,
+68,121,74,133,62,210,118,161,148,219,208,52,65,126,131,199,61,173,128,132,98,169,119,108,179,157,236,123,177,232,69,196,18,156,89,91,72,215,1,149,217,166,57,124,197,119,105,228,249,61,138,230,177,105,231,10,144,221,162,214,155,65,187,221,44,29,231,157,212,198,25,30,205,160,135,42,17,126,30,190,15,33,144,11,231,68,215,87,113,138,87,76,26,146,237,12,193,228,119,106,136,121,82,148,203,83,28,99,17,162,99,237,104,204,182,228,37,34,223,108,71,153,168,31,173,115,13,145,135,151,150,175,210,106,195,159,41,105,75,109,198,53,83,168,173,12,132,75,189,140,178,6,106,128,154,24,101,150,46,85,83,88,182,83,42,65,7,209,250,248,80,127,19,100,35,171,11,0,45,12,82,63,180,252,116,47,20,116,6,45,137,69,60,199,180,56,10,219,120,105,1,238,25,125,81,139,173,52,161,194,208,144,40,178,215,109,233,22,154,160,176,20,22,36,239,135,24,168,226,76,31,204,246,240,211,18,82,206,135,243,183,58,223,164,163,45,15,124,253,153,97,40,27,149,96,78,
+229,26,222,158,204,2,221,139,16,151,205,82,94,105,41,18,133,35,57,155,66,151,33,239,136,9,102,162,50,205,38,247,110,201,227,178,21,181,78,145,152,239,72,165,92,158,197,156,41,104,149,232,243,41,173,176,188,151,159,231,128,105,29,125,33,217,90,62,80,152,226,48,169,133,131,221,179,70,52,23,173,3,114,14,1,40,213,240,89,82,109,48,191,143,87,73,71,78,175,234,104,66,202,92,63,174,91,104,32,249,39,144,89,185,154,58,149,130,40,36,242,126,188,13,93,44,16,101,129,114,141,153,106,114,162,146,78,246,218,222,244,107,69,69,43,17,85,70,123,97,233,253,8,202,147,37,17,134,20,13,168,250,84,157,129,133,198,242,94,133,179,102,134,184,97,158,226,101,147,174,67,251,213,192,98,79,162,106,119,211,93,0,94,243,16,182,212,140,84,184,182,222,62,138,88,19,188,119,0,173,154,100,184,104,126,204,61,204,103,142,200,104,203,160,92,153,65,223,9,32,243,131,235,220,131,103,155,245,175,115,158,210,214,246,206,77,227,111,241,91,242,9,158,208,69,168,
+111,41,94,184,193,107,129,67,171,242,160,213,66,2,60,132,244,58,243,212,34,135,206,239,105,114,49,253,106,96,137,129,20,216,97,178,229,153,1,82,22,184,188,125,239,229,76,31,153,184,42,100,138,51,169,198,206,195,97,173,166,134,176,219,89,128,7,131,9,214,194,199,34,157,131,94,84,34,71,218,173,89,95,53,3,199,14,159,101,30,157,25,186,181,5,156,196,240,170,218,219,187,189,89,96,102,49,132,131,105,174,5,134,173,107,152,127,112,76,217,28,43,218,220,253,193,139,58,218,254,96,105,74,38,97,224,163,62,20,147,190,96,95,246,68,59,89,138,104,211,183,31,183,15,133,100,53,37,211,180,153,215,233,196,40,133,201,118,218,233,4,78,44,218,43,240,163,78,96,19,23,13,105,53,81,55,46,190,79,222,137,243,166,18,17,192,44,171,28,111,161,160,14,164,29,142,48,186,88,31,41,208,73,5,54,73,150,84,95,88,157,52,139,32,168,88,94,147,250,128,14,151,183,218,25,220,24,133,19,219,211,81,253,46,182,209,210,234,213,85,93,146,73,132,224,107,
+80,149,117,181,23,38,210,114,41,0,45,151,128,210,13,4,87,68,73,118,79,153,167,126,114,37,27,189,137,118,215,39,107,6,203,4,197,147,129,120,210,121,219,212,215,128,121,166,212,26,10,94,81,142,71,1,173,176,57,60,156,177,200,112,138,233,215,227,226,128,14,55,157,81,68,41,64,210,219,43,116,191,189,239,57,165,158,194,246,225,120,42,18,229,149,45,250,35,236,142,185,134,213,225,106,226,213,45,240,6,110,105,246,145,52,38,197,114,241,51,101,239,180,150,83,44,183,98,79,29,191,103,104,190,250,180,162,18,8,215,52,77,83,220,128,31,142,16,121,71,44,122,69,53,119,75,2,235,201,64,63,231,10,175,100,76,74,17,234,196,102,154,62,70,104,52,50,217,207,112,253,187,4,129,85,141,3,200,196,41,183,101,91,211,91,188,20,104,200,213,57,216,15,54,91,214,241,27,223,180,133,3,229,2,76,133,93,154,35,49,74,231,82,204,52,167,169,145,170,106,235,87,55,122,216,121,120,65,95,95,55,160,197,240,0,20,2,186,211,121,53,196,25,33,84,214,
+141,177,74,12,223,178,190,107,238,185,4,93,12,27,51,236,227,188,47,238,189,180,96,73,160,53,68,152,51,19,68,9,79,79,61,82,117,192,65,252,185,217,12,29,223,199,2,130,180,155,113,56,218,173,154,240,126,161,193,8,14,113,218,99,249,140,99,165,136,198,164,159,161,25,161,168,58,24,224,197,189,176,208,23,16,70,221,241,132,212,53,52,29,218,78,192,49,239,103,66,54,230,13,225,74,151,80,240,134,42,31,159,210,171,238,43,72,254,170,96,70,207,149,93,65,167,30,51,197,35,69,245,25,129,87,226,201,123,144,153,214,105,5,124,59,107,51,164,35,81,30,87,104,94,145,150,92,54,195,42,215,131,144,103,42,72,38,213,82,247,124,223,74,208,137,99,249,80,164,42,1,157,71,192,214,213,209,78,198,180,179,181,103,140,118,96,60,131,41,170,120,13,51,11,194,22,47,58,46,95,91,189,243,158,4,235,190,172,0,42,236,154,71,168,251,54,74,12,189,130,176,173,208,120,161,162,226,165,178,68,33,84,82,40,196,228,163,143,169,56,51,1,237,167,192,58,
+237,69,179,14,94,214,15,213,13,252,137,157,143,157,75,166,124,108,53,68,24,85,71,145,73,43,2,52,66,146,43,243,112,226,23,199,50,58,250,124,13,235,134,67,18,50,235,233,52,47,128,55,29,144,95,33,191,62,62,6,210,254,222,253,170,250,56,152,190,34,185,98,47,43,247,161,235,115,87,221,100,123,238,11,160,253,180,6,249,168,95,57,208,71,54,142,26,44,244,26,32,95,142,214,175,219,218,58,7,79,24,80,155,3,120,2,65,18,161,42,34,212,39,41,237,25,32,233,161,189,25,193,161,255,116,114,113,51,40,24,49,218,159,225,136,206,105,30,246,206,62,13,71,30,52,194,22,45,96,101,13,228,205,244,164,147,170,62,22,162,57,92,67,228,5,115,86,132,232,236,107,212,25,110,114,144,44,151,239,12,203,17,12,138,138,22,222,210,125,228,83,202,130,56,3,107,25,214,219,114,112,131,173,101,70,236,246,34,188,122,9,131,98,226,144,122,53,69,198,117,91,214,190,30,54,94,52,84,54,39,48,79,130,61,219,140,111,151,140,65,215,41,216,58,3,57,
+53,3,126,83,125,143,63,96,228,70,55,205,213,1,250,210,123,173,106,149,150,196,228,30,34,250,248,206,73,225,72,134,2,13,132,211,115,15,123,96,126,61,108,111,197,118,82,24,132,205,199,82,237,50,57,55,67,63,4,248,243,206,253,14,167,103,176,63,232,230,144,64,102,124,27,213,36,187,86,13,18,175,121,234,150,236,220,118,192,91,85,144,200,137,12,217,0,148,240,247,141,213,194,77,63,47,106,53,50,152,101,211,148,194,171,229,60,143,114,51,180,182,93,27,139,158,4,225,104,132,185,221,69,238,180,100,74,15,121,161,146,107,239,242,4,222,107,213,118,99,253,112,106,75,228,38,41,87,46,220,76,74,101,104,8,81,115,96,158,201,115,245,224,77,147,217,193,111,0,172,201,125,61,221,28,183,226,24,208,211,232,225,22,250,83,99,115,24,1,242,206,91,15,224,158,187,223,89,212,115,70,93,112,50,177,39,19,123,203,216,152,114,241,65,131,61,23,245,198,241,170,208,194,93,79,244,134,40,126,229,23,37,20,225,33,6,232,64,43,119,133,186,4,150,184,223,
+74,170,94,4,231,170,23,183,241,238,196,241,67,59,247,24,186,178,211,245,221,72,44,173,39,99,12,123,67,91,167,114,54,6,32,90,17,85,52,101,184,24,65,35,180,247,34,19,246,178,78,174,253,71,89,250,81,186,184,37,101,110,126,77,154,70,180,45,155,69,231,209,12,217,186,95,176,187,249,56,40,99,159,226,221,182,168,57,118,32,13,135,252,54,254,18,12,239,40,3,61,4,17,136,79,113,73,224,116,0,224,241,167,162,167,11,120,60,27,136,43,46,15,64,2,144,122,72,166,131,239,45,37,136,75,117,117,19,90,235,184,136,8,23,147,192,187,220,188,21,76,120,100,236,20,138,44,31,162,181,252,142,141,23,227,231,166,100,27,96,53,132,66,40,165,11,25,32,95,129,156,43,223,153,47,26,219,104,102,130,82,192,154,124,20,90,54,112,173,162,174,110,24,1,253,218,12,5,88,26,181,151,131,234,161,36,107,29,16,24,142,151,147,143,120,142,223,211,156,47,51,242,210,188,144,156,105,181,243,217,101,19,92,81,64,91,107,186,187,129,23,125,11,161,1,231,
+196,1,188,212,130,27,82,235,89,158,181,84,213,46,73,132,96,212,48,26,232,30,61,32,189,247,41,234,196,173,172,8,233,235,121,118,125,0,223,91,13,142,52,110,236,65,242,68,235,185,29,12,19,113,16,108,29,84,233,20,0,238,111,68,180,39,186,152,171,60,105,16,14,242,56,10,61,234,10,80,231,24,120,39,164,136,137,251,158,0,162,1,239,66,239,221,61,176,207,238,247,23,167,135,209,10,205,241,105,244,69,245,163,228,249,157,118,39,53,56,239,80,39,132,146,147,2,189,145,71,221,93,6,234,83,8,209,19,29,56,55,72,16,226,117,201,169,182,238,205,17,7,238,147,127,127,70,94,64,1,103,168,222,167,147,157,68,198,109,188,14,228,74,23,34,87,225,66,141,104,188,221,27,153,150,138,76,241,55,216,7,128,150,226,93,239,25,80,225,75,155,61,138,62,242,214,109,20,225,128,232,160,199,1,220,239,207,60,104,50,125,79,123,74,53,159,198,35,170,108,42,73,52,47,131,41,7,153,252,139,46,191,44,95,208,188,45,183,3,100,197,23,153,244,245,253,
+184,179,112,102,101,2,207,85,193,65,163,3,59,103,47,141,234,59,51,246,148,240,118,205,26,2,41,165,57,14,111,10,179,113,206,186,197,30,207,103,178,172,197,124,88,209,150,98,59,87,9,46,54,62,128,131,187,231,82,215,254,147,72,128,152,102,75,97,247,36,86,190,31,89,110,133,85,126,193,82,244,226,12,240,242,129,146,219,152,178,241,2,167,197,46,33,165,209,30,107,137,143,22,119,219,244,240,209,118,190,213,235,10,190,116,130,50,168,99,100,117,4,194,118,179,163,173,241,163,185,143,92,6,76,175,113,184,209,177,146,126,40,116,39,194,179,103,233,83,208,64,58,213,196,171,32,250,218,73,162,192,59,80,183,66,229,130,152,179,149,34,170,125,179,168,33,28,163,212,226,137,151,200,116,166,188,91,16,52,143,89,7,180,105,81,228,128,32,56,210,37,83,31,121,247,119,0,24,117,166,33,56,41,231,115,138,56,80,29,52,234,20,52,246,240,52,99,0,21,233,182,229,4,81,100,77,16,207,219,48,138,214,194,113,98,210,201,19,73,235,5,236,44,251,115,188,
+135,189,173,46,105,230,237,216,126,95,220,7,7,190,40,48,82,80,124,169,143,143,187,35,36,79,103,191,207,32,183,93,239,184,141,167,125,54,158,123,147,27,147,115,246,160,177,125,168,70,146,16,153,210,185,134,190,83,98,21,76,156,101,130,105,139,100,3,242,218,242,156,170,158,169,200,209,33,191,103,72,21,120,51,5,170,170,228,19,144,189,149,177,17,212,148,212,120,193,78,134,233,117,98,63,3,88,7,148,0,146,107,66,46,249,32,37,70,206,126,65,244,170,175,116,41,34,37,226,56,63,3,198,87,199,51,62,163,144,212,39,32,239,129,147,33,62,34,62,163,233,78,187,19,251,247,38,224,235,61,232,165,175,183,1,57,112,182,143,249,82,132,131,7,248,108,225,204,165,8,30,116,113,67,160,144,247,120,188,207,15,240,199,233,193,73,93,20,118,252,83,52,130,244,99,247,232,254,179,123,92,220,64,213,251,120,143,168,143,124,248,81,205,217,150,248,12,107,54,246,202,129,220,123,209,57,82,7,226,51,234,44,180,167,246,93,13,130,223,116,119,14,196,79,83,26,
+142,31,3,187,156,144,223,25,248,210,55,60,207,143,43,115,62,237,248,100,7,37,246,68,136,26,124,129,9,80,135,25,225,110,30,175,241,163,121,8,26,31,52,186,175,51,128,76,119,252,92,109,32,142,227,199,213,134,148,243,164,251,106,11,162,126,72,127,174,234,215,110,72,171,93,132,94,80,126,34,144,41,252,80,65,6,249,42,64,4,182,169,117,66,95,219,179,233,17,194,44,33,109,29,221,156,185,66,237,7,158,4,196,197,249,137,39,185,47,161,134,166,118,43,93,33,175,67,248,73,3,168,231,34,36,53,241,197,66,146,213,70,4,124,150,229,99,118,186,154,61,159,10,217,211,199,71,46,138,164,80,227,104,75,84,187,46,244,52,194,180,51,172,113,136,199,122,152,32,249,154,71,15,78,91,50,24,182,190,40,70,60,53,151,186,199,159,188,184,35,7,34,31,241,168,82,253,5,31,8,179,253,254,18,34,223,202,227,247,74,193,19,27,43,98,88,47,2,107,98,99,12,18,123,91,142,139,226,196,141,0,34,238,237,145,250,248,66,250,205,199,239,191,46,147,253,
+147,223,45,147,125,241,229,55,63,124,245,221,47,190,252,225,235,127,253,213,143,168,230,191,170,25,253,6,176,253,159,127,247,231,255,219,151,223,253,249,87,63,252,186,4,245,47,126,248,172,139,125,249,205,247,223,126,241,87,223,126,255,253,215,127,242,205,87,159,149,170,159,127,247,213,151,63,124,245,35,254,252,223,10,254,147,191,249,77,17,236,183,176,235,255,244,235,239,190,250,249,15,223,252,205,103,167,95,87,83,254,254,23,255,252,46,238,167,95,252,159,191,188,179,124,241,237,159,253,240,213,47,126,172,124,125,247,213,247,191,252,230,71,8,253,223,17,251,89,150,251,246,47,191,250,226,95,127,249,205,47,191,250,226,103,255,197,39,182,254,247,191,252,249,95,124,241,243,47,191,255,234,167,159,64,241,191,99,251,221,244,95,33,198,255,201,87,247,161,253,10,206,253,251,175,255,242,175,190,249,250,207,126,133,189,255,195,151,223,255,171,79,49,255,222,136,63,69,125,251,87,95,125,247,229,15,223,126,247,179,127,249,179,63,254,227,187,69,63,252,242,187,95,124,255,111,
+107,116,255,230,47,190,254,249,95,252,244,254,184,155,252,235,98,226,79,191,248,254,206,255,213,247,63,202,254,149,141,247,17,124,253,139,63,253,234,175,191,248,201,143,252,95,252,197,151,63,98,248,255,201,143,148,187,218,223,209,250,179,255,236,78,252,234,110,223,231,124,254,213,151,159,24,223,119,255,124,241,89,55,250,131,47,254,236,219,239,190,248,36,124,247,105,202,119,95,127,117,151,255,247,191,248,23,127,246,197,47,190,253,197,143,194,126,219,220,191,181,242,251,207,41,251,91,235,126,199,172,127,127,204,223,125,245,151,95,126,125,31,226,255,244,203,111,190,249,163,223,173,12,253,93,148,29,255,78,234,141,255,97,181,192,127,111,238,254,217,157,247,191,251,117,212,254,14,32,251,239,65,227,255,21,225,238,206,159,220,59,125,241,245,23,63,251,111,191,248,195,127,122,127,254,179,47,254,193,231,243,243,95,69,252,193,111,115,254,26,213,253,179,198,249,207,191,255,95,239,174,255,197,159,255,228,235,63,248,233,175,181,253,236,95,126,253,179,63,254,189,32,240,159,1,116,
+143,135,159,252,30,226,127,40,218,254,175,217,127,83,240,252,93,210,221,9,255,201,191,248,254,51,88,126,242,43,83,254,224,223,49,251,55,46,186,171,250,223,191,253,229,61,244,239,89,230,251,175,190,185,231,128,251,82,252,217,127,250,197,207,254,243,47,254,118,64,159,115,241,7,191,17,243,119,94,68,253,237,164,243,255,155,50,234,239,173,166,254,87,255,228,239,253,131,127,252,135,255,8,0,70,2,179,64,0,0,44,187,254,88,78,245,51,38,213,135,125,102,227,55,249,23,79,46,194,235,225,177,38,203,162,158,133,29,57,143,39,196,23,193,200,64,65,0,209,3,121,14,28,136,224,200,72,16,172,190,94,241,168,183,72,210,57,131,82,33,217,112,31,36,10,168,80,94,122,22,142,54,210,82,217,242,192,226,160,42,2,200,135,136,162,45,2,138,2,231,235,110,119,137,223,150,221,143,52,243,16,23,61,81,219,36,180,125,117,102,29,98,190,88,151,161,237,45,109,154,85,44,210,37,208,104,175,104,202,107,195,1,224,78,209,224,231,235,160,82,56,131,90,152,146,24,
+93,172,206,244,220,2,237,28,48,191,23,155,157,183,117,103,85,25,35,101,226,202,59,180,216,137,74,242,124,45,122,24,149,161,159,253,45,141,211,96,38,5,216,97,227,133,157,241,68,165,202,108,186,202,194,139,123,16,190,109,29,9,170,244,190,198,59,145,150,172,191,103,70,107,252,115,14,99,6,73,199,46,63,254,237,246,177,74,165,86,147,169,226,224,191,198,159,149,178,161,178,116,214,137,14,100,125,208,21,207,161,207,145,224,197,171,88,186,135,252,11,52,65,193,53,232,252,128,86,86,199,224,143,139,4,209,106,53,46,133,15,165,83,125,196,183,210,18,49,86,106,127,42,34,61,161,107,90,226,212,149,34,114,177,71,87,170,92,229,131,162,58,175,227,195,83,131,38,6,74,51,29,141,27,9,136,20,181,225,57,174,190,113,151,30,215,135,204,138,205,14,24,89,137,73,143,251,68,62,198,187,199,93,68,20,68,197,241,163,82,228,97,132,91,112,90,213,228,62,62,114,61,232,15,175,142,74,77,168,238,178,103,57,9,113,239,21,183,114,100,54,183,38,55,199,133,
+94,149,130,123,100,40,67,7,30,43,249,244,68,246,156,163,112,214,37,186,175,25,16,230,203,136,194,241,24,61,179,217,177,151,126,110,145,88,3,124,158,185,178,55,62,206,53,245,219,165,146,206,201,219,185,104,157,21,30,248,7,225,89,155,88,225,215,180,47,153,179,48,26,124,153,179,8,157,36,145,80,28,10,39,82,67,10,133,217,8,110,161,97,245,252,138,181,154,158,41,105,101,152,235,211,41,179,72,224,81,89,117,37,73,59,52,71,51,149,82,82,221,124,106,85,127,215,79,184,67,233,92,167,49,8,195,3,175,217,234,227,197,169,15,214,29,43,65,96,144,147,125,140,52,51,141,11,15,84,189,48,25,156,213,115,101,204,53,53,15,28,226,85,234,144,226,59,59,194,36,132,177,229,219,140,22,239,150,197,53,209,220,48,79,92,53,143,192,176,121,251,61,242,250,21,97,51,223,38,215,186,167,12,76,155,18,40,136,149,53,21,76,231,60,93,80,2,90,14,80,215,33,145,99,188,166,173,177,78,94,2,126,224,101,136,239,122,208,117,241,226,55,60,172,223,155,
+128,121,147,15,200,79,56,184,87,233,71,45,216,158,246,178,121,140,213,220,248,232,81,140,203,70,210,197,137,147,131,108,169,241,98,239,213,21,83,250,227,37,147,220,116,110,155,233,219,57,231,244,22,120,253,249,161,214,222,100,71,120,208,227,36,137,185,241,10,201,168,93,233,67,215,164,146,135,23,140,22,142,180,200,216,38,237,217,86,169,231,9,114,13,148,26,163,29,248,76,45,220,52,245,81,167,20,189,71,198,204,169,17,196,136,41,70,29,85,204,111,124,127,19,49,193,66,159,78,140,170,29,143,2,37,7,253,247,247,147,93,234,122,235,139,53,40,172,129,158,217,165,119,3,29,133,59,74,156,236,40,37,128,78,173,38,141,44,181,248,186,136,25,87,212,189,161,191,189,152,42,167,204,67,250,97,234,226,171,40,219,218,139,159,204,246,85,119,116,85,237,186,108,7,210,178,23,182,85,22,107,117,120,72,56,137,24,173,219,85,103,241,234,30,95,172,14,190,109,147,105,203,250,117,168,200,123,0,198,160,70,211,114,38,89,196,66,82,74,177,179,81,173,107,49,164,
+182,214,230,249,85,55,93,1,254,206,19,106,217,111,203,208,230,29,69,187,30,249,108,160,44,203,12,29,172,244,161,123,235,63,51,204,45,213,28,59,195,111,95,176,203,221,105,101,43,216,143,133,252,255,197,222,123,51,57,23,116,233,97,127,101,35,69,20,75,187,82,169,168,80,85,82,176,57,21,40,211,22,249,149,164,42,106,169,218,101,194,12,222,123,59,240,222,187,193,0,24,120,239,129,129,247,222,15,188,247,94,120,223,217,143,235,180,220,64,137,2,6,184,211,141,238,251,244,115,78,159,115,238,233,1,208,29,146,225,29,215,85,225,163,119,44,186,62,140,221,96,144,51,192,171,87,207,141,26,15,202,44,88,243,160,235,42,189,86,14,149,68,55,154,132,246,56,102,142,152,19,91,152,167,95,107,188,187,117,84,84,207,122,5,206,183,191,181,121,64,57,120,31,80,249,57,206,197,32,39,71,139,166,108,158,243,86,187,170,74,66,141,226,180,234,156,83,203,161,109,25,93,55,24,251,121,149,29,141,45,222,176,163,58,97,81,127,15,97,57,139,65,51,109,235,29,
+218,107,138,203,30,58,148,234,101,243,252,125,159,126,122,161,92,223,212,140,150,165,239,209,37,78,15,133,248,246,229,150,51,167,83,241,207,78,195,228,208,16,51,187,217,192,208,105,60,125,196,144,115,167,54,168,34,43,185,215,117,129,76,114,11,140,201,229,169,85,79,84,152,115,91,239,131,178,245,194,122,139,200,96,89,196,74,114,240,236,142,68,174,181,52,209,152,98,29,141,185,44,214,227,34,187,118,54,25,229,230,156,120,187,31,21,54,220,197,86,92,212,194,199,86,113,126,198,84,37,205,135,240,16,25,211,78,19,254,157,247,212,52,158,227,91,233,65,149,101,246,90,127,237,219,173,146,18,113,129,107,68,184,21,79,79,211,161,125,236,151,37,39,235,39,132,90,36,75,181,239,234,21,26,121,166,30,18,231,227,247,65,85,238,142,65,172,41,127,216,165,170,232,176,130,246,66,228,152,78,116,250,65,172,143,233,167,76,249,203,140,4,253,174,74,71,138,150,216,236,157,104,190,192,60,247,39,167,235,240,54,229,47,181,151,148,148,31,204,251,26,97,166,191,150,204,
+80,138,37,166,251,152,40,10,150,253,202,244,128,31,59,23,225,150,118,35,214,186,167,249,54,169,184,176,53,71,151,103,204,53,133,189,19,66,178,162,87,69,152,154,151,161,100,63,95,27,247,14,97,39,85,119,250,158,29,154,16,144,214,207,48,147,246,220,129,156,172,228,13,220,214,101,178,227,172,234,55,246,132,222,64,205,75,152,122,87,56,106,81,197,153,210,157,154,91,158,30,179,161,84,9,102,68,127,126,226,108,190,116,74,151,236,127,56,117,178,161,125,127,102,80,239,230,81,187,211,9,0,107,123,14,116,64,159,64,7,232,170,107,148,209,249,95,107,163,80,76,178,130,11,151,98,77,30,242,140,218,235,189,227,76,228,132,20,57,79,127,46,237,43,71,122,107,101,192,92,13,126,7,16,75,233,44,124,9,33,12,165,78,195,101,46,221,201,214,73,117,83,217,149,132,95,205,156,126,172,8,53,44,18,58,49,99,18,59,183,81,88,200,220,69,150,238,159,162,131,178,4,175,11,14,188,199,227,90,72,62,11,89,47,223,160,210,246,132,165,33,77,110,83,102,23,
+231,167,175,37,8,19,134,154,238,82,49,57,28,51,244,251,192,67,76,165,21,227,218,177,148,59,149,36,217,112,119,88,204,72,176,225,167,74,94,133,248,240,239,190,11,205,198,25,237,106,172,248,227,57,93,102,186,187,245,86,159,144,53,200,138,5,236,42,213,181,100,71,168,235,163,241,90,216,167,199,213,158,83,99,122,220,21,58,247,183,134,92,185,196,153,122,221,250,174,131,203,70,183,112,125,227,199,226,208,198,70,74,236,136,235,95,211,97,183,217,154,34,238,179,102,15,46,47,52,52,20,94,54,38,218,75,229,50,118,31,150,36,214,81,220,185,178,185,243,241,53,39,227,18,222,93,5,163,144,50,24,68,118,138,79,65,230,40,5,46,239,164,153,168,30,46,217,148,162,221,119,251,120,255,152,237,149,249,13,163,180,195,136,102,235,254,112,50,239,77,38,120,156,90,218,196,33,75,182,208,241,166,224,92,193,89,76,114,10,15,29,107,6,105,173,33,125,208,75,35,155,54,211,226,229,57,187,62,252,116,152,221,219,114,13,216,132,227,184,111,183,37,82,95,129,243,
+30,243,184,112,123,100,48,27,97,177,211,33,42,42,151,89,115,117,241,253,184,10,52,19,156,204,57,79,206,163,141,71,112,232,68,244,11,163,221,66,158,55,44,201,187,198,133,99,87,229,151,71,3,72,185,139,141,151,173,83,38,117,96,158,191,83,87,228,206,196,98,47,120,173,169,107,1,193,58,28,159,102,4,205,189,222,114,175,198,210,35,221,61,61,63,239,150,144,158,64,101,229,29,169,237,228,3,31,238,235,53,185,248,245,179,201,28,218,241,117,99,219,120,145,37,198,53,158,109,183,65,27,191,194,78,86,146,236,220,147,102,189,220,112,209,140,76,108,213,229,252,243,246,140,154,223,159,98,247,49,29,145,217,27,7,168,139,236,102,21,203,172,201,163,53,102,154,93,226,53,27,234,110,9,134,247,203,195,79,228,154,229,253,83,143,40,106,53,63,92,109,251,10,185,133,38,115,187,97,34,160,106,81,204,52,195,120,156,123,178,91,61,235,106,123,113,108,213,224,83,9,215,210,29,8,221,184,200,152,205,85,153,14,40,180,235,0,222,32,81,208,113,220,11,143,15,
+238,113,137,67,110,196,101,182,220,242,235,160,97,84,63,93,35,210,133,211,190,101,24,142,171,93,118,92,39,91,243,1,187,222,176,10,52,6,131,8,108,16,245,122,81,75,242,186,156,24,159,227,75,124,50,73,195,209,120,238,115,159,131,23,152,254,18,99,188,98,91,72,74,199,178,254,229,220,164,82,151,220,37,156,98,57,121,150,145,73,136,218,246,240,234,220,178,235,88,110,189,102,178,116,137,79,69,156,197,252,129,183,111,70,11,203,169,160,230,20,111,234,205,123,225,70,56,26,102,188,104,197,112,143,139,108,195,115,48,218,40,242,114,1,155,221,103,72,186,220,124,72,31,235,77,169,74,189,11,214,72,90,221,239,69,230,203,111,131,3,26,184,133,249,198,30,124,186,189,105,44,126,148,39,110,199,116,167,198,234,16,30,119,120,185,185,56,64,211,39,131,227,58,132,104,13,107,138,230,132,112,39,238,91,208,84,173,166,27,120,240,109,116,87,59,238,211,201,213,183,239,25,114,85,163,171,54,138,87,119,189,218,225,105,88,72,217,23,154,182,52,122,142,123,92,214,
+164,53,110,56,120,224,214,62,89,187,138,222,19,169,202,227,109,41,23,84,247,206,97,46,196,225,81,101,53,51,174,20,163,111,153,69,210,151,198,72,214,228,91,28,234,193,52,134,217,94,246,11,156,136,35,26,35,236,177,112,114,111,105,189,40,33,234,86,154,151,125,94,218,73,244,109,143,227,101,79,226,75,121,112,195,242,138,213,54,116,76,225,70,102,35,197,97,78,50,239,56,139,241,200,19,2,209,153,190,111,167,115,60,78,161,97,249,234,33,94,244,58,149,73,152,247,73,131,103,94,168,142,239,243,167,163,107,143,36,75,163,252,206,21,87,100,201,44,83,40,231,19,51,235,162,123,48,222,154,101,89,143,235,254,220,181,111,92,212,103,174,77,26,49,235,39,48,25,108,213,41,92,189,131,55,21,119,23,29,90,215,245,234,62,207,210,215,229,219,93,90,48,193,13,194,92,21,116,116,67,93,42,234,7,46,85,80,104,68,98,67,112,118,158,218,166,97,134,150,34,201,213,221,177,141,70,197,13,152,249,179,100,27,227,220,44,242,235,82,241,251,88,18,39,7,189,
+170,132,58,48,170,56,181,133,97,25,57,60,173,11,18,235,66,51,201,3,204,60,94,61,25,125,148,56,118,220,109,58,178,196,169,129,175,125,191,80,212,199,157,16,243,227,58,28,78,103,76,124,126,39,78,31,65,122,142,33,199,65,110,83,203,80,234,65,146,78,160,88,185,1,165,106,166,151,57,13,239,81,239,37,112,69,158,75,180,216,206,115,200,189,197,25,49,78,46,161,196,29,126,111,54,8,229,169,81,35,246,154,170,242,210,110,205,61,218,92,143,114,90,242,32,225,184,20,13,252,169,89,145,152,210,186,165,149,152,206,18,75,19,126,235,56,20,141,159,100,206,194,18,189,122,166,230,157,185,32,3,72,91,28,57,43,179,149,24,124,169,163,125,81,141,131,17,6,88,89,145,153,139,112,198,146,96,93,178,47,70,140,230,161,102,153,248,136,166,211,199,146,56,125,48,152,42,29,117,69,57,98,190,101,71,136,170,206,120,155,115,122,213,5,235,208,170,208,250,79,101,134,39,104,172,106,126,188,194,35,208,106,242,251,250,229,164,76,220,189,5,111,171,0,217,231,
+71,198,60,103,251,84,153,151,235,226,43,49,103,77,32,73,125,245,248,81,220,102,57,26,93,101,200,178,188,219,30,94,134,213,110,126,4,89,180,247,136,173,245,108,6,106,91,19,238,66,242,193,185,231,113,234,138,22,174,153,73,119,169,148,27,3,209,92,75,31,244,53,180,55,30,111,156,123,93,36,122,75,72,235,207,104,73,101,46,244,225,101,209,29,121,128,158,211,117,19,87,187,223,39,10,176,162,91,66,177,43,239,245,69,162,38,59,227,105,84,150,106,58,225,45,129,26,181,191,171,181,145,56,53,67,15,140,110,197,31,31,199,220,232,118,79,132,91,25,223,56,160,67,130,22,147,166,97,111,214,154,60,217,153,106,0,21,101,29,198,134,142,64,233,217,82,28,215,131,198,37,4,179,211,29,140,29,182,12,113,46,51,141,81,108,5,122,82,211,219,183,120,107,154,242,210,85,84,174,33,181,87,228,159,68,102,80,101,113,214,198,73,229,99,251,24,125,212,166,92,50,198,190,224,12,170,239,215,47,170,249,205,50,220,133,7,227,1,89,123,196,219,157,95,122,101,
+226,193,138,105,155,183,4,212,100,3,224,124,97,66,142,179,227,127,101,246,167,228,100,119,97,26,233,9,205,119,13,95,31,200,154,216,177,201,213,183,115,203,151,170,155,41,110,62,104,198,74,118,111,238,165,213,129,152,102,187,221,169,224,99,251,46,133,217,40,52,11,166,64,63,156,174,115,177,61,73,53,10,123,233,198,198,117,11,226,212,230,76,238,193,249,110,139,202,100,183,219,136,179,55,127,23,91,6,171,45,210,178,190,223,234,130,163,190,70,134,57,198,234,106,239,155,60,116,212,106,19,107,225,0,117,56,173,138,192,243,156,142,39,11,166,80,202,55,43,189,183,240,53,73,125,233,156,119,196,21,155,38,215,51,230,88,99,150,250,27,245,142,59,228,124,247,101,181,215,93,40,203,10,13,97,97,243,155,60,195,177,10,134,113,4,183,218,115,216,153,235,102,42,235,233,225,229,98,69,133,225,57,108,138,170,3,187,200,160,137,12,110,129,64,21,212,242,17,68,225,2,125,234,182,109,230,188,133,209,47,253,228,18,153,211,54,2,39,137,231,46,182,111,204,54,41,
+115,143,243,240,167,68,17,26,152,113,218,218,187,175,106,122,134,74,117,111,128,235,28,94,80,236,233,104,120,25,207,117,5,204,19,189,220,232,91,26,214,131,213,113,121,91,149,219,126,40,172,126,101,194,5,46,81,7,142,158,83,229,240,192,22,231,20,207,89,254,44,39,77,201,136,169,145,191,39,66,117,14,18,236,69,220,200,82,141,39,118,141,43,119,19,106,195,130,190,116,145,125,141,220,146,236,162,195,80,45,217,25,61,99,132,188,155,229,188,233,128,111,222,71,110,39,115,234,172,29,21,198,107,250,94,227,170,237,76,137,123,14,153,40,216,238,74,5,77,228,18,172,157,7,247,210,7,119,201,116,95,29,186,102,161,53,107,136,76,233,39,219,144,115,245,106,78,232,73,43,29,118,104,38,166,118,86,18,230,184,206,66,118,42,137,155,18,220,115,100,73,2,169,75,13,227,10,192,162,245,105,137,1,181,106,29,70,37,113,193,50,135,224,66,45,46,162,89,66,146,138,91,187,138,114,193,203,216,65,99,182,214,137,15,215,54,103,246,176,127,64,74,139,235,150,9,
+98,249,208,148,95,211,185,134,63,15,97,123,232,178,147,14,231,118,125,26,183,93,10,230,106,124,194,241,185,11,121,140,212,72,51,50,116,16,61,131,243,120,112,54,211,42,137,196,62,49,78,213,161,86,197,192,112,41,246,67,71,77,100,214,210,47,134,217,77,134,110,133,127,198,155,37,115,71,87,250,180,175,138,94,57,238,65,117,78,142,160,71,74,29,139,230,121,239,140,67,160,196,19,228,16,238,185,202,39,31,167,161,200,184,131,151,125,43,241,100,50,226,101,146,77,37,83,177,60,71,207,46,188,29,175,37,13,132,246,137,81,33,54,182,170,145,248,136,160,20,38,81,52,141,203,25,79,87,254,110,179,151,27,172,59,226,5,16,78,42,123,197,168,82,52,36,24,134,128,170,65,214,170,124,81,186,116,102,51,238,52,213,206,229,239,176,77,35,4,195,73,215,211,145,173,64,94,231,186,169,94,113,101,87,83,231,48,119,197,117,201,159,184,62,254,150,95,223,105,55,173,255,209,78,143,41,106,87,79,134,173,26,233,203,80,226,154,103,148,10,116,89,30,126,163,23,
+210,94,14,1,41,36,86,31,157,195,209,62,122,102,157,85,42,118,190,94,70,251,110,199,219,190,177,206,87,93,193,74,52,152,35,189,244,101,253,20,171,100,183,245,215,226,251,45,157,169,90,15,155,225,232,51,185,54,162,57,126,18,234,106,54,151,207,254,105,170,209,86,47,57,54,130,210,143,94,50,10,119,219,142,111,80,226,160,195,29,208,63,171,92,146,102,156,16,215,19,148,150,35,235,18,33,56,234,218,106,20,202,85,193,192,220,78,171,241,202,73,2,92,51,160,5,159,226,93,119,82,174,253,114,53,87,244,125,212,173,147,227,108,194,251,56,175,240,230,124,246,75,160,76,3,119,192,205,140,211,0,92,242,49,12,80,175,176,134,226,243,56,98,57,21,116,211,156,147,190,164,246,154,195,241,128,187,186,101,166,183,206,42,108,218,166,28,168,138,14,215,42,237,230,180,253,200,189,21,226,121,156,11,130,100,121,175,126,110,63,242,87,99,102,242,32,88,48,7,37,226,125,157,64,153,150,138,92,248,96,163,57,62,29,225,248,43,91,178,232,143,71,179,88,217,250,
+112,13,174,211,43,179,245,161,151,36,84,138,242,188,153,112,189,205,22,210,123,135,54,213,149,15,161,132,42,225,36,155,143,6,68,235,48,168,171,26,97,13,22,108,47,222,104,159,238,37,178,231,45,100,156,95,251,81,252,84,239,53,80,54,4,123,247,41,204,159,155,74,225,165,130,4,242,205,94,222,177,235,81,109,121,109,112,122,201,40,95,246,190,228,248,172,242,165,242,198,199,170,200,25,75,140,164,16,79,119,236,56,68,43,14,131,139,87,144,206,238,110,233,24,31,110,109,110,126,255,137,158,21,208,201,128,134,162,166,86,233,106,144,211,72,255,74,128,28,16,82,144,169,184,47,48,112,6,151,103,129,55,190,159,225,171,138,140,87,180,170,185,164,202,103,36,237,179,28,232,110,45,225,118,200,238,247,144,131,91,160,95,236,183,128,220,143,168,195,81,226,50,224,254,248,212,184,23,39,146,23,77,68,61,5,124,231,221,12,202,95,195,210,36,69,133,56,137,170,174,58,111,108,116,122,223,92,114,106,136,22,6,85,173,243,28,182,70,42,202,155,30,127,60,59,197,
+90,219,130,251,102,164,113,66,181,14,248,67,187,107,45,239,221,43,245,65,23,206,111,79,111,158,72,211,77,86,15,136,15,123,146,232,248,228,213,126,110,8,193,238,95,203,128,221,82,38,122,29,215,168,155,28,88,78,105,69,250,80,182,183,174,174,21,159,72,243,129,82,78,99,71,48,123,169,206,228,194,106,47,92,157,156,66,53,159,238,0,7,112,8,202,193,30,200,30,240,70,228,227,0,228,60,176,237,5,217,0,95,105,56,0,132,156,0,222,189,28,64,81,10,156,142,176,182,246,183,67,58,121,165,92,85,145,27,96,3,64,242,64,80,251,167,35,20,240,211,145,2,144,254,70,170,2,222,32,90,81,97,163,26,202,193,201,154,28,172,255,141,206,199,137,127,163,131,108,233,223,232,200,137,231,55,186,84,238,3,123,196,43,78,52,106,189,102,224,108,179,99,207,223,121,56,0,210,4,192,255,105,254,103,239,239,254,208,231,71,126,232,131,248,63,244,145,192,31,250,82,213,139,62,212,214,118,136,164,147,183,236,200,212,34,162,127,211,255,71,114,162,126,232,3,10,
+47,250,96,183,10,78,223,50,134,199,65,176,72,130,231,129,124,1,14,64,250,25,30,32,255,25,254,63,241,203,252,30,30,162,173,130,151,98,224,182,210,46,60,75,56,91,251,6,131,217,32,216,231,69,41,205,154,174,28,22,54,13,79,123,236,217,196,23,86,30,16,25,229,126,15,199,243,249,130,177,1,4,56,15,112,15,240,115,124,106,107,49,83,223,41,122,105,58,48,190,174,64,167,75,171,228,218,50,180,82,25,57,112,143,208,87,195,178,3,207,169,87,61,27,96,34,212,46,39,228,137,98,104,94,16,152,112,158,55,219,58,193,210,233,100,158,75,12,141,30,173,50,179,245,113,155,31,201,113,169,116,38,140,193,24,51,110,248,163,0,166,32,56,222,206,136,130,222,67,20,2,186,219,139,179,49,141,101,133,201,255,70,103,248,60,69,150,169,75,63,186,158,134,89,143,247,120,199,38,151,218,88,252,96,188,222,229,108,106,26,78,8,217,4,179,140,113,201,55,102,154,248,199,141,59,124,60,135,229,86,43,204,193,2,32,182,151,22,49,123,4,82,14,126,155,16,
+210,240,216,123,94,192,199,181,229,191,133,123,221,217,82,233,70,66,28,129,207,199,9,138,79,22,194,134,243,165,61,79,85,202,123,225,232,223,249,184,116,222,254,40,64,243,29,168,13,252,210,193,47,21,80,56,160,9,224,165,52,193,111,84,57,216,247,27,245,61,79,250,141,234,247,92,56,30,80,9,152,162,14,195,33,128,205,151,75,243,237,209,116,56,7,255,38,61,201,5,236,4,65,85,76,8,194,181,54,240,46,214,190,27,129,123,8,12,176,71,88,14,47,205,198,126,96,243,132,31,216,55,193,15,172,96,217,38,27,60,191,166,178,5,3,249,101,67,232,63,53,110,245,151,52,175,153,2,254,208,252,71,120,209,102,84,216,190,23,61,167,60,199,47,199,153,228,74,191,255,105,6,194,108,38,8,130,83,17,224,70,166,151,162,34,121,160,33,168,146,67,109,144,219,101,135,124,13,224,123,168,65,14,76,28,125,246,112,214,2,47,199,7,225,82,165,230,229,75,46,176,109,8,89,21,59,60,159,41,90,38,192,242,68,102,190,41,104,155,129,47,10,193,23,7,83,
+30,222,36,68,73,104,240,4,129,253,163,28,200,31,154,156,249,15,77,1,224,135,38,72,242,67,19,24,249,161,57,145,18,86,209,202,171,39,195,35,27,254,146,69,197,99,67,95,29,34,128,219,39,97,88,204,160,254,168,47,212,143,124,142,190,10,254,235,143,144,128,126,1,156,230,252,63,206,239,232,103,126,95,125,126,38,78,238,255,153,56,223,143,57,200,33,63,230,240,46,249,233,238,223,253,116,127,118,48,176,95,64,59,49,249,5,20,232,186,75,34,1,238,151,70,32,145,155,11,188,15,40,168,121,65,219,45,2,250,49,28,16,151,10,254,7,122,254,255,48,190,241,167,251,177,243,254,2,245,65,30,84,123,98,139,147,139,140,119,174,13,165,62,188,52,135,254,237,127,16,119,82,237,51,125,165,97,227,95,74,127,81,225,79,64,191,145,25,47,18,183,84,165,221,120,117,125,190,84,22,120,85,63,9,111,147,244,143,250,249,129,31,245,123,32,121,142,226,36,139,114,128,191,105,212,195,162,141,15,223,3,76,70,49,212,127,158,247,19,242,94,202,56,52,2,63,
+78,234,225,248,78,211,236,232,208,35,76,70,40,134,103,47,126,153,79,50,13,222,27,137,47,139,137,212,224,120,185,136,41,176,224,4,190,48,238,27,69,128,236,141,208,151,164,20,248,143,98,144,175,7,207,117,90,60,237,155,175,213,45,28,208,226,195,126,248,35,97,63,142,74,66,252,56,170,7,254,158,226,4,139,87,7,61,13,135,165,168,224,127,78,127,244,223,82,219,32,185,219,82,246,170,34,190,2,156,211,242,51,19,179,212,194,240,95,254,75,126,137,35,152,237,141,145,43,211,36,23,229,255,147,255,31,15,79,37,35,36,129,114,29,47,111,231,227,128,128,223,86,249,96,17,16,127,223,15,255,104,191,28,143,227,169,115,16,246,190,247,255,236,60,218,182,191,199,91,26,30,147,3,62,81,228,227,62,210,175,186,131,167,210,28,237,143,196,75,67,194,159,240,154,22,193,1,6,85,155,107,83,161,86,230,50,3,247,143,252,3,200,61,254,38,196,103,33,254,95,253,158,249,43,222,100,80,251,97,32,240,242,203,158,6,236,95,241,80,233,240,140,132,145,255,142,
+224,255,68,92,112,40,82,168,23,210,138,27,104,252,216,5,23,84,34,82,28,188,253,28,242,82,196,104,120,94,176,102,208,239,35,137,31,197,73,177,180,57,162,119,234,178,236,191,52,52,122,205,171,238,21,48,38,163,159,128,65,47,169,133,148,87,76,147,175,191,169,33,40,236,51,245,163,70,183,24,11,249,123,126,253,71,59,100,227,218,192,169,199,30,93,117,123,30,142,64,161,73,130,151,134,141,239,111,159,51,62,111,222,219,10,41,242,166,204,238,197,75,255,207,196,57,116,221,18,206,162,38,8,40,240,177,135,132,174,207,88,13,197,106,14,161,182,110,55,240,66,247,190,76,134,244,19,94,48,47,26,157,251,181,136,237,61,130,92,167,51,203,67,56,195,191,58,248,204,144,71,181,102,209,50,114,213,223,97,13,210,66,20,59,215,18,241,28,251,16,62,157,144,61,164,13,219,35,136,54,195,71,49,165,214,15,64,6,21,100,105,200,11,110,224,161,165,8,236,34,211,0,27,233,215,77,121,160,26,176,226,188,220,42,7,179,187,175,142,164,90,136,200,52,135,146,
+192,142,218,56,123,82,158,149,250,86,67,192,126,135,135,127,100,39,255,240,185,210,249,109,86,137,71,219,140,17,189,134,247,60,106,240,206,147,202,131,231,247,136,96,144,247,216,116,50,172,231,109,157,208,105,159,251,54,170,85,143,115,174,101,138,176,150,170,117,189,53,95,45,223,169,130,107,179,227,44,239,225,232,129,86,28,117,22,123,62,143,216,82,41,167,221,183,110,6,124,206,191,164,136,126,117,246,214,178,198,106,29,96,3,65,108,4,208,214,234,18,229,136,230,170,98,148,57,250,241,199,207,12,35,250,66,68,252,234,245,66,196,143,155,165,95,136,117,15,7,152,241,171,231,190,228,238,20,151,137,141,111,211,160,206,118,223,177,161,226,185,64,227,227,120,217,190,87,59,46,48,10,226,133,187,254,231,101,236,74,164,89,185,217,113,34,120,9,250,119,243,163,42,128,12,155,90,250,36,74,14,78,50,186,124,233,193,22,20,120,143,245,152,198,35,40,191,238,200,193,39,250,144,235,104,75,83,159,181,166,165,245,14,163,16,207,94,52,38,65,120,102,179,232,27,196,
+234,225,125,48,238,90,119,191,198,155,246,63,225,246,91,43,177,223,169,242,243,231,247,146,55,95,61,196,160,198,131,150,211,126,47,67,15,232,162,168,51,107,112,211,155,51,191,174,168,38,247,210,50,86,173,18,219,234,87,216,169,99,230,96,114,127,139,113,153,69,17,213,121,236,158,79,37,109,115,67,127,252,134,200,202,44,226,93,140,120,206,152,198,236,161,125,192,242,151,194,54,107,73,224,47,141,251,201,181,143,26,190,214,85,78,160,108,36,4,148,93,123,88,219,3,0,130,95,207,10,47,254,137,175,173,190,128,139,127,124,56,204,127,251,103,255,221,223,124,150,141,252,123,159,101,255,254,105,240,41,87,48,84,195,96,140,112,235,12,25,90,71,172,225,145,44,89,176,61,27,198,6,218,218,17,44,16,14,0,168,167,161,192,88,49,27,123,203,202,119,173,202,4,237,25,76,21,148,0,205,20,10,218,196,227,53,1,104,23,138,228,31,96,33,127,164,217,69,153,59,65,154,2,250,224,99,90,215,13,62,203,170,245,251,42,69,221,28,125,30,207,206,227,202,106,181,
+30,19,87,251,122,105,53,155,231,5,85,229,237,189,227,131,32,115,109,83,2,44,227,29,240,43,251,231,119,147,193,246,0,41,185,64,186,106,37,198,29,121,189,67,2,40,245,201,92,137,15,244,77,245,199,58,153,196,58,153,185,46,48,20,221,105,41,144,132,136,99,89,183,88,184,137,191,167,36,172,248,59,55,70,14,206,23,12,118,12,44,87,2,101,147,85,18,114,57,24,128,18,86,200,229,177,21,117,58,35,230,47,129,80,67,110,141,29,101,41,69,217,84,182,241,149,235,215,214,221,85,231,116,239,231,126,253,162,207,130,87,70,208,103,107,29,86,245,131,124,76,16,230,211,155,113,93,226,154,140,254,123,202,89,105,79,56,248,112,94,182,18,236,144,82,207,170,219,172,197,11,111,4,247,70,29,228,208,195,135,103,189,84,181,246,4,58,69,39,44,177,237,66,10,209,236,34,161,155,190,175,166,152,62,237,66,196,142,18,96,117,143,28,22,139,62,66,112,162,195,201,22,105,76,120,72,188,7,191,138,193,147,144,28,37,139,240,251,107,207,44,48,49,69,126,28,
+201,146,16,135,250,155,15,156,132,139,207,66,218,204,85,46,18,33,163,45,46,205,169,242,110,235,128,147,102,68,188,197,135,114,49,232,100,120,79,213,79,85,101,72,84,215,245,38,203,149,36,161,220,17,218,182,20,217,70,185,21,239,121,136,136,70,50,32,162,147,17,228,42,101,117,57,47,145,136,140,127,167,53,33,115,153,118,48,106,172,130,97,132,143,4,17,33,125,103,200,64,66,18,241,65,24,123,96,216,213,124,30,18,18,98,138,224,151,213,225,229,241,0,29,208,41,135,70,180,60,170,148,17,6,250,6,239,76,130,170,244,51,97,101,244,9,127,66,76,23,244,27,2,115,14,251,177,223,220,30,68,198,70,11,176,46,210,71,239,25,1,62,27,180,73,218,57,237,165,179,56,180,73,140,67,211,234,136,92,77,227,102,34,198,114,7,87,221,42,0,160,120,60,97,12,2,107,159,89,45,159,78,179,14,70,238,102,225,189,151,105,85,200,215,84,249,99,12,31,241,63,159,185,247,213,221,188,190,92,75,24,37,84,149,130,201,30,239,36,213,65,238,93,243,152,159,
+143,50,237,149,116,144,114,202,140,112,29,33,65,196,117,212,116,149,125,124,149,108,251,30,0,213,155,52,134,172,2,193,17,185,222,249,155,233,103,86,24,252,98,153,182,173,156,76,163,204,135,7,242,30,141,134,8,104,149,136,106,157,64,119,17,200,188,79,190,251,164,54,61,67,55,199,152,183,221,74,19,9,108,242,124,147,243,191,239,209,109,16,133,114,197,163,58,170,34,207,215,73,19,13,137,56,45,186,189,155,248,148,15,81,132,73,153,135,188,57,56,197,94,46,45,52,106,117,37,146,11,24,232,219,236,227,106,66,133,193,223,44,112,204,220,6,67,15,95,91,66,167,182,128,85,132,65,22,218,224,106,102,28,151,120,6,86,37,163,105,162,232,217,99,120,62,238,157,186,9,106,40,149,228,228,166,233,163,202,9,19,36,184,90,134,192,129,100,8,122,177,123,231,53,47,250,86,86,40,172,101,226,223,26,150,96,59,59,245,191,125,176,211,162,138,14,253,69,38,49,235,32,144,22,26,197,118,240,74,36,26,123,227,195,86,110,242,152,246,110,114,185,26,108,203,179,
+241,93,168,153,227,238,235,56,179,73,100,68,93,188,17,237,202,139,51,238,150,101,201,185,36,205,85,159,216,132,9,152,158,147,83,97,82,86,131,84,242,1,180,19,223,14,175,210,65,146,243,124,64,158,167,160,223,255,185,144,67,37,25,152,170,2,158,212,61,216,148,159,198,68,194,85,40,58,157,58,164,57,232,154,104,78,76,162,87,166,232,40,42,112,44,204,214,149,201,27,21,146,233,32,6,33,5,109,144,98,150,9,116,18,201,126,30,55,225,64,100,188,137,146,157,140,1,137,233,141,46,156,217,63,76,106,103,25,213,243,101,177,234,86,174,12,62,17,198,50,245,188,92,222,108,106,37,236,4,121,162,6,209,102,170,38,154,148,232,98,120,182,44,114,250,140,17,43,4,198,156,200,251,132,16,153,52,181,219,9,157,164,22,54,226,155,121,192,213,43,78,192,5,156,60,212,113,168,153,251,56,202,81,116,62,62,95,211,83,198,142,68,75,117,226,214,35,162,49,73,179,139,233,148,91,203,223,150,231,61,22,197,246,163,216,130,4,206,76,152,209,196,82,185,81,158,
+22,143,224,84,35,24,5,134,218,254,1,253,116,46,153,47,137,128,73,155,62,83,237,198,203,246,182,169,73,109,190,83,49,10,52,236,108,150,88,152,89,34,46,210,161,108,207,174,32,26,120,14,4,41,8,154,37,24,27,152,66,28,69,199,78,100,168,33,135,184,141,215,138,236,253,177,98,59,176,109,171,213,187,117,137,223,77,161,240,211,102,208,114,111,201,117,81,177,254,226,93,151,245,212,84,98,122,110,92,114,25,115,170,198,192,230,68,11,205,180,129,29,139,75,235,161,169,56,153,54,199,98,166,40,193,155,79,29,227,158,95,249,152,237,108,106,57,134,89,111,189,82,69,218,228,219,177,108,247,208,214,233,104,87,238,124,246,138,93,16,47,13,133,84,208,209,168,27,211,174,88,189,6,247,144,253,102,156,237,118,159,172,212,132,163,244,94,114,182,45,46,44,102,183,39,160,192,186,214,175,168,213,235,35,219,173,219,75,15,4,174,91,151,247,7,138,26,232,85,242,94,236,217,162,58,129,45,135,53,218,41,252,71,37,100,188,168,10,165,225,177,138,46,99,131,62,
+235,146,177,140,58,165,165,183,213,162,51,139,1,13,104,67,182,118,34,130,41,4,183,222,229,150,3,244,58,139,226,218,205,98,109,25,44,194,234,38,245,14,133,246,156,198,230,95,19,153,144,8,219,82,38,196,243,252,154,28,188,39,229,77,86,87,71,31,140,199,17,236,100,170,55,251,155,58,161,98,148,28,100,27,45,83,165,236,45,109,120,46,196,30,69,42,85,75,49,48,213,29,220,35,104,192,153,170,169,140,192,188,220,251,88,179,252,98,109,119,117,142,70,19,35,196,145,165,236,110,0,142,60,163,208,51,205,125,22,124,99,246,87,245,161,238,136,217,102,30,44,213,72,53,203,183,71,141,89,102,156,103,170,78,215,144,182,81,153,183,163,228,82,121,223,135,52,116,137,100,84,150,180,172,137,243,69,157,165,83,150,145,170,170,202,78,87,63,139,23,66,253,97,99,20,135,129,74,220,78,161,184,104,108,33,238,86,240,150,125,190,64,33,115,75,230,5,118,178,201,42,228,95,206,5,90,206,236,205,91,161,100,50,42,47,149,244,225,68,230,58,118,38,147,62,192,
+228,108,58,28,140,78,222,151,126,225,92,238,93,6,191,156,32,34,163,40,61,123,189,230,100,129,255,69,60,14,14,247,250,37,198,220,170,251,157,188,232,195,175,145,53,55,77,247,68,241,197,153,105,149,186,235,16,123,246,88,105,140,205,26,145,115,157,35,74,254,97,102,140,46,38,171,143,102,51,57,104,22,195,182,43,175,240,157,59,147,157,195,145,68,108,168,25,79,81,116,110,37,136,247,34,41,21,237,92,148,154,248,84,241,160,243,110,240,208,129,231,24,79,225,204,191,233,188,205,138,244,56,159,27,86,131,78,54,25,67,224,19,133,73,131,186,164,132,103,54,32,30,91,7,42,22,138,179,82,209,37,55,53,252,165,53,223,49,82,37,142,170,75,149,78,233,0,55,56,200,19,191,85,106,181,61,145,73,78,108,208,220,130,106,18,129,34,163,58,45,63,130,155,183,120,10,195,27,163,250,102,22,190,159,58,133,142,111,226,59,73,11,98,152,205,38,226,87,55,10,74,115,194,88,190,214,124,223,74,153,84,113,7,147,243,228,46,226,118,137,174,173,192,245,88,180,
+17,154,239,7,166,175,9,213,51,183,113,197,224,189,207,48,96,83,67,141,18,30,105,122,93,184,69,96,126,131,205,155,188,212,16,184,180,37,76,86,123,202,185,29,74,228,220,54,20,175,228,57,5,202,197,126,72,205,91,187,188,152,22,3,123,88,223,169,202,124,186,237,159,149,38,103,134,180,229,82,155,118,150,96,227,28,111,102,163,154,152,76,64,115,232,91,224,60,224,240,141,197,149,180,142,182,177,116,44,52,63,77,33,181,25,233,31,216,237,248,254,23,76,59,192,207,185,243,60,200,162,86,126,54,91,130,1,142,192,249,28,230,223,35,76,92,254,45,123,5,225,205,16,60,106,78,176,16,21,3,138,32,88,166,25,202,179,156,199,63,164,188,19,179,159,250,99,60,111,175,149,37,51,1,199,113,248,48,47,28,61,206,187,55,124,80,95,166,22,90,115,115,142,10,216,210,234,107,1,46,183,214,34,54,154,10,53,145,187,191,240,156,146,93,162,174,232,118,99,244,103,177,203,255,170,8,135,118,251,40,66,121,238,67,221,228,158,134,43,181,87,3,156,42,95,43,
+209,68,154,98,53,123,190,214,142,15,178,222,212,140,169,82,31,0,181,131,161,50,6,112,141,33,2,37,87,4,250,20,233,91,95,111,239,26,34,228,185,129,216,145,234,79,3,34,79,75,75,178,26,150,119,137,151,195,86,113,41,145,26,129,194,34,19,88,111,250,143,238,203,174,50,235,168,76,161,88,117,96,197,50,214,42,19,210,223,91,20,111,150,150,65,163,204,55,14,188,34,14,222,67,105,211,49,124,240,242,23,231,46,92,77,54,109,113,17,242,58,186,133,61,135,104,235,118,221,240,85,253,147,147,201,134,108,46,77,239,95,116,58,125,114,230,48,90,162,62,107,187,217,190,132,17,214,133,154,126,106,158,180,105,116,178,71,112,36,161,200,228,15,122,181,208,158,26,114,138,239,121,41,218,38,107,9,155,211,16,188,45,242,55,66,147,178,51,85,45,242,136,222,190,112,155,112,4,205,241,71,143,101,128,230,116,67,149,136,78,13,13,86,19,82,113,210,53,136,131,114,45,166,154,125,99,68,66,17,19,115,140,100,206,20,107,40,185,151,39,35,186,159,73,68,211,
+245,209,189,93,233,88,202,161,110,193,197,216,159,121,68,44,107,143,102,67,6,122,30,13,238,78,8,56,104,11,105,152,162,19,228,45,102,23,50,37,51,192,9,82,134,229,177,66,205,58,197,250,225,239,110,23,134,60,154,103,203,184,59,83,167,124,233,31,40,205,166,22,174,150,152,42,24,203,165,78,245,72,71,209,142,102,166,249,221,67,214,180,9,145,194,177,111,245,30,116,49,246,240,41,111,129,111,23,137,145,66,103,154,135,40,21,209,252,46,175,241,212,156,22,68,23,174,118,182,104,201,108,222,40,198,220,80,248,247,68,27,51,235,152,6,127,25,219,92,119,47,126,217,158,226,57,239,159,147,118,9,224,12,175,42,248,85,84,11,252,214,230,191,169,190,41,206,160,167,115,106,53,189,137,127,152,19,99,138,74,33,30,45,152,104,37,237,176,29,58,80,102,99,53,130,209,19,225,170,245,55,150,32,136,52,15,209,137,153,13,34,253,86,72,39,68,81,162,126,227,41,71,19,117,255,59,102,180,201,39,162,0,146,200,16,13,231,207,249,230,235,75,136,2,205,68,
+109,63,118,106,26,105,62,178,224,44,172,214,173,74,53,123,186,92,183,226,8,147,49,189,218,184,184,177,171,157,249,12,255,21,190,121,161,160,38,147,30,239,79,62,151,214,56,243,45,53,35,232,207,172,222,205,57,155,180,161,95,221,234,85,217,159,182,199,176,73,74,18,250,156,140,21,151,51,223,60,83,209,171,171,220,5,107,103,137,119,52,189,45,186,28,162,29,102,130,92,35,215,109,191,111,74,34,218,169,215,198,43,233,137,67,118,179,27,101,177,143,2,162,212,30,78,207,159,197,197,48,205,174,107,11,104,108,22,101,85,223,179,168,115,85,206,200,163,223,120,91,52,148,179,96,69,30,197,217,82,176,60,59,246,79,145,102,155,102,128,246,151,241,164,67,10,245,77,218,254,178,231,61,231,3,251,128,207,247,246,24,48,45,131,193,21,199,254,208,117,233,100,102,240,172,143,155,50,104,132,240,30,129,6,59,91,133,171,214,85,221,131,185,46,26,33,13,143,65,66,23,115,195,227,90,55,223,56,157,55,185,49,201,143,105,30,57,70,99,26,211,237,104,75,89,65,
+139,103,19,84,242,166,245,176,235,250,157,175,120,249,62,72,75,55,158,1,55,32,126,231,187,101,222,131,203,214,193,1,170,182,187,97,122,151,244,49,173,156,151,114,218,151,9,49,65,133,96,255,34,163,82,86,145,72,174,109,124,144,205,95,100,187,88,142,178,97,137,212,42,91,15,116,91,102,201,245,200,87,94,71,190,214,253,72,34,30,120,79,244,190,191,93,55,106,117,83,168,148,37,74,106,29,55,177,84,178,87,112,53,29,227,39,24,79,103,89,44,59,241,232,35,221,119,82,171,0,207,196,206,53,144,21,32,112,30,81,28,129,68,36,239,45,128,72,57,242,177,245,124,230,188,253,242,254,235,140,158,32,242,34,78,252,141,164,71,155,244,20,93,100,142,130,98,34,71,148,63,56,164,165,98,74,28,22,164,227,210,26,14,171,111,102,88,23,165,107,1,99,36,242,199,93,11,76,220,154,38,125,97,207,18,220,54,223,86,136,194,158,173,13,100,230,91,249,69,80,189,153,34,58,230,233,92,78,40,172,42,144,22,48,212,17,255,254,114,2,72,121,169,151,201,169,
+156,87,171,122,115,181,123,236,2,65,80,101,139,22,102,11,175,85,68,33,131,46,16,87,232,55,162,2,218,137,142,33,210,25,247,187,56,19,8,25,200,160,64,31,188,228,132,70,178,175,0,84,27,182,33,216,55,129,41,104,25,215,38,249,41,122,4,166,71,162,67,129,47,160,232,101,225,101,24,205,71,123,79,176,117,20,39,6,84,177,81,172,136,131,230,205,172,44,167,202,122,186,110,102,7,99,128,189,98,108,55,190,225,0,50,76,166,24,250,101,15,211,176,178,100,169,202,27,137,16,152,161,162,117,163,70,187,200,81,202,9,111,166,199,2,9,63,161,201,234,204,242,248,182,233,5,113,44,248,155,62,27,119,205,21,160,196,196,142,51,55,254,38,197,111,18,219,251,222,43,222,195,18,12,176,152,93,98,78,155,203,138,80,168,84,6,15,12,96,212,160,154,247,198,34,82,214,116,189,254,51,23,65,117,60,111,221,129,39,31,43,35,137,149,158,191,132,107,163,107,214,239,98,241,205,205,96,60,4,113,240,208,181,124,156,194,146,138,73,64,98,18,21,184,16,19,
+114,123,75,110,225,29,210,167,184,148,238,166,137,211,198,59,23,31,199,70,118,62,6,133,123,5,77,73,166,190,104,189,47,140,161,79,83,94,243,209,7,16,13,119,182,148,124,253,154,225,207,155,175,44,30,187,14,142,171,10,255,32,140,53,141,36,210,176,172,124,108,173,85,170,178,153,53,85,170,122,230,183,47,65,62,208,69,79,237,51,109,3,202,135,121,206,179,135,123,178,184,109,234,1,24,163,87,198,196,132,82,39,40,10,106,225,220,42,73,152,74,99,118,144,97,97,46,30,247,209,57,136,86,190,115,171,95,108,79,238,36,71,25,143,253,143,161,142,50,115,182,186,107,64,89,113,81,0,170,184,71,32,111,187,246,151,81,5,146,39,55,146,63,17,95,170,116,15,127,125,19,88,232,38,255,3,161,119,83,16,80,150,234,241,201,158,0,112,58,225,60,255,102,220,197,237,80,166,129,20,247,127,211,104,80,141,90,163,107,91,97,158,171,8,147,135,68,180,44,27,122,2,40,164,65,114,32,128,32,87,254,186,188,94,5,249,79,65,73,248,41,20,126,222,254,47,
+237,255,68,187,12,64,248,204,249,11,207,216,19,14,132,35,10,238,0,239,77,199,53,232,45,198,186,201,232,219,211,138,248,129,110,184,197,245,166,151,194,195,164,52,239,148,187,140,73,253,174,100,116,202,251,166,15,44,51,248,172,109,104,153,155,165,201,78,103,68,56,252,125,223,31,67,160,100,153,79,15,177,152,143,130,210,85,133,125,80,203,113,167,106,89,187,171,46,15,196,80,238,173,97,45,157,238,89,43,248,40,217,66,173,123,110,230,14,53,182,218,38,239,208,50,93,125,170,134,65,155,116,25,40,153,169,181,135,60,83,63,59,88,7,47,100,135,183,5,242,7,234,84,61,74,21,176,48,210,102,52,67,209,42,90,218,235,32,82,30,230,175,51,25,58,75,239,159,177,117,221,20,65,225,68,211,200,22,141,203,49,237,95,23,26,126,206,234,135,27,138,62,134,212,95,198,191,8,124,5,251,44,25,193,211,253,246,170,175,59,67,182,131,169,18,207,67,42,41,57,119,95,47,245,130,241,200,17,105,3,77,99,221,37,217,100,92,189,172,116,76,166,146,126,148,195,
+74,75,37,236,81,22,240,113,136,116,194,145,16,36,108,197,132,61,173,232,127,68,85,66,230,89,146,27,21,68,32,250,88,91,216,128,226,58,71,39,244,148,143,75,43,90,155,57,126,31,160,220,92,124,43,197,69,18,28,24,11,7,164,59,22,49,150,188,98,116,147,245,0,33,92,79,43,111,26,23,89,231,128,141,159,225,133,116,41,83,143,149,30,66,5,131,181,112,42,120,153,151,110,222,143,81,29,178,251,71,177,16,135,238,218,7,55,243,126,84,69,155,182,1,12,70,233,9,39,22,169,24,1,31,231,187,224,131,150,3,65,6,1,161,244,131,209,74,141,222,106,97,81,102,130,90,17,102,30,155,131,217,209,203,12,94,125,74,0,180,168,189,162,138,119,192,129,193,104,202,166,102,0,14,212,198,236,120,211,97,141,148,246,113,173,112,34,119,92,110,201,3,60,255,166,186,136,144,12,14,137,255,38,149,154,24,68,165,44,202,253,158,247,75,128,37,149,15,179,192,81,55,180,23,86,58,62,114,244,183,71,70,165,122,158,149,211,116,174,61,57,15,233,7,168,234,
+50,239,53,211,183,50,233,89,150,97,152,1,40,250,90,110,40,88,19,117,164,60,242,76,228,192,160,187,48,208,217,227,55,35,9,88,5,103,247,45,32,23,7,43,193,180,134,88,93,43,215,212,222,13,20,233,55,230,1,107,237,199,43,79,163,173,170,234,235,186,113,216,173,190,95,235,214,100,65,206,13,12,80,44,252,7,204,149,117,193,87,192,172,235,200,101,134,47,101,70,47,12,34,199,82,153,55,118,240,219,220,212,40,175,27,74,166,39,225,206,136,204,170,128,185,38,225,62,68,187,80,205,111,189,208,178,145,115,206,64,38,186,114,120,232,49,251,233,128,142,121,227,58,215,102,97,11,245,46,13,253,246,117,141,39,191,135,52,163,154,89,162,211,138,18,150,67,243,169,144,75,179,130,119,233,129,45,152,212,231,162,7,236,157,120,209,164,205,74,25,182,8,173,220,253,246,239,243,198,253,224,194,47,205,123,234,177,197,143,38,58,70,254,100,141,23,105,66,55,54,151,245,96,107,155,10,110,199,171,150,244,120,9,83,141,62,89,65,36,126,111,122,76,80,31,26,
+178,98,47,30,64,140,100,83,57,130,22,124,84,80,49,215,42,200,31,169,163,8,203,21,159,65,133,28,5,236,148,150,157,208,67,37,13,34,174,225,152,77,82,69,196,67,224,121,14,239,221,80,155,41,12,177,190,177,114,0,238,220,160,59,60,246,185,235,24,68,200,240,142,210,197,35,13,63,61,232,55,131,137,91,159,35,39,195,119,32,222,49,56,149,248,43,162,229,150,15,194,171,197,111,46,229,157,44,177,156,108,158,162,69,219,60,229,171,25,237,36,149,23,190,127,49,147,89,118,197,203,59,92,206,190,198,4,141,169,90,189,166,53,185,137,33,62,46,12,209,142,43,240,35,38,10,255,238,195,123,223,123,117,31,77,124,241,109,168,10,57,115,254,71,168,23,134,237,226,168,107,151,38,133,97,141,168,8,214,189,44,102,177,199,236,246,44,146,234,28,247,241,75,209,109,90,101,230,157,68,150,214,247,218,2,231,83,11,78,30,48,120,250,69,104,160,117,48,74,81,143,153,140,252,77,162,174,197,44,240,184,113,76,179,94,63,234,138,100,130,205,231,222,203,181,35,
+61,255,224,107,133,106,58,91,17,123,123,101,125,243,133,74,190,155,102,198,165,210,61,159,14,187,238,115,176,247,54,92,12,39,14,218,58,32,134,97,77,142,81,8,91,51,227,234,90,115,168,153,141,67,56,48,19,143,235,58,93,234,58,70,12,14,120,135,206,77,202,209,232,165,47,141,182,191,183,13,208,10,8,166,217,220,229,92,119,144,151,229,108,231,6,4,184,138,221,122,142,242,83,252,211,102,79,247,242,167,220,65,68,179,94,184,29,243,106,166,112,103,189,76,67,104,175,91,50,252,171,194,102,242,1,223,192,251,240,177,155,102,34,246,125,210,172,206,159,210,114,203,155,110,169,69,100,106,143,253,234,101,226,57,182,165,181,38,33,227,130,81,144,54,157,23,20,23,228,252,244,52,146,30,162,169,121,84,30,183,141,88,209,133,121,123,239,211,124,216,233,124,179,94,144,15,87,182,236,110,204,102,101,222,8,240,143,139,253,189,246,200,153,77,226,180,95,129,163,42,188,238,235,10,180,174,209,58,130,80,109,37,194,56,252,233,160,213,151,5,31,229,35,203,198,244,
+198,9,133,247,95,167,56,235,233,8,8,10,0,190,142,173,244,162,236,252,27,31,36,56,140,11,239,1,188,62,128,219,244,182,21,209,62,7,139,69,129,49,63,106,203,232,56,222,78,169,193,211,173,206,227,28,230,219,170,229,116,179,86,37,144,108,137,51,41,214,37,63,106,104,124,101,65,130,16,120,240,152,228,183,203,165,56,194,153,57,92,64,255,212,198,194,106,101,226,143,27,239,114,50,79,6,178,225,89,30,87,70,100,25,165,66,85,120,170,157,125,244,27,171,37,137,61,72,182,140,250,152,40,198,233,64,38,139,139,171,99,31,82,83,70,25,114,79,223,76,160,94,3,140,226,37,68,24,247,132,32,176,69,117,13,249,220,58,190,115,243,56,171,181,101,31,45,148,64,219,83,203,60,209,81,222,241,145,123,223,55,247,228,183,103,63,179,62,233,83,202,12,216,134,162,20,28,150,129,37,11,126,101,196,51,81,185,142,251,160,35,217,125,211,182,155,168,180,194,238,201,209,69,205,22,91,55,15,23,187,54,12,200,124,34,121,115,133,62,104,143,30,39,46,102,246,
+182,125,3,44,95,153,35,113,59,101,229,56,215,92,139,51,143,18,184,74,139,209,245,76,43,5,237,76,4,152,83,214,189,71,8,52,187,132,255,139,120,97,164,151,197,212,149,115,95,31,204,122,30,69,107,35,134,241,227,230,45,109,222,53,93,141,182,123,4,107,18,5,172,211,112,48,61,62,238,79,188,61,143,111,81,102,89,176,12,183,168,105,40,25,176,250,54,121,171,95,219,92,9,166,154,19,144,27,61,166,13,59,214,138,197,17,199,235,9,199,192,85,176,21,187,198,248,198,104,30,47,117,106,174,113,143,219,21,233,213,247,80,150,196,211,115,78,43,245,85,183,31,236,252,148,78,176,137,205,221,107,46,244,156,31,52,169,52,23,182,142,233,118,250,113,27,70,49,69,38,105,76,53,173,226,231,50,83,108,132,89,130,139,49,27,244,137,92,253,90,110,42,205,31,9,124,216,166,128,77,38,125,178,26,198,82,199,191,205,13,90,55,147,34,166,39,46,231,13,41,97,242,222,117,10,137,166,0,212,226,131,186,204,151,129,179,221,41,10,184,169,128,149,201,183,220,
+247,183,71,232,192,130,141,31,23,66,137,42,241,104,184,71,181,206,85,183,166,197,71,123,202,254,188,52,10,186,70,81,235,92,125,42,129,230,123,170,117,252,244,133,159,225,107,126,84,73,230,45,215,238,149,102,122,133,219,100,76,164,108,74,190,176,238,192,183,9,211,220,49,175,204,28,28,73,255,154,64,22,173,238,91,225,237,74,38,229,105,241,0,51,82,201,128,85,254,138,63,203,59,19,19,108,69,200,81,77,209,143,72,236,180,41,102,115,244,55,54,189,67,235,244,213,247,9,21,252,216,75,57,207,205,190,95,66,68,80,247,72,90,17,67,238,201,215,41,248,66,156,100,177,157,114,3,230,173,153,39,240,166,240,190,63,211,120,77,155,85,126,37,60,13,166,166,188,125,112,56,234,177,252,201,255,17,26,228,249,156,246,36,15,217,232,222,152,100,237,62,130,105,151,85,153,98,28,236,227,134,32,119,90,75,65,155,10,199,30,166,248,109,249,141,206,190,9,87,203,185,91,241,190,170,208,157,20,116,255,178,162,136,215,186,74,101,195,208,209,180,58,95,60,239,113,
+85,123,71,223,195,5,168,163,111,95,132,75,62,118,109,125,215,6,173,184,121,77,229,76,20,223,25,243,35,107,116,223,211,241,11,96,120,64,250,45,50,241,133,153,241,62,141,24,75,165,214,210,77,245,195,103,120,11,79,235,24,76,29,51,79,113,170,168,121,48,137,70,203,249,203,141,126,51,141,237,191,21,70,148,62,174,241,96,73,111,62,198,3,184,208,97,135,218,236,96,188,48,211,37,71,133,94,223,66,229,122,133,183,184,32,160,220,75,158,231,164,251,19,135,237,242,154,49,48,245,155,210,158,245,50,84,131,242,73,161,142,17,18,94,225,107,1,205,17,200,46,63,203,228,204,105,191,115,89,134,99,107,48,126,32,86,234,80,148,0,137,174,123,156,101,238,190,208,200,217,15,200,161,30,119,219,144,79,203,42,72,195,43,21,220,93,108,159,166,241,238,1,250,158,124,177,145,96,107,124,233,226,70,5,246,116,243,189,108,223,142,158,147,230,189,53,217,211,159,91,127,234,153,245,223,230,48,90,132,66,86,213,113,92,158,74,17,10,60,157,211,132,233,40,41,88,
+232,28,233,243,107,69,100,37,197,208,103,66,168,93,247,8,203,133,205,185,167,42,237,14,90,188,117,158,19,110,140,209,110,18,58,74,233,100,45,145,51,224,201,187,58,251,177,46,136,77,17,103,240,148,217,112,33,76,67,104,18,28,197,229,36,137,241,214,125,156,108,177,55,197,1,16,155,124,233,154,128,99,127,78,167,73,49,109,197,51,216,71,155,243,152,179,229,50,201,27,190,112,0,215,212,230,113,21,128,78,21,27,220,84,115,211,113,119,97,161,240,189,75,195,9,147,124,97,18,45,20,28,241,225,58,159,62,229,231,225,192,108,163,47,46,29,60,50,9,61,30,251,147,249,206,238,207,159,148,180,195,125,45,43,195,149,164,251,157,1,239,72,51,102,100,29,189,8,96,13,95,26,247,108,224,190,74,64,25,157,192,150,176,199,86,130,150,239,128,129,45,2,108,234,42,24,127,137,178,13,94,192,131,212,131,91,185,228,169,126,91,9,171,190,85,167,173,248,245,176,209,105,158,41,206,51,167,180,61,101,170,240,145,79,220,137,120,70,199,121,137,78,188,219,21,230,
+160,2,238,95,109,158,227,235,222,253,120,100,112,147,171,13,255,150,231,7,188,147,29,241,25,99,152,30,187,52,41,235,23,14,234,132,141,175,210,14,26,164,38,49,177,245,145,50,136,78,233,20,112,138,49,241,41,216,103,152,123,155,35,155,102,43,21,123,106,247,167,207,131,123,112,28,157,89,120,17,245,186,215,61,69,87,98,144,245,154,190,189,72,99,244,47,11,56,87,110,97,110,227,109,37,219,100,114,121,134,174,117,250,166,34,179,113,31,246,73,174,209,80,74,67,128,237,23,2,151,125,61,104,10,241,141,201,194,249,194,242,227,200,239,100,126,68,157,154,240,179,90,231,44,231,38,63,93,48,40,199,150,43,225,15,207,30,240,158,218,167,26,199,186,6,222,114,13,166,109,247,21,127,176,15,150,237,214,21,183,183,223,175,171,150,29,183,179,58,193,150,234,176,40,210,13,27,183,59,186,129,63,148,46,243,99,170,181,219,173,215,45,206,67,236,119,219,109,138,13,207,153,203,158,176,193,69,51,150,111,75,159,115,160,12,199,181,123,95,89,34,218,219,119,198,20,
+2,58,234,25,106,207,47,189,134,1,245,101,227,165,87,119,1,190,245,168,242,175,75,119,244,218,119,60,183,246,231,66,196,125,186,159,35,98,107,176,79,141,152,45,209,212,123,60,63,5,70,252,77,58,34,118,90,203,199,40,148,16,152,89,70,252,174,122,11,61,225,160,107,254,156,186,55,43,215,134,215,179,139,133,82,105,81,61,11,182,167,206,165,78,104,183,102,52,197,8,217,217,69,173,242,144,101,79,138,148,194,89,184,248,141,115,219,114,11,131,4,54,54,96,143,94,91,152,47,199,177,48,222,71,75,207,120,155,196,11,37,193,204,175,30,54,23,44,188,141,110,3,198,117,28,190,124,235,130,137,242,51,16,124,12,119,32,169,118,107,207,110,70,148,152,169,85,93,163,40,110,157,185,215,79,240,82,223,227,188,196,181,40,98,79,45,243,56,57,103,185,21,107,88,171,159,246,46,29,204,201,43,41,101,211,197,61,24,187,128,181,248,191,161,183,70,140,232,72,148,107,124,11,243,11,183,57,72,13,229,38,220,238,184,49,228,61,30,108,7,95,90,236,24,245,224,
+189,101,155,96,213,31,207,69,240,98,62,226,55,50,178,215,116,204,154,235,104,254,251,120,181,236,149,174,244,143,240,164,136,108,38,28,71,81,109,60,64,39,86,76,102,221,189,101,175,243,250,220,88,148,203,243,173,80,73,10,46,207,92,249,57,255,100,4,23,35,8,77,64,81,96,162,107,70,212,21,24,188,239,219,78,200,249,215,137,116,2,11,81,13,158,96,178,41,227,205,112,154,185,62,42,125,247,175,85,128,86,166,228,186,149,211,197,37,82,216,11,200,224,185,0,54,146,121,176,76,0,68,46,15,37,210,105,240,233,125,246,245,184,162,108,175,245,36,52,13,142,0,4,40,229,186,119,4,246,94,45,234,52,24,0,16,188,46,2,148,78,153,145,92,245,114,32,198,65,147,134,56,105,48,1,16,191,165,176,1,22,156,220,149,189,18,1,151,78,4,19,123,134,188,59,234,80,152,8,99,22,80,181,238,131,231,223,123,144,21,39,76,113,111,61,126,235,250,96,98,211,125,213,44,33,152,114,173,250,142,118,21,139,90,214,136,58,71,182,65,125,31,224,98,26,73,
+246,118,3,227,131,8,175,105,225,248,52,205,2,231,14,230,28,159,153,173,16,142,7,51,177,102,241,133,249,212,153,196,218,139,77,139,24,54,3,124,102,86,33,19,27,167,99,83,103,233,40,211,143,107,171,144,160,137,241,162,238,64,220,3,99,87,104,122,31,41,225,52,249,133,170,0,47,86,82,83,245,24,151,197,30,1,50,124,6,240,109,28,25,108,88,225,65,155,244,161,109,54,13,246,26,61,94,83,213,92,68,173,62,204,5,155,169,93,133,19,210,59,193,110,57,41,250,47,171,7,214,191,59,167,44,172,116,241,10,225,215,221,177,79,197,195,7,251,186,66,77,85,85,14,22,132,223,231,60,213,74,6,9,169,14,94,9,63,200,110,166,28,29,177,238,237,16,168,61,98,144,172,169,250,201,165,20,253,245,109,122,87,91,21,149,219,206,23,71,73,207,19,76,139,180,169,171,246,186,73,149,142,108,145,241,175,74,35,162,81,57,69,43,168,142,172,133,11,231,144,118,29,48,220,62,254,74,106,203,58,111,49,251,153,116,83,84,195,219,165,189,71,77,242,118,186,
+165,158,253,246,111,94,89,127,25,85,108,94,215,124,204,115,106,150,176,21,196,133,216,208,186,246,250,246,36,155,190,88,113,62,243,43,249,33,177,15,71,195,232,171,145,221,196,194,145,254,179,105,208,87,136,246,71,249,236,189,133,108,100,253,81,24,134,22,178,24,191,101,71,114,182,35,176,212,231,178,216,49,149,172,102,105,189,117,162,166,203,137,154,65,241,16,61,71,111,176,77,122,249,98,105,96,9,118,35,54,255,17,125,104,247,45,93,40,9,45,37,83,247,112,241,243,99,171,229,240,26,159,110,202,125,59,168,79,201,168,182,100,178,242,108,71,238,181,197,16,205,57,87,95,166,89,190,74,197,151,225,215,233,87,23,179,57,137,53,46,109,141,109,74,139,30,76,94,108,171,115,127,219,235,93,232,208,143,175,189,228,25,87,79,150,134,173,168,201,14,108,224,99,219,228,216,207,143,204,44,99,214,208,241,110,245,1,84,147,202,233,202,78,253,98,86,174,34,241,123,93,48,9,174,101,88,219,199,115,54,43,237,25,65,118,43,246,176,50,54,108,221,196,217,194,214,
+198,1,219,179,182,106,10,154,141,38,160,21,100,17,151,233,138,191,163,105,136,15,179,123,144,168,240,50,187,241,232,26,15,56,29,164,46,65,200,57,195,35,231,8,142,254,19,212,196,1,174,39,12,147,125,70,151,85,125,240,78,140,182,182,149,46,41,12,162,41,155,40,238,142,167,182,106,0,59,22,167,104,250,201,7,79,0,165,142,27,91,58,42,121,31,214,27,32,16,178,243,97,43,42,175,89,18,185,206,11,109,126,6,208,10,228,204,210,50,214,74,181,119,216,186,100,202,145,103,90,51,120,151,32,99,159,208,243,48,22,0,168,131,38,0,62,4,240,235,242,122,1,32,63,133,159,218,223,22,254,97,187,231,119,45,176,71,213,25,155,39,155,49,1,1,82,208,95,45,111,191,222,61,209,131,72,62,12,64,243,96,1,25,200,235,242,114,237,64,136,46,7,58,222,228,213,95,255,37,202,28,110,215,85,131,14,63,46,203,53,243,149,204,131,224,176,108,92,122,77,174,31,60,78,236,39,200,7,91,225,121,140,227,23,33,93,227,162,88,211,222,142,73,115,69,4,
+234,132,206,254,88,183,100,6,20,111,242,9,210,220,117,238,26,245,18,15,142,93,26,88,35,31,173,163,187,5,219,252,60,233,220,37,18,217,29,118,163,250,192,203,69,57,58,57,17,220,45,151,252,164,128,44,68,252,16,203,219,168,226,98,244,126,240,186,244,113,86,206,108,206,197,13,115,28,184,13,252,190,11,255,70,157,24,65,68,49,108,239,144,183,78,105,126,99,111,69,230,67,101,2,45,1,63,21,166,230,66,122,210,74,25,49,96,147,252,234,157,212,241,214,13,26,239,157,168,191,83,41,48,115,195,135,61,201,145,194,233,60,140,99,92,176,252,59,108,98,217,35,235,216,56,253,49,207,246,140,104,19,55,183,128,61,207,38,150,73,219,188,222,20,26,194,163,164,33,5,37,123,131,121,201,76,79,202,96,19,59,160,101,133,160,232,97,29,7,197,59,252,31,251,248,17,8,51,169,129,204,164,176,68,239,213,173,161,163,15,200,92,170,66,15,218,222,48,57,102,92,121,185,223,188,239,204,129,117,172,52,84,52,44,160,221,102,17,171,220,11,52,0,102,209,163,
+198,202,136,170,245,225,171,225,188,10,222,205,5,255,4,93,196,214,209,249,119,41,204,93,90,145,172,204,24,86,54,109,160,131,46,129,134,233,122,167,127,174,63,68,243,32,22,234,194,150,151,238,73,190,196,172,107,209,80,167,134,121,174,153,139,137,58,244,37,137,113,98,121,73,82,101,166,56,53,193,251,177,252,201,124,140,181,124,152,105,1,224,76,217,83,217,228,237,188,43,204,129,59,39,44,251,35,143,173,217,144,11,250,75,83,21,139,102,22,108,40,30,248,143,242,241,96,218,9,5,15,52,169,212,222,178,63,218,159,40,216,106,231,164,103,100,1,76,239,152,163,123,99,194,226,56,141,105,207,131,77,78,249,48,242,202,180,169,162,43,203,46,142,125,202,213,195,124,83,150,54,32,120,176,214,180,63,26,185,99,155,126,95,171,241,126,36,11,35,50,6,253,130,124,160,151,33,15,22,105,60,226,252,215,211,7,19,255,50,170,246,179,220,254,62,108,108,208,113,37,47,186,175,24,242,22,129,62,247,234,25,16,221,179,82,131,12,99,47,179,25,211,93,154,16,190,
+117,207,8,52,206,228,36,189,72,107,110,203,158,133,19,163,63,251,193,32,47,121,217,132,120,53,32,115,14,131,90,176,141,188,238,50,10,148,224,223,254,102,94,165,220,195,150,120,19,192,12,38,116,44,0,223,203,198,133,191,46,190,55,38,255,36,231,0,84,124,88,27,224,163,228,253,251,176,6,220,15,47,155,165,117,213,107,195,40,77,158,61,34,38,2,196,60,77,71,40,47,124,99,154,233,239,252,14,174,119,223,122,93,215,169,102,101,140,204,113,184,149,5,177,15,113,62,161,239,245,206,37,206,230,229,232,175,90,231,36,98,227,198,224,237,114,115,77,203,86,171,15,142,157,215,192,165,130,87,245,106,138,153,12,242,167,59,109,110,161,3,240,195,139,10,8,4,232,128,38,0,1,4,248,117,121,189,0,160,159,194,79,237,111,11,255,165,253,255,159,237,158,159,66,183,233,193,82,200,117,92,177,139,1,28,130,155,202,23,175,18,158,43,136,117,24,206,115,13,208,152,121,36,10,240,94,124,133,124,0,22,92,85,2,145,100,169,240,235,237,221,106,184,187,161,150,
+183,189,232,31,156,115,244,167,255,205,191,252,147,255,241,103,99,181,223,223,154,252,235,191,217,154,237,95,255,251,95,251,173,253,108,142,246,135,255,248,135,255,237,191,254,55,127,241,151,255,246,63,254,221,115,132,126,78,28,250,181,25,218,239,142,255,215,95,252,187,127,247,39,127,245,23,127,253,107,63,177,31,164,127,249,39,127,254,151,127,242,191,252,218,125,234,95,252,205,59,127,242,23,127,245,107,39,182,255,251,175,254,240,215,127,248,203,255,240,115,86,210,159,255,106,249,217,68,236,117,199,255,250,55,144,191,78,78,250,125,207,159,252,219,63,252,245,255,249,191,255,229,31,254,234,95,252,218,191,236,247,6,110,255,250,255,248,195,159,255,79,255,243,191,248,197,229,167,241,111,48,254,205,191,255,203,95,103,42,253,135,191,254,187,123,212,253,221,205,141,254,236,95,253,233,191,250,175,254,236,79,255,135,255,30,5,134,129,221,32,0,0,228,189,255,254,66,168,153,61,227,32,29,131,192,17,168,203,241,141,201,91,107,167,192,224,112,8,112,30,37,20,130,17,175,84,
+10,245,17,147,94,147,134,128,220,14,82,131,148,147,219,158,117,60,214,191,145,199,248,151,127,77,11,35,176,118,23,239,186,175,15,137,158,206,58,223,55,249,207,185,171,89,38,24,47,250,215,37,184,219,28,124,147,185,117,91,101,146,151,92,169,98,229,217,213,122,202,143,118,153,44,43,203,182,163,201,123,99,88,179,124,143,253,161,14,183,186,131,164,87,1,29,157,125,86,216,35,171,209,82,196,70,61,74,117,92,133,201,46,63,91,171,42,170,189,214,77,78,75,208,182,8,173,161,75,48,153,6,151,148,151,89,26,182,254,75,65,60,146,125,179,62,208,199,141,72,216,54,24,33,43,53,141,129,227,157,220,214,252,76,198,70,75,162,106,52,164,23,147,90,4,43,104,152,226,202,92,246,199,68,136,42,35,22,90,220,160,200,251,208,158,6,28,27,171,168,67,110,219,51,49,137,131,13,238,106,232,219,167,206,177,201,204,155,69,246,35,104,23,57,174,93,103,103,235,102,47,206,38,193,42,149,130,92,111,15,99,76,232,70,110,98,158,20,77,170,245,32,20,194,183,96,
+33,132,200,68,51,211,146,94,208,136,28,74,49,20,244,253,92,163,16,34,252,176,40,144,13,112,79,223,159,244,135,55,130,27,191,15,83,217,144,146,82,223,169,12,37,20,39,213,152,100,225,180,230,253,20,206,124,16,179,156,230,27,47,120,122,173,203,63,118,60,129,124,221,167,66,8,4,31,66,32,142,19,229,176,183,176,139,129,30,68,28,75,6,186,75,210,79,178,46,70,188,79,42,191,191,7,105,205,135,60,66,91,197,164,237,150,157,124,18,97,113,167,99,251,45,52,240,174,143,58,203,178,249,32,182,65,251,53,228,204,89,220,43,249,34,125,229,22,178,77,150,73,38,167,209,97,130,221,193,58,109,174,48,116,1,149,217,236,236,226,209,58,182,202,18,69,8,32,198,55,104,152,254,32,18,178,250,53,81,66,81,181,102,215,181,154,86,191,69,138,67,103,203,177,135,178,204,174,37,80,0,29,166,160,195,185,26,147,100,221,175,151,80,121,189,93,36,42,248,47,213,0,227,221,149,212,214,230,186,81,143,223,187,88,108,4,25,7,131,159,84,174,154,132,217,33,
+90,176,171,172,97,231,5,85,96,233,182,20,58,40,29,70,99,178,47,131,34,23,84,121,34,182,105,250,33,132,242,47,113,193,231,57,138,31,179,190,248,15,21,141,226,80,75,69,186,190,10,187,152,82,46,211,78,217,232,116,194,18,110,37,233,131,55,137,16,141,147,87,73,108,151,248,178,251,200,110,58,18,129,72,55,118,74,78,85,58,132,72,129,93,239,114,91,233,109,58,94,31,83,65,82,118,31,136,15,55,153,208,185,45,86,233,202,60,42,17,100,122,35,116,5,83,164,86,0,33,28,68,16,3,145,90,118,25,124,214,29,57,41,56,75,145,212,60,253,36,139,168,150,24,26,163,97,163,11,68,190,128,45,200,221,244,234,62,160,245,201,189,187,92,158,8,152,44,86,27,171,34,148,36,192,179,181,212,38,171,224,240,255,16,245,149,221,201,123,79,180,95,253,247,212,241,82,220,139,59,20,47,154,22,119,74,112,47,238,26,66,176,36,151,254,239,186,235,178,22,47,32,100,206,228,204,158,61,123,146,147,48,184,121,254,240,122,5,221,13,161,115,119,245,227,39,
+60,9,3,180,90,134,46,32,102,140,69,26,68,184,184,220,167,21,186,131,4,125,182,8,183,88,28,250,103,229,236,180,94,251,27,11,239,92,182,187,96,6,240,167,21,232,177,22,59,104,160,200,201,79,106,159,188,69,159,171,21,132,199,164,204,115,118,29,46,239,101,218,231,228,215,58,78,189,104,69,131,141,146,22,140,187,195,182,182,235,225,40,129,128,192,225,144,72,198,204,231,125,159,109,3,236,80,207,43,80,211,206,141,125,119,253,40,62,151,28,133,231,22,230,130,137,250,145,117,253,195,202,183,247,211,17,221,231,55,181,125,243,185,51,179,62,142,238,47,157,15,218,62,139,187,242,139,149,87,45,206,25,72,51,55,91,5,230,99,171,198,14,198,159,205,245,11,219,118,172,116,182,61,29,137,166,168,159,176,174,62,123,66,74,196,138,216,222,51,88,43,225,26,22,13,200,182,169,236,57,207,236,35,233,234,185,104,74,81,219,235,237,161,143,96,27,211,147,247,145,25,245,240,5,174,169,45,32,114,79,24,211,54,223,183,36,229,51,178,136,107,5,111,234,241,149,
+124,76,206,216,182,32,21,42,103,204,77,159,135,67,23,112,175,243,220,55,225,225,53,24,39,112,181,240,52,27,252,240,141,108,205,70,96,55,124,6,182,29,199,115,7,202,53,218,169,99,205,200,65,119,41,214,163,68,224,198,229,54,201,24,67,120,182,0,51,56,220,62,143,179,104,103,185,79,172,121,129,145,200,85,48,7,176,25,107,13,8,235,243,55,74,46,0,246,79,226,241,117,63,164,253,34,229,153,123,84,219,109,210,96,62,247,27,106,85,124,199,19,109,113,60,169,115,190,205,20,105,234,241,174,203,116,89,15,47,243,246,182,91,119,73,16,224,112,134,42,190,169,205,80,51,180,161,104,225,54,31,39,80,151,162,46,106,167,174,190,34,68,245,73,165,122,5,95,164,182,28,6,196,22,150,221,182,37,135,32,133,23,191,202,230,138,252,252,178,107,63,76,123,14,11,30,117,17,58,0,31,120,132,141,216,240,220,172,204,26,4,73,77,166,16,76,81,161,93,29,70,236,75,186,235,161,74,252,248,130,2,35,43,148,88,251,174,211,244,218,191,195,240,211,209,157,
+113,173,220,187,66,163,215,198,93,65,149,75,152,64,0,25,143,233,30,119,67,182,49,246,59,42,186,145,172,4,49,77,229,188,142,19,253,117,20,204,20,255,162,111,26,27,241,82,82,218,97,11,26,250,226,120,162,152,119,176,246,229,73,16,56,253,100,36,51,236,119,221,1,142,19,92,176,198,127,89,243,118,7,58,59,214,159,155,140,188,145,101,128,252,161,81,50,54,184,15,105,71,69,34,241,204,118,253,114,59,123,29,220,2,126,236,180,180,102,63,180,105,225,188,97,36,71,152,209,163,105,157,140,188,55,227,210,167,181,226,91,195,213,74,219,25,5,156,23,190,118,238,11,206,200,107,79,31,92,118,179,167,249,180,251,186,146,96,189,208,26,191,158,216,250,128,99,216,163,49,215,167,22,46,169,25,98,197,173,121,156,61,142,57,246,184,133,81,136,53,155,0,124,132,243,169,13,197,124,237,23,3,149,21,222,190,128,20,175,200,22,185,78,159,209,138,19,156,235,96,50,101,159,41,209,213,47,28,116,3,73,172,183,249,88,3,248,125,189,98,184,84,34,243,14,233,
+236,113,84,140,109,244,185,164,213,155,129,239,129,186,52,167,181,78,93,250,151,222,236,243,157,181,120,119,81,49,1,125,137,242,172,94,162,99,186,183,53,190,190,169,89,252,169,88,7,144,2,8,19,47,210,52,159,15,125,201,147,168,56,220,177,63,28,206,75,70,135,206,239,63,165,15,241,27,28,93,50,230,138,247,137,100,129,41,190,76,185,49,136,30,109,111,186,121,227,24,223,140,138,23,36,45,196,169,183,249,111,91,209,184,163,32,59,62,55,29,142,220,80,96,239,28,120,175,241,204,37,217,242,156,114,41,231,250,188,205,135,188,18,111,175,203,139,97,102,235,151,175,119,142,98,68,173,90,140,203,217,164,151,199,18,71,40,113,29,39,130,39,9,10,180,39,147,180,17,199,248,70,247,174,88,50,27,0,108,248,24,51,30,19,45,105,62,235,249,61,225,211,203,11,44,8,92,78,202,161,122,229,88,132,223,252,107,63,70,235,136,72,254,11,7,57,141,138,153,92,106,69,126,19,76,127,76,174,88,244,204,233,76,73,66,184,227,149,231,254,77,73,56,155,34,230,
+155,166,160,184,26,143,0,46,11,157,232,232,169,170,5,238,229,73,151,136,147,58,135,248,89,234,30,38,28,33,25,241,174,227,238,143,70,168,10,224,150,78,151,176,173,220,218,136,50,166,158,254,51,227,66,247,169,217,23,210,148,72,2,143,69,83,124,158,70,126,164,249,72,116,153,117,38,133,179,215,6,241,160,23,215,244,77,57,124,41,239,79,92,141,217,147,63,119,191,77,199,65,129,2,109,234,134,204,161,85,93,10,106,228,124,255,77,4,34,148,101,150,99,96,43,231,132,217,9,14,37,213,43,200,168,137,217,3,240,125,48,104,223,25,164,34,194,236,184,115,207,150,5,206,195,45,215,5,163,177,3,200,161,63,236,2,126,70,70,15,4,158,84,254,44,108,123,253,56,171,32,115,95,154,1,7,50,119,101,214,219,196,136,211,180,223,24,138,164,106,111,242,238,34,201,92,255,188,204,159,42,89,222,160,237,143,252,119,223,11,102,253,33,249,190,5,111,243,8,128,52,172,23,96,243,4,175,183,158,79,45,160,151,63,211,77,159,115,156,94,141,157,111,36,237,189,
+88,251,131,246,102,189,53,95,75,155,252,41,202,207,209,169,50,11,248,91,142,223,87,169,177,49,59,244,219,235,213,101,149,120,100,132,239,150,118,132,16,166,188,112,182,125,166,191,239,67,82,152,128,99,192,252,83,40,79,230,74,214,126,104,41,9,142,175,57,217,221,86,120,47,118,161,23,187,254,131,105,125,143,234,97,1,5,223,236,74,0,171,145,32,60,225,147,62,112,234,182,115,149,21,252,3,100,213,151,55,157,175,205,56,249,145,5,209,19,215,0,153,196,40,17,44,32,161,211,151,63,37,169,2,190,110,202,153,174,202,127,20,197,211,170,28,89,250,58,221,208,60,114,78,153,180,231,232,38,141,215,132,231,130,78,84,107,62,185,131,7,246,168,241,121,104,20,85,253,34,247,244,95,162,32,18,234,84,231,130,225,130,67,28,220,159,231,85,107,74,101,86,184,8,31,75,42,157,123,28,120,246,177,133,112,163,76,35,177,121,18,167,241,238,181,81,167,231,124,207,190,233,172,31,164,69,248,167,54,158,171,90,143,168,77,13,100,231,35,174,43,35,193,230,170,233,
+125,231,211,49,209,18,53,102,247,2,234,248,90,86,248,74,82,29,90,254,223,153,123,156,91,102,15,221,226,138,179,108,206,151,77,86,67,114,66,39,63,86,208,45,118,80,7,196,221,140,199,159,38,107,16,181,118,161,146,228,78,206,188,115,104,243,231,11,142,90,96,248,28,127,189,179,198,166,183,68,217,208,190,100,110,229,4,91,117,173,253,67,227,188,88,105,1,207,204,101,14,92,145,203,71,60,30,225,163,216,24,72,237,31,134,121,178,242,58,227,95,229,20,34,68,182,191,129,249,0,78,221,7,253,1,117,36,173,148,120,251,177,180,100,52,11,31,63,15,134,202,65,50,125,216,189,236,212,193,214,102,104,249,93,250,81,60,215,99,53,22,104,140,245,232,197,156,13,22,205,23,221,255,99,26,237,223,58,157,214,176,134,127,27,13,217,116,150,195,176,36,144,132,239,70,41,34,125,197,42,155,203,56,142,239,196,70,228,18,152,202,228,245,89,99,69,228,55,70,217,26,191,17,132,181,78,74,12,176,104,219,109,227,108,112,130,97,12,197,35,249,15,34,204,252,249,
+228,221,132,205,62,152,172,49,124,151,27,103,31,177,207,179,31,219,35,120,86,184,201,242,228,230,150,36,176,247,76,239,77,52,113,125,76,212,92,58,122,231,233,145,147,94,158,11,249,34,100,226,158,203,221,83,193,219,249,128,125,85,210,77,124,57,244,98,231,54,108,72,140,74,242,253,74,55,163,35,163,226,66,206,155,242,93,18,127,99,116,134,228,64,69,242,28,56,91,25,111,143,173,54,22,189,46,38,59,105,94,30,243,143,107,244,156,161,126,40,102,83,180,83,173,141,139,79,62,179,95,122,229,229,253,102,175,126,189,203,141,91,129,157,238,138,246,20,177,236,234,83,182,73,145,33,15,31,107,202,167,31,48,239,158,94,139,255,198,148,246,184,75,5,166,164,225,107,133,210,232,212,132,29,102,231,63,83,182,28,134,138,218,140,171,151,96,111,246,37,251,165,144,87,155,6,83,175,239,250,158,207,23,229,46,112,164,8,166,194,157,124,87,60,232,48,209,55,145,255,254,45,133,52,189,216,82,224,199,34,171,198,221,169,198,241,247,159,18,136,67,213,206,181,172,103,
+58,123,203,249,57,70,190,115,8,187,175,11,59,180,177,66,198,116,83,53,139,220,250,37,250,34,216,86,8,82,160,231,94,181,117,221,204,44,244,147,172,233,92,231,159,118,249,234,31,65,103,193,91,160,54,231,59,184,137,138,2,30,148,197,6,78,3,152,210,100,207,239,97,74,196,8,108,68,99,36,38,82,85,184,203,145,18,141,14,114,241,102,158,241,131,238,60,208,232,101,210,22,61,188,130,243,231,112,33,139,85,86,129,24,236,47,252,21,212,84,26,137,73,130,30,108,38,42,196,128,229,249,231,195,149,19,109,90,197,192,181,18,171,93,146,218,86,221,44,57,175,148,133,156,50,112,60,155,205,124,76,94,126,188,5,200,190,181,140,161,138,31,125,145,140,227,57,217,206,223,83,125,203,196,219,117,214,31,92,197,105,47,228,253,137,135,95,140,238,115,113,82,0,246,21,161,251,156,44,84,43,45,236,154,76,81,63,168,177,218,182,183,210,139,168,232,138,88,241,93,188,39,58,238,190,106,198,185,22,194,23,225,232,241,148,237,96,211,66,168,250,17,239,92,43,1,
+186,184,101,51,188,37,186,15,83,183,34,188,80,124,255,196,67,67,56,36,23,61,168,165,77,0,168,157,123,158,127,211,196,165,37,60,101,56,43,107,252,2,8,41,159,12,117,7,133,66,57,232,234,171,30,241,155,16,40,183,15,251,10,218,13,253,64,184,221,235,160,139,76,29,67,115,169,148,28,57,243,21,90,242,76,156,28,195,142,255,158,189,246,78,121,90,4,161,52,130,28,57,179,164,63,12,122,195,24,26,49,92,119,93,170,163,215,89,29,179,168,189,26,216,136,92,209,3,186,155,154,155,140,250,175,175,148,187,22,86,74,82,247,191,182,118,185,181,25,76,231,57,173,64,59,246,83,111,177,81,39,135,126,12,154,134,192,93,47,238,155,138,247,36,51,41,0,124,34,60,28,109,20,215,167,226,185,25,203,45,9,60,70,192,247,109,192,165,55,50,164,183,56,118,77,212,110,46,125,20,228,133,198,87,173,94,132,183,243,96,98,237,89,86,80,58,102,106,99,229,26,18,0,144,119,65,56,232,111,166,36,228,121,162,140,45,69,94,89,165,23,38,228,236,185,111,
+9,157,212,193,47,9,107,204,183,104,56,220,126,39,86,144,247,58,167,28,114,110,116,218,255,2,224,254,2,118,87,187,216,212,174,66,30,210,47,237,247,200,188,229,133,100,123,19,53,248,162,245,138,122,211,177,146,179,12,148,14,162,130,26,80,131,217,252,22,249,68,194,29,230,26,159,52,84,180,227,186,176,15,252,253,221,124,22,133,139,171,74,118,157,221,157,246,182,54,224,143,132,148,5,111,219,231,143,21,34,130,131,7,41,253,87,232,136,4,211,172,255,185,167,250,31,18,154,254,152,129,58,142,115,36,146,51,88,50,3,135,75,134,165,54,187,103,69,180,84,17,250,102,214,62,32,91,39,128,223,159,77,46,158,44,32,237,211,206,184,210,211,58,195,161,37,145,171,159,138,84,61,109,89,223,214,242,94,116,196,43,121,209,83,36,71,73,51,228,20,117,2,185,12,202,3,69,48,19,73,238,67,229,116,246,213,68,42,133,193,201,48,26,31,18,93,111,35,202,190,157,20,60,243,112,48,219,40,36,236,66,26,181,119,154,247,42,104,208,224,219,252,242,246,78,51,
+230,105,70,37,134,206,236,7,143,47,249,112,8,81,247,41,253,54,123,117,77,52,159,52,70,134,78,82,28,217,205,213,104,190,232,253,117,32,51,197,197,218,81,155,143,198,124,83,178,56,217,154,216,167,107,168,117,102,252,179,146,57,216,0,51,175,173,53,139,66,190,52,7,219,47,4,208,172,206,11,111,167,163,163,50,71,223,64,174,165,253,139,48,213,60,227,193,52,255,155,95,226,150,125,157,159,197,44,106,78,80,12,9,125,135,20,201,179,10,212,81,13,30,192,159,132,14,133,170,77,45,85,52,229,248,122,152,59,13,174,137,208,30,243,187,118,21,64,148,92,159,48,6,100,236,204,251,163,227,238,231,69,191,62,2,220,234,79,147,133,94,210,154,14,247,36,210,241,91,101,211,70,157,90,61,117,23,169,127,74,138,194,222,166,34,223,150,192,216,145,154,218,98,179,231,147,102,115,29,45,80,199,122,146,174,109,54,62,193,186,230,140,56,205,87,0,134,233,196,87,80,242,128,174,184,83,11,66,122,168,62,70,249,84,153,21,124,136,164,238,80,204,229,18,103,60,
+169,204,247,65,162,16,90,192,106,44,135,145,222,191,226,33,161,220,239,191,72,233,191,123,74,126,146,61,189,19,236,197,17,100,200,119,176,230,97,189,170,84,14,127,80,172,213,179,88,63,23,73,184,100,58,43,133,228,233,149,247,232,155,35,31,91,84,36,129,212,179,149,38,149,2,102,15,109,80,143,212,187,79,69,73,188,177,140,237,207,241,25,118,186,44,146,112,35,234,180,54,55,38,181,114,60,220,144,236,44,154,253,236,151,141,113,211,41,54,121,124,202,213,49,204,185,69,140,107,214,169,235,179,150,62,92,235,28,216,52,9,26,228,92,51,217,135,106,199,145,172,93,137,20,240,173,214,75,111,244,123,66,247,216,55,221,215,155,123,51,205,72,24,194,238,89,29,120,137,140,83,62,176,185,106,146,16,212,107,169,60,139,167,99,125,133,243,9,145,193,83,207,13,149,140,79,199,140,63,82,97,75,145,135,42,229,152,173,205,231,111,153,152,15,158,61,248,144,140,100,191,226,49,166,29,7,212,244,170,105,23,62,55,176,48,22,204,9,15,118,6,92,177,90,236,226,
+153,114,154,54,255,119,170,100,243,182,44,54,9,58,44,52,0,236,220,191,144,92,107,60,171,75,171,37,135,208,230,243,167,160,158,17,198,0,89,247,79,243,63,126,12,189,200,91,135,96,91,111,126,240,244,96,65,182,138,78,35,137,121,123,211,155,165,82,180,148,184,88,17,161,222,142,111,51,41,70,209,146,122,101,61,127,138,174,101,145,31,213,201,157,194,14,54,56,0,238,129,228,98,246,77,18,121,63,225,98,34,29,90,124,158,109,106,195,25,25,58,49,43,111,109,179,241,194,163,141,46,254,180,131,54,39,56,234,196,234,251,40,24,51,230,120,236,218,230,240,80,220,212,23,61,135,255,128,246,175,95,175,46,213,117,226,230,121,95,42,164,239,188,187,161,42,53,172,169,15,248,219,197,46,9,240,228,85,40,181,239,248,51,156,122,198,140,235,115,179,189,1,61,197,80,188,100,76,174,64,123,6,157,125,169,90,76,159,71,184,109,138,95,245,185,203,66,182,247,113,72,72,224,59,223,114,194,114,155,64,37,166,82,100,117,1,38,70,253,146,91,31,219,210,68,79,
+63,36,79,161,45,129,46,147,136,31,10,67,19,167,138,243,184,17,199,92,11,4,93,132,154,62,69,10,242,174,22,140,157,83,223,153,82,4,111,89,232,152,93,22,188,254,129,171,223,99,106,102,150,71,127,204,8,28,61,19,175,206,95,94,87,101,108,22,103,172,27,253,99,33,58,75,195,40,219,66,15,106,177,154,35,232,205,126,12,6,23,52,82,236,82,254,117,222,96,157,128,48,171,28,17,198,181,130,151,41,22,189,21,60,40,215,145,93,127,224,91,133,67,143,245,207,1,55,70,50,223,36,221,183,96,124,112,27,14,35,181,126,44,222,86,34,233,130,73,112,170,35,17,129,228,92,158,225,15,135,201,254,252,147,247,91,98,68,57,26,75,119,207,107,73,96,179,44,144,166,109,182,82,27,107,10,14,133,28,129,70,120,121,52,94,218,208,149,101,246,223,77,74,202,24,137,211,122,66,79,219,132,173,220,49,109,126,103,16,155,160,8,204,203,194,143,2,191,15,136,45,103,141,218,248,89,186,78,1,180,84,0,4,206,49,78,154,185,127,15,153,15,28,165,51,3,
+154,77,98,160,200,157,170,163,129,162,119,123,207,69,163,253,222,64,33,181,253,200,102,102,59,236,4,189,196,24,152,227,237,144,73,102,97,70,219,124,69,242,180,203,149,13,181,139,117,114,181,99,63,151,113,102,112,97,228,191,13,0,140,8,242,139,220,212,76,187,4,79,184,254,220,58,45,66,146,75,162,239,252,192,241,213,50,193,23,200,176,77,188,185,244,37,198,62,161,174,108,115,97,167,131,212,242,122,67,25,187,67,24,114,252,168,7,60,189,204,215,196,58,252,92,3,0,135,137,13,228,101,147,65,190,97,151,255,171,106,79,110,108,47,213,242,122,207,145,44,193,244,154,100,101,217,98,24,150,216,43,174,182,35,97,96,175,33,162,164,190,108,32,190,10,167,9,83,138,57,191,235,90,145,132,7,231,37,163,239,42,89,240,107,105,255,195,24,126,126,64,147,70,113,172,42,143,39,129,115,62,23,30,2,191,46,198,90,236,111,78,11,115,27,5,130,12,44,126,131,235,15,244,240,107,223,157,114,93,215,166,93,30,10,216,58,39,35,130,167,51,244,168,199,177,121,
+63,185,76,159,135,161,163,132,219,43,125,217,160,184,233,119,208,106,17,18,125,120,113,137,249,193,38,123,225,100,200,98,167,210,201,230,240,46,235,209,212,189,81,55,242,253,240,206,87,127,160,174,4,69,149,121,213,249,132,212,224,188,255,159,161,102,67,222,169,87,86,46,189,186,143,120,5,70,137,148,8,111,199,225,115,71,175,100,37,150,207,31,159,174,235,24,75,19,124,217,166,164,225,60,221,155,208,69,178,121,247,240,170,232,249,111,21,115,12,49,93,70,207,12,234,174,233,60,207,89,214,137,119,98,187,3,143,211,4,108,64,74,224,188,14,29,182,115,14,152,141,180,156,220,98,129,228,71,106,177,251,52,202,81,207,210,79,87,78,35,150,119,44,104,184,18,222,75,215,18,172,148,107,168,17,65,6,164,13,63,93,106,113,215,105,11,68,61,251,23,17,199,44,110,219,119,119,161,114,75,236,193,255,169,74,28,17,199,115,14,86,140,129,53,31,160,59,198,1,69,173,3,28,184,183,130,186,115,107,245,212,214,202,84,113,6,182,122,243,145,241,97,119,130,116,148,
+147,17,244,111,188,96,155,43,230,67,217,180,90,141,69,126,125,159,115,5,227,246,242,219,30,66,156,101,191,50,158,49,88,141,206,241,165,28,95,40,123,140,137,190,96,27,91,129,23,114,229,89,184,33,196,196,199,143,236,217,9,76,199,182,221,183,191,135,94,109,166,195,116,106,54,147,214,129,117,69,34,171,240,92,167,83,205,5,205,25,149,235,89,66,66,136,67,4,59,209,32,117,32,16,53,8,15,88,111,204,17,218,15,242,47,36,182,38,144,162,13,153,77,82,206,141,177,233,201,213,211,127,156,31,120,59,201,250,156,24,229,207,165,235,235,179,175,75,157,117,218,1,132,215,16,220,99,75,154,217,221,183,94,248,111,158,61,181,233,180,79,163,254,194,110,7,67,18,159,122,85,122,99,241,109,185,203,73,13,162,221,55,225,170,91,168,96,72,40,26,91,226,255,30,181,222,107,221,244,33,77,250,27,225,192,133,228,216,90,5,131,203,250,100,142,137,215,55,117,55,160,71,190,197,199,237,158,26,147,136,16,252,228,34,81,207,168,207,144,124,1,122,154,106,228,249,
+188,54,107,203,27,142,255,188,202,189,44,42,240,65,163,235,246,19,235,145,246,201,125,98,39,171,198,180,168,179,168,73,191,77,190,41,190,91,189,172,90,241,165,101,80,9,111,165,204,39,77,86,178,120,239,58,102,233,153,122,199,201,41,45,28,106,97,60,164,230,83,4,169,130,138,188,168,69,162,108,115,127,121,75,57,129,25,95,123,171,229,67,93,186,31,129,131,138,142,199,6,9,26,174,197,102,201,6,128,209,44,197,104,3,208,17,133,92,248,84,171,119,253,248,127,173,60,96,63,67,232,9,109,140,187,92,28,154,115,255,243,250,99,193,97,114,12,159,72,73,239,51,31,225,34,13,80,74,202,6,207,228,163,196,201,138,125,231,187,251,50,96,95,117,254,0,113,108,180,122,156,23,216,214,185,160,49,216,124,130,28,211,103,96,90,250,166,225,222,101,0,63,151,198,107,143,160,4,77,238,233,87,52,10,122,42,180,17,101,189,127,41,229,83,7,155,211,227,129,221,133,224,135,223,102,110,228,0,181,125,117,74,96,214,141,158,36,194,53,214,223,94,44,108,187,131,
+196,44,66,169,168,82,136,133,137,21,209,103,27,109,188,98,36,77,51,191,176,26,171,45,227,234,54,87,205,157,230,72,185,235,144,214,43,219,218,213,99,57,134,46,250,176,175,127,52,118,32,175,5,60,93,89,52,132,123,143,223,101,218,179,69,152,178,61,203,35,157,124,246,83,215,249,116,62,230,208,253,117,248,222,67,203,234,166,58,57,17,140,138,94,135,85,125,127,193,53,171,82,223,137,156,171,101,181,49,243,203,138,183,79,76,132,72,122,171,17,25,19,167,97,194,131,10,115,206,10,107,184,143,249,65,61,236,226,188,144,153,77,159,212,116,45,223,248,229,220,215,169,194,18,181,216,229,104,63,111,39,110,191,92,70,205,191,86,181,18,85,49,52,17,250,83,74,182,138,10,173,185,182,129,125,55,86,10,145,156,182,130,219,191,76,175,248,83,231,69,252,92,125,108,138,83,135,204,72,24,83,208,10,207,37,165,198,178,203,178,68,41,103,100,94,122,150,57,108,146,152,98,24,22,61,140,99,248,191,215,85,216,183,84,249,150,197,140,217,183,233,66,129,202,2,43,
+57,156,133,103,223,105,246,235,106,230,36,71,246,173,191,69,37,237,125,121,202,201,180,71,102,87,118,113,64,43,236,177,239,148,178,153,59,173,29,83,239,244,117,29,160,145,118,89,142,150,228,108,221,95,210,227,159,166,185,130,61,115,247,187,101,186,101,211,185,0,75,119,160,223,249,188,146,209,163,76,235,95,191,178,198,89,137,111,230,187,175,136,168,200,151,174,98,172,163,151,85,42,92,22,250,43,210,186,237,208,64,102,16,173,44,218,164,225,24,208,27,46,187,185,170,27,95,246,177,203,219,50,176,163,53,141,35,114,49,204,117,77,83,229,72,135,1,224,136,14,181,254,190,92,114,114,151,47,203,159,238,179,193,235,35,109,129,38,68,235,136,211,191,167,145,170,102,220,62,84,145,204,204,235,190,161,199,184,49,83,92,27,191,75,225,26,221,91,67,59,253,122,179,172,93,221,243,28,107,98,192,192,11,156,250,231,204,152,22,56,82,82,225,221,252,132,115,253,119,88,74,218,168,16,255,205,3,202,115,36,182,79,120,38,38,127,40,119,245,177,234,252,137,23,162,158,
+39,69,30,126,107,138,197,182,34,41,21,134,20,15,251,247,30,194,27,231,178,117,59,132,187,243,230,52,112,37,230,50,36,147,184,190,135,245,251,192,90,120,62,57,6,5,179,255,48,51,207,19,170,200,1,88,141,198,147,249,248,224,27,141,166,252,74,214,55,181,26,241,232,185,155,118,142,215,109,249,236,88,34,177,51,88,47,218,46,251,67,54,127,111,12,0,141,115,56,11,32,162,143,241,174,208,161,4,122,91,25,107,108,244,212,45,199,14,139,212,25,6,118,219,84,69,228,166,113,226,179,2,210,129,10,187,236,60,87,221,46,55,150,92,231,114,100,148,163,194,189,90,207,94,66,60,1,103,9,15,91,236,100,24,22,186,167,43,254,162,200,157,138,1,18,57,191,55,175,82,100,59,207,249,78,161,236,27,41,201,145,238,225,11,212,31,63,240,99,5,207,103,133,244,107,155,151,29,90,79,246,46,102,8,235,162,98,139,215,108,198,200,246,128,175,112,210,197,0,200,12,208,5,151,238,185,37,1,230,104,6,206,51,39,166,146,100,106,165,236,106,204,131,95,149,195,
+230,242,78,227,178,69,85,227,170,215,62,206,94,53,29,191,31,57,43,170,125,9,188,181,61,209,180,82,69,142,254,155,11,228,62,71,232,33,163,6,62,231,115,215,85,94,122,20,180,247,137,144,239,210,57,255,136,57,171,88,19,130,5,157,227,73,29,109,181,95,135,99,23,117,81,223,238,50,57,28,65,71,75,83,251,122,148,66,46,179,239,82,40,39,212,203,23,106,157,189,144,64,203,1,207,121,246,115,232,181,27,44,90,102,21,26,196,189,155,203,5,167,54,97,128,122,209,31,47,185,107,30,100,32,233,246,185,39,78,229,234,8,20,96,180,63,23,225,109,235,6,67,0,34,126,244,15,205,211,160,80,201,138,157,173,228,189,4,168,245,88,36,78,96,161,231,123,49,221,145,51,126,254,129,162,252,148,246,3,28,30,75,151,188,156,162,124,176,99,247,19,223,55,127,62,76,198,108,81,29,251,12,246,46,131,202,121,254,173,239,224,40,173,0,239,120,11,184,208,8,44,126,5,208,13,23,243,190,169,231,62,169,127,78,6,115,178,237,133,107,115,9,114,185,203,113,
+90,122,211,87,1,71,69,23,5,255,193,200,239,92,241,183,224,232,44,96,209,124,158,57,220,187,184,46,25,127,46,251,185,109,139,178,13,231,45,146,200,114,55,2,5,99,225,182,99,227,152,51,141,233,214,42,26,65,125,178,173,28,128,183,73,239,50,219,132,31,10,21,118,96,197,44,209,220,221,92,233,78,206,121,124,198,179,179,152,28,95,247,20,185,210,156,48,174,87,76,24,190,231,152,219,112,89,203,89,34,115,189,120,59,109,124,123,91,135,73,214,232,18,121,82,203,103,159,126,124,8,73,208,152,52,233,109,157,54,84,25,160,11,28,121,0,86,42,148,113,27,126,0,218,123,243,67,199,119,221,2,216,114,219,95,85,251,223,64,126,197,190,118,1,145,124,116,166,182,124,61,69,227,136,254,56,193,223,253,201,133,208,163,54,101,163,13,95,55,245,148,146,179,16,66,176,29,150,71,95,234,210,135,87,80,217,220,96,72,193,213,65,127,76,1,53,122,220,222,250,186,116,206,51,185,228,2,71,183,23,63,108,92,146,107,229,199,229,242,30,47,13,149,104,135,170,
+197,215,123,6,61,38,241,157,212,207,21,124,98,121,70,143,141,253,189,202,133,13,7,119,252,10,246,89,69,158,189,98,49,186,108,172,234,230,179,211,5,230,78,18,30,141,72,217,95,115,25,255,122,35,104,0,167,31,19,142,239,175,177,142,47,214,97,4,62,198,140,117,221,59,207,173,234,253,132,11,89,59,90,28,164,190,250,72,93,2,249,129,254,98,245,97,115,243,149,177,174,248,126,45,157,214,178,177,54,175,60,176,75,236,85,254,166,114,132,85,123,237,136,193,248,169,113,146,176,113,205,87,156,163,138,138,249,56,5,64,176,3,106,221,67,66,78,212,61,221,211,182,55,82,80,189,189,173,23,62,32,249,34,209,114,203,29,103,248,101,36,13,211,23,16,182,110,61,82,158,70,134,38,222,215,84,127,22,43,169,248,39,151,89,66,217,244,21,226,161,75,118,78,136,59,18,153,190,43,85,182,229,142,247,63,249,101,219,70,220,14,80,133,86,238,63,206,78,155,224,110,162,134,150,114,50,238,155,26,68,148,134,4,249,105,202,236,222,204,46,126,61,157,3,238,239,
+205,253,193,136,79,18,119,82,81,252,34,17,173,20,97,200,142,177,146,140,30,158,61,126,122,92,252,112,167,224,10,119,148,40,83,232,19,9,173,85,70,196,32,252,116,243,115,75,50,30,37,37,168,218,214,171,240,244,187,119,17,2,174,83,127,162,211,142,228,20,197,126,250,49,161,149,127,191,26,108,225,254,251,82,126,142,17,168,64,64,159,189,147,179,195,132,26,181,198,39,204,45,41,199,104,119,69,161,212,86,29,246,63,188,6,95,72,63,238,193,45,191,103,15,95,18,113,126,227,16,125,90,21,85,220,73,122,58,49,34,45,200,133,72,84,190,182,28,91,65,94,205,217,236,157,175,198,139,136,254,238,168,191,218,42,241,55,154,207,104,5,107,90,89,198,103,119,109,255,105,190,18,167,105,40,24,135,25,225,138,92,170,216,179,63,95,131,11,69,116,110,247,99,172,252,209,118,200,101,128,101,183,141,0,112,190,247,44,190,244,252,247,223,14,132,254,119,97,151,255,10,126,221,133,196,68,239,193,239,173,78,85,191,60,47,173,171,184,121,150,126,145,42,78,76,222,
+52,35,230,224,197,115,189,227,171,5,227,25,252,82,200,25,93,255,94,85,133,206,194,157,203,180,72,104,225,183,247,1,6,207,172,162,0,90,14,215,248,219,116,246,190,63,145,208,149,252,190,117,170,66,46,176,32,199,95,102,137,85,240,227,61,125,38,200,149,138,138,54,193,159,18,204,244,251,153,220,26,173,31,72,30,59,45,90,191,102,90,241,155,80,169,159,77,110,222,231,235,237,87,230,239,120,70,15,165,90,130,213,177,53,178,138,94,222,186,255,230,116,126,25,132,116,123,240,228,61,112,210,61,189,113,244,69,48,58,17,247,3,119,26,34,88,192,224,242,204,39,219,61,150,195,112,18,102,146,73,228,34,98,127,19,23,148,57,24,247,231,77,173,8,220,180,178,219,170,222,76,73,188,202,41,161,223,151,121,112,237,6,122,163,143,82,227,85,248,192,136,166,162,218,232,120,148,137,117,68,198,255,132,63,111,117,7,152,63,54,50,209,89,164,214,48,82,6,222,250,121,12,125,217,69,132,104,93,212,37,250,240,67,229,222,147,151,9,180,121,165,95,157,76,73,230,
+23,185,80,116,207,7,115,3,182,30,90,156,50,193,48,35,94,229,175,228,142,149,236,126,122,202,119,246,239,31,40,16,76,77,156,93,112,116,114,91,123,184,130,34,88,238,8,173,114,87,17,33,164,210,188,233,236,36,221,230,37,31,119,116,29,158,227,211,204,116,124,166,46,117,239,25,184,87,191,125,156,170,217,134,126,221,52,107,175,229,209,249,98,221,66,71,29,127,40,229,239,83,190,107,200,179,95,40,55,150,168,27,113,231,122,120,87,49,28,116,126,169,167,146,219,250,59,70,113,10,197,51,235,180,105,136,62,71,139,69,225,194,11,186,11,206,208,126,74,181,151,130,31,153,67,54,157,78,63,74,90,33,145,253,28,77,25,75,113,70,63,239,231,53,68,185,150,188,90,245,151,227,198,28,125,230,181,144,59,209,122,65,106,56,229,9,74,79,125,111,25,216,37,17,173,220,209,118,248,151,75,152,64,118,92,193,154,205,150,164,27,152,105,226,254,181,235,3,98,56,140,122,242,2,173,47,175,236,126,52,24,163,127,113,87,33,102,68,134,187,15,98,211,224,165,185,
+133,74,136,196,90,69,229,52,221,222,77,117,69,189,157,93,107,29,37,172,85,67,95,113,60,75,150,132,139,67,190,166,215,165,3,14,106,153,145,35,240,99,69,201,80,54,249,182,215,240,40,185,133,124,27,168,63,183,226,168,235,153,150,243,103,231,66,193,232,125,223,63,243,0,225,25,172,231,91,113,88,172,12,159,230,22,117,102,117,46,68,95,53,111,117,43,184,217,215,168,246,211,76,51,81,52,180,88,2,155,53,35,99,45,223,134,67,250,228,10,253,148,5,163,234,127,170,172,168,54,140,52,146,15,251,160,83,233,89,234,165,136,166,143,216,28,209,161,165,228,14,152,103,30,125,83,190,176,92,40,226,167,226,234,240,230,109,88,126,102,114,138,245,142,62,168,242,166,171,4,246,46,52,143,213,184,219,153,165,55,72,230,12,219,54,47,126,69,103,197,68,117,161,176,185,99,65,244,191,187,252,137,85,90,155,52,58,203,165,240,158,148,208,80,102,249,167,39,219,221,229,245,157,162,155,63,224,199,200,31,251,98,236,214,245,254,20,195,104,87,63,142,143,175,103,236,
+24,68,175,76,223,84,8,67,4,217,104,51,117,27,215,242,130,162,220,23,155,153,185,197,246,109,245,204,119,132,189,188,184,126,162,208,168,10,223,94,235,215,136,67,17,75,239,25,113,79,61,152,20,48,157,96,166,171,108,242,182,222,126,185,26,210,31,28,82,133,172,251,143,201,126,135,235,179,135,28,28,82,28,236,21,224,48,227,71,119,21,189,160,127,174,211,226,61,169,166,208,53,156,84,234,28,107,101,12,224,0,255,34,3,162,118,15,197,125,209,21,226,111,162,150,30,249,240,92,50,247,107,163,131,40,167,216,135,97,213,87,124,188,156,220,169,129,186,92,22,214,196,179,87,155,55,186,84,100,163,172,7,240,1,94,165,59,60,56,175,245,168,30,60,195,55,40,0,219,228,72,248,135,105,83,38,43,18,253,194,148,139,24,227,220,233,59,208,6,102,67,217,110,160,126,205,240,39,12,75,138,48,177,26,54,152,53,47,152,26,156,151,140,250,151,162,195,138,59,194,171,206,80,126,180,93,137,174,192,83,173,37,28,11,133,228,74,54,29,208,18,129,252,79,139,199,
+127,85,49,45,231,167,180,76,213,208,248,124,139,143,43,157,42,16,254,160,131,231,172,33,18,162,248,211,68,235,157,118,6,145,166,194,195,99,230,193,145,166,171,120,98,127,50,71,127,122,164,201,157,211,213,216,91,232,181,95,189,190,11,51,6,154,104,232,36,242,47,83,109,101,235,178,142,83,190,202,198,151,209,5,194,70,218,157,69,6,14,76,230,102,237,238,179,224,24,22,3,205,105,44,189,252,175,150,109,55,106,29,221,183,39,174,151,11,199,49,132,102,184,181,39,63,51,119,138,90,143,83,116,4,150,202,196,23,194,187,132,44,71,164,78,171,214,239,168,202,153,50,106,191,89,129,153,75,36,167,84,84,109,89,83,7,57,88,37,9,206,56,170,23,178,239,59,241,245,95,241,116,80,215,126,99,67,109,9,224,145,51,34,121,134,223,152,81,204,50,108,240,50,150,144,67,12,13,188,127,175,185,96,140,180,127,132,139,59,106,0,100,82,147,222,128,86,178,224,148,110,204,241,134,220,142,150,223,24,182,98,90,52,9,51,202,201,190,162,220,142,213,139,79,2,149,
+215,220,106,78,75,243,2,114,200,231,203,236,245,127,217,44,101,217,24,172,74,74,111,119,177,10,114,90,141,30,14,31,122,145,113,149,235,120,159,224,53,243,100,84,101,169,36,249,206,124,118,105,88,254,243,68,117,148,19,119,218,163,6,79,216,254,66,244,40,8,204,8,125,13,6,255,248,174,219,30,235,198,180,224,42,159,98,183,127,204,9,83,218,65,177,124,212,228,198,214,184,175,188,97,248,48,254,124,45,196,215,102,81,54,62,27,52,51,183,10,209,117,209,1,227,155,89,221,178,75,168,4,122,146,165,182,149,100,196,253,156,74,122,158,218,206,175,169,134,79,88,108,21,138,2,183,154,16,145,41,137,173,84,230,117,203,78,137,162,186,159,60,113,215,90,21,141,17,215,6,146,108,23,18,90,43,171,155,60,208,71,41,39,54,81,16,3,25,163,59,50,209,204,93,95,99,181,14,76,41,235,163,250,155,22,14,49,91,141,85,190,70,22,215,253,170,240,243,120,222,44,214,106,50,125,7,70,52,73,172,76,230,97,194,233,127,116,246,187,67,56,222,1,236,84,66,
+89,212,56,218,75,69,212,198,122,88,113,181,178,106,198,153,206,243,223,138,211,58,148,169,44,239,79,40,70,182,174,241,91,174,226,3,254,189,148,148,228,221,85,216,225,152,158,59,77,91,229,252,51,95,227,142,185,40,117,97,146,168,131,143,141,162,32,209,205,130,17,220,157,92,29,79,220,155,220,61,61,180,75,204,111,202,90,46,154,71,91,209,248,189,148,90,214,234,202,182,6,113,53,10,8,206,85,21,165,149,180,104,172,117,225,71,144,19,184,175,49,253,253,194,28,76,205,83,34,239,194,239,38,209,184,151,159,84,51,99,239,231,20,69,145,219,168,77,180,250,117,2,145,40,31,162,165,125,214,29,51,104,103,110,143,69,41,128,94,253,181,162,81,70,94,183,86,25,163,173,113,178,168,188,13,255,89,178,216,19,63,192,187,7,232,106,222,112,16,165,172,168,153,122,193,219,81,178,30,20,103,171,54,240,53,44,143,71,101,158,223,191,175,52,152,55,94,114,245,20,74,2,158,52,121,204,115,206,27,117,84,54,185,99,117,190,247,231,224,77,48,220,109,231,28,250,
+68,116,69,53,94,114,12,122,251,166,93,137,160,3,195,214,134,61,156,75,165,109,32,5,246,90,229,25,56,7,163,186,130,202,85,207,104,40,41,245,192,37,16,206,82,140,96,47,117,254,9,168,141,11,249,212,5,152,181,21,166,141,212,161,187,178,208,125,131,51,11,123,254,231,77,146,55,207,55,229,111,151,95,43,223,49,16,39,45,176,174,66,156,10,131,170,226,244,13,26,186,54,89,167,22,235,43,66,206,44,170,247,157,28,137,146,106,20,201,132,138,195,136,201,227,84,102,118,169,254,14,248,120,1,12,67,133,135,233,224,122,127,122,231,38,151,221,87,68,214,56,159,156,101,209,159,234,30,29,244,197,135,207,225,85,250,107,154,82,212,86,21,247,204,125,223,152,21,219,202,174,214,41,207,136,249,37,138,253,208,80,179,68,105,99,77,182,66,163,52,255,193,110,133,20,74,182,215,19,164,46,163,106,143,249,217,243,31,50,22,76,198,186,171,38,132,193,178,202,235,90,234,78,169,251,109,135,43,165,85,8,38,243,28,241,93,135,174,6,136,118,59,175,77,102,111,
+122,38,197,80,196,248,63,87,162,77,125,22,31,78,242,140,207,207,174,9,244,25,250,72,124,177,18,61,97,193,200,236,205,42,158,248,20,59,241,35,159,151,223,215,11,255,213,121,171,253,155,53,198,77,198,59,247,244,178,26,62,171,100,141,213,79,194,194,93,227,86,109,120,254,254,102,211,182,66,172,0,221,156,123,218,183,99,252,33,115,167,123,139,242,209,188,228,68,144,151,124,252,203,236,80,172,228,155,117,36,237,114,172,21,90,231,227,212,165,106,201,225,242,127,177,103,174,86,234,167,218,111,98,165,177,106,191,19,236,49,181,108,80,253,149,40,84,172,189,80,135,2,109,31,61,202,67,54,86,72,109,117,128,77,142,253,49,67,41,74,44,25,220,42,147,27,21,42,219,189,18,118,131,99,70,47,118,235,214,29,220,41,196,27,240,181,69,34,41,154,229,171,133,92,30,79,91,162,123,100,81,231,185,77,120,156,121,95,111,90,237,89,97,78,240,181,211,119,248,79,246,181,77,116,228,160,30,173,20,42,108,52,189,0,147,44,99,31,4,147,113,137,203,14,222,151,
+115,196,96,92,212,173,250,100,40,137,118,24,59,251,153,214,11,90,232,197,101,242,150,93,113,28,125,83,110,110,163,47,57,175,75,177,222,230,87,87,146,193,45,144,226,117,242,107,52,249,183,252,48,232,175,103,232,116,39,198,254,120,151,200,17,195,17,15,179,255,190,125,201,207,9,193,120,3,51,235,3,99,5,217,190,28,253,247,241,183,232,247,190,30,207,54,36,65,88,22,92,60,135,200,244,183,155,208,205,60,188,102,152,54,144,180,6,226,63,255,126,21,15,239,127,235,79,75,178,53,79,161,37,137,132,202,176,56,227,160,236,71,109,12,185,51,75,46,45,10,6,110,221,75,211,186,229,194,47,148,240,116,124,234,215,119,141,102,219,187,200,96,128,248,154,116,5,176,25,77,181,182,49,5,47,66,74,99,173,57,247,6,18,5,100,134,115,252,233,118,231,29,246,40,159,83,1,149,238,52,196,184,90,211,165,149,192,110,182,206,127,198,110,182,204,127,198,110,182,4,109,111,49,19,212,69,42,101,67,96,93,80,221,87,37,47,236,199,136,106,251,236,52,34,165,140,
+197,181,253,91,142,243,12,8,125,2,243,243,119,56,28,30,36,239,96,156,224,122,32,127,213,205,31,201,15,176,115,240,48,208,155,161,242,205,171,21,34,32,224,133,28,20,27,58,221,168,15,209,242,1,24,254,192,95,87,181,149,13,96,246,66,150,211,28,45,253,20,116,188,169,198,10,62,13,244,150,221,164,245,94,181,128,136,172,61,143,76,115,150,121,128,165,216,163,79,17,152,217,208,237,23,109,38,76,195,50,170,228,210,9,47,174,57,104,21,221,174,106,114,37,110,118,233,181,125,161,169,237,45,133,95,51,59,42,247,105,10,183,25,247,199,76,111,73,210,231,122,245,58,169,232,140,250,243,189,70,3,110,151,22,131,98,198,210,27,89,189,124,63,219,28,205,50,203,251,85,169,42,89,25,138,239,99,197,249,36,114,234,229,188,213,196,224,9,89,93,140,33,99,49,138,204,223,24,161,132,109,99,251,142,167,214,100,248,99,53,19,92,132,17,210,236,199,247,15,28,119,108,215,253,187,255,164,89,86,73,39,133,99,38,57,89,252,125,143,186,76,51,139,154,197,230,
+80,180,10,186,102,203,136,74,177,32,172,90,40,90,94,185,32,10,54,42,180,136,122,74,229,53,238,249,16,134,172,73,36,113,197,154,88,255,178,76,141,9,207,21,209,71,222,28,109,177,58,245,31,254,152,94,111,223,81,186,89,170,127,90,132,8,249,126,105,226,183,45,183,133,117,99,229,224,27,209,204,74,95,139,55,207,90,24,217,44,44,165,166,134,219,128,22,228,4,227,254,243,186,48,3,122,182,211,63,230,92,158,242,188,77,90,95,150,173,90,214,214,57,106,121,63,122,85,159,79,75,185,136,249,18,83,111,6,181,112,219,28,96,135,6,130,72,44,159,87,68,209,9,156,37,123,240,59,58,187,61,31,200,32,129,96,239,170,24,79,101,53,242,181,8,29,27,18,2,1,237,51,220,181,35,15,80,250,46,34,190,45,39,252,238,41,18,29,249,41,161,208,254,214,1,18,81,45,71,77,111,201,202,102,85,59,39,89,154,105,41,94,184,81,223,157,86,196,85,154,116,14,16,176,184,89,181,105,115,196,160,221,132,196,155,231,53,146,72,70,132,211,235,135,121,143,
+143,150,191,26,134,185,16,146,74,222,161,223,96,223,91,204,151,124,251,109,51,144,146,41,249,57,236,191,123,169,39,38,136,127,139,124,229,164,247,87,209,86,82,143,85,39,229,89,242,187,27,211,124,203,89,99,173,171,232,87,122,152,104,41,9,105,251,89,118,207,155,238,92,23,3,55,117,17,118,130,202,125,214,202,200,72,215,11,255,236,75,43,42,132,106,114,86,171,19,175,115,233,186,164,60,158,27,149,76,224,155,251,47,168,240,166,23,19,210,2,43,165,35,206,27,247,64,82,246,63,14,72,166,216,83,62,108,145,111,83,36,104,27,176,241,241,185,13,180,120,53,246,75,182,156,139,158,103,25,70,84,103,126,221,190,221,243,190,170,226,224,116,198,213,211,139,14,166,238,124,110,3,60,247,99,9,245,178,75,121,248,188,104,11,230,72,110,37,159,243,135,218,51,181,168,86,142,3,113,56,39,51,167,193,223,122,146,33,50,230,27,239,201,11,143,238,131,51,54,57,31,242,74,155,191,163,202,10,144,158,215,193,54,31,242,211,103,101,45,35,165,23,184,87,4,124,
+154,198,177,216,141,200,8,133,98,62,83,147,151,146,241,105,83,82,254,0,73,97,210,158,88,210,50,182,118,87,76,7,208,237,15,17,121,73,219,68,62,250,32,120,49,182,200,111,223,212,164,107,111,146,157,162,119,108,202,126,65,249,222,26,78,236,8,180,99,50,40,246,47,254,220,1,46,96,18,73,177,55,80,121,84,255,65,46,250,61,24,91,143,32,206,127,34,109,215,217,72,235,126,33,249,189,159,150,63,218,175,235,160,177,30,187,41,69,162,37,193,22,55,108,17,119,1,52,44,198,21,230,210,251,41,128,20,68,249,15,86,76,224,98,165,157,249,173,131,139,166,254,30,219,43,252,134,83,65,51,82,42,158,220,146,104,174,90,235,223,143,237,132,124,35,187,163,241,119,132,154,126,160,100,83,42,248,122,32,84,15,96,174,172,0,169,77,244,167,19,200,191,112,56,83,188,86,92,10,148,141,35,106,253,190,135,180,138,41,177,29,215,5,170,33,48,55,114,223,243,12,121,158,40,8,171,85,58,57,43,54,70,0,200,146,254,175,101,226,155,215,179,242,66,56,12,
+140,210,207,68,85,120,215,52,63,54,190,51,80,194,143,149,186,57,113,141,100,148,109,186,121,168,13,219,53,82,74,111,30,227,199,164,202,173,178,223,42,142,171,202,135,186,247,231,18,212,123,4,43,25,172,21,204,180,93,214,248,27,74,172,140,55,29,7,141,7,147,26,133,101,52,212,214,90,51,37,99,210,35,245,118,246,125,149,29,180,207,135,61,78,45,78,64,239,54,234,17,196,146,218,158,176,72,23,10,60,195,250,89,178,219,69,215,49,143,38,44,197,85,6,254,84,215,85,170,188,226,101,98,69,104,255,36,61,14,69,171,224,139,179,198,172,17,116,181,209,233,163,245,200,228,10,163,163,178,79,230,121,126,79,183,84,147,25,181,248,224,145,133,114,120,124,189,80,56,206,6,116,101,11,100,242,153,34,191,57,179,216,88,124,74,185,212,167,68,226,195,173,203,43,164,84,164,202,157,134,61,10,180,123,246,161,198,3,201,21,184,235,53,97,242,39,228,110,208,27,173,239,175,139,159,227,132,151,47,133,52,79,59,136,170,20,243,24,133,194,171,116,41,87,57,60,
+147,187,41,117,207,143,215,227,125,32,226,160,43,70,223,16,78,93,208,210,116,42,177,240,89,20,20,119,144,194,237,98,205,110,234,108,157,77,126,125,176,148,49,228,3,117,107,65,67,4,97,151,54,132,16,197,213,252,76,185,173,90,150,58,94,242,118,90,251,116,53,121,137,219,240,76,106,47,222,118,109,236,161,130,88,166,180,58,198,34,185,32,109,66,219,4,233,80,235,196,225,168,66,21,201,16,229,153,150,142,193,182,130,239,242,246,44,58,76,49,9,124,126,84,78,153,211,57,151,107,97,193,105,230,183,122,24,78,36,209,251,162,178,154,180,130,199,171,145,255,168,45,21,162,51,245,105,209,220,117,44,111,177,45,188,120,8,222,136,90,235,143,136,29,140,154,72,68,103,131,75,125,59,144,45,100,188,128,243,233,203,10,190,33,128,45,78,182,219,170,202,209,66,113,118,76,30,201,129,221,107,33,34,112,147,247,251,133,37,117,16,61,230,187,233,127,24,98,216,61,132,186,66,109,111,169,178,43,69,145,177,34,19,113,131,197,124,121,177,130,91,18,71,206,200,123,
+224,98,186,84,203,234,22,62,219,41,246,128,27,76,221,232,3,37,171,86,133,115,60,22,144,105,149,220,72,148,79,245,189,84,53,199,26,75,20,204,8,98,218,209,191,130,207,61,224,82,25,223,223,122,95,244,125,41,96,234,135,206,127,207,103,1,199,11,49,41,233,31,128,157,23,78,111,157,236,228,32,184,81,65,86,12,12,88,209,168,238,177,227,44,136,203,156,73,111,71,181,195,252,28,160,84,239,155,140,184,171,63,205,199,89,117,247,65,244,0,123,114,234,4,83,174,134,171,82,95,201,48,17,167,139,141,185,207,13,174,40,244,84,249,149,154,173,144,102,197,215,52,166,218,4,188,49,207,154,17,34,41,123,227,252,187,237,53,199,45,189,67,196,214,173,32,217,100,212,178,45,54,241,204,61,253,108,190,248,158,23,248,187,177,81,156,161,12,85,38,138,154,104,146,89,206,35,241,123,111,94,241,233,139,233,76,60,211,5,227,158,211,12,222,209,182,120,252,190,180,17,110,32,163,205,24,117,151,135,30,115,121,212,202,51,246,76,95,183,98,107,220,19,141,55,198,
+231,133,239,191,187,182,42,53,186,76,25,252,56,57,252,238,72,56,116,202,218,99,198,22,119,212,55,87,158,9,170,181,47,240,135,172,182,38,210,114,245,212,125,229,48,105,144,18,75,117,211,230,126,204,112,27,107,15,234,21,28,130,228,168,127,3,228,85,183,194,148,241,255,200,162,234,88,165,95,137,227,169,12,93,69,77,85,181,111,145,156,205,195,72,197,106,193,237,16,156,153,233,177,43,22,27,223,105,25,30,59,60,139,159,14,73,113,171,218,136,167,202,248,79,90,127,168,33,116,209,44,174,165,211,169,118,7,86,81,126,174,118,66,181,182,201,136,66,138,238,219,72,252,97,192,248,146,71,212,13,86,99,80,14,208,53,67,245,193,37,238,237,31,6,202,98,193,61,190,49,97,213,238,36,138,69,69,38,40,75,221,8,36,226,246,120,52,155,198,197,25,168,41,250,10,237,19,186,234,150,46,178,68,45,5,7,122,71,171,179,167,168,93,108,162,2,171,30,103,60,77,200,105,239,140,15,1,52,251,196,118,77,6,26,58,74,241,193,82,167,120,25,69,244,159,190,
+144,0,67,247,144,64,161,208,148,41,118,175,137,56,7,104,69,60,249,170,61,63,254,116,226,207,150,208,119,39,15,22,227,38,56,42,151,241,7,41,85,3,120,90,44,107,132,93,35,226,16,207,39,19,93,5,230,23,127,135,13,208,82,242,150,230,227,229,247,208,230,116,175,51,227,8,52,182,216,98,186,92,150,167,203,13,168,215,178,184,29,216,91,87,173,253,126,211,18,203,69,94,241,71,180,13,105,124,251,125,87,81,220,194,19,76,125,241,106,210,36,224,227,189,232,4,161,128,107,170,128,137,114,193,114,89,101,231,153,199,59,26,179,172,58,172,116,245,248,112,40,51,170,247,153,241,9,30,11,150,182,57,153,92,28,151,57,69,127,197,243,118,170,76,243,73,225,180,143,52,174,162,133,226,61,212,234,119,48,69,179,136,195,206,31,116,16,168,169,14,111,25,181,24,182,188,69,245,124,143,251,112,71,79,236,75,189,253,130,109,143,25,232,114,150,171,212,41,26,69,190,228,90,110,220,229,23,79,188,199,146,11,204,53,117,193,52,174,12,10,65,72,177,171,9,168,
+124,96,50,40,66,81,117,132,60,5,134,112,209,111,10,56,42,137,221,138,133,240,13,219,35,181,24,230,199,111,60,123,158,176,11,240,219,117,157,119,128,165,127,235,184,164,252,27,147,197,245,46,171,131,209,228,15,215,246,125,154,37,255,151,161,226,209,40,159,169,127,239,56,81,62,81,183,210,234,164,103,161,86,37,167,171,196,149,188,149,54,63,94,80,69,23,45,248,127,75,228,226,196,173,9,95,88,156,163,46,229,200,198,198,187,180,3,68,185,252,186,29,252,254,212,122,150,237,184,141,41,150,27,89,164,193,170,15,69,31,102,219,91,253,142,40,45,94,75,204,243,243,10,210,69,161,154,66,57,19,145,75,194,225,63,117,180,206,89,189,87,252,68,74,164,110,55,76,20,195,222,126,187,148,69,67,100,21,125,250,196,211,102,74,134,104,139,92,4,70,68,71,186,94,81,46,21,90,79,31,221,186,28,78,13,195,75,162,0,209,250,87,242,198,31,103,95,169,226,56,64,246,202,34,247,190,181,211,24,254,38,121,246,35,192,166,186,186,76,48,19,121,65,124,227,207,
+91,4,162,129,86,51,186,196,33,130,94,151,204,171,24,60,65,48,239,6,185,111,209,193,44,76,192,244,34,38,237,129,134,10,46,86,46,7,53,202,159,134,211,95,207,175,226,94,201,156,1,138,123,5,126,74,180,138,95,29,135,17,11,97,30,40,150,244,52,8,248,61,135,140,108,64,78,122,197,210,39,23,173,136,115,146,202,210,217,70,109,157,71,48,214,186,138,238,168,157,182,79,109,6,161,50,251,244,64,17,155,113,83,205,165,255,14,223,112,82,13,198,66,221,216,112,252,108,33,255,44,26,202,250,104,250,245,167,163,14,191,251,39,150,202,5,75,246,58,123,163,32,211,21,248,252,61,121,191,200,232,242,185,163,14,187,196,245,78,145,116,63,48,101,137,179,105,178,152,90,180,220,228,165,72,94,186,54,236,41,97,20,71,147,139,77,79,124,243,183,251,104,78,61,77,9,115,153,16,125,214,236,174,81,150,55,121,255,134,147,247,31,58,220,99,211,54,226,250,44,88,113,46,238,71,106,65,212,84,32,27,221,135,39,224,138,118,233,232,11,191,255,248,240,42,103,
+21,165,66,236,41,132,53,19,12,51,77,10,72,129,249,124,231,222,191,178,231,195,149,127,214,203,52,255,201,141,254,202,72,41,182,206,50,48,187,192,45,127,28,84,217,177,112,164,143,101,191,53,38,17,168,66,178,94,12,98,171,149,18,138,193,119,137,106,178,236,133,7,194,146,92,119,199,184,156,163,15,168,156,34,42,108,33,82,65,69,161,249,124,165,129,172,23,218,69,117,249,210,77,16,252,68,226,161,180,37,170,179,69,219,146,201,197,28,157,193,103,55,82,105,77,36,156,198,168,177,107,195,222,78,92,184,195,196,128,201,149,25,162,254,84,233,106,52,227,146,16,191,132,100,210,235,171,134,110,145,86,125,240,60,160,211,242,111,125,180,15,159,115,113,219,161,255,27,144,171,56,250,179,192,161,147,186,118,234,175,184,183,54,207,30,104,169,165,16,58,173,61,173,181,98,159,5,114,127,246,145,93,91,57,195,182,131,65,37,252,208,88,213,237,178,239,142,61,220,181,36,34,190,155,211,165,194,190,75,217,131,50,39,56,120,64,3,110,137,93,236,173,117,181,41,85,
+61,94,122,131,157,212,104,178,141,88,172,120,115,37,72,93,228,149,37,38,223,158,79,46,236,179,233,228,32,166,108,195,246,145,92,163,40,95,18,62,203,95,50,158,152,65,126,79,140,234,0,156,110,183,211,85,108,239,211,242,239,106,204,139,212,160,112,149,200,246,112,252,41,68,102,254,125,62,41,234,201,63,62,92,83,20,90,35,184,43,87,37,114,135,136,162,126,120,185,109,156,46,147,248,182,220,198,228,90,204,21,7,148,243,224,157,156,117,32,141,77,251,87,1,244,124,235,146,163,255,254,251,79,120,235,146,233,244,108,246,41,27,237,72,133,228,78,202,73,235,104,115,101,231,210,74,50,50,230,138,135,175,191,65,194,54,229,17,143,216,203,121,55,66,98,122,252,207,53,23,55,172,253,235,187,227,44,116,34,208,146,123,126,249,206,175,176,200,253,110,14,171,227,234,5,39,146,160,240,69,170,40,223,26,237,254,235,119,220,43,57,63,255,249,163,117,112,167,62,248,3,204,62,99,210,238,109,239,25,197,92,103,87,98,241,120,95,172,207,34,31,123,127,124,37,238,
+27,249,133,75,75,134,26,75,243,87,143,229,252,123,110,177,156,197,34,244,176,249,219,159,14,74,102,11,34,80,102,202,84,100,85,148,255,57,113,107,47,37,36,122,34,217,122,85,71,105,150,53,126,171,147,117,146,131,124,232,239,106,153,254,147,64,45,206,222,79,242,22,240,118,8,99,69,153,139,255,61,168,113,103,144,135,204,42,138,189,0,84,7,196,138,211,175,159,42,172,143,229,1,162,232,254,4,25,195,239,205,166,236,44,214,57,178,204,104,16,42,226,137,189,21,81,156,41,242,22,151,163,146,217,74,78,74,244,153,70,253,223,121,4,142,67,181,119,13,82,64,113,190,222,80,78,145,17,137,7,182,0,85,43,227,167,236,77,169,180,114,63,92,164,85,205,241,76,85,56,183,238,250,183,122,84,94,202,188,125,65,203,207,121,242,101,237,226,119,81,108,128,170,255,147,43,31,254,123,13,54,227,74,57,197,31,227,106,179,252,226,185,218,49,20,163,147,210,229,226,198,248,7,81,254,91,3,94,250,58,167,200,241,219,159,83,73,97,211,164,222,22,241,247,235,210,
+97,172,248,71,103,251,137,24,69,222,255,3,70,188,102,76,240,166,65,255,250,2,94,91,151,59,137,227,44,129,4,251,218,9,132,23,29,184,92,11,26,15,57,13,31,43,7,236,99,230,161,22,47,96,60,161,3,124,124,87,137,149,39,158,40,83,78,65,202,152,155,242,29,39,72,31,242,175,117,219,88,225,37,235,92,96,130,240,59,24,3,203,251,60,12,9,6,132,161,177,244,30,183,178,244,130,193,74,115,12,63,57,53,219,101,110,168,40,186,186,20,55,227,63,190,94,90,114,208,20,37,6,143,192,21,76,221,252,167,243,200,38,35,90,35,52,153,249,52,33,98,55,168,100,131,47,44,166,19,60,221,112,170,164,216,29,134,232,90,177,227,243,150,36,138,61,225,94,203,51,137,236,180,92,182,230,143,242,81,224,182,121,234,236,241,255,119,156,162,0,71,54,147,167,249,146,253,158,24,139,84,33,105,44,113,160,253,1,207,144,83,240,233,79,38,174,182,66,167,149,190,167,235,184,74,66,7,139,100,191,133,54,183,19,89,81,7,237,234,25,40,238,211,8,93,213,
+251,95,222,144,208,188,11,52,52,7,129,33,221,238,40,37,219,69,113,84,231,78,84,147,124,72,149,92,59,135,105,38,133,237,0,65,61,203,177,160,45,124,131,150,255,41,71,52,215,115,8,60,218,166,158,65,61,233,142,254,243,23,116,71,180,224,188,81,207,120,57,116,233,223,102,248,165,96,85,37,139,196,225,74,21,41,43,249,250,80,166,151,137,127,14,181,14,36,90,84,253,231,153,219,231,89,246,0,120,59,208,90,177,153,99,70,214,161,86,109,171,75,123,123,124,10,5,42,235,208,227,255,96,228,184,143,198,227,234,219,43,58,34,56,18,10,76,121,12,212,106,207,107,55,141,153,145,83,30,19,74,249,167,136,121,229,104,243,194,93,31,230,91,27,84,201,143,163,100,87,53,140,51,178,243,247,127,113,159,26,45,86,48,31,60,169,17,166,211,159,170,153,152,38,238,244,125,93,177,62,14,147,193,158,72,212,248,134,174,5,27,149,55,91,102,44,117,221,183,78,231,242,209,71,7,145,135,242,194,253,75,96,112,14,237,41,69,213,82,133,2,81,43,157,45,74,
+8,119,100,160,111,19,194,224,231,166,154,243,169,2,110,215,215,7,19,100,155,190,73,144,60,61,107,235,102,225,144,8,13,189,72,31,24,175,22,237,88,241,222,15,160,84,187,230,3,75,219,84,77,159,168,166,159,56,155,124,90,79,255,164,251,242,212,77,127,67,124,220,198,248,0,103,197,153,5,252,254,158,215,220,169,60,34,203,16,83,69,172,201,252,25,232,49,61,92,249,221,162,138,204,62,252,191,176,50,187,209,210,101,86,180,131,168,188,56,142,220,138,107,232,250,191,219,181,255,127,222,191,114,167,180,32,254,26,244,253,69,227,122,137,223,143,217,125,145,8,115,80,167,220,243,183,74,126,245,85,106,100,59,36,197,211,127,103,11,235,133,115,64,176,11,117,215,47,79,217,199,206,171,196,139,240,3,122,73,141,53,108,179,198,63,236,154,115,164,248,191,247,159,139,210,74,133,156,18,227,78,87,187,123,182,236,146,161,48,228,50,229,31,108,182,150,150,18,175,4,126,199,203,7,24,119,182,77,29,251,139,168,110,159,214,139,120,188,177,30,103,28,160,165,251,246,
+103,224,97,210,11,119,226,106,229,29,221,38,113,208,162,21,90,245,167,55,115,231,99,197,33,105,200,46,56,220,142,216,191,122,50,245,247,32,2,241,85,97,167,39,215,138,191,171,246,50,66,97,7,222,56,158,209,248,112,255,191,243,155,3,123,33,19,15,57,232,82,21,59,152,130,20,158,127,13,39,225,111,147,229,111,249,135,178,19,235,253,45,238,62,49,22,220,29,222,118,32,158,222,103,71,152,6,125,2,81,11,51,169,206,245,145,31,26,149,105,26,45,183,188,205,29,130,47,22,46,152,147,56,56,157,184,231,64,178,29,186,98,191,234,201,173,119,155,249,111,109,89,56,182,108,167,188,83,133,138,130,116,171,166,80,188,121,139,146,147,166,99,210,213,169,220,231,195,171,245,250,97,7,19,137,4,33,80,187,235,166,14,91,189,235,214,48,150,197,188,198,231,179,220,49,100,123,93,149,230,38,51,228,211,31,111,226,203,238,148,47,253,165,88,156,176,95,16,158,111,124,246,196,194,34,118,201,95,177,96,142,218,5,235,154,197,213,106,45,239,227,89,148,73,245,246,
+148,10,247,26,227,41,155,203,76,34,198,254,76,26,107,8,87,75,167,250,187,194,27,150,191,110,138,135,68,108,123,235,185,15,144,95,120,24,96,141,22,109,48,137,118,226,125,121,129,115,210,123,100,119,63,234,67,68,64,187,101,42,98,101,151,132,240,228,234,162,88,30,107,38,46,57,51,251,68,52,46,204,74,143,190,77,171,12,170,244,1,36,39,249,218,248,175,162,165,122,73,92,35,235,138,106,174,234,186,193,154,243,237,38,69,182,177,56,99,67,50,130,91,114,177,67,252,115,250,230,115,143,171,165,156,111,189,6,39,177,1,109,131,160,149,138,99,130,139,163,111,151,197,248,222,203,122,255,86,60,141,201,118,100,125,120,215,84,128,198,238,2,117,23,205,189,136,86,151,252,191,253,183,190,217,250,222,65,159,221,85,95,231,218,51,103,59,152,101,166,98,198,219,9,178,225,77,206,248,37,178,172,168,82,238,57,121,180,137,143,27,110,206,39,139,20,82,141,65,150,92,116,207,44,217,244,55,12,156,39,239,87,198,127,145,129,33,48,49,203,142,193,191,120,231,10,
+103,70,230,121,27,227,131,243,148,30,32,86,38,57,250,217,250,116,166,222,148,156,112,222,21,245,130,86,252,172,255,112,200,130,129,126,216,117,134,42,220,28,157,58,171,78,234,201,251,109,116,86,168,92,226,207,44,160,118,29,164,54,228,153,118,71,121,231,106,71,183,137,169,61,28,153,208,90,46,218,53,168,240,254,88,82,204,186,179,103,193,249,241,70,159,170,167,124,209,7,246,102,148,171,173,97,93,41,109,193,88,156,133,83,238,8,59,236,249,59,26,127,30,209,214,77,145,58,159,250,41,238,222,118,144,130,187,245,238,110,137,6,53,20,90,17,75,15,74,64,231,78,56,117,94,103,79,62,102,126,122,101,201,157,162,203,109,196,44,227,122,139,197,145,5,118,44,175,128,235,33,154,122,236,116,94,205,175,108,147,84,214,87,68,250,19,186,219,166,40,202,16,105,128,43,200,208,117,10,251,139,180,193,195,207,177,164,130,64,123,137,210,215,111,90,215,127,49,126,124,60,157,13,115,29,178,61,238,44,152,9,245,138,219,188,43,149,207,144,254,141,70,162,83,117,104,
+240,150,54,107,112,152,136,135,110,146,112,218,86,7,10,31,116,231,235,225,137,188,143,185,140,175,5,198,100,50,243,199,167,29,132,158,197,131,203,213,27,105,221,114,129,55,21,111,241,198,52,146,33,76,147,211,68,166,226,226,211,114,176,235,173,160,133,86,33,210,169,127,38,117,55,155,103,100,73,154,97,229,54,44,120,215,26,129,157,67,155,177,146,246,38,91,57,30,163,170,13,34,27,88,204,103,101,76,5,180,3,64,186,167,203,111,105,65,140,106,87,124,133,27,168,68,203,119,69,156,14,204,170,141,155,168,49,213,167,192,209,238,134,205,72,185,175,152,253,168,133,127,180,114,254,47,234,209,210,5,83,235,218,74,51,229,56,172,240,59,184,139,40,231,186,72,200,217,127,239,3,115,115,184,90,8,198,5,220,59,144,37,153,23,12,137,50,60,54,165,110,72,238,178,205,235,66,90,233,6,189,74,62,187,248,91,19,170,167,239,165,156,115,200,207,194,229,215,37,127,186,34,134,246,58,226,109,12,254,203,214,174,164,20,177,182,252,214,166,143,206,212,235,117,125,248,
+63,236,188,249,115,106,121,118,39,248,175,188,112,71,56,202,29,118,121,38,194,179,68,185,187,167,203,30,119,119,69,219,30,199,216,29,243,131,163,194,249,170,242,217,149,225,170,204,156,124,153,93,83,211,238,8,132,4,72,44,146,46,2,129,144,216,47,18,32,177,136,69,8,16,155,196,114,65,66,160,11,18,18,136,85,32,118,33,33,22,177,207,247,222,251,94,238,158,152,158,137,233,152,136,233,252,133,76,238,247,236,231,124,206,57,95,174,82,119,199,121,161,245,118,110,165,246,203,220,69,227,120,82,205,109,182,59,179,199,58,26,230,12,66,78,244,241,54,75,99,54,226,217,84,220,204,56,87,47,77,29,252,211,251,73,11,86,81,26,23,218,145,247,22,109,36,91,19,67,116,200,193,240,161,32,171,170,55,170,215,62,36,96,60,21,154,80,113,108,151,4,157,103,218,188,251,129,205,22,72,146,32,181,169,254,112,134,48,236,130,61,185,102,3,148,247,106,230,24,145,28,143,16,6,148,65,212,45,118,90,123,156,118,151,244,104,108,225,188,56,45,174,219,77,177,214,
+17,116,53,116,162,80,106,251,170,10,223,44,161,211,248,100,76,87,186,170,16,94,205,76,117,97,76,12,178,93,139,139,165,153,135,108,174,85,27,171,3,112,104,121,49,18,103,42,183,14,108,21,152,27,179,100,27,126,153,6,190,3,26,62,174,26,112,4,179,7,151,0,130,185,197,66,23,42,222,219,187,188,155,219,162,200,155,164,121,121,235,114,123,89,91,47,25,185,189,203,229,118,29,108,56,42,72,159,2,116,81,156,238,226,56,59,232,115,150,207,159,123,55,172,115,129,106,62,40,232,149,211,225,189,109,231,129,33,15,195,193,128,232,81,178,40,45,230,10,176,129,83,181,52,45,105,35,106,9,204,67,201,165,121,227,93,94,178,130,57,72,188,172,216,130,200,76,255,92,242,81,143,238,86,39,107,232,102,252,172,94,182,147,165,11,215,76,127,82,248,110,124,135,145,16,234,31,94,103,204,171,22,154,28,107,57,231,139,42,54,130,100,247,183,224,151,251,178,95,0,70,248,227,187,21,51,69,233,82,81,161,131,105,77,84,144,130,37,99,200,120,190,16,99,3,49,
+59,47,185,240,251,213,186,128,173,102,27,215,80,125,119,158,26,118,20,238,89,242,230,169,157,69,226,70,55,171,148,235,150,153,76,34,41,199,133,213,89,146,177,15,13,206,39,39,206,142,177,167,27,128,126,216,224,70,19,35,229,13,91,224,79,238,15,199,135,210,146,204,9,57,238,228,205,129,108,193,77,34,181,54,226,22,244,225,145,9,245,138,91,199,123,72,208,34,119,58,246,95,80,192,236,216,237,165,35,198,216,30,197,85,63,118,77,45,238,152,226,110,155,50,216,238,175,169,249,2,85,181,23,223,177,248,73,116,18,233,146,207,23,60,87,97,175,190,13,228,121,42,195,65,216,176,210,20,104,86,205,49,223,125,231,1,77,34,198,150,252,9,209,24,249,125,70,121,180,16,23,116,171,44,40,71,38,185,185,212,75,166,59,62,149,87,125,114,174,56,241,242,226,140,169,253,243,106,213,2,95,85,221,63,169,197,54,229,20,18,201,173,102,238,241,171,149,52,21,209,180,238,231,175,77,69,116,192,58,178,171,69,91,1,5,124,165,140,180,46,152,28,18,73,173,87,
+54,123,78,84,102,97,111,91,15,66,14,165,19,26,178,77,254,155,193,101,38,163,181,174,198,57,137,102,144,85,191,16,103,248,42,210,35,41,158,143,54,141,61,107,123,51,200,114,78,84,227,145,209,114,84,114,104,206,215,234,186,228,238,2,151,183,122,143,153,143,30,225,230,223,34,110,108,104,187,95,162,138,116,169,128,46,190,179,43,78,93,175,244,60,72,144,129,123,9,37,137,136,99,177,153,46,18,113,237,196,79,88,75,97,198,181,25,205,80,204,59,90,223,100,120,247,4,147,72,81,202,156,116,23,10,41,65,199,59,185,221,155,142,214,134,44,133,254,69,85,85,0,27,23,49,35,213,76,117,131,175,66,192,130,1,179,82,132,158,171,64,207,92,4,25,109,57,75,116,136,253,16,88,4,188,48,86,60,202,156,35,209,44,187,246,239,57,51,122,118,167,229,108,26,40,219,16,189,176,185,240,194,239,86,39,70,146,31,4,132,171,55,175,160,28,178,95,92,167,131,157,163,180,28,111,194,203,164,41,25,2,62,63,14,115,244,232,192,122,101,187,184,65,2,231,208,
+213,186,248,224,118,235,69,143,122,42,71,64,42,41,126,232,189,145,11,71,212,241,101,181,220,236,150,145,238,10,77,35,99,63,44,143,87,249,170,142,8,248,250,136,84,59,38,67,212,170,68,126,233,146,61,195,36,154,8,103,27,238,22,5,213,227,102,214,28,210,189,220,140,36,253,181,120,49,204,31,116,93,150,208,99,219,98,73,250,38,126,91,88,191,236,167,11,31,105,152,193,2,126,200,130,250,250,11,95,237,31,51,98,255,128,19,235,12,102,220,85,124,48,147,47,194,93,18,116,44,47,123,144,57,146,100,251,76,45,80,141,253,40,51,9,118,98,105,44,7,75,128,47,214,14,152,166,37,47,2,74,108,72,194,237,54,231,107,75,196,239,27,45,10,59,233,71,230,142,40,124,92,156,222,80,66,245,207,55,163,1,107,14,46,60,21,10,50,115,78,93,50,95,102,144,12,93,161,187,24,21,219,45,209,197,164,22,48,44,251,143,233,66,92,195,129,64,153,199,254,160,198,191,102,244,78,119,216,174,43,0,43,103,92,221,69,70,45,212,24,156,181,221,141,251,118,
+14,142,14,244,124,172,78,150,216,254,11,193,112,50,157,58,20,189,193,218,170,127,158,115,33,50,109,67,208,149,195,195,20,20,224,232,188,30,245,98,199,98,114,110,50,104,175,186,60,136,148,242,156,195,194,185,118,124,201,228,20,245,104,37,71,184,127,97,203,7,202,146,163,250,82,143,153,64,255,162,158,52,2,246,173,66,36,159,120,153,51,201,128,67,164,207,185,57,156,154,235,170,222,112,102,123,42,14,83,197,177,162,76,142,141,238,198,253,112,113,76,197,46,149,2,37,121,187,180,204,145,83,180,100,41,30,37,142,57,133,90,91,8,111,122,117,230,156,45,155,92,177,237,111,199,245,86,174,185,134,239,114,176,7,216,134,153,198,95,146,203,195,3,101,44,50,141,36,203,179,160,19,30,183,212,215,189,147,70,173,185,28,177,0,211,36,196,177,37,102,12,251,25,212,63,205,95,57,249,105,151,225,114,116,77,137,231,57,130,251,37,237,19,11,232,181,242,78,175,139,16,82,178,176,175,246,209,84,156,89,209,66,235,97,169,199,70,6,105,65,59,36,226,148,223,135,
+243,62,249,229,6,212,232,206,244,39,192,80,50,225,38,110,149,248,115,199,56,249,170,70,137,201,187,207,169,28,246,20,123,136,187,161,78,213,185,160,248,222,249,89,244,172,216,53,141,146,227,230,117,162,121,89,111,244,33,50,11,120,247,136,95,193,188,235,213,66,47,78,208,119,64,92,135,107,196,31,74,157,39,106,107,220,94,170,210,60,213,211,160,227,178,103,17,207,54,88,190,152,102,31,61,251,133,114,67,216,225,116,205,68,168,99,247,153,191,28,89,188,215,120,8,177,8,16,187,237,87,203,209,151,86,101,229,255,70,60,119,177,120,142,158,159,4,48,3,207,35,28,111,151,232,98,58,190,255,132,252,115,161,45,149,159,158,126,151,191,202,252,8,110,183,247,228,6,232,20,140,133,26,103,195,42,176,62,230,49,186,67,156,206,224,31,218,250,172,1,26,73,174,212,207,161,218,74,202,23,82,164,177,178,254,82,15,37,69,206,138,249,213,83,178,247,30,43,11,249,25,81,22,168,125,107,197,80,154,237,77,234,171,246,160,97,251,236,200,56,20,167,14,7,155,41,
+83,243,98,210,156,251,170,254,142,207,176,11,47,254,192,112,51,202,117,38,227,237,53,85,73,38,191,212,109,176,238,195,107,7,78,65,97,30,38,18,166,12,140,0,99,46,228,49,249,228,221,188,210,187,254,46,74,8,94,173,141,132,27,17,110,208,246,209,138,132,208,203,107,241,245,161,117,7,20,191,204,192,230,70,2,73,175,110,44,236,127,21,47,95,68,158,60,109,193,92,198,218,237,218,218,77,34,22,19,28,170,117,197,22,59,161,236,50,227,78,203,174,71,179,73,194,162,134,204,21,128,142,33,126,181,104,41,22,189,123,158,199,82,100,244,194,29,22,75,234,218,120,233,170,218,40,37,45,143,120,120,145,133,57,226,224,172,214,29,128,214,127,239,9,95,10,88,168,223,56,47,212,178,102,160,22,142,177,98,0,181,112,19,71,74,216,138,178,24,193,211,71,181,128,169,195,149,83,200,27,88,54,251,233,135,32,155,231,160,36,89,36,167,156,207,131,218,210,131,226,226,87,91,96,13,142,225,4,47,184,254,139,80,228,129,4,173,131,200,211,240,83,238,240,67,14,
+62,112,3,159,28,19,233,178,61,245,11,6,189,157,51,11,199,115,83,184,207,82,45,115,4,123,208,167,204,249,34,236,121,36,37,78,184,27,118,181,153,166,19,132,143,100,126,122,158,72,35,65,7,131,167,144,139,94,188,8,242,243,50,218,19,179,13,6,122,75,66,206,121,182,4,31,68,163,86,51,157,161,99,6,87,240,232,9,54,216,242,48,61,175,61,91,31,12,138,15,20,43,183,200,200,40,42,84,223,87,184,143,120,231,159,97,95,155,63,76,158,95,94,53,96,229,254,145,127,95,174,150,108,39,85,62,60,130,57,76,219,243,48,180,183,206,141,222,120,193,18,184,33,167,40,201,132,31,46,10,35,36,80,234,74,29,114,141,154,198,2,37,23,95,144,55,48,37,43,117,163,175,231,19,55,66,220,211,133,135,84,161,59,118,214,23,87,114,20,204,195,254,218,49,130,156,140,178,156,128,237,138,61,112,162,126,18,72,13,160,234,222,246,25,43,190,174,25,203,95,148,87,152,35,87,137,52,73,201,252,73,199,87,255,189,224,95,168,49,112,79,61,210,137,64,28,
+145,137,64,60,2,31,99,46,126,159,119,139,209,53,190,74,243,149,157,131,5,187,191,118,87,174,47,150,136,184,142,49,110,42,232,170,212,159,192,224,192,221,59,188,241,55,252,130,202,164,178,54,36,65,92,151,45,43,102,65,21,45,6,83,68,221,0,223,103,128,243,183,193,252,158,127,201,71,125,10,171,171,183,170,126,145,94,196,229,80,98,14,63,119,139,157,67,204,104,149,50,186,17,201,195,73,118,14,114,172,3,223,179,132,190,146,177,175,74,46,20,8,253,221,152,254,210,141,42,217,33,240,215,192,72,109,43,82,243,115,208,246,125,59,204,184,143,6,206,23,143,213,202,147,208,215,234,37,186,36,111,54,150,77,22,163,104,223,92,228,93,106,160,125,202,87,122,85,114,203,123,38,233,104,26,137,37,210,77,243,105,57,164,105,45,128,48,45,130,124,218,3,97,58,219,82,157,61,134,120,167,51,67,176,66,194,130,177,18,21,230,137,116,71,148,88,48,2,73,199,2,225,22,48,215,96,110,57,134,222,247,135,85,82,141,44,55,83,190,196,49,163,192,141,124,29,
+31,244,122,52,133,1,89,244,93,59,240,196,215,113,74,95,188,239,159,154,184,146,88,202,52,89,34,211,191,252,94,17,239,203,164,131,182,63,61,31,21,181,211,234,236,92,79,177,168,6,60,252,56,26,162,89,217,83,116,85,25,25,108,175,157,90,48,186,216,173,252,50,66,171,139,31,150,169,78,131,51,175,71,55,48,45,91,135,149,222,34,103,103,188,86,74,89,157,11,30,10,4,249,31,105,179,173,187,149,195,115,123,43,97,97,114,253,57,57,193,238,233,130,96,119,186,129,179,99,251,31,108,210,241,238,97,129,174,18,211,47,111,227,227,92,178,114,113,82,156,190,40,161,130,197,31,91,65,151,165,120,116,106,118,229,178,128,92,82,101,139,119,131,3,157,39,122,113,198,220,170,94,1,216,80,230,117,65,13,167,201,29,153,23,125,37,238,154,233,114,112,196,193,19,48,50,92,158,167,186,7,33,166,229,198,217,60,93,141,71,77,250,64,178,56,109,199,219,181,118,44,139,48,182,182,19,32,170,106,229,241,142,2,247,131,52,222,223,50,45,132,98,101,103,176,221,
+204,146,37,169,99,179,21,141,11,228,91,86,84,158,168,60,231,165,203,28,247,220,119,245,40,56,70,72,169,171,42,37,21,44,83,255,114,148,9,240,233,250,117,38,224,213,193,152,1,94,99,140,153,76,19,233,39,105,119,206,10,199,222,151,204,130,219,242,196,211,233,96,207,65,90,230,171,246,129,239,48,215,173,0,223,1,215,249,158,181,144,179,23,177,215,74,83,39,218,62,236,10,87,47,84,120,38,220,169,136,131,162,49,113,176,68,41,194,167,29,166,73,153,6,129,94,247,32,232,36,224,57,145,28,149,88,155,123,89,44,132,55,99,3,202,3,253,208,1,170,207,121,39,145,94,129,240,134,215,91,163,85,246,2,23,43,68,3,74,4,174,81,33,2,55,143,49,165,0,52,224,1,135,51,253,181,168,157,48,212,95,196,13,157,139,65,73,138,156,178,60,31,131,134,231,164,104,43,57,71,28,231,73,137,227,246,236,197,106,227,122,235,178,185,91,242,232,248,242,230,190,140,175,2,154,85,244,219,64,136,73,95,176,195,9,209,152,252,95,190,255,127,252,253,50,246,
+125,85,64,162,46,71,177,48,183,205,172,78,62,227,58,65,44,167,0,4,104,30,164,50,217,17,176,211,155,39,112,167,177,220,41,28,75,84,28,113,42,195,191,71,36,35,16,37,16,91,4,143,22,139,153,120,57,231,90,188,102,121,224,217,113,180,207,175,174,164,61,72,147,12,56,220,120,144,201,206,28,148,141,88,219,212,195,251,142,19,226,89,168,64,60,31,34,196,243,215,8,181,18,147,204,106,130,121,222,111,251,0,80,56,168,114,179,155,1,224,143,42,239,238,11,169,254,113,57,180,169,43,8,46,6,153,12,63,193,52,5,114,112,207,211,67,164,39,32,19,99,52,247,98,235,118,112,114,219,48,218,178,167,155,243,16,171,199,103,198,181,124,21,179,3,62,251,2,254,218,147,112,183,181,88,247,75,203,163,193,157,30,21,237,204,19,137,7,214,253,225,249,188,220,105,120,46,177,158,194,149,241,170,174,5,214,250,59,189,0,181,3,164,2,64,132,102,171,57,111,95,219,61,146,106,55,132,173,210,60,203,131,96,38,191,207,231,35,96,51,102,178,3,216,140,153,
+220,0,54,99,38,135,113,175,77,118,38,192,102,204,100,38,176,25,51,121,9,216,140,153,188,1,108,198,76,174,2,155,49,147,117,192,102,204,228,5,96,51,102,50,19,216,140,153,60,2,54,99,38,219,128,205,152,201,102,96,51,102,178,11,216,140,153,156,3,54,99,38,63,0,155,49,147,115,192,102,204,100,62,176,25,51,121,9,216,140,153,108,3,54,99,38,219,176,98,3,38,47,170,124,164,202,114,51,187,70,150,144,49,137,122,220,203,194,74,20,233,53,151,215,172,168,250,28,104,107,253,255,174,159,12,219,9,68,108,47,167,37,252,170,245,235,121,61,76,16,9,116,138,159,186,207,240,145,172,148,217,121,230,175,86,125,255,191,204,51,43,238,63,14,42,90,32,61,96,149,93,1,77,24,147,120,8,68,102,151,168,197,221,196,189,126,67,222,236,112,6,119,252,255,82,143,255,201,245,200,89,199,150,2,180,141,205,33,152,71,171,73,76,57,160,155,19,83,14,232,246,255,22,62,150,240,244,222,131,4,236,24,240,203,165,62,132,102,85,138,69,82,250,78,138,77,
+37,74,86,201,84,233,72,21,100,104,147,220,2,225,88,99,5,130,218,112,222,16,72,238,84,219,126,48,177,220,121,245,40,147,227,94,99,238,199,9,160,96,183,8,160,48,221,225,64,81,232,194,36,193,247,197,209,7,226,8,38,161,40,115,225,155,254,24,18,254,80,238,176,76,221,200,210,128,175,192,46,43,128,197,25,34,28,94,17,17,14,62,187,186,178,81,135,155,22,40,106,252,94,187,20,152,93,254,0,50,184,131,118,198,207,1,198,30,60,31,181,37,104,178,197,231,126,115,200,128,6,183,47,236,128,163,155,8,170,55,151,249,208,9,230,87,214,247,250,149,165,122,128,173,54,65,46,15,166,254,206,242,119,241,176,6,204,148,183,224,39,121,144,189,183,40,100,181,86,238,43,21,191,142,194,71,192,86,46,156,255,110,126,71,128,113,149,205,106,65,39,123,162,62,29,31,109,243,52,114,173,64,85,49,232,253,244,168,0,100,244,25,193,126,113,129,96,175,239,226,236,131,131,40,187,197,103,178,76,211,140,93,38,103,67,212,112,64,173,74,90,247,81,210,88,157,
+195,17,124,14,247,174,209,102,199,189,219,227,31,202,229,44,218,154,44,175,242,35,114,170,54,180,133,235,179,240,93,125,104,64,31,254,70,245,216,204,111,95,184,209,11,73,2,57,135,182,21,212,13,74,196,17,236,151,196,149,80,99,227,182,204,153,221,145,225,83,190,202,221,253,78,221,60,227,117,3,65,221,140,131,49,126,56,211,221,110,148,225,118,216,147,201,238,14,84,108,65,157,238,96,154,20,18,85,151,47,81,185,151,190,47,175,87,71,103,75,242,176,161,191,45,43,57,106,98,166,209,128,14,206,246,218,145,198,201,134,196,13,246,25,146,113,232,198,19,90,156,37,18,90,238,36,18,90,171,96,118,250,249,85,88,180,143,206,181,215,194,158,147,57,136,202,189,247,222,121,214,120,114,74,133,201,156,139,247,67,42,178,187,47,171,140,192,68,185,237,23,15,71,55,59,166,235,128,235,142,18,175,191,152,5,123,85,189,90,50,184,44,88,97,82,119,14,64,5,171,195,105,38,183,182,159,45,112,243,60,120,117,235,90,194,179,59,196,71,170,106,121,75,110,222,210,
+203,133,74,87,128,147,158,91,27,173,1,1,212,59,38,145,240,29,12,125,168,75,208,180,0,79,164,11,80,200,82,60,131,150,85,15,47,164,43,117,117,15,164,140,95,68,28,172,10,137,131,14,8,28,244,196,145,33,23,112,229,22,189,164,70,218,0,204,220,248,54,191,117,236,88,22,89,19,36,206,166,33,103,119,211,221,145,226,123,192,251,58,179,17,199,10,43,224,24,130,148,116,92,86,53,61,159,94,242,27,176,189,11,84,84,3,143,114,65,224,205,23,96,126,117,22,45,238,163,209,57,176,121,188,199,197,194,115,169,126,160,77,132,158,18,44,63,29,120,96,144,36,22,227,11,252,233,115,233,16,127,154,96,197,193,211,11,31,82,18,175,41,85,61,27,227,59,252,23,8,254,202,97,25,94,51,238,36,111,217,172,125,253,17,87,80,223,60,152,39,54,180,119,249,226,195,242,101,219,79,167,65,61,26,219,175,238,84,58,15,213,43,95,233,76,152,45,45,183,118,232,95,242,221,194,248,38,26,183,9,45,87,183,201,228,212,90,242,5,232,92,24,147,74,201,254,
+117,155,9,117,46,136,31,240,141,107,80,35,0,154,166,187,57,188,221,205,90,192,178,16,167,169,32,170,156,189,124,126,126,238,223,125,148,239,114,119,106,141,155,11,142,70,204,76,208,228,78,74,209,206,22,148,214,68,70,139,39,200,108,28,142,109,129,77,155,101,240,60,94,198,205,30,42,9,179,89,133,167,176,126,31,101,154,80,23,103,31,93,227,85,46,231,47,242,204,231,140,48,185,66,213,10,108,22,157,182,152,15,123,47,24,116,8,243,27,80,249,174,75,20,212,54,240,5,230,10,61,240,69,19,14,46,232,84,2,201,53,82,122,102,235,189,200,220,214,63,118,78,149,88,105,202,93,198,114,236,124,103,112,68,145,220,137,124,79,245,64,125,247,104,9,98,147,227,24,32,113,57,103,11,18,6,88,137,91,96,25,21,55,216,176,172,115,126,202,112,222,112,230,174,245,104,85,122,57,136,14,177,11,150,21,102,19,236,201,229,74,226,222,171,119,136,229,220,20,223,232,181,90,47,203,247,13,5,104,202,251,92,86,103,190,97,113,81,40,126,129,81,112,84,115,217,
+216,17,248,96,206,52,15,4,136,8,92,93,160,203,125,136,84,19,226,23,170,252,113,45,19,186,45,9,238,131,206,28,99,7,217,196,205,252,18,55,82,100,144,192,209,245,210,62,211,228,119,46,9,106,130,150,122,238,46,97,162,22,137,99,194,107,226,24,232,147,216,177,75,230,42,126,203,121,244,37,62,151,50,171,24,238,31,220,16,215,2,229,247,253,138,7,202,59,7,48,86,106,162,124,163,207,5,112,237,228,62,25,208,14,155,56,222,247,71,1,129,35,252,71,128,107,128,81,178,67,33,6,210,247,113,244,120,144,125,180,194,96,122,226,196,32,251,190,110,248,173,69,63,29,58,78,213,114,196,0,60,37,224,179,37,1,240,137,181,178,165,36,62,198,210,249,66,162,81,31,224,214,64,133,53,96,13,214,224,13,40,209,224,81,61,222,224,153,183,152,49,192,150,77,50,49,24,140,118,136,193,128,141,25,3,108,89,168,17,3,197,251,124,85,98,198,0,91,76,196,248,148,231,232,137,134,75,75,227,13,55,231,129,123,23,155,42,169,147,9,156,41,168,32,61,184,
+185,108,44,63,195,19,213,102,204,140,205,209,52,48,223,248,246,139,107,117,52,159,131,51,81,247,60,222,86,245,168,153,201,73,22,72,80,18,161,200,21,19,108,126,161,16,129,229,16,226,176,247,25,46,65,49,70,134,56,213,87,246,178,112,42,138,156,141,83,81,88,43,204,119,14,199,169,248,170,107,156,42,7,139,112,170,219,129,18,167,74,22,78,112,42,197,164,136,83,49,95,228,4,21,114,129,83,93,110,105,205,232,149,203,188,216,57,147,243,85,9,16,121,14,238,45,142,220,130,123,75,198,183,26,82,22,244,96,68,221,56,162,253,103,241,51,172,39,128,104,30,75,26,144,51,203,88,210,0,71,114,3,137,205,177,145,43,63,11,167,39,214,17,164,43,151,11,20,14,16,12,155,8,193,86,38,33,88,215,44,80,160,218,3,227,140,167,131,177,142,228,32,196,231,150,8,241,181,101,158,25,10,201,212,58,171,183,216,10,213,141,138,103,150,233,42,15,183,5,5,183,64,24,22,105,85,225,243,249,4,150,234,251,28,25,169,67,59,208,141,61,81,160,128,98,225,
+25,170,41,235,234,35,89,133,45,148,135,51,155,30,75,229,180,51,167,75,158,236,137,128,18,94,222,196,220,124,102,175,153,207,55,148,104,38,237,172,216,12,113,11,139,131,45,84,15,216,22,86,218,131,54,239,5,101,114,18,137,213,20,44,67,239,114,36,113,95,71,231,10,192,214,14,102,108,56,58,148,93,57,145,229,231,152,187,50,32,6,178,126,210,23,71,230,207,206,200,101,201,126,32,41,227,235,1,108,98,1,136,251,199,9,166,166,85,146,51,138,122,76,4,140,79,141,170,52,187,195,236,72,28,30,211,153,178,4,223,24,184,44,182,41,119,57,138,146,228,196,212,150,96,10,1,13,70,34,195,212,2,36,40,160,57,99,117,36,59,19,181,227,214,96,57,239,76,228,220,37,174,81,94,12,110,144,86,229,93,177,146,74,8,10,148,8,65,8,49,158,170,214,211,47,212,49,8,185,145,192,137,251,92,101,178,155,133,105,86,127,85,130,207,97,102,48,223,26,122,35,228,12,140,169,57,136,175,218,32,142,85,244,196,177,234,29,113,204,67,69,154,199,91,160,224,
+229,68,63,77,63,24,77,78,174,142,125,82,189,53,69,177,201,242,50,64,20,254,228,132,40,252,108,75,32,237,106,198,144,115,235,126,123,14,76,234,79,248,118,194,56,85,250,67,72,23,212,202,12,3,7,112,4,59,131,29,97,180,137,5,166,110,102,20,144,109,248,4,204,221,14,9,200,5,142,249,164,158,26,200,172,214,179,240,60,54,215,176,71,103,36,185,153,238,23,132,134,27,204,56,67,208,6,186,96,170,156,3,93,48,85,150,177,41,151,169,71,29,187,57,24,22,123,16,30,206,197,124,162,192,185,156,129,116,193,184,140,206,110,49,46,70,0,133,201,212,114,117,97,153,226,151,119,201,152,11,109,76,194,241,94,11,225,248,198,254,60,51,174,62,175,141,3,187,52,212,156,145,176,215,106,12,172,50,203,204,23,237,70,50,27,34,243,130,249,7,129,178,229,197,182,32,80,161,189,203,173,203,21,59,173,109,95,183,91,176,87,183,98,244,69,242,114,143,42,116,71,179,122,84,167,84,108,129,29,0,67,164,104,28,40,185,123,184,27,21,247,86,74,123,41,186,
+138,56,22,125,196,142,45,82,139,39,182,50,146,6,51,139,121,176,149,243,234,238,143,194,160,29,13,249,57,248,241,234,233,202,181,119,122,157,143,204,140,72,219,91,216,174,151,54,101,15,33,254,156,16,23,80,121,143,223,18,12,191,247,221,200,147,166,112,225,34,159,233,88,153,114,194,164,188,115,245,7,151,130,195,99,111,225,26,174,123,5,208,126,236,120,185,90,220,57,100,3,28,103,124,3,199,149,152,122,202,142,252,116,181,163,178,111,113,94,66,229,139,171,237,160,48,116,210,160,108,184,54,42,15,230,237,71,141,56,125,112,92,128,175,244,3,233,242,118,132,169,232,41,43,180,110,54,177,107,71,194,231,21,183,31,211,38,231,165,246,9,96,80,226,218,104,208,73,18,97,132,234,156,248,198,210,88,121,87,207,60,200,15,170,93,245,109,157,102,181,104,47,189,90,168,230,125,112,30,80,45,118,169,109,147,72,0,93,150,104,96,219,42,147,15,132,44,100,237,90,209,1,202,105,213,238,91,6,195,161,175,51,205,45,49,226,87,129,179,167,121,178,60,220,188,191,
+158,156,111,216,165,167,194,104,151,69,0,178,135,128,113,166,128,128,113,31,87,35,158,3,121,225,39,121,105,161,152,38,185,204,7,11,40,249,254,33,89,51,161,28,250,121,180,122,183,37,113,131,236,94,224,63,44,224,25,241,30,63,141,0,63,177,76,80,132,55,85,247,166,29,26,201,172,187,78,101,199,156,65,113,169,88,27,4,149,203,207,241,116,225,126,167,227,5,184,204,251,26,46,199,40,7,32,106,87,213,249,21,104,59,59,224,204,204,245,11,67,174,227,11,172,123,230,32,245,48,60,75,179,116,194,40,235,187,125,96,132,41,139,120,12,79,167,182,58,122,58,39,162,8,146,188,253,221,236,184,198,97,26,81,73,36,99,48,39,138,45,219,205,82,48,189,136,55,138,175,247,115,172,81,28,169,5,85,201,75,204,54,162,183,109,199,171,19,254,253,96,181,175,13,133,211,7,103,206,23,229,96,40,47,13,238,187,173,89,168,231,117,63,148,149,54,189,69,57,5,78,7,62,239,227,245,98,109,151,240,169,193,228,59,194,235,100,152,159,77,78,243,169,73,65,46,
+151,196,121,249,238,222,90,112,139,254,189,114,197,241,236,20,150,60,228,171,122,237,221,108,120,170,187,231,94,136,229,230,26,157,70,79,151,128,123,228,50,194,61,246,16,225,30,202,18,238,158,167,171,130,171,33,10,69,92,47,138,197,115,165,14,156,121,223,39,54,240,62,193,207,205,97,135,92,73,43,143,163,237,130,50,201,74,136,244,250,178,239,116,240,244,42,236,57,167,139,84,51,251,170,47,221,58,175,108,3,62,3,14,138,223,172,72,20,139,106,76,191,225,80,38,94,128,201,80,116,232,49,193,246,3,154,241,198,104,69,19,247,122,15,168,175,62,80,165,112,229,65,130,174,121,236,57,62,240,28,179,136,129,231,113,206,95,227,50,57,29,175,241,123,227,235,225,227,84,67,79,252,221,152,180,138,83,205,249,183,112,42,35,31,34,204,254,114,78,227,224,84,72,144,138,83,205,203,185,56,21,178,191,128,83,213,184,59,56,213,119,253,224,131,9,5,165,16,161,32,165,68,40,40,102,120,142,160,204,218,145,119,77,174,161,251,67,67,63,142,142,252,167,60,182,31,
+129,138,150,28,167,176,138,206,181,112,84,116,72,222,247,217,13,60,202,36,249,133,25,163,218,248,14,14,84,112,42,24,182,139,191,183,30,233,38,63,1,196,204,119,251,53,21,167,98,234,215,209,93,166,25,109,77,29,157,34,47,102,187,94,165,70,190,223,78,134,25,162,151,24,174,53,225,225,22,204,225,48,192,156,65,249,198,156,177,128,5,141,227,23,28,117,239,83,199,170,181,151,54,207,155,229,177,155,39,37,173,83,41,183,51,32,117,111,19,165,147,162,194,249,36,241,195,4,155,231,91,213,61,12,95,46,79,253,253,53,128,52,193,48,34,136,141,105,7,167,109,137,182,177,231,79,10,6,50,233,141,217,122,182,22,41,35,170,200,150,42,120,13,230,210,83,11,243,217,212,61,40,114,85,121,231,149,185,45,105,62,236,21,252,73,26,102,18,188,75,92,188,188,239,243,86,48,157,105,130,60,189,28,181,137,57,242,230,252,183,239,79,14,240,235,44,148,101,147,167,13,70,143,16,166,177,175,6,180,102,191,60,220,71,157,88,133,187,137,235,132,108,154,184,78,96,
+118,227,90,236,118,171,42,163,165,131,178,170,112,38,141,246,250,235,223,195,247,138,224,107,57,133,232,12,245,156,92,232,19,37,91,231,236,96,93,60,158,63,176,27,249,213,138,184,130,35,255,144,184,62,192,230,116,252,102,75,175,246,171,179,156,109,63,170,214,37,26,218,58,156,223,164,41,100,34,203,114,93,115,175,208,196,119,67,243,10,46,166,222,190,131,80,239,59,247,213,183,90,46,43,142,28,213,215,141,168,42,92,111,203,149,181,171,189,211,122,199,72,239,237,122,81,83,93,249,156,96,178,87,4,18,231,214,233,5,90,56,191,23,39,226,38,26,102,234,183,239,165,154,248,253,226,21,75,96,178,158,5,180,145,135,158,250,1,53,161,225,205,216,213,189,63,46,187,94,175,39,42,229,198,213,18,76,175,94,69,181,27,151,162,37,83,229,166,156,217,181,163,245,146,231,31,231,215,13,111,64,212,147,212,153,230,38,98,210,216,206,101,242,180,199,244,212,125,240,178,232,104,105,16,244,57,79,29,109,191,115,215,178,4,87,47,76,161,135,179,3,247,193,234,254,149,
+40,238,208,249,132,194,171,216,249,250,52,42,103,154,86,190,126,47,253,126,14,113,153,25,221,62,180,125,53,165,202,141,18,85,215,74,95,23,164,154,124,249,68,82,185,188,240,42,172,51,94,137,210,72,11,234,109,196,168,171,250,194,33,233,221,32,202,21,155,236,91,197,84,83,157,239,54,246,18,71,25,211,104,141,6,112,113,228,198,234,116,131,184,46,213,45,18,215,165,104,217,126,45,144,107,4,249,5,166,97,90,45,101,76,104,9,222,180,236,41,233,105,165,190,175,59,146,100,57,138,152,201,255,244,40,115,45,193,170,77,78,234,88,210,189,83,59,43,7,234,39,235,110,187,175,223,22,78,194,105,249,141,35,56,159,44,192,19,201,247,220,75,154,85,105,129,5,149,153,59,151,25,243,172,226,41,29,249,32,110,113,202,229,77,12,125,197,213,110,2,110,178,17,129,45,72,167,237,105,107,76,46,45,236,228,69,175,215,175,179,55,62,197,73,167,39,144,55,87,190,157,127,235,213,149,13,11,234,59,181,146,133,122,84,125,109,126,70,105,140,140,153,151,128,118,66,
+235,154,242,85,134,92,129,87,246,98,222,248,169,194,218,176,109,91,158,251,236,237,11,145,156,118,176,210,149,108,11,115,147,50,210,21,28,244,64,36,69,68,154,13,244,68,154,109,90,136,52,211,182,210,47,225,109,86,157,247,168,150,105,107,147,82,209,91,245,59,79,51,242,108,157,187,233,69,59,201,181,200,40,74,247,95,207,162,187,141,187,251,205,252,228,73,197,16,29,151,33,224,96,31,225,224,111,223,71,211,81,123,231,4,17,223,22,102,58,123,16,214,60,107,87,146,15,231,192,87,119,18,98,81,120,209,17,139,194,214,166,127,232,206,137,250,85,54,146,44,139,77,105,134,16,99,104,130,133,160,55,84,175,183,84,75,38,230,51,150,15,86,243,105,128,217,153,42,6,15,197,12,106,155,74,214,0,70,96,16,225,199,96,111,101,58,151,34,204,72,139,244,104,183,254,208,219,169,47,193,221,169,39,149,246,223,16,9,134,216,137,31,244,226,216,240,111,203,195,129,203,137,183,0,234,55,139,215,47,247,75,60,95,43,121,116,0,104,140,44,108,88,98,201,21,108,
+120,115,52,237,183,100,219,196,186,247,229,239,130,6,192,70,251,156,69,134,75,65,255,150,99,246,84,110,101,241,141,95,132,193,122,142,199,239,17,215,234,16,196,62,7,249,64,101,181,240,75,29,151,219,77,192,2,115,142,211,49,240,171,150,138,26,71,141,23,138,12,207,74,123,78,7,195,107,30,196,238,49,225,125,204,163,123,255,187,20,44,87,8,129,99,89,4,206,175,76,45,115,132,193,28,126,245,25,138,236,79,239,20,93,209,46,196,52,45,110,226,13,75,20,196,181,228,171,142,0,186,221,199,108,121,122,1,52,26,157,73,15,21,8,71,4,223,221,235,183,238,239,160,251,65,60,222,137,235,209,7,144,26,85,144,27,143,12,166,201,135,237,19,170,38,124,216,180,220,82,14,233,85,119,222,55,174,74,253,73,126,147,80,224,97,58,247,14,159,46,193,242,81,158,163,239,123,53,91,139,100,139,211,152,61,94,114,135,17,246,228,122,152,106,175,129,185,193,33,177,65,105,163,204,143,191,23,134,239,249,20,121,83,177,53,7,26,21,153,218,179,138,150,73,71,138,
+230,169,114,53,142,47,48,141,84,144,4,21,96,137,210,211,145,217,14,104,65,195,32,100,185,118,126,247,185,27,123,126,191,200,113,236,16,63,204,239,121,124,90,72,235,69,196,167,100,232,128,77,146,111,128,225,109,190,226,237,92,156,17,239,61,84,241,247,30,152,113,170,246,128,105,234,156,69,15,75,96,92,109,47,52,75,142,61,72,114,7,63,7,195,245,116,119,155,206,186,54,141,158,175,21,26,19,25,140,51,35,119,71,118,141,9,1,50,104,37,226,135,122,119,141,183,235,23,36,184,173,59,74,19,50,160,75,79,219,241,152,209,163,132,236,84,121,45,73,206,148,138,236,34,211,228,12,181,35,225,219,146,31,44,241,36,204,124,161,113,65,136,191,149,240,254,247,196,211,72,240,30,217,17,160,225,176,114,65,36,168,122,247,7,254,117,141,206,60,231,79,134,230,101,107,23,251,39,146,131,163,18,254,70,193,35,246,86,136,189,227,189,70,214,182,107,150,176,176,178,144,222,71,243,186,131,88,212,79,146,55,231,46,202,75,21,190,52,42,106,211,177,151,12,216,11,
+92,53,136,234,48,7,183,15,219,137,3,177,228,101,178,6,75,19,126,117,38,203,172,147,153,38,154,119,71,33,187,195,94,207,176,80,137,215,51,114,20,204,169,169,96,212,49,190,25,221,114,195,59,151,110,196,51,7,84,48,237,99,111,53,108,238,205,103,137,23,83,118,236,29,15,114,18,60,238,157,88,88,38,251,182,230,97,225,142,105,170,88,247,87,23,192,118,186,120,238,77,7,152,115,109,78,203,112,48,78,241,36,74,55,226,104,22,158,140,61,233,169,31,21,8,228,225,36,255,105,175,106,241,120,118,123,143,225,84,250,137,76,142,240,146,187,9,211,6,73,238,0,54,96,38,188,127,79,34,138,191,39,145,126,145,83,199,87,108,142,171,22,110,33,228,35,43,186,179,0,124,137,185,178,2,124,137,185,114,3,127,91,4,228,177,153,1,156,70,102,70,193,120,198,250,30,189,53,246,28,172,129,221,200,194,62,26,197,34,209,33,200,219,103,4,185,25,38,200,57,74,130,124,63,73,144,103,61,4,185,125,157,32,223,207,160,81,247,121,108,142,20,179,16,239,241,
+204,197,181,252,234,238,146,158,13,182,5,19,176,127,39,112,191,135,37,90,140,120,95,231,59,207,191,237,31,113,243,255,60,79,73,4,57,26,36,200,3,90,130,124,156,34,200,155,17,130,220,119,70,144,159,85,8,242,119,218,197,181,110,130,156,9,19,228,204,196,59,242,38,65,78,222,33,200,145,109,130,124,213,68,144,79,4,4,57,95,66,144,115,80,130,124,174,78,144,243,122,4,57,180,70,144,123,214,8,114,165,128,32,95,186,36,211,131,72,107,73,148,27,200,253,73,128,71,115,220,5,108,61,16,112,188,59,120,230,109,132,136,23,131,56,68,57,167,14,136,114,246,228,136,114,254,242,61,155,107,236,186,20,245,11,202,245,185,7,55,99,247,110,209,199,216,71,31,214,132,182,123,194,145,77,3,225,200,16,24,202,146,72,176,58,90,44,243,161,171,205,11,241,254,246,54,25,234,205,223,210,88,223,240,55,165,137,150,46,71,229,37,35,85,119,104,63,109,48,215,179,41,86,180,224,99,136,246,209,243,59,137,52,186,75,164,31,91,137,167,159,154,191,82,93,216,
+61,219,172,30,197,2,229,12,156,101,220,46,157,141,25,169,214,233,84,160,71,157,185,175,157,71,240,243,122,244,249,128,217,57,100,164,14,54,174,185,155,85,253,138,16,102,129,238,68,38,77,231,99,68,34,81,236,216,62,135,189,4,76,202,129,205,141,183,4,246,9,31,50,71,234,144,206,136,95,56,49,124,6,15,57,42,192,110,143,95,133,209,20,99,93,189,214,178,194,251,77,187,242,24,57,44,83,170,197,251,199,9,219,123,206,175,242,19,7,238,190,2,99,38,196,126,127,61,237,202,89,212,192,165,73,177,36,148,42,2,72,169,68,99,155,229,40,103,188,174,177,84,165,112,254,176,29,219,103,191,96,47,173,105,231,33,87,210,247,176,219,179,238,90,55,119,154,112,144,108,60,220,176,7,106,50,136,42,202,79,195,209,208,124,33,8,3,5,215,128,42,233,61,65,181,23,78,93,20,249,213,227,148,54,137,8,229,172,231,171,2,236,37,145,162,43,160,46,194,215,6,52,186,33,20,138,162,17,40,116,202,175,50,125,114,46,246,38,92,85,18,1,129,221,239,50,
+130,219,235,19,35,195,31,73,46,64,234,4,65,87,5,116,167,215,147,226,154,60,7,187,9,103,152,103,100,176,103,211,161,80,223,84,151,237,15,196,102,243,74,53,229,3,253,167,58,74,71,206,39,163,24,50,22,23,176,55,18,175,251,128,248,145,53,48,47,243,85,245,160,88,238,238,170,48,127,153,86,23,241,107,117,185,7,115,38,240,165,22,115,38,240,229,34,230,76,149,220,47,181,205,251,147,96,5,36,203,137,3,196,239,201,5,24,127,143,146,164,34,126,63,6,244,110,224,30,61,69,110,222,99,128,190,4,36,198,73,164,109,44,67,23,193,114,135,189,34,200,114,115,240,223,231,253,88,219,34,145,248,59,100,172,143,249,16,210,62,10,248,196,176,121,7,15,48,246,247,32,88,128,217,60,34,192,21,18,17,96,10,68,4,120,137,164,194,243,101,14,219,39,129,200,34,5,191,150,135,100,152,149,64,164,15,171,10,32,178,2,100,98,34,169,90,5,203,244,184,153,212,95,11,117,201,69,136,188,74,114,239,98,157,89,219,132,23,14,183,152,28,9,137,84,3,
+44,78,53,220,68,83,168,224,207,142,195,183,23,149,124,151,175,196,184,175,123,176,188,247,33,59,105,197,252,190,42,39,123,52,5,143,65,22,135,242,107,180,133,201,97,190,162,71,73,124,82,101,5,51,108,171,122,106,163,65,87,203,143,88,84,154,115,144,20,235,210,193,190,62,128,134,240,23,28,149,14,252,194,89,51,87,21,249,147,86,252,125,96,19,13,184,126,147,105,82,164,79,144,93,226,239,26,122,110,53,210,44,248,144,121,41,165,25,172,44,170,228,97,208,100,71,218,68,14,86,230,253,81,99,93,208,176,21,174,144,210,230,70,102,95,19,115,62,207,67,100,37,201,61,2,117,182,155,6,64,123,169,122,128,99,134,69,155,76,225,121,98,110,85,31,66,7,29,157,168,9,63,229,87,25,165,73,194,116,235,229,64,231,44,115,192,22,220,82,145,4,164,206,58,208,187,167,206,154,251,183,136,177,110,73,198,28,218,51,168,176,132,37,75,74,143,214,237,32,65,115,235,235,57,166,137,229,175,41,150,120,67,93,18,251,3,146,253,168,5,235,167,229,185,101,83,
+39,16,176,231,41,176,173,142,133,48,88,81,227,113,185,88,239,172,200,53,91,76,4,248,63,57,47,55,35,167,17,231,13,199,166,72,201,193,220,45,43,49,23,193,247,67,146,191,86,229,57,199,163,88,110,254,9,218,14,120,247,183,243,234,237,251,233,85,198,65,197,235,76,68,130,78,147,148,22,210,10,246,197,47,212,49,230,65,25,73,130,123,144,2,107,112,15,226,249,7,60,216,0,217,139,121,208,141,236,226,30,28,245,112,120,61,184,128,71,252,106,9,44,254,192,28,17,208,204,175,71,113,205,100,91,76,92,179,54,150,54,73,246,131,40,15,115,177,55,171,149,238,17,14,168,130,20,234,96,154,218,250,28,176,9,139,236,35,232,35,88,100,221,87,203,120,100,105,115,248,252,21,20,130,122,250,207,161,151,219,61,66,252,195,136,62,117,82,214,163,244,28,76,38,196,224,245,137,37,208,1,33,6,201,17,98,122,14,32,166,61,75,217,7,98,158,227,97,180,28,185,144,174,198,148,28,148,62,47,185,158,121,70,8,180,200,97,110,222,198,84,214,16,135,71,201,
+50,201,226,78,27,113,231,74,146,211,163,76,187,227,241,174,95,10,232,236,112,203,193,29,111,40,143,217,55,94,63,186,176,166,168,31,26,66,194,142,42,57,121,12,152,217,209,195,100,96,243,122,170,160,64,126,121,121,122,100,116,61,79,206,142,202,207,19,125,70,151,217,123,62,115,142,236,195,163,231,179,231,179,237,211,200,131,209,110,67,38,198,210,201,194,211,33,127,110,85,6,212,91,226,132,85,26,57,131,243,20,36,163,192,3,122,21,7,82,105,246,93,230,236,30,237,70,46,62,212,173,111,211,152,180,4,168,23,119,116,209,87,59,77,250,4,118,138,175,52,124,233,35,28,94,221,202,226,169,125,24,62,216,148,104,138,169,68,233,28,140,37,137,79,247,213,24,62,122,8,194,56,146,216,39,82,164,41,69,84,100,240,24,32,137,146,204,81,105,56,42,95,8,251,251,21,18,147,34,227,153,125,122,132,247,60,46,182,148,40,123,80,49,143,121,213,73,65,190,105,204,243,101,147,71,177,78,75,83,233,96,172,94,31,187,64,200,30,189,147,188,224,239,145,47,101,
+154,20,181,114,44,51,93,193,131,149,237,150,50,86,51,8,13,72,253,73,85,187,184,192,196,196,163,240,252,1,159,83,125,42,102,19,231,79,233,59,168,199,17,149,83,67,43,163,163,96,123,204,214,16,144,237,32,113,232,241,245,23,89,67,179,82,63,181,58,119,246,159,98,163,234,114,111,151,129,6,82,92,96,71,159,20,38,203,204,62,184,128,136,27,107,142,224,209,181,63,153,53,238,201,46,131,206,12,70,78,18,45,3,114,214,75,57,182,22,145,165,173,8,196,198,253,183,165,68,208,148,18,45,173,87,215,66,59,152,71,72,18,210,58,5,120,206,159,225,84,165,243,89,185,70,196,156,121,125,181,208,147,17,186,154,213,57,89,121,28,184,44,76,145,153,47,41,198,34,176,148,183,176,83,70,104,32,213,53,224,59,138,76,129,232,85,24,30,75,163,12,248,32,10,3,199,233,129,191,245,28,191,140,60,161,203,132,12,95,136,66,184,249,68,61,144,33,226,41,67,198,96,45,0,42,21,218,192,169,224,3,50,78,69,39,93,3,42,160,49,157,194,1,143,65,227,
+208,80,143,161,228,49,132,74,193,99,128,204,209,156,18,83,28,40,140,197,16,132,48,10,98,136,133,112,21,99,14,66,8,129,24,98,143,87,65,12,177,16,46,130,24,98,126,72,50,9,69,115,8,161,232,122,148,80,212,237,195,21,165,107,128,76,76,100,5,200,196,68,210,129,76,76,36,168,164,40,16,233,231,240,170,7,13,190,94,84,228,173,249,57,213,212,14,178,10,65,163,23,4,42,37,247,109,8,196,107,64,73,217,165,171,13,56,75,40,74,116,87,137,246,206,80,179,143,190,184,232,230,235,124,53,138,143,14,7,67,144,76,86,96,182,81,248,42,10,243,225,85,142,74,38,59,151,248,16,236,33,120,6,99,15,193,51,45,246,112,146,169,39,86,22,23,249,119,210,214,85,195,48,47,243,193,77,201,192,137,233,253,180,95,12,151,103,195,80,226,118,230,129,150,193,19,50,172,64,202,57,154,172,143,56,103,235,203,189,209,193,234,156,205,142,230,159,110,160,135,116,80,52,216,60,151,177,96,59,2,77,108,33,128,225,182,234,120,40,95,177,37,212,155,231,247,
+150,218,3,66,163,199,125,235,173,3,94,245,80,16,164,221,217,100,89,21,170,12,94,88,132,173,226,197,77,57,217,141,13,252,105,155,176,234,134,146,104,90,7,47,102,20,200,206,137,38,221,113,66,1,97,221,119,25,46,111,118,251,176,100,30,100,77,0,146,61,110,239,249,4,43,182,106,103,76,8,104,158,227,2,182,58,152,215,125,97,78,77,198,10,96,164,106,64,139,145,22,1,237,201,57,36,184,63,134,10,247,33,200,63,144,63,216,178,136,252,220,101,174,109,63,179,108,118,5,42,221,65,194,82,132,243,100,84,32,119,23,22,46,166,20,208,169,142,41,37,172,174,246,98,240,118,20,62,220,112,162,240,147,114,243,220,98,111,43,159,53,192,62,158,252,97,185,3,98,140,196,148,232,237,153,10,13,189,196,129,180,65,156,107,189,2,226,47,250,156,128,173,200,81,169,150,156,60,213,56,146,46,72,22,87,196,71,54,21,26,176,96,76,0,143,62,198,4,240,144,117,36,72,51,104,71,170,151,129,70,229,244,233,208,121,223,127,164,124,143,255,2,235,69,70,220,
+73,237,237,118,244,1,104,106,26,233,30,80,159,145,151,153,29,148,53,249,90,62,36,220,205,210,113,203,119,113,175,93,134,33,220,107,39,231,1,72,96,144,250,4,34,205,244,105,163,167,67,163,118,190,135,231,234,10,203,66,241,108,128,92,220,9,245,15,77,241,172,202,77,36,91,15,233,140,107,68,91,151,9,151,133,139,110,17,218,213,94,130,0,197,215,210,208,50,150,223,38,85,173,153,133,121,218,188,136,101,21,28,245,61,125,197,110,162,101,110,162,140,68,239,193,213,159,90,182,56,213,199,92,198,233,139,218,132,246,213,185,163,90,251,118,23,56,250,140,159,228,47,157,96,133,85,150,93,77,125,195,252,100,216,23,77,166,165,85,249,214,164,215,72,100,94,38,182,250,232,37,208,135,145,196,221,205,220,34,240,124,3,75,135,251,164,122,238,26,198,43,144,27,183,41,145,149,45,199,180,215,29,106,204,138,78,54,48,63,31,219,137,80,163,187,253,113,132,110,18,201,48,101,129,174,54,76,89,160,171,26,40,251,228,19,104,98,221,244,9,71,197,160,197,215,171,
+135,201,195,212,108,231,177,196,107,174,139,89,115,125,167,207,102,182,175,114,129,142,152,138,180,236,162,81,46,5,88,155,186,90,175,118,73,222,25,36,179,222,209,59,15,246,150,75,217,11,234,163,146,235,204,30,136,189,113,160,159,135,64,218,152,87,176,180,57,180,179,211,0,13,21,118,196,184,44,50,223,148,109,28,85,233,192,170,69,102,253,84,198,238,145,49,212,12,159,173,13,138,246,220,189,220,241,74,240,64,134,207,45,133,6,178,72,183,196,215,151,101,225,100,182,194,209,92,91,147,119,195,216,240,82,137,238,217,180,33,164,53,158,222,228,173,233,196,101,98,97,133,83,53,48,27,238,5,144,39,101,60,79,206,151,79,22,64,158,108,36,225,211,75,238,141,194,186,153,24,36,18,40,124,88,56,12,201,38,123,174,244,245,85,229,162,27,198,36,94,184,151,113,137,22,144,59,152,196,231,69,191,108,82,219,229,201,84,232,211,89,18,54,242,119,148,190,218,197,147,175,63,172,54,55,129,170,151,64,87,76,85,249,57,65,216,74,16,132,73,100,113,135,209,209,208,
+77,38,54,157,99,94,6,125,96,211,162,229,94,112,110,215,233,167,12,95,128,238,238,80,123,18,242,251,124,135,202,252,192,49,64,58,230,164,82,142,29,28,32,245,108,154,46,243,9,247,125,54,70,191,30,73,238,57,65,233,18,2,50,54,66,128,21,115,70,124,29,226,148,103,234,108,35,19,233,66,5,218,9,163,147,60,201,52,27,194,132,115,90,175,110,24,65,199,80,237,18,105,145,188,234,18,5,41,2,40,113,156,109,28,151,53,243,244,14,200,157,194,168,220,239,207,218,15,211,164,107,116,191,25,113,220,63,202,238,70,160,86,111,8,247,105,236,68,153,117,150,36,88,219,189,168,155,103,50,71,231,169,113,250,172,59,18,140,155,172,132,33,34,118,110,60,100,253,242,200,150,149,219,238,108,234,119,206,169,43,15,205,88,25,142,237,99,17,159,157,19,64,113,96,71,231,48,136,153,250,52,19,70,71,158,246,62,91,180,217,101,159,77,104,158,140,177,58,154,58,251,199,75,171,242,81,187,223,90,80,161,213,107,46,161,118,119,151,80,219,93,134,146,160,14,233,
+167,75,253,199,52,68,61,201,103,68,183,169,150,241,142,166,216,237,22,43,231,80,114,32,249,26,46,133,189,55,220,125,15,134,31,85,3,192,15,106,163,149,87,173,200,204,28,80,225,223,198,197,91,12,220,216,143,208,133,218,162,97,82,101,221,29,12,60,0,118,232,112,55,215,202,190,33,14,48,135,74,4,178,195,0,224,212,22,2,224,222,251,179,185,74,0,220,100,131,0,184,158,133,0,56,237,152,0,184,85,148,0,56,46,74,0,220,110,156,0,56,101,159,0,184,69,142,234,97,155,83,61,210,97,94,2,37,101,197,202,94,105,151,239,9,219,244,56,135,206,241,90,98,160,74,187,49,104,224,23,225,144,66,148,169,85,239,171,209,125,244,77,213,22,142,230,99,185,131,128,59,203,38,142,230,50,115,82,97,64,78,120,167,38,97,136,157,120,182,139,166,233,45,113,83,100,239,60,69,26,148,126,246,166,126,120,156,60,52,248,108,170,90,130,16,187,187,69,136,21,190,0,212,40,48,226,105,221,89,240,172,53,124,121,82,90,5,227,167,84,118,48,235,13,120,246,
+25,189,18,185,234,61,241,50,131,238,232,62,83,154,210,43,240,123,60,198,235,204,56,155,35,201,65,61,166,214,47,119,225,178,203,249,92,115,45,233,186,124,237,170,235,249,222,128,105,177,192,59,214,18,0,168,243,96,0,72,201,87,233,218,164,85,154,232,145,113,20,228,84,105,56,10,218,132,239,253,177,132,249,131,47,58,220,58,216,2,233,238,227,162,85,200,33,164,238,122,93,145,173,179,177,150,38,110,229,129,61,131,222,64,193,59,89,94,159,207,70,90,178,199,39,207,241,228,190,117,212,243,215,83,169,0,117,37,53,91,230,248,4,59,43,95,143,43,149,198,93,102,209,100,230,82,213,233,27,202,197,101,69,118,58,123,74,93,50,60,37,17,175,186,133,105,90,184,133,68,214,97,163,230,233,166,102,71,135,139,153,66,68,22,240,37,247,84,218,225,176,19,124,44,157,168,232,157,16,22,208,171,1,17,80,201,254,209,99,227,144,229,139,12,185,46,57,18,48,168,76,178,73,191,108,161,87,78,32,238,122,157,124,26,210,161,214,114,223,49,126,170,200,88,198,113,
+254,52,163,155,239,175,85,46,160,163,245,186,154,154,131,17,243,142,31,207,204,75,162,237,158,100,230,3,212,231,67,4,128,168,98,52,108,210,77,43,236,101,183,82,52,28,222,250,47,122,197,72,228,244,88,215,186,142,41,76,17,201,202,116,236,184,46,70,143,187,210,71,47,167,155,221,161,251,206,93,157,187,254,246,202,21,77,117,48,245,158,249,134,253,126,150,179,78,178,88,199,123,137,117,180,4,27,241,74,153,201,241,194,12,215,43,39,11,123,0,19,28,104,26,102,157,166,47,166,113,199,161,225,182,119,51,98,71,143,178,246,199,221,246,50,205,127,145,186,62,101,137,103,81,127,214,126,29,18,159,89,166,29,223,176,108,207,102,84,154,150,224,164,22,146,248,108,243,95,230,17,19,48,103,218,253,238,101,33,134,78,190,36,61,253,48,101,61,149,38,221,3,237,86,35,251,32,20,155,23,182,24,131,77,75,253,37,164,49,104,208,82,194,149,112,238,161,118,241,225,236,42,153,201,232,163,227,116,4,58,39,217,170,19,219,245,244,186,173,172,95,26,230,7,13,134,
+14,229,105,89,22,166,95,40,223,188,151,222,213,85,129,250,37,9,68,143,42,11,175,15,103,241,209,134,79,189,179,225,26,234,27,118,223,120,51,5,139,75,150,221,243,251,149,169,43,154,222,56,240,67,212,134,202,190,117,219,49,91,68,123,147,186,188,74,29,2,216,237,54,120,213,186,115,71,28,222,62,129,14,154,142,110,229,101,101,163,207,228,211,150,235,154,29,145,102,142,30,183,174,7,103,43,29,189,131,187,46,232,107,83,107,171,87,37,46,111,61,245,224,219,46,148,35,28,176,208,204,166,55,98,58,50,238,36,122,44,245,77,169,132,230,218,10,224,6,227,194,70,10,49,128,1,149,43,190,216,239,198,229,142,98,254,118,191,32,178,29,136,142,135,38,42,40,140,97,247,200,47,240,29,25,85,205,102,225,46,115,41,34,121,148,47,145,112,55,239,85,47,45,94,249,31,142,184,119,12,161,43,198,81,229,203,126,177,9,105,101,14,53,7,133,94,165,132,182,31,89,56,251,212,25,193,254,34,66,176,191,213,19,236,135,121,156,253,246,104,160,154,76,102,213,105,
+195,147,95,216,145,212,182,82,70,223,184,190,35,150,33,125,199,214,164,218,74,136,79,246,248,151,153,109,205,85,33,10,27,245,167,135,44,50,44,7,83,24,36,84,166,34,142,228,137,95,120,32,39,28,156,172,3,7,43,202,144,166,167,178,181,15,205,109,213,254,83,233,78,95,90,162,45,134,98,171,151,186,228,76,56,9,250,198,221,253,144,157,222,105,230,38,252,118,225,46,114,1,39,122,183,15,217,193,203,78,215,88,12,232,214,214,121,145,173,164,149,123,13,173,215,215,205,39,103,213,3,250,222,164,9,120,171,65,159,172,78,125,201,244,112,120,179,127,196,173,118,193,119,162,17,82,57,241,50,59,222,6,8,6,43,10,95,30,236,53,153,3,163,216,69,66,186,88,157,219,18,48,168,230,172,125,197,101,31,173,245,55,53,51,145,157,94,106,57,7,170,251,103,221,214,97,39,187,1,175,144,213,121,213,176,183,116,198,111,205,7,147,187,22,209,131,114,103,53,240,156,78,202,154,153,126,113,96,180,170,80,191,102,135,46,106,74,169,180,229,231,117,204,105,192,103,
+28,0,86,87,176,235,72,51,203,211,78,65,141,46,97,69,186,168,75,175,31,141,208,93,29,53,155,25,221,117,177,121,73,8,55,58,103,27,49,105,45,224,122,42,20,31,115,79,153,41,25,12,41,69,238,209,214,189,202,242,84,156,107,166,34,135,151,220,193,102,188,171,66,169,147,200,186,115,83,44,211,180,28,158,110,101,5,64,3,95,28,195,2,102,118,183,64,31,83,202,132,179,179,5,175,22,19,85,92,116,37,29,253,187,97,183,20,197,12,92,57,219,114,92,229,129,73,241,69,171,109,214,63,143,222,231,161,7,83,8,234,233,164,145,171,181,229,23,254,112,16,55,83,42,67,141,106,71,220,86,249,146,229,231,186,170,60,94,204,207,205,159,208,157,32,132,119,241,121,48,192,49,212,104,110,112,127,126,63,77,156,12,86,140,156,123,143,99,210,112,62,83,177,86,201,51,48,58,251,71,126,155,69,192,76,32,114,212,196,186,51,163,23,157,134,99,3,232,185,49,212,67,7,39,129,171,216,202,21,105,21,172,11,99,40,100,218,218,67,93,0,15,51,41,173,92,
+166,153,57,47,167,199,252,221,180,127,213,236,109,57,210,81,128,62,3,155,211,151,212,183,130,195,242,115,12,238,106,118,134,192,191,181,135,138,204,143,87,169,100,135,132,132,131,219,250,85,218,110,85,129,212,181,180,155,167,227,38,124,51,186,138,9,88,93,48,95,164,82,43,112,120,36,26,31,236,0,46,135,88,70,147,189,105,97,26,232,163,2,89,128,245,71,37,214,31,181,244,78,32,127,118,211,58,185,153,234,48,80,208,162,87,207,69,227,64,137,94,177,210,22,102,60,125,225,11,132,49,173,221,231,80,88,64,44,42,207,126,98,81,121,63,127,132,236,196,162,162,68,136,69,229,63,181,143,191,160,49,25,35,62,74,133,29,233,8,232,139,214,23,208,179,49,198,33,98,12,206,222,97,205,19,180,236,121,206,139,172,107,121,54,204,99,78,211,126,187,239,60,139,23,15,81,5,208,227,102,61,14,181,45,155,7,229,194,139,21,231,180,75,192,231,195,49,222,237,14,182,54,143,84,136,120,168,246,201,108,108,31,23,244,188,35,161,118,214,74,70,172,45,87,61,95,
+2,42,190,239,187,1,172,239,222,189,228,154,215,143,109,3,98,209,94,21,35,71,62,200,111,152,128,254,115,17,121,70,103,58,215,75,179,230,203,109,182,25,157,243,65,122,69,173,227,125,99,207,233,130,94,3,90,205,218,21,48,127,79,131,100,35,147,27,205,113,212,75,201,150,4,57,140,228,2,208,96,36,201,0,49,56,169,137,246,52,111,1,52,128,164,179,184,224,63,44,116,110,27,89,134,108,175,77,227,134,138,242,68,36,127,252,60,94,201,5,18,243,190,229,203,34,143,14,26,72,183,194,181,30,212,174,182,211,214,230,203,129,118,227,97,90,235,186,39,212,236,77,155,245,176,233,26,61,232,179,47,106,198,55,245,162,149,55,69,129,226,53,35,238,171,49,154,208,122,192,161,106,91,109,206,136,158,43,29,56,251,249,132,112,186,76,151,249,231,82,247,85,93,36,37,30,52,53,5,253,150,107,243,26,190,212,106,92,189,123,83,102,117,39,197,114,141,85,232,75,137,88,43,173,73,172,73,87,157,171,135,158,25,54,88,65,8,128,31,23,219,71,155,106,204,177,
+67,195,114,83,156,114,24,183,87,83,55,179,155,195,19,83,122,213,108,183,28,63,78,247,84,200,154,157,214,218,212,77,159,215,5,186,224,168,153,87,190,159,75,130,88,208,59,98,68,37,113,129,130,75,251,150,108,199,1,232,62,172,235,178,68,87,25,123,221,143,30,209,175,182,91,49,216,118,19,139,52,83,87,103,122,219,108,191,54,203,111,218,119,66,160,99,137,100,89,138,20,143,96,154,88,135,99,27,119,21,166,3,76,154,174,253,161,106,18,146,214,194,165,172,74,87,45,218,162,107,171,230,229,172,177,134,10,18,150,76,172,55,53,239,93,193,39,180,136,45,57,91,118,165,252,217,237,111,231,225,130,73,116,159,91,176,250,180,181,16,220,106,212,50,133,155,157,163,185,139,39,209,174,160,118,92,92,90,20,244,105,145,205,105,93,2,49,134,59,2,93,195,62,91,88,79,192,66,94,153,63,156,14,240,196,111,158,19,137,223,5,58,245,224,121,169,25,43,66,170,43,144,73,174,250,28,198,170,236,17,211,71,108,57,26,129,22,54,53,91,144,243,241,244,192,158,
+107,66,187,61,171,213,216,28,151,206,67,16,94,121,51,132,24,48,208,240,200,195,167,122,160,96,210,144,134,68,254,173,187,137,234,136,117,209,45,72,129,97,151,43,194,58,87,254,80,138,166,14,102,225,190,198,32,156,69,33,202,65,56,51,121,222,22,14,167,249,111,232,35,4,250,60,47,50,235,23,82,164,121,147,220,104,31,150,157,115,80,125,144,142,175,16,9,125,69,140,245,151,181,48,145,208,154,53,34,161,247,102,47,211,147,101,94,54,12,63,159,127,95,221,234,241,106,219,146,73,204,165,11,159,109,182,20,94,188,253,222,250,126,127,46,135,159,139,156,237,224,227,177,149,115,68,28,59,42,17,199,206,4,179,28,194,5,243,247,177,194,137,40,146,165,37,121,157,40,32,51,113,173,18,224,18,243,93,183,77,92,171,176,163,103,57,201,50,251,171,250,162,19,143,251,55,248,227,99,200,138,223,186,200,31,166,248,118,99,174,233,240,91,23,84,186,132,223,186,0,44,195,111,93,132,173,18,190,45,197,6,73,252,214,37,6,167,241,91,23,20,110,61,17,64,241,
+240,76,92,152,80,240,91,23,176,147,224,183,46,47,113,3,81,30,87,20,252,214,37,96,243,225,183,46,60,21,173,166,169,240,171,131,149,225,212,52,194,174,74,12,188,204,172,188,144,103,216,79,120,49,120,77,246,165,62,45,66,159,124,117,73,54,17,200,88,165,234,102,144,167,26,214,143,209,92,72,104,232,20,31,173,190,214,164,124,83,206,54,156,237,206,181,196,114,144,93,113,117,66,187,150,190,86,219,202,58,78,160,243,29,26,129,143,196,222,92,219,81,12,58,248,166,217,201,95,112,236,69,5,131,83,62,89,166,70,38,143,253,106,173,155,154,184,78,92,102,71,170,37,204,178,174,125,130,163,67,11,152,21,207,9,6,239,246,226,152,204,49,215,18,128,138,188,221,68,225,118,57,210,184,59,112,158,100,94,102,194,118,89,60,179,22,43,135,247,194,145,217,146,201,130,149,122,250,146,219,152,151,221,8,23,177,14,48,21,74,112,7,173,237,111,176,162,216,77,230,8,42,176,247,90,171,210,2,118,121,210,235,14,39,26,215,114,161,83,93,91,203,159,174,168,80,
+213,69,8,235,31,239,239,9,200,113,228,10,191,13,229,240,226,185,9,109,143,110,218,227,90,251,173,149,244,122,119,222,100,48,44,236,248,108,78,188,13,141,61,196,125,221,253,244,6,69,184,24,5,202,225,97,20,140,84,231,84,215,183,107,106,238,74,9,27,36,241,56,143,61,229,228,1,126,26,69,68,216,233,101,89,122,221,58,68,24,198,38,178,68,55,205,213,237,197,155,42,220,159,205,124,22,159,110,106,53,176,101,194,185,3,220,26,201,51,141,216,199,170,79,48,29,187,104,79,156,35,70,197,129,210,39,216,101,119,133,134,61,84,183,62,237,111,62,48,108,201,241,77,16,159,183,175,199,242,89,20,108,50,231,29,231,134,203,132,82,80,48,94,71,161,245,83,113,73,208,118,155,218,79,138,210,105,200,92,215,233,235,5,113,101,12,16,180,46,196,249,100,121,211,251,103,255,201,36,173,213,114,78,21,156,42,51,129,167,27,77,104,195,243,120,112,42,193,247,65,234,186,182,122,213,17,20,123,197,184,255,64,91,61,58,190,211,90,130,130,118,219,235,74,122,32,
+155,193,121,178,158,241,13,7,179,82,151,81,158,192,206,219,16,116,30,32,97,97,157,69,187,248,118,181,225,138,3,157,128,74,222,135,58,220,229,89,140,189,163,219,198,168,189,87,42,213,35,123,235,238,250,108,73,126,16,84,161,129,171,126,12,49,32,174,211,150,142,125,253,192,222,61,189,84,93,160,27,81,44,84,71,239,246,227,250,51,207,175,142,194,7,26,166,22,29,182,3,229,89,74,27,157,109,118,6,215,1,21,234,186,234,35,14,3,50,235,199,54,47,67,155,177,74,201,230,161,199,59,84,188,131,204,230,137,125,105,103,172,128,176,59,178,91,35,167,42,153,110,13,225,136,105,122,194,81,217,247,177,96,192,150,150,45,163,75,182,100,220,93,14,7,197,55,173,181,44,34,238,128,189,253,82,216,186,215,177,226,210,49,210,220,200,239,244,74,217,33,183,174,155,108,179,214,178,82,231,89,138,171,52,97,202,3,221,13,173,135,116,122,255,118,151,81,19,171,21,72,217,141,223,87,184,42,183,27,56,186,100,5,26,21,200,78,67,121,227,164,109,28,68,96,31,
+116,133,123,207,103,59,237,215,35,181,117,95,252,244,69,117,76,7,58,15,49,165,129,206,51,76,105,160,115,7,83,122,18,89,189,20,251,250,197,113,95,178,135,196,204,24,161,103,8,22,176,134,169,1,159,55,197,116,160,242,6,190,29,138,59,42,252,250,242,94,87,2,58,35,205,188,206,190,136,215,131,207,1,101,82,246,9,99,69,28,89,121,4,243,48,39,91,141,227,17,87,211,8,96,35,121,106,88,198,49,146,62,250,169,222,121,66,237,201,210,73,231,52,51,136,164,197,211,254,138,255,197,156,182,100,199,15,148,181,9,141,83,229,0,74,53,150,44,128,114,174,188,137,83,250,107,167,84,142,234,69,154,191,149,234,210,96,6,47,96,67,56,152,193,71,216,16,78,106,84,47,55,140,59,199,203,211,187,172,55,152,3,99,45,157,211,177,125,227,94,133,234,10,239,204,3,249,91,62,58,67,118,43,117,89,241,233,186,20,21,226,211,245,150,131,122,128,148,51,135,80,251,188,51,123,16,230,2,144,39,212,191,240,122,59,205,189,124,25,42,68,75,253,82,197,27,
+178,236,45,27,243,71,180,147,136,232,54,197,20,39,14,0,234,181,61,166,23,193,28,137,180,200,133,51,240,236,73,55,74,250,56,211,146,216,197,162,245,167,253,128,215,235,181,121,27,250,98,37,59,53,235,146,240,172,183,34,222,153,13,122,59,179,97,132,198,155,21,197,83,168,37,239,153,179,2,62,245,108,211,175,187,57,236,158,50,34,151,155,133,253,117,75,32,83,60,217,54,233,180,101,154,212,178,21,108,136,14,233,71,157,237,67,235,209,254,129,182,167,189,57,15,7,221,205,157,224,61,115,87,119,91,156,205,214,26,173,233,237,238,232,62,219,226,85,5,217,73,160,119,150,90,57,31,143,46,142,143,199,169,222,241,64,243,146,139,49,14,159,172,150,64,113,154,134,66,240,118,170,219,156,95,231,117,162,70,235,140,151,190,67,31,178,165,195,145,203,88,49,217,119,199,87,55,112,63,181,94,60,22,101,22,206,30,10,156,113,125,58,101,80,41,174,169,37,61,242,13,121,179,225,44,39,151,97,255,32,220,25,109,178,113,122,240,219,63,253,235,183,255,205,31,254,
+243,87,196,231,171,191,250,228,213,223,189,249,252,213,231,191,120,243,234,163,95,189,254,187,55,175,126,254,201,199,111,63,127,253,241,231,111,95,125,244,241,231,159,188,250,205,39,95,124,246,234,245,167,159,254,242,163,159,191,254,252,163,79,62,198,190,120,245,139,215,255,254,205,43,240,240,139,183,111,94,189,253,228,87,111,126,253,139,215,159,191,250,228,103,127,251,197,91,112,232,205,135,175,126,246,5,198,241,245,199,127,255,183,95,252,242,151,191,121,245,246,23,159,124,246,249,171,183,111,254,215,47,222,124,252,243,55,175,62,249,219,87,159,126,246,230,211,207,62,249,249,155,183,111,63,249,12,72,252,213,175,94,127,252,225,219,31,189,83,9,251,248,239,254,240,213,63,249,232,227,159,255,242,139,15,223,188,250,103,127,252,249,103,191,252,211,143,126,246,251,239,62,127,248,139,127,241,238,200,187,143,47,222,126,244,241,223,189,250,248,245,175,222,188,253,244,53,16,240,239,62,253,244,15,191,113,226,159,190,250,39,31,190,249,219,143,62,126,243,234,39,127,246,227,127,253,
+39,127,252,167,63,254,203,191,124,245,87,95,124,254,201,103,31,189,254,229,79,126,245,119,223,123,234,95,253,228,79,255,228,213,63,251,235,223,255,242,224,79,127,31,247,208,219,31,126,244,171,95,254,139,47,73,190,212,242,127,252,236,245,175,193,137,95,126,71,189,183,159,127,246,197,207,63,127,245,103,191,249,241,167,159,254,47,31,125,252,225,39,191,126,245,35,224,247,247,255,254,193,127,120,119,238,247,254,225,207,222,124,252,197,31,189,254,236,213,175,192,231,55,45,0,15,255,253,39,31,125,248,234,79,254,183,143,62,255,193,239,124,157,230,247,254,225,163,191,253,193,95,124,246,201,175,62,253,252,127,250,183,127,252,26,56,248,151,63,248,224,183,176,115,132,196,255,225,131,223,250,157,223,249,218,233,223,251,135,63,250,236,205,235,191,255,193,239,252,225,151,95,126,240,31,191,87,214,95,126,241,51,76,161,31,0,141,62,248,237,87,63,123,253,217,183,228,130,111,126,248,227,15,63,124,39,237,131,223,250,221,87,127,253,79,191,238,213,15,126,244,35,66,221,159,254,
+238,171,191,250,55,63,249,203,63,250,241,31,255,219,31,96,223,252,206,247,201,254,189,127,248,166,244,63,123,253,209,199,255,23,197,99,199,48,241,95,10,121,167,249,247,202,249,242,155,207,127,243,233,27,16,239,111,196,5,207,140,63,255,241,159,253,201,119,188,255,181,83,223,246,255,95,125,244,249,47,223,96,106,252,230,27,133,242,235,143,62,255,5,30,201,87,32,185,137,226,122,11,98,241,195,191,252,232,127,127,243,250,103,128,226,107,218,253,222,63,0,75,254,213,103,32,131,127,128,81,124,227,9,246,197,15,255,242,205,231,63,248,210,188,247,174,249,94,251,62,248,143,223,210,253,95,255,187,159,124,240,55,63,254,139,191,248,224,111,254,236,199,63,249,243,247,167,254,195,247,89,134,233,255,21,75,240,31,63,252,159,191,248,248,43,61,9,25,239,42,20,124,252,155,55,159,189,1,49,255,170,66,94,253,244,163,183,56,148,96,181,136,215,249,235,159,255,61,6,42,191,254,5,118,20,43,156,87,127,251,209,47,223,188,250,236,205,219,143,62,4,149,244,142,209,79,
+190,133,60,175,63,195,142,0,144,120,251,230,99,28,79,126,243,234,231,191,124,253,246,45,112,231,231,191,248,228,195,183,24,107,226,11,162,96,63,124,245,250,45,150,124,95,85,247,79,95,253,224,107,149,11,146,241,167,0,206,128,106,64,191,159,191,126,251,230,119,126,248,45,153,152,214,31,131,71,31,191,250,217,155,87,175,63,252,16,176,4,248,70,68,15,232,243,241,39,224,249,103,192,28,44,68,159,131,127,3,10,96,121,249,163,31,129,184,189,183,226,207,63,249,252,205,143,48,53,190,23,19,126,250,234,215,159,124,246,247,64,245,143,1,34,254,26,147,70,164,4,110,44,144,5,228,2,56,253,16,83,19,131,51,224,164,31,254,252,211,79,113,119,253,238,43,92,252,175,63,2,112,139,193,239,175,190,120,251,249,171,79,1,198,126,240,91,159,252,236,237,59,208,253,224,183,190,66,88,60,245,190,87,145,15,254,230,23,111,94,127,248,230,51,92,33,2,222,95,17,223,224,89,250,143,208,188,5,77,224,231,111,222,211,188,254,248,55,95,233,246,195,111,164,196,63,
+127,245,47,255,37,110,214,143,254,235,63,248,131,63,248,237,255,246,191,255,175,22,231,165,115,139,36,18,137,252,50,195,254,103,249,47,180,173,166,112,41,206,9,24,51,238,205,213,104,227,84,234,108,156,221,174,233,124,108,223,211,173,52,179,40,82,46,242,231,74,241,71,183,247,40,74,78,28,21,152,183,193,3,90,253,25,185,125,9,155,54,117,124,47,95,19,214,66,222,151,34,121,221,178,233,173,176,185,188,156,247,194,180,74,229,111,26,78,158,142,163,91,173,172,36,230,112,56,140,105,227,45,235,100,158,57,155,186,102,9,221,246,182,77,189,187,97,155,166,47,195,157,187,123,125,142,204,208,30,230,228,100,198,169,230,204,91,221,181,32,71,164,37,151,251,146,127,139,176,53,185,2,57,180,177,17,218,190,57,169,38,30,158,187,103,134,229,181,13,105,254,190,138,228,202,235,75,94,122,98,39,185,87,10,162,54,195,21,109,229,162,173,247,71,227,69,153,80,186,79,141,251,73,156,177,201,239,229,24,243,72,136,188,128,4,88,75,232,74,204,120,247,172,8,109,251,
+194,237,100,39,61,226,148,78,2,93,234,78,166,39,239,36,115,21,251,101,54,55,163,122,102,205,147,147,138,101,209,51,219,97,62,165,165,244,112,238,248,122,160,26,165,118,46,83,7,41,202,138,208,27,213,134,231,53,62,9,253,154,92,219,34,229,232,9,182,61,151,220,184,155,161,210,236,131,195,216,205,241,70,108,129,188,117,217,207,159,156,27,238,196,225,133,213,166,123,147,124,239,62,164,187,216,30,197,67,73,178,18,123,17,95,168,84,29,165,52,45,228,204,203,6,98,213,242,150,47,14,185,71,131,121,183,4,206,220,145,125,52,163,224,126,60,219,168,24,182,229,15,236,84,141,226,222,219,81,203,72,15,162,211,7,211,203,158,142,86,229,95,186,89,162,93,22,137,117,82,22,48,224,57,65,213,28,44,104,153,100,147,2,125,186,127,76,181,19,20,105,134,11,11,215,123,215,116,56,53,116,140,106,194,64,51,217,93,137,11,44,156,204,230,217,214,238,25,243,110,56,188,191,124,65,252,240,121,220,120,166,134,235,139,219,193,168,209,120,182,56,39,46,156,110,172,
+26,207,162,70,72,89,128,118,54,54,26,138,251,28,185,46,90,230,214,168,178,139,197,7,217,220,106,43,191,98,69,235,134,85,152,165,119,177,245,12,203,113,83,43,186,127,18,145,172,150,85,229,54,76,81,94,187,133,161,91,213,162,52,57,119,232,227,238,151,215,24,136,131,254,176,94,163,188,152,11,156,216,224,153,68,202,206,101,215,188,10,201,245,173,98,93,84,242,108,85,246,34,89,243,73,209,167,85,203,170,47,130,13,251,161,13,214,144,169,202,27,79,211,176,143,192,16,20,84,44,215,56,139,100,138,91,113,29,93,102,64,47,20,245,220,202,68,98,149,240,245,83,87,81,123,34,91,44,108,93,37,33,55,31,113,183,52,219,207,20,181,59,50,191,216,142,216,61,172,192,81,62,104,236,30,52,242,7,26,117,187,117,32,79,205,145,79,143,155,44,133,104,206,111,29,55,34,236,165,225,204,215,177,6,57,209,189,126,224,248,137,174,162,112,239,76,5,251,134,98,63,227,79,92,51,16,31,203,160,93,234,207,193,183,43,195,237,254,192,120,24,242,175,185,106,167,
+16,67,157,201,42,70,82,176,176,203,60,66,145,66,146,60,12,90,251,228,118,120,234,45,109,229,66,131,238,158,91,210,72,174,45,116,15,165,116,165,75,22,117,139,6,79,39,58,222,253,229,124,201,171,83,95,71,208,214,98,120,197,81,212,216,174,203,243,197,148,100,107,163,31,173,251,22,189,113,166,226,220,100,29,62,23,119,12,37,164,62,210,186,39,201,45,77,102,80,162,178,206,230,79,149,183,126,78,83,226,46,93,153,121,125,135,107,80,186,179,236,246,51,45,229,245,112,111,122,119,96,152,236,86,109,60,94,184,150,217,218,153,76,151,155,80,177,105,12,10,184,43,177,248,169,236,178,26,241,170,98,126,53,155,220,246,28,15,39,27,251,94,197,134,174,28,216,159,115,217,215,227,204,51,253,224,228,250,217,176,76,247,73,121,11,129,142,58,122,100,228,108,29,108,29,12,149,243,114,62,71,189,221,72,108,176,188,203,251,233,83,213,255,193,222,123,60,183,158,101,249,157,255,202,27,45,20,173,86,171,66,234,233,152,153,136,137,89,204,70,49,90,75,19,90,76,
+116,68,103,87,189,106,61,41,59,179,148,249,170,90,29,49,11,0,4,225,189,183,4,225,65,120,239,29,9,67,128,240,32,188,247,30,132,37,188,25,144,47,179,156,90,234,238,8,73,163,133,54,143,192,239,119,239,185,231,158,107,126,191,203,207,247,60,102,181,171,99,170,245,162,172,216,44,139,185,226,149,172,82,165,188,147,156,116,111,136,236,29,221,148,26,53,125,40,29,199,11,157,65,70,76,109,67,205,116,31,255,180,77,114,133,65,254,92,188,167,28,231,173,166,247,54,206,66,1,124,167,141,78,106,130,32,184,13,35,162,175,207,138,65,37,234,122,140,85,236,246,33,114,49,19,235,101,197,195,74,225,214,88,102,202,243,100,65,254,112,131,149,80,253,146,164,153,151,234,19,131,35,141,189,61,218,202,19,136,254,147,103,193,223,119,49,147,169,60,173,161,117,252,29,149,206,69,0,173,58,167,14,209,167,67,145,154,85,95,81,96,50,93,139,17,98,69,229,140,247,162,104,68,242,117,53,209,6,72,102,183,249,155,226,54,179,32,146,139,85,176,107,176,192,157,110,
+53,50,162,62,132,111,166,250,137,167,235,250,24,108,105,134,186,24,8,123,51,204,115,200,66,48,155,36,220,80,189,104,139,221,214,174,137,249,54,60,245,10,210,37,74,26,71,156,246,154,180,111,208,102,37,181,154,83,98,129,159,89,245,24,10,1,244,230,151,221,201,235,193,72,88,172,101,107,93,58,223,29,48,110,221,121,255,137,125,127,19,245,105,163,169,76,217,97,243,120,196,136,1,64,34,214,141,40,97,70,233,9,236,178,174,121,26,180,157,47,83,25,7,3,118,177,184,121,118,101,128,104,83,68,209,86,63,249,238,142,162,40,86,154,51,203,65,141,144,78,125,154,85,8,180,35,34,27,165,67,253,113,87,47,73,209,169,167,242,85,60,56,170,233,82,137,7,4,28,211,104,172,17,247,166,226,170,101,65,197,84,60,196,216,186,19,92,53,10,216,141,74,104,37,243,109,121,238,80,212,47,188,46,230,175,21,7,240,114,156,196,48,177,21,167,34,89,234,172,207,162,167,86,82,178,241,229,200,177,168,42,234,8,240,247,36,105,145,173,100,142,200,7,190,34,62,
+100,103,76,133,32,168,33,77,169,205,138,57,111,225,113,137,7,10,78,168,147,138,71,209,132,68,20,3,10,159,34,229,87,25,51,105,146,91,183,46,94,167,150,151,156,160,28,204,64,154,214,4,50,234,232,70,108,220,52,21,28,20,65,191,228,193,132,85,10,53,181,69,91,205,15,100,89,18,239,98,131,236,241,173,163,170,105,112,232,91,106,56,50,161,223,149,131,18,210,9,124,226,22,115,182,30,102,188,239,218,131,62,61,151,232,199,63,144,235,105,107,250,53,95,176,174,164,207,32,180,161,212,243,146,159,149,161,98,194,105,198,202,179,177,99,74,142,236,142,0,33,179,114,65,59,32,6,101,10,37,161,147,63,101,241,186,242,164,212,114,197,252,176,87,46,4,45,23,64,196,175,33,157,41,209,34,9,145,154,23,120,66,174,125,174,181,101,122,96,117,218,218,223,44,100,71,142,45,21,118,97,48,229,43,235,75,155,163,184,154,78,200,190,244,141,78,86,71,215,231,207,190,215,12,229,62,223,103,190,128,116,124,142,239,137,113,186,231,86,239,237,182,244,61,1,9,
+189,234,89,42,245,230,129,113,204,210,122,141,28,212,94,224,130,50,60,95,100,203,233,51,119,236,124,182,255,8,243,77,67,97,243,236,74,132,91,100,246,81,32,30,177,109,244,5,114,197,195,50,90,44,54,204,132,254,102,88,173,146,159,29,166,39,5,75,84,147,66,132,208,152,60,113,95,144,206,248,198,85,209,184,44,58,197,206,149,192,91,0,22,133,235,151,94,110,247,104,0,200,60,3,24,37,74,188,175,246,227,2,220,85,206,7,173,199,159,141,212,81,88,154,72,152,125,151,189,240,177,173,123,188,44,37,124,114,15,25,118,60,105,90,106,183,101,13,102,164,171,69,155,23,166,73,80,253,137,140,85,144,217,231,88,77,59,225,8,137,119,20,66,120,229,48,55,102,87,189,244,40,199,21,248,106,114,16,110,116,235,161,5,15,26,154,175,146,91,241,81,221,100,176,163,122,161,204,135,67,116,74,147,91,148,185,204,160,105,154,182,121,54,85,35,91,68,12,172,125,50,204,110,239,244,212,48,93,248,14,193,114,188,238,177,85,76,181,195,26,166,137,85,129,160,103,
+129,94,17,156,70,38,104,31,57,189,2,69,75,90,204,143,85,229,207,104,16,211,178,38,123,78,116,40,226,46,51,182,191,56,103,103,57,38,164,127,106,53,239,111,230,118,145,234,212,159,43,30,78,132,98,5,73,104,238,193,108,150,1,126,232,210,79,57,184,48,2,141,18,92,100,133,217,155,196,176,54,117,58,18,179,217,175,43,92,115,236,128,109,170,161,252,166,11,234,78,244,117,133,83,167,4,170,246,99,221,29,122,139,101,67,246,81,75,106,221,48,67,44,20,68,8,183,153,119,51,17,152,216,65,201,121,214,251,53,176,177,79,219,20,102,221,129,48,14,153,152,99,200,18,122,51,63,245,205,235,138,46,210,196,33,215,57,246,125,18,171,139,150,64,106,61,62,183,52,38,151,216,246,88,237,63,241,115,51,233,112,137,198,157,60,238,202,179,96,43,237,89,50,232,59,1,202,68,241,245,122,18,66,230,70,255,160,211,251,133,182,185,117,149,38,116,20,190,229,171,54,55,135,142,123,190,58,139,47,165,47,61,233,103,168,180,177,219,75,120,123,41,207,42,75,243,
+118,164,200,204,114,206,146,98,247,117,54,138,181,105,44,111,135,103,50,0,209,184,189,17,192,159,25,91,168,218,177,15,213,73,182,129,129,110,208,159,221,183,207,155,235,83,66,62,145,108,142,174,45,121,134,12,13,177,91,63,121,39,72,167,72,178,9,190,223,2,194,248,190,194,156,178,219,219,99,20,108,109,178,229,196,204,227,176,51,88,140,0,148,21,167,237,54,105,63,196,81,245,65,200,100,117,28,117,194,199,231,203,194,198,131,110,60,24,247,217,158,117,99,11,232,19,203,255,4,63,96,245,66,51,216,46,58,132,41,189,97,24,29,170,25,13,180,110,228,113,226,56,57,164,214,193,32,216,224,66,251,97,76,201,60,120,98,7,121,227,82,108,181,51,88,94,23,146,149,56,127,121,123,169,117,91,93,143,16,50,86,246,42,99,77,85,99,16,98,131,164,104,126,82,86,121,125,183,235,130,126,204,156,81,189,90,125,97,0,188,71,89,54,208,52,10,47,47,179,230,73,32,35,171,175,249,250,48,24,79,244,0,0,50,31,178,40,2,73,86,107,226,18,145,112,205,
+146,123,150,75,238,96,244,35,158,29,168,57,73,195,141,53,109,164,80,17,244,67,163,83,58,158,148,87,40,215,178,68,32,234,55,200,220,26,41,234,117,117,241,240,254,193,84,184,185,51,60,87,68,87,155,108,210,186,29,228,102,157,100,50,58,27,188,108,23,121,185,174,181,232,199,38,167,20,119,216,89,0,69,1,185,17,237,1,249,125,190,34,203,190,141,141,110,159,238,18,114,34,84,24,156,35,11,11,108,114,150,89,175,187,5,69,53,215,158,114,160,22,115,184,164,63,21,103,226,112,169,113,237,138,67,133,79,174,36,139,160,211,87,3,153,58,246,62,137,212,183,86,136,235,6,88,46,92,64,104,54,174,87,250,162,91,106,205,40,32,46,186,225,66,100,15,24,206,48,42,209,120,155,73,185,220,233,126,125,89,130,59,244,77,4,193,235,23,186,4,125,168,233,176,240,82,11,127,220,93,245,160,101,12,176,147,113,200,113,94,73,202,129,196,164,108,227,203,49,232,43,245,120,8,62,214,100,34,190,26,5,79,225,124,59,54,91,204,167,41,26,14,213,28,14,185,
+205,129,130,6,141,165,165,161,143,22,224,117,248,85,40,70,208,224,186,158,161,110,5,145,238,22,151,183,220,230,75,36,6,19,208,113,240,164,139,135,13,60,27,117,170,36,199,220,153,211,104,205,151,105,177,98,71,123,44,18,105,98,6,9,1,97,50,82,180,1,111,208,205,114,54,190,26,247,220,141,236,60,182,177,22,113,61,152,143,149,151,176,107,220,173,213,212,11,219,184,109,40,22,14,130,81,79,237,69,122,87,33,187,136,98,52,113,153,109,59,71,89,169,175,33,157,164,152,213,121,240,58,67,249,161,50,167,221,158,214,87,209,69,197,41,179,129,101,55,155,200,184,47,213,30,199,154,102,61,104,190,174,203,28,120,159,91,192,24,229,172,175,0,198,252,228,125,109,220,221,114,169,157,45,43,171,239,92,94,54,69,6,88,173,81,212,207,156,133,158,146,193,145,68,159,130,108,85,184,220,91,230,206,103,84,75,157,87,43,116,74,82,206,104,52,195,36,171,156,241,249,170,253,64,186,154,192,193,141,221,128,154,24,221,111,202,43,160,44,39,82,5,130,128,14,138,
+189,35,232,199,247,26,204,213,106,91,20,102,183,130,180,139,234,236,59,107,175,44,82,200,193,169,242,71,7,74,169,109,190,111,202,15,156,244,14,247,128,139,9,197,51,242,228,68,187,234,242,108,142,89,201,51,127,142,227,119,20,255,51,44,188,105,63,174,252,252,215,213,83,139,218,117,199,192,70,45,109,26,195,232,29,119,183,237,244,77,238,218,82,11,107,95,116,50,74,177,213,228,222,88,173,30,255,54,73,110,29,134,47,33,93,88,168,34,46,176,237,236,65,173,129,230,64,74,123,167,249,104,124,185,219,191,220,119,140,113,235,17,141,212,163,19,250,187,7,99,10,65,145,153,23,180,226,11,142,59,203,190,172,180,130,126,61,253,166,161,63,108,160,240,52,94,126,76,105,108,14,68,2,91,27,141,41,66,62,65,190,201,156,198,56,134,154,22,35,180,220,77,83,137,152,8,243,238,109,16,4,172,58,111,221,14,211,188,224,64,216,177,97,88,12,177,199,208,39,206,245,119,77,192,216,94,71,148,236,202,221,108,220,50,139,219,155,199,7,13,150,197,97,44,1,64,
+41,228,206,157,19,137,104,168,23,189,87,211,100,145,119,215,113,118,255,158,157,133,57,244,149,6,54,177,175,141,24,140,124,125,10,173,132,240,47,0,118,150,182,167,2,70,32,245,93,103,117,6,23,64,213,23,251,230,152,200,226,21,224,154,52,141,25,51,48,29,0,117,182,87,67,54,141,78,220,115,143,203,201,157,45,157,69,51,229,66,245,62,123,136,133,171,216,248,52,145,82,145,52,44,233,7,239,66,147,50,53,132,126,87,89,21,203,164,204,217,67,24,182,226,200,249,28,211,17,20,22,241,244,196,19,200,122,162,197,220,161,145,220,203,48,206,242,229,199,253,238,170,92,151,41,70,164,142,146,102,201,129,100,214,138,135,137,179,202,6,123,34,186,208,62,155,234,208,160,84,69,180,104,163,153,39,4,165,119,14,192,95,68,131,85,204,90,176,230,142,144,146,157,52,200,81,136,209,177,180,92,195,121,122,10,176,44,106,152,220,181,171,140,218,116,217,179,206,124,131,152,156,230,243,212,46,243,177,72,40,56,82,242,153,121,94,1,167,137,60,241,11,235,140,104,104,
+82,177,88,82,124,61,240,83,208,89,57,12,172,199,46,32,125,34,244,254,48,24,175,92,203,231,243,45,147,121,216,191,122,161,42,12,248,244,18,7,168,230,188,150,71,69,60,74,218,34,96,21,41,165,112,185,215,58,47,191,170,190,210,199,157,221,114,44,198,245,134,68,22,114,171,165,117,1,147,151,83,223,190,161,217,59,85,181,30,197,166,119,71,236,143,55,171,144,42,222,77,50,1,3,134,239,105,177,169,39,95,175,92,99,46,16,123,71,181,24,163,227,137,14,125,48,28,110,213,145,59,10,214,157,225,177,173,227,62,117,135,124,5,247,251,163,78,211,137,20,195,235,99,167,71,156,203,240,188,70,230,1,66,116,113,125,34,127,107,89,32,42,189,26,239,161,244,216,12,182,197,10,106,102,42,96,85,165,180,43,118,62,121,173,163,18,104,131,26,102,220,72,175,53,94,203,197,71,77,22,135,138,105,6,234,177,81,90,212,46,122,248,36,53,80,13,209,73,182,81,75,222,238,99,210,180,233,205,148,75,213,44,199,153,25,171,20,180,231,68,7,181,130,228,148,57,
+178,7,130,55,237,22,247,64,59,19,32,234,37,220,212,187,220,246,229,237,153,227,230,23,244,69,133,30,1,3,110,140,177,197,42,31,105,122,185,74,93,185,206,132,210,207,70,139,114,209,15,215,230,249,33,31,222,190,171,75,175,197,220,65,10,247,58,216,236,95,65,183,17,59,30,160,54,10,221,38,153,203,89,188,51,57,157,204,211,147,182,105,13,98,239,252,175,71,179,186,180,88,56,95,128,242,6,64,98,76,198,128,39,128,194,158,144,243,109,42,217,147,92,132,72,220,185,236,148,42,196,173,34,196,131,195,235,125,18,243,188,123,194,192,220,143,43,8,138,239,136,236,230,15,103,124,145,96,123,233,99,12,245,20,129,134,213,11,208,75,65,126,208,34,235,233,238,212,180,151,228,193,234,226,83,64,148,16,47,72,169,41,165,23,77,134,35,149,251,142,175,121,115,221,183,52,250,246,243,54,108,76,60,181,110,219,172,91,65,123,126,43,221,146,164,141,45,120,183,2,220,210,3,150,184,173,156,165,86,73,87,29,184,26,220,23,223,157,162,244,214,246,20,44,174,175,
+142,37,216,61,94,156,205,1,81,164,133,203,120,119,155,35,90,88,13,199,129,139,218,24,236,149,190,91,69,84,143,59,220,3,72,11,28,25,216,118,112,169,77,167,219,160,248,13,217,195,154,7,164,144,185,131,83,106,117,193,187,170,205,230,138,19,239,159,192,147,152,174,245,34,100,208,72,9,115,131,91,245,228,173,148,199,221,145,178,239,138,9,96,49,249,25,170,151,18,14,228,231,67,8,47,70,43,67,61,172,36,210,60,144,19,142,20,158,143,149,137,94,83,215,118,178,4,181,202,160,150,174,200,66,220,33,86,80,50,30,205,128,34,17,89,146,90,65,234,87,240,17,194,125,250,153,139,82,107,239,237,25,13,0,149,245,96,44,250,98,46,226,124,232,69,232,130,158,90,233,56,101,42,252,244,190,118,188,159,129,152,21,62,86,75,92,215,111,138,220,18,138,206,93,40,158,211,6,214,105,246,164,234,182,30,89,53,158,210,66,60,206,61,199,211,194,179,111,65,94,163,4,228,228,85,20,22,187,52,122,91,28,87,16,214,48,15,226,69,211,74,1,171,29,203,83,
+10,10,170,235,198,81,212,108,207,117,185,23,181,48,182,241,246,183,100,144,190,209,164,176,96,144,248,19,3,239,138,238,100,135,236,201,161,220,39,42,6,49,67,210,66,230,121,80,67,121,99,160,172,67,111,62,148,77,210,152,165,123,212,36,38,77,96,14,219,193,108,143,192,115,252,81,11,186,137,208,230,176,64,199,253,24,187,178,250,79,157,179,122,218,11,92,93,65,161,174,233,50,174,216,123,142,14,204,118,139,97,141,135,171,252,68,180,89,132,177,71,75,233,218,80,28,10,238,68,53,18,154,63,196,146,24,32,186,42,170,212,241,18,40,83,128,0,220,9,59,215,138,56,136,13,44,211,50,46,123,234,158,245,208,200,60,230,217,221,249,248,129,157,77,162,208,213,20,121,237,238,168,98,119,89,133,210,87,31,201,40,237,195,11,57,124,220,228,15,58,236,194,31,234,110,38,79,97,153,124,29,50,65,52,229,168,66,191,110,166,200,234,5,39,38,85,60,15,198,50,165,88,135,122,196,100,130,67,83,206,133,142,184,130,73,65,134,112,139,155,178,129,168,199,101,228,
+138,165,137,102,105,129,80,43,226,114,180,149,78,185,90,69,187,215,132,239,43,42,28,161,63,52,106,98,14,146,123,236,176,97,156,25,204,161,238,215,22,238,195,173,155,57,211,112,204,49,215,52,17,32,185,130,61,155,181,196,184,135,239,29,208,146,183,222,19,28,11,166,195,154,78,239,137,213,5,249,13,238,221,210,247,16,120,80,173,196,240,101,215,93,19,226,72,190,135,57,188,33,245,135,204,9,48,23,110,134,149,118,21,136,18,125,24,11,169,222,72,26,159,213,188,94,102,21,120,34,151,56,111,134,142,101,114,34,94,14,86,112,223,9,222,23,23,104,79,151,83,2,200,12,8,11,24,34,246,148,208,36,222,47,15,176,43,178,7,215,129,146,105,30,92,94,163,202,65,105,41,212,61,235,74,66,65,164,188,203,61,128,236,129,225,44,110,31,206,155,57,142,100,153,202,153,71,67,53,244,232,220,99,10,181,188,151,72,104,160,0,66,170,67,192,149,150,242,168,224,154,55,229,243,123,223,8,151,245,57,27,149,19,242,26,157,14,103,56,119,59,141,132,214,144,170,
+17,169,215,9,175,97,4,202,96,225,184,166,229,124,196,200,124,222,36,175,17,56,62,194,22,8,67,189,0,51,32,184,107,108,68,73,75,158,149,18,35,34,31,201,137,19,26,239,117,95,43,111,204,159,7,138,171,91,91,4,116,244,21,248,13,45,172,193,242,106,106,60,143,168,232,188,184,218,114,95,124,196,229,239,125,189,139,143,35,153,191,60,121,9,28,178,74,170,160,153,46,114,102,91,148,233,198,134,160,191,96,200,58,172,185,4,66,112,21,128,39,41,228,86,219,168,106,134,171,139,251,102,40,255,30,154,143,107,192,51,4,126,95,210,248,102,253,54,175,127,227,223,70,85,22,103,149,235,136,15,160,87,184,153,67,224,36,244,171,48,141,255,128,127,198,119,59,84,73,74,37,118,69,177,177,163,82,32,129,202,121,30,31,206,50,93,94,57,165,119,8,199,28,1,40,174,157,141,243,161,215,237,103,171,29,64,187,141,32,217,105,129,194,113,122,187,87,62,30,149,185,234,137,110,189,145,95,105,80,157,43,148,132,198,131,98,78,165,62,39,126,64,4,233,210,96,
+114,99,65,95,63,57,199,155,144,117,189,126,33,217,102,7,73,152,252,218,28,128,50,46,22,108,104,173,91,251,85,30,34,216,72,221,94,147,138,231,130,169,176,174,28,135,143,156,120,92,227,85,182,226,168,157,50,73,110,62,78,31,111,84,150,9,253,182,17,136,35,107,85,13,220,52,182,71,30,28,201,28,156,103,116,37,221,11,133,79,116,133,184,180,107,34,112,170,65,146,132,70,110,163,133,12,73,65,19,21,93,187,201,158,2,160,75,226,99,162,249,75,156,96,143,15,186,74,98,217,33,121,20,112,94,67,170,87,53,180,17,91,127,114,230,161,166,147,245,237,152,65,57,115,108,57,135,238,210,142,20,25,47,153,108,94,74,205,66,158,173,238,125,184,29,5,112,212,184,143,59,186,157,38,133,4,208,82,38,4,193,213,54,2,154,135,96,182,49,94,222,251,184,56,202,101,196,124,56,240,101,204,46,174,103,46,254,167,80,120,114,31,137,176,8,222,60,67,17,200,186,194,83,226,176,222,81,137,213,243,130,207,102,159,247,195,29,250,108,206,67,217,6,52,40,214,
+115,240,231,207,122,31,169,44,220,110,45,213,227,209,222,134,44,99,151,120,157,175,128,183,104,208,228,37,227,110,137,250,136,62,233,190,91,235,92,59,136,81,195,89,140,225,92,195,51,122,230,117,213,125,29,136,8,159,73,87,68,231,50,168,52,47,60,7,196,174,235,40,94,87,249,176,64,36,114,185,94,129,185,77,37,240,114,0,50,34,21,79,32,69,84,198,65,122,5,194,62,163,1,3,5,220,224,47,243,204,125,153,103,151,9,131,7,144,223,102,223,53,25,247,126,21,231,21,101,80,8,178,174,28,7,95,238,93,95,110,1,46,247,222,150,212,149,163,133,126,251,192,123,95,69,35,89,182,131,190,132,119,113,27,111,192,120,178,203,20,236,95,150,208,101,70,62,180,79,252,194,11,239,76,143,191,85,235,186,127,221,78,143,156,209,104,206,117,40,249,189,86,3,182,124,175,21,64,0,251,91,205,251,252,7,126,241,107,115,41,159,235,250,166,220,44,27,198,195,74,104,166,75,153,163,111,186,85,95,38,55,225,25,121,13,5,171,124,111,19,29,64,248,226,247,230,
+125,189,211,76,189,51,247,210,126,180,230,233,225,195,111,75,191,6,122,183,71,45,219,185,48,57,141,228,225,22,47,246,144,63,218,179,95,213,222,87,203,138,122,189,226,157,141,160,183,253,65,252,214,253,76,100,36,131,100,27,176,6,88,176,177,93,93,26,184,253,226,22,110,115,113,203,55,165,174,122,239,94,129,2,100,132,199,119,3,79,39,98,33,187,120,48,230,50,227,124,88,3,58,29,198,235,166,21,105,175,62,36,61,158,153,16,107,127,213,232,202,155,135,98,64,215,65,27,221,55,81,156,220,91,136,107,112,73,29,185,0,42,169,111,197,67,193,17,184,240,147,4,185,181,6,205,26,18,51,14,222,156,192,138,251,73,173,214,83,8,31,121,108,105,174,176,29,77,121,141,148,100,250,102,221,156,9,86,199,72,30,92,192,201,21,76,42,130,136,54,105,162,150,132,228,254,221,53,178,32,118,227,248,12,239,148,42,224,59,10,59,16,92,248,156,188,121,204,231,35,194,181,152,70,199,60,55,11,11,215,18,190,204,243,111,115,252,153,237,150,112,143,235,60,88,0,
+111,52,4,132,196,188,255,171,92,53,169,103,104,45,179,191,255,109,153,192,255,252,191,127,248,103,255,236,39,31,254,213,183,223,126,253,231,95,125,247,107,225,192,251,183,47,252,234,211,55,31,126,254,213,79,63,127,248,247,191,252,244,249,227,135,239,63,253,229,167,175,191,250,238,71,130,246,253,135,63,251,39,111,124,237,175,63,252,226,187,111,127,245,233,103,151,2,31,63,191,17,180,111,127,241,241,187,119,86,250,253,23,98,245,78,240,223,57,212,191,248,130,198,62,191,233,10,126,128,114,159,190,249,213,183,255,238,11,11,252,229,247,31,191,251,201,135,127,241,205,135,255,251,207,254,241,159,253,227,119,134,245,86,232,243,87,255,238,141,221,253,234,171,111,62,191,161,189,75,3,239,188,239,7,111,62,125,254,235,55,148,247,249,71,183,223,106,124,255,111,222,225,219,191,249,248,133,35,126,250,93,110,251,238,247,167,159,191,65,177,95,179,190,63,253,81,173,240,70,14,63,127,245,233,155,47,188,243,221,223,63,250,240,233,243,135,175,190,254,254,219,55,128,248,235,150,
+222,196,16,159,127,52,251,222,161,47,228,241,29,1,190,19,191,31,105,221,91,68,47,13,253,233,37,210,23,147,159,63,254,135,247,32,189,51,200,75,84,255,242,11,162,252,252,221,87,223,124,255,245,87,159,223,162,243,237,143,182,63,127,250,197,37,30,63,127,143,196,95,189,209,204,111,191,249,248,6,43,63,127,250,233,47,223,6,226,77,83,240,197,196,111,56,227,111,240,244,183,223,253,218,215,55,56,249,71,191,14,232,207,190,253,226,240,123,200,223,36,22,23,39,47,49,120,67,207,127,250,86,235,203,215,55,183,223,232,234,247,159,63,126,245,179,55,143,47,1,255,197,215,31,223,110,253,228,195,255,121,9,199,31,189,183,253,101,140,191,253,229,143,253,127,139,252,87,191,252,252,237,95,94,102,192,79,191,122,147,137,252,14,118,253,1,148,190,69,250,87,159,126,250,241,195,175,62,126,247,253,87,191,111,233,61,70,239,134,126,172,250,235,225,125,171,253,219,108,242,191,172,160,228,239,164,39,249,251,203,73,254,171,171,73,254,240,114,249,135,105,246,30,170,191,89,
+100,242,86,241,159,127,243,251,50,135,31,53,38,127,240,103,255,224,159,127,243,225,178,218,63,253,234,141,59,255,79,127,246,15,254,118,41,201,165,189,191,197,224,31,255,173,22,127,95,32,242,223,88,10,115,233,194,223,38,69,121,151,171,92,58,243,203,111,126,250,182,147,188,75,82,126,71,14,243,22,131,223,146,169,124,137,243,175,85,28,127,248,59,178,150,223,175,249,199,191,83,245,61,160,255,137,154,191,209,227,252,77,98,156,191,139,22,231,191,168,18,231,82,235,191,3,33,206,219,166,240,247,84,223,252,225,239,222,122,91,47,127,95,97,206,23,19,111,53,127,183,224,127,38,44,255,237,244,59,191,37,214,248,103,127,242,79,255,225,159,252,47,127,2,186,106,1,202,0,0,224,138,255,59,98,141,44,213,10,64,178,89,205,10,64,36,184,33,174,103,200,112,226,202,12,224,33,64,199,91,80,97,116,11,187,93,240,80,137,56,159,72,5,180,8,51,173,37,168,231,208,205,222,32,124,210,1,19,150,55,58,134,137,213,100,247,194,162,65,5,137,126,156,45,107,132,
+235,35,132,198,16,173,11,56,176,19,173,136,79,92,71,42,50,157,78,151,151,166,225,96,109,63,58,159,187,25,87,213,244,162,104,15,139,139,117,6,4,185,202,67,177,112,215,136,50,189,174,33,27,79,240,133,44,39,64,37,69,66,70,94,208,85,207,83,230,215,208,179,118,99,97,116,240,136,96,70,131,243,174,108,116,131,146,241,192,70,226,132,43,224,53,120,159,62,184,196,92,48,66,139,206,210,137,8,115,19,212,65,227,55,12,137,40,19,5,128,233,233,50,126,35,167,208,95,35,202,90,251,10,177,83,13,206,243,124,124,112,134,212,19,215,85,34,168,98,64,21,143,1,220,129,203,221,172,136,158,37,27,12,43,95,131,243,156,194,181,206,188,113,177,71,160,69,188,251,176,191,91,216,136,60,137,0,97,50,64,18,33,150,58,142,1,92,57,178,118,22,164,76,175,45,26,9,126,153,218,115,167,214,134,0,218,201,44,222,138,197,252,33,12,11,171,141,66,232,98,4,96,133,185,2,183,91,45,208,132,59,201,121,82,232,152,45,245,2,231,247,39,249,192,15,124,
+145,0,157,62,5,128,184,77,112,224,38,131,58,156,114,251,252,188,102,242,197,102,107,103,65,97,169,13,86,216,12,19,185,81,66,0,134,238,233,217,162,195,72,163,1,194,30,18,178,225,4,93,85,134,197,219,252,217,207,34,41,155,70,81,44,178,189,127,245,210,227,5,176,119,108,168,56,92,19,31,255,54,200,119,221,27,21,38,122,190,16,144,227,180,81,170,233,65,206,180,5,21,205,96,6,127,71,241,38,245,163,46,144,87,115,15,208,196,35,27,46,148,232,45,140,51,61,175,78,181,65,86,97,72,31,236,41,104,72,220,68,97,116,59,175,211,141,192,36,125,107,79,200,179,248,121,124,80,143,95,117,135,0,58,106,168,37,131,245,215,97,100,0,230,54,195,0,5,32,222,59,160,228,130,161,176,74,208,228,191,152,43,96,30,228,196,164,111,36,66,188,161,197,218,82,14,165,136,37,242,240,76,206,232,40,109,42,90,100,22,215,164,54,1,246,12,77,52,24,61,73,25,34,209,75,0,6,210,93,238,197,223,180,17,89,18,49,13,7,119,155,12,13,2,50,13,
+67,32,64,177,227,189,85,196,83,18,52,46,50,46,107,1,159,8,176,86,194,141,4,89,236,175,126,82,21,215,134,3,135,92,195,22,45,242,118,200,242,66,217,226,17,198,29,90,165,145,101,90,229,183,149,35,57,107,78,36,107,139,138,55,234,86,209,52,80,44,76,198,95,21,231,233,193,75,34,29,141,221,240,230,210,102,90,78,166,11,195,37,219,36,60,221,231,134,244,123,127,48,93,203,52,232,16,23,129,39,117,218,172,218,85,81,198,48,217,23,233,225,51,73,70,44,145,101,221,167,69,39,196,161,62,6,168,81,240,128,168,245,0,243,59,193,67,227,9,167,159,149,218,44,92,61,155,20,101,179,165,195,85,25,46,233,13,2,231,103,111,82,92,1,221,220,0,232,104,115,203,249,248,218,147,106,240,236,22,106,18,121,102,128,44,29,244,149,107,147,245,111,231,37,173,80,188,201,219,132,218,185,189,233,65,222,237,123,103,234,235,222,88,45,158,253,193,242,205,122,232,42,24,4,71,85,220,38,116,143,117,91,97,39,27,74,109,85,170,180,235,134,95,169,146,132,
+5,156,82,78,66,73,16,157,224,162,27,84,60,63,40,189,144,131,226,224,12,112,211,186,241,224,126,131,108,100,131,19,32,181,42,233,244,226,97,112,119,31,204,165,141,236,229,73,113,179,222,219,239,5,240,241,96,130,148,18,185,167,118,3,46,99,68,182,240,53,230,80,152,246,98,249,50,199,25,31,111,248,140,85,17,50,182,13,13,203,34,34,53,233,94,41,217,12,211,34,165,82,36,64,147,112,146,34,148,101,252,226,0,245,49,219,189,222,85,152,174,151,154,160,91,15,4,16,165,107,119,122,91,167,134,149,32,71,60,203,244,49,159,213,103,115,188,152,176,151,239,211,167,137,26,131,26,201,141,50,218,241,229,86,184,14,38,31,105,112,70,206,163,182,174,165,21,26,156,146,161,110,14,203,245,186,83,80,156,135,134,137,60,99,55,100,30,142,28,139,52,171,43,165,124,119,79,134,32,226,14,180,241,221,31,146,178,80,128,157,38,58,202,140,185,115,91,120,168,113,239,50,87,112,217,179,10,31,135,164,123,170,100,246,174,92,125,180,202,164,188,86,57,132,201,190,
+218,78,215,188,140,211,190,84,192,71,129,135,164,34,146,32,9,158,148,89,239,19,213,159,150,183,111,42,68,50,100,182,231,158,205,242,16,82,249,180,130,91,157,181,67,189,127,240,200,109,187,135,172,128,44,68,187,252,74,174,27,176,199,164,153,229,107,166,42,70,26,94,153,178,179,16,15,50,82,186,138,220,54,20,44,150,237,203,242,169,184,236,88,240,133,78,223,29,249,185,157,222,221,214,145,215,171,16,151,173,68,130,92,150,213,72,187,247,172,75,105,119,104,171,60,62,108,164,43,199,67,97,173,24,222,250,218,144,45,202,159,104,182,66,252,123,112,42,191,107,41,149,161,244,77,156,108,159,237,120,2,97,86,131,5,40,31,164,130,228,198,33,75,111,242,121,110,8,61,150,182,76,85,195,122,31,35,33,194,203,215,199,42,199,237,109,152,166,216,67,22,174,12,138,186,52,107,53,91,162,32,92,247,156,219,171,108,102,146,217,65,70,43,201,21,24,27,51,166,251,156,246,194,55,240,114,49,86,203,83,154,43,97,187,44,194,139,83,195,90,57,221,243,157,228,203,
+104,240,46,116,30,31,94,135,22,214,154,50,183,247,182,4,216,35,35,124,39,74,80,81,125,114,16,36,12,54,85,61,49,228,230,198,72,51,247,24,153,251,240,97,134,168,228,109,79,22,70,75,126,197,48,63,189,108,238,79,213,187,209,77,76,159,196,162,219,86,85,251,53,89,110,201,188,59,244,1,42,113,216,188,143,80,115,89,71,181,54,32,110,161,25,217,2,153,165,244,125,15,218,56,135,125,214,4,140,239,158,166,97,3,234,8,147,113,48,71,218,105,25,13,49,89,164,39,126,22,45,228,159,104,47,37,185,212,25,110,183,192,149,187,224,62,229,77,104,55,120,173,205,155,72,6,145,85,113,223,190,105,21,110,51,105,253,29,153,82,190,190,129,100,122,16,244,192,168,156,215,143,126,185,88,127,114,97,238,83,65,31,218,204,244,80,237,212,146,163,168,100,67,151,1,230,218,157,122,165,61,88,195,187,64,234,202,45,234,3,123,177,105,31,175,51,45,239,153,3,169,26,134,63,32,26,52,178,158,14,189,122,28,83,61,126,36,214,216,236,208,230,79,70,99,78,
+150,112,235,246,211,174,230,220,237,18,110,26,114,193,198,112,195,119,108,154,199,103,102,13,26,193,107,165,243,54,147,126,165,38,11,102,197,153,253,181,132,166,157,86,54,204,157,210,114,59,61,221,152,123,194,218,110,22,132,42,75,246,171,35,124,56,193,140,28,6,181,108,202,86,200,201,149,171,169,98,232,179,35,208,194,7,37,125,14,244,28,180,185,115,155,66,232,221,73,145,73,210,157,74,174,166,157,91,193,135,102,27,121,53,32,64,34,89,1,70,94,49,239,196,254,67,226,209,195,49,61,91,16,145,97,45,235,101,164,113,20,144,102,222,28,242,165,109,14,61,160,208,49,143,39,221,139,38,150,93,29,66,58,254,188,251,228,122,77,142,249,203,116,173,56,119,108,197,91,138,252,32,188,203,205,16,172,252,44,50,97,175,216,175,235,187,90,222,231,170,23,171,30,222,218,109,202,134,248,19,171,56,229,6,47,162,147,103,85,236,190,49,153,224,139,180,231,14,139,163,86,58,189,131,234,150,186,187,35,157,15,50,68,53,51,114,213,240,139,9,211,109,64,32,128,232,
+91,13,245,160,64,210,45,208,160,188,127,182,70,92,187,103,214,115,212,43,60,210,9,217,238,73,56,231,84,163,39,54,190,84,70,155,235,86,156,151,176,233,147,125,192,199,227,213,169,91,232,94,87,38,104,23,114,72,187,178,181,38,45,225,164,167,219,94,35,47,81,147,185,42,91,57,104,255,52,226,15,81,200,70,71,98,26,188,150,215,83,197,201,75,245,71,11,235,215,189,33,32,87,42,237,226,178,66,100,128,178,110,7,218,135,112,122,72,76,49,181,41,134,122,90,229,112,229,225,184,104,13,206,248,102,60,129,84,235,151,37,253,146,128,128,79,134,123,200,112,141,167,133,244,151,88,166,117,163,71,2,122,211,176,212,83,103,167,48,246,175,119,171,244,153,73,151,141,103,60,109,136,137,196,246,239,103,238,192,144,113,120,136,199,2,175,99,27,230,192,3,224,215,46,123,247,106,229,200,29,32,119,214,107,197,18,247,112,146,42,132,187,227,21,85,60,154,179,156,51,200,153,53,237,118,157,197,1,179,104,54,104,95,25,165,199,5,86,48,89,26,236,75,204,46,121,
+138,154,69,50,253,104,226,221,237,231,51,216,30,117,246,17,179,185,254,126,208,186,143,53,162,129,141,255,134,214,29,234,41,254,246,244,37,102,142,80,116,47,88,206,97,44,117,157,97,186,92,19,94,178,58,19,177,58,89,84,233,222,143,69,178,7,180,44,248,168,54,247,71,173,189,17,51,120,21,195,44,168,61,164,64,116,155,130,134,22,142,133,31,221,8,20,247,94,155,82,161,22,105,83,56,159,170,221,72,15,147,151,71,87,247,242,35,229,11,62,49,12,112,200,2,43,29,223,161,164,91,240,252,190,230,108,55,106,12,240,189,137,214,132,114,152,75,212,108,100,40,249,193,33,184,76,2,52,5,109,8,37,166,110,243,131,33,217,231,130,186,92,126,186,201,23,230,237,17,222,8,80,71,170,199,37,150,128,169,98,149,150,157,255,52,118,72,251,161,252,164,24,200,50,207,4,204,243,68,21,168,175,143,22,161,140,230,67,7,206,116,102,11,108,56,140,75,161,211,149,137,177,58,1,27,254,25,67,107,38,241,187,187,43,218,82,226,191,25,94,231,228,248,106,130,61,
+171,107,235,123,76,197,76,13,159,23,197,201,200,64,169,233,166,33,91,227,106,131,209,153,228,227,242,125,231,120,98,192,118,10,4,189,64,129,177,108,177,118,146,54,74,135,253,132,131,51,252,250,64,109,133,32,77,146,74,14,8,165,71,151,199,196,131,128,200,187,222,226,105,189,225,75,156,47,198,196,67,144,59,130,8,250,212,197,202,57,14,95,109,51,61,227,178,124,124,42,220,50,36,94,27,118,225,236,213,194,246,166,125,52,161,114,144,72,53,92,3,4,69,103,202,117,192,143,131,145,40,104,80,148,54,7,174,170,205,124,165,162,215,3,10,22,228,224,233,21,57,182,101,125,205,59,1,177,66,94,201,57,92,178,22,248,208,162,185,167,65,252,65,174,249,190,111,15,46,245,126,228,53,79,141,12,27,26,12,14,179,155,100,121,144,55,181,28,139,153,164,53,228,44,74,222,46,58,150,103,112,187,17,105,162,60,234,95,227,9,170,77,233,61,2,123,36,27,118,205,120,197,217,41,164,74,115,138,18,186,10,94,172,50,8,143,103,229,12,89,73,231,182,72,50,13,
+130,161,102,148,22,206,144,29,189,111,5,136,252,115,187,181,14,176,219,162,174,70,230,89,72,52,237,52,74,80,220,58,191,87,62,92,133,74,134,21,206,20,79,153,69,246,172,197,116,246,32,64,81,247,217,5,96,247,164,85,48,131,48,49,96,129,10,49,169,16,217,79,95,218,185,34,34,216,222,30,206,129,93,54,46,87,21,99,24,55,236,22,61,83,186,252,231,245,177,45,173,226,20,78,182,119,200,44,98,175,73,170,216,76,67,128,22,54,27,216,141,163,180,155,21,251,143,236,84,64,5,172,85,97,242,182,250,244,4,83,187,70,183,181,8,88,210,119,86,89,199,128,194,4,106,187,17,68,142,199,1,201,168,73,134,130,141,36,41,169,101,183,30,12,165,207,220,19,169,142,231,97,5,178,247,212,14,175,228,58,229,213,156,183,155,59,205,103,70,141,45,237,36,81,228,118,148,172,98,210,21,57,3,246,57,153,23,168,31,13,210,39,3,239,169,228,24,33,140,93,80,39,152,221,186,178,254,101,74,133,61,231,251,161,74,214,155,54,239,120,194,193,136,49,143,182,
+164,168,178,90,59,76,164,176,118,168,234,101,43,98,171,219,71,249,74,181,141,216,175,239,247,46,248,126,118,4,1,140,141,171,190,90,145,209,45,182,10,0,13,57,58,110,134,134,131,173,217,58,66,9,207,173,164,2,85,127,178,39,135,106,48,171,69,123,96,81,150,244,57,169,165,45,34,67,78,96,116,81,199,170,167,205,57,142,109,205,232,237,139,45,89,217,81,38,13,145,136,217,215,118,140,101,67,67,167,120,194,179,153,205,194,76,139,204,239,147,24,157,141,134,149,5,39,217,28,12,230,186,114,69,196,3,230,107,241,30,228,3,153,112,135,21,217,10,51,63,128,198,66,171,164,92,168,247,104,226,83,113,231,122,109,21,178,246,3,32,120,68,137,138,166,163,247,57,120,39,80,188,176,247,136,9,168,151,85,74,118,230,245,154,48,26,38,50,101,63,134,152,199,141,105,147,122,92,86,120,236,12,58,71,216,94,54,243,180,220,3,193,24,110,200,63,223,103,59,135,133,24,46,217,38,158,198,7,73,27,1,75,107,97,234,215,23,152,200,22,15,50,13,136,6,54,
+70,182,246,58,78,33,108,41,123,230,12,94,71,114,219,80,46,5,40,33,253,32,27,4,52,98,111,249,19,140,179,147,225,202,252,107,140,97,121,163,178,63,36,100,220,132,54,123,13,175,218,31,133,49,191,17,181,83,85,196,42,153,119,244,226,89,176,59,196,204,192,40,50,68,142,6,28,39,158,60,37,31,80,207,180,41,65,158,154,238,51,147,86,84,51,79,247,238,58,122,138,0,90,187,59,121,140,91,195,99,5,160,207,96,102,195,137,100,65,163,139,110,124,200,116,102,32,16,122,17,213,186,42,16,107,26,49,37,176,44,81,232,56,67,55,253,116,107,212,144,63,81,69,2,118,165,173,9,130,49,3,83,198,156,135,23,185,208,28,25,105,29,2,208,128,154,227,90,110,82,172,151,151,246,2,90,57,244,182,211,156,111,28,81,133,7,54,161,57,240,47,244,39,101,37,52,213,131,186,68,78,153,77,15,198,30,76,183,86,131,153,215,153,233,183,81,240,129,215,7,219,197,37,188,238,41,130,39,74,75,4,94,160,96,175,176,53,5,226,212,138,178,2,226,18,169,
+185,121,18,97,167,86,139,56,120,236,209,76,141,129,239,225,120,121,58,100,175,184,49,98,182,42,105,150,52,109,70,122,153,182,5,162,88,30,143,226,100,230,118,107,185,57,71,81,83,40,146,49,185,82,79,92,158,246,184,201,1,19,13,130,108,77,82,246,126,36,119,178,226,136,184,248,164,194,236,166,108,240,204,37,16,186,74,100,99,144,161,121,200,51,40,242,8,86,217,136,114,36,33,36,73,28,66,81,222,182,169,155,78,54,252,154,245,174,169,156,216,18,15,177,84,143,91,186,133,230,86,43,121,50,101,77,186,2,134,203,97,95,25,46,187,222,245,170,248,134,229,6,54,8,6,210,230,52,158,24,113,75,149,171,178,241,161,56,29,68,11,244,137,101,119,88,215,78,75,92,79,106,166,23,119,219,138,57,84,231,159,168,29,140,20,73,135,37,40,38,171,252,37,12,201,143,36,178,25,48,219,107,62,150,152,186,165,159,203,186,55,117,176,102,250,182,127,230,55,238,152,207,249,195,75,120,102,103,180,44,171,241,237,162,141,170,63,122,211,2,145,46,123,12,153,102,
+101,31,21,165,49,246,125,25,178,127,255,0,110,154,212,10,133,59,58,215,19,177,187,206,221,22,203,43,148,120,152,232,97,166,47,191,150,189,108,160,141,204,49,100,203,246,185,93,219,41,157,168,59,142,19,177,219,82,239,99,172,20,108,187,114,199,117,80,198,195,1,11,221,112,224,187,147,85,47,57,207,224,193,99,52,60,85,160,151,45,37,187,59,107,200,139,99,124,34,204,165,123,244,213,42,85,81,74,215,124,224,244,93,87,26,117,204,195,76,152,0,56,110,160,33,62,148,231,12,216,193,80,141,41,91,19,89,157,172,59,27,127,77,124,28,93,179,124,144,108,197,130,141,102,79,24,7,104,116,38,60,114,247,40,222,78,129,26,233,135,42,68,41,34,215,59,97,81,103,101,178,176,2,219,59,60,229,44,200,188,2,111,32,39,80,150,182,66,2,28,51,54,90,192,236,93,3,231,235,27,180,134,205,28,81,88,149,240,125,142,227,168,145,197,51,64,240,16,0,120,111,11,196,62,119,134,128,123,48,130,125,248,193,65,111,54,76,37,104,26,224,118,166,121,50,146,
+61,72,32,148,59,148,133,239,136,225,2,247,28,74,149,44,124,154,132,158,4,222,254,203,248,174,48,219,35,15,98,238,131,164,44,206,12,64,62,128,101,150,201,24,172,92,130,157,114,237,213,235,240,11,163,141,153,199,248,91,53,235,145,194,149,131,96,71,20,128,83,6,234,64,10,43,163,236,47,25,248,131,39,250,16,31,118,67,107,243,5,101,9,159,242,154,108,150,137,202,133,234,215,160,74,211,55,4,80,99,212,109,216,233,168,13,94,217,147,2,155,45,210,128,30,102,82,154,5,157,12,111,198,29,47,208,111,56,123,6,82,31,29,79,52,15,30,203,66,179,108,236,77,247,74,152,45,168,110,125,154,205,193,202,157,18,82,229,41,147,44,98,251,82,42,141,51,15,122,196,82,61,146,246,111,242,26,99,136,187,212,203,35,50,207,157,140,212,125,172,113,179,138,232,235,184,114,141,232,110,241,247,22,210,16,193,95,150,211,26,232,253,202,43,33,61,226,205,194,193,48,148,158,129,52,231,115,79,34,35,221,0,225,102,43,209,159,17,174,170,70,89,3,156,115,12,
+180,82,161,88,109,148,173,135,52,46,198,44,133,197,5,78,128,112,125,105,15,23,227,184,89,154,174,0,32,188,153,38,36,24,110,208,74,173,165,211,8,161,114,162,57,59,201,30,26,70,158,236,50,221,219,7,26,174,12,189,93,231,238,48,81,196,116,55,128,189,158,201,13,129,30,171,144,224,223,157,147,178,245,197,4,139,178,159,20,213,9,201,17,57,86,37,83,165,235,183,30,221,150,142,0,132,204,237,180,241,26,143,142,12,66,56,225,225,45,131,9,7,128,7,29,119,135,162,196,53,222,89,235,3,27,179,177,215,41,48,116,153,145,61,224,197,250,128,199,178,161,161,186,163,107,86,153,136,154,233,243,81,110,149,73,57,180,129,147,129,18,104,8,18,194,39,90,47,7,206,7,76,162,159,189,62,49,102,177,183,211,39,246,24,82,34,152,105,76,103,44,158,161,47,145,133,69,143,54,233,237,80,217,128,26,172,79,26,191,201,44,157,19,210,192,108,16,108,220,202,72,182,158,85,70,89,122,95,195,105,160,50,101,77,35,124,214,158,148,140,75,216,230,228,54,201,
+99,45,11,151,168,68,218,246,92,170,66,167,129,244,112,207,75,174,200,201,99,142,56,145,70,151,145,39,119,177,171,204,39,78,82,223,41,90,224,232,6,97,199,17,160,172,88,121,89,185,250,18,187,105,90,188,182,77,52,133,253,114,251,178,229,154,47,167,63,233,176,238,236,102,37,36,104,175,10,150,141,64,122,141,224,117,169,28,237,229,34,23,249,62,90,173,115,205,119,138,84,26,33,187,61,20,25,148,203,7,221,67,185,40,52,35,198,151,56,211,47,113,133,94,122,82,32,231,246,114,76,85,55,227,197,119,116,160,108,105,155,168,146,44,202,170,235,205,142,206,103,25,66,104,159,224,203,166,203,12,114,176,72,208,27,29,47,30,217,225,118,103,144,68,137,1,29,153,148,203,142,72,223,184,148,111,19,232,201,87,147,142,175,226,172,2,165,80,189,52,145,90,93,154,173,157,207,230,87,65,124,71,209,200,98,106,129,44,158,229,92,23,114,64,129,238,58,153,5,56,36,68,103,221,86,112,77,94,86,207,119,233,99,39,86,158,163,164,56,247,203,163,127,14,108,179,
+219,162,34,12,102,235,228,228,45,56,6,87,167,175,89,21,101,140,137,204,165,69,189,181,207,234,236,151,93,235,195,174,6,45,26,132,24,66,71,157,234,244,200,157,201,33,27,142,31,189,233,28,240,49,240,72,142,39,197,55,61,26,1,111,164,152,233,13,36,19,9,147,81,13,244,251,7,186,176,131,204,25,250,160,167,113,29,111,75,238,167,75,220,114,210,144,228,117,129,199,71,100,10,51,54,13,155,227,230,11,226,40,208,244,92,98,152,44,118,242,139,72,103,196,243,226,220,167,72,0,196,223,199,170,127,252,147,15,255,242,243,87,159,127,249,253,27,145,121,131,93,63,251,248,211,111,223,160,232,175,62,126,120,255,181,243,247,191,201,211,254,244,151,111,252,244,11,175,252,213,167,239,127,249,213,215,31,190,250,254,23,31,127,250,249,11,234,252,248,219,191,244,254,163,15,127,245,150,6,248,245,215,111,104,236,61,71,251,63,182,252,5,203,126,251,253,23,22,247,243,47,215,222,129,223,207,190,253,240,205,183,159,127,147,130,249,158,242,247,213,79,191,24,254,183,111,
+217,135,63,251,238,171,191,250,98,246,223,125,250,230,157,250,253,249,183,223,189,103,17,126,254,240,23,151,38,190,249,98,239,195,215,31,127,245,241,235,159,124,248,215,63,58,243,3,29,125,119,247,255,249,195,223,244,253,79,63,252,192,84,191,121,235,207,167,207,239,44,239,82,230,215,249,179,63,18,202,119,159,63,125,255,225,175,190,250,235,183,98,239,86,191,255,252,213,119,23,151,62,125,255,139,175,191,250,235,55,114,247,179,143,223,255,244,187,79,191,248,130,150,47,23,127,250,5,14,254,136,65,191,255,1,240,125,245,225,255,250,248,245,47,126,72,42,253,201,123,254,230,15,253,255,77,168,190,116,227,231,63,32,157,239,63,252,193,59,168,253,197,191,252,248,150,11,250,249,219,239,222,67,249,167,63,38,79,254,139,111,190,255,248,249,135,75,111,41,175,255,232,210,210,47,223,225,230,119,31,63,255,242,187,111,46,77,126,247,241,231,151,27,111,89,154,23,143,126,200,244,252,139,175,191,253,243,203,104,126,251,231,255,246,210,251,63,122,199,212,239,9,179,111,227,242,
+205,183,31,126,250,111,190,250,230,47,222,28,190,140,255,47,62,126,247,249,211,101,156,190,251,248,239,127,249,233,187,55,142,251,133,35,191,221,190,84,250,203,47,180,227,103,159,126,254,222,202,91,128,222,192,192,23,170,254,87,159,126,246,23,31,63,127,255,22,230,159,254,242,187,183,219,255,131,145,254,192,72,63,252,78,206,253,111,32,233,135,223,193,164,255,228,255,253,205,98,253,254,253,211,255,0,168,255,61,0,212,223,134,109,151,33,251,201,219,178,190,216,249,87,111,27,197,23,221,200,247,63,140,201,15,139,253,125,199,252,49,105,253,227,127,248,234,77,176,240,59,65,251,123,114,216,191,139,3,239,69,255,254,237,255,15,154,251,95,133,230,254,71,123,248,31,252,163,191,217,198,111,99,223,223,179,241,101,11,248,79,220,252,205,163,224,247,44,255,157,177,241,123,193,127,125,217,222,223,159,82,127,246,127,252,222,150,243,119,34,203,191,5,160,255,115,150,254,255,165,207,255,244,127,251,147,127,248,191,254,241,159,32,174,242,0,252,219,127,21,48,249,66,159,31,89,
+99,54,50,149,74,47,42,110,236,100,170,220,105,172,121,165,140,83,151,161,146,87,115,32,54,117,184,7,192,105,19,1,121,230,3,206,35,250,200,196,20,178,10,219,202,155,140,115,60,88,13,101,168,177,78,175,143,140,7,117,199,49,120,247,250,74,206,82,55,68,240,225,22,66,163,94,221,1,111,59,4,109,245,76,142,221,68,89,209,125,205,64,179,184,207,170,170,181,48,140,57,247,163,99,212,85,113,229,247,35,186,142,81,51,52,220,0,224,21,0,130,162,89,195,181,198,117,108,227,35,3,194,97,26,183,238,199,179,193,108,50,177,228,183,139,186,90,125,100,57,52,84,31,90,165,140,22,75,167,89,200,97,129,86,76,207,167,25,100,129,31,217,162,25,160,30,87,162,96,108,242,124,34,183,81,35,42,122,107,87,72,119,168,248,52,186,214,18,21,98,55,216,174,111,226,151,61,164,110,198,98,237,224,119,192,83,136,113,0,101,202,131,147,252,117,88,161,194,238,153,242,43,108,85,15,113,212,209,123,110,209,186,66,114,231,236,231,7,239,90,200,165,235,249,144,48,
+124,143,195,154,38,72,134,17,68,42,76,130,163,12,162,17,12,185,97,28,192,114,94,93,17,151,163,214,67,84,58,139,79,247,47,194,77,207,33,175,41,107,175,68,86,168,208,204,157,13,32,216,182,54,237,64,107,162,107,38,108,180,4,221,242,239,74,84,96,74,98,85,38,56,57,229,45,126,79,176,122,30,226,62,16,40,83,2,209,4,249,44,125,54,247,240,189,196,87,68,80,210,37,212,84,251,118,22,24,38,216,171,146,91,97,108,62,172,57,101,140,251,104,231,110,84,116,202,228,0,180,231,149,18,17,224,25,61,23,94,11,135,164,25,196,132,197,59,204,19,51,183,93,129,111,79,89,201,124,195,65,159,191,94,161,57,44,35,132,51,178,170,228,67,89,216,190,235,104,138,171,210,202,97,215,139,91,233,69,142,254,28,49,226,8,149,129,38,54,194,129,4,189,148,250,57,170,195,251,80,115,169,255,166,126,35,11,188,2,76,96,164,244,14,78,185,21,92,247,238,128,249,60,82,28,36,92,78,126,203,27,74,134,216,201,202,238,7,0,81,20,32,199,225,58,116,
+248,29,196,118,95,163,93,83,72,0,249,84,78,88,86,102,190,176,2,213,208,198,107,89,54,182,86,239,157,213,14,151,148,186,86,31,204,65,236,70,42,170,26,61,26,124,133,156,140,114,6,108,117,29,30,58,113,183,230,9,13,166,72,194,37,215,97,67,243,94,65,164,101,228,132,162,110,46,79,57,112,86,44,160,232,13,60,175,12,110,207,20,109,222,55,195,51,50,80,242,220,74,63,200,185,60,100,204,69,16,128,232,189,164,149,184,120,34,47,21,87,75,111,110,56,67,219,74,66,210,254,65,216,167,76,52,116,233,244,156,45,173,167,15,13,86,246,233,232,207,11,80,106,91,48,140,220,50,232,125,125,182,228,3,218,188,167,84,10,41,13,12,30,7,154,120,107,191,121,76,209,30,30,86,165,12,102,132,67,14,17,214,64,143,136,95,161,234,108,188,219,110,30,201,101,202,194,38,181,109,47,242,34,242,157,255,44,156,65,124,207,175,139,185,120,72,141,166,99,204,22,32,21,166,67,73,98,181,35,28,192,164,125,88,204,221,77,198,116,187,245,50,198,9,139,26,
+191,9,116,210,246,51,44,241,178,202,119,125,169,209,214,18,4,227,182,133,61,163,234,11,240,46,135,85,242,220,137,245,225,105,249,185,154,154,117,42,112,24,41,143,222,57,135,152,66,185,248,217,170,145,36,143,29,206,240,176,126,113,106,135,99,198,118,109,74,57,44,254,185,226,105,30,66,90,200,195,37,53,123,122,5,110,233,132,109,167,171,141,12,181,55,97,89,18,21,34,162,148,22,108,79,39,26,36,29,30,36,239,202,133,64,111,12,57,198,152,223,136,251,57,41,73,64,180,126,89,224,104,249,160,143,31,223,218,50,187,230,128,134,151,248,196,109,44,22,96,198,72,141,65,207,28,104,205,136,40,146,156,197,184,183,61,189,172,135,43,103,117,184,168,15,211,197,27,197,185,96,126,210,214,225,79,45,234,34,172,106,93,161,31,201,177,136,201,229,200,142,237,86,143,153,23,84,123,245,81,215,244,41,239,207,247,22,58,200,104,187,25,188,240,232,18,24,0,225,59,158,112,207,248,229,181,124,31,218,145,17,122,108,112,127,141,120,244,199,241,50,27,132,23,146,36,
+18,143,137,230,19,119,44,72,168,226,15,158,13,2,20,129,248,22,131,252,109,125,124,126,97,186,236,58,227,32,246,74,166,188,134,100,156,101,181,117,10,137,250,119,25,212,51,130,212,36,194,137,16,86,206,19,69,105,105,237,110,68,78,211,101,218,84,99,163,84,10,84,244,9,7,188,195,143,226,153,18,196,84,5,147,242,132,136,128,172,87,192,167,176,142,54,125,48,62,95,159,176,42,206,9,35,144,247,159,212,14,252,40,0,63,102,85,136,76,12,41,245,209,28,70,30,31,148,188,82,157,134,213,237,32,87,234,207,123,91,186,103,157,69,143,21,25,223,222,133,226,242,187,230,69,203,193,192,52,117,44,84,196,215,196,141,123,245,102,174,112,98,100,60,83,131,225,49,143,96,112,31,10,189,179,7,118,231,72,219,119,51,129,127,236,81,48,98,42,210,24,92,200,221,134,16,155,254,43,185,20,210,172,31,109,0,62,117,180,245,130,86,22,178,148,251,232,219,229,164,41,135,214,62,168,191,138,235,246,214,81,131,218,210,248,28,19,220,110,150,199,152,247,34,170,24,
+128,150,69,24,39,103,197,27,246,221,193,25,41,112,195,78,28,113,208,194,156,135,50,165,119,172,210,7,124,101,108,83,110,68,84,86,130,108,58,44,178,129,18,28,181,197,201,120,154,98,98,22,177,14,199,130,145,152,158,26,26,10,190,90,87,149,190,134,184,154,130,20,156,137,49,145,10,238,151,185,163,239,227,70,109,210,64,230,94,198,222,7,44,3,101,254,42,32,195,244,2,24,136,205,163,245,171,92,184,241,201,74,196,165,3,174,51,226,244,2,105,249,228,9,12,182,139,195,40,99,176,132,16,3,115,112,56,218,73,88,53,227,229,189,248,196,8,248,4,186,78,224,211,154,68,49,46,231,109,27,144,85,118,240,164,2,163,44,189,174,78,93,152,212,209,202,215,29,69,176,28,90,110,34,52,139,137,129,76,152,90,199,145,64,12,39,39,99,212,184,43,90,104,77,216,249,19,51,71,202,144,52,13,249,136,108,47,108,177,84,126,135,224,184,202,150,125,57,40,162,211,213,237,195,234,10,100,60,200,35,69,237,59,185,111,218,245,244,166,234,147,123,59,130,30,219,
+179,171,87,56,182,80,130,237,107,72,205,26,159,79,179,242,130,140,207,98,214,0,144,61,156,185,44,222,37,101,175,122,207,99,47,119,6,98,31,229,207,50,190,170,73,88,1,60,136,71,4,147,123,115,74,151,200,83,156,17,23,131,102,143,47,180,155,103,133,21,128,130,44,113,124,106,137,233,201,166,226,94,6,224,97,125,111,141,188,173,241,211,140,165,86,28,175,202,55,67,189,110,68,60,85,84,68,169,198,71,182,207,43,201,67,17,91,201,139,85,220,7,197,236,76,188,171,14,152,140,77,119,30,13,170,132,156,89,242,197,155,155,55,150,42,245,220,106,244,51,206,47,96,36,230,198,162,154,190,220,108,104,224,154,173,63,85,205,71,214,240,254,97,91,4,250,43,72,253,181,3,122,190,123,72,63,96,208,26,137,72,42,152,141,95,54,203,220,45,177,61,231,116,219,15,101,222,204,167,173,239,103,116,59,123,9,191,90,188,98,33,89,239,171,204,5,115,185,70,9,32,149,212,69,149,92,187,27,25,87,198,99,211,60,78,138,36,139,151,95,143,18,187,80,17,215,
+211,156,23,108,121,90,183,77,15,245,247,175,149,211,249,177,186,108,184,20,231,162,68,119,136,206,211,203,152,153,163,39,191,142,132,54,2,194,216,218,226,49,229,197,1,239,246,3,39,243,155,9,114,176,53,89,26,79,123,245,250,105,84,87,93,246,119,156,235,65,106,232,8,155,56,106,126,230,107,51,158,53,91,54,179,106,162,166,156,219,87,29,155,116,110,103,115,62,213,228,116,223,29,208,206,164,161,30,173,195,172,77,92,42,87,59,221,62,60,247,243,251,64,159,99,45,117,86,47,146,150,103,165,185,227,60,180,54,88,132,104,66,191,30,113,218,64,199,115,76,197,34,244,49,240,210,166,65,174,66,86,144,115,100,22,101,13,12,102,85,29,197,239,158,88,190,232,156,119,93,52,203,38,229,71,102,227,184,135,248,70,74,74,182,107,19,226,58,144,221,243,141,189,5,220,247,109,189,169,151,206,238,170,104,245,105,29,89,151,166,229,3,56,93,35,147,105,253,204,155,128,86,175,122,50,121,8,219,70,219,58,219,18,182,183,180,125,16,53,36,112,143,119,18,238,22,
+199,173,159,106,158,3,199,115,168,206,159,233,71,149,35,121,62,211,3,55,94,93,160,209,137,140,98,43,32,222,239,171,191,48,201,169,209,10,135,166,103,93,47,110,254,88,221,45,251,202,110,179,39,107,29,136,198,182,51,164,78,66,79,88,88,128,173,248,56,178,178,183,16,58,219,201,63,93,198,130,104,89,95,241,77,91,140,75,243,116,84,46,247,26,102,213,144,101,228,16,35,30,57,51,77,241,102,178,87,126,246,232,113,101,57,209,125,83,72,217,43,64,103,46,76,197,117,212,122,98,243,9,255,152,74,5,142,146,224,226,242,70,146,12,86,246,104,99,50,135,170,188,204,168,227,54,106,11,107,237,203,134,236,89,76,223,244,225,35,187,209,137,55,43,34,155,168,189,192,150,93,23,223,210,243,166,181,94,203,144,133,190,238,110,195,14,79,17,2,65,218,84,96,109,192,61,196,139,13,130,140,165,103,196,115,17,138,24,220,116,184,11,101,150,45,68,191,205,240,108,131,169,92,156,73,37,250,22,75,173,16,163,45,8,95,77,209,81,27,69,159,164,241,217,97,114,
+9,87,93,94,149,130,122,102,52,27,69,61,227,201,87,13,21,62,145,72,249,156,177,46,76,115,219,24,232,160,136,69,160,233,82,221,184,111,155,183,71,108,71,229,216,82,225,143,47,60,105,24,18,221,249,207,65,79,31,132,125,193,149,101,103,10,188,56,57,197,61,195,195,70,72,167,229,95,73,107,62,53,48,210,78,175,219,207,247,142,202,90,63,190,31,237,234,44,173,153,108,136,70,51,250,196,29,35,47,68,36,228,248,98,66,97,61,182,30,214,47,150,106,172,232,60,100,224,190,29,193,187,142,88,159,174,131,204,23,151,230,84,196,28,42,36,155,149,66,7,114,226,226,183,63,9,125,151,130,70,9,102,85,75,44,153,193,130,47,148,167,155,229,49,238,154,74,103,51,33,253,150,219,247,105,103,129,45,111,136,191,179,17,42,126,134,50,77,127,222,189,50,137,47,58,223,58,181,136,245,242,102,203,35,149,80,63,251,244,72,173,238,76,124,130,161,61,72,56,28,177,158,24,16,160,196,45,94,139,35,43,82,158,44,175,193,99,62,158,180,61,44,195,90,84,32,
+148,134,57,100,236,52,199,224,89,212,46,115,238,163,57,64,150,159,70,235,115,91,242,6,98,75,115,154,252,148,58,51,176,46,220,25,125,209,136,120,70,75,178,86,79,38,35,43,206,146,210,241,246,234,154,22,224,158,244,248,76,32,226,70,134,116,203,226,76,22,17,223,121,110,71,253,16,141,202,63,248,15,252,42,168,1,172,39,183,172,44,245,149,241,228,196,77,232,86,107,90,87,189,155,128,205,42,255,180,91,131,5,89,48,48,59,135,167,247,115,90,91,217,60,18,205,224,224,64,134,251,28,109,61,175,164,155,5,232,17,97,213,2,235,55,139,18,246,24,126,92,243,224,107,22,43,115,31,121,74,131,107,35,210,52,129,135,132,121,188,49,127,5,216,193,28,161,68,103,182,48,9,152,225,84,181,12,10,214,111,27,113,161,186,116,110,155,128,84,45,182,60,215,39,150,186,214,148,68,108,119,247,235,94,139,138,146,198,94,180,179,234,200,195,74,230,15,2,253,177,219,237,94,237,218,46,37,177,178,87,88,224,119,150,109,134,125,187,101,213,14,16,239,177,251,130,
+27,91,231,207,34,255,203,0,94,122,168,73,100,227,81,196,187,240,92,207,163,71,48,181,59,159,105,134,215,35,174,158,101,174,55,50,39,235,245,154,148,26,71,181,215,11,6,232,5,114,226,42,115,55,203,28,223,112,29,209,27,228,70,211,142,234,224,117,105,30,160,151,172,53,0,17,114,246,48,35,62,100,36,71,144,45,8,17,98,213,39,154,114,33,162,83,188,116,10,23,173,83,209,250,65,150,172,163,158,249,57,232,103,243,68,198,90,67,175,176,194,29,49,210,24,192,155,177,148,127,218,156,75,31,212,15,253,12,249,53,222,229,156,84,149,60,102,200,202,110,165,14,60,72,212,154,36,188,183,117,91,111,193,169,223,15,229,152,74,14,89,8,180,170,32,119,192,246,132,57,147,238,43,10,40,84,213,185,225,114,18,235,135,129,91,172,0,81,48,110,42,20,135,129,66,108,168,18,150,46,76,18,153,21,8,83,87,173,69,154,222,14,247,85,97,213,4,78,251,187,72,169,80,238,233,165,142,216,57,156,117,39,13,157,99,171,154,94,39,117,13,138,182,169,174,222,
+56,75,214,88,224,197,107,31,95,79,117,211,102,161,196,51,22,38,149,90,17,167,166,6,37,48,83,167,187,4,111,31,131,41,113,84,211,19,81,165,28,69,121,63,173,26,4,119,214,155,2,186,191,28,24,15,156,65,32,162,139,203,250,139,168,113,138,8,238,242,110,167,185,69,53,224,149,202,161,3,159,53,35,22,18,162,169,72,163,207,156,76,210,118,33,184,105,51,225,30,89,7,117,205,172,171,216,174,176,61,124,35,106,132,49,90,37,66,159,84,192,212,221,235,108,116,14,215,180,80,128,229,16,179,181,144,159,39,166,112,0,33,101,181,215,53,117,221,84,246,1,82,40,181,16,135,181,10,197,189,57,116,174,147,231,13,41,223,184,184,104,162,157,216,51,35,154,61,122,173,114,34,216,11,234,50,175,50,38,71,194,123,38,183,76,87,136,231,106,159,55,38,224,180,179,248,229,192,178,78,166,156,64,62,150,64,240,23,56,92,188,11,204,51,198,250,160,151,234,211,10,141,115,6,22,79,194,171,169,49,101,170,48,143,252,179,3,96,86,176,69,251,199,12,91,76,
+175,15,109,197,154,32,205,191,227,26,1,234,253,173,41,170,75,120,132,57,134,80,187,152,69,114,50,225,2,168,168,228,224,132,77,225,174,7,215,94,25,158,205,71,228,130,27,233,18,173,197,83,131,107,179,229,151,103,124,107,196,57,62,118,18,176,216,129,194,141,132,21,222,245,78,237,140,192,89,75,231,250,206,154,200,153,137,234,147,37,202,157,176,8,179,53,252,158,85,166,16,50,26,208,30,229,212,37,93,170,66,146,99,137,226,44,126,33,206,82,48,155,74,122,208,94,98,57,214,218,79,144,42,141,93,15,232,99,251,227,149,51,57,73,122,154,149,61,116,139,143,52,60,202,2,212,31,215,140,92,2,51,98,221,209,73,241,90,15,47,157,56,251,96,252,77,64,129,204,181,131,103,7,18,121,100,201,148,60,255,78,72,222,202,117,38,45,204,134,185,78,75,162,109,107,3,15,126,216,61,76,72,104,231,241,44,19,45,165,112,230,124,49,78,122,132,119,216,97,18,241,216,75,122,150,253,122,184,221,247,132,158,61,203,235,224,229,237,231,136,158,249,214,52,209,218,
+20,182,220,70,92,92,55,181,126,4,174,184,157,152,186,153,245,224,11,48,233,83,36,14,86,164,5,70,2,121,49,96,212,95,112,81,175,215,237,209,144,235,55,92,221,206,61,53,238,39,16,138,84,230,145,138,181,229,52,104,99,95,216,88,118,230,10,237,42,89,23,1,156,240,25,95,142,197,204,170,195,121,112,62,208,128,219,168,230,106,206,135,146,188,24,48,7,253,114,126,41,84,57,200,231,23,155,217,18,122,20,6,203,42,127,101,115,234,135,227,62,188,19,213,245,56,156,200,186,115,197,169,82,123,148,92,28,252,224,75,96,23,102,233,54,89,157,36,128,120,204,16,173,78,118,144,150,39,183,51,10,106,81,104,154,227,227,218,73,31,114,27,53,195,83,100,155,236,195,142,123,124,52,133,172,218,236,153,197,93,109,154,226,10,109,55,246,241,164,199,17,184,176,182,197,122,83,86,216,60,147,18,179,114,212,87,55,107,213,195,139,217,78,219,21,169,30,27,123,202,160,108,212,222,115,205,138,227,120,174,28,78,26,211,61,98,87,179,115,110,230,60,51,90,211,210,
+193,40,71,238,103,196,50,140,209,13,121,132,216,112,36,102,241,129,14,232,23,47,111,237,8,43,111,128,54,2,203,218,215,251,130,188,190,14,60,249,84,139,93,3,238,42,147,119,124,14,42,157,54,221,123,92,143,67,66,177,36,147,74,105,147,151,189,50,119,82,27,155,242,33,245,17,139,179,184,16,170,72,31,44,212,97,217,162,237,118,180,132,194,170,47,238,252,181,96,63,165,108,116,176,35,173,89,228,136,221,210,252,41,24,173,238,84,97,249,16,12,99,11,140,184,25,250,165,127,13,22,206,16,196,108,136,107,92,170,246,139,128,103,147,240,53,248,152,131,188,84,123,114,102,83,160,137,189,15,94,153,192,203,46,22,210,162,66,224,214,134,85,190,47,9,167,219,133,236,133,232,131,241,18,214,126,4,200,240,62,177,114,17,82,99,158,67,225,242,231,48,56,180,162,18,25,100,238,157,154,189,39,114,177,188,192,41,173,59,178,204,32,253,243,93,131,116,128,242,120,17,127,38,144,200,245,32,32,38,103,113,171,132,112,169,34,131,93,175,14,218,42,218,99,35,86,
+27,92,31,99,39,55,108,28,114,80,50,96,17,229,14,172,112,212,59,82,89,23,137,83,94,233,28,152,3,125,77,239,187,152,125,244,9,34,133,109,112,169,39,124,2,134,144,66,184,124,4,172,120,43,125,96,168,196,235,71,9,175,145,199,197,125,94,190,222,231,51,48,30,7,66,41,204,28,187,230,33,128,117,23,119,129,128,49,123,124,4,15,86,204,132,234,161,23,132,69,197,74,105,144,207,55,106,41,194,240,76,4,73,1,171,25,41,141,130,201,18,132,108,130,86,39,131,54,82,222,64,45,203,61,194,125,210,167,182,151,140,23,220,149,120,13,153,168,137,74,225,235,137,27,233,60,221,237,221,37,240,38,236,21,31,17,40,166,70,19,132,189,98,134,217,238,201,16,60,26,32,229,49,238,65,9,159,59,133,159,33,165,94,31,220,23,158,148,82,151,47,242,65,186,20,218,231,247,48,210,205,132,253,24,5,92,60,99,53,200,215,116,181,123,186,33,48,185,139,154,45,43,175,212,119,183,8,5,54,215,211,42,225,138,120,226,136,49,161,25,215,70,88,116,28,87,
+50,111,203,92,30,121,154,195,238,65,210,149,91,126,113,55,149,76,108,111,158,113,86,16,78,110,66,88,9,186,157,22,52,33,158,64,190,229,221,211,170,212,155,189,140,97,146,218,166,146,136,250,48,96,119,230,178,50,29,74,212,136,153,58,204,90,21,139,227,208,20,250,196,247,254,255,143,189,247,234,113,53,201,18,196,254,74,105,30,22,221,139,238,198,204,108,3,218,1,90,15,218,125,89,1,35,64,144,128,21,246,97,128,238,174,190,61,85,152,154,174,81,85,119,107,49,216,7,102,210,37,201,36,153,76,186,164,79,71,239,146,222,126,100,146,76,146,73,239,189,247,222,123,47,50,243,86,181,43,205,172,4,65,3,1,186,184,153,204,47,190,136,19,39,142,139,8,198,57,39,96,209,208,78,160,222,240,204,132,39,232,21,35,233,8,199,237,1,243,106,147,199,36,12,22,7,50,119,182,190,188,100,14,226,152,139,198,154,171,93,9,4,147,195,19,62,243,42,208,182,20,226,89,241,225,18,253,228,136,60,32,123,225,80,127,135,50,39,132,175,66,118,47,70,189,112,
+0,247,229,3,140,204,202,237,75,241,54,190,192,58,215,233,195,204,101,168,146,75,227,90,78,6,210,191,228,149,31,250,30,111,200,250,234,17,12,180,123,182,121,59,181,180,72,135,3,92,160,126,240,29,185,213,15,134,180,219,196,52,89,229,12,203,43,235,101,24,122,139,76,55,30,87,54,250,66,248,42,195,191,68,237,20,66,124,76,15,51,213,247,72,70,243,217,174,122,184,23,36,75,236,103,98,200,142,190,53,243,238,155,13,36,239,62,34,72,154,4,130,53,18,149,81,177,234,175,51,161,37,49,47,29,119,147,243,17,123,11,139,202,30,138,79,56,162,1,205,187,55,84,99,4,32,49,117,56,168,254,206,157,128,199,32,222,232,212,243,153,243,46,136,177,99,133,175,115,39,121,120,120,189,140,69,207,145,177,172,191,4,59,82,254,74,48,23,165,129,174,165,27,180,39,132,218,187,100,130,207,213,202,134,231,130,209,133,160,253,120,139,236,235,195,184,131,244,226,140,124,17,180,251,248,188,172,101,48,33,133,25,218,91,228,69,58,50,202,233,113,65,144,29,18,155,
+102,158,137,14,131,4,217,174,15,169,171,252,157,23,70,114,185,111,188,187,118,237,218,55,208,136,114,186,157,135,153,99,12,214,219,65,96,170,69,137,166,88,226,210,106,111,16,129,108,40,74,208,57,98,142,219,155,226,171,50,161,166,33,149,199,205,150,144,102,29,58,108,243,174,157,65,126,217,157,113,155,41,117,101,166,66,86,43,177,42,196,231,83,142,233,132,170,62,10,65,11,218,151,65,59,19,45,112,218,183,37,189,32,201,126,82,95,166,236,109,230,85,20,199,28,41,144,24,122,143,73,39,142,206,251,238,164,170,60,148,242,162,254,230,227,131,3,250,66,84,241,238,97,251,151,99,107,139,221,198,15,230,97,77,206,45,10,73,13,203,132,240,40,4,23,139,190,30,73,110,181,163,33,209,227,223,193,227,67,142,91,70,156,117,205,113,27,145,120,94,17,188,19,4,209,79,224,112,231,177,41,25,141,196,181,7,68,74,37,243,80,35,228,92,148,41,43,80,223,173,93,133,185,6,80,237,109,158,192,149,181,48,173,13,205,132,226,50,104,223,165,44,58,217,182,178,
+42,244,96,18,103,242,40,68,55,120,125,89,190,60,100,140,188,123,144,235,112,198,121,104,110,159,111,144,254,237,225,162,142,226,72,46,247,26,161,166,197,187,185,189,187,55,46,240,119,169,210,21,136,143,56,232,111,81,224,67,37,208,2,11,172,96,112,112,12,3,101,121,139,81,211,64,12,170,71,75,205,252,133,150,190,191,63,215,94,69,219,71,59,226,19,144,94,193,91,131,235,168,162,96,40,239,254,30,119,180,33,254,135,35,207,28,67,158,159,55,209,104,67,246,71,217,206,66,60,169,182,232,168,219,237,37,146,246,20,123,49,34,4,23,77,222,113,244,39,8,102,18,111,91,14,84,184,174,203,105,156,30,14,105,111,201,96,24,25,54,19,96,214,91,52,120,218,39,20,99,151,71,43,162,9,122,182,40,51,229,160,65,64,4,247,125,80,236,69,169,57,63,90,1,223,161,143,13,87,184,200,105,63,202,49,218,209,167,87,218,227,187,243,117,193,146,247,144,138,14,105,81,223,241,39,0,127,158,79,229,110,167,88,80,103,46,104,81,99,81,67,183,180,203,142,42,
+161,118,53,112,235,23,139,67,237,202,10,168,4,29,126,156,250,220,67,50,248,107,2,100,125,120,17,11,184,106,221,4,145,150,201,55,37,109,81,131,142,157,138,145,189,221,76,203,240,216,201,132,226,245,11,113,85,1,107,238,187,175,211,185,136,168,119,115,154,16,85,236,53,225,206,176,145,241,187,101,217,74,90,145,40,143,186,214,152,235,16,120,249,203,150,160,131,35,182,72,125,116,120,167,127,140,144,145,104,126,83,82,204,223,49,86,240,241,36,198,187,185,234,191,240,94,121,235,181,149,19,238,10,10,43,2,247,17,151,8,200,98,92,203,228,89,240,98,121,9,196,119,118,177,198,35,53,213,232,226,16,58,121,113,175,18,206,225,24,242,125,185,84,39,114,231,4,207,118,103,87,243,68,188,201,234,158,205,147,85,208,100,94,212,106,242,201,160,51,190,155,205,201,196,51,220,123,55,75,37,124,184,111,170,220,57,220,229,83,49,61,219,8,94,1,140,166,36,19,199,67,2,55,88,138,156,153,120,115,191,127,195,79,58,100,74,50,231,222,237,102,7,163,153,16,191,
+134,106,34,120,205,68,104,231,242,207,160,123,175,217,32,128,102,120,227,114,227,134,24,19,190,150,242,172,184,97,34,77,18,218,68,29,88,69,133,147,31,169,132,204,69,51,135,48,94,202,137,110,202,253,69,1,170,193,162,98,132,71,32,19,18,16,38,30,78,78,30,157,33,20,46,6,145,19,81,139,59,188,25,124,15,159,180,140,89,123,57,31,90,29,167,9,4,58,136,213,141,162,56,98,232,226,56,29,49,95,118,3,172,16,186,64,2,143,71,25,218,225,242,44,3,178,32,188,71,94,56,135,124,169,48,254,80,102,60,185,96,237,202,243,3,201,42,169,38,33,35,98,81,88,122,26,212,98,70,177,162,62,102,240,217,57,38,109,229,210,8,46,80,43,252,150,134,34,212,8,248,102,250,58,21,190,94,217,234,158,229,208,61,105,103,129,170,98,50,71,18,56,14,45,69,157,125,53,168,197,215,101,238,171,154,111,77,183,144,100,73,212,253,128,65,221,220,21,158,118,243,1,82,152,172,160,228,247,247,119,85,181,179,250,218,3,16,225,125,94,254,218,48,215,19,68,
+33,225,44,1,74,247,81,4,201,75,178,68,22,33,103,252,178,181,234,152,203,157,132,181,144,212,67,115,182,49,131,171,81,53,29,72,137,145,68,182,184,101,88,178,151,193,162,253,242,230,169,248,12,74,159,129,231,214,3,56,3,226,76,185,191,119,20,116,114,131,249,55,63,58,133,139,159,28,10,62,253,236,243,47,126,241,201,201,233,224,205,63,229,163,203,194,15,62,249,234,195,233,120,251,228,228,240,229,199,194,79,62,252,246,195,175,126,253,141,127,204,199,232,247,95,125,120,119,245,248,230,102,130,211,77,3,223,228,8,255,29,232,79,190,247,14,226,251,63,120,247,14,57,121,92,252,246,103,95,125,126,58,74,252,120,161,193,135,175,62,252,224,91,231,141,159,157,50,143,255,253,207,63,124,245,187,90,95,254,242,253,106,132,119,255,138,83,52,252,47,62,255,217,23,95,254,237,199,188,228,39,119,139,19,14,239,33,242,127,243,201,247,222,195,229,223,51,30,28,255,254,201,79,254,230,251,39,60,79,89,188,223,189,93,126,15,218,143,254,200,143,226,255,65,159,140,
+255,74,207,136,127,125,66,246,135,255,229,111,254,221,123,126,129,247,52,3,191,59,219,251,195,19,229,127,255,197,231,159,254,221,219,233,237,39,191,231,145,240,159,190,185,39,226,211,211,235,15,239,46,63,239,128,222,252,19,62,249,151,58,58,126,67,225,119,135,237,31,135,122,28,236,233,208,251,253,237,143,254,250,195,47,127,253,63,125,249,245,247,254,226,207,127,240,201,95,252,249,159,127,255,71,71,18,125,243,252,111,254,252,15,207,115,63,54,249,95,62,252,250,175,127,246,243,55,135,137,55,130,28,37,230,191,249,174,94,62,166,108,248,201,79,126,250,223,253,238,96,253,173,197,191,72,52,240,127,251,109,54,255,227,248,126,151,0,227,243,95,157,242,71,156,28,136,126,251,249,135,255,253,147,207,191,254,232,213,117,44,63,10,249,41,97,195,39,159,126,249,229,87,71,149,125,75,69,241,189,15,63,250,219,31,157,134,248,145,112,223,164,135,120,39,219,73,212,79,110,85,71,93,58,98,245,171,47,127,250,195,95,125,249,171,175,63,28,255,191,93,4,240,143,39,161,
+61,234,211,187,2,253,232,147,255,245,247,213,251,147,239,125,241,249,223,125,248,228,167,127,246,145,110,255,240,155,175,63,59,37,187,255,254,199,75,2,126,249,197,135,79,63,94,17,240,249,201,181,233,216,199,207,127,246,233,223,125,253,150,68,227,88,227,195,127,254,252,235,211,141,2,71,8,71,209,250,217,111,190,248,245,79,255,236,132,217,233,52,252,191,127,243,50,249,155,111,27,157,70,119,52,51,159,125,99,96,222,144,254,252,235,111,205,192,55,41,72,126,121,28,220,79,255,236,148,133,228,221,53,235,116,255,192,209,50,124,241,155,15,167,97,255,236,237,116,253,205,66,188,195,57,101,230,255,252,215,191,121,147,193,31,125,242,159,62,38,215,56,90,137,207,255,246,219,43,9,62,34,240,225,243,183,123,6,126,246,245,31,50,253,29,206,143,254,8,237,163,0,253,232,248,239,15,185,120,68,224,100,119,78,222,97,71,140,78,12,252,214,230,156,82,104,156,248,123,242,59,59,41,230,155,125,60,234,220,145,252,223,213,221,137,74,39,41,253,155,239,232,229,205,85,238,
+205,153,239,141,70,167,156,29,167,228,43,39,21,255,244,203,163,165,250,251,47,191,58,41,254,135,143,78,141,95,124,56,154,196,99,247,63,255,242,235,163,85,125,207,218,114,196,242,104,225,255,236,163,63,204,145,142,159,255,234,136,200,145,86,191,254,240,233,103,191,250,252,127,251,205,177,230,251,181,17,223,92,250,240,189,111,248,240,238,180,248,46,82,191,252,229,201,97,240,40,220,199,190,78,14,75,71,139,254,141,28,31,135,252,243,15,71,19,244,249,201,178,126,203,141,183,105,229,216,239,151,191,248,252,151,159,127,56,185,145,156,216,254,142,211,23,71,12,190,124,151,172,95,124,56,177,231,125,50,249,110,223,189,159,254,235,55,222,189,57,36,30,49,249,250,179,47,127,115,156,94,62,252,231,227,140,242,118,213,196,135,19,184,15,127,72,217,255,27,38,230,143,189,37,254,242,199,63,254,171,127,245,23,63,254,183,127,117,14,110,159,9,206,64,32,112,124,255,77,176,126,14,177,140,212,26,38,231,8,68,14,233,22,1,47,176,160,143,202,134,203,166,86,98,227,37,
+46,175,18,162,251,11,173,232,25,105,133,66,132,153,187,10,129,29,108,122,22,114,80,28,89,235,240,9,47,83,53,244,209,163,47,106,111,65,118,39,174,138,179,151,174,206,197,83,23,85,105,33,88,83,208,234,250,32,25,228,167,83,101,167,165,242,235,30,185,251,241,214,206,52,114,7,254,241,53,73,185,26,143,175,57,179,203,153,182,8,2,99,180,149,183,223,69,16,30,156,192,236,28,12,36,238,66,76,87,27,146,221,198,52,27,121,228,233,32,55,16,233,28,43,69,128,174,64,231,204,48,252,188,33,33,35,70,195,48,146,47,126,13,235,119,235,103,102,51,173,187,175,85,167,212,78,24,130,118,188,160,30,95,189,248,212,117,203,237,83,171,240,181,149,23,41,14,16,37,163,216,113,192,185,10,162,6,185,151,200,20,209,24,140,77,110,44,10,107,61,242,149,16,33,72,106,72,5,106,186,96,144,117,216,115,22,101,47,80,204,31,198,238,69,247,146,174,200,89,141,116,183,117,67,187,189,149,110,69,72,174,104,93,190,4,101,221,155,45,31,238,163,163,10,29,2,
+74,39,214,182,202,20,53,10,205,5,57,165,110,33,69,217,185,97,167,7,41,17,45,236,83,244,99,188,24,183,85,102,24,12,234,75,13,221,155,236,158,95,147,179,247,166,10,220,4,2,61,174,117,74,69,143,208,148,65,98,181,243,221,77,140,29,106,177,75,93,148,31,67,155,63,57,3,25,67,175,3,60,86,49,32,21,163,13,244,90,47,50,39,126,40,208,149,214,236,134,140,123,157,41,2,208,65,181,130,92,206,48,142,32,68,59,131,129,182,65,108,167,145,150,223,120,98,108,145,85,152,132,119,40,53,182,87,46,228,77,148,145,108,53,205,127,165,19,234,233,114,185,133,194,248,145,208,0,96,226,31,218,195,171,219,157,186,21,198,164,3,49,110,196,6,34,19,174,219,90,174,18,74,175,87,186,214,126,171,167,5,147,132,13,85,58,126,165,16,92,42,239,169,116,102,40,184,21,131,208,136,139,116,200,170,162,186,250,210,59,164,92,196,101,108,203,118,21,129,18,83,25,76,1,220,188,46,139,103,21,19,12,220,39,168,70,172,21,148,237,1,3,191,247,230,205,
+143,69,174,47,7,180,232,226,160,182,184,86,207,72,115,222,197,131,183,7,240,71,15,62,109,158,24,204,178,193,176,167,51,174,89,121,104,197,149,58,20,169,30,37,116,160,91,26,154,213,23,165,76,131,129,49,150,159,168,231,192,21,85,222,219,80,123,26,131,43,213,51,220,172,30,133,1,40,151,78,163,10,38,132,224,189,205,134,149,232,132,139,199,148,147,142,139,27,194,198,29,201,55,80,216,115,106,236,249,194,62,112,93,221,163,65,132,121,41,215,232,242,53,87,230,126,21,235,54,37,211,10,130,102,24,233,211,177,129,89,132,220,169,68,102,131,16,74,193,21,191,98,228,217,27,134,137,229,65,210,104,100,34,137,160,90,145,252,245,71,29,5,223,120,174,65,184,219,235,27,128,185,207,118,141,221,135,9,39,130,132,172,35,122,238,222,159,108,221,230,75,112,81,19,74,229,25,110,54,242,200,149,216,240,12,165,248,181,25,184,34,173,172,209,73,1,117,39,34,206,26,15,77,191,113,15,130,235,249,144,196,195,237,170,2,51,72,34,212,121,97,128,206,229,240,154,
+98,100,95,89,115,51,241,61,137,156,17,4,124,249,27,195,194,246,144,213,117,38,117,49,215,79,145,185,205,59,112,0,69,92,47,167,187,174,89,222,229,69,187,23,118,117,234,110,34,119,248,210,67,141,188,222,42,94,210,157,1,111,124,157,225,228,245,215,237,28,171,175,140,180,173,192,138,183,210,136,123,179,185,86,248,200,232,1,16,39,160,178,118,114,225,243,33,131,175,78,2,249,5,195,71,81,212,61,49,183,84,189,29,214,242,135,112,214,8,101,85,253,165,141,86,51,218,249,187,125,213,154,34,156,112,164,201,242,117,188,85,137,183,227,149,176,226,129,92,135,51,165,126,234,53,93,86,178,249,215,161,17,10,14,173,239,100,128,192,104,122,90,242,39,131,232,38,97,29,109,176,75,16,171,36,90,229,17,194,49,185,94,211,112,107,13,177,219,235,99,220,79,165,190,187,62,151,180,189,197,250,18,78,233,245,3,169,41,149,77,55,36,75,188,186,162,220,77,48,10,135,111,207,123,42,89,66,6,92,129,164,228,171,242,162,92,215,112,191,206,100,56,27,34,177,7,
+200,34,161,1,104,169,114,55,117,61,218,208,206,85,75,251,130,144,83,236,201,148,180,186,65,9,198,54,4,170,240,10,33,235,209,72,35,114,238,41,3,102,183,108,197,43,56,62,118,105,20,49,96,171,24,86,210,167,134,7,214,77,47,237,210,110,123,48,137,180,117,219,76,13,51,110,175,74,149,181,147,81,239,120,179,58,166,236,121,28,39,141,214,83,50,157,199,80,204,76,94,222,162,204,25,23,206,193,170,248,66,34,169,201,55,66,239,14,88,225,100,97,228,158,7,36,245,91,138,116,176,29,157,247,112,171,51,100,246,194,9,165,93,21,232,124,77,170,29,203,31,158,193,203,203,20,1,102,5,52,33,160,112,36,90,136,176,201,195,97,217,151,153,117,198,7,114,202,148,159,121,237,13,201,57,108,68,37,101,121,81,40,192,141,58,36,48,216,222,180,119,253,40,89,98,240,67,2,198,126,234,12,64,161,205,141,109,142,42,142,26,38,180,54,21,171,179,207,56,226,107,221,162,228,75,134,0,238,48,113,173,105,247,20,179,81,199,135,27,227,1,237,89,87,109,190,
+207,131,52,231,50,219,250,144,120,192,102,101,116,67,131,145,73,0,203,142,207,111,21,192,64,143,129,220,13,67,207,82,66,31,55,221,41,103,233,96,58,134,151,88,167,183,176,27,247,163,113,169,32,71,142,211,122,106,202,202,24,46,247,93,249,193,235,62,195,33,79,73,56,192,25,149,34,12,190,57,211,188,168,62,229,227,45,182,155,57,207,40,8,252,17,226,21,217,207,161,215,155,39,4,162,217,1,206,158,45,9,76,135,161,152,216,60,58,154,215,228,69,28,110,175,184,245,149,77,194,229,22,85,238,69,112,27,191,57,104,69,183,16,111,177,37,167,57,188,1,89,212,160,47,215,17,101,125,190,91,98,172,184,173,137,50,196,228,121,12,62,188,134,50,92,193,175,53,196,73,46,206,217,58,161,20,135,160,190,176,156,165,231,225,245,120,220,86,51,34,99,255,201,201,228,220,175,120,118,236,73,231,172,54,62,33,37,33,50,214,192,253,200,70,171,107,105,100,18,196,40,233,45,229,72,169,247,204,201,167,56,26,25,194,194,95,27,90,199,38,113,175,100,14,159,47,
+81,172,232,225,208,47,142,106,52,83,199,31,122,164,230,134,124,207,45,35,35,154,68,238,122,26,110,55,164,93,107,182,212,76,86,187,203,189,90,240,45,120,106,174,62,71,108,196,235,33,237,204,118,203,167,82,37,94,43,147,204,200,171,133,28,67,179,187,247,91,221,251,124,238,154,62,207,95,215,82,143,33,79,135,202,146,115,193,94,55,83,3,108,186,23,219,248,85,204,32,153,48,187,91,88,104,196,183,233,31,160,107,133,89,53,45,134,7,122,126,57,238,154,183,92,118,171,158,111,219,24,243,202,130,127,171,46,234,231,61,10,99,162,35,107,216,249,26,127,141,55,138,27,123,33,149,164,24,153,234,155,104,124,171,208,92,7,158,123,23,25,191,76,84,114,73,217,179,20,36,60,143,191,210,201,210,245,32,185,134,17,123,194,104,59,189,223,6,116,235,114,200,77,234,237,31,21,174,136,117,45,209,177,21,101,171,86,89,130,234,175,18,85,116,151,121,123,224,186,94,200,254,14,74,56,89,122,174,164,17,190,95,50,81,216,80,100,201,227,13,194,151,187,203,234,27,
+100,91,167,11,91,111,105,119,200,213,104,78,126,214,51,157,195,38,33,108,61,43,108,212,157,236,156,240,72,119,37,107,186,145,112,92,206,39,234,47,226,219,117,7,253,16,62,218,77,18,50,32,98,109,77,166,42,233,126,111,157,238,134,198,253,99,87,228,162,210,52,35,239,52,235,14,182,50,230,91,189,167,118,52,119,186,168,93,57,170,31,242,143,197,148,201,82,179,183,96,133,94,23,17,120,96,104,14,254,167,197,11,91,196,88,54,90,213,10,70,177,165,76,188,77,250,16,74,117,178,100,18,227,188,166,155,61,145,161,193,179,85,151,226,183,207,147,158,137,207,65,105,120,182,249,246,65,169,93,24,236,35,236,54,236,67,100,8,15,170,149,199,189,189,134,212,248,100,86,113,110,237,37,74,6,134,44,199,76,216,57,198,142,9,13,10,70,101,173,76,173,187,164,156,53,232,152,243,190,40,175,158,12,230,154,25,115,118,61,88,155,230,75,242,56,58,111,33,93,118,101,160,145,241,194,26,43,54,103,32,42,154,197,76,3,197,151,50,105,150,151,190,89,33,80,157,
+76,148,62,131,223,33,133,40,194,207,137,109,218,158,55,143,43,231,96,114,51,40,138,14,44,150,51,245,51,182,100,207,179,197,147,177,105,56,178,147,236,224,190,47,125,175,64,225,228,123,81,82,139,222,25,72,168,67,78,71,171,80,23,183,27,68,95,154,173,231,212,143,135,46,168,120,55,109,225,106,48,249,110,161,27,119,169,105,39,183,254,82,224,42,64,78,118,196,85,166,221,51,250,59,215,216,185,38,10,117,248,70,117,113,137,77,192,157,77,167,203,81,133,219,187,151,151,75,23,227,90,214,235,80,39,175,47,17,165,170,110,152,153,24,137,77,220,197,235,174,186,101,31,231,64,130,76,35,244,5,189,44,35,95,238,120,219,1,66,189,63,60,84,32,216,84,30,122,205,128,75,147,38,24,141,84,226,202,140,135,117,144,179,159,217,179,130,7,13,8,107,200,113,82,197,4,222,177,146,179,194,200,164,134,59,66,249,37,47,179,30,201,94,23,11,139,157,202,86,100,237,178,28,57,246,32,151,130,122,204,153,206,99,215,58,235,85,33,88,93,148,246,204,31,57,132,
+104,136,56,67,53,29,118,155,73,10,95,111,30,30,72,213,23,78,205,81,151,6,208,30,178,149,118,142,215,241,142,235,20,220,210,49,230,58,26,24,172,203,71,33,139,89,52,160,219,138,70,195,119,165,204,194,196,191,147,79,64,17,225,52,147,2,30,240,129,137,12,177,216,233,43,241,117,170,227,179,251,243,118,61,135,52,165,63,133,186,17,254,194,158,190,29,201,237,173,78,71,88,54,214,141,132,161,133,148,107,180,162,198,22,190,149,35,199,154,91,70,154,51,234,172,103,66,225,82,43,118,36,110,22,234,253,48,90,51,221,74,242,141,200,89,70,18,63,26,19,242,166,173,16,154,248,35,153,125,196,222,93,72,33,126,251,33,199,45,117,38,40,156,180,152,82,116,15,157,101,106,153,170,93,36,146,245,172,95,170,238,151,173,189,62,114,162,63,219,110,7,35,79,111,235,96,215,226,186,100,4,178,116,234,52,56,234,26,177,57,20,238,86,21,194,153,52,25,161,49,228,144,8,75,247,196,229,168,210,26,73,41,206,160,225,161,215,52,64,171,25,159,153,240,249,161,
+31,111,68,228,101,186,202,195,212,130,131,179,46,145,175,52,249,76,154,209,52,238,143,107,176,75,164,182,48,235,21,6,14,61,162,237,195,15,212,82,123,12,182,156,117,61,113,210,18,191,94,59,38,175,91,96,211,19,233,184,130,182,131,75,220,94,145,228,23,12,165,1,140,238,218,83,19,166,187,143,214,106,94,73,3,49,34,147,218,217,200,225,177,176,220,105,55,196,219,176,191,98,29,184,253,142,86,150,240,208,157,101,132,208,217,114,233,226,48,84,214,3,242,122,172,166,101,187,184,193,124,140,243,243,242,117,225,40,162,72,102,241,155,154,108,96,39,109,32,3,50,166,220,162,56,232,249,115,84,77,108,48,12,227,221,93,69,181,141,166,175,28,45,244,253,146,2,141,48,250,40,107,221,137,29,60,128,210,74,11,21,223,51,107,239,133,104,232,166,163,224,82,31,155,15,245,198,139,84,225,66,231,210,242,1,143,224,89,100,195,130,69,30,235,45,103,121,208,199,1,54,109,220,14,117,202,60,107,157,51,109,17,178,21,162,114,63,1,223,155,40,99,10,83,93,117,
+207,7,40,255,100,29,185,52,150,41,117,68,99,134,73,79,25,84,223,172,19,1,118,151,54,168,157,146,88,215,113,176,202,52,236,38,145,98,200,218,193,104,171,87,92,51,252,56,177,20,62,222,97,193,32,229,97,235,145,249,186,229,252,211,192,170,152,47,181,187,100,150,158,69,206,188,215,89,45,245,112,198,173,219,57,85,71,92,226,66,167,8,100,98,203,123,148,78,167,215,197,193,210,40,44,42,139,85,190,102,152,251,233,254,141,225,201,247,192,121,4,240,251,244,48,183,186,177,179,221,198,34,78,225,215,11,239,53,98,27,126,144,206,182,109,122,13,141,23,82,244,20,116,26,165,196,128,243,7,192,138,226,100,6,185,207,92,195,131,183,197,14,97,192,160,38,212,23,176,46,182,195,187,77,246,242,126,239,238,238,94,174,217,135,34,234,166,9,213,133,226,202,14,167,31,168,112,108,0,139,101,18,30,218,230,233,54,168,221,34,66,145,85,229,126,236,244,230,158,141,247,202,222,107,211,226,148,164,147,81,112,105,150,99,70,170,156,252,182,156,0,66,222,70,194,24,
+141,32,82,49,245,82,107,175,207,59,22,20,106,44,32,67,248,90,66,121,39,29,135,29,103,32,165,53,141,29,174,47,7,218,161,236,89,161,21,116,194,214,57,59,170,75,225,92,235,214,97,50,195,77,102,145,250,149,12,55,153,88,241,174,124,63,217,205,242,21,227,61,199,217,128,190,84,209,120,172,151,65,147,176,128,126,173,50,12,70,5,11,221,130,188,4,248,129,168,185,21,228,217,36,29,159,3,63,160,208,124,146,240,121,47,50,52,97,7,225,209,243,25,104,75,84,229,55,36,208,193,212,216,194,50,124,4,205,97,239,222,108,110,158,70,99,47,250,142,161,208,192,252,41,237,42,48,231,184,20,106,31,53,164,227,87,245,41,250,181,238,105,85,238,214,71,50,48,13,252,160,57,90,178,27,38,48,139,188,242,59,17,24,84,130,166,134,158,40,141,243,77,227,46,56,120,109,77,6,163,62,94,35,155,145,206,37,166,61,136,10,50,251,173,89,3,59,160,105,43,196,220,4,228,154,195,129,56,56,80,251,171,148,129,199,83,9,180,166,158,195,241,149,83,205,114,
+83,110,124,26,175,120,133,139,41,174,228,113,66,138,98,150,90,181,75,18,10,74,80,144,109,81,168,147,219,117,121,4,115,223,173,242,184,73,174,187,168,179,165,233,49,69,43,83,59,140,182,108,19,190,132,113,83,251,154,103,164,196,123,159,133,198,157,21,11,58,14,91,178,47,141,125,55,118,247,60,134,1,147,245,189,93,81,198,50,20,53,42,169,165,81,96,102,34,91,153,78,109,191,237,38,117,163,208,128,103,143,143,176,154,210,161,165,147,59,233,64,103,211,75,101,171,250,142,183,101,237,95,82,118,155,186,113,239,247,108,65,32,233,211,110,195,144,57,14,235,22,49,125,171,230,168,46,95,184,132,240,128,101,95,110,188,47,116,68,204,96,52,13,211,97,211,104,121,142,239,26,102,230,37,252,133,51,12,24,141,186,222,46,40,168,145,88,254,253,115,161,110,75,7,195,126,48,104,219,30,117,176,240,26,139,174,106,166,148,183,242,21,65,17,33,95,163,82,5,67,38,200,69,218,147,240,69,128,175,188,47,41,232,7,49,187,213,70,131,110,9,179,118,109,87,63,
+244,212,51,38,142,26,36,168,205,218,46,104,31,154,213,238,64,160,161,82,88,138,14,94,202,32,196,105,193,13,18,135,45,192,81,158,46,102,4,24,40,120,31,165,129,206,159,81,193,183,114,235,119,151,51,195,143,121,39,102,59,33,53,15,243,157,193,12,63,192,155,254,59,195,107,167,101,238,128,134,236,113,231,214,151,187,63,187,83,20,114,77,114,90,29,25,62,89,74,154,219,109,52,41,7,92,203,109,155,56,201,235,14,51,48,40,112,85,144,15,168,201,176,222,165,145,21,88,2,213,77,103,152,189,98,184,47,137,134,69,155,121,183,198,211,18,82,216,122,151,64,131,76,54,211,30,88,244,246,199,77,107,142,208,31,16,229,171,43,22,73,234,99,83,180,151,226,229,91,133,180,13,183,214,244,148,116,107,61,167,25,13,199,75,218,208,166,212,31,81,157,130,130,87,225,25,71,1,223,142,61,232,33,111,242,24,209,31,41,227,14,195,159,242,137,99,189,231,210,113,81,59,66,198,55,210,180,138,101,185,139,210,162,32,2,183,8,28,76,87,107,40,253,56,244,231,
+237,233,165,155,232,97,23,175,142,237,144,17,231,83,158,44,205,69,105,18,63,119,82,124,148,218,190,105,79,11,219,211,246,214,11,92,177,127,24,118,205,156,123,21,45,82,137,223,230,65,173,91,45,180,179,187,155,7,140,114,30,187,239,124,76,209,31,27,40,228,51,48,124,107,102,152,171,183,232,115,222,163,31,182,128,226,33,45,157,239,150,225,75,189,116,46,2,196,13,171,90,126,24,223,229,195,160,55,0,18,11,39,109,33,132,27,96,118,185,2,231,234,140,116,128,6,29,81,231,29,222,53,106,6,3,217,249,201,198,128,170,136,33,239,175,174,244,52,2,11,21,24,87,71,164,13,52,87,57,238,39,209,110,248,26,12,202,149,9,162,69,74,65,132,29,235,156,170,24,13,70,87,169,150,20,25,180,218,173,253,238,27,60,57,238,212,163,168,205,183,225,70,11,217,206,221,119,246,2,242,190,249,174,118,124,143,56,189,207,213,212,74,129,223,56,1,31,120,231,116,84,128,136,213,103,214,115,237,45,61,183,191,132,32,173,111,148,224,30,247,229,85,16,60,168,29,
+128,130,244,243,153,154,68,241,60,31,201,10,66,158,200,42,188,100,127,67,71,243,83,222,49,142,20,175,90,111,79,79,121,9,219,238,60,85,36,188,209,63,64,130,48,143,64,142,48,160,244,240,76,162,136,51,239,1,35,138,158,6,214,97,221,27,251,30,249,249,61,216,186,232,3,144,241,240,128,25,242,106,248,148,92,2,126,8,13,188,71,126,111,215,172,180,197,188,59,74,91,202,72,82,206,108,216,136,92,179,96,131,65,245,163,236,40,138,77,229,184,178,142,37,164,7,253,217,115,227,149,44,93,200,30,10,209,155,26,38,2,180,96,121,53,241,36,171,138,190,219,176,136,9,27,136,196,97,150,3,21,21,213,4,173,28,36,55,203,41,56,24,138,7,231,116,175,26,208,11,207,131,59,146,245,249,92,12,59,126,52,113,252,147,190,217,121,26,42,8,68,58,146,11,116,158,134,252,147,229,173,247,242,69,94,124,219,81,153,237,131,30,248,37,81,185,137,40,50,65,193,0,33,57,240,103,125,6,88,242,252,130,245,102,46,165,97,104,180,221,203,203,90,176,184,28,
+74,187,155,193,24,35,187,106,103,170,63,165,18,201,61,209,68,61,192,54,35,7,108,158,245,84,83,79,105,1,169,233,244,188,74,199,183,185,5,216,134,234,58,163,120,218,32,207,222,172,2,79,9,22,209,4,154,93,198,137,216,121,175,34,177,171,16,192,170,17,205,201,88,245,39,172,87,178,49,61,234,36,182,173,30,83,226,207,164,162,250,150,52,148,75,165,19,164,180,56,173,100,179,121,244,120,253,156,91,163,246,62,165,85,194,146,89,101,138,46,14,145,191,1,198,8,0,247,210,167,29,80,208,108,2,90,50,72,205,54,21,122,52,139,99,103,134,154,161,64,36,244,73,149,78,166,236,221,105,128,38,20,4,20,204,228,59,216,97,7,9,129,145,58,46,19,194,31,222,175,47,198,101,86,124,5,89,61,66,204,215,73,168,146,183,199,153,211,99,232,150,255,156,134,100,239,31,245,22,242,140,33,75,35,22,244,182,248,58,23,20,110,166,59,207,116,119,30,80,94,24,109,211,10,194,63,142,142,227,120,41,91,131,212,249,129,132,207,160,75,9,148,152,97,237,85,
+79,130,173,206,89,198,121,111,108,110,181,253,137,2,164,46,178,47,15,27,209,205,254,97,89,185,54,83,111,117,36,75,34,3,187,202,119,136,83,126,172,40,232,161,74,228,217,32,103,11,2,21,29,115,124,166,222,43,49,151,66,25,117,158,246,97,90,47,102,183,70,239,129,58,94,65,99,107,46,193,154,237,121,151,169,163,84,18,159,214,11,97,90,186,105,76,193,160,51,124,255,133,45,213,169,100,244,10,123,113,206,112,151,2,24,75,81,12,90,208,208,162,58,140,213,146,53,140,200,125,199,149,244,220,43,193,130,155,195,3,81,93,163,116,10,238,169,152,112,39,94,19,90,107,18,74,70,222,64,18,7,222,33,23,232,199,84,190,33,106,173,136,61,4,7,42,126,83,191,247,49,121,81,212,96,207,21,189,156,145,47,168,125,213,220,10,46,165,135,222,148,26,179,156,219,202,96,129,5,204,243,95,168,97,49,37,179,73,79,49,210,53,145,41,148,48,79,109,205,199,235,120,174,48,239,108,231,178,105,100,174,128,110,71,232,35,238,138,163,224,9,45,235,210,205,182,
+134,221,176,16,50,252,26,213,69,250,28,217,38,116,95,199,131,66,224,8,60,48,0,245,217,188,18,73,204,140,46,196,115,26,240,178,5,148,77,131,215,200,39,134,108,94,26,126,39,60,223,220,56,83,230,254,205,94,80,170,206,59,176,69,190,236,134,23,231,156,218,192,108,159,230,15,242,199,192,131,61,183,235,27,146,230,136,206,138,183,29,23,245,29,253,86,232,100,62,244,204,17,224,129,142,88,111,96,179,184,6,220,183,160,49,237,158,118,152,28,220,37,239,155,118,154,104,112,167,84,181,19,234,97,33,204,186,35,64,45,141,33,3,106,114,161,180,103,39,118,123,182,60,92,204,85,106,196,163,82,189,249,78,85,183,179,187,10,87,41,134,192,79,132,28,120,204,129,149,240,47,41,37,204,54,112,207,127,166,171,147,132,245,156,101,127,49,57,110,15,55,6,24,144,45,23,70,69,198,2,190,79,117,92,21,93,76,213,1,14,107,232,124,35,223,74,226,157,128,54,37,182,2,177,219,142,144,102,97,82,246,155,116,124,174,16,107,58,10,105,64,25,28,150,98,104,
+48,230,12,125,144,182,205,80,214,121,221,219,65,199,192,178,76,39,23,47,244,228,80,19,158,118,29,162,176,212,203,61,190,166,162,8,47,219,113,159,56,79,159,37,235,249,102,172,139,32,146,35,96,239,232,140,48,140,114,214,90,93,57,55,177,69,45,196,187,1,5,252,188,161,57,230,98,198,54,208,45,49,177,253,125,91,134,157,206,227,3,231,156,246,144,31,223,230,219,87,158,182,47,207,192,5,140,77,176,96,37,212,237,195,94,236,97,198,45,37,16,120,27,192,206,179,184,149,67,127,215,17,105,84,201,105,153,173,207,139,242,117,51,31,204,203,52,226,156,51,86,142,122,224,180,198,133,152,183,232,78,134,234,132,214,25,135,15,246,221,117,193,175,118,200,222,113,235,207,59,110,153,221,133,187,240,68,246,192,77,193,49,115,206,181,1,153,134,233,16,33,197,54,41,64,132,206,31,82,232,245,230,18,49,139,131,133,26,159,248,38,111,234,238,192,238,53,40,143,58,152,248,72,173,47,150,217,166,129,205,234,144,47,101,51,29,10,180,93,16,239,29,142,86,31,25,
+241,39,219,61,228,234,76,184,30,85,103,238,203,1,123,211,54,29,100,56,77,208,194,65,236,208,150,238,238,242,65,175,24,0,213,176,169,10,165,154,181,18,149,193,107,174,80,14,7,120,100,199,58,74,228,196,41,207,55,157,237,29,223,91,234,0,44,255,139,10,0,192,71,249,44,37,0,6,0,145,46,1,203,130,148,123,144,196,151,129,113,48,166,32,31,70,222,61,229,118,53,201,15,108,200,162,169,113,205,101,182,93,212,23,69,191,100,185,234,186,22,88,219,38,247,116,17,208,152,9,179,205,64,212,21,59,3,230,89,229,5,187,11,14,236,183,190,124,59,184,107,209,54,57,108,169,97,59,142,204,54,45,4,214,164,100,93,145,55,183,12,248,225,230,236,70,58,81,130,201,231,175,253,29,88,108,47,251,115,208,251,9,154,99,170,112,120,185,13,38,161,94,197,159,124,41,228,22,153,221,143,2,155,60,22,140,77,180,26,134,165,198,62,75,170,97,115,41,157,249,66,154,223,188,64,169,15,231,46,200,244,6,182,80,25,87,29,39,53,188,171,63,60,213,6,198,
+112,92,179,83,187,204,206,125,55,98,194,119,86,27,106,140,182,153,250,141,208,181,240,44,102,167,49,233,57,209,129,169,126,122,30,247,133,150,122,194,212,128,212,211,86,0,188,98,226,253,217,1,233,122,232,105,64,70,170,193,224,224,185,231,212,33,225,70,79,157,159,66,141,44,165,161,89,207,198,51,244,107,149,151,174,56,103,4,30,25,101,170,246,153,231,116,174,130,176,212,66,199,214,24,2,224,26,176,79,179,226,141,187,107,211,193,176,9,111,6,169,192,33,165,78,15,204,140,151,108,102,140,137,102,208,232,118,110,18,24,139,138,51,73,125,121,88,63,188,40,102,175,125,42,6,171,92,107,168,156,11,79,185,0,47,28,200,242,173,199,179,117,166,219,87,204,130,245,21,215,82,192,134,15,6,84,45,90,166,86,205,251,85,179,189,217,85,188,101,197,109,126,127,75,212,230,1,209,108,42,57,44,236,147,168,69,215,205,177,75,3,170,85,4,79,64,166,26,204,230,240,32,25,89,138,135,27,212,93,225,1,166,97,241,176,131,29,121,108,58,136,253,187,201,221,3,
+192,10,131,204,27,205,102,107,202,245,46,214,158,163,129,186,243,220,229,119,158,228,114,149,121,201,228,128,84,215,232,54,165,69,98,27,141,212,119,221,51,217,155,98,116,155,3,118,137,136,53,43,137,57,147,92,199,50,115,223,24,219,28,181,233,13,118,55,235,45,196,215,142,160,104,84,23,6,139,155,167,70,184,89,45,96,99,216,174,148,216,139,131,134,125,219,205,217,66,62,130,133,20,107,236,62,174,188,227,179,116,211,219,149,187,200,141,84,207,136,248,66,89,127,80,40,56,240,224,149,161,114,229,119,156,97,41,148,141,185,219,221,36,42,68,214,6,189,235,11,55,131,202,158,181,31,153,247,135,150,65,52,171,71,6,133,57,235,46,207,180,0,145,216,115,157,16,32,202,67,88,85,29,63,16,116,60,206,241,165,176,165,18,137,73,23,35,99,207,203,14,72,238,242,247,17,26,17,179,13,82,20,228,65,218,238,44,228,124,40,85,67,33,81,238,245,44,7,13,23,63,204,22,30,166,89,118,225,108,174,86,113,161,121,123,185,13,214,239,106,90,181,112,137,79,60,
+64,244,215,51,67,228,38,148,218,1,189,122,94,210,222,237,172,163,206,148,86,207,251,23,199,141,243,36,142,186,58,206,21,74,193,98,7,213,207,6,41,243,222,119,95,6,102,54,201,133,156,144,169,152,183,78,96,34,239,57,116,165,170,199,102,75,36,167,64,151,44,94,180,186,247,160,236,80,90,236,5,89,195,245,150,32,71,55,155,244,140,71,169,111,129,90,227,76,221,197,218,115,174,52,144,117,84,117,185,196,73,179,198,237,193,82,61,60,181,196,27,147,48,175,229,222,7,0,115,13,24,172,248,27,192,168,11,236,152,49,195,164,142,16,46,192,102,153,142,164,105,247,112,71,209,50,232,55,152,206,22,153,196,2,187,78,167,231,90,76,132,165,68,250,82,31,119,4,7,197,78,214,6,172,224,5,28,201,206,224,90,174,81,147,65,126,70,189,222,100,72,251,87,168,223,120,211,210,38,19,115,93,111,239,188,219,139,110,47,139,22,242,46,101,179,5,204,145,10,119,234,51,211,194,14,83,92,214,63,10,174,154,255,104,190,194,68,156,55,18,206,179,249,254,82,117,
+3,207,14,250,155,70,62,194,82,195,152,61,172,12,88,39,242,240,67,89,56,235,135,221,231,251,151,56,78,184,96,145,151,59,170,78,120,90,133,37,11,64,11,231,106,231,236,137,136,175,13,180,211,158,252,179,195,148,183,199,68,11,111,143,229,106,169,135,11,189,182,106,149,241,171,51,68,38,73,129,95,186,235,55,192,186,145,190,49,199,170,25,106,8,133,10,228,185,243,50,174,6,77,176,86,246,177,98,88,75,19,44,91,89,254,197,132,123,165,42,95,162,71,130,118,8,211,53,207,248,28,96,106,235,51,228,8,45,245,199,169,142,249,19,20,184,105,35,183,184,27,167,113,253,112,153,152,3,153,44,98,35,177,97,13,168,194,96,63,200,58,15,182,118,102,135,76,37,116,151,179,26,9,124,180,196,155,3,233,86,168,169,193,239,2,36,205,204,29,30,196,45,81,244,206,212,219,74,179,174,91,236,158,175,91,16,69,48,133,201,44,160,187,245,194,141,84,33,17,209,76,115,180,40,72,30,177,192,133,66,177,42,93,155,238,14,80,180,218,251,40,102,117,146,151,162,
+87,189,111,225,65,172,61,173,85,215,176,131,31,21,72,179,100,25,228,157,108,71,57,187,96,105,106,168,33,9,196,117,194,144,23,232,69,67,177,89,251,23,6,77,55,22,84,192,112,82,170,83,179,173,140,53,172,208,235,194,158,76,8,207,245,148,137,195,88,166,198,40,55,65,167,49,71,28,106,209,243,66,110,61,138,209,14,142,76,106,114,16,228,55,135,158,204,127,160,108,22,180,76,210,70,101,50,140,177,34,195,236,56,218,118,210,209,184,167,7,121,14,89,157,121,220,179,16,129,243,133,112,164,185,56,208,94,16,51,218,193,78,208,37,128,2,206,144,102,135,228,69,154,159,178,141,146,50,150,132,75,200,116,138,28,102,140,222,145,54,227,41,206,67,55,183,66,153,214,214,23,97,18,59,84,108,130,235,237,93,140,230,172,183,174,48,173,201,33,228,235,109,70,186,103,78,78,246,84,216,98,2,75,105,10,93,54,221,236,18,125,83,148,172,102,239,152,188,115,214,250,28,181,44,46,240,149,102,159,120,150,19,18,206,11,252,155,90,131,138,27,209,101,216,78,82,
+39,86,238,98,69,184,16,182,81,10,215,21,44,81,90,56,248,147,53,76,37,32,84,250,87,143,108,225,34,135,157,136,242,129,152,76,104,78,89,0,224,124,109,22,90,228,141,199,203,221,122,55,191,237,160,136,229,246,116,210,44,168,83,235,24,177,177,69,133,154,103,17,236,85,28,223,185,56,228,219,2,146,229,150,162,231,62,211,76,222,215,117,80,58,63,24,202,228,67,48,16,238,220,133,207,24,238,16,220,56,184,24,42,140,136,70,227,162,217,189,92,170,242,55,195,174,221,192,80,33,90,175,149,250,25,118,27,195,104,165,242,65,78,175,28,169,205,115,22,44,98,142,155,129,88,248,192,27,162,58,64,107,237,211,204,250,67,70,187,71,65,28,117,79,111,102,92,165,218,61,197,200,36,174,26,244,224,105,66,17,207,12,150,130,23,4,218,200,196,112,150,49,249,64,203,54,223,15,83,5,70,119,93,13,140,6,206,0,48,243,31,184,59,150,128,146,212,240,95,204,54,87,134,161,119,23,246,247,94,51,160,151,77,15,175,193,133,201,84,25,24,208,210,66,11,213,
+93,103,108,158,158,59,197,236,172,154,135,41,109,206,10,202,214,11,211,43,253,220,63,115,48,241,1,218,93,190,253,196,215,96,215,90,225,34,56,131,1,122,246,157,166,215,233,233,125,69,147,163,19,58,111,61,119,207,251,198,205,228,176,53,51,115,139,44,99,99,202,175,39,103,137,190,25,30,172,220,129,1,166,9,27,220,89,142,159,90,115,116,183,183,229,250,108,147,211,176,91,53,133,139,194,46,90,243,63,236,205,137,77,107,101,192,152,118,115,22,156,217,29,73,231,6,253,37,121,112,92,178,17,243,178,230,201,238,204,202,235,201,32,85,143,4,7,38,112,99,160,144,233,91,218,166,6,97,155,198,55,59,23,202,92,159,183,12,65,7,183,32,89,13,90,69,174,20,208,151,200,3,179,111,59,62,200,243,250,237,30,143,57,44,185,85,87,161,49,55,42,6,194,10,35,197,216,211,24,85,211,42,99,228,238,7,138,218,40,51,201,20,58,164,77,83,40,198,42,117,175,251,32,121,85,222,241,98,78,204,165,159,111,207,0,53,27,16,43,242,203,11,68,112,176,247,
+30,240,193,176,28,97,174,246,68,218,196,193,143,55,37,82,89,216,97,61,92,25,6,216,209,30,147,189,226,237,66,194,155,46,212,19,231,157,37,156,220,156,168,99,88,91,146,59,79,211,126,80,137,11,198,224,83,97,78,155,205,9,109,49,172,7,91,47,100,219,26,114,52,19,142,169,251,166,188,26,43,138,137,66,93,241,82,127,96,33,110,128,197,160,93,8,20,55,198,61,0,67,18,243,119,37,27,27,150,175,72,35,109,152,238,208,221,25,138,207,194,146,222,146,160,164,135,102,225,99,103,225,90,123,201,18,200,206,223,89,179,42,29,231,54,74,109,77,92,108,53,58,154,129,69,51,107,116,124,173,0,145,159,84,3,103,103,125,107,239,60,193,51,243,74,114,161,154,39,149,205,200,139,76,154,30,52,35,249,225,217,18,55,47,56,217,251,161,159,217,244,235,201,75,234,90,14,90,140,199,6,61,233,65,22,40,61,236,103,249,75,125,105,39,243,0,166,123,171,83,74,111,48,133,108,229,222,136,16,7,101,32,192,18,28,80,130,131,232,105,150,74,128,69,206,60,
+9,132,66,47,46,54,210,231,139,14,202,223,116,111,150,64,197,147,94,78,239,137,3,217,158,60,198,44,3,8,238,113,78,219,40,91,211,178,164,72,197,102,118,40,96,239,3,181,168,138,92,3,175,223,204,205,161,156,174,208,73,148,95,80,199,90,183,249,46,40,124,123,90,65,71,219,207,192,217,227,51,224,171,61,3,177,33,188,61,68,223,158,109,16,138,156,154,26,205,40,78,219,239,224,0,196,15,14,116,55,111,173,64,225,204,91,171,182,86,8,216,70,81,218,179,216,21,205,156,86,70,188,180,6,68,224,105,232,188,51,13,245,173,69,113,160,59,205,176,173,113,240,98,13,214,218,219,162,157,180,221,187,139,102,218,104,222,91,77,14,253,8,60,42,88,4,206,241,224,196,64,10,2,53,130,111,45,110,120,153,193,93,184,176,203,205,98,140,220,25,12,231,30,5,121,167,46,146,25,180,59,150,177,43,47,115,213,108,71,195,122,190,190,127,239,88,129,60,242,66,211,163,217,250,179,13,232,25,25,173,190,149,142,59,69,31,116,78,106,48,36,109,127,81,52,208,
+51,252,173,206,226,28,148,249,216,111,159,156,232,14,26,45,117,53,69,186,155,168,112,195,102,127,154,149,18,91,105,177,29,112,191,45,167,253,64,60,247,104,112,205,28,207,153,187,149,13,56,210,102,19,43,142,128,92,191,67,38,105,27,47,74,249,185,27,227,35,183,197,240,118,79,12,195,46,54,6,38,111,185,25,222,174,43,246,170,183,169,158,238,237,250,167,77,104,128,61,234,246,97,40,202,51,1,215,11,106,118,22,48,31,123,58,99,190,143,179,184,204,14,22,248,22,135,219,91,72,204,228,54,186,230,35,156,192,137,57,176,192,124,227,201,246,236,229,20,112,172,14,83,13,41,224,19,193,123,193,53,208,43,116,8,220,85,187,33,222,143,162,129,36,189,211,91,207,197,153,44,211,195,70,197,42,158,253,72,127,162,200,107,6,157,150,46,102,149,57,87,187,229,26,52,109,167,216,161,26,47,37,43,245,130,60,157,228,220,61,49,31,61,59,77,149,12,112,163,224,7,173,133,215,208,89,63,110,198,36,44,9,200,161,195,7,183,197,199,241,116,196,53,192,200,245,
+9,52,67,38,126,141,157,111,38,13,173,109,6,240,182,69,5,103,71,147,239,236,41,122,123,242,26,194,72,157,251,73,248,32,197,250,110,95,132,61,230,16,101,189,200,24,94,184,101,52,113,76,78,73,209,40,233,75,73,60,94,222,32,36,146,184,225,184,136,57,13,122,185,245,117,155,97,78,225,8,218,119,213,103,183,197,236,235,42,70,234,222,215,224,56,239,200,80,30,186,245,134,121,85,115,144,104,77,123,14,38,65,24,171,30,7,120,43,120,226,218,194,95,241,101,251,250,68,112,231,81,199,213,12,64,90,208,100,90,154,233,26,181,231,30,201,219,120,41,233,141,145,125,74,225,208,11,178,22,78,218,167,175,122,201,9,175,189,237,222,193,39,143,14,54,47,60,224,38,192,249,218,202,121,139,122,147,66,52,51,144,48,232,17,172,80,77,168,47,201,35,57,241,62,7,204,238,193,203,40,109,193,127,240,233,37,210,59,162,77,88,47,235,59,133,236,160,145,112,43,104,77,151,5,109,1,44,200,232,197,81,184,218,185,222,202,49,214,49,247,30,221,5,45,146,51,
+118,122,229,96,118,221,168,6,0,192,180,218,135,227,195,46,236,54,149,191,133,30,81,165,148,88,87,25,177,161,136,212,60,26,214,241,88,166,126,165,23,212,82,107,182,230,169,165,170,13,110,207,23,243,16,94,210,195,171,59,245,92,114,112,226,127,30,182,154,73,212,198,132,220,184,233,51,216,225,156,162,215,194,192,19,228,202,74,209,85,164,212,5,158,1,133,154,169,207,21,115,170,235,208,176,130,105,188,9,91,34,233,95,40,60,124,13,107,161,22,237,212,121,53,235,242,180,53,94,29,247,111,143,249,216,172,27,112,180,10,29,87,226,37,33,200,129,218,182,119,61,191,157,152,113,154,27,98,242,38,168,27,109,252,171,18,20,226,168,195,165,5,44,72,114,231,123,83,239,224,147,244,216,182,32,26,136,200,149,121,200,161,183,8,65,239,98,203,43,102,6,254,108,157,209,228,169,124,94,157,197,16,188,125,47,14,113,6,103,138,245,102,23,127,5,43,137,39,65,38,138,97,236,188,106,106,153,94,104,219,232,180,221,148,75,92,23,252,69,126,116,155,65,107,110,143,
+176,9,103,78,224,216,124,240,116,106,158,165,174,37,137,132,153,125,53,131,245,208,214,147,186,197,192,197,81,227,114,13,146,166,227,231,243,187,35,78,187,163,205,33,206,36,18,24,86,155,24,168,158,35,153,187,143,118,200,62,131,157,44,68,248,205,10,105,64,234,55,43,244,167,118,139,246,110,183,158,85,111,214,174,246,236,4,98,160,53,248,245,44,190,246,156,29,247,149,179,52,236,234,252,164,24,47,113,112,27,125,100,157,232,196,12,88,148,246,120,180,41,39,147,242,141,221,130,157,128,159,190,201,231,191,19,68,113,2,126,132,29,57,1,63,194,158,63,191,161,15,226,29,129,223,109,248,201,94,2,51,155,95,181,197,247,71,88,39,80,127,140,231,237,9,79,81,129,143,195,174,55,23,199,21,44,238,173,119,49,28,245,214,251,51,242,143,237,43,67,67,77,31,187,188,254,206,241,120,70,221,222,171,6,62,31,20,52,236,205,132,245,162,65,247,3,183,137,65,181,142,249,184,62,110,247,212,36,34,26,2,241,238,249,119,133,102,198,111,219,5,46,11,160,97,168,
+228,146,112,42,35,97,194,191,241,236,36,125,255,209,128,149,244,243,78,112,16,56,201,209,51,144,187,231,75,248,108,154,40,169,16,239,35,102,243,109,145,16,96,189,186,87,37,240,204,96,230,229,171,142,153,48,79,54,11,105,138,35,174,169,183,225,101,54,175,243,131,95,209,119,47,122,112,214,190,184,185,174,23,247,250,135,17,218,247,108,110,29,247,8,6,189,110,110,123,167,147,96,109,176,207,250,153,22,70,235,211,243,103,51,147,96,113,187,14,28,119,23,109,205,211,145,112,136,88,111,147,143,102,108,60,13,239,72,116,205,18,64,53,145,254,16,48,200,111,13,118,103,16,32,115,170,153,251,124,255,36,10,169,55,60,175,19,129,141,3,221,49,193,102,199,125,228,155,157,219,31,199,76,210,230,19,78,201,174,91,9,14,16,24,209,201,236,109,46,86,111,212,32,105,107,249,132,52,31,2,75,70,251,162,162,105,166,150,107,52,7,192,62,138,160,228,132,220,218,192,198,74,22,53,15,153,232,84,250,230,134,238,225,33,12,57,194,56,113,190,123,18,171,62,162,179,
+222,141,202,98,57,207,53,243,59,94,184,41,41,71,78,136,102,238,231,189,75,217,50,227,9,28,237,191,250,13,171,141,117,212,211,213,66,36,6,90,149,148,242,206,102,164,11,207,236,157,33,230,19,118,141,64,76,34,68,185,187,93,136,148,156,148,222,138,142,32,62,242,125,105,220,14,52,47,51,137,78,159,97,139,144,10,5,206,183,215,115,108,51,2,228,117,237,169,174,242,158,110,102,113,146,46,88,116,149,17,143,0,161,208,107,115,223,203,13,52,28,203,81,53,83,195,71,92,159,223,197,244,22,125,66,54,23,107,109,163,116,98,170,39,223,185,176,110,203,105,160,111,92,8,114,108,166,187,118,143,170,205,215,211,17,29,21,178,216,100,76,151,105,41,103,201,9,229,7,136,225,234,247,232,139,50,88,147,237,35,33,207,16,239,128,105,111,84,232,137,238,205,189,19,121,131,207,239,179,155,153,168,201,148,215,44,129,62,116,170,140,16,205,100,142,253,219,124,56,127,131,98,24,186,154,121,22,120,237,129,124,163,127,156,57,42,97,16,194,119,106,188,175,196,50,205,
+101,176,232,160,10,165,133,6,103,154,111,245,172,31,2,118,176,26,228,240,212,135,67,253,215,92,159,63,93,168,21,73,202,35,222,71,125,129,191,205,11,161,193,86,131,233,21,252,102,141,104,225,40,83,87,46,154,144,196,169,174,47,169,179,124,68,15,126,136,92,152,58,196,164,106,78,1,247,176,67,1,27,126,132,251,112,132,203,48,140,125,25,104,73,27,163,213,139,175,61,3,122,33,83,118,248,156,105,1,24,51,151,168,147,62,124,107,71,194,65,89,170,217,78,55,30,224,45,125,235,85,115,92,79,168,79,74,252,84,160,101,159,145,221,197,63,107,63,68,121,197,242,210,114,146,139,143,203,174,26,230,249,221,16,137,207,222,8,97,25,47,22,103,200,229,160,208,151,143,97,154,149,194,77,102,246,103,105,80,65,53,119,47,42,80,158,198,169,61,226,209,236,187,235,17,169,253,169,211,33,63,238,147,157,139,170,66,131,95,59,214,171,158,244,242,5,21,163,231,122,243,78,79,174,42,237,135,47,251,243,48,227,122,89,75,187,242,44,137,168,208,18,175,141,132,215,
+93,146,183,243,180,196,214,157,150,41,222,174,72,236,227,38,232,244,213,150,222,252,24,1,95,131,56,143,227,211,215,35,71,187,14,2,137,173,192,153,251,116,136,121,58,195,60,29,98,62,255,255,229,255,95,45,159,131,148,175,62,160,193,68,148,207,26,194,51,208,243,195,4,151,52,214,28,35,107,98,230,23,193,64,32,100,253,53,5,180,174,64,2,16,85,183,89,71,46,158,65,32,229,97,166,45,202,222,221,206,193,244,211,111,155,216,8,108,205,137,162,49,247,71,145,102,63,254,209,39,255,227,41,56,225,103,63,63,93,32,250,29,177,44,31,235,255,245,119,68,185,188,133,109,124,113,138,218,56,221,175,122,10,47,248,242,215,159,125,242,245,231,191,56,190,251,54,190,224,155,204,197,167,226,83,233,239,135,209,156,194,4,254,225,195,167,167,192,131,95,156,242,21,255,250,20,177,240,189,175,191,127,138,64,120,131,245,219,83,118,223,83,183,167,168,137,207,190,252,234,243,127,60,221,50,251,197,177,238,87,31,62,125,143,31,249,31,126,249,126,51,234,9,133,183,62,
+62,255,250,29,169,15,191,248,193,119,140,231,219,14,191,254,136,213,63,126,248,38,52,230,173,225,215,95,126,83,227,211,111,83,57,127,7,148,183,182,127,0,233,211,227,168,62,124,245,109,180,197,191,124,204,218,39,63,252,47,31,195,213,190,248,245,15,62,249,234,248,243,197,207,143,159,199,159,47,126,251,131,79,62,59,62,127,118,252,252,244,84,246,233,159,4,147,253,191,27,122,246,127,146,183,244,61,162,228,247,19,119,254,240,191,252,228,39,199,225,252,126,112,217,23,31,126,249,235,159,254,240,215,95,254,195,9,206,63,21,68,242,151,127,254,253,63,1,245,213,31,128,250,234,243,191,253,236,119,176,254,231,211,211,255,21,96,95,252,252,79,241,58,74,241,175,191,252,251,239,68,237,223,189,189,250,39,177,251,249,119,96,247,59,136,127,138,224,63,15,242,139,223,254,41,142,191,61,41,193,119,162,248,31,79,124,57,149,252,248,88,242,227,239,0,247,217,31,208,239,179,55,64,63,60,170,192,9,218,127,248,166,241,95,252,229,9,222,95,254,243,4,252,236,183,223,
+1,237,91,236,190,3,222,63,139,223,167,127,64,193,207,222,117,244,247,105,248,31,254,253,91,209,9,198,95,253,215,241,228,211,239,224,201,111,63,2,254,78,166,252,199,223,117,241,45,138,111,240,254,5,195,27,191,59,142,234,199,255,234,223,254,229,95,33,193,173,51,206,41,235,108,250,247,178,206,110,9,177,7,192,201,133,92,63,177,22,128,88,185,127,58,71,34,46,176,91,194,45,242,156,100,185,34,95,223,35,30,65,70,136,117,25,121,9,82,33,253,30,95,154,54,83,123,170,108,45,183,30,96,44,202,68,7,204,74,62,136,211,237,93,208,200,139,6,243,103,16,72,29,159,234,214,23,248,43,56,100,243,2,113,246,15,221,212,214,203,81,40,20,147,116,131,193,168,45,76,133,64,125,235,167,235,38,126,202,118,178,223,208,240,20,215,171,215,227,49,220,86,79,206,215,26,236,149,131,112,45,119,144,160,174,49,34,138,119,67,224,89,43,19,74,150,226,235,241,139,85,123,95,58,147,62,249,2,238,251,72,154,146,69,208,159,109,170,33,44,178,125,190,166,188,30,
+10,189,195,232,44,69,199,102,234,75,240,16,23,184,181,10,207,8,148,75,121,73,73,179,224,50,234,118,173,245,32,132,244,12,24,37,4,145,149,249,35,245,4,87,2,36,34,179,134,216,188,103,63,80,18,10,113,66,218,118,233,54,57,79,90,79,178,160,133,148,86,135,178,232,85,47,81,1,16,253,204,45,209,158,107,173,115,62,8,222,131,96,24,11,255,136,78,193,212,149,189,59,56,135,243,122,21,33,49,216,189,5,41,108,66,206,122,76,76,100,87,205,48,72,224,24,91,98,8,232,236,206,69,127,149,129,81,150,85,159,84,105,241,251,113,23,156,115,208,51,20,147,234,178,157,122,55,227,38,32,133,232,30,144,193,251,41,153,104,144,92,104,202,247,215,51,151,206,122,179,117,11,110,178,234,29,9,118,120,124,168,18,145,120,12,135,230,19,63,66,86,92,45,166,90,113,161,2,92,233,115,139,163,32,51,1,114,192,168,132,22,71,105,36,20,97,180,226,35,76,29,50,128,159,51,241,160,162,151,232,66,249,193,206,231,115,56,106,243,160,113,248,27,97,107,29,
+51,161,93,167,201,81,110,64,236,113,67,204,98,175,150,111,188,26,38,253,128,75,104,33,108,182,237,219,136,32,121,125,17,30,11,207,19,105,30,24,250,202,199,59,232,4,110,24,171,74,45,28,204,69,233,172,172,30,27,173,16,145,89,51,146,15,49,6,197,232,233,73,28,125,4,227,116,179,163,28,221,60,40,132,55,10,33,190,46,138,79,111,250,220,164,24,107,117,213,46,179,129,43,223,184,234,135,92,59,72,108,212,171,219,200,185,4,92,142,190,10,185,96,186,102,26,120,247,90,15,184,96,91,67,129,220,21,166,184,11,200,131,229,177,47,166,83,151,87,44,102,215,182,246,210,15,231,53,28,19,41,5,85,134,96,144,232,1,70,79,193,22,173,43,94,163,175,106,196,81,164,187,82,222,231,240,101,103,209,231,215,2,3,178,165,245,233,180,101,200,99,121,181,15,7,201,8,187,36,226,101,94,234,9,17,84,238,26,58,125,227,199,94,253,137,75,0,129,180,193,43,108,35,16,110,77,227,173,5,119,36,89,9,1,38,84,160,40,49,9,8,242,161,190,211,107,
+35,69,208,186,197,221,217,141,250,0,30,110,157,101,40,179,66,98,35,184,158,25,136,98,100,70,217,65,84,54,224,21,22,181,206,80,212,203,106,2,116,49,121,161,156,153,180,240,64,28,4,190,218,194,37,66,66,61,89,21,102,124,108,167,128,181,161,69,205,242,194,230,181,159,89,89,189,1,227,38,219,86,12,230,1,102,139,41,144,17,120,52,245,13,239,140,177,164,85,172,133,4,187,142,118,58,114,170,65,223,122,160,222,131,171,121,174,87,163,155,21,38,178,178,162,231,97,226,245,0,212,21,143,44,22,55,108,157,166,95,247,103,239,237,107,48,43,21,34,221,36,24,251,0,56,136,199,128,238,158,5,93,205,253,45,227,101,14,60,42,175,248,181,156,201,23,220,234,218,49,60,146,154,200,243,118,51,73,110,134,10,68,37,105,76,126,212,177,19,3,98,221,208,44,11,28,80,169,130,137,229,27,238,68,129,153,102,139,92,180,94,198,51,123,138,9,93,232,39,185,193,184,54,207,104,244,174,68,65,190,94,11,168,82,176,162,79,91,192,210,113,141,65,121,207,24,
+55,240,43,93,104,178,84,205,251,123,10,208,67,34,202,4,251,117,166,113,253,108,208,169,13,215,193,139,222,252,2,162,188,62,110,210,36,235,59,112,74,115,64,232,12,42,233,64,148,89,151,71,51,214,33,163,90,55,132,71,28,196,203,250,157,236,16,65,109,177,1,246,97,49,151,210,91,155,197,164,101,170,69,220,228,203,212,66,68,111,48,129,123,88,213,13,2,87,6,75,67,69,205,146,209,174,171,169,28,36,181,136,25,50,5,17,205,187,149,128,45,250,3,229,17,119,113,184,229,241,71,3,121,191,197,120,12,207,241,209,81,188,39,51,144,207,64,32,116,21,182,73,175,230,117,202,195,188,152,51,213,240,46,229,188,163,22,233,101,123,132,203,221,96,241,151,235,187,205,65,166,51,29,94,39,93,147,222,110,120,228,110,123,119,221,192,249,101,224,28,47,235,94,187,247,185,26,49,2,211,113,230,230,167,132,36,16,55,232,101,29,161,169,2,2,103,22,51,72,166,148,3,129,138,236,64,73,156,49,84,183,177,76,155,21,19,239,160,171,250,188,210,151,166,220,97,
+24,63,15,231,44,73,85,178,190,113,57,15,220,228,151,234,89,48,69,56,35,140,247,237,193,128,88,231,76,137,129,230,102,104,162,169,10,212,168,45,165,63,248,182,8,26,28,107,122,70,51,253,119,41,83,140,145,122,234,203,27,1,36,173,17,97,242,72,59,67,1,130,87,177,200,170,200,203,124,58,40,130,145,33,229,164,31,192,168,98,81,214,161,50,2,236,62,136,235,245,92,204,127,25,18,195,30,91,104,252,10,130,184,182,48,63,152,166,126,209,227,60,228,122,124,191,30,161,106,10,108,100,155,217,138,65,143,197,76,37,171,16,194,112,3,178,191,43,45,112,200,24,51,123,185,213,137,225,10,162,136,86,200,62,221,117,56,132,210,217,45,28,53,57,199,42,189,145,209,40,165,169,21,54,213,177,197,137,176,103,245,254,196,65,117,22,214,47,10,171,135,168,158,178,209,168,128,133,125,189,168,59,53,33,246,102,0,5,177,117,125,115,54,165,75,172,47,114,108,227,193,178,27,185,236,169,81,44,121,167,71,92,197,239,132,185,181,86,148,198,164,158,207,220,241,171,
+51,144,140,109,156,109,52,117,204,220,172,2,229,150,220,213,86,50,40,76,218,47,228,121,128,94,98,166,152,121,245,10,163,46,20,76,131,117,88,100,146,68,186,52,108,125,190,234,96,253,125,175,30,78,146,69,30,76,163,130,33,165,49,53,115,169,51,1,101,182,83,28,108,143,91,73,184,147,142,26,52,236,128,196,215,86,26,210,177,25,198,27,150,180,231,202,201,56,213,138,133,111,98,78,103,2,88,157,5,217,91,98,111,27,148,118,96,140,97,163,221,176,19,192,208,166,220,46,178,198,13,221,33,90,73,151,231,193,151,192,77,30,244,44,194,165,23,109,7,109,182,217,51,7,158,141,93,164,206,170,99,58,131,214,57,109,203,91,19,112,122,107,152,164,195,165,203,142,91,177,49,200,159,250,162,155,69,37,179,216,230,113,202,126,6,69,200,137,13,66,130,78,194,154,142,3,66,234,156,134,143,24,233,103,148,131,205,68,206,29,92,122,147,190,78,219,122,170,57,22,89,45,137,24,11,238,244,184,151,76,135,183,210,142,55,3,76,13,154,243,91,29,43,81,168,41,
+108,190,29,153,154,152,188,48,173,154,208,165,62,112,121,227,55,113,134,76,114,224,48,70,71,180,70,133,88,193,20,163,32,137,10,234,241,53,177,74,236,125,44,213,56,134,212,190,118,182,13,218,160,173,105,7,60,105,127,42,115,240,50,121,13,132,146,96,182,175,226,193,246,11,149,179,218,122,24,146,252,184,158,42,133,141,211,240,163,162,54,97,41,95,195,53,220,104,8,111,214,111,206,110,64,117,92,35,79,201,115,250,197,105,70,72,51,61,188,104,186,200,205,101,85,108,159,14,194,252,154,71,203,89,50,141,82,246,78,59,108,20,6,38,115,66,154,210,10,61,114,41,255,160,51,47,238,100,64,129,71,25,174,80,205,220,182,81,206,53,108,245,92,85,88,34,104,211,140,155,49,33,1,41,76,174,11,59,203,98,224,159,128,83,11,91,57,193,224,50,50,19,102,75,33,60,95,93,167,178,11,119,220,50,234,36,5,113,53,95,216,156,57,99,94,58,201,60,31,53,170,29,141,59,239,207,212,90,109,50,12,179,196,169,17,125,169,49,84,202,226,12,236,139,184,113,
+75,46,236,131,213,154,6,59,166,247,113,17,246,136,171,145,31,210,9,99,253,126,92,224,110,158,154,9,105,215,43,103,234,132,101,180,220,154,97,30,80,134,189,98,163,27,13,56,53,179,197,61,219,68,12,212,193,235,170,91,244,246,15,225,42,170,33,5,140,116,255,222,161,62,174,33,248,56,242,173,7,29,200,140,153,179,243,125,153,198,22,70,173,161,139,213,161,132,54,70,239,162,226,172,76,200,220,203,172,175,199,98,76,176,32,144,97,196,202,66,15,68,127,188,76,17,123,165,195,53,134,236,163,20,119,60,67,70,51,189,30,132,248,174,188,147,67,148,50,3,173,189,172,177,191,9,105,218,0,190,63,247,106,253,68,252,12,205,157,184,3,140,122,140,189,152,25,183,242,65,96,209,55,95,166,198,139,181,172,20,196,21,133,47,180,122,46,199,234,72,26,57,177,233,56,69,155,87,85,131,47,75,206,210,107,51,62,184,176,136,229,24,133,205,218,204,171,9,41,133,29,78,127,199,51,174,250,12,79,226,69,2,112,47,183,10,225,117,46,255,170,27,205,85,12,248,
+112,203,217,233,182,245,0,130,214,246,179,200,25,162,254,105,222,70,52,158,150,193,94,174,226,46,104,84,21,238,100,57,178,15,195,94,159,251,176,224,1,179,81,221,60,163,46,101,36,24,149,45,52,114,237,250,123,204,70,144,172,220,42,171,50,27,124,228,4,215,108,217,39,215,58,171,226,98,253,67,175,17,34,203,151,39,242,148,72,172,244,193,229,233,12,18,171,12,35,144,221,69,187,186,159,218,74,72,116,2,218,17,88,66,21,8,232,134,171,161,73,208,241,5,167,144,122,109,249,205,129,128,194,40,199,54,150,44,74,115,83,215,38,142,230,115,117,95,240,146,230,22,218,134,177,93,108,3,227,141,158,60,108,204,165,180,196,110,24,104,246,7,249,57,95,17,232,91,216,214,34,89,177,235,231,225,41,17,77,180,217,8,192,222,128,75,15,153,100,196,27,216,6,225,43,69,6,114,157,154,229,177,248,115,123,13,41,16,94,18,51,139,70,137,101,126,244,74,89,179,130,111,223,141,200,205,225,177,7,96,244,199,103,143,163,124,187,212,118,249,27,240,212,65,133,74,
+97,7,253,48,126,151,82,43,40,107,249,147,210,79,153,178,81,100,81,96,121,47,161,218,136,214,107,153,163,101,15,152,124,118,204,150,168,193,184,177,36,243,58,192,192,121,236,23,73,237,56,145,5,120,233,90,1,29,107,234,159,29,87,11,175,9,74,55,57,105,103,138,14,139,61,88,20,170,76,64,190,101,89,54,175,74,192,195,177,19,164,254,126,11,157,143,232,90,198,241,126,202,32,73,185,92,105,7,57,16,213,53,139,100,31,186,88,23,230,249,180,89,245,20,88,24,214,144,18,219,171,3,6,128,67,180,113,182,59,55,179,136,64,209,55,33,251,25,175,190,161,4,237,246,143,218,210,4,218,149,220,26,182,190,108,127,96,202,150,218,198,237,192,203,71,209,174,201,202,136,231,133,150,112,74,8,83,210,10,97,158,145,30,168,84,171,51,84,184,24,181,96,122,108,196,24,76,172,211,158,13,66,145,167,218,32,196,183,129,1,0,89,53,156,166,159,149,6,26,105,75,220,247,95,97,148,49,98,141,192,161,28,9,215,3,91,146,65,171,151,151,86,112,175,12,122,
+1,9,113,55,218,73,104,114,153,175,173,90,204,213,102,65,144,234,165,219,187,128,136,20,47,230,134,26,253,162,127,85,16,169,185,122,239,54,69,222,56,114,187,58,51,162,106,74,6,254,129,161,118,79,234,231,230,16,31,96,239,112,90,121,141,162,255,108,167,244,35,153,42,232,186,179,47,193,7,34,222,76,186,223,149,67,82,149,248,172,211,247,143,61,36,130,189,129,232,112,243,230,68,253,102,81,232,222,1,144,237,45,205,166,81,248,148,173,195,50,17,43,138,109,200,136,254,112,195,226,154,199,233,253,163,4,96,198,92,82,157,43,215,22,93,27,3,166,130,103,28,220,178,142,134,38,53,233,175,176,1,129,37,202,19,91,210,23,61,93,236,90,219,26,110,167,44,144,156,244,90,14,231,13,107,99,40,11,37,219,162,232,186,68,203,183,170,57,9,109,58,134,36,207,66,246,13,139,52,50,218,185,196,198,202,82,19,235,84,15,97,232,52,230,149,61,158,131,46,159,124,231,77,108,81,247,127,48,247,30,63,206,126,75,122,216,191,114,161,133,97,5,11,178,49,26,
+192,134,22,182,23,134,247,134,55,22,4,204,88,247,14,52,192,72,87,152,59,242,88,94,145,205,216,204,161,153,115,238,102,122,201,102,179,201,102,78,205,204,102,206,169,153,115,206,217,111,119,207,220,249,13,102,108,107,39,47,190,151,141,243,158,83,167,170,78,85,61,207,33,136,250,54,107,149,138,63,222,116,6,109,107,5,140,203,109,212,153,95,15,236,75,132,196,182,66,157,236,32,220,199,44,118,241,104,70,127,221,241,79,176,214,146,204,96,16,174,181,209,43,39,197,220,16,159,108,13,109,172,10,82,93,194,36,199,107,116,242,145,237,157,131,103,51,136,188,214,202,107,125,61,113,222,143,75,77,134,72,176,240,93,181,38,71,212,249,154,206,143,66,244,215,124,169,240,172,142,218,3,36,232,202,83,187,174,238,39,213,75,218,253,164,17,24,2,190,169,162,227,36,219,244,184,50,195,37,16,8,215,37,191,126,179,221,61,174,204,173,181,122,211,27,142,28,132,242,181,16,104,242,115,241,60,87,174,48,49,86,167,232,123,182,55,99,174,95,147,97,158,0,169,210,143,
+111,233,68,127,175,146,222,16,182,51,148,3,104,145,7,21,183,250,70,124,8,139,99,66,124,132,117,93,86,230,67,202,132,178,85,62,112,54,68,214,237,121,57,211,141,1,90,201,59,165,125,76,216,179,234,118,67,164,170,85,71,135,191,142,21,107,133,190,157,51,51,72,128,222,28,238,117,76,119,69,212,22,32,216,4,232,105,95,220,126,228,28,136,203,242,102,84,171,203,161,173,166,147,70,86,201,39,193,181,9,235,178,202,171,192,67,156,87,147,58,20,85,235,72,8,24,156,130,91,73,128,121,10,229,83,199,86,160,124,222,236,42,77,86,78,54,167,17,62,102,181,186,168,255,205,255,92,152,109,135,248,230,198,202,101,99,129,196,75,85,189,109,80,78,135,39,205,61,127,178,168,215,135,187,213,224,12,192,223,45,113,117,188,186,53,242,21,114,155,199,209,89,191,46,47,135,41,233,73,12,51,201,52,150,122,131,33,226,102,160,229,194,61,206,235,232,146,63,138,239,33,113,114,253,214,197,151,131,47,159,156,56,75,203,43,11,237,218,225,162,18,62,245,121,15,61,
+227,106,125,122,104,212,231,209,151,49,198,156,229,104,253,57,79,213,239,24,16,82,230,184,200,191,35,143,112,140,98,45,12,210,163,241,12,191,117,217,95,218,139,251,119,13,70,246,152,225,107,231,140,92,249,82,235,149,159,90,169,28,45,147,33,246,222,164,101,154,138,164,97,147,28,126,146,115,126,32,227,230,76,177,32,222,90,173,164,45,239,181,31,238,203,171,20,106,238,117,243,33,221,213,44,39,191,197,26,158,233,20,179,143,120,77,0,89,14,46,182,244,236,178,141,13,39,241,183,48,89,176,121,139,189,93,36,35,103,239,99,182,222,191,90,8,179,10,195,167,62,57,43,79,159,62,142,218,250,52,81,117,171,206,154,234,88,50,153,59,221,28,207,244,44,101,157,57,214,117,124,152,250,220,61,190,223,89,87,237,112,119,206,147,67,232,50,96,74,78,38,105,194,126,146,157,134,66,100,174,5,156,109,62,148,71,73,72,196,193,75,94,84,123,51,231,106,188,42,128,247,55,211,155,124,179,51,117,228,111,114,57,45,202,177,25,95,76,196,147,39,51,219,229,178,252,
+5,227,227,52,29,12,89,11,125,251,212,87,142,62,81,151,168,147,92,235,203,224,26,9,199,106,42,154,156,159,241,84,205,242,118,50,140,106,181,4,247,185,175,118,46,117,158,115,57,100,25,44,102,199,173,72,150,47,121,63,3,113,70,192,255,178,237,227,7,66,101,65,75,154,67,40,52,214,233,148,251,224,150,87,51,188,117,141,218,86,237,107,140,61,35,57,77,121,233,211,172,206,28,109,9,142,109,157,198,172,157,2,59,155,142,51,12,123,37,90,243,58,182,235,160,80,27,251,67,238,26,106,88,173,92,75,220,222,186,58,66,245,109,147,92,227,46,105,134,169,117,124,220,230,170,155,55,253,211,6,155,46,107,55,229,213,219,46,236,145,191,21,161,0,254,195,123,191,237,48,78,55,147,229,99,253,24,186,88,155,228,167,138,92,230,82,115,32,36,200,1,94,123,99,237,80,233,94,22,181,187,232,150,72,105,126,102,217,143,234,2,171,141,181,29,140,46,215,205,254,88,143,152,182,35,205,49,231,212,206,20,151,243,173,92,199,214,173,27,171,120,55,27,216,52,113,
+107,248,149,67,169,59,29,229,193,100,132,208,120,181,8,229,99,193,58,155,84,143,160,29,247,185,24,163,21,58,108,112,175,23,45,137,200,54,43,230,159,247,113,50,24,204,137,61,71,114,192,241,204,119,39,192,134,188,35,145,94,172,157,116,104,154,217,134,71,220,147,169,145,193,126,124,62,157,45,17,71,117,112,165,114,38,218,77,68,109,53,84,231,122,194,103,96,90,186,93,53,207,19,234,58,170,241,191,179,169,244,48,217,92,18,0,250,219,129,155,21,210,202,179,0,12,207,42,104,105,66,252,32,150,26,219,238,226,52,184,0,137,227,102,132,209,105,251,156,144,154,248,49,193,225,137,18,240,61,143,16,139,138,113,28,50,97,24,166,107,39,168,230,188,153,176,199,75,119,236,171,73,201,217,147,5,215,68,215,233,155,158,128,215,171,243,226,15,75,61,138,81,23,243,239,143,70,193,224,68,128,62,66,114,250,18,130,11,101,178,6,126,230,130,189,32,226,236,125,98,112,214,17,244,147,159,67,93,110,15,193,104,80,188,6,78,93,195,56,44,112,231,21,163,193,149,
+146,150,192,184,163,207,241,230,179,164,139,214,104,176,152,205,107,136,32,115,61,205,201,168,69,220,69,153,19,146,153,187,155,45,176,191,194,67,157,19,38,125,18,216,199,141,13,163,87,105,101,175,98,72,20,2,89,220,207,193,66,162,219,63,38,86,27,81,100,52,251,252,186,160,73,209,223,31,102,202,207,71,27,155,171,34,114,120,8,132,187,32,26,166,235,150,39,66,100,252,204,123,248,91,243,62,67,63,211,115,180,234,219,4,13,70,0,27,210,228,122,115,213,66,76,119,185,241,227,187,25,249,140,126,244,240,188,85,150,180,131,78,80,133,208,19,228,179,85,161,250,213,44,78,88,190,164,219,12,133,199,211,192,116,53,64,123,184,53,151,182,162,3,157,229,145,240,242,154,17,175,21,110,15,204,29,112,164,20,248,162,137,199,120,100,128,213,188,62,3,22,138,211,218,177,127,213,123,3,79,1,103,43,15,221,68,157,11,249,27,217,126,95,38,21,160,119,38,101,223,56,12,177,54,10,57,205,50,208,79,217,217,116,104,66,181,212,167,45,124,93,166,59,94,44,22,
+104,10,14,183,223,207,69,112,244,172,166,20,234,21,176,156,229,34,155,142,228,111,246,44,239,37,46,134,223,115,214,175,19,161,22,83,184,197,250,33,184,15,77,178,233,178,238,86,156,173,159,18,148,182,183,167,39,54,58,112,39,124,14,117,70,103,148,110,99,116,246,243,203,198,250,248,172,159,251,208,215,250,167,207,249,201,19,63,139,241,246,65,202,194,241,113,56,98,232,102,233,251,92,107,14,99,31,64,129,76,102,115,27,117,17,149,181,218,9,160,221,12,160,230,37,158,200,97,151,178,95,115,23,203,53,243,82,23,106,177,76,173,140,88,198,247,179,207,19,60,33,213,107,182,163,80,204,98,9,236,19,180,119,5,106,231,243,91,226,60,53,126,137,204,108,154,112,84,194,146,45,202,7,142,198,150,72,214,34,167,125,205,49,70,227,102,253,102,222,123,55,73,189,119,235,57,97,72,33,160,54,52,239,93,2,140,253,142,17,114,189,174,183,199,78,3,64,249,96,126,203,104,244,225,131,177,134,212,197,19,159,50,117,215,231,11,141,172,112,23,172,201,2,128,236,30,
+130,56,154,145,229,172,96,68,208,148,208,74,15,5,55,62,33,226,248,151,74,1,58,0,137,180,93,250,122,159,171,94,196,98,118,98,135,154,203,94,208,131,212,167,173,89,137,240,105,26,14,93,146,15,37,71,33,246,157,208,76,24,194,170,66,158,223,169,180,220,23,30,176,9,119,205,61,226,210,99,155,7,243,130,212,2,227,170,168,216,228,179,207,123,9,116,131,54,227,30,98,68,252,40,68,45,53,187,102,138,218,13,80,80,146,60,5,238,234,68,229,29,175,242,114,54,142,134,94,53,226,241,19,248,100,24,113,242,35,230,56,184,13,59,133,20,53,106,129,162,248,212,227,88,223,125,175,94,5,86,118,2,53,65,71,54,15,243,19,242,9,59,122,114,83,214,74,200,219,81,19,130,100,252,149,152,69,141,225,60,236,134,169,10,91,79,23,222,153,236,119,249,103,246,240,137,56,148,61,49,90,145,56,135,253,50,5,20,47,108,127,2,133,38,243,219,3,103,74,131,1,111,164,194,84,228,158,114,4,125,58,0,157,58,248,92,152,221,98,157,7,149,239,168,253,52,
+154,240,178,19,122,233,53,55,74,233,227,60,55,124,202,195,3,246,37,98,246,54,91,85,254,115,115,221,115,219,121,28,204,250,170,44,110,249,111,9,116,146,69,209,146,154,197,57,39,71,216,188,208,168,48,222,72,187,217,19,121,246,40,201,14,39,125,134,88,231,228,196,16,236,198,156,187,188,182,221,223,73,211,226,197,11,184,96,76,107,217,196,175,234,12,86,77,211,238,251,96,68,143,154,55,143,212,222,123,39,48,171,8,196,233,10,125,96,23,173,139,150,46,164,130,26,31,89,246,123,10,196,135,118,248,237,172,189,103,212,54,207,101,142,81,13,196,187,244,181,235,201,90,71,249,73,233,5,218,221,236,93,240,15,118,230,160,195,230,167,194,23,27,12,66,181,223,115,241,240,217,62,18,103,27,166,158,59,211,164,51,149,100,110,107,254,157,241,210,105,47,208,120,222,203,211,138,195,25,122,141,182,3,31,156,202,36,192,5,39,254,75,151,86,133,211,162,61,132,65,5,200,98,99,23,143,74,212,175,146,84,244,61,245,44,220,171,238,252,252,7,126,209,228,47,63,
+64,32,65,200,88,218,134,245,116,193,41,4,130,222,125,86,165,223,213,162,10,193,128,31,184,11,153,111,131,64,32,120,184,237,77,76,250,170,50,11,130,27,172,29,16,46,74,173,251,254,56,171,48,111,151,175,10,67,82,204,94,174,17,130,154,243,8,14,195,26,35,237,86,93,112,220,226,10,235,124,119,133,63,136,62,68,41,109,234,25,222,15,145,72,144,62,195,166,131,183,200,185,88,203,215,214,28,50,221,196,54,85,174,23,174,20,148,180,167,102,26,186,103,90,126,229,139,148,249,251,4,213,53,232,51,40,54,29,166,149,139,245,230,133,37,167,121,202,159,44,145,138,195,90,207,83,174,117,81,166,85,215,171,24,16,103,49,21,177,234,84,160,117,4,130,5,190,36,170,61,221,106,201,249,78,241,26,124,75,142,245,37,75,117,54,54,199,141,249,133,54,72,206,187,135,198,90,234,185,131,227,239,250,168,28,121,57,23,18,232,68,110,82,189,176,121,202,76,221,32,141,156,178,137,206,29,156,239,155,31,221,137,199,253,39,173,171,238,113,144,3,174,135,169,163,100,
+123,249,220,100,10,76,239,238,158,132,201,185,235,81,25,45,237,138,112,29,219,13,108,202,213,26,188,15,79,187,173,155,22,89,173,140,240,179,250,45,240,240,54,65,174,186,184,4,219,103,2,223,127,66,70,81,112,213,94,26,110,40,123,27,112,37,235,217,16,115,145,237,185,73,234,4,131,234,96,126,183,181,69,86,210,132,163,162,131,71,205,85,43,21,56,251,33,57,170,190,154,152,46,136,1,116,24,255,137,153,34,178,5,89,253,8,81,141,213,161,239,235,114,218,84,197,35,93,56,11,19,46,216,75,135,220,4,210,215,50,88,228,179,180,239,245,178,227,37,124,64,119,83,174,125,66,162,194,248,141,172,52,184,200,248,156,61,164,62,245,245,246,99,29,14,50,2,235,140,194,134,138,143,180,241,105,241,181,253,52,18,96,236,145,64,104,52,29,143,199,16,204,87,101,91,127,75,159,69,92,38,19,236,189,217,174,110,241,10,168,216,162,41,139,166,72,216,39,242,98,146,239,216,16,177,95,83,182,215,39,97,100,122,227,178,144,237,225,87,187,27,226,102,66,77,187,
+230,57,207,113,73,55,2,173,19,65,127,72,170,218,101,14,142,5,97,173,235,149,193,248,10,193,248,190,74,91,63,126,247,190,6,115,207,245,37,174,34,194,149,23,50,133,33,119,81,218,8,143,226,178,101,50,125,212,65,186,46,26,232,248,250,241,121,80,85,124,12,114,127,119,62,53,119,121,30,104,233,143,226,124,232,85,103,98,130,158,186,25,68,43,105,66,154,203,85,31,90,180,59,225,227,56,85,45,178,5,125,211,244,36,42,115,243,230,169,15,120,152,143,111,6,42,188,117,58,9,248,250,243,233,29,47,5,139,92,174,140,192,111,206,190,245,252,128,11,50,248,246,181,242,205,15,139,97,111,98,66,241,5,1,82,56,75,136,217,132,188,230,239,119,31,196,88,143,56,44,58,143,136,192,79,125,46,32,162,155,247,175,117,205,35,233,219,254,133,9,9,243,179,51,67,134,211,214,233,17,18,233,41,46,19,247,37,85,182,87,119,174,154,174,118,104,153,10,237,11,21,178,197,178,60,113,241,210,36,229,132,189,82,165,131,6,84,233,38,215,0,78,160,211,14,122,
+188,151,39,197,57,146,60,213,124,101,94,55,66,146,38,186,74,147,91,30,233,114,172,106,198,153,233,231,137,108,73,146,46,18,153,197,221,125,88,197,255,116,98,115,178,99,24,111,190,120,39,180,105,118,26,9,33,147,147,42,221,155,227,67,124,173,104,75,152,80,220,123,51,61,37,241,57,253,216,44,22,236,237,247,28,251,248,97,71,204,85,83,227,89,76,196,115,55,121,193,163,14,99,241,167,28,15,72,125,149,253,26,192,97,15,82,107,68,97,66,150,147,185,59,245,198,32,3,195,193,104,132,43,32,34,111,119,28,133,182,42,95,2,17,79,192,35,210,254,52,124,102,145,178,140,36,226,1,203,206,71,5,50,254,203,0,95,85,40,207,57,55,234,81,165,245,166,189,173,146,120,219,179,63,197,242,5,4,251,0,186,245,168,89,47,30,27,254,112,155,105,240,115,62,40,200,71,12,211,177,54,175,229,143,244,216,163,185,130,177,14,159,134,31,118,120,228,148,146,154,193,99,57,170,239,8,231,92,69,169,120,100,8,45,41,181,26,182,165,224,237,194,124,40,7,218,
+6,60,226,8,33,61,94,37,2,125,149,164,217,232,253,114,34,158,76,201,67,222,225,75,126,18,138,179,71,198,41,6,200,234,96,242,9,126,46,140,48,166,194,44,32,170,136,82,206,135,225,131,161,136,158,202,48,229,42,68,33,225,196,148,216,192,139,118,77,209,145,251,180,115,7,145,183,230,51,43,209,98,160,123,178,246,238,11,242,151,151,185,83,53,68,168,218,249,72,110,172,46,207,87,20,126,232,81,201,130,236,189,0,254,83,117,238,228,220,142,224,160,49,120,165,114,70,43,194,194,29,138,27,94,177,59,157,236,50,203,199,95,44,100,209,69,103,183,179,93,152,154,251,116,225,175,168,232,176,206,38,105,28,41,226,48,78,93,238,105,161,152,254,235,212,202,25,226,192,196,192,212,122,103,13,236,43,49,46,137,154,41,225,219,73,125,141,239,60,179,223,161,118,116,198,221,123,179,181,171,58,150,207,66,244,84,30,66,127,39,126,240,136,168,79,159,160,152,0,184,104,226,244,190,127,104,152,112,8,22,83,133,229,38,91,40,152,176,229,42,159,2,78,31,229,95,
+173,110,8,211,13,12,62,237,157,119,23,185,240,90,48,77,122,143,102,68,146,74,154,187,69,249,121,88,246,30,128,136,143,106,193,201,156,240,10,55,39,125,184,226,34,95,168,36,213,169,140,131,52,214,24,197,117,111,66,128,235,228,69,211,229,86,247,41,36,251,19,185,146,232,211,80,231,164,231,6,42,166,109,85,101,218,25,84,76,249,42,38,96,45,145,193,106,110,129,195,76,69,63,82,56,163,45,15,120,133,127,151,19,124,248,171,156,192,235,195,216,66,80,177,242,30,159,63,14,171,153,177,180,179,8,22,229,135,0,145,15,143,99,250,142,117,111,7,91,131,229,104,235,86,244,102,234,130,94,245,57,211,222,197,161,226,145,105,202,221,191,14,58,47,154,83,217,32,182,255,173,186,121,155,213,87,3,110,71,53,67,103,191,17,84,2,221,222,137,95,234,242,247,122,205,188,132,45,228,248,55,189,50,87,93,247,251,12,176,40,130,53,113,252,85,20,147,115,196,20,81,142,84,3,65,75,105,48,141,29,160,56,182,120,70,157,153,94,51,20,170,69,109,205,42,54,
+130,166,101,126,251,218,72,58,249,217,72,228,166,182,195,47,178,113,208,141,166,62,174,192,210,249,122,24,57,204,51,235,203,143,216,79,7,40,182,106,129,202,242,76,253,52,69,188,213,81,252,56,68,204,158,81,147,18,133,187,9,110,40,114,41,113,101,147,51,22,57,199,103,87,228,67,242,110,207,97,130,124,0,214,194,223,161,114,141,168,229,186,224,20,148,101,95,255,46,244,185,94,223,243,11,132,119,151,133,136,181,215,98,169,78,213,28,27,103,125,147,230,90,26,132,188,244,177,252,2,66,63,210,202,60,147,102,208,221,154,120,192,97,79,19,62,49,222,161,232,159,5,11,20,132,244,2,2,196,104,244,23,72,131,24,109,227,6,18,22,0,190,121,128,65,32,45,200,6,70,248,249,128,4,126,62,32,178,86,255,34,182,169,57,164,47,220,254,197,186,48,23,5,162,184,186,192,251,70,241,221,181,242,141,226,218,103,248,229,220,130,6,17,205,6,132,175,206,71,230,88,196,220,82,231,6,101,212,245,33,194,103,61,216,51,154,109,190,238,19,13,222,158,85,93,117,
+189,179,225,138,220,101,158,144,134,134,210,143,104,100,9,87,52,217,193,59,194,215,21,161,8,222,17,78,227,235,42,19,59,35,64,127,5,100,218,187,171,50,111,131,209,86,119,12,140,15,98,31,247,137,150,76,51,106,17,14,114,113,69,108,120,94,89,137,198,171,119,184,1,145,3,94,90,186,157,137,3,63,53,128,50,133,65,148,221,45,41,181,115,128,102,132,157,175,83,182,5,150,36,31,151,94,68,116,142,99,7,127,130,223,185,65,89,125,34,59,91,163,188,76,115,249,248,224,240,60,253,186,33,132,194,186,111,120,40,114,148,142,25,87,71,171,127,22,241,0,141,131,138,123,233,74,17,114,99,47,132,159,29,139,145,136,157,69,54,193,75,2,135,131,131,120,171,12,125,53,194,15,107,58,163,208,76,179,183,26,149,193,119,74,67,87,202,161,53,97,40,51,99,220,124,54,204,72,185,117,241,241,69,48,21,163,104,156,133,180,136,155,150,3,221,86,10,231,41,245,231,210,124,148,37,99,100,50,111,67,77,42,63,192,62,244,143,35,183,199,19,16,69,22,124,48,
+83,28,244,205,115,78,151,161,53,243,223,232,32,31,8,28,34,206,11,131,170,191,41,88,173,230,103,94,105,19,211,236,94,133,57,194,243,101,159,252,227,44,65,225,19,106,81,85,130,72,205,41,22,33,254,76,136,118,62,161,245,163,143,24,91,5,6,140,209,168,16,226,188,1,133,54,155,30,121,38,35,53,151,198,181,139,200,94,80,140,248,131,182,113,63,183,207,135,80,92,241,241,0,211,63,62,141,220,146,148,62,235,232,110,9,43,18,47,199,203,92,163,32,45,114,140,160,90,71,178,193,180,188,72,126,96,33,32,192,169,218,73,10,69,43,215,202,225,126,28,172,30,81,97,50,25,84,68,210,86,62,24,201,90,167,253,244,229,132,141,48,226,215,175,9,213,10,72,237,61,35,221,160,154,165,93,107,222,132,232,62,146,64,173,19,230,35,95,243,20,38,239,240,120,38,210,169,206,209,158,30,137,116,255,107,246,113,36,213,62,192,186,95,254,144,248,253,14,173,246,65,136,40,20,2,166,122,239,21,199,99,47,204,153,248,189,9,208,7,151,153,37,18,220,56,87,
+255,217,152,65,89,224,85,29,23,238,50,60,38,208,122,61,182,160,146,245,221,204,205,168,106,143,13,54,15,108,100,148,16,195,125,21,254,135,41,190,154,127,205,247,159,223,158,47,222,150,200,72,67,142,96,80,240,40,56,100,204,24,231,193,135,31,204,217,62,59,189,79,76,9,95,14,181,19,238,69,143,28,62,37,169,88,45,102,34,144,238,124,170,169,114,240,182,32,68,211,175,26,18,198,71,138,12,237,164,108,201,145,208,15,51,88,214,215,21,161,1,222,17,62,223,82,6,117,227,37,76,196,115,76,180,27,223,9,86,39,114,172,132,42,163,136,77,221,103,158,200,38,123,238,38,253,22,207,96,100,190,78,97,224,245,217,186,165,61,180,198,39,84,162,61,241,91,241,94,185,198,7,208,74,41,48,152,81,253,199,243,123,183,250,116,121,113,204,214,52,39,107,190,57,82,54,28,240,166,203,114,116,73,34,170,124,115,245,188,209,56,104,91,111,117,135,248,206,18,95,232,170,113,3,237,117,65,188,138,88,176,216,87,134,117,66,76,220,210,247,153,109,143,65,13,136,
+214,41,233,225,99,54,126,124,47,111,218,34,48,9,193,28,244,124,37,161,91,150,70,30,220,209,209,128,106,157,38,122,159,10,204,211,92,7,209,187,136,37,152,31,241,165,36,200,249,95,182,34,195,20,111,122,50,67,193,130,130,214,43,18,81,200,215,31,106,225,15,253,255,174,23,168,95,212,139,232,87,157,217,92,63,247,184,175,11,131,203,242,2,133,184,22,46,11,116,8,126,192,75,59,217,164,101,175,216,211,51,0,129,70,151,121,16,136,203,142,19,213,29,157,89,234,52,114,236,163,201,89,111,255,80,95,207,200,4,175,6,43,246,56,228,0,34,169,148,117,113,89,255,49,184,192,23,10,58,124,246,115,48,60,140,79,101,143,126,168,86,133,35,174,65,78,138,132,141,68,199,150,37,97,209,107,63,158,107,139,231,196,82,207,152,66,62,46,158,152,0,157,119,220,60,234,211,179,169,40,25,202,113,26,13,89,85,224,137,161,216,225,176,193,83,211,115,10,25,74,173,212,5,70,129,201,61,174,211,130,169,240,154,216,179,122,80,100,159,92,74,238,225,117,244,44,
+178,96,117,169,168,146,30,118,121,222,236,3,143,56,127,102,24,166,72,193,21,170,1,125,129,52,163,110,40,238,45,11,221,255,157,255,255,250,15,255,224,159,253,23,255,245,31,252,225,63,131,192,130,80,233,87,71,231,202,245,247,63,69,194,239,51,217,22,239,6,204,238,205,196,193,101,23,25,121,85,143,26,244,76,54,188,19,11,93,76,184,59,225,125,177,137,96,77,56,162,243,228,49,200,154,211,136,198,82,93,9,94,75,57,178,233,117,98,197,138,173,83,227,158,122,167,202,150,159,128,7,56,3,1,119,9,239,145,9,67,168,251,76,13,5,251,216,131,164,33,187,213,171,44,195,219,219,219,106,106,143,218,119,252,183,94,123,210,221,241,227,134,184,189,212,155,218,119,220,217,7,191,55,229,133,108,235,117,97,173,42,109,29,181,244,152,0,41,101,60,158,137,238,61,185,188,148,162,207,147,137,214,73,103,72,77,85,59,29,97,180,41,39,2,173,240,85,136,81,171,201,253,118,205,152,10,105,62,41,157,43,90,196,84,80,2,187,123,3,143,34,140,155,138,238,160,
+71,248,204,135,168,200,236,49,102,2,195,8,32,216,182,49,88,31,42,224,70,14,33,103,206,208,88,73,188,220,114,238,217,10,15,111,203,40,213,37,216,158,103,117,244,135,87,48,53,55,99,1,21,186,190,198,21,234,250,207,173,70,52,130,53,228,175,49,122,2,79,218,63,105,100,156,212,141,62,36,109,56,184,108,216,105,188,195,244,11,188,4,21,82,134,24,248,22,252,112,36,249,116,24,14,120,255,206,193,83,96,164,211,75,194,235,237,74,122,141,72,117,194,22,57,229,144,170,115,175,113,96,19,220,166,218,215,39,73,29,159,228,119,243,52,188,145,246,18,74,142,142,144,97,231,159,40,22,114,38,45,92,189,179,92,0,39,255,136,183,62,158,178,154,216,217,19,209,228,43,93,254,196,40,101,39,116,124,219,7,52,112,82,127,204,166,6,49,47,154,175,92,207,242,120,152,0,65,106,189,154,90,136,209,167,116,252,224,134,235,120,200,228,35,241,106,68,158,240,29,194,70,208,80,165,171,119,96,84,219,119,20,214,171,35,194,57,170,7,187,190,81,87,180,238,224,
+149,109,190,189,157,82,117,119,108,77,177,192,233,184,175,248,55,4,187,216,232,103,16,182,12,196,160,124,169,133,80,47,106,138,22,160,26,118,131,29,109,11,189,198,197,51,149,152,0,211,84,31,154,102,68,187,70,236,83,64,170,12,119,67,198,139,27,190,145,220,132,128,247,134,185,139,12,74,71,185,149,242,222,0,99,38,93,133,112,244,217,51,209,18,251,180,180,184,202,172,121,106,167,84,29,83,130,61,5,102,73,228,197,79,182,229,252,87,207,148,130,0,122,124,124,51,49,44,155,172,97,39,191,63,244,0,231,185,185,232,167,237,63,239,124,79,30,82,206,32,212,220,43,231,56,211,43,175,187,61,170,188,190,119,36,22,186,47,241,160,70,19,38,136,183,192,158,234,7,189,69,183,192,242,150,108,51,34,111,145,67,25,33,252,216,85,103,106,226,134,53,203,81,18,146,208,77,143,115,197,142,3,190,183,206,165,187,231,239,11,28,92,134,59,252,60,171,137,231,231,151,186,25,134,78,74,28,18,49,177,125,138,91,207,156,197,81,159,202,23,106,39,86,205,61,210,
+114,214,4,255,53,187,162,141,187,47,215,75,143,212,237,223,124,112,190,254,158,196,179,211,43,75,174,217,10,203,76,58,178,89,54,126,53,15,55,30,227,167,196,160,98,116,224,53,190,57,235,236,119,111,130,11,245,178,35,160,148,108,58,14,22,238,85,34,49,230,91,133,177,234,132,250,26,6,143,249,166,212,26,251,194,199,152,84,94,75,213,151,80,253,145,67,92,121,179,230,98,172,84,174,158,232,134,188,175,50,196,3,211,157,120,158,239,240,107,59,44,166,16,144,214,224,73,242,148,108,33,237,34,227,229,135,36,50,144,102,77,220,195,40,103,187,230,118,203,213,6,80,11,128,203,37,157,29,229,54,136,219,155,237,156,73,189,41,21,252,199,99,241,194,16,9,42,156,99,168,86,235,103,207,159,225,55,154,40,178,130,69,102,43,192,96,11,153,78,109,232,19,210,123,123,176,219,72,211,58,145,15,0,37,222,104,105,124,107,154,248,234,213,78,249,248,254,112,180,241,249,14,227,204,50,239,214,116,167,136,51,162,132,173,85,156,140,219,18,195,144,232,155,34,58,30,
+145,215,108,121,187,94,122,205,198,150,248,242,181,126,18,56,121,218,226,41,61,236,229,79,96,109,50,15,159,100,6,145,0,128,26,85,57,53,128,185,164,237,162,0,190,151,215,50,65,198,127,137,221,110,210,231,131,68,73,172,93,59,163,252,53,128,178,173,241,53,216,103,125,243,110,181,218,144,105,111,3,228,246,105,214,89,123,191,54,145,88,25,100,25,192,3,69,114,126,18,97,246,70,3,165,8,157,12,71,137,107,170,69,97,188,35,45,44,235,190,205,162,179,76,71,236,22,199,202,127,188,118,201,115,96,64,207,218,29,230,117,124,120,112,11,226,68,45,243,154,61,204,215,174,212,248,230,74,149,67,180,131,231,141,163,164,227,54,49,150,122,51,47,233,38,121,98,66,92,171,223,72,46,59,128,236,229,251,198,187,61,241,222,152,119,211,12,67,83,238,42,237,86,227,174,219,48,103,23,80,216,52,208,125,196,56,78,29,227,45,0,126,211,185,107,174,222,171,45,85,151,8,37,30,253,78,91,205,113,186,250,6,209,6,106,106,22,12,55,122,88,177,118,115,207,188,
+75,164,96,71,138,216,232,132,252,253,188,63,66,231,63,167,1,196,164,38,225,63,102,101,252,195,214,87,13,188,79,116,194,119,21,239,82,47,63,219,37,215,254,188,92,77,179,226,22,155,243,133,55,47,74,132,36,63,87,224,49,11,185,86,239,7,79,46,49,84,69,126,142,77,91,185,208,211,151,72,39,27,191,156,209,31,153,99,164,234,32,63,41,142,51,30,100,155,98,196,89,178,60,35,31,55,91,214,126,35,170,176,44,212,210,163,249,156,196,30,202,125,215,192,43,95,181,92,158,206,36,251,71,221,187,29,213,148,253,173,213,128,62,218,183,241,7,77,34,125,43,220,216,122,187,124,184,179,43,170,94,91,105,253,0,211,238,195,198,141,236,22,220,220,58,34,142,185,180,159,86,21,242,212,124,112,201,22,93,146,10,147,216,176,88,10,11,243,22,9,222,95,244,242,172,79,163,182,19,142,106,214,93,92,30,234,8,118,113,6,252,250,20,223,230,11,206,62,229,198,199,170,49,135,252,46,116,169,6,104,157,55,239,57,109,4,44,15,134,241,134,131,214,10,107,196,
+39,49,253,120,187,185,76,43,227,244,182,89,7,69,247,249,182,29,63,212,217,1,155,99,183,66,78,46,83,96,80,217,221,52,64,23,151,145,113,13,125,134,111,117,186,14,113,164,0,180,253,168,139,161,238,80,50,149,16,137,5,40,201,152,246,26,254,0,22,9,52,112,252,20,69,3,38,124,224,3,74,58,160,152,214,154,239,238,13,87,235,237,14,60,231,113,224,73,196,167,18,148,137,88,227,85,28,17,31,131,197,143,237,66,188,199,213,224,176,149,117,222,34,140,195,210,89,215,77,58,167,89,101,126,205,140,76,35,76,161,230,205,58,208,143,161,120,14,59,148,123,207,67,248,164,183,222,214,110,176,140,132,63,22,222,171,210,61,27,188,118,11,87,10,132,136,36,159,55,192,50,115,108,228,116,177,42,44,31,21,131,23,130,224,26,251,90,1,111,170,21,56,148,244,92,138,125,62,50,50,233,48,124,243,170,11,109,22,201,163,34,83,31,201,57,222,201,148,100,192,231,2,99,221,67,182,165,172,94,35,1,77,112,77,163,227,2,231,21,12,75,221,196,122,49,123,
+90,49,6,100,51,174,112,65,155,143,74,242,157,95,200,255,112,138,171,215,181,147,65,220,86,50,230,197,158,179,247,33,202,189,154,109,162,207,114,232,26,228,166,223,197,5,83,201,184,164,84,116,15,77,103,209,171,114,250,166,95,247,207,166,165,120,215,218,185,12,222,81,152,102,128,57,109,35,137,228,180,136,59,61,132,91,47,129,25,48,242,201,118,37,181,237,117,80,215,153,115,28,75,214,39,245,132,93,174,24,55,102,75,50,224,158,63,114,155,55,34,87,237,77,238,72,90,64,109,63,228,99,235,218,86,115,187,244,46,61,1,221,166,147,84,25,114,30,149,110,251,8,218,95,146,45,196,18,120,83,153,94,251,147,83,187,171,62,18,207,176,43,99,250,124,185,240,215,174,247,56,145,101,92,159,204,38,231,124,159,156,13,222,19,146,147,229,48,172,59,160,8,70,13,110,14,155,162,133,89,133,116,93,114,222,142,216,91,118,238,62,205,156,249,53,17,136,131,200,119,136,203,60,18,54,251,48,141,107,218,131,247,139,243,214,236,77,61,249,224,232,150,141,79,208,249,
+248,113,55,36,142,111,80,68,220,65,116,167,182,143,88,147,49,181,128,122,101,19,183,249,108,114,97,76,34,184,214,113,230,240,25,56,85,194,171,125,218,157,239,215,203,121,221,188,155,32,228,78,139,229,9,83,63,107,131,25,204,204,200,181,98,136,88,122,27,71,228,248,251,125,96,120,100,205,214,120,125,82,206,9,82,88,181,42,156,183,164,101,245,183,181,96,222,24,136,104,43,175,199,201,23,156,219,211,14,126,201,106,87,159,136,31,156,172,140,16,181,43,117,163,213,210,53,149,65,185,58,44,236,141,65,171,235,87,237,224,196,91,179,77,83,182,230,38,119,255,250,122,54,31,195,200,213,198,165,236,89,15,213,39,227,118,52,187,87,128,28,133,170,201,229,147,164,183,41,143,94,143,21,55,192,21,207,53,198,111,93,106,116,79,244,219,165,110,198,80,194,206,15,90,215,124,62,182,211,198,157,183,170,197,209,55,93,219,231,199,11,253,70,44,15,217,241,161,93,143,41,212,71,243,7,117,39,111,122,233,226,110,18,217,229,104,169,176,9,14,165,36,200,220,188,102,
+122,236,218,166,126,241,159,63,25,61,180,63,107,145,169,119,107,176,200,172,209,100,88,110,141,63,198,173,236,218,164,23,142,249,23,217,156,145,47,230,164,233,235,72,199,66,157,28,71,122,243,229,149,103,87,45,130,91,5,158,185,69,145,6,241,190,154,109,180,192,7,48,101,90,47,14,181,183,107,47,131,55,244,10,132,132,115,46,232,114,118,81,251,219,139,106,31,228,38,244,196,46,42,31,125,60,119,31,21,146,211,253,135,131,100,51,183,130,29,30,163,153,233,86,18,250,201,157,78,146,214,238,71,165,153,150,12,4,104,163,214,217,228,27,137,2,193,3,59,111,115,244,133,100,158,237,198,175,14,54,246,182,100,221,136,219,223,63,62,214,170,138,169,157,173,7,151,188,173,42,51,186,82,29,246,232,94,55,112,220,250,125,201,206,126,236,153,47,226,181,73,32,15,1,172,173,123,50,165,62,16,9,26,82,164,121,186,57,118,27,23,34,190,142,189,88,195,113,159,214,139,172,108,138,71,227,155,166,109,17,7,179,146,123,98,223,150,184,81,1,42,212,121,46,93,69,
+233,137,243,90,214,38,225,26,233,152,203,123,215,188,143,90,227,209,138,84,168,180,30,226,54,191,239,35,202,168,182,223,242,197,9,207,57,175,59,223,150,60,212,14,146,4,129,162,164,98,196,103,125,181,27,45,43,174,27,227,149,119,219,207,145,18,211,131,59,198,117,95,203,40,90,141,126,174,149,37,215,58,138,124,8,118,131,156,132,127,150,113,200,225,251,11,79,203,64,231,117,97,27,193,145,126,186,207,99,203,14,182,150,224,200,156,196,113,82,233,146,157,100,16,251,240,180,112,107,214,13,116,149,113,83,44,17,20,227,199,163,121,121,121,27,191,135,142,238,36,198,81,62,206,106,75,132,99,172,86,28,34,115,100,67,57,235,211,175,202,142,93,156,149,60,127,91,69,10,144,202,253,203,165,13,199,223,155,214,52,109,225,121,26,63,39,204,140,109,222,244,209,73,43,7,90,158,74,57,25,171,57,185,141,94,159,58,90,252,156,170,43,79,33,184,167,226,194,150,212,161,29,138,80,212,204,174,57,247,9,97,212,106,110,181,68,230,131,152,155,43,51,33,167,163,163,
+189,106,83,238,172,162,65,111,117,80,16,212,150,1,135,83,6,28,10,216,17,31,114,21,203,59,246,71,69,225,27,5,141,78,26,219,209,5,220,163,222,45,60,98,223,97,151,43,164,195,152,32,47,142,174,108,249,243,139,55,219,54,31,52,150,150,51,173,162,78,153,1,86,50,46,134,166,179,187,244,133,88,187,119,208,232,136,72,2,152,197,55,163,250,213,123,133,184,103,113,223,19,48,154,114,149,27,228,132,127,198,142,231,176,60,33,113,232,58,196,134,248,101,110,249,32,235,241,26,38,7,106,183,120,196,196,224,250,196,20,34,158,20,242,142,4,184,154,42,202,153,167,12,37,16,168,151,30,50,118,42,22,120,246,143,150,252,177,134,188,2,232,105,186,116,97,209,9,202,29,34,189,128,16,26,149,141,193,47,45,60,169,117,194,178,221,202,190,191,194,101,166,74,1,227,152,29,111,23,19,42,197,183,197,242,230,229,192,163,113,163,20,72,6,177,137,173,238,170,230,217,240,168,53,206,110,167,112,200,222,163,19,78,214,137,147,28,20,214,226,26,9,230,57,109,12,
+92,83,157,205,112,75,170,192,3,210,169,211,240,40,219,81,180,78,222,110,227,196,28,159,63,25,231,211,203,210,101,4,168,201,89,149,117,108,7,56,249,135,90,78,171,121,187,194,32,213,7,198,213,52,196,77,171,167,105,43,199,39,6,157,158,158,246,204,208,196,185,152,210,221,101,163,103,12,27,129,232,168,94,131,227,53,195,85,190,238,165,22,169,42,254,205,239,170,35,185,163,69,153,15,188,62,164,240,145,209,219,71,205,185,187,224,56,214,154,193,210,244,196,146,103,108,31,192,225,109,107,129,86,160,117,204,143,178,229,225,149,63,240,153,161,218,69,49,232,235,73,226,237,212,39,131,28,39,175,210,155,12,11,72,18,56,171,45,102,181,86,249,159,136,145,117,109,114,179,126,208,196,204,43,170,244,224,75,65,105,179,75,146,210,11,147,228,217,64,235,1,75,125,157,191,80,160,152,235,205,194,233,174,66,130,13,111,116,15,11,203,235,233,131,254,83,253,88,61,135,178,86,223,80,70,85,50,148,81,117,133,75,179,205,42,209,126,35,168,68,120,79,158,21,128,56,
+230,118,23,83,174,122,196,187,224,83,40,34,191,59,141,48,180,90,18,128,206,143,81,24,211,102,149,29,121,53,255,135,35,59,175,105,54,20,203,242,162,158,92,174,132,61,198,33,15,63,212,248,76,56,226,138,85,26,32,2,123,68,101,224,139,18,245,195,203,193,91,84,242,227,93,230,196,206,183,92,202,39,22,43,154,44,187,66,88,211,213,197,56,106,58,244,129,161,239,146,201,1,146,213,63,83,148,75,165,44,76,151,127,131,205,4,49,230,51,135,62,40,38,7,23,191,47,222,191,248,231,229,221,84,152,125,36,135,176,69,20,206,234,103,51,6,221,53,227,146,68,231,56,156,129,85,145,125,168,200,124,4,172,73,215,62,124,60,25,16,230,82,192,52,228,74,237,75,72,246,8,168,215,239,208,96,12,127,205,237,129,21,230,199,63,232,227,37,26,176,136,34,142,13,196,102,225,91,23,101,215,252,169,246,58,242,189,95,170,166,253,234,249,188,211,118,15,43,63,98,57,229,163,219,120,173,173,215,14,204,167,42,208,53,170,5,123,67,174,192,189,161,138,229,229,48,
+59,23,47,118,66,165,124,138,69,78,126,50,160,48,250,227,197,219,231,6,29,71,231,235,167,50,112,210,8,212,79,161,60,75,85,114,15,149,211,121,55,220,223,177,7,90,95,92,151,245,221,174,219,21,230,168,158,37,238,235,171,93,246,98,44,18,75,194,167,128,186,170,59,176,176,254,91,75,21,98,148,184,156,109,39,111,184,94,68,235,173,209,241,38,177,156,13,129,125,23,247,88,228,172,98,135,113,227,138,98,49,14,43,0,19,181,159,166,159,57,40,52,180,235,29,3,189,163,127,109,253,184,161,38,70,81,233,61,51,82,190,238,99,0,213,107,61,197,178,242,218,11,48,65,245,18,235,35,158,19,140,45,217,90,198,44,180,57,36,54,73,32,171,40,243,153,213,58,135,181,177,179,7,43,84,178,70,167,150,160,173,222,54,86,221,118,106,122,216,174,72,112,222,110,109,209,105,163,168,189,222,134,157,211,66,81,57,126,14,19,231,254,147,151,80,91,54,26,148,242,135,243,188,58,4,204,114,156,141,187,193,75,62,77,56,243,185,90,63,175,26,118,7,79,126,89,
+220,252,88,116,62,205,177,172,15,118,144,52,231,215,155,8,113,240,196,225,27,249,6,186,145,53,169,177,74,118,24,172,125,55,207,48,71,23,6,2,151,82,224,184,73,46,54,110,171,43,37,3,215,24,113,128,117,156,35,173,125,249,89,173,134,242,142,37,108,101,218,226,111,39,39,97,159,179,171,36,206,203,112,62,51,79,56,111,243,13,25,118,169,51,23,177,137,55,190,189,156,216,171,218,155,101,117,219,54,88,101,96,108,93,125,208,236,53,115,102,83,222,182,222,27,119,151,35,81,61,210,205,75,10,244,41,54,59,169,199,66,50,137,186,75,103,166,97,125,187,51,135,104,83,173,152,232,34,239,29,225,164,228,13,71,72,82,167,192,77,68,102,124,28,59,70,135,67,167,215,195,12,112,219,240,3,150,185,76,109,183,228,228,96,12,141,184,171,224,174,228,115,110,165,146,17,190,87,173,163,135,151,179,188,33,155,216,233,45,86,210,82,199,49,110,135,58,60,75,186,14,85,107,75,240,86,126,116,223,41,95,143,30,214,235,13,4,78,65,101,85,126,57,20,53,240,
+2,179,234,251,200,219,214,116,109,63,10,196,243,242,44,185,124,4,234,87,120,9,30,26,137,87,175,196,51,39,37,189,220,219,229,130,254,5,235,62,220,106,233,35,77,209,118,149,227,171,139,239,118,169,165,27,250,250,168,121,214,172,89,119,253,232,66,164,132,235,212,101,49,62,132,148,181,91,121,87,78,1,107,17,253,121,197,218,115,55,250,220,142,245,141,40,59,185,158,52,214,43,193,248,83,159,30,133,78,247,155,60,217,184,177,178,18,92,60,250,184,69,242,200,24,76,140,122,255,161,148,22,60,148,149,124,38,145,181,0,212,109,119,235,62,150,37,61,141,106,226,60,69,152,3,197,129,4,31,180,221,125,144,67,182,8,143,67,111,45,139,188,34,53,118,63,41,3,177,251,71,164,12,236,235,207,210,247,19,102,207,249,127,6,54,63,195,94,108,123,3,89,179,221,199,15,135,111,164,166,76,230,101,44,120,171,147,226,8,111,118,173,186,192,114,206,136,129,90,117,38,137,10,249,92,116,240,67,32,228,181,40,190,23,219,71,138,117,202,39,158,73,166,230,64,162,
+79,231,9,108,35,250,168,39,27,71,250,119,85,49,7,135,189,107,52,155,9,83,42,111,92,40,31,94,27,18,133,71,11,10,131,195,225,202,114,250,78,219,98,50,163,237,64,149,194,234,9,35,188,125,102,50,167,17,91,113,63,64,39,148,149,144,101,197,214,62,163,62,201,52,15,195,62,206,109,34,37,252,168,65,78,210,232,186,16,33,90,241,86,244,44,105,11,128,53,148,16,126,50,222,234,232,31,57,166,25,28,141,164,116,65,30,211,100,51,196,152,152,180,186,199,19,241,38,147,81,6,139,49,210,205,10,173,87,219,220,10,91,84,189,40,8,85,42,161,45,186,113,162,39,145,143,199,176,242,149,122,183,30,108,70,163,200,179,21,66,162,230,202,69,127,88,108,51,20,47,102,229,82,246,25,99,219,10,2,215,235,240,67,215,171,237,112,130,100,180,179,89,165,199,173,103,72,159,146,43,63,21,253,223,51,113,102,37,213,246,226,35,231,57,74,54,53,202,1,164,156,120,70,1,67,127,164,234,66,217,54,187,102,172,23,117,85,21,167,210,251,173,24,196,78,190,
+66,124,82,173,240,244,115,52,70,110,226,108,13,206,125,185,78,162,33,47,131,182,205,142,231,61,95,204,237,143,138,110,102,211,2,86,126,16,39,164,94,94,175,120,108,214,145,139,108,75,36,229,221,44,218,197,7,134,184,68,78,181,64,77,21,174,71,211,66,6,224,57,179,251,1,207,228,52,102,16,220,207,218,190,122,178,65,185,56,33,233,56,82,55,143,246,5,231,82,252,144,190,46,166,52,194,44,74,238,226,21,175,143,102,206,115,1,193,82,188,192,3,251,164,20,31,184,95,228,108,143,207,110,219,194,34,39,113,163,72,18,250,202,105,151,5,214,113,143,83,16,191,106,74,36,112,207,88,23,143,122,27,179,37,129,139,187,68,12,59,49,115,241,192,28,193,153,252,202,238,181,194,178,122,57,17,64,229,185,182,33,208,93,223,180,24,169,183,70,66,233,53,125,71,218,247,130,207,51,115,84,196,12,48,130,182,200,240,179,226,190,123,11,106,14,224,82,19,184,246,131,82,139,182,65,59,9,200,48,53,3,133,139,129,68,83,73,48,213,34,21,251,7,86,37,103,
+75,221,86,42,79,2,151,0,134,52,134,215,29,112,161,134,150,222,137,181,250,94,184,50,186,149,214,54,151,11,239,52,167,72,38,141,125,139,200,60,108,213,194,201,12,67,240,89,169,105,43,221,75,75,147,172,219,119,202,250,229,192,123,19,7,29,206,60,24,100,20,9,106,69,69,209,211,240,23,150,49,227,24,141,139,203,178,241,100,96,169,66,124,230,71,100,153,250,140,169,95,253,169,189,62,19,124,30,42,54,136,74,173,23,59,242,199,121,254,221,29,236,86,243,50,213,229,151,129,7,86,201,110,187,75,139,180,120,63,216,115,165,6,64,176,218,77,132,2,70,185,106,109,92,186,49,78,3,95,130,36,161,129,12,218,113,43,14,241,16,94,252,40,151,111,41,76,228,67,83,202,59,84,11,58,195,33,85,199,29,188,18,213,251,154,200,81,161,109,226,156,103,15,102,199,214,81,9,9,59,84,48,149,180,241,20,43,15,121,193,125,18,217,83,71,136,93,18,35,60,33,230,245,40,149,129,57,1,134,233,218,56,54,222,9,195,119,53,156,36,56,132,214,36,193,214,
+247,115,8,101,214,126,6,252,63,195,67,253,207,240,239,231,237,134,141,194,232,92,245,194,246,159,64,208,18,129,77,201,119,173,248,229,115,38,230,251,161,55,119,170,216,100,163,31,163,181,157,169,120,121,139,129,211,84,176,59,167,112,160,174,12,82,66,177,176,70,4,146,81,228,172,179,60,2,87,222,180,33,254,122,213,86,191,166,93,190,70,33,54,114,147,235,118,27,246,246,46,158,95,239,164,99,252,85,110,42,68,97,100,30,130,3,52,226,210,19,214,241,88,126,93,92,211,38,193,248,251,205,28,70,70,28,121,210,187,68,141,131,61,78,244,125,207,134,130,57,78,212,253,186,49,96,222,30,113,158,17,188,62,58,92,232,252,62,82,140,97,212,4,238,125,51,185,183,211,171,117,124,155,190,46,181,162,181,231,213,69,235,10,199,253,109,19,194,254,10,14,73,91,226,89,228,77,94,93,160,107,88,109,223,168,143,8,243,124,88,77,241,20,23,230,253,119,181,19,174,57,2,226,146,232,222,30,161,215,123,131,129,80,236,159,15,54,3,53,29,129,207,143,138,151,216,
+212,125,15,216,145,246,143,148,187,12,224,17,246,45,115,29,180,132,190,5,67,75,173,202,233,130,105,16,61,51,227,217,17,137,143,65,189,67,163,218,206,40,11,10,116,160,255,133,214,32,140,252,190,62,101,104,200,213,5,240,228,63,199,182,13,166,225,153,112,140,99,130,138,132,20,179,191,180,247,52,147,142,111,237,219,244,214,250,75,96,149,208,213,53,118,165,171,64,102,82,64,209,119,118,186,213,64,77,75,67,224,187,106,229,88,173,17,116,141,251,109,105,139,202,6,97,46,208,77,154,157,92,113,13,81,250,160,107,214,70,11,15,251,222,216,148,50,219,27,181,156,24,17,151,139,201,134,227,129,215,217,223,222,66,138,121,24,38,128,77,142,128,135,222,146,45,189,175,157,252,209,232,236,50,63,86,57,57,164,174,1,202,132,126,9,5,101,246,191,132,130,50,111,95,66,45,154,137,86,234,129,231,71,3,222,103,78,132,247,61,244,141,189,10,139,43,15,137,243,22,208,139,17,94,104,16,162,72,193,99,154,218,231,142,3,5,52,207,136,255,49,15,211,201,215,76,
+226,95,248,181,173,3,243,140,98,223,174,215,223,226,141,201,192,250,90,199,120,129,231,56,127,252,206,156,31,183,26,187,87,41,133,162,95,191,140,6,109,206,125,25,13,218,204,41,221,253,189,250,17,141,1,97,126,217,91,202,190,173,193,69,220,64,185,92,38,201,109,184,90,100,166,195,12,132,118,177,11,232,124,180,95,198,33,112,83,38,53,127,179,213,85,137,82,10,39,255,150,134,202,206,191,142,39,122,138,137,18,163,248,151,75,160,95,82,64,143,30,127,212,11,8,64,235,101,50,86,99,230,25,25,215,160,73,104,208,38,208,36,81,13,180,233,203,164,7,208,166,249,104,179,210,82,61,240,242,168,248,255,225,31,173,93,55,157,78,125,191,176,83,225,233,236,148,96,168,192,192,88,249,10,21,60,162,12,112,216,100,57,175,82,139,76,65,3,142,194,31,3,10,47,223,6,172,83,165,105,244,131,42,77,150,70,68,240,100,239,225,252,123,103,126,121,82,219,73,224,174,90,251,116,200,182,64,117,224,241,31,69,63,126,42,55,0,78,92,24,53,219,169,244,106,131,
+150,114,249,170,208,111,117,40,237,111,117,234,140,89,42,83,128,128,177,118,254,10,54,48,214,22,119,123,59,223,86,195,168,107,17,22,56,77,74,249,214,122,58,142,142,93,160,214,26,251,229,91,107,143,70,148,87,176,73,242,74,45,240,173,165,80,188,156,79,54,246,95,196,89,24,179,254,214,116,40,77,142,136,110,160,211,2,207,224,203,2,37,19,140,247,254,99,192,240,45,205,171,204,131,210,196,254,145,99,180,251,73,24,225,183,23,16,163,52,48,34,201,207,181,200,110,102,88,191,64,60,119,40,222,225,180,117,169,209,66,42,26,37,246,0,52,171,224,75,187,216,139,248,211,127,119,80,241,249,115,235,69,54,38,50,131,113,246,166,208,204,142,238,0,104,51,71,63,174,75,138,206,215,57,148,162,159,176,15,191,208,168,91,165,87,231,231,219,35,12,171,18,61,160,148,219,201,211,43,4,128,166,39,154,80,124,99,17,57,232,13,143,226,251,152,41,200,52,247,201,61,124,67,62,121,42,185,105,129,216,155,188,17,124,224,105,166,122,5,176,166,135,104,72,110,254,
+41,206,183,195,116,69,141,237,32,225,129,54,246,105,221,101,88,17,226,96,253,44,131,130,44,127,221,80,125,0,141,21,74,165,172,234,12,91,17,231,17,60,76,97,222,62,146,203,193,176,76,13,184,195,135,89,128,185,111,109,46,217,234,2,126,63,139,210,241,181,134,44,213,159,141,8,222,159,121,221,239,121,47,188,148,237,94,231,6,78,185,215,40,253,107,134,89,81,4,19,1,28,152,228,126,6,18,253,201,192,207,220,119,42,27,188,231,171,36,38,46,57,5,126,224,28,35,84,106,16,223,243,101,80,199,6,47,148,178,222,131,106,164,110,251,224,180,152,24,241,141,84,89,102,87,120,122,145,222,26,140,183,231,181,25,48,198,158,176,171,60,247,148,245,193,204,121,187,22,106,26,248,209,55,15,61,24,63,150,25,254,253,33,102,208,74,236,90,250,123,187,38,159,61,154,74,254,69,43,20,129,213,71,38,111,208,127,102,190,27,7,69,69,217,42,244,190,142,52,175,15,75,207,146,29,0,58,77,131,61,175,148,92,192,59,60,169,230,97,75,249,31,246,214,110,250,
+182,57,238,171,198,199,160,109,82,65,159,107,251,128,154,61,197,152,170,121,37,47,61,205,21,3,20,180,41,255,186,140,223,79,52,17,253,145,174,46,167,110,35,84,85,103,173,166,16,118,159,150,125,29,49,53,44,122,107,54,227,232,22,133,108,26,122,131,223,2,9,89,222,104,8,168,222,161,222,204,108,212,202,23,38,35,35,3,200,42,121,116,158,215,218,161,78,186,146,45,142,223,235,208,51,121,178,132,152,210,33,243,162,117,150,211,54,230,128,150,206,212,182,76,184,7,32,155,124,183,219,83,141,210,72,247,136,22,27,164,234,13,112,108,124,211,160,186,159,97,182,46,106,42,94,172,169,97,190,210,239,156,249,250,235,242,62,134,217,225,30,83,75,42,223,239,105,195,247,163,102,175,105,169,24,61,79,225,49,247,237,18,167,116,105,119,53,197,57,160,42,214,237,175,33,206,78,243,22,128,1,8,28,35,201,169,236,211,230,90,33,221,17,244,137,3,150,211,132,44,10,29,208,1,54,82,224,77,184,218,235,51,118,27,130,2,154,97,107,28,61,119,37,122,131,36,
+31,171,208,172,212,137,160,235,29,127,57,66,68,226,204,216,198,172,72,127,114,9,162,17,155,177,185,45,173,15,230,19,202,64,0,25,118,30,254,254,232,238,6,123,158,245,89,145,180,215,246,179,51,189,163,102,15,182,111,190,210,75,84,88,169,149,63,20,204,173,89,27,232,187,167,7,219,32,131,130,109,161,148,169,79,203,57,113,111,18,14,124,194,46,27,74,101,124,125,207,157,28,22,10,255,168,101,108,128,161,120,163,41,206,14,21,213,239,55,43,83,15,66,178,211,149,147,182,104,121,66,81,32,55,123,247,194,49,176,16,81,215,182,96,76,70,41,237,196,151,224,93,43,253,136,65,84,196,129,80,115,31,8,104,164,180,221,195,218,130,106,64,243,82,59,186,246,226,113,99,96,240,123,80,207,60,88,47,205,32,192,53,100,161,20,58,71,151,68,19,156,239,40,220,21,160,79,47,74,88,7,77,109,1,54,130,8,172,169,43,176,168,110,82,143,235,193,137,36,175,237,39,123,81,125,254,20,79,221,90,168,114,235,51,38,73,36,159,48,223,233,16,229,124,71,255,
+163,234,65,3,70,127,123,99,142,193,127,10,58,158,22,110,21,242,8,180,159,10,10,4,129,71,97,255,22,104,30,150,246,50,15,220,62,213,21,13,197,35,138,22,38,182,130,162,42,154,58,51,218,182,231,215,252,131,34,254,52,67,79,23,115,217,67,146,255,104,121,185,41,46,158,54,8,89,226,124,223,222,145,43,206,148,173,51,29,4,43,11,88,9,17,167,29,88,10,213,167,47,146,87,201,246,91,198,163,225,141,71,121,209,176,252,87,7,15,155,151,105,160,96,193,112,30,140,43,127,1,155,132,26,50,198,160,125,188,241,127,206,193,11,203,210,174,85,54,193,226,127,210,88,189,75,165,52,9,210,188,84,176,142,171,121,139,156,87,117,32,234,98,177,165,83,229,228,9,149,24,209,122,119,32,22,13,12,120,136,186,171,230,226,44,186,194,254,1,173,16,101,166,246,22,253,186,200,116,26,27,120,233,248,93,225,133,63,240,31,2,190,192,202,103,115,132,228,248,237,112,243,8,249,107,124,131,124,163,229,223,224,153,228,27,45,65,217,223,104,9,200,248,183,42,245,
+25,44,197,167,31,56,2,81,46,127,133,131,152,2,251,2,21,16,83,194,83,59,225,72,150,87,8,63,112,244,123,60,85,255,192,81,233,233,7,142,70,80,162,168,214,123,187,213,71,152,245,189,68,13,18,44,216,11,41,105,94,151,122,199,188,84,133,5,242,50,176,16,122,64,238,152,4,177,188,8,253,127,226,47,194,252,227,242,135,152,176,79,184,17,16,33,203,237,32,6,124,65,192,248,91,218,49,254,70,122,2,165,125,213,51,207,55,19,245,244,150,71,222,99,128,89,248,246,170,82,90,254,161,75,84,214,15,93,170,188,156,170,200,47,42,229,248,129,183,59,206,15,173,8,121,191,105,133,230,82,235,57,104,8,144,216,64,120,223,192,61,237,217,183,12,209,47,240,114,5,86,7,193,127,2,174,133,153,63,227,236,175,241,251,253,69,29,229,156,197,6,0,182,166,57,224,247,160,194,148,31,243,191,244,193,252,125,250,168,64,125,18,163,55,195,195,91,140,226,3,185,230,95,143,75,190,245,156,0,108,39,242,151,184,30,121,7,84,225,240,47,120,142,81,12,18,
+214,183,153,170,250,189,155,85,253,240,181,155,184,86,23,244,51,163,148,4,77,21,79,129,206,174,128,120,57,127,249,209,162,126,177,49,27,223,140,70,242,205,210,24,53,195,201,161,245,252,130,151,16,61,154,124,0,243,55,60,36,44,252,218,96,16,178,144,127,54,248,241,127,229,152,189,108,66,96,217,0,34,249,159,3,214,129,99,151,177,234,238,111,233,1,14,85,215,194,111,130,228,250,241,179,143,51,90,200,8,118,237,83,236,35,240,75,94,33,107,228,235,52,1,72,53,198,199,31,69,0,144,107,228,223,79,100,139,252,71,145,245,224,91,145,36,217,3,144,229,182,90,68,242,109,189,120,142,31,108,22,228,11,154,42,175,1,178,191,177,179,31,180,212,126,20,121,250,43,125,135,151,61,22,126,111,202,203,158,127,14,36,1,198,99,97,254,230,193,126,179,219,156,232,135,71,57,150,149,190,233,155,240,254,85,92,144,79,0,241,237,106,39,122,151,168,27,241,203,115,248,245,15,191,29,228,107,55,228,47,248,147,201,35,203,35,14,86,210,243,151,114,179,223,235,43,
+98,194,110,94,230,47,242,44,160,201,159,118,226,168,89,97,255,9,52,190,175,145,26,193,234,215,24,230,251,152,81,137,159,99,6,122,43,231,249,235,168,56,198,159,13,181,24,106,254,242,102,119,140,116,51,201,151,101,127,157,87,69,113,109,119,173,161,76,147,252,233,6,138,216,194,127,210,139,124,1,101,236,102,69,168,252,71,108,182,255,35,214,105,173,172,68,95,6,66,7,63,6,18,166,246,107,19,248,155,56,225,130,254,91,88,108,137,128,113,182,114,74,162,175,244,241,65,115,1,210,142,84,136,243,101,209,88,187,201,169,3,32,127,218,21,172,39,24,60,100,9,199,56,242,104,117,18,8,141,214,193,84,151,141,46,61,114,15,60,231,44,80,4,201,24,196,200,201,189,206,106,54,178,246,153,20,228,153,77,238,151,218,107,225,40,153,43,237,198,88,139,218,14,127,93,153,36,163,40,249,125,107,211,14,213,133,226,0,64,22,217,232,30,219,236,240,68,177,174,183,123,249,98,20,193,216,33,161,82,28,70,246,191,183,119,142,48,110,134,52,25,58,70,200,77,66,
+216,239,39,174,102,82,216,229,114,210,102,176,14,147,5,72,49,60,80,147,12,209,98,245,215,55,82,37,254,215,147,223,207,125,63,141,119,70,233,207,64,236,251,41,7,252,19,71,29,231,38,209,128,193,154,61,187,72,209,233,187,71,220,17,47,124,122,71,181,0,44,118,219,53,205,202,250,221,238,132,214,125,243,206,190,46,199,141,139,87,51,227,75,23,215,214,236,143,227,53,149,150,114,230,132,194,226,189,129,95,182,13,99,58,117,130,123,146,247,113,132,134,55,228,95,123,108,72,221,247,183,88,135,3,229,202,114,74,79,105,196,235,144,182,116,101,193,8,67,172,211,12,189,32,42,143,174,250,58,110,64,102,190,126,205,30,65,213,123,31,98,222,33,102,177,213,231,173,247,184,95,247,38,232,131,28,138,211,62,195,188,139,164,90,76,77,118,140,21,154,75,50,156,131,151,211,206,170,139,191,192,10,245,51,44,201,91,248,231,149,7,85,191,201,62,129,215,171,217,9,203,40,151,75,92,201,160,68,228,90,155,21,206,173,30,126,47,116,23,177,75,116,209,151,18,2,
+97,209,155,215,67,126,46,116,20,76,115,118,141,3,2,140,254,9,102,178,172,44,70,35,249,93,79,170,122,142,86,107,185,48,168,127,108,155,186,144,121,115,64,181,204,226,248,238,116,31,167,168,28,92,40,12,163,153,45,44,95,95,94,113,56,236,57,15,150,148,170,77,134,56,158,183,157,140,1,122,7,158,102,236,204,132,213,116,237,100,204,165,111,158,71,114,112,220,59,85,224,179,149,127,228,167,110,8,8,232,227,26,81,106,230,247,177,29,107,135,183,71,208,87,235,189,105,109,208,126,132,61,79,163,174,57,218,174,82,180,108,3,131,163,147,230,205,149,116,232,101,27,77,247,41,72,249,245,10,7,5,28,45,45,39,1,154,28,152,22,35,149,122,187,201,125,112,53,253,22,131,75,157,15,193,236,35,144,22,169,129,212,18,164,84,26,5,159,57,236,58,193,6,11,106,148,205,1,70,68,20,15,230,240,74,76,126,113,158,19,55,37,25,173,113,75,193,242,15,139,192,125,117,46,143,122,158,56,28,68,214,222,155,200,125,209,240,240,249,244,22,90,34,188,198,123,
+222,30,37,206,168,167,170,46,173,0,140,60,238,91,192,149,88,151,11,71,103,161,179,47,23,158,66,120,243,108,124,215,162,124,212,170,39,175,158,149,58,71,42,15,97,138,138,203,89,155,57,232,148,190,224,238,114,190,190,232,10,184,226,224,170,189,49,119,50,91,70,138,15,186,30,75,38,128,14,157,16,3,180,224,158,246,181,96,192,249,89,224,116,179,242,54,167,149,241,140,123,176,34,145,114,32,155,104,42,77,53,142,53,6,12,128,194,54,122,50,250,181,1,126,82,73,76,16,130,230,13,43,233,75,19,223,149,50,173,94,185,32,129,142,178,165,239,59,44,145,38,196,100,31,95,169,56,239,72,49,51,165,97,126,24,77,134,166,138,224,233,252,145,152,86,90,184,243,224,241,145,202,198,243,92,64,4,150,149,21,2,68,76,96,159,96,9,112,91,187,123,200,144,182,39,126,197,6,72,161,146,146,140,249,53,217,196,192,214,80,5,96,73,214,100,233,58,84,109,158,155,80,240,251,44,16,108,174,31,153,31,207,98,106,115,67,13,223,48,237,229,213,173,125,142,73,
+188,115,202,3,143,71,2,210,141,188,16,81,37,245,24,82,189,165,143,83,176,146,247,11,75,66,110,191,34,82,177,251,206,10,75,97,242,144,173,158,185,112,238,164,206,53,146,7,30,178,39,70,240,159,103,200,78,22,215,136,126,128,44,149,110,92,224,115,227,122,250,126,2,228,240,95,13,164,126,134,1,27,248,68,111,142,229,130,225,46,51,137,90,189,207,209,160,22,13,230,108,38,120,217,212,241,53,65,215,186,233,155,122,52,62,115,85,94,212,239,223,163,241,151,69,160,224,74,139,209,204,153,59,167,199,238,213,196,70,246,67,31,241,186,177,108,227,204,154,43,95,2,214,151,77,159,194,107,240,151,183,4,42,77,212,173,154,115,65,201,45,48,220,221,136,150,35,100,27,207,162,74,8,128,10,92,226,39,152,109,129,211,85,141,43,40,86,67,159,63,152,140,76,106,109,171,86,88,45,180,27,67,229,29,207,58,94,94,141,171,237,46,61,213,44,42,200,166,27,154,93,254,174,18,211,92,5,165,80,189,209,153,60,207,175,78,42,224,188,191,88,151,88,97,16,51,
+90,220,160,112,138,189,250,215,63,40,253,235,30,167,255,252,159,254,234,127,250,237,191,251,139,63,250,175,254,175,223,254,246,223,254,230,215,255,47,93,78,255,135,63,251,179,223,247,33,253,221,87,23,210,255,245,143,254,241,31,253,227,191,234,100,250,187,95,253,241,87,163,212,63,251,203,63,254,143,223,239,254,253,159,254,159,191,249,179,223,253,211,95,253,207,191,253,203,223,252,31,191,249,243,127,242,213,233,244,207,127,243,187,127,255,219,127,247,235,175,63,255,253,159,253,241,95,252,201,111,255,252,223,254,234,119,191,249,139,191,248,234,233,249,219,63,249,106,231,247,171,63,1,85,249,39,95,45,67,191,132,129,255,254,232,31,252,201,47,148,251,163,127,240,247,169,247,79,127,245,191,252,135,127,253,111,254,86,243,213,223,129,83,126,243,11,101,255,247,255,248,221,134,244,207,191,250,107,126,109,245,175,255,195,159,127,55,90,253,122,255,235,63,254,243,95,255,126,239,239,158,167,95,10,254,250,55,191,251,234,221,250,55,99,255,229,95,254,155,63,5,119,249,211,223,253,
+234,79,64,211,126,253,215,157,91,127,253,155,63,249,227,255,240,103,127,241,171,159,54,131,191,251,94,240,15,255,187,255,31,245,55,253,233,35,250,159,167,135,233,47,207,238,63,177,161,233,175,254,197,191,248,171,153,191,108,37,249,63,254,126,237,191,252,71,191,250,171,78,156,255,234,95,254,163,255,254,15,127,245,191,253,171,239,102,146,127,248,7,223,175,126,122,104,254,173,55,255,205,31,252,195,255,140,189,36,255,206,79,183,255,249,63,251,111,191,126,185,221,133,64,32,48,246,79,19,73,20,119,194,187,79,60,228,169,53,23,135,148,24,203,152,245,87,169,246,62,159,64,39,109,18,31,150,4,188,192,113,168,37,30,141,146,52,161,148,23,74,156,59,149,115,194,114,53,209,199,82,238,165,108,179,94,175,153,150,192,82,71,60,231,139,232,208,52,7,228,25,24,172,240,209,66,250,148,48,57,17,151,76,216,190,57,110,156,124,58,157,174,24,236,107,92,83,231,93,222,134,249,42,112,75,239,46,181,209,245,50,218,169,44,131,193,250,104,32,102,168,39,183,100,42,118,
+153,125,117,153,239,225,89,250,144,121,14,101,163,103,4,131,170,149,167,137,50,11,78,94,141,68,243,6,172,221,40,213,39,130,54,246,155,47,104,247,80,228,110,7,218,227,245,158,33,33,132,244,49,244,146,155,4,209,143,248,123,166,209,215,132,169,88,143,8,40,165,13,207,197,154,73,75,119,40,211,215,218,222,205,182,184,60,164,119,85,107,93,165,56,42,174,62,166,237,253,193,57,86,56,250,188,75,40,81,187,244,181,158,189,246,4,127,58,249,68,216,174,240,117,151,218,121,7,236,73,114,163,171,24,50,58,213,84,137,76,38,184,238,175,159,105,95,114,245,15,132,145,37,20,168,101,180,109,69,138,120,178,231,135,166,227,116,143,167,183,21,153,109,253,3,98,13,44,28,163,187,23,197,28,214,69,223,21,144,54,241,124,218,123,226,191,128,118,180,23,46,146,51,66,107,171,132,252,59,199,219,4,226,55,0,172,123,195,166,2,139,174,111,134,251,165,188,117,176,4,186,120,151,154,168,150,64,90,181,209,244,122,232,188,64,7,209,227,243,22,216,28,33,242,70,40,
+140,24,220,33,47,57,196,21,89,181,87,41,110,166,217,150,187,33,33,235,96,62,177,120,52,62,16,39,227,215,120,52,7,168,99,156,26,11,207,103,153,84,204,247,88,244,236,93,219,220,212,232,51,25,119,12,208,17,198,54,134,204,122,39,240,92,94,120,240,137,212,21,107,245,141,142,156,12,180,0,221,74,21,69,184,222,215,41,205,134,27,25,203,73,129,119,97,253,206,67,51,63,115,200,112,19,217,247,92,242,80,216,110,208,6,166,1,214,150,240,179,54,154,91,222,238,67,27,79,161,44,28,110,9,187,36,14,220,253,19,65,178,115,152,203,13,33,99,227,91,69,5,45,159,115,248,57,11,154,62,55,135,229,134,206,47,113,171,22,117,220,196,250,188,83,149,71,193,231,51,245,222,163,23,191,147,68,66,13,36,174,212,33,94,253,43,60,235,186,76,144,221,77,8,82,171,242,98,11,174,225,125,130,181,111,82,95,245,187,75,189,205,55,163,243,62,238,29,35,4,167,11,229,38,127,250,176,145,247,32,28,184,27,62,183,3,27,64,178,253,160,0,133,137,38,153,
+171,145,173,10,249,164,101,104,142,16,187,25,211,221,23,10,208,193,146,196,209,68,118,201,192,5,197,213,119,141,30,229,46,207,141,216,120,89,228,197,121,126,138,225,186,254,48,177,202,213,146,201,37,144,67,112,43,211,144,240,152,50,101,105,89,155,61,85,179,190,121,237,57,185,53,76,200,107,153,178,66,230,217,171,31,203,155,11,220,67,120,227,209,185,28,135,93,209,179,44,132,247,51,215,115,16,202,160,6,216,198,7,58,172,228,27,222,134,27,33,112,159,36,34,108,4,201,226,153,83,123,251,100,61,173,217,204,8,227,210,25,215,196,6,4,53,29,67,209,232,61,41,6,222,152,91,2,85,20,253,57,74,79,75,240,153,176,199,84,182,174,210,222,100,99,55,227,22,203,224,245,139,206,230,113,54,229,91,190,95,139,166,28,250,156,231,84,74,197,84,216,37,94,58,122,149,63,229,17,177,172,38,148,232,218,3,138,32,179,244,132,117,72,153,198,253,173,21,80,10,55,147,241,205,62,84,56,34,64,8,205,171,23,241,138,209,211,251,195,177,234,139,3,147,24,108,
+166,226,182,102,138,29,165,138,82,40,202,153,205,220,18,147,86,225,185,142,195,55,146,77,56,44,211,114,103,60,116,47,133,91,114,91,170,85,129,156,205,254,97,210,116,16,19,206,255,205,214,123,244,202,19,252,136,97,95,101,79,58,218,240,66,182,161,187,125,48,224,131,15,254,2,178,188,130,22,86,194,238,74,128,110,147,115,158,55,57,231,55,111,114,126,147,115,206,57,231,156,115,78,158,223,127,181,130,15,110,52,8,20,187,200,98,179,72,22,137,30,98,170,76,55,119,4,170,65,146,113,99,64,163,202,45,34,249,161,82,44,55,244,191,226,66,242,79,78,74,13,67,184,185,231,9,185,163,97,28,41,152,103,46,123,251,52,205,236,252,96,67,95,84,209,170,22,143,89,253,26,195,134,149,211,50,59,41,211,69,39,69,245,124,90,89,163,225,225,120,51,30,3,41,20,255,38,200,50,86,20,69,2,37,0,239,195,24,121,17,237,87,140,139,56,5,142,69,180,8,120,248,239,114,6,156,86,125,143,120,84,168,180,195,149,98,135,114,108,107,191,94,7,201,246,109,
+41,220,205,164,202,72,175,77,143,100,199,12,242,190,2,72,56,229,57,228,130,125,78,225,212,156,26,96,65,5,149,188,133,196,227,116,70,179,147,40,213,45,106,152,213,64,130,121,5,13,226,163,56,172,239,189,85,89,129,168,209,63,17,238,125,90,62,125,167,125,119,178,166,34,251,34,127,151,253,251,57,162,156,230,72,164,240,24,133,124,159,110,92,64,134,16,219,2,91,199,106,239,211,54,233,171,100,71,22,1,123,188,210,234,2,183,87,158,124,169,84,6,185,211,149,47,228,202,143,54,77,154,166,153,64,103,59,189,251,140,6,186,194,253,133,213,191,43,4,186,145,205,206,197,127,249,69,213,212,88,109,46,152,154,136,33,239,62,18,80,207,157,49,38,180,111,41,244,207,254,220,172,150,87,183,45,225,161,208,112,174,192,188,66,22,21,204,3,126,70,166,103,132,28,142,146,233,161,178,24,107,253,90,83,146,243,90,27,125,199,230,227,235,223,77,214,96,106,98,110,206,229,65,133,64,30,216,215,141,247,150,156,89,196,101,247,178,64,123,130,122,170,53,225,188,108,
+198,186,243,173,84,127,92,112,86,37,93,98,1,58,181,33,252,195,107,132,128,235,222,137,100,101,148,107,231,182,240,155,227,136,31,177,234,80,45,59,177,24,143,206,77,233,111,36,120,237,245,22,207,132,150,241,18,26,212,64,107,57,182,76,124,255,50,165,254,53,223,61,154,181,98,227,47,72,73,137,204,40,81,112,99,34,151,70,126,165,185,25,105,154,158,101,252,206,86,185,7,34,237,187,33,141,55,44,113,10,115,63,159,50,250,75,73,149,10,174,253,77,197,229,16,166,152,178,193,215,209,150,136,139,94,46,24,156,213,158,107,132,230,169,229,231,220,238,45,109,170,204,55,7,122,238,55,90,126,206,40,99,222,119,236,141,0,48,33,90,64,21,190,140,173,243,187,95,172,245,97,165,80,16,62,209,222,125,251,215,174,199,210,12,45,149,138,42,161,118,21,71,136,187,78,117,53,249,247,181,92,73,223,212,122,156,82,104,132,204,80,75,146,83,130,216,246,66,56,78,4,199,206,197,215,119,47,195,95,124,151,7,63,72,90,105,194,143,132,138,119,79,204,48,220,216,
+145,50,126,37,243,14,53,246,213,135,37,11,63,155,152,87,51,52,93,128,26,83,166,154,137,48,193,157,203,75,82,138,252,226,171,229,181,233,155,74,145,14,50,149,214,79,6,194,74,9,14,20,122,209,126,211,228,246,44,192,107,3,221,122,227,200,160,160,30,180,38,69,219,36,92,186,206,64,187,204,237,200,132,173,32,111,45,184,27,22,167,201,156,162,7,159,225,213,232,206,247,186,22,83,163,22,216,160,167,174,26,152,18,164,32,227,115,94,210,255,170,3,204,215,123,196,27,26,71,160,196,93,165,22,58,73,212,185,5,53,108,116,95,84,111,32,178,191,179,99,152,214,94,44,161,161,31,42,173,149,73,233,59,148,157,26,42,156,152,79,2,29,20,193,143,243,54,8,212,121,55,127,159,150,100,149,36,253,202,137,59,212,45,227,173,106,16,96,27,219,86,210,136,80,43,139,214,232,49,86,52,64,151,18,130,0,155,19,227,242,9,198,160,193,57,31,142,15,190,247,199,10,148,232,128,97,165,204,37,151,181,240,154,189,105,101,106,4,193,164,190,209,96,190,97,237,
+183,54,167,249,30,115,74,58,222,51,94,31,50,205,206,226,209,54,141,13,74,59,163,234,81,20,13,105,203,147,44,122,121,20,111,121,149,11,184,54,112,44,9,102,24,152,159,32,144,119,89,167,14,138,219,118,153,37,59,17,54,45,78,113,251,149,240,169,179,20,135,103,20,215,127,28,164,254,114,146,80,121,125,179,119,214,180,61,187,155,149,246,75,174,225,157,239,34,65,187,132,153,43,83,241,108,243,110,152,94,237,146,234,132,240,72,130,195,218,184,122,253,156,28,97,63,91,92,239,94,32,94,12,44,62,54,200,8,127,221,188,197,93,223,229,63,85,85,30,195,155,58,251,149,79,181,232,72,227,59,183,49,124,209,22,122,48,229,235,235,37,3,132,4,36,109,66,199,115,171,8,241,246,44,77,24,177,111,177,110,167,63,0,27,157,147,237,49,210,53,236,163,222,92,53,4,144,172,221,123,86,14,81,125,255,240,231,207,203,94,201,166,198,250,105,183,240,133,179,91,235,165,228,58,115,211,44,212,186,44,231,102,174,21,186,163,231,49,179,113,158,148,204,19,185,92,
+156,146,139,26,241,105,86,146,204,74,50,249,186,44,253,41,137,137,50,109,190,20,98,113,74,10,38,13,147,151,226,114,82,62,190,40,197,228,66,248,91,38,132,255,74,159,220,239,29,251,189,221,58,143,26,118,217,24,231,110,41,211,45,19,2,239,124,249,156,153,234,188,210,134,13,240,5,55,187,238,195,215,148,19,19,79,171,137,31,179,203,53,79,234,38,87,235,143,82,117,61,200,105,234,152,208,174,168,25,124,221,92,219,2,3,198,134,171,120,108,155,127,30,59,59,31,60,228,58,237,110,210,202,141,84,49,97,233,68,120,144,164,170,31,41,155,45,141,19,46,70,230,118,101,211,154,80,236,8,191,121,160,223,244,183,251,160,71,60,107,49,228,163,58,181,137,197,142,209,35,160,162,78,34,216,186,167,95,72,89,89,233,142,247,101,59,21,77,230,44,116,250,192,53,108,106,29,37,254,78,206,178,17,30,20,60,71,37,31,17,151,14,60,98,231,164,177,212,157,104,84,205,27,209,249,21,50,121,13,170,108,201,75,209,152,117,129,160,220,72,111,57,135,70,213,100,
+123,54,38,196,25,48,168,196,223,158,22,140,165,193,91,79,157,99,147,134,58,196,31,108,204,142,144,59,6,247,84,112,201,46,106,239,232,119,174,117,178,107,211,239,8,107,122,166,214,163,47,139,207,55,122,233,129,185,173,15,253,239,229,217,108,103,148,67,114,70,48,57,210,12,73,2,201,242,174,203,149,158,200,252,199,250,35,72,156,227,196,217,94,85,229,81,191,225,20,75,88,169,184,180,205,113,26,203,193,211,76,143,186,151,220,33,134,80,127,155,85,67,188,251,177,190,170,157,151,251,153,42,175,5,44,154,91,67,222,181,198,110,216,185,216,87,92,236,207,145,174,208,229,77,81,5,110,220,60,245,87,194,18,91,95,195,112,235,129,174,176,98,135,226,66,110,246,218,138,155,88,6,121,15,74,231,155,187,176,186,67,113,87,94,36,112,137,165,129,190,137,191,110,149,186,156,223,79,155,167,149,244,171,127,79,32,35,204,100,138,238,164,202,32,10,30,7,95,116,211,133,45,251,169,188,23,38,56,228,64,115,25,42,230,162,198,172,240,165,136,170,88,63,169,231,174,
+156,92,201,80,235,68,153,83,94,199,10,238,154,134,251,196,24,215,244,32,27,169,16,183,240,46,148,239,54,223,220,58,58,21,145,227,160,50,156,173,69,226,181,99,188,175,234,60,183,108,245,173,19,245,25,78,141,245,206,121,20,174,197,73,109,192,248,42,52,17,227,134,191,125,47,151,206,198,71,250,150,182,187,134,1,149,54,35,232,99,222,200,78,45,81,115,69,210,94,83,255,34,37,71,212,48,215,69,62,64,40,110,114,208,63,90,34,30,56,54,111,67,139,168,45,46,217,173,227,248,225,42,6,186,119,42,229,244,151,180,205,38,33,238,135,77,177,28,14,95,200,224,44,91,183,174,184,214,177,145,83,69,104,161,242,12,51,225,200,196,42,177,203,241,4,156,103,177,168,232,11,202,87,120,165,99,41,22,118,172,168,153,97,252,124,91,69,148,248,232,167,164,74,194,68,159,112,116,147,244,195,78,189,143,195,208,226,54,196,36,202,45,173,11,52,54,23,94,40,141,167,139,12,103,26,246,212,224,185,143,66,205,159,64,42,132,51,188,92,212,26,185,117,172,11,214,
+16,88,204,57,20,230,197,233,88,153,220,144,227,173,222,174,68,65,176,129,19,182,92,150,88,31,220,141,32,78,159,20,229,82,61,174,191,74,237,130,150,1,101,154,226,61,242,187,91,242,162,245,51,77,205,133,126,56,242,114,132,49,85,166,222,254,198,192,253,68,8,201,158,75,95,250,131,82,11,20,193,17,163,215,35,52,158,79,75,44,201,78,184,239,140,65,243,41,182,48,22,219,28,85,207,62,200,68,228,70,245,179,25,11,173,67,71,126,77,217,225,164,22,182,101,16,217,206,153,106,193,228,214,99,108,208,92,166,174,199,197,91,34,47,36,6,60,29,240,51,21,241,188,219,199,252,196,147,220,101,75,40,204,32,230,106,205,6,8,88,53,250,28,39,37,33,154,214,58,64,150,95,21,27,250,7,200,216,196,155,26,211,235,115,26,73,37,246,17,231,91,16,255,154,122,107,83,123,104,49,213,141,117,140,71,245,126,166,31,12,186,26,150,34,199,244,176,223,41,124,89,205,150,75,106,75,91,83,250,18,187,106,28,147,159,99,189,49,50,74,142,39,104,138,32,211,
+179,222,77,33,12,62,99,50,215,173,119,16,251,111,51,19,192,105,174,142,77,135,70,96,238,223,211,121,49,44,124,181,59,148,86,117,184,59,181,154,215,185,249,221,84,91,206,210,211,159,42,7,250,176,151,118,184,233,80,5,104,146,187,61,127,250,231,128,31,156,70,73,124,106,74,224,19,69,246,133,174,12,137,239,249,103,151,32,245,155,66,108,174,228,236,79,136,138,175,164,212,163,232,79,150,216,253,33,137,219,221,86,57,69,83,231,205,51,60,214,58,228,236,76,187,10,82,126,175,79,80,80,99,233,145,112,57,212,105,153,161,142,251,142,34,77,176,196,5,189,201,63,192,160,118,71,147,235,80,188,111,172,152,195,188,2,30,165,138,150,138,205,5,31,122,90,96,249,35,230,199,126,227,139,43,143,117,133,212,97,193,216,151,17,213,49,82,167,95,195,248,70,64,192,79,74,158,87,218,81,99,26,117,209,142,30,254,60,77,220,159,152,99,229,141,119,211,81,193,2,38,152,118,111,109,189,124,214,50,64,85,56,235,216,242,106,9,240,236,234,219,152,8,14,0,87,
+7,114,142,146,24,190,20,60,251,237,184,82,32,190,185,188,179,36,134,42,104,216,234,77,139,11,155,80,113,101,153,4,15,187,196,95,237,199,113,255,226,99,175,78,234,108,228,47,251,95,103,91,79,140,175,110,38,176,172,80,91,180,95,236,100,112,89,55,211,35,44,145,8,22,188,240,43,170,53,211,36,131,250,118,136,97,33,146,43,62,123,238,107,163,41,193,149,158,54,112,249,246,1,246,116,200,56,162,67,100,213,215,215,129,133,159,223,224,221,23,213,171,251,126,151,20,169,177,178,202,191,205,90,254,109,49,93,103,190,168,77,92,57,177,1,166,219,177,157,221,137,118,227,72,62,87,237,39,100,207,48,13,38,47,142,31,170,10,146,176,248,34,230,3,237,172,146,156,245,247,14,20,117,64,199,130,94,47,82,66,29,149,52,54,232,164,67,140,50,45,178,23,95,106,170,149,207,95,149,37,208,96,213,60,138,135,67,159,124,226,91,94,7,98,65,88,201,97,242,229,57,15,100,48,74,135,107,211,146,183,229,54,192,59,20,45,4,231,104,34,171,94,81,158,242,89,
+217,205,121,172,173,191,71,108,117,189,149,85,98,60,248,96,143,238,80,9,67,69,104,236,135,186,227,203,50,27,247,104,75,143,89,121,140,157,119,106,191,226,223,28,134,164,65,148,131,99,152,204,48,85,86,33,240,101,13,7,50,209,239,65,38,116,120,146,131,37,39,185,219,124,228,22,140,57,71,196,174,166,81,152,201,14,55,125,20,189,173,176,128,50,249,48,152,2,190,78,108,181,108,173,96,112,202,105,167,52,119,191,171,108,96,64,161,163,89,166,107,167,224,240,96,130,141,8,128,234,76,216,240,60,201,207,193,144,171,80,191,247,137,21,61,213,54,33,183,1,39,127,252,88,6,48,162,197,102,64,163,167,95,108,88,175,40,239,121,139,104,223,215,180,203,67,5,187,168,131,118,72,186,33,244,79,225,236,179,109,252,150,54,70,102,102,249,73,6,2,188,153,100,149,38,195,91,134,56,187,93,59,229,120,43,224,90,2,243,223,145,57,14,3,107,192,47,126,203,93,124,70,174,201,181,18,89,136,88,151,37,177,217,23,6,164,6,15,215,5,127,21,90,154,76,178,
+185,70,171,58,67,4,96,115,51,168,210,82,143,129,155,248,244,199,250,160,119,244,38,213,251,78,139,225,236,55,246,168,102,134,13,254,143,149,218,31,232,137,0,161,181,231,33,106,51,140,179,184,180,163,242,244,189,110,176,244,213,142,69,185,193,180,86,27,134,27,148,229,194,107,185,97,226,252,73,167,85,58,35,107,12,181,201,247,56,89,41,175,166,166,95,79,168,212,199,31,43,210,108,218,117,250,20,131,196,9,33,114,107,28,183,178,219,22,124,168,94,102,48,197,188,166,113,208,42,35,109,84,211,137,181,125,107,198,11,154,5,66,179,74,63,90,4,107,96,184,144,198,215,176,205,182,2,70,223,200,69,93,47,58,235,40,211,151,164,139,111,228,144,211,162,222,21,206,254,84,240,111,108,7,151,44,112,35,142,148,99,58,178,152,218,245,135,102,26,15,36,167,180,228,125,201,115,46,74,130,230,188,194,141,178,123,55,154,146,155,168,32,132,88,47,224,17,84,195,45,51,77,227,177,91,141,58,68,34,126,140,109,63,159,58,126,120,7,142,241,210,156,123,165,165,165,
+180,199,222,23,15,238,180,161,216,244,251,38,170,179,225,57,220,230,62,128,48,241,200,192,150,12,126,101,63,92,144,40,203,145,97,158,173,155,32,55,68,180,106,20,86,205,180,160,216,139,136,30,219,138,165,148,52,191,252,203,13,160,245,245,68,243,143,210,167,115,0,250,125,163,112,83,38,153,222,244,207,143,169,53,183,170,211,84,119,120,42,134,243,250,50,157,189,51,221,218,154,28,149,203,32,150,166,143,93,155,58,237,203,189,119,219,36,14,66,91,255,197,242,25,106,14,187,30,170,13,177,186,169,253,101,239,165,13,189,237,210,106,169,255,117,170,108,30,24,26,27,134,38,242,141,215,240,13,225,220,88,159,60,195,7,128,44,164,216,233,117,250,37,253,37,121,214,218,45,118,16,115,75,134,234,111,40,194,33,197,204,202,36,139,32,248,149,186,37,28,19,70,180,227,109,149,19,237,97,130,75,33,167,191,197,183,253,122,118,215,62,52,232,117,153,48,70,244,132,63,36,65,16,48,212,9,239,34,33,28,243,120,160,16,22,125,118,104,179,219,147,8,44,212,99,60,
+48,187,57,57,227,94,249,125,54,225,149,213,162,56,71,248,122,38,163,119,153,90,41,50,80,28,162,177,115,80,136,40,112,147,135,184,103,4,176,138,109,235,206,143,35,83,209,115,35,67,63,195,77,244,154,211,108,231,75,45,162,66,21,36,4,130,221,204,200,164,239,150,25,111,106,35,180,230,28,152,94,103,3,12,44,59,51,115,58,100,251,68,148,55,186,120,235,77,254,160,27,39,216,7,13,86,11,156,101,68,111,198,47,35,24,189,63,245,18,246,167,22,212,16,3,197,174,115,199,5,180,68,136,59,128,253,7,2,91,162,207,234,93,109,185,172,81,241,20,182,77,210,155,166,191,207,2,190,47,179,36,203,214,123,200,116,1,81,183,206,95,35,83,5,232,23,143,23,200,100,163,140,26,55,72,52,190,99,104,201,239,176,246,98,108,46,84,89,214,191,79,139,168,22,145,249,28,220,92,232,122,112,15,104,229,204,246,13,44,120,172,60,244,79,231,139,9,127,169,111,128,135,123,39,57,221,247,159,173,153,119,82,117,116,62,112,182,131,14,63,32,13,76,130,243,119,
+19,104,231,192,20,89,46,218,203,251,118,113,91,107,14,53,66,110,115,91,133,9,169,96,71,139,211,140,97,149,37,211,132,89,8,100,171,181,200,61,247,177,29,23,87,161,192,114,134,26,92,32,167,76,10,119,11,115,66,120,144,226,152,105,194,117,98,205,227,151,35,103,15,163,103,205,221,29,171,165,229,89,132,122,52,196,85,18,212,79,195,247,45,75,222,216,56,9,50,115,241,144,213,217,158,213,119,71,208,117,84,84,81,152,245,111,191,207,80,76,239,136,221,13,123,32,67,210,146,16,164,62,62,238,247,162,216,151,39,255,193,211,76,214,240,135,138,213,105,58,214,35,126,57,137,245,96,115,128,52,116,170,152,17,111,68,241,50,177,35,25,136,160,63,164,178,85,118,206,194,154,114,150,14,43,18,188,180,107,103,108,197,62,128,243,203,151,136,197,219,49,57,207,97,255,124,126,200,1,238,90,200,84,78,156,206,99,63,16,103,200,134,196,57,245,188,212,181,169,200,71,106,192,5,89,44,9,136,229,26,5,241,192,156,74,201,141,254,211,192,41,201,107,80,109,154,
+64,37,17,231,46,117,224,143,32,250,13,190,53,47,20,115,242,78,187,93,71,212,82,170,253,248,202,136,40,193,140,207,246,54,33,119,54,28,174,248,42,170,33,55,198,71,166,74,123,111,229,220,30,191,122,155,15,101,199,4,195,61,212,153,6,253,195,188,114,89,114,218,191,15,154,158,68,155,129,254,200,113,238,5,77,13,185,74,101,93,43,125,143,199,246,117,96,70,167,184,223,197,241,18,27,75,215,233,182,250,149,94,156,213,1,238,243,46,157,74,86,33,13,209,18,14,233,52,104,245,195,223,230,202,141,115,167,19,142,79,186,240,253,186,26,119,176,22,248,199,211,232,12,172,60,240,164,222,233,119,164,57,22,227,227,2,106,142,237,152,14,181,212,91,160,18,4,248,50,152,188,142,91,181,61,103,170,112,5,196,247,91,224,14,252,112,122,112,222,41,253,253,154,4,162,68,133,207,62,238,186,26,34,100,170,231,155,62,246,252,250,216,179,234,47,176,247,154,243,255,17,145,251,64,186,67,61,70,62,223,234,63,246,159,227,254,129,248,62,124,173,201,206,33,91,94,
+3,210,186,11,63,83,203,183,127,36,248,11,31,237,26,79,181,188,218,206,207,84,73,3,240,23,130,233,95,96,247,109,26,251,62,142,114,244,98,63,240,169,117,241,172,184,191,184,75,43,245,129,94,23,15,231,123,187,67,4,139,175,19,49,125,6,252,21,192,190,61,55,62,22,135,184,246,204,31,63,163,156,244,239,51,1,50,141,85,6,14,222,31,202,248,24,236,254,16,156,253,237,222,187,38,250,172,77,219,253,69,14,68,254,227,148,31,5,6,134,195,46,207,98,112,89,124,132,207,129,99,241,116,74,38,156,159,24,192,122,4,243,143,244,238,204,92,251,129,21,205,214,202,207,65,182,34,165,243,117,81,70,163,197,19,71,212,53,160,170,80,47,65,61,193,68,156,183,186,171,220,193,135,219,111,163,164,199,19,140,213,71,122,107,22,163,236,28,214,34,95,97,184,7,191,136,190,120,80,161,181,32,116,143,88,16,140,118,181,235,203,181,43,212,139,215,127,106,143,249,151,237,190,62,90,97,199,119,103,99,216,123,180,246,202,4,206,244,189,96,28,210,133,200,56,82,
+25,155,36,253,210,188,239,119,2,109,242,119,144,168,4,5,47,226,34,253,227,230,84,250,44,252,164,136,175,186,155,168,74,22,174,236,159,251,45,67,182,104,215,217,151,63,184,142,178,63,122,109,56,247,19,79,193,105,175,51,56,163,175,75,154,48,239,128,203,243,2,31,28,81,124,4,107,251,102,130,197,153,239,191,250,199,235,191,125,218,248,159,255,249,191,248,103,255,227,95,255,115,0,184,5,156,254,249,180,65,251,255,124,218,168,124,133,69,46,15,139,16,50,180,53,187,6,253,87,186,69,128,185,1,17,209,56,43,0,29,153,12,1,10,164,228,178,1,176,132,75,196,187,27,172,228,104,120,237,229,123,231,158,49,59,41,33,3,71,203,154,168,171,186,13,174,36,154,217,76,14,27,108,123,175,224,200,224,160,67,58,203,15,36,150,188,9,199,59,249,150,202,164,211,213,116,4,35,222,42,35,119,123,205,210,188,21,63,118,219,143,109,14,44,23,157,6,39,53,158,23,209,8,251,220,250,246,152,122,16,182,8,34,5,52,16,203,223,226,47,228,124,111,244,253,0,
+219,207,18,149,1,45,144,181,105,27,63,97,209,65,175,39,240,136,74,74,102,189,191,49,73,53,242,45,112,18,111,76,94,109,139,192,57,37,97,186,18,109,155,131,124,16,149,78,39,241,137,189,84,32,90,57,233,108,183,196,81,247,161,14,70,109,104,40,193,248,128,73,131,251,20,141,166,196,191,207,204,236,248,24,7,168,104,212,140,69,41,176,43,235,34,139,206,215,30,98,200,237,233,87,3,152,241,194,37,71,68,201,109,91,30,120,87,116,55,60,88,79,83,29,142,85,151,249,176,157,172,189,10,166,39,128,243,77,206,59,213,229,75,163,5,82,31,229,34,100,102,126,64,230,59,43,12,226,246,2,220,152,27,244,207,175,207,136,97,210,3,178,181,0,185,8,132,6,92,241,110,109,56,14,150,10,38,246,248,159,42,27,119,58,120,12,39,28,149,159,80,81,67,191,176,16,222,23,120,35,182,65,166,207,55,116,31,114,158,68,165,133,3,72,64,37,108,1,162,84,193,203,8,240,124,13,25,212,0,13,36,236,204,69,162,233,140,190,113,37,163,239,58,76,18,164,
+11,124,41,94,194,91,193,35,245,169,225,79,61,110,91,207,174,121,173,30,141,176,21,241,157,57,159,70,21,170,84,36,9,153,193,37,43,120,51,84,32,185,212,237,191,24,119,52,156,46,54,44,153,32,132,206,211,67,18,182,165,25,34,125,166,11,70,226,149,118,253,3,46,128,181,225,10,132,10,112,243,19,8,82,170,35,207,136,83,157,155,196,75,80,5,72,84,125,72,152,115,7,71,54,250,21,188,88,181,27,124,167,40,58,6,219,28,73,82,38,128,80,64,30,184,222,30,58,121,156,104,34,98,187,0,81,97,28,21,193,193,238,49,18,78,30,83,28,106,16,55,204,55,1,9,124,6,99,101,78,5,123,19,25,14,23,56,142,14,135,144,106,137,118,200,216,19,166,1,72,58,194,241,113,111,91,88,126,0,248,7,128,7,244,165,123,232,134,205,226,67,23,4,208,166,19,54,67,209,200,119,135,23,254,213,1,192,225,30,152,10,86,212,59,240,47,185,80,47,90,106,16,160,141,237,49,35,104,152,24,72,234,167,213,63,225,178,229,83,189,58,29,163,127,52,67,
+150,70,10,195,233,108,31,89,198,82,16,176,141,120,26,40,12,198,237,165,28,192,208,42,33,227,23,27,240,33,180,21,119,216,104,220,29,64,60,63,1,181,1,171,227,17,175,130,155,21,175,29,214,30,157,58,67,67,119,241,118,99,125,211,145,147,90,117,212,45,44,21,45,139,159,83,86,188,124,147,162,53,104,159,64,114,94,251,128,94,213,79,239,32,253,232,190,127,39,163,28,108,28,237,163,214,26,169,35,192,41,48,153,105,222,227,35,200,189,5,251,181,66,209,176,241,37,141,39,50,129,199,167,17,16,63,251,133,6,145,222,52,223,122,66,43,35,104,3,5,148,214,219,37,207,236,169,126,135,100,21,57,100,17,127,87,75,201,242,41,233,126,62,251,28,138,221,209,214,52,109,89,199,181,140,189,22,49,121,69,188,147,208,168,204,46,119,134,20,251,217,246,245,130,125,212,252,74,178,213,125,102,199,188,124,116,115,149,169,60,226,122,163,24,63,134,114,185,30,194,128,223,132,50,11,152,180,7,192,48,109,129,124,3,120,239,172,208,5,237,215,61,51,236,147,215,
+120,163,88,151,249,243,204,169,81,229,103,79,150,26,219,55,0,233,35,27,236,115,82,151,13,39,71,105,180,86,95,146,44,223,176,222,250,126,26,242,245,199,109,150,87,48,66,176,182,20,204,166,107,212,108,189,203,238,249,21,84,139,238,19,117,21,60,124,244,130,16,14,136,214,172,94,192,195,220,9,205,53,1,98,0,116,96,225,119,129,111,32,48,106,66,149,172,117,172,253,166,18,157,104,67,75,99,111,150,237,126,105,119,110,203,155,122,75,234,81,67,229,227,113,26,54,45,97,150,100,172,107,73,10,186,21,183,54,1,134,222,12,25,89,61,133,24,171,97,184,109,27,205,105,211,152,130,13,97,207,97,63,131,209,131,24,112,218,244,132,50,113,88,248,219,103,136,224,58,176,250,54,44,92,144,137,65,98,53,16,63,170,155,97,210,106,192,90,89,94,188,195,186,216,88,66,2,42,248,112,88,196,110,152,108,182,53,95,159,65,215,162,254,183,177,203,114,134,123,161,35,214,72,168,131,60,11,157,73,201,41,154,151,180,171,126,169,1,82,103,187,189,171,171,99,68,
+97,203,34,210,134,169,44,115,169,72,200,135,148,200,69,46,129,235,54,145,5,163,177,110,48,42,40,147,97,118,46,71,119,233,76,184,222,4,70,180,99,76,96,240,87,53,129,193,243,250,42,53,157,28,119,149,1,43,145,87,173,26,121,92,20,222,218,134,229,83,9,108,106,223,177,220,248,21,83,6,112,173,56,45,142,116,51,44,61,40,3,91,172,118,188,25,43,213,161,67,130,17,100,35,106,168,180,93,61,203,123,152,195,57,242,206,171,40,197,177,206,11,53,152,133,173,196,69,19,82,153,234,140,50,118,13,66,213,116,72,15,217,184,65,91,235,192,107,172,31,232,247,210,135,4,92,102,192,118,112,11,70,31,198,88,171,109,190,53,76,117,177,145,71,7,254,193,48,180,60,194,246,158,189,160,159,22,106,157,57,95,103,45,117,16,99,53,149,156,152,107,175,213,42,125,37,219,103,38,121,60,82,164,127,196,101,132,102,160,171,179,197,80,194,87,6,155,67,204,60,191,192,18,181,101,125,105,149,120,136,26,247,12,160,177,195,228,79,205,143,81,98,155,209,65,110,
+188,247,206,239,223,166,208,165,137,177,29,34,253,143,145,44,72,219,120,234,208,55,200,27,160,154,49,72,172,65,187,0,63,2,109,240,163,198,152,111,1,142,85,161,187,47,11,248,194,3,78,31,207,51,42,12,193,232,60,213,129,184,240,232,207,13,68,41,174,20,246,140,141,128,191,80,142,45,33,7,24,148,254,183,22,213,15,165,171,222,62,221,252,251,130,150,196,187,29,225,140,154,184,222,201,133,15,69,235,140,102,227,122,34,240,17,180,154,81,25,54,20,112,40,245,26,82,66,231,173,178,159,11,101,167,126,11,179,86,118,62,29,213,94,106,155,236,60,4,201,75,206,220,59,185,4,65,173,180,76,84,240,7,174,190,145,158,1,213,16,203,58,59,158,183,255,154,219,221,134,185,63,150,186,79,211,60,3,175,53,96,98,125,46,243,178,56,136,170,16,75,205,239,56,150,19,152,69,106,94,100,233,103,90,139,72,243,170,17,140,215,139,187,67,66,137,198,51,237,122,20,44,227,160,137,95,19,125,47,225,82,239,163,65,73,75,22,179,192,229,40,93,112,17,122,174,
+7,41,58,21,88,118,127,208,116,195,111,84,212,165,96,121,37,160,85,59,143,94,134,133,139,234,58,27,67,153,183,10,52,37,239,250,33,244,136,189,130,217,186,76,187,133,223,204,208,106,105,74,230,245,216,91,8,74,210,121,157,201,253,73,125,87,49,11,232,124,183,91,247,110,90,128,142,0,177,51,226,232,142,18,162,77,152,50,109,249,160,238,122,90,199,69,226,56,63,64,174,26,235,144,52,14,37,73,128,68,180,212,135,228,119,135,11,221,86,33,124,106,5,102,243,32,225,253,21,59,176,151,40,191,199,134,253,94,135,140,200,140,60,136,117,119,78,98,129,202,116,19,121,191,140,30,145,206,136,81,49,166,21,36,50,226,185,22,181,206,50,146,40,105,146,25,213,150,45,176,66,106,98,47,171,118,1,214,24,207,152,78,234,174,145,234,246,9,119,228,222,103,159,46,86,253,74,128,38,55,3,46,71,207,232,161,170,20,94,7,142,41,25,6,207,167,139,154,54,244,249,206,14,4,198,77,184,14,174,239,240,35,178,56,255,116,175,28,213,249,53,162,109,130,88,122,
+221,118,205,152,32,183,60,149,155,57,52,163,220,151,60,75,87,174,231,229,32,180,241,228,3,250,188,161,44,179,57,24,212,8,105,21,255,221,55,97,244,48,141,82,161,113,137,84,173,89,122,189,123,202,68,239,201,77,247,101,192,110,235,5,181,38,61,192,178,104,28,10,101,172,148,70,158,101,137,244,196,161,44,36,56,223,55,166,230,6,238,125,6,188,143,101,171,41,240,61,76,44,53,132,205,125,35,110,57,220,218,98,164,231,177,110,22,159,82,70,7,75,129,84,126,234,214,199,212,142,65,202,92,91,67,26,138,66,68,107,66,6,226,135,137,38,102,160,132,47,221,134,164,39,130,211,193,56,134,48,70,10,51,75,97,86,204,48,166,151,101,172,210,59,153,213,48,130,174,53,197,232,64,141,133,113,134,65,205,50,84,104,153,54,137,86,174,211,234,121,154,161,174,184,132,54,208,233,221,203,115,86,139,190,36,30,224,135,1,219,90,3,16,32,228,235,115,115,78,77,75,95,186,109,49,133,18,17,81,124,50,160,185,71,109,51,216,166,239,194,235,221,28,120,65,138,
+225,148,41,115,193,142,49,69,114,166,80,55,49,204,43,42,92,65,221,250,215,97,129,195,210,164,110,222,237,20,41,241,130,223,112,114,172,17,1,154,81,152,228,20,22,81,158,252,79,139,199,227,192,4,149,165,101,247,18,108,111,36,72,147,192,96,26,111,181,115,59,186,116,118,87,222,40,139,34,192,48,173,226,18,122,180,151,248,50,56,119,48,105,19,176,193,192,249,226,12,193,113,173,141,121,199,142,168,77,174,33,73,30,43,150,254,181,254,2,71,233,25,78,198,75,52,152,143,103,159,2,134,121,206,105,210,103,241,129,39,20,22,86,112,80,198,78,44,72,204,229,97,98,142,173,25,193,37,176,97,242,29,25,74,84,81,141,115,142,57,193,94,7,189,198,229,19,219,122,164,116,27,131,67,75,181,171,93,142,65,191,224,95,49,169,218,133,191,204,124,47,255,19,63,196,194,41,1,70,135,52,122,128,198,8,49,148,99,170,209,185,47,18,233,155,105,243,182,92,59,250,200,136,118,53,49,146,158,50,133,76,116,166,143,156,193,95,187,184,180,55,210,178,2,1,244,
+97,234,181,89,63,5,55,209,62,223,41,110,75,38,150,29,196,146,138,158,123,58,113,175,1,31,247,41,250,27,179,214,31,121,115,71,75,199,250,218,26,35,235,149,219,122,21,191,184,242,103,203,23,239,92,52,204,39,42,49,91,246,43,21,21,201,7,122,108,240,195,120,220,203,100,188,146,129,6,63,172,90,193,129,191,162,107,87,23,55,57,72,24,203,233,42,6,123,164,172,91,41,93,73,186,25,166,39,221,77,78,207,244,20,165,190,71,237,96,244,134,227,80,248,205,18,78,132,247,249,82,192,106,238,87,82,113,9,74,247,61,54,17,220,112,115,223,165,184,100,66,227,144,101,174,252,184,126,43,157,56,65,254,227,147,105,2,53,222,196,117,232,12,216,122,102,245,202,18,205,85,187,192,162,220,21,156,166,37,159,52,80,37,141,186,3,20,255,160,25,26,255,138,139,54,45,75,240,123,208,37,206,7,76,151,209,10,248,109,213,208,152,244,139,153,143,183,168,57,45,140,15,66,237,166,34,204,34,126,193,170,222,27,67,211,60,234,154,113,233,121,233,38,84,159,120,
+255,42,11,23,119,19,58,173,20,79,96,8,210,80,243,72,9,48,28,98,67,27,96,97,16,87,147,157,162,15,186,105,235,184,16,153,22,242,37,31,199,156,202,175,204,100,158,106,57,112,222,8,168,239,44,41,58,89,100,82,173,168,122,64,41,206,40,253,242,253,0,72,98,28,123,43,19,72,98,45,95,233,124,220,137,130,194,31,86,78,210,26,121,135,165,122,51,157,75,100,4,193,222,247,234,59,77,101,206,146,47,55,53,71,177,110,121,22,166,18,218,227,50,46,176,42,92,83,229,41,201,154,65,177,221,235,176,122,142,134,18,4,3,63,44,61,215,10,42,145,126,171,23,213,227,192,222,237,249,137,91,113,106,250,236,228,64,240,196,241,9,215,23,38,143,238,234,40,11,184,203,191,185,113,233,141,166,21,193,59,209,226,210,147,246,152,137,54,5,79,250,86,118,170,38,22,170,123,6,43,51,198,189,137,112,138,14,158,49,6,182,3,241,215,32,173,185,223,191,67,248,111,191,30,87,31,131,244,134,126,195,46,140,174,105,204,54,213,230,212,236,118,157,184,171,246,
+138,136,142,241,65,132,92,41,60,188,103,48,184,230,7,156,1,4,37,48,187,81,1,100,240,231,108,169,177,161,154,100,208,55,175,195,226,153,218,61,205,191,44,147,130,251,254,233,243,34,171,102,91,27,103,153,236,72,70,97,192,107,189,206,7,229,210,60,208,77,215,216,68,71,62,188,32,197,8,157,227,244,160,123,241,222,45,73,233,102,185,131,122,159,87,54,143,194,73,29,164,2,91,217,9,19,32,108,83,14,115,52,210,227,234,45,220,238,30,188,229,152,72,230,136,37,94,180,195,77,117,218,242,80,23,157,35,71,5,87,193,194,147,142,126,3,254,58,79,125,238,4,178,157,184,191,189,164,155,208,195,105,197,242,154,13,191,148,151,49,236,164,49,30,12,138,150,16,90,246,146,141,93,47,220,173,31,202,170,136,0,239,66,37,210,178,7,162,218,53,69,5,250,241,59,205,135,23,7,131,25,59,94,68,51,166,238,194,250,76,171,164,245,48,13,141,109,35,236,188,206,24,234,163,191,36,242,46,203,54,204,31,21,108,11,128,139,77,135,25,122,169,153,145,11,131,
+66,65,209,236,226,144,175,4,253,131,76,93,251,86,95,251,246,111,30,115,135,135,38,1,120,79,4,200,2,194,240,216,4,166,196,64,207,128,150,84,75,114,228,177,59,123,9,84,81,203,124,251,59,207,247,212,190,246,190,69,204,9,121,239,214,98,133,55,176,244,201,33,100,195,60,99,254,36,24,157,15,92,248,146,156,155,13,208,3,22,179,73,58,24,15,139,26,199,193,29,230,133,111,203,45,119,61,166,7,14,184,75,58,119,26,231,54,132,69,12,6,55,183,240,67,146,10,30,71,133,181,104,107,177,53,119,41,154,239,47,184,153,66,131,81,202,95,112,201,194,5,88,204,211,191,22,219,241,218,6,233,236,175,6,224,91,167,157,251,233,193,199,70,44,57,204,101,164,2,114,84,8,183,50,164,203,238,24,208,124,234,8,246,42,135,4,35,237,226,113,3,160,97,61,14,155,18,104,130,146,32,111,66,180,133,132,99,231,191,249,177,232,61,210,99,30,213,201,47,218,31,3,219,28,87,177,116,207,42,50,162,75,178,41,53,173,176,190,94,208,192,132,199,253,73,235,
+232,189,138,43,171,61,208,49,157,198,67,108,61,154,17,129,50,247,233,188,202,71,154,68,214,93,78,243,92,231,30,157,199,97,10,191,2,40,234,17,27,181,1,134,132,147,201,143,161,235,96,102,138,118,6,204,142,16,90,82,196,98,56,164,32,6,112,50,97,16,126,138,81,84,194,178,221,141,4,213,220,9,61,118,85,12,90,22,193,143,183,92,52,23,164,182,162,97,159,128,217,177,231,103,215,185,185,203,103,125,25,145,86,120,163,120,209,120,18,30,189,144,193,202,54,178,194,182,183,165,12,124,2,51,104,41,49,210,0,1,170,234,20,151,30,177,253,36,55,185,74,59,107,135,216,233,82,45,85,137,178,247,155,68,155,192,120,6,14,2,10,5,118,9,34,218,19,7,246,135,168,149,100,171,90,247,156,18,0,16,127,175,177,13,96,66,21,71,143,16,140,189,196,209,206,147,240,98,200,42,185,44,112,103,219,227,224,132,149,252,106,162,113,138,114,4,129,169,44,177,252,248,217,51,249,106,224,111,1,222,104,100,60,86,224,24,152,107,37,93,58,187,43,186,150,240,
+213,167,36,117,1,23,252,89,125,75,115,110,244,37,10,178,52,172,41,107,25,133,245,184,75,166,17,67,188,154,116,234,203,190,50,212,159,213,132,203,60,159,10,85,110,28,67,159,69,120,9,199,251,35,252,104,23,193,23,78,42,150,48,141,207,200,64,233,130,6,107,81,114,149,80,122,222,151,216,195,211,76,242,253,115,211,191,199,142,9,243,198,91,73,125,50,180,8,244,214,202,60,109,208,8,224,193,172,69,137,197,61,101,174,86,2,186,187,254,208,168,59,177,225,121,126,48,3,135,74,45,216,21,146,247,114,242,22,80,73,7,119,132,78,51,3,167,147,6,212,19,14,178,81,8,35,97,248,116,109,72,255,64,119,12,224,132,218,118,172,248,65,194,140,184,211,181,130,164,144,34,175,132,70,237,220,82,164,221,99,187,98,49,123,71,143,115,95,43,194,103,92,126,247,187,145,179,37,93,152,82,145,197,194,117,8,127,48,60,195,124,162,28,174,40,24,60,240,144,34,26,40,215,118,1,81,7,111,106,142,30,109,161,170,116,206,86,5,228,200,88,29,92,6,208,161,
+99,29,234,26,137,177,38,165,212,80,206,45,223,62,214,138,186,147,58,216,216,11,122,176,191,162,250,90,18,112,159,1,156,40,2,36,18,48,203,55,55,85,165,219,219,226,188,222,58,39,143,188,59,58,39,30,13,31,101,122,221,97,138,12,101,192,176,183,179,240,183,148,10,49,247,0,209,151,124,88,137,68,24,208,163,152,225,145,144,116,228,66,207,161,150,130,209,196,0,42,228,2,144,223,40,97,32,67,250,146,189,141,242,238,39,145,175,53,11,58,91,65,118,144,199,68,71,180,15,224,143,153,59,125,246,75,26,104,149,180,20,0,16,188,221,173,211,198,46,144,6,187,114,223,165,54,158,209,189,5,77,203,10,96,132,120,106,112,140,110,55,223,192,192,30,158,207,176,86,39,106,170,119,184,9,96,134,123,100,190,157,150,107,207,172,175,71,48,70,13,138,9,223,48,33,160,240,208,243,225,231,183,133,132,208,248,104,196,11,208,22,93,183,34,247,23,35,235,196,116,110,17,74,53,221,0,36,153,165,223,241,165,251,200,77,186,139,140,176,42,192,211,100,88,136,17,
+169,120,26,183,206,67,158,231,204,37,151,66,244,111,121,99,79,229,127,99,239,132,144,236,147,61,33,44,6,33,243,41,22,217,73,99,195,12,142,1,25,2,81,133,43,37,94,148,83,169,15,202,96,100,112,212,249,5,11,63,189,173,99,234,24,128,97,77,96,150,14,190,217,86,137,223,211,26,250,233,16,214,128,61,107,123,18,91,179,217,84,18,211,240,19,79,253,134,83,218,36,206,69,41,174,11,168,194,59,79,124,166,195,217,163,149,204,96,219,37,223,178,205,43,38,26,203,110,71,167,86,16,191,110,174,119,181,163,56,125,144,107,156,20,230,120,31,241,59,155,206,66,51,130,93,90,44,108,34,51,76,234,98,140,13,176,240,187,240,168,136,254,12,202,38,231,5,244,75,17,66,204,39,99,143,141,36,25,110,83,226,213,155,139,177,204,0,23,21,120,60,210,103,33,98,18,10,170,179,157,223,202,186,135,119,10,119,189,192,51,206,170,255,253,226,175,15,47,165,22,174,135,177,90,60,78,105,216,169,116,105,105,191,29,12,135,241,90,247,107,255,204,230,242,114,219,
+140,135,239,23,252,0,225,240,203,179,86,94,70,184,245,248,99,85,40,235,151,148,84,34,19,145,37,1,107,224,148,130,41,152,47,191,221,61,88,207,249,1,2,173,48,182,210,103,192,89,16,148,47,153,201,8,233,194,176,171,208,178,4,149,150,212,117,249,245,161,194,29,105,106,229,14,104,36,252,26,126,178,226,39,12,201,232,169,210,246,130,206,201,140,110,135,182,72,184,191,12,190,191,177,196,236,218,226,67,125,101,232,107,141,253,174,69,239,8,205,138,148,157,157,229,194,178,165,161,125,123,81,60,247,157,170,94,102,178,70,141,175,81,73,223,177,9,166,48,251,173,111,95,168,55,61,13,58,175,65,234,206,137,161,133,42,94,69,18,158,65,38,194,149,95,169,219,216,122,55,69,190,229,152,215,225,246,192,108,156,247,92,173,33,184,144,17,111,46,230,81,253,201,11,219,48,18,68,230,9,80,73,51,143,27,187,219,230,98,196,235,66,166,34,122,126,57,91,218,82,224,69,158,180,176,86,216,209,254,148,1,134,103,3,0,122,103,161,220,140,81,232,15,200,71,48,
+5,27,249,203,251,242,82,232,143,213,51,11,131,216,42,169,46,68,248,10,228,27,65,242,41,188,14,247,199,100,51,158,147,195,184,27,71,118,48,24,22,131,244,249,12,215,75,112,161,181,38,126,142,190,175,34,82,36,176,205,17,28,241,17,32,11,145,46,32,51,128,252,13,194,232,191,184,50,125,128,72,15,246,18,216,122,207,7,238,196,163,9,134,126,67,38,60,4,8,248,51,7,97,37,25,48,19,223,62,130,129,120,121,149,68,134,252,121,0,132,128,255,16,236,182,127,144,17,34,29,43,16,253,153,105,100,249,127,31,130,176,75,63,249,195,109,196,236,134,123,214,254,56,245,162,172,247,254,183,233,206,103,250,50,213,146,187,5,201,178,245,145,68,167,244,132,89,39,114,207,172,86,14,235,194,227,19,203,245,205,57,145,185,191,211,105,72,229,130,53,37,53,86,185,238,127,18,136,1,116,199,105,77,103,248,135,67,0,211,217,48,160,42,64,248,173,127,73,35,243,67,7,56,203,191,73,154,30,103,186,172,147,199,30,140,103,233,191,213,74,238,193,135,63,232,15,
+255,5,200,31,170,104,107,0,149,209,118,106,47,145,101,243,57,116,254,36,0,212,218,83,240,135,45,255,126,170,26,239,35,0,209,140,89,81,87,23,207,124,221,146,157,249,250,1,204,23,46,77,82,107,105,6,147,201,84,153,204,149,229,174,23,189,199,79,61,184,107,231,69,92,233,14,146,177,42,151,203,150,251,231,221,197,105,193,19,55,160,203,92,163,111,133,189,184,18,208,13,4,23,244,131,137,27,18,155,121,105,105,71,195,19,158,203,87,75,151,242,47,147,204,19,158,209,7,110,228,226,209,166,19,52,32,39,74,147,169,72,92,114,63,108,243,198,232,152,86,108,96,44,63,100,69,35,56,121,236,182,46,50,165,211,132,37,60,200,15,177,21,92,109,254,28,155,77,126,91,1,129,59,77,72,154,192,64,64,185,160,229,68,166,120,133,38,255,160,97,18,193,214,17,202,60,183,38,104,208,27,92,58,191,127,58,190,17,255,129,210,36,124,82,117,91,113,166,77,242,98,148,55,234,136,145,26,177,140,3,121,43,169,249,254,63,207,235,235,132,202,249,108,66,78,212,
+197,156,34,89,9,173,147,48,186,63,156,255,72,173,100,61,37,182,90,249,70,145,207,44,6,195,193,96,39,11,95,140,38,244,166,251,238,101,72,26,146,24,130,179,213,99,18,203,57,35,248,243,194,229,68,39,83,154,29,104,19,65,19,165,75,245,134,209,222,146,15,183,90,209,12,96,113,35,119,244,96,57,131,202,219,228,195,127,66,191,117,52,77,134,4,115,7,219,145,250,163,102,217,198,132,98,36,66,28,187,167,130,47,98,98,253,34,169,200,134,114,150,66,122,255,34,252,203,99,212,136,129,129,145,206,196,70,18,120,160,66,188,87,18,251,147,55,152,83,189,6,26,242,143,122,101,128,189,229,198,74,96,56,252,69,10,126,217,69,181,161,59,131,161,247,183,164,250,152,238,70,174,251,172,222,140,22,79,106,252,159,145,163,199,131,249,64,232,143,206,115,31,165,95,130,152,55,54,241,103,215,12,4,165,43,184,79,102,148,134,55,39,253,116,53,247,221,51,220,254,217,221,117,102,144,48,64,100,171,219,233,28,176,230,101,239,220,138,85,117,237,199,16,171,134,72,
+98,32,120,2,235,232,240,187,223,41,30,99,169,107,185,94,85,236,103,167,152,190,182,196,59,70,64,162,86,217,246,238,128,167,56,76,233,138,42,201,140,148,127,11,215,45,137,77,125,219,216,58,79,36,250,5,24,194,169,94,101,50,225,76,161,171,0,212,25,251,99,122,111,147,248,97,129,140,232,64,0,23,132,167,101,237,219,245,118,25,92,66,139,98,21,193,53,6,63,163,42,46,19,200,228,35,78,200,0,134,233,249,227,125,3,24,8,196,255,226,27,8,16,193,62,124,74,27,79,111,31,64,250,25,101,67,35,0,31,225,67,126,230,96,62,222,252,190,196,71,137,143,207,255,241,103,42,233,212,78,18,24,8,32,104,227,249,196,1,31,25,183,60,147,15,79,88,22,196,15,124,66,152,219,202,226,35,132,159,34,24,30,199,255,241,236,205,63,249,55,196,75,102,134,63,4,48,223,9,253,243,225,75,37,28,6,212,207,226,120,45,11,184,250,44,233,237,122,122,176,36,157,17,253,4,129,251,153,191,4,165,17,146,63,146,68,164,159,244,80,138,0,193,190,69,247,
+15,167,111,143,247,207,170,56,134,247,79,88,49,27,50,104,139,8,9,34,8,44,97,255,211,112,248,134,39,81,9,131,161,82,130,120,5,198,190,7,237,127,41,169,102,191,51,75,179,203,152,45,231,184,38,193,145,101,123,182,247,53,19,32,226,131,81,51,100,21,56,24,30,43,119,17,185,174,138,41,148,103,147,67,112,209,38,48,220,122,173,0,104,20,233,190,71,190,29,172,152,66,205,30,196,93,230,104,142,155,251,229,49,124,247,238,135,64,152,75,37,192,120,228,219,106,60,186,79,110,114,123,215,83,153,140,219,27,218,51,181,101,126,251,185,171,190,119,117,251,9,150,234,196,59,101,188,212,165,229,92,243,207,212,208,187,67,100,193,83,21,83,114,155,28,79,225,229,182,91,89,34,140,78,242,10,172,165,169,220,234,219,159,216,120,238,11,78,229,243,118,129,55,56,13,241,133,242,255,181,43,238,159,250,232,254,167,255,238,175,254,247,127,249,95,254,195,127,250,135,127,106,151,251,63,254,237,191,252,87,127,186,185,254,169,63,238,255,250,47,127,245,247,255,241,111,
+254,213,223,254,235,255,242,7,251,15,255,230,111,254,246,239,254,234,223,255,167,127,247,55,127,247,183,255,234,255,175,171,237,79,167,217,63,252,237,191,251,155,15,238,223,255,253,127,250,119,31,154,255,218,23,247,175,255,195,223,253,205,95,253,159,255,230,111,254,183,255,229,127,253,171,255,248,119,255,225,63,255,237,255,253,153,252,159,255,246,239,255,211,135,254,31,187,214,254,230,239,254,116,167,253,253,223,254,187,255,248,111,63,171,253,213,95,218,170,254,225,95,254,253,255,243,223,253,215,142,164,255,254,191,125,183,251,235,191,254,231,255,226,159,253,245,255,240,215,255,2,5,246,1,127,128,128,127,186,254,242,111,18,215,133,56,238,122,182,199,205,244,85,33,8,243,162,0,134,238,43,120,197,124,185,7,94,93,4,138,206,240,199,1,221,250,9,138,80,149,81,84,142,19,217,14,46,30,118,60,64,84,133,61,129,10,41,77,29,178,144,34,89,58,146,39,243,4,245,221,252,136,115,182,184,141,161,116,119,94,6,213,235,251,2,175,182,198,159,14,218,131,189,163,133,9,
+246,188,199,127,122,25,130,84,116,172,217,52,21,155,206,252,185,89,108,227,93,157,19,165,80,40,31,202,137,55,207,124,163,79,125,105,77,212,102,66,221,201,11,166,101,103,225,212,223,151,123,251,5,160,60,56,239,131,198,174,36,236,88,237,86,94,70,178,164,48,249,174,35,207,155,14,134,100,116,101,248,243,94,221,91,67,182,100,233,199,127,15,118,89,47,145,69,148,85,161,44,10,54,182,30,244,103,123,106,250,59,164,76,179,154,66,70,251,169,136,59,58,80,115,242,61,101,50,121,189,125,206,56,174,166,127,146,233,159,60,68,101,162,170,240,23,18,234,120,61,91,85,1,110,14,146,130,198,159,135,115,169,194,241,204,194,139,70,34,99,185,238,51,162,67,129,35,247,81,116,238,50,111,161,179,67,53,245,118,94,226,125,53,151,247,47,153,102,240,154,90,153,50,116,224,54,40,248,158,252,247,102,32,62,87,157,139,35,47,72,35,132,70,134,51,222,117,6,194,101,242,180,107,109,168,115,73,177,53,71,239,172,255,40,120,123,98,120,238,120,40,194,22,249,64,102,
+112,111,108,247,203,206,113,63,238,175,146,247,118,12,29,29,159,72,38,173,33,125,77,100,184,231,36,23,118,123,201,203,178,172,204,123,101,24,45,38,190,49,6,114,223,106,247,235,8,196,191,144,148,3,54,160,118,110,215,50,215,237,154,251,73,190,179,101,245,52,103,172,3,218,215,99,157,156,126,158,223,125,138,212,189,117,115,47,92,138,85,54,205,202,165,142,197,186,189,215,137,220,15,221,247,186,68,147,247,169,63,36,184,10,61,31,228,219,178,201,67,151,126,161,165,123,215,109,108,153,187,26,246,24,120,201,188,192,221,156,203,236,157,105,104,222,217,45,123,222,192,173,45,171,251,237,109,121,91,56,115,27,200,41,198,137,153,111,247,115,104,145,63,40,156,242,74,49,143,55,153,232,66,209,155,46,41,30,93,225,37,99,237,216,106,143,96,248,231,121,146,191,149,167,165,6,221,114,70,43,148,11,103,70,120,31,155,215,120,250,77,118,159,56,70,143,192,247,60,95,211,87,36,239,87,81,222,160,2,79,37,200,104,76,7,30,39,202,27,228,204,95,148,94,137,113,
+248,154,7,121,87,178,180,181,118,218,227,177,246,197,57,163,59,143,233,183,112,61,165,181,110,147,110,44,132,99,209,182,83,124,99,251,68,190,92,219,1,218,82,57,80,247,237,247,248,81,124,172,104,157,225,105,89,90,80,91,207,245,139,129,146,61,199,60,98,142,119,237,104,162,209,224,140,78,130,157,118,7,212,103,169,35,78,143,205,79,170,102,145,151,215,170,222,27,77,243,133,118,123,208,150,81,30,146,77,162,69,207,77,156,3,53,199,46,76,202,199,213,106,223,215,149,115,46,248,50,189,214,46,91,235,132,50,87,141,44,111,219,124,38,177,175,29,98,217,153,123,37,238,149,4,230,80,232,26,236,157,251,87,200,82,60,62,89,239,244,232,173,126,209,54,175,30,136,115,13,58,247,20,151,215,26,34,242,96,201,125,64,125,155,137,158,119,39,120,11,204,247,56,63,239,248,14,154,77,55,52,22,163,211,118,80,187,207,195,77,26,106,93,250,139,111,182,60,226,112,165,133,145,89,127,111,152,195,121,105,150,63,175,68,145,100,175,93,143,148,116,223,93,110,235,40,
+93,180,124,157,121,142,162,49,46,99,28,34,46,249,250,189,46,10,152,37,108,58,80,38,182,213,174,165,216,38,58,203,53,236,195,59,108,119,253,152,237,23,164,91,141,234,25,56,238,3,234,101,110,95,45,50,179,64,181,173,190,221,125,205,79,239,150,95,63,176,183,87,46,130,173,45,179,213,20,127,106,37,176,153,5,119,195,254,94,190,251,41,231,143,242,117,138,238,108,73,180,34,114,65,171,77,149,203,249,221,61,115,166,80,219,242,186,94,223,218,40,87,174,124,174,45,217,148,220,219,155,190,61,223,150,33,117,104,125,11,143,172,198,152,185,86,232,215,122,180,211,255,67,117,108,183,140,54,10,113,207,253,58,182,6,214,131,182,159,50,70,196,248,141,179,46,129,102,239,101,185,114,140,120,236,126,99,114,27,22,120,53,91,238,91,100,139,66,119,43,109,224,5,70,142,93,227,249,35,86,28,64,59,228,244,187,60,1,140,143,85,122,250,107,104,159,186,55,201,109,250,228,62,163,239,42,101,201,161,196,193,166,154,50,35,104,224,185,248,149,103,111,91,59,55,29,
+208,131,188,13,79,150,159,86,25,198,173,187,199,219,142,118,91,177,65,72,171,62,189,252,217,62,90,242,181,208,39,41,187,250,223,123,85,192,86,123,89,206,143,187,9,197,121,23,202,231,165,130,237,228,28,222,85,50,133,167,142,169,226,251,160,105,98,41,5,103,248,234,59,99,95,216,19,220,52,70,252,132,128,126,248,145,113,127,231,227,173,246,233,248,152,236,118,75,82,6,85,68,226,190,214,138,152,145,251,20,93,63,249,146,149,121,117,67,187,94,139,253,216,93,125,206,240,174,215,233,40,231,177,111,183,103,189,40,122,197,52,60,231,193,168,215,91,45,67,213,49,181,196,6,25,158,61,247,61,126,191,10,178,249,88,14,162,228,47,241,242,246,166,244,214,114,149,189,66,59,221,18,79,230,184,11,143,221,93,171,174,175,215,139,165,42,158,31,242,113,249,253,46,92,59,107,198,187,249,51,174,130,146,210,103,25,106,10,182,170,163,121,114,169,104,175,130,141,10,52,86,17,137,7,95,165,246,39,214,26,114,231,159,247,130,129,226,181,159,25,6,216,116,183,151,18,
+138,180,93,112,123,24,246,205,118,190,112,94,78,26,202,79,156,117,175,178,246,136,130,245,41,159,226,190,180,75,154,80,175,210,90,75,71,212,150,239,111,48,121,67,121,162,88,110,236,82,240,189,45,238,212,45,158,99,142,255,110,132,149,105,95,188,229,114,235,198,126,51,154,117,50,190,20,99,143,142,247,187,222,212,129,94,38,173,172,78,32,169,79,135,40,101,112,70,36,95,154,215,208,56,176,203,31,181,177,220,182,38,190,62,238,123,109,143,223,38,39,57,157,126,109,34,44,231,98,173,230,26,72,29,112,176,20,65,151,223,121,193,53,26,209,68,143,92,246,93,40,165,29,78,174,235,206,68,108,189,229,28,87,86,50,118,21,207,148,146,84,147,206,59,53,108,134,144,233,126,191,29,135,88,244,158,24,92,210,207,19,195,189,226,90,148,144,225,224,234,137,239,112,117,250,84,254,154,78,214,214,68,243,193,0,191,74,109,67,207,53,223,217,99,186,233,105,163,120,179,13,237,37,188,86,83,216,90,184,18,161,40,59,114,196,168,246,150,243,230,87,52,203,140,69,179,
+88,165,109,240,238,115,63,150,30,108,5,17,202,125,60,154,102,217,228,248,53,28,166,130,79,254,185,144,77,173,119,209,183,189,220,69,86,121,154,252,164,59,91,198,6,213,57,7,254,244,205,99,193,153,134,221,92,151,133,110,53,87,119,29,17,252,203,194,119,105,76,164,199,91,87,195,73,205,123,214,31,195,64,203,254,176,12,100,180,214,197,175,55,221,233,155,106,32,130,29,8,35,121,31,207,49,246,183,222,54,22,214,117,237,197,237,95,91,219,55,4,191,91,192,235,81,208,194,122,242,167,159,240,159,242,147,247,78,243,180,240,244,221,189,174,47,4,149,200,38,239,54,69,247,174,243,188,141,127,140,208,28,229,155,205,33,72,84,187,233,138,22,254,246,237,219,231,10,22,181,38,23,223,183,71,255,89,44,63,5,228,74,177,253,252,229,36,51,142,124,225,2,108,215,187,89,22,139,114,163,238,53,58,104,186,108,233,202,94,63,43,137,237,185,47,62,33,173,159,109,211,27,44,139,46,106,116,29,99,142,108,108,154,176,34,50,203,239,80,122,148,151,104,231,196,142,
+191,244,150,123,33,207,127,251,12,60,103,206,66,126,1,85,120,119,47,163,181,226,219,151,23,225,93,128,57,134,71,123,228,105,211,237,159,180,32,222,123,173,72,194,132,208,80,62,105,39,149,227,213,74,93,91,44,30,27,119,34,55,60,104,94,197,34,248,201,246,239,141,12,200,114,156,88,127,219,39,133,243,24,227,182,50,58,204,161,228,217,176,114,119,81,73,19,233,36,190,114,113,250,143,203,125,51,205,224,112,78,135,144,122,116,9,98,134,245,10,111,87,174,161,249,184,191,136,0,150,110,205,147,221,250,193,29,92,111,7,171,91,23,84,219,191,168,23,39,100,48,114,227,160,135,36,199,221,194,219,182,83,234,238,54,230,95,166,33,231,180,232,161,153,230,25,54,133,165,109,128,15,207,142,153,166,113,159,172,46,121,161,33,152,129,99,38,174,148,58,202,118,17,120,251,125,219,43,162,71,77,118,38,90,117,226,219,116,142,231,122,167,221,172,225,125,209,187,39,189,213,170,221,126,117,173,229,100,60,129,31,17,145,54,252,211,167,0,128,100,163,240,158,204,242,73,
+191,245,50,142,15,159,22,33,82,80,238,101,203,129,120,31,247,157,143,15,154,136,55,252,236,103,144,115,188,1,232,207,244,207,125,243,18,164,3,172,251,170,190,245,226,0,126,50,49,236,187,246,19,43,111,43,59,116,105,45,39,218,88,18,76,246,144,187,3,109,11,197,122,241,43,114,161,205,210,140,244,170,48,234,210,16,159,30,97,114,109,180,186,129,193,36,163,237,84,97,218,245,169,179,25,94,57,92,207,233,229,78,246,117,78,247,119,169,142,111,143,24,173,220,60,205,153,22,202,165,232,188,142,12,219,45,248,211,34,117,77,149,223,134,84,89,24,232,178,162,86,233,147,155,87,18,81,166,222,204,26,228,139,213,195,144,239,184,17,40,153,192,26,187,109,174,214,56,149,138,83,55,200,51,172,101,6,243,7,128,73,149,96,210,211,77,18,58,219,86,86,142,197,202,86,244,41,104,127,202,116,247,92,23,103,24,171,213,201,106,177,3,54,153,228,42,127,226,114,168,231,92,98,108,224,47,173,58,80,172,20,142,104,247,107,16,60,175,53,206,6,190,123,213,211,80,
+42,129,244,178,103,85,10,236,214,246,25,38,239,237,125,3,69,173,171,177,215,133,155,172,241,227,236,83,86,117,202,50,197,162,224,116,227,88,244,123,63,21,239,186,90,168,57,120,134,213,140,11,135,200,26,22,167,143,205,47,89,40,124,159,17,251,75,163,121,110,78,236,6,61,34,114,174,156,245,210,92,132,104,101,123,239,131,171,137,33,251,81,208,20,70,175,187,92,77,198,179,42,211,95,100,185,179,157,97,83,157,219,202,67,19,43,195,86,173,218,138,85,235,174,76,121,223,108,150,140,239,30,238,159,64,234,14,91,143,204,228,88,220,140,137,139,242,230,54,220,106,29,191,181,242,198,132,106,236,44,252,178,192,65,111,222,65,197,206,29,156,247,141,97,248,190,188,65,97,7,112,227,107,9,120,95,13,118,141,235,170,51,156,142,250,148,167,60,148,38,225,64,170,140,149,237,159,182,61,195,60,17,212,12,163,70,123,170,8,77,99,120,243,164,18,162,115,179,92,26,239,214,178,183,21,62,95,55,48,219,205,52,183,210,65,69,85,177,22,254,110,110,108,83,43,100,
+234,160,117,175,116,169,59,216,161,152,103,69,235,159,121,45,55,38,132,51,171,91,153,47,14,111,75,54,146,137,112,34,175,160,97,51,53,231,183,159,153,47,31,242,173,160,210,222,139,80,55,205,140,11,13,166,135,73,65,103,156,109,191,153,214,222,195,115,242,96,2,71,25,9,22,212,156,94,171,184,211,194,94,173,89,41,211,60,21,254,110,236,175,21,1,105,255,244,167,170,181,47,42,182,126,64,248,205,109,239,250,29,178,191,148,61,21,10,78,59,42,184,205,108,97,207,119,97,164,207,214,57,81,194,158,101,116,60,210,31,182,173,8,65,188,226,240,140,81,104,194,214,134,114,234,103,157,171,118,91,190,112,211,153,250,128,97,130,232,122,175,156,235,229,119,199,172,188,32,148,104,170,126,48,74,105,19,71,221,155,129,84,11,99,3,196,19,100,44,159,117,103,255,94,236,239,140,91,125,38,67,109,114,152,88,171,35,58,72,44,209,43,180,57,247,71,75,66,195,16,234,22,50,81,197,66,233,236,184,11,47,65,47,32,228,16,9,107,223,137,27,191,49,20,187,223,
+161,222,56,11,250,213,188,43,188,88,15,212,248,49,80,143,138,8,57,205,170,124,45,196,114,41,95,156,66,199,32,232,13,66,168,156,201,77,42,167,68,93,131,172,133,37,184,255,65,118,157,138,253,142,237,232,177,54,225,107,99,46,196,121,156,8,242,133,8,3,117,83,70,63,100,228,34,91,37,152,178,49,95,47,55,238,138,194,194,22,28,134,72,149,179,122,217,83,157,201,82,36,119,73,250,18,79,127,76,83,150,21,8,35,132,164,178,246,101,148,59,244,199,239,192,170,93,190,64,186,228,130,143,170,250,89,173,48,218,111,141,204,38,141,115,202,28,174,75,0,54,176,57,187,20,254,215,45,187,197,191,74,92,143,2,13,91,66,4,110,168,115,119,239,222,91,81,74,183,32,217,9,214,167,141,29,214,16,163,153,135,43,184,169,251,62,203,219,26,195,122,155,0,163,109,159,218,46,247,120,70,73,33,147,176,215,127,12,228,158,171,123,88,98,216,212,191,109,247,59,37,29,146,218,153,17,171,155,53,201,242,165,69,150,143,119,163,209,207,213,190,87,43,21,117,237,
+88,113,78,193,213,212,116,20,235,88,71,236,111,214,140,213,218,97,47,52,117,222,68,193,91,160,140,189,63,122,158,106,191,135,194,90,95,57,203,141,147,204,251,1,164,71,239,146,219,4,71,21,93,48,156,247,124,2,216,252,245,25,177,202,88,152,203,141,159,185,1,53,206,148,80,23,249,201,96,219,90,197,207,99,135,229,72,241,224,51,73,237,106,225,61,52,162,190,153,99,90,39,11,45,132,237,102,53,174,160,190,22,204,179,24,101,78,89,198,251,197,254,113,28,90,178,243,254,84,29,156,138,108,99,239,107,101,125,53,168,212,73,139,71,216,21,179,186,19,68,230,105,30,4,21,135,101,190,205,96,140,168,166,233,62,160,172,199,56,242,219,190,211,249,254,254,54,234,131,85,181,249,209,237,24,201,105,123,130,190,98,204,57,151,49,247,205,26,41,108,209,65,165,235,107,78,197,106,100,83,171,170,120,89,101,51,48,133,47,169,113,101,53,5,251,75,11,113,226,125,6,37,222,63,148,167,172,203,177,22,230,144,253,197,156,234,22,105,95,35,105,75,191,95,6,133,
+133,93,15,171,11,177,230,95,172,245,197,176,171,203,44,29,248,29,86,90,230,179,73,242,24,252,133,34,187,202,157,150,160,90,231,70,133,207,59,218,118,214,140,74,183,67,36,2,15,243,212,100,217,182,243,46,53,71,179,109,148,225,162,117,237,75,162,242,7,220,211,249,67,246,204,81,252,64,203,159,134,239,76,23,27,151,92,13,207,212,157,191,63,25,51,166,49,156,179,247,175,82,119,68,62,102,167,190,253,41,164,119,167,123,181,119,196,214,142,213,196,99,113,71,165,29,72,197,26,234,8,83,192,240,29,221,243,224,250,92,119,195,117,245,191,85,83,2,17,114,70,219,244,65,145,121,65,188,215,224,84,74,75,33,104,232,199,27,37,51,178,233,100,247,45,183,177,42,171,221,47,137,183,117,121,231,55,90,113,43,112,87,174,122,103,214,30,249,249,78,109,91,187,44,55,188,89,159,156,182,156,73,117,212,126,54,94,143,139,222,60,5,211,124,63,122,167,152,209,22,51,70,45,22,183,227,202,112,68,61,246,113,51,97,181,176,87,1,18,177,182,28,169,156,189,83,
+129,132,168,148,50,89,74,106,147,161,57,31,123,237,150,111,163,215,154,109,154,174,66,197,161,84,102,74,151,133,156,57,193,240,243,170,59,176,146,105,174,19,217,253,220,56,250,20,73,201,135,14,31,242,240,250,106,133,210,4,130,230,205,200,8,123,142,92,209,24,175,157,115,144,149,14,48,149,49,82,210,46,32,40,153,177,243,101,232,72,239,59,150,21,25,121,99,58,188,174,116,79,195,77,141,117,195,7,228,137,0,14,84,85,99,142,90,95,166,210,25,120,164,69,66,4,69,67,221,16,226,173,16,196,181,87,190,140,135,34,136,60,225,84,132,112,130,248,51,196,248,232,192,80,147,179,131,16,0,8,12,190,240,65,178,59,90,69,24,221,92,14,177,44,197,62,41,70,72,180,78,44,80,147,145,49,159,129,232,100,33,72,194,86,196,219,153,38,199,172,75,92,217,87,155,12,69,33,150,191,189,148,212,113,39,91,82,142,176,95,188,109,106,94,210,55,173,23,229,81,22,176,248,185,68,73,245,119,18,170,20,98,132,32,111,234,172,183,90,255,47,123,111,254,220,88,
+146,223,7,254,43,12,109,132,163,91,49,106,141,101,173,87,150,101,69,104,45,173,173,176,108,121,173,89,111,172,21,99,117,77,55,103,166,86,213,93,189,85,213,35,141,66,177,1,130,196,77,220,23,137,139,0,8,128,184,137,147,0,113,95,143,36,64,220,4,137,27,32,136,27,196,69,156,4,64,0,251,64,84,87,119,107,164,176,29,187,254,109,163,170,200,124,249,242,248,230,247,248,124,191,153,249,42,51,147,134,164,115,217,44,215,171,132,30,135,228,138,192,177,50,28,140,208,104,237,104,229,160,218,241,7,113,157,38,91,30,13,156,158,162,18,54,29,198,75,147,68,201,71,33,13,17,37,193,96,136,157,102,211,18,59,152,9,194,101,134,240,12,67,179,161,97,158,235,173,174,138,137,33,185,12,6,131,111,34,212,71,203,211,169,207,154,74,169,105,101,4,190,78,231,88,140,121,237,253,153,252,148,210,8,6,176,87,14,126,210,15,247,83,231,210,71,26,22,78,41,93,184,231,75,244,99,37,86,213,137,31,245,215,234,48,114,220,111,19,178,188,214,116,184,7,120,
+201,130,112,39,16,64,204,208,217,126,230,232,170,230,243,89,12,233,154,34,157,85,213,238,30,235,245,250,237,56,192,76,29,144,203,152,238,37,147,47,186,60,195,187,177,174,11,192,162,109,164,99,28,39,28,184,162,86,34,169,123,98,254,0,118,51,247,226,162,228,106,102,81,169,167,227,156,6,14,151,195,5,155,17,87,33,205,172,33,91,135,234,229,69,48,42,179,27,200,151,199,75,85,99,18,205,199,21,221,186,163,118,114,113,205,63,102,98,130,29,170,97,135,92,184,79,62,234,15,96,245,184,196,66,37,219,60,42,113,105,41,110,196,88,18,223,216,212,223,45,110,179,228,117,229,33,30,78,76,242,253,151,151,87,119,57,139,240,210,60,211,144,143,240,90,124,237,246,22,38,74,199,152,79,183,224,76,240,60,73,142,237,14,250,167,166,86,210,22,19,91,116,75,3,138,93,163,214,132,74,184,150,123,122,150,225,244,60,186,29,166,64,26,161,5,16,125,68,158,89,138,244,173,126,69,67,102,230,42,98,217,42,13,25,224,199,33,248,228,32,25,19,99,212,222,254,
+100,2,159,131,170,223,234,116,66,55,124,83,251,226,192,46,244,29,95,205,131,151,199,243,224,240,246,248,74,60,174,183,36,48,107,245,186,165,241,194,13,18,141,210,133,153,209,96,194,20,81,145,162,120,114,210,197,53,43,110,195,40,105,48,181,216,37,56,189,55,136,171,42,105,124,231,4,8,184,229,38,163,145,4,244,74,252,50,186,60,224,45,53,42,204,104,120,175,223,79,232,184,25,92,56,220,209,158,26,147,209,244,194,115,201,137,181,182,228,50,93,83,123,7,245,132,164,135,97,190,138,70,133,2,82,59,173,44,65,211,205,35,139,64,142,141,46,168,128,6,21,61,180,157,146,216,137,56,255,65,105,75,75,71,181,251,70,176,165,228,198,119,192,190,88,114,31,124,176,235,138,167,110,42,0,49,122,75,245,178,179,26,117,77,253,20,10,24,203,33,158,247,114,171,31,86,68,109,52,108,194,85,149,251,138,68,137,16,103,159,220,33,83,131,128,59,69,193,90,146,30,167,90,124,140,186,223,198,18,226,187,214,38,70,117,57,204,150,101,247,145,121,219,120,205,190,
+228,249,154,199,206,131,219,229,161,60,173,185,43,70,184,100,120,61,152,27,231,76,87,43,44,81,97,72,188,3,139,241,40,164,63,93,14,175,88,209,99,73,114,160,169,68,100,90,56,237,250,0,73,75,225,241,192,233,168,36,225,74,61,41,194,40,77,69,47,135,116,175,150,130,179,155,239,102,75,188,177,208,155,185,181,52,97,188,12,21,54,67,165,43,117,146,142,186,106,242,58,37,118,67,166,49,221,165,139,251,210,203,136,235,80,225,43,196,23,3,11,177,113,40,187,3,125,214,249,205,65,21,158,60,213,76,71,33,246,54,128,153,74,185,11,90,132,45,104,105,136,26,88,68,115,239,241,114,252,188,229,184,147,199,0,124,128,71,24,15,20,59,187,0,59,57,107,180,241,0,149,127,24,117,57,105,162,14,193,37,191,78,192,224,114,77,162,54,153,227,49,55,142,249,117,173,176,164,246,205,55,122,113,159,84,11,53,67,176,161,175,7,67,27,96,126,33,224,84,19,143,104,1,149,214,90,12,245,31,120,65,12,170,19,9,223,159,229,31,8,133,166,165,64,99,51,
+153,220,44,247,81,20,162,141,176,98,76,154,126,4,83,42,131,68,117,71,177,143,7,242,121,233,228,56,232,244,243,218,11,182,90,92,139,115,195,52,203,97,232,20,198,54,23,101,150,200,25,191,80,48,204,237,204,29,206,225,126,181,24,5,154,38,26,187,140,30,42,184,197,8,127,88,36,202,27,53,7,179,63,230,63,168,107,217,158,16,206,22,186,248,234,22,34,77,97,121,43,37,100,33,15,43,211,178,9,158,209,108,54,115,48,128,4,51,83,94,147,232,83,145,220,39,169,70,58,9,142,142,27,152,94,130,240,70,199,114,163,182,4,16,216,206,206,182,217,79,128,97,151,115,15,100,83,65,143,53,143,73,200,25,58,69,158,157,228,223,93,18,155,114,169,237,146,56,58,63,192,68,35,41,174,62,224,68,1,78,26,56,54,12,199,230,61,41,209,245,48,53,79,108,68,151,243,7,194,131,125,9,46,202,79,30,100,73,1,239,92,168,233,195,179,124,142,90,76,200,115,30,82,86,149,232,190,90,179,98,6,143,77,4,233,50,100,168,115,18,244,4,249,232,17,40,
+61,73,105,84,64,58,226,38,92,231,217,102,24,211,192,160,166,56,207,118,51,63,30,95,223,105,106,219,163,26,100,213,91,54,159,183,243,10,181,167,167,210,66,219,238,214,165,71,4,215,50,126,67,147,84,46,46,74,66,131,5,176,166,98,135,6,113,231,170,157,41,246,34,240,105,33,22,199,240,164,241,124,78,128,119,249,221,105,93,152,127,108,87,160,0,76,180,163,152,161,229,37,201,32,47,181,243,136,112,61,179,145,244,43,163,113,126,227,94,168,82,209,96,67,30,38,234,88,196,180,189,86,122,30,81,45,246,143,71,24,159,167,194,193,160,15,163,192,125,64,138,223,129,147,234,206,201,211,204,239,231,63,96,161,192,117,193,202,234,4,246,3,101,178,240,200,120,110,60,56,29,30,167,17,128,223,153,189,224,51,153,178,61,67,103,20,81,78,199,249,113,29,135,43,198,143,167,28,106,79,174,237,123,14,194,225,180,48,154,146,103,104,138,118,231,246,124,10,36,16,236,82,60,219,52,150,122,126,200,121,55,35,35,25,45,15,137,129,202,140,213,214,14,201,20,0,
+61,180,185,209,214,105,120,66,71,224,209,102,51,14,190,16,219,238,187,25,157,254,1,123,178,231,117,155,216,168,81,75,188,27,196,208,159,4,150,35,116,242,214,30,129,140,249,65,175,36,154,199,220,72,203,200,7,127,115,170,18,235,117,129,44,255,66,227,21,3,76,38,65,5,106,199,99,34,182,200,160,9,236,252,25,97,59,185,67,11,120,111,179,145,4,13,59,247,245,199,163,27,55,50,50,161,106,42,4,224,54,194,18,68,221,34,223,53,227,233,92,67,248,222,243,24,106,90,61,239,212,249,41,79,0,79,211,195,47,18,20,39,131,246,112,85,222,6,20,188,51,12,60,157,61,119,18,44,64,230,97,112,27,185,71,70,248,14,8,100,14,166,28,37,142,21,170,83,220,137,248,8,76,106,91,142,230,46,2,24,99,221,201,191,145,222,90,129,252,197,195,245,147,46,97,182,12,241,198,227,85,38,4,83,145,155,70,199,236,249,252,176,217,94,141,195,193,63,223,199,129,209,70,126,185,141,100,114,228,13,44,246,64,47,158,158,99,6,139,101,240,194,2,227,182,196,
+33,97,14,111,56,191,36,99,153,215,114,182,109,72,207,39,12,184,5,3,126,189,215,12,231,235,131,80,148,64,52,88,19,49,6,67,208,138,204,241,9,2,176,187,45,189,183,101,108,10,13,99,84,36,52,174,173,54,18,206,210,85,15,174,157,226,124,169,225,161,44,69,86,73,158,14,86,72,50,154,17,192,24,185,186,231,223,29,223,79,79,184,42,36,237,122,249,120,47,157,64,227,97,221,97,30,105,224,179,85,180,161,238,230,118,204,211,83,121,116,173,32,20,201,158,61,221,239,96,168,247,71,205,142,220,96,226,91,200,137,115,175,182,216,146,200,87,67,105,234,117,121,126,236,106,156,59,207,14,207,249,206,180,32,168,195,76,77,59,75,217,227,169,48,150,38,212,166,167,106,103,36,202,192,222,62,158,120,67,102,27,54,38,150,71,248,153,100,238,64,75,232,249,110,192,25,117,114,143,129,86,156,248,143,248,232,101,104,152,155,239,206,117,241,224,213,1,45,16,192,7,12,98,73,236,94,145,5,193,165,204,85,187,238,158,102,131,222,185,217,10,116,118,165,90,97,
+200,52,99,146,102,143,204,235,104,199,57,190,210,170,25,226,3,192,170,105,92,94,80,132,133,198,165,72,140,18,85,48,79,88,234,56,150,179,116,122,58,235,84,74,171,219,41,220,198,136,31,9,35,224,180,0,222,28,80,139,151,226,203,226,34,242,32,49,165,137,83,170,32,186,75,43,167,77,176,142,248,20,22,223,107,212,167,169,152,156,16,131,170,143,130,104,69,227,222,49,201,41,76,164,135,214,142,129,219,227,142,243,253,248,92,76,206,242,129,219,34,69,161,240,241,132,157,43,165,114,84,235,251,174,228,88,211,242,8,112,23,35,205,135,188,92,9,100,25,202,69,217,14,167,81,31,148,248,203,163,54,77,208,14,158,219,137,124,221,5,153,166,80,156,142,44,101,37,211,97,146,201,8,168,60,255,252,52,173,179,250,227,156,240,81,102,156,61,62,25,59,248,104,206,237,92,180,219,137,176,57,160,172,239,86,194,94,10,201,220,153,17,81,140,76,36,216,225,168,36,11,199,141,49,35,161,197,178,118,12,40,228,193,76,207,127,132,221,157,28,26,25,196,131,40,161,
+41,168,77,192,72,55,211,12,68,140,46,252,116,92,59,230,6,79,159,218,143,151,103,173,7,143,1,166,18,101,80,112,12,116,183,142,5,152,234,243,227,220,124,116,40,240,6,110,244,29,241,113,190,225,11,245,201,166,93,90,225,86,65,247,72,83,221,218,77,222,101,9,48,49,190,238,209,173,63,18,166,203,89,116,42,213,87,52,231,98,99,183,15,87,222,215,171,249,186,196,161,129,26,224,59,101,10,17,129,110,34,230,138,105,101,148,202,161,222,29,4,117,33,19,114,71,31,237,176,138,124,219,113,107,162,59,118,103,237,54,235,214,24,83,65,200,57,135,248,253,177,239,40,31,200,44,209,23,94,236,21,159,117,118,95,188,34,166,36,83,47,244,8,10,204,17,51,19,238,208,193,181,245,96,246,36,82,124,19,142,75,123,37,57,26,211,235,79,219,194,44,29,171,72,201,199,45,157,243,138,223,59,119,245,249,147,173,120,214,140,136,26,250,52,59,52,69,240,207,73,49,100,5,211,123,132,131,179,213,96,234,129,212,58,1,246,30,37,232,163,107,26,33,238,212,18,
+109,110,140,244,74,119,15,200,174,47,69,74,250,241,1,126,64,67,173,44,81,128,61,93,194,107,225,202,64,41,133,242,12,14,159,191,188,52,33,178,41,195,5,12,212,222,75,106,128,204,7,32,206,122,90,166,173,45,161,121,189,52,109,17,163,15,205,42,17,58,189,240,123,158,218,209,4,59,224,209,34,38,230,61,115,204,123,199,4,45,61,125,27,191,40,5,44,114,72,53,17,130,239,31,186,110,205,189,43,111,82,87,211,24,154,187,81,25,31,6,127,184,70,243,142,169,97,206,81,32,127,72,143,251,46,50,121,80,210,189,217,252,242,241,14,193,26,195,177,213,237,227,9,233,46,144,196,239,30,26,138,73,233,96,71,209,72,231,175,19,195,195,120,13,16,121,59,119,11,75,164,153,71,51,204,96,95,165,27,126,83,56,100,234,2,122,69,114,151,125,249,24,220,27,241,30,15,117,164,209,97,2,153,10,186,143,139,91,34,48,68,193,164,136,230,120,208,109,91,60,35,200,128,113,27,241,159,183,245,24,237,241,114,133,128,106,61,60,161,187,82,207,170,173,230,253,
+193,195,213,54,13,80,56,167,24,254,133,106,202,127,70,174,153,131,143,140,234,144,76,200,10,181,30,146,20,184,147,96,90,53,212,138,49,64,71,151,184,212,23,183,46,120,119,34,4,10,147,114,131,115,149,41,233,154,113,126,217,162,43,80,228,28,154,208,186,141,240,239,33,192,33,4,3,37,244,65,20,5,147,80,48,189,74,18,215,217,125,228,58,27,226,92,103,67,144,235,236,91,207,58,27,227,120,206,174,233,248,0,115,162,206,93,213,216,18,152,128,86,105,187,25,196,45,16,176,81,52,112,122,148,30,97,47,47,143,2,124,212,49,252,142,9,73,80,116,96,68,234,130,222,70,116,8,26,44,16,56,155,98,108,79,141,212,29,185,127,2,42,16,18,2,248,10,199,66,106,2,178,46,118,187,181,46,6,191,163,97,9,9,93,96,139,5,56,201,94,30,128,17,40,20,240,2,13,107,17,207,14,105,94,149,170,118,217,7,251,219,162,193,98,64,33,226,129,0,10,1,152,94,37,203,96,154,231,196,208,22,39,116,38,173,113,6,220,178,145,184,171,57,115,164,50,
+31,61,32,92,124,46,174,47,87,250,175,165,229,252,124,10,220,177,152,7,55,0,83,155,244,210,176,160,192,53,201,242,29,80,199,40,229,140,29,149,120,170,39,0,245,206,104,100,175,164,82,189,70,3,10,241,246,38,147,74,189,110,156,62,60,160,53,170,238,22,93,99,95,86,71,163,218,83,177,72,5,39,76,189,128,241,38,161,219,103,159,178,42,183,17,1,4,184,87,108,37,41,20,147,53,105,141,72,21,68,105,220,26,143,223,220,160,245,242,39,251,147,113,112,235,156,239,51,178,85,175,48,214,167,52,26,30,44,56,28,221,13,20,131,118,240,189,164,45,208,159,105,197,19,54,137,98,58,157,116,243,48,222,108,81,66,103,147,247,251,85,154,117,40,75,111,193,0,5,148,22,64,163,65,45,221,3,234,231,132,197,146,146,26,30,93,154,2,156,254,108,95,152,229,207,164,167,166,105,178,69,189,225,88,239,114,225,33,76,117,126,12,1,203,55,158,203,211,105,8,17,96,125,164,137,66,44,78,37,226,116,98,218,20,63,77,33,115,36,228,44,105,222,93,84,215,
+46,33,133,227,59,239,226,150,118,9,80,131,1,4,77,191,128,59,249,151,148,118,91,120,201,129,69,81,243,172,38,199,41,172,166,50,172,177,66,35,62,182,20,6,145,132,14,229,224,223,4,28,171,217,8,80,201,8,10,154,176,205,2,187,247,123,47,141,192,108,58,78,101,224,73,157,10,127,85,229,37,174,148,100,122,24,152,160,14,24,211,51,148,24,28,176,8,38,223,109,96,253,252,210,197,9,119,7,140,223,164,20,248,185,172,217,140,186,21,13,198,196,119,24,50,9,137,38,121,67,58,174,41,226,48,49,6,35,66,200,27,240,231,226,163,179,99,142,171,236,165,154,58,250,136,215,208,136,52,102,203,108,13,156,31,237,163,167,166,136,220,71,44,239,143,192,64,211,124,49,67,220,5,250,227,155,39,186,86,164,9,196,149,173,43,62,6,180,161,102,122,208,187,29,14,157,52,137,151,108,40,47,230,51,236,73,173,175,35,86,221,120,140,11,224,75,212,124,57,58,154,219,213,214,50,153,157,22,217,69,190,152,60,122,133,29,81,24,0,36,35,197,182,112,144,136,
+245,229,41,182,124,44,36,119,56,214,174,93,217,176,102,248,79,56,223,17,101,143,64,131,153,146,91,171,0,58,152,147,170,85,199,208,30,134,165,148,103,216,108,246,24,95,60,17,79,7,81,121,165,74,111,164,116,85,7,153,175,18,171,118,146,131,233,116,42,74,146,88,222,83,101,155,52,247,218,2,183,118,80,173,42,21,154,136,121,159,20,62,225,109,65,172,227,185,100,55,57,152,207,97,240,195,101,191,79,158,157,186,143,182,37,44,23,58,155,78,147,69,140,195,67,122,38,177,21,227,223,70,18,148,189,140,139,38,220,18,87,202,249,180,97,166,152,148,45,147,196,84,85,4,155,24,128,109,200,77,106,181,102,218,175,208,91,210,113,112,124,208,174,25,23,67,84,35,34,57,55,153,67,165,93,172,53,43,85,36,79,10,17,140,195,1,3,30,152,122,5,20,83,97,157,248,151,55,115,242,76,154,35,59,248,129,125,26,145,166,64,151,20,224,100,54,17,212,60,144,15,195,218,219,171,142,140,212,34,230,206,29,67,190,55,77,241,10,38,183,145,74,74,119,26,194,
+80,30,17,210,158,230,174,23,102,210,0,143,227,144,175,170,77,249,199,151,85,242,80,140,146,163,145,100,47,13,32,119,148,242,92,148,28,23,122,167,177,199,157,85,41,126,96,39,35,24,62,68,238,167,52,201,89,187,165,225,232,211,206,164,208,163,205,30,5,70,44,171,37,160,239,23,83,144,179,227,104,209,95,36,27,119,251,181,136,192,75,71,234,168,9,249,180,163,196,27,106,130,7,5,71,163,71,69,248,39,66,226,21,45,155,99,56,52,29,250,53,245,212,39,148,211,151,55,231,143,215,214,253,65,175,215,19,93,102,205,231,197,113,59,224,15,229,143,192,217,85,46,195,146,65,105,29,251,99,56,147,46,205,32,24,41,20,51,21,195,105,0,131,53,178,46,167,173,86,64,175,47,207,83,243,106,53,209,33,236,201,149,65,117,158,87,184,181,3,26,179,217,166,30,171,27,55,139,185,23,171,77,243,157,232,108,34,49,220,6,202,186,59,163,88,25,240,214,168,65,85,237,110,228,150,251,208,217,220,60,39,166,222,140,58,71,165,12,165,227,203,107,239,243,185,121,
+237,72,116,150,41,37,20,210,112,77,162,59,173,223,71,38,213,222,147,236,254,49,152,166,236,2,148,249,54,38,197,186,103,179,58,122,62,189,166,61,52,217,7,148,41,77,5,16,238,104,194,16,201,101,40,25,14,218,178,65,232,160,237,231,233,15,152,89,45,102,181,222,210,126,162,57,174,101,131,217,236,242,228,80,44,226,180,244,71,123,210,68,204,64,75,234,186,178,61,143,149,214,132,130,214,52,242,239,228,208,0,134,175,59,180,219,209,214,137,241,192,58,83,84,230,213,102,22,191,24,12,52,62,230,1,112,141,158,63,225,31,137,231,252,222,189,51,111,175,54,39,250,234,41,16,30,43,155,48,218,16,133,45,211,176,77,184,140,77,174,96,110,218,231,75,161,138,30,106,195,125,29,184,55,228,2,17,224,241,216,137,13,241,27,48,147,37,152,204,243,213,148,146,145,111,84,74,113,67,26,153,122,52,71,200,110,112,137,188,59,25,187,218,158,10,218,187,141,107,44,70,25,193,160,203,5,251,44,52,95,221,75,52,54,152,39,15,201,152,34,204,102,15,208,114,41,
+242,140,111,51,123,143,128,123,90,130,8,0,15,17,174,119,42,151,137,219,233,121,142,170,32,175,208,166,87,226,199,135,86,178,198,80,219,13,143,119,121,110,41,213,116,105,54,99,86,2,76,79,65,71,227,99,234,41,211,1,35,141,153,78,25,92,241,193,157,70,188,207,139,106,65,52,221,167,151,128,148,249,96,62,108,242,163,22,218,181,140,82,161,198,45,230,29,12,223,82,85,137,93,123,73,188,173,2,12,103,2,37,134,148,227,1,233,112,39,159,109,234,142,114,123,182,209,236,50,66,230,93,163,135,243,140,60,53,48,71,189,79,252,208,249,85,34,198,201,238,145,100,71,182,201,61,156,125,14,92,123,183,129,249,208,240,160,223,106,34,167,2,223,209,220,86,223,5,98,71,94,166,95,224,231,121,155,140,8,233,232,170,118,62,159,141,25,133,136,158,225,202,66,48,211,182,177,133,234,88,2,248,51,190,193,6,14,184,204,30,3,179,81,21,228,84,187,66,203,43,195,20,159,53,47,61,121,198,163,125,151,118,162,81,221,123,46,129,153,68,219,81,0,193,251,136,
+209,118,142,199,168,248,150,155,148,78,169,132,146,198,105,134,156,193,83,87,178,71,41,16,136,14,43,165,231,153,188,39,155,88,205,228,219,129,179,70,196,179,76,123,177,80,129,82,78,129,211,162,192,128,124,25,87,99,74,193,80,94,144,214,96,138,140,4,33,198,130,105,14,142,163,33,127,166,87,172,88,205,59,30,12,14,115,47,37,215,49,193,124,171,123,174,161,87,34,195,97,134,202,192,5,67,161,54,182,138,59,16,245,208,146,218,160,213,218,111,224,118,111,51,189,66,68,0,120,81,58,112,158,144,57,211,184,232,26,49,214,163,207,31,143,65,64,42,62,149,29,150,157,186,71,211,138,156,230,238,171,4,63,76,78,7,49,105,5,73,125,16,147,86,144,228,7,49,105,5,73,92,16,147,86,144,212,150,42,156,252,11,31,249,174,142,129,234,157,6,225,69,144,144,18,128,83,88,3,56,135,5,167,176,152,45,140,136,193,162,95,35,92,52,253,222,106,234,88,32,60,165,98,85,133,214,9,202,153,66,83,232,56,148,199,188,169,22,35,251,153,177,24,2,32,206,
+146,36,106,124,71,83,203,146,169,80,64,47,60,186,193,220,72,182,49,252,83,63,242,38,179,133,57,131,208,30,129,59,20,14,35,37,19,168,241,189,20,101,121,122,31,233,135,229,146,56,170,59,196,146,28,125,163,152,32,183,74,11,15,22,10,244,222,55,212,209,81,52,7,32,191,188,201,16,227,169,4,197,90,38,86,179,51,210,46,41,201,231,28,209,44,61,121,154,159,19,236,36,40,106,121,242,1,64,102,138,17,152,150,58,20,105,208,147,68,172,224,31,0,236,33,223,201,71,194,203,94,180,204,47,103,112,90,165,125,42,39,66,24,7,248,145,51,142,74,92,4,156,15,145,161,230,46,130,6,209,180,90,140,8,85,52,32,65,241,78,66,154,59,180,138,118,125,80,9,186,146,66,226,164,116,64,180,24,112,218,75,164,146,68,145,27,161,249,44,27,13,177,153,119,184,1,2,82,222,80,171,196,36,194,101,55,19,99,251,211,180,216,188,194,175,251,201,70,57,218,245,208,147,212,25,33,82,142,191,203,27,91,110,175,202,98,236,49,64,34,47,237,226,242,228,240,
+108,94,220,17,37,40,59,14,161,140,116,161,72,214,247,28,9,29,67,67,202,15,224,19,34,24,194,17,89,84,148,128,38,31,220,158,238,210,20,165,138,113,255,66,142,30,136,101,91,67,52,143,225,161,157,94,39,4,245,72,40,130,153,36,169,161,124,126,191,92,181,106,20,2,59,26,3,207,110,195,140,55,251,180,0,143,148,36,58,26,94,31,162,3,215,139,69,4,168,40,82,188,62,143,110,1,91,2,220,250,69,3,193,72,199,198,44,201,19,103,50,189,161,87,135,17,177,177,182,203,58,193,16,209,24,137,125,48,168,136,51,50,24,24,189,82,170,196,113,141,154,34,4,170,18,206,229,21,39,38,234,90,58,38,133,148,51,10,200,137,103,252,9,252,92,4,180,28,93,185,180,94,139,4,100,169,106,132,43,127,24,54,101,219,24,40,64,160,168,106,186,114,157,54,32,154,200,119,89,118,38,65,129,128,225,218,33,75,114,121,132,81,157,227,141,14,142,202,30,245,94,13,239,36,116,217,69,168,129,51,94,25,136,148,84,108,47,163,127,80,95,231,244,221,188,36,
+161,195,220,26,147,98,118,169,109,190,172,75,12,181,40,102,7,3,69,17,144,73,117,109,10,70,75,160,152,32,92,8,53,63,208,136,84,98,136,1,5,201,211,177,14,38,177,110,174,192,48,21,34,48,92,98,188,199,236,176,7,70,195,58,208,246,2,15,44,227,93,105,30,132,6,131,116,249,137,49,229,160,22,137,63,176,37,39,219,110,204,9,191,31,173,17,111,226,21,41,213,172,89,200,193,128,21,195,195,64,111,253,9,76,227,140,225,104,43,212,103,24,216,25,76,43,14,52,59,39,29,165,66,113,172,84,182,8,2,58,189,74,163,161,68,116,250,17,24,51,237,142,37,253,254,184,82,125,56,55,156,220,72,42,153,203,204,14,24,72,161,113,118,76,106,203,59,175,77,120,168,71,175,229,184,138,79,204,49,243,170,15,221,240,135,30,179,215,77,79,245,164,187,222,40,232,249,214,27,5,51,223,122,163,32,138,95,111,20,96,239,215,27,5,85,172,17,28,193,153,167,87,142,36,124,26,168,235,129,255,48,4,18,193,2,114,237,166,12,154,181,155,242,79,120,50,
+89,63,195,55,248,219,67,243,170,2,24,78,16,47,180,64,157,123,190,14,96,7,151,235,0,214,147,93,7,176,78,24,176,165,130,211,176,12,7,67,97,210,233,20,71,109,64,171,154,244,84,78,12,14,151,235,22,34,119,30,208,62,204,200,178,164,73,146,251,188,8,128,77,151,100,179,116,43,58,43,36,77,205,22,139,123,33,79,229,243,109,23,63,1,217,35,95,82,131,182,135,35,215,32,200,69,82,119,139,73,118,229,246,113,36,241,182,28,213,46,70,41,80,6,137,167,222,61,57,79,119,28,226,245,123,36,92,59,98,179,157,208,105,35,152,99,47,161,52,133,120,233,17,189,209,145,157,146,217,110,133,15,94,114,251,195,17,1,223,85,87,165,125,65,165,147,15,241,92,64,229,140,45,93,154,162,220,245,6,47,174,140,22,225,169,107,172,48,213,111,196,138,212,252,184,16,217,33,174,200,116,116,76,141,36,121,142,9,42,149,119,202,11,190,112,162,201,108,217,151,120,26,140,123,230,236,90,167,247,183,52,54,98,181,200,251,72,146,52,241,118,137,135,98,50,42,
+141,128,77,15,234,149,159,176,138,88,187,24,128,4,78,83,132,180,209,227,117,184,29,129,193,204,8,173,182,168,148,163,29,28,63,24,124,131,177,183,192,58,39,55,189,193,82,51,110,64,45,74,121,209,249,193,129,93,171,237,95,210,129,164,144,194,181,121,16,228,65,116,43,123,27,113,128,157,101,243,121,94,126,189,12,218,78,174,151,65,227,246,245,50,168,240,130,78,91,141,60,86,97,92,240,117,132,107,57,244,105,54,178,47,246,241,122,72,2,156,89,109,253,23,241,90,185,194,107,136,7,26,149,51,192,137,226,142,179,6,14,159,0,198,140,80,5,40,117,209,163,28,131,46,89,192,84,1,156,46,18,65,124,130,240,11,207,137,26,95,187,98,20,4,240,60,231,22,30,20,250,218,93,213,76,50,117,12,164,71,151,192,216,150,128,185,17,164,166,118,20,189,188,22,148,192,153,131,213,19,216,6,25,200,162,201,181,181,167,70,57,253,152,11,118,90,189,42,115,216,186,116,167,233,112,187,33,61,51,164,166,39,231,161,1,45,53,243,29,93,153,78,130,185,180,41,
+7,156,78,116,197,126,111,49,87,99,48,46,62,10,74,46,242,71,183,251,128,247,146,215,145,183,130,242,166,61,183,39,217,205,200,118,33,129,107,248,145,108,155,92,50,91,139,230,172,129,53,15,50,131,84,181,15,144,22,142,230,220,167,147,153,219,189,154,110,66,118,237,106,63,223,90,196,31,1,149,241,121,85,86,20,100,195,102,234,2,229,11,157,60,10,103,55,194,254,153,66,88,244,159,106,26,153,40,67,146,217,147,39,117,2,144,191,192,22,114,75,68,198,136,186,253,251,61,247,250,51,146,163,230,250,51,146,134,61,212,102,82,149,247,130,147,80,213,117,91,126,186,45,11,231,220,94,27,178,176,211,66,67,39,56,19,144,67,212,220,147,90,65,21,224,76,0,115,98,202,185,31,250,169,186,194,153,77,226,204,61,127,40,50,221,95,127,40,18,187,57,231,173,62,20,193,244,77,253,125,185,41,150,184,170,45,133,10,198,145,60,91,143,168,48,52,96,217,119,240,81,219,69,126,102,20,142,243,209,147,109,102,123,196,44,165,69,93,213,226,118,118,203,55,29,150,
+66,219,17,186,125,92,174,115,210,193,113,160,154,2,77,180,24,59,181,52,105,97,239,233,162,218,84,108,129,164,160,29,114,207,185,74,220,49,94,89,123,247,3,197,113,72,150,87,159,102,199,187,114,174,162,83,150,85,45,83,57,101,199,235,117,209,20,184,243,243,26,43,215,19,85,34,39,205,41,109,152,97,231,250,23,225,76,240,212,37,130,80,64,102,192,230,214,233,34,231,170,94,39,15,199,90,246,51,156,91,28,157,44,40,182,172,160,26,96,94,243,196,241,74,82,207,68,92,41,182,131,138,250,226,136,234,145,90,146,230,216,120,175,149,12,130,230,135,0,213,128,118,232,194,1,122,69,35,61,58,207,66,131,115,19,203,217,80,14,115,227,71,163,192,146,12,226,78,143,16,48,214,213,188,236,187,15,153,144,24,56,150,118,168,240,148,124,16,128,140,56,31,129,126,66,131,225,24,37,39,195,161,188,55,156,230,133,135,52,25,244,34,109,59,99,93,109,7,189,91,222,106,105,57,241,228,39,150,82,156,162,22,91,26,42,34,77,35,116,240,33,69,15,180,76,179,
+166,212,148,225,131,160,39,20,69,243,171,143,17,46,139,215,185,162,160,10,86,117,99,87,31,35,60,248,150,167,171,143,17,20,202,128,159,62,27,172,112,79,233,49,130,222,229,78,50,95,121,23,52,204,102,17,58,177,177,114,64,198,79,87,17,50,58,66,54,164,159,177,46,15,131,194,177,218,39,84,79,239,117,115,172,73,113,24,244,22,230,82,0,63,160,226,7,143,22,219,66,17,28,242,171,54,89,51,121,145,191,46,135,208,96,179,106,194,108,209,81,194,82,226,252,169,49,99,74,87,117,120,135,169,131,191,238,47,194,153,83,123,73,135,55,42,246,117,102,123,147,181,39,143,30,220,31,31,212,21,246,113,114,88,75,156,155,48,50,89,187,16,1,177,20,25,49,95,40,128,195,221,138,7,21,63,110,157,140,118,108,182,171,124,155,41,38,27,226,189,54,247,105,36,81,77,115,11,143,189,207,180,24,158,116,85,181,4,24,92,196,79,228,104,204,30,148,128,145,232,107,186,154,168,194,209,143,148,250,224,72,193,174,231,236,233,161,213,201,67,249,80,202,211,0,57,
+43,52,152,78,252,245,115,206,147,119,255,96,43,9,198,135,160,135,220,41,130,118,155,184,141,132,193,180,187,155,30,235,79,179,15,199,78,190,215,0,234,228,8,50,83,114,121,119,183,17,136,11,234,196,240,215,9,232,58,1,184,214,137,118,5,186,178,92,53,89,60,109,1,77,204,156,11,7,95,250,9,10,82,42,149,57,235,145,233,30,16,198,118,19,186,170,234,1,180,82,63,4,184,9,144,30,97,7,162,173,12,64,62,106,59,105,132,48,234,54,226,198,136,230,16,248,217,14,168,63,74,238,109,196,44,55,217,83,237,125,155,225,170,127,255,112,112,29,105,25,16,156,72,50,136,111,26,134,45,14,166,158,109,180,36,145,160,127,216,58,48,222,152,82,167,234,211,211,101,2,6,68,183,144,248,68,12,135,209,147,92,249,100,202,106,45,219,205,163,224,245,17,101,206,51,83,183,80,108,78,245,129,173,76,227,132,197,155,179,114,175,6,218,50,3,196,142,14,226,186,0,82,123,183,69,211,187,31,248,58,180,16,150,99,96,37,187,249,44,111,162,97,45,71,121,105,
+246,180,60,209,49,162,53,24,79,250,4,212,33,13,23,191,238,131,156,3,45,8,77,31,119,131,19,183,208,25,207,59,39,83,73,71,151,241,179,33,194,63,105,223,34,66,71,83,166,108,190,135,233,66,9,71,104,12,122,44,108,34,163,200,165,175,159,235,16,61,243,155,39,140,235,108,150,172,63,140,78,209,146,57,60,207,153,198,198,89,152,253,42,13,179,27,10,93,194,105,122,42,51,80,180,115,28,19,2,208,182,144,116,46,102,234,55,238,9,206,34,124,148,185,169,72,98,76,149,177,234,184,111,165,147,109,85,132,228,164,78,241,193,249,199,240,69,251,178,9,206,108,141,194,73,84,44,208,139,184,81,52,136,7,150,218,78,42,22,19,29,180,166,91,162,57,76,134,191,177,226,67,62,119,124,23,91,27,110,203,27,102,210,128,50,16,115,124,156,62,229,50,132,61,168,103,249,173,209,56,147,42,140,113,202,28,204,210,137,157,90,187,93,200,113,93,20,101,209,3,14,188,81,217,64,12,199,146,90,89,45,21,214,37,140,136,95,108,184,77,107,37,129,72,34,118,
+85,139,92,146,77,174,130,170,221,85,97,207,38,60,131,248,92,40,120,98,12,208,24,104,43,140,108,112,178,36,192,38,78,69,227,100,155,48,60,172,202,47,14,175,46,119,229,169,56,185,103,118,154,132,156,9,234,134,67,218,179,211,164,62,178,108,192,56,214,93,229,49,214,169,20,114,231,233,179,172,22,82,120,48,188,37,0,243,226,57,223,73,11,100,176,105,172,74,124,48,98,51,228,210,138,36,205,101,26,153,73,253,181,85,236,69,142,226,181,73,164,250,84,75,114,128,208,144,30,42,220,78,65,129,10,99,73,177,144,189,47,85,72,181,36,218,176,197,99,163,238,47,34,134,219,101,214,138,121,184,75,218,230,79,169,27,115,57,226,59,199,110,103,2,167,185,172,190,195,148,41,44,250,90,151,213,81,48,15,106,210,83,85,205,228,116,172,194,154,153,80,70,62,242,156,220,17,182,5,86,253,182,92,106,247,156,50,200,3,33,249,88,64,4,216,93,0,197,172,159,227,23,1,25,232,231,142,164,244,155,120,127,206,197,149,34,55,145,70,112,247,44,142,27,153,207,
+103,151,187,157,97,193,40,134,60,228,161,178,118,81,83,211,88,9,0,40,229,124,112,98,210,69,173,81,14,204,54,42,121,15,142,16,236,61,52,214,227,229,119,70,187,118,91,14,101,157,66,38,119,59,160,86,242,143,209,249,84,179,53,127,26,109,59,36,11,115,221,94,93,32,100,71,228,156,20,118,63,42,123,121,231,166,19,54,126,40,95,5,114,173,135,45,76,170,16,65,5,246,207,21,236,251,170,169,31,15,141,58,221,176,187,11,154,61,45,69,60,114,68,196,146,193,83,229,114,8,3,174,182,112,152,148,120,75,222,64,0,110,232,3,24,196,211,85,98,30,31,208,50,65,8,72,108,65,128,62,7,244,141,196,103,171,125,40,156,71,74,43,78,16,84,138,20,100,226,130,1,221,45,213,118,49,194,58,127,142,11,183,105,1,200,100,21,185,107,111,163,17,178,96,193,97,87,79,107,90,44,216,252,214,163,188,81,139,8,242,14,58,18,4,105,15,76,174,68,131,110,30,178,7,57,197,136,202,145,51,175,239,225,168,12,214,51,66,108,64,81,35,174,246,120,79,
+185,189,88,31,230,182,35,246,170,251,17,242,132,182,197,38,209,105,1,132,17,9,106,159,170,38,167,177,20,23,246,101,61,173,156,196,213,49,90,106,223,134,236,85,132,170,21,95,137,205,121,109,120,47,74,104,157,180,50,140,131,247,122,15,67,243,253,172,215,138,118,94,151,110,74,46,249,170,151,139,209,34,57,24,165,99,212,51,56,177,119,53,28,59,128,37,219,55,132,158,57,134,152,4,8,75,119,252,135,177,228,240,24,150,201,121,198,151,163,93,81,236,33,2,43,113,168,135,87,0,143,79,180,180,121,114,6,188,235,202,196,112,140,169,125,122,206,245,217,132,73,127,88,124,58,205,95,238,227,0,252,253,73,39,157,10,243,184,160,213,101,116,213,5,29,244,46,24,112,110,112,34,9,88,14,172,0,13,113,173,102,85,25,96,172,225,192,49,38,246,41,6,170,104,192,89,244,33,76,83,64,15,51,101,106,16,210,187,66,167,167,185,72,98,225,107,75,33,50,118,54,186,146,142,179,40,108,159,119,210,201,147,154,66,4,48,92,29,72,3,98,34,172,224,177,123,
+120,109,45,211,134,15,88,79,24,194,192,200,27,7,2,96,8,1,93,55,70,156,160,128,157,144,161,194,103,120,130,1,132,53,220,98,115,10,70,118,37,1,11,232,160,251,198,85,220,82,113,240,79,241,24,80,14,136,149,156,96,237,243,131,62,40,66,2,68,171,162,5,38,153,219,103,105,70,88,219,231,107,1,111,129,121,9,221,105,183,7,142,31,204,62,223,90,103,235,103,94,179,45,199,39,123,156,244,43,226,42,84,45,237,38,98,130,210,69,125,171,110,150,107,181,87,125,82,191,35,151,251,229,10,108,128,142,25,31,88,196,105,165,194,154,72,36,182,5,96,117,38,88,244,48,195,119,162,21,212,147,238,109,132,176,3,18,2,1,245,145,84,137,228,15,96,182,89,40,31,64,135,178,185,28,20,44,155,103,86,50,120,27,247,73,75,210,6,239,209,164,24,10,182,187,47,8,163,37,244,193,67,17,140,121,32,185,209,21,107,22,161,11,42,249,211,227,116,224,40,9,243,184,225,37,180,176,218,157,82,124,60,24,237,82,141,7,25,209,20,161,174,198,135,199,108,
+155,29,25,51,38,168,7,52,92,222,115,38,16,87,124,46,184,175,116,24,22,5,146,60,38,21,13,206,74,185,93,232,74,206,15,246,233,85,254,232,169,74,76,147,183,177,141,180,86,200,115,243,52,236,137,50,132,119,57,198,163,17,232,51,154,118,209,100,124,56,166,32,98,216,218,54,92,93,215,86,106,97,156,229,170,214,86,183,193,217,0,36,171,179,46,23,131,134,90,60,61,167,233,96,187,146,92,108,71,32,163,76,247,104,176,178,163,205,232,218,167,166,233,108,112,7,243,183,34,55,125,152,70,219,227,192,14,77,42,49,18,126,14,204,91,220,179,89,228,114,56,157,207,247,79,160,157,123,162,8,228,170,222,149,77,128,114,73,59,175,199,65,145,115,92,219,130,168,114,181,96,113,101,80,103,91,152,138,69,41,103,112,89,198,103,75,57,94,103,111,185,159,179,209,144,233,190,234,185,36,3,204,91,101,129,106,240,92,18,101,60,152,7,65,159,44,130,248,29,43,67,223,91,235,75,159,176,50,126,208,246,123,43,227,7,109,31,249,60,27,232,115,46,214,217,49,
+168,224,145,99,5,39,201,30,61,170,125,142,135,64,88,64,0,58,139,108,147,61,221,103,5,33,3,183,139,1,4,146,199,84,104,20,67,68,89,155,239,197,122,206,233,86,249,140,126,151,67,170,141,7,214,51,8,87,9,96,34,157,97,50,66,88,28,231,108,195,231,242,166,49,52,219,75,196,56,133,169,152,3,10,199,33,160,64,110,35,147,154,212,32,14,219,168,186,248,29,13,112,207,107,206,18,216,7,31,199,79,198,170,42,6,78,144,80,105,101,62,18,20,191,34,35,156,182,197,242,216,6,131,163,144,199,91,23,92,211,19,64,32,27,240,171,87,41,8,178,18,81,21,35,33,19,60,166,171,133,183,253,94,216,248,16,1,17,111,119,4,172,210,201,164,123,183,119,8,204,17,86,27,114,72,90,21,247,19,159,113,191,18,217,73,182,109,140,93,70,21,232,85,203,112,234,113,65,158,62,74,174,72,117,64,50,195,14,233,9,191,199,129,64,86,252,140,129,60,94,177,120,9,242,216,187,85,228,239,142,158,179,229,141,117,118,241,254,89,26,152,74,248,89,26,251,
+170,197,179,52,188,91,179,231,240,42,82,13,179,158,25,187,235,88,195,174,3,185,134,221,72,101,37,141,64,79,24,141,135,42,6,85,237,110,124,107,20,179,29,124,56,133,22,152,98,119,145,114,35,8,55,171,29,9,10,216,42,10,52,107,40,232,115,111,161,114,244,24,179,166,195,2,210,225,2,223,251,33,162,152,117,198,198,167,50,124,156,93,105,78,109,55,247,145,96,149,240,34,161,187,29,107,251,83,19,122,232,119,243,37,80,200,10,93,248,137,88,84,125,17,67,106,187,143,172,19,62,90,4,205,137,49,176,45,96,11,101,84,214,26,8,211,24,66,93,78,167,79,146,116,40,206,215,56,135,115,246,253,204,5,169,99,192,230,144,247,238,8,73,229,217,37,177,47,238,228,210,251,120,211,167,211,22,125,8,176,255,51,136,3,91,151,51,2,87,124,30,14,38,208,170,252,98,8,183,125,58,29,150,156,151,122,170,158,93,247,152,105,0,103,238,222,50,1,87,144,21,240,181,19,24,95,244,74,124,188,213,126,8,2,87,61,12,87,178,11,182,239,184,62,28,175,
+38,58,16,20,113,245,11,28,170,17,28,235,106,168,118,112,172,73,152,95,178,3,127,222,119,132,116,93,188,182,158,227,224,91,10,107,224,131,120,224,52,224,49,147,200,81,32,93,7,31,137,215,96,158,129,175,226,162,235,1,12,55,100,60,93,205,114,157,73,33,98,103,13,120,208,21,8,130,182,102,89,129,32,152,69,37,111,63,35,234,214,58,91,107,1,117,220,114,95,84,64,76,222,167,83,234,67,97,247,217,108,2,174,60,156,197,178,120,123,227,106,251,209,58,35,95,93,5,199,213,138,136,78,175,158,163,129,25,158,67,137,43,110,64,162,32,9,108,24,132,185,118,132,11,99,181,155,114,39,159,139,20,176,232,250,109,16,15,211,126,62,26,70,243,49,193,241,65,70,135,19,59,48,117,57,66,66,250,211,201,98,231,180,61,231,86,107,90,186,70,144,226,165,129,116,250,185,132,120,121,84,206,183,84,92,225,188,97,13,206,153,114,171,244,166,86,60,199,223,234,64,108,58,171,182,135,56,161,151,246,148,124,72,213,149,199,179,107,27,70,10,165,54,140,160,199,
+221,169,130,252,26,17,124,252,176,243,102,55,157,23,97,20,82,170,73,123,181,5,152,64,88,14,152,227,245,221,84,76,107,11,208,174,33,178,193,120,12,42,164,218,209,6,71,76,224,81,175,209,66,14,28,216,26,170,152,236,254,128,179,45,57,184,131,229,251,131,30,126,206,117,31,37,241,251,174,168,34,12,22,119,62,235,233,142,53,234,241,90,14,99,104,130,220,151,177,151,58,137,152,130,176,122,235,24,117,49,215,86,111,23,140,111,44,144,191,223,31,113,214,217,144,155,117,54,24,71,223,194,87,89,171,213,136,85,86,25,191,22,160,44,181,213,140,64,47,200,23,207,102,181,135,225,173,225,110,223,186,134,59,72,22,52,58,70,233,242,184,207,9,128,3,240,56,215,56,134,85,108,51,6,204,61,98,130,130,0,99,15,80,95,18,16,10,132,188,218,176,3,39,31,142,29,208,135,94,175,156,40,40,241,29,200,90,159,218,254,240,19,181,146,39,225,185,181,184,127,122,27,1,205,126,49,175,21,34,43,63,201,37,59,249,161,167,203,109,141,22,227,180,24,118,136,
+213,30,165,196,7,9,85,109,157,3,250,150,163,186,24,244,242,106,188,221,26,146,224,225,112,113,202,155,89,57,14,71,2,67,131,194,137,144,134,108,186,216,218,166,117,3,172,85,132,130,220,41,203,165,197,8,128,114,201,83,79,171,57,9,153,15,90,9,208,54,187,71,171,206,160,184,62,104,27,9,12,122,193,217,237,241,44,75,37,109,15,62,209,99,64,211,20,65,140,13,206,202,223,111,169,158,119,222,145,207,250,88,136,112,19,58,201,10,146,29,171,193,129,99,179,236,36,98,97,126,18,171,90,173,22,128,124,132,225,87,81,10,92,30,90,177,187,214,187,149,129,98,3,241,237,212,253,108,6,238,19,140,248,145,160,182,253,42,142,33,87,206,6,244,32,131,149,179,1,57,173,95,103,91,196,107,120,251,224,127,14,215,110,137,21,94,187,165,96,124,157,253,43,114,194,174,221,146,220,185,118,75,31,252,26,124,157,141,30,174,187,255,208,207,206,186,251,198,20,241,125,191,246,13,14,127,211,15,113,221,189,177,182,238,254,87,112,248,239,250,79,49,216,40,35,187,
+176,35,48,206,96,233,253,193,1,255,241,187,255,151,255,219,123,118,95,190,221,248,236,197,171,87,155,159,111,124,250,107,175,158,79,26,248,244,215,54,94,124,249,249,198,207,222,188,254,250,171,213,173,182,235,220,231,147,3,222,190,123,253,6,44,9,86,254,4,204,221,248,233,203,87,155,171,123,126,223,124,241,226,221,170,228,135,204,117,225,213,245,185,239,126,14,190,122,249,14,236,227,203,141,159,172,238,206,125,179,249,217,187,87,191,220,120,127,119,237,170,173,119,175,55,254,229,138,148,255,126,215,219,254,250,198,255,240,249,230,79,95,126,185,185,241,39,127,240,127,252,233,255,246,163,255,229,143,255,228,143,54,126,239,95,125,253,242,31,255,211,223,252,252,213,207,86,100,255,254,135,146,223,235,246,95,130,227,253,77,240,245,175,244,249,221,11,115,55,126,119,227,171,175,127,242,234,229,103,27,255,251,203,119,63,255,195,87,63,91,159,216,240,123,31,238,207,253,253,95,185,242,245,59,215,221,254,250,198,159,255,250,243,77,181,63,126,30,223,115,213,143,214,183,214,254,
+96,227,249,2,220,207,95,190,120,245,250,103,159,254,218,255,119,55,206,126,244,241,127,237,229,178,63,252,157,31,254,163,223,254,157,31,66,183,19,144,91,200,247,15,114,64,197,98,113,229,62,36,15,105,214,189,136,20,220,211,240,96,209,80,165,209,211,117,119,187,148,45,231,86,228,196,73,216,243,100,28,104,180,79,7,61,145,5,250,189,76,191,25,140,166,207,106,76,143,244,145,193,57,84,51,220,7,36,147,238,232,196,90,119,49,213,220,51,64,123,200,115,171,58,39,39,73,207,146,32,92,178,103,198,126,184,82,216,19,79,57,238,180,181,106,238,100,198,249,25,123,56,127,26,47,250,133,182,42,155,165,193,80,101,51,31,117,12,219,219,163,51,145,137,30,110,135,202,38,103,156,242,168,42,137,51,89,168,114,189,38,153,129,87,168,56,175,142,235,240,85,12,245,107,190,168,125,35,16,220,3,232,33,204,92,157,44,68,119,137,142,14,123,181,47,149,75,56,80,179,136,102,244,137,70,169,109,8,58,117,205,155,140,106,135,90,174,92,182,68,64,135,224,132,162,164,
+188,78,20,102,190,120,255,218,238,218,93,154,239,239,116,230,172,19,97,134,46,133,87,212,17,199,53,77,35,60,208,241,108,103,76,200,28,225,56,39,42,228,34,16,52,46,69,78,204,205,22,164,57,131,214,139,168,97,109,7,146,229,48,211,72,39,32,122,76,167,81,133,236,13,211,225,50,4,136,195,156,217,196,59,138,20,34,203,3,104,147,213,187,86,238,135,73,238,142,64,98,228,116,115,234,167,44,76,78,198,69,18,120,168,79,215,27,171,93,59,205,32,245,86,175,223,190,141,66,25,251,221,254,109,137,54,157,159,11,196,251,165,116,154,196,146,66,146,137,213,109,231,89,12,35,107,200,159,108,237,251,49,236,246,41,44,11,81,186,105,186,211,59,116,123,144,201,161,20,5,202,88,96,196,151,82,253,35,163,51,132,61,208,213,158,104,106,210,211,73,218,192,186,25,91,68,227,2,107,234,29,105,181,34,239,86,178,156,170,232,28,39,202,56,41,123,73,76,34,176,39,97,190,161,183,29,53,233,32,18,170,191,180,163,63,147,170,102,123,99,20,44,57,140,239,250,
+161,216,248,190,138,124,123,8,71,159,38,183,107,98,139,16,233,10,90,129,114,50,239,196,38,210,48,20,116,87,207,131,248,136,81,29,210,119,122,185,5,45,112,143,118,32,220,211,139,176,183,116,129,22,221,108,245,176,36,248,20,178,211,63,214,30,222,6,249,40,183,146,119,88,190,45,244,90,56,14,90,225,57,195,29,24,246,120,5,44,243,62,124,96,123,186,191,3,28,117,45,119,127,135,42,42,91,162,178,62,11,191,159,104,32,172,229,12,203,74,205,204,165,120,30,44,190,87,87,147,8,214,193,54,103,190,39,147,99,167,184,242,133,245,241,194,171,234,225,245,14,4,171,105,172,62,112,180,139,123,45,215,8,17,104,30,182,43,108,255,29,41,118,218,217,174,167,164,148,107,68,46,167,179,48,20,105,101,124,89,185,76,100,132,12,61,22,163,191,63,212,221,243,143,32,62,127,215,193,54,221,145,137,22,183,144,41,216,73,104,78,116,147,155,236,211,36,217,230,152,9,130,32,247,1,106,43,136,88,92,23,7,254,212,8,185,189,216,44,30,53,179,204,161,3,81,
+168,55,160,193,181,164,71,249,201,133,89,90,57,233,62,10,43,23,253,11,157,23,185,45,247,156,212,27,227,156,212,188,104,23,172,161,229,213,172,212,34,74,199,35,198,152,178,151,206,251,181,205,160,222,210,58,9,46,123,140,249,165,45,57,101,215,77,174,88,162,229,132,50,13,126,50,207,234,16,226,37,88,206,112,57,204,236,222,36,124,165,137,177,205,210,116,37,234,120,97,112,102,142,222,149,13,194,27,14,255,74,133,235,120,206,244,103,253,98,150,86,14,159,204,49,252,170,17,142,168,141,142,218,183,39,225,128,104,118,203,107,22,198,65,43,185,19,79,30,152,162,51,196,252,186,223,177,70,135,220,240,163,98,68,115,51,39,83,67,162,231,0,220,178,251,225,181,249,230,126,44,184,55,44,68,234,201,3,99,72,68,83,235,253,203,187,163,57,244,164,159,212,241,118,240,248,163,69,250,198,173,27,10,75,8,183,124,251,4,135,216,174,10,31,27,13,206,1,178,133,3,160,8,43,151,129,71,68,93,122,44,87,42,194,109,41,235,227,177,96,107,107,120,158,147,44,
+39,173,182,116,158,198,246,58,101,102,46,207,93,182,129,213,1,236,217,155,51,74,139,230,57,57,198,21,3,24,224,112,56,130,246,125,126,213,117,67,174,217,126,228,94,245,207,184,120,110,161,135,228,216,150,157,180,22,113,91,129,106,218,84,62,202,114,84,34,161,50,33,160,75,56,224,243,248,114,111,219,66,201,232,240,62,7,233,34,117,33,126,144,121,6,51,113,154,97,139,205,115,151,160,156,141,219,168,52,122,137,75,105,208,87,195,52,41,105,169,239,87,220,186,74,128,127,224,219,85,249,6,225,26,174,99,233,158,166,56,79,44,195,228,76,95,190,178,199,240,76,172,133,117,117,54,152,32,251,32,188,157,30,99,46,252,93,13,69,143,223,94,118,195,34,252,241,78,102,118,155,79,0,2,205,110,34,217,47,204,110,140,205,195,8,241,50,25,152,19,154,98,145,122,222,213,79,68,139,251,83,121,141,5,99,89,18,253,120,122,126,123,227,178,87,93,156,147,54,113,27,171,27,16,206,122,100,169,21,118,61,227,25,156,2,1,116,79,112,190,27,145,39,145,36,105,
+233,170,74,28,13,163,58,182,217,123,117,236,109,90,250,158,7,130,5,140,238,182,69,161,81,212,95,143,76,76,28,203,14,103,134,159,208,112,105,137,167,221,162,40,26,112,90,71,114,224,73,77,144,49,93,22,105,247,224,135,30,164,225,108,20,76,28,199,174,111,50,139,153,99,172,50,250,111,115,212,174,153,19,132,218,226,10,124,62,87,152,115,225,137,66,216,125,114,196,128,86,182,107,198,197,225,57,213,46,195,136,143,146,76,137,36,169,80,248,153,69,128,214,157,120,134,46,66,73,250,208,208,39,195,213,195,254,147,17,127,68,79,13,61,238,187,2,191,206,11,17,17,215,225,171,137,65,125,86,204,17,23,25,144,180,218,57,163,160,200,90,226,241,190,51,119,135,123,84,153,206,109,60,216,52,223,193,47,233,22,22,1,165,138,227,35,45,216,18,149,150,140,10,179,189,42,190,192,91,80,155,214,210,193,185,42,75,228,201,46,110,120,119,206,102,88,206,131,200,29,108,67,80,129,185,136,9,253,11,219,162,55,175,79,14,9,8,237,165,183,53,67,30,218,253,93,
+134,223,169,42,233,77,79,36,60,153,111,235,37,242,56,166,17,147,198,166,123,123,148,81,1,2,159,58,184,5,197,30,50,45,206,223,220,156,236,103,161,51,2,133,121,138,173,178,248,161,93,120,246,138,200,164,154,2,237,98,168,31,63,120,12,118,164,103,88,11,30,155,71,132,242,231,230,176,83,112,190,85,107,50,30,204,2,165,44,149,51,229,46,128,148,4,143,34,81,139,189,129,231,76,144,110,76,230,4,220,161,224,81,120,189,163,210,198,218,129,138,97,164,232,104,228,12,15,106,200,160,22,101,197,131,99,4,5,43,75,16,31,173,184,147,46,230,244,240,20,143,124,184,216,157,194,39,72,142,11,78,59,164,158,138,159,246,24,15,122,59,33,91,28,171,46,16,203,121,72,94,216,111,88,243,6,177,112,216,74,184,199,19,124,66,141,96,114,113,56,161,89,58,94,160,206,238,3,205,99,218,195,29,207,4,105,33,199,214,131,37,61,70,244,242,106,187,140,62,18,158,66,31,95,123,111,196,173,9,123,196,114,142,79,70,189,170,253,174,124,206,235,104,58,110,102,
+119,240,68,186,22,204,107,209,253,71,198,64,156,121,58,154,38,210,137,211,133,114,70,122,34,238,224,162,36,153,220,233,45,16,39,123,182,184,1,41,140,228,141,81,60,42,223,27,81,83,80,193,224,172,62,58,219,227,243,204,148,158,148,105,217,10,236,45,207,125,103,42,141,186,193,44,47,12,180,201,82,77,153,25,123,170,38,141,94,35,241,56,83,142,170,155,33,228,33,65,229,188,222,245,96,78,2,18,105,31,70,89,28,170,70,44,227,3,206,118,60,29,42,48,76,142,196,23,194,6,124,138,236,182,42,214,207,197,93,232,171,71,108,223,197,225,54,107,78,246,146,158,15,219,159,182,162,36,92,47,106,177,66,241,125,243,45,197,93,27,228,159,216,49,90,227,190,61,243,159,48,125,74,148,162,218,214,215,93,238,66,124,23,199,46,17,135,149,199,19,254,150,129,38,220,153,79,88,237,180,4,221,158,73,23,76,22,53,90,109,85,246,175,45,179,152,247,168,70,122,210,27,46,231,58,141,221,247,8,179,51,35,139,106,197,230,196,90,118,227,60,252,57,44,239,0,
+13,137,149,246,158,93,80,47,220,19,3,17,113,207,24,177,29,60,11,242,92,49,120,58,190,213,153,79,239,138,77,94,92,31,19,118,85,173,109,26,188,87,187,179,75,29,36,181,182,185,143,93,164,25,115,222,66,72,1,204,165,124,120,162,65,136,186,227,193,193,129,125,254,180,16,240,219,105,164,149,58,29,221,177,208,238,92,235,46,143,85,92,18,111,140,72,149,55,253,136,135,244,35,234,232,29,186,50,167,140,174,144,61,85,216,160,79,166,133,132,218,205,241,57,90,134,103,7,134,83,202,114,78,117,137,217,205,29,209,40,239,9,0,110,251,238,2,170,238,117,11,176,232,195,196,4,157,60,54,143,137,8,132,10,99,209,221,161,242,91,253,248,169,220,35,145,158,87,196,122,188,74,80,89,78,152,164,201,94,94,133,118,28,46,184,187,216,179,35,235,17,75,123,174,8,53,43,25,60,167,27,133,6,31,33,163,150,158,201,167,245,243,139,101,250,209,137,100,242,56,174,121,70,129,171,244,26,74,202,73,210,157,71,216,210,11,200,228,70,20,153,98,133,88,85,215,
+20,123,216,162,38,7,209,81,49,218,170,148,121,41,5,170,130,234,211,230,247,189,202,125,124,191,47,40,187,93,23,243,167,238,52,176,219,153,64,15,88,247,236,209,78,175,75,228,12,80,113,166,117,199,129,244,88,116,129,45,63,201,37,153,240,57,109,43,66,42,87,57,102,187,230,29,171,125,176,191,64,85,43,35,217,109,89,219,170,28,223,45,143,73,166,37,238,134,113,124,22,188,235,157,197,56,162,7,148,183,45,68,224,102,75,61,27,145,100,225,211,70,11,188,17,222,154,122,139,184,25,154,115,167,150,63,32,6,198,197,236,24,159,175,131,2,52,65,118,114,87,56,111,20,219,189,145,249,138,92,50,66,221,136,228,118,28,222,83,115,180,180,107,106,225,42,89,221,221,168,168,225,179,78,26,29,84,187,200,207,194,109,221,185,41,121,38,175,171,42,212,226,82,138,157,102,123,149,71,124,48,248,80,242,112,160,189,4,64,112,92,86,240,60,188,79,150,117,145,76,199,214,144,95,135,122,44,242,78,0,179,250,14,106,8,219,186,40,127,206,63,211,230,185,18,215,
+98,233,85,163,243,147,147,86,169,64,129,227,178,214,131,147,199,221,92,71,191,253,128,44,185,101,183,56,227,156,153,194,179,108,152,244,208,90,101,226,40,188,45,60,139,119,240,144,46,95,35,77,9,56,15,79,106,179,99,133,93,198,56,95,31,31,233,22,211,157,131,59,243,67,118,70,63,118,140,231,151,249,142,123,220,220,213,168,146,173,59,24,134,154,108,243,202,211,109,209,46,54,224,111,203,89,17,24,209,104,213,104,119,99,149,166,109,71,84,79,177,98,23,173,32,191,5,151,148,218,89,177,205,236,33,116,247,75,126,60,100,68,227,218,15,180,242,57,58,59,169,245,251,184,243,125,148,178,125,225,222,51,149,10,19,49,113,206,8,96,47,115,141,65,139,170,75,53,97,188,58,187,197,196,217,148,132,177,229,38,126,232,115,5,177,241,2,130,78,20,163,205,22,3,24,26,92,38,182,128,222,174,204,21,187,31,63,68,28,179,204,9,15,47,94,26,203,99,49,169,107,86,206,224,180,107,16,34,114,30,234,88,76,129,233,92,180,24,155,126,34,223,27,56,64,239,
+54,126,186,103,215,205,118,47,160,120,244,165,210,113,139,166,57,25,63,205,14,136,77,213,41,123,27,194,47,30,121,207,140,68,223,132,30,114,132,51,68,82,166,190,175,14,145,133,215,114,43,177,161,113,37,229,19,70,243,38,211,106,16,178,129,179,216,220,231,112,251,74,137,61,10,111,175,113,56,90,8,136,211,204,94,253,106,4,236,160,170,188,157,134,167,171,122,76,151,10,158,190,208,227,102,237,170,17,136,54,147,51,109,183,102,219,70,132,175,112,189,40,62,154,33,123,44,6,69,6,134,61,221,172,208,35,195,164,49,254,221,230,233,208,212,61,36,87,176,218,7,3,47,219,95,34,75,94,68,12,38,160,102,56,87,188,237,44,179,224,161,96,67,243,6,226,194,94,46,62,9,204,222,227,12,213,26,138,41,88,66,18,162,44,139,110,203,162,71,178,64,217,201,40,57,2,174,110,226,100,33,48,199,232,106,236,83,148,92,16,162,79,134,230,41,180,159,124,220,131,131,198,136,140,237,208,240,15,198,102,157,119,243,4,194,108,28,14,229,17,234,200,51,82,234,241,
+241,178,209,28,34,131,182,162,8,191,111,175,70,186,23,134,110,246,122,50,208,166,7,170,238,161,243,84,218,223,190,136,159,81,122,71,7,219,173,243,44,106,225,66,160,143,79,164,26,61,59,30,161,5,164,184,161,2,135,220,187,38,149,243,36,242,69,130,164,229,9,76,220,166,174,242,116,93,91,106,118,132,69,229,241,254,112,126,248,208,101,98,230,199,151,179,3,147,58,84,157,54,195,133,120,245,98,193,241,164,89,44,251,77,202,157,223,219,126,194,63,208,51,93,205,133,39,66,20,158,221,112,79,104,61,34,201,171,194,207,74,170,76,74,134,226,28,120,103,42,222,62,124,116,143,220,122,12,35,76,238,219,106,249,162,48,134,100,131,115,187,122,116,86,31,196,35,100,27,187,87,42,72,246,237,214,253,167,193,21,138,80,13,250,31,167,237,24,178,83,229,217,142,212,219,203,222,232,140,156,31,4,151,252,26,99,156,180,113,67,90,114,6,35,234,250,130,8,213,81,5,95,211,47,242,164,153,56,119,207,65,72,239,120,57,147,171,26,63,12,223,54,239,224,77,207,
+158,166,12,57,211,181,210,221,254,153,58,38,97,33,237,0,67,144,56,45,201,51,39,119,196,7,168,125,60,198,102,231,114,99,115,56,107,155,135,156,93,25,195,223,119,203,240,169,178,8,182,159,233,221,68,165,189,172,189,79,215,31,63,230,47,46,239,183,89,147,36,250,209,149,77,30,212,106,68,203,124,192,162,157,163,241,254,27,165,122,75,197,218,95,214,180,61,219,84,112,137,20,95,48,247,234,30,81,27,35,219,241,116,103,254,39,118,234,238,176,71,152,119,33,58,151,15,230,238,94,241,211,117,53,146,156,228,163,164,195,52,12,202,93,198,60,252,43,254,109,216,149,76,10,39,149,107,65,107,154,93,52,104,92,116,223,35,243,160,45,169,212,149,251,10,19,155,113,203,106,136,142,137,196,167,51,109,87,187,139,185,107,186,219,60,215,229,41,230,210,23,222,82,36,170,134,184,251,130,84,226,121,119,128,187,195,108,23,177,115,92,15,153,121,53,231,49,41,188,115,225,241,31,62,133,10,143,38,142,36,63,42,48,134,179,199,133,194,64,200,36,91,226,163,48,71,
+167,245,63,182,206,150,59,176,226,140,48,189,32,18,152,119,60,252,144,192,103,137,107,154,211,105,177,193,123,2,18,72,68,206,105,96,138,17,20,30,151,19,109,121,32,15,97,153,145,165,2,11,163,75,133,189,135,6,15,184,245,116,10,129,182,157,117,152,224,61,234,188,251,12,206,104,200,152,152,238,233,241,81,152,137,156,26,47,208,247,211,189,216,214,196,167,126,152,93,4,85,187,225,106,94,14,236,235,173,148,137,209,111,141,10,0,48,37,221,167,168,183,139,60,177,134,203,153,139,17,56,204,253,44,159,184,55,102,64,152,32,187,207,175,50,49,119,207,101,133,77,141,70,244,144,28,62,129,209,101,217,197,52,148,182,197,220,75,45,222,104,66,88,51,249,81,132,75,176,149,132,249,227,182,34,230,94,80,233,195,112,215,111,183,234,208,144,212,72,209,15,35,166,9,48,138,73,113,166,176,65,53,224,94,0,246,70,161,190,204,131,205,150,139,249,7,194,153,123,75,170,236,183,120,218,9,186,232,153,237,84,36,248,35,163,184,131,216,46,78,53,67,66,142,2,142,
+98,255,33,41,106,123,14,57,182,138,230,193,99,165,160,77,185,179,144,212,120,130,224,31,208,5,117,30,56,128,221,48,196,56,153,39,29,120,137,89,105,231,164,155,188,11,234,121,217,23,134,76,47,98,196,237,152,27,189,199,213,113,162,30,8,200,216,10,28,100,164,250,214,18,64,44,80,246,1,220,73,200,19,203,170,232,17,30,71,69,51,247,204,227,246,190,36,102,23,95,143,19,139,27,69,92,123,125,13,207,155,76,141,233,20,252,199,19,46,7,110,55,103,79,208,108,202,143,56,209,173,233,121,222,58,224,22,4,253,62,57,139,103,39,99,140,130,57,74,212,8,240,53,50,2,39,108,214,173,167,157,123,30,25,26,233,143,225,70,255,142,102,118,176,68,15,218,188,34,234,54,157,62,72,76,18,87,15,99,40,75,46,41,231,227,190,7,77,26,45,139,168,142,240,236,203,199,110,193,205,236,115,112,23,24,64,94,86,41,102,189,27,55,241,156,52,26,232,174,240,35,201,124,251,177,86,222,153,173,90,111,54,5,20,78,116,122,126,96,25,168,228,133,120,156,78,
+158,136,208,67,194,29,112,96,41,13,228,188,44,94,214,34,204,219,69,67,177,43,234,133,10,99,218,147,226,112,176,203,173,205,14,51,29,28,236,153,140,217,113,47,28,220,142,98,196,75,218,192,235,222,50,217,4,126,171,32,81,88,44,61,184,129,21,11,24,197,234,21,151,76,202,115,141,85,128,220,253,192,55,136,178,121,108,30,79,120,176,222,105,13,84,198,206,81,120,177,227,209,229,224,139,197,163,6,184,69,34,248,115,138,85,2,242,125,60,47,236,131,10,186,91,141,139,15,162,98,60,174,186,44,26,160,174,201,0,185,188,95,58,163,112,104,37,223,183,10,57,209,157,237,241,141,249,22,148,207,109,120,107,194,3,118,195,120,137,242,206,49,201,51,133,225,29,14,219,227,174,148,80,87,226,199,1,9,211,26,52,83,133,146,91,174,56,234,134,57,84,110,65,103,39,244,56,56,59,22,94,59,246,168,219,232,34,46,185,188,83,245,107,185,154,254,220,126,237,62,181,53,170,22,20,75,203,165,199,239,178,238,26,98,176,232,226,148,251,97,131,201,62,103,31,30,
+152,115,249,206,241,49,66,21,167,47,89,215,103,97,54,192,177,245,183,82,242,168,24,218,179,251,35,219,174,232,119,14,108,5,127,253,232,245,198,215,95,126,190,249,230,237,187,213,26,234,207,95,255,213,250,156,212,191,122,253,230,47,223,254,96,227,213,230,187,141,175,223,110,108,254,245,139,47,86,171,145,159,189,254,242,221,230,151,223,95,58,5,127,128,149,255,206,90,232,122,217,242,163,63,255,245,141,15,171,139,63,254,193,106,221,240,183,126,248,59,235,196,63,253,237,31,127,252,97,141,239,143,127,244,71,255,118,85,248,79,94,252,100,243,213,250,253,231,191,248,244,47,86,127,126,184,126,252,179,205,119,207,47,63,122,247,233,95,124,244,233,175,61,167,63,253,181,143,63,254,228,79,54,127,250,238,223,191,126,251,159,62,250,157,31,108,252,147,127,250,241,39,63,122,253,213,55,143,255,248,159,125,252,247,244,241,71,159,191,124,247,103,239,222,188,252,242,103,235,150,223,109,254,245,123,218,62,52,245,219,96,229,127,246,91,255,21,109,253,233,87,239,94,190,254,114,
+93,251,245,119,210,127,135,218,117,177,95,33,247,31,255,240,119,190,237,227,159,252,22,152,241,63,126,219,201,31,253,187,63,252,244,47,214,108,252,222,82,231,198,191,222,124,1,138,107,213,203,247,215,123,127,252,205,18,245,219,231,177,124,88,55,254,241,198,219,205,95,108,190,121,241,234,249,24,93,80,166,47,94,189,219,92,13,127,227,121,137,249,229,138,180,149,64,215,53,126,176,177,26,219,243,122,250,119,40,88,157,163,251,213,155,215,159,127,253,217,230,122,233,27,212,132,207,55,55,254,234,231,47,63,251,249,55,7,236,190,220,252,124,227,167,175,223,124,177,250,177,214,161,149,214,124,5,42,200,171,215,175,255,242,237,198,171,151,127,185,249,125,37,121,183,9,190,126,241,110,115,227,247,62,123,245,226,237,219,141,31,253,254,55,171,212,171,101,233,239,233,206,119,23,132,63,232,201,247,213,228,159,127,183,192,119,132,252,65,198,223,43,240,94,114,223,17,220,63,255,135,22,168,127,149,204,247,47,190,179,252,253,43,4,255,222,143,126,255,211,127,180,241,249,171,159,
+253,224,249,224,226,119,27,159,253,252,197,155,141,79,127,253,221,203,119,175,54,63,254,213,85,238,63,123,249,55,155,27,111,255,102,227,211,127,241,220,236,167,191,251,187,235,134,254,211,235,215,95,124,244,15,218,205,106,47,0,212,181,127,251,242,203,85,253,143,222,254,205,119,86,220,223,191,251,15,155,159,189,251,213,23,63,90,145,241,209,154,152,239,241,229,91,126,126,242,255,194,234,190,215,228,51,243,63,249,175,176,175,239,213,122,47,149,191,135,138,255,22,107,250,7,246,11,54,126,244,140,113,47,126,249,131,247,155,74,127,185,185,249,213,234,156,233,159,253,28,148,212,235,175,65,125,6,237,227,39,155,239,254,106,115,243,203,239,31,42,253,108,26,223,218,192,251,179,164,127,115,227,223,189,126,183,249,246,119,159,149,237,211,191,248,241,198,79,191,254,242,179,103,203,250,43,80,51,86,106,189,106,240,213,203,119,207,134,248,226,205,207,190,254,98,133,163,31,206,173,126,9,226,234,155,47,95,172,106,188,120,245,242,111,94,124,99,148,43,222,189,253,228,251,138,254,
+188,85,245,203,47,223,253,124,243,221,203,207,54,190,216,252,226,39,32,28,252,226,197,155,151,47,126,2,26,219,106,87,9,132,236,181,49,130,208,190,122,254,252,253,150,216,251,194,111,55,62,250,225,170,145,151,32,238,255,245,170,151,117,246,199,207,99,249,225,183,71,121,255,79,159,108,252,199,23,175,190,222,92,21,89,159,222,253,158,123,255,246,197,151,191,252,112,158,247,207,95,252,2,212,220,215,95,172,126,188,121,118,13,224,56,190,94,13,243,23,171,202,159,108,252,209,39,63,251,100,117,100,247,250,121,85,224,207,255,243,167,191,251,233,239,126,107,163,255,249,123,246,10,82,182,78,110,108,174,184,2,82,255,147,95,174,70,244,230,7,32,224,128,207,47,222,254,125,173,173,181,226,63,127,48,108,176,149,159,188,126,253,234,239,156,53,14,74,2,36,238,237,51,107,193,167,181,146,189,151,225,123,85,248,32,147,175,191,92,131,218,179,108,126,186,218,167,3,81,240,243,77,240,225,217,23,174,234,127,241,226,229,151,223,18,178,230,8,168,46,47,86,2,251,87,155,
+239,254,240,197,187,23,63,126,86,152,181,22,175,159,191,216,124,247,243,215,159,131,82,253,131,87,32,38,255,242,171,205,103,114,158,91,121,11,170,198,230,198,87,32,202,128,253,174,119,9,191,122,253,234,151,95,188,126,243,21,8,181,107,105,124,242,223,109,215,241,191,184,21,247,97,127,112,99,227,197,183,149,127,227,111,193,135,15,80,243,195,31,108,128,127,127,235,135,207,63,190,131,45,223,74,248,89,169,191,95,249,15,62,255,252,163,85,238,7,251,93,215,254,228,95,175,96,13,204,248,232,227,143,255,14,169,191,241,183,207,229,191,195,87,16,25,254,108,165,133,171,252,239,109,61,174,58,248,222,230,225,111,252,237,191,127,243,250,139,175,222,253,233,191,249,232,163,53,73,31,127,211,216,55,66,251,78,135,127,23,58,254,231,205,207,94,128,218,184,118,113,63,221,92,233,250,230,74,219,158,109,14,116,180,96,84,244,102,243,255,250,26,212,221,87,31,224,229,131,78,189,254,10,4,128,119,160,97,190,6,75,190,122,253,226,243,183,223,186,203,111,245,236,211,223,88,
+251,165,117,217,223,251,189,79,255,197,143,159,139,189,31,234,55,26,245,77,129,79,255,239,245,235,247,196,255,255,10,242,173,130,172,216,180,230,223,119,180,99,197,223,15,130,0,229,240,246,217,157,252,183,41,12,216,46,200,246,85,107,127,191,162,172,240,243,119,64,19,255,236,179,77,16,99,192,49,173,100,246,102,243,255,4,57,240,157,203,16,222,171,212,74,32,223,17,255,55,218,242,161,247,95,188,124,243,110,229,129,158,1,109,99,53,166,117,187,63,254,46,137,223,20,250,197,235,151,159,175,11,253,135,231,238,190,41,4,246,243,1,121,254,252,215,127,243,91,210,126,188,214,94,176,238,171,95,110,188,0,137,124,177,246,92,207,49,223,230,219,103,165,248,211,127,179,241,147,175,223,189,91,57,165,55,171,128,239,229,43,48,154,1,249,4,82,186,249,158,151,171,42,171,65,126,211,210,203,47,127,241,250,213,47,64,157,7,253,226,243,152,87,42,250,217,235,55,171,239,41,62,76,36,86,21,86,65,232,219,159,175,121,244,203,141,175,54,191,252,124,149,254,208,232,218,
+66,222,99,235,71,207,150,242,197,139,15,205,111,108,174,188,203,215,95,125,254,226,185,143,207,87,230,1,18,254,103,255,235,159,60,167,127,242,226,237,230,199,223,136,97,227,139,175,193,64,236,205,38,104,177,95,62,59,234,55,95,111,130,131,255,0,220,96,203,47,158,11,110,126,254,141,75,248,195,205,159,190,248,250,213,187,247,18,90,69,179,43,191,189,30,236,234,43,148,183,223,24,221,123,51,222,124,223,214,39,27,127,252,211,141,63,122,243,230,245,155,181,7,253,232,217,13,129,210,89,63,190,31,254,199,171,46,215,244,172,189,220,251,198,126,176,241,249,203,183,96,204,249,75,48,134,94,181,1,14,246,167,207,223,172,60,119,11,214,5,221,14,88,97,173,82,171,218,32,143,94,188,122,187,249,131,141,215,171,171,49,254,234,37,8,79,32,155,191,6,53,251,23,155,160,40,214,148,190,103,194,138,208,255,135,154,247,232,113,168,107,210,195,254,138,161,133,160,133,97,24,3,91,182,150,134,252,19,188,243,102,4,123,12,8,16,70,130,199,107,227,50,179,153,115,206,
+108,230,156,201,102,38,155,57,135,102,206,57,231,28,221,239,251,205,72,3,143,12,216,75,239,200,58,247,156,115,239,169,170,167,158,7,172,203,223,239,191,132,244,223,254,187,255,245,127,255,155,191,253,47,255,88,231,31,202,227,47,85,255,15,255,104,221,63,221,246,199,202,127,84,222,191,253,211,63,127,78,251,143,219,254,251,191,253,155,63,31,245,111,255,253,63,92,247,111,254,209,19,253,221,31,214,223,178,253,247,59,255,195,164,63,206,253,31,14,248,127,250,179,10,255,135,127,255,119,191,212,232,239,227,243,15,255,253,253,140,127,251,119,127,134,234,223,7,242,127,245,23,218,246,15,88,251,231,45,253,235,127,243,183,255,203,223,252,187,127,8,206,223,161,63,67,246,119,244,31,197,233,127,74,187,191,68,246,239,29,255,31,127,81,45,127,28,205,31,243,255,238,207,19,249,207,132,222,159,4,238,47,14,253,135,80,248,207,70,193,95,238,240,159,156,237,255,143,161,248,127,252,67,241,252,145,67,127,243,79,145,248,15,235,255,11,36,254,207,34,233,191,253,223,254,197,
+31,214,127,140,97,255,73,207,252,35,160,253,235,127,246,175,255,30,43,254,220,237,175,255,249,95,255,207,127,253,139,185,255,236,191,248,45,167,255,195,223,253,5,133,255,197,95,255,159,127,12,254,63,215,234,127,218,29,244,87,255,234,159,255,213,191,252,175,193,144,52,96,254,71,221,65,8,206,146,243,78,82,202,43,158,175,29,0,89,177,156,150,74,147,187,65,114,172,28,218,27,239,233,160,155,114,238,165,208,71,117,130,16,161,226,107,10,138,67,97,190,222,122,179,254,248,161,91,99,81,148,79,111,214,92,242,241,249,241,209,214,212,106,230,242,124,101,222,197,238,145,194,193,220,203,170,163,110,117,98,181,78,166,23,96,57,234,244,254,156,181,206,41,54,87,199,228,54,185,212,80,63,100,187,178,51,210,117,203,231,58,141,199,158,71,59,113,247,92,59,167,187,59,144,109,197,154,47,4,64,218,165,59,59,103,8,21,209,200,63,241,203,33,33,199,20,215,155,92,52,243,202,157,168,16,74,142,93,155,29,10,93,222,3,131,129,17,42,47,217,192,179,47,116,233,154,
+127,188,83,90,119,165,229,250,0,72,122,130,177,92,206,248,104,161,207,250,156,28,109,134,117,18,30,185,43,64,23,21,85,14,193,77,114,190,198,86,198,13,188,23,92,102,222,149,119,255,203,150,122,165,108,47,238,121,118,2,97,186,205,228,215,25,9,14,176,160,20,214,184,126,127,143,27,186,112,54,54,135,88,6,225,68,29,233,235,24,92,160,46,160,216,200,110,227,35,1,187,158,122,143,63,106,81,109,246,193,10,45,56,168,234,102,79,174,197,141,33,47,21,7,106,211,220,18,8,183,71,164,80,41,27,168,98,165,246,59,18,80,97,111,11,71,10,64,212,248,119,83,244,1,53,32,144,95,83,7,72,176,75,200,55,41,220,106,242,60,203,235,89,120,60,61,83,63,5,192,204,158,1,230,34,39,91,247,109,197,0,247,250,36,198,38,106,86,64,142,210,85,253,144,192,10,8,166,245,36,7,68,211,83,108,139,94,141,83,4,39,152,67,114,80,7,30,1,233,144,18,19,105,115,62,17,27,36,210,132,77,208,146,90,220,127,44,169,99,43,149,222,41,171,21,69,
+46,69,193,242,213,229,97,131,227,123,69,159,1,148,188,51,110,135,97,220,6,227,244,42,203,149,90,223,76,6,102,185,39,205,99,62,27,216,170,5,46,90,57,135,4,29,34,73,215,240,130,239,43,30,131,157,44,231,246,5,224,195,160,4,151,65,86,129,81,69,98,231,128,243,233,61,206,172,210,116,18,52,120,39,151,146,14,191,10,170,41,229,91,172,224,247,83,103,146,55,28,241,155,73,10,147,8,85,253,108,127,7,120,206,79,241,143,149,67,141,44,41,55,4,39,29,67,209,4,36,148,95,201,148,27,239,207,122,250,84,232,148,125,253,187,79,247,115,179,169,115,83,25,17,214,133,150,48,80,8,111,242,37,167,149,222,248,253,49,5,72,99,242,69,160,100,201,2,159,194,81,232,211,65,126,43,186,32,74,132,75,241,163,194,5,24,186,116,131,52,162,237,140,243,237,145,113,51,229,93,200,153,194,73,197,117,175,142,168,168,251,22,153,65,109,86,2,159,148,102,31,169,100,197,20,72,3,11,79,187,136,161,230,242,170,231,37,116,154,94,150,86,49,138,208,215,
+62,218,162,159,107,68,63,221,227,174,37,19,118,59,103,13,232,151,128,62,205,56,119,92,36,14,185,183,64,10,154,161,100,22,56,216,132,72,202,225,6,30,101,169,1,215,129,85,121,31,96,248,123,251,235,50,225,250,207,175,246,178,253,166,204,45,175,81,57,129,77,187,143,207,52,221,186,205,148,54,235,12,235,42,83,218,75,27,99,100,47,172,219,63,64,138,230,216,34,57,15,250,153,103,189,69,154,127,205,164,44,235,88,181,168,28,63,233,66,124,200,9,215,147,137,213,89,65,159,208,124,203,99,182,47,122,227,107,122,194,185,60,94,177,129,178,49,96,241,198,5,139,23,89,228,5,232,228,104,191,178,52,92,143,22,34,75,60,35,188,151,39,187,227,219,63,239,181,230,93,183,218,121,26,81,239,99,0,170,114,50,229,45,44,83,220,223,149,28,77,46,180,40,120,76,110,241,86,215,251,25,175,2,248,16,205,13,69,140,58,53,114,111,253,72,5,131,118,194,208,103,114,126,148,161,29,163,231,51,248,237,112,38,14,245,62,238,14,21,87,12,203,3,171,250,208,
+59,68,46,76,37,176,86,212,16,17,173,121,233,125,143,87,173,151,237,228,124,137,43,131,199,22,241,70,228,77,231,1,172,156,159,29,43,63,223,214,145,1,155,112,216,189,154,230,88,103,141,91,104,154,117,50,3,118,25,119,74,43,22,222,152,118,106,139,245,160,224,244,185,143,220,30,4,224,218,41,121,179,55,96,109,232,83,76,76,231,241,157,93,39,217,103,133,92,220,150,32,143,249,228,36,66,185,36,251,53,20,2,183,112,57,55,39,180,160,170,214,201,60,126,139,134,122,111,104,73,214,92,116,193,140,142,102,165,186,170,32,92,82,21,217,247,149,239,139,44,165,207,117,44,143,80,128,67,145,194,184,231,40,148,78,40,169,223,126,193,38,239,23,126,197,253,52,167,57,32,112,119,163,202,129,167,223,18,201,136,68,34,45,122,175,68,74,202,94,114,177,41,100,223,212,146,250,105,217,119,45,176,127,179,51,62,51,89,158,79,248,77,28,169,116,193,53,155,168,26,250,108,183,12,37,110,104,58,47,108,188,49,194,61,22,35,9,183,76,3,201,168,98,78,0,138,
+155,79,233,149,244,53,154,179,104,169,23,8,28,30,162,131,230,212,160,175,169,234,149,65,174,98,148,160,189,152,166,207,36,181,64,247,23,217,139,216,80,53,76,161,104,21,10,138,172,9,161,51,204,21,25,175,229,9,89,39,82,20,81,78,146,147,170,40,201,195,98,91,5,169,59,158,120,117,201,151,144,52,52,103,155,129,36,21,66,82,89,175,136,205,26,118,38,97,126,253,209,6,101,76,85,86,138,1,11,154,144,88,58,69,233,156,53,226,140,19,236,190,41,43,173,160,249,87,195,91,67,236,171,100,253,66,41,127,184,219,176,183,9,97,10,133,154,241,83,162,197,24,36,245,91,70,69,202,200,246,225,5,159,157,209,96,151,11,96,20,198,161,113,75,90,87,100,51,139,133,80,235,65,247,211,89,143,33,116,212,226,149,136,26,93,220,155,147,57,112,126,180,111,220,95,11,231,99,155,110,143,160,5,135,246,131,175,102,73,89,97,110,160,214,163,87,204,217,47,173,132,173,187,249,64,177,148,196,99,32,113,130,224,11,47,251,109,195,144,131,2,204,80,28,1,81,
+95,11,97,204,222,142,100,199,50,121,155,205,233,233,49,83,170,202,222,12,61,28,115,26,143,148,106,214,173,156,84,232,242,178,10,7,17,158,105,89,77,210,28,201,49,122,172,15,87,135,106,67,186,68,104,91,164,138,23,153,90,208,79,97,10,239,71,23,219,171,77,23,30,93,193,197,18,146,88,91,133,178,148,188,252,80,20,76,233,85,154,56,148,156,80,229,22,82,166,110,219,183,144,195,157,148,7,141,168,246,198,86,97,179,146,30,90,196,157,99,199,151,218,62,95,239,151,42,103,149,105,49,100,166,166,205,124,21,238,76,49,36,55,140,113,101,63,86,31,134,153,203,161,58,40,46,106,44,42,219,106,19,161,35,102,189,70,75,254,100,222,244,83,41,126,10,3,143,136,199,242,209,25,211,134,42,218,15,252,161,21,17,177,181,49,66,85,53,211,198,59,178,123,93,4,67,238,40,216,184,46,132,208,26,215,116,144,62,36,89,239,69,163,187,148,220,223,130,55,152,185,130,177,53,211,99,224,42,6,251,185,217,199,9,109,86,53,67,79,143,49,5,166,184,161,24,
+91,147,215,164,255,125,95,212,110,124,154,126,57,197,91,151,66,175,177,91,232,208,217,35,209,15,171,91,160,224,136,174,67,146,12,196,13,216,128,202,150,253,126,104,4,208,123,168,110,211,135,88,244,75,199,198,174,192,177,56,11,23,134,107,194,140,163,24,150,109,79,176,94,236,45,231,254,133,150,109,175,173,2,131,83,89,29,207,0,191,189,211,89,151,238,4,62,191,48,78,9,13,191,126,26,200,164,204,144,183,211,20,20,87,251,222,69,216,220,132,46,15,233,194,220,67,248,248,88,111,56,98,64,41,129,178,127,138,168,207,118,50,8,84,230,121,182,37,81,242,144,232,85,43,104,89,249,140,105,134,147,100,143,85,218,135,157,249,203,82,213,24,161,36,198,133,3,111,55,222,100,188,152,115,125,17,1,147,5,43,26,26,36,186,175,154,21,107,196,237,112,47,69,155,98,46,124,17,194,165,156,242,99,113,194,67,16,128,118,10,245,17,105,108,32,135,35,33,229,197,187,251,91,16,111,62,207,36,93,207,43,127,120,232,250,225,248,160,120,22,67,137,229,143,66,80,
+231,83,117,94,31,171,106,196,113,104,71,28,23,190,178,215,81,109,246,66,29,111,28,126,146,144,91,251,85,110,141,26,246,143,148,23,63,78,198,229,25,250,183,168,83,216,105,59,133,60,165,113,121,149,22,238,37,251,162,195,196,67,223,62,162,132,201,160,186,235,141,69,50,65,171,5,64,69,0,16,176,125,165,53,201,61,151,215,8,237,8,1,21,202,103,54,216,133,67,101,27,249,39,190,123,252,125,60,197,127,48,85,31,168,200,96,236,89,243,214,62,197,42,59,148,100,7,62,30,122,208,160,227,233,129,115,224,18,178,151,228,246,206,8,22,203,70,100,41,51,154,127,23,4,106,42,104,122,91,27,166,120,172,45,33,85,128,107,135,121,2,201,79,185,144,210,85,108,78,99,15,195,207,201,42,31,70,183,219,62,39,109,245,67,126,145,13,238,126,227,21,224,163,249,31,75,139,198,180,170,174,78,150,169,102,120,243,24,187,18,107,65,84,32,249,94,148,176,225,90,168,96,67,134,69,248,123,180,196,168,45,146,30,34,146,139,100,247,68,171,230,109,164,217,177,73,
+177,91,102,155,102,191,173,6,52,225,150,212,148,216,30,233,52,65,131,231,49,247,39,6,253,80,15,251,153,182,221,49,205,116,63,40,21,242,92,214,180,141,195,182,241,167,249,62,78,174,51,188,50,241,101,58,35,22,151,180,218,83,149,153,164,252,150,158,41,81,185,79,230,110,126,95,158,221,211,186,75,115,128,143,125,173,73,185,136,103,222,43,74,67,171,130,133,21,126,49,64,80,203,229,186,11,14,217,162,121,230,160,170,218,219,134,120,105,249,27,144,154,247,90,177,235,148,35,116,38,122,128,215,176,46,159,83,16,2,127,36,227,101,222,203,195,62,221,17,7,21,49,63,102,136,28,206,252,12,158,117,169,230,239,222,246,206,216,189,244,14,91,216,156,200,215,101,185,108,132,13,167,254,216,63,43,173,243,251,68,240,22,212,164,205,116,160,74,199,122,157,184,117,97,9,9,135,92,80,64,158,134,57,198,83,125,239,243,192,120,111,51,244,73,159,202,69,94,253,184,226,240,231,246,187,156,12,191,11,225,26,186,119,116,46,159,237,37,87,142,69,106,76,201,213,5,
+242,39,221,28,199,163,7,94,13,51,247,58,22,250,72,73,204,70,21,100,122,142,245,139,233,100,109,51,235,199,99,239,38,8,103,44,5,3,236,243,196,164,118,172,181,1,251,38,67,96,221,130,94,201,162,217,62,179,130,220,129,56,108,251,128,250,142,34,98,124,244,212,202,162,84,242,145,80,103,177,178,108,216,169,53,233,197,34,180,248,169,130,242,185,6,4,64,143,179,202,203,157,210,209,166,178,201,113,170,140,226,29,212,63,131,104,215,66,236,171,174,134,135,142,132,14,248,117,193,154,169,183,250,66,112,242,144,122,145,175,87,200,154,189,126,90,238,163,65,92,187,121,45,236,180,214,82,132,212,46,165,251,180,131,194,51,221,197,159,133,65,30,58,130,159,126,163,55,66,235,4,47,252,209,116,140,147,59,83,129,245,128,203,24,233,229,179,131,84,161,134,73,255,116,108,204,61,186,148,251,8,106,121,102,72,211,85,171,197,64,13,49,126,169,191,60,115,238,5,12,154,120,173,146,74,115,43,146,104,10,50,225,80,6,141,58,197,10,154,198,248,187,35,27,4,131,
+83,117,180,65,3,104,30,125,150,69,163,30,16,122,53,135,89,181,220,225,34,83,164,208,89,91,181,230,26,249,180,235,27,107,14,60,165,138,48,230,15,109,216,117,206,185,70,235,148,126,37,221,162,49,115,178,44,26,121,33,59,75,175,173,3,118,167,89,23,49,86,247,9,203,158,135,205,122,191,83,122,85,172,221,144,227,33,46,48,136,183,135,226,82,49,77,121,127,190,49,190,61,231,66,43,126,122,155,115,141,194,118,70,16,178,65,51,48,124,199,83,104,244,170,158,49,251,32,90,31,213,89,91,70,234,65,229,203,68,99,209,104,13,248,52,239,15,21,126,112,74,207,45,87,120,169,48,37,115,171,78,143,175,25,113,49,255,169,113,65,218,172,217,162,86,233,196,144,209,100,105,233,107,152,178,24,72,220,89,225,32,79,247,246,89,236,89,19,204,112,22,64,163,65,45,26,249,107,46,46,49,172,248,23,252,94,52,111,124,123,76,231,91,96,193,238,202,196,112,113,218,223,152,81,129,156,61,108,94,74,75,73,13,12,182,27,67,159,172,80,66,136,249,136,255,4,
+227,75,70,88,136,113,228,89,159,117,179,134,59,96,55,134,73,82,187,103,117,82,76,2,108,144,18,95,66,150,44,205,149,62,169,81,88,125,59,59,100,190,162,106,44,243,85,92,189,72,165,210,26,246,135,255,249,12,20,159,165,101,11,122,253,66,41,241,249,239,204,249,80,180,100,71,11,237,178,58,97,205,219,82,167,221,211,240,123,215,8,187,126,253,212,85,204,136,55,248,199,70,137,55,71,111,48,28,104,89,254,163,232,251,239,255,219,255,230,159,255,203,191,250,87,96,136,10,120,253,223,222,8,65,84,138,145,66,13,24,251,125,36,172,6,197,194,130,123,65,45,138,224,236,125,52,27,48,1,21,134,238,249,13,223,85,241,212,246,204,88,94,214,176,248,106,201,81,230,126,150,244,182,156,152,71,220,48,67,231,96,205,213,57,129,28,165,4,47,116,167,5,76,242,145,124,167,50,204,225,34,160,149,6,108,70,167,126,204,63,59,116,153,5,199,52,28,221,141,227,145,243,142,3,111,221,18,4,202,158,102,191,22,100,31,121,77,146,54,245,38,178,194,103,130,77,
+158,30,104,40,54,165,217,180,223,176,30,101,226,225,112,52,69,82,32,128,234,161,139,233,208,220,213,163,138,211,226,25,91,101,251,250,64,137,36,117,164,163,96,32,24,97,151,120,241,59,136,204,125,126,128,80,3,153,130,83,204,228,133,134,211,212,206,66,96,157,107,77,252,225,197,14,95,107,75,103,252,78,79,172,204,22,98,237,19,214,183,19,96,229,234,209,133,15,60,170,155,28,255,4,240,155,17,11,127,149,226,34,150,91,10,194,170,189,23,86,232,87,212,165,132,108,161,82,129,218,51,79,248,65,214,95,133,178,60,184,105,80,133,240,214,154,99,95,60,29,61,72,84,67,252,230,250,135,192,223,230,210,36,62,4,234,40,65,64,36,32,156,172,226,149,108,249,159,98,82,24,6,83,190,53,252,124,197,144,5,146,224,215,60,1,80,200,49,68,184,38,5,155,87,55,22,138,34,172,50,93,80,168,5,40,205,228,2,39,228,252,69,62,223,72,230,44,216,93,28,185,137,70,136,25,83,183,146,104,218,137,100,13,223,49,124,166,9,17,139,111,213,118,85,153,223,
+139,59,233,151,132,22,106,125,252,40,7,166,134,115,207,115,6,131,24,244,117,0,141,157,120,174,166,102,7,42,27,177,120,23,13,19,230,24,160,89,150,156,114,95,3,89,252,62,142,129,245,102,195,46,227,42,20,105,199,141,150,227,10,0,123,41,72,185,56,192,202,34,49,63,112,223,41,80,238,197,244,230,141,157,55,116,64,37,180,89,212,211,249,130,71,125,96,154,88,252,157,72,85,124,3,5,65,15,34,16,29,33,212,229,161,54,131,53,232,207,221,162,133,224,230,248,44,76,141,47,177,228,240,78,223,9,12,72,76,166,84,197,225,155,37,59,35,106,14,92,119,60,242,65,156,193,154,86,16,228,108,53,161,173,212,143,13,39,166,170,181,253,104,229,89,119,249,215,65,59,254,138,160,150,96,190,33,87,206,93,80,31,158,239,6,119,114,215,56,244,171,21,43,246,80,17,1,9,56,158,141,97,57,190,204,10,209,83,123,76,63,36,170,216,170,239,87,111,19,97,48,206,85,84,12,137,65,75,148,204,191,47,164,250,46,117,185,194,39,213,217,204,115,8,81,98,
+164,208,88,146,144,70,105,248,30,252,27,29,1,139,126,139,25,113,132,64,94,220,49,163,244,228,113,220,9,169,85,171,134,210,56,8,45,16,9,121,190,50,143,19,87,24,58,121,101,121,69,128,228,4,235,253,54,25,202,201,113,24,40,101,31,202,237,20,59,64,86,149,152,3,112,203,92,76,226,158,75,30,186,30,132,206,192,113,246,127,154,231,158,243,136,56,207,223,6,107,213,221,167,254,208,142,78,229,153,68,93,107,179,117,143,165,184,189,245,66,146,249,22,85,238,13,217,145,113,188,20,138,147,101,214,120,47,130,20,5,87,173,244,236,164,67,18,20,100,101,69,237,43,183,163,176,73,221,133,69,131,174,86,22,175,103,49,40,1,214,231,183,57,171,134,39,94,69,90,220,30,47,80,250,154,47,44,94,134,224,189,213,29,17,42,139,174,108,96,92,104,214,195,22,180,188,15,102,183,226,53,63,218,203,84,243,8,191,101,130,88,101,74,39,111,99,18,69,23,25,192,201,135,237,134,232,178,36,246,150,195,74,245,86,205,255,164,10,146,68,24,221,71,28,165,169,
+249,113,224,176,230,7,57,4,232,214,52,88,169,192,39,162,20,244,154,211,177,96,74,232,64,232,83,94,245,222,211,156,234,218,204,160,23,148,1,32,35,65,93,236,35,66,211,72,81,111,200,64,186,107,171,54,46,197,59,255,252,212,173,114,171,166,228,209,184,27,91,155,253,154,64,24,118,199,253,64,247,125,137,145,197,159,31,133,104,78,68,240,134,93,27,104,171,179,18,152,167,79,28,1,59,205,64,1,40,128,130,78,118,33,17,32,199,24,164,169,199,158,111,102,147,159,219,76,28,244,43,53,191,222,159,10,121,83,203,244,197,114,107,223,55,50,166,10,241,117,210,162,15,41,104,123,85,231,178,110,238,224,187,96,57,93,47,233,136,206,172,225,120,190,205,208,164,6,9,26,56,67,82,243,100,45,189,62,192,113,98,102,251,151,61,69,10,33,70,73,156,197,225,22,183,243,72,160,36,242,17,204,38,128,192,130,0,64,134,39,142,127,96,146,226,49,88,192,219,60,204,98,223,156,26,71,100,50,108,243,117,104,86,128,92,59,203,166,103,165,113,127,128,163,239,33,
+5,242,66,223,238,180,221,25,75,134,163,202,202,209,99,73,25,179,242,163,38,166,120,31,177,239,54,25,69,223,20,143,205,231,183,191,178,245,152,15,84,24,240,243,157,113,15,185,183,250,18,173,63,85,63,249,31,220,215,32,214,51,16,158,228,92,195,191,112,79,74,226,55,167,10,89,237,151,96,168,192,4,32,1,75,188,207,44,132,28,201,116,156,169,154,56,2,31,194,118,121,64,13,187,78,142,82,76,166,73,213,215,53,213,107,251,206,52,105,150,72,175,45,23,1,91,1,164,55,158,19,4,146,212,120,90,126,22,46,100,189,168,76,29,175,169,121,93,20,208,141,239,4,12,40,195,226,145,73,225,100,227,134,134,45,136,196,136,87,55,191,69,191,132,120,42,216,199,210,127,148,30,198,204,222,75,22,92,52,184,57,214,50,136,93,98,162,207,205,54,73,72,28,198,51,40,90,116,71,138,110,227,230,232,28,99,181,98,28,181,111,205,166,142,128,64,9,144,43,168,157,4,67,97,140,142,117,46,16,61,119,102,222,66,247,234,93,155,49,106,218,200,66,16,123,127,
+165,100,160,181,39,228,40,17,44,192,86,231,211,69,100,128,235,3,228,106,244,31,3,21,112,169,67,182,178,97,152,203,59,127,121,108,77,218,156,0,18,41,63,4,23,49,208,2,57,188,139,118,171,34,104,219,16,88,187,218,123,161,77,246,78,180,104,252,133,186,184,161,68,55,108,157,92,63,31,151,200,175,223,58,247,19,12,48,192,224,180,45,178,31,104,13,105,224,111,109,48,243,185,244,144,11,130,195,143,80,176,78,7,51,137,73,163,171,189,11,7,92,209,238,7,161,163,6,18,26,0,154,205,121,188,117,224,97,209,63,32,37,2,29,245,112,120,67,55,93,68,244,83,185,10,2,233,89,216,39,114,77,40,159,215,222,231,207,251,72,84,191,240,198,163,73,50,31,21,131,215,106,132,68,85,51,175,213,148,203,141,102,180,205,63,118,83,228,102,230,129,101,240,147,30,237,147,117,65,30,47,25,228,131,134,187,231,232,49,104,124,132,127,14,227,158,117,211,26,163,169,135,115,180,77,53,92,41,242,250,41,92,207,196,75,58,145,215,121,151,157,238,158,56,54,187,
+99,42,88,51,28,55,249,155,168,57,157,129,22,208,214,249,217,190,229,139,179,88,238,24,63,26,96,22,135,17,62,64,72,130,179,72,125,5,40,189,190,11,118,255,124,178,71,177,82,170,34,242,34,52,156,69,204,131,24,29,201,233,149,34,129,93,40,135,136,248,85,193,13,153,192,70,41,60,197,101,52,112,72,125,111,234,185,146,0,166,239,93,13,198,193,89,52,108,123,168,37,144,228,40,254,81,88,212,243,136,5,90,79,244,77,168,171,61,236,80,168,179,52,94,2,83,208,207,16,50,61,43,161,177,62,166,82,94,199,17,172,124,61,69,181,142,63,190,128,24,109,153,15,178,86,134,34,120,237,17,79,55,162,237,133,38,118,5,97,174,25,150,153,160,65,14,231,30,154,192,3,211,23,63,118,225,126,23,156,195,85,114,118,8,238,53,31,4,64,12,251,6,86,204,206,0,14,128,190,100,66,225,70,45,242,29,96,128,10,141,173,198,141,95,80,253,69,66,49,149,121,113,77,37,123,211,106,173,72,155,254,211,71,234,93,165,147,57,83,110,181,28,204,78,240,0,
+48,33,99,181,98,211,47,206,189,71,231,237,151,211,112,213,250,69,67,16,15,120,145,211,11,28,122,124,49,90,76,130,245,97,119,52,13,231,34,189,122,155,65,202,96,59,63,217,111,144,69,137,213,93,46,189,214,49,75,47,250,111,110,165,97,158,148,15,202,80,125,226,48,81,142,8,108,126,50,144,64,32,243,1,40,89,207,78,208,34,254,68,92,246,5,169,99,45,209,67,40,69,168,12,176,119,203,240,27,208,36,93,30,88,77,80,199,139,173,52,160,65,79,59,129,200,140,240,236,180,14,70,242,122,246,205,20,27,87,252,110,63,208,185,190,107,34,254,197,229,98,117,41,61,197,80,237,51,50,171,126,131,155,59,136,24,223,110,131,38,115,34,172,227,80,134,204,39,254,227,207,179,58,74,1,184,167,79,96,201,207,188,1,157,64,23,86,204,238,229,23,12,233,43,203,215,131,154,69,208,30,173,243,82,59,181,42,57,233,62,217,244,206,136,224,174,111,99,185,213,71,43,172,22,132,83,71,11,164,192,195,72,125,188,144,234,96,3,95,227,166,67,192,96,37,61,
+133,245,61,134,100,215,14,128,12,9,25,130,159,9,47,159,174,229,196,195,53,5,205,158,243,236,56,143,231,53,26,202,251,149,118,199,139,134,144,90,72,41,253,228,117,30,152,200,79,209,243,3,32,204,103,128,223,193,170,8,129,79,166,192,48,99,61,25,137,67,176,214,190,203,33,191,181,141,62,217,37,240,45,235,41,133,126,225,192,67,219,210,163,62,205,141,26,28,154,211,231,59,74,3,162,160,115,148,252,225,169,187,47,215,134,154,95,209,77,136,107,80,14,244,71,70,235,12,15,209,191,136,190,89,96,42,225,247,208,141,44,102,122,69,244,235,40,180,24,238,99,242,237,165,206,215,134,252,241,10,152,47,213,128,189,186,219,212,175,249,46,234,162,31,114,3,30,101,101,149,109,127,95,70,252,93,28,61,117,84,164,103,196,229,65,96,46,66,80,134,90,12,118,97,10,68,62,36,153,24,3,200,134,129,33,150,208,192,217,201,93,119,133,106,46,216,183,33,230,179,170,145,5,178,111,137,69,40,249,219,58,33,180,130,253,212,42,35,219,28,87,36,16,248,112,46,
+76,243,129,222,214,118,12,213,132,89,68,169,173,22,160,205,184,94,127,178,114,99,130,123,241,127,12,181,32,11,88,147,3,192,12,183,18,107,81,131,3,14,97,15,118,13,74,182,93,82,168,251,38,217,137,121,123,55,47,179,11,141,161,238,14,38,121,82,246,55,249,248,192,134,95,249,112,111,47,64,49,197,236,153,240,190,165,150,221,118,73,176,239,19,3,128,161,47,63,244,162,180,82,169,190,219,37,216,60,60,203,116,223,229,236,110,118,60,57,116,11,30,10,7,230,154,115,82,19,49,117,118,81,11,99,49,249,117,129,203,102,14,121,33,91,174,81,118,190,101,237,243,78,250,176,7,223,174,16,104,78,8,118,200,132,1,7,228,59,247,4,127,154,238,81,145,51,113,148,157,9,233,45,29,23,93,107,153,75,25,99,68,56,206,5,95,121,44,17,14,146,142,137,8,31,64,252,130,22,105,192,151,175,66,246,86,86,83,55,84,244,121,179,130,93,45,144,76,214,221,49,28,109,16,95,33,93,220,138,45,69,48,248,40,132,207,73,238,140,64,249,114,68,102,131,55,
+79,65,254,106,115,26,239,101,233,83,96,254,0,41,166,100,167,212,219,214,246,250,234,247,237,130,198,72,186,169,60,194,246,69,141,4,156,21,4,151,251,3,113,40,129,13,107,34,193,1,110,3,33,13,62,240,120,0,199,171,132,179,137,169,125,224,152,251,101,80,120,203,231,66,11,83,89,61,137,194,168,241,152,210,2,58,200,147,205,71,95,166,71,179,249,216,213,7,172,136,96,141,143,222,15,50,168,189,151,87,219,13,6,209,125,1,194,226,141,87,237,203,128,223,38,155,220,174,12,98,143,59,139,34,145,240,177,212,140,241,154,219,15,63,15,0,115,74,192,215,17,103,35,28,163,69,194,186,4,24,11,86,74,192,4,85,102,183,235,228,24,47,235,26,181,199,170,66,245,150,20,192,16,62,12,166,242,88,64,61,217,35,186,79,148,177,11,243,37,105,174,237,152,128,18,188,97,222,121,245,228,249,40,175,58,81,7,205,89,82,107,159,217,130,10,120,250,166,118,208,143,242,32,145,254,190,50,197,14,83,26,50,45,33,136,76,175,27,193,41,3,6,25,0,149,251,
+174,29,112,209,115,77,160,213,57,194,205,220,140,88,15,58,38,230,252,53,80,101,67,58,128,152,108,74,187,138,236,228,161,92,7,82,186,231,7,244,212,134,109,47,200,42,101,23,65,182,23,77,71,194,127,10,83,231,241,57,29,139,143,129,199,7,191,246,241,179,255,232,143,77,209,144,83,224,2,103,114,204,145,172,175,18,228,45,122,238,150,175,95,64,120,191,248,77,233,160,217,93,171,202,119,41,138,106,64,31,80,129,154,19,10,8,122,186,168,232,95,43,242,141,203,133,100,28,211,98,183,62,201,248,147,173,42,208,22,36,79,170,181,5,43,54,237,169,103,192,238,66,152,141,100,24,134,27,126,213,29,32,87,150,156,6,240,8,170,224,251,67,6,68,2,198,48,8,88,255,90,105,233,226,159,214,237,36,251,252,29,135,146,125,232,96,23,186,217,84,64,176,71,96,189,5,95,4,189,111,192,151,6,50,48,45,217,247,231,136,102,214,2,230,240,38,189,163,93,75,35,199,162,194,12,212,142,186,225,48,3,238,47,202,121,87,94,180,118,45,119,225,93,37,160,69,
+101,43,57,176,156,26,62,239,118,217,156,48,224,101,16,56,141,165,201,253,35,107,180,90,56,165,128,153,219,176,236,58,45,20,174,159,136,126,148,197,82,161,135,221,122,103,190,98,127,193,228,63,54,201,33,47,53,210,75,211,208,232,169,20,35,214,62,226,9,50,207,111,39,210,109,136,23,232,101,47,90,45,239,48,187,172,107,110,175,42,129,163,82,1,113,216,16,40,195,188,205,11,141,179,116,167,99,139,216,41,125,133,128,68,102,66,165,41,27,155,108,159,233,18,245,118,202,15,14,152,114,130,106,31,150,69,17,243,224,2,106,207,238,54,80,125,168,148,113,86,234,68,96,203,227,100,125,154,100,109,65,42,147,216,94,131,14,185,252,40,4,252,238,10,153,7,193,160,144,23,244,175,188,205,78,160,91,39,153,131,223,56,88,95,67,85,250,235,120,111,182,54,12,28,74,5,136,119,0,209,34,106,74,118,121,20,131,96,245,223,198,237,214,120,242,188,51,117,24,118,190,215,192,210,183,62,120,181,32,3,215,172,239,241,87,186,102,161,219,184,98,186,45,255,227,139,
+32,59,180,172,150,54,20,61,152,52,230,235,237,170,160,132,24,158,8,31,238,229,108,236,141,176,136,223,136,205,197,211,34,169,210,237,200,67,160,222,217,128,40,85,94,148,138,213,243,48,239,28,244,65,156,229,41,176,164,128,242,69,240,2,125,184,143,131,216,124,124,29,85,114,244,187,126,54,25,7,133,102,235,129,139,180,92,248,14,65,71,106,134,42,55,80,243,201,54,4,187,222,212,221,12,18,110,109,68,241,173,215,160,13,192,96,7,210,204,176,73,207,39,141,13,239,112,93,183,159,8,194,77,116,139,20,214,202,115,229,73,154,52,0,80,241,204,86,172,136,66,18,140,249,98,220,65,150,5,202,228,243,213,161,102,150,112,171,251,62,99,67,140,153,179,111,183,85,212,223,136,211,9,179,208,25,21,39,50,160,188,56,139,35,238,34,108,134,243,192,143,163,174,235,65,85,28,89,192,189,88,231,145,230,193,5,216,248,209,248,91,34,243,96,102,132,13,179,94,191,53,143,221,28,41,255,18,229,59,184,112,228,119,104,201,143,17,165,86,17,72,152,120,159,115,137,
+46,194,44,60,113,19,83,31,83,208,66,119,58,244,82,29,84,156,98,25,148,115,150,104,38,190,108,131,204,0,152,28,206,18,61,244,192,103,81,24,12,158,171,192,233,193,32,72,62,221,3,219,226,213,175,72,5,240,84,155,206,89,193,55,50,8,52,214,81,74,62,73,14,142,122,247,114,92,15,170,231,252,229,94,90,90,119,238,53,153,247,85,108,194,162,39,5,18,248,138,205,73,108,94,148,140,211,91,29,218,221,4,71,69,210,133,108,217,88,32,108,138,35,47,130,75,120,128,15,94,3,199,174,108,36,3,49,254,17,157,53,16,96,176,144,106,93,201,213,99,29,67,253,55,95,129,102,255,149,57,92,188,175,210,251,9,189,156,125,191,121,176,118,222,19,43,129,235,238,130,46,102,31,63,158,74,56,23,182,79,8,143,228,185,248,131,78,107,241,152,160,89,42,189,145,160,123,161,222,139,81,95,145,122,156,106,89,253,18,140,223,169,126,128,83,107,42,94,133,212,118,229,76,220,22,165,65,24,112,174,135,78,85,165,133,204,178,11,62,247,104,128,30,176,242,82,
+145,47,63,237,47,22,105,17,70,45,201,33,126,4,163,78,64,16,88,115,171,63,100,92,18,232,192,24,221,201,85,76,16,52,114,246,143,9,232,90,115,219,187,227,204,74,156,38,11,190,122,85,17,28,236,154,66,201,125,45,216,222,121,1,232,20,151,246,11,198,159,213,189,23,243,14,235,221,83,178,47,17,197,123,235,219,54,198,55,57,98,251,120,143,157,161,32,26,41,103,107,48,196,69,175,73,45,71,183,160,121,222,143,182,246,39,101,88,36,2,242,119,237,87,245,175,200,226,213,23,193,167,123,249,62,79,216,97,43,34,9,84,188,139,9,12,230,226,40,32,200,128,17,245,216,230,14,10,47,133,120,79,117,208,210,71,30,114,172,54,244,212,11,113,239,39,106,117,148,125,62,215,126,173,18,222,203,227,27,43,102,181,155,152,7,35,91,210,216,160,149,213,51,137,174,240,11,253,123,115,209,206,196,135,66,157,200,135,93,236,129,165,230,55,7,9,114,29,118,231,42,85,198,45,232,55,253,18,253,78,215,80,168,213,13,97,62,112,50,113,148,148,180,66,167,192,
+49,1,68,139,83,202,29,193,217,249,149,9,79,38,89,13,106,154,130,202,64,56,86,33,1,98,29,2,41,84,34,186,63,97,169,99,23,204,162,185,108,173,248,96,252,5,100,63,182,86,211,64,50,169,218,214,53,50,197,23,101,20,61,157,217,90,104,244,63,182,107,245,180,196,154,248,103,183,99,235,53,76,180,200,218,53,22,255,105,161,129,229,186,123,84,247,91,183,217,45,187,13,155,164,217,252,103,162,144,188,248,48,99,206,141,81,17,140,223,189,45,38,200,0,254,179,0,247,5,32,61,233,228,27,186,227,29,18,143,32,212,217,78,56,94,194,238,176,50,129,72,74,33,79,225,4,100,151,206,125,197,14,95,160,56,255,100,14,161,74,35,125,171,51,132,219,161,53,152,22,197,219,133,228,212,192,171,233,231,126,81,164,166,95,9,242,28,233,56,144,76,223,228,218,78,241,156,130,146,210,14,75,217,242,119,247,61,116,122,61,189,29,10,183,53,71,53,93,75,204,205,247,145,57,130,187,29,111,108,192,56,94,201,62,125,146,24,96,93,142,202,79,136,193,31,103,
+28,90,195,248,148,67,2,221,152,78,135,10,220,164,7,10,51,121,80,196,173,149,123,221,96,135,217,183,47,97,34,24,128,47,105,177,80,190,217,146,241,66,216,209,47,156,226,98,111,236,7,133,158,157,106,188,234,226,42,29,184,177,137,64,30,28,108,0,194,53,52,69,120,79,76,9,48,91,161,121,223,167,34,35,39,59,40,114,54,108,97,1,140,152,67,226,166,71,226,176,22,244,135,69,107,48,242,245,108,243,206,87,62,112,161,148,192,174,42,174,47,200,84,4,95,144,162,233,13,154,88,3,103,246,182,139,105,73,86,123,253,140,179,141,152,35,19,230,98,252,160,113,189,176,12,231,97,33,127,130,7,240,170,220,46,229,86,81,60,116,96,250,146,170,6,101,118,18,195,20,71,214,39,240,149,127,161,88,104,62,204,209,113,233,102,162,183,197,47,208,38,84,118,12,43,73,191,74,85,152,36,89,184,97,225,219,34,85,225,37,253,241,235,52,76,244,189,63,238,218,177,212,150,76,12,86,33,221,97,240,1,86,222,192,168,173,15,208,217,247,133,30,4,232,149,215,
+108,239,201,172,127,236,135,237,153,126,70,251,199,217,62,232,112,166,61,37,50,97,146,60,233,174,166,148,189,152,11,197,64,121,146,114,118,106,52,14,26,62,209,91,8,74,25,136,248,247,39,181,103,234,68,17,166,152,18,197,241,112,126,102,204,163,243,132,228,110,174,182,11,206,50,160,1,132,54,139,120,149,67,226,158,206,241,121,247,182,142,144,201,237,92,18,232,51,107,142,79,129,8,228,102,222,24,72,64,213,35,84,92,31,62,102,255,21,123,153,171,219,54,26,70,11,154,54,106,98,20,205,218,182,6,171,227,234,204,196,192,198,53,253,238,203,187,243,0,34,140,16,195,42,195,237,112,193,241,145,89,36,175,125,145,219,250,64,137,154,185,122,121,45,124,51,199,190,69,207,160,214,118,87,221,133,152,212,80,64,35,238,126,61,143,101,153,231,58,42,230,94,79,47,233,100,210,143,97,79,170,106,153,184,203,146,62,95,230,235,70,134,158,89,147,193,76,7,156,34,110,248,31,148,0,252,203,9,236,32,23,103,242,7,189,248,53,192,186,127,49,100,57,127,49,204,
+255,100,13,217,73,121,129,122,75,113,100,31,138,252,151,11,48,46,206,200,186,73,3,227,76,136,11,203,198,11,118,137,195,6,173,150,161,143,106,121,206,82,99,208,141,35,232,254,202,162,114,221,224,96,130,51,199,135,2,238,188,12,120,207,228,29,240,149,144,186,174,225,24,47,232,30,45,3,226,87,75,91,54,247,189,166,194,14,178,166,146,204,62,225,144,91,111,67,1,161,18,146,195,143,214,30,161,33,130,5,38,81,246,29,137,219,155,124,228,15,128,215,127,55,184,96,56,36,105,142,136,227,135,107,100,91,162,131,58,77,104,204,185,95,44,11,213,58,140,47,25,108,229,175,157,245,142,53,131,89,226,194,64,108,119,245,85,104,66,51,182,61,67,154,105,128,97,5,9,34,47,15,243,13,26,149,94,177,216,246,121,150,78,146,154,2,147,13,149,78,112,45,213,230,26,140,148,116,160,116,59,3,185,79,195,173,92,206,175,123,74,244,217,195,13,14,76,97,50,31,22,106,239,50,23,80,20,106,55,211,235,164,228,105,32,70,49,137,217,40,194,164,4,134,126,54,
+115,178,166,149,146,165,48,184,232,59,255,82,170,148,43,154,50,143,220,143,17,14,213,247,194,24,226,145,5,112,48,199,179,252,116,30,16,188,91,214,0,242,61,150,9,43,140,23,33,242,117,136,18,96,224,0,22,66,199,7,219,167,206,116,75,22,129,171,129,123,115,91,248,54,15,87,118,187,3,226,85,134,243,236,242,99,4,20,62,141,29,14,160,205,203,244,96,2,60,23,6,173,8,86,216,38,145,115,241,23,213,97,241,169,125,77,233,60,123,7,7,224,0,91,14,144,81,250,232,222,187,210,243,37,75,39,10,209,47,148,52,126,154,169,203,54,92,104,82,124,28,233,170,91,162,253,179,82,224,124,214,250,139,20,133,241,47,15,204,108,111,138,11,39,65,4,56,103,213,92,235,52,14,204,79,184,147,96,5,84,26,96,253,234,251,187,185,119,198,163,44,16,127,191,82,41,248,158,115,150,115,88,19,151,85,227,149,67,3,52,170,69,192,230,226,3,40,61,122,254,249,40,199,126,89,181,232,134,110,233,164,154,236,166,0,226,156,35,98,205,44,0,224,211,81,207,
+225,75,11,243,168,189,19,198,33,62,9,225,200,249,252,31,139,111,186,164,18,52,59,255,57,210,185,190,146,191,214,165,249,38,229,29,206,162,2,250,111,227,73,15,129,85,88,159,96,80,113,54,213,250,75,232,53,176,214,22,145,211,221,47,115,132,107,162,67,61,183,30,3,18,79,0,179,146,1,151,110,220,153,122,57,205,115,22,60,203,229,184,32,201,223,88,130,182,161,4,84,161,188,120,94,173,12,47,243,125,170,194,126,222,229,210,89,160,20,170,188,141,117,188,60,119,186,250,75,84,7,190,115,0,249,240,203,107,71,219,188,246,188,126,133,226,53,157,207,251,227,241,131,235,130,74,67,238,92,156,0,216,82,16,235,71,90,74,147,201,99,2,157,193,50,195,96,95,34,240,19,200,117,155,185,124,62,123,161,87,158,80,131,61,26,173,20,39,217,41,239,11,235,234,207,209,0,39,109,242,129,222,14,138,216,147,13,104,225,134,183,149,160,36,251,76,127,100,80,177,2,178,115,126,63,78,73,190,63,243,238,231,15,35,18,88,97,110,22,66,240,99,3,166,92,236,
+106,64,30,84,214,236,217,27,141,50,235,112,108,133,16,88,202,176,95,88,82,194,243,53,78,229,193,102,103,154,4,10,208,61,40,112,243,84,205,41,158,93,208,79,182,105,16,150,214,245,230,147,154,153,67,77,101,218,204,43,36,31,235,165,224,207,122,69,118,171,190,102,101,199,251,120,212,59,185,119,168,166,241,226,108,148,235,168,48,215,111,137,124,108,93,84,69,11,22,174,111,115,6,196,47,252,127,236,50,140,112,150,156,123,182,88,238,49,125,120,125,224,53,75,243,45,49,243,41,201,22,75,11,233,84,13,45,37,204,132,223,106,15,64,68,211,16,224,29,133,70,224,16,190,183,160,30,164,205,49,248,177,168,218,140,101,130,20,164,5,50,198,114,93,242,167,82,110,186,162,99,74,21,185,142,129,149,249,172,244,84,2,1,120,221,81,218,157,109,239,218,203,115,158,91,77,247,253,113,133,6,155,201,235,232,96,59,175,220,103,223,138,222,186,247,157,248,59,141,5,216,58,134,49,152,246,228,68,42,174,204,7,163,36,101,66,75,180,3,21,34,105,119,170,203,7,
+123,77,168,251,141,43,195,1,101,165,109,209,39,99,35,245,121,98,225,87,100,98,183,180,210,186,116,148,123,65,98,218,172,242,86,235,41,85,115,40,150,29,161,189,72,186,115,83,110,255,180,131,227,90,115,215,6,20,103,53,17,31,80,186,84,109,215,123,7,146,62,247,113,99,252,146,158,211,14,241,216,224,161,43,184,51,11,33,88,249,72,59,238,59,249,128,101,46,176,98,161,187,89,121,31,225,238,99,134,185,61,245,208,88,123,50,156,163,73,65,1,151,2,247,191,193,9,195,82,206,70,63,43,117,186,201,151,172,203,171,29,228,116,29,149,144,231,74,139,209,189,87,130,60,110,166,45,3,11,245,39,232,25,236,133,108,85,113,39,44,1,29,220,99,232,62,12,8,109,65,52,72,48,194,10,71,202,175,124,149,236,140,143,46,147,217,236,192,17,46,105,244,99,169,25,168,148,134,82,91,163,173,224,232,31,158,193,241,26,34,235,182,198,137,230,5,137,224,193,215,37,132,204,122,19,232,160,100,210,232,119,171,32,72,248,20,220,66,113,99,251,94,75,188,94,60,
+7,232,129,124,252,121,80,32,122,9,230,197,181,47,237,166,61,233,18,73,162,46,57,111,179,47,109,108,74,139,77,68,86,13,237,243,16,77,105,53,52,65,172,92,45,194,210,180,156,136,69,187,227,32,146,119,25,230,236,39,48,235,237,60,107,195,85,99,99,200,23,122,29,243,31,107,170,77,127,247,133,76,53,210,11,84,63,129,136,102,215,174,227,251,59,110,79,49,139,72,136,251,76,131,58,183,31,26,208,86,173,81,75,97,183,99,188,34,227,91,216,47,197,221,61,186,127,86,41,133,195,134,150,74,204,104,185,232,93,122,145,154,22,90,84,37,95,185,176,103,147,227,167,149,107,131,134,5,209,40,47,154,199,214,15,238,235,170,88,230,167,186,170,218,90,199,62,175,156,51,97,107,205,167,95,113,161,33,71,146,202,234,7,49,228,237,58,46,49,89,107,230,77,159,242,7,181,74,131,31,245,32,176,36,87,85,166,241,6,181,5,3,142,108,105,12,180,138,1,235,188,185,254,234,134,127,68,118,61,228,180,134,47,115,170,110,80,161,86,129,59,63,137,238,15,79,
+29,221,195,119,11,121,2,74,34,28,228,81,33,77,234,243,140,146,62,145,60,221,240,38,220,163,204,188,181,84,69,186,128,194,50,13,190,79,144,115,204,188,246,74,196,227,26,182,89,160,104,156,102,176,37,182,231,125,46,87,56,133,163,244,121,144,211,11,152,205,40,156,131,202,215,153,60,134,77,10,36,211,89,27,57,29,242,96,189,94,144,172,5,2,247,143,155,1,158,227,110,192,238,86,127,75,179,203,58,137,39,13,98,25,84,9,71,146,162,14,17,181,192,228,60,183,206,208,112,14,79,48,115,37,233,132,26,167,237,59,146,35,190,215,194,139,224,84,63,236,45,58,156,76,33,154,148,172,40,189,250,10,177,170,49,134,188,139,251,61,8,67,95,61,214,209,88,215,58,56,78,233,225,107,41,215,52,76,176,215,134,198,123,108,41,156,95,202,253,218,83,6,119,201,39,191,254,90,234,109,240,211,97,45,170,158,212,160,84,88,37,80,50,148,187,229,45,132,94,203,82,239,131,101,92,80,244,225,82,247,249,253,97,155,22,97,5,154,212,172,174,55,84,56,203,154,
+191,211,138,106,13,219,204,202,232,243,252,223,230,52,155,55,42,187,38,172,161,1,202,180,246,53,87,87,61,195,122,158,24,49,53,211,42,189,91,131,57,173,114,150,177,21,125,195,27,73,94,131,83,175,6,189,8,17,167,87,208,95,249,213,224,155,199,117,14,177,201,96,154,197,58,93,155,153,98,33,235,102,150,177,59,8,224,162,196,33,102,111,216,106,78,57,113,12,225,22,185,74,179,107,123,5,52,24,218,21,120,41,147,125,14,237,177,172,82,213,45,184,57,177,217,155,146,223,126,201,40,75,87,13,171,150,76,13,107,121,190,6,255,53,147,224,18,242,135,238,13,158,199,140,110,175,194,105,90,181,26,135,76,212,60,197,74,140,211,74,38,88,144,202,30,204,6,122,253,73,28,200,89,184,95,98,25,254,106,230,103,82,65,84,122,196,191,97,211,160,219,148,24,65,157,163,46,75,90,85,139,239,221,20,164,168,14,22,192,50,99,178,127,29,86,179,28,37,109,252,168,115,174,180,149,218,174,201,244,2,141,100,223,129,193,166,130,164,232,84,122,249,172,178,128,79,
+203,158,207,25,45,25,182,233,231,158,125,131,166,162,35,4,142,193,134,63,31,11,109,15,239,133,35,218,160,50,196,166,204,255,80,253,67,48,143,50,158,153,19,0,109,46,18,11,20,178,49,179,59,54,116,141,83,175,246,107,77,43,80,10,234,97,62,65,158,54,227,143,19,131,31,97,211,203,41,46,241,153,88,228,3,163,18,170,250,96,105,166,6,35,171,80,170,43,234,25,49,36,197,98,45,86,13,153,74,105,145,182,155,186,94,26,60,140,101,73,189,135,188,90,36,211,179,250,164,207,184,12,73,159,5,136,30,27,142,93,2,251,38,147,70,41,168,236,35,169,148,45,155,54,15,0,16,136,173,20,92,176,87,25,140,45,12,75,212,58,242,153,221,37,89,20,129,182,111,249,217,233,77,163,186,100,220,88,214,146,242,124,18,241,51,213,43,155,167,28,177,85,103,84,236,150,141,164,106,230,149,164,201,103,84,42,220,153,88,249,201,15,66,98,198,93,233,31,212,1,163,123,11,52,136,141,74,198,255,36,65,176,252,144,107,96,146,93,250,47,126,10,47,41,100,185,
+241,109,222,24,23,51,252,32,212,41,254,21,175,77,234,74,161,20,108,133,151,228,172,101,29,110,145,150,42,20,52,219,212,5,7,173,253,229,168,189,37,230,97,171,90,101,232,16,106,186,105,118,123,62,250,96,37,76,52,141,55,100,149,164,62,35,76,212,84,130,90,43,23,14,247,66,255,225,190,112,239,146,246,27,76,36,230,85,162,45,21,251,109,148,230,190,153,145,26,12,39,172,151,29,189,105,184,127,86,184,190,8,152,83,173,59,207,71,26,199,210,123,55,72,108,149,249,57,179,21,151,186,119,247,143,221,111,56,114,15,97,90,46,32,149,216,141,73,178,25,29,183,192,20,3,47,198,236,161,240,252,19,60,148,238,45,118,109,198,97,141,50,137,189,64,95,208,114,186,227,155,229,248,215,220,115,238,143,58,69,11,59,43,94,201,178,226,76,108,61,165,81,145,138,126,92,49,230,196,111,22,217,50,238,158,181,165,3,227,209,226,62,252,144,166,182,121,117,100,240,211,39,45,101,154,65,141,44,66,68,205,174,207,194,87,213,62,26,176,194,6,92,151,61,37,85,
+228,229,92,245,50,74,15,188,96,127,68,96,191,135,105,195,239,121,22,195,196,249,202,244,130,47,108,252,49,61,231,219,110,214,194,105,126,210,244,156,22,232,142,230,88,120,85,107,254,50,178,79,187,163,83,201,137,246,74,117,44,120,12,155,36,215,106,51,45,179,197,125,208,15,35,9,30,140,230,218,139,88,173,229,30,148,12,34,158,46,94,160,142,116,124,235,193,36,251,72,76,61,145,40,63,100,18,78,146,134,226,128,180,136,47,30,141,15,157,14,18,252,49,109,84,169,172,142,184,220,173,65,251,253,237,217,67,87,70,140,233,148,18,135,133,134,236,93,205,130,93,68,56,10,110,220,169,184,77,164,71,140,78,84,68,146,138,240,137,144,148,157,185,0,189,10,210,141,23,63,30,254,221,66,10,17,168,198,103,178,110,9,154,37,220,153,221,103,250,83,30,98,73,166,89,34,196,247,246,166,36,63,33,189,65,195,153,169,132,90,148,6,87,10,26,102,242,182,50,51,164,191,225,150,196,154,251,131,94,213,199,143,162,243,139,146,100,159,17,214,36,59,231,223,219,118,
+154,249,21,235,25,18,148,29,60,212,101,14,138,193,90,213,32,100,126,40,52,193,213,134,4,29,6,47,213,89,106,197,245,49,94,185,243,36,79,121,126,182,207,81,254,69,31,69,194,171,143,111,22,148,54,204,225,122,194,184,36,219,132,246,235,244,224,18,182,208,209,161,65,234,70,14,198,229,181,8,55,76,47,14,106,28,82,63,205,169,186,194,86,131,170,57,57,159,88,107,147,200,160,6,133,99,67,102,60,148,214,240,208,5,98,38,186,106,30,186,155,59,102,156,209,78,97,253,155,220,17,187,100,82,145,175,109,110,167,190,107,195,73,113,3,234,180,104,170,45,123,180,197,153,241,117,81,189,46,117,92,8,227,231,133,234,176,146,143,54,171,228,121,149,241,167,79,5,71,184,167,99,50,206,231,109,197,43,146,125,16,167,232,91,212,106,110,99,109,188,149,116,91,213,12,114,64,190,167,61,24,47,236,145,154,173,96,140,247,247,9,253,146,40,185,198,123,179,44,237,229,146,76,110,149,71,228,116,188,103,167,158,195,86,24,181,206,178,140,151,76,173,175,201,94,189,
+77,47,244,166,205,57,107,163,167,50,117,43,113,186,71,142,115,96,249,244,31,58,235,100,58,223,100,99,53,241,188,18,57,27,73,118,91,101,97,98,223,76,144,204,114,28,237,130,65,91,170,160,144,169,170,140,182,193,143,156,102,151,225,185,103,98,209,54,61,69,134,249,206,215,235,220,231,209,104,96,130,153,2,153,239,148,155,61,179,72,186,39,52,54,215,45,104,191,51,115,20,183,223,114,117,106,137,134,57,145,200,21,222,100,211,16,31,127,196,232,34,153,101,82,17,221,217,218,18,55,49,203,153,52,63,6,108,96,61,84,84,227,171,103,101,85,224,196,229,133,25,55,116,245,181,77,70,3,167,199,11,123,222,253,87,181,17,70,236,236,157,198,128,84,111,34,220,230,157,235,100,7,49,245,171,65,38,99,191,56,103,222,212,62,104,182,79,185,60,23,81,144,123,86,4,175,33,47,124,95,202,68,32,207,248,183,214,55,32,25,131,145,239,184,27,71,125,39,125,109,224,77,163,23,185,29,15,218,184,98,50,187,146,86,223,116,98,157,116,35,238,53,29,18,117,207,
+82,220,241,171,143,8,171,225,161,30,233,121,223,46,208,70,175,105,212,70,76,209,150,22,178,64,147,30,10,223,142,200,190,126,2,21,95,3,141,160,197,195,147,102,185,156,186,234,42,133,162,214,69,156,24,109,169,159,70,214,136,229,175,113,74,37,140,214,18,16,145,218,214,138,134,23,55,177,27,82,3,222,148,142,194,230,24,222,185,69,216,16,19,170,118,154,195,14,154,172,79,118,143,173,117,189,192,194,98,249,33,168,142,59,252,196,39,148,129,103,71,46,215,107,65,62,253,89,48,119,129,125,33,116,108,102,62,27,213,199,232,17,1,251,229,193,0,219,81,53,201,42,151,102,198,15,109,149,146,236,82,164,148,129,34,253,144,100,144,40,61,245,220,44,26,201,80,251,76,146,183,140,192,200,186,156,222,20,178,43,87,50,197,24,12,47,116,86,4,199,27,151,195,100,105,26,121,218,100,31,5,205,67,244,201,57,193,220,95,207,7,250,84,128,223,133,206,72,14,223,101,181,115,223,217,90,6,95,143,125,53,132,245,200,101,145,101,206,240,181,128,171,7,77,242,27,
+223,116,78,173,176,10,72,39,3,243,154,13,95,233,117,247,82,25,78,107,31,17,245,222,83,238,13,112,186,188,194,161,126,200,180,109,249,57,201,111,172,174,81,240,35,108,58,106,255,16,34,80,248,83,98,38,34,7,106,200,86,217,159,229,228,117,209,18,108,131,77,95,68,177,73,180,156,56,102,191,218,151,152,21,205,19,208,233,171,67,20,235,151,217,173,139,135,70,200,105,43,69,119,90,43,139,225,115,150,97,83,12,50,157,23,229,186,63,151,193,53,68,233,181,23,178,135,161,143,81,41,50,174,20,250,130,105,182,149,218,201,117,119,182,43,157,153,122,190,9,111,153,72,159,210,245,178,5,56,30,219,109,77,114,244,32,154,49,162,119,111,225,108,84,247,123,60,149,224,12,47,195,6,10,114,162,104,139,9,90,151,162,92,18,164,65,18,219,46,248,211,206,146,4,190,229,208,83,226,135,96,149,125,64,197,58,156,113,68,123,170,64,202,225,253,214,75,173,234,159,209,7,130,102,245,150,47,2,134,67,94,197,191,113,34,246,169,24,155,133,199,31,125,45,23,130,
+115,78,250,149,171,72,24,166,62,220,173,232,69,61,214,141,190,86,97,1,223,223,231,194,48,185,43,134,71,29,98,152,238,95,85,26,31,135,109,83,116,67,235,183,122,215,186,233,184,190,14,17,166,109,123,160,14,26,118,12,251,247,137,161,5,249,255,83,47,224,127,247,247,189,128,186,127,210,11,248,241,72,150,251,47,159,174,150,123,218,156,111,207,45,211,214,214,192,245,92,188,168,96,213,119,106,203,55,25,90,1,219,9,69,141,164,181,175,221,226,22,188,229,248,83,130,214,18,242,176,200,143,252,229,194,162,1,91,109,116,163,213,166,245,157,150,244,90,247,111,174,131,236,20,146,135,34,169,129,188,241,142,247,207,70,134,105,26,159,211,220,253,171,125,111,57,199,201,6,144,181,216,17,6,141,227,231,96,246,2,12,14,132,201,154,39,2,144,88,178,71,220,123,29,80,60,208,176,214,8,74,233,227,251,251,1,26,26,178,80,52,90,181,113,210,42,92,135,155,41,235,154,85,22,118,221,125,101,242,62,93,46,174,84,255,77,187,132,193,46,75,137,149,236,19,200,
+118,134,28,210,145,129,27,222,88,82,136,137,69,74,188,79,8,114,89,158,113,173,165,195,244,66,59,94,65,251,214,40,93,92,3,187,42,62,221,192,9,136,8,131,54,27,49,244,95,38,148,131,11,113,43,198,65,151,12,197,105,133,229,194,190,63,188,212,128,250,101,46,82,175,0,132,43,167,148,147,125,8,26,188,146,85,88,61,138,136,140,236,13,155,139,79,11,146,69,236,154,203,206,241,112,10,227,114,69,51,55,144,111,35,41,54,114,128,184,153,222,213,68,193,40,174,22,146,129,45,2,226,9,217,128,35,85,68,59,224,244,92,149,7,2,245,32,198,40,211,35,123,13,81,215,47,109,141,134,150,29,25,248,174,196,153,31,200,220,136,123,214,166,110,249,44,228,34,251,18,165,194,80,194,208,82,201,83,7,32,245,162,239,20,146,72,104,199,248,128,78,170,44,212,19,52,233,18,87,235,131,50,249,106,174,53,107,181,76,246,53,162,90,177,124,229,207,39,137,107,168,164,146,54,215,138,46,239,42,20,35,217,71,227,59,160,104,5,232,88,122,197,236,241,97,227,
+122,118,208,62,36,104,99,215,17,83,42,33,239,249,232,164,239,219,87,254,142,161,64,113,66,199,160,94,2,109,24,254,187,43,251,17,93,61,106,114,143,246,29,239,140,224,10,174,207,64,182,173,61,97,244,152,4,22,37,193,100,55,48,25,61,121,201,210,234,218,255,46,62,92,31,159,163,37,180,19,216,124,138,10,106,201,34,64,184,95,126,62,8,221,18,239,3,205,39,200,37,201,135,208,26,196,253,104,41,221,167,26,43,49,219,68,116,62,242,104,196,98,182,235,117,234,99,142,164,204,143,212,146,180,15,46,241,64,196,252,233,115,165,128,170,32,108,224,27,7,188,237,115,37,6,156,248,86,33,85,198,108,181,72,0,202,62,220,96,109,12,68,122,38,50,234,35,111,166,22,45,171,107,59,22,140,174,252,24,228,154,66,53,238,36,119,207,134,182,172,138,42,157,16,173,189,76,215,183,204,243,114,122,89,25,63,26,33,172,24,148,14,228,128,251,79,58,194,168,166,147,103,211,235,74,190,75,83,172,130,50,154,194,219,197,48,110,85,140,123,1,245,239,92,187,163,
+14,174,189,115,21,9,84,151,97,40,0,131,134,67,98,208,41,255,183,5,43,79,14,249,114,147,199,200,30,244,44,222,113,177,138,149,250,210,136,201,188,113,235,180,81,251,144,87,254,118,137,188,134,71,97,215,225,247,154,115,199,183,179,244,97,213,17,242,203,35,245,101,170,92,248,88,252,134,191,135,178,233,227,77,249,186,41,165,170,93,45,51,120,96,145,60,214,169,155,93,224,8,11,124,198,224,114,182,150,108,157,212,186,163,247,101,204,77,166,70,86,162,128,76,8,54,230,75,242,157,95,27,28,121,217,237,166,172,107,182,104,204,211,226,131,138,61,206,56,196,106,217,128,0,230,119,253,73,209,129,188,10,112,38,154,81,173,137,188,71,201,184,182,136,47,227,90,14,247,83,13,44,95,29,200,36,81,202,119,71,161,64,106,159,184,204,199,187,82,102,44,215,238,251,41,54,207,115,180,188,179,145,183,143,12,134,18,186,217,199,146,57,220,28,2,70,205,5,137,143,102,201,132,61,117,71,252,234,241,232,51,14,203,180,224,208,90,240,100,7,76,242,145,164,6,44,
+4,9,162,174,118,112,44,37,247,66,12,34,182,196,105,177,34,188,237,181,67,51,188,235,122,159,208,118,102,69,86,243,83,237,121,12,83,183,96,109,51,37,47,109,167,97,186,106,78,108,203,49,153,159,55,160,3,239,114,245,24,125,23,160,49,91,31,182,4,112,35,98,98,182,103,10,169,97,75,60,69,243,6,52,104,235,57,206,222,116,206,165,51,253,47,169,11,115,241,238,148,204,78,218,95,244,199,4,21,111,225,182,193,177,167,93,77,39,96,160,136,105,229,5,71,86,241,56,209,182,56,215,249,56,144,206,91,123,26,76,164,114,174,124,159,91,42,146,65,151,195,188,57,225,120,245,195,2,2,177,105,24,97,130,249,148,209,199,49,131,6,19,210,199,145,17,161,226,202,20,129,144,147,170,201,131,117,85,40,162,16,253,134,230,148,197,50,80,178,174,173,14,92,124,131,119,126,179,72,65,106,9,21,62,2,101,173,135,47,66,43,213,236,17,134,160,89,173,54,10,204,199,79,162,103,40,216,117,252,124,148,235,52,46,194,71,152,101,155,112,134,57,206,59,233,200,
+139,39,106,151,7,91,42,122,150,158,233,112,94,212,12,31,207,228,164,40,199,153,135,96,194,30,33,152,43,203,64,240,109,130,68,1,75,31,235,77,100,170,225,235,204,101,232,214,85,223,2,80,210,90,88,185,29,43,203,106,118,175,157,111,219,183,240,233,21,245,47,58,187,76,85,36,128,238,217,35,53,252,21,245,69,233,142,163,229,69,109,13,162,222,111,228,153,71,37,243,1,220,94,246,69,92,128,88,30,63,57,16,78,187,62,96,43,176,245,139,122,199,245,51,144,122,82,81,134,243,44,237,79,134,176,147,235,162,217,252,141,9,79,61,199,86,121,219,74,84,198,13,207,122,211,135,233,102,240,185,225,122,55,98,104,175,224,145,204,92,234,51,24,186,79,127,140,16,9,132,38,195,83,186,103,203,3,178,77,183,175,176,228,69,126,140,63,216,195,124,217,70,143,113,195,112,11,251,231,226,100,114,106,106,18,173,6,142,160,197,248,180,252,249,130,117,82,157,13,158,249,165,182,98,138,216,135,221,71,171,31,31,33,219,214,221,20,233,41,93,70,205,194,132,182,181,
+68,118,160,6,178,178,105,72,124,41,37,21,225,77,208,167,233,99,229,174,22,126,97,209,121,238,222,92,124,173,227,249,76,136,191,122,24,166,39,173,169,195,25,92,76,39,139,96,252,98,201,16,189,229,56,207,77,200,125,54,128,79,178,144,194,46,21,195,70,141,134,67,54,206,165,120,33,116,176,125,227,55,112,86,194,12,132,49,168,112,221,197,164,175,54,57,74,60,131,102,209,1,31,170,204,71,184,127,136,152,130,227,31,44,206,54,196,15,244,64,24,29,243,101,65,142,208,227,199,209,116,105,167,229,213,45,149,92,54,241,207,247,253,217,94,104,119,237,107,111,226,230,202,148,138,159,158,50,252,108,141,249,88,82,4,200,166,199,116,154,33,153,227,114,78,113,104,180,239,65,185,84,36,84,235,106,26,177,253,182,222,154,10,9,200,120,253,209,74,70,198,97,110,80,86,180,151,136,103,78,12,239,93,18,101,176,197,47,180,86,65,134,56,243,139,99,110,221,126,36,118,131,87,208,117,186,146,39,146,191,152,231,114,228,122,204,62,4,71,151,110,40,91,186,68,13,
+236,186,193,198,235,253,197,188,168,100,84,114,59,181,71,56,32,23,211,253,182,115,181,134,142,243,185,227,56,15,50,19,42,207,45,41,83,241,206,158,143,25,246,88,37,136,232,1,195,61,253,144,65,15,236,182,247,209,224,172,188,206,135,24,114,180,126,226,225,199,132,222,183,36,222,240,133,245,203,50,63,181,239,33,102,215,167,15,182,172,236,141,235,156,72,51,180,136,6,54,75,218,230,247,76,67,22,60,126,87,129,224,165,157,36,63,44,172,186,190,139,219,168,116,143,74,99,83,182,151,163,15,12,88,231,1,51,221,238,139,233,107,219,116,110,159,210,115,130,87,92,206,124,145,117,159,25,54,24,88,152,245,176,159,4,126,29,146,148,53,246,6,76,167,245,99,84,151,198,232,155,50,218,21,89,126,169,204,197,89,81,80,75,214,173,10,59,98,210,102,169,117,151,167,51,81,32,159,197,19,214,225,242,239,225,115,102,101,230,8,188,227,88,89,174,168,210,192,215,5,108,80,175,18,66,5,69,124,149,143,31,104,217,191,82,111,7,159,8,42,47,47,218,155,46,44,
+128,43,95,85,149,23,21,208,156,233,254,225,254,66,53,138,206,173,236,20,103,182,51,91,86,226,221,99,134,201,70,61,158,63,234,51,99,175,45,50,1,100,12,159,152,94,30,218,217,75,48,174,113,101,215,31,176,89,237,40,70,82,26,0,95,153,25,5,242,120,82,202,114,47,92,29,228,80,191,110,63,214,205,218,170,195,225,127,168,0,110,144,62,207,131,219,237,80,243,232,99,188,35,248,91,131,72,84,161,63,125,216,139,175,70,61,83,170,15,98,196,51,238,30,112,141,24,151,182,139,184,168,55,255,93,164,14,218,133,6,212,210,64,3,229,161,52,191,125,242,201,76,249,220,174,198,220,23,253,9,14,231,110,143,88,117,156,197,133,94,19,179,12,91,150,41,244,33,82,21,43,122,183,94,232,40,214,33,236,121,149,207,158,64,209,36,51,178,114,156,5,77,107,179,158,114,40,31,77,70,36,202,202,233,108,36,132,81,72,140,86,13,184,233,39,61,43,222,122,214,107,215,151,125,43,174,40,54,174,42,164,20,85,194,253,98,240,73,114,120,86,22,123,16,189,138,
+80,188,251,153,75,67,60,46,206,133,144,122,165,199,20,172,62,241,151,94,57,241,11,172,224,153,92,35,76,1,115,14,39,202,74,183,146,112,126,71,75,96,90,119,121,206,106,175,44,95,145,156,194,237,7,117,245,150,163,212,139,214,9,21,124,147,76,24,153,74,245,225,207,59,225,63,246,3,59,84,66,132,110,74,125,51,13,162,233,142,86,36,82,50,60,193,116,102,145,139,197,222,199,47,200,53,7,22,48,112,81,21,30,63,160,36,61,116,217,166,19,148,218,236,241,253,59,182,175,59,83,253,255,23,117,239,241,227,206,147,37,248,253,43,163,147,36,96,49,90,39,1,139,189,202,64,7,65,128,116,208,73,128,122,166,123,86,13,204,118,15,102,102,87,59,55,122,207,42,122,22,189,183,69,239,189,39,139,222,123,239,189,247,158,170,239,239,215,221,219,187,152,193,174,142,66,49,201,136,151,153,239,189,120,17,153,140,32,42,63,239,252,228,215,117,1,3,127,13,56,55,87,82,53,225,237,68,125,28,197,171,201,124,102,245,55,157,213,130,218,72,233,232,64,49,226,
+26,249,241,58,244,233,48,113,249,252,22,89,89,211,50,240,196,199,80,199,166,0,9,190,212,154,185,246,84,223,177,250,238,92,172,93,111,219,42,238,125,133,218,84,203,29,131,158,200,159,126,79,120,212,94,74,6,126,75,136,250,56,221,28,3,69,85,141,128,156,14,151,203,164,165,155,108,10,13,88,127,174,63,72,105,94,72,196,229,66,57,248,39,43,132,42,206,169,254,239,239,144,58,167,180,156,119,75,170,148,148,157,50,33,216,169,245,147,207,91,128,160,96,200,238,134,24,14,79,16,45,40,11,42,174,125,179,122,169,164,15,187,167,15,209,234,147,216,197,224,152,30,24,21,94,45,195,84,50,18,134,162,153,0,227,99,187,139,116,216,122,106,88,49,163,82,8,215,26,210,240,117,135,77,180,103,113,139,163,236,81,11,15,114,32,48,65,97,61,135,68,243,18,26,203,221,168,73,102,189,63,57,224,119,203,180,152,218,71,239,222,208,179,36,60,58,87,3,235,149,135,69,202,118,94,114,246,157,43,55,243,236,110,96,123,117,134,188,68,102,95,96,36,145,123,66,
+40,252,123,236,230,8,236,115,225,200,105,85,135,115,225,136,161,15,24,27,119,138,119,137,211,67,36,237,126,63,6,58,144,206,150,251,94,125,4,223,183,164,39,38,101,211,124,132,78,9,86,250,243,240,182,229,228,35,143,156,196,121,72,50,238,77,65,228,230,204,74,142,97,122,217,98,156,221,191,230,90,150,82,87,111,197,217,155,42,188,248,165,118,108,151,228,165,29,96,217,79,82,244,164,206,147,205,250,96,91,77,40,170,179,226,46,192,74,241,205,72,46,143,163,93,114,49,190,62,191,59,193,210,188,181,9,9,200,122,131,202,196,44,222,191,170,187,54,195,155,124,217,237,253,237,177,141,115,195,179,54,55,203,33,244,135,201,184,55,106,163,137,58,184,158,189,42,124,225,119,133,199,84,27,119,49,126,9,77,157,71,181,177,76,24,32,175,106,142,73,163,195,112,50,105,12,38,22,77,193,214,133,62,0,245,226,100,190,89,22,212,79,148,173,72,171,64,10,188,192,105,17,69,55,197,180,70,64,246,182,41,189,64,6,51,79,188,138,27,5,162,217,27,224,69,200,
+245,229,50,205,220,128,173,207,159,112,222,198,185,6,155,180,217,100,228,97,100,188,52,222,234,177,27,167,68,62,249,182,60,216,26,248,89,21,215,142,161,228,238,246,190,29,181,248,213,88,12,180,13,33,62,17,219,6,192,90,122,143,33,49,164,100,27,59,145,25,23,145,39,8,42,33,124,168,60,168,218,182,16,6,247,229,94,169,23,75,11,209,86,29,230,102,128,91,202,148,79,177,208,200,70,240,158,95,38,21,249,230,66,186,78,183,32,171,231,138,241,47,199,132,133,226,214,186,100,158,120,183,74,190,131,221,34,50,209,54,232,113,250,52,96,73,30,26,209,94,236,55,37,72,1,92,192,195,95,31,169,109,194,45,141,120,128,38,220,213,134,24,172,99,65,221,199,3,206,37,73,137,91,56,102,101,116,7,129,71,216,189,85,62,10,201,141,203,155,50,193,115,191,153,84,98,56,19,54,60,212,149,171,205,168,192,37,15,178,142,6,19,39,216,34,154,192,100,0,254,48,96,12,134,49,198,64,34,97,212,153,166,206,177,111,87,134,39,176,254,91,154,173,194,52,116,
+180,148,86,181,58,42,226,193,57,194,27,112,237,60,238,128,203,227,246,227,235,109,68,244,45,90,120,117,251,111,137,183,144,214,165,211,223,91,32,109,176,98,238,75,74,61,92,255,72,244,41,155,64,160,171,37,177,117,180,44,94,22,23,126,87,129,40,73,125,3,18,184,230,2,129,183,179,144,200,40,222,92,20,247,21,78,20,98,170,252,164,96,195,38,116,101,245,167,84,109,30,57,212,98,2,15,236,189,167,179,160,213,172,72,113,21,33,117,76,36,26,71,236,207,239,63,12,5,13,51,38,70,161,66,139,18,84,42,109,47,18,105,174,143,72,132,6,133,13,241,90,164,183,196,55,168,131,98,183,65,254,233,153,95,253,80,30,105,197,29,235,242,77,219,37,213,217,176,60,126,31,6,38,194,139,94,189,62,14,177,203,232,80,22,31,208,35,179,126,47,59,174,168,104,212,24,155,183,109,187,22,196,167,69,113,235,181,19,71,83,171,87,163,5,48,170,38,239,162,140,205,52,204,157,94,88,20,31,183,147,142,213,36,27,176,84,30,231,19,241,53,210,6,187,112,164,
+88,72,42,188,132,103,135,156,143,72,33,84,162,23,207,198,228,34,6,211,214,2,11,142,198,88,104,3,44,10,140,183,178,2,24,1,69,226,149,86,32,139,195,220,220,74,105,182,57,67,47,28,233,173,0,166,169,37,205,76,18,233,151,191,84,5,238,69,128,240,138,41,178,116,177,95,153,36,245,227,62,13,93,84,252,238,250,210,163,110,245,88,63,152,48,197,131,229,81,100,112,3,141,189,243,137,179,152,191,203,33,195,155,110,113,119,100,77,56,82,108,37,24,233,115,119,56,188,72,181,91,61,122,246,154,12,140,233,131,223,239,62,159,41,37,76,230,24,207,98,182,4,19,229,97,31,76,62,22,104,199,191,182,139,100,110,163,107,136,33,151,101,95,97,175,177,0,155,18,69,80,174,104,9,51,92,24,12,8,216,242,93,102,54,16,171,110,65,248,100,22,20,113,185,175,131,230,92,216,95,224,121,236,227,155,49,98,100,85,249,66,83,44,192,165,244,197,3,74,95,72,213,89,9,228,139,58,230,5,226,163,221,123,135,254,137,29,71,19,2,31,106,83,40,42,190,
+124,74,63,76,29,172,147,187,50,2,254,146,122,246,99,152,5,180,251,0,75,178,88,104,237,109,212,151,24,23,34,7,189,224,86,139,48,188,148,109,116,174,159,45,1,189,100,133,140,73,11,61,207,21,32,139,226,20,108,72,4,189,129,190,67,161,56,32,12,91,118,127,116,48,159,209,134,168,43,35,71,3,65,68,123,130,35,148,176,150,239,69,137,22,69,150,134,145,39,34,13,145,182,197,252,217,146,138,213,220,239,13,47,40,112,100,230,129,131,78,173,230,28,39,245,121,71,211,113,194,54,78,21,34,102,245,221,58,166,177,77,41,5,232,105,188,155,104,221,236,144,35,25,81,72,155,62,116,170,19,202,253,4,229,137,48,198,151,193,59,55,77,248,33,139,166,169,118,15,232,138,105,185,215,209,243,171,238,106,85,58,2,179,49,208,114,189,38,121,60,233,173,131,253,136,230,201,92,15,20,69,82,127,97,46,132,64,150,91,17,221,162,109,90,182,50,109,187,44,69,221,193,158,213,107,187,12,129,31,27,206,126,105,53,152,152,243,86,53,175,159,198,150,209,148,26,
+238,142,222,33,205,247,194,68,35,241,240,39,105,138,238,139,44,215,187,145,128,0,84,239,29,244,190,28,131,53,70,221,22,205,128,7,159,31,159,153,133,218,190,73,2,249,143,234,170,247,222,132,210,80,228,114,4,40,209,145,36,126,171,8,240,49,8,227,204,16,196,0,25,235,109,69,120,255,4,132,207,149,90,86,211,81,25,25,104,142,83,17,118,86,31,210,166,23,61,167,58,154,176,203,247,163,219,175,188,97,110,145,178,245,114,199,150,249,59,28,120,14,237,126,226,75,7,52,119,233,73,69,224,84,164,11,142,24,233,3,250,209,107,238,38,115,67,196,49,146,105,199,9,130,249,10,129,132,68,164,97,98,196,64,150,70,149,112,110,178,247,61,218,63,49,197,186,87,123,53,154,139,183,254,199,106,188,187,153,241,164,121,58,7,99,155,128,145,181,219,106,227,217,79,140,207,225,4,43,112,107,8,100,153,6,119,71,15,48,107,195,121,59,118,137,134,204,204,194,220,185,183,232,227,173,191,72,220,228,117,253,188,7,163,131,162,199,120,4,241,173,6,164,70,41,188,
+0,133,231,56,64,25,100,222,120,57,63,61,114,94,98,42,13,9,92,193,213,53,141,78,244,208,230,150,158,222,16,136,15,105,170,86,47,16,146,142,220,93,89,59,160,198,105,134,79,249,197,109,210,15,95,119,17,129,196,163,153,7,18,228,210,142,172,140,114,92,63,133,184,225,243,63,24,225,180,28,135,20,1,239,36,69,64,70,0,145,20,158,119,161,244,241,54,177,208,124,78,114,46,186,178,157,151,250,8,137,187,40,239,147,213,251,126,54,90,217,90,242,206,114,164,216,121,108,169,110,109,61,174,17,189,147,112,76,31,89,111,138,190,179,200,143,9,17,173,31,128,9,205,157,66,109,69,103,176,60,165,21,191,62,64,82,246,39,206,77,194,182,158,87,194,216,132,38,117,148,140,222,230,190,37,137,145,62,144,112,147,225,83,233,218,179,20,9,39,92,136,101,212,237,98,99,96,116,201,182,255,72,245,238,38,236,2,140,46,246,90,208,6,67,16,230,230,179,163,13,116,228,45,217,147,216,209,209,93,63,20,87,71,189,147,46,137,23,154,168,64,204,151,190,143,40,
+140,64,161,139,111,88,134,74,224,72,149,123,254,84,98,217,57,216,206,195,135,183,69,235,12,147,26,212,147,50,76,210,101,12,100,160,161,162,168,202,165,112,40,238,122,115,172,189,114,34,224,41,155,99,212,244,193,230,148,78,52,48,79,67,250,190,113,171,178,185,100,228,113,217,17,16,127,238,101,62,210,52,126,159,244,9,121,233,87,143,74,184,234,152,124,219,99,157,18,183,122,232,232,122,204,201,110,211,45,197,30,96,146,199,29,143,112,208,188,3,31,168,108,141,218,169,184,236,235,55,67,14,80,161,194,223,110,246,111,3,97,159,148,198,62,76,46,97,169,128,215,94,30,219,28,86,64,3,225,67,134,91,154,16,20,62,68,112,239,247,72,60,21,148,241,107,36,117,80,64,45,38,216,52,219,119,224,107,93,35,155,205,88,115,176,221,108,101,204,70,55,6,124,175,125,78,202,164,241,76,41,215,194,33,238,198,33,236,208,46,112,125,184,38,171,75,65,51,123,91,209,56,84,92,168,158,90,11,13,26,91,59,217,133,174,101,161,3,108,196,251,228,39,43,16,245,
+245,172,114,65,179,29,134,194,27,28,208,199,247,173,67,42,132,89,239,161,125,245,24,4,62,16,238,43,26,189,212,33,210,125,30,74,30,208,34,20,123,187,155,47,77,186,207,183,133,162,37,216,110,70,115,236,217,121,35,205,11,173,85,116,188,166,206,147,38,147,13,79,52,147,134,150,205,76,183,156,0,33,24,104,42,251,116,24,168,187,233,116,110,173,129,49,233,64,114,222,153,144,29,0,6,128,230,126,155,17,192,184,198,69,177,56,27,174,239,155,14,242,56,19,188,230,189,187,131,225,174,1,25,86,249,205,145,39,229,32,252,15,169,78,133,104,196,63,49,8,226,147,237,38,95,102,135,190,81,157,170,63,244,167,248,105,164,117,141,158,223,203,242,181,90,32,3,84,106,71,65,222,109,50,152,24,5,35,152,115,85,44,200,200,68,64,195,40,17,133,19,234,42,120,223,111,188,156,77,76,43,241,103,85,117,103,191,145,204,248,159,27,248,204,237,7,155,216,194,136,136,89,196,61,146,199,253,1,193,182,124,100,238,47,188,32,134,145,22,213,201,215,227,217,109,62,
+32,64,84,234,171,164,139,154,147,141,17,199,137,223,176,250,213,173,59,229,186,135,78,241,170,10,236,112,171,159,203,81,124,228,112,86,178,85,119,169,23,121,44,236,198,58,159,62,128,137,75,197,85,13,77,6,190,206,139,247,207,22,27,117,183,29,15,94,109,250,188,107,173,250,240,208,70,77,25,77,5,149,241,244,202,136,76,110,242,116,157,100,252,40,94,191,248,207,187,146,239,66,193,65,217,116,219,179,221,140,139,200,23,12,220,209,218,47,112,63,32,247,222,72,84,94,134,149,205,92,43,173,14,108,150,235,124,56,101,78,2,233,124,18,116,82,117,198,38,109,90,89,200,116,121,233,69,161,4,7,62,118,139,121,220,163,107,80,143,29,184,195,65,223,190,194,254,65,160,103,214,37,155,171,136,115,13,160,210,69,102,251,165,140,123,10,13,112,58,120,137,74,67,24,213,70,66,126,121,176,79,156,53,150,249,130,105,158,129,183,200,93,171,153,36,95,199,182,249,154,120,186,89,39,231,80,93,167,28,191,102,33,253,27,46,133,141,52,114,9,169,254,61,79,188,192,
+82,78,40,86,103,49,124,138,232,125,88,121,237,50,235,185,231,45,95,118,184,149,150,239,141,203,84,53,244,164,91,55,208,233,89,189,140,234,42,174,40,224,164,126,192,213,131,25,19,73,134,244,41,47,51,77,113,49,222,35,106,72,41,123,130,72,30,175,84,199,75,112,118,30,13,155,233,158,82,167,110,111,170,154,102,201,120,152,5,252,85,109,232,115,106,103,150,182,103,182,170,123,122,202,153,117,250,221,220,215,80,245,21,214,216,90,166,204,141,54,221,189,188,113,171,169,1,151,92,151,204,133,115,93,234,46,70,238,185,21,111,29,244,251,71,139,94,107,79,54,27,12,39,225,62,228,221,243,143,216,164,249,73,155,189,53,40,236,222,109,247,154,212,38,76,91,106,110,12,212,18,185,209,142,215,27,17,35,68,142,65,78,198,218,107,6,70,17,118,77,93,123,132,24,128,68,22,54,139,24,183,246,48,242,174,158,228,218,87,170,82,47,189,29,160,177,124,130,241,156,89,93,18,196,230,238,98,237,235,132,227,13,45,187,176,220,205,34,239,180,135,242,150,46,116,113,
+97,167,172,247,167,155,54,51,215,12,175,189,90,6,144,102,21,57,9,137,203,239,15,244,103,22,76,202,24,184,100,116,134,10,167,15,118,17,160,151,15,233,135,221,64,116,20,239,115,237,226,244,50,98,4,153,59,64,178,215,41,169,187,38,235,97,90,31,196,13,170,26,213,0,207,61,157,129,1,231,37,42,216,198,217,52,145,119,31,202,87,185,114,206,26,47,242,38,230,224,21,36,122,9,66,225,13,161,90,126,62,222,66,156,149,195,239,192,77,203,237,11,199,184,198,172,100,250,33,53,0,154,223,204,164,214,147,63,145,37,238,201,188,14,192,235,148,96,152,104,197,181,94,45,94,48,221,144,245,58,182,240,177,219,59,203,181,2,80,178,76,157,195,72,75,181,96,26,174,88,220,173,242,149,201,22,43,86,254,200,239,245,73,141,232,235,237,134,14,93,142,73,140,33,21,76,187,116,128,203,59,109,102,119,221,6,164,85,231,125,23,82,89,238,245,214,144,89,16,38,118,254,165,14,4,192,97,85,48,248,203,237,30,141,177,107,198,62,62,28,195,202,57,24,29,48,
+124,83,130,177,80,37,224,199,219,247,6,80,254,92,0,64,127,46,0,126,22,255,97,255,83,107,227,78,57,79,193,124,112,174,124,79,203,121,202,31,211,114,77,83,46,79,197,60,224,201,83,71,67,64,42,117,62,169,152,246,242,245,238,206,133,104,228,176,110,14,110,147,163,171,122,85,113,208,208,243,16,48,155,218,67,184,125,201,215,7,0,85,79,191,203,186,156,87,109,170,78,224,32,83,102,227,216,70,179,173,106,151,92,133,167,49,179,214,231,47,83,160,75,107,103,65,196,171,21,185,138,227,185,84,192,56,21,166,8,128,251,161,102,95,129,133,145,120,218,117,76,133,141,223,226,204,209,231,250,109,129,212,121,44,6,52,242,152,132,45,147,68,152,139,233,142,86,85,132,83,118,243,201,181,162,40,21,188,223,110,82,209,40,40,249,179,21,27,202,63,192,125,216,216,89,155,48,170,235,175,106,54,235,167,199,196,194,59,94,229,48,36,224,137,76,148,246,246,181,42,83,62,253,101,93,99,24,66,137,133,129,214,121,43,83,21,161,162,118,183,152,214,25,178,176,52,
+70,104,228,150,102,85,149,199,198,90,250,164,254,6,86,49,24,103,64,125,132,19,89,130,5,100,251,171,237,144,243,61,38,159,131,103,130,53,8,9,114,178,55,95,151,228,221,68,171,100,88,40,138,59,123,54,181,13,143,112,213,35,129,168,114,73,85,82,25,200,252,170,146,80,5,166,117,164,111,229,232,83,255,85,10,68,185,110,6,10,97,59,176,140,148,154,56,40,19,100,234,22,181,27,103,248,92,185,116,152,228,170,142,215,49,177,20,80,218,202,73,64,33,246,36,61,186,205,143,125,196,140,180,80,216,190,198,180,151,225,69,162,0,191,255,120,64,89,223,66,230,185,88,114,89,102,220,79,64,181,162,238,33,95,94,50,40,64,99,245,104,243,109,229,33,95,22,51,144,142,135,208,150,135,160,99,162,169,0,14,154,234,125,153,120,79,220,166,58,168,66,197,67,159,136,192,54,155,64,112,10,239,219,34,146,72,96,91,85,121,89,63,241,68,27,13,6,133,76,111,172,159,73,209,73,70,51,228,165,239,131,177,233,4,210,227,116,76,12,153,201,198,12,252,193,194,
+54,163,145,139,250,159,116,35,198,216,88,92,86,200,185,34,230,79,149,206,238,214,16,242,109,164,78,66,225,225,134,174,135,204,86,250,243,130,65,153,234,131,146,2,209,77,44,200,163,118,249,197,143,126,219,234,232,181,102,120,175,233,245,209,32,45,117,115,100,7,68,168,35,83,168,142,217,210,46,17,209,16,133,142,156,126,50,201,204,197,250,77,169,240,195,118,15,76,34,111,129,37,121,2,193,205,132,215,49,90,24,174,149,78,33,183,58,172,26,97,144,107,107,179,165,185,171,182,72,61,36,183,211,201,245,56,123,155,89,32,76,81,105,158,146,18,178,197,225,234,205,240,188,74,146,134,10,220,227,229,231,201,49,26,7,45,188,99,226,153,117,27,170,27,109,115,57,90,191,25,249,126,61,59,228,137,6,46,168,10,94,17,18,165,103,253,224,181,27,68,54,43,217,187,3,34,85,22,220,239,138,164,146,103,34,73,99,168,130,2,85,225,125,15,56,17,47,234,233,153,233,47,119,41,147,118,104,218,28,57,30,243,154,69,98,30,127,230,123,243,70,60,41,8,109,60,
+70,10,255,253,117,71,129,82,120,151,215,52,2,232,153,199,180,177,84,250,164,33,146,178,182,191,214,215,95,132,132,36,7,13,147,33,82,121,131,218,133,106,251,224,25,49,205,70,105,134,136,112,204,171,144,224,37,239,159,189,129,249,181,44,106,77,140,65,13,91,116,4,162,180,78,134,25,207,180,224,134,251,136,253,153,191,223,41,234,202,75,0,116,230,45,108,69,0,206,160,183,90,181,228,162,231,43,17,203,48,119,150,243,85,163,211,223,110,202,23,7,171,44,118,127,255,15,181,191,7,41,255,139,63,253,147,255,227,103,68,239,175,126,249,235,191,253,61,195,253,47,254,242,23,255,234,63,65,80,254,67,234,139,127,224,188,95,255,147,255,246,31,255,203,255,245,31,255,203,159,40,179,255,195,111,126,0,244,127,249,127,254,55,63,42,255,253,175,255,230,231,218,159,254,161,248,7,226,253,47,127,251,39,191,249,237,15,156,237,159,255,234,215,255,246,87,63,81,113,127,253,155,191,250,55,127,251,71,135,254,206,212,31,129,149,127,245,239,126,79,166,253,179,191,251,57,
+5,199,15,92,248,207,153,5,126,241,87,127,245,171,95,252,245,15,18,237,191,199,200,255,233,223,231,225,119,43,126,232,255,217,197,255,237,87,191,248,229,255,250,155,191,252,187,111,23,127,95,252,131,139,191,247,237,39,191,254,228,95,127,27,254,197,191,250,14,199,159,125,87,126,243,219,31,185,40,126,243,163,250,131,103,255,19,79,252,175,127,245,3,91,251,219,255,231,87,191,252,211,159,136,188,191,252,245,95,252,197,183,131,63,28,250,139,191,254,237,191,254,129,35,254,143,219,245,83,158,236,63,216,253,157,252,39,37,63,172,255,226,151,127,68,209,253,71,63,229,254,248,238,139,191,252,61,134,247,55,191,252,147,63,255,237,95,253,221,31,19,155,255,252,47,127,253,87,127,246,219,95,252,245,47,255,190,134,255,47,191,253,229,79,44,254,239,166,254,84,252,187,159,58,241,167,68,8,223,131,226,251,236,31,72,225,159,128,192,63,250,251,103,157,191,254,61,186,247,119,205,253,65,253,254,213,175,127,240,145,127,159,79,224,119,56,224,31,168,224,63,251,125,232,254,175,
+255,242,143,64,236,127,250,39,255,227,239,204,252,249,95,126,119,208,207,125,247,35,241,202,143,218,207,142,252,30,231,255,123,158,241,143,52,16,63,199,230,167,196,15,191,250,119,63,65,182,127,78,230,240,55,255,230,175,254,0,212,254,185,99,190,189,253,205,223,254,12,184,254,15,66,252,171,127,244,31,99,134,255,48,46,254,230,103,102,244,223,252,213,119,96,127,253,35,225,195,31,99,181,255,236,87,255,247,47,254,237,175,127,251,111,254,250,103,235,63,14,251,33,254,14,208,95,254,250,111,254,246,71,78,136,31,99,255,255,63,84,226,255,238,31,166,18,255,147,127,244,211,199,63,253,249,227,159,253,81,122,147,31,59,127,130,190,255,124,192,191,47,254,179,159,139,255,211,175,254,246,127,255,187,191,249,161,233,143,185,196,63,157,246,167,255,81,231,254,87,255,245,223,15,63,254,39,255,89,244,227,159,204,255,80,249,187,219,194,63,168,238,159,254,65,221,63,253,79,233,251,103,191,75,121,240,135,139,255,31,210,249,207,254,160,243,159,255,127,39,52,255,33,24,255,243,
+223,252,225,210,251,7,57,205,63,245,201,15,238,247,191,254,221,161,255,197,31,165,95,248,207,34,50,255,243,159,159,149,168,255,135,68,102,22,54,77,44,77,217,158,86,27,80,123,59,55,63,149,130,66,148,151,225,83,220,209,53,218,59,148,70,169,32,175,11,84,230,226,60,3,65,158,215,205,214,154,110,189,147,193,78,74,140,201,252,236,246,197,58,138,245,7,91,174,110,173,25,140,185,166,186,188,51,155,115,201,186,68,146,203,1,187,193,105,7,128,141,152,90,1,82,48,124,203,26,79,175,11,163,208,72,232,42,32,156,14,206,91,37,86,199,99,235,197,182,71,150,239,175,27,55,190,183,57,9,81,183,72,38,29,131,210,75,90,58,222,84,199,240,108,242,238,40,96,137,133,70,92,75,201,111,190,25,76,134,145,31,36,95,156,37,85,85,34,8,184,127,144,240,50,114,241,210,121,8,28,150,85,67,11,244,214,238,7,244,12,190,89,120,120,152,79,73,11,177,141,127,152,203,94,56,133,201,233,97,190,24,118,214,147,128,215,41,108,19,139,248,49,116,207,115,201,
+219,11,80,153,173,249,187,141,87,178,21,23,36,91,236,168,202,187,97,166,137,120,200,124,39,249,80,97,20,242,100,167,94,32,247,37,230,250,226,115,225,142,241,114,246,238,83,192,36,92,12,224,89,12,172,172,64,29,111,96,50,187,232,193,124,217,35,208,35,156,126,237,109,101,241,70,146,38,8,85,251,222,174,101,75,103,143,227,0,210,16,9,111,30,98,88,132,120,71,106,132,73,0,14,104,225,230,206,97,148,176,195,29,2,180,139,182,25,152,223,64,69,59,164,23,187,184,190,145,105,217,244,164,18,244,3,0,23,186,10,231,177,133,139,196,79,252,66,208,102,95,35,243,97,223,78,228,222,102,154,129,46,242,22,193,0,155,39,180,143,47,139,56,240,65,237,136,162,224,18,86,72,71,116,203,68,190,80,20,60,2,54,195,143,18,126,60,214,143,178,157,62,165,71,93,181,83,21,22,27,48,191,73,178,124,225,68,85,160,25,39,160,106,245,5,85,31,48,208,133,72,23,148,236,122,254,204,109,83,124,214,232,162,228,106,77,185,144,2,44,106,33,202,54,119,187,
+228,237,40,55,6,76,198,135,255,104,188,197,31,0,195,87,144,39,6,175,103,14,137,15,147,209,40,184,184,62,176,186,2,24,122,232,205,30,117,224,68,103,254,133,242,170,194,191,211,149,202,199,59,253,128,47,42,200,131,207,187,252,123,245,157,161,4,185,140,17,35,102,247,83,47,150,184,24,157,179,96,210,171,74,71,160,9,3,249,151,14,65,238,150,215,203,103,27,118,67,189,119,213,139,149,218,168,118,241,223,163,22,100,222,39,209,12,185,31,235,22,251,54,79,138,87,235,151,63,247,62,97,54,143,157,52,83,234,177,241,170,94,210,77,252,204,249,64,170,189,13,9,38,27,196,40,201,30,11,87,8,30,15,4,24,206,214,59,115,163,91,69,162,53,75,105,33,182,82,124,77,136,27,21,134,184,138,5,104,109,172,166,134,164,14,144,196,51,103,33,118,213,245,236,209,120,169,49,95,44,239,19,132,99,15,215,84,35,45,43,55,200,42,27,160,156,30,130,54,36,24,177,122,69,140,251,17,52,46,59,141,205,26,131,214,234,128,104,59,109,11,200,155,117,90,200,
+237,166,74,112,229,39,200,184,111,57,7,130,141,83,203,190,247,50,192,185,149,195,178,94,111,110,197,152,242,72,165,47,108,197,80,77,111,87,166,10,195,42,39,91,229,168,13,39,3,149,81,67,127,12,223,149,98,27,246,154,136,178,75,73,144,123,32,209,159,142,51,197,100,231,14,16,223,18,231,183,105,250,78,147,218,240,248,197,130,78,63,34,63,130,151,226,234,49,210,27,217,192,210,73,183,130,16,84,226,78,145,67,241,46,62,128,179,189,22,56,49,53,252,34,193,120,133,61,56,244,231,37,56,246,230,79,189,51,199,45,179,219,82,58,250,244,246,195,5,134,75,28,227,102,231,33,66,159,61,163,225,93,13,153,203,182,171,12,114,165,101,53,217,87,140,8,252,115,229,199,234,239,154,69,197,236,18,119,162,98,166,134,59,89,4,112,159,160,9,135,32,230,215,91,13,84,241,131,247,30,111,27,196,216,132,30,28,127,191,146,222,129,53,133,243,246,233,209,162,225,239,154,230,57,103,94,71,93,155,27,167,54,79,45,76,155,103,115,118,81,100,179,249,226,176,89,
+139,27,70,83,125,226,98,113,41,107,215,177,34,153,163,170,167,1,85,120,90,214,163,25,89,24,214,160,89,156,90,163,173,24,120,99,216,43,7,36,192,66,174,107,220,105,143,73,147,40,211,188,137,7,62,243,65,217,202,28,210,158,232,99,147,142,31,23,1,75,66,111,32,75,45,111,206,193,249,81,25,165,231,35,98,171,199,84,30,163,177,102,86,92,49,45,170,172,158,188,209,207,40,162,250,162,216,247,236,144,95,76,227,152,52,242,197,136,41,178,202,78,7,30,1,166,69,194,60,123,210,13,57,143,225,246,98,32,27,177,85,200,153,30,107,152,170,133,14,107,121,10,243,24,48,17,187,104,188,178,185,208,181,63,80,32,55,241,156,97,12,61,98,28,121,219,58,42,104,226,18,22,149,40,166,7,212,115,11,216,120,40,29,182,130,3,70,148,194,193,169,43,155,232,162,71,207,32,39,109,122,191,111,17,134,124,209,58,11,23,189,126,34,39,174,183,11,221,8,27,244,70,105,233,28,214,65,8,39,113,255,91,205,16,93,139,46,119,176,246,16,81,74,200,50,215,
+32,151,23,232,138,138,142,199,248,89,159,75,163,217,48,85,109,23,37,109,182,143,165,106,86,5,55,216,116,45,86,175,44,31,38,161,57,29,204,224,8,122,194,115,198,14,67,42,86,8,227,27,175,28,151,215,52,63,176,204,45,191,33,55,203,29,138,227,137,207,113,124,145,69,70,76,110,140,174,14,28,195,41,116,4,187,95,96,7,190,203,63,246,114,80,108,135,169,189,124,51,45,14,106,75,120,146,254,2,11,133,92,165,53,129,86,48,186,204,212,14,151,168,25,224,108,14,160,13,98,132,146,72,149,222,18,166,172,58,119,167,223,86,80,192,85,34,224,178,237,202,128,149,134,241,174,38,219,133,121,165,162,69,41,59,107,39,181,59,168,231,93,97,166,23,226,163,70,72,141,68,79,160,227,104,154,209,145,179,113,164,213,206,121,172,121,88,211,49,5,195,13,246,190,189,55,216,98,122,108,1,15,177,164,139,61,46,9,5,235,64,157,35,226,124,202,247,100,14,82,27,25,64,98,9,116,114,242,65,169,122,164,212,106,230,101,141,167,183,174,236,214,133,17,242,222,
+50,13,182,174,133,105,17,251,200,6,249,241,204,61,228,124,207,240,190,24,40,226,213,36,222,222,29,182,55,6,229,104,16,48,138,92,113,144,173,92,107,18,74,154,124,96,24,101,180,67,149,44,62,72,26,146,230,166,201,22,224,229,161,146,166,223,45,216,163,183,183,49,236,92,132,184,58,83,173,2,170,184,88,90,219,49,109,0,107,89,15,25,236,62,56,72,220,242,77,109,130,239,169,244,101,17,13,53,57,52,126,142,232,232,225,145,218,143,63,250,131,248,220,86,181,177,25,38,46,60,243,3,204,236,98,200,136,87,205,132,110,158,168,176,9,254,76,45,59,182,156,239,99,203,146,158,230,36,144,75,107,210,223,255,44,185,67,192,209,241,100,209,113,163,25,161,212,194,135,180,206,45,21,176,29,75,189,76,162,239,219,210,48,240,133,242,106,99,53,25,213,106,252,160,42,188,65,205,113,217,96,233,40,34,83,25,61,44,231,245,113,211,69,159,156,191,221,242,222,75,109,94,13,185,41,154,69,144,99,90,184,220,148,78,174,141,99,12,37,100,122,39,7,121,195,59,
+194,241,29,144,54,167,1,151,171,45,228,241,201,197,16,81,146,85,27,237,114,251,51,210,130,54,81,139,231,111,168,196,13,125,78,224,233,230,26,189,88,59,225,183,143,84,45,51,159,101,189,76,153,217,116,234,181,26,95,212,22,50,81,35,245,131,19,88,211,128,0,45,203,134,82,34,97,112,131,37,250,154,178,34,104,184,3,134,58,104,177,23,177,25,63,161,153,129,235,20,32,255,133,52,203,228,208,181,107,2,3,198,52,131,251,209,225,15,170,232,185,100,34,158,43,106,146,242,221,206,36,154,200,136,131,147,237,48,154,242,236,71,171,186,214,116,154,135,138,201,40,187,178,33,93,6,58,3,150,197,43,43,89,87,55,1,102,251,190,130,128,210,106,75,151,34,89,130,79,41,52,32,50,217,188,126,79,70,151,4,113,97,63,216,204,192,238,123,254,228,31,226,100,131,229,25,81,186,184,171,249,141,190,188,205,133,204,138,103,151,28,154,26,74,184,197,180,196,233,37,246,116,93,2,203,136,219,93,5,10,75,86,180,145,226,181,3,193,185,229,245,57,175,251,201,111,
+82,234,111,31,24,123,82,129,188,114,251,27,136,73,121,226,215,77,202,194,219,215,170,146,170,230,0,238,65,218,219,63,66,28,6,176,128,79,61,105,209,147,72,182,150,41,243,172,128,48,12,87,42,48,2,54,148,161,111,92,101,196,235,171,245,206,4,215,146,74,55,85,94,75,63,117,34,237,148,85,141,124,234,10,242,120,213,177,15,217,223,50,42,99,173,36,44,203,41,21,243,83,82,141,118,121,83,200,3,48,76,216,98,66,20,109,90,161,109,54,124,104,96,70,135,24,53,137,139,2,107,90,60,147,73,67,76,13,160,52,76,124,190,136,198,40,26,150,141,109,252,51,21,230,136,7,138,27,226,10,51,237,85,172,214,166,21,183,142,80,20,229,61,191,77,95,18,81,226,227,88,184,98,179,45,129,106,174,110,117,210,66,30,45,74,76,4,55,113,158,119,62,140,41,136,214,92,195,192,11,113,232,155,196,195,63,246,67,17,140,113,113,13,141,193,196,248,175,106,46,103,224,51,106,87,116,123,26,63,50,92,65,113,36,38,254,244,61,117,76,63,168,85,249,64,3,
+204,169,111,235,124,35,245,24,128,89,89,21,164,155,101,69,178,172,104,155,116,71,57,14,84,103,215,86,194,179,223,154,147,121,213,42,49,127,29,250,129,4,187,152,24,87,78,95,169,73,193,125,113,85,54,253,3,225,58,126,56,204,182,137,22,14,17,227,213,111,2,156,38,244,190,60,67,47,98,169,45,104,68,47,46,44,65,29,198,47,248,198,189,90,9,118,179,93,93,169,234,214,155,157,152,88,145,211,93,200,188,80,132,131,166,32,162,183,51,179,221,119,113,128,157,211,54,31,142,203,85,242,105,95,222,231,23,67,47,34,201,124,81,3,79,83,25,177,153,243,166,101,206,138,243,226,233,55,7,158,86,146,219,51,39,253,216,91,41,210,109,155,230,218,0,209,123,176,53,148,22,181,40,124,27,194,66,125,191,125,92,115,111,191,4,39,187,231,136,230,203,85,70,243,243,162,219,97,144,27,111,125,124,95,72,167,181,229,192,197,26,14,232,85,163,49,249,222,72,135,83,81,202,186,69,195,63,111,74,217,5,178,55,67,185,168,211,151,126,239,60,173,158,190,166,123,
+183,152,69,190,96,211,217,156,10,184,22,24,125,68,239,102,28,183,207,221,246,151,30,131,170,193,43,202,74,71,234,66,66,80,170,174,242,66,246,252,192,51,55,207,180,28,101,89,29,202,108,64,143,206,78,174,52,240,21,241,199,82,66,32,77,93,99,80,83,46,51,109,63,189,195,123,105,142,42,177,235,233,64,36,19,67,59,158,115,127,202,30,157,251,63,190,7,6,153,129,29,249,43,126,140,89,8,55,181,39,238,110,246,86,153,192,146,101,160,242,44,154,226,170,67,137,41,33,98,124,142,24,82,33,0,246,73,81,159,225,91,240,93,53,162,113,113,28,239,221,225,232,155,162,133,19,166,210,63,152,84,131,53,125,40,97,46,27,106,25,9,9,131,139,56,65,228,87,250,54,255,244,229,66,213,99,76,128,20,79,132,134,133,231,109,74,79,120,99,101,146,97,156,119,174,217,198,18,86,204,21,243,38,57,36,201,157,205,141,81,89,40,93,154,195,249,188,74,82,42,103,145,240,38,90,90,180,217,202,225,236,17,90,223,226,76,108,30,17,26,255,206,29,157,78,48,
+173,124,246,33,42,26,46,238,174,248,114,237,165,164,10,245,78,24,11,51,149,52,207,103,246,203,167,74,32,17,19,194,38,97,104,165,12,158,133,245,43,103,17,8,35,223,119,221,116,228,192,140,250,12,153,43,73,42,182,126,171,207,129,108,154,132,236,200,253,162,213,114,161,150,63,43,124,13,32,137,26,192,9,242,167,128,140,33,67,207,206,37,67,198,55,186,201,72,232,165,13,158,105,42,227,159,106,131,210,12,11,185,93,229,13,50,124,221,56,26,91,13,169,186,65,242,186,107,225,29,222,26,242,204,69,111,232,49,255,160,229,237,105,129,221,152,112,9,17,232,195,218,13,70,88,133,174,22,25,219,157,4,25,158,86,208,119,8,22,64,97,202,37,97,157,144,66,89,57,210,115,40,119,80,122,40,167,33,216,101,172,80,66,32,179,68,196,99,186,230,203,195,139,119,45,252,29,132,20,133,16,4,213,228,174,124,149,41,73,72,8,61,68,99,90,246,207,105,10,231,214,226,163,36,255,215,208,249,160,13,17,190,103,72,154,219,99,82,185,165,251,56,135,159,103,53,
+175,50,133,196,157,66,70,44,137,27,254,142,159,227,143,227,215,249,142,31,111,65,87,39,221,79,204,86,247,101,163,98,2,21,144,131,127,40,42,230,31,184,156,176,107,100,140,93,99,96,109,87,121,39,168,48,5,3,28,204,169,38,206,201,22,17,45,140,217,239,97,105,7,79,31,63,162,120,253,54,129,152,244,212,29,217,246,77,210,23,99,167,44,227,122,49,197,205,115,194,88,63,150,23,16,74,66,49,25,42,232,113,6,31,7,71,220,207,119,104,130,198,202,115,243,142,98,210,94,189,240,162,204,49,23,122,145,18,210,136,213,89,45,152,184,125,244,28,106,27,153,152,23,73,201,27,162,254,126,187,105,12,36,4,1,8,245,123,20,128,114,85,41,9,9,255,110,120,155,25,72,160,47,26,81,56,174,221,247,107,231,249,231,170,158,205,73,189,252,148,84,28,12,41,139,38,214,253,198,132,220,41,153,185,24,194,90,219,231,121,133,33,154,254,248,30,82,69,159,139,70,16,91,89,152,228,180,170,70,177,236,69,198,160,100,88,154,55,101,225,150,201,22,111,110,216,
+128,97,73,165,5,18,131,221,163,240,249,213,69,93,248,215,92,31,249,22,55,225,207,147,219,245,42,240,77,73,235,150,20,240,241,62,20,225,74,79,174,21,253,84,17,182,181,47,26,137,232,203,221,71,8,144,206,144,104,221,119,114,103,16,186,137,183,30,116,68,126,146,215,175,33,198,4,109,100,230,69,62,9,153,77,172,181,222,125,207,249,73,53,247,117,102,130,142,127,23,63,31,45,215,189,187,252,46,171,66,155,176,193,176,14,216,167,36,76,75,89,65,184,195,135,73,126,248,30,99,90,96,114,171,252,58,39,232,68,114,148,239,13,37,212,12,249,184,73,126,5,155,3,149,71,42,96,242,121,224,119,97,110,79,242,223,247,30,255,231,183,100,200,52,176,40,199,113,136,248,184,77,8,239,181,189,168,111,90,107,107,73,131,54,74,242,72,238,173,123,66,58,33,113,121,6,108,73,101,21,65,222,51,181,248,228,123,112,121,18,2,92,252,205,230,126,173,72,7,168,174,179,22,243,42,11,22,183,22,39,192,206,48,138,62,161,130,44,104,25,126,122,201,73,207,47,
+78,119,57,215,125,235,76,21,164,93,217,41,240,118,184,41,33,218,205,69,238,117,29,53,58,226,158,62,106,114,63,27,179,197,59,20,42,33,50,60,218,203,93,220,68,160,81,211,146,43,148,103,188,103,105,8,158,175,230,105,147,100,186,97,237,220,242,193,88,201,200,36,238,238,197,21,117,1,207,63,252,164,240,47,254,197,239,158,241,249,250,123,159,241,217,61,61,234,168,225,97,190,253,252,140,79,190,89,180,33,228,70,111,16,144,141,133,113,93,180,79,227,115,198,148,43,89,150,102,115,144,10,165,242,180,168,230,161,112,16,174,169,5,145,206,25,115,126,108,50,159,13,9,21,98,100,120,124,186,245,167,58,13,31,23,122,183,180,200,213,61,252,233,25,159,29,103,85,183,142,152,171,39,120,196,180,143,196,136,2,238,146,38,18,232,241,184,11,38,213,210,62,54,21,148,184,110,205,231,85,198,114,204,115,65,79,22,68,33,84,23,173,69,19,4,97,110,39,180,104,71,200,124,115,11,247,78,164,241,10,201,2,41,146,115,70,164,205,49,134,156,237,94,196,60,142,
+192,34,207,83,78,156,230,145,132,16,154,24,206,147,10,90,94,152,4,134,206,6,77,207,105,212,183,74,197,161,218,168,101,166,179,252,242,22,159,216,107,233,84,35,124,25,74,250,14,42,118,243,69,181,204,253,152,86,75,16,220,3,223,60,74,234,133,72,208,222,10,249,188,196,136,243,155,101,122,37,18,57,247,20,60,88,64,254,56,209,42,152,14,62,19,34,88,96,167,182,18,10,17,50,54,196,219,106,173,141,252,210,53,15,149,183,55,160,241,122,239,194,152,95,2,109,92,104,177,164,131,8,3,37,53,49,143,161,99,175,217,8,238,87,9,46,209,163,205,21,1,55,204,98,17,64,162,194,210,244,233,91,37,63,210,62,72,246,119,58,189,17,64,148,222,210,104,178,129,139,42,235,201,182,225,103,172,237,213,79,19,65,125,33,137,224,230,52,3,221,4,6,97,85,186,5,17,132,111,187,134,65,126,226,192,79,126,3,60,68,251,79,100,38,17,202,245,39,19,105,174,229,215,139,170,195,79,151,92,188,59,228,29,119,163,49,102,97,41,97,239,18,49,243,18,37,
+238,124,168,53,101,235,24,136,195,79,226,22,48,185,71,81,70,242,54,162,141,125,175,71,128,116,242,10,6,243,36,93,217,170,38,141,6,192,208,69,240,89,93,103,19,192,106,84,90,83,38,148,1,21,46,28,175,243,236,11,0,182,240,134,4,105,216,62,98,27,141,229,99,228,192,143,134,125,87,162,91,6,233,222,110,77,104,51,104,55,112,6,92,235,73,77,35,77,230,97,94,118,156,220,66,126,222,38,82,154,218,41,237,60,247,45,96,145,186,194,131,253,42,211,231,210,48,82,80,4,232,139,31,143,201,155,139,181,50,127,201,21,83,233,231,36,220,200,249,235,43,184,228,130,128,68,61,223,83,86,168,10,248,226,90,150,209,59,5,61,66,220,141,225,96,91,68,152,37,129,224,241,132,107,198,6,141,57,57,145,137,141,138,135,101,24,247,227,242,176,236,238,247,160,168,94,100,94,146,198,44,118,215,11,126,58,130,177,6,132,240,228,160,41,24,146,162,207,20,125,152,49,237,212,156,134,90,139,95,24,218,123,149,218,43,126,142,246,234,81,95,246,64,235,179,239,
+119,211,192,47,101,213,106,249,155,173,208,115,80,98,242,26,167,16,17,73,219,69,121,72,136,166,6,208,33,6,166,43,183,105,225,248,156,75,115,24,159,70,227,55,255,166,173,138,66,198,164,253,0,183,67,177,143,15,251,186,175,14,102,95,243,2,187,202,111,125,175,214,42,38,178,110,21,161,132,205,183,136,249,250,12,23,83,68,197,137,82,184,207,196,231,195,62,51,71,157,58,132,13,232,242,240,91,217,15,194,151,67,115,91,248,90,188,120,251,68,144,207,176,138,28,227,210,242,72,16,28,91,160,109,102,45,148,228,34,108,71,129,103,102,192,56,211,58,105,24,153,213,167,213,131,99,166,229,14,126,87,229,204,32,191,48,56,207,85,62,25,182,248,250,27,161,48,122,151,189,47,213,159,235,87,213,181,51,206,131,177,237,228,20,19,50,170,119,239,231,4,6,37,112,15,59,209,108,132,42,134,147,120,21,75,90,30,251,163,44,235,247,34,64,253,238,121,127,1,225,25,238,170,112,203,152,178,157,142,147,50,248,216,82,178,40,112,38,221,179,94,45,35,247,114,37,
+95,108,231,236,6,55,44,148,103,164,236,54,150,57,5,193,2,56,180,226,0,98,161,192,71,186,236,184,160,172,202,162,198,173,35,219,51,130,4,137,218,17,156,13,81,165,112,146,168,60,225,84,180,54,183,174,99,159,16,187,18,124,55,194,116,226,43,22,71,167,61,93,128,139,137,38,175,225,130,100,77,60,210,20,131,210,177,41,148,182,97,130,211,219,75,47,161,118,134,102,43,73,58,126,109,224,85,195,131,234,9,143,48,182,121,10,66,151,196,224,236,2,114,253,38,42,131,62,103,104,235,113,14,17,160,122,2,215,58,57,165,117,7,57,35,52,86,135,160,67,8,229,240,17,226,56,33,238,192,14,215,159,45,161,155,166,131,181,147,28,19,172,198,254,153,198,189,149,229,8,160,76,44,107,199,161,201,172,209,142,53,50,232,35,208,8,192,213,59,140,161,140,220,76,141,189,67,68,19,18,29,117,197,113,60,31,57,199,245,139,167,20,83,122,228,9,236,26,232,201,45,117,127,253,205,107,212,145,106,42,249,198,94,47,42,171,64,70,53,188,207,143,163,29,245,99,
+150,186,136,140,98,191,119,182,206,23,228,31,204,152,249,93,137,91,157,191,157,6,233,173,122,186,177,168,57,175,32,31,65,70,147,19,139,140,18,23,238,43,218,131,203,150,166,108,6,191,68,9,65,76,124,168,246,124,203,97,118,32,26,97,101,190,11,185,68,131,29,94,178,73,75,246,249,107,167,76,188,187,23,207,239,249,60,105,76,54,7,62,193,50,77,41,229,170,130,62,101,221,156,48,217,120,190,160,196,253,205,188,31,26,253,221,43,168,61,40,46,67,216,131,221,222,220,41,132,194,226,42,169,127,197,208,175,131,180,32,231,225,87,31,31,222,78,115,53,35,170,251,44,115,239,189,216,6,126,182,85,232,214,219,12,80,145,70,156,151,221,210,105,101,175,36,182,202,225,141,94,247,10,11,190,91,164,192,39,11,200,84,56,142,50,173,13,88,97,166,117,182,9,106,228,95,23,203,120,136,70,211,61,234,188,13,139,156,84,120,35,179,173,108,100,212,72,109,228,18,142,109,90,109,135,23,25,64,108,151,157,66,149,158,140,138,76,218,54,57,133,128,140,248,194,37,
+88,67,255,90,188,190,68,26,210,212,71,150,49,133,173,20,213,83,127,71,154,102,35,116,41,222,171,42,64,120,82,69,106,246,45,29,200,198,101,217,72,90,151,43,81,226,190,42,249,218,199,178,60,165,3,203,169,40,91,229,131,20,1,50,118,66,43,97,190,245,215,216,118,250,59,54,9,103,41,184,169,228,108,24,144,200,172,208,56,131,214,213,159,163,73,151,180,7,163,214,194,34,129,214,28,231,229,146,141,163,30,112,67,170,193,226,102,130,139,211,79,59,187,225,115,139,34,218,29,193,219,9,81,255,72,32,139,73,114,227,185,35,20,148,73,160,226,43,229,237,159,46,196,82,171,99,63,12,146,75,39,219,229,186,5,129,11,71,34,155,241,202,79,135,128,130,92,54,74,209,106,223,200,211,137,134,94,164,136,223,240,208,95,178,87,204,243,137,14,86,233,97,42,227,148,52,75,148,173,115,240,37,204,119,31,45,167,114,11,208,227,45,169,20,196,165,110,149,162,53,154,83,209,59,13,119,113,186,163,95,240,2,209,49,131,113,199,61,91,225,253,204,1,131,140,159,
+138,9,21,78,249,1,90,1,85,91,118,236,67,196,220,184,194,235,233,59,239,86,226,245,107,18,94,109,212,20,206,85,180,158,173,126,23,70,141,148,105,88,144,211,4,65,225,194,116,68,150,89,199,239,240,17,131,193,184,50,140,129,24,147,114,36,203,175,178,225,167,82,72,215,42,5,186,4,112,41,254,66,125,16,125,167,81,201,72,93,119,55,121,218,68,155,70,159,102,185,107,17,233,254,224,62,183,116,219,185,176,143,80,217,26,13,141,164,220,233,81,121,84,55,197,238,202,26,1,37,209,134,168,219,214,146,235,49,252,145,235,100,191,20,171,158,12,182,213,228,161,171,97,59,12,205,30,178,73,94,253,187,202,118,165,132,116,73,18,95,236,165,27,173,92,11,188,33,238,102,217,208,59,37,182,199,14,101,148,113,162,234,143,103,43,168,80,143,193,246,247,246,205,141,253,132,217,117,74,48,206,210,94,62,184,219,70,51,190,139,20,109,44,241,41,25,136,77,83,234,145,7,4,13,251,66,62,173,200,61,129,168,102,202,171,157,206,81,18,41,65,147,249,105,126,67,
+152,52,132,203,69,176,188,92,64,122,181,254,155,98,254,168,92,94,218,124,82,96,41,127,190,239,52,207,252,171,140,21,129,36,237,178,156,182,32,105,150,204,58,173,209,77,220,185,226,44,185,40,36,159,139,34,101,123,127,69,122,76,68,120,104,167,94,66,118,241,139,188,92,184,151,45,172,66,211,228,153,153,17,30,99,166,160,28,191,37,123,144,229,125,69,237,116,15,169,96,76,140,164,216,123,12,108,85,151,157,223,78,178,192,151,227,70,180,249,205,228,248,92,249,81,203,203,103,231,154,151,227,248,130,137,174,113,31,118,224,166,137,64,56,168,72,39,63,26,67,130,53,90,97,211,5,70,50,50,244,186,82,175,178,12,149,114,78,124,9,46,236,82,183,98,186,168,20,132,172,19,94,152,211,30,45,253,124,61,38,236,234,244,21,87,251,72,0,197,139,160,26,180,176,242,152,188,1,181,65,164,216,17,106,138,149,226,209,76,47,83,224,24,15,191,103,88,231,38,24,82,119,9,160,232,47,237,83,130,160,96,40,234,103,188,225,24,75,3,35,34,205,122,130,15,213,
+161,87,194,101,152,98,227,60,53,28,123,154,0,69,160,215,24,174,190,54,244,49,40,145,11,84,91,23,164,0,211,111,251,94,121,136,193,142,140,15,52,254,76,5,39,237,246,30,123,181,40,21,181,143,75,13,170,195,193,169,116,79,153,160,207,199,240,159,136,239,94,3,51,131,150,26,251,83,14,20,52,155,11,139,96,162,144,141,6,170,16,202,232,174,31,181,220,133,92,221,45,23,226,132,40,218,60,108,202,16,166,250,251,251,101,23,131,1,74,182,91,73,107,202,184,84,252,86,42,80,64,215,3,46,176,112,247,184,69,70,123,74,98,190,132,93,130,60,96,54,5,109,145,222,206,198,157,103,178,139,57,25,93,89,200,64,233,202,96,145,181,178,158,206,157,190,252,159,229,146,147,100,200,27,50,9,222,179,2,179,96,93,160,143,196,123,209,81,157,124,77,98,41,16,107,56,106,31,141,156,207,79,166,88,88,246,190,29,21,47,107,57,208,93,80,10,190,184,128,145,195,181,53,9,96,53,140,65,77,42,135,148,190,126,65,125,222,67,168,65,182,214,89,107,196,180,
+2,213,39,192,167,94,111,78,33,247,68,215,191,142,237,19,208,140,110,179,209,30,211,77,154,190,105,210,183,13,119,188,116,111,230,167,188,72,111,139,73,14,176,133,235,221,71,234,231,103,33,16,117,72,227,152,157,240,178,0,25,145,35,138,58,46,121,39,164,200,27,121,130,128,60,248,0,9,108,85,133,2,106,201,119,15,228,9,94,227,132,124,16,129,73,179,154,222,232,152,67,75,108,88,10,157,78,10,32,173,14,230,186,48,202,70,255,50,208,188,56,114,174,232,233,254,161,111,8,220,95,57,154,190,65,166,217,31,126,246,104,117,242,230,151,160,83,210,215,64,46,160,28,51,193,86,113,241,62,134,1,90,94,191,239,124,229,219,118,18,148,50,229,195,110,208,108,46,211,104,21,100,99,181,126,236,181,98,56,99,99,110,81,150,50,100,211,19,57,138,215,220,118,86,133,215,212,68,146,201,200,158,239,26,124,159,146,221,138,208,35,43,85,69,122,118,149,4,187,192,27,196,181,221,182,124,226,188,77,8,87,157,45,119,29,31,39,99,65,109,132,25,147,151,202,237,
+48,212,46,229,220,209,203,160,211,18,227,157,7,217,142,115,52,81,228,151,66,50,38,27,67,151,203,189,134,223,35,199,15,68,69,161,186,64,53,140,66,218,224,68,23,228,147,106,227,131,219,122,98,117,73,193,101,42,109,190,246,182,75,239,222,114,179,118,215,231,109,238,118,115,22,167,219,241,242,84,130,174,41,163,173,125,47,126,47,2,205,170,215,185,26,134,79,149,224,155,25,177,44,76,21,194,17,17,221,144,214,190,205,81,68,162,75,103,145,41,72,200,112,252,13,213,52,49,212,190,246,12,39,50,202,130,122,5,152,9,99,111,42,222,86,95,207,26,48,129,183,247,124,141,73,148,131,143,185,227,218,121,153,59,91,234,208,116,207,124,239,120,173,143,150,90,62,36,22,134,67,45,153,156,95,134,6,195,190,216,120,220,14,25,32,203,112,213,44,63,91,235,97,68,22,63,41,0,97,244,83,87,217,224,230,75,87,77,71,63,86,24,24,43,44,23,102,14,239,163,253,3,66,187,126,92,235,29,110,71,38,114,24,10,98,37,171,189,150,242,243,98,74,87,233,164,
+118,29,4,22,93,161,33,76,35,210,13,148,27,115,12,122,244,124,63,191,205,101,228,31,67,251,42,81,223,242,199,107,185,203,236,186,72,200,212,69,215,23,51,10,201,16,152,150,9,7,96,212,223,203,254,110,125,87,91,243,65,158,1,210,223,209,37,82,95,14,96,146,10,92,224,190,62,188,21,184,248,253,206,5,214,210,70,105,85,86,39,106,242,182,144,250,195,40,135,186,8,0,63,115,181,241,193,141,64,213,155,32,29,232,168,206,192,160,208,45,214,170,147,79,230,117,100,110,38,228,243,9,173,246,189,76,228,227,166,96,163,129,81,152,110,41,211,3,17,239,71,121,40,1,57,104,150,215,100,157,81,33,95,19,128,176,11,39,71,82,104,227,107,16,120,148,199,22,193,228,149,44,14,94,38,71,40,60,223,187,223,168,63,132,152,124,18,152,172,124,159,246,217,70,202,108,120,25,98,238,59,252,216,249,189,143,111,83,196,68,4,97,140,59,184,208,152,94,87,90,46,39,146,61,126,158,230,45,203,197,69,73,247,10,180,211,3,42,196,46,91,220,104,12,45,7,
+18,7,140,91,38,203,229,46,153,212,42,72,73,10,51,131,47,24,188,54,130,23,43,117,112,245,68,33,24,216,216,31,65,62,217,56,19,212,192,31,87,207,215,106,77,209,152,1,190,61,8,228,149,51,9,185,228,1,15,144,253,1,172,49,241,34,155,173,108,118,200,115,231,148,136,178,7,125,146,24,130,226,149,138,90,80,113,157,60,95,26,245,46,77,211,228,169,134,125,132,60,69,185,26,180,81,209,131,79,63,210,28,89,159,74,136,239,235,174,128,162,173,146,103,167,135,43,170,17,141,198,198,125,221,0,244,137,162,71,51,170,132,207,158,148,170,148,131,45,206,43,43,108,160,213,85,64,234,31,135,242,215,51,250,97,63,170,81,160,154,50,223,146,239,239,188,176,59,76,140,246,233,132,236,52,127,192,239,52,28,126,211,37,169,190,224,83,51,17,205,167,60,173,2,72,88,167,124,207,210,229,65,13,234,17,161,161,98,74,27,198,182,45,44,141,222,115,27,26,146,219,176,50,64,118,123,190,127,127,89,190,240,159,6,241,202,68,197,21,185,13,89,150,113,219,186,
+93,113,191,113,207,243,184,108,186,201,204,117,48,103,34,96,106,22,211,200,179,229,105,65,129,104,150,163,208,159,150,45,43,59,110,177,73,27,233,57,74,31,200,164,141,229,193,55,144,74,72,49,85,65,118,121,203,14,134,131,126,255,52,216,64,178,208,234,62,95,67,217,116,66,147,199,195,101,78,48,225,213,125,55,169,40,191,4,85,172,10,189,47,251,90,22,37,6,230,200,82,4,65,173,153,48,193,229,193,66,219,62,223,157,203,69,213,237,182,46,75,54,65,174,198,244,180,105,6,22,246,82,18,201,99,231,43,114,154,199,242,169,82,154,37,239,111,2,220,231,184,165,130,193,245,40,212,134,43,215,201,248,50,243,105,31,76,33,77,58,39,97,172,229,247,149,4,41,174,132,29,43,57,201,24,158,177,237,7,175,240,119,116,113,85,37,18,105,248,209,105,202,163,229,225,33,249,136,149,187,58,163,55,18,133,246,160,125,124,202,210,158,251,27,136,76,225,6,145,89,74,166,231,129,32,113,40,27,197,255,177,162,97,190,87,69,123,114,88,42,39,82,2,2,143,212,
+11,50,118,39,224,76,16,145,67,108,253,232,117,39,11,142,118,146,83,203,52,122,153,157,184,44,172,69,68,193,37,39,26,96,79,27,237,92,54,66,84,234,74,34,144,47,12,117,94,30,195,201,41,152,136,49,172,250,210,61,177,203,82,63,40,213,48,49,143,77,99,146,4,79,75,71,218,137,51,138,156,107,213,135,131,121,173,53,250,156,247,122,134,167,152,18,37,136,1,133,239,40,250,72,130,64,101,27,0,22,184,65,81,148,76,159,103,207,211,93,166,14,93,126,154,197,194,80,205,89,30,34,14,226,100,22,106,127,210,62,24,116,150,4,153,145,198,180,65,190,81,67,0,87,153,136,128,237,168,40,152,122,25,181,99,241,98,29,174,33,185,191,248,54,101,53,242,179,152,222,221,60,81,133,209,79,188,79,229,44,114,231,80,94,20,212,151,230,222,32,92,145,180,145,165,147,69,126,55,153,207,118,60,39,223,211,15,234,162,169,135,204,109,185,209,33,95,90,49,130,173,84,56,78,153,224,250,20,39,221,243,25,224,58,140,132,49,254,12,190,239,217,118,248,84,203,
+56,76,111,152,233,141,147,128,124,117,243,8,103,177,155,161,234,208,105,27,83,36,4,102,73,242,96,69,30,33,73,53,245,8,185,33,141,16,15,75,115,236,197,122,105,237,165,120,108,49,132,162,116,215,41,121,215,155,171,15,16,197,82,42,119,75,242,39,162,175,171,209,233,32,83,94,209,82,182,201,125,23,232,199,152,149,223,98,215,198,51,142,186,52,205,33,133,14,227,86,56,73,11,203,27,214,14,231,127,119,20,17,3,21,69,210,126,153,24,170,52,117,73,60,143,182,62,247,143,249,237,164,220,66,234,181,212,156,199,187,179,122,35,235,222,97,133,221,204,68,29,89,31,199,152,124,248,182,97,234,138,21,172,252,243,212,93,125,141,196,142,190,188,29,32,205,78,243,204,71,114,129,215,102,91,49,153,111,171,235,199,108,107,77,97,131,46,84,78,136,176,177,147,54,16,72,161,228,150,36,244,250,35,0,132,40,156,230,199,63,68,136,140,223,138,18,117,63,84,34,148,74,178,67,86,95,134,158,85,152,189,82,196,107,38,74,189,78,201,166,47,101,143,116,202,220,
+129,91,247,136,248,154,198,15,31,233,112,222,127,254,138,106,80,87,131,113,14,34,21,0,130,180,93,172,205,129,85,139,12,147,71,32,243,241,232,55,69,142,101,202,102,149,110,28,78,41,255,138,100,21,209,44,19,17,68,165,29,89,68,16,153,81,224,106,220,131,186,118,50,178,95,46,19,161,180,20,76,14,106,98,84,14,83,250,75,248,69,106,54,225,86,155,252,236,34,162,208,115,174,74,71,225,195,120,39,23,130,249,235,116,198,138,203,111,117,91,228,112,83,194,25,84,63,209,71,184,200,106,217,109,92,164,253,34,106,5,36,90,148,204,35,169,180,203,82,150,140,168,41,65,174,29,48,108,36,43,78,175,133,187,101,118,99,233,45,88,47,171,224,68,130,136,52,9,16,220,49,211,36,33,116,12,124,31,64,133,17,117,112,184,88,89,41,133,165,64,189,160,62,225,51,25,185,144,28,38,120,92,138,132,243,200,65,82,91,88,205,172,92,202,70,149,247,251,84,36,168,162,109,177,195,166,216,12,180,23,31,109,119,78,32,208,21,38,208,178,136,102,203,197,72,92,
+97,15,252,78,225,127,93,174,134,113,23,168,44,224,229,126,201,233,117,53,218,220,144,192,39,41,242,245,218,102,162,224,242,118,109,202,2,230,203,254,36,229,108,51,205,232,248,174,236,82,39,130,171,137,253,29,230,152,241,14,110,101,182,80,67,65,77,175,161,209,184,84,138,37,10,19,190,133,203,23,140,212,175,142,232,218,244,212,80,239,185,94,178,5,76,88,110,122,147,80,156,117,195,114,48,30,210,198,210,64,198,249,49,59,49,0,16,68,210,47,52,236,172,60,235,196,211,117,35,85,125,104,43,215,121,158,249,96,163,218,252,91,253,185,167,130,151,219,180,242,84,71,237,180,93,98,167,69,179,171,197,78,253,222,143,6,246,40,13,148,181,158,229,200,216,155,148,189,37,214,23,248,148,197,117,77,235,177,106,120,121,53,60,59,79,173,77,221,97,94,73,25,79,243,242,228,196,208,74,124,61,117,0,186,19,88,201,200,44,83,15,229,67,45,91,143,201,229,125,219,198,210,225,96,228,60,4,21,110,238,66,117,152,163,218,61,130,189,83,2,104,12,248,181,139,118,
+156,100,163,70,124,134,193,74,6,102,8,173,101,79,248,58,74,102,215,80,46,167,62,49,205,253,196,173,152,31,185,46,151,188,115,250,80,45,87,149,148,249,156,151,168,221,183,221,150,57,21,20,150,189,0,137,147,132,112,172,164,13,176,123,189,175,21,110,190,85,109,168,98,176,32,182,66,137,2,145,33,141,123,71,184,208,207,237,135,206,139,87,130,61,50,138,85,195,251,166,178,171,6,178,206,18,157,57,187,108,193,167,215,188,203,24,231,81,103,46,67,0,151,114,79,183,147,160,25,166,27,230,131,61,49,177,251,70,101,229,106,196,126,244,232,213,188,77,247,121,175,237,23,181,7,117,81,149,131,229,188,35,198,24,41,44,98,209,121,170,146,131,58,14,120,227,219,160,196,26,189,238,6,170,170,117,221,196,245,96,48,149,255,6,19,186,217,232,126,243,251,242,16,185,97,90,105,1,108,186,179,99,124,230,93,202,118,195,171,118,248,129,70,197,183,102,203,187,61,114,106,209,143,143,149,121,164,235,173,208,153,241,155,237,99,94,221,118,93,227,86,129,154,119,82,137,
+46,27,91,89,57,156,183,71,167,51,88,188,239,118,244,138,107,213,244,200,36,121,207,115,211,82,63,30,253,36,144,27,123,127,131,124,189,142,85,125,111,78,26,71,233,38,23,6,173,18,145,152,49,167,4,149,244,141,136,247,216,235,189,192,193,20,156,45,60,63,23,25,239,185,190,205,250,26,241,128,221,17,32,163,242,244,70,42,118,181,72,85,167,22,11,137,67,162,214,16,39,233,181,235,162,220,168,29,181,106,162,207,41,115,231,21,219,200,16,216,147,80,251,75,231,41,151,238,187,114,220,219,77,29,96,91,140,244,235,121,88,148,193,107,190,246,190,97,252,130,193,211,95,162,206,125,95,122,96,150,155,180,104,79,152,181,150,200,99,61,113,87,172,210,247,148,87,235,118,51,177,12,215,229,94,91,58,37,143,214,109,169,31,83,86,40,235,147,172,176,164,198,16,205,54,8,103,225,185,139,253,5,189,155,150,150,229,123,110,77,49,17,59,118,208,171,78,51,159,71,20,55,223,4,195,135,150,110,234,234,101,29,28,202,16,139,84,121,119,190,67,18,106,222,251,107,
+101,253,48,60,238,117,243,66,194,142,183,240,89,191,233,80,120,237,105,245,222,204,51,39,207,78,77,203,244,1,254,40,88,60,177,23,114,102,96,71,41,183,236,187,207,188,56,112,86,78,253,160,204,84,238,76,23,86,253,53,62,194,252,27,179,153,131,126,45,207,153,6,203,139,252,226,147,175,95,75,234,220,242,97,74,206,79,216,142,203,125,114,211,53,94,217,98,172,178,63,28,14,71,105,225,58,175,29,188,14,176,241,233,7,121,40,138,40,180,175,29,137,27,104,167,109,243,66,187,169,173,33,62,23,43,29,214,155,29,219,157,61,22,212,37,19,60,228,227,56,90,107,126,242,198,89,200,2,38,142,98,222,41,44,186,175,18,167,114,143,153,22,213,83,205,185,65,216,29,73,84,99,214,3,122,248,148,172,246,24,200,249,184,197,230,219,208,148,60,39,50,203,152,235,187,195,247,185,65,222,25,234,240,115,178,1,35,213,238,31,89,154,209,164,186,94,124,143,59,216,56,144,26,137,171,78,24,66,145,216,241,133,58,161,106,41,113,233,103,221,214,75,35,121,49,152,
+185,8,172,64,7,78,30,176,27,211,90,126,70,197,73,205,173,2,65,170,17,84,37,25,199,100,110,173,167,117,112,103,59,214,17,136,146,2,177,11,143,181,125,47,80,176,149,44,154,107,31,186,119,22,133,161,16,120,139,142,209,156,252,84,73,182,52,132,15,221,250,246,179,153,1,3,9,60,100,30,171,167,80,5,100,220,67,58,125,6,205,110,204,161,130,222,121,17,110,39,28,92,10,55,192,161,120,140,120,68,1,198,251,225,253,146,92,153,87,118,250,21,123,13,200,191,197,36,20,116,77,5,134,131,109,22,137,79,6,30,16,121,8,175,200,203,226,203,240,48,247,91,246,67,132,252,150,253,16,129,190,101,63,68,242,111,153,180,99,77,193,158,91,250,183,0,254,251,243,240,69,237,51,136,14,7,139,109,98,136,71,206,51,109,170,112,170,63,12,109,1,219,110,211,96,165,225,49,106,208,240,158,70,53,61,77,38,9,142,26,156,224,40,165,36,159,196,86,218,242,49,8,111,190,204,238,143,145,45,117,6,94,239,251,5,88,108,172,137,145,65,55,155,138,200,2,
+130,246,210,188,85,145,159,201,57,152,224,106,91,68,190,167,49,33,0,169,239,39,186,244,194,108,165,33,119,34,50,230,220,30,11,155,74,223,124,148,197,9,149,121,124,198,160,61,220,120,110,89,138,167,223,47,78,108,35,80,116,182,250,41,148,10,66,229,164,97,165,249,22,44,22,228,117,234,245,235,194,48,228,113,104,25,151,172,146,204,252,30,206,52,22,195,98,105,28,66,26,110,75,247,89,85,146,36,28,209,222,130,32,130,204,71,48,148,136,31,70,145,232,10,139,109,180,90,149,16,79,5,133,207,131,211,88,6,234,229,141,128,166,122,98,25,239,89,22,132,119,51,133,169,65,5,73,136,95,72,239,243,153,52,41,170,46,233,155,232,93,142,78,177,22,74,226,217,123,82,130,66,181,229,54,78,33,32,212,249,236,134,252,136,67,98,67,145,10,208,177,131,95,71,66,166,5,163,141,86,118,76,136,40,16,39,155,207,223,148,5,217,13,213,10,8,72,105,213,28,152,140,230,25,61,235,128,138,53,139,215,249,199,64,134,8,13,252,148,105,57,41,240,227,167,231,
+50,16,176,32,251,40,220,132,209,186,31,174,194,93,198,143,59,93,20,160,9,122,202,192,18,62,186,196,201,152,168,69,72,88,192,215,116,130,154,121,64,199,18,148,24,242,48,79,252,161,240,98,172,110,246,148,123,88,170,188,128,169,114,51,30,91,207,72,68,54,156,28,97,199,201,161,223,142,17,52,95,63,57,198,33,203,219,92,45,41,64,144,219,253,49,163,57,80,210,157,80,1,81,86,51,70,239,98,94,157,164,202,223,63,100,114,121,153,138,224,3,233,240,60,246,58,118,146,149,228,151,166,156,118,151,33,175,57,150,138,231,243,173,13,20,76,221,44,124,217,238,246,26,252,5,162,76,71,104,62,39,160,70,240,26,116,21,212,10,205,74,131,42,180,207,197,39,55,120,162,42,45,46,4,160,80,125,44,149,238,19,65,168,62,33,185,87,90,146,107,41,25,51,87,62,111,158,183,168,209,226,12,3,194,3,31,232,11,35,245,2,75,42,50,104,61,201,122,54,249,104,141,221,248,52,189,101,105,218,82,206,216,150,157,47,167,141,178,97,202,36,50,33,11,160,59,
+206,243,237,160,159,134,19,207,204,138,172,106,27,246,178,246,170,187,172,167,224,41,170,133,189,145,250,147,36,241,205,166,172,255,176,132,149,209,247,31,81,121,212,15,94,152,225,96,198,151,131,202,161,60,246,246,98,254,243,179,248,185,104,106,213,7,156,220,251,158,39,19,117,115,95,208,21,18,217,139,51,82,240,250,255,82,247,38,190,141,165,215,157,232,191,82,240,3,130,118,210,238,180,61,246,155,196,9,6,207,113,60,243,130,56,147,65,22,228,61,60,24,232,234,238,178,187,198,237,174,70,87,85,28,15,252,30,72,113,17,119,94,238,162,184,137,139,68,81,220,36,82,220,55,137,20,23,137,155,184,137,162,184,137,155,40,238,34,41,238,219,187,164,170,171,187,218,61,118,6,19,3,239,1,85,18,121,239,247,157,115,190,239,44,223,57,194,249,221,107,39,15,103,161,211,54,86,112,120,22,93,8,246,135,88,13,137,127,146,14,203,246,162,186,98,194,146,95,128,89,23,137,141,25,47,202,225,241,218,49,102,10,85,181,183,117,84,208,123,180,91,195,165,215,145,48,
+56,62,88,156,30,35,171,111,248,161,44,230,200,146,182,143,238,118,193,145,233,139,156,72,112,181,3,5,226,173,32,41,92,53,8,252,244,132,125,166,16,168,0,46,122,191,10,219,215,80,162,114,229,245,49,237,108,231,250,84,64,95,219,187,9,119,73,156,218,118,63,13,147,103,5,244,180,246,140,113,126,176,133,9,26,198,67,239,64,66,19,155,15,189,242,253,40,51,56,163,222,201,27,225,248,222,184,137,185,187,162,232,67,243,230,62,189,218,90,111,211,101,71,215,196,197,122,7,15,217,109,124,5,191,243,157,119,223,121,244,23,159,61,121,252,243,37,122,224,197,71,79,150,141,226,143,63,126,244,241,179,103,159,190,234,10,255,167,143,158,124,242,232,87,207,94,62,122,250,201,63,63,251,249,147,37,198,226,239,94,126,242,147,21,182,225,87,75,56,195,107,220,192,219,143,86,20,62,121,242,203,7,240,196,138,202,18,18,241,228,147,21,164,230,157,71,127,181,4,116,124,248,228,179,37,234,225,201,191,60,125,241,232,233,139,183,31,61,121,231,103,239,44,193,27,175,
+241,23,75,34,239,191,124,241,226,217,39,111,175,24,127,244,248,159,159,172,96,40,143,63,254,248,11,110,75,52,8,40,203,74,248,215,72,143,71,63,248,236,103,47,151,200,140,71,159,62,94,1,122,192,105,171,17,15,176,24,112,37,159,61,121,241,242,179,79,150,112,139,37,120,6,92,201,59,191,7,168,197,243,23,159,189,252,224,197,163,191,249,213,15,62,253,244,209,247,191,144,249,203,112,139,191,88,173,112,181,13,95,153,253,173,95,255,243,179,167,31,62,250,17,120,231,173,111,126,121,202,183,126,253,122,193,111,253,233,159,254,233,151,112,1,175,91,249,191,245,235,215,31,94,252,234,211,39,31,62,249,233,43,41,126,248,227,31,252,253,223,255,231,31,252,205,143,254,236,55,71,174,70,124,149,213,155,144,143,111,191,251,240,227,75,60,191,245,235,37,158,97,41,255,18,30,242,227,199,239,63,249,248,173,247,190,177,252,254,222,55,190,249,206,143,159,252,244,197,10,226,240,237,37,86,228,187,223,124,13,121,88,126,255,206,119,191,249,6,161,149,45,172,0,32,255,
+240,191,255,213,223,255,197,15,126,248,215,111,45,87,255,117,11,124,239,255,254,31,132,181,188,90,220,155,72,138,55,160,15,239,190,254,245,131,165,145,60,93,193,120,254,249,201,103,191,122,244,193,179,95,252,2,212,209,243,167,47,94,174,160,62,111,127,73,149,175,113,108,143,63,121,182,66,46,61,152,224,219,175,141,242,201,103,63,121,251,209,47,63,122,250,193,71,175,140,14,28,250,232,135,160,13,191,255,248,131,159,63,220,120,123,133,139,122,229,89,224,212,79,159,124,6,186,213,47,86,166,250,133,113,191,243,37,33,127,63,208,160,255,89,123,253,255,165,169,125,73,79,255,61,111,250,253,24,219,15,94,25,204,87,173,107,105,118,31,61,254,228,195,143,151,234,250,219,191,94,65,241,126,184,68,30,126,252,42,28,62,127,103,121,249,225,51,56,114,5,18,252,193,7,75,20,219,202,96,62,124,250,248,227,103,63,123,244,254,19,208,134,192,8,250,229,168,190,138,196,111,61,253,233,163,199,15,195,151,232,188,151,224,199,231,207,127,250,242,227,111,190,253,57,155,87,
+52,255,238,201,127,93,66,211,192,221,254,146,41,44,69,126,160,252,218,242,193,29,124,96,255,236,179,159,172,164,93,158,13,171,185,203,11,15,254,240,252,213,240,165,36,159,27,255,43,132,226,23,7,202,3,149,175,208,0,191,62,7,15,19,208,176,62,252,124,77,203,19,224,243,37,253,127,211,61,158,253,252,109,80,202,229,102,126,13,56,110,9,221,250,253,250,206,10,153,247,167,191,233,58,75,206,111,250,201,159,188,251,21,63,121,247,155,191,49,235,217,207,191,236,110,127,251,215,191,213,217,190,251,53,206,182,36,242,176,27,95,38,244,96,108,95,33,246,59,168,125,137,232,179,159,191,246,223,215,214,247,214,255,245,135,255,219,91,223,254,206,159,188,243,238,59,223,249,222,247,190,249,232,175,254,242,111,255,250,39,111,136,242,32,198,235,153,175,205,244,55,103,254,240,7,255,249,135,63,250,241,79,254,237,226,193,155,112,202,231,191,124,250,226,131,143,222,122,13,238,123,67,159,31,60,126,190,180,236,223,92,203,247,191,14,223,247,247,47,62,3,77,23,12,55,63,
+124,188,204,20,254,252,207,31,45,181,244,125,240,231,234,243,255,179,228,177,212,252,27,27,177,138,11,127,246,59,56,190,218,131,47,115,253,209,191,124,240,241,227,95,172,2,213,107,29,62,249,240,75,112,194,55,246,233,205,136,247,15,207,192,35,240,195,151,160,115,189,120,242,225,211,103,47,193,0,240,248,57,24,6,150,105,226,163,159,190,252,108,25,91,222,126,136,48,43,192,243,202,85,31,131,185,31,184,202,183,191,244,237,129,235,219,111,220,127,21,186,158,188,248,224,29,144,250,47,62,253,120,233,105,63,125,249,201,10,63,252,42,210,188,15,6,220,37,28,249,229,167,143,62,94,77,91,69,26,48,67,124,250,179,79,94,27,209,243,213,197,207,13,227,249,239,63,172,252,47,160,219,63,253,228,201,163,31,255,224,255,252,219,127,252,135,255,248,87,63,254,209,163,63,255,79,47,159,126,231,221,15,255,248,23,191,90,234,14,148,245,63,124,45,223,31,130,193,240,143,193,187,191,193,244,119,217,227,63,61,125,241,209,202,38,31,118,239,207,95,135,178,255,240,166,145,
+46,177,182,191,177,199,63,89,26,237,219,160,117,173,40,188,161,249,223,109,212,75,43,254,253,26,241,231,86,251,63,103,180,175,147,193,63,94,225,197,191,191,18,252,237,215,196,87,230,9,86,42,15,170,91,66,229,63,121,254,226,241,39,47,62,55,151,63,126,93,88,125,251,157,71,63,4,165,124,13,170,127,176,135,15,94,62,127,1,214,29,175,240,226,175,74,172,127,88,25,254,10,59,190,122,30,193,50,63,88,14,94,34,196,159,46,159,65,240,254,210,100,63,248,156,218,170,234,122,246,203,207,49,244,96,86,240,3,176,48,122,56,82,87,231,247,251,224,81,243,236,147,39,175,190,129,245,214,242,113,3,175,103,129,59,242,252,249,67,249,179,122,52,195,91,96,33,247,252,217,47,158,60,122,200,74,192,4,233,249,138,205,3,245,183,31,129,89,195,138,246,79,159,190,120,14,146,126,1,214,114,223,92,173,232,25,152,35,127,6,38,2,43,50,203,114,236,159,159,126,246,98,249,204,132,207,79,126,144,249,167,143,159,126,242,144,157,124,14,145,95,206,252,240,217,138,
+227,195,42,95,62,127,2,38,33,223,127,211,144,95,31,185,43,17,191,255,232,211,151,239,127,252,244,131,7,129,191,100,90,75,226,31,60,123,249,201,139,175,57,46,63,151,102,85,76,253,151,165,28,111,253,229,103,143,127,249,222,31,60,250,229,87,206,208,95,190,179,188,177,58,70,151,0,244,167,255,237,201,91,96,78,244,79,31,61,93,194,208,223,176,187,135,145,255,240,228,95,94,188,245,29,240,128,122,27,172,24,94,217,239,74,138,111,254,142,146,236,13,145,150,135,223,95,130,10,121,235,191,60,3,101,123,251,209,135,191,4,107,227,175,72,182,162,250,222,31,189,247,71,95,22,226,239,158,252,20,44,149,63,122,235,119,48,123,216,187,85,190,240,176,71,143,192,163,239,221,47,5,231,55,79,179,239,173,194,244,242,201,7,191,122,120,72,193,234,249,12,160,100,207,30,46,188,10,156,239,63,94,150,213,15,169,230,42,100,131,249,235,242,113,8,143,126,249,248,87,175,12,238,241,135,31,130,185,227,50,123,123,239,27,255,184,124,150,195,202,226,222,251,198,170,254,
+95,153,210,202,95,151,165,253,127,5,221,1,52,172,143,151,15,8,121,248,227,193,227,95,172,30,180,241,96,164,75,91,121,197,23,204,55,193,96,13,18,123,254,209,242,49,22,203,177,111,248,210,146,29,24,253,95,252,106,249,124,13,208,35,127,182,20,105,249,160,133,7,74,43,186,160,93,127,0,214,89,143,150,169,246,139,239,63,44,250,11,184,251,119,254,221,191,255,238,31,124,251,187,223,251,238,26,44,9,21,66,191,232,78,15,178,27,156,90,159,98,72,175,185,186,107,93,160,28,61,221,169,201,110,248,55,3,247,148,197,83,95,84,98,145,163,136,127,243,240,60,112,68,1,0,41,154,49,62,130,220,151,243,240,19,61,65,207,8,159,32,55,147,9,187,157,186,87,164,153,83,131,150,197,90,138,209,37,94,213,153,86,107,87,40,24,172,150,118,51,54,11,16,23,131,44,66,151,132,2,102,74,122,194,205,110,158,162,114,165,173,2,135,190,119,38,199,104,40,27,118,20,223,63,183,29,146,224,128,29,131,35,119,134,160,80,8,1,124,106,226,45,186,88,32,74,
+73,143,179,27,115,186,16,110,57,113,226,56,130,69,187,5,49,66,1,116,27,27,160,118,212,61,167,221,199,101,235,250,198,180,119,80,164,233,88,19,148,1,227,30,241,79,196,242,168,212,215,88,164,76,218,94,33,176,176,196,1,146,234,0,117,130,74,152,45,10,133,45,112,213,16,22,10,179,69,46,41,20,114,28,142,65,3,6,147,147,102,179,153,78,128,119,177,210,233,5,67,44,118,11,138,25,73,102,199,174,200,239,109,99,45,29,81,84,155,43,16,73,176,153,45,16,180,65,245,193,194,73,46,6,131,219,119,232,30,62,150,53,205,166,216,92,158,14,113,222,11,130,148,251,234,2,79,72,228,17,178,182,241,34,206,232,41,206,85,243,93,131,70,131,4,164,167,27,152,83,101,20,173,177,250,125,120,4,62,29,203,78,27,54,58,108,179,78,176,115,207,81,82,96,111,139,57,106,221,154,156,69,95,84,78,34,217,233,103,231,52,173,213,52,217,223,231,183,227,52,47,75,119,149,194,111,23,241,248,17,124,43,53,220,17,139,201,214,158,200,30,246,82,209,104,99,
+61,59,228,107,209,182,27,138,31,79,65,39,210,244,30,41,143,31,49,249,195,248,65,216,227,191,201,68,175,155,169,200,129,47,59,115,76,96,245,102,203,134,163,109,199,227,188,33,118,158,48,83,73,201,254,122,8,190,209,158,110,95,210,186,131,238,152,71,189,223,215,232,241,107,104,77,67,220,160,135,157,166,134,221,21,118,32,204,76,162,59,121,92,76,166,183,50,154,193,62,158,193,119,99,2,212,3,89,66,22,176,147,182,81,189,74,82,214,148,20,196,188,35,10,73,136,152,222,12,245,114,101,4,229,219,14,218,0,238,5,201,62,205,36,12,44,53,208,219,169,32,121,30,71,159,146,139,225,170,157,88,158,198,66,163,165,51,250,144,177,5,4,219,74,164,91,184,21,230,106,117,230,147,112,124,111,168,241,95,13,119,73,20,53,185,83,85,23,47,109,252,228,252,80,31,113,200,206,90,196,83,203,38,5,32,222,179,188,40,162,143,199,105,120,146,146,98,112,123,59,233,196,36,50,162,29,166,150,18,159,143,186,165,51,219,68,23,118,89,207,188,51,147,53,83,211,
+40,35,99,109,192,232,200,55,82,108,84,130,218,57,167,119,34,93,213,188,54,24,94,142,209,6,137,127,4,200,3,10,54,208,115,73,118,177,124,161,20,205,55,233,58,107,117,30,81,145,236,3,81,112,61,249,187,253,109,179,140,35,59,170,203,132,81,153,16,209,53,235,245,22,12,176,61,158,166,196,198,179,163,43,147,139,118,142,188,216,170,195,216,247,25,75,59,208,151,28,180,35,44,62,43,80,237,243,248,222,67,141,6,131,213,136,37,151,103,52,149,55,121,191,192,88,85,250,158,49,234,169,104,229,126,221,54,150,111,189,103,95,132,146,45,187,167,132,117,81,85,64,227,182,153,58,175,106,238,197,88,201,33,116,122,222,162,242,117,235,39,148,194,192,144,187,69,110,167,22,148,44,122,86,209,14,84,155,124,119,78,117,238,184,64,27,18,78,167,101,143,185,9,133,137,236,5,122,55,199,156,33,101,149,190,136,134,117,192,108,134,25,69,100,244,148,248,4,110,55,200,111,176,246,66,197,227,90,3,235,20,116,247,205,49,86,231,66,104,109,36,252,192,250,85,144,
+153,165,148,157,34,59,55,110,196,3,93,2,85,181,0,26,147,65,139,10,229,174,139,141,13,137,101,214,231,219,154,216,209,5,170,104,239,243,184,58,27,79,198,151,194,54,231,90,253,112,100,79,50,246,83,198,35,157,228,240,56,56,190,182,192,22,228,53,145,133,228,223,228,99,203,177,73,177,133,215,221,143,229,6,129,181,181,62,142,56,79,195,170,193,216,75,9,239,56,161,144,4,54,193,143,177,217,99,126,93,122,62,194,88,70,9,223,222,154,213,205,79,95,157,25,47,182,251,128,75,123,125,75,193,12,128,184,92,13,116,106,57,251,117,165,88,41,140,154,182,131,187,253,195,182,105,80,93,236,8,138,55,228,202,110,91,61,71,202,178,100,218,241,53,178,206,20,7,21,190,141,38,222,183,118,65,222,214,180,125,14,178,109,168,237,224,13,98,43,26,56,29,213,70,245,115,190,197,75,192,181,92,57,251,156,192,20,39,108,42,166,226,80,28,214,184,147,174,86,221,119,46,187,92,68,136,219,200,20,93,134,65,15,51,242,164,8,24,244,167,218,164,28,121,191,143,
+91,51,15,46,21,23,40,214,144,199,174,159,182,110,241,117,179,195,26,142,75,34,200,5,148,69,80,23,211,134,104,91,3,191,113,220,160,240,138,90,104,111,174,246,22,69,155,104,178,183,238,73,208,171,59,245,145,158,135,5,228,139,208,29,25,211,73,165,51,118,110,168,44,22,218,232,134,32,112,221,37,216,21,73,42,32,71,204,17,240,88,113,176,216,165,1,131,65,182,25,105,90,125,78,143,194,225,201,74,91,44,190,20,185,143,54,152,29,4,73,23,62,156,248,52,69,162,152,41,189,209,217,228,233,169,43,121,188,111,62,79,42,181,27,62,188,216,214,11,158,239,217,185,109,36,219,48,92,80,249,53,165,202,221,88,115,68,70,50,44,187,130,192,1,104,106,167,159,235,99,249,153,17,146,133,96,111,212,186,133,145,33,139,229,112,50,139,35,75,198,22,141,184,77,155,105,178,162,236,217,16,169,29,214,139,70,72,215,192,51,123,37,25,246,156,98,93,156,159,43,207,121,93,131,2,207,158,246,246,231,59,205,141,177,93,59,57,158,225,235,134,78,25,101,39,176,
+93,92,86,176,212,186,172,162,64,246,167,107,91,100,171,164,72,161,208,55,68,69,221,166,114,125,36,212,134,156,115,82,174,208,159,144,61,212,84,210,196,19,165,24,29,207,81,211,78,8,201,246,60,19,164,236,224,70,231,82,185,14,48,128,147,118,78,65,143,242,225,112,125,177,107,215,114,134,34,91,58,222,21,112,216,39,213,162,177,209,109,209,180,78,79,159,82,222,224,119,28,92,20,31,91,57,48,22,114,113,37,125,170,80,218,152,70,192,111,46,39,61,99,115,226,102,187,150,19,180,5,226,32,110,158,144,91,36,197,251,27,15,188,226,180,210,79,121,154,202,56,65,207,48,199,49,1,25,142,27,129,231,203,116,60,158,230,157,169,252,34,127,63,157,250,153,76,104,141,200,203,104,58,141,121,191,239,170,86,91,101,83,185,17,133,167,112,70,181,238,108,4,119,114,118,168,57,83,183,65,117,18,71,52,146,205,30,73,82,130,4,192,38,198,217,251,251,222,144,189,63,234,104,14,189,116,64,220,202,234,228,182,105,69,239,166,18,183,92,151,14,197,180,174,139,91,
+168,77,178,173,75,62,247,167,170,231,226,24,28,200,143,192,109,27,201,249,200,233,206,134,164,216,132,14,84,149,40,30,197,92,147,21,119,138,225,250,94,117,175,200,38,71,61,226,144,152,167,176,113,196,120,201,30,148,15,67,192,205,236,157,99,143,228,208,159,177,109,205,243,133,117,81,104,168,217,42,238,67,0,247,189,136,70,206,72,200,161,187,160,30,122,178,246,197,119,53,145,189,6,126,71,67,79,213,40,166,108,171,184,102,239,224,236,72,172,132,138,49,84,22,121,20,19,202,219,42,222,241,157,124,8,236,136,141,98,166,174,7,167,107,128,25,6,28,3,107,246,29,81,112,171,24,218,63,159,240,23,231,249,189,200,158,222,120,80,231,241,225,56,58,208,217,142,48,90,66,105,105,177,85,100,128,204,165,156,49,175,152,150,79,214,65,9,199,62,68,221,38,99,122,177,136,128,75,201,111,122,50,1,215,2,226,220,61,77,27,174,188,33,131,250,48,121,76,42,165,136,135,138,141,162,107,86,10,219,16,83,36,56,73,134,168,35,230,46,60,165,227,203,193,226,98,
+86,144,47,158,13,89,162,113,31,8,90,4,44,222,89,118,219,120,129,75,210,15,166,94,70,194,204,5,199,179,17,245,2,211,111,196,36,108,187,91,195,219,253,49,42,97,45,19,144,87,46,218,126,212,82,200,160,183,185,34,251,152,16,211,30,146,8,90,237,193,192,59,8,157,159,5,4,222,147,198,32,24,142,120,189,101,82,12,221,161,53,168,87,90,175,176,216,218,7,108,128,243,212,35,229,185,238,120,124,55,222,227,176,241,215,141,39,248,91,225,54,123,114,29,69,244,36,241,93,108,246,128,236,61,191,37,196,40,9,116,209,169,87,5,98,232,237,86,135,111,71,223,43,133,58,60,139,137,78,116,130,11,181,87,218,34,20,66,20,196,153,176,120,183,181,56,7,115,130,245,89,86,119,196,188,210,55,203,106,139,103,27,219,141,250,92,254,99,118,26,217,219,223,160,45,142,7,142,136,5,233,73,133,204,24,32,230,168,159,175,215,24,129,200,157,178,108,82,230,193,0,184,37,203,156,207,108,81,126,188,151,104,157,230,195,67,221,141,132,192,79,83,7,72,228,177,
+231,250,216,106,191,96,8,93,108,126,109,128,231,114,200,253,96,39,76,109,169,200,200,234,174,26,185,118,196,130,184,49,9,165,7,136,59,118,125,104,196,25,91,18,137,201,21,214,44,166,14,215,207,218,202,240,252,246,66,90,80,22,231,55,211,181,112,113,31,157,80,36,98,71,100,4,238,206,215,180,115,167,218,214,238,64,93,156,217,88,142,18,130,125,239,111,102,8,178,221,34,229,122,66,196,211,57,184,254,56,37,173,236,111,70,220,145,33,193,125,44,174,94,40,56,227,253,34,93,41,41,28,154,156,59,161,74,21,146,238,187,227,214,177,31,7,175,87,206,160,177,86,211,222,175,135,153,160,193,168,108,141,170,124,104,205,222,120,110,4,233,62,159,89,41,28,93,36,103,119,38,175,64,53,77,70,15,60,133,176,240,12,227,89,175,118,69,51,163,194,125,150,191,42,136,195,69,139,214,91,162,199,106,250,194,28,162,152,248,3,241,44,208,45,238,146,236,154,226,221,213,150,29,185,67,149,156,227,12,216,237,48,214,228,50,147,187,154,177,3,193,150,156,241,231,69,
+156,69,89,12,79,90,101,136,33,18,118,120,46,99,77,107,176,129,172,11,240,77,187,7,16,199,18,56,135,182,47,238,115,59,36,17,133,44,241,42,120,22,226,216,183,55,133,179,129,193,45,125,253,74,26,218,176,208,113,17,194,252,188,208,225,208,141,116,142,62,124,214,73,56,8,211,234,228,220,102,237,207,209,32,33,56,142,27,109,203,66,216,251,224,4,123,136,68,79,78,226,167,213,112,50,218,137,38,185,189,67,225,149,249,134,95,244,72,118,89,94,243,161,66,185,230,143,106,140,116,24,142,74,181,140,0,44,64,131,11,183,25,202,77,33,214,96,136,214,13,206,144,231,198,45,19,20,239,32,74,36,252,32,203,42,168,48,250,205,168,79,227,140,229,47,97,23,6,186,191,111,100,115,110,194,103,34,45,71,83,223,62,196,186,205,112,247,217,61,152,32,88,12,156,245,98,189,197,154,167,246,204,149,210,182,195,115,157,211,235,52,241,70,198,200,104,33,181,131,181,205,89,207,72,11,108,24,27,86,238,176,75,109,174,21,14,66,209,72,231,124,211,222,59,209,54,
+206,130,30,255,70,220,192,198,238,55,121,52,143,55,151,172,221,86,187,1,17,54,140,93,4,135,243,136,58,56,195,243,6,87,206,124,127,103,140,144,115,112,3,224,120,13,80,233,45,35,189,190,166,35,18,136,172,1,162,69,36,244,9,97,34,248,77,123,210,95,31,100,49,135,155,173,126,125,144,229,114,185,88,50,117,50,97,29,131,249,245,70,113,83,40,81,21,131,45,215,169,91,200,85,239,101,5,96,20,221,196,185,207,18,87,97,216,252,214,47,129,139,39,151,145,155,26,36,113,194,165,130,1,41,16,246,216,93,12,134,184,91,46,55,114,105,10,101,126,97,74,215,203,183,14,219,186,99,208,202,246,156,8,139,244,80,118,214,108,88,228,8,141,126,186,99,189,205,68,91,183,136,20,113,195,163,100,118,246,6,150,54,255,130,182,91,244,116,120,80,7,25,225,140,238,100,12,182,113,197,165,178,194,124,118,48,238,121,248,42,108,9,195,226,113,102,243,141,203,161,20,179,141,239,131,199,58,185,227,114,221,77,207,177,124,175,35,120,120,59,188,185,144,99,239,82,
+2,222,198,33,137,75,3,68,51,233,77,168,146,242,205,41,123,8,176,198,160,25,116,27,172,65,84,214,138,12,238,50,91,166,137,97,210,114,158,246,122,235,247,199,114,120,138,24,157,32,110,171,9,27,200,233,218,195,231,113,155,53,175,143,170,10,59,246,194,158,115,169,116,0,131,167,54,25,209,201,106,196,17,83,118,107,183,146,153,6,222,2,80,29,92,10,251,77,112,55,69,0,35,68,111,174,163,12,135,18,226,32,20,3,147,47,149,224,18,176,91,245,151,100,25,153,222,164,85,52,155,81,129,221,94,37,146,59,176,124,254,254,92,194,167,132,195,123,96,224,223,66,220,201,138,82,177,203,72,57,236,177,192,108,113,122,14,33,242,41,170,51,64,213,1,231,211,85,180,242,90,20,181,75,148,178,136,53,248,212,120,139,54,12,68,125,21,194,135,58,128,11,248,48,44,140,111,179,98,172,25,29,71,102,150,17,187,205,52,175,207,23,87,102,200,245,163,75,40,48,58,70,72,138,22,139,223,120,33,229,179,101,2,107,193,75,209,46,229,209,101,67,106,148,225,90,
+152,145,172,157,206,183,135,88,160,137,136,66,224,56,197,112,151,143,157,157,5,59,227,98,113,176,76,97,120,96,14,211,180,226,0,88,103,0,30,48,112,190,1,134,13,123,146,73,165,6,62,68,204,75,146,166,219,136,41,209,228,155,248,75,157,201,100,105,101,156,132,217,238,58,0,149,109,221,21,239,142,49,163,162,200,188,189,115,138,119,213,142,189,153,221,198,65,246,228,178,160,79,91,201,219,241,11,40,184,77,35,136,29,185,235,6,173,114,11,46,83,238,184,9,136,172,229,202,141,49,77,119,236,200,253,50,4,56,70,240,139,17,74,164,192,80,222,208,25,58,113,185,220,10,248,82,153,197,240,110,143,84,83,67,213,186,139,248,194,102,59,111,9,139,28,56,142,64,221,42,122,8,112,217,241,186,231,26,165,40,218,195,74,162,16,232,154,99,106,217,98,103,2,205,159,38,208,242,57,117,142,63,86,157,89,15,176,163,204,140,41,175,99,13,183,23,56,13,18,197,4,206,1,21,117,11,1,158,147,84,56,14,233,4,203,81,52,130,191,239,8,69,3,30,196,130,
+52,118,84,153,240,41,241,134,207,128,236,97,12,183,49,237,81,250,200,67,134,223,165,244,52,90,39,148,243,236,240,111,8,201,73,90,222,44,173,13,98,118,165,4,9,10,66,133,251,218,85,234,72,142,197,98,57,234,254,228,118,56,204,54,51,197,198,221,221,228,26,114,237,205,92,120,50,9,243,237,96,80,170,84,218,234,115,155,34,5,1,214,181,91,69,251,177,71,20,56,0,139,69,80,65,250,59,139,173,133,173,113,217,181,195,251,236,214,124,49,79,165,179,81,83,71,204,102,104,181,23,107,112,51,100,139,207,32,216,119,72,163,240,97,55,66,159,201,50,214,214,13,143,207,33,77,246,216,73,25,66,70,149,122,234,211,126,63,119,93,160,41,247,232,218,102,150,43,30,73,1,157,246,6,6,5,231,242,25,129,134,28,206,30,143,115,57,251,76,58,206,195,101,3,57,213,109,43,11,139,55,221,253,214,190,206,74,182,245,175,247,4,202,136,205,163,224,77,99,21,208,61,160,50,59,23,2,96,197,218,115,59,183,180,69,241,24,200,206,126,119,27,62,29,118,151,
+229,161,135,199,67,211,151,213,97,38,113,106,96,109,21,161,40,3,228,174,42,43,118,77,29,23,198,47,50,6,154,36,206,140,157,112,128,5,210,44,94,79,213,200,72,128,185,44,251,60,89,162,151,164,11,123,188,94,157,29,246,32,88,69,143,30,221,114,5,197,11,122,60,216,182,90,198,218,204,126,63,238,158,245,58,167,209,27,73,17,6,195,200,115,185,74,177,84,16,48,71,221,192,153,231,52,191,176,163,249,142,157,232,252,210,115,115,171,13,50,183,72,29,79,179,61,99,83,43,33,11,177,48,86,13,117,124,108,2,121,227,58,144,95,56,6,170,13,59,205,75,236,1,42,130,253,94,193,134,167,244,227,179,13,230,128,15,86,33,205,123,208,203,102,139,57,231,66,117,119,29,213,89,52,114,177,178,24,63,238,100,229,28,151,7,144,244,232,198,78,241,90,39,133,236,150,12,134,126,87,130,152,110,93,109,92,26,19,87,151,199,220,9,232,117,141,41,3,116,59,84,2,206,191,96,4,244,232,68,138,147,191,182,8,2,205,230,44,82,87,21,115,137,138,245,72,
+33,196,140,90,45,245,65,172,234,33,122,61,221,9,177,148,71,236,183,143,131,199,244,41,129,107,191,0,243,1,68,68,205,39,114,122,174,156,64,122,22,62,88,228,61,4,142,18,187,150,184,141,123,46,157,243,220,250,21,122,180,88,52,214,155,77,47,132,191,32,238,218,193,5,248,58,167,99,43,71,137,48,91,102,155,118,84,156,155,219,17,139,93,227,212,101,38,144,191,45,151,133,215,14,75,107,69,55,196,111,37,108,105,193,9,142,218,9,157,158,122,125,100,22,62,30,135,153,67,201,188,13,139,218,111,155,102,162,51,177,66,158,38,2,29,72,14,190,50,236,46,94,179,14,223,0,109,81,19,41,184,117,49,105,28,226,77,205,35,235,124,134,57,224,68,152,239,110,227,42,187,15,5,70,72,46,211,54,60,208,129,37,244,157,109,209,189,185,25,59,122,235,113,124,138,197,177,240,14,140,227,201,104,196,26,243,107,160,101,75,118,7,64,47,231,80,161,128,106,56,215,184,187,237,78,132,3,191,50,107,108,146,16,165,7,197,31,129,214,220,238,72,205,119,120,110,
+195,229,17,66,66,0,118,157,111,58,185,15,132,115,218,211,108,147,230,172,101,224,102,1,202,112,119,87,221,41,142,74,107,28,189,173,112,38,205,183,15,16,164,206,222,169,113,162,37,117,80,32,35,38,188,204,103,13,248,197,52,247,76,18,71,3,94,130,12,220,167,49,152,216,9,106,244,3,30,119,83,30,75,150,3,26,130,211,131,230,103,194,156,66,191,19,40,230,234,70,6,159,8,160,150,27,90,183,226,82,58,180,97,225,203,131,117,77,209,117,30,8,36,140,147,21,229,150,93,178,13,164,69,185,166,160,232,105,28,160,215,213,192,122,191,115,145,78,78,227,124,172,22,78,14,93,82,74,252,98,106,147,39,34,25,116,60,126,185,194,199,97,16,124,183,149,120,77,234,132,129,142,93,44,150,138,129,52,210,58,169,230,224,236,132,183,31,139,22,38,235,194,162,8,182,69,229,51,144,118,194,201,38,158,78,69,164,14,3,71,147,200,68,165,114,33,90,100,12,208,227,6,248,213,137,219,237,161,80,40,231,137,19,140,161,84,237,158,87,167,23,199,158,208,110,246,
+56,63,115,2,7,84,108,21,213,145,166,196,66,110,17,142,3,186,199,248,12,29,206,102,165,246,226,252,83,20,147,47,44,78,215,206,97,78,76,2,199,212,218,125,209,176,39,235,154,212,192,44,113,208,29,174,157,244,70,1,101,91,147,0,235,201,211,33,202,128,56,186,193,17,81,6,2,20,60,3,192,8,70,130,194,217,235,118,36,3,32,171,68,96,125,3,227,67,97,88,20,51,12,231,43,221,80,48,48,195,113,77,201,26,80,56,242,92,99,236,24,59,87,214,6,80,29,235,86,81,15,168,214,245,16,128,239,4,58,91,171,42,228,116,109,8,206,89,78,233,128,115,150,83,118,192,57,107,118,36,21,12,118,237,101,197,210,166,219,181,74,49,4,208,117,249,139,128,103,116,133,164,231,192,173,66,49,113,169,35,15,0,234,123,141,240,32,208,26,233,65,160,49,208,25,146,115,177,12,4,232,80,65,14,71,17,79,1,109,15,48,225,27,203,81,109,145,201,200,175,5,232,201,42,147,223,43,7,107,166,251,84,162,211,216,213,198,76,251,121,81,18,28,190,187,141,
+7,104,236,62,221,125,237,159,222,34,12,226,123,101,229,36,124,217,136,138,45,215,37,81,110,150,180,180,101,103,130,140,190,1,199,201,150,228,78,172,198,60,63,123,85,103,95,17,206,101,236,45,112,139,133,3,40,224,166,140,170,27,151,96,173,156,146,102,82,107,231,76,8,184,207,27,24,60,220,204,133,31,24,135,120,114,0,89,146,250,192,170,244,86,11,202,171,90,202,123,34,213,91,58,65,44,224,231,160,88,137,148,107,185,3,67,110,112,13,212,24,223,55,93,138,189,143,139,110,158,72,52,77,197,100,38,4,84,6,60,112,124,134,88,210,59,133,251,216,29,236,152,194,55,29,129,231,220,29,148,79,52,139,249,217,205,177,134,193,220,95,231,179,192,37,201,192,125,42,156,94,104,157,55,99,15,31,60,74,129,125,171,125,103,4,231,115,221,107,160,158,174,48,188,132,153,142,80,157,32,182,201,254,2,71,190,233,60,157,168,231,114,146,42,90,93,135,167,140,81,99,27,133,50,32,151,59,156,45,134,183,195,120,183,231,232,0,212,74,206,7,79,176,23,44,179,
+228,190,192,104,149,50,115,56,174,199,94,227,51,240,184,205,22,42,235,8,148,36,34,212,137,129,188,82,76,90,21,170,184,178,14,207,254,114,30,159,110,23,34,219,80,190,131,115,196,247,156,87,0,85,20,61,130,155,119,138,90,36,219,3,150,173,85,184,29,73,56,131,1,252,192,86,145,180,123,184,186,192,65,62,92,160,21,15,160,154,98,254,56,178,50,143,51,152,112,53,106,247,80,244,48,237,76,252,48,237,160,180,26,229,185,190,95,141,2,248,168,213,40,20,179,178,26,5,3,36,171,81,80,13,115,53,106,237,53,125,65,241,129,161,241,97,90,96,111,235,129,225,206,241,3,67,247,3,253,93,207,131,88,200,192,43,57,207,30,196,242,84,30,196,2,70,252,192,234,47,212,25,239,160,227,191,201,64,64,57,15,193,105,148,185,221,147,239,231,243,178,80,218,106,180,102,24,86,145,197,120,101,48,167,172,155,96,174,149,200,46,164,156,240,173,57,145,158,141,246,199,227,101,250,219,56,2,19,143,51,152,29,9,55,242,17,178,250,180,189,219,30,207,51,244,11,
+75,202,80,209,36,253,115,194,190,117,170,159,46,230,233,62,120,236,219,189,130,34,235,226,226,10,172,208,81,214,154,199,185,212,108,81,82,228,167,114,5,245,177,154,8,99,45,98,7,254,195,182,52,118,110,207,8,47,55,136,96,58,131,204,129,58,179,99,12,9,127,138,229,195,79,246,232,237,202,100,216,2,210,179,197,76,39,40,142,199,176,45,8,223,81,57,242,156,223,136,69,0,145,168,235,161,74,24,102,37,71,147,4,139,52,154,9,106,71,18,195,160,31,7,110,237,62,48,199,93,166,184,106,48,199,93,166,184,68,48,199,5,83,92,116,14,129,107,194,93,225,19,165,21,201,110,118,75,222,117,125,246,12,13,218,123,23,36,71,208,194,225,109,196,164,116,37,71,162,22,192,254,149,16,110,214,67,244,28,17,73,165,15,91,105,7,84,252,222,61,75,15,142,21,1,136,58,165,116,114,57,80,53,11,23,7,8,58,175,202,47,50,112,187,152,203,51,87,236,116,140,231,47,83,205,128,93,219,97,99,72,37,118,174,84,128,2,217,117,156,133,63,200,4,80,134,
+171,222,158,128,174,10,209,82,115,176,108,178,31,121,136,74,34,113,224,23,99,233,68,175,121,50,16,219,137,1,170,204,153,207,58,144,129,209,105,7,206,119,152,56,128,61,147,76,214,27,154,77,251,233,94,85,157,50,87,10,48,152,124,132,227,88,224,108,82,140,68,247,38,118,207,108,252,34,112,119,140,6,143,220,121,133,46,22,218,28,114,184,216,108,91,244,193,84,173,6,1,160,102,48,118,113,214,168,157,126,31,203,239,100,248,217,209,30,75,113,155,31,57,177,174,130,159,21,8,184,142,214,199,144,163,204,214,42,243,237,22,69,171,204,87,94,59,94,101,190,132,147,203,85,230,91,142,95,44,11,132,53,116,180,135,55,128,70,184,117,119,140,74,248,136,156,49,214,54,214,80,239,59,80,22,4,0,41,56,230,168,209,253,253,208,137,93,24,156,206,10,120,142,138,212,234,56,207,106,174,46,138,87,245,58,62,22,11,102,131,65,208,253,143,140,48,56,46,1,5,160,99,50,31,203,4,162,176,46,32,69,128,38,34,128,18,25,118,21,222,142,220,222,143,12,183,
+182,11,20,176,124,191,22,223,29,159,133,92,96,112,61,10,228,220,48,42,46,8,116,70,39,57,188,225,210,238,216,41,223,5,33,103,220,241,89,68,169,4,84,16,236,142,3,192,54,67,163,3,4,46,117,143,61,195,218,145,233,187,107,54,34,165,111,206,173,163,110,215,46,245,38,18,101,198,128,151,74,113,211,6,189,229,190,61,94,180,235,113,68,87,226,30,148,109,190,217,116,20,114,187,107,234,114,188,28,128,100,116,86,4,202,128,246,129,92,97,109,186,202,187,223,206,174,103,181,131,153,205,156,173,40,102,9,107,58,93,85,152,155,138,97,107,62,159,118,186,169,123,87,185,63,42,19,197,7,233,73,208,168,99,40,145,45,63,15,9,206,231,162,12,130,125,100,74,102,41,200,138,8,6,79,187,203,202,102,154,125,30,6,201,178,85,20,141,62,207,109,171,7,90,247,101,94,116,80,230,246,231,151,45,121,42,91,203,164,43,88,200,8,202,23,195,248,48,194,16,80,3,94,13,183,83,230,102,204,201,166,130,178,136,165,71,145,244,116,22,139,180,167,216,102,106,
+174,206,229,2,105,90,211,198,161,53,27,165,102,203,230,205,247,59,58,103,138,134,72,237,101,58,48,254,29,108,8,136,139,74,155,129,109,217,186,23,159,14,146,54,29,71,73,13,227,183,221,19,41,35,152,233,99,226,153,62,35,51,96,76,199,221,66,32,213,13,148,235,234,0,140,95,140,217,172,120,134,49,98,185,191,109,130,233,245,217,61,249,146,183,220,136,40,92,85,207,196,208,177,84,34,109,189,204,212,229,81,148,169,210,94,76,11,54,46,188,117,127,147,189,231,90,220,53,159,108,192,53,87,156,40,139,77,222,107,246,120,48,128,178,6,72,49,55,160,114,243,36,85,41,113,33,163,216,217,242,100,191,28,64,236,91,134,237,108,219,155,49,30,220,41,219,56,160,211,34,79,15,91,194,254,244,138,209,57,84,196,60,124,88,204,125,59,234,199,138,57,242,128,60,92,241,175,195,67,178,150,219,184,119,183,115,195,229,5,209,48,219,109,192,143,163,65,121,150,197,76,107,209,164,12,134,168,132,73,14,104,231,187,229,60,151,83,200,198,4,140,210,244,200,3,225,
+94,34,8,245,196,126,82,216,233,136,54,226,250,221,57,211,230,228,205,46,66,33,46,125,97,208,92,25,12,169,81,167,84,9,23,171,7,96,245,5,203,205,98,232,204,49,184,119,176,225,126,96,110,183,182,111,11,14,177,50,189,30,52,170,103,230,73,148,109,182,92,24,12,147,240,104,100,232,118,195,182,18,222,233,229,149,1,72,7,60,49,157,57,60,194,112,137,196,36,114,7,61,228,36,7,158,75,210,186,154,215,146,247,22,183,50,83,162,72,44,167,215,83,193,73,237,212,102,105,100,167,29,81,55,114,86,94,24,61,225,146,6,225,93,231,221,4,214,148,252,164,88,155,198,198,72,112,92,238,250,120,207,78,192,69,130,153,40,151,79,148,1,153,197,162,221,14,156,13,22,25,74,115,166,9,204,108,189,192,76,12,218,90,200,217,40,143,45,106,141,56,51,26,157,6,61,182,169,34,51,31,14,35,189,51,55,87,93,220,58,179,59,98,213,109,27,232,25,187,235,109,187,246,156,117,208,234,57,96,221,36,150,227,79,74,57,217,248,196,176,80,135,13,234,43,131,
+37,121,193,188,170,165,166,225,130,225,160,51,106,84,58,58,55,194,187,8,206,102,213,198,141,232,206,216,144,71,181,51,26,88,102,94,87,142,245,216,81,118,16,100,238,208,173,51,227,189,97,100,153,142,76,188,44,125,170,108,201,239,3,50,125,240,32,106,176,222,141,122,146,182,56,87,224,149,21,96,190,19,94,110,12,25,116,87,51,60,197,98,107,7,115,238,102,35,40,245,107,22,28,155,65,115,180,216,19,104,79,154,190,56,39,189,97,90,84,154,241,250,88,24,225,231,73,33,134,137,7,83,148,72,155,112,144,41,200,115,215,32,65,37,192,130,25,118,13,149,20,243,232,153,176,20,143,131,22,129,192,116,163,0,57,4,116,208,163,101,64,0,211,6,17,152,59,2,208,250,6,213,234,57,29,194,249,29,216,165,100,10,144,219,27,96,144,223,23,18,233,99,123,216,127,55,179,13,101,182,173,98,88,125,143,232,33,124,161,117,239,40,177,69,226,75,192,28,15,66,61,61,242,136,76,112,212,57,115,11,141,74,40,17,88,94,41,217,217,42,66,204,224,233,164,3,
+176,243,72,5,140,42,10,133,236,154,207,192,218,93,30,73,13,6,64,65,19,27,93,99,13,38,201,40,202,6,156,5,112,183,121,168,221,209,61,159,197,40,19,213,50,65,36,46,34,78,75,91,194,126,22,216,63,92,63,62,184,220,5,233,213,109,64,7,76,80,39,119,177,29,48,139,239,128,49,111,118,202,136,116,219,254,142,219,179,117,141,55,76,47,5,8,89,48,149,215,225,68,77,140,255,158,109,66,220,100,150,111,128,241,170,174,152,163,136,127,28,14,12,214,145,72,111,193,134,97,106,240,170,8,11,76,253,174,215,37,69,64,177,87,240,73,176,9,135,224,182,71,239,92,251,226,68,191,9,25,136,246,104,49,86,41,127,115,35,105,146,238,145,160,93,31,68,189,30,163,61,198,214,31,94,55,148,211,166,207,64,57,11,136,189,27,39,53,207,152,30,185,186,241,209,57,44,250,76,210,4,199,146,97,195,92,66,133,66,219,181,135,28,113,114,146,35,121,44,49,95,42,65,143,144,236,236,54,210,124,168,155,123,174,92,217,10,254,108,185,41,224,158,200,75,14,
+139,94,162,144,32,139,93,232,50,147,223,41,66,68,56,139,87,80,8,128,101,102,127,11,11,223,119,128,225,31,34,216,108,79,207,131,214,226,193,65,192,78,200,95,0,176,164,223,50,102,30,141,175,52,172,4,205,105,230,151,55,15,91,42,41,166,94,245,86,201,39,30,200,92,111,226,245,233,87,66,173,144,20,171,210,181,136,84,101,46,102,220,73,35,25,197,142,99,181,93,151,161,97,222,211,128,179,239,102,177,10,4,3,3,106,25,81,145,12,30,125,211,181,35,15,202,0,86,206,124,80,39,76,190,152,128,121,37,39,217,222,167,171,14,224,124,28,108,8,1,78,251,232,35,64,117,68,6,84,167,16,5,152,68,120,236,183,189,125,136,200,3,38,46,41,36,24,184,236,56,230,90,145,1,225,195,68,80,23,159,82,39,131,250,67,137,182,138,54,234,124,147,224,56,133,45,79,88,181,39,99,87,140,183,165,102,37,202,96,4,3,254,145,12,53,162,242,197,51,18,188,230,3,205,106,142,3,179,112,182,17,197,228,28,17,193,244,57,178,110,6,181,0,5,188,91,
+64,209,237,143,57,111,80,193,213,44,89,83,192,216,37,150,4,115,70,198,81,159,212,72,33,56,166,222,4,215,15,232,29,11,56,197,30,136,123,74,124,80,211,16,40,12,15,244,142,247,12,221,219,220,196,92,13,91,162,151,33,90,192,101,39,200,100,232,190,79,196,14,49,16,108,59,242,206,161,42,146,218,170,246,173,169,152,212,115,215,52,135,237,91,59,1,218,56,212,104,72,154,46,140,144,74,216,129,78,111,117,142,202,120,213,68,229,138,176,252,139,48,161,167,89,14,107,160,130,27,234,162,158,31,191,179,223,130,110,70,228,79,203,137,13,107,108,144,196,35,216,163,163,177,8,11,240,147,39,141,68,194,30,93,90,59,129,87,165,56,71,116,126,89,89,164,118,23,137,229,122,7,250,7,133,85,57,248,180,186,120,136,172,179,71,140,177,58,80,189,46,193,248,113,198,5,144,196,34,148,200,162,178,24,191,122,112,160,173,149,150,64,37,173,180,100,71,158,222,193,248,68,65,17,117,7,95,13,199,158,35,248,19,44,243,114,45,180,74,103,68,166,35,56,106,233,
+161,159,235,133,127,116,120,9,9,139,142,60,103,49,24,152,247,230,144,87,62,149,23,212,63,25,182,210,46,160,66,45,181,155,197,216,24,120,126,241,24,60,17,174,193,210,152,207,152,133,17,52,6,60,149,190,116,76,21,116,80,47,235,225,177,190,185,204,20,10,104,124,144,24,87,206,179,179,89,178,24,232,56,239,197,249,132,18,203,19,115,221,60,236,84,53,104,23,22,161,81,140,169,142,227,129,32,104,47,119,8,254,142,176,200,71,177,22,189,201,176,20,43,120,35,182,173,241,13,61,49,139,164,23,153,233,116,88,42,27,22,120,130,199,215,109,194,178,61,240,152,246,38,187,36,241,195,188,249,114,158,225,96,127,210,118,5,6,167,201,96,210,238,8,59,187,172,116,154,89,78,51,123,25,120,22,223,82,244,225,178,29,146,255,97,188,191,188,83,68,179,23,45,186,48,93,30,235,231,124,105,217,229,101,165,115,185,2,211,80,230,240,115,217,109,186,77,138,226,103,51,107,69,100,170,113,233,80,92,209,7,216,232,186,170,109,155,209,170,235,116,101,66,116,207,151,
+42,143,119,109,70,161,233,138,33,26,33,160,24,106,187,226,19,204,155,217,153,73,231,106,239,112,108,174,182,89,40,16,245,205,150,40,205,160,137,66,73,44,20,243,154,234,211,243,131,39,51,56,37,157,245,32,106,7,24,123,32,212,212,248,211,158,1,253,70,121,146,186,12,16,23,165,2,111,177,93,246,216,197,46,187,67,144,15,70,97,217,83,193,114,226,1,120,26,234,246,55,97,142,117,173,48,221,8,240,185,142,193,38,165,138,241,135,212,14,240,120,227,153,195,106,249,45,67,149,64,247,154,163,89,48,178,224,155,200,36,13,209,174,196,34,121,8,40,175,53,165,103,155,52,131,45,67,50,168,13,169,208,68,68,73,220,57,144,27,8,47,25,81,170,92,154,90,98,28,15,155,196,78,182,18,142,34,255,84,85,190,231,215,224,120,228,77,131,70,156,209,97,106,100,232,220,78,48,108,37,26,88,181,176,56,62,61,218,236,28,92,90,163,62,53,71,138,213,133,13,37,210,4,105,189,179,111,236,170,227,33,207,241,148,237,211,135,61,124,134,224,176,230,142,246,82,
+93,39,109,129,147,38,96,18,119,121,92,77,95,14,246,85,109,126,92,214,107,202,247,139,25,232,117,240,92,45,243,105,42,53,81,160,0,175,83,155,73,120,74,127,227,101,11,138,94,115,92,229,64,105,121,44,157,88,98,179,4,103,117,78,110,199,57,72,12,3,227,114,96,44,139,243,23,170,251,17,118,84,230,195,112,144,194,250,238,88,145,209,96,19,37,40,146,157,112,24,40,146,80,241,40,57,242,100,61,173,132,31,80,218,198,195,171,107,139,169,59,77,206,175,134,23,73,211,198,252,202,63,171,108,11,59,179,156,174,227,74,141,64,195,190,157,182,109,13,249,161,251,132,90,103,7,28,219,5,18,188,110,117,50,213,81,180,167,106,18,221,186,27,16,151,85,219,116,44,194,21,181,69,104,54,89,59,146,150,205,154,73,55,102,241,137,144,81,206,10,224,25,179,38,227,197,139,211,114,169,23,220,16,134,109,221,127,176,50,152,162,130,110,221,80,25,129,144,215,69,183,115,51,213,250,140,209,154,95,181,188,158,45,213,224,194,100,119,170,116,188,251,147,147,251,75,
+48,207,207,118,121,138,224,169,170,8,189,38,218,21,89,30,0,59,12,246,231,217,248,76,45,65,4,117,28,186,201,210,202,227,59,23,181,237,129,36,19,156,137,82,89,61,85,59,111,183,154,249,43,223,41,4,216,128,78,143,61,26,106,199,111,172,55,167,22,77,114,54,239,205,139,23,83,201,2,51,236,186,82,6,31,36,216,45,231,155,178,186,102,218,41,23,192,245,194,193,225,203,16,1,134,172,101,196,2,136,224,105,140,222,70,49,99,71,48,248,210,213,57,160,175,47,93,253,8,189,12,228,118,24,128,216,114,174,193,83,154,107,208,7,232,179,253,91,66,97,29,8,81,182,138,51,136,232,22,182,125,215,134,123,171,244,101,224,216,56,230,201,16,196,108,248,88,189,10,40,99,253,181,100,58,37,111,110,239,29,121,86,145,100,4,102,7,185,2,35,186,37,91,158,11,107,214,13,48,199,176,137,110,208,251,75,54,247,199,225,194,112,184,173,1,35,77,31,74,222,34,210,237,110,178,82,146,88,242,221,122,224,75,69,89,231,167,126,240,192,208,64,68,83,219,240,
+136,12,229,188,234,3,252,226,69,73,175,154,239,126,250,244,227,39,159,131,67,222,95,190,185,106,213,139,188,194,106,60,254,233,139,39,159,253,228,209,135,79,62,248,248,241,103,175,223,135,244,102,107,222,91,207,159,61,144,91,117,237,173,250,241,158,62,127,244,121,11,237,234,58,248,227,211,101,27,228,55,63,127,89,211,63,125,180,228,249,213,142,190,167,159,252,70,63,224,151,223,227,245,201,179,151,63,251,104,133,76,124,254,228,227,15,65,1,94,62,255,226,221,96,15,96,194,15,30,127,242,232,241,199,75,129,158,60,254,224,163,101,235,237,95,253,229,143,150,235,90,246,21,126,169,43,245,161,209,245,85,215,238,59,47,159,127,240,232,249,7,159,61,253,244,97,47,62,111,86,253,96,217,142,250,170,71,245,75,125,155,63,251,236,217,203,79,31,189,247,141,31,253,203,227,101,107,228,123,223,248,13,20,195,127,122,242,226,111,158,126,242,208,105,186,236,207,124,254,223,30,61,188,253,104,217,90,186,186,252,222,55,254,143,101,155,50,120,231,157,15,126,245,232,189,63,
+2,111,127,231,207,94,1,201,192,139,95,106,227,92,81,251,251,23,31,126,13,181,215,60,30,232,252,203,163,247,254,16,188,241,239,191,158,206,107,114,15,189,178,95,109,146,253,236,21,205,85,155,236,215,52,197,174,174,127,246,246,163,239,175,250,102,127,123,215,236,123,223,120,247,189,111,188,253,8,20,250,63,62,3,89,125,19,156,245,23,31,63,254,224,231,191,5,115,241,189,215,13,217,255,240,10,161,183,124,207,219,210,160,126,184,236,143,125,123,245,254,180,199,143,62,125,250,228,225,77,109,175,180,5,26,12,168,135,231,31,188,247,141,87,87,150,234,252,24,52,166,151,143,127,182,124,147,215,18,153,250,41,184,27,15,239,15,251,138,109,189,243,213,22,209,111,127,251,59,239,254,193,255,250,238,187,107,176,107,200,240,75,207,47,22,179,27,233,131,128,3,146,2,156,199,169,69,52,181,38,19,29,219,73,136,26,209,235,117,108,134,8,192,118,107,65,99,217,120,16,28,4,50,173,67,25,166,66,162,188,158,114,241,168,194,10,69,53,11,239,4,189,103,247,167,76,
+171,36,82,23,151,198,34,223,191,221,117,199,234,122,159,152,183,6,205,107,66,175,183,85,165,144,74,165,222,41,209,211,81,141,139,197,209,48,49,83,169,204,117,63,105,60,157,26,44,48,27,60,153,233,7,102,243,197,26,29,157,41,142,18,51,2,120,87,102,101,38,124,153,11,30,78,166,148,178,131,46,58,35,38,22,150,189,94,235,205,116,130,143,136,198,211,177,237,222,130,46,149,90,23,226,120,242,171,227,108,94,239,138,99,173,117,63,71,35,126,147,191,126,197,95,102,221,103,38,86,51,59,74,233,106,230,84,44,92,205,244,131,116,67,226,193,54,61,248,176,176,68,228,97,97,110,234,195,130,255,173,175,27,77,89,177,173,59,231,12,186,182,185,109,225,148,196,91,182,174,183,57,197,73,77,141,187,114,33,213,56,93,55,241,10,77,83,106,52,218,24,36,115,1,247,177,158,181,212,255,17,218,43,62,55,38,88,175,66,215,231,8,128,239,188,3,90,236,39,239,125,235,1,82,253,208,50,253,252,139,86,235,21,172,249,147,175,14,120,251,161,39,250,217,167,79,
+62,89,134,215,191,5,127,255,100,217,77,189,196,51,175,94,78,247,226,249,178,139,255,201,178,67,123,133,65,3,163,242,167,96,228,5,227,22,104,176,143,254,241,85,40,92,97,168,159,128,132,30,127,246,217,242,13,123,43,76,244,67,123,246,215,243,93,210,249,197,147,95,188,15,18,254,231,199,159,61,93,190,19,109,233,70,95,101,247,53,75,90,197,242,167,207,127,241,116,5,184,126,249,252,75,0,189,31,126,252,236,249,147,207,145,128,15,11,91,189,110,112,249,90,198,7,180,193,43,170,191,63,208,30,40,238,223,44,133,253,203,7,89,95,35,9,126,27,136,239,253,175,67,19,44,91,246,255,242,217,106,69,95,131,202,126,88,233,239,106,201,255,28,235,247,21,161,126,27,232,239,205,161,255,10,244,223,247,126,19,253,247,254,27,232,187,165,164,191,169,255,37,28,239,235,94,66,247,173,95,191,255,21,100,246,171,77,248,87,225,227,62,135,113,128,39,202,171,221,254,237,10,0,119,242,43,123,243,225,199,63,251,201,159,253,15,40,104,233,48,95,221,165,229,91,243,
+62,254,217,59,127,245,252,225,230,171,119,229,253,225,210,66,151,183,191,245,235,159,44,111,191,82,237,27,96,225,143,159,63,249,250,193,43,74,75,172,248,191,22,132,255,197,14,252,86,136,231,235,97,191,93,211,223,253,239,97,164,223,80,245,82,200,63,254,224,127,94,223,75,58,255,54,112,200,47,118,1,116,252,47,40,130,95,190,14,50,253,189,87,112,42,240,8,254,227,47,96,26,239,254,201,119,255,224,79,191,251,46,6,198,135,154,191,242,86,194,245,97,180,84,48,186,137,119,136,65,102,94,30,100,76,245,142,94,81,51,41,4,10,169,34,117,205,56,224,111,217,169,64,6,46,144,35,32,104,45,186,66,59,95,187,39,155,215,224,244,237,221,168,168,65,65,235,101,152,93,147,224,66,196,68,144,194,234,27,57,37,131,221,26,204,220,55,44,182,33,162,242,221,251,144,229,226,112,193,227,100,213,193,83,166,90,204,46,239,180,70,254,73,21,170,72,59,0,248,49,0,1,255,47,255,65,30,126,29,67,30,126,1,8,53,202,17,236,177,218,105,58,128,156,121,134,
+51,221,26,137,228,180,111,228,103,57,57,237,90,90,34,198,211,59,53,68,86,149,219,148,203,247,183,113,120,31,80,41,231,13,250,131,40,2,202,178,139,56,119,54,53,125,187,150,241,9,245,107,213,190,62,85,219,56,191,103,33,111,221,142,141,92,100,219,126,78,131,33,47,73,196,43,237,124,55,51,172,90,227,37,67,91,221,19,225,110,111,105,125,205,160,80,215,216,20,249,148,137,117,127,5,147,42,241,151,245,94,227,200,85,11,202,174,203,184,64,193,108,51,140,29,67,248,81,227,114,148,240,29,151,239,134,217,139,76,242,96,206,54,28,157,72,221,132,107,251,193,250,137,246,4,96,140,3,22,123,155,78,65,78,43,107,217,144,49,40,23,218,122,188,106,50,41,157,150,55,105,152,91,195,132,174,246,220,15,23,137,242,26,206,77,58,38,192,33,16,2,19,198,21,206,72,44,140,46,176,149,146,9,14,195,99,161,144,65,68,233,200,33,41,169,184,199,247,201,24,200,29,67,40,128,86,114,1,187,139,142,42,40,250,93,159,84,12,135,156,17,42,7,10,247,93,
+129,8,104,91,100,238,254,117,149,184,143,170,193,121,59,238,182,72,197,187,22,78,144,115,31,213,191,197,35,67,20,199,106,157,193,6,211,57,108,103,151,10,84,115,61,160,99,108,105,155,115,185,101,173,206,26,15,99,125,214,5,121,215,156,22,155,75,67,62,59,229,182,109,186,125,9,169,74,181,189,102,9,159,110,180,199,5,186,2,191,195,119,209,49,14,43,99,140,44,27,248,250,156,56,2,215,97,252,195,42,2,194,44,165,6,34,35,225,52,146,94,223,47,87,152,121,231,180,10,133,28,225,102,76,26,174,82,74,239,248,107,21,22,233,122,210,185,20,87,55,10,81,151,199,152,102,31,56,113,36,231,225,137,142,103,206,245,204,144,254,201,145,249,232,104,110,156,116,146,57,45,140,208,27,53,174,203,245,146,8,173,63,96,224,61,50,113,16,19,240,212,141,148,124,196,3,57,211,226,163,102,199,53,242,28,121,20,95,171,227,110,160,199,55,58,220,154,178,23,148,71,226,169,141,254,212,75,113,47,156,167,33,185,146,77,70,242,174,139,115,97,155,100,203,6,43,
+64,30,197,8,238,11,133,187,156,221,192,137,253,188,86,199,249,143,136,114,196,248,44,67,213,169,33,147,235,29,103,221,45,106,76,18,30,114,245,108,26,231,214,146,152,238,89,92,17,216,197,178,118,240,28,241,24,221,9,77,108,123,155,147,57,185,122,227,221,211,161,121,194,51,49,78,112,214,115,217,206,54,34,54,15,163,124,108,142,55,173,166,193,205,65,21,107,152,123,237,24,4,52,171,42,245,166,38,65,138,151,3,242,142,102,178,224,109,239,177,74,24,138,102,231,128,117,129,187,219,68,95,248,154,121,127,18,157,66,93,170,143,132,150,187,134,224,14,6,212,109,69,88,246,86,74,233,29,70,14,140,170,113,26,210,211,76,180,23,141,52,249,202,106,180,219,100,151,76,30,251,146,94,204,210,47,109,14,70,87,171,112,65,226,140,131,83,150,54,179,79,49,135,57,195,205,170,244,170,235,44,32,185,156,171,113,203,134,28,196,107,243,36,30,51,137,172,251,140,105,219,169,222,154,111,222,152,60,59,188,169,106,178,35,165,99,10,228,194,222,17,197,169,75,183,54,
+43,23,181,12,246,42,201,130,244,21,80,247,246,181,124,31,101,169,108,55,58,82,82,127,32,35,245,207,200,83,99,181,223,82,248,47,175,70,154,217,200,57,190,236,204,104,185,241,118,247,140,92,132,245,208,243,162,65,181,208,87,140,187,18,227,157,245,116,19,8,85,183,72,222,61,166,3,35,182,48,197,147,49,108,157,59,179,232,35,116,73,147,175,76,251,206,217,73,162,184,145,35,76,189,250,115,253,84,28,230,103,131,183,87,42,141,220,208,174,182,155,238,100,173,173,199,152,105,68,233,241,145,244,160,234,63,35,25,247,217,199,87,33,68,240,76,100,136,181,174,210,204,109,122,212,42,136,218,244,146,93,89,142,174,184,138,111,155,174,201,218,162,236,230,52,179,219,187,190,235,93,247,106,245,72,239,170,187,29,142,112,37,155,139,203,102,27,53,103,6,83,46,106,185,87,212,249,218,139,129,83,67,193,8,165,86,222,188,102,134,67,231,249,252,16,129,37,123,73,121,145,124,221,126,25,2,88,105,33,219,109,129,64,0,24,69,24,189,153,119,37,37,254,161,52,192,
+82,25,243,215,51,159,179,106,30,201,109,163,162,237,114,99,255,52,113,53,42,68,161,214,61,32,225,136,181,108,151,198,242,136,25,62,13,134,134,148,49,81,237,117,225,119,3,236,200,98,162,227,158,109,78,111,2,59,50,113,39,142,199,152,108,14,190,211,52,107,239,170,243,160,119,247,83,180,148,215,123,195,62,103,51,54,162,45,129,82,80,194,173,207,248,122,216,249,54,19,209,20,165,154,205,27,76,4,62,162,94,43,177,138,236,1,111,76,214,133,156,72,27,62,146,180,204,214,70,242,226,148,91,200,15,201,33,34,195,73,152,23,39,60,169,211,106,184,116,146,242,183,219,112,229,70,192,204,172,233,153,211,131,83,183,73,95,147,24,18,82,66,34,112,15,137,109,202,214,33,251,215,151,241,118,213,198,47,157,210,160,245,201,97,40,200,112,150,164,85,143,102,134,202,84,171,215,97,116,112,195,61,237,187,96,219,194,201,30,13,63,190,157,240,230,37,102,48,155,139,166,120,150,160,49,238,68,99,88,151,165,75,237,142,30,211,222,48,235,230,246,140,92,93,145,234,
+93,33,191,28,192,218,169,40,47,20,34,51,0,123,77,61,51,127,47,61,136,220,183,213,151,5,201,176,216,184,187,12,121,122,219,17,238,193,200,95,46,91,201,185,197,94,187,82,79,30,118,130,54,220,144,208,189,136,232,212,37,139,113,126,236,116,134,250,170,65,2,173,187,107,96,106,227,3,249,5,149,197,44,233,101,180,248,177,66,14,192,146,134,246,24,2,217,159,245,58,14,141,224,118,163,230,222,177,74,177,188,19,21,129,229,10,196,144,254,120,24,142,11,5,71,142,162,221,191,23,34,238,102,38,102,221,253,201,130,54,182,77,37,67,191,181,156,241,182,164,195,14,209,229,148,183,93,138,44,105,157,186,235,86,77,171,107,166,202,20,93,203,221,187,164,71,30,92,167,112,152,157,134,180,234,45,168,195,225,235,52,166,9,187,189,115,237,162,228,218,29,196,81,194,213,162,177,28,155,198,29,253,240,52,88,45,227,195,136,43,255,185,124,67,132,231,160,183,208,92,127,0,66,216,218,216,25,159,90,114,252,86,111,99,18,19,46,68,222,190,193,219,232,14,78,47,
+88,3,246,162,193,117,206,10,179,13,21,119,116,26,185,244,132,24,241,201,246,184,139,169,13,88,119,90,105,155,124,121,163,115,148,116,98,65,254,36,196,148,141,117,242,139,13,159,66,16,236,77,241,54,8,164,115,159,75,201,209,232,219,203,57,253,246,18,90,77,56,202,154,174,187,234,112,215,22,55,196,8,18,119,225,171,245,14,206,41,253,212,76,119,21,26,220,102,244,142,68,161,235,174,160,76,1,35,209,34,156,132,178,170,187,18,126,47,143,1,195,146,185,150,103,135,82,105,157,193,126,109,222,209,183,39,13,140,122,40,119,223,247,118,154,234,43,211,68,115,185,217,196,158,95,168,119,57,49,184,46,117,191,67,242,245,23,16,29,238,46,78,128,158,35,54,46,137,205,186,108,39,20,3,68,156,89,94,183,16,108,142,84,246,155,0,75,164,107,120,238,55,252,119,187,148,196,148,128,236,66,121,172,90,47,83,104,133,240,230,116,141,219,101,85,123,201,249,52,45,9,6,32,139,155,51,237,152,191,145,104,146,204,235,59,250,108,235,206,211,30,30,90,34,108,238,
+4,127,39,9,8,116,4,102,254,12,119,238,41,28,146,67,126,40,107,189,237,133,67,8,138,117,195,173,199,228,36,58,38,244,49,225,98,61,107,222,99,78,144,55,153,27,15,37,187,150,13,143,119,44,82,86,206,40,184,194,104,59,68,35,105,22,13,57,198,217,225,124,65,85,17,23,226,200,5,214,120,152,59,71,131,158,62,159,17,37,129,253,152,111,86,119,73,163,178,190,205,239,53,164,44,183,229,113,157,110,24,96,52,169,121,138,124,127,79,182,111,32,33,55,16,185,157,138,22,220,26,92,26,112,149,246,120,186,185,199,28,194,171,46,130,183,10,137,159,48,42,247,224,17,142,52,239,114,110,53,30,93,161,109,105,205,28,59,94,203,220,182,105,97,44,102,133,173,69,184,48,223,22,71,232,167,24,120,178,121,93,14,236,54,147,122,122,99,91,219,18,88,48,115,202,25,62,219,194,69,206,136,215,53,209,17,95,144,60,103,241,135,105,250,182,190,6,185,221,67,185,35,10,8,11,50,72,195,105,234,130,191,74,218,201,107,41,125,76,70,47,223,27,70,133,160,
+203,240,43,94,205,188,15,237,178,44,89,0,159,197,110,38,88,48,141,154,27,246,179,100,151,218,109,222,60,60,179,30,90,71,60,211,89,166,53,195,143,17,217,217,208,121,34,79,16,239,203,103,247,155,23,126,234,128,202,229,112,32,245,91,100,21,77,153,196,137,20,188,155,73,150,77,93,123,53,102,149,101,230,40,109,9,37,190,125,119,0,79,16,174,7,241,81,209,8,219,170,29,151,109,155,199,248,147,123,46,251,248,94,196,153,150,23,1,119,114,207,89,88,167,122,2,243,171,146,233,178,215,232,95,211,90,91,154,22,34,82,205,138,53,145,245,97,85,108,19,177,206,117,220,122,61,125,72,59,147,7,217,205,210,34,140,183,42,75,83,97,154,54,24,156,168,247,8,155,134,112,42,4,81,114,194,41,94,48,142,194,168,111,115,99,164,251,48,113,151,52,185,156,37,180,14,69,208,230,218,21,1,2,226,129,178,4,97,97,35,53,236,232,24,3,100,138,100,203,31,175,133,66,11,57,123,112,27,34,194,221,24,48,172,110,158,217,182,134,83,225,118,161,53,150,184,
+238,99,120,51,53,105,201,19,171,241,73,92,186,62,189,234,165,148,113,129,216,184,24,196,115,234,35,203,90,228,2,53,190,188,49,132,217,48,214,30,241,6,83,160,171,185,249,13,64,23,112,40,174,164,182,128,181,4,73,182,135,26,195,218,245,218,5,61,162,143,103,44,189,43,152,120,194,171,206,58,134,100,208,111,158,6,153,185,89,112,142,51,45,124,231,147,192,156,96,26,152,248,131,34,222,218,137,27,226,77,155,124,16,230,117,149,247,214,177,110,168,43,243,230,177,133,193,189,40,152,230,233,238,60,22,212,15,235,233,36,29,211,45,138,72,232,96,30,126,186,51,107,239,108,117,157,178,19,113,226,76,170,169,232,136,11,17,68,5,97,94,119,177,177,69,170,59,139,141,212,60,115,118,122,205,181,77,141,194,238,98,193,101,223,37,103,108,216,66,103,91,180,212,116,100,63,192,190,52,213,146,71,139,221,201,194,88,158,144,22,230,233,157,252,44,58,183,208,136,125,253,212,122,164,147,77,224,184,114,188,117,177,184,115,217,52,189,139,109,39,13,141,41,56,136,174,
+238,56,97,138,251,174,251,46,212,80,22,27,236,139,3,107,243,157,19,77,215,7,153,180,167,220,41,13,194,118,214,207,97,131,246,150,67,78,97,77,215,116,177,116,220,79,15,157,196,83,237,108,124,226,221,102,245,64,177,3,123,133,128,251,110,114,84,224,220,203,253,12,195,198,28,90,32,220,47,234,8,109,123,34,220,13,195,251,14,73,130,107,187,110,112,134,211,249,6,83,151,111,219,100,56,157,106,59,54,156,230,184,97,108,27,71,66,251,133,246,147,27,36,30,87,187,6,92,154,13,222,8,2,243,236,110,230,78,52,19,83,49,24,14,186,146,218,61,44,59,150,218,114,224,239,13,235,60,42,146,93,201,246,59,137,166,114,255,242,206,175,194,223,119,79,11,134,253,201,205,152,186,217,188,238,150,103,173,96,5,15,143,64,110,201,56,249,218,160,185,158,142,138,96,193,141,190,135,107,106,173,31,172,235,57,101,197,230,98,90,225,115,172,72,46,111,52,64,183,163,136,194,182,68,118,120,68,44,74,227,84,149,174,136,139,176,143,59,94,193,109,221,46,190,70,29,
+71,188,25,84,19,62,69,40,97,169,128,238,174,224,208,67,23,154,57,148,113,84,112,71,39,150,254,193,52,120,30,147,23,58,222,201,97,57,138,16,99,187,197,32,181,52,131,65,76,78,143,105,161,132,24,97,250,75,111,81,76,94,107,109,157,70,68,210,220,185,51,158,227,206,236,173,24,1,35,37,100,118,37,86,214,130,165,85,182,224,78,187,67,157,131,64,182,164,227,196,80,132,52,171,35,226,220,217,118,234,156,93,33,217,166,218,113,203,180,215,243,26,226,213,0,88,128,113,100,183,146,41,23,78,83,50,180,89,137,162,25,175,146,157,161,197,5,141,49,28,109,235,110,170,136,18,100,73,197,227,23,109,238,134,163,219,115,129,137,170,109,151,3,98,170,59,158,52,68,49,243,148,158,69,187,233,34,74,42,200,24,226,65,85,173,24,237,58,105,103,79,138,77,159,111,177,123,109,95,123,84,33,28,242,180,218,11,8,4,13,80,228,162,29,50,53,83,217,219,217,243,180,157,189,180,241,90,44,201,43,80,153,43,111,183,82,169,12,215,32,144,209,121,42,229,246,
+24,245,222,154,73,186,166,119,32,91,145,136,5,172,21,61,235,46,151,49,51,223,216,82,99,76,58,183,103,75,111,4,19,165,0,17,143,215,248,218,229,6,217,36,209,75,13,7,2,184,31,15,129,20,29,91,14,7,222,68,30,167,149,50,53,166,166,185,94,67,81,215,33,128,65,75,221,26,48,192,79,119,228,211,45,61,4,194,128,57,225,80,136,121,99,151,0,129,93,59,143,218,16,136,82,238,42,57,211,24,39,116,10,41,18,183,243,92,47,157,210,76,33,156,80,72,206,12,3,71,93,59,89,122,153,190,142,133,65,74,30,158,116,214,30,217,207,211,231,108,200,145,23,2,205,67,32,25,28,117,125,13,114,151,79,93,176,9,122,29,40,5,209,59,184,217,92,222,233,184,243,13,140,137,115,118,158,218,135,64,142,172,209,120,28,200,90,41,253,210,253,37,181,220,66,163,65,250,216,226,58,222,105,24,67,129,165,120,128,233,28,7,82,197,182,19,237,99,11,210,14,202,101,64,22,182,245,83,80,2,232,181,102,37,39,7,148,51,39,34,65,120,144,105,229,36,
+135,220,5,8,144,173,1,184,38,26,184,40,225,30,4,2,87,34,49,48,200,240,96,184,20,15,187,148,1,20,143,160,131,132,193,229,122,157,22,6,165,156,151,31,240,245,16,34,100,10,89,138,126,238,19,83,203,86,101,147,113,82,247,138,215,110,155,119,160,190,121,213,234,30,4,212,249,238,138,239,108,197,215,14,146,237,131,133,241,228,152,148,94,35,208,83,141,128,73,181,184,49,53,169,238,118,23,226,28,49,225,246,73,74,163,91,119,3,125,52,184,13,88,229,37,92,5,197,116,119,68,152,26,59,121,97,221,37,236,167,83,241,117,76,119,83,34,139,235,14,96,7,205,82,67,230,186,63,196,251,213,21,121,182,151,78,92,141,149,27,53,108,52,212,9,94,50,137,254,68,98,177,113,187,64,43,39,118,119,113,46,185,67,157,179,227,151,215,93,139,92,167,162,29,195,10,117,130,222,74,33,18,110,18,161,8,65,97,8,247,24,97,205,72,63,211,12,47,10,156,217,118,242,154,1,7,217,176,143,194,41,119,250,108,230,54,244,239,238,180,97,18,231,190,167,82,
+72,20,66,237,250,89,98,116,41,75,186,119,90,231,55,190,186,21,232,98,40,106,144,252,117,150,154,175,155,47,74,78,47,218,193,153,209,77,54,101,64,211,244,142,143,74,247,35,163,106,24,32,180,92,183,185,99,37,154,90,238,248,47,117,49,11,69,138,16,213,48,221,233,26,99,135,94,49,98,65,69,10,176,91,122,165,195,200,148,149,14,92,55,158,182,59,93,137,244,180,23,227,90,164,239,27,239,244,23,88,157,83,185,191,97,109,10,108,9,54,204,15,173,205,239,214,232,133,122,32,59,191,73,106,23,161,251,251,131,3,88,150,187,27,168,181,167,13,154,3,83,73,4,59,60,61,22,252,14,157,229,205,189,3,33,130,114,7,123,80,232,193,202,222,76,212,249,96,36,173,48,108,220,163,139,108,22,1,26,218,130,175,80,168,240,245,123,86,236,190,239,44,97,7,71,75,235,81,66,49,144,165,49,128,83,227,71,216,131,104,234,186,14,5,109,120,72,60,103,91,244,199,67,223,40,160,203,230,236,135,219,163,240,116,196,96,144,161,82,44,42,184,213,139,175,7,
+209,230,115,100,6,162,109,39,55,201,98,4,3,71,3,104,212,112,185,10,96,96,205,237,114,44,75,137,50,67,110,9,35,223,167,43,83,57,97,230,230,218,137,164,219,46,1,126,122,55,74,186,78,118,54,146,68,70,162,178,30,68,154,97,115,49,175,140,162,237,31,159,211,82,244,115,201,157,234,52,19,145,163,79,229,91,29,1,66,208,145,111,166,47,82,183,202,93,194,101,190,232,139,80,238,105,108,74,6,144,220,101,36,163,70,229,56,195,161,213,206,234,170,181,69,149,41,211,52,80,220,200,229,60,103,184,21,77,11,20,42,177,79,63,13,184,24,244,232,36,12,197,248,5,66,175,179,161,216,132,217,138,238,61,57,3,163,34,131,66,194,173,85,206,105,43,106,115,54,149,80,17,93,145,139,163,25,10,206,193,45,228,98,207,116,177,158,179,240,192,205,23,107,6,93,45,159,120,138,76,232,45,81,209,124,178,223,78,141,219,197,77,239,77,87,16,36,176,22,26,180,90,3,106,85,167,234,24,138,184,89,146,156,31,8,34,29,67,52,64,114,54,81,10,83,211,
+28,174,112,16,41,216,141,89,217,60,189,146,211,89,104,211,102,236,72,114,153,157,197,111,78,167,132,252,205,158,188,232,187,192,201,157,56,63,196,149,215,209,58,121,173,128,118,126,35,33,89,172,69,219,216,191,45,33,121,207,22,155,60,150,201,112,71,161,174,24,13,174,142,75,238,172,58,138,57,38,213,20,128,200,72,192,237,26,171,181,203,90,185,3,112,192,83,108,141,68,224,236,13,27,219,42,17,139,112,17,25,237,199,50,134,147,166,60,191,129,63,189,80,10,108,86,67,205,191,102,141,173,103,163,28,19,46,81,40,38,171,234,64,29,136,157,132,90,123,132,187,185,63,202,157,97,14,54,58,201,227,19,50,79,72,163,167,80,62,35,64,207,177,88,228,113,85,213,154,50,2,180,109,90,190,195,71,152,6,246,246,17,226,210,211,142,194,101,155,126,184,188,204,215,183,97,23,247,85,109,33,114,83,83,6,245,103,30,212,61,243,152,31,229,75,181,76,254,28,116,30,255,48,174,29,171,45,100,162,45,224,77,248,77,65,102,103,224,236,20,233,78,187,203,153,26,
+59,100,183,154,196,65,77,141,18,196,73,76,146,84,125,41,188,40,34,119,138,190,181,224,41,42,211,217,191,149,231,230,54,253,160,44,91,247,159,142,115,163,106,166,51,156,26,246,228,251,158,90,107,75,127,125,172,207,155,111,29,177,157,188,111,243,222,112,234,216,161,177,52,50,159,217,118,213,223,167,251,96,53,156,105,7,135,185,161,204,92,90,67,188,172,90,76,123,177,192,230,76,189,30,182,233,205,13,79,44,224,66,116,122,153,210,160,51,160,74,76,42,70,173,238,201,28,166,73,211,19,157,179,163,117,134,141,119,130,92,247,162,238,146,57,119,123,204,156,148,24,200,39,84,147,155,233,102,54,34,168,11,175,20,250,206,69,242,206,172,4,69,208,74,54,242,2,155,176,58,195,249,14,98,78,146,166,142,51,149,78,50,132,134,154,151,224,87,50,162,6,55,105,202,158,208,156,59,187,195,148,240,226,140,196,234,201,26,73,81,98,219,149,167,13,98,165,254,89,160,235,72,90,205,83,29,113,167,19,166,26,106,3,233,69,220,170,76,245,155,253,86,152,131,113,154,
+84,148,132,174,172,76,41,60,169,228,14,42,24,196,156,122,27,152,20,207,112,221,59,198,141,36,173,192,89,202,180,115,144,119,20,198,59,250,67,7,182,204,117,166,17,167,78,104,124,63,156,50,25,178,90,26,10,243,255,118,113,101,91,9,43,205,250,145,206,19,157,119,65,102,3,162,200,12,1,100,134,0,65,8,67,24,148,65,34,50,79,66,152,4,9,131,50,19,4,20,21,248,113,239,245,95,156,115,209,55,189,186,170,187,234,171,254,170,43,171,86,122,94,178,183,66,160,220,80,172,31,5,154,156,11,108,243,234,44,217,157,229,86,140,101,103,149,86,188,89,224,67,136,192,15,126,234,239,157,215,170,232,123,151,139,50,64,95,99,173,33,77,86,247,74,251,94,35,130,174,7,143,79,43,218,135,67,124,255,230,91,190,52,191,138,106,37,30,244,115,112,26,65,73,75,173,188,244,238,66,228,143,147,226,212,161,57,143,151,200,81,114,85,1,111,19,99,205,155,97,80,117,114,1,43,187,164,159,231,234,63,55,227,183,89,116,213,44,142,202,234,39,13,211,63,75,
+37,128,182,84,22,109,26,69,86,228,205,145,231,30,104,172,71,201,239,33,208,211,205,75,180,104,186,205,41,213,220,135,212,52,145,16,165,117,2,120,249,200,219,1,52,21,125,193,209,173,199,122,12,179,251,227,159,247,247,6,59,232,33,238,183,238,159,44,113,213,58,6,137,47,157,109,25,26,63,246,51,208,185,133,8,179,117,122,20,117,131,169,113,187,58,47,194,77,155,125,76,255,125,84,54,239,170,212,85,19,224,238,76,233,56,41,139,114,46,217,76,251,65,45,244,121,20,91,93,190,5,161,219,101,58,131,11,241,237,98,115,62,83,231,181,254,51,141,66,92,2,39,93,241,197,81,232,249,189,198,91,7,110,231,3,108,159,117,138,54,225,155,254,174,198,188,90,77,112,240,54,207,50,1,63,174,20,31,105,231,101,46,197,236,216,116,173,145,159,238,86,48,136,41,241,33,195,158,226,238,232,9,80,224,15,250,17,248,189,24,189,193,22,172,181,126,33,149,255,144,166,184,168,200,113,164,68,111,182,231,122,181,90,117,239,155,185,41,29,59,203,197,220,162,68,69,
+234,89,93,55,172,211,231,94,146,150,73,53,134,7,36,164,124,190,145,203,154,188,53,61,89,91,19,65,31,92,128,88,232,20,59,250,192,216,110,255,179,45,117,92,61,159,79,10,138,3,49,183,23,148,10,101,87,82,217,25,122,171,51,239,242,17,112,53,14,18,181,29,249,92,0,151,102,61,10,53,31,204,6,137,22,127,59,42,126,197,57,33,150,247,43,60,65,63,110,70,147,31,130,73,214,206,130,89,52,147,114,152,88,147,38,11,70,127,247,55,10,138,44,80,19,221,45,21,182,240,151,60,203,83,205,155,57,32,139,220,166,170,11,176,111,171,39,101,103,106,61,26,231,214,147,63,193,95,65,201,20,71,155,85,114,7,191,188,80,176,237,153,142,40,173,204,250,155,250,108,225,106,233,123,158,101,51,198,235,49,66,12,49,254,185,94,138,30,154,49,111,137,13,91,175,7,87,237,148,202,103,69,19,19,174,56,109,15,125,219,42,155,42,85,84,63,191,84,32,2,239,208,52,171,164,115,173,20,80,142,51,231,25,160,237,128,48,42,223,21,119,58,234,252,188,80,
+47,85,70,250,57,85,174,53,81,75,3,134,242,119,47,111,29,253,8,212,11,94,207,116,8,84,52,226,147,193,18,61,42,249,246,94,180,249,249,142,186,101,11,149,57,217,3,191,217,93,55,74,115,79,48,108,142,134,198,130,112,204,202,176,242,214,201,210,210,48,173,146,56,255,125,196,219,191,40,69,223,188,136,118,222,219,150,2,8,187,69,4,70,57,254,162,87,199,6,44,71,74,53,81,232,217,0,158,225,189,228,1,110,103,34,9,255,146,171,231,98,30,122,63,252,8,22,188,211,221,160,179,186,64,115,101,217,246,13,147,110,173,235,251,105,101,221,205,216,167,103,182,124,191,120,231,226,13,159,21,121,136,19,91,79,72,71,134,30,250,121,194,155,241,116,75,202,232,58,113,188,183,36,229,106,45,123,241,114,165,188,77,202,220,125,44,9,164,221,51,206,36,205,107,103,89,13,185,79,46,138,38,83,254,243,77,253,131,16,34,189,109,58,11,100,21,224,110,109,233,84,156,105,224,105,21,126,126,218,95,3,65,209,6,160,13,151,24,102,251,130,95,237,160,191,195,
+245,54,154,86,132,118,233,36,199,185,201,74,233,159,47,35,137,175,214,23,126,252,13,188,47,222,121,106,115,61,11,212,109,236,186,34,160,12,23,101,168,204,118,109,146,199,101,190,182,172,139,60,202,70,1,226,138,130,56,218,126,95,149,191,146,34,199,234,179,49,41,235,38,194,14,94,179,124,200,136,123,193,94,235,230,27,77,192,175,84,130,2,48,78,193,245,80,2,237,158,165,45,244,201,94,101,203,250,69,133,20,207,168,14,196,88,135,238,56,19,252,12,142,231,236,134,235,131,79,230,63,204,102,157,106,136,1,152,43,117,55,169,16,158,27,103,229,171,193,239,56,247,251,61,8,79,229,224,187,136,165,181,149,51,98,133,64,199,237,113,27,97,100,85,238,207,25,137,123,155,6,43,38,171,103,51,235,41,17,41,105,39,43,97,107,127,216,105,205,14,233,182,78,197,207,122,191,110,102,113,13,110,119,127,42,223,27,214,101,176,222,184,109,111,89,89,82,112,242,153,192,38,226,167,145,30,110,46,246,124,194,253,15,237,67,95,139,65,174,46,205,245,117,120,201,77,
+199,160,148,121,218,179,196,195,108,18,35,137,117,64,212,29,49,53,100,87,228,235,227,57,53,187,96,40,125,102,14,239,102,70,239,148,72,255,29,179,117,122,24,11,143,48,250,181,193,158,99,220,98,87,241,187,141,164,227,170,166,124,164,152,20,191,73,220,64,131,207,25,172,181,244,125,59,14,251,181,47,18,143,169,237,124,173,91,180,99,70,116,53,121,146,146,19,17,57,17,58,51,11,235,135,182,227,31,10,253,253,194,215,74,243,115,27,127,136,58,89,67,115,220,66,139,93,102,216,245,166,219,63,253,194,61,148,115,69,37,67,90,118,235,121,1,20,248,226,116,132,160,200,134,64,207,62,106,181,149,184,196,87,31,184,108,119,12,177,24,161,111,149,239,43,41,102,106,145,202,243,185,0,217,128,178,168,83,246,33,25,10,24,166,62,102,47,196,179,142,82,220,86,138,59,106,253,184,61,207,107,25,13,220,26,196,237,8,5,2,185,80,112,173,70,124,183,143,254,96,169,27,126,13,47,214,183,23,122,116,113,54,62,37,122,252,249,197,216,117,250,79,55,73,104,20,
+3,58,241,156,108,111,236,202,112,157,13,235,156,60,222,218,127,157,253,132,209,43,226,176,211,14,135,249,47,215,221,7,241,41,164,59,90,138,192,215,130,85,43,221,117,45,63,15,101,201,156,243,226,90,28,206,137,189,38,201,138,137,35,42,118,14,189,245,29,66,145,66,230,44,98,166,153,14,221,159,33,92,243,223,218,109,246,101,145,20,228,174,177,61,245,5,220,70,177,51,206,116,75,150,222,236,207,19,40,231,6,111,214,131,179,23,62,7,94,195,21,77,120,69,26,68,246,110,186,180,39,188,98,198,163,129,17,95,112,87,153,154,244,42,156,140,48,135,71,212,126,112,54,67,67,204,144,231,182,92,33,29,145,118,47,215,35,144,227,221,49,13,12,251,33,240,27,197,54,139,137,26,37,180,226,96,175,67,182,94,19,142,83,0,251,41,140,18,70,62,92,52,67,18,29,87,27,52,19,72,211,242,89,192,139,37,35,52,242,240,21,42,83,219,208,49,60,137,85,85,242,117,90,48,13,199,224,232,163,114,93,102,230,10,252,205,99,78,142,174,158,119,158,143,38,4,
+0,5,218,42,18,210,142,67,45,183,71,233,231,117,228,120,42,207,19,228,53,206,196,249,102,196,82,133,17,57,7,141,176,240,160,180,158,59,243,186,138,241,95,231,227,181,22,246,72,245,46,35,67,141,137,86,156,71,43,140,71,204,60,169,53,234,40,158,136,75,157,246,15,175,131,6,99,120,164,46,65,225,182,167,32,253,170,220,31,23,43,37,245,165,255,78,122,62,199,60,205,187,150,253,89,34,182,248,135,71,128,4,110,2,186,19,185,35,19,226,149,91,56,79,118,63,135,171,84,82,167,21,163,3,235,152,25,234,230,18,167,250,179,102,158,151,249,51,181,250,194,102,183,211,125,5,123,1,188,242,147,192,250,231,35,83,52,165,92,106,163,81,59,43,23,251,126,83,14,130,55,181,9,49,75,116,116,93,170,226,77,188,100,236,248,214,213,84,87,29,136,70,121,75,13,200,75,222,212,230,212,230,135,89,51,45,126,195,23,20,15,241,246,80,137,7,153,154,149,86,11,212,70,226,176,3,180,230,206,19,46,155,197,178,8,110,135,141,137,19,15,54,177,212,126,77,
+76,18,142,162,162,21,201,114,204,40,20,122,202,146,245,154,123,95,219,155,108,198,6,37,50,28,124,255,243,69,194,88,54,165,12,113,204,63,175,136,43,149,129,61,243,154,115,0,57,40,71,232,151,15,147,48,203,163,98,203,158,203,58,150,207,142,107,9,179,254,105,209,123,189,222,30,191,141,199,128,142,65,191,217,174,224,66,35,193,16,74,188,157,70,29,243,255,105,8,36,197,186,190,233,141,11,76,173,219,29,123,60,233,58,19,205,251,175,80,168,213,126,137,22,40,138,43,75,147,48,31,127,250,235,246,44,207,46,213,91,251,190,101,109,128,76,169,61,150,41,146,60,92,47,179,68,50,120,102,60,246,255,134,208,17,228,133,226,140,38,38,18,131,250,161,235,237,155,134,55,86,223,190,54,56,238,92,127,224,91,198,19,147,242,194,219,41,46,181,4,240,145,47,248,161,151,187,111,198,109,223,5,80,96,114,183,106,150,227,15,74,81,121,51,208,116,205,167,148,87,114,193,236,202,225,150,235,174,116,156,86,50,74,142,9,132,118,72,111,225,228,121,229,119,33,142,
+100,185,110,206,131,78,62,237,141,24,55,46,129,219,237,125,174,60,211,70,187,185,187,72,194,76,225,27,97,208,68,173,230,79,159,87,136,96,126,225,14,49,184,178,151,162,167,129,228,186,116,249,218,81,174,178,60,6,209,104,36,229,205,134,156,178,148,133,135,195,199,239,6,148,34,239,30,111,113,16,17,193,201,125,179,85,89,120,84,238,119,133,2,106,21,40,224,76,87,190,172,119,146,214,217,216,54,157,67,244,249,8,26,141,152,62,186,78,12,76,198,227,219,120,225,146,50,113,123,171,234,74,85,40,153,164,108,109,33,94,173,246,217,215,2,194,54,153,89,38,35,22,108,135,109,203,19,251,196,212,185,171,193,33,216,104,100,49,124,146,189,115,41,233,248,228,12,239,37,13,104,219,188,161,160,175,143,189,222,108,118,113,143,182,240,233,9,155,86,199,208,247,177,46,131,16,31,189,175,79,29,202,222,61,254,67,73,79,93,233,238,219,240,240,102,122,207,228,65,199,135,113,187,153,11,6,91,201,84,114,23,56,110,124,183,44,17,97,22,198,235,34,234,171,252,130,
+125,225,241,84,6,223,51,22,223,64,180,108,69,232,110,241,89,143,204,154,32,175,212,90,148,70,46,10,16,63,61,214,219,129,231,59,48,152,218,4,128,7,215,21,39,66,70,238,214,81,61,154,199,3,43,1,196,60,213,131,12,224,225,170,47,50,243,80,137,25,226,241,43,127,18,197,27,52,94,61,21,198,64,205,64,65,31,247,251,204,102,35,130,51,52,76,171,113,177,133,172,22,135,41,100,61,65,39,98,188,114,20,64,173,53,66,34,145,187,8,201,182,81,43,167,90,141,138,105,92,64,74,82,0,111,216,42,119,135,249,9,251,149,159,135,254,49,155,58,234,40,78,226,170,142,169,0,65,64,63,186,158,120,148,62,14,241,252,69,90,36,237,184,89,240,207,142,227,2,88,51,168,232,213,60,49,225,141,160,181,91,217,223,182,249,123,159,245,120,188,212,194,48,4,197,74,214,178,36,70,178,107,160,214,135,213,91,12,26,198,39,38,166,125,106,21,120,252,166,114,72,222,91,200,171,27,92,169,93,191,97,181,2,113,29,138,187,195,117,251,147,193,251,133,74,151,
+148,211,177,82,160,164,4,98,227,233,157,192,185,161,111,85,171,190,142,155,245,215,184,168,119,172,54,137,243,223,33,68,18,94,75,232,192,67,63,44,130,97,148,215,144,238,125,102,88,231,77,213,119,187,154,77,177,105,186,221,136,64,225,160,19,87,130,120,116,61,194,146,134,204,235,177,178,157,74,222,228,177,227,232,200,40,128,35,42,42,245,91,114,60,94,123,106,195,120,185,87,246,145,48,231,236,17,178,201,182,17,6,116,172,237,220,223,167,16,233,66,9,85,200,196,232,75,17,174,55,64,29,207,167,242,170,85,138,236,200,222,25,216,142,247,213,244,226,77,201,243,31,196,179,163,208,251,125,180,36,204,86,171,237,18,122,126,127,62,233,55,106,89,79,101,242,6,121,61,121,91,203,4,62,84,242,126,33,86,121,32,173,236,12,245,31,215,255,249,254,4,16,151,243,47,64,55,203,127,1,26,146,255,2,4,16,26,212,153,58,91,118,46,26,13,32,5,120,128,170,232,18,211,172,216,253,63,80,79,34,148,63,80,79,34,174,63,80,79,34,213,63,80,79,138,1,
+234,191,138,101,255,172,130,196,56,96,181,234,194,149,202,121,181,122,10,67,143,135,46,18,13,198,89,139,80,192,122,210,86,1,228,16,231,211,254,166,7,84,209,0,202,142,84,194,50,235,73,35,6,4,86,80,72,193,205,48,108,101,225,18,40,13,71,201,36,27,60,157,232,65,84,31,159,45,101,99,72,185,110,227,54,104,151,188,225,163,132,153,71,78,109,108,33,94,132,45,14,156,34,16,113,47,40,185,168,93,84,126,252,221,58,205,140,35,203,91,44,84,168,123,76,163,186,48,163,165,7,170,96,255,123,29,222,237,198,241,100,119,167,165,202,213,0,39,87,164,80,110,115,209,65,89,42,249,73,143,18,229,35,186,229,154,82,150,251,42,13,211,152,254,164,54,164,236,236,56,8,118,46,179,123,149,111,178,220,33,29,74,246,149,250,150,59,28,230,190,76,88,148,56,144,99,245,50,112,35,10,42,20,138,148,6,141,35,124,209,61,110,220,105,180,211,88,46,246,125,118,47,16,151,95,141,76,10,252,176,111,14,254,200,228,196,37,62,5,116,243,183,144,43,194,45,
+225,218,75,93,95,235,252,195,40,215,115,232,31,70,137,49,189,163,201,132,90,253,125,186,215,6,170,226,128,90,60,108,140,83,84,179,246,100,172,145,165,34,146,226,102,59,130,73,248,94,42,229,167,38,14,191,146,197,124,1,36,162,87,8,97,166,158,161,154,200,150,100,155,98,128,110,37,167,157,152,100,148,74,252,183,31,231,255,247,233,152,79,35,100,58,94,82,108,46,253,228,255,118,29,253,207,127,255,95,254,191,255,1,159,205,45,128,
+
diff --git a/uppsrc/CtrlLib/srcdoc.tpp/Updater$en-us.tpp b/uppsrc/CtrlLib/srcdoc.tpp/Updater$en-us.tpp
new file mode 100644
index 000000000..440ebee99
--- /dev/null
+++ b/uppsrc/CtrlLib/srcdoc.tpp/Updater$en-us.tpp
@@ -0,0 +1,90 @@
+TITLE("About Updater")
+COMPRESSED
+120,156,133,85,219,110,219,70,20,252,149,133,229,182,137,43,
+43,123,229,46,197,151,4,78,80,4,72,157,160,110,208,7,
+193,136,86,212,202,34,76,145,10,151,178,236,164,205,183,119,
+14,73,249,214,135,90,208,141,218,115,102,206,204,28,122,38,
+217,241,49,31,243,17,255,159,191,233,219,176,242,187,178,189,
+156,149,210,185,172,176,92,103,94,216,236,99,154,253,248,241,
+99,146,166,50,163,86,2,173,4,215,74,72,33,52,231,90,
+90,97,82,158,26,39,28,87,86,75,99,185,153,110,125,227,
+55,151,51,239,84,118,242,71,130,42,57,54,35,37,148,224,
+34,145,26,167,184,226,82,11,105,132,115,90,88,227,84,154,
+36,211,220,111,219,162,174,46,103,11,170,67,149,66,21,183,
+46,209,2,53,218,72,101,141,70,173,214,66,224,179,48,54,
+177,118,218,22,109,25,46,103,5,145,94,136,196,102,94,75,
+34,125,70,108,245,56,25,129,165,180,104,161,165,78,180,114,
+82,9,39,101,146,42,157,106,208,23,114,90,180,1,100,23,
+40,163,82,42,51,0,214,70,11,5,93,180,53,10,199,44,
+222,53,79,133,4,186,227,198,0,56,220,30,196,34,157,168,
+46,1,156,180,134,78,59,237,132,178,78,106,153,72,16,224,
+22,195,18,186,153,46,67,204,81,167,164,200,90,80,202,206,
+94,155,76,160,216,142,237,72,242,148,203,196,166,0,4,89,
+12,174,210,84,40,7,64,45,12,23,106,154,215,75,12,187,
+144,134,171,12,53,14,110,36,104,220,73,99,18,1,190,82,
+57,32,90,161,20,94,141,118,118,26,3,249,209,214,205,229,
+236,228,245,11,62,225,19,105,204,75,226,155,162,220,41,173,
+148,78,82,45,184,2,10,122,104,146,43,225,112,84,24,233,
+166,11,31,1,217,106,210,246,140,18,64,105,130,252,202,25,
+5,228,4,47,112,22,227,41,40,35,83,237,148,114,124,154,
+151,62,198,71,242,156,208,136,66,140,133,24,89,82,213,40,
+169,83,146,70,73,200,43,19,147,10,232,107,18,205,229,180,
+9,95,119,69,19,54,161,130,192,5,2,146,29,204,25,194,
+8,46,125,24,229,88,72,196,209,36,9,39,181,12,50,33,
+149,129,220,92,56,13,70,120,192,224,118,200,99,23,143,46,
+23,66,141,133,26,165,82,43,48,73,181,134,0,104,32,82,
+33,4,119,120,96,50,200,210,37,67,12,217,122,28,43,161,
+199,66,143,44,130,12,159,82,77,240,169,34,249,36,212,151,
+9,55,176,65,246,229,146,68,151,199,144,93,72,71,207,151,
+84,111,198,2,11,1,134,194,24,140,173,32,180,116,24,221,
+64,121,213,133,92,88,55,61,15,251,248,214,183,97,72,203,
+201,217,113,31,51,145,140,69,50,226,84,111,92,10,251,132,
+38,249,148,214,169,76,149,50,50,53,42,225,144,49,246,251,
+76,197,180,83,221,62,222,55,177,99,97,177,94,24,213,24,
+12,223,149,97,112,43,136,138,116,105,66,34,12,77,230,167,
+101,81,17,15,228,34,235,163,112,114,246,171,16,150,26,57,
+108,139,115,9,87,41,180,128,4,220,32,230,184,35,56,248,
+12,155,37,118,128,110,9,249,181,191,10,243,211,97,95,191,
+127,249,231,167,119,231,167,159,47,216,44,202,140,189,89,212,
+187,150,125,222,46,49,110,243,243,229,44,242,236,240,109,18,
+110,3,243,213,146,53,161,196,247,37,59,107,155,242,67,177,
+96,13,74,192,42,178,220,87,44,250,27,156,98,101,221,178,
+122,197,54,190,168,90,60,125,149,7,150,215,177,141,108,191,
+14,21,91,134,109,89,223,21,213,21,171,194,158,249,237,182,
+44,114,79,55,29,118,19,154,136,247,200,124,203,74,223,92,
+161,172,44,16,192,249,47,145,197,98,25,38,3,169,225,237,
+207,117,96,184,234,35,43,34,107,215,69,156,50,184,117,232,
+66,23,183,165,207,65,182,173,241,115,0,92,187,175,155,107,
+182,108,138,155,48,97,127,17,153,93,12,13,139,173,111,192,
+14,29,192,61,247,229,99,82,99,86,180,44,95,135,252,58,
+62,52,192,98,228,216,229,59,182,170,155,161,245,61,238,132,
+189,95,209,181,38,16,3,95,221,141,159,204,56,96,237,122,
+93,59,77,195,109,209,198,201,65,106,86,163,209,190,65,110,
+33,234,174,105,48,255,253,72,251,162,93,119,88,117,117,176,
+99,232,87,180,19,118,94,183,1,200,16,175,167,132,201,137,
+223,1,170,32,147,48,239,146,45,64,220,231,109,127,182,179,
+22,238,85,228,218,1,26,253,98,40,87,207,4,191,8,225,
+96,252,171,158,109,7,176,12,176,185,140,207,14,159,215,251,
+142,199,106,87,85,119,12,219,223,246,54,1,146,20,69,92,
+122,98,44,220,192,135,77,221,116,220,171,1,153,205,79,233,
+24,42,58,198,112,112,56,13,65,217,170,40,33,78,81,145,
+176,15,102,76,216,197,225,84,159,215,161,83,113,80,187,27,
+252,145,23,19,246,193,199,22,244,111,66,89,111,233,78,199,
+214,8,211,21,137,219,145,138,53,116,106,198,61,233,143,141,
+207,203,67,34,1,14,225,203,178,247,20,8,243,163,1,99,
+126,52,156,7,189,78,228,77,240,213,48,247,67,242,235,93,
+115,104,8,66,253,246,44,2,91,18,52,72,230,245,182,59,
+134,184,13,195,66,128,30,57,62,74,31,52,34,5,134,57,
+41,15,243,163,175,147,162,42,230,71,93,217,24,11,87,228,
+107,134,255,30,24,185,44,169,113,183,146,36,30,156,219,244,
+244,125,183,247,255,9,247,51,63,223,221,250,205,22,124,1,
+74,187,70,67,175,97,113,172,55,129,182,157,38,34,50,191,
+125,126,63,255,242,230,211,167,249,151,223,223,188,63,199,62,
+213,88,156,178,184,14,211,71,237,108,246,236,220,112,113,254,
+125,248,112,250,247,5,70,234,51,246,226,101,198,94,189,98,
+15,23,6,59,227,19,179,87,69,3,47,73,131,150,246,250,
+65,151,251,142,67,183,249,81,30,231,167,249,183,73,204,97,
+86,223,123,232,155,127,11,80,43,110,67,89,146,250,221,214,
+247,119,194,167,13,202,250,170,158,44,54,219,231,229,245,102,
+75,241,164,159,201,48,24,218,133,23,73,104,194,182,198,154,
+62,85,180,127,83,236,242,95,43,18,2,111,
\ No newline at end of file
diff --git a/uppsrc/CtrlLib/srcdoc.tpp/all.i b/uppsrc/CtrlLib/srcdoc.tpp/all.i
new file mode 100644
index 000000000..2ba799760
--- /dev/null
+++ b/uppsrc/CtrlLib/srcdoc.tpp/all.i
@@ -0,0 +1,20 @@
+TOPIC("RoundingDoubles$en-us")
+#include "RoundingDoubles$en-us.tpp"
+END_TOPIC
+
+TOPIC("Updater$en-us")
+#include "Updater$en-us.tpp"
+END_TOPIC
+
+TOPIC("Tips$en-us")
+#include "Tips$en-us.tpp"
+END_TOPIC
+
+TOPIC("MenuCb$en-us")
+#include "MenuCb$en-us.tpp"
+END_TOPIC
+
+TOPIC("Tutorial$en-us")
+#include "Tutorial$en-us.tpp"
+END_TOPIC
+
diff --git a/uppsrc/DocTypes/AUTHORS b/uppsrc/DocTypes/AUTHORS
new file mode 100644
index 000000000..f782e5b62
--- /dev/null
+++ b/uppsrc/DocTypes/AUTHORS
@@ -0,0 +1,2 @@
+Mirek Fidler <cxl@ntllib.org>
+Tomas Rylek  <rylek@volny.cz>
\ No newline at end of file
diff --git a/uppsrc/DocTypes/COPYING b/uppsrc/DocTypes/COPYING
new file mode 100644
index 000000000..33aa39102
--- /dev/null
+++ b/uppsrc/DocTypes/COPYING
@@ -0,0 +1,30 @@
+Copyright (C) 2005 Mirek Fidler, Tomas Rylek and various contributors (see AUTHORS)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to
+deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies of the Software and its Copyright notices. In addition publicly
+documented acknowledgment must be given that this software has been used if no
+source code of this software is made available publicly. This includes
+acknowledgments in either Copyright notices, Manuals, Publicity and Marketing
+documents or any documentation provided with any product containing this
+software. This License does not apply to any software that links to the
+libraries provided by this software (statically or dynamically), but only to
+the software provided.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+-----------
+
+Please see the COPYING.PLAIN for a plain-english explanation of this notice
+and it's intent.
diff --git a/uppsrc/DocTypes/COPYING-PLAIN b/uppsrc/DocTypes/COPYING-PLAIN
new file mode 100644
index 000000000..770a8132f
--- /dev/null
+++ b/uppsrc/DocTypes/COPYING-PLAIN
@@ -0,0 +1,33 @@
+Plain English Copyright Notice
+
+This file is not intended to be the actual License. The reason this file
+exists is that we here are programmers and engineers. We aren't lawyers. We
+provide licenses that we THINK say the right things, but we have our own
+intentions at heart. This is a plain-english explanation of what those
+intentions are, and if you follow them you will be within the "spirit" of
+the license.
+
+The intent is for us to enjoy writing software that is useful to us (the
+AUTHORS) and allow others to use it freely and also benefit from the work we
+put into making it. We don't want to restrict others using it. They should
+not *HAVE* to make the source code of the applications they write that
+simply link to these libraries (be that statically or dynamically), or for
+them to be limited as to what license they choose to use (be it open, closed
+or anything else). But we would like to know you are using these libraries.
+We simply would like to know that it has been useful to someone. This is why
+we ask for acknowledgement of some sort.
+
+You can do what you want with the source of this software - it doesn't
+matter. We still have it here for ourselves and it is open and free to use
+and download and play with. It can't be taken away. We don't really mind what
+you do with the source to your software. We would simply like to know that
+you are using it - especially if it makes it to a commerical product. If you
+simply e-mail all the AUTHORS (see COPYING and AUTHORS files) telling us, and
+then make sure you include a paragraph or page in the manual or in the "About.."
+box for the product with the copyright notice and state that you used this
+software, we will be very happy. If you want to contribute back modifications
+and fixes you may have made we will welcome those too with open arms (generally).
+If you want help with changes needed, ports needed or features to be added,
+arrangements can be easily made with some dialogue.
+
+Mirek Fidler <cxl@ntllib.org>
diff --git a/uppsrc/DocTypes/DocTable.cpp b/uppsrc/DocTypes/DocTable.cpp
new file mode 100644
index 000000000..5c4925050
--- /dev/null
+++ b/uppsrc/DocTypes/DocTable.cpp
@@ -0,0 +1,537 @@
+#include "DocTypes.h"
+
+NAMESPACE_UPP
+
+TableCell& TableCell::NewPar() {
+	par.Add();
+	par.Top().CopyStyle(par[par.GetCount() - 2]);
+	return *this;
+}
+
+int   TableCell::GetHeight(int zoom, int cx) const {
+	cx -= DocZoom(zoom, style.leftwidth) + DocZoomLn(zoom, style.rightwidth) +
+		  DocZoom(zoom, style.leftspace) + DocZoom(zoom, style.rightspace);
+	int cy = DocZoom(zoom, style.topwidth) + DocZoomLn(zoom, style.bottomwidth) +
+		     DocZoom(zoom, style.topspace) + DocZoom(zoom, style.bottomspace);
+	for(int i = 0; i < par.GetCount(); i++) {
+		const Paragraph& p = par[i];
+		cy += p.GetHeight(zoom, cx) +
+			  DocZoom(zoom, p.GetBefore()) + DocZoom(zoom, p.GetAfter());
+	}
+	return paintrect ? max(cy, paintrect.RatioSize(cx, 0).cy) : cy;
+}
+
+int   TableCell::GetWidth(int zoom) const {
+	int cx = 0;
+	for(int i = 0; i < par.GetCount(); i++)
+		cx = max(cx, par[i].GetWidth(zoom));
+	cx += DocZoom(zoom, style.leftwidth) + DocZoomLn(zoom, style.rightwidth) +
+		  DocZoom(zoom, style.leftspace) + DocZoom(zoom, style.rightspace);
+	return cx;
+}
+
+bool  TableCell::Paint(int zoom, Draw& w, int x, int y, int cx, int cy, int pcy, Color color,
+					   PaintInfo& pi) const {
+	if(pcy > cy) pcy = cy;
+	w.DrawRect(x, y, cx, cy, style.paper);
+	int lw = DocZoom(zoom, style.leftwidth);
+	int tw = DocZoom(zoom, style.topwidth);
+	int rw = DocZoomLn(zoom, style.rightwidth);
+	int bw = DocZoomLn(zoom, style.bottomwidth);
+	int ls = DocZoom(zoom, style.leftspace);
+	int ts = DocZoom(zoom, style.topspace);
+	int rs = DocZoom(zoom, style.rightspace);
+	int bs = DocZoom(zoom, style.bottomspace);
+	Rect r(x + lw + ls, y + tw + ts, x + cx - rw - rs, y + cy - bw - bs);
+	if(paintrect) {
+		w.Clip(r);
+		paintrect.Paint(w, r, color, style.paper);
+		w.End();
+	}
+	w.DrawRect(x, y, lw, cy, color);
+	w.DrawRect(x, y, cx, tw, color);
+	w.DrawRect(x + cx - rw, y, rw, cy, color);
+	w.DrawRect(x, y + cy - bw, cx, bw, color);
+	x = r.left;
+	cx = r.Width();
+	switch(style.align) {
+	case ALIGN_TOP:
+		y = y + tw + ts;
+		break;
+	case ALIGN_CENTER:
+		y = y + (cy - pcy) / 2 + tw + ts;
+		break;
+	case ALIGN_BOTTOM:
+		y = y + cy - pcy - bw - bs;
+		break;
+	}
+	int ymax = y + cy - bw - bs;
+	int ypos = 0;
+	for(int i = 0; i < par.GetCount(); i++) {
+		const Paragraph& p = par[i];
+		int bef = DocZoom(zoom, p.GetBefore());
+		int aft = DocZoom(zoom, p.GetAfter());
+		if(ypos + bef - pi.yl + y > ymax) {
+			pi.yl = ypos;
+			return true;
+		}
+		ypos += bef;
+		Paragraph::PaintInfo ppi;
+		if(ypos >= pi.yl) {
+			int py = y + ypos - pi.yl;
+			if(p.Paint(zoom, w, x, py, cx, ymax, ppi, style.paper)) {
+				pi.yl = ypos + ppi.yl;
+				return true;
+			}
+			ypos += ppi.ypos - py;
+		}
+		else {
+			int h = ypos < pi.yl ? p.GetHeight(zoom, cx) : 0;
+			if(ypos + h > pi.yl) {
+				ppi.yl = pi.yl - ypos;
+				if(p.Paint(zoom, w, x, y, cx, ymax, ppi, style.paper)) {
+					pi.yl = ypos + ppi.yl;
+					return true;
+				}
+			}
+			ypos += h;
+		}
+		ypos += aft;
+		if(ypos - pi.yl + y > ymax) {
+			pi.yl = ypos;
+			return true;
+		}
+	}
+	pi.yl = ypos;
+	return false;
+}
+
+void TableCell::GetValueRects(int zoom, Draw& w, int x, int y, int cx, int cy, int pcy,
+							  Vector<ValueRect>& vr)
+const {
+	if(pcy > cy) pcy = cy;
+	int lm = DocZoom(zoom, style.leftwidth) + DocZoom(zoom, style.leftspace);
+	x += lm;
+	cx -= lm + DocZoomLn(zoom, style.rightwidth) + DocZoom(zoom, style.rightspace);
+	int tm = DocZoom(zoom, style.topwidth) + DocZoom(zoom, style.topspace);
+	switch(style.align) {
+	case ALIGN_TOP:
+		y += tm;
+		break;
+	case ALIGN_CENTER:
+		y += (cy - pcy) / 2 + tm;
+		break;
+	case ALIGN_BOTTOM:
+		y += cy - pcy - DocZoomLn(zoom, style.bottomwidth) - DocZoom(zoom, style.bottomspace);
+		break;
+	}
+	for(int i = 0; i < par.GetCount(); i++) {
+		const Paragraph& p = par[i];
+		y += DocZoom(zoom, p.GetBefore());
+		p.GetValueRects(zoom, w, x, y, cx, vr);
+		y += DocZoom(zoom, p.GetAfter());
+	}
+}
+
+void TableCell::Qtf(const char *s) {
+	QtfParser parser;
+	par.Clear();
+	parser.Set(s);
+	while(parser.Parse() == QtfParser::PARAGRAPH)
+		par.Add() = parser.PickParagraph();
+	if(par.IsEmpty())
+		par.Add();
+}
+
+TableCell::TableCell(const TableCell& c, int) : par(c.par, 1) {
+	CopyStyle(c);
+	keep = c.keep;
+	paintrect = c.paintrect;
+}
+
+void TableCell::Style::Init() {
+	ratio = 1;
+	leftwidth = topwidth = rightwidth = bottomwidth = 5;
+	leftspace = rightspace = 20;
+	topspace = bottomspace = 10;
+	align = ALIGN_CENTER;
+	paper = White;
+}
+
+TableCell::TableCell() {
+	style.Init();
+	par.Add();
+	keep = false;
+	span = 1;
+}
+
+TableCell& Table::operator()(int i, int j) {
+	Array<TableCell>& c = cell.DoIndex(i);
+	int n = c.GetCount();
+	if(n <= j) {
+		c.SetCount(j + 1);
+		Array<TableCell>& row0 = cell[0];
+		if(i != 0) {
+			int l = min(row0.GetCount(), c.GetCount());
+			for(int j = n; j < l; j++)
+				c[j].Ratio(row0[j].GetRatio()).CopyStyle(row0[j].Par());
+		}
+	}
+	return c[j];
+}
+
+Table& Table::AddRow() {
+	cell.DoIndex(cell.GetCount());
+	return *this;
+}
+
+TableCell& Table::AddCell(bool inheritstyle) {
+	int j = cell.Top().GetCount();
+	TableCell& cl = cell.Top().Add();
+	if(inheritstyle)
+		if(cell.GetCount() > 1) {
+			Array<TableCell>& row0 = cell[0];
+			if(row0.GetCount() > j) {
+				cl.CopyStyle(row0[j]);
+				cl.CopyStyle(row0[j].Par());
+			}
+		}
+		else
+		if(cell[0].GetCount() > 1) {
+			TableCell& cc = cell[0][cell[0].GetCount() - 2];
+			cl.CopyStyle(cc);
+			cl.CopyStyle(cc.Par());
+			cl.Ratio(1);
+		}
+	return cl;
+}
+
+Table::Table(const Table& tab, int) : cell(tab.cell, 1) {
+	style = tab.style;
+}
+
+void Table::Style::Init() {
+	framewidth = 5;
+	framecolor = Black;
+	before = after = 0;
+	lm = rm = 0;
+	headerrows = 1;
+	breakcy = 800;
+	breakpgcy = 400;
+}
+
+Table::Table() {
+	style.Init();
+}
+
+int GetTotalRatio(const Array<TableCell>& row) {
+	int tr = 0;
+	for(int i = 0; i < row.GetCount(); i++)
+		tr += row[i].GetRatio();
+	return tr;
+}
+
+Table::Line Table::GetLine(int zoom, int i, int tcx, const Vector<int> *yl) const {
+	Line ln;
+	const Array<TableCell>& row = cell[i];
+	int rcx = GetTotalRatio(row);
+	ln.cell.SetCount(row.GetCount());
+	ln.keep = false;
+	ln.height = 0;
+	ln.span = 0;
+	int cx = 0;
+	int rt = 0;
+	int j;
+	for(j = 0; j < row.GetCount(); j++) {
+		Size& sz = ln.cell[j].size;
+		const TableCell& cell = row[j];
+		int span = ln.cell[j].span = cell.GetSpan() > 1 ? cell.GetSpan() : 0;
+		ln.span = max(ln.span, span);
+		if(j == row.GetCount() - 1)
+			sz.cx = tcx - cx;
+		else {
+			rt += cell.GetRatio();
+			sz.cx = tcx * rt / rcx - cx;
+			cx += sz.cx;
+		}
+	}
+	for(j = 0; j < row.GetCount(); j++) {
+		Size& sz = ln.cell[j].size;
+		const TableCell& cell = row[j];
+		sz.cy = cell.GetHeight(zoom, sz.cx);
+		if(yl && !ln.span && j < yl->GetCount())
+			sz.cy -= (*yl)[j];
+		ln.height = max(ln.height, ln.cell[j].span ? 0 : sz.cy);
+		ln.cell[j].spanh = sz.cy;
+		ln.cell[j].paint = true;
+		if(cell.IsKeep()) ln.keep = true;
+	}
+	return ln;
+}
+
+bool Table::KeepLine(int i) const {
+	const Array<TableCell>& row = cell[i];
+	for(i = 0; i < row.GetCount(); i++)
+		if(row[i].IsKeep()) return true;
+	return false;
+}
+
+void Table::DrawLine(int zoom, Draw& w, int x, int y, int i, const Line& ln,
+					 int ymax, Vector<int> *yl) const {
+	const Array<TableCell>& row = cell[i];
+	x += DocZoom(zoom, GetLm()) + DocZoomLn(zoom, GetFrameWidth());
+	if(yl) yl->SetCount(row.GetCount(), 0);
+	for(int j = 0; j < row.GetCount(); j++) {
+		const TableCell& cell = row[j];
+		const Cell& cl = ln.cell[j];
+		Size sz = cl.size;
+		if(cl.paint) {
+			TableCell::PaintInfo pi;
+			int h = cl.span ? cl.spanh : ln.height;
+			if(yl) {
+				pi.yl = (*yl)[j];
+				if(ymax - y >= 0)
+					h = min(ymax - y, h);
+			}
+			cell.Paint(zoom, w, x, y, sz.cx, h, sz.cy, GetFrameColor(), pi);
+			if(yl) (*yl)[j] = pi.yl;
+		}
+		x += sz.cx;
+	}
+}
+
+void Table::PaintLines(int zoom, Draw& w, int x, int& y, int i, const Vector<Line>& line,
+					   Vector<int> *yl) const {
+	for(int j = line.GetCount() - 1; j >= 0; j--) {
+		y -= line[j].height;
+		DrawLine(zoom, w, x, y, i + j, line[j], INT_MAX, j == 0 ? yl : NULL);
+	}
+}
+
+void Table::FrameTab(int zoom, Draw& w, bool was, int x, int y, int yp, int cx) const {
+	if(!was) return;
+	DrawFatFrame(w, x + DocZoom(zoom, GetLm()), yp,
+		         cx - DocZoom(zoom, GetLm()) - DocZoom(zoom, GetRm()) -
+				 (zoom < 1024) * DocZoom(zoom, GetFrameWidth()),
+		         y - yp + (zoom >= 1024) * DocZoom(zoom, GetFrameWidth()),
+				 GetFrameColor(), DocZoomLn(zoom, GetFrameWidth()));
+}
+
+int Table::Span(Vector<Line>& line) const {
+	int hg = 0;
+	for(int i = 0; i < line.GetCount(); i++) {
+		Line& ln = line[i];
+		int x = 0;
+		for(int j = 0; j < ln.cell.GetCount(); j++) {
+			Cell& cell = ln.cell[j];
+			if(cell.span) {
+				int k;
+				int h = 0;
+				int m = min(cell.span + i, line.GetCount());
+				for(k = i; k < m; k++) {
+					Line& ln = line[k];
+					h += ln.height;
+				}
+				if(h > cell.spanh)
+					cell.spanh = h;
+				else
+					line[m - 1].height += cell.spanh - h;
+				for(k = i + 1; k < m; k++) {
+					int xx = 0;
+					Line& ln = line[k];
+					for(int j = 0; j < ln.cell.GetCount() && xx <= x; j++) {
+						Cell& cll = ln.cell[j];
+						if(xx == x && cell.size.cx == cll.size.cx)
+							cll.paint = false;
+						xx += cll.size.cx;
+					}
+				}
+				cell.paint = true;
+			}
+			x += cell.size.cx;
+		}
+		hg += ln.height;
+	}
+	return hg;
+}
+
+bool Table::Paint(int zoom, Draw& w, int x, int y, int cx, int ymax, PaintInfo& pi) const {
+	int j;
+	Vector<Line> header;
+	int zfw = DocZoomLn(zoom, GetFrameWidth());
+	int tcx = cx - 2 * zfw - DocZoom(zoom, GetLm()) - DocZoom(zoom, GetRm());
+	bool breakpage = pi.line != pi.oline;
+	int  pgcy = ymax - y;
+	pi.oline = pi.line;
+	if(pi.line) {
+		int m = min(GetHeaderRows(), cell.GetCount());
+		for(j = 0; j < m; j++)
+			header.Add() = GetLine(zoom, j, tcx, NULL);
+	}
+	int hdrcy = Span(header);
+	if(hdrcy > ymax - y) {
+		header.Clear();
+		hdrcy = 0;
+	}
+	int hg = hdrcy;
+	int yp = y;
+	y += zfw;
+	bool was = false;
+	if(y >= ymax) {
+		pi.ypos = y;
+		return true;
+	}
+	while(pi.line < GetRows() && y < ymax) {
+		Vector<Line> line;
+		Vector<int> *yl = &pi.yl;
+		int span = 0;
+		bool nospan = true;
+		for(;;) {
+			int k = pi.line + line.GetCount();
+			if(k >= GetRows() || line.GetCount() && !KeepLine(k) && span <= 0)
+				break;
+			span = max((line.Add() = GetLine(zoom, k, tcx, yl)).span, span);
+			if(span) nospan = false;
+			yl = NULL;
+			span--;
+		}
+		hg += Span(line);
+		int lhg = line.Top().height;
+		if(hg + y + zfw > ymax) {
+			if((!breakpage ||
+				lhg > style.breakcy && ymax - (y + hg - lhg) - zfw > style.breakpgcy)
+			   && nospan && line.GetCount() && hg + y + zfw - lhg <= ymax) {
+				int yy = y + hdrcy;
+				PaintLines(zoom, w, x, yy, 0, header, 0);
+				yy = y + hdrcy;
+				int i;
+				for(i = 0; i < line.GetCount() - 1; i++) {
+					DrawLine(zoom, w, x, yy, pi.line++, line[i], ymax, NULL);
+					yy += line[i].height;
+				}
+				DrawLine(zoom, w, x, yy, pi.line, line[i], ymax, &pi.yl);
+				breakpage = was = true;
+				y = ymax;
+			}
+			if(breakpage) {
+				FrameTab(zoom, w, was, x, y, yp, cx);
+				pi.ypos = y;
+				return true;
+			}
+		}
+		y += hg;
+		int yy = y;
+		PaintLines(zoom, w, x, yy, pi.line, line, &pi.yl);
+		PaintLines(zoom, w, x, yy, 0, header, 0);
+		pi.yl.Clear();
+		header.Clear();
+		hg = 0;
+		breakpage = was = true;
+		pi.line += line.GetCount();
+	}
+	FrameTab(zoom, w, was, x, y, yp, cx);
+	pi.ypos = y + zfw;
+	return false;
+}
+
+int  Table::Paint(int zoom, Draw& w, int x, int y, int cx) const {
+	PaintInfo pi;
+	Paint(zoom, w, x, y, cx, INT_MAX, pi);
+	return pi.ypos;
+}
+
+bool Table::Paint(Draw& w, int x, int y, int cx, int ymax, PaintInfo& pi) const {
+	return Paint(1024, w, x, y, cx, ymax, pi);
+}
+
+int  Table::Paint(Draw& w, int x, int y, int cx) const {
+	return Paint(1024, w, x, y, cx);
+}
+
+int  Table::GetHeight(int zoom, int cx) const {
+	int cy = 0;
+	int ln = 0;
+	cx -= DocZoomLn(zoom, GetFrameWidth()) + DocZoomLn(zoom, GetFrameWidth()) +
+		  DocZoom(zoom, GetLm()) + DocZoom(zoom, GetRm());
+	cy += 2 * DocZoomLn(zoom, GetFrameWidth());
+	while(ln < GetRows()) {
+		Vector<Line> line;
+		int span = 0;
+		for(;;) {
+			int k = ln + line.GetCount();
+			if(ln + line.GetCount() >= GetRows() ||
+			   line.GetCount() && !KeepLine(k) && span <= 0)
+				break;
+			span = max((line.Add() = GetLine(zoom, k, cx, NULL)).span, span);
+			span--;
+		}
+		cy += Span(line);
+		ln += line.GetCount();
+	}
+	return cy;
+}
+
+void Table::RectLine(int zoom, Draw& w, int x, int y, int i, const Line& ln,
+					 Vector<ValueRect>& vr) const {
+	const Array<TableCell>& row = cell[i];
+	x += DocZoom(zoom, GetLm()) + DocZoomLn(zoom, GetFrameWidth());
+	for(int j = 0; j < row.GetCount(); j++) {
+		const TableCell& cell = row[j];
+		const Cell& cl = ln.cell[j];
+		Size sz = cl.size;
+		if(cl.paint) {
+			int h = cl.span ? cl.spanh : ln.height;
+			cell.GetValueRects(zoom, w, x, y, sz.cx, h, sz.cy, vr);
+		}
+		x += sz.cx;
+	}
+}
+
+void Table::RectLines(int zoom, Draw& w, int x, int y, int i, const Vector<Line>& line,
+					   Vector<ValueRect>& vr) const {
+	for(int j = line.GetCount() - 1; j >= 0; j--) {
+		y -= line[j].height;
+		RectLine(zoom, w, x, y, i + j, line[j], vr);
+	}
+}
+
+void Table::GetValueRects(int zoom, Draw& w, int x, int& y, int cx, Vector<ValueRect>& vr)
+const {
+	int zfw = DocZoomLn(zoom, GetFrameWidth());
+	int li = 0;
+	cx -= 2 * zfw + DocZoom(zoom, GetLm()) + DocZoom(zoom, GetRm());
+	y += zfw;
+	while(li < GetRows()) {
+		Vector<Line> line;
+		int span = 0;
+		for(;;) {
+			int k = li + line.GetCount();
+			if(k >= GetRows() || line.GetCount() && !KeepLine(k) && span <= 0)
+				break;
+			span = max((line.Add() = GetLine(zoom, k, cx, NULL)).span, span);
+			span--;
+		}
+		y += Span(line);
+		RectLines(zoom, w, x, y, li, line, vr);
+		li += line.GetCount();
+	}
+	y += zfw;
+}
+
+int  Table::GetHeight(int cx) const {
+	return GetHeight(1024, cx);
+}
+
+int  Table::GetWidth(int zoom) const {
+	int cx = 0;
+	for(int i = 0; i < GetRows(); i++) {
+		const Array<TableCell>& row = cell[i];
+		int x = 0;
+		for(int j = 0; j < row.GetCount(); j++)
+			x = max(x, row[j].GetWidth(zoom) / row[j].GetRatio());
+		cx = max(cx, x * GetTotalRatio(row));
+	}
+	return cx + 2 * GetFrameWidth();
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/DocTypes/DocTypes.cpp b/uppsrc/DocTypes/DocTypes.cpp
new file mode 100644
index 000000000..723494743
--- /dev/null
+++ b/uppsrc/DocTypes/DocTypes.cpp
@@ -0,0 +1,685 @@
+#include "DocTypes.h"
+
+NAMESPACE_UPP
+
+#define LLOG(x)  // DLOG(x)
+#define LDUMP(x) // DDUMP(x)
+
+class BulletDisplay : public Display {
+	void  Paint(Draw& w, const Rect& r, const Value& q, Color i, Color p, dword s) const {
+		Size sz = r.Size();
+		w.DrawEllipse(r.left, r.top + sz.cy / 4, sz.cx / 2, sz.cy / 2, i);
+	}
+};
+
+class WhiteBulletDisplay : public Display {
+	void  Paint(Draw& w, const Rect& r, const Value& q, Color i, Color p, dword s) const {
+		Size sz = r.Size();
+		w.DrawEllipse(r.left, r.top + sz.cy / 4, sz.cx / 2, sz.cy / 2, p, sz.cx / 8, i);
+	}
+};
+
+class BoxBulletDisplay : public Display {
+	void  Paint(Draw& w, const Rect& r, const Value& q, Color i, Color p, dword s) const {
+		Size sz = r.Size();
+		w.DrawRect(r.left, r.top + sz.cy / 4, sz.cx / 2, sz.cy / 2, i);
+	}
+};
+
+class WhiteBoxBulletDisplay : public Display {
+	void  Paint(Draw& w, const Rect& r, const Value& q, Color i, Color p, dword s) const {
+		Size sz = r.Size();
+		w.DrawRect(r.left, r.top + sz.cy / 4, sz.cx / 2, sz.cy / 2, i);
+		w.DrawRect(r.left + sz.cx / 8, r.top + sz.cy / 4 + sz.cx / 8,
+			       sz.cx / 2 - sz.cx / 4, sz.cy / 2 - sz.cx / 4, p);
+	}
+};
+
+static Display& sSb() { static BulletDisplay d; return d; }
+static Display& sWb() { static WhiteBulletDisplay d; return d; }
+static Display& sBb() { static BoxBulletDisplay d; return d; }
+static Display& sWd() { static WhiteBoxBulletDisplay d; return d; }
+
+GLOBAL_VARP(PaintRect, Paragraph::StdBullet, (sSb()))
+GLOBAL_VARP(PaintRect, Paragraph::WhiteBullet, (sWb()))
+GLOBAL_VARP(PaintRect, Paragraph::BoxBullet, (sBb()))
+GLOBAL_VARP(PaintRect, Paragraph::WhiteBoxBullet, (sWd()))
+
+Paragraph& Paragraph::Cat(const String& s, Font font, Color color, const Value& val, int delta) {
+	length += s.GetLength();
+	Part& n = part.Add();
+	n.text = s;
+	n.font = font;
+	n.color = color;
+	n.value = val;
+	n.delta = delta;
+	return *this;
+}
+
+Paragraph& Paragraph::Cat(const String& s, Font font, Color color, int delta) {
+	return Cat(s, font, color, Null, delta);
+}
+
+Paragraph& Paragraph::Cat(const char *s, Font font, Color color, int delta) {
+	return Cat(String(s), font, color, delta);
+}
+
+Paragraph& Paragraph::Cat(const PaintRect& pr, int cx, int cy, const Value& val, Color color) {
+	if(pr) {
+		length++;
+		Part& n = part.Add();
+		n.pr = pr;
+		n.sz = pr.RatioSize(cx, cy);
+		n.value = val;
+		n.color = color;
+	}
+	return *this;
+}
+
+Paragraph& Paragraph::Cat(const Paragraph& p) {
+	part.Append(p.part);
+	length += p.GetLength();
+	style.before = max(style.before, p.style.before);
+	style.after = max(style.after, p.style.after);
+	return *this;
+}
+
+Paragraph& Paragraph::Bullet(const PaintRect& bullet, int indent, Size size, Color color) {
+	style.bullet = bullet;
+	style.bulletindent = indent;
+	style.bulletsize = size;
+	style.bulletcolor = color;
+	return *this;
+}
+
+int  Paragraph::GetWidth(int zoom) const {
+	const Part *pptr = part.Begin();
+	const Part *plim = part.End();
+	int cx = DocZoom(zoom, style.indent);
+	while(pptr != plim) {
+		if(pptr->pr)
+			cx += pptr->pr && !pptr->sz.cx ? pptr->pr.GetStdSize().cx
+			                               : DocZoom(zoom, pptr->sz.cx);
+		else {
+			FontInfo pf = Font(pptr->font).Height(DocZoom(zoom, pptr->font.GetHeight())).Info();
+			const char *s = pptr->text;
+			int n = pptr->text.GetLength();
+			while(n--) {
+				cx += pf[*s == 31 ? 32 : (byte) *s];
+				s++;
+			}
+		}
+		pptr++;
+	}
+	return cx + style.lm + style.rm + (style.bullet ? style.bulletindent : 0);
+}
+
+bool Paragraph::Format(ParaTypo& pfmt, int cx, int zoom) const {
+	int len = length + !!style.indent;
+	Buffer<char> chr(len);
+	Buffer<int>  width(len);
+	Buffer<ParaTypo::Part *> info(len);
+	Buffer<ParaTypo::Part>   pinfo(part.GetCount() + !!style.indent);
+	const Part *pptr = part.Begin();
+	const Part *plim = part.End();
+	ParaTypo::Part *pp = pinfo;
+	char *cp = chr;
+	int  *wp = width;
+	ParaTypo::Part **ip = info;
+	if(!IsNull(parafont)) {
+		Font pf = parafont;
+//		pf.Height(max(1, DocZoom(zoom, parafont.GetHeight())));
+		int n = DocZoom(zoom, parafont.GetHeight());
+		pf.Height(n ? n : 1);
+		FontInfo f = pf.Info();
+		pfmt.SetMin(f.GetAscent(), f.GetDescent(), f.GetExternal());
+	}
+/*	if(!IsNull(parafont)) {
+		FontInfo f = w.GetFontInfo(parafont);
+		pfmt.SetMin(DocZoom(zoom, f.GetAscent()),
+			        DocZoom(zoom, f.GetDescent()),
+					DocZoom(zoom, f.GetExternal()));
+	}
+*/	if(style.indent) {
+		static Part dummy;
+		*cp++ = ' ';
+		*wp++ = DocZoom(zoom, style.indent);
+		pp->Set(Arial(0), Black);
+		pp->voidptr = &dummy;
+		*ip++ = pp;
+		pp++;
+	}
+	while(pptr != plim) {
+		if(pptr->pr) {
+			*cp++ = '@';
+			Size sz = pptr->pr.GetStdSize();
+			*wp++ = pp->width = pptr->pr && !pptr->sz.cx ? sz.cx : DocZoom(zoom, pptr->sz.cx);
+			*ip++ = pp;
+			pp->ascent = minmax(pptr->pr && !pptr->sz.cy ? sz.cy : DocZoom(zoom, pptr->sz.cy), 0, 1000);
+			pp->descent = 0;
+			pp->external = pp->overhang = 0;
+			pp->color = pptr->color;
+		}
+		else {
+			Font font = pptr->font;
+			font.Height(DocZoom(zoom, pptr->font.GetHeight()));
+			FontInfo pf = pp->Set(font, pptr->color);
+			const char *s = pptr->text;
+//			LOG("Format " << s << " a: " << pf.GetAscent() << " d: " << pf.GetDescent());
+			int n = pptr->text.GetLength();
+			while(n--) {
+				*cp++ = *s;
+				*wp++ = pf[*s == 31 ? 32 : (byte) *s];
+				*ip++ = pp;
+				s++;
+			}
+		}
+		pp->voidptr = (void *)pptr;
+		pp++;
+		pptr++;
+	}
+	return pfmt.Format(style.align, len, chr, width, info, cx);
+}
+
+class Paragraph::ParaHeight : public ParaTypo {
+protected:
+	virtual bool Put();
+
+public:
+	int    cy;
+};
+
+bool  Paragraph::ParaHeight::Put() {
+	LDUMP(ascent);
+	LDUMP(descent);
+	LDUMP(external);
+	cy += ascent + descent + external;
+	return false;
+}
+
+int  Paragraph::GetHeight(int zoom, int cx) const {
+	ParaHeight pp;
+	pp.cy = 0;
+	cx -= DocZoom(zoom, style.lm + style.rm + style.bulletindent);
+	if(cx <= 0) return 0;
+	Format(pp, cx, zoom);
+	LLOG("ParaHeight " << pp.cy);
+	return pp.cy;
+}
+
+class Paragraph::ParaPaint : public ParaTypo {
+public:
+	Draw&  draw;
+	int    zoom;
+	int    posx;
+	int    liney;
+	int    lm;
+	int    ymax;
+	int    yl, yp;
+	int    bh;
+	Color  paper;
+
+	void Put(int px, int py, Part *ip, Part **ibeg, Part **i, const char *text);
+
+	virtual bool PutAligned(int lm);
+
+	ParaPaint(Draw& w) : draw(w) {}
+};
+
+inline
+void Paragraph::ParaPaint::Put(int px, int py, Part *ip, Part **ibeg, Part **i, const char *text) {
+	if(!ip) return;
+	const Paragraph::Part *p = (const Paragraph::Part *) ip->voidptr;
+	if(p->pr)
+		p->pr.Paint(draw, px, py - ip->ascent, ip->width, ip->ascent, ip->color, paper);
+	else
+		draw.DrawText(px, py - ip->ascent + DocZoom(zoom, p->delta),
+		              text + (ibeg - info), ip->font, ip->color, i - ibeg);
+}
+
+bool Paragraph::ParaPaint::PutAligned(int alm) {
+	if(yp == 0) bh = ascent + descent;
+	if(liney + ascent + descent > ymax) return true;
+	if(yp >= yl) {
+		if(len) {
+			Part **i = info;
+			Part **ilim = info + len;
+			Part **ibeg = i;
+			Part  *ip = *ibeg;
+			int   *w = width;
+			int x = posx + alm + lm;
+			int px = x;
+			int py = liney + ascent;
+			while(i < ilim) {
+				if(*i != ip) {
+					Put(px, py, ip, ibeg, i, text);
+					px = x;
+					ibeg = i;
+					ip = *i;
+				}
+				x += *w++;
+				i++;
+			}
+			Put(px, py, ip, ibeg, i, text);
+		}
+		liney += ascent + descent + external;
+	}
+	yp += ascent + descent + external;
+	return false;
+}
+
+bool Paragraph::Paint(int zoom, Draw& w, int x, int y, int cx, int ymax, PaintInfo& pi,
+                      Color paper) const {
+	ParaPaint pp(w);
+	int bi = style.bullet ? style.bulletindent : 0;
+	pp.zoom = zoom;
+	pp.posx = x;
+	pp.liney = y;
+	pp.ymax = ymax;
+	pp.lm = DocZoom(zoom, style.lm + bi);
+	pp.yl = pi.yl;
+	pp.yp = 0;
+	pp.paper = paper;
+	cx -= DocZoom(zoom, style.lm + style.rm + bi);
+	bool r = Format(pp, max(1, cx), zoom);
+	if(pi.yl == 0 && pp.yp > 0 && style.bullet)
+		style.bullet.Paint(w, x + DocZoom(zoom, style.lm), y,
+		                   style.bulletsize.cx ? DocZoom(zoom, style.bulletsize.cx) : pp.bh,
+		                   style.bulletsize.cy ? DocZoom(zoom, style.bulletsize.cy) : pp.bh,
+						   style.bulletcolor, paper, 0);
+	pi.ypos = pp.liney;
+	pi.yl = pp.yp;
+	return r;
+}
+
+int Paragraph::Paint(int zoom, Draw& w, int x, int y, int cx, Color paper) const {
+	PaintInfo pi;
+	Paint(zoom, w, x, y, cx, INT_MAX, pi, paper);
+	return pi.ypos;
+}
+
+class Paragraph::ParaAngle : public ParaTypo {
+public:
+	Draw&  draw;
+	int    posx;
+	int    posy;
+	int    y;
+	int    lm;
+	int    bh;
+	double cosf, sinf;
+	int    angle;
+
+	void Put(int px, int py, Part *ip, Part **ibeg, Part **i, const char *text);
+
+	virtual bool PutAligned(int lm);
+
+	ParaAngle(Draw& w) : draw(w) {}
+};
+
+inline
+void Paragraph::ParaAngle::Put(int x, int y, Part *ip, Part **ibeg, Part **i, const char *text) {
+	if(!ip) return;
+	const Paragraph::Part *p = (const Paragraph::Part *) ip->voidptr;
+	if(p->pr) return;
+	y -= ip->ascent;
+	draw.DrawText(int(x * cosf + y * sinf + posx),
+	              int(-x * sinf + y * cosf + posy),
+	              angle,
+		          text + (ibeg - info), ip->font, ip->color, i - ibeg);
+}
+
+bool Paragraph::ParaAngle::PutAligned(int alm) {
+	if(y == 0) bh = ascent + descent;
+	if(len) {
+		Part **i = info;
+		Part **ilim = info + len;
+		Part **ibeg = i;
+		Part  *ip = *ibeg;
+		int   *w = width;
+		int x = alm + lm;
+		int px = x;
+		int py = ascent + y;
+		while(i < ilim) {
+			if(*i != ip) {
+				Put(px, py, ip, ibeg, i, text);
+				px = x;
+				ibeg = i;
+				ip = *i;
+			}
+			x += *w++;
+			i++;
+		}
+		Put(px, py, ip, ibeg, i, text);
+	}
+	y += ascent + descent + external;
+	return false;
+}
+
+void Paragraph::Paint(int zoom, int angle, Draw& w, int x, int y, int cx) const {
+	ParaAngle pp(w);
+	int bi = style.bullet ? style.bulletindent : 0;
+	double pan = 2 * M_PI * angle / 3600;
+	pp.sinf = sin(pan);
+	pp.cosf = cos(pan);
+	pp.angle = angle;
+	pp.posx = x;
+	pp.posy = y;
+	pp.y = 0;
+	pp.lm = DocZoom(zoom, style.lm + bi);
+	cx -= DocZoom(zoom, style.lm + style.rm + bi);
+	bool r = Format(pp, max(1, cx), zoom);
+/*	if(pp.yp > 0 && style.bullet)
+		style.bullet.Paint(w, x + DocZoom(zoom, style.lm), y, DocZoom(zoom, style.bulletindent),
+		                   pp.bh, Black, White, 0);*/
+}
+
+int    Paragraph::GetHeight(int cx) const {
+	return GetHeight(1024, cx);
+}
+
+bool Paragraph::Paint(Draw& w, int x, int y, int cx, int ymax, PaintInfo& pi, Color paper) const {
+	return Paint(1024, w, x, y, cx, ymax, pi, paper);
+}
+
+int  Paragraph::Paint(Draw& w, int x, int y, int cx, Color paper) const {
+	return Paint(1024, w, x, y, cx, paper);
+}
+
+class Paragraph::ParaRect : public ParaTypo {
+public:
+	Draw&              draw;
+	int                liney;
+	int                lm;
+	int                px;
+	Vector<ValueRect>& vr;
+
+	void Put(int x, int y, Part *ip, Part **ibeg, Part **i, const char *text);
+
+	virtual bool PutAligned(int lm);
+
+	ParaRect(Draw& w, Vector<ValueRect>& vr) : draw(w), vr(vr) {}
+};
+
+inline
+void Paragraph::ParaRect::Put(int x, int y, Part *ip, Part **ibeg, Part **i, const char *text) {
+	if(!ip) return;
+	const Paragraph::Part *p = (const Paragraph::Part *) ip->voidptr;
+	if(IsNull(p->value)) return;
+	ValueRect& r = vr.Add();
+	r.value = p->value;
+	r.rect = RectC(px + x, y, p->pr ? ip->width
+				              : GetTextSize(text + (ibeg - info), ip->font, i - ibeg).cx,
+			       ascent + descent + external);
+}
+
+bool Paragraph::ParaRect::PutAligned(int alm) {
+	if(len) {
+		Part **i = info;
+		Part **ilim = info + len;
+		Part **ibeg = i;
+		Part  *ip = *ibeg;
+		int   *w = width;
+		int x = alm + lm;
+		int px = x;
+		while(i < ilim) {
+			if(*i != ip) {
+				Put(px, liney, ip, ibeg, i, text);
+				px = x;
+				ibeg = i;
+				ip = *i;
+			}
+			x += *w++;
+			i++;
+		}
+		Put(px, liney, ip, ibeg, i, text);
+	}
+	liney += ascent + descent + external;
+	return false;
+}
+
+void Paragraph::GetValueRects(int zoom, Draw& w, int x, int& y, int cx, Vector<ValueRect>& vr)
+const {
+	ParaRect pr(w, vr);
+	int bi = style.bullet ? style.bulletindent : 0;
+	pr.lm = DocZoom(zoom, style.lm + bi);
+	pr.liney = y;
+	pr.px = x;
+	cx -= DocZoom(zoom, style.lm + style.rm + bi);
+	Format(pr, max(1, cx), zoom);
+	y = pr.liney;
+}
+
+void Paragraph::Style::Init() {
+	align = ALIGN_LEFT;
+	before = lm = rm = indent = after = 0;
+	bulletindent = 0;
+	bulletsize = Size(0, 0);
+	bulletcolor = Black;
+	bullet = PaintRect();
+}
+
+void Paragraph::Clear() {
+	part.Clear();
+	style.Init();
+	length = 0;
+	parafont = Null;
+}
+
+Paragraph::Paragraph(const Paragraph& p, int) : part(p.part, 1) {
+	style = p.style;
+	length = p.length;
+	parafont = p.parafont;
+}
+
+Paragraph::Paragraph() {
+	length = 0;
+	style.Init();
+	parafont = Null;
+}
+
+Table& Document::AddTable() {
+	Item& m = item.Add();
+	m.type = TABLE;
+	return m.data;
+}
+
+Paragraph& Document::AddParagraph() {
+	Item& m = item.Add();
+	m.type = PARAGRAPH;
+	Table& tab = m.data;
+	tab.AddRow();
+	return tab.AddCell().Par();
+}
+
+void Document::Cat(const Paragraph& p) {
+	if(item.GetCount() && item.Top().type == PARAGRAPH)
+		item.Top().data.LastCell().Par().Cat(p);
+	else
+		AddParagraph() <<= p;
+}
+
+int Document::GetHeight(int zoom, int cx) const {
+	int cy = 0;
+	for(int i = 0; i < item.GetCount(); i++) {
+		const Item& m = item[i];
+		if(m.type == PARAGRAPH) {
+			const Paragraph& p = m.data.LastCell().Par();
+			cy += DocZoom(zoom, p.GetBefore());
+			cy += p.GetHeight(zoom, cx);
+			cy += DocZoom(zoom, p.GetAfter());
+		}
+		else {
+			cy += DocZoom(zoom, m.data.GetBefore());
+			cy += m.data.GetHeight(zoom, cx);
+			cy += DocZoom(zoom, m.data.GetAfter());
+		}
+	}
+	return cy;
+}
+
+int Document::GetWidth(int zoom) const {
+	int cx = 0;
+	for(int i = 0; i < item.GetCount(); i++) {
+		const Item& m = item[i];
+		if(m.type == PARAGRAPH)
+			cx = max(cx, m.data.LastCell().Par().GetWidth(zoom));
+		else
+			cx = max(cx, m.data.GetWidth(zoom));
+	}
+	return cx;
+}
+
+int Document::Paint(int zoom, Draw& w, int x, int y, int cx, Color paper) const {
+	for(int i = 0; i < item.GetCount(); i++) {
+		const Item& m = item[i];
+		if(m.type == PARAGRAPH) {
+			const Paragraph& p = m.data.LastCell().Par();
+			y += DocZoom(zoom, p.GetBefore());
+			y = p.Paint(zoom, w, x, y, cx, paper);
+			y += DocZoom(zoom, p.GetAfter());
+		}
+		else {
+			y += DocZoom(zoom, m.data.GetBefore());
+			y = m.data.Paint(zoom, w, x, y, cx);
+			y += DocZoom(zoom, m.data.GetAfter());
+		}
+	}
+	return y;
+}
+
+Vector<ValueRect> Document::GetValueRects(int zoom, Draw& w, int x, int y, int cx) const {
+	Vector<ValueRect> vr;
+	for(int i = 0; i < item.GetCount(); i++) {
+		const Item& m = item[i];
+		if(m.type == PARAGRAPH) {
+			const Paragraph& p = m.data.LastCell().Par();
+			y += DocZoom(zoom, p.GetBefore());
+			p.GetValueRects(zoom, w, 0, y, cx, vr);
+			y += DocZoom(zoom, p.GetAfter());
+		}
+		else {
+			y += DocZoom(zoom, m.data.GetBefore());
+			m.data.GetValueRects(zoom, w, x, y, cx, vr);
+			y += DocZoom(zoom, m.data.GetAfter());
+		}
+	}
+	return vr;
+}
+
+int  Document::GetHeight(int zoom, int i, int cx, Document::Cache& cache) const {
+	if(cache.cx == cx && cache.zoom == zoom && i < cache.cy.GetCount() && !IsNull(cache.cy[i]))
+		return cache.cy[i];
+	int cy;
+	const Item& m = item[i];
+	if(m.type == PARAGRAPH) {
+		const Paragraph& p = m.data.LastCell().Par();
+		cy = DocZoom(zoom, p.GetBefore());
+		cy += p.GetHeight(zoom, cx);
+		cy += DocZoom(zoom, p.GetAfter());
+	}
+	else {
+		cy = DocZoom(zoom, m.data.GetBefore());
+		cy += m.data.GetHeight(zoom, cx);
+		cy += DocZoom(zoom, m.data.GetAfter());
+	}
+	if(cache.cx != cx || cache.zoom != zoom) {
+		cache.Clear();
+		cache.cx = cx;
+		cache.zoom = zoom;
+	}
+	cache.cy.DoIndex(i, Null) = cy;
+	return cy;
+}
+
+int  Document::GetHeight(int zoom, int cx, Cache& cache) const {
+	int cy = 0;
+	for(int i = 0; i < item.GetCount(); i++)
+		cy += GetHeight(zoom, i, cx, cache);
+	return cy;
+}
+
+void Document::Paint(int zoom, Draw& w, int x, int y, int cx, int cy, int y0,
+					 Cache& cache, Color paper) const {
+	int yp = 0;
+	for(int i = 0; i < item.GetCount() && yp < y0 + cy; i++) {
+		const Item& m = item[i];
+		int h = GetHeight(zoom, i, cx, cache);
+		int yo = yp + y - y0;
+		if((yp += h) <= y0)
+			continue;
+		if(m.type == PARAGRAPH) {
+			const Paragraph& p = m.data.LastCell().Par();
+			p.Paint(zoom, w, x, yo + DocZoom(zoom, p.GetBefore()), cx, paper);
+		}
+		else
+			m.data.Paint(zoom, w, x, yo + DocZoom(zoom, m.data.GetBefore()), cx);
+	}
+}
+
+void Document::Qtf0(const char *s, bool append, byte charset) {
+	QtfParser parser(s);
+	for(;;) {
+		switch(parser.Parse()) {
+		case QtfParser::PARAGRAPH:
+			if(append)
+				Cat(parser.GetParagraph());
+			else
+				AddParagraph() = parser.PickParagraph();
+			break;
+		case QtfParser::TABLE:
+			AddTable() = parser.PickTable();
+			break;
+		case QtfParser::END:
+			return;
+		}
+		append = false;
+	}
+}
+
+Document& Document::operator=(const char *s) {
+	Clear();
+	Qtf(s);
+	return *this;
+}
+
+Document& Document::operator|=(const char *s) {
+	AppendQtf(s, true);
+	return *this;
+}
+
+Document::Document(const Document& p, int) : item(p.item, 1) {}
+
+Document::Document() {}
+
+Document::Document(const char *qtf) {
+	Qtf(qtf);
+}
+
+void  DocOut::Qtf(const char *s) {
+	QtfParser parser(s);
+	for(;;) {
+		switch(parser.Parse()) {
+		case QtfParser::PARAGRAPH:
+			Put(parser.GetParagraph());
+			break;
+		case QtfParser::TABLE:
+			Put(parser.GetTable());
+			break;
+		case QtfParser::PAGE:
+			Page();
+			break;
+		case QtfParser::END:
+			return;
+		}
+	}
+}
+
+void DocOut::Put(const Document& doc) {
+	for(int i = 0; i < doc.GetCount(); i++)
+		if(doc.IsParagraph(i))
+			Put(doc.GetParagraph(i));
+		else
+			Put(doc.GetTable(i));
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/DocTypes/DocTypes.h b/uppsrc/DocTypes/DocTypes.h
new file mode 100644
index 000000000..348836735
--- /dev/null
+++ b/uppsrc/DocTypes/DocTypes.h
@@ -0,0 +1,716 @@
+#ifndef DOCTYPES_H
+#define DOCTYPES_H
+
+// THIS PACKAGE IS OBSOLETE
+// DO NOT USE IN NEW CODE!!!
+// USE RICHTEXT INSTEAD
+
+#include <Draw/Draw.h>
+#include <RichText/RichText.h>
+#include <CtrlLib/CtrlLib.h>
+
+NAMESPACE_UPP
+
+enum { DOC_SCREEN_ZOOM = 140 };
+
+class ParaTypo {
+public:
+	struct Part {
+		Font   font;
+		Color  color;
+		int    overhang;
+		int    ascent;
+		int    descent;
+		int    external;
+		void  *voidptr;
+		int    width;
+
+		FontInfo Set(Font font, Color color);
+	};
+
+
+protected:
+	int         total;
+	Alignment   align;
+	int         pgcx;
+	const char *textbeg;
+	int         minascent;
+	int         mindescent;
+	int         minexternal;
+
+	int         len;
+	const char *text;
+	int        *width;
+	Part      **info;
+	int         cx;
+	int         ascent;
+	int         descent;
+	int         external;
+	int         nspc;
+	bool        last;
+
+	void Begin(const char *c, int *w, Part **ii) { text = c; width = w; info = ii; nspc = cx = 0; }
+
+	int Align();
+
+	virtual bool PutAligned(int lm);
+	virtual bool Put();
+	virtual bool PutRaw();
+
+public:
+	void SetMin(int ma, int md, int me)   { minascent = ma; mindescent = md, minexternal = me; }
+	bool Format(Alignment align, int len, char *text, int *width, Part **info, int cx);
+	ParaTypo()                            { minascent = mindescent = minexternal = 0; }
+};
+
+inline int DocZoom(int zoom, int val)     { return (zoom * val) >> 10; }
+inline int DocZoomLn(int zoom, int val)   { return val ? max(DocZoom(zoom, val), 1) : 0; }
+
+struct ValueRect : Moveable<ValueRect> {
+	Value value;
+	Rect  rect;
+};
+
+class Table;
+
+class Paragraph : Moveable<Paragraph>, DeepCopyOption<Paragraph> {
+public:
+	struct Style {
+		Alignment align;
+		int       before, lm, rm, indent, after;
+		int       bulletindent;
+		Color     bulletcolor;
+		Size      bulletsize;
+		PaintRect bullet;
+		void      Init();
+	};
+
+	struct Part : Moveable<Part> {
+		Font      font;
+		int       delta;
+		Color     color;
+		String    text;
+		Size      sz;
+		PaintRect pr;
+		Value     value;
+
+		Part() { delta = 0; }
+	};
+
+	struct PaintInfo {
+		int       yl;
+		int       ypos;
+
+		PaintInfo()            { yl = 0; }
+	};
+
+protected:
+	int          length;
+	Vector<Part> part;
+	Font         parafont;
+	Style        style;
+
+	class        ParaPaint;
+	class        ParaAngle;
+	class        ParaHeight;
+	class        ParaRect;
+
+public:
+	static PaintRect& StdBullet();
+	static PaintRect& WhiteBullet();
+	static PaintRect& BoxBullet();
+	static PaintRect& WhiteBoxBullet();
+
+	Paragraph&  Cat(const String& s, Font font, Color color, const Value& val, int delta = 0);
+	Paragraph&  Cat(const PaintRect& pr, int cx, int cy, const Value& val, Color color = Black);
+
+	Paragraph&  Cat(const String& s, Font font, Color color = Black, int delta = 0);
+	Paragraph&  Cat(const char *s, Font font, Color color = Black, int delta = 0);
+	Paragraph&  Cat(const PaintRect& pr, int cx, int cy = 0, Color color = Black) { return Cat(pr, cx, cy, Null, color); }
+	Paragraph&  Cat(const PaintRect& pr, Size sz, Color color = Black)            { return Cat(pr, sz.cx, sz.cy, color); }
+	Paragraph&  Cat(const PaintRect& pr, Color color = Black)                     { return Cat(pr, pr.GetStdSize(), color); }
+
+	Paragraph&  Cat(const Paragraph& p);
+
+	Paragraph&  Align(Alignment a)   { style.align = a; return *this; }
+	Paragraph&  Left()               { style.align = ALIGN_LEFT; return *this; }
+	Paragraph&  Right()              { style.align = ALIGN_RIGHT; return *this; }
+	Paragraph&  Center()             { style.align = ALIGN_CENTER; return *this; }
+	Paragraph&  Justify()            { style.align = ALIGN_JUSTIFY; return *this; }
+	Paragraph&  Lm(int x)            { style.lm = x; return *this; }
+	Paragraph&  Rm(int x)            { style.rm = x; return *this; }
+	Paragraph&  Indent(int x)        { style.indent = x; return *this; }
+
+	Paragraph&  Bullet(const PaintRect& r = Paragraph::StdBullet(), int indent = 150,
+		               Size size = Size(0, 0), Color color = Black);
+
+	Alignment   GetAlign() const                { return style.align; }
+	int         GetLm() const                   { return style.lm; }
+	int         GetRm() const                   { return style.rm; }
+	int         GetIndent() const               { return style.indent; }
+	int         GetBulletIndent() const         { return style.bulletindent; }
+	PaintRect   GetBullet() const               { return style.bullet; }
+
+	Paragraph&  Before(int x)                   { style.before = x; return *this; }
+	Paragraph&  After(int x)                    { style.after = x; return *this; }
+
+	int         GetBefore() const               { return style.before; }
+	int         GetAfter() const                { return style.after; }
+
+	const Style& GetStyle() const               { return style; }
+	void         SetStyle(const Style& s)       { style = s; }
+	void         CopyStyle(const Paragraph& s)  { SetStyle(s.GetStyle()); }
+
+	int         GetLength() const               { return length; }
+	int         GetCount() const                { return part.GetCount(); }
+	const Part *GetParts() const                { return part.Begin(); }
+
+	bool        Format(ParaTypo& pfmt, int cx, int coef = 1024) const;
+
+	int         GetHeight(int zoom, int cx) const;
+	bool        Paint(int zoom, Draw& w, int x, int y, int cx, int ymax, PaintInfo& pi,
+		              Color paper = SWhite) const;
+	int         Paint(int zoom, Draw& w, int x, int y, int cx, Color paper = SWhite) const;
+	void        Paint(int zoom, int angle, Draw& w, int x, int y, int cx) const;
+
+	int         GetHeight(int cx) const;
+	bool        Paint(Draw& w, int x, int y, int cx, int ymax, PaintInfo& pi,
+		              Color paper = White) const;
+	int         Paint(Draw& w, int x, int y, int cx, Color paper = White) const;
+
+	void        GetValueRects(int zoom, Draw& w, int x, int& y, int cx,
+		                      Vector<ValueRect>& vr) const;
+
+	int         GetWidth(int zoom) const;
+	int         GetWidth() const                { return GetWidth(1024); }
+
+	void        Clear();
+	void        SetParaFont(Font f)             { parafont = f; }
+	Font        GetParaFont() const             { return parafont; }
+
+	Paragraph(const Paragraph& p, int);
+	Paragraph();
+};
+
+class TableCell : Moveable<TableCell>, DeepCopyOption<TableCell> {
+public:
+	struct Style {
+		int       ratio;
+		int       leftwidth, topwidth, rightwidth, bottomwidth;
+		int       leftspace, topspace, rightspace, bottomspace;
+		Color     paper;
+		Alignment align;
+
+		void Init();
+	};
+
+	struct PaintInfo {
+		int       yl;
+
+		PaintInfo()        { yl = 0; }
+	};
+
+protected:
+	Array<Paragraph> par;
+	Style            style;
+	bool             keep;
+	int              span;
+	PaintRect        paintrect;
+
+public:
+	Paragraph&  Par()                            { return par.Top(); }
+	const Paragraph&  Par() const                { return par.Top(); }
+	operator    Paragraph&()                     { return par.Top(); }
+	operator    const Paragraph&() const         { return par.Top(); }
+
+	int               GetCount() const           { return par.GetCount(); }
+	Paragraph&        operator[](int i)          { return par[i]; }
+	const Paragraph&  operator[](int i) const    { return par[i]; }
+
+	TableCell& NewPar();
+
+	TableCell& Cat(const String& s, Font f, Color c = Black) { Par().Cat(s, f, c); return *this; }
+	TableCell& Cat(const char *s, Font f, Color c = Black)   { Par().Cat(s, f, c); return *this; }
+	TableCell& Cat(const PaintRect& pr, int cx, int cy = 0)  { Par().Cat(pr, cx, cy); return *this; }
+	TableCell& Cat(const PaintRect& pr, Size sz)             { Par().Cat(pr, sz); return *this; }
+	TableCell& Cat(const PaintRect& pr)                      { Par().Cat(pr); return *this; }
+
+	TableCell& Align(Alignment a)                     { Par().Align(a); return *this; }
+	TableCell& Left()                                 { Par().Left(); return *this; }
+	TableCell& Right()                                { Par().Right(); return *this; }
+	TableCell& Center()                               { Par().Center(); return *this; }
+	TableCell& Justify()                              { Par().Justify(); return *this; }
+	TableCell& Before(int x)                          { Par().Before(x); return *this; }
+	TableCell& After(int x)                           { Par().After(x); return *this; }
+	TableCell& Lm(int x)                              { Par().Lm(x); return *this; }
+	TableCell& Rm(int x)                              { Par().Rm(x); return *this; }
+	TableCell& Indent(int x)                          { Par().Indent(x); return *this; }
+
+	TableCell& Paper(Color color)                     { style.paper = color; return *this; }
+
+	TableCell& VertAlign(Alignment a)   { style.align = a; return *this; }
+	TableCell& Top()                    { style.align = ALIGN_TOP; return *this; }
+	TableCell& VertCenter()             { style.align = ALIGN_CENTER; return *this; }
+	TableCell& Bottom()                 { style.align = ALIGN_BOTTOM; return *this; }
+
+	TableCell& Ratio(int w)             { style.ratio = w; return *this; }
+
+	TableCell& Keep(bool b = true)      { keep = b; return *this; }
+	TableCell& NoKeep()                 { return Keep(false); }
+
+	TableCell& Span(int n)              { span = n; return *this; }
+
+	TableCell& LeftWidth(int x)   { style.leftwidth = x; return *this; }
+	TableCell& TopWidth(int x)    { style.topwidth = x; return *this; }
+	TableCell& RightWidth(int x)  { style.rightwidth = x; return *this; }
+	TableCell& BottomWidth(int x) { style.bottomwidth = x; return *this; }
+	TableCell& FrameWidth(int x)  { return LeftWidth(x).TopWidth(x).RightWidth(x).BottomWidth(x); }
+
+	TableCell& LeftSpace(int x)   { style.leftspace = x; return *this; }
+	TableCell& TopSpace(int x)    { style.topspace = x; return *this; }
+	TableCell& RightSpace(int x)  { style.rightspace = x; return *this; }
+	TableCell& BottomSpace(int x) { style.bottomspace = x; return *this; }
+	TableCell& FrameSpace(int x)  { return LeftSpace(x).TopSpace(x).RightSpace(x).BottomSpace(x); }
+
+	Alignment  GetVertAlign()           { return style.align; }
+
+	int   GetRatio() const              { return style.ratio; }
+
+	dword GetPaper() const              { return style.paper; }
+
+	int   GetLeftWidth(int x) const     { return style.leftwidth; }
+	int   GetTopWidth(int x) const      { return style.topwidth; }
+	int   GetRightWidth(int x) const    { return style.rightwidth; }
+	int   GetBottomWidth(int x) const   { return style.bottomwidth; }
+
+	int   GetLeftSpace(int x) const     { return style.leftspace; }
+	int   GetTopSpace(int x) const      { return style.topspace; }
+	int   GetRightSpace(int x) const    { return style.rightspace; }
+	int   GetBottomSpace(int x) const   { return style.bottomspace; }
+
+	bool  IsKeep() const                { return keep; }
+
+	int   GetSpan() const               { return span; }
+
+	const Paragraph::Style& GetParStyle() const { return Par().GetStyle(); }
+	void  SetStyle(const Paragraph::Style& s)   { Par().SetStyle(s); }
+	void  CopyStyle(const Paragraph& s)         { Par().CopyStyle(s); }
+
+	const Style& GetStyle() const             { return style; }
+	void  SetStyle(const Style& s)            { style = s; }
+	void  CopyStyle(const TableCell& s)       { SetStyle(s.GetStyle()); }
+	void  ClearStyle()                        { style.Init(); }
+
+	int   GetHeight(int zoom, int cx) const;
+	bool  Paint(int zoom, Draw& w, int x, int y, int cx, int cy, int pcy, Color color,
+		        PaintInfo& pi) const;
+	void  GetValueRects(int zoom, Draw& w, int x, int y, int cx, int cy, int pcy,
+		                Vector<ValueRect>& vr) const;
+	int   GetWidth(int zoom) const;
+
+	void  Qtf(const char *s);
+	void  SetPaintRect(const PaintRect& c)   { paintrect = c; }
+
+	TableCell& operator=(const char *s)      { Qtf(s); return *this; }
+	TableCell& operator=(const PaintRect& c) { paintrect = c; return *this; }
+
+	void  Clear()                            { par.Clear(); par.Add(); keep = false;
+	                                           span = 1; style.Init(); }
+	TableCell(const TableCell& c, int);
+	TableCell();
+};
+
+int GetTotalRatio(const Array<TableCell>& row);
+int GetColumnWidth(const Array<TableCell>& row, int j, int cx, int tratio);
+
+class Table : Moveable<Table>, DeepCopyOption<Table> {
+public:
+	struct Style {
+		int   before;
+		int   after;
+		int   lm;
+		int   rm;
+		int   framewidth;
+		Color framecolor;
+		int   headerrows;
+		int   breakcy;
+		int   breakpgcy;
+
+		void Init();
+	};
+
+	struct PaintInfo {
+		int         line;
+		int         oline;
+		int         ypos;
+		Vector<int> yl;
+
+		PaintInfo()      { line = 0; oline = -1; }
+	};
+
+protected:
+	Vector< Array<TableCell> > cell;
+	Style style;
+
+	struct Cell : Moveable<Cell> {
+		Size         size;
+		int          span;
+		int          spanh;
+		bool         paint;
+	};
+
+	struct Line : Moveable<Line> {
+		int          height;
+		bool         keep;
+		int          span;
+		Vector<Cell> cell;
+	};
+
+	Line GetLine(int zoom, int i, int tcx, const Vector<int> *yl) const;
+	int  Span(Vector<Line>& line) const;
+	void FrameTab(int zoom, Draw& w, bool was, int x, int y, int yp, int cx) const;
+	void DrawLine(int zoom, Draw& w, int x, int y, int i, const Line& ln, int ymax,
+				  Vector<int> *yl) const;
+	void PaintLines(int zoom, Draw& w, int x, int& y, int i, const Vector<Line>& line,
+		            Vector<int> *yl) const;
+	bool KeepLine(int i) const;
+
+	void RectLine(int zoom, Draw& w, int x, int y, int i, const Line& ln,
+				  Vector<ValueRect>& vr) const;
+	void RectLines(int zoom, Draw& w, int x, int y, int i, const Vector<Line>& line,
+				   Vector<ValueRect>& vr) const;
+
+public:
+	operator const Vector< Array<TableCell> >& () const { return cell; }
+	TableCell& operator()(int i, int j);
+	const Array<TableCell>& operator[](int i) const  { return cell[i]; }
+	const Array<TableCell>& LastRow() const { return cell.Top(); }
+
+	Table&     AddRow();
+	TableCell& AddCell(bool inheritstyle = true);
+	TableCell& LastCell()                    { return cell.Top().Top(); }
+	const TableCell& LastCell() const        { return cell.Top().Top(); }
+
+	Table& Before(int x)                     { style.before = x; return *this; }
+	Table& After(int x)                      { style.after = x; return *this; }
+	Table& Lm(int x)                         { style.lm = x; return *this; }
+	Table& Rm(int x)                         { style.rm = x; return *this; }
+	Table& FrameWidth(int x)                 { style.framewidth = x; return *this; }
+	Table& FrameColor(Color color)           { style.framecolor = color; return *this; }
+	Table& HeaderRows(int n)                 { style.headerrows = n; return *this; }
+	Table& NoHeaderRows()                    { return HeaderRows(0); }
+	Table& Breaks(int bcy, int bpcy)         { style.breakcy = bcy; style.breakpgcy = bpcy;
+	                                           return *this; }
+
+	int    GetBefore() const                 { return style.before; }
+	int    GetAfter() const                  { return style.after; }
+	int    GetLm() const                     { return style.lm; }
+	int    GetRm() const                     { return style.rm; }
+	int    GetFrameWidth() const             { return style.framewidth; }
+	Color  GetFrameColor() const             { return style.framecolor; }
+	int    GetHeaderRows() const             { return style.headerrows; }
+	int    GetBreaksCy() const               { return style.breakcy; }
+	int    GetBreaksPgCy() const             { return style.breakpgcy; }
+
+	const Style& GetStyle() const            { return style; }
+	void         SetStyle(const Style& s)    { style = s; }
+	void         CopyStyle(const Table& s)   { SetStyle(s.GetStyle()); }
+
+	int         GetRows() const              { return cell.GetCount(); }
+
+	int         GetHeight(int zoom, int cx) const;
+	bool        Paint(int zoom, Draw& w, int x, int y, int cx,
+		              int ymax, PaintInfo& pi) const;
+	int         Paint(int zoom, Draw& w, int x, int y, int cx) const;
+	void        GetValueRects(int zoom, Draw& w, int x, int& y, int cx,
+		                      Vector<ValueRect>& vr) const;
+
+	int         GetHeight(int cx) const;
+	bool        Paint(Draw& w, int x, int y, int cx,
+		              int ymax, PaintInfo& pi) const;
+	int         Paint(Draw& w, int x, int y, int cx) const;
+
+	int         GetWidth(int zoom) const;
+	int         GetWidth() const             { return GetWidth(1024); }
+
+	void        Clear()                      { cell.Clear(); style.Init(); }
+
+	Table(const Table& tab, int);
+	Table();
+};
+
+class Document : Moveable<Document>, DeepCopyOption<Document> {
+public:
+	class Cache {
+		int zoom;
+		int cx;
+		Vector<int> cy;
+
+		friend class Document;
+
+	public:
+		void     Clear()           { cy.Clear(); cx = Null; }
+		void     SetModify(int i)  { if(i < cy.GetCount()) cy[i] = Null; }
+		Cache()                    { cx = Null; }
+	};
+
+protected:
+	enum Type { PARAGRAPH, TABLE };
+	struct Item : Moveable<Item>, DeepCopyOption<Item> {
+		Type  type;
+		Table data;
+
+		Item() {}
+		Item(const Item& s, int) : data(s.data, 1), type(s.type) {}
+	};
+
+	Vector<Item>     item;
+
+	int               GetHeight(int zoom, int i, int cx, Cache& cache) const;
+	void              Qtf0(const char *s, bool append, byte charset);
+
+public:
+	Table&            AddTable();
+	Paragraph&        AddParagraph();
+	void              Cat(const Paragraph& p);
+
+	void              Clear()                     { item.Clear(); }
+
+	int               GetCount() const            { return item.GetCount(); }
+
+	bool              IsParagraph(int i) const    { return item[i].type == PARAGRAPH; }
+	const Paragraph&  GetParagraph(int i) const   { return item[i].data.LastCell().Par(); }
+
+	bool              IsTable(int i) const        { return item[i].type == TABLE; }
+	const Table&      GetTable(int i) const       { return item[i].data; }
+
+	int               GetHeight(int zoom, int cx) const;
+	int               Paint(int zoom, Draw& w, int x, int y, int cx, Color paper = SWhite) const;
+	Vector<ValueRect> GetValueRects(int zoom, Draw& w, int x, int y, int cx) const;
+	int               GetWidth(int zoom) const;
+
+	int               GetHeight(int cx) const           { return GetHeight(1024, cx); }
+	int               Paint(Draw& w, int x, int y, int cx, Color paper = White) const {
+		                return Paint(1024, w, x, y, cx, paper); }
+	int               GetWidth() const                    { return GetWidth(1024); }
+
+	int               GetHeight(int zoom, int cx, Cache& cache) const;
+	void              Paint(int zoom, Draw& w, int x, int y, int cx, int cy, int y0,
+		                    Cache& cache, Color paper = SWhite) const;
+
+	void              Qtf(const char *s, byte charset = 0)       { Qtf0(s, false, charset); }
+	void              AppendQtf(const char *s, byte charset = 0) { Qtf0(s, true, charset); }
+	Document&         operator=(const char *s);
+	Document&         operator|=(const char *s);
+
+	Document(const Document&, int);
+	Document();
+	Document(const char *qtf);
+};
+
+/* Qtf format
+	[commands affected-text]     (one space ' ' exactly beetween command string and text)
+
+commands
+	/            Italic
+	*            Bold
+	_            Underline
+	-            Overstrike
+	`            Superscript
+	,            Subscript
+	0123456789   font 0:6pt, 1:8pt, 2:10pt, 3:12pt, 4:16pt, 5:20pt, 6:24pt, 7:28pt, 8:36pt, 9:48pt
+	+nnn         Font nnn dots
+	G            Gui font
+	A            Arial
+	R            Roman
+	C            Courier
+	S            Symbol
+	W            WingDings
+	.n           Font face with index n
+	!fontface!   Font face fontface
+
+	<            Left
+	>            Right
+	=            Center
+	#            Justify
+
+	lnnn         Left Margin (nnn is a number of dots)
+	rnnn         Right Margin
+	innn         Indent
+	bnnn         Before
+	annn         After
+
+	o            Bullet
+	Oi/nnn       Bullet, i 0 Std, 1 White, 2 Box, 3 WhiteBox, nnn indent
+
+	^sss^        Value link sss
+
+	;            Nop (number delimiter)
+
+	@0 - 9       Standard colors (0-Black, 1-LtGray, 2-White, 3-Red, 4-Green, 5-Blue, 6-LtRed,
+	                              7-WhiteGray, 8-LtCyan, 9-Yellow)
+	@(r.g.b)     RGB colors
+
+other
+	[Pn:n file]  Insert WMF picture
+	[In:n name]  Insert ItemImage, round scale and center
+	[Jn:n name]  Insert ItemImage, full scale
+
+	`x or \x     Just x, if x is not special (x is any char)
+
+	\n or &      End Of Paragraph
+
+	_            Hard Space
+
+    \1text\1     DeQtf (raw text)
+
+* Qtf Tables
+
+State state
+	++                 Table begin / end
+	\t or ||           End Of Cell
+	\v or --           End Of Table Row
+    \f or ^^           Page (->end of paragraph, end of table)
+	::                 Table Command (use space as delimiter)
+
+commands
+	nnn                Cell ratio (verticaly inherited for the same table)
+	!                  Clear cell style
+	^                  Align top
+	v                  Align bottom
+	=                  Align center
+	lnnn/nnn           Left ruler width / space (both optional)
+	rnnn/nnn           Right ruler width / space (both optional)
+	bnnn/nnn           Bottom ruler width / space (both optional)
+	tnnn/nnn           Top ruler width / space (both optional)
+	annn/nnn           All rulers width / space (both optional)
+	@0 - 9, @(r.g.b)   Paper color
+	snnn               Table before
+	<nnn               Table lm
+	>nnn               Table rm
+	fnnn               Table framewidth
+	hnnn               Table header rows
+	_0 - 9, _(r.g.b)   Table framecolor
+	~                  No frames (eq to a0f0)
+	/                  Keep with previous row
+	+nnn               Vertical span
+*/
+
+class QtfParser {
+public:
+	enum Code { END, PARAGRAPH, TABLE, PAGE };
+	enum Type { NORMAL, SUPERSCRIPT, SUBSCRIPT };
+
+protected:
+	const char   *term;
+	struct State : public Paragraph::Style, Moveable<State> {
+		Font    font;
+		int     type;
+		Color   color;
+		String  value;
+
+		State() { type = 0; }
+	};
+	State         state;
+	Array<State>  stack;
+	Paragraph     paragraph;
+	Table         table;
+	Code          ender;
+	bool          inraw;
+	byte          charset;
+
+	void       Init();
+	int        GetNumber();
+	Color      GetColor();
+	String     GetString();
+	void       Picture(int type);
+	void       Flush(String& text);
+	void       Celln(int& a, int& b);
+	bool       IsTable()              { return table.GetRows(); }
+	Paragraph& Par();
+	TableCell& Cell()                 { return table.LastCell(); }
+	bool       Term(char c1, char c2) { return term[0] == c1 && term[1] == c2; }
+	bool       Term2(char c)          { return term[0] == c && term[1] == c; }
+	bool       Key(char c)            { if(*term == c) { term++; return true; } return false; }
+	bool       Key(char c1, char c2)  { if(Term(c1, c2)) { term += 2; return true; } return false; }
+	bool       Key2(char c)           { return Key(c, c); }
+	Code       Error(const char *s);
+
+public:
+	void SetStyle(const Paragraph::Style& s)          { (Paragraph::Style&)state = s; }
+
+	void Set(const char *s, byte charset = 0)         { term = s; inraw = false; ender = END; }
+	Code Parse();
+
+	const Paragraph& GetParagraph()                   { return paragraph; }
+	const Table&     GetTable()                       { return table; }
+
+	Paragraph        PickParagraph()                  { return paragraph; }
+	Table            PickTable()                      { return table; }
+
+	void operator=(const char *s)                     { Set(s); }
+
+	QtfParser()                                       { Init(); }
+	QtfParser(const char *text, byte charset = 0)     { Init(); Set(text); }
+};
+
+String AsQtf(const Document& text);
+
+class DocOut {
+public:
+	virtual void Put(const Paragraph& paragraph) = 0;
+	virtual void Put(const Table& table) = 0;
+	virtual void Page() = 0;
+
+	void    Put(const Document& doc);
+	void    Qtf(const char *s);
+
+	DocOut& operator<<(const Paragraph& paragraph)    { Put(paragraph); return *this; }
+	DocOut& operator<<(const Table& table)            { Put(table); return *this; }
+	DocOut& operator<<(const Document& doc)           { Put(doc); return *this; }
+	DocOut& operator<<(const char *qtf)               { Qtf(qtf); return *this; }
+};
+
+class RtfDocOut : public DocOut {
+public:
+	virtual void Put(const Paragraph& paragraph);
+	virtual void Put(const Table& table);
+	virtual void Page();
+
+protected:
+	Index<dword> color;
+	String rtf;
+	int    pgcx;
+	bool   page;
+	double imagescale;
+
+	struct VSpan;
+
+	static inline int Dow(int q)          { return q * 12 / 5; }
+
+	void PutColor(const char *cmd, dword color);
+	void PutPicture(const Drawing& iw, Size sz);
+	void Border(const char *cmd, int width, dword color);
+	void PutPara(const Paragraph& p, bool par = true, bool table = false,
+		         int ls = 0, int rs = 0, int ts = 0, int bs = 0);
+
+public:
+	String Get();
+
+	void   SetPageWidth(int cx)           { pgcx = cx; }
+	void   ImageScale(double d)           { imagescale = d; }
+
+	void   Clear();
+
+	RtfDocOut();
+#ifdef flagSO
+	virtual ~RtfDocOut();
+#endif
+};
+
+END_UPP_NAMESPACE
+
+#include "Report.h"
+#include "QtfCtrl.h"
+
+#endif
diff --git a/uppsrc/DocTypes/DocTypes.upp b/uppsrc/DocTypes/DocTypes.upp
new file mode 100644
index 000000000..dbcdab375
--- /dev/null
+++ b/uppsrc/DocTypes/DocTypes.upp
@@ -0,0 +1,25 @@
+uses
+	Draw,
+	RichText,
+	CtrlLib,
+	PdfDraw;
+
+file
+	DocTypes.h,
+	ParaFormat.cpp,
+	DocTypes.cpp,
+	DocTable.cpp,
+	QtfParser.cpp,
+	QtfEncoder.cpp,
+	RtfDocOut.cpp,
+	Report.h,
+	Report.cpp,
+	ShowReport.cpp,
+	QtfCtrl.h,
+	QtfCtrl.cpp,
+	Report.lay,
+	DocTypes.usc,
+	Info readonly separator,
+	COPYING,
+	COPYING-PLAIN,
+	AUTHORS;
diff --git a/uppsrc/DocTypes/DocTypes.usc b/uppsrc/DocTypes/DocTypes.usc
new file mode 100644
index 000000000..94209388d
--- /dev/null
+++ b/uppsrc/DocTypes/DocTypes.usc
@@ -0,0 +1,22 @@
+ctrl QtfCtrl {
+	group "Static";
+
+	GetMinSize() { return Size(0, 0); }
+	GetStdSize() { return Size(64, 24); }
+
+	Doc    SetLabel @1 ? "Label of control" ;
+	bool   VCenter = false ? "Vertical center";
+	Color  Background = :SWhite ? "Background color";
+	int    Zoom = 140;
+	Frame  SetFrame @1;
+	Qtf    SetInfo @1 ? "Info of control" ;
+
+	Paint(w) {
+		sz = GetSize();
+		w.DrawRect(0, 0, sz.cx, sz.cy, .Background);
+		y = 0;
+		if(.VCenter)
+			y = (sz.cy - GetQtfHeight(.Zoom, .SetLabel, sz.cx)) / 2;
+		w.DrawQtf(.Zoom, 0, y, .SetLabel, sz.cx, .Background);
+	}
+}
diff --git a/uppsrc/DocTypes/ParaFormat.cpp b/uppsrc/DocTypes/ParaFormat.cpp
new file mode 100644
index 000000000..99aa67ecf
--- /dev/null
+++ b/uppsrc/DocTypes/ParaFormat.cpp
@@ -0,0 +1,130 @@
+#include "DocTypes.h"
+
+NAMESPACE_UPP
+
+FontInfo ParaTypo::Part::Set(Font _font, Color _color) {
+	font = _font;
+	color = _color;
+	FontInfo pf = font.Info();
+	external = pf.GetExternal();
+	overhang = pf.GetOverhang();
+	ascent = pf.GetAscent();
+	descent = pf.GetDescent();
+	voidptr = NULL;
+	return pf;
+}
+
+int  ParaTypo::Align() {
+	switch(align) {
+	case ALIGN_RIGHT:
+		return pgcx - cx;
+	case ALIGN_CENTER:
+		return (pgcx - cx) / 2;
+	case ALIGN_JUSTIFY:
+		if(last) break;
+		int nsp = nspc;
+		const char *clim = text + len;
+		const char *s;
+		for(s = text; *s == ' ' && s != clim; s++)
+			nsp--;
+		if(nsp == 0) break;
+		int q = ((pgcx - cx) << 12) / nsp;
+		int *w = s - text + width;
+		Part **i = s - text + info;
+		int prec = 0;
+		while(s < clim) {
+			if(*s == ' ') {
+				*w += (prec + q) >> 12;
+				prec = (prec + q) & 4095;
+				*i = NULL;
+			}
+			w++;
+			s++;
+			i++;
+		}
+	}
+	return 0;
+}
+
+bool ParaTypo::PutAligned(int lm) {
+	return false;
+}
+
+bool ParaTypo::Put() {
+	return PutAligned(Align());
+}
+
+bool ParaTypo::PutRaw() {
+	ASSERT(len >= 0);
+	ASSERT(nspc <= len);
+	ascent = minascent;
+	descent = mindescent;
+	external = minexternal;
+	if(len) {
+		Part *last = *(info + len - 1);
+		for(Part *p = *info; p <= last; p++) {
+			if(p->ascent > ascent)
+				ascent = p->ascent;
+			if(p->descent > descent)
+				descent = p->descent;
+			if(p->external > external)
+				external = p->external;
+		}
+	}
+	return Put();
+}
+
+bool ParaTypo::Format(Alignment _align, int _total, char *_text, int *_width,
+                      ParaTypo::Part **_info, int _pgcx) {
+	align = _align;
+	total = _total;
+	pgcx = _pgcx;
+	textbeg = _text;
+	char *s = _text;
+	int *w = _width;
+	Part **i = _info;
+	const char *space = NULL;
+	const char *slim = _text + total;
+	Begin(_text, _width, _info);
+	int px = 0;
+	last = false;
+	while(s < slim) {
+		cx += *w;
+		if(*s == ' ') {
+			space = s;
+			nspc++;
+		}
+		if(*s == 31)
+			*s = ' ';
+		if(cx > pgcx && text < s) {
+			int q;
+			if(space && text < space) {
+				len = space - text;
+				q = space - _text;
+				cx -= _width[q];
+				nspc--;
+				q++;
+			}
+			else {
+				len = s - text;
+				q = s - _text;
+			}
+			int dw = 0;
+			for(int *ww = _width + q; ww <= w; ww++)
+				dw += *ww;
+			cx -= dw;
+			if(PutRaw()) return true;
+			Begin(_text + q, _width + q, _info + q);
+			cx = dw;
+			space = NULL;
+		}
+		w++;
+		s++;
+		i++;
+	}
+	len = s - text;
+	last = true;
+	return PutRaw();
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/DocTypes/QtfCtrl.cpp b/uppsrc/DocTypes/QtfCtrl.cpp
new file mode 100644
index 000000000..6a06d4366
--- /dev/null
+++ b/uppsrc/DocTypes/QtfCtrl.cpp
@@ -0,0 +1,122 @@
+#include "DocTypes.h"
+
+NAMESPACE_UPP
+
+void QtfCtrl::MouseWheel(Point p, int zdelta, dword keyflags) {
+	sb.Wheel(zdelta);
+}
+
+QtfCtrl::QtfCtrl() {
+	zoom = VertLayoutZoom(140);
+	sb.SetLine(8).Hide();
+	sb.WhenScroll = callback(this, &QtfCtrl::Scroll);
+	NoWantFocus();
+	tm = bm = lm = rm = 0;
+	vcenter = false;
+	color = SLtGray;
+	Background(Null);
+	AddFrame(sb);
+}
+
+QtfCtrl::~QtfCtrl() {}
+
+QtfCtrl& QtfCtrl::SetLabel(const char *text) {
+	Set(text);
+	return *this;
+}
+
+bool QtfCtrl::Key(dword key, int count) {
+	return sb.VertKey(key);
+}
+
+int QtfCtrl::GetHeight(int cx) const {
+	cx -= lm + rm;
+	if(cx <= 0) return 0;
+	return doc.GetHeight(zoom, cx, cache);
+}
+
+Draw& ScreenInfo();
+
+void QtfCtrl::Layout() {
+	Size sz = sb.GetViewSize();
+	if(GetHeight(sz.cx) > sz.cy - tm - bm) {
+		sb.Show();
+		sb.Set(sb, GetSize().cy - tm - bm, GetHeight(sb.GetReducedViewSize().cx));
+	}
+	else
+		sb.Hide();
+//	if(WhenLink) //!! fails when text is set prior to WhenLink
+	{
+		int cx = GetSize().cx - lm - rm;
+		if(cx <= 0) return;
+		valuerect = doc.GetValueRects(zoom, ScreenInfo(), 0, 0, cx);
+	}
+}
+
+Value QtfCtrl::FindValue(Point p) const {
+	p.y += sb - tm;
+	p.x -= lm;
+	for(int i = 0; i < valuerect.GetCount(); i++) {
+		const ValueRect& r = valuerect[i];
+		if(r.rect.Contains(p))
+			return r.value;
+	}
+	return Null;
+}
+
+Image QtfCtrl::CursorImage(Point p, dword) {
+	if(!WhenLink) return Image::Arrow();
+	Value v = FindValue(p);
+	return IsNull(v) ? Image::Arrow() : CtrlImg::HandCursor();
+}
+
+void  QtfCtrl::LeftUp(Point p, dword keyflags) {
+	SetWantFocus();
+	if(!WhenLink) return;
+	Value v = FindValue(p);
+	if(IsNull(v)) return;
+	WhenLink(v);
+}
+
+void QtfCtrl::Paint(Draw& w) {
+	Size sz = GetSize();
+	w.DrawRect(0, 0, sz.cx, sz.cy, color);
+	int hg = GetHeight(sz.cx);
+	sz.cx -= lm + rm;
+	sz.cy -= tm + bm;
+	w.Clipoff(lm, tm, sz.cx, sz.cy);
+	int dcy = vcenter && hg <= sz.cy - tm - bm ? (sz.cy - hg) : 0;
+	doc.Paint(zoom, w, 0, dcy / 2, sz.cx, sz.cy - dcy, sb, cache, color);
+	w.End();
+}
+
+void QtfCtrl::Scroll() {
+	Refresh();
+}
+
+void QtfCtrl::Set(const char *s) {
+	cache.Clear();
+	doc.Clear();
+	doc.Qtf(s, GetDefaultCharset());
+	sb = 0;
+	Layout();
+	Refresh();
+}
+
+void QtfCtrl::Set(const Document& _doc) {
+	cache.Clear();
+	doc <<= _doc;
+	sb = 0;
+	Layout();
+	Refresh();
+}
+
+void QtfCtrl::Pick(pick_ Document& _doc) {
+	cache.Clear();
+	doc = _doc;
+	sb = 0;
+	Layout();
+	Refresh();
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/DocTypes/QtfCtrl.h b/uppsrc/DocTypes/QtfCtrl.h
new file mode 100644
index 000000000..7166ea633
--- /dev/null
+++ b/uppsrc/DocTypes/QtfCtrl.h
@@ -0,0 +1,74 @@
+// OBSOLETE!!! Use RichTextView instead!
+
+NAMESPACE_UPP
+
+class QtfCtrl : public Ctrl {
+public:
+	virtual void  Paint(Draw& w);
+	virtual void  Layout();
+	virtual bool  Key(dword key, int);
+	virtual Image CursorImage(Point p, dword keyflags);
+	virtual void  LeftUp(Point p, dword keyflags);
+	virtual void  MouseWheel(Point p, int zdelta, dword keyflags);
+
+protected:
+	Document          doc;
+	mutable Document::Cache cache;
+	Color             color;
+	int               tm, lm, rm, bm;
+	int               zoom;
+	ScrollBar         sb;
+	bool              vcenter;
+	Vector<ValueRect> valuerect;
+
+	int      GetHeight() const                    { return GetHeight(GetSize().cx); }
+	void     Scroll();
+	Value    FindValue(Point p) const;
+
+public:
+	Callback1<const Value&> WhenLink;
+
+	QtfCtrl&  SetLabel(const char *text);
+
+	void     Set(const char *qtf);
+	void     Set(const Document& _doc);
+	void     Pick(pick_ Document& _doc);
+
+	int      GetHeight(int cx) const;
+	int      GetWidth() const                      { return doc.GetWidth(zoom); }
+
+	const Vector<ValueRect>& GetValueRects() const { return valuerect; }
+	int      GetSb() const                         { return sb; }
+	void     SetSb(int i)                          { sb = i; }
+
+	const Document& GetDocument() const            { return doc; }
+
+	QtfCtrl& Background(Color _color)  { Transparent(IsNull(color = _color)); Refresh(); return *this; }
+//	QtfCtrl& Zoom(int _zoom)           { zoom = _zoom; RefreshLayout(); Refresh(); return *this; }
+	QtfCtrl& VCenter(bool b = true)    { vcenter = b; return *this; }
+	QtfCtrl& NoVCenter()               { return VCenter(false); }
+	QtfCtrl& Lm(int _lm)               { lm = _lm; Refresh(); return *this; }
+	QtfCtrl& Rm(int _rm)               { rm = _rm; Refresh(); return *this; }
+	QtfCtrl& Tm(int _tm)               { tm = _tm; Refresh(); return *this; }
+	QtfCtrl& Bm(int _bm)               { bm = _bm; Refresh(); return *this; }
+	QtfCtrl& HMargins(int a)           { lm = rm = a; Refresh(); return *this; }
+	QtfCtrl& VMargins(int a)           { tm = bm = a; Refresh(); return *this; }
+	QtfCtrl& Margins(int a)            { lm = rm = tm = bm = a; Refresh(); return *this; }
+//	QtfCtrl& WithSb()                  { AddFrame(sb); return *this; }
+
+	int      GetLm() const             { return lm; }
+	int      GetTm() const             { return tm; }
+	int      GetRm() const             { return rm; }
+	int      GetBm() const             { return bm; }
+
+	void     operator=(const char *s)          { Set(s); }
+	void     operator=(Document& _doc)         { Pick(_doc); }
+	void     operator<<=(const Document& _doc) { Set(_doc); }
+
+	void     Clear()                           { Set(""); }
+
+	QtfCtrl();
+	virtual ~QtfCtrl();
+};
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/DocTypes/QtfEncoder.cpp b/uppsrc/DocTypes/QtfEncoder.cpp
new file mode 100644
index 000000000..6d49e4803
--- /dev/null
+++ b/uppsrc/DocTypes/QtfEncoder.cpp
@@ -0,0 +1,263 @@
+#include "DocTypes.h"
+
+NAMESPACE_UPP
+
+static Color DocQTFColor[] = {
+	Black, LtGray, White, Red, Green, Blue, LtRed, WhiteGray, LtCyan, Yellow
+};
+
+static int DocQTFFontHeight[] = {
+	50, 67, 84, 100, 134, 167, 200, 234, 300, 400
+};
+
+static void SeparateNumber(String& s)
+{
+	if(*s.Last() >= '0' && *s.Last() <= '9')
+		s.Cat(';');
+}
+
+//////////////////////////////////////////////////////////////////////
+
+struct RichObjectTypeDrawingData
+{
+	void    Serialize(Stream& stream);
+
+	Drawing drawing;
+	Size    dot_size;
+	String  comment;
+};
+
+void RichObjectTypeDrawingData::Serialize(Stream& stream)
+{
+	int version = 1;
+	stream % version % dot_size % comment % drawing;
+}
+
+static String RichObjectTypeDrawingTypeName()
+{
+	return "Drawing";
+
+}
+
+static String FmtColor(Color c)
+{
+	if(IsNull(c)) return "N";
+	for(int i = 0; i < 10; i++)
+		if(DocQTFColor[i] == c)
+			return String(i + '0', 1);
+	return NFormat("(%d.%d.%d)", c.GetR(), c.GetG(), c.GetB());
+}
+
+String CharFmt(const Paragraph::Part& a, const Paragraph::Part& b)
+{
+	String fmt;
+	if(a.font.IsBold() != b.font.IsBold()) fmt.Cat('*');
+	if(a.font.IsItalic() != b.font.IsItalic()) fmt.Cat('/');
+	if(a.font.IsUnderline() != b.font.IsUnderline()) fmt.Cat('_');
+	if(a.font.IsStrikeout() != b.font.IsStrikeout()) fmt.Cat('-');
+//	if(a.capitals != b.capitals) fmt.Cat('c');
+	if(a.delta != b.delta)
+		fmt.Cat(b.delta == 0 ? a.delta < 0 ? '`' : ',' :
+		        b.delta < 0 ? '`' : ',');
+	if(a.font.GetFace() != b.font.GetFace())
+		switch(b.font.GetFace()) {
+		case Font::ARIAL:     fmt.Cat('A'); break;
+		case Font::ROMAN:     fmt.Cat('R'); break;
+		case Font::COURIER:   fmt.Cat('C'); break;
+		case Font::STDFONT:   fmt.Cat('G'); break;
+		case Font::SYMBOL:    fmt.Cat('S'); break;
+		default:
+			fmt << "!" << a.font.GetFaceName() << "!";
+		}
+	if(a.value != b.value)
+		fmt << '^' << DeQtf(StdFormat(b.value)) << '^';
+	if(a.color != b.color)
+		fmt << "@" << FmtColor(b.color);
+	if(a.font.GetHeight() != b.font.GetHeight()) {
+		for(int i = 0; i < 10; i++)
+			if(b.font.GetHeight() == DocQTFFontHeight[i]) {
+				SeparateNumber(fmt);
+				fmt.Cat('0' + i);
+				return fmt;
+			}
+		fmt.Cat(NFormat("+%d", tabs(b.font.GetHeight())));
+	}
+	return fmt;
+}
+
+static String sFmtNumber(char c, int former, int current)
+{
+	return former != current ? NFormat("%c%d", c, current) : String();
+}
+
+String QTFEncodeParaFormat(const Paragraph::Style& format, const Paragraph::Part& charformat,
+                           const Paragraph::Style& style, const Paragraph::Part& charstyle,
+                           bool savecharformat)
+{
+	String qtf;
+	if(format.align != style.align)
+		switch(format.align) {
+		case ALIGN_LEFT:    qtf << '<'; break;
+		case ALIGN_RIGHT:   qtf << '>'; break;
+		case ALIGN_CENTER:  qtf << '='; break;
+		case ALIGN_JUSTIFY: qtf << '#'; break;
+		}
+	qtf << sFmtNumber('l', style.lm, format.lm)
+	    << sFmtNumber('r', style.rm, format.rm)
+	    << sFmtNumber('i', style.indent, format.indent)
+	    << sFmtNumber('b', style.before, format.before)
+	    << sFmtNumber('a', style.after, format.after);
+	if(style.bullet != format.bullet) {
+		qtf << 'O';
+		qtf << (format.bullet ? "0" : "_");
+	}
+	if(savecharformat)
+		qtf << CharFmt(charstyle, charformat);
+	qtf << " ";
+	return qtf;
+}
+
+String QTFEncodePara(const Paragraph& p,
+                     const Paragraph::Style& style, const Paragraph::Part& charstyle)
+{
+	Paragraph::Part paraformat;
+	paraformat.font = p.GetParaFont();
+	String qtf = QTFEncodeParaFormat(p.GetStyle(), paraformat, style, charstyle,
+		                             p.GetCount() == 0);
+	int d = qtf.GetLength();
+	for(int i = 0; i < p.GetCount(); i++) {
+		const Paragraph::Part& part = p.GetParts()[i];
+		if(part.pr) {
+//			const RichObject& object = part.object;
+			Size sz = part.sz;
+			qtf << "\r\n";
+			qtf << "@@" << RichObjectTypeDrawingTypeName() << ':' << sz.cx
+			    << '*' << sz.cy << "\r\n";
+			DrawingDraw ddraw(sz);
+			part.pr.Paint(ddraw, sz, Black, White, 0);
+			RichObjectTypeDrawingData dwg;
+			dwg.drawing = ddraw;
+			dwg.dot_size = sz;
+			StringStream datastrm;
+			datastrm % dwg;
+			String data = datastrm;
+			const char *q = data.Begin();
+			const char *slim = data.End();
+			int n = 0;
+			qtf.Reserve(qtf.GetLength() + 8 * data.GetLength() / 7);
+			while(q < slim - 7) {
+				byte seven = 0;
+				byte data[8];
+				data[0] = ((q[0] & 0x80) >> 7) |
+				          ((q[1] & 0x80) >> 6) |
+				          ((q[2] & 0x80) >> 5) |
+				          ((q[3] & 0x80) >> 4) |
+				          ((q[4] & 0x80) >> 3) |
+				          ((q[5] & 0x80) >> 2) |
+				          ((q[6] & 0x80) >> 1) |
+				          0x80;
+				data[1] = q[0] | 0x80;
+				data[2] = q[1] | 0x80;
+				data[3] = q[2] | 0x80;
+				data[4] = q[3] | 0x80;
+				data[5] = q[4] | 0x80;
+				data[6] = q[5] | 0x80;
+				data[7] = q[6] | 0x80;
+				qtf.Cat(data, 8);
+				if(++n % 10 == 0)
+					qtf << "\r\n";
+				q += 7;
+			}
+			while(q < slim) {
+				byte seven = 0;
+				const char *lim = slim;
+				const char *s;
+				for(s = q; s < lim; s++)
+					seven = (seven >> 1) | (*s & 0x80);
+				seven >>= 8 - (lim - q);
+				qtf.Cat(seven | 0x80);
+				for(s = q; s < lim; s++)
+					qtf.Cat(*s | 0x80);
+				if(++n % 10 == 0)
+					qtf << "\r\n";
+				q += 7;
+			}
+		}
+		else {
+			String cf = CharFmt(charstyle, part);
+			if(!cf.IsEmpty()) {
+				qtf << '[' << cf << ' ';
+				d += cf.GetLength() + 2;
+			}
+			for(const char *s = part.text.Begin(); s != part.text.End(); s++) {
+				byte c = *s;
+				if(c < 128) {
+					if(c >= 'a' && c <= 'z' || c >= 'A' && c <= 'Z' || c >= '0' && c <= '9'
+					|| c == ' ' || c == '.' || c == ',' || c == '?' || c == '(' || c == ')'
+					|| c == ';')
+					{
+						qtf.Cat(c);
+						d++;
+					}
+					else if(c == 9)
+					{
+						qtf.Cat(127);
+						d++;
+					}
+					else if(c == 31)
+					{
+						qtf.Cat('_');
+						d++;
+					}
+					else
+					{
+						qtf.Cat('`');
+						qtf.Cat(c);
+						d += 2;
+					}
+					if(d > 60 && c == ' ')
+					{
+						qtf.Cat("\r\n");
+						d = 0;
+					}
+				}
+				else
+				{
+					qtf.Cat(c);
+					d++;
+				}
+				if(d > 80)
+				{
+					qtf.Cat("\r\n");
+					d = 0;
+				}
+			}
+			if(!cf.IsEmpty()) {
+				d++;
+				qtf << ']';
+			}
+		}
+	}
+	return qtf;
+}
+
+String AsQtf(const Document& text)
+{
+	Paragraph::Style empty_format;
+	empty_format.Init();
+	Paragraph::Part empty_part;
+	String qtf;
+//	qtf << "[";
+	for(int i = 0; i < text.GetCount(); i++)
+		if(text.IsParagraph(i)) {
+			const Paragraph& p = text.GetParagraph(i);
+			if(i) qtf << "\r\n&\r\n";
+			qtf << "[";
+			qtf << QTFEncodePara(p, empty_format, empty_part);
+			qtf << "]";
+		}
+	qtf << "\r\n"; // ]";
+	return qtf;
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/DocTypes/QtfParser.cpp b/uppsrc/DocTypes/QtfParser.cpp
new file mode 100644
index 000000000..e97920b16
--- /dev/null
+++ b/uppsrc/DocTypes/QtfParser.cpp
@@ -0,0 +1,381 @@
+#include "DocTypes.h"
+
+NAMESPACE_UPP
+
+int  QtfParser::GetNumber() {
+	int n = 0;
+	int sgn = 1;
+	if(*term == '-') {
+		sgn = -1;
+		term++;
+	}
+	while(IsDigit(*term))
+		n = n * 10 + *term++ - '0';
+	return sgn * n;
+}
+
+String QtfParser::GetString() {
+	String s;
+	for(;;) {
+		if(*term == '\0') return s;
+		if(*term == '^') {
+			term++;
+			return s;
+		}
+		s.Cat(*term++);
+	}
+}
+
+Paragraph& QtfParser::Par() {
+	return table.GetRows() ? table.LastCell() : paragraph;
+}
+
+void QtfParser::Flush(String& text) {
+	if(text.GetLength()) {
+		Par().SetParaFont(state.font);
+		if(state.type == NORMAL)
+			Par().Cat(text, state.font, state.color, state.value);
+		else {
+			Font f = state.font;
+			int h = f.GetHeight();
+			f.Height(2 * h / 3);
+			Par().Cat(text, f, state.color, state.value, state.type == SUPERSCRIPT ? -abs(h / 3)
+				                                                                   :  abs(h / 5));
+		}
+		paragraph.SetStyle(state);
+	}
+	text.Clear();
+}
+
+Color QtfParser::GetColor() {
+	static Color color[] = { Black, LtGray, White, Red, Green,
+							 Blue, LtRed, WhiteGray, LtCyan, Yellow };
+	int c = *term++;
+	if(c == '(') {
+		byte r = GetNumber();
+		if(Key(')')) {
+			r &= 255;
+			return Color(r, r, r);
+		}
+		Key('.');
+		byte g = GetNumber();
+		Key('.');
+		byte b = GetNumber();
+		Key(')');
+		return Color(r, g, b);
+	}
+	else
+	if(c >= '0' && c <= '9')
+		return color[c - '0'];
+	else
+		return Red;
+}
+
+void QtfParser::Picture(int type) {
+	int cx = 0;
+	int cy = 0;
+	term++;
+	cx = GetNumber();
+	Key(':');
+	cy = GetNumber();
+	Key(' ');
+	String name;
+	while(*term != ']' && *term)
+		name.Cat(*term++);
+	if(type == 0) {
+#ifdef PLATFORM_WIN32
+		Drawing iw = Drawing::LoadWMF(GetExeDirFile(name));
+		if(!iw) iw = Drawing::LoadWMF(name);
+		if(iw) Par().Cat(PaintRect(DrawingDisplay(), iw), cx, cy, state.value);
+#endif
+	}
+	else if(type == 3) {
+		bool isx = (name.GetLength() == 8);
+		for(const char *p = name; isx && *p; p++)
+			isx = IsXDigit(*p);
+		if(isx)
+			Par().Cat(*(PaintRect *)(strtoul(name, NULL, 16)), cx, cy, state.value);
+	}
+//	else
+//		Par().Cat(type == 1 ? PaintRect(NameNImageDisplay(), name)
+//		                    : PaintRect(NameSImageDisplay(), name), cx, cy, state.value);
+	if(*term) term++;
+}
+
+void QtfParser::Celln(int& a, int& b) {
+	a = -1;
+	b = -1;
+	if(IsDigit(*term))
+		a = GetNumber();
+	if(*term == '/') {
+		term++;
+		b = GetNumber();
+	}
+}
+
+QtfParser::Code QtfParser::Error(const char *s) {
+	paragraph.Clear();
+	paragraph.Cat("ERROR: " + String(s) + ": " + String(term, min<int>(strlen(term), 20)),
+	              Arial(84).Bold().Underline(), Red);
+	term = "";
+	return PARAGRAPH;
+}
+
+QtfParser::Code QtfParser::Parse() {
+	String text;
+	paragraph.Clear();
+	table.Clear();
+	if(*term == '\0') {
+		paragraph.SetStyle(state);
+		paragraph.SetParaFont(state.font);
+		Code e = ender;
+		ender = END;
+		return e;
+	}
+	ender = END;
+	if(inraw)
+		goto toinraw;
+	while(Key(']'))
+		if(stack.GetCount()) {
+			state = stack.Top();
+			stack.Drop();
+		}
+		else
+			return Error("[ UNMATCHED");
+	if(Key2('^') || Key('\f')) return PAGE;
+	if(Key2('+')) {
+		table.AddRow();
+		table.AddCell();
+	}
+	Par().SetStyle(state);
+	for(;;) {
+		if(*term == '\0') {
+			Flush(text);
+			return IsTable() ? TABLE : PARAGRAPH;
+		}
+		if(Term2('^') || *term == '\f') {
+			Flush(text);
+			return IsTable() ? TABLE : PARAGRAPH;
+		}
+		if(Term2('+')) {
+			Flush(text);
+			if(IsTable()) {
+				term += 2;
+				return TABLE;
+			}
+			else
+				return PARAGRAPH;
+		}
+		if(Key('\n') || Key('&')) {
+			Flush(text);
+			Par().SetParaFont(state.font);
+			if(!IsTable()) {
+				ender = *term ? PARAGRAPH : END;
+				return PARAGRAPH;
+			}
+			Cell().NewPar();
+			Par().SetStyle(state);
+			continue;
+		}
+		if(Key('\t') || Key2('|')) {
+			Flush(text);
+			if(!IsTable()) return PARAGRAPH;
+			table.AddCell();
+			continue;
+		}
+		if(Key('\v') || Key2('-')) {
+			Flush(text);
+			if(!IsTable()) return PARAGRAPH;
+			table.AddRow();
+			table.AddCell();
+			continue;
+		}
+		if(Key('`') || Key('\\')) {
+			text.Cat(*term++);
+			continue;
+		}
+		if(Key2(':')) {
+			Flush(text);
+			if(!IsTable())
+				return Error("NOT IN TABLE");
+			while(*term != ' ' && *term != '\n') {
+				int a, b;
+				switch(*term++) {
+				case 0: return END;
+				case '^': Cell().Top(); break;
+				case '=': Cell().VertCenter(); break;
+				case 'v': Cell().Bottom(); break;
+				case 'l': Celln(a, b); if(a >= 0) Cell().LeftWidth(a);
+					      if(b >= 0) Cell().LeftSpace(b); break;
+				case 'r': Celln(a, b); if(a >= 0) Cell().RightWidth(a);
+					      if(b >= 0) Cell().RightSpace(b); break;
+				case 't': Celln(a, b); if(a >= 0) Cell().TopWidth(a);
+					      if(b >= 0) Cell().TopSpace(b); break;
+				case 'b': Celln(a, b); if(a >= 0) Cell().BottomWidth(a);
+					      if(b >= 0) Cell().BottomSpace(b); break;
+				case 'a': Celln(a, b); if(a >= 0) Cell().FrameWidth(a);
+					      if(b >= 0) Cell().FrameSpace(b); break;
+				case '@': Cell().Paper(GetColor()); break;
+				case '<': table.Lm(GetNumber()); break;
+				case '>': table.Rm(GetNumber()); break;
+				case 'f': table.FrameWidth(GetNumber()); break;
+				case 'h': table.HeaderRows(GetNumber()); break;
+				case '_': table.FrameColor(GetColor()); break;
+				case 's': table.Before(GetNumber()); break;
+				case '!': Cell().Clear(); break;
+				case '~': Cell().FrameWidth(0); table.FrameWidth(0); break;
+				case '/': Cell().Keep(); break;
+				case '+': Cell().Span(GetNumber()); break;
+				default:
+					term--;
+					if(IsDigit(*term))
+						Cell().Ratio(GetNumber());
+					else
+						term++;
+				}
+			}
+			term++;
+			continue;
+		}
+		if(Key('[')) {
+			Flush(text);
+			if(*term == 'P')
+				Picture(0);
+			else
+			if(*term == 'I')
+				Picture(1);
+			else
+			if(*term == 'J')
+				Picture(2);
+			else
+			if(*term == 'K')
+				Picture(3);
+			else {
+				stack.Add(state);
+				for(;;) {
+					int c = *term++;
+					if(c == ' ' || c == '\n') break;
+					switch(c) {
+					case 0: return END;
+					case '[': stack.Add(state); break;
+					case '/': state.font.Italic(!state.font.IsItalic()); break;
+					case '_': state.font.Underline(!state.font.IsUnderline()); break;
+					case '*': state.font.Bold(!state.font.IsBold()); break;
+					case '-': state.font.Strikeout(!state.font.IsStrikeout()); break;
+					case '`': state.type = SUPERSCRIPT; break;
+					case ',': state.type = SUBSCRIPT; break;
+					case 'A': state.font = state.font.Face(Font::ARIAL); break;
+					case 'R': state.font = state.font.Face(Font::ROMAN); break;
+					case 'C': state.font = state.font.Face(Font::COURIER); break;
+					case 'G': state.font = state.font.Face(Font::STDFONT); break;
+					case 'S': state.font = state.font.Face(Font::SYMBOL); break;
+#ifdef PLATFORM_WIN32
+					case 'W': state.font = state.font.Face(Font::WINGDINGS); break;
+#endif
+					case '.': state.font = state.font.Face(GetNumber()); break;
+					case '^': state.value = GetString(); break;
+					case '<': Par().Left(); state.align = ALIGN_LEFT; break;
+					case '>': Par().Right(); state.align = ALIGN_RIGHT; break;
+					case '=': Par().Center(); state.align = ALIGN_CENTER; break;
+					case '#': Par().Justify(); state.align = ALIGN_JUSTIFY; break;
+					case 'l': Par().Lm(state.lm = GetNumber()); break;
+					case 'r': Par().Rm(state.rm = GetNumber()); break;
+					case 'i': Par().Indent(state.indent = GetNumber()); break;
+					case 'b': Par().Before(state.before = GetNumber()); break;
+					case 'a': Par().After(state.after = GetNumber()); break;
+					case 'o': Par().Bullet(); state.bullet = Paragraph::StdBullet();
+						      state.bulletindent = 150; break;
+					case 'O': {
+							int a, b;
+							Celln(a, b);
+							state.bullet = a == 1 ? Paragraph::WhiteBullet() :
+							               a == 2 ? Paragraph::BoxBullet() :
+							               a == 3 ? Paragraph::WhiteBoxBullet() :
+							                        Paragraph::StdBullet(),
+							state.bulletindent = b < 0 ? 150 : b;
+							Par().Bullet(state.bullet, state.bulletindent);
+						}
+						break;
+					case '!': {
+							String fn;
+							for(;;) {
+								if(*term == '!') {
+									term++;
+									break;
+								}
+								if(*term == '\0')
+									break;
+								fn.Cat(*term++);
+							}
+							state.font.Face(Font::FindFaceNameIndex(fn));
+						}
+						break;
+					case '+': state.font.Height(GetNumber()); break;
+					case '@':
+						state.color = GetColor();
+						break;
+					default:
+						if(c >= '0' && c <= '9') {
+							static int fsize[] = {
+								50, 67, 84, 100, 134, 167, 200, 234, 300, 400
+							};
+							state.font.Height(fsize[c - '0']);
+						}
+						break;
+					}
+				}
+			}
+		}
+		else
+		if(Key(']')) {
+			Flush(text);
+			if(stack.GetCount()) {
+				state = stack.Top();
+				stack.Drop();
+			}
+		}
+		else
+		if(*term == '_') {
+			text.Cat(31);
+			term++;
+		}
+		else
+		if(*term == '\1') {
+			term++;
+		toinraw:
+			for(;;) {
+				if(*term == '\0') break;
+				if(*term == '\1') {
+					inraw = false;
+					term++;
+					break;
+				}
+				if(*term == '\n' && !IsTable()) {
+					inraw = true;
+					term++;
+					Flush(text);
+					ender = PARAGRAPH;
+					return PARAGRAPH;
+				}
+				text.Cat(*term++);
+			}
+		}
+		else
+		if((byte)*term >= 31)
+			text.Cat(*term++);
+		else
+			term++;
+	}
+	String spc(" ");
+	Flush(spc);
+}
+
+void QtfParser::Init() {
+	state.font = Arial(-84);
+	state.color = Black;
+	state.Init();
+	charset = 0;
+	ender = END;
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/DocTypes/Report.cpp b/uppsrc/DocTypes/Report.cpp
new file mode 100644
index 000000000..439419bf1
--- /dev/null
+++ b/uppsrc/DocTypes/Report.cpp
@@ -0,0 +1,255 @@
+#include "DocTypes.h"
+
+NAMESPACE_UPP
+
+DocReport::DocReport(const char *_name) {
+	name = _name;
+	pgsz.cx = 3968;
+	pgsz.cy = 6074;
+	size = pgsz;
+	pgnformat = NULL;
+	pageno = 1;
+	dortf = true;
+	WhenNewPage();
+	StartPage();
+	valrects = false;
+	lm = 0;
+}
+
+DocReport::~DocReport() {}
+
+void DocReport::Clear() {
+	pgnformat = NULL;
+	pageno = 1;
+	page.Clear();
+	header.Clear();
+	footer.Clear();
+	qtfheader.Clear();
+	qtffooter.Clear();
+	WhenNewPage();
+	StartPage();
+	rtf.Clear();
+	vr.Clear();
+}
+
+void DocReport::SetCount(int n)
+{
+	page.SetCount(n);
+	StartPage();
+}
+
+
+DocReport& DocReport::SetPageSize(int cx, int cy) {
+	pgsz = Size(cx, cy);
+	StartPage();
+	return *this;
+}
+
+DocReport& DocReport::SetPageSize(Size sz) {
+	pgsz = sz;
+	StartPage();
+	return *this;
+}
+
+DocReport& DocReport::SetPageNo(int _pageno) {
+	pageno = _pageno;
+	return *this;
+}
+
+DocReport& DocReport::SetPageno(int x, int y, const char *format, Font font, int fp) {
+	pgnx = x;
+	pgny = y;
+	pgnformat = format;
+	pgnfont = font;
+	pageno = fp;
+	WhenNewPage();
+	StartPage();
+	return *this;
+}
+
+DocReport& DocReport::SetHeader(const Drawing& h) {
+	header = h;
+	StartPage();
+	return *this;
+}
+
+DocReport& DocReport::SetFooter(const Drawing& f) {
+	footer = f;
+	StartPage();
+	return *this;
+}
+
+DocReport& DocReport::SetHeader(const char *qtf) {
+	qtfheader = qtf;
+	StartPage();
+	return *this;
+}
+
+DocReport& DocReport::SetFooter(const char *qtf) {
+	qtffooter = qtf;
+	StartPage();
+	return *this;
+}
+
+String  DocReport::HFormat(const char *s) {
+	String result;
+	while(*s) {
+		if(s[0] == '$' && s[1] == '$') {
+			if(s[2] == 'P')
+				result.Cat(Format("%d", pageno));
+			if(s[2] == 'D')
+				result.Cat(Format(GetSysDate()));
+			s += 3;
+		}
+		result.Cat(*s++);
+	}
+	return result;
+}
+
+void DocReport::StartPage() {
+	Create(pgsz.cx, pgsz.cy);
+	size = pgsz;
+	ylim = size.cy;
+	bool artf = dortf;
+	dortf = false;
+	if(qtffooter.IsEmpty()) {
+		if(footer) {
+			Size sz = footer.GetSize();
+			DrawDrawing(0, pgsz.cy - sz.cy, sz.cx, sz.cy, footer);
+			size.cy -= sz.cy;
+		}
+	}
+	else {
+		ypos = 0;
+		Qtf(HFormat(qtffooter));
+		Drawing h = GetResult();
+		Create(pgsz.cx, pgsz.cy);
+		DrawDrawing(0, pgsz.cy - ypos, pgsz.cx, pgsz.cy, h);
+		size.cy -= ypos;
+	}
+	ylim = size.cy;
+	ypos = 0;
+	if(qtfheader.IsEmpty()) {
+		if(header) {
+			Size sz = header.GetSize();
+			DrawDrawing(0, 0, sz.cx, sz.cy, header);
+			ypos = max(0, sz.cy);
+		}
+	}
+	else
+		Qtf(HFormat(qtfheader));
+	size.cy -= ypos;
+	if(pgnformat)
+		DrawText(pgnx, pgny >= 0 ? pgny : pgsz.cy - pgny,
+		         Format(pgnformat, pageno), pgnfont);
+	dortf = artf;
+}
+
+void DocReport::EndPage() {
+	page.Add(GetResult());
+	pageno++;
+}
+
+void DocReport::NextPage() {
+	EndPage();
+	WhenNewPage();
+	StartPage();
+}
+
+void DocReport::Page() {
+	if(dortf) rtf.Page();
+	NextPage();
+}
+
+void DocReport::SkipBefore(int cy) {
+	ypos += cy;
+	if(ypos > GetYLim()) {
+		Page();
+		if(ypos + cy < GetYLim())
+			ypos += cy;
+	}
+}
+
+void DocReport::SkipAfter(int cy) {
+	ypos += cy;
+	if(ypos > GetYLim())
+		Page();
+}
+
+void DocReport::AddVR(const Vector<ValueRect>& v) {
+	for(int i = 0; i < v.GetCount(); i++) {
+		RValueRect& r = vr.Add();
+		(ValueRect&)r = v[i];
+		r.toppage = r.bottompage = page.GetCount();
+		while(r.rect.top >= GetYLim()) {
+			r.rect.top -= GetYLim();
+			r.toppage++;
+		}
+		while(r.rect.bottom >= GetYLim()) {
+			r.rect.bottom -= GetYLim();
+			r.bottompage++;
+		}
+	}
+}
+
+void DocReport::Put(const Paragraph& p) {
+	if(dortf) rtf.Put(p);
+	SkipBefore(p.GetBefore());
+	if(valrects) {
+		int y = ypos;
+		Vector<ValueRect> v;
+		p.GetValueRects(1024, *this, lm, y, pgsz.cx - lm, v);
+		AddVR(v);
+	}
+	Paragraph::PaintInfo pi;
+	while(p.Paint(*this, lm, ypos, pgsz.cx - lm, GetYLim(), pi))
+		Page();
+	SetYPos(pi.ypos);
+	SkipAfter(p.GetAfter());
+}
+
+void DocReport::Put(const Table& tab) {
+	if(dortf) rtf.Put(tab);
+	SkipBefore(tab.GetBefore());
+	if(valrects) {
+		int y = ypos;
+		Vector<ValueRect> v;
+		tab.GetValueRects(1024, *this, lm, y, pgsz.cx - lm, v);
+		AddVR(v);
+	}
+	Table::PaintInfo pi;
+	while(tab.Paint(*this, lm, ypos, pgsz.cx - lm, GetYLim(), pi))
+		Page();
+	SetYPos(pi.ypos);
+	SkipAfter(tab.GetAfter());
+}
+
+void  DocReport::KillLastPage() {
+	if(page.GetCount())
+		page.Drop();
+	pageno--;
+}
+
+void PutQTF(DocReport& r, const char *qtf)
+{
+	RichText text;
+	text = ParseQTF(qtf);
+
+	Size sz = r.GetPageSize();
+	Size pgsz = r.GetSize();
+	int lastpage = text.GetHeight(pgsz).page;
+	int x = (sz.cx - pgsz.cx) / 2;
+	int y = (sz.cy - pgsz.cy) / 2;
+	for(int i = 0; i <= lastpage; i++) {
+		if(i)
+			r.Page();
+		PrintPageDraw pw(r);
+		pw.SetPage(i);
+		PaintInfo paintinfo;
+		paintinfo.top = PageY(i, 0);
+		paintinfo.bottom = PageY(i + 1, 0);
+		text.Paint(pw, Rect(Point(x, y), pgsz), paintinfo);
+	}
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/DocTypes/Report.h b/uppsrc/DocTypes/Report.h
new file mode 100644
index 000000000..87f538d4e
--- /dev/null
+++ b/uppsrc/DocTypes/Report.h
@@ -0,0 +1,188 @@
+NAMESPACE_UPP
+
+#define LAYOUTFILE <DocTypes/Report.lay>
+#include <CtrlCore/lay.h>
+
+class DocReport : public DrawingDraw, public DocOut {
+public:
+	virtual void    Put(const Paragraph& p);
+	virtual void    Put(const Table& p);
+	virtual void    Page();
+
+	struct RValueRect : public ValueRect {
+		int toppage;
+		int bottompage;
+	};
+
+protected:
+	String          name;
+	Array<RValueRect> vr;
+	Array<Drawing>  page;
+	Size            pgsz;
+	Size            size;
+	Drawing         header;
+	Drawing         footer;
+	String          qtfheader;
+	String          qtffooter;
+	int             ylim, lm;
+	int             pgn, pgnx, pgny, pageno;
+	const char     *pgnformat;
+	Font            pgnfont;
+	QtfParser       parser;
+	RtfDocOut       rtf;
+
+	bool            dortf;
+	bool            valrects;
+
+	int             ypos;
+
+	struct TableSet;
+
+	void          StartPage();
+	void          EndPage();
+	String        HFormat(const char *s);
+	bool          Print0(int page, const char *name);
+	void          AddVR(const Vector<ValueRect>& v);
+
+	friend class ReportDlg;
+
+public:
+	Callback      WhenNewPage;
+
+	void          NextPage();
+
+	DocReport&       SetPageSize(int cx, int cy);
+	DocReport&       SetPageSize(Size sz);
+	DocReport&       SetPageno(int x, int y, const char *format = "%d",
+		                    Font font = Roman(-100), int fp = 1);
+	DocReport&       SetPageNo(int pageno);
+	DocReport&       SetHeader(const Drawing& h);
+	DocReport&       SetFooter(const Drawing& f);
+
+	DocReport&       Landscape()                         {	return SetPageSize(pgsz.cy, pgsz.cx); }
+
+
+	int           GetPageNo() const                   { return pageno; }
+
+	DocReport&       SetHeader(const char *qtf);
+	DocReport&       SetFooter(const char *qtf);
+
+	Size          GetPageSize() const                 { return pgsz; }
+	Size          GetSize() const                     { return size; }
+	String        GetHeader() const                   { return qtfheader; }
+	String        GetFooter() const                   { return qtffooter; }
+
+	int           GetYPos() const                     { return ypos; }
+	void          SetYPos(int y)                      { ypos = y; }
+	void          AddYPos(int dy)                     { ypos += dy; }
+	int           GetYLim() const                     { return ylim; }
+	int           GetYRest() const                    { return GetYLim() - ypos; }
+	void          SetLm(int cx)                       { lm = cx; }
+
+	void          SkipBefore(int cy);
+	void          SkipAfter(int cy);
+
+	int           GetCount() const                    { return page.GetCount(); }
+	int           GetPageCount() const                { return page.GetCount() + 1; }
+	Drawing       GetPage(int i) const                { return page[i]; }
+	const Array<Drawing>& GetPages() const            { return page; }
+	void          SetCount(int n);
+
+	void          Clear();
+
+	void          KillLastPage();
+
+	void          Finish()                            { EndPage(); }
+
+	bool          Print(int page = 0, const char *name = NULL);
+	bool          Perform(const char *caption = NULL);
+
+	const ValueRect& GetValueRect(int i) const        { return vr[i]; }
+	int              GetValueRectCount() const        { return vr.GetCount(); }
+
+	String           GetRtf()                         { return rtf.Get(); }
+
+	DocReport&       Rtf(bool b = true)               { dortf = b; return *this; }
+	DocReport&       NoRtf()                          { return Rtf(false); }
+	DocReport&       RtfImageScale(double d)          { rtf.ImageScale(d); return *this; }
+	DocReport&       ValueRects(bool b = true)        { valrects = true; return *this; }
+
+	DocReport(const char *name = t_("DocReport"));
+	virtual ~DocReport();
+};
+
+String Pdf(const DocReport& report);
+
+class ReportCtrl : public Ctrl {
+public:
+	virtual void Paint(Draw& w);
+	virtual void Layout();
+	virtual bool Key(dword key, int);
+	virtual void LeftDown(Point p, dword);
+	virtual void MouseWheel(Point, int zdelta, dword);
+
+protected:
+	ScrollBar sb;
+	DocReport   *report;
+	Image     page[64];
+	int       pagei[64];
+	Size      pagesize;
+	int       vsize;
+
+	int       pm;
+	int       pvn;
+	bool      numbers;
+	int       pages;
+
+	Image     GetPage(int i);
+
+	void      Init();
+	void      Sb();
+	void      Numbers()               { Refresh(); }
+
+public:
+	Callback  WhenGoPage;
+
+	enum Pages {
+		PG1, PG2, PG4, PG16
+	};
+	ReportCtrl& Pages(int pags)       { pages = pags; Layout(); return *this; }
+	ReportCtrl& Numbers(bool nums)    { numbers = nums; Refresh(); return *this; }
+
+	void      Set(DocReport& p);
+	int       GetFirst() const        { return sb / max(pagesize.cy * pvn, 1); }
+
+	void      ScrollInto(int toppage, int top, int bottompage, int bottom);
+	void      ScrollInto(const DocReport::RValueRect& vr);
+
+	typedef ReportCtrl CLASSNAME;
+
+	ReportCtrl();
+};
+
+class ReportDlg : public WithReportLayout<TopWindow> {
+	void Pages()   { pg.Pages(~sw); }
+	void Numbers() { pg.Numbers(numbers); }
+	void GoPage()  { sw <<= ReportCtrl::PG1; Pages(); }
+	void Pdf();
+
+	Array<Button>  button;
+	DocReport        *report;
+
+public:
+	ReportCtrl pg;
+
+	typedef ReportDlg CLASSNAME;
+
+	static void SetPdfRoutine(String (*pdf)(const DocReport& report, int margin));
+
+	void SetButton(int i, const char *label, int id);
+
+	int  Perform(DocReport& report, int zoom = 100, const char *caption = t_("DocReport"));
+
+	ReportDlg();
+};
+
+void PutQTF(DocReport& r, const char *qtf);
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/DocTypes/Report.lay b/uppsrc/DocTypes/Report.lay
new file mode 100644
index 000000000..a0ae665ed
--- /dev/null
+++ b/uppsrc/DocTypes/Report.lay
@@ -0,0 +1,10 @@
+LAYOUT(ReportLayout, 268, 276)
+	UNTYPED(pg, HSizePosZ(6, 108).VSizePosZ(3, 4))
+	ITEM(Label, lbl, SetLabel(t_("1 / 1")).RightPosZ(6, 96).TopPosZ(3, 26))
+	ITEM(LabelBox, dv___2, SetLabel(t_("Sideways")).RightPosZ(8, 88).TopPosZ(42, 94))
+	ITEM(Switch, sw, SetLabel(t_("&1 page\n&2 pages\n&4 pages\n&8 pages")).RightPosZ(12, 76).TopPosZ(60, 72))
+	ITEM(Option, numbers, SetLabel(t_("Page &numbers")).RightPosZ(4, 92).TopPosZ(146, 18))
+	ITEM(Button, pdf, SetLabel(t_("PDF export..")).RightPosZ(12, 80).TopPosZ(172, 24))
+	ITEM(Button, cancel, SetLabel(t_("Cancel")).RightPosZ(12, 80).BottomPosZ(8, 24))
+END_LAYOUT
+
diff --git a/uppsrc/DocTypes/RtfDocOut.cpp b/uppsrc/DocTypes/RtfDocOut.cpp
new file mode 100644
index 000000000..aabd2b2fb
--- /dev/null
+++ b/uppsrc/DocTypes/RtfDocOut.cpp
@@ -0,0 +1,272 @@
+#include <DocTypes/DocTypes.h>
+
+NAMESPACE_UPP
+
+RtfDocOut::RtfDocOut() {
+	color.Add(Black());
+	pgcx = 3968;
+	imagescale = 6;
+	page = false;
+	rtf.Reserve(8192);
+}
+
+#ifdef flagSO
+RtfDocOut::~RtfDocOut() {}
+#endif
+
+void RtfDocOut::Clear() {
+	color.Clear();
+	color.Add(Black());
+	pgcx = 3968;
+	imagescale = 6;
+	page = false;
+	rtf.Clear();
+}
+
+void RtfDocOut::PutColor(const char *cmd, dword col) {
+	rtf.Cat(Format("\\%s%d", cmd, color.FindAdd(col) + 1));
+}
+
+void RtfDocOut::Border(const char *cmd, int width, dword color) {
+	if(width) {
+		rtf.Cat(Format("\\%s\\brdrth\\brdrw%d", cmd, Dow(width)));
+		PutColor("brdrcf", color);
+	}
+}
+
+Draw& ScreenInfo();
+
+void RtfDocOut::PutPicture(const Drawing& iw, Size sz) {
+#ifdef PLATFORM_WIN32
+	WinMetaFile wmf = iw.AsWMF();
+	HENHMETAFILE hemf = wmf.GetHEMF();
+	if(!hemf) return;
+	dword size = GetWinMetaFileBits(hemf, 0, NULL, MM_ANISOTROPIC, ScreenInfo());
+	if(size <= 0) return;
+	StringBuffer b(size);
+	GetWinMetaFileBits(hemf, size, (byte *) ~b, MM_ANISOTROPIC, ScreenInfo());
+	String data = b;
+	rtf.Cat(Format("\r\n{\\pict\\wmetafile8\\picw%d\\pich%d\\picwgoal%d\\pichgoal%d \r\n",
+			       254 * sz.cx / 60, 254 * sz.cy / 60, Dow(sz.cx), Dow(sz.cy)));
+	static const char hex[] = "0123456789ABCDEF";
+	const byte *lim = (byte *) data.End();
+	for(const byte *s = data; s < lim; s++)
+		rtf << hex[*s >> 4] << hex[*s & 15];
+	rtf.Cat("\r\n}\r\n");
+#endif
+}
+
+void RtfDocOut::PutPara(const Paragraph& p, bool par, bool table, int ls, int rs, int ts, int bs) {
+	int i;
+	const Paragraph::Style& st = p.GetStyle();
+	String bt;
+	String bf;
+	String bfs;
+	Font bsf = p.GetParaFont();
+	for(i = 0; i < p.GetCount(); i++) {
+		const Paragraph::Part& pi = p.GetParts()[i];
+		if(!pi.pr) {
+			bsf = pi.font;
+			break;
+		}
+	}
+	bfs = Format("%d ", 6 * abs(bsf.GetHeight()) / 25);
+	if(st.bullet) {
+		const Display *d = &st.bullet.GetDisplay();
+		bf = "4";
+		if(d == &Paragraph::WhiteBullet().GetDisplay())
+			bt = "\\'a1";
+		else
+		if(d == &Paragraph::BoxBullet().GetDisplay())
+			bt = "n";
+		else
+		if(d == &Paragraph::WhiteBoxBullet().GetDisplay())
+			bt = "o";
+		else {
+			bf = "3";
+			bt = "\\'b7";
+		}
+		rtf.Cat("{\\pntext\\pard\\plain\\f");
+		rtf.Cat(bf);
+		rtf.Cat("\\fs");
+		rtf.Cat(bfs);
+		rtf.Cat(bt);
+		rtf.Cat("\\tab}\r\n");
+	}
+	rtf.Cat("\\pard\\lang1029");
+	if(page) {
+		rtf.Cat("\\pagebb");
+		page = false;
+	}
+	rtf.Cat("\\q");
+	switch(st.align) {
+	default: rtf.Cat('l'); break;
+	case ALIGN_RIGHT: rtf.Cat('r'); break;
+	case ALIGN_JUSTIFY: rtf.Cat('j'); break;
+	case ALIGN_CENTER: rtf.Cat('c'); break;
+	}
+	if(table)
+		rtf.Cat("\\intbl");
+	int bi = st.bullet ? st.bulletindent : 0;
+	rtf.Cat(Format("\\fi%d\\li%d\\ri%d\\sb%d\\sa%d \r\n",
+		Dow(st.bullet ? -bi : st.indent), Dow(st.lm + ls + bi), Dow(st.rm + rs),
+			Dow(st.before + ts), Dow(st.after + bs)));
+	if(st.bullet) {
+		rtf.Cat("{\\*\\pn \\pnlvlblt\\pnf");
+		rtf.Cat(bf);
+		rtf.Cat("\\pnfs");
+		rtf.Cat(bfs);
+		rtf.Cat(Format("\\pnindent%d\\pnhang{\\pntxtb ", Dow(bi + st.indent)));
+		rtf.Cat(bt);
+		rtf.Cat("}}\r\n");
+	}
+ 	for(i = 0; i < p.GetCount(); i++) {
+		const Paragraph::Part& pi = p.GetParts()[i];
+		if(pi.pr) {
+			Size sz = (int)imagescale * pi.pr.GetStdSize();
+			if(pi.sz.cx) sz.cx = pi.sz.cx;
+			if(pi.sz.cy) sz.cy = pi.sz.cy;
+			DrawingDraw wd(sz);
+			pi.pr.Paint(wd, 0, 0, sz.cx, sz.cy, Black, White);
+			PutPicture(wd, sz);
+		}
+		else {
+			rtf.Cat('{');
+			if(pi.font.IsBold()) rtf.Cat("\\b");
+			if(pi.font.IsItalic()) rtf.Cat("\\i");
+			if(pi.font.IsUnderline()) rtf.Cat("\\ul");
+			if(pi.font.IsStrikeout()) rtf.Cat("\\strike");
+			switch(pi.font.GetFace()) {
+			case Font::ROMAN:   rtf.Cat("\\f1"); break;
+			case Font::COURIER: rtf.Cat("\\f2"); break;
+			case Font::SYMBOL:  rtf.Cat("\\f3"); break;
+			}
+			rtf.Cat(Format("\\fs%d", 6 * abs(pi.font.GetHeight()) / 25));
+			if(pi.color != Black)
+				PutColor("cf", pi.color);
+			rtf.Cat(' ');
+			for(const char *s = pi.text; *s; s++) {
+				int c = byte(*s);
+				if(c == 31)
+					rtf.Cat("\\~");
+				else
+				if(c < 128 && c != '{' && c != '\\' && c != '}')
+					rtf.Cat(c);
+				else
+					rtf.Cat(Format("\\'%2x", c));
+			}
+			rtf.Cat("}\r\n");
+		}
+	}
+	if(par) rtf.Cat("\\par ");
+	rtf.Cat("\r\n");
+}
+
+void RtfDocOut::Put(const Paragraph& paragraph) {
+	PutPara(paragraph);
+}
+
+struct RtfDocOut::VSpan : Moveable<RtfDocOut::VSpan> {
+	int x1, x2;
+	int span;
+};
+
+void RtfDocOut::Put(const Table& tab) {
+	const Table::Style& tst = tab.GetStyle();
+	int cx = pgcx - tst.lm - tst.rm;
+	Vector<VSpan> vspan;
+	rtf.Cat("\\par \r\n");
+	int lastrowi = tab.GetRows() - 1;
+	while(lastrowi > 0) {
+		if(tab[lastrowi].GetCount()) break;
+		lastrowi--;
+	}
+	for(int rowi = 0; rowi < tab.GetRows(); rowi++) {
+		int j;
+		const Array<TableCell>& row = tab[rowi];
+		if(row.GetCount()) {
+			rtf.Cat(Format("\\trowd \\trgaph0\\trleft%d", Dow(tst.lm)));
+			if(rowi < tab.GetHeaderRows())
+				rtf.Cat("\\trhdr");
+			rtf.Cat("\\trkeep \r\n");
+			int x = 0;
+			int n = GetTotalRatio(row);
+			for(j = 0; j < row.GetCount(); j++) {
+				const TableCell& cell = row[j];
+				const TableCell::Style& st = cell.GetStyle();
+				int x1 = cx * x / n + tst.lm;
+				int x2 = cx * (x + row[j].GetRatio()) / n + tst.lm;
+				if(cell.GetSpan() > 1) {
+					VSpan& v = vspan.Add();
+					v.span = cell.GetSpan();
+					v.x1 = x1;
+					v.x2 = x2;
+					rtf.Cat("\\clvmgf");
+				}
+				else
+					for(int i = 0; i < vspan.GetCount(); i++) {
+						VSpan& v = vspan[i];
+						if(v.x1 == x1 && v.x2 == x2)
+							rtf.Cat("\\clvmrg");
+					}
+				rtf.Cat("\\clvertal");
+				rtf.Cat(st.align == ALIGN_TOP ? 't' : st.align == ALIGN_CENTER ? 'c' : 'b');
+				Border("clbrdrt", st.topwidth + (rowi == 0) * tst.framewidth, tst.framecolor);
+				Border("clbrdrl", st.leftwidth + (j == 0) * tst.framewidth, tst.framecolor);
+				Border("clbrdrb", st.bottomwidth + (rowi == lastrowi) * tst.framewidth,
+					   tst.framecolor);
+				Border("clbrdrr", st.rightwidth + (j == row.GetCount() - 1) * tst.framewidth,
+					   tst.framecolor);
+				if(GetRValue(st.paper) == GetGValue(st.paper) &&
+				   GetGValue(st.paper) == GetBValue(st.paper))
+					rtf.Cat(Format("\\clshdng%d", 10000 - 10000 * GetBValue(st.paper) / 255));
+				else
+					PutColor("clcbpat", st.paper);
+				rtf.Cat(Format("\\cellx%d \n", Dow(x2)));
+				x += row[j].GetRatio();
+			}
+			for(j = 0; j < row.GetCount(); j++) {
+				const TableCell& cell = row[j];
+				const TableCell::Style& st = row[j].GetStyle();
+				for(int i = 0; i < cell.GetCount(); i++)
+					PutPara(cell[i], i < cell.GetCount() - 1, true, st.leftspace, st.rightspace,
+							(i == 0) * st.topspace, (i == cell.GetCount() - 1) * st.bottomspace);
+				rtf.Cat("\\cell \r\n");
+			}
+			rtf.Cat("\\pard\\intbl\\row \r\n");
+			for(int i = 0; i < vspan.GetCount();)
+				if(--vspan[i].span <= 0)
+					vspan.Remove(i);
+				else
+					i++;
+		}
+	}
+	rtf.Cat("\\pard \r\n");
+}
+
+void RtfDocOut::Page() {
+	page = true;
+}
+
+String RtfDocOut::Get() {
+	String out =
+		"{\\rtf1\\ansi\\ansicpg1250\r\n"
+	       "{\\fonttbl\r\n"
+				"{\\f0\\fswiss\\fcharset238\\cpg1250 Arial CE;Arial;}\r\n"
+				"{\\f1\\froman\\fcharset238\\cpg1250 Times New Roman CE;Times New Roman;}\r\n"
+				"{\\f2\\fmodern\\fcharset238\\cpg1250 Courier New CE;Courier New;}\r\n"
+				"{\\f3\\ftech\\fcharset238\\cpg1250 Symbol;}\r\n"
+				"{\\f4\\ftech\\fcharset238\\cpg1250 WingDings;}\r\n"
+			"}\r\n"
+			"{\\colortbl;\r\n";
+	for(int i = 0; i < color.GetCount(); i++)
+		out.Cat(Format("\\red%d\\green%d\\blue%d;\r\n",
+		               GetRValue(color[i]), GetGValue(color[i]), GetBValue(color[i])));
+	out +=  "}\n"
+		    "\\f0\\pard\\plain \r\n";
+	out += rtf;
+	out += "}\r\n";
+	return out;
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/DocTypes/ShowReport.cpp b/uppsrc/DocTypes/ShowReport.cpp
new file mode 100644
index 000000000..2aba90613
--- /dev/null
+++ b/uppsrc/DocTypes/ShowReport.cpp
@@ -0,0 +1,325 @@
+#include "DocTypes.h"
+
+#define LLOG(x) // LOG(x)
+
+#ifdef PLATFORM_WIN32
+#include <commdlg.h>
+#pragma  comment(lib, "comdlg32.lib")
+#endif
+
+NAMESPACE_UPP
+
+void ReportCtrl::MouseWheel(Point, int zdelta, dword) {
+	sb.Wheel(zdelta);
+}
+
+ReportCtrl::ReportCtrl() {
+	report = NULL;
+	vsize = 0;
+	pagesize.cx = pagesize.cy = 0;
+	sb.WhenScroll = callback(this, &ReportCtrl::Sb);
+	sb.SetLine(16);
+	AddFrame(sb);
+	SetFrame(FieldFrame());
+	numbers = false;
+	pages = PG1;
+}
+
+void ReportCtrl::Set(DocReport& p) {
+	Init();
+	report = &p;
+	Refresh();
+	Layout();
+}
+
+bool ReportCtrl::Key(dword key, int) {
+	return sb.VertKey(key);
+}
+
+void ReportCtrl::LeftDown(Point p, dword) {
+	if(!report || pagesize.cy == 0 || pagesize.cx == 0) return;
+	int pg = (sb + p.y) / pagesize.cy * pvn + min(pvn - 1, p.x / pagesize.cx);
+	WhenGoPage();
+	Layout();
+	sb = pg * pagesize.cy;
+}
+
+void ReportCtrl::Sb() {
+	Refresh();
+	WhenAction();
+}
+
+void ReportCtrl::Init() {
+	for(int i = 0; i < 64; i++) {
+		page[i].Clear();
+		pagei[i] = -1;
+	}
+}
+
+void ReportCtrl::Layout() {
+	Size sz = GetSize();
+	if(report && report->GetCount()) {
+		ASSERT(pages >= PG1 && pages <= PG16);
+		pvn = 1 << pages;
+		static int h[] = { 1, 3, 15, 63 };
+		pm = h[pages];
+		Size sr = report->GetPage(0).GetSize();
+		pagesize.cx = sz.cx / max(pvn, 1);
+		pagesize.cy = sr.cy * pagesize.cx / max(sr.cx, 1);
+		vsize = (report->GetCount() + pvn - 1) / max(pvn, 1) * pagesize.cy;
+		sb.SetPage(sz.cy);
+		sb.SetTotal(vsize);
+		Init();
+		Refresh();
+	}
+	else {
+		vsize = 0;
+		sb.Set(0, 0, 0);
+		return;
+	}
+}
+
+Image ReportCtrl::GetPage(int i) {
+	ASSERT(report);
+	int ii = i & pm;
+	if(pagei[ii] != i) {
+		pagei[ii] = i;
+		Size sz = Size(max(pagesize.cx - 2, 1), max(pagesize.cy - 2, 1));
+		ImageDraw iw(sz);
+		iw.DrawRect(sz, White);
+		iw.DrawDrawing(0, 0, sz.cx, sz.cy, report->GetPage(i));
+		page[ii] = iw;
+	}
+	return page[ii];
+}
+
+void ReportCtrl::ScrollInto(int toppage, int top, int bottompage, int bottom) {
+	sb.ScrollInto(toppage * pagesize.cy + top * pagesize.cy / report->GetPageSize().cy,
+	              (bottompage - toppage) * pagesize.cy +
+	                (bottom - top) * pagesize.cy / report->GetPageSize().cy);
+}
+
+void ReportCtrl::ScrollInto(const DocReport::RValueRect& vr)
+{
+	ScrollInto(vr.toppage, vr.rect.top, vr.bottompage, vr.rect.bottom);
+}
+
+void ReportCtrl::Paint(Draw& w) {
+	Size sz = GetSize();
+	if(sz.cx <= 0 || sz.cy <= 0) return;
+	if(!vsize || !report) {
+		w.DrawRect(0, 0, sz.cx, sz.cy, SGray);
+		return;
+	}
+	int i = sb / pagesize.cy;
+	int y = i * pagesize.cy - sb;
+	i *= pvn;
+	while(y < sz.cy) {
+		int x = 0;
+		for(int j = pvn; j--;) {
+			if(i < report->GetCount()) {
+				w.DrawImage(x + 1, y + 1, GetPage(i));
+				if(j == 0) {
+					w.DrawRect(x + pagesize.cx - 1, y, sz.cx - x - pagesize.cx, pagesize.cy, White);
+					DrawFrame(w, x, y, sz.cx - x, pagesize.cy, White, LtGray);
+				}
+				else
+					DrawFrame(w, x, y, pagesize.cx, pagesize.cy, White, LtGray);
+				if(numbers) {
+					String n = Format("%d", i + 1);
+					Size tsz = GetTextSize(n, StdFont());
+					tsz += Size(8, 4);
+					int tx = x + pagesize.cx - tsz.cx;
+					DrawFrame(w, tx, y, tsz.cx, tsz.cy, Black, Black);
+					w.DrawRect(tx + 1, y + 1, tsz.cx - 2, tsz.cy - 2, Yellow);
+					w.DrawText(tx + 4, y + 2, n);
+				}
+			}
+			else {
+				w.DrawRect(x, y, sz.cx - x, pagesize.cy, Gray);
+				break;
+			}
+			x += pagesize.cx;
+			i++;
+		}
+		y += pagesize.cy;
+	}
+}
+
+ReportDlg::ReportDlg()
+{
+	CtrlLayoutCancel(*this, "");
+	sw <<= ReportCtrl::PG1;
+	sw <<= THISBACK(Pages);
+	numbers <<= THISBACK(Numbers);
+	pg.WhenGoPage = THISBACK(GoPage);
+	lbl.SetFont(Arial(20).Italic());
+	lbl.SetAlign(ALIGN_CENTER);
+	pg.WhenAction = Breaker(-1);
+	Sizeable();
+	MaximizeBox();
+	Icon(CtrlImg::smallreporticon());
+	SetButton(0, t_("&Print"), 999995);
+	pdf.Show(GetDrawingToPdfFn());
+	pdf <<= THISBACK(Pdf);
+}
+
+String Pdf(const DocReport& report)
+{
+	return GetDrawingToPdfFn() ? (*GetDrawingToPdfFn())(report.GetPages(), report.GetPageSize(),
+	                                                    200)
+	                           : String();
+}
+
+void ReportDlg::Pdf()
+{
+	static FileSel fs;
+	static bool b;
+	if(!b) {
+		fs.Type("PDF file", "*.pdf");
+		fs.AllFilesType();
+	}
+	if(!fs.ExecuteSaveAs(t_("Output PDF file")))
+		return;
+	SaveFile(~fs, UPP::Pdf(*report));
+}
+
+void ReportDlg::SetButton(int i, const char *label, int id)
+{
+	LogPos p = cancel.GetPos();
+	Button& b = button.At(i);
+	b.SetLabel(label);
+	b.RightPos(p.x.GetA(), p.x.GetB()).BottomPos(p.y.GetA() + (p.y.GetB() + 6) * (i + 1), p.y.GetB());
+	b <<= Breaker(id);
+	for(int i = 0; i < button.GetCount(); i++)
+		button[i].Remove();
+	for(int i = 0; i < button.GetCount(); i++)
+		AddChildBefore(&button[i], &cancel);
+}
+
+int ReportDlg::Perform(DocReport& report, int zoom, const char *caption)
+{
+	this->report = &report;
+	report.EndPage();
+	if(report.dortf)
+		WriteClipboard("Rich text format", report.rtf.Get());
+	pg.Set(report);
+	Size sz;
+	Rect area = Ctrl::GetWorkArea();
+	sz = area.Size() * 4 * abs(zoom) / 500;
+	SetRect(sz);
+
+	ActiveFocus(pg);
+	Title(caption);
+	Open();
+	int n = -1;
+	for(;;) {
+		int nn = pg.GetFirst() + 1;
+		if(n != nn)
+			lbl = Format("%d / %d", n = nn, report.GetCount());
+		int c = Run();
+		switch(c) {
+		case IDCANCEL:
+			return false;
+		case 999995:
+			return report.Print0(pg.GetFirst(), caption);
+		}
+		if(c > 0)
+			return c;
+	}
+}
+/*
+bool DocReport::Perform(int zoom, const char *caption) {
+	EndPage();
+	if(dortf)
+		WriteClipboard(GetClipboardFormatCode("Rich text format"), rtf.Get());
+	ReportDlg dlg(caption);
+	dlg.pg.Set(*this);
+	Size sz;
+	Rect area = Ctrl::GetWorkArea();
+	sz = area.Size() * 4 * abs(zoom) / 500;
+	dlg.SetRect(sz);
+
+	dlg.ActiveFocus(dlg.pg);
+	dlg.Title(caption);
+	dlg.print <<= dlg.Breaker(123);
+	dlg.Open();
+	int n = -1;
+	for(;;) {
+		int nn = dlg.pg.GetFirst() + 1;
+		if(n != nn)
+			dlg.lbl = Format("%d / %d", n = nn, GetCount());
+		switch(dlg.Run()) {
+		case IDCANCEL:
+			return false;
+		case 123:
+			if(Print0(dlg.pg.GetFirst())) return true;
+			break;
+		}
+	}
+}
+*/
+
+bool DocReport::Perform(const char *caption)
+{
+	ReportDlg dlg;
+	return dlg.Perform(*this, 100, caption);
+}
+
+bool DocReport::Print0(int i, const char *_name) {
+#ifdef PLATFORM_WIN32
+	PRINTDLG dlg;
+	memset(&dlg, 0, sizeof(dlg));
+	dlg.lStructSize = sizeof(dlg);
+	dlg.hwndOwner = GetActiveWindow();
+	dlg.Flags = PD_ALLPAGES|PD_DISABLEPRINTTOFILE|PD_NOSELECTION|PD_RETURNDC|
+		        PD_HIDEPRINTTOFILE|PD_RETURNDEFAULT;
+	if(!PrintDlg(&dlg)) return false;
+	if(dlg.hDevMode) {
+		DEVMODE *pDevMode = (DEVMODE*)::GlobalLock(dlg.hDevMode);
+		pDevMode->dmOrientation = pgsz.cx > pgsz.cy ? DMORIENT_LANDSCAPE
+		                                            : DMORIENT_PORTRAIT;
+		::GlobalUnlock(dlg.hDevMode);
+	}
+	dlg.Flags = PD_ALLPAGES|PD_DISABLEPRINTTOFILE|PD_NOSELECTION|PD_RETURNDC|
+		        PD_HIDEPRINTTOFILE;
+	dlg.nFromPage = i + 1;
+	dlg.nToPage = i + 1;
+	dlg.nMinPage = 1;
+	dlg.nMaxPage = page.GetCount();
+	if(PrintDlg(&dlg)) {
+		PrintDraw w(dlg.hDC, _name ? _name : ~name);
+		if(!(dlg.Flags & PD_PAGENUMS)) {
+			dlg.nFromPage = dlg.nMinPage;
+			dlg.nToPage = dlg.nMaxPage;
+		}
+		Size sz = w.GetPageMMs();
+		int x = (6000 * sz.cx / 254 - pgsz.cx) / 2;
+		int y = (6000 * sz.cy / 254 - pgsz.cy) / 2;
+		for(int c = 0; c < ((dlg.Flags & PD_COLLATE) ? dlg.nCopies : 1); c++)
+			for(i = dlg.nFromPage - 1; i <= dlg.nToPage - 1; i++)
+				for(int c = 0; c < ((dlg.Flags & PD_COLLATE) ? 1 : dlg.nCopies); c++) {
+					LLOG("Printing Page " << i << " gdi: " << GdiGetFreeSpace());
+					Drawing iw = GetPage(i);
+					Size sz = iw.GetSize();
+					w.StartPage();
+					w.DrawDrawing(x, y, sz.cx, sz.cy, iw);
+					w.EndPage();
+				}
+	}
+	else
+		dlg.nToPage = (WORD)-1;
+	::GlobalFree(dlg.hDevMode);
+	::GlobalFree(dlg.hDevNames);
+	return dlg.nFromPage - 1 == 0 && dlg.nToPage == page.GetCount();
+#endif
+	return false;
+}
+
+bool DocReport::Print(int page, const char *_name)
+{
+	EndPage();
+	return Print0(page, _name ? _name : ~name);
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/Docedit/AUTHORS b/uppsrc/Docedit/AUTHORS
new file mode 100644
index 000000000..f782e5b62
--- /dev/null
+++ b/uppsrc/Docedit/AUTHORS
@@ -0,0 +1,2 @@
+Mirek Fidler <cxl@ntllib.org>
+Tomas Rylek  <rylek@volny.cz>
\ No newline at end of file
diff --git a/uppsrc/Docedit/COPYING b/uppsrc/Docedit/COPYING
new file mode 100644
index 000000000..33aa39102
--- /dev/null
+++ b/uppsrc/Docedit/COPYING
@@ -0,0 +1,30 @@
+Copyright (C) 2005 Mirek Fidler, Tomas Rylek and various contributors (see AUTHORS)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to
+deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies of the Software and its Copyright notices. In addition publicly
+documented acknowledgment must be given that this software has been used if no
+source code of this software is made available publicly. This includes
+acknowledgments in either Copyright notices, Manuals, Publicity and Marketing
+documents or any documentation provided with any product containing this
+software. This License does not apply to any software that links to the
+libraries provided by this software (statically or dynamically), but only to
+the software provided.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+-----------
+
+Please see the COPYING.PLAIN for a plain-english explanation of this notice
+and it's intent.
diff --git a/uppsrc/Docedit/COPYING-PLAIN b/uppsrc/Docedit/COPYING-PLAIN
new file mode 100644
index 000000000..770a8132f
--- /dev/null
+++ b/uppsrc/Docedit/COPYING-PLAIN
@@ -0,0 +1,33 @@
+Plain English Copyright Notice
+
+This file is not intended to be the actual License. The reason this file
+exists is that we here are programmers and engineers. We aren't lawyers. We
+provide licenses that we THINK say the right things, but we have our own
+intentions at heart. This is a plain-english explanation of what those
+intentions are, and if you follow them you will be within the "spirit" of
+the license.
+
+The intent is for us to enjoy writing software that is useful to us (the
+AUTHORS) and allow others to use it freely and also benefit from the work we
+put into making it. We don't want to restrict others using it. They should
+not *HAVE* to make the source code of the applications they write that
+simply link to these libraries (be that statically or dynamically), or for
+them to be limited as to what license they choose to use (be it open, closed
+or anything else). But we would like to know you are using these libraries.
+We simply would like to know that it has been useful to someone. This is why
+we ask for acknowledgement of some sort.
+
+You can do what you want with the source of this software - it doesn't
+matter. We still have it here for ourselves and it is open and free to use
+and download and play with. It can't be taken away. We don't really mind what
+you do with the source to your software. We would simply like to know that
+you are using it - especially if it makes it to a commerical product. If you
+simply e-mail all the AUTHORS (see COPYING and AUTHORS files) telling us, and
+then make sure you include a paragraph or page in the manual or in the "About.."
+box for the product with the copyright notice and state that you used this
+software, we will be very happy. If you want to contribute back modifications
+and fixes you may have made we will welcome those too with open arms (generally).
+If you want help with changes needed, ports needed or features to be added,
+arrangements can be easily made with some dialogue.
+
+Mirek Fidler <cxl@ntllib.org>
diff --git a/uppsrc/Docedit/DocItem.cpp b/uppsrc/Docedit/DocItem.cpp
new file mode 100644
index 000000000..42b181199
--- /dev/null
+++ b/uppsrc/Docedit/DocItem.cpp
@@ -0,0 +1,346 @@
+#include "Docedit.h"
+
+#define IMAGECLASS DppImg
+#define IMAGEFILE  <Docedit/Docedit.iml>
+#include <Draw/iml_source.h>
+
+bool IsCppKeyword(const String& id)
+{
+	static Index<String> kw;
+	if(kw.GetCount() == 0)
+		for(int i = 0; CppKeyword[i]; i++)
+			kw.Add(CppKeyword[i]);
+	return kw.Find(id) >= 0;
+}
+
+void DocItemDisplay::Paint(Draw& w, const Rect& r, const Value& q,
+	                       Color _ink, Color paper, dword style) const
+{
+	ValueArray va = q;
+	String txt = va.Get(0);
+	String name = va.Get(1);
+	int    kind = va.Get(2);
+	int    access = va.Get(3);
+	int    status = va.Get(4);
+	String pname = va.Get(5);
+	String tname = va.Get(6);
+	Color c = Color(230, 255, 230);
+	switch(status) {
+	case DocDir::IGNORED: c = SGray; break;
+	case DocDir::OBSOLETELINK:
+	case DocDir::OBSOLETE: c = SLtRed; break;
+	case DocDir::UNDOCUMENTED: c = paper; break;
+	}
+	w.DrawRect(r, style & (FOCUS|CURSOR) ? paper : c);
+	if(IsNull(q)) return;
+	int x0 = r.left;
+	if(access == PROTECTED)
+		w.DrawImage(x0, r.top + 1, DppImg::Protected());
+	x0 += 6;
+	Image img = DppImg::Other();
+	switch(kind) {
+	case FUNCTION:
+		img = DppImg::Function();
+		break;
+	case INSTANCEFUNCTION:
+		img = DppImg::InstanceFunction();
+		break;
+	case CLASSFUNCTION:
+		img = DppImg::ClassFunction();
+		break;
+	case FUNCTIONTEMPLATE:
+		img = DppImg::FunctionTemplate();
+		break;
+	case INSTANCEFUNCTIONTEMPLATE:
+		img = DppImg::InstanceFunctionTemplate();
+		break;
+	case CLASSFUNCTIONTEMPLATE:
+		img = DppImg::ClassFunctionTemplate();
+		break;
+	case STRUCT:
+		img = DppImg::Struct();
+		break;
+	case STRUCTTEMPLATE:
+		img = DppImg::StructTemplate();
+		break;
+	case INSTANCEVARIABLE:
+		img = DppImg::InstanceVariable();
+		break;
+	case CLASSVARIABLE:
+		img = DppImg::ClassVariable();
+		break;
+	case VARIABLE:
+		img = DppImg::Variable();
+		break;
+	case ENUM:
+		img = DppImg::Enum();
+		break;
+	case INLINEFRIEND:
+		img = DppImg::InlineFriend();
+		break;
+	case TYPEDEF:
+		img = DppImg::Typedef();
+		break;
+	case CONSTRUCTOR:
+		img = DppImg::Constructor();
+		break;
+	case DESTRUCTOR:
+		img = DppImg::Destructor();
+		break;
+	case MACRO:
+		img = DppImg::Macro();
+		break;
+	}
+	if(style & (CURSOR|FOCUS))
+		DrawHighlightImage(w, x0, r.top + 1, img);
+	else
+		w.DrawImage(x0, r.top + 1, img);
+	x0 += 20;
+	int x = x0;
+	int y = r.top + 2;
+	const char *s = txt;
+	while(*s && y < r.bottom) {
+		Font f = Arial(11);
+		Color ink = SBlack;
+		int n = 1;
+		if(*s >= '0' && *s <= '9') {
+			while(s[n] >= '0' && s[n] <= '9')
+				n++;
+			ink = SRed;
+		}
+		else
+		if(iscid(*s)) {
+			if(strncmp(s, name, name.GetLength()) == 0 && !iscid(s[name.GetLength()])) {
+				f = Arial(11).Bold();
+				n = name.GetLength();
+				name.Clear();
+			}
+			else {
+				String id;
+				n = 0;
+				while(IsAlNum(s[n]) || s[n] == '_') {
+					id.Cat(s[n]);
+					n++;
+				}
+				if(IsCppKeyword(id))
+					ink = SLtBlue;
+				else
+				if(InScList(id, pname)) {
+					ink = SRed;
+					f = Arial(11).Bold();
+				}
+				else
+				if(InScList(id, tname)) {
+					ink = SGreen;
+					f = Arial(11).Bold();
+				}
+			}
+		}
+		else
+			ink = SMagenta;
+		if(style & (CURSOR|FOCUS)) ink = _ink;
+		Size fsz = w.GetTextSize(s, f, n);
+		if(x + fsz.cx >= r.right && fsz.cx < r.Width()) {
+			if(x0 + 70 < r.right)
+				x = x0 + 24;
+			else
+				x = x0;
+			y += fsz.cy;
+		}
+		w.DrawText(x, y, s, f, ink, n);
+		x += fsz.cx;
+		s += n;
+	}
+}
+
+void DocNestDisplay::Paint(Draw& w, const Rect& r, const Value& q,
+	                       Color _ink, Color paper, dword style) const
+{
+	String text = q;
+	w.DrawRect(r, paper);
+	if(IsNull(text)) {
+		w.DrawText(r.left, r.top, "Globals", Arial(11).Bold().Italic(),
+		           style & (CURSOR|FOCUS) ? _ink : SBlue);
+		return;
+	}
+	int x = r.left;
+	int y = r.top;
+	const char *s = text;
+	Font  idf = Arial(11).Bold();
+	Color idink = SBlack;
+	while(*s && y < r.bottom) {
+		Font f = Arial(11);
+		Color ink = SBlack;
+		int n = 1;
+		if(*s >= '0' && *s <= '9') {
+			while(s[n] >= '0' && s[n] <= '9')
+				n++;
+			ink = SRed;
+		}
+		else
+		if(iscid(*s)) {
+			String id;
+			n = 0;
+			while(IsAlNum(s[n]) || s[n] == '_') {
+				id.Cat(s[n]);
+				n++;
+			}
+			if(IsCppKeyword(id)) {
+				ink = SLtBlue;
+				if(id == "class" || id == "typename")
+					idink = SGreen;
+			}
+			else {
+				ink = idink;
+				f = idf;
+				idink = SBlack;
+				idf = Arial(11);
+			}
+		}
+		else {
+			ink = SMagenta;
+			if(*s == ':') {
+				idf = Arial(11).Bold();
+				idink = SBlack;
+			}
+		}
+		if(style & (CURSOR|FOCUS)) ink = _ink;
+		Size fsz = w.GetTextSize(s, f, n);
+		w.DrawText(x, y, s, f, ink, n);
+		x += fsz.cx;
+		s += n;
+	}
+}
+
+int GetItemHeight(const String& txt, const String& nm, const String& pname,
+                  const String& tname, int cx)
+{
+	String name = nm;
+	int x = 26;
+	int y = ScreenInfo().GetFontInfo(Arial(11)).GetHeight() + 3;
+	const char *s = txt;
+	while(*s) {
+		Font f = Arial(11);
+		int n = 1;
+		if(*s >= '0' && *s <= '9')
+			while(s[n] >= '0' && s[n] <= '9')
+				n++;
+		else
+		if(iscid(*s)) {
+			if(strncmp(s, name, name.GetLength()) == 0 && !iscid(s[name.GetLength()])) {
+				f = Arial(11).Bold();
+				n = name.GetLength();
+				name.Clear();
+			}
+			else {
+				String id;
+				n = 0;
+				while(IsAlNum(s[n]) || s[n] == '_') {
+					id.Cat(s[n]);
+					n++;
+				}
+				if(!IsCppKeyword(id) && InScList(id, pname) || InScList(id, tname))
+					f = Arial(11).Bold();
+			}
+		}
+		Size fsz = ScreenInfo().GetTextSize(s, f, n);
+		if(x + fsz.cx >= cx && fsz.cx < cx) {
+			if(26 + 70 < cx)
+				x = 26 + 24;
+			else
+				x = 26;
+			y += fsz.cy;
+		}
+		x += fsz.cx;
+		s += n;
+	}
+	return y;
+}
+
+void InitItemArray(ArrayCtrl& item)
+{
+	item.NoHeader();
+	item.AddIndex();
+	item.AddIndex().Accel();
+	item.AddIndex();
+	item.AddIndex();
+	item.AddIndex();
+	item.AddIndex();
+	item.AddIndex();
+	item.AddIndex();
+	item.AddIndex();
+	item.AddColumnAt(0, "").Add(1).Add(2).Add(3).Add(4).Add(5).Add(6).Add(7).Add(8)
+	    .SetDisplay(Single<DocItemDisplay>()).Accel().HeaderTab().SetMargin(0);
+	item.HeaderObject().Tab(0).SetMargin(0);
+}
+
+void LoadItems(const DocSet& set, const String& nameing, const String& nesting, ArrayCtrl& item)
+{
+	const ArrayMap<String, DocItem>& nt = set.Get(~nameing).Get(nesting);
+	item.Clear();
+	int cx = item.HeaderObject().GetTabWidth(0) - 2 * item.HeaderObject().Tab(0).GetMargin();
+	for(int i = 0; i < nt.GetCount(); i++) {
+		const DocItem& im = nt[i];
+		if(im.cppitem) {
+			item.Add(nt.GetKey(i), im.cppitem->name, im.cppitem->kind, im.cppitem->access,
+			         im.status, im.cppitem->pname, im.cppitem->tname,
+			         im.package, im.cppitem->file, im.cppitem->line);
+			item.SetLineCy(item.GetCount() - 1,
+			               GetItemHeight(nt.GetKey(i), im.cppitem->name,
+			                             im.cppitem->pname, im.cppitem->tname, cx));
+		}
+		else {
+			item.Add(nt.GetKey(i), Null, Null, Null, im.status, Null, Null, im.package,
+			         Null, Null);
+			item.SetLineCy(item.GetCount() - 1,
+			               GetItemHeight(nt.GetKey(i), Null, Null, Null, cx));
+		}
+	}
+}
+
+int ByOrder(int a1, int a2, int *order)
+{
+	if(a1 == a2) return 0;
+	while(*order != -1) {
+		if(a1 == *order) return -1;
+		if(a2 == *order) return  1;
+		order++;
+	}
+	return 0;
+}
+
+int CompareItems(const Vector<Value>& row1, const Vector<Value>& row2)
+{
+	int q;
+	int status_order[] = {
+		STATUS_UNDOCUMENTED, STATUS_OBSOLETE, STATUS_IGNORED, STATUS_EXTERNAL, STATUS_NORMAL,
+		-1
+	};
+	int kind1 = row1[2];
+	int kind2 = row2[2];
+	if(kind1 != STRUCT && kind2 != STRUCT && kind1 != STRUCTTEMPLATE && kind2 != STRUCTTEMPLATE) {
+		q = (int)row2[3] - (int)row1[3];
+		if(q) return q;
+		q = ByOrder(row1[4], row2[4], status_order);
+		if(q) return q;
+	}
+	int kind_order[] = {
+		STRUCT, STRUCTTEMPLATE,
+		MACRO,
+		CONSTRUCTOR, DESTRUCTOR,
+		ENUM, TYPEDEF,
+		INSTANCEFUNCTION, CLASSFUNCTION, INLINEFRIEND,
+		INSTANCEVARIABLE, CLASSVARIABLE,
+		INSTANCEFUNCTION, INSTANCEVARIABLE,
+		VARIABLE, FUNCTION, FUNCTIONTEMPLATE,
+		-1
+	};
+	q = ByOrder(kind1, kind2, kind_order);
+	if(q) return q;
+	return strcmp((String)row1[1], (String)row2[1]);
+}
+
+int CompareNests(const Value& v1, const Value& v2)
+{
+	return strcmp(String(v1), String(v2));
+}
diff --git a/uppsrc/Docedit/DocLink.cpp b/uppsrc/Docedit/DocLink.cpp
new file mode 100644
index 000000000..0d27dd0a3
--- /dev/null
+++ b/uppsrc/Docedit/DocLink.cpp
@@ -0,0 +1,114 @@
+#include "Docedit.h"
+
+void DocLinkDlg::Nameing()
+{
+	nesting.Clear();
+	if(IsNull(nameing)) {
+		Nesting();
+		return;
+	}
+	const VectorMap<String, ArrayMap<String, DocItem> >& ns = set->Get(~nameing);
+	nesting.Clear();
+	for(int i = 0; i < ns.GetCount(); i++)
+		nesting.Add(ns.GetKey(i));
+	nesting.Sort(0, CompareNests);
+	nesting.GoBegin();
+	Nesting();
+}
+
+void DocLinkDlg::Nesting()
+{
+	item.Clear();
+	if(!nesting.IsCursor()) {
+		Item();
+		return;
+	}
+	LoadItems(*set, ~nameing, nesting.GetKey(), item);
+	if(sort)
+		item.Sort(CompareItems);
+	item.GoBegin();
+}
+
+String DocLinkDlg::Get()
+{
+	return "dpp://" + String(~nameing) + "/" + String(nesting.GetKey()) + "/"
+	       + String(item.GetKey());
+}
+
+void DocLinkDlg::Item()
+{
+	link <<= Get();
+	String s = doc_dir.GetText(DocKey(~nameing, nesting.GetKey(), item.GetKey(), lang));
+	label.KillCursor();
+	label.Clear();
+	label.Disable();
+	if(IsNull(s)) return;
+	Array<RichPosInfo> pi = ParseQTF(s).GetPosInfo(Rect(0, 0, 5000, 5000), PageY());
+	for(int i = 0; i < pi.GetCount(); i++)
+		if(pi[i].type == RichPosInfo::LABEL)
+			label.Add(FromUnicode(pi[i].data, CHARSET_WIN1252));
+	if(label.GetCount())
+		label.Enable();
+}
+
+void DocLinkDlg::Label()
+{
+	if(label.IsCursor())
+		link <<= Get() + "#" + String(label.GetKey());
+}
+
+bool DocLinkDlg::Perform(const DocSet& _set, bool _sort, String& _link, dword _lang,
+                         const String& _nameing, const String& _nesting)
+{
+	lang = _lang;
+	set = &_set;
+	sort = _sort;
+	nameing.Clear();
+	for(int i = 0; i < _set.GetCount(); i++)
+		nameing.Add(_set.GetKey(i));
+	if(nameing.GetCount())
+		nameing.SetIndex(0);
+	if(!IsNull(_nameing) && nameing.HasKey(_nameing))
+		nameing <<= _nameing;
+	Nameing();
+	if(!IsNull(_nesting))
+		nesting.FindSetCursor(_nesting);
+	link <<= _link;
+	link.SetFocus();
+	if(Execute() == IDOK) {
+		link.AddHistory();
+		_link = link;
+		return true;
+	}
+	return false;
+}
+
+DocLinkDlg::DocLinkDlg()
+{
+	CtrlLayoutOKCancel(*this, "Link");
+	nesting.AddColumn().SetDisplay(Single<DocNestDisplay>());
+	nesting.NoHeader().NoGrid();
+	nameing <<= THISBACK(Nameing);
+	nesting.WhenEnterRow = THISBACK(Nesting);
+	InitItemArray(item);
+	item.WhenLeftClick = THISBACK(Item);
+	label.NoHeader().NoGrid();
+	label.AddColumn();
+	label.WhenLeftClick = THISBACK(Label);
+}
+
+bool ParseLink(const String& link, DocKey& key, String& label)
+{
+	if(memcmp(link, "dpp://", 6)) return false;
+	Vector<String> p = Split(~link + 6, '/', false);
+	if(p.GetCount() != 3) return false;
+	key.nameing = p[0];
+	key.nesting = p[1];
+	key.item = p[2];
+	int q = key.item.Find('#');
+	label = Null;
+	if(q < 0) return true;
+	label = key.item.Mid(q + 1);
+	key.item = key.item.Mid(0, q);
+	return true;
+}
diff --git a/uppsrc/Docedit/Docbase.cpp b/uppsrc/Docedit/Docbase.cpp
new file mode 100644
index 000000000..97a509ebb
--- /dev/null
+++ b/uppsrc/Docedit/Docbase.cpp
@@ -0,0 +1,66 @@
+#include "Docedit.h"
+
+String PackageDirectory(const String& name)
+{
+	return AppendFileName("F:/uppsrc", name);
+}
+
+String SourcePath(const String& package, const String& name)
+{
+	return AppendFileName(PackageDirectory(package), name);
+}
+
+String CommonPath(const String& filename)
+{
+	return AppendFileName("f:/theide", filename);
+}
+
+DocBase doc_base;
+
+void DocBase::RemoveFile(const String& file)
+{
+	CppBase base;
+	CppBase& doc_base = *this;
+	for(int i = 0; i < doc_base.GetCount(); i++) {
+		String m = doc_base.GetKey(i);
+		CppNamespace& mm = doc_base[i];
+		for(int i = 0; i < mm.GetCount(); i++) {
+			String n = mm.GetKey(i);
+			CppNest& nn = mm[i];
+			for(int i = 0; i < nn.GetCount(); i++) {
+				CppItem& q = nn[i];
+				if(q.file != file)
+					base.GetAdd(m).GetAdd(n).GetAdd(nn.GetKey(i)) = q;
+			}
+		}
+	}
+	doc_base = base;
+}
+
+void DocBase::ParseFile(const String& file, const String& package) throw(CParser::Error)
+{
+	Parse(FileIn(file), ignore, doc_base, package, file);
+}
+
+void DocBase::RefreshFile(const String& file, const String& package) throw(CParser::Error)
+{
+	RemoveFile(file);
+	ParseFile(file, package);
+}
+
+Vector<String> DocBase::GetHeaders()
+{
+	Index<String> h;
+	for(int i = 0; i < doc_base.GetCount(); i++) {
+		String m = doc_base.GetKey(i);
+		CppNamespace& mm = doc_base[i];
+		for(int i = 0; i < mm.GetCount(); i++) {
+			String n = mm.GetKey(i);
+			CppNest& nn = mm[i];
+			for(int i = 0; i < nn.GetCount(); i++) {
+				h.FindAdd(nn[i].file);
+			}
+		}
+	}
+	return h.PickKeys();
+}
diff --git a/uppsrc/Docedit/Docdir.cpp b/uppsrc/Docedit/Docdir.cpp
new file mode 100644
index 000000000..590fb2749
--- /dev/null
+++ b/uppsrc/Docedit/Docdir.cpp
@@ -0,0 +1,511 @@
+#include "Docedit.h"
+
+bool DocKey::operator==(const DocKey& b) const
+{
+	return nameing == b.nameing && nesting == b.nesting && item == b.item && lang == b.lang;
+}
+
+dword GetHashValue(const DocKey& k)
+{
+	return CombineHash(GetHashValue(k.nameing), GetHashValue(k.nesting),
+	                   GetHashValue(k.item)) << k.lang;
+}
+
+int CharFilterNameing(int c)
+{
+	return c == ':' ? '_' : c;
+}
+
+String DocFile(const String& package, const String& name)
+{
+	return AppendFileName(SourcePath(package, "doc.dpp"), name);
+}
+
+Time   GetFileTime(const char *path)
+{
+	FindFile ff(path);
+	return ff ? Time(ff.GetLastWriteTime()) : Null;
+}
+
+void CreateDocDir(const String& package)
+{
+	::CreateDirectory(SourcePath(package, "doc.dpp"), 0);
+}
+
+String AsCode(const DocKey& k)
+{
+	return AsCString(k.nameing) + ", " + AsCString(k.nesting) + ", " +
+	       AsCString(k.item) + ", " + AsCString(LNGAsText(k.lang));
+}
+
+bool ReadCode(CParser& p, DocKey& key)
+{
+	if(!p.IsString()) return false;
+	key.nameing = p.ReadString();
+	if(!p.Char(',') || !p.IsString()) return false;
+	key.nesting = p.ReadString();
+	if(!p.Char(',') || !p.IsString()) return false;
+	key.item = p.ReadString();
+	if(!p.Char(',') || !p.IsString()) return false;
+	key.lang = LNGFromText(p.ReadString());
+	return true;
+}
+
+void DocDir::SaveLinks(const String& package) const
+{
+	CreateDocDir(package);
+	FileOut out(DocFile(package, "links"));
+	int q = dir.Find(package);
+	if(q >= 0) {
+		const ArrayMap<DocKey, Entry>& p = dir[q];
+		for(int i = 0; i < p.GetCount(); i++) {
+			const Entry& w = p[i];
+			const DocKey& k = p.GetKey(i);
+			if(w.type == LINK)
+				out << "LINK(" << AsCode(k) << ", " << AsCString(w.text) << ")\r\n";
+			if(w.type == IGNORED)
+				out << "IGNORED(" << AsCode(k) << ")\r\n";
+		}
+	}
+}
+
+void DocDir::SaveDir(const String& package) const
+{
+	CreateDocDir(package);
+	FileOut out(DocFile(package, "dir.h"));
+	int q = dir.Find(package);
+	if(q >= 0) {
+		const ArrayMap<DocKey, Entry>& p = dir[q];
+		for(int i = 0; i < p.GetCount(); i++) {
+			const Entry& w = p[i];
+			if(w.type == NORMAL || w.type == EXTERNAL) {
+				const DocKey& k = p.GetKey(i);
+				out << "#ifdef INCLUDE_NAMESPACE_" <<
+				       Filter(k.nameing, CharFilterNameing) << "\r\n";
+				out << "//" << k.item << "\r\n";
+				out << "//" << k.nesting << "\r\n";
+				out << "//" << k.nameing << "\r\n";
+				out << "#include \"doc.dpp/";
+				out << w.text;
+				out << "\" //";
+				if(w.type == EXTERNAL)
+					out << "*";
+				out << LNGAsText(k.lang) << "\r\n";
+				out << "#endif\r\n\r\n";
+			}
+		}
+	}
+	SaveLinks(package);
+}
+
+bool DocDir::LoadLinks(const String& package)
+{
+	String f = LoadFile(DocFile(package, "links"));
+	CParser p(f);
+	ArrayMap<DocKey, Entry>& pk = dir.GetAdd(package);
+	try {
+		while(!p.IsEof()) {
+			if(p.Id("LINK")) {
+				DocKey key;
+				p.PassChar('(');
+				if(!ReadCode(p, key)) return false;
+				p.PassChar(',');
+				String link = p.ReadString();
+				p.PassChar(')');
+				Entry& e = pk.GetAdd(key);
+				e.text = link;
+				e.type = LINK;
+			}
+			if(p.Id("IGNORED")) {
+				DocKey key;
+				p.PassChar('(');
+				if(!ReadCode(p, key)) return false;
+				p.PassChar(')');
+				Entry& e = pk.GetAdd(key);
+				e.text.Clear();
+				e.type = IGNORED;
+			}
+		}
+		return true;
+	}
+	catch(CParser::Error) {
+		return false;
+	}
+}
+
+bool DocDir::LoadDir(const String& package)
+{
+	ArrayMap<DocKey, Entry>& p = dir.GetAdd(package);
+	p.Clear();
+	LoadLinks(package);
+	FileIn in(DocFile(package, "dir.h"));
+	int q = 0;
+	String d[3];
+	while(!in.IsEof()) {
+		String l = in.GetLine();
+		if(memcmp(l, "#include ", 9) == 0) {
+			const char *b = strchr(l, '/');
+			if(!b) return false;
+			const char *e = strchr(b + 1, '\"');
+			if(!e) return false;
+			String fn = String(b + 1, e);
+			e = strchr(e, '/');
+			if(!e || e[1] != '/') return false;
+			e += 2;
+			int type = NORMAL;
+			if(*e == '*') {
+				type = EXTERNAL;
+				e++;
+			}
+			Entry& w = p.GetAdd(DocKey(d[2], d[1], d[0], LNGFromText(e)));
+			w.text = fn;
+			w.type = type;
+			q = 0;
+		}
+		if(l[0] == '/' && l[1] == '/') {
+			if(q >= 3) return false;
+			d[q] = l.Mid(2);
+			q++;
+		}
+	}
+	return true;
+}
+
+int DocDir::ReadDocHeader(const char *filename, DocKey& key)
+{
+	FileIn in(filename);
+	if(!in) return -1;
+	String l = in.GetLine();
+	CParser p(l);
+	if(!p.Id("ITEM") || !p.Char('(') || !ReadCode(p, key)) return -1;
+	p.Char(')');
+	if(p.Id("EXTERNAL"))
+		return EXTERNAL;
+	return NORMAL;
+}
+
+void DocDir::RebuildDir(const String& package)
+{
+	FindFile ff(DocFile(package, "*.dpp"));
+	Progress pi("Rebuilding " + package + " doc directory %d");
+	ArrayMap<DocKey, Entry>& p = dir.GetAdd(package);
+	p.Clear();
+	LoadLinks(package);
+	while(ff) {
+		DocKey key;
+		pi.Step();
+		int q = ReadDocHeader(DocFile(package, ff.GetName()), key);
+		if(q >= 0) {
+			Entry& w = p.GetAdd(key);
+		 	w.text = ff.GetName();
+		 	w.type = q;
+		}
+		ff.Next();
+	}
+	SaveDir(package);
+}
+
+void DocDir::Refresh(const String& package)
+{
+	FindFile ff(DocFile(package, "dir.h"));
+	if(!ff) {
+		RebuildDir(package);
+		return;
+	}
+	FileTime dirtime = ff.GetLastWriteTime();
+	ff.Search(DocFile(package, "links"));
+	if(ff && ff.GetLastWriteTime() > dirtime) {
+		RebuildDir(package);
+		return;
+	}
+	const ArrayMap<DocKey, Entry>& p = dir.GetAdd(package);
+	Index<String> dfn;
+	for(int i = 0; i < p.GetCount(); i++)
+		if(p[i].type == NORMAL || p[i].type == EXTERNAL)
+			dfn.Add(p[i].text);
+	ff.Search(DocFile(package, "*.dpp"));
+	int count = 0;
+	while(ff) {
+		DocKey key;
+		if(dfn.Find(ff.GetName()) >= 0)
+			if(ff.GetLastWriteTime() > dirtime) {
+				RebuildDir(package);
+				return;
+			}
+			else
+				count++;
+		else
+		if(ReadDocHeader(DocFile(package, ff.GetName()), key) >= 0) {
+			RebuildDir(package);
+			return;
+		}
+		ff.Next();
+	}
+	if(count != dfn.GetCount())
+		RebuildDir(package);
+}
+
+int CharFilterLNG_(int c)
+{
+	return c == '-' ? '_' : c;
+}
+
+String DocDir::GetAddFileName(const String& package, const DocKey& key, int type)
+{
+	Entry& w = dir.GetAdd(package).GetAdd(key);
+	String& fn = w.text;
+	w.type = type;
+	if(!IsEmpty(fn)) return fn;
+	String nm = key.nameing + '_' + key.nesting + '_' + key.item;
+	String n;
+	const char *s = nm;
+	while(*s && n.GetLength() < 30)
+		if(iscid(*s))
+			n.Cat(*s++);
+		else {
+			n.Cat('_');
+			while(*s && !iscid(*s))
+				s++;
+		}
+	n << '_' << LNGAsText(key.lang);
+	int i = 0;
+	for(;;) {
+		fn = n + FormatIntAlpha(i) + ".dpp";
+		if(!FindFile(DocFile(package, fn)))
+			return fn;
+		i++;
+	}
+}
+
+bool DocDir::GetFileName(const DocKey& key, String& fn, String& package)
+{
+	dword hv = GetHashValue(key);
+	for(int i = 0; i < dir.GetCount(); i++) {
+		const ArrayMap<DocKey, Entry>& p = dir[i];
+		int q = p.Find(key, hv);
+		if(q >= 0) {
+			fn = p[q].text;
+			package = dir.GetKey(i);
+			return true;
+		}
+	}
+	return false;
+}
+
+void DocDir::RemoveOtherKey(const DocKey& key, int t1, int t2)
+{
+	dword hv = GetHashValue(key);
+	for(int i = 0; i < dir.GetCount(); i++) {
+		int q = dir[i].Find(key, hv);
+		if(q >= 0) {
+			Entry& e = dir[i][q];
+			if(e.type != t1 && e.type != t2) {
+				if(e.type == NORMAL || e.type == EXTERNAL)
+					DeleteFile(DocFile(dir.GetKey(i), dir[i][q].text));
+				dir[i].Remove(q);
+			}
+			SaveDir(dir.GetKey(i));
+			SaveLinks(dir.GetKey(i));
+		}
+	}
+}
+
+void DocDir::Remove(const DocKey& k)
+{
+	RemoveOtherKey(k, UNDOCUMENTED, UNDOCUMENTED);
+}
+
+void DocDir::SaveText(const String& package, const DocKey& k, const String& text, bool external)
+{
+	RemoveOtherKey(k, NORMAL, EXTERNAL);
+	CreateDocDir(package);
+	String fn = DocFile(package, GetAddFileName(package, k, external ? EXTERNAL : NORMAL));
+	FileOut out(fn);
+	out << "ITEM(" << AsCode(k) << ")";
+	if(external)
+		out << " EXTERNAL";
+	out << "\r\n";
+	int n = 0;
+	for(;;) {
+		int m = min(text.GetLength() - n, 2048);
+		if(m == 0) break;
+		out << "TEXT(\r\n\t";
+		out << AsCString(~text + n, ~text + n + m, 64, "\t") << "\r\n";
+		out << ")\r\n";
+		n += m;
+	}
+	out << "END_ITEM\r\n";
+	SaveDir(package);
+	SaveLinks(package);
+}
+
+void DocDir::SaveLink(const String& package, const DocKey& key, const String& text)
+{
+	RemoveOtherKey(key, LINK);
+	Entry& w = dir.GetAdd(package).GetAdd(key);
+	w.text = text;
+	w.type = LINK;
+	SaveLinks(package);
+}
+
+void DocDir::Ignore(const String& package, const DocKey& key)
+{
+	RemoveOtherKey(key, IGNORED);
+	Entry& w = dir.GetAdd(package).GetAdd(key);
+	w.type = IGNORED;
+	SaveLinks(package);
+}
+
+DocDir::Entry *DocDir::Find(const DocKey& key, String& package) const
+{
+	dword hv = GetHashValue(key);
+	for(int i = 0; i < dir.GetCount(); i++) {
+		int q = dir[i].Find(key, hv);
+		if(q >= 0) {
+			package = dir.GetKey(i);
+			return const_cast<Entry *>(&dir[i][q]);
+		}
+	}
+	return NULL;
+}
+
+DocDir::Entry *DocDir::Find(const DocKey& key) const
+{
+	String dm;
+	return Find(key, dm);
+}
+
+int DocDir::GetStatus(const DocKey& key)
+{
+	DocDir::Entry *e = Find(key);
+	return e ? e->type : UNDOCUMENTED;
+}
+
+int DocDir::GetStatus(const String& nameing, const String& nesting, const String& item,
+                      int lang)
+{
+	return GetStatus(DocKey(nameing, nesting, item, lang));
+}
+
+String DocDir::GetFilePath(const DocKey& key) const
+{
+	String package;
+	Entry *e = Find(key, package);
+	if(!e || e->type != NORMAL && e->type != EXTERNAL) return Null;
+	return DocFile(package, e->text);
+}
+
+String DocDir::GetPackage(const DocKey& key) const
+{
+	String package;
+	Entry *e = Find(key, package);
+	return e ? package : Null;
+}
+
+String DocDir::GetText(const DocKey& key) const
+{
+	String s = LoadFile(GetFilePath(key));
+	if(s.IsEmpty()) return Null;
+	CParser p(s);
+	DocKey dummy;
+	if(!p.Id("ITEM") || !p.Char('(') || !ReadCode(p, dummy)) return "Invalid file";
+	p.Char(')');
+	p.Id("EXTERNAL");
+	String text;
+	while(p.Id("TEXT")) {
+		p.Char('(');
+		if(p.IsString())
+			text.Cat(p.ReadString());
+		else
+			return "Invalid file";
+		p.Char(')');
+	}
+	return p.Id("END_ITEM") ? text : "Invalid file";
+}
+
+String DocDir::GetLink(const DocKey& key) const
+{
+	DocDir::Entry *e = Find(key);
+	if(!e) return Null;
+	return e->type == LINK ? e->text : Null;
+}
+
+bool Contains(const DocSet& r, const DocKey& key)
+{
+	int q = r.Find(key.nameing);
+	if(q < 0) return false;
+	int w = r[q].Find(key.nesting);
+	if(w < 0) return false;
+	return r[q][w].Find(key.item) >= 0;
+}
+
+bool Contains(const String& big, const String& part)
+{
+	if(part.GetLength() > big.GetLength()) return false;
+	const char *s = big;
+	const char *e = s + big.GetLength() - part.GetLength();
+	int l = part.GetLength();
+	while(s <= e) {
+		if(memcmp(s, part, l) == 0)
+			return true;
+		s++;
+	}
+	return false;
+}
+
+DocSet DocDir::Select(const DocQuery& query)
+{
+	DocSet r;
+	CppBase base;
+	int i;
+	for(i = 0; i < doc_base.GetCount(); i++) {
+		String nameing = doc_base.GetKey(i);
+		CppNamespace& mm = doc_base[i];
+		for(int i = 0; i < mm.GetCount(); i++) {
+			String nesting = mm.GetKey(i);
+			CppNest& nn = mm[i];
+			for(int i = 0; i < nn.GetCount(); i++) {
+				CppItem& q = nn[i];
+				String item = nn.GetKey(i);
+				if((query.name.IsEmpty() || query.name == q.name) &&
+				   (query.text.IsEmpty() || Contains(item, query.text)) &&
+				   (query.package.IsEmpty() || q.package.CompareNoCase(query.package) == 0) &&
+				   (query.header.IsEmpty() || q.file.CompareNoCase(query.header) == 0)) {
+					String pk;
+					const Entry *e = Find(DocKey(nameing, nesting, item, query.lang), pk);
+					int st = e ? e->type : UNDOCUMENTED;
+					if((query.undocumented || e) && (st != IGNORED || query.ignored)) {
+						DocItem& a = r.GetAdd(nameing).GetAdd(nesting).GetAdd(item);
+						a.cppitem = &q;
+						a.item = item;
+						a.status = st;
+						a.package = e ? pk : q.package;
+					}
+				}
+			}
+		}
+	}
+	for(i = 0; i < dir.GetCount(); i++) {
+		ArrayMap<DocKey, Entry>& pk = dir[i];
+		String package = dir.GetKey(i);
+		for(int j = 0; j < pk.GetCount(); j++) {
+			const DocKey& k = pk.GetKey(j);
+			if(k.lang == query.lang &&
+			   query.name.IsEmpty() &&
+			   (query.text.IsEmpty() || Contains(k.item, query.text)) &&
+			   (query.package.IsEmpty() || package.CompareNoCase(query.package) == 0) &&
+			   query.header.IsEmpty() &&
+			   !Contains(r, k)) {
+				DocItem& a = r.GetAdd(k.nameing).GetAdd(k.nesting).GetAdd(k.item);
+				a.cppitem = NULL;
+				a.item = k.item;
+				int st = pk[j].type;
+				a.status = st == NORMAL ? OBSOLETE : st == LINK ? OBSOLETELINK : st;
+				a.package = package;
+			}
+		}
+	}
+	return r;
+}
+
+DocDir doc_dir;
diff --git a/uppsrc/Docedit/Docedit.cpp b/uppsrc/Docedit/Docedit.cpp
new file mode 100644
index 000000000..b0ce4a873
--- /dev/null
+++ b/uppsrc/Docedit/Docedit.cpp
@@ -0,0 +1,541 @@
+#include <DocEdit/DocEdit.h>
+
+int  PosOf(const String& str, const String& sub)
+{
+	if(sub.GetLength() > str.GetLength()) return -1;
+	const char *s = str;
+	const char *e = s + str.GetLength() - sub.GetLength();
+	while(s <= e) {
+		if(memcmp(s, sub, sub.GetLength()) == 0)
+			return s - ~str;
+		s++;
+	}
+	return -1;
+}
+
+void DocBrowser::Nameing()
+{
+	nesting.Clear();
+	if(IsNull(nameing)) {
+		Nesting();
+		return;
+	}
+	const VectorMap<String, ArrayMap<String, DocItem> >& ns = set.Get(~nameing);
+	nesting.Clear();
+	for(int i = 0; i < ns.GetCount(); i++)
+		nesting.Add(ns.GetKey(i));
+	nesting.Sort(0, CompareNests);
+	nesting.GoBegin();
+	Nesting();
+}
+
+void DocBrowser::Nesting()
+{
+	item.Clear();
+	if(!nesting.IsCursor()) {
+		Item();
+		return;
+	}
+	LoadItems(set, ~nameing, nesting.GetKey(), item);
+	if(sort)
+		item.Sort(CompareItems);
+	item.GoBegin();
+	edit.Enable(item.IsCursor());
+}
+
+void DocBrowser::Item()
+{
+	Flush();
+	EnterItem();
+}
+
+void DocBrowser::EnterItem()
+{
+	String lbl;
+	target = current = DocKey(~nameing, nesting.GetKey(), item.GetKey(), (int)~lang);
+	if(doc_dir.GetStatus(current) == DocDir::LINK)
+		if(!ParseLink(doc_dir.GetLink(current), target, lbl)) {
+		   View();
+		   view.SetQTF("[R9&&&=@3* Invalid link");
+		   return;
+		}
+	String txt = LoadFile(CommonPath("dppstyles.qtf")) + doc_dir.GetText(target);
+	package <<= doc_dir.GetPackage(target);
+	if(edit.IsShown()) {
+		edit.SetPage(Size(3968, INT_MAX));
+		edit.SetQTF(txt);
+		edit.SetFocus();
+		String p = doc_dir.GetFilePath(target);
+		if(!IsNull(p)) {
+			int q = editstate.Find(p);
+			if(q >= 0) {
+				FileInfo& fi = editstate[q];
+				if(fi.time == GetFileTime(p)) {
+					edit.SetPickUndoInfo(fi.info);
+					fi.time = Time(1, 1, 1);
+				}
+			}
+		}
+		int q = posinfo.Find(current);
+		if(q >= 0)
+			edit.SetPosInfo(posinfo[q]);
+		else
+		if(!lbl.IsEmpty())
+			edit.GotoLabel(lbl);
+		edit.ClearModify();
+	}
+	else {
+		view.SetQTF(txt);
+		if(!lbl.IsEmpty())
+			view.GotoLabel(lbl);
+	}
+	trect.Color(SLtBlue);
+	title.SetInk(SWhite);
+	String s = " dpp://" + current.nameing + "/" + current.nesting + "/" + current.item;
+	switch(GetCurrentStatus()) {
+	case DocDir::UNDOCUMENTED:
+		trect.Color(SGray);
+		break;
+	case DocDir::LINK:
+		s << " -> " << target.nameing + "/" + target.nesting + "/" + target.item;
+		trect.Color(SCyan);
+		break;
+	case DocDir::OBSOLETE:
+		trect.Color(SRed);
+		break;
+	case DocDir::EXTERNAL:
+		trect.Color(SGreen);
+		break;
+	}
+	title = s;
+	int status = item.Get(4);
+	int kind = item.Get(2);
+	String name = item.Get(1);
+	String text = item.Get(0);
+	String post;
+	if(status == DocDir::EXTERNAL)
+		post = " (external)";
+	if(!name.IsEmpty() && status != DocDir::EXTERNAL) {
+		int q = PosOf(text, name);
+		if(q >= 0) {
+			if(current.nesting.IsEmpty() || kind == STRUCT || kind == STRUCTTEMPLATE)
+				Title(text.Mid(0, q) + current.nameing + text.Mid(q) + post);
+			else
+				Title(text.Mid(0, q) + current.nameing + current.nesting + "::" + text.Mid(q)
+				      + post);
+			return;
+		}
+	}
+	Title(current.nameing + "::" + current.nesting + "::" + text + post);
+}
+
+void DocBrowser::Flush()
+{
+	if(edit.IsShown() && target && item.IsCursor()) {
+		posinfo.GetAdd(current) = edit.GetPosInfo();
+		if(edit.IsModified()) {
+			DocItem& im = set.Get(target.nameing).Get(target.nesting).Get(target.item);
+			const RichText& txt = edit.Get();
+			SaveFile(CommonPath("dppstyles.qtf"), StylesAsQTF(txt));
+			if(edit.GetLength()) {
+				doc_dir.SaveText(GetItemPackage(), target, BodyAsQTF(txt),
+				                 doc_dir.GetStatus(target) == DocDir::EXTERNAL);
+				im.status = DocDir::NORMAL;
+			}
+			else {
+				doc_dir.Remove(target);
+				im.status = DocDir::UNDOCUMENTED;
+			}
+			String p = doc_dir.GetFilePath(target);
+			FileInfo& fi = editstate.GetAdd(p);
+			fi.time = GetFileTime(p);
+			fi.info = edit.PickUndoInfo();
+		}
+		target.Clear();
+		if(edit.IsModified())
+			ReloadItems();
+		edit.ClearModify();
+	}
+}
+
+void DocBrowser::Query()
+{
+	DocQuery q;
+	q.lang = (int)~lang;
+	q.undocumented = q.normal = q.external = q.obsolete = q.ignored = false;
+	switch(query.status) {
+	case 4:
+		q.ignored = true;
+	case 0:
+		q.undocumented = q.normal = q.external = q.obsolete = true;
+		break;
+	case 1:
+		q.undocumented = true;
+		break;
+	case 2:
+		q.obsolete = true;
+		break;
+	case 3:
+		q.ignored = true;
+		break;
+	}
+	q.name = query.name;
+	q.text = query.text;
+	q.header = ~query.header;
+	set = doc_dir.Select(q);
+	nameing.ClearList();
+	for(int i = 0; i < set.GetCount(); i++)
+		nameing.Add(set.GetKey(i));
+	if(nameing.GetCount())
+		nameing.SetIndex(0);
+	Nameing();
+}
+
+void DocBrowser::Select()
+{
+	int c;
+	query.header.ClearList();
+	Vector<String> h = doc_base.GetHeaders();
+	for(int i = 0; i < h.GetCount(); i++)
+		query.header.Add(h[i], GetFileName(h[i]));
+	query.header.Add(Null, "<any>");
+	for(;;) {
+		c = query.Run();
+		if(c == IDCANCEL)
+			break;;
+		if(c == IDYES) {
+			query.status = 0;
+			query.name <<= Null;
+			query.text <<= Null;
+		}
+		if(c == IDOK)
+			break;
+	}
+	query.Close();
+	query.name.AddHistory();
+	query.text.AddHistory();
+	if(c == IDOK)
+		Query();
+}
+
+bool DocBrowser::Key(dword key, int)
+{
+	switch(key) {
+	case K_F6:
+		Select();
+		break;
+	default:
+		return false;
+	}
+	return true;
+}
+
+void DocBrowser::Edit()
+{
+	Flush();
+	edit.Show();
+	view.Hide();
+	EnterItem();
+}
+
+void DocBrowser::View()
+{
+	view.Show();
+	edit.Hide();
+	Item();
+}
+
+void DocBrowser::Sort()
+{
+	sort = !sort;
+	Nesting();
+}
+
+int DocBrowser::GetCurrentStatus()
+{
+	return item.IsCursor() ? doc_dir.GetStatus(current) : Null;
+}
+
+void DocBrowser::ReloadItems()
+{
+	int c = item.GetCursor();
+	int a = item.GetCursorSc();
+	Nesting();
+	if(c >= 0)
+		item.SetCursor(c);
+	item.ScCursor(a);
+}
+
+void DocBrowser::SetCurrentStatus(int status)
+{
+	set.GetAdd(current.nameing).GetAdd(current.nesting).GetAdd(current.item).status = status;
+	ReloadItems();
+}
+
+void DocBrowser::Link()
+{
+	int q = GetCurrentStatus();
+	if(q != DocDir::UNDOCUMENTED && q != DocDir::LINK || !item.IsCursor())
+		return;
+	String pk = GetItemPackage();
+	String h;
+	if(GetCurrentStatus() == DocDir::LINK)
+		h = doc_dir.GetLink(current);
+	if(linkdlg.Perform(set, sort, h, (int)~lang, ~nameing, nesting.GetKey())) {
+		int c = item.GetCursor();
+		item.KillCursor();
+		doc_dir.SaveLink(pk, current, h);
+		item.SetCursor(c);
+		SetCurrentStatus(DocDir::LINK);
+	}
+}
+
+void DocBrowser::Ignore()
+{
+	int q = GetCurrentStatus();
+	if(q != DocDir::UNDOCUMENTED || !item.IsCursor()) return;
+	int c = item.GetCursor();
+	String pk = GetItemPackage();
+	item.KillCursor();
+	doc_dir.Ignore(pk, current);
+	item.SetCursor(c);
+	SetCurrentStatus(DocDir::IGNORED);
+}
+
+void DocBrowser::Delete()
+{
+	int q = GetCurrentStatus();
+	if(q == DocDir::UNDOCUMENTED || !item.IsCursor()) return;
+	int c = item.GetCursor();
+	item.KillCursor();
+	switch(q) {
+	case DocDir::OBSOLETE:
+	case DocDir::OBSOLETELINK:
+		break;
+	default:
+		if(!PromptYesNo("Remove current current ?")) return;
+	}
+	doc_dir.Remove(current);
+	item.SetCursor(c);
+	SetCurrentStatus(DocDir::UNDOCUMENTED);
+}
+
+void DocBrowser::New()
+{
+
+	external.package.Add("Core"); //!!!
+	external.package <<= doc_dir.GetPackage(current);
+	external.nameing <<= ~nameing;
+	external.nesting <<= nesting.GetKey();
+again:
+	if(external.Execute() != IDOK) return;
+	if(IsNull(external.nameing)) {
+		Exclamation("Missing namespace !");
+		goto again;
+	}
+	if(IsNull(external.item)) {
+		Exclamation("Missing item !");
+		goto again;
+	}
+	external.nameing.AddHistory();
+	external.nesting.AddHistory();
+	DocKey k = DocKey(~external.nameing, ~external.nesting, ~external.item, (int)~lang);
+	doc_dir.SaveText(~external.package, k, "", true);
+	Query();
+	nameing <<= k.nameing;
+	Nameing();
+	if(nesting.FindSetCursor(k.nesting))
+		item.FindSetCursor(k.item);
+}
+
+void DocBrowser::EditLink(String& s)
+{
+	linkdlg.Perform(set, sort, s, (int)~lang, ~nameing, nesting.GetKey());
+}
+
+void DocBrowser::FollowLink(const String& s)
+{
+	if(memcmp(s, "dpp://", 6)) {
+		Exclamation("Not a dpp link !");
+		return;
+	}
+	Vector<String> l = Split(~s + 6, '/', false);
+	if(l.GetCount() != 3) {
+		Exclamation("Invalid link !");
+		return;
+	}
+	if(nameing.HasKey(l[0])) {
+		nameing.SetData(l[0]);
+		Nameing();
+		if(nesting.FindSetCursor(l[1])) {
+			String n = l[2];
+			String l;
+			int q = n.Find('#');
+			if(q >= 0) {
+				l = n.Mid(q + 1);
+				n = n.Mid(0, q);
+			}
+			if(item.FindSetCursor(n))
+				return;
+		}
+	}
+	Exclamation("Link not found");
+}
+
+void DocBrowser::BrowseMenu(Bar& bar)
+{
+	bar.Add("Select..", THISBACK(Select))
+	   .Key(K_F6);
+	bar.Separator();
+	bar.Add("Edit", THISBACK(Edit))
+	   .Radio(edit.IsShown())
+	   .Key(K_CTRL_O);
+	bar.Add("View", THISBACK(View))
+	   .Radio(view.IsShown())
+	   .Key(edit.IsShown() ? K_ESCAPE : 0);
+	bar.Separator();
+	bar.Add("Sort by types and names", THISBACK(Sort))
+	   .Check(sort);
+	bar.Separator();
+}
+
+void DocBrowser::ItemMenu(Bar& bar)
+{
+	int q = GetCurrentStatus();
+	bar.Add(q == DocDir::UNDOCUMENTED || q == DocDir::LINK,
+	        "Link..", THISBACK(Link))
+	   .Key(K_CTRL_L);
+	bar.Add(q == DocDir::UNDOCUMENTED, "Ignore", THISBACK(Ignore))
+	   .Key(K_CTRL_I);
+	bar.Add(q != DocDir::UNDOCUMENTED, "Delete", THISBACK(Delete))
+	   .Key(K_CTRL_DELETE);
+	bar.Add("New..", THISBACK(New));
+}
+
+void DocBrowser::MainMenu(Bar& bar)
+{
+	bar.Add("Browse", THISBACK(BrowseMenu));
+	bar.Add("Item", THISBACK(ItemMenu));
+}
+
+void DocBrowser::EditBar(Bar& bar)
+{
+	edit.StyleTool(bar);
+	bar.Gap();
+	edit.FontTools(bar);
+	bar.Gap();
+	edit.InkTool(bar);
+	edit.PaperTool(bar);
+	bar.Gap();
+	edit.LanguageTool(bar);
+	edit.SpellCheckTool(bar);
+	bar.Break();
+
+	edit.HyperlinkTool(bar, 300);
+	bar.Gap();
+	edit.LabelTool(bar);
+	bar.Gap();
+	edit.IndexEntryTool(bar);
+	bar.Break();
+
+	edit.ParaTools(bar);
+	bar.Gap();
+	edit.EditTools(bar);
+	bar.Gap();
+	edit.PrintTool(bar);
+}
+
+void DocBrowser::SetEditBar()
+{
+	editbar.Set(THISBACK(EditBar));
+}
+
+void DocBrowser::SetMainBar()
+{
+	menu.Set(THISBACK(MainMenu));
+}
+
+void DocBrowser::Close()
+{
+	Flush();
+	TopWindow::Close();
+}
+
+DocBrowser::DocBrowser()
+{
+	Zoomable().Sizeable().Icon(DppImg::SmallIcon);
+	ni_split.Vert(nesting, item);
+	ni_split.SetPos(3000);
+	int q = nameing.GetMinSize().cy;
+	larea.Add(nameing.HSizePos().TopPos(0, q));
+	larea.Add(ni_split.HSizePos().VSizePos(q + 4, 0));
+	rarea.AddFrame(trect.Height(q + 4));
+	trect.SetFrame(ThinInsetFrame());
+	trect.Add(title.SizePos());
+	trect.Add(package.RightPos(0, 100).VSizePos());
+	rarea.Add(view.SizePos());
+	rarea.Add(edit.SizePos());
+	vi_split.Horz(larea, rarea);
+	vi_split.SetPos(3000);
+	Add(vi_split);
+	nesting.AddColumn().SetDisplay(Single<DocNestDisplay>());
+	nesting.NoHeader().NoGrid();
+	nameing <<= THISBACK(Nameing);
+	nesting.WhenEnterRow = THISBACK(Nesting);
+	InitItemArray(item);
+	item.WhenEnterRow = THISBACK(Item);
+	item.WhenKillCursor = THISBACK(Flush);
+	item.WhenBar = THISBACK(ItemMenu);
+	item.WhenLeftDouble = THISBACK(Edit);
+
+	view.Show();
+	edit.Hide();
+	edit.SetPage(Size(3968, INT_MAX));
+
+	CtrlLayoutOKCancel(query, "Select");
+	query.clear <<= query.Breaker(IDYES);
+	query.status = 0;
+
+	AddFrame(menu);
+	SetMainBar();
+	menu.Ctrl::Add(lang.RightPos(10, 70).TopPos(0, EditField::GetStdHeight()));
+	lang.Add((int)LNG_ENGLISH, "EN-US");
+	lang.Add((int)LNGFromText("EN-GB"), "EN-GB");
+	lang.Add((int)LNGFromText("DE-DE"), "DE-DE");
+	lang.Add((int)LNG_CZECH, "CS-CZ");
+	lang <<= (int)LNGFromText("EN-US");
+	lang <<= THISBACK(Query);
+
+	edit.InsertFrame(1, editbar);
+	edit.WhenRefreshBar = THISBACK(SetEditBar);
+	edit.WhenHyperlink = THISBACK(EditLink);
+
+	view.WhenLink = THISBACK(FollowLink);
+
+	sort = false;
+
+	CtrlLayoutOKCancel(external, "New external item");
+	external.ActiveFocus(external.item);
+}
+
+void AppMain()
+{
+	doc_base.ignore.Add("pick_");
+	FindFile ff("f:/uppsrc/Core/*.h");
+	while(ff) {
+		String fn = String("f:/uppsrc/Core/") + ff.GetName();
+		try {
+			doc_base.ParseFile(fn, "Core");
+		}
+		catch(Parser::Error e) {
+			LOG(e);
+		}
+		ff.Next();
+	}
+	doc_dir.Refresh("Core");
+	TimeStop();
+	RDUMP(TimeStop());
+	DocBrowser d;
+	d.Query();
+	d.Run();
+}
diff --git a/uppsrc/Docedit/Docedit.h b/uppsrc/Docedit/Docedit.h
new file mode 100644
index 000000000..650f15e89
--- /dev/null
+++ b/uppsrc/Docedit/Docedit.h
@@ -0,0 +1,241 @@
+#include <RichEdit/RichEdit.h>
+#include <docpp/docpp.h>
+
+#define IMAGECLASS DppImg
+#define IMAGEFILE  <Docedit/Docedit.iml>
+#include <Draw/iml_header.h>
+
+// before placed to IDE...
+
+String SourcePath(const String& package, const String& name);
+String PackageDirectory(const String& name);
+String CommonPath(const String& filename);
+
+// ------
+
+struct DocBase : public CppBase {
+	Vector<String> DocBase::ignore;
+	Vector<String> package;
+
+	void RemoveFile(const String& file);
+	void ParseFile(const String& file, const String& package) throw(Parser::Error);
+	void RefreshFile(const String& file, const String& package) throw(Parser::Error);
+	Vector<String> GetHeaders();
+	Vector<String> GetPackages();
+};
+
+extern DocBase doc_base;
+
+Time   GetFileTime(const char *path);
+String DocFile(const String& package, const String& name);
+
+struct DocKey {
+	String nameing;
+	String nesting;
+	String item;
+	dword  lang;
+
+	bool operator==(const DocKey& b) const;
+	dword GetHashValue(const DocKey& k);
+	operator bool() const  { return item.GetLength(); }
+	void  Clear()          { item.Clear(); nesting.Clear(); nameing.Clear(); lang = 0; }
+
+	DocKey() {}
+	DocKey(const String& m, const String& n, const String& s, dword l)
+	   : nameing(m), nesting(n), item(s), lang(l) {}
+};
+
+dword GetHashValue(const DocKey& k);
+
+struct DocQuery {
+	String name, text, package, header;
+	bool   undocumented, normal, external, obsolete, ignored;
+	dword  lang;
+};
+
+struct DocItem {
+	CppItem *cppitem;
+	String   item;
+	int      status;
+	String   package;
+};
+
+typedef VectorMap<String, VectorMap<String, ArrayMap<String, DocItem> > > DocSet;
+
+class DocDir {
+	struct Entry {
+		int    type;
+		String text;
+	};
+	VectorMap<String, ArrayMap<DocKey, Entry> > dir;
+
+	int    ReadDocHeader(const char *filename, DocKey& key);
+	String GetAddFileName(const String& package, const DocKey& key, int type);
+	bool   GetFileName(const DocKey& key, String& fn, String& package);
+
+	bool   LoadLinks(const String& package);
+	void   SaveLinks(const String& package) const;
+
+	void   RemoveOtherKey(const DocKey& k, int t1, int t2 = UNDOCUMENTED);
+	Entry *Find(const DocKey& key, String& package) const;
+	Entry *Find(const DocKey& key) const;
+
+public:
+	enum {
+		NORMAL, EXTERNAL, LINK, IGNORED,
+		UNDOCUMENTED = -1, OBSOLETE = -2, OBSOLETELINK = -3
+	};
+
+	bool   LoadDir(const String& package);
+	void   SaveDir(const String& package) const;
+
+	void   RebuildDir(const String& package);
+
+	void   Refresh(const String& package);
+
+	int    GetStatus(const DocKey& key);
+	int    GetStatus(const String& nameing, const String& nesting, const String& item, int lang);
+
+	String GetFilePath(const DocKey& key) const;
+	String GetPackage(const DocKey& key) const;
+	String GetText(const DocKey& key) const;
+	String GetLink(const DocKey& key) const;
+
+	void   Remove(const DocKey& key);
+	void   SaveText(const String& package, const DocKey& key, const String& text, bool external);
+	void   SaveLink(const String& package, const DocKey& key, const String& text);
+	void   Ignore(const String& package, const DocKey& key);
+
+	DocSet Select(const DocQuery& query);
+};
+
+bool ParseLink(const String& link, DocKey& key, String& label);
+
+extern DocDir doc_dir;
+
+#define LAYOUTFILE "DocEdit.lay"
+#include <CtrlCore/lay.h>
+
+struct DocItemDisplay : public Display
+{
+	virtual void Paint(Draw& w, const Rect& r, const Value& q,
+		               Color _ink, Color paper, dword style) const;
+};
+
+struct DocNestDisplay : public Display
+{
+	virtual void Paint(Draw& w, const Rect& r, const Value& q,
+		               Color _ink, Color paper, dword style) const;
+};
+
+void InitItemArray(ArrayCtrl& item);
+void LoadItems(const DocSet& set, const String& nameing, const String& nesting, ArrayCtrl& item);
+int  PosOf(const String& s, const String& subs);
+bool IsCppKeyword(const String& id);
+int  CompareNests(const Value& v1, const Value& v2);
+int  CompareItems(const Vector<Value>& row1, const Vector<Value>& row2);
+
+struct DocLinkDlg : public WithLinkLayout<TopWindow> {
+	const DocSet *set;
+	bool          sort;
+	dword         lang;
+
+	void   Nameing();
+	void   Nesting();
+	void   Item();
+	bool   Perform(const DocSet& set, bool sort, String& link, int lang,
+	               const String& nameing = Null, const String& nesting = Null);
+	void   Label();
+	String Get();
+
+	typedef DocLinkDlg CLASSNAME;
+
+	DocLinkDlg();
+};
+
+class DocBrowser : public TopWindow {
+public:
+	virtual bool Key(dword key, int count);
+	virtual void Close();
+
+private:
+	struct FileInfo {
+		Time               time;
+		RichEdit::UndoInfo info;
+	};
+
+	ArrayMap<String, FileInfo>          editstate;
+	ArrayMap<DocKey, RichEdit::PosInfo> posinfo;
+
+	DropList     nameing;
+	StaticRect   larea, rarea;
+	ArrayCtrl    nesting;
+	ArrayCtrl    item;
+	Splitter     ni_split;
+	Splitter     vi_split;
+
+	FrameTop<StaticRect> trect;
+	Label                title;
+	DataPusher           package;
+	RichTextView         view;
+	RichEdit             edit;
+
+	DropList             lang;
+
+	MenuBar      menu;
+	ToolBar      tool;
+
+	ToolBar      editbar;
+
+	WithQueryLayout<TopWindow> query;
+	DocSet       set;
+	DocKey       current, target;
+
+	DocLinkDlg   linkdlg;
+
+	bool         sort;
+
+	WithExternalLayout<TopWindow> external;
+
+	void   Nameing();
+	void   Nesting();
+	void   Item();
+	void   EnterItem();
+
+	void   ReloadItems();
+
+	DocKey Key();
+	void   Flush();
+	int    GetCurrentStatus();
+	void   SetCurrentStatus(int status);
+	String GetItemPackage()      { return item.Get(7); }
+
+	void EditLink(String& s);
+
+	void Edit();
+	void View();
+	void Sort();
+	void Select();
+	void Link();
+	void Ignore();
+	void Delete();
+	void New();
+
+	void FollowLink(const String& s);
+
+	void SetMainBar();
+
+	void MainMenu(Bar& bar);
+	void ItemMenu(Bar& bar);
+	void BrowseMenu(Bar& bar);
+
+	void EditBar(Bar& bar);
+	void SetEditBar();
+
+public:
+	typedef DocBrowser CLASSNAME;
+
+	void Query();
+
+	DocBrowser();
+};
diff --git a/uppsrc/Docedit/Docedit.iml b/uppsrc/Docedit/Docedit.iml
new file mode 100644
index 000000000..412cf1036
--- /dev/null
+++ b/uppsrc/Docedit/Docedit.iml
@@ -0,0 +1,309 @@
+IMAGE_BEGIN(Variable)
+	IMAGE_SCAN("��\0\0\0")
+	IMAGE_SCAN("‚\0\0\0�\0\377\0�\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\0\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\0\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\0�\0\0\0�\0\377\0\1\0\0\0")
+	IMAGE_SCAN("�\5\0\0\0\0\377\0\0\0\0\377\377\377\0\0\0�\0\377\0\1\0\0\0")
+	IMAGE_SCAN("�\5\0\0\0\0\377\0\0\0\0\377\377\377\0\0\0�\0\377\0\1\0\0\0")
+	IMAGE_SCAN("�\5\0\0\0\0\377\0\0\0\0\377\377\377\0\0\0�\0\377\0\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\0�\0\0\0�\0\377\0\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\0\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\0\1\0\0\0")
+	IMAGE_SCAN("‚\0\0\0�\0\377\0�\0\0\0")
+	IMAGE_SCAN("��\0\0\0")
+IMAGE_PACKED(Variable, "\2\20\0\0\0\20\0\0\0\0\0\0\0\377\377\377\377\0\0\0\0")
+IMAGE_BEGIN(SmallIcon)
+	IMAGE_SCAN("�\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\1\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\3\0\0\0\377\377\0\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("�\3\0\0\0\0\377\0\0\0\0�\3\0\0\0\377\377\0\0\0\0�\3\0\0\0\377\0\377\0\0\0")
+	IMAGE_SCAN("�\3\0\0\0\0\377\0\0\0\0�\3\0\0\0\377\377\0\0\0\0�\3\0\0\0\377\0\377\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\0\1\0\0\0�\377\377\0\1\0\0\0�\377\0\377\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\0\1\0\0\0�\377\377\0\1\0\0\0�\377\0\377\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\0\377\0\1\0\0\0�\377\377\0\1\0\0\0�\377\0\377\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\0\377\0\1\0\0\0�\377\377\0\1\0\0\0�\377\0\377\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\0\1\0\0\0�\377\377\0\1\0\0\0�\377\0\377\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\0\1\0\0\0�\377\377\0\1\0\0\0�\377\0\377\1\0\0\0")
+	IMAGE_SCAN("�\3\0\0\0\0\377\0\0\0\0�\3\0\0\0\377\377\0\0\0\0�\3\0\0\0\377\0\377\0\0\0")
+	IMAGE_SCAN("�\3\0\0\0\0\377\0\0\0\0�\3\0\0\0\377\377\0\0\0\0�\3\0\0\0\377\0\377\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\1\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\1\0\0\0�\1\0\0\0")
+IMAGE_PACKED(SmallIcon, "\2\20\0\0\0\20\0\0\0\0\0\0\0\377\377\377\377\0\0\0\0")
+IMAGE_BEGIN(InstanceVariable)
+	IMAGE_SCAN("��\0\0\0")
+	IMAGE_SCAN("��\0\0\0�\0\377\0�\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\377\377\0\1\0\0\0�\0\377\0\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\377\377\0�\0\0\0�\0\377\0\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\377\377\0�\0\0\0�\0\377\0�\0\0\0�\0\377\0\1\0\0\0")
+	IMAGE_SCAN("��\0\0\0�\5\0\0\0\0\377\0\0\0\0\377\377\377\0\0\0�\0\377\0\1\0\0\0")
+	IMAGE_SCAN("�\5\0\0\0\0\377\0\0\0\0\377\377\377\0\0\0�\0\377\0\1\0\0\0")
+	IMAGE_SCAN("�\5\0\0\0\0\377\0\0\0\0\377\377\377\0\0\0�\0\377\0\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\0�\0\0\0�\0\377\0\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\0\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\0\1\0\0\0")
+	IMAGE_SCAN("‚\0\0\0�\0\377\0�\0\0\0")
+	IMAGE_SCAN("��\0\0\0")
+IMAGE_PACKED(InstanceVariable, "\2\20\0\0\0\20\0\0\0\0\0\0\0\377\377\377\377\0\0\0\0")
+IMAGE_BEGIN(ClassVariable)
+	IMAGE_SCAN("��\0\0\0")
+	IMAGE_SCAN("‚\0\0\0�\0\377\0�\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\0\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\0\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\0�\0\0\0�\0\377\0\1\0\0\0")
+	IMAGE_SCAN("�\5\0\0\0\0\377\0\0\0\0\377\377\377\0\0\0�\0\377\0\1\0\0\0")
+	IMAGE_SCAN("�\5\0\0\0\0\377\0\0\0\0\377\377\377\0\0\0�\0\377\0\1\0\0\0")
+	IMAGE_SCAN("��\0\0\0�\5\0\0\0\0\377\0\0\0\0\377\377\377\0\0\0�\0\377\0\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\377\377\0�\0\0\0�\0\377\0�\0\0\0�\0\377\0\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\377\377\0�\0\0\0�\0\377\0\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\377\377\0\1\0\0\0�\0\377\0\1\0\0\0")
+	IMAGE_SCAN("��\0\0\0�\0\377\0�\0\0\0")
+	IMAGE_SCAN("��\0\0\0")
+IMAGE_PACKED(ClassVariable, "\2\20\0\0\0\20\0\0\0\0\0\0\0\377\377\377\377\0\0\0\0")
+IMAGE_BEGIN(Function)
+	IMAGE_SCAN("�\1\0\0\0")
+	IMAGE_SCAN("ɂ\0\0\0")
+	IMAGE_SCAN("Ȃ\0\0\0")
+	IMAGE_SCAN("�\3\0\0\0\0\377\377\0\0\0")
+	IMAGE_SCAN("�\3\0\0\0\0\377\377\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\377\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\377�\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\377\1\0\0\0")
+	IMAGE_SCAN("‡\0\0\0�\0\377\377\1\0\0\0")
+	IMAGE_SCAN("�\3\0\0\0\0\377\377\0\0\0")
+	IMAGE_SCAN("�\3\0\0\0\0\377\377\0\0\0")
+	IMAGE_SCAN("ǂ\0\0\0")
+	IMAGE_SCAN("Ƃ\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0")
+IMAGE_PACKED(Function, "\2\20\0\0\0\20\0\0\0\0\0\0\0\377\377\377\377\0\0\0\0")
+IMAGE_BEGIN(InstanceFunction)
+	IMAGE_SCAN("ƒ\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377\377\0\1\0\0\0Â\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377\377\0\1\0\0\0‚\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377\377\0\1\0\0\0�\3\0\0\0\0\377\377\0\0\0")
+	IMAGE_SCAN("ƒ\0\0\0�\3\0\0\0\0\377\377\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\377\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\377�\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\377\1\0\0\0")
+	IMAGE_SCAN("‡\0\0\0�\0\377\377\1\0\0\0")
+	IMAGE_SCAN("�\3\0\0\0\0\377\377\0\0\0")
+	IMAGE_SCAN("�\3\0\0\0\0\377\377\0\0\0")
+	IMAGE_SCAN("ǂ\0\0\0")
+	IMAGE_SCAN("Ƃ\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0")
+IMAGE_PACKED(InstanceFunction, "\2\20\0\0\0\20\0\0\0\0\0\0\0\377\377\377\377\0\0\0\0")
+IMAGE_BEGIN(InlineFriend)
+	IMAGE_SCAN("�\1\0\0\0")
+	IMAGE_SCAN("ɂ\0\0\0")
+	IMAGE_SCAN("Ȃ\0\0\0")
+	IMAGE_SCAN("�\3\0\0\0\0\377\377\0\0\0")
+	IMAGE_SCAN("�\3\0\0\0���\0\0\0")
+	IMAGE_SCAN("�\4\0\0\0���\0\377\377\0\0\0")
+	IMAGE_SCAN("�\4\0\0\0���\0\377\377����\0\0\0")
+	IMAGE_SCAN("�\12\0\0\0���\0\377\377���\0\377\377���\0\377\377���\0\377\377\0\0\0")
+	IMAGE_SCAN("‡\0\0\0\3���\0\377\377\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377\377\0\3\0\0\0\0\377\377\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377\377\0\3\0\0\0\0\377\377\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377\377\0�\0\0\0")
+	IMAGE_SCAN("Ń\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0")
+IMAGE_PACKED(InlineFriend, "\2\20\0\0\0\20\0\0\0\0\0\0\0\377\377\377\377\0\0\0\0")
+IMAGE_BEGIN(ClassFunction)
+	IMAGE_SCAN("�\1\0\0\0")
+	IMAGE_SCAN("ɂ\0\0\0")
+	IMAGE_SCAN("Ȃ\0\0\0")
+	IMAGE_SCAN("�\3\0\0\0\0\377\377\0\0\0")
+	IMAGE_SCAN("�\3\0\0\0\0\377\377\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\377\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\377�\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\377\1\0\0\0")
+	IMAGE_SCAN("‡\0\0\0�\0\377\377\1\0\0\0")
+	IMAGE_SCAN("�\3\0\0\0\0\377\377\0\0\0��\0\0\0")
+	IMAGE_SCAN("�\3\0\0\0\0\377\377\0\0\0�\1\0\0\0�\377\377\0\1\0\0\0")
+	IMAGE_SCAN("ǂ\0\0\0�\1\0\0\0�\377\377\0\1\0\0\0")
+	IMAGE_SCAN("Ƃ\0\0\0�\1\0\0\0�\377\377\0\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0Ń\0\0\0")
+IMAGE_PACKED(ClassFunction, "\2\20\0\0\0\20\0\0\0\0\0\0\0\377\377\377\377\0\0\0\0")
+IMAGE_BEGIN(FunctionTemplate)
+	IMAGE_SCAN("�\1\0\0\0")
+	IMAGE_SCAN("ɂ\0\0\0")
+	IMAGE_SCAN("ă\0\0\0��\0\0\0��\0\0\0")
+	IMAGE_SCAN("�\3\0\0\0���\0\0\0")
+	IMAGE_SCAN("Â\0\0\0�\3\0\0\0���\0\0\0��\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0����\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�����\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0����\1\0\0\0")
+	IMAGE_SCAN("‡\0\0\0����\1\0\0\0")
+	IMAGE_SCAN("�\3\0\0\0���\0\0\0")
+	IMAGE_SCAN("„\0\0\0�\3\0\0\0���\0\0\0��\0\0\0")
+	IMAGE_SCAN("ǂ\0\0\0")
+	IMAGE_SCAN("��\0\0\0��\0\0\0��\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0")
+IMAGE_PACKED(FunctionTemplate, "\2\20\0\0\0\20\0\0\0\0\0\0\0\377\377\377\377\0\0\0\0")
+IMAGE_BEGIN(InstanceFunctionTemplate)
+	IMAGE_SCAN("�\1\0\0\0")
+	IMAGE_SCAN("��\0\0\0ł\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\377\377\0�\0\0\0��\0\0\0��\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\377\377\0\1\0\0\0�\3\0\0\0���\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\377\377\0\1\0\0\0�\3\0\0\0���\0\0\0��\0\0\0")
+	IMAGE_SCAN("��\0\0\0�\1\0\0\0����\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�����\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0����\1\0\0\0")
+	IMAGE_SCAN("‡\0\0\0����\1\0\0\0")
+	IMAGE_SCAN("�\3\0\0\0���\0\0\0")
+	IMAGE_SCAN("„\0\0\0�\3\0\0\0���\0\0\0��\0\0\0")
+	IMAGE_SCAN("ǂ\0\0\0")
+	IMAGE_SCAN("��\0\0\0��\0\0\0��\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0")
+IMAGE_PACKED(InstanceFunctionTemplate, "\2\20\0\0\0\20\0\0\0\0\0\0\0\377\377\377\377\0\0\0\0")
+IMAGE_BEGIN(ClassFunctionTemplate)
+	IMAGE_SCAN("�\1\0\0\0")
+	IMAGE_SCAN("ɂ\0\0\0")
+	IMAGE_SCAN("ă\0\0\0��\0\0\0��\0\0\0")
+	IMAGE_SCAN("�\3\0\0\0���\0\0\0")
+	IMAGE_SCAN("Â\0\0\0�\3\0\0\0���\0\0\0��\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0����\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�����\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0����\1\0\0\0")
+	IMAGE_SCAN("‡\0\0\0����\1\0\0\0")
+	IMAGE_SCAN("��\0\0\0�\3\0\0\0���\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\377\377\0�\0\0\0�\3\0\0\0���\0\0\0��\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\377\377\0\1\0\0\0‚\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\377\377\0\1\0\0\0��\0\0\0��\0\0\0")
+	IMAGE_SCAN("��\0\0\0�\1\0\0\0")
+IMAGE_PACKED(ClassFunctionTemplate, "\2\20\0\0\0\20\0\0\0\0\0\0\0\377\377\377\377\0\0\0\0")
+IMAGE_BEGIN(Enum)
+	IMAGE_SCAN("")
+	IMAGE_SCAN("")
+	IMAGE_SCAN("Œ\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377\0\377\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377\0\377�\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377\0\377\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377\0\377�\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377\0\377\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377\0\377�\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377\0\377\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377\0\377�\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377\0\377\1\0\0\0")
+	IMAGE_SCAN("Œ\0\0\0")
+IMAGE_PACKED(Enum, "\2\20\0\0\0\20\0\0\0\0\0\0\0\377\377\377\377\0\0\0\0")
+IMAGE_BEGIN(Protected)
+	IMAGE_SCAN("�\3�\0\0\0\0\377\0\0�")
+	IMAGE_SCAN("�\2�\0\0\0\0\377�\1\0\0�")
+	IMAGE_SCAN("�\3�\0\0\0\0\377\0\0�")
+	IMAGE_SCAN("�\2�\0\0\0\0\377�\1\0\0�")
+	IMAGE_SCAN("�\3�\0\0\0\0\377\0\0�")
+	IMAGE_SCAN("�\2�\0\0\0\0\377�\1\0\0�")
+	IMAGE_SCAN("�\3�\0\0\0\0\377\0\0�")
+	IMAGE_SCAN("�\2�\0\0\0\0\377�\1\0\0�")
+	IMAGE_SCAN("�\3�\0\0\0\0\377\0\0�")
+	IMAGE_SCAN("�\2�\0\0\0\0\377�\1\0\0�")
+	IMAGE_SCAN("�\3�\0\0\0\0\377\0\0�")
+	IMAGE_SCAN("�\2�\0\0\0\0\377�\1\0\0�")
+	IMAGE_SCAN("�\3�\0\0\0\0\377\0\0�")
+IMAGE_PACKED(Protected, "\2\20\0\0\0\20\0\0\0\0\0\0\0\377\377\377\377\0\0\0\0")
+IMAGE_BEGIN(Struct)
+	IMAGE_SCAN("Ê\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377\377\0\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377\377\0\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377\377\0\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377\377\0\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377\377\0\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377\377\0\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377\377\0\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377\377\0\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377\377\0\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377\377\0\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377\377\0\1\0\0\0")
+	IMAGE_SCAN("Ê\0\0\0")
+IMAGE_PACKED(Struct, "\2\20\0\0\0\20\0\0\0\0\0\0\0\377\377\377\377\0\0\0\0")
+IMAGE_BEGIN(StructTemplate)
+	IMAGE_SCAN("Ê\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0����\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�����\0\0\0\2���\0\0\0")
+	IMAGE_SCAN("�\2\0\0\0����\0\0\0����\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�����\0\0\0\2���\0\0\0")
+	IMAGE_SCAN("�\2\0\0\0����\0\0\0����\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�����\0\0\0\2���\0\0\0")
+	IMAGE_SCAN("�\2\0\0\0����\0\0\0����\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�����\0\0\0\2���\0\0\0")
+	IMAGE_SCAN("�\2\0\0\0����\0\0\0����\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�����\0\0\0\2���\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0����\1\0\0\0")
+	IMAGE_SCAN("Ê\0\0\0")
+IMAGE_PACKED(StructTemplate, "\2\20\0\0\0\20\0\0\0\0\0\0\0\377\377\377\377\0\0\0\0")
+IMAGE_BEGIN(Other)
+	IMAGE_SCAN("")
+	IMAGE_SCAN("")
+	IMAGE_SCAN("LJ\0\0\0")
+	IMAGE_SCAN("Ä\0\0\0�\377\377\377\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377\377\377\1\0\0\0")
+	IMAGE_SCAN("�\2\0\0\0\377\377\377�����\377\377\377\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377\377\377\1\0\0\0")
+	IMAGE_SCAN("�\2\0\0\0\377\377\377�����\377\377\377\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377\377\377\1\0\0\0")
+	IMAGE_SCAN("�\2\0\0\0\377\377\377�����\377\377\377\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377\377\377\1\0\0\0")
+	IMAGE_SCAN("�\2\0\0\0\377\377\377����\2\377\377\377\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377\377\377\1\0\0\0")
+	IMAGE_SCAN("È\0\0\0")
+IMAGE_PACKED(Other, "\2\20\0\0\0\20\0\0\0\0\0\0\0\377\377\377\377\0\0\0\0")
+IMAGE_BEGIN(Typedef)
+	IMAGE_SCAN("")
+	IMAGE_SCAN("Æ\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\0\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\0\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\0\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\0\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\0\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\0\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\0\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\0\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\0\1\0\0\0")
+	IMAGE_SCAN("Æ\0\0\0")
+IMAGE_PACKED(Typedef, "\2\20\0\0\0\20\0\0\0\0\0\0\0\377\377\377\377\0\0\0\0")
+IMAGE_BEGIN(Constructor)
+	IMAGE_SCAN("�\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\3\0\0\0\0\377\377\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("�\3\0\0\0\0\377\377\0\0\0�\3\0\0\0\0\377\377\0\0\0�\3\0\0\0\0\377\377\0\0\0")
+	IMAGE_SCAN("�\2\0\0\0\0\377\377�\0\0\0\1\0\377\377�\0\0\0\2\0\377\377\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\377\1\0\0\0")
+	IMAGE_SCAN("Ã\0\0\0�\0\377\377�\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\377\1\0\0\0")
+	IMAGE_SCAN("Ã\0\0\0�\0\377\377�\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\377\1\0\0\0")
+	IMAGE_SCAN("�\2\0\0\0\0\377\377�\0\0\0\1\0\377\377�\0\0\0\2\0\377\377\0\0\0")
+	IMAGE_SCAN("�\3\0\0\0\0\377\377\0\0\0�\3\0\0\0\0\377\377\0\0\0�\3\0\0\0\0\377\377\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\3\0\0\0\0\377\377\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0")
+IMAGE_PACKED(Constructor, "\2\20\0\0\0\20\0\0\0\0\0\0\0\377\377\377\377\0\0\0\0")
+IMAGE_BEGIN(Destructor)
+	IMAGE_SCAN("")
+	IMAGE_SCAN("")
+	IMAGE_SCAN("ǃ\0\0\0")
+	IMAGE_SCAN("ł\0\0\0���\0�\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0���\0\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0���\0\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0���\0\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0���\0\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0���\0\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0���\0\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0���\0\1\0\0\0")
+	IMAGE_SCAN("ł\0\0\0���\0�\0\0\0")
+	IMAGE_SCAN("ǃ\0\0\0")
+IMAGE_PACKED(Destructor, "\2\20\0\0\0\20\0\0\0\0\0\0\0\377\377\377\377\0\0\0\0")
+IMAGE_BEGIN(Macro)
+	IMAGE_SCAN("Ä\0\0\0��\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0����\1\0\0\0�\1\0\0\0����\1\0\0\0")
+	IMAGE_SCAN("��\0\0\0�����\0\0\0�����\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0����\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0����\1\0\0\0")
+	IMAGE_SCAN("��\0\0\0�����\0\0\0�����\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0����\1\0\0\0�\1\0\0\0����\1\0\0\0")
+	IMAGE_SCAN("��\0\0\0�����\0\0\0�����\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0����\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0����\1\0\0\0")
+	IMAGE_SCAN("��\0\0\0�����\0\0\0�����\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0����\1\0\0\0�\1\0\0\0����\1\0\0\0")
+	IMAGE_SCAN("Ä\0\0\0��\0\0\0")
+IMAGE_PACKED(Macro, "\2\20\0\0\0\20\0\0\0\0\0\0\0\377\377\377\377\0\0\0\0")
diff --git a/uppsrc/Docedit/Docedit.lay b/uppsrc/Docedit/Docedit.lay
new file mode 100644
index 000000000..4560f8373
--- /dev/null
+++ b/uppsrc/Docedit/Docedit.lay
@@ -0,0 +1,48 @@
+#ifdef LAYOUTFILE
+
+LAYOUT(QueryLayout, 372, 120)
+	ITEM(LabelBox, dv___0, LeftPosZ(8, 132).TopPosZ(4, 108).SetLabel("Status"))
+	ITEM(Switch, status, LeftPosZ(16, 117).TopPosZ(20, 85).SetLabel("Any except ignored\nUndocumented\nObsolete\nIgnored\nAny"))
+	ITEM(Label, dv___2, LeftPosZ(152, 48).TopPosZ(12, 13).SetLabel("Name"))
+	ITEM(WithDropChoice<EditString>, name, LeftPosZ(204, 160).TopPosZ(8, 19))
+	ITEM(Label, dv___4, LeftPosZ(152, 48).TopPosZ(36, 13).SetLabel("Contains"))
+	ITEM(WithDropChoice<EditString>, text, LeftPosZ(204, 160).TopPosZ(32, 19))
+	ITEM(Label, dv___6, LeftPosZ(152, 44).TopPosZ(59, 13).SetLabel("Header"))
+	ITEM(DropList, header, LeftPosZ(204, 160).TopPosZ(56, 19))
+	ITEM(Button, ok, LeftPosZ(232, 64).TopPosZ(88, 24).SetLabel("OK"))
+	ITEM(Button, cancel, LeftPosZ(300, 64).TopPosZ(88, 24).SetLabel("Cancel"))
+	ITEM(Button, clear, LeftPosZ(152, 64).TopPosZ(88, 24).SetLabel("Clear"))
+END_LAYOUT
+
+LAYOUT(LinkLayout, 632, 500)
+	ITEM(Label, dv___0, LeftPosZ(8, 28).TopPosZ(12, 13).SetLabel("Link"))
+	ITEM(WithDropChoice<EditString>, link, LeftPosZ(44, 580).TopPosZ(8, 19))
+	ITEM(DropList, nameing, LeftPosZ(8, 224).TopPosZ(36, 19))
+	ITEM(ArrayCtrl, nesting, LeftPosZ(8, 224).TopPosZ(60, 400))
+	ITEM(ArrayCtrl, item, LeftPosZ(240, 384).TopPosZ(36, 300))
+	ITEM(ArrayCtrl, label, LeftPosZ(240, 384).TopPosZ(340, 120))
+	ITEM(Button, ok, LeftPosZ(492, 64).TopPosZ(468, 24).SetLabel("OK"))
+	ITEM(Button, cancel, LeftPosZ(560, 64).TopPosZ(468, 24).SetLabel("Cancel"))
+END_LAYOUT
+
+LAYOUT(ExternalLayout, 400, 108)
+	ITEM(Label, dv___0, LeftPosZ(4, 68).TopPosZ(8, 13).SetLabel("Namespace"))
+	ITEM(WithDropChoice<EditString>, nameing, LeftPosZ(80, 76).TopPosZ(4, 19))
+	ITEM(Label, dv___2, LeftPosZ(176, 43).TopPosZ(8, 13).SetLabel("Nesting"))
+	ITEM(WithDropChoice<EditString>, nesting, LeftPosZ(224, 168).TopPosZ(4, 19))
+	ITEM(Label, dv___4, LeftPosZ(4, 28).TopPosZ(31, 13).SetLabel("Item"))
+	ITEM(EditString, item, LeftPosZ(80, 312).TopPosZ(28, 19))
+	ITEM(Label, dv___6, LeftPosZ(4, 72).TopPosZ(56, 13).SetLabel("Host package"))
+	ITEM(DropList, package, LeftPosZ(80, 100).TopPosZ(52, 19))
+	ITEM(Button, ok, LeftPosZ(260, 64).TopPosZ(76, 24).SetLabel("OK"))
+	ITEM(Button, cancel, LeftPosZ(328, 64).TopPosZ(76, 24).SetLabel("Cancel"))
+END_LAYOUT
+
+LAYOUT(TemplateLayout, 672, 568)
+	ITEM(Button, ok, LeftPosZ(532, 64).TopPosZ(536, 24).SetLabel("OK"))
+	ITEM(Button, cancel, LeftPosZ(600, 64).TopPosZ(536, 24).SetLabel("Cancel"))
+	ITEM(DocEdit, code, LeftPosZ(164, 500).TopPosZ(8, 160))
+	ITEM(RichTextView, view, LeftPosZ(164, 500).TopPosZ(172, 352))
+END_LAYOUT
+
+#endif
diff --git a/uppsrc/Docedit/Docedit.upp b/uppsrc/Docedit/Docedit.upp
new file mode 100644
index 000000000..0152d7984
--- /dev/null
+++ b/uppsrc/Docedit/Docedit.upp
@@ -0,0 +1,19 @@
+uses
+	docpp,
+	RichEdit;
+
+file
+	Docedit.h,
+	Docbase.cpp,
+	Docdir.cpp,
+	DocItem.cpp,
+	DocLink.cpp,
+	Docedit.cpp,
+	Docedit.iml,
+	Info readonly separator,
+	COPYING,
+	COPYING-PLAIN,
+	AUTHORS;
+
+mainconfig
+	"Debug" = normal "GUI";
diff --git a/uppsrc/Docedit/prj.aux b/uppsrc/Docedit/prj.aux
new file mode 100644
index 000000000..aaa931940
--- /dev/null
+++ b/uppsrc/Docedit/prj.aux
@@ -0,0 +1,7 @@
+file
+	F:\uppsrc\Core\doc.dpp\__WString_Data__struct_DataEN.dpp,
+	F:\uppsrc\Core\doc.dpp\links,
+	F:\uppsrc\Core\doc.dpp\appdoc_dialogs_SomeDialog_EN-US.dpp,
+	F:\uppsrc\Core\doc.dpp\dir.h,
+	e:\out\upp\Docedit\DEBUG-GUI-MAIN-MSC-ST-WIN32\Docedit.log,
+	F:\theide\dppstyles.qtf;
diff --git a/uppsrc/Draw/AUTHORS b/uppsrc/Draw/AUTHORS
new file mode 100644
index 000000000..91cb31646
--- /dev/null
+++ b/uppsrc/Draw/AUTHORS
@@ -0,0 +1,3 @@
+Mirek Fidler <cxl@ntllib.org>
+Tomas Rylek  <rylek@volny.cz>
+Michael Albert
\ No newline at end of file
diff --git a/uppsrc/Draw/COPYING b/uppsrc/Draw/COPYING
new file mode 100644
index 000000000..33aa39102
--- /dev/null
+++ b/uppsrc/Draw/COPYING
@@ -0,0 +1,30 @@
+Copyright (C) 2005 Mirek Fidler, Tomas Rylek and various contributors (see AUTHORS)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to
+deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies of the Software and its Copyright notices. In addition publicly
+documented acknowledgment must be given that this software has been used if no
+source code of this software is made available publicly. This includes
+acknowledgments in either Copyright notices, Manuals, Publicity and Marketing
+documents or any documentation provided with any product containing this
+software. This License does not apply to any software that links to the
+libraries provided by this software (statically or dynamically), but only to
+the software provided.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+-----------
+
+Please see the COPYING.PLAIN for a plain-english explanation of this notice
+and it's intent.
diff --git a/uppsrc/Draw/COPYING-PLAIN b/uppsrc/Draw/COPYING-PLAIN
new file mode 100644
index 000000000..770a8132f
--- /dev/null
+++ b/uppsrc/Draw/COPYING-PLAIN
@@ -0,0 +1,33 @@
+Plain English Copyright Notice
+
+This file is not intended to be the actual License. The reason this file
+exists is that we here are programmers and engineers. We aren't lawyers. We
+provide licenses that we THINK say the right things, but we have our own
+intentions at heart. This is a plain-english explanation of what those
+intentions are, and if you follow them you will be within the "spirit" of
+the license.
+
+The intent is for us to enjoy writing software that is useful to us (the
+AUTHORS) and allow others to use it freely and also benefit from the work we
+put into making it. We don't want to restrict others using it. They should
+not *HAVE* to make the source code of the applications they write that
+simply link to these libraries (be that statically or dynamically), or for
+them to be limited as to what license they choose to use (be it open, closed
+or anything else). But we would like to know you are using these libraries.
+We simply would like to know that it has been useful to someone. This is why
+we ask for acknowledgement of some sort.
+
+You can do what you want with the source of this software - it doesn't
+matter. We still have it here for ourselves and it is open and free to use
+and download and play with. It can't be taken away. We don't really mind what
+you do with the source to your software. We would simply like to know that
+you are using it - especially if it makes it to a commerical product. If you
+simply e-mail all the AUTHORS (see COPYING and AUTHORS files) telling us, and
+then make sure you include a paragraph or page in the manual or in the "About.."
+box for the product with the copyright notice and state that you used this
+software, we will be very happy. If you want to contribute back modifications
+and fixes you may have made we will welcome those too with open arms (generally).
+If you want help with changes needed, ports needed or features to be added,
+arrangements can be easily made with some dialogue.
+
+Mirek Fidler <cxl@ntllib.org>
diff --git a/uppsrc/Draw/Cham.cpp b/uppsrc/Draw/Cham.cpp
new file mode 100644
index 000000000..3fe463658
--- /dev/null
+++ b/uppsrc/Draw/Cham.cpp
@@ -0,0 +1,567 @@
+#include "Draw.h"
+
+NAMESPACE_UPP
+
+#define LTIMING(x) //  RTIMING(x)
+
+#if defined(_DEBUG) && 0
+#include <plugin/png/png.h>
+
+inline void LOGPNG(const char *name, const Image& m)
+{
+	PNGEncoder png;
+	png.SaveFile(ConfigFile(name) + ".png", m);
+}
+
+#else
+
+#define LOGPNG(a, b)
+
+#endif
+
+struct ChImageMaker : ImageMaker {
+	Size       sz;
+	Rect       sr;
+	Image      img;
+
+	virtual String Key() const;
+	virtual Image  Make() const;
+};
+
+String ChImageMaker::Key() const
+{
+	LTIMING("ChImageMaker::Key");
+	StringBuffer b;
+	int64 id = img.GetSerialId();
+	b.Cat((const char *)&id, sizeof(id));
+	b.Cat((const char *)&sz.cx, sizeof(sz.cx));
+	b.Cat((const char *)&sz.cy, sizeof(sz.cy));
+	b.Cat((const char *)&sr.left, sizeof(sr.left));
+	b.Cat((const char *)&sr.right, sizeof(sr.right));
+	b.Cat((const char *)&sr.top, sizeof(sr.top));
+	b.Cat((const char *)&sr.bottom, sizeof(sr.bottom));
+	return b;
+}
+
+Image ChImageMaker::Make() const
+{
+	LTIMING("ChImageMaker::Make");
+	return Rescale(img, sz, sr);
+}
+
+void  ChDraw(Draw& w, int x, int y, int cx, int cy, const Image& img, const Rect& src)
+{
+	LTIMING("ChDraw");
+	if(cx > 0 && cy > 0) {
+		ChImageMaker m;
+		m.sz = Size(cx, cy);
+		m.sr = src;
+		m.img = img;
+		w.DrawImage(x, y, MakeImage(m));
+	}
+}
+
+void  ChDraw(Draw& w, const Rect& r, const Image& img, const Rect& src)
+{
+	ChDraw(w, r.left, r.top, r.GetWidth(), r.GetHeight(), img, src);
+}
+
+struct sChLookWith {
+	Value look;
+	Image img;
+	Color (*colorfn)(int i);
+	int   ii;
+	Color color;
+	Point offset;
+};
+
+Value ChLookWith(const Value& look, const Image& img, Point offset)
+{
+	sChLookWith x;
+	x.look = look;
+	x.img = img;
+	x.colorfn = NULL;
+	x.color = Null;
+	x.offset = offset;
+	return RawToValue(x);
+}
+
+Value ChLookWith(const Value& look, const Image& img, Color color, Point offset)
+{
+	sChLookWith x;
+	x.look = look;
+	x.img = img;
+	x.colorfn = NULL;
+	x.color = color;
+	x.offset = offset;
+	return RawToValue(x);
+}
+
+Value ChLookWith(const Value& look, const Image& img, Color (*color)(int i), int i, Point offset)
+{
+	sChLookWith x;
+	x.look = look;
+	x.img = img;
+	x.colorfn = color;
+	x.ii = i;
+	x.offset = offset;
+	return RawToValue(x);
+}
+
+Value sChOp(Draw& w, const Rect& r, const Value& v, int op);
+
+struct sChBorder {
+	const ColorF *border;
+	Value face;
+};
+
+Value ChBorder(const ColorF *colors, const Value& face)
+{
+	sChBorder b;
+	b.border = colors;
+	b.face = face;
+	return RawToValue(b);
+}
+
+Value StdChLookFn(Draw& w, const Rect& r, const Value& v, int op)
+{
+	if(IsType<sChLookWith>(v)) {
+		const sChLookWith& x = ValueTo<sChLookWith>(v);
+		if(op == LOOK_PAINT) {
+			LOGPNG(AsString(x.img.GetSerialId()), x.img);
+			ChPaint(w, r, x.look);
+			Point p = r.CenterPos(x.img.GetSize()) + x.offset;
+			if(x.colorfn)
+				w.DrawImage(p.x, p.y, x.img, (*x.colorfn)(x.ii));
+			else
+			if(!IsNull(x.color))
+				w.DrawImage(p.x, p.y, x.img, x.color);
+			else
+				w.DrawImage(p.x, p.y, x.img);
+			return 1;
+		}
+		return sChOp(w, r, x.look, op);
+	}
+	if(IsType<sChBorder>(v)) {
+		sChBorder b = ValueTo<sChBorder>(v);
+		int n = (int)(intptr_t)*b.border;
+		switch(op) {
+		case LOOK_PAINT:
+			ChPaint(w, r.Deflated(n), b.face);
+		case LOOK_PAINTEDGE:
+			DrawBorder(w, r, b.border);
+			return 0;
+		case LOOK_MARGINS:
+			return Rect(n, n, n, n);
+		case LOOK_ISBODYOPAQUE:
+		case LOOK_ISOPAQUE:
+			return false;
+		}
+	}
+	if(IsType<Color>(v)) {
+		Color c = v;
+		switch(op) {
+		case LOOK_PAINT:
+			w.DrawRect(r, c);
+			return 0;
+		case LOOK_PAINTEDGE:
+			DrawFrame(w, r, c);
+			return 0;
+		case LOOK_MARGINS:
+			return Rect(1, 1, 1, 1);
+		case LOOK_ISBODYOPAQUE:
+		case LOOK_ISOPAQUE:
+			return !IsNull(c);
+		}
+	}
+	if(IsType<Image>(v)) {
+		Image img = v;
+		Size isz = img.GetSize();
+		Size sz = r.GetSize();
+		Point p = img.GetHotSpot();
+		Point p2 = img.Get2ndSpot();
+		int tile = 0;
+		if(p2.x || p2.y) {
+			if(p2.x < p.x) {
+				Swap(p2.x, p.x);
+				tile = 1;
+			}
+			if(p2.y < p.y) {
+				Swap(p2.y, p.y);
+				tile += 2;
+			}
+			p2.x++;
+			p2.y++;
+		}
+		else {
+			p2.x = isz.cx - p.x;
+			p2.y = isz.cy - p.y;
+			if(p.x > isz.cx / 2) {
+				tile = 1;
+				p2.x = p.x;
+				p.x = isz.cx - p.x - 1;
+			}
+			if(p.y > isz.cy / 2) {
+				tile += 2;
+				p2.y = p.y;
+				p.y = isz.cy - p.y - 1;
+			}
+		}
+		if(op == LOOK_MARGINS)
+			return Rect(p.x, p.y, isz.cx - p2.x, isz.cy - p2.y);
+		if(op == LOOK_ISOPAQUE)
+			return img.GetKind() == IMAGE_OPAQUE;
+		if(IsNull(img))
+			return 1;
+		if(op == LOOK_ISBODYOPAQUE) {
+			static VectorMap<int64, bool> btc;
+			int64 key = img.GetSerialId();
+			int q = btc.Find(key);
+			if(q < 0) {
+				bool opaque = true;
+				Rect m = ChMargins(img);
+				Rect r = img.GetSize();
+				r.left += max(m.left, 0);
+				r.right -= max(m.right, 0);
+				r.top += m.top;
+				r.bottom -= m.bottom;
+				int cx = r.right - r.left;
+				if(cx >= 0)
+					for(int y = r.top; y < r.bottom && opaque; y++) {
+						const RGBA *s = img[y] + r.left;
+						const RGBA *e = s + cx;
+						while(s < e) {
+							if(s->a != 255) {
+								opaque = false;
+								break;
+							}
+						}
+					}
+				if(btc.GetCount() > 100)
+					btc.Clear();
+				btc.Add(key, q);
+				return opaque;
+			}
+			return btc[q];
+		}
+		if(op == LOOK_PAINT || op == LOOK_PAINTEDGE) {
+			LTIMING("ChPaint Image");
+			w.Clipoff(r);
+			Rect sr(p, p2);
+			Size sz2(isz.cx - sr.right, isz.cy - sr.bottom);
+			Rect r = RectC(p.x, p.y, sz.cx - sr.left - sz2.cx, sz.cy - sr.top - sz2.cy);
+			int top = minmax(sz.cy / 2, 0, isz.cy);
+			int bottom = minmax(sz.cy - top, 0, isz.cy);
+			int yy = isz.cy - bottom;
+			int left = minmax(sz.cx / 2, 0, isz.cx);
+			int right = minmax(sz.cx - left, 0, isz.cx);
+			int xx = isz.cx - right;
+			if(!r.IsEmpty()) {
+				w.DrawImage(0, 0, img, RectC(0, 0, p.x, p.y));
+				w.DrawImage(0, r.bottom, img, RectC(0, sr.bottom, p.x, sz2.cy));
+				w.DrawImage(r.right, 0, img, RectC(sr.right, 0, sz2.cx, p.y));
+				w.DrawImage(r.right, r.bottom, img, RectC(sr.right, sr.bottom, sz2.cx, sz2.cy));
+				ChDraw(w, p.x, 0, r.Width(), p.y, img, RectC(p.x, 0, sr.Width(), p.y));
+				ChDraw(w, p.x, r.bottom, r.Width(), sz2.cy, img, RectC(p.x, sr.bottom, sr.Width(), sz2.cy));
+				ChDraw(w, 0, p.y, p.x, r.Height(), img, RectC(0, p.y, p.x, sr.Height()));
+				ChDraw(w, r.right, p.y, sz2.cx, r.Height(), img,
+				       RectC(sr.right, p.y, sz2.cx, sr.Height()));
+				if(op == LOOK_PAINT) {
+					if(IsNull(r) || IsNull(sr))
+						return 1;
+					if(tile) {
+						LTIMING("Ch-Tiles");
+						LTIMING("Ch-Tiles");
+						img = Rescale(img, Size((tile & 1 ? sr : r).GetWidth(),
+						                    (tile & 2 ? sr : r).GetHeight()), sr);
+						DrawTiles(w, r, img);
+					}
+					else {
+						static VectorMap<int64, int> btc;
+						int64 key = img.GetSerialId();
+						int q;
+						{
+							LTIMING("Find");
+							q = btc.Find(key);
+						}
+						if(q < 0) {
+							LTIMING("ClassifyContent");
+							q = ClassifyContent(img, sr);
+							if(btc.GetCount() > 100)
+								btc.Clear();
+							btc.Add(key, q);
+						}
+						else
+							q = btc[q];
+						switch(q) {
+						case IMAGECONTENT_VERTDUP|IMAGECONTENT_HORZDUP:
+							{
+								LTIMING("Ch-singlecolor");
+								RGBA c = img[sr.top][sr.left];
+								if(c.a == 255) {
+									w.DrawRect(r, c);
+									break;
+								}
+							}
+						case 0:
+						default:
+							ChDraw(w, r, img, sr);
+							break;
+							LTIMING("Ch-linedup");
+							img = CachedRescalePaintOnly(
+									img,
+									Size((q & IMAGECONTENT_HORZDUP) ? max(min(40, r.GetWidth()), sr.GetWidth())
+									                                : r.GetWidth(),
+									     (q & IMAGECONTENT_VERTDUP) ? max(min(40, r.GetHeight()), sr.GetHeight())
+							                                        : r.GetHeight()),
+									sr
+							);
+							LTIMING("Ch-linedup-drawtiles");
+							DrawTiles(w, r, img);
+							break;
+						}
+					}
+				}
+			}
+			else
+			if(r.left < r.right) {
+				w.DrawImage(0, 0, img, RectC(0, 0, p.x, top));
+				w.DrawImage(0, sz.cy - bottom, img, RectC(0, yy, p.x, bottom));
+				w.DrawImage(r.right, 0, img, RectC(sr.right, 0, sz2.cx, top));
+				w.DrawImage(r.right, sz.cy - bottom, img, RectC(sr.right, yy, sz2.cx, bottom));
+				ChDraw(w, p.x, 0, r.Width(), top, img, RectC(p.x, 0, sr.Width(), top));
+				ChDraw(w, p.x, sz.cy - bottom, r.Width(), bottom, img, RectC(p.x, yy, sr.Width(), bottom));
+			}
+			else
+			if(r.top < r.bottom) {
+				w.DrawImage(0, 0, img, RectC(0, 0, left, p.y));
+				w.DrawImage(0, r.bottom, img, RectC(0, sr.bottom, left, sz2.cy));
+				w.DrawImage(sz.cx - right, 0, img, RectC(xx, 0, right, p.y));
+				w.DrawImage(sz.cx - right, r.bottom, img, RectC(xx, sr.bottom, right, sz2.cy));
+				ChDraw(w, 0, p.y, left, r.Height(), img, RectC(0, p.y, left, sr.Height()));
+				ChDraw(w, sz.cx - right, p.y, right, r.Height(), img, RectC(xx, p.y, right, sr.Height()));
+			}
+			else {
+				w.DrawImage(0, 0, img, RectC(0, 0, left, top));
+				w.DrawImage(0, sz.cy - bottom, img, RectC(0, yy, left, top));
+				w.DrawImage(sz.cx - right, 0, img, RectC(xx, 0, right, top));
+				w.DrawImage(sz.cx - right, sz.cy - bottom, img, RectC(xx, yy, right, bottom));
+			}
+			w.End();
+			return 1;
+		}
+	}
+	return Null;
+}
+
+typedef Value (*ChPainterFn)(Draw& w, const Rect& r, const Value& v, int op);
+
+Vector<ChPainterFn>& sChps()
+{
+	static Vector<ChPainterFn> x;
+	return x;
+}
+
+void ChLookFn(Value (*fn)(Draw& w, const Rect& r, const Value& v, int op))
+{
+	if(FindIndex(sChps(), fn) < 0)
+		sChps().Add(fn);
+}
+
+struct sStyleCh : Moveable<sStyleCh> {
+	byte *status;
+	void (*init)();
+};
+
+Vector<sStyleCh>& sChStyle()
+{
+	static Vector<sStyleCh> x;
+	return x;
+}
+
+void ChRegisterStyle__(byte& state, byte& registered, void (*init)())
+{
+	if(!registered) {
+		sStyleCh& s = sChStyle().Add();
+		s.status = &state;
+		s.init = init;
+		registered = true;
+	}
+}
+
+void ChReset()
+{
+	for(int i = 0; i < sChStyle().GetCount(); i++)
+		*sChStyle()[i].status = 0;
+	ChLookFn(StdChLookFn);
+}
+
+void ChFinish()
+{
+	for(int i = 0; i < sChStyle().GetCount(); i++)
+		sChStyle()[i].init();
+}
+
+Value sChOp(Draw& w, const Rect& r, const Value& v, int op)
+{
+	Value q;
+	if(!IsNull(v))
+		for(int i = sChps().GetCount() - 1; i >= 0; i--) {
+			q = (*sChps()[i])(w, r, v, op);
+			if(!IsNull(q))
+				break;
+		}
+	return q;
+}
+
+void ChPaint(Draw& w, const Rect& r, const Value& look)
+{
+	sChOp(w, r, look, LOOK_PAINT);
+}
+
+void ChPaint(Draw& w, int x, int y, int cx, int cy, const Value& look)
+{
+	sChOp(w, RectC(x, y, cx, cy), look, LOOK_PAINT);
+}
+
+void ChPaintEdge(Draw& w, const Rect& r, const Value& look)
+{
+	sChOp(w, r, look, LOOK_PAINTEDGE);
+}
+
+void ChPaintEdge(Draw& w, int x, int y, int cx, int cy, const Value& look)
+{
+	sChOp(w, RectC(x, y, cx, cy), look, LOOK_PAINTEDGE);
+}
+
+void ChPaintBody(Draw& w, const Rect& r, const Value& look)
+{
+	Rect m = ChMargins(look);
+	w.Clip(r);
+	ChPaint(w, Rect(r.left - m.left, r.top - m.top, r.right + m.right, r.bottom + m.bottom),
+	        look);
+	w.End();
+}
+
+void ChPaintBody(Draw& w, int x, int y, int cx, int cy, const Value& look)
+{
+	ChPaintBody(w, RectC(x, y, cx, cy), look);
+}
+
+Rect ChMargins(const Value& look)
+{
+	NilDraw w;
+	return sChOp(w, Null, look, LOOK_MARGINS);
+}
+
+bool ChIsOpaque(const Value& look)
+{
+	NilDraw w;
+	return sChOp(w, Null, look, LOOK_ISOPAQUE);
+}
+
+bool ChIsBodyOpaque(const Value& look)
+{
+	NilDraw w;
+	return sChOp(w, Null, look, LOOK_ISBODYOPAQUE);
+}
+
+void   DeflateMargins(Rect& r, const Rect& m)
+{
+	r = Rect(r.left + m.left, r.top + m.top, r.right - m.right, r.bottom - m.bottom);
+}
+
+void   ChDeflateMargins(Rect& r, const Value& look)
+{
+	return DeflateMargins(r, ChMargins(look));
+}
+
+void DeflateMargins(Size& sz, const Rect& m)
+{
+	sz = Size(sz.cx + m.left + m.right, sz.cy + m.top + m.bottom);
+}
+
+void ChDeflateMargins(Size& sz, const Value& look)
+{
+	DeflateMargins(sz, ChMargins(look));
+}
+
+void   InflateMargins(Rect& r, const Rect& m)
+{
+	r = Rect(r.left - m.left, r.top - m.top, r.right + m.right, r.bottom + m.bottom);
+}
+
+void   ChInflateMargins(Rect& r, const Value& look)
+{
+	return InflateMargins(r, ChMargins(look));
+}
+
+void InflateMargins(Size& sz, const Rect& m)
+{
+	sz = Size(sz.cx + m.left + m.right, sz.cy + m.top + m.bottom);
+}
+
+void ChInflateMargins(Size& sz, const Value& look)
+{
+	InflateMargins(sz, ChMargins(look));
+}
+
+Image AdjustColors(const Image& img) {
+	const RGBA *s = ~img;
+	const RGBA *e = s + img.GetLength();
+	ImageBuffer w(img.GetSize());
+	RGBA *t = w;
+	Color black = SColorText();
+	Color shadow = SColorShadow();
+	Color face = SColorFace();
+	Color light = SColorLight();
+	Color highlight = SColorHighlight();
+	Color hot = highlight;
+	Color paper = SColorPaper();
+	while(s < e) {
+		*t = *s;
+		if(s->r == s->g && s->g == s->b)
+			if(s->r < 128)
+				*t = Blend(black, shadow, 2 * s->r);
+			else
+			if(s->r >= 128 && s->r < 192)
+				*t = Blend(shadow, face, 4 * (s->r - 128));
+			else
+				*t = Blend(face, light, 4 * (s->r - 192));
+		else
+		if(s->r == 0 && s->g == 0)
+			*t = Blend(black, highlight, 2 * (s->b - 128));
+		else
+		if(s->b == 0 && s->g == 0)
+			*t = Blend(black, hot, 2 * (s->r - 128));
+		else
+		if(s->r == s->g && s->b == 0)
+			*t = Blend(black, paper, s->r);
+		t->a = s->a;
+		t++;
+		s++;
+	}
+	w.SetHotSpot(img.GetHotSpot());
+	w.Set2ndSpot(img.Get2ndSpot());
+	return w;
+}
+
+void  Override(Iml& target, Iml& source, bool colored)
+{
+	for(int i = 0; i < target.GetCount(); i++) {
+		int q = source.Find(target.GetId(i));
+		if(q >= 0) {
+			Image m = source.Get(q);
+			if(colored)
+				m = AdjustColors(m);
+			target.Set(i, m);
+		}
+	}
+}
+
+void ColoredOverride(Iml& target, Iml& source)
+{
+	Override(target, source, true);
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/Draw/Cham.h b/uppsrc/Draw/Cham.h
new file mode 100644
index 000000000..a566ad5b4
--- /dev/null
+++ b/uppsrc/Draw/Cham.h
@@ -0,0 +1,117 @@
+enum LookOp {
+	LOOK_PAINT,
+	LOOK_MARGINS,
+	LOOK_PAINTEDGE,
+	LOOK_ISOPAQUE,
+	LOOK_ISBODYOPAQUE,
+};
+
+void  ChLookFn(Value (*fn)(Draw& w, const Rect& r, const Value& look, int lookop));
+
+Image AdjustColors(const Image& img);
+
+void   Override(Iml& target, Iml& source, bool colored = false);
+void   ColoredOverride(Iml& target, Iml& source);
+
+void   ChReset();
+void   ChFinish();
+
+void   ChPaint(Draw& w, const Rect& r, const Value& look);
+void   ChPaint(Draw& w, int x, int y, int cx, int cy, const Value& look);
+void   ChPaintEdge(Draw& w, const Rect& r, const Value& look);
+void   ChPaintEdge(Draw& w, int x, int y, int cx, int cy, const Value& look);
+void   ChPaintBody(Draw& w, const Rect& r, const Value& look);
+void   ChPaintBody(Draw& w, int x, int y, int cx, int cy, const Value& look);
+Rect   ChMargins(const Value& look);
+bool   ChIsOpaque(const Value& look);
+bool   ChIsBodyOpaque(const Value& look);
+
+void   DeflateMargins(Rect& r, const Rect& margin);
+void   ChDeflateMargins(Rect& r, const Value& look);
+void   DeflateMargins(Size& sz, const Rect& m);
+void   ChDeflateMargins(Size& sz, const Value& look);
+void   InflateMargins(Rect& r, const Rect& m);
+void   ChInflateMargins(Rect& r, const Value& look);
+void   InflateMargins(Size& sz, const Rect& m);
+void   ChInflateMargins(Size& sz, const Value& look);
+
+template <class T>
+struct ChStyle {
+	byte status;
+	byte registered;
+	T   *standard;
+
+	const T& Standard() const      { return *standard; }
+	T&       Write() const         { T& x = *(T *)this; x.status = 2; return x; }
+	void     Assign(const T& src)  { *(T *)this = src; }
+
+	ChStyle()                      { status = 0; registered = 0; standard = NULL; }
+};
+
+#define CH_STYLE(klass, type, style) \
+struct COMBINE5(klass, __, type, __, style) : klass::type { \
+	void Init(); \
+	static void InitIt(); \
+}; \
+\
+void COMBINE5(klass, __, type, __, style)::InitIt() { \
+	klass::style(); \
+} \
+\
+const klass::Style& klass::style() \
+{ \
+	static COMBINE5(klass, __, type, __, style) b, standard; \
+	if(b.status == 0) { \
+		ChRegisterStyle__(b.status, b.registered, COMBINE5(klass, __, type, __, style)::InitIt); \
+		b.Init(); \
+		b.status = 1; \
+		standard = b; \
+		standard.standard = b.standard = &standard; \
+	} \
+	return b; \
+} \
+\
+void COMBINE5(klass, __, type, __, style)::Init()
+
+#define CH_VAR(chtype, type, name, init) \
+chtype& COMBINE(ch_var__, name)(); \
+void COMBINE(ch_init__, name)() { \
+	COMBINE(ch_var__, name)(); \
+} \
+\
+chtype& COMBINE(ch_var__, name)() { \
+	static chtype b; \
+	if(b.status == 0) { \
+		ChRegisterStyle__(b.status, b.registered, COMBINE(ch_init__, name)); \
+		b.value = init; \
+		b.status = 1; \
+	} \
+	return b; \
+} \
+\
+type name() { return COMBINE(ch_var__, name)().value; } \
+void COMBINE(name, _Write)(type v) { COMBINE(ch_var__, name)().Write().value = v; }
+
+struct ChColor : ChStyle<ChColor> { Color value; };
+#define CH_COLOR(name, init) CH_VAR(ChColor, Color, name, init)
+
+struct ChInt : ChStyle<ChInt> { int value; };
+#define CH_INT(name, init) CH_VAR(ChInt, int, name, init)
+
+struct ChValue : ChStyle<ChValue> { Value value; };
+#define CH_VALUE(name, init) CH_VAR(ChValue, Value, name, init)
+
+struct ChImage : ChStyle<ChImage> { Image value; };
+#define CH_IMAGE(name, init) CH_VAR(ChImage, Image, name, init)
+
+void ChPaint(Draw& w, const Rect& r, const Value& element);
+void ChPaint(Draw& w, int x, int y, int cx, int cy, const Value& element);
+
+Value ChLookWith(const Value& look, const Image& img, Point offset = Point(0, 0));
+Value ChLookWith(const Value& look, const Image& img, Color color, Point offset = Point(0, 0));
+Value ChLookWith(const Value& look, const Image& img, Color (*color)(int i), int i, Point offset = Point(0, 0));
+
+//private:
+void ChRegisterStyle__(byte& state, byte& registered, void (*init)());
+
+Value ChBorder(const ColorF *colors, const Value& face = SColorFace());
diff --git a/uppsrc/Draw/ComposeText.cpp b/uppsrc/Draw/ComposeText.cpp
new file mode 100644
index 000000000..5bf508134
--- /dev/null
+++ b/uppsrc/Draw/ComposeText.cpp
@@ -0,0 +1,275 @@
+#include "Draw.h"
+
+NAMESPACE_UPP
+
+enum {
+	CG_NONE,
+	CG_CAPITAL,
+	CG_SMALL
+};
+
+enum {
+	CG_GRAVE = 0x60,
+	CG_ACUTE = 0xb4,
+	CG_CEDILLA = 0xb8,
+	CG_MACRON = 175,
+	CG_CIRCUMFLEX = 0x2c6,
+	CG_TILDE = 0x2dc,
+	CG_DOT_ABOVE = 0x2d9,
+	CG_OGONEK = 0x2db,
+	CG_STROKE = '-',
+	CG_BREVE = 0x2d8,
+	CG_CARON = 0x2c7,
+	CG_MIDDLE_DOT = 0xb7,
+	CG_DOUBLE_ACUTE = 0x2dd,
+	CG_DIAERESIS = 0xa8,
+	CG_RING_ABOVE = 0x2da,
+	CG_COMMA_T = ',',
+	CG_COMMA_UR = 1,
+	CG_COMMA_URI,
+};
+
+struct CGInfo {
+	byte  type;
+	char  ascii;
+	wchar mark;
+}
+gc_info[128] = {
+	{ CG_CAPITAL, 'A', CG_MACRON },
+	{ CG_SMALL, 'a', CG_MACRON },
+	{ CG_CAPITAL, 'A', CG_BREVE },
+	{ CG_SMALL, 'a', CG_BREVE },
+	{ CG_CAPITAL, 'A', CG_OGONEK },
+	{ CG_SMALL, 'a', CG_OGONEK },
+	{ CG_CAPITAL, 'C', CG_ACUTE },
+	{ CG_SMALL, 'c', CG_ACUTE },
+	{ CG_CAPITAL, 'C', CG_CIRCUMFLEX },
+	{ CG_SMALL, 'c', CG_CIRCUMFLEX },
+	{ CG_CAPITAL, 'C', CG_DOT_ABOVE },
+	{ CG_SMALL, 'c', CG_DOT_ABOVE },
+	{ CG_CAPITAL, 'C', CG_CARON },
+	{ CG_SMALL, 'c', CG_CARON },
+	{ CG_CAPITAL, 'D', CG_CARON },
+	{ CG_SMALL, 'd', CG_COMMA_UR },
+	{ CG_CAPITAL, 'D', CG_STROKE },
+	{ CG_SMALL, 'd', CG_STROKE },
+	{ CG_CAPITAL, 'E', CG_MACRON },
+	{ CG_SMALL, 'e', CG_MACRON },
+	{ CG_CAPITAL, 'E', CG_BREVE },
+	{ CG_SMALL, 'e', CG_BREVE },
+	{ CG_CAPITAL, 'E', CG_DOT_ABOVE },
+	{ CG_SMALL, 'e', CG_DOT_ABOVE },
+	{ CG_CAPITAL, 'E', CG_OGONEK },
+	{ CG_SMALL, 'e', CG_OGONEK },
+	{ CG_CAPITAL, 'E', CG_CARON },
+	{ CG_SMALL, 'e', CG_CARON },
+	{ CG_CAPITAL, 'G', CG_CIRCUMFLEX },
+	{ CG_SMALL, 'g', CG_CIRCUMFLEX },
+	{ CG_CAPITAL, 'G', CG_BREVE },
+	{ CG_SMALL, 'g', CG_BREVE },
+	{ CG_CAPITAL, 'G', CG_DOT_ABOVE },
+	{ CG_SMALL, 'g', CG_DOT_ABOVE },
+	{ CG_CAPITAL, 'G', CG_CEDILLA },
+	{ CG_SMALL, 'g', CG_CEDILLA },
+	{ CG_CAPITAL, 'H', CG_CIRCUMFLEX },
+	{ CG_SMALL, 'h', CG_CIRCUMFLEX },
+	{ CG_CAPITAL, 'H', CG_STROKE },
+	{ CG_SMALL, 'h', CG_STROKE },
+	{ CG_CAPITAL, 'I', CG_TILDE },
+	{ CG_SMALL, 'i', CG_TILDE },
+	{ CG_CAPITAL, 'I', CG_MACRON },
+	{ CG_SMALL, 'i', CG_MACRON },
+	{ CG_CAPITAL, 'I', CG_BREVE },
+	{ CG_SMALL, 'i', CG_BREVE },
+	{ CG_CAPITAL, 'I', CG_OGONEK },
+	{ CG_SMALL, 'i', CG_OGONEK },
+	{ CG_CAPITAL, 'I', CG_DOT_ABOVE },
+	{ CG_NONE, 0, 0 }, // , CG_SMALL, 'DOTLESS I
+	{ CG_NONE, 0, 0 }, // LATIN CAPITAL LIGATURE IJ
+	{ CG_NONE, 0, 0 }, // LATIN SMALL LIGATURE IJ
+	{ CG_CAPITAL, 'J', CG_CIRCUMFLEX },
+	{ CG_SMALL, 'j', CG_CIRCUMFLEX },
+	{ CG_CAPITAL, 'K', CG_CEDILLA },
+	{ CG_SMALL, 'k', CG_CEDILLA },
+	{ CG_NONE, 0, 0 }, // CG_SMALL, 'KRA
+	{ CG_CAPITAL, 'L', CG_ACUTE },
+	{ CG_SMALL, 'l', CG_ACUTE },
+	{ CG_CAPITAL, 'L', CG_CEDILLA },
+	{ CG_SMALL, 'l', CG_CEDILLA },
+	{ CG_CAPITAL, 'L', CG_COMMA_URI },
+	{ CG_SMALL, 'l', CG_COMMA_UR },
+	{ CG_CAPITAL, 'L', CG_MIDDLE_DOT },
+	{ CG_SMALL, 'l', CG_MIDDLE_DOT },
+	{ CG_CAPITAL, 'L', CG_STROKE },
+	{ CG_SMALL, 'l', CG_STROKE },
+	{ CG_CAPITAL, 'N', CG_ACUTE },
+	{ CG_SMALL, 'n', CG_ACUTE },
+	{ CG_CAPITAL, 'N', CG_CEDILLA },
+	{ CG_SMALL, 'n', CG_CEDILLA },
+	{ CG_CAPITAL, 'N', CG_CARON },
+	{ CG_SMALL, 'n', CG_CARON },
+	{ CG_NONE, 0, 0 }, // CG_SMALL, 'N PRECEDED BY APOSTROPHE
+	{ CG_NONE, 0, 0 }, //CG_CAPITAL, 'ENG
+	{ CG_NONE, 0, 0 }, //CG_SMALL, 'ENG
+	{ CG_CAPITAL, 'O', CG_MACRON },
+	{ CG_SMALL, 'o', CG_MACRON },
+	{ CG_CAPITAL, 'O', CG_BREVE },
+	{ CG_SMALL, 'o', CG_BREVE },
+	{ CG_CAPITAL, 'O', CG_DOUBLE_ACUTE },
+	{ CG_SMALL, 'o', CG_DOUBLE_ACUTE },
+	{ CG_NONE, 0, 0 }, // LATIN CAPITAL LIGATURE OE
+	{ CG_NONE, 0, 0 }, // LATIN SMALL LIGATURE OE
+	{ CG_CAPITAL, 'R', CG_ACUTE },
+	{ CG_SMALL, 'r', CG_ACUTE },
+	{ CG_CAPITAL, 'R', CG_CEDILLA },
+	{ CG_SMALL, 'r', CG_CEDILLA },
+	{ CG_CAPITAL, 'R', CG_CARON },
+	{ CG_SMALL, 'r', CG_CARON },
+	{ CG_CAPITAL, 'S', CG_ACUTE },
+	{ CG_SMALL, 's', CG_ACUTE },
+	{ CG_CAPITAL, 'S', CG_CIRCUMFLEX },
+	{ CG_SMALL, 's', CG_CIRCUMFLEX },
+	{ CG_CAPITAL, 'S', CG_CEDILLA },
+	{ CG_SMALL, 's', CG_CEDILLA },
+	{ CG_CAPITAL, 'S', CG_CARON },
+	{ CG_SMALL, 's', CG_CARON },
+	{ CG_CAPITAL, 'T', CG_CEDILLA },
+	{ CG_SMALL, 't', CG_CEDILLA },
+	{ CG_CAPITAL, 'T', CG_CARON },
+	{ CG_SMALL, 't', CG_COMMA_T },
+	{ CG_CAPITAL, 'T', CG_STROKE },
+	{ CG_SMALL, 't', CG_STROKE },
+	{ CG_CAPITAL, 'U', CG_TILDE },
+	{ CG_SMALL, 'u', CG_TILDE },
+	{ CG_CAPITAL, 'U', CG_MACRON },
+	{ CG_SMALL, 'u', CG_MACRON },
+	{ CG_CAPITAL, 'U', CG_BREVE },
+	{ CG_SMALL, 'u', CG_BREVE },
+	{ CG_CAPITAL, 'U', CG_RING_ABOVE },
+	{ CG_SMALL, 'u', CG_RING_ABOVE },
+	{ CG_CAPITAL, 'U', CG_DOUBLE_ACUTE },
+	{ CG_SMALL, 'u', CG_DOUBLE_ACUTE },
+	{ CG_CAPITAL, 'U', CG_OGONEK },
+	{ CG_SMALL, 'u', CG_OGONEK },
+	{ CG_CAPITAL, 'W', CG_CIRCUMFLEX },
+	{ CG_SMALL, 'w', CG_CIRCUMFLEX },
+	{ CG_CAPITAL, 'Y', CG_CIRCUMFLEX },
+	{ CG_SMALL, 'y', CG_CIRCUMFLEX },
+	{ CG_CAPITAL, 'Y', CG_DIAERESIS },
+	{ CG_CAPITAL, 'Z', CG_ACUTE },
+	{ CG_SMALL, 'z', CG_ACUTE },
+	{ CG_CAPITAL, 'Z', CG_DOT_ABOVE },
+	{ CG_SMALL, 'z', CG_DOT_ABOVE },
+	{ CG_CAPITAL, 'Z', CG_CARON },
+	{ CG_SMALL, 'z', CG_CARON },
+	{ CG_NONE, 0, 0 } // CG_SMALL, 'LONG S
+};
+
+Draw& ScreenInfo();
+
+void FontInfo::ComposeMetrics(Font fnt, CharMetrics *m, int page) const
+{
+	if(fnt.GetFaceInfo() & Font::COMPOSED) {
+		FontInfo fi = ScreenInfo().GetFontInfoW(fnt);
+		for(int i = 0; i < 32; i++) {
+			int c = gc_info[i + (page - 8) * 32].ascii;
+			m[i].lspc = fi.GetLeftSpace(c);
+			m[i].width = fi[c];
+			m[i].rspc = fi.GetRightSpace(c);
+			if(gc_info[i].type == CG_COMMA_UR && !fi.IsFixedPitch())
+				m[i].rspc += m[i].width / 2;
+		}
+	}
+}
+
+void Draw::ComposeText(int x, int y, int angle, const wchar *text, Font font, Color ink,
+                       int n, const int *dx) {
+	if(font.GetFaceInfo() & Font::COMPOSED) {
+		for(int i = 0; i < n; i++)
+			if(text[i] >= 256 && text[i] < 256 + 128) {
+				FontInfo fi = GetFontInfoW(font);
+				Clip(x, y, 9999, fi.GetHeight());
+				Buffer<wchar> ntext(n);
+				double sina;
+				double cosa;
+				Size   offset;
+				if(angle)
+					SinCos(angle, sina, cosa); //TODO global sin tables!
+				int xp = 0;
+				for(int i = 0; i < n; i++) {
+					wchar chr = text[i];
+					ntext[i] = chr;
+					if(chr >= 256 && chr < 256 + 128) {
+						CGInfo f = gc_info[chr - 256];
+						if(f.type != CG_NONE) {
+							ntext[i] = chr = f.ascii;
+							Font mfnt = font;
+							FontInfo mfi = fi;
+							int my = 0;
+							int mx = 0;
+							int cw = fi[f.ascii];
+							int mw = mfi[f.mark];
+							wchar mark = f.mark;
+							if(mark == CG_COMMA_UR && fi.IsFixedPitch())
+								mark = CG_CARON;
+							if(mark == CG_COMMA_T) {
+								my -= 3 * font.GetHeight() / 4;
+								mx += 4 * cw / 10;
+								if(font.IsItalic())
+									mx += mw / 2;
+							}
+							else
+							if(mark == CG_COMMA_UR) {
+								my -= 2 * font.GetHeight() / 3;
+								mx += cw - mw / 4;
+								mark = ',';
+								if(font.IsItalic())
+									mx += mw / 3;
+							}
+							else
+							if(mark == CG_COMMA_URI) {
+								my -= 2 * font.GetHeight() / 3;
+								mx += cw - mw / 2;
+								mark = ',';
+								if(font.IsItalic())
+									mx += mw / 3;
+							}
+							else
+							if(mark != CG_STROKE) {
+								if(f.mark != CG_OGONEK && f.mark != CG_CEDILLA && f.type == CG_CAPITAL) {
+									mfnt = font(9 * font.GetHeight() / 10);
+									mfi = GetFontInfoW(mfnt);
+									my -= mark == CG_RING_ABOVE ? font.GetHeight() / 19
+									                            : font.GetHeight() / 13;
+								}
+								mw = mfi[f.mark];
+								mx += (cw - mw) / 2;
+								if(font.IsItalic())
+									mx += mw / 5;
+							}
+							if(angle)
+								DrawText(int(x + cosa * (xp + mx) + sina * my),
+								         int(y - sina * (xp + mx) + cosa * my),
+								         angle, &mark, mfnt, ink, 1);
+							else
+								DrawText(x + xp + mx, y + my, &mark, mfnt, ink, 1);
+						}
+					}
+					if(angle)
+						DrawTextOp(int(x + cosa * xp), int(y - sina * xp),
+						           angle, &chr, font, ink, 1, dx);
+					if(dx)
+						xp += dx[i];
+					else
+						xp += fi[chr];
+				}
+				if(!angle)
+					DrawTextOp(x, y, angle, ntext, font, ink, n, dx);
+				End();
+				return;
+			}
+	}
+	DrawTextOp(x, y, angle, text, font, ink, n, dx);
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/Draw/Debug.cpp b/uppsrc/Draw/Debug.cpp
new file mode 100644
index 000000000..53ed312ff
--- /dev/null
+++ b/uppsrc/Draw/Debug.cpp
@@ -0,0 +1,564 @@
+#include "Draw.h"
+
+NAMESPACE_UPP
+
+String DumpLanguage(int language)
+{
+	if(IsNull(language))
+		return "Null";
+	char out[5];
+	out[0] = (char)(language >> 24);
+	out[1] = (char)(language >> 16);
+	out[2] = '-';
+	out[3] = (char)(language >> 8);
+	out[4] = (char)(language >> 0);
+	return String(out, 5);
+}
+
+String DumpAlign(int align)
+{
+	String ss;
+	switch(align)
+	{
+	case ALIGN_NULL:    return "ALIGN_NULL";
+	case ALIGN_LEFT:    return "ALIGN_LEFT";
+	case ALIGN_CENTER:  return "ALIGN_CENTER";
+	case ALIGN_RIGHT:   return "ALIGN_RIGHT";
+	case ALIGN_JUSTIFY: return "ALIGN_JUSTIFY";
+	default:            return ss << "ALIGNMENT(" << (int)align << ")";
+	}
+}
+
+String DumpColor(Color color)
+{
+	if(IsNull(color))
+		return "Null";
+	int r = color.GetR(), g = color.GetG(), b = color.GetB();
+	byte xr = -r, xg = -g, xb = -b;
+	static const char *stdc[] = { "Black", "LtBlue", "LtGreen", "LtCyan", "LtRed", "LtMagenta", "Yellow", "White" };
+	if((xr | xg | xb) <= 1)
+		return stdc[4 * xr + 2 * xg + xb];
+	String ss;
+	return ss << "Color(" << r << ", " << g << ", " << b << ")";
+}
+
+String DumpFont(Font font)
+{
+	String out;
+	if(IsNull(font))
+		out << "Font(Null)";
+	else
+	{
+		out << "Font()";
+		out << ".Face("       << font.GetFace()     << ")";
+		out << ".FaceName(\"" << font.GetFaceName() << "\")";
+		out << ".Height("     << font.GetHeight()   << ")";
+		out << ".Width("      << font.GetWidth()    << ")";
+
+		if(font.IsItalic())    out << ".Italic()";
+		if(font.IsBold())      out << ".Bold()";
+		if(font.IsUnderline()) out << ".Underline()";
+		if(font.IsStrikeout()) out << ".Strikeout()";
+	}
+	return out;
+}
+
+String DumpFontInfo(FontInfo fi)
+{
+	String out;
+	out << "FontInfo(font = " << fi.GetFont() << "\n"
+		"\tempty = " << fi.IsEmpty() << "\n"
+		"\tascent = " << fi.GetAscent() << "\n"
+		"\tdescent = " << fi.GetDescent() << "\n"
+		"\texternal leading = " << fi.GetExternal() << "\n"
+		"\tinternal leading = " << fi.GetInternal() << "\n"
+		"\theight = " << fi.GetHeight() << "\n"
+		"\tline height = " << fi.GetLineHeight() << "\n"
+		"\toverhang = " << fi.GetOverhang() << "\n"
+		"\taverage width = " << fi.GetAveWidth() << "\n"
+		"\tmaximum width = " << fi.GetMaxWidth() << "\n"
+		"\tfixed pitch = " << fi.IsFixedPitch() << "\n"
+		"\tscaleable = " << fi.IsScaleable() << "\n"
+		"\tfont height = " << fi.GetFontHeight() << "\n";
+
+	out << "\n\twidth:\n";
+	int i;
+	for(i = 0; i < 256; i++)
+		out << NFormat(i & 15 ? "  " : "\n\t%02x\t", i) << NFormat("%2>d", fi[i]);
+	out << "\n\n\tleft space:\n";
+	for(i = 0; i < 256; i++)
+		out << NFormat(i & 15 ? "  " : "\n\t%02x\t", i) << NFormat("%2>d", fi.GetLeftSpace(i));
+	out << "\n\n\tright space:\n";
+	for(i = 0; i < 256; i++)
+		out << NFormat(i & 15 ? "  " : "\n\t%02x\t", i) << NFormat("%2>d", fi.GetRightSpace(i));
+	out << "\n\n\tkerning:\n";
+	int kp = 0;
+	for(i = 0; i < 256; i++)
+		for(int j = 0; j < 256; j++)
+			if(int k = fi.GetKerning(i, j))
+				out << (kp++ & 7 ? "  " : "\n\t") << NFormat("(%02x,%02x)=%2>d", i, j, k);
+	out << (kp ? "\n" : "\tnone\n");
+	return out;
+}
+
+#ifdef PLATFORM_X11
+enum
+{
+	GCAllMask = GCFunction
+	| GCPlaneMask
+	| GCForeground
+	| GCBackground
+	| GCLineWidth
+	| GCLineStyle
+	| GCCapStyle
+	| GCJoinStyle
+	| GCFillStyle
+	| GCFillRule
+	| GCArcMode
+	| GCTile
+	| GCStipple
+	| GCTileStipXOrigin
+	| GCTileStipYOrigin
+	| GCFont
+	| GCSubwindowMode
+	| GCGraphicsExposures
+	| GCClipXOrigin
+	| GCClipYOrigin
+//	| GCClipMask
+	| GCDashOffset
+//	| GCDashList
+};
+#endif
+
+#ifdef PLATFORM_X11
+String DumpPixmap(Pixmap pixmap)
+{
+	String out;
+	if(pixmap == Pixmap(-1))
+		out << "NULL";
+	else
+	{
+		Window root;
+		int x, y;
+		unsigned width, height, border_width, depth;
+		XGetGeometry(Xdisplay, pixmap, &root, &x, &y, &width, &height, &border_width, &depth);
+		out << (int)width << " x " << (int)height << ", depth = " << (int)depth;
+	}
+	return out;
+}
+#endif
+
+#ifdef PLATFORM_X11
+String DumpXFont(XFont font)
+{
+	XFontStruct *fs = XQueryFont(Xdisplay, font);
+	String out = DumpXFontStruct(fs);
+	if(fs)
+		XFreeFontInfo(NULL, fs, 0);
+	return out;
+}
+#endif
+
+#ifdef PLATFORM_X11
+String DumpXFontStruct(XFontStruct *fs)
+{
+	String out;
+	if(!fs)
+		out << "NULL\n";
+	else
+	{
+		out <<
+		"direction="         << (int)fs -> direction         << "\n"
+		"min_char_or_byte2=" << (int)fs -> min_char_or_byte2 << "\n"
+		"max_char_or_byte2=" << (int)fs -> max_char_or_byte2 << "\n"
+		"min_byte1="         << (int)fs -> min_byte1         << "\n"
+		"max_byte1="         << (int)fs -> max_byte1         << "\n"
+		"all_chars_exist="   << (int)fs -> all_chars_exist   << "\n"
+		"default_char="      << (int)fs -> default_char      << "\n"
+		"n_properties="      << (int)fs -> n_properties      << "\n";
+		for(int i = 0; i < fs -> n_properties; i++)
+		{
+			char *name = XGetAtomName(Xdisplay, fs -> properties[i].name);
+			out << "properties[" << i << "]=" << name << ", card32 = " << (int)fs -> properties[i].card32 << "\n";
+			XFree(name);
+		}
+		out <<
+		"min_bounds=" << (int)fs -> min_bounds.width << " x "
+		<< (int)fs -> min_bounds.ascent << " + " << (int)fs -> min_bounds.descent << "\n"
+		"max_bounds=" << (int)fs -> max_bounds.width << " x "
+		<< (int)fs -> max_bounds.ascent << " + " << (int)fs -> max_bounds.descent << "\n";
+		out <<
+		"ascent=" << (int)fs -> ascent << "\n"
+		"descent=" << (int)fs -> descent << "\n";
+	}
+	return out;
+}
+#endif
+
+#ifdef PLATFORM_X11
+String DumpGC(GC gc)
+{
+	XGCValues values;
+	Zero(values);
+	XGetGCValues(Xdisplay, gc, GCAllMask & ~GCFont, &values);
+	String out = DumpGCValues(values);
+	XFontStruct *gc_font = XQueryFont(Xdisplay, (XID)gc);
+	out << "GCFont=" << DumpXFontStruct(gc_font) << "\n";
+	if(gc_font)
+		XFreeFontInfo(NULL, gc_font, 0);
+	return out;
+}
+#endif
+
+#ifdef PLATFORM_X11
+String DumpGCValues(const XGCValues& gc_values, int mask)
+{
+	String out;
+	if(mask & GCFunction)
+	{
+		static const char *names[] =
+		{
+			"X11_ROP2_ZERO",
+			"X11_ROP2_AND",
+			"X11_ROP2_AND_NOT",
+			"X11_ROP2_COPY",
+			"X11_ROP2_NOT_AND",
+			"X11_ROP2_NOP",
+			"X11_ROP2_XOR",
+			"X11_ROP2_OR",
+			"X11_ROP2_NOT_AND_NOT",
+			"X11_ROP2_NOT_XOR",
+			"X11_ROP2_INVERT",
+			"X11_ROP2_OR_NOT",
+			"X11_ROP2_NOT_COPY",
+			"X11_ROP2_NOT_OR",
+			"X11_ROP2_NOT_OR_NOT",
+			"X11_ROP2_ONE",
+		};
+		ASSERT(__countof(names) == 16);
+		out << "GCFunction=" << (int)gc_values.function << ", " << names[gc_values.function & 15] << "\n";
+	}
+	if(mask & GCPlaneMask)
+		out << "GCPlaneMask=" << Format("%08x", (int)gc_values.plane_mask) << "\n";
+	if(mask & GCForeground)
+		out << "GCForeground=" << Format("%08x", (int)gc_values.foreground) << "\n";
+	if(mask & GCBackground)
+		out << "GCBackground=" << Format("%08x", (int)gc_values.background) << "\n";
+	if(mask & GCLineWidth)
+		out << "GCLineWidth=" << (int)gc_values.line_width << "\n";
+	if(mask & GCLineStyle)
+	{
+		out << "GCLineStyle=" << (int)gc_values.line_style << ", ";
+		switch(gc_values.line_style)
+		{
+		case LineSolid:      out << "LineSolid"; break;
+		case LineOnOffDash:  out << "LineOnOffDash"; break;
+		case LineDoubleDash: out << "LineDoubleDash"; break;
+		default:             out << "unknown"; break;
+		}
+		out << "\n";
+	}
+	if(mask & GCCapStyle)
+	{
+		out << "GCCapStyle=" << (int)gc_values.cap_style << ", ";
+		switch(gc_values.cap_style)
+		{
+		case CapNotLast:    out << "CapNotLast"; break;
+		case CapButt:       out << "CapButt"; break;
+		case CapRound:      out << "CapRound"; break;
+		case CapProjecting: out << "CapProjecting"; break;
+		default:            out << "unknown"; break;
+		}
+		out << "\n";
+	}
+	if(mask & GCJoinStyle)
+	{
+		out << "GCJoinStyle=" << (int)gc_values.join_style << ", ";
+		switch(gc_values.join_style)
+		{
+		case JoinMiter: out << "JoinMiter"; break;
+		case JoinRound: out << "JoinRound"; break;
+		case JoinBevel: out << "JoinBevel"; break;
+		default:        out << "unknown"; break;
+		}
+		out << "\n";
+	}
+	if(mask & GCFillStyle)
+	{
+		out << "GCFillStyle=" << (int)gc_values.fill_style << ", ";
+		switch(gc_values.fill_style)
+		{
+		case FillSolid:          out << "FillSolid"; break;
+		case FillTiled:          out << "FillTiled"; break;
+		case FillStippled:       out << "FillStippled"; break;
+		case FillOpaqueStippled: out << "FillOpaqueStippled"; break;
+		default:                 out << "unknown"; break;
+		}
+		out << "\n";
+	}
+	if(mask & GCFillRule)
+	{
+		out << "GCFillRule=" << (int)gc_values.fill_rule << ", ";
+		switch(gc_values.fill_rule)
+		{
+		case EvenOddRule: out << "EvenOddRule"; break;
+		case WindingRule: out << "WindingRule"; break;
+		default:          out << "unknown"; break;
+		}
+		out << "\n";
+	}
+	if(mask & GCArcMode)
+	{
+		out << "GCArcMode=" << (int)gc_values.arc_mode << ", ";
+		switch(gc_values.arc_mode)
+		{
+		case ArcChord:    out << "ArcChord"; break;
+		case ArcPieSlice: out << "ArcPieSlice"; break;
+		default:          out << "unknown"; break;
+		}
+		out << "\n";
+	}
+	if(mask & GCTile)
+		out << "GCTile=" << DumpPixmap(gc_values.tile) << "\n";
+	if(mask & GCStipple)
+		out << "GCStipple=" << DumpPixmap(gc_values.stipple) << "\n";
+	if(mask & GCTileStipXOrigin)
+		out << "GCTileStipXOrigin=" << (int)gc_values.ts_x_origin << "\n";
+	if(mask & GCTileStipYOrigin)
+		out << "GCTileStipYOrigin=" << (int)gc_values.ts_y_origin << "\n";
+	if(mask & GCFont)
+		out << "GCFont=" << DumpXFont(gc_values.font) << "\n";
+	if(mask & GCSubwindowMode)
+	{
+		out << "GCSubwindowMode=" << (int)gc_values.subwindow_mode << ", ";
+		switch(gc_values.subwindow_mode)
+		{
+		case ClipByChildren:   out << "ClipByChildren"; break;
+		case IncludeInferiors: out << "IncludeInferiors"; break;
+		default:               out << "unknown"; break;
+		}
+	}
+	if(mask & GCGraphicsExposures)
+		out << "GCGraphicsExposures=" << (gc_values.graphics_exposures ? "true" : "false") << "\n";
+	if(mask & GCClipXOrigin)
+		out << "GCClipXOrigin=" << (int)gc_values.clip_x_origin;
+	if(mask & GCClipYOrigin)
+		out << "GCClipYOrigin=" << (int)gc_values.clip_y_origin;
+//	if(mask & GCClipMask)
+//		out << "GCClipMask=" << DumpPixmap(gc_values.clip_mask);
+	if(mask & GCDashOffset)
+		out << "GCDashOffset=" << (int)gc_values.dash_offset;
+//	if(mask & GCDashList)
+//		out << "GCDashList=" << Format("%02x\n", gc_values.dashes);
+	return out;
+}
+#endif
+
+#ifdef PLATFORM_X11
+String DumpEvent(XEvent *event)
+{
+	String out;
+	if(!event)
+		out << "NULL";
+	else
+	{
+		out << "event_type=" << (int)event -> type << ", ";
+		switch(event -> type)
+		{
+		case KeyPress:
+			out << "KeyPress, state=" << (int)event -> xkey.state << ", keycode=" << (int)event -> xkey.keycode;
+			break;
+
+		case KeyRelease:
+			out << "KeyRelease, state=" << (int)event -> xkey.state << ", keycode=" << (int)event -> xkey.keycode;
+			break;
+
+		case ButtonPress:
+			out << "ButtonPress, x=" << (int)event -> xbutton.x << ", y=" << (int)event -> xbutton.y << ", state=" << (int)event -> xbutton.state << ", button=" << (int)event -> xbutton.button;
+			break;
+
+		case ButtonRelease:
+			out << "ButtonRelease, x=" << (int)event -> xbutton.x << ", y=" << (int)event -> xbutton.y << ", state=" << (int)event -> xbutton.state << ", button=" << (int)event -> xbutton.button;
+			break;
+
+		case MotionNotify:
+			out << "MotionNotify, x=" << (int)event -> xmotion.x << ", y=" << (int)event -> xmotion.y << ", state=" << (int)event -> xmotion.state;
+			break;
+
+		case EnterNotify:
+		case LeaveNotify:
+			out << (event -> type == EnterNotify ? "EnterNotify" : "LeaveNotify") << ", mode=";
+			switch(event -> xcrossing.mode)
+			{
+			case NotifyNormal: out << "NotifyNormal"; break;
+			case NotifyGrab:   out << "NotifyGrab"; break;
+			case NotifyUngrab: out << "NotifyUngrab"; break;
+			default:           out << "unknown"; break;
+			}
+			out << ", detail=";
+			switch(event -> xcrossing.detail)
+			{
+			case NotifyAncestor:         out << "NotifyAncestor"; break;
+			case NotifyVirtual:          out << "NotifyVirtual"; break;
+			case NotifyInferior:         out << "NotifyInferior"; break;
+			case NotifyNonlinear:        out << "NotifyNonlinear"; break;
+			case NotifyNonlinearVirtual: out << "NotifyNonlinearVirtual"; break;
+			default:                     out << "unknown (" << (int)event -> xcrossing.detail << ")"; break;
+			}
+			out << ", same_screen=" << (event -> xcrossing.same_screen ? "true" : "false")
+			<< ", focus=" << (event -> xcrossing.focus ? "true" : "false")
+			<< ", state=" << (int)event -> xcrossing.state;
+			break;
+
+		case FocusIn:
+		case FocusOut:
+			out << (event -> type == FocusIn ? "FocusIn" : "FocusOut") << ", mode=";
+			switch(event -> xfocus.mode)
+			{
+			case NotifyNormal: out << "NotifyNormal"; break;
+			case NotifyGrab:   out << "NotifyGrab"; break;
+			case NotifyUngrab: out << "NotifyUngrab"; break;
+			default:           out << "unknown"; break;
+			}
+			out << ", detail=";
+			switch(event -> xfocus.detail)
+			{
+			case NotifyAncestor:         out << "NotifyAncestor"; break;
+			case NotifyVirtual:          out << "NotifyVirtual"; break;
+			case NotifyInferior:         out << "NotifyInferior"; break;
+			case NotifyNonlinear:        out << "NotifyNonlinear"; break;
+			case NotifyNonlinearVirtual: out << "NotifyNonlinearVirtual"; break;
+			case NotifyPointer:          out << "NotifyPointer"; break;
+			case NotifyPointerRoot:      out << "NotifyPointerRoot"; break;
+			case NotifyDetailNone:       out << "NotifyDetailNone"; break;
+			default:                     out << "unknown (" << (int)event -> xfocus.detail << ")"; break;
+			}
+			break;
+
+		case KeymapNotify:
+			out << "KeymapNotify";
+			break;
+
+		case Expose:
+			out << "Expose [" << event -> xexpose.x << ", " << event -> xexpose.y
+			<< " - " << (event -> xexpose.x + event -> xexpose.width)
+			<< ", " << (event -> xexpose.y + event -> xexpose.height) << "], count=" << event -> xexpose.count;
+			break;
+
+		case GraphicsExpose:
+			out << "GraphicsExpose [" << event -> xgraphicsexpose.x << ", " << event -> xgraphicsexpose.y
+			<< " - " << (event -> xgraphicsexpose.x + event -> xgraphicsexpose.width)
+			<< ", " << (event -> xgraphicsexpose.y + event -> xgraphicsexpose.height) << "], "
+			"count=" << event -> xgraphicsexpose.count
+			<< ", major_code=" << (int)event -> xgraphicsexpose.major_code
+			<< ", minor_code=" << (int)event -> xgraphicsexpose.minor_code;
+			break;
+
+		case NoExpose:
+			out << "NoExpose"
+			<< ", major_code=" << (int)event -> xnoexpose.major_code
+			<< ", minor_code=" << (int)event -> xnoexpose.minor_code;
+			break;
+
+		case VisibilityNotify:
+			out << "VisibilityNotify, state=" << (int)event -> xvisibility.state;
+			break;
+
+		case CreateNotify:
+			out << "CreateNotify [" << event -> xcreatewindow.x << ", " << event -> xcreatewindow.y
+			<< " - " << (event -> xcreatewindow.x + event -> xcreatewindow.width)
+			<< ", " << (event -> xcreatewindow.y + event -> xcreatewindow.height) << "], "
+			"border_width=" << event -> xcreatewindow.border_width << ", "
+			"override_redirect=" << (event -> xcreatewindow.override_redirect ? "true" : "false");
+			break;
+
+		case DestroyNotify:
+			out << "DestroyNotify";
+			break;
+
+		case UnmapNotify:
+			out << "UnmapNotify";
+			break;
+
+		case MapNotify:
+			out << "MapNotify";
+			break;
+
+		case MapRequest:
+			out << "MapRequest";
+			break;
+
+		case ReparentNotify:
+			out << "ReparentNotify";
+			break;
+
+		case ConfigureNotify:
+			out << "ConfigureNotify";
+			break;
+
+		case ConfigureRequest:
+			out << "ConfigureRequest";
+			break;
+
+		case GravityNotify:
+			out << "GravityNotify";
+			break;
+
+		case ResizeRequest:
+			out << "ResizeRequest";
+			break;
+
+		case CirculateNotify:
+			out << "CirculateNotify";
+			break;
+
+		case CirculateRequest:
+			out << "CirculateRequest";
+			break;
+
+		case PropertyNotify:
+			out << "PropertyNotify";
+			break;
+
+		case SelectionClear:
+			out << "SelectionClear";
+			break;
+
+		case SelectionRequest:
+			out << "SelectionRequest";
+			break;
+
+		case SelectionNotify:
+			out << "SelectionNotify";
+			break;
+
+		case ColormapNotify:
+			out << "ColormapNotify";
+			break;
+
+		case ClientMessage:
+			out << "ClientMessage";
+			break;
+
+		case MappingNotify:
+			out << "MappingNotify";
+			break;
+		}
+	}
+	return out;
+}
+#endif
+
+#ifdef PLATFORM_WIN32
+int GdiGetFreeSpace()
+{
+	Vector<HPEN> objects;
+	for(HPEN pen; pen = CreatePen(PS_SOLID, 0, LtGray()); objects.Add(pen))
+		;
+	for(int i = 0; i < objects.GetCount(); DeleteObject(objects[i++]))
+		;
+	return objects.GetCount();
+}
+#endif
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/Draw/Debug.h b/uppsrc/Draw/Debug.h
new file mode 100644
index 000000000..3f6c5f6d9
--- /dev/null
+++ b/uppsrc/Draw/Debug.h
@@ -0,0 +1,46 @@
+String DumpLanguage(int language);
+String DumpColor(Color color);
+String DumpFont(Font font);
+String DumpFontInfo(FontInfo fi);
+String DumpAlign(int align);
+#ifdef PLATFORM_X11
+String DumpPixmap(Pixmap pixmap);
+String DumpXFont(XFont font);
+String DumpXFontStruct(XFontStruct *fs);
+String DumpGC(GC gc);
+String DumpGCValues(const XGCValues& gc_values, int mask = -1);
+String DumpEvent(XEvent *event);
+#endif//PLATFORM_X11
+
+class SimpleTiming
+{
+public:
+	SimpleTiming(const char *name) : name(name)
+	{
+		last_ticks = start_ticks = GetTickCount();
+		RLOG(name << " (open) & " << start_ticks);
+	}
+
+	void Show(const char *part)
+	{
+		int ticks = GetTickCount();
+		RLOG(name << " in " << (ticks - start_ticks) <<
+		", " << part << " in " << (ticks - last_ticks));
+		last_ticks = ticks;
+	}
+
+	~SimpleTiming()
+	{
+		int ticks = GetTickCount();
+		String out;
+		RLOG(name << " done in " << (ticks - start_ticks)
+		<< ", last part in " << (ticks - last_ticks));
+	}
+
+private:
+	String name;
+	int    start_ticks;
+	int    last_ticks;
+};
+
+int GdiGetFreeSpace();
diff --git a/uppsrc/Draw/Display.cpp b/uppsrc/Draw/Display.cpp
new file mode 100644
index 000000000..d25aef802
--- /dev/null
+++ b/uppsrc/Draw/Display.cpp
@@ -0,0 +1,321 @@
+#include "Draw.h"
+
+NAMESPACE_UPP
+
+#define IMAGECLASS DrawImg
+#define IMAGEFILE <Draw/DrawImg.iml>
+#include <Draw/iml.h>
+
+#define LLOG(x) // RLOG(x)
+
+AttrText::operator Value() const
+{
+	return RawToValue(*this);
+}
+
+void AttrText::Init()
+{
+	ink = Null;
+	paper = Null;
+	font = Null;
+	align = Null;
+}
+
+AttrText::AttrText(const char *_text)
+{
+	text = _text;
+	Init();
+}
+
+AttrText::AttrText(const wchar *_text)
+{
+	text = _text;
+	Init();
+}
+
+AttrText::AttrText(const WString& _text)
+{
+	text = _text;
+	Init();
+}
+
+class StdDisplayClass : public Display
+{
+public:
+	StdDisplayClass(int align = ALIGN_LEFT) : align(align) {}
+
+	virtual void Paint0(Draw& draw, const Rect& rc, const Value& v, Color ink, Color paper, dword style) const;
+	virtual void Paint(Draw& draw, const Rect& rc, const Value& v, Color ink, Color paper, dword style) const;
+	virtual Size GetStdSize(const Value& q) const;
+
+private:
+	int    align;
+};
+
+void Display::PaintBackground(Draw& w, const Rect& r, const Value& q,
+                              Color ink, Color paper, dword style) const
+{
+	if(IsType<AttrText>(q)) {
+		const AttrText& t = ValueTo<AttrText>(q);
+		if(!IsNull(t.paper))
+			paper = t.paper;
+	}
+	w.DrawRect(r, paper);
+}
+
+void Display::Paint(Draw& w, const Rect& r, const Value& q, Color ink, Color paper, dword style) const
+{
+	StdDisplay().Paint(w, r, q, ink, paper, style);
+}
+
+Size Display::RatioSize(const Value& q, int cx, int cy) const {
+	return Size(cx, cy);
+}
+
+Size Display::GetStdSize(const Value& q) const
+{
+	return Size(8, 8);
+}
+
+void StdDisplayClass::Paint0(Draw& w, const Rect& r, const Value& q,
+                             Color ink, Color paper, dword s) const {
+	LLOG("Display::Paint0: " << q << " ink:" << ink << " paper:" << paper);
+	WString txt;
+	Font font = StdFont();
+	int a = align;
+	if(IsType<AttrText>(q)) {
+		const AttrText& t = ValueTo<AttrText>(q);
+		txt = t.text;
+		if(!IsNull(t.paper))
+			paper = t.paper;
+		if(!IsNull(t.ink))
+			ink = t.ink;
+		if(!IsNull(t.font))
+			font = t.font;
+		if(!IsNull(t.align))
+			a = t.align;
+	}
+	else
+		txt = IsString(q) ? q : StdConvert().Format(q);
+	int x = r.left;
+	Size tsz = GetTLTextSize(txt, font);
+	if(a == ALIGN_RIGHT)
+		x = r.right - tsz.cx;
+	if(a == ALIGN_CENTER)
+		x += (r.Width() - tsz.cx) / 2;
+	int tcy = GetTLTextHeight(txt, font);
+	int tt = r.top + max((r.Height() - tcy) / 2, 0);
+	if(tsz.cx > r.GetWidth()) {
+		Size isz = DrawImg::threedots().GetSize();
+		int wd = r.GetWidth() - isz.cx;
+		w.Clip(r.left, r.top, wd, r.GetHeight());
+		DrawTLText(w, x, tt, r.Width(), txt, font, ink);
+		w.End();
+		w.DrawImage(r.left + wd, tt + font.Info().GetAscent() - isz.cy, DrawImg::threedots(), ink);
+	}
+	else
+		DrawTLText(w, x, tt, r.Width(), txt, font, ink);
+}
+
+void StdDisplayClass::Paint(Draw& w, const Rect& r, const Value& q,
+                    Color ink, Color paper, dword s) const {
+	LLOG("Display::Paint: " << q << " ink:" << ink << " paper:" << paper);
+	PaintBackground(w, r, q, ink, paper, s);
+	Paint0(w, r, q, ink, paper, s);
+}
+
+Size StdDisplayClass::GetStdSize(const Value& q) const
+{
+	Font font = StdFont();
+	WString txt;
+	if(IsType<AttrText>(q)) {
+		const AttrText& t = ValueTo<AttrText>(q);
+		txt = t.text;
+		if(!IsNull(t.font))
+			font = t.font;
+	}
+	else
+		txt = IsString(q) ? q : StdConvert().Format(q);
+	return GetTLTextSize(txt, font);
+}
+
+#ifdef flagSO
+Display::Display() {}
+#endif
+
+Display::~Display() {}
+
+const Display& GLOBAL_V_INIT(StdDisplayClass, StdDisplay)
+const Display& GLOBAL_VP_INIT(StdDisplayClass, StdCenterDisplay, (ALIGN_CENTER))
+const Display& GLOBAL_VP_INIT(StdDisplayClass, StdRightDisplay, (ALIGN_RIGHT))
+
+#ifdef flagSO
+ColorDisplayNull::ColorDisplayNull(String nulltext) : nulltext(nulltext) {}
+ColorDisplayNull::~ColorDisplayNull() {}
+#endif
+
+void  ColorDisplayNull::Paint(Draw& w, const Rect& r, const Value& q,
+							 Color ink, Color paper, dword style) const
+{
+	if(IsNull(q))
+		PaintBackground(w, r, q, ink, paper, style);
+	else
+		w.DrawRect(r, Color(q));
+}
+
+const Display& ColorDisplay() { return Single<ColorDisplayNull>(); }
+
+class SizeTextDisplayCls : public Display {
+public:
+	virtual void Paint(Draw& w, const Rect& r, const Value& q,
+		               Color ink, Color paper, dword style) const;
+};
+
+void  SizeTextDisplayCls::Paint(Draw& w, const Rect& r, const Value& q,
+								Color ink, Color, dword) const {
+	w.DrawText(r.left, r.top, r.Width(), (String)q, Arial(-r.Height()), ink);
+}
+
+const Display& SizeTextDisplay() { return Single<SizeTextDisplayCls>(); }
+
+static inline int NScale(int sz, int r) {
+	return sz ? sz < r ? r / sz * sz : r : 0;
+}
+
+class CenteredImageDisplayCls : public Display {
+public:
+	virtual void Paint(Draw& w, const Rect& r, const Value& q,
+		               Color ink, Color paper, dword style) const
+	{
+		w.DrawRect(r, paper);
+		Image m = q;
+		Size sz = m.GetSize();
+		if(!IsNull(m))
+			w.DrawImage(r.left + (r.Width() - sz.cx) / 2, r.top + (r.Height() - sz.cy) / 2, m);
+	}
+	virtual Size GetStdSize(const Value& q) const
+	{
+		return Image(q).GetSize();
+	}
+};
+
+const Display& CenteredImageDisplay() { return Single<CenteredImageDisplayCls>(); }
+
+class CenteredHighlightImageDisplayCls : public Display {
+public:
+	virtual void Paint(Draw& w, const Rect& r, const Value& q,
+		               Color ink, Color paper, dword style) const
+	{
+		w.DrawRect(r, paper);
+		Image m = q;
+		Size sz = m.GetSize();
+		if(!IsNull(m))
+			DrawHighlightImage(w, r.left + (r.Width() - sz.cx) / 2,
+			                      r.top + (r.Height() - sz.cy) / 2, m);
+	}
+	virtual Size GetStdSize(const Value& q) const
+	{
+		return Image(q).GetSize();
+	}
+};
+
+const Display& CenteredHighlightImageDisplay()
+{
+	return Single<CenteredHighlightImageDisplayCls>();
+}
+
+class ImageDisplayCls : public Display {
+public:
+	virtual void Paint(Draw& w, const Rect& r, const Value& q,
+		               Color ink, Color paper, dword style) const
+	{
+		w.DrawRect(r, paper);
+		Image m = q;
+		if(!IsNull(m))
+			w.DrawImage(r.left, r.top, Rescale(m, r.GetSize()));
+	}
+	virtual Size GetStdSize(const Value& q) const
+	{
+		return Image(q).GetSize();
+	}
+};
+
+const Display& ImageDisplay() { return Single<ImageDisplayCls>(); }
+
+class FittedImageDisplayCls : public Display {
+public:
+	virtual void Paint(Draw& w, const Rect& r, const Value& q,
+		               Color ink, Color paper, dword style) const
+	{
+		w.DrawRect(r, paper);
+		Image m = q;
+		if(!IsNull(m)) {
+			Size sz = GetFitSize(m.GetSize(), r.Size());
+			Point p = r.CenterPos(sz);
+			w.DrawImage(p.x, p.y, m);
+		}
+	}
+	virtual Size GetStdSize(const Value& q) const
+	{
+		return Image(q).GetSize();
+	}
+};
+
+const Display& FittedImageDisplay() { return Single<FittedImageDisplayCls>(); }
+
+class DrawingDisplayCls : public Display {
+public:
+	virtual void Paint(Draw& w, const Rect& r, const Value& q,
+		               Color ink, Color paper, dword style) const;
+	virtual Size GetStdSize(const Value& q) const;
+	virtual Size RatioSize(const Value& q, int cx, int cy) const;
+};
+
+void DrawingDisplayCls::Paint(Draw& w, const Rect& r, const Value& q,
+							  Color, Color, dword) const {
+	w.DrawDrawing(r, q);
+}
+
+Size DrawingDisplayCls::GetStdSize(const Value& q) const {
+	return ((const Drawing&) q).GetSize();
+}
+
+Size DrawingDisplayCls::RatioSize(const Value& q, int cx, int cy) const {
+	return ((const Drawing&) q).RatioSize(cx, cy);
+}
+
+const Display& DrawingDisplay() { return Single<DrawingDisplayCls>(); }
+
+Size  PaintRect::GetStdSize() const {
+	return display ? display->GetStdSize(value) : Size(0, 0);
+}
+
+Size  PaintRect::RatioSize(int cx, int cy) const {
+	return display ? display->RatioSize(value, cx, cy) : Size(0, 0);
+}
+
+void  PaintRect::Paint(Draw& w, const Rect& r,
+                       Color ink, Color paper, dword style) const {
+	if(display)
+		display->Paint(w, r, value, ink, paper, style);
+}
+
+void  PaintRect::Paint(Draw& w, int x, int y, int cx, int cy,
+					   Color ink, Color paper, dword style) const {
+	Paint(w, RectC(x, y, cx, cy), ink, paper, style);
+}
+
+PaintRect::PaintRect() {
+	display = NULL;
+}
+
+PaintRect::PaintRect(const Display& _display) {
+	display = &_display;
+}
+
+PaintRect::PaintRect(const Display& _display, const Value& _val) {
+	display = &_display;
+	value = _val;
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/Draw/Display.h b/uppsrc/Draw/Display.h
new file mode 100644
index 000000000..204c5095f
--- /dev/null
+++ b/uppsrc/Draw/Display.h
@@ -0,0 +1,100 @@
+class Display {
+public:
+	enum {
+		CURSOR   = 0x01,
+		FOCUS    = 0x02,
+		SELECT   = 0x04,
+		READONLY = 0x08,
+	};
+
+	virtual void PaintBackground(Draw& w, const Rect& r, const Value& q,
+	                             Color ink, Color paper, dword style) const;
+	virtual void Paint(Draw& w, const Rect& r, const Value& q,
+		               Color ink, Color paper, dword style) const;
+	virtual Size GetStdSize(const Value& q) const;
+	virtual Size RatioSize(const Value& q, int cx, int cy) const;
+#ifdef flagSO
+	Display();
+#endif
+	virtual ~Display();
+};
+
+struct AttrText {
+	WString text;
+	Font    font;
+	Color   ink;
+	Color   paper;
+	int     align;
+
+	AttrText& Ink(Color c)              { ink = c; return *this; }
+	AttrText& Paper(Color c)            { paper = c; return *this; }
+	AttrText& SetFont(Font f)           { font = f; return *this; }
+	AttrText& Align(int a)              { align = a; return *this; }
+	AttrText& Left()                    { return Align(ALIGN_LEFT); }
+	AttrText& Center()                  { return Align(ALIGN_CENTER); }
+	AttrText& Right()                   { return Align(ALIGN_RIGHT); }
+
+	operator Value() const;
+
+	AttrText(const char *text);
+	AttrText(const wchar *text);
+	AttrText(const WString& text);
+
+private:
+	void Init();
+};
+
+const Display& StdDisplay();
+const Display& StdCenterDisplay();
+const Display& StdRightDisplay();
+
+const Display& ColorDisplay();
+const Display& SizeTextDisplay();
+const Display& ImageDisplay();
+const Display& FittedImageDisplay();
+const Display& CenteredImageDisplay();
+const Display& CenteredHighlightImageDisplay();
+const Display& DrawingDisplay();
+
+class ColorDisplayNull : public Display {
+public:
+#ifdef flagSO
+	ColorDisplayNull(String nulltext = Null);
+	virtual ~ColorDisplayNull();
+#else
+	ColorDisplayNull(String nulltext = Null) : nulltext(nulltext) {}
+#endif
+	virtual void Paint(Draw& w, const Rect& r, const Value& q,
+		               Color ink, Color paper, dword style) const;
+private:
+	String nulltext;
+};
+
+class PaintRect : Moveable<PaintRect> {
+protected:
+	Value          value;
+	const Display *display;
+
+public:
+	void     Paint(Draw& w, const Rect& r,
+	               Color ink = SColorText, Color paper = SColorPaper, dword style = 0) const;
+	void     Paint(Draw& w, int x, int y, int cx, int cy,
+		           Color ink = SColorText, Color paper = SColorPaper, dword style = 0) const;
+	Size     GetStdSize() const;
+	Size     RatioSize(int cx, int cy) const;
+	Size     RatioSize(Size sz) const              { return RatioSize(sz.cx, sz.cy); }
+
+	void     SetDisplay(const Display& d)          { display = &d; }
+	void     SetValue(const Value& v)              { value = v; }
+	void     Set(const Display& d, const Value& v) { display = &d; value = v; }
+	void     Clear()                               { display = NULL; }
+
+	const Value&   GetValue() const                { return value; }
+	const Display& GetDisplay() const              { return *display; }
+
+	operator bool() const                          { return display; }
+
+	PaintRect();
+	PaintRect(const Display& display);
+	PaintRect(const Display& display, const Value& val);
+};
diff --git a/uppsrc/Draw/Draw.cpp b/uppsrc/Draw/Draw.cpp
new file mode 100644
index 000000000..d3c8c8dce
--- /dev/null
+++ b/uppsrc/Draw/Draw.cpp
@@ -0,0 +1,359 @@
+#include "Draw.h"
+
+NAMESPACE_UPP
+
+#define LLOG(x)    // RLOG(x)
+#define LTIMING(x) // RTIMING(x)
+//#define BENCH
+
+static StaticMutex sDrawLock;
+
+#ifdef BENCH
+static TimingInspector sDrawTiming("DRAW");
+#endif
+
+void EnterDraw() {
+	sDrawLock.Enter();
+#ifdef BENCH
+	sDrawTiming.Start();
+#endif
+}
+
+void LeaveDraw() {
+#ifdef BENCH
+	sDrawTiming.End();
+#endif
+	sDrawLock.Leave();
+}
+
+void Draw::StartPage() {}
+void Draw::EndPage() {}
+
+// -------------------------------
+
+bool Draw::IsDrawing() const
+{
+	return dynamic_cast<const DrawingDraw *>(this);
+}
+
+Stream& Draw::DrawingOp(int code)
+{
+	ASSERT(IsDrawing());
+	Stream& drawing = static_cast<DrawingDraw *>(this)->GetStream();
+	drawing / code;
+	return drawing;
+}
+
+/*
+Stream& Draw::PutRect(const Rect& r)
+{
+	ASSERT(IsDrawing());
+	Stream& drawing = dynamic_cast<DrawingDraw *>(this)->GetStream();
+	return Pack16(drawing, const_cast<Rect&>(r));
+}
+*/
+
+// -------------------------------
+
+void Draw::DrawImageOp(int x, int y, int cx, int cy, const Image& img, const Rect& src, Color color)
+{
+	DrawLock __;
+	LTIMING("DrawImageOp");
+	if(IsNull(src))
+		return;
+	Size sz = Size(cx, cy);
+	if((cx > 2000 || cy > 2000) && IsNull(color) && (!IsSystem() || IsPrinter())) {
+		int yy = 0;
+		ImageRaster ir(img);
+		RescaleImage rm;
+		rm.Create(Size(cx, cy), ir, src);
+		while(yy < cy) {
+			int ccy = min(cy - yy, 16);
+			ImageBuffer ib(cx, ccy);
+			for(int q = 0; q < ccy; q++)
+				rm.Get(ib[q]);
+			DrawImageBandRLE(*this, x, y + yy, ib, 16);
+			yy += ccy;
+		}
+		return;
+	}
+	if(src.GetSize() == sz)
+		img.PaintImage(*this, x, y, src, color);
+	else {
+		Image h = Rescale(img, Size(cx, cy), src);
+		h.PaintImage(*this, x, y, h.GetSize(), color);
+	}
+}
+
+// -------------------------------
+
+void Draw::DrawRect(const Rect& rect, Color color)
+{
+	DrawRect(rect.left, rect.top, rect.GetWidth(), rect.GetHeight(), color);
+}
+
+void Draw::DrawImage(int x, int y, int cx, int cy, const Image& img, const Rect& src)
+{
+	DrawImageOp(x, y, cx, cy, img, src, Null);
+}
+
+void Draw::DrawImage(int x, int y, int cx, int cy, const Image& img)
+{
+	DrawImage(x, y, cx, cy, img, img.GetSize());
+}
+
+void Draw::DrawImage(int x, int y, int cx, int cy, const Image& img, const Rect& src, Color color)
+{
+	if(IsNull(color)) return;
+	DrawImageOp(x, y, cx, cy, img, src, color);
+}
+
+void Draw::DrawImage(int x, int y, int cx, int cy, const Image& img, Color color)
+{
+	if(IsNull(color)) return;
+	DrawImage(x, y, cx, cy, img, img.GetSize(), color);
+}
+
+void Draw::DrawImage(const Rect& r, const Image& img, const Rect& src)
+{
+	DrawImage(r.left, r.top, r.Width(), r.Height(), img, src);
+}
+
+void Draw::DrawImage(const Rect& r, const Image& img)
+{
+	DrawImage(r.left, r.top, r.Width(), r.Height(), img);
+}
+
+void Draw::DrawImage(const Rect& r, const Image& img, const Rect& src, Color color)
+{
+	if(IsNull(color)) return;
+	DrawImage(r.left, r.top, r.Width(), r.Height(), img, src, color);
+}
+
+void Draw::DrawImage(const Rect& r, const Image& img, Color color)
+{
+	if(IsNull(color)) return;
+	DrawImage(r.left, r.top, r.Width(), r.Height(), img, color);
+}
+
+void Draw::DrawImage(int x, int y, const Image& img, const Rect& src)
+{
+	Size sz = src.GetSize();
+	DrawImageOp(x, y, sz.cx, sz.cy, img, src, Null);
+}
+
+void Draw::DrawImage(int x, int y, const Image& img)
+{
+	Size sz = img.GetSize();
+	DrawImageOp(x, y, sz.cx, sz.cy, img, img.GetSize(), Null);
+}
+
+void Draw::DrawImage(int x, int y, const Image& img, const Rect& src, Color color)
+{
+	if(IsNull(color)) return;
+	Size sz = img.GetSize();
+	DrawImageOp(x, y, sz.cx, sz.cy, img, src, color);
+}
+
+void Draw::DrawImage(int x, int y, const Image& img, Color color)
+{
+	if(IsNull(color)) return;
+	Size sz = img.GetSize();
+	DrawImageOp(x, y, sz.cx, sz.cy, img, img.GetSize(), color);
+}
+
+void Draw::DrawData(int x, int y, int cx, int cy, const String& data, const char *type)
+{
+	DrawDataOp(x, y, cx, cy, data, type);
+}
+
+void Draw::DrawData(const Rect& r, const String& data, const char *type)
+{
+	DrawDataOp(r.left, r.top, r.GetWidth(), r.GetHeight(), data, type);
+}
+
+void Draw::DrawLine(Point p1, Point p2, int width, Color color)
+{
+	DrawLine(p1.x, p1.y, p2.x, p2.y, width, color);
+}
+
+#ifndef PLATFORM_WINCE
+void Draw::DrawPolyPolyline(const Vector<Point>& vertices, const Vector<int>& counts,
+                            int width, Color color, Color doxor)
+{
+	DrawPolyPolyline(vertices.Begin(), vertices.GetCount(),
+		             counts.Begin(), counts.GetCount(),
+		             width, color, doxor);
+}
+
+void Draw::DrawPolyline(const Point *vertices, int count,
+                        int width, Color color, Color doxor)
+{
+	DrawPolyPolyline(vertices, count, &count, 1, width, color, doxor);
+}
+
+void Draw::DrawPolyline(const Vector<Point>& vertices,
+                        int width, Color color, Color doxor)
+{
+	DrawPolyline(vertices.Begin(), vertices.GetCount(), width, color, doxor);
+}
+
+void Draw::DrawPolyPolyPolygon(const Vector<Point>& vertices,
+                           const Vector<int>& subpolygon_counts,
+                           const Vector<int>& disjunct_polygon_counts,
+                           Color color, int width, Color outline,
+                           uint64 pattern, Color doxor)
+{
+	DrawPolyPolyPolygon(vertices.Begin(), vertices.GetCount(),
+	                    subpolygon_counts.Begin(), subpolygon_counts.GetCount(),
+	                    disjunct_polygon_counts.Begin(), disjunct_polygon_counts.GetCount(),
+	                    color, width, outline, pattern, doxor);
+}
+
+void Draw::DrawPolyPolygon(const Point *vertices, int vertex_count,
+                       const int *subpolygon_counts, int subpolygon_count_count,
+                       Color color, int width, Color outline, uint64 pattern, Color doxor)
+{
+	DrawPolyPolyPolygon(vertices, vertex_count,
+	                    subpolygon_counts, subpolygon_count_count, &vertex_count, 1,
+	                    color, width, outline, pattern, doxor);
+}
+
+void Draw::DrawPolyPolygon(const Vector<Point>& vertices, const Vector<int>& subpolygon_counts,
+                       Color color, int width, Color outline, uint64 pattern, Color doxor)
+{
+	DrawPolyPolygon(vertices.Begin(), vertices.GetCount(),
+	                subpolygon_counts.Begin(), subpolygon_counts.GetCount(),
+	                color, width, outline, pattern, doxor);
+}
+
+void Draw::DrawPolygons(const Point *vertices, int vertex_count,
+                    const int *polygon_counts, int polygon_count_count,
+                    Color color, int width, Color outline, uint64 pattern, Color doxor)
+{
+	DrawPolyPolyPolygon(vertices, vertex_count,
+	                    polygon_counts, polygon_count_count,
+	                    polygon_counts, polygon_count_count,
+	                    color, width, outline, pattern, doxor);
+}
+
+void Draw::DrawPolygons(const Vector<Point>& vertices, const Vector<int>& polygon_counts,
+                    Color color, int width, Color outline, uint64 pattern, Color doxor)
+{
+	DrawPolygons(vertices.Begin(), vertices.GetCount(),
+                 polygon_counts.Begin(), polygon_counts.GetCount(),
+                 color, width, outline, pattern, doxor);
+}
+
+void Draw::DrawPolygon(const Point *vertices, int vertex_count,
+                   Color color, int width, Color outline, uint64 pattern, Color doxor)
+{
+	DrawPolyPolyPolygon(vertices, vertex_count, &vertex_count, 1, &vertex_count, 1,
+	                    color, width, outline, pattern, doxor);
+}
+
+void Draw::DrawPolygon(const Vector<Point>& vertices,
+                       Color color, int width, Color outline, uint64 pattern, Color doxor)
+{
+	DrawPolygon(vertices.Begin(), vertices.GetCount(), color, width, outline, pattern, doxor);
+}
+#endif
+void Draw::DrawEllipse(int x, int y, int cx, int cy, Color color, int pen, Color pencolor)
+{
+	DrawEllipse(RectC(x, y, cx, cy), color, pen, pencolor);
+}
+
+void Draw::Offset(int x, int y)
+{
+	Offset(Point(x, y));
+}
+
+bool Draw::Clip(int x, int y, int cx, int cy)
+{
+	return Clip(RectC(x, y, cx, cy));
+}
+
+bool Draw::Clipoff(int x, int y, int cx, int cy)
+{
+	return Clipoff(RectC(x, y, cx, cy));
+}
+
+bool Draw::ExcludeClip(int x, int y, int cx, int cy)
+{
+	return ExcludeClip(RectC(x, y, cx, cy));
+}
+
+bool Draw::IntersectClip(int x, int y, int cx, int cy)
+{
+	return IntersectClip(RectC(x, y, cx, cy));
+}
+
+bool Draw::IsPainting(int x, int y, int cx, int cy) const
+{
+	return IsPainting(RectC(x, y, cx, cy));
+}
+
+// ---------------------------
+
+void NilDraw::BeginOp() {}
+void NilDraw::EndOp() {}
+void NilDraw::OffsetOp(Point p) {}
+bool NilDraw::ClipOp(const Rect& r) { return false; }
+bool NilDraw::ClipoffOp(const Rect& r) { return false; }
+bool NilDraw::ExcludeClipOp(const Rect& r) { return false; }
+bool NilDraw::IntersectClipOp(const Rect& r) { return false; }
+Rect NilDraw::GetClipOp() const { return Rect(0, 0, 0, 0); }
+bool NilDraw::IsPaintingOp(const Rect& r) const { return false; }
+
+void NilDraw::DrawRectOp(int x, int y, int cx, int cy, Color color) {}
+void NilDraw::DrawImageOp(int x, int y, int cx, int cy, const Image& img,
+                          const Rect& src, Color color) {}
+void NilDraw::DrawLineOp(int x1, int y1, int x2, int y2, int width, Color color) {}
+void NilDraw::DrawEllipseOp(const Rect& r, Color color, int pen, Color pencolor) {}
+void NilDraw::DrawTextOp(int x, int y, int angle, const wchar *text, Font font,
+	                    Color ink, int n, const int *dx) {}
+
+void NilDraw::DrawDrawingOp(const Rect& target, const Drawing& w) {}
+
+// ---------------------------
+
+Draw& ScreenInfo();
+
+void BackDraw::Create(int cx, int cy)
+{
+	DrawLock __;
+	Create(ScreenInfo(), cx, cy);
+}
+
+bool BackDraw::IsPaintingOp(const Rect& r) const
+{
+	Rect rr = r + GetOffset();
+	if(!rr.Intersects(size))
+		return false;
+	return painting ? painting->IsPainting(rr + painting_offset) : true;
+}
+
+BackDraw::BackDraw()
+{
+	painting = NULL;
+	painting_offset = Point(0, 0);
+}
+
+BackDraw::~BackDraw()
+{
+	Destroy();
+}
+
+Draw& ScreenInfo();
+
+bool ScreenInPaletteMode()
+{
+	return ScreenInfo().PaletteMode();
+}
+
+Size GetScreenSize()
+{
+	return ScreenInfo().GetPagePixels();
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/Draw/Draw.h b/uppsrc/Draw/Draw.h
new file mode 100644
index 000000000..90016e3fe
--- /dev/null
+++ b/uppsrc/Draw/Draw.h
@@ -0,0 +1,1223 @@
+#ifndef DRAW_H
+#define DRAW_H
+
+#include <Core/Core.h>
+
+#ifdef PLATFORM_X11
+
+#define PLATFORM_XFT //TODO - remove
+
+#define Time    XTime
+#define Font    XFont
+#define Display XDisplay
+#define Picture XPicture
+
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+#include <X11/Xatom.h>
+
+#ifdef PLATFORM_XFT
+#include <X11/Xft/Xft.h>
+#include <X11/extensions/Xrender.h>
+#endif
+
+#undef Picture
+#undef Time
+#undef Font
+#undef Display
+
+#undef True
+#undef False
+
+#define XFalse 0
+#define XTrue  1
+#endif
+
+
+NAMESPACE_UPP
+
+#ifdef PLATFORM_X11
+
+extern XDisplay   *Xdisplay;
+extern Visual     *Xvisual;
+extern int         Xscreenno;
+extern Window      Xroot;
+extern Screen     *Xscreen;
+extern Colormap    Xcolormap;
+extern int         Xheight;
+extern int         Xwidth;
+extern int         XheightMM;
+extern int         XwidthMM;
+extern int         Xdepth;
+extern dword       Xblack;
+extern dword       Xwhite;
+extern int         Xconnection;
+
+extern dword   (*Xgetpixel)(int r, int g, int b);
+
+void          InitX11Draw(const char *dispname = NULL);
+void          InitX11Draw(XDisplay *display);
+
+void   XError();
+void   XError(const char *s);
+
+inline dword GetXPixel(int r, int g, int b) { return (*Xgetpixel)(r, g, b); }
+inline dword GetXPixel(Color color)         { return (*Xgetpixel)(color.GetR(), color.GetG(), color.GetB()); }
+
+enum {
+	X11_ROP2_ZERO,
+	X11_ROP2_AND,
+	X11_ROP2_AND_NOT,
+	X11_ROP2_COPY,
+	X11_ROP2_NOT_AND,
+	X11_ROP2_NOP,
+	X11_ROP2_XOR,
+	X11_ROP2_OR,
+	X11_ROP2_NOT_AND_NOT,
+	X11_ROP2_NOT_XOR,
+	X11_ROP2_INVERT,
+	X11_ROP2_OR_NOT,
+	X11_ROP2_NOT_COPY,
+	X11_ROP2_NOT_OR,
+	X11_ROP2_NOT_OR_NOT,
+	X11_ROP2_ONE,
+};
+
+#endif
+
+class Drawing;
+class Draw;
+
+#ifdef PLATFORM_WIN32
+HDC ScreenHDC();
+#endif
+
+bool ScreenInPaletteMode();
+Size GetScreenSize();
+
+#include "Image.h"
+
+void EnterDraw();
+void LeaveDraw();
+
+struct DrawLock {
+	DrawLock()    { EnterDraw(); }
+	~DrawLock()   { LeaveDraw(); }
+};
+
+const int FONT_V = 40;
+
+class FontInfo;
+
+class Font : AssignValueTypeNo<Font, FONT_V, Moveable<Font> >{
+	word  face;
+	word  flags;
+	int16 height;
+	int16 width;
+
+public:
+	enum {
+		FIXEDPITCH  = 0x0001,
+		SCALEABLE   = 0x0002,
+		SYMBOLTYPE  = 0x0004,
+		COMPOSED    = 0x0008,
+		LOCAL       = 0x0010,
+	};
+
+	static int    GetFaceCount();
+	static String GetFaceName(int index);
+	static int    FindFaceNameIndex(const char *name);
+	static dword  GetFaceInfo(int index);
+
+	enum {
+		STDFONT,
+		SCREEN_SERIF,
+		SCREEN_SANS,
+		SCREEN_FIXED,
+		ROMAN,
+		ARIAL,
+		COURIER,
+		SYMBOL,
+	#ifdef PLATFORM_WIN32
+		WINGDINGS,
+		TAHOMA,
+	#endif
+		OTHER,
+	};
+
+	int    GetFace() const          { return face; }
+	int    GetHeight() const        { return height; }
+	int    GetWidth() const         { return width; }
+	bool   IsBold() const           { return flags & 0x8000; }
+	bool   IsItalic() const         { return flags & 0x4000; }
+	bool   IsUnderline() const      { return flags & 0x2000; }
+	bool   IsStrikeout() const      { return flags & 0x1000; }
+	bool   IsNonAntiAliased() const { return flags & 0x800; }
+	bool   IsTrueTypeOnly() const   { return flags & 0x400; }
+	String GetFaceName() const;
+	dword  GetFaceInfo() const;
+
+	FontInfo Info() const;
+
+	Font& Face(int n)            { face = n; return *this; }
+	Font& Height(int n)          { height = n; return *this; }
+	Font& Width(int n)           { width = n; return *this; }
+	Font& Bold()                 { flags |= 0x8000; return *this; }
+	Font& NoBold()               { flags &= ~0x8000; return *this; }
+	Font& Bold(bool b)           { return b ? Bold() : NoBold(); }
+	Font& Italic()               { flags |= 0x4000; return *this; }
+	Font& NoItalic()             { flags &= ~0x4000; return *this; }
+	Font& Italic(bool b)         { return b ? Italic() : NoItalic(); }
+	Font& Underline()            { flags |= 0x2000; return *this; }
+	Font& NoUnderline()          { flags &= ~0x2000; return *this; }
+	Font& Underline(bool b)      { return b ? Underline() : NoUnderline(); }
+	Font& Strikeout()            { flags |= 0x1000; return *this; }
+	Font& NoStrikeout()          { flags &= ~0x1000; return *this; }
+	Font& Strikeout(bool b)      { return b ? Strikeout() : NoStrikeout(); }
+	Font& NonAntiAliased()       { flags |= 0x800; return *this; }
+	Font& NoNonAntiAliased()     { flags &= ~0x800; return *this; }
+	Font& NonAntiAliased(bool b) { return b ? NonAntiAliased() : NoNonAntiAliased(); }
+	Font& TrueTypeOnly()         { flags |= 0x400; return *this; }
+	Font& NoTrueTypeOnly()       { flags &= ~0x400; return *this; }
+	Font& TrueTypeOnly(bool b)   { return b ? TrueTypeOnly() : NoTrueTypeOnly(); }
+	Font& FaceName(const String& name);
+
+	Font  operator()() const       { return *this; }
+	Font  operator()(int n) const  { return Font(*this).Height(n); }
+
+	void  Serialize(Stream& s);
+
+	bool  operator==(Font f) const { return face == f.face && flags == f.flags &&
+	                                        width == f.width && height == f.height; }
+	bool  operator!=(Font f) const { return !operator==(f); }
+
+	dword GetHashValue() const     { return MAKELONG(flags, width) ^ MAKELONG(face, height); }
+	bool  IsNull() const           { return face == 0xffff; }
+
+	Font()                         { height = width = 0; face = flags = 0; }
+	Font(int _face, int _height)   { face = _face; height = _height; flags = 0; width = 0; }
+	Font(const Nuller&)            { face = 0xffff; height = width = 0; flags = 0; }
+
+	operator Value() const         { return RichValue<Font>(*this); }
+	Font(const Value& q)           { *this = RichValue<Font>::Extract(q); }
+};
+
+template<>
+inline bool IsNull(const Font& f)            { return f.IsNull(); }
+
+template<>
+inline unsigned GetHashValue(const Font& f)  { return f.GetHashValue(); }
+
+template<>
+String AsString(const Font& f);
+
+class FontInfo : Moveable<FontInfo> {
+	struct CharMetrics : Moveable<CharMetrics> {
+		int  width;
+		int  lspc;
+		int  rspc;
+
+		bool operator==(const CharMetrics& b) const
+		     { return width == b.width && lspc == b.lspc && rspc == b.rspc; }
+	};
+	
+	struct Kinfo : Moveable<Kinfo> {
+		CharMetrics std;
+		byte       *flags;
+		
+		Kinfo() {
+			flags = NULL;
+		}
+		~Kinfo() {
+			if(flags)
+				delete[] flags;
+		}
+	};
+
+	struct Data : public Link<Data, 2> {
+		void         GetMetrics(CharMetrics *t, int from, int count);
+	#ifdef PLATFORM_X11
+		void         CreateFont(int i, int cs);
+	#endif
+
+		int          refcount;
+		Font         font;
+		int          angle;
+		int          device;
+	#ifdef PLATFORM_WIN32
+		HFONT        hfont;
+	#endif
+	#ifdef PLATFORM_XFT
+		XftFont     *xftfont;
+		XftFont     *xftfont0;
+	#endif
+		int          ascent;
+		int          descent;
+		int          external;
+		int          internal;
+		int          height;
+		int          lineheight;
+		int          overhang;
+		Size         offset;
+		int          avewidth;
+		int          maxwidth;
+		int          firstchar;
+		int          charcount;
+		int          default_char;
+
+		CharMetrics *base[64];
+
+		Mutex         xmutex;
+		Vector<Kinfo> kinfo;
+		VectorMap<dword, CharMetrics> xx;
+
+		bool         fixedpitch;
+		bool         scaleable;
+		int          spacebefore;
+		int          spaceafter;
+	#ifdef PLATFORM_X11
+		int          underline_position;
+		int          underline_thickness;
+		double       sina;
+		double       cosa;
+		bool         twobyte;
+		String       filename;
+	#endif
+
+		VectorMap<dword, int> kerning;
+
+		Data();
+		~Data();
+	};
+
+	Data *ptr;
+	int   charset;
+
+	friend class Draw;
+
+	CharMetrics       *CreateMetricsPage(int page) const;
+	CharMetrics       *GetPage(int page) const;
+	void               ComposeMetrics(Font fnt, CharMetrics *m, int from) const;
+	CharMetrics        GetCM(int c) const;
+
+	void       Release();
+	void       Retain(const FontInfo& f);
+	FontInfo(Data *ptr) : ptr(ptr)       { charset = CHARSET_UNICODE; }
+
+	bool        IsEqual(byte charset, Font f, int angle, int device) const;
+	CharMetrics GetComposedMetrics(int c);
+
+public:
+	int        GetAscent() const                  { return ptr->ascent; }
+	int        GetDescent() const                 { return ptr->descent; }
+	int        GetExternal() const                { return ptr->external; }
+	int        GetInternal() const                { return ptr->internal; }
+	int        GetHeight() const                  { return ptr->height; }
+	int        GetLineHeight() const              { return ptr->lineheight; }
+	int        GetOverhang() const                { return ptr->overhang; }
+	int        GetAveWidth() const                { return ptr->avewidth; }
+	int        GetMaxWidth() const                { return ptr->maxwidth; }
+	int        GetWidth(int c) const;
+	int        operator[](int c) const            { return GetWidth(c); }
+	int        GetLeftSpace(int c) const;
+	int        GetRightSpace(int c) const;
+	int        GetKerning(int c1, int c2) const   { return ptr->kerning.Get(MAKELONG(c1, c2), 0); }
+	bool       IsFixedPitch() const               { return ptr->fixedpitch; }
+	bool       IsScaleable() const                { return ptr->scaleable; }
+
+	Font       GetFont() const                    { return ptr->font; }
+	int        GetFontHeight() const              { return ptr->font.GetHeight(); }
+
+#ifdef PLATFORM_XFT
+	String     GetFileName() const;
+#endif
+#ifdef PLATFORM_WIN32
+	HFONT      GetHFONT() const                   { return ptr->hfont; }
+#endif
+
+	void       Clear()                            { Release(); ptr = NULL; }
+	bool       IsEmpty() const                    { return !ptr; }
+	operator   bool() const                       { return ptr; }
+
+	FontInfo(const FontInfo& f);
+	FontInfo& operator=(const FontInfo& f);
+
+	FontInfo()                                    { ptr = NULL; charset = CHARSET_UNICODE; }
+	~FontInfo()                                   { Release(); }
+};
+
+Font StdFont();
+
+inline Font StdFont(int h)                        { return StdFont().Height(h); }
+
+struct ScreenSans : public Font  { ScreenSans(int n = 0) : Font(SCREEN_SANS, n) {} };
+struct ScreenSerif : public Font { ScreenSerif(int n = 0) : Font(SCREEN_SERIF, n) {} };
+struct ScreenFixed : public Font { ScreenFixed(int n = 0) : Font(SCREEN_FIXED, n) {} };
+
+struct Roman     : public Font { Roman(int n) : Font(ROMAN, n) {} };
+struct Arial     : public Font { Arial(int n) : Font(ARIAL, n) {} };
+struct Courier   : public Font { Courier(int n) : Font(COURIER, n) {} };
+struct Symbol    : public Font { Symbol(int n) : Font(SYMBOL, n) {} };
+
+#ifdef PLATFORM_WIN32
+struct WingDings : public Font { WingDings(int n) : Font(WINGDINGS, n) {} };
+struct Tahoma    : public Font { Tahoma(int n) : Font(TAHOMA, n) {} };
+#endif
+
+#ifdef PLATFORM_WIN32
+#ifndef PLATFORM_WINCE
+HPALETTE GetQlibPalette();
+#endif
+#endif
+
+Size GetTextSize(const wchar *text, Font font, int n = -1);
+Size GetTextSize(const WString& text, Font font);
+Size GetTextSize(const char *text, byte charset, Font font, int n = -1);
+Size GetTextSize(const char *text, Font font, int n = -1);
+Size GetTextSize(const String& text, Font font);
+
+enum {
+	PEN_NULL = -1,
+	PEN_SOLID = -2,
+	PEN_DASH = -3,
+#ifndef PLATFORM_WINCE
+	PEN_DOT = -4,
+	PEN_DASHDOT = -5,
+	PEN_DASHDOTDOT = -6,
+#endif
+};
+
+class Image;
+
+struct DrawingPos;
+
+//DEPRECATED: TODO
+Color SBlack();
+Color SGray();
+Color SLtGray();
+Color SWhiteGray();
+Color SWhite();
+Color SRed();
+Color SGreen();
+Color SBrown();
+Color SBlue();
+Color SMagenta();
+Color SCyan();
+Color SYellow();
+Color SLtRed();
+Color SLtGreen();
+Color SLtYellow();
+Color SLtBlue();
+Color SLtMagenta();
+Color SLtCyan();
+//END OF DEPRECATED
+
+Color SColorPaper();
+Color SColorText();
+Color SColorHighlight();
+Color SColorHighlightText();//
+Color SColorMenu();
+Color SColorMenuText();
+Color SColorInfo();
+Color SColorInfoText();//
+Color SColorMark();
+Color SColorDisabled();
+Color SColorLight();
+Color SColorFace();
+Color SColorShadow();
+
+Color SColorLtFace();
+Color SColorDkShadow();
+
+
+void SBlack_Write(Color c);
+void SGray_Write(Color c);
+void SLtGray_Write(Color c);
+void SWhiteGray_Write(Color c);
+void SWhite_Write(Color c);
+void SRed_Write(Color c);
+void SGreen_Write(Color c);
+void SBrown_Write(Color c);
+void SBlue_Write(Color c);
+void SMagenta_Write(Color c);
+void SCyan_Write(Color c);
+void SYellow_Write(Color c);
+void SLtRed_Write(Color c);
+void SLtGreen_Write(Color c);
+void SLtYellow_Write(Color c);
+void SLtBlue_Write(Color c);
+void SLtMagenta_Write(Color c);
+void SLtCyan_Write(Color c);
+
+void SColorPaper_Write(Color c);
+void SColorText_Write(Color c);
+void SColorHighlight_Write(Color c);
+void SColorHighlightText_Write(Color c);//
+void SColorMenu_Write(Color c);
+void SColorMenuText_Write(Color c);
+void SColorInfo_Write(Color c);
+void SColorInfoText_Write(Color c);//
+void SColorMark_Write(Color c);
+void SColorDisabled_Write(Color c);
+void SColorLight_Write(Color c);
+void SColorFace_Write(Color c);
+void SColorShadow_Write(Color c);
+
+void SColorLtFace_Write(Color c);
+void SColorDkShadow_Write(Color c);
+
+
+inline Color InvertColor() { return Color(255, 0); }
+inline Color DefaultInk() { return Black(); } //TODO!
+
+class Draw {
+protected:
+	bool      palette:1;
+	bool      color16:1;
+	bool      printer:1;
+	bool      pixels:1;
+	bool      aborted:1;
+	bool      backdraw:1;
+	bool      is_mono:1;
+
+	static bool      sFini;
+
+	enum { LRU, HASH };
+	static FontInfo::Data *GetFontHash(int hash);
+	static FontInfo::Data *GetFontLru();
+	static int       FontCached;
+
+	static bool      StdFontSizeSet;
+	static Size      StdFontSize;
+	static Font      AStdFont;
+
+	typedef Link<FontInfo::Data, 2> FontLink;
+
+	Size   pagePixels;
+	Size   pageMMs;
+	Size   inchPixels;
+	Size   sheetPixels;
+	Point  pageOffset;
+
+	Draw();
+
+	friend bool DrawDrawing(Draw& w, Stream& s, const Rect& target, Size sz);
+
+	friend class  BackRectDraw;
+	friend class  ImageDraw;
+	friend class  FontInfo;
+	friend class  Font;
+
+	friend void StaticExitDraw_();
+	friend Font StdFont();
+
+	static void      InitColors();
+	static void      InitFonts();
+	static void      FreeFonts();
+	static void      Release(FontInfo::Data *font);
+
+	int       device;
+	FontInfo  lastFont;
+
+	Point        actual_offset;
+	struct Cloff : Moveable<Cloff> {
+		Point org;
+	#ifdef PLATFORM_WIN32
+		HRGN  hrgn;
+	#endif
+	#ifdef PLATFORM_X11
+		int clipi;
+		int offseti;
+	#endif
+		Rect  drawingclip;
+	};
+	Array<Cloff> cloff;
+	Rect         drawingclip;
+
+	static void      InitPlatformFonts();
+
+	enum FontHashConst { FONTHASH = 97 };
+
+	void ComposeText(int x, int y, int angle, const wchar *text, Font font, Color ink,
+                     int n, const int *dx);
+
+
+#ifdef PLATFORM_WIN32
+	static int CALLBACK AddFace(const LOGFONT *logfont, const TEXTMETRIC *, dword type,
+	                            LPARAM param);
+	static int       EnumFace(HDC hdc, const char *face);
+	static void      ForceFace(HDC hdc, const char *face, const char *aface);
+	static void      Win32__InitColors();
+	static FontInfo  Acquire(Font font, HDC hdc, int angle, int device);
+
+	HDC       handle;
+	COLORREF  lastTextColor;
+	Color     lastColor;
+	HBRUSH    orgBrush;
+	HBRUSH    actBrush;
+	HFONT     orgFont;
+	HPEN      orgPen;
+	HPEN      actPen;
+	int       lastPen;
+	Color     lastPenColor;
+
+	void   Unselect0();
+	void   Cinit();
+	void   Init();
+
+	void   LoadCaps();
+	void   SetDevice(const char *devicename);
+	void   SetPrinterMode();
+	void   Reset();
+	void   SetOrg();
+	friend HPALETTE GetQlibPalette();
+
+	static const char *FontScreenSans;
+	static const char *FontScreenSerif;
+	static const char *FontScreenFixed;
+	static const char *FontRoman;
+	static const char *FontArial;
+	static const char *FontCourier;
+	static const char *FontSymbol;
+	static const char *FontWingdings;
+	static const char *FontTahoma;
+
+public:
+	static bool AutoPalette();
+	static void SetAutoPalette(bool ap);
+
+#endif
+
+#ifdef PLATFORM_X11
+	static int       AddFonts(const char *xlfd_pattern, int count);
+	static FontInfo  Acquire(Font font, int angle, int device);
+
+	Vector< Vector<Rect> > clip;
+	Vector<Point> offset;
+
+	Drawable   dw;
+	GC         gc;
+	XftDraw   *xftdraw;
+
+	int        foreground;
+	int        linewidth;
+
+	void       Init();
+	void       Init(const Vector<Rect>& clip, Point offset = Point(0, 0));
+	void       CloneClip();
+#endif
+
+public:
+	static int  FontCacheMax;
+
+	static void SinCos(int angle, double& sina, double& cosa);
+
+	static void SetStdFont(Font font);
+	static Font GetStdFont();
+	static Size GetStdFontSize();
+	static int  GetStdFontCy()                          { return GetStdFontSize().cy; }
+
+#ifdef PLATFORM_WIN32
+#ifdef PLATFORM_WINCE
+	static void Flush()                                 {}
+#else
+	static void Flush()                                 { GdiFlush(); }
+#endif
+#endif
+#ifdef PLATFORM_X11
+	static void Flush()                                 { XSync(Xdisplay, false); }
+#endif
+
+	bool  PaletteMode() const                           { return palette; }
+	bool  IsMono() const                                { return is_mono; }
+
+	Size  GetPagePixels() const                         { return pagePixels; }
+//	Size  GetPageDots() const                           { return pagePixels; }
+	Size  GetPageMMs() const                            { return pageMMs; }
+	Size  GetPixelsPerInch() const                      { return inchPixels; }
+//	Size  GetSheetPixels() const                        { return sheetPixels; }
+//	Point GetPageOffset() const                         { return pageOffset; }
+
+	bool  Pixels() const                                { return pixels; }
+	bool  Dots() const                                  { return !pixels; }
+
+	bool  IsPrinter() const                             { return printer; }
+	bool  IsAborted() const                             { return aborted; }
+	bool  IsBack() const                                { return backdraw; }
+#ifdef PLATFORM_WIN32
+	bool  IsSystem() const                              { return handle; }
+#endif
+#ifdef PLATFORM_X11
+	bool  IsSystem() const                              { return gc != None; }
+#endif
+	bool  IsDrawing() const;
+
+	enum {
+		BEGIN               = 1,
+		OFFSET              = 2,
+		CLIP                = 3,
+		CLIPOFF             = 4,
+		EXCLUDECLIP         = 5,
+		INTERSECTCLIP       = 6,
+		END                 = 7,
+		DRAWRECT            = 8,
+		DRAWIMAGE           = 9,
+		DRAWMONOIMAGE       = 10,
+		DRAWDRAWING         = 11,
+		DRAWLINE            = 12,
+		DRAWELLIPSE         = 13,
+		DRAWTEXT            = 14,
+		DRAWARC             = 15,
+		DRAWPOLYPOLYLINE    = 16,
+		DRAWPOLYPOLYPOLYGON = 17,
+		DRAWDATA            = 18,
+	};
+	typedef void (*Drawer)(Draw&, Stream&, const DrawingPos&);
+
+	Stream&  DrawingOp(int code);
+	Stream&  PutRect(const Rect& r);
+
+	static void  Register(int code, Drawer drawer);
+
+	virtual void StartPage();
+	virtual void EndPage();
+
+	virtual void BeginOp();
+	virtual void EndOp();
+	virtual void OffsetOp(Point p);
+	virtual bool ClipOp(const Rect& r);
+	virtual bool ClipoffOp(const Rect& r);
+	virtual bool ExcludeClipOp(const Rect& r);
+	virtual bool IntersectClipOp(const Rect& r);
+	virtual Rect GetClipOp() const;
+	virtual bool IsPaintingOp(const Rect& r) const;
+
+	virtual	void DrawRectOp(int x, int y, int cx, int cy, Color color);
+	virtual void DrawImageOp(int x, int y, int cx, int cy, const Image& img, const Rect& src, Color color);
+	virtual void DrawDataOp(int x, int y, int cx, int cy, const String& data, const char *id);
+	virtual void DrawLineOp(int x1, int y1, int x2, int y2, int width, Color color);
+
+#ifndef PLATFORM_WINCE
+	virtual void DrawPolyPolylineOp(const Point *vertices, int vertex_count,
+	                                const int *counts, int count_count,
+	                                int width, Color color, Color doxor);
+	virtual void DrawPolyPolyPolygonOp(const Point *vertices, int vertex_count,
+	                                   const int *subpolygon_counts, int scc,
+	                                   const int *disjunct_polygon_counts, int dpcc,
+	                                   Color color, int width, Color outline,
+	                                   uint64 pattern, Color doxor);
+	virtual void DrawArcOp(const Rect& rc, Point start, Point end, int width, Color color);
+#endif
+	virtual void DrawEllipseOp(const Rect& r, Color color, int pen, Color pencolor);
+	virtual void DrawTextOp(int x, int y, int angle, const wchar *text, Font font,
+		                    Color ink, int n, const int *dx);
+	virtual void DrawDrawingOp(const Rect& target, const Drawing& w);
+
+	void  Begin()                                       { BeginOp(); }
+	void  End()                                         { EndOp(); }
+	void  Offset(Point p)                               { OffsetOp(p); }
+	void  Offset(int x, int y);
+	bool  Clip(const Rect& r)                           { return ClipOp(r); }
+	bool  Clip(int x, int y, int cx, int cy);
+	bool  Clipoff(const Rect& r)                        { return ClipoffOp(r); }
+	bool  Clipoff(int x, int y, int cx, int cy);
+	bool  ExcludeClip(const Rect& r)                    { return ExcludeClipOp(r); }
+	bool  ExcludeClip(int x, int y, int cx, int cy);
+	bool  IntersectClip(const Rect& r)                  { return IntersectClipOp(r); }
+	bool  IntersectClip(int x, int y, int cx, int cy);
+	Rect  GetClip() const                               { return GetClipOp(); }
+	bool  IsPainting(const Rect& r) const               { return IsPaintingOp(r); }
+	bool  IsPainting(int x, int y, int cx, int cy) const;
+
+	Point GetOffset() const                             { return actual_offset; }
+
+	int   GetCloffLevel() const                         { return cloff.GetCount(); }
+
+
+	void DrawRect(int x, int y, int cx, int cy, Color color)
+	{ DrawRectOp(x, y, cx, cy, color); }
+	void DrawRect(const Rect& rect, Color color);
+
+	void DrawImage(int x, int y, int cx, int cy, const Image& img, const Rect& src);
+	void DrawImage(int x, int y, int cx, int cy, const Image& img);
+	void DrawImage(int x, int y, int cx, int cy, const Image& img, const Rect& src, Color color);
+	void DrawImage(int x, int y, int cx, int cy, const Image& img, Color color);
+
+	void DrawImage(const Rect& r, const Image& img, const Rect& src);
+	void DrawImage(const Rect& r, const Image& img);
+	void DrawImage(const Rect& r, const Image& img, const Rect& src, Color color);
+	void DrawImage(const Rect& r, const Image& img, Color color);
+
+	void DrawImage(int x, int y, const Image& img, const Rect& src);
+	void DrawImage(int x, int y, const Image& img);
+	void DrawImage(int x, int y, const Image& img, const Rect& src, Color color);
+	void DrawImage(int x, int y, const Image& img, Color color);
+
+	void DrawData(int x, int y, int cx, int cy, const String& data, const char *type);
+	void DrawData(const Rect& r, const String& data, const char *type);
+
+	void DrawLine(int x1, int y1, int x2, int y2, int width = 0, Color color = DefaultInk)
+	{ DrawLineOp(x1, y1, x2, y2, width, color); }
+	void DrawLine(Point p1, Point p2, int width = 0, Color color = DefaultInk);
+
+	void DrawEllipse(const Rect& r, Color color = DefaultInk,
+	                 int pen = Null, Color pencolor = DefaultInk)
+	{ DrawEllipseOp(r, color, pen, pencolor); }
+	void DrawEllipse(int x, int y, int cx, int cy, Color color = DefaultInk,
+		             int pen = Null, Color pencolor = DefaultInk);
+
+#ifndef PLATFORM_WINCE
+	void DrawArc(const Rect& rc, Point start, Point end, int width = 0, Color color = DefaultInk)
+	{ DrawArcOp(rc, start, end, width, color); }
+
+	void DrawPolyPolyline(const Point *vertices, int vertex_count,
+	                      const int *counts, int count_count,
+	                      int width = 0, Color color = DefaultInk, Color doxor = Null)
+	{ DrawPolyPolylineOp(vertices, vertex_count, counts, count_count, width, color, doxor); }
+	void DrawPolyPolyline(const Vector<Point>& vertices, const Vector<int>& counts,
+		                  int width = 0, Color color = DefaultInk, Color doxor = Null);
+	void DrawPolyline(const Point *vertices, int count,
+		              int width = 0, Color color = DefaultInk, Color doxor = Null);
+	void DrawPolyline(const Vector<Point>& vertices,
+		              int width = 0, Color color = DefaultInk, Color doxor = Null);
+
+	void   DrawPolyPolyPolygon(const Point *vertices, int vertex_count,
+		                       const int *subpolygon_counts, int subpolygon_count_count,
+		                       const int *disjunct_polygon_counts, int disjunct_polygon_count_count,
+		                       Color color = DefaultInk, int width = 0, Color outline = Null,
+		                       uint64 pattern = 0, Color doxor = Null)
+	{ DrawPolyPolyPolygonOp(vertices, vertex_count, subpolygon_counts, subpolygon_count_count,
+		                  disjunct_polygon_counts, disjunct_polygon_count_count,
+		                  color, width, outline, pattern, doxor); }
+
+	void   DrawPolyPolyPolygon(const Vector<Point>& vertices,
+	                           const Vector<int>& subpolygon_counts,
+	                           const Vector<int>& disjunct_polygon_counts,
+	                           Color color = DefaultInk, int width = 0, Color outline = Null, uint64 pattern = 0, Color doxor = Null);
+	void   DrawPolyPolygon(const Point *vertices, int vertex_count,
+	                       const int *subpolygon_counts, int subpolygon_count_count,
+	                       Color color = DefaultInk, int width = 0, Color outline = Null, uint64 pattern = 0, Color doxor = Null);
+	void   DrawPolyPolygon(const Vector<Point>& vertices, const Vector<int>& subpolygon_counts,
+	                       Color color = DefaultInk, int width = 0, Color outline = Null, uint64 pattern = 0, Color doxor = Null);
+	void   DrawPolygons(const Point *vertices, int vertex_count,
+	                    const int *polygon_counts, int polygon_count_count,
+	                    Color color = DefaultInk, int width = 0, Color outline = Null, uint64 pattern = 0, Color doxor = Null);
+	void   DrawPolygons(const Vector<Point>& vertices, const Vector<int>& polygon_counts,
+	                    Color color = DefaultInk, int width = 0, Color outline = Null, uint64 pattern = 0, Color doxor = Null);
+	void   DrawPolygon(const Point *vertices, int vertex_count,
+	                   Color color = DefaultInk, int width = 0, Color outline = Null, uint64 pattern = 0, Color doxor = Null);
+	void   DrawPolygon(const Vector<Point>& vertices,
+	                   Color color = DefaultInk, int width = 0, Color outline = Null, uint64 pattern = 0, Color doxor = Null);
+#endif
+
+	void DrawDrawing(const Rect& r, const Drawing& iw) { DrawDrawingOp(r, iw); }
+	void DrawDrawing(int x, int y, int cx, int cy, const Drawing& iw);
+
+	void DrawText(int x, int y, int angle, const wchar *text, Font font = StdFont(),
+		          Color ink = DefaultInk, int n = -1, const int *dx = NULL);
+	void DrawText(int x, int y, const wchar *text, Font font = StdFont(),
+		          Color ink = DefaultInk, int n = -1, const int *dx = NULL);
+
+	void DrawText(int x, int y, const WString& text, Font font = StdFont(),
+		          Color ink = DefaultInk, const int *dx = NULL);
+	void DrawText(int x, int y, int angle, const WString& text, Font font = StdFont(),
+		          Color ink = DefaultInk, const int *dx = NULL);
+
+	void DrawText(int x, int y, int angle, const char *text, byte charset,
+	              Font font = StdFont(), Color ink = DefaultInk, int n = -1, const int *dx = NULL);
+	void DrawText(int x, int y, const char *text, byte charset, Font font = StdFont(),
+		          Color ink = DefaultInk, int n = -1, const int *dx = NULL);
+
+	void DrawText(int x, int y, int angle, const char *text,
+	              Font font = StdFont(), Color ink = DefaultInk, int n = -1, const int *dx = NULL);
+	void DrawText(int x, int y, const char *text, Font font = StdFont(),
+		          Color ink = DefaultInk, int n = -1, const int *dx = NULL);
+
+	void DrawText(int x, int y, const String& text, Font font = StdFont(),
+		          Color ink = DefaultInk, const int *dx = NULL);
+	void DrawText(int x, int y, int angle, const String& text, Font font = StdFont(),
+		          Color ink = DefaultInk, const int *dx = NULL);
+
+#ifdef PLATFORM_WIN32
+	bool         IsMetaFile() const                     { return device == -1; }
+
+	COLORREF GetColor(Color color) const;
+#ifndef PLATFORM_WINCE
+	Point LPtoDP(Point p) const;
+	Point DPtoLP(Point p) const;
+	Rect  LPtoDP(const Rect& r) const;
+	Rect  DPtoLP(const Rect& r) const;
+#endif
+	void SetColor(Color color);
+	void SetFont(Font font, int angle = 0);
+	void SetDrawPen(int width, Color color);
+
+	Size  GetSizeCaps(int i, int j) const;
+	HDC   BeginGdi();
+	void  EndGdi();
+	HDC   GetHandle()                    { return handle; }
+	operator HDC() const                 { return handle; }
+	void  Unselect();
+	void  Attach(HDC ahandle)            { handle = ahandle; Init(); }
+	HDC   Detach()                       { Unselect(); HDC h = handle; handle = NULL; return h; }
+
+	Draw(HDC hdc);
+	virtual ~Draw();
+#endif
+
+#ifdef PLATFORM_X11
+
+#ifdef PLATFORM_XFT
+	static XftFont *CreateXftFont(Font f, int angle);
+	XftDraw *GetXftDraw() const               { return xftdraw; }
+#endif
+	void  SetForeground(Color color);
+	void  SetLineStyle(int width);
+	void  SetFont(Font font, int angle);
+	void  SetClip();
+
+	Drawable GetDrawable() const              { return dw; }
+	GC       GetGC() const                    { return gc; }
+	const Vector<Rect>& GetClipList() const   { return clip.Top(); }
+#ifdef PLATFORM_XFT
+	Draw(Drawable dw, GC gc, XftDraw *xftdraw, const Vector<Rect>& clip);
+#else
+	Draw(Drawable dw, GC gc, const Vector<Rect>& clip);
+#endif
+	virtual ~Draw();
+#endif
+
+private: //Deprecated
+	FontInfo GetFontInfo(byte charset, Font font = StdFont());
+	FontInfo GetFontInfo(Font font = StdFont());
+	FontInfo GetFontInfoW(Font font = StdFont());
+
+	Size GetTextSize(const wchar *text, Font font = StdFont(), int n = -1) { return UPP::GetTextSize(text, font, n); }
+	Size GetTextSize(const WString& text, Font font = StdFont()) { return UPP::GetTextSize(text, font); }
+	Size GetTextSize(const char *text, byte charset, Font font = StdFont(), int n = -1) { return UPP::GetTextSize(text, charset, font); }
+	Size GetTextSize(const char *text, Font font = StdFont(), int n = -1) { return UPP::GetTextSize(text, font, n); }
+	Size GetTextSize(const String& text, Font font = StdFont()) { return UPP::GetTextSize(text, font); }
+
+private:
+	Draw(const Draw&);
+	void operator=(const Draw&);
+};
+
+void DrawImageBandRLE(Draw& w, int x, int y, const Image& m, int minp);
+
+class DataDrawer {
+	typedef DataDrawer *(*Factory)();
+	template <class T> static DataDrawer *FactoryFn() { return new T; }
+	static void AddFormat(const char *id, Factory f);
+	static VectorMap<String, void *>& Map();
+
+public:
+	virtual void  Open(const String& data, int cx, int cy) = 0;
+	virtual void  Render(ImageBuffer& ib) = 0;
+	virtual ~DataDrawer();
+
+	static  One<DataDrawer> Create(const String& id);
+
+	template <class T>	static void Register(const char *id)  { AddFormat(id, &DataDrawer::FactoryFn<T>); }
+};
+
+struct DrawingPos {
+	Size    source;
+	Size    target;
+	Point   srcoff;
+	Point   trgoff;
+	Point   trgini;
+	Vector<Point16> stack;
+
+	bool  Identity() const                               { return source == target; }
+
+	int   GetX(int x) const;
+	int   GetY(int y) const;
+	int   GetCx(int cx) const;
+	int   GetCy(int cy) const;
+	int   GetW(int w) const;
+	Point Get(int x, int y) const;
+	Point Get(Point p) const;
+	Size  Get(Size sz) const;
+	Rect  Get(const Rect& r) const;
+	Rect  Get(int x, int y, int cx, int cy) const;
+
+	Point operator()(int x, int y) const                 { return Get(x, y); }
+	Point operator()(Point p) const                      { return Get(p); }
+	Size  operator()(Size sz) const                      { return Get(sz); }
+	Rect  operator()(const Rect& r) const                { return Get(r); }
+	Rect  operator()(int x, int y, int cx, int cy) const { return Get(x, y, cx, cy); }
+
+	void TransformX(int& x) const                        { x = GetX(x); }
+	void TransformY(int& y) const                        { y = GetY(y); }
+	void TransformW(int& w) const                        { w = GetW(w); }
+	void Transform(int& x, int& y) const                 { TransformX(x); TransformY(y); }
+	void Transform(Point& p) const                       { p = Get(p); }
+	void Transform(Size& sz) const                       { sz = Get(sz); }
+	void Transform(Rect& r) const                        { r = Get(r); }
+};
+
+class DrawerRegistrator {
+public:
+	DrawerRegistrator(int code, Draw::Drawer w)          { Draw::Register(code, w); }
+};
+
+#ifdef PLATFORM_WIN32
+class WinMetaFile;
+#endif
+
+class Drawing : Moveable<Drawing> {
+	Size   size;
+	String data;
+
+	friend class DrawingDraw;
+	friend class Draw;
+
+public:
+	operator bool() const          { return !data.IsEmpty(); }
+	Size GetSize() const           { return size; }
+	void SetSize(Size sz)          { size = sz; }
+	void SetSize(int cx, int cy)   { size = Size(cx, cy); }
+
+	Size RatioSize(int cx, int cy) const;
+	Size RatioSize(Size sz) const  { return RatioSize(sz.cx, sz.cy); }
+
+	void Clear()                   { data.Clear(); size = Null; }
+
+	void Append(Drawing& dw);
+
+	void Serialize(Stream& s);
+
+	bool IsNullInstance() const    { return data.IsEmpty(); }
+
+	operator Value() const         { return RawValue<Drawing>(*this); }
+	Drawing(const Value& src)      { if(!IsNull(src)) *this = RawValue<Drawing>::Extract(src); }
+
+	Drawing()                      { size = Null; }
+	Drawing(const Nuller&)         { size = Null; }
+
+#ifdef PLATFORM_WIN32
+#ifndef PLATFORM_WINCE
+	// deprecated
+	static Drawing FromWMF(const WinMetaFile& wmf);
+	static Drawing LoadWMF(const char *file);
+	static Drawing ReadClipboardWMF();
+	WinMetaFile AsWMF() const;
+	void        WriteClipboardWMF() const;
+#endif
+#endif
+};
+
+class DrawingDraw : public Draw {
+public:
+	virtual void BeginOp();
+	virtual void EndOp();
+	virtual void OffsetOp(Point p);
+	virtual bool ClipOp(const Rect& r);
+	virtual bool ClipoffOp(const Rect& r);
+	virtual bool ExcludeClipOp(const Rect& r);
+	virtual bool IntersectClipOp(const Rect& r);
+	virtual Rect GetClipOp() const;
+	virtual bool IsPaintingOp(const Rect& r) const;
+
+	virtual	void DrawRectOp(int x, int y, int cx, int cy, Color color);
+	virtual void DrawImageOp(int x, int y, int cx, int cy, const Image& img, const Rect& src, Color color);
+	virtual void DrawDataOp(int x, int y, int cx, int cy, const String& data, const char *id);
+	virtual void DrawLineOp(int x1, int y1, int x2, int y2, int width, Color color);
+	virtual void DrawPolyPolylineOp(const Point *vertices, int vertex_count,
+	                                const int *counts, int count_count,
+	                                int width, Color color, Color doxor);
+	virtual void DrawPolyPolyPolygonOp(const Point *vertices, int vertex_count,
+	                                   const int *subpolygon_counts, int scc,
+	                                   const int *disjunct_polygon_counts, int dpcc,
+	                                   Color color, int width, Color outline,
+	                                   uint64 pattern, Color doxor);
+	virtual void DrawEllipseOp(const Rect& r, Color color, int pen, Color pencolor);
+	virtual void DrawArcOp(const Rect& rc, Point start, Point end, int pen, Color pencolor);
+	virtual void DrawTextOp(int x, int y, int angle, const wchar *text, Font font,
+		                    Color ink, int n, const int *dx);
+
+	virtual void DrawDrawingOp(const Rect& target, const Drawing& w);
+
+private:
+	Size         size;
+	StringStream drawing;
+
+	void         DInit();
+	void         DrawingBegin();
+
+public:
+	void     SetPixels(bool b = true)         { pixels = b; }
+
+	Stream&  GetStream()                      { return drawing; }
+
+	void     Create(int cx, int cy);
+	void     Create(Size sz);
+
+	Size     GetSize() const                  { return size; }
+
+	Drawing  GetResult();
+	operator Drawing()                        { return GetResult(); }
+
+	DrawingDraw();
+	DrawingDraw(int cx, int cy);
+	DrawingDraw(Size sz);
+	~DrawingDraw();
+};
+
+class NilDraw : public Draw {
+public:
+	virtual void BeginOp();
+	virtual void EndOp();
+	virtual void OffsetOp(Point p);
+	virtual bool ClipOp(const Rect& r);
+	virtual bool ClipoffOp(const Rect& r);
+	virtual bool ExcludeClipOp(const Rect& r);
+	virtual bool IntersectClipOp(const Rect& r);
+	virtual Rect GetClipOp() const;
+	virtual bool IsPaintingOp(const Rect& r) const;
+
+	virtual	void DrawRectOp(int x, int y, int cx, int cy, Color color);
+	virtual void DrawImageOp(int x, int y, int cx, int cy, const Image& img,
+	                         const Rect& src, Color color);
+	virtual void DrawLineOp(int x1, int y1, int x2, int y2, int width, Color color);
+	virtual void DrawEllipseOp(const Rect& r, Color color, int pen, Color pencolor);
+	virtual void DrawTextOp(int x, int y, int angle, const wchar *text, Font font,
+		                    Color ink, int n, const int *dx);
+
+	virtual void DrawDrawingOp(const Rect& target, const Drawing& w);
+
+	NilDraw();
+	~NilDraw();
+};
+
+class BackDraw : public Draw {
+public:
+	virtual bool IsPaintingOp(const Rect& r) const;
+
+protected:
+#ifdef PLATFORM_WIN32
+	HBITMAP hbmpold;
+	HBITMAP hbmp;
+#endif
+#ifdef PLATFORM_X11
+	Pixmap  pixmap;
+#endif
+	Size    size;
+	Draw   *painting;
+	Point   painting_offset;
+
+
+public:
+	void  Put(Draw& w, int x, int y);
+	void  Put(Draw& w, Point p)                  { Put(w, p.x, p.y); }
+
+	void Create(Draw& draw, int cx, int cy);
+	void Create(Draw& draw, Size sz)             { Create(draw, sz.cx, sz.cy); }
+	void Create(int cx, int cy);
+	void Create(Size sz)                         { Create(sz.cx, sz.cy); }
+	void Destroy();
+
+	void SetPaintingDraw(Draw& w, Point off)     { painting = &w; painting_offset = off; }
+
+	BackDraw();
+	~BackDraw();
+};
+
+void         AddNotEmpty(Vector<Rect>& result, int left, int right, int top, int bottom);
+bool         Subtract(const Rect& r, const Rect& sub, Vector<Rect>& result);
+bool         Subtract(const Vector<Rect>& rr, const Rect& sub, Vector<Rect>& result);
+Vector<Rect> Subtract(const Vector<Rect>& rr, const Rect& sub, bool& changed);
+Vector<Rect> Intersect(const Vector<Rect>& b, const Rect& a, bool& changed);
+
+void Subtract(Vector<Rect>& rr, const Rect& sub);
+void Union(Vector<Rect>& rr, const Rect& add);
+
+#ifdef PLATFORM_X11
+void SetClip(GC gc, XftDraw *xftdraw, const Vector<Rect>& cl);
+#endif
+
+void DrawRect(Draw& w, const Rect& rect, const Image& img, bool ralgn = false); //??? TODO
+void DrawRect(Draw& w, int x, int y, int cx, int cy, const Image& img, bool ra = false);
+
+void DrawTiles(Draw& w, int x, int y, int cx, int cy, const Image& img);
+void DrawTiles(Draw& w, const Rect& rect, const Image& img);
+
+void DrawFatFrame(Draw& w, int x, int y, int cx, int cy, Color color, int n);
+void DrawFatFrame(Draw& w, const Rect& r, Color color, int n);
+
+void DrawFrame(Draw& w, int x, int y, int cx, int cy,
+			   Color leftcolor, Color topcolor, Color rightcolor, Color bottomcolor);
+void DrawFrame(Draw& w, const Rect& r,
+			   Color leftcolor, Color topcolor, Color rightcolor, Color bottomcolor);
+void DrawFrame(Draw& w, int x, int y, int cx, int cy,
+			   Color topleftcolor, Color bottomrightcolor);
+void DrawFrame(Draw& w, const Rect& r,
+			   Color topleftcolor, Color bottomrightcolor);
+void DrawFrame(Draw& w, int x, int y, int cx, int cy, Color color);
+void DrawFrame(Draw& w, const Rect& r, Color color);
+
+void DrawBorder(Draw& w, int x, int y, int cx, int cy, const ColorF *colors_ltrd); //TODO
+void DrawBorder(Draw& w, const Rect& r, const ColorF *colors_ltrd);
+
+const ColorF *BlackBorder();
+const ColorF *ButtonPushBorder();
+const ColorF *EdgeButtonBorder();
+const ColorF *DefButtonBorder();
+const ColorF *ButtonBorder();
+const ColorF *InsetBorder();
+const ColorF *OutsetBorder();
+const ColorF *ThinOutsetBorder();
+const ColorF *ThinInsetBorder();
+
+void DrawBorder(Draw& w, int x, int y, int cx, int cy, const ColorF *(*colors_ltrd)());
+void DrawBorder(Draw& w, const Rect& r, const ColorF *(*colors_ltrd)());
+
+void DrawRectMinusRect(Draw& w, const Rect& rect, const Rect& inner, Color color);
+
+void DrawHighlightImage(Draw& w, int x, int y, const Image& img, bool highlight = true,
+                        bool enabled = true, Color maskcolor = SColorPaper);
+
+Color GradientColor(Color fc, Color tc, int i, int n);
+
+void DrawDragRect(Draw& w, const Rect& rect1, const Rect& rect2, const Rect& clip, int n, Color color, uint64 pattern);
+
+enum {
+	BUTTON_NORMAL, BUTTON_OK, BUTTON_HIGHLIGHT, BUTTON_PUSH, BUTTON_DISABLED, BUTTON_CHECKED,
+	BUTTON_VERTICAL = 0x100,
+	BUTTON_EDGE = 0x200,
+	BUTTON_TOOL = 0x400,
+	BUTTON_SCROLL = 0x800,
+};
+
+void DrawXPButton(Draw& w, Rect r, int type);
+
+void DrawTextEllipsis(Draw& w, int x, int y, int cx, const char *text, const char *ellipsis,
+				      Font font = StdFont(), Color ink = SColorText(), int n = -1);
+void DrawTextEllipsis(Draw& w, int x, int y, int cx, const wchar *text, const char *ellipsis,
+				      Font font = StdFont(), Color ink = SColorText(), int n = -1);
+Size GetTLTextSize(const wchar *text, Font font = StdFont());
+int  GetTLTextHeight(const wchar *s, Font font = StdFont());
+void DrawTLText(Draw& draw, int x, int y, int cx, const wchar *text, Font font = StdFont(),
+                Color ink = SColorText(), int accesskey = 0);
+
+
+typedef String (*DrawingToPdfFnType)(const Array<Drawing>& report, Size pagesize, int margin);
+
+void SetDrawingToPdfFn(DrawingToPdfFnType Pdf);
+DrawingToPdfFnType GetDrawingToPdfFn();
+
+#ifdef PLATFORM_WIN32
+
+#include "DrawWin32.h"
+
+#endif
+
+#include "Display.h"
+#include "ImageDraw.h"
+#include "Debug.h"
+#include "Cham.h"
+
+END_UPP_NAMESPACE
+
+#endif
diff --git a/uppsrc/Draw/Draw.upp b/uppsrc/Draw/Draw.upp
new file mode 100644
index 000000000..0f4254543
--- /dev/null
+++ b/uppsrc/Draw/Draw.upp
@@ -0,0 +1,90 @@
+description "Fundamental graphics operations, including raster image processing";
+
+acceptflags
+	NOGTK;
+
+uses
+	Core;
+
+library((LINUX | FREEBSD) & !NOGTK) "gtk-x11-2.0  gdk-x11-2.0  atk-1.0  gdk_pixbuf-2.0  m  pangocairo-1.0  fontconfig  Xext  Xrender  Xinerama  Xi  Xrandr  Xcursor Xfixes pango-1.0  cairo  X11  gobject-2.0  gmodule-2.0  glib-2.0";
+
+library(WIN32 !MSC8ARM) "user32 gdi32";
+
+library(LINUX) X11;
+
+library(LINUX) dl;
+
+library(LINUX !XLFD) Xft;
+
+library(FREEBSD) X11;
+
+library(FREEBSD !XLFD) "Xft fontconfig Xrender freetype expat";
+
+library(LINUX !XLFD !SHARED) "fontconfig Xrender freetype expat";
+
+library(OSX11) "X11 Xft fontconfig Xrender freetype expat";
+
+file
+	Draw.h,
+	DrawWin32.h,
+	DrawWin32.cpp,
+	DrawX11.cpp,
+	ComposeText.cpp,
+	DrawText.cpp,
+	DrawTextWin32.cpp,
+	DrawTextXft.cpp,
+	Draw.cpp,
+	DrawOpWin32.cpp,
+	DrawOpX11.cpp,
+	DrawData.cpp,
+	Drawing.cpp,
+	MetaFile.cpp,
+	DrawUtil.cpp,
+	DrawTextUtil.cpp,
+	Display.h,
+	Display.cpp,
+	Debug.h,
+	Debug.cpp,
+	Image readonly separator,
+	Image.h,
+	ImageDraw.h,
+	Image.cpp,
+	ImageBlit.cpp,
+	ImageWin32.cpp,
+	ImageX11.cpp,
+	Raster.h,
+	RasterFormat.cpp,
+	RasterWrite.cpp,
+	Palette.cpp,
+	Raster.cpp,
+	RasterEncoder.cpp,
+	ImageOp.h,
+	ImageOp.cpp,
+	ImageChOp.cpp,
+	ImageScale.cpp,
+	MakeCache.cpp,
+	DrawRasterData.cpp,
+	iml.h,
+	iml_header.h,
+	iml_source.h,
+	DrawImg.iml,
+	Chameleon readonly separator,
+	Cham.h,
+	Cham.cpp,
+	SSettings.cpp,
+	GTK-dli readonly separator,
+	gobj.dli,
+	gdk.dli,
+	gpixbuf.dli,
+	gtk.dli,
+	gnome.dli,
+	Info readonly separator,
+	src.tpp,
+	srcdoc.tpp,
+	COPYING,
+	COPYING-PLAIN,
+	AUTHORS;
+
+mainconfig
+	"Debug" = "MSC GUI DEBUG WIN32";
+
diff --git a/uppsrc/Draw/DrawData.cpp b/uppsrc/Draw/DrawData.cpp
new file mode 100644
index 000000000..158b12ce2
--- /dev/null
+++ b/uppsrc/Draw/DrawData.cpp
@@ -0,0 +1,121 @@
+#include "Draw.h"
+
+NAMESPACE_UPP
+
+#define LTIMING(x)
+// #define BENCHMARK_RLE
+
+VectorMap<String, void *>& DataDrawer::Map()
+{
+	static VectorMap<String, void *> x;
+	return x;
+}
+
+static StaticCriticalSection sDataDrawer;
+
+void DataDrawer::AddFormat(const char *id, Factory factory)
+{
+	INTERLOCKED_(sDataDrawer)
+		Map().Add(id, (void *)factory);
+}
+
+One<DataDrawer> DataDrawer::Create(const String& id)
+{
+	INTERLOCKED_(sDataDrawer) {
+		Factory q = (Factory) Map().Get(id, NULL);
+		if(q)
+			return (*q)();
+	}
+	return NULL;
+}
+
+bool IsEqColumn(const Image& m, int x, RGBA c)
+{
+	LTIMING("IsEqColumn");
+	Size sz = m.GetSize();
+	const RGBA *s = ~m + x;
+	if(c.a != 255)
+		return false;
+	while(sz.cy > 1) {
+		s += sz.cx;
+		if(*s != c)
+			return false;
+		sz.cy--;
+	}
+	return true;
+}
+
+
+#ifdef BENCHMARK_RLE
+static int sTotal;
+static int sRle;
+
+EXITBLOCK
+{
+	DUMP(sTotal);
+	DUMP(sRle);
+}
+#endif
+
+void DrawImageBandRLE(Draw& w, int x, int y, const Image& m, int minp)
+{
+	int xi = 0;
+	int cx = m.GetWidth();
+	int ccy = m.GetHeight();
+	Buffer<bool> todo(cx, true);
+#ifdef BENCHMARK_RLE
+	sTotal += cx;
+#endif
+	while(xi < cx) {
+		int xi0 = xi;
+		RGBA c = m[0][xi0];
+		while(w.Dots() && IsEqColumn(m, xi, c) && xi < cx)
+			xi++;
+		if(xi - xi0 >= 16) {
+#ifdef BENCHMARK_RLE
+			sRle += xi - xi0;
+#endif
+			w.DrawRect(x + xi0, y, xi - xi0, ccy, c);
+			Fill(~todo + xi0, ~todo + xi, false);
+		}
+		xi++;
+	}
+	xi = 0;
+	while(xi < cx)
+		if(todo[xi]) {
+			int xi0 = xi;
+			while(xi < cx && todo[xi] && xi - xi0 < 2000)
+				xi++;
+			w.DrawImage(x + xi0, y, Crop(m, xi0, 0, xi - xi0, ccy));
+		}
+		else
+			xi++;
+}
+
+void Draw::DrawDataOp(int x, int y, int cx, int cy, const String& data, const char *id)
+{
+	DrawLock __;
+	One<DataDrawer> dd = DataDrawer::Create(id);
+	if(dd) {
+		dd->Open(data, cx, cy);
+		if(cx > 2048 || cy > 2048) {
+			int yy = 0;
+			while(yy < cy) {
+				int ccy = min(cy - yy, 16);
+				ImageBuffer ib(cx, ccy);
+				dd->Render(ib);
+				DrawImageBandRLE(*this, x, y + yy, ib, 16);
+				yy += ccy;
+			}
+		}
+		else {
+			ImageBuffer m(cx, cy);
+			dd->Render(m);
+			DrawImage(x, y, m);
+		}
+	}
+}
+
+DataDrawer::~DataDrawer() {}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/Draw/DrawImg.iml b/uppsrc/Draw/DrawImg.iml
new file mode 100644
index 000000000..5989ceca3
--- /dev/null
+++ b/uppsrc/Draw/DrawImg.iml
@@ -0,0 +1,7 @@
+PREMULTIPLIED
+IMAGE_ID(threedots)
+
+IMAGE_BEGIN_DATA
+IMAGE_DATA(120,156,99,96,99,96,103,192,1,54,3,177,40,22,241,255,64,188,10,136,37,176,136,195,228,176,137,167,99,17,71,23)
+IMAGE_DATA(3,129,80,92,14,130,1,0,129,113,9,95,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0)
+IMAGE_END_DATA(64, 1)
diff --git a/uppsrc/Draw/DrawOpWin32.cpp b/uppsrc/Draw/DrawOpWin32.cpp
new file mode 100644
index 000000000..ea6b95fd8
--- /dev/null
+++ b/uppsrc/Draw/DrawOpWin32.cpp
@@ -0,0 +1,290 @@
+#include "Draw.h"
+
+NAMESPACE_UPP
+
+#ifdef PLATFORM_WIN32
+
+#define LLOG(x)      // LOG(x)
+#define LTIMING(x)   // RTIMING(x)
+
+void Draw::BeginOp()
+{
+	LTIMING("Begin");
+	DrawLock __;
+	Cloff& w = cloff.Add();
+	w.org = actual_offset;
+	w.hrgn = CreateRectRgn(0, 0, 0, 0);
+	ASSERT(w.hrgn);
+	int	q = ::GetClipRgn(handle, w.hrgn);
+	ASSERT(q >= 0);
+	if(q == 0) {
+		DeleteObject(w.hrgn);
+		w.hrgn = NULL;
+	}
+}
+
+void Draw::OffsetOp(Point p)
+{
+	DrawLock __;
+	Begin();
+	actual_offset += p;
+	LTIMING("Offset");
+	SetOrg();
+}
+
+bool Draw::ClipOp(const Rect& r)
+{
+	DrawLock __;
+	Begin();
+	LTIMING("Clip");
+	return IntersectClip(r);
+}
+
+bool Draw::ClipoffOp(const Rect& r)
+{
+	DrawLock __;
+	Begin();
+	LTIMING("Clipoff");
+	LLOG("ClipoffOp " << r << ", GetClip() = " << GetClip() << ", actual_offset = " << actual_offset);
+	actual_offset += r.TopLeft();
+	bool q = IntersectClip(r);
+	SetOrg();
+	LLOG("//ClipoffOp, GetClip() = " << GetClip() << ", actual_offset = " << actual_offset);
+	return q;
+}
+
+void Draw::EndOp()
+{
+	DrawLock __;
+	LTIMING("End");
+	ASSERT(cloff.GetCount());
+	Cloff& w = cloff.Top();
+	actual_offset = w.org;
+	::SelectClipRgn(handle, w.hrgn);
+	SetOrg();
+	if(w.hrgn)
+		::DeleteObject(w.hrgn);
+	cloff.Drop();
+}
+
+bool Draw::ExcludeClipOp(const Rect& r)
+{
+	DrawLock __;
+#ifdef PLATFORM_WINCE
+	int q = ExcludeClipRect(handle, r.left, r.top, r.right, r.bottom);
+#else
+	LTIMING("ExcludeClip");
+	Rect rr = LPtoDP(r);
+	HRGN hrgn = ::CreateRectRgnIndirect(rr);
+	int q = ::ExtSelectClipRgn(handle, hrgn, RGN_DIFF);
+	ASSERT(q != ERROR);
+	::DeleteObject(hrgn);
+#endif
+	return q == SIMPLEREGION || q == COMPLEXREGION;
+}
+
+bool Draw::IntersectClipOp(const Rect& r)
+{
+	DrawLock __;
+#ifdef PLATFORM_WINCE
+	int q = IntersectClipRect(handle, r.left, r.top, r.right, r.bottom);
+#else
+	LTIMING("Intersect");
+	Rect rr = LPtoDP(r);
+	HRGN hrgn = ::CreateRectRgnIndirect(rr);
+	int q = ::ExtSelectClipRgn(handle, hrgn, RGN_AND);
+	ASSERT(q != ERROR);
+	::DeleteObject(hrgn);
+#endif
+	return q == SIMPLEREGION || q == COMPLEXREGION;
+}
+
+Rect Draw::GetClipOp() const
+{
+	DrawLock __;
+	Rect r;
+	::GetClipBox(handle, r);
+	return r;
+}
+
+bool Draw::IsPaintingOp(const Rect& r) const
+{
+	DrawLock __;
+	LTIMING("IsPainting");
+	LLOG("Draw::IsPaintingOp r: " << r);
+	return ::RectVisible(handle, r);
+}
+
+void Draw::DrawRectOp(int x, int y, int cx, int cy, Color color)
+{
+	DrawLock __;
+	LTIMING("DrawRect");
+	LLOG("DrawRect " << RectC(x, y, cx, cy) << ": " << color);
+	if(IsNull(color)) return;
+	if(cx <= 0 || cy <= 0) return;
+	if(color == InvertColor)
+		::PatBlt(handle, x, y, cx, cy, DSTINVERT);
+	else {
+		SetColor(color);
+		::PatBlt(handle, x, y, cx, cy, PATCOPY);
+	}
+}
+
+void Draw::DrawLineOp(int x1, int y1, int x2, int y2, int width, Color color)
+{
+	DrawLock __;
+	if(IsNull(width) || IsNull(color)) return;
+	SetDrawPen(width, color);
+	::MoveToEx(handle, x1, y1, NULL);
+	::LineTo(handle, x2, y2);
+}
+
+#ifndef PLATFORM_WINCE
+
+void Draw::DrawPolyPolylineOp(const Point *vertices, int vertex_count,
+                            const int *counts, int count_count,
+	                        int width, Color color, Color doxor)
+{
+	DrawLock __;
+	ASSERT(count_count > 0 && vertex_count > 0);
+	if(vertex_count < 2 || IsNull(color))
+		return;
+	bool is_xor = !IsNull(doxor);
+	if(is_xor)
+		color = Color(color.GetR() ^ doxor.GetR(), color.GetG() ^ doxor.GetG(), color.GetB() ^ doxor.GetB());
+	if(is_xor)
+		SetROP2(GetHandle(), R2_XORPEN);
+	SetDrawPen(width, color);
+	if(count_count == 1)
+		::Polyline(GetHandle(), (const POINT *)vertices, vertex_count);
+	else
+		::PolyPolyline(GetHandle(), (const POINT *)vertices,
+		               (const dword *)counts, count_count);
+	if(is_xor)
+		SetROP2(GetHandle(), R2_COPYPEN);
+}
+
+static void DrawPolyPolyPolygonRaw(
+	Draw& draw, const Point *vertices, int vertex_count,
+	const int *subpolygon_counts, int subpolygon_count_count,
+	const int *disjunct_polygon_counts, int disjunct_polygon_count_count)
+{
+	DrawLock __;
+	for(int i = 0; i < disjunct_polygon_count_count; i++, disjunct_polygon_counts++)
+	{
+		int poly = *disjunct_polygon_counts;
+		int sub = 1;
+		if(*subpolygon_counts < poly)
+			if(disjunct_polygon_count_count > 1)
+			{
+				const int *se = subpolygon_counts;
+				int total = 0;
+				while(total < poly)
+					total += *se++;
+				sub = (int)(se - subpolygon_counts);
+			}
+			else
+				sub = subpolygon_count_count;
+		ASSERT(sizeof(POINT) == sizeof(Point)); // modify algorithm when not
+		if(sub == 1)
+			Polygon(draw, (const POINT *)vertices, poly);
+		else
+			PolyPolygon(draw, (const POINT *)vertices, subpolygon_counts, sub);
+		vertices += poly;
+		subpolygon_counts += sub;
+	}
+}
+
+void Draw::DrawPolyPolyPolygonOp(const Point *vertices, int vertex_count,
+	const int *subpolygon_counts, int subpolygon_count_count,
+	const int *disjunct_polygon_counts, int disjunct_polygon_count_count,
+	Color color, int width, Color outline, uint64 pattern, Color doxor)
+{
+	DrawLock __;
+	if(vertex_count == 0)
+		return;
+	bool is_xor = !IsNull(doxor);
+	HDC hdc = GetHandle();
+	if(pattern) {
+		int old_rop = GetROP2(hdc);
+		HGDIOBJ old_brush = GetCurrentObject(hdc, OBJ_BRUSH);
+		word wpat[8] = {
+			(byte)(pattern >> 56), (byte)(pattern >> 48), (byte)(pattern >> 40), (byte)(pattern >> 32),
+			(byte)(pattern >> 24), (byte)(pattern >> 16), (byte)(pattern >> 8), (byte)(pattern >> 0),
+		};
+		HBITMAP bitmap = CreateBitmap(8, 8, 1, 1, wpat);
+		HBRUSH brush = ::CreatePatternBrush(bitmap);
+		COLORREF old_bk = GetBkColor(hdc);
+		COLORREF old_fg = GetTextColor(hdc);
+		if(!is_xor) {
+			SetROP2(hdc, R2_MASKPEN);
+			SelectObject(hdc, brush);
+			SetTextColor(hdc, Black());
+			SetBkColor(hdc, White());
+			SetDrawPen(PEN_NULL, Black);
+			DrawPolyPolyPolygonRaw(*this, vertices, vertex_count,
+				subpolygon_counts, subpolygon_count_count,
+				disjunct_polygon_counts, disjunct_polygon_count_count);
+			SetROP2(hdc, R2_MERGEPEN);
+			SetTextColor(hdc, color);
+			SetBkColor(hdc, Black());
+		}
+		else {
+			SetROP2(hdc, R2_XORPEN);
+			SetTextColor(hdc, COLORREF(color) ^ COLORREF(doxor));
+			SelectObject(hdc, brush);
+		}
+		DrawPolyPolyPolygonRaw(*this, vertices, vertex_count,
+			subpolygon_counts, subpolygon_count_count,
+			disjunct_polygon_counts, disjunct_polygon_count_count);
+		SelectObject(hdc, old_brush);
+		SetTextColor(hdc, old_fg);
+		SetBkColor(hdc, old_bk);
+		SetROP2(hdc, old_rop);
+		DeleteObject(brush);
+		DeleteObject(bitmap);
+		if(!IsNull(outline)) {
+			SetColor(Null);
+			SetDrawPen(width, outline);
+			ASSERT(sizeof(POINT) == sizeof(Point));
+			DrawPolyPolyPolygonRaw(*this, vertices, vertex_count,
+				subpolygon_counts, subpolygon_count_count,
+				disjunct_polygon_counts, disjunct_polygon_count_count);
+		}
+	}
+	else { // simple fill
+		SetDrawPen(IsNull(outline) ? PEN_NULL : width, Nvl(outline, Black));
+		int old_rop2;
+		if(is_xor) {
+			color = Color(color.GetR() ^ doxor.GetR(), color.GetG() ^ doxor.GetG(), color.GetB() ^ doxor.GetB());
+			old_rop2 = SetROP2(hdc, R2_XORPEN);
+		}
+		SetColor(color);
+		DrawPolyPolyPolygonRaw(*this, vertices, vertex_count,
+			subpolygon_counts, subpolygon_count_count,
+			disjunct_polygon_counts, disjunct_polygon_count_count);
+		if(is_xor)
+			SetROP2(hdc, old_rop2);
+	}
+}
+
+void Draw::DrawArcOp(const Rect& rc, Point start, Point end, int width, Color color)
+{
+	DrawLock __;
+	SetDrawPen(width, color);
+	::Arc(GetHandle(), rc.left, rc.top, rc.right, rc.bottom, start.x, start.y, end.x, end.y);
+}
+
+#endif
+
+void Draw::DrawEllipseOp(const Rect& r, Color color, int width, Color pencolor)
+{
+	DrawLock __;
+	SetColor(color);
+	SetDrawPen(width, pencolor);
+	::Ellipse(GetHandle(), r.left, r.top, r.right, r.bottom);
+}
+
+#endif
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/Draw/DrawOpX11.cpp b/uppsrc/Draw/DrawOpX11.cpp
new file mode 100644
index 000000000..2d3a1c6f4
--- /dev/null
+++ b/uppsrc/Draw/DrawOpX11.cpp
@@ -0,0 +1,318 @@
+#include "Draw.h"
+
+NAMESPACE_UPP
+
+#ifdef PLATFORM_X11
+
+#define LLOG(x)     // LOG(x)
+#define LTIMING(x)  // TIMING(x)
+
+void Draw::BeginOp()
+{
+	Cloff f = cloff.Top();
+	Vector<Rect> newclip;
+	newclip <<= clip.Top();
+	f.clipi = clip.GetCount();
+	clip.Add() = newclip;
+	cloff.Add(f);
+}
+
+void Draw::OffsetOp(Point p)
+{
+	Cloff f = cloff.Top();
+	f.offseti = offset.GetCount();
+	actual_offset += p;
+	offset.Add(actual_offset);
+	cloff.Add(f);
+}
+
+bool Draw::ClipOp(const Rect& r)
+{
+	LLOG("Draw::ClipOp(" << r << ")");
+	Cloff f = cloff.Top();
+	bool ch = false;
+	Vector<Rect> newclip = Intersect(clip.Top(), r + actual_offset, ch);
+	if(ch) {
+		f.clipi = clip.GetCount();
+		clip.Add() = newclip;
+	}
+	cloff.Add(f);
+	if(ch)
+		SetClip();
+	return clip.Top().GetCount();
+}
+
+bool Draw::ClipoffOp(const Rect& r)
+{
+	LLOG("Draw::ClipOffOp(" << r << ")");
+	Cloff f = cloff.Top();
+	bool ch = false;
+	Vector<Rect> newclip = Intersect(clip.Top(), r + actual_offset, ch);
+	if(ch) {
+		f.clipi = clip.GetCount();
+		clip.Add() = newclip;
+	}
+	f.offseti = offset.GetCount();
+	actual_offset += r.TopLeft();
+	offset.Add(actual_offset);
+	cloff.Add(f);
+	if(ch)
+		SetClip();
+	return clip.Top().GetCount();
+}
+
+void Draw::EndOp()
+{
+	ASSERT(cloff.GetCount());
+	cloff.Drop();
+	actual_offset = offset[cloff.Top().offseti];
+	clip.SetCount(cloff.Top().clipi + 1);
+	SetClip();
+}
+
+bool Draw::ExcludeClipOp(const Rect& r)
+{
+	LLOG("Draw::ExcludeClipOp(" << r << ")");
+	CloneClip();
+	Vector<Rect>& cl = clip.Top();
+	bool ch = false;
+	Vector<Rect> ncl = Subtract(cl, r + actual_offset, ch);
+	if(ch) {
+		cl = ncl;
+		SetClip();
+	}
+	return clip.Top().GetCount();
+}
+
+bool Draw::IntersectClipOp(const Rect& r)
+{
+	CloneClip();
+	Vector<Rect>& cl = clip.Top();
+	bool ch = false;
+	Vector<Rect> ncl = Intersect(cl, r + actual_offset, ch);
+	if(ch) {
+		cl = ncl;
+		SetClip();
+	}
+	return clip.Top().GetCount();
+}
+
+Rect Draw::GetClipOp() const
+{
+	LLOG("Draw::GetClipOp; #clip = " << clip.GetCount() << ", #cloff = " << cloff.GetCount()
+		<< ", clipi = " << cloff.Top().clipi);
+	const Vector<Rect>& cl = clip[cloff.Top().clipi];
+	Rect box(0, 0, 0, 0);
+	if(!cl.GetCount()) return box;
+	box = cl[0];
+	LLOG("cl[0] = " << box);
+	for(int i = 1; i < cl.GetCount(); i++) {
+		LLOG("cl[" << i << "] = " << cl[i]);
+		box |= cl[i];
+	}
+	LLOG("out box = " << box << ", actual offset = " << actual_offset);
+	return box - actual_offset;
+}
+
+bool Draw::IsPaintingOp(const Rect& r) const
+{
+	Rect rr = r + actual_offset;
+	const Vector<Rect>& cl = clip[cloff.Top().clipi];
+	for(int i = 0; i < cl.GetCount(); i++)
+		if(cl[i].Intersects(rr))
+			return true;
+	return false;
+}
+
+void Draw::DrawRectOp(int x, int y, int cx, int cy, Color color)
+{
+	LTIMING("DrawRect");
+	DrawLock __;
+	LLOG("DrawRect " << RectC(x, y, cx, cy) << ": " << color);
+	if(IsNull(color)) return;
+	if(cx <= 0 || cy <= 0) return;
+	if(color == InvertColor) {
+		XSetFunction(Xdisplay, gc, GXinvert);
+		XFillRectangle(Xdisplay, dw, gc, x + actual_offset.x, y + actual_offset.y, cx, cy);
+		XSetFunction(Xdisplay, gc, GXcopy);
+	}
+	else {
+		SetForeground(color);
+		XFillRectangle(Xdisplay, dw, gc, x + actual_offset.x, y + actual_offset.y, cx, cy);
+	}
+}
+
+void Draw::DrawLineOp(int x1, int y1, int x2, int y2, int width, Color color)
+{
+	DrawLock __;
+	if(IsNull(width) || IsNull(color)) return;
+	SetLineStyle(width);
+	SetForeground(color);
+	XDrawLine(Xdisplay, dw, gc,
+	          x1 + actual_offset.x, y1 + actual_offset.y,
+	          x2 + actual_offset.x, y2 + actual_offset.y);
+}
+
+void Draw::DrawPolyPolylineOp(const Point *vertices, int vertex_count,
+	                          const int *counts, int count_count,
+	                          int width, Color color, Color doxor)
+{
+	DrawLock __;
+	ASSERT(count_count > 0 && vertex_count > 0);
+	if(vertex_count < 2 || IsNull(color))
+		return;
+	XGCValues gcv_old, gcv_new;
+	XGetGCValues(Xdisplay, GetGC(), GCForeground | GCLineWidth | GCFunction, &gcv_old);
+	gcv_new.function = IsNull(doxor) ? X11_ROP2_COPY : X11_ROP2_XOR;
+	gcv_new.foreground = GetXPixel(color) ^ (IsNull(doxor) ? 0 : GetXPixel(doxor));
+	gcv_new.line_width = width;
+	XChangeGC(Xdisplay, GetGC(), GCForeground | GCLineWidth | GCFunction, &gcv_new);
+	enum { REQUEST_LENGTH = 256 }; // X server XDrawLines request length (heuristic)
+	Point offset = GetOffset();
+	if(vertex_count == 2)
+		XDrawLine(Xdisplay, GetDrawable(), GetGC(),
+			vertices[0].x + offset.x, vertices[0].y + offset.y,
+			vertices[1].x + offset.x, vertices[1].y + offset.y);
+	else if(count_count == 1 || vertex_count > count_count * (REQUEST_LENGTH + 2)) {
+		for(; --count_count >= 0; counts++)
+		{
+			Buffer<XPoint> part(*counts);
+			for(XPoint *vo = part, *ve = vo + *counts; vo < ve; vo++, vertices++)
+			{
+				vo -> x = (short)(vertices -> x + offset.x);
+				vo -> y = (short)(vertices -> y + offset.y);
+			}
+			XDrawLines(Xdisplay, GetDrawable(), GetGC(), part, *counts, CoordModeOrigin);
+		}
+	}
+	else {
+		int segment_count = vertex_count - count_count;
+		Buffer<XSegment> segments(segment_count);
+		XSegment *so = segments;
+		while(--count_count >= 0)
+		{
+			const Point *end = vertices + *counts++;
+			so -> x1 = (short)(vertices -> x + offset.x);
+			so -> y1 = (short)(vertices -> y + offset.y);
+			vertices++;
+			so -> x2 = (short)(vertices -> x + offset.x);
+			so -> y2 = (short)(vertices -> y + offset.y);
+			so++;
+			while(++vertices < end) {
+				so -> x1 = so[-1].x2;
+				so -> y1 = so[-1].y2;
+				so -> x2 = (short)(vertices -> x + offset.x);
+				so -> y2 = (short)(vertices -> y + offset.y);
+				so++;
+			}
+		}
+		ASSERT(so == segments + segment_count);
+		XDrawSegments(Xdisplay, GetDrawable(), GetGC(), segments, segment_count);
+	}
+	XChangeGC(Xdisplay, GetGC(), GCForeground | GCLineWidth | GCFunction, &gcv_old);
+}
+
+static void DrawPolyPolyPolygonRaw(Draw& draw, const Point *vertices, int vertex_count,
+	const int *subpolygon_counts, int subpolygon_count_count, const int *, int)
+{
+	DrawLock __;
+	Point offset = draw.GetOffset();
+	const Point *in = vertices;
+	for(int i = 0; i < subpolygon_count_count; i++) {
+		int n = subpolygon_counts[i];
+		Buffer<XPoint> out_points(n);
+		XPoint *t = out_points;
+		XPoint *e = t + n;
+		while(t < e) {
+			t->x = (short)(in->x + offset.x);
+			t->y = (short)(in->y + offset.y);
+			t++;
+			in++;
+		}
+		XFillPolygon(Xdisplay, draw.GetDrawable(), draw.GetGC(), out_points, n, Nonconvex, CoordModeOrigin);
+	}
+}
+
+void Draw::DrawPolyPolyPolygonOp(const Point *vertices, int vertex_count,
+	 const int *subpolygon_counts, int subpolygon_count_count,
+	const int *disjunct_polygon_counts, int disjunct_polygon_count_count,
+	Color color, int width, Color outline, uint64 pattern, Color doxor)
+{
+	DrawLock __;
+	if(vertex_count == 0)
+		return;
+
+	bool is_xor = !IsNull(doxor);
+	XGCValues gcv_old, gcv_new;
+	XGetGCValues(Xdisplay, GetGC(), GCForeground | GCFunction | GCLineWidth, &gcv_old);
+	unsigned xor_pixel = (is_xor ? GetXPixel(doxor) : 0);
+	if(!IsNull(color))
+	{
+		gcv_new.foreground = GetXPixel(color) ^ xor_pixel;
+		gcv_new.function = is_xor ? X11_ROP2_XOR : X11_ROP2_COPY;
+		XChangeGC(Xdisplay, GetGC(), GCForeground | GCFunction, &gcv_new);
+		DrawPolyPolyPolygonRaw(*this, vertices, vertex_count,
+			subpolygon_counts, subpolygon_count_count,
+			disjunct_polygon_counts, disjunct_polygon_count_count);
+	}
+	if(!IsNull(outline))
+	{
+		gcv_new.foreground = GetXPixel(outline) ^ xor_pixel;
+		gcv_new.line_width = width;
+		XChangeGC(Xdisplay, GetGC(), GCForeground | GCLineWidth, &gcv_new);
+		Point offset = GetOffset();
+		for(const int *sp = subpolygon_counts, *se = sp + subpolygon_count_count; sp < se; sp++)
+		{
+			Buffer<XPoint> segment(*sp + 1);
+			XPoint *out = segment;
+			for(const Point *end = vertices + *sp; vertices < end; vertices++, out++)
+			{
+				out -> x = (short)(vertices -> x + offset.x);
+				out -> y = (short)(vertices -> y + offset.y);
+			}
+			*out = segment[0];
+			XDrawLines(Xdisplay, GetDrawable(), GetGC(), segment, *sp + 1, CoordModeOrigin);
+		}
+	}
+	XChangeGC(Xdisplay, GetGC(), GCForeground | GCFunction | GCLineWidth, &gcv_old);
+}
+
+void Draw::DrawEllipseOp(const Rect& r, Color color, int pen, Color pencolor)
+{
+	DrawLock __;
+	SetLineStyle(pen);
+	if(!IsNull(color)) {
+		SetForeground(color);
+		XFillArc(Xdisplay, dw, gc, r.left + actual_offset.x, r.top + actual_offset.y,
+			r.Width() - 1, r.Height() - 1, 0, 360 * 64);
+	}
+	if(!IsNull(pencolor) && !IsNull(pen)) {
+		SetForeground(pencolor);
+		XDrawArc(Xdisplay, dw, gc, r.left + actual_offset.x, r.top + actual_offset.y,
+			r.Width() - 1, r.Height() - 1, 0, 360 * 64);
+	}
+}
+
+void Draw::DrawArcOp(const Rect& rc, Point start, Point end, int width, Color color)
+{
+	DrawLock __;
+	XGCValues gcv, gcv_old;
+	XGetGCValues(Xdisplay, GetGC(), GCForeground, &gcv_old);
+	Point offset = GetOffset();
+	gcv.foreground = GetXPixel(color);
+	XChangeGC(Xdisplay, GetGC(), GCForeground, &gcv);
+	Point centre = rc.CenterPoint();
+	int angle1 = fround(360 * 64 / (2 * M_PI) *
+	                    atan2(start.x - centre.x, centre.y - start.y));
+	int angle2 = fround(360 * 64 / (2 * M_PI) *
+	                    atan2(end.x - centre.x, centre.y - end.y));
+	if(angle2 <= angle1)
+		angle2 += 360 * 64;
+	XDrawArc(Xdisplay, GetDrawable(), GetGC(), rc.left + offset.x, rc.top + offset.y,
+		rc.Width(), rc.Height(), angle1, angle2);
+	XChangeGC(Xdisplay, GetGC(), GCForeground, &gcv_old);
+}
+
+#endif
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/Draw/DrawRasterData.cpp b/uppsrc/Draw/DrawRasterData.cpp
new file mode 100644
index 000000000..0e1712f43
--- /dev/null
+++ b/uppsrc/Draw/DrawRasterData.cpp
@@ -0,0 +1,40 @@
+#include "Draw.h"
+
+NAMESPACE_UPP
+
+struct cDrawRasterData : DataDrawer {
+	int                cx;
+	StringStream       ss;
+	One<StreamRaster>  raster;
+	RescaleImage       si;
+
+	virtual void Open(const String& data, int cx, int cy);
+	virtual void Render(ImageBuffer& ib);
+};
+
+void cDrawRasterData::Open(const String& data, int _cx, int cy)
+{
+	cx = _cx;
+	ss.Open(data);
+	raster = StreamRaster::OpenAny(ss);
+	if(raster)
+		si.Create(Size(cx, cy), *raster, raster->GetSize());
+}
+
+void cDrawRasterData::Render(ImageBuffer& ib)
+{
+	for(int y = 0; y < ib.GetHeight(); y++)
+		si.Get(ib[y]);
+}
+
+INITBLOCK
+{
+	DataDrawer::Register<cDrawRasterData>("image_data");
+};
+
+void DrawRasterData(Draw& w, int x, int y, int cx, int cy, const String& data)
+{
+	w.DrawData(x, y, cx, cy, data, "image_data");
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/Draw/DrawText.cpp b/uppsrc/Draw/DrawText.cpp
new file mode 100644
index 000000000..f60351ca9
--- /dev/null
+++ b/uppsrc/Draw/DrawText.cpp
@@ -0,0 +1,492 @@
+#include "Draw.h"
+
+NAMESPACE_UPP
+
+
+#if defined(PLATFORM_WIN32) || defined(PLATFORM_X11)
+
+#define LLOG(x)    // LOG(x)
+#define LTIMING(x) // TIMING(x)
+
+bool Draw::sFini;
+
+void Draw::SinCos(int angle, double& sina, double& cosa)
+{
+	angle = angle % 3600;
+	switch(angle) {
+	case    0: sina =  0; cosa =  1; break;
+	case  900: sina =  1; cosa =  0; break;
+	case 1800: sina =  0; cosa = -1; break;
+	case 2700: sina = -1; cosa =  0; break;
+	default:
+		double a = angle * M_PI / 1800.0;
+		sina = sin(a);
+		cosa = cos(a);
+		break;
+	}
+}
+
+bool Draw::StdFontSizeSet;
+Size Draw::StdFontSize;
+Font Draw::AStdFont;
+
+INITBLOCK {
+	RichValue<Font>::Register();
+}
+
+void Draw::InitFonts()
+{
+	DrawLock __;
+	if(sFini) return;
+	sFini = true;
+	GetFontHash(0);
+	GetFontLru();
+	InitPlatformFonts();
+}
+
+int FontFilter(int c)
+{
+	return c >= 'a' && c <= 'z' || c >= '0' && c <= '9' ? c : c >= 'A' && c <= 'Z' ? ToLower(c) : 0;
+}
+
+int  Font::FindFaceNameIndex(const char *name) {
+	if(!Draw::sFini) Draw::InitFonts();
+	for(int i = 1; i < GetFaceCount(); i++)
+		if(GetFaceName(i) == name)
+			return i;
+	String n = Filter(name, FontFilter);
+	for(int i = 1; i < GetFaceCount(); i++)
+		if(Filter(GetFaceName(i), FontFilter) == n)
+			return i;
+	return 0;
+}
+
+Draw& ScreenInfo();
+
+FontInfo Font::Info() const
+{
+	DrawLock __;
+	return ScreenInfo().GetFontInfoW(*this);
+}
+
+void Draw::SetStdFont(Font font)
+{
+	InitFonts();
+	AStdFont = font;
+	StdFontSizeSet = false;
+}
+
+Size Draw::GetStdFontSize()
+{
+	if(!StdFontSizeSet) {
+		StdFontSizeSet = true;
+		FontInfo fi = AStdFont.Info();
+		FontInfo bfi = AStdFont().Bold().Info();
+		StdFontSize = Size(fi.GetAveWidth(), bfi.GetHeight());
+	}
+	return StdFontSize;
+}
+
+Font StdFont()
+{
+	return Font(0, Draw::AStdFont.GetHeight());
+}
+
+String Font::GetFaceName() const {
+	if(IsNull()) return String();
+	if(GetFace() == 0)
+		return "STDFONT";
+	return GetFaceName(GetFace());
+}
+
+dword Font::GetFaceInfo() const {
+	if(IsNull()) return 0;
+	return GetFaceInfo(GetFace());
+}
+
+Font& Font::FaceName(const String& name) {
+	int n = FindFaceNameIndex(name);
+	Face(n < 0 ? 0xffff : n);
+	return *this;
+}
+
+void Font::Serialize(Stream& s) {
+	int version = 1;
+	s / version;
+	if(version >= 1) {
+		int f = GetFace();
+		if(f > COURIER)
+			f = -1;
+		s / f;
+		String name;
+		if(f < 0) {
+			name = GetFaceName();
+			s % name;
+		}
+		if(s.IsLoading())
+			if(f >= 0)
+				Face(f);
+			else
+				FaceName(name);
+	}
+	else {
+		String name = GetFaceName();
+		s % name;
+		if(s.IsLoading()) {
+			FaceName(name);
+			if(IsNull())
+				Face(COURIER);
+		}
+	}
+	s % flags % height % width;
+}
+
+template<>
+String AsString(const Font& f) {
+	if(IsNull(f)) return "<null>";
+	String s = "<" + f.GetFaceName() + Format(":%d", f.GetHeight());
+	if(f.IsBold())
+		s += " Bold";
+	if(f.IsItalic())
+		s += " Italic";
+	if(f.IsUnderline())
+		s += " Underline";
+	if(f.IsStrikeout())
+		s += " Strikeout";
+	return s + '>';
+}
+
+int Draw::FontCacheMax = 32;
+int Draw::FontCached;
+
+void Draw::FreeFonts() {
+	FontCacheMax = FontCached = 0;
+	sFini = false;
+	for(int i = 0; i < FONTHASH; i++)
+		GetFontHash(i)->DeleteList(HASH);
+}
+
+FontInfo::FontInfo(const FontInfo& f)
+{
+	Retain(f);
+}
+
+FontInfo& FontInfo::operator=(const FontInfo& f)
+{
+	Release();
+	Retain(f);
+	return *this;
+}
+
+//# Pretty ugly code....
+FontInfo::Data *Draw::GetFontHash(int i) {
+	static byte buff[FONTHASH * sizeof(FontLink)];
+	static FontLink *fonthash;
+	if(!fonthash) {
+		fonthash = (FontLink *)buff;
+		for(int i = 0; i < FONTHASH; i++)
+			fonthash[i].LinkSelfAll();
+	}
+	ASSERT(i >= 0 && i < FONTHASH);
+	return (FontInfo::Data *)&fonthash[i];
+}
+
+//# Pretty ugly code....
+FontInfo::Data *Draw::GetFontLru() {
+	static byte buff[sizeof(FontLink)];
+	static FontLink *fontlru;
+	if(!fontlru)
+		fontlru = new(buff) FontLink;
+	return (FontInfo::Data *)fontlru;
+}
+
+bool FontInfo::IsEqual(byte _charset, Font f, int angle, int device) const
+{
+	return ptr && ptr->font == f && ptr->angle == angle && ptr->device == device &&
+	       charset == _charset;
+}
+
+FontInfo::CharMetrics FontInfo::GetCM(int c) const
+{
+//	CharMetrics mm;
+//	ptr->GetMetrics(&mm, c, 1);
+//	return mm;
+
+	if(c < 0) c = (byte)c;
+	if(charset != CHARSET_UNICODE)
+		c = ToUnicode(c, charset);
+	ASSERT(c < 65536);
+	if(c >= 65536) {
+		CharMetrics h;
+		h.width = h.lspc = h.rspc = 0;
+		return h;
+	}
+	if(c < 2048)
+		return GetPage(c >> 5)[c & 31];
+	Mutex::Lock __(ptr->xmutex);
+	Kinfo& ki = ptr->kinfo.At((c >> 10) - 2);
+	if(!ki.flags) {
+		ki.flags = new byte[128];
+		memset(ki.flags, 0, 128);
+		ptr->GetMetrics(&ki.std, c, 1);
+	}
+	int fi = (c >> 3) & 127;
+	int fm = 1 << (c & 7);
+	if(ki.flags[fi] & fm)
+		return ki.std;
+	int q = ptr->xx.Find(c);
+	if(q >= 0)
+		return ptr->xx[q];
+	CharMetrics m;
+	ptr->GetMetrics(&m, c, 1);
+	if(m == ki.std)
+		ki.flags[fi] |= fm;
+	else
+		ptr->xx.Add(c, m);
+	return m;
+}
+
+int FontInfo::GetWidth(int c) const {
+	return GetCM(c).width;
+}
+
+int FontInfo::GetLeftSpace(int c) const {
+	return GetCM(c).lspc;
+}
+
+int FontInfo::GetRightSpace(int c) const {
+	return GetCM(c).rspc;
+}
+
+void Draw::Release(FontInfo::Data *font) {
+	DrawLock __;
+	ASSERT(font->refcount > 0);
+	LLOG("Release " << font->font << " count:" << font->count);
+	if(--font->refcount == 0) {
+		if(FontCacheMax == 0) {
+			delete font;
+			return;
+		}
+		FontInfo::Data *lru = GetFontLru();
+		font->LinkAfter(lru, LRU);
+		FontCached++;
+		LLOG("Placed to cache " << font->font << " cached:" << FontCached);
+		while(FontCached > FontCacheMax) {
+			ASSERT(lru->GetPrev(LRU) != lru);
+			FontCached--;
+			LLOG("Deleting from cache " << lru->GetPrev(LRU)->font <<
+				        " cached: " << FontCached);
+			delete lru->GetPrev(LRU);
+		}
+	}
+}
+
+void FontInfo::Release()
+{
+	if(ptr) Draw::Release(ptr);
+}
+
+void FontInfo::Retain(const FontInfo& f)
+{
+	DrawLock __;
+	ptr = f.ptr;
+	ptr->refcount++;
+	charset = f.charset;
+}
+
+FontInfo Draw::GetFontInfo(byte charset, Font font) {
+	DrawLock __;
+	LTIMING("GetFontInfo");
+	if(charset == CHARSET_DEFAULT)
+		charset = GetDefaultCharset();
+	if(lastFont.IsEqual(charset, font, 0, device))
+		return lastFont;
+#ifdef PLATFORM_WIN32
+	HDC hdc = GetHandle();
+	FontInfo fi = Acquire(font, hdc ? hdc : ScreenHDC(), 0, device);
+#endif
+#ifdef PLATFORM_X11
+	FontInfo fi = Acquire(font, 0, device);
+#endif
+	fi.charset = charset;
+	return fi;
+}
+
+FontInfo Draw::GetFontInfo(Font font)
+{
+	return GetFontInfo(CHARSET_DEFAULT, font);
+}
+
+FontInfo Draw::GetFontInfoW(Font font)
+{
+	return GetFontInfo(CHARSET_UNICODE, font);
+}
+
+void Draw::SetFont(Font font, int angle) {
+	DrawLock __;
+	LLOG("Set font: " << font << " face: " << font.GetFaceName());
+	if(lastFont && lastFont.IsEqual(CHARSET_UNICODE, font, angle, device))
+		return;
+#ifdef PLATFORM_WIN32
+	lastFont = Acquire(font, GetHandle(), angle, device);
+	HFONT h = (HFONT) SelectObject(handle, lastFont.ptr->hfont);
+	if(!orgFont) orgFont = h;
+#endif
+#ifdef PLATFORM_X11
+	lastFont = Acquire(font, angle, device);
+#endif
+}
+
+WString TextUnicode(const char *s, int n, byte cs, Font font)
+{
+	if(n < 0)
+		n = (int)strlen(s);
+	if(font.GetFace() == Font::SYMBOL) {
+		WStringBuffer b(n);
+		wchar *t = b;
+		while(n > 0) {
+			*t++ = *s++;
+			n--;
+		}
+		return b;
+	}
+	else
+		return ToUnicode(s, n, cs);
+}
+
+FontInfo::CharMetrics *FontInfo::CreateMetricsPage(int page) const
+{
+	DrawLock __;
+	CharMetrics *cm;
+	cm = new CharMetrics[32];
+	ptr->GetMetrics(cm, page << 5, 32);
+	if(page >= 8 && page < 12)
+		ComposeMetrics(ptr->font, cm, page);
+	return cm;
+}
+
+FontInfo::CharMetrics *FontInfo::GetPage(int page) const
+{
+	ASSERT(page >= 0 && page < 64);
+	ONCELOCK_PTR(ptr->base[page], CreateMetricsPage(page));
+	return ptr->base[page];
+}
+
+void Draw::DrawText(int x, int y, int angle, const wchar *text, Font font,
+		            Color ink, int n, const int *dx)
+{
+	if(IsNull(ink)) return;
+	if(n < 0)
+		n = wstrlen(text);
+	ComposeText(x, y, angle, text, font, ink, n, dx);
+}
+
+// ----------------------------
+
+void Draw::DrawText(int x, int y, const wchar *text, Font font,
+                    Color ink, int n, const int *dx)
+{
+	DrawText(x, y, 0, text, font, ink, n, dx);
+}
+
+// ---------------------------
+
+void Draw::DrawText(int x, int y, int angle, const WString& text, Font font,
+                    Color ink, const int *dx)
+{
+	DrawText(x, y, angle, ~text, font, ink, text.GetLength(), dx);
+}
+
+void Draw::DrawText(int x, int y, const WString& text, Font font, Color ink, const int *dx)
+{
+	DrawText(x, y, 0, text, font, ink, dx);
+}
+
+// ---------------------------
+
+void Draw::DrawText(int x, int y, int angle, const char *text, byte charset, Font font,
+                    Color ink, int n, const int *dx)
+{
+	DrawText(x, y, angle, TextUnicode(text, n, charset, font), font, ink, dx);
+}
+
+void Draw::DrawText(int x, int y, const char *text, byte charset, Font font,
+                    Color ink, int n, const int *dx)
+{
+	DrawText(x, y, 0, text, charset, font, ink, n, dx);
+}
+
+// ---------------------------
+
+void Draw::DrawText(int x, int y, int angle, const char *text,
+                    Font font, Color ink, int n, const int *dx)
+{
+	DrawText(x, y, angle, text, CHARSET_DEFAULT, font, ink, n, dx);
+}
+
+void Draw::DrawText(int x, int y, const char *text, Font font,
+                    Color ink, int n, const int *dx)
+{
+	DrawText(x, y, text, CHARSET_DEFAULT, font, ink, n, dx);
+}
+
+// ---------------------------
+
+void Draw::DrawText(int x, int y, int angle, const String& text, Font font,
+                    Color ink, const int *dx)
+{
+	DrawText(x, y, angle, text, font, ink, text.GetLength(), dx);
+}
+
+void Draw::DrawText(int x, int y, const String& text, Font font, Color ink, const int *dx)
+{
+	WString h = TextUnicode(text, text.GetLength(), CHARSET_DEFAULT, font);
+	DrawText(x, y, h, font, ink, h.GetLength(), dx);
+}
+
+// --------------------------
+
+Size GetTextSize(const wchar *text, Font font, int n)
+{
+	FontInfo fi = font.Info();
+	if(n < 0)
+		n = wstrlen(text);
+	Size sz;
+	sz.cx = 0;
+	const wchar *wtext = (const wchar *)text;
+	while(n > 0) {
+		sz.cx += fi[*wtext++];
+		n--;
+	}
+	sz.cy = fi.GetHeight();
+	return sz;
+}
+
+Size GetTextSize(const WString& text, Font font)
+{
+	return GetTextSize(text, font, text.GetLength());
+}
+
+Size GetTextSize(const char *text, byte charset, Font font, int n)
+{
+	return GetTextSize(TextUnicode(text, n, charset, font), font);
+}
+
+Size GetTextSize(const char *text, Font font, int n)
+{
+	return GetTextSize(text, CHARSET_DEFAULT, font, n);
+}
+
+Size GetTextSize(const String& text, Font font)
+{
+	return GetTextSize(text, font, text.GetLength());
+}
+
+Font Draw::GetStdFont()
+{
+	return AStdFont;
+}
+
+#endif
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/Draw/DrawTextUtil.cpp b/uppsrc/Draw/DrawTextUtil.cpp
new file mode 100644
index 000000000..a1703acb2
--- /dev/null
+++ b/uppsrc/Draw/DrawTextUtil.cpp
@@ -0,0 +1,123 @@
+#include "Draw.h"
+
+NAMESPACE_UPP
+
+void DrawTextEllipsis(Draw& w, int x, int y, int cx, const wchar *text, const char *ellipsis,
+				      Font font, Color ink, int n)
+{
+	if(n < 0) n = wstrlen(text);
+	FontInfo f = font.Info();
+	const char *s;
+	int dtl = 0;
+	int el = 0;
+	for(s = ellipsis; *s; s++) {
+		dtl += f[(byte)*s];
+		el++;
+	}
+	int l = 0;
+	int i;
+	for(i = 0; i < n; i++) {
+		l += f[(byte) text[i]];
+		if(l > cx) {
+			while(l + dtl > cx && i > 0) {
+				l -= f[(byte) text[i]];
+				i--;
+			}
+			i++;
+			break;
+		}
+	}
+	w.DrawText(x, y, text, font, ink, i);
+	if(i < n)
+		w.DrawText(x + l, y, ellipsis, font, ink, el);
+}
+
+void DrawTextEllipsis(Draw& w, int x, int y, int cx, const char *text, const char *ellipsis,
+				      Font font, Color ink, int n)
+{
+	DrawTextEllipsis(w, x, y, cx, WString(text), ellipsis, font, ink, n);
+}
+
+Size GetTLTextSize(const wchar *text, Font font)
+{
+	Size sz(0, 0);
+	int cy = font.Info().GetHeight();
+	const wchar *s = text;
+	const wchar *t = s;
+	for(;;) {
+		if(*s == '\n' || *s == '\0') {
+			int a = 0;
+			const wchar *q = t;
+			while(q < s) {
+				while(q < s && *q < ' ') {
+					if(*q == '\t')
+						a = (a + 2 * cy) / (2 * cy) * (2 * cy);
+					q++;
+				}
+				t = q;
+				while(q < s && *q >= ' ')
+					q++;
+				a += GetTextSize(t, font, (int) (q - t)).cx;
+			}
+			t = s + 1;
+			sz.cy += cy;
+			sz.cx = max(sz.cx, a);
+		}
+		if(*s++ == '\0') break;
+	}
+	return sz;
+}
+
+int GetTLTextHeight(const wchar *s, Font font)
+{
+	int cy = font.Info().GetHeight();
+	int h = cy;
+	while(*s) {
+		if(*s == '\n')
+			h += cy;
+		s++;
+	}
+	return h;
+}
+
+void DrawTLText(Draw& draw, int x, int y, int cx, const wchar *text,
+                Font font, Color ink, int accesskey) {
+	int cy = font.Info().GetHeight();
+	const wchar *s = text;
+	const wchar *t = s;
+	for(;;) {
+		if(*s == '\n' || *s == '\0') {
+			int a = x;
+			const wchar *q = t;
+			while(q < s) {
+				while(q < s && *q < ' ') {
+					if(*q == '\t')
+						a = (a - x + 2 * cy) / (2 * cy) * (2 * cy) + x;
+					q++;
+				}
+				t = q;
+				bool ak = false;
+				while(q < s && *q >= ' ') {
+					if(accesskey && ToUpper(ToAscii(*q)) == accesskey) {
+						ak = true;
+						accesskey = 0;
+						break;
+					}
+					q++;
+				}
+				draw.DrawText(a, y, t, font, ink, (int)(q - t));
+				a += GetTextSize(t, font, (int)(q - t)).cx;
+				if(ak) {
+					draw.DrawText(a, y, q, font().Underline(), ink, 1);
+					a += GetTextSize(q, font().Underline(), 1).cx;
+					q++;
+				}
+			}
+			t = s + 1;
+			y += cy;
+		}
+		if(*s++ == '\0') break;
+	}
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/Draw/DrawTextWin32.cpp b/uppsrc/Draw/DrawTextWin32.cpp
new file mode 100644
index 000000000..36cdd915a
--- /dev/null
+++ b/uppsrc/Draw/DrawTextWin32.cpp
@@ -0,0 +1,417 @@
+#include "Draw.h"
+
+NAMESPACE_UPP
+
+#ifdef PLATFORM_WIN32
+
+#define LLOG(x)     //  LOG(x)
+#define LTIMING(x)
+
+struct FontFaceInfo : Moveable<FontFaceInfo> {
+	String name;
+	dword  info;
+
+	FontFaceInfo() { info = 0; }
+};
+
+static VectorMap<String, FontFaceInfo>& sFontFace()
+{
+	static VectorMap<String, FontFaceInfo> s;
+	return s;
+}
+
+int    Font::GetFaceCount()
+{
+	if(!Draw::sFini) Draw::InitFonts();
+	return sFontFace().GetCount();
+}
+
+String Font::GetFaceName(int index) {
+	if(!Draw::sFini) Draw::InitFonts();
+	return index >= 0 && index < sFontFace().GetCount() ? sFontFace()[index].name
+	                                                    : Null;
+}
+
+dword Font::GetFaceInfo(int index) {
+	if(!Draw::sFini) Draw::InitFonts();
+	return index >= 0 && index < sFontFace().GetCount() ? sFontFace()[index].info
+	                                                    : 0;
+}
+
+int CALLBACK Draw::AddFace(const LOGFONT *logfont, const TEXTMETRIC *, dword type, LPARAM param)
+{
+#ifdef PLATFORM_WINCE
+	const wchar *facename = (const wchar *)param;
+	if(facename && _wcsicmp(logfont->lfFaceName, facename))
+		return 1;
+#else
+	const char *facename = (const char *)param;
+	if(facename && stricmp(logfont->lfFaceName, facename))
+		return 1;
+#endif
+
+	dword typ = 0;
+	if((logfont->lfPitchAndFamily & 3) == FIXED_PITCH)
+		typ |= Font::FIXEDPITCH;
+	if(type & TRUETYPE_FONTTYPE)
+		typ |= Font::SCALEABLE;
+	if(logfont->lfCharSet == SYMBOL_CHARSET)
+		typ |= Font::SYMBOLTYPE;
+	else
+	if(logfont->lfCharSet != 0)
+		typ |= Font::LOCAL;
+#ifndef PLATFORM_WINCE
+	{
+		typedef DWORD (WINAPI *GGIW)(HDC, LPCWSTR, int, LPWORD, DWORD);
+		static GGIW fn;
+		ONCELOCK
+			if(HMODULE hDLL = LoadLibrary("gdi32"))
+				fn = (GGIW) GetProcAddress(hDLL, "GetGlyphIndicesW");
+		if(fn) {
+			HDC hdc = CreateIC("DISPLAY", NULL, NULL, NULL);
+			HFONT hfnt = (HFONT) CreateFontIndirect(logfont);
+			HFONT o = (HFONT) SelectObject(hdc, hfnt);
+			wchar wch[128];
+			WORD  pos[128];
+			for(int i = 0; i < 128; i++)
+				wch[i] = i + 256;
+			(*fn)(hdc,  (LPCWSTR) wch, 128, pos, 1);
+			SelectObject(hdc, o);
+			DeleteObject(hfnt);
+			DeleteDC(hdc);
+			int n = 0;
+			for(int i = 0; i < 128; i++)
+				if(pos[i] == 0xffff)
+					n++;
+			if(n > 10)
+				typ |= Font::COMPOSED;
+		}
+	}
+#endif
+#ifdef PLATFORM_WINCE
+	if(facename) {
+		FontFaceInfo& f = sFontFace().Add(WString(logfont->lfFaceName).ToString());
+		f.name = WString(facename).ToString();
+		return 0;
+	}
+	FontFaceInfo& f = sFontFace().Add(WString(logfont->lfFaceName).ToString());
+	f.name = FromSystemCharset(logfont->lfFaceName);
+#else
+	if(facename) {
+		FontFaceInfo& f = sFontFace().Add(logfont->lfFaceName);
+		f.name = facename;
+		f.info = typ;
+		return 0;
+	}
+	FontFaceInfo& f = sFontFace().Add(logfont->lfFaceName);
+	f.name = FromSystemCharset(logfont->lfFaceName);
+#endif
+	f.info |= typ;
+	return 1;
+}
+
+int Draw::EnumFace(HDC hdc, const char *face)
+{
+#ifdef PLATFORM_WINCE
+	return EnumFontFamilies(hdc, ToSystemCharset(face), AddFace, (LPARAM)~ToSystemCharset(face));
+#else
+	return EnumFontFamilies(hdc, face, AddFace, (LPARAM)face);
+#endif
+}
+
+void Draw::ForceFace(HDC hdc, const char *face, const char *aface)
+{
+	if(!aface)
+		aface = "Arial";
+	if(EnumFace(hdc, face) && (aface == NULL || EnumFace(hdc, aface)))
+		Panic("Missing font " + String(face));
+}
+
+#ifdef PLATFORM_WINCE
+const char *Draw::FontScreenSans  = "Tahoma"; //TODO!
+const char *Draw::FontScreenSerif = "Tahoma";
+const char *Draw::FontScreenFixed = "Courier New";
+const char *Draw::FontRoman       = "Tahoma" ;
+const char *Draw::FontArial       = "Tahoma";
+const char *Draw::FontCourier     = "Tahoma";
+const char *Draw::FontSymbol      = "Tahoma";
+const char *Draw::FontWingdings   = "Tahoma";
+const char *Draw::FontTahoma      = "Tahoma";
+#else
+const char *Draw::FontScreenSans  = "Arial";
+const char *Draw::FontScreenSerif = "Times New Roman";
+const char *Draw::FontScreenFixed = "Courier New";
+const char *Draw::FontRoman       = "Times New Roman" ;
+const char *Draw::FontArial       = "Arial";
+const char *Draw::FontCourier     = "Courier New";
+const char *Draw::FontSymbol      = "Symbol";
+const char *Draw::FontWingdings   = "WingDings";
+const char *Draw::FontTahoma      = "Tahoma";
+#endif
+
+void Draw::InitPlatformFonts() {
+#ifdef PLATFORM_WINCE
+	HDC hdc = CreateDC(NULL, NULL, NULL, NULL);
+#else
+	HDC hdc = CreateIC("DISPLAY", NULL, NULL, NULL);
+#endif
+	ForceFace(hdc, FontScreenSans, NULL);
+	ForceFace(hdc, FontScreenSerif, FontScreenSans);
+	ForceFace(hdc, FontScreenSans, FontScreenSans);
+	ForceFace(hdc, FontScreenFixed, FontScreenSans);
+	ForceFace(hdc, FontRoman, FontScreenSans);
+	ForceFace(hdc, FontArial, FontScreenSans);
+	ForceFace(hdc, FontCourier, FontScreenSans);
+	ForceFace(hdc, FontSymbol, FontScreenSans);
+	ForceFace(hdc, FontWingdings, FontArial);
+	ForceFace(hdc, FontTahoma, FontArial);
+	EnumFace(hdc, NULL);
+	DeleteDC(hdc);
+#ifdef PLATFORM_WINCE
+	SetStdFont(Arial(10));
+#else
+	NONCLIENTMETRICS ncm;
+	ncm.cbSize = sizeof(ncm);
+	::SystemParametersInfo(SPI_GETNONCLIENTMETRICS, sizeof(ncm), &ncm, 0);
+	SetStdFont(Font(Font::FindFaceNameIndex(ncm.lfMenuFont.lfFaceName),
+	                abs((int)ncm.lfMenuFont.lfHeight)));
+#endif
+}
+
+FontInfo::Data::Data()
+{
+	refcount = 1;
+	hfont = NULL;
+	for(int i = 0; i < 64; i++)
+		base[i] = NULL;
+}
+
+FontInfo::Data::~Data()
+{
+	DrawLock __;
+	if(hfont)
+		DeleteObject(hfont);
+	for(int i = 0; i < 64; i++)
+		if(base[i]) delete[] base[i];
+}
+
+int sGetCW(HDC hdc, wchar *h, int n)
+{
+	SIZE sz;
+	return GetTextExtentPoint32W(hdc, h, n, &sz) ? sz.cx : 0;
+}
+
+void FontInfo::Data::GetMetrics(CharMetrics *t, int from, int count)
+{
+	DrawLock __;
+	HDC hdc = ScreenHDC();
+	HFONT ohfont = (HFONT) ::SelectObject(hdc, hfont);
+	if(from >= 8192) {
+		TIMING("GetMetricsSlow");
+		wchar h[3];
+		h[0] = 'x';
+		h[1] = 'x';
+		h[2] = 'x';
+		int w0 = sGetCW(hdc, h, 2);
+		for(int i = 0; i < count; i++) {
+			h[1] = from + i;
+			t[i].width = sGetCW(hdc, h, 3) - w0;
+			t[i].lspc = t[i].rspc = 0;
+		}
+	}
+	else {
+		bool abca = false, abcw = false;
+		Buffer<ABC> abc(count);
+#ifdef PLATFORM_WINCE
+		if(scaleable)
+			abcw = ::GetCharABCWidths(hdc, from, from + count - 1, abc);
+#else
+		if(scaleable && !(abcw = ::GetCharABCWidthsW(hdc, from, from + count - 1, abc)))
+			abca = ::GetCharABCWidthsA(hdc, from, from + count - 1, abc);
+#endif
+		if(abcw)
+		{
+			for(ABC *s = abc, *lim = abc + count; s < lim; s++, t++)
+			{
+				t->width = s->abcA + s->abcB + s->abcC;
+				t->lspc = s->abcA;
+				t->rspc = s->abcC;
+			}
+		}
+		else
+		{
+			Buffer<int> wb(count);
+#ifdef PLATFORM_WINCE
+			::GetCharWidth32(hdc, from, from + count - 1, wb);
+#else
+			::GetCharWidthW(hdc, from, from + count - 1, wb);
+#endif
+			for(int *s = wb, *lim = wb + count; s < lim; s++, t++)
+			{
+				t->width = *s - overhang;
+				if(abca)
+				{
+					ABC aa = abc[(byte)ToAscii(from++)];
+					t->lspc = aa.abcA;
+					t->rspc = aa.abcC;
+				}
+				else
+					t->lspc = t->rspc = 0;
+			}
+		}
+	}
+	::SelectObject(hdc, ohfont);
+}
+
+FontInfo Draw::Acquire(Font font, HDC hdc, int angle, int device)
+{
+	DrawLock __;
+	if(IsNull(font))
+		font = StdFont();
+	if(font.GetFace() == 0)
+		font.Face(AStdFont.GetFace());
+	if(font.GetHeight() == 0)
+		font.Height(AStdFont.GetHeight());
+//	if(font.GetFace() >= sFontFace().GetCount())
+//		font.SetFace(Font::ARIAL);
+	FontInfo::Data *f, *fh;
+	f = fh = GetFontHash((font.GetHashValue() ^ angle ^ (device << 9)) % FONTHASH);
+	LLOG("Acquire " << font);
+	for(;;) {
+		f = f->GetNext(HASH);
+		if(f == fh) break;
+		if(f->font == font && f->angle == angle && f->device == device)
+		{
+			LLOG("Reusing " << f->font << " count:" << f->count);
+			if(f->InList(LRU)) {
+				f->Unlink(LRU);
+				FontCached--;
+				LLOG("Removing from cache " << f->font << " count:" << f->count <<
+				     " cached:" << FontCached);
+			}
+			f->refcount++;
+			return f;
+		}
+	}
+	LLOG("New " << font);
+	LTIMING("Acquire New");
+	f = fh->InsertNext(HASH);
+	f->font = font;
+	f->angle = angle;
+	f->device = device;
+
+	byte chrset;
+	if((sFontFace()[font.GetFace()].info & Font::SCALEABLE) == 0)
+		chrset = DEFAULT_CHARSET;
+	else
+	if(sFontFace()[font.GetFace()].info & Font::SYMBOLTYPE)
+		chrset = SYMBOL_CHARSET;
+	else
+		chrset = DEFAULT_CHARSET;
+#ifdef PLATFORM_WINCE
+	LOGFONT lfnt;
+	Zero(lfnt);
+	lfnt.lfHeight = font.GetHeight() ? -abs(font.GetHeight()) : -12;
+	lfnt.lfWeight = font.IsBold() ? FW_BOLD : FW_NORMAL;
+	lfnt.lfItalic = font.IsItalic();
+	lfnt.lfUnderline = font.IsUnderline();
+	lfnt.lfStrikeOut = font.IsStrikeout();
+	wcscpy(lfnt.lfFaceName, ToSystemCharset(font.GetFaceName()));
+	f->hfont = CreateFontIndirect(&lfnt);
+#else
+	f->hfont = CreateFont(font.GetHeight() ? -abs(font.GetHeight()) : -12,
+		                  font.GetWidth(), angle, angle, font.IsBold() ? FW_BOLD : FW_NORMAL,
+		                  font.IsItalic(), font.IsUnderline(), font.IsStrikeout(),
+						  chrset,
+						  font.IsTrueTypeOnly() ? OUT_TT_ONLY_PRECIS : OUT_DEFAULT_PRECIS,
+						  CLIP_DEFAULT_PRECIS,
+						  font.IsNonAntiAliased() ? NONANTIALIASED_QUALITY
+						                          : DEFAULT_QUALITY,
+						  DEFAULT_PITCH|FF_DONTCARE,
+						  sFontFace().GetKey(font.GetFace()));
+#endif
+	ASSERT(f->hfont);
+	TEXTMETRIC tm;
+	HFONT hfont = (HFONT) ::SelectObject(hdc, f->hfont);
+	::GetTextMetrics(hdc, &tm);
+	f->ascent = tm.tmAscent;
+	f->descent = tm.tmDescent;
+	f->external = tm.tmExternalLeading;
+	f->internal = tm.tmInternalLeading;
+	f->height = f->ascent + f->descent;
+	f->lineheight = f->height + f->external;
+	f->overhang = tm.tmOverhang;
+	f->avewidth = tm.tmAveCharWidth;
+	f->maxwidth = tm.tmMaxCharWidth;
+	f->firstchar = tm.tmFirstChar;
+	f->charcount = tm.tmLastChar - tm.tmFirstChar + 1;
+	f->default_char = tm.tmDefaultChar;
+	f->fixedpitch = (tm.tmPitchAndFamily & TMPF_FIXED_PITCH) == 0;
+	f->scaleable = tm.tmPitchAndFamily & TMPF_TRUETYPE;
+	f->kerning.Clear();
+	if(f->scaleable) {
+		ABC abc;
+		GetCharABCWidths(hdc, 'o', 'o', &abc);
+		f->spacebefore = abc.abcA;
+		f->spaceafter = abc.abcC;
+	}
+	else
+		f->spacebefore = f->spaceafter = 0;
+#ifndef PLATFORM_WINCE
+	int n = ::GetKerningPairs(hdc, 0, NULL);
+	if(n) {
+		Buffer<KERNINGPAIR> kp(n);
+		::GetKerningPairs(hdc, n, kp);
+		const KERNINGPAIR *p = kp;
+		while(n--) {
+			f->kerning.Add(MAKELONG(p->wFirst, p->wSecond), p->iKernAmount);
+			p++;
+		}
+	}
+#endif
+	::SelectObject(hdc, hfont);
+	f->offset = Size(0, f->ascent);
+	if(angle) {
+		FontInfo font0 = Acquire(font, hdc, 0, device);
+		double sina, cosa;
+		SinCos(angle, sina, cosa);
+		f->offset.cx = fround(font0.GetAscent() * sina);
+		f->offset.cy = fround(font0.GetAscent() * cosa);
+	}
+	return FontInfo(f);
+}
+
+void Draw::DrawTextOp(int x, int y, int angle, const wchar *text, Font font, Color ink,
+                      int n, const int *dx) {
+	while(n > 30000) {
+		DrawTextOp(x, y, angle, text, font, ink, 30000, dx);
+		if(dx) {
+			for(int i = 0; i < 30000; i++)
+				x += *dx++;
+		}
+		else
+			x += GetTextSize(text, font, 30000).cx;
+		n -= 30000;
+		text += 30000;
+	}
+	DrawLock __;
+	COLORREF cr = GetColor(ink);
+	if(cr != lastTextColor) {
+		LLOG("Setting text color: " << ink);
+		::SetTextColor(handle, lastTextColor = cr);
+	}
+	if(angle) {
+		SetFont(font, angle);
+		::ExtTextOutW(handle, x + lastFont.ptr->offset.cx, y + lastFont.ptr->offset.cy,
+		              0, NULL, (const WCHAR *)text, n, dx);
+	}
+	else {
+		SetFont(font);
+		::ExtTextOutW(handle, x, y + lastFont.GetAscent(), 0, NULL, (const WCHAR *)text,
+		              n, dx);
+	}
+}
+
+#endif
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/Draw/DrawTextXft.cpp b/uppsrc/Draw/DrawTextXft.cpp
new file mode 100644
index 000000000..33d8584dc
--- /dev/null
+++ b/uppsrc/Draw/DrawTextXft.cpp
@@ -0,0 +1,371 @@
+#include "Draw.h"
+
+NAMESPACE_UPP
+
+#ifdef PLATFORM_XFT
+
+#define LLOG(x)       //LOG(x)
+#define LTIMING(x)    //RTIMING(x)
+
+struct XFTFontFaceInfo {
+	String      name;
+	bool        fixed:1;
+	bool        scaleable:1;
+	bool        compose:1;
+
+	XFTFontFaceInfo()
+	{
+		fixed = scaleable = false;
+	}
+};
+
+ArrayMap<String, XFTFontFaceInfo>& XFTFontFace()
+{
+	static ArrayMap<String, XFTFontFaceInfo> x;
+	return x;
+}
+
+FontInfo::Data::Data()
+{
+	refcount = 1;
+	for(int i = 0; i < 64; i++)
+		base[i] = NULL;
+	xftfont = NULL;
+}
+
+FontInfo::Data::~Data()
+{
+	DrawLock __;
+	if(xftfont0 && xftfont0 != xftfont)
+		XftFontClose(Xdisplay, xftfont0);
+	if(xftfont)
+		XftFontClose(Xdisplay, xftfont);
+	for(int i = 0; i < 64; i++)
+		if(base[i]) delete[] base[i];
+}
+
+void FontInfo::Data::GetMetrics(CharMetrics *t, int from, int count)
+{
+	DrawLock __;
+	LTIMING("GetMetrics");
+	LLOG("GetMetrics " << font << " " << from << ", " << count);
+	if(xftfont) {
+		for(int i = 0; i < count; i++) {
+			LTIMING("XftTextExtents16");
+			wchar h = from + i;
+			XGlyphInfo info;
+			XftTextExtents16(Xdisplay, xftfont0, &h, 1, &info);
+			t[i].width = info.xOff;
+			t[i].lspc = -info.x;
+			t[i].rspc = info.xOff - info.width + info.x;
+		}
+	}
+}
+
+const char *basic_fonts[] = {
+	"sans-serif",
+	"serif",
+	"sans-serif",
+	"monospace",
+	"serif",
+	"sans-serif",
+	"monospace",
+};
+
+static int sCheckComposed(const char *face)
+{
+	XftFont *xftfont = XftFontOpen(Xdisplay, Xscreenno,
+	                               XFT_FAMILY, XftTypeString, (char *)face,
+	                               XFT_PIXEL_SIZE, XftTypeInteger, 20,
+	                               (void *)0);
+	if(xftfont == NULL )
+		return -1;
+	int n = 0;
+	for(int c = 0; c < 128; c++)
+		if(!XftCharExists(Xdisplay, xftfont, c + 256))
+			n++;
+	XftFontClose(Xdisplay, xftfont);
+	return n > 10;
+}
+
+void Draw::InitPlatformFonts()
+{
+	for(int i = 0; i < __countof(basic_fonts); i++) {
+		XFTFontFaceInfo& f = XFTFontFace().Add(basic_fonts[i]);
+		f.name = basic_fonts[i];
+		f.scaleable = true;
+		f.fixed = i == 3 || i == 6;
+		f.compose = sCheckComposed(basic_fonts[i]);
+	}
+	FcFontSet *fs = XftListFonts(Xdisplay, Xscreenno, (void *)0, XFT_FAMILY, XFT_SPACING,
+	                             XFT_SCALABLE, (void *)0);
+	for(int i = 0; i < fs->nfont; i++) {
+		FcChar8 *family = NULL;
+		if(FcPatternGetString(fs->fonts[i], FC_FAMILY, 0, &family) == 0 && family) {
+			int comp = sCheckComposed((char *)family);
+			if(comp >= 0) {
+				XFTFontFaceInfo& f = XFTFontFace().GetAdd((char *)family);
+				int spacing;
+				if(FcPatternGetInteger(fs->fonts[i], FC_SPACING, 0, &spacing) == 0 && spacing == XFT_MONO)
+					f.fixed = true;
+				FcBool scaleable;
+				if(FcPatternGetBool(fs->fonts[i], FC_SCALABLE, 0, &scaleable) == 0 && scaleable)
+					f.scaleable = true;
+				f.compose = comp;
+			}
+		}
+	}
+	FcFontSetDestroy(fs);
+}
+
+int    Font::GetFaceCount()
+{
+	if(!Draw::sFini) Draw::InitFonts();
+	return XFTFontFace().GetCount();
+}
+
+String Font::GetFaceName(int index)
+{
+	if(!Draw::sFini) Draw::InitFonts();
+	return index >= 0 && index < XFTFontFace().GetCount() ? XFTFontFace().GetKey(index)
+	                                                      : Null;
+}
+
+dword Font::GetFaceInfo(int index) {
+	if(!Draw::sFini) Draw::InitFonts();
+	dword w = 0;
+	if(index >= 0 && index < XFTFontFace().GetCount()) {
+		XFTFontFaceInfo& fi = XFTFontFace()[index];
+		if(fi.fixed)
+			w |= FIXEDPITCH;
+		if(fi.scaleable)
+			w |= SCALEABLE;
+		if(fi.compose)
+			w |= COMPOSED;
+	}
+	return w;
+}
+
+int    gtk_antialias = -1;
+int    gtk_hinting = -1;
+String gtk_hintstyle;
+String gtk_rgba;
+
+XftFont *Draw::CreateXftFont(Font font, int angle)
+{
+	LTIMING("CreateXftFont");
+	XftFont *xftfont;
+	double sina, cosa;
+	int hg = abs(font.GetHeight());
+	if(hg == 0) hg = 10;
+	int i = font.GetFace();
+	if(i < 0 || i >= XFTFontFace().GetCount())
+		i = 0;
+	const char *face = i < 7 ? basic_fonts[i] : ~XFTFontFace().GetKey(i);
+	FcPattern *p = FcPatternCreate();
+	FcPatternAddString(p, FC_FAMILY, (FcChar8*)face);
+	FcPatternAddInteger(p, FC_SLANT, font.IsItalic() ? 110 : 0);
+	FcPatternAddInteger(p, FC_PIXEL_SIZE, hg);
+	FcPatternAddInteger(p, FC_WEIGHT, font.IsBold() ? 200 : 100);
+	FcPatternAddBool(p, FC_MINSPACE, 1);
+	if(angle) {
+		FcMatrix mx;
+		SinCos(angle, sina, cosa);
+		mx.xx = cosa;
+		mx.xy = -sina;
+		mx.yx = sina;
+		mx.yy = cosa;
+		FcPatternAddMatrix(p, FC_MATRIX, &mx);
+	}
+	FcResult result;
+	FcPattern *m = XftFontMatch(Xdisplay, Xscreenno, p, &result);
+	if(font.IsNonAntiAliased() || gtk_antialias >= 0) {
+		FcPatternDel(m, FC_ANTIALIAS);
+		FcPatternAddBool(m, FC_ANTIALIAS,
+		                 font.IsNonAntiAliased() ? FcFalse : gtk_antialias ? FcTrue : FcFalse);
+	}
+	if(gtk_hinting >= 0) {
+		FcPatternDel(m, FC_HINTING);
+		FcPatternAddBool(m, FC_HINTING, gtk_hinting);
+	}
+	const char *hs[] = { "hintnone", "hintslight", "hintmedium", "hintfull" };
+	for(int i = 0; i < 4; i++)
+		if(gtk_hintstyle == hs[i]) {
+			FcPatternDel(m, FC_HINT_STYLE);
+			FcPatternAddInteger(m, FC_HINT_STYLE, i);
+		}
+	const char *rgba[] = { "_", "rgb", "bgr", "vrgb", "vbgr" };
+	for(int i = 0; i < __countof(rgba); i++)
+		if(gtk_rgba == rgba[i]) {
+			FcPatternDel(m, FC_RGBA);
+			FcPatternAddInteger(m, FC_RGBA, i);
+		}
+	xftfont = XftFontOpenPattern(Xdisplay, m);
+	FcPatternDestroy(p);
+	return xftfont;
+}
+
+FontInfo Draw::Acquire(Font font, int angle, int device)
+{
+	DrawLock __;
+	LTIMING("Acquire");
+	if(IsNull(font))
+		font = StdFont();
+	if(font.GetFace() == 0)
+		font.Face(AStdFont.GetFace());
+	if(font.GetHeight() == 0)
+		font.Height(AStdFont.GetHeight());
+	FontInfo::Data *f, *fh;
+	f = fh = GetFontHash((font.GetHashValue() ^ angle ^ (device << 9)) % (int)FONTHASH);
+	LLOG("Acquire " << font << " device: " << device);
+	for(;;) {
+		f = f->GetNext(HASH);
+		if(f == fh) break;
+		if(f->font == font && f->angle == angle && f->device == device)
+		{
+			LLOG("Reusing " << f->font);
+			if(f->InList(LRU)) {
+				f->Unlink(LRU);
+				FontCached--;
+				LLOG("Removing from cache " << f->font << " cached:" << FontCached);
+			}
+			f->refcount++;
+			return f;
+		}
+	}
+	LLOG("New " << font);
+	LTIMING("Acquire New");
+	f = fh->InsertNext(HASH);
+	f->font = font;
+	f->angle = angle;
+	f->device = device;
+	int hg = abs(font.GetHeight());
+	if(hg == 0) hg = 10;
+	f->xftfont0 = f->xftfont = CreateXftFont(font, angle);
+	if(angle)
+		f->xftfont0 = CreateXftFont(font, 0);
+	f->filename = NULL;
+	f->ascent = (int16)f->xftfont0->ascent;
+	f->descent = (int16)f->xftfont0->descent;
+	f->height = f->ascent + f->descent;
+	f->lineheight = (int16)f->xftfont0->height;
+	f->external = 0;
+	f->internal = 0;
+	f->overhang = 0;
+	f->maxwidth = (int16)f->xftfont0->max_advance_width;
+	f->avewidth = f->maxwidth;
+	f->default_char = '?';
+	f->fixedpitch = font.GetFaceInfo() & Font::FIXEDPITCH;
+	f->underline_thickness = max(hg / 20, 1);
+	f->underline_position = max(hg / 15, int(f->descent > 0));
+	if(angle) {
+		SinCos(angle, f->sina, f->cosa);
+		f->offset.cx = fround(f->ascent * f->sina);
+		f->offset.cy = fround(f->ascent * f->cosa);
+	}
+	FontInfo fi = FontInfo(f);
+	fi.GetPage(0);
+	return fi;
+}
+
+String FontInfo::GetFileName() const
+{
+	if(IsNull(ptr->filename)) {
+		char *fn = NULL;
+		XftPatternGetString(ptr->xftfont->pattern, XFT_FILE, 0, &fn);
+		if(fn)
+			ptr->filename = fn;
+	}
+	return ptr->filename;
+}
+
+void Draw::DrawTextOp(int x, int y, int angle, const wchar *text, Font font,
+                      Color ink, int n, const int *dx) {
+	LTIMING("DrawText");
+	LLOG("DrawText " << ToUtf8(WString(text, n)) << " color:" << ink << " font:" << font);
+	//TODO - X11 seems to crash when displaying too long strings (?)
+	int ox = x + actual_offset.x;
+	int oy = y + actual_offset.y;
+	SetForeground(ink);
+	SetFont(font, angle);
+	const FontInfo::Data *fd = lastFont.ptr;
+	XftColor c;
+	c.color.red = ink.GetR() << 8;
+	c.color.green = ink.GetG() << 8;
+	c.color.blue = ink.GetB() << 8;
+	c.color.alpha = 0xffff;
+	c.pixel = GetXPixel(ink.GetR(), ink.GetG(), ink.GetB());
+	if(angle) {
+		int xpos = 0;
+		for(int i = 0; i < n; i++) {
+			wchar h = text[i];
+			XftDrawString16(xftdraw, &c, fd->xftfont,
+			                int(ox + xpos * fd->cosa + fd->offset.cx),
+			                int(oy - xpos * fd->sina + fd->offset.cy),
+			                (FcChar16 *)&h, 1);
+			xpos += dx ? dx[i] : lastFont[text[i]];
+		}
+		if(font.IsUnderline() || font.IsStrikeout()) {
+			x += fd->offset.cx;
+			y += fd->offset.cy;
+			if(font.IsUnderline())
+				DrawLine(
+					int(x + fd->underline_position * fd->sina),
+					int(y + fd->underline_position * fd->cosa),
+					int(x + xpos * fd->cosa + fd->underline_position * fd->sina),
+					int(y - xpos * fd->sina + fd->underline_position * fd->cosa),
+					fd->underline_thickness,
+					ink
+				);
+			if(font.IsStrikeout()) {
+				int p = 2 * fd->ascent / 3;
+				DrawLine(
+					int(x + p * fd->sina),
+					int(y + p * fd->cosa),
+					int(x + xpos * fd->cosa + p * fd->sina),
+					int(y - xpos * fd->sina + p * fd->cosa),
+					fd->underline_thickness,
+					ink
+				);
+			}
+		}
+	}
+	else {
+		if(dx) {
+			int xpos = ox;
+			Buffer<XftCharSpec> ch(n);
+			for(int i = 0; i < n; i++) {
+				ch[i].ucs4 = text[i];
+				ch[i].x = xpos;
+				ch[i].y = oy + fd->ascent;
+				xpos += dx[i];
+			}
+			XftDrawCharSpec(xftdraw, &c, fd->xftfont, ch, n);
+		}
+		else
+			XftDrawString16(xftdraw, &c, fd->xftfont, ox, oy + fd->ascent,
+			                (FcChar16 *)text, n);
+		LLOG("XftColor: r=" << c.color.red << ", g=" << c.color.green << ", b=" << c.color.blue
+			<< ", alpha=" << c.color.alpha << ", pixel=" << FormatIntHex(c.pixel));
+		if(font.IsUnderline() || font.IsStrikeout()) {
+			int cx;
+			if(dx && n > 0) {
+				cx = 0;
+				Sum(cx, dx, dx + n - 1);
+				cx += lastFont[text[n - 1]];
+			}
+			else
+				cx = GetTextSize(text, font, n).cx;
+			if(font.IsUnderline())
+				DrawRect(x, y + lastFont.GetAscent() + lastFont.ptr->underline_position,
+				         cx, lastFont.ptr->underline_thickness, ink);
+			if(font.IsStrikeout())
+				DrawRect(x, y + 2 * lastFont.GetAscent() / 3,
+				         cx, lastFont.ptr->underline_thickness, ink);
+		}
+	}
+}
+
+#endif
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/Draw/DrawUtil.cpp b/uppsrc/Draw/DrawUtil.cpp
new file mode 100644
index 000000000..fa70c38fd
--- /dev/null
+++ b/uppsrc/Draw/DrawUtil.cpp
@@ -0,0 +1,636 @@
+#include "Draw.h"
+
+NAMESPACE_UPP
+
+#define LTIMING(x) // TIMING(x)
+
+void AddNotEmpty(Vector<Rect>& result, int left, int right, int top, int bottom)
+{
+	if(left < right && top < bottom)
+		result.Add(Rect(left, top, right, bottom));
+}
+
+bool Subtract(const Rect& r, const Rect& sub, Vector<Rect>& result)
+{
+	LTIMING("SubtractRect0");
+	Rect is = r & sub;
+	if(!is.IsEmpty()) {
+		AddNotEmpty(result, r.left, is.left, r.top, is.top);
+		AddNotEmpty(result, is.left, is.right, r.top, is.top);
+		AddNotEmpty(result, is.right, r.right, r.top, is.top);
+		AddNotEmpty(result, r.left, is.left, is.top, is.bottom);
+		AddNotEmpty(result, is.right, r.right, is.top, is.bottom);
+		AddNotEmpty(result, r.left, is.left, is.bottom, r.bottom);
+		AddNotEmpty(result, is.left, is.right, is.bottom, r.bottom);
+		AddNotEmpty(result, is.right, r.right, is.bottom, r.bottom);
+		return true;
+	}
+	else {
+		result.Add(r);
+		return false;
+	}
+}
+
+bool Subtract(const Vector<Rect>& rr, const Rect& sub, Vector<Rect>& result)
+{
+	LTIMING("SubtractRect");
+	bool changed = false;
+	for(int i = 0; i < rr.GetCount(); i++) {
+		const Rect& r = rr[i];
+		if(Subtract(r, sub, result))
+			changed = true;
+	}
+	return changed;
+}
+
+Vector<Rect> Subtract(const Vector<Rect>& rr, const Rect& sub, bool& changed)
+{
+	Vector<Rect> result;
+	if(Subtract(rr, sub, result))
+		changed = true;
+	return result;
+}
+
+void Subtract(Vector<Rect>& rr, const Rect& sub)
+{
+	LTIMING("Subtract");
+	if(sub.IsEmpty())
+		return;
+	bool dummy;
+	rr = Subtract(rr, sub, dummy);
+}
+
+void Union(Vector<Rect>& rr, const Rect& add)
+{
+	LTIMING("Union");
+	if(add.IsEmpty())
+		return;
+	Vector<Rect> r;
+	r.Add(add);
+	for(int i = 0; i < rr.GetCount() && r.GetCount(); i++)
+		Subtract(r, rr[i]);
+	for(int i = 0; i < r.GetCount(); i++)
+		rr.Add(r[i]);
+}
+
+Vector<Rect> Intersect(const Vector<Rect>& b, const Rect& a, bool& changed)
+{
+	Vector<Rect> result;
+	for(int i = 0; i < b.GetCount(); i++) {
+		Rect r = b[i] & a;
+		if(r.IsEmpty())
+			changed = true;
+		else {
+			if(r != b[i]) changed = true;
+			result.Add(r);
+		}
+	}
+	return result;
+}
+
+void DrawFatFrame(Draw& w, int x, int y, int cx, int cy, Color color, int n) {
+	if(n < 0) {
+		x += n;
+		y += n;
+		n = -n;
+		cx += 2 * n;
+		cy += 2 * n;
+	}
+	w.DrawRect(x, y, cx, n, color);
+	w.DrawRect(x, y + n, n, cy - n, color);
+	w.DrawRect(x + cx - n, y + n, n, cy - n, color);
+	w.DrawRect(x + n, y + cy - n, cx - 2 * n, n, color);
+}
+
+void DrawFatFrame(Draw& w, const Rect& r, Color color, int n) {
+	DrawFatFrame(w, r.left, r.top, r.Width(), r.Height(), color, n);
+}
+
+void DrawFrame(Draw& w, int x, int y, int cx, int cy,
+			   Color leftcolor, Color topcolor, Color rightcolor, Color bottomcolor)
+{
+	w.DrawRect(x, y, cx - 1, 1, topcolor);
+	w.DrawRect(x, y, 1, cy - 1, leftcolor);
+	w.DrawRect(x + cx - 1, y, 1, cy, rightcolor);
+	w.DrawRect(x, y + cy - 1, cx, 1, bottomcolor);
+}
+
+void DrawFrame(Draw& w, const Rect& r,
+			   Color leftcolor, Color topcolor, Color rightcolor, Color bottomcolor)
+{
+	DrawFrame(w, r.left, r.top, r.Width(), r.Height(),
+		      leftcolor, topcolor, rightcolor, bottomcolor);
+}
+
+void DrawFrame(Draw& w, int x, int y, int cx, int cy,
+			   Color topleftcolor, Color bottomrightcolor)
+{
+	DrawFrame(w, x, y, cx, cy, topleftcolor, topleftcolor, bottomrightcolor, bottomrightcolor);
+}
+
+void DrawFrame(Draw& w, const Rect& r,
+			   Color topleftcolor, Color bottomrightcolor) {
+	DrawFrame(w, r, topleftcolor, topleftcolor, bottomrightcolor, bottomrightcolor);
+}
+
+void DrawFrame(Draw& w, int x, int y, int cx, int cy, Color color) {
+	DrawFrame(w, x, y, cx, cy, color, color);
+}
+
+void DrawFrame(Draw& w, const Rect& r, Color color) {
+	DrawFrame(w, r, color, color);
+}
+
+void DrawBorder(Draw& w, int x, int y, int cx, int cy, const ColorF *c) {
+	if(!c) return;
+	int n = (int)(uintptr_t)*c;
+	c++;
+	while(n--) {
+		if(cx <= 0 || cy <= 0)
+			break;
+		DrawFrame(w, x, y, cx, cy, c[0], c[1], c[2], c[3]);
+		x += 1;
+		y += 1;
+		cx -= 2;
+		cy -= 2;
+		c += 4;
+	}
+}
+
+void DrawBorder(Draw& w, const Rect& r, const ColorF *c) {
+	DrawBorder(w, r.left, r.top, r.Width(), r.Height(), c);
+}
+
+const ColorF *BlackBorder()
+{
+	static ColorF data[] = {
+		(ColorF)1,
+		&SColorText, &SColorText, &SColorText, &SColorText,
+	};
+	return data;
+}
+
+const ColorF *DefButtonBorder()
+{
+	static ColorF data[] = {
+		(ColorF)3,
+		&SColorText, &SColorText, &SColorText, &SColorText,
+		&SColorLight, &SColorLight, &SColorText, &SColorText,
+		&SColorLtFace, &SColorLtFace, &SColorShadow, &SColorShadow,
+	};
+	return data;
+}
+
+const ColorF *ButtonBorder()
+{
+	static ColorF data[] = {
+		(ColorF)2,
+		&SColorLight, &SColorLight, &SColorText, &SColorText,
+		&SColorLtFace, &SColorLtFace, &SColorShadow, &SColorShadow,
+	};
+	return data;
+}
+
+const ColorF *EdgeButtonBorder()
+{
+	static ColorF data[] = {
+		(ColorF)2,
+		&SColorLtFace, &SColorLtFace, &SColorText, &SColorText,
+		&SColorLight, &SColorLight, &SColorShadow, &SColorShadow,
+	};
+	return data;
+}
+
+const ColorF *ButtonPushBorder()
+{
+	static ColorF data[] = {
+		(ColorF)2,
+		&SColorText, &SColorText, &SColorText, &SColorText,
+		&SColorShadow, &SColorShadow, &SColorText, &SColorText
+	};
+	return data;
+}
+
+const ColorF *InsetBorder()
+{
+	static ColorF data[] = {
+		(ColorF)2,
+		&SColorShadow, &SColorShadow, &SColorLight, &SColorLight,
+		&SColorText, &SColorText, &SColorFace, &SColorFace
+	};
+	return data;
+}
+
+const ColorF *OutsetBorder()
+{
+	static ColorF data[] = {
+		(ColorF)2,
+		&SColorFace, &SColorFace, &SColorText, &SColorText,
+		&SColorLight, &SColorLight, &SColorShadow, &SColorShadow,
+	};
+	return data;
+}
+
+const ColorF *ThinOutsetBorder()
+{
+	static ColorF data[] = {
+		(ColorF)1,
+		&SColorLight, &SColorLight, &SColorShadow, &SColorShadow,
+	};
+	return data;
+}
+
+const ColorF *ThinInsetBorder()
+{
+	static ColorF data[] = {
+		(ColorF)1,
+		&SColorShadow, &SColorShadow, &SColorLight, &SColorLight,
+	};
+	return data;
+}
+
+void DrawBorder(Draw& w, int x, int y, int cx, int cy, const ColorF *(*colors_ltrd)())
+{
+	DrawBorder(w, x, y, cx, cy, (*colors_ltrd)());
+}
+
+void DrawBorder(Draw& w, const Rect& r, const ColorF *(*colors_ltrd)())
+{
+	DrawBorder(w, r, (*colors_ltrd)());
+}
+
+void DrawRectMinusRect(Draw& w, const Rect& rect, const Rect& inner, Color color) {
+	Rect r = rect;
+	r.bottom = inner.top;
+	w.DrawRect(r, color);
+	r = inner;
+	r.right = r.left;
+	r.left = rect.left;
+	w.DrawRect(r, color);
+	r.left = inner.right;
+	r.right = rect.right;
+	w.DrawRect(r, color);
+	r = rect;
+	r.top = inner.bottom;
+	w.DrawRect(r, color);
+}
+
+void DrawRect(Draw& w, int x, int y, int cx, int cy, const Image& img, bool ra) {
+	w.Clip(x, y, cx, cy);
+	Size sz = img.GetSize();
+	for(int a = ra ? x : x / sz.cx * sz.cx; a < x + cx; a += sz.cx)
+		for(int b = ra ? y : y / sz.cy * sz.cy ; b < y + cy; b += sz.cy)
+			w.DrawImage(a, b, img);
+	w.End();
+}
+
+void DrawRect(Draw& w, const Rect& rect, const Image& img, bool ralgn)
+{
+	DrawRect(w, rect.left, rect.top, rect.Width(), rect.Height(), img, ralgn);
+}
+
+void DrawTiles(Draw& w, int x, int y, int cx, int cy, const Image& img) {
+	w.Clip(x, y, cx, cy);
+	Size sz = img.GetSize();
+	for(int a = x; a < x + cx; a += sz.cx)
+		for(int b = y; b < y + cy; b += sz.cy)
+			w.DrawImage(a, b, img);
+	w.End();
+}
+
+void DrawTiles(Draw& w, const Rect& rect, const Image& img)
+{
+	DrawTiles(w, rect.left, rect.top, rect.GetWidth(), rect.GetHeight(), img);
+}
+
+void DrawHighlightImage(Draw& w, int x, int y, const Image& img, bool highlight,
+                        bool enabled, Color maskcolor)
+{
+	if(highlight) {
+		w.DrawImage(x + 1, y, img, maskcolor);
+		w.DrawImage(x - 1, y, img, maskcolor);
+		w.DrawImage(x, y + 1, img, maskcolor);
+		w.DrawImage(x, y - 1, img, maskcolor);
+	}
+	w.DrawImage(x, y, enabled ? img : MakeImage(img, Etched));
+}
+
+Color GradientColor(Color fc, Color tc, int i, int n)
+{
+	return Color(
+			fc.GetR() + i * (tc.GetR() - fc.GetR()) / n,
+			fc.GetG() + i * (tc.GetG() - fc.GetG()) / n,
+			fc.GetB() + i * (tc.GetB() - fc.GetB()) / n
+	);
+}
+
+void PaintButtonRect(Draw& w, Rect& r,
+                     Color left, Color top, Color right, Color bottom,
+                     Color& topleft, Color& topright, Color& bottomleft, Color& bottomright)
+{
+	w.DrawRect(r.left, r.top, 1, 1, topleft);
+	w.DrawRect(r.right - 1, r.top, 1, 1, topright);
+	w.DrawRect(r.left, r.bottom - 1, 1, 1, bottomleft);
+	w.DrawRect(r.right - 1, r.bottom - 1, 1, 1, bottomright);
+
+	Color b1, b2;
+	w.DrawRect(r.left + 1, r.top, 1, 1, b1 = Blend(topleft, top, 160));
+	w.DrawRect(r.left, r.top + 1, 1, 1, b2 = Blend(topleft, left, 160));
+	w.DrawRect(r.left + 2, r.top, 1, 1, Blend(b1, top));
+	w.DrawRect(r.left, r.top + 2, 1, 1, Blend(b2, left));
+	topleft = Blend(b1, b2);
+
+	w.DrawRect(r.right - 2, r.top, 1, 1, b1 = Blend(topright, top, 160));
+	w.DrawRect(r.right - 1, r.top + 1, 1, 1, b2 = Blend(topright, right, 160));
+	w.DrawRect(r.right - 3, r.top, 1, 1, Blend(b1, top));
+	w.DrawRect(r.right - 1, r.top + 2, 1, 1, Blend(b2, right));
+	topright = Blend(b1, b2);
+
+	w.DrawRect(r.left + 1, r.bottom - 1, 1, 1, b1 = Blend(bottomleft, bottom, 160));
+	w.DrawRect(r.left, r.bottom - 2, 1, 1, b2 = Blend(bottomleft, left, 160));
+	w.DrawRect(r.left + 2, r.bottom - 1, 1, 1, Blend(b1, bottom));
+	w.DrawRect(r.left, r.bottom - 3, 1, 1, Blend(b2, left));
+	bottomleft = Blend(b1, b2);
+
+	w.DrawRect(r.right - 2, r.bottom - 1, 1, 1, b1 = Blend(bottomright, bottom, 160));
+	w.DrawRect(r.right - 1, r.bottom - 2, 1, 1, b2 = Blend(bottomright, right, 160));
+	w.DrawRect(r.right - 3, r.bottom - 1, 1, 1, Blend(b1, bottom));
+	w.DrawRect(r.right - 1, r.bottom - 3, 1, 1, Blend(b2, right));
+	bottomright = Blend(b1, b2);
+
+	w.DrawRect(r.left + 3, r.top, r.Width() - 6, 1, top);
+	w.DrawRect(r.left, r.top + 3, 1, r.Height() - 6, left);
+	w.DrawRect(r.right - 1, r.top + 3, 1, r.Height() - 6, right);
+	w.DrawRect(r.left + 3, r.bottom - 1, r.Width() - 6, 1, bottom);
+
+	r.Deflate(1, 1);
+}
+
+void DrawXPButton(Draw& w, Rect r, int type)
+{
+	Color outlight = SColorLight;
+	Color outshade = Blend(SColorShadow, SColorFace);
+	Color light = SColorLight;
+	Color shade = SColorShadow;
+	Color frame = Blend(SColorHighlight, SColorText);
+	Color mark = Null;
+	Color topleft = SColorFace;
+	int   markblend = 0;
+
+	if(type & BUTTON_EDGE)
+		frame = Blend(SColorHighlight, SColorLight);
+
+	if(type & BUTTON_TOOL) {
+		frame = SColorDisabled;
+		light = Blend(SColorFace, light);
+	}
+
+	if(type & BUTTON_SCROLL) {
+		outlight = SColorFace;
+		shade = outshade = SColorFace;
+		frame = Blend(SColorHighlight, SColorShadow);
+	}
+
+	switch(type & 15) {
+	case BUTTON_OK:
+		mark = Blend(Blue, SColorLight);
+		markblend = 130;
+		break;
+	case BUTTON_HIGHLIGHT:
+		if(!(type & BUTTON_SCROLL)) {
+			mark = Blend(Yellow, LtRed, 100);
+			markblend = 130;
+		}
+		break;
+	case BUTTON_PUSH:
+		light = shade = Blend(SColorHighlight, SColorFace, 235);
+		break;
+	case BUTTON_DISABLED:
+		frame = SColorDisabled;
+		outlight = outshade = light = shade = SColorFace;
+		break;
+	case BUTTON_CHECKED:
+		if(type & BUTTON_TOOL)
+			light = shade = SColorLight;
+		else
+			light = shade = Blend(SColorHighlight, SColorFace);
+		break;
+	}
+
+	Color topright = topleft;
+	Color bottomleft = topleft;
+	Color bottomright = topleft;
+
+	if(type & BUTTON_EDGE) {
+		DrawFrame(w, r, frame);
+		light = Blend(frame, SColorLight);
+		shade = Blend(frame, SColorShadow);
+		w.DrawRect(r.left, r.top, 1, 1, light);
+		w.DrawRect(r.right - 1, r.top, 1, 1, light);
+		w.DrawRect(r.left, r.bottom - 1, 1, 1, light);
+		w.DrawRect(r.right - 1, r.bottom - 1, 1, 1, light);
+		r.Deflate(1, 1);
+		switch(type & 15) {
+		case BUTTON_HIGHLIGHT:
+			light = Blend(light, SColorLight);
+			shade = Blend(shade, SColorLight);
+			break;
+		case BUTTON_PUSH:
+			light = shade = Blend(SColorHighlight, SColorFace);
+			break;
+		}
+	}
+	else {
+		if(!(type & BUTTON_TOOL))
+			PaintButtonRect(w, r, outshade, outshade, outlight, outlight, topleft, topright, bottomleft, bottomright);
+		PaintButtonRect(w, r, frame, frame, frame, frame, topleft, topright, bottomleft, bottomright);
+		Color hc = Blend(light, mark, markblend);
+		Color sc = Blend(shade, mark, markblend);
+		PaintButtonRect(w, r, hc, hc, sc, sc, topleft, topright, bottomleft, bottomright);
+		if(markblend) {
+			DrawFrame(w, r, Blend(hc, mark, markblend), Blend(sc, mark, markblend));
+			r.Deflate(1, 1);
+		}
+	}
+
+	if(type & BUTTON_SCROLL)
+		switch(type & 15) {
+		case BUTTON_PUSH:
+			light = shade = Blend(SColorFace, SColorHighlight);
+			break;
+		case BUTTON_HIGHLIGHT:
+			light = shade = Blend(SColorLight, SColorHighlight, 40);
+			break;
+		default:
+			light = Blend(SColorLight, SColorHighlight, 80);
+			shade = Blend(SColorFace, SColorHighlight, 80);
+		}
+
+	Color b1 = Blend(light, shade, 80);
+	Color bs = Blend(shade, SColorFace);
+	if(type & BUTTON_VERTICAL) {
+		int wd = r.Width();
+		int w1 = 4 * wd / 5;
+		for(int i = 0; i < wd; i++)
+			w.DrawRect(r.left + i, r.top, 1, r.Height(), i < w1 ? Blend(light, b1, 255 * i / w1)
+			                                                    : Blend(b1, bs, 255 * (i - w1) / (wd - w1)));
+	}
+	else {
+		int h = r.Height();
+		int h1 = 4 * h / 5;
+		for(int i = 0; i < h; i++)
+			w.DrawRect(r.left, r.top + i, r.Width(), 1, i < h1 ? Blend(light, b1, 255 * i / h1)
+			                                                   : Blend(b1, bs, 255 * (i - h1) / (h - h1)));
+	}
+}
+
+#ifdef PLATFORM_WIN32
+
+HRGN GetFrameRgn(const Rect& rect, int n) {
+	HRGN rgn = CreateRectRgnIndirect(rect);
+	Rect r = rect;
+	r.Deflate(n);
+	if(r.Width() > 0 && r.Height() > 0) {
+		HRGN rgnin = CreateRectRgnIndirect(r);
+		CombineRgn(rgn, rgn, rgnin, RGN_XOR);
+		DeleteObject(rgnin);
+	}
+	return rgn;
+}
+
+void DrawDragRect(Draw& w, const Rect& _rect1, const Rect& _rect2, const Rect& _clip, int n, Color color, uint64 pattern)
+{
+	Point o = w.GetOffset();
+	Rect rect1 = _rect1 + o;
+	Rect rect2 = _rect2 + o;
+	Rect clip = _clip + o;
+	HDC hdc = w.BeginGdi();
+	word wpat[8] = {
+		(byte)(pattern >> 56), (byte)(pattern >> 48), (byte)(pattern >> 40), (byte)(pattern >> 32),
+		(byte)(pattern >> 24), (byte)(pattern >> 16), (byte)(pattern >> 8), (byte)(pattern >> 0),
+	};
+	HBITMAP bitmap = CreateBitmap(8, 8, 1, 1, wpat);
+	HBRUSH brush = ::CreatePatternBrush(bitmap);
+	DeleteObject(bitmap);
+	SetTextColor(hdc, color);
+	SetBkColor(hdc, SColorText());
+	Point offset;
+#ifdef PLATFORM_WINCE
+	offset = Point(0, 0);
+#else
+	::GetViewportOrgEx(hdc, offset);
+#endif
+	HRGN rgn = GetFrameRgn(rect1 + offset, n);
+	HRGN rgn2 = GetFrameRgn(rect2 + offset, n);
+	HRGN cliprgn = CreateRectRgnIndirect(clip + offset);
+	CombineRgn(rgn, rgn, rgn2, RGN_XOR);
+	CombineRgn(rgn, rgn, cliprgn, RGN_AND);
+	SelectClipRgn(hdc, rgn);
+	Rect r;
+	GetClipBox(hdc, r);
+	HBRUSH obrush = (HBRUSH) SelectObject(hdc, brush);
+	PatBlt(hdc, r.left, r.top, r.Width(), r.Height(), PATINVERT);
+	SelectObject(hdc, obrush);
+	SelectClipRgn(hdc, NULL);
+	DeleteObject(rgn);
+	DeleteObject(rgn2);
+	DeleteObject(cliprgn);
+	ReleaseDC(NULL, hdc);
+	DeleteObject(brush);
+	w.EndGdi();
+}
+
+#endif
+
+#ifdef PLATFORM_X11
+
+Vector<Rect> RectRgn(const Rect& r)
+{
+	Vector<Rect> q;
+	q.Add(r);
+	return q;
+}
+
+Vector<Rect> Intersect(const Vector<Rect>& r1, const Vector<Rect>& r2)
+{
+	Vector<Rect> q;
+	for(int i = 0; i < r1.GetCount(); i++)
+		for(int j = 0; j < r2.GetCount(); j++) {
+			Rect r = r1[i] & r2[j];
+			if(!r.IsEmpty())
+				q.Add(r);
+		}
+	return q;
+}
+
+Vector<Rect> Subtract(const Vector<Rect>& r1, const Vector<Rect>& r2)
+{
+	Vector<Rect> q;
+	bool dummy;
+	q <<= r1;
+	for(int i = 0; i < r2.GetCount(); i++)
+		q = Subtract(q, r2[i], dummy);
+	return q;
+}
+
+
+Vector<Rect> Xor(const Vector<Rect>& r1, const Vector<Rect>& r2)
+{
+	Vector<Rect> is = Intersect(r1, r2);
+	Vector<Rect> q = Subtract(r1, is);
+	q.Append(Subtract(r2, is));
+	return q;
+}
+
+Vector<Rect> GetFrameRgn(const Rect& rect, int n) {
+	Vector<Rect> q = RectRgn(rect);
+	q.Add(rect);
+	Rect r = rect;
+	r.Deflate(n);
+	if(r.Width() > 0 && r.Height() > 0)
+		q = Xor(q, RectRgn(r));
+	return q;
+}
+
+void DrawDragRect(Draw& w, const Rect& rect1, const Rect& rect2, const Rect& clip, int n,
+                  Color color, uint64 pattern)
+{
+	char bd[8];
+	for(int i = 0; i < 8; i++)
+		bd[i] = ~(byte)(pattern >> (8 * (7 - i)));
+	Pixmap stipple = XCreateBitmapFromData(Xdisplay, w.GetDrawable(), bd, 8, 8);
+	Point offset = w.GetOffset();
+	GC gc = XCreateGC(Xdisplay, w.GetDrawable(), 0, 0);
+#ifdef PLATFORM_XFT
+	SetClip(gc, w.GetXftDraw(),
+	        Intersect(Xor(GetFrameRgn(rect1 + offset, n), GetFrameRgn(rect2 + offset, n)),
+	                  RectRgn(clip + offset)));
+#else
+	SetClip(gc, Intersect(Xor(GetFrameRgn(rect1 + offset, n), GetFrameRgn(rect2 + offset, n)),
+	                      RectRgn(clip + offset)));
+#endif
+	XGCValues gcv;
+	gcv.function = X11_ROP2_XOR;
+	gcv.foreground = GetXPixel(color);
+	gcv.fill_style = FillStippled;
+	gcv.stipple = stipple;
+	XChangeGC(Xdisplay, gc, GCForeground|GCFunction|GCStipple|GCFillStyle, &gcv);
+	XFillRectangle(Xdisplay, w.GetDrawable(), gc, 0, 0, Xwidth, Xheight);
+	XFreePixmap(Xdisplay, stipple);
+}
+
+#endif
+
+static DrawingToPdfFnType sPdf;
+
+void SetDrawingToPdfFn(DrawingToPdfFnType Pdf)
+{
+	sPdf = Pdf;
+}
+
+DrawingToPdfFnType GetDrawingToPdfFn()
+{
+	return sPdf;
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/Draw/DrawWin32.cpp b/uppsrc/Draw/DrawWin32.cpp
new file mode 100644
index 000000000..2a1c48cb4
--- /dev/null
+++ b/uppsrc/Draw/DrawWin32.cpp
@@ -0,0 +1,451 @@
+#include "Draw.h"
+
+NAMESPACE_UPP
+
+#define LLOG(x) // LOG(x)
+#define LTIMING(x) // RTIMING(x)
+
+#ifdef PLATFORM_WIN32
+
+static COLORREF sLightGray;
+
+void StaticExitDraw_()
+{
+	Draw::FreeFonts();
+}
+
+EXITBLOCK
+{
+	StaticExitDraw_();
+}
+
+#ifndef PLATFORM_WINCE
+void Add(LOGPALETTE *pal, int r, int g, int b)
+{
+	pal->palPalEntry[pal->palNumEntries].peRed   = min(r, 255);
+	pal->palPalEntry[pal->palNumEntries].peGreen = min(g, 255);
+	pal->palPalEntry[pal->palNumEntries].peBlue  = min(b, 255);
+	pal->palPalEntry[pal->palNumEntries++].peFlags = PC_NOCOLLAPSE;
+}
+
+HPALETTE GetQlibPalette()
+{
+	static HPALETTE hQlibPalette;
+	if(hQlibPalette) return hQlibPalette;
+	Draw::InitColors();
+	LOGPALETTE *pal = (LOGPALETTE *) new byte[sizeof(LOGPALETTE) + 256 * sizeof(PALETTEENTRY)];
+	pal->palNumEntries = 0;
+	pal->palVersion    = 0x300;
+	for(int r = 0; r < 6; r++)
+		for(int g = 0; g < 6; g++)
+			for(int b = 0; b < 6; b++)
+				Add(pal, 255 * r / 5, 255 * g / 5, 255 * b / 5);
+	for(int q = 0; q <= 16; q++)
+		Add(pal, 16 * q, 16 * q, 16 * q);
+	Add(pal, GetRValue(sLightGray), GetGValue(sLightGray), GetBValue(sLightGray));
+	hQlibPalette = CreatePalette(pal);
+	delete[] pal;
+	return hQlibPalette;
+}
+#endif
+
+Draw& GLOBAL_VP(ScreenDraw, ScreenInfo, (true))
+
+HDC ScreenHDC()
+{
+	return ScreenInfo();
+}
+
+static bool _AutoPalette = true;
+bool Draw::AutoPalette() { return _AutoPalette; }
+void Draw::SetAutoPalette(bool ap) { _AutoPalette = ap; }
+
+COLORREF Draw::GetColor(Color c) const {
+	COLORREF color = c;
+#ifdef PLATFORM_WINCE
+	return color;
+#else
+	if(!palette)
+		return color;
+	static Index<dword> *SColor;
+	ONCELOCK {
+		static Index<dword> StaticColor;
+		StaticColor << RGB(0x00, 0x00, 0x00) << RGB(0x80, 0x00, 0x00) << RGB(0x00, 0x80, 0x00)
+					<< RGB(0x80, 0x80, 0x00) << RGB(0x00, 0x00, 0x80) << RGB(0x80, 0x00, 0x80)
+					<< RGB(0x00, 0x80, 0x80) << RGB(0xC0, 0xC0, 0xC0) << RGB(0xC0, 0xDC, 0xC0)
+					<< RGB(0xA6, 0xCA, 0xF0) << RGB(0xFF, 0xFB, 0xF0) << RGB(0xA0, 0xA0, 0xA4)
+					<< RGB(0x80, 0x80, 0x80) << RGB(0xFF, 0x00, 0x00) << RGB(0x00, 0xFF, 0x00)
+					<< RGB(0xFF, 0xFF, 0x00) << RGB(0x00, 0x00, 0xFF) << RGB(0xFF, 0x00, 0xFF)
+					<< RGB(0x00, 0xFF, 0xFF) << RGB(0xFF, 0xFF, 0xFF);
+		SColor = &StaticColor;
+	}
+	if(color16 || !AutoPalette())
+		return GetNearestColor(handle, color);
+	if(SColor->Find(color) >= 0)
+		return color;
+	if(color == sLightGray)
+		return PALETTEINDEX(216 + 17);
+	int r = GetRValue(color);
+	int g = GetGValue(color);
+	int b = GetBValue(color);
+	return PALETTEINDEX(r == g && g == b ? (r + 8) / 16 + 216
+		                                 : (r + 25) / 51 * 36 +
+		                                   (g + 25) / 51 * 6 +
+		                                   (b + 25) / 51);
+#endif
+}
+
+void Draw::InitColors()
+{
+}
+
+void Draw::SetColor(Color color)
+{
+	DrawLock __;
+	LLOG("SetColor " << color);
+	if(color != lastColor) {
+		LLOG("Setting, lastColor:" << FormatIntHex(lastColor.GetRaw())
+			<< " color:" << FormatIntHex(color.GetRaw()) <<
+		     " GetColor:" << FormatIntHex(GetColor(color)) << " palette:" << palette);
+		HBRUSH oldBrush = actBrush;
+		HBRUSH h;
+		if(!IsNull(color))
+			h = (HBRUSH) SelectObject(handle, actBrush = CreateSolidBrush(GetColor(color)));
+		else {
+			HGDIOBJ empty = GetStockObject(HOLLOW_BRUSH);
+			h = (HBRUSH) SelectObject(handle, empty);
+			actBrush = NULL;
+		}
+		ASSERT(h);
+		if(!orgBrush) orgBrush = h;
+		if(oldBrush) DeleteObject(oldBrush);
+		lastColor = color;
+	}
+}
+
+void Draw::SetDrawPen(int width, Color color) {
+	DrawLock __;
+	if(IsNull(width))
+		width = PEN_NULL;
+	if(width != lastPen || color != lastPenColor) {
+		static int penstyle[] = {
+			PS_NULL, PS_SOLID, PS_DASH,
+		#ifndef PLATFORM_WINCE
+			PS_DOT, PS_DASHDOT, PS_DASHDOTDOT
+		#endif
+		};
+		HPEN oldPen = actPen;
+		actPen = CreatePen(width < 0 ? penstyle[-width - 1] : PS_SOLID,
+			               width < 0 ? 0 : width, GetColor(color));
+		HPEN h = (HPEN) SelectObject(handle, actPen);
+		if(!orgPen) orgPen = h;
+		if(oldPen) DeleteObject(oldPen);
+		lastPen = width;
+		lastPenColor = color;
+	}
+}
+
+
+void Draw::SetOrg() {
+	DrawLock __;
+#ifdef PLATFORM_WINCE
+	::SetViewportOrgEx(handle, actual_offset.x, actual_offset.y, 0);
+#else
+	LLOG("Draw::SetOrg: clip = " << GetClip() << ", offset = " << actual_offset);
+	::SetWindowOrgEx(handle, -actual_offset.x, -actual_offset.y, 0);
+	LLOG("//Draw::SetOrg: clip = " << GetClip());
+#endif
+}
+
+#ifndef PLATFORM_WINCE
+Point Draw::LPtoDP(Point p) const {
+	DrawLock __;
+	::LPtoDP(handle, p, 1);
+	return p;
+}
+
+Point Draw::DPtoLP(Point p) const {
+	DrawLock __;
+	::DPtoLP(handle, p, 1);
+	return p;
+}
+
+Rect  Draw::LPtoDP(const Rect& r) const {
+	DrawLock __;
+	Rect w = r;
+	::LPtoDP(handle, reinterpret_cast<POINT *>(&w), 2);
+	return w;
+}
+
+Rect  Draw::DPtoLP(const Rect& r) const {
+	DrawLock __;
+	Rect w = r;
+	::LPtoDP(handle, reinterpret_cast<POINT *>(&w), 2);
+	return w;
+}
+#endif
+
+Size Draw::GetSizeCaps(int i, int j) const {
+	DrawLock __;
+	return Size(GetDeviceCaps(handle, i), GetDeviceCaps(handle, j));
+}
+
+void Draw::LoadCaps() {
+	DrawLock __;
+	color16 = false;
+	palette = (GetDeviceCaps(handle, RASTERCAPS) & RC_PALETTE);
+	if(palette)
+		color16 = GetDeviceCaps(handle, SIZEPALETTE) != 256;
+	pagePixels = GetSizeCaps(HORZRES, VERTRES);
+	pageMMs = GetSizeCaps(HORZSIZE, VERTSIZE);
+	inchPixels = GetSizeCaps(LOGPIXELSX, LOGPIXELSY);
+	sheetPixels = GetSizeCaps(PHYSICALWIDTH, PHYSICALHEIGHT);
+	pageOffset = GetSizeCaps(PHYSICALOFFSETX, PHYSICALOFFSETY);
+	is_mono = GetDeviceCaps(handle, BITSPIXEL) == 1 && GetDeviceCaps(handle, PLANES) == 1;
+/*
+	if(!is_mono)
+	{
+		HBITMAP hbmp = (HBITMAP)GetCurrentObject(handle, OBJ_BITMAP);
+		if(hbmp)
+		{
+			BITMAP bmp;
+			GetObject(hbmp, sizeof(bmp), &bmp);
+			is_mono = bmp.bmPlanes == 1 && bmp.bmBitsPixel == 1;
+		}
+	}
+*/
+}
+
+void Draw::SetDevice(const char *s) {
+	DrawLock __;
+	static Index<String> map;
+	device = map.FindAdd(s) + 1;
+	LoadCaps();
+}
+
+void Draw::Cinit() {
+	DrawLock __;
+	lastColor = Color::FromCR(COLORREF(-5));
+	lastPenColor = Color::FromCR(COLORREF(-5));
+	lastTextColor = COLORREF(-1);
+	lastPen = Null;
+	actBrush = orgBrush = NULL;
+	actPen = orgPen = NULL;
+	orgFont = NULL;
+	lastFont.Clear();
+}
+
+void Draw::Init() {
+	DrawLock __;
+	Cinit();
+	SetBkMode(handle, TRANSPARENT);
+	::SetTextAlign(handle, TA_BASELINE);
+#ifdef PLATFORM_WINCE
+	actual_offset = Point(0, 0);
+#else
+	::GetViewportOrgEx(handle, actual_offset);
+#endif
+	LoadCaps();
+}
+
+void Draw::Reset() {
+	DrawLock __;
+	device = 0;
+	pixels = true;
+	printer = aborted = backdraw = is_mono = false;
+}
+
+Draw::Draw() {
+	DrawLock __;
+	InitColors();
+	InitFonts();
+	actual_offset = Point(0, 0);
+	Reset();
+	handle = NULL;
+}
+
+Draw::Draw(HDC hdc) {
+	DrawLock __;
+	InitColors();
+	InitFonts();
+	Reset();
+	Attach(hdc);
+}
+
+void Draw::Unselect0() {
+	DrawLock __;
+	if(orgPen) SelectObject(handle, orgPen);
+	if(orgBrush) SelectObject(handle, orgBrush);
+	if(orgFont) SelectObject(handle, orgFont);
+	if(actPen) DeleteObject(actPen);
+	if(actBrush) DeleteObject(actBrush);
+	Cinit();
+}
+
+void Draw::Unselect() {
+	DrawLock __;
+	while(cloff.GetCount())
+		End();
+	Unselect0();
+}
+
+Draw::~Draw() {
+	DrawLock __;
+	if(handle)
+		Unselect();
+}
+
+HDC Draw::BeginGdi() {
+	DrawLock __;
+	Begin();
+	return handle;
+}
+
+void Draw::EndGdi() {
+	DrawLock __;
+	Unselect0();
+	End();
+}
+
+NilDraw::NilDraw() {
+	DrawLock __;
+	Attach(ScreenInfo().GetHandle());
+	pixels = false;
+	cloff.Clear();
+}
+
+NilDraw::~NilDraw() {
+	DrawLock __;
+	Detach();
+}
+
+void BackDraw::Create(Draw& w, int cx, int cy) {
+	ASSERT(w.GetHandle());
+	DrawLock __;
+	Destroy();
+	size.cx = cx;
+	size.cy = cy;
+	hbmp = ::CreateCompatibleBitmap(w.GetHandle(), cx, cy);
+	handle = ::CreateCompatibleDC(w.GetHandle());
+	ASSERT(hbmp);
+	ASSERT(handle);
+#ifndef PLATFORM_WINCE
+	if(w.PaletteMode() && AutoPalette()) {
+		::SelectPalette(handle, GetQlibPalette(), FALSE);
+		::RealizePalette(handle);
+	}
+#endif
+	hbmpold = (HBITMAP) ::SelectObject(handle, hbmp);
+	Init();
+	backdraw = true;
+}
+
+void BackDraw::Put(Draw& w, int x, int y) {
+	DrawLock __;
+	ASSERT(handle);
+	LTIMING("BackDraw::Put");
+#ifdef PLATFORM_WINCE
+	::SetViewportOrgEx(handle, 0, 0, 0);
+#else
+	::SetWindowOrgEx(handle, 0, 0, NULL);
+#endif
+	::BitBlt(w, x, y, size.cx, size.cy, *this, 0, 0, SRCCOPY);
+}
+
+void BackDraw::Destroy() {
+	DrawLock __;
+	if(handle) {
+		Unselect();
+		::SelectObject(handle, hbmpold);
+		::DeleteDC(handle);
+		::DeleteObject(hbmp);
+		handle = NULL;
+	}
+}
+
+ScreenDraw::ScreenDraw(bool ic) {
+	DrawLock __;
+#ifdef PLATFORM_WINCE
+	Attach(CreateDC(NULL, NULL, NULL, NULL));
+#else
+	Attach((ic ? CreateIC : CreateDC)("DISPLAY", NULL, NULL, NULL));
+	if(PaletteMode() && AutoPalette()) {
+		SelectPalette(handle, GetQlibPalette(), TRUE);
+		RealizePalette(handle);
+	}
+#endif
+}
+
+ScreenDraw::~ScreenDraw() {
+	DrawLock __;
+	Unselect();
+	DeleteDC(handle);
+}
+
+#ifndef PLATFORM_WINCE
+
+void PrintDraw::InitPrinter()
+{
+	DrawLock __;
+	Init();
+	printer = true;
+	pixels = false;
+	::SetMapMode(handle, MM_ANISOTROPIC);
+	::SetViewportExtEx(handle, inchPixels.cx, inchPixels.cy, NULL);
+	::SetViewportOrgEx(handle, 0, 0, NULL);
+	::SetWindowExtEx(handle, 600, 600, NULL);
+	::SetWindowOrgEx(handle, 0, 0, NULL);
+	actual_offset = Point(0, 0);
+}
+
+void PrintDraw::StartPage()
+{
+	DrawLock __;
+	if(IsAborted()) return;
+	Unselect();
+	if(::StartPage(handle) <= 0)
+		Abort();
+	else
+		InitPrinter();
+}
+
+void PrintDraw::EndPage()
+{
+	DrawLock __;
+	if(IsAborted()) return;
+	Unselect();
+	ASSERT(printer);
+	if(::EndPage(handle) <= 0)
+		Abort();
+}
+
+PrintDraw::PrintDraw(HDC hdc, const char *docname)
+   : Draw(hdc)
+{
+	DrawLock __;
+	DOCINFO di;
+	memset(&di, 0, sizeof(di));
+	di.cbSize = sizeof(di);
+	String sys_docname = ToSystemCharset(docname);
+	di.lpszDocName = ~sys_docname;
+	if(::StartDoc(hdc, &di) <= 0) {
+		Abort();
+		return;
+	}
+	InitPrinter();
+}
+
+PrintDraw::~PrintDraw() {
+	DrawLock __;
+	if(IsAborted())
+		::AbortDoc(handle);
+	else
+		::EndDoc(handle);
+	DeleteDC(handle);
+	handle = NULL;
+}
+#endif
+
+#endif
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/Draw/DrawWin32.h b/uppsrc/Draw/DrawWin32.h
new file mode 100644
index 000000000..681082ec8
--- /dev/null
+++ b/uppsrc/Draw/DrawWin32.h
@@ -0,0 +1,105 @@
+#ifndef PLATFORM_WINCE
+class WinMetaFile {
+	Size size;
+	mutable HENHMETAFILE hemf;
+
+	void     ChkP() const                   { ASSERT(!IsPicked()); }
+	void     Init();
+	void     Pick(pick_ WinMetaFile& src);
+	void     Copy(const WinMetaFile& src);
+
+public:
+	void          Attach(HENHMETAFILE emf);
+	HENHMETAFILE *Detach();
+
+	bool     IsPicked() const               { return (uintptr_t) hemf == 0xffffffff; }
+
+	operator bool() const                   { ChkP(); return hemf; }
+	Size     GetSize() const                { ChkP(); return hemf ? size : Size(0, 0); }
+
+	void     Clear();
+
+	void     Paint(Draw& w, const Rect& r) const;
+	void     Paint(Draw& w, int x, int y, int cx, int cy) const;
+
+	void     Serialize(Stream& s);
+
+	void     ReadClipboard();
+	void     WriteClipboard() const;
+	bool     Load(const char *file);
+
+	WinMetaFile()                                 { Init(); }
+	WinMetaFile(HENHMETAFILE hemf);
+	WinMetaFile(HENHMETAFILE hemf, Size sz);
+	WinMetaFile(const char *file);
+
+	WinMetaFile(pick_ WinMetaFile& src)           { Pick(src); }
+	WinMetaFile(const WinMetaFile& src, int)      { Copy(src); }
+	void     operator=(pick_ WinMetaFile& src)    { Clear(); Pick(src); }
+	void     operator<<=(const WinMetaFile& src)  { Clear(); Copy(src); }
+
+	~WinMetaFile()                                { Clear(); }
+
+	HENHMETAFILE GetHEMF() const                  { ChkP(); return hemf; }
+};
+
+class WinMetaFileDraw : public Draw {
+	Size size;
+
+public:
+	bool        Create(HDC hdc, int cx, int cy, const char *app = NULL, const char *name = NULL, const char *file = NULL);
+	bool        Create(int cx, int cy, const char *app = NULL, const char *name = NULL, const char *file = NULL);
+	WinMetaFile Close();
+
+	WinMetaFileDraw() {}
+	WinMetaFileDraw(HDC hdc, int cx, int cy, const char *app = NULL, const char *name = NULL, const char *file = NULL);
+	WinMetaFileDraw(int cx, int cy, const char *app = NULL, const char *name = NULL, const char *file = NULL);
+	~WinMetaFileDraw();
+};
+#endif
+
+class ScreenDraw : public Draw {
+public:
+	ScreenDraw(bool ic = false);
+	~ScreenDraw();
+};
+
+#ifndef PLATFORM_WINCE
+class PrintDraw : public Draw {
+public:
+	virtual void StartPage();
+	virtual void EndPage();
+
+private:
+	void  InitPrinter();
+public:
+	void  Abort()                                       { aborted = true; }
+
+	PrintDraw(HDC hdc, const char *jobname);
+	~PrintDraw();
+};
+#endif
+
+inline bool     BitBlt(HDC ddc, Point d, HDC sdc, const Rect& s, dword rop = SRCCOPY)
+{ return BitBlt(ddc, d.x, d.y, s.Width(), s.Height(), sdc, s.left, s.top, rop); }
+
+inline bool     StretchBlt(HDC ddc, const Rect& r, HDC sdc, const Rect& s, dword rop = SRCCOPY)
+{ return StretchBlt(ddc, r.left, r.top, r.Width(), r.Height(), sdc, s.left, s.top, s.Width(), s.Height(), rop); }
+
+inline bool     PatBlt(HDC dc, const Rect& r, dword rop = PATCOPY)
+{ return PatBlt(dc, r.left, r.top, r.Width(), r.Height(), rop); }
+
+inline void     MoveTo(HDC hdc, Point pt)                         { MoveToEx(hdc, pt.x, pt.y, 0); }
+inline void     LineTo(HDC hdc, Point pt)                         { LineTo(hdc, pt.x, pt.y); }
+
+inline void     DrawLine(HDC hdc, Point p, Point q)               { MoveTo(hdc, p); LineTo(hdc, q); }
+inline void     DrawLine(HDC hdc, int px, int py, int qx, int qy) { MoveToEx(hdc, px, py, 0); LineTo(hdc, qx, qy); }
+
+#ifndef PLATFORM_WINCE
+inline void     DrawArc(HDC hdc, const Rect& rc, Point p, Point q){ Arc(hdc, rc.left, rc.top, rc.right, rc.bottom, p.x, p.y, q.x, q.y); }
+#endif
+inline void     DrawCircle(HDC hdc, int x, int y, int radius)     { Ellipse(hdc, x - radius, y - radius, x + radius + 1, y + radius + 1); }
+inline void     DrawCircle(HDC hdc, Point centre, int radius)     { DrawCircle(hdc, centre.x, centre.y, radius); }
+inline void     DrawEllipse(HDC hdc, const Rect& rc)              { Ellipse(hdc, rc.left, rc.top, rc.right, rc.bottom); }
+
+inline void     DrawRect(HDC hdc, const Rect& rc)                 { Rectangle(hdc, rc.left, rc.top, rc.right, rc.bottom); }
diff --git a/uppsrc/Draw/DrawX11.cpp b/uppsrc/Draw/DrawX11.cpp
new file mode 100644
index 000000000..498cf2204
--- /dev/null
+++ b/uppsrc/Draw/DrawX11.cpp
@@ -0,0 +1,459 @@
+#include "Draw.h"
+
+#ifdef PLATFORM_X11
+
+#define Time    XTime
+#define Font    XFont
+#define Display XDisplay
+#define Picture XPicture
+
+#ifndef flagNOGTK
+#include <gtk/gtk.h>
+#include <gdk/gdkx.h>
+#include <gdk/gdkprivate.h>
+#endif
+
+#undef Picture
+#undef Time
+#undef Font
+#undef Display
+
+NAMESPACE_UPP
+
+#define LLOG(x)     //LOG(x)
+#define LTIMING(x)  //TIMING(x)
+
+XDisplay   *Xdisplay;
+int         Xscreenno;
+Visual     *Xvisual;
+Window      Xroot;
+Screen     *Xscreen;
+Colormap    Xcolormap;
+int         Xheight;
+int         Xwidth;
+int         XheightMM;
+int         XwidthMM;
+int         Xdepth;
+dword       Xblack;
+dword       Xwhite;
+int         Xconnection;
+byte       *Xmapcolor;
+byte       *Xunmapcolor;
+
+dword   (*Xgetpixel)(int r, int g, int b);
+
+void StaticExitDraw_()
+{
+	Draw::FreeFonts();
+}
+
+EXITBLOCK
+{
+	if(Xdisplay) {
+		StaticExitDraw_();
+// No CloseDisplay for now...
+		XCloseDisplay(Xdisplay);
+		LLOG("Xdisplay closed");
+		Xdisplay = NULL;
+	}
+	if(Xmapcolor)
+		delete[] Xmapcolor;
+	if(Xunmapcolor)
+		delete[] Xunmapcolor;
+}
+
+void XError()
+{
+	Panic("X11 error !");
+}
+
+void   XError(const char *s)
+{
+	Panic(String("X11 error:") + s + " !");
+}
+
+static int sAcs;
+
+bool sAllocColor(int xr, int xg, int xb)
+{
+	XColor ce;
+	ce.red = xr;
+	ce.green = xg;
+	ce.blue = xb;
+	ce.flags = DoRed | DoGreen | DoBlue;
+	if(!XAllocColor(Xdisplay, Xcolormap, &ce)) return false;
+	sAcs++;
+	return sAcs < 257;
+}
+
+void sAllocColors()
+{
+	int r, g, b;
+	for(r = 0; r < 2; r++)
+		for(g = 0; g < 2; g++)
+			for(b = 0; b < 2; b++)
+				if(!sAllocColor(65535 * r, 65535 * g, 65535 * b)) return;
+	for(r = 0; r < 3; r++)
+		for(g = 0; g < 3; g++)
+			for(b = 0; b < 3; b++)
+				if((r == 1 || g == 1 || b == 1) &&
+				   !sAllocColor((65535 * r) / 2, (65535 * g) / 2, (65535 * b) / 2)) return;
+	for(r = 5; r >= 0; r--)
+		for(g = 5; g >= 0; g--)
+			for(b = 5; b >= 0; b--)
+				if((r != 0 && r != 5 || g != 0 && g != 5 || b != 0 && b != 5) &&
+				   !sAllocColor((65535 * r) / 5, (65535 * g) / 5, (65535 * b) / 5)) return;
+	for(r = 1; r <= 11; r += 2)
+		if(!sAllocColor((65535 * r) / 11, (65535 * r) / 11, (65535 * r) / 11)) return;
+	for(int r = 255; r >= 0; r--)
+		if(!sAllocColor(r << 8, r << 8, r << 8)) return;
+}
+
+dword GetPseudoColorPixel(int r, int g, int b)
+{
+	return Xmapcolor[r * 11 / 255 * (24 * 12) + g * 23 / 255 * 12 + b * 11 / 255];
+}
+
+static
+struct Xshift {
+	dword  mask;
+	int    bits;
+	int    shift;
+	dword  Do(int c) { return (c >> bits << shift) & mask; }
+}
+Xred, Xgreen, Xblue;
+
+Xshift CalcXShift(dword mask)
+{
+	Xshift f;
+	f.mask = mask;
+	f.shift = 0;
+	f.bits = 0;
+	while((mask & 1) == 0) {
+		mask >>= 1;
+		f.shift++;
+	}
+	while((mask & 1) == 1) {
+		mask >>= 1;
+		f.bits++;
+	}
+	f.bits = 8 - f.bits;
+	if(f.bits < 0) {
+		f.shift += f.bits;
+		f.bits = 0;
+	}
+	LLOG("xshift(" << FormatIntHex(mask) << "): mask = "
+		<< FormatIntHex(f.mask) << ", bits = " << f.bits << ", shift = " << f.shift);
+	return f;
+}
+
+dword GetTrueColorPixel(int r, int g, int b)
+{
+	return Xred.Do(r) | Xgreen.Do(g) | Xblue.Do(b);
+}
+
+inline int ssq(int x) { return x * x; }
+
+void InitX11Draw(XDisplay *display)
+{
+	Xdisplay = display;
+	if(!Xdisplay) {
+		puts(NFormat("No X11 display, errno = %d, %s", errno, strerror(errno)));
+		fflush(stdout);
+		XError();
+	}
+	int Xscreenno = DefaultScreen(Xdisplay);
+	Xroot = RootWindow(Xdisplay, Xscreenno);
+	Xscreen = ScreenOfDisplay(Xdisplay, Xscreenno);
+	Xcolormap = DefaultColormap(Xdisplay, Xscreenno);
+//	Xcolormap = (Colormap)GDK().gdk_x11_colormap_get_xcolormap(GDK().gdk_rgb_get_colormap());
+	Xheight = DisplayHeight(Xdisplay, Xscreenno);
+	Xwidth = DisplayWidth(Xdisplay, Xscreenno);
+	XheightMM = DisplayHeightMM(Xdisplay, Xscreenno);
+	XwidthMM = DisplayWidthMM(Xdisplay, Xscreenno);
+	LLOG("Xwidth = " << Xwidth << ", XwidthMM = " << XwidthMM);
+	LLOG("Xheight = " << Xheight << ", XheightMM = " << XheightMM);
+	Xdepth = DefaultDepth(Xdisplay, Xscreenno);
+	Xblack = BlackPixel(Xdisplay, 0);
+	Xwhite = WhitePixel(Xdisplay, 0);
+	Xconnection = XConnectionNumber(Xdisplay);
+	Xvisual = DefaultVisual(Xdisplay, Xscreenno);
+	Visual *v = Xvisual;
+	if(v->c_class == TrueColor) {
+		Xred = CalcXShift(v->red_mask);
+		Xgreen = CalcXShift(v->green_mask);
+		Xblue = CalcXShift(v->blue_mask);
+		Xgetpixel = GetTrueColorPixel;
+	}
+	else {
+		sAllocColors();
+		int colorcount = max(1 << Xdepth, 256);
+		Buffer<XColor> cs(colorcount);
+		int i;
+		for(i = 0; i < colorcount; i++)
+			cs[i].pixel = i;
+		XQueryColors(Xdisplay, Xcolormap, cs, colorcount);
+		Xunmapcolor = new byte[3 * colorcount];
+		for(i = 0; i < colorcount; i++)
+		{
+			Xunmapcolor[3 * i + 0] = cs[i].blue;
+			Xunmapcolor[3 * i + 1] = cs[i].green;
+			Xunmapcolor[3 * i + 2] = cs[i].red;
+		}
+		byte *cm = Xmapcolor = new byte[12 * 24 * 12];
+		for(int r = 0; r < 12; r++)
+			for(int g = 0; g < 24; g++)
+				for(int b = 0; b < 12; b++) {
+					int mind = INT_MAX;
+					int mini;
+					for(int i = 0; i < colorcount; i++) {
+						int d = ssq(r * 255 / 11 - (cs[i].red >> 8)) +
+						        ssq(g * 255 / 23 - (cs[i].green >> 8)) +
+						        ssq(b * 255 / 11 - (cs[i].blue >> 8));
+						if(d < mind) {
+							mini = i;
+							mind = d;
+						}
+					}
+					*cm++ = mini;
+				}
+		Xgetpixel = GetPseudoColorPixel;
+	}
+//	XFree(v);
+
+	Draw::SetStdFont(ScreenSans(12));
+}
+
+void InitX11Draw(const char *dispname)
+{
+#ifdef flagNOGTK
+	if(!dispname || !*dispname) {
+		int f = Environment().Find("DISPLAY");
+		dispname = (f >= 0 ? ~Environment()[f] : ":0.0");
+	}
+	InitX11Draw(XOpenDisplay(dispname));
+#else
+	MemoryIgnoreLeaksBlock __;
+	const Vector<String>& cmd = CommandLine();
+	char **argv = (char**) MemoryAllocPermanent(sizeof(char *) * cmd.GetCount());
+	for(int i = 0; i < cmd.GetCount(); i++)
+	    argv[i] = PermanentCopy(cmd[i]);
+	int argc = cmd.GetCount();
+	gtk_init (&argc, &argv);
+	GtkWidget *w = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+	GdkDisplay *d = gtk_widget_get_display(w);
+	gdk_x11_display_get_xdisplay(d);
+	InitX11Draw(gdk_x11_display_get_xdisplay(d));
+	gtk_widget_destroy(w);
+#endif
+}
+
+#ifdef PLATFORM_XFT
+void SetClip(GC gc, XftDraw *xftdraw, const Vector<Rect>& cl)
+#else
+void SetClip(GC gc, const Vector<Rect>& cl)
+#endif
+{
+	DrawLock __;
+	LTIMING("SetClip");
+	Buffer<XRectangle> xr(cl.GetCount());
+	LLOG("SetClip");
+	for(int i = 0; i < cl.GetCount(); i++) {
+		XRectangle& r = xr[i];
+		const Rect& cr = cl[i];
+		LLOG("[" << i << "] = " << cr);
+		r.x = cr.left;
+		r.y = cr.top;
+		r.width = cr.Width();
+		r.height = cr.Height();
+	}
+	XSetClipRectangles(Xdisplay, gc, 0, 0, xr, cl.GetCount(), Unsorted);
+#ifdef PLATFORM_XFT
+	LLOG("XftDrawSetClipRectangles, # = " << cl.GetCount() << ", xftdraw = " << FormatIntHex(xftdraw));
+	XftDrawSetClipRectangles(xftdraw, 0, 0, xr, cl.GetCount());
+	LLOG("//XftDrawSetClipRectangles");
+#endif
+}
+
+void Draw::CloneClip()
+{
+	if(cloff.GetCount() > 1 && cloff.Top().clipi == cloff[cloff.GetCount() - 2].clipi) {
+		cloff.Top().clipi = clip.GetCount();
+		Vector<Rect>& c = clip.Add();
+		c <<= clip[clip.GetCount() - 2];
+	}
+}
+
+void Draw::SetForeground(Color color)
+{
+	DrawLock __;
+	LTIMING("SetForeground");
+	if(IsDrawing()) return;
+	int p = GetXPixel(color.GetR(), color.GetG(), color.GetB());
+	if(p == foreground) return;
+	LTIMING("XSetForeground");
+	LLOG("XSetForeground " << color);
+	foreground = p;
+	XSetForeground(Xdisplay, gc, foreground);
+}
+
+void Draw::SetClip() {
+	DrawLock __;
+	if(IsDrawing() || dw == Xroot) return;
+	LTIMING("SetClip");
+#ifdef PLATFORM_XFT
+	UPP::SetClip(gc, xftdraw, clip.Top());
+#else
+	UPP::SetClip(gc, clip.Top());
+#endif
+}
+
+void Draw::SetLineStyle(int width)
+{
+	DrawLock __;
+	if(IsDrawing()) return;
+	if(width == linewidth) return;
+	linewidth = width;
+	if(IsNull(width))
+		width = 1;
+	if(width < PEN_SOLID) {
+		static const char dash[] = { 18, 6 };
+		static const char dot[] = { 3, 3 };
+		static const char dashdot[] = { 9, 6, 3, 6 };
+		static const char dashdotdot[] = { 9, 3, 3, 3, 3, 3 };
+		static struct {
+			const char *dash;
+			int   len;
+		} ds[] = {
+			{ dash, __countof(dash) },
+			{ dot, __countof(dot) },
+			{ dashdot, __countof(dashdot) },
+			{ dashdotdot, __countof(dashdotdot) }
+		};
+		int i = -(width - PEN_DASH);
+		ASSERT(i >= 0 && i < 4);
+		XSetDashes(Xdisplay, gc, 0, ds[i].dash, ds[i].len);
+	}
+	XSetLineAttributes(Xdisplay, gc, max(width, 1),
+	                   width < PEN_SOLID ? LineOnOffDash : LineSolid, CapRound, JoinRound);
+}
+
+void Draw::Init()
+{
+	DrawLock __;
+	pagePixels = Size(Xwidth, Xheight);
+	pageMMs = Size(XwidthMM, XheightMM);
+	inchPixels = 254 * pagePixels / pageMMs / 10;
+	sheetPixels = pagePixels;
+	pageOffset = Point(0, 0);
+	InitFonts();
+	cloff.Clear();
+	clip.Clear();
+	foreground = linewidth = Null;
+	device = 0;
+	device = 0;
+	pixels = true;
+	printer = aborted = backdraw = is_mono = false;
+}
+
+void Draw::Init(const Vector<Rect>& _clip, Point _offset)
+{
+	DrawLock __;
+	Init();
+	clip.Add() <<= _clip;
+	offset.Add(_offset);
+	actual_offset = _offset;
+	Cloff& f = cloff.Add();
+	f.offseti = 0;
+	f.clipi = 0;
+	SetClip();
+}
+
+Draw::Draw()
+{
+	DrawLock __;
+	dw = None;
+	gc = None;
+	actual_offset = Point(0, 0);
+	Init();
+}
+
+#ifdef PLATFORM_XFT
+Draw::Draw(Drawable _dw, GC _gc, XftDraw *_xftdraw, const Vector<Rect>& _clip)
+#else
+Draw::Draw(Drawable _dw, GC _gc, const Vector<Rect>& _clip)
+#endif
+{
+	LLOG("Draw");
+	dw = _dw;
+	gc = _gc;
+#ifdef PLATFORM_XFT
+	xftdraw = _xftdraw;
+#endif
+	Init(_clip);
+}
+
+Draw::~Draw()
+{
+}
+
+void BackDraw::Create(Draw& w, int cx, int cy)
+{
+	DrawLock __;
+	LLOG("Creating BackDraw " << cx << "x" << cy);
+	Destroy();
+	size.cx = cx;
+	size.cy = cy;
+	dw = XCreatePixmap(Xdisplay, w.GetDrawable(), max(cx, 1), max(cy, 1), Xdepth);
+	gc = XCreateGC(Xdisplay, dw, 0, 0);
+#ifdef PLATFORM_XFT
+	xftdraw = XftDrawCreate(Xdisplay, (Drawable) dw,
+	                        DefaultVisual(Xdisplay, Xscreenno), Xcolormap);
+#endif
+	Vector<Rect> clip;
+	clip.Add(RectC(0, 0, cx, cy));
+	Init(clip, Point(0, 0));
+	backdraw = true;
+}
+
+void BackDraw::Put(Draw& w, int x, int y)
+{
+	DrawLock __;
+	LLOG("Putting BackDraw");
+	ASSERT(dw != None);
+	XCopyArea(Xdisplay, dw, w.GetDrawable(), w.GetGC(), 0, 0, size.cx, size.cy,
+	          x + w.GetOffset().x, y + w.GetOffset().y);
+}
+
+void BackDraw::Destroy()
+{
+	DrawLock __;
+	if(dw != None) {
+	#ifdef PLATFORM_XFT
+		XftDrawDestroy(xftdraw);
+	#endif
+		XFreePixmap(Xdisplay, dw);
+		XFreeGC(Xdisplay, gc);
+	}
+}
+
+NilDraw::NilDraw()
+{
+	DrawLock __;
+	dw = Xroot;
+	gc = XCreateGC(Xdisplay, Xroot, 0, 0);
+	pixels = false;
+	Init(Vector<Rect>());
+}
+
+NilDraw::~NilDraw()
+{
+	DrawLock __;
+	XFreeGC(Xdisplay, gc);
+}
+
+Draw& ScreenInfo() { return Single<NilDraw>(); }
+
+END_UPP_NAMESPACE
+
+#endif
diff --git a/uppsrc/Draw/Drawing.cpp b/uppsrc/Draw/Drawing.cpp
new file mode 100644
index 000000000..54fc7e837
--- /dev/null
+++ b/uppsrc/Draw/Drawing.cpp
@@ -0,0 +1,754 @@
+#include "Draw.h"
+
+NAMESPACE_UPP
+
+#define LLOG(x)  // LOG(x)
+
+#ifdef COMPILER_MSC
+#pragma warning(disable: 4700)
+#endif
+
+static void StreamUnpackPoints(Stream& stream, Point *out, int count)
+{
+	if(count == 0)
+		return;
+#ifdef CPU_LITTLE_ENDIAN
+	if(sizeof(Point) == 8) {
+		stream.Get(out, 8 * count);
+		return;
+	}
+#endif
+	Point *end = out + count;
+	byte *top = reinterpret_cast<byte *>(end) - count * 8;
+	stream.Get(top, count * 8);
+	for(; out < end; out++, top += 8) {
+		out -> x = (short)Peek32le(top + 0);
+		out -> y = (short)Peek32le(top + 4);
+	}
+}
+
+static void StreamPackPoints(Stream& stream, const Point *in, int count)
+{
+#ifdef CPU_LITTLE_ENDIAN
+	if(sizeof(Point) == 8) {
+		stream.Put(in, 8 * count);
+		return;
+	}
+#endif
+	enum { PART = 1024 };
+	byte part[PART * 8];
+	while(count > 0)
+	{
+		int part_count = min<int>(count, PART);
+		for(byte *pp = part, *pe = pp + 8 * part_count; pp < pe; pp += 8, in++) {
+			Poke32le(pp + 0, in -> x);
+			Poke32le(pp + 4, in -> y);
+		}
+		stream.Put(part, part_count * 4);
+		count -= part_count;
+	}
+}
+
+static void StreamUnpackInts(Stream& stream, int *out, int count)
+{
+#ifdef CPU_LITTLE_ENDIAN
+	if(sizeof(int) == 4) {
+		stream.Get(out, count * 4);
+		return;
+	}
+#endif
+	while(count--)
+		*out++ = stream.Get32le();
+}
+
+static void StreamPackInts(Stream& stream, const int *in, int count)
+{
+#ifdef CPU_LITTLE_ENDIAN
+	if(sizeof(int) == 4) {
+		stream.Put(in, count * 4);
+		return;
+	}
+#endif
+	while(count--)
+		stream.Put32le(*in++);
+}
+
+// ------------------------------
+
+void DrawingDraw::DrawingBegin()
+{
+	Cloff& w = cloff.Add();
+	w.org = actual_offset;
+	w.drawingclip = drawingclip;
+}
+
+void DrawingDraw::BeginOp()
+{
+	DrawingOp(BEGIN);
+	DrawingBegin();
+}
+
+void DrawingDraw::OffsetOp(Point p)
+{
+	DrawingOp(OFFSET) % p;
+	DrawingBegin();
+	actual_offset += p;
+}
+
+bool DrawingDraw::ClipOp(const Rect& r)
+{
+	DrawingOp(CLIP) % const_cast<Rect&>(r);
+	DrawingBegin();
+	drawingclip &= r + actual_offset;
+	return !drawingclip.IsEmpty();
+}
+
+bool DrawingDraw::ClipoffOp(const Rect& r)
+{
+	DrawingOp(CLIPOFF) % const_cast<Rect&>(r);
+	DrawingBegin();
+	drawingclip &= r + actual_offset;
+	actual_offset += r.TopLeft();
+	return !drawingclip.IsEmpty();
+}
+
+void DrawingDraw::EndOp()
+{
+	DrawingOp(END);
+	ASSERT(cloff.GetCount());
+	Cloff& w = cloff.Top();
+	actual_offset = w.org;
+	drawingclip = w.drawingclip;
+	cloff.Drop();
+}
+
+bool DrawingDraw::ExcludeClipOp(const Rect& r)
+{
+	DrawingOp(EXCLUDECLIP) % const_cast<Rect&>(r);
+	return !drawingclip.IsEmpty();
+}
+
+bool DrawingDraw::IntersectClipOp(const Rect& r)
+{
+	DrawingOp(INTERSECTCLIP) % const_cast<Rect&>(r);
+	drawingclip &= r;
+	return !drawingclip.IsEmpty();
+}
+
+Rect DrawingDraw::GetClipOp() const
+{
+	return drawingclip - actual_offset;
+}
+
+bool DrawingDraw::IsPaintingOp(const Rect& r) const
+{
+	return true;
+}
+
+void DrawingDraw::DrawRectOp(int x, int y, int cx, int cy, Color color)
+{
+	if(!IsNull(color))
+		DrawingOp(DRAWRECT) % x % y % cx % cy % color;
+}
+
+void DrawingDraw::DrawImageOp(int x, int y, int cx, int cy, const Image& img, const Rect& src, Color color)
+{
+	Rect s = src;
+	DrawingOp(DRAWIMAGE) % x % y % cx % cy % const_cast<Image&>(img) % s % color;
+}
+
+void DrawingDraw::DrawDataOp(int x, int y, int cx, int cy, const String& data, const char *id)
+{
+	String h = id;
+	DrawingOp(DRAWDATA) % x % y % cx % cy % const_cast<String&>(data) % h;
+}
+
+void DrawingDraw::DrawLineOp(int x1, int y1, int x2, int y2, int width, Color color)
+{
+	DrawingOp(DRAWLINE) % x1 % y1 % x2 % y2 % width % color;
+}
+
+void DrawingDraw::DrawPolyPolylineOp(const Point *vertices, int vertex_count,
+	                                 const int *counts, int count_count,
+	                                 int width, Color color, Color doxor)
+{
+	ASSERT(count_count > 0 && vertex_count > 0);
+	if(vertex_count < 2 || IsNull(color))
+		return;
+	DrawingOp(DRAWPOLYPOLYLINE);
+	int version = 2;
+	drawing / version;
+	drawing % width % color % doxor;
+	drawing % vertex_count % count_count;
+	StreamPackPoints(drawing, vertices, vertex_count);
+	StreamPackInts(drawing, counts, count_count);
+}
+
+void DrawingDraw::DrawPolyPolyPolygonOp(const Point *vertices, int vertex_count,
+	                   const int *subpolygon_counts, int subpolygon_count_count,
+	                   const int *disjunct_polygon_counts, int disjunct_polygon_count_count,
+	                   Color color, int width, Color outline, uint64 pattern, Color doxor)
+{
+	if(vertex_count == 0)
+		return;
+	DrawingOp(DRAWPOLYPOLYPOLYGON);
+	int version = 2;
+	drawing / version;
+	drawing % color % width % outline % pattern % doxor;
+	drawing % vertex_count % subpolygon_count_count % disjunct_polygon_count_count;
+	StreamPackPoints(drawing, vertices, vertex_count);
+	StreamPackInts(drawing, subpolygon_counts, subpolygon_count_count);
+	StreamPackInts(drawing, disjunct_polygon_counts, disjunct_polygon_count_count);
+}
+
+void DrawingDraw::DrawEllipseOp(const Rect& r, Color color, int pen, Color pencolor)
+{
+	DrawingOp(DRAWELLIPSE) % const_cast<Rect&>(r) % color / pen % pencolor;
+}
+
+void DrawingDraw::DrawArcOp(const Rect& rc, Point start, Point end, int width, Color color)
+{
+	DrawingOp(DRAWARC) % const_cast<Rect&>(rc) % start % end % color % width;
+}
+
+void DrawingDraw::DrawTextOp(int x, int y, int angle, const wchar *text, Font font, Color ink,
+                             int n, const int *dx) {
+	if(IsNull(ink)) return;
+	if(n < 0)
+		n = wstrlen((const wchar *)text);
+	if(n == 0)
+		return;
+	Stream& s = DrawingOp(DRAWTEXT);
+	byte cs = CHARSET_UNICODE;
+	s % x % y % angle % font % ink / n % cs;
+	s.PutW((wchar *)text, n);
+	bool dxb = dx;
+	s % dxb;
+	if(dx) {
+		int *w = const_cast<int *>(dx);
+		while(n--)
+			s / *w++;
+	}
+}
+
+Drawing DrawingDraw::GetResult()
+{
+	Drawing out;
+	out.size = size;
+	LLOG("GetResult size: " << size);
+	out.data = drawing.GetResult();
+	return out;
+}
+
+// ------------------------------
+
+int   DrawingPos::GetX(int x) const {
+	return iscale(x + srcoff.x, target.cx, source.cx) - trgoff.x;
+}
+
+int   DrawingPos::GetY(int y) const {
+	return iscale(y + srcoff.y, target.cy, source.cy) - trgoff.y;
+}
+
+int   DrawingPos::GetCx(int cx) const {
+	return iscale(cx, target.cx, source.cx);
+}
+
+int   DrawingPos::GetCy(int cy) const {
+	return iscale(cy, target.cy, source.cy);
+}
+
+int   DrawingPos::GetW(int w) const {
+	return iscale(w, target.cx + target.cy, source.cx + source.cy);
+}
+
+Point DrawingPos::Get(int x, int y) const {
+	return Point(GetX(x), GetY(y));
+}
+
+Point DrawingPos::Get(Point p) const {
+	return Get(p.x, p.y);
+}
+
+Size  DrawingPos::Get(Size sz) const {
+	return Size(GetCx(sz.cx), GetCy(sz.cy));
+}
+
+Rect  DrawingPos::Get(const Rect& r) const {
+	return Rect(GetX(r.left), GetY(r.top), GetX(r.right), GetY(r.bottom));
+}
+
+Rect  DrawingPos::Get(int x, int y, int cx, int cy) const {
+	return Get(RectC(x, y, cx, cy));
+}
+
+Rect GetRect16(Stream& s) {
+	Rect r;
+	Pack16(s, r);
+	return r;
+}
+
+Point GetPoint16(Stream& s) {
+	Point p;
+	Pack16(s, p);
+	return p;
+}
+
+static void wsBegin(Draw& w, Stream&, const DrawingPos& ps) {
+	w.Begin();
+	DrawingPos& cps = const_cast<DrawingPos&>(ps);
+	cps.stack.Add(cps.srcoff);
+}
+
+static void wsOffset(Draw& w, Stream& s, const DrawingPos& ps) {
+	Point off;
+	s % off;
+	w.Offset(ps(off));
+	DrawingPos& cps = const_cast<DrawingPos&>(ps);
+	cps.stack.Add(cps.srcoff);
+	cps.srcoff += off;
+	cps.trgoff = w.GetOffset() - cps.trgini;
+}
+
+static void wsClip(Draw& w, Stream& s, const DrawingPos& ps) {
+	Rect rc;
+	s % rc;
+	w.Clip(ps(rc));
+	DrawingPos& cps = const_cast<DrawingPos&>(ps);
+	cps.stack.Add(cps.srcoff);
+}
+
+static void wsClipoff(Draw& w, Stream& s, const DrawingPos& ps) {
+	Rect rc;
+	s % rc;
+	w.Clipoff(ps(rc));
+	DrawingPos& cps = const_cast<DrawingPos&>(ps);
+	cps.stack.Add(cps.srcoff);
+	cps.srcoff += rc.TopLeft();
+	cps.trgoff = w.GetOffset() - cps.trgini;
+}
+
+static void wsExcludeClip(Draw& w, Stream& s, const DrawingPos& ps) {
+	Rect rc;
+	s % rc;
+	w.ExcludeClip(ps(rc));
+}
+
+static void wsIntersectClip(Draw& w, Stream& s, const DrawingPos& ps) {
+	Rect rc;
+	s % rc;
+	w.IntersectClip(ps(rc));
+}
+
+static void wsEnd(Draw& w, Stream& s, const DrawingPos& ps) {
+	w.End();
+	DrawingPos& cps = const_cast<DrawingPos&>(ps);
+	cps.srcoff = cps.stack.Pop();
+	cps.trgoff = w.GetOffset() - cps.trgini;
+}
+
+static void wsDrawRect(Draw& w, Stream& s, const DrawingPos& ps) {
+	int   x, y, cx, cy;
+	Color color;
+	s % x % y % cx % cy % color;
+	LLOG("wsDrawRect " << RectC(x, y, cx, cy) << " ps:" << ps(x, y, cx, cy) << " color:" << color);
+	w.DrawRect(ps(x, y, cx, cy), color);
+}
+
+static void wsDrawImage(Draw& w, Stream& s, const DrawingPos& ps) {
+	int x, y, cx, cy;
+	Image img;
+	Rect src;
+	Color color;
+	s % x % y % cx % cy % img % src % color;
+	Rect r = ps(x, y, cx, cy);
+	w.DrawImageOp(r.left, r.top, r.Width(), r.Height(), img, src, color);
+}
+
+static void wsDrawData(Draw& w, Stream& s, const DrawingPos& ps)
+{
+	String data, id;
+	int x, y, cx, cy;
+	s % x % y % cx % cy % const_cast<String&>(data) % id;
+	Rect r = ps(x, y, cx, cy);
+	w.DrawData(r, data, id);
+}
+
+static void wsDrawDrawing(Draw& w, Stream& s, const DrawingPos& ps) {
+	Drawing dw;
+	Rect rc;
+	s % dw % rc;
+	w.DrawDrawing(ps(rc), dw);
+}
+
+static void wsDrawLine(Draw& w, Stream& s, const DrawingPos& ps) {
+	int x1, y1, x2, y2, width;
+	Color color;
+	s % x1 % y1 % x2 % y2 % width % color;
+	w.DrawLine(ps(x1, y1), ps(x2, y2), width > 0 ? ps.GetW(width) : width, color);
+}
+
+#ifndef PLATFORM_WINCE
+
+static void wsDrawPolyPolyline(Draw& w, Stream& stream, const DrawingPos& dp)
+{
+	int width, vertex_count, count_count;
+	Color color, doxor;
+	int version;
+	stream / version;
+	stream % width % color % doxor;
+	stream % vertex_count % count_count;
+	Buffer<Point> vertices(vertex_count);
+	Buffer<int> counts(count_count);
+	StreamUnpackPoints(stream, vertices, vertex_count);
+	StreamUnpackInts(stream, counts, count_count);
+	if(!dp.Identity()) {
+		for(Point *p = vertices, *e = p + vertex_count; p < e; p++)
+			dp.Transform(*p);
+		if(width > 0)
+			dp.TransformW(width);
+	}
+	w.DrawPolyPolyline(vertices, vertex_count, counts, count_count, width, color, doxor);
+}
+
+static void wsDrawPolyPolyPolygon(Draw& w, Stream& stream, const DrawingPos& dp)
+{
+	Color color, outline, doxor;
+	uint64 pattern;
+	int width, vertex_count, subpolygon_count_count, disjunct_polygon_count_count;
+	int version = 2;
+	stream / version;
+	stream % color % width % outline % pattern % doxor;
+	stream % vertex_count % subpolygon_count_count % disjunct_polygon_count_count;
+	Buffer<Point> vertices(vertex_count);
+	Buffer<int> subpolygon_counts(subpolygon_count_count);
+	Buffer<int> disjunct_polygon_counts(disjunct_polygon_count_count);
+	StreamUnpackPoints(stream, vertices, vertex_count);
+	StreamUnpackInts(stream, subpolygon_counts, subpolygon_count_count);
+	StreamUnpackInts(stream, disjunct_polygon_counts, disjunct_polygon_count_count);
+	if(!dp.Identity()) {
+		for(Point *p = vertices, *e = p + vertex_count; p < e; p++)
+			dp.Transform(*p);
+		dp.TransformW(width);
+	}
+	w.DrawPolyPolyPolygon(vertices, vertex_count,
+		                  subpolygon_counts, subpolygon_count_count,
+		                  disjunct_polygon_counts, disjunct_polygon_count_count,
+		                  color, width, outline, pattern, doxor);
+}
+
+static void wsDrawArc(Draw& w, Stream& s, const DrawingPos& ps)
+{
+	Rect r;
+	Point start, end;
+	Color color;
+	int width;
+	s % r % start % end % color % width;
+	w.DrawArc(r, start, end, width, color);
+}
+
+#endif
+
+static void wsDrawEllipse(Draw& w, Stream& s, const DrawingPos& ps) {
+	Rect r;
+	s % r;
+	Color color, pencolor;
+	int pen;
+	s % color / pen % pencolor;
+	w.DrawEllipse(ps(r), color, pen > 0 ? ps.GetW(pen) : pen, pencolor);
+}
+
+static void wsDrawText(Draw& w, Stream& s, const DrawingPos& ps) {
+	int x, y, n, angle;
+	Font font;
+	Color ink;
+	byte cs;
+	s % x % y % angle % font % ink / n % cs;
+	if(font.GetHeight() == 0) {
+		FontInfo fi = font.Info();
+		font.Height(fi.GetHeight() - fi.GetInternal());
+	}
+	bool unicode = cs == CHARSET_UNICODE;
+	WString text;
+	if(unicode) {
+		Buffer<wchar> txt(n);
+		s.GetW(txt, n);
+		text = WString(txt, n);
+	}
+	else {
+		Buffer<char> txt(n);
+		s.Get(txt, n);
+		text = ToUnicode(txt, n, cs);
+	}
+	LLOG("wsDrawText \"" << WString(text, n)
+	     << "\" at: (" << x << ", " << y << ", " << angle << ")");
+	bool dxb;
+	s % dxb;
+	Buffer<int> dx(n);
+	int *wd = dx;
+	int nn = n;
+	angle %= 3600;
+	if(ps.Identity()) {
+		if(dxb) {
+			while(nn--)
+				s / *wd++;
+			w.DrawText(x, y, angle, text, font, ink, dx);
+		}
+		else
+			w.DrawText(x, y, angle, text, font, ink);
+	}
+	else {
+		FontInfo fi = font.Info();
+		const wchar *wp = ~text;
+		int odd = (angle / 900) & 1;
+		if(angle % 900 == 0) {
+			int error = 0;
+			int a, b;
+			if(odd) {
+				a = ps.target.cy;
+				b = ps.source.cy;
+				int ht = ps.GetCx(fi.GetFontHeight());
+				font.Width(ps.GetCy(fi.GetAveWidth())).Height(ht ? ht : 1);
+				FontInfo nf = font.Info();
+				x = angle == 2700 ? ps.GetX(x - fi.GetAscent()) + nf.GetAscent()
+				                  : ps.GetX(x + fi.GetAscent()) - nf.GetAscent();
+				y = ps.GetY(y);
+			}
+			else {
+				a = ps.target.cx;
+				b = ps.source.cx;
+				int ht = ps.GetCy(fi.GetFontHeight());
+				font.Width(ps.GetCx(fi.GetAveWidth())).Height(ht ? ht : 1);
+				FontInfo nf = font.Info();
+				x = ps.GetX(x);
+				y = angle == 1800 ? ps.GetY(y - fi.GetAscent()) + nf.GetAscent()
+				                  : ps.GetY(y + fi.GetAscent()) - nf.GetAscent();
+			}
+			while(nn--) {
+				int c;
+				if(dxb)
+					s / c;
+				else
+					c = fi[*wp++];
+				*wd++ = (c * a + error) / b;
+				error = (c * a + error) % b;
+			}
+			w.DrawText(x, y, angle, text, font, ink, dx);
+		}
+		else {
+			double ang = (double) (angle % 900) * M_2PI / 3600;
+			double sx = (double) ps.target.cx / ps.source.cx;
+			double sy = (double) ps.target.cy / ps.source.cy;
+			double ang2 = atan((odd ? sx / sy : sy / sx) * tan(ang));
+			double q = (odd ? sx : sy) * sin(ang) / sin(ang2);
+			double error = 0;
+			while(nn--) {
+				int cx;
+				if(dxb)
+					s / cx;
+				else
+					cx = fi[*wp++];
+				double ncx = q * cx + error;
+				*wd++ = cx = (int) ncx;
+				error = ncx - cx;
+			}
+			int ht = (int)(fi.GetFontHeight() * (sx * sin(ang) * sin(ang2) + sy * cos(ang) * cos(ang2)));
+			font.Width(int(q * fi.GetAveWidth())).Height(ht ? ht : 1);
+			w.DrawText(ps.GetX(x), ps.GetY(y), int(ang2 * 3600 / M_2PI) + (angle / 900) * 900,
+					   text, font, ink, dx);
+		}
+	}
+}
+
+static VectorMap<int, Draw::Drawer>& sDrawerMap()
+{
+	return Single< VectorMap<int, Draw::Drawer> > ();
+}
+
+void Draw::Register(int code, Drawer drawer)
+{
+	static StaticCriticalSection lock;
+	CriticalSection::Lock __(lock);
+	VectorMap<int, Draw::Drawer>& map = sDrawerMap();
+	int i = map.Find(code);
+	if(i >= 0) {
+		ASSERT(map[i] == drawer);
+		return;
+	}
+	map.Add(code, drawer);
+}
+
+void Draw::DrawDrawingOp(const Rect& target, const Drawing& w) {
+	{
+		ONCELOCK {
+			Register(BEGIN, wsBegin);
+			Register(OFFSET, wsOffset);
+			Register(CLIP, wsClip);
+			Register(CLIPOFF, wsClipoff);
+			Register(EXCLUDECLIP, wsExcludeClip);
+			Register(INTERSECTCLIP, wsIntersectClip);
+			Register(END, wsEnd);
+			Register(DRAWRECT, wsDrawRect);
+			Register(DRAWIMAGE, wsDrawImage);
+			Register(DRAWDRAWING, wsDrawDrawing);
+			Register(DRAWLINE, wsDrawLine);
+			Register(DRAWELLIPSE, wsDrawEllipse);
+			Register(DRAWTEXT, wsDrawText);
+#ifndef PLATFORM_WINCE
+			Register(DRAWARC, wsDrawArc);
+			Register(DRAWPOLYPOLYLINE, wsDrawPolyPolyline);
+			Register(DRAWPOLYPOLYPOLYGON, wsDrawPolyPolyPolygon);
+#endif
+			Register(DRAWDATA, wsDrawData);
+		}
+	}
+
+#ifdef _DEBUG
+	int cl = GetCloffLevel();
+#endif
+	DrawingPos pos;
+	pos.srcoff = pos.trgoff = Point(0, 0);
+	pos.target = target.Size();
+	pos.source = w.size;
+	LLOG("DrawDrawingOp size: " << w.size);
+	if(pos.target.cx == 0 || pos.target.cy == 0 || pos.source.cx == 0 || pos.source.cy == 0)
+		return;
+	Clipoff(target);
+	pos.trgini = GetOffset();
+	VectorMap<int, Draw::Drawer>& map = sDrawerMap();
+	StringStream s(w.data);
+	LOGBEGIN();
+	while(!s.IsEof()) {
+		int code;
+		s / code;
+		int i = map.Find(code);
+		if(i < 0)
+			break;
+		(*map[i])(*this, s, pos);
+	}
+	LOGEND();
+	End();
+#ifdef _DEBUG
+	ASSERT(GetCloffLevel() == cl);
+#endif
+}
+
+void DrawingDraw::DrawDrawingOp(const Rect& target, const Drawing& w)
+{
+	DrawingOp(DRAWDRAWING) % const_cast<Drawing&>(w) % const_cast<Rect&>(target);
+	return;
+}
+
+void Draw::DrawDrawing(int x, int y, int cx, int cy, const Drawing& w) {
+	DrawDrawing(RectC(x, y, cx, cy), w);
+}
+
+void  DrawingDraw::Create(int cx, int cy) {
+	Create(Size(cx, cy));
+}
+
+void  DrawingDraw::Create(Size sz) {
+	drawing.Create();
+	size = sz;
+#ifdef PLATFORM_WIN32
+	cloff.Clear();
+#endif
+#ifdef PLATFORM_X11
+	cloff.Clear();
+	clip.Clear();
+	Vector<Rect> cliplist;
+	cliplist.Add(RectC(0, 0, sz.cx, sz.cy));
+	Init(cliplist);
+#endif
+	drawingclip = Rect(0, 0, sz.cx, sz.cy);
+	pixels = false;
+	LLOG("DrawingDraw::Create, sz = " << sz << " -> clip = " << GetClip());
+}
+
+void DrawingDraw::DInit()
+{
+#ifdef PLATFORM_WIN32
+	Attach(ScreenHDC());
+#endif
+#ifdef PLATFORM_X11
+	gc = XCreateGC(Xdisplay, RootWindow(Xdisplay, Xscreenno), 0, 0);
+	dw = RootWindow(Xdisplay, Xscreenno);
+#endif
+	pixels = false;
+	backdraw = true;
+	LLOG("DrawingDraw::DInit: pixels = " << Pixels());
+}
+
+DrawingDraw::DrawingDraw()
+{
+	DInit();
+}
+
+DrawingDraw::DrawingDraw(Size sz) {
+	DInit();
+	Create(sz);
+}
+
+DrawingDraw::DrawingDraw(int cx, int cy) {
+	DInit();
+	Create(cx, cy);
+}
+
+DrawingDraw::~DrawingDraw() {
+#ifdef PLATFORM_X11
+	XFreeGC(Xdisplay, gc);
+#endif
+}
+
+Size Drawing::RatioSize(int cx, int cy) const {
+	return GetRatioSize(GetSize(), cx, cy);
+}
+
+void Drawing::Append(Drawing& dw)
+{
+	if(IsNull(size))
+		size = dw.size;
+	data << dw.data;
+}
+
+void Drawing::Serialize(Stream& s)
+{
+	s % size;
+	s % data;
+}
+
+#ifdef PLATFORM_WIN32
+#ifndef PLATFORM_WINCE
+Drawing Drawing::FromWMF(const WinMetaFile& wmf) {
+	if(!wmf) return Drawing();
+	Size sz = wmf.GetSize();
+	DrawingDraw dd(sz);
+	wmf.Paint(dd, 0, 0, sz.cx, sz.cy);
+	return dd;
+}
+
+Drawing Drawing::LoadWMF(const char *file) {
+	return FromWMF(WinMetaFile(file));
+}
+
+Drawing Drawing::ReadClipboardWMF() {
+	WinMetaFile wmf;
+	wmf.ReadClipboard();
+	return FromWMF(wmf);
+}
+
+WinMetaFile Drawing::AsWMF() const {
+	Size sz = GetSize();
+	WinMetaFileDraw wd(sz.cx, sz.cy);
+	wd.DrawDrawing(0, 0, sz.cx, sz.cy, *this);
+	return wd.Close();
+}
+
+void Drawing::WriteClipboardWMF() const {
+	WinMetaFile wmf = AsWMF();
+	wmf.WriteClipboard();
+}
+#endif
+#endif
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/Draw/Image.cpp b/uppsrc/Draw/Image.cpp
new file mode 100644
index 000000000..798d2f199
--- /dev/null
+++ b/uppsrc/Draw/Image.cpp
@@ -0,0 +1,698 @@
+#include "Draw.h"
+
+NAMESPACE_UPP
+
+#define LTIMING(x) // RTIMING(x)
+
+int ImageBuffer::ScanKind() const
+{
+	bool a255 = false;
+	bool a0 = false;
+	const RGBA *s = pixels;
+	const RGBA *e = s + GetLength();
+	while(s < e) {
+		if(s->a == 0)
+			a0 = true;
+		else
+		if(s->a == 255)
+			a255 = true;
+		else
+			return IMAGE_ALPHA;
+		s++;
+	}
+	return a255 ? a0 ? IMAGE_MASK : IMAGE_OPAQUE : IMAGE_EMPTY;
+}
+
+void ImageBuffer::Create(int cx, int cy)
+{
+	ASSERT(cx >= 0 && cy >= 0);
+	size.cx = cx;
+	size.cy = cy;
+	pixels.Alloc(GetLength());
+#ifdef _DEBUG
+	RGBA *s = pixels;
+	RGBA *e = pixels + GetLength();
+	byte  a = 0;
+	while(s < e) {
+		s->a = a;
+		a = ~a;
+		s->r = 255;
+		s->g = s->b = 0;
+		s++;
+	}
+#endif
+	kind = IMAGE_UNKNOWN;
+	spot2 = hotspot = Point(0, 0);
+	dots = Size(0, 0);
+}
+
+void ImageBuffer::DeepCopy(const ImageBuffer& img)
+{
+	Create(img.GetSize());
+	SetHotSpot(img.GetHotSpot());
+	Set2ndSpot(img.Get2ndSpot());
+	SetDots(img.GetDots());
+	memcpy(pixels, img.pixels, GetLength() * sizeof(RGBA));
+}
+
+void ImageBuffer::Set(Image& img)
+{
+	if(img.data)
+		if(img.data->refcount == 1) {
+			size = img.GetSize();
+			kind = IMAGE_UNKNOWN;
+			hotspot = img.GetHotSpot();
+			spot2 = img.Get2ndSpot();
+			dots = img.GetDots();
+			pixels = img.data->buffer.pixels;
+			img.Clear();
+		}
+		else {
+			DeepCopy(img.data->buffer);
+			kind = IMAGE_UNKNOWN;
+			img.Clear();
+		}
+	else
+		Create(0, 0);
+}
+
+
+void ImageBuffer::operator=(Image& img)
+{
+	Clear();
+	Set(img);
+}
+
+void ImageBuffer::operator=(ImageBuffer& img)
+{
+	Clear();
+	Image m = img;
+	Set(m);
+}
+
+ImageBuffer::ImageBuffer(Image& img)
+{
+	Set(img);
+}
+
+ImageBuffer::ImageBuffer(ImageDraw& w)
+{
+	Image img = w;
+	Set(img);
+}
+
+ImageBuffer::ImageBuffer(ImageBuffer& b)
+{
+	kind = b.kind;
+	size = b.size;
+	dots = b.dots;
+	pixels = b.pixels;
+	hotspot = b.hotspot;
+	spot2 = b.spot2;
+}
+
+void Image::Set(ImageBuffer& b)
+{
+	if(b.GetWidth() == 0 || b.GetHeight() == 0)
+		data = NULL;
+	else
+		data = new Data(b);
+}
+
+void Image::Clear()
+{
+	if(data)
+		data->Release();
+	data = NULL;
+}
+
+Image& Image::operator=(ImageBuffer& img)
+{
+	if(data)
+		data->Release();
+	Set(img);
+	return *this;
+}
+
+Image& Image::operator=(const Image& img)
+{
+	Data *d = data;
+	data = img.data;
+	if(data)
+		data->Retain();
+	if(d)
+		d->Release();
+	return *this;
+}
+
+const RGBA* Image::operator~() const
+{
+	return data ? ~data->buffer : NULL;
+}
+
+Image::operator const RGBA*() const
+{
+	return data ? ~data->buffer : NULL;
+}
+
+const RGBA* Image::operator[](int i) const
+{
+	ASSERT(data);
+	return data->buffer[i];
+}
+
+Size Image::GetSize() const
+{
+	return data ? data->buffer.GetSize() : Size(0, 0);
+}
+
+int Image::GetLength() const
+{
+	return data ? data->buffer.GetLength() : 0;
+}
+
+Point Image::GetHotSpot() const
+{
+	return data ? data->buffer.GetHotSpot() : Point(0, 0);
+}
+
+Point Image::Get2ndSpot() const
+{
+	return data ? data->buffer.Get2ndSpot() : Point(0, 0);
+}
+
+Size Image::GetDots() const
+{
+	return data ? data->buffer.GetDots() : Size(0, 0);
+}
+
+int Image::GetKindNoScan() const
+{
+	return data ? data->buffer.GetKind() : IMAGE_EMPTY;
+}
+
+int Image::Data::GetKind()
+{
+	int k = buffer.GetKind();
+	if(k != IMAGE_UNKNOWN)
+		return k;
+	k = buffer.ScanKind();
+	buffer.SetKind(k);
+	return k;
+}
+
+int Image::GetKind() const
+{
+	return data ? data->GetKind() : IMAGE_EMPTY;
+}
+
+void Image::PaintImage(Draw& w, int x, int y, const Rect& src, Color c) const
+{
+	if(data)
+		data->Paint(w, x, y, src, c);
+}
+
+void Image::Serialize(Stream& s)
+{
+	int version = 0;
+	s / version;
+	Size sz = GetSize();
+	Point p = GetHotSpot();
+	Size dots = GetDots();
+	s % sz % p % dots;
+	int len = sz.cx * sz.cy;
+	if(s.IsLoading())
+		if(len) {
+			ImageBuffer b(sz);
+			if(!s.GetAll(~b, len * sizeof(RGBA)))
+				s.SetError();
+			b.SetDots(dots);
+			b.SetHotSpot(p);
+			*this = b;
+		}
+		else
+			Clear();
+	else
+		s.Put(~*this, len * sizeof(RGBA));
+}
+
+bool Image::operator==(const Image& img) const
+{
+	if(GetLength() != img.GetLength())
+		return false;
+	return memcmp(~*this, ~img, GetLength() * sizeof(RGBA)) == 0;
+}
+
+bool Image::operator!=(const Image& img) const
+{
+	return !operator==(img);
+}
+
+dword Image::GetHashValue() const
+{
+	return memhash(~*this, GetLength() * sizeof(RGBA));
+}
+
+Image::Image(const Image& img)
+{
+	data = img.data;
+	if(data)
+		data->Retain();
+}
+
+Image::Image(Image (*fn)())
+{
+	data = NULL;
+	*this = (*fn)();
+}
+
+Image::Image(const Value& src)
+{
+	data = NULL;
+	if(!IsNull(src))
+		*this = RawValue<Image>::Extract(src);
+}
+
+Image::Image(ImageBuffer& b)
+{
+	Set(b);
+}
+
+Image::~Image()
+{
+	if(data)
+		data->Release();
+}
+
+Image::Image(const Init& init)
+{
+	ASSERT(init.info[0] >= 1);
+	Size sz;
+	sz.cx = Peek32le(init.info + 1);
+	sz.cy = Peek32le(init.info + 5);
+	ImageBuffer b(sz);
+	int i = 0;
+	while(i < init.scan_count) {
+		UnpackRLE(b[i], (const byte *)init.scans[i], sz.cx);
+		i++;
+	}
+	while(i < sz.cy)
+		memset(b[i++], 0, sizeof(RGBA) * sz.cx);
+	b.SetHotSpot(Point(Peek32le(init.info + 9), Peek32le(init.info + 13)));
+	Set(b);
+}
+
+String Image::ToString() const
+{
+	return String("Image ").Cat() << GetSize();
+}
+
+Link<Image::Data>     Image::Data::ResData[1];
+int                   Image::Data::ResCount;
+
+Image::Data::Data(ImageBuffer& b)
+:	buffer(b)
+{
+	paintcount = 0;
+	paintonly = false;
+	refcount = 1;
+	INTERLOCKED {
+		static int64 gserial;
+		serial = ++gserial;
+	}
+	SysInit();
+}
+
+Image::Data::~Data()
+{
+	DrawLock __;
+	SysRelease();
+	Unlink();
+}
+
+void Image::Data::PaintOnlyShrink()
+{
+	if(paintonly) {
+		LTIMING("PaintOnlyShrink");
+		DrawLock __;
+		DropPixels___(buffer);
+		ResCount -= GetResCount();
+		Unlink();
+	}
+}
+
+Draw& ImageDraw::Alpha()
+{
+	if(!has_alpha) {
+		alpha.DrawRect(size, GrayColor(0));
+		has_alpha = true;
+	}
+	return alpha;
+}
+
+static void sMultiply(ImageBuffer& b, int (*op)(RGBA *t, const RGBA *s, int len))
+{
+	if(b.GetKind() != IMAGE_OPAQUE && b.GetKind() != IMAGE_EMPTY)
+		(*op)(~b, ~b, b.GetLength());
+}
+
+void Premultiply(ImageBuffer& b)
+{
+	sMultiply(b, Premultiply);
+}
+
+void Unmultiply(ImageBuffer& b)
+{
+	sMultiply(b, Unmultiply);
+}
+
+static Image sMultiply(const Image& img, int (*op)(RGBA *t, const RGBA *s, int len))
+{
+	int k = img.GetKind();
+	if(k == IMAGE_OPAQUE || k == IMAGE_EMPTY)
+		return img;
+	ImageBuffer ib(img.GetSize());
+	ib.SetHotSpot(img.GetHotSpot());
+	ib.Set2ndSpot(img.Get2ndSpot());
+	ib.SetKind(Premultiply(~ib, ~img, ib.GetLength()));
+	return ib;
+}
+
+Image Premultiply(const Image& img)
+{
+	return sMultiply(img, Premultiply);
+}
+
+Image Unmultiply(const Image& img)
+{
+	return sMultiply(img, Unmultiply);
+}
+
+void SetPaintOnly___(Image& m)
+{
+	if(m.data && m.data->refcount == 1)
+		m.data->paintonly = true;
+}
+
+void Iml::Init(int n)
+{
+	for(int i = 0; i < n; i++)
+		map.Add(name[i]);
+}
+
+void Iml::Reset()
+{
+	int n = map.GetCount();
+	map.Clear();
+	Init(n);
+}
+
+void Iml::Set(int i, const Image& img)
+{
+	map[i].image = img;
+	map[i].loaded = true;
+}
+
+static StaticCriticalSection sImgImlLock;
+
+Image Iml::Get(int i)
+{
+	IImage& m = map[i];
+	if(!m.loaded) {
+		INTERLOCKED_(sImgImlLock) {
+			if(data.GetCount()) {
+				int ii = 0;
+				for(;;) {
+					const Data& d = data[ii];
+					if(i < d.count) {
+						static const char   *cached_data;
+						static Vector<Image> cached;
+						if(cached_data != d.data) {
+							cached_data = d.data;
+							cached = UnpackImlData(String(d.data, d.len));
+							if(premultiply)
+								for(int i = 0; i < cached.GetCount(); i++)
+									cached[i] = Premultiply(cached[i]);
+						}
+						m.image = cached[i];
+						break;
+					}
+					i -= d.count;
+					ii++;
+				}
+			}
+			else
+				m.image = Premultiply(Image(img_init[i]));
+		}
+		m.loaded = true;
+	}
+	return m.image;
+}
+
+#ifdef _DEBUG
+int  Iml::GetBinSize() const
+{
+	int size = 0;
+	for(int i = 0; i < map.GetCount(); i++) {
+		const Image::Init& init = img_init[i];
+		size += (int)strlen(name[i]) + 1 + 24;
+		for(int q = 0; q < init.scan_count; q++)
+			size += (int)strlen(init.scans[q]);
+	}
+	return size;
+}
+#endif
+
+Iml::Iml(const Image::Init *img_init, const char **name, int n)
+:	img_init(img_init),
+	name(name)
+{
+#ifdef flagCHECKINIT
+	RLOG("Constructing iml " << *name);
+#endif
+	premultiply = true;
+	Init(n);
+}
+
+void Iml::AddData(const byte *_data, int len, int count)
+{
+	Data& d = data.Add();
+	d.data = (const char *)_data;
+	d.len = len;
+	d.count = count;
+	data.Shrink();
+}
+
+static StaticCriticalSection sImgMapLock;
+
+static VectorMap<String, Iml *>& sImgMap()
+{
+	static VectorMap<String, Iml *> x;
+	return x;
+}
+
+void Register(const char *imageclass, Iml& list)
+{
+#ifdef flagCHECKINIT
+	RLOG("Registering iml " << imageclass);
+#endif
+	INTERLOCKED_(sImgMapLock)
+		sImgMap().GetAdd(imageclass) = &list;
+}
+
+int GetImlCount()
+{
+	int q;
+	INTERLOCKED_(sImgMapLock)
+		q = sImgMap().GetCount();
+	return q;
+}
+
+Iml& GetIml(int i)
+{
+	return *sImgMap()[i];
+}
+
+void Iml::Enter()
+{
+	sImgMapLock.Enter();
+}
+
+void Iml::Leave()
+{
+	sImgMapLock.Leave();
+}
+
+String GetImlName(int i)
+{
+	String x;
+	INTERLOCKED_(sImgMapLock)
+		x = sImgMap().GetKey(i);
+	return x;
+}
+
+int FindIml(const char *name)
+{
+	int q;
+	INTERLOCKED_(sImgMapLock)
+		q = sImgMap().Find(name);
+	return q;
+}
+
+Image GetImlImage(const char *name)
+{
+	Image m;
+	const char *w = strchr(name, ':');
+	if(w) {
+		int q = FindIml(String(name, w));
+		if(q >= 0) {
+			INTERLOCKED_(sImgMapLock) {
+				Iml& iml = *sImgMap()[q];
+				while(*w == ':')
+					w++;
+				q = iml.Find(w);
+				if(q >= 0)
+					m = iml.Get(q);
+			}
+		}
+	}
+	return m;
+}
+
+void SetImlImage(const char *name, const Image& m)
+{
+	const char *w = strchr(name, ':');
+	if(w) {
+		int q = FindIml(String(name, w));
+		if(q >= 0) {
+			INTERLOCKED_(sImgMapLock) {
+				Iml& iml = *sImgMap()[q];
+				while(*w == ':')
+					w++;
+				q = iml.Find(w);
+				if(q >= 0)
+					iml.Set(q, m);
+			}
+		}
+	}
+}
+
+String StoreImageAsString(const Image& img)
+{
+	if(img.GetKind() == IMAGE_EMPTY)
+		return Null;
+	int type = img.GetKind() == IMAGE_OPAQUE ? 3 : 4;
+	StringStream ss;
+	ss.Put(type);
+	Size sz = img.GetSize();
+	ss.Put16le(sz.cx);
+	ss.Put16le(sz.cy);
+	Point p = img.GetHotSpot();
+	ss.Put16le(p.x);
+	ss.Put16le(p.y);
+	Size dots = img.GetDots();
+	ss.Put16le(dots.cx);
+	ss.Put16le(dots.cy);
+	const RGBA *s = img;
+	const RGBA *e = s + img.GetLength();
+	Buffer<byte> b(type * img.GetLength());
+	byte *t = b;
+	if(type == 3)
+		while(s < e) {
+			*t++ = s->r;
+			*t++ = s->g;
+			*t++ = s->b;
+			s++;
+		}
+	else
+		while(s < e) {
+			*t++ = s->r;
+			*t++ = s->g;
+			*t++ = s->b;
+			*t++ = s->a;
+			s++;
+		}
+	MemReadStream m(b, type * img.GetLength());
+	ZCompress(ss, m);
+	return ss;
+}
+
+Image  LoadImageFromString(const String& src)
+{
+	if(src.GetLength() < 13)
+		return Null;
+	StringStream ss(src);
+	int type = ss.Get();
+	Size sz;
+	sz.cx = ss.Get16le();
+	sz.cy = ss.Get16le();
+	if(sz.cx < 0 || sz.cy < 0)
+		return Null;
+	Point p;
+	p.x = ss.Get16le();
+	p.y = ss.Get16le();
+	if(p.x < 0 || p.y < 0)
+		return Null;
+	Size dots;
+	dots.cx = ss.Get16le();
+	dots.cy = ss.Get16le();
+	if(dots.cx < 0 || dots.cy < 0)
+		return Null;
+	StringStream out;
+	ZDecompress(out, ss);
+	String data = out;
+	if(data.GetLength() != type * sz.cx * sz.cy)
+		return Image();
+	ImageBuffer ib(sz);
+	ib.SetHotSpot(p);
+	ib.SetDots(dots);
+	RGBA *t = ib;
+	const RGBA *e = t + ib.GetLength();
+	const byte *s = data;
+	if(type == 3)
+		while(t < e) {
+			t->r = *s++;
+			t->g = *s++;
+			t->b = *s++;
+			t->a = 255;
+			t++;
+		}
+	else
+	if(type == 4)
+		while(t < e) {
+			t->r = *s++;
+			t->g = *s++;
+			t->b = *s++;
+			t->a = *s++;
+			t++;
+		}
+	else
+		return Image();
+	return ib;
+}
+
+Size GetImageStringSize(const String& src)
+{
+	if(src.GetLength() < 13)
+		return Size(0, 0);
+	StringStream ss(src);
+	ss.Get();
+	Size sz;
+	sz.cx = ss.Get16le();
+	sz.cy = ss.Get16le();
+	return sz;
+}
+
+Size GetImageStringDots(const String& src)
+{
+	if(src.GetLength() < 13)
+		return Size(0, 0);
+	StringStream ss(src);
+	ss.SeekCur(9);
+	Size sz;
+	sz.cx = ss.Get16le();
+	sz.cy = ss.Get16le();
+	return sz;
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/Draw/Image.h b/uppsrc/Draw/Image.h
new file mode 100644
index 000000000..2752e4ad0
--- /dev/null
+++ b/uppsrc/Draw/Image.h
@@ -0,0 +1,341 @@
+#define NEWIMAGE
+
+enum ImageKind {
+	IMAGE_UNKNOWN,
+	IMAGE_EMPTY,
+	IMAGE_ALPHA,
+	IMAGE_MASK,
+	IMAGE_OPAQUE,
+};
+
+inline bool operator==(const RGBA& a, const RGBA& b)
+{
+	return a.r == b.r && a.g == b.g && a.b == b.b && a.a == b.a;
+}
+
+inline bool operator!=(const RGBA& a, const RGBA& b)
+{
+	return !(a == b);
+}
+
+inline RGBA RGBAZero() { RGBA c; c.r = c.g = c.b = c.a = 0; return c; }
+
+void Fill(RGBA *t, const RGBA& src, int n);
+void FillColor(RGBA *t, const RGBA& src, int n);
+
+void Copy(RGBA *t, const RGBA *s, int n);
+
+int  Premultiply(RGBA *t, const RGBA *s, int len);
+int  Unmultiply(RGBA *t, const RGBA *s, int len);
+
+void AlphaBlend(RGBA *t, const RGBA *s, int len);
+void AlphaBlend(RGBA *t, const RGBA *s, int len, Color color);
+
+void AlphaBlendOpaque(RGBA *t, const RGBA *s, int len, Color color);
+void AlphaBlendOpaque(RGBA *t, const RGBA *s, int len);
+
+void AlphaBlendStraight(RGBA *b, const RGBA *f, int len);
+void AlphaBlendStraight(RGBA *b, const RGBA *f, int len, Color color);
+void AlphaBlendStraightOpaque(RGBA *t, const RGBA *s, int len);
+void AlphaBlendStraightOpaque(RGBA *t, const RGBA *s, int len, int alpha);
+
+int  GetChMaskPos32(dword mask);
+void AlphaBlendOverBgST(RGBA *b, RGBA bg, int len);
+
+const byte *UnpackRLE(RGBA *t, const byte *src, int len);
+String      PackRLE(const RGBA *s, int len);
+
+inline int  Grayscale(int r, int g, int b) { return (77 * r + 151 * g + 28 * b) >> 8; }
+inline int  Grayscale(const RGBA& c)       { return Grayscale(c.r, c.g, c.b); }
+inline byte Saturate255(int x)             { return byte(~(x >> 24) & (x | (-(x >> 8) >> 24)) & 0xff); }
+
+class  Image;
+class  ImageDraw;
+
+class ImageBuffer : NoCopy {
+	mutable int  kind;
+	Size         size;
+	Buffer<RGBA> pixels;
+	Point        hotspot;
+	Point        spot2;
+	Size         dots;
+
+	void         Set(Image& img);
+	void         DeepCopy(const ImageBuffer& img);
+
+	RGBA*        Line(int i) const      { ASSERT(i >= 0 && i < size.cy); return (RGBA *)~pixels + i * size.cx; }
+	friend void  DropPixels___(ImageBuffer& b) { b.pixels.Clear(); }
+
+	friend class Image;
+
+public:
+	void  SetKind(int k)                { kind = k; }
+	int   GetKind() const               { return kind; }
+	int   ScanKind() const;
+	int   GetScanKind() const           { return kind == IMAGE_UNKNOWN ? ScanKind() : kind; }
+
+	void  SetHotSpot(Point p)           { hotspot = p; }
+	Point GetHotSpot() const            { return hotspot; }
+
+	void  Set2ndSpot(Point p)           { spot2 = p; }
+	Point Get2ndSpot() const            { return spot2; }
+
+	void  SetDots(Size sz)              { dots = sz; }
+	Size  GetDots() const               { return dots; }
+
+	Size  GetSize() const               { return size; }
+	int   GetWidth() const              { return size.cx; }
+	int   GetHeight() const             { return size.cy; }
+	int   GetLength() const             { return size.cx * size.cy; }
+
+	RGBA *operator[](int i)             { return Line(i); }
+	const RGBA *operator[](int i) const { return Line(i); }
+	RGBA *operator~()                   { return pixels; }
+	operator RGBA*()                    { return pixels; }
+	const RGBA *operator~() const       { return pixels; }
+	operator const RGBA*() const        { return pixels; }
+
+	void  Create(int cx, int cy);
+	void  Create(Size sz)               { Create(sz.cx, sz.cy); }
+	bool  IsEmpty() const               { return (size.cx | size.cy) == 0; }
+	void  Clear()                       { Create(0, 0); }
+
+	void  operator=(Image& img);
+	void  operator=(ImageBuffer& img);
+
+	ImageBuffer()                       { Create(0, 0); }
+	ImageBuffer(int cx, int cy)         { Create(cx, cy); }
+	ImageBuffer(Size sz)                { Create(sz.cx, sz.cy); }
+	ImageBuffer(Image& img);
+	ImageBuffer(ImageDraw& w);
+	ImageBuffer(ImageBuffer& b);
+};
+
+void Premultiply(ImageBuffer& b);
+void Unmultiply(ImageBuffer& b);
+
+void SetSurface(Draw& w, int x, int y, int cx, int cy, const RGBA *pixels);
+
+class Image : public AssignValueTypeNo< Image, 150, Moveable<Image> > {
+private:
+	struct Data : Link<Data> {
+		Atomic refcount;
+		int64  serial;
+		int    paintcount;
+
+		static Link<Data>            ResData[1];
+		static int                   ResCount;
+
+		void   Retain()  { AtomicInc(refcount); }
+		void   Release() { if(AtomicDec(refcount) == 0) delete this; }
+
+#ifdef PLATFORM_WIN32
+		LPCSTR      cursor_cheat;
+		HBITMAP     hbmp;
+		HBITMAP     hmask;
+		HBITMAP     himg;
+		RGBA       *section;
+
+		void CreateHBMP(HDC dc, const RGBA *data);
+		int  GetResCount() const { return !!hbmp + !!hmask + !!himg; }
+#endif
+
+#ifdef PLATFORM_X11
+		int         cursor_cheat;
+		XPicture    picture;
+		XPicture    picture8;
+		int  GetResCount() const { return !!picture; }
+#endif
+
+		ImageBuffer buffer;
+		bool        paintonly;
+
+		void        SysInit();
+		void        SysRelease();
+		int         GetKind();
+		void        Paint(Draw& w, int x, int y, const Rect& src, Color c);
+		void        PaintOnlyShrink();
+
+		Data(ImageBuffer& b);
+		~Data();
+	};
+
+	Data *data;
+
+	static Link<Image::Data>     ResData[1];
+	static int                   ResCount;
+
+	void Set(ImageBuffer& b);
+
+	friend class ImageBuffer;
+	friend struct Data;
+
+	friend class Draw;
+
+	void PaintImage(Draw& w, int x, int y, const Rect& src, Color c) const;
+
+	friend void SetPaintOnly___(Image& m);
+
+#ifdef PLATFORM_WIN32
+#ifndef PLATFORM_WINCE
+	void         SetCursorCheat(LPCSTR id)   { data->cursor_cheat = id; }
+	LPCSTR       GetCursorCheat() const      { return data ? data->cursor_cheat : NULL; }
+	friend Image Win32IconCursor(LPCSTR id, int iconsize, bool cursor);
+	friend HICON IconWin32(const Image& img, bool cursor);
+#endif
+#endif
+
+#ifdef PLATFORM_X11
+	void         SetCursorCheat(int id)      { data->cursor_cheat = id; }
+	int          GetCursorCheat() const      { return data ? data->cursor_cheat : -1; }
+	friend       Cursor X11Cursor(const Image&);
+	friend       Image sX11Cursor__(int c);
+#endif
+
+public:
+	const RGBA*    operator~() const;
+	operator const RGBA*() const;
+	const RGBA* operator[](int i) const;
+
+	Size  GetSize() const;
+	int   GetWidth() const                    { return GetSize().cx; }
+	int   GetHeight() const                   { return GetSize().cy; }
+	int   GetLength() const;
+	Point GetHotSpot() const;
+	Point Get2ndSpot() const;
+	Size  GetDots() const;
+	int   GetKindNoScan() const;
+	int   GetKind() const;
+
+	int64 GetSerialId() const                 { return data ? data->serial : 0; }
+	bool  IsSame(const Image& img) const      { return GetSerialId() == img.GetSerialId(); }
+
+	bool   operator==(const Image& img) const;
+	bool   operator!=(const Image& img) const;
+	dword  GetHashValue() const;
+	String ToString() const;
+
+	void  Serialize(Stream& s);
+	void  Clear();
+
+	Image& operator=(const Image& img);
+	Image& operator=(ImageBuffer& img);
+
+	bool IsNullInstance() const         { Size sz = GetSize(); return (sz.cx|sz.cy) == 0; }
+
+	bool IsEmpty() const                { return IsNullInstance(); }
+	operator Value() const              { return RichValue<Image>(*this); }
+
+	Image()                             { data = NULL; }
+	Image(const Nuller&)                { data = NULL; }
+	Image(const Value& src);
+	Image(const Image& img);
+	Image(Image (*fn)());
+	Image(ImageBuffer& b);
+	~Image();
+
+
+	static Image Arrow();
+	static Image Wait();
+	static Image IBeam();
+	static Image No();
+	static Image SizeAll();
+	static Image SizeHorz();
+	static Image SizeVert();
+	static Image SizeTopLeft();
+	static Image SizeTop();
+	static Image SizeTopRight();
+	static Image SizeLeft();
+	static Image SizeRight();
+	static Image SizeBottomLeft();
+	static Image SizeBottom();
+	static Image SizeBottomRight();
+	static Image Cross();
+	static Image Hand();
+
+	// IML support ("private"), deprecated - legacy .iml
+	struct Init {
+		const char *const *scans;
+		int16 scan_count;
+		char info[24];
+	};
+	explicit Image(const Init& init);
+};
+
+Image Premultiply(const Image& img);
+Image Unmultiply(const Image& img);
+
+Vector<Image> UnpackImlData(const void *ptr, int len);
+Vector<Image> UnpackImlData(const String& d);
+
+class Iml {
+	struct IImage : Moveable<IImage> {
+		bool  loaded;
+		Image image;
+
+		IImage() { loaded = false; }
+	};
+	struct Data : Moveable<Data> {
+		const char *data;
+		int   len, count;
+	};
+	Vector<Data> data;
+	VectorMap<String, IImage> map;
+	const Image::Init *img_init;
+	const char **name;
+	bool  premultiply;
+
+	void  Init(int n);
+
+public:
+	void   Enter();
+	void   Leave();
+	void   Reset();
+	int    GetCount() const                  { return map.GetCount(); }
+	String GetId(int i)                      { return map.GetKey(i); }
+	Image  Get(int i);
+	int    Find(const String& s) const       { return map.Find(s); }
+	void   Set(int i, const Image& img);
+	void   Premultiplied()                   { premultiply = false; }
+
+#ifdef _DEBUG
+	int    GetBinSize() const;
+#endif
+
+	Iml(const Image::Init *img_init, const char **name, int n);//Deprecated - legacy .iml
+	void AddData(const byte *data, int len, int count);
+};
+
+void   Register(const char *imageclass, Iml& iml);
+
+int    GetImlCount();
+String GetImlName(int i);
+Iml&   GetIml(int i);
+int    FindIml(const char *name);
+Image  GetImlImage(const char *name);
+void   SetImlImage(const char *name, const Image& m);
+
+String StoreImageAsString(const Image& img);
+Image  LoadImageFromString(const String& s);
+Size   GetImageStringSize(const String& src);
+Size   GetImageStringDots(const String& src);
+
+#include "Raster.h"
+#include "ImageOp.h"
+
+#ifdef PLATFORM_WIN32
+#ifndef PLATFORM_WINCE
+
+Image Win32Icon(LPCSTR id, int iconsize = 0);
+Image Win32Icon(int id, int iconsize = 0);
+Image Win32Cursor(LPCSTR id);
+Image Win32Cursor(int id);
+HICON IconWin32(const Image& img, bool cursor = false);
+Image Win32DllIcon(const char *dll, int ii, bool large);
+
+#endif
+#endif
+
+#ifdef PLATFORM_X11
+Cursor X11Cursor(const Image& img);
+#endif
diff --git a/uppsrc/Draw/ImageBlit.cpp b/uppsrc/Draw/ImageBlit.cpp
new file mode 100644
index 000000000..43bb557c2
--- /dev/null
+++ b/uppsrc/Draw/ImageBlit.cpp
@@ -0,0 +1,380 @@
+#include "Draw.h"
+
+NAMESPACE_UPP
+
+void Fill(RGBA *t, const RGBA& src, int n)
+{
+	while(n--)
+		*t++ = src;
+}
+
+void FillColor(RGBA *t, const RGBA& src, int n)
+{
+	while(n--) {
+		t->r = src.r;
+		t->g = src.g;
+		t->b = src.b;
+		t++;
+	}
+}
+
+void Copy(RGBA *t, const RGBA *s, int n)
+{
+	while(n--)
+		*t++ = *s++;
+}
+
+const byte *UnpackRLE(RGBA *t, const byte *s, int len)
+{
+	RGBA *e = t + len;
+	while(t < e)
+		if(*s & 0x80) {
+			if(*s == 0x80)
+				break;
+			int count = min<int>((int)(*s & 0x3F), (int)(e - t));
+			RGBA h;
+			if(*s++ & 0x40)
+				Zero(h);
+			else {
+				h.b = s[0];
+				h.g = s[1];
+				h.r = s[2];
+				h.a = 255;
+				s += 3;
+			}
+			count = min<int>(count, (int)(e - t));
+			memsetex(t, &h, sizeof(RGBA), count);
+			t += count;
+		}
+		else {
+			if(*s == 0)
+				break;
+			int count = *s++;
+			while(count-- && t < e) {
+				RGBA h;
+				h.b = s[0];
+				h.g = s[1];
+				h.r = s[2];
+				h.a = 255;
+				*t++ = h;
+				s += 3;
+			}
+		}
+	while(t < e)
+		Zero(*t++);
+	return s;
+}
+
+String PackRLE(const RGBA *s, int len)
+{
+	StringBuffer r;
+	const RGBA *e = s + len;
+	while(s < e) {
+		const RGBA *q = s;
+		if(s->a == 0) {
+			s++;
+			while(s < e && s->a == 0 && s - q < 0x3f)
+				s++;
+			r.Cat((0x80|0x40) + (int)(s - q));
+		}
+		else
+		if(s + 1 < e && s[0] == s[1]) {
+			s++;
+			while(s + 1 < e && s[0] == s[1] && s - q < 0x3e)
+				s++;
+			s++;
+			r.Cat(0x80 + (int)(s - q));
+			r.Cat(q->b);
+			r.Cat(q->g);
+			r.Cat(q->r);
+		}
+		else {
+			s++;
+			while(s + 1 < e && s->a && s[0] != s[1] && s - q < 0x3f)
+				s++;
+			r.Cat((int)(s - q));
+			while(q < s) {
+				r.Cat(q->b);
+				r.Cat(q->g);
+				r.Cat(q->r);
+				q++;
+			}
+		}
+	}
+	return r;
+}
+
+int Premultiply(RGBA *t, const RGBA *s, int len)
+{
+	const RGBA *e = s + len;
+	while(s < e) {
+		if(s->a != 255) {
+			while(s < e) {
+				byte a = s->a;
+				if(s->a != 0 || s->a != 255) {
+					while(s < e) {
+						int alpha = s->a + (s->a >> 7);
+						t->r = alpha * (s->r) >> 8;
+						t->g = alpha * (s->g) >> 8;
+						t->b = alpha * (s->b) >> 8;
+						t->a = s->a;
+						s++;
+						t++;
+					}
+					return IMAGE_ALPHA;
+				}
+				t->r = a & s->r;
+				t->g = a & s->g;
+				t->b = a & s->b;
+				t->a = s->a;
+				s++;
+				t++;
+			}
+			return IMAGE_MASK;
+		}
+		*t++ = *s++;
+	}
+	return IMAGE_OPAQUE;
+}
+
+int um_table__[256];
+
+void sInitUmTable__()
+{
+	ONCELOCK {
+		for(int i = 1; i < 256; i++)
+			um_table__[i] = 65536 / i;
+	}
+}
+
+int Unmultiply(RGBA *t, const RGBA *s, int len)
+{
+	sInitUmTable__();
+	const RGBA *e = s + len;
+	while(s < e) {
+		if(s->a != 255) {
+			while(s < e) {
+				byte a = s->a;
+				if(s->a != 0 || s->a != 255) {
+					while(s < e) {
+						int alpha = um_table__[s->a];
+						t->r = (alpha * s->r) >> 8;
+						t->g = (alpha * s->g) >> 8;
+						t->b = (alpha * s->b) >> 8;
+						t->a = s->a;
+						s++;
+						t++;
+					}
+					return IMAGE_ALPHA;
+				}
+				t->r = a & s->r;
+				t->g = a & s->g;
+				t->b = a & s->b;
+				t->a = s->a;
+				s++;
+				t++;
+			}
+			return IMAGE_MASK;
+		}
+		*t++ = *s++;
+	}
+	return IMAGE_OPAQUE;
+}
+
+void AlphaBlend(RGBA *t, const RGBA *s, int len)
+{
+	const RGBA *e = s + len;
+	while(s < e) {
+		int alpha = 256 - (s->a + (s->a >> 7));
+		t->r = s->r + (alpha * t->r >> 8);
+		t->g = s->g + (alpha * t->g >> 8);
+		t->b = s->b + (alpha * t->b >> 8);
+		t->a = s->a + (alpha * t->a >> 8);
+		s++;
+		t++;
+	}
+}
+
+void AlphaBlendOpaque(RGBA *t, const RGBA *s, int len)
+{
+	const RGBA *e = s + len;
+	while(s < e) {
+		int alpha = 256 - (s->a + (s->a >> 7));
+		t->r = s->r + (alpha * t->r >> 8);
+		t->g = s->g + (alpha * t->g >> 8);
+		t->b = s->b + (alpha * t->b >> 8);
+		t->a = 255;
+		s++;
+		t++;
+	}
+}
+
+void AlphaBlend(RGBA *t, const RGBA *s, int len, Color color)
+{
+	const RGBA *e = s + len;
+	int r = color.GetR();
+	int g = color.GetG();
+	int b = color.GetB();
+	while(s < e) {
+		int alpha = s->a + (s->a >> 7);
+		t->r += alpha * (r - t->r) >> 8;
+		t->g += alpha * (g - t->g) >> 8;
+		t->b += alpha * (b - t->b) >> 8;
+		t->a = s->a + ((256 - alpha) * t->a >> 8);
+		s++;
+		t++;
+	}
+}
+
+void AlphaBlendOpaque(RGBA *t, const RGBA *s, int len, Color color)
+{
+	const RGBA *e = s + len;
+	int r = color.GetR();
+	int g = color.GetG();
+	int b = color.GetB();
+	while(s < e) {
+		int alpha = s->a + (s->a >> 7);
+		t->r += alpha * (r - t->r) >> 8;
+		t->g += alpha * (g - t->g) >> 8;
+		t->b += alpha * (b - t->b) >> 8;
+		t->a = 255;
+		s++;
+		t++;
+	}
+}
+
+void AlphaBlendStraightOpaque(RGBA *t, const RGBA *s, int len)
+{
+	const RGBA *e = s + len;
+	while(s < e) {
+		int alpha = s->a + (s->a >> 7);
+		t->r += alpha * (s->r - t->r) >> 8;
+		t->g += alpha * (s->g - t->g) >> 8;
+		t->b += alpha * (s->b - t->b) >> 8;
+		t->a = 255;
+		s++;
+		t++;
+	}
+}
+
+struct sBlends {
+	int16 m;
+	byte  a;
+};
+
+sBlends *sblends;
+
+void sOnceInitBlends()
+{
+	ONCELOCK {
+		sblends = (sBlends *)MemoryAllocPermanent(256 * 256 * sizeof(sBlends));
+		for(int Fa = 0; Fa <= 255; Fa++)
+			for(int Ba = 0; Ba <= 255; Ba++) {
+				double A = (Fa / 255.0 + Ba / 255.0 - Fa / 255.0 * Ba / 255.0);
+				sblends[(Ba << 8) + Fa].a = minmax((int)(255 * A + 0.5), 0, 255);
+				sblends[(Ba << 8) + Fa].m = A > 0.001 ? int(256 * (Fa / 255.0) / A + 0.5) : 0;
+			}
+	}
+}
+
+inline void sInitBlends()
+{
+	if(!sblends)
+		sOnceInitBlends();
+}
+
+void AlphaBlendStraight(RGBA *b, const RGBA *f, int len)
+{
+	sInitBlends();
+	const RGBA *e = f + len;
+	while(f < e) {
+		sBlends& x = sblends[(b->a << 8) + f->a];
+		int m = x.m;
+		b->a = x.a;
+		b->r += m * (f->r - b->r) >> 8;
+		b->g += m * (f->g - b->g) >> 8;
+		b->b += m * (f->b - b->b) >> 8;
+		b++;
+		f++;
+	}
+}
+
+void AlphaBlendOverBgStraight(RGBA *b, RGBA bg, int len)
+{
+	sInitBlends();
+	const RGBA *e = b + len;
+	while(b < e) {
+		sBlends& x = sblends[(bg.a << 8) + b->a];
+		int m = x.m;
+		b->a = x.a;
+		b->r = bg.r + (m * (b->r - bg.r) >> 8);
+		b->g = bg.g + (m * (b->g - bg.g) >> 8);
+		b->b = bg.b + (m * (b->b - bg.b) >> 8);
+		b++;
+	}
+}
+
+void AlphaBlendStraight(RGBA *b, const RGBA *f, int len, Color color)
+{
+	sInitBlends();
+	const RGBA *e = f + len;
+	int cr = color.GetR();
+	int cg = color.GetG();
+	int cb = color.GetB();
+	while(f < e) {
+		sBlends& x = sblends[(b->a << 8) + f->a];
+		int m = x.m;
+		b->a = x.a;
+		b->r += m * (cr - b->r) >> 8;
+		b->g += m * (cg - b->g) >> 8;
+		b->b += m * (cb - b->b) >> 8;
+		b++;
+		f++;
+	}
+}
+
+int GetChMaskPos32(dword mask)
+{
+	if(mask == 0xff000000)
+		return 3;
+	if(mask == 0xff0000)
+		return 2;
+	if(mask == 0xff00)
+		return 1;
+	return 0;
+}
+
+Vector<Image> UnpackImlData(const void *ptr, int len)
+{
+	Vector<Image> img;
+	String data = ZDecompress(ptr, len);
+	const char *s = data;
+	while(s + 6 * 2 + 1 <= data.End()) {
+		ImageBuffer ib(Peek16le(s + 1), Peek16le(s + 3));
+		ib.SetHotSpot(Point(Peek16le(s + 5), Peek16le(s + 7)));
+		ib.Set2ndSpot(Point(Peek16le(s + 9), Peek16le(s + 11)));
+		s += 13;
+		int len = ib.GetLength();
+		RGBA *t = ib;
+		const RGBA *e = t + len;
+		if(s + 4 * len > data.End())
+			break;
+		while(t < e) {
+			t->a = s[3];
+			t->r = s[0];
+			t->g = s[1];
+			t->b = s[2];
+			s += 4;
+			t++;
+		}
+		img.Add() = ib;
+	}
+	return img;
+}
+
+Vector<Image> UnpackImlData(const String& d)
+{
+	return UnpackImlData(~d, d.GetLength());
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/Draw/ImageChOp.cpp b/uppsrc/Draw/ImageChOp.cpp
new file mode 100644
index 000000000..1646196f9
--- /dev/null
+++ b/uppsrc/Draw/ImageChOp.cpp
@@ -0,0 +1,368 @@
+#include "Draw.h"
+
+NAMESPACE_UPP
+
+int Diff(RGBA a, RGBA b)
+{
+	return max(abs(a.a - b.a), max(abs(a.r - b.r), max(abs(a.b - b.b), abs(a.g - b.g))));
+}
+
+struct InterPoint {
+	ImageBuffer &b;
+	Rect         rc;
+	int          sr, sg, sb;
+	int          sn, in;
+
+	InterPoint(ImageBuffer& b) : b(b) {
+		sr = sg = sb = sn = in = 0;
+	}
+	void Add(int x, int y);
+};
+
+void InterPoint::Add(int y, int x) {
+	if(rc.Contains(x, y)) {
+		RGBA ba = b[y][x];
+		if(ba.a == 0)
+			return;
+		in++;
+		sn++;
+		sr += ba.r;
+		sg += ba.g;
+		sb += ba.b;
+	}
+	else
+		in++;
+}
+
+void Interpolate(ImageBuffer& b, Vector< Vector<bool> >& map, const Rect& rc)
+{
+	Unmultiply(b);
+	int todo;
+	do {
+		todo = 0;
+		for(int x = rc.left; x < rc.right; x++)
+			for(int y = rc.top; y < rc.bottom; y++) {
+				RGBA& p = b[y][x];
+				if(map[y][x]) {
+					map[y][x] = 0;
+					InterPoint ip(b);
+					ip.rc = rc;
+					ip.Add(y - 1, x - 1);
+					ip.Add(y - 1, x);
+					ip.Add(y - 1, x + 1);
+					ip.Add(y, x - 1);
+					ip.Add(y, x + 1);
+					ip.Add(y + 1, x - 1);
+					ip.Add(y + 1, x);
+					ip.Add(y + 1, x + 1);
+					if(ip.in >= 2) {
+						if(ip.sn) {
+							p.r = ip.sr / ip.sn;
+							p.g = ip.sg / ip.sn;
+							p.b = ip.sb / ip.sn;
+						}
+						else
+							p = SColorFace();
+						p.a = 255;
+					}
+					else
+						todo++;
+				}
+			}
+	}
+	while(todo);
+	Premultiply(b);
+}
+
+struct ButtonDecomposer {
+	Image src;
+	Image dst;
+	int   aa[8];
+	int   maxdiff;
+	RGBA  color;
+	int   gdiff;
+	int   gcount;
+
+	RGBA GetC(int p) {
+		Size sz = src.GetSize();
+		int xx[3];
+		int yy[3];
+		yy[0] = xx[0] = aa[p];
+		xx[1] = sz.cx - aa[p] - 1;
+		xx[2] = sz.cx / 2;
+		yy[1] = sz.cy - aa[p] - 1;
+		yy[2] = sz.cy / 2;
+		return src[xx[p / 3]][xx[p % 3]];
+	}
+
+	void Do() {
+		Size sz = src.GetSize();
+		int qa = min(4, min(sz.cy / 4, sz.cx / 4));
+		if(qa == 0) {
+			dst = src;
+			return;
+		}
+		int a = 0;
+		for(int p = 0; p < 8; p++) {
+			aa[p] = qa;
+			Color c = GetC(p);
+			while(aa[p] > 0) {
+				Color c1 = GetC(p);
+				if(Diff(c, c1) > 30)
+					break;
+				c = c1;
+				aa[p]--;
+			}
+			if(aa[p] > a)
+				a = aa[p];
+		}
+		if(a < min(sz.cx / 3, sz.cy / 3))
+			a++;
+		dst = src;
+		ImageBuffer b(dst);
+		color = SColorText();
+		maxdiff = gdiff = gcount = 0;
+		Vector< Vector<bool> > map;
+		for(int y = a; y < sz.cy - a; y++) {
+			map.At(y).SetCount(sz.cx, false);
+			RGBA *p = b[y];
+			int x = a;
+			Color c = p[x];
+			while(x < sz.cx - a) {
+				if(Diff(p[x], c) > 30)
+					break;
+				c = p[x++];
+			}
+			int xx = sz.cx - a;
+			while(xx > x) {
+				if(Diff(p[xx - 1], c) > 30)
+					break;
+				c = p[--xx];
+			}
+			for(int q = x; q < xx; q++) {
+				int d = Diff(p[q], c);
+				gcount++;
+				gdiff += d;
+				if(d >= maxdiff) {
+					maxdiff = d;
+					color = p[q];
+				}
+			}
+			Fill(p + x, RGBAZero(), xx - x);
+			map[y].Set(x, true, xx - x);
+		}
+		Interpolate(b, map, Rect(a, a, sz.cx - a, sz.cy - a));
+		if(a < 2) a = 2;
+		b.SetHotSpot(Point(a, a));
+		dst = b;
+	}
+};
+
+Image Unglyph(const Image& m, Color& c, double& gfactor)
+{
+	ButtonDecomposer b;
+	b.src = Unmultiply(m);
+	b.Do();
+	c = b.color;
+	gfactor = (double)b.gdiff / b.gcount;
+	return Premultiply(b.dst);
+}
+
+Image Unglyph(const Image& m, Color& c)
+{
+	double dummy;
+	return Unglyph(m, c, dummy);
+}
+
+Image Unglyph(const Image& m)
+{
+	Color dummy;
+	return Unglyph(m, dummy);
+}
+
+Image VertBlend(Image img1, Image img2, int y0, int y1)
+{
+	Size sz = img1.GetSize();
+	Size sz2 = img2.GetSize();
+	sz.cx = min(sz.cx, sz2.cx);
+	sz.cy = min(sz.cy, sz2.cy);
+	ImageBuffer b(sz);
+	for(int y = 0; y < sz.cy; y++)
+		if(y >= y1)
+			memcpy(b[y], img2[y], sz.cx * sizeof(RGBA));
+		else
+		if(y >= y0 && y1 > y0) {
+			int alpha = 256 * (y - y0) / (y1 - y0);
+			RGBA *t = b[y];
+			const RGBA *s1 = img1[y];
+			const RGBA *s2 = img2[y];
+			const RGBA *e = s1 + sz.cx;
+			while(s1 < e) {
+				t->r = s1->r + ((alpha * (s2->r - s1->r)) >> 8);
+				t->g = s1->g + ((alpha * (s2->g - s1->g)) >> 8);
+				t->b = s1->b + ((alpha * (s2->b - s1->b)) >> 8);
+				t->a = s1->a + ((alpha * (s2->a - s1->a)) >> 8);
+				s1++;
+				s2++;
+				t++;
+			}
+		}
+		else
+			memcpy(b[y], img1[y], sz.cx * sizeof(RGBA));
+	b.SetHotSpot(img1.GetHotSpot());
+	b.Set2ndSpot(img1.Get2ndSpot());
+	return b;
+}
+
+Image HorzBlend(Image img1, Image img2, int x0, int x1)
+{
+	Image m = RotateAntiClockwise(VertBlend(RotateClockwise(img1), RotateClockwise(img2), x0, x1));
+	ImageBuffer b(m);
+	b.SetHotSpot(img1.GetHotSpot());
+	b.Set2ndSpot(img1.Get2ndSpot());
+	return b;
+}
+
+Image HorzSymm(Image src) {
+	ImageBuffer b(src);
+	Size sz = b.GetSize();
+	for(int y = 0; y < sz.cy; y++) {
+		RGBA *l = b[y];
+		for(int x = 0; x < sz.cx / 2; x++)
+			l[sz.cx - x - 1] = l[x];
+	}
+	b.SetHotSpot(src.GetHotSpot());
+	b.Set2ndSpot(src.Get2ndSpot());
+	return b;
+}
+
+bool EqLine(const Image& m, int l1, int l2, int x, int width)
+{
+	return !memcmp(m[l1] + x, m[l2] + x, width * sizeof(RGBA));
+}
+
+bool EqLine(const Image& m, int l1, int l2)
+{
+	return EqLine(m, l1, l2, 0, m.GetWidth());
+}
+
+bool EqColumn(const Image& m, int c1, int c2, int y, int height)
+{
+	int cx = m.GetWidth();
+	const RGBA *a = m[y] + c1;
+	const RGBA *b = m[y] + c2;
+	for(int w = 0; w < height; w++) {
+		if(*a != *b)
+			return false;
+		a += cx;
+		b += cx;
+	}
+	return true;
+}
+
+bool EqColumn(const Image& m, int c1, int c2)
+{
+	return EqColumn(m, c1, c2, 0, m.GetHeight());
+}
+
+int ClassifyContent(const Image& m, const Rect& rect)
+{
+	if(IsNull(rect))
+		return 0;
+	bool vdup = true;
+	for(int q = rect.top + 1; q < rect.bottom; q++)
+		if(!EqLine(m, q, rect.top, rect.left, rect.GetWidth())) {
+			vdup = false;
+			break;
+		}
+	for(int q = rect.left + 1; q < rect.right; q++)
+		if(!EqColumn(m, rect.left, q, rect.top, rect.GetHeight()))
+			return vdup;
+	return 2 + vdup;
+}
+
+Image RecreateAlpha(const Image& overwhite, const Image& overblack)
+{
+	Size sz = overwhite.GetSize();
+	ASSERT(overblack.GetSize() == sz);
+	ImageBuffer r(sz);
+	const RGBA *ws = overwhite;
+	const RGBA *bs = overblack;
+	RGBA *t = r;
+	RGBA *e = t + r.GetLength();
+	while(t < e) {
+		t->a = bs->r - ws->r + 255;
+		if(t->a) {
+			t->r = bs->r * 255 / t->a;
+			t->g = bs->g * 255 / t->a;
+			t->b = bs->b * 255 / t->a;
+		}
+		else
+			t->r = t->g = t->b = 0;
+		t++;
+		bs++;
+		ws++;
+	}
+	Premultiply(r);
+	return r;
+}
+
+int ImageMargin(const Image& _m, int p, int dist)
+{
+	Image m = Unmultiply(_m);
+	Color c = m[p][p];
+	int d;
+	Size sz = m.GetSize();
+	for(d = p; d >= 0; d--)
+		if(Diff(m[d][d], c) > dist || Diff(m[sz.cx - d - 1][sz.cy - d - 1], c) > dist)
+			break;
+	return d + 1;
+}
+
+ChPartMaker::ChPartMaker(const Image& m)
+{
+	image = m;
+	border = SColorShadow();
+	bg = Null;
+	ResetShape();
+}
+
+void ChPartMaker::ResetShape()
+{
+	t = b = l = r = true;
+	tl = tr = bl = br = 0;
+}
+
+Image ChPartMaker::Make() const
+{
+	Size sz = image.GetSize();
+	ASSERT(sz.cx >= 6 && sz.cy >= 6);
+	Image h = image;
+	ImageBuffer ib(h);
+	for(int x = 0; x < sz.cx; x++) {
+		if(t)
+			ib[0][x] = x >= tl && x < sz.cx - tr ? border : bg;
+		if(b)
+			ib[sz.cy - 1][x] = x >= bl && x < sz.cx - br ? border : bg;
+	}
+	for(int y = 0; y < sz.cy; y++) {
+		if(l)
+			ib[y][0] = y >= tl && y < sz.cy - bl ? border : bg;
+		if(r)
+			ib[y][sz.cx - 1] = y >= tr && y < sz.cy - br ? border : bg;
+	}
+	if(tl == 2)
+		ib[1][1] = border;
+	if(tr == 2)
+		ib[1][sz.cx - 2] = border;
+	if(bl == 2)
+		ib[sz.cy - 2][1] = border;
+	if(br == 2)
+		ib[sz.cy - 2][sz.cx - 2] = border;
+	int q = max(max(tl, tr), max(br, bl));
+	ib.SetHotSpot(Point(q, q));
+	ib.Set2ndSpot(Point(sz.cx - q - 1, sz.cy - q - 1));
+	return ib;
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/Draw/ImageDraw.h b/uppsrc/Draw/ImageDraw.h
new file mode 100644
index 000000000..a5e8ac628
--- /dev/null
+++ b/uppsrc/Draw/ImageDraw.h
@@ -0,0 +1,38 @@
+class ImageDraw : public Draw, NoCopy {
+	Size    size;
+
+#ifdef PLATFORM_WIN32
+	struct  Section {
+		HDC     dc;
+		HBITMAP hbmp, hbmpOld;
+		RGBA   *pixels;
+
+		void Init(int cx, int cy);
+		~Section();
+	};
+
+	Section rgb;
+	Section a;
+	Draw    alpha;
+#endif
+
+#ifdef PLATFORM_X11
+	Draw    alpha;
+#endif
+
+	bool    has_alpha;
+
+	void Init();
+	Image Get(bool pm) const;
+
+public:
+	Draw& Alpha();                       
+
+	operator Image() const;
+	
+	Image GetStraight() const;
+	
+	ImageDraw(Size sz);
+	ImageDraw(int cx, int cy);
+	~ImageDraw();
+};
diff --git a/uppsrc/Draw/ImageOp.cpp b/uppsrc/Draw/ImageOp.cpp
new file mode 100644
index 000000000..c15bf40da
--- /dev/null
+++ b/uppsrc/Draw/ImageOp.cpp
@@ -0,0 +1,665 @@
+#include "Draw.h"
+
+NAMESPACE_UPP
+
+Image WithHotSpots(const Image& m, int x1, int y1, int x2, int y2)
+{
+	Image h = m;
+	ImageBuffer b(h);
+	b.SetHotSpot(Point(x1, y1));
+	b.Set2ndSpot(Point(x2, y2));
+	return b;
+}
+
+Image WithHotSpot(const Image& m, int x1, int y1)
+{
+	Image h = m;
+	ImageBuffer b(h);
+	b.SetHotSpot(Point(x1, y1));
+	return b;
+}
+
+Image CreateImage(Size sz, Color color)
+{
+	ImageBuffer ib(sz);
+	RGBA rgba = color;
+	memsetex(ib, &rgba, sizeof(RGBA), ib.GetLength());
+	return ib;
+}
+
+Size DstSrc(ImageBuffer& dest, Point& p, const Image& src, Rect& sr)
+{
+	if(p.x < 0) {
+		sr.left += -p.x;
+		p.x = 0;
+	}
+	if(p.y < 0) {
+		sr.top += -p.y;
+		p.y = 0;
+	}
+	sr = sr & src.GetSize();
+	Size sz = dest.GetSize() - p;
+	sz.cx = min(sz.cx, sr.GetWidth());
+	sz.cy = min(sz.cy, sr.GetHeight());
+	return sz;
+}
+
+void DstSrcOp(ImageBuffer& dest, Point p, const Image& src, const Rect& srect,
+              void (*op)(RGBA *t, const RGBA *s, int n))
+{
+	Rect sr = srect;
+	Size sz = DstSrc(dest, p, src, sr);
+	if(sz.cx > 0)
+		while(--sz.cy >= 0)
+			(*op)(dest[p.y++] + p.x, src[sr.top++] + sr.left, sz.cx);
+}
+
+void Copy(ImageBuffer& dest, Point p, const Image& src, const Rect& srect)
+{
+	DstSrcOp(dest, p, src, srect, Copy);
+}
+
+void Over(ImageBuffer& dest, Point p, const Image& src, const Rect& srect)
+{
+	DstSrcOp(dest, p, src, srect, AlphaBlend);
+}
+
+void OverStraightOpaque(ImageBuffer& dest, Point p, const Image& src, const Rect& srect)
+{
+	DstSrcOp(dest, p, src, srect, AlphaBlendStraightOpaque);
+}
+
+void  Copy(Image& dest, Point p, const Image& _src, const Rect& srect)
+{
+	Image src = _src;
+	ImageBuffer b(dest);
+	Copy(b, p, src, srect);
+	dest = b;
+}
+
+void  Over(Image& dest, Point p, const Image& _src, const Rect& srect)
+{
+	Image src = _src;
+	ImageBuffer b(dest);
+	Over(b, p, src, srect);
+	dest = b;
+}
+
+void  OverStraightOpaque(Image& dest, Point p, const Image& _src, const Rect& srect)
+{
+	Image src = _src;
+	ImageBuffer b(dest);
+	OverStraightOpaque(b, p, src, srect);
+	dest = b;
+}
+
+void Crop(RasterEncoder& tgt, Raster& img, const Rect& rc)
+{
+	Rect r = rc & img.GetSize();
+	tgt.Create(r.Size(), img);
+	for(int y = r.top; y < r.bottom; y++)
+		tgt.WriteLine(~img[y] + r.left);
+}
+
+Image Crop(const Image& img, const Rect& rc)
+{
+	if(rc.left == 0 && rc.top == 0 && rc.Size() == img.GetSize())
+		return img;
+	if((rc & img.GetSize()).IsEmpty())
+		return Image();
+	ImageRaster  src(img);
+	ImageEncoder tgt;
+	Crop(tgt, src, rc);
+	return tgt;
+}
+
+Image Crop(const Image& img, int x, int y, int cx, int cy)
+{
+	return Crop(img, RectC(x, y, cx, cy));
+}
+
+Image ColorMask(const Image& src, Color key)
+{
+	ImageBuffer ib(src.GetSize());
+	const RGBA *s = src;
+	const RGBA *e = src + src.GetLength();
+	RGBA *t = ~ib;
+	byte kr = key.GetR();
+	byte kg = key.GetG();
+	byte kb = key.GetB();
+	while(s < e) {
+		if(s->r == kr && s->g == kg && s->b == kb)
+			*t++ = RGBAZero();
+		else
+			*t++ = *s;
+		s++;
+	}
+	return ib;
+}
+
+void CanvasSize(RasterEncoder& tgt, Raster& img, int cx, int cy)
+{
+	tgt.Create(cx, cy, img);
+	int ccx = min(img.GetWidth(), cx);
+	int ccy = min(img.GetHeight(), cy);
+	for(int y = 0; y < ccy; y++) {
+		memcpy(~tgt, img[y], ccx * sizeof(RGBA));
+		memset(~tgt + ccx, 0, (cx - ccx) * sizeof(RGBA));
+		tgt.WriteLine();
+	}
+	for(int y = cy - ccy; --y >= 0;) {
+		memset(~tgt, 0, cx * sizeof(RGBA));
+		tgt.WriteLine();
+	}
+}
+
+Image CanvasSize(const Image& img, int cx, int cy)
+{
+	ImageRaster  src(img);
+	ImageEncoder tgt;
+	CanvasSize(tgt, src, cx, cy);
+	return tgt;
+}
+
+Image AssignAlpha(const Image& img, const Image& alpha)
+{
+	Size sz = Size(min(img.GetWidth(), alpha.GetWidth()),
+	               min(img.GetHeight(), alpha.GetHeight()));
+	if(sz.cx == 0 || sz.cy == 0)
+		return Image();
+	ImageBuffer ib(sz);
+	for(int y = 0; y < sz.cy; y++) {
+		const RGBA *s = img[y];
+		const RGBA *e = s + sz.cx;
+		const RGBA *a = alpha[y];
+		RGBA *t = ib[y];
+		while(s < e) {
+			*t = *s++;
+			(t++)->a = (a++)->a;
+		}
+	}
+	return ib;
+}
+
+int   EqualightCh(int c, int l, int h)
+{
+	return Saturate255((c - l) * 255 / (h - l) + l);
+}
+
+Image Equalight(const Image& img, int thold)
+{
+	int histogram[256];
+	ZeroArray(histogram);
+	const RGBA *s = ~img;
+	const RGBA *e = s + img.GetLength();
+	while(s < e) {
+		histogram[Grayscale(*s)]++;
+		s++;
+	}
+	int n = (thold * img.GetLength()) >> 8;
+	int h = 255;
+	int l = 0;
+	while(l < h) {
+		if(n < 0)
+			break;
+		n -= histogram[l++];
+		if(n < 0)
+			break;
+		n -= histogram[h--];
+	}
+	if(l >= h)
+		return img;
+	ImageBuffer w(img.GetSize());
+	RGBA *t = w;
+	s = ~img;
+	while(s < e) {
+		t->r = EqualightCh(s->r, l, h);
+		t->g = EqualightCh(s->g, l, h);
+		t->b = EqualightCh(s->b, l, h);
+		t->a = s->a;
+		s++;
+		t++;
+	}
+	return w;
+}
+
+Image Grayscale(const Image& img)
+{
+	const RGBA *s = ~img;
+	const RGBA *e = s + img.GetLength();
+	ImageBuffer w(img.GetSize());
+	RGBA *t = w;
+	while(s < e) {
+		int q = Grayscale(*s);
+		t->r = q;
+		t->g = q;
+		t->b = q;
+		t->a = s->a;
+		t++;
+		s++;
+	}
+	return w;
+}
+
+Image Grayscale(const Image& img, int amount)
+{
+	const RGBA *s = ~img;
+	const RGBA *e = s + img.GetLength();
+	ImageBuffer w(img.GetSize());
+	RGBA *t = w;
+	int na = 256 - amount;
+	while(s < e) {
+		int q = Grayscale(*s);
+		t->r = Saturate255((amount * q + na * s->r) >> 8);
+		t->g = Saturate255((amount * q + na * s->g) >> 8);
+		t->b = Saturate255((amount * q + na * s->b) >> 8);
+		t->a = s->a;
+		t++;
+		s++;
+	}
+	return w;
+}
+
+Image Colorize(const Image& img, Color color, int alpha)
+{
+	const RGBA *s = ~img;
+	const RGBA *e = s + img.GetLength();
+	ImageBuffer w(img.GetSize());
+	Unmultiply(w);
+	RGBA *t = w;
+	byte r = color.GetR();
+	byte g = color.GetG();
+	byte b = color.GetB();
+	alpha = alpha + (alpha >> 7);
+	while(s < e) {
+		int ga = Grayscale(*s);
+		ga = ga + (ga >> 7);
+		t->r = (alpha * (((ga * r) >> 8) - s->r) >> 8) + s->r;
+		t->g = (alpha * (((ga * g) >> 8) - s->g) >> 8) + s->g;
+		t->b = (alpha * (((ga * b) >> 8) - s->b) >> 8) + s->b;
+		t->a = s->a;
+		t++;
+		s++;
+	}
+	Premultiply(w);
+	return w;
+}
+
+inline
+byte ContrastCh(int amount, int ch)
+{
+	return Saturate255(128 + (amount * (ch - 128) >> 8));
+}
+
+Image Contrast(const Image& img, int amount)
+{
+	const RGBA *s = ~img;
+	const RGBA *e = s + img.GetLength();
+	ImageBuffer w(img.GetSize());
+	Unmultiply(w);
+	RGBA *t = w;
+	while(s < e) {
+		t->r = ContrastCh(amount, s->r);
+		t->g = ContrastCh(amount, s->g);
+		t->b = ContrastCh(amount, s->b);
+		t->a = s->a;
+		t++;
+		s++;
+	}
+	Premultiply(w);
+	return w;
+}
+
+void sLine(RGBA *t, int cx, const RasterLine l[3], ImageFilter9& filter)
+{
+	RGBA h[3][3];
+	const RGBA *x[3];
+	x[0] = h[0];
+	x[1] = h[1];
+	x[2] = h[2];
+	if(cx == 1) {
+		h[0][0] = l[0][0]; h[0][1] = l[0][0]; h[0][2] = l[0][0];
+		h[1][0] = l[1][0]; h[1][1] = l[1][0]; h[1][2] = l[1][0];
+		h[2][0] = l[2][0]; h[2][1] = l[2][0]; h[2][2] = l[2][0];
+		*t = filter(x);
+		return;
+	}
+	h[0][0] = l[0][0]; h[0][1] = l[0][0]; h[0][2] = l[0][1];
+	h[1][0] = l[1][0]; h[1][1] = l[1][0]; h[1][2] = l[1][1];
+	h[2][0] = l[2][0]; h[2][1] = l[2][0]; h[2][2] = l[2][1];
+	*t++ = filter(x);
+	for(int i = 1; i < cx - 1; i++) {
+		x[0] = ~l[0] + i - 1;
+		x[1] = ~l[1] + i - 1;
+		x[2] = ~l[2] + i - 1;
+		*t++ = filter(x);
+	}
+	h[0][0] = l[0][cx - 2]; h[0][1] = l[0][cx - 1]; h[0][2] = l[0][cx - 1];
+	h[1][0] = l[1][cx - 2]; h[1][1] = l[1][cx - 1]; h[1][2] = l[1][cx - 1];
+	h[2][0] = l[2][cx - 2]; h[2][1] = l[2][cx - 1]; h[2][2] = l[2][cx - 1];
+	x[0] = h[0];
+	x[1] = h[1];
+	x[2] = h[2];
+	*t++ = filter(x);
+}
+
+void  Filter(RasterEncoder& target, Raster& src, ImageFilter9& filter)
+{
+	Size sz = src.GetSize();
+	target.Create(sz, src);
+	if(sz.cy < 1)
+		return;
+	RasterLine l[3];
+	if(sz.cy == 1) {
+		l[0] = src[0];
+		l[1] = src[0];
+		l[2] = src[0];
+		sLine(target, sz.cx, l, filter);
+		return;
+	}
+	l[0] = src[0];
+	l[1] = src[0];
+	l[2] = src[1];
+	sLine(target, sz.cx, l, filter);
+	target.WriteLine();
+	for(int y = 1; y < sz.cy - 1; y++) {
+		l[0] = l[1];
+		l[1] = l[2];
+		l[2] = src[y + 1];
+		sLine(target, sz.cx, l, filter);
+		target.WriteLine();
+	}
+	l[0] = l[1];
+	l[1] = l[2];
+	l[2] = src[sz.cy - 1];
+	sLine(target, sz.cx, l, filter);
+	target.WriteLine();
+}
+
+Image Filter(const Image& img, ImageFilter9& filter)
+{
+	ImageEncoder tgt;
+	ImageRaster src(img);
+	Filter(tgt, src, filter);
+	return tgt;
+}
+
+struct RGBAI {
+	int r, g, b, a;
+
+	RGBAI() { r = g = b = a= 0; }
+};
+
+static void sGetS(RGBA q, RGBAI& p, int mul)
+{
+	p.r += mul * q.r;
+	p.g += mul * q.g;
+	p.b += mul * q.b;
+	p.a += mul * q.a;
+}
+
+struct sSharpenFilter : ImageFilter9 {
+	int amount;
+
+	virtual RGBA operator()(const RGBA **mx);
+};
+
+RGBA sSharpenFilter::operator()(const RGBA **mx)
+{
+	RGBAI q;
+	sGetS(mx[0][0], q, 7);
+	sGetS(mx[0][1], q, 9);
+	sGetS(mx[0][2], q, 7);
+	sGetS(mx[1][0], q, 9);
+	sGetS(mx[1][2], q, 9);
+	sGetS(mx[2][0], q, 7);
+	sGetS(mx[2][1], q, 9);
+	sGetS(mx[2][2], q, 7);
+	const RGBA& s = mx[1][1];
+	RGBA t;
+	int na = 256 + amount;
+	t.b = Saturate255((na * (s.b << 6) - amount * q.b) >> 14);
+	t.g = Saturate255((na * (s.g << 6) - amount * q.g) >> 14);
+	t.r = Saturate255((na * (s.r << 6) - amount * q.r) >> 14);
+	t.a = Saturate255((na * (s.a << 6) - amount * q.a) >> 14);
+	return t;
+}
+
+void Sharpen(RasterEncoder& target, Raster& src, int amount)
+{
+	Size sz = src.GetSize();
+	target.Create(sz, src);
+	sSharpenFilter f;
+	f.amount = amount;
+	Filter(target, src, f);
+}
+
+Image Sharpen(const Image& img, int amount)
+{
+	ImageEncoder tgt;
+	ImageRaster src(img);
+	Sharpen(tgt, src, amount);
+	return tgt;
+}
+
+struct sEtchFilter : ImageFilter9 {
+	virtual RGBA operator()(const RGBA **mx);
+};
+
+RGBA sEtchFilter::operator()(const RGBA **mx)
+{
+	RGBA t;
+	RGBA s = mx[1][1];
+	if(s.a == 255 && s.r + s.g + s.b < 400) {
+		t.r = t.g = t.b = 128;
+		t.a = 255;
+		return t;
+	}
+	s = mx[0][0];
+	if(s.a == 255 && s.r + s.g + s.b < 400) {
+		t.r = t.g = t.b = t.a = 255;
+		return t;
+	}
+	Zero(t);
+	return t;
+}
+
+Image Etched(const Image& img)
+{
+	sEtchFilter ef;
+	return Filter(img, ef);
+}
+
+Image SetColorKeepAlpha(const Image& img, Color c)
+{
+	RGBA rgba = c;
+	const RGBA *s = ~img;
+	const RGBA *e = s + img.GetLength();
+	ImageBuffer w(img.GetSize());
+	RGBA *t = w;
+	while(s < e) {
+		*t = rgba;
+		(t++)->a = (s++)->a;
+	}
+	w.SetHotSpot(img.GetHotSpot());
+	w.Set2ndSpot(img.Get2ndSpot());
+	return w;
+}
+
+Image CreateHorzFadeOut(Size sz, Color color)
+{
+	ImageBuffer ib(sz);
+	RGBA c = color;
+	for(int q = 0; q < sz.cx; q++) {
+		c.a = q * 255 / sz.cx;
+		RGBA *t = ~ib + q;
+		for(int n = sz.cy; n > 0; n--) {
+			*t = c;
+			t += sz.cx;
+		}
+	}
+	Premultiply(ib);
+	return ib;
+}
+
+struct FadeOutMaker : ImageMaker {
+	Size  sz;
+	Color color;
+
+	virtual String Key() const {
+		char h[sizeof(Size) + sizeof(Color)];
+		memcpy(h, &sz, sizeof(sz));
+		memcpy(h + sizeof(Size), &color, sizeof(Color));
+		return String(h, sizeof(h));
+	}
+
+	virtual Image  Make() const {
+		return CreateHorzFadeOut(sz, color);
+	}
+};
+
+Image  HorzFadeOut(Size sz, Color color)
+{
+	FadeOutMaker m;
+	m.sz = sz;
+	m.color = color;
+	return MakeImage(m);
+}
+
+Image HorzFadeOut(int cx, int cy, Color color)
+{
+	return HorzFadeOut(Size(cx, cy), color);
+}
+
+Image  RotateClockwise(const Image& img)
+{
+	Size sz = img.GetSize();
+	ImageBuffer ib(sz.cy, sz.cx);
+	for(int x = 0; x < sz.cx; x++)
+		for(int y = 0; y < sz.cy; y++)
+			ib[x][y] = img[sz.cy - y - 1][x];
+	return ib;
+}
+
+Image  RotateAntiClockwise(const Image& img)
+{
+	Size sz = img.GetSize();
+	ImageBuffer ib(sz.cy, sz.cx);
+	for(int x = 0; x < sz.cx; x++)
+		for(int y = 0; y < sz.cy; y++)
+			ib[x][y] = img[y][sz.cx - x - 1];
+	return ib;
+}
+
+Image MirrorHorz(const Image& img)
+{
+	Size sz = img.GetSize();
+	Image h = img;
+	ImageBuffer ib(h);
+	for(int y = 0; y < sz.cy; y++) {
+		RGBA *b = ib[y] + 0;
+		RGBA *e = b + sz.cx - 1;
+		while(b < e) {
+			Swap(*b, *e);
+			b++;
+			e--;
+		}
+	}
+	return ib;
+}
+
+Image MirrorVert(const Image& img)
+{
+	Size sz = img.GetSize();
+	Image h = img;
+	ImageBuffer ib(h);
+
+	for(int y = 0; y < sz.cy / 2; y++) {
+		RGBA *b = ib[y];
+		RGBA *e = ib[sz.cy - y - 1];
+		for(int x = 0; x < sz.cx; x++) {
+			Swap(*b, *e);
+			b++;
+			e++;
+		}
+	}
+	return ib;
+}
+
+Image Magnify(const Image& img, int nx, int ny)
+{
+	if(nx == 1 && ny == 1)
+		return img;
+	if(nx == 0 || ny == 0)
+		return Image();
+	Size sz = img.GetSize();
+	bool xdown = nx < 0;
+	nx = abs(nx);
+	int ncx = xdown ? sz.cx / nx : sz.cx * nx;
+	ImageBuffer b(ncx, sz.cy * ny);
+	const RGBA *s = ~img;
+	const RGBA *e = s + img.GetLength();
+	RGBA *t = ~b;
+	while(s < e) {
+		RGBA *q = t;
+		const RGBA *le = s + sz.cx;
+		while(s < le) {
+			Fill(q, *s, nx);
+			q += nx;
+			s++;
+		}
+		for(int n = ny - 1; n--;) {
+			memcpy(q, t, ncx * sizeof(RGBA));
+			q += ncx;
+		}
+		t = q;
+	}
+	return b;
+}
+
+static Pointf Cvp(double x, double y, double sina, double cosa)
+{
+	return Pointf(x * cosa + y * sina, -x * sina + y * cosa);
+}
+
+Image Rotate(const Image& m, int angle)
+{
+	Size isz = m.GetSize();
+	Point center = isz / 2;
+	Pointf centerf = Pointf(Point(isz)) / 2.0;
+	double sina, cosa;
+	Draw::SinCos(-angle, sina, cosa);
+	Pointf p1 = Cvp(-centerf.x, -centerf.y, sina, cosa);
+	Pointf p2 = Cvp(centerf.x, -centerf.y, sina, cosa);
+	Size sz2 = Size(2 * (int)max(tabs(p1.x), tabs(p2.x)),
+	                2 * (int)max(tabs(p1.y), tabs(p2.y)));
+	Pointf dcenterf = Sizef(sz2) / 2.0;
+	Point dcenter = sz2 / 2;
+
+	ImageBuffer ib(sz2);
+	Fill(~ib, RGBAZero(), ib.GetLength());
+	RGBA *t = ~ib;
+	Draw::SinCos(angle, sina, cosa);
+	int sini = int(sina * 128);
+	int cosi = int(cosa * 128);
+	Buffer<int> xmx(sz2.cx);
+	Buffer<int> xmy(sz2.cx);
+	for(int x = 0; x < sz2.cx; x++) {
+		int xx = x + x - sz2.cx;
+		xmx[x] = int(xx * cosi);
+		xmy[x] = -int(xx * sini);
+	}
+	for(int y = 0; y < sz2.cy; y++) {
+		int yy = y + y - sz2.cy;
+		int ymx = int(yy * sini) + (isz.cx << 7);
+		int ymy = int(yy * cosi) + (isz.cy << 7);
+		for(int x = 0; x < sz2.cx; x++) {
+			int xs = (xmx[x] + ymx) >> 8;
+			int ys = (xmy[x] + ymy) >> 8;
+			*t++ = xs >= 0 && xs < isz.cx && ys >= 0 && ys < isz.cy ? m[ys][xs] : RGBAZero();
+		}
+	}
+	return ib;
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/Draw/ImageOp.h b/uppsrc/Draw/ImageOp.h
new file mode 100644
index 000000000..bd47a1036
--- /dev/null
+++ b/uppsrc/Draw/ImageOp.h
@@ -0,0 +1,153 @@
+Image CreateImage(Size sz, Color color);
+Image SetColorKeepAlpha(const Image& img, Color c);
+
+Image WithHotSpots(const Image& m, int x1, int y1, int x2, int y2);
+Image WithHotSpot(const Image& m, int x1, int y1);
+
+void Over(ImageBuffer& dest, Point p, const Image& src, const Rect& srect);
+void Copy(ImageBuffer& dest, Point p, const Image& src, const Rect& srect);
+
+void  Copy(Image& dest, Point p, const Image& src, const Rect& srect);
+void  Over(Image& dest, Point p, const Image& src, const Rect& srect);
+
+void  OverStraightOpaque(ImageBuffer& dest, Point p, const Image& src, const Rect& srect);
+void  OverStraightOpaque(Image& dest, Point p, const Image& _src, const Rect& srect);
+
+void  Crop(RasterEncoder& tgt, Raster& img, const Rect& rc);
+Image Crop(const Image& img, const Rect& rc);
+Image Crop(const Image& img, int x, int y, int cx, int cy);
+
+Image ColorMask(const Image& src, Color transparent);
+
+void  CanvasSize(RasterEncoder& tgt, Raster& img, int cx, int cy);
+Image CanvasSize(const Image& img, int cx, int cy);
+
+Image AssignAlpha(const Image& img, const Image& new_alpha);
+
+Image Grayscale(const Image& img);
+Image Grayscale(const Image& img, int amount);
+Image Contrast(const Image& img, int amount = 256);
+
+Image HorzFadeOut(int cx, int cy, Color color);
+Image HorzFadeOut(Size sz, Color color);
+
+class RescaleImage {
+	Raster       *src;
+	Size          tsz;
+	Vector<dword> horz;
+	Vector<dword> vert;
+	void        (*row_proc)(dword *dest, const RGBA *src, const dword *map);
+	Size          size;
+	int           cx4;
+	int           count;
+	int           segment;
+	int           entry;
+	int           step;
+	int           segspan;
+	bool          bigseg;
+	Buffer<dword> row_buffers;
+	int           first;
+	int           full;
+	const dword  *offsets;
+	int           offset;
+	int           y;
+
+	struct Ln {
+		RasterLine line;
+		int        ii;
+	};
+
+	Ln            cache[4];
+	int           cii;
+	const RGBA   *GetLine(int i);
+
+public:
+	void Create(Size sz, Raster& src, const Rect& src_rc);
+	void Get(RGBA *line);
+};
+
+void DrawRasterData(Draw& w, int x, int y, int cx, int cy, const String& data);
+
+void  Rescale(RasterEncoder& tgt, Size sz, Raster& src, const Rect& src_rc);
+Image Rescale(const Image& src, Size sz, const Rect& src_rc);
+Image Rescale(const Image& src, Size sz);
+Image Rescale(const Image& src, int cx, int cy);
+
+struct ImageFilter9 {
+	virtual RGBA operator()(const RGBA **mx) = 0;
+	virtual ~ImageFilter9() {}
+};
+
+Image Filter(const Image& img, ImageFilter9& filter);
+void  Filter(RasterEncoder& target, Raster& src, ImageFilter9& filter);
+
+Image Etched(const Image& img);
+Image Sharpen(const Image& img, int amount = 100);
+
+Image RotateClockwise(const Image& img);
+Image RotateAntiClockwise(const Image& img);
+Image MirrorHorz(const Image& img);
+Image MirrorVert(const Image& img);
+Image Rotate(const Image& m, int angle);
+
+// Experimental {
+Image Colorize(const Image& img, Color color, int alpha = 100);
+Image Equalight(const Image& img, int thold = 10);
+// }
+
+//Chameleon support
+int   Diff(RGBA a, RGBA b);
+Image Unglyph(const Image& m, Color& c, double& factor);
+Image Unglyph(const Image& m, Color& c);
+Image Unglyph(const Image& m);
+Image VertBlend(Image img1, Image img2, int y0, int y1);
+Image HorzBlend(Image img1, Image img2, int x0, int x1);
+Image HorzSymm(Image src);
+
+enum {
+	IMAGECONTENT_VERTDUP = 1,
+	IMAGECONTENT_HORZDUP = 2,
+	IMAGECONTENT_OPAQUEBODY = 4,
+};
+
+int    ClassifyContent(const Image& m, const Rect& rect);
+
+Image  RecreateAlpha(const Image& overwhite, const Image& overblack);
+int    ImageMargin(const Image& m, int p, int dist);
+
+struct ChPartMaker {
+	Image image;
+	Color border;
+	Color bg;
+	
+	bool  t, b, l, r;
+	byte  tl, tr, bl, br;
+	
+	void ResetShape();
+	Image Make() const;
+
+	ChPartMaker(const Image& m);
+};
+
+// Image cache
+
+struct ImageMaker {
+	virtual String Key() const = 0;
+	virtual Image  Make() const = 0;
+	virtual ~ImageMaker() {}
+};
+
+Image MakeImage(const ImageMaker& m);
+Image MakeImage(const Image& image, Image (*make)(const Image& image));
+
+void  SetMakeImageCacheSize(int m);
+void  SetMakeImageCacheMax(int m);
+
+Image MakeImagePaintOnly(const ImageMaker& m);
+
+Image CachedRescale(const Image& m, Size sz, const Rect& src);
+Image CachedRescale(const Image& m, Size sz);
+Image CachedRescalePaintOnly(const Image& m, Size sz, const Rect& src);
+Image CachedRescalePaintOnly(const Image& m, Size sz);
+
+Image Magnify(const Image& img, int nx, int ny);
diff --git a/uppsrc/Draw/ImageScale.cpp b/uppsrc/Draw/ImageScale.cpp
new file mode 100644
index 000000000..2dc42f205
--- /dev/null
+++ b/uppsrc/Draw/ImageScale.cpp
@@ -0,0 +1,507 @@
+#include "Draw.h"
+
+NAMESPACE_UPP
+
+enum
+{
+	MAXAA = 4,
+
+	MAP_COUNT   = 0,
+	MAP_SEGMENT = 1,
+	MAP_BLOCK   = 2,
+	MAP_STEP    = 3,
+	MAP_DATA    = 4,
+};
+
+enum { LOG2_STRETCH_CURVE = 10, COUNT_STRETCH_CURVE = 1 << LOG2_STRETCH_CURVE };
+
+static const byte *GetStretchCurve()
+{
+	static byte cache[COUNT_STRETCH_CURVE];
+	ONCELOCK {
+		for(int i = 0; i < COUNT_STRETCH_CURVE; i++)
+		{
+			enum { HALF = COUNT_STRETCH_CURVE >> 1 };
+			double a = (i <= HALF ? i / double(HALF) : (COUNT_STRETCH_CURVE - i) / double(HALF));
+			double o = pow(a, 0.85);
+			cache[i] = minmax<int>((int)((i <= HALF ? o : 2 - o) * 128), 0, 255);
+		}
+	}
+	return cache;
+}
+
+Vector<dword> AAGetMap(int& dmin, int& dmax, int dclipmin, int dclipmax,
+	                   int smin, int smax, int sclipmin, int sclipmax, int times, int avail)
+{
+	Vector<dword> map;
+	if(dmax == dmin || smax == smin)
+		return map;
+	if(dmax < dmin)
+	{
+		Swap(dmin, dmax);
+		Swap(smin, smax);
+	}
+	int dw = dmax - dmin, sw = smax - smin, spos;
+	if(sw > 0)
+	{
+		int x0 = dmin;
+		if(smin < sclipmin)
+			x0 += iscalefloor(sclipmin - smin, dw, sw);
+		if(x0 < dclipmin)
+			x0 = dclipmin;
+		spos = smin * dw + (x0 - dmin) * sw;
+		dmin = x0;
+		if(smax > sclipmax)
+			dmax -= iscalefloor(smax - sclipmax, dw, sw);
+		if(dmax > dclipmax)
+			dmax = dclipmax;
+	}
+	else
+	{
+		int x0 = dmin;
+		if(smin > sclipmax)
+			x0 += iscalefloor(sclipmax - smin, dw, sw);
+		if(x0 < dclipmin)
+			x0 = dclipmin;
+		spos = smin * dw + (x0 - dmin) * sw;
+		dmin = x0;
+		if(smax < sclipmin)
+			dmax -= iscalefloor(smax - sclipmin, dw, sw);
+		Swap(smin, smax);
+	}
+	int count = min(dclipmax, dmax) - dmin;
+	if(smin < sclipmin)
+		smin = sclipmin;
+	if(smax > sclipmax)
+		smax = sclipmax;
+	if(smax <= smin || count <= 0)
+		return map;
+	int span = min(tabs(sw) % dw ? idivceil(tabs(sw), dw) + 1 : tabs(sw) / dw, smax - smin);
+	bool bigseg = (span >= MAXAA);
+	int segment = (bigseg ? MAXAA : span);
+	int segstep = span / segment;
+	map.SetCount(4 + count * (bigseg ? 1 : 1 + segment));
+	map[MAP_COUNT] = dword(count);
+	map[MAP_SEGMENT] = dword(segment);
+	map[MAP_BLOCK] = 1 + (bigseg ? 0 : segment);
+	map[MAP_STEP] = (span / segment) * times;
+	dword *out = map.Begin() + MAP_DATA;
+	int sendoffset = (smax - (segment - 1) * segstep - 1) * times;
+	int last = 0;
+
+	if(smax - smin == 1)
+	{
+		ASSERT(segment == 1);
+		dword dval = dword(smin * times);
+		*out++ = dval;
+		*out++ = avail;
+		while(--count > 0)
+		{
+			*out++ = 0;
+			*out++ = avail;
+		}
+	}
+	else if(tabs(sw) >= dw)
+	{ // size reduction
+		int sbegin = smin * dw, send = smax * dw, aw = tabs(sw);
+		for(spos += min(sw, 0); --count >= 0; spos += sw)
+		{
+			int pb = max(spos, sbegin), pe = min(spos + aw, send);
+			int total = pe - pb, left = avail;
+			int start = idivfloor(pb, dw), end = idivceil(pe, dw) - 1, rem = pb % dw;
+//			DUMP(start);
+//			DUMP(end);
+			if(pb >= send)
+			{
+				last += *out++ = sendoffset - last;
+				if(!bigseg)
+				{
+					int i = segment - 1;
+					while(--i >= 0)
+						*out++ = 0;
+					*out++ = left;
+				}
+			}
+			else if(end <= start)
+			{ // 1 source pixel only
+//				ASSERT(!bigseg);
+				int scomp = minmax(start + segment - smax, 0, start - smin);
+				last += *out++ = (start - scomp) * times - last;
+				if(!bigseg)
+				{
+					int i = scomp;
+					while(--i >= 0)
+						*out++ = 0;
+					*out++ = dword(left);
+					i = segment - scomp - 1;
+					while(--i >= 0)
+						*out++ = 0;
+				}
+			}
+			else
+			{
+				int delta = (dw - rem) * left / total;
+				if(!delta)
+					start++;
+				int scomp = minmax(start + span - smax, 0, start - smin);
+				last += *out++ = (start - scomp) * times - last;
+				if(!bigseg)
+				{
+					int i = scomp;
+					while(--i >= 0)
+						*out++ = 0;
+					i = segment - scomp;
+					if(delta)
+					{
+						*out++ = delta;
+						left -= delta;
+						total -= dw - rem;
+						i--;
+					}
+					while(++start < end)
+					{
+						ASSERT(i > 0);
+						delta = dw * left / total;
+						*out++ = delta;
+						left -= delta;
+						total -= dw;
+						--i;
+					}
+					if(left > 0)
+					{
+						ASSERT(i > 0);
+						*out++ = left;
+						--i;
+					}
+					while(--i >= 0)
+						*out++ = 0;
+				}
+			}
+//			LOG("-> " << map[rec] << " + " << map[rec + 1]);
+		}
+	}
+	else
+	{ // size inflation
+		static const byte *curve = GetStretchCurve();
+		ASSERT(segment == 2 && !bigseg);
+		int sbegin = smin * dw, send = (smax - 1) * dw;
+		for(spos += (sw - dw) >> 1; --count >= 0; spos += sw)
+		{
+			if(spos <= sbegin)
+			{
+				last += out[0] = smin * times - last;
+				out[1] = avail;
+				out[2] = 0;
+			}
+			else if(spos >= send)
+			{
+				last += out[0] = sendoffset - last;
+				out[1] = 0;
+				out[2] = avail;
+			}
+			else
+			{
+				int pos = spos / dw;
+				int rel = spos % dw;
+				last += out[0] = pos * times - last;
+				out[1] = avail - (out[2] = curve[rel * COUNT_STRETCH_CURVE / dw]);
+			}
+			out += 3;
+		}
+	}
+
+#ifdef _DEBUG
+	ASSERT(out == map.End());
+	int offs = 0, step = map[MAP_BLOCK], segspan = (map[MAP_SEGMENT] - 1) * map[MAP_STEP] + 1;
+	for(int t = 0; t < (int)map[MAP_COUNT]; t++)
+	{
+		offs += map[MAP_DATA + t * step];
+		ASSERT(offs >= times * smin && offs + segspan <= times * smax);
+	}
+#endif
+
+	return map;
+}
+
+static void BltAAMapRGBA1(dword *dest, const RGBA *s, const dword *map)
+{
+	int count = map[MAP_COUNT];
+	map += 4;
+	while(count--) {
+		s += map[0];
+		dest[0] = s->b << 8;
+		dest[1] = s->g << 8;
+		dest[2] = s->r << 8;
+		dest[3] = s->a << 8;
+		map += 2;
+		dest += 4;
+	}
+}
+
+static void BltAAMapRGBA2(dword *dest, const RGBA *s, const dword *map)
+{
+	int count = map[MAP_COUNT];
+	map += 4;
+	while(count--) {
+		s += map[0];
+		dest[0] = s[0].b * map[1] + s[1].b * map[2];
+		dest[1] = s[0].g * map[1] + s[1].g * map[2];
+		dest[2] = s[0].r * map[1] + s[1].r * map[2];
+		dest[3] = s[0].a * map[1] + s[1].a * map[2];
+		map += 3;
+		dest += 4;
+	}
+}
+
+
+static void BltAAMapRGBA3(dword *dest, const RGBA *s, const dword *map)
+{
+	int count = map[MAP_COUNT];
+	map += 4;
+	while(count--) {
+		s += map[0];
+		dest[0] = s[0].b * map[1] + s[1].b * map[2] + s[2].b * map[3];
+		dest[1] = s[0].g * map[1] + s[1].g * map[2] + s[2].g * map[3];
+		dest[2] = s[0].r * map[1] + s[1].r * map[2] + s[2].r * map[3];
+		dest[3] = s[0].a * map[1] + s[1].a * map[2] + s[2].a * map[3];
+		map += 4;
+		dest += 4;
+	}
+}
+
+static void BltAAMapRGBA4(dword *dest, const RGBA *s, const dword *map)
+{
+	int step = map[MAP_STEP];
+	int count = map[MAP_COUNT];
+	map += 4;
+	while(count--) {
+		s += map[0];
+		dest[0] = (s[0].b + s[step].b + s[2 * step].b + s[3 * step].b) << 6;
+		dest[1] = (s[0].g + s[step].g + s[2 * step].g + s[3 * step].g) << 6;
+		dest[2] = (s[0].r + s[step].r + s[2 * step].r + s[3 * step].r) << 6;
+		dest[3] = (s[0].a + s[step].a + s[2 * step].a + s[3 * step].a) << 6;
+		map += 1;
+		dest += 4;
+	}
+}
+
+void BltAASet2Fix(RGBA *dest, const dword *src1, dword w1, const dword *src2, dword w2, int count)
+{
+	while(count--) {
+		dest->b = byte((src1[0] * w1 + src2[0] * w2) >> 16);
+		dest->g = byte((src1[1] * w1 + src2[1] * w2) >> 16);
+		dest->r = byte((src1[2] * w1 + src2[2] * w2) >> 16);
+		dest->a = byte((src1[3] * w1 + src2[3] * w2) >> 16);
+		dest++;
+		src1 += 4;
+		src2 += 4;
+	}
+}
+
+void BltAASet3Fix(RGBA *dest,
+                  const dword *src1, dword w1, const dword *src2, dword w2, const dword *src3, dword w3,
+                  dword count)
+{
+	while(count--) {
+		dest->b = byte((src1[0] * w1 + src2[0] * w2 + src3[0] * w3) >> 16);
+		dest->g = byte((src1[1] * w1 + src2[1] * w2 + src3[1] * w3) >> 16);
+		dest->r = byte((src1[2] * w1 + src2[2] * w2 + src3[2] * w3) >> 16);
+		dest->a = byte((src1[3] * w1 + src2[3] * w2 + src3[3] * w3) >> 16);
+		dest++;
+		src1 += 4;
+		src2 += 4;
+		src3 += 4;
+	}
+}
+
+void BltAASet4Fix(RGBA *dest, const dword *src1, const dword *src2,
+                              const dword *src3, const dword *src4, int count)
+{
+	while(count--) {
+		dest->b = byte((src1[0] + src2[0] + src3[0] + src4[0]) >> 10);
+		dest->g = byte((src1[1] + src2[1] + src3[1] + src4[1]) >> 10);
+		dest->r = byte((src1[2] + src2[2] + src3[2] + src4[2]) >> 10);
+		dest->a = byte((src1[3] + src2[3] + src3[3] + src4[3]) >> 10);
+		dest++;
+		src1 += 4;
+		src2 += 4;
+		src3 += 4;
+		src4 += 4;
+	}
+}
+
+void BltAAFix2(RGBA *dest, const dword *src, int count)
+{
+#ifdef CPU_LITTLE_ENDIAN
+	const byte *s = (byte *)src + 1;
+#else
+	const byte *s = (byte *)src + 2;
+#endif
+	while(count--) {
+		dest->b = s[0];
+		dest->g = s[4];
+		dest->r = s[8];
+		dest->a = s[12];
+		dest++;
+		s += 16;
+	}
+}
+
+void RescaleImage::Create(Size _tsz, Raster& _src, const Rect& src_rc)
+{
+	y = -1;
+	src = &_src;
+	tsz = _tsz;
+	if(tsz.cx == 0 || tsz.cy == 0)
+		return;
+
+	size = src->GetSize();
+
+	Rect dr = tsz;
+	horz = AAGetMap(dr.left, dr.right, dr.left, dr.right,
+	                src_rc.left, src_rc.right, 0, size.cx, 1, 0x100);
+	if(horz.IsEmpty())
+		return;
+
+	vert = AAGetMap(dr.top, dr.bottom, dr.top, dr.bottom,
+	                src_rc.top, src_rc.bottom, 0, size.cy, 1, 0x100);
+	if(vert.IsEmpty())
+		return;
+
+	switch(horz[MAP_SEGMENT]) {
+	case 1:  row_proc = BltAAMapRGBA1; break;
+	case 2:  row_proc = BltAAMapRGBA2; break;
+	case 3:  row_proc = BltAAMapRGBA3; break;
+	case 4:  row_proc = BltAAMapRGBA4; break;
+	default: NEVER(); return;
+	}
+
+	cx4 = 4 * tsz.cx;
+	count = vert[MAP_COUNT];
+	segment = vert[MAP_SEGMENT];
+	entry = vert[MAP_BLOCK];
+	step = vert[MAP_STEP];
+	segspan = (segment - 1) * step + 1;
+	bigseg = (segment == MAXAA);
+	row_buffers.Alloc(cx4 * segment);
+	first = vert[4];
+	full = 0;
+	offsets = vert.GetIter(4);
+	offset = 0;
+	y = 0;
+	cii = 0;
+	cache[0].ii = cache[1].ii = cache[2].ii = cache[3].ii = -1;
+}
+
+const RGBA *RescaleImage::GetLine(int ii)
+{
+	if(cache[0].ii == ii)
+		return cache[0].line;
+	if(cache[1].ii == ii)
+		return cache[1].line;
+	if(cache[2].ii == ii)
+		return cache[2].line;
+	if(cache[3].ii == ii)
+		return cache[3].line;
+	cache[cii].line = (*src)[ii];
+	cache[cii].ii = ii;
+	const RGBA *l = cache[cii].line;
+	cii = (cii + 1) % 4;
+	return l;
+}
+
+void RescaleImage::Get(RGBA *tgt)
+{
+	if(y < 0 || offsets >= vert.End()) {
+		memset(tgt, 0, sizeof(RGBA) * tsz.cx);
+		return;
+	}
+	offset += *offsets++;
+	ASSERT(offset >= 0 && offset + segspan <= size.cy);
+	if(bigseg) {
+		row_proc(&row_buffers[0 * cx4], GetLine(offset + 0 * step), horz);
+		row_proc(&row_buffers[1 * cx4], GetLine(offset + 1 * step), horz);
+		row_proc(&row_buffers[2 * cx4], GetLine(offset + 2 * step), horz);
+		row_proc(&row_buffers[3 * cx4], GetLine(offset + 3 * step), horz);
+		BltAASet4Fix(tgt, &row_buffers[0 * cx4], &row_buffers[1 * cx4],
+			              &row_buffers[2 * cx4], &row_buffers[3 * cx4], tsz.cx);
+	}
+	else {
+		int endoff = offset + segment;
+		for(int next = first + full; next < endoff; next++) {
+			if(full >= segment)
+				first++;
+			else
+				full++;
+			row_proc(&row_buffers[next % segment * cx4], GetLine(next), horz);
+		}
+		while(first > offset) {
+			if(full < segment)
+				full++;
+			--first;
+			row_proc(&row_buffers[first % segment * cx4], GetLine(first), horz);
+		}
+		ASSERT(offset >= first && endoff <= first + full);
+		switch(segment) {
+		case 1:
+			BltAAFix2(tgt, &row_buffers[offset % segment * cx4], tsz.cx);
+			offsets++;
+			break;
+		case 2:
+			if(offsets[0] == 0)
+				BltAAFix2(tgt, &row_buffers[(offset + 1) % segment * cx4], tsz.cx);
+			else
+			if(offsets[1] == 0)
+				BltAAFix2(tgt, &row_buffers[offset % segment * cx4], tsz.cx);
+			else
+				BltAASet2Fix(tgt, &row_buffers[(offset + 0) % segment * cx4], offsets[0],
+					              &row_buffers[(offset + 1) % segment * cx4], offsets[1],
+					         tsz.cx);
+			offsets += 2;
+			break;
+		case 3:
+			BltAASet3Fix(tgt,
+			             &row_buffers[(offset + 0) % segment * cx4], offsets[0],
+			             &row_buffers[(offset + 1) % segment * cx4], offsets[1],
+			             &row_buffers[(offset + 2) % segment * cx4], offsets[2], tsz.cx);
+			offsets += 3;
+			break;
+		default:
+			NEVER();
+			break;
+		}
+	}
+}
+
+void Rescale(RasterEncoder& tgt, Size tsz, Raster& src, const Rect& src_rc)
+{
+	tgt.Create(tsz, src);
+	RescaleImage rs;
+	rs.Create(tsz, src, src_rc);
+	while(tsz.cy-- > 0) {
+		rs.Get(tgt);
+		tgt.WriteLine();
+	}
+}
+
+Image Rescale(const Image& src, Size sz, const Rect& src_rc)
+{
+	if(src.GetSize() == sz && src_rc == sz)
+		return src;
+	ImageRaster isrc(src);
+	ImageEncoder tgt;
+	Rescale(tgt, sz, isrc, src_rc);
+	return tgt;
+}
+
+Image Rescale(const Image& src, Size sz)
+{
+	return Rescale(src, sz, src.GetSize());
+}
+
+Image Rescale(const Image& src, int cx, int cy)
+{
+	return Rescale(src, Size(cx, cy));
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/Draw/ImageWin32.cpp b/uppsrc/Draw/ImageWin32.cpp
new file mode 100644
index 000000000..68bbde2f2
--- /dev/null
+++ b/uppsrc/Draw/ImageWin32.cpp
@@ -0,0 +1,613 @@
+#include "Draw.h"
+
+#ifdef PLATFORM_WIN32
+#include <shellapi.h>
+#endif
+
+NAMESPACE_UPP
+
+#ifdef PLATFORM_WIN32
+
+#define LTIMING(x) // RTIMING(x)
+
+bool ImageFallBack
+// = true
+;
+
+class BitmapInfo32__ {
+	Buffer<byte> data;
+
+public:
+	operator BITMAPINFO *()        { return (BITMAPINFO *)~data; }
+	operator BITMAPINFOHEADER *()  { return (BITMAPINFOHEADER *)~data; }
+	BITMAPINFOHEADER *operator->() { return (BITMAPINFOHEADER *)~data; }
+
+	BitmapInfo32__(int cx, int cy);
+};
+
+BitmapInfo32__::BitmapInfo32__(int cx, int cy)
+{
+	data.Alloc(sizeof(BITMAPINFOHEADER) + sizeof(RGBQUAD)*256);
+	BITMAPINFOHEADER *hi = (BITMAPINFOHEADER *) ~data;;
+	memset(hi, 0, sizeof(BITMAPINFOHEADER));
+	hi->biSize = sizeof(BITMAPINFOHEADER);
+	hi->biPlanes = 1;
+#ifdef PLATFORM_WINCE
+	hi->biBitCount = 32;
+	hi->biCompression = BI_BITFIELDS;
+	dword *x = (dword *)(~data + sizeof(BITMAPINFOHEADER));
+	x[2] = 0xff;
+	x[1] = 0xff00;
+	x[0] = 0xff0000;
+#else
+	hi->biBitCount = 32;
+	hi->biCompression = BI_RGB;
+#endif
+	hi->biSizeImage = 0;
+	hi->biClrUsed = 0;
+	hi->biClrImportant = 0;
+	hi->biWidth = cx;
+	hi->biHeight = -cy;
+}
+
+HBITMAP CreateBitMask(const RGBA *data, Size sz, Size tsz, Size csz, RGBA *ct)
+{
+	DrawLock __;
+	memset(ct, 0, tsz.cx * tsz.cy * sizeof(RGBA));
+	int linelen = (tsz.cx + 15) >> 4 << 1;
+	Buffer<byte>  mask(tsz.cy * linelen, 0xff);
+	byte *m = mask;
+	RGBA *ty = ct;
+	const RGBA *sy = data;
+	for(int y = 0; y < csz.cy; y++) {
+		const RGBA *s = sy;
+		RGBA *t = ty;
+		for(int x = 0; x < csz.cx; x++) {
+			if(s->a > 128) {
+				*t = *s;
+				m[x >> 3] &= ~(0x80 >> (x & 7));
+			}
+			else
+				t->r = t->g = t->b = 0;
+			t->a = 0;
+			t++;
+			s++;
+		}
+		m += linelen;
+		sy += sz.cx;
+		ty += tsz.cx;
+	}
+	return ::CreateBitmap(tsz.cx, tsz.cy, 1, 1, mask);
+}
+
+void SetSurface(HDC dc, int x, int y, int cx, int cy, const RGBA *pixels)
+{
+	DrawLock __;
+	BitmapInfo32__ bi(cx, cy);
+	::SetDIBitsToDevice(dc, x, y, cx, cy, 0, 0, 0, cy, pixels,
+	                    bi, DIB_RGB_COLORS);
+}
+
+void SetSurface(Draw& w, int x, int y, int cx, int cy, const RGBA *pixels)
+{
+	SetSurface(w.GetHandle(), x, y, cx, cy, pixels);
+}
+
+class DrawSurface : NoCopy {
+	int          x, y;
+	Size         size;
+	RGBA        *pixels;
+	HDC          dc, dcMem;
+	HBITMAP      hbmp, hbmpOld;
+
+	void  Init(Draw& w, int x, int y, int cx, int cy);
+	RGBA* Line(int i) const { ASSERT(i >= 0 && i < size.cy); return (RGBA *)pixels + size.cx * (size.cy - i - 1); }
+
+public:
+	operator RGBA *()                   { return pixels; }
+	Size        GetSize() const         { return size; }
+	RGBA       *operator[](int i)       { return Line(i); }
+	const RGBA *operator[](int i) const { return Line(i); }
+	int         GetLineDelta() const    { return -size.cx; }
+
+	DrawSurface(Draw& w, const Rect& r);
+	DrawSurface(Draw& w, int x, int y, int cx, int cy);
+	~DrawSurface();
+};
+
+void DrawSurface::Init(Draw& w, int _x, int _y, int cx, int cy)
+{
+	DrawLock __;
+	dc = w.GetHandle();
+	size = Size(cx, cy);
+	x = _x;
+	y = _y;
+	dcMem = ::CreateCompatibleDC(dc);
+	BitmapInfo32__ bi(cx, cy);
+	hbmp = CreateDIBSection(dc, bi, DIB_RGB_COLORS, (void **)&pixels, NULL, 0);
+	hbmpOld = (HBITMAP) ::SelectObject(dcMem, hbmp);
+	::BitBlt(dcMem, 0, 0, cx, cy, dc, x, y, SRCCOPY);
+}
+
+DrawSurface::DrawSurface(Draw& w, const Rect& r)
+{
+	Init(w, r.left, r.top, r.Width(), r.Height());
+}
+
+DrawSurface::DrawSurface(Draw& w, int x, int y, int cx, int cy)
+{
+	Init(w, x, y, cx, cy);
+}
+
+DrawSurface::~DrawSurface()
+{
+	DrawLock __;
+	::BitBlt(dc, x, y, size.cx, size.cy, dcMem, 0, 0, SRCCOPY);
+	::DeleteObject(::SelectObject(dcMem, hbmpOld));
+	::DeleteDC(dcMem);
+}
+
+void Image::Data::SysInit()
+{
+	hbmp = hmask = himg = NULL;
+	cursor_cheat = NULL;
+}
+
+void Image::Data::SysRelease()
+{
+	if(hbmp) {
+		DrawLock __;
+		DeleteObject(hbmp);
+		ResCount -= !paintonly;
+	}
+	if(hmask) {
+		DrawLock __;
+		DeleteObject(hmask);
+		ResCount -= !paintonly;
+	}
+	if(himg) {
+		DrawLock __;
+		DeleteObject(himg);
+		ResCount -= !paintonly;
+	}
+	himg = hbmp = hmask = NULL;
+}
+
+#ifndef PLATFORM_WINCE
+typedef BOOL (WINAPI *tAlphaBlend)(HDC hdcDest, int nXOriginDest, int nYOriginDest,
+                                   int nWidthDest, int nHeightDest,
+                                   HDC hdcSrc, int nXOriginSrc, int nYOriginSrc,
+                                   int nWidthSrc, int nHeightSrc, BLENDFUNCTION blendFunction);
+
+static tAlphaBlend fnAlphaBlend()
+{
+	DrawLock __;
+	static tAlphaBlend pSet;
+	static bool inited = false;
+	if(!inited) {
+		inited = true;
+		if(HMODULE hDLL = LoadLibrary("msimg32.dll"))
+			pSet = (tAlphaBlend) GetProcAddress(hDLL, "AlphaBlend");
+	}
+	return pSet;
+}
+#endif
+
+void Image::Data::CreateHBMP(HDC dc, const RGBA *data)
+{
+	DrawLock __;
+	Size sz = buffer.GetSize();
+	BitmapInfo32__ bi(sz.cx, sz.cy);
+	HDC dcMem = ::CreateCompatibleDC(dc);
+	RGBA *pixels;
+	HBITMAP hbmp32 = CreateDIBSection(dcMem, bi, DIB_RGB_COLORS, (void **)&pixels, NULL, 0);
+	HDC hbmpOld = (HDC) ::SelectObject(dcMem, hbmp32);
+	memcpy(pixels, data, buffer.GetLength() * sizeof(RGBA));
+	HDC dcMem2 = ::CreateCompatibleDC(dc);
+	hbmp = ::CreateCompatibleBitmap(dc, sz.cx, sz.cy);
+	HBITMAP o2 = (HBITMAP)::SelectObject(dcMem2, hbmp);
+	::BitBlt(dcMem2, 0, 0, sz.cx, sz.cy, dcMem, 0, 0, SRCCOPY);
+	::SelectObject(dcMem2, o2);
+	::DeleteDC(dcMem2);
+	::SelectObject(dcMem, hbmpOld);
+	::DeleteObject(hbmp32);
+	::DeleteDC(dcMem);
+	ResCount++;
+}
+
+void Image::Data::Paint(Draw& w, int x, int y, const Rect& src, Color c)
+{
+	DrawLock __;
+	ASSERT(!paintonly || IsNull(c));
+	int max = IsWinNT() ? 250 : 100;
+	while(ResCount > max) {
+		Image::Data *l = ResData->GetPrev();
+		l->SysRelease();
+		l->Unlink();
+	}
+	HDC dc = w.GetHandle();
+	Size sz = buffer.GetSize();
+	int  len = sz.cx * sz.cy;
+	Rect sr = src & sz;
+	Size ssz = sr.Size();
+	if(sr.IsEmpty())
+		return;
+	if(GetKind() == IMAGE_EMPTY)
+		return;
+	if(GetKind() == IMAGE_OPAQUE && !IsNull(c)) {
+		w.DrawRect(x, y, sz.cx, sz.cy, c);
+		return;
+	}
+	if(GetKind() == IMAGE_OPAQUE && paintcount == 0 && sr == Rect(sz) && !w.IsMetaFile() && IsWinNT()) {//TODO !IsWinNT
+		LTIMING("Image Opaque direct set");
+		SetSurface(w, x, y, sz.cx, sz.cy, buffer);
+		paintcount++;
+		return;
+	}
+	Unlink();
+	LinkAfter(ResData);
+	if(GetKind() == IMAGE_OPAQUE) {
+		if(!hbmp) {
+			LTIMING("Image Opaque create");
+			CreateHBMP(dc, buffer);
+		}
+		LTIMING("Image Opaque blit");
+		HDC dcMem = ::CreateCompatibleDC(dc);
+		HBITMAP o = (HBITMAP)::SelectObject(dcMem, hbmp);
+		::BitBlt(dc, x, y, ssz.cx, ssz.cy, dcMem, sr.left, sr.top, SRCCOPY);
+		::SelectObject(dcMem, o);
+		::DeleteDC(dcMem);
+		PaintOnlyShrink();
+		return;
+	}
+	if(GetKind() == IMAGE_MASK/* || GetKind() == IMAGE_OPAQUE*/) {
+		HDC dcMem = ::CreateCompatibleDC(dc);
+		if(!hmask) {
+			LTIMING("Image Mask create");
+			Buffer<RGBA> bmp(len);
+			hmask = CreateBitMask(buffer, sz, sz, sz, bmp);
+			ResCount++;
+			if(!hbmp)
+				CreateHBMP(dc, bmp);
+		}
+		LTIMING("Image Mask blt");
+		HBITMAP o = (HBITMAP)::SelectObject(dcMem, ::CreateCompatibleBitmap(dc, sz.cx, sz.cy));
+		::BitBlt(dcMem, 0, 0, ssz.cx, ssz.cy, dc, x, y, SRCCOPY);
+		HDC dcMem2 = ::CreateCompatibleDC(dc);
+		::SelectObject(dcMem2, hmask);
+		::BitBlt(dcMem, 0, 0, ssz.cx, ssz.cy, dcMem2, sr.left, sr.top, SRCAND);
+		if(IsNull(c)) {
+			::SelectObject(dcMem2, hbmp);
+			::BitBlt(dcMem, 0, 0, ssz.cx, ssz.cy, dcMem2, sr.left, sr.top, SRCPAINT);
+		}
+		else {
+			HBRUSH ho = (HBRUSH) SelectObject(dcMem, CreateSolidBrush(c));
+			::BitBlt(dcMem, 0, 0, ssz.cx, ssz.cy, dcMem2, sr.left, sr.top, 0xba0b09);
+			::DeleteObject(::SelectObject(dcMem, ho));
+		}
+		::BitBlt(dc, x, y, ssz.cx, ssz.cy, dcMem, 0, 0, SRCCOPY);
+		::DeleteObject(::SelectObject(dcMem, o));
+		::DeleteDC(dcMem2);
+		::DeleteDC(dcMem);
+		PaintOnlyShrink();
+		return;
+	}
+#ifndef PLATFORM_WINCE
+	if(fnAlphaBlend() && IsNull(c) && !ImageFallBack) {
+		if(!himg) {
+			LTIMING("Image Alpha create");
+			BitmapInfo32__ bi(sz.cx, sz.cy);
+			himg = CreateDIBSection(ScreenHDC(), bi, DIB_RGB_COLORS,
+			                              (void **)&section, NULL, 0);
+			ResCount++;
+			memcpy(section, ~buffer, buffer.GetLength() * sizeof(RGBA));
+		}
+		LTIMING("Image Alpha blit");
+		BLENDFUNCTION bf;
+		bf.BlendOp = AC_SRC_OVER;
+		bf.BlendFlags = 0;
+		bf.SourceConstantAlpha = 255;
+		bf.AlphaFormat = AC_SRC_ALPHA;
+		HDC dcMem = ::CreateCompatibleDC(dc);
+		::SelectObject(dcMem, himg);
+		fnAlphaBlend()(dc, x, y, ssz.cx, ssz.cy, dcMem, sr.left, sr.top, ssz.cx, ssz.cy, bf);
+		::DeleteDC(dcMem);
+		PaintOnlyShrink();
+	}
+	else
+#endif
+	{
+		LTIMING("Image Alpha sw");
+		DrawSurface sf(w, x, y, ssz.cx, ssz.cy);
+		RGBA *t = sf;
+		for(int i = sr.top; i < sr.bottom; i++) {
+			if(IsNull(c))
+				AlphaBlendOpaque(t, buffer[i] + sr.left, ssz.cx);
+			else
+				AlphaBlendOpaque(t, buffer[i] + sr.left, ssz.cx, c);
+			t += ssz.cx;
+		}
+	}
+}
+
+void ImageDraw::Section::Init(int cx, int cy)
+{
+	DrawLock __;
+	dc = ::CreateCompatibleDC(ScreenHDC());
+	BitmapInfo32__ bi(cx, cy);
+	hbmp = CreateDIBSection(dc, bi, DIB_RGB_COLORS, (void **)&pixels, NULL, 0);
+	hbmpOld = (HBITMAP) ::SelectObject(dc, hbmp);
+}
+
+ImageDraw::Section::~Section()
+{
+	DrawLock __;
+	::DeleteObject(::SelectObject(dc, hbmpOld));
+	::DeleteDC(dc);
+}
+
+void ImageDraw::Init()
+{
+	DrawLock __;
+	rgb.Init(size.cx, size.cy);
+	a.Init(size.cx, size.cy);
+	Attach(rgb.dc);
+	alpha.Attach(a.dc);
+	has_alpha = false;
+}
+
+Image ImageDraw::Get(bool pm) const
+{
+	ImageBuffer b(size);
+	int n = size.cx * size.cy;
+	memcpy(~b, rgb.pixels, n * sizeof(RGBA));
+	const RGBA *s = a.pixels;
+	const RGBA *e = a.pixels + n;
+	RGBA *t = b;
+	if(has_alpha) {
+		while(s < e) {
+			t->a = s->r;
+			t++;
+			s++;
+		}
+		if(pm)
+			Premultiply(b);
+		b.SetKind(IMAGE_ALPHA);
+	}
+	else {
+		while(s < e) {
+			t->a = 255;
+			t++;
+			s++;
+		}
+		b.SetKind(IMAGE_OPAQUE);
+	}
+	return b;
+}
+
+ImageDraw::operator Image() const
+{
+	return Get(true);
+}
+
+Image ImageDraw::GetStraight() const
+{
+	return Get(false);
+}
+
+ImageDraw::ImageDraw(Size sz)
+{
+	size = sz;
+	Init();
+}
+
+ImageDraw::ImageDraw(int cx, int cy)
+{
+	size = Size(cx, cy);
+	Init();
+}
+
+ImageDraw::~ImageDraw()
+{
+	Detach();
+	alpha.Detach();
+}
+
+#ifdef PLATFORM_WINCE
+
+Image Image::Arrow() { return Null; }
+Image Image::Wait() { return Null; }
+Image Image::IBeam() { return Null; }
+Image Image::No() { return Null; }
+Image Image::SizeAll() { return Null; }
+Image Image::SizeHorz() { return Null; }
+Image Image::SizeVert() { return Null; }
+Image Image::SizeTopLeft() { return Null; }
+Image Image::SizeTop() { return Null; }
+Image Image::SizeTopRight() { return Null; }
+Image Image::SizeLeft() { return Null; }
+Image Image::SizeRight() { return Null; }
+Image Image::SizeBottomLeft() { return Null; }
+Image Image::SizeBottom() { return Null; }
+Image Image::SizeBottomRight() { return Null; }
+
+#else
+
+static Image sWin32Icon(HICON icon, bool cursor)
+{
+	DrawLock __;
+	ICONINFO iconinfo;
+	if(!icon || !GetIconInfo(icon, &iconinfo))
+		return Image();
+	BITMAP bm;
+	::GetObject((HGDIOBJ)iconinfo.hbmMask, sizeof(BITMAP), (LPVOID)&bm);
+	HDC dcMem = ::CreateCompatibleDC(NULL);
+	Size sz(bm.bmWidth, bm.bmHeight);
+	BitmapInfo32__ bi(sz.cx, sz.cy);
+	int len = sz.cx * sz.cy;
+	Buffer<RGBA> mask(len);
+	::SelectObject(dcMem, iconinfo.hbmColor);
+	::GetDIBits(dcMem, iconinfo.hbmMask, 0, sz.cy, ~mask, bi, DIB_RGB_COLORS);
+	ImageBuffer b(sz.cx, iconinfo.hbmColor ? sz.cy : sz.cy / 2);
+	b.SetHotSpot(Point(iconinfo.xHotspot, iconinfo.yHotspot));
+	if(iconinfo.hbmColor) {
+		::SelectObject(dcMem, iconinfo.hbmColor);
+		::GetDIBits(dcMem, iconinfo.hbmColor, 0, sz.cy, ~b, bi, DIB_RGB_COLORS);
+		RGBA *s = ~b;
+		RGBA *e = s + len;
+		RGBA *m = mask;
+		while(s < e) {
+			if(s->a != 255 && s->a != 0) {
+				Premultiply(b);
+				goto alpha;
+			}
+			s++;
+		}
+		s = ~b;
+		while(s < e) {
+			s->a = m->r ? 0 : 255;
+			s++;
+			m++;
+		}
+	}
+	else {
+		len /= 2;
+		RGBA *s = ~b;
+		RGBA *e = s + len;
+		RGBA *c = mask + len;
+		RGBA *m = mask;
+		while(s < e) {
+			s->a = (m->r & ~c->r) ? 0 : 255;
+			s->r = s->g = s->b = (c->r & ~m->r) ? 255 : 0;
+			s++;
+			m++;
+			c++;
+		}
+	}
+alpha:
+	::DeleteDC(dcMem);
+	::DeleteObject(iconinfo.hbmColor);
+	::DeleteObject(iconinfo.hbmMask);
+	Image img(b);
+	::DestroyIcon(icon);
+	return img;
+}
+
+Image Win32IconCursor(LPCSTR id, int iconsize, bool cursor)
+{
+	HICON icon;
+	if(cursor)
+		icon = (HICON)LoadCursor(0, id);
+	else
+		if(iconsize)
+			icon = (HICON)LoadImage(GetModuleHandle(NULL), id,
+			                        IMAGE_ICON, iconsize, iconsize, LR_DEFAULTCOLOR);
+		else
+			icon = LoadIcon(0, id);
+	Image img = sWin32Icon(icon, cursor);
+	if(cursor)
+		img.SetCursorCheat(id);
+	return img;
+}
+
+Image Win32DllIcon(const char *dll, int ii, bool large)
+{
+	HICON icon;
+	if(ExtractIconEx(dll, ii, large ? &icon : NULL, large ? NULL : &icon, 1) == 1)
+		return sWin32Icon(icon, false);
+	return Null;
+}
+
+Image Win32Icon(LPCSTR id, int iconsize)
+{
+	return Win32IconCursor(id, iconsize, false);
+}
+
+Image Win32Icon(int id, int iconsize)
+{
+	return Win32Icon(MAKEINTRESOURCE(id), iconsize);
+}
+
+Image Win32Cursor(LPCSTR id)
+{
+	return Win32IconCursor(id, 0, true);
+}
+
+Image Win32Cursor(int id)
+{
+	return Win32Cursor(MAKEINTRESOURCE(id));
+}
+
+HICON IconWin32(const Image& img, bool cursor)
+{
+	DrawLock __;
+	if(img.IsEmpty())
+		return NULL;
+	if(cursor) {
+		LPCSTR id = img.GetCursorCheat();
+		if(id)
+			return (HICON)LoadCursor(0, id);
+	}
+	Size sz = img.GetSize();
+	ICONINFO iconinfo;
+	iconinfo.fIcon = !cursor;
+	Point p = img.GetHotSpot();
+	iconinfo.xHotspot = p.x;
+	iconinfo.yHotspot = p.y;
+	static Size cursor_size(GetSystemMetrics(SM_CXCURSOR), GetSystemMetrics(SM_CYCURSOR));
+	Size tsz = sz;
+	if(!IsWin2K() && cursor)
+		tsz = cursor_size;
+	Size csz = Size(min(tsz.cx, sz.cx), min(tsz.cy, sz.cy));
+	if(IsWinXP() && !ImageFallBack) {
+		RGBA *pixels;
+		BitmapInfo32__ bi(tsz.cx, tsz.cy);
+		HDC dcMem = ::CreateCompatibleDC(NULL);
+		iconinfo.hbmColor = ::CreateDIBSection(dcMem, bi, DIB_RGB_COLORS, (void **)&pixels, NULL, 0);
+		iconinfo.hbmMask = ::CreateBitmap(tsz.cx, tsz.cy, 1, 1, NULL);
+		memset(pixels, 0, tsz.cx * tsz.cy * sizeof(RGBA));
+		for(int y = 0; y < csz.cy; y++)
+			memcpy(pixels + y * tsz.cx, img[y], csz.cx * sizeof(RGBA));
+		::DeleteDC(dcMem);
+	}
+	else {
+		Buffer<RGBA>  h(tsz.cx * tsz.cy);
+		HDC dc = ::GetDC(NULL);
+		BitmapInfo32__ bi(tsz.cx, tsz.cy);
+		iconinfo.hbmMask = CreateBitMask(~img, sz, tsz, csz, h);
+		iconinfo.hbmColor = ::CreateDIBitmap(dc, bi, CBM_INIT, h, bi, DIB_RGB_COLORS);
+		::ReleaseDC(NULL, dc);
+	}
+
+	HICON icon = ::CreateIconIndirect(&iconinfo);
+	::DeleteObject(iconinfo.hbmColor);
+	::DeleteObject(iconinfo.hbmMask);
+	return icon;
+}
+
+#define WCURSOR_(x)\
+{ Image m; INTERLOCKED { static Image img = Win32Cursor(x); m = img; } return m; }
+
+Image Image::Arrow() WCURSOR_(IDC_ARROW)
+Image Image::Wait() WCURSOR_(IDC_WAIT)
+Image Image::IBeam() WCURSOR_(IDC_IBEAM)
+Image Image::No() WCURSOR_(IDC_NO)
+Image Image::SizeAll() WCURSOR_(IDC_SIZEALL)
+Image Image::SizeHorz()	WCURSOR_(IDC_SIZEWE)
+Image Image::SizeVert() WCURSOR_(IDC_SIZENS)
+Image Image::SizeTopLeft() WCURSOR_(IDC_SIZENWSE)
+Image Image::SizeTop() WCURSOR_(IDC_SIZENS)
+Image Image::SizeTopRight() WCURSOR_(IDC_SIZENESW)
+Image Image::SizeLeft() WCURSOR_(IDC_SIZEWE)
+Image Image::SizeRight() WCURSOR_(IDC_SIZEWE)
+Image Image::SizeBottomLeft() WCURSOR_(IDC_SIZENESW)
+Image Image::SizeBottom() WCURSOR_(IDC_SIZENS)
+Image Image::SizeBottomRight()  WCURSOR_(IDC_SIZENWSE)
+Image Image::Cross() WCURSOR_(IDC_CROSS)
+Image Image::Hand() WCURSOR_(IDC_HAND)
+
+#endif
+
+#endif
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/Draw/ImageX11.cpp b/uppsrc/Draw/ImageX11.cpp
new file mode 100644
index 000000000..cacc4921f
--- /dev/null
+++ b/uppsrc/Draw/ImageX11.cpp
@@ -0,0 +1,406 @@
+#include "Draw.h"
+
+NAMESPACE_UPP
+
+#ifdef PLATFORM_X11
+
+static void sInitXImage(XImage& ximg, Size sz)
+{
+	Zero(ximg);
+	ximg.width            = sz.cx;
+	ximg.height           = sz.cy;
+	ximg.xoffset          = 0;
+	ximg.format           = ZPixmap;
+	ximg.bitmap_bit_order = MSBFirst;
+#ifdef CPU_LITTLE_ENDIAN
+	ximg.byte_order       = LSBFirst;
+#else
+	ximg.byte_order       = MSBFirst;
+#endif
+}
+
+void SetSurface(Draw& w, int x, int y, int cx, int cy, const RGBA *pixels)
+{
+	DrawLock __;
+	Pixmap pixmap = XCreatePixmap(Xdisplay, Xroot, cx, cy, 24);
+	XPicture picture = XRenderCreatePicture(
+		Xdisplay, pixmap,
+	    XRenderFindStandardFormat(Xdisplay, PictStandardRGB24),
+	    0, 0
+	);
+	XImage ximg;
+	sInitXImage(ximg, Size(cx, cy));
+	ximg.bitmap_pad = 32;
+	ximg.bytes_per_line = 4 * cx;
+	ximg.bits_per_pixel = 32;
+	ximg.blue_mask = 0x00ff0000;
+	ximg.green_mask = 0x0000ff00;
+	ximg.red_mask = 0x000000ff;
+	Buffer<RGBA> pma;
+	ximg.bitmap_unit = 32;
+	ximg.depth = 24;
+	ximg.data = (char *)pixels;
+	XInitImage(&ximg);
+	GC gc = XCreateGC(Xdisplay, pixmap, 0, 0);
+	XPutImage(Xdisplay, pixmap, gc, &ximg, 0, 0, 0, 0, cx, cy);
+	XFreeGC(Xdisplay, gc);
+	XFreePixmap(Xdisplay, pixmap);
+	XRenderComposite(Xdisplay, PictOpOver,
+	                 picture, 0, XftDrawPicture(w.GetXftDraw()),
+	                 0, 0, 0, 0, x, y, cx, cy);
+	XRenderFreePicture(Xdisplay, picture);
+}
+
+void Image::Data::SysInit()
+{
+	picture = 0;
+	picture8 = 0;
+	cursor_cheat = -1;
+}
+
+void Image::Data::SysRelease()
+{
+	if(picture) {
+		DrawLock __;
+		if(Xdisplay) XRenderFreePicture(Xdisplay, picture);
+		ResCount -= !paintonly;
+		picture = 0;
+	}
+	if(picture8) {
+		DrawLock __;
+		if(Xdisplay) XRenderFreePicture(Xdisplay, picture8);
+		ResCount -= !paintonly;
+		picture8 = 0;
+	}
+}
+
+struct XRSolidFill {
+	Color    color;
+	XPicture picture;
+	Pixmap   pixmap;
+};
+
+enum { XRSolidFillCount = 67 };
+
+static XRSolidFill sFill[XRSolidFillCount];
+
+inline int s255d16(int x)
+{
+	return (x << 8)|x;
+}
+
+static XPicture sGetSolidFill(Color c)
+{
+	DrawLock __;
+	int q = GetHashValue(c) % (int)XRSolidFillCount;
+	XRSolidFill& f = sFill[q];
+	if(f.color == c && f.picture)
+		return f.picture;
+	if(f.picture)
+		XRenderFreePicture(Xdisplay, f.picture);
+	if(f.pixmap)
+		XFreePixmap(Xdisplay, f.pixmap);
+	f.pixmap = XCreatePixmap(Xdisplay, Xroot, 1, 1, 32);
+	XRenderPictureAttributes attr;
+	attr.repeat = XTrue;
+	f.picture = XRenderCreatePicture(Xdisplay, f.pixmap,
+	                                 XRenderFindStandardFormat(Xdisplay, PictStandardARGB32),
+	                                                           CPRepeat, &attr);
+	f.color = c;
+	XRenderColor xc;
+	xc.red = s255d16(c.GetR());
+	xc.green = s255d16(c.GetG());
+	xc.blue = s255d16(c.GetB());
+	xc.alpha = 65535;
+	XRenderFillRectangle(Xdisplay, PictOpSrc, f.picture, &xc, 0, 0, 1, 1);
+	return f.picture;
+}
+
+void Image::Data::Paint(Draw& w, int x, int y, const Rect& src, Color c)
+{
+	DrawLock __;
+	while(ResCount > 512) {
+		Image::Data *l = ResData->GetPrev();
+		l->SysRelease();
+		l->Unlink();
+	}
+	x += w.GetOffset().x;
+	y += w.GetOffset().y;
+	Size sz = buffer.GetSize();
+	int  len = sz.cx * sz.cy;
+	Rect sr = src & sz;
+	Size ssz = sr.Size();
+	if(sr.IsEmpty())
+		return;
+	if(GetKind() == IMAGE_EMPTY)
+		return;
+	if(GetKind() == IMAGE_OPAQUE && !IsNull(c)) {
+		w.DrawRect(x, y, sz.cx, sz.cy, c);
+		return;
+	}
+	if(GetKind() == IMAGE_OPAQUE && paintcount == 0 && sr == Rect(sz)) {
+		SetSurface(w, x, y, sz.cx, sz.cy, buffer);
+		paintcount++;
+		return;
+	}
+	Unlink();
+	LinkAfter(ResData);
+	if(IsNull(c)) {
+		if(!picture) {
+			bool opaque = GetKind() == IMAGE_OPAQUE;
+			Pixmap pixmap = XCreatePixmap(Xdisplay, Xroot, sz.cx, sz.cy, opaque ? 24 : 32);
+			picture = XRenderCreatePicture(
+				Xdisplay, pixmap,
+			    XRenderFindStandardFormat(Xdisplay, opaque ? PictStandardRGB24
+			                                               : PictStandardARGB32),
+			    0, 0
+			);
+			ResCount++;
+			XImage ximg;
+			sInitXImage(ximg, sz);
+			ximg.bitmap_pad = 32;
+			ximg.bytes_per_line = 4 * sz.cx;
+			ximg.bits_per_pixel = 32;
+			ximg.blue_mask = 0x00ff0000;
+			ximg.green_mask = 0x0000ff00;
+			ximg.red_mask = 0x000000ff;
+			ximg.bitmap_unit = 32;
+			ximg.data = (char *)~buffer;
+			ximg.depth = opaque ? 24 : 32;
+			XInitImage(&ximg);
+			GC gc = XCreateGC(Xdisplay, pixmap, 0, 0);
+			XPutImage(Xdisplay, pixmap, gc, &ximg, 0, 0, 0, 0, sz.cx, sz.cy);
+			XFreeGC(Xdisplay, gc);
+			XFreePixmap(Xdisplay, pixmap);
+			PaintOnlyShrink();
+		}
+		XRenderComposite(Xdisplay, PictOpOver,
+		                 picture, 0, XftDrawPicture(w.GetXftDraw()),
+		                 sr.left, sr.top, 0, 0, x, y, ssz.cx, ssz.cy);
+	}
+	else {
+		ASSERT(!paintonly);
+		if(!picture8) {
+			Pixmap pixmap = XCreatePixmap(Xdisplay, Xroot, sz.cx, sz.cy, 8);
+			picture8 = XRenderCreatePicture(Xdisplay, pixmap,
+			                                XRenderFindStandardFormat(Xdisplay, PictStandardA8),
+			                                0, 0);
+			ResCount++;
+			Buffer<byte> ab(len);
+			byte *t = ab;
+			const RGBA *s = buffer;
+			const RGBA *e = s + len;
+			while(s < e)
+				*t++ = (s++)->a;
+			XImage ximg;
+			sInitXImage(ximg, sz);
+			ximg.data             = (char *)~ab;
+			ximg.bitmap_unit      = 8;
+			ximg.bitmap_pad       = 8;
+			ximg.depth            = 8;
+			ximg.bytes_per_line   = sz.cx;
+			ximg.bits_per_pixel   = 8;
+			XInitImage(&ximg);
+			GC gc = XCreateGC(Xdisplay, pixmap, 0, 0);
+			XPutImage(Xdisplay, pixmap, gc, &ximg, 0, 0, 0, 0, sz.cx, sz.cy);
+			XFreeGC(Xdisplay, gc);
+			XFreePixmap(Xdisplay, pixmap);
+		}
+		XRenderComposite(Xdisplay, PictOpOver,
+		                 sGetSolidFill(c), picture8, XftDrawPicture(w.GetXftDraw()),
+		                 sr.left, sr.top, 0, 0, x, y, ssz.cx, ssz.cy);
+	}
+}
+
+void ImageDraw::Init()
+{
+	DrawLock __;
+	dw = XCreatePixmap(Xdisplay, Xroot, max(size.cx, 1), max(size.cy, 1), Xdepth);
+	gc = XCreateGC(Xdisplay, dw, 0, 0);
+	xftdraw = XftDrawCreate(Xdisplay, (Drawable) dw, DefaultVisual(Xdisplay, Xscreenno), Xcolormap);
+
+	alpha.dw = XCreatePixmap(Xdisplay, Xroot, max(size.cx, 1), max(size.cy, 1), Xdepth);
+	alpha.gc = XCreateGC(Xdisplay, alpha.dw, 0, 0);
+	alpha.xftdraw = XftDrawCreate(Xdisplay, (Drawable) alpha.dw, DefaultVisual(Xdisplay, Xscreenno), Xcolormap);
+
+	Vector<Rect> clip;
+	clip.Add(RectC(0, 0, size.cx, size.cy));
+	Draw::Init(clip, Point(0, 0));
+	alpha.Init(clip, Point(0, 0));
+
+	has_alpha = false;
+}
+
+ImageDraw::operator Image() const
+{
+	DrawLock __;
+	XImage *xim = XGetImage(Xdisplay, dw, 0, 0, max(size.cx, 1), max(size.cy, 1), AllPlanes, ZPixmap);
+	Visual *v = DefaultVisual(Xdisplay, Xscreenno);
+	RasterFormat fmt;
+
+	RGBA   palette[256];
+
+	switch(xim->depth) {
+	case 15:
+	case 16:
+		if(xim->byte_order == LSBFirst)
+			fmt.Set16le(v->red_mask, v->green_mask, v->blue_mask);
+		else
+			fmt.Set16be(v->red_mask, v->green_mask, v->blue_mask);
+		break;
+	case 8: {
+		int n = min(v->map_entries, 256);
+		XColor colors[256];
+		for(int i = 0; i < 256; i++) {
+			colors[i].pixel = i;
+			colors[i].flags = DoRed|DoGreen|DoBlue;
+		}
+		XQueryColors(Xdisplay, Xcolormap, colors, n);
+		XColor *s = colors;
+		XColor *e = s + n;
+		while(s < e) {
+			RGBA& t = palette[s->pixel];
+			t.r = s->red >> 8;
+			t.g = s->green >> 8;
+			t.b = s->blue >> 8;
+			t.a = 255;
+			s++;
+		}
+		fmt.Set8();
+		break;
+	}
+	default:
+		if(xim->bits_per_pixel == 32)
+			if(xim->byte_order == LSBFirst)
+				fmt.Set32le(v->red_mask, v->green_mask, v->blue_mask);
+			else
+				fmt.Set32be(v->red_mask, v->green_mask, v->blue_mask);
+		else
+			if(xim->byte_order == LSBFirst)
+				fmt.Set24le(v->red_mask, v->green_mask, v->blue_mask);
+			else
+				fmt.Set24be(v->red_mask, v->green_mask, v->blue_mask);
+		break;
+	}
+
+	ImageBuffer ib(size);
+	const byte *s = (const byte *)xim->data;
+	RGBA *t = ib;
+	for(int y = 0; y < size.cy; y++) {
+		fmt.Read(t, s, size.cx, palette);
+		s += xim->bytes_per_line;
+		t += size.cx;
+	}
+	XDestroyImage(xim);
+	if(has_alpha) {
+		xim = XGetImage(Xdisplay, alpha.dw, 0, 0, size.cx, size.cy, AllPlanes, ZPixmap);
+		const byte *s = (const byte *)xim->data;
+		t = ib;
+		Buffer<RGBA> line(size.cx);
+		for(int y = 0; y < size.cy; y++) {
+			fmt.Read(line, s, size.cx, palette);
+			for(int x = 0; x < size.cx; x++)
+				(t++)->a = line[x].r;
+			s += xim->bytes_per_line;
+		}
+		XDestroyImage(xim);
+	}
+	Premultiply(ib);
+	return ib;
+}
+
+ImageDraw::ImageDraw(Size sz)
+{
+	size = sz;
+	Init();
+}
+
+ImageDraw::ImageDraw(int cx, int cy)
+{
+	size = Size(cx, cy);
+	Init();
+}
+
+ImageDraw::~ImageDraw()
+{
+	DrawLock __;
+	XftDrawDestroy(xftdraw);
+	XFreePixmap(Xdisplay, dw);
+	XFreeGC(Xdisplay, gc);
+	XftDrawDestroy(alpha.xftdraw);
+	XFreePixmap(Xdisplay, alpha.dw);
+	XFreeGC(Xdisplay, alpha.gc);
+}
+
+Image sX11Cursor__(int c)
+{
+	ImageBuffer b(32, 32);
+	Image m(b);
+	m.SetCursorCheat(c);
+	return m;
+}
+
+#include <X11/cursorfont.h>
+
+#define FCURSOR_(x) { Image h; INTERLOCKED { static Image m = sX11Cursor__(x); h = m; } return h; }
+
+Image Image::Arrow() FCURSOR_(XC_left_ptr)
+Image Image::Wait() FCURSOR_(XC_watch)
+Image Image::IBeam() FCURSOR_(XC_xterm)
+Image Image::No() FCURSOR_(XC_circle)
+Image Image::SizeAll() FCURSOR_(XC_fleur)
+Image Image::SizeHorz() FCURSOR_(XC_sb_h_double_arrow)
+Image Image::SizeVert() FCURSOR_(XC_double_arrow)
+Image Image::SizeTopLeft() FCURSOR_(XC_top_left_corner)
+Image Image::SizeTop() FCURSOR_(XC_top_side)
+Image Image::SizeTopRight() FCURSOR_(XC_top_right_corner)
+Image Image::SizeLeft() FCURSOR_(XC_left_side)
+Image Image::SizeRight() FCURSOR_(XC_right_side)
+Image Image::SizeBottomLeft() FCURSOR_(XC_bottom_left_corner)
+Image Image::SizeBottom() FCURSOR_(XC_bottom_side)
+Image Image::SizeBottomRight()  FCURSOR_(XC_bottom_right_corner)
+Image Image::Cross() FCURSOR_(XC_crosshair)
+Image Image::Hand() FCURSOR_(XC_hand1)
+
+Cursor X11Cursor(const Image& img)
+{
+	DrawLock __;
+	int q = img.GetCursorCheat();
+	if(q >= 0)
+		return XCreateFontCursor(Xdisplay, q);
+	int len = img.GetLength();
+	Size sz = img.GetSize();
+	Pixmap pixmap = XCreatePixmap(Xdisplay, Xroot, sz.cx, sz.cy, 32);
+	XPicture picture = XRenderCreatePicture(
+		Xdisplay, pixmap,
+	    XRenderFindStandardFormat(Xdisplay, PictStandardARGB32),
+	    0, 0
+	);
+	XImage ximg;
+	sInitXImage(ximg, sz);
+	ximg.bitmap_pad = 32;
+	ximg.bytes_per_line = 4 * sz.cx;
+	ximg.bits_per_pixel = 32;
+	ximg.blue_mask = 0x00ff0000;
+	ximg.green_mask = 0x0000ff00;
+	ximg.red_mask = 0x000000ff;
+	Buffer<RGBA> pma;
+	pma.Alloc(len);
+	memcpy(pma, ~img, len * sizeof(RGBA));
+	ximg.bitmap_unit = 32;
+	ximg.depth = 32;
+	ximg.data = (char *)~pma;
+	XInitImage(&ximg);
+	GC gc = XCreateGC(Xdisplay, pixmap, 0, 0);
+	XPutImage(Xdisplay, pixmap, gc, &ximg, 0, 0, 0, 0, sz.cx, sz.cy);
+	XFreeGC(Xdisplay, gc);
+	XFreePixmap(Xdisplay, pixmap);
+	Point p = img.GetHotSpot();
+	Cursor c = XRenderCreateCursor(Xdisplay, picture, p.x, p.y);
+	XRenderFreePicture(Xdisplay, picture);
+	return c;
+}
+
+#endif
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/Draw/MakeCache.cpp b/uppsrc/Draw/MakeCache.cpp
new file mode 100644
index 000000000..5f4522ca3
--- /dev/null
+++ b/uppsrc/Draw/MakeCache.cpp
@@ -0,0 +1,171 @@
+#include "Draw.h"
+
+NAMESPACE_UPP
+
+#define LLOG(x)  // LOG(x)
+
+static StaticCriticalSection sMakeImage;
+
+static LRUCache<Image>& sImageCache()
+{
+	static LRUCache<Image> m;
+	return m;
+}
+
+struct scImageMaker : LRUCache<Image>::Maker {
+	const ImageMaker *m;
+	bool  paintonly;
+
+	virtual String Key() const {
+		String q = m->Key();
+		return m->Key();
+	}
+	virtual int    Make(Image& object) const {
+		object = m->Make();
+		if(paintonly) {
+			SetPaintOnly___(object);
+			return object.GetLength() + 20000;
+		}
+		return object.GetLength() + 100;
+	}
+};
+
+static int sMaxSize;
+static int sMaxSizeMax = 4000000;
+
+void SetMakeImageCacheMax(int m)
+{
+	sMaxSizeMax = m;
+}
+
+void  SetMakeImageCacheSize(int m)
+{
+	sMaxSize = m;
+}
+
+void SweepMkImageCache()
+{
+	INTERLOCKED_(sMakeImage) {
+		LRUCache<Image>& cache = sImageCache();
+		cache.ClearCounters();
+	}
+}
+
+Image MakeImage__(const ImageMaker& m, bool paintonly)
+{
+	Image result;
+	INTERLOCKED_(sMakeImage) {
+		LRUCache<Image>& cache = sImageCache();
+		scImageMaker cm;
+		cm.m = &m;
+		cm.paintonly = paintonly;
+		result = cache.Get(cm);
+		int q = min(cache.GetFoundSize() + cache.GetNewSize(), sMaxSizeMax);
+		if(q > sMaxSize) {
+			sMaxSize = q;
+			LLOG("ImageCache: Increasing maxsize to " << sMaxSize);
+		}
+		cache.Shrink(sMaxSize);
+	}
+	return result;
+}
+
+Image MakeImage(const ImageMaker& m)
+{
+	return MakeImage__(m, false);
+}
+
+Image MakeImagePaintOnly(const ImageMaker& m)
+{
+	return MakeImage__(m, true);
+}
+
+class SimpleImageMaker : public ImageMaker {
+	Image (*make)(const Image& image);
+	Image image;
+
+public:
+	virtual String Key() const;
+	virtual Image  Make() const;
+
+	SimpleImageMaker(const Image& image, Image (*make)(const Image& image))
+	:	make(make),image(image) {}
+};
+
+String SimpleImageMaker::Key() const
+{
+	String key;
+	int64 k = image.GetSerialId();
+	key.Cat((const char *)&k, sizeof(int64));
+	key.Cat((const char *)&make, sizeof(make));
+	return key;
+}
+
+Image SimpleImageMaker::Make() const
+{
+	return (*make)(image);
+}
+
+Image MakeImage(const Image& image, Image (*make)(const Image& image))
+{
+	return MakeImage(SimpleImageMaker(image, make));
+}
+
+struct sCachedRescale : public ImageMaker
+{
+	Rect  src;
+	Size  sz;
+	Image img;
+
+	virtual String Key() const {
+		StringBuffer h;
+		RawCat(h, src.left);
+		RawCat(h, src.top);
+		RawCat(h, src.right);
+		RawCat(h, src.bottom);
+		RawCat(h, sz.cx);
+		RawCat(h, sz.cy);
+		RawCat(h, img.GetSerialId());
+		return h;
+	}
+
+	virtual Image Make() const {
+		return Rescale(img, sz, src);
+	}
+
+};
+
+Image CachedRescale(const Image& m, Size sz, const Rect& src)
+{
+	if(m.GetSize() == sz)
+		return m;
+	sCachedRescale cr;
+	cr.sz = sz;
+	cr.src = src;
+	cr.img = m;
+	return MakeImage(cr);
+}
+
+Image CachedRescale(const Image& m, Size sz)
+{
+	return CachedRescale(m, sz, m.GetSize());
+}
+
+Image CachedRescalePaintOnly(const Image& m, Size sz, const Rect& src)
+{
+	if(m.GetSize() == sz)
+		return m;
+	sCachedRescale cr;
+	cr.sz = sz;
+	cr.src = src;
+	cr.img = m;
+	return MakeImagePaintOnly(cr);
+}
+
+Image CachedRescalePaintOnly(const Image& m, Size sz)
+{
+	return CachedRescalePaintOnly(m, sz, m.GetSize());
+}
+
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/Draw/MetaFile.cpp b/uppsrc/Draw/MetaFile.cpp
new file mode 100644
index 000000000..3ef145665
--- /dev/null
+++ b/uppsrc/Draw/MetaFile.cpp
@@ -0,0 +1,270 @@
+#include "Draw.h"
+
+NAMESPACE_UPP
+
+#ifdef PLATFORM_WIN32
+#ifndef PLATFORM_WINCE
+
+static void wsMetaDraw(Draw& w, Stream& s, const DrawingPos& ps) {
+	Rect r;
+	WinMetaFile wmf;
+	s % r % wmf;
+	wmf.Paint(w, ps(r));
+}
+
+INITBLOCK {
+	Draw::Register(555, wsMetaDraw);
+};
+
+void WinMetaFile::Init() {
+	hemf = NULL;
+}
+
+void WinMetaFile::Paint(Draw& w, const Rect& r) const {
+	ChkP();
+	DrawingDraw *dw = dynamic_cast<DrawingDraw *>(&w);
+	if(dw) {
+		Stream& s = dw->DrawingOp(555) % const_cast<Rect&>(r);
+		s % const_cast<WinMetaFile&>(*this);
+		return;
+	}
+	if(hemf)
+		PlayEnhMetaFile(w, hemf, r);
+}
+
+void WinMetaFile::Paint(Draw& w, int x, int y, int cx, int cy) const {
+	Paint(w, RectC(x, y, cx, cy));
+}
+
+void WinMetaFile::ReadClipboard() {
+	Clear();
+	if(::IsClipboardFormatAvailable(CF_ENHMETAFILE) && ::OpenClipboard(NULL)) {
+		HENHMETAFILE hemf = (HENHMETAFILE) ::GetClipboardData(CF_ENHMETAFILE);
+		if(hemf) Attach(hemf);
+		::CloseClipboard();
+	}
+}
+
+void WinMetaFile::WriteClipboard() const {
+	if(hemf && ::OpenClipboard(NULL)) {
+		::EmptyClipboard();
+		::SetClipboardData(CF_ENHMETAFILE, CopyEnhMetaFile(hemf, NULL));
+		::CloseClipboard();
+	}
+}
+
+void WinMetaFile::Clear() {
+	if(hemf && !IsPicked())
+		::DeleteEnhMetaFile(hemf);
+	hemf = NULL;
+}
+
+void WinMetaFile::Pick(pick_ WinMetaFile& src) {
+	hemf = src.hemf;
+	size = src.size;
+	src.hemf = (HENHMETAFILE)(intptr_t) 0xffffffff;
+}
+
+void WinMetaFile::Copy(const WinMetaFile& src) {
+	hemf = ::CopyEnhMetaFile(src.hemf, NULL);
+	size = src.size;
+}
+
+void WinMetaFile::Attach(HENHMETAFILE _hemf) {
+	Clear();
+	ENHMETAHEADER info;
+	memset(&info, 0, sizeof(info));
+	info.iType = EMR_HEADER;
+	info.nSize = sizeof(info);
+	info.dSignature = ENHMETA_SIGNATURE;
+	if(_hemf && ::GetEnhMetaFileHeader(_hemf, sizeof(info), &info)
+	   && info.rclFrame.left < info.rclFrame.right
+	   && info.rclFrame.top < info.rclFrame.bottom) {
+		size.cx = 600 * (info.rclFrame.right - info.rclFrame.left) / 2540;
+		size.cy = 600 * (info.rclFrame.bottom - info.rclFrame.top) / 2540;
+		hemf = _hemf;
+	}
+}
+
+#pragma pack(push, 1)
+struct PLACEABLE_METAFILEHEADER
+{
+    DWORD   key;
+    WORD    hmf;
+    short   left, top, right, bottom;
+    WORD    inch;
+    DWORD   reserved;
+    WORD    checksum;
+};
+#pragma pack(pop)
+
+bool WinMetaFile::Load(const char* path) {
+	Clear();
+	FileIn file(path);
+	if(!file.Open(path) || file.GetSize() <= sizeof(ENHMETAHEADER))
+		return false;
+
+	int first = file.Get32le();
+	file.Seek(0);
+
+	HENHMETAFILE hemf;
+	HMETAFILE hMF;
+	Size sz(1000, 1000);
+
+	if(first == 0x9AC6CDD7) {
+		PLACEABLE_METAFILEHEADER mfh;
+		file.Get(&mfh, 22);
+		String bits = LoadStream(file);
+		if((hMF = ::SetMetaFileBitsEx(bits.GetLength(), bits)) == NULL)
+			return false;
+		sz = Size(mfh.right - mfh.left, mfh.bottom - mfh.top);
+	}
+	else
+	if((hemf = ::GetEnhMetaFile(path)) != NULL) {
+		Attach(hemf);
+		return true;
+	}
+	else
+	if((LOWORD(first) == 1 || LOWORD(first) == 2) && HIWORD(first) >= sizeof(METAHEADER) / 2) {
+		METAHEADER mh;
+		if(!file.GetAll(&mh, sizeof(mh)))
+			return false;
+		if(mh.mtVersion != 0x100 && mh.mtVersion != 0x300)
+			return false;
+		if((hMF = ::GetMetaFile(path)) == NULL)
+			return false;
+	}
+	else
+		return false;
+
+	dword len = ::GetMetaFileBitsEx(hMF, 0, NULL);
+	Buffer<byte> bits(len);
+	::GetMetaFileBitsEx(hMF, len, bits);
+	Attach(::SetWinMetaFileBits(len, bits, NULL, NULL));
+	::DeleteMetaFile(hMF);
+	size = sz;
+	return true;
+}
+
+void WinMetaFile::Serialize(Stream& s) {
+	dword size = 0;
+	if(s.IsStoring()) {
+		if(hemf) {
+			size = ::GetEnhMetaFileBits(hemf, 0, 0);
+			s % size;
+			Buffer<byte> buffer(size);
+			::GetEnhMetaFileBits(hemf, size, buffer);
+			s.SerializeRaw(buffer, size);
+		}
+		else
+			s % size;
+	}
+	else {
+		Clear();
+		s % size;
+		if(size) {
+			Buffer<byte> buffer(size);
+			s.SerializeRaw(buffer, size);
+			HENHMETAFILE hemf = ::SetEnhMetaFileBits(size, buffer);
+			Attach(hemf);
+		}
+	}
+}
+
+WinMetaFile::WinMetaFile(HENHMETAFILE hemf) {
+	Init();
+	Attach(hemf);
+}
+
+WinMetaFile::WinMetaFile(HENHMETAFILE hemf, Size sz) {
+	Init();
+	Attach(hemf);
+	size = sz;
+}
+
+WinMetaFile::WinMetaFile(const char *file) {
+	Init();
+	Load(file);
+}
+
+bool WinMetaFileDraw::Create(HDC hdc, int cx, int cy, const char *app, const char *name, const char *file) {
+	if(handle) Close();
+
+	String s;
+	if(app) s.Cat(app);
+	s.Cat('\0');
+	if(name) s.Cat(name);
+	s.Cat('\0');
+
+	bool del = false;
+	if(!hdc) {
+		hdc = ::GetWindowDC((HWND) NULL);
+		del = true;
+	}
+	size = Size(iscale(cx, 2540, 600), iscale(cy, 2540, 600));
+
+	Rect r = size;
+
+	HDC mfdc = ::CreateEnhMetaFile(hdc, file, r, name || app ? (const char *)s : NULL);
+	if(!mfdc)
+		return false;
+	Size px(max(1, ::GetDeviceCaps(mfdc, HORZRES)),  max(1, ::GetDeviceCaps(mfdc, VERTRES)));
+	Size mm(max(1, ::GetDeviceCaps(mfdc, HORZSIZE)), max(1, ::GetDeviceCaps(mfdc, VERTSIZE)));
+	Attach(mfdc);
+
+	Init();
+
+	pixels = false;
+
+	::SetMapMode(handle, MM_ANISOTROPIC);
+	::SetWindowOrgEx(handle, 0, 0, 0);
+	::SetWindowExtEx(handle, 600, 600, 0);
+	::SetViewportOrgEx(handle, 0, 0, 0);
+	::SetViewportExtEx(handle, px.cx * 254 / (10 * mm.cx), px.cy * 254 / (10 * mm.cy), 0);
+	::SelectClipRgn(mfdc, NULL);
+	::IntersectClipRect(mfdc, 0, 0, cx, cy);
+
+	if(del) {
+		::ReleaseDC((HWND) NULL, hdc);
+		hdc = NULL;
+	}
+
+	actual_offset = Point(0, 0);
+
+	printer = false;
+	pixels = false;
+	actual_offset = Point(0, 0);
+	device = -1;
+	aborted = false;
+	palette = false;
+	backdraw = true;
+
+	return true;
+}
+
+bool WinMetaFileDraw::Create(int cx, int cy, const char *app, const char *name, const char *file) {
+	return Create(NULL, cx, cy, app, name, file);
+}
+
+WinMetaFile WinMetaFileDraw::Close() {
+	HDC hdc = Detach();
+	ASSERT(hdc);
+	return WinMetaFile(CloseEnhMetaFile(hdc), size);
+}
+
+WinMetaFileDraw::~WinMetaFileDraw() {
+	if(handle) Close();
+}
+
+WinMetaFileDraw::WinMetaFileDraw(HDC hdc, int cx, int cy, const char *app, const char *name, const char *file) {
+	Create(hdc, cx, cy, app, name, file);
+}
+
+WinMetaFileDraw::WinMetaFileDraw(int cx, int cy, const char *app, const char *name, const char *file) {
+	Create(cx, cy, app, name, file);
+}
+
+#endif
+#endif
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/Draw/Palette.cpp b/uppsrc/Draw/Palette.cpp
new file mode 100644
index 000000000..5bc9cae13
--- /dev/null
+++ b/uppsrc/Draw/Palette.cpp
@@ -0,0 +1,281 @@
+#include "Draw.h"
+
+NAMESPACE_UPP
+
+#define LTIMING(x)
+
+struct sPalCv {
+	PaletteCv&  cv_pal;
+	const RGBA *palette;
+	int         ncolors;
+	bool        done[RASTER_MAP_G];
+	struct Ginfo {
+		int   dist;
+		byte  g;
+		byte  ii;
+	};
+
+	enum _n { BINS = 16, BINSHIFT = 11 };
+
+	Ginfo       line[BINS][256];
+	Ginfo      *eline[BINS];
+	byte       *gline;
+
+	static int Sq(int a, int b) { return (a - b) * (a - b); }
+
+	void SetLine(int r, int b);
+	int  Get(int g);
+
+	sPalCv(const RGBA *palette, int ncolors, PaletteCv& cv_pal);
+	sPalCv(const RGBA *palette, int ncolors, PaletteCv& cv_pal,
+	       int histogram[RASTER_MAP_R][RASTER_MAP_G][RASTER_MAP_B]);
+};
+
+void sPalCv::SetLine(int r, int b)
+{
+	gline = cv_pal.At(r, b);
+	r = 255 * r / (RASTER_MAP_R - 1); //IMPROVE!
+	b = 255 * b / (RASTER_MAP_B - 1);
+	for(int i = 0; i < BINS; i++)
+		eline[i] = line[i];
+	for(int i = 0; i < ncolors; i++) {
+		int dist = Sq(palette[i].r, r) + Sq(palette[i].b, b);
+		int bini = dist >> BINSHIFT;
+		Ginfo *t = eline[bini >= BINS ? BINS - 1 : bini]++;
+		t->dist = dist;
+		t->g = palette[i].g;
+		t->ii = i;
+	}
+	ZeroArray(done);
+}
+
+int sPalCv::Get(int g)
+{
+	if(done[g])
+		return gline[g];
+	int gg = 255 * g / (RASTER_MAP_G - 1);
+	int ii = 0;
+	int dist = INT_MAX;
+	for(int th = 0; th < BINS; th++) {
+		Ginfo *s = line[th];
+		Ginfo *e = eline[th];
+		while(s < e) {
+			int sdist = Sq(s->g, gg) + s->dist;
+			if(sdist < dist) {
+				ii = s->ii;
+				dist = sdist;
+			}
+			s++;
+		}
+		if(th < BINS - 1 && dist < ((th + 1) << BINSHIFT))
+			break;
+	}
+	done[g] = true;
+	gline[g] = ii;
+	return ii;
+}
+
+sPalCv::sPalCv(const RGBA *palette, int ncolors, PaletteCv& cv_pal)
+:	cv_pal(cv_pal), palette(palette), ncolors(ncolors)
+{
+	byte ender[256];
+	for(int b = 0; b < RASTER_MAP_B; b++) {
+		ZeroArray(ender);
+		for(int r = 0; r < RASTER_MAP_R; r++) {
+			SetLine(r, b);
+			int g = 0;
+			while(g < RASTER_MAP_G) {
+				int ii = Get(g);
+				int eg = max<int>(g, ender[ii]);
+				if(Get(eg) == ii)
+					while(eg < RASTER_MAP_G - 1 && Get(eg + 1) == ii)
+						eg++;
+				else
+					while(Get(eg) != ii)
+						eg--;
+				ender[ii] = eg;
+				g++;
+				while(g <= eg - 1) {
+					gline[g] = ii;
+					done[g] = true;
+					g++;
+				}
+			}
+		}
+	}
+}
+
+sPalCv::sPalCv(const RGBA *palette, int ncolors, PaletteCv& cv_pal,
+               int histogram[RASTER_MAP_R][RASTER_MAP_G][RASTER_MAP_B])
+:	cv_pal(cv_pal), palette(palette), ncolors(ncolors)
+{
+	for(int b = 0; b < RASTER_MAP_B; b++) {
+		for(int r = 0; r < RASTER_MAP_R; r++) {
+			SetLine(r, b);
+			for(int g = 0; g < RASTER_MAP_G; g++)
+				if(histogram[r][g][b])
+					Get(g);
+		}
+	}
+}
+
+struct sPalMaker {
+	int        histogram[RASTER_MAP_R][RASTER_MAP_G][RASTER_MAP_B];
+	int        colorcount;
+	struct Dim {
+		int l, h;
+
+		operator int() { return h - l; }
+	};
+	enum { G = 0, R = 1, B = 2 };
+	void Copy(Dim *d, Dim *s)   { d[R] = s[R]; d[G] = s[G]; d[B] = s[B]; }
+	struct Box {
+		int     volume;
+		int     colorcount;
+		int     population;
+		Dim     dim[3];
+		int     avg_r, avg_g, avg_b;
+
+		Dim&    operator[](int i)    { return dim[i]; }
+	};
+
+	void Update(Box& box, int ii);
+
+	sPalMaker(Raster& raster, RGBA *palette, int ncolors);
+};
+
+void sPalMaker::Update(Box& x, int ii)
+{
+	x.colorcount = 0;
+	x.population = 0;
+	int a[3][RASTER_MAP_MAX];
+	ZeroArray(a[R]);
+	ZeroArray(a[G]);
+	ZeroArray(a[B]);
+	x.avg_r = x.avg_g = x.avg_b = 0;
+	for(int r = x[R].l; r < x[R].h; r++)
+		for(int g = x[G].l; g < x[G].h; g++)
+			for(int b = x[B].l; b < x[B].h; b++) {
+				int q = histogram[r][g][b];
+				a[R][r] += q;
+				a[G][g] += q;
+				a[B][b] += q;
+				x.avg_r += q * r;
+				x.avg_g += q * g;
+				x.avg_b += q * b;
+			#ifdef CPU_X86
+				x.colorcount += q > 0;
+			#else
+				x.colorcount += (-q >> 31) & 1;
+			#endif
+				x.population += q;
+			}
+	for(int i = 0; i < 3; i++) {
+		Dim& d = x[i];
+		while(d.l < d.h && a[i][d.l] == 0)
+			d.l++;
+		while(d.h > d.l && a[i][d.h - 1] == 0)
+			d.h--;
+	}
+	x.volume = x[R] * x[G] * x[B];
+}
+
+static byte sRc(int avg, int pop, int div)
+{
+	return Saturate255(255 * (avg + (pop >> 1)) / pop / (div - 1));
+}
+
+sPalMaker::sPalMaker(Raster& raster, RGBA *palette, int ncolors)
+{
+	ASSERT(ncolors <= 256);
+	ZeroArray(histogram);
+	Size sz = raster.GetSize();
+	for(int y = 0; y < sz.cy; y++) {
+		Raster::Line line = raster[y];
+		const RGBA *s = line;
+		const RGBA *e = s + sz.cx;
+		while(s < e) {
+			histogram[s->r >> RASTER_SHIFT_R][s->g >> RASTER_SHIFT_G][s->b >> RASTER_SHIFT_B]++;
+			s++;
+		}
+	}
+	Buffer<Box> box(256);
+	box[0][R].l = 0;
+	box[0][R].h = RASTER_MAP_R;
+	box[0][G].l = 0;
+	box[0][G].h = RASTER_MAP_G;
+	box[0][B].l = 0;
+	box[0][B].h = RASTER_MAP_B;
+	Update(box[0], 0);
+	if(box[0].population == 0)
+		return;
+	colorcount = box[0].colorcount;
+	int count = 1;
+	int method = 0;
+	while(count < ncolors) {
+		int ii = -1;
+		int maxv = 0;
+		if(2 * count > ncolors)
+			method = 1;
+		for(int i = 0; i < count; i++) {
+			int v = method ? box[i].volume : box[i].colorcount;
+			if(box[i].colorcount > 1 && v > maxv) {
+				ii = i;
+				maxv = v;
+			}
+		}
+		if(ii < 0)
+			break;
+		Box& b = box[ii];
+		int ci = b[R] > b[G] ? b[B] > b[R] ? B : R : b[B] > b[G] ? B : G;
+		if(b[ci] == 1) {
+			if(method == 1)
+				break;
+			method = 1;
+		}
+		else {
+			int m = (b[ci].l + b[ci].h) >> 1;
+			Box& b1 = box[count];
+			b1 = b;
+			b[ci].h = m;
+			b1[ci].l = m;
+			Update(b, ii);
+			Update(b1, count++);
+		}
+	}
+	for(int i = 0; i < count; i++) {
+		RGBA& c = palette[i];
+		Box& x = box[i];
+		c.r = sRc(x.avg_r, x.population, RASTER_MAP_R);
+		c.g = sRc(x.avg_g, x.population, RASTER_MAP_G);
+		c.b = sRc(x.avg_b, x.population, RASTER_MAP_B);
+		c.a = 255;
+	}
+}
+
+void CreatePaletteCv(const RGBA *palette, int ncolors, PaletteCv& cv_pal)
+{
+	LTIMING("PaletteCv");
+	ASSERT(ncolors <= 256);
+	delete new sPalCv(palette, ncolors, cv_pal);
+}
+
+void CreatePalette(Raster& raster, RGBA *palette, int ncolors)
+{
+	LTIMING("Palette");
+	ASSERT(ncolors <= 256);
+	delete new sPalMaker(raster, palette, ncolors);
+}
+
+void CreatePalette(Raster& raster, RGBA *palette, int ncolors, PaletteCv& cv)
+{
+	LTIMING("Palette+Cv");
+	ASSERT(ncolors <= 256);
+	One<sPalMaker> m = new sPalMaker(raster, palette, ncolors);
+	if(m->colorcount < 15000) // Is that right!?
+		delete new sPalCv(palette, ncolors, cv, m->histogram);
+	else
+		CreatePaletteCv(palette, ncolors, cv);
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/Draw/Raster.cpp b/uppsrc/Draw/Raster.cpp
new file mode 100644
index 000000000..a65f80bd9
--- /dev/null
+++ b/uppsrc/Draw/Raster.cpp
@@ -0,0 +1,255 @@
+#include "Draw.h"
+
+NAMESPACE_UPP
+
+Raster::Info::Info()
+{
+	bpp = 24;
+	colors = 1 << 24;
+	dots = Size(0, 0);
+	hotspot = Point(0, 0);
+	kind = IMAGE_OPAQUE;
+}
+
+const RasterFormat *Raster::GetFormat()
+{
+	return NULL;
+}
+
+void Raster::SeekPage(int page)
+{
+	ASSERT(page == 0);
+}
+
+int Raster::GetPageCount()
+{
+	return 1;
+}
+
+void Raster::Line::Pick(pick_ Line& b)
+{
+	data = b.data;
+	fmtdata = b.fmtdata;
+	raster = b.raster;
+	free = b.free;
+	fmtfree = b.fmtfree;
+	const_cast<Line *>(&b)->free = const_cast<Line *>(&b)->fmtfree = false;
+#ifdef _DEBUG
+	const_cast<Line *>(&b)->data = NULL;
+	const_cast<Line *>(&b)->fmtdata = NULL;
+#endif
+}
+
+void Raster::Line::MakeRGBA() const
+{
+	ASSERT(fmtdata && raster);
+	int cx = raster->GetWidth();
+	const RasterFormat *f = raster->GetFormat();
+	if(f) {
+		RGBA *rgba = new RGBA[cx];
+		free = true;
+		f->Read(rgba, fmtdata, cx, raster->GetPalette());
+		data = rgba;
+	}
+	else
+		data = (const RGBA *)fmtdata;
+}
+
+Raster::Info Raster::GetInfo()
+{
+	Info f;
+	f.bpp = 32;
+	f.colors = 256*256*256;
+	f.dots = Size(0, 0);
+	f.hotspot = Point(0, 0);
+	f.kind = IMAGE_ALPHA;
+	return f;
+}
+
+bool Raster::Create() { return true; }
+
+bool Raster::IsError() { return false; }
+
+int   Raster::GetPaletteCount() { return 0; }
+
+const RGBA *Raster::GetPalette() { return NULL; }
+
+Image Raster::GetImage(int x, int y, int cx, int cy, const Gate2<int, int> progress)
+{
+	Size size = GetSize();
+	y = minmax(y, 0, size.cy);
+	int yy = minmax(y + cy, y, size.cy);
+	x = minmax(x, 0, size.cx);
+	cx = minmax(x + cx, x, size.cx) - x;
+	ImageBuffer b(cx, yy - y);
+	RGBA* t = b;
+	int y0 = y;
+	while(y < yy) {
+		if(progress(y - y0, yy - y0))
+			return Null;
+		memcpy(t, ~GetLine(y) + x, cx * sizeof(RGBA));
+		t += cx;
+		y++;
+	}
+	Info f = GetInfo();
+	b.SetHotSpot(f.hotspot - Point(x, y0));
+	if(size.cx && size.cy)
+		b.SetDots(Size(f.dots.cx * cx / size.cx, f.dots.cy * cy / size.cy));
+	return IsError() ? Image() : Image(b);
+}
+
+Image Raster::GetImage(const Gate2<int, int> progress)
+{
+	Size sz = GetSize();
+	return GetImage(0, 0, sz.cx, sz.cy, progress);
+}
+
+Raster::~Raster() {}
+
+Raster::Line ImageRaster::GetLine(int line)
+{
+	return Line(img[line], false);
+}
+
+Size ImageRaster::GetSize()
+{
+	return img.GetSize();
+}
+
+Raster::Info ImageRaster::GetInfo()
+{
+	Raster::Info f = Raster::GetInfo();
+	f.dots = img.GetDots();
+	f.hotspot = img.GetHotSpot();
+	f.kind = img.GetKind();
+	return f;
+}
+
+MemoryRaster::MemoryRaster()
+: size(0, 0)
+{
+}
+
+void MemoryRaster::Load(Raster& raster)
+{
+	info = raster.GetInfo();
+	size = raster.GetSize();
+	palette.SetCount(raster.GetPaletteCount());
+	if(!palette.IsEmpty())
+		memcpy(palette, raster.GetPalette(), palette.GetCount() * sizeof(RGBA));
+	lines.SetCount(size.cy);
+	if(const RasterFormat *fmt = raster.GetFormat()) {
+		format = *fmt;
+		int rowbytes = format.GetByteCount(size.cx);
+		for(int i = 0; i < size.cy; i++) {
+			lines[i].Alloc(rowbytes);
+			memcpy(~lines[i], raster.GetLine(i).GetRawData(), rowbytes);
+		}
+	}
+	else {
+		format.SetRGBA();
+		int rowbytes = sizeof(RGBA) * size.cx;
+		for(int i = 0; i < size.cy; i++) {
+			lines[i].Alloc(rowbytes);
+			memcpy(~lines[i], raster.GetLine(i).GetRGBA(), rowbytes);
+		}
+	}
+}
+
+Raster::Line MemoryRaster::GetLine(int line)
+{
+	if(format.IsRGBA())
+		return Line((const RGBA *)~lines[line], false);
+	else
+		return Line(~lines[line], this, false);
+}
+
+int MemoryRaster::GetLength() const
+{
+	return size.cy * (format.IsRGBA()
+		? size.cx * sizeof(RGBA)
+		: ((size.cx * info.bpp + 31) >> 5) * 4);
+}
+
+bool StreamRaster::Open(Stream& _s)
+{
+	s = &_s;
+	error = !Create();
+	return !error;
+}
+
+bool StreamRaster::IsError()
+{
+	return error || !s || s->IsError();
+}
+
+Image StreamRaster::Load(Stream& s, const Gate2<int, int> progress)
+{
+	if(Open(s)) {
+		Image img = GetImage(progress);
+		if(!IsError())
+			return img;
+	}
+	return Image();
+}
+
+Image StreamRaster::LoadFile(const char *fn, const Gate2<int, int> progress)
+{
+	FileIn in(fn);
+	return in ? Load(in, progress) : Image();
+}
+
+Image StreamRaster::LoadString(const String& s, const Gate2<int, int> progress)
+{
+	StringStream ss(s);
+	return Load(ss, progress);
+}
+
+static StaticCriticalSection sAnyRaster;
+
+Vector<void *>& StreamRaster::Map()
+{
+	static Vector<void *> x;
+	return x;
+}
+
+void StreamRaster::AddFormat(RasterFactory factory)
+{
+	INTERLOCKED_(sAnyRaster)
+		Map().Add((void *)factory);
+}
+
+One<StreamRaster> StreamRaster::OpenAny(Stream& s)
+{
+	INTERLOCKED_(sAnyRaster)
+		for(int i = 0; i < Map().GetCount(); i++) {
+			int64 p = s.GetPos();
+			One<StreamRaster> raster = (*RasterFactory(Map()[i]))();
+			s.ClearError();
+			if(raster->Open(s))
+				return raster;
+			s.ClearError();
+			s.Seek(p);
+		}
+	return NULL;
+}
+
+Image StreamRaster::LoadAny(Stream& s, const Gate2<int, int> progress)
+{
+	One<StreamRaster> r = OpenAny(s);
+	return r ? r->GetImage(progress) : Image();
+}
+
+Image StreamRaster::LoadFileAny(const char *fn, const Gate2<int, int> progress)
+{
+	FileIn in(fn);
+	return LoadAny(in, progress);
+}
+
+Image StreamRaster::LoadStringAny(const String& s, const Gate2<int, int> progress)
+{
+	StringStream ss(s);
+	return LoadAny(ss, progress);
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/Draw/Raster.h b/uppsrc/Draw/Raster.h
new file mode 100644
index 000000000..fd05e4f70
--- /dev/null
+++ b/uppsrc/Draw/Raster.h
@@ -0,0 +1,297 @@
+enum {
+	RASTER_1,
+	RASTER_2,
+	RASTER_4,
+	RASTER_8,
+	RASTER_8ALPHA,
+	RASTER_16,
+	RASTER_24,
+	RASTER_32,
+	RASTER_32ALPHA,
+	RASTER_32PREMULTIPLIED,
+
+	RASTER_MSBFIRST = 0x80,
+
+	RASTER_MAP_R = 32,
+	RASTER_SHIFT_R = 3,
+	RASTER_MAP_G = 64,
+	RASTER_SHIFT_G = 2,
+	RASTER_MAP_B = 16,
+	RASTER_SHIFT_B = 4,
+
+	RASTER_MAP_MAX = 64
+};
+
+struct PaletteCv {
+	Buffer<byte> cv;
+
+	byte *At(int r, int b)           { return cv + (r << 10) + (b << 6); }
+	byte  Get(const RGBA& b) const   { return cv[(int(b.r >> RASTER_SHIFT_R) << 10) +
+	                                             (int(b.g >> RASTER_SHIFT_G)) +
+	                                             (int(b.b >> RASTER_SHIFT_B) << 6)]; }
+	PaletteCv()                      { cv.Alloc(RASTER_MAP_R * RASTER_MAP_G * RASTER_MAP_B); }
+};
+
+struct RasterFormat {
+	byte  type;
+	dword rmask, gmask, bmask, amask;
+
+	void Set1lf()                    { type = RASTER_1; }
+	void Set1mf()                    { type = RASTER_1|RASTER_MSBFIRST; }
+	void Set2lf()                    { type = RASTER_2; }
+	void Set2mf()                    { type = RASTER_2|RASTER_MSBFIRST; }
+	void Set4lf()                    { type = RASTER_4; }
+	void Set4mf()                    { type = RASTER_4|RASTER_MSBFIRST; }
+	void Set8()                      { type = RASTER_8; }
+	void Set8A()                     { type = RASTER_8ALPHA; }
+	void Set16le(dword rmask, dword gmask, dword bmask);
+	void Set16be(dword rmask, dword gmask, dword bmask);
+	void Set24le(dword rmask, dword gmask, dword bmask);
+	void Set24be(dword rmask, dword gmask, dword bmask);
+	void Set32le(dword rmask, dword gmask, dword bmask, dword amask = 0);
+	void Set32be(dword rmask, dword gmask, dword bmask, dword amask = 0);
+	void Set32leStraight(dword rmask, dword gmask, dword bmask, dword amask);
+	void Set32beStraight(dword rmask, dword gmask, dword bmask, dword amask);
+	void SetRGBA();
+	void SetRGBAStraight();
+
+	int  IsRGBA() const;
+	int  GetByteCount(int cx) const;
+	int  GetBpp() const;
+	bool HasAlpha() const;
+	int  GetColorCount() const;
+	int  GetPaletteCount() const;
+
+	void Read(RGBA *t, const byte *s, int cx, const RGBA *palette) const;
+	void Write(byte *t, const RGBA *s, int cx, const PaletteCv *palcv) const;
+
+private:
+	byte  rpos, gpos, bpos, apos;
+	static void TailBits(RGBA *t, const byte *src, int cx, byte andm, byte shift, const RGBA *palette);
+	static void TailBitsMSB1st(RGBA *t, const byte *src, int cx, byte shift1, byte andm, byte shift, const RGBA *palette);
+};
+
+class Raster {
+public:
+	class Line {
+		mutable const RGBA *data;
+		const byte         *fmtdata;
+		Raster             *raster;
+		mutable bool        free;
+		bool                fmtfree;
+
+		friend class       Raster;
+
+		void               MakeRGBA() const;
+
+	public:
+		const RGBA         *GetRGBA() const     { if(!data) MakeRGBA(); return data; }
+		const byte         *GetRawData() const  { return fmtdata; }
+		operator const RGBA *() const           { return GetRGBA(); }
+		const RGBA *operator~() const           { return GetRGBA(); }
+
+		Line(const RGBA *data, bool free)
+			: data(data), fmtdata((byte *)data), raster(NULL), free(free), fmtfree(false) {}
+		Line(const byte *fmtdata, Raster *raster, bool fmtfree)
+			: data(NULL), fmtdata(fmtdata), raster(raster), free(false), fmtfree(fmtfree) {}
+		Line(pick_ Line& b)                     { Pick(b); }
+		Line()                                  { data = NULL; fmtdata = NULL; raster = NULL; free = fmtfree = false; }
+		~Line()                                 { Free(); }
+
+		void Free()                             { if(free) delete[] data; if(fmtfree) delete[] fmtdata; }
+		void Pick(pick_ Line& b);
+
+		void operator=(pick_ Line& b)           { Free(); Pick(b); }
+	};
+
+	struct Info {
+		int   bpp;
+		int   colors;
+		Size  dots;
+		Point hotspot;
+		int   kind;
+		
+		Info();
+	};
+
+public:
+	virtual void    SeekPage(int page);
+	virtual int     GetPageCount();
+
+	virtual bool    Create();
+	virtual Size    GetSize() = 0;
+	virtual Info    GetInfo();
+	virtual Line    GetLine(int line) = 0;
+	virtual bool    IsError();
+	virtual int     GetPaletteCount();
+	virtual const RGBA *GetPalette();
+	virtual const RasterFormat *GetFormat();
+
+	int    GetWidth()                              { return GetSize().cx; }
+	int    GetHeight()                             { return GetSize().cy; }
+	Line   operator[](int i)                       { return GetLine(i); }
+	
+	Image  GetImage(int x, int y, int cx, int cy, const Gate2<int, int> progress = false);
+	Image  GetImage(const Gate2<int, int> progress = false);
+
+	virtual ~Raster();
+};
+
+typedef Raster::Line RasterLine;
+typedef Raster::Info RasterInfo;
+
+void CreatePaletteCv(const RGBA *palette, int ncolors, PaletteCv& cv_pal);
+void CreatePalette(Raster& raster, RGBA *palette, int ncolors);
+void CreatePalette(Raster& raster, RGBA *palette, int ncolors, PaletteCv& cv);
+
+class ImageRaster : public Raster {
+	Image img;
+
+public:
+	virtual Size    GetSize();
+	virtual Line    GetLine(int line);
+	virtual Info    GetInfo();
+
+	ImageRaster(const Image& img) : img(img) {}
+};
+
+class MemoryRaster : public Raster {
+public:
+	MemoryRaster();
+	MemoryRaster(Raster& raster)                 { Load(raster); }
+
+	virtual Size               GetSize()         { return size; }
+	virtual Info               GetInfo()         { return info; }
+	virtual Line               GetLine(int line);
+	virtual int                GetPaletteCount() { return palette.GetCount(); }
+	virtual RGBA               *GetPalette()     { return palette.Begin(); }
+	virtual const RasterFormat *GetFormat()      { return &format; }
+
+	void                       Load(Raster& raster);
+	int                        GetLength() const;
+
+private:
+	RasterFormat    format;
+	Info            info;
+	Size            size;
+	Vector< Buffer<byte> > lines;
+	Vector<RGBA>    palette;
+};
+
+class StreamRaster : public Raster {
+	Stream *s;
+	bool    error;
+
+	typedef StreamRaster *(*RasterFactory)();
+	template <class T> static StreamRaster *FactoryFn() { return new T; }
+	static void AddFormat(RasterFactory f);
+	static Vector<void *>& Map();
+
+public:
+	Stream& GetStream()                 { return *s; }
+	bool    Open(Stream& _s);
+	bool    IsError();
+
+	void    SetError()                  { error = true; }
+
+	Image Load(Stream& s, const Gate2<int, int> progress = false);
+	Image LoadFile(const char *fn, const Gate2<int, int> progress = false);
+	Image LoadString(const String& s, const Gate2<int, int> progress = false);
+
+	template <class T>
+	static void Register()              { AddFormat(&StreamRaster::FactoryFn<T>); }
+
+	static One<StreamRaster> OpenAny(Stream& s);
+	static Image LoadAny(Stream& s, const Gate2<int, int> progress = false);
+	static Image LoadFileAny(const char *fn, const Gate2<int, int> progress = false);
+	static Image LoadStringAny(const String& s, const Gate2<int, int> progress = false);
+
+	StreamRaster()                      { error = true; }
+};
+
+class RasterEncoder {
+	Size           size, dots;
+	Point          hotspot;
+	RGBA          *line;
+	Buffer<byte>   scanline;
+	int            line_bytes;
+	Buffer<RGBA>   h;
+	Buffer<RGBA>   palette;
+	One<PaletteCv> palette_cv;
+
+	RGBA          *Pal();
+
+protected:
+	RasterFormat   format;
+	void           SetLine(RGBA *_line);
+
+public:
+	virtual int  GetPaletteCount();
+	virtual void Start(Size sz) = 0;
+	virtual void WriteLineRaw(const byte *data) = 0;
+
+	void WriteLine();
+	void WriteLine(const RGBA *s);
+
+	const RasterFormat& GetFormat() const        { return format; }
+	const RGBA         *GetPalette();
+	const PaletteCv    *GetPaletteCv()           { return ~palette_cv; }
+
+	operator RGBA *()                            { return line; }
+	RGBA *operator~()                            { return line; }
+	Size GetSize() const                         { return size; }
+	int  GetWidth() const                        { return GetSize().cx; }
+	int  GetHeight() const                       { return GetSize().cy; }
+
+	void  SetHotSpot(Point p)                    { hotspot = p; }
+	Point GetHotSpot() const                     { return hotspot; }
+
+	void SetDots(Size _dots)                     { dots = _dots; }
+	Size GetDots() const                         { return dots; }
+
+	void SetPalette(const RGBA *palette);
+	void SetPalette(Raster& pal_raster);
+
+	void Create(Size sz);
+	void Create(int cx, int cy)                  { Create(Size(cx, cy)); }
+
+	void Create(Size sz, const RGBA *palette);
+	void Create(int cx, int cy, const RGBA *palette);
+	void Create(Size sz, Raster& pal_raster);
+	void Create(int cx, int cy, Raster& pal_raster);
+
+	RasterEncoder();
+	virtual ~RasterEncoder();
+};
+
+class ImageEncoder : public RasterEncoder {
+	int         ii;
+	ImageBuffer ib;
+
+public:
+	virtual void Start(Size sz);
+	virtual void WriteLineRaw(const byte *data);
+
+	Size GetSize() const                { return ib.GetSize(); }
+	int  GetWidth() const               { return GetSize().cx; }
+	int  GetHeight() const              { return GetSize().cy; }
+
+	operator const RGBA *()             { return Image(ib); }
+	operator Image()                    { return Image(ib); }
+};
+
+class StreamRasterEncoder : public RasterEncoder {
+	Stream *s;
+
+public:
+	Stream& GetStream()                 { return *s; }
+	void    SetStream(Stream& _s)       { s = &_s; }
+
+	void    Save(Stream& s, Raster& raster);
+	bool    SaveFile(const char *fn, Raster& raster);
+	String  SaveString(Raster& raster);
+
+	void    Save(Stream& s, const Image& img);
+	bool    SaveFile(const char *fn, const Image& img);
+	String  SaveString(const Image& img);
+};
diff --git a/uppsrc/Draw/RasterEncoder.cpp b/uppsrc/Draw/RasterEncoder.cpp
new file mode 100644
index 000000000..415d4fc4d
--- /dev/null
+++ b/uppsrc/Draw/RasterEncoder.cpp
@@ -0,0 +1,178 @@
+#include "Draw.h"
+
+NAMESPACE_UPP
+
+RasterEncoder::RasterEncoder()
+{
+	size = Size(0, 0);
+	dots = Size(0, 0);
+	hotspot = Point(0, 0);
+	format.SetRGBA();
+}
+
+void RasterEncoder::SetLine(RGBA *_line)
+{
+	line = _line;
+	h.Clear();
+}
+
+void RasterEncoder::WriteLine(const RGBA *s)
+{
+	if(format.IsRGBA())
+		WriteLineRaw((byte *)s);
+	else {
+		if(!scanline)
+			scanline.Alloc(format.GetByteCount(size.cx));
+		format.Write(scanline, s, size.cx, GetPaletteCv());
+		WriteLineRaw(scanline);
+	}
+}
+
+void RasterEncoder::WriteLine()
+{
+	WriteLine(line);
+}
+
+void RasterEncoder::Create(Size sz)
+{
+	size = sz;
+	h.Alloc(sz.cx);
+	line = h;
+	Start(sz);
+	scanline.Clear();
+	line_bytes = format.GetByteCount(size.cx);
+}
+
+RGBA *RasterEncoder::Pal()
+{
+	if(!palette)
+		palette.Alloc(256);
+	return palette;
+}
+
+const RGBA *RasterEncoder::GetPalette()
+{
+	if(!palette) {
+		palette.Alloc(256);
+		RGBA *p = palette;
+		int n = GetPaletteCount();
+		for(int i = 0; i < n; i++)
+			p[i].r = p[i].g = p[i].b = p[i].a = 255 * i * (n - 1) / (n - 1);
+	}
+	return palette;
+}
+
+void RasterEncoder::SetPalette(const RGBA *pal)
+{
+	int n = GetPaletteCount();
+	if(n) {
+		memcpy(Pal(), pal, n * sizeof(RGBA));
+		palette_cv.Create();
+		CreatePaletteCv(Pal(), n, *palette_cv);
+	}
+}
+
+void RasterEncoder::SetPalette(Raster& raster)
+{
+	int n = GetPaletteCount();
+	if(n) {
+		if(raster.GetPaletteCount() == n)
+			memcpy(Pal(), raster.GetPalette(), n * sizeof(RGBA));
+		else
+			CreatePalette(raster, Pal(), n);
+		palette_cv.Create();
+		CreatePaletteCv(Pal(), n, *palette_cv);
+	}
+}
+
+void RasterEncoder::Create(Size sz, const RGBA *palette)
+{
+	SetPalette(palette);
+	Create(sz);
+}
+
+void RasterEncoder::Create(int cx, int cy, const RGBA *palette)
+{
+	SetPalette(palette);
+	Create(cx, cy);
+}
+
+void RasterEncoder::Create(Size sz, Raster& pal_raster)
+{
+	SetPalette(pal_raster);
+	Create(sz);
+}
+
+void RasterEncoder::Create(int cx, int cy, Raster& pal_raster)
+{
+	SetPalette(pal_raster);
+	Create(cx, cy);
+}
+
+int RasterEncoder::GetPaletteCount()
+{
+	return 0;
+}
+
+RasterEncoder::~RasterEncoder() {}
+
+void ImageEncoder::Start(Size sz)
+{
+	ii = 0;
+	ib.Create(sz);
+	if(sz.cy)
+		SetLine(ib[0]);
+}
+
+void ImageEncoder::WriteLineRaw(const byte *data)
+{
+	if((RGBA *)data != ~*this)
+		memcpy(~*this, data, GetSize().cx * sizeof(RGBA));
+	if(++ii < GetHeight())
+		SetLine(ib[ii]);
+}
+
+void StreamRasterEncoder::Save(Stream& s, Raster& raster)
+{
+	SetStream(s);
+	Size sz = raster.GetSize();
+	Create(sz, raster);
+	SetDots(raster.GetInfo().dots);
+	SetHotSpot(raster.GetInfo().hotspot);
+	for(int i = 0; i < sz.cy; i++)
+		WriteLine(raster[i]);
+}
+
+bool StreamRasterEncoder::SaveFile(const char *fn, Raster& raster)
+{
+	FileOut out(fn);
+	Save(out, raster);
+	return !out.IsError();
+}
+
+String StreamRasterEncoder::SaveString(Raster& raster)
+{
+	StringStream ss;
+	Save(ss, raster);
+	return ss;
+}
+
+void StreamRasterEncoder::Save(Stream& s, const Image& img)
+{
+	ImageRaster r(img);
+	Save(s, r);
+}
+
+bool StreamRasterEncoder::SaveFile(const char *fn, const Image& img)
+{
+	ImageRaster r(img);
+	return SaveFile(fn, r);
+}
+
+String StreamRasterEncoder::SaveString(const Image& img)
+{
+	ImageRaster r(img);
+	return SaveString(r);
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/Draw/RasterFormat.cpp b/uppsrc/Draw/RasterFormat.cpp
new file mode 100644
index 000000000..4d4d8d957
--- /dev/null
+++ b/uppsrc/Draw/RasterFormat.cpp
@@ -0,0 +1,368 @@
+#include "Draw.h"
+
+NAMESPACE_UPP
+
+static int sMaskPos16(dword mask)
+{
+	if(mask > 0xffff)
+		return 0;
+	int pos = 0;
+	while(((mask << pos) & 0x18000) != 0x8000)
+		pos++;
+	return pos;
+}
+
+void RasterFormat::Set16le(dword _rmask, dword _gmask, dword _bmask)
+{
+	rpos = sMaskPos16(rmask = _rmask);
+	gpos = sMaskPos16(gmask = _gmask);
+	bpos = sMaskPos16(bmask = _bmask);
+	type = RASTER_16;
+}
+
+void RasterFormat::Set16be(dword _rmask, dword _gmask, dword _bmask)
+{
+	Set16le(_rmask, _gmask, _bmask);
+	type = RASTER_16|RASTER_MSBFIRST;
+}
+
+void RasterFormat::Set24le(dword rmask, dword gmask, dword bmask)
+{
+	rpos = GetChMaskPos32(rmask);
+	gpos = GetChMaskPos32(gmask);
+	bpos = GetChMaskPos32(bmask);
+	apos = 0;
+	type = RASTER_24;
+}
+
+void RasterFormat::Set32le(dword rmask, dword gmask, dword bmask, dword amask)
+{
+	Set24le(rmask, gmask, bmask);
+	if(amask) {
+		apos = GetChMaskPos32(amask);
+		type = RASTER_32ALPHA;
+	}
+	else
+		type = RASTER_32;
+}
+
+void RasterFormat::Set24be(dword rmask, dword gmask, dword bmask)
+{
+	rpos = 2 - GetChMaskPos32(rmask);
+	gpos = 2 - GetChMaskPos32(gmask);
+	bpos = 2 - GetChMaskPos32(bmask);
+	apos = 0;
+	type = RASTER_24;
+}
+
+void RasterFormat::Set32be(dword rmask, dword gmask, dword bmask, dword amask)
+{
+	rpos = 3 - GetChMaskPos32(rmask);
+	gpos = 3 - GetChMaskPos32(gmask);
+	bpos = 3 - GetChMaskPos32(bmask);
+	if(amask) {
+		apos = 3 - GetChMaskPos32(amask);
+		type = RASTER_32PREMULTIPLIED;
+	}
+	else
+		type = RASTER_32;
+}
+
+void RasterFormat::Set32leStraight(dword rmask, dword gmask, dword bmask, dword amask)
+{
+	Set32le(rmask, gmask, bmask, amask);
+	type = RASTER_32ALPHA;
+}
+
+void RasterFormat::Set32beStraight(dword rmask, dword gmask, dword bmask, dword amask)
+{
+	Set32be(rmask, gmask, bmask, amask);
+	type = RASTER_32ALPHA;
+}
+
+void RasterFormat::SetRGBA()
+{
+	type = RASTER_32PREMULTIPLIED;
+	bpos = 0;
+	gpos = 1;
+	rpos = 2;
+	apos = 3;
+}
+
+void RasterFormat::SetRGBAStraight()
+{
+	type = RASTER_32ALPHA;
+	bpos = 0;
+	gpos = 1;
+	rpos = 2;
+	apos = 3;
+}
+
+int RasterFormat::IsRGBA() const
+{
+	return (type & 31) == RASTER_32PREMULTIPLIED && bpos == 0 && gpos == 1 && rpos == 2 && apos == 3;
+}
+
+static byte bits[16] = { 1, 2, 4, 8, 16, 16, 24, 32, 32, 32 };
+
+int RasterFormat::GetByteCount(int cx) const
+{
+	int b = bits[type & 15];
+	return (cx * b + 7) >> 3;
+}
+
+int RasterFormat::GetBpp() const
+{
+	return bits[type & 15];
+}
+
+bool RasterFormat::HasAlpha() const
+{
+	return (type & 15) == RASTER_32ALPHA;
+}
+
+int RasterFormat::GetColorCount() const
+{
+	static int colors[16] = { 2, 4, 16, 256, 256, 65536, 256 * 256 * 256, 256 * 256 * 256, 256 * 256 * 256 };
+	return colors[type & 15];
+}
+
+int RasterFormat::GetPaletteCount() const
+{
+	static int colors[16] = { 2, 4, 16, 256 };
+	return (type & 15) < 4 ? colors[type & 15] : 0;
+}
+
+void RasterFormat::TailBits(RGBA *t, const byte *src, int cx, byte andm, byte shift, const RGBA *palette)
+{
+	if(cx) {
+		byte c = *src;
+		while(cx > 0) {
+			*t++ = palette[c & andm]; c >>= shift;
+			cx--;
+		}
+	}
+}
+
+void RasterFormat::TailBitsMSB1st(RGBA *t, const byte *src, int cx, byte shift1, byte andm, byte shift, const RGBA *palette)
+{
+	if(cx) {
+		byte c = *src;
+		while(cx > 0) {
+			*t++ = palette[(c >> shift1) & andm]; c <<= shift;
+			cx--;
+		}
+	}
+}
+
+void RasterFormat::Read(RGBA *t, const byte *s, int cx, const RGBA *palette) const
+{
+	switch(type) {
+	case RASTER_1:
+		{
+			const byte *e = s + (cx >> 3);
+			while(s < e) {
+				byte c = *s++;
+				t[0] = palette[(c >> 0) & 1];
+				t[1] = palette[(c >> 1) & 1];
+				t[2] = palette[(c >> 2) & 1];
+				t[3] = palette[(c >> 3) & 1];
+				t[4] = palette[(c >> 4) & 1];
+				t[5] = palette[(c >> 5) & 1];
+				t[6] = palette[(c >> 6) & 1];
+				t[7] = palette[(c >> 7) & 1];
+				t += 8;
+			}
+			TailBits(t, s, cx & 7, 1, 1, palette);
+		}
+		break;
+	case RASTER_1|RASTER_MSBFIRST:
+		{
+			const byte *e = s + (cx >> 3);
+			while(s < e) {
+				byte c = *s++;
+				t[7] = palette[(c >> 0) & 1];
+				t[6] = palette[(c >> 1) & 1];
+				t[5] = palette[(c >> 2) & 1];
+				t[4] = palette[(c >> 3) & 1];
+				t[3] = palette[(c >> 4) & 1];
+				t[2] = palette[(c >> 5) & 1];
+				t[1] = palette[(c >> 6) & 1];
+				t[0] = palette[(c >> 7) & 1];
+				t += 8;
+			}
+			TailBitsMSB1st(t, s, cx & 7, 7, 1, 1, palette);
+		}
+		break;
+	case RASTER_2:
+		{
+			const byte *e = s + (cx >> 2);
+			while(s < e) {
+				byte c = *s++;
+				t[0] = palette[(c >> 0) & 3];
+				t[1] = palette[(c >> 2) & 3];
+				t[2] = palette[(c >> 4) & 3];
+				t[3] = palette[(c >> 6) & 3];
+				t += 4;
+			}
+			TailBits(t, s, cx & 3, 3, 2, palette);
+		}
+		break;
+	case RASTER_2|RASTER_MSBFIRST:
+		{
+			const byte *e = s + (cx >> 2);
+			while(s < e) {
+				byte c = *s++;
+				t[3] = palette[(c >> 0) & 3];
+				t[2] = palette[(c >> 2) & 3];
+				t[1] = palette[(c >> 4) & 3];
+				t[0] = palette[(c >> 6) & 3];
+				t += 4;
+			}
+			TailBitsMSB1st(t, s, cx & 3, 6, 3, 2, palette);
+		}
+		break;
+	case RASTER_4:
+		{
+			const byte *e = s + (cx >> 1);
+			while(s < e) {
+				byte c = *s++;
+				t[0] = palette[(c >> 0) & 15];
+				t[1] = palette[(c >> 4) & 15];
+				t += 2;
+			}
+			TailBits(t, s, cx & 1, 15, 4, palette);
+		}
+		break;
+	case RASTER_4|RASTER_MSBFIRST:
+		{
+			const byte *e = s + (cx >> 1);
+			while(s < e) {
+				byte c = *s++;
+				t[1] = palette[(c >> 0) & 15];
+				t[0] = palette[(c >> 4) & 15];
+				t += 2;
+			}
+			TailBitsMSB1st(t, s, cx & 1, 4, 15, 4, palette);
+		}
+		break;
+	case RASTER_8:
+	case RASTER_8|RASTER_MSBFIRST:
+		{
+			RGBA *e = t + cx;
+			while(t < e)
+				*t++ = palette[*s++];
+		}
+		break;
+	case RASTER_8ALPHA:
+	case RASTER_8ALPHA|RASTER_MSBFIRST:
+		{
+			RGBA *e = t + cx;
+			while(t < e) {
+				RGBA pal = palette[*s];
+				pal.a = s[1];
+				*t++ = pal;
+				s += 2;
+			}
+			break;
+		}
+	case RASTER_16:
+		{
+			RGBA *e = t + cx;
+			while(t < e) {
+				word w = Peek16le(s);
+				t->a = 255;
+				t->r = byte((w & rmask) << rpos >> 8);
+				t->g = byte((w & gmask) << gpos >> 8);
+				t->b = byte((w & bmask) << bpos >> 8);
+				s += 2;
+				t++;
+			}
+		}
+		break;
+	case RASTER_16|RASTER_MSBFIRST:
+		{
+			RGBA *e = t + cx;
+			while(t < e) {
+				word w = Peek16be(s);
+				t->a = 255;
+				t->r = byte((w & rmask) << rpos >> 8);
+				t->g = byte((w & gmask) << gpos >> 8);
+				t->b = byte((w & bmask) << bpos >> 8);
+				s += 2;
+				t++;
+			}
+		}
+		break;
+	case RASTER_24:
+	case RASTER_24|RASTER_MSBFIRST:
+		{
+			RGBA *e = t + cx;
+			while(t < e) {
+				t->a = 255;
+				t->r = s[rpos];
+				t->g = s[gpos];
+				t->b = s[bpos];
+				s += 3;
+				t++;
+			}
+		}
+		break;
+	case RASTER_32:
+	case RASTER_32|RASTER_MSBFIRST:
+		if(bpos == 0 && gpos == 1 && rpos == 2) {
+			RGBA *e = t + cx;
+			while(t < e) {
+				*t = *(RGBA *)s;
+				t->a = 255;
+				s += 4;
+				t++;
+			}
+		}
+		else
+		{
+			RGBA *e = t + cx;
+			while(t < e) {
+				t->a = 255;
+				t->r = s[rpos];
+				t->g = s[gpos];
+				t->b = s[bpos];
+				s += 4;
+				t++;
+			}
+		}
+		break;
+	case RASTER_32ALPHA:
+	case RASTER_32ALPHA|RASTER_MSBFIRST: {
+			RGBA *e = t + cx;
+			while(t < e) {
+				t->a = s[apos];
+				int alpha = t->a + (t->a >> 7);
+				t->r = (alpha * s[rpos]) >> 8;
+				t->g = (alpha * s[gpos]) >> 8;
+				t->b = (alpha * s[bpos]) >> 8;
+				s += 4;
+				t++;
+			}
+		}
+		break;
+	case RASTER_32PREMULTIPLIED:
+	case RASTER_32PREMULTIPLIED|RASTER_MSBFIRST:
+		if(bpos == 0 && gpos == 1 && rpos == 2 && apos == 3)
+			memcpy(t, s, cx * sizeof(RGBA));
+		else {
+			RGBA *e = t + cx;
+			while(t < e) {
+				t->a = s[apos];
+				t->r = s[rpos];
+				t->g = s[gpos];
+				t->b = s[bpos];
+				s += 4;
+				t++;
+			}
+		}
+		break;
+	}
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/Draw/RasterWrite.cpp b/uppsrc/Draw/RasterWrite.cpp
new file mode 100644
index 000000000..82088ae61
--- /dev/null
+++ b/uppsrc/Draw/RasterWrite.cpp
@@ -0,0 +1,344 @@
+#include "Draw.h"
+
+NAMESPACE_UPP
+
+extern int  um_table__[256];
+void sInitUmTable__();
+
+void RasterFormat::Write(byte *t, const RGBA *s, int cx, const PaletteCv *palcv) const
+{
+	const RGBA *e = s + cx;
+	switch(type) {
+	case RASTER_1:
+		if(palcv) {
+			const byte *e = t + (cx >> 3);
+			while(t < e) {
+				*t++ =
+					  ((palcv->Get(s[0]) & 1) << 0)
+					| ((palcv->Get(s[1]) & 1) << 1)
+					| ((palcv->Get(s[2]) & 1) << 2)
+					| ((palcv->Get(s[3]) & 1) << 3)
+					| ((palcv->Get(s[4]) & 1) << 4)
+					| ((palcv->Get(s[5]) & 1) << 5)
+					| ((palcv->Get(s[6]) & 1) << 6)
+					| ((palcv->Get(s[7]) & 1) << 7)
+				;
+				s += 8;
+			}
+			cx &= 7;
+			if(cx) {
+				byte c = 0;
+				byte sh = 0;
+				while(cx > 0) {
+					c |= (palcv->Get(*s++)) << sh;
+					sh++;
+					cx--;
+				}
+				*t = c;
+			}
+		}
+		else {
+			const byte *e = t + (cx >> 3);
+			while(t < e) {
+				*t++ =
+					  ((s[0].g & 0x80) >> 7)
+					| ((s[1].g & 0x80) >> 6)
+					| ((s[2].g & 0x80) >> 5)
+					| ((s[3].g & 0x80) >> 4)
+					| ((s[4].g & 0x80) >> 3)
+					| ((s[5].g & 0x80) >> 2)
+					| ((s[6].g & 0x80) >> 1)
+					| ((s[7].g & 0x80) >> 0)
+				;
+				s += 8;
+			}
+			cx &= 7;
+			if(cx) {
+				byte c = 0;
+				byte sh = 7;
+				while(cx > 0) {
+					c |= ((s++)->g & 0x80) >> sh;
+					sh--;
+					cx--;
+				}
+				*t = c;
+			}
+		}
+		break;
+	case RASTER_1|RASTER_MSBFIRST:
+		if(palcv) {
+			const byte *e = t + (cx >> 3);
+			while(t < e) {
+				*t++ =
+					  ((palcv->Get(s[7]) & 1) << 0)
+					| ((palcv->Get(s[6]) & 1) << 1)
+					| ((palcv->Get(s[5]) & 1) << 2)
+					| ((palcv->Get(s[4]) & 1) << 3)
+					| ((palcv->Get(s[3]) & 1) << 4)
+					| ((palcv->Get(s[2]) & 1) << 5)
+					| ((palcv->Get(s[1]) & 1) << 6)
+					| ((palcv->Get(s[0]) & 1) << 7)
+				;
+				s += 8;
+			}
+			cx &= 7;
+			if(cx) {
+				byte c = 0;
+				byte sh = 7;
+				while(cx > 0) {
+					c |= (palcv->Get(*s++)) << sh;
+					sh--;
+					cx--;
+				}
+				*t = c;
+			}
+		}
+		else {
+			const byte *e = t + (cx >> 3);
+			while(t < e) {
+				*t++ =
+					  ((s[7].g & 0x80) >> 7)
+					| ((s[6].g & 0x80) >> 6)
+					| ((s[5].g & 0x80) >> 5)
+					| ((s[4].g & 0x80) >> 4)
+					| ((s[3].g & 0x80) >> 3)
+					| ((s[2].g & 0x80) >> 2)
+					| ((s[1].g & 0x80) >> 1)
+					| ((s[0].g & 0x80) >> 0)
+				;
+				s += 8;
+			}
+			cx &= 7;
+			if(cx) {
+				byte c = 0;
+				byte sh = 0;
+				while(cx > 0) {
+					c |= ((s++)->g & 0x80) >> sh;
+					sh++;
+					cx--;
+				}
+				*t = c;
+			}
+		}
+		break;
+	case RASTER_2:
+		if(palcv) {
+			const byte *e = t + (cx >> 2);
+			while(t < e) {
+				*t++ =
+					  ((palcv->Get(s[0]) & 3) << 0)
+					| ((palcv->Get(s[1]) & 3) << 2)
+					| ((palcv->Get(s[2]) & 3) << 4)
+					| ((palcv->Get(s[3]) & 3) << 6)
+				;
+				s += 4;
+			}
+			cx &= 3;
+			if(cx) {
+				byte c = 0;
+				byte sh = 0;
+				while(cx > 0) {
+					c |= (palcv->Get(*s++)) << sh;
+					sh += 2;
+					cx--;
+				}
+				*t = c;
+			}
+		}
+		else {
+			const byte *e = t + (cx >> 2);
+			while(t < e) {
+				*t++ =
+					  ((s[0].g & 0xc0) >> 6)
+					| ((s[1].g & 0xc0) >> 4)
+					| ((s[2].g & 0xc0) >> 2)
+					| ((s[3].g & 0xc0) >> 0)
+				;
+				s += 4;
+			}
+			cx &= 3;
+			if(cx) {
+				byte c = 0;
+				byte sh = 6;
+				while(cx > 0) {
+					c |= ((s++)->g & 0xc0) >> sh;
+					sh -= 2;
+					cx--;
+				}
+				*t = c;
+			}
+		}
+		break;
+	case RASTER_2|RASTER_MSBFIRST:
+		if(palcv) {
+			const byte *e = t + (cx >> 2);
+			while(t < e) {
+				*t++ =
+					  ((palcv->Get(s[3]) & 3) << 0)
+					| ((palcv->Get(s[2]) & 3) << 2)
+					| ((palcv->Get(s[1]) & 3) << 4)
+					| ((palcv->Get(s[0]) & 3) << 6)
+				;
+				s += 4;
+			}
+			cx &= 3;
+			if(cx) {
+				byte c = 0;
+				byte sh = 6;
+				while(cx > 0) {
+					c |= (palcv->Get(*s++)) << sh;
+					sh -= 2;
+					cx--;
+				}
+				*t = c;
+			}
+		}
+		else {
+			const byte *e = t + (cx >> 2);
+			while(t < e) {
+				*t++ =
+					  ((s[3].g & 0xc0) >> 6)
+					| ((s[2].g & 0xc0) >> 4)
+					| ((s[1].g & 0xc0) >> 2)
+					| ((s[0].g & 0xc0) >> 0)
+				;
+				s += 4;
+			}
+			cx &= 3;
+			if(cx) {
+				byte c = 0;
+				byte sh = 0;
+				while(cx > 0) {
+					c |= ((s++)->g & 0xc0) >> sh;
+					sh += c;
+					cx--;
+				}
+				*t = c;
+			}
+		}
+		break;
+	case RASTER_4:
+		if(palcv) {
+			const byte *e = t + (cx >> 1);
+			while(t < e) {
+				*t++ = (palcv->Get(s[0]) & 15) | ((palcv->Get(s[1]) & 15) << 4);
+				s += 2;
+			}
+			if(cx & 1)
+				*t = palcv->Get(*s) & 15;
+		}
+		else {
+			const byte *e = t + (cx >> 1);
+			while(t < e) {
+				*t++ = ((Grayscale(s[0]) & 0xf0) >> 4) | ((Grayscale(s[1]) & 0xf0));
+				s += 2;
+			}
+			if(cx & 1)
+				*t = (Grayscale(s[0]) & 0xf0) >> 4;
+		}
+		break;
+	case RASTER_4|RASTER_MSBFIRST:
+		if(palcv) {
+			const byte *e = t + (cx >> 1);
+			while(t < e) {
+				*t++ = (palcv->Get(s[1]) & 15) | ((palcv->Get(s[0]) & 15) << 4);
+				s += 2;
+			}
+			if(cx & 1)
+				*t = (palcv->Get(*s) & 15) << 4;
+		}
+		else {
+			const byte *e = t + (cx >> 1);
+			while(t < e) {
+				*t++ = ((Grayscale(s[1]) & 0xf0) >> 4) | ((Grayscale(s[0]) & 0xf0));
+				s += 2;
+			}
+			if(cx & 1)
+				*t = Grayscale(s[0]) & 0xf0;
+		}
+		break;
+	case RASTER_8:
+	case RASTER_8|RASTER_MSBFIRST:
+		if(palcv)
+			while(s < e) {
+				*t++ = palcv->Get(*s);
+				s++;
+			}
+		else
+			while(s < e)
+				*t++ = Grayscale(*s++);
+		break;
+	case RASTER_16:
+		while(s < e) {
+			Poke16le(t, ((s->r << 8 >> rpos) & rmask) |
+			            ((s->g << 8 >> gpos) & gmask) |
+			            ((s->b << 8 >> bpos) & bmask));
+			t += 2;
+			s++;
+		}
+		break;
+	case RASTER_16|RASTER_MSBFIRST:
+		while(s < e) {
+			Poke16be(t, ((s->r << 8 >> rpos) & rmask) |
+			            ((s->g << 8 >> gpos) & gmask) |
+			            ((s->b << 8 >> bpos) & bmask));
+			t += 2;
+			s++;
+		}
+		break;
+	case RASTER_24:
+	case RASTER_24|RASTER_MSBFIRST:
+		while(s < e) {
+			t[rpos] = s->r;
+			t[gpos] = s->g;
+			t[bpos] = s->b;
+			t += 3;
+			s++;
+		}
+		break;
+	case RASTER_32:
+	case RASTER_32|RASTER_MSBFIRST:
+		while(s < e) {
+			t[rpos] = s->r;
+			t[gpos] = s->g;
+			t[bpos] = s->b;
+			t += 4;
+			s++;
+		}
+		break;
+	case RASTER_32ALPHA:
+	case RASTER_32ALPHA|RASTER_MSBFIRST:
+		sInitUmTable__();
+		while(s < e) {
+			int alpha = um_table__[t[apos] = s->a];
+			t[rpos] = (alpha * s->r) >> 8;
+			t[gpos] = (alpha * s->g) >> 8;
+			t[bpos] = (alpha * s->b) >> 8;
+			t += 4;
+			s++;
+		}
+		break;
+	case RASTER_32PREMULTIPLIED:
+	case RASTER_32PREMULTIPLIED|RASTER_MSBFIRST:
+	#ifdef PLATFORM_WIN32
+		if(bpos == 0 && gpos == 1 && rpos == 2 && apos == 3)
+			memcpy(t, s, cx * sizeof(RGBA));
+		else
+	#endif
+		{
+			while(s < e) {
+				t[rpos] = s->r;
+				t[gpos] = s->g;
+				t[bpos] = s->b;
+				t[apos] = s->a;
+				t += 4;
+				s++;
+			}
+		}
+		break;
+	default:
+		NEVER();
+	}
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/Draw/SSettings.cpp b/uppsrc/Draw/SSettings.cpp
new file mode 100644
index 000000000..2e58e6e34
--- /dev/null
+++ b/uppsrc/Draw/SSettings.cpp
@@ -0,0 +1,41 @@
+#include "Draw.h"
+
+NAMESPACE_UPP
+
+CH_COLOR(SBlack, Black());
+CH_COLOR(SGray, Gray());
+CH_COLOR(SLtGray, LtGray());
+CH_COLOR(SWhiteGray, WhiteGray());
+CH_COLOR(SWhite, White());
+CH_COLOR(SRed, Red());
+CH_COLOR(SGreen, Green());
+CH_COLOR(SBrown, Brown());
+CH_COLOR(SBlue, Blue());
+CH_COLOR(SMagenta, Magenta());
+CH_COLOR(SCyan, Cyan());
+CH_COLOR(SYellow, Yellow());
+CH_COLOR(SLtRed, LtRed());
+CH_COLOR(SLtGreen, LtGreen());
+CH_COLOR(SLtYellow, LtYellow());
+CH_COLOR(SLtBlue, LtBlue());
+CH_COLOR(SLtMagenta, LtMagenta());
+CH_COLOR(SLtCyan, LtCyan());
+
+CH_COLOR(SColorPaper, White());
+CH_COLOR(SColorFace, LtGray());
+CH_COLOR(SColorText, Black());
+CH_COLOR(SColorHighlight, Blue());
+CH_COLOR(SColorHighlightText, White());
+CH_COLOR(SColorMenu, LtGray());
+CH_COLOR(SColorMenuText, Black());
+CH_COLOR(SColorInfo, LtYellow());
+CH_COLOR(SColorInfoText, Black());
+CH_COLOR(SColorDisabled, Gray());
+CH_COLOR(SColorLight, White());
+CH_COLOR(SColorShadow, Gray());
+CH_COLOR(SColorMark, LtBlue());
+
+CH_COLOR(SColorLtFace, Blend(SColorFace, SColorLight));
+CH_COLOR(SColorDkShadow, Blend(SColorShadow, SColorText));
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/Draw/gdk.dli b/uppsrc/Draw/gdk.dli
new file mode 100644
index 000000000..4f7ce0579
--- /dev/null
+++ b/uppsrc/Draw/gdk.dli
@@ -0,0 +1,22 @@
+FN(G_obj *, gdk_x11_colormap_foreign_new, (G_obj *visual, Colormap xcolormap))
+FN(G_obj *, gdkx_visual_get, (VisualID   xvisualid))
+FN(G_obj *, gdk_pixmap_foreign_new, (uint32 anid))
+FN(void, gdk_drawable_set_colormap, (G_obj *drawable, G_obj *colormap))
+FN(G_obj *, gdk_x11_display_get_xdisplay, (G_obj *display))
+
+FN(void, gdk_draw_pixbuf, (G_obj *drawable,
+                           G_obj *gc,
+                           G_obj *pixbuf,
+                           int src_x,
+                           int src_y,
+                           int dest_x,
+                           int dest_y,
+                           int width,
+                           int height,
+                           int dither,
+                           int x_dither,
+                           int y_dither))
+
+FN(G_obj *, gdk_rgb_get_colormap, (void))
+FN(G_obj *, gdk_x11_colormap_get_xcolormap, (G_obj *))
+FN(G_obj *, gdk_gc_new, (G_obj *))
diff --git a/uppsrc/Draw/gnome.dli b/uppsrc/Draw/gnome.dli
new file mode 100644
index 000000000..000209a50
--- /dev/null
+++ b/uppsrc/Draw/gnome.dli
@@ -0,0 +1 @@
+FN(void, gnome_triggers_vdo, (const char *msg, const char *level, const char *supinfo[]))
diff --git a/uppsrc/Draw/gobj.dli b/uppsrc/Draw/gobj.dli
new file mode 100644
index 000000000..34a4d0c1b
--- /dev/null
+++ b/uppsrc/Draw/gobj.dli
@@ -0,0 +1,2 @@
+FN(void, g_object_unref, (G_obj *object))
+FN(void, g_object_get, (G_obj *object, const char *first_property_name, ...))
diff --git a/uppsrc/Draw/gpixbuf.dli b/uppsrc/Draw/gpixbuf.dli
new file mode 100644
index 000000000..f9bdfb36f
--- /dev/null
+++ b/uppsrc/Draw/gpixbuf.dli
@@ -0,0 +1,6 @@
+FN(int, gdk_pixbuf_get_width, (const G_obj *pixbuf))
+FN(int, gdk_pixbuf_get_height, (const G_obj *pixbuf))
+FN(int, gdk_pixbuf_get_has_alpha, (const G_obj *pixbuf))
+FN(int, gdk_pixbuf_get_bits_per_sample, (const G_obj *pixbuf))
+FN(int, gdk_pixbuf_get_n_channels, (const G_obj *pixbuf))
+FN(byte *, gdk_pixbuf_get_pixels, (const G_obj *pixbuf))
diff --git a/uppsrc/Draw/gtk.dli b/uppsrc/Draw/gtk.dli
new file mode 100644
index 000000000..afe205b46
--- /dev/null
+++ b/uppsrc/Draw/gtk.dli
@@ -0,0 +1,185 @@
+FN(void, gtk_init, (int *, char ***))
+FN(G_obj *, gtk_window_new, (int))
+FN(void, gtk_widget_realize, (G_obj *))
+FN(G_obj *, gtk_fixed_new, (void))
+FN(void, gtk_container_add, (G_obj *, G_obj *))
+FN(void, gtk_fixed_put, (G_obj *, G_obj *, int, int))
+FN(void, gtk_widget_show, (G_obj *))
+FN(G_obj *, gtk_widget_get_style, (G_obj *widget))
+FN(G_obj *, gtk_settings_get_default, (void))
+
+FN(void, gtk_object_sink, (G_obj *widget))
+
+FN(void, gtk_paint_box, (
+	G_obj *style,
+	G_obj *window,
+	int state_type,
+	int shadow_type,
+	void *area,
+	G_obj *widget,
+	const char *detail,
+	int x,
+	int y,
+	int width,
+	int height
+))
+
+FN(void, gtk_paint_check, (
+	G_obj *style,
+	G_obj *window,
+	int state_type,
+	int shadow_type,
+	void *area,
+	G_obj *widget,
+	const char *detail,
+	int x,
+	int y,
+	int width,
+	int height
+))
+
+FN(void, gtk_paint_option, (
+	G_obj *style,
+	G_obj *window,
+	int state_type,
+	int shadow_type,
+	void *area,
+	G_obj *widget,
+	const char *detail,
+	int x,
+	int y,
+	int width,
+	int height
+))
+
+FN(void, gtk_paint_tab, (
+	G_obj *style,
+	G_obj *window,
+	int state_type,
+	int shadow_type,
+	void *area,
+	G_obj *widget,
+	const char *detail,
+	int x,
+	int y,
+	int width,
+	int height
+))
+
+FN(void, gtk_paint_slider, (
+	G_obj *style,
+	G_obj *window,
+	int state_type,
+	int shadow_type,
+	void *area,
+	G_obj *widget,
+	const char *detail,
+	int x,
+	int y,
+	int width,
+	int height,
+	int orientation
+))
+
+FN(void, gtk_paint_handle, (
+	G_obj *style,
+	G_obj *window,
+	int state_type,
+	int shadow_type,
+	void *area,
+	G_obj *widget,
+	const char *detail,
+	int x,
+	int y,
+	int width,
+	int height,
+	int orientation
+))
+
+FN(void, gtk_paint_resize_grip, (
+	G_obj *style,
+	G_obj *window,
+	int state_type,
+	void *area,
+	G_obj *widget,
+	const char *detail,
+	G_obj *edge,
+	int x,
+	int y,
+	int width,
+	int height
+))
+
+FN(void, gtk_paint_arrow, (
+	G_obj *style,
+	G_obj *window,
+	int state_type,
+	int shadow_type,
+	void *area,
+	G_obj *widget,
+	const char *detail,
+	int arrow_type,
+	int fill,
+	int x,
+	int y,
+	int width,
+	int height
+))
+
+FN(void, gtk_paint_extension, (
+	G_obj *style,
+	G_obj *window,
+	int    state_type,
+	int    shadow_type,
+	void  *area,
+	G_obj *widget,
+	const char *detail,
+	int x,
+	int y,
+	int width,
+	int height,
+	int gap_side
+))
+
+FN(G_obj *, gtk_widget_render_icon, (G_obj *widget, const char *stock_id, int size, const char *detail))
+
+FN(G_obj *, gtk_adjustment_new, (
+	double value,
+	double lower,
+	double upper,
+	double step_increment,
+	double page_increment,
+	double page_size
+))
+
+FN(void, gtk_widget_set_state, (G_obj *widget, int state))
+FN(void, gtk_widget_set_sensitive, (G_obj *widget, int sensitive))
+
+FN(void, gtk_toggle_button_set_active, (G_obj *toggle_button, int is_active))
+FN(void, gtk_toggle_button_set_inconsistent, (G_obj *toggle_button, int setting))
+FN(G_obj *, gtk_widget_get_display, (G_obj *widget))
+FN(void, gtk_widget_destroy, (G_obj *widget))
+
+FN(void, gtk_widget_style_get, (G_obj *widget, const char *first_property_name, ...))
+FN(G_obj *, gtk_widget_get_parent, (G_obj *widget))
+FN(void, gtk_widget_set, (G_obj *widget, const char *first_property_name, ...))
+FN(void, gtk_window_set_default, (G_obj *window, G_obj *default_widget))
+
+FN(G_obj *, gtk_dialog_new, (void))
+FN(G_obj *, gtk_button_new, (void))
+FN(G_obj *, gtk_radio_button_new, (void *group))
+FN(G_obj *, gtk_check_button_new, (void))
+FN(G_obj *, gtk_vscrollbar_new, (G_obj *adjustment))
+FN(G_obj *, gtk_hscrollbar_new, (G_obj *adjustment))
+FN(G_obj *, gtk_image_new, (void))
+FN(G_obj *, gtk_menu_bar_new, (void))
+FN(void, gtk_menu_shell_append, (G_obj *menu_shell, G_obj *child))
+FN(void, gtk_menu_item_set_submenu, (G_obj *item, G_obj *submenu))
+
+
+FN(G_obj *, gtk_menu_new, (void))
+FN(G_obj *, gtk_menu_item_new, (void))
+FN(G_obj *, gtk_notebook_new, (void))
+
+FN(void, gtk_misc_get_alignment, (G_obj *misc, float *xalign, float *yalign))
+FN(void, gtk_misc_get_padding, (G_obj *misc, int *xpad, int *ypad))
diff --git a/uppsrc/Draw/iml.h b/uppsrc/Draw/iml.h
new file mode 100644
index 000000000..b47f503bb
--- /dev/null
+++ b/uppsrc/Draw/iml.h
@@ -0,0 +1,9 @@
+//#BLITZ_APPROVE
+
+#define IMAGE_KEEP
+
+#include "iml_header.h"
+
+#undef IMAGE_KEEP
+
+#include "iml_source.h"
diff --git a/uppsrc/Draw/iml_header.h b/uppsrc/Draw/iml_header.h
new file mode 100644
index 000000000..1253ca825
--- /dev/null
+++ b/uppsrc/Draw/iml_header.h
@@ -0,0 +1,63 @@
+//#BLITZ_APPROVE
+
+//$-
+
+#define IMAGE_META(k, v)
+#define IMAGE_SCAN(s)
+#define IMAGE_PACKED(n, d)
+
+#define PREMULTIPLIED
+#define IMAGE_BEGIN_DATA
+#define IMAGE_DATA(a0,a1,a2,a3,a4,a5,a6,a7,a8,a9,aa,ab,ac,ad,ae,af,b0,b1,b2,b3,b4,b5,b6,b7,b8,b9,ba,bb,bc,bd,be,bf)
+#define IMAGE_END_DATA(n, c)
+
+class IMAGECLASS {
+public:
+#define IMAGE_BEGIN(n) I_##n,
+#define IMAGE_ID(n) I_##n,
+	enum {
+#include IMAGEFILE
+		COUNT
+	};
+#undef  IMAGE_BEGIN
+#undef  IMAGE_ID
+
+public:
+	static UPP::Iml&   Iml();
+
+	static void        Register__()                { Register(ASSTRING(IMAGECLASS), Iml()); }
+
+	static int         Find(const UPP::String& s);
+	static int         Find(const char *s);
+	static int         GetCount()                  { return Iml().GetCount(); }
+	static UPP::String GetId(int i)                { return Iml().GetId(i); }
+
+	static UPP::Image  Get(int i);
+	static UPP::Image  Get(const char *s);
+	static UPP::Image  Get(const UPP::String& s);
+
+	static void   Set(int i, const UPP::Image& m);
+	static void   Set(const char *s, const UPP::Image& m);
+
+	static void   Reset()                     { Iml().Reset(); }
+
+#define IMAGE_BEGIN(n) static UPP::Image n() { return Get(I_##n); }
+#define IMAGE_ID(n) static UPP::Image n() { return Get(I_##n); }
+#include IMAGEFILE
+#undef  IMAGE_BEGIN
+#undef  IMAGE_ID
+
+};
+
+#undef  IMAGE_SCAN
+#undef  IMAGE_PACKED
+#undef  IMAGE_META
+
+#undef  IMAGE_BEGIN_DATA
+#undef  IMAGE_END_DATA
+#undef  IMAGE_DATA
+
+#ifndef IMAGE_KEEP
+#undef  IMAGECLASS
+#undef  IMAGEFILE
+#endif
diff --git a/uppsrc/Draw/iml_source.h b/uppsrc/Draw/iml_source.h
new file mode 100644
index 000000000..a8ff73b8e
--- /dev/null
+++ b/uppsrc/Draw/iml_source.h
@@ -0,0 +1,140 @@
+//#BLITZ_APPROVE
+
+//$
+
+#define IMAGE_META(k, v)
+
+#define PREMULTIPLIED
+#define IMAGE_ID(n)
+#define IMAGE_BEGIN_DATA
+#define IMAGE_END_DATA(n, c)
+#define IMAGE_DATA(a0,a1,a2,a3,a4,a5,a6,a7,a8,a9,aa,ab,ac,ad,ae,af,b0,b1,b2,b3,b4,b5,b6,b7,b8,b9,ba,bb,bc,bd,be,bf)
+
+#define IMAGE_BEGIN(n) const char *COMBINE(COMBINE(IMAGECLASS, _), n##__scans__)[] = {
+#define IMAGE_SCAN(s)  s,
+#define IMAGE_PACKED(n, d) };
+#define IMAGE_DATA_BEGIN
+
+
+#include IMAGEFILE
+
+#undef  IMAGE_BEGIN
+#undef  IMAGE_SCAN
+#undef  IMAGE_PACKED
+
+// -----------------------
+
+#define IMAGE_SCAN(s)
+#define IMAGE_BEGIN(n)
+
+// -----------------------
+
+
+UPP::Iml& IMAGECLASS::Iml() {
+	static UPP::Image::Init init[] = {
+	#define IMAGE_PACKED(n, d) { COMBINE(COMBINE(IMAGECLASS, _), n##__scans__), __countof(COMBINE(COMBINE(IMAGECLASS, _), n##__scans__)), d },
+
+		#include IMAGEFILE
+
+		{ NULL }
+	#undef  IMAGE_PACKED
+	};
+
+	static const char *name[IMAGECLASS::COUNT] = {
+	#define IMAGE_PACKED(n, d) #n,
+	#undef  IMAGE_ID
+	#define IMAGE_ID(n) #n,
+
+		#include IMAGEFILE
+
+	#undef  IMAGE_PACKED
+	#undef  IMAGE_ID
+	#define IMAGE_ID(n)
+	#define IMAGE_PACKED(n, d)
+	};
+	static UPP::Iml iml(init, name, COUNT);
+	static bool imlinit;
+	if(!imlinit) {
+		imlinit = true;
+
+	#undef  IMAGE_BEGIN_DATA
+	#undef  IMAGE_DATA
+	#undef  IMAGE_END_DATA
+	#define IMAGE_BEGIN_DATA { static const UPP::byte data[] = {
+	#define IMAGE_DATA(a0,a1,a2,a3,a4,a5,a6,a7,a8,a9,aa,ab,ac,ad,ae,af,b0,b1,b2,b3,b4,b5,b6,b7,b8,b9,ba,bb,bc,bd,be,bf)\
+	                   a0,a1,a2,a3,a4,a5,a6,a7,a8,a9,aa,ab,ac,ad,ae,af,b0,b1,b2,b3,b4,b5,b6,b7,b8,b9,ba,bb,bc,bd,be,bf,
+
+	#define IMAGE_END_DATA(n, c)   }; iml.AddData(data, n, c); }
+
+		#include IMAGEFILE
+
+	#undef IMAGE_BEGIN_DATA
+	#undef IMAGE_END_DATA
+	#undef IMAGE_DATA
+	#define IMAGE_BEGIN_DATA
+	#define IMAGE_END_DATA(n, c)
+	#define IMAGE_DATA(a0,a1,a2,a3,a4,a5,a6,a7,a8,a9,aa,ab,ac,ad,ae,af,b0,b1,b2,b3,b4,b5,b6,b7,b8,b9,ba,bb,bc,bd,be,bf)
+
+	#undef PREMULTIPLIED
+	#define PREMULTIPLIED iml.Premultiplied();
+		#include IMAGEFILE
+	#undef PREMULTIPLIED
+	#define PREMULTIPLIED
+
+	}
+	return iml;
+}
+
+UPP::Image IMAGECLASS::Get(int i)
+{
+	return Iml().Get(i);
+}
+
+UPP::Image IMAGECLASS::Get(const char *s)
+{
+	return Iml().Get(Find(s));
+}
+
+int   IMAGECLASS::Find(const UPP::String& s)
+{
+	return Iml().Find(s);
+}
+
+int   IMAGECLASS::Find(const char *s)
+{
+	return Iml().Find(s);
+}
+
+void  IMAGECLASS::Set(int i, const UPP::Image& m)
+{
+	Iml().Set(i, m);
+}
+
+void  IMAGECLASS::Set(const char *s, const UPP::Image& m)
+{
+	Iml().Set(Find(s), m);
+}
+
+struct COMBINE(IMAGECLASS, __Reg) {
+	COMBINE(IMAGECLASS, __Reg()) {
+		IMAGECLASS::Register__();
+	}
+};
+
+static COMBINE(IMAGECLASS, __Reg) COMBINE(IMAGECLASS, ___Reg);
+
+#undef  IMAGE_BEGIN_DATA
+#undef  IMAGE_DATA
+#undef  IMAGE_END_DATA
+#undef  IMAGE_PACKED
+#undef  IMAGE_ID
+
+#undef  IMAGE_SCAN
+#undef  IMAGE_BEGIN
+
+#ifndef IMAGE_KEEP
+#undef  IMAGECLASS
+#undef  IMAGEFILE
+#endif
+
+#undef  IMAGE_META
diff --git a/uppsrc/Draw/init b/uppsrc/Draw/init
new file mode 100644
index 000000000..726dc0a7f
--- /dev/null
+++ b/uppsrc/Draw/init
@@ -0,0 +1,4 @@
+#ifndef _Draw_icpp_init_stub
+#define _Draw_icpp_init_stub
+#include "Core/init"
+#endif
diff --git a/uppsrc/Draw/src.tpp/Display$en-us.tpp b/uppsrc/Draw/src.tpp/Display$en-us.tpp
new file mode 100644
index 000000000..bb17d5605
--- /dev/null
+++ b/uppsrc/Draw/src.tpp/Display$en-us.tpp
@@ -0,0 +1,15 @@
+TITLE("Display")
+COMPRESSED
+120,156,237,27,139,114,219,54,242,87,48,238,99,100,159,164,35,41,201,146,229,235,77,18,199,73,61,205,37,29,217,233,205,141,199,182,32,10,146,112,166,72,149,15,59,206,163,223,126,187,11,144,4,37,82,150,31,73,51,215,52,157,136,36,128,125,97,95,216,69,78,29,246,253,247,86,221,250,206,186,229,191,254,115,49,225,137,23,159,157,202,118,187,183,207,157,206,254,229,47,111,246,246,119,158,212,118,219,219,8,197,6,40,173,174,221,234,117,90,118,219,217,133,191,236,150,237,116,156,86,219,238,57,123,237,94,171,213,179,250,174,199,163,232,236,212,115,122,189,125,92,228,192,34,167,219,113,236,110,187,215,238,217,173,110,207,129,181,142,101,57,86,215,233,216,237,86,207,233,244,199,34,114,207,78,121,175,181,191,51,216,133,69,45,196,4,192,45,123,215,105,119,219,142,213,178,156,54,160,178,123,189,182,221,237,244,90,123,187,187,125,151,47,98,25,248,26,151,180,109,199,222,31,217,221,125,160,249,143,63,254,104,218,109,75,81,208,6,96,182,213,6,82,109,248,102,
+181,157,174,221,217,179,246,58,61,187,103,181,0,120,167,107,117,250,11,30,242,121,53,235,157,91,89,239,90,125,25,11,0,177,243,55,219,238,194,146,221,250,238,119,118,187,11,140,246,90,237,78,175,107,1,114,199,113,90,45,199,110,57,123,123,78,103,183,211,237,207,4,31,139,240,236,244,195,197,167,31,14,95,55,222,30,179,211,200,222,255,229,137,197,78,127,176,172,134,101,61,169,89,77,171,233,116,58,219,76,75,54,253,14,148,177,139,244,149,61,151,209,194,227,55,103,63,158,157,70,206,126,250,202,184,63,78,159,135,13,192,36,175,196,88,1,18,17,11,133,15,159,216,111,220,75,4,147,126,28,176,120,38,88,180,16,174,156,72,152,23,10,55,230,254,52,241,120,200,120,40,120,147,13,196,68,192,42,23,22,195,108,13,56,194,65,150,68,176,66,250,108,206,253,27,118,45,199,83,17,195,0,252,31,199,161,28,37,49,44,225,147,9,64,148,254,148,240,40,236,248,22,76,244,2,69,74,212,100,90,21,153,156,47,60,49,23,126,204,113,167,17,71,196,142,227,
+113,202,29,208,176,16,225,36,8,231,140,123,30,227,46,206,138,88,45,18,130,141,132,23,92,51,24,51,23,160,158,133,146,212,102,187,169,69,133,63,86,246,115,186,195,126,147,81,194,61,22,197,55,158,96,46,0,4,33,0,47,103,25,151,192,213,112,139,134,135,91,140,20,71,196,32,199,145,140,217,196,227,211,8,25,202,185,131,193,89,48,142,104,43,22,97,112,37,199,130,241,241,88,34,17,128,70,250,72,191,226,143,143,130,36,134,165,191,39,50,4,60,87,138,16,190,88,8,64,2,82,239,43,34,119,52,177,164,247,153,170,167,26,179,195,14,222,14,142,223,12,26,31,51,229,120,153,72,38,148,32,153,140,152,155,132,33,62,214,134,91,51,78,175,81,16,14,183,182,155,103,6,220,254,16,254,164,170,3,143,47,222,28,188,61,238,151,96,163,1,80,123,6,8,77,68,8,122,18,184,73,212,92,3,245,248,240,213,225,193,73,25,88,53,146,177,208,248,184,196,68,4,207,110,44,198,107,137,30,28,62,125,254,230,245,171,255,148,33,72,199,170,81,128,202,143,
+135,141,192,247,110,82,36,36,248,14,216,103,110,149,5,123,188,146,97,140,91,150,193,188,10,228,184,194,100,193,198,127,229,96,117,197,225,90,250,122,78,172,132,252,250,92,13,224,99,113,234,240,199,28,86,139,45,13,214,115,26,72,133,43,136,32,44,3,16,164,198,130,143,235,176,132,247,199,66,182,173,209,208,243,58,60,191,87,225,33,80,7,129,23,132,26,20,61,87,137,184,5,230,117,249,88,160,22,124,33,42,249,39,96,227,235,32,28,107,96,244,92,13,140,220,71,113,120,251,98,73,152,218,65,157,204,64,23,83,205,82,222,4,181,147,92,17,122,64,84,162,212,87,43,143,21,163,2,115,215,5,10,200,219,6,134,83,39,209,55,217,235,32,22,224,134,57,40,58,233,250,155,95,200,87,22,66,4,46,76,208,141,161,7,28,179,255,38,145,246,208,44,190,89,128,39,134,149,215,96,228,224,84,229,212,135,69,8,160,134,51,221,144,71,51,22,128,151,15,175,101,36,96,115,27,26,141,235,73,164,205,13,198,24,0,162,5,240,41,71,210,147,49,57,115,96,
+137,66,3,16,142,252,164,1,134,28,72,59,55,221,3,82,247,198,71,52,137,178,177,16,198,78,120,136,1,37,19,75,217,188,223,97,158,230,39,128,120,161,36,9,30,165,100,42,170,81,227,227,113,50,157,138,40,86,172,138,105,24,36,200,44,106,77,217,26,165,47,230,170,17,119,47,111,91,165,20,3,8,51,162,80,243,243,121,159,103,25,73,223,252,208,55,63,244,112,63,132,121,34,37,64,47,223,30,101,177,148,252,12,166,79,144,222,68,152,255,80,130,148,58,172,220,55,65,250,72,74,169,161,215,25,228,141,44,154,5,137,55,134,116,226,74,40,171,129,165,30,71,115,138,130,185,184,70,208,128,61,205,105,210,76,79,57,48,240,59,9,154,145,7,238,5,169,87,235,225,129,18,93,200,219,48,151,51,172,82,123,128,140,144,38,171,229,142,210,36,141,205,209,25,186,30,36,102,4,203,128,17,9,76,9,99,225,221,212,33,43,133,201,201,116,6,227,224,218,138,180,73,244,156,19,233,43,233,161,235,91,50,72,242,167,68,118,204,163,203,237,111,94,80,205,163,
+241,59,122,66,178,138,99,249,62,181,123,124,172,118,140,47,69,12,103,134,213,57,181,47,227,100,170,236,239,88,25,66,40,226,36,244,25,197,100,30,130,190,1,157,164,42,83,136,220,62,187,162,173,52,206,125,77,118,216,156,54,153,156,100,250,39,35,227,120,114,52,231,176,47,117,140,207,81,1,1,170,53,202,0,141,21,159,105,34,90,198,66,190,19,30,28,210,158,153,58,173,22,105,195,74,87,137,119,180,11,161,88,64,172,207,78,113,26,158,74,68,214,41,100,54,184,243,119,8,8,68,20,113,135,218,164,81,40,197,69,238,205,92,225,238,161,242,110,10,50,64,70,254,52,253,48,130,221,202,241,193,92,230,190,187,231,186,155,205,244,113,160,183,60,83,192,212,157,41,21,188,20,98,145,158,245,57,250,120,240,67,40,183,205,182,220,24,4,62,26,31,7,233,161,248,90,142,227,89,147,29,77,216,123,17,6,166,222,142,48,62,204,23,73,172,60,42,226,47,32,134,165,241,12,184,43,197,113,99,226,152,9,57,157,197,15,65,242,238,161,186,91,252,233,84,148,
+132,162,56,76,150,19,165,124,183,158,198,113,120,2,54,152,57,16,42,167,0,119,30,184,100,29,133,96,71,175,68,24,203,145,71,254,63,55,76,163,108,82,199,231,1,138,196,44,43,193,183,3,176,105,17,230,197,149,24,197,112,61,19,152,248,107,246,22,88,106,162,128,42,41,45,72,105,162,35,4,193,153,193,95,128,28,68,60,150,19,42,47,197,16,174,71,128,100,28,44,168,90,228,7,254,176,225,39,88,225,201,139,73,42,56,10,114,50,133,152,229,148,136,140,108,238,223,199,49,122,60,109,117,250,173,74,118,177,33,55,69,47,5,199,177,226,85,163,42,219,29,66,245,2,206,96,26,15,62,86,33,153,224,152,70,130,243,82,167,185,30,248,166,169,34,133,107,147,133,60,218,62,28,182,10,235,26,250,179,165,136,94,68,81,64,144,238,255,121,174,157,41,72,211,233,89,236,40,79,152,151,14,35,138,198,34,121,69,7,150,125,221,206,84,31,171,145,153,186,84,166,29,46,230,76,51,177,52,97,213,132,135,59,152,151,53,31,131,207,95,205,108,254,49,57,165,
+29,250,170,88,5,210,76,107,88,98,150,108,166,96,46,5,86,39,107,88,69,59,42,227,113,162,121,44,140,111,200,98,223,100,141,158,61,57,245,135,53,112,52,195,237,254,253,4,64,32,86,217,55,28,186,172,224,158,223,166,210,179,32,148,239,129,77,172,23,35,22,60,119,53,217,211,5,86,156,211,144,172,10,245,79,95,29,189,124,61,188,120,117,248,226,164,158,190,28,28,190,62,57,28,144,59,214,95,6,71,47,127,62,185,77,36,175,196,36,30,214,238,45,14,92,158,75,35,99,140,164,100,176,230,193,180,219,40,81,145,232,1,180,40,0,27,80,163,131,164,75,243,111,35,139,130,230,3,168,162,245,27,16,21,82,190,178,89,234,27,128,91,224,113,16,94,80,128,174,149,102,119,229,118,146,197,110,56,52,195,161,211,200,224,87,61,195,19,107,149,183,50,133,47,100,202,134,202,27,51,102,220,112,126,195,29,195,42,98,19,122,38,156,3,4,137,121,81,148,145,0,39,241,8,139,148,105,62,74,66,203,146,9,210,123,108,32,81,197,210,76,50,96,179,49,1,
+252,60,60,146,42,92,35,123,231,236,250,255,155,203,52,245,90,206,186,150,14,58,95,152,211,22,171,250,61,78,15,215,105,139,83,139,102,229,59,121,212,172,75,153,246,6,39,137,239,234,246,222,212,11,70,220,139,134,91,88,139,74,191,71,250,184,140,228,167,13,70,248,164,123,171,84,175,151,84,26,83,171,243,131,59,77,117,77,155,99,31,62,180,58,45,171,191,219,238,90,51,123,255,73,205,177,192,198,105,52,93,229,243,185,56,235,247,245,199,188,3,10,223,206,159,56,244,121,71,157,127,179,140,255,220,200,254,97,218,79,172,148,251,102,46,6,149,236,3,243,49,237,78,226,123,34,138,116,205,63,115,27,212,151,229,35,8,72,219,77,68,94,141,218,60,108,220,13,63,121,194,97,131,98,32,30,209,30,133,156,194,57,231,110,244,168,56,113,127,74,40,247,203,104,49,223,114,58,50,172,52,204,106,105,3,153,250,46,17,106,231,141,58,33,21,106,157,73,148,90,207,210,73,109,69,24,112,94,69,50,115,137,20,63,24,2,145,115,137,151,5,64,129,205,211,35,
+85,113,99,80,121,119,38,140,160,69,117,3,152,58,145,96,170,215,179,192,203,142,87,234,182,193,18,25,84,127,202,104,48,223,74,36,161,138,85,249,225,147,235,45,169,171,236,136,118,64,71,242,56,88,12,27,152,99,96,219,201,135,152,190,132,247,133,140,193,176,139,216,87,191,85,210,16,185,220,83,181,130,9,226,164,139,15,105,53,118,121,175,181,174,20,113,149,125,173,196,150,169,155,244,55,193,53,254,25,204,197,67,147,41,199,89,58,124,119,228,170,40,98,171,202,33,86,112,224,203,76,130,163,30,5,225,120,85,226,88,209,6,221,204,168,41,190,151,160,215,19,214,203,250,211,167,162,151,103,21,225,174,226,194,205,106,235,204,236,81,177,139,126,89,238,178,8,229,21,143,69,69,84,252,23,24,60,31,121,226,156,165,79,217,196,127,172,69,246,207,139,52,54,102,99,232,79,184,50,246,165,10,15,245,46,220,96,62,146,190,200,28,19,6,200,98,196,65,105,153,247,106,244,77,149,225,150,190,133,162,219,202,16,200,204,230,77,147,29,17,234,244,212,101,240,158,
+241,164,163,21,140,217,78,47,29,173,76,82,255,58,87,38,30,220,66,188,24,254,116,113,76,139,84,78,116,95,192,37,13,197,28,52,213,39,30,181,191,136,176,141,25,214,102,213,230,35,255,42,184,4,5,86,93,56,208,65,84,72,78,245,230,84,109,177,36,152,127,173,172,39,63,70,211,236,43,232,132,173,59,233,125,21,70,180,182,201,112,207,222,196,205,253,150,61,86,43,228,155,241,62,204,120,87,109,86,181,75,30,102,180,239,234,12,178,76,23,126,168,141,179,108,191,172,134,217,93,29,19,189,186,106,31,213,117,135,167,180,167,254,149,155,246,35,181,178,111,219,169,124,225,221,125,237,106,229,232,87,74,53,48,53,44,52,191,30,153,217,91,219,178,127,106,187,52,149,108,70,229,131,130,216,95,178,41,250,5,116,228,46,208,192,130,223,111,182,247,135,32,67,224,148,238,66,5,57,13,181,232,125,19,221,22,254,220,108,87,213,223,114,142,205,168,94,224,234,88,100,135,241,251,150,232,242,211,214,18,160,98,184,207,241,175,54,34,214,92,215,28,163,251,46,221,
+208,59,178,89,184,44,113,103,38,213,181,139,226,141,139,37,6,175,214,48,88,105,141,87,133,251,11,247,102,238,203,109,94,238,220,190,140,228,204,139,3,107,37,185,172,40,159,65,208,7,120,107,47,23,245,118,126,159,101,14,71,214,34,189,88,64,75,70,17,248,64,186,182,204,61,143,138,200,234,16,194,221,88,213,123,253,64,119,85,100,224,15,183,234,249,60,35,138,34,231,185,235,215,119,172,200,9,88,117,102,45,27,127,73,74,255,152,119,138,40,49,40,153,83,153,22,12,140,235,93,183,5,251,205,66,251,237,252,164,74,173,207,33,69,205,174,224,169,116,214,70,92,45,43,221,42,95,27,223,48,179,242,30,219,40,8,188,77,136,41,199,24,135,248,15,179,10,23,247,34,177,220,231,51,208,174,86,138,106,101,93,20,49,95,196,55,249,228,186,10,207,126,144,91,105,164,110,244,223,9,211,103,114,89,75,163,101,252,228,69,48,98,36,191,79,188,46,32,105,184,183,134,165,63,145,215,207,226,164,185,183,137,44,223,85,201,146,252,88,181,247,46,149,234,178,15,
+7,18,74,188,4,252,156,253,15,162,7,123,54,
diff --git a/uppsrc/Draw/src.tpp/Draw$en-us.tpp b/uppsrc/Draw/src.tpp/Draw$en-us.tpp
new file mode 100644
index 000000000..d92ccc939
--- /dev/null
+++ b/uppsrc/Draw/src.tpp/Draw$en-us.tpp
@@ -0,0 +1,105 @@
+TITLE("Draw")
+COMPRESSED
+120,156,236,189,9,91,20,73,182,48,252,87,242,155,123,223,25,112,144,70,237,197,177,103,238,115,109,181,187,125,175,221,250,169,61,51,247,235,7,37,169,74,32,199,162,138,169,172,18,152,183,239,251,40,138,162,104,1,138,27,178,168,133,130,136,43,34,40,34,162,96,185,35,138,162,162,162,168,168,40,96,137,44,178,126,231,68,68,102,101,214,194,110,183,61,227,44,82,85,153,17,113,226,196,217,227,196,137,31,39,115,255,254,239,65,1,65,255,22,52,196,127,166,205,20,194,120,171,193,18,252,163,248,233,167,83,191,228,39,127,246,229,146,255,154,251,135,47,39,252,167,223,231,159,250,99,47,147,160,151,41,95,76,154,50,245,179,41,147,62,157,252,57,252,51,105,202,164,201,159,77,158,242,233,164,169,147,255,240,233,212,41,83,166,6,77,211,25,120,73,10,254,209,48,121,234,212,47,177,209,100,104,52,249,139,207,38,79,250,226,211,169,159,78,157,52,229,139,169,147,161,237,228,160,160,201,65,95,76,254,108,210,167,83,166,78,254,108,154,94,144,116,193,63,242,83,
+167,124,57,97,254,231,208,104,10,142,4,157,7,77,250,124,242,167,95,124,58,57,104,74,208,228,79,97,168,73,83,167,126,58,233,139,207,166,78,249,195,231,159,79,211,241,81,22,209,100,100,99,137,147,38,77,158,244,101,232,164,47,190,4,152,255,239,255,253,191,129,147,62,13,162,16,124,10,157,77,10,250,20,64,157,4,191,5,125,58,249,139,73,159,253,33,232,15,159,77,157,52,53,104,10,116,254,217,23,65,159,77,139,226,205,124,164,239,169,127,54,228,212,191,8,154,38,90,4,232,98,194,239,39,77,250,2,154,124,30,240,249,191,77,250,244,11,152,232,212,41,159,126,54,245,139,32,24,124,242,228,201,83,166,76,158,52,101,242,31,254,48,249,179,207,63,251,98,90,132,192,235,5,115,240,143,255,103,241,255,252,175,89,223,79,252,97,1,247,163,52,229,203,105,33,240,223,153,102,62,26,255,18,132,202,63,76,227,240,223,223,6,255,40,5,125,57,129,251,113,2,71,158,46,14,150,127,157,252,37,71,31,114,255,249,159,98,36,31,46,76,155,244,249,167,65,
+191,157,60,121,210,31,226,86,196,47,79,142,91,38,255,167,171,51,189,249,126,249,145,199,121,151,54,199,63,170,26,104,186,185,55,191,113,253,227,117,15,111,174,56,235,76,191,248,176,121,103,230,154,53,165,215,6,10,143,156,239,61,20,119,114,253,190,253,119,219,50,156,3,109,89,47,138,6,250,59,7,222,110,92,86,242,58,61,41,185,234,213,227,189,203,143,55,182,150,236,120,84,219,113,248,116,122,125,231,192,185,164,243,203,139,187,11,26,226,18,246,38,59,90,207,165,159,220,185,169,225,249,149,4,251,133,236,51,233,165,219,156,43,27,107,18,236,69,137,13,185,55,250,91,51,146,90,47,159,172,72,118,190,109,116,166,223,44,234,121,146,178,127,77,231,174,34,219,131,252,50,91,218,254,251,167,111,87,84,111,207,88,219,103,111,126,220,89,222,241,102,99,247,177,150,146,184,238,117,167,95,165,56,90,59,118,219,106,215,174,220,187,98,117,241,153,3,213,240,218,253,222,183,133,217,39,106,179,118,245,223,221,186,45,62,21,70,216,158,190,201,209,110,187,219,97,
+127,102,187,182,6,224,89,126,213,121,180,175,50,197,185,114,115,27,60,125,220,184,190,28,193,235,200,181,149,199,213,59,54,58,182,198,93,134,151,250,139,155,250,171,138,10,26,147,202,171,142,156,76,56,12,112,55,20,167,231,165,86,229,245,15,156,40,137,75,176,87,64,211,51,137,13,9,93,153,206,183,13,141,21,41,215,119,218,30,56,215,21,159,201,3,16,18,82,28,231,227,161,143,248,6,50,241,99,113,39,109,9,69,247,202,211,219,75,239,244,213,183,45,127,113,190,49,43,241,242,225,158,250,203,203,215,23,36,197,111,46,95,249,32,46,121,165,115,229,142,93,107,26,18,78,111,168,72,137,95,150,157,96,95,118,33,57,213,177,108,195,14,219,178,236,107,229,233,203,207,159,217,109,107,223,211,119,54,169,216,241,234,156,125,83,202,165,59,141,173,235,50,30,30,186,227,200,179,247,108,57,210,91,95,126,103,32,225,97,234,214,101,197,215,239,61,186,120,38,253,209,182,138,148,189,13,215,55,55,36,92,218,177,222,150,186,229,72,178,227,246,201,85,206,236,226,
+212,248,226,194,51,71,18,236,149,187,243,227,43,82,54,151,167,239,61,144,255,116,167,237,208,186,134,243,59,156,123,47,165,59,42,139,206,157,200,188,119,183,105,253,202,149,57,169,13,231,225,183,204,215,167,95,230,236,169,40,127,84,186,106,195,154,43,21,41,155,160,223,98,91,71,221,145,204,228,39,219,206,39,21,63,185,126,239,226,155,92,91,83,105,81,127,221,179,158,226,150,135,175,174,166,212,63,40,218,151,85,120,115,227,173,162,246,166,215,71,27,154,15,87,164,52,60,184,190,185,235,65,78,206,222,23,107,211,115,59,206,21,12,196,181,244,212,111,42,110,90,94,82,158,61,176,253,208,218,218,195,182,194,100,199,69,199,197,162,222,254,91,25,105,91,82,203,214,55,57,18,155,51,106,207,21,150,220,28,104,216,93,191,191,244,68,207,243,103,79,174,95,129,209,215,22,117,247,116,63,46,168,170,74,42,58,87,157,114,183,192,249,118,85,69,93,10,0,118,181,184,123,160,244,126,229,138,198,130,186,157,165,213,3,171,18,239,86,213,95,190,217,251,164,99,251,
+230,132,226,238,77,56,33,251,165,253,206,212,164,235,239,18,142,23,189,124,94,145,190,183,235,192,211,53,13,185,239,202,175,157,45,189,89,244,160,179,32,110,243,189,99,27,128,96,15,1,110,158,190,72,178,239,216,20,87,154,85,99,59,85,102,91,221,188,206,190,35,103,237,157,163,217,216,79,250,165,222,130,91,189,187,171,106,157,53,199,118,23,247,22,157,43,77,176,119,109,107,186,126,176,172,229,249,217,180,4,251,10,192,177,51,125,249,185,253,4,219,21,41,203,9,182,159,238,76,36,216,118,238,173,72,116,174,124,154,236,88,155,125,233,78,130,61,127,69,241,74,192,35,174,92,78,69,10,89,185,194,75,59,200,202,189,118,220,38,43,231,216,221,191,97,231,195,230,142,214,148,139,231,119,231,23,116,230,219,14,221,126,5,180,176,242,233,242,97,209,143,115,79,223,157,245,131,208,207,154,142,148,113,161,159,91,72,63,117,133,111,151,191,221,89,139,207,95,63,93,115,213,217,87,147,106,111,123,176,205,145,148,191,242,194,133,20,199,218,75,119,26,206,20,223,109,
+126,183,204,185,242,192,85,50,225,179,247,156,53,101,237,117,167,234,157,142,246,199,109,107,187,222,108,58,81,250,252,70,253,213,171,157,101,229,21,169,240,74,38,208,207,229,142,236,155,175,82,226,42,31,60,239,168,79,109,62,184,170,244,238,179,206,234,190,219,27,156,217,189,249,219,43,90,91,239,239,124,119,161,174,58,183,255,228,245,254,221,253,73,155,59,239,239,43,72,122,221,127,14,86,248,113,110,99,151,189,168,236,88,207,219,23,189,231,211,31,237,169,72,105,166,228,82,58,64,201,165,244,26,33,151,206,103,215,119,217,146,17,243,55,142,220,75,115,56,119,100,172,217,178,209,129,116,242,156,208,73,215,166,228,148,162,151,231,19,138,175,55,222,187,120,61,203,209,116,190,190,181,241,194,26,71,211,237,43,246,190,243,187,106,119,218,174,2,186,42,138,94,94,57,83,255,38,181,170,185,46,110,211,165,206,58,71,101,245,161,184,131,183,206,33,1,180,61,186,220,0,232,109,168,161,232,181,173,162,232,93,245,128,162,247,204,93,138,222,138,56,138,222,167,155,41,
+122,157,9,123,41,193,92,88,75,9,230,118,49,50,222,242,91,215,143,244,156,127,250,228,250,230,71,119,122,86,111,125,213,145,146,115,49,225,200,178,243,113,197,113,84,172,172,169,166,100,177,44,142,146,133,227,34,37,139,71,247,54,56,110,156,202,95,117,239,212,227,14,74,81,5,157,132,162,218,144,60,78,181,62,140,127,53,208,147,176,238,116,250,33,36,90,0,161,28,137,22,64,56,143,68,11,32,84,32,209,2,8,175,41,185,120,204,167,5,231,83,89,153,82,119,49,183,181,167,114,229,190,71,101,251,222,60,61,250,48,241,60,129,251,128,45,254,64,235,246,238,45,247,179,150,109,62,232,192,121,174,90,179,107,71,75,214,166,180,156,206,245,235,138,236,182,212,129,45,71,210,19,237,141,142,129,237,141,5,87,28,206,103,3,135,235,251,30,30,123,250,60,33,181,107,39,130,242,248,82,101,113,211,185,138,246,203,197,121,7,242,86,239,180,245,94,131,70,221,69,133,237,219,226,91,91,123,139,139,143,119,220,232,59,243,174,46,209,158,220,127,56,233,202,242,45,
+235,187,91,26,239,56,202,236,245,91,142,60,73,178,119,151,237,110,191,188,124,203,46,91,106,201,150,35,247,146,236,141,171,247,237,63,236,60,154,145,94,92,30,119,6,193,89,83,242,248,121,85,250,219,251,85,45,71,238,229,63,122,87,145,114,5,232,229,176,243,109,247,238,27,213,175,243,157,43,175,22,17,178,189,95,92,219,253,178,255,96,127,249,186,23,175,246,92,30,40,46,233,92,147,212,181,31,225,43,1,248,186,155,151,119,59,211,139,31,173,45,185,209,87,125,34,197,113,13,150,118,249,238,252,82,231,202,219,195,230,171,100,39,93,248,13,14,186,240,41,4,235,215,7,82,227,19,14,29,131,165,95,15,107,143,75,127,10,214,30,151,126,3,174,61,44,125,2,172,61,46,253,38,88,123,92,250,107,176,246,184,244,167,151,101,19,137,0,34,161,177,175,125,115,241,246,11,175,136,68,56,210,216,74,36,194,171,60,59,145,8,246,59,3,169,219,65,34,12,37,151,110,2,205,34,228,155,80,200,1,228,50,189,44,39,218,35,217,241,234,70,67,94,127,218,133,
+182,181,47,151,237,197,159,206,92,58,83,156,215,159,157,242,24,212,49,116,189,161,225,164,173,113,255,10,91,194,45,156,124,134,243,237,185,190,147,205,247,234,183,222,203,123,212,151,118,115,247,149,11,25,47,207,21,174,219,181,187,235,245,154,219,91,157,217,53,101,39,86,92,184,92,122,188,114,251,225,251,189,247,138,110,213,118,172,178,189,169,77,113,52,221,60,133,90,100,203,242,155,253,125,157,103,95,217,179,82,214,93,186,211,253,56,183,255,222,201,117,71,242,74,219,242,26,183,23,117,87,229,175,47,190,126,228,222,197,35,121,182,166,251,5,213,175,14,29,179,53,92,168,93,99,47,218,9,51,42,61,178,110,157,189,121,127,125,119,213,171,212,180,190,151,251,42,211,74,14,29,223,235,124,123,224,24,153,120,118,58,240,116,121,143,227,101,122,135,221,246,96,85,241,245,14,128,61,219,214,80,149,89,118,197,81,178,34,217,113,186,245,44,210,205,241,91,118,219,218,195,137,219,143,214,247,151,175,216,217,157,179,191,245,224,153,60,92,216,7,249,246,134,231,69,219,
+210,156,89,231,78,109,239,91,223,94,118,55,45,43,35,109,227,134,101,142,131,21,216,176,101,77,195,243,61,235,219,110,39,220,235,218,142,120,218,120,233,190,51,245,94,213,242,132,199,68,94,102,238,77,72,104,127,22,191,174,242,52,209,34,187,15,197,173,163,12,153,178,146,50,228,154,4,202,144,178,252,70,122,237,238,57,181,236,113,33,74,249,45,71,94,94,126,80,114,250,97,65,82,69,205,185,212,120,144,8,107,41,89,92,200,165,100,177,108,7,33,11,151,220,184,178,165,56,173,227,105,225,195,85,153,5,73,53,32,66,183,111,43,237,92,86,222,152,181,125,239,58,224,223,190,213,231,158,13,212,57,30,46,107,216,65,197,194,211,108,42,22,236,187,168,88,56,83,76,197,194,245,60,42,22,82,87,80,177,224,60,72,197,220,145,245,132,218,203,211,51,175,172,217,123,56,241,197,131,226,155,3,55,158,86,156,63,127,56,129,144,197,161,54,91,211,187,170,213,171,214,238,182,239,92,97,7,140,188,198,97,178,79,148,159,180,33,213,237,46,40,179,157,74,42,202,
+120,153,216,185,162,46,171,222,126,34,123,103,102,110,203,139,171,217,231,54,39,174,202,235,201,171,189,91,120,244,104,206,142,91,141,187,74,145,90,223,58,170,207,20,36,212,156,40,204,106,61,71,233,101,215,173,182,245,206,93,55,223,86,244,86,131,2,122,115,120,87,214,131,123,253,142,202,29,91,18,235,94,238,181,217,182,158,236,172,171,47,104,203,104,79,187,126,184,178,179,160,234,84,247,185,109,199,83,159,214,164,223,44,43,217,117,103,103,89,95,103,206,185,21,103,51,47,215,164,175,122,82,148,211,125,235,138,35,46,125,55,17,28,91,183,109,117,212,85,221,45,205,58,124,163,119,229,158,83,123,142,55,95,173,57,186,111,115,119,247,133,43,239,18,115,106,94,130,126,185,142,244,54,112,100,221,90,251,141,172,184,186,154,236,60,219,213,167,151,222,189,168,114,56,187,215,216,211,106,8,98,46,180,53,228,110,219,81,158,179,167,176,177,161,225,78,67,85,217,229,166,211,13,231,19,156,217,173,197,169,79,109,197,121,173,69,91,155,58,206,174,232,188,236,168,185,
+113,188,101,221,173,186,164,129,19,77,251,14,197,59,29,128,29,128,179,47,253,216,217,54,251,153,103,143,107,139,156,111,43,156,207,203,110,103,149,109,106,207,235,204,121,144,120,224,12,152,190,149,135,17,249,247,143,62,138,203,220,158,136,164,251,22,104,183,196,22,183,61,33,227,97,62,82,214,139,75,43,82,118,182,36,46,171,59,76,224,201,142,91,57,184,62,34,203,6,164,215,66,86,125,115,119,102,201,242,101,72,122,15,128,246,144,244,246,60,68,58,74,141,175,33,218,40,59,225,52,209,70,203,54,196,161,54,2,210,147,229,214,115,160,61,36,189,163,64,123,72,122,183,129,246,144,244,238,0,237,33,233,29,6,218,67,210,91,9,180,135,164,183,139,154,81,151,54,80,51,234,250,25,42,174,42,110,80,113,117,41,141,138,43,71,23,21,87,241,77,84,92,237,238,130,233,223,172,127,94,220,255,120,32,253,212,235,150,194,227,229,148,176,146,108,246,238,210,254,39,117,91,154,47,157,60,118,249,76,122,49,53,3,27,239,95,202,223,86,187,234,78,194,49,196,198,
+234,134,231,61,117,93,125,135,74,79,158,58,208,126,215,118,173,247,94,250,139,253,219,10,203,108,73,251,143,174,239,32,8,235,168,109,200,45,174,108,223,249,250,84,170,163,52,163,231,241,150,231,221,119,31,174,46,190,190,238,212,173,154,237,219,143,110,110,171,202,203,42,219,94,48,112,184,250,120,114,253,169,186,254,18,199,221,135,207,74,182,61,219,156,213,183,14,69,212,118,144,81,135,155,143,21,229,216,174,238,199,46,111,64,159,43,30,63,239,73,190,179,175,46,61,227,54,136,109,194,112,197,235,238,216,109,184,50,59,96,253,82,29,87,178,157,107,6,122,243,109,171,14,202,112,236,237,115,214,188,93,103,235,189,116,173,237,249,171,212,190,184,103,253,103,107,87,149,84,164,220,36,118,252,218,202,131,5,121,3,89,167,26,115,46,53,228,222,190,240,248,229,138,184,12,42,184,119,56,214,108,219,191,169,202,222,140,232,203,78,178,151,63,60,149,8,178,98,45,200,213,55,89,206,118,199,209,85,169,164,255,132,244,54,141,220,113,183,27,123,9,218,119,247,191,142,
+75,2,235,53,229,226,118,98,189,218,14,93,34,214,235,211,157,203,226,78,111,72,63,151,183,108,109,118,249,163,108,248,188,3,191,192,231,229,217,244,193,91,252,114,52,247,116,207,186,129,228,245,237,87,30,228,212,238,94,121,169,123,107,229,181,248,198,214,186,252,23,29,135,79,29,216,125,239,250,217,252,99,121,175,239,159,44,24,112,110,88,113,171,60,253,233,147,234,184,229,13,40,58,143,215,220,169,89,86,124,230,118,197,142,234,171,155,55,237,176,29,186,188,217,153,186,177,50,62,97,131,125,93,165,183,247,30,226,123,9,13,185,247,223,245,109,88,221,217,81,218,150,157,249,172,179,246,78,91,203,153,3,101,183,119,62,189,184,178,224,252,192,189,53,157,253,219,206,236,46,189,188,43,206,217,149,94,216,121,247,254,246,119,241,21,55,50,50,58,122,192,22,232,43,187,219,110,235,120,221,87,90,187,234,69,250,211,23,135,43,118,217,222,28,201,221,120,122,103,241,245,245,143,139,158,181,173,201,57,81,242,170,227,86,182,237,128,29,30,212,230,158,174,4,118,110,
+120,118,42,105,123,81,231,149,237,246,83,187,6,94,215,222,62,190,162,176,233,78,103,238,185,220,132,198,131,7,238,236,191,212,246,166,180,105,83,198,254,164,19,215,15,101,118,118,222,233,236,74,190,90,218,83,191,101,195,129,229,47,30,109,222,116,237,89,253,230,230,135,13,59,106,74,123,142,237,218,149,51,112,114,107,215,218,181,237,175,218,156,189,143,78,87,165,103,244,189,112,188,204,184,113,111,160,101,93,233,190,119,101,43,156,169,55,28,171,95,220,173,45,191,228,120,114,246,70,110,71,215,225,43,45,237,143,182,214,110,222,88,212,145,95,182,191,160,180,160,109,103,97,79,103,111,215,198,86,91,218,145,190,174,139,107,182,172,188,123,58,221,81,254,58,197,81,146,255,18,160,62,95,156,189,188,230,68,89,70,97,217,222,3,133,27,155,182,21,223,61,240,112,199,214,130,103,233,149,137,53,73,15,46,181,148,223,204,58,247,208,121,54,197,81,188,255,72,129,173,99,224,94,243,177,254,147,182,184,157,231,206,85,39,181,58,115,183,244,182,92,176,149,22,56,150,
+159,77,223,121,233,120,127,113,119,98,103,127,89,91,22,188,240,32,57,207,81,242,178,229,222,233,215,229,21,41,87,183,111,112,180,183,247,157,233,171,169,42,188,114,249,66,103,73,101,78,103,221,222,174,211,233,25,7,42,91,242,251,78,36,214,247,230,223,221,214,114,58,253,209,209,179,206,130,183,181,39,90,218,119,190,188,114,108,117,223,246,190,142,218,149,27,215,21,150,180,38,59,218,203,90,50,142,31,239,185,190,188,225,250,91,219,134,206,220,93,15,210,210,78,222,30,56,93,87,191,247,89,235,203,235,103,250,119,239,220,115,181,127,211,253,117,197,175,143,30,182,215,111,203,121,116,248,113,239,198,134,231,55,59,54,28,106,109,46,206,187,87,86,153,158,153,86,220,180,63,43,247,209,157,170,226,236,129,154,117,13,207,239,61,108,42,106,4,91,244,217,129,43,171,27,46,180,111,116,20,55,215,46,47,88,5,162,59,253,218,185,244,71,249,13,9,57,185,41,142,173,137,197,103,94,220,172,72,57,183,203,246,250,174,109,117,113,249,171,190,251,23,43,139,179,107,
+144,114,87,189,232,64,202,221,176,102,89,231,46,148,128,231,169,246,77,222,65,180,111,67,130,187,156,92,245,122,141,253,78,125,93,124,118,11,53,248,207,110,166,6,255,65,98,189,215,119,174,125,221,81,182,98,213,170,81,219,149,78,162,182,119,53,84,231,182,212,236,47,121,177,39,253,196,186,53,229,141,69,85,157,199,86,116,230,31,60,213,219,221,146,247,54,39,177,247,165,237,94,217,202,71,7,247,103,118,60,107,168,111,1,81,191,10,221,168,166,142,146,29,111,207,117,167,85,173,27,104,236,75,206,172,61,177,121,237,163,139,213,149,7,50,29,143,51,178,14,61,89,95,178,194,217,137,82,224,246,174,202,87,87,91,142,189,109,221,144,249,238,220,195,229,57,61,233,207,119,190,190,157,94,152,149,117,96,237,155,54,199,205,254,120,103,199,19,199,238,252,218,199,185,53,93,215,234,183,228,190,188,153,90,90,233,124,124,237,122,82,205,134,252,131,199,19,211,118,86,189,219,21,23,95,232,120,153,124,240,213,225,218,215,121,53,5,41,43,246,158,168,91,81,180,161,
+165,115,253,205,125,125,91,137,20,127,250,42,61,63,62,35,174,250,68,82,199,221,147,37,119,123,119,222,73,187,180,165,245,192,227,107,233,55,95,58,111,23,220,109,73,73,60,121,56,169,178,250,120,218,234,139,206,236,61,39,182,59,179,55,247,230,231,22,21,117,221,115,22,29,205,58,90,183,162,58,163,33,177,167,167,34,195,118,99,253,161,158,155,5,117,125,197,207,14,189,233,123,188,105,215,139,129,254,117,15,174,21,230,213,95,189,88,145,184,102,75,199,190,117,173,47,179,250,222,22,108,125,179,247,82,85,75,105,119,250,147,154,158,214,187,27,157,153,53,173,39,154,31,159,184,187,167,117,173,253,225,182,43,101,89,43,82,18,55,39,86,222,218,156,88,215,156,190,238,66,122,227,254,179,187,243,111,52,228,166,181,36,217,119,63,223,124,185,49,173,234,65,193,165,222,93,119,26,158,102,175,177,63,220,92,149,121,181,162,186,251,222,197,12,176,50,227,238,148,172,190,88,91,155,153,246,180,179,183,184,107,91,43,248,69,215,27,59,115,74,146,96,174,171,83,159,
+62,42,110,234,207,31,120,81,223,81,178,241,92,193,131,78,219,181,129,45,253,153,111,138,155,238,61,171,218,144,208,106,111,7,196,219,236,142,50,91,70,199,137,155,221,155,75,106,146,14,158,171,78,127,83,156,225,76,125,251,106,32,46,119,87,154,99,211,241,7,215,46,247,238,119,30,93,183,229,254,145,39,9,246,250,115,121,169,73,93,41,39,203,178,170,106,43,170,91,242,219,111,52,173,126,90,123,41,33,115,245,203,194,151,173,119,246,191,57,94,219,92,212,211,92,93,152,187,57,245,89,111,109,25,80,100,33,248,33,15,19,27,246,180,39,110,74,47,190,88,181,219,150,95,81,221,118,43,175,235,77,219,64,178,227,78,113,106,123,124,113,90,195,250,180,156,196,139,187,202,26,206,183,13,25,255,104,167,126,70,205,182,250,75,203,243,175,156,186,126,12,237,175,142,7,203,243,86,109,239,203,62,178,43,127,45,245,99,125,242,77,23,240,77,113,69,245,209,187,7,247,45,239,220,218,151,93,124,4,22,232,85,233,138,236,117,199,8,255,20,108,110,45,41,238,169,
+63,149,28,183,194,171,253,60,220,248,71,58,134,5,250,207,57,74,15,173,183,181,108,203,124,84,184,252,44,121,126,210,153,222,12,132,190,49,191,48,97,205,202,234,4,123,15,252,118,227,241,243,139,109,135,78,111,198,158,30,61,189,151,222,151,213,123,224,122,243,177,214,237,69,251,175,100,189,168,57,223,254,116,224,196,193,123,9,133,91,192,149,205,2,255,215,102,111,180,61,88,217,92,126,200,153,208,94,87,88,145,146,150,96,127,122,242,113,101,233,241,188,221,93,135,155,174,245,180,157,184,159,82,155,118,191,169,204,217,88,191,255,202,73,18,31,139,7,173,94,211,84,186,249,132,163,189,251,216,253,4,123,194,43,226,63,216,146,251,78,92,175,186,159,230,184,80,119,40,27,35,28,155,169,90,111,113,220,186,150,132,156,95,185,97,167,173,187,101,197,246,220,21,27,28,183,193,47,238,1,179,45,201,126,181,62,239,98,101,233,133,93,189,41,13,142,52,240,66,18,237,109,205,173,3,107,157,217,87,238,212,103,196,39,57,239,86,236,195,229,130,149,184,122,144,46,
+92,83,2,93,184,135,201,212,65,220,151,74,29,196,125,149,212,65,124,152,78,29,68,95,254,203,78,240,109,247,166,28,58,246,130,134,53,238,188,166,97,141,139,27,89,88,163,156,186,39,13,185,52,172,145,189,156,134,53,150,237,166,97,141,13,7,104,88,227,113,61,11,107,220,161,97,141,77,239,104,88,227,85,28,13,107,236,189,77,221,212,17,251,47,68,142,37,216,187,111,111,207,40,106,206,170,203,57,244,252,234,221,147,207,79,230,237,184,221,124,178,102,32,254,224,230,91,15,159,14,20,36,59,246,98,144,171,248,110,243,246,227,167,6,154,154,143,118,60,93,219,117,110,223,150,142,131,87,59,138,234,54,213,222,175,173,123,253,246,90,11,80,74,41,152,104,13,207,109,123,51,207,173,175,63,153,92,124,49,37,158,4,72,78,84,217,226,122,18,235,31,183,173,62,11,82,229,170,179,160,181,176,52,59,179,102,253,173,218,182,93,105,27,219,107,237,93,153,59,251,183,149,119,229,53,86,151,94,239,190,124,179,249,238,77,66,118,207,94,52,228,158,223,212,152,149,
+217,178,236,197,182,221,239,206,61,238,125,186,242,96,238,179,167,111,187,14,22,222,62,219,210,213,190,247,76,199,234,87,89,205,165,79,129,150,144,148,6,242,158,218,171,218,55,117,100,93,221,135,148,212,249,182,190,250,89,69,158,179,224,242,150,212,146,182,142,142,220,67,171,91,175,102,28,28,88,223,115,106,251,187,142,234,170,243,143,48,172,217,190,231,86,114,129,51,181,170,251,116,250,235,248,248,119,123,108,253,253,153,125,143,50,236,165,171,157,3,40,126,175,229,216,47,117,239,63,104,27,120,253,160,114,251,234,119,207,211,227,55,30,58,149,236,40,95,253,200,185,33,245,73,166,19,144,253,14,240,115,181,178,186,186,171,173,239,249,218,171,169,91,159,108,117,244,157,109,183,213,23,21,44,171,191,81,145,114,38,25,233,100,219,6,71,171,243,89,214,253,59,105,43,174,157,76,119,52,237,237,172,120,94,93,218,245,204,81,88,116,23,157,168,35,247,146,46,217,187,91,118,181,212,58,46,228,156,234,68,137,182,57,125,235,46,231,227,150,244,146,246,164,172,178,235,
+87,239,60,107,104,47,91,14,116,216,150,138,12,247,160,59,169,49,39,165,234,220,192,99,71,233,134,198,242,151,87,239,166,111,115,228,61,59,94,124,253,180,253,104,125,227,201,154,215,203,46,118,110,217,214,217,179,73,142,95,52,158,61,230,184,98,207,218,156,252,250,194,227,253,3,113,43,104,220,231,176,115,71,205,192,249,173,133,111,114,211,214,108,57,122,235,205,193,67,203,136,99,190,45,243,88,90,211,213,125,73,71,19,75,75,90,30,109,185,181,162,248,50,122,179,199,139,150,221,61,59,182,184,222,234,139,9,71,174,45,223,177,230,144,205,190,105,217,134,135,135,150,93,135,47,240,121,21,126,129,207,79,224,75,101,124,99,111,97,81,86,126,11,152,22,235,136,85,156,119,232,72,79,93,195,149,130,206,246,115,123,31,109,200,108,172,94,94,213,218,184,173,175,185,33,255,254,138,226,139,23,118,197,85,52,161,121,2,246,105,239,50,231,74,112,245,210,79,231,231,157,70,11,102,101,110,78,226,218,100,199,214,251,137,222,223,203,205,207,75,118,84,59,159,54,111,
+104,238,105,191,82,87,80,182,111,123,65,210,155,211,169,231,15,86,160,89,189,188,242,225,214,91,85,235,79,30,42,46,117,190,125,187,33,241,229,173,29,41,171,118,64,7,41,185,96,73,150,236,175,109,60,214,92,109,235,116,84,63,201,184,113,50,25,76,242,231,149,241,182,202,234,190,154,186,206,242,142,228,198,230,251,117,45,205,15,170,250,30,58,91,243,79,156,237,46,204,220,186,122,215,179,221,155,246,55,189,179,183,159,63,136,6,254,185,234,229,93,182,167,69,123,243,107,146,43,95,164,174,75,238,190,92,90,210,184,51,126,239,201,218,45,151,175,175,187,211,245,122,27,2,242,214,121,47,165,117,255,137,179,207,90,147,223,22,149,28,173,235,44,89,159,190,181,237,109,106,105,237,49,220,87,56,117,171,179,224,236,229,83,189,224,82,108,0,159,34,190,161,56,175,172,227,118,135,163,97,121,119,69,239,110,91,247,145,182,158,21,53,251,129,208,47,166,151,247,37,59,142,223,169,217,17,87,96,235,47,185,82,122,237,74,82,15,120,232,37,206,103,121,199,50,170,
+114,234,170,175,21,175,221,179,219,214,159,112,195,158,14,152,217,105,219,215,112,188,35,235,68,231,222,83,231,11,91,109,183,94,157,139,75,167,29,60,216,145,96,111,116,172,104,63,125,186,244,84,154,163,52,171,208,118,224,92,117,239,187,103,199,58,55,55,238,168,168,78,106,36,238,73,247,227,215,207,139,154,107,86,119,157,217,127,63,165,33,62,254,113,214,133,140,51,235,111,150,189,56,249,242,213,150,29,100,29,78,247,22,116,188,131,105,148,118,237,200,108,181,93,43,127,251,162,35,97,243,173,206,171,53,246,202,245,237,25,77,119,227,115,47,172,177,239,111,72,197,117,172,112,30,125,242,164,237,65,81,215,221,189,37,245,235,200,130,118,239,3,108,95,120,118,120,227,94,231,89,92,176,214,229,155,26,158,87,221,75,141,127,116,161,2,93,160,141,15,159,52,228,55,228,230,236,36,84,144,88,92,75,168,32,229,92,26,161,130,101,206,44,66,5,48,85,66,45,185,57,47,18,215,246,46,219,126,217,195,63,115,82,255,44,55,109,89,242,202,213,41,107,151,229,94,
+120,189,117,47,124,94,129,95,224,115,59,126,89,93,189,107,93,92,91,127,73,226,173,162,108,226,213,188,120,244,106,243,166,173,165,205,135,247,36,221,233,57,145,250,250,66,82,103,65,238,233,206,182,203,253,217,123,14,18,7,111,101,53,117,220,114,143,83,199,173,188,130,58,120,91,15,81,7,15,100,52,113,240,188,191,151,208,112,35,183,255,200,133,67,43,146,86,181,212,102,62,170,234,121,184,114,109,46,121,82,151,240,248,121,209,238,129,196,11,15,14,191,170,122,59,208,187,167,172,54,19,251,73,171,94,94,84,81,157,113,227,237,233,157,136,128,211,165,199,139,187,123,59,7,110,92,24,232,185,86,4,26,124,217,126,231,173,149,157,183,155,94,174,60,49,208,182,105,111,229,249,162,156,155,246,148,151,37,171,9,150,94,159,200,177,165,173,62,250,188,236,136,35,191,233,198,198,29,165,5,27,107,106,55,56,114,16,174,190,222,220,190,221,119,183,175,205,177,21,214,31,125,117,227,218,131,119,104,111,62,201,105,168,207,40,236,121,93,189,105,195,129,53,133,197,182,
+226,154,166,251,235,236,87,15,189,234,221,99,107,128,149,125,105,135,142,59,158,223,40,77,233,110,106,200,177,119,63,41,216,226,40,219,122,108,219,209,87,142,199,185,91,83,139,155,78,172,5,239,99,111,195,177,231,231,115,118,220,60,85,18,119,183,96,187,243,109,170,179,103,229,141,91,107,237,93,109,47,171,90,242,175,148,39,216,235,176,159,205,199,108,143,215,198,111,42,122,238,60,180,183,253,200,137,199,185,207,47,228,110,110,71,183,229,241,19,103,205,192,155,61,183,47,15,92,201,204,90,223,127,174,123,89,252,177,178,146,194,156,221,107,108,87,119,192,243,228,26,199,139,59,251,187,110,38,52,216,211,27,83,28,229,125,77,169,71,118,218,94,167,93,58,252,226,86,231,131,243,171,138,83,206,188,72,127,13,43,17,255,232,40,89,135,188,226,245,232,102,167,84,92,181,219,96,169,86,182,222,104,58,248,124,89,237,149,164,7,72,56,103,154,91,59,142,85,166,53,182,190,60,115,253,204,238,229,93,57,30,122,62,158,154,125,233,217,212,236,91,121,205,73,3,70,
+47,219,11,111,62,220,83,144,116,168,134,6,140,10,150,209,128,145,253,34,9,24,21,36,60,167,1,163,145,238,187,201,241,109,231,110,26,48,122,147,112,172,220,121,97,231,165,204,213,119,15,60,185,118,179,246,232,131,23,247,218,138,118,183,109,223,123,101,219,234,45,69,153,29,57,239,234,239,65,95,23,233,54,233,218,251,29,205,171,27,203,143,151,21,222,60,145,158,57,208,176,47,163,121,91,193,187,55,73,241,27,170,219,156,39,251,215,56,138,235,107,243,112,232,218,205,142,134,220,226,222,212,244,26,231,219,218,188,115,247,146,178,174,62,221,91,152,236,160,250,230,134,211,241,182,245,202,149,119,157,183,158,157,236,61,120,226,98,123,253,64,79,121,125,127,249,153,184,3,167,42,239,182,116,237,190,120,250,89,122,198,221,166,182,194,170,146,230,246,173,77,7,218,247,63,40,172,79,125,149,96,79,68,163,192,246,162,239,212,221,237,205,229,192,109,251,159,159,60,89,98,111,189,122,255,104,79,115,125,121,109,94,125,122,130,61,115,119,230,218,86,251,142,85,229,13,
+113,113,109,185,107,142,0,6,146,78,109,106,111,204,219,156,116,202,209,83,254,180,212,126,180,36,227,230,64,203,129,99,109,187,214,223,236,122,190,41,175,189,240,96,90,251,139,131,23,94,55,238,220,187,59,99,255,165,170,186,178,59,109,119,115,186,110,61,115,116,84,59,222,57,211,247,58,107,210,50,29,237,39,235,210,91,146,42,170,55,213,166,21,95,219,155,250,236,122,203,245,140,155,21,37,205,21,41,71,10,18,31,231,118,213,111,47,91,245,96,141,189,57,245,100,214,9,199,149,195,61,171,215,31,236,202,218,234,184,210,241,242,229,173,28,91,114,249,134,226,181,247,86,103,219,26,58,74,26,202,114,143,215,220,127,209,184,203,110,187,87,186,205,209,55,144,242,104,131,163,180,185,116,223,218,157,182,135,79,186,211,155,155,28,9,43,114,10,108,113,213,153,43,202,86,189,58,118,174,59,241,101,217,134,18,199,187,87,21,21,111,243,79,158,218,220,85,124,230,204,179,134,231,157,123,111,109,41,57,118,234,100,93,167,243,225,149,229,43,28,206,245,113,142,202,148,
+187,183,7,238,229,223,75,178,151,13,36,246,221,121,181,174,222,209,88,120,203,81,187,227,238,155,29,182,210,123,241,117,183,175,86,108,169,62,114,121,125,98,69,74,230,147,138,244,227,85,125,89,141,91,30,156,239,189,184,198,222,217,1,114,180,190,229,108,67,70,229,129,196,254,4,251,192,246,196,202,148,7,235,138,223,28,114,16,3,178,164,144,152,143,247,82,8,61,61,57,208,239,108,89,139,113,176,51,141,239,232,134,219,50,123,60,73,196,168,89,182,236,244,174,254,172,250,21,245,91,47,177,220,13,246,103,97,132,64,243,59,56,193,168,227,163,36,171,129,183,8,18,39,197,74,22,33,50,100,162,94,136,18,140,122,193,104,225,68,163,69,48,27,121,131,196,153,194,184,112,51,31,21,33,234,120,3,103,178,90,162,172,150,64,238,47,17,130,81,88,42,152,185,88,147,149,51,10,130,158,179,152,184,40,30,90,113,146,41,82,176,68,136,198,112,232,131,227,185,104,209,168,55,69,7,184,94,228,73,190,9,103,10,253,155,160,179,112,97,38,51,39,66,135,8,152,
+100,225,141,122,222,172,231,230,145,142,176,27,147,30,199,183,192,195,25,22,179,129,129,110,225,151,0,204,180,159,144,223,114,36,207,70,0,112,57,94,226,162,5,131,33,144,155,109,132,54,188,133,211,241,146,64,90,91,97,86,102,67,44,66,21,41,232,34,120,163,40,69,66,67,73,82,58,226,162,97,134,17,156,8,223,13,102,129,215,199,2,248,162,69,228,13,226,63,0,104,4,147,206,29,49,99,34,125,154,5,41,10,166,32,46,5,148,154,140,22,179,201,16,192,45,49,154,162,161,135,80,120,151,188,163,179,154,205,136,78,157,65,140,138,130,209,3,176,149,201,96,197,44,35,78,176,232,8,168,60,39,137,145,162,129,55,115,145,188,209,200,144,170,227,141,156,14,0,177,8,248,21,70,143,54,170,17,39,33,194,245,228,59,194,51,27,19,115,164,0,242,6,12,35,113,126,75,225,37,0,26,16,195,135,137,6,152,166,85,98,243,144,4,51,153,22,79,128,208,46,111,148,96,38,63,75,254,28,188,137,107,42,152,161,13,224,202,76,40,66,33,128,255,102,32,2,
+133,152,176,107,25,139,208,228,239,86,193,28,43,119,42,133,76,52,11,72,100,122,232,2,187,183,136,2,161,169,165,188,89,52,89,37,25,171,122,97,169,168,195,25,24,196,37,2,23,37,198,8,6,192,202,63,4,53,194,2,56,201,26,21,101,50,99,103,58,147,1,103,103,210,11,128,117,126,41,15,232,11,53,8,48,63,35,160,6,17,171,165,251,233,6,160,37,107,120,4,89,148,65,105,155,227,205,2,183,20,103,224,193,20,1,164,53,153,38,37,68,32,22,189,32,137,225,70,0,8,208,192,147,69,137,16,245,2,0,38,89,100,202,157,187,32,100,34,82,138,24,38,234,224,125,11,192,10,36,98,68,132,8,18,18,7,15,228,9,15,17,69,48,57,50,15,2,98,24,175,67,42,11,7,150,128,5,148,228,254,120,157,197,10,224,90,120,115,184,32,35,14,87,139,18,6,101,37,96,57,163,132,128,144,54,72,212,81,128,126,158,18,56,97,13,58,13,62,138,15,21,13,34,89,20,156,56,50,111,52,62,54,0,69,90,40,91,235,76,200,232,100,70,97,102,1,
+86,215,104,49,196,82,114,82,33,143,81,37,206,139,183,88,204,98,168,21,4,11,144,183,5,71,252,187,21,58,131,217,73,146,136,179,243,195,183,64,58,232,128,28,128,213,97,161,97,70,132,236,56,32,191,8,24,77,103,138,140,52,25,253,41,168,34,244,235,66,136,129,215,45,145,8,160,28,175,95,202,27,117,72,13,170,121,0,57,168,22,59,150,78,75,161,27,209,72,112,200,144,199,232,29,164,2,93,236,64,238,107,36,251,8,88,23,53,80,202,178,51,161,197,186,147,40,245,83,57,37,49,1,194,27,12,166,104,194,193,128,58,33,198,34,224,84,225,85,13,170,67,1,127,22,248,242,15,28,26,222,15,153,104,0,105,10,148,76,193,224,20,114,209,1,129,7,80,164,234,128,61,36,124,31,161,209,112,13,32,156,252,104,228,137,48,98,125,144,30,3,185,185,97,208,137,213,44,65,55,17,2,191,148,44,28,82,133,100,5,96,53,64,69,18,177,26,109,22,9,66,20,82,68,16,40,67,232,197,48,128,201,106,176,48,230,250,147,90,171,184,68,135,10,219,48,
+79,55,150,65,153,17,10,244,41,46,5,234,212,83,97,42,161,38,1,26,210,129,152,8,55,153,1,150,105,26,238,21,39,125,22,244,229,92,248,170,72,100,42,186,16,45,32,121,195,196,112,171,89,17,102,30,216,113,235,131,72,39,156,160,22,133,46,225,228,246,62,136,100,62,28,223,39,18,199,231,83,11,44,53,40,176,88,131,71,7,76,55,24,72,31,110,234,0,185,91,158,137,158,138,110,152,67,152,36,88,220,58,145,31,134,242,18,80,5,147,237,32,147,129,73,97,201,65,220,67,247,72,250,81,38,67,108,56,138,111,31,237,205,188,132,82,220,213,210,199,123,56,29,183,71,46,2,252,113,194,39,178,162,9,86,137,182,48,171,81,71,8,192,103,67,89,204,45,21,205,68,132,185,52,42,229,109,159,13,221,84,120,84,68,172,164,22,217,108,13,135,238,135,190,8,48,123,7,89,166,231,217,163,167,179,41,172,15,77,190,45,249,235,23,226,63,13,211,107,241,75,176,223,183,51,103,44,254,113,194,127,78,225,34,244,186,96,127,150,103,251,23,209,56,101,178,
+11,163,211,84,38,136,167,16,2,198,97,227,35,136,216,22,132,190,140,10,36,58,164,72,28,199,31,85,130,40,81,201,15,120,148,16,245,244,117,73,54,178,20,235,141,48,36,181,217,128,156,160,231,72,33,210,100,142,13,153,24,9,26,4,57,90,180,192,39,42,231,77,84,150,50,211,32,144,77,2,166,248,189,201,34,76,11,6,177,135,99,74,130,65,111,138,4,219,15,23,129,7,49,66,84,138,81,178,152,173,58,139,199,172,136,124,134,86,209,124,108,32,183,128,105,96,0,71,49,76,127,8,249,125,200,239,65,9,196,2,25,163,170,149,168,36,147,149,181,66,141,46,37,31,45,162,57,202,129,80,18,204,76,208,130,133,6,227,131,34,85,244,150,223,60,156,5,66,18,64,141,41,250,241,207,162,16,141,159,0,135,243,5,64,69,168,96,38,58,41,0,69,155,94,52,67,91,208,133,96,79,234,13,46,250,146,177,47,81,171,23,21,16,192,111,230,151,10,196,154,229,185,72,144,161,160,93,168,122,166,19,146,193,229,64,115,73,194,18,65,32,226,65,23,97,50,
+11,20,217,186,8,1,245,30,85,50,130,81,178,154,5,170,29,17,131,110,171,78,140,11,88,3,35,18,15,192,135,250,199,165,148,9,64,84,222,193,51,212,87,58,98,159,17,33,36,0,94,76,177,248,77,114,45,25,85,139,60,106,229,40,3,88,218,176,166,196,186,49,91,209,176,68,155,50,218,100,94,130,0,35,174,61,177,32,9,2,247,157,168,51,155,36,83,152,69,33,61,189,73,103,141,4,24,9,75,17,234,249,20,169,103,6,99,138,137,63,17,180,10,42,66,215,118,60,52,195,177,79,28,234,177,144,128,111,102,132,4,252,53,140,172,113,200,132,144,0,66,131,248,202,159,137,52,13,249,35,126,158,15,159,67,254,35,228,183,26,94,197,127,177,11,202,176,250,232,224,0,238,27,198,189,225,58,248,194,58,93,28,50,129,252,22,19,102,65,49,10,15,200,16,139,105,255,127,196,174,161,103,218,14,21,128,194,246,127,157,52,105,48,166,215,251,102,250,191,134,76,84,176,201,128,4,254,198,133,224,185,112,16,239,70,197,12,119,73,132,111,188,11,4,85,87,
+131,201,4,153,241,189,139,133,95,185,12,248,200,248,239,129,241,255,58,28,134,7,166,154,248,147,204,229,140,146,53,47,132,235,92,47,48,154,86,203,1,229,61,153,249,38,254,244,215,175,23,170,188,6,186,198,154,87,9,15,78,252,201,205,22,27,141,84,25,63,81,242,81,98,124,148,24,31,37,198,207,42,49,70,41,6,100,78,30,185,93,177,212,36,234,129,167,137,151,17,236,39,179,244,108,21,15,43,43,140,65,50,28,68,82,7,32,9,31,71,153,1,115,176,254,176,44,4,195,106,3,201,147,167,44,140,121,141,38,115,36,89,102,163,201,162,94,51,194,220,178,51,132,47,130,115,101,64,18,52,194,187,97,102,96,68,240,189,68,36,74,226,197,11,50,113,201,145,95,4,193,51,44,193,236,55,244,65,168,247,70,29,28,20,121,236,187,178,210,254,232,73,91,17,180,192,65,48,143,56,10,241,27,28,193,1,248,109,158,9,80,232,142,233,33,100,107,0,71,90,209,95,168,19,30,188,56,228,79,139,201,175,126,63,194,143,65,240,14,253,235,175,8,98,121,2,
+190,196,49,145,82,46,169,50,162,101,36,113,21,37,186,45,17,249,236,53,116,32,247,72,128,198,245,112,65,64,163,208,114,27,201,194,235,150,16,206,11,28,6,15,120,117,115,57,63,144,138,10,219,154,204,122,209,136,91,8,254,154,254,24,250,38,254,196,0,113,131,208,207,71,123,151,7,254,255,14,47,74,67,169,228,179,47,255,235,63,253,130,2,131,2,39,127,246,153,63,247,227,255,10,10,154,24,20,196,133,154,76,134,96,246,133,28,186,229,22,43,95,131,184,121,60,72,39,139,240,157,73,47,104,95,242,243,87,94,163,10,39,152,45,245,12,89,170,10,36,66,169,142,238,187,133,33,36,88,52,210,123,200,196,80,30,195,164,176,232,243,191,249,138,125,11,228,190,51,25,77,186,8,51,70,48,89,216,155,200,89,11,137,246,19,113,170,122,91,193,235,39,160,86,44,86,179,17,132,130,193,42,0,110,127,252,4,154,192,39,46,228,79,242,208,86,100,77,183,193,89,164,28,3,85,66,36,137,98,67,195,48,32,70,77,75,18,113,167,58,31,35,178,84,95,33,
+28,172,61,25,84,10,28,43,218,103,75,56,249,145,96,124,120,8,143,84,80,58,76,132,185,26,184,225,3,84,69,172,4,226,143,132,212,233,220,85,82,117,208,185,47,66,209,179,0,152,110,17,157,24,126,244,141,138,111,4,203,60,88,146,121,4,241,195,196,8,157,144,196,246,71,162,160,57,217,36,161,74,215,45,170,38,147,150,31,217,81,145,55,134,252,3,20,101,128,8,149,120,12,163,163,162,181,168,186,243,141,66,2,45,8,16,61,232,110,148,60,17,130,24,30,97,113,19,20,216,209,123,194,214,119,223,141,24,85,110,177,66,101,150,104,52,70,138,6,131,72,165,235,32,147,158,171,106,233,49,117,47,189,140,243,180,9,129,204,19,204,179,141,186,136,17,78,158,109,83,202,27,142,222,228,249,32,243,254,222,74,140,88,104,197,164,3,152,152,226,63,80,66,160,9,129,56,88,138,194,88,71,191,98,120,7,55,83,165,191,91,65,154,97,104,95,23,241,30,208,177,32,66,144,113,50,42,166,33,75,239,73,175,8,174,193,170,215,68,151,35,121,115,184,104,148,
+92,190,79,164,192,27,225,141,48,171,129,89,70,52,8,111,36,218,153,216,182,196,42,82,130,162,196,187,2,100,240,196,163,193,125,113,32,19,248,132,54,24,245,14,140,234,29,189,40,30,148,155,138,161,137,139,34,179,49,152,49,110,179,135,149,245,57,49,179,8,144,67,151,126,0,171,193,159,245,236,154,34,190,195,102,7,150,152,100,21,45,108,247,148,205,135,236,84,131,224,5,208,229,145,85,178,74,25,216,203,68,9,20,126,174,153,0,115,24,173,46,46,4,164,9,70,24,6,55,237,24,0,254,163,22,55,238,172,29,41,232,69,107,164,60,58,48,38,91,27,255,225,81,33,49,244,24,25,146,207,67,74,163,185,212,204,25,13,25,50,75,136,205,196,98,2,103,41,204,2,13,204,70,202,113,90,212,186,182,166,121,106,142,15,210,200,23,82,216,6,62,65,142,255,48,105,154,144,192,56,208,51,231,135,126,29,217,45,245,164,99,0,230,43,48,127,173,161,196,183,166,27,76,90,12,251,249,7,211,105,243,24,95,32,83,85,153,142,44,98,160,236,46,99,20,194,
+36,137,84,226,201,219,210,161,68,8,10,48,65,226,119,178,220,13,142,165,114,80,72,5,125,184,48,152,30,248,86,17,127,26,225,7,198,146,20,101,224,117,196,186,26,229,242,48,56,134,162,3,196,125,32,55,102,219,119,36,210,211,139,217,235,30,141,119,173,4,9,23,96,239,42,203,23,76,11,197,242,85,7,145,140,66,184,102,51,13,99,100,38,139,68,214,154,121,162,129,242,174,22,201,23,192,80,11,113,245,61,199,113,9,43,153,204,177,5,179,121,84,109,20,255,87,5,212,136,12,108,81,114,27,215,155,45,45,74,238,253,143,101,181,16,41,31,224,90,81,34,250,224,87,203,213,212,231,90,169,65,27,7,7,103,30,157,211,120,45,25,230,238,104,182,88,71,50,123,109,203,177,205,107,122,40,201,233,24,243,188,254,102,10,229,34,96,237,67,5,193,136,153,114,216,169,87,117,20,9,142,168,155,66,26,38,2,188,14,49,118,12,124,197,235,150,140,110,250,218,37,85,210,135,244,38,43,70,16,39,134,90,195,194,4,152,98,56,181,251,100,147,143,70,72,221,
+223,97,234,78,19,193,99,25,85,18,141,204,3,210,116,38,43,34,44,202,108,210,91,73,138,162,63,81,49,60,120,130,128,97,140,8,147,92,53,12,63,17,165,101,16,117,75,104,239,60,229,248,232,8,147,203,238,192,128,160,41,18,148,42,137,74,135,73,58,51,32,54,144,155,171,117,52,17,92,204,123,100,177,3,76,240,81,246,30,180,78,40,138,26,154,177,232,79,24,157,218,147,156,178,132,126,20,8,179,64,39,234,173,199,0,175,104,240,58,165,193,12,76,95,66,67,141,115,15,209,33,7,149,77,48,105,37,176,15,67,19,248,198,78,102,114,106,205,120,10,16,214,231,40,4,136,186,229,24,35,63,130,133,255,90,52,12,55,222,230,145,12,51,188,153,202,91,7,223,177,196,215,161,167,140,51,14,246,214,197,44,99,4,77,47,212,244,229,10,82,126,231,45,53,76,126,56,83,36,180,227,30,172,162,59,52,0,59,152,177,22,65,23,97,132,166,225,152,125,135,220,133,25,124,86,204,132,35,217,151,44,155,206,132,126,12,178,177,50,146,146,132,139,241,97,154,
+17,38,135,229,65,63,107,164,135,214,206,21,205,30,209,64,228,63,31,217,118,94,194,148,148,141,93,177,51,14,134,21,84,254,2,134,204,104,78,167,68,115,24,89,250,52,181,144,99,129,221,153,236,67,174,166,160,240,22,220,87,10,228,102,145,20,67,217,57,242,102,187,208,204,193,80,204,255,228,168,175,109,145,87,68,129,121,158,54,246,169,133,219,100,208,115,147,62,15,153,136,173,39,127,6,31,88,120,207,3,56,112,178,0,14,189,188,119,5,47,128,91,162,179,48,136,37,131,9,119,170,216,22,9,143,178,129,133,92,131,3,185,25,132,20,228,25,0,33,97,162,35,58,67,164,149,60,9,65,36,36,108,149,112,111,17,70,97,94,158,153,141,235,167,236,75,10,22,255,97,160,6,169,214,136,131,9,49,174,244,116,6,147,59,134,92,161,101,23,118,190,21,103,80,186,50,115,11,129,33,102,104,209,18,128,174,52,219,76,28,230,34,177,109,8,222,24,43,191,70,89,68,238,148,76,151,37,135,42,155,29,177,81,114,132,0,243,148,233,32,168,197,49,27,25,116,
+150,5,214,14,119,141,169,46,50,139,18,77,150,228,62,163,11,58,21,102,37,98,106,110,104,152,40,24,244,52,30,67,227,95,32,191,195,81,99,209,68,218,80,96,126,182,146,68,169,25,129,11,220,24,123,14,176,36,250,104,170,36,115,154,239,236,37,159,213,20,25,105,53,138,58,98,82,179,73,90,53,185,134,234,109,104,117,44,157,104,57,179,192,146,192,93,157,131,109,77,22,32,152,142,0,235,255,141,123,138,186,146,182,136,18,19,221,80,150,178,204,198,55,25,67,38,194,15,33,19,195,168,94,82,124,78,246,220,35,63,87,78,126,158,71,45,97,130,38,76,40,13,153,136,217,184,4,56,121,3,71,222,248,86,229,155,178,143,130,193,32,70,73,168,210,105,14,0,197,253,223,97,166,164,61,107,72,164,18,117,41,64,242,192,162,186,114,247,181,96,202,46,177,171,11,131,122,85,92,62,4,250,196,12,102,154,221,58,8,212,168,171,121,99,184,65,157,42,27,224,242,87,0,118,204,142,214,19,238,36,113,50,19,77,156,143,129,199,22,65,11,1,181,61,20,253,
+79,101,180,224,133,178,221,244,2,210,142,98,1,90,162,77,152,180,64,4,6,37,27,247,173,35,141,242,240,33,169,129,100,166,91,45,38,128,17,84,129,44,139,166,113,214,40,220,204,213,230,178,210,225,5,24,218,26,165,90,123,185,21,75,179,32,123,64,60,168,9,139,89,140,65,216,62,143,129,255,146,237,32,248,5,55,246,41,127,1,187,34,7,132,162,75,73,149,21,188,202,193,138,137,40,51,121,118,142,200,40,137,242,169,15,69,20,184,120,15,23,128,136,101,154,99,129,251,47,28,221,128,137,50,88,37,194,244,68,197,49,64,41,238,229,45,107,34,46,105,135,242,12,4,35,221,49,87,77,14,39,101,0,253,10,203,20,9,154,85,71,158,133,10,17,60,238,189,146,48,139,74,42,50,33,79,90,74,238,210,19,48,253,3,209,120,10,146,233,217,33,147,121,137,138,182,229,109,42,25,36,94,34,18,81,195,109,220,39,68,252,7,114,223,51,70,0,100,211,227,25,202,65,29,131,86,12,241,100,111,214,221,16,83,204,47,201,66,150,223,101,93,41,6,154,218,
+48,211,216,100,72,52,76,99,42,207,193,163,215,90,150,242,36,80,12,170,142,160,224,94,244,112,55,18,0,107,138,109,201,187,19,42,233,56,0,49,235,178,176,173,42,28,147,231,35,159,52,238,253,123,157,244,2,193,226,117,222,195,71,220,20,16,10,202,207,10,186,22,146,232,174,247,233,161,17,135,250,53,44,76,187,239,206,71,185,99,7,17,139,162,198,163,31,55,12,41,47,14,138,42,183,252,9,98,82,255,16,165,135,118,11,168,161,66,179,210,229,60,9,207,231,174,252,20,250,179,164,16,165,60,36,80,132,154,63,213,103,8,153,152,244,131,158,23,204,177,128,22,139,13,38,179,88,240,23,52,221,216,231,175,208,158,11,38,71,182,252,125,217,215,30,135,43,70,66,8,170,64,62,183,120,198,244,57,115,190,154,62,227,191,52,92,160,215,127,205,235,6,167,4,234,153,120,144,194,162,57,115,191,249,122,238,247,11,23,113,236,131,235,149,144,9,42,122,1,164,225,201,52,229,105,128,55,64,125,141,177,112,214,95,23,126,55,107,225,252,217,51,22,113,174,207,
+234,145,92,221,145,141,12,61,136,35,253,34,142,252,241,74,190,150,216,40,193,11,44,139,230,204,155,62,127,250,119,48,25,242,215,107,83,86,212,220,157,248,53,84,77,166,58,241,39,45,165,163,214,117,255,145,10,14,245,175,30,162,99,124,25,127,129,69,255,181,122,29,252,52,120,195,71,139,56,205,11,234,169,107,86,80,153,249,2,212,133,40,19,241,49,106,154,80,129,74,112,22,72,81,14,181,146,231,126,12,130,0,50,76,200,180,105,11,22,206,68,186,241,15,244,134,65,163,16,173,109,63,76,108,12,61,27,186,149,234,142,13,127,111,251,199,178,50,211,0,50,136,176,119,79,105,50,171,36,3,185,13,96,244,83,34,251,196,154,45,98,31,83,210,188,226,125,90,68,122,153,65,196,199,248,220,95,28,233,204,193,17,212,197,160,112,6,64,254,130,125,250,129,239,164,139,101,191,124,75,250,198,128,249,160,221,147,163,213,156,220,21,52,197,172,51,45,17,161,83,36,227,146,192,62,10,155,64,28,146,44,102,196,14,130,193,209,98,239,67,71,158,155,194,132,145,
+17,21,179,141,97,38,154,248,29,26,11,166,121,128,204,94,211,56,249,233,98,186,101,41,127,13,246,195,23,89,114,97,4,111,198,93,98,202,242,244,55,194,223,152,92,200,112,237,167,36,20,202,8,38,176,138,184,85,30,201,171,118,50,49,235,86,103,22,67,81,43,210,116,109,242,34,205,250,37,227,184,37,246,177,193,39,254,132,159,192,104,192,13,89,234,156,163,167,227,167,236,86,206,248,118,250,252,5,179,22,134,44,142,137,137,1,19,218,26,201,78,115,250,123,147,75,178,168,51,11,224,13,128,213,174,1,20,62,13,194,35,50,134,56,154,201,109,37,9,207,202,148,34,177,67,29,241,20,100,161,225,74,58,38,163,202,94,189,106,242,236,220,243,72,150,113,136,197,123,111,11,229,85,202,127,48,216,252,122,196,216,252,203,48,208,249,151,145,225,243,7,163,72,78,28,123,224,149,248,155,191,24,46,101,176,198,142,83,217,186,157,49,134,115,193,220,2,37,249,130,109,131,40,91,32,52,164,74,3,102,152,128,77,34,64,145,166,165,52,141,195,229,82,202,27,193,
+44,87,136,197,124,34,69,37,94,173,192,66,17,15,134,159,34,218,101,144,162,204,38,28,86,62,53,47,98,60,139,151,176,80,131,103,255,154,36,9,139,41,156,6,241,137,203,236,107,246,208,223,18,33,202,130,150,20,207,82,151,217,241,125,213,217,143,64,110,6,171,34,160,228,175,71,89,37,80,72,28,90,79,44,205,230,19,87,223,48,16,221,40,98,198,153,110,73,0,103,34,176,184,162,106,145,188,81,140,34,165,81,52,186,198,98,138,34,235,142,141,2,185,233,52,201,197,59,38,149,225,224,187,16,22,134,2,33,58,66,52,184,80,167,51,153,49,54,111,50,234,37,25,24,10,25,30,170,165,227,40,0,194,88,22,22,178,128,254,141,114,2,151,231,200,170,13,64,38,228,189,39,148,104,115,79,216,134,132,11,102,212,234,154,242,48,24,230,113,197,233,212,201,72,126,24,137,35,193,117,44,231,192,211,210,2,24,193,180,152,13,96,221,146,66,46,193,1,26,44,134,252,70,47,154,45,177,33,191,161,61,144,131,41,120,142,64,98,198,179,89,32,241,67,90,171,
+65,174,31,227,239,203,196,25,142,225,255,21,162,205,139,49,51,211,26,101,96,145,91,53,128,174,117,160,25,57,174,184,149,130,239,79,220,82,234,89,56,138,174,52,240,61,201,89,16,36,99,200,239,44,168,130,141,225,90,66,242,209,19,216,84,4,253,200,124,36,23,92,98,84,76,33,162,33,120,22,97,15,179,154,9,209,186,72,149,68,115,41,37,203,21,41,200,194,144,243,15,184,59,3,160,205,192,60,127,20,17,240,227,172,24,204,6,20,200,79,99,193,238,44,163,222,27,110,69,73,7,54,23,6,163,125,97,142,206,138,90,32,238,20,63,6,120,180,73,121,110,46,30,205,241,211,166,247,105,253,91,79,15,111,134,102,45,6,155,139,23,222,197,96,40,22,107,97,123,50,204,55,146,87,148,72,63,15,54,150,34,196,48,182,158,176,78,176,96,52,253,86,171,240,48,114,100,116,79,208,197,120,181,158,21,109,113,239,213,15,247,169,2,99,22,255,199,226,32,18,65,50,163,69,77,118,182,241,215,63,178,95,81,90,176,31,99,149,87,177,154,140,242,163,252,166,
+53,106,76,76,233,107,153,134,244,81,166,112,49,131,199,81,124,53,139,253,192,150,246,19,206,47,38,128,139,245,247,190,190,49,131,175,175,43,21,219,199,82,123,91,104,237,50,187,197,28,98,7,31,80,201,118,244,62,156,23,98,25,41,169,248,12,83,19,17,53,154,232,156,124,48,108,17,135,255,42,47,132,252,86,77,22,230,241,38,11,31,75,239,157,90,136,245,169,53,25,52,47,138,178,232,86,101,223,41,141,221,13,38,101,3,66,217,231,194,117,48,7,107,23,218,12,11,237,122,129,156,22,99,99,12,110,142,249,145,66,94,24,247,103,176,121,81,103,116,174,254,190,173,108,117,154,9,221,6,140,246,102,247,25,113,15,83,136,140,178,196,186,229,222,120,180,65,181,139,239,113,126,62,18,130,200,97,104,222,24,75,107,210,241,228,141,8,214,114,169,72,82,134,221,19,196,199,149,56,223,155,20,27,81,51,221,40,135,211,141,187,212,252,160,216,131,58,105,161,244,220,179,108,44,203,98,109,248,244,174,18,230,1,44,32,70,130,80,193,234,184,24,254,18,27,44,
+31,206,245,16,246,100,104,185,102,219,152,249,115,24,188,41,11,125,92,161,159,123,92,93,140,70,8,17,148,105,95,136,213,188,64,81,248,47,38,86,192,121,253,213,169,189,247,167,196,8,43,185,182,216,135,48,173,204,129,11,77,81,115,128,165,252,92,246,21,9,83,200,142,147,18,86,113,213,173,211,108,221,147,244,35,247,142,162,69,146,240,32,187,238,56,63,228,252,160,128,197,65,254,92,48,2,72,90,124,101,178,88,76,145,243,229,144,53,123,203,28,40,199,181,23,155,3,229,128,182,255,251,80,206,190,153,240,75,10,32,202,154,96,146,54,166,215,211,19,252,56,247,65,109,74,101,114,176,240,193,114,11,223,70,225,48,51,77,255,101,120,245,163,21,240,33,75,11,208,221,139,99,199,40,40,100,103,110,48,25,241,203,107,127,37,218,199,71,226,17,129,97,122,148,191,148,205,224,27,90,223,146,231,163,157,49,18,217,165,142,2,254,156,182,134,156,78,164,177,171,221,203,143,104,228,198,32,225,87,228,98,245,249,81,111,242,64,217,233,244,49,218,16,106,88,238,
+158,246,51,94,166,240,71,250,250,231,213,143,63,47,133,35,247,205,32,106,44,96,177,14,254,232,98,253,71,74,243,131,171,161,247,195,0,67,234,147,247,55,236,71,213,48,4,235,106,119,141,126,213,202,193,101,82,250,208,14,30,169,219,35,211,14,239,41,82,242,145,198,62,42,136,113,163,114,175,26,98,100,116,255,49,76,249,175,160,35,124,148,199,33,130,156,158,217,85,75,115,175,197,113,212,220,60,130,82,85,180,144,140,100,81,173,47,214,47,194,227,236,75,217,129,172,65,72,149,28,135,165,27,6,44,73,130,228,97,3,18,52,121,77,114,232,138,78,158,149,84,89,136,39,227,117,180,232,4,121,37,82,140,25,148,49,21,198,97,189,186,32,102,121,223,238,13,24,72,127,179,226,153,55,52,107,148,242,63,162,228,217,137,223,80,57,53,120,252,205,232,150,150,69,83,101,112,101,77,161,18,0,46,232,7,59,250,190,96,44,200,30,9,55,141,119,229,165,81,85,93,26,116,255,198,85,126,130,29,192,198,66,184,70,165,104,144,166,108,138,251,166,208,48,50,172,
+6,89,132,25,190,64,114,219,125,26,122,144,161,81,205,13,133,216,25,6,83,88,216,28,60,133,55,10,228,186,82,7,48,232,71,142,251,25,135,153,54,165,46,76,171,186,165,202,16,134,39,180,141,146,40,89,4,163,46,150,150,53,86,149,164,82,238,52,1,60,136,70,129,155,190,96,193,172,249,11,217,245,70,124,152,69,21,187,115,221,73,230,138,64,234,133,40,75,132,123,29,68,16,19,209,164,112,8,128,0,92,136,180,237,94,132,82,174,74,97,81,146,18,67,126,103,16,248,37,33,191,163,60,233,13,52,232,45,92,160,119,118,97,230,149,81,31,76,47,48,242,29,53,21,105,106,103,4,41,146,163,28,168,192,204,70,65,185,120,131,140,62,24,139,143,102,77,198,157,99,231,204,179,152,102,206,115,163,168,224,81,117,166,74,207,162,143,124,22,197,160,199,162,73,1,28,236,144,121,143,62,216,216,167,92,32,241,70,111,66,96,136,34,95,90,238,247,204,13,228,245,250,33,36,146,44,93,232,254,52,157,3,230,95,5,123,38,129,17,140,177,115,187,228,44,248,
+152,189,140,233,222,166,140,57,65,46,48,70,132,129,113,39,169,153,64,82,115,62,8,146,34,177,105,111,232,242,27,9,130,252,181,25,123,195,164,78,47,132,37,71,75,134,162,46,5,184,17,82,150,183,169,14,66,72,243,229,105,184,17,18,37,33,111,133,248,124,130,60,206,54,234,160,66,73,27,207,112,107,60,244,56,62,194,27,195,38,47,149,61,246,65,73,45,154,75,47,23,149,213,198,79,216,209,118,182,77,163,100,213,12,110,117,121,196,84,230,171,221,186,113,19,103,243,221,96,245,101,217,121,163,199,113,147,110,195,166,204,65,101,219,135,69,153,190,133,223,40,81,57,110,114,112,24,164,74,75,26,46,149,61,70,183,99,133,163,38,214,17,75,72,15,218,28,241,252,181,199,138,228,50,138,35,188,41,112,84,57,220,56,150,38,178,251,79,29,184,115,59,101,79,10,36,44,98,181,122,188,54,213,60,81,194,126,95,139,6,131,52,162,208,28,41,255,129,217,131,164,195,64,110,174,209,189,74,140,92,201,201,85,185,70,83,160,87,113,170,92,197,108,72,12,67,
+118,87,168,188,102,213,176,148,115,43,172,98,10,73,101,48,42,185,12,120,158,67,174,2,162,28,9,146,43,61,96,149,95,112,112,220,10,163,5,251,15,22,70,36,167,245,84,172,20,134,249,19,90,161,63,134,224,32,246,54,158,33,189,25,202,194,78,252,137,34,76,65,46,14,69,106,56,42,135,144,201,115,114,14,249,123,171,193,16,28,160,14,190,233,1,145,236,218,107,90,40,77,94,103,60,174,131,178,132,16,22,166,143,185,7,179,232,17,62,18,162,32,50,7,79,103,209,44,20,82,29,139,93,92,228,90,87,22,225,66,25,25,193,130,83,236,72,26,214,81,198,211,73,8,18,41,167,70,142,96,145,2,107,164,192,49,86,244,130,33,36,94,62,96,108,116,173,42,23,97,21,228,163,107,34,45,231,99,32,135,251,164,64,114,235,76,0,23,97,138,198,122,97,1,212,33,215,91,5,150,10,19,206,71,70,242,193,232,219,155,205,52,203,39,64,173,10,104,229,88,197,197,142,138,48,89,76,244,212,37,193,145,60,140,71,169,115,210,206,163,56,242,184,139,179,177,
+237,117,169,31,189,63,121,66,134,249,39,22,32,100,126,19,127,162,231,7,71,33,49,126,141,12,60,70,186,158,3,90,127,116,106,122,210,40,245,244,40,219,197,76,30,229,120,163,108,71,20,128,235,73,200,159,212,15,131,198,137,89,177,219,153,180,232,196,108,227,18,215,33,73,90,234,154,212,218,243,226,147,251,197,76,2,147,96,146,43,131,56,102,50,124,159,44,219,6,30,108,45,147,45,157,18,171,137,79,204,190,0,224,101,131,72,139,250,169,222,96,135,188,162,81,113,138,244,66,64,163,183,110,100,91,57,192,117,198,154,85,233,230,244,60,137,72,146,142,39,49,42,198,254,2,181,61,88,176,79,21,231,195,195,121,179,190,15,89,28,24,24,24,172,46,55,65,197,43,111,180,144,34,29,162,114,214,89,47,72,162,89,30,39,138,199,226,35,108,195,39,140,39,247,1,178,219,237,92,240,201,82,72,174,233,73,38,169,130,86,162,181,94,37,94,175,170,182,170,40,21,131,114,91,25,247,205,204,217,236,232,173,114,135,25,169,14,251,135,207,2,184,63,76,37,154,
+241,187,89,158,227,225,190,14,195,165,231,208,100,163,73,16,244,88,154,210,253,0,63,172,117,184,96,68,124,208,48,183,36,132,19,181,170,220,144,70,134,148,162,12,34,157,178,26,37,18,45,255,169,42,59,74,158,42,93,152,204,244,5,102,252,147,50,94,22,93,4,186,5,180,108,23,73,116,149,175,117,6,169,38,33,82,176,4,35,96,159,118,65,50,50,65,41,0,208,146,149,220,85,167,72,127,114,183,158,127,32,247,131,81,139,61,31,68,205,84,60,165,58,173,129,56,41,0,229,7,88,137,8,189,235,212,251,104,182,112,129,103,80,54,176,190,96,138,154,167,148,66,217,67,122,112,7,235,180,121,18,106,176,138,50,81,87,168,151,211,171,110,33,61,146,47,195,213,39,148,251,124,235,102,234,181,210,98,129,114,245,53,218,163,92,52,208,143,212,202,86,105,240,72,94,47,184,85,85,243,90,210,3,57,48,228,255,112,95,205,250,102,246,247,33,1,220,220,175,191,198,90,48,1,220,140,57,179,231,177,63,240,27,124,154,245,215,25,115,126,152,57,139,253,62,251,
+251,133,179,230,47,152,53,99,33,251,62,235,251,153,240,239,204,249,211,255,50,31,126,100,31,103,127,55,253,155,89,236,243,119,115,191,159,171,254,78,158,127,255,13,251,54,103,246,247,242,131,89,115,160,199,5,242,55,172,122,198,62,78,159,63,131,125,154,55,119,206,127,227,255,73,171,255,153,54,129,136,17,14,102,65,214,235,251,31,230,204,9,160,31,23,204,157,51,123,38,251,60,115,250,130,111,229,143,115,23,170,126,244,248,6,255,227,66,254,199,45,93,155,138,115,178,206,202,40,176,214,116,11,30,248,7,87,64,187,160,254,190,154,18,168,160,45,21,204,208,214,215,139,8,15,188,199,8,14,7,9,153,72,255,231,179,197,220,133,216,192,100,177,176,6,126,164,49,21,59,82,4,150,126,53,251,115,129,248,223,193,6,101,221,64,83,28,14,111,8,195,63,170,175,76,232,12,209,135,247,110,60,123,243,236,212,141,102,199,205,234,25,102,37,0,111,6,204,48,155,254,243,217,34,128,13,102,133,192,228,124,216,31,46,141,31,78,66,77,42,161,234,39,91,34,254,
+28,19,158,242,66,3,203,48,235,98,12,154,195,253,68,69,212,144,202,99,112,165,17,53,66,133,161,158,208,16,218,96,140,20,61,139,86,89,126,143,46,234,123,33,179,17,177,1,136,44,77,55,168,43,71,10,12,244,49,2,178,39,118,20,111,14,71,213,202,234,88,83,26,15,53,97,109,187,24,114,171,38,230,133,8,6,55,234,33,207,104,222,12,243,219,220,226,205,96,224,5,130,53,76,57,70,160,87,112,17,138,230,45,244,60,221,12,242,35,189,101,22,143,15,75,66,164,8,138,251,111,232,109,199,136,212,224,162,191,137,70,249,55,229,188,20,233,129,29,43,228,62,225,38,7,187,206,233,201,39,12,201,207,158,225,107,54,205,144,223,73,48,73,43,181,252,20,208,7,241,150,101,127,155,132,145,24,170,68,35,137,189,145,57,98,49,8,98,220,96,190,154,209,36,59,213,110,252,5,43,60,241,167,40,106,27,67,163,79,40,7,145,18,175,28,173,77,71,93,114,57,145,66,61,154,78,52,235,172,145,228,114,5,157,224,222,173,12,108,148,18,143,24,86,55,90,
+176,181,143,212,210,102,172,209,242,225,176,239,199,128,249,71,1,226,177,53,192,197,6,192,146,96,69,76,255,161,68,74,204,226,144,223,47,214,197,44,254,100,177,75,28,196,146,223,98,201,111,35,23,49,186,24,141,108,209,197,186,100,202,144,103,25,135,47,103,220,227,248,35,144,80,227,29,211,151,133,220,144,2,142,228,30,139,212,5,67,33,129,173,4,253,8,132,157,90,58,141,131,128,27,134,112,27,55,89,54,221,172,123,143,102,136,206,151,24,25,210,250,6,47,221,236,51,202,62,100,107,65,85,206,236,87,102,188,147,197,199,122,191,188,89,167,58,129,76,20,159,201,171,136,210,200,29,207,205,114,29,101,121,179,149,90,208,236,82,49,157,193,164,91,18,45,74,42,55,129,222,130,65,227,119,222,134,165,214,175,209,168,58,155,128,130,203,172,132,89,100,128,252,200,176,110,54,145,191,107,43,67,113,6,232,34,19,240,88,216,138,183,168,192,144,143,141,203,175,227,170,186,192,85,184,132,192,224,138,207,144,78,105,124,6,27,4,176,144,162,90,16,72,222,226,85,
+128,168,145,24,84,20,118,240,137,21,112,121,139,124,117,176,137,1,65,182,71,204,58,77,59,132,73,221,10,38,137,43,13,63,171,210,205,24,24,58,54,57,127,175,222,139,75,24,201,206,11,145,70,131,75,68,119,163,108,28,99,85,99,170,36,135,196,63,207,100,136,157,199,238,162,25,181,80,242,46,27,52,133,252,233,177,115,65,26,157,136,192,214,66,76,200,98,194,72,131,119,225,3,78,95,131,104,128,36,221,143,18,68,210,118,88,16,126,64,114,112,164,125,233,77,49,110,125,161,118,244,8,133,72,130,89,148,51,95,217,53,71,129,156,76,101,10,41,144,168,26,169,83,203,100,40,111,198,43,108,64,156,40,196,66,119,42,200,213,9,120,75,188,252,76,136,81,48,205,34,38,52,79,10,75,48,184,82,183,149,113,144,221,113,167,80,134,69,51,30,29,66,25,154,145,0,235,150,118,230,202,225,117,219,92,81,109,23,184,58,151,109,61,53,61,104,186,83,167,149,19,72,208,144,36,227,251,17,243,84,123,40,128,73,127,12,72,202,67,248,179,13,28,209,140,66,
+66,70,43,187,220,11,58,85,38,174,66,101,200,143,65,33,32,151,93,95,39,133,4,7,115,129,129,129,218,151,232,244,201,203,24,87,196,151,2,216,102,138,14,183,161,149,209,124,181,210,14,162,233,238,247,216,29,25,210,231,11,242,215,73,234,225,241,134,19,141,128,85,200,3,119,178,17,111,42,66,115,77,126,36,97,43,173,124,65,107,122,152,164,228,38,248,9,237,248,130,74,136,97,111,120,54,114,141,236,131,68,4,53,109,146,238,153,47,163,37,22,239,112,13,161,188,2,189,106,47,21,93,25,212,229,191,103,40,98,96,226,79,242,198,60,61,43,199,193,143,33,191,83,17,42,22,230,13,196,107,159,240,82,90,166,255,194,193,92,133,191,224,173,240,70,150,13,33,223,150,46,239,231,9,122,117,175,64,116,96,19,224,71,98,102,89,67,113,170,46,107,11,111,123,194,161,204,66,20,86,213,209,51,171,12,175,83,197,91,170,168,41,197,42,35,211,179,94,228,126,86,118,157,158,156,251,66,236,24,86,249,153,156,33,84,236,126,146,111,72,246,26,93,130,38,228,
+119,161,188,110,73,184,25,141,149,144,223,49,245,108,146,175,250,83,102,175,108,18,27,240,58,190,165,30,233,36,236,168,13,96,77,244,125,59,213,207,170,199,255,76,146,30,23,113,244,175,242,210,31,135,86,246,255,161,117,66,134,167,237,199,4,10,1,98,16,16,124,234,114,207,150,31,149,240,48,148,240,56,106,200,97,170,57,206,61,152,66,6,14,196,243,118,248,9,253,155,127,77,69,232,30,58,82,233,67,223,54,15,19,168,222,21,150,70,61,33,37,120,89,55,37,25,98,8,221,242,201,80,126,145,86,179,120,85,44,46,249,202,178,204,81,123,200,234,69,14,217,104,130,51,68,67,200,135,33,199,26,160,249,240,29,162,143,110,6,74,56,145,152,0,42,122,82,2,37,72,251,178,200,8,214,74,51,95,172,227,33,26,61,89,69,99,159,121,125,237,35,59,124,0,118,197,71,202,31,14,189,123,120,76,255,26,132,44,255,63,220,100,28,53,61,255,179,196,187,36,107,40,75,104,100,67,141,18,92,143,126,222,59,228,224,191,253,13,51,86,67,22,143,203,4,124,
+117,231,123,30,63,243,198,236,123,18,93,224,38,107,4,187,143,61,223,217,232,37,47,226,200,31,175,253,136,218,39,163,220,57,30,177,99,67,15,181,196,40,71,242,152,103,161,124,165,14,121,36,31,203,201,87,115,163,243,47,199,207,212,82,146,185,55,240,88,47,41,134,115,56,166,67,203,222,140,252,170,218,27,194,77,13,52,147,201,149,75,184,3,33,40,183,203,123,217,204,161,145,7,79,152,149,240,38,241,83,124,83,182,28,89,28,138,88,149,226,175,146,224,130,8,221,60,165,48,175,26,102,47,94,26,1,75,153,184,201,232,1,52,195,51,80,15,185,202,210,138,183,68,210,236,106,25,191,223,187,220,66,197,37,97,14,166,183,193,16,186,8,193,160,247,112,66,189,72,40,44,46,162,141,206,73,34,66,231,234,13,212,134,183,166,10,126,124,71,19,85,11,239,85,43,186,199,9,181,145,55,159,205,188,204,98,112,159,203,109,70,180,179,79,240,28,172,215,238,20,49,245,9,231,35,130,24,236,9,130,86,65,251,164,58,119,64,229,146,73,94,137,217,13,208,33,
+197,170,22,222,96,159,80,248,180,55,16,229,97,180,110,52,198,214,188,229,80,13,181,145,231,158,66,69,44,14,185,111,133,184,49,168,168,233,72,22,157,190,18,10,60,122,112,135,77,126,160,133,143,74,82,232,148,37,121,170,142,87,41,93,202,185,19,129,220,76,122,54,208,149,247,233,58,145,65,132,9,237,141,139,196,218,89,161,2,55,85,115,112,133,240,171,24,30,225,61,182,251,149,203,84,115,77,206,205,84,115,187,152,81,62,65,109,230,37,146,90,163,156,157,86,189,6,86,155,38,129,30,255,18,189,18,226,7,211,10,9,112,251,135,216,8,138,10,10,249,173,234,23,204,129,128,31,252,167,141,212,10,212,170,177,127,145,68,178,97,90,182,94,53,189,214,7,19,35,195,71,223,255,144,233,43,146,42,127,133,106,254,177,82,204,71,2,249,5,9,100,124,150,208,131,233,3,20,123,242,227,242,254,243,242,255,120,156,243,30,51,233,125,164,180,15,140,210,222,11,45,120,8,152,95,198,240,24,247,3,40,191,70,182,31,135,197,250,23,94,155,247,65,234,239,89,
+8,254,74,48,251,171,86,118,195,88,245,143,139,252,115,218,28,255,10,158,237,175,134,249,198,178,110,31,151,105,116,254,222,47,174,118,126,181,72,254,85,43,162,127,21,95,235,3,211,73,174,253,51,35,29,23,143,206,144,250,91,97,34,73,186,195,42,3,120,23,196,108,249,0,16,253,65,121,7,183,186,34,5,35,169,107,227,199,250,158,160,241,29,105,53,84,23,176,19,168,135,200,209,179,43,100,63,9,70,178,98,238,2,71,136,145,115,129,140,199,189,103,203,245,235,204,130,164,227,13,130,158,0,163,238,140,166,205,98,121,38,179,137,108,97,5,112,38,163,33,86,158,144,33,42,130,39,197,246,140,130,65,57,46,131,81,110,146,253,43,168,174,181,116,77,156,21,154,81,141,130,188,160,169,60,70,95,142,165,67,97,17,107,179,250,164,148,100,178,154,117,2,3,1,171,0,10,242,112,129,94,234,197,140,209,14,71,190,1,214,24,172,34,205,55,130,101,161,16,99,89,32,254,67,61,70,52,160,197,28,50,129,178,216,215,38,163,101,26,135,111,44,254,113,2,167,
+106,16,76,27,44,38,111,47,14,153,240,35,226,3,79,91,192,234,96,163,197,228,135,48,248,20,140,187,179,11,44,122,252,213,207,63,0,153,132,62,52,146,39,33,19,127,132,207,147,130,253,25,233,125,39,240,146,213,76,74,5,227,150,139,234,110,111,204,83,228,126,48,138,58,19,86,180,132,161,56,63,94,162,245,241,228,85,163,20,67,107,37,225,216,110,251,119,4,190,137,63,105,250,192,123,72,232,144,154,87,9,228,19,127,194,63,236,92,22,217,213,192,101,164,133,18,37,185,153,103,162,163,81,179,221,71,14,102,153,37,143,253,74,2,140,235,92,156,145,251,35,23,20,28,160,60,129,118,198,112,122,121,2,61,19,40,207,14,43,128,232,36,120,170,202,215,241,118,9,142,46,134,11,249,83,176,114,35,11,206,85,41,29,102,137,128,23,240,160,51,110,48,5,147,76,28,23,146,93,232,27,132,118,240,47,210,130,71,108,108,48,58,66,169,140,116,36,55,14,246,83,136,33,38,88,69,25,177,234,47,36,121,31,126,24,45,189,17,225,71,31,139,198,37,244,233,
+87,88,127,211,39,41,202,99,225,99,54,146,62,134,188,129,181,136,252,53,50,146,224,149,85,243,98,168,166,231,243,228,244,91,152,46,150,234,156,198,110,147,137,54,153,151,144,82,160,164,122,179,201,130,7,17,72,39,82,0,72,165,104,62,22,101,90,164,64,136,135,84,92,131,133,10,249,17,207,166,99,238,49,149,140,131,148,122,38,224,132,154,98,2,185,175,76,49,156,4,140,74,43,195,241,120,5,13,82,8,189,142,87,83,198,13,70,80,51,54,136,82,215,149,56,110,16,170,135,208,94,229,66,10,137,26,196,112,163,224,253,74,96,60,130,31,200,77,55,72,166,0,122,45,135,20,43,89,132,72,178,98,88,231,145,116,32,215,117,35,163,18,237,17,42,90,34,249,40,250,22,169,93,3,76,104,177,98,143,134,88,215,69,33,172,76,25,1,3,235,57,139,164,222,37,32,147,108,210,10,22,84,32,34,74,15,194,206,108,20,73,25,38,144,80,208,108,232,59,100,218,180,217,210,2,212,40,164,7,41,194,100,53,232,101,21,2,237,195,77,38,61,23,110,21,36,
+137,92,65,100,82,238,44,225,85,92,227,101,0,143,227,251,49,154,99,70,97,195,88,81,143,99,252,177,99,235,130,178,213,196,159,88,173,113,38,219,200,171,40,169,0,157,17,100,7,95,47,132,155,5,114,217,2,158,209,197,51,239,240,58,72,141,41,159,7,5,193,138,4,145,43,179,104,110,136,153,72,16,63,154,130,199,56,195,44,66,79,4,9,192,138,127,8,34,175,91,163,162,121,179,30,200,105,210,84,250,67,132,192,235,129,6,162,141,28,66,31,192,77,254,2,126,199,239,228,189,64,110,56,66,220,35,99,221,135,4,87,202,148,64,59,237,118,58,8,135,137,63,145,238,136,166,255,82,133,16,73,230,77,114,48,153,172,189,153,55,74,81,60,146,93,32,183,208,68,79,4,193,251,170,180,69,90,202,80,233,4,111,12,80,23,113,5,150,54,89,233,126,59,61,149,192,244,137,171,5,97,95,69,232,171,121,84,78,219,65,70,165,73,156,74,93,93,114,188,153,1,163,176,170,251,216,76,237,208,190,213,60,78,82,15,40,73,252,63,176,48,65,193,254,212,114,
+17,45,86,202,145,26,166,143,180,98,206,20,222,226,67,178,59,68,29,233,7,97,227,101,152,228,252,73,16,124,200,74,161,130,234,212,22,80,18,79,17,164,1,1,197,215,47,172,79,103,80,145,175,58,158,71,71,165,186,83,98,149,158,221,106,206,34,214,133,24,68,131,136,246,50,175,131,222,37,133,179,212,245,34,181,51,64,240,24,220,180,162,158,158,38,254,41,239,209,65,73,230,19,142,197,222,69,129,73,223,135,225,8,25,201,153,107,126,60,182,229,37,139,63,82,106,36,111,140,85,242,123,120,218,77,168,64,146,68,152,213,164,156,107,167,20,162,224,114,132,234,127,188,52,255,175,77,209,43,23,108,241,52,25,139,122,11,88,211,91,101,251,243,161,166,165,42,157,171,216,146,38,178,110,145,145,38,166,115,163,25,249,82,30,36,101,18,130,130,85,199,160,100,121,164,93,65,70,73,84,29,152,99,85,69,26,200,218,18,157,128,135,27,81,64,123,41,20,255,203,107,163,143,66,125,28,132,250,71,161,249,97,11,77,239,254,246,95,22,88,240,84,175,28,212,26,
+210,227,86,222,95,60,92,209,248,51,186,214,148,196,45,102,150,203,60,2,207,122,80,175,218,167,127,203,5,43,236,64,38,21,192,106,103,225,19,23,167,176,89,250,145,49,121,9,171,182,224,201,73,189,64,62,250,143,90,209,121,93,186,145,171,186,145,175,232,160,202,110,28,116,26,171,117,227,166,55,84,138,110,41,111,22,149,106,222,234,219,6,188,171,57,151,106,163,92,141,35,185,74,117,144,30,25,18,136,247,41,161,93,233,178,57,181,199,127,21,65,32,113,75,140,232,51,248,49,222,195,227,190,115,136,188,34,245,140,144,188,149,138,225,176,6,122,1,3,116,224,209,233,241,23,127,20,66,140,214,134,18,106,31,85,164,119,21,249,81,242,143,197,92,30,103,81,226,35,94,246,225,201,150,64,110,186,86,124,120,145,27,96,255,152,20,106,85,197,105,22,8,242,171,176,156,2,26,37,70,157,96,54,122,188,201,10,231,127,136,108,252,49,238,242,81,254,124,0,150,39,167,246,209,67,99,45,194,48,173,79,47,94,57,182,166,210,2,31,226,181,225,227,181,5,164,
+24,112,196,105,34,75,195,248,132,185,61,48,30,175,195,133,198,242,65,62,237,81,31,134,168,12,173,76,124,234,206,222,255,94,208,216,156,47,48,177,209,78,225,252,104,149,32,171,37,108,42,126,15,80,226,7,108,114,52,130,48,227,219,233,243,241,178,137,197,63,44,252,122,106,240,96,183,89,143,90,135,13,74,79,227,160,199,198,133,238,222,103,132,136,145,164,76,160,188,55,18,149,5,182,201,234,17,62,34,26,209,104,161,154,79,114,211,123,31,213,216,184,171,49,159,234,203,37,21,212,59,167,218,101,116,85,2,85,56,43,38,38,70,125,199,146,255,135,160,18,223,175,236,249,168,126,199,30,45,31,55,169,249,43,17,146,210,96,10,220,37,29,135,140,68,124,128,2,241,163,92,249,64,108,154,143,210,104,108,206,192,104,92,128,247,101,238,243,244,55,172,200,79,171,80,176,180,145,144,137,50,158,181,46,192,160,170,94,222,138,1,49,202,121,109,30,224,34,170,153,179,190,158,254,195,156,133,195,98,183,15,215,15,64,200,212,51,69,42,23,201,105,255,159,219,35,
+120,159,126,192,47,174,206,134,75,158,131,109,31,127,180,255,127,57,251,127,220,37,194,63,165,2,118,23,38,46,178,30,66,164,124,84,200,227,226,30,140,163,83,240,235,150,152,191,102,151,224,163,168,249,40,106,62,44,219,31,127,29,97,6,202,216,19,80,104,154,8,90,249,126,94,215,217,51,215,192,104,25,118,138,129,66,127,34,77,67,165,224,6,187,72,139,140,238,34,206,33,179,8,96,157,48,105,149,36,18,144,107,220,72,90,56,249,234,53,137,64,14,144,113,223,154,162,133,165,130,89,69,213,242,133,218,131,75,61,24,80,67,226,1,30,96,19,186,145,44,88,206,204,43,8,50,67,193,83,29,143,178,66,155,67,129,157,42,100,138,236,160,23,195,194,224,145,66,81,174,87,49,128,164,144,60,205,236,25,206,78,203,207,239,101,141,213,115,25,148,27,70,174,118,127,209,125,247,143,250,245,215,162,95,63,106,171,49,165,205,188,167,172,153,95,47,243,186,133,19,148,163,72,62,19,105,144,114,62,38,211,124,0,81,136,143,210,232,67,147,70,170,178,241,120,99,
+36,222,250,233,229,244,190,207,82,3,11,68,227,12,147,52,170,58,3,148,174,7,45,26,160,55,89,67,13,190,74,2,128,25,200,143,161,185,206,36,241,158,69,1,166,203,181,134,173,96,119,138,150,88,151,13,78,139,103,235,120,131,206,106,224,45,236,234,43,9,79,170,242,164,38,44,249,168,156,44,166,204,234,231,141,65,101,187,95,233,89,62,154,143,139,102,54,146,67,103,120,112,76,30,73,177,8,221,142,170,186,113,155,86,76,120,27,152,201,0,194,252,42,22,119,113,183,138,167,241,170,1,147,114,61,169,171,212,50,193,57,150,41,150,167,75,188,21,28,50,0,11,27,4,195,207,126,236,88,207,4,110,50,254,243,93,200,226,121,179,185,79,168,24,114,235,142,174,1,118,231,194,159,91,135,240,96,168,14,93,21,119,167,235,116,130,36,187,7,172,252,110,112,200,68,86,222,64,167,160,92,242,193,1,195,45,174,33,119,61,24,217,255,82,5,158,24,108,139,56,119,32,221,10,106,68,251,170,136,33,203,95,90,116,130,86,69,167,68,173,92,51,71,139,190,171,
+180,26,17,182,32,17,35,201,13,85,74,137,117,214,47,251,19,243,99,0,234,241,224,144,63,225,39,125,52,184,171,176,156,230,192,191,160,24,244,243,135,37,21,163,209,51,69,55,220,207,63,16,207,62,252,30,30,35,85,178,30,98,149,30,98,53,61,124,75,206,62,120,233,34,150,118,1,218,86,5,138,235,186,93,188,5,87,0,15,211,72,109,0,215,53,122,192,62,6,83,184,8,24,144,253,5,171,81,116,219,237,2,12,66,115,134,44,83,232,223,240,0,182,74,205,189,103,242,250,215,173,148,249,94,8,92,117,95,245,4,156,21,210,21,126,138,13,150,107,132,147,235,148,217,253,208,114,177,2,202,7,46,146,87,44,6,236,153,70,248,216,88,195,100,6,160,121,175,92,16,51,40,3,0,153,123,37,252,88,111,68,143,214,15,49,61,5,125,56,17,184,204,180,246,126,197,116,44,185,253,51,106,120,47,235,176,111,23,38,137,121,163,125,33,86,243,2,61,178,228,155,169,148,75,47,233,161,64,87,149,26,131,73,71,48,238,131,207,22,49,175,73,224,35,23,113,
+244,175,87,34,9,146,73,104,110,212,168,120,13,93,24,79,34,211,206,24,95,161,97,154,161,3,56,163,154,194,60,171,69,163,72,222,163,46,242,62,69,243,48,230,231,169,160,65,158,210,35,196,162,217,130,182,51,35,44,98,3,133,241,58,193,151,141,42,191,63,18,35,245,43,33,92,52,170,215,88,51,145,241,26,101,150,81,63,146,49,134,211,229,220,176,48,112,62,188,81,231,32,247,46,169,150,46,106,136,165,139,242,77,128,42,240,66,77,38,131,87,240,102,24,196,168,33,88,231,23,167,188,81,79,204,20,22,246,79,57,183,89,49,58,131,85,47,252,211,174,221,108,148,32,120,207,207,175,106,134,42,160,20,48,177,124,156,187,32,114,129,70,159,171,225,163,191,168,113,129,119,195,106,176,64,95,241,243,87,94,98,40,112,135,127,20,11,50,168,69,139,96,142,82,201,254,138,13,218,49,149,39,244,48,218,60,236,50,79,219,203,211,216,114,51,70,232,77,65,67,68,163,73,189,189,185,81,99,42,201,39,211,173,58,78,205,250,149,119,88,105,11,26,77,70,155,
+80,9,76,179,206,89,156,57,50,92,121,160,110,129,101,9,85,161,237,176,24,37,213,82,203,132,216,177,27,26,176,75,183,159,176,55,183,159,194,98,222,51,166,92,213,61,189,127,252,249,176,168,10,235,131,15,47,104,127,193,186,32,218,95,232,149,72,227,141,110,28,216,237,55,50,180,219,111,242,125,76,99,20,72,115,68,163,48,90,129,52,105,148,18,105,148,237,98,38,143,114,188,81,182,211,222,173,248,94,164,217,36,15,113,230,241,11,204,218,253,29,143,95,228,203,203,134,20,114,99,184,27,213,48,52,161,252,43,92,141,58,150,219,68,135,127,5,234,207,65,146,99,187,133,211,59,65,171,238,76,244,248,93,125,63,162,27,161,178,11,5,61,127,245,209,98,72,122,31,111,41,57,203,0,214,163,52,22,250,31,85,164,123,108,203,250,222,233,41,10,55,175,135,150,114,30,139,226,117,165,160,51,47,63,141,147,16,155,110,214,189,215,181,243,89,37,125,200,200,4,137,166,142,186,181,96,212,255,18,11,63,172,85,247,176,108,232,84,221,126,196,25,140,131,54,27,
+85,160,74,206,25,249,85,56,100,195,216,37,30,140,134,73,133,197,69,28,249,227,67,181,145,61,113,31,36,129,137,47,139,72,82,140,87,224,194,76,94,53,218,240,168,9,211,25,70,133,18,227,168,208,49,188,123,196,93,139,59,90,71,84,222,135,214,252,200,82,65,220,44,126,79,13,231,158,226,161,121,248,158,210,180,63,214,248,27,81,146,200,104,37,206,240,182,90,198,164,143,64,208,134,11,163,51,130,71,178,179,232,101,99,81,75,236,20,12,119,241,62,200,102,8,162,159,20,221,52,196,146,165,137,136,149,200,222,179,54,101,213,215,222,136,103,236,112,209,140,185,115,230,206,159,63,235,107,22,37,148,191,186,240,225,45,82,168,150,84,44,80,232,69,162,177,30,61,95,214,104,74,237,163,33,227,141,94,205,163,241,12,66,46,112,155,159,215,169,141,81,245,143,131,209,6,96,18,231,83,48,14,202,37,191,156,121,51,26,35,101,209,183,51,103,44,226,224,31,175,83,38,155,115,223,232,69,215,132,61,71,30,79,74,152,101,212,251,30,109,196,208,3,223,124,203,
+27,245,42,19,101,20,224,251,10,254,155,162,176,34,130,201,188,24,70,247,25,179,255,113,2,189,239,220,149,230,52,45,24,239,65,0,137,191,148,101,169,49,249,129,26,2,53,107,4,1,88,209,77,110,121,241,160,66,72,127,1,222,155,185,52,17,106,61,162,68,104,6,5,8,76,189,41,90,10,160,151,172,195,223,40,51,17,88,36,61,238,47,244,33,166,178,241,97,162,65,240,103,106,76,5,157,82,198,82,103,50,155,5,41,202,100,212,211,234,191,114,91,55,240,253,132,192,240,64,50,9,38,173,241,79,0,55,79,31,70,42,21,177,58,195,156,65,92,34,248,211,179,37,74,194,29,189,37,66,34,10,116,144,83,225,108,32,146,64,167,193,132,31,54,164,215,214,91,56,126,41,47,26,200,77,10,120,150,63,138,84,136,135,111,254,99,32,209,31,140,146,96,208,236,233,251,15,177,218,18,80,9,46,141,193,192,105,51,146,36,76,236,5,6,35,89,133,180,87,87,41,109,25,179,218,233,177,165,145,251,161,118,18,61,59,131,167,122,12,114,202,35,172,35,12,39,
+89,98,13,2,187,53,131,32,158,101,66,169,146,25,35,77,122,122,99,18,61,93,67,110,202,176,90,76,145,64,218,74,109,68,55,12,227,194,27,72,150,7,59,213,35,160,170,196,170,223,161,102,171,20,129,83,197,123,140,4,163,228,150,76,41,129,30,165,211,164,216,144,177,160,51,11,188,69,155,99,25,26,75,1,214,91,205,138,61,68,82,117,160,103,5,163,132,65,6,197,36,75,169,86,144,39,159,233,194,11,64,44,98,36,244,225,2,158,28,145,194,226,217,120,212,138,76,146,152,0,100,72,176,212,196,40,154,240,233,5,33,240,212,74,70,166,203,161,100,52,202,75,56,125,222,108,82,81,91,242,101,183,13,135,238,166,91,44,188,46,194,139,138,28,68,4,130,193,31,161,21,128,131,211,42,79,198,96,152,85,19,140,170,210,183,27,93,210,254,105,174,149,194,195,170,245,161,141,24,183,82,186,48,99,46,34,172,186,96,38,54,177,104,20,45,34,111,16,255,193,242,180,252,80,42,144,75,83,204,145,162,81,182,192,136,26,67,106,21,12,164,27,147,5,111,61,
+81,142,35,136,146,133,101,225,122,72,77,213,81,62,154,83,79,22,10,150,152,220,145,165,165,57,153,154,192,218,3,151,0,134,86,12,112,55,108,176,89,184,214,90,73,139,226,165,37,48,7,73,96,215,108,41,242,110,30,74,92,252,230,118,146,73,94,161,137,63,69,123,229,120,25,119,152,117,108,50,26,217,248,110,32,141,74,61,206,20,180,20,53,56,109,232,5,21,109,120,23,78,138,242,242,130,52,55,10,209,10,2,214,141,140,125,133,129,163,204,240,192,100,149,232,226,80,95,141,46,23,71,18,193,35,229,83,17,138,164,146,229,107,20,43,87,132,87,254,132,161,162,67,254,163,180,164,206,238,246,173,128,241,45,179,160,118,193,148,149,116,115,46,101,82,112,67,153,150,34,6,209,100,11,125,227,147,58,131,12,243,250,161,61,11,146,151,38,254,67,96,126,0,57,50,59,152,87,129,47,204,224,163,36,237,75,138,104,81,155,178,158,110,132,168,125,228,50,104,7,111,246,183,225,121,31,190,44,39,98,27,240,168,16,72,160,193,7,226,116,124,20,31,138,103,4,
+80,179,225,234,80,221,161,228,134,146,246,129,220,108,114,56,229,239,86,209,66,46,144,137,100,167,121,221,59,115,19,50,132,19,35,73,30,50,118,3,250,149,72,172,111,231,206,255,255,230,207,90,192,125,194,253,121,214,252,133,240,9,236,157,111,255,123,193,236,25,211,231,252,101,246,204,133,223,194,3,249,251,183,179,102,127,243,237,66,78,176,232,72,181,113,158,11,19,162,105,205,113,60,68,44,97,216,0,224,66,74,36,167,13,34,248,165,120,247,19,82,173,235,176,3,232,76,189,90,196,90,162,77,218,105,251,137,132,90,255,230,207,148,38,69,29,57,97,36,72,24,196,96,134,6,33,94,82,127,31,201,65,102,87,109,228,7,200,116,146,164,66,107,44,244,110,145,40,9,211,91,16,217,213,94,208,39,57,218,61,109,154,46,70,123,188,241,111,208,199,100,194,61,35,232,35,214,223,55,223,44,96,53,154,34,213,76,74,167,70,20,1,185,195,2,176,7,116,62,147,44,40,82,186,98,88,131,80,148,133,134,90,180,203,150,169,6,147,64,139,34,189,28,3,62,253,
+109,92,143,232,124,109,0,139,105,8,127,199,45,183,225,59,126,137,240,215,57,95,207,12,241,243,172,217,167,58,162,232,63,141,157,59,199,220,4,185,77,176,159,170,28,159,164,61,82,168,206,216,160,201,191,244,140,160,213,96,240,56,166,136,15,176,242,70,144,247,76,3,157,199,206,89,152,251,15,108,132,161,226,147,195,117,46,221,113,191,232,175,97,22,26,31,102,31,188,198,84,131,184,25,196,244,116,127,71,27,127,24,42,206,60,30,177,115,239,14,189,7,214,70,140,31,47,74,2,38,139,164,196,116,4,251,230,38,175,53,56,2,6,242,250,214,207,155,169,182,64,128,53,50,11,244,22,156,15,63,82,132,57,44,11,208,253,26,135,88,209,208,209,158,177,224,116,212,116,239,125,127,101,188,72,223,203,6,132,154,250,199,16,106,52,136,195,200,4,247,194,56,200,1,24,61,96,156,35,127,29,212,194,242,254,210,216,57,199,11,120,223,204,96,128,125,51,99,80,144,220,31,191,15,96,180,145,124,55,48,8,113,253,25,180,173,18,176,166,95,180,175,255,81,243,250,
+160,89,181,255,161,61,116,193,18,107,231,136,238,16,140,159,192,82,248,3,239,236,92,164,220,222,233,43,10,233,241,92,203,104,168,147,23,145,58,39,222,133,22,43,220,234,201,107,35,102,83,109,81,28,175,140,23,178,88,135,12,226,198,122,33,139,77,228,184,195,32,251,36,212,106,6,123,125,152,231,57,71,181,89,181,0,247,235,231,105,110,79,127,95,231,69,70,56,202,40,140,191,249,66,56,208,168,224,101,223,99,164,231,155,220,72,66,157,6,43,152,233,150,153,224,35,131,74,251,104,120,7,165,102,184,26,106,89,100,10,252,157,29,137,5,31,176,246,3,137,162,224,189,229,6,94,2,183,198,139,77,187,64,7,62,182,81,6,151,188,167,253,121,26,61,233,135,15,22,7,187,126,134,223,184,105,92,148,53,212,128,40,159,233,118,170,19,200,242,7,116,206,169,47,231,138,35,73,164,189,135,63,71,188,55,122,51,117,200,111,93,251,123,224,74,152,12,86,164,224,0,185,138,133,124,7,59,141,67,5,208,72,43,124,101,17,125,205,246,32,27,76,207,91,120,85,
+0,138,94,61,138,133,53,148,203,165,148,184,35,217,41,102,65,71,244,65,162,35,76,120,5,48,237,7,163,217,122,33,74,48,234,73,124,131,186,110,242,49,88,26,57,146,111,52,166,193,119,122,217,179,89,100,97,83,229,204,188,20,65,47,182,193,200,155,69,146,155,242,92,36,31,206,78,125,69,1,139,41,55,198,147,209,229,11,202,124,110,195,200,196,70,73,77,161,38,173,92,166,203,167,149,131,148,222,92,226,228,231,88,55,244,185,1,81,188,30,39,9,148,228,34,43,112,129,92,64,98,156,7,177,174,10,245,160,207,237,26,72,47,74,81,6,62,150,44,113,0,141,38,186,17,131,43,144,16,38,134,91,205,172,152,9,94,33,29,233,170,171,26,228,213,219,251,179,40,68,123,240,133,252,163,134,43,228,31,125,241,132,6,181,218,109,33,158,196,56,204,38,67,200,239,192,17,135,126,112,255,72,69,174,86,137,198,181,25,217,178,128,41,13,122,34,137,203,52,44,7,109,113,250,33,191,225,141,98,36,198,243,67,126,163,160,72,36,91,22,225,184,78,122,179,41,
+74,21,159,243,15,80,42,132,201,163,201,17,123,128,139,110,104,153,5,57,31,130,109,77,32,250,49,138,27,101,114,197,163,205,194,223,173,2,48,208,82,145,39,61,8,75,201,134,136,9,70,35,209,216,31,23,89,76,81,162,14,208,248,73,200,39,51,44,102,195,12,240,38,66,62,145,204,58,250,53,228,223,5,99,200,68,171,20,242,111,196,147,192,95,48,219,13,7,14,241,35,43,241,219,16,127,240,45,200,3,250,123,176,215,139,251,212,43,167,124,246,83,58,157,128,158,57,172,149,252,40,216,15,127,230,88,97,30,29,124,86,124,234,217,114,100,156,69,93,229,38,234,56,180,107,49,137,200,96,220,12,171,72,67,58,52,54,132,35,208,146,59,195,197,2,157,40,62,12,38,171,26,78,252,100,194,150,188,104,64,249,35,175,208,32,52,172,4,192,53,68,172,252,170,161,98,229,215,81,144,49,221,212,244,144,178,138,96,13,23,140,72,110,184,255,64,223,229,252,160,21,240,181,129,204,137,236,86,232,73,2,14,55,239,251,111,2,200,132,133,24,30,35,204,254,108,
+79,71,166,178,111,102,206,86,109,103,17,162,151,79,44,4,40,185,123,52,176,247,223,48,50,221,217,114,141,75,23,142,29,246,48,91,73,192,73,181,79,96,149,148,16,53,91,98,63,178,101,98,2,11,43,20,8,158,7,42,39,59,125,58,22,181,194,220,38,18,30,101,209,113,50,8,21,117,84,200,208,221,85,163,18,164,230,57,73,32,233,70,64,29,56,23,23,35,202,58,197,5,141,28,184,167,1,116,68,228,12,131,137,85,242,115,127,139,94,59,139,145,241,48,171,153,108,205,68,153,77,138,38,35,111,179,184,165,17,232,147,165,67,169,119,240,220,174,249,196,7,4,62,178,147,51,92,26,115,125,241,35,92,70,181,204,4,23,180,94,236,185,25,242,82,224,78,31,39,68,70,129,142,84,222,103,171,8,15,40,169,204,141,18,220,177,20,45,226,77,166,140,209,200,207,222,132,130,79,48,101,107,141,157,57,146,79,36,13,1,61,109,162,40,215,9,204,30,83,217,131,242,9,35,245,43,132,60,60,77,61,45,6,180,187,86,56,97,18,143,70,158,80,118,97,21,
+121,195,210,210,38,176,174,149,168,49,27,83,182,19,73,97,1,153,112,73,213,0,189,16,230,218,219,35,141,81,5,169,41,215,91,95,116,148,137,63,81,58,199,188,6,51,134,238,17,156,17,226,124,152,120,30,45,22,245,99,67,35,217,43,163,147,36,73,145,70,73,4,91,154,202,189,80,65,14,220,171,177,69,17,10,111,132,198,186,153,52,227,140,71,156,137,47,20,210,163,112,10,174,200,172,71,133,75,138,46,45,159,121,98,78,139,53,46,216,15,20,137,53,146,98,137,108,153,104,16,164,51,69,70,129,164,11,37,181,47,128,101,93,40,242,7,131,48,204,37,163,163,65,17,128,88,52,186,82,49,92,64,132,10,120,20,46,128,109,208,104,173,17,29,10,71,253,123,67,247,224,82,98,112,212,143,171,184,24,205,226,48,146,134,175,100,92,213,213,187,148,110,105,127,202,219,46,89,192,12,118,55,205,46,91,140,174,116,40,240,190,141,122,222,172,39,74,131,236,244,211,21,55,192,32,176,54,196,2,0,123,130,87,138,12,74,26,101,73,134,145,200,149,235,178,222,
+226,185,80,209,18,201,71,169,46,84,151,181,57,240,186,76,75,51,103,128,143,33,90,72,138,17,65,2,109,173,145,108,1,108,87,73,206,65,176,48,131,4,137,134,169,118,66,21,178,203,195,138,150,209,193,192,151,17,148,204,18,186,3,174,184,15,50,125,146,81,2,57,191,89,138,223,199,43,9,94,17,48,101,87,126,144,58,139,194,18,193,27,85,62,94,0,211,207,202,134,168,9,212,190,81,169,108,28,224,98,16,57,93,199,5,147,146,219,128,8,70,175,82,197,108,122,170,36,13,6,142,57,83,12,69,4,101,32,173,120,35,77,229,80,49,25,79,179,51,52,44,234,91,179,144,1,220,185,219,99,113,199,151,45,137,33,164,49,50,220,25,144,188,225,197,220,88,16,97,197,252,18,172,210,40,59,231,138,26,240,83,229,59,16,198,159,40,232,253,229,213,253,74,176,68,11,108,65,136,25,226,199,118,50,141,38,124,145,216,45,196,38,183,98,44,149,110,250,242,42,139,141,169,19,139,36,24,194,40,57,179,245,112,229,54,233,3,104,90,77,180,200,218,200,187,169,
+145,224,194,17,189,3,0,234,69,29,33,119,106,26,69,240,200,141,52,195,157,40,41,213,88,6,147,110,9,44,164,31,111,176,68,152,172,225,17,72,174,64,58,24,133,8,128,193,93,142,52,190,72,20,29,173,77,13,179,215,155,140,2,157,130,65,64,73,46,226,189,36,120,203,183,21,68,140,129,140,65,102,6,84,73,140,83,74,186,178,9,42,179,48,234,91,102,141,250,209,154,166,102,252,141,210,173,108,234,204,98,15,72,93,109,54,22,91,15,240,94,151,4,80,247,128,72,124,228,43,26,170,254,142,143,10,153,72,233,84,135,185,25,132,247,163,133,80,180,174,151,18,36,152,113,198,152,132,132,1,29,3,51,178,1,92,96,247,112,163,106,12,22,179,129,169,75,208,5,59,247,48,42,87,117,6,233,130,10,114,63,114,60,43,36,64,31,109,50,235,137,219,234,122,24,76,220,19,175,33,29,53,169,127,199,75,75,188,251,110,242,19,244,223,100,114,103,94,156,76,239,154,247,100,210,247,229,185,1,121,97,134,12,109,164,156,221,16,68,178,112,86,35,62,69,50,
+210,154,65,68,193,227,35,82,225,139,108,244,155,162,248,191,91,137,227,111,142,5,41,104,22,52,242,145,56,197,254,164,110,33,237,49,144,251,26,107,177,242,134,168,8,30,99,75,70,35,8,69,13,21,34,131,40,17,164,0,46,212,74,180,126,148,1,95,5,128,34,192,74,192,114,174,177,32,164,113,109,145,159,81,100,130,228,250,223,86,160,213,201,127,8,224,38,7,5,125,6,246,5,162,194,109,98,33,191,49,133,133,133,252,70,73,72,160,129,44,63,139,156,121,75,191,139,154,90,169,132,72,81,94,18,177,33,201,62,147,63,71,226,46,32,7,126,227,173,3,37,120,194,114,27,228,84,73,215,27,38,64,25,131,94,206,150,35,201,178,2,73,118,81,116,171,155,227,75,107,108,162,142,53,43,73,36,74,17,4,38,74,84,109,220,114,40,149,192,29,89,68,140,161,185,132,143,76,155,88,40,146,197,144,49,195,35,88,17,182,10,89,13,69,185,218,31,188,120,133,10,145,142,192,51,148,219,12,238,29,202,111,185,219,5,252,80,110,226,96,240,15,230,186,120,78,
+101,36,238,11,81,234,46,15,80,129,158,36,91,170,221,23,141,218,210,76,102,120,250,213,183,118,85,79,252,151,240,51,148,57,107,108,1,141,107,239,202,140,215,182,64,167,65,165,189,153,255,64,99,3,204,192,97,182,224,32,174,3,203,71,67,98,51,155,81,44,152,72,71,148,209,192,94,102,113,20,145,38,123,105,0,144,176,14,31,90,182,172,147,0,46,66,190,250,193,32,132,203,242,145,212,190,101,189,0,231,130,110,231,141,2,133,88,52,106,157,127,139,41,92,32,96,147,57,120,76,88,134,149,26,137,74,166,90,40,22,245,166,214,44,149,242,68,141,34,111,211,44,106,224,116,6,103,128,250,98,136,88,214,15,57,93,128,188,52,238,228,52,122,131,237,107,209,40,146,164,118,15,115,205,165,188,228,24,25,141,220,201,33,181,65,67,98,70,33,218,149,125,175,151,195,146,76,53,90,2,88,13,118,164,22,60,185,96,140,165,50,31,156,20,193,107,208,89,117,204,66,163,176,85,191,79,99,239,251,214,218,170,151,221,117,182,42,144,41,103,224,226,89,3,222,44,
+254,67,192,228,66,160,125,201,61,25,87,136,17,116,86,84,60,158,89,185,1,36,59,15,117,18,199,42,231,224,137,62,234,36,178,111,42,185,138,78,131,38,58,168,58,178,136,232,193,144,38,9,147,235,229,109,13,137,20,101,212,134,121,201,230,13,86,173,1,21,55,15,15,97,10,90,163,85,53,123,156,167,41,202,34,70,202,125,210,25,75,17,96,9,132,76,68,47,141,45,24,218,134,248,151,197,24,232,46,8,241,192,162,112,211,194,44,59,72,44,33,157,106,2,234,152,209,200,4,53,31,113,23,132,28,87,81,251,172,196,64,16,113,163,5,212,58,206,82,241,50,113,40,197,235,84,78,218,232,77,58,43,185,144,4,95,6,211,213,98,22,193,98,33,239,200,1,242,217,120,233,171,81,79,83,88,129,105,195,229,92,109,49,146,112,20,254,5,17,39,16,27,135,35,246,25,203,178,70,156,210,93,31,130,146,144,223,80,104,0,50,134,182,144,137,100,238,75,137,121,44,3,73,205,242,104,118,73,140,198,81,6,107,62,156,161,146,200,7,134,201,81,107,126,55,6,
+80,127,213,106,125,53,145,15,79,231,171,90,104,40,148,80,10,51,234,148,67,12,88,0,149,144,27,51,229,39,48,205,234,243,154,9,95,64,171,19,57,7,7,30,115,51,213,202,78,83,38,205,227,97,236,32,186,223,141,7,244,170,105,17,245,79,116,1,85,135,122,32,21,96,30,146,97,63,143,22,225,197,173,58,60,105,141,17,7,118,78,90,102,82,82,160,25,188,31,217,19,148,37,35,35,66,122,196,22,3,7,24,6,49,89,36,134,189,5,130,133,246,237,77,31,144,162,106,178,104,209,148,179,85,191,20,171,122,201,85,210,118,36,196,195,114,234,135,94,7,114,97,149,26,215,210,63,134,139,107,21,98,233,165,84,228,7,86,220,88,133,79,130,36,175,193,16,24,139,212,203,22,205,42,129,139,125,141,45,89,142,162,127,208,4,21,31,197,30,167,112,161,154,180,35,224,42,193,21,5,129,249,209,195,36,38,230,8,208,229,247,11,37,23,97,224,171,28,53,128,128,26,52,207,194,120,69,5,186,97,32,20,16,128,111,146,120,207,52,210,9,54,160,72,12,160,
+13,105,233,124,203,88,74,204,51,118,30,85,202,206,216,235,23,42,24,116,223,27,86,83,19,45,153,13,158,191,23,205,43,107,72,69,125,134,169,232,78,182,99,216,110,161,172,189,216,214,58,16,22,185,244,37,76,163,200,101,86,254,70,176,204,167,231,10,200,240,244,136,171,26,52,121,215,207,213,171,142,148,168,15,151,237,5,54,170,160,215,28,223,153,201,72,95,175,22,37,68,214,200,43,139,70,164,66,170,126,148,64,136,223,74,136,12,187,142,148,229,202,251,146,35,227,68,67,174,3,60,154,179,59,218,226,60,94,132,202,16,196,160,196,173,189,47,186,79,105,226,67,138,120,23,154,202,250,163,190,37,251,219,211,52,74,27,79,34,184,172,109,229,109,149,14,94,172,201,201,156,175,58,176,50,40,5,185,209,139,223,87,100,143,134,208,37,82,134,50,146,42,144,31,38,154,37,11,39,223,74,167,108,198,155,152,183,163,236,78,16,83,138,156,35,161,43,70,76,34,5,215,26,208,72,248,144,220,156,39,17,132,13,118,163,181,107,33,20,195,217,99,74,140,211,60,
+25,216,61,232,0,93,96,134,13,113,61,60,216,211,91,64,145,44,24,13,38,146,143,154,96,162,90,5,202,150,29,187,162,93,83,61,243,255,111,239,106,118,219,134,97,240,171,248,232,14,105,31,96,215,102,197,6,108,64,208,22,219,97,72,55,39,118,145,52,142,109,216,203,178,2,123,248,137,164,72,81,138,236,185,217,210,67,209,75,209,40,10,101,83,162,68,126,252,145,168,125,24,20,163,122,207,129,101,55,172,144,51,102,224,107,119,67,203,136,211,234,213,87,135,11,234,141,203,190,231,97,199,44,35,97,46,179,63,125,128,213,128,138,171,44,147,161,137,243,136,28,78,141,31,168,34,214,150,216,89,215,5,64,137,246,107,80,36,169,193,75,40,196,96,27,138,87,193,8,50,81,234,197,118,48,205,70,147,239,124,168,82,129,163,93,9,187,19,128,16,11,112,30,129,224,115,70,153,120,86,208,38,41,13,35,44,121,151,24,110,3,227,170,228,218,168,238,183,152,52,253,193,131,61,201,164,106,139,109,13,202,185,75,164,230,108,178,157,225,88,33,96,169,2,83,201,
+117,103,111,251,74,22,70,160,54,200,190,93,11,143,66,230,49,230,127,94,244,50,240,203,186,250,84,252,200,174,214,37,129,20,41,122,255,48,46,141,47,155,9,12,214,176,182,129,189,6,43,88,131,1,221,88,83,250,126,122,217,127,195,252,192,39,173,54,6,68,221,162,53,196,61,205,113,149,235,234,109,199,42,248,193,5,204,186,87,214,52,99,186,85,102,31,28,211,15,88,59,28,18,17,190,59,204,145,139,203,146,249,129,101,52,232,182,183,214,7,93,53,23,57,185,128,115,94,180,9,133,96,170,43,204,100,3,135,213,39,227,14,187,10,81,71,144,190,131,74,130,244,242,47,208,80,221,128,247,230,16,160,106,20,8,152,0,155,147,212,198,161,89,65,82,116,50,35,29,103,17,66,56,59,106,196,35,201,224,228,157,255,6,192,163,6,152,67,209,218,115,57,43,100,251,196,167,184,6,177,218,214,237,227,247,115,37,129,79,22,172,83,201,212,171,212,196,130,93,122,53,224,211,174,238,145,171,247,105,171,211,58,189,1,69,238,144,27,110,49,58,214,208,121,101,99,
+22,70,20,126,233,191,119,162,79,105,31,44,192,225,239,228,207,107,44,30,89,129,112,160,28,163,22,0,190,64,244,255,143,226,201,207,233,134,241,196,79,174,67,61,4,106,170,98,175,207,137,216,121,116,112,222,112,197,153,241,39,148,170,174,179,172,155,71,95,158,1,3,125,65,130,27,30,43,177,147,36,174,129,27,93,16,128,157,57,104,168,221,14,115,101,38,160,32,162,213,143,173,247,217,186,220,181,35,96,175,39,11,250,171,208,190,20,161,117,81,111,47,231,56,60,157,204,220,5,106,219,157,214,74,226,18,244,55,95,170,155,25,152,48,224,74,88,163,132,131,12,191,122,26,222,252,160,60,201,176,141,206,227,244,199,58,73,232,162,231,54,149,214,129,24,39,23,244,152,218,74,53,184,119,121,158,211,192,154,23,223,31,101,53,72,88,171,179,146,21,165,73,178,55,235,170,110,80,133,217,102,27,80,248,62,174,171,221,47,168,92,223,97,153,173,218,252,73,127,214,37,20,205,5,180,138,108,236,179,11,8,247,178,4,129,6,150,143,41,59,91,175,15,232,43,129,
+224,154,124,228,171,235,86,245,174,204,209,227,74,121,115,102,108,28,244,34,153,21,237,10,42,168,72,128,145,99,128,121,12,122,50,118,245,109,1,129,3,47,31,184,187,115,229,200,227,225,142,246,243,121,243,229,62,144,121,222,107,36,72,199,177,38,119,175,206,254,80,47,188,157,46,178,245,40,190,216,12,26,211,66,222,12,129,26,17,50,116,61,15,131,140,17,16,183,203,5,106,213,16,144,71,63,40,209,235,77,3,78,47,251,117,12,254,253,244,50,210,133,95,196,117,51,45,178,147,60,71,190,54,22,23,229,189,186,9,225,193,211,101,112,191,3,15,184,21,185,193,113,199,12,3,208,251,140,24,24,25,234,6,189,237,89,88,228,46,233,192,163,82,17,46,161,102,250,159,234,3,46,234,54,86,148,18,219,213,251,194,72,48,213,17,148,141,150,230,183,249,204,6,1,41,164,146,155,108,124,82,182,48,125,179,165,186,18,82,114,100,115,27,242,102,212,86,190,12,91,69,138,51,170,200,181,222,24,93,244,246,8,113,63,47,179,6,208,196,46,230,199,178,40,166,219,
+58,165,106,156,13,182,192,153,149,192,156,66,229,39,116,201,61,29,68,185,115,95,169,188,107,54,176,115,36,209,145,207,223,188,94,75,2,74,143,74,59,32,198,149,66,182,15,228,11,155,195,102,85,231,148,254,99,195,70,161,215,186,77,90,243,72,148,229,0,59,121,149,89,151,183,122,208,161,52,74,230,61,252,79,83,164,91,223,250,83,103,119,115,239,72,138,67,163,179,233,85,98,33,209,207,238,8,1,199,154,133,106,131,248,15,255,236,73,1,249,197,226,18,230,124,89,110,10,40,160,9,155,127,99,79,137,5,147,153,200,210,227,159,238,235,118,211,81,50,49,106,99,183,70,57,185,125,108,136,90,39,129,201,243,63,137,235,44,49,
+
diff --git a/uppsrc/Draw/src.tpp/Font$en-us.tpp b/uppsrc/Draw/src.tpp/Font$en-us.tpp
new file mode 100644
index 000000000..f57d271b7
--- /dev/null
+++ b/uppsrc/Draw/src.tpp/Font$en-us.tpp
@@ -0,0 +1,13 @@
+TITLE("Font")
+COMPRESSED
+120,156,189,90,9,115,219,182,18,254,43,232,180,205,200,142,236,240,180,100,169,237,196,241,209,106,154,216,25,31,233,235,120,44,11,34,33,11,45,69,234,17,144,28,191,76,242,219,187,0,72,10,148,120,72,178,251,236,177,69,145,216,19,187,223,98,1,222,90,232,135,31,140,166,241,189,81,243,211,57,33,35,60,11,248,221,45,117,156,118,23,91,110,247,239,223,47,14,187,187,111,27,7,206,142,224,98,2,23,187,101,218,109,215,54,29,235,0,254,153,182,105,185,150,237,152,109,235,208,105,219,118,219,232,120,1,102,236,238,54,176,218,237,174,32,178,128,200,106,185,150,217,114,218,78,219,180,91,109,11,104,45,195,176,140,150,229,154,142,221,182,220,142,79,152,119,119,139,219,118,119,247,242,0,136,108,33,9,152,27,230,129,229,180,28,203,176,13,203,1,81,102,187,237,152,45,183,109,31,30,28,116,60,60,229,52,10,19,89,212,52,45,179,59,52,91,93,208,249,219,183,111,251,166,99,40,13,28,96,102,26,14,168,106,194,61,195,177,90,166,123,104,28,186,109,179,
+109,216,192,220,109,25,110,103,138,99,60,41,55,221,173,53,189,101,116,40,39,192,98,247,181,105,182,128,228,160,121,240,189,233,180,192,208,182,237,184,237,150,1,194,45,203,178,109,203,180,173,195,67,203,61,112,91,157,49,193,62,137,239,110,191,220,127,253,241,244,124,239,230,10,221,50,179,251,123,103,0,191,103,81,200,197,167,244,104,7,221,254,104,24,123,134,241,182,97,236,27,251,150,235,238,160,196,213,234,62,186,79,175,222,26,72,144,46,30,116,22,143,22,196,211,152,206,49,39,171,228,125,33,243,136,49,250,16,126,194,193,140,92,63,77,201,121,212,71,43,183,50,210,159,202,36,55,81,198,244,236,226,252,122,112,255,169,143,146,139,162,49,66,240,135,104,78,240,48,32,125,148,94,213,139,249,229,254,151,187,87,119,183,204,234,202,251,136,50,132,145,23,133,94,76,56,81,94,66,124,140,57,18,97,22,211,33,17,95,9,194,211,41,129,89,15,61,130,162,17,226,228,51,223,71,61,73,157,138,110,162,49,102,200,131,73,154,2,191,233,19,138,166,36,198,34,
+232,16,14,125,49,82,186,67,200,154,147,152,83,32,65,143,148,143,81,76,189,241,96,79,61,196,67,26,80,78,9,219,79,116,76,62,148,40,198,163,152,134,15,136,17,224,128,3,132,57,7,13,103,92,232,24,101,10,75,125,149,134,215,99,33,47,142,9,155,70,161,47,73,159,24,4,30,26,37,166,11,142,4,148,11,37,209,40,138,39,194,188,17,6,51,105,232,147,207,104,176,135,8,246,198,57,58,97,39,155,18,143,142,168,151,12,155,11,237,165,188,24,140,128,63,22,77,8,132,13,241,201,136,134,82,2,12,3,61,65,4,104,52,153,128,87,4,47,214,17,6,26,210,78,244,229,139,229,30,186,157,150,99,184,63,65,196,119,251,72,216,30,24,221,221,52,158,145,10,243,206,213,245,137,8,141,187,187,78,231,231,116,16,186,226,224,103,28,251,232,215,155,158,82,52,21,62,124,66,211,0,115,97,222,62,58,198,33,2,39,225,128,147,88,61,59,137,241,163,96,74,248,21,247,133,132,125,224,91,46,252,242,226,195,209,121,137,104,70,98,58,146,194,171,121,28,
+93,246,142,222,151,241,192,33,27,236,173,203,233,248,226,230,178,119,122,89,194,11,252,28,177,41,76,167,191,6,171,171,63,63,188,187,40,213,234,105,50,140,130,132,203,215,175,249,240,188,134,104,67,19,2,209,232,169,41,86,169,21,50,46,51,198,83,46,143,134,28,167,243,209,11,71,145,160,24,71,43,209,39,104,229,99,21,84,66,132,187,132,114,201,252,119,80,209,195,95,9,63,3,139,143,163,25,124,111,12,118,50,52,132,104,135,124,244,80,1,192,81,29,2,53,232,208,121,101,3,26,59,41,130,92,18,62,139,67,133,16,225,108,50,36,113,154,62,131,189,16,79,32,222,241,28,211,64,192,195,254,34,208,203,52,62,7,138,65,3,84,169,208,89,226,222,21,23,48,208,71,234,179,74,113,193,114,161,247,218,134,219,42,95,179,39,197,6,3,239,12,45,146,145,187,25,105,149,189,103,48,36,213,174,39,70,15,26,128,138,140,3,122,226,120,176,251,188,41,91,97,94,105,191,148,91,192,71,27,1,58,45,6,12,118,53,39,133,186,119,51,31,9,5,148,135,
+52,28,205,194,66,115,148,36,95,35,46,68,50,172,21,23,254,99,20,251,125,36,63,170,162,66,48,252,183,162,130,134,34,143,147,186,55,140,102,188,36,62,144,40,150,209,100,72,67,53,22,28,36,174,227,39,52,10,240,195,74,93,104,183,160,46,152,118,86,23,10,224,235,172,247,159,211,147,143,189,235,227,223,82,8,51,84,141,31,236,169,137,96,26,28,166,72,88,4,131,199,71,239,79,143,222,189,63,45,101,51,138,9,9,158,16,243,176,76,109,212,160,178,152,2,142,205,137,7,21,21,41,23,52,17,217,127,128,162,24,207,8,135,69,208,78,149,76,9,189,215,127,126,92,22,42,2,84,160,38,75,0,152,73,84,133,133,160,112,88,64,56,20,49,86,193,247,248,226,195,199,139,171,211,19,141,235,205,224,245,224,53,154,49,146,20,113,88,71,120,145,79,196,10,2,230,99,26,49,130,38,20,150,111,176,88,120,15,83,19,202,4,192,158,16,36,128,91,205,153,120,74,62,83,198,197,197,98,64,90,25,86,18,62,155,154,14,68,97,69,168,11,188,150,41,217,
+209,162,49,181,73,139,74,185,214,46,10,237,252,128,198,78,54,36,201,244,52,71,115,153,41,107,126,117,30,254,70,232,195,152,63,75,61,197,98,77,5,245,148,26,75,66,9,33,245,138,254,65,125,62,126,150,158,146,195,70,106,74,45,31,5,89,170,36,130,36,48,228,74,192,87,141,162,122,188,118,17,44,87,95,47,128,74,185,124,21,44,141,12,189,20,110,224,252,69,49,151,107,106,181,128,157,193,146,90,91,224,172,141,225,53,102,41,252,86,202,229,64,188,212,40,29,201,107,140,186,18,38,0,232,106,148,141,228,186,177,179,83,101,194,90,186,167,171,182,68,253,244,107,185,5,27,168,174,207,71,52,252,11,48,22,90,139,104,78,101,71,35,64,43,16,189,91,65,229,17,145,152,44,75,43,215,35,18,121,242,5,54,51,170,159,239,31,7,175,114,139,13,13,114,54,170,164,225,106,21,133,254,99,121,217,80,165,116,138,72,219,168,157,135,162,151,83,92,118,135,10,173,64,47,52,165,159,73,192,222,248,17,103,149,1,150,96,214,54,150,228,192,234,101,13,81,
+136,133,110,160,32,22,64,217,70,6,190,139,2,63,215,138,172,103,156,32,91,238,58,150,89,159,71,91,50,87,132,117,236,21,243,97,20,5,207,212,190,96,102,4,215,194,169,25,46,77,205,10,32,113,28,80,111,11,155,21,97,189,75,183,22,144,146,214,137,72,5,108,229,216,101,17,47,233,218,27,128,157,56,128,46,125,11,227,51,218,122,7,63,71,140,70,93,39,72,19,179,149,167,11,4,189,164,179,197,202,229,111,2,149,106,11,47,100,180,245,206,126,142,24,141,186,78,144,38,102,43,103,23,8,122,142,179,1,207,211,27,18,215,1,192,103,33,19,87,208,70,249,111,168,76,162,55,51,152,97,49,193,111,88,42,29,154,68,159,64,39,83,1,231,231,81,120,20,114,122,20,80,204,200,118,216,171,51,168,159,193,23,16,184,169,200,188,192,173,38,180,76,228,51,103,85,204,230,155,100,42,195,40,28,236,97,16,2,255,149,24,185,125,32,118,162,101,67,238,83,15,203,237,113,177,163,175,141,147,91,225,227,104,22,248,192,130,139,205,201,153,160,125,28,19,40,
+234,208,110,203,190,54,93,9,84,174,141,89,90,126,75,251,45,221,182,130,101,48,211,235,100,213,66,120,85,244,162,76,109,45,60,95,75,54,19,159,3,241,173,53,88,193,216,205,148,200,129,219,214,74,172,96,79,77,71,146,222,188,38,12,162,16,194,6,98,37,94,1,150,120,9,89,196,89,147,199,233,156,164,232,162,105,90,108,221,106,226,111,109,98,113,54,214,216,41,246,174,16,29,45,165,178,102,200,90,118,44,250,122,201,124,209,193,15,94,109,213,113,213,238,106,151,236,234,86,109,158,235,82,202,118,118,243,29,26,143,244,93,77,181,153,139,122,35,181,47,78,153,4,150,57,196,130,175,237,33,52,179,67,71,128,47,193,225,124,22,4,85,248,162,14,17,163,88,76,253,90,61,184,214,127,151,71,67,202,21,208,127,189,56,72,59,112,156,28,109,38,123,102,162,57,26,205,2,97,8,163,208,134,211,209,147,48,91,245,224,18,76,229,49,91,110,183,80,58,64,30,237,84,246,228,121,195,101,107,248,47,219,158,89,94,177,65,166,181,141,234,209,102,14,107,170,
+19,223,164,69,246,198,56,124,128,108,90,10,164,202,35,129,43,240,38,196,212,255,4,230,170,96,38,120,146,75,35,205,63,243,136,22,159,3,100,92,86,179,168,191,96,43,115,132,136,55,29,10,115,132,21,37,72,194,87,107,163,229,84,163,134,118,22,178,56,119,198,108,121,127,173,178,141,206,98,226,103,248,109,100,79,182,197,68,157,93,73,44,108,18,90,54,26,173,17,27,165,54,125,247,162,54,125,247,127,52,9,38,254,56,154,76,113,44,166,253,49,202,31,254,86,38,185,216,21,199,108,44,223,125,120,225,221,209,140,239,134,8,183,216,199,2,6,218,17,116,233,250,79,32,248,243,10,51,48,216,176,28,167,69,164,174,122,100,215,122,199,176,252,70,204,226,56,187,23,82,158,230,175,20,1,200,148,28,181,55,179,221,47,5,94,77,64,246,220,11,40,162,218,229,214,4,53,10,9,68,111,230,119,252,86,20,43,168,236,101,187,121,35,125,35,182,185,254,121,177,157,216,179,138,101,186,51,70,137,51,52,152,150,2,19,64,19,239,247,104,143,18,142,235,249,33,
+91,17,137,185,36,113,30,202,215,112,72,213,82,71,177,236,35,245,169,193,120,201,142,231,218,139,17,184,174,205,89,13,140,238,55,73,196,99,245,126,148,82,43,141,66,113,253,41,41,36,73,236,139,215,166,212,189,202,154,81,224,105,165,250,75,58,90,114,236,163,156,153,75,213,242,191,171,17,150,179,84,89,151,152,170,31,72,222,253,3,118,76,35,136,
+
diff --git a/uppsrc/Draw/src.tpp/FontInfo$en-us.tpp b/uppsrc/Draw/src.tpp/FontInfo$en-us.tpp
new file mode 100644
index 000000000..6f3a42e42
--- /dev/null
+++ b/uppsrc/Draw/src.tpp/FontInfo$en-us.tpp
@@ -0,0 +1,9 @@
+TITLE("FontInfo")
+COMPRESSED
+120,156,181,88,13,79,219,56,24,254,43,150,182,161,150,65,101,59,73,147,182,183,19,211,177,221,161,109,220,4,59,221,73,85,161,110,226,180,214,242,181,216,45,160,211,237,183,223,107,167,105,27,40,109,104,1,16,202,135,223,199,239,243,126,199,125,138,94,191,198,71,248,21,222,242,211,61,229,33,155,70,106,208,23,182,237,245,24,117,122,223,63,253,217,233,29,158,52,218,118,83,163,16,64,177,92,98,121,142,69,108,218,134,127,196,34,212,161,150,77,60,218,177,61,203,242,112,215,143,152,148,131,126,68,61,175,167,133,40,8,81,215,161,196,181,61,219,35,150,235,81,144,165,24,83,236,82,135,216,150,71,157,110,192,165,63,232,51,207,234,29,94,180,65,200,210,59,1,56,38,109,106,187,54,197,22,166,54,108,69,60,207,38,174,227,89,157,118,187,235,179,76,137,52,153,239,37,8,161,164,55,34,110,15,116,254,249,243,103,139,216,184,208,192,6,48,130,109,80,149,192,51,108,83,151,56,29,220,113,60,226,97,11,192,29,23,59,221,140,229,44,126,156,186,179,149,
+186,139,187,66,113,128,56,124,75,136,11,34,237,163,246,43,98,187,64,212,179,108,199,115,49,108,78,41,181,44,74,44,218,233,80,167,237,184,221,9,103,1,207,7,253,127,175,255,123,243,225,252,248,175,75,212,151,164,247,169,59,132,223,143,105,162,206,146,48,213,215,198,170,93,212,127,131,241,49,198,39,13,220,194,45,234,56,77,52,55,119,241,28,93,151,87,39,24,149,226,203,151,221,229,235,37,64,150,139,25,83,252,33,196,149,222,247,75,58,227,108,20,241,43,84,94,45,22,254,178,105,175,95,175,7,7,131,190,164,61,244,53,79,103,2,252,139,20,191,85,40,230,42,23,190,68,97,154,163,177,152,241,196,136,182,208,183,137,144,8,254,114,176,199,240,56,77,162,187,130,25,186,17,106,130,124,48,83,134,2,206,51,228,167,217,29,74,51,158,51,237,123,137,26,34,81,60,79,88,4,18,83,201,53,66,200,115,158,248,28,150,78,19,37,146,49,98,73,128,126,76,193,59,240,40,206,34,225,3,223,0,201,59,9,254,66,105,136,228,132,229,229,58,159,249,19,
+184,110,182,180,250,206,26,79,100,42,239,94,221,127,120,202,20,187,66,143,137,252,206,213,123,233,243,68,13,27,195,166,15,90,171,238,138,3,74,147,1,145,165,123,32,236,42,206,92,64,84,151,52,154,139,69,200,0,151,86,191,224,106,154,131,121,212,4,72,3,61,230,131,149,144,207,163,8,129,27,56,16,101,35,112,168,121,63,98,146,71,34,225,134,50,238,109,162,113,202,247,231,49,199,120,54,34,35,30,165,55,79,37,242,225,182,136,154,189,152,148,32,59,80,97,65,32,116,0,179,8,201,140,249,218,17,76,65,86,36,10,233,90,152,11,83,218,32,152,33,98,99,96,9,82,41,232,35,121,174,128,176,186,225,144,57,234,38,69,154,174,212,49,172,179,171,133,46,88,206,139,68,8,106,24,225,44,121,6,35,148,32,59,24,33,78,165,2,109,195,156,243,185,21,128,33,212,138,101,180,163,25,139,166,252,169,188,254,224,98,60,217,47,72,11,136,39,114,90,168,221,104,162,225,219,149,88,215,247,199,134,242,196,224,26,135,193,157,246,222,194,121,219,121,125,134,
+229,207,192,109,9,243,116,126,133,220,130,95,153,1,141,102,13,245,223,207,248,223,34,80,147,253,170,224,28,100,151,156,155,65,215,24,115,104,41,32,175,205,190,168,39,53,148,255,194,110,247,87,190,4,217,37,87,216,173,136,161,90,236,164,252,92,115,80,111,15,229,215,105,62,168,33,108,33,191,250,170,14,93,149,42,32,203,130,25,211,157,220,12,1,171,156,75,165,15,13,58,106,64,191,79,3,232,233,34,65,211,68,232,235,173,1,89,204,16,105,62,236,15,7,123,153,102,21,232,37,205,115,201,98,136,97,185,112,69,163,98,131,58,9,248,153,135,234,82,215,217,125,67,97,1,244,146,124,79,77,31,28,241,34,32,160,254,155,137,79,135,65,4,219,35,211,40,42,49,97,134,2,61,195,233,247,186,183,32,232,26,12,101,76,143,136,129,25,57,31,9,160,22,58,231,99,128,135,129,200,52,28,24,83,153,9,68,232,201,75,145,98,222,144,247,118,60,66,89,42,197,122,89,80,60,231,122,172,101,213,254,102,134,25,173,109,146,42,211,212,138,121,56,186,203,38,
+53,220,120,161,75,240,179,248,113,137,244,162,129,43,98,17,177,92,79,48,171,177,99,56,27,215,154,150,200,131,241,26,127,214,48,199,39,232,64,48,177,23,182,56,218,207,32,115,172,221,172,65,170,239,142,80,77,57,250,180,242,248,189,208,17,230,196,16,26,185,169,121,15,230,198,210,180,171,81,78,6,149,91,58,208,153,177,181,123,156,201,143,226,150,7,95,133,242,55,247,190,81,154,70,143,219,118,21,166,102,247,251,150,67,50,137,176,32,7,57,20,167,73,58,60,54,121,180,117,8,60,147,151,62,139,204,247,234,94,74,47,80,118,212,89,143,182,48,183,202,18,166,70,56,235,219,77,58,47,190,61,175,10,93,244,229,198,152,126,184,160,214,192,161,197,138,218,4,121,155,142,20,84,81,120,14,156,74,125,107,114,121,134,129,117,9,179,3,15,227,138,249,216,29,230,105,92,147,28,66,53,232,137,136,159,67,87,222,234,174,75,165,207,23,230,14,43,110,54,19,158,3,215,164,251,15,33,40,131,246,8,89,31,67,163,225,190,8,133,223,170,88,33,99,48,65,
+1,215,16,144,139,113,234,126,205,216,230,206,202,125,195,236,95,121,116,48,108,46,207,167,214,156,8,53,150,100,150,135,87,134,197,131,147,167,117,226,195,131,213,154,25,46,158,55,75,35,252,166,15,134,12,96,62,245,97,28,67,13,115,106,84,127,14,124,183,141,85,229,212,231,106,179,138,43,99,225,187,93,76,240,148,189,214,154,227,189,148,98,156,196,250,27,186,212,164,174,69,170,158,222,230,214,21,7,204,109,47,17,143,51,117,247,160,80,12,254,7,99,121,167,180,
+
diff --git a/uppsrc/Draw/src.tpp/Image$en-us.tpp b/uppsrc/Draw/src.tpp/Image$en-us.tpp
new file mode 100644
index 000000000..9a4cac418
--- /dev/null
+++ b/uppsrc/Draw/src.tpp/Image$en-us.tpp
@@ -0,0 +1,16 @@
+TITLE("Image and ImageBuffer")
+COMPRESSED
+120,156,229,27,11,111,219,54,243,175,240,195,182,194,201,28,127,122,249,17,123,43,150,62,208,5,93,211,124,77,186,97,8,226,90,145,233,152,168,44,106,162,28,55,29,154,223,190,59,82,111,203,178,228,100,93,134,47,45,98,69,36,143,247,230,241,238,124,97,144,111,191,213,218,218,55,218,150,159,225,11,58,179,151,110,120,121,193,44,107,48,178,141,238,232,227,235,183,135,163,253,159,90,61,107,15,161,232,0,197,236,235,230,160,107,234,150,209,131,95,186,169,27,93,195,180,244,129,113,104,13,76,115,160,13,29,215,22,226,242,194,53,6,131,17,46,50,218,198,55,70,191,107,232,125,107,96,13,116,179,63,48,96,173,161,105,134,214,55,186,186,101,14,140,238,112,74,133,115,121,97,15,204,209,254,187,30,44,50,113,39,0,174,233,61,195,234,91,134,102,106,134,5,91,233,131,129,165,247,187,3,243,176,215,27,58,182,31,50,238,69,123,49,93,55,244,209,149,222,31,1,206,119,119,119,29,221,210,20,6,22,0,211,53,11,80,213,225,157,102,25,125,189,123,168,29,
+118,7,250,64,51,1,120,183,175,117,135,190,29,216,139,205,164,119,183,146,222,215,134,44,164,0,98,255,123,93,239,195,146,94,187,247,141,110,245,129,208,129,105,117,7,125,13,54,55,12,195,52,13,221,52,14,15,141,110,175,219,31,206,169,61,165,193,229,197,159,31,190,124,247,242,228,224,253,25,185,16,230,136,28,47,236,107,74,108,111,170,158,158,45,103,51,26,60,185,188,16,250,232,245,112,2,255,228,107,124,144,236,30,146,139,239,52,237,64,211,126,106,105,29,173,99,116,187,123,36,146,131,122,79,62,196,79,63,105,10,100,58,50,76,199,210,213,254,242,202,101,206,250,242,49,238,121,36,4,187,246,126,181,221,37,61,191,245,233,9,31,147,181,87,201,210,31,54,111,221,38,201,144,73,244,174,86,50,32,247,123,195,111,168,125,229,210,49,137,159,82,232,27,129,63,253,240,244,195,37,178,204,136,217,25,80,63,160,130,122,161,0,206,18,182,88,44,67,132,5,79,56,122,131,184,119,162,169,14,76,184,162,100,202,2,234,132,238,45,241,109,230,133,116,74,66,
+78,94,4,246,170,67,206,57,113,2,106,135,148,240,128,56,115,219,131,69,114,105,155,44,5,37,23,227,68,72,74,118,227,172,32,47,59,57,188,230,182,32,46,95,77,14,28,46,66,226,112,79,132,182,23,146,144,45,0,3,74,125,120,229,223,2,102,33,97,130,44,34,14,72,229,120,199,156,249,228,64,114,29,38,45,124,59,100,56,20,130,4,226,45,222,79,190,159,124,79,232,39,31,8,17,196,103,159,168,43,144,12,160,142,121,4,24,178,0,147,103,190,203,128,58,219,245,231,54,153,241,96,97,135,114,189,54,34,248,209,45,42,29,247,105,96,135,60,152,220,77,90,147,61,137,241,48,163,60,177,8,228,64,170,92,96,74,5,69,122,247,234,217,209,88,13,224,99,126,234,100,63,171,57,233,150,249,89,173,189,100,86,180,159,194,120,29,157,12,144,13,56,237,142,176,6,216,214,193,11,4,242,142,134,203,192,3,21,36,62,71,165,10,80,26,74,17,148,116,234,113,254,98,114,57,105,193,250,175,205,126,216,183,64,104,66,38,96,179,97,55,48,111,150,31,106,
+196,157,112,78,201,140,5,96,28,146,67,168,184,248,202,101,30,141,137,221,151,91,84,178,238,21,13,207,216,103,90,165,177,146,43,56,41,226,10,62,110,34,73,35,17,192,134,114,71,204,167,96,218,158,128,179,139,240,153,146,253,54,204,127,99,211,112,94,105,108,21,220,151,168,74,8,53,113,61,179,193,245,128,87,138,40,108,237,117,156,79,219,48,252,153,178,235,121,120,47,20,21,136,221,113,188,221,134,227,47,212,187,190,39,27,21,136,154,56,158,44,23,87,160,194,32,228,200,241,130,230,42,83,159,28,36,50,105,161,173,165,228,3,33,219,56,205,195,51,159,87,178,90,42,242,41,90,80,164,201,242,185,154,249,10,234,14,218,28,80,56,211,168,231,80,101,179,219,208,127,193,67,241,160,70,136,0,107,162,13,179,21,206,254,252,86,48,199,118,137,0,232,169,21,146,227,89,97,8,142,92,143,135,68,208,176,13,132,42,162,165,190,105,109,162,109,21,213,107,230,77,239,165,110,8,96,7,145,124,132,101,72,21,83,84,157,209,173,33,9,30,251,16,109,132,54,
+115,183,122,81,26,48,219,61,174,36,76,110,6,196,245,172,72,138,242,185,218,151,70,96,119,32,119,233,177,63,150,16,122,193,33,69,108,31,130,25,199,198,155,1,9,150,94,155,176,41,132,124,108,198,148,33,70,114,62,114,93,245,40,200,138,133,115,9,69,160,71,17,18,11,88,20,199,128,184,41,128,8,32,62,162,127,44,97,168,21,206,65,41,224,63,4,122,179,165,43,25,231,216,206,156,121,215,138,223,162,90,45,142,5,186,174,73,75,82,147,142,60,169,208,146,43,206,221,205,188,83,0,55,157,202,91,163,0,185,125,36,165,92,8,29,197,1,79,114,199,248,226,186,222,65,158,117,207,145,96,209,209,253,56,249,17,97,116,114,175,235,69,60,176,244,1,153,150,5,251,152,88,247,181,233,255,207,227,34,31,52,231,156,10,112,210,171,57,5,155,132,240,111,197,99,67,181,3,26,155,32,152,28,122,101,249,215,94,135,188,136,227,41,209,38,115,56,25,15,4,156,100,109,50,229,242,170,135,23,27,55,62,129,17,136,188,42,129,65,119,200,9,135,27,92,56,
+183,67,233,0,212,123,38,192,115,68,198,47,224,94,182,245,56,182,197,92,94,193,182,250,195,233,138,7,211,136,95,242,185,250,64,142,225,238,224,16,225,74,9,23,67,121,165,149,254,137,165,94,47,226,3,208,122,5,241,243,20,29,51,151,243,213,13,152,180,128,117,232,48,129,103,183,146,254,106,243,60,231,103,97,0,174,111,251,137,46,167,197,103,186,252,99,51,249,49,212,29,72,191,178,225,244,142,162,44,230,169,203,44,106,6,58,35,5,180,146,30,229,149,212,61,65,97,77,237,5,218,89,89,142,229,134,179,68,134,57,252,19,40,201,104,235,178,192,12,0,59,38,234,51,153,148,183,152,52,123,179,151,120,213,24,174,168,113,109,120,238,82,59,64,185,52,66,93,174,74,209,78,182,86,25,30,153,58,161,11,63,188,173,129,64,198,117,149,56,174,33,89,247,37,133,28,78,150,31,89,151,189,206,213,108,226,43,235,182,74,61,86,197,46,57,63,69,74,136,231,210,43,53,163,189,16,120,61,56,241,213,145,221,14,100,70,73,48,153,224,154,38,151,22,5,175,
+147,253,3,195,32,212,6,204,30,93,221,18,25,25,41,76,193,228,182,68,65,39,75,215,61,150,185,46,167,210,117,110,141,126,178,128,106,58,12,60,99,146,35,38,205,194,121,220,251,76,3,158,222,207,183,144,240,18,13,225,94,184,75,8,13,111,188,121,138,235,105,33,60,111,61,163,50,90,150,183,26,185,114,12,195,77,142,163,231,220,187,161,65,24,43,19,28,50,114,117,37,186,233,31,57,175,85,76,237,70,78,169,59,218,60,163,161,95,64,134,162,221,168,207,140,201,236,101,200,17,97,176,196,36,106,93,247,151,161,38,241,126,74,8,79,42,169,107,136,187,146,78,94,54,197,147,36,112,214,141,189,32,160,89,192,23,205,68,84,225,210,239,67,212,218,218,26,142,235,57,247,111,21,60,20,17,15,106,107,89,230,113,127,178,135,106,87,143,138,181,42,74,43,147,0,54,201,204,75,113,108,237,37,104,158,163,127,156,45,61,71,222,78,33,194,226,171,212,60,178,245,134,132,20,240,171,82,48,153,108,104,178,94,165,35,240,218,137,113,79,116,177,149,91,72,200,
+224,137,23,44,12,113,28,163,93,15,38,9,38,3,107,15,94,128,167,135,129,227,133,27,149,63,226,178,131,140,147,236,224,122,185,192,66,73,99,62,150,156,112,155,185,184,203,185,117,181,46,252,247,130,126,149,35,107,114,87,238,159,72,166,38,177,193,85,1,150,47,104,153,114,38,31,38,196,130,112,85,177,131,41,113,150,129,224,129,200,207,138,232,195,162,30,202,42,180,25,156,211,130,130,5,99,166,42,94,186,224,88,125,82,0,146,107,147,192,241,16,130,226,5,149,233,200,5,28,123,124,42,134,10,114,54,0,129,55,228,207,63,77,248,25,198,191,172,153,54,186,134,253,113,160,55,232,106,67,83,239,106,79,141,190,5,175,16,175,152,208,163,32,224,171,203,203,225,144,20,129,198,239,146,169,191,217,44,172,55,243,248,25,70,199,181,166,158,240,122,243,48,119,7,215,160,242,201,95,190,200,215,64,106,95,55,14,135,198,160,175,151,144,138,32,126,230,193,231,250,27,254,10,126,182,254,236,115,238,255,66,103,205,22,52,154,252,78,166,217,183,112,160,119,216,237,
+13,77,205,178,54,112,160,25,138,21,91,150,77,127,198,195,144,47,154,109,161,214,52,157,95,205,139,47,95,74,141,164,244,13,89,171,207,71,206,112,24,87,233,85,168,193,241,176,26,39,241,255,120,83,205,126,60,206,28,244,227,216,179,228,157,35,206,25,102,103,101,42,248,1,187,1,95,88,6,141,40,28,114,213,241,200,57,102,107,228,100,21,48,85,33,79,106,22,112,249,179,131,192,190,197,76,42,150,12,227,146,101,14,70,154,56,197,248,66,85,205,227,251,120,92,232,246,214,42,221,171,57,131,157,92,206,229,193,196,66,229,230,0,19,153,193,185,97,14,37,0,78,216,237,124,137,126,125,151,8,11,251,218,150,219,173,193,139,43,227,105,24,36,119,137,115,195,228,191,165,196,160,100,48,137,44,247,225,112,124,44,176,58,48,13,236,21,102,20,200,41,135,97,100,85,60,209,137,179,14,1,77,247,3,179,50,14,117,115,216,215,6,253,31,176,105,229,105,207,66,173,132,97,87,27,237,147,227,55,71,175,94,78,62,188,63,121,125,242,246,183,19,165,148,48,212,
+179,48,116,136,27,21,100,110,31,211,207,222,71,143,175,188,78,50,45,3,225,229,155,211,243,223,55,172,103,113,4,219,194,180,152,170,249,203,212,143,74,142,105,123,165,16,143,126,57,253,249,104,3,68,188,58,229,224,76,217,76,150,132,66,21,188,128,62,74,33,106,165,144,223,28,157,189,174,11,88,195,118,11,4,199,61,247,182,20,218,219,211,163,255,189,127,89,9,175,64,52,128,235,68,134,158,106,69,154,24,100,37,21,149,12,251,219,170,55,4,117,44,224,203,16,75,210,83,10,145,218,2,158,4,168,29,177,151,224,101,240,248,149,9,53,136,56,4,168,148,140,218,226,140,36,0,22,16,22,208,184,154,38,150,110,81,73,79,213,212,100,127,20,20,15,174,109,15,148,80,70,59,130,45,124,87,90,3,160,128,41,210,211,183,47,148,169,182,115,165,243,43,42,227,69,238,79,14,92,240,174,133,109,30,188,89,36,245,128,103,113,49,76,246,44,52,76,166,229,202,96,165,119,137,76,29,45,215,118,240,177,44,135,22,150,22,201,126,231,75,105,237,24,65,201,168,
+16,8,183,17,169,84,132,82,180,78,101,160,152,82,252,88,202,127,88,187,68,189,139,216,88,71,86,192,134,251,161,30,67,168,155,217,128,233,202,50,51,135,10,242,63,49,165,200,55,127,172,71,0,86,151,238,77,67,6,72,77,50,142,103,138,243,121,134,163,179,80,89,67,240,39,94,193,199,167,69,101,22,182,213,180,21,195,16,30,152,33,18,54,86,148,200,114,22,150,118,6,12,163,242,127,115,83,43,244,1,20,110,107,170,167,32,223,78,144,51,56,191,194,224,138,141,2,234,178,42,159,229,169,212,129,131,20,172,111,138,87,150,164,140,163,46,172,199,137,219,141,198,213,77,39,186,22,215,83,137,127,107,223,68,78,196,81,247,196,80,181,72,52,23,111,182,89,162,88,148,192,158,139,92,187,69,78,178,226,115,133,104,185,108,197,133,115,167,208,61,225,201,34,92,61,249,252,147,141,33,89,185,148,211,210,33,81,127,116,84,39,99,181,250,64,242,62,233,177,181,159,165,17,69,61,2,30,113,23,90,222,210,31,115,47,90,14,211,175,221,145,150,85,3,175,164,
+59,45,140,99,229,78,41,251,163,78,181,38,68,150,116,172,230,139,95,178,11,53,215,128,74,62,100,146,169,229,189,167,141,130,64,86,112,92,245,49,253,155,122,107,183,211,247,47,234,173,45,97,224,93,46,63,218,80,202,119,169,140,235,137,43,130,62,217,47,86,141,146,106,86,110,219,201,126,77,184,127,103,115,123,214,134,39,251,77,155,219,43,241,38,73,93,38,229,74,141,146,223,6,252,42,233,132,229,106,143,134,222,167,82,3,193,31,101,188,16,217,174,118,207,101,210,95,89,108,187,121,204,171,150,239,228,88,156,79,201,235,204,119,89,106,172,75,74,190,213,30,41,166,108,199,112,111,19,101,187,70,123,10,30,138,207,163,171,232,114,9,210,18,62,117,84,106,76,197,73,234,251,40,153,99,5,147,37,83,58,195,118,163,14,57,13,232,13,131,224,61,73,239,197,137,183,180,60,227,114,81,39,26,254,167,234,239,201,153,27,55,52,106,53,144,125,216,102,28,249,94,68,77,107,146,141,120,145,92,240,27,204,238,100,187,221,212,109,52,140,139,132,185,110,103,52,
+190,70,33,108,105,79,75,227,222,168,122,157,44,77,155,116,154,160,92,86,164,124,48,196,31,168,5,199,79,50,126,217,83,24,86,20,242,220,157,181,113,48,32,7,213,3,239,201,32,126,149,235,181,103,210,219,230,138,157,109,172,17,224,237,211,102,83,217,37,184,233,75,104,219,203,163,41,195,139,175,202,26,57,10,92,105,109,105,178,136,8,221,97,239,178,19,97,3,14,143,200,235,175,179,176,196,253,111,33,99,103,23,159,74,32,235,148,155,122,249,93,244,164,220,161,212,161,243,33,29,198,102,188,42,90,27,54,42,83,249,248,255,165,27,136,95,224,247,103,119,20,49,46,141,196,140,143,27,248,185,42,209,234,40,112,201,170,180,172,76,37,176,58,233,227,223,206,57,163,208,250,65,46,255,2,215,147,232,107,
+
diff --git a/uppsrc/Draw/src.tpp/Iml$en-us.tpp b/uppsrc/Draw/src.tpp/Iml$en-us.tpp
new file mode 100644
index 000000000..e3ea2a6d0
--- /dev/null
+++ b/uppsrc/Draw/src.tpp/Iml$en-us.tpp
@@ -0,0 +1,7 @@
+TITLE("Iml and image list class methods")
+COMPRESSED
+120,156,181,86,109,111,155,72,16,254,43,35,165,141,32,231,160,221,5,12,134,47,145,122,47,138,42,93,165,186,247,9,145,122,131,215,246,94,49,228,96,237,180,58,93,126,251,13,11,216,198,6,167,201,245,18,41,235,236,238,60,243,60,51,179,51,142,24,188,121,67,70,228,130,60,243,19,252,44,22,124,147,170,56,146,142,227,135,156,185,225,151,247,31,38,225,213,141,49,118,204,10,133,34,138,237,81,219,119,109,234,176,49,254,161,54,101,46,179,29,234,179,137,227,219,182,79,130,36,229,101,25,71,41,243,253,176,50,98,35,118,193,60,151,81,207,241,29,159,218,158,207,208,150,17,194,136,199,92,234,216,62,115,131,185,40,147,56,226,190,29,94,125,28,163,145,93,121,66,112,66,199,204,241,28,70,108,194,28,116,69,125,223,161,158,235,219,147,241,56,72,248,131,146,121,214,248,146,148,50,26,222,83,47,68,206,79,79,79,22,117,72,205,192,65,48,74,28,164,74,113,143,56,204,163,238,132,76,92,159,250,196,70,112,215,35,110,240,192,11,190,30,150,238,62,43,
+221,35,129,84,2,33,174,126,162,212,67,147,241,104,124,65,29,15,133,250,182,227,250,30,65,231,140,49,219,102,212,102,147,9,115,199,174,23,172,4,159,139,34,142,254,254,252,207,219,95,126,191,254,99,10,81,105,135,112,187,78,129,103,115,144,107,190,20,144,202,82,129,142,43,172,133,90,229,243,242,50,142,74,18,66,181,208,240,125,48,195,95,52,169,22,125,45,184,33,16,189,37,228,154,144,27,131,88,196,98,174,107,66,147,153,118,31,149,193,231,246,223,202,99,92,193,177,16,166,50,91,166,2,150,105,126,207,83,144,89,169,120,150,8,200,23,154,86,205,67,150,128,75,158,72,174,196,28,30,165,90,129,224,201,234,148,240,227,74,226,118,33,30,10,81,138,76,149,144,228,153,194,15,21,156,37,17,111,33,209,23,230,95,46,51,68,186,255,214,64,52,59,133,5,239,52,206,67,145,111,37,110,2,47,10,254,109,118,157,202,47,2,120,146,8,60,83,57,168,85,227,85,179,68,128,210,130,79,57,94,248,107,35,11,161,137,239,132,44,242,2,48,221,74,38,155,
+148,23,39,148,71,144,240,20,175,35,215,189,222,58,238,214,65,220,221,110,220,63,162,60,53,51,102,102,208,19,249,109,46,231,187,72,239,98,142,73,210,86,187,19,195,108,83,160,247,203,211,104,54,74,219,24,238,194,38,179,90,245,62,108,195,76,127,19,234,93,190,201,52,89,4,42,85,112,192,180,165,34,51,53,80,41,200,186,69,232,222,48,204,125,53,105,220,189,24,181,41,178,82,51,207,54,235,123,81,236,179,84,49,111,115,119,158,243,237,124,102,32,171,131,0,223,85,39,83,85,96,185,222,65,189,246,6,89,27,239,131,28,159,230,231,64,237,129,165,13,114,183,107,246,137,193,122,204,148,92,200,3,65,192,85,75,239,170,3,96,197,103,213,245,106,211,136,119,53,240,144,178,255,67,87,191,146,51,233,249,85,102,152,29,157,244,125,78,102,151,175,173,175,10,238,168,182,142,42,171,223,244,176,32,234,163,110,85,212,123,179,203,78,40,142,60,13,21,113,197,169,142,206,67,94,202,106,238,236,115,174,219,223,82,110,69,214,137,216,60,182,118,97,205,196,146,
+43,188,1,91,158,110,176,114,22,144,229,10,59,209,38,59,215,84,166,109,97,140,118,177,213,30,171,208,190,168,207,76,255,115,161,140,160,199,172,147,140,163,60,244,22,239,81,236,215,203,211,66,252,176,21,197,99,129,163,244,92,45,246,190,170,102,25,135,141,209,217,177,137,203,167,21,118,217,238,5,156,46,85,15,93,200,166,169,234,153,118,140,22,116,18,6,56,85,112,148,192,44,8,162,70,120,122,167,199,233,236,18,162,155,122,178,26,102,216,121,103,56,16,23,162,16,213,52,194,150,94,141,153,252,254,79,145,40,61,155,234,74,58,238,253,86,175,215,232,40,137,218,163,126,63,70,116,146,40,136,250,90,166,166,169,203,213,124,61,54,36,43,94,196,48,187,58,132,170,190,75,240,53,102,79,79,82,195,180,42,99,35,106,30,135,249,2,69,187,137,99,244,3,183,231,198,16,104,159,240,22,249,246,72,80,227,181,170,179,65,111,183,173,142,65,25,167,143,160,245,247,114,111,63,202,215,112,170,94,11,246,125,53,213,171,169,91,12,166,117,216,76,11,161,191,183,
+205,161,57,135,120,189,65,230,226,107,245,28,228,225,227,120,190,136,116,83,212,18,166,103,98,63,130,65,109,157,88,52,202,214,3,194,166,251,100,141,106,242,235,239,41,244,51,28,79,115,86,254,112,178,229,43,201,214,95,95,7,222,164,62,180,154,163,248,95,62,13,49,222,
diff --git a/uppsrc/Draw/src.tpp/all.i b/uppsrc/Draw/src.tpp/all.i
new file mode 100644
index 000000000..2920d2fc2
--- /dev/null
+++ b/uppsrc/Draw/src.tpp/all.i
@@ -0,0 +1,24 @@
+TOPIC("Draw$en-us")
+#include "Draw$en-us.tpp"
+END_TOPIC
+
+TOPIC("Display$en-us")
+#include "Display$en-us.tpp"
+END_TOPIC
+
+TOPIC("Image$en-us")
+#include "Image$en-us.tpp"
+END_TOPIC
+
+TOPIC("Iml$en-us")
+#include "Iml$en-us.tpp"
+END_TOPIC
+
+TOPIC("Font$en-us")
+#include "Font$en-us.tpp"
+END_TOPIC
+
+TOPIC("FontInfo$en-us")
+#include "FontInfo$en-us.tpp"
+END_TOPIC
+
diff --git a/uppsrc/Draw/srcdoc.tpp/DrawOutput$en-us.tpp b/uppsrc/Draw/srcdoc.tpp/DrawOutput$en-us.tpp
new file mode 100644
index 000000000..2e0ababa5
--- /dev/null
+++ b/uppsrc/Draw/srcdoc.tpp/DrawOutput$en-us.tpp
@@ -0,0 +1,238 @@
+TITLE("Draw")
+COMPRESSED
+120,156,141,89,13,175,26,55,22,253,43,86,94,182,133,148,
+176,243,9,3,104,165,166,73,183,138,180,109,163,166,221,86,
+138,162,197,12,6,220,55,31,236,216,60,30,93,109,127,251,
+158,123,109,51,64,146,118,27,53,47,143,25,219,247,227,220,
+115,207,53,239,18,241,244,105,52,138,238,162,63,249,111,254,
+74,109,228,161,178,239,223,85,73,81,44,244,52,202,22,50,
+158,46,190,159,45,126,255,253,247,241,108,150,44,104,171,24,
+91,197,81,150,198,73,28,103,81,148,37,211,56,159,69,179,
+188,136,139,40,157,102,73,62,141,242,249,94,118,178,126,255,
+78,22,233,226,217,15,19,172,74,70,249,93,26,167,113,20,
+79,146,12,111,69,105,148,100,113,146,199,69,145,197,211,188,
+72,103,147,201,188,148,123,171,219,230,253,187,21,173,195,170,
+20,171,162,105,49,201,98,172,201,242,36,157,230,25,214,102,
+89,28,227,223,113,62,157,76,167,115,171,109,165,176,38,158,
+76,23,50,75,22,47,201,202,108,52,185,131,117,201,20,75,
+179,36,155,100,105,145,164,113,145,36,147,89,154,205,50,152,
+29,39,115,109,21,140,92,97,13,173,163,101,57,14,204,242,
+44,78,17,143,108,154,167,120,109,138,159,89,52,139,19,156,
+90,68,121,142,3,213,99,8,18,197,135,214,77,112,92,50,
+205,233,237,34,43,226,116,90,36,89,50,73,96,64,52,133,
+147,116,122,62,95,43,83,98,93,154,196,11,11,147,22,47,
+191,204,23,49,22,79,71,211,187,36,154,69,201,100,58,195,
+129,48,22,14,167,179,89,156,22,56,48,139,243,40,78,231,
+101,187,38,39,147,60,74,23,88,83,32,11,19,108,204,33,
+201,39,49,236,77,210,2,39,78,227,52,197,223,121,86,76,
+231,70,81,30,108,219,189,127,247,236,203,65,52,142,198,73,
+158,15,201,222,25,150,23,105,150,166,217,100,150,197,81,138,
+83,176,71,70,225,154,68,200,100,156,39,197,124,37,13,142,
+180,25,5,246,37,101,158,80,132,176,167,69,158,226,228,9,
+254,66,70,225,94,138,200,36,179,172,72,211,34,154,151,149,
+52,230,34,60,207,200,197,56,30,197,241,221,148,162,154,167,
+73,54,163,208,164,9,194,155,76,242,89,140,248,230,147,44,
+74,230,157,250,247,65,119,170,86,13,2,172,1,140,69,72,
+142,7,33,108,113,32,76,70,113,2,24,230,147,73,68,209,
+202,129,133,36,205,17,238,40,46,50,88,132,63,72,176,245,
+56,100,108,48,46,226,116,20,167,119,179,36,75,97,201,44,
+203,16,0,108,16,207,226,56,142,10,252,129,103,8,11,35,
+35,134,9,236,132,59,222,45,207,70,113,118,55,5,128,145,
+167,89,70,199,207,82,10,95,130,232,39,147,40,71,26,18,
+183,60,161,160,39,79,17,246,56,41,232,255,33,173,207,71,
+49,10,1,22,198,121,14,183,83,4,58,41,224,122,142,200,
+167,12,238,120,90,204,191,83,71,243,74,90,229,209,242,236,
+229,83,7,179,120,50,138,39,119,17,173,207,139,25,210,23,
+103,20,190,52,203,102,201,44,77,243,100,150,167,147,8,97,
+52,174,142,105,49,213,18,215,225,121,147,233,40,158,162,172,
+224,106,158,195,121,94,6,199,167,49,153,146,20,179,9,5,
+193,111,178,124,94,233,134,236,0,46,22,14,10,207,94,126,
+17,199,83,218,168,64,181,20,197,36,74,103,136,5,66,16,
+229,128,57,152,160,64,158,145,230,4,53,64,84,80,222,203,
+173,90,62,247,117,250,159,127,253,247,47,95,127,247,252,167,
+183,226,157,73,22,226,85,39,143,159,189,127,103,162,133,248,
+113,167,141,144,157,213,101,165,132,237,180,50,194,182,130,170,
+166,211,43,37,30,180,58,138,118,35,236,78,241,42,209,174,
+126,85,165,93,126,110,68,215,98,133,110,248,209,94,234,198,
+234,102,43,246,93,91,42,99,198,126,119,255,227,77,165,0,
+107,65,32,171,87,170,155,187,173,112,112,211,90,94,223,73,
+99,85,39,116,13,163,133,182,70,85,155,145,168,15,229,142,
+159,86,216,81,168,134,170,113,77,39,74,156,71,22,31,42,
+25,214,108,218,174,150,118,44,94,139,149,170,180,122,80,226,
+212,30,196,177,61,84,107,177,110,241,161,177,228,151,221,233,
+230,94,200,85,123,176,206,6,9,231,69,185,147,77,163,42,
+209,118,248,197,182,109,181,106,31,113,14,44,218,200,146,188,
+186,114,177,195,98,164,71,12,156,25,33,58,240,124,11,220,
+139,227,78,195,236,163,108,44,71,146,151,9,211,214,138,206,
+222,46,200,82,126,223,234,90,193,46,218,177,82,28,80,189,
+109,218,78,241,195,181,54,56,163,36,98,198,59,246,168,84,
+35,214,176,151,222,126,64,252,219,14,118,55,107,31,55,51,
+116,190,41,33,75,123,144,149,88,62,41,101,243,32,205,242,
+137,63,129,173,64,240,218,198,182,99,228,92,137,26,159,184,
+20,194,254,144,14,245,136,13,170,19,239,118,232,26,138,97,
+39,170,118,171,75,108,26,206,47,219,186,198,217,70,12,212,
+120,59,198,89,107,14,164,32,204,46,159,140,250,15,86,218,
+5,7,204,125,245,249,101,178,97,161,178,229,120,72,225,110,
+251,48,177,51,136,243,30,121,194,58,245,160,75,122,21,94,
+137,67,179,134,199,22,22,220,128,236,187,246,56,162,4,27,
+242,132,214,111,85,163,58,24,110,16,174,19,160,1,127,149,
+172,180,61,209,83,4,90,226,127,208,45,57,71,62,31,91,
+177,145,181,174,168,4,124,76,150,207,59,85,73,14,28,195,
+222,8,179,147,29,217,135,8,156,56,18,72,144,237,36,32,
+203,97,53,188,235,252,202,48,141,94,178,248,30,85,231,252,
+94,62,111,81,101,156,141,139,130,50,115,50,10,203,27,2,
+50,217,131,244,87,135,181,186,173,188,80,113,47,109,87,45,
+231,243,55,12,175,246,65,117,157,94,171,17,63,250,39,106,
+150,86,184,223,190,2,21,244,191,189,166,160,243,118,203,207,
+220,47,223,74,115,239,74,1,120,226,4,0,152,70,188,129,
+155,150,62,31,127,220,25,135,194,79,58,243,202,129,197,29,
+252,179,110,190,85,86,254,93,87,234,143,78,26,241,3,89,
+153,86,12,66,24,134,226,141,55,120,36,222,172,55,231,229,
+63,168,125,219,217,27,4,188,168,236,174,61,108,119,188,185,
+168,245,118,103,81,150,106,3,176,1,92,234,113,95,73,31,
+61,84,124,7,168,171,142,234,172,52,161,134,65,12,96,142,
+144,107,98,154,149,177,244,34,64,220,213,64,252,81,219,29,
+120,169,178,122,95,17,159,97,107,240,146,227,204,229,19,162,
+156,117,219,44,63,183,162,81,8,9,62,188,111,218,163,3,
+37,89,109,119,18,165,32,230,203,231,67,49,28,129,172,202,
+93,219,34,233,150,24,74,236,218,134,104,138,207,160,173,36,
+111,187,227,13,212,137,193,11,92,28,219,238,126,132,215,75,
+121,192,202,158,239,120,239,207,171,74,212,173,103,63,242,104,
+3,134,218,209,174,178,106,125,89,29,229,233,54,110,204,26,
+213,169,199,26,236,237,107,177,210,247,8,141,48,170,214,203,
+231,196,35,85,165,81,91,214,179,74,231,44,6,27,86,248,
+80,111,14,21,30,128,210,44,83,203,45,123,248,224,46,92,
+142,92,220,141,175,197,147,104,36,120,71,125,0,174,145,179,
+129,24,198,140,16,136,18,229,191,173,232,223,251,182,58,109,
+219,198,48,139,140,220,166,180,23,111,196,62,185,170,211,191,
+209,46,246,180,247,213,206,208,55,23,11,206,116,181,106,237,
+110,36,148,217,171,82,187,160,128,191,130,217,31,163,156,227,
+78,53,125,228,96,156,210,15,138,219,138,35,74,238,167,244,
+168,143,232,0,208,250,105,249,197,242,11,198,149,110,90,68,
+233,4,248,247,81,218,131,185,136,253,97,161,114,28,176,107,
+13,219,247,248,248,248,253,94,208,78,237,218,4,54,88,43,
+40,64,183,34,112,215,112,212,183,45,228,40,180,29,116,118,
+136,189,117,32,87,71,173,98,39,125,219,47,193,34,240,72,
+114,183,68,227,228,212,106,52,214,31,67,232,46,28,14,140,
+116,174,31,35,17,77,4,89,49,118,123,10,175,213,90,31,
+106,49,160,216,114,180,93,130,169,225,186,244,192,88,146,2,
+220,241,9,224,193,32,84,5,10,74,141,197,207,225,76,131,
+150,4,131,7,236,203,109,180,134,100,203,7,204,228,42,79,
+221,184,140,55,3,33,147,230,94,187,112,5,195,156,103,189,
+21,61,138,110,32,224,227,114,189,215,21,25,178,195,161,143,
+4,69,64,102,115,203,131,3,235,246,232,232,129,59,34,74,
+227,12,166,61,84,189,91,116,69,247,43,87,169,14,65,110,
+3,238,73,138,132,140,54,53,151,47,133,18,24,132,57,35,
+202,198,17,85,75,63,251,230,16,26,3,101,161,111,11,100,
+199,85,95,24,131,86,43,95,165,55,69,44,136,129,200,146,
+111,223,18,199,179,31,216,236,151,243,47,189,69,4,29,120,
+242,205,171,215,228,77,16,92,87,73,244,123,122,37,179,58,
+104,18,194,36,82,66,232,59,175,173,6,72,247,78,238,233,
+120,90,200,37,12,233,181,199,67,156,211,33,225,101,169,42,
+197,67,24,21,72,169,58,75,196,79,177,128,84,82,164,93,
+14,123,138,98,221,174,245,230,20,244,70,40,141,189,126,84,
+21,60,113,128,179,178,219,170,51,106,6,161,247,82,86,165,
+240,69,197,1,27,222,32,227,171,19,123,125,86,51,36,58,
+92,90,121,90,3,69,44,159,4,172,50,106,208,25,94,135,
+254,81,43,217,56,218,135,230,161,210,40,1,114,87,141,94,
+62,173,165,149,164,119,33,57,67,60,72,131,89,232,125,180,
+45,23,26,46,24,146,74,20,21,236,226,233,129,187,64,219,
+49,176,84,189,7,202,17,93,223,46,168,215,113,249,147,238,
+150,150,78,218,66,241,238,89,123,129,206,244,254,64,72,190,
+46,20,3,193,74,172,204,236,160,169,9,219,115,218,188,29,
+181,216,104,200,182,177,120,219,142,152,140,116,67,150,149,64,
+231,133,86,96,248,125,32,23,80,63,7,95,7,78,211,89,
+215,143,58,16,52,149,36,170,11,109,222,160,218,229,165,139,
+234,81,149,7,42,58,131,9,151,218,52,61,248,128,51,204,
+200,195,138,28,92,177,211,240,121,249,4,98,225,132,181,43,
+84,9,18,99,119,7,195,199,180,235,195,121,36,0,195,108,
+117,211,55,183,15,186,131,37,200,112,56,61,79,59,129,193,
+64,244,34,148,135,160,143,232,118,71,59,215,186,253,43,162,
+207,63,139,86,141,93,209,181,72,223,51,234,37,35,5,48,
+0,94,195,116,162,205,57,160,72,27,35,97,71,179,220,90,
+63,232,245,225,178,91,159,163,36,6,104,103,103,214,226,147,
+30,180,228,117,161,35,209,104,39,54,7,55,182,160,208,2,
+18,100,144,23,165,211,206,110,252,226,38,3,67,220,128,66,
+7,54,0,85,119,226,38,48,118,115,41,201,38,146,131,60,
+34,98,132,68,110,143,187,19,139,27,95,22,248,116,125,65,
+206,206,215,77,215,214,142,0,169,23,157,213,252,92,232,141,
+95,11,70,163,79,126,108,185,114,111,1,185,225,65,240,74,
+194,106,235,72,181,99,177,182,145,186,66,58,14,92,38,232,
+209,208,95,205,167,54,247,187,245,188,123,97,189,172,32,198,
+12,106,251,64,34,190,1,186,173,13,224,66,90,58,238,174,
+206,194,32,248,144,81,163,17,79,151,20,110,197,80,94,208,
+194,151,181,205,244,203,125,121,101,202,3,113,26,200,78,54,
+142,130,228,126,95,161,101,57,117,1,99,88,52,18,197,1,
+36,13,104,100,215,250,153,150,214,223,174,96,200,145,233,60,
+26,186,131,110,59,98,152,46,229,250,1,83,48,133,192,39,
+32,192,22,72,194,228,12,171,152,207,250,222,51,64,8,143,
+234,66,20,123,237,67,191,96,58,11,180,73,77,25,191,130,
+186,89,126,59,178,52,28,231,18,120,224,8,246,82,234,170,
+184,105,20,36,69,176,1,94,142,32,69,82,144,158,60,113,
+28,144,163,105,32,166,124,133,113,190,148,229,78,13,221,72,
+73,128,181,188,149,35,137,193,97,143,136,16,81,16,131,151,
+247,195,51,67,168,107,126,8,100,121,81,77,189,160,165,243,
+130,140,29,158,71,112,134,20,167,151,201,25,17,4,37,121,
+229,0,122,32,245,162,12,176,70,194,37,20,218,170,106,203,
+251,19,223,230,16,145,147,58,68,215,178,114,229,46,106,252,
+101,193,109,186,16,102,104,179,158,157,184,192,17,10,5,253,
+65,179,15,203,155,237,1,194,208,235,239,189,187,205,177,221,
+201,17,136,175,124,238,31,109,85,177,24,249,196,8,140,195,
+56,69,196,223,142,121,152,101,54,128,85,0,58,129,252,18,
+44,87,234,100,16,212,176,51,245,99,215,36,103,188,12,199,
+226,235,241,21,39,79,23,87,59,175,9,34,131,56,138,70,
+2,127,13,23,254,149,250,228,154,218,152,197,214,128,223,58,
+63,244,235,197,250,184,21,203,191,185,45,198,223,40,251,3,
+95,220,13,134,11,241,215,191,242,67,125,37,128,207,190,250,
+109,252,15,71,16,186,222,126,104,69,239,179,102,51,241,210,
+167,44,212,87,22,242,111,227,151,21,74,104,112,254,16,70,
+185,65,212,107,21,86,182,43,10,23,75,32,237,24,130,30,
+135,189,233,66,202,151,144,223,227,2,189,68,2,190,162,248,
+14,200,200,7,215,77,144,144,251,143,103,158,5,188,83,37,
+87,204,75,108,8,202,161,123,58,43,239,169,55,118,234,122,
+28,175,116,173,93,99,55,124,137,211,223,253,5,90,190,160,
+210,163,118,204,17,80,20,72,152,152,203,117,173,115,7,164,
+85,52,176,114,187,228,91,37,71,106,37,154,109,215,130,223,
+1,214,154,76,98,41,68,211,51,95,36,145,181,157,245,204,
+73,131,35,216,179,227,171,134,27,54,163,32,5,114,225,71,
+253,77,204,10,144,64,241,98,144,161,129,158,167,231,230,228,
+70,67,40,207,158,237,121,190,171,105,240,115,146,225,162,117,
+16,153,81,55,226,54,122,201,226,238,86,142,55,13,61,135,
+106,232,124,203,50,228,32,94,105,226,176,239,121,211,203,253,
+168,107,48,163,90,118,245,98,251,139,90,26,126,226,150,232,
+5,53,55,244,212,174,49,254,94,115,227,175,76,206,245,138,
+99,93,138,248,242,167,193,180,1,65,250,162,235,36,180,164,
+191,60,168,252,141,29,97,178,105,233,234,149,7,201,179,234,
+67,154,204,189,90,95,93,44,26,248,249,102,119,50,151,235,
+89,79,96,83,238,111,23,166,12,130,255,124,219,205,141,239,
+226,41,42,165,166,123,89,4,145,47,162,219,189,5,34,127,
+99,68,158,47,8,135,125,135,38,63,123,39,220,153,123,111,
+9,44,181,157,126,164,243,253,148,17,116,26,105,23,175,161,
+67,41,94,53,234,35,57,64,183,213,33,92,216,119,128,156,
+16,23,219,254,54,109,200,14,186,43,151,149,182,181,220,135,
+89,246,226,32,191,127,152,210,204,9,97,171,105,180,113,146,
+235,226,238,67,215,36,45,208,197,9,136,231,185,238,143,124,
+245,29,214,15,79,101,69,51,120,111,189,187,118,97,69,239,
+95,244,194,248,23,241,86,117,144,127,200,218,11,175,83,46,
+82,16,186,111,200,83,232,33,205,213,225,132,165,147,139,171,
+255,62,192,125,9,32,201,130,149,19,107,192,247,158,92,10,
+99,158,127,145,53,226,133,113,3,210,18,92,16,67,199,63,
+125,212,208,224,81,213,214,223,18,95,200,32,158,69,57,148,
+255,71,49,184,111,45,40,6,156,75,23,132,7,232,227,246,
+96,250,145,45,24,231,212,194,175,251,45,154,47,245,75,204,
+100,122,3,200,201,173,191,208,52,234,252,238,74,49,87,53,
+74,115,20,253,56,125,113,33,65,87,45,231,207,61,59,186,
+118,34,94,51,237,135,47,75,66,175,229,119,190,230,175,95,
+58,122,78,5,65,213,196,90,219,127,225,67,95,72,56,102,
+245,23,96,23,247,252,13,117,192,193,117,178,72,99,121,36,
+15,29,83,122,221,132,79,195,55,61,36,55,164,147,245,46,
+92,238,82,73,119,161,171,158,17,219,174,30,40,112,254,6,
+147,215,243,183,30,59,210,41,44,164,13,148,26,127,230,253,
+126,139,142,133,226,117,95,229,152,133,35,52,122,240,143,86,
+174,251,7,238,82,232,44,184,249,122,137,102,58,32,213,200,
+33,95,249,119,10,145,119,119,44,166,165,54,227,232,116,39,
+31,84,95,172,3,231,111,31,128,225,121,14,96,83,184,145,
+57,252,94,32,151,178,142,129,25,248,67,179,163,217,58,44,
+225,78,25,36,147,19,173,88,77,204,24,46,226,110,17,196,
+95,22,209,172,196,7,145,192,251,84,58,60,120,83,241,254,
+127,197,219,15,118,
\ No newline at end of file
diff --git a/uppsrc/Draw/srcdoc.tpp/DrawTutorial$en-us.tpp b/uppsrc/Draw/srcdoc.tpp/DrawTutorial$en-us.tpp
new file mode 100644
index 000000000..05ad9616e
--- /dev/null
+++ b/uppsrc/Draw/srcdoc.tpp/DrawTutorial$en-us.tpp
@@ -0,0 +1,195 @@
+TITLE("Draw tutorial")
+COMPRESSED
+120,156,188,187,137,115,98,105,118,47,248,175,104,94,123,28,213,237,234,122,90,115,169,242,188,176,221,118,120,58,198,75,135,159,123,94,76,116,84,184,178,179,212,221,25,206,206,204,201,204,114,187,231,61,59,132,54,36,33,64,18,32,196,46,33,33,4,232,130,16,155,0,1,146,64,32,132,0,177,139,203,38,132,216,55,137,85,172,119,62,148,89,221,213,221,85,182,159,103,194,169,68,87,247,187,103,249,157,243,157,115,190,115,137,56,63,26,236,251,189,223,235,255,176,255,91,253,255,202,191,143,255,116,244,39,79,190,120,254,246,211,31,61,31,124,244,232,147,103,3,3,131,253,159,60,25,120,248,201,95,63,254,228,159,255,249,159,63,26,24,238,127,244,73,79,216,0,16,54,208,63,60,52,48,56,0,214,250,135,7,31,14,140,60,238,127,60,242,104,224,81,255,208,195,225,193,145,135,253,35,31,191,122,242,250,201,207,63,253,209,147,71,67,159,124,231,111,30,0,174,193,15,71,190,53,52,48,52,208,63,240,96,112,24,80,245,15,245,15,14,15,12,142,12,60,122,
+52,60,240,112,228,209,208,227,7,15,62,126,250,228,213,219,103,47,95,124,250,163,31,247,248,134,1,219,16,96,235,127,248,232,193,240,0,96,26,30,25,28,122,56,50,12,152,135,135,1,188,33,160,248,225,131,135,15,63,126,251,236,237,243,209,79,127,244,172,135,27,160,253,94,15,229,240,135,15,190,5,208,13,62,4,156,195,131,195,15,134,135,30,13,14,13,60,26,28,124,240,120,104,248,241,48,128,61,48,248,241,179,183,163,0,228,143,135,7,63,121,2,62,61,182,17,160,111,120,100,120,96,8,120,100,248,225,200,16,32,123,8,174,195,253,143,7,6,129,210,71,253,35,35,64,223,232,63,126,233,166,31,3,7,245,156,212,227,125,0,84,14,62,28,233,113,60,26,126,52,48,244,240,209,224,240,224,131,65,0,162,255,33,48,180,135,96,228,227,207,71,223,60,5,188,67,131,3,159,188,5,176,62,249,222,31,141,124,50,0,152,31,126,248,240,91,131,253,143,251,7,31,60,124,12,148,2,192,192,230,161,199,143,7,134,30,1,165,195,3,35,253,3,67,31,63,
+125,249,57,176,243,199,131,35,253,67,247,26,31,129,173,120,0,36,223,187,101,228,193,0,0,61,56,244,8,168,124,56,48,52,4,126,143,12,63,122,248,241,155,209,222,102,188,125,249,250,211,31,125,231,143,62,232,255,168,255,163,193,145,145,111,247,216,31,3,246,71,67,195,67,67,195,15,30,15,15,244,15,1,53,64,198,112,207,103,15,250,193,118,14,140,12,62,250,248,199,79,222,0,157,111,193,210,195,119,158,29,232,69,19,240,253,208,163,145,33,160,250,1,248,5,246,21,24,56,4,252,51,248,120,248,209,208,208,163,254,143,159,62,127,242,230,205,123,39,245,28,244,157,158,145,3,3,31,14,12,124,235,97,207,183,35,67,131,195,143,123,206,25,26,4,78,30,124,48,242,120,0,120,121,228,193,112,255,224,199,175,71,255,239,47,158,189,30,253,249,232,11,224,230,103,32,60,62,249,114,139,222,199,34,0,243,46,20,7,63,28,24,4,193,56,242,224,65,127,207,95,35,32,32,6,135,70,128,195,251,7,30,13,3,68,224,7,108,243,219,247,209,248,227,95,219,
+48,244,225,192,208,183,30,15,14,15,1,36,143,135,135,129,7,128,128,129,199,3,3,3,253,143,192,15,176,12,248,229,62,62,6,222,7,214,123,245,239,216,135,63,28,24,254,214,67,16,198,96,167,30,15,247,212,63,30,234,249,111,16,184,127,240,65,255,8,216,135,193,119,236,131,61,175,15,254,30,240,251,192,224,163,222,231,222,243,3,35,31,14,128,124,0,16,7,70,70,128,221,67,192,213,131,143,128,237,35,192,247,67,247,33,62,240,240,209,199,127,53,250,139,55,127,250,228,237,232,251,128,249,206,247,126,239,93,164,13,60,248,112,224,193,183,250,123,252,35,143,30,131,13,28,24,238,249,111,104,120,248,241,224,227,161,161,145,193,199,35,67,15,250,129,31,223,188,75,232,30,115,47,165,238,211,241,87,66,30,126,56,240,16,36,23,176,117,100,4,88,127,207,6,44,127,56,208,131,50,248,232,241,131,158,23,222,11,249,236,187,207,159,189,232,225,0,145,241,201,187,96,248,206,247,254,96,96,224,97,79,208,35,144,52,143,30,61,232,31,122,12,156,1,124,208,
+63,2,34,29,20,132,71,96,163,193,62,15,130,52,232,85,132,167,127,255,228,167,163,159,125,247,125,182,222,67,232,69,224,200,208,200,163,94,220,2,78,0,29,128,0,114,30,247,247,63,0,43,143,30,129,108,250,248,167,79,94,253,70,0,14,246,127,56,216,15,162,8,212,159,17,144,148,64,23,8,191,254,199,189,90,2,42,3,216,1,80,138,30,143,188,139,192,207,190,251,98,244,205,219,209,207,193,230,143,244,223,155,61,56,240,225,224,0,240,29,136,191,145,145,71,195,195,15,0,94,160,251,97,175,52,245,182,16,36,240,200,195,161,143,127,240,228,117,47,246,134,193,198,15,142,124,242,247,255,7,216,122,144,61,15,134,239,183,111,112,240,235,83,96,240,215,41,240,176,255,125,117,249,239,127,247,79,255,235,159,253,213,119,127,248,95,251,126,244,102,240,147,190,63,125,253,228,23,125,111,191,0,233,248,236,201,243,223,255,244,71,111,134,62,233,27,248,168,239,79,158,188,121,246,180,239,115,240,240,217,139,159,246,189,124,53,10,50,22,84,194,55,61,138,145,247,
+92,247,6,245,61,123,211,215,75,201,247,119,175,71,95,129,13,2,137,210,99,251,233,235,39,175,126,246,236,233,147,231,125,47,191,120,251,234,139,183,31,245,125,255,109,143,254,217,139,183,61,138,151,47,158,60,127,254,203,62,80,129,158,253,244,197,232,231,125,191,120,246,246,103,125,32,211,222,142,246,61,127,246,115,112,249,188,239,205,232,219,190,151,63,233,27,125,242,230,151,125,111,95,246,125,1,244,124,137,233,213,235,30,205,179,127,24,125,243,81,223,15,95,60,127,246,247,163,125,63,127,249,230,158,252,229,219,159,141,190,238,123,3,158,63,127,242,250,29,176,209,158,214,190,167,47,127,254,106,244,30,218,219,151,47,159,255,253,179,183,111,62,236,251,225,103,127,240,217,31,124,141,165,125,79,94,143,246,253,232,59,255,185,239,205,91,16,241,207,71,65,245,232,251,236,187,125,61,209,163,61,35,94,188,236,123,95,201,70,123,48,191,120,117,15,244,163,159,126,212,215,139,76,96,204,231,111,127,246,97,223,171,209,158,214,231,47,95,247,141,190,125,250,97,31,48,
+184,239,197,232,83,32,236,201,235,95,246,189,122,242,236,157,163,158,188,125,251,250,217,143,191,120,59,250,78,235,125,121,24,125,59,250,250,77,79,38,240,231,171,209,167,61,75,251,192,226,207,94,126,254,230,163,222,46,60,252,164,239,91,207,94,60,125,254,197,231,163,125,127,248,189,183,175,159,255,197,179,31,255,231,247,215,143,126,246,95,222,147,188,191,124,241,166,167,230,5,144,250,6,196,253,104,223,15,95,189,250,228,55,41,222,188,125,253,197,211,183,125,127,249,203,63,126,245,170,239,227,190,191,125,249,234,191,61,123,241,249,203,95,244,125,246,223,223,83,124,247,127,252,195,179,215,111,191,0,187,249,15,47,159,125,222,247,131,30,248,15,122,129,240,217,239,247,253,226,219,95,165,251,238,255,248,197,71,63,250,206,125,144,252,13,64,254,233,7,127,62,250,246,191,62,251,127,70,63,248,246,135,125,255,237,103,96,99,63,248,246,183,127,75,253,215,48,129,186,222,215,251,60,0,159,71,224,243,231,175,71,71,95,252,43,156,127,209,43,10,128,243,61,235,192,151,
+188,224,255,159,60,7,9,255,21,246,175,227,123,240,37,95,255,123,190,225,15,251,254,102,244,243,127,3,215,240,151,92,35,224,243,131,63,251,171,207,254,238,79,255,250,111,127,155,249,235,100,252,217,243,231,207,94,129,19,237,131,193,158,226,193,247,122,31,220,3,254,226,95,115,212,175,152,135,126,155,249,47,222,190,99,7,128,254,45,40,254,248,245,211,79,63,232,185,253,123,31,12,255,166,40,32,225,7,47,123,59,253,206,47,191,186,29,30,185,39,1,247,67,31,246,125,239,151,79,94,252,134,139,190,242,231,255,9,164,190,124,253,135,247,92,255,165,239,213,87,169,94,245,253,225,31,190,23,55,212,147,14,196,255,122,229,126,47,30,125,117,229,30,193,200,87,87,30,190,95,249,218,221,249,193,203,231,191,188,63,36,62,120,117,191,145,247,1,240,117,94,120,245,209,247,158,143,62,121,253,193,183,191,1,219,192,239,130,27,248,26,116,191,11,111,224,30,223,96,255,183,191,34,183,239,107,228,126,35,252,159,130,222,179,135,190,183,151,255,30,228,131,191,139,124,240,
+119,145,15,254,46,242,193,127,25,249,224,191,25,121,47,50,238,99,240,47,193,89,251,226,237,147,127,143,21,67,191,107,197,208,239,90,49,244,187,86,12,253,203,86,12,253,187,173,248,176,239,251,127,245,183,15,134,63,232,255,199,39,79,70,70,190,250,249,246,55,165,193,175,228,126,255,231,64,198,167,31,244,10,198,96,239,87,175,100,127,255,231,63,253,236,227,143,223,60,249,135,209,111,42,53,239,185,238,131,236,126,191,30,189,255,252,79,177,15,126,163,214,223,138,177,175,99,30,250,87,117,127,141,144,175,147,247,183,189,215,149,15,122,37,230,126,7,62,251,79,255,251,232,243,231,47,251,126,241,242,245,243,207,255,151,207,254,211,215,131,120,199,52,240,141,92,31,246,253,113,175,131,249,96,96,228,219,31,253,201,203,231,223,88,179,223,43,255,23,228,252,205,203,159,63,121,113,47,231,251,111,159,60,127,246,180,103,23,168,160,255,146,184,161,123,113,247,7,70,255,215,202,252,222,203,47,94,63,27,125,125,47,245,135,47,62,31,125,221,43,76,191,1,241,179,127,
+122,255,231,103,255,244,91,41,242,231,63,252,254,103,127,247,199,63,248,193,103,127,247,151,127,252,253,191,250,146,234,215,167,237,253,145,253,193,183,63,234,157,176,79,126,252,28,136,253,232,111,190,120,241,235,108,250,149,228,222,165,255,203,203,255,214,247,71,127,244,172,183,177,31,131,110,184,255,247,193,187,232,240,220,196,53,202,142,26,251,242,223,157,137,158,15,97,110,232,85,29,227,242,86,103,29,55,187,228,134,184,126,220,122,100,88,95,70,45,4,174,196,154,242,88,96,17,117,115,122,184,99,221,160,197,40,243,39,226,201,24,101,129,41,231,73,90,141,156,209,239,78,8,101,98,158,92,129,225,230,67,129,224,81,124,41,79,192,158,208,172,181,154,71,94,200,150,246,174,124,99,94,102,252,138,114,179,119,133,153,132,210,27,177,133,171,203,147,9,249,117,33,130,184,214,29,91,106,174,167,43,113,117,16,68,213,162,181,120,17,158,33,37,85,184,92,149,118,195,181,94,199,206,29,155,221,75,172,179,179,64,115,146,89,205,187,92,182,96,125,107,159,161,153,200,28,
+151,51,155,107,62,153,252,178,75,175,5,150,196,178,218,89,200,125,46,207,26,233,118,239,188,125,177,142,57,163,38,142,55,225,41,73,147,184,168,13,115,185,158,107,46,76,86,43,244,54,19,103,202,201,21,232,57,246,138,110,89,120,233,47,185,67,146,235,249,72,215,208,48,141,151,27,155,50,147,59,142,158,147,17,246,102,181,113,189,64,162,146,107,186,77,238,92,209,223,194,36,109,173,163,219,147,16,158,152,204,11,108,246,22,237,234,72,164,118,169,111,23,36,228,252,150,146,87,32,173,68,9,165,34,109,97,81,226,197,19,54,145,211,59,4,82,242,182,143,218,219,50,27,204,197,59,109,66,102,232,210,85,64,186,12,155,140,170,176,107,89,153,180,98,62,125,142,179,235,90,28,74,160,219,18,137,252,230,106,78,183,80,49,146,91,133,136,149,52,111,83,168,61,228,93,227,188,254,58,95,161,133,36,188,174,73,161,44,192,183,62,107,42,94,153,242,96,144,84,66,190,91,104,217,171,103,123,245,170,134,31,111,197,101,169,43,20,36,18,222,173,101,246,217,222,147,
+125,73,190,131,105,186,35,211,44,245,186,186,227,84,105,116,170,116,216,87,17,105,60,9,159,29,118,99,220,177,174,80,231,21,94,86,116,183,162,253,120,215,18,201,198,149,45,235,116,34,74,165,167,235,8,243,108,81,91,208,109,42,166,183,11,179,33,74,205,151,229,186,124,186,166,211,46,216,229,66,72,26,86,69,40,188,128,125,139,118,202,10,22,181,107,136,184,109,238,168,200,22,73,98,175,156,115,68,118,75,23,141,107,203,172,214,96,199,154,60,17,82,135,31,187,49,8,90,228,182,33,84,9,26,52,219,208,86,192,20,44,228,179,87,234,88,69,109,204,237,69,60,52,55,165,186,34,18,3,75,43,90,97,51,72,9,132,87,106,186,128,184,231,159,91,99,216,151,101,222,38,226,23,55,141,202,100,200,127,11,237,75,24,19,205,77,72,174,222,22,170,115,251,218,202,69,67,121,142,110,46,205,177,120,254,72,237,72,163,65,110,147,2,149,71,224,96,242,236,30,161,224,216,40,180,27,9,4,151,50,124,163,183,51,178,110,132,138,30,55,31,206,139,231,19,4,
+123,138,216,50,90,177,187,162,227,152,140,89,116,151,226,193,189,236,110,150,165,204,141,101,238,110,27,205,202,86,149,93,221,175,54,179,113,59,112,105,25,37,97,201,224,16,197,46,96,49,44,21,82,144,181,55,227,15,200,172,5,196,112,184,50,29,221,213,145,218,164,82,117,92,89,62,161,153,45,232,98,187,20,13,220,221,33,238,230,45,14,7,23,218,87,101,174,232,132,239,105,134,181,92,91,169,220,61,14,221,108,185,196,153,122,87,178,229,209,71,80,144,176,162,228,59,48,83,78,251,45,105,211,227,83,237,218,146,6,91,124,101,44,182,129,87,243,99,27,78,49,9,137,51,76,141,10,31,70,55,101,201,26,94,183,83,45,95,112,143,125,164,66,68,89,242,233,119,163,106,157,180,18,40,161,209,218,166,231,28,114,97,170,244,144,228,196,222,89,164,69,98,103,115,152,93,52,57,116,119,151,41,99,89,23,183,225,8,93,197,88,45,231,39,225,124,53,155,213,169,72,218,188,189,236,222,46,170,145,139,219,88,44,237,107,5,242,110,229,69,190,196,185,80,48,90,
+180,189,155,252,245,177,142,128,232,118,231,245,82,37,215,219,210,27,40,73,34,215,180,232,228,154,130,231,129,172,67,112,29,195,183,243,102,145,182,235,211,181,241,137,200,254,93,61,114,39,137,162,236,244,214,149,70,102,210,250,36,53,191,154,98,210,150,91,41,110,49,204,232,92,195,14,251,118,69,152,83,221,94,51,109,146,40,19,143,135,212,57,239,77,188,205,21,42,139,82,68,168,188,187,187,200,42,227,213,106,64,215,10,88,242,116,136,23,118,139,130,140,178,37,135,107,49,215,130,26,143,246,214,185,142,191,217,71,87,73,235,4,56,190,237,155,153,221,245,46,9,12,103,202,184,214,23,176,175,194,87,210,102,142,38,201,34,13,136,33,98,107,154,117,81,55,46,58,198,35,13,151,40,23,98,87,114,24,22,171,21,212,217,83,44,145,79,201,180,180,42,249,117,164,105,33,167,150,61,235,117,33,11,210,102,211,231,38,81,187,212,173,114,208,66,245,141,156,21,46,123,147,36,67,35,148,209,168,60,197,59,76,125,214,155,109,70,106,200,106,219,50,219,188,217,114,
+180,249,87,30,97,85,192,17,68,188,149,176,127,126,53,8,32,44,232,119,124,243,230,52,149,73,204,16,227,38,6,79,214,172,224,44,10,97,69,196,236,74,46,147,248,78,109,74,148,15,33,185,114,29,219,193,250,25,235,72,35,31,21,149,51,71,26,197,124,219,179,159,221,75,154,111,236,252,170,205,191,88,37,51,84,33,201,205,141,177,206,220,191,80,37,29,117,123,169,6,119,186,19,182,61,136,160,189,116,192,214,157,249,164,203,237,46,84,163,97,93,220,164,107,155,99,136,178,67,97,100,34,237,187,14,190,108,222,244,76,225,143,69,43,5,191,188,98,186,150,233,21,225,219,74,98,113,202,228,139,240,69,72,180,129,232,106,215,241,125,115,210,27,12,34,157,192,117,12,99,199,21,170,1,125,215,234,79,139,84,151,213,246,252,108,216,158,85,219,132,50,24,186,173,110,73,5,46,115,181,145,156,158,76,203,244,27,210,208,217,102,211,8,85,60,2,19,84,128,107,71,228,98,195,26,181,212,211,164,106,220,111,218,63,93,211,214,82,45,175,165,186,133,15,222,41,
+194,167,113,211,178,66,103,87,180,217,221,248,33,36,172,217,81,41,111,214,18,20,138,58,251,17,44,231,134,165,246,107,50,66,1,210,33,213,20,176,185,10,25,90,43,11,217,233,232,117,73,46,11,104,246,187,34,170,216,94,221,227,106,59,221,118,39,197,18,66,219,215,141,148,92,128,46,104,210,123,192,19,179,231,203,17,68,184,206,40,131,234,6,55,201,214,70,206,124,232,183,9,68,154,107,52,177,17,178,159,193,62,183,15,14,121,84,89,110,203,99,18,232,2,87,221,4,206,102,102,117,28,140,241,146,184,168,12,107,108,217,128,89,166,223,81,50,210,25,175,136,146,170,166,124,92,47,182,155,168,37,21,177,101,26,166,30,60,71,207,150,29,50,12,247,72,161,201,49,76,203,82,166,212,95,235,94,38,213,248,59,97,167,30,25,87,144,107,129,142,86,127,8,21,78,247,175,174,189,33,55,30,173,104,110,84,69,30,254,188,134,231,11,123,89,117,102,23,165,217,61,8,55,80,243,209,149,77,147,203,127,17,18,241,246,142,107,227,187,109,11,218,168,216,174,77,
+119,47,98,246,2,47,119,7,107,74,197,185,40,190,27,2,190,36,175,9,247,64,108,92,239,175,91,196,145,219,138,63,91,102,105,149,136,57,107,139,116,178,102,10,1,170,145,189,53,80,63,210,50,156,28,209,222,80,215,156,236,38,251,162,161,209,159,146,106,153,68,91,17,180,251,111,226,115,234,102,153,235,43,236,250,170,119,37,235,70,188,186,205,10,204,19,56,233,141,102,180,52,175,134,194,185,142,57,26,11,173,211,216,94,108,33,28,218,67,90,158,19,141,133,17,153,209,248,111,242,6,101,214,195,206,235,5,194,149,66,110,143,17,174,217,110,118,203,126,124,80,215,226,225,237,228,112,71,43,161,123,235,99,116,47,6,241,134,97,107,182,90,77,7,184,50,189,74,77,207,84,179,141,58,99,149,126,78,14,227,200,60,103,230,84,204,45,149,53,5,78,85,82,78,48,29,181,200,10,35,186,98,50,182,183,219,233,43,99,184,156,167,7,247,162,93,218,141,145,51,213,42,108,97,131,72,44,213,17,96,120,32,7,149,45,74,242,32,20,186,104,28,70,27,248,220,
+98,214,78,245,215,76,94,7,39,169,169,90,109,126,228,142,169,80,67,99,225,138,1,162,86,96,184,19,118,217,84,176,194,213,12,78,216,14,170,130,130,15,167,80,17,51,4,91,161,85,149,170,195,12,68,219,245,56,3,77,77,166,118,26,18,217,230,105,177,108,160,27,162,36,59,230,78,129,143,165,229,167,247,163,87,148,2,153,34,245,88,13,98,132,215,106,197,219,166,4,174,83,225,91,22,241,33,145,32,180,103,172,31,159,104,66,132,89,121,56,18,237,150,90,145,134,70,218,212,231,28,54,72,65,94,182,82,85,133,178,215,197,218,143,177,18,249,14,232,44,124,243,252,117,11,171,94,234,56,162,1,174,167,216,17,217,4,233,170,78,5,105,19,211,183,112,186,234,225,132,40,69,119,198,153,194,88,124,126,30,95,78,88,230,33,89,5,41,186,178,194,229,139,46,84,138,9,139,77,7,26,141,216,157,30,109,84,23,180,221,235,24,131,192,93,43,52,46,163,29,116,206,88,100,221,41,23,196,20,155,196,68,102,138,43,220,124,26,45,108,185,234,46,56,114,81,
+144,49,53,73,149,80,10,139,118,24,93,47,217,166,216,91,243,102,237,113,181,81,223,17,183,144,149,174,175,88,53,21,92,133,46,3,9,206,71,212,199,222,8,219,4,181,99,43,211,102,215,54,79,70,61,21,251,180,236,150,168,21,244,36,233,233,110,18,57,207,179,232,225,27,78,244,116,217,212,20,10,107,185,61,246,141,137,237,88,15,68,234,185,124,203,160,19,138,90,235,139,2,88,195,12,87,208,17,74,139,59,231,202,100,145,232,53,203,111,173,182,77,92,24,175,217,184,164,143,81,116,209,150,99,182,90,229,132,214,116,60,151,134,27,114,85,221,28,159,36,47,244,69,192,121,42,202,222,174,55,172,59,103,229,117,111,103,17,183,168,43,72,17,133,151,23,18,32,130,86,11,201,197,37,204,162,42,165,72,81,167,84,160,213,80,180,89,140,115,145,174,52,126,221,33,173,215,43,196,82,65,87,169,132,218,226,156,172,140,131,186,92,173,166,173,64,178,81,49,158,199,144,183,27,52,102,23,65,204,200,157,48,29,239,122,179,14,72,91,89,153,45,211,196,241,242,
+170,9,79,215,209,3,161,174,217,239,32,100,66,215,174,194,146,8,185,21,214,237,117,89,218,30,180,84,82,65,77,246,22,89,198,6,242,241,233,232,21,181,222,209,71,55,18,124,84,164,204,247,21,242,7,232,240,238,158,239,186,157,44,174,212,43,107,137,41,125,86,61,93,48,231,87,96,117,234,46,175,27,143,202,200,243,193,221,134,238,166,28,72,241,203,98,83,97,175,190,93,62,11,104,182,152,154,12,30,189,165,178,117,51,26,87,189,18,217,177,166,171,78,178,223,98,201,134,50,141,86,156,238,213,229,17,142,71,198,60,174,242,234,218,229,218,66,230,150,167,80,149,68,138,104,129,178,146,53,169,246,244,59,243,230,91,114,33,80,175,157,115,184,157,99,157,192,78,189,104,70,17,137,5,185,83,146,138,109,74,176,26,62,36,149,247,167,139,244,122,27,75,190,100,248,149,201,212,113,99,90,207,72,226,68,154,50,231,78,207,197,71,252,187,26,233,157,241,146,227,66,124,77,83,134,101,115,197,195,94,181,210,11,213,236,13,212,89,65,70,203,150,68,217,89,82,
+153,73,11,151,235,10,213,190,111,254,38,42,238,230,36,103,70,35,66,200,70,89,186,46,225,12,31,185,139,89,236,72,228,246,74,81,212,101,106,80,55,107,143,32,249,169,108,75,212,72,18,124,204,88,221,149,77,176,246,154,50,58,87,212,109,17,88,182,253,24,15,144,239,214,99,82,238,242,126,212,156,172,119,14,237,34,166,92,152,196,53,107,104,91,53,12,135,170,167,27,94,22,162,149,169,60,153,196,172,164,236,33,232,248,73,30,181,230,153,93,56,56,15,164,35,177,121,253,206,180,169,141,236,94,219,116,29,15,5,99,215,220,218,125,33,223,157,85,9,225,195,237,176,41,194,172,39,138,214,4,2,14,212,110,121,93,92,182,35,185,110,186,19,41,135,43,12,76,160,91,78,179,21,93,81,199,109,41,130,118,64,77,102,186,42,154,186,53,219,226,158,54,43,19,73,166,122,207,135,216,116,93,158,81,176,129,22,64,53,221,50,226,50,31,251,47,117,187,233,113,116,141,175,67,57,85,4,90,158,82,167,9,116,174,132,233,132,217,74,214,22,86,54,45,146,116,
+213,136,36,227,199,4,95,55,65,176,229,69,228,172,180,109,110,215,85,110,46,114,205,50,108,148,61,76,175,72,37,232,48,230,74,172,122,128,114,55,101,156,213,109,192,225,230,148,241,182,97,21,117,252,248,140,35,166,203,77,94,33,220,212,10,175,104,106,10,146,103,68,241,110,151,190,227,178,82,125,74,6,226,226,176,58,91,69,228,32,204,143,8,10,241,200,222,186,206,223,152,19,75,142,106,58,21,203,237,219,204,146,51,105,17,125,29,95,240,9,184,91,154,80,44,45,35,100,15,147,91,162,70,72,137,192,158,182,253,76,7,83,78,35,21,125,29,113,171,202,62,191,83,141,102,108,248,194,5,79,0,169,103,249,145,12,105,1,28,60,73,234,217,161,177,153,42,9,121,157,219,98,230,84,111,11,212,175,210,233,21,214,177,157,69,68,110,75,183,183,34,165,131,69,238,158,81,44,94,60,41,50,109,232,20,207,54,67,137,3,111,68,41,142,164,171,60,31,233,234,8,141,107,77,37,249,190,178,168,105,52,118,247,16,143,144,18,149,96,205,250,139,141,187,249,61,
+93,172,16,234,210,79,40,173,228,126,182,78,145,20,154,183,110,44,105,162,202,132,81,99,169,13,83,39,197,145,165,164,20,89,43,144,169,228,197,82,234,216,53,219,51,182,177,202,130,166,199,26,41,162,108,236,196,36,64,29,236,104,97,236,88,201,145,217,28,91,192,123,39,198,218,30,169,10,221,36,149,76,234,218,244,216,12,95,236,77,10,78,37,26,13,225,242,78,123,230,169,240,235,115,209,124,30,181,64,130,112,185,164,98,115,163,197,212,28,92,181,202,99,134,99,65,55,22,32,92,185,146,17,163,64,174,152,57,112,75,189,42,27,131,183,215,157,220,161,158,200,236,130,200,1,94,64,243,83,156,19,39,220,45,148,180,12,135,110,141,23,140,142,12,102,216,209,93,34,249,240,8,123,205,28,131,112,12,105,144,112,144,89,157,72,85,151,174,93,215,212,243,9,255,129,224,130,192,94,243,77,82,173,200,76,183,178,171,225,40,55,15,4,132,152,194,183,31,90,59,23,237,49,243,242,11,150,73,238,200,24,252,179,167,50,59,139,55,197,108,114,228,138,211,241,13,
+214,85,67,206,138,212,206,51,231,6,127,90,102,39,227,247,54,241,140,0,141,53,227,47,219,15,3,248,189,106,37,85,117,206,39,169,201,218,137,56,189,135,198,231,79,209,190,109,181,221,16,240,224,181,199,41,25,234,180,115,185,70,45,115,167,197,228,152,185,54,1,5,98,40,188,139,117,232,178,77,156,43,178,173,228,198,18,116,32,215,83,148,160,181,118,205,239,220,93,250,187,169,181,69,3,178,239,184,162,55,125,170,124,145,68,92,19,121,140,91,147,120,91,251,90,187,152,99,93,112,196,13,13,45,51,183,91,181,42,234,74,74,33,16,214,115,120,135,2,171,115,150,225,162,52,218,115,23,58,190,157,111,172,217,102,22,180,129,99,51,71,21,78,5,72,97,123,250,64,128,117,93,207,210,41,202,253,187,252,30,203,46,51,214,112,188,38,38,114,74,32,109,94,48,111,111,165,77,119,67,103,90,247,204,58,111,89,132,249,134,58,145,103,153,23,9,198,130,112,206,191,27,144,144,112,23,57,117,203,122,183,7,231,153,115,197,21,223,89,192,81,64,118,230,156,251,
+242,154,3,194,238,34,204,212,204,177,92,22,169,95,175,123,188,91,43,184,134,57,200,0,47,55,107,114,149,169,45,228,203,120,1,175,229,76,72,51,9,118,242,14,43,139,160,84,197,142,242,172,3,44,214,92,9,17,247,166,188,19,193,230,133,216,90,80,72,87,101,158,101,222,38,206,28,12,51,2,53,60,115,211,200,59,19,206,237,23,179,12,120,211,39,102,123,106,188,228,52,120,200,184,168,45,227,25,155,220,116,136,152,184,19,121,49,103,194,152,241,88,0,185,170,76,2,86,169,218,200,179,20,226,138,181,164,222,186,233,110,211,20,228,160,9,231,13,76,112,51,202,213,114,117,231,54,160,75,93,49,38,107,246,37,132,185,237,83,24,247,131,92,169,203,57,227,93,182,172,178,25,132,134,154,176,148,103,73,197,182,37,130,250,4,28,102,45,11,69,72,56,18,76,157,47,150,123,106,245,53,124,122,101,114,51,28,186,214,213,38,178,28,142,207,188,134,245,148,182,206,99,187,190,130,73,212,209,115,196,179,196,91,81,163,24,106,38,206,211,213,82,74,182,197,207,
+27,163,20,133,222,215,213,69,151,46,12,123,228,253,125,69,94,35,54,199,85,100,35,99,57,44,133,169,141,184,122,183,131,223,164,208,2,100,164,29,208,121,85,75,204,139,218,18,82,155,133,208,114,165,215,162,45,4,177,107,158,113,30,191,176,46,49,79,200,177,104,137,170,19,227,68,103,227,39,162,70,193,221,12,17,214,108,213,109,53,4,222,54,32,166,184,184,0,201,85,54,44,139,210,53,45,42,186,88,255,222,78,158,181,39,152,181,151,129,45,197,117,175,139,90,17,184,246,186,110,133,40,152,41,47,165,100,219,252,212,225,93,93,72,48,199,46,186,168,220,213,53,53,104,97,210,202,146,176,71,162,196,197,15,198,44,34,24,242,66,126,244,85,75,189,20,71,206,15,196,187,214,2,199,238,177,250,241,124,72,62,214,245,90,136,129,117,119,215,143,122,199,40,161,73,152,158,40,228,109,105,52,77,106,48,233,69,57,50,179,251,166,88,208,140,78,81,253,186,243,249,179,51,9,64,81,246,50,214,51,155,30,172,134,156,15,158,187,50,68,44,197,223,161,28,223,
+161,200,149,237,51,162,244,214,44,65,226,171,43,148,68,109,177,184,126,179,195,242,196,148,5,228,122,38,147,231,120,210,109,170,164,229,18,9,245,172,51,93,180,16,231,179,178,74,57,66,92,161,79,35,245,165,228,244,118,146,216,244,210,14,5,49,207,153,246,48,30,201,156,146,137,10,200,22,148,238,147,247,247,20,215,26,174,20,158,39,194,208,36,66,208,248,218,231,202,19,89,103,221,128,189,236,61,85,92,227,238,159,194,80,201,64,140,57,23,179,219,247,56,203,1,239,126,249,84,96,93,245,44,45,24,116,171,30,111,57,47,70,122,14,200,177,121,246,188,223,206,131,228,183,19,222,128,175,232,216,202,236,50,178,45,244,220,226,86,58,65,110,20,109,77,185,195,58,169,58,149,172,235,238,86,123,184,121,219,0,183,36,140,101,132,176,124,53,128,188,218,92,161,108,2,200,9,210,182,201,115,38,160,233,22,183,154,45,201,66,22,118,230,23,17,201,58,34,194,158,166,132,121,214,150,49,178,105,214,92,43,149,217,101,7,199,51,125,158,9,180,218,129,11,159,66,
+48,111,151,171,86,38,130,10,93,28,179,175,72,105,248,210,69,120,12,206,79,33,19,48,109,111,145,228,8,6,46,116,222,37,102,162,190,200,65,140,16,104,138,206,143,20,53,58,143,229,208,200,52,148,19,25,36,103,171,229,19,59,24,0,196,191,189,177,47,206,113,236,98,44,108,207,58,161,130,174,118,143,55,45,165,0,188,115,43,120,250,81,137,193,159,205,146,57,141,34,12,194,12,115,87,157,183,19,194,97,233,122,146,234,165,45,23,23,59,41,39,197,34,235,232,167,65,204,131,144,47,204,194,205,75,66,182,186,157,85,99,188,220,248,89,174,99,191,233,230,231,178,203,77,146,210,166,55,168,49,254,118,253,18,4,254,100,77,37,228,154,97,178,87,39,133,87,38,113,7,115,165,99,97,220,158,107,153,174,17,150,87,34,80,122,4,199,68,17,148,150,81,28,102,70,151,52,231,181,248,153,27,181,69,164,176,77,33,123,115,91,24,94,228,8,118,101,38,150,52,237,40,159,87,130,170,75,1,248,184,171,150,132,3,148,234,90,141,163,240,73,97,193,216,6,94,
+151,153,11,10,44,52,67,221,126,25,114,194,162,194,246,154,45,213,49,131,52,198,83,58,161,116,242,242,162,124,126,205,135,157,43,23,58,84,125,58,167,209,236,234,67,103,201,188,147,234,229,158,158,233,196,73,238,137,108,94,236,151,35,227,197,112,19,21,158,154,134,73,198,160,139,144,185,94,209,182,247,137,1,165,92,51,13,4,7,141,23,197,157,131,115,53,150,95,102,204,93,181,224,118,135,15,225,102,73,250,41,187,126,49,219,138,197,125,136,27,166,102,15,113,193,112,154,96,39,86,226,29,240,222,112,165,207,228,102,209,233,234,252,54,179,59,229,113,39,224,208,153,25,18,66,5,22,28,184,38,107,206,156,71,249,83,7,69,152,174,230,182,89,93,148,199,189,92,14,17,131,252,92,64,109,92,220,237,68,189,4,134,51,141,177,243,136,110,34,205,107,178,97,78,162,190,181,201,156,126,252,40,199,242,120,98,173,149,228,217,146,22,26,23,116,243,29,202,149,89,118,224,189,114,101,238,102,85,237,26,159,184,2,205,50,58,167,19,2,169,188,174,223,17,221,96,
+55,157,204,110,176,129,225,203,33,220,226,153,109,253,156,51,153,183,239,71,183,42,144,131,57,1,205,24,48,109,42,113,138,124,12,148,112,166,208,107,164,125,235,28,99,22,71,212,117,80,148,180,228,140,43,63,145,29,92,5,176,114,2,132,59,134,113,122,142,188,170,191,58,230,116,168,133,150,244,214,232,191,147,4,244,34,175,24,170,208,118,188,10,209,49,154,189,4,237,231,205,230,36,61,171,22,183,12,210,78,138,118,179,24,206,197,210,155,158,125,235,105,200,177,98,15,10,90,241,53,203,218,86,229,102,130,109,84,175,141,185,66,153,77,206,237,216,134,175,179,181,234,0,149,143,183,90,168,30,213,81,43,135,105,22,205,40,112,185,51,254,201,2,107,103,106,15,115,116,4,154,13,173,93,112,217,176,187,199,22,182,42,24,230,214,68,134,14,99,175,123,205,7,232,61,136,189,230,3,244,40,38,112,30,141,129,30,101,18,52,41,212,172,108,44,122,176,113,223,160,156,101,222,53,40,165,30,17,160,57,25,123,215,200,104,247,33,220,29,115,107,44,51,70,56,133,
+180,219,54,78,151,10,150,197,223,216,223,40,223,177,255,170,15,146,222,211,45,162,28,154,204,213,2,174,67,162,58,167,3,144,145,83,97,181,78,214,50,119,119,211,90,102,78,80,217,245,100,180,37,236,222,100,5,189,220,109,236,136,156,22,95,70,207,114,100,28,124,100,70,20,170,77,159,144,196,58,145,116,235,68,123,42,41,225,5,118,241,121,166,196,176,29,115,122,219,188,190,104,72,175,30,42,243,139,213,22,159,51,175,80,157,180,156,170,46,74,185,25,240,121,168,105,123,24,54,160,180,167,60,24,138,220,185,4,233,154,120,75,199,215,131,247,219,169,171,8,167,69,12,121,9,217,25,118,39,169,82,132,106,117,238,77,51,229,144,33,235,46,187,122,171,180,216,225,16,162,13,47,217,15,251,68,29,148,55,9,5,80,22,223,241,193,218,49,10,207,103,170,124,36,124,78,160,228,110,43,168,65,147,227,186,35,40,59,243,51,208,102,50,112,188,218,241,108,47,198,179,236,108,158,178,45,181,171,78,0,18,113,162,171,18,132,112,90,41,174,174,9,240,8,123,162,
+57,170,43,174,90,174,202,169,194,245,53,207,181,106,110,35,1,51,52,5,133,43,83,219,84,51,84,221,188,72,46,240,29,111,122,3,41,253,24,116,15,96,87,148,14,38,87,3,183,100,153,10,85,224,218,36,229,108,6,102,73,84,162,196,198,170,135,119,196,225,218,136,119,186,218,173,213,88,111,186,174,211,11,55,248,113,74,192,183,52,147,150,37,149,184,153,83,187,249,20,235,84,113,174,84,88,167,195,199,91,148,26,175,4,121,204,54,148,53,113,184,114,98,209,169,10,196,103,231,219,123,102,198,216,161,196,116,45,5,246,28,114,240,235,51,28,143,146,103,47,109,115,15,75,187,162,92,182,36,109,26,219,235,80,65,184,43,21,178,72,76,190,147,96,201,6,73,220,213,155,8,9,188,243,185,10,153,234,216,2,240,228,238,214,86,133,136,149,169,48,172,120,58,39,61,209,98,234,164,99,111,32,116,189,154,14,233,248,26,78,179,27,96,36,75,110,181,48,98,43,107,119,103,188,92,249,34,137,233,172,184,86,227,68,110,51,189,80,35,57,143,157,176,85,184,206,
+238,56,93,212,93,15,145,235,189,58,117,173,230,4,89,237,134,244,222,147,7,238,230,233,154,37,123,122,28,91,220,67,95,88,48,56,246,78,207,127,124,45,99,74,7,200,151,39,106,164,155,35,248,87,250,120,231,89,125,131,127,225,59,82,154,115,50,37,110,252,116,198,116,216,96,199,34,230,218,38,215,115,188,236,173,154,214,157,209,45,123,37,119,36,136,166,170,205,197,204,210,2,145,171,170,121,248,233,153,60,160,63,244,115,240,239,22,202,115,51,153,234,34,167,122,224,190,211,136,39,69,88,227,177,73,123,202,176,11,174,236,140,250,137,77,96,62,168,202,186,71,34,67,197,82,58,103,213,60,167,13,89,152,224,41,9,48,219,12,168,115,39,35,47,184,20,155,155,94,145,238,250,28,69,236,144,238,100,39,171,130,125,143,210,46,211,157,164,152,236,43,78,182,35,188,186,18,26,252,251,232,125,113,17,189,177,112,145,97,159,89,178,97,6,207,173,201,146,108,101,193,186,144,195,213,71,58,19,75,231,25,111,58,3,85,132,112,40,113,193,41,55,168,27,97,141,
+172,114,215,74,31,170,124,13,200,102,23,210,4,169,138,173,20,58,227,148,245,114,105,33,7,133,174,143,164,51,185,221,64,232,204,238,119,170,204,167,73,181,222,35,118,171,184,150,236,114,194,235,116,105,103,249,233,220,233,177,64,66,207,110,95,240,25,30,175,233,2,147,62,19,65,49,191,101,183,236,133,119,197,144,240,50,209,73,51,98,28,73,153,156,221,0,20,156,82,117,62,155,182,155,114,177,188,192,109,177,8,36,18,98,111,157,226,205,113,125,233,28,4,17,14,46,44,100,125,25,139,49,80,11,178,211,181,137,86,183,204,103,120,105,149,139,68,119,6,43,57,79,159,65,82,149,82,38,229,30,50,12,153,85,143,89,33,203,28,26,107,219,69,110,117,145,74,9,224,119,204,9,27,159,129,117,173,154,69,107,28,37,150,77,128,108,2,170,248,148,171,242,37,132,96,157,83,117,102,205,233,171,148,48,138,129,50,242,9,47,90,34,223,66,108,7,78,248,128,135,183,103,240,188,176,207,127,53,159,174,26,234,6,153,127,251,104,77,140,157,130,112,87,209,146,244,
+196,75,246,150,204,244,105,115,75,123,90,158,55,194,33,41,57,107,216,40,68,54,74,12,28,89,226,117,220,122,85,190,61,106,161,218,8,96,137,177,192,1,130,155,95,247,100,214,230,161,29,201,57,203,127,211,241,92,111,87,167,153,82,127,166,132,221,136,136,114,243,50,248,88,168,63,95,217,170,37,154,177,75,51,241,36,81,243,52,143,213,206,204,85,73,105,187,86,11,48,230,4,92,91,239,96,76,108,165,237,2,233,192,92,106,118,62,47,96,74,231,4,158,120,192,130,217,190,152,237,112,15,102,78,74,12,182,99,170,6,242,149,144,226,45,206,231,17,129,123,86,1,8,18,103,155,23,148,130,12,163,242,162,79,182,46,40,193,75,225,102,229,116,131,208,50,240,143,151,82,85,49,229,38,152,108,165,243,108,207,113,116,254,90,37,153,191,190,163,110,114,220,0,153,198,20,202,157,41,224,227,142,80,111,208,30,216,110,12,37,113,205,197,166,132,85,190,18,7,206,148,66,28,131,47,183,191,13,9,192,251,216,204,29,134,145,143,117,13,173,211,141,64,235,228,116,
+119,2,18,110,46,163,178,119,10,231,106,137,65,21,10,131,201,53,221,237,108,92,133,111,157,110,74,226,144,48,226,163,31,219,230,60,130,144,84,101,216,102,98,114,244,182,168,179,77,225,26,64,89,152,220,53,1,183,104,228,190,28,39,225,75,240,128,95,218,210,72,174,93,225,54,114,46,118,195,239,99,175,156,20,171,98,111,144,171,42,50,156,231,153,27,235,245,153,170,104,57,78,148,24,13,69,135,51,121,172,139,202,60,55,226,178,90,90,203,58,50,11,214,237,157,178,196,203,74,216,102,175,243,219,17,243,165,180,41,46,176,170,122,121,55,124,21,19,28,131,60,8,93,171,130,134,216,177,45,89,18,83,196,64,65,208,87,187,240,3,5,107,193,100,187,221,243,74,148,186,104,175,118,165,172,236,198,188,245,72,96,9,56,147,121,113,90,134,9,162,183,180,117,20,35,217,117,183,232,167,27,246,214,233,156,210,1,9,139,246,235,43,23,39,147,1,102,85,174,138,101,93,205,97,159,221,9,137,230,9,222,204,213,245,121,208,20,236,38,209,202,38,206,119,33,44,
+243,196,7,193,117,199,120,32,20,14,237,204,28,111,122,186,210,13,149,129,56,37,183,28,59,125,68,23,59,39,32,152,12,114,152,20,206,45,227,189,178,243,204,130,107,89,77,235,186,119,68,215,11,229,112,230,74,163,148,171,69,12,231,66,246,38,74,58,99,31,122,46,124,75,39,203,69,153,192,43,246,195,100,244,186,103,45,101,175,48,64,141,115,58,51,228,89,168,48,15,234,14,34,6,69,202,79,20,122,187,100,238,169,44,15,17,226,24,47,122,253,208,33,118,137,182,79,66,192,17,113,149,248,90,53,217,153,61,196,117,226,225,211,64,158,197,246,128,182,96,237,196,125,94,1,104,218,80,65,126,203,220,2,111,134,244,147,241,206,44,160,105,26,225,0,112,208,12,142,113,127,123,176,35,135,177,27,147,119,6,2,40,99,68,112,66,59,26,169,251,19,250,0,116,15,189,147,156,226,120,215,8,196,199,222,53,2,139,158,119,141,192,127,20,29,3,208,193,43,4,110,193,54,143,195,105,91,57,150,164,211,233,180,118,15,11,186,5,20,10,213,89,205,87,244,18,
+77,189,156,69,12,179,17,64,208,110,229,36,162,90,29,159,119,4,234,27,19,235,172,147,226,193,1,166,121,152,70,95,39,90,197,185,35,1,214,239,176,182,74,102,110,93,145,243,75,90,245,2,3,67,89,101,205,116,247,208,151,120,230,54,113,78,94,207,21,186,233,77,77,227,122,77,172,105,77,215,139,93,99,211,132,99,197,47,43,205,9,7,62,121,121,40,158,59,138,198,3,45,223,194,53,156,159,15,59,178,187,70,77,233,100,29,191,127,147,63,8,81,118,242,1,57,63,164,174,165,209,28,31,215,39,175,3,81,36,153,76,24,88,199,87,116,197,155,3,45,150,166,35,43,80,126,121,190,40,12,181,58,0,149,71,150,79,107,4,51,144,124,83,183,166,139,136,12,213,173,214,66,179,185,28,31,239,174,142,171,124,192,80,52,174,70,223,1,230,9,116,171,200,89,239,185,34,156,187,43,28,77,69,204,217,131,20,154,93,14,249,234,117,55,106,98,93,94,15,9,87,129,159,58,45,124,45,127,33,214,139,76,71,213,184,123,115,59,184,167,189,137,25,177,1,69,
+177,21,81,215,69,121,13,173,22,105,213,24,126,113,108,203,212,84,242,5,92,247,93,113,58,113,56,174,43,70,210,141,112,45,175,11,178,212,245,153,60,192,20,130,228,70,95,102,153,115,158,224,203,2,60,57,135,186,76,212,202,151,133,105,219,173,214,235,220,45,39,234,103,126,73,82,33,147,205,64,59,39,145,80,54,155,21,104,179,26,84,215,122,124,211,38,121,45,7,2,103,121,220,75,139,101,101,89,91,137,206,81,17,51,56,55,159,91,113,32,90,216,199,243,219,124,9,27,138,46,73,218,76,38,83,42,153,76,226,15,155,5,16,249,54,134,186,238,21,109,143,89,123,34,136,64,70,79,4,20,203,86,115,78,186,175,201,147,153,121,104,34,236,223,118,215,211,75,222,36,63,43,73,102,249,66,24,43,203,184,54,173,120,138,70,218,40,39,10,133,130,170,227,107,118,114,145,121,158,221,151,150,77,74,85,110,110,74,38,214,122,21,62,146,215,169,114,171,137,33,224,246,117,91,149,220,117,230,109,62,24,174,172,178,189,100,39,98,193,55,231,157,117,238,68,208,
+227,243,120,194,204,29,10,115,66,228,204,204,166,170,182,197,243,76,172,13,133,207,55,85,213,219,115,158,251,56,203,169,241,101,33,30,214,166,66,217,124,203,219,41,116,58,237,176,248,67,39,29,2,141,39,16,4,4,48,102,91,13,212,219,137,239,212,115,175,128,250,116,78,166,46,11,189,217,180,38,222,220,179,168,235,133,224,110,124,28,147,205,56,128,252,6,144,239,188,200,120,17,175,23,135,195,21,10,206,2,35,219,81,226,100,157,110,251,246,234,152,46,18,44,79,120,147,147,144,220,182,137,133,152,202,114,66,18,84,150,171,194,42,236,134,35,91,186,204,121,185,93,94,101,159,103,232,171,44,143,113,67,236,129,160,107,72,101,105,146,66,225,108,88,40,114,176,170,201,217,230,82,87,11,227,224,16,131,0,226,67,42,15,170,232,208,242,152,55,185,11,100,110,50,32,156,190,21,63,133,33,20,132,178,205,194,249,51,85,128,201,168,89,72,82,120,92,5,223,51,84,172,114,85,142,44,72,203,216,61,99,128,45,230,116,174,122,33,242,57,87,239,189,115,158,233,
+198,156,254,204,14,118,163,227,89,234,193,240,184,140,231,153,13,208,35,207,1,249,211,222,245,89,199,59,54,233,25,213,188,234,81,30,10,146,160,58,157,140,67,182,5,160,110,30,50,46,205,220,75,137,165,248,178,165,251,13,63,163,233,5,139,147,48,99,179,167,29,148,38,50,144,10,250,32,82,146,114,140,205,141,65,242,49,65,83,144,43,166,59,99,128,239,36,95,21,227,54,142,11,228,84,117,105,59,5,222,222,181,82,213,214,57,40,130,187,74,79,221,186,238,169,57,50,82,120,30,194,17,97,175,164,33,180,77,66,155,30,111,3,237,69,179,61,198,115,118,70,157,170,194,211,222,240,253,93,70,125,114,127,135,102,147,239,239,82,213,171,222,221,82,48,19,95,96,133,5,9,177,103,19,77,204,184,50,2,39,147,86,33,195,176,183,158,171,21,224,253,70,22,87,99,68,46,178,231,54,134,41,114,177,27,15,248,124,145,68,173,230,225,64,251,187,46,158,136,87,93,113,214,116,28,207,174,35,67,143,44,132,50,55,230,11,193,54,94,80,221,115,70,182,241,113,
+21,87,86,117,153,68,38,174,90,173,19,149,245,154,208,42,35,211,225,82,48,100,68,37,171,150,107,233,178,214,13,111,32,71,1,120,31,134,22,161,172,109,214,41,64,187,253,171,187,1,6,187,5,9,225,45,79,228,84,22,54,236,105,165,229,132,87,89,86,1,25,16,121,143,150,193,130,56,214,67,69,102,211,187,13,113,242,45,243,54,49,163,137,174,75,183,224,77,176,163,233,140,164,122,45,184,222,246,136,210,164,230,221,94,69,30,189,67,67,80,228,92,230,102,97,2,181,26,109,153,90,119,135,181,112,132,167,45,102,151,151,17,7,188,35,97,45,203,211,27,210,134,67,10,179,123,33,161,128,87,120,112,158,98,110,123,164,91,56,136,237,233,190,219,118,35,128,150,49,139,100,84,38,221,142,153,149,194,170,35,64,12,206,201,249,245,118,205,90,83,236,134,249,85,121,211,105,193,78,79,152,202,87,87,53,56,68,155,167,103,3,52,63,171,39,20,152,100,254,242,185,171,247,28,64,101,155,223,5,206,151,235,101,176,206,134,150,113,153,251,108,216,180,29,121,45,
+116,24,194,65,209,251,184,237,100,9,153,113,231,4,135,76,33,215,97,218,4,39,94,187,88,155,208,73,200,30,105,234,94,74,149,181,38,210,94,168,34,33,31,254,116,29,74,11,242,250,133,229,46,121,83,144,170,58,123,209,151,201,85,247,15,120,75,106,16,40,133,204,58,228,135,155,98,193,130,73,114,163,78,248,65,87,220,43,67,174,245,115,187,175,40,232,180,27,213,163,150,100,141,152,189,218,222,175,187,188,142,12,210,51,126,227,186,190,191,172,217,45,51,183,252,115,239,232,215,39,54,64,50,66,146,228,132,141,174,105,213,2,1,84,96,156,213,137,102,179,34,129,118,92,11,159,27,81,206,204,45,8,225,61,29,84,88,168,2,190,48,103,195,163,210,151,19,200,89,58,149,74,229,114,190,220,173,131,156,17,89,41,189,162,184,237,63,220,167,153,5,199,107,30,165,247,80,128,93,116,102,52,46,182,87,22,150,101,60,213,77,43,141,89,242,239,223,52,202,245,186,66,59,190,26,14,161,243,27,208,50,9,125,239,40,99,247,68,16,0,101,238,106,201,143,134,
+139,103,248,54,166,50,165,242,133,66,33,83,62,159,63,4,50,147,61,161,64,102,23,8,189,209,93,175,136,162,58,197,138,71,170,34,222,103,45,213,92,190,207,90,236,26,229,62,107,103,225,201,251,172,77,85,143,238,179,86,182,52,247,174,76,235,93,247,89,75,144,166,239,179,246,60,195,234,249,5,148,2,15,234,30,199,244,12,168,5,189,29,141,223,75,93,245,156,42,163,233,234,60,204,168,188,35,167,35,128,188,82,175,23,105,97,77,43,32,207,171,2,36,85,41,159,15,37,215,25,62,73,214,91,76,91,184,157,206,57,75,21,84,243,220,203,189,243,164,82,228,91,181,133,22,74,158,11,239,251,17,116,76,36,178,131,243,67,145,155,242,59,171,221,213,252,169,187,202,151,249,121,140,110,29,196,232,82,165,142,103,229,195,157,138,60,223,162,43,114,119,160,181,13,20,3,53,175,87,100,167,71,148,50,78,92,119,33,90,22,66,184,69,72,158,184,184,188,188,180,51,53,234,110,45,239,84,122,103,179,173,76,198,191,127,87,144,251,229,80,146,233,167,85,196,104,
+92,117,73,77,130,211,219,238,172,171,193,220,64,100,50,217,250,250,186,90,166,14,36,155,106,60,14,145,117,157,87,199,24,211,98,36,105,71,114,91,121,146,57,129,128,48,153,93,153,158,14,7,37,201,155,172,79,216,101,100,25,123,49,155,205,164,82,117,91,173,160,18,111,165,202,172,231,205,42,240,71,74,134,19,3,105,104,60,147,229,86,22,192,161,234,129,196,245,106,198,158,10,90,178,158,42,176,63,151,226,115,110,133,78,9,213,90,44,203,40,224,8,53,51,212,190,36,44,98,38,20,205,20,166,186,37,152,8,235,154,137,52,77,133,59,13,196,66,124,24,178,31,166,82,22,52,30,151,79,7,235,85,13,167,133,149,55,64,135,91,215,85,249,101,200,231,243,10,118,45,130,152,65,128,85,102,110,175,12,107,231,231,2,113,118,2,141,35,218,228,244,118,220,178,108,135,34,17,237,45,27,179,140,238,176,214,244,53,39,236,225,162,197,156,134,214,151,77,55,211,14,134,215,146,168,249,106,181,41,109,243,168,19,228,116,166,110,117,24,151,214,9,10,167,179,118,
+23,83,204,121,45,55,87,134,118,17,51,69,174,102,154,146,3,148,131,161,96,168,85,200,70,57,228,169,158,52,91,173,90,214,195,241,48,65,111,42,191,11,103,198,206,88,48,116,62,29,22,246,66,6,212,242,44,147,76,117,165,244,211,21,208,188,20,242,217,172,201,133,112,47,91,117,118,236,172,236,140,81,147,182,154,90,167,174,102,195,218,162,150,91,65,120,23,97,52,99,252,60,19,216,23,213,100,155,139,56,89,184,123,104,98,33,65,221,114,192,175,38,196,123,162,136,123,42,119,179,197,66,118,218,231,96,85,237,186,91,128,243,152,36,199,200,151,58,3,66,61,196,162,30,175,157,239,104,212,142,106,162,193,19,99,215,21,206,32,26,214,129,102,111,58,14,136,1,173,168,71,12,104,215,133,138,136,110,174,115,49,151,43,218,136,141,112,166,118,22,75,65,190,128,200,201,154,234,110,203,235,220,210,234,111,126,95,182,245,174,173,69,101,14,180,247,245,219,24,233,125,223,182,12,25,122,95,134,129,71,227,189,47,205,64,199,155,248,134,239,229,126,155,206,56,86,
+34,5,58,184,222,186,242,223,195,79,92,157,32,58,229,138,181,113,191,148,122,32,191,86,79,248,192,53,113,189,23,247,217,4,100,214,166,167,57,182,187,38,80,110,122,54,199,118,39,129,40,186,143,111,168,121,87,244,130,93,212,134,251,68,32,241,45,148,96,236,170,38,51,69,84,198,214,132,206,204,24,43,189,193,191,8,47,19,246,129,18,247,109,69,137,59,21,186,152,21,24,59,191,90,109,71,177,254,75,119,50,150,183,10,80,27,126,28,18,98,52,8,190,99,128,237,98,17,67,63,108,156,147,211,178,49,30,18,116,78,179,252,39,122,203,28,124,44,64,205,248,206,15,170,146,229,12,27,106,78,47,76,59,2,52,172,219,183,212,217,150,171,218,123,200,205,149,242,246,198,34,91,96,105,78,171,56,150,118,204,195,10,192,211,91,1,242,58,108,72,22,167,185,172,4,199,139,223,42,23,152,56,177,167,202,168,45,41,34,153,52,34,159,224,145,81,139,190,105,143,143,37,209,210,103,238,244,174,170,181,200,165,41,50,218,70,67,52,219,22,30,216,249,86,126,85,
+183,36,183,118,180,60,214,145,147,9,235,110,217,30,144,175,211,248,187,137,229,240,57,57,190,151,11,243,175,147,36,67,88,71,128,106,251,169,172,54,45,75,10,80,17,166,166,51,221,241,173,121,204,70,137,55,211,212,135,136,205,69,253,22,38,179,32,136,199,77,16,145,88,86,165,217,53,240,62,142,191,66,174,25,105,60,31,17,200,186,200,54,169,145,177,32,155,251,56,164,6,97,234,206,140,168,91,21,20,51,119,38,117,133,211,140,213,11,33,245,132,40,209,216,94,238,200,14,138,188,155,172,78,133,32,221,78,35,61,129,215,110,233,138,121,69,222,195,210,213,131,101,70,161,62,21,193,181,234,206,166,158,239,171,229,198,212,90,171,130,180,231,19,71,252,153,240,42,97,195,193,18,229,26,78,34,121,26,9,51,90,120,13,193,94,37,160,195,56,168,182,53,45,56,177,178,108,233,232,74,46,20,18,132,23,3,25,70,60,192,14,94,233,150,58,89,119,190,64,170,84,214,52,100,4,1,111,9,162,110,24,73,118,139,200,109,178,169,109,21,92,44,114,150,157,177,
+171,213,54,117,53,217,140,221,238,179,2,77,65,84,225,234,216,215,90,88,15,237,60,157,148,32,209,96,216,121,198,102,102,25,197,88,213,93,67,120,165,70,85,113,87,208,21,161,80,217,30,138,78,181,151,74,34,13,97,204,69,143,211,142,228,235,9,60,177,152,166,197,155,65,101,116,215,131,242,149,247,17,217,117,64,175,227,196,79,57,168,192,21,89,151,72,51,247,66,237,219,227,66,102,223,222,140,113,176,190,99,24,170,233,226,33,146,170,218,44,119,28,8,67,40,186,13,138,194,14,114,214,18,202,169,4,73,158,102,90,136,171,7,66,182,34,58,8,220,82,208,147,43,206,253,155,137,96,253,82,141,56,102,4,30,73,151,120,156,46,17,125,203,184,253,56,172,32,220,161,45,199,39,83,133,75,90,171,52,118,142,150,56,51,181,173,40,84,157,64,153,241,144,192,227,116,215,183,149,55,71,136,62,180,53,125,29,134,110,228,19,69,118,115,143,153,170,111,160,11,133,100,188,124,58,187,176,112,24,184,213,213,5,140,238,149,167,46,23,68,156,8,29,58,217,242,
+200,156,202,241,248,65,54,228,236,52,74,197,148,74,217,196,162,59,38,165,29,18,206,148,226,82,82,171,98,195,181,53,190,101,140,12,9,77,197,195,151,144,26,187,79,13,79,162,240,112,68,131,95,129,125,152,125,43,172,230,121,67,124,53,43,68,218,108,197,151,120,69,19,130,167,201,180,153,116,181,88,48,95,135,98,36,230,33,47,76,77,174,76,136,232,181,174,196,19,201,64,124,103,133,24,152,137,156,32,57,200,228,159,15,222,26,188,107,55,130,6,193,32,24,119,144,121,129,80,7,55,183,113,157,233,22,103,117,27,104,231,182,138,145,23,210,220,161,184,156,175,226,193,154,184,114,225,38,47,196,116,141,23,204,200,162,186,27,172,200,196,94,211,169,180,202,150,171,174,11,25,173,108,223,219,153,142,240,182,199,241,43,123,184,13,169,15,164,131,213,159,65,54,48,109,82,121,70,6,55,25,165,210,6,90,40,189,163,234,80,5,38,79,168,164,95,206,234,24,55,222,88,75,39,190,81,103,157,71,180,168,239,50,19,186,234,32,251,55,167,178,130,175,90,54,223,
+65,110,21,85,137,4,246,35,76,69,101,6,205,100,146,68,83,225,100,196,189,105,54,8,32,58,38,71,78,30,161,89,194,246,78,169,20,137,79,238,31,139,43,27,6,162,174,37,73,150,90,57,38,113,239,6,25,223,40,29,197,35,119,249,73,133,234,162,57,237,88,152,236,38,240,20,195,2,199,86,13,173,149,123,245,181,60,14,94,183,29,34,186,30,212,150,77,177,7,105,121,178,150,141,69,145,157,102,23,216,105,28,207,216,82,84,73,194,36,26,78,168,104,110,119,36,78,118,48,35,209,149,140,160,40,65,42,77,67,22,190,216,238,242,15,167,173,4,156,119,98,135,39,60,69,241,164,160,114,35,11,244,211,210,94,147,160,229,233,142,13,203,28,108,8,154,94,216,202,24,208,34,122,101,75,187,219,78,49,101,99,27,98,118,129,169,132,166,47,15,136,150,180,225,136,209,227,159,88,98,157,101,167,193,154,109,113,13,55,3,22,22,167,206,77,160,244,94,44,31,110,101,143,4,168,21,153,81,48,139,93,245,140,105,207,216,78,240,42,52,54,71,221,220,196,148,
+58,19,153,0,201,204,244,218,87,74,117,192,53,51,174,107,147,47,151,92,25,156,126,201,83,140,128,250,105,32,28,69,48,59,179,222,9,98,234,204,224,45,159,94,205,128,23,158,177,155,69,36,27,217,241,110,17,252,155,201,54,16,118,52,169,51,229,157,68,68,180,234,215,99,45,4,80,169,231,224,166,222,178,21,59,22,236,160,12,68,141,110,82,53,94,3,245,222,176,136,16,198,169,231,92,148,119,162,190,53,211,149,56,233,171,71,242,121,239,196,205,49,130,205,66,147,224,141,3,171,57,88,223,87,77,194,115,109,24,123,32,18,234,162,240,209,86,15,118,91,127,183,136,79,3,213,87,7,81,209,250,114,99,145,138,151,236,67,9,141,131,142,114,79,186,87,78,105,176,60,156,9,235,168,99,56,242,26,120,115,157,104,44,47,151,166,153,147,48,209,0,99,175,189,213,106,195,170,23,30,57,50,171,10,117,91,196,156,70,196,99,91,71,249,69,104,186,180,46,187,97,112,53,130,236,22,39,50,83,78,201,22,8,248,238,148,56,185,116,4,29,81,192,83,206,142,
+207,211,206,49,193,185,118,162,144,31,196,43,149,162,117,250,18,115,62,3,100,186,152,136,193,164,47,110,158,163,3,128,13,205,188,32,48,176,251,4,102,46,198,246,28,48,39,187,252,109,76,145,74,102,75,169,188,147,217,46,56,18,247,45,16,83,204,242,78,80,206,72,221,93,234,185,37,17,151,54,111,163,213,154,94,3,100,239,47,148,153,107,147,240,30,16,75,95,35,217,166,192,149,178,182,102,195,128,235,50,184,46,130,43,1,92,201,224,138,37,137,54,54,23,255,245,239,183,202,38,41,181,110,152,26,67,237,222,33,247,15,78,39,222,127,241,245,238,120,158,102,191,59,158,77,168,119,199,243,152,228,221,49,254,77,116,62,91,161,234,191,95,103,255,187,248,77,209,30,29,34,136,116,246,219,23,214,234,60,126,142,78,43,209,139,201,149,248,116,116,137,201,200,212,66,136,43,148,89,206,178,154,13,23,214,174,185,213,79,235,90,19,2,156,85,217,205,220,30,184,215,139,71,83,215,219,184,29,198,196,226,220,166,208,58,87,138,76,116,22,229,129,235,48,46,91,
+215,178,131,54,183,21,215,145,115,57,29,154,53,183,113,72,243,117,142,213,106,203,186,122,203,56,193,211,38,39,106,75,92,119,64,215,225,149,181,5,105,115,158,169,77,98,183,25,141,59,90,155,112,145,136,206,16,20,145,16,131,225,50,84,155,145,69,102,87,127,27,74,184,137,214,238,93,102,54,144,143,228,12,104,150,139,108,168,221,196,232,82,173,11,127,166,77,198,168,168,10,186,70,55,57,124,140,176,61,220,141,208,189,58,40,94,100,224,231,245,59,246,249,203,6,146,9,28,140,185,190,50,17,52,242,73,223,223,254,108,180,111,244,31,159,252,252,213,243,209,55,125,111,126,246,242,23,111,122,211,206,125,63,249,226,249,243,190,215,79,94,252,116,180,55,141,252,53,131,210,207,94,244,61,121,218,251,243,163,247,243,227,131,31,245,253,245,79,126,242,102,244,237,155,190,39,47,62,239,123,250,252,217,171,87,128,231,189,154,255,235,229,23,125,79,159,188,0,194,122,36,247,42,126,53,211,253,242,205,179,158,160,95,177,253,198,211,175,168,124,251,178,175,55,20,253,
+236,39,207,70,63,239,123,61,250,244,45,128,247,124,244,75,181,239,102,170,191,162,185,7,241,221,156,247,179,55,189,121,238,167,127,127,63,179,254,249,175,69,246,70,187,123,195,222,127,246,226,243,79,223,143,89,247,6,175,223,190,4,191,238,65,188,122,61,250,15,207,94,126,241,230,221,56,248,71,125,63,120,242,250,237,179,167,95,60,127,242,250,249,47,251,158,253,252,213,203,215,0,195,253,116,251,211,151,63,255,241,179,222,60,251,59,3,255,243,189,29,191,86,212,211,242,61,176,4,158,126,10,36,63,121,219,3,247,19,224,192,190,167,175,71,159,220,143,128,247,189,24,253,197,187,17,251,159,188,124,221,247,230,139,31,191,30,253,105,143,21,184,255,233,23,175,95,143,2,61,247,79,159,0,134,143,126,115,88,236,63,124,36,188,55,10,254,167,47,127,240,126,146,253,155,231,193,191,50,174,252,193,187,129,236,251,113,233,222,8,222,253,72,248,159,191,126,242,203,222,164,221,192,215,76,19,191,227,238,141,218,189,103,253,141,1,187,95,207,236,13,245,127,205,236,223,
+175,198,223,254,231,230,215,191,156,67,255,151,102,215,123,148,95,177,253,23,191,59,34,248,46,30,63,189,31,111,254,173,57,229,127,153,177,23,135,31,124,179,188,193,119,254,251,93,130,94,100,125,250,193,200,253,176,234,253,176,231,255,15,74,191,97,249,203,32,254,114,46,251,221,224,249,255,39,133,255,65,67,144,35,95,153,126,28,24,124,244,240,247,7,134,7,71,230,38,108,99,215,99,191,49,253,200,192,220,16,77,235,148,49,19,251,68,238,50,222,24,118,121,185,176,241,100,31,154,88,156,156,70,109,46,204,144,239,78,198,73,142,165,131,241,53,131,126,85,117,25,174,45,73,8,151,173,184,48,40,52,236,205,76,139,204,156,35,126,220,37,19,150,162,43,180,133,83,29,93,173,114,43,233,165,69,165,83,25,60,218,187,36,81,8,14,118,222,130,143,79,196,15,180,51,59,117,73,189,150,43,22,247,107,215,181,186,60,233,109,234,148,205,108,86,238,9,168,201,174,50,175,181,153,172,109,168,86,230,143,248,173,29,245,122,123,123,82,122,69,40,44,9,2,215,55,
+74,78,157,111,113,26,241,238,203,24,87,68,9,180,54,166,165,133,244,122,132,95,220,100,98,170,209,173,124,53,188,21,188,61,119,79,209,73,172,211,185,57,161,234,148,58,23,46,193,9,60,116,231,214,99,110,228,68,167,119,137,67,106,158,28,140,55,242,89,110,154,163,113,178,79,202,135,140,173,75,191,90,41,76,178,84,132,114,46,118,19,69,214,196,183,141,200,165,155,60,222,48,141,243,26,58,140,13,161,24,36,183,118,243,118,115,170,32,59,159,199,205,77,200,72,53,150,220,103,60,107,162,152,68,213,186,95,16,94,160,138,217,19,147,168,49,164,190,91,11,78,251,55,218,155,120,55,53,94,40,76,99,173,187,245,74,82,215,73,145,75,187,254,205,246,12,110,242,174,118,103,103,163,184,87,142,75,130,216,41,102,94,218,157,151,17,103,244,32,165,214,79,93,162,102,81,237,0,127,22,147,193,25,13,181,174,122,193,153,135,101,188,45,231,158,25,83,69,248,74,21,135,143,169,80,172,154,5,167,208,190,155,26,171,234,107,161,21,204,46,178,188,199,213,84,141,
+201,147,181,213,201,208,244,145,111,249,132,156,186,242,42,14,213,231,27,78,250,10,66,93,20,39,133,235,227,86,225,82,136,84,209,57,203,39,23,29,129,36,157,80,44,36,178,122,106,83,178,67,45,158,4,180,11,242,195,233,176,162,131,42,198,203,68,163,160,228,174,47,238,251,78,120,233,69,117,72,123,130,218,42,44,45,119,13,219,36,133,233,76,208,154,62,135,47,22,103,247,86,4,1,175,21,154,136,164,168,11,217,202,120,155,228,61,156,61,118,233,140,84,211,90,77,187,20,104,69,207,199,232,77,213,76,73,26,166,100,215,29,49,210,4,113,150,141,50,21,23,110,86,28,197,82,210,45,181,8,214,3,102,135,70,125,130,22,89,19,93,188,52,99,149,177,253,135,173,107,209,229,21,236,57,86,238,249,87,46,138,165,118,22,115,178,147,55,132,88,139,251,251,97,23,14,83,152,95,31,91,36,18,15,57,206,89,98,109,129,151,35,98,248,203,119,238,41,20,58,121,156,188,94,26,179,30,236,204,160,35,74,18,121,25,33,209,139,232,204,138,241,40,74,54,203,
+80,243,149,13,41,42,48,158,204,232,140,240,100,150,197,184,51,158,122,148,21,43,163,149,180,116,139,145,146,174,98,91,171,94,52,194,71,166,115,246,66,172,65,100,45,200,74,200,150,245,78,105,62,163,85,84,203,23,105,166,213,181,18,162,135,47,187,231,123,104,221,233,180,216,107,84,109,92,196,119,84,107,41,65,244,224,50,45,64,163,243,66,182,223,14,89,242,26,145,214,19,232,104,140,200,33,53,210,41,204,21,109,36,38,180,109,217,15,144,27,242,109,197,100,138,47,26,79,5,119,117,24,131,135,169,190,18,194,173,210,109,82,144,56,143,228,213,232,221,69,43,118,43,141,239,114,111,115,199,119,248,85,60,167,136,89,180,95,11,125,84,99,80,201,54,138,35,242,154,225,122,137,198,166,133,171,200,217,140,81,181,98,84,153,90,182,157,24,67,42,154,100,121,121,69,78,49,216,209,228,185,44,93,87,34,80,152,152,197,78,58,160,177,137,114,217,70,180,92,15,150,213,106,157,14,186,225,158,45,31,72,176,168,162,218,215,192,67,245,124,249,168,65,243,53,168,
+100,229,89,118,206,182,108,107,115,141,219,246,64,217,82,112,173,111,34,199,121,106,58,201,104,76,67,107,180,230,49,111,130,201,114,234,13,39,181,58,207,31,131,195,227,153,40,109,153,149,96,240,239,110,44,113,131,180,144,228,81,181,72,140,220,225,106,240,161,70,21,223,12,219,186,242,250,177,94,99,231,22,243,221,104,249,242,166,75,56,241,118,52,16,42,90,44,224,246,67,201,128,78,103,83,171,131,146,14,43,29,87,41,147,94,187,162,101,221,70,155,111,117,233,21,80,99,52,37,114,124,38,125,201,164,31,59,46,49,168,115,82,238,130,101,38,96,207,98,118,227,137,160,49,147,160,37,212,238,211,149,91,35,71,113,42,89,156,19,46,173,185,198,237,101,223,120,204,135,215,85,16,191,157,149,237,220,30,106,152,72,40,212,153,96,152,81,72,225,70,231,73,66,145,72,62,16,72,231,249,194,178,92,180,217,73,35,49,182,176,217,40,84,117,18,59,41,201,164,75,48,115,43,242,36,125,54,115,70,165,115,215,210,43,205,200,102,163,46,202,182,26,38,138,150,213,
+101,73,91,138,204,25,203,124,186,166,90,71,194,252,98,121,42,169,50,241,146,150,43,161,53,89,86,103,230,214,58,176,28,209,120,252,132,136,35,66,170,223,82,211,69,43,149,37,200,195,122,132,205,129,130,14,101,41,60,119,158,231,181,171,39,210,12,123,73,68,193,108,210,246,35,206,241,205,99,117,146,49,71,113,139,109,210,61,140,56,213,137,70,138,120,188,225,32,107,180,65,122,234,58,116,147,227,161,172,42,181,207,158,72,51,178,137,66,101,155,214,184,157,90,246,166,165,245,73,215,42,231,96,67,122,228,100,168,60,113,8,115,46,183,230,87,22,97,41,59,112,13,67,197,211,229,233,181,34,85,1,241,136,184,211,19,110,195,186,199,187,9,77,111,146,154,201,172,211,158,184,18,250,97,229,162,213,123,150,95,174,196,85,2,46,18,44,46,182,188,251,98,131,212,122,36,191,242,196,146,235,81,88,154,128,227,32,164,103,211,157,220,198,50,174,178,130,15,117,167,166,115,146,64,66,171,157,161,108,29,4,96,116,17,246,27,236,210,94,24,237,185,20,147,62,174,
+162,81,247,8,37,178,203,173,109,182,31,127,188,97,219,53,169,5,205,77,117,8,223,129,218,44,177,34,137,93,182,182,100,108,107,64,154,90,63,180,45,193,171,83,86,154,147,118,97,167,99,150,172,233,32,204,82,186,143,169,138,56,149,57,47,197,120,119,147,164,6,175,104,224,90,153,152,75,247,18,253,178,187,151,148,208,215,26,53,95,166,193,10,174,175,112,171,251,110,91,117,155,113,225,105,116,79,124,199,235,100,95,197,166,213,53,75,60,229,5,254,248,108,221,10,23,78,89,179,233,85,250,198,242,66,243,8,11,227,219,249,166,244,122,101,246,70,182,227,217,14,249,210,7,187,139,235,216,46,233,104,141,38,65,244,181,78,170,189,149,115,96,113,34,49,84,16,238,33,197,248,229,249,244,88,131,158,99,6,47,3,10,60,110,62,82,128,23,149,167,137,192,78,40,32,59,230,100,155,238,128,216,22,128,197,218,178,117,18,35,56,218,164,55,175,54,196,80,103,47,68,69,120,193,109,225,33,109,185,124,69,76,203,163,214,13,168,84,109,90,217,254,20,91,41,193,
+134,26,203,139,144,56,2,111,27,132,183,1,132,176,150,50,94,57,92,172,217,29,126,110,35,176,45,188,233,210,4,103,200,42,140,220,148,58,151,7,88,250,92,211,92,115,111,193,82,196,186,76,68,84,179,90,89,108,175,77,138,169,78,77,193,237,45,70,57,224,175,19,48,174,57,21,135,173,16,171,242,87,83,206,77,84,186,21,179,47,118,14,164,84,255,78,122,205,58,157,235,180,119,99,38,235,217,38,45,186,22,48,21,226,121,237,10,101,150,31,240,138,252,226,133,214,137,124,122,156,175,68,71,23,100,62,58,237,104,49,162,69,7,132,162,90,7,36,33,165,104,222,148,93,174,32,8,169,120,17,137,27,118,54,175,84,75,55,117,35,178,218,60,138,31,200,224,136,248,84,194,110,186,185,22,99,87,72,70,88,51,105,204,132,147,98,142,179,3,103,181,171,36,60,129,24,207,38,20,22,131,148,201,167,136,177,153,242,188,145,152,94,27,91,49,40,241,73,154,68,15,117,69,7,51,20,122,17,188,149,171,115,37,159,94,38,174,251,78,35,76,153,72,171,17,206,
+36,172,22,71,219,138,25,15,176,147,34,102,72,136,30,143,175,111,105,4,37,120,25,187,55,167,137,105,253,210,153,84,192,191,146,62,223,91,116,165,142,52,50,207,124,205,70,192,237,36,236,221,245,50,165,30,186,179,194,229,192,12,195,125,148,161,181,39,43,71,25,195,137,98,43,169,31,111,120,203,140,92,122,251,66,43,148,212,112,73,108,96,169,40,244,156,241,155,145,114,9,17,30,119,55,24,199,168,188,189,34,141,156,205,156,200,155,52,109,41,174,215,242,154,205,244,255,75,220,123,61,55,155,165,247,129,255,202,87,190,216,29,217,178,74,235,80,174,178,181,23,178,36,175,85,107,107,93,171,221,27,187,166,106,90,51,61,163,222,26,77,171,122,70,178,116,179,133,72,0,4,145,137,28,73,68,18,137,68,206,129,200,57,3,4,136,64,0,68,206,57,3,251,130,236,30,117,247,204,238,214,214,94,248,187,224,71,188,231,156,231,249,61,241,156,247,156,195,7,98,159,26,217,145,42,136,164,59,73,31,62,242,132,229,80,53,182,80,206,142,182,170,200,218,215,62,
+152,96,251,171,60,21,134,187,217,171,150,21,8,158,49,188,118,196,27,15,0,211,147,101,240,192,11,150,176,71,162,114,120,114,80,236,45,234,149,169,104,84,75,53,71,155,127,89,183,218,109,248,8,131,178,101,80,232,187,229,245,78,79,190,8,51,208,166,222,108,215,77,139,156,219,220,105,98,153,238,26,227,81,192,202,61,132,233,219,151,59,186,10,212,193,191,22,170,56,186,212,78,222,197,162,211,157,144,82,216,184,29,55,244,36,141,188,136,219,6,76,104,57,141,65,107,224,144,232,27,148,183,66,165,122,216,135,43,232,209,110,210,104,105,199,133,222,73,9,93,163,57,32,236,124,186,208,29,115,162,13,231,162,86,143,81,106,49,23,65,79,169,114,244,85,197,104,118,0,159,82,115,199,69,192,94,202,212,111,122,176,139,163,252,161,223,227,212,110,12,212,102,131,195,32,58,97,97,169,93,164,239,189,154,10,71,132,91,131,120,241,208,59,151,23,242,222,169,47,199,68,128,184,241,182,134,248,10,21,245,178,98,137,188,150,155,37,166,223,237,48,205,251,19,21,187,
+49,166,109,131,81,207,150,207,39,212,33,107,85,55,48,139,42,86,219,105,186,218,210,217,90,35,231,94,24,224,228,214,163,141,203,92,38,27,203,66,151,133,131,86,151,224,116,238,193,155,218,70,220,1,29,166,20,188,16,37,202,234,130,64,115,207,220,83,28,219,124,216,181,74,139,232,33,113,83,242,112,176,139,60,111,146,183,217,113,217,114,233,50,169,232,117,147,149,55,25,76,139,60,44,75,118,146,94,114,225,142,156,205,154,47,61,110,92,80,188,97,189,216,134,251,105,66,9,24,194,18,39,206,6,182,245,26,190,89,113,146,167,90,143,219,104,236,241,198,220,118,230,92,215,40,133,198,66,146,154,150,27,111,17,190,125,119,19,137,23,222,198,174,42,51,199,91,116,187,205,29,166,42,16,224,187,195,121,75,153,30,21,141,227,37,46,100,23,89,143,235,7,210,134,94,89,171,79,71,253,165,129,179,230,143,142,36,184,193,56,34,191,89,216,246,67,109,94,126,168,68,44,189,209,74,61,52,178,153,197,197,182,128,175,196,34,111,235,29,113,62,117,174,43,28,187,
+118,184,239,216,157,216,206,176,201,56,144,81,136,183,64,125,105,237,174,144,80,246,226,2,91,147,93,59,115,116,204,149,225,82,220,183,31,39,71,183,149,205,198,147,32,55,24,69,101,176,95,245,156,134,213,100,89,186,136,92,40,224,135,219,174,33,82,45,44,61,109,108,124,147,205,159,252,30,136,31,167,94,239,42,121,109,229,182,197,124,219,251,171,164,216,46,182,43,146,171,187,13,123,91,43,198,30,19,39,18,103,8,113,108,68,22,247,99,164,26,186,91,74,137,15,253,248,140,173,137,206,201,81,197,131,100,95,188,183,207,131,229,78,37,15,166,207,111,175,69,132,124,241,109,200,25,9,229,244,80,20,217,84,136,157,199,186,231,225,116,244,28,193,141,169,128,116,147,47,205,186,59,23,116,99,142,61,104,248,149,244,64,6,58,148,69,70,117,54,244,18,144,83,47,240,158,234,243,58,113,108,191,16,177,12,136,114,230,183,11,19,207,162,202,48,34,200,61,59,165,145,148,148,162,35,166,158,84,143,141,138,6,218,228,57,167,15,51,238,188,16,31,76,95,253,111,
+6,101,210,96,77,204,187,215,214,213,94,178,215,238,150,30,130,89,153,40,2,47,2,229,104,126,248,36,160,80,96,79,222,57,217,27,230,201,251,212,199,75,69,144,84,198,79,87,88,65,65,67,138,26,4,36,8,124,110,184,83,15,34,247,112,25,188,164,198,163,123,145,25,35,215,44,59,122,110,188,165,211,185,109,83,57,237,82,215,159,122,214,128,235,84,142,100,198,210,74,194,230,28,236,181,3,125,121,208,182,153,123,33,62,117,249,34,124,76,41,25,143,131,7,163,247,5,106,19,162,56,29,98,246,134,176,213,83,229,75,201,81,147,179,101,10,130,215,112,240,144,234,203,26,184,205,192,99,136,152,183,228,185,196,46,71,224,184,245,172,236,228,215,147,34,66,208,170,188,241,165,36,9,235,124,23,32,244,229,59,185,124,66,79,37,18,175,143,175,97,180,247,84,111,211,50,199,164,173,77,150,191,58,82,197,59,146,188,93,158,93,92,117,4,234,164,35,53,247,195,251,80,99,74,179,29,227,68,116,211,171,177,15,245,105,118,155,169,221,147,10,67,69,66,186,47,
+166,209,49,170,29,114,199,135,101,5,34,179,136,144,254,90,117,128,29,80,81,232,65,65,191,68,202,229,114,225,137,109,243,239,13,50,174,97,242,100,189,18,192,225,112,226,229,96,45,147,209,76,108,197,165,252,68,88,202,227,137,147,210,50,189,12,53,110,141,29,190,247,10,212,88,77,42,135,92,62,150,136,83,221,94,175,119,75,144,48,156,236,136,85,93,40,72,10,156,205,27,97,77,106,89,116,48,129,62,58,202,74,220,52,239,138,64,43,131,90,196,49,229,94,223,28,188,232,4,17,169,162,162,16,121,146,7,172,18,245,112,117,135,31,122,117,122,145,228,118,252,64,141,165,237,203,62,237,68,208,113,200,211,110,163,145,120,209,74,74,227,203,16,30,50,164,76,22,50,155,50,44,67,31,240,192,76,143,189,58,204,166,79,21,152,231,13,238,162,36,19,169,146,84,195,91,88,197,11,103,242,82,127,5,234,155,25,220,233,113,55,242,201,156,107,37,219,45,68,237,121,138,75,146,91,208,79,135,139,151,123,138,112,70,156,118,34,202,235,80,139,244,20,3,214,89,
+124,95,158,252,250,4,245,144,200,170,73,155,9,105,64,30,100,7,240,85,167,16,8,160,34,217,126,117,219,163,24,198,237,176,26,101,151,222,176,159,170,157,68,196,137,180,65,242,41,169,83,205,190,158,54,80,251,213,29,85,113,137,168,228,32,37,217,161,30,166,61,202,216,148,13,103,30,25,213,204,161,99,136,134,142,181,244,48,219,140,218,100,17,158,12,171,4,236,73,131,190,90,237,193,145,242,85,24,93,120,116,5,157,12,77,228,196,187,207,97,242,144,166,169,76,120,220,31,213,17,198,72,130,150,94,30,249,14,19,172,172,219,218,33,145,71,81,69,228,94,156,130,133,36,198,165,239,237,169,119,94,220,91,122,243,124,91,137,134,24,129,81,248,90,228,109,180,244,121,243,52,244,56,82,46,142,109,75,45,70,225,209,21,57,25,151,192,29,157,174,94,205,65,112,129,224,10,161,75,130,83,143,45,124,208,140,131,39,108,94,48,118,26,31,47,65,120,159,90,180,88,129,17,89,142,186,242,22,23,138,92,248,8,147,122,95,79,9,158,5,77,134,243,169,64,47,
+86,47,78,251,32,78,124,63,28,83,3,87,21,36,255,68,8,151,76,119,217,13,183,201,189,130,79,197,123,167,186,97,90,194,8,34,250,104,98,160,5,31,36,217,189,94,101,186,110,193,251,32,204,168,107,148,186,198,185,231,122,150,236,184,34,79,142,241,219,48,29,123,163,72,93,89,135,140,228,139,125,31,221,189,197,144,97,42,143,94,28,86,71,29,172,173,171,39,25,72,113,15,27,202,75,14,228,149,197,211,22,31,51,245,107,123,207,133,172,97,130,25,194,164,84,73,179,79,205,96,220,65,86,99,243,185,148,176,200,197,92,26,69,74,182,43,223,213,184,133,238,243,32,170,106,211,81,26,93,57,104,171,85,187,81,245,169,137,215,98,98,51,56,71,118,81,52,145,216,87,41,161,229,45,84,69,38,97,104,232,6,83,116,93,76,121,71,99,88,76,191,121,76,129,158,24,129,236,34,72,99,26,186,215,5,250,101,205,190,118,248,82,153,14,99,203,103,153,204,46,233,53,238,52,162,216,25,157,123,99,144,96,239,16,174,150,115,92,123,93,195,14,237,157,87,60,
+19,155,125,10,227,224,157,46,65,71,194,137,140,70,194,203,81,34,210,150,9,47,222,55,187,254,169,81,195,121,159,203,125,219,162,123,189,125,201,243,198,44,38,30,205,96,250,140,153,18,219,180,89,79,56,133,201,35,196,249,34,28,58,174,34,169,34,74,25,192,193,102,18,85,160,47,205,77,75,210,182,251,137,43,127,92,187,174,15,120,170,58,174,100,63,33,10,146,116,142,191,126,124,70,208,252,167,187,106,75,35,191,247,75,123,111,113,169,158,211,149,38,240,209,86,33,165,177,51,234,157,75,147,197,98,124,144,141,131,203,203,142,220,143,50,154,211,3,96,233,173,165,49,52,47,111,44,249,148,175,131,62,227,54,155,52,116,187,103,23,171,87,91,190,55,210,185,138,147,237,215,176,5,113,3,94,88,147,91,179,150,45,133,153,46,121,133,68,105,49,117,112,90,83,156,144,103,175,184,59,195,204,181,215,246,16,78,133,18,9,176,212,121,8,181,66,33,254,64,102,129,79,148,195,78,7,172,199,31,111,154,67,29,129,102,197,137,201,21,120,44,68,123,113,35,53,
+145,254,125,21,68,122,189,184,197,106,48,68,58,30,200,159,136,136,195,149,132,62,14,170,102,147,102,105,96,92,8,174,199,26,12,1,202,184,64,26,192,17,151,27,36,186,129,213,28,41,252,163,36,92,119,77,52,2,15,204,75,79,41,2,245,184,70,32,213,242,58,72,90,92,3,114,95,181,25,183,23,154,48,48,236,73,195,106,92,57,146,176,110,7,213,190,100,16,137,113,141,251,10,244,222,138,33,28,207,68,157,235,77,187,3,189,218,203,175,48,27,201,209,135,167,136,170,226,209,142,21,51,49,154,37,242,83,22,50,164,147,130,10,145,49,34,85,243,28,11,75,84,39,103,15,200,73,168,124,198,235,64,19,94,133,245,66,60,13,246,42,15,212,231,78,193,193,162,132,35,188,169,124,47,133,151,154,169,11,102,93,103,129,186,245,19,17,125,108,71,72,147,167,166,202,238,41,227,154,65,125,16,205,132,5,238,70,143,92,190,132,252,118,76,245,94,163,41,230,133,250,166,71,108,222,230,89,15,76,21,70,111,21,7,216,108,11,174,189,21,26,226,154,149,35,195,
+198,228,21,41,129,139,225,171,123,51,123,158,186,26,177,58,128,85,139,103,175,65,181,36,24,120,67,168,50,70,52,143,171,233,35,175,243,72,231,137,80,172,67,146,11,83,223,204,108,87,156,60,30,136,10,39,11,99,44,53,93,58,125,163,195,207,46,56,134,46,83,85,228,178,176,236,45,38,127,35,162,195,42,4,178,129,57,21,216,140,72,150,153,169,42,197,210,176,232,241,26,218,114,101,219,226,32,150,131,201,123,85,210,254,22,210,30,84,4,30,29,11,147,87,139,160,145,180,46,116,109,100,82,166,91,134,200,115,251,200,78,93,101,131,111,151,234,240,88,247,38,129,32,96,196,142,119,103,81,16,175,228,151,218,19,230,138,133,113,27,147,60,117,88,109,120,238,249,71,167,90,223,159,103,104,59,34,93,254,182,229,207,227,217,53,6,11,119,219,96,114,196,6,230,70,229,140,48,238,6,188,214,51,240,188,193,96,209,56,135,149,30,104,40,50,167,97,198,85,254,165,125,11,72,61,41,75,208,180,151,219,17,129,29,51,22,13,76,85,135,161,169,250,249,125,221,
+219,38,111,47,61,113,185,128,38,189,8,40,180,167,123,155,84,68,119,158,120,241,182,94,232,19,184,218,106,223,63,217,46,218,42,28,45,255,130,31,116,83,50,56,151,68,121,221,95,92,116,68,196,199,206,213,253,245,229,69,137,220,65,98,36,97,53,251,164,239,251,65,176,8,246,221,219,106,142,59,192,219,206,158,5,62,59,15,224,59,175,23,31,14,57,65,126,56,164,255,230,221,33,121,151,239,222,247,15,254,133,61,251,23,208,197,247,65,38,149,254,32,19,7,125,144,185,104,159,201,200,69,168,29,157,108,16,50,65,238,12,250,53,229,142,210,152,55,183,17,7,209,69,235,4,106,45,161,110,79,194,175,223,240,175,140,178,139,159,184,226,190,52,202,18,171,0,87,48,160,252,83,36,75,29,217,203,220,148,97,16,66,180,60,133,213,121,172,196,35,165,59,81,20,216,16,120,240,45,156,1,228,205,91,65,216,145,129,249,145,80,63,91,67,143,245,224,0,167,197,164,248,198,231,209,16,98,220,130,213,203,233,121,84,77,94,132,9,54,48,58,178,73,44,171,5,
+45,33,93,55,38,225,223,38,83,46,147,242,118,238,249,4,144,5,2,32,112,153,71,189,247,36,63,169,175,141,9,205,93,156,210,46,48,8,10,145,131,190,103,69,66,104,24,152,46,58,2,108,244,99,128,77,85,20,8,249,33,128,28,0,41,250,27,161,207,96,221,190,129,206,141,64,27,27,222,201,175,209,100,193,253,247,226,214,240,17,238,224,55,64,187,120,213,128,8,209,44,51,26,76,224,238,255,78,175,69,252,163,95,132,113,165,112,248,52,228,183,217,139,123,49,158,165,126,75,126,0,248,184,10,116,239,209,120,226,228,158,173,89,127,106,189,233,96,215,108,240,115,160,117,197,137,86,231,242,87,236,117,100,216,87,89,129,245,95,152,212,149,39,159,174,8,29,134,95,57,136,107,196,132,110,170,15,214,162,35,51,236,157,10,21,185,89,78,158,147,165,154,255,73,18,14,29,55,254,78,148,116,85,173,10,95,111,80,248,227,114,37,205,5,152,205,103,159,132,242,144,99,19,169,40,186,136,65,127,90,42,2,253,199,231,199,188,141,209,124,35,54,59,41,44,199,
+26,28,45,219,19,53,177,39,228,175,59,88,65,160,156,122,131,99,163,178,59,117,10,2,101,80,20,130,58,195,8,123,112,165,240,51,96,165,194,176,174,125,41,60,41,12,112,139,142,92,41,33,62,205,219,38,185,119,55,169,90,84,136,87,118,72,168,72,144,165,126,147,112,117,26,205,245,49,19,30,31,110,183,6,167,6,22,7,204,160,160,71,11,77,164,135,3,44,231,48,222,1,163,36,104,22,226,82,83,89,13,152,31,67,79,58,211,12,255,69,102,12,75,139,106,32,184,40,71,135,173,110,2,121,20,105,145,116,38,40,126,38,76,163,137,44,137,58,185,170,237,145,248,136,106,226,172,39,236,81,152,93,134,202,125,21,152,94,168,4,188,72,104,154,173,89,231,132,72,45,85,192,248,195,164,39,81,126,12,103,59,5,87,239,225,209,129,127,132,71,91,2,40,31,48,61,124,222,6,18,242,91,229,1,131,179,98,69,55,119,112,214,71,122,175,37,63,186,35,195,180,107,81,85,130,32,58,110,199,150,179,75,212,47,62,2,142,32,250,8,56,242,135,57,221,144,
+43,85,39,107,177,99,252,206,171,239,196,97,252,108,101,109,103,181,83,206,146,121,85,110,9,30,59,167,181,87,1,139,203,203,95,157,154,17,230,73,87,171,33,187,216,29,43,123,216,106,61,131,61,14,239,147,77,192,92,13,139,139,230,243,215,201,249,152,118,178,152,212,183,146,150,33,27,52,204,174,110,41,10,207,229,90,119,187,32,45,72,225,134,87,114,79,85,216,239,85,49,171,148,18,57,145,52,67,109,173,82,240,235,3,14,6,10,93,175,194,161,6,14,155,122,65,247,1,89,162,25,240,80,233,167,76,62,173,156,72,144,143,168,75,37,76,117,133,25,164,223,30,150,216,94,87,103,11,123,15,230,59,84,247,210,106,173,40,9,240,132,253,86,180,181,142,67,211,75,48,225,165,182,62,173,199,82,231,55,101,38,191,62,19,254,231,191,247,233,223,125,249,139,175,79,132,127,10,252,118,62,101,253,234,139,31,127,83,81,252,191,252,227,247,246,31,158,79,80,63,59,215,238,254,235,159,127,254,209,239,252,13,5,95,125,241,254,69,12,159,254,246,179,159,255,205,
+231,159,126,245,247,127,253,249,249,192,246,139,95,125,250,49,208,227,179,47,206,213,186,127,241,233,139,95,252,228,243,191,59,31,146,158,219,127,250,217,143,63,255,221,79,127,249,249,23,63,251,203,247,154,224,239,164,206,188,63,251,201,79,190,248,168,61,254,237,178,219,63,120,175,220,253,197,123,193,207,79,63,253,249,103,63,251,157,223,59,67,250,211,95,252,244,203,79,63,252,250,60,24,160,114,134,248,233,171,207,127,245,55,95,253,226,227,88,248,175,190,252,234,243,247,178,226,63,7,88,127,45,195,121,208,15,63,125,249,23,255,199,231,63,254,213,199,9,239,95,127,245,229,223,126,1,200,241,141,204,0,212,159,126,249,213,95,125,28,8,127,246,23,95,254,205,199,49,248,175,49,2,146,124,1,12,56,159,85,254,248,47,63,251,234,179,31,159,107,129,255,222,183,142,233,223,43,157,127,235,212,249,91,228,190,70,249,142,252,139,15,144,0,174,255,233,243,95,253,225,47,127,124,254,2,131,175,117,8,168,239,39,95,252,18,24,253,99,128,239,87,95,254,213,123,199,
+243,161,248,123,245,242,95,125,249,254,249,87,95,190,87,53,255,53,134,223,253,22,185,63,254,252,255,59,189,191,248,242,87,191,2,154,190,77,242,211,143,63,255,249,207,63,253,224,31,12,245,189,150,247,115,249,51,191,127,255,222,227,189,6,251,249,16,255,236,32,127,255,78,244,151,127,243,78,17,160,253,151,31,88,126,249,59,239,74,60,183,253,54,69,126,148,102,255,48,204,249,30,194,95,124,14,216,234,236,68,159,255,228,211,95,252,253,175,149,247,163,255,254,151,103,206,31,7,247,95,126,245,163,255,242,163,31,254,240,211,15,254,235,71,249,247,119,79,123,175,100,255,233,127,255,179,63,253,163,255,229,143,255,228,119,126,109,158,47,63,253,236,235,107,13,63,7,20,242,94,242,253,179,191,253,236,139,159,159,143,37,127,237,154,31,113,240,173,210,238,231,210,246,31,130,254,59,160,249,143,190,252,155,179,106,207,125,254,225,225,159,125,246,87,159,255,240,253,254,1,224,163,95,151,130,255,198,220,223,112,255,79,223,220,160,248,25,64,244,28,18,159,190,93,168,246,
+215,151,38,126,249,141,121,127,244,79,127,254,249,79,207,97,244,213,47,0,205,156,99,231,236,135,95,124,5,0,255,249,231,191,250,213,215,207,128,177,223,48,248,227,47,126,250,211,207,223,175,32,0,10,252,5,16,156,239,95,210,242,45,237,158,111,19,156,111,22,124,173,218,127,184,166,241,23,31,230,250,163,79,159,125,245,213,103,127,255,81,237,255,252,77,0,63,251,198,36,191,252,142,249,127,249,223,248,102,195,31,127,245,229,95,255,135,179,1,207,81,121,182,228,111,84,174,254,255,117,141,224,123,135,225,31,7,251,63,248,151,191,121,79,0,200,112,191,252,208,239,167,31,253,227,179,37,62,253,232,127,252,244,163,127,244,159,190,250,242,103,95,125,246,87,127,245,126,187,229,151,159,126,250,55,191,248,209,63,250,246,176,247,76,245,83,0,218,143,254,207,111,4,120,47,231,254,237,62,223,202,87,128,205,207,116,129,1,191,119,254,248,131,223,249,225,183,59,2,34,126,250,187,115,251,239,127,111,248,215,197,221,223,75,187,255,228,239,190,51,6,200,72,63,248,14,
+246,95,158,9,156,5,248,55,231,15,128,17,206,23,114,190,167,176,15,86,31,1,122,134,243,5,16,118,255,248,151,63,250,14,225,239,168,245,239,222,239,131,124,61,224,159,158,111,143,0,168,126,250,197,239,253,58,223,1,146,156,203,47,255,28,64,243,207,254,229,191,252,221,79,31,63,126,255,247,191,123,139,227,251,52,127,27,145,223,202,228,235,44,248,27,92,206,119,91,254,217,247,203,129,127,151,203,167,31,253,147,239,208,252,253,223,253,14,229,143,124,247,78,248,183,125,117,193,187,250,127,242,119,191,247,135,63,249,201,15,127,240,53,153,127,242,233,95,124,175,207,153,9,160,199,247,246,111,183,124,235,82,204,119,64,125,92,175,249,23,255,80,47,255,55,202,104,127,239,38,206,217,158,191,123,118,155,255,135,110,255,234,219,253,190,249,94,131,119,73,1,252,128,164,239,201,238,252,4,248,248,111,63,255,217,23,191,0,132,254,30,185,63,249,197,79,126,235,61,145,111,21,24,127,143,198,63,251,252,191,158,61,250,7,223,115,171,255,245,243,159,2,169,246,47,255,
+223,72,156,147,51,144,208,190,206,11,127,244,31,254,240,207,255,252,207,254,240,63,254,201,191,249,205,158,95,95,55,249,46,151,179,199,159,221,247,139,143,72,1,254,255,131,111,150,4,63,250,215,255,250,219,153,253,28,94,159,190,120,247,255,239,152,235,155,72,61,91,245,7,95,252,238,111,142,62,79,1,63,248,226,123,234,57,119,254,245,72,32,151,1,115,192,89,237,255,241,79,255,236,207,255,244,63,3,19,211,127,0,50,60,240,236,63,255,224,247,127,139,231,127,51,240,211,31,252,193,247,227,251,187,77,255,219,191,255,211,63,255,183,127,248,71,255,243,15,190,214,241,127,139,107,59,191,89,187,252,127,248,253,127,254,223,253,171,243,229,157,27,72,251,91,151,119,82,172,193,1,125,77,241,104,233,75,168,148,214,191,241,219,153,68,156,55,113,165,191,244,74,204,80,47,19,235,28,95,80,193,236,33,228,242,210,32,145,132,210,133,139,90,153,136,97,170,42,167,64,64,145,103,133,213,118,243,112,185,234,59,115,184,214,155,160,215,72,143,220,146,60,45,175,150,58,
+107,112,196,205,45,195,31,212,59,138,96,127,28,127,242,123,54,21,206,86,212,18,139,165,202,76,230,252,167,177,7,107,108,19,29,177,232,156,225,177,114,191,221,86,182,38,147,84,138,219,109,47,28,157,103,115,183,95,48,221,206,26,47,94,133,50,159,110,212,205,111,234,158,116,86,71,168,115,60,230,129,165,27,35,78,106,94,206,248,248,66,23,87,122,71,213,9,52,187,92,65,94,189,123,28,172,165,110,88,56,248,48,222,233,196,14,218,84,61,244,244,152,58,228,227,165,83,58,212,58,41,231,173,83,133,114,49,136,166,177,84,253,28,189,107,233,205,7,99,23,219,154,110,109,200,241,67,131,59,241,149,9,125,41,22,183,217,86,90,246,99,182,17,168,12,205,198,193,238,176,56,197,115,213,83,236,64,61,84,26,4,193,105,105,220,84,110,233,129,37,200,217,167,145,88,71,158,4,110,68,24,211,207,219,233,141,239,58,59,217,209,61,57,2,130,216,187,102,248,159,172,181,104,214,37,152,70,15,33,139,213,134,179,27,169,243,131,122,205,222,121,203,179,199,216,160,
+115,183,15,156,70,21,34,236,136,94,225,136,216,107,110,194,78,128,57,53,120,152,211,77,20,168,82,219,211,91,48,226,205,182,195,27,107,210,123,226,38,195,108,171,42,32,194,238,139,75,90,59,124,112,160,232,6,3,107,165,216,176,51,157,98,51,188,93,173,158,107,108,119,11,91,105,62,18,139,220,201,202,150,228,83,216,188,196,202,230,221,174,145,228,131,123,153,53,31,230,58,85,229,185,225,37,132,236,28,227,45,202,36,70,66,94,157,70,95,63,138,115,62,152,85,18,90,157,17,132,93,79,208,207,73,168,139,122,154,139,221,68,171,79,86,86,47,100,29,238,44,180,139,214,49,7,251,104,203,61,78,100,195,206,86,25,220,140,204,69,174,166,17,197,118,186,236,99,225,137,101,13,149,140,125,168,186,51,11,241,220,122,217,98,40,67,94,77,157,250,89,79,233,36,237,136,91,111,110,56,228,183,143,212,226,212,224,95,227,144,16,30,18,98,190,181,12,168,33,184,89,139,144,23,31,247,205,114,227,214,156,25,12,169,161,160,145,157,33,46,213,81,110,161,171,122,
+100,27,250,135,109,179,197,136,12,175,199,198,209,5,187,179,219,44,148,70,159,165,214,221,29,96,212,226,137,232,142,49,182,250,32,55,184,123,194,86,26,92,171,221,63,210,214,217,246,217,106,82,97,228,64,175,186,62,220,137,199,203,116,1,39,244,205,212,141,222,173,65,72,92,193,111,244,137,58,130,182,210,29,232,177,3,202,92,55,176,141,6,163,251,126,29,154,169,40,54,25,182,223,195,189,153,112,160,170,197,112,120,195,126,78,111,89,112,27,55,15,71,32,59,103,208,22,235,100,99,56,173,203,134,129,95,79,31,232,79,118,243,172,146,115,74,80,147,132,161,113,48,147,249,226,37,122,187,59,132,20,34,238,68,120,165,62,38,114,181,152,124,83,165,185,87,176,96,195,34,238,217,26,163,161,238,132,81,236,144,134,157,99,69,118,60,160,183,249,123,48,132,78,192,240,29,235,135,222,118,146,53,96,148,222,190,96,132,208,13,237,229,77,73,185,60,46,188,169,213,212,88,10,137,85,171,242,49,227,123,10,237,205,67,179,165,78,65,251,80,47,173,152,96,104,62,
+28,89,84,117,183,32,30,113,109,155,75,82,46,178,55,173,86,162,133,96,106,86,216,212,168,211,126,214,83,24,78,221,114,139,150,244,21,237,98,171,109,63,186,228,185,205,183,81,1,166,72,218,194,205,23,122,131,130,182,149,130,237,6,7,216,137,151,73,102,163,202,198,153,76,89,113,246,150,252,68,29,132,43,168,189,134,83,89,88,237,207,246,195,248,96,63,85,237,59,235,106,84,41,111,172,28,123,101,194,54,175,246,111,189,192,72,63,26,29,102,94,185,181,98,22,182,252,61,244,246,184,47,175,148,151,61,243,112,216,47,26,166,11,95,234,109,105,36,146,178,17,235,166,133,121,90,176,205,216,180,111,178,108,41,170,194,178,85,152,25,113,159,148,237,6,132,26,245,55,65,15,29,80,3,186,106,186,70,209,214,212,230,134,134,98,197,157,237,244,48,15,91,79,136,83,40,114,47,219,229,135,91,141,129,88,217,69,60,21,251,105,98,239,111,230,167,74,121,135,179,87,22,246,131,114,180,31,94,178,113,21,155,116,245,18,218,222,29,155,143,119,123,0,170,178,191,
+9,49,119,195,22,61,167,237,55,91,201,116,135,173,47,233,22,229,220,166,167,52,30,236,177,151,141,204,108,196,10,56,99,63,209,62,140,240,220,46,82,59,86,174,148,158,22,216,218,203,203,67,84,92,154,10,38,71,250,113,216,124,179,199,19,251,33,219,109,63,187,111,33,122,79,103,187,230,135,237,82,74,61,16,43,179,88,81,68,92,149,112,135,209,170,114,218,71,216,43,121,229,48,57,81,151,101,179,4,218,82,82,230,167,69,185,181,82,229,75,171,72,187,92,76,198,141,111,140,149,53,123,72,189,13,102,202,99,215,126,44,46,82,81,209,122,110,169,23,81,118,213,200,26,18,77,234,220,22,220,13,5,60,142,55,238,120,67,251,149,138,62,50,219,78,218,210,105,125,196,36,87,7,229,41,152,42,169,106,229,85,73,29,52,81,195,163,103,141,246,165,78,9,233,42,243,68,126,185,161,198,151,184,99,170,247,56,152,117,165,106,66,87,87,220,53,235,212,3,6,67,93,199,14,79,83,118,46,86,28,69,189,57,174,54,163,45,41,39,182,176,251,176,29,38,82,
+212,77,23,189,195,175,241,110,88,200,75,231,181,97,170,112,17,16,76,59,63,109,163,163,162,117,102,123,107,50,236,59,82,115,55,90,28,130,216,23,17,62,98,27,153,143,197,209,174,174,163,183,50,77,142,181,88,221,210,220,106,230,66,36,152,104,26,193,19,122,185,82,239,196,227,88,47,89,229,175,203,197,13,202,177,202,28,199,165,131,4,102,57,235,79,244,88,43,212,204,212,216,224,96,205,18,87,199,125,69,166,31,110,66,112,14,99,85,150,89,100,245,102,224,101,215,226,232,37,163,28,135,171,147,79,174,150,244,214,229,144,118,244,214,169,28,242,40,184,135,51,139,78,234,233,201,116,195,95,199,48,181,214,156,185,20,30,125,84,253,53,230,101,218,202,249,95,202,117,217,229,193,23,49,239,231,74,20,15,53,61,107,81,18,117,217,221,250,171,224,62,214,203,49,183,182,137,116,119,154,113,152,166,17,103,16,237,108,1,141,97,0,225,231,41,157,118,127,236,189,204,83,47,76,251,120,210,235,84,214,251,167,186,252,158,120,18,70,170,68,95,197,16,201,180,116,
+48,29,23,191,230,51,150,235,124,205,230,110,64,137,246,78,168,196,206,49,163,49,97,30,124,206,16,175,23,44,235,227,222,165,39,165,183,57,223,232,56,141,81,172,179,98,103,118,154,136,102,171,203,77,41,212,100,45,142,141,130,227,73,191,102,171,163,61,195,240,109,53,72,121,7,220,227,166,34,207,177,183,89,173,120,167,99,157,250,60,64,147,224,61,61,102,32,198,36,133,24,83,188,156,227,140,213,85,58,247,56,162,110,87,84,104,168,133,53,24,234,74,254,97,120,111,161,239,148,143,188,41,175,205,7,25,197,34,128,255,114,27,125,54,94,179,21,102,119,204,108,223,41,232,107,171,116,216,222,116,45,169,97,67,63,47,89,83,225,18,168,133,149,34,128,156,94,25,55,91,178,9,151,141,225,142,88,199,167,80,107,78,210,151,118,201,153,87,26,235,110,146,137,23,133,59,86,232,23,231,15,209,5,47,198,95,63,118,42,236,219,201,76,186,221,13,139,201,131,4,35,125,25,29,42,148,137,160,220,37,109,157,228,81,161,62,43,190,29,17,226,147,25,181,228,189,
+27,184,57,137,114,156,88,137,197,176,67,28,151,176,168,125,219,107,15,57,37,235,94,191,229,52,129,124,214,172,45,75,70,235,195,229,136,204,81,219,118,205,64,105,145,227,84,180,135,245,64,159,194,86,12,139,181,56,23,221,104,164,19,146,254,218,72,122,41,161,236,27,50,223,124,41,70,217,39,84,171,116,39,152,204,46,10,2,91,165,130,123,94,187,170,15,30,46,166,178,87,36,78,136,1,246,234,249,101,155,224,209,131,202,125,37,206,223,193,205,204,93,61,160,225,192,156,15,241,58,107,7,70,50,106,60,113,252,196,121,219,246,22,199,74,223,48,152,42,148,172,98,168,86,182,246,179,169,92,73,125,65,62,76,142,130,101,200,183,91,206,15,97,219,157,120,98,24,214,59,190,121,113,22,126,209,82,57,135,244,1,176,163,240,72,228,180,130,217,114,174,17,43,247,131,251,101,235,196,149,78,230,98,147,116,98,166,217,204,196,192,136,180,242,222,16,43,133,88,225,185,228,19,207,89,188,54,40,211,11,224,239,97,78,98,92,60,23,160,83,3,140,120,88,121,56,
+221,205,176,82,211,208,130,211,245,20,94,231,161,210,159,118,86,53,229,170,184,55,25,248,54,253,228,25,204,233,248,86,69,99,115,149,122,75,196,56,139,0,255,222,77,234,200,70,1,141,5,211,42,161,70,39,133,196,49,103,111,19,158,35,116,123,36,3,51,118,252,24,182,251,138,27,36,94,156,58,137,230,115,36,56,209,129,56,129,181,132,238,129,50,59,204,97,71,118,180,76,236,4,201,226,105,159,185,43,251,228,84,211,178,60,209,138,155,165,99,72,209,182,213,137,195,177,135,180,27,30,146,88,26,188,133,185,223,107,79,165,228,98,35,209,139,143,169,9,169,194,170,6,247,80,178,185,164,109,221,219,165,85,184,19,53,106,47,119,163,36,174,120,187,154,147,75,202,33,159,202,198,86,198,72,243,174,13,1,205,13,253,14,248,86,189,190,125,32,116,172,128,63,222,78,58,26,54,196,121,70,126,140,227,61,92,246,10,65,236,84,162,198,99,179,119,165,214,199,236,1,100,250,88,65,199,204,167,173,109,173,82,120,168,178,185,156,145,62,244,224,99,107,132,180,109,
+113,31,187,245,242,157,230,112,82,155,112,139,242,226,46,122,39,231,174,119,22,62,215,240,60,88,103,106,40,193,100,74,237,143,169,142,187,114,78,82,105,106,250,115,46,255,184,10,237,29,149,0,61,232,147,157,104,134,169,210,83,37,172,246,253,169,196,179,64,19,210,28,131,18,88,239,160,194,67,39,12,15,67,71,117,175,96,129,147,52,159,159,142,190,173,32,245,98,219,211,151,214,139,148,62,170,168,28,93,41,56,27,45,90,20,77,170,187,186,211,29,133,143,169,75,133,193,222,107,22,80,37,61,59,63,115,81,239,172,234,88,127,96,209,83,46,198,86,234,105,146,242,9,248,122,142,218,162,106,236,31,114,53,241,97,31,103,251,73,238,156,189,244,22,220,183,10,22,20,12,119,85,245,201,204,248,222,237,8,42,11,238,47,27,182,251,17,231,109,216,153,162,206,105,131,66,146,81,183,196,78,164,117,202,116,245,84,182,189,81,176,119,236,236,141,152,108,108,181,52,149,241,112,199,226,110,151,189,158,190,124,226,47,117,198,214,60,108,170,104,249,19,119,180,227,51,
+44,203,90,209,76,149,72,179,169,184,190,253,117,109,101,158,186,251,86,32,122,204,212,232,65,146,91,173,98,46,92,66,206,221,222,187,184,100,175,102,71,207,85,181,92,171,103,56,48,185,186,62,68,1,188,119,18,56,152,60,218,151,204,85,109,142,123,220,194,247,245,178,125,109,208,133,44,177,174,121,154,214,73,235,62,125,196,122,254,139,89,177,221,184,16,44,114,122,214,56,75,246,89,23,204,78,130,41,190,218,244,102,73,177,174,188,70,233,83,182,185,111,148,197,236,60,25,122,148,95,177,37,82,228,53,125,135,240,239,245,180,209,86,88,54,118,216,227,252,254,213,60,5,143,110,86,37,33,46,179,2,23,123,87,48,192,65,141,3,241,201,119,92,158,112,165,85,217,187,136,85,186,199,45,206,110,232,38,140,38,251,70,112,76,217,115,156,49,157,155,59,108,19,9,84,157,195,124,104,234,39,219,68,44,139,217,238,186,253,216,113,46,227,27,57,150,186,155,36,230,198,38,169,212,133,245,120,185,154,181,169,177,226,164,215,210,189,156,38,49,152,59,160,223,17,99,
+199,108,110,160,153,32,102,59,132,133,243,216,138,8,71,167,164,140,203,155,229,119,49,172,1,166,174,29,99,81,7,176,238,78,205,252,105,243,112,229,45,17,208,203,202,236,232,64,28,136,237,226,113,129,156,31,252,189,114,141,59,149,217,120,147,84,79,111,174,48,234,21,66,126,34,159,181,228,213,80,136,98,100,190,130,117,104,103,57,214,122,53,29,142,141,17,31,36,108,13,213,148,170,51,169,94,241,16,217,80,100,195,53,86,179,54,59,218,182,245,22,49,6,174,105,182,50,11,42,230,102,127,225,171,247,197,149,157,167,126,85,49,167,186,75,179,61,127,178,34,18,35,240,133,160,156,217,176,150,173,100,47,218,24,36,92,138,138,126,127,73,205,68,181,76,26,34,82,97,134,219,26,157,57,7,241,148,115,253,214,128,61,101,37,118,35,51,144,115,99,16,120,51,189,196,135,225,120,129,1,67,168,46,229,249,230,202,53,118,7,108,80,203,186,212,229,166,142,23,126,93,60,134,46,239,39,27,167,168,155,156,63,246,213,26,65,251,134,168,57,229,153,210,201,225,158,
+48,66,29,36,121,172,34,101,61,28,16,144,87,17,227,13,124,9,201,79,104,2,100,51,124,5,165,201,239,95,67,205,52,247,69,215,155,22,87,184,242,182,156,78,204,116,251,153,157,67,129,58,175,36,187,57,42,14,188,76,198,65,179,12,139,211,170,153,163,1,123,115,233,221,187,28,181,25,104,137,145,136,241,5,208,43,8,212,196,43,39,11,73,168,2,115,74,84,248,67,119,59,138,51,7,8,96,173,53,79,156,134,207,171,138,105,136,115,183,42,149,231,211,44,183,178,237,78,5,68,204,98,194,173,17,115,198,193,190,217,84,234,33,244,78,191,50,246,220,90,103,13,12,2,133,31,64,68,220,61,9,142,111,117,118,89,54,215,254,194,93,76,148,122,83,33,166,40,234,27,113,166,221,200,220,119,205,136,92,223,68,243,239,39,245,155,202,192,107,152,163,245,88,203,10,122,185,131,32,5,28,144,10,228,184,226,77,120,42,75,30,153,88,179,129,247,178,212,210,53,58,46,31,144,119,102,210,42,167,99,95,108,39,114,151,114,56,30,6,182,199,208,66,225,70,164,
+226,54,28,17,7,242,131,94,47,233,193,253,118,171,6,233,72,112,96,50,25,62,199,188,163,222,73,49,67,94,179,39,145,151,61,34,144,61,245,48,174,107,78,160,118,154,152,188,137,9,232,44,57,254,102,29,115,135,44,47,246,209,189,148,90,192,82,160,107,153,160,144,59,56,173,71,181,93,120,138,238,189,29,40,7,24,104,91,42,240,19,163,22,145,87,222,224,215,192,64,210,248,77,120,76,54,91,125,168,163,35,176,121,33,83,234,243,13,240,178,134,95,31,93,152,131,230,216,114,173,7,29,180,61,226,157,8,244,35,65,223,93,152,134,73,246,32,233,6,224,57,6,137,110,36,147,242,40,3,174,236,237,86,27,23,92,161,203,132,249,23,187,125,87,64,8,58,202,225,218,20,238,70,215,79,23,35,168,155,107,157,196,95,232,79,105,78,12,208,172,1,20,190,197,184,103,204,50,116,55,123,113,170,8,61,15,72,60,1,147,87,172,163,88,142,112,67,65,65,16,205,23,76,88,236,143,9,151,85,96,235,191,29,49,135,176,116,103,105,109,70,199,198,106,110,13,
+122,180,8,238,14,163,239,250,207,70,114,186,107,184,13,191,235,18,216,142,109,244,179,77,245,186,238,148,24,64,164,215,247,243,214,252,176,193,32,184,21,78,156,12,76,246,156,245,5,99,228,129,130,64,52,49,140,231,70,152,150,219,184,223,98,224,77,98,54,196,190,170,212,177,182,147,65,157,119,106,201,87,216,217,33,118,58,180,239,116,90,40,135,187,31,56,98,220,108,191,7,5,112,77,65,180,39,71,13,119,255,124,242,229,107,189,9,31,120,243,245,51,182,143,39,251,102,76,237,21,23,3,85,209,166,245,19,215,45,155,206,176,15,48,17,133,199,44,167,191,25,56,82,79,189,177,140,3,2,57,28,44,183,128,3,115,5,10,79,72,193,177,213,43,145,22,189,242,243,72,177,170,184,214,251,11,168,96,56,183,239,102,60,194,197,248,40,152,224,172,211,4,233,73,89,245,90,1,11,9,140,142,154,179,161,194,31,183,111,112,107,204,178,172,38,102,35,214,60,167,156,50,95,103,131,225,222,132,19,111,55,111,61,132,223,88,225,86,212,39,20,21,87,25,157,225,
+130,192,52,136,128,147,22,161,153,55,149,254,201,165,86,90,7,155,37,121,197,221,149,26,80,220,188,21,203,18,250,245,125,55,82,102,156,236,36,155,93,125,112,241,108,126,11,192,238,14,12,120,17,168,141,120,66,162,1,208,87,53,1,158,3,36,176,114,2,231,0,194,143,132,244,239,103,254,109,36,92,155,45,121,232,247,253,157,52,89,18,220,163,0,95,2,218,65,18,50,111,242,254,52,30,116,84,207,81,4,226,93,67,65,103,52,32,7,236,14,140,66,0,191,128,65,73,8,224,230,32,24,8,36,132,1,113,114,254,23,68,249,45,231,248,6,93,19,241,160,179,91,130,36,66,200,7,169,56,44,232,120,167,132,227,93,191,83,26,131,28,119,4,96,137,252,77,59,241,210,64,60,77,154,45,120,223,245,238,209,120,144,132,116,110,226,189,163,168,129,215,239,40,64,110,208,59,138,59,240,205,59,10,80,18,118,203,155,172,59,216,119,118,65,240,145,202,111,234,12,98,160,255,121,239,138,151,254,205,254,160,119,212,0,254,239,160,6,157,255,80,237,154,8,70,249,
+32,187,175,241,98,211,118,141,158,82,185,97,64,63,198,129,127,251,56,205,121,156,135,184,30,249,16,54,155,182,64,135,30,53,116,99,214,64,10,208,77,29,222,69,55,14,151,62,185,51,75,209,244,70,38,129,218,168,146,155,184,32,2,66,189,10,142,60,182,127,79,128,188,44,107,36,252,58,132,68,233,209,118,64,144,187,48,232,30,245,97,136,181,181,154,191,45,62,230,184,129,91,244,29,187,76,110,222,42,84,106,48,74,79,22,196,137,34,16,204,145,171,45,46,26,168,169,239,186,44,70,43,68,203,45,39,131,52,4,163,48,1,169,76,124,10,48,64,196,171,184,12,165,183,203,66,240,107,243,210,148,159,63,82,181,169,119,36,97,17,111,66,185,14,38,167,48,60,200,111,41,63,20,101,137,225,115,239,45,129,246,164,163,202,75,66,14,151,167,131,220,47,73,9,47,64,114,0,182,217,246,92,42,183,177,174,36,225,61,212,148,217,122,239,6,21,27,45,8,113,20,0,223,156,5,65,250,153,123,63,128,246,9,166,214,13,206,148,241,60,226,232,228,113,214,82,
+4,26,136,248,48,166,51,162,126,11,231,1,224,97,62,51,1,120,76,206,76,0,30,224,51,19,128,135,230,204,4,224,129,57,51,1,120,64,206,76,0,30,248,51,19,128,71,17,132,2,185,123,152,16,150,216,192,90,163,148,82,52,60,152,223,227,39,228,14,27,80,191,16,78,228,105,192,2,16,81,169,191,150,133,222,37,45,206,31,223,37,125,0,148,254,46,105,48,249,46,233,172,252,240,46,169,226,29,133,242,210,242,142,194,253,2,122,71,1,225,201,223,81,24,235,174,119,20,102,43,232,29,5,132,8,123,71,1,66,245,145,126,75,163,194,80,75,236,31,140,12,249,15,70,137,179,117,131,247,147,186,92,142,211,232,99,108,96,97,247,212,78,240,89,99,110,59,84,175,191,145,101,82,106,62,139,39,138,18,32,216,56,84,113,212,246,104,194,179,142,9,114,63,191,60,249,45,7,50,217,76,136,9,134,117,47,219,218,19,56,117,23,120,141,12,44,224,25,136,92,154,213,196,233,118,189,41,225,115,47,149,114,221,103,66,232,151,2,39,170,145,13,204,67,119,152,
+1,224,134,62,129,114,143,214,253,13,184,118,111,38,25,179,233,87,10,49,198,95,57,135,184,196,153,10,88,80,229,81,4,54,144,73,229,21,202,99,18,217,96,200,6,134,249,211,1,40,82,27,207,42,195,247,57,152,34,35,8,41,34,217,204,181,130,107,85,20,141,12,191,197,174,145,223,8,36,128,172,18,39,170,197,163,89,183,233,80,232,48,42,184,146,205,104,88,0,71,133,217,154,56,180,129,89,220,139,16,74,119,113,221,104,221,250,46,147,13,164,186,222,235,65,147,86,240,205,0,115,211,129,248,33,142,72,208,226,74,165,90,208,242,131,134,252,172,67,48,207,92,181,241,100,86,89,219,174,159,220,248,115,48,200,36,37,137,77,29,165,171,192,43,54,71,151,68,138,146,157,197,4,43,176,51,153,45,20,150,185,146,1,164,64,0,45,199,196,238,202,144,178,37,196,107,110,227,156,87,59,51,113,51,57,117,139,162,12,9,88,37,217,54,146,198,233,221,237,115,105,218,81,221,206,55,227,112,191,183,163,173,88,142,147,162,51,115,249,25,99,16,49,46,66,225,
+46,91,176,108,22,145,85,218,204,84,129,101,92,64,34,114,38,70,134,76,17,6,53,236,29,91,6,163,21,100,239,102,16,38,112,181,141,120,172,57,42,145,89,96,48,48,22,137,38,114,185,144,171,249,45,157,39,60,91,188,10,248,22,242,81,11,123,172,149,201,231,80,156,16,234,158,206,156,110,15,135,98,124,102,77,11,75,8,80,60,176,86,52,241,30,14,192,155,150,33,150,87,44,228,84,29,132,94,7,108,117,102,145,5,120,180,142,158,53,34,158,131,13,134,200,192,43,224,116,221,120,13,21,144,102,229,45,92,11,183,121,188,36,158,29,227,241,163,59,185,7,116,119,150,19,77,254,187,53,121,58,136,144,243,156,211,219,198,75,131,25,81,193,59,116,129,18,76,0,132,122,13,58,80,74,252,251,75,210,24,32,151,173,109,192,111,150,221,85,131,247,240,18,41,112,68,33,148,170,149,178,75,117,219,185,164,192,121,122,169,231,42,36,205,225,113,187,176,98,48,36,241,161,37,14,49,10,68,227,246,85,129,158,95,153,56,46,97,50,153,156,114,109,100,18,171,
+154,139,52,173,100,199,233,54,59,41,103,198,129,14,135,217,233,208,149,151,170,68,209,162,135,54,247,137,5,237,244,186,74,88,137,131,121,54,219,69,72,144,199,80,195,93,184,125,102,153,76,247,151,33,235,21,69,45,178,48,237,75,18,33,6,177,214,6,91,88,174,140,191,175,106,96,2,94,120,228,9,193,60,215,167,37,42,20,208,228,73,50,223,84,60,99,237,105,8,155,150,1,26,44,70,123,149,5,98,164,185,14,254,52,26,90,214,61,230,245,226,245,142,214,79,136,52,105,215,171,253,120,203,51,213,118,46,144,102,247,104,19,42,18,236,183,103,178,147,159,177,61,205,192,203,29,121,68,91,247,56,215,230,73,181,111,125,185,37,238,218,151,41,99,229,214,125,88,185,78,9,53,49,217,114,162,39,194,222,229,54,119,11,133,104,47,175,213,45,211,24,66,148,191,6,247,30,96,142,94,101,24,110,159,240,194,224,71,49,58,23,205,249,181,204,24,236,210,30,154,78,241,14,61,247,112,58,211,17,117,180,189,197,143,140,4,146,211,234,191,222,75,156,107,216,10,
+182,21,59,177,90,211,157,23,34,22,119,110,210,230,248,81,169,57,205,3,16,52,127,202,209,190,17,77,64,52,20,68,158,197,162,114,8,148,39,182,109,35,48,82,67,136,37,155,59,113,10,206,41,188,38,203,251,132,242,251,65,2,91,83,144,56,197,132,161,40,141,115,151,118,82,214,56,10,178,127,204,216,14,18,84,33,34,183,146,80,139,98,128,199,9,36,13,20,53,178,42,41,151,238,10,75,187,65,38,217,191,222,88,130,21,177,29,93,132,78,29,149,76,116,124,133,80,164,71,60,94,54,161,161,197,58,27,108,144,155,162,69,101,125,212,45,244,177,165,33,70,145,231,44,254,40,70,85,15,202,198,124,143,115,187,153,201,212,234,226,8,191,9,196,73,183,21,76,152,14,75,111,131,89,87,112,86,217,199,20,172,231,114,52,112,163,203,203,83,13,10,20,93,203,4,109,121,177,147,228,152,81,124,107,120,59,184,184,184,36,11,3,102,222,190,221,73,109,161,44,239,188,86,37,177,49,72,163,152,0,232,83,21,87,19,43,119,26,88,28,219,42,69,44,40,66,
+146,41,7,187,110,114,247,53,1,118,126,127,114,39,173,163,68,108,90,243,53,52,7,2,14,244,12,13,37,78,17,144,234,177,155,89,77,105,45,120,173,115,71,139,227,142,62,203,198,103,6,27,53,97,87,220,102,173,156,238,234,238,101,212,114,140,103,54,11,108,228,177,131,178,110,120,46,194,212,254,224,40,11,251,36,99,221,138,194,72,139,174,167,28,171,75,38,147,165,152,253,74,106,189,133,77,41,22,107,108,50,184,70,67,9,79,34,19,47,25,218,230,47,72,120,16,131,12,90,51,200,23,216,150,83,35,228,80,18,99,238,77,96,46,42,167,93,75,111,41,30,125,177,7,231,14,30,172,130,23,3,18,31,112,2,217,13,206,145,94,36,83,2,14,178,127,95,16,77,14,96,90,112,124,188,152,98,65,52,162,177,36,49,62,223,72,111,215,67,220,21,163,71,211,178,246,79,9,203,101,140,225,150,88,233,126,251,83,203,161,240,106,25,167,251,232,227,146,99,170,165,37,146,184,190,143,221,198,181,220,185,149,183,106,40,19,173,181,89,159,185,100,182,65,175,68,
+215,120,167,18,96,197,22,30,152,229,206,5,67,172,217,126,255,160,72,10,20,50,235,235,91,5,140,50,179,192,92,178,175,183,187,185,30,245,11,81,9,10,121,100,17,42,129,110,248,41,54,217,198,121,167,213,157,107,71,107,9,80,119,125,204,177,94,177,161,77,18,35,203,36,21,31,29,34,157,207,140,47,11,71,177,185,187,221,128,218,154,47,221,180,3,136,135,27,229,237,154,32,202,13,110,147,111,163,108,123,110,44,99,7,218,167,110,23,121,116,196,124,49,3,24,37,41,71,80,173,81,210,124,80,231,16,183,213,142,187,60,220,108,99,142,202,27,250,120,50,17,70,7,203,179,28,171,175,218,105,126,141,206,234,233,57,49,123,124,44,214,59,177,159,31,49,199,109,39,28,139,19,120,161,2,24,62,189,111,240,181,232,245,147,221,57,89,41,235,216,73,156,44,126,218,122,38,144,107,131,12,60,67,118,52,8,175,65,62,206,62,151,48,206,209,221,242,142,5,130,165,69,238,201,76,109,125,202,73,90,111,17,67,66,217,153,130,31,35,47,132,162,141,175,196,200,
+160,243,139,233,145,84,235,120,9,143,100,137,158,193,185,166,55,110,72,210,132,232,182,133,101,11,133,247,75,222,42,223,180,231,144,119,204,146,155,100,27,222,29,160,51,223,186,29,164,192,153,50,148,246,62,216,212,176,155,14,39,85,163,214,104,211,46,9,29,239,64,138,129,252,44,153,164,110,112,0,64,141,175,50,162,72,18,101,250,186,207,132,215,160,215,94,73,243,17,66,42,4,147,226,142,120,109,21,84,175,17,249,78,207,193,167,81,252,21,233,53,134,99,67,118,26,82,191,238,58,217,186,110,106,9,34,228,163,40,181,103,73,218,68,138,142,194,235,34,181,36,72,21,70,17,240,68,2,14,68,148,159,71,48,163,102,108,203,125,152,47,171,74,187,39,198,121,218,5,112,51,26,248,97,43,122,106,93,5,173,11,220,163,145,47,230,176,147,15,65,5,223,117,135,210,112,219,246,92,94,255,182,173,184,249,15,101,152,254,49,78,54,137,101,40,249,177,195,88,15,76,52,112,170,131,189,238,107,229,176,129,60,131,239,138,96,9,32,119,56,58,66,206,253,27,91,
+126,201,89,48,38,162,147,34,181,125,152,231,150,85,238,45,42,172,93,45,72,220,187,200,16,115,242,209,240,140,1,233,250,218,188,237,222,16,6,131,41,78,77,189,176,194,123,253,58,197,253,26,83,188,62,191,120,17,133,81,38,123,135,81,12,159,158,219,65,56,59,149,133,157,8,209,214,173,114,108,40,83,99,204,154,188,169,146,171,117,111,192,228,19,38,42,65,210,4,223,7,188,93,7,41,92,74,217,102,137,122,132,145,48,250,246,68,186,95,63,84,121,66,20,45,233,237,200,16,241,45,183,182,39,244,132,188,18,72,170,86,217,26,115,222,161,60,108,148,218,53,209,21,188,174,72,27,27,17,152,141,57,111,201,5,202,190,105,20,1,67,206,28,30,212,58,128,3,69,88,182,69,32,101,84,192,119,83,209,224,247,194,34,159,121,186,97,53,31,20,36,239,163,48,245,140,3,43,214,229,195,136,161,61,174,15,36,233,154,146,0,47,77,59,242,130,143,102,62,92,82,76,201,86,250,129,80,38,133,251,46,194,45,245,73,97,218,83,70,90,146,119,192,126,60,207,
+200,211,187,73,34,87,232,184,66,201,201,66,222,189,97,243,219,32,5,233,17,209,27,200,16,56,114,16,253,148,121,176,166,135,142,140,150,17,140,31,1,184,13,234,25,238,117,76,33,120,185,188,155,221,211,240,207,197,215,83,209,80,103,202,25,140,246,86,55,215,69,108,10,174,71,154,181,64,31,76,140,91,53,201,241,12,233,70,106,245,17,31,44,196,133,124,41,49,197,49,35,150,68,53,108,206,253,140,187,42,216,180,181,185,114,45,42,33,10,224,197,242,3,240,91,220,102,236,223,9,162,158,187,38,164,246,210,165,51,14,71,82,0,128,92,82,62,79,206,1,153,8,135,129,5,24,28,213,18,179,166,20,79,142,204,111,162,90,113,108,199,125,141,152,211,253,65,182,21,183,112,208,214,236,113,151,203,111,54,141,105,175,124,42,95,37,212,143,47,186,231,196,18,170,184,207,64,228,75,232,96,117,223,243,10,168,250,155,253,52,159,236,250,217,106,12,234,14,55,240,152,19,33,184,96,210,205,91,106,30,180,84,202,187,1,94,39,0,211,122,137,74,138,104,203,175,
+84,18,105,148,135,229,166,226,80,130,98,34,133,59,212,19,21,83,171,210,67,214,233,96,86,67,255,122,31,47,8,219,118,96,162,187,81,13,231,19,82,80,60,160,202,225,105,99,138,73,121,182,110,203,71,151,186,157,64,150,194,247,152,24,184,70,150,150,129,16,231,19,232,128,250,241,107,189,149,48,106,119,221,181,102,244,54,228,78,14,219,190,59,68,92,255,194,126,188,202,33,249,253,139,98,70,43,133,13,206,142,88,207,158,29,113,243,70,85,9,241,38,177,151,68,27,12,112,164,162,94,223,138,97,184,39,162,73,18,19,169,98,53,114,79,5,150,159,29,6,68,140,40,245,83,235,225,42,236,147,180,184,160,130,129,159,180,205,205,109,136,20,118,239,206,99,12,247,189,151,254,135,123,99,210,31,238,205,150,168,205,164,99,44,4,183,59,202,152,76,77,189,102,74,233,253,222,85,4,196,121,127,189,216,143,166,92,11,149,219,16,248,35,45,113,109,112,81,36,107,23,114,254,89,147,213,158,151,170,79,96,87,249,90,131,190,157,228,151,22,90,8,29,3,98,3,
+170,250,0,194,32,190,3,73,234,21,149,140,248,193,84,146,182,87,99,225,37,179,84,220,110,119,227,152,208,115,105,158,73,204,224,92,99,121,8,181,29,59,107,16,97,74,120,34,52,116,41,113,55,107,14,110,149,253,28,19,212,95,114,41,92,184,231,37,242,246,210,234,59,32,192,202,160,60,122,155,238,118,180,103,62,199,94,184,120,24,99,182,154,72,251,122,209,7,220,116,166,233,157,173,160,26,250,1,43,120,159,114,221,3,43,207,108,163,57,140,208,173,167,53,201,170,243,158,44,157,9,34,130,80,242,28,115,83,182,77,184,235,56,190,90,163,54,215,106,196,34,201,85,135,52,87,86,54,215,45,201,61,205,210,143,224,92,38,170,60,28,206,168,76,137,155,119,84,119,51,3,128,170,27,54,237,139,64,16,185,159,46,203,215,93,146,82,216,184,21,19,232,103,170,185,80,119,70,80,143,213,67,183,111,148,153,233,193,79,246,36,40,90,185,64,158,122,222,251,212,124,190,39,242,81,197,112,194,7,216,85,103,182,191,123,34,28,208,159,170,42,154,67,133,16,121,
+143,148,104,229,178,13,245,90,10,215,85,103,41,126,161,48,76,193,95,240,65,79,84,5,54,156,223,226,40,205,219,90,235,181,81,216,75,158,20,43,80,217,21,180,163,42,71,148,29,137,10,10,219,194,249,96,32,235,130,175,245,130,103,64,177,242,12,251,33,159,28,203,249,239,76,142,251,154,127,119,79,117,62,114,76,153,243,172,59,117,47,139,90,250,177,201,193,196,164,181,77,11,210,47,196,174,44,174,156,249,129,243,177,30,234,118,20,134,245,69,249,238,32,45,52,61,132,152,225,52,106,205,245,132,173,1,116,178,160,177,220,199,208,184,145,120,192,237,237,188,105,90,27,236,106,89,101,43,188,50,87,153,0,189,215,98,94,165,77,60,37,176,234,249,27,105,20,126,89,123,193,9,69,137,41,85,215,143,160,41,92,207,139,252,65,202,230,50,8,107,35,153,185,56,176,235,85,152,192,242,46,22,164,197,67,30,34,162,114,99,3,59,172,46,150,124,48,201,121,211,245,211,131,157,222,158,91,139,63,211,151,87,254,202,74,138,222,34,15,139,215,102,88,158,207,102,
+13,136,90,118,223,44,165,180,227,15,63,244,1,50,158,69,148,61,126,44,44,42,246,216,245,13,170,114,233,199,149,248,144,72,40,222,171,189,171,21,241,80,30,122,48,111,119,198,139,90,225,105,13,76,236,21,144,91,42,52,174,147,96,184,98,227,52,62,209,87,111,220,212,147,61,69,129,198,139,168,171,193,154,132,45,216,198,181,118,36,54,56,217,110,136,145,76,173,99,175,199,216,225,240,20,198,3,159,221,246,96,126,119,219,75,187,210,190,230,4,61,175,177,1,113,113,94,78,220,18,214,7,73,102,51,170,34,226,92,205,227,61,90,179,216,202,202,221,253,50,94,73,243,171,23,118,89,141,70,239,62,0,51,188,163,85,203,36,139,150,206,182,93,179,223,179,145,71,44,146,62,122,170,154,135,249,176,221,55,27,145,76,248,53,245,110,125,253,173,249,130,239,225,2,43,209,198,109,99,44,14,152,230,158,187,113,60,145,28,206,120,16,29,162,76,8,116,212,107,187,116,242,178,129,235,136,106,194,98,207,121,188,0,185,223,189,114,54,177,11,122,189,145,47,157,230,
+114,20,251,205,198,146,184,16,185,205,65,221,76,57,16,205,11,189,155,110,62,188,189,182,8,183,174,129,12,136,237,115,104,75,223,179,36,85,75,171,242,0,46,241,196,1,98,67,64,46,251,66,140,78,113,182,227,60,99,78,19,183,43,238,45,38,108,188,0,166,92,208,90,80,150,71,60,164,40,163,94,179,42,226,2,162,95,239,228,67,220,36,13,26,106,175,79,248,192,155,58,87,177,197,143,28,22,53,2,148,88,178,111,58,53,69,239,125,134,229,100,246,27,207,42,173,184,124,74,7,84,232,210,228,234,62,125,221,71,188,89,203,48,81,173,55,205,91,168,153,91,29,26,235,38,62,169,211,175,128,185,64,163,15,115,109,72,249,228,180,18,46,170,10,56,77,44,204,108,76,154,34,73,15,185,175,4,243,59,198,238,245,194,225,184,111,135,17,178,69,6,58,196,56,107,102,247,212,249,114,234,43,131,138,186,117,69,43,116,206,44,19,0,207,167,125,64,229,64,150,38,247,185,235,157,7,36,179,159,36,18,45,110,99,20,157,103,72,182,150,134,222,179,78,118,103,
+155,225,16,184,48,23,10,96,149,12,9,88,130,123,142,63,142,161,247,99,204,248,114,252,18,244,72,181,226,48,77,53,124,158,52,203,69,44,71,203,208,145,227,203,237,40,27,221,182,90,19,254,100,202,167,191,109,159,181,123,50,57,189,28,49,142,125,206,11,75,243,60,30,104,121,84,143,114,21,4,157,116,136,225,110,123,217,53,42,225,79,58,3,62,7,219,146,60,88,195,128,167,47,168,76,245,135,100,178,10,159,92,90,226,122,155,226,238,230,206,26,60,89,109,1,58,72,126,182,39,147,226,113,118,196,47,220,54,102,78,32,205,23,137,235,173,100,100,58,11,134,65,76,135,88,114,131,233,110,129,94,36,70,146,131,248,177,111,35,49,186,32,174,142,195,30,176,182,162,137,238,77,187,214,21,211,114,90,14,224,93,33,208,165,176,5,241,67,4,160,242,232,153,34,92,65,2,43,162,15,199,40,241,44,91,201,59,69,53,6,161,56,191,72,247,2,31,9,238,200,164,192,253,108,50,26,150,189,240,58,35,152,200,17,126,143,56,239,192,221,151,51,235,246,83,77,
+238,189,187,102,161,120,40,124,119,109,173,210,67,195,120,199,224,221,155,24,131,206,197,88,162,73,95,166,113,227,143,125,178,9,34,14,63,239,112,25,253,0,200,173,240,136,70,170,41,68,165,88,54,91,4,216,167,72,200,27,16,98,52,201,206,129,167,165,198,23,9,74,247,166,179,68,216,72,87,87,208,190,93,137,248,216,240,251,96,119,199,255,96,183,22,2,236,70,246,59,144,132,225,37,43,56,151,138,137,104,185,205,212,111,152,146,186,135,62,54,246,110,193,111,205,179,152,229,53,32,166,148,43,32,76,19,109,107,50,212,115,94,57,132,57,30,160,11,232,89,25,128,46,64,239,189,70,207,88,138,132,203,82,85,131,81,103,239,183,234,235,25,232,211,36,154,193,124,79,141,152,0,76,180,61,222,220,135,128,174,110,160,239,185,43,248,131,28,196,241,65,174,169,165,153,229,56,141,162,96,183,221,223,221,160,76,17,112,23,5,61,240,7,125,62,171,232,55,195,154,170,123,242,35,128,90,180,236,159,81,163,81,250,132,32,62,21,129,4,6,1,209,126,103,80,70,
+192,239,91,170,188,11,63,207,242,177,129,12,198,127,108,32,195,132,31,27,196,200,248,199,6,50,7,244,177,129,252,10,250,216,64,134,18,62,58,34,37,240,247,142,248,143,237,98,144,229,99,187,24,234,248,216,254,69,225,63,182,127,33,142,143,109,92,161,227,99,27,247,193,134,144,203,201,205,102,107,34,14,111,198,243,182,157,51,99,145,175,230,230,193,190,211,223,39,130,228,83,139,173,135,122,158,236,110,193,104,226,181,33,81,8,128,47,104,10,67,237,50,134,201,106,167,226,120,82,150,146,140,120,41,157,88,81,213,215,71,197,16,113,156,111,114,233,185,251,190,159,81,234,181,139,214,64,99,0,93,83,218,24,245,195,147,60,45,195,20,225,8,243,220,98,149,19,187,5,103,13,42,144,186,147,212,173,165,132,0,17,33,85,235,196,43,57,120,20,209,226,166,82,59,172,203,213,40,5,5,188,174,148,237,36,54,133,162,159,41,52,48,208,245,37,64,199,244,100,148,234,180,218,91,121,102,215,26,140,8,113,171,154,24,123,6,24,190,148,27,0,48,144,53,14,144,
+89,121,162,244,196,148,87,113,20,252,252,252,67,176,161,215,51,15,149,124,113,223,7,48,75,91,237,110,53,94,39,38,113,100,4,8,35,209,95,16,27,72,98,174,255,226,120,209,87,76,150,80,102,2,87,5,246,105,142,188,34,39,103,164,47,254,96,232,160,124,93,7,114,23,107,145,21,1,82,221,186,107,193,107,101,176,248,184,55,164,214,12,123,107,144,150,109,226,228,53,41,40,155,76,142,238,72,151,23,66,128,174,14,112,64,71,118,200,235,40,153,66,202,134,35,113,16,90,32,173,235,182,163,211,106,103,249,226,11,62,208,186,25,15,149,79,245,76,19,35,185,119,162,196,178,194,66,229,62,25,106,151,128,169,210,15,193,253,213,211,69,154,41,114,147,186,221,35,30,102,96,245,110,33,32,208,43,237,66,96,75,165,101,59,247,12,186,41,142,50,33,64,187,169,198,133,49,84,181,207,60,217,166,40,53,40,140,84,178,114,41,151,125,94,243,237,114,83,168,127,35,207,218,144,82,86,122,169,215,88,34,25,154,51,122,145,85,46,247,207,161,231,84,104,91,209,
+16,18,112,93,61,85,41,113,222,20,198,77,222,253,2,218,91,209,156,103,27,110,69,78,20,10,55,183,27,145,50,164,221,61,27,230,134,56,104,215,185,138,177,179,163,193,170,40,18,144,25,177,26,6,38,53,116,189,217,218,70,175,149,244,77,41,70,221,10,163,218,34,19,241,28,250,116,59,223,69,226,160,187,83,66,165,41,226,26,211,116,8,30,227,180,250,156,139,147,242,232,122,219,23,122,65,251,66,204,187,179,9,183,82,19,141,75,202,69,176,219,217,136,200,8,13,28,144,226,150,54,18,20,18,215,21,241,228,142,112,92,208,82,178,148,19,157,190,207,34,93,53,250,65,51,174,150,249,228,16,74,152,85,68,88,183,23,82,89,17,85,181,175,103,152,160,165,207,160,215,86,34,66,189,125,113,129,50,56,81,66,178,239,77,99,239,7,172,113,77,67,80,137,120,230,253,69,33,197,139,221,41,174,45,102,216,4,118,57,245,153,198,165,254,125,198,129,122,11,176,50,88,153,2,241,246,24,189,103,11,13,18,234,221,53,226,72,11,32,28,242,184,46,146,155,168,
+160,84,95,121,19,161,248,92,120,72,43,181,228,71,194,137,60,66,202,224,77,74,144,22,178,64,87,188,8,106,91,148,155,235,222,45,104,14,188,164,168,23,95,184,210,196,82,238,82,210,201,101,24,8,184,239,198,124,115,244,107,177,39,103,5,55,5,195,151,15,193,108,64,203,119,15,123,1,166,78,197,245,38,157,232,69,58,156,122,45,70,147,249,206,34,144,159,65,224,116,169,138,55,1,104,207,74,116,149,196,70,69,34,87,142,72,133,78,206,206,39,215,155,32,159,34,3,231,202,185,187,3,101,243,98,114,114,133,113,83,95,185,20,77,193,158,213,131,248,190,19,185,142,44,141,33,213,227,60,14,129,167,228,42,180,157,41,99,151,249,212,107,171,50,110,184,191,227,55,133,182,100,158,13,50,88,202,154,205,236,214,161,247,215,163,180,109,198,224,187,245,139,23,122,27,252,192,89,176,34,221,227,242,181,93,7,45,241,137,226,201,5,10,203,11,11,239,52,172,134,18,94,10,184,94,112,244,160,87,74,4,15,43,248,134,83,24,209,209,69,172,103,231,205,164,6,
+57,131,142,45,74,135,227,188,188,7,39,3,135,16,55,128,34,201,35,124,181,189,47,48,177,133,27,222,171,233,158,186,30,165,187,59,207,213,92,77,79,145,69,125,34,119,97,104,136,156,145,160,5,211,215,65,16,62,123,61,75,123,196,31,8,250,120,141,253,132,28,172,225,185,105,179,134,102,210,234,2,222,141,25,71,113,135,59,114,233,5,196,60,37,236,117,132,116,33,129,130,110,36,74,184,127,158,6,233,230,139,38,252,4,78,120,51,20,108,227,161,226,138,139,73,73,28,234,142,209,73,164,175,94,197,26,50,188,37,195,51,163,8,57,94,203,246,21,92,200,57,117,206,139,234,183,241,183,29,36,233,203,221,79,233,151,4,133,230,46,1,100,142,220,70,183,223,251,230,100,217,228,78,88,54,86,125,141,219,30,169,189,230,194,197,110,253,56,55,235,112,78,247,67,22,89,164,184,118,84,36,55,129,253,154,220,189,151,97,214,245,212,67,183,185,28,213,174,24,71,135,187,223,160,247,87,15,233,128,213,237,186,189,164,208,8,248,61,17,85,158,48,162,154,51,247,
+8,142,149,19,102,15,175,163,182,192,63,203,95,119,122,153,205,246,10,142,204,93,183,169,141,181,60,138,194,101,174,205,238,217,170,195,22,244,234,247,241,230,162,166,44,146,110,29,149,87,116,139,132,170,152,133,94,212,40,26,221,43,100,222,235,184,212,34,213,142,93,26,183,205,197,90,101,223,130,225,54,198,31,29,56,136,107,90,166,251,86,187,9,122,234,98,238,17,89,20,51,99,233,119,190,232,75,149,85,202,130,225,109,89,53,57,246,122,50,136,124,142,65,208,98,55,63,221,84,161,139,116,101,250,38,143,161,237,240,224,42,142,50,187,30,53,185,153,41,57,116,24,21,215,55,61,35,175,16,112,181,52,119,236,5,109,77,111,217,17,193,45,96,85,15,48,35,82,60,200,13,224,96,106,243,132,133,78,154,239,247,23,23,59,151,214,218,141,223,213,92,92,180,0,171,208,110,92,233,44,226,117,116,193,243,219,78,247,187,195,130,35,130,206,133,160,13,69,248,20,158,163,24,112,167,6,198,185,55,119,236,62,68,7,23,65,169,19,108,226,7,25,215,59,153,96,
+45,116,71,116,85,134,120,35,165,122,43,93,172,123,70,116,254,69,187,127,16,120,65,142,70,139,124,241,170,202,194,231,79,207,212,118,95,5,172,198,211,58,225,146,147,110,215,117,107,215,84,18,120,23,216,62,75,168,151,194,242,92,107,232,26,180,87,112,41,101,113,93,174,5,178,249,39,97,51,161,84,92,42,180,33,1,64,86,172,82,149,72,138,117,62,250,184,34,56,54,179,164,122,24,222,137,64,144,66,193,148,231,132,224,229,167,197,35,186,24,127,123,83,63,66,7,152,85,60,79,121,196,205,190,166,143,11,195,252,243,193,158,197,53,218,178,24,241,197,38,76,12,67,85,1,11,196,39,197,29,205,206,220,227,60,163,197,42,157,42,117,156,176,102,218,30,99,243,164,144,161,102,65,110,199,54,121,150,255,146,165,111,250,194,254,59,240,6,58,236,42,2,225,255,150,141,32,108,180,182,92,183,31,145,147,185,251,106,186,249,192,69,117,240,248,117,128,223,13,212,48,50,155,50,2,181,211,121,230,235,173,252,4,102,211,32,130,7,77,203,0,175,61,110,195,139,
+23,198,2,164,158,42,243,207,224,229,78,210,183,135,104,8,163,0,74,105,74,104,216,0,101,57,33,7,139,54,169,143,127,152,200,25,81,204,140,78,187,190,200,160,184,187,215,200,49,96,121,202,200,20,89,99,98,202,153,144,4,154,54,64,238,54,126,215,191,206,210,116,161,205,171,173,60,8,181,110,84,242,157,188,23,15,85,59,188,215,118,97,76,56,78,234,195,245,168,187,133,40,184,179,152,9,195,61,139,158,2,100,15,3,19,26,113,221,120,201,152,10,190,76,104,227,142,17,67,92,140,72,79,212,238,21,2,120,2,49,235,188,216,112,100,242,32,95,65,20,176,180,24,84,155,186,54,39,41,161,73,232,8,201,163,43,239,210,62,112,193,168,78,28,77,140,77,242,61,121,95,145,40,98,157,45,130,61,160,56,48,242,101,127,116,79,209,107,45,163,217,76,157,182,201,227,242,81,138,164,126,81,86,189,166,83,29,120,159,120,57,131,4,48,30,170,29,188,87,147,246,149,106,108,104,72,172,22,96,148,25,215,93,213,70,130,166,120,97,98,5,57,75,22,162,252,
+35,177,184,37,106,48,17,210,34,50,27,44,181,24,218,11,218,59,254,32,115,51,248,32,83,181,117,240,229,121,55,51,232,237,17,205,219,246,148,233,107,118,208,77,131,54,28,111,213,24,142,26,134,185,73,157,245,245,150,228,138,59,247,210,184,62,144,101,63,230,174,48,139,35,198,139,213,84,92,141,23,251,50,119,67,113,165,28,35,126,71,167,27,18,255,47,226,222,235,199,185,38,189,19,251,87,62,236,197,66,2,4,97,36,175,7,178,12,95,172,239,246,79,240,133,0,141,87,159,86,3,140,52,194,200,214,88,119,204,108,146,205,156,115,206,169,153,155,57,116,51,199,102,206,236,102,206,57,71,179,251,253,102,52,105,33,195,88,64,23,239,123,138,85,231,73,117,158,58,85,213,117,158,231,119,58,221,215,82,173,158,133,70,63,145,202,67,1,61,241,245,16,96,64,68,155,91,114,35,8,92,57,195,250,98,24,30,164,139,37,148,241,198,61,58,13,222,71,87,117,234,154,68,131,159,189,223,226,116,75,4,76,25,199,30,220,136,210,14,200,184,170,186,108,151,183,
+199,79,127,11,197,192,133,166,116,178,181,58,169,88,68,50,207,170,212,81,84,184,15,222,58,144,46,79,92,115,103,21,248,114,215,81,15,225,220,151,32,215,115,94,226,168,165,121,119,90,184,244,235,129,133,22,142,143,149,188,80,24,110,136,213,90,98,203,180,246,129,180,4,16,176,239,85,96,77,182,94,133,237,10,51,230,51,71,81,209,211,187,31,154,1,15,10,147,196,86,13,138,113,245,186,118,125,83,0,247,201,228,206,131,11,43,200,122,90,56,210,106,12,92,24,171,16,103,63,114,125,121,14,237,83,249,187,238,203,119,207,122,138,146,73,113,230,251,64,140,245,154,217,175,94,140,114,139,193,116,131,209,226,86,31,163,151,98,98,142,236,95,29,216,177,174,155,49,203,190,164,118,63,2,159,82,187,177,30,37,237,89,7,14,134,7,105,125,106,112,84,77,0,17,97,86,103,185,91,9,239,185,238,188,17,121,11,179,178,126,22,3,247,150,139,244,81,10,8,172,66,115,206,55,5,200,122,53,145,195,72,194,1,234,167,150,141,139,142,108,39,36,110,243,45,189,
+124,220,110,37,241,251,179,196,221,215,187,218,56,253,105,22,140,26,247,41,208,236,141,71,224,74,150,201,91,218,31,203,41,236,47,5,239,51,101,145,46,212,22,56,204,67,87,115,203,234,126,229,199,108,242,132,190,78,157,109,249,62,80,53,88,230,183,175,57,246,21,214,122,227,72,253,171,164,166,37,145,122,14,15,181,149,48,3,55,175,16,119,159,14,158,226,139,64,124,17,81,47,159,41,10,110,24,228,36,150,102,231,243,50,160,130,191,139,211,182,218,198,223,115,243,66,196,140,44,183,116,233,151,95,35,248,34,27,71,69,240,110,230,241,190,218,17,248,135,138,182,246,182,16,10,72,131,40,222,149,63,200,41,8,8,187,149,181,28,245,27,215,51,117,15,124,237,53,135,154,53,153,188,39,247,194,155,154,3,250,146,195,42,245,128,244,203,77,158,20,181,218,101,195,245,162,28,227,87,182,161,98,13,134,210,116,150,92,165,162,156,235,148,203,222,253,141,246,249,119,162,187,139,124,120,239,62,9,87,167,48,101,202,54,135,121,77,198,192,16,141,151,127,226,122,244,
+232,193,200,180,214,171,181,195,35,132,97,146,196,247,134,205,151,196,183,94,71,179,182,34,144,17,39,50,118,171,226,143,110,182,25,18,16,101,39,56,163,186,177,12,219,160,205,61,36,98,206,177,111,58,140,83,188,143,45,217,53,125,77,160,51,170,185,90,120,196,28,163,198,219,125,91,223,123,236,243,167,68,208,45,1,191,132,153,39,161,94,245,178,124,181,57,21,115,66,106,45,253,152,225,221,142,193,9,65,210,99,122,4,55,110,207,114,199,197,135,163,53,27,115,190,187,196,51,19,253,6,202,251,133,107,158,54,29,176,14,236,175,94,44,250,204,238,187,63,89,251,238,188,63,89,119,251,248,56,175,213,160,212,114,105,229,25,244,142,88,27,221,5,217,93,241,251,22,185,143,57,210,77,84,178,84,57,133,158,250,140,116,141,193,244,247,158,31,160,62,252,102,236,148,204,87,228,243,231,192,185,172,238,189,114,16,108,0,244,24,92,29,226,170,133,77,209,80,183,66,185,208,145,156,105,21,218,144,232,99,142,31,232,203,209,181,184,125,53,46,174,219,159,144,232,132,
+41,69,62,160,5,214,178,55,58,119,229,118,126,85,95,171,92,216,219,27,142,71,60,35,60,65,47,134,45,239,194,169,43,42,17,101,210,72,228,97,202,188,74,186,132,181,134,142,89,26,146,75,80,48,236,40,47,158,184,164,104,241,233,15,180,152,220,14,122,154,193,4,224,245,210,123,215,136,59,19,218,251,161,201,25,112,189,150,86,160,233,149,179,246,137,36,105,151,219,120,182,43,119,141,29,58,24,100,202,54,35,224,223,149,218,204,217,205,202,188,15,219,204,226,107,216,70,44,153,100,204,198,54,122,212,21,209,24,172,71,176,81,210,130,243,65,139,231,225,25,71,59,234,234,4,184,63,6,12,94,252,46,83,240,225,20,147,77,195,235,122,48,53,24,182,124,31,41,124,62,120,46,136,90,245,148,113,127,80,79,121,123,37,181,125,161,230,31,225,64,0,169,54,42,216,143,161,62,248,69,147,210,168,104,0,61,96,50,224,237,49,12,198,83,148,230,145,164,64,215,54,93,212,89,140,223,17,10,114,13,248,60,50,167,183,18,137,244,35,146,13,44,238,27,208,166,
+108,110,40,182,221,52,18,24,32,6,166,129,50,145,128,183,240,144,246,5,80,39,126,118,51,0,42,31,228,94,121,175,163,121,72,160,221,58,150,160,105,64,128,10,96,13,0,34,31,66,14,28,242,170,165,239,238,220,150,91,18,18,176,252,164,159,203,64,132,6,143,218,133,0,228,41,218,235,185,12,43,247,85,217,86,244,3,2,240,228,61,54,128,41,8,106,186,168,216,144,151,115,3,235,116,139,224,88,32,143,122,44,100,67,81,175,9,168,60,116,192,154,6,24,66,112,123,134,87,27,179,11,16,177,179,200,227,4,144,80,33,56,239,49,0,64,104,241,178,29,178,15,43,24,32,0,48,224,147,25,40,116,22,163,61,234,23,131,245,154,162,2,104,224,79,253,241,158,230,8,162,87,114,63,10,185,11,207,76,245,130,65,67,224,157,126,252,73,47,55,154,215,249,188,250,104,149,15,18,136,97,115,159,52,167,10,129,64,128,251,134,161,145,212,143,89,16,14,227,129,14,190,125,55,70,6,164,5,138,69,139,15,252,246,153,149,194,247,237,179,48,30,252,219,103,97,
+128,7,207,183,15,204,64,128,111,31,152,133,62,55,235,16,237,34,201,229,148,194,217,107,155,182,177,183,7,28,52,196,243,249,209,58,51,116,140,92,243,218,11,193,61,44,69,118,193,164,230,188,172,13,119,215,62,33,174,127,93,107,234,130,248,210,19,74,212,85,201,112,165,205,24,72,158,151,24,57,105,215,40,231,45,45,26,223,212,84,190,22,17,190,180,78,92,27,218,241,234,205,41,86,223,234,242,72,194,182,213,211,174,18,103,104,125,229,123,209,188,114,47,238,231,19,200,17,133,195,170,87,157,7,222,30,188,102,116,186,64,63,160,131,62,69,204,45,191,120,143,245,133,51,169,162,34,171,127,197,51,20,109,131,145,144,59,205,99,9,138,124,215,136,119,162,47,83,109,208,126,177,43,23,220,67,33,188,147,126,197,179,73,59,205,27,60,240,28,6,20,126,3,42,226,127,250,95,191,251,79,127,250,149,84,224,167,255,240,223,62,47,255,154,194,227,135,202,95,103,191,248,215,244,28,223,125,98,61,252,97,252,136,111,25,47,190,97,32,252,226,251,127,252,197,247,
+255,244,253,87,162,144,239,254,249,43,186,252,187,175,80,207,111,249,2,254,233,239,127,254,153,230,225,126,203,127,253,201,207,238,108,254,244,55,132,126,94,254,234,46,230,23,255,252,153,93,225,135,12,7,63,249,197,103,50,134,47,180,132,95,254,221,247,255,240,13,99,225,83,254,15,68,127,242,171,194,175,242,21,252,227,103,60,255,247,127,243,153,177,226,39,255,240,47,223,40,127,224,242,45,175,192,15,25,48,62,27,126,109,237,183,100,12,127,249,239,157,176,224,155,33,63,244,240,31,136,90,254,31,137,123,240,149,191,255,55,59,225,27,12,192,87,254,130,111,72,0,63,232,241,111,82,253,64,246,133,32,240,245,235,255,43,225,253,246,63,251,130,144,248,213,127,191,79,248,135,162,188,255,96,236,246,239,186,209,79,127,249,71,223,98,248,127,7,100,225,167,191,141,100,241,43,155,255,236,47,126,165,252,39,120,197,239,116,213,15,52,255,229,211,141,127,101,239,231,157,119,111,248,47,127,255,223,254,250,47,255,242,251,255,231,191,254,236,39,223,210,183,252,97,210,175,
+7,242,231,191,137,153,241,249,239,51,144,254,119,243,57,252,106,120,253,245,255,118,55,225,175,254,29,66,180,127,3,89,225,199,127,254,163,255,248,103,127,241,227,255,5,0,126,5,110,129,191,133,172,192,130,159,137,29,108,235,198,21,157,210,50,136,190,29,38,188,226,128,75,58,8,218,65,138,245,16,60,46,130,107,99,129,107,50,203,83,184,216,58,240,217,217,70,190,94,161,21,60,95,134,20,52,200,4,126,100,44,23,159,44,59,195,160,46,12,175,220,204,168,120,96,75,53,151,187,100,103,121,112,215,181,66,71,90,24,214,238,28,160,217,116,25,247,13,156,140,208,222,239,39,245,19,85,189,156,179,115,65,148,232,140,62,20,139,233,27,44,191,192,228,19,55,195,117,12,34,75,60,148,245,2,79,178,81,74,141,170,20,176,145,134,13,59,216,251,177,81,57,76,18,7,126,208,240,170,175,142,172,74,129,185,250,113,53,170,154,136,164,132,152,115,84,9,228,107,80,237,62,55,113,24,58,241,133,233,13,209,139,39,191,60,41,201,160,251,196,117,160,183,63,81,175,
+204,237,1,141,57,150,200,152,35,19,115,6,43,44,99,118,93,55,51,191,41,231,224,61,58,222,126,114,233,185,80,68,113,63,48,60,200,75,26,38,209,156,212,186,170,4,86,85,201,175,143,208,213,68,59,152,162,7,248,74,234,176,96,197,145,71,168,179,121,68,179,86,202,203,233,117,79,208,22,214,106,109,129,24,22,171,251,110,156,79,92,44,106,216,222,19,119,3,21,65,47,98,28,173,26,159,242,47,88,31,204,103,134,154,173,23,51,77,242,28,174,18,244,138,169,8,30,159,90,131,146,14,19,79,15,35,59,176,132,85,47,72,226,70,229,150,230,66,15,194,134,154,41,87,95,106,235,16,75,228,168,96,141,86,124,31,72,233,83,234,132,55,88,42,50,234,20,193,111,170,233,72,100,197,251,224,151,249,183,41,157,173,108,117,68,170,173,142,60,184,20,248,47,77,189,94,70,139,89,104,85,87,49,118,233,215,106,250,231,198,16,84,189,226,9,21,189,61,120,156,215,18,234,15,22,57,30,240,212,248,31,242,141,26,238,104,136,86,153,81,187,14,33,105,115,168,
+218,202,223,68,45,107,22,225,77,11,173,42,74,213,58,132,47,25,231,225,203,3,149,70,35,69,151,207,173,143,132,244,234,200,84,209,179,241,194,148,211,164,189,116,58,216,145,209,63,147,241,242,83,219,69,186,158,201,147,253,154,66,93,206,87,162,210,11,208,213,246,74,247,229,91,167,204,161,183,115,15,154,94,229,45,95,32,15,10,131,202,179,0,235,38,162,47,55,30,174,128,13,243,115,154,28,12,89,114,152,35,38,115,190,220,37,77,144,139,101,103,185,148,104,137,47,154,98,199,55,233,18,186,142,15,203,102,18,113,246,246,171,66,220,100,28,27,188,238,51,33,55,133,249,16,147,144,157,181,161,92,225,64,220,82,91,222,62,109,237,213,1,160,84,55,232,57,215,23,170,50,161,30,76,215,107,227,202,113,246,217,10,178,107,212,15,78,204,23,219,185,61,48,117,133,44,213,167,209,44,163,86,50,198,133,82,94,91,243,149,163,154,134,220,184,81,152,217,24,233,179,193,140,95,247,50,80,54,134,100,156,16,179,131,123,55,208,80,214,170,205,224,159,71,186,151,
+27,17,101,194,198,242,170,55,76,202,125,214,14,195,138,98,238,165,149,67,5,158,86,93,45,205,79,55,177,122,15,179,88,197,32,136,30,37,177,62,197,185,130,99,64,16,154,166,231,146,180,249,29,142,123,73,22,193,221,113,246,96,229,230,195,106,169,68,191,168,119,53,148,41,149,186,47,198,89,55,40,225,136,235,104,26,175,141,7,95,247,208,14,189,94,113,54,165,249,210,84,125,60,48,42,47,133,174,107,91,244,246,180,122,234,244,98,191,129,111,115,102,253,100,236,65,55,71,235,173,44,111,44,158,180,87,185,216,54,65,173,173,21,193,6,155,200,76,133,12,97,201,29,119,46,47,250,225,130,246,88,2,171,133,210,237,217,117,222,174,55,9,211,198,93,189,141,146,1,245,42,216,218,14,237,157,144,51,165,225,225,231,182,218,94,94,223,73,82,181,246,194,180,98,211,5,175,237,58,158,212,102,112,240,36,227,118,52,51,194,16,189,74,126,86,116,213,159,111,53,1,152,75,110,223,206,233,41,51,233,160,213,75,164,213,108,19,63,222,212,217,73,35,177,234,168,
+110,75,196,116,129,130,218,212,43,35,179,11,148,21,146,111,78,163,198,181,170,207,105,167,227,53,98,109,195,174,49,106,33,166,151,22,150,241,91,222,109,138,229,226,78,6,69,90,175,250,39,183,251,174,203,58,94,118,203,102,119,112,18,224,30,70,75,183,33,230,224,61,136,187,107,202,198,137,19,234,15,106,142,122,100,142,117,20,26,84,113,85,174,219,237,143,85,173,155,176,26,15,47,173,76,116,93,17,154,152,135,222,192,18,75,171,152,8,77,157,174,169,31,184,221,91,214,185,143,109,65,7,60,125,53,125,160,167,123,179,247,39,204,57,250,114,110,238,161,20,107,33,154,234,211,125,189,202,57,186,40,163,13,203,70,145,66,60,229,51,213,16,153,186,76,44,163,230,120,70,67,100,202,235,116,126,217,204,121,51,245,57,99,120,48,210,77,50,189,106,237,65,61,72,229,199,222,129,129,48,115,47,111,183,23,97,205,110,172,45,209,238,21,225,52,124,211,157,173,243,203,116,15,56,229,40,148,28,180,60,121,49,15,162,153,210,113,167,51,62,50,215,43,155,49,35,
+43,106,242,157,248,240,225,5,53,218,163,181,179,246,54,100,214,102,178,20,156,84,78,209,214,226,80,150,169,135,145,86,150,42,58,56,221,59,84,183,98,129,156,2,109,183,198,154,206,52,92,179,83,220,189,184,158,101,182,115,165,196,109,20,173,84,76,171,122,238,170,118,170,132,240,6,8,122,236,114,117,54,75,68,85,217,26,93,83,199,211,178,214,106,225,205,227,92,52,32,71,82,96,157,36,59,79,61,45,47,23,189,100,19,149,210,234,183,200,171,251,165,189,219,118,43,28,188,103,65,61,69,215,206,139,126,166,238,12,40,141,184,197,202,26,157,102,240,57,71,67,214,194,151,80,181,31,163,141,153,168,51,174,53,244,178,71,79,42,24,173,106,84,218,189,54,107,153,64,244,16,85,99,135,133,70,82,239,143,58,109,154,87,148,85,80,200,239,177,5,213,67,157,158,153,34,208,236,101,244,195,110,47,141,43,28,70,106,29,173,214,240,14,42,255,41,163,89,78,74,173,5,94,221,228,29,173,150,177,149,122,3,131,101,19,184,211,14,167,249,138,201,74,221,90,53,
+42,73,113,184,125,174,57,213,40,135,115,120,24,124,164,44,181,36,19,179,235,86,20,170,141,119,54,31,172,24,92,178,153,83,55,157,180,202,237,130,96,247,148,173,23,102,163,75,174,53,199,108,212,40,123,247,122,13,238,41,86,153,181,4,37,230,40,236,37,134,189,113,86,40,200,195,168,214,240,14,157,130,44,142,106,79,244,84,103,101,207,2,102,241,227,93,34,252,26,137,12,96,71,197,225,68,233,161,11,26,166,166,80,89,3,166,43,199,100,47,196,246,243,201,247,70,90,167,111,166,107,163,222,22,126,84,246,234,42,78,56,255,194,126,203,177,223,166,234,209,117,186,32,218,73,55,147,145,221,88,22,73,72,58,189,95,51,173,44,167,78,170,48,52,85,159,152,247,23,249,69,4,187,191,208,59,45,130,153,114,158,248,11,29,199,243,131,205,17,186,61,131,47,210,75,131,79,146,24,80,67,169,42,78,119,239,57,166,116,209,169,168,218,23,148,211,22,111,181,161,13,166,16,179,219,207,7,140,197,189,118,212,107,168,216,111,158,218,234,214,139,191,246,226,99,57,
+187,37,217,94,105,199,16,211,213,121,43,201,218,89,88,99,153,124,174,95,221,49,83,85,13,243,97,89,163,195,118,18,173,80,112,78,10,73,73,121,205,201,169,133,146,139,194,201,77,156,54,69,130,111,234,137,59,230,67,178,215,138,91,100,175,104,254,187,181,74,40,38,109,2,148,213,202,49,72,235,138,99,185,239,232,198,47,85,255,231,184,48,141,164,5,130,216,225,136,61,55,53,87,101,58,62,212,48,243,175,97,230,155,119,211,128,207,246,186,137,139,158,69,166,103,7,14,219,106,39,90,146,7,51,201,213,97,42,235,237,74,247,218,174,12,18,120,95,183,98,86,14,139,79,245,40,197,10,133,231,43,69,50,122,82,158,220,86,224,84,253,190,161,188,203,243,157,122,65,38,76,94,168,42,75,39,167,187,91,51,218,112,133,17,38,167,113,71,45,70,255,212,97,190,150,131,53,50,105,171,8,243,17,173,163,15,243,56,183,152,99,240,240,132,61,81,175,236,182,190,171,19,93,56,112,123,189,133,76,205,193,28,108,73,192,90,142,213,142,120,237,125,58,9,85,101,
+96,134,29,37,45,61,242,95,84,51,144,125,226,79,234,53,157,99,140,155,50,29,71,211,167,92,90,55,68,146,137,147,210,48,159,40,164,52,207,65,251,152,196,153,14,82,172,16,112,3,179,54,10,101,131,75,54,190,102,61,248,138,243,64,167,72,201,243,18,210,218,199,186,222,10,203,103,202,214,237,209,56,109,102,104,117,220,208,205,217,162,237,246,168,146,86,7,44,164,37,151,99,181,173,136,204,219,3,195,7,189,221,236,75,124,62,48,81,81,183,78,71,68,19,52,218,237,162,118,194,173,62,121,67,102,77,79,79,108,44,248,34,45,87,90,186,98,187,195,18,109,59,120,168,53,71,222,35,244,178,236,110,152,77,74,225,252,20,188,153,103,79,199,169,123,255,241,90,111,236,222,202,149,174,181,93,230,224,95,220,173,218,235,241,145,237,191,25,200,141,234,72,174,133,241,155,171,248,209,221,188,44,235,220,15,37,240,89,233,123,39,36,52,189,196,135,61,159,130,104,248,70,249,121,178,195,140,140,80,23,239,132,28,233,54,26,115,85,245,177,237,170,188,37,44,188,
+46,71,62,102,212,200,118,198,143,73,7,235,114,63,134,165,41,61,23,79,235,247,91,13,236,220,24,232,182,5,188,88,77,148,112,22,151,135,220,37,91,166,175,135,92,28,233,234,180,229,226,124,205,80,88,134,121,134,115,212,18,40,25,203,211,167,204,182,158,138,215,94,67,166,114,197,172,185,88,51,71,27,61,185,230,223,223,222,45,129,181,205,33,194,224,82,236,104,195,178,137,103,229,71,32,124,96,128,183,29,243,32,56,48,246,210,87,176,206,75,194,170,30,109,221,57,75,172,174,24,212,178,25,137,77,49,67,231,176,168,105,26,189,13,211,248,14,134,3,119,46,17,139,149,54,229,62,61,80,48,186,232,200,162,106,143,157,141,88,199,174,169,183,135,85,230,210,180,130,197,164,216,22,137,129,94,230,123,244,87,77,98,122,250,120,237,55,160,111,108,65,96,135,53,48,178,246,97,58,254,134,35,158,252,201,225,225,32,105,238,104,136,154,54,177,232,175,55,99,251,179,125,251,162,133,65,131,181,129,99,183,145,245,58,21,114,64,122,194,131,119,155,214,178,194,169,
+151,181,157,84,179,48,174,72,176,121,103,183,174,57,101,178,96,193,100,130,121,98,62,210,15,17,10,56,5,50,187,138,215,235,254,162,63,63,247,147,179,192,174,118,26,165,132,222,74,133,75,203,118,177,183,119,243,105,54,91,157,231,243,62,223,203,135,15,225,80,150,213,217,103,22,42,103,44,102,238,76,27,146,167,80,3,43,188,48,72,240,47,129,187,40,2,125,220,171,5,172,110,57,241,100,82,85,109,229,6,196,55,227,69,163,163,139,55,178,133,85,106,203,161,13,232,179,85,184,215,199,78,87,127,27,20,97,226,142,115,245,126,190,12,180,218,16,18,126,235,103,124,149,7,91,33,116,130,142,77,166,231,250,136,223,129,169,131,69,215,3,220,119,220,240,54,51,64,70,121,18,164,78,179,248,190,86,82,179,236,102,42,53,203,121,237,222,10,0,78,56,116,94,203,73,109,158,11,73,152,123,201,115,183,30,21,83,26,175,222,213,16,184,212,91,64,84,167,93,111,39,53,94,144,21,170,143,204,204,160,194,57,18,232,154,222,23,42,77,84,27,102,238,211,147,28,
+43,248,38,225,45,222,102,200,197,91,4,225,184,219,188,34,185,134,196,91,203,156,28,208,207,75,115,49,153,179,92,175,196,147,39,185,241,62,235,192,203,97,7,106,49,200,3,98,249,156,59,106,62,42,55,156,53,97,19,180,143,200,80,202,156,42,36,30,130,49,81,177,1,83,159,205,78,144,210,18,166,4,253,111,11,117,101,105,38,215,90,34,31,122,63,177,88,58,118,97,155,100,150,48,79,74,0,133,253,140,135,210,119,115,100,79,103,15,36,15,85,124,118,186,113,105,103,227,44,133,99,3,71,0,69,223,84,45,16,170,9,161,221,69,180,206,57,141,143,128,17,136,2,244,226,224,125,58,224,0,128,82,128,95,37,202,1,240,85,42,126,86,222,75,239,223,154,41,130,123,37,186,188,125,17,71,1,207,146,115,244,35,47,23,69,167,119,30,249,232,139,162,163,95,73,69,241,222,77,3,168,2,207,248,178,57,185,157,141,16,30,50,192,195,158,15,137,209,66,65,135,236,66,123,1,191,120,145,142,222,58,142,102,140,5,111,22,123,31,30,79,152,8,183,72,31,
+17,94,92,62,222,148,200,196,128,86,37,192,122,197,209,187,185,102,81,108,5,131,43,129,103,20,192,190,154,62,189,18,252,252,177,186,245,204,70,175,92,28,156,105,125,232,169,91,76,30,27,190,98,136,4,31,163,197,28,205,48,142,121,118,25,94,109,128,31,234,118,2,121,19,10,49,244,183,162,62,144,7,62,193,180,126,104,219,153,79,167,32,234,40,176,59,120,150,202,84,193,120,153,215,17,155,159,146,94,152,158,163,121,145,3,40,37,175,163,11,164,135,143,142,210,10,144,44,119,93,103,141,141,9,138,89,24,143,29,167,223,172,242,94,75,109,218,36,185,45,69,143,16,58,19,72,241,131,15,162,93,91,89,194,154,193,41,125,236,249,137,91,153,202,70,33,29,149,105,84,129,98,154,158,169,18,57,182,253,93,232,236,180,52,199,122,59,3,51,122,60,251,133,67,111,212,5,38,164,244,197,214,135,139,94,171,230,173,45,45,39,79,177,215,25,183,40,137,75,28,114,116,93,3,157,80,160,171,209,55,28,220,56,190,200,232,143,209,11,45,249,209,127,33,110,170,
+56,48,220,76,137,45,156,130,205,135,11,5,228,199,243,43,239,99,153,85,209,251,119,151,210,194,123,6,189,48,85,189,1,136,246,236,232,140,94,88,77,94,74,79,106,59,97,212,87,79,88,93,225,222,170,104,56,224,48,134,62,161,219,78,33,11,211,186,36,90,68,54,90,125,194,22,220,58,54,57,233,140,30,174,179,203,185,160,13,146,50,148,158,235,196,7,125,113,127,237,187,173,3,123,182,145,160,142,181,28,149,124,186,243,26,225,171,88,119,181,113,7,232,136,47,137,5,85,15,68,123,26,90,57,64,91,236,46,69,115,150,41,213,241,55,225,77,49,122,99,139,31,87,136,199,199,137,158,131,106,242,146,80,10,145,168,41,180,101,39,248,97,23,198,32,96,151,17,122,162,62,195,168,105,232,1,2,51,151,6,73,168,14,231,139,246,8,55,246,68,51,47,91,135,51,145,188,97,223,238,176,24,157,14,161,62,19,44,247,251,88,176,87,167,207,39,33,244,173,218,100,58,197,34,197,12,164,27,98,119,164,42,36,146,203,205,99,159,57,42,203,94,140,95,163,37,
+219,22,170,101,179,71,193,87,148,27,241,182,208,101,144,150,120,68,162,117,77,26,28,229,64,84,2,6,221,246,184,226,61,52,58,100,240,178,90,76,250,245,100,152,247,167,25,45,73,103,62,93,64,17,95,180,207,234,39,188,173,1,70,23,90,36,63,245,226,190,157,13,76,138,155,60,240,157,49,46,187,90,21,172,103,221,52,203,121,229,162,7,27,141,225,188,86,97,111,177,206,234,234,180,179,205,79,5,247,193,176,50,36,19,215,234,82,42,24,208,14,201,161,133,180,161,161,212,232,76,99,7,29,127,108,93,150,90,36,47,140,167,1,70,149,62,38,181,150,198,29,167,47,230,137,86,154,47,103,115,180,152,47,183,162,4,99,12,217,13,103,234,93,61,39,185,133,242,58,119,15,245,192,14,122,206,167,135,138,155,128,21,171,154,205,183,246,18,245,221,219,81,148,214,221,103,209,84,194,230,185,24,198,223,215,61,242,168,40,202,49,170,216,180,5,85,80,42,97,31,69,72,111,52,13,59,216,9,81,252,230,249,25,214,47,241,196,239,117,34,129,226,162,244,75,166,
+247,58,149,0,164,168,250,165,246,195,96,215,116,142,212,250,186,112,166,155,106,50,43,101,125,111,179,15,207,74,98,24,187,157,60,80,213,253,18,169,205,170,44,95,224,84,144,165,93,105,84,202,89,194,235,163,9,72,58,94,18,219,54,5,64,87,134,209,230,251,125,228,126,105,219,102,149,151,6,119,214,129,224,91,74,174,237,171,164,122,106,130,180,134,3,228,201,180,83,104,115,174,198,170,250,224,153,7,223,88,42,101,74,31,122,26,52,14,51,77,165,129,177,178,121,188,91,179,4,133,201,200,186,252,41,51,140,90,6,232,46,163,1,98,209,103,214,149,132,99,219,224,115,135,209,131,6,88,222,83,232,114,203,121,39,143,104,42,157,80,42,75,53,31,111,203,213,60,96,114,35,213,216,3,137,178,158,155,11,135,142,248,8,127,10,58,184,92,110,224,136,132,214,240,247,158,214,23,251,86,231,132,160,161,203,73,76,135,92,254,128,59,207,26,233,40,241,177,186,178,90,177,38,51,95,28,143,128,185,155,75,59,211,189,173,86,168,162,86,82,168,188,241,58,14,110,
+5,85,122,62,70,143,151,45,246,108,253,128,14,34,153,167,3,207,116,218,14,56,105,130,140,197,16,208,220,183,221,196,124,127,239,118,144,124,191,34,57,169,72,186,215,253,155,118,92,200,72,208,58,7,215,78,94,51,252,81,193,71,90,77,165,81,169,254,155,171,122,59,251,63,98,43,169,223,213,48,34,29,11,213,109,39,194,24,166,244,39,119,118,253,210,199,195,213,86,124,161,123,148,181,206,194,41,19,229,96,80,19,243,156,191,134,187,171,175,169,101,151,231,181,180,44,155,1,9,34,108,153,230,49,13,145,140,23,65,226,136,201,178,112,214,193,125,67,137,128,164,76,124,216,108,165,232,156,24,100,253,244,245,52,146,27,234,161,68,222,163,171,86,118,96,53,234,246,56,50,171,50,146,190,64,123,32,213,223,104,203,36,72,22,1,119,113,12,144,127,61,168,175,36,88,112,227,84,14,150,61,253,171,132,63,168,214,173,232,188,220,98,178,18,207,123,212,208,35,229,186,178,233,114,58,50,132,214,208,70,217,93,153,242,82,227,189,17,207,39,218,25,133,180,51,198,
+0,197,82,44,207,65,44,228,121,156,115,169,241,106,105,237,181,90,88,229,161,3,142,209,40,156,135,201,69,90,235,82,172,48,230,218,45,183,163,7,250,166,15,101,10,189,112,29,91,141,198,246,18,193,201,29,51,72,134,200,173,86,32,121,8,36,195,211,238,11,220,66,215,142,205,237,97,212,117,251,22,246,194,72,171,248,43,84,11,108,101,93,250,126,203,234,38,128,15,73,183,236,124,238,71,32,74,77,173,129,194,4,81,252,1,114,165,155,64,157,34,187,136,86,186,87,17,186,144,212,243,17,138,22,175,21,226,210,56,70,104,247,184,253,154,210,96,74,238,131,73,76,173,189,139,87,151,69,148,108,112,149,76,208,129,226,206,127,0,79,164,201,227,7,54,209,195,221,76,53,61,250,179,187,139,203,228,85,140,87,112,195,3,44,23,57,148,149,181,242,145,66,72,238,190,46,135,59,10,110,241,50,61,246,169,254,130,254,54,73,19,243,81,133,240,225,150,60,247,209,161,205,99,161,196,181,35,25,253,229,251,227,192,166,117,157,121,10,69,100,113,54,237,62,61,125,
+242,220,140,82,147,110,118,237,120,25,41,225,161,234,3,144,176,75,45,229,85,153,53,148,198,224,54,216,136,104,37,67,184,179,51,33,87,195,225,33,224,161,73,119,215,30,223,42,91,226,196,174,90,134,237,12,1,58,49,176,83,141,143,139,43,198,10,123,9,114,89,172,134,233,232,52,141,252,141,70,133,192,45,95,43,31,196,228,196,206,34,190,54,205,204,146,27,65,71,129,41,95,51,117,48,112,210,1,231,111,42,75,67,94,129,54,228,40,53,96,244,213,242,244,109,58,255,55,231,125,193,157,71,226,53,10,112,62,11,238,211,148,160,35,3,84,153,247,233,222,161,240,68,1,33,176,241,81,14,112,124,149,196,159,149,247,18,249,179,242,94,202,125,107,6,84,29,253,148,62,249,110,92,62,2,162,233,19,219,246,112,151,81,128,169,193,34,30,54,165,7,44,1,56,53,248,171,228,93,2,190,74,144,207,202,123,137,240,173,89,61,191,87,50,140,143,179,78,22,234,241,15,214,165,33,242,206,52,10,162,128,190,169,123,64,125,83,151,174,250,166,238,239,217,69,254,
+172,220,115,18,32,64,27,88,134,121,56,8,94,231,171,212,246,112,120,29,11,112,140,173,150,88,170,2,250,89,2,51,142,151,85,97,228,85,215,113,210,61,47,41,132,222,248,193,81,232,119,48,235,125,26,125,175,115,95,134,20,96,191,116,166,241,169,98,104,9,11,122,140,120,163,2,143,131,53,64,71,143,15,109,64,121,11,131,197,50,243,77,9,139,230,69,65,187,150,29,201,236,174,26,26,61,167,216,162,2,103,7,99,97,217,228,24,207,151,39,238,144,61,21,142,248,20,91,223,112,56,190,187,116,181,82,38,15,214,190,165,150,168,243,187,11,205,119,170,164,81,176,209,19,189,33,86,14,58,234,134,81,73,17,205,83,106,185,122,226,178,90,243,99,219,185,160,1,161,20,166,231,172,240,5,195,225,163,2,129,46,155,197,222,243,212,219,11,29,151,101,4,188,44,145,21,247,247,249,221,255,234,137,239,43,93,87,144,71,211,163,57,211,132,223,89,233,130,92,114,94,165,148,244,88,164,41,89,135,238,230,158,152,7,21,40,141,223,20,219,235,167,105,70,191,218,
+208,193,98,249,8,49,48,63,85,249,157,174,1,90,141,52,242,196,44,48,212,177,223,127,65,108,20,177,74,58,118,251,52,106,164,129,75,78,109,58,78,219,65,75,60,152,98,231,144,196,115,8,29,5,150,49,205,122,255,181,230,203,207,109,167,188,2,24,247,239,203,167,126,74,163,111,113,202,55,42,221,24,203,159,85,124,123,232,200,80,223,76,154,186,126,197,183,195,238,29,17,190,82,227,207,211,104,44,72,177,25,164,42,233,213,240,220,95,69,99,112,146,205,160,154,72,111,153,251,144,137,133,225,4,95,30,111,4,6,70,119,246,16,190,113,64,221,224,54,115,62,165,68,199,178,32,232,14,91,229,103,107,210,119,126,25,240,147,181,20,252,240,3,196,119,193,69,92,93,83,201,35,230,33,71,199,218,109,65,62,26,212,197,179,138,48,165,31,82,158,65,49,93,218,10,114,159,244,72,72,65,106,88,183,69,37,253,234,3,48,155,115,67,18,198,192,164,139,157,121,188,115,79,15,120,8,54,213,6,46,168,250,192,22,23,39,33,185,160,211,101,114,125,65,5,111,
+232,234,211,125,82,185,113,232,34,12,232,135,174,18,158,162,35,11,56,99,236,46,214,203,95,115,158,5,126,17,144,66,159,197,134,15,108,53,141,173,163,220,165,6,96,41,22,145,205,33,148,97,41,146,253,126,205,220,219,171,245,7,127,214,106,210,113,70,244,3,12,154,58,227,217,52,210,189,253,213,122,191,10,239,237,207,233,135,210,64,37,41,10,141,177,115,203,23,202,163,165,109,40,133,79,170,233,164,109,241,49,26,179,148,133,144,116,106,209,225,239,59,15,165,254,94,255,74,153,220,249,64,82,182,7,219,179,198,248,200,23,198,216,44,234,131,218,208,120,95,227,34,241,224,22,42,167,240,219,82,225,201,87,139,226,244,25,252,5,161,206,233,87,104,24,223,232,217,20,155,119,131,36,15,54,149,238,78,151,89,178,41,180,50,12,39,127,198,68,99,164,187,30,143,154,7,177,170,165,120,153,220,233,242,58,242,151,188,17,45,146,130,233,33,170,77,172,211,207,210,125,121,155,68,111,4,60,242,71,236,12,189,124,131,225,76,24,121,236,0,185,203,78,225,34,141,
+58,28,18,176,176,34,182,5,239,78,56,4,164,114,41,61,132,144,2,242,241,252,206,131,152,7,246,249,94,162,184,136,7,14,233,117,207,20,249,18,54,39,51,62,185,61,242,223,191,184,193,112,193,59,183,71,245,75,136,81,14,102,97,119,27,222,212,119,101,238,186,160,63,149,185,179,188,221,149,121,166,188,204,83,151,198,221,176,15,196,225,94,73,31,62,189,66,239,114,98,119,219,30,62,141,187,219,166,214,149,37,33,186,47,128,180,233,181,119,246,246,37,187,68,189,179,103,51,49,227,232,235,93,242,10,150,74,192,131,80,74,149,223,22,129,91,4,203,182,131,100,241,141,253,189,91,63,180,140,193,20,126,140,228,15,82,239,61,79,35,89,95,44,5,121,233,83,127,255,253,218,209,245,233,130,94,63,224,179,41,229,1,117,166,221,124,172,165,165,48,40,229,157,79,122,147,194,252,154,235,39,31,230,160,74,101,208,204,49,188,97,45,97,126,115,4,51,233,126,29,81,228,200,37,108,202,163,177,195,78,222,231,141,42,178,76,46,24,24,239,55,238,72,242,38,249,
+213,194,162,68,108,227,110,93,239,167,39,82,91,36,3,91,62,193,82,131,251,149,148,255,52,39,18,210,161,42,248,98,244,174,147,190,20,226,177,6,166,24,254,46,99,81,202,10,137,225,207,238,212,40,227,134,182,168,172,247,39,172,41,104,167,132,130,84,236,119,50,27,233,177,101,194,111,163,160,88,240,193,239,27,69,109,120,14,21,244,105,134,236,163,212,185,143,161,220,157,183,140,30,73,231,75,217,143,252,196,170,68,221,21,186,26,72,52,21,88,6,71,142,76,42,207,125,32,166,218,108,47,241,62,64,247,119,217,18,61,231,42,137,183,4,119,243,31,135,247,237,83,211,130,26,117,204,247,219,218,252,211,36,116,212,223,160,154,58,228,174,67,138,84,74,130,87,238,0,76,141,122,242,112,71,178,66,41,57,49,184,81,227,79,83,170,54,111,158,104,131,134,74,242,14,176,43,196,118,166,252,17,162,218,108,23,208,122,192,138,14,168,21,10,121,226,206,134,31,69,65,160,88,15,186,86,151,150,201,226,13,210,88,246,243,36,235,167,36,24,197,51,136,30,9,54,
+64,113,215,47,221,247,57,192,100,154,180,121,93,211,166,149,204,39,3,176,248,243,109,211,127,175,170,199,119,246,134,7,61,121,177,129,172,145,211,146,62,143,238,18,145,72,249,136,57,232,86,171,142,14,144,223,93,61,218,42,249,204,56,246,152,210,163,187,43,26,218,246,146,207,68,28,96,81,94,207,183,139,249,111,35,186,172,68,182,115,110,211,253,144,162,179,83,163,176,105,49,120,238,104,134,106,165,53,134,52,86,107,34,146,125,16,152,54,152,83,211,165,242,100,225,112,206,31,217,26,55,128,38,52,244,167,177,101,130,242,57,204,83,177,125,251,228,105,88,236,165,120,173,91,225,117,36,106,75,68,21,145,74,95,215,199,227,232,132,179,80,103,24,151,211,109,140,88,2,109,118,238,74,90,118,111,176,109,181,98,46,143,86,194,246,200,102,214,172,205,202,224,240,16,136,192,141,85,81,220,169,225,140,120,52,107,11,25,212,214,148,110,235,233,125,116,76,188,251,197,233,247,126,58,203,112,182,12,134,138,99,179,79,121,76,110,60,82,204,220,179,252,243,134,82,215,
+147,172,117,21,227,125,80,78,189,81,233,246,186,57,234,177,209,135,234,203,78,85,219,173,105,233,108,151,153,38,164,245,153,78,199,108,146,24,91,0,148,45,74,220,135,156,168,86,5,170,93,86,193,79,148,241,145,132,48,120,32,106,203,0,149,167,245,55,157,230,115,43,200,211,220,146,199,109,100,215,182,146,27,97,29,92,46,121,123,29,115,60,241,154,236,92,10,199,219,21,97,45,32,236,38,251,206,173,33,37,88,130,15,199,65,207,234,60,111,235,42,34,124,216,183,134,181,189,56,125,73,237,137,118,227,121,121,118,104,71,46,45,162,161,117,54,150,59,3,29,119,87,42,214,198,24,94,151,195,207,142,163,29,22,21,67,93,166,149,47,71,204,178,244,225,60,16,155,111,20,233,158,197,182,129,48,94,110,107,9,189,171,20,114,95,40,49,240,154,229,143,72,205,152,243,37,76,11,246,96,253,172,40,153,78,70,162,224,88,87,179,233,156,100,7,92,41,187,9,20,39,37,220,108,115,91,37,217,47,51,110,233,184,93,7,146,161,120,59,185,80,247,169,136,190,117,
+28,102,159,69,197,221,94,159,92,31,215,45,125,50,31,228,62,76,180,25,124,219,7,150,43,176,188,117,42,16,57,173,24,113,54,107,168,112,160,115,34,225,163,115,223,195,216,103,108,165,37,187,26,31,245,87,111,102,195,234,218,183,96,157,93,218,47,65,40,204,172,43,152,63,152,67,92,38,90,89,63,10,122,229,23,155,197,251,18,65,145,174,38,242,149,100,230,27,235,38,49,59,38,153,74,230,17,238,10,29,142,174,110,135,133,61,145,233,214,55,179,205,168,155,132,91,54,4,41,199,231,104,130,43,20,255,204,138,232,197,19,182,98,119,125,25,95,110,178,222,244,180,181,164,194,172,113,154,87,200,146,103,7,218,99,245,74,207,156,152,233,148,193,138,42,69,139,145,234,36,87,18,156,179,189,227,228,92,120,24,37,192,249,83,178,34,97,20,237,208,14,18,91,246,83,124,209,248,24,158,103,145,81,245,109,21,12,183,36,54,152,228,50,153,121,193,235,207,216,214,134,71,47,177,222,85,11,141,242,253,45,155,131,165,203,64,180,69,129,163,16,135,34,52,28,187,
+97,24,39,91,232,8,207,196,112,93,37,92,38,211,186,175,60,103,77,255,14,164,142,26,58,207,35,94,57,132,100,219,249,148,139,139,207,47,53,80,228,238,155,170,64,139,194,157,177,192,251,42,238,73,15,92,65,159,49,77,164,119,90,214,244,52,54,10,249,250,98,190,100,57,56,250,250,171,36,4,138,30,149,204,163,194,238,112,80,249,171,9,149,133,124,58,1,41,53,77,103,212,90,50,226,230,195,41,157,14,54,9,130,85,7,138,66,175,7,72,135,202,127,64,184,122,7,221,109,153,102,134,174,151,107,133,147,187,168,138,138,226,115,98,164,102,239,64,68,130,61,107,160,88,12,133,19,67,49,38,195,208,201,93,163,90,36,185,58,87,27,154,107,229,56,14,98,30,47,149,108,247,250,93,227,125,133,71,85,71,141,29,138,32,252,214,238,74,28,5,30,136,45,72,138,197,195,116,162,214,20,230,96,183,165,107,49,127,214,185,32,251,185,236,97,71,47,246,186,81,179,221,237,146,219,137,154,83,174,90,206,54,7,56,133,112,16,86,115,110,99,227,184,238,96,39,
+221,222,249,166,124,52,99,12,22,255,107,121,73,173,245,171,116,117,133,72,90,119,224,105,46,241,113,224,61,188,12,68,250,224,135,98,199,119,47,197,34,129,207,189,20,189,6,189,32,71,120,27,231,136,146,39,179,197,166,98,92,70,11,161,51,19,15,108,187,211,7,199,128,69,51,186,26,147,17,118,241,126,134,26,122,55,208,250,163,185,236,116,200,133,81,239,35,192,235,24,59,85,26,90,226,236,166,137,167,5,117,150,8,243,177,208,18,146,209,156,149,215,196,249,162,249,254,238,165,212,33,251,3,110,235,5,181,113,90,58,157,96,156,158,207,79,192,198,116,0,9,199,39,253,13,78,45,220,41,158,246,237,87,152,126,218,48,119,207,144,30,204,125,88,183,135,67,115,97,36,109,126,242,215,86,105,207,197,89,244,17,103,88,165,167,161,56,223,43,46,99,91,57,158,120,0,164,106,143,143,78,112,196,110,195,204,69,181,202,1,103,7,135,138,56,207,234,233,190,93,58,45,51,102,13,197,253,108,145,118,38,64,35,54,213,212,223,26,183,99,140,99,29,119,160,10,
+103,240,250,60,210,3,233,69,55,115,7,84,223,132,157,0,235,58,137,143,206,70,141,237,149,11,98,173,253,100,111,52,203,30,198,228,183,172,56,249,4,177,59,157,206,23,71,120,132,205,183,33,110,171,125,57,81,190,25,166,174,206,162,114,177,20,175,205,42,22,65,185,175,166,124,209,96,152,235,222,238,155,209,9,100,209,226,28,118,78,58,55,18,141,62,6,132,185,145,180,77,185,219,1,24,39,75,131,193,182,27,136,173,185,202,245,162,110,133,65,58,242,72,166,152,27,247,52,8,73,183,129,221,43,35,208,213,121,122,29,23,234,196,106,57,47,106,173,101,203,243,108,107,21,154,93,197,214,26,27,169,14,92,103,166,93,185,159,62,81,79,140,37,217,95,22,185,95,78,51,206,246,121,193,87,99,39,206,243,94,39,127,126,134,108,194,153,37,42,165,47,155,145,65,105,70,158,110,104,209,17,150,28,37,134,134,197,162,244,236,69,9,26,240,54,0,211,161,35,86,194,234,213,169,97,253,222,219,206,58,169,196,149,104,239,195,99,136,17,123,187,173,100,216,132,196,
+105,126,219,71,226,150,20,3,211,101,47,83,194,122,166,205,147,133,223,248,74,14,231,201,60,187,162,102,183,222,158,144,55,195,164,70,63,64,175,22,118,78,4,98,75,161,189,113,240,196,134,109,42,197,144,68,74,229,138,127,25,116,148,229,225,75,64,73,182,30,151,107,110,96,121,108,99,174,245,23,230,201,124,122,199,104,176,244,24,199,217,61,37,95,28,171,52,201,152,6,223,185,165,239,210,20,137,105,23,108,41,121,140,97,234,213,126,91,69,193,171,135,188,170,172,151,154,205,77,246,140,137,7,26,31,107,148,187,219,148,10,194,199,157,244,252,150,220,249,147,116,42,79,150,61,49,63,144,160,193,1,23,223,229,68,29,145,136,91,61,14,200,170,3,111,130,107,132,31,62,44,90,250,169,162,92,138,51,193,234,89,140,22,233,225,41,1,84,109,95,139,200,124,163,196,96,84,35,37,176,164,254,113,149,124,206,240,177,106,238,249,121,145,70,157,220,231,189,83,25,125,57,134,195,24,174,241,145,50,17,73,55,231,172,164,38,194,78,236,60,119,12,73,32,153,182,
+214,43,105,100,13,97,241,93,217,0,47,151,137,246,244,183,118,75,159,159,16,202,13,235,199,171,33,179,14,186,245,83,111,72,164,163,189,151,99,50,96,138,194,230,251,189,213,15,51,93,61,238,37,54,150,78,133,48,28,47,7,21,139,44,16,43,25,6,209,91,247,118,153,16,48,6,118,31,93,14,68,205,9,86,241,108,113,235,44,230,50,187,49,135,146,36,71,26,98,5,30,0,221,166,61,230,77,13,234,18,50,192,23,121,72,162,157,77,106,59,119,133,102,221,185,12,174,251,242,64,90,88,39,189,118,130,7,165,226,43,93,136,248,202,52,102,216,37,140,21,104,168,71,132,251,201,171,51,61,104,41,46,243,211,11,247,178,207,220,136,100,114,238,190,250,129,220,223,65,189,20,168,124,221,190,80,162,209,168,169,192,120,165,185,243,3,97,239,108,164,58,144,77,18,151,92,170,75,64,30,87,34,137,38,204,178,73,72,216,205,190,29,143,161,162,24,128,127,129,57,12,115,195,80,144,172,79,85,241,209,226,163,146,199,41,154,55,228,86,4,61,107,74,230,108,214,
+38,169,8,3,105,191,94,3,27,159,180,220,198,243,34,106,113,46,246,79,102,179,208,104,36,137,55,68,178,225,28,253,24,203,183,92,181,39,58,205,20,245,252,160,50,122,43,201,100,27,213,209,241,86,108,8,196,97,142,132,93,114,91,221,128,238,62,99,28,71,165,195,40,112,173,55,29,142,179,249,165,21,128,193,204,199,253,116,223,131,52,92,227,28,111,113,121,175,116,175,100,55,253,6,234,238,211,145,109,55,154,54,75,212,141,156,34,167,151,176,69,172,177,179,222,246,58,241,120,237,108,84,95,185,209,129,228,209,142,136,208,239,79,214,90,75,167,91,218,171,174,48,157,139,157,83,80,24,251,196,39,211,93,221,42,15,110,240,114,135,142,1,229,166,235,198,38,12,101,104,59,11,130,10,137,89,99,166,171,249,224,93,180,109,116,6,39,17,117,175,59,239,134,216,189,18,63,154,71,85,163,77,5,163,197,76,54,202,35,155,118,121,147,175,110,111,179,220,117,183,234,105,202,214,227,106,3,121,61,47,34,8,94,189,99,100,81,149,81,164,182,198,61,7,121,23,
+63,74,91,141,138,140,222,187,71,111,165,7,111,54,106,153,144,200,70,240,188,219,46,99,68,209,208,120,86,186,106,93,121,97,129,250,46,103,10,225,93,238,162,34,203,150,182,133,18,197,80,17,173,10,164,44,142,227,137,150,153,81,27,195,106,56,199,7,72,2,4,149,236,115,43,227,186,1,54,88,146,10,216,219,102,24,22,234,158,174,54,189,3,122,31,168,107,82,230,152,43,111,96,81,246,186,212,11,127,60,10,20,53,123,80,132,21,89,129,198,66,5,156,52,196,155,54,125,167,119,159,73,163,245,213,169,209,183,236,187,118,52,167,94,178,63,231,223,62,132,226,236,8,65,183,23,227,138,157,156,87,170,26,148,221,84,185,4,101,148,203,116,131,227,49,44,26,10,240,231,249,242,54,183,159,242,110,235,37,106,48,247,52,159,98,161,148,187,216,149,212,173,80,35,185,60,55,14,119,146,226,73,129,133,189,227,225,24,10,250,0,181,43,251,56,56,50,163,85,226,29,210,160,82,165,242,228,141,253,118,172,226,62,180,19,242,244,141,24,137,49,162,226,207,205,40,
+57,139,11,197,148,83,81,135,253,40,29,122,24,144,102,76,52,117,207,102,250,105,41,107,29,24,26,101,251,12,75,57,151,125,97,94,103,55,157,90,29,142,170,16,137,198,58,13,245,57,255,105,212,83,5,223,58,88,133,138,212,32,186,200,57,152,46,245,152,116,197,72,229,25,84,96,120,144,131,69,45,238,242,116,200,96,103,20,183,13,232,54,230,75,107,70,82,103,64,40,43,37,56,101,110,239,78,37,193,170,57,64,74,102,24,71,193,40,246,94,183,28,183,73,142,177,121,74,104,27,4,66,182,58,235,92,62,178,157,135,242,182,71,217,175,150,70,70,123,135,76,16,131,253,27,239,208,139,133,14,44,139,213,94,188,197,76,170,165,56,76,33,41,172,68,181,164,88,134,39,218,45,117,60,95,39,57,57,60,87,175,229,20,92,216,245,19,211,251,58,154,6,34,10,12,175,19,175,245,23,232,238,134,135,209,189,189,144,66,132,155,109,224,60,123,95,197,209,234,238,226,218,145,242,204,217,203,81,30,197,25,199,157,132,90,42,106,160,15,221,14,227,227,204,212,116,
+226,77,20,82,65,186,25,204,154,87,21,66,52,168,83,206,4,80,216,164,238,245,139,117,70,15,39,228,96,73,10,50,153,1,189,225,186,149,251,70,135,114,109,17,58,26,68,117,95,39,26,121,108,245,108,168,65,12,251,145,173,89,140,239,76,160,183,100,125,96,49,207,235,138,220,104,43,94,74,228,11,95,229,131,167,239,88,38,214,2,47,158,124,168,51,247,209,91,205,49,232,76,185,72,36,109,158,108,29,121,57,179,224,137,238,50,150,194,59,217,86,214,102,37,20,233,135,185,43,114,104,91,10,24,124,240,178,29,175,206,3,172,189,225,178,128,55,212,171,35,230,67,117,68,229,228,214,106,127,189,123,240,171,209,14,160,108,140,212,249,198,212,131,208,136,36,131,152,234,108,97,97,142,154,237,152,110,63,20,220,123,199,62,47,14,52,24,115,246,99,121,91,161,100,22,196,68,190,173,121,187,201,239,194,8,36,78,102,156,151,238,25,6,240,158,2,32,146,206,143,11,202,160,117,247,38,209,97,81,66,114,221,11,142,233,237,133,139,227,249,64,229,3,211,194,125,
+50,70,147,220,57,140,18,56,221,159,108,82,84,70,90,79,53,83,170,42,89,218,167,102,35,90,132,202,25,205,210,227,153,169,37,70,162,109,112,167,7,175,218,7,19,225,71,197,229,94,232,145,155,38,12,199,188,191,154,79,90,93,77,122,119,104,23,72,227,112,164,238,107,23,107,207,40,119,201,84,225,33,226,125,203,51,230,152,254,128,114,79,107,141,136,238,71,139,153,181,182,47,165,57,7,128,99,57,226,189,205,120,104,132,237,236,218,28,203,246,228,208,143,184,37,45,120,191,107,73,149,133,238,205,148,159,30,95,187,128,248,36,137,158,28,208,114,96,238,237,149,118,125,197,76,6,219,185,207,72,207,72,92,183,210,13,150,252,56,5,88,209,137,50,186,31,67,79,166,42,147,198,101,223,130,68,107,80,10,54,73,29,168,196,147,76,161,61,209,211,32,208,128,161,141,167,202,47,55,140,58,126,80,204,143,53,234,235,77,230,232,61,115,181,92,139,91,170,55,90,179,183,185,172,241,90,223,76,132,148,224,227,165,65,118,77,207,168,94,59,93,152,97,64,225,122,
+54,215,66,118,183,79,93,163,98,128,120,99,180,66,145,5,148,135,229,50,159,37,99,123,124,203,134,19,137,57,243,51,127,226,73,233,79,37,243,88,181,215,136,22,20,239,38,249,186,83,202,203,174,209,7,114,163,147,10,143,153,182,118,132,45,156,134,61,86,146,123,66,46,93,18,154,51,91,9,78,149,161,130,33,152,204,187,51,179,231,129,110,142,231,222,202,230,61,63,3,183,193,231,61,15,97,92,62,184,210,35,22,65,114,44,167,107,104,73,44,31,216,22,147,140,40,18,185,154,181,207,87,115,38,144,116,84,113,135,174,23,44,69,175,143,172,212,150,214,71,148,156,21,77,122,162,237,60,114,132,182,196,218,221,195,165,13,145,149,74,42,177,190,161,36,251,44,187,201,175,112,21,210,121,143,239,34,36,247,42,38,190,151,54,93,208,117,100,93,55,57,119,53,172,229,237,96,111,184,13,55,244,134,85,184,13,163,183,142,130,169,187,2,205,27,89,141,231,37,58,7,1,158,21,41,246,208,90,185,69,29,242,182,65,136,56,168,210,194,189,175,190,190,230,213,190,
+228,52,28,14,183,156,77,113,27,92,222,38,41,203,104,83,176,188,246,137,205,195,99,255,42,128,74,203,100,50,149,148,123,99,101,144,195,40,242,154,78,37,182,23,189,143,20,92,58,19,74,172,115,102,57,152,223,42,186,221,154,253,212,109,15,49,166,228,237,216,240,175,116,13,140,238,156,194,151,137,65,133,150,56,24,202,210,179,122,149,220,140,82,196,5,135,82,208,117,70,147,242,104,2,103,141,160,68,39,170,167,70,168,192,99,12,183,232,204,45,107,136,82,65,36,114,152,123,67,65,0,165,198,53,116,64,50,187,81,218,178,73,56,226,106,194,230,231,134,175,136,244,158,96,35,177,5,80,150,116,148,49,157,139,107,6,233,2,75,68,174,162,28,53,196,207,117,150,211,70,234,116,76,174,247,43,157,221,53,222,31,178,86,237,177,45,100,47,149,238,232,115,168,131,186,245,102,3,59,213,63,127,168,130,151,20,238,164,203,101,157,200,7,119,1,143,52,188,174,162,158,214,233,198,120,186,174,85,83,239,203,205,185,107,208,233,42,149,122,132,230,19,71,119,223,48,
+87,57,70,135,111,215,197,236,181,33,242,18,79,216,146,218,236,132,176,196,106,84,52,204,114,250,34,124,187,190,174,55,238,229,105,129,85,205,72,23,131,123,70,190,168,92,197,139,144,187,125,78,119,87,44,217,181,191,197,184,89,138,178,189,119,137,48,20,87,222,160,1,119,55,76,67,13,31,76,173,147,204,237,147,82,123,37,58,46,86,206,38,128,67,8,250,119,71,72,32,157,87,206,102,117,223,56,179,177,68,247,2,225,142,53,37,88,194,231,177,135,23,136,130,51,6,37,206,109,241,32,226,72,6,141,101,171,163,184,241,74,13,98,199,40,60,19,166,214,141,19,3,31,213,56,246,229,110,3,216,124,88,153,226,244,229,37,120,233,120,230,175,61,237,26,205,181,27,210,65,45,249,5,230,220,124,164,149,141,160,223,175,227,215,105,122,160,218,222,155,68,89,212,4,7,125,8,12,188,116,109,144,125,42,240,10,252,218,4,235,126,167,28,247,212,30,243,197,171,53,45,11,204,143,195,180,192,178,151,207,151,91,115,111,85,154,177,51,133,214,142,190,76,160,214,83,
+228,178,58,50,91,51,211,208,122,157,86,44,150,26,206,182,139,236,119,28,165,217,214,48,46,154,237,251,62,168,118,137,46,151,48,221,72,205,39,138,242,122,23,14,125,62,59,138,202,37,21,195,118,46,171,152,102,175,27,59,188,31,69,25,121,70,146,160,155,7,178,114,98,22,25,53,252,245,121,192,249,97,144,192,239,235,89,75,51,251,116,168,58,143,154,126,241,176,185,178,95,204,234,218,252,195,95,90,133,197,226,142,202,96,129,196,238,203,174,216,187,223,239,15,4,242,133,231,96,194,181,170,126,160,159,153,238,210,231,65,15,114,212,104,156,146,213,222,230,109,26,102,160,40,163,213,25,172,109,44,188,105,83,135,171,174,95,222,148,78,237,101,213,90,160,172,102,235,97,255,108,16,246,45,95,167,46,227,237,153,68,161,188,250,71,174,189,157,178,122,127,63,128,15,112,45,235,58,20,228,14,90,181,121,175,91,16,216,1,203,222,102,101,86,93,207,235,156,85,235,114,189,156,94,176,111,225,48,131,207,96,8,93,234,142,103,170,106,200,153,62,219,24,233,141,2,
+158,141,255,253,115,150,63,116,126,148,226,117,28,239,92,38,128,10,229,170,67,128,207,3,23,64,155,247,117,10,195,235,252,238,121,140,232,91,51,16,247,173,25,0,252,214,92,196,84,166,32,10,112,62,65,124,59,14,250,55,207,141,244,95,205,188,133,53,58,233,202,160,172,11,88,210,53,202,111,212,135,30,63,219,246,113,230,40,198,37,234,37,18,124,93,131,248,148,76,172,29,210,11,63,28,238,103,37,157,33,39,194,199,76,3,79,165,108,119,60,208,246,167,142,69,154,121,201,97,142,131,136,250,194,162,220,234,189,46,151,177,178,176,179,47,176,165,77,82,71,73,203,175,168,155,73,56,109,40,207,173,71,172,228,114,123,144,212,220,173,202,116,183,163,221,112,208,25,167,252,174,84,47,147,6,243,156,179,176,25,83,20,87,130,107,24,89,165,157,221,128,60,45,204,6,101,202,204,109,235,230,13,80,243,126,239,172,40,132,242,230,211,36,56,176,38,56,205,145,134,14,74,238,149,108,23,162,93,153,158,92,55,132,140,191,94,220,220,36,53,184,153,251,85,12,195,
+15,97,78,255,243,159,126,247,21,181,241,219,65,78,191,174,250,171,127,5,246,253,201,111,69,10,125,195,150,253,12,53,250,2,122,253,70,241,67,76,212,159,126,34,196,254,205,247,127,251,5,139,251,119,223,127,247,147,159,253,227,223,253,228,11,66,248,231,255,240,253,39,62,226,39,18,236,111,50,251,6,55,252,13,64,245,46,253,63,127,222,255,171,144,163,95,35,196,254,226,39,255,242,5,63,249,87,159,129,75,191,193,253,27,56,239,31,253,244,111,191,251,151,159,255,223,223,253,195,247,255,252,253,47,190,4,124,113,249,147,79,4,229,159,254,211,103,148,214,63,221,173,248,197,183,176,167,255,243,251,79,228,202,239,254,246,231,191,248,226,240,203,191,251,249,207,190,255,102,193,159,124,247,243,123,205,47,126,249,211,59,131,111,148,159,65,93,119,146,31,125,11,174,250,98,250,197,240,39,63,251,217,247,127,243,107,22,223,240,100,255,175,159,254,253,247,127,252,239,12,234,250,237,65,124,197,167,252,15,140,143,250,3,49,63,191,29,242,243,45,72,232,75,236,255,207,
+224,164,223,240,185,159,254,242,91,16,209,127,250,189,200,164,95,123,199,31,253,241,239,66,122,254,64,241,39,255,234,41,127,244,163,223,11,53,250,93,250,95,69,57,253,119,89,252,30,194,233,239,132,71,253,14,225,255,241,253,207,126,246,243,95,254,225,16,167,47,176,208,63,255,241,183,158,250,235,255,240,101,239,95,255,135,63,249,238,63,255,226,167,63,249,217,31,253,217,143,255,248,79,255,247,159,255,236,111,62,105,191,251,237,158,249,22,29,248,239,20,239,244,163,223,135,164,252,139,31,253,248,63,254,248,207,254,2,4,6,2,90,191,129,72,9,103,77,88,151,24,169,215,228,4,225,178,247,74,31,101,74,51,212,20,12,25,101,218,167,61,212,84,245,137,132,79,189,227,45,254,98,170,232,233,136,179,252,116,186,82,175,156,182,212,141,100,160,12,59,205,133,86,54,42,22,199,203,69,174,66,45,113,82,171,167,114,248,20,172,172,199,188,121,17,239,148,69,245,134,246,140,135,108,58,229,182,205,238,180,181,156,98,99,226,216,135,176,71,31,159,222,136,51,137,33,
+105,48,108,237,171,139,35,57,59,44,226,6,20,6,94,241,49,218,87,28,46,247,216,204,164,147,132,142,113,17,33,233,158,14,181,152,153,184,19,90,222,109,60,95,2,218,159,196,204,168,76,147,39,100,138,53,228,77,136,207,119,53,114,227,77,142,217,28,45,220,190,42,41,31,205,211,41,61,216,8,92,5,212,122,225,174,69,78,236,10,64,104,253,200,199,239,12,182,221,26,74,209,122,128,178,177,114,206,250,97,242,76,223,62,182,70,192,6,49,126,42,233,42,115,158,112,11,16,110,187,234,32,227,229,149,97,177,32,242,78,131,104,14,56,115,77,177,94,67,114,238,47,232,41,16,38,181,81,165,4,24,43,138,5,65,1,117,124,251,12,0,37,72,182,204,228,13,28,61,78,222,111,239,211,107,42,112,177,188,135,34,252,37,45,39,0,232,246,232,122,202,3,17,171,88,239,32,92,37,128,216,189,133,199,96,122,255,145,76,66,238,16,111,78,133,145,68,42,67,110,196,87,82,237,131,208,59,76,61,162,91,178,173,161,209,207,43,32,217,9,227,73,142,32,228,28,
+130,200,213,208,10,46,68,134,138,181,44,96,6,139,71,172,194,76,234,87,180,10,244,88,58,161,108,120,142,94,174,5,109,27,203,183,193,158,191,199,238,193,50,55,160,236,245,68,70,222,162,9,236,37,95,128,157,122,129,174,143,198,204,189,242,241,212,41,118,34,145,218,233,153,188,38,152,72,196,254,184,10,1,19,82,107,175,133,184,100,188,25,249,171,7,253,237,221,124,95,11,130,0,238,23,216,115,12,0,65,190,211,124,34,22,69,131,80,232,111,77,207,176,167,125,243,99,31,129,96,156,209,211,150,169,68,122,226,160,152,120,87,235,145,176,4,238,145,111,213,193,0,19,59,241,45,113,128,101,109,62,208,109,241,113,235,118,175,177,51,118,119,66,102,65,160,243,202,203,130,144,100,15,9,108,186,218,245,163,148,90,28,165,5,169,138,113,113,60,1,4,247,251,44,78,22,103,75,31,235,25,72,39,8,254,226,125,130,244,19,227,5,232,230,61,164,46,214,217,130,25,110,16,85,188,254,3,36,43,168,132,89,8,22,64,142,175,207,153,241,226,83,192,222,63,189,
+82,204,51,86,107,206,113,243,135,56,232,228,178,57,201,94,187,50,241,144,124,74,188,191,74,15,186,6,7,151,20,222,2,170,103,86,4,23,187,121,152,160,1,177,0,201,110,129,171,87,74,143,49,92,24,184,167,109,228,13,85,191,202,50,80,117,150,240,134,133,140,241,6,248,222,93,204,53,234,171,99,203,220,139,62,168,79,155,110,89,93,177,155,194,89,157,215,184,202,8,229,42,68,182,70,120,127,208,83,52,210,8,150,166,235,83,77,210,128,145,219,211,62,23,243,32,82,225,225,246,240,62,117,63,96,15,25,14,120,254,186,77,155,164,160,140,255,225,193,27,238,155,160,111,31,189,45,106,51,173,229,12,139,112,72,25,142,73,23,129,120,95,223,120,248,128,151,187,171,153,87,170,117,221,42,1,49,182,62,180,159,183,203,164,87,58,214,102,217,165,134,66,231,76,117,102,21,247,203,113,77,223,96,6,206,13,162,25,125,177,243,173,26,184,186,52,46,42,26,189,148,223,36,5,199,79,163,238,227,136,203,110,31,189,132,153,3,143,194,225,196,99,208,145,41,97,
+96,124,186,7,56,95,224,90,238,209,46,215,46,15,132,174,65,137,45,223,243,24,147,120,223,79,124,203,50,141,223,29,177,156,219,244,20,85,58,225,28,231,224,224,244,94,151,156,82,37,106,202,247,148,192,2,104,82,66,142,50,226,90,254,226,239,30,29,102,179,57,106,52,136,149,207,3,151,184,245,22,140,206,124,82,176,150,7,0,130,160,141,107,80,8,144,61,129,210,239,194,167,170,227,194,127,39,167,0,16,95,140,15,16,129,235,39,160,168,116,85,190,206,141,202,117,164,81,137,183,95,223,107,144,2,164,219,24,59,246,194,143,9,245,88,175,140,106,183,23,245,196,90,203,71,27,3,53,150,90,25,234,81,177,211,178,196,136,57,205,18,48,68,178,220,224,107,226,209,35,84,89,230,234,5,88,13,35,140,3,170,134,124,31,228,137,82,146,61,4,160,158,52,183,86,56,245,7,117,203,14,14,190,21,18,151,120,228,238,75,234,79,6,37,245,160,192,144,171,172,156,211,137,49,109,66,100,112,247,50,217,10,212,198,213,222,53,54,24,139,131,228,188,163,207,246,
+130,27,106,220,21,95,244,233,229,232,254,101,158,75,64,250,66,125,234,166,136,0,163,193,71,50,130,87,176,241,63,14,32,200,19,100,231,152,166,11,171,114,43,117,213,12,124,173,181,187,150,237,152,57,103,11,69,195,107,116,2,14,49,251,16,37,37,70,78,190,199,3,25,62,240,218,78,3,223,127,133,168,138,72,167,39,19,58,39,33,16,144,91,203,23,63,33,211,222,181,39,231,201,75,188,109,233,34,218,59,68,70,153,227,112,100,150,11,252,89,197,224,172,41,251,79,92,103,10,65,35,78,66,181,101,89,198,188,140,55,44,16,79,201,71,211,174,41,67,197,167,229,61,44,75,84,208,181,126,148,65,177,16,175,222,126,74,177,30,210,117,63,255,65,143,8,123,123,126,12,143,24,124,191,72,76,85,228,1,171,218,77,50,150,44,57,149,228,47,163,171,235,168,199,52,244,108,12,211,27,140,5,191,58,35,199,254,126,88,98,69,65,228,73,29,239,121,166,128,119,79,168,103,28,164,66,222,101,86,53,217,131,6,191,38,148,176,101,54,101,189,69,8,203,84,189,
+74,253,0,218,87,109,148,71,2,135,176,117,148,144,84,33,192,234,226,94,140,132,202,154,215,141,212,250,155,178,94,107,31,89,106,134,178,181,86,17,36,218,169,215,11,193,141,10,2,98,108,32,39,1,0,62,85,0,62,35,209,128,42,150,172,7,145,244,240,170,193,14,240,184,33,144,52,246,16,145,69,20,225,13,167,136,232,237,73,97,127,145,162,70,113,164,96,101,139,104,151,153,230,50,31,74,45,219,115,85,106,144,147,76,41,50,135,197,199,40,69,48,223,128,76,3,21,155,131,25,202,15,173,109,162,61,234,134,146,249,196,51,239,193,56,137,49,86,237,106,16,80,199,109,109,143,76,16,245,22,163,91,76,131,224,121,151,112,188,205,33,36,72,146,239,224,250,75,137,46,66,188,79,170,5,198,193,241,96,149,189,225,30,50,184,160,139,112,30,28,84,30,189,37,37,60,210,48,4,209,106,10,86,203,168,197,53,74,149,56,224,187,99,107,119,66,101,77,85,86,245,96,245,224,170,185,216,188,144,17,169,71,192,64,239,117,165,105,0,5,240,4,208,249,59,16,
+98,163,130,164,55,163,151,236,134,140,109,28,72,241,80,179,234,236,180,118,250,196,166,166,101,123,44,20,25,75,77,87,72,94,73,230,245,23,68,36,27,182,73,40,22,77,157,169,174,125,238,6,13,222,226,57,122,113,89,53,212,225,206,149,6,51,45,154,183,109,5,37,80,91,13,46,117,153,46,121,164,247,210,150,216,51,253,196,4,113,120,165,136,106,38,32,173,40,38,34,100,119,195,31,121,128,26,200,131,185,62,16,33,160,213,219,244,1,197,2,249,166,52,224,3,81,254,10,204,97,32,60,190,39,240,210,205,90,234,186,151,252,76,63,75,152,221,179,240,199,69,91,122,167,203,171,163,154,183,247,90,49,179,74,121,21,93,98,89,63,153,55,59,86,241,245,72,133,3,32,23,96,64,0,152,122,112,207,224,52,231,136,149,140,151,7,247,173,175,5,154,44,239,46,182,254,4,147,226,48,66,16,32,227,137,29,32,132,52,194,67,130,76,1,190,241,56,134,182,80,212,9,253,164,232,201,207,36,205,41,115,148,86,231,194,113,74,13,145,103,43,39,149,163,216,1,
+125,60,197,183,76,41,39,238,56,189,146,155,56,16,239,34,88,60,50,229,184,240,144,10,10,208,166,168,99,255,65,128,190,162,226,65,203,212,231,131,230,172,0,156,140,71,218,226,94,179,117,8,223,133,42,249,73,141,121,105,23,106,194,152,248,230,237,4,66,187,181,220,18,57,103,127,92,38,121,243,77,67,153,68,220,200,242,46,57,210,94,105,208,157,32,10,100,114,36,242,132,201,81,203,193,118,10,215,122,164,95,49,162,107,183,94,188,148,243,114,53,143,109,61,14,0,240,130,216,142,56,111,1,12,133,234,211,42,117,33,124,10,221,158,66,182,182,118,23,32,52,108,5,31,140,2,0,128,36,15,141,53,31,3,125,136,86,192,109,65,53,162,49,128,209,236,209,12,92,44,101,115,184,138,243,98,138,132,181,58,242,32,118,60,191,230,221,140,92,144,89,142,182,84,21,106,209,2,10,148,144,2,30,210,107,163,62,77,29,21,17,226,121,90,227,236,195,32,0,25,196,27,33,11,120,0,193,59,182,64,188,224,184,153,4,148,161,32,89,44,236,184,104,136,49,192,
+75,187,86,9,70,183,183,203,11,52,29,6,142,199,40,44,119,203,37,89,217,165,28,234,154,56,61,103,44,168,234,211,6,234,165,142,2,178,199,137,162,218,205,98,252,204,165,48,102,197,251,198,121,213,54,67,99,194,244,57,18,105,24,122,96,158,23,31,93,225,225,17,8,255,127,107,185,183,158,68,210,52,14,224,95,133,237,43,103,211,233,153,189,153,111,208,217,205,38,155,76,118,46,39,157,180,35,204,14,19,71,93,181,179,179,119,80,20,80,128,104,113,104,193,19,66,1,10,120,0,21,16,69,228,92,160,156,148,67,171,173,8,30,56,168,40,7,15,128,148,48,5,173,233,233,222,77,54,155,236,222,144,20,60,245,190,47,79,85,165,222,252,46,254,20,53,5,24,112,185,175,32,24,88,6,35,23,201,72,33,34,176,23,198,133,152,48,23,28,114,214,168,150,194,53,51,192,201,5,149,224,196,230,104,92,169,95,88,84,91,52,234,202,131,61,242,30,75,223,220,84,173,83,110,163,130,145,154,220,152,120,72,59,7,228,239,110,143,50,250,200,123,254,78,162,154,
+78,77,88,183,81,16,155,8,96,107,108,35,32,245,78,20,156,10,202,134,154,66,173,51,76,20,51,48,201,97,219,134,33,4,222,105,164,202,30,255,80,221,204,139,90,234,53,131,214,80,189,230,110,115,214,119,215,110,179,126,186,101,210,19,180,242,203,249,4,79,124,230,57,113,148,7,221,248,254,204,146,169,187,252,81,129,239,234,126,56,119,38,20,108,203,166,179,195,244,7,163,46,89,153,199,210,217,247,80,45,148,13,196,242,119,67,84,219,172,141,151,28,173,165,145,84,252,200,54,39,87,174,164,224,107,5,204,210,142,136,210,11,235,222,99,239,252,165,93,101,155,222,176,223,239,94,196,26,171,199,226,163,178,227,238,144,210,160,45,219,14,238,198,56,46,72,191,31,20,5,14,124,218,186,113,97,164,193,98,22,50,3,26,3,77,76,103,185,143,34,50,117,201,161,46,25,71,18,252,112,166,194,201,237,193,34,222,213,3,29,81,175,162,224,216,42,213,23,150,20,185,99,209,149,188,72,60,203,57,229,26,24,250,10,71,225,176,169,234,98,239,133,79,56,69,201,
+115,3,84,181,235,70,20,22,87,228,220,146,153,11,143,211,100,238,196,113,165,182,30,23,4,47,54,103,80,61,77,11,56,23,153,211,149,113,225,221,226,2,107,57,108,18,222,72,246,227,115,121,254,176,237,62,176,226,68,64,227,213,57,52,237,59,179,21,180,80,120,52,9,1,211,116,182,99,102,161,64,65,238,215,146,174,253,4,125,231,152,3,40,118,224,188,104,65,81,0,20,192,18,178,23,144,205,52,130,33,213,229,24,114,1,39,15,177,237,152,248,76,31,177,10,42,18,214,26,205,1,78,108,241,84,84,167,125,66,3,236,193,54,143,173,152,172,105,0,186,67,42,230,215,130,110,41,128,136,111,74,30,120,212,183,63,133,192,76,187,105,129,109,115,235,88,74,196,0,199,175,160,169,129,229,44,56,200,60,81,239,105,217,231,46,136,159,52,93,137,163,82,64,123,183,169,60,217,203,7,207,32,236,60,100,12,175,152,228,226,165,141,5,219,221,242,91,23,200,27,160,79,248,43,98,153,0,142,199,148,139,5,207,117,114,218,166,48,51,217,7,105,153,68,10,243,
+169,153,220,32,119,104,184,62,34,145,243,227,72,17,116,40,177,131,228,12,176,119,41,29,105,72,93,33,79,113,124,93,6,199,185,197,13,55,117,108,240,193,45,53,131,172,77,88,1,161,203,247,227,190,122,126,147,151,151,81,179,66,232,212,122,65,83,110,120,64,57,215,101,224,199,141,215,188,184,101,182,170,170,80,154,27,96,201,46,132,162,71,250,183,84,239,49,71,82,128,196,168,141,58,125,134,174,47,218,143,172,160,105,220,60,233,137,70,97,46,141,169,241,202,10,59,233,147,208,18,86,242,161,51,169,160,127,5,219,157,219,188,97,115,161,197,57,186,33,55,195,96,217,47,25,72,67,190,6,207,215,202,230,75,228,94,120,147,208,111,105,230,195,243,203,165,155,177,58,221,174,26,30,86,109,243,160,3,24,171,200,198,118,76,8,39,16,171,40,140,13,52,231,68,238,6,45,0,79,226,46,187,13,89,179,191,78,23,14,104,193,240,113,98,142,9,108,199,148,247,190,195,11,158,111,67,0,98,161,34,126,147,87,100,139,130,249,45,164,26,216,139,207,211,149,119,
+128,182,20,67,226,186,68,196,207,146,121,171,239,238,45,69,223,236,195,100,6,210,57,92,78,17,37,137,156,103,104,206,50,96,173,174,179,238,120,73,96,111,107,57,17,88,141,177,80,64,60,21,98,106,220,69,122,86,51,11,161,84,202,40,135,99,98,40,115,85,100,220,147,212,135,43,105,87,221,139,250,30,184,182,247,108,57,219,153,44,24,50,186,201,226,168,126,202,173,79,69,110,253,147,75,19,219,44,125,122,56,72,151,40,198,26,1,188,255,107,90,111,208,32,76,215,196,83,24,207,127,137,221,38,50,32,251,86,41,101,111,155,108,114,237,248,49,38,2,168,199,89,181,205,133,12,185,117,70,42,75,192,127,16,65,123,212,99,245,192,2,122,98,180,50,165,206,2,13,93,190,141,23,197,163,121,230,21,40,16,0,161,186,149,239,77,136,188,140,100,152,73,45,196,176,60,228,224,43,31,174,173,123,115,225,233,213,106,221,163,43,238,186,240,199,103,23,17,231,131,179,216,41,131,98,103,214,146,67,135,158,108,126,80,151,42,199,234,153,20,42,147,250,145,19,108,
+231,10,129,28,41,84,119,119,240,238,212,106,46,82,147,81,174,248,212,170,225,201,189,138,243,73,43,52,5,68,17,112,145,51,173,66,53,167,234,216,109,131,167,106,232,6,60,70,240,188,33,135,195,60,127,122,69,190,149,106,8,56,107,208,65,154,10,69,193,69,249,22,109,132,135,65,209,5,155,218,15,97,152,249,36,38,7,93,82,44,99,210,0,220,21,252,161,241,74,64,195,249,174,20,193,223,230,19,141,163,197,92,201,166,11,91,134,220,108,217,126,46,170,42,13,104,26,44,172,148,184,215,202,0,245,217,126,38,175,206,174,93,92,115,87,204,252,253,173,83,6,64,83,158,77,134,55,230,179,103,171,7,165,181,89,90,86,100,169,139,135,202,179,213,82,169,192,100,50,170,251,135,219,241,185,29,124,191,99,226,105,61,67,17,36,162,98,231,211,195,152,93,0,90,67,176,223,20,212,51,232,8,186,195,240,202,184,243,213,168,37,43,11,132,52,245,27,52,79,63,185,169,160,193,195,117,145,64,114,37,211,78,215,206,183,20,101,253,193,219,229,120,53,152,170,89,
+21,229,141,19,52,103,197,55,8,150,117,223,59,205,105,164,65,161,220,134,150,132,159,134,37,125,253,130,240,77,47,185,171,25,59,244,136,136,79,135,77,43,251,251,27,114,63,137,208,71,254,153,220,217,222,219,196,180,86,2,81,43,34,169,171,165,103,125,29,189,36,82,87,139,13,219,59,240,234,222,79,121,240,9,217,122,154,99,146,122,159,63,66,223,7,203,107,82,223,119,191,255,48,31,169,247,207,221,223,191,34,180,61,10,27,225,7,82,123,255,155,94,210,23,47,8,47,219,59,126,196,167,253,219,211,32,68,66,223,143,221,111,58,137,77,10,236,195,167,233,255,128,143,77,213,107,174,11,31,240,219,230,183,223,224,103,124,2,145,164,46,34,94,217,10,106,194,107,94,118,17,91,21,47,62,70,44,117,119,247,18,201,93,45,21,109,129,97,207,83,31,218,241,63,69,238,194,207,250,146,64,236,238,239,123,245,252,209,48,137,205,32,167,63,124,249,245,87,95,53,179,163,200,93,248,58,219,30,163,162,158,19,218,9,61,228,95,72,157,205,62,225,5,196,30,242,
+83,15,254,159,202,248,159,248,232,179,110,247,16,219,94,63,251,203,63,159,86,70,248,169,251,251,215,207,126,227,95,228,31,218,122,136,77,120,123,249,11,169,227,77,63,233,85,219,23,159,225,223,147,68,54,137,235,67,233,31,73,253,45,9,108,251,215,132,164,143,215,229,243,31,63,26,91,43,128,168,245,249,250,217,159,72,157,221,132,127,116,247,118,18,127,247,17,219,240,102,254,155,172,167,167,203,249,63,152,245,91,82,71,55,126,187,244,60,18,223,95,187,127,110,239,250,47,102,253,141,237,125,74,113,175,126,5,133,85,124,243,
diff --git a/uppsrc/Draw/srcdoc.tpp/ImgTutorial$en-us.tpp b/uppsrc/Draw/srcdoc.tpp/ImgTutorial$en-us.tpp
new file mode 100644
index 000000000..59f403728
--- /dev/null
+++ b/uppsrc/Draw/srcdoc.tpp/ImgTutorial$en-us.tpp
@@ -0,0 +1,416 @@
+TITLE("Image tutorial")
+COMPRESSED
+120,156,132,185,231,111,171,105,150,39,246,175,20,208,227,245,238,108,205,224,74,186,186,161,10,6,6,152,221,15,251,101,109,216,222,79,141,129,167,186,187,118,182,224,222,238,118,87,13,188,134,225,193,21,115,16,147,196,44,70,73,204,89,98,142,98,14,98,206,153,34,197,36,6,49,231,228,87,213,61,54,214,95,172,23,124,9,62,124,207,57,191,243,123,206,57,207,57,212,47,143,191,250,139,191,120,247,245,187,95,188,251,255,249,251,230,223,124,255,31,191,251,199,223,254,244,119,191,252,237,241,167,79,223,254,112,116,116,252,238,219,239,142,62,126,251,223,127,254,246,159,254,233,159,254,250,232,253,187,79,223,190,41,59,2,148,29,189,123,127,114,116,124,4,172,189,123,127,252,241,232,244,243,187,207,167,159,142,62,189,59,249,248,254,248,244,227,187,211,111,254,240,221,31,191,251,207,127,247,203,239,62,157,124,251,151,255,227,7,64,234,248,235,211,95,156,28,157,28,189,59,250,112,252,30,120,234,221,201,187,227,247,71,199,167,71,159,62,189,63,250,120,250,233,228,243,
+135,15,223,252,250,187,63,252,244,195,239,127,247,119,191,252,213,155,220,123,64,236,4,16,123,247,241,211,135,247,71,128,208,251,211,227,147,143,167,239,1,225,247,239,1,120,39,128,225,143,31,62,126,252,230,167,31,126,250,237,247,127,247,203,31,222,112,3,104,255,246,13,229,251,175,63,252,2,64,119,252,17,144,124,127,252,254,195,251,147,79,199,39,71,159,142,143,63,124,62,121,255,249,61,0,251,232,248,155,31,126,250,30,0,249,171,247,199,223,126,7,188,222,196,78,1,123,239,79,223,31,157,0,140,188,255,120,122,2,60,246,17,120,127,255,238,243,209,49,96,244,211,187,211,83,192,222,247,255,229,159,105,250,21,64,208,27,73,111,178,31,0,147,199,31,79,223,36,62,189,255,116,116,242,241,211,241,251,227,15,199,0,136,119,31,1,71,223,16,156,126,243,155,239,127,252,53,32,123,114,124,244,237,79,0,172,111,255,246,111,78,191,61,2,132,63,126,253,241,23,199,239,62,191,59,254,240,241,51,96,20,0,12,248,124,242,249,243,209,201,39,192,232,251,163,211,
+119,71,39,223,252,250,247,191,1,252,252,213,241,233,187,147,159,45,126,2,182,226,3,160,249,103,90,78,63,28,1,160,143,79,62,1,38,63,30,157,156,0,247,211,247,159,62,126,243,227,247,111,155,241,211,239,255,248,119,191,252,203,191,249,151,239,254,250,221,95,31,159,158,254,171,55,241,207,128,248,167,147,247,39,39,239,63,124,126,127,244,238,4,48,3,232,120,255,198,217,135,119,192,118,30,157,30,127,250,230,87,223,253,8,216,252,9,88,250,248,39,102,143,222,162,9,224,254,228,211,233,9,96,250,3,112,3,246,21,112,240,4,224,231,248,243,251,79,39,39,159,222,125,243,235,223,126,247,227,143,127,38,233,141,160,191,124,115,242,232,232,235,163,163,95,124,124,227,246,244,228,248,253,231,55,114,78,142,1,146,143,63,156,126,62,2,88,62,253,240,254,221,241,55,127,252,254,127,251,199,31,254,248,253,127,254,254,119,0,205,63,0,225,241,237,63,111,209,159,99,17,0,243,167,80,60,254,250,232,24,8,198,211,15,31,222,189,241,117,10,4,196,241,201,41,64,
+248,187,163,79,239,1,68,192,5,108,243,79,127,142,198,95,253,191,62,156,124,125,116,242,139,207,199,239,79,0,36,159,223,191,7,24,0,20,28,125,62,58,58,122,247,9,184,0,207,0,94,126,142,143,163,63,7,214,159,205,255,73,252,253,215,71,239,127,241,17,8,99,96,167,62,191,127,51,255,249,228,141,191,99,128,254,227,15,239,78,129,125,56,254,147,248,241,27,235,199,127,1,240,126,116,252,233,237,245,51,243,71,167,95,31,1,249,0,64,60,58,61,5,252,62,1,168,62,254,4,248,126,10,112,127,242,115,136,31,125,252,244,205,191,255,254,127,255,241,223,124,247,211,247,127,14,152,191,252,219,191,248,83,164,29,125,248,250,232,195,47,222,189,201,159,126,250,12,108,224,209,251,55,254,78,222,191,255,124,252,249,228,228,244,248,243,233,201,135,119,0,143,63,254,41,161,223,132,223,82,234,231,116,252,127,148,124,252,250,232,35,144,92,128,175,167,167,128,247,63,139,1,158,127,60,122,131,114,252,233,243,135,55,22,254,172,228,239,255,234,183,63,252,238,13,7,
+16,25,223,254,41,24,254,242,111,255,245,209,209,199,55,69,159,128,164,249,244,233,195,187,147,207,0,25,0,7,239,78,129,72,7,10,194,39,96,163,129,125,62,6,210,224,173,34,252,250,127,253,238,31,190,255,251,191,250,115,182,254,12,225,45,2,79,79,78,63,189,197,45,32,9,64,7,64,0,122,62,191,123,247,1,88,249,244,9,200,166,111,254,225,187,63,252,87,1,120,252,238,235,227,119,64,20,1,245,231,20,72,74,192,22,16,126,239,62,191,213,18,160,50,0,59,0,148,162,207,167,127,138,192,191,255,171,223,125,255,227,79,223,255,6,216,252,211,119,63,187,125,124,244,245,241,17,192,29,16,127,167,167,159,222,191,255,0,224,5,108,127,124,43,77,111,91,8,36,240,233,199,147,111,254,135,239,128,124,249,63,255,151,255,235,191,249,183,255,254,175,254,195,255,244,213,47,127,60,254,246,171,127,247,159,1,7,190,250,233,31,129,92,250,225,187,223,254,139,191,251,229,143,39,223,126,117,244,215,127,94,7,50,251,135,127,248,221,247,127,252,234,187,223,253,230,
+171,63,124,247,195,239,126,250,225,119,255,240,213,79,255,233,251,175,126,120,251,254,237,241,83,64,199,239,190,250,15,127,255,175,255,254,95,127,253,213,31,254,248,253,111,190,255,143,0,171,191,249,147,130,31,191,250,221,247,192,202,111,190,250,143,191,7,116,252,225,15,191,253,225,215,223,189,85,195,175,254,229,247,127,253,15,127,253,213,119,63,126,245,211,239,127,255,219,95,125,247,199,175,126,248,245,239,127,247,227,191,250,234,187,63,126,255,213,63,254,248,143,223,253,246,183,255,199,63,27,255,13,176,240,102,245,127,254,79,223,255,187,127,243,111,255,254,191,253,241,255,131,237,79,32,254,187,175,254,230,111,126,198,244,205,9,192,246,191,0,182,251,232,11,24,4,38,129,190,252,243,223,146,194,232,89,224,102,162,251,96,92,84,6,135,242,102,87,222,100,76,3,227,235,107,105,240,106,204,88,140,4,99,166,152,33,146,84,228,170,3,114,230,100,225,191,156,35,196,126,215,25,225,142,68,136,169,208,185,103,200,3,244,124,233,138,170,56,85,208,37,107,226,128,120,229,
+114,42,153,68,168,238,130,202,231,224,244,64,155,200,105,198,153,81,44,25,73,54,181,200,193,202,222,181,238,147,34,81,50,117,89,74,85,214,23,253,171,150,170,87,202,172,242,119,124,169,225,139,36,177,77,172,229,145,201,212,61,109,28,102,84,98,242,60,183,232,69,84,236,106,42,88,95,138,118,77,189,231,81,148,126,213,111,212,59,250,64,41,4,208,115,98,34,83,2,84,39,186,205,235,54,174,106,151,239,161,193,106,24,61,53,144,235,154,34,119,157,24,178,224,145,109,140,166,125,210,88,154,233,231,73,62,91,9,243,30,180,38,246,25,32,202,226,115,238,22,32,7,229,1,93,183,179,100,201,135,123,80,112,230,56,16,163,3,79,18,100,206,15,197,212,139,215,30,108,227,78,61,17,200,16,192,80,238,82,248,44,169,53,51,117,51,198,238,149,30,238,227,8,114,253,78,140,151,45,239,49,218,56,185,62,147,126,73,112,88,128,218,7,140,58,106,221,2,6,212,95,190,68,33,237,93,235,198,45,69,74,154,231,10,136,249,250,12,114,225,227,156,189,221,213,25,
+7,242,197,1,61,172,154,176,27,247,85,2,30,51,175,17,175,135,91,252,3,8,121,247,243,189,249,168,42,238,139,17,73,183,176,52,165,165,12,247,163,57,48,218,63,160,50,23,252,53,82,220,216,19,249,74,117,245,218,133,144,16,159,246,247,205,128,40,153,132,126,121,124,170,188,93,95,254,244,246,180,174,44,249,242,129,77,211,225,153,239,201,82,225,206,196,176,197,247,221,22,147,224,191,32,154,171,235,80,40,148,130,237,167,60,87,162,35,85,90,198,249,0,68,94,76,105,26,69,12,46,192,12,60,35,141,202,130,162,156,171,241,38,88,99,84,43,205,196,213,55,81,156,213,53,51,156,207,197,208,249,207,215,12,184,185,49,11,183,190,64,97,104,234,23,207,44,155,190,167,95,40,44,92,44,79,88,68,206,137,122,75,188,170,74,112,102,27,247,25,84,246,232,221,190,228,87,96,61,52,246,252,106,227,227,184,12,148,91,115,137,107,33,41,43,105,114,60,180,172,232,129,184,81,233,202,79,5,18,102,142,252,228,5,141,69,100,216,80,227,236,138,208,155,240,172,
+74,122,94,7,114,24,74,115,72,10,8,117,60,248,220,59,105,205,54,166,245,20,252,66,136,243,87,137,154,30,222,220,128,174,140,252,101,103,10,102,63,25,87,131,245,118,47,21,59,95,34,35,17,170,117,206,103,185,176,12,109,56,160,237,25,95,209,86,165,205,235,237,123,97,183,180,121,132,6,79,243,230,208,186,121,22,51,42,150,170,201,154,120,169,158,224,48,166,18,238,130,232,196,98,50,43,68,109,35,40,111,34,32,35,255,57,103,182,157,151,173,2,40,83,27,65,25,104,132,18,197,222,114,72,167,136,238,176,76,213,72,99,89,10,198,172,40,11,203,166,122,118,3,111,244,199,17,164,41,113,131,26,128,80,54,195,12,239,86,176,174,229,236,137,94,100,220,174,7,12,227,51,115,196,140,233,216,242,193,37,167,203,187,231,63,204,253,47,22,247,84,192,35,94,94,250,41,180,12,42,55,179,128,175,20,134,137,151,212,147,201,123,73,69,41,98,202,177,35,17,99,178,90,111,19,224,17,187,84,243,69,209,148,6,21,80,130,28,114,133,35,213,101,179,251,60,
+113,57,172,91,178,89,236,149,150,111,236,206,136,168,123,13,99,17,6,141,133,198,43,91,134,174,80,156,25,230,80,82,11,236,212,15,234,3,237,185,175,227,221,162,102,118,48,162,101,136,80,248,57,70,158,202,102,55,176,104,203,171,194,188,197,227,206,113,103,57,13,203,26,43,103,100,85,60,250,60,3,98,174,47,228,55,103,90,116,36,140,108,32,174,110,176,36,19,31,250,34,160,184,83,119,27,59,197,194,24,44,234,25,83,175,189,202,211,180,113,212,198,251,26,190,240,46,24,250,123,211,250,69,40,26,105,93,224,43,182,120,95,235,249,224,183,203,162,92,242,216,142,160,51,131,170,247,113,168,154,76,252,146,33,132,53,19,86,198,40,109,77,24,65,231,153,3,244,229,228,250,76,49,177,158,93,224,185,205,194,144,242,40,183,206,95,159,207,23,215,33,142,50,24,29,146,210,150,105,41,186,243,162,10,169,23,251,130,161,24,117,12,187,10,117,154,164,90,226,9,226,82,182,73,128,164,243,23,85,60,158,121,80,162,239,46,144,68,8,79,104,150,9,106,120,89,
+64,97,124,198,231,245,89,22,213,210,42,9,120,189,32,46,18,106,63,106,13,196,8,122,98,45,114,144,90,229,136,90,75,32,202,141,50,125,11,153,29,70,79,109,139,80,161,229,19,76,37,221,86,231,213,70,74,20,216,176,254,146,220,137,216,119,131,171,216,226,42,109,108,69,122,173,102,7,142,241,246,240,244,205,181,49,73,205,92,115,206,25,168,0,87,46,180,251,251,102,213,254,75,250,220,31,136,90,221,37,65,79,158,44,198,145,240,199,27,94,221,160,46,38,102,240,98,88,124,126,9,234,168,114,214,38,230,213,223,155,204,8,137,69,85,227,66,114,107,206,6,133,146,127,120,52,190,82,206,27,174,42,155,0,202,115,211,168,27,144,65,164,132,137,157,78,29,111,235,232,157,183,67,183,135,184,96,75,25,230,96,36,19,39,159,204,110,103,58,179,233,139,74,32,188,48,145,253,47,1,145,112,144,134,88,161,54,102,151,78,108,68,55,106,238,214,183,47,150,148,115,33,219,196,226,221,193,54,32,102,220,151,164,144,248,37,191,211,123,195,184,191,226,54,82,81,
+214,237,60,203,181,191,10,80,107,30,35,99,61,60,49,199,220,241,72,159,134,41,138,20,41,147,108,227,168,84,207,103,125,52,41,79,152,10,250,1,122,123,85,61,96,132,216,179,141,246,122,210,97,112,239,238,111,40,204,216,212,55,126,18,207,202,194,133,238,206,98,236,178,72,27,16,169,193,175,38,252,37,198,100,78,176,184,193,48,86,173,93,138,154,122,245,122,4,126,55,1,173,171,112,36,41,68,34,197,94,209,243,3,72,57,193,6,168,61,60,186,57,82,195,131,139,208,170,167,116,168,149,121,159,168,71,77,54,171,47,134,171,45,68,19,244,122,140,78,18,46,31,144,199,14,205,141,163,110,30,118,228,143,21,104,55,186,200,199,110,196,203,50,66,134,246,96,140,114,74,205,113,175,244,84,43,234,177,117,41,89,92,63,251,84,62,161,134,218,163,222,150,141,79,29,188,132,37,151,23,228,201,225,204,237,167,90,133,30,211,61,231,16,100,79,194,129,107,219,61,132,36,183,145,136,124,136,3,212,163,65,161,177,104,205,153,186,203,202,50,76,10,213,52,237,224,
+50,168,213,80,36,222,81,195,65,27,47,82,170,6,250,245,232,141,76,105,67,11,88,46,57,148,59,77,218,159,248,211,18,85,249,122,8,112,179,74,233,254,176,190,188,19,217,215,121,61,153,25,195,177,148,226,98,145,63,229,49,54,94,5,74,211,100,170,239,5,221,107,107,100,116,86,20,79,50,35,55,20,239,148,9,213,14,107,146,28,197,195,43,217,51,239,32,188,106,141,44,61,100,249,11,246,202,92,201,180,176,200,178,93,218,236,249,70,14,172,168,161,181,153,91,84,154,215,87,247,12,88,72,189,236,177,104,152,10,170,121,198,220,94,135,174,52,228,56,189,9,230,59,34,210,118,135,217,190,178,50,174,160,154,231,64,11,124,251,188,201,105,148,168,213,181,160,175,154,12,113,181,40,250,102,46,153,166,232,187,22,205,187,111,24,247,222,146,75,208,54,171,45,34,160,8,181,35,226,176,252,185,57,137,52,89,243,181,188,79,215,218,218,4,39,170,100,218,102,172,240,235,36,108,102,143,196,246,149,151,162,225,121,209,210,112,179,183,81,83,18,157,226,113,25,1,
+74,11,172,245,94,226,104,188,182,36,123,187,108,119,138,151,110,172,82,59,231,196,64,198,103,174,151,203,51,226,180,35,5,20,220,39,36,230,141,156,69,97,53,61,202,159,166,94,126,35,170,124,54,84,241,247,251,67,7,162,173,34,216,23,231,70,188,80,126,174,241,44,160,146,176,203,208,235,180,39,109,97,172,102,109,96,226,105,37,2,114,117,15,221,250,162,66,154,22,73,116,62,215,97,247,158,136,194,187,70,139,18,143,224,27,134,86,193,206,54,245,77,124,216,18,105,249,6,222,72,86,27,84,180,241,73,40,111,249,234,82,217,19,30,164,119,141,100,138,182,89,14,214,180,228,186,53,75,130,63,220,200,62,189,60,73,16,135,238,176,180,220,42,201,154,149,63,116,1,61,36,64,8,47,242,16,40,50,12,89,249,211,6,221,71,43,196,110,177,18,44,154,156,13,166,204,251,62,5,227,4,203,180,106,229,190,236,84,185,237,86,197,18,11,222,18,139,158,98,161,184,22,88,151,29,100,23,215,151,48,89,55,185,155,58,182,234,235,35,144,43,110,251,2,206,87,
+196,228,144,149,63,81,182,76,236,143,233,70,61,68,208,49,55,219,235,241,166,22,18,129,99,175,214,189,0,101,130,37,166,117,228,124,224,14,186,8,151,131,226,82,221,45,57,82,153,249,67,138,178,239,99,239,228,89,197,157,77,174,239,19,157,3,40,93,198,88,14,31,19,121,170,80,104,63,176,227,59,211,35,190,49,161,184,32,211,165,140,188,108,78,193,245,178,121,51,204,91,229,217,174,72,142,211,177,18,3,240,254,86,255,220,198,50,166,177,27,87,239,114,161,174,26,136,203,37,113,167,97,233,251,95,214,10,54,87,243,128,164,219,26,137,68,115,119,179,16,120,81,18,7,122,237,92,240,158,212,145,88,144,22,187,98,45,115,88,18,199,21,2,47,80,146,92,10,126,24,221,240,207,14,242,242,50,220,200,121,137,170,14,30,55,136,146,158,192,135,118,29,108,25,48,242,73,78,96,167,172,70,133,66,116,55,95,208,54,87,73,83,195,18,209,107,245,242,242,52,83,103,175,18,106,131,58,215,223,98,221,228,28,8,205,226,201,152,150,94,70,106,53,36,199,125,
+111,15,118,112,115,11,228,194,21,65,47,235,211,43,243,192,153,82,214,184,116,219,39,110,159,14,127,97,14,61,179,13,125,106,13,223,54,159,153,119,129,232,140,126,79,219,29,42,6,191,212,206,62,108,248,162,231,144,108,73,61,124,153,185,155,52,63,108,26,171,132,30,101,244,126,136,191,197,114,77,115,235,19,2,191,203,176,2,90,212,221,202,215,134,148,123,77,183,140,227,205,231,131,101,40,137,155,107,228,75,195,146,31,135,161,115,182,64,193,198,192,152,53,237,84,26,98,166,106,35,56,198,50,123,177,95,49,40,58,195,33,221,51,219,213,240,23,51,49,201,127,154,248,156,243,186,38,123,118,118,203,218,171,195,157,62,170,19,219,70,163,77,204,240,57,168,65,183,169,161,154,253,17,219,154,75,107,113,16,27,167,174,214,206,9,62,232,138,224,59,4,227,148,228,157,126,166,110,187,123,224,28,139,184,161,215,194,126,141,240,54,165,107,93,62,52,207,67,92,237,85,164,239,68,181,40,90,27,50,203,55,205,161,120,139,219,208,187,124,249,210,234,153,111,106,73,
+166,39,248,112,31,137,232,71,215,249,44,120,122,61,122,38,209,246,3,183,29,135,17,75,156,56,225,104,201,185,227,168,155,243,114,116,48,93,83,135,55,108,140,114,18,228,208,18,240,25,151,149,101,170,181,214,179,173,3,183,122,88,158,199,100,90,6,112,112,105,209,29,17,193,27,188,143,56,151,99,254,182,250,170,198,156,179,89,182,36,116,108,30,242,94,178,126,25,219,53,190,104,213,52,190,40,90,78,110,52,24,59,122,227,98,200,235,39,239,61,34,182,152,51,49,243,157,152,60,212,48,119,59,251,104,157,162,103,238,164,159,152,109,198,202,216,109,43,128,146,34,130,178,68,46,6,249,169,103,32,18,57,98,169,113,32,145,247,207,138,20,7,83,34,127,28,137,37,88,5,139,108,186,134,150,102,225,116,53,69,70,238,114,217,130,78,100,175,96,67,190,39,114,157,36,245,5,167,148,174,10,178,59,116,121,229,170,9,149,153,219,152,149,241,116,46,151,93,248,38,168,204,181,106,151,199,192,102,6,154,51,35,47,138,157,142,39,177,79,178,20,90,120,77,60,124,
+136,180,202,13,237,131,92,100,144,245,22,108,229,165,222,115,62,103,23,173,142,60,118,107,76,87,128,131,124,187,150,222,122,251,135,120,210,224,141,42,229,50,153,237,129,200,41,139,20,185,71,111,255,225,234,65,118,111,217,174,110,230,28,242,234,86,213,97,47,236,165,216,222,212,99,109,157,130,169,92,164,119,81,173,211,67,177,211,97,91,64,78,28,155,104,157,81,251,203,174,188,151,25,166,178,12,246,160,147,215,240,212,172,130,14,91,98,81,248,16,125,197,63,77,146,224,148,67,208,188,168,96,150,52,49,178,81,172,172,219,48,207,254,202,173,67,196,39,94,220,148,251,66,183,244,40,125,147,100,27,215,102,104,15,144,0,80,71,179,210,106,120,193,102,223,87,144,182,214,224,80,145,135,70,165,126,37,111,216,138,253,7,150,113,174,40,45,217,221,36,37,75,93,215,19,88,95,33,236,117,94,249,130,87,238,13,40,66,36,241,167,161,91,189,67,107,144,78,111,245,249,150,233,225,124,5,49,98,91,70,16,117,85,161,204,75,46,51,186,238,170,70,17,47,79,90,
+245,170,22,125,33,12,196,119,149,108,131,35,74,207,184,129,140,253,14,12,65,96,99,25,247,21,252,21,253,156,175,55,8,169,229,220,255,202,184,105,39,19,146,243,234,156,139,2,116,247,57,108,92,87,73,176,227,134,86,164,250,201,170,212,71,105,123,132,81,11,199,55,105,3,168,109,125,211,16,80,213,249,252,3,156,204,122,49,243,88,130,221,2,51,184,187,208,123,84,65,138,132,78,21,118,18,61,229,72,6,150,218,251,25,12,25,8,73,34,60,86,95,90,221,178,238,83,135,84,118,207,202,174,6,111,43,38,92,172,237,235,140,22,221,67,195,242,67,202,160,164,108,135,185,206,158,45,102,162,243,179,174,13,50,143,102,227,187,242,248,207,229,16,83,115,190,102,114,177,87,138,118,224,198,120,247,180,28,45,154,209,97,248,187,64,209,78,25,185,47,113,130,23,72,207,94,187,2,187,92,219,52,58,211,66,174,57,108,94,133,53,184,69,211,167,45,186,41,165,241,238,123,238,56,81,63,242,197,106,241,249,166,58,190,127,121,196,128,247,234,190,114,40,19,46,171,
+44,125,205,29,173,53,121,240,129,39,112,105,54,218,232,113,1,112,10,111,224,125,199,56,160,151,37,9,114,191,186,247,210,131,64,117,105,172,173,220,29,141,54,17,246,238,94,183,107,169,134,243,80,210,15,143,39,38,80,121,138,41,78,36,160,212,123,205,70,115,40,161,22,120,251,33,174,42,75,121,201,37,41,0,164,186,108,29,187,74,82,246,222,157,98,169,223,9,21,129,106,198,146,184,201,50,249,40,193,222,204,111,72,202,244,21,155,61,186,92,145,203,53,149,90,160,8,238,198,248,121,251,241,229,97,123,171,107,245,118,133,12,225,225,242,42,8,215,122,87,166,161,170,111,197,156,143,115,131,125,45,20,95,182,69,163,43,120,63,67,47,132,116,75,237,164,26,53,199,122,170,121,229,28,133,54,209,174,60,62,211,197,0,186,235,39,172,139,149,80,56,60,15,97,45,110,29,49,162,11,46,172,221,11,161,127,104,17,188,6,67,177,113,111,120,87,148,8,237,182,240,232,188,16,209,72,252,47,136,228,220,141,28,137,17,12,213,82,145,180,182,67,34,155,103,57,
+32,230,158,188,55,3,230,197,184,72,240,37,218,121,81,237,129,224,3,75,24,212,155,241,188,149,208,109,92,76,154,159,150,61,67,227,164,40,166,231,80,10,48,110,121,236,96,94,164,214,65,157,104,190,95,159,28,209,219,66,184,232,21,77,166,134,215,15,158,36,2,3,14,98,191,228,55,83,37,34,31,121,17,160,34,134,171,224,208,234,79,210,53,179,126,91,180,137,195,226,175,108,142,19,214,136,88,71,29,138,85,143,48,53,176,66,174,229,197,177,186,87,95,176,220,163,187,91,193,44,206,149,179,202,94,100,229,97,8,52,90,126,108,137,7,138,16,244,77,171,103,19,123,120,237,153,207,114,131,75,216,206,39,218,40,187,41,156,2,8,195,76,15,179,146,61,11,52,124,230,249,0,180,112,95,17,201,151,103,226,77,163,77,39,18,225,17,157,183,254,212,28,131,137,206,22,123,171,32,86,183,136,134,144,89,232,161,17,125,116,38,2,237,31,54,35,139,232,85,111,89,111,156,174,171,196,30,174,234,200,141,208,148,241,65,236,160,201,141,189,60,53,176,119,147,236,
+185,145,66,191,204,159,173,44,43,142,23,152,28,44,68,238,195,5,139,92,127,36,107,111,211,53,164,209,83,130,148,243,32,225,40,244,114,192,24,151,156,3,45,189,81,168,173,139,66,173,86,137,107,192,129,226,122,154,157,207,51,203,188,219,109,93,250,253,241,89,137,76,34,191,170,20,77,229,54,72,157,210,158,111,166,229,94,113,196,201,130,26,209,105,34,9,203,216,90,16,95,137,197,176,232,20,248,199,236,98,97,102,118,200,123,202,13,164,232,222,94,14,54,250,188,128,81,54,205,179,204,120,77,80,219,122,245,175,12,229,43,93,189,144,101,53,250,124,1,203,126,177,31,234,247,46,138,130,226,245,188,234,34,171,49,24,215,124,146,35,175,181,24,27,119,106,224,114,51,163,23,158,90,132,112,183,74,222,65,176,33,36,63,149,150,141,214,160,195,20,103,4,132,178,245,86,80,173,160,70,123,254,124,95,140,148,97,98,68,33,68,89,12,114,155,61,229,241,161,104,123,234,210,205,17,139,0,166,24,216,52,93,132,118,89,205,207,71,102,182,90,85,147,162,46,121,
+188,57,47,172,37,69,217,177,179,237,197,82,112,109,54,134,84,138,76,152,103,195,228,228,67,186,209,106,219,36,41,75,58,2,76,68,9,206,216,180,228,227,193,68,215,107,241,123,198,189,114,188,48,106,93,187,25,219,243,122,240,235,124,6,122,204,220,104,172,220,247,74,91,100,73,163,99,175,53,121,15,16,32,247,118,55,51,142,144,124,57,160,112,184,234,220,81,64,27,83,45,47,131,60,66,8,56,120,92,108,101,67,61,171,154,93,34,166,215,185,121,222,83,22,29,19,250,203,151,46,211,9,66,222,6,167,23,3,134,109,72,190,113,106,175,52,75,56,202,137,128,164,170,169,210,172,95,109,65,165,25,82,128,56,235,174,103,18,214,38,16,222,187,237,137,67,18,125,78,158,46,114,138,160,145,114,190,7,71,112,82,46,211,166,240,117,49,246,90,13,104,195,158,166,85,38,22,73,161,164,37,129,98,111,250,52,10,129,41,179,88,161,184,234,27,139,250,179,105,68,92,106,44,107,182,206,254,16,58,92,153,181,171,65,133,72,49,129,23,135,22,253,102,191,48,242,
+200,175,73,196,129,124,17,49,43,104,224,5,30,142,29,225,38,103,26,171,99,49,247,196,76,240,87,95,216,138,114,176,214,195,105,177,156,33,151,77,14,100,185,128,45,191,142,157,7,210,3,220,115,65,92,149,66,135,87,10,58,179,18,9,208,142,130,205,51,111,150,217,87,215,7,154,113,16,202,154,33,17,28,230,156,60,88,50,8,22,81,187,156,175,175,8,186,105,250,242,137,53,205,85,175,124,70,100,89,211,72,0,61,130,41,49,95,49,21,19,238,2,89,151,110,98,203,231,229,3,107,102,149,184,135,176,244,50,177,166,90,206,95,206,129,54,44,111,180,202,218,15,135,106,226,209,94,10,217,214,166,14,158,156,231,116,38,140,8,18,163,90,53,27,45,102,166,163,143,27,101,78,97,184,170,243,201,39,171,86,74,33,187,15,98,192,58,2,20,119,109,189,89,210,246,7,195,45,1,241,204,173,226,98,120,23,242,194,237,48,155,65,171,243,145,67,237,152,153,119,35,138,16,183,121,120,196,230,24,124,166,51,79,203,27,205,66,123,10,30,120,38,192,237,87,160,
+224,36,178,177,51,196,168,62,127,59,163,192,249,117,214,69,192,143,247,58,27,112,46,203,52,29,70,65,28,133,177,247,24,136,150,178,160,94,150,227,100,94,12,152,122,88,195,21,218,244,118,18,50,199,110,242,97,175,140,248,54,248,69,197,185,88,48,52,17,10,22,62,218,94,223,169,13,246,154,138,131,43,203,157,28,65,66,234,156,8,205,209,240,146,54,10,110,85,130,107,59,2,46,99,82,88,189,129,146,27,71,137,44,138,94,136,194,9,245,82,144,106,251,50,75,193,232,46,135,121,138,130,189,232,214,131,207,135,241,132,147,239,191,196,38,101,150,202,19,52,77,176,24,148,65,45,127,28,50,230,214,10,35,83,74,155,36,242,67,6,174,148,36,12,21,43,217,208,67,95,34,21,3,185,249,101,117,143,229,45,55,79,183,150,23,2,139,151,128,116,239,107,192,1,214,95,182,92,194,91,133,187,118,137,70,13,206,219,246,171,129,42,1,18,12,12,54,177,73,175,142,179,165,209,221,236,101,196,79,97,235,138,105,241,65,62,88,232,224,147,133,68,142,55,191,142,
+128,166,53,54,51,237,195,217,151,245,190,48,220,204,69,76,22,223,142,64,59,245,131,229,171,90,201,178,58,180,85,147,101,188,235,88,167,111,185,157,153,186,150,224,108,130,88,114,218,212,97,249,107,50,167,233,42,213,248,248,144,160,179,68,105,6,244,58,117,171,21,53,210,205,2,77,89,18,193,35,56,203,126,190,199,45,245,172,41,72,192,134,143,246,114,179,121,120,153,33,199,155,81,91,166,230,66,57,159,110,252,130,173,149,157,44,23,177,15,138,179,210,60,136,211,150,27,86,130,229,69,212,160,167,202,38,32,45,67,151,116,46,154,137,97,73,119,197,117,211,94,26,204,13,198,37,17,115,217,76,157,13,160,89,102,132,79,146,156,27,32,21,97,89,4,243,248,50,34,21,211,64,214,15,108,21,244,154,233,68,39,240,203,165,208,51,90,140,76,155,16,241,66,95,48,239,48,67,136,43,78,145,151,134,213,74,54,164,144,207,220,151,234,94,41,185,227,219,75,110,11,211,65,51,43,28,75,48,108,192,103,177,38,94,222,107,248,94,134,213,204,192,15,236,252,35,
+20,82,153,116,228,230,91,226,101,180,188,66,204,55,224,49,62,159,100,242,25,76,81,178,69,215,159,169,151,162,70,236,144,142,36,95,96,104,185,190,85,235,123,243,12,77,94,157,127,200,27,115,9,240,97,92,125,41,37,38,106,222,118,196,121,70,169,15,243,115,102,164,134,34,69,87,12,198,26,222,192,208,186,144,251,130,57,220,16,162,119,129,107,44,141,170,72,39,209,17,51,230,64,133,133,230,88,51,103,249,114,209,3,172,64,246,225,232,72,49,72,166,170,148,177,70,126,95,213,148,13,213,181,216,131,80,113,20,244,106,69,202,218,222,44,207,159,55,209,226,18,152,155,72,131,112,21,193,105,148,77,131,47,18,57,45,211,64,178,156,119,37,245,44,55,40,239,238,24,37,197,91,65,114,227,221,21,180,241,80,31,180,22,55,53,120,212,177,26,67,241,206,172,164,130,132,123,37,211,11,234,134,116,126,215,186,203,39,89,169,26,23,217,10,219,134,101,255,67,201,42,82,236,123,228,222,1,203,36,235,247,70,211,54,229,221,198,102,118,216,115,193,240,16,84,200,
+246,175,76,218,78,215,212,188,234,137,207,235,229,102,122,115,163,157,88,237,149,70,146,138,102,14,250,151,186,21,17,179,127,21,150,114,98,126,101,226,8,67,113,136,233,227,205,136,206,157,81,58,129,91,185,203,64,132,11,160,45,243,182,195,110,150,209,241,197,121,137,144,57,248,229,105,94,168,189,149,15,94,166,55,198,98,172,159,217,199,89,29,191,98,53,126,200,222,42,251,26,219,192,245,186,13,41,51,153,217,192,51,241,92,221,241,23,251,210,75,98,216,83,199,212,148,23,88,78,225,30,201,159,23,215,121,66,77,30,77,11,12,196,203,71,4,252,75,165,190,95,147,110,94,184,115,104,110,147,157,123,252,19,1,41,47,135,38,169,30,231,101,193,239,73,80,33,55,166,146,218,124,51,173,92,170,164,137,0,162,47,193,61,176,232,247,69,209,182,132,234,142,9,209,229,121,82,212,222,53,167,187,65,204,145,113,152,220,235,196,13,59,99,164,129,55,67,249,82,182,201,186,206,98,160,5,40,67,133,188,164,95,204,19,226,128,181,58,200,26,86,59,112,72,129,60,
+252,133,186,200,204,212,119,227,58,146,18,81,148,31,86,11,62,200,54,228,94,135,18,85,184,113,230,130,130,113,129,104,204,129,181,5,154,68,171,199,78,165,234,119,111,63,174,225,31,163,146,243,209,89,34,24,55,151,208,18,164,185,186,13,162,146,119,67,53,78,177,77,160,206,96,115,251,217,149,100,40,138,178,40,242,123,110,38,229,89,205,31,35,7,164,4,83,196,74,206,51,119,100,189,7,105,88,79,184,227,121,177,123,111,222,27,96,169,134,99,172,229,153,58,254,43,33,206,171,201,65,231,110,245,28,154,16,185,49,96,45,215,139,211,207,218,125,81,117,243,229,33,18,59,19,123,144,7,177,67,12,151,119,83,23,138,123,166,202,155,202,48,24,230,93,75,221,182,95,46,24,78,3,212,4,86,183,24,142,139,32,168,40,86,32,103,86,175,16,146,85,4,237,178,216,141,166,60,28,32,77,65,118,162,11,151,131,100,96,173,193,179,200,202,137,58,76,177,79,38,123,12,55,11,206,138,64,188,184,97,184,124,249,26,104,231,34,241,94,89,212,60,58,115,13,145,
+129,218,234,219,176,229,233,121,186,119,178,198,194,90,232,6,108,76,156,5,130,70,154,92,32,3,155,153,235,4,121,230,6,235,187,109,114,152,233,164,90,37,36,217,213,206,17,238,9,123,237,71,209,18,132,217,191,16,145,240,48,221,12,214,104,31,27,34,102,153,163,55,58,90,207,134,82,14,110,194,231,210,74,46,170,132,83,146,221,16,189,77,157,81,58,180,166,123,187,228,113,244,252,188,80,132,31,19,190,240,75,149,25,55,242,168,84,13,28,115,190,3,77,209,227,118,114,75,229,0,99,55,54,37,80,209,163,209,67,60,87,143,175,105,98,183,37,250,176,52,242,77,176,116,51,120,123,105,187,136,39,160,254,161,221,227,220,197,110,136,210,167,4,74,235,232,40,67,185,213,3,131,151,19,76,133,47,23,89,1,128,239,90,113,159,239,81,161,59,80,158,238,204,208,196,15,169,8,153,53,158,155,52,219,196,18,62,207,58,174,50,114,83,208,35,178,107,235,137,44,136,212,124,230,62,136,123,216,190,215,129,122,186,212,244,50,86,218,214,50,124,214,100,159,114,172,
+139,58,28,99,235,100,177,77,204,121,60,195,210,54,38,141,157,150,130,123,168,197,163,166,240,146,187,126,25,62,61,95,249,110,174,5,157,118,33,7,158,74,227,142,51,15,191,200,16,207,134,14,228,104,141,134,167,139,66,174,29,11,169,186,227,78,80,4,104,7,65,77,35,175,228,189,49,115,20,211,57,53,125,163,171,106,158,69,44,172,96,42,186,101,216,4,68,107,52,83,55,47,32,185,198,85,240,225,98,161,159,148,25,30,129,47,140,172,25,164,10,123,250,238,234,62,163,159,63,24,76,115,87,172,162,59,144,166,184,128,210,169,184,154,108,199,77,90,136,169,41,80,220,151,7,159,60,246,232,110,209,4,11,237,129,183,21,213,46,106,230,188,211,164,164,57,2,14,31,189,238,108,32,211,212,47,97,139,246,60,64,92,179,164,185,216,214,209,74,190,146,90,80,61,107,12,177,235,95,151,164,230,35,234,81,175,21,22,170,141,250,72,160,238,18,35,35,113,135,39,215,202,231,117,217,110,152,191,89,62,145,160,210,82,65,76,83,41,250,108,202,230,2,142,218,17,
+118,220,221,219,47,252,47,86,136,217,122,72,79,219,33,234,114,47,117,230,102,245,225,44,167,116,44,30,93,240,67,136,80,80,209,238,87,230,25,177,80,223,96,3,153,64,78,48,247,187,245,91,4,165,172,31,213,158,12,74,217,157,238,242,134,113,46,146,86,116,76,89,225,217,58,169,118,76,7,216,244,214,141,2,177,12,227,64,180,90,203,111,206,123,184,245,101,39,196,166,36,27,105,184,108,127,111,95,38,188,125,47,207,237,39,231,102,100,231,51,231,158,227,114,10,6,161,171,208,45,195,122,86,46,4,238,96,145,78,108,32,151,175,155,68,143,15,54,202,122,179,187,182,72,28,93,222,94,19,69,232,204,99,173,67,145,218,197,251,197,168,108,138,177,137,205,146,30,123,81,35,135,133,161,38,166,26,166,92,62,25,122,11,33,20,183,195,148,216,231,58,253,77,183,46,134,159,121,38,175,146,173,44,98,162,28,236,247,76,199,28,123,214,101,246,3,90,37,168,131,233,196,42,61,106,163,103,116,24,27,200,240,164,227,120,21,111,89,80,239,253,85,177,1,235,123,
+203,133,102,33,60,231,144,96,85,77,29,214,154,50,33,56,38,170,103,86,227,22,80,244,93,2,166,9,246,80,18,1,69,176,148,199,167,144,161,201,106,152,86,5,122,153,14,187,5,252,35,218,46,178,166,173,134,170,216,246,92,16,48,245,197,188,13,74,201,37,216,54,7,185,119,183,18,73,111,170,254,18,187,117,37,152,14,211,140,201,175,229,19,181,91,37,131,22,14,32,220,176,21,109,113,181,91,184,84,19,80,64,185,186,223,236,51,145,94,162,194,222,70,175,61,47,215,13,215,13,138,189,239,61,221,45,100,200,178,128,84,172,121,130,85,164,53,82,179,70,221,96,54,134,70,153,241,9,119,151,183,147,67,137,10,76,237,251,36,107,76,57,187,40,183,76,119,244,198,72,164,69,193,58,108,154,194,98,181,36,84,92,22,66,213,44,151,134,101,240,172,32,55,151,219,117,29,109,115,125,177,169,225,12,247,107,218,6,241,88,50,155,121,80,13,67,158,149,95,101,219,198,173,169,244,202,206,93,1,103,159,175,219,86,208,201,40,214,78,63,105,99,229,12,206,28,
+169,125,206,134,175,29,206,128,34,188,76,29,58,25,181,85,205,42,143,167,198,249,125,164,232,94,93,112,205,253,23,205,100,207,78,8,186,221,216,72,252,124,245,138,238,99,37,137,198,190,154,161,186,101,67,122,158,109,56,127,228,222,193,166,224,73,106,140,17,228,5,27,144,28,164,182,168,189,254,176,238,238,181,176,100,141,120,137,245,250,245,238,202,13,244,125,142,125,11,3,185,192,40,21,109,234,75,239,78,140,19,184,172,33,142,159,90,45,122,114,82,203,245,60,5,175,127,137,147,114,148,94,167,173,46,247,132,205,22,180,123,121,54,208,191,122,249,74,181,199,145,7,171,125,198,132,248,165,158,42,81,164,137,72,167,155,183,205,159,153,169,49,82,0,19,45,232,82,225,92,130,178,52,232,174,200,46,130,166,155,55,115,130,202,97,185,38,64,201,10,252,45,163,33,71,208,140,138,226,213,243,12,91,174,97,196,158,25,104,83,185,198,110,64,165,140,193,219,16,246,133,237,208,48,29,82,110,30,165,107,189,204,40,117,164,72,186,26,14,56,180,209,100,181,73,55,
+10,190,192,99,227,240,6,7,67,174,109,164,129,49,33,191,75,42,238,148,178,134,164,64,91,245,176,55,189,68,80,119,190,188,191,218,172,184,129,106,163,120,169,49,27,49,70,195,152,56,11,97,253,213,135,196,152,34,12,66,23,238,75,230,51,154,77,189,218,39,197,11,163,58,154,76,52,98,196,113,112,45,168,169,227,137,54,221,139,244,100,125,148,158,121,234,139,237,59,230,201,11,237,254,90,23,169,170,169,3,180,53,41,19,132,187,18,105,111,22,46,251,76,95,128,217,34,76,125,66,148,117,184,142,181,188,68,202,59,3,52,188,83,211,62,27,77,178,192,54,26,167,14,3,74,182,232,70,144,165,153,186,141,33,182,185,75,109,204,182,39,176,128,3,209,71,186,96,121,108,13,73,11,219,249,178,66,169,232,152,96,10,106,138,186,79,105,32,36,114,1,153,207,48,176,30,132,177,6,43,207,220,75,54,13,186,155,151,196,8,178,243,208,149,244,10,32,197,158,206,8,104,220,231,144,185,59,121,145,45,83,48,151,15,214,54,35,0,124,124,190,173,221,89,21,77,
+76,30,92,65,155,174,15,151,42,1,254,1,1,12,137,111,255,153,207,223,210,173,118,43,17,129,163,26,15,30,4,4,52,58,123,224,224,85,168,184,37,227,40,72,172,59,250,217,219,103,4,228,154,197,31,141,46,50,79,118,4,240,12,176,84,115,80,149,28,200,53,95,133,238,149,50,93,43,12,242,120,77,142,89,158,173,40,136,236,134,120,134,118,112,182,181,11,121,106,134,45,240,228,142,36,71,217,154,161,25,19,161,49,224,206,175,248,30,124,192,183,39,214,70,33,146,20,113,134,48,250,125,228,219,165,136,165,120,242,170,239,61,84,10,148,44,19,6,152,26,157,130,219,50,219,75,188,245,171,236,25,118,145,121,0,241,241,136,44,76,42,188,22,22,85,47,183,171,234,56,42,21,70,189,161,80,155,101,80,40,36,202,110,87,195,203,147,247,233,123,52,157,11,163,68,190,64,185,14,188,10,147,141,186,245,235,206,216,63,165,62,238,101,245,43,45,28,218,24,243,115,21,78,45,195,178,116,197,214,66,94,15,97,181,39,147,76,140,10,245,75,114,183,189,73,104,
+19,42,160,56,242,91,21,167,224,215,98,205,78,185,53,78,97,243,190,64,105,222,134,89,38,132,52,210,150,198,51,100,144,204,108,199,170,7,221,213,237,147,157,84,13,119,90,168,109,162,201,28,15,178,44,50,49,116,251,186,171,9,212,37,227,20,6,54,157,27,116,11,210,173,42,104,118,31,188,252,121,241,202,42,187,220,14,81,248,51,64,157,30,125,118,97,201,109,207,41,107,222,66,46,160,100,192,118,173,197,204,64,172,109,200,231,137,12,173,67,174,9,250,101,104,192,177,95,245,88,3,77,203,182,69,226,92,42,71,165,63,120,88,136,192,208,20,164,27,54,136,104,172,251,174,17,226,131,161,98,180,193,38,27,189,202,140,195,183,165,131,177,204,196,200,7,228,187,236,85,234,204,66,174,132,245,86,71,196,192,149,12,39,207,185,98,65,45,155,24,33,37,186,78,242,100,31,229,244,148,100,159,116,175,94,66,83,91,117,51,19,122,106,231,162,110,190,96,75,16,105,217,126,26,185,62,143,75,184,82,97,45,1,43,40,100,88,194,26,45,190,176,132,173,205,81,
+48,89,230,104,139,87,122,40,159,149,240,107,164,105,82,180,214,55,166,206,103,188,237,22,85,112,130,182,221,3,63,61,198,246,226,234,217,228,12,113,48,206,233,242,187,68,7,149,13,214,247,27,146,23,44,249,226,119,159,197,194,213,203,117,56,25,42,242,148,74,1,123,94,183,239,167,6,188,255,42,87,239,228,250,182,34,62,125,78,150,48,161,179,250,139,231,108,112,211,172,174,77,225,97,131,116,51,131,244,5,237,39,117,76,20,70,223,25,203,30,101,145,107,224,23,196,90,55,187,8,214,188,138,37,108,65,230,206,132,234,17,253,87,237,113,254,94,139,191,228,52,138,57,235,51,58,131,110,12,154,198,177,90,227,80,132,12,153,164,104,49,30,67,5,186,40,144,207,112,120,54,123,231,124,182,99,200,83,232,93,146,156,92,52,53,82,131,126,111,230,39,250,113,210,42,17,58,215,149,50,163,231,214,237,245,225,150,49,65,119,226,28,139,40,185,144,34,102,190,250,166,128,31,87,218,233,5,62,149,98,7,181,229,76,130,82,188,169,170,40,28,8,107,82,89,208,
+233,147,3,193,217,233,220,157,243,91,151,217,49,5,141,238,136,31,34,182,65,98,213,142,108,251,22,78,237,46,72,46,19,187,102,77,198,229,208,17,38,8,99,19,123,69,196,101,248,119,220,110,93,83,38,92,102,64,203,137,127,82,210,20,217,125,95,255,106,96,218,117,208,129,237,238,41,104,114,205,103,220,65,98,66,74,77,59,6,122,162,176,247,207,233,175,232,85,56,42,85,9,117,201,58,158,171,225,103,24,213,221,20,22,222,105,197,213,134,157,60,176,187,147,32,40,73,95,171,118,244,235,98,70,213,89,39,46,136,205,106,192,174,178,72,125,185,108,112,89,205,76,210,132,82,106,236,172,123,9,187,242,8,158,23,108,35,123,25,94,114,168,239,12,168,165,150,41,25,68,231,81,65,3,230,229,182,138,45,162,88,112,16,33,160,185,90,23,82,45,237,188,64,207,207,80,245,104,27,226,227,62,188,204,235,8,15,143,12,249,216,61,161,227,43,51,72,48,17,235,202,52,131,70,209,44,30,41,124,157,120,64,79,43,55,118,60,57,194,184,26,215,81,200,244,136,
+49,46,207,67,155,253,92,150,227,6,212,25,23,163,227,33,79,215,141,57,172,241,130,177,88,198,151,236,117,95,21,17,181,28,11,83,62,49,167,24,239,188,141,47,65,173,241,58,87,40,132,31,64,98,199,54,68,193,10,188,201,188,154,45,92,242,178,164,38,167,186,201,226,21,79,169,6,179,20,202,121,181,233,241,97,201,21,144,167,14,88,151,77,55,55,178,217,167,132,181,136,189,153,50,80,112,11,197,117,87,26,232,201,119,134,43,115,190,101,28,182,8,59,239,218,102,64,45,52,87,231,57,241,206,98,23,118,175,120,50,117,167,128,223,251,199,37,145,119,219,245,119,111,86,224,231,102,140,135,22,31,72,48,205,61,65,189,43,43,202,164,33,179,191,107,32,37,241,171,134,73,219,232,36,184,2,251,98,98,145,177,48,42,11,191,80,27,221,41,64,152,7,104,215,40,90,69,42,65,78,181,101,77,53,6,3,90,213,213,181,59,232,104,244,56,93,95,187,47,219,42,195,180,73,66,135,76,142,9,71,212,195,161,47,30,133,21,137,32,45,111,50,115,21,177,159,
+178,0,141,21,41,63,212,60,54,207,117,163,187,70,168,170,50,35,140,213,171,178,5,8,49,67,101,99,119,87,73,23,38,242,114,207,141,51,41,146,203,123,191,65,157,67,51,200,81,165,186,112,200,162,32,42,142,106,212,180,198,232,80,60,185,78,74,49,181,156,9,151,94,212,236,28,37,238,244,38,21,212,105,247,119,41,17,102,156,226,57,207,101,109,223,116,88,74,118,4,70,173,175,182,237,138,151,68,218,118,252,114,65,171,137,67,58,175,144,209,151,221,159,15,96,80,127,230,230,138,124,203,26,22,120,208,195,82,210,11,121,130,201,92,20,151,169,220,183,135,160,204,32,32,108,8,152,27,186,116,122,99,186,35,215,11,76,243,10,168,220,197,33,9,161,122,92,170,252,123,91,6,231,207,221,106,123,36,222,214,123,30,78,84,81,168,36,12,170,50,217,210,148,17,79,21,14,94,169,214,197,156,26,77,181,154,95,171,103,77,37,199,90,177,130,49,64,193,96,136,94,116,236,215,138,200,43,10,51,12,230,132,179,71,124,178,122,95,19,247,240,64,134,11,163,150,
+21,65,133,157,153,109,42,202,55,153,36,142,63,253,82,183,89,108,244,20,81,212,155,138,39,5,162,192,214,246,144,89,108,216,0,171,125,178,15,243,205,226,156,95,114,63,212,211,113,34,163,57,155,6,200,91,81,161,2,74,167,141,98,10,123,44,55,53,165,55,133,222,206,182,91,51,235,87,47,26,147,164,255,133,124,203,128,101,246,232,230,27,221,70,124,22,191,96,197,14,198,248,160,136,64,221,246,138,171,97,25,111,170,52,215,208,87,206,196,19,76,27,118,10,27,201,153,38,102,96,245,64,136,158,62,103,82,150,175,109,15,58,95,30,67,110,46,70,212,75,163,186,247,204,137,4,186,19,66,143,122,223,205,223,174,53,189,236,142,137,211,216,194,91,93,19,62,16,165,113,251,161,140,10,20,112,86,52,99,132,162,186,105,208,238,126,158,106,149,230,84,77,139,153,203,155,108,152,128,229,186,56,26,163,15,114,212,218,50,72,81,94,252,74,181,59,136,53,94,143,155,197,27,176,91,222,190,69,139,103,165,109,230,101,216,187,184,154,149,14,51,85,9,179,217,224,
+6,94,170,155,112,95,172,92,203,219,101,132,159,238,206,113,27,45,123,205,191,187,16,181,58,105,121,55,190,156,26,8,243,50,190,143,18,141,189,113,140,214,146,215,200,123,27,82,81,24,184,239,167,243,97,197,32,137,166,196,242,79,78,139,56,104,202,27,84,26,170,224,85,50,148,33,73,213,249,86,34,72,60,231,65,186,115,226,115,104,33,217,79,105,160,139,154,181,95,181,247,186,105,217,83,76,168,79,140,187,142,237,1,199,170,251,51,115,71,73,112,67,200,94,231,163,109,3,174,87,39,202,187,99,206,189,207,223,139,170,57,35,90,79,89,172,5,161,124,180,16,106,40,65,218,183,1,84,140,194,11,223,14,21,90,160,39,232,3,137,62,114,148,50,17,174,247,218,98,108,59,231,74,14,91,96,221,93,63,110,39,171,50,23,194,72,85,118,164,231,208,109,206,59,2,75,18,32,42,109,29,238,30,176,93,177,219,254,72,174,243,246,21,51,158,236,218,180,68,118,216,21,86,138,77,88,186,96,50,228,193,165,212,190,157,214,172,238,33,194,243,14,108,123,147,227,
+237,188,174,71,23,135,123,108,170,162,194,126,41,151,60,140,76,87,215,104,155,74,242,165,236,149,51,37,223,150,95,197,118,216,23,175,5,104,122,92,189,47,96,114,146,208,172,28,244,86,203,126,225,174,108,117,111,168,42,40,137,196,182,54,13,16,217,70,42,184,178,72,17,110,189,120,113,15,185,227,52,36,140,117,170,52,20,194,165,233,55,127,124,100,72,78,104,127,10,119,245,173,204,76,195,49,106,131,25,250,26,146,209,55,81,100,13,128,237,118,88,113,190,186,138,215,64,191,227,249,231,254,233,161,118,145,45,17,70,104,186,208,136,10,39,232,112,8,208,44,189,117,98,84,151,217,169,229,92,41,136,102,244,217,83,213,152,127,41,191,86,16,109,172,208,187,9,128,129,239,49,84,124,0,45,174,120,207,24,15,96,174,154,179,198,61,160,146,95,178,120,208,153,245,65,57,188,227,240,216,13,11,165,176,172,239,25,144,117,133,79,7,41,208,9,241,6,219,9,100,149,160,39,187,108,31,165,53,46,74,121,209,64,109,91,92,189,66,98,107,206,93,111,16,241,184,
+64,244,213,46,79,194,152,181,77,132,249,97,0,175,82,237,50,223,229,172,15,153,217,230,201,47,55,79,246,243,108,84,22,3,223,182,38,143,244,94,144,176,147,177,251,79,187,128,137,20,75,55,80,245,153,201,105,64,216,65,29,58,235,103,249,236,53,222,161,12,74,125,13,163,21,205,232,53,83,92,95,22,127,19,39,39,55,233,231,187,32,203,63,244,237,231,99,242,236,114,118,208,201,238,247,43,217,236,32,63,40,247,253,66,183,37,121,148,85,204,175,187,121,5,165,241,42,100,50,243,90,138,16,69,141,245,252,166,158,103,103,246,250,142,204,155,170,200,202,43,204,162,175,32,73,172,203,249,68,18,73,111,71,47,153,221,163,109,63,78,224,200,83,69,1,152,238,255,107,28,231,50,68,37,64,163,65,71,108,15,247,154,177,190,36,19,177,174,252,243,65,173,51,64,13,250,96,246,198,163,137,53,199,153,205,120,81,245,60,229,10,97,67,193,45,69,20,137,109,204,76,33,145,142,216,135,78,95,233,90,51,67,232,52,127,81,40,24,5,82,139,86,7,203,69,211,
+139,108,148,211,174,211,36,169,27,156,236,186,42,79,181,41,183,142,131,213,124,39,21,130,170,235,218,168,19,149,65,10,56,51,212,75,223,198,231,120,244,227,93,86,81,34,193,93,173,184,150,228,187,173,163,249,97,204,128,176,154,81,149,175,231,114,244,221,86,9,37,162,114,171,90,219,110,109,136,65,171,17,135,150,15,234,207,168,234,132,181,12,5,8,162,17,219,12,103,215,73,145,134,88,38,213,126,193,79,61,155,199,93,5,185,251,224,73,211,178,198,60,94,255,133,206,151,195,198,47,113,194,76,168,143,38,48,91,77,39,81,87,165,110,81,221,155,105,131,183,101,105,48,16,156,109,107,7,137,169,141,13,203,193,157,223,220,121,175,197,134,168,15,125,55,3,138,249,134,41,93,242,54,184,5,79,240,168,230,244,107,158,142,51,2,49,123,122,2,49,57,185,127,166,157,73,125,147,246,29,36,214,192,198,215,196,59,111,115,113,232,76,212,94,176,107,160,186,156,59,216,115,93,16,148,206,31,22,137,118,23,28,231,192,101,50,131,160,96,137,232,230,86,85,204,216,
+91,116,151,149,117,65,0,215,112,102,25,88,197,102,5,78,151,71,127,53,29,147,72,182,185,49,33,150,28,212,37,164,238,42,91,204,227,175,21,178,168,108,248,130,137,129,240,166,47,219,133,113,208,165,167,140,20,98,123,237,83,194,141,250,27,213,64,220,200,58,16,162,113,223,174,11,148,35,85,12,132,69,194,49,172,228,122,121,122,182,204,223,202,188,235,123,45,1,237,79,17,251,194,67,97,17,32,36,198,108,46,140,91,136,58,54,109,225,170,128,23,33,116,4,150,202,238,36,221,188,184,94,95,225,130,6,195,176,40,227,147,15,32,243,69,224,134,60,51,208,113,35,139,59,174,198,192,251,2,87,97,164,77,2,101,72,154,61,20,106,187,38,161,43,62,208,64,76,32,186,251,73,163,209,52,139,175,5,105,128,145,246,238,34,135,121,182,107,237,154,24,59,229,72,78,248,97,75,66,49,204,26,35,82,150,252,105,53,21,190,220,35,111,165,194,106,143,185,139,92,221,79,84,79,181,74,243,22,157,126,153,135,162,228,221,242,140,83,121,161,243,139,1,138,41,236,
+13,132,154,67,71,78,152,201,52,89,112,193,202,122,127,81,194,94,187,172,55,72,133,188,213,60,127,146,21,227,135,214,249,179,150,182,246,196,234,153,200,203,125,125,158,205,249,237,133,167,203,203,246,75,157,180,184,102,52,22,38,223,238,198,133,175,43,19,42,142,27,228,78,9,169,117,123,205,218,205,63,201,86,57,212,56,224,186,119,147,120,161,123,77,105,153,244,184,95,161,126,88,45,218,144,150,223,134,228,136,196,188,37,54,111,97,23,16,13,39,228,136,251,27,104,171,61,150,214,25,19,215,11,124,99,80,246,16,174,13,79,193,60,114,20,51,203,72,210,118,1,168,104,138,236,85,88,189,94,42,161,29,21,54,31,138,211,231,240,110,113,157,198,223,78,208,121,155,132,212,87,113,36,75,186,229,5,19,120,38,169,189,190,96,109,6,29,160,139,103,160,128,245,241,186,67,174,63,98,214,246,140,139,35,57,244,220,121,37,163,171,42,130,65,251,39,124,198,29,242,168,20,246,101,201,178,66,140,168,107,216,101,47,236,135,120,173,79,169,166,3,54,208,15,138,40,
+23,65,62,109,210,150,68,202,72,70,198,102,29,13,240,229,104,211,155,96,187,123,170,219,34,8,7,139,221,50,26,36,148,200,119,76,7,42,0,78,143,74,29,177,115,25,207,34,208,23,21,60,53,41,66,95,40,58,149,192,5,25,194,15,173,58,17,167,240,80,198,83,238,49,111,231,129,209,180,171,207,4,190,69,24,103,135,225,175,147,10,244,133,3,221,157,108,53,158,28,210,148,185,129,201,224,29,94,226,150,10,149,233,246,242,145,77,51,91,165,203,16,65,30,206,236,48,67,105,148,90,51,11,12,100,207,200,67,51,164,85,115,74,179,20,241,240,218,126,100,47,59,206,71,19,86,16,138,147,51,236,53,225,14,46,13,155,44,1,241,254,92,33,140,145,196,41,213,19,163,224,224,41,37,32,120,209,47,122,66,167,51,73,66,109,194,110,127,25,6,196,10,218,249,86,225,147,138,105,26,190,221,73,115,204,103,221,151,153,208,53,177,94,146,132,81,11,199,0,153,82,132,234,115,184,188,93,149,35,41,56,51,102,185,77,47,200,133,48,189,157,107,213,111,247,224,
+236,121,97,88,82,143,250,208,17,94,209,79,5,242,96,233,184,30,164,85,101,11,159,156,3,133,62,78,7,253,71,137,121,144,28,165,203,248,59,102,133,92,55,168,247,183,48,136,146,211,187,84,41,141,70,28,163,130,239,210,235,16,234,249,52,227,87,60,123,110,153,90,188,183,16,183,131,202,37,221,254,74,57,111,171,238,96,189,87,102,165,100,108,188,224,210,250,56,231,176,111,1,65,157,38,174,93,123,79,80,92,45,151,195,115,27,210,219,183,247,226,177,4,232,144,123,156,128,168,235,14,47,128,94,84,168,225,123,207,67,199,85,121,188,188,35,243,161,149,181,68,36,43,157,85,113,17,216,129,169,232,161,201,209,212,22,45,188,26,130,117,139,137,143,14,12,160,147,189,149,179,103,222,137,205,79,118,9,200,220,235,194,239,6,68,114,125,111,210,249,230,119,156,231,130,253,60,217,11,171,11,252,243,1,211,152,121,109,237,121,222,197,178,132,99,105,158,6,16,174,128,189,46,6,109,19,15,45,104,64,66,211,208,11,124,160,132,190,184,245,94,8,115,13,200,50,
+93,193,103,174,192,193,224,218,69,195,82,94,10,148,109,102,85,17,118,54,32,48,200,122,221,204,150,69,216,36,119,7,143,97,208,119,23,56,242,72,225,71,90,50,35,158,127,148,34,113,27,177,170,181,57,153,71,29,140,158,217,55,92,159,231,109,87,181,173,112,191,125,238,246,20,178,68,198,164,11,23,35,244,233,128,150,174,3,172,36,6,75,116,158,52,236,35,198,46,127,44,206,154,7,114,36,171,2,147,35,75,205,213,0,98,96,47,185,30,44,246,212,67,122,239,81,151,108,90,36,77,59,17,13,243,60,125,28,161,146,233,226,69,191,202,202,78,132,114,228,44,246,126,96,239,205,190,12,47,221,57,168,122,113,195,28,216,148,253,194,226,102,63,228,202,124,20,113,222,194,153,152,28,74,100,235,138,164,64,144,234,148,249,13,57,15,199,154,245,173,236,242,25,107,83,104,42,35,39,142,49,236,247,8,45,221,185,141,191,56,240,50,24,219,161,67,247,211,201,68,133,187,195,119,24,186,41,223,224,86,152,102,226,228,30,162,105,229,211,228,43,162,33,230,2,207,
+38,92,86,168,117,209,216,191,26,5,184,17,39,90,227,104,173,49,55,15,12,52,10,152,235,92,22,158,16,169,28,96,177,163,41,61,103,216,59,133,19,159,142,15,99,110,81,117,117,118,20,238,42,85,202,186,254,42,123,216,119,167,93,244,29,19,151,229,68,228,11,16,223,216,186,232,70,174,86,46,222,99,186,81,70,215,218,50,33,26,133,240,203,218,149,244,125,74,197,145,63,4,64,1,241,246,18,100,30,41,64,87,141,34,58,94,193,11,121,7,113,147,14,182,177,114,134,50,61,81,137,63,225,225,15,47,17,17,250,234,172,140,190,40,76,152,249,87,238,194,234,109,185,164,7,249,138,187,96,122,64,231,193,215,102,54,143,190,35,246,170,101,82,66,110,131,111,166,170,75,47,203,114,152,101,193,242,23,93,102,198,176,204,43,202,46,164,111,0,23,154,229,186,78,48,8,24,41,117,17,18,223,180,151,251,242,56,83,87,133,97,150,80,46,116,43,203,171,17,125,104,156,212,36,218,164,132,86,186,176,169,197,31,187,121,18,215,170,16,142,213,68,104,102,148,123,
+43,1,5,66,124,188,247,74,181,100,138,90,220,118,236,7,61,80,185,177,80,248,204,139,0,168,132,30,183,19,165,75,16,23,186,178,188,146,42,121,144,139,108,201,11,113,101,11,39,108,138,237,177,236,240,56,63,28,81,180,217,139,243,89,115,153,43,71,95,232,60,211,236,102,60,112,205,244,126,28,189,69,6,151,209,119,184,60,242,141,6,168,184,228,27,133,242,84,107,61,218,78,93,122,25,187,17,114,40,40,218,158,108,240,185,46,219,219,133,94,226,150,237,147,93,129,14,231,42,103,58,232,37,26,165,126,129,219,31,77,76,63,235,33,132,145,249,52,211,153,181,231,21,62,105,68,69,232,189,194,147,81,111,65,48,184,243,17,212,38,60,168,167,73,165,142,235,31,97,132,120,242,45,29,183,192,112,47,35,75,127,178,89,238,225,217,56,106,90,171,20,4,179,160,58,59,106,162,157,103,61,21,105,6,77,89,171,100,226,231,50,190,166,224,43,158,209,228,70,69,179,49,123,30,92,190,29,112,114,82,181,78,43,86,225,75,129,74,13,180,239,142,112,126,185,203,
+236,121,22,14,6,74,211,42,11,139,243,145,142,121,8,212,27,153,115,234,162,197,41,130,41,175,14,98,213,215,5,149,6,44,109,242,54,15,181,64,105,61,141,130,148,62,95,232,117,237,80,234,74,115,207,193,16,82,79,241,240,147,93,227,121,44,129,30,110,170,155,238,248,174,150,181,75,125,60,203,172,73,190,237,5,228,211,51,11,199,163,71,231,121,59,51,133,110,159,184,187,104,172,21,202,67,172,52,250,171,118,79,2,41,104,118,114,239,142,148,175,147,93,49,135,228,129,255,28,197,22,175,80,151,79,77,251,156,159,182,23,134,217,77,128,100,165,212,77,183,78,243,46,67,192,33,253,242,38,81,8,93,37,34,84,242,168,180,148,188,82,45,175,251,114,21,92,201,29,20,174,214,194,180,246,224,119,19,178,107,181,40,61,215,247,50,200,148,84,145,127,233,14,236,35,68,22,31,5,147,137,164,252,171,193,125,49,199,248,163,126,83,76,78,190,189,92,151,241,203,165,215,151,3,249,83,152,128,36,155,21,23,238,34,174,108,221,164,226,31,118,104,138,196,215,112,
+155,124,15,252,235,186,6,182,43,104,252,51,209,236,130,59,127,88,128,204,88,54,30,104,138,112,168,158,105,108,176,42,218,164,49,54,106,24,146,89,134,78,209,251,210,44,77,250,80,240,171,124,189,6,21,90,231,56,76,30,196,62,12,201,68,240,84,214,158,33,21,104,40,234,94,201,129,73,133,114,113,18,232,192,72,101,23,7,173,97,173,119,190,252,227,162,186,146,39,151,136,114,148,233,220,246,144,2,201,164,133,11,238,41,9,133,126,118,163,121,146,203,31,170,30,101,128,167,43,164,244,148,91,131,26,142,46,111,72,6,10,113,221,47,211,149,208,84,163,52,69,163,4,15,113,195,160,227,215,199,144,132,36,8,95,4,11,55,187,87,215,195,207,237,127,82,8,101,65,101,98,231,70,140,96,217,45,98,131,84,152,116,181,203,209,219,173,212,29,160,26,203,91,13,112,158,98,196,10,29,73,55,228,92,70,218,245,103,177,58,16,227,15,32,122,244,42,217,38,215,59,68,203,92,147,39,21,192,60,235,188,249,0,162,42,57,66,95,52,133,70,189,170,199,224,148,
+120,253,220,133,64,75,98,79,210,3,10,94,179,9,56,9,12,3,219,202,185,231,112,46,20,249,242,194,127,152,139,210,47,222,144,219,113,45,42,40,12,103,32,168,234,201,30,59,35,147,111,207,61,214,188,6,62,206,210,129,17,5,65,112,34,106,118,247,32,52,151,150,11,181,151,184,46,207,15,72,238,187,97,66,129,18,23,178,83,25,81,81,155,90,91,57,174,36,235,149,106,7,93,131,164,73,31,237,173,93,174,231,84,26,239,3,8,15,131,17,226,160,30,27,125,23,242,19,38,22,179,120,73,135,114,65,122,171,105,29,34,176,173,207,65,95,229,108,88,92,4,97,96,180,27,133,82,114,26,234,49,59,37,38,120,211,140,179,44,218,65,133,41,160,162,250,235,142,184,119,58,159,15,100,196,62,141,47,165,172,219,233,2,4,42,15,26,34,196,29,148,167,198,161,233,85,158,249,192,119,22,38,130,187,202,99,161,254,58,119,9,136,134,113,22,71,124,120,131,131,48,0,211,159,3,138,132,222,249,23,150,128,2,53,51,236,66,43,21,202,28,77,153,80,67,219,
+140,124,27,31,220,7,146,245,50,62,214,163,210,175,84,41,219,205,129,183,160,54,112,101,100,67,163,187,81,203,33,40,244,27,48,8,232,236,12,65,225,74,125,91,206,115,180,141,30,243,174,6,69,0,5,122,60,102,96,84,204,225,210,157,52,87,208,99,35,178,190,193,180,188,224,113,46,27,53,39,133,9,80,103,143,230,112,16,16,80,108,35,132,71,64,189,108,46,154,226,13,160,134,49,80,227,228,168,233,154,114,81,68,155,59,160,128,154,211,139,100,105,128,13,68,129,202,47,224,183,48,78,227,202,13,46,106,138,232,217,109,64,38,140,15,208,23,19,109,233,69,156,199,143,73,98,149,89,33,124,121,144,124,169,1,122,9,114,199,211,214,19,220,62,227,87,116,65,99,133,237,87,237,195,90,181,209,12,9,227,168,150,171,103,211,61,74,32,151,200,231,133,23,190,134,98,130,3,27,16,113,160,228,23,40,23,143,112,149,244,74,53,199,177,195,209,33,27,205,115,237,177,182,232,117,34,247,93,229,20,148,193,136,119,149,168,126,26,156,242,2,0,133,75,7,84,
+214,38,81,88,88,160,229,189,153,162,32,99,148,216,65,234,90,233,100,46,81,117,206,166,121,81,28,243,141,75,209,86,38,161,98,171,87,200,90,128,58,226,144,115,183,80,3,115,247,50,46,66,95,95,93,114,179,163,25,197,70,147,151,27,251,188,145,68,226,139,165,175,37,138,26,10,97,0,180,58,46,87,75,77,138,6,187,227,180,141,32,128,105,210,29,152,3,141,88,2,214,203,217,235,14,150,36,136,51,136,157,221,233,3,6,123,61,71,13,100,79,237,75,28,152,231,223,30,164,221,113,140,227,85,137,131,94,145,42,21,147,35,57,176,228,187,36,61,139,94,209,60,109,232,250,1,248,178,161,139,134,33,67,18,219,169,162,169,123,198,180,183,171,239,18,16,141,135,51,80,253,231,204,227,39,133,28,232,72,82,21,60,130,186,145,12,95,18,114,228,240,85,119,200,170,217,66,45,28,84,35,39,113,40,161,19,194,218,202,228,69,146,143,160,226,188,83,21,89,171,87,14,16,36,91,202,180,252,217,102,35,26,82,6,216,190,106,144,29,150,123,92,220,218,3,109,
+233,14,194,200,46,255,23,168,27,42,206,225,23,125,198,64,158,138,33,240,81,4,90,92,113,58,200,62,98,207,193,221,224,158,212,190,10,229,206,166,119,192,227,95,46,209,53,148,238,78,124,251,80,187,97,222,7,64,189,194,104,30,27,149,99,209,157,134,247,133,131,224,138,73,220,50,147,81,74,174,129,113,63,203,193,191,21,74,113,139,108,215,234,16,126,35,17,156,4,137,121,92,62,148,52,133,93,15,184,215,228,199,186,228,225,204,136,186,173,157,1,5,94,130,215,207,20,96,77,175,224,142,36,9,20,91,5,235,125,185,48,165,207,225,138,36,167,143,192,95,131,8,245,77,23,132,2,74,0,79,129,194,222,133,172,74,175,19,15,166,19,223,168,69,162,80,41,13,167,192,131,56,106,170,33,208,48,94,190,40,158,206,20,46,204,157,212,119,91,141,19,72,209,34,24,24,255,187,56,11,21,155,185,235,243,30,58,225,97,107,230,236,108,97,10,173,14,74,11,211,181,32,46,18,95,161,11,31,183,231,217,47,131,208,212,125,199,204,212,36,105,17,136,242,115,121,
+21,195,146,5,80,111,64,64,153,91,246,26,73,50,194,112,111,227,207,194,132,39,205,69,162,234,112,60,247,65,183,0,185,20,224,217,142,50,19,27,201,196,161,227,105,96,71,102,241,215,197,44,226,197,174,197,65,105,184,186,126,220,237,90,175,237,127,82,151,4,63,128,122,56,2,170,234,177,203,31,211,125,169,240,156,1,22,249,168,231,141,102,176,98,149,73,109,77,229,117,125,173,16,38,95,107,14,37,5,208,243,242,122,227,26,32,86,219,243,4,117,227,85,213,121,68,35,101,178,78,102,46,208,103,143,165,12,36,139,7,63,0,44,119,38,10,68,137,187,18,168,145,80,255,34,35,69,21,221,32,20,53,16,5,139,158,168,234,14,56,186,33,22,206,206,111,221,66,60,148,167,223,141,213,8,232,10,129,23,222,250,27,175,122,87,240,6,234,26,4,208,182,155,102,120,22,26,72,175,21,201,145,28,84,174,221,136,174,5,82,225,139,74,173,228,252,9,245,236,62,95,251,191,89,121,203,247,244,150,101,91,248,95,199,157,64,130,5,11,36,184,19,52,56,4,18,
+220,221,19,92,130,187,223,6,214,62,123,159,115,158,251,225,189,207,251,229,215,204,73,119,207,174,26,163,70,85,77,178,150,18,31,158,124,147,69,12,36,150,177,105,35,203,225,141,92,156,135,83,18,223,21,149,212,79,145,58,144,58,255,15,168,128,53,175,161,13,12,23,21,189,61,125,253,92,76,8,100,43,248,214,154,11,79,57,223,43,121,143,249,245,52,158,216,240,207,50,89,49,250,24,123,26,15,152,62,18,234,133,20,174,84,233,208,228,251,147,231,152,185,44,78,118,123,13,102,23,169,115,237,114,130,79,183,81,177,37,214,179,6,239,232,179,101,181,3,76,174,236,121,20,246,175,128,41,148,224,103,129,160,90,223,212,155,171,191,27,227,199,28,236,239,91,203,55,240,25,56,8,72,45,126,144,91,18,34,124,42,114,220,144,149,110,241,6,14,163,38,155,248,121,150,152,100,179,118,207,71,246,110,54,120,37,19,84,114,209,160,235,203,76,156,178,114,26,70,167,57,197,143,18,189,116,73,252,60,83,126,95,180,120,176,175,157,142,153,57,249,26,51,74,100,25,
+88,30,206,14,100,134,153,155,141,132,111,110,238,45,123,37,136,28,252,188,186,123,135,151,184,228,70,117,154,134,88,134,117,33,50,250,149,48,155,144,225,159,83,18,85,142,255,102,65,165,162,224,107,8,179,207,14,206,32,95,5,186,190,214,210,209,251,41,119,202,114,179,148,231,255,142,89,175,6,8,233,143,141,235,31,80,122,225,118,167,160,179,201,30,37,239,254,92,136,160,163,224,218,191,33,117,87,33,68,222,133,68,159,53,241,139,136,194,78,155,175,227,117,214,167,156,209,130,172,19,147,134,31,211,238,131,28,124,102,84,74,89,20,114,183,110,204,43,182,70,72,166,15,43,154,102,117,14,70,71,72,201,95,207,37,50,247,17,203,65,231,232,48,174,192,46,208,119,240,23,26,20,73,190,102,209,87,20,253,44,172,95,126,243,198,146,202,245,214,41,119,162,165,74,162,214,80,100,62,123,9,76,215,35,134,203,186,3,115,123,164,194,120,96,75,178,17,79,118,241,61,58,106,96,53,209,175,21,168,203,10,114,205,196,185,228,171,142,78,45,50,122,58,146,117,83,
+124,123,224,78,240,115,98,167,247,250,176,124,190,176,6,9,30,74,225,135,229,250,95,129,158,69,168,25,232,20,24,174,24,123,100,201,9,202,224,93,30,13,125,62,47,175,41,49,254,18,152,199,204,59,7,185,75,160,74,82,125,104,73,91,200,77,127,182,60,213,42,141,224,97,158,55,41,18,250,5,189,241,133,79,147,183,61,120,222,190,179,252,202,215,133,249,115,235,249,77,250,150,213,28,120,48,20,89,240,168,194,176,161,210,131,27,104,231,63,101,11,181,134,116,204,83,122,106,43,163,119,169,107,162,29,28,73,86,72,181,217,223,149,121,232,228,191,182,32,72,194,43,153,229,86,52,116,208,127,226,180,25,130,229,44,111,134,41,82,230,239,83,49,212,12,1,137,203,104,129,174,111,129,174,55,170,201,47,193,228,115,80,227,194,144,218,155,255,96,244,119,196,237,247,116,62,180,206,200,68,244,72,249,241,180,34,143,246,141,158,193,109,16,59,61,176,103,52,96,11,4,255,201,127,34,99,166,143,141,50,197,139,228,61,166,47,195,183,246,252,229,49,181,109,69,76,
+83,205,71,54,39,254,113,223,207,155,70,194,8,195,55,144,247,248,250,175,34,189,117,40,48,201,58,85,115,245,151,128,43,160,200,44,252,150,175,235,176,129,3,153,128,64,18,233,136,42,208,125,154,110,153,239,105,222,18,75,9,31,170,235,153,198,106,105,101,207,137,3,196,191,191,185,128,158,145,98,144,193,174,53,137,177,172,156,74,168,116,47,134,42,3,43,227,224,242,25,199,236,46,98,251,123,54,91,85,234,109,223,4,79,89,241,135,197,227,213,13,144,76,63,69,202,116,96,40,49,238,44,15,58,216,187,60,209,245,178,100,144,65,234,1,137,157,24,8,169,23,93,232,18,149,81,155,30,22,170,189,220,236,254,169,231,128,145,208,1,85,234,89,252,18,221,70,89,153,6,251,115,32,45,79,107,54,114,140,100,102,84,188,123,180,211,126,48,30,16,60,176,149,211,8,206,34,110,219,53,232,219,95,161,211,44,152,234,35,126,62,32,210,33,25,226,173,188,107,35,96,89,41,120,112,138,5,30,28,235,250,130,62,51,106,119,254,142,124,228,152,248,73,210,119,204,
+84,178,246,144,53,162,132,112,238,72,127,129,114,193,109,196,101,202,59,45,138,207,66,24,249,124,171,236,233,65,169,132,32,109,209,109,199,97,26,189,149,110,7,125,148,222,15,10,151,222,14,138,45,12,60,213,247,93,191,97,180,134,211,156,127,244,227,58,131,0,108,185,206,128,24,177,45,207,219,152,7,25,124,223,30,132,203,220,31,180,201,220,31,228,53,241,63,32,248,134,219,123,171,226,144,242,88,146,31,67,27,33,217,22,130,46,132,210,125,144,107,154,45,144,113,153,47,129,155,75,26,66,228,24,108,237,49,13,22,160,175,101,223,217,3,127,202,192,173,188,28,36,179,162,204,107,220,232,89,66,248,49,79,118,48,124,195,124,133,33,58,70,22,161,29,216,6,230,230,144,177,3,79,131,37,75,92,250,10,248,31,191,139,47,101,145,147,173,76,169,253,185,209,214,13,251,113,99,126,60,252,24,130,164,227,55,204,98,156,171,38,232,236,84,88,142,101,57,12,175,78,88,214,156,105,68,131,211,32,129,155,10,100,12,84,137,89,248,152,115,85,96,253,94,224,183,
+75,145,153,60,253,132,145,188,92,149,6,121,45,35,201,176,66,136,140,209,131,12,205,155,218,94,64,150,184,132,167,245,70,48,95,202,10,98,170,224,147,130,17,125,131,28,239,126,55,66,144,80,178,27,230,158,113,128,159,82,50,15,245,242,29,1,12,153,63,150,132,126,53,223,78,116,170,130,15,84,34,21,254,79,61,4,18,11,216,28,236,205,109,23,200,219,111,190,134,142,111,76,57,179,98,219,245,32,134,84,196,249,38,236,235,38,43,73,8,148,142,248,132,224,97,186,153,248,15,175,91,209,225,173,65,236,156,75,215,232,117,55,12,153,197,21,50,137,204,237,201,52,224,27,89,247,228,153,214,38,132,39,197,135,117,67,225,173,228,241,244,235,19,158,74,250,79,123,112,224,153,109,80,131,254,129,34,116,210,245,249,230,145,7,149,133,176,165,86,117,143,22,130,120,202,180,221,105,12,145,226,97,175,96,227,143,23,74,6,214,19,6,62,134,90,29,245,207,240,203,68,175,10,152,1,244,127,227,22,166,240,233,45,16,115,162,11,59,215,20,200,145,255,216,73,36,
+44,52,129,28,10,151,33,106,221,159,37,47,69,172,180,225,175,48,98,165,87,54,125,105,152,80,232,189,143,161,210,169,94,152,150,15,161,133,94,13,72,160,113,144,123,152,120,248,239,74,96,61,159,3,249,241,176,174,158,54,92,237,253,210,66,64,241,3,153,3,193,130,176,238,254,39,222,238,42,49,59,200,92,218,173,38,255,34,156,89,251,122,144,127,229,13,138,150,255,76,7,6,65,18,15,30,85,32,162,183,34,117,97,35,107,114,252,159,207,23,133,94,169,72,154,203,184,123,223,138,117,6,191,153,32,94,171,113,143,8,58,220,119,99,112,34,66,192,187,97,16,41,154,115,99,13,191,253,103,149,223,60,134,5,209,130,251,133,22,124,100,72,251,103,236,193,125,33,99,39,125,227,219,101,126,8,241,230,217,148,48,48,184,193,128,19,227,238,7,193,64,19,15,64,129,172,9,163,53,254,213,150,53,57,214,147,242,233,34,141,199,20,103,165,66,173,148,146,198,119,7,11,225,119,7,235,50,148,185,82,186,228,121,158,212,241,34,138,222,90,133,168,113,163,198,111,
+189,5,29,8,145,52,98,140,108,171,46,41,45,130,86,232,158,240,98,182,212,205,26,214,13,30,58,210,105,62,139,177,242,137,246,115,111,17,75,221,188,110,110,207,226,195,194,50,85,29,148,148,246,78,99,36,196,202,181,245,61,86,32,86,10,202,14,236,247,104,11,63,128,0,130,82,71,158,181,5,196,174,228,215,67,196,40,165,226,107,108,129,34,110,11,129,37,99,7,152,125,86,123,22,230,30,211,175,48,124,230,229,42,105,228,43,88,90,126,129,74,134,64,165,93,125,35,218,96,195,35,46,217,100,91,254,78,127,124,187,97,177,27,171,240,48,20,210,3,131,96,124,137,53,254,141,242,246,235,102,112,172,107,214,52,178,255,67,249,140,55,194,243,129,230,33,240,48,164,18,74,198,0,70,149,240,131,86,246,253,133,157,132,168,254,11,103,15,56,8,196,128,120,35,35,177,31,140,119,71,7,113,13,104,200,85,94,148,24,58,4,228,161,207,114,130,3,189,135,15,20,115,219,13,74,70,96,10,100,20,56,40,159,126,63,232,115,1,28,244,191,243,231,182,175,24,
+241,198,217,248,245,11,155,143,86,38,17,165,244,127,234,214,31,45,195,224,54,2,37,132,92,197,18,72,208,14,104,208,85,130,4,157,67,29,14,144,77,1,142,61,90,25,173,220,65,209,69,15,187,172,119,62,172,94,118,37,16,15,180,173,111,31,143,38,144,80,81,110,98,244,32,225,37,85,212,224,65,190,248,205,103,41,86,62,181,29,140,92,128,138,37,151,127,1,168,160,11,240,142,225,55,210,6,74,7,129,96,162,82,188,252,236,30,54,102,209,102,63,75,51,139,231,37,238,176,9,23,222,13,35,223,221,4,157,147,49,55,38,210,248,1,222,245,172,207,119,21,244,128,60,14,129,253,142,61,97,220,141,136,231,172,235,242,43,15,62,53,194,60,245,122,0,98,130,122,87,161,66,0,56,13,226,70,232,198,252,126,166,87,201,80,235,18,194,124,249,136,15,160,190,133,178,90,248,199,147,184,58,7,248,230,245,234,28,224,27,33,254,169,254,156,17,35,45,88,75,53,151,178,194,56,55,250,193,148,144,155,163,249,100,95,187,76,174,206,240,242,246,214,132,66,253,
+151,238,43,49,100,58,0,38,180,171,43,174,175,163,65,171,220,114,148,190,233,153,141,158,64,186,201,49,18,114,67,15,225,62,131,73,132,231,237,183,131,239,230,81,25,151,12,137,174,153,138,81,232,127,197,31,217,125,155,197,135,249,64,53,71,197,162,157,154,204,123,26,209,205,53,159,128,230,252,151,206,129,189,82,87,171,140,252,252,49,37,209,224,128,102,77,175,162,5,78,202,191,138,22,8,169,167,171,104,81,220,244,136,240,9,157,6,12,146,93,183,199,84,241,148,249,73,149,169,151,29,176,176,138,8,224,170,121,205,231,50,37,243,243,154,92,161,163,9,232,46,247,200,3,232,137,203,142,45,248,50,166,95,167,248,8,218,115,131,171,198,210,229,137,52,75,141,237,34,212,148,15,6,194,221,35,95,73,8,160,130,220,178,56,2,239,185,146,16,112,16,130,186,23,0,136,91,180,144,33,240,43,9,89,255,246,243,239,63,126,54,92,73,8,56,200,184,146,240,63,112,253,189,226,10,58,107,166,207,144,230,167,242,104,90,81,220,13,139,98,210,135,240,222,250,53,
+128,224,31,238,112,96,220,119,56,94,157,74,233,86,133,253,50,198,137,34,135,203,152,204,58,96,174,253,147,150,95,162,194,238,248,75,111,248,83,135,6,207,218,8,90,70,46,166,144,24,253,39,30,115,62,40,174,222,19,50,41,200,103,39,248,204,238,245,211,107,197,52,189,163,39,133,58,198,17,94,229,235,133,88,87,9,130,223,158,74,71,144,175,79,5,194,198,183,26,173,12,99,91,6,19,72,84,36,188,78,19,149,69,2,237,42,86,131,74,246,161,255,25,231,8,224,149,185,50,112,252,104,146,149,82,44,20,169,252,66,30,97,40,41,138,122,171,210,196,109,88,153,76,196,15,246,63,83,80,101,126,110,96,206,213,85,205,194,63,102,76,226,52,89,217,219,163,153,12,68,17,207,168,122,0,81,68,204,105,162,47,9,232,66,229,48,122,48,200,239,226,9,64,21,123,208,61,36,129,38,34,67,44,1,182,171,166,188,222,208,9,237,76,183,223,69,124,242,174,218,32,90,189,80,158,108,33,68,165,70,155,178,160,180,155,156,81,49,119,57,35,135,238,114,214,24,
+179,225,84,222,227,80,55,149,175,251,158,19,245,57,210,220,21,240,10,127,186,238,84,208,21,66,236,127,213,31,55,92,1,66,241,123,218,156,74,68,15,92,177,61,157,61,59,125,228,165,81,158,68,138,239,141,245,191,244,244,249,134,102,37,124,224,218,229,214,16,155,84,243,21,97,186,231,29,27,213,206,193,254,211,79,62,224,39,55,93,216,64,213,150,172,199,255,208,177,43,165,160,152,145,231,121,6,249,175,186,230,138,3,223,205,7,13,194,216,136,212,202,254,155,174,102,192,62,33,199,91,39,170,60,252,165,155,175,245,58,34,125,109,23,181,233,155,58,95,249,7,212,217,50,121,176,118,186,152,184,17,169,121,120,144,251,197,64,226,255,149,143,95,111,172,133,98,164,183,50,140,220,171,121,156,27,88,200,245,90,24,236,66,159,96,159,60,216,167,158,128,100,37,247,242,79,216,191,101,211,247,237,131,203,150,146,247,231,154,120,224,136,152,203,139,225,231,244,211,237,188,183,160,43,253,158,180,21,16,101,216,85,249,35,90,64,185,144,131,3,92,209,69,13,37,209,
+130,28,101,222,127,23,208,189,32,12,71,208,162,6,48,22,238,175,195,5,202,41,208,202,140,49,74,172,50,21,79,53,24,72,130,122,28,122,76,101,216,178,202,164,93,62,61,176,1,233,255,174,131,211,95,185,64,25,161,243,104,209,189,177,94,252,231,189,46,4,117,151,127,68,10,164,149,160,228,187,187,120,19,219,219,45,67,187,245,235,233,136,70,217,17,153,95,72,100,161,255,246,239,31,80,179,119,254,140,120,244,172,12,252,1,87,248,79,158,112,99,97,119,2,236,147,38,100,113,101,228,147,228,47,175,215,175,34,247,227,104,167,252,123,2,245,218,175,9,116,38,162,168,112,165,132,49,30,255,87,95,240,121,151,5,104,234,198,58,54,252,77,202,12,8,43,221,112,155,145,125,15,227,7,18,135,143,19,46,195,124,93,88,149,152,161,255,47,30,12,60,137,101,74,200,217,166,252,132,24,229,165,47,231,53,124,1,177,113,176,104,124,222,251,117,8,158,8,187,39,224,159,4,126,174,90,205,229,208,158,124,226,124,106,227,25,172,207,142,10,141,250,47,157,133,252,
+163,179,244,34,25,115,72,14,191,255,241,147,187,165,233,65,6,160,31,153,131,126,228,169,4,107,8,33,247,250,106,15,146,223,210,98,116,90,65,28,218,140,88,241,80,234,182,15,227,44,109,73,62,43,75,37,37,244,103,15,134,227,140,184,50,2,168,54,120,198,12,37,145,249,177,13,13,98,233,200,61,81,165,141,191,17,194,45,233,97,136,100,101,0,254,159,58,142,3,234,244,67,123,39,254,79,255,214,146,49,155,160,104,105,160,67,42,255,119,6,255,191,248,25,184,183,9,253,3,200,209,148,133,232,24,163,200,233,18,225,191,243,94,239,159,188,39,185,182,9,244,188,97,70,207,157,134,111,132,29,12,219,206,62,209,51,135,2,208,237,223,10,86,96,142,120,111,212,32,120,248,107,234,208,179,22,25,149,210,189,234,25,254,79,222,91,60,176,23,79,215,71,34,148,24,31,103,129,79,253,41,151,3,222,163,158,186,204,110,31,84,14,157,184,164,140,0,166,13,74,84,51,19,117,37,66,2,24,161,53,23,25,214,10,187,114,104,150,120,206,252,233,99,96,203,42,
+52,174,215,147,113,254,197,224,214,207,171,34,78,227,140,158,246,59,127,253,188,135,39,231,109,144,134,233,13,165,244,250,8,102,15,136,0,151,197,197,95,88,115,234,99,154,142,254,70,50,25,25,49,204,24,248,123,184,1,1,187,187,13,35,2,162,222,244,52,216,80,248,143,39,74,248,183,222,244,0,253,0,51,181,112,190,24,125,125,65,185,109,123,32,152,204,70,234,68,241,229,212,133,147,143,213,152,81,216,108,165,15,193,211,169,30,224,131,152,199,192,95,101,13,49,158,131,47,202,105,140,30,14,242,229,86,185,168,181,213,129,12,171,120,218,92,131,85,33,209,104,141,62,74,134,207,48,186,67,32,142,195,67,206,11,224,129,70,169,55,234,255,41,103,2,152,168,229,250,75,171,250,89,120,36,20,24,89,203,141,205,62,206,32,60,212,30,139,154,181,103,117,98,130,118,207,173,1,78,29,214,200,97,36,148,53,160,189,23,200,0,50,200,55,95,138,164,37,131,143,211,159,48,183,0,218,88,177,226,136,137,189,50,51,58,161,95,142,203,132,223,174,212,224,72,229,
+1,13,102,134,52,13,12,155,43,94,83,80,34,194,218,71,216,7,42,205,207,203,123,242,159,27,203,89,159,240,206,8,61,40,34,232,205,27,207,219,135,21,44,0,101,77,171,201,59,111,136,16,254,57,154,189,18,80,119,173,231,246,132,231,123,28,8,200,18,192,245,43,213,239,191,47,20,200,134,43,125,220,48,195,191,250,37,22,254,30,88,124,196,157,192,79,96,222,196,224,242,19,246,222,39,1,73,238,133,136,70,255,212,167,13,210,117,198,237,189,15,57,130,40,47,61,212,0,96,216,12,160,195,95,187,97,38,195,109,195,78,2,121,175,239,86,207,233,154,164,45,18,205,52,159,66,86,211,0,207,32,223,169,116,68,239,129,159,40,145,33,111,171,218,23,20,34,125,155,160,119,71,36,113,173,74,178,166,61,71,125,160,49,183,151,82,12,190,17,0,19,29,161,173,13,181,129,213,218,122,83,10,65,251,168,62,150,98,0,32,251,16,163,1,229,76,50,231,162,130,1,154,115,71,43,119,217,85,120,37,108,99,14,204,104,110,114,62,240,213,5,213,229,170,254,157,
+55,97,165,72,226,243,32,181,212,3,47,223,31,100,173,65,225,183,31,51,114,188,14,87,121,171,238,254,62,24,48,36,4,228,154,119,108,129,124,19,201,198,55,145,54,70,6,159,222,168,207,79,26,116,210,36,253,243,45,118,212,206,179,211,13,123,0,70,62,3,70,255,92,205,156,9,74,174,13,204,142,240,209,114,131,193,211,113,225,143,36,37,149,93,146,28,64,92,223,7,45,240,79,195,172,228,196,122,192,176,180,252,233,213,139,62,226,247,202,194,104,101,221,66,28,18,139,252,173,37,122,199,7,149,116,81,202,239,39,4,85,28,242,141,160,183,202,30,88,8,180,227,156,186,44,127,128,249,142,54,229,156,222,202,178,106,140,101,230,1,116,220,93,43,229,111,230,123,123,197,68,97,200,217,195,43,41,234,253,193,210,106,12,88,248,16,123,27,175,16,35,205,83,193,155,246,236,46,216,92,151,60,119,49,107,151,195,97,107,195,105,22,201,91,255,2,114,60,223,31,203,180,245,13,44,169,178,241,219,112,193,85,251,88,194,186,242,129,207,93,129,4,191,230,53,79,
+240,174,83,44,233,211,2,175,83,108,78,58,143,179,147,122,176,102,220,228,2,217,59,241,168,41,159,33,129,231,93,125,64,41,11,183,128,37,95,105,22,197,180,62,61,180,79,141,133,248,246,225,54,129,136,215,32,9,125,122,1,177,240,201,144,185,54,9,201,166,35,74,119,158,73,57,204,213,251,85,207,197,141,123,92,131,252,1,137,98,149,129,191,43,249,242,190,6,166,115,141,235,223,36,14,202,79,130,182,183,78,154,142,123,31,197,4,209,49,70,70,175,1,92,145,79,213,70,137,88,250,229,38,15,167,0,104,56,92,217,4,229,210,186,173,143,101,64,185,20,179,178,84,215,50,43,113,4,101,214,49,196,18,82,65,153,165,31,114,162,79,91,30,171,26,51,57,64,235,133,104,16,148,24,244,22,54,193,15,156,63,24,15,253,166,80,51,31,179,64,158,126,249,52,176,179,23,4,11,214,21,186,168,112,159,109,111,7,217,222,36,60,59,91,80,33,173,244,51,137,179,207,77,163,186,34,200,54,150,4,252,156,206,36,40,231,182,92,122,17,211,104,212,11,3,23,
+186,4,26,200,182,38,227,217,105,252,50,254,145,148,77,156,31,25,242,91,65,198,39,67,8,224,1,162,87,50,114,118,189,65,190,242,1,130,66,131,254,226,248,110,230,51,160,119,249,163,187,65,208,194,241,48,39,229,238,158,130,251,230,30,204,214,0,187,57,240,39,1,244,65,164,229,255,184,241,202,91,231,114,68,66,19,84,208,217,195,52,247,13,32,0,142,52,152,43,112,62,95,234,100,12,14,236,139,167,103,96,244,183,155,213,219,70,165,225,113,77,196,152,55,126,222,252,69,86,85,169,83,143,244,50,193,62,231,32,209,71,95,25,220,82,224,109,50,88,161,22,173,61,34,189,78,246,27,39,120,204,89,56,235,82,155,53,221,143,104,94,102,119,165,224,196,214,198,208,239,42,226,5,159,236,198,124,232,55,178,0,159,56,231,62,205,251,169,233,125,65,248,153,3,18,198,159,224,192,161,192,153,30,175,224,141,145,34,143,210,1,96,122,120,95,162,250,48,220,210,128,106,128,46,254,175,77,76,42,1,104,25,150,4,139,147,79,203,195,101,180,240,138,180,89,186,
+131,79,93,112,123,107,103,46,136,70,52,233,155,169,103,71,80,45,105,255,195,78,237,213,206,55,51,31,134,0,61,55,240,196,211,85,116,18,199,222,245,239,112,181,4,60,29,129,192,15,112,224,139,0,194,13,58,207,215,16,159,4,238,129,91,247,62,76,8,65,128,123,215,91,176,251,52,132,240,62,141,212,164,208,232,6,106,232,100,192,220,252,237,142,87,220,54,193,163,248,250,223,7,184,38,73,68,242,85,241,245,232,11,227,223,134,152,119,21,142,47,54,126,74,97,189,97,18,241,206,252,0,247,231,244,47,31,245,225,64,255,250,216,237,84,243,143,145,33,244,171,88,150,229,104,125,44,183,182,112,70,3,224,192,32,26,248,115,55,164,117,129,47,193,167,147,40,37,71,35,193,163,76,216,107,212,123,36,248,54,244,102,225,93,191,211,176,26,62,53,13,28,45,43,254,203,167,247,90,232,194,239,111,17,68,88,45,159,120,205,31,9,233,152,142,128,4,28,152,60,31,34,15,244,240,94,156,215,114,205,71,122,88,163,227,105,215,241,232,185,35,219,156,162,225,82,
+164,60,235,70,87,240,24,216,76,140,64,138,158,226,216,216,226,109,121,177,193,100,113,234,181,132,107,93,85,251,203,2,121,35,1,110,118,97,165,31,178,44,241,46,114,228,4,245,93,102,202,90,248,94,225,215,106,92,203,167,22,18,84,252,22,130,15,128,125,64,118,139,51,48,79,107,106,196,191,69,250,155,68,116,125,244,195,247,16,40,120,88,18,214,162,83,37,48,160,151,13,247,245,197,34,157,191,117,47,215,218,8,98,145,193,21,223,50,249,236,139,199,220,95,169,248,206,175,68,153,30,143,180,123,187,42,87,98,27,58,164,121,184,158,102,29,254,122,8,30,193,193,147,166,122,150,10,214,27,230,173,141,123,243,98,222,193,101,132,157,5,151,35,220,27,230,247,11,92,42,121,111,104,204,231,204,244,245,24,123,59,3,18,218,84,243,243,199,201,20,250,37,232,165,217,135,174,173,212,158,10,58,175,224,83,173,68,108,79,59,22,240,105,227,2,160,120,96,141,55,224,141,235,123,76,38,84,37,13,224,235,57,122,62,248,158,213,28,139,41,209,101,230,80,200,251,
+171,157,100,243,166,249,252,125,133,252,119,187,165,192,110,14,114,198,118,123,246,202,9,254,41,190,245,176,233,153,130,27,22,185,78,146,50,166,24,208,174,52,34,31,248,207,185,227,45,183,85,102,223,86,140,188,72,25,92,187,236,115,155,169,179,147,188,252,83,223,83,110,179,161,116,28,152,253,188,241,227,201,111,153,229,43,105,227,23,151,105,90,254,235,239,0,93,225,162,144,89,44,208,13,64,4,106,27,150,115,94,249,33,243,247,97,149,87,87,49,48,7,248,219,2,138,70,117,169,31,217,109,214,181,155,9,187,31,32,57,189,29,0,195,159,68,149,116,10,44,143,85,138,230,104,26,15,166,187,85,89,108,100,0,202,79,77,104,24,136,65,254,84,5,253,14,242,53,75,56,214,19,139,228,235,232,224,225,127,254,212,174,239,89,183,198,44,209,1,200,149,116,240,77,145,47,178,163,68,245,24,140,6,25,236,185,44,198,24,26,37,246,27,198,100,34,124,145,241,101,128,192,243,36,237,251,213,78,210,102,4,165,46,71,167,99,76,0,131,11,112,223,209,252,163,121,
+139,234,220,28,176,189,119,229,189,249,202,251,49,45,236,45,106,84,243,130,22,194,231,3,58,207,80,186,251,107,246,59,175,65,193,247,9,106,197,58,190,180,71,38,15,239,68,64,204,251,123,48,227,251,85,50,187,192,68,50,191,126,211,69,72,130,2,191,174,191,126,63,7,53,199,219,109,150,150,191,36,119,65,227,127,228,152,229,54,135,20,110,34,64,232,212,135,171,94,212,232,25,223,213,131,82,108,199,99,248,148,191,145,95,157,162,2,57,91,134,9,82,135,7,165,212,240,123,147,21,41,182,13,69,66,63,40,223,48,83,168,253,1,123,39,171,224,210,87,24,157,202,58,34,128,147,160,120,24,39,115,37,13,84,21,120,123,114,106,75,9,62,194,199,120,237,215,200,174,60,110,107,13,179,95,44,118,105,58,253,221,183,28,109,80,213,142,69,207,136,191,55,27,24,29,72,132,17,227,3,178,241,244,69,182,54,25,82,216,179,201,7,46,203,224,18,79,3,151,5,167,239,177,143,20,108,176,111,156,163,240,46,183,211,232,93,110,21,251,187,220,70,246,119,185,13,
+41,238,114,123,126,0,114,11,20,15,234,187,158,167,93,34,171,179,219,157,182,49,229,152,139,48,159,139,33,175,45,101,11,154,33,50,211,189,240,25,235,143,249,175,199,234,1,77,96,20,6,65,145,101,27,28,194,77,91,99,23,227,222,204,239,101,41,59,46,236,27,210,66,123,46,147,183,111,59,11,145,84,249,158,147,95,11,235,4,13,114,93,32,61,78,30,248,110,37,238,253,166,234,56,196,68,207,71,76,217,95,162,167,37,227,224,193,66,232,89,161,172,127,232,250,251,223,159,90,190,28,56,168,134,204,158,67,120,24,17,148,175,53,5,25,146,213,9,133,72,145,93,48,232,208,91,169,151,172,30,244,235,242,171,140,101,243,183,89,105,190,231,54,75,72,24,35,251,2,66,222,183,132,89,66,174,95,143,17,242,1,112,149,159,104,12,42,146,37,113,59,242,124,28,80,55,239,121,216,128,139,74,50,9,232,233,158,175,104,173,243,181,12,181,199,129,173,106,80,22,40,39,137,107,60,203,67,203,202,10,137,47,247,227,6,105,228,129,176,13,104,53,137,43,223,159,
+228,169,30,61,147,128,74,241,141,231,42,94,71,235,120,150,58,154,199,80,168,226,248,223,37,32,228,248,34,142,95,250,251,34,63,226,71,95,228,240,232,235,15,232,184,253,141,147,102,2,249,144,112,115,150,62,231,92,110,79,191,139,116,160,230,85,192,239,240,34,1,62,77,84,127,243,143,69,5,124,82,214,75,237,235,47,75,89,254,245,52,16,105,234,237,74,40,141,246,3,244,223,35,141,93,202,76,124,32,7,14,24,20,146,248,58,170,48,144,2,225,126,124,170,252,126,124,8,77,10,22,252,128,164,142,1,77,156,66,131,163,26,98,208,189,198,13,33,103,30,65,217,128,164,255,80,205,120,152,91,88,131,92,221,133,160,35,172,71,128,103,8,6,249,128,240,157,215,76,123,171,31,32,32,172,175,197,1,222,169,241,75,119,215,95,13,32,90,34,30,134,2,22,155,6,12,175,188,34,232,149,175,67,186,199,104,131,1,222,103,120,117,242,138,30,12,242,98,165,121,29,42,35,202,109,240,174,193,96,249,43,183,197,210,86,119,4,40,233,251,179,112,206,224,67,106,
+86,154,127,148,219,97,198,111,4,174,2,14,160,153,0,45,203,243,15,244,225,139,14,7,153,232,94,230,32,233,90,16,182,16,136,24,209,3,245,13,20,36,82,42,4,194,151,129,216,194,220,194,23,2,33,247,66,63,30,55,227,166,111,16,8,235,9,113,91,133,192,19,110,171,232,8,214,109,21,4,242,117,91,85,159,34,78,158,40,26,76,253,129,252,21,200,90,119,239,187,150,120,90,91,164,46,65,254,54,180,113,65,27,135,234,90,7,191,174,195,40,104,123,225,80,235,38,97,245,33,26,170,219,193,16,50,213,157,96,248,252,109,186,192,32,169,211,79,222,190,159,238,237,231,135,116,47,83,2,12,145,87,175,134,20,230,251,143,69,39,252,27,209,163,192,189,250,159,229,231,217,3,129,184,33,255,223,207,141,188,159,251,7,118,91,213,11,33,110,171,192,162,219,42,160,60,83,100,157,145,57,2,221,6,251,163,144,208,53,28,132,128,209,24,62,123,118,142,82,169,205,71,31,233,38,96,216,37,243,87,190,90,164,194,170,128,17,147,225,112,195,128,207,25,102,99,
+216,233,217,133,203,165,182,52,196,89,143,70,243,143,221,12,167,57,173,75,239,109,245,116,111,4,60,237,43,194,191,127,12,96,131,149,116,181,171,56,183,126,44,254,174,183,32,229,135,43,79,180,255,243,60,208,155,21,48,136,247,102,197,17,42,190,89,193,151,121,110,86,120,128,94,95,173,248,241,64,239,171,32,111,183,85,83,228,173,15,2,166,107,175,171,60,27,164,239,26,117,96,127,234,175,199,13,1,57,252,37,13,140,57,214,210,245,235,64,151,141,148,243,196,185,32,27,205,233,137,179,1,12,9,212,185,76,189,218,233,157,221,134,221,117,192,161,79,84,31,40,152,142,229,7,9,134,11,254,169,151,31,114,93,14,48,100,93,92,130,120,251,1,0,25,217,192,184,184,137,195,141,157,223,65,224,65,221,16,8,252,255,229,220,9,196,157,160,50,216,157,160,100,232,29,104,62,228,14,52,230,120,23,126,8,4,2,186,24,130,54,106,101,100,82,106,116,219,178,25,244,1,20,101,231,21,172,227,187,202,2,108,57,27,232,107,14,32,163,74,116,227,93,229,58,175,
+160,153,244,25,130,105,193,101,54,132,127,91,229,121,231,99,84,152,127,156,74,149,249,71,211,208,158,154,72,97,64,64,116,249,33,213,173,129,8,219,153,64,157,178,198,171,208,202,4,192,5,180,154,63,144,91,157,15,120,119,235,2,96,120,40,16,125,8,168,11,57,248,107,117,245,227,57,66,32,255,81,255,67,32,212,91,119,128,191,253,174,1,1,173,131,240,182,10,244,183,183,85,120,24,207,249,115,128,177,72,133,103,48,23,116,112,63,26,8,200,242,227,209,156,154,56,107,192,144,64,156,195,230,43,16,176,191,219,80,122,191,14,46,85,185,122,101,225,71,217,166,6,131,29,80,146,1,218,3,48,196,170,78,21,58,253,160,66,227,211,26,0,72,172,44,4,101,215,213,144,131,22,20,92,81,186,247,151,217,45,63,116,93,5,241,220,125,245,33,244,255,245,220,232,219,42,8,164,126,91,165,1,184,222,228,78,148,189,203,157,84,112,151,59,98,0,200,221,182,68,126,227,91,96,96,35,12,27,121,219,85,42,38,95,49,244,17,11,141,107,184,82,41,16,12,152,
+221,64,41,49,178,237,91,57,193,53,87,137,200,222,195,117,135,217,173,77,122,51,104,248,214,250,135,155,202,3,37,5,196,29,129,34,19,87,94,68,89,218,231,251,37,84,122,191,228,19,238,151,117,234,253,18,130,186,95,254,224,238,151,110,248,253,210,243,117,191,140,36,175,151,75,122,75,177,178,17,212,199,168,166,240,209,59,167,61,138,122,195,188,116,209,146,30,12,39,228,15,13,254,189,207,113,53,65,206,134,10,206,212,17,205,156,251,236,201,97,244,165,209,35,197,195,0,84,97,5,108,38,47,34,87,146,234,84,129,175,77,41,50,161,247,67,53,179,136,147,113,10,42,144,43,101,65,234,216,76,69,48,122,107,133,211,63,235,112,74,169,142,251,27,164,253,2,55,62,23,174,77,38,72,162,143,225,145,143,219,136,247,153,99,164,172,62,131,225,101,242,31,127,168,244,111,187,72,242,189,147,79,158,208,49,3,177,69,22,245,215,180,217,43,10,207,112,223,117,249,249,59,82,91,121,104,139,118,222,71,168,108,112,246,154,18,95,148,16,107,27,134,92,209,81,60,
+246,2,150,157,22,3,226,239,218,199,167,7,219,147,39,75,198,254,150,8,182,39,238,53,70,33,239,104,16,122,243,62,11,84,170,68,38,204,39,21,0,68,249,164,206,21,222,104,243,217,131,201,95,25,195,191,205,130,34,9,198,225,245,242,157,124,191,52,162,238,151,104,55,184,76,254,27,111,125,244,138,247,159,7,3,21,19,174,219,141,55,247,54,244,25,130,184,186,203,12,244,24,8,65,34,2,147,222,216,161,229,67,111,236,128,226,125,55,118,144,167,207,128,29,85,109,102,251,70,67,221,24,114,231,33,174,7,215,46,138,143,47,111,8,204,157,70,228,228,149,70,213,4,6,70,30,95,3,18,235,187,229,1,106,191,216,123,251,44,213,185,240,127,241,11,123,93,189,167,126,161,3,19,73,30,120,190,9,249,128,94,67,0,14,99,241,35,231,211,203,255,237,28,214,47,19,191,221,213,120,222,168,208,235,78,132,235,223,185,54,198,158,90,77,165,149,180,230,19,251,97,246,61,212,56,214,161,179,66,99,48,155,93,219,77,3,31,119,93,142,250,108,220,105,155,254,
+126,106,46,235,110,132,153,206,229,142,166,195,250,207,54,113,30,14,49,219,196,126,90,143,202,221,24,232,63,85,14,243,158,230,90,166,194,49,141,115,219,192,107,236,206,233,32,35,235,114,55,145,218,219,227,179,125,55,119,8,131,20,123,136,244,28,121,111,20,180,191,18,14,106,250,73,126,245,162,72,212,151,99,228,221,207,89,189,102,146,112,244,195,82,126,113,129,189,215,253,116,173,11,78,83,106,146,142,142,253,102,236,24,170,227,182,177,33,29,179,141,135,31,130,252,206,117,252,221,147,216,35,83,81,204,30,143,173,179,111,246,229,92,223,184,46,213,201,121,195,96,215,143,29,47,209,108,4,91,197,47,203,184,180,22,151,37,35,70,198,45,238,56,80,36,255,26,60,181,246,47,4,176,142,220,255,241,96,175,58,158,223,21,64,161,1,241,177,10,100,44,240,122,43,251,66,199,0,213,120,68,209,17,58,64,142,29,13,141,124,6,160,8,129,235,200,247,229,32,25,221,150,187,17,247,229,100,247,125,249,20,113,95,142,248,103,249,145,121,95,14,37,220,151,215,141,
+84,186,80,41,115,25,56,154,178,233,207,75,114,189,28,47,167,13,67,89,60,204,175,254,92,229,236,229,26,163,35,225,157,21,251,160,132,87,209,254,24,61,77,146,99,29,16,152,73,17,158,235,2,69,167,94,158,109,27,117,126,167,233,167,37,245,101,58,106,53,87,166,222,85,190,30,187,140,140,249,218,105,245,158,205,215,118,109,67,127,146,182,135,120,187,14,115,74,145,196,236,35,67,122,241,77,100,111,6,50,201,236,129,169,239,44,123,73,162,224,155,56,151,187,126,234,110,8,157,78,23,60,196,62,26,90,239,131,173,53,35,123,31,172,61,190,211,121,58,140,93,151,115,141,214,222,20,126,209,47,14,229,254,207,92,93,151,199,67,219,200,84,254,211,175,152,185,242,196,152,205,149,115,99,139,40,191,171,159,184,131,188,235,216,214,92,108,51,124,253,120,236,186,142,245,137,99,117,62,213,203,151,83,253,178,170,95,28,237,250,249,75,97,103,240,77,215,58,7,6,249,255,91,183,239,186,124,125,175,12,185,189,224,194,222,86,65,33,63,183,85,206,103,233,101,99,
+192,112,110,58,196,185,41,104,11,255,105,104,223,114,200,236,154,232,145,160,252,21,254,252,59,158,176,176,198,211,77,111,43,144,155,222,66,174,47,115,255,31,227,159,2,182,120,187,69,239,22,228,217,193,209,109,22,195,192,214,152,171,212,126,28,55,75,56,223,204,199,216,182,133,235,243,4,246,155,250,211,235,212,120,123,94,252,59,199,37,188,121,127,121,174,238,172,71,29,115,210,11,100,53,85,118,93,47,118,109,247,171,115,86,126,220,76,234,93,215,65,125,25,29,204,187,137,51,120,105,214,120,59,141,43,118,217,153,218,103,188,102,206,187,92,94,46,127,250,99,253,226,122,185,180,40,71,63,47,220,101,168,194,154,42,43,126,153,122,143,104,94,43,88,63,104,92,173,224,217,200,221,204,39,14,218,197,181,136,30,135,154,110,253,239,160,186,132,20,59,70,172,30,3,97,125,158,233,27,71,188,166,197,187,212,156,96,191,221,23,126,56,143,219,41,151,125,63,124,164,196,59,12,101,160,228,90,23,206,143,254,249,146,228,226,92,122,175,199,19,156,212,233,70,195,241,
+46,151,205,211,75,234,57,1,157,231,176,93,226,14,222,206,54,14,213,103,254,243,57,167,60,70,152,59,98,121,28,174,207,195,103,201,126,121,140,154,219,147,221,199,235,229,180,218,13,155,234,112,125,17,61,135,230,138,69,190,242,8,232,52,63,138,24,29,141,211,240,113,73,126,237,100,233,248,162,203,227,197,133,243,77,151,67,113,29,254,142,70,97,112,167,143,71,226,104,206,51,79,251,234,58,87,142,231,191,194,81,38,169,182,252,164,24,137,69,115,243,222,223,92,127,133,179,17,65,153,123,209,29,116,131,20,227,45,34,103,233,66,48,135,163,59,135,141,43,126,89,105,118,222,135,73,120,51,100,184,122,252,243,177,238,220,157,214,225,201,166,79,169,15,53,199,252,216,214,221,84,141,174,238,34,182,3,170,182,49,247,30,235,99,219,209,148,47,183,108,171,240,196,98,111,159,23,209,5,251,175,252,84,239,9,64,76,47,243,103,56,113,126,153,225,120,187,203,185,11,199,163,247,60,254,181,100,120,244,113,174,239,133,251,58,143,229,207,180,73,199,177,150,165,213,60,
+174,170,23,180,208,106,217,202,169,21,81,85,145,82,118,88,15,27,47,201,50,113,197,79,170,10,243,176,46,87,76,230,122,43,167,12,156,184,167,213,88,161,153,215,157,199,199,195,113,81,233,186,120,237,243,121,83,145,92,120,173,243,218,92,209,161,218,22,81,120,193,59,93,168,135,31,120,229,48,177,117,233,202,160,227,48,238,142,71,230,5,0,120,124,104,18,43,67,77,123,91,59,25,55,243,176,197,181,94,87,26,95,22,198,160,30,113,92,142,99,11,173,59,199,211,219,116,245,42,226,56,45,199,50,73,15,224,12,158,52,35,85,4,164,206,203,78,248,97,190,156,199,175,232,57,129,100,39,179,109,230,205,229,114,178,28,198,225,42,225,48,25,191,28,230,155,75,157,107,91,196,42,128,143,221,78,52,20,125,190,60,218,86,185,202,178,207,182,176,39,177,234,182,153,86,27,141,155,211,202,2,178,77,180,10,108,177,132,20,139,180,184,173,238,219,148,155,160,200,130,255,84,135,170,219,223,241,160,156,169,236,186,237,39,44,183,98,233,182,98,78,219,96,147,43,90,
+244,177,128,133,123,222,131,76,48,71,55,191,219,49,135,209,188,237,68,198,203,94,69,26,75,90,126,189,11,201,139,227,217,118,222,86,200,175,126,139,7,190,240,243,184,83,182,65,186,105,61,90,4,231,211,194,207,121,180,13,255,180,21,215,217,2,119,62,132,86,35,118,121,146,117,85,120,78,139,99,83,143,172,198,220,242,42,223,175,196,108,237,253,58,82,95,245,30,135,53,135,153,22,53,89,198,213,121,217,52,102,150,129,191,197,10,118,203,84,146,110,174,255,163,193,50,112,240,133,123,244,199,2,176,53,166,113,47,199,160,189,91,244,82,79,233,190,228,207,202,173,154,63,213,236,80,219,102,213,237,135,249,78,94,25,84,159,107,220,211,47,250,111,83,172,119,243,234,200,249,64,31,173,217,19,157,34,103,106,185,206,214,67,54,175,42,106,156,129,243,121,167,89,235,227,186,203,229,160,88,83,192,120,40,159,215,69,221,95,74,84,204,146,156,161,243,212,179,206,159,54,250,48,189,85,63,158,204,128,30,69,243,164,22,114,206,190,215,171,122,94,175,113,178,78,237,
+25,237,239,112,88,139,24,35,157,198,249,124,250,69,210,254,22,241,54,239,100,42,130,108,190,102,118,117,203,184,131,118,154,7,255,84,48,100,209,255,18,118,90,230,129,245,249,248,231,133,144,218,188,45,223,54,169,213,214,231,131,126,209,121,105,149,75,58,125,183,155,158,88,36,135,124,181,120,182,141,3,49,22,141,43,181,232,15,229,81,177,220,25,7,107,199,197,90,92,102,235,204,21,242,200,81,113,30,170,198,226,80,253,30,172,173,178,107,156,226,160,99,212,95,28,203,148,232,79,196,104,105,172,210,253,193,131,44,46,226,241,217,203,97,188,14,81,255,204,173,96,49,72,209,117,209,47,76,238,199,187,237,247,248,185,62,110,255,10,239,204,98,58,22,124,57,206,73,107,33,69,39,240,119,162,104,82,252,101,219,88,231,183,77,189,23,213,34,109,29,166,195,50,89,132,62,193,245,254,23,230,168,255,30,124,153,249,214,9,239,80,143,230,60,57,122,252,247,63,40,186,181,41,107,210,101,73,124,29,119,232,147,142,195,53,126,109,170,116,172,248,226,208,59,50,251,
+150,109,19,31,235,173,81,83,217,252,71,47,27,58,230,186,221,22,20,43,138,68,83,104,252,241,187,95,195,137,186,161,138,65,55,234,248,39,56,74,233,190,22,199,64,176,231,12,17,178,157,234,71,218,214,21,51,35,79,39,105,143,69,155,73,223,137,62,116,86,131,8,201,213,10,59,47,78,253,188,221,81,216,38,186,250,145,82,60,189,191,45,86,121,166,102,232,12,29,103,95,157,69,52,174,15,51,186,206,195,89,185,232,75,152,174,147,83,181,152,249,153,162,240,86,207,59,81,119,63,112,70,228,48,233,214,14,154,201,98,108,99,110,106,65,54,168,177,58,81,179,126,163,113,189,236,70,198,200,167,66,211,170,157,45,11,110,42,204,252,194,235,53,7,59,121,119,222,69,244,201,120,135,174,10,217,23,15,145,78,95,162,143,59,79,204,93,3,27,105,146,166,221,151,147,97,49,245,250,153,187,133,158,228,124,134,50,205,26,253,102,220,201,199,56,145,211,166,61,254,117,152,245,135,117,103,188,179,233,55,53,166,229,196,88,71,148,69,38,83,127,214,153,107,44,75,
+155,46,136,68,205,221,177,253,253,146,46,177,44,103,107,132,109,204,119,212,78,235,34,223,166,49,251,105,29,227,92,165,91,90,79,145,47,12,163,171,182,107,245,43,245,160,99,95,232,176,62,74,135,179,208,81,36,93,130,56,26,226,236,58,157,73,195,23,65,96,153,179,126,83,223,244,119,190,9,205,32,231,56,239,100,164,154,72,224,145,249,235,213,161,36,28,50,211,106,88,24,43,51,102,147,20,229,108,87,153,206,143,59,2,57,67,153,116,122,228,23,205,239,62,56,12,139,192,43,150,9,39,69,56,83,247,91,167,126,210,159,246,45,246,186,162,79,219,54,29,44,163,170,115,236,219,251,203,58,178,236,61,246,107,107,135,62,106,98,170,76,237,208,159,165,221,209,71,11,58,246,132,83,236,9,4,17,20,187,99,42,240,225,250,218,158,41,192,15,124,216,255,232,163,64,224,202,107,102,53,55,36,178,237,173,169,97,94,156,87,238,131,154,26,247,252,139,214,44,55,117,9,136,216,210,101,83,221,179,39,169,138,34,39,4,17,123,162,101,243,125,141,43,114,177,156,
+119,251,221,124,217,29,242,68,174,147,225,20,68,73,250,36,87,76,83,118,209,207,61,193,18,205,211,139,65,14,62,213,14,198,254,166,30,117,45,98,147,189,202,156,154,56,153,227,115,147,184,28,106,68,219,250,201,120,154,135,251,64,143,151,141,175,62,163,87,143,128,242,123,111,97,116,83,120,186,136,161,94,70,92,167,229,94,38,145,165,128,30,215,180,124,252,169,208,236,251,95,130,155,56,143,7,244,96,89,129,147,132,221,88,180,110,191,92,246,206,67,106,116,30,245,139,250,244,166,194,163,56,135,234,37,119,179,18,118,163,161,56,135,57,113,142,76,75,149,89,24,148,196,227,160,126,220,143,80,236,84,190,206,115,110,198,214,165,49,47,212,244,173,242,211,23,173,31,254,209,196,235,235,226,254,105,30,78,49,170,84,231,143,11,182,220,117,37,113,7,206,204,13,8,37,241,216,142,119,90,239,149,250,212,186,203,121,116,158,150,203,90,95,34,242,19,195,188,237,126,176,143,60,47,123,236,100,63,41,72,9,190,41,66,52,184,59,253,28,239,123,137,229,204,47,74,
+146,44,226,83,38,217,111,8,72,17,210,51,249,60,26,214,211,104,222,203,216,146,215,156,166,158,62,60,66,138,76,92,151,125,221,122,74,31,38,220,218,130,27,95,78,106,253,234,186,22,220,12,104,181,95,52,111,185,46,75,64,228,218,46,253,120,95,101,10,205,39,239,95,123,125,52,245,7,224,173,1,79,103,81,108,177,185,192,119,64,107,251,190,0,207,98,105,13,255,238,47,165,42,41,237,51,34,182,94,161,205,139,115,202,160,170,198,189,236,127,209,25,0,109,42,167,6,241,80,29,252,150,39,105,0,237,185,59,35,101,242,117,145,115,116,212,173,190,24,178,246,42,156,230,157,232,251,101,57,157,145,240,132,206,115,227,195,248,87,28,244,83,138,12,154,39,118,110,249,248,85,237,32,19,133,83,155,137,157,178,63,140,50,81,246,68,92,219,10,86,95,165,161,44,95,143,58,70,199,185,220,225,88,165,26,97,25,3,164,218,169,250,115,96,233,166,226,78,35,187,244,161,93,69,244,18,153,228,37,228,216,181,206,3,15,44,211,36,73,182,32,108,87,83,175,236,
+17,13,110,79,221,131,75,205,158,57,109,36,157,83,36,104,52,138,198,142,165,121,21,119,200,108,147,121,172,186,235,14,214,101,121,90,223,17,117,34,129,89,117,63,28,236,151,25,90,212,44,1,97,187,226,122,137,178,161,38,94,229,28,70,131,129,34,157,63,215,152,214,6,46,211,14,51,36,106,135,97,53,243,126,201,240,154,72,148,123,98,89,47,199,140,165,219,20,139,35,193,232,11,103,198,50,200,86,29,166,44,4,114,46,72,185,3,155,33,157,106,126,139,98,91,135,113,53,15,202,146,73,65,90,224,23,127,19,230,1,238,182,49,216,54,9,105,47,74,136,34,197,166,220,69,100,144,224,103,170,143,126,241,126,19,63,197,87,26,153,151,20,95,149,135,12,235,246,39,83,159,56,101,167,77,124,164,143,196,7,19,71,250,240,87,126,44,141,204,25,181,205,40,220,175,66,35,173,55,55,56,140,210,229,49,219,191,79,243,82,229,17,109,84,106,224,51,29,182,104,111,170,125,172,108,117,81,201,84,209,174,194,117,177,39,87,214,180,91,30,137,27,65,188,214,229,
+29,244,181,46,15,225,67,133,245,82,152,87,71,213,131,34,165,226,176,238,188,106,82,16,84,81,234,74,157,121,28,219,90,230,186,80,152,87,6,206,167,85,124,174,208,60,213,207,204,203,177,129,111,205,219,193,100,220,25,62,239,251,115,17,37,254,196,187,112,42,109,147,210,178,236,207,189,41,18,133,119,36,31,39,121,71,235,73,20,220,212,77,81,231,105,61,143,154,71,148,137,253,241,56,50,162,91,10,141,184,126,182,228,139,181,151,138,253,99,135,110,224,131,140,90,192,169,218,84,230,197,46,5,223,98,136,121,59,241,110,25,78,131,126,46,226,156,57,125,243,153,159,66,114,156,232,199,237,111,235,184,155,5,209,188,72,140,205,240,112,108,102,75,55,54,191,56,15,79,155,26,155,243,225,176,237,54,213,160,237,107,18,169,205,252,243,156,75,217,138,48,131,229,241,60,92,155,135,231,29,246,137,98,174,82,237,191,168,109,107,56,156,91,135,79,167,124,133,98,31,200,91,24,90,94,40,137,134,107,202,117,113,254,20,126,2,250,76,181,79,63,91,25,146,44,184,
+136,133,197,79,52,48,4,95,78,235,201,92,169,127,2,177,11,229,124,188,91,126,63,231,174,227,182,85,120,15,166,91,183,172,59,23,10,40,79,0,95,52,105,126,205,186,243,109,19,73,1,248,162,1,190,47,167,229,60,193,111,57,32,208,224,249,68,241,151,56,143,246,63,109,203,213,57,7,225,15,161,245,168,204,174,76,92,45,231,193,36,220,148,20,22,255,139,62,88,93,135,199,246,5,81,151,215,180,30,108,194,131,185,238,180,140,76,193,146,235,36,179,100,115,193,39,149,41,48,54,21,231,188,38,17,212,241,213,57,224,43,5,52,146,115,180,99,245,244,77,55,200,80,189,255,124,47,147,240,167,75,70,238,48,183,84,198,106,213,153,151,196,173,139,47,245,247,121,219,191,233,215,87,199,195,200,143,83,210,184,151,173,223,159,151,130,235,93,219,207,152,214,151,202,122,109,86,92,118,185,188,115,105,22,236,73,184,160,154,242,235,2,109,110,152,1,74,141,198,175,31,104,138,125,211,169,249,159,68,220,137,211,95,158,197,108,220,137,99,146,157,117,216,92,141,107,
+82,155,13,20,92,141,221,149,74,214,106,179,84,216,206,213,56,11,179,79,252,158,27,119,228,103,127,122,62,23,207,88,219,23,145,87,127,58,190,178,239,90,30,63,37,190,84,22,18,233,89,161,201,37,57,75,254,217,212,203,37,57,50,130,153,27,206,93,116,215,178,202,229,226,63,109,86,7,131,113,117,188,252,229,250,221,69,10,11,219,158,54,220,157,163,232,208,219,92,86,133,218,186,174,29,78,196,119,211,243,203,115,173,118,152,56,54,224,31,146,99,131,160,44,230,159,144,24,159,76,246,145,17,24,79,129,220,74,169,43,147,143,41,60,168,95,216,143,187,99,110,19,147,106,198,160,195,58,63,214,131,151,224,8,139,29,189,191,95,70,201,228,232,247,119,116,121,125,29,65,161,35,80,157,140,94,94,70,106,208,49,198,98,163,245,122,116,49,153,70,116,250,72,124,17,143,190,191,71,251,253,101,84,42,1,165,24,93,66,161,209,124,62,210,93,116,163,167,167,209,219,219,101,4,131,141,142,199,209,165,82,25,253,253,141,34,151,200,104,185,28,101,50,151,17,149,
+58,242,249,70,23,4,98,84,40,140,158,47,207,163,64,96,52,157,94,70,137,196,232,231,103,68,113,187,71,151,203,168,30,172,143,52,154,17,137,36,28,153,205,35,6,99,244,36,145,140,208,232,145,45,104,27,13,135,163,112,184,50,90,44,70,146,184,89,200,115,148,76,198,170,169,243,94,116,30,54,135,181,126,52,98,155,77,154,218,162,234,92,246,15,21,203,100,148,150,152,227,156,194,214,57,111,29,126,60,163,245,233,96,218,76,106,103,87,222,101,114,245,97,242,168,211,188,132,37,164,25,42,233,193,193,207,228,79,151,25,140,112,217,186,46,230,188,52,207,190,108,92,50,65,110,152,233,17,6,34,99,82,164,147,211,190,241,200,79,41,131,221,214,89,4,153,193,113,155,148,242,233,108,215,81,139,243,249,191,93,23,19,14,241,189,217,76,136,246,151,199,240,143,113,254,241,109,42,7,12,13,38,51,210,100,155,143,223,214,234,118,111,156,5,179,10,1,109,0,226,56,21,16,131,131,18,230,190,183,217,34,141,241,7,174,23,152,134,15,214,32,14,135,223,207,166,
+167,79,242,172,253,133,129,216,190,219,237,102,234,105,214,248,245,124,152,187,28,238,212,24,139,179,37,98,194,31,133,242,61,155,53,123,88,233,108,91,248,48,180,158,57,207,218,245,134,125,112,30,136,213,234,183,58,118,108,250,209,239,170,104,1,90,26,252,141,77,38,83,128,197,102,17,86,171,239,25,139,213,204,210,222,117,208,84,161,54,86,170,140,63,116,6,27,143,39,238,252,187,111,187,189,25,123,224,188,43,194,207,143,191,145,191,176,94,44,124,166,80,120,68,44,246,123,187,109,62,253,41,223,173,165,103,166,182,79,32,153,81,40,22,15,14,39,66,161,223,151,243,69,64,34,37,195,97,120,111,60,94,46,244,86,178,141,205,229,18,31,30,182,223,229,178,192,104,76,122,83,41,240,205,113,126,241,109,123,143,201,76,70,218,107,52,236,135,252,118,50,164,207,246,171,102,118,163,248,198,51,136,221,24,130,25,231,234,94,92,99,131,125,238,219,78,249,51,71,221,217,28,87,191,47,221,83,120,27,101,100,142,10,199,43,3,241,249,122,222,79,123,200,87,231,0,
+127,100,180,0,74,121,190,42,207,62,111,92,240,220,124,152,232,17,46,39,13,203,35,210,29,187,46,20,192,137,207,96,183,116,22,120,102,176,221,38,249,0,39,231,81,139,241,125,163,94,19,124,242,243,150,122,132,147,186,63,115,226,112,82,99,22,254,188,229,157,25,37,78,79,59,196,32,52,102,182,159,71,124,102,146,144,145,67,63,223,41,228,32,234,41,232,22,186,89,24,4,252,101,226,134,254,2,148,10,117,51,69,169,98,254,20,32,158,4,138,108,128,64,160,112,200,59,184,65,167,19,38,139,5,170,88,244,70,176,132,223,65,72,107,233,63,63,243,204,4,34,243,219,254,77,240,122,81,30,207,209,123,113,189,106,226,9,98,186,217,27,155,150,235,22,203,90,34,142,84,168,25,157,238,77,83,94,223,223,147,137,250,68,170,50,66,50,121,182,92,65,164,125,211,80,58,157,55,136,245,191,74,3,137,66,47,48,138,155,91,29,150,78,255,76,44,22,81,4,130,119,94,98,189,138,190,200,84,109,43,16,208,250,190,152,63,141,6,33,153,68,97,2,24,111,225,
+249,85,232,115,147,169,45,12,70,187,253,221,49,143,71,194,203,203,22,181,217,192,21,10,207,164,88,252,233,245,180,102,147,185,80,98,41,85,196,38,157,142,90,44,188,148,129,4,229,39,17,196,98,9,234,176,33,110,198,207,169,113,85,87,113,141,63,246,243,175,233,236,237,183,178,182,120,101,105,84,211,15,35,162,73,236,135,23,3,200,200,221,130,163,60,181,104,46,76,103,31,182,143,186,254,123,60,153,103,176,165,149,123,190,40,46,233,161,113,79,252,22,105,114,195,172,220,145,146,201,242,210,229,220,82,179,138,211,97,209,158,196,171,174,26,239,103,47,218,145,10,8,25,184,21,12,74,122,137,231,23,219,189,250,156,191,140,185,47,209,156,209,117,82,116,223,151,147,77,173,215,95,158,134,249,209,62,175,89,102,228,47,15,159,73,74,112,255,20,236,186,140,34,9,121,201,158,177,247,156,152,235,253,149,90,175,231,155,239,251,103,82,78,163,30,120,18,164,41,100,79,248,118,25,132,199,122,37,19,143,15,187,250,206,82,175,223,247,251,232,83,75,120,110,124,186,
+158,76,98,30,51,73,34,5,135,104,244,10,14,223,207,156,206,211,68,227,180,157,203,245,172,104,210,75,116,205,230,126,185,188,138,250,163,251,239,239,211,201,209,116,170,99,245,180,64,179,80,231,242,185,65,56,204,91,137,68,251,70,227,52,254,125,117,242,221,60,70,92,18,15,38,187,237,254,81,175,95,245,251,251,12,38,115,154,235,156,239,73,59,143,167,33,17,179,254,185,127,40,16,172,126,127,5,123,173,246,20,192,56,143,210,192,100,162,217,172,130,217,195,97,8,10,191,159,241,120,207,96,56,40,27,202,249,11,239,112,56,154,181,239,239,73,91,100,118,105,19,108,246,144,103,143,39,217,204,126,52,186,186,108,38,195,73,37,89,247,219,101,174,117,244,210,54,227,206,141,175,147,101,113,218,167,37,75,63,105,216,34,241,114,60,187,180,110,52,199,93,7,243,185,142,191,164,46,105,100,244,40,159,128,56,74,72,121,91,206,222,35,213,236,27,106,100,31,196,17,55,231,87,28,38,151,213,192,248,18,19,165,78,93,151,149,137,252,148,48,134,45,29,151,155,145,
+31,182,73,73,254,177,231,107,128,146,126,74,185,162,244,16,103,231,29,23,77,115,190,154,128,170,187,240,87,45,39,205,86,122,216,223,26,108,159,9,92,174,90,144,252,3,32,1,140,30,103,65,235,83,208,108,20,61,11,158,86,108,182,213,254,80,51,191,191,122,201,220,57,93,81,46,167,85,106,203,128,31,48,235,222,224,15,144,234,92,55,158,37,47,102,45,159,205,78,71,73,177,129,88,178,74,167,109,86,44,182,186,253,24,147,151,25,48,141,205,178,164,136,132,222,254,176,34,57,28,214,151,151,106,126,195,80,235,211,249,154,250,56,28,166,141,134,30,203,193,90,18,137,214,253,158,83,29,169,212,214,82,254,156,21,41,164,9,26,109,214,15,133,150,95,95,214,199,207,207,234,217,169,54,159,243,12,138,32,28,74,85,218,173,94,42,181,148,249,101,214,86,171,218,120,251,81,171,99,12,182,2,191,192,165,190,190,7,159,222,151,213,235,171,245,231,167,58,254,225,199,234,245,238,48,174,88,204,83,187,109,15,94,169,44,213,106,171,4,37,169,226,25,86,155,141,
+199,37,18,99,161,80,119,240,251,122,88,71,54,219,205,123,44,18,217,252,64,203,227,243,169,202,181,89,119,108,243,42,175,238,171,89,149,100,213,46,181,109,236,177,205,128,58,222,206,120,213,95,175,21,142,94,129,20,214,95,79,114,167,213,176,110,157,88,249,162,175,9,209,193,167,226,86,143,112,175,6,179,202,214,87,118,190,234,91,112,154,12,46,198,129,49,39,74,133,228,180,18,242,83,193,232,13,219,58,85,70,126,130,110,147,10,250,37,38,204,166,112,200,18,212,29,174,118,135,117,87,126,110,25,149,54,19,195,159,105,93,28,149,85,120,209,105,241,244,29,254,1,145,164,10,19,197,167,85,40,252,90,233,213,157,153,167,64,105,167,82,169,160,252,106,197,159,105,204,74,156,24,126,205,47,173,86,163,18,11,200,131,145,44,68,122,62,84,144,30,131,97,12,175,195,37,36,114,116,180,255,172,215,57,155,94,192,109,178,82,177,216,192,239,175,27,5,130,210,227,227,168,153,32,175,167,137,114,221,165,25,13,211,235,101,239,98,179,25,185,220,210,195,199,3,40,
+249,76,198,172,164,92,81,142,254,50,38,142,161,55,28,24,140,198,102,73,46,31,181,69,166,71,123,165,156,19,171,100,158,36,157,214,199,227,12,132,221,174,196,225,140,214,51,147,73,159,102,191,168,43,209,104,86,44,236,81,244,79,6,44,182,244,241,129,24,69,8,38,121,136,61,127,124,37,226,211,40,196,67,15,14,51,64,161,165,163,203,165,34,145,114,233,88,122,248,251,186,90,101,249,86,219,144,203,53,62,76,31,74,54,155,202,104,60,228,82,169,195,209,178,62,21,245,163,166,191,132,110,144,140,164,151,222,164,202,75,215,44,2,199,46,93,59,140,88,235,121,123,52,66,226,75,250,174,81,66,141,245,73,188,252,139,51,169,116,108,19,182,141,102,191,222,140,71,174,179,104,113,18,227,75,135,90,194,135,255,124,77,184,62,150,69,88,162,190,250,194,167,242,199,141,139,101,44,9,50,169,62,53,68,252,124,165,60,134,141,58,230,183,92,149,61,30,165,143,120,35,159,231,236,249,222,136,137,95,233,35,198,112,116,118,138,167,3,145,161,216,109,230,49,111,103,
+88,115,102,95,181,5,150,56,237,253,209,245,122,128,200,226,93,112,21,242,138,6,53,39,47,67,14,178,84,42,226,229,81,90,172,100,126,102,105,22,145,72,132,245,114,178,188,177,160,68,161,140,11,133,130,69,206,40,149,31,61,237,115,52,245,212,153,206,146,122,151,134,201,54,167,35,145,158,88,98,156,80,40,44,44,54,90,240,60,119,150,25,189,93,233,99,114,50,4,16,73,142,189,193,225,96,141,199,149,104,158,33,22,120,211,139,154,186,63,202,26,12,235,30,139,101,32,18,89,179,253,62,58,82,137,173,219,82,186,40,147,73,19,94,42,173,31,10,27,191,252,95,172,207,207,232,217,185,21,107,226,20,138,32,216,12,165,90,32,146,210,47,70,153,140,213,106,69,97,141,55,177,179,70,97,147,20,88,108,210,247,61,56,124,122,141,175,175,172,159,143,159,232,15,255,187,94,119,53,135,138,217,58,183,253,219,15,42,85,163,90,189,101,117,187,68,129,224,123,230,241,128,111,222,77,201,92,161,52,120,113,229,51,246,147,124,183,12,44,226,211,215,111,159,111,49,
+217,188,116,214,163,104,148,77,99,13,243,6,134,102,168,84,87,18,28,135,194,178,93,133,22,199,143,206,212,244,27,133,194,89,142,67,195,104,219,12,215,227,204,231,49,141,28,157,38,61,220,77,245,56,251,218,77,245,144,178,242,229,53,37,163,133,140,181,207,87,122,56,171,99,106,75,242,236,229,40,165,83,240,89,158,83,250,245,38,50,38,164,116,76,230,216,117,238,79,7,35,67,49,56,111,98,209,142,162,78,115,102,245,133,129,121,18,205,16,80,172,88,62,93,234,13,242,154,12,21,167,223,183,195,70,166,82,204,126,204,248,222,88,238,132,160,57,27,112,98,68,126,115,176,90,25,233,10,212,248,119,53,144,179,96,153,31,133,98,64,248,118,216,61,202,90,37,163,81,74,47,221,78,70,175,31,244,31,250,171,12,117,223,248,244,57,156,234,23,110,150,116,33,72,209,168,12,28,222,28,156,207,171,58,207,122,146,248,171,85,213,248,239,156,49,155,21,229,82,134,160,82,13,58,157,85,211,47,176,58,107,213,188,68,160,150,37,243,121,133,194,169,200,182,219,131,
+84,138,179,10,98,173,210,64,117,156,224,199,194,233,110,231,34,215,235,179,76,230,224,113,185,92,149,88,86,209,195,23,151,42,140,5,18,93,191,95,209,108,102,147,254,228,32,16,88,109,63,248,86,67,134,203,81,62,112,8,153,195,65,113,58,249,179,181,218,128,68,50,78,108,182,210,215,215,168,245,37,60,207,62,71,19,141,0,196,114,185,172,80,57,149,153,78,103,32,137,227,179,164,23,25,207,153,169,179,159,165,147,106,186,238,119,170,156,51,239,105,101,150,239,231,237,21,18,31,30,232,187,89,73,92,254,74,226,166,121,78,165,51,51,117,59,64,52,1,229,94,197,184,131,137,245,129,191,223,160,106,100,220,4,185,247,128,138,111,95,148,107,106,228,129,235,66,77,202,104,114,228,167,72,67,145,157,79,19,90,198,47,223,111,147,34,186,34,224,60,38,176,62,249,107,33,33,34,75,183,199,108,243,176,145,171,243,171,113,158,139,139,230,28,39,197,188,241,158,137,136,113,30,103,34,217,151,231,53,89,177,129,133,11,101,29,71,145,236,141,146,21,62,13,200,195,
+240,23,95,106,50,251,178,31,156,65,211,107,244,59,213,159,141,172,86,73,46,85,179,30,50,14,65,200,66,248,159,63,25,160,119,114,36,50,11,244,110,176,206,25,245,2,214,140,149,138,198,228,223,254,66,182,217,148,63,62,102,225,83,237,160,23,48,106,55,252,193,36,191,90,203,127,246,251,76,181,42,7,122,151,45,179,229,198,44,58,91,81,14,6,41,227,216,32,29,12,179,64,239,228,131,65,54,75,147,63,190,125,102,115,98,185,12,147,164,49,20,56,124,150,128,68,202,237,246,108,108,246,32,87,132,105,76,217,54,20,207,139,196,242,39,7,37,139,197,202,17,8,68,182,194,145,139,191,105,99,154,8,135,73,32,145,30,217,231,103,198,227,145,159,32,16,26,143,23,242,59,253,237,182,104,62,77,160,45,22,89,165,146,137,53,98,114,134,38,179,94,111,229,229,50,205,104,12,37,63,63,219,99,245,126,142,241,181,59,98,157,49,91,103,62,75,199,213,116,21,224,100,157,121,87,0,167,193,188,157,69,226,189,242,127,112,122,224,166,185,86,161,21,224,100,220,
+104,6,0,167,108,140,43,191,226,52,254,111,56,49,175,56,205,121,184,25,50,37,78,159,15,117,107,72,150,217,205,4,169,130,50,119,222,242,169,216,47,234,231,107,138,159,152,215,119,161,205,132,86,81,235,231,85,155,136,173,58,182,15,185,96,67,86,183,187,147,186,231,144,181,186,139,239,141,243,172,66,68,27,202,133,9,106,75,247,132,241,165,158,176,33,152,199,5,236,241,53,105,236,31,118,8,145,108,188,135,170,70,99,123,32,127,130,33,169,124,41,2,34,66,65,5,149,82,74,173,150,119,187,93,218,98,17,98,62,48,219,75,195,124,158,242,89,222,95,57,236,244,3,23,196,17,154,230,245,54,67,30,79,251,226,210,157,52,241,98,90,240,55,158,230,214,235,171,107,8,163,81,136,78,111,167,253,20,221,123,178,88,215,148,149,170,108,46,35,85,184,228,84,26,45,52,159,115,218,69,166,78,232,43,54,50,66,165,52,209,233,110,21,139,5,173,88,12,61,70,34,237,111,148,78,245,16,101,62,189,69,66,169,173,88,44,111,54,105,239,254,247,80,175,215,110,
+9,249,58,123,133,73,23,19,32,216,36,10,41,131,195,60,212,243,57,196,227,137,38,12,70,170,90,237,119,160,226,229,58,103,181,202,17,92,14,117,189,14,177,157,108,17,141,150,250,252,172,239,254,152,243,32,69,68,98,50,83,153,76,191,209,124,3,93,211,238,96,58,204,191,137,237,172,34,84,11,51,168,221,184,34,78,227,36,95,236,50,251,218,30,217,245,200,115,55,116,210,174,57,66,85,27,117,107,219,200,65,127,235,243,212,217,160,192,163,14,230,104,52,136,35,133,51,176,245,224,44,149,87,74,238,26,70,200,140,28,14,154,163,87,186,194,185,60,38,48,62,156,235,226,206,97,16,56,103,125,166,57,59,96,225,172,253,32,146,252,232,105,147,186,252,185,160,68,82,100,63,90,14,117,105,109,172,134,72,63,81,204,79,209,168,184,69,163,29,70,98,133,133,247,82,138,140,193,69,163,28,228,131,164,80,72,240,103,152,198,169,250,110,18,67,33,191,72,132,204,157,248,129,66,112,132,239,119,59,84,89,168,128,244,36,61,116,58,84,189,30,7,244,238,43,67,
+109,0,189,123,119,170,159,185,89,194,136,32,69,161,168,64,239,112,80,232,87,157,247,118,50,231,147,85,85,111,160,77,45,151,210,82,153,70,82,169,112,116,250,23,192,233,237,213,147,204,75,224,82,89,50,147,87,200,181,10,26,141,134,211,233,56,95,125,217,219,71,33,9,112,146,74,19,173,246,84,54,159,83,139,69,28,192,233,107,111,125,51,62,100,31,159,222,2,161,84,65,40,148,54,26,84,128,19,78,42,253,2,56,189,217,43,143,44,57,230,231,33,135,64,201,143,167,111,154,211,137,155,76,144,19,137,228,179,90,253,29,64,229,211,117,238,195,42,135,112,174,56,225,0,78,72,26,173,177,91,216,190,244,93,156,159,68,251,233,116,112,233,244,215,73,114,192,217,54,52,243,184,37,27,87,18,21,135,124,246,177,12,206,206,246,134,35,194,252,10,82,112,77,164,159,138,126,144,61,112,156,137,191,170,162,96,12,87,223,23,146,6,91,221,131,185,238,64,181,7,119,160,146,206,173,103,206,140,156,219,147,75,216,117,62,114,8,5,229,101,234,81,83,253,161,203,
+185,172,38,7,100,187,163,133,36,233,206,235,237,73,45,88,252,219,53,203,230,57,61,124,238,92,136,28,15,57,221,159,79,242,154,182,166,22,148,181,50,22,228,155,132,210,134,9,159,142,195,112,140,47,11,152,205,237,173,253,104,104,122,31,248,115,16,239,187,18,139,131,106,147,63,132,104,207,46,132,227,80,224,143,26,77,152,193,40,182,241,248,249,110,183,131,255,41,143,157,111,167,241,44,226,113,168,36,82,184,229,247,183,5,130,249,235,195,235,238,135,127,252,113,31,106,117,205,100,68,219,92,150,1,155,181,197,229,54,231,235,245,174,204,182,19,69,95,181,138,114,242,23,167,230,243,225,225,176,77,48,26,231,114,249,174,141,22,217,237,149,90,73,46,212,200,30,25,180,32,222,137,111,239,118,243,74,197,183,91,155,236,138,240,203,236,241,53,30,166,72,132,151,0,133,210,198,98,231,143,8,196,174,194,177,139,167,223,47,52,17,9,67,150,160,145,65,239,103,203,179,246,204,221,110,139,203,85,174,228,243,227,182,104,195,91,82,109,150,96,181,26,108,199,98,115,
+134,166,213,92,175,231,229,178,197,184,49,86,82,169,243,209,98,59,246,211,187,166,127,254,167,215,239,224,232,249,161,188,105,111,198,129,73,149,246,84,119,169,93,243,175,218,185,255,116,60,238,118,34,166,126,78,145,180,252,11,82,136,196,125,154,212,115,154,186,222,239,28,50,66,199,110,108,103,174,146,95,207,7,80,136,35,63,253,167,159,4,254,243,148,45,48,52,129,53,192,200,231,60,83,131,66,221,123,172,176,254,133,71,164,212,238,233,100,142,240,201,142,8,232,142,102,173,138,154,242,87,181,49,217,170,3,40,60,191,27,193,231,72,137,9,127,21,164,219,154,183,122,184,103,96,210,228,175,130,68,75,83,15,5,106,194,98,142,78,112,147,91,163,113,104,250,81,252,158,161,8,158,214,112,168,123,52,26,153,132,48,63,240,128,130,233,104,52,38,100,19,160,51,0,68,58,46,18,89,60,218,129,142,197,76,122,1,251,133,142,136,198,66,98,49,48,191,249,127,216,248,170,238,212,185,168,221,191,142,187,67,145,226,14,197,221,221,189,64,91,28,130,20,41,46,133,
+224,39,221,239,185,57,223,249,110,90,178,67,51,178,199,179,230,35,115,174,196,74,167,55,54,230,240,98,243,238,52,75,230,226,53,231,247,55,115,185,136,70,157,142,181,88,108,172,82,88,189,161,240,213,76,191,205,87,108,135,35,3,188,190,142,126,127,173,77,119,179,241,235,208,191,101,129,175,178,84,167,99,190,172,89,105,2,241,27,141,150,91,17,136,70,87,164,95,184,106,108,161,33,151,15,177,148,234,92,165,50,34,105,181,86,133,162,49,128,203,244,193,46,155,175,83,19,41,236,68,50,43,243,203,70,82,169,21,0,226,141,119,154,94,18,30,11,39,234,253,150,126,62,195,51,126,255,104,181,178,222,56,28,30,147,185,72,4,137,188,64,32,255,245,5,142,151,6,155,157,197,227,240,115,162,224,75,224,114,80,92,193,247,35,148,155,22,221,64,67,232,179,66,185,233,187,102,202,25,9,109,122,199,171,240,61,253,221,227,152,180,136,227,159,141,178,220,26,122,48,90,75,136,179,109,41,231,219,156,179,152,20,27,174,96,231,253,121,13,72,57,202,191,166,209,102,
+138,46,253,53,141,56,138,59,30,44,191,209,211,161,91,149,70,136,87,164,239,151,249,169,87,129,135,47,143,117,128,149,98,238,60,149,227,105,173,88,56,15,75,69,75,251,23,147,146,179,44,144,158,29,102,243,86,173,82,51,41,62,222,132,172,40,157,145,169,48,146,25,175,67,169,100,40,135,124,126,197,223,245,90,220,210,4,109,118,241,30,220,203,2,33,86,249,252,148,104,113,217,218,151,130,107,33,29,206,13,175,93,209,238,212,105,197,82,110,98,27,43,108,182,202,108,134,157,125,176,14,131,168,151,22,52,10,133,47,20,106,49,135,197,40,144,200,202,246,241,152,245,196,118,215,177,214,236,24,150,63,12,240,120,72,183,90,74,67,202,80,97,179,103,85,102,204,110,41,55,123,38,195,218,240,242,245,145,214,189,137,21,144,92,236,118,51,74,131,103,87,196,155,31,110,133,65,207,26,79,114,163,253,94,233,241,84,244,56,253,44,137,177,27,10,242,215,215,183,66,145,173,162,41,51,76,134,98,11,41,51,151,11,221,130,29,38,139,190,138,140,100,114,228,5,131,
+205,33,145,74,0,14,175,132,66,90,170,139,250,81,173,66,33,86,240,251,251,226,117,167,133,8,161,146,66,169,64,249,86,75,38,127,100,179,63,180,190,212,225,226,4,239,135,183,251,33,125,217,72,247,31,241,248,101,45,58,4,138,194,89,129,95,153,99,107,10,142,41,103,234,34,89,34,159,58,112,111,118,47,3,212,97,90,158,129,189,103,230,180,230,172,12,13,121,199,145,243,238,247,234,3,196,126,207,43,117,86,253,255,253,196,72,44,166,5,211,113,25,254,93,67,60,95,215,248,176,228,108,120,118,163,195,140,187,29,203,248,78,12,103,107,215,59,26,80,9,134,153,71,99,96,98,81,117,174,139,13,177,223,167,140,183,207,108,84,154,78,143,240,248,162,162,209,100,208,112,140,126,161,128,23,153,34,125,64,129,147,53,122,28,189,197,144,1,234,86,239,155,16,46,201,100,9,40,88,87,145,203,49,148,202,12,114,32,27,61,186,86,23,69,205,227,209,243,165,220,85,165,82,48,153,140,45,101,155,153,106,70,163,56,96,181,43,120,144,8,46,79,185,203,69,17,
+8,12,25,34,81,166,198,81,144,109,213,10,20,153,230,46,166,221,158,126,229,43,169,100,50,3,131,201,116,176,66,133,42,89,233,24,82,90,61,235,227,35,157,13,100,21,208,178,25,12,218,153,50,93,33,9,51,132,28,117,38,67,31,77,194,57,171,77,201,227,49,232,118,59,116,63,10,207,177,193,224,106,240,84,14,63,14,21,147,92,89,78,150,25,56,92,166,206,133,41,20,113,6,75,129,167,224,104,224,53,7,233,148,178,219,101,148,74,120,200,151,199,63,63,7,11,156,126,123,96,185,221,105,228,98,161,112,58,25,80,14,192,163,209,241,118,187,183,27,225,71,101,57,190,164,213,198,227,241,221,233,100,28,29,151,25,40,63,49,230,255,144,34,25,187,44,129,79,237,1,239,205,221,205,61,154,14,202,25,8,169,227,218,197,89,52,228,13,71,174,96,221,171,71,16,82,161,231,249,31,82,126,26,225,31,82,19,212,229,15,41,240,59,134,181,164,21,143,235,110,109,9,75,198,251,196,100,221,35,158,253,91,223,251,105,64,73,229,199,68,93,47,248,98,171,15,
+92,175,235,56,9,195,45,114,232,161,135,225,241,155,205,239,149,4,45,107,155,227,112,7,140,140,223,161,84,81,24,9,62,127,224,239,78,72,49,188,203,25,159,247,231,3,253,23,41,54,160,127,126,90,80,248,218,151,54,14,147,36,129,56,228,199,7,137,196,54,138,8,131,171,162,223,167,19,209,69,236,82,1,175,86,247,18,195,225,192,98,217,34,211,56,16,172,251,221,27,141,136,75,59,253,226,71,215,107,34,16,24,172,220,171,237,68,237,150,199,144,237,47,213,106,249,226,18,185,136,252,215,56,153,60,28,92,46,219,165,193,221,247,54,219,159,74,163,166,72,227,112,136,185,92,130,164,84,14,100,178,109,223,34,117,135,122,2,190,78,94,204,208,39,223,120,91,208,26,159,205,6,31,31,241,237,206,234,214,102,4,75,154,132,66,100,166,226,79,156,92,158,160,211,7,244,205,102,91,215,184,21,176,186,128,165,128,192,154,92,207,248,251,45,222,221,118,7,84,170,197,231,227,215,19,137,197,72,241,232,111,163,139,181,201,233,72,191,180,90,68,131,33,65,45,137,
+137,226,0,51,4,156,101,78,27,147,255,58,35,20,242,241,211,154,208,92,247,216,61,183,52,8,30,11,183,179,21,28,28,19,91,207,126,80,85,139,19,41,42,145,42,122,169,61,127,57,224,243,177,117,136,2,131,142,47,238,11,158,8,161,62,194,30,42,222,47,93,72,168,164,220,191,230,4,226,189,55,252,77,16,25,120,180,12,25,122,178,241,40,89,48,216,59,60,2,184,20,19,31,184,170,7,155,248,66,237,156,46,91,116,162,210,60,176,38,72,24,92,241,149,83,158,138,229,149,132,138,69,192,229,217,244,116,85,102,48,208,225,146,38,185,205,234,111,101,80,178,69,73,100,191,191,116,246,70,215,108,49,13,70,2,73,146,182,91,101,127,123,191,49,242,102,147,97,24,24,33,187,22,223,239,125,178,70,163,156,39,77,97,63,89,187,71,251,42,166,112,200,100,124,50,149,88,199,98,50,169,180,28,118,193,52,161,222,71,75,55,252,153,209,127,79,68,175,197,27,23,10,101,199,99,187,60,215,105,148,137,143,254,135,226,103,193,250,172,69,136,63,243,132,195,33,
+219,190,189,149,191,149,26,63,172,253,241,23,159,232,168,23,14,145,64,76,160,147,104,153,223,95,94,25,235,26,95,139,245,162,204,10,211,52,165,18,95,169,112,227,153,140,44,30,47,35,110,126,141,243,139,197,76,202,9,4,70,34,142,155,71,99,113,169,84,6,184,37,101,64,146,238,245,248,163,185,110,119,100,159,17,103,188,223,31,95,173,64,25,135,67,103,50,167,247,4,145,30,8,164,191,204,95,163,165,193,106,103,189,7,158,70,40,226,29,214,160,37,157,207,31,128,19,124,250,184,151,59,190,148,172,229,74,184,86,184,178,177,195,236,4,245,94,112,19,57,172,4,211,67,112,86,222,14,101,242,148,61,241,188,43,155,161,222,167,125,66,157,214,140,229,90,81,40,91,187,37,103,103,73,252,111,18,85,209,124,252,235,156,183,107,247,45,2,245,124,78,13,44,28,234,22,164,53,254,212,41,122,90,119,80,2,10,173,192,182,110,234,81,85,21,28,147,249,180,8,173,50,131,56,188,0,254,188,208,178,47,250,138,38,202,49,161,21,112,198,102,158,75,43,8,31,
+46,23,26,244,211,176,27,230,106,129,171,213,208,131,186,126,179,44,184,189,136,55,148,68,138,35,192,143,97,92,4,199,97,163,214,68,98,20,141,238,223,224,254,63,159,107,147,35,5,34,118,177,72,80,91,85,168,225,48,90,46,99,251,105,220,102,154,118,47,220,154,197,154,115,252,5,241,215,11,170,211,137,110,141,198,254,68,109,14,96,58,245,47,213,98,70,151,56,161,130,226,163,201,73,114,212,235,237,47,13,49,179,183,89,111,104,245,127,47,144,127,193,231,114,98,116,34,17,149,201,250,131,8,220,28,234,113,249,24,93,62,67,31,127,227,111,54,27,122,54,139,126,224,62,250,59,171,89,155,105,113,105,18,18,149,147,188,39,9,114,57,154,78,151,71,113,184,126,157,107,134,41,226,92,150,130,68,74,178,46,87,226,253,142,30,118,187,209,82,73,234,115,249,222,11,133,233,66,31,62,28,88,94,55,110,137,92,160,156,206,168,78,215,147,162,209,239,237,54,184,62,104,55,219,97,63,182,199,70,177,84,212,105,237,36,174,187,47,93,175,114,235,127,116,192,223,
+183,205,178,162,236,163,137,81,155,106,130,86,23,241,84,177,153,35,242,200,110,115,147,174,255,8,161,175,15,90,107,213,84,182,61,85,16,36,115,20,144,149,60,109,255,196,10,98,64,225,159,88,65,12,184,167,1,226,91,16,150,210,51,55,30,196,105,141,50,10,40,176,2,219,127,151,232,0,43,122,221,197,153,166,135,82,121,138,168,121,76,40,22,1,248,206,49,224,60,189,132,142,106,153,91,8,68,196,236,209,50,195,67,180,91,0,139,36,81,243,57,66,255,101,142,56,85,245,206,75,152,38,129,161,208,48,73,24,168,163,114,57,68,34,17,65,70,17,192,163,107,246,97,116,220,63,125,34,2,42,53,154,201,68,88,40,150,200,84,3,140,226,48,179,95,207,21,176,72,11,18,238,114,65,65,250,132,88,173,34,53,142,4,210,167,247,178,116,58,119,50,237,78,194,43,31,77,42,20,16,24,76,228,142,13,72,156,95,239,29,67,76,243,198,248,248,192,101,3,57,180,82,137,96,48,218,145,50,93,98,126,167,45,197,166,116,142,57,26,29,113,86,27,154,199,67,
+208,15,135,72,243,85,162,196,36,104,2,125,58,207,226,199,83,196,193,0,101,73,90,16,26,77,100,164,128,73,252,109,26,148,163,96,20,54,10,67,64,32,194,168,199,3,33,22,195,161,188,27,174,86,129,21,204,184,249,125,113,251,136,48,129,16,77,161,32,124,65,31,156,76,14,103,179,48,160,47,53,187,56,254,233,89,6,30,210,155,205,68,26,142,199,55,107,81,11,40,10,35,134,22,130,57,175,161,107,38,130,17,215,97,180,221,18,247,213,255,181,249,97,1,117,11,63,66,151,35,144,88,244,245,250,100,221,182,88,32,230,234,161,124,71,220,195,84,122,158,127,208,150,167,233,114,248,55,57,156,253,115,129,210,224,28,114,129,241,231,83,180,46,13,183,158,246,195,231,62,221,156,252,231,209,224,18,39,6,54,222,205,101,93,131,7,239,243,119,238,12,146,147,207,95,66,233,170,220,245,130,35,102,198,127,99,224,67,142,132,186,72,3,249,252,155,95,52,161,198,182,46,39,56,63,207,111,122,118,200,153,68,245,58,223,49,154,24,181,60,195,194,41,0,204,185,
+114,55,165,242,17,69,140,158,15,81,200,149,19,239,121,253,82,105,175,86,53,64,38,243,182,221,62,232,117,238,115,132,10,249,51,121,177,96,68,37,109,158,215,235,57,16,184,137,54,162,71,141,19,178,49,39,189,114,100,189,158,184,152,206,93,171,9,22,10,177,91,50,249,184,7,66,123,35,165,87,141,153,222,206,131,218,215,46,151,59,147,190,191,111,80,192,217,22,45,33,13,174,247,30,14,149,74,147,201,120,183,183,238,192,70,227,70,34,1,143,139,55,228,120,17,51,5,249,82,118,0,229,170,205,112,120,182,88,110,240,233,244,241,193,10,201,50,8,49,59,73,197,247,71,88,236,30,137,60,63,44,143,91,175,23,164,82,67,189,28,113,221,143,156,30,251,161,207,189,17,10,206,160,169,187,89,46,207,67,167,243,54,159,7,149,78,229,243,188,127,216,38,141,155,186,4,82,69,219,155,56,56,226,115,55,235,80,103,216,243,196,66,103,7,243,121,247,62,127,62,175,15,101,238,182,159,156,157,147,226,166,36,28,136,43,190,100,104,135,122,110,190,36,207,82,232,
+252,188,185,34,207,165,235,65,17,146,111,16,11,214,66,119,245,127,114,245,158,255,79,174,126,33,222,29,220,145,185,239,205,214,237,119,242,79,199,174,129,154,24,4,206,251,182,199,43,60,93,28,107,207,167,78,244,146,149,191,115,65,83,111,151,30,137,144,248,184,156,113,70,33,252,235,61,19,27,219,58,211,78,16,23,109,245,38,171,190,197,239,112,116,127,20,111,84,4,40,73,35,211,48,17,38,214,234,142,227,6,195,150,205,6,247,174,189,223,211,232,46,72,163,245,229,213,229,72,240,159,92,128,76,221,39,147,117,80,46,247,247,251,221,45,32,89,3,176,90,239,89,154,207,135,191,135,205,213,235,59,11,133,126,10,151,210,109,181,38,205,166,8,194,200,159,76,118,5,49,164,201,72,169,85,75,49,157,113,252,249,181,3,222,222,192,239,111,127,101,83,233,102,240,38,55,119,84,171,167,117,26,224,123,248,189,221,237,207,141,6,210,159,207,119,147,24,147,200,64,230,48,162,185,172,103,160,84,237,6,195,51,105,187,245,115,185,221,67,218,110,178,50,56,162,226,
+136,72,254,70,99,247,8,56,2,132,195,253,161,208,85,68,165,150,90,252,201,126,150,217,159,38,30,111,4,202,208,96,177,232,231,114,76,224,241,232,111,29,91,34,135,163,84,97,180,78,55,207,186,97,235,14,135,41,191,205,38,210,26,181,165,56,68,127,162,235,250,184,236,22,248,126,219,188,118,174,153,118,70,118,103,32,12,149,124,123,7,230,180,83,172,161,186,234,210,229,126,36,246,220,125,62,50,215,33,181,235,92,135,182,199,5,112,247,196,208,203,199,97,118,157,254,75,193,119,128,254,47,5,115,76,39,220,117,37,228,196,250,38,107,163,237,90,123,242,99,213,169,192,55,34,35,84,101,213,99,234,237,103,109,187,241,37,171,124,119,167,33,152,50,35,35,190,20,239,52,7,12,92,123,91,40,24,69,165,78,189,15,200,112,167,187,144,120,79,236,106,95,110,157,142,212,198,13,16,18,14,172,239,230,146,78,103,158,111,111,143,119,234,64,177,212,221,79,198,110,155,173,77,158,205,86,31,172,211,46,195,240,5,139,66,254,208,71,33,109,176,88,79,12,19,107,
+195,225,171,103,232,233,50,81,91,173,220,18,185,26,31,127,183,62,175,216,189,92,182,157,206,213,109,174,115,121,120,173,15,79,124,57,5,190,106,123,40,91,123,28,142,246,219,230,109,149,64,187,252,2,69,235,43,105,48,124,179,5,156,61,145,224,70,163,145,237,219,109,181,50,186,30,106,44,255,37,81,200,167,70,42,245,190,90,245,80,51,153,182,66,177,138,166,17,174,160,136,207,207,97,201,148,113,50,177,149,91,101,238,126,191,253,254,46,89,109,204,46,13,142,255,160,133,127,247,195,11,72,217,4,2,30,145,168,189,128,156,183,78,87,107,148,120,243,105,250,119,3,200,155,141,237,114,225,134,124,69,155,72,52,122,60,190,211,172,186,26,166,218,11,155,205,168,213,214,226,14,212,245,100,60,29,151,235,85,129,223,158,215,220,131,154,113,99,234,142,68,149,80,41,176,199,92,119,71,197,169,110,89,245,99,243,54,18,235,129,176,210,221,135,212,21,132,21,251,180,0,30,49,116,68,16,250,207,0,90,164,255,25,192,227,223,116,106,112,67,214,10,99,115,93,124,
+221,15,49,49,96,211,13,141,95,222,167,130,154,201,253,225,125,195,70,251,180,140,64,196,192,219,28,9,41,3,240,160,16,147,61,19,25,129,106,201,233,198,69,5,141,222,68,111,216,2,98,174,205,155,133,75,40,110,220,14,6,67,70,54,67,54,199,147,203,9,32,255,85,188,249,39,43,138,223,230,203,241,68,227,60,80,216,170,212,158,225,144,47,176,88,138,105,220,132,1,114,109,246,56,79,224,26,29,78,251,203,197,77,13,4,4,34,81,177,246,224,168,109,204,106,183,216,158,205,135,118,251,205,248,212,226,171,245,180,214,132,157,124,124,237,126,126,220,164,207,79,65,54,91,60,23,61,106,61,169,218,204,162,180,218,62,235,101,75,240,19,61,231,179,192,239,7,138,69,138,90,71,100,238,121,153,76,105,162,80,110,182,149,138,59,147,17,192,227,241,98,20,161,54,158,41,76,102,12,79,25,115,227,201,93,52,230,233,99,250,2,26,173,248,78,187,169,205,180,225,186,180,29,254,126,131,215,189,223,31,118,139,68,2,151,139,114,39,18,83,13,222,112,234,73,111,
+55,64,189,177,133,45,32,144,190,4,68,39,177,104,155,8,212,165,168,7,34,61,81,112,164,247,131,97,207,83,188,95,158,140,147,47,67,145,156,229,11,32,148,106,198,250,198,216,29,9,124,169,15,207,30,179,223,41,38,247,186,165,216,143,9,144,224,63,148,206,195,44,181,248,175,162,126,129,91,12,93,184,31,164,179,255,183,175,212,230,152,112,247,163,129,207,251,147,165,133,107,205,171,147,48,87,72,150,90,228,228,227,151,80,80,90,172,90,150,147,151,87,197,232,245,86,107,33,163,43,10,18,179,203,213,128,34,207,117,136,36,75,22,133,223,223,99,243,149,143,73,53,116,186,5,110,128,196,73,248,176,58,151,116,21,157,121,1,123,188,91,127,0,165,146,109,50,174,175,109,182,197,108,118,252,72,179,174,59,70,192,18,113,139,248,67,42,197,154,178,38,235,177,216,34,18,185,30,195,48,159,137,218,161,182,114,171,213,248,244,155,129,178,75,67,40,92,244,157,206,227,92,231,83,82,209,157,118,126,181,24,221,92,118,243,252,167,238,192,58,22,63,63,199,111,165,
+218,39,67,116,186,69,227,77,55,228,176,204,68,162,184,129,70,47,16,136,227,166,43,242,185,56,66,97,170,80,204,14,38,35,243,179,90,169,107,181,139,81,120,116,172,48,124,82,120,91,40,46,81,200,223,41,113,220,44,151,213,233,116,228,98,179,57,78,53,62,134,155,43,228,166,41,184,34,112,61,91,238,247,6,228,251,22,165,146,211,247,240,181,62,95,150,131,232,244,184,27,132,192,136,243,238,154,180,154,86,131,225,217,96,179,23,147,82,131,90,18,89,196,254,126,232,114,137,63,64,218,29,56,194,175,143,251,177,227,43,44,90,174,186,107,101,222,154,186,223,189,96,62,248,179,129,223,87,130,235,161,59,59,102,152,139,97,138,88,199,82,109,84,209,168,245,60,171,175,212,80,253,25,186,39,187,22,228,29,242,127,246,93,85,189,30,252,55,150,71,166,255,27,203,251,243,18,54,243,236,193,32,191,18,106,27,84,78,229,233,84,255,246,146,144,154,95,187,193,17,61,163,103,80,241,14,71,66,70,171,239,249,124,189,95,132,142,73,45,78,103,29,23,109,182,123,
+19,131,193,2,112,215,14,111,22,33,249,202,194,8,196,63,156,230,16,78,14,123,188,89,15,2,133,146,109,252,15,39,253,108,246,5,225,52,223,49,28,193,162,251,149,63,36,83,172,73,243,31,78,122,8,167,175,48,76,23,18,127,66,56,253,204,250,191,191,91,139,215,215,88,46,197,224,124,249,237,176,155,95,3,175,117,50,89,143,193,184,191,238,1,157,147,253,73,233,20,222,222,6,159,31,41,115,54,215,248,254,214,247,43,149,175,173,69,167,241,224,62,223,195,217,210,4,251,61,182,238,118,245,6,166,161,39,145,190,46,94,191,206,241,242,194,136,102,55,89,72,160,172,131,33,183,177,221,234,185,220,47,218,193,174,179,50,94,68,219,34,129,56,68,163,204,72,4,162,14,135,235,159,199,39,219,100,202,165,176,189,239,239,196,110,3,120,134,30,75,187,211,40,22,235,250,84,138,141,68,230,246,93,209,247,60,103,117,114,199,141,166,85,20,154,216,3,247,236,229,198,253,30,140,147,86,199,55,143,123,50,175,58,195,142,39,246,233,253,37,254,14,49,243,192,207,
+231,215,119,78,79,108,115,234,147,162,165,40,206,142,133,238,136,247,194,106,254,130,230,121,24,254,245,25,188,235,67,15,224,174,61,242,231,41,202,151,203,222,126,175,253,69,42,230,191,221,72,84,202,247,191,221,72,91,4,154,187,238,154,121,36,85,75,88,188,221,95,51,114,171,69,251,161,66,71,111,200,51,35,163,178,101,20,196,241,23,155,153,30,173,226,43,235,22,84,81,82,200,118,29,82,166,253,189,39,244,64,38,175,63,230,253,188,49,17,92,157,14,200,195,128,129,57,175,28,42,75,6,189,121,50,105,240,246,251,124,163,49,166,31,236,251,31,130,199,227,202,8,184,0,133,108,25,165,82,60,185,60,47,77,74,199,128,100,15,192,122,141,94,105,177,252,62,222,15,102,159,143,39,20,198,242,20,202,248,234,179,137,13,228,70,37,186,88,133,199,78,167,149,255,202,165,254,254,230,189,222,113,161,72,182,121,95,27,141,12,87,111,154,176,95,44,57,107,142,167,84,230,101,50,96,220,151,218,66,98,30,149,147,202,103,250,227,73,218,102,179,241,120,188,60,220,
+110,31,255,188,217,60,84,30,143,21,207,167,1,121,50,101,27,14,121,22,140,37,175,209,140,227,40,133,205,47,224,189,102,73,48,202,24,131,182,32,17,41,238,227,145,239,245,84,119,42,181,154,35,206,250,150,200,97,63,244,186,205,88,161,128,107,234,154,133,8,1,247,120,204,243,249,62,213,203,75,53,138,152,93,86,197,219,133,117,6,139,150,106,158,52,251,201,130,118,75,191,235,75,249,127,246,216,243,156,189,191,124,253,142,95,116,249,28,199,194,229,24,205,37,225,80,41,10,22,252,91,196,121,121,208,236,55,253,49,252,130,204,223,175,92,72,158,139,183,165,107,76,17,6,242,144,239,187,136,131,31,247,255,54,36,109,196,255,109,72,154,13,208,150,233,33,57,247,212,72,175,228,237,207,11,28,153,253,126,215,144,172,22,94,68,6,149,14,23,21,151,33,195,192,98,245,106,221,128,201,36,6,153,143,112,231,115,146,158,77,181,56,147,176,62,6,229,183,132,105,22,107,20,134,131,97,48,177,122,115,16,214,27,173,108,54,23,242,121,36,143,39,185,208,143,134,
+151,87,139,35,193,93,10,70,36,170,13,50,110,92,185,156,68,167,39,233,239,180,225,134,102,49,187,194,211,245,228,112,180,130,151,11,183,211,33,25,55,198,100,10,43,15,8,197,229,230,197,51,30,39,5,85,166,92,10,47,247,92,37,141,225,251,227,195,124,125,211,241,94,94,72,132,13,33,217,224,201,237,44,84,185,18,213,24,199,44,24,219,74,32,112,207,103,36,169,221,78,30,157,114,145,142,72,167,71,210,37,204,68,161,178,86,42,92,200,71,144,226,241,36,228,35,228,70,10,157,159,67,226,40,227,120,210,42,51,203,184,253,62,137,70,3,146,239,52,185,153,214,95,175,75,155,253,16,4,157,102,127,128,39,18,145,32,31,129,209,233,98,137,53,186,63,138,131,91,68,187,191,46,153,109,195,58,185,110,214,235,185,108,118,157,180,223,39,153,106,18,34,69,229,82,197,86,17,164,144,237,80,201,125,117,112,182,87,231,112,92,160,38,127,231,36,93,141,27,225,24,45,198,54,32,168,4,114,238,251,235,118,112,68,13,167,229,100,63,102,33,33,177,220,235,209,
+210,125,60,133,219,214,154,132,19,250,184,189,77,68,249,63,253,132,243,207,79,200,66,143,110,65,93,158,154,186,229,140,246,195,139,142,62,207,103,70,81,86,118,57,167,172,184,76,24,150,172,87,200,202,22,244,82,82,169,49,237,114,241,10,137,74,142,201,80,238,115,41,17,255,129,166,48,233,223,225,79,24,37,242,206,97,79,215,68,226,1,141,190,220,112,254,251,138,29,244,197,212,98,145,170,84,40,171,173,234,25,147,121,176,88,228,151,169,230,62,66,5,105,254,188,248,85,70,37,149,222,175,215,217,253,126,232,139,68,151,147,43,160,75,17,187,141,204,122,173,86,187,28,229,86,107,102,192,24,14,42,213,101,40,79,5,130,162,110,45,101,218,107,165,181,90,85,247,198,155,190,188,28,118,187,139,96,166,13,40,80,221,118,58,111,122,147,113,88,239,207,253,126,230,241,28,4,97,193,229,139,29,176,49,135,34,122,164,148,147,171,197,170,10,147,57,203,100,144,7,20,234,114,243,7,6,78,182,136,25,163,18,206,178,84,252,61,22,155,81,165,210,3,141,118,121,
+119,211,2,102,218,106,93,154,156,126,149,215,107,53,128,244,79,69,162,195,233,116,245,234,116,157,6,111,181,157,166,79,27,73,171,229,169,46,151,179,175,175,131,63,151,187,236,39,135,9,191,52,45,137,222,197,129,190,44,116,75,63,55,176,230,227,25,188,175,58,151,245,178,117,224,187,102,181,154,177,108,106,75,123,94,77,60,244,20,61,142,250,214,253,67,123,193,51,15,6,121,106,134,165,148,169,43,129,100,221,74,61,239,221,211,197,20,170,156,22,223,146,103,12,253,125,251,95,125,197,241,231,133,108,205,42,203,26,59,199,164,153,141,172,228,184,108,105,93,150,113,168,230,88,181,34,83,213,253,141,157,236,39,191,34,222,191,106,179,105,93,79,198,204,32,63,110,199,201,224,146,229,119,8,141,137,188,179,57,179,69,46,103,79,36,154,81,28,98,249,16,57,93,185,9,95,40,45,148,170,170,128,106,202,100,218,183,91,121,179,206,93,30,88,78,154,53,202,23,169,200,228,109,25,131,153,222,239,246,126,48,216,44,81,13,190,19,255,235,51,49,159,74,122,14,87,
+181,217,156,26,176,6,251,120,220,172,50,123,6,11,253,235,61,172,123,234,228,159,95,149,55,29,119,246,249,105,207,102,155,130,179,199,160,39,125,85,210,81,157,17,162,162,50,72,32,206,206,103,187,63,236,111,22,41,6,31,255,202,230,101,114,105,137,18,169,174,86,170,51,173,22,105,87,40,154,3,153,97,16,20,177,57,41,34,30,47,77,36,202,50,249,140,218,239,219,205,230,102,26,135,51,184,185,108,110,218,79,196,73,206,231,242,13,118,155,118,187,246,82,233,250,234,243,21,10,228,49,125,16,221,31,85,30,47,188,34,16,76,143,71,251,130,207,127,125,121,41,84,92,140,227,205,179,108,216,82,205,97,202,110,179,189,46,181,218,101,4,217,12,200,174,118,223,105,234,90,25,202,171,182,164,227,75,126,250,118,232,227,140,177,12,220,206,205,134,205,94,13,168,167,41,106,149,34,216,74,133,222,120,43,36,246,56,215,226,229,169,55,187,134,30,217,150,5,121,132,124,5,107,255,191,248,138,129,228,39,164,97,253,228,240,156,15,43,47,43,43,99,93,78,13,10,
+241,187,79,49,9,169,234,214,253,179,77,98,94,34,154,249,252,240,161,103,19,98,31,159,192,231,27,170,28,161,121,33,238,67,195,126,118,86,193,239,12,239,117,167,59,148,186,164,88,170,66,58,165,181,217,62,102,179,31,250,7,235,119,199,240,90,220,17,33,95,78,161,84,110,169,164,38,22,251,144,30,165,63,97,152,35,36,246,53,107,169,229,76,122,188,157,170,62,175,6,210,169,143,227,241,167,197,119,80,29,47,205,74,116,249,19,145,57,157,21,254,171,6,210,169,143,102,243,167,64,33,59,222,8,205,70,70,108,208,72,216,47,229,92,48,167,77,36,62,100,50,240,167,47,117,72,96,175,66,78,170,80,80,142,39,143,170,205,170,225,241,62,224,135,195,79,243,213,161,76,161,95,5,249,66,94,1,170,20,239,195,129,198,130,181,124,76,167,63,31,44,148,67,134,120,101,39,201,3,178,18,131,173,34,17,17,13,28,254,241,124,190,221,77,166,207,20,246,231,59,152,248,61,40,188,190,170,160,211,209,22,139,31,106,140,250,135,200,249,184,94,125,111,6,195,103,
+18,243,115,251,78,56,204,146,87,62,161,42,14,42,131,143,188,224,111,211,206,107,69,108,244,75,32,185,10,236,29,216,203,156,253,155,36,95,127,28,243,143,28,71,11,114,76,149,146,88,45,122,15,228,2,191,132,203,205,233,254,77,211,127,164,177,208,199,253,170,189,30,203,143,231,83,120,153,155,62,242,66,159,6,226,193,199,255,206,131,254,27,42,35,101,106,21,140,111,196,156,24,85,84,112,40,91,118,172,66,99,229,11,247,226,157,134,178,6,139,240,200,64,59,159,179,184,106,149,222,88,145,224,16,25,4,11,38,1,204,44,242,247,119,182,194,248,222,158,232,86,115,152,39,86,199,242,197,202,120,172,169,186,170,44,173,54,59,82,160,190,111,2,171,51,201,91,9,149,36,210,59,6,179,9,186,204,225,217,90,29,59,252,150,47,23,77,39,213,97,25,141,217,84,234,52,105,54,53,6,3,171,63,30,103,171,76,165,229,68,175,188,135,181,58,57,242,227,171,242,243,163,249,196,124,178,178,217,108,2,141,85,250,5,149,102,86,139,208,74,89,47,101,2,145,171,
+69,163,89,183,91,118,179,50,42,213,88,198,11,37,145,201,43,70,163,247,107,165,162,209,106,89,144,63,135,110,79,41,133,131,12,113,9,79,86,198,151,241,119,153,76,3,249,115,214,102,147,173,115,149,8,5,138,33,200,227,73,46,5,120,173,222,110,26,32,24,100,173,215,4,117,80,157,136,33,33,83,135,218,254,42,221,16,92,48,161,150,66,97,65,56,17,12,134,68,243,117,32,152,101,44,102,137,255,234,79,158,47,172,221,148,222,250,238,199,8,90,109,98,30,71,237,214,162,239,226,81,152,53,180,88,243,90,92,91,51,85,140,61,149,172,237,79,123,158,162,221,114,76,250,254,208,102,183,242,33,75,158,210,96,41,193,242,113,173,94,116,114,190,243,253,148,133,24,144,125,92,72,160,100,229,193,254,53,43,160,90,18,254,53,43,32,188,172,127,205,10,220,141,74,97,224,253,142,132,138,209,207,160,16,231,61,147,196,140,209,93,206,52,46,186,233,246,212,67,203,200,145,118,88,73,204,90,45,19,166,197,49,17,43,140,70,178,112,119,59,235,121,235,162,251,205,
+97,145,88,173,46,21,232,147,73,198,230,180,141,102,179,29,180,94,207,3,132,63,88,20,9,248,114,232,218,169,100,35,29,139,141,34,145,221,61,12,243,132,196,237,90,50,181,154,73,79,39,230,211,231,77,11,133,35,202,134,178,187,250,60,142,23,121,187,18,93,253,92,218,130,24,210,19,20,181,91,201,156,241,79,161,152,19,221,91,250,229,101,180,219,236,118,13,158,71,129,130,181,219,121,163,94,193,17,177,104,251,125,6,242,19,35,129,96,119,116,122,40,58,162,128,30,41,150,138,106,181,138,81,173,164,73,153,204,40,30,223,65,188,236,49,82,4,252,28,84,219,170,84,130,46,15,202,210,253,254,232,253,93,178,75,227,60,26,156,96,193,77,31,79,234,235,217,67,191,223,210,221,238,8,10,83,86,40,217,21,176,228,197,32,122,220,201,34,80,152,58,66,66,197,108,208,151,139,244,215,23,56,202,229,118,251,201,200,57,41,165,75,34,154,56,28,248,19,170,199,166,12,131,190,31,60,81,155,183,9,229,252,101,216,173,127,231,35,93,45,195,145,25,233,166,174,
+66,236,211,164,130,123,204,109,167,104,157,193,237,142,46,31,181,66,15,217,186,87,234,78,124,28,255,213,117,174,237,122,25,223,145,22,234,11,17,162,231,31,82,135,255,218,74,239,233,255,218,74,56,164,29,138,77,140,12,10,68,204,246,76,84,138,73,218,184,43,73,204,236,30,18,162,18,140,175,175,52,204,156,111,118,148,17,26,12,143,202,232,116,10,88,93,210,55,43,190,191,43,244,129,108,214,135,219,67,199,210,43,95,94,40,50,192,241,56,93,173,42,50,201,76,37,142,154,221,4,128,221,153,124,229,157,219,144,223,155,109,104,118,243,49,252,179,86,255,254,210,33,191,151,238,116,20,70,208,88,73,165,254,250,122,105,131,65,193,102,87,110,123,155,214,66,255,120,63,134,223,76,234,207,79,58,248,243,147,254,252,84,188,109,222,42,9,180,214,47,128,125,124,37,223,12,202,23,10,135,73,32,164,209,104,164,226,118,171,116,69,218,149,139,195,18,22,178,89,183,236,123,204,168,84,51,164,217,76,193,98,85,118,110,43,116,57,22,45,236,35,80,213,137,4,125,
+96,30,164,203,101,69,58,45,169,128,110,173,158,196,130,49,162,4,138,10,141,129,51,16,136,244,227,161,88,244,122,12,151,43,147,195,18,71,253,200,238,164,238,121,188,12,129,48,67,25,82,20,127,59,80,142,117,133,207,199,32,147,51,177,44,1,250,194,229,225,18,28,14,218,89,134,217,98,240,120,179,126,172,34,68,98,21,215,83,230,52,95,51,86,61,85,199,255,150,241,62,132,135,223,183,214,172,162,172,160,137,138,183,253,36,173,46,49,139,112,145,66,232,75,122,119,39,212,161,214,83,220,175,250,204,245,196,56,174,85,213,251,69,55,75,81,42,2,87,251,253,83,28,188,255,207,231,7,80,104,250,51,34,161,185,100,46,60,232,167,99,229,155,213,130,70,71,225,18,20,70,237,11,103,206,183,195,29,101,20,250,7,60,77,167,139,147,198,251,156,51,23,79,36,6,81,68,124,251,16,185,93,41,65,159,39,45,150,152,106,85,15,199,100,198,241,248,1,29,116,111,23,36,183,21,22,21,136,84,20,50,125,132,197,226,145,200,248,99,243,24,244,196,22,53,150,
+95,239,20,22,63,178,227,230,200,240,121,113,203,101,44,254,245,53,200,17,45,84,15,175,254,17,95,76,143,146,175,26,115,254,131,163,58,28,241,159,159,193,39,229,197,98,101,212,187,69,174,94,39,103,179,25,57,107,22,151,72,196,163,81,96,240,8,90,76,84,46,153,159,203,103,164,227,239,52,221,102,195,243,120,113,40,71,13,126,222,44,30,44,143,11,229,168,188,226,154,76,49,135,3,28,164,79,241,233,116,0,213,187,69,134,224,178,147,36,224,79,159,152,144,62,225,224,240,248,243,41,131,244,169,156,194,78,191,157,137,195,159,62,49,177,157,54,206,104,140,171,143,106,153,92,94,142,192,185,211,117,201,238,80,54,105,45,166,193,128,103,179,193,248,254,111,140,27,159,164,168,248,241,56,142,29,80,241,84,17,109,221,251,82,119,3,57,255,157,223,4,247,170,237,229,119,224,120,209,197,115,28,28,71,111,164,149,68,80,168,210,20,252,103,6,184,224,18,183,105,250,160,247,164,183,78,107,245,170,147,107,135,2,124,112,110,138,11,49,62,28,36,83,216,199,255,
+156,127,216,254,230,31,245,182,98,15,108,81,2,138,217,194,141,132,105,209,139,23,94,32,42,245,6,58,192,5,96,17,20,77,161,215,183,105,48,24,44,66,99,91,56,248,92,14,149,72,200,163,81,68,255,33,50,147,92,41,46,79,154,47,29,153,42,21,4,21,42,128,199,71,235,245,73,210,159,196,197,98,40,169,116,24,5,36,125,0,246,190,236,149,166,75,229,225,144,164,121,125,248,78,7,37,166,80,74,14,7,189,105,110,225,13,6,212,120,236,142,14,229,82,41,252,125,209,43,105,116,242,143,143,36,237,77,135,255,252,68,245,179,217,104,2,45,213,195,73,239,205,172,70,43,133,177,94,232,4,34,30,141,65,163,252,254,232,202,216,150,170,177,180,151,68,186,255,167,78,180,74,85,132,215,106,81,44,86,116,83,97,72,45,116,26,205,25,198,81,213,241,36,99,40,147,227,203,101,20,46,140,139,130,110,169,158,4,163,49,162,56,138,10,69,194,48,110,119,252,227,81,71,137,197,8,151,43,66,173,50,129,126,100,179,119,202,221,127,5,133,71,21,139,40,136,
+118,40,102,10,202,231,67,144,201,216,72,150,0,204,50,96,236,33,0,86,69,16,170,139,13,104,137,228,73,97,224,39,107,182,72,219,159,190,148,123,143,221,204,157,236,126,146,28,117,204,233,40,93,13,199,49,210,113,198,182,68,0,101,170,159,251,235,102,128,234,215,31,150,104,63,134,10,61,84,178,219,89,221,95,119,169,209,85,7,213,123,42,91,139,122,4,196,16,47,198,89,77,189,166,4,36,40,200,252,13,33,189,210,254,153,63,201,45,4,241,221,45,137,17,69,82,155,249,28,212,179,67,41,39,6,219,247,163,250,180,8,141,10,19,183,186,153,164,201,208,231,112,182,11,34,17,60,159,111,237,176,224,113,100,135,108,72,40,55,37,75,133,62,164,191,219,225,16,180,88,144,183,169,230,49,66,133,24,126,146,248,53,74,165,156,7,88,204,230,126,7,251,221,238,173,68,13,250,30,252,222,39,122,189,136,223,78,7,160,213,218,66,126,28,100,179,33,210,187,6,181,248,222,251,198,211,247,122,111,75,67,208,11,190,66,223,51,233,227,183,218,7,144,203,110,148,
+88,37,200,96,220,182,150,97,208,76,235,189,195,74,226,82,106,50,30,236,119,226,77,163,1,234,245,55,32,137,9,66,169,153,157,193,148,50,17,181,122,56,98,50,183,120,60,8,194,192,91,91,16,84,97,252,98,33,153,74,138,167,30,113,32,22,219,74,165,72,144,70,187,189,211,130,55,51,109,189,166,158,246,207,216,21,4,2,129,237,80,36,2,169,84,63,255,200,239,38,160,251,132,242,239,33,30,2,225,46,177,43,213,106,14,150,139,200,6,210,40,34,209,191,244,120,30,13,219,141,249,170,6,83,212,13,85,156,25,20,10,91,149,10,116,94,79,155,211,10,88,135,58,209,158,27,30,186,216,95,158,223,127,143,74,245,110,231,61,104,155,108,29,234,210,176,36,8,139,163,62,76,232,198,253,155,79,61,74,161,237,245,20,24,156,214,201,231,69,215,124,164,40,55,136,251,208,231,82,79,8,81,94,145,245,147,194,116,105,63,54,93,16,140,184,201,100,145,0,1,124,213,182,117,64,191,90,146,177,49,55,253,243,83,128,234,127,125,229,55,48,88,12,216,228,92,
+57,183,82,217,30,200,128,85,31,238,10,81,249,98,126,172,80,28,140,199,221,77,181,234,214,106,219,240,145,98,117,19,184,156,103,12,95,152,32,147,128,43,6,187,69,34,221,112,51,188,253,12,25,77,212,80,173,69,156,207,34,191,148,211,208,235,221,64,126,220,125,60,182,91,124,163,208,241,82,171,32,230,43,124,210,225,28,188,190,110,32,63,238,246,122,219,203,164,193,232,125,173,125,162,39,58,125,252,243,3,200,6,32,172,148,110,6,131,219,222,90,140,102,90,237,241,14,203,149,82,223,223,219,254,110,7,65,229,134,67,37,159,196,24,3,69,33,135,141,201,21,18,2,165,122,200,96,108,240,24,188,27,4,219,109,1,96,116,178,57,66,50,113,79,138,39,226,64,52,198,221,246,251,110,26,173,13,219,152,161,203,113,104,79,216,126,31,59,95,6,72,127,96,219,237,186,169,78,170,192,231,43,126,190,168,39,3,196,126,23,245,32,188,3,129,96,3,233,148,155,207,23,56,28,69,122,133,49,233,195,109,46,109,42,112,39,92,111,220,143,201,24,115,5,105,167,
+37,0,95,61,238,237,14,213,231,110,185,182,174,245,124,96,236,165,58,1,66,217,119,227,157,182,178,21,148,167,218,13,155,187,106,81,111,212,69,128,34,194,39,132,65,146,15,164,81,79,19,177,59,112,221,124,250,78,195,199,25,125,114,237,75,238,181,71,130,229,139,131,190,191,22,160,238,131,74,254,107,1,174,238,91,4,237,169,55,129,242,186,222,234,196,132,41,102,171,151,16,166,33,34,8,28,76,194,37,89,145,118,148,222,40,35,18,135,233,155,223,234,194,230,45,69,153,205,150,62,216,81,86,7,58,95,148,49,147,204,52,232,134,254,112,72,162,64,132,158,222,224,204,86,55,142,68,146,12,239,247,116,79,92,105,185,136,135,131,164,211,73,223,106,156,74,3,111,119,133,229,203,101,122,174,171,32,43,8,187,75,94,40,220,32,95,56,249,249,161,45,155,77,133,247,85,251,86,143,190,233,232,4,130,2,238,23,104,13,137,108,150,79,27,12,20,26,156,214,175,9,239,246,116,191,191,174,112,113,50,197,164,21,107,165,65,42,36,71,2,153,92,172,82,165,179,
+96,44,133,22,159,201,199,73,12,6,205,237,86,56,143,108,60,62,34,147,209,224,233,180,66,134,192,19,185,177,104,140,14,0,10,64,131,195,227,194,183,123,157,222,235,197,83,216,45,124,23,245,7,232,84,106,44,94,32,111,127,19,2,139,144,158,74,141,18,68,126,188,43,178,216,98,11,243,226,79,161,43,12,198,249,33,56,31,73,103,252,133,117,190,113,45,182,116,44,95,160,99,169,180,245,245,68,247,157,32,185,113,209,249,46,250,188,118,166,235,106,180,28,135,110,39,114,104,251,9,205,118,153,208,170,106,218,48,117,165,203,83,244,24,150,254,137,196,210,67,207,248,49,179,136,28,151,209,199,153,141,62,159,39,163,150,145,147,62,86,79,216,46,173,75,64,95,44,144,64,201,255,109,35,59,138,33,154,171,115,147,70,35,109,32,197,17,17,117,24,22,108,239,172,199,25,126,226,115,227,58,245,112,241,94,26,78,198,102,155,141,95,231,241,22,7,251,113,243,67,240,121,240,66,110,42,76,161,14,83,41,203,66,46,175,247,251,139,247,48,237,184,161,249,204,48,
+241,114,157,58,254,246,175,193,171,165,211,169,27,141,245,197,68,237,148,35,91,251,46,101,57,143,57,157,197,1,159,111,41,20,234,253,100,114,17,67,58,131,160,168,85,195,66,209,4,252,170,13,117,111,230,23,236,75,157,64,88,156,61,114,167,158,212,170,32,12,8,99,146,253,210,39,18,197,150,243,185,238,247,47,128,149,209,233,227,243,95,168,232,66,62,62,30,1,207,106,197,172,213,214,33,124,22,59,171,211,66,127,242,105,48,50,53,149,220,38,250,195,129,185,92,70,214,211,233,69,28,229,164,249,5,252,87,2,25,31,137,96,208,125,36,210,50,132,36,41,20,210,83,143,212,175,22,127,254,141,238,253,110,194,94,223,176,131,108,155,161,155,158,76,248,122,185,252,43,2,159,139,38,88,135,35,209,108,21,135,6,189,153,205,174,247,38,37,75,73,212,23,87,252,145,224,5,117,7,211,180,249,15,193,97,137,80,187,62,108,96,143,189,46,231,236,99,146,188,112,88,231,117,93,205,204,49,214,251,166,118,88,228,195,190,255,155,30,42,142,1,112,187,40,203,235,
+177,33,214,140,165,14,78,203,80,108,213,64,118,28,196,214,53,103,170,139,159,201,193,35,135,62,223,47,43,252,191,169,124,200,105,59,252,247,128,27,21,241,180,120,9,49,26,133,132,216,100,9,36,152,196,140,65,154,76,177,28,38,183,137,34,252,33,234,179,84,136,216,108,155,124,152,228,15,144,161,207,84,38,115,19,71,249,131,15,10,149,28,145,203,55,240,52,206,239,39,81,201,189,8,18,185,9,195,218,247,30,245,244,27,9,4,184,155,18,181,253,137,62,33,142,81,161,112,115,245,249,218,95,24,151,51,106,224,26,32,162,156,188,190,182,128,203,197,109,164,24,67,6,180,78,215,127,123,187,186,173,12,163,6,6,241,107,223,106,117,43,80,55,163,17,67,36,0,209,99,212,45,129,21,115,72,210,126,223,23,8,220,190,34,191,152,71,217,172,0,252,112,112,59,94,138,25,49,156,201,236,43,20,238,155,20,78,161,98,135,131,24,80,175,187,189,175,20,27,1,33,151,247,55,27,192,173,39,81,240,112,36,22,217,15,135,161,75,97,143,123,228,253,222,23,31,
+197,245,22,255,120,64,1,1,63,224,114,213,63,193,151,227,17,35,20,0,0,199,4,92,175,245,98,144,226,180,192,13,134,62,41,151,171,71,17,78,87,14,43,14,162,197,33,140,169,144,7,176,212,62,214,76,5,152,76,176,27,104,129,69,33,248,101,0,151,73,50,216,116,128,59,231,55,88,81,130,183,115,11,92,52,192,195,12,92,142,50,32,184,5,167,206,50,248,46,5,195,112,6,216,11,130,37,17,184,172,25,65,78,15,16,139,158,152,208,55,66,22,252,184,159,254,111,223,156,255,207,136,227,7,232,200,19,22,153,2,223,104,4,12,135,132,83,217,28,169,82,57,221,130,244,102,29,54,158,72,251,30,207,244,200,126,229,137,225,42,181,84,171,157,222,118,140,87,46,44,153,66,74,203,229,233,8,245,26,20,97,48,24,73,36,2,78,1,216,207,26,123,113,93,36,221,174,70,141,125,254,172,48,94,175,164,184,42,106,2,247,189,193,112,22,207,87,152,215,87,201,50,153,212,72,225,111,166,30,246,231,71,242,250,170,17,122,95,223,222,16,111,58,190,148,64,
+208,248,5,111,86,29,50,155,149,12,6,114,141,6,247,166,71,17,48,4,137,223,175,113,113,158,217,12,220,106,147,230,195,121,141,28,153,45,97,169,149,138,132,197,210,120,210,188,108,22,193,96,74,251,32,168,49,82,8,100,30,122,48,144,104,52,154,155,149,65,192,193,162,81,164,228,253,93,227,230,18,16,4,4,2,41,125,62,175,233,18,117,247,139,246,91,2,82,147,41,29,67,162,118,39,108,187,35,229,36,57,233,12,126,7,225,36,16,72,174,215,244,87,144,109,181,64,26,39,89,228,114,211,243,62,221,86,8,46,59,212,229,198,85,88,109,200,124,65,138,13,82,37,215,147,212,119,234,73,91,46,41,223,37,93,207,107,82,93,77,154,59,113,164,68,142,116,63,185,74,109,19,105,85,45,117,48,213,210,97,74,34,127,77,73,98,88,9,18,91,144,220,175,146,192,85,162,234,248,36,189,7,252,81,120,240,46,108,98,246,92,59,116,254,189,176,224,240,88,252,123,97,1,143,200,65,25,245,55,202,26,121,110,87,24,110,55,136,51,234,33,201,4,250,109,104,
+113,18,139,121,49,172,90,5,62,88,238,141,7,95,204,195,134,67,104,61,114,221,94,2,37,68,130,197,98,192,59,13,112,187,113,20,18,236,110,185,3,61,104,9,18,197,199,3,172,211,1,106,73,78,189,129,135,62,15,151,75,160,197,175,55,41,4,167,29,86,40,0,139,161,188,254,14,251,170,193,145,191,191,192,210,80,223,116,200,95,159,240,151,151,48,144,64,215,187,20,54,242,5,174,84,2,91,139,164,254,129,98,179,17,104,51,26,232,138,184,124,162,120,60,130,53,26,192,215,145,205,229,225,85,106,36,48,155,1,63,111,92,129,155,164,82,194,241,120,0,136,34,184,28,108,50,9,71,88,44,192,193,206,221,240,240,201,56,172,223,135,1,83,13,151,129,192,80,208,112,56,28,8,195,124,211,53,245,114,65,4,157,65,9,135,51,133,248,219,235,67,174,86,18,93,82,55,93,144,188,30,248,200,212,133,81,40,18,97,88,56,157,19,155,45,36,233,235,75,130,70,79,87,48,74,240,138,9,158,17,97,136,205,130,55,220,235,254,21,161,82,1,247,235,19,232,
+248,128,101,11,120,22,248,192,239,28,248,124,234,128,239,28,144,32,62,129,243,30,104,216,128,231,172,10,100,152,128,197,57,4,232,114,64,26,107,1,112,36,16,188,3,6,81,0,48,118,0,83,46,4,11,61,73,143,156,27,253,114,187,172,222,137,131,127,108,118,64,228,255,177,25,226,113,133,71,96,185,92,184,130,97,152,221,56,189,30,70,221,239,195,109,129,217,119,36,230,243,16,52,97,248,7,203,236,193,231,243,34,8,155,112,157,107,166,88,119,30,169,20,216,108,104,92,46,236,114,133,47,131,65,137,11,250,143,118,225,94,31,220,104,148,44,109,204,233,20,214,108,241,225,78,167,196,241,50,245,207,224,175,124,184,74,21,147,88,232,208,137,31,215,15,172,217,148,168,48,87,141,17,243,246,6,203,98,178,18,25,66,99,194,174,179,89,24,131,33,113,135,185,154,55,4,129,8,239,35,16,18,19,53,93,224,162,119,59,216,98,33,89,232,136,233,60,170,82,69,66,1,21,186,110,218,159,129,51,24,176,120,156,43,145,194,113,84,236,0,51,132,115,185,18,239,
+235,16,71,66,201,100,176,13,108,35,209,147,112,120,56,21,129,132,135,195,18,137,19,182,57,97,111,55,216,66,44,14,183,248,155,67,24,138,85,48,151,43,220,255,124,217,108,225,2,97,29,158,74,133,35,144,237,116,97,23,75,56,159,223,10,103,9,102,59,74,228,15,97,243,5,184,186,148,130,167,168,112,155,13,88,246,99,64,4,25,142,51,80,238,19,21,74,64,25,247,47,209,189,69,186,21,71,178,251,242,226,190,33,120,110,144,238,126,138,96,238,43,219,125,127,117,195,182,8,247,145,228,222,57,81,80,60,5,194,240,38,208,11,2,212,16,12,211,241,193,254,234,102,249,224,129,108,226,219,227,127,214,205,55,84,55,141,238,163,13,31,200,198,144,95,12,133,168,60,126,44,95,28,128,227,177,185,90,229,106,49,218,252,72,49,30,32,70,182,32,5,58,67,234,83,6,201,164,57,22,227,115,165,210,60,32,25,223,0,88,181,71,157,205,177,177,195,113,112,185,152,169,157,14,215,104,204,79,142,106,149,28,89,237,82,4,179,121,204,238,28,52,253,77,115,161,
+192,85,169,184,249,161,92,37,133,87,31,61,42,228,199,160,92,10,188,233,44,159,159,92,40,151,230,19,104,149,62,77,170,54,9,90,109,164,206,226,12,9,4,51,26,139,230,34,16,249,174,8,84,185,56,76,38,50,131,44,38,71,223,125,171,141,107,225,241,184,118,123,30,42,30,149,18,205,20,224,73,144,89,83,40,128,225,96,104,217,110,185,117,88,61,127,176,171,222,8,55,38,15,15,25,52,84,31,221,143,198,44,145,200,144,43,145,228,195,225,9,255,118,51,7,131,220,181,115,77,226,112,146,85,230,100,216,135,111,247,49,55,25,242,209,66,75,177,8,231,114,76,102,10,133,187,240,249,72,100,114,178,9,190,14,103,120,139,57,172,227,242,135,162,64,204,79,56,35,206,7,220,112,156,193,88,28,9,63,8,43,255,109,82,89,139,198,134,162,48,111,104,113,249,11,151,185,246,120,30,231,7,189,115,123,91,239,125,192,164,120,50,24,215,215,103,112,125,13,174,235,73,203,98,140,29,146,200,150,106,178,206,133,126,39,237,208,79,11,70,166,153,16,16,50,141,
+230,85,69,151,206,40,126,137,104,6,219,209,11,170,26,51,161,197,219,43,227,241,88,166,37,168,56,229,169,162,60,87,76,84,149,248,219,135,237,196,107,43,8,226,159,227,148,67,241,126,62,169,254,238,73,157,56,185,31,212,244,175,49,216,187,94,30,143,229,207,197,33,31,98,107,78,103,175,213,124,220,254,14,165,253,90,204,235,237,205,127,30,134,167,254,230,240,223,106,140,62,163,71,36,62,11,185,198,213,225,187,214,38,37,193,163,160,68,116,31,217,58,191,18,73,211,164,215,209,158,170,149,140,66,30,13,86,167,57,159,241,113,245,110,253,48,242,168,234,227,208,50,234,61,95,73,193,36,51,116,99,144,226,75,70,232,41,32,97,153,17,233,187,149,11,229,241,25,151,132,98,132,110,52,236,225,202,20,135,84,247,80,80,81,227,223,54,210,214,108,171,232,133,74,94,126,39,115,90,51,140,53,254,110,217,218,140,201,96,230,238,157,217,148,189,64,59,219,52,100,56,38,230,136,157,171,44,138,221,94,91,93,80,141,58,157,202,102,154,127,37,101,248,252,142,162,
+43,246,7,139,63,221,195,95,91,242,139,159,248,152,50,56,156,140,99,234,61,63,68,31,90,6,41,251,189,91,232,207,151,237,171,223,147,201,126,103,92,195,161,34,207,102,101,57,76,44,54,131,87,156,87,27,90,187,87,90,45,5,202,132,108,180,90,85,54,154,60,1,149,89,46,99,163,175,175,221,222,150,217,14,149,46,39,99,62,119,103,40,106,143,147,61,178,89,24,249,49,35,146,134,87,166,153,55,71,70,149,86,215,106,204,248,128,129,10,167,7,155,140,222,233,242,88,25,113,57,51,23,204,101,18,137,81,52,10,236,86,70,143,143,47,128,139,138,197,130,82,173,122,50,134,195,76,185,60,130,111,54,187,141,217,99,118,209,22,243,220,241,160,152,248,188,12,161,48,227,180,56,71,185,156,85,171,21,255,61,207,101,40,124,209,106,106,157,142,249,253,141,205,12,6,163,126,223,218,54,153,120,66,225,237,88,209,243,178,232,115,72,185,35,67,112,164,105,247,189,7,251,65,179,246,218,1,228,11,11,244,133,114,147,248,16,95,215,111,107,157,144,74,86,142,155,
+66,2,133,140,30,47,133,212,251,104,63,174,97,129,179,179,58,110,230,130,219,84,59,46,161,129,125,44,32,61,169,131,143,60,120,107,226,77,174,109,63,22,253,28,102,252,79,241,198,55,102,174,187,202,182,17,165,171,242,192,171,179,191,113,42,186,254,76,125,137,55,240,13,219,159,207,232,207,107,193,127,227,153,235,12,212,120,31,29,33,146,67,228,224,232,236,155,21,43,243,138,113,185,15,46,94,190,180,170,52,26,25,77,212,50,42,207,180,219,138,210,199,79,252,124,142,42,111,89,205,11,222,102,139,23,102,179,193,72,1,249,8,53,133,202,180,54,6,150,169,102,11,114,105,105,144,129,197,226,239,119,212,170,46,168,183,114,139,149,72,133,138,198,139,197,1,233,234,139,64,201,194,21,102,250,187,131,161,60,226,249,86,185,5,241,102,147,136,40,20,205,117,60,198,46,143,168,213,154,15,20,17,205,144,48,153,138,10,15,145,206,3,91,188,0,99,132,71,20,95,95,12,113,46,135,79,36,80,4,215,11,87,92,202,23,148,16,191,49,170,85,124,6,155,137,199,
+227,131,133,30,101,241,190,114,69,69,18,137,162,186,92,153,247,123,10,47,18,197,39,19,153,48,16,40,55,95,167,43,115,209,238,84,253,204,153,98,135,3,255,243,19,255,78,126,203,244,250,114,91,80,215,232,243,163,177,202,90,176,50,74,34,101,69,171,149,244,130,74,8,155,224,31,56,16,54,162,63,112,32,108,246,79,127,93,255,168,133,214,73,121,25,52,133,226,43,57,29,44,133,82,177,109,31,212,176,158,51,117,14,164,134,16,226,7,238,121,189,3,195,148,187,148,229,156,46,67,113,48,222,13,136,192,235,105,235,58,250,30,171,78,251,155,96,244,9,161,212,62,164,4,83,183,2,223,221,17,89,159,119,239,202,150,232,233,2,132,150,97,75,84,250,87,206,212,122,61,84,37,171,183,149,113,101,79,142,160,3,76,236,54,126,168,140,181,148,201,52,92,120,59,183,159,55,227,167,48,233,120,5,19,137,118,207,64,17,139,83,159,111,125,119,133,23,242,17,197,76,81,178,84,28,236,206,251,27,232,54,50,19,212,24,101,80,153,181,101,120,191,88,16,63,157,
+160,136,5,177,153,41,232,227,143,56,132,33,2,14,236,35,195,86,107,43,50,5,127,45,244,201,110,56,159,115,182,14,135,155,47,156,84,45,131,252,88,80,164,194,171,211,45,65,89,84,101,82,181,218,48,62,16,80,194,184,225,118,171,119,62,41,145,120,121,10,238,222,119,183,173,133,18,77,60,39,147,161,205,182,229,97,121,224,199,199,109,103,5,130,65,145,152,79,164,138,73,113,44,102,128,68,166,182,143,7,184,94,251,201,62,95,183,193,91,175,159,84,151,51,201,231,15,197,100,242,246,114,1,151,152,165,223,235,237,150,233,10,147,142,200,225,164,136,15,194,192,227,217,234,245,185,191,230,211,199,219,52,34,190,103,255,168,76,9,113,217,31,149,37,33,46,131,168,236,24,170,133,146,178,114,221,228,11,197,101,244,58,132,72,42,218,175,107,88,215,225,76,93,55,115,175,219,109,170,46,161,93,251,216,22,183,39,190,130,150,177,99,15,55,185,142,253,24,53,63,196,7,32,202,239,248,134,235,110,162,109,172,114,171,188,235,213,57,126,108,226,93,63,190,177,76,
+89,106,166,161,179,181,40,125,234,184,159,175,215,179,219,58,118,166,86,235,33,73,85,93,172,140,99,123,36,185,250,3,102,113,31,171,84,181,148,209,68,27,214,106,22,131,243,136,58,243,170,211,1,135,131,176,56,188,199,135,168,106,209,14,178,223,139,133,30,56,94,94,161,32,158,17,127,91,134,67,110,158,125,240,121,9,25,165,37,134,141,213,35,145,197,51,36,80,177,83,199,227,64,102,46,47,78,46,167,141,9,50,113,131,86,203,98,192,26,234,227,49,100,86,197,201,239,36,20,185,5,208,18,47,80,44,117,203,135,202,150,4,226,83,59,129,251,242,42,127,31,140,8,59,82,156,64,199,89,110,254,32,38,150,48,215,109,245,108,150,68,166,24,188,134,196,187,166,30,141,134,23,255,5,113,166,136,82,40,36,84,170,199,96,56,180,148,203,117,56,20,183,167,26,167,249,65,155,207,137,191,135,248,16,10,213,66,161,5,226,179,122,46,167,247,120,174,95,117,174,206,68,253,164,126,196,223,222,6,47,47,41,75,165,82,135,22,192,242,239,141,97,252,92,182,79,
+8,220,95,115,74,68,233,145,80,219,165,47,40,59,137,103,13,157,104,132,99,244,200,191,154,17,50,29,164,42,228,184,44,68,126,146,162,253,169,134,5,144,49,17,9,236,246,168,77,83,212,178,216,244,195,252,69,80,197,50,81,73,124,184,95,53,45,225,253,251,100,252,217,37,132,197,218,180,229,42,99,229,23,199,184,240,177,162,6,31,34,161,163,33,51,117,19,61,195,215,52,199,41,19,55,202,159,191,66,145,67,120,28,86,198,31,123,58,9,29,96,98,135,194,88,245,86,75,253,122,109,211,207,207,15,29,185,235,238,66,133,50,77,36,68,31,6,138,8,42,148,216,155,166,194,11,248,136,114,209,95,161,200,118,170,243,1,116,191,49,19,19,42,69,86,153,29,54,7,243,27,29,42,20,57,108,176,61,172,77,111,12,92,2,58,240,249,202,75,184,36,59,73,185,156,41,25,159,95,22,153,188,47,22,250,247,78,46,40,166,15,75,67,118,156,226,253,230,53,72,186,178,42,63,124,252,176,162,120,70,6,86,102,104,179,138,36,190,140,210,80,56,137,129,156,203,
+205,179,200,20,163,137,146,226,176,101,154,143,3,208,151,122,93,28,33,47,130,47,150,82,106,181,252,198,100,150,45,22,200,249,78,161,251,241,186,185,226,229,154,122,252,77,92,119,23,89,167,83,166,80,234,211,86,203,174,84,54,183,109,193,114,65,250,250,76,39,230,63,178,207,207,50,100,178,166,179,153,221,189,113,55,223,105,133,2,121,58,254,78,136,131,100,213,162,18,121,254,84,155,52,59,33,138,33,53,196,87,110,26,45,189,22,2,245,99,132,46,126,82,80,49,129,132,69,184,29,170,10,10,151,116,3,135,10,218,9,119,219,196,226,107,234,235,237,198,221,158,101,221,224,122,20,195,226,82,200,80,55,68,117,119,232,167,237,90,102,172,197,103,36,184,255,206,223,186,101,235,123,55,190,56,166,231,181,38,157,111,216,253,124,198,173,63,228,186,30,120,136,174,237,78,130,148,76,47,189,203,56,128,107,183,227,165,195,37,253,251,27,87,111,137,208,9,123,51,205,251,254,142,203,241,237,182,40,254,241,147,62,159,227,87,37,65,243,66,183,217,248,233,217,108,52,
+82,200,200,156,20,133,42,183,54,152,163,169,70,246,146,164,152,169,114,70,102,4,72,184,178,191,250,128,28,123,121,116,114,201,88,73,10,10,145,62,30,71,115,47,113,3,210,201,100,220,150,195,111,244,168,122,3,59,81,95,224,136,47,253,119,171,252,112,65,37,137,131,119,45,157,160,180,122,97,175,82,134,28,21,69,97,169,84,96,67,39,169,228,86,43,163,209,165,232,97,134,4,155,35,39,18,197,244,243,57,189,88,140,128,191,183,126,188,240,4,46,18,137,154,74,38,101,55,185,156,222,239,167,1,39,160,8,133,42,45,126,106,182,162,28,142,201,230,182,37,95,46,233,108,54,247,111,106,42,149,86,4,53,142,86,139,255,248,220,36,222,222,100,74,37,29,57,24,164,35,17,133,75,229,98,188,188,156,47,118,30,35,139,190,207,75,51,88,236,13,199,179,142,158,141,21,84,44,11,215,9,5,160,209,33,19,139,16,123,30,170,110,46,233,217,7,135,110,26,238,185,57,34,65,208,178,216,163,75,129,238,6,75,237,83,199,234,219,35,176,241,197,78,235,46,186,
+99,52,87,63,120,143,171,115,177,65,93,123,126,124,107,217,175,237,77,49,103,11,252,212,49,205,159,175,143,179,117,17,178,160,10,227,205,253,126,174,143,8,189,14,154,204,73,110,150,203,58,128,123,246,218,168,223,203,230,55,254,91,87,19,161,19,37,71,115,243,253,93,151,131,120,232,68,169,4,167,85,160,5,25,35,36,246,224,72,161,231,252,237,241,141,89,27,224,84,163,210,191,96,168,212,24,35,156,1,159,33,61,27,139,61,29,163,178,50,120,74,187,244,44,12,244,25,146,145,126,48,228,247,80,120,227,109,148,207,239,235,141,46,127,80,52,222,240,162,139,35,55,65,176,245,121,125,140,60,47,71,19,181,31,102,52,163,219,137,146,153,233,190,204,66,34,166,176,91,183,153,205,71,39,129,40,180,244,207,99,143,223,205,77,74,163,207,253,190,239,241,108,22,176,5,120,241,250,29,47,62,17,23,71,165,98,83,143,84,44,22,235,75,165,173,77,56,236,54,153,218,228,22,127,181,162,156,142,37,76,171,21,91,46,251,67,54,251,111,98,32,53,75,219,53,142,
+209,72,185,213,62,209,185,92,76,73,85,246,101,178,77,36,194,117,187,92,130,151,151,199,247,197,46,128,16,105,193,74,179,255,16,25,61,255,33,82,113,157,32,68,30,23,141,150,69,194,60,110,150,15,22,14,245,0,225,32,246,46,165,138,99,193,94,53,61,39,223,65,218,238,6,70,215,61,108,123,85,125,247,157,164,28,221,8,115,64,184,214,49,74,74,60,45,240,105,29,209,165,113,247,142,108,232,110,64,64,104,24,164,28,83,12,55,182,153,121,209,211,9,33,149,91,14,87,190,85,194,141,186,92,210,64,144,123,184,11,43,179,104,13,85,147,26,156,135,51,47,82,153,70,57,28,169,67,226,61,60,68,21,109,20,242,193,211,133,254,112,129,189,86,52,81,181,90,218,247,248,15,55,1,35,67,139,166,82,82,173,253,128,2,185,140,116,20,139,125,149,90,220,118,23,135,97,192,71,125,62,169,212,140,180,219,152,12,92,244,182,121,76,231,186,248,16,13,115,58,163,237,213,244,30,12,196,251,168,175,175,40,73,255,133,203,144,44,92,179,212,27,136,43,49,26,
+37,139,198,19,200,232,209,81,124,128,11,227,250,91,183,84,239,68,69,80,95,176,47,8,150,233,76,139,70,69,209,108,118,116,31,220,75,27,141,247,124,62,60,189,120,237,30,222,171,144,139,35,147,209,201,84,16,130,69,26,137,188,47,158,79,141,201,244,81,77,50,127,126,8,191,71,204,181,217,138,25,12,210,177,101,252,62,28,106,160,196,246,209,226,191,25,41,159,148,47,76,22,130,69,137,149,202,100,239,143,135,102,161,86,31,6,137,233,204,82,125,127,123,57,172,67,223,202,255,12,242,228,254,159,65,222,255,153,176,27,164,230,128,132,118,251,231,123,177,161,7,233,114,107,70,76,46,176,31,123,79,12,241,193,167,248,224,155,32,255,21,136,4,95,229,221,160,100,45,200,68,92,107,196,241,186,41,253,206,37,5,246,237,87,241,54,117,96,122,65,18,174,169,143,216,60,224,147,36,182,243,16,167,83,4,46,183,128,87,190,157,75,255,27,122,6,130,160,224,46,252,152,33,106,181,104,196,224,4,207,188,15,217,20,193,225,68,28,94,51,248,23,79,16,89,204,
+247,102,161,7,47,175,241,15,13,66,173,142,120,54,126,240,38,96,101,16,184,84,42,162,181,131,160,151,203,74,35,174,215,72,193,226,118,187,56,44,124,13,225,243,69,164,102,247,210,198,108,119,41,187,179,56,98,48,0,227,241,6,146,246,244,55,166,86,139,32,5,197,205,210,144,214,140,177,13,189,4,73,87,43,170,72,123,147,22,13,66,90,18,249,252,148,208,241,44,5,13,1,222,118,52,44,113,96,137,188,192,95,36,175,66,232,74,27,163,1,93,214,0,81,88,116,179,50,186,109,76,164,64,68,41,22,208,234,135,10,49,28,70,202,101,36,144,78,111,166,26,247,194,76,91,64,138,114,76,99,174,23,68,167,19,25,82,40,192,245,106,118,96,28,245,182,96,177,32,13,191,106,216,249,28,249,73,253,140,100,179,64,163,17,51,43,20,245,15,86,190,80,162,142,71,168,158,31,192,5,239,175,249,63,157,31,254,63,58,239,252,79,231,17,151,208,13,82,245,112,202,65,133,139,77,192,47,6,8,222,112,160,31,126,82,175,225,45,33,120,50,158,129,29,90,80,
+12,183,28,46,56,86,14,5,69,162,185,133,52,245,176,11,181,51,172,171,193,117,142,7,96,129,93,175,176,204,152,229,246,17,185,100,56,188,213,2,204,168,213,170,142,184,220,129,139,87,66,174,162,141,70,68,115,201,7,118,86,73,25,101,52,27,17,63,191,192,205,127,150,84,208,172,108,184,193,110,0,7,187,228,29,5,20,139,136,221,25,0,237,110,9,243,239,1,202,124,101,6,108,204,18,58,12,5,29,12,182,0,108,109,146,48,208,199,19,12,25,237,3,19,181,196,79,67,129,183,240,215,87,29,216,219,254,15,109,95,213,158,88,216,101,249,215,145,0,193,33,184,91,112,119,183,96,9,4,119,119,119,119,232,67,234,235,153,103,46,186,239,230,170,168,156,80,245,100,189,107,47,57,64,246,235,35,166,214,154,239,114,1,5,144,85,149,26,86,154,129,208,62,74,203,0,197,132,65,239,97,116,74,14,70,137,83,62,9,226,251,19,68,4,209,249,4,136,173,6,90,163,177,45,29,152,66,9,248,54,155,214,88,174,107,219,232,165,210,251,111,210,135,24,12,161,
+70,35,24,47,151,251,122,189,214,13,228,210,89,94,183,12,65,24,60,2,142,128,66,113,80,176,199,227,91,46,171,124,167,51,85,102,140,176,163,119,147,25,86,169,216,32,241,56,24,14,247,97,234,117,190,197,146,170,91,56,50,217,59,153,2,107,69,163,144,80,8,124,91,223,124,137,68,43,132,78,250,178,82,48,144,139,41,75,239,223,164,240,254,213,21,194,242,175,174,244,158,83,23,158,119,247,240,154,206,233,254,121,106,29,79,205,219,178,121,173,47,158,117,231,209,215,223,56,57,211,135,117,121,199,33,158,245,56,203,11,124,249,62,97,150,102,143,162,246,182,40,40,159,253,152,55,228,238,88,89,247,227,241,65,34,253,60,143,67,43,179,120,183,90,31,80,112,237,88,59,237,47,207,189,121,208,148,110,155,245,179,121,81,121,246,197,77,209,90,213,172,157,242,19,111,84,3,75,36,64,95,109,175,199,190,142,245,31,221,174,216,251,59,240,58,54,177,162,248,17,8,120,131,157,155,215,182,90,46,175,161,68,231,217,224,54,63,55,203,229,226,2,251,122,38,206,
+184,231,181,154,28,94,121,86,203,141,197,122,112,147,73,175,190,221,108,30,127,183,182,135,217,236,101,205,231,67,253,237,87,194,75,250,87,217,241,67,145,95,36,5,167,159,222,115,130,86,240,190,119,164,247,7,215,213,192,7,206,122,186,245,25,69,241,176,7,109,70,123,165,209,238,50,114,239,249,104,120,173,67,222,150,179,79,38,175,82,73,25,8,90,143,245,250,73,26,201,158,189,160,215,116,238,241,216,175,183,31,15,175,151,155,219,253,208,156,52,207,161,212,235,174,75,155,133,193,114,188,182,126,152,207,44,230,109,191,239,62,152,204,103,158,226,37,9,191,128,43,90,249,121,77,163,94,182,219,251,167,221,254,160,105,111,201,43,239,146,149,243,159,55,159,124,14,36,173,0,252,58,75,186,63,33,132,187,121,192,85,241,155,195,243,214,237,193,243,64,145,238,226,250,108,12,15,215,198,208,189,181,215,60,210,44,244,120,80,175,108,183,229,177,113,154,29,154,211,226,195,195,138,31,39,148,164,101,178,119,223,198,198,146,235,54,48,46,31,141,97,194,112,94,44,110,
+97,209,112,121,40,12,117,32,214,133,197,107,44,157,158,131,122,188,243,40,149,188,66,114,234,116,237,198,38,15,5,136,50,149,185,211,107,60,202,115,30,113,230,248,113,24,56,221,123,57,89,233,33,145,120,181,133,211,226,57,252,244,60,34,145,152,151,155,0,207,248,57,124,122,160,208,230,195,227,74,170,14,243,249,57,152,16,54,23,154,164,108,199,155,207,78,22,235,253,118,246,44,167,49,171,125,12,237,174,129,115,241,104,188,197,72,251,84,40,220,26,51,11,62,180,209,51,76,64,221,136,72,175,35,149,137,7,235,136,72,119,146,82,233,249,248,137,124,118,47,171,19,15,55,12,140,58,119,58,6,143,61,176,213,218,43,149,122,147,253,144,151,109,191,213,58,124,178,56,251,248,239,73,226,150,222,73,36,15,18,41,109,150,232,203,93,206,250,225,154,177,152,27,44,230,120,186,92,239,110,183,103,189,88,52,139,52,173,40,25,40,54,22,211,249,254,205,108,189,50,89,119,108,24,235,113,56,154,113,172,84,171,136,22,211,109,229,135,114,75,161,93,81,232,202,253,
+124,246,176,103,205,56,154,230,145,38,239,242,70,46,37,125,178,45,159,70,8,65,16,56,12,185,111,64,135,124,108,241,133,35,225,24,64,104,35,93,199,253,201,181,213,27,199,235,210,165,161,21,199,187,190,231,62,221,219,124,172,155,181,225,172,95,47,230,121,113,176,245,92,250,102,72,197,173,109,94,212,84,91,203,114,93,46,221,18,60,233,184,72,76,77,151,29,240,23,56,244,56,104,192,71,251,198,116,170,109,36,134,110,199,102,98,158,54,98,49,109,184,235,6,232,174,200,55,182,91,177,54,218,207,43,220,195,194,176,145,205,106,191,218,55,183,125,29,237,55,186,209,174,246,119,0,60,67,19,21,55,2,1,109,208,222,113,219,86,139,229,149,19,234,44,27,220,226,103,113,179,120,13,200,114,155,192,21,249,171,205,249,218,80,171,151,3,9,77,20,217,46,102,39,123,109,184,188,56,142,243,120,172,53,184,150,85,90,210,216,212,215,185,118,14,90,184,191,205,200,27,134,178,179,234,152,136,137,174,160,144,67,243,173,58,235,134,42,82,64,251,79,197,130,107,51,
+50,29,199,63,78,219,125,20,18,184,182,219,6,199,110,95,206,84,199,203,185,226,52,247,57,244,149,19,135,191,70,194,46,209,65,212,104,183,151,45,254,237,216,242,85,139,195,57,116,190,63,28,175,78,39,195,205,225,52,44,150,229,227,245,121,209,114,181,228,29,169,181,199,66,254,124,155,78,92,20,74,3,117,66,45,199,114,171,173,116,171,150,70,241,228,118,64,239,1,73,117,229,185,107,39,119,233,211,4,67,73,47,215,151,141,96,152,255,108,228,171,250,103,35,46,222,243,248,112,71,230,7,215,229,58,92,219,65,217,113,226,124,45,116,87,167,198,211,181,46,205,185,69,237,200,109,97,233,42,224,208,189,163,103,249,239,238,136,166,183,169,213,207,152,240,50,57,87,71,90,171,90,188,6,114,55,182,247,121,32,61,118,21,139,92,53,163,176,61,143,211,35,23,157,70,227,154,43,219,135,122,145,150,131,50,99,59,206,185,101,115,47,100,148,52,249,131,140,104,142,236,21,239,218,51,36,211,196,183,136,98,15,92,248,76,124,36,253,224,225,179,73,23,81,175,135,
+131,75,136,36,14,143,69,17,249,66,127,125,120,184,202,245,60,155,70,115,191,92,219,197,87,39,46,22,139,167,33,167,229,230,113,101,227,74,44,213,64,231,76,255,229,226,161,109,65,214,109,66,51,17,209,125,74,198,21,26,202,1,225,249,61,200,197,131,91,254,174,219,230,102,35,208,123,149,234,196,73,141,146,27,195,112,13,77,67,191,206,84,170,107,185,221,114,203,229,228,239,15,102,56,137,26,237,99,30,131,190,194,224,175,97,93,196,45,18,113,5,130,103,178,197,151,122,155,89,94,113,56,30,175,119,251,213,217,225,116,207,231,220,181,197,146,140,161,165,246,103,57,91,26,201,181,199,106,174,112,81,40,221,148,8,133,187,217,36,199,242,161,212,86,2,174,252,64,99,219,222,240,106,48,246,220,73,238,41,163,224,227,159,116,203,51,9,19,96,8,239,65,30,54,227,31,126,123,92,8,229,247,61,113,94,54,236,117,141,21,13,168,237,43,71,141,23,214,101,237,224,188,198,247,83,107,28,222,112,215,54,85,245,130,166,173,15,168,232,42,32,92,77,129,51,46,
+89,29,135,150,5,179,110,181,46,160,254,219,125,219,45,76,235,197,80,209,247,50,10,123,221,92,57,246,197,85,81,105,221,172,217,242,147,99,236,108,175,138,55,74,138,115,97,52,30,199,242,170,91,176,226,177,109,253,13,226,184,214,87,37,91,222,129,99,7,212,171,45,104,85,133,107,30,27,116,119,220,173,165,89,163,186,85,163,131,139,122,221,154,66,140,26,229,53,250,109,241,240,52,221,230,126,163,198,220,109,79,11,44,214,10,165,77,27,205,227,214,102,92,152,205,86,116,127,192,52,212,49,112,86,226,152,206,142,22,138,124,92,112,181,253,244,142,19,5,203,247,114,141,5,96,26,216,128,93,95,178,194,253,93,224,223,211,106,157,60,26,181,134,70,47,200,246,168,219,187,228,178,182,222,100,194,33,149,214,179,135,236,2,137,60,158,108,159,215,217,175,219,208,225,18,184,7,60,214,142,128,243,106,247,251,162,209,56,62,146,120,167,50,86,79,175,219,139,229,209,106,113,244,170,149,90,60,190,8,159,194,199,187,219,105,41,212,234,245,185,70,181,163,109,105,206,
+88,172,30,10,137,22,95,95,199,6,215,217,112,86,57,140,241,99,179,13,114,50,176,251,213,244,117,95,27,137,239,111,157,126,18,10,184,250,179,84,1,236,163,56,180,115,160,26,235,178,142,67,156,170,219,112,223,234,108,120,81,135,242,204,55,129,105,55,77,135,138,74,43,207,166,14,239,145,241,171,113,190,59,91,38,199,98,89,127,192,161,211,65,88,92,140,56,53,218,186,131,99,179,59,54,99,179,6,248,175,105,225,174,195,182,146,23,243,154,237,150,22,237,223,50,10,127,153,49,221,161,115,226,148,45,145,168,53,54,246,233,169,36,38,13,237,56,92,45,35,159,178,86,41,49,209,134,195,29,106,215,171,70,95,50,175,173,136,195,209,159,192,181,98,252,213,124,233,60,37,110,197,2,117,186,205,34,66,93,187,197,82,171,157,53,211,123,61,212,182,49,74,51,26,186,223,49,252,2,240,163,1,248,71,35,141,34,31,18,216,220,223,189,226,68,129,14,182,54,196,119,141,171,1,139,4,236,186,18,13,222,61,85,202,107,65,90,35,214,136,139,29,33,26,182,169,
+169,85,182,193,160,102,60,26,53,12,70,113,103,250,156,110,50,102,125,155,201,102,109,177,56,71,56,220,168,5,2,26,191,191,248,244,129,148,218,100,190,26,153,78,22,135,253,193,209,122,189,185,107,174,41,156,10,197,173,81,41,255,105,230,83,45,133,114,155,95,230,108,10,101,157,66,233,106,54,155,226,88,174,220,218,74,192,149,104,236,125,219,31,58,13,198,186,37,201,181,1,227,240,196,178,44,128,109,191,191,233,59,60,62,80,7,121,211,42,144,166,110,215,2,99,188,178,53,93,224,131,213,185,221,79,165,113,248,166,225,222,84,212,9,26,83,203,161,162,179,179,3,171,209,132,146,126,206,71,251,208,196,228,88,173,9,53,144,149,106,182,253,133,54,220,155,179,210,109,35,88,183,3,77,251,60,14,229,70,108,26,45,97,30,87,206,143,69,78,206,230,70,197,219,217,239,249,130,156,228,100,108,169,52,1,164,130,243,109,70,254,33,178,35,145,132,156,204,94,113,29,226,143,161,31,28,220,62,155,114,170,243,24,59,0,45,109,123,44,242,229,100,199,241,192,134,
+216,193,219,107,245,103,232,4,114,19,155,197,74,112,155,73,187,190,221,219,112,182,211,105,2,23,177,91,230,131,158,158,253,43,33,197,253,171,204,56,193,140,127,253,136,29,114,178,148,65,156,213,234,251,143,239,4,68,152,254,225,219,214,54,149,148,58,13,182,216,202,147,50,97,170,216,93,51,80,173,178,209,104,28,52,15,149,189,221,38,236,118,233,240,23,179,189,84,236,11,115,159,77,95,225,240,9,103,36,204,22,137,18,156,118,123,152,34,108,87,222,84,185,185,156,77,183,215,195,206,230,116,176,57,17,78,226,112,24,86,89,94,163,56,84,174,205,102,173,217,206,98,178,77,39,140,215,155,219,20,138,33,55,4,51,170,126,203,25,112,71,165,216,80,201,182,231,118,195,46,151,19,191,150,223,33,73,154,32,43,40,163,166,20,200,181,111,112,8,208,189,129,68,133,184,70,14,45,152,221,227,92,198,89,136,250,226,20,187,87,218,70,251,75,135,74,234,86,63,134,152,134,58,58,22,231,120,12,227,72,63,235,35,2,195,13,71,230,234,64,107,133,6,78,97,119,
+89,221,17,243,212,152,93,44,226,160,234,194,250,140,52,49,139,145,16,44,160,62,176,211,60,103,78,129,200,140,75,54,39,84,42,197,193,236,95,235,77,135,16,227,176,34,17,28,227,119,189,51,246,8,81,14,2,129,107,35,223,216,108,219,225,24,228,116,244,129,79,136,19,235,196,9,82,2,2,8,208,31,189,185,95,2,244,103,117,194,97,177,8,64,127,74,47,35,48,226,204,102,4,107,222,178,191,208,135,2,161,53,53,198,49,227,126,177,206,33,35,35,24,179,82,176,190,39,124,227,132,233,119,63,223,182,58,33,112,208,161,15,64,95,137,227,154,42,122,215,172,84,241,109,84,26,71,74,22,33,221,92,221,69,66,239,68,76,233,140,245,111,220,222,146,72,57,36,18,110,157,88,71,70,178,110,47,248,6,124,55,157,185,193,204,48,182,203,149,227,118,119,113,92,110,164,72,19,241,68,129,116,99,49,154,91,246,38,147,141,201,100,227,177,88,220,229,18,169,39,57,34,73,56,157,239,179,100,178,21,153,98,143,234,162,236,80,8,7,129,244,34,11,141,72,25,
+35,58,25,227,211,38,72,204,36,96,119,229,203,160,101,62,62,225,9,146,243,11,128,22,1,82,116,221,14,221,143,185,181,60,155,107,27,101,117,97,181,185,138,235,128,19,199,15,235,235,181,101,40,47,23,238,89,88,116,63,20,22,84,32,163,178,156,141,229,210,235,177,76,119,173,73,50,170,201,87,180,218,249,130,137,189,119,32,178,252,229,64,65,177,57,224,236,87,214,9,180,5,187,94,27,235,31,186,93,231,111,11,104,11,144,140,252,14,232,142,134,88,194,227,142,175,181,123,250,146,231,108,29,210,144,51,167,211,229,147,153,150,179,18,12,7,185,30,44,247,41,26,240,223,3,22,235,164,125,79,155,77,235,214,118,248,49,155,157,44,160,43,220,103,191,18,142,95,151,29,143,15,204,120,66,92,121,151,147,157,140,89,179,46,50,147,190,15,194,116,2,206,47,173,79,78,220,48,31,233,204,233,24,14,246,108,209,106,171,52,234,108,139,70,31,200,81,143,238,209,226,241,172,201,68,229,54,28,204,178,217,195,79,226,231,26,124,187,223,106,124,143,101,192,99,232,
+241,15,124,21,1,159,65,161,221,195,227,113,109,242,220,75,107,177,81,159,47,103,103,211,113,87,170,86,102,120,181,250,48,24,92,179,120,146,91,224,111,52,151,67,173,218,92,44,86,149,94,197,172,223,63,24,12,174,235,15,210,45,251,110,176,83,173,100,220,60,236,143,203,70,227,60,201,45,29,178,128,8,17,45,207,250,113,248,136,123,210,207,106,172,57,121,110,150,182,163,210,155,55,60,224,215,235,110,188,236,109,241,123,174,245,99,109,221,170,27,149,203,13,250,57,81,116,187,217,38,6,136,182,30,251,203,189,15,19,138,64,87,153,107,155,21,149,141,218,178,84,23,203,121,66,66,154,47,112,116,108,213,82,173,178,252,45,231,211,174,31,239,91,151,138,87,146,45,107,52,160,66,2,232,15,166,177,201,210,71,163,89,21,108,34,185,155,43,40,113,185,137,19,224,148,19,201,57,10,118,157,247,222,190,251,150,238,87,151,245,59,112,58,12,137,31,177,37,16,224,19,245,37,28,14,56,34,75,82,95,178,88,135,36,228,1,56,35,139,32,101,105,27,187,164,247,
+89,181,90,179,120,154,22,115,191,106,173,153,214,39,11,22,43,100,209,166,213,166,117,45,177,89,204,102,22,107,190,233,234,129,147,194,250,165,186,244,216,194,140,135,69,226,138,140,204,98,204,48,213,186,153,248,109,17,50,210,97,126,105,117,98,5,129,46,241,58,169,217,188,31,130,135,171,212,56,117,134,70,91,200,209,171,69,215,98,241,172,241,110,188,60,24,206,179,89,167,69,46,175,246,62,231,144,206,151,197,50,96,113,188,102,44,166,4,71,204,241,80,168,5,12,174,54,189,60,181,181,88,200,118,135,211,137,97,127,168,84,244,213,249,124,110,1,154,73,117,107,84,235,211,133,123,170,165,84,26,243,133,99,69,161,156,83,40,150,245,102,83,45,51,212,159,235,96,33,215,139,37,173,205,254,160,98,48,204,24,80,134,69,154,156,201,243,224,148,55,246,122,93,202,7,187,175,191,97,238,176,218,122,26,175,241,4,133,246,85,254,214,135,86,9,86,246,46,251,49,229,57,212,49,191,2,107,61,223,51,52,234,96,145,63,125,185,78,205,116,31,43,142,205,107,173,
+141,166,175,186,119,172,246,253,252,98,162,166,209,10,216,240,232,178,6,231,38,211,243,220,158,127,237,213,105,33,118,57,69,170,148,76,180,65,181,133,219,99,137,82,123,5,145,72,153,67,237,112,120,245,7,114,223,26,250,28,222,37,5,173,30,93,175,5,226,251,108,225,168,192,190,0,7,200,11,249,186,197,178,122,190,13,167,5,234,126,155,141,166,187,101,171,69,85,211,212,246,247,122,180,93,42,94,11,170,153,133,18,50,100,12,140,2,60,16,149,166,170,99,147,146,50,17,71,83,170,158,97,191,207,127,71,133,101,100,80,9,214,180,66,93,181,141,77,49,162,205,29,93,129,66,225,43,153,243,122,195,162,89,169,203,105,217,244,11,18,220,63,26,14,235,144,179,228,152,19,191,37,169,164,169,34,145,10,72,228,148,116,178,237,119,57,135,225,189,195,225,90,112,216,242,13,129,80,223,239,5,207,201,51,77,226,205,206,234,181,146,239,207,71,58,11,209,90,173,86,213,106,117,183,32,145,76,187,34,115,215,211,168,20,135,106,185,95,95,200,151,149,74,53,190,223,
+47,100,50,211,181,87,111,214,165,152,188,37,34,30,55,15,250,101,99,212,168,6,166,38,171,192,242,155,25,120,142,144,105,249,155,236,140,31,191,150,169,27,175,201,64,17,95,41,138,237,46,21,252,212,164,145,165,62,154,143,84,18,178,86,47,99,49,225,216,92,173,163,19,84,86,43,213,205,173,173,154,213,157,35,150,167,84,66,74,24,141,70,197,182,195,155,117,59,173,244,87,207,246,144,216,32,163,64,169,70,227,234,50,73,183,100,42,169,148,106,175,181,54,55,76,207,16,75,35,137,33,133,153,205,173,248,62,63,86,171,22,17,13,6,127,191,29,142,234,47,164,160,63,140,8,9,37,146,197,170,190,121,250,83,107,204,96,31,183,215,42,160,68,131,98,102,149,246,84,181,177,99,21,38,44,18,183,232,74,84,73,246,231,171,85,26,237,208,216,206,64,144,81,147,81,48,220,175,69,165,169,124,127,66,208,196,145,128,160,58,169,93,48,132,177,165,167,38,48,97,131,161,227,23,53,212,177,24,85,44,142,177,58,66,24,204,160,82,29,74,131,129,202,104,164,114,
+24,140,216,206,212,159,248,163,192,255,199,224,89,161,24,108,57,28,81,3,61,142,42,16,196,90,252,90,191,229,203,52,151,227,229,220,188,219,149,28,14,174,138,195,161,226,112,177,71,149,37,54,231,51,181,247,217,120,98,48,153,74,215,201,84,109,54,83,153,39,38,0,138,216,144,225,103,26,11,185,218,76,110,209,170,40,180,250,124,238,82,107,181,88,129,218,159,159,183,49,146,148,74,62,40,190,121,175,228,148,64,93,58,4,212,5,131,91,174,51,93,30,63,127,122,189,238,212,157,249,217,40,67,179,201,138,75,90,175,146,192,140,91,183,86,95,75,215,172,209,231,251,203,118,111,78,141,137,191,197,226,64,77,173,25,26,76,51,115,27,130,53,82,202,248,112,56,160,212,80,50,202,32,155,229,103,82,244,100,226,119,99,63,158,79,37,21,9,44,130,136,140,185,137,199,101,154,197,62,7,80,168,206,139,89,82,209,241,235,117,160,37,126,187,156,232,183,47,4,80,152,203,124,221,242,176,100,157,111,219,2,213,117,222,102,127,187,12,43,196,242,91,211,148,154,214,
+223,173,109,96,54,27,89,179,249,64,255,251,43,97,196,95,94,49,0,4,232,87,204,148,147,141,12,194,172,81,7,172,98,96,16,166,127,249,244,245,73,102,196,13,195,157,56,189,140,57,247,67,152,48,107,72,163,197,99,177,65,8,20,50,162,250,141,146,206,155,76,178,134,131,95,227,193,56,24,143,183,175,207,59,110,50,46,125,155,203,102,25,241,56,102,36,220,252,13,4,6,2,193,246,217,226,219,189,205,90,49,60,92,204,205,199,35,235,233,116,252,114,56,131,195,233,176,173,178,236,226,16,180,86,155,45,102,38,235,195,68,159,78,126,205,230,238,96,50,217,230,41,118,168,240,171,86,24,104,228,223,122,26,133,129,70,199,241,231,243,128,205,222,22,172,212,243,121,187,37,73,167,3,178,98,52,175,16,232,168,47,197,8,29,80,168,71,122,79,40,134,127,174,65,185,215,203,26,120,164,17,240,133,221,113,232,50,48,253,115,245,79,203,162,171,191,154,242,14,115,159,103,198,0,246,66,159,210,92,111,48,77,124,230,106,221,206,40,227,177,225,208,39,54,200,41,
+80,201,31,239,51,45,217,175,84,42,1,120,191,123,241,62,155,214,19,127,20,48,4,66,210,69,6,119,171,86,165,217,176,34,67,18,183,91,183,127,129,159,5,250,193,15,95,55,95,178,128,126,144,45,80,199,219,108,50,216,5,99,177,36,154,111,90,1,212,223,38,1,124,154,196,154,119,244,16,16,105,220,209,253,238,68,14,100,216,152,150,75,62,80,161,160,132,85,40,98,226,159,31,200,111,19,241,244,46,113,53,222,2,12,176,174,68,130,119,43,229,134,94,144,150,244,251,89,99,230,99,188,78,191,125,173,95,235,76,183,91,9,199,110,207,206,84,227,129,62,108,50,247,153,108,19,59,254,75,15,71,226,221,67,87,146,78,103,87,186,183,241,232,219,100,27,49,217,116,221,126,207,184,92,233,113,183,91,178,88,100,31,67,169,92,20,200,53,86,139,201,220,108,54,209,175,76,230,47,22,43,185,156,46,217,58,71,46,9,211,115,245,185,66,101,202,227,114,244,104,244,87,44,22,73,132,194,172,31,44,79,104,147,100,82,247,178,246,126,237,110,246,241,15,41,149,
+141,82,118,192,4,56,33,132,191,9,112,92,48,127,19,208,226,231,255,38,0,24,1,148,225,209,152,27,213,233,150,174,81,163,183,247,64,40,157,231,198,68,76,177,8,64,223,0,189,120,15,64,223,200,41,177,47,232,217,175,101,106,0,244,132,11,80,12,48,82,105,56,108,175,157,128,98,128,255,241,165,137,105,133,153,206,229,66,144,193,211,234,208,170,53,173,168,80,24,236,118,243,63,24,199,35,3,251,37,40,149,245,40,201,91,120,62,23,241,150,208,90,197,176,88,48,207,5,151,238,213,11,176,64,47,8,227,34,54,203,108,208,51,98,85,84,34,241,199,100,160,131,18,214,116,102,20,86,228,191,5,23,250,79,175,59,81,16,191,131,134,15,100,24,226,135,190,71,88,107,155,136,138,2,218,1,70,169,12,227,76,21,155,107,86,171,248,12,26,13,51,45,235,146,190,32,235,71,195,102,181,12,217,47,229,167,63,165,82,44,137,20,70,38,144,221,215,39,20,127,65,54,199,132,205,208,227,194,88,48,24,220,125,122,155,122,109,178,148,237,206,192,11,203,97,207,
+112,58,25,88,14,39,108,177,116,31,83,165,222,94,46,229,116,189,217,72,87,40,178,0,127,198,152,205,225,201,105,210,237,139,245,174,26,168,84,153,168,228,122,42,1,96,63,10,115,62,87,195,108,118,23,77,11,211,134,73,108,146,75,207,50,20,124,128,253,168,47,201,31,251,71,122,229,31,251,65,57,215,31,251,141,8,161,242,123,181,133,238,46,180,192,222,236,151,66,139,152,34,28,136,175,103,100,205,196,12,132,96,126,245,1,62,28,194,41,81,254,33,7,49,26,3,99,249,151,95,0,146,74,225,118,127,109,245,34,124,160,155,38,250,95,132,15,195,145,193,213,10,116,0,31,177,215,171,239,211,48,157,45,152,111,95,129,132,14,71,120,199,84,171,240,133,167,169,123,245,129,222,155,139,219,238,6,124,241,62,179,80,196,178,113,152,246,60,238,27,64,169,208,152,175,199,164,99,160,113,206,130,255,90,161,198,0,127,233,9,63,173,61,49,239,19,50,222,131,208,56,184,229,235,98,109,236,14,24,109,110,233,224,20,16,5,202,156,151,26,22,208,107,125,26,13,
+43,67,146,219,109,191,206,187,100,209,89,198,223,4,115,224,26,96,178,89,184,92,30,8,4,223,128,47,97,218,56,102,248,181,74,237,10,23,8,2,45,190,96,233,109,166,138,67,160,7,0,114,79,119,56,48,120,14,7,142,195,5,174,94,167,64,29,79,101,58,160,209,194,98,178,48,153,186,215,246,59,120,165,226,10,196,177,2,71,37,213,42,143,101,90,43,153,234,99,70,163,152,80,8,78,132,64,2,13,174,64,234,141,172,58,176,246,121,203,10,144,164,112,178,226,187,206,125,169,62,234,146,253,83,253,229,26,250,167,250,223,176,198,159,234,163,50,139,103,99,111,110,72,179,239,205,58,88,93,120,158,109,64,247,186,3,242,174,86,3,128,95,40,209,185,246,5,248,125,12,147,55,94,128,95,214,246,218,243,166,162,253,72,1,154,55,20,121,94,240,69,243,231,138,79,106,54,17,29,253,99,249,157,212,126,140,143,199,61,251,69,243,52,250,237,122,153,207,125,195,169,21,111,217,177,88,23,110,114,234,213,131,109,181,251,229,233,224,6,210,90,245,152,81,158,185,
+209,226,161,193,3,134,10,164,217,189,9,205,228,70,243,89,217,165,102,40,123,29,10,41,17,187,11,10,185,62,16,224,175,92,68,182,171,191,212,48,97,175,65,24,17,53,247,177,216,69,44,190,3,254,202,133,101,180,170,228,104,56,220,111,183,23,78,185,124,255,197,60,46,167,138,215,44,230,177,115,183,228,239,40,18,217,139,252,162,214,169,228,53,125,246,128,175,225,49,163,171,241,186,191,223,47,92,110,237,126,180,122,148,177,230,179,44,95,142,82,86,243,207,107,75,154,90,125,89,75,36,247,174,200,35,56,249,155,69,169,86,157,247,22,115,35,165,98,71,9,83,46,155,205,125,44,23,121,108,165,102,73,166,229,202,82,64,57,216,110,202,59,109,99,196,243,22,77,222,179,48,41,135,28,160,217,87,218,241,55,233,127,105,71,221,80,252,165,29,57,63,248,151,118,252,14,142,82,201,207,79,52,90,250,158,137,181,217,64,19,154,121,113,171,73,51,96,162,56,115,60,72,156,110,54,12,5,91,244,130,210,33,13,218,237,242,73,227,45,14,183,203,200,23,171,18,
+225,251,211,1,133,214,145,15,15,1,189,191,94,29,14,226,183,213,169,36,249,80,123,167,211,199,79,205,230,203,233,233,166,51,55,197,213,90,110,125,114,140,177,88,14,13,93,40,6,247,108,220,98,142,213,165,203,255,239,126,51,204,223,126,51,112,207,111,88,236,243,17,225,248,252,30,228,128,249,129,238,251,222,198,246,117,246,244,52,102,209,15,33,194,211,46,149,6,32,238,8,125,135,56,40,113,181,148,106,198,147,211,193,96,103,60,26,29,12,70,125,103,106,45,38,81,171,93,206,122,210,83,88,252,52,28,110,236,68,34,7,145,88,135,166,8,139,85,202,170,123,242,167,203,226,126,63,62,93,174,251,122,221,161,177,105,234,67,169,70,20,24,22,27,154,233,60,111,198,155,70,76,214,62,30,239,58,224,240,250,221,173,89,107,18,64,27,83,106,144,133,124,126,172,80,236,128,124,233,200,100,234,235,163,94,163,75,209,120,90,111,44,158,239,247,70,141,172,235,245,155,140,175,155,77,144,150,129,233,179,112,208,31,234,236,76,248,15,245,203,13,245,135,122,239,169,
+127,161,94,137,197,180,252,52,8,141,86,87,192,106,183,23,161,160,164,12,10,243,112,88,201,102,5,252,212,40,153,48,109,74,118,155,167,16,237,181,144,163,111,32,102,227,241,125,112,80,232,182,165,22,251,229,235,14,134,85,202,165,32,77,0,208,178,72,110,49,27,193,32,115,206,193,210,218,154,129,206,86,137,199,125,221,177,21,101,49,213,52,135,59,231,119,101,171,152,205,106,150,89,221,215,131,72,242,126,69,103,218,57,168,225,44,208,157,43,168,80,76,98,132,230,243,106,228,167,120,242,97,126,131,80,241,197,118,103,85,81,21,208,126,17,136,66,81,51,213,117,72,163,160,81,143,105,52,152,89,70,62,180,253,206,135,87,203,97,101,19,137,211,100,56,48,101,179,21,142,92,62,239,125,30,58,223,95,78,143,6,184,210,197,225,38,145,176,41,112,12,84,4,130,121,139,127,181,120,155,213,162,116,190,156,231,15,187,17,160,227,230,122,189,146,72,204,23,17,132,69,29,175,86,144,138,249,56,109,177,78,123,44,150,25,139,173,92,108,151,121,157,99,145,132,111,
+213,186,90,173,202,81,57,180,105,44,106,2,252,180,210,233,204,219,2,203,205,219,100,177,148,241,132,18,168,6,130,251,163,86,188,246,144,22,49,234,107,255,122,117,243,19,226,41,216,62,33,220,110,213,5,221,157,16,223,148,140,223,248,253,176,93,117,16,211,136,70,243,189,164,100,194,164,68,69,128,148,188,3,105,69,145,150,153,8,82,169,79,83,100,243,124,211,158,97,181,123,251,76,100,226,109,65,88,152,86,177,217,160,251,29,91,146,96,14,7,147,144,56,208,189,238,234,67,56,156,59,214,199,47,55,10,171,245,185,53,141,25,237,242,110,123,109,122,69,245,72,94,165,157,218,216,58,180,69,210,54,154,85,84,93,203,96,198,192,225,9,104,49,53,98,2,231,187,146,49,13,101,163,67,1,17,16,77,65,33,159,96,50,157,92,112,68,182,181,214,51,49,97,163,65,200,245,139,252,27,195,96,172,249,49,218,100,126,129,9,104,173,204,243,57,94,243,179,7,135,130,209,40,66,48,184,133,223,248,88,130,147,250,79,182,193,236,247,19,248,183,24,140,52,102,134,
+159,194,225,38,40,52,192,4,131,227,77,222,72,63,6,215,235,204,68,162,22,143,32,36,238,122,150,84,144,140,199,105,147,245,48,253,191,251,199,234,28,137,229,84,200,102,69,114,69,166,148,43,76,162,49,179,56,34,102,126,124,196,211,196,171,68,151,34,241,180,63,129,120,190,55,156,54,92,246,148,235,169,57,63,174,169,120,148,98,98,252,239,185,37,243,108,156,97,246,138,24,18,21,219,216,206,44,143,171,160,160,70,171,13,164,183,217,175,193,250,138,36,203,227,128,137,114,50,155,171,16,127,68,246,126,240,229,201,123,143,132,38,175,68,34,239,29,143,249,151,84,151,0,173,158,0,82,253,28,42,173,150,28,139,213,5,69,178,203,153,204,222,168,233,60,154,193,42,167,154,78,65,241,130,177,4,154,72,72,58,250,196,193,174,199,69,114,121,206,76,132,65,10,197,252,231,71,142,255,145,127,131,48,241,100,132,141,205,68,231,187,97,221,132,66,49,51,213,173,70,163,160,85,131,67,239,33,51,74,220,40,165,158,201,164,242,181,42,236,104,156,48,24,251,157,137,
+127,153,160,126,19,10,41,68,146,235,118,91,189,183,79,12,86,142,64,228,161,97,232,191,133,97,87,135,181,88,207,138,22,196,69,225,184,151,59,29,188,220,124,62,177,88,246,139,169,210,33,14,213,107,126,213,98,146,177,154,100,195,233,52,191,223,79,42,182,202,126,111,118,40,162,193,122,90,160,81,102,105,60,170,2,141,206,135,66,162,9,4,178,127,120,28,55,107,145,195,81,39,126,109,57,239,85,242,120,92,75,251,40,37,71,253,159,241,21,189,240,189,115,51,122,185,227,117,3,210,231,22,164,56,108,89,111,211,250,139,29,121,32,103,71,95,177,67,177,126,221,127,148,29,142,165,124,71,95,170,102,145,190,96,235,88,20,147,21,187,195,1,228,227,87,0,20,214,103,133,90,173,195,219,229,157,53,128,175,19,20,203,171,181,74,155,134,173,179,72,58,70,112,0,45,238,24,242,24,184,30,149,64,188,86,124,125,231,211,50,208,111,65,221,213,40,190,63,41,68,217,74,72,0,113,181,95,237,247,92,73,229,107,229,148,43,165,194,84,49,187,84,252,74,37,163,
+214,40,82,30,153,78,199,103,242,138,64,239,150,15,134,121,160,231,40,198,227,124,142,124,154,108,62,48,120,101,216,29,206,137,68,10,34,17,145,255,183,232,171,99,147,49,233,169,253,241,168,188,92,114,110,183,98,205,229,230,143,86,133,18,23,203,151,229,147,101,17,97,54,203,43,213,188,58,172,86,12,6,249,44,233,170,208,167,243,41,190,130,163,204,230,11,138,201,132,155,203,231,21,209,104,30,23,130,41,84,191,249,140,95,168,208,20,40,84,69,11,133,202,157,207,10,246,59,59,127,176,40,140,89,239,126,198,152,92,151,121,157,60,159,106,0,1,240,247,95,253,25,21,254,213,31,208,233,95,253,49,242,129,250,115,62,72,92,58,119,94,65,6,120,144,252,238,3,134,45,39,105,228,120,28,40,167,112,217,92,111,31,200,77,11,52,157,45,149,161,78,191,225,226,18,144,100,64,136,49,50,64,136,101,48,136,87,231,86,247,182,148,106,170,218,218,146,86,167,40,224,123,226,151,239,133,40,108,220,6,240,61,98,57,74,141,253,244,32,239,240,192,143,84,57,54,
+125,249,196,10,57,89,204,32,96,190,63,197,196,247,119,219,155,152,171,13,182,65,84,170,50,216,34,43,149,95,32,108,65,163,85,210,240,84,50,26,29,37,71,157,118,29,104,48,164,108,15,219,104,185,220,255,197,180,54,151,138,221,44,102,235,217,111,36,82,84,175,63,233,12,144,215,226,167,8,52,10,6,247,159,222,171,65,155,44,87,149,179,246,56,125,56,42,1,222,146,57,156,40,14,215,95,92,157,6,117,188,92,1,43,102,47,253,85,2,250,75,193,98,163,128,254,246,235,28,131,165,192,46,103,69,42,69,166,112,203,201,98,49,138,88,220,141,126,124,244,211,68,195,93,151,98,240,180,191,177,67,118,208,147,25,13,228,35,131,17,29,38,201,77,199,83,251,43,128,68,189,99,177,26,250,18,98,181,231,159,16,35,92,255,132,120,224,255,39,196,27,50,239,184,17,18,98,44,255,26,200,179,228,8,40,226,83,228,1,69,104,189,238,139,128,14,199,32,165,163,239,44,241,239,240,32,170,94,231,255,55,111,75,141,48,16,194,1,197,213,123,237,242,214,218,23,
+134,51,90,27,202,116,138,194,81,17,42,181,188,52,131,81,208,48,250,175,175,37,147,143,118,48,44,92,150,59,192,96,66,62,201,63,17,41,32,193,12,1,137,194,64,252,224,8,148,157,232,130,67,10,29,93,103,216,11,125,34,74,44,134,170,139,197,58,155,204,39,40,1,240,162,206,231,208,188,198,166,115,242,191,191,97,153,68,74,201,102,81,156,159,159,80,240,173,115,123,175,233,45,18,224,10,11,131,145,193,17,148,192,33,128,242,251,67,62,208,85,232,229,237,14,144,133,103,145,42,203,71,163,84,213,100,85,86,42,100,117,228,111,189,214,214,120,21,202,127,210,37,153,12,171,45,230,242,242,201,148,78,49,155,81,147,73,8,151,167,8,133,95,233,134,94,35,83,231,201,100,217,21,133,34,195,96,168,219,251,45,212,224,10,165,17,30,145,34,254,254,205,185,112,87,201,233,113,13,161,224,148,220,85,62,103,124,211,97,2,202,46,36,160,184,119,244,102,71,28,241,14,124,10,160,205,28,34,219,50,148,242,249,116,117,55,93,251,47,16,220,65,169,28,10,135,
+239,127,32,171,183,22,104,182,132,234,7,37,143,85,74,67,250,136,11,13,1,213,119,58,43,27,176,207,227,198,158,194,64,70,131,89,172,253,47,23,247,214,133,174,236,217,205,126,111,71,64,11,253,2,136,165,30,234,123,132,95,73,75,215,219,57,172,252,116,47,167,96,127,189,129,123,134,219,62,159,144,8,127,144,65,59,24,36,88,157,236,56,105,164,211,2,195,69,205,50,81,164,79,183,206,101,143,233,147,208,172,189,201,200,183,246,202,239,241,106,121,44,210,48,153,136,14,7,190,29,216,116,155,68,61,118,249,147,71,39,224,241,177,72,36,236,251,126,167,51,63,122,120,92,20,1,239,221,173,119,190,54,217,168,42,135,203,49,241,120,140,57,189,175,101,88,27,28,174,118,190,58,93,234,120,131,88,81,0,87,128,124,252,195,98,245,177,216,13,224,103,231,58,199,101,89,21,26,89,145,86,67,253,44,22,162,74,69,175,31,238,111,50,153,243,15,50,224,146,125,55,74,178,36,47,73,27,246,127,128,124,220,43,151,55,191,191,231,187,113,184,89,122,105,210,91,
+202,191,229,101,168,224,255,53,175,25,146,78,135,227,227,71,108,8,4,22,124,34,232,117,31,233,77,75,66,247,129,102,167,250,132,56,157,6,1,97,56,155,125,191,65,116,110,184,186,187,237,87,171,173,183,215,244,183,186,129,102,184,31,45,20,193,136,147,168,90,37,233,203,160,115,8,242,43,193,248,9,145,244,24,20,134,230,20,28,204,23,208,173,91,123,122,62,44,252,121,15,250,224,252,239,213,137,129,67,128,117,37,6,92,84,45,7,193,35,211,236,92,182,248,77,159,213,23,162,190,89,219,111,241,226,7,110,160,151,27,13,12,6,162,188,51,205,38,81,203,12,200,188,116,80,183,235,52,232,245,229,145,108,6,234,5,45,46,21,139,137,252,192,226,162,112,120,111,121,127,1,91,168,38,148,211,215,98,144,24,16,216,1,96,13,56,27,174,124,117,170,212,113,81,161,162,0,174,152,113,214,24,147,217,195,98,187,134,203,165,92,231,168,218,150,66,33,43,2,242,47,53,159,255,81,40,251,64,254,53,24,12,229,49,66,174,178,149,10,185,79,151,82,70,232,15,
+99,27,215,182,95,46,27,84,170,90,121,32,153,149,141,229,227,177,25,203,200,248,249,96,114,28,243,41,222,229,103,190,22,39,231,71,78,223,84,173,251,1,206,192,114,57,130,193,155,224,170,224,252,241,144,195,141,138,87,255,198,31,236,42,169,234,85,18,42,216,2,108,75,1,4,174,21,135,79,248,182,90,197,179,155,167,84,129,176,88,128,96,144,22,179,111,123,24,200,3,56,32,111,49,44,146,190,81,172,162,246,90,6,49,6,206,207,98,197,38,38,57,10,35,187,80,124,146,88,169,204,128,62,126,162,159,16,136,191,139,122,77,63,42,68,143,234,129,233,23,134,240,34,113,44,214,26,255,108,29,54,89,72,224,251,2,67,118,175,27,211,210,46,135,3,123,45,150,194,141,95,139,165,54,25,155,67,15,14,71,196,93,75,55,147,78,143,191,223,223,0,174,226,0,170,122,224,159,127,136,58,43,85,229,124,76,60,220,0,174,58,62,57,156,110,6,135,27,95,157,38,172,58,94,169,0,217,118,77,180,88,99,44,230,39,30,139,205,192,225,227,59,194,109,210,36,
+128,231,68,212,114,98,161,24,83,26,21,255,22,79,177,199,255,22,79,17,106,42,181,138,76,37,63,190,183,155,79,187,61,67,156,205,198,5,170,201,248,200,94,102,140,221,117,121,22,203,115,169,176,212,36,235,243,41,111,185,20,173,143,200,165,186,55,52,13,197,125,130,228,95,138,247,118,153,55,196,23,8,61,245,107,236,99,193,78,87,103,69,4,133,58,39,72,73,68,137,1,159,186,241,65,213,42,40,73,251,157,205,193,241,56,18,79,64,88,44,32,154,178,12,105,210,86,182,214,28,219,212,149,65,175,61,80,182,15,56,52,5,80,52,68,74,201,63,80,48,2,226,231,35,159,247,9,127,4,0,71,95,20,29,33,113,8,93,9,228,7,125,23,10,159,35,83,9,210,160,170,212,63,84,90,75,44,35,151,74,132,223,123,50,54,24,248,102,42,95,111,16,54,184,213,12,55,19,66,34,125,32,145,136,159,147,173,55,251,53,180,28,168,112,248,51,16,112,126,8,4,63,45,126,111,246,186,221,140,191,92,184,159,110,247,107,21,212,226,104,253,84,198,50,101,143,
+124,60,34,152,172,177,107,165,242,169,86,127,80,109,212,159,173,241,83,254,211,205,148,100,192,149,220,188,24,155,76,62,205,230,238,7,147,249,179,55,127,182,21,209,204,107,177,46,130,64,166,252,68,99,98,140,88,252,33,20,254,180,173,130,215,150,40,154,20,241,19,167,244,134,177,70,192,69,120,5,219,11,55,183,185,31,63,200,10,197,232,153,173,24,254,231,92,48,2,114,193,173,105,177,210,255,208,84,82,195,40,127,2,71,120,15,66,171,213,142,135,55,155,95,193,175,222,5,198,190,97,245,52,101,163,137,240,177,113,165,42,116,102,217,210,67,31,70,6,200,143,1,237,28,116,96,224,141,10,250,23,145,244,211,122,219,83,8,223,29,97,186,245,203,7,185,26,152,192,21,169,127,161,73,1,81,244,76,117,163,1,231,3,236,92,167,49,95,118,36,237,181,246,167,213,250,183,158,137,209,0,103,179,29,185,124,13,148,46,250,75,65,189,232,72,56,40,18,181,128,121,119,185,84,92,230,247,7,30,135,66,192,131,255,230,189,86,13,43,23,47,33,69,63,157,175,
+69,64,29,28,8,183,190,58,71,83,210,208,106,65,85,43,193,120,36,222,145,72,214,93,81,192,38,240,215,154,90,13,71,73,42,22,80,211,9,239,181,5,75,161,88,227,250,98,155,171,86,43,248,36,26,53,133,70,67,15,209,168,32,12,6,248,225,109,221,224,218,172,197,44,155,163,126,172,191,110,218,155,253,52,206,174,143,203,38,242,249,227,253,57,217,213,40,199,149,108,193,28,63,255,5,218,29,234,95,160,245,241,254,5,218,200,171,48,124,220,27,250,151,31,1,80,222,8,239,190,131,229,61,89,66,84,171,66,0,202,227,235,54,176,175,15,65,238,247,68,132,168,82,37,0,88,182,244,193,95,31,96,71,193,157,131,79,73,131,40,10,97,10,4,102,168,42,117,216,231,71,138,255,17,122,131,188,227,223,17,175,251,5,33,186,30,51,234,195,248,233,22,230,92,54,153,62,43,53,8,89,144,106,181,253,166,153,87,203,100,65,141,70,95,107,16,54,185,213,76,61,243,35,158,128,32,145,145,244,201,54,154,97,48,93,28,192,203,96,32,0,21,10,4,64,48,
+96,222,232,132,253,17,125,185,52,130,64,77,145,70,114,216,186,122,50,249,216,31,214,40,135,35,56,159,243,129,57,207,85,20,147,177,141,104,182,162,153,204,32,48,231,66,56,60,13,204,185,76,147,120,237,97,82,200,137,249,34,90,225,86,4,41,20,33,10,197,78,151,25,50,83,46,7,202,0,65,149,74,161,174,81,40,84,240,124,22,18,93,174,116,2,39,83,122,98,187,14,108,116,222,122,211,89,169,112,233,33,253,136,83,254,11,160,161,244,151,136,2,26,138,127,137,40,160,161,63,127,34,74,48,76,94,34,202,111,15,209,243,25,8,12,140,124,11,250,98,35,56,110,138,11,240,210,90,9,4,122,189,138,129,96,227,86,127,108,36,132,216,128,253,16,252,160,93,192,65,120,217,15,255,45,5,98,168,106,117,74,232,227,27,244,253,246,6,201,16,240,0,130,4,116,16,70,199,172,250,161,119,75,24,218,239,235,76,111,100,42,13,38,35,175,218,7,240,111,18,61,28,188,1,16,2,8,218,220,15,172,68,2,36,207,47,48,18,9,20,52,54,171,65,194,225,
+32,68,98,27,186,210,189,214,28,217,78,239,112,248,219,253,254,213,246,120,218,75,237,104,188,34,30,142,104,167,227,13,207,225,124,225,112,237,171,238,69,70,139,5,117,171,86,222,226,241,47,137,77,210,238,138,116,2,127,169,212,212,170,148,80,115,196,252,197,100,182,247,102,168,78,17,45,165,5,42,140,150,246,218,127,20,173,249,210,68,157,46,69,159,191,194,40,105,48,248,70,109,55,111,229,242,87,141,166,125,123,173,254,42,121,40,143,35,71,7,251,66,25,30,209,106,56,42,164,144,23,31,183,51,139,179,167,56,251,79,26,5,185,163,120,39,86,165,140,81,175,54,31,38,237,46,28,115,32,30,71,152,120,114,29,89,31,135,123,199,217,92,143,155,23,247,252,249,177,16,52,79,207,251,52,244,180,207,171,94,43,30,146,121,10,30,79,216,143,248,138,6,242,1,254,47,119,157,92,243,198,220,55,132,2,189,74,111,71,158,92,254,48,252,245,62,118,160,170,6,124,224,233,20,98,97,233,194,37,208,207,27,96,80,196,44,204,196,228,103,192,246,127,241,84,1,
+225,19,223,94,247,3,232,64,171,242,181,223,74,76,160,85,249,162,40,159,91,4,139,197,32,98,241,214,223,17,250,254,252,233,181,174,200,138,96,15,134,126,32,245,95,64,21,32,183,73,164,48,16,137,212,186,213,116,22,31,16,78,97,34,17,4,219,110,251,83,4,58,91,71,198,96,222,47,87,216,12,208,1,107,49,149,13,139,70,11,120,189,14,89,39,18,254,8,130,239,134,115,76,102,100,165,10,195,168,213,144,193,192,159,181,146,248,250,116,42,197,103,201,180,180,92,30,57,177,77,253,113,44,223,81,41,165,242,98,153,138,76,158,211,208,209,232,27,208,3,32,31,31,64,116,231,183,101,223,169,146,236,59,9,167,245,250,200,205,22,134,47,151,33,42,149,127,112,148,180,202,70,127,86,74,131,0,228,253,76,249,215,11,128,188,74,136,103,121,43,246,159,219,231,134,189,166,144,11,130,72,97,151,170,88,31,221,226,108,68,83,202,212,1,188,42,203,55,45,238,103,239,137,188,129,137,247,35,61,5,241,247,93,169,11,216,202,77,251,199,156,11,185,7,19,31,
+167,68,10,139,60,192,239,101,168,104,122,74,205,248,191,185,70,12,66,249,254,60,87,171,239,173,127,129,171,6,100,216,219,126,239,211,182,87,69,32,194,98,223,128,154,218,131,192,161,197,151,153,117,179,114,48,232,11,72,176,207,61,152,146,20,130,133,68,194,219,59,232,69,120,30,24,232,15,152,103,31,182,5,52,227,204,240,154,192,193,191,0,91,114,149,64,219,237,205,110,135,62,102,170,231,0,254,107,73,66,229,242,71,239,243,244,236,64,48,120,168,30,174,127,188,222,33,254,118,195,224,183,8,184,175,117,226,63,91,160,102,51,121,93,78,161,255,217,67,116,180,142,38,157,222,241,176,113,58,78,243,231,156,175,198,54,43,209,222,114,220,182,90,183,172,53,211,215,21,121,5,224,27,240,28,173,178,91,220,22,54,211,201,41,159,15,220,20,138,71,95,236,37,9,33,205,70,66,171,244,118,105,212,13,26,237,191,181,5,94,62,136,199,123,38,147,177,238,176,183,146,26,141,103,109,99,101,244,24,207,73,238,154,231,17,247,159,71,142,23,134,154,94,214,128,159,
+101,84,88,126,210,219,87,116,53,250,238,52,151,154,32,184,152,166,95,222,188,244,96,115,241,99,4,28,197,5,169,214,62,43,203,66,234,205,209,68,70,242,41,7,251,121,193,171,129,179,88,184,53,144,204,73,210,180,221,229,162,185,182,41,50,41,101,28,222,68,79,233,146,19,177,151,35,30,143,75,63,170,115,167,181,0,221,209,208,84,218,19,20,7,52,177,117,41,55,227,254,53,177,84,11,228,224,164,70,160,22,144,197,128,40,230,71,78,20,124,226,41,40,92,241,9,32,110,50,208,110,129,168,104,29,189,17,101,163,124,175,27,95,165,175,74,71,173,129,144,81,60,171,206,199,226,33,182,171,109,235,64,253,253,93,65,37,210,115,54,219,218,232,63,172,175,32,118,38,116,187,173,29,217,106,128,67,224,136,115,32,208,218,172,8,192,51,166,75,58,226,126,119,53,26,13,118,18,63,90,12,246,123,255,218,225,4,136,174,197,187,57,197,2,188,82,165,159,213,106,215,96,208,32,100,73,163,89,207,108,138,172,38,211,243,126,239,106,87,42,141,56,86,235,56,51,
+139,249,144,82,213,99,231,115,171,104,236,220,135,247,93,153,215,170,33,169,214,70,47,230,130,202,141,170,71,33,175,54,91,238,217,110,119,177,217,13,76,129,186,12,161,27,3,139,228,181,21,136,36,229,185,150,158,46,160,213,99,61,192,247,239,215,71,188,147,24,239,141,199,184,54,159,247,176,241,73,222,18,207,60,131,225,89,84,98,92,79,90,250,230,117,245,114,15,102,250,130,167,120,87,26,131,39,3,139,139,79,35,101,46,133,242,91,185,192,9,113,47,108,5,133,220,1,206,166,84,1,30,108,138,29,183,30,248,131,215,40,118,101,252,220,210,237,128,96,50,119,73,19,56,155,36,112,56,93,165,172,47,228,77,128,167,71,181,246,151,41,52,189,136,131,242,253,122,6,4,72,31,0,191,238,152,193,249,42,106,203,0,134,130,145,163,157,79,4,86,80,90,41,89,205,192,80,105,116,144,15,36,1,9,242,217,64,39,151,175,109,43,161,0,253,177,41,149,32,44,22,254,202,199,200,149,234,117,42,78,221,211,199,225,13,19,113,112,187,92,214,25,129,67,17,249,
+95,91,131,62,156,174,215,169,248,75,244,224,113,71,118,26,128,67,65,0,242,115,92,17,108,24,204,234,122,181,223,61,128,252,208,170,89,232,208,225,180,215,235,181,132,47,177,136,32,70,203,33,212,98,94,87,171,254,152,7,253,183,70,232,173,199,100,217,177,216,218,69,119,89,212,57,86,11,213,153,203,173,148,74,123,30,158,175,69,163,139,16,76,106,117,177,95,43,133,116,114,112,40,84,251,250,106,45,252,96,171,151,199,226,189,126,31,118,127,48,196,109,141,6,27,48,8,53,163,209,254,26,4,141,171,253,232,107,107,100,184,98,196,123,2,6,48,191,80,118,103,90,226,185,228,18,207,222,126,239,49,78,50,66,79,137,232,198,243,198,100,119,173,161,194,134,50,238,14,204,185,195,10,87,138,42,62,25,191,185,83,80,209,117,161,219,83,202,66,129,166,24,146,200,184,246,253,100,76,220,135,100,30,81,151,5,248,251,35,123,69,81,200,221,137,58,82,76,41,146,219,157,83,219,255,188,239,233,215,27,76,124,11,220,237,48,84,244,44,38,160,112,95,135,235,177,
+5,91,211,61,203,57,54,48,128,218,0,218,3,113,16,164,2,50,12,16,97,80,58,160,210,73,160,249,60,200,247,39,71,239,194,63,57,242,117,222,192,240,64,185,12,30,249,76,165,6,112,18,108,115,40,4,40,23,12,118,77,220,92,116,86,247,23,145,128,48,24,58,55,22,47,145,248,122,159,195,206,26,98,244,224,194,97,31,120,36,27,246,222,48,120,22,84,32,72,180,248,244,5,189,245,183,32,232,228,91,106,165,82,68,22,91,199,58,28,190,161,180,41,253,251,181,45,21,119,197,166,86,179,169,84,105,170,246,59,158,116,76,112,11,4,14,79,220,221,67,169,6,151,173,198,228,110,57,56,159,103,43,20,182,68,95,44,21,66,178,155,70,66,174,236,146,169,171,77,52,106,11,133,216,109,161,48,209,22,72,249,79,16,137,151,252,137,117,89,189,222,202,96,180,151,15,101,246,239,111,98,59,20,177,165,73,224,64,86,129,199,134,150,64,81,118,130,230,203,142,47,148,226,238,220,172,241,158,237,230,205,137,249,120,234,69,199,139,247,103,116,113,98,102,154,100,
+248,123,31,254,226,23,224,253,207,238,81,201,46,164,80,8,79,20,208,171,211,20,208,171,78,87,160,205,248,229,141,11,98,35,21,3,15,158,45,49,183,10,252,49,222,220,1,192,247,5,209,78,41,203,15,47,117,218,194,144,121,92,220,158,215,57,9,60,95,48,113,251,150,121,197,206,187,231,170,131,148,120,145,14,31,252,186,127,12,74,188,35,76,76,22,160,81,108,212,159,29,243,67,68,16,241,253,253,13,36,0,234,34,174,165,7,9,160,224,215,52,192,161,127,211,160,210,0,65,18,229,214,129,6,129,97,121,251,146,168,147,251,53,13,254,28,156,76,127,221,129,107,125,220,216,110,75,152,203,1,1,102,220,58,209,49,22,44,216,239,127,237,254,113,122,121,187,189,254,186,185,150,129,32,233,100,137,234,121,152,195,89,230,88,56,179,195,33,85,128,247,42,213,178,90,61,27,224,6,169,92,112,49,235,97,172,38,208,229,114,168,31,56,78,11,53,151,211,13,149,202,114,62,63,139,130,162,135,16,76,166,29,14,105,20,125,44,86,14,33,66,51,161,240,208,22,
+60,157,124,16,135,151,76,112,0,87,24,24,182,27,94,169,92,158,169,84,135,217,64,114,61,111,15,217,172,116,38,77,150,158,103,19,218,9,67,93,150,94,185,88,45,186,163,46,201,7,131,193,123,198,247,231,10,48,27,156,244,71,220,60,186,211,244,146,164,15,137,52,126,159,48,139,43,43,220,254,255,49,15,122,233,35,246,167,68,4,5,37,37,3,253,194,17,0,202,65,72,80,8,122,249,3,126,101,235,130,66,16,12,92,165,106,129,76,76,149,22,42,94,136,117,182,111,32,8,97,191,32,116,192,30,182,65,0,123,61,0,189,21,192,254,5,125,235,149,131,216,24,44,72,31,126,45,138,105,233,0,236,95,208,215,116,186,191,13,36,199,61,184,209,72,101,3,93,192,29,118,123,112,2,151,72,165,253,192,133,165,201,12,46,20,82,25,255,23,112,1,120,220,14,135,195,1,168,200,3,231,230,242,250,201,244,245,54,100,190,131,153,206,35,66,50,85,15,56,135,110,52,230,127,45,38,65,146,255,45,38,1,145,41,122,20,154,1,131,195,48,183,91,184,193,189,
+137,172,52,34,41,240,189,79,12,92,39,255,247,239,168,231,122,38,78,23,242,115,125,63,2,134,0,27,19,191,96,247,36,47,179,165,18,31,176,59,2,179,159,61,73,233,199,185,89,121,13,131,205,16,166,122,159,95,246,95,190,1,110,44,101,25,206,61,35,30,105,234,33,25,215,110,148,87,200,66,85,188,150,8,156,197,235,40,164,235,2,205,171,166,160,152,209,179,114,93,66,69,67,231,228,18,48,0,69,218,202,173,251,229,158,236,115,233,33,19,15,197,165,26,24,154,13,126,79,193,40,100,125,218,151,226,61,89,94,54,161,148,224,149,239,122,1,255,180,98,94,38,0,120,0,252,101,2,128,7,64,125,237,63,103,142,233,54,79,243,81,170,39,98,231,72,70,100,233,170,95,19,158,195,222,149,116,111,93,17,100,55,184,102,117,20,27,123,45,28,118,96,32,33,235,27,161,2,81,195,27,166,137,185,3,173,232,134,104,165,69,85,35,118,160,37,93,219,143,128,52,12,190,111,21,1,244,193,122,83,126,90,200,243,115,230,152,255,169,225,126,239,11,141,211,17,
+229,28,146,222,80,214,253,129,199,126,108,57,183,236,229,178,223,195,7,91,155,27,230,102,177,232,241,214,133,233,150,100,109,14,72,44,6,166,255,90,104,52,29,215,25,56,219,217,28,255,72,242,38,149,234,216,95,45,15,232,254,144,20,171,187,162,51,53,246,57,177,106,12,213,196,98,1,65,111,175,13,168,225,249,137,68,152,1,111,24,81,113,188,171,183,201,201,124,30,2,83,91,144,226,11,3,163,242,45,181,202,115,18,6,227,45,8,233,172,227,170,174,5,25,22,124,148,223,160,1,86,106,68,194,44,126,33,224,213,213,218,88,174,194,121,43,55,25,158,223,27,178,104,184,95,249,54,111,194,31,22,161,141,184,127,195,38,151,236,4,54,82,247,232,43,214,193,214,11,23,66,30,125,209,34,198,126,160,46,214,196,121,134,208,172,105,181,125,86,157,172,121,67,247,19,37,190,160,13,107,199,74,141,114,252,170,225,113,37,127,153,140,224,136,33,178,228,183,161,225,127,61,228,0,143,43,207,137,233,147,18,188,127,211,213,252,225,36,217,32,42,222,15,95,170,0,
+112,90,241,100,195,131,204,222,79,12,45,138,63,193,79,222,41,193,219,61,171,130,148,184,94,14,135,98,122,152,150,247,18,186,160,140,35,240,58,110,237,235,122,212,149,70,203,134,27,106,93,182,227,92,22,61,217,62,80,23,190,69,203,82,109,54,3,160,29,170,88,92,157,145,2,18,178,86,27,133,187,191,54,47,194,104,164,99,209,64,170,130,7,232,152,41,191,217,60,94,82,243,181,198,201,25,89,5,249,54,100,64,98,98,101,69,109,209,92,113,84,96,209,13,44,218,151,81,10,161,119,33,25,53,189,113,55,122,251,222,130,102,252,58,178,28,120,110,194,249,213,96,72,200,247,136,128,90,29,68,68,211,239,183,175,118,111,47,51,225,224,69,112,209,87,89,34,120,203,249,118,175,201,239,231,107,85,179,190,48,11,85,117,77,200,172,210,138,199,106,212,105,234,47,109,111,149,54,181,84,157,79,149,251,185,193,162,149,43,70,77,111,115,18,30,107,249,207,193,238,246,12,80,30,228,105,227,121,97,76,23,232,132,197,185,168,6,22,206,51,107,113,85,28,3,162,
+66,134,208,247,71,228,252,40,201,136,41,190,30,186,129,199,198,131,151,9,138,195,210,222,143,176,178,248,126,49,30,223,80,194,140,59,182,130,165,27,217,144,49,217,217,121,31,97,156,242,253,2,117,124,193,38,233,38,89,201,183,12,1,73,128,169,61,243,0,29,81,210,180,239,215,210,64,213,170,59,79,87,234,228,180,253,35,230,21,246,31,98,50,95,196,172,212,33,141,175,30,4,32,38,134,75,26,14,87,7,56,71,68,100,115,191,86,239,110,40,120,119,77,77,253,82,171,115,178,43,204,45,98,83,37,53,251,18,129,41,123,71,110,162,156,80,232,10,138,140,38,200,85,36,20,180,242,11,188,57,163,191,251,124,86,189,111,0,43,119,204,140,252,91,226,16,16,75,161,174,178,36,193,8,211,249,79,3,170,141,16,144,43,48,168,242,230,3,221,30,148,164,213,190,185,20,21,142,205,233,173,176,56,70,211,5,141,185,24,165,22,63,76,31,177,16,133,175,58,61,250,151,157,134,141,163,212,61,107,67,165,56,216,162,132,75,200,99,43,90,176,31,6,212,37,162,
+217,12,107,203,41,222,54,62,218,243,57,237,202,187,59,26,139,230,58,141,109,56,86,211,242,197,177,183,56,226,75,6,255,63,130,18,147,255,8,234,20,255,35,232,183,233,31,65,19,252,127,4,133,29,254,17,212,157,252,71,80,138,246,31,65,79,193,127,4,85,122,1,130,222,158,141,185,177,228,115,30,87,135,163,122,16,127,81,178,125,40,108,183,80,35,99,59,184,92,236,156,175,252,59,165,246,135,228,9,152,113,96,196,7,250,217,175,145,233,31,203,133,24,132,142,238,243,226,237,110,238,238,53,226,87,167,123,102,230,151,223,118,97,232,100,47,203,83,193,121,69,78,145,210,4,66,242,183,16,64,201,88,10,224,164,253,123,64,227,48,48,159,217,88,14,5,254,248,249,254,228,115,155,161,112,39,54,34,11,137,228,190,205,133,129,241,233,132,26,28,18,243,242,110,75,143,184,232,204,229,197,63,17,232,226,152,73,83,47,154,98,134,74,251,48,193,201,33,49,95,117,126,172,199,59,13,7,39,142,79,45,166,10,109,176,253,104,2,99,62,4,128,220,3,99,62,
+213,172,16,205,90,222,106,231,93,147,205,251,132,126,53,83,143,79,183,147,103,95,120,90,71,89,13,127,90,28,113,189,210,63,32,133,178,127,64,30,56,255,128,36,76,254,1,201,81,255,3,18,253,254,15,200,75,252,31,144,10,198,63,32,87,148,127,64,22,185,47,32,79,71,28,174,225,129,89,151,45,157,71,186,88,182,7,112,215,192,104,243,192,199,185,210,118,15,3,104,200,96,249,66,48,76,100,245,248,198,13,135,193,209,155,244,231,79,37,65,247,138,103,7,76,245,151,84,1,157,91,94,84,116,0,92,220,95,132,5,63,116,66,121,81,17,38,200,65,58,68,20,140,245,61,20,208,160,51,106,198,192,8,57,220,223,98,9,255,159,66,178,222,67,212,244,72,248,65,4,175,232,95,130,144,174,108,123,127,243,45,155,39,211,13,173,61,10,20,104,51,126,216,62,64,133,42,120,77,3,83,105,63,199,29,1,10,237,47,173,110,129,175,113,205,198,70,59,123,247,182,81,173,162,194,158,101,23,95,198,127,94,239,50,150,212,11,121,128,150,206,155,239,190,225,93,
+251,251,143,35,235,103,113,221,8,22,8,96,160,157,205,63,20,75,118,112,211,219,129,165,185,59,10,25,37,116,197,78,48,25,240,248,245,48,49,125,42,211,57,194,158,45,106,155,32,50,239,149,25,145,241,43,192,236,127,16,230,102,247,245,51,225,60,118,135,46,224,66,90,38,2,190,43,174,255,70,117,174,143,67,33,101,188,109,255,112,83,13,140,157,11,48,195,218,63,119,1,10,171,233,229,46,211,4,34,217,158,97,194,34,91,194,13,107,19,232,24,126,182,137,104,224,29,245,81,99,199,175,23,0,224,114,175,33,6,102,24,50,217,254,1,135,166,253,3,206,2,251,7,92,138,106,96,124,75,5,20,44,83,74,34,124,251,92,6,156,158,30,20,109,191,125,61,46,46,32,123,243,159,91,46,2,253,122,111,61,183,113,119,195,174,128,216,35,198,163,115,136,130,56,52,197,26,117,248,97,162,210,66,118,254,239,249,177,95,236,18,28,156,189,190,240,88,203,3,106,172,182,153,113,179,185,84,228,57,204,99,179,101,127,243,6,246,150,240,183,144,165,145,241,239,16,
+0,85,46,105,35,166,64,184,251,195,30,229,251,67,117,215,30,164,58,200,206,245,1,87,68,191,147,195,228,8,54,158,217,166,207,229,233,210,60,142,61,146,33,47,56,118,60,110,184,27,87,234,85,218,47,94,160,0,133,9,89,255,101,129,202,19,120,213,173,213,8,25,224,223,143,119,108,86,94,171,183,198,26,109,219,0,70,211,209,29,23,124,187,181,37,156,208,244,59,224,207,235,54,1,14,29,29,145,185,63,116,118,252,108,29,94,64,51,227,66,109,154,158,159,166,148,126,179,25,69,65,145,99,169,156,194,175,127,135,65,122,145,45,33,230,7,156,2,7,140,37,33,234,55,84,144,200,183,96,151,128,166,251,77,40,226,183,138,13,229,194,190,8,152,47,190,11,244,120,254,14,89,231,180,219,152,135,225,135,131,206,33,73,134,213,52,12,161,42,249,57,150,160,140,42,63,136,203,179,115,140,101,68,119,96,77,206,44,36,70,200,96,100,13,77,26,202,174,233,88,207,150,149,108,126,75,245,163,132,27,239,247,9,150,230,153,199,79,43,91,197,191,64,191,255,224,
+185,122,247,102,238,233,33,191,170,146,67,11,114,49,189,28,190,126,102,203,108,159,18,244,13,78,78,229,232,98,197,42,149,157,205,135,132,116,141,191,230,136,185,45,108,227,101,6,38,204,108,103,179,116,156,25,10,150,74,254,17,2,33,204,130,15,172,138,250,54,178,8,210,169,220,180,204,172,96,21,249,177,88,45,148,255,49,162,4,204,210,139,17,126,96,150,94,140,48,152,229,228,79,128,17,0,37,254,24,193,36,32,127,3,237,177,172,243,230,231,191,65,90,199,41,52,105,221,95,164,10,166,99,127,242,205,225,33,40,195,81,203,150,225,63,82,38,170,147,35,72,92,55,124,98,152,107,211,43,226,121,86,185,159,232,127,187,241,129,60,14,4,200,195,130,205,69,101,204,119,0,38,226,162,204,244,207,80,142,206,161,152,210,39,26,40,9,100,55,127,34,148,115,45,191,110,204,92,252,142,1,64,9,14,181,207,135,236,226,45,88,127,236,140,249,96,227,155,157,143,201,19,52,122,212,111,199,104,0,4,198,222,173,134,96,122,64,129,9,246,245,1,46,34,174,223,
+46,168,128,0,3,15,138,189,248,151,2,7,41,210,63,1,9,166,141,246,177,137,223,64,20,42,88,89,65,144,1,167,94,41,75,88,122,51,189,204,12,240,50,18,11,246,11,207,140,191,1,21,101,124,126,32,223,145,64,40,128,2,2,108,34,190,35,164,130,212,231,134,254,230,107,117,142,208,117,18,209,208,202,38,193,102,151,97,171,243,101,45,208,38,222,59,11,127,248,12,20,201,79,95,185,108,98,14,9,209,237,88,147,154,153,5,153,119,232,75,55,137,36,251,38,129,60,122,121,235,5,229,88,28,170,210,24,81,122,140,137,209,196,121,146,38,90,60,207,86,246,241,154,237,191,75,112,159,49,34,231,196,85,61,127,181,235,207,46,237,219,55,5,152,64,83,38,248,150,123,181,236,239,114,182,175,131,29,152,104,25,54,119,2,15,116,12,58,208,163,153,157,142,251,47,54,155,230,22,169,36,15,25,100,179,163,204,104,178,143,3,73,242,29,176,25,38,240,51,126,139,101,84,36,240,51,82,129,31,210,84,86,245,190,12,132,68,64,1,251,113,127,74,136,41,128,
+208,105,244,139,208,239,111,140,0,1,133,133,250,223,11,128,74,2,185,103,198,219,67,20,16,192,99,202,199,82,218,215,103,198,222,12,223,153,18,217,79,104,135,93,222,131,195,223,166,210,171,243,46,107,62,115,154,113,106,170,254,199,100,149,200,249,207,12,182,251,65,9,42,70,203,18,12,194,88,51,147,134,7,248,108,42,193,244,110,246,28,175,226,167,235,137,100,123,101,251,252,155,195,67,3,63,58,8,178,105,169,169,154,154,16,227,18,153,137,153,210,146,204,76,69,78,25,20,67,250,6,57,57,26,124,13,162,168,183,13,106,94,191,58,166,103,8,58,176,114,50,252,243,79,166,18,200,96,135,128,253,250,52,68,81,8,179,128,240,6,157,17,222,49,183,199,234,44,242,77,97,192,32,34,4,181,69,138,188,178,135,97,6,215,199,39,33,68,224,188,17,147,120,118,98,69,183,133,15,215,239,1,11,85,86,139,208,253,158,165,142,255,149,164,239,215,237,167,15,118,47,89,113,121,28,65,201,119,119,41,189,114,112,234,250,57,193,82,179,14,37,120,216,88,140,101,
+8,252,56,61,154,221,5,110,26,112,165,128,41,95,13,42,97,113,73,154,60,34,188,18,82,170,174,254,160,160,36,181,130,128,28,77,169,190,4,62,109,15,16,16,98,89,245,214,3,0,159,102,228,111,113,131,252,7,48,118,44,162,132,121,7,146,59,248,207,151,222,225,23,51,24,116,186,183,182,34,48,208,8,242,171,147,232,53,76,96,26,154,223,99,124,142,249,40,126,225,221,183,133,74,183,45,203,10,84,247,232,202,240,65,97,234,235,48,232,113,3,148,52,94,61,27,46,89,202,255,212,178,34,10,206,123,62,213,208,163,12,148,142,153,219,187,65,70,2,61,96,32,246,106,121,226,175,39,16,35,43,210,244,167,118,105,126,253,149,66,222,39,20,152,44,199,175,73,162,226,61,48,3,95,224,239,161,66,64,19,25,202,223,61,240,251,191,60,135,68,254,235,25,3,120,90,38,249,72,191,249,1,126,248,117,239,96,46,168,125,132,2,51,32,212,202,20,39,87,235,160,133,10,65,49,152,1,67,249,120,19,190,67,64,174,159,230,222,225,196,33,74,251,121,203,184,
+87,23,52,172,80,198,204,114,74,178,199,227,195,125,230,3,115,80,0,64,6,48,38,190,64,6,48,142,189,64,6,48,230,188,64,134,84,142,187,41,80,108,160,178,98,198,108,102,166,1,76,171,47,80,201,81,230,71,135,40,35,191,223,184,165,141,93,248,26,85,160,15,1,10,37,97,32,115,159,31,204,83,141,20,66,143,133,233,248,167,176,131,4,130,167,16,226,111,21,248,160,135,183,189,117,130,139,104,133,98,253,127,112,5,1,184,34,131,196,183,19,248,196,101,39,168,129,111,240,193,89,154,181,204,1,203,239,192,102,31,215,211,94,43,62,151,106,142,69,97,0,64,138,233,72,83,65,48,39,172,148,97,247,130,42,64,172,105,172,19,128,41,207,219,138,76,94,152,17,68,251,194,92,78,136,10,9,83,160,198,141,251,221,127,159,81,1,8,77,99,147,132,210,207,124,146,130,66,1,82,28,49,235,233,68,236,23,230,243,235,13,128,144,168,127,201,231,91,19,127,242,240,78,238,55,5,36,13,204,152,85,32,107,41,54,96,21,244,19,44,179,67,248,160,36,52,
+139,156,1,24,2,16,130,97,249,138,177,52,25,108,239,241,158,130,195,206,45,72,77,22,66,49,210,238,254,139,155,55,241,109,63,187,15,3,255,21,161,5,140,113,226,56,19,111,220,38,78,90,36,200,182,133,129,102,17,212,45,22,139,192,200,252,50,243,115,252,219,29,207,12,102,198,118,186,77,1,74,20,111,138,20,111,138,167,40,138,34,197,251,190,239,83,164,120,139,247,41,222,247,45,222,215,82,63,205,216,243,115,82,108,27,180,187,139,37,36,61,62,190,207,245,62,215,151,239,189,143,222,109,229,16,87,240,140,97,145,176,185,141,110,28,18,80,4,136,18,182,174,36,213,48,8,120,155,37,7,128,141,8,205,81,222,121,111,105,196,60,251,161,239,6,199,138,182,174,8,209,43,172,247,10,115,89,230,141,174,136,15,78,182,243,244,250,164,36,197,192,91,165,19,219,213,57,192,194,100,15,151,202,67,130,227,35,74,163,230,115,8,25,206,14,214,21,98,174,31,15,49,116,88,66,2,101,15,176,183,146,121,20,199,113,56,241,62,253,212,21,83,253,53,28,238,
+126,124,8,162,67,12,193,46,250,52,193,101,194,166,95,123,248,119,208,228,34,139,29,33,46,93,124,40,187,87,235,54,64,53,102,70,252,236,103,189,139,19,36,230,57,44,174,26,23,57,226,221,249,104,33,82,63,199,5,236,46,112,10,133,192,194,208,147,240,65,156,203,205,206,30,104,0,37,164,112,220,30,168,28,107,168,97,188,253,184,118,114,120,202,92,57,207,49,167,7,11,14,245,8,91,9,96,160,119,213,28,105,198,86,62,86,232,170,3,121,45,20,28,207,31,6,1,32,225,137,171,191,25,29,172,6,234,209,35,130,75,118,161,226,117,183,37,0,226,97,221,68,50,40,232,4,252,210,248,4,92,97,98,237,172,220,139,188,198,102,203,7,157,16,178,196,51,44,6,138,57,69,225,88,231,24,36,54,112,124,112,120,156,185,152,98,23,36,44,62,5,13,130,12,13,48,23,43,135,23,219,137,54,172,21,239,135,217,194,135,180,79,87,156,58,14,158,228,174,219,129,2,130,144,40,165,230,109,85,31,141,86,237,43,222,218,11,61,253,47,217,43,252,108,175,209,
+114,4,92,168,83,221,172,210,151,115,94,101,237,165,30,11,112,96,222,71,156,66,37,22,230,112,57,155,172,82,176,248,214,89,97,229,134,125,123,4,74,66,156,95,215,236,88,104,36,6,245,156,128,27,204,145,222,166,42,93,118,103,210,52,180,244,194,222,102,174,158,224,112,206,237,218,251,108,148,59,13,138,22,127,73,108,242,234,75,98,75,135,95,18,219,117,220,198,220,155,198,67,110,105,168,14,55,33,143,139,97,246,82,10,60,172,99,3,141,108,125,138,229,107,244,129,202,210,217,187,49,226,107,212,251,41,84,120,50,192,93,219,241,76,140,250,244,164,1,227,226,134,143,90,229,204,80,82,28,179,226,190,148,144,162,184,24,250,111,180,186,227,245,92,80,63,134,175,2,121,173,49,97,19,158,204,80,113,209,57,230,237,115,109,108,69,196,207,179,247,233,101,208,130,208,175,167,128,251,226,254,154,57,208,72,204,115,42,191,95,31,117,19,19,131,230,214,167,38,89,59,154,244,205,117,139,10,229,245,113,167,244,197,206,13,57,48,211,66,13,55,91,106,192,157,18,
+81,142,17,174,138,218,82,150,87,108,94,216,48,247,184,51,61,103,23,51,155,58,245,240,223,102,194,24,92,254,54,19,158,158,52,223,102,194,155,53,255,196,136,110,204,168,131,27,30,68,151,11,61,96,107,92,111,20,117,53,209,82,47,187,149,101,222,65,11,114,117,52,67,10,215,203,118,213,246,246,22,228,44,167,235,106,220,77,233,129,205,229,82,80,19,118,206,162,97,238,118,115,75,238,46,212,57,228,134,167,231,228,112,200,13,216,231,228,112,200,13,243,231,228,16,100,240,135,151,145,115,84,101,233,240,208,130,141,161,22,37,181,100,231,178,244,147,44,195,97,86,101,93,5,21,93,86,92,48,116,186,244,113,175,98,174,152,111,137,33,82,145,165,30,28,146,162,14,245,98,160,42,225,197,64,114,208,139,129,70,179,24,200,68,115,221,221,251,235,146,64,85,127,19,194,225,26,21,173,47,151,7,194,177,187,62,123,62,125,76,42,169,173,150,59,242,146,174,132,247,47,233,202,146,123,73,87,65,225,33,93,85,36,4,102,80,167,102,238,24,137,240,38,1,205,111,
+29,30,252,233,75,152,174,243,47,97,138,237,189,132,105,175,82,235,114,5,205,123,79,123,192,184,168,35,30,205,164,219,75,8,203,105,154,39,178,243,69,205,205,191,203,222,49,182,201,16,89,192,123,9,39,201,244,37,156,20,129,195,151,177,233,122,87,23,247,134,211,199,217,54,125,27,142,108,100,92,120,188,114,142,25,21,135,194,19,206,139,88,128,254,139,88,12,15,255,146,185,68,111,232,4,109,126,159,63,192,170,158,129,15,176,185,103,224,3,108,245,173,86,15,120,7,224,20,200,196,155,48,45,14,250,150,96,153,166,112,46,254,221,157,246,81,162,125,137,36,28,242,16,73,164,232,198,134,156,120,131,3,50,220,50,97,44,218,35,139,11,116,186,146,28,124,79,119,178,43,63,19,132,189,152,73,114,207,58,33,131,75,100,112,166,100,6,11,15,111,253,135,247,75,253,86,28,184,12,237,253,82,164,99,35,69,78,166,143,169,212,62,245,246,101,86,36,182,150,186,40,239,248,214,143,255,242,139,239,255,209,209,15,127,246,234,111,94,31,125,244,250,139,55,127,243,
+201,235,207,143,190,248,242,211,207,95,127,113,244,230,249,211,67,243,201,209,119,223,252,236,227,163,159,188,249,248,245,23,223,57,250,229,79,223,124,248,211,163,87,159,191,62,250,242,167,175,63,57,140,126,248,241,207,63,122,253,209,209,207,191,120,243,201,223,28,125,250,201,235,163,79,127,114,244,12,255,211,215,175,62,122,253,249,51,254,151,159,30,253,217,7,191,253,193,111,31,189,250,228,163,163,15,63,253,217,103,7,74,31,189,124,126,160,113,244,234,179,207,62,126,243,225,171,47,223,124,250,201,119,143,126,244,243,3,245,175,56,63,51,57,112,127,134,249,240,211,143,94,31,125,254,250,179,131,92,175,63,249,242,128,253,234,139,131,152,7,156,15,143,126,246,250,203,159,126,250,209,23,207,108,63,252,248,213,23,95,252,26,236,89,160,103,228,103,201,62,126,253,235,89,28,189,247,151,191,251,194,227,232,227,55,95,124,249,130,246,237,31,127,247,89,27,255,252,143,142,190,106,254,233,87,83,59,250,227,63,251,242,243,143,255,237,155,191,254,221,175,218,239,254,244,95,
+190,11,249,50,245,79,94,253,236,245,23,159,189,250,240,245,209,127,248,236,179,63,122,7,226,183,254,228,189,223,251,222,31,124,247,253,239,126,239,251,223,255,246,209,95,254,201,247,143,254,233,71,175,127,242,230,160,171,31,254,249,159,254,155,127,245,103,255,246,79,127,244,163,163,31,255,249,127,124,107,135,47,190,194,121,23,230,95,255,240,223,254,171,163,163,63,254,203,119,40,189,133,127,255,247,126,247,171,246,199,207,51,252,151,191,66,255,149,252,255,243,231,175,126,249,187,135,161,191,39,248,139,190,254,252,63,254,233,103,159,29,253,224,232,179,159,255,245,193,14,71,255,254,211,207,254,215,55,159,124,244,233,47,143,62,248,79,95,193,189,140,252,224,171,222,239,252,221,47,222,124,254,229,207,95,125,124,244,139,79,223,124,116,244,23,175,14,150,124,239,153,199,7,223,58,250,232,208,124,251,235,201,127,240,159,223,85,195,11,252,91,118,31,252,224,7,239,224,253,242,219,95,227,252,167,95,113,249,229,119,159,7,255,221,235,15,191,124,239,223,188,254,242,71,111,254,
+207,215,239,125,251,59,71,63,250,179,79,63,254,244,243,127,125,208,243,123,223,254,21,167,103,224,191,252,173,163,103,248,183,186,248,241,123,223,127,255,59,71,207,191,127,249,174,238,191,214,241,143,15,2,252,195,67,63,254,6,217,15,254,243,187,242,255,155,255,240,195,15,254,234,79,255,226,47,62,248,171,63,255,211,31,254,47,127,95,226,183,83,123,239,219,223,125,150,245,213,95,127,124,144,240,187,255,238,231,159,188,247,15,211,251,254,31,253,139,163,63,249,147,183,110,248,131,127,246,254,31,126,235,159,255,179,223,135,2,87,128,11,192,175,94,11,8,173,151,95,251,99,201,107,6,100,8,196,75,213,46,125,2,223,116,241,204,88,151,18,197,191,212,194,137,87,151,214,75,9,38,124,73,102,232,173,183,39,209,78,86,188,77,123,40,55,106,52,78,223,211,100,213,107,106,172,23,117,174,248,129,252,76,67,237,205,52,136,45,187,165,167,240,18,74,23,209,39,245,211,73,21,232,85,74,16,79,23,243,23,147,134,159,14,81,51,237,214,102,0,189,153,172,38,141,33,
+68,55,185,152,58,116,150,53,26,99,227,219,184,18,236,40,42,89,42,96,246,104,48,122,109,209,64,189,9,140,49,88,145,187,172,202,27,245,148,34,208,96,207,64,93,89,11,83,70,228,111,213,92,175,116,93,109,209,235,240,144,223,129,238,192,180,76,124,20,133,176,106,46,110,214,89,212,99,246,24,162,238,16,145,98,108,251,242,56,65,95,133,157,217,7,17,173,218,155,16,118,253,150,76,171,112,160,248,109,180,190,175,197,140,171,143,64,183,36,236,223,181,134,187,173,217,230,234,0,225,26,33,56,217,227,70,204,1,146,98,70,103,57,80,100,255,172,63,194,13,232,131,158,89,172,148,106,238,53,55,14,80,89,11,9,95,62,62,146,99,107,186,21,198,42,83,73,189,225,76,226,146,1,84,251,94,113,200,238,83,135,215,16,244,70,5,2,251,73,166,18,116,242,168,184,163,14,10,86,151,161,130,49,87,155,66,150,69,118,202,104,226,205,128,106,216,232,71,99,115,143,123,160,29,46,193,157,102,234,226,0,214,204,78,239,86,216,100,155,219,3,67,206,249,19,225,
+37,51,92,157,115,46,119,128,141,247,152,173,57,161,128,89,221,29,83,109,196,244,164,238,219,203,188,166,148,4,210,11,58,247,72,96,210,117,45,82,174,66,227,40,32,76,136,98,0,96,153,101,22,214,233,30,160,14,73,90,93,248,173,201,169,78,181,212,89,137,205,33,227,176,132,73,255,8,157,183,179,17,25,62,202,22,62,89,123,7,87,94,46,84,158,12,176,232,35,108,183,117,55,60,5,55,224,8,156,21,50,33,242,45,206,38,113,94,194,47,148,219,121,97,171,158,134,241,115,199,217,211,169,101,122,174,119,144,9,148,86,236,132,252,120,82,61,190,56,59,121,200,118,212,193,80,220,29,205,214,154,126,15,215,124,137,226,172,37,23,51,168,210,187,245,39,159,12,151,244,164,150,239,62,9,6,92,70,223,198,139,41,164,166,12,63,131,189,133,122,240,136,235,193,9,89,92,146,246,189,228,89,200,192,71,87,164,160,44,20,153,244,225,224,101,0,229,156,245,96,201,157,207,15,106,153,222,201,207,51,70,177,93,9,242,163,30,93,48,247,56,168,18,162,115,174,
+146,41,182,205,180,20,211,99,157,126,237,219,222,176,26,36,27,41,187,225,111,116,108,169,197,86,23,46,192,99,119,99,75,247,27,252,170,70,102,83,245,102,31,35,212,39,196,253,121,64,77,9,107,170,85,255,62,9,198,60,236,220,3,141,16,130,226,75,55,30,155,147,24,184,184,133,232,179,250,226,186,19,27,199,46,90,164,140,61,197,62,124,151,35,251,122,201,11,181,72,131,23,151,142,159,8,92,235,19,85,67,138,84,69,241,91,226,131,146,227,84,214,68,22,67,56,138,124,196,83,90,138,208,10,50,101,44,144,38,36,247,137,53,62,221,119,224,2,245,180,202,207,37,141,185,118,51,166,221,139,79,244,115,156,44,8,205,210,91,86,150,198,208,201,166,181,199,38,101,163,40,171,144,204,155,74,217,211,31,76,205,243,232,220,220,241,8,37,201,52,83,130,86,119,69,74,99,190,116,81,120,104,23,216,50,75,51,81,109,167,186,194,251,49,145,175,161,248,18,237,101,76,22,184,85,236,137,4,89,76,138,130,110,13,172,85,118,222,211,215,239,130,6,181,219,222,
+77,167,102,27,219,13,210,19,46,201,71,79,100,175,103,22,55,21,137,32,78,4,131,204,243,123,105,129,105,49,220,211,205,142,193,116,183,108,16,24,219,208,204,146,208,62,110,91,144,218,178,141,155,40,50,0,141,49,190,233,239,174,156,70,195,157,47,197,20,196,170,20,53,143,51,39,186,84,92,137,107,177,72,199,50,59,192,147,250,84,201,220,36,88,148,179,157,148,175,64,184,1,218,222,110,201,59,134,68,123,173,211,64,163,137,166,109,215,167,49,51,60,119,74,245,221,198,243,74,245,77,111,210,183,15,205,195,194,99,113,169,153,207,44,115,253,253,170,124,86,187,224,246,234,197,142,31,77,12,93,180,39,103,134,241,169,170,141,100,233,233,40,145,176,214,49,192,147,45,53,82,50,8,34,245,52,3,225,172,237,81,63,72,123,122,178,38,178,78,42,3,235,169,206,180,158,63,25,89,75,101,184,104,26,169,164,189,22,79,222,187,195,109,249,113,112,239,22,28,221,95,139,69,2,61,188,60,103,109,199,22,116,51,190,135,163,140,28,174,252,106,128,22,82,90,233,
+245,241,163,164,53,8,53,111,166,109,228,38,104,187,207,42,247,23,92,60,5,2,68,172,226,77,250,21,189,114,246,36,109,192,212,126,100,158,34,73,78,45,122,220,42,172,146,232,186,177,22,56,16,117,94,38,6,133,96,40,59,213,33,12,99,18,140,22,93,70,235,108,24,185,233,184,191,18,173,170,52,78,24,115,49,237,205,135,141,121,15,222,215,106,206,42,157,33,102,31,237,3,51,39,106,130,187,165,175,1,140,2,149,133,85,106,72,193,227,170,3,38,39,8,164,9,27,93,85,204,51,233,156,123,152,153,19,135,235,229,114,100,219,115,166,9,103,65,129,224,150,67,237,52,160,179,30,163,176,83,217,197,252,19,77,104,42,135,214,57,166,40,40,28,106,244,33,73,67,170,211,208,42,3,33,226,250,130,117,114,220,235,139,58,55,250,77,16,193,86,98,128,25,149,135,41,187,151,72,40,130,251,194,194,209,168,219,217,130,6,52,115,46,200,24,59,142,5,40,19,22,86,178,42,160,79,179,210,42,112,90,193,172,141,54,137,172,6,93,134,182,74,130,231,67,36,
+110,166,224,94,115,4,172,42,250,18,228,169,112,164,101,49,181,51,57,245,200,115,17,113,13,169,155,156,81,135,245,121,205,156,226,80,214,113,93,171,223,122,210,37,61,229,27,131,50,61,135,129,17,180,48,120,214,140,249,85,41,189,58,110,212,145,202,147,27,89,81,67,132,242,219,141,227,45,28,24,52,35,70,199,204,165,120,115,155,239,209,142,219,106,146,235,98,86,37,83,41,112,127,248,180,203,151,106,18,181,104,135,198,87,150,60,228,194,185,168,26,192,226,228,13,24,127,104,19,19,88,33,184,81,33,211,140,83,240,48,95,212,45,176,5,65,88,158,186,194,206,238,58,193,204,172,189,137,242,11,149,171,152,58,69,13,228,168,84,131,21,114,191,186,75,172,178,93,214,2,113,60,183,199,182,18,84,202,214,58,199,48,149,108,35,173,148,185,24,160,51,170,180,241,225,140,99,128,203,14,28,53,129,179,246,242,38,119,87,73,92,144,35,132,4,225,98,214,189,81,117,113,53,220,237,108,118,194,184,110,242,102,132,174,66,57,0,206,156,118,197,22,106,205,246,146,
+75,117,4,130,223,87,53,251,45,197,50,163,244,136,176,138,53,28,80,121,200,227,197,50,100,124,42,84,160,196,44,217,16,138,46,188,105,195,136,92,60,149,209,131,1,196,37,81,109,166,99,65,193,155,149,177,130,205,163,128,105,65,213,80,208,72,158,46,38,236,64,43,173,240,243,91,224,167,110,171,145,4,237,248,11,57,61,30,148,227,156,193,32,220,124,125,214,14,109,251,192,56,24,18,203,250,44,188,91,181,243,194,229,29,101,137,77,60,26,67,54,161,141,101,110,221,113,119,235,183,249,73,50,205,189,139,141,231,171,201,29,197,20,105,144,211,99,241,14,202,159,137,215,225,158,0,177,236,101,244,131,72,21,243,26,164,20,210,159,54,182,209,34,66,61,49,209,180,29,7,151,155,81,71,242,136,136,195,80,232,115,87,187,42,105,79,161,74,197,103,124,83,159,49,179,13,165,147,5,252,20,159,223,210,111,137,167,84,193,250,196,38,100,115,114,69,178,189,195,75,113,99,189,170,71,234,110,227,31,226,88,97,107,125,162,43,131,226,2,69,234,152,177,179,140,72,
+219,83,5,108,78,47,34,241,78,213,131,56,156,50,130,131,3,109,70,85,242,19,197,221,122,5,202,5,17,245,138,41,179,117,178,109,131,75,10,192,34,222,69,90,161,51,240,169,44,141,222,222,165,167,152,211,91,89,113,110,151,172,46,150,206,157,159,150,184,80,140,79,225,38,128,101,28,23,52,240,25,106,55,118,83,190,208,8,2,132,81,93,38,39,223,143,240,170,166,30,165,44,110,203,128,218,210,225,100,141,10,10,153,228,152,233,159,147,84,172,244,37,125,192,73,106,203,179,187,43,110,199,9,42,63,84,155,246,51,190,205,0,115,114,164,106,43,216,208,18,130,78,30,207,213,5,156,179,186,37,204,210,107,44,107,195,230,153,193,229,65,79,192,181,62,70,47,44,146,102,70,31,189,140,84,41,62,2,56,112,114,73,78,223,54,203,72,142,108,127,35,138,212,79,116,196,200,6,74,118,95,86,168,236,100,177,17,6,51,210,173,250,190,203,96,198,131,24,163,112,54,8,39,54,114,135,138,217,172,102,196,49,186,129,183,179,2,85,87,166,43,117,241,66,56,177,
+56,53,221,194,210,216,229,60,94,38,176,154,209,62,224,45,245,46,16,59,191,111,203,115,152,252,73,41,60,199,77,52,213,2,61,77,35,137,8,216,200,229,245,228,44,141,177,215,159,186,37,7,244,220,104,147,106,111,82,164,193,126,235,72,86,43,105,103,172,254,8,188,12,184,177,141,30,56,33,14,34,55,79,77,237,67,73,188,237,12,75,141,52,234,132,20,44,106,117,140,145,13,182,56,199,117,252,117,165,24,221,245,83,17,89,178,90,34,155,6,131,15,153,238,224,129,77,205,60,216,67,92,191,214,20,21,63,249,203,119,173,90,203,169,16,12,76,166,50,154,49,32,173,182,116,87,1,37,66,93,102,116,219,114,48,19,62,246,41,211,155,168,188,83,64,217,67,45,87,78,142,92,92,207,98,75,210,20,165,10,24,4,227,188,192,212,160,152,81,69,203,35,219,133,67,245,37,166,253,121,121,108,131,145,111,33,164,160,153,38,197,141,175,111,170,188,50,36,58,226,224,204,121,57,115,167,112,85,80,30,80,138,94,60,31,166,55,150,60,123,114,87,138,99,18,100,
+38,69,80,236,82,237,226,172,71,149,78,24,187,123,22,221,88,188,221,84,128,113,104,47,54,135,25,0,141,130,18,37,41,80,237,59,136,165,108,128,19,80,214,64,220,103,41,48,168,198,128,132,213,208,135,253,144,190,190,170,236,27,174,154,130,174,224,178,140,181,32,43,87,81,89,83,114,187,213,32,227,64,33,170,130,1,147,174,217,2,79,216,157,74,34,53,39,74,125,0,17,134,64,107,197,128,45,116,61,228,159,117,29,188,117,75,82,203,170,239,29,184,9,166,90,184,44,103,103,121,115,216,224,100,184,168,39,157,230,42,45,30,179,139,171,155,61,126,69,49,207,66,196,105,43,224,219,169,81,59,222,102,46,54,172,41,184,39,84,169,70,230,198,53,27,171,111,29,34,151,185,215,26,76,36,59,59,231,152,58,230,140,11,2,155,73,137,236,148,88,239,193,21,175,70,5,70,105,206,177,38,70,236,217,152,29,87,31,87,39,19,116,9,18,30,178,42,156,16,205,155,210,73,145,236,29,251,94,90,100,206,147,14,113,46,29,56,145,155,100,139,101,167,89,14,12,
+180,211,53,154,131,2,85,166,231,103,219,107,7,139,224,100,92,179,36,45,182,186,125,127,203,235,149,29,189,117,100,173,84,133,88,128,139,229,113,155,45,81,251,79,50,230,24,35,207,213,66,50,60,17,218,123,121,128,83,137,51,247,54,56,49,198,152,246,162,195,152,187,167,3,169,170,145,172,216,214,139,17,141,157,156,210,195,154,53,137,29,201,241,106,13,104,23,217,47,4,150,238,244,56,166,34,244,78,175,105,170,72,182,111,187,235,49,219,21,161,110,69,202,68,227,167,7,18,211,139,83,213,150,127,214,153,99,217,18,58,42,195,235,139,52,151,106,180,10,168,173,132,15,210,100,35,110,170,170,70,34,245,132,24,141,167,72,77,114,34,246,44,216,246,76,34,40,132,101,228,176,54,155,174,206,1,21,213,84,167,38,105,57,166,222,24,49,87,12,103,185,153,249,211,78,184,100,102,55,227,37,3,86,236,101,14,105,23,193,82,39,149,144,189,104,29,194,56,99,179,171,217,245,20,59,84,192,140,254,144,123,138,29,17,229,44,27,194,223,230,60,132,206,155,23,123,
+206,164,23,11,25,88,106,146,234,120,117,165,189,24,92,89,214,24,63,117,121,236,223,19,157,27,177,173,190,7,241,24,92,128,55,93,69,180,215,201,33,117,165,10,107,176,97,19,174,90,183,120,105,21,236,245,106,139,93,159,164,1,201,224,184,226,37,180,31,215,73,42,248,188,25,231,91,183,156,139,57,212,232,125,226,98,247,87,94,49,150,69,149,123,189,246,168,5,146,41,196,193,50,138,240,25,200,186,69,85,211,176,216,244,90,0,232,226,111,97,51,91,20,16,122,30,110,97,220,210,54,217,154,146,20,188,108,57,220,91,162,220,134,7,231,153,86,117,20,155,217,196,234,216,165,84,100,47,167,2,7,65,184,184,200,120,17,85,160,149,167,103,231,38,94,47,223,227,221,207,46,79,142,15,248,208,3,254,101,18,56,149,227,211,4,55,131,124,7,99,184,123,131,182,35,127,114,230,98,60,19,96,217,83,103,64,232,83,59,114,137,98,133,206,184,33,234,149,122,174,42,97,193,233,118,155,247,76,194,121,160,241,76,98,120,160,113,153,70,100,110,10,49,117,81,84,
+208,227,120,61,122,239,240,21,165,93,207,44,60,4,96,70,58,127,12,31,76,70,161,83,103,134,234,158,107,115,31,124,195,123,248,228,172,70,89,91,128,206,222,36,70,204,134,179,144,12,218,198,59,203,140,97,237,44,251,96,192,76,69,220,203,139,151,212,75,222,25,230,217,170,107,171,225,228,197,93,122,235,24,177,211,237,96,121,149,3,52,162,205,86,227,115,108,241,125,121,139,61,208,201,63,211,145,105,197,58,98,102,177,183,220,179,213,221,131,195,13,98,110,75,77,217,206,152,131,7,164,179,140,220,121,160,22,166,54,188,125,89,196,77,57,61,8,70,220,88,224,158,76,182,182,74,146,35,7,65,251,216,216,140,165,14,98,61,108,241,153,10,214,190,15,202,158,229,58,219,249,9,245,3,231,3,7,77,6,55,1,129,25,26,163,215,103,71,219,22,126,142,213,180,40,70,123,57,88,75,132,27,27,220,128,129,113,30,138,34,16,148,188,182,122,12,52,213,57,103,38,223,108,157,67,215,20,123,4,211,24,11,61,62,237,117,104,110,184,127,79,99,21,251,234,224,
+152,54,11,22,28,54,6,179,172,103,86,115,56,216,238,1,123,186,191,83,57,208,197,104,249,180,14,216,122,170,28,72,119,212,103,182,86,196,249,96,212,208,171,117,67,54,26,58,26,142,217,27,93,127,180,21,175,11,187,137,65,27,127,200,153,198,217,96,194,113,177,105,222,205,235,198,144,138,219,51,222,107,200,50,239,30,123,220,87,246,108,95,109,166,61,55,255,211,31,29,125,239,187,95,109,171,253,122,139,233,121,75,235,121,87,235,243,87,255,241,139,175,128,255,183,79,127,126,244,225,171,79,142,94,125,252,197,167,71,175,62,252,240,245,23,191,218,119,123,187,141,246,46,129,183,232,159,188,80,120,187,153,246,250,23,175,63,57,250,240,167,175,62,249,155,183,219,113,63,251,193,111,110,44,252,222,251,239,255,225,183,190,255,207,126,255,4,232,3,140,222,221,89,160,135,186,248,56,131,230,41,18,172,182,1,217,41,49,53,47,112,215,192,194,198,163,93,41,25,199,74,150,179,2,140,194,24,17,25,7,191,115,88,93,172,125,147,9,181,159,11,45,61,141,211,41,
+113,119,68,103,190,203,166,224,242,10,146,37,155,148,45,219,99,141,144,225,239,253,139,90,199,111,64,14,234,38,198,82,161,176,164,151,134,124,49,100,190,48,110,215,131,122,47,123,17,42,248,7,230,252,13,10,23,28,225,129,1,151,165,30,184,10,231,144,84,197,244,114,46,171,107,199,248,109,168,16,176,80,210,212,185,149,183,239,10,103,149,120,211,115,67,75,43,110,10,13,47,1,229,21,50,154,34,31,227,182,66,134,160,108,46,115,32,205,233,231,156,199,254,193,98,7,172,200,31,239,174,103,4,1,63,197,145,6,157,17,17,217,52,243,18,244,66,86,171,213,87,1,74,144,218,147,80,23,86,193,208,247,66,6,150,202,227,172,8,213,89,218,64,175,162,174,139,10,215,217,113,62,49,237,70,30,71,164,169,41,139,167,101,129,32,41,120,198,218,200,184,74,68,125,121,10,163,154,29,134,126,209,128,184,140,142,128,2,182,157,148,114,128,134,28,238,44,79,61,163,105,163,79,43,183,157,11,28,161,123,106,71,167,75,130,121,136,16,67,243,177,203,232,181,239,74,
+32,250,29,45,62,122,98,195,220,96,131,48,56,159,0,13,117,122,226,156,29,56,51,223,4,118,180,117,156,122,26,117,5,47,59,143,201,167,234,106,214,79,26,31,118,240,232,131,156,174,222,147,242,22,46,58,237,18,133,5,83,112,154,205,164,142,160,87,232,217,180,159,165,69,252,46,177,121,107,160,53,215,131,32,214,92,205,37,7,29,212,157,162,233,217,14,173,85,234,45,128,173,88,117,104,113,93,215,98,120,10,213,109,226,138,75,52,72,53,147,174,50,152,100,189,22,130,102,46,224,141,165,215,144,61,38,61,67,83,135,59,193,161,76,189,193,117,143,206,1,21,246,237,118,251,154,34,199,8,246,251,74,245,34,166,205,55,99,36,86,56,168,166,121,96,113,177,56,127,117,51,224,117,46,186,11,251,131,92,192,139,218,37,151,70,176,97,38,202,78,101,235,196,237,84,176,16,216,188,226,118,107,12,206,207,34,98,39,181,214,14,95,3,35,52,196,186,33,206,100,187,148,118,46,30,19,5,243,148,202,99,74,88,140,137,245,16,88,135,4,28,194,98,209,123,162,
+159,239,204,214,42,91,210,181,206,162,188,187,117,239,165,232,20,54,43,198,65,102,106,79,166,102,121,100,137,132,129,27,77,37,111,104,105,214,131,178,101,117,158,231,198,162,85,164,59,27,87,33,38,164,29,141,66,225,7,142,37,92,148,137,110,109,37,155,233,226,69,117,94,181,105,154,6,229,80,166,49,87,73,42,164,177,6,180,203,121,49,17,111,175,187,151,181,205,130,178,121,198,57,127,24,12,188,123,143,248,1,50,15,207,26,51,209,149,185,154,188,13,57,6,100,154,109,137,170,195,233,170,118,167,143,109,172,252,230,124,3,101,20,80,157,226,137,128,93,141,147,158,138,132,164,152,30,189,119,79,146,173,241,160,99,121,130,220,215,178,156,12,87,156,183,97,174,149,215,2,80,192,172,207,228,192,200,181,159,231,37,172,78,173,87,92,149,165,97,54,54,51,234,78,253,44,218,103,240,106,130,107,3,111,205,241,94,32,213,2,117,164,46,246,6,111,229,169,152,48,202,199,119,245,73,214,67,212,95,83,77,187,218,57,162,215,82,231,153,79,209,123,62,203,16,156,
+81,187,103,70,160,249,246,146,209,166,30,175,197,97,72,165,156,169,85,196,79,125,129,224,42,111,35,103,14,139,245,118,223,39,202,59,250,91,81,43,53,101,105,214,4,181,102,79,73,66,92,93,253,0,117,75,55,40,157,252,78,94,167,234,68,171,151,34,186,193,141,218,171,34,51,247,102,176,106,157,231,217,219,94,43,21,32,72,23,12,153,60,105,189,225,194,129,189,219,84,78,165,15,151,180,150,226,50,218,120,186,204,15,147,24,224,21,42,46,187,15,185,25,221,241,41,149,218,125,36,83,187,18,164,26,141,211,177,236,37,40,156,94,4,197,229,18,247,253,58,64,78,234,228,73,79,105,107,115,104,108,231,217,146,36,236,115,212,250,16,125,214,195,27,243,20,86,16,193,22,156,19,72,204,232,90,247,72,200,61,146,66,60,85,61,73,4,26,206,29,102,171,248,244,150,45,189,66,148,238,47,102,219,5,111,73,179,93,199,194,226,116,188,112,201,180,138,173,114,72,247,100,19,147,230,71,20,85,233,220,151,203,45,114,21,124,204,109,116,192,241,93,249,18,126,249,
+84,151,76,220,126,83,245,172,209,106,181,68,89,231,34,174,149,63,9,85,178,1,94,74,55,216,239,87,143,234,228,234,92,55,157,178,184,251,243,107,252,42,65,196,25,78,112,153,33,233,242,152,211,136,163,29,115,137,99,122,185,98,157,251,2,166,20,65,136,15,154,125,199,224,199,202,54,176,84,8,27,102,89,76,188,53,10,43,101,210,205,232,58,207,98,1,1,54,161,234,94,203,215,150,30,160,110,241,205,132,116,162,146,250,104,6,65,111,172,188,225,60,226,73,254,135,202,186,225,142,55,74,182,24,233,126,207,119,180,110,207,20,124,53,70,43,164,148,43,171,228,217,202,122,141,12,223,207,234,37,148,143,66,208,8,112,237,61,231,212,123,167,5,117,79,212,142,121,226,9,209,49,247,243,15,246,110,122,104,175,241,97,83,207,182,118,108,0,48,211,105,75,58,64,165,130,120,164,68,57,50,79,98,98,98,27,119,181,82,39,6,23,135,0,208,132,90,14,5,19,39,72,224,203,146,129,135,219,76,119,119,245,24,90,226,135,28,60,128,180,189,188,10,215,66,116,
+213,147,114,159,201,51,85,83,187,152,43,140,63,38,87,2,237,60,131,200,24,136,235,219,179,37,164,37,185,185,88,9,84,247,140,20,162,26,96,206,25,5,54,177,70,58,59,100,168,188,184,24,30,128,105,128,5,255,176,12,2,221,154,12,177,100,96,179,42,173,124,16,56,45,83,219,21,172,246,89,215,56,24,199,44,154,17,172,70,242,87,220,81,72,8,137,42,187,174,154,59,124,191,45,128,154,58,216,188,21,62,150,39,208,61,190,139,104,105,8,87,209,228,228,206,109,47,37,71,126,137,133,173,34,181,66,183,130,172,186,103,90,16,11,164,165,88,138,144,221,121,139,131,121,231,144,80,156,110,140,192,208,4,214,171,113,244,166,215,112,184,112,220,118,113,185,236,73,88,170,242,213,121,62,125,172,188,207,12,208,230,44,97,182,134,228,133,23,12,184,121,190,120,168,148,115,1,40,103,14,172,220,244,38,99,123,233,164,91,190,171,84,9,247,197,221,40,45,90,5,58,73,165,48,61,24,249,100,94,177,164,59,40,6,23,55,218,22,139,164,100,91,162,42,73,212,
+92,48,239,251,99,171,21,86,84,24,152,68,9,84,38,59,79,249,85,30,49,200,66,102,137,226,106,112,189,115,50,189,91,46,103,104,42,172,193,92,39,186,12,76,89,35,229,172,214,211,46,156,24,159,68,145,135,231,6,101,173,191,78,152,204,148,61,237,70,194,141,104,204,172,194,33,210,44,216,152,149,7,135,220,236,101,17,68,131,52,48,156,193,237,57,80,158,101,130,178,97,14,230,133,166,39,200,44,154,123,118,185,67,50,244,40,50,173,188,189,207,60,202,239,72,98,241,126,70,82,155,201,233,105,91,140,178,94,43,39,15,162,41,115,44,77,160,117,91,126,230,130,161,95,181,194,92,102,168,160,171,154,177,8,72,62,190,111,51,110,15,62,212,61,185,60,189,61,132,201,33,92,32,255,79,183,173,175,218,164,79,188,63,6,112,238,0,224,111,124,251,249,239,123,120,246,15,157,149,189,123,84,246,15,158,148,189,156,137,125,239,119,95,190,77,125,227,100,236,255,223,7,99,127,241,234,179,215,159,191,115,50,246,147,79,63,127,239,64,240,232,205,209,7,255,226,
+232,253,63,58,180,127,252,43,253,189,61,5,59,58,16,249,179,79,127,254,201,151,63,126,239,219,135,225,231,147,218,111,127,147,221,215,12,223,162,188,61,88,251,131,247,143,62,248,237,163,239,29,254,254,214,209,155,239,252,125,106,63,126,239,205,55,37,248,154,192,191,127,253,183,95,190,247,7,255,21,248,63,252,232,55,40,252,234,224,236,93,89,190,119,160,245,213,57,223,243,239,55,232,28,136,188,247,46,217,31,126,240,87,127,246,230,243,15,63,126,253,227,119,143,13,223,17,236,240,243,167,95,252,232,203,207,15,46,249,27,232,255,250,96,249,31,191,247,193,63,121,161,241,193,63,249,246,255,184,83,194,223,249,187,151,133,195,207,158,13,246,13,41,94,88,127,19,238,93,17,127,244,172,248,111,124,244,171,25,191,163,153,127,255,249,155,87,207,199,225,239,248,200,255,45,161,175,177,190,115,244,179,119,208,254,145,231,157,255,252,15,126,255,91,127,248,189,247,225,64,58,64,251,141,85,137,135,214,163,101,187,248,164,248,194,211,112,237,100,28,95,89,20,119,25,241,
+22,119,188,23,205,74,59,153,96,249,82,20,59,241,61,204,237,125,44,222,8,190,6,145,195,80,228,177,227,1,68,57,81,123,219,15,48,86,151,216,180,159,224,59,222,40,145,123,238,139,95,138,161,185,19,122,33,170,110,159,86,224,49,37,255,178,74,234,114,182,8,116,214,104,153,116,29,37,127,205,218,168,207,235,38,102,81,89,244,176,7,161,154,161,88,244,135,26,126,93,197,67,15,52,210,66,34,130,224,42,131,120,64,66,168,166,3,154,166,139,7,209,147,131,58,160,165,161,136,102,233,38,171,157,3,24,65,203,233,19,137,126,143,177,236,82,178,211,51,45,185,49,174,96,8,183,132,174,156,126,67,66,221,83,246,130,254,234,38,202,84,175,137,170,176,111,141,185,175,185,208,110,0,212,33,119,94,17,30,198,190,105,107,131,186,24,87,10,28,175,55,151,120,220,230,19,200,177,100,31,91,146,165,231,202,115,7,177,53,29,70,20,14,161,104,248,212,238,79,75,149,130,103,210,236,197,80,20,116,209,154,19,159,44,163,217,236,131,154,33,26,137,224,5,127,182,
+62,88,25,53,93,45,183,38,225,89,114,50,249,4,36,29,157,43,29,248,18,212,119,88,50,103,233,104,159,80,172,221,53,56,234,234,229,221,217,118,47,43,2,109,32,158,110,209,204,166,115,101,248,96,87,21,12,70,79,41,193,61,77,116,167,6,75,72,143,247,181,133,78,79,119,14,85,220,90,99,47,48,15,125,190,80,197,158,10,91,107,200,101,92,177,151,113,41,30,146,247,210,163,38,225,164,56,81,129,149,46,245,137,184,162,109,69,91,60,159,241,200,157,211,61,169,19,105,48,134,14,253,147,201,165,189,184,130,130,81,82,73,31,178,4,243,132,103,145,235,212,56,108,139,69,50,183,10,48,143,125,150,246,101,240,215,38,65,137,231,2,137,58,169,138,172,39,166,108,219,75,221,188,86,0,61,173,84,66,12,159,20,196,103,210,147,77,13,162,27,89,79,40,182,0,98,116,28,156,220,199,175,36,162,208,22,105,133,123,201,243,93,174,186,169,27,208,143,67,104,150,124,103,201,143,31,167,173,75,166,183,206,163,77,157,24,255,49,139,222,135,59,212,132,58,47,
+80,19,185,18,226,42,79,110,69,164,61,38,122,250,154,180,196,112,43,157,180,65,141,200,146,123,18,48,178,234,23,96,243,90,58,232,84,42,101,151,1,87,244,238,214,8,98,167,54,80,113,228,182,206,155,22,182,35,115,218,20,168,222,69,198,171,146,161,184,222,170,121,66,44,50,183,1,177,124,19,35,181,161,177,116,177,85,173,134,68,207,8,166,6,109,140,239,0,214,43,105,10,238,82,202,173,95,139,243,218,162,67,116,199,68,52,198,147,123,148,68,195,132,97,22,27,88,58,101,233,181,206,13,4,140,147,109,129,235,239,164,225,130,115,138,182,28,143,132,18,143,230,82,50,161,18,5,101,30,197,210,79,78,148,190,254,157,248,244,56,11,4,146,164,185,147,9,95,116,210,152,63,216,64,225,80,40,198,62,190,32,72,137,40,149,255,60,246,152,58,101,210,188,87,165,71,176,57,65,55,14,83,220,211,179,196,222,180,192,7,225,150,150,31,188,212,46,225,85,160,39,53,232,47,248,27,169,19,37,100,215,82,90,74,155,190,192,48,226,115,135,11,205,27,167,72,
+33,28,139,142,82,73,7,149,0,125,156,163,241,109,142,251,135,17,26,57,105,221,30,188,249,26,24,64,55,189,142,26,159,80,130,110,150,217,94,51,158,48,100,217,211,100,199,34,95,96,186,229,107,181,175,243,200,128,172,198,242,80,185,29,116,97,193,240,184,224,196,117,124,195,199,117,55,110,133,140,177,32,34,100,69,175,122,123,225,129,34,159,172,140,116,177,166,28,82,82,199,153,18,4,148,109,135,118,28,166,59,66,78,88,189,41,34,12,136,147,84,87,61,23,14,214,100,246,37,66,215,152,220,138,5,50,146,50,52,90,186,187,164,113,129,42,68,2,134,236,166,28,67,70,202,198,174,60,61,20,199,131,24,161,35,64,42,84,38,58,215,207,209,182,174,74,68,197,109,33,229,66,173,34,211,4,198,64,109,85,27,91,65,253,62,146,217,247,164,186,84,133,109,179,234,239,210,100,173,125,38,87,134,245,218,246,244,154,25,31,179,162,157,78,221,231,131,6,167,49,136,216,213,206,145,197,54,131,210,142,226,64,61,247,35,116,124,101,186,9,114,43,50,157,48,113,
+194,102,26,87,94,107,218,190,197,129,1,188,225,237,173,78,58,196,92,72,211,97,231,116,140,224,82,67,110,153,89,78,208,93,18,141,67,63,219,126,206,189,170,5,108,184,244,245,5,225,10,58,45,221,37,164,172,115,39,189,165,157,114,152,29,158,72,72,168,145,184,118,233,153,7,225,200,208,60,51,214,10,163,11,10,68,66,146,141,194,95,113,110,218,152,217,86,56,5,158,30,115,112,139,210,213,192,21,97,31,99,248,96,201,156,253,228,1,37,168,150,117,2,138,146,214,48,86,112,226,1,116,22,115,239,196,222,219,59,47,75,229,185,67,148,100,140,14,6,2,13,147,26,203,2,232,114,237,81,181,78,161,105,165,58,137,144,54,141,64,26,1,172,22,240,113,72,114,74,151,145,197,93,146,254,93,212,10,190,187,31,129,59,208,59,23,170,203,77,58,242,104,10,24,90,56,51,73,84,168,54,212,210,205,76,178,190,140,191,109,79,107,79,235,84,116,27,186,64,250,19,24,54,10,212,201,94,51,27,230,8,39,124,238,200,77,17,212,169,71,155,72,106,152,197,227,
+141,116,102,213,174,148,45,148,185,160,189,19,0,195,187,158,128,93,28,12,228,82,101,34,72,95,153,238,232,157,9,137,38,33,72,183,121,125,9,106,57,117,161,209,230,112,122,146,125,48,44,42,39,29,203,172,36,36,234,82,34,82,130,107,117,243,31,131,183,70,75,81,3,158,141,166,42,220,164,218,52,145,215,119,101,188,12,227,113,108,161,226,30,202,170,175,236,60,41,93,196,55,238,180,247,122,234,90,131,157,30,187,225,100,253,106,218,14,133,16,33,227,114,98,220,167,23,227,220,164,17,236,245,35,125,6,131,129,186,9,46,83,94,235,38,59,204,50,145,4,236,149,83,175,214,170,193,231,141,32,125,29,238,217,183,219,245,88,231,153,181,30,178,200,10,70,32,193,251,235,99,93,96,96,50,173,175,5,90,144,116,242,132,113,87,101,15,83,124,74,82,180,160,58,1,203,118,61,139,227,124,210,122,150,74,205,222,4,65,61,41,146,180,229,40,197,94,78,70,158,110,181,10,132,220,108,62,47,26,234,51,17,25,122,214,144,0,157,158,251,72,153,78,81,83,50,
+178,138,135,166,107,78,204,114,150,243,74,38,211,175,28,181,90,39,181,6,174,125,4,2,151,47,19,104,110,176,138,107,1,90,219,107,183,41,52,26,18,73,99,24,79,78,241,208,227,132,31,201,102,179,47,129,64,160,97,62,19,161,210,114,177,217,92,33,231,39,220,40,14,60,178,42,165,98,118,131,217,202,143,28,218,38,89,192,17,160,90,15,209,116,55,27,122,12,49,245,246,57,155,61,98,31,219,107,194,2,200,130,64,234,52,10,133,98,139,75,103,195,82,179,26,74,124,232,15,156,250,118,138,76,58,171,128,247,194,235,230,216,219,53,247,249,14,76,179,219,92,232,233,230,66,54,18,57,78,147,47,232,96,40,65,182,34,77,193,104,114,25,43,20,128,179,67,43,48,43,16,4,138,74,164,37,116,29,158,44,173,82,243,19,122,58,115,40,74,103,45,190,156,62,70,210,146,113,81,23,218,110,159,164,17,36,177,255,244,128,78,196,215,235,5,33,102,104,113,229,116,136,17,252,6,28,169,243,201,30,100,197,180,63,143,155,174,173,38,148,56,28,139,232,77,96,
+133,76,191,113,3,204,9,55,82,101,185,148,230,173,57,132,42,136,237,115,201,107,25,30,238,191,113,128,101,20,212,85,66,187,69,84,185,254,100,26,158,214,82,243,144,59,2,190,94,17,36,197,168,5,250,226,192,71,173,192,166,158,30,251,46,74,20,54,127,152,244,183,161,162,113,161,113,216,86,217,240,211,174,161,118,111,213,1,179,25,145,38,31,211,148,166,117,162,98,29,167,235,158,81,163,48,3,65,160,4,7,33,235,237,154,238,253,132,182,68,231,5,139,109,15,148,130,6,105,46,57,82,225,108,54,155,217,102,86,227,170,183,28,226,113,102,101,225,181,43,117,231,229,35,133,201,192,212,51,237,221,215,179,56,88,193,61,185,112,68,172,212,237,195,99,235,38,157,111,239,41,148,139,11,191,47,239,49,204,225,11,223,147,109,93,102,73,165,51,178,111,82,203,28,252,134,47,232,107,200,33,140,152,146,117,249,155,210,221,163,249,150,167,13,199,85,50,66,123,216,233,247,73,35,124,147,125,226,114,148,30,233,13,70,123,245,68,188,125,48,88,252,13,19,41,192,
+162,116,30,47,28,210,167,108,215,219,31,187,92,173,211,115,183,95,13,125,166,143,120,166,31,236,226,137,196,139,125,79,71,32,12,3,29,138,2,185,5,199,49,55,138,222,72,236,166,249,162,72,194,53,89,192,243,202,18,216,195,12,116,174,148,23,46,195,226,239,42,156,91,247,97,12,248,60,120,24,35,96,223,78,207,235,57,12,198,200,169,198,136,226,187,153,212,45,17,113,232,98,112,239,220,12,246,79,212,166,242,170,124,214,208,235,81,213,177,14,10,226,42,147,130,27,56,16,220,209,220,230,250,15,252,139,120,34,111,138,108,32,181,118,244,180,184,90,74,138,233,188,141,207,159,141,48,28,18,38,4,19,167,238,140,120,112,162,244,96,26,152,214,242,116,28,230,220,9,39,38,53,212,114,21,156,249,55,240,12,31,55,107,229,85,29,52,148,27,118,146,132,140,178,4,207,194,226,223,74,120,26,197,24,51,170,94,134,161,199,52,133,66,99,37,143,61,155,198,249,178,201,32,206,87,192,156,73,101,176,117,145,86,52,6,89,137,58,176,22,196,241,120,75,27,113,
+190,221,110,243,206,124,254,16,14,14,135,229,161,142,56,247,4,230,151,4,199,10,51,246,63,33,119,101,31,190,167,168,35,132,161,122,114,58,155,45,87,91,12,22,105,119,12,245,106,245,172,151,81,89,108,54,27,131,97,126,106,174,122,249,188,125,162,98,214,42,172,128,123,184,86,217,165,9,211,226,241,196,252,148,204,231,17,98,140,196,186,93,226,204,165,210,136,64,33,147,155,205,38,185,217,110,243,5,89,233,73,205,151,152,168,119,251,204,85,94,57,87,28,223,88,106,217,250,238,233,230,9,1,210,145,42,120,191,140,48,47,143,209,51,54,80,91,197,31,39,48,24,76,219,15,190,164,6,37,54,115,23,185,22,234,174,49,131,22,111,217,188,180,18,139,179,155,244,144,252,4,138,175,111,235,5,228,195,40,7,12,204,179,134,24,197,126,101,213,235,245,112,121,151,108,38,159,141,238,5,2,73,168,124,161,199,36,198,164,45,208,92,17,75,245,238,147,137,223,212,132,162,252,192,45,0,125,225,58,6,196,219,205,38,84,208,231,249,221,42,28,255,118,121,145,62,
+248,219,85,153,169,212,61,142,48,124,190,166,192,227,183,37,183,94,188,55,121,8,55,55,223,83,111,168,121,183,62,161,33,41,41,122,158,160,94,157,124,106,63,248,115,204,231,219,104,11,187,226,45,83,220,15,162,43,53,121,43,250,32,152,201,93,251,176,150,113,225,130,17,16,228,104,87,35,197,24,117,33,86,222,48,87,107,52,122,46,78,84,183,132,54,165,235,131,183,80,250,153,128,202,163,63,201,106,45,117,75,210,148,112,193,226,102,254,174,148,62,119,166,220,94,190,49,149,102,193,28,178,23,131,255,183,250,43,4,254,130,168,115,191,32,134,5,47,136,227,235,23,196,243,23,55,138,66,144,47,136,252,196,11,98,235,94,48,10,220,139,83,231,37,149,81,32,205,22,93,162,13,184,184,66,171,89,112,118,130,6,191,1,44,82,189,222,64,116,2,75,203,224,46,100,92,127,106,138,211,68,177,22,187,87,152,180,108,183,236,178,179,155,34,104,244,189,64,108,154,211,79,203,162,46,195,137,235,138,135,152,10,129,223,207,123,136,36,161,216,75,64,148,85,103,151,
+82,20,89,80,158,49,216,131,56,171,30,24,241,115,126,101,83,4,59,124,148,88,106,182,1,59,199,238,75,179,85,215,194,229,218,219,215,7,252,109,143,232,174,13,34,62,208,177,65,43,118,233,206,152,65,148,82,148,38,91,197,116,108,149,63,169,44,185,80,130,123,27,226,237,244,177,190,151,233,195,217,47,211,79,185,43,103,247,5,213,202,229,198,11,156,77,47,114,46,65,149,161,241,227,166,233,105,200,70,92,83,80,27,0,127,150,50,73,207,130,238,4,53,132,208,151,132,24,78,116,145,98,183,176,161,179,50,40,174,120,40,66,171,61,129,160,146,72,244,164,244,32,174,23,112,183,83,156,6,215,79,32,217,19,1,125,50,132,149,71,144,241,213,204,247,196,170,221,140,153,49,32,81,198,247,133,130,23,5,41,56,104,100,134,157,169,120,35,160,214,153,165,65,172,19,130,140,151,139,69,76,218,28,25,99,111,171,99,255,106,38,207,149,228,80,89,30,27,235,74,235,220,135,123,135,195,43,208,150,3,164,9,123,103,135,223,38,192,44,199,213,216,163,76,159,226,
+59,66,33,247,215,118,45,193,175,19,5,67,196,193,241,221,151,141,34,225,220,51,151,227,96,157,244,137,131,117,28,223,107,35,57,158,99,215,153,148,195,210,120,226,81,190,204,224,159,118,62,240,49,64,182,34,156,221,227,156,86,148,42,171,55,213,69,123,128,130,78,120,204,220,60,100,195,132,155,7,33,202,122,15,143,47,56,229,236,67,43,100,173,81,42,1,116,92,230,224,101,0,205,91,143,160,222,55,156,57,141,16,161,250,206,97,184,118,161,58,5,62,34,61,148,18,113,56,118,32,39,32,120,132,118,107,127,200,213,36,24,162,38,168,22,82,111,112,210,196,61,253,174,254,184,217,220,203,234,61,72,79,55,59,197,39,8,50,228,73,138,11,234,31,103,19,194,200,5,202,199,197,216,248,202,84,112,54,70,38,228,112,44,57,97,180,180,53,174,38,90,32,8,165,96,240,127,172,191,151,124,48,1,247,4,38,75,99,253,88,129,84,135,201,121,193,8,222,14,141,0,247,119,252,163,231,215,215,235,236,63,120,255,253,111,253,225,239,253,62,28,120,9,208,188,123,
+250,71,91,15,241,174,43,134,103,239,178,93,250,142,249,206,75,188,157,0,185,173,177,109,35,163,67,192,133,131,1,181,5,126,168,240,173,161,151,208,71,27,200,120,125,197,66,123,79,174,142,129,176,61,45,98,112,212,158,206,151,23,151,118,224,104,24,62,5,193,46,77,24,79,248,20,64,17,32,199,99,43,232,218,137,16,18,78,32,186,162,122,78,209,211,151,189,110,189,193,152,115,59,115,81,49,176,223,170,215,201,188,133,209,70,231,21,10,3,75,6,195,56,175,48,119,215,81,221,57,232,26,114,79,235,162,167,25,124,91,37,81,81,232,222,17,173,34,207,179,124,129,170,37,11,76,164,245,93,126,70,198,193,245,238,70,52,135,69,76,189,211,221,57,115,167,243,125,56,195,88,142,91,204,112,218,156,235,198,109,137,4,72,224,63,17,233,205,213,93,19,231,8,146,249,206,68,145,27,212,64,246,155,70,231,122,173,43,187,231,87,205,196,169,208,130,81,68,64,186,38,31,146,188,221,149,135,108,95,68,109,103,177,35,147,158,165,46,235,241,81,42,96,123,50,50,
+170,101,56,28,96,230,50,37,22,121,134,74,100,204,51,252,147,58,183,112,86,151,132,168,163,186,203,143,134,111,46,252,182,7,157,74,8,71,147,253,89,198,62,116,225,95,150,71,150,209,224,186,12,203,96,252,153,81,65,79,38,164,78,186,204,41,48,173,147,21,0,232,65,205,196,236,73,83,146,72,188,133,170,97,215,70,11,77,114,3,244,14,104,65,170,108,217,63,167,218,27,12,27,219,3,41,1,71,154,115,72,102,56,237,62,206,77,113,61,104,46,242,210,206,179,199,90,234,70,117,49,8,237,200,10,27,43,253,36,133,105,145,97,69,113,218,90,68,196,134,39,223,195,194,201,191,121,26,66,119,35,247,131,94,72,54,8,225,132,71,56,0,17,81,97,233,68,142,131,94,240,101,93,107,62,241,225,92,96,116,55,43,147,72,79,172,47,27,129,126,143,156,105,55,82,227,25,164,235,129,123,150,216,246,46,232,242,218,3,38,69,145,151,23,66,45,215,87,160,243,175,150,141,246,114,64,46,230,152,35,189,9,201,97,114,209,46,182,98,229,183,25,200,163,245,113,
+255,81,71,145,96,42,225,20,65,98,131,204,239,236,180,124,130,239,233,138,5,162,40,202,246,80,115,68,134,228,145,222,232,139,171,209,76,84,63,196,79,67,154,117,225,90,189,40,95,240,249,230,211,136,48,198,136,107,211,101,172,51,43,181,116,206,25,105,58,150,159,229,150,97,228,201,180,213,87,142,204,41,123,146,59,216,197,100,156,52,14,18,9,219,16,202,201,130,14,155,54,20,160,16,197,172,171,7,210,151,153,199,37,14,21,183,165,128,124,124,163,7,67,195,46,84,93,205,133,125,67,227,243,61,200,241,146,175,217,245,0,10,224,168,215,223,168,21,43,211,5,112,225,64,157,8,74,204,52,146,162,143,164,156,52,232,94,166,237,45,251,126,171,109,206,97,34,221,236,102,119,155,230,231,203,115,8,218,70,195,24,219,41,175,227,90,118,198,230,119,211,27,61,217,247,216,241,155,166,67,69,216,213,238,212,159,26,139,73,56,178,227,184,4,100,11,144,170,72,121,249,183,50,75,109,35,217,245,64,1,26,61,195,0,177,71,227,147,0,205,120,181,31,129,78,48,
+254,18,199,232,22,199,175,58,80,89,10,141,25,164,159,252,171,82,188,76,244,200,199,177,135,136,240,166,110,210,69,96,94,16,164,60,222,232,19,88,164,3,162,73,79,21,16,18,75,196,32,186,232,152,181,152,15,71,107,57,8,26,187,79,121,48,238,230,118,174,135,94,80,162,206,90,180,243,209,208,59,27,152,70,232,146,24,225,166,67,48,18,62,156,222,189,170,207,78,66,129,190,121,208,150,216,179,218,60,12,29,169,200,0,40,20,67,26,146,157,52,31,149,217,135,29,141,25,27,202,215,179,94,12,50,186,163,245,118,18,191,128,12,92,203,23,15,216,116,146,198,67,8,220,216,225,13,165,183,182,91,165,198,178,104,178,128,65,48,64,12,163,178,153,141,148,173,84,200,207,86,236,43,160,82,29,200,119,19,228,149,27,247,67,169,226,42,169,17,164,132,210,8,68,194,73,197,196,213,110,91,149,117,75,208,185,58,81,235,179,55,219,62,189,77,2,206,235,205,230,227,50,175,154,12,161,102,204,128,13,183,177,249,224,185,144,61,131,170,123,187,48,128,209,197,179,
+103,205,40,133,115,83,194,26,189,2,161,176,180,228,249,252,15,158,120,48,214,212,19,169,252,14,16,147,200,226,152,143,214,246,162,231,130,68,174,171,52,23,246,240,16,155,17,175,128,1,103,1,78,103,236,253,1,141,20,177,185,63,159,31,43,101,126,84,73,241,64,124,196,21,70,156,113,138,224,102,59,196,89,22,208,93,214,86,156,74,34,26,147,109,1,243,203,115,127,36,224,33,212,192,106,48,154,53,115,92,221,35,51,173,208,137,250,41,62,186,41,19,218,27,109,179,18,99,87,182,4,220,137,195,68,68,19,233,171,156,162,204,144,160,7,144,251,5,99,63,49,83,205,24,38,153,12,212,20,82,12,58,210,13,17,178,225,124,54,74,21,79,208,4,136,101,83,144,2,23,208,83,127,163,54,122,66,78,42,40,180,110,82,215,83,100,90,164,8,87,67,21,204,51,56,253,17,91,135,117,72,204,139,145,86,105,233,63,78,240,124,103,54,15,9,28,19,46,7,85,3,121,206,190,177,97,53,85,230,61,18,67,79,160,17,124,93,95,202,111,140,140,196,27,88,171,
+14,148,145,137,184,7,149,157,157,93,2,23,73,228,204,125,106,91,27,245,93,200,249,122,239,65,32,168,131,27,87,137,41,218,96,153,151,195,104,51,146,182,220,79,8,66,62,216,19,63,115,143,165,3,143,199,19,247,53,145,225,1,151,221,235,71,187,101,78,74,240,192,133,143,75,90,209,78,3,182,81,249,187,36,10,241,184,73,238,183,36,139,28,107,100,122,102,18,96,168,198,168,223,111,226,10,29,31,189,222,147,153,247,201,129,129,253,192,78,17,116,168,153,197,137,94,224,157,11,113,157,154,70,248,125,149,1,55,19,79,230,236,15,187,107,7,182,172,223,174,158,172,133,66,161,219,237,14,28,5,19,14,135,155,15,2,5,122,23,105,183,35,99,245,218,114,84,22,112,246,180,160,198,108,222,249,233,23,138,245,124,32,225,93,241,200,230,237,202,178,155,111,161,18,30,119,34,66,243,249,25,85,39,217,71,245,251,78,24,14,130,158,49,114,108,15,58,49,164,169,150,141,34,107,172,71,23,163,209,40,65,144,184,69,210,116,242,123,146,216,74,55,204,144,8,196,
+4,125,33,89,22,159,180,49,96,240,240,60,127,120,136,24,35,163,71,235,49,26,47,39,24,227,210,30,167,197,199,224,216,143,17,192,250,238,88,15,20,21,35,193,78,25,49,212,244,178,196,208,65,202,235,166,207,94,196,55,171,205,126,58,63,100,157,61,34,173,121,39,90,3,162,185,72,73,241,222,126,6,131,181,216,188,78,163,98,26,220,25,216,146,45,106,54,148,89,237,69,128,205,169,1,217,137,232,129,196,178,203,228,243,187,237,172,155,46,151,203,132,16,161,70,170,134,238,206,200,195,6,207,192,2,223,230,212,164,199,60,0,46,2,140,1,73,0,24,139,41,18,225,105,179,102,96,40,56,215,220,0,85,211,108,212,235,55,183,20,60,89,217,178,142,1,193,116,154,254,168,211,246,76,0,120,25,128,112,38,139,44,203,189,134,197,42,57,208,0,139,63,20,98,74,31,155,86,139,203,196,125,234,83,245,215,157,148,167,20,142,129,251,130,83,30,120,17,73,163,55,54,12,253,1,14,35,218,207,36,226,44,221,232,21,31,214,71,79,178,102,56,184,11,54,211,
+17,182,193,57,7,28,63,170,212,78,128,29,176,127,52,93,81,38,158,21,33,132,102,185,231,164,226,78,135,26,149,157,68,81,150,216,172,137,41,36,99,223,150,34,49,187,164,52,74,30,183,245,58,199,102,128,246,201,190,17,241,99,139,93,118,232,64,103,53,3,143,248,190,103,133,64,10,42,73,71,44,94,230,179,52,109,23,200,121,84,43,0,28,18,64,140,43,10,224,59,113,177,147,148,36,19,138,4,195,48,239,43,175,152,57,34,201,168,190,238,135,219,52,227,233,57,92,122,3,124,164,48,2,229,142,56,96,171,33,134,104,134,212,148,73,165,200,92,158,86,192,237,108,78,70,232,240,181,25,112,113,96,66,129,1,168,206,228,28,52,37,73,196,185,83,42,141,64,163,9,154,119,56,199,234,170,238,62,109,64,28,243,134,152,155,201,157,237,31,61,155,109,242,114,89,126,236,231,138,197,125,201,174,3,241,93,204,238,246,218,42,50,136,86,49,229,134,1,206,185,213,181,125,230,178,226,219,152,110,207,55,76,76,183,116,72,181,125,75,110,161,191,66,114,46,24,
+21,156,167,128,27,162,69,27,88,142,8,30,154,115,214,219,209,20,125,226,213,104,132,194,110,128,162,34,77,234,1,170,136,87,191,180,251,171,229,42,201,162,157,183,50,82,255,236,68,187,57,27,98,22,43,79,101,54,234,53,155,139,22,147,203,108,31,94,132,121,47,167,82,180,106,215,30,51,112,101,39,13,179,227,115,0,7,0,49,114,133,222,141,200,107,54,47,34,131,88,46,103,44,57,150,224,57,158,83,189,70,158,250,104,241,73,48,180,152,161,114,68,208,240,184,51,184,37,46,50,236,245,66,66,196,227,133,25,85,155,123,112,47,28,222,101,86,226,168,203,113,181,55,72,231,80,174,71,181,73,156,205,47,228,35,213,253,12,50,202,155,183,107,187,125,101,151,20,76,118,187,61,155,81,247,178,55,1,42,236,38,41,36,158,208,230,210,237,241,20,247,72,180,140,164,216,226,67,218,51,239,164,100,21,65,82,194,48,90,246,187,97,201,193,14,179,217,134,89,23,138,145,3,112,57,75,187,7,54,45,224,151,224,69,70,108,88,47,118,251,237,220,115,140,102,136,
+248,124,159,23,224,189,144,149,157,139,69,88,251,52,49,21,204,45,133,190,219,159,110,149,30,231,166,71,220,110,6,249,188,126,90,113,159,117,146,30,177,236,140,18,50,40,83,199,77,68,184,48,205,198,145,212,169,172,220,49,168,79,134,155,245,184,234,29,228,120,35,217,156,118,181,43,141,28,43,115,74,51,159,248,130,1,1,57,141,247,0,184,185,162,27,91,46,90,248,128,77,136,185,177,236,171,119,24,187,157,109,215,16,106,194,123,50,29,167,188,9,229,204,210,2,36,71,172,175,84,165,155,78,185,211,0,1,6,52,135,195,17,23,36,59,195,78,71,34,200,76,188,22,6,30,137,231,177,34,208,115,84,191,131,14,88,224,228,30,199,188,75,132,105,59,203,106,150,29,104,24,221,212,57,141,102,244,101,34,221,7,217,156,147,27,37,123,46,205,124,142,67,154,187,49,103,50,100,27,149,178,249,252,153,38,81,162,170,123,252,48,126,75,108,207,22,160,10,70,246,112,109,80,183,87,91,219,48,4,135,23,115,178,14,238,192,175,96,92,4,173,145,209,104,52,235,
+207,8,210,145,227,210,55,21,93,20,2,155,45,251,124,25,218,183,163,156,251,172,230,177,31,8,4,182,85,88,221,211,167,79,6,11,56,111,168,5,4,18,253,149,196,161,59,94,172,68,231,232,210,186,130,182,48,44,168,157,145,199,227,77,188,161,155,245,150,22,107,170,25,83,49,169,35,198,22,75,18,194,213,102,144,211,90,35,201,100,50,30,7,245,169,211,114,146,232,113,161,61,182,109,184,235,5,104,179,128,54,76,146,132,235,49,230,92,96,224,129,247,244,134,93,191,127,175,79,170,178,15,40,243,169,38,78,31,153,128,67,197,200,48,189,12,87,238,139,131,69,81,216,28,35,112,235,25,119,106,17,85,212,117,53,41,95,156,110,211,17,177,106,244,12,177,102,30,252,253,158,36,217,179,231,249,121,17,238,203,50,47,230,79,57,174,1,221,234,33,129,182,94,200,192,220,201,133,216,197,42,92,228,141,226,241,131,231,109,134,4,143,211,153,147,204,121,161,148,185,36,57,157,205,83,145,227,93,77,163,178,72,112,81,212,99,214,89,40,160,66,161,251,67,118,8,
+196,149,170,86,155,252,52,126,90,92,13,83,201,78,200,130,38,132,80,178,199,67,218,158,4,52,163,34,205,188,89,0,174,42,39,26,248,185,76,92,94,223,156,173,206,138,59,51,57,107,214,157,72,18,28,0,135,179,92,46,217,110,18,178,57,90,160,131,45,13,61,51,232,22,159,248,119,201,118,103,191,7,47,77,213,176,153,64,32,24,218,243,126,206,188,89,86,43,75,28,132,123,214,103,20,243,166,22,162,147,216,231,247,252,177,151,181,233,132,218,237,32,195,180,30,106,30,109,132,129,24,89,4,156,51,101,156,19,6,48,15,109,246,246,232,107,166,153,230,35,9,148,74,229,163,197,98,17,139,197,2,203,213,193,44,79,79,79,64,99,13,53,107,179,88,251,195,179,138,207,183,159,13,245,26,205,28,117,165,220,43,149,135,168,147,203,65,242,71,46,17,59,214,195,138,130,164,56,22,139,5,55,171,22,151,201,179,75,232,203,216,237,3,73,172,213,213,225,106,95,107,211,246,214,175,204,99,196,98,234,19,149,5,26,168,100,154,123,219,245,173,94,186,57,253,75,
+87,100,122,233,94,229,95,186,229,194,75,215,44,126,233,10,36,47,221,113,242,165,171,73,190,116,17,157,151,46,180,243,210,253,21,31,213,75,23,220,79,118,105,89,174,103,36,6,221,143,117,89,73,38,184,188,48,239,215,82,210,14,183,44,219,216,75,43,35,153,212,20,124,26,76,187,72,56,241,39,13,188,180,11,27,23,69,60,121,67,221,8,97,31,111,174,150,101,193,147,96,166,2,197,249,253,51,119,4,76,245,144,22,234,117,10,51,66,215,242,20,137,74,176,201,4,78,76,227,120,224,50,62,189,50,219,53,34,218,185,251,204,220,131,69,134,238,78,66,178,119,109,64,179,126,220,156,92,43,44,204,69,116,165,162,14,42,250,123,167,155,170,94,68,154,241,154,61,192,115,163,66,1,29,102,1,14,29,123,188,97,216,225,201,147,202,94,180,5,214,150,14,117,37,241,10,48,69,157,43,179,169,17,71,132,172,243,60,217,127,238,110,26,53,34,126,227,152,149,80,154,33,22,61,224,237,211,7,116,175,51,185,188,44,243,134,27,199,158,153,198,210,54,84,175,90,
+61,128,75,218,157,0,122,203,63,47,2,120,160,116,66,51,156,178,8,35,85,92,213,174,101,225,102,125,0,228,140,251,129,79,164,197,224,110,199,43,133,205,224,155,106,175,36,24,199,206,224,210,1,23,58,166,21,165,232,106,47,107,209,151,122,101,11,32,156,179,163,42,149,108,19,52,178,46,149,43,19,196,234,133,109,214,23,126,222,186,181,243,153,33,102,150,59,163,219,76,46,54,211,125,60,71,93,215,103,222,123,124,95,226,63,185,165,131,104,171,6,82,151,194,2,36,15,136,123,159,51,137,81,110,46,6,57,40,76,114,229,93,128,213,209,1,66,196,97,182,139,88,222,55,237,215,242,137,60,19,208,217,9,157,30,185,59,248,175,78,29,162,75,110,96,242,75,57,119,172,186,204,158,140,89,210,73,55,49,196,141,0,180,34,98,184,181,117,7,230,144,6,140,25,77,55,62,245,168,70,207,98,66,210,226,90,41,110,140,8,42,100,210,227,44,227,52,225,53,44,172,178,78,153,36,35,63,204,235,61,146,157,155,248,86,67,187,247,236,85,2,247,217,28,189,227,
+100,198,86,232,130,159,95,105,230,103,137,58,155,15,50,223,36,231,107,167,241,0,70,93,136,110,87,176,68,156,188,224,175,118,154,209,214,69,74,72,88,24,251,126,175,134,193,6,155,122,174,169,52,159,241,212,22,230,210,20,127,140,112,173,155,158,79,26,94,119,98,119,168,131,174,238,149,3,46,80,192,29,215,123,215,69,146,240,158,117,88,62,91,217,143,13,252,249,120,172,44,98,61,152,232,179,49,15,166,5,29,108,251,108,218,214,75,151,96,127,233,234,148,47,221,44,235,165,235,162,188,116,221,209,141,183,42,63,40,108,54,50,251,185,184,144,82,53,144,99,174,31,246,199,232,238,156,72,251,250,110,131,79,62,122,253,183,71,31,126,250,201,23,95,190,250,228,203,223,184,29,224,205,39,31,189,249,197,155,143,158,75,118,126,248,247,111,59,120,123,1,193,95,191,250,226,245,71,71,159,190,92,67,240,92,166,244,92,132,253,82,111,244,124,135,193,87,53,218,95,223,157,240,157,163,207,62,126,245,225,55,71,190,81,189,253,197,135,159,126,246,250,109,221,246,65,
+132,159,188,249,219,3,216,47,223,124,249,211,231,210,148,163,247,62,126,243,127,188,254,117,145,202,215,247,30,188,250,235,79,127,241,250,232,245,223,190,250,217,103,31,191,254,246,119,223,185,175,225,221,194,242,231,2,242,207,62,255,244,48,155,215,71,63,255,228,205,79,222,188,92,177,240,250,243,159,60,87,85,189,8,240,229,167,71,111,14,42,56,40,227,203,131,2,126,112,244,92,22,243,179,143,127,252,221,131,146,142,14,96,95,126,231,171,203,20,142,126,254,197,203,20,14,114,254,226,205,167,63,255,226,107,9,222,106,228,127,255,249,129,239,47,63,127,245,217,103,207,215,59,124,249,211,87,7,41,94,125,252,172,193,143,191,190,140,225,7,239,86,196,252,127,166,26,236,175,255,199,150,131,253,206,223,125,165,209,15,190,245,124,5,198,111,72,254,143,44,22,251,157,191,251,141,122,155,3,131,3,204,7,127,117,224,240,237,131,56,135,230,189,175,58,31,252,167,95,85,220,252,191,94,98,246,172,199,255,14,181,101,191,38,243,223,88,84,246,107,196,255,114,53,217,63,
+174,114,235,55,234,202,14,230,62,40,227,191,174,6,234,253,175,155,119,254,67,227,253,111,253,222,239,253,225,239,195,129,119,128,193,111,252,139,198,182,139,175,153,25,30,174,72,105,62,165,132,68,88,188,198,81,104,136,0,202,203,1,199,136,39,100,46,69,79,132,12,152,119,120,191,130,186,128,195,222,198,48,153,203,46,234,193,192,83,76,177,146,233,156,229,242,85,25,81,112,135,12,52,157,115,127,35,117,59,240,17,233,24,236,82,103,183,3,144,64,119,9,129,116,183,140,237,101,189,209,104,20,87,234,174,101,166,222,238,198,129,93,117,150,78,167,91,254,53,164,177,172,95,164,109,145,1,218,113,187,186,226,96,22,231,174,219,141,187,154,168,33,40,81,106,52,2,188,17,78,120,211,190,110,22,72,87,31,218,70,159,79,175,137,118,8,10,213,177,45,54,79,221,114,69,28,12,5,29,47,231,116,201,146,65,224,119,223,222,160,92,125,43,82,33,117,132,37,64,142,171,231,59,230,59,78,235,206,123,13,239,74,50,188,69,160,215,21,232,229,212,87,220,221,84,246,
+3,151,31,178,209,108,104,193,106,174,178,243,134,66,107,5,115,220,176,12,72,204,185,240,174,128,184,82,34,138,200,11,29,192,101,197,54,12,146,6,214,92,103,150,187,56,62,6,194,136,83,221,240,240,165,145,115,13,1,117,189,197,101,231,56,22,149,91,206,240,57,254,20,72,186,246,229,17,105,194,104,192,201,68,171,15,157,46,211,121,39,238,100,153,48,144,18,23,57,37,93,37,208,116,207,69,126,123,127,11,17,58,170,134,82,194,14,90,145,162,85,152,40,138,243,185,251,38,4,158,179,82,98,169,69,190,22,239,98,10,56,224,25,167,156,242,57,32,65,87,122,103,66,234,136,152,196,147,186,55,95,202,137,1,93,163,156,41,88,110,92,193,135,152,0,175,104,201,165,219,16,135,223,223,87,177,80,34,158,78,122,18,98,117,178,177,213,75,103,223,224,228,149,77,27,237,208,41,221,138,214,153,50,127,59,109,16,206,44,25,126,231,228,97,106,137,238,238,85,215,187,107,74,166,27,148,113,176,124,102,38,13,136,194,56,242,188,23,180,247,121,59,103,203,120,232,
+9,36,239,59,121,49,11,44,211,37,160,48,249,186,220,46,35,99,6,81,222,77,171,213,180,99,111,172,89,189,235,255,162,237,189,126,228,95,174,59,177,127,133,79,6,215,176,12,69,195,11,27,6,86,182,225,23,219,88,232,101,31,22,4,72,173,46,181,196,82,150,64,81,22,9,240,97,58,205,116,206,61,157,115,247,116,14,211,61,157,115,206,221,211,57,231,156,115,78,238,223,189,36,117,73,145,171,125,88,191,244,153,239,183,78,157,58,223,115,78,157,170,250,20,170,70,191,253,124,161,83,75,114,248,64,155,71,89,188,82,198,40,72,209,80,71,237,180,88,91,117,142,34,146,97,54,167,79,192,237,134,28,73,36,89,245,238,101,234,237,13,11,151,246,219,75,229,49,43,88,70,81,113,69,76,249,166,115,156,222,137,138,133,246,188,111,81,109,209,87,42,156,252,254,252,241,238,221,72,137,220,216,39,131,227,117,148,4,193,14,14,242,110,206,30,95,178,216,204,84,64,232,190,229,51,84,178,143,141,88,59,41,53,240,240,221,40,8,15,0,148,99,171,32,42,247,
+134,29,75,203,53,208,97,236,2,158,84,135,145,24,166,181,115,110,58,185,212,229,237,180,185,48,57,183,188,6,108,229,41,89,100,195,249,56,141,61,243,54,35,167,106,168,187,130,150,71,227,196,181,161,114,184,89,65,95,252,172,74,211,63,188,110,251,110,254,212,239,53,251,115,160,87,184,190,201,207,232,148,164,20,115,62,26,79,15,43,214,220,67,216,206,108,89,37,83,168,139,79,35,76,250,171,17,160,151,111,39,21,231,208,161,138,9,11,249,40,118,45,161,204,100,212,138,217,62,137,114,225,84,81,169,133,38,148,220,210,97,150,175,184,99,253,213,179,120,175,123,110,117,107,174,140,188,235,87,129,77,41,54,34,166,140,217,63,155,213,240,65,72,59,170,128,239,213,183,60,143,170,125,65,141,53,145,28,102,196,138,211,69,115,199,118,164,117,212,173,187,75,136,204,158,135,15,39,123,157,16,179,191,215,245,39,118,185,119,181,119,180,125,23,138,245,114,29,91,247,89,227,94,9,94,234,72,102,122,222,136,26,145,75,210,21,154,52,70,158,203,201,141,104,158,180,
+150,234,177,163,60,37,149,37,91,35,153,204,172,85,125,4,253,187,113,39,246,88,82,44,124,211,179,17,95,11,112,237,112,17,142,100,227,233,133,193,131,173,123,149,55,95,242,245,251,164,116,95,133,28,183,57,119,93,124,49,179,42,199,241,249,66,222,27,80,99,86,253,3,91,170,189,28,12,71,86,161,97,50,220,253,58,75,197,196,47,76,223,133,14,69,111,215,156,147,8,117,202,146,48,88,11,9,121,226,106,68,222,179,33,86,94,90,188,7,11,95,178,67,209,192,163,24,152,117,65,217,85,2,3,25,199,208,82,93,168,174,8,4,183,48,163,57,75,145,62,16,96,235,106,89,41,199,252,204,210,126,189,217,171,172,185,101,160,102,179,215,231,11,187,153,156,93,143,205,123,155,46,49,171,146,148,213,110,92,226,231,245,219,225,164,134,154,83,77,84,204,126,89,163,93,47,150,185,91,81,230,129,228,181,104,68,144,160,18,223,33,170,231,242,164,117,238,214,170,181,35,102,2,98,38,108,238,84,247,122,89,16,146,26,67,221,111,147,185,139,133,150,173,80,106,20,
+140,198,43,230,106,221,209,76,153,155,229,196,158,23,101,154,196,38,19,189,143,178,68,3,187,135,130,207,178,10,118,17,70,147,239,213,70,242,84,112,194,219,205,13,18,244,35,160,34,189,198,20,154,173,28,84,219,118,6,153,146,34,37,102,230,51,167,252,252,192,147,180,49,198,125,58,38,100,206,32,0,129,116,51,169,120,83,247,98,62,154,9,79,187,31,233,4,49,113,150,10,186,180,188,134,41,80,137,41,157,100,3,201,211,44,170,167,98,27,183,205,10,82,73,92,13,166,115,231,149,31,220,215,46,161,44,43,244,61,128,237,155,119,29,217,211,159,19,160,45,141,230,70,199,142,104,212,177,63,205,106,221,41,5,173,210,81,197,52,164,216,177,42,21,140,21,38,62,68,156,95,151,192,62,3,83,15,151,169,62,84,97,160,181,174,176,142,50,126,19,170,123,152,96,21,162,46,62,99,209,111,70,124,43,14,92,10,17,109,121,95,138,171,178,98,178,231,1,123,130,121,219,43,247,134,167,236,136,151,156,75,5,171,108,232,112,78,42,118,54,60,76,159,42,219,149,
+9,251,116,106,226,103,84,211,217,4,54,35,233,244,117,1,88,46,7,214,132,239,217,253,208,15,145,116,249,27,105,186,34,72,73,147,74,41,187,53,28,232,70,57,92,185,36,236,20,75,106,118,124,239,13,213,117,87,186,184,223,45,85,35,77,235,152,212,36,102,144,73,125,232,253,84,57,67,150,170,114,100,54,45,207,108,205,96,24,54,143,94,237,166,14,73,174,209,64,237,196,26,174,145,41,112,27,208,76,206,190,165,149,90,78,49,174,145,21,120,54,211,126,103,80,19,235,133,117,33,37,163,41,29,240,55,176,130,170,65,119,23,70,72,94,167,173,166,45,97,235,57,127,26,120,193,139,68,41,159,54,9,40,204,106,141,50,26,59,20,204,150,156,50,144,19,108,217,162,166,84,212,208,253,246,209,36,73,106,151,235,166,53,101,33,85,161,179,212,189,162,212,77,190,94,73,199,14,37,239,194,72,136,168,81,118,194,53,103,27,41,77,143,212,139,230,131,138,147,178,107,187,27,23,204,67,185,143,53,176,4,82,25,145,83,154,243,0,178,232,242,38,149,4,175,123,
+225,57,65,107,39,170,217,205,105,80,98,20,91,98,85,37,75,72,87,187,237,170,204,111,38,134,253,122,50,198,90,242,171,87,85,234,99,241,12,95,77,195,202,216,65,231,152,137,197,170,160,236,61,242,24,94,58,217,236,39,65,246,148,25,210,111,225,98,241,164,212,53,43,141,249,14,182,30,90,226,16,22,47,91,218,16,94,151,57,182,207,236,20,52,160,118,110,86,164,160,96,171,120,7,150,62,149,205,247,200,73,113,100,30,147,168,136,71,180,55,71,82,68,96,152,193,138,250,74,230,121,186,202,160,183,68,116,106,65,70,238,229,140,155,44,134,111,206,187,119,55,250,160,43,240,229,35,66,99,20,27,147,106,213,77,88,212,36,217,136,181,35,73,144,113,203,152,73,141,186,89,131,184,33,35,205,171,217,34,127,205,238,4,131,209,102,135,163,235,121,43,216,116,123,124,228,192,65,213,146,55,237,72,207,67,193,168,210,154,81,230,203,34,195,204,222,188,214,36,19,9,171,39,142,78,42,197,67,21,32,201,203,46,181,164,56,151,178,242,92,240,200,129,244,200,10,
+131,204,198,171,127,22,154,133,227,187,196,162,76,126,204,174,125,72,48,216,21,72,171,27,28,60,133,41,248,45,58,243,96,151,101,58,185,134,184,156,62,85,57,88,221,130,213,107,186,170,32,111,88,217,146,122,158,158,91,251,92,37,209,115,90,174,219,180,103,164,200,91,107,186,205,192,96,130,228,25,70,91,245,144,93,28,194,98,65,54,124,132,27,59,36,38,57,179,255,24,40,56,111,164,154,248,249,168,146,216,135,177,27,91,131,198,107,218,86,95,105,104,12,226,128,220,147,91,188,37,203,9,146,2,9,162,142,141,110,145,89,235,98,24,28,202,197,143,243,174,116,20,228,138,24,181,3,155,210,117,44,180,218,171,69,223,51,25,18,162,101,166,127,24,107,47,55,93,91,114,121,204,31,174,107,165,35,103,26,72,157,243,30,234,184,79,73,109,35,18,196,74,107,19,60,124,254,200,50,32,59,202,82,113,206,50,126,150,228,131,236,141,109,132,242,211,87,187,54,13,39,36,142,82,8,222,124,73,66,179,184,56,220,189,37,39,239,98,250,210,186,227,95,38,143,134,
+84,186,144,163,150,171,246,155,146,175,76,108,223,223,19,73,242,88,126,167,143,31,230,40,97,139,237,154,195,167,221,1,113,134,21,82,7,204,20,105,199,215,90,59,72,95,121,55,254,145,133,144,6,207,242,62,81,86,138,176,122,194,183,204,97,27,209,170,122,36,174,38,92,191,210,236,240,140,235,49,230,29,246,75,3,4,191,104,203,160,222,132,160,218,241,151,35,147,241,157,224,88,217,15,203,206,60,60,55,78,146,58,143,126,247,166,200,73,203,250,55,203,52,86,248,56,103,95,249,45,96,149,191,65,106,15,189,254,112,21,237,223,62,3,64,37,178,204,200,168,230,159,177,26,69,36,174,133,116,164,160,172,136,126,62,11,167,217,212,121,84,42,27,182,251,150,32,191,204,106,156,193,47,29,148,14,122,43,197,231,170,219,123,43,178,114,153,168,47,100,36,101,80,251,114,34,218,125,91,55,189,61,224,242,165,5,15,92,139,234,221,162,172,73,6,94,81,70,77,174,83,72,250,168,129,21,85,105,51,239,165,252,125,173,182,236,110,136,9,77,140,104,232,99,112,53,
+82,150,9,91,75,215,33,155,62,191,10,144,53,97,120,1,165,162,76,82,58,96,56,41,12,31,88,30,243,37,214,1,25,167,66,237,72,132,97,157,26,195,206,48,63,99,155,239,167,237,100,222,171,47,78,113,148,79,149,112,52,239,241,30,184,108,162,206,251,245,125,173,113,250,220,191,85,175,252,91,70,134,233,8,217,119,10,99,119,19,16,13,182,128,236,220,199,44,175,236,170,117,106,82,82,106,177,226,135,170,147,97,46,24,68,82,158,170,118,61,83,167,81,245,231,89,227,229,205,180,250,143,38,68,112,180,99,218,49,240,182,185,242,229,175,193,106,162,60,189,93,74,245,8,131,73,36,7,165,92,217,29,25,26,215,169,86,41,172,130,41,138,107,59,42,237,144,194,92,57,193,123,68,249,226,95,175,24,159,108,161,245,160,161,28,180,195,79,48,254,118,35,221,192,132,50,171,180,214,240,227,253,243,211,136,227,41,177,137,235,17,219,55,120,27,33,73,226,99,39,19,31,72,154,103,151,196,46,124,91,105,170,10,79,23,234,146,157,185,175,177,10,138,81,39,51,
+52,155,207,145,6,23,154,238,109,43,145,163,245,145,119,8,245,92,246,110,147,47,116,174,138,147,165,161,194,42,32,122,25,216,132,94,37,145,211,208,92,67,50,176,63,87,192,34,116,17,189,154,196,148,162,217,157,62,214,225,209,161,49,169,66,132,199,241,142,53,153,81,173,232,144,60,13,160,251,176,240,252,74,51,135,167,80,157,57,91,37,239,206,3,139,124,97,120,243,18,233,110,25,71,181,253,176,94,251,163,109,155,103,199,176,106,70,135,212,156,158,127,218,136,35,123,11,177,210,14,23,242,24,82,84,212,32,169,17,226,3,196,248,148,127,2,253,138,62,61,168,250,176,37,189,91,129,61,142,53,60,222,100,253,54,160,234,9,70,114,202,156,0,43,144,241,43,250,74,177,154,53,231,242,33,12,57,97,30,143,206,240,55,175,127,77,111,15,234,146,33,39,135,215,195,131,99,148,133,14,14,144,40,184,6,128,163,27,164,198,211,191,76,27,104,100,173,10,83,61,101,168,80,213,235,135,148,207,223,185,100,13,222,2,46,88,60,169,158,94,254,137,102,22,141,5,
+188,157,119,110,136,192,118,62,64,74,146,22,112,10,236,91,122,86,157,223,40,2,213,62,165,161,7,59,8,103,5,190,125,169,137,91,192,23,223,166,226,67,141,221,224,180,246,82,194,67,192,147,21,40,101,124,35,224,87,180,194,160,176,19,88,144,202,244,4,3,207,9,128,60,201,25,253,90,81,34,224,27,133,177,128,135,194,205,219,51,167,1,255,34,233,73,92,251,166,224,87,20,251,160,139,42,117,129,255,70,237,95,83,224,23,74,233,63,237,24,226,196,60,176,62,229,159,36,95,55,136,12,203,225,60,193,137,80,40,4,205,42,34,43,61,239,103,119,163,180,173,210,187,172,243,141,24,62,9,151,209,54,116,251,129,84,219,218,251,236,17,125,129,11,243,42,61,21,79,198,120,191,194,154,213,130,138,203,191,85,202,30,185,234,16,30,241,172,154,211,97,159,237,110,164,154,79,117,182,84,168,227,77,139,11,6,111,207,190,230,158,107,187,161,12,85,55,108,188,73,153,17,177,31,103,51,5,84,176,214,32,205,116,224,166,246,6,157,242,34,140,150,162,194,62,141,
+26,163,39,213,70,166,139,239,143,82,230,71,68,6,104,206,40,214,148,66,31,142,220,140,40,254,77,216,84,60,27,245,222,82,143,163,27,2,111,7,146,81,238,208,66,174,92,170,109,196,77,192,106,169,65,225,178,70,69,121,67,43,48,4,144,124,9,142,199,7,254,22,117,121,83,103,146,188,157,3,145,176,130,109,120,45,230,17,212,17,188,128,159,127,175,34,225,218,177,230,209,49,186,71,158,128,63,180,122,70,128,204,53,47,139,91,32,237,66,100,223,157,127,80,192,78,217,149,166,122,247,4,158,97,161,110,22,131,17,142,116,165,36,25,148,203,151,146,243,1,53,38,222,155,54,236,131,48,164,48,229,184,53,138,103,215,194,197,132,25,188,83,46,155,198,222,225,237,1,142,79,198,100,95,89,7,143,240,193,208,76,88,69,163,118,93,187,0,228,181,39,82,64,49,36,229,197,139,40,80,197,203,205,233,147,215,128,25,124,59,119,13,2,114,254,214,91,6,101,141,215,135,251,176,200,77,237,168,216,48,95,142,94,30,213,182,106,155,9,218,110,40,165,18,132,119,
+96,88,141,199,193,103,136,53,64,4,248,173,56,203,1,84,104,25,255,153,184,203,15,156,34,6,160,95,32,197,145,10,167,115,37,144,126,188,117,133,42,249,85,247,78,70,1,154,164,183,37,241,227,158,103,180,231,213,194,103,127,58,94,231,250,4,50,160,145,37,62,47,247,118,86,24,253,34,108,100,83,71,82,191,165,137,179,243,3,10,230,78,116,68,51,210,248,167,241,205,56,23,62,20,104,121,105,93,105,254,36,228,93,148,212,136,39,136,127,140,76,128,216,226,206,142,238,104,42,243,123,120,114,26,134,213,108,153,114,181,183,56,101,198,171,1,16,96,166,142,221,57,172,100,237,213,182,162,142,218,40,184,136,168,54,188,87,27,89,150,106,168,231,0,62,47,150,133,54,58,124,30,61,244,23,123,139,15,224,109,223,217,135,217,186,150,6,227,127,215,6,123,2,240,59,40,79,13,13,72,2,114,84,9,102,125,186,178,112,149,175,229,60,8,147,204,44,173,18,200,192,145,44,181,234,98,156,77,80,210,103,86,222,9,119,202,132,223,164,9,153,239,107,10,182,62,
+155,149,200,19,228,209,255,31,125,235,9,116,128,192,191,206,70,7,200,232,107,154,149,201,146,223,116,236,223,238,151,95,83,215,226,40,189,254,238,242,211,215,244,100,77,217,47,51,32,5,110,205,124,19,118,214,205,55,212,197,149,117,46,53,182,154,51,119,245,13,142,135,163,100,176,223,85,223,37,227,35,39,95,50,89,2,227,93,159,30,121,19,240,219,121,179,241,160,148,167,251,29,207,81,115,92,42,181,210,13,255,146,237,208,13,247,215,217,12,221,64,147,26,206,70,214,143,54,61,242,15,231,134,190,1,50,246,175,19,226,175,242,199,175,40,231,235,60,114,129,251,40,64,191,15,240,178,8,126,19,54,191,166,31,240,5,231,4,233,107,137,79,233,175,13,69,252,166,249,195,199,55,52,200,85,205,196,251,176,78,243,156,59,111,112,17,94,112,129,241,164,98,87,114,205,33,227,66,2,74,217,99,41,183,133,207,85,133,74,153,135,57,200,217,246,77,211,197,234,185,14,43,52,243,69,116,11,120,200,250,132,92,218,47,19,238,109,182,229,152,70,7,226,115,165,190,
+246,81,109,213,208,174,73,47,107,187,200,74,171,25,245,26,164,174,112,39,205,41,219,204,170,13,54,223,147,36,104,111,68,9,140,9,34,49,17,6,20,190,216,5,130,170,227,183,243,170,231,180,131,8,219,116,148,225,18,169,120,3,231,215,195,251,240,190,59,205,116,203,52,219,150,169,198,234,39,41,133,186,84,146,155,89,148,10,38,81,1,41,180,59,200,169,4,68,142,223,130,210,254,228,127,250,206,159,252,247,223,249,95,127,242,213,15,190,6,244,191,128,235,63,248,241,79,191,250,201,215,232,254,175,33,253,95,95,33,252,13,190,252,53,126,247,231,255,240,195,31,126,245,147,111,35,234,223,188,249,167,29,130,239,252,224,59,255,248,147,31,253,244,171,95,93,204,242,203,251,138,127,244,55,127,243,15,63,253,2,245,253,18,135,255,127,127,240,227,127,248,234,255,191,203,131,191,243,247,63,253,201,63,252,135,159,254,23,193,207,223,40,244,163,191,249,235,223,18,241,159,3,155,191,141,52,255,6,215,255,249,213,15,127,250,191,253,237,63,254,63,223,253,183,127,251,
+5,220,253,187,255,238,59,127,245,143,127,251,147,191,250,206,127,250,234,231,63,252,241,15,254,250,239,127,23,66,253,211,159,255,221,87,127,245,213,15,127,169,236,215,240,252,255,253,111,254,175,255,253,159,29,25,253,189,39,161,127,133,80,255,146,239,159,99,176,95,67,174,255,228,172,239,253,232,47,127,121,215,239,239,192,163,127,254,75,60,250,231,223,249,159,31,12,15,250,59,240,231,135,188,191,248,63,254,252,223,124,231,123,223,255,111,127,252,133,253,71,127,249,253,127,255,243,239,127,239,219,64,243,175,196,253,236,151,226,126,246,75,113,63,251,29,226,254,224,23,63,250,225,119,191,180,251,133,245,59,223,255,197,247,127,241,157,95,62,253,233,191,254,230,241,103,191,81,248,179,95,21,254,171,223,16,242,7,191,120,168,243,245,157,217,143,194,63,255,241,15,254,195,127,250,238,111,96,223,127,240,139,175,126,252,247,95,253,118,211,127,240,139,31,127,255,15,254,151,31,124,169,243,199,95,96,240,239,254,236,11,36,254,243,223,170,249,13,215,79,190,112,253,233,23,174,
+159,253,174,226,191,254,117,241,207,127,87,241,95,126,221,198,31,254,225,63,47,123,232,252,155,47,191,117,118,251,55,30,190,245,231,195,7,255,246,39,95,253,205,63,252,248,167,63,250,187,31,255,252,123,223,253,209,95,126,75,229,71,52,127,227,151,223,119,222,250,191,198,206,198,191,251,143,143,126,254,207,206,133,127,179,43,241,71,95,194,235,203,134,194,95,255,30,134,63,125,48,252,241,111,113,252,103,149,252,23,123,214,191,20,246,223,123,152,227,187,191,169,208,111,196,252,31,253,217,55,65,255,39,127,246,187,131,254,235,136,255,47,12,248,47,178,126,246,75,89,223,68,252,111,184,247,199,223,255,247,63,251,254,247,190,48,62,84,252,163,63,252,122,251,229,47,190,250,171,239,254,171,111,73,252,77,87,255,218,161,223,226,248,139,175,126,248,200,185,255,241,247,108,155,252,215,190,122,251,219,251,47,127,246,63,254,233,127,243,63,252,241,191,126,2,109,159,110,223,218,125,201,51,166,21,24,145,158,21,82,85,11,61,56,168,193,118,248,205,96,193,13,141,128,177,221,
+167,137,192,187,1,3,1,130,6,56,22,133,9,188,0,1,248,249,18,106,224,67,81,107,209,82,99,28,231,209,72,196,80,64,45,103,123,251,40,147,143,40,170,138,107,61,21,145,94,211,164,12,94,28,150,78,21,179,50,214,226,182,8,117,229,41,196,193,170,126,26,151,75,219,250,206,79,75,201,122,118,110,86,55,111,29,237,236,66,58,152,22,79,51,40,65,101,209,66,82,123,139,148,215,63,15,90,179,214,253,60,139,237,175,198,207,185,65,146,177,84,247,106,71,193,32,73,237,219,169,117,29,68,58,182,93,160,186,201,97,78,101,242,120,243,75,88,22,194,169,206,182,131,197,100,33,243,46,242,115,64,98,73,78,102,162,39,75,213,182,95,92,21,6,82,231,9,117,156,157,66,181,59,189,176,143,153,163,211,69,66,184,201,232,18,183,143,117,124,94,91,217,230,245,250,249,112,223,226,215,199,187,99,55,188,244,107,150,221,48,175,156,87,87,165,124,29,171,61,222,132,166,122,101,103,182,13,153,106,160,213,181,126,183,163,84,47,187,141,93,85,77,77,199,190,156,
+113,97,117,194,192,28,230,149,58,118,128,154,246,49,168,22,40,179,150,105,184,58,110,107,231,21,235,219,157,65,94,116,240,139,238,125,75,4,97,29,231,11,151,246,52,173,189,206,47,47,27,200,133,81,123,173,79,241,146,237,41,51,79,171,82,144,73,229,102,16,105,67,68,22,57,104,74,216,165,240,212,254,94,169,163,206,47,230,101,61,134,179,231,45,70,251,121,185,197,16,51,174,19,139,116,2,52,51,125,251,251,189,71,136,170,64,11,251,253,176,53,68,235,182,231,84,249,185,105,136,88,206,116,27,115,215,191,239,84,156,245,222,132,190,156,53,179,252,125,81,116,157,48,19,219,221,80,163,207,187,213,182,42,193,94,6,1,90,246,56,205,56,6,199,85,207,218,120,117,140,31,246,62,159,207,4,189,209,98,236,175,185,167,22,75,30,50,0,27,9,255,114,153,1,84,206,206,89,251,60,3,204,79,57,194,203,97,14,13,236,175,20,19,81,237,156,223,172,41,254,115,208,150,15,102,84,132,99,221,69,44,151,194,124,197,190,22,189,37,9,235,5,137,129,79,59,
+217,26,232,165,100,51,61,140,249,110,164,180,27,57,132,17,5,120,162,175,147,213,137,25,213,177,212,247,193,227,230,99,163,211,3,245,117,212,174,58,230,96,167,170,117,228,46,135,31,230,62,178,54,202,57,192,142,239,247,178,93,69,20,50,49,225,213,251,62,226,72,147,222,86,122,243,243,128,137,99,117,146,206,211,11,0,163,81,10,151,125,152,218,229,196,90,128,118,61,165,129,200,184,144,118,179,218,184,92,123,179,44,133,21,61,79,161,209,28,210,254,9,116,74,43,160,177,72,109,61,143,156,234,145,226,232,37,98,217,118,171,149,226,35,188,78,39,110,70,110,91,149,74,48,125,253,10,48,141,167,207,202,137,14,80,92,79,70,233,58,41,76,221,71,211,237,64,75,193,32,72,247,176,13,117,36,177,44,178,50,230,179,101,147,47,108,220,197,83,80,68,84,215,18,229,229,43,11,28,99,92,103,248,105,61,238,32,100,69,55,238,106,14,199,144,110,150,228,225,18,246,44,243,117,137,245,210,86,184,85,51,197,101,18,245,99,111,46,186,211,120,96,223,146,113,91,
+94,29,166,43,121,142,235,112,20,170,169,116,159,72,236,235,101,122,182,178,63,130,106,254,252,142,81,123,131,251,123,62,16,63,236,112,86,129,166,129,89,194,142,205,253,242,51,30,123,185,195,204,204,234,123,141,37,167,40,115,183,114,31,237,94,89,108,220,167,141,167,164,77,223,51,148,155,221,164,191,11,237,107,135,44,113,49,240,15,47,34,239,253,116,151,175,216,14,233,229,124,79,68,238,43,237,202,49,153,72,239,109,144,176,110,186,126,30,90,202,86,59,84,87,88,55,177,93,123,183,149,148,149,108,83,123,78,227,29,86,173,249,21,88,25,12,106,71,74,177,89,219,26,178,39,138,141,189,241,95,106,234,251,224,242,97,236,61,169,53,202,233,89,191,175,249,82,221,120,243,60,195,30,101,119,215,49,184,94,149,35,166,186,214,222,199,232,200,183,187,238,17,230,222,251,173,23,235,58,88,178,123,130,22,120,90,116,235,44,37,253,190,78,68,28,119,39,235,176,98,181,218,251,87,227,109,25,185,1,84,61,148,125,159,205,144,29,112,57,75,182,6,62,213,18,16,
+48,122,9,92,168,53,177,189,50,230,164,215,204,13,108,249,13,121,32,179,195,217,46,97,252,126,158,95,225,211,122,239,73,166,246,116,245,244,131,169,90,219,175,230,243,23,53,202,117,235,11,200,55,237,73,228,168,195,239,231,101,248,222,191,104,46,14,61,233,86,111,2,82,132,61,204,49,55,89,14,5,166,47,224,178,139,48,100,204,149,48,187,47,198,19,140,131,24,49,173,71,221,188,18,107,63,58,240,184,116,27,66,107,207,135,53,254,33,130,79,212,210,231,102,125,84,82,221,44,234,42,121,45,9,158,111,123,231,208,48,220,191,178,203,159,135,238,109,10,97,87,163,247,142,101,124,1,229,65,215,245,68,79,50,44,75,189,90,111,204,153,223,227,219,237,28,129,137,157,151,150,74,149,61,15,6,181,232,133,49,15,170,153,35,101,208,164,50,179,16,133,77,223,61,212,12,117,109,231,216,84,248,98,65,146,25,241,163,244,126,224,61,212,111,189,92,119,195,214,167,206,97,179,45,180,244,39,197,122,239,81,41,166,253,153,228,104,93,39,200,28,148,40,208,154,162,
+208,79,100,195,196,36,177,72,198,177,65,134,37,222,159,230,201,171,58,176,14,187,95,114,154,80,205,196,60,108,143,47,8,76,229,217,95,58,218,163,7,54,134,120,63,210,211,248,78,179,89,134,91,29,213,68,253,78,242,244,245,245,251,199,62,159,77,76,170,108,144,190,162,88,159,74,62,205,124,43,86,33,143,212,76,211,182,159,195,246,179,150,171,86,26,166,186,238,249,170,39,231,213,51,231,162,247,54,100,76,143,29,85,155,41,138,88,151,139,154,5,189,84,189,222,183,92,13,69,116,127,42,215,239,130,141,151,120,141,176,26,2,91,103,108,105,166,43,76,118,231,162,175,184,106,91,234,68,203,100,39,239,83,183,143,89,83,241,3,61,136,103,135,197,14,183,85,144,149,216,183,103,74,64,91,116,122,8,214,104,23,159,141,156,65,185,116,7,11,15,25,185,30,208,41,76,81,175,191,12,13,78,175,115,202,98,93,210,9,151,120,33,179,30,231,203,185,93,115,247,250,188,205,89,130,67,190,45,76,247,190,232,122,64,177,163,247,6,92,85,217,43,63,47,219,54,
+224,229,112,102,82,42,69,193,83,173,129,220,213,114,174,193,174,186,92,86,121,19,132,172,223,16,30,139,239,152,221,9,80,214,44,96,243,186,11,141,189,105,43,38,152,53,235,73,19,137,71,246,97,52,52,236,21,228,251,158,175,161,72,199,151,93,192,77,216,7,145,100,50,166,118,27,48,30,221,184,15,223,215,138,42,235,152,224,67,145,137,25,67,37,124,189,107,14,99,11,121,104,191,216,163,115,11,107,114,54,235,11,91,128,107,110,155,75,60,140,3,166,180,187,78,150,54,64,80,63,85,166,228,174,165,146,203,198,223,196,158,236,158,112,140,13,33,158,113,83,36,163,151,95,14,171,207,194,77,230,152,207,205,173,122,45,121,58,79,207,97,199,181,121,156,219,13,64,24,120,49,70,177,2,155,90,202,47,139,224,246,149,183,203,157,215,156,122,124,23,38,217,101,168,85,5,215,214,75,183,214,163,27,237,244,2,117,127,89,21,102,182,167,125,202,133,156,160,15,6,86,231,62,45,177,142,11,183,185,80,103,25,219,56,80,117,6,49,147,19,183,139,51,192,221,128,
+217,181,2,60,102,125,140,182,179,83,92,62,239,207,216,103,173,137,0,174,128,189,71,246,197,252,26,29,66,28,103,251,242,73,97,59,170,22,222,118,245,37,195,46,214,203,178,67,228,34,187,212,187,237,174,69,41,159,26,57,227,133,13,129,157,51,85,107,199,14,164,153,199,186,108,59,125,165,89,144,131,24,234,158,79,239,214,22,169,124,143,116,214,107,230,26,77,161,134,110,79,159,155,147,138,181,71,93,209,233,161,22,121,179,235,83,15,26,78,107,110,4,214,85,31,246,195,96,15,174,203,239,245,67,172,250,50,41,177,207,185,33,110,78,28,220,111,131,222,167,105,44,125,52,152,80,85,110,57,214,41,134,25,217,239,203,154,175,134,253,124,33,139,15,46,195,235,209,2,194,39,19,175,151,199,71,230,63,174,150,124,252,112,153,169,26,187,73,253,126,52,12,54,157,115,176,193,29,112,174,24,155,103,213,192,105,228,220,249,228,137,151,239,149,201,139,253,93,216,94,172,231,36,246,117,86,199,11,22,5,67,4,51,173,85,78,93,84,151,93,185,23,43,155,163,199,
+189,175,159,177,139,177,41,152,67,205,211,215,221,132,154,223,239,158,229,69,194,107,129,44,192,172,128,233,71,224,101,133,205,102,104,199,48,77,84,169,119,107,63,108,95,210,156,47,197,189,246,16,121,180,104,133,31,83,235,91,57,181,255,180,177,243,68,214,154,141,225,166,111,13,7,135,55,151,152,57,247,61,217,201,184,32,161,9,11,74,51,45,241,13,80,76,69,126,177,174,174,195,126,158,204,118,152,149,171,70,182,5,98,178,129,231,61,245,69,102,170,31,239,203,183,61,135,82,55,69,206,67,237,171,241,232,122,154,111,121,23,247,242,221,104,92,172,184,249,245,205,167,45,225,244,152,167,229,164,174,204,29,141,39,29,71,157,44,131,120,64,176,235,68,122,101,205,183,101,70,109,127,122,67,105,58,183,6,192,233,109,93,219,252,198,37,88,103,236,21,119,130,138,164,247,41,84,151,201,181,153,118,163,124,177,186,108,118,74,72,23,233,113,216,113,108,85,142,129,124,102,102,49,19,145,72,206,248,117,46,190,214,155,215,226,130,60,78,124,86,76,241,158,77,176,158,
+189,131,64,181,113,229,225,253,0,33,98,173,4,54,85,45,251,114,52,83,244,47,218,160,37,211,221,157,90,159,113,248,218,66,191,142,204,238,39,104,226,58,58,195,202,74,94,125,102,133,219,251,115,10,14,85,239,220,55,194,221,190,173,155,96,84,177,123,117,129,168,248,101,136,253,165,150,52,142,83,45,166,145,45,187,245,173,45,197,178,255,58,179,190,216,110,9,228,166,190,137,85,107,125,67,176,76,120,182,218,206,174,230,162,198,90,180,150,195,201,208,121,168,202,106,129,181,253,125,1,215,220,94,193,136,148,108,57,191,212,72,150,155,181,128,10,146,223,230,54,249,241,60,35,133,202,170,104,109,87,151,100,166,100,209,220,210,147,175,167,145,85,221,126,83,239,21,235,38,61,190,142,40,238,142,139,110,95,239,216,47,202,141,110,156,177,230,247,18,251,82,2,139,158,247,125,117,77,125,121,47,251,203,178,151,93,205,188,224,30,11,184,224,54,226,127,110,151,88,155,145,221,228,46,43,231,170,219,46,154,111,18,151,185,181,204,111,63,43,87,52,43,70,162,188,46,
+58,219,27,155,106,237,121,194,227,101,60,93,221,179,78,165,30,102,164,52,229,239,144,225,158,102,191,207,170,217,93,127,172,52,167,23,67,233,118,148,216,74,28,203,179,132,18,187,141,124,185,253,120,161,137,88,109,101,132,111,12,49,209,247,104,25,157,164,136,81,205,252,235,26,55,180,245,133,166,151,10,172,167,160,248,242,35,227,136,69,139,51,116,246,97,93,165,143,219,118,50,160,162,112,214,170,109,182,241,203,212,227,175,241,63,15,134,13,249,78,70,140,208,47,202,58,154,36,21,145,201,143,46,102,50,200,203,5,150,112,232,9,187,250,145,121,15,189,104,41,9,218,153,9,25,125,109,188,246,187,142,210,192,98,190,179,25,234,247,119,254,203,222,83,155,206,219,146,201,222,112,158,77,130,134,166,237,94,165,77,48,193,30,206,170,81,203,200,224,232,44,164,180,232,182,254,180,161,43,207,50,206,62,224,192,196,186,146,101,119,36,34,34,251,12,228,179,243,87,213,220,102,51,161,172,213,144,243,197,214,222,58,89,103,132,68,181,0,108,229,14,10,125,233,179,52,
+12,204,232,28,99,188,122,205,111,253,211,102,41,233,115,13,2,144,26,19,162,156,35,169,222,20,174,18,115,217,90,27,168,35,143,51,29,19,128,44,50,31,102,19,31,227,28,141,20,177,85,150,194,125,178,210,164,155,46,242,99,156,76,95,172,217,42,199,153,95,218,242,218,241,225,46,74,206,237,153,185,58,234,64,170,119,9,215,190,237,74,160,237,21,115,209,49,127,213,49,93,103,86,218,154,153,15,9,71,215,113,225,104,1,210,86,89,50,103,240,151,13,111,229,50,159,184,115,79,161,181,125,125,136,96,138,230,50,213,197,208,117,2,242,251,233,25,185,189,221,18,235,245,29,56,51,212,134,250,218,176,20,84,5,179,228,49,105,79,150,9,65,164,22,128,165,113,56,136,117,149,122,126,70,100,236,192,119,204,50,240,106,236,0,34,177,116,159,123,212,87,155,4,34,243,173,214,228,173,55,225,3,26,173,31,222,233,233,157,126,176,71,236,116,200,65,159,160,55,12,199,84,144,222,48,160,154,167,69,177,246,4,75,134,229,149,82,139,164,187,100,80,32,186,120,213,
+206,222,188,81,57,18,230,3,36,11,155,178,201,119,192,232,21,39,246,7,137,92,214,156,119,136,141,29,104,194,4,26,100,227,134,139,73,104,97,197,163,62,221,76,49,159,205,73,110,123,189,233,76,209,112,157,196,73,95,13,117,226,4,98,101,8,10,139,111,221,65,74,255,28,236,14,63,223,204,93,121,57,157,198,43,8,3,148,197,43,30,201,121,254,184,63,183,110,103,103,153,206,244,49,182,184,157,221,76,183,93,213,76,21,90,69,12,174,66,116,65,164,166,222,41,81,215,27,59,178,197,162,183,154,48,30,178,103,53,0,34,38,235,117,28,153,225,166,153,230,34,159,219,90,103,54,104,164,197,16,106,208,55,134,96,124,142,216,124,64,243,4,245,66,31,58,131,62,244,214,224,154,201,144,16,158,199,176,84,132,152,227,101,157,186,82,182,77,204,58,85,17,52,226,152,196,209,245,175,71,87,152,235,72,189,87,210,183,192,130,181,174,40,78,12,235,203,132,94,87,101,198,170,204,8,81,214,119,133,229,203,141,101,41,6,146,231,149,215,13,101,149,27,184,227,155,
+129,152,0,149,163,47,225,45,33,232,101,80,233,124,190,119,202,203,188,1,21,238,109,158,103,85,84,170,94,101,159,110,228,187,10,52,11,88,24,167,140,192,201,55,160,85,80,227,233,116,37,248,66,42,219,100,72,36,42,182,248,78,53,56,128,149,230,179,236,114,63,174,21,235,218,202,109,253,50,241,37,249,53,101,248,82,173,96,98,225,103,196,203,229,230,214,148,95,235,171,198,231,145,198,18,105,136,76,105,154,11,152,174,200,104,104,2,151,212,179,114,179,182,235,117,54,111,10,237,175,189,97,75,249,22,234,77,26,187,231,153,34,221,238,153,103,248,5,159,226,141,70,192,74,255,168,55,18,72,195,18,89,230,72,12,38,160,81,74,208,135,206,172,60,164,25,135,131,60,32,206,97,17,229,52,79,228,70,37,120,150,68,150,145,64,194,199,39,207,28,129,89,36,125,70,22,86,0,23,121,208,64,32,162,105,19,26,182,221,66,55,47,193,120,19,134,52,89,115,126,222,84,174,205,184,129,138,104,221,141,178,197,50,85,111,159,126,23,243,1,165,17,69,199,71,83,
+133,19,191,27,89,195,43,85,77,51,141,155,149,224,165,82,9,86,242,26,162,146,89,50,53,31,73,218,137,25,108,241,186,115,142,136,88,243,132,254,38,13,233,187,44,133,90,225,248,44,36,84,197,148,0,129,124,119,182,215,68,129,38,225,102,242,202,220,79,13,211,170,123,17,246,76,234,3,29,165,79,46,162,8,148,254,211,137,88,62,233,112,9,194,82,135,133,246,65,203,12,174,204,20,234,130,226,144,27,133,31,141,196,205,19,237,77,225,107,141,156,50,60,28,135,98,16,37,75,184,13,62,58,68,170,53,124,163,171,219,67,69,20,85,198,136,29,200,88,98,18,134,136,62,235,47,183,203,141,45,139,76,218,98,8,173,146,230,44,142,120,166,232,233,121,170,4,121,152,114,91,236,69,216,255,244,210,81,109,29,46,136,128,233,176,224,6,98,103,104,206,9,206,157,161,145,7,237,114,226,230,153,169,15,67,125,11,119,20,223,146,115,211,106,93,166,14,177,82,74,32,47,73,163,122,47,114,73,1,89,102,64,101,73,22,90,143,112,199,33,214,205,50,198,201,234,
+212,167,98,132,41,68,169,168,87,34,137,237,164,120,253,176,1,157,56,132,192,158,104,160,214,224,148,107,205,148,3,202,46,237,122,48,66,247,66,31,184,3,29,173,79,54,22,8,180,110,5,64,247,226,249,232,145,102,250,220,243,13,229,132,233,145,228,233,68,109,88,93,52,1,251,35,245,251,115,116,145,199,85,73,89,168,248,185,228,37,242,236,89,0,194,234,61,80,25,138,52,204,35,44,245,72,79,170,236,30,221,188,238,151,107,26,176,140,87,43,24,226,58,209,172,135,92,229,134,23,204,176,152,66,8,184,132,114,107,240,2,178,136,235,106,72,15,187,97,48,122,19,15,108,167,204,133,193,190,146,105,33,163,79,110,189,107,76,110,192,109,115,31,26,229,41,87,76,228,204,2,121,44,92,18,56,24,166,87,186,164,139,204,100,15,102,248,216,43,32,68,16,82,89,33,3,1,176,197,251,227,195,244,75,0,21,91,160,26,140,141,221,113,14,38,104,93,110,66,87,145,197,16,45,123,61,67,237,168,235,132,218,245,89,220,3,8,94,11,208,21,43,208,127,255,72,
+130,120,76,65,222,197,17,155,140,90,114,68,183,166,194,118,250,90,216,95,230,22,131,8,184,142,235,4,18,86,6,206,28,180,114,229,185,121,230,42,140,229,85,129,19,124,71,210,245,199,116,147,168,110,44,230,247,54,173,184,200,77,115,226,146,89,108,23,194,228,72,219,132,238,197,234,37,35,95,131,77,0,13,175,28,80,13,20,71,247,80,4,40,234,179,210,235,62,170,189,228,95,171,156,33,11,194,96,4,160,71,34,97,204,25,188,0,44,139,195,78,249,18,235,166,166,238,137,6,37,44,125,202,161,16,95,153,186,208,18,14,147,30,16,133,84,225,48,187,76,122,118,58,229,20,97,163,16,89,13,23,158,198,212,8,74,147,229,82,218,36,13,180,168,156,103,226,105,64,183,166,105,64,125,162,112,225,0,99,247,72,65,28,107,142,27,246,94,172,144,61,120,190,236,99,108,78,125,189,148,224,236,166,146,25,59,164,116,99,163,192,248,118,186,92,161,129,187,198,195,138,138,88,151,107,154,188,161,94,132,37,106,71,70,152,127,116,91,138,141,128,138,214,235,210,46,
+127,184,30,108,31,71,146,132,173,139,31,165,180,169,48,87,56,197,232,62,116,175,250,188,22,242,54,242,139,123,72,30,74,64,214,150,194,185,180,35,36,9,171,53,200,40,153,100,182,2,27,66,255,7,120,37,14,134,172,16,235,78,177,86,138,78,74,177,169,89,43,230,10,9,53,185,83,230,57,158,180,70,4,197,134,193,175,161,162,36,224,61,142,30,118,92,77,147,216,242,226,154,238,162,102,102,72,151,130,117,114,230,90,216,71,151,56,23,90,234,72,0,66,57,4,14,214,38,71,96,197,37,67,60,254,241,115,20,11,167,58,162,142,214,209,228,211,111,239,213,46,61,54,144,97,245,192,97,50,92,204,154,68,114,23,39,45,236,164,156,1,72,102,146,113,6,224,224,6,146,41,255,124,218,171,238,109,248,82,83,45,227,231,252,146,6,33,182,97,62,109,107,117,50,212,100,202,3,37,0,214,36,54,144,19,33,125,154,186,51,87,161,97,97,89,226,149,81,7,227,55,126,204,107,196,137,161,122,60,224,228,206,71,19,7,33,184,28,54,170,4,96,237,235,34,131,
+239,234,71,169,82,140,230,123,39,134,162,84,223,102,147,19,42,84,157,143,174,19,136,144,132,139,93,137,193,47,116,18,128,26,37,135,216,246,81,247,70,39,80,87,3,176,142,47,143,1,225,94,136,144,246,56,8,227,106,52,60,117,201,159,147,30,139,219,111,106,8,98,190,185,40,7,113,215,3,234,65,201,28,139,56,153,157,52,29,126,43,133,156,29,25,110,254,214,138,181,14,2,28,198,208,114,29,78,214,79,204,89,96,180,231,225,22,161,81,246,170,220,231,90,232,81,37,23,141,21,124,224,98,148,134,241,10,222,241,154,76,10,119,90,149,242,241,65,216,135,165,45,224,38,31,89,179,231,65,15,239,73,96,7,125,120,57,192,23,187,152,170,91,235,202,122,1,87,36,242,84,190,1,98,29,21,103,98,141,38,250,40,113,252,117,224,60,136,234,160,184,16,103,202,40,217,204,168,158,64,205,241,72,213,176,160,180,244,106,43,172,185,159,135,42,8,42,56,68,150,239,58,101,176,42,223,53,149,225,251,250,85,221,96,162,232,201,85,254,73,150,18,67,150,9,94,
+99,49,74,145,194,26,109,225,80,44,218,118,217,68,37,49,71,212,140,22,128,20,188,8,193,210,91,114,55,193,215,145,63,129,194,86,43,224,240,146,128,186,106,143,161,1,161,166,89,216,237,158,54,243,114,224,89,168,60,130,191,7,76,13,42,248,153,104,21,155,130,51,240,126,105,153,217,200,94,39,126,124,44,60,144,227,80,122,94,115,112,18,100,48,96,1,212,94,135,31,4,80,209,235,105,153,231,105,179,80,109,142,166,67,36,233,20,109,19,254,190,22,206,164,222,59,170,11,230,50,62,201,109,188,57,21,230,11,178,88,247,195,67,240,214,110,47,165,208,197,206,246,147,135,28,240,31,90,133,94,87,248,98,220,67,231,203,136,114,207,115,234,29,108,115,187,207,53,19,184,230,219,144,71,112,247,241,5,108,5,56,20,53,118,86,89,25,238,82,20,222,72,193,152,142,31,234,9,106,8,168,151,214,12,218,24,30,229,139,39,101,228,64,32,215,84,161,140,56,143,158,154,123,157,181,140,178,156,125,208,42,178,224,133,114,117,120,93,190,245,182,234,70,11,104,122,
+24,54,196,166,220,34,129,206,29,54,43,4,89,31,82,3,53,198,72,43,194,19,57,144,244,31,38,153,158,240,5,107,60,45,166,143,161,28,228,182,154,102,118,196,196,70,141,63,207,4,193,56,31,79,121,56,238,131,249,22,40,189,87,100,180,105,202,199,205,9,170,72,145,135,214,244,242,25,115,48,188,181,253,20,176,224,17,16,23,75,68,6,93,247,153,98,160,128,88,179,88,136,133,70,35,121,226,239,213,9,214,163,15,75,95,211,173,154,247,124,62,114,109,151,203,243,84,0,80,64,178,33,252,26,118,81,122,208,186,246,192,2,55,224,121,166,156,160,12,239,19,104,220,141,150,56,1,143,8,168,134,149,133,204,97,65,56,9,246,21,232,218,72,176,98,200,69,247,4,49,208,22,25,208,236,93,108,148,61,51,91,159,73,39,108,123,4,105,133,247,192,71,35,13,175,109,93,92,190,248,32,58,36,40,190,57,181,103,3,29,19,235,154,181,79,30,215,92,225,147,65,99,39,83,235,122,4,242,110,42,221,63,204,204,3,225,104,183,71,138,249,6,105,30,20,50,
+201,99,52,217,16,219,165,56,81,81,104,143,239,84,234,12,10,162,57,21,151,178,104,142,66,93,129,247,51,37,174,152,26,253,0,133,134,126,78,17,42,24,233,0,135,42,155,116,193,217,66,236,215,139,139,230,136,127,174,207,178,219,60,43,156,227,174,179,247,6,62,12,138,135,157,73,88,41,209,229,129,242,226,195,214,5,44,167,23,18,196,140,38,169,233,226,22,255,241,154,255,172,101,217,236,234,217,99,222,105,102,83,164,181,47,107,23,221,70,67,62,93,235,15,235,90,193,118,158,200,212,21,103,239,142,38,111,49,25,20,166,92,61,199,79,5,131,120,130,65,67,224,214,73,222,43,211,85,106,126,144,220,196,18,215,72,138,234,65,196,79,45,118,120,72,163,94,239,154,89,36,115,93,10,67,228,135,118,33,122,87,121,4,233,230,156,209,251,54,127,181,39,251,184,203,117,150,236,75,15,204,29,201,193,103,12,86,102,133,8,66,86,170,101,202,140,145,100,93,227,247,232,196,50,142,179,182,197,115,1,163,193,60,23,250,202,187,223,4,162,86,195,70,125,77,80,
+85,125,206,250,181,80,34,77,220,39,188,46,83,255,178,66,229,150,192,92,148,222,55,191,159,136,202,112,204,23,220,81,158,231,47,234,28,118,10,41,226,114,156,252,166,79,143,223,196,205,200,199,69,2,51,27,138,251,55,193,188,85,89,121,133,9,65,143,6,203,91,185,82,209,167,108,123,240,97,18,155,19,218,167,178,180,182,217,203,85,219,101,107,39,134,200,135,239,165,191,113,73,20,186,66,246,177,36,42,139,70,199,242,161,166,199,27,118,24,141,254,150,179,191,48,150,79,181,41,178,45,107,79,43,110,139,129,160,212,245,197,123,45,248,44,209,57,207,199,47,38,35,185,206,23,130,86,172,69,147,185,125,119,199,226,213,126,128,14,178,39,29,176,53,136,96,12,87,211,155,223,80,94,184,81,9,115,119,22,202,218,66,33,230,24,91,89,134,152,10,19,133,175,219,27,71,232,172,162,10,72,78,201,85,123,32,57,85,28,172,36,140,72,54,161,42,206,76,33,83,229,233,233,198,112,61,84,49,207,46,115,144,185,150,26,44,7,214,175,77,95,78,227,45,61,83,
+198,53,150,95,79,120,159,138,134,211,242,240,252,154,122,199,81,87,246,64,212,238,177,69,237,16,199,61,42,91,230,30,241,230,27,219,212,205,147,210,171,3,117,38,22,231,199,229,16,193,192,116,151,96,26,97,176,33,76,207,162,242,194,179,237,237,205,179,112,72,41,128,117,194,65,229,97,170,239,149,232,168,76,223,147,5,21,177,70,58,177,10,168,39,187,50,163,149,68,62,139,38,59,114,85,137,39,5,138,43,99,39,187,236,35,88,134,193,129,128,247,26,98,221,24,225,152,94,80,198,180,102,12,132,156,155,216,239,147,110,212,114,26,68,118,37,51,233,99,52,227,78,232,176,192,186,12,110,23,43,199,143,155,235,182,191,158,30,254,44,61,252,41,40,3,164,203,169,168,108,231,117,61,242,114,237,99,232,162,205,250,198,102,92,87,41,154,111,8,105,226,77,88,36,74,58,209,112,220,27,163,54,85,166,118,182,47,24,213,144,136,56,118,128,132,95,227,78,223,80,21,61,177,195,90,150,38,82,93,109,77,225,89,209,53,37,114,142,177,210,205,31,163,103,73,199,
+118,166,166,118,201,105,129,34,21,231,55,174,189,81,164,250,173,250,49,24,138,166,53,23,205,144,75,190,146,161,145,158,27,112,2,206,206,175,123,171,13,117,109,200,101,185,134,247,97,53,237,139,163,250,190,75,42,84,197,21,158,168,192,228,54,252,24,185,154,90,184,80,197,74,117,77,85,88,184,33,42,142,193,144,132,112,114,19,62,163,11,88,71,152,236,212,157,76,178,112,204,102,178,133,147,27,129,164,23,199,125,178,33,49,107,248,116,43,77,219,34,148,228,70,122,180,162,109,172,46,230,148,157,235,137,72,147,141,24,108,177,249,163,24,181,239,153,235,87,59,233,187,242,167,191,218,137,162,195,178,15,148,218,230,165,212,243,94,5,125,57,94,83,98,83,234,4,212,175,219,86,207,178,131,172,183,77,49,20,152,236,10,171,48,12,107,155,102,172,248,209,60,120,105,113,227,44,152,237,48,139,33,116,104,135,252,232,36,242,147,16,77,97,79,234,124,50,61,101,128,65,60,98,104,128,200,191,77,184,112,91,65,255,66,13,239,238,161,166,194,228,183,2,211,10,99,
+213,157,158,200,43,155,207,241,90,108,142,213,68,29,93,186,42,159,1,147,168,119,51,22,231,119,120,199,47,3,215,149,181,58,145,117,54,23,72,61,17,245,106,238,76,191,230,141,209,223,215,251,53,101,91,124,104,246,121,217,61,188,153,139,106,199,111,229,153,180,203,163,211,180,135,52,76,199,168,13,60,128,204,116,81,37,188,18,38,197,208,115,136,249,24,209,105,202,98,186,147,29,107,70,49,232,107,213,56,64,193,114,65,159,155,166,44,120,186,99,245,102,130,32,78,110,248,152,95,84,176,1,177,59,227,21,17,39,71,101,201,46,84,55,202,41,90,15,189,144,61,96,18,169,165,61,225,74,150,135,94,65,121,213,33,44,199,6,251,28,54,93,94,122,114,21,136,17,66,63,226,180,182,62,134,202,246,217,55,172,125,66,229,146,214,224,1,121,141,92,165,9,233,113,17,111,248,176,178,188,41,245,140,245,130,25,68,8,30,199,53,29,33,34,51,212,118,70,189,77,150,145,144,210,8,60,19,151,6,106,63,6,136,247,128,12,210,11,22,241,202,178,27,44,140,168,
+59,40,104,110,235,120,2,79,107,188,170,53,189,49,62,82,109,88,18,144,234,228,225,144,120,68,66,142,240,73,84,146,43,77,150,116,81,233,11,69,28,115,112,139,158,47,255,66,215,204,52,206,232,26,253,21,223,43,0,169,21,3,255,173,255,137,177,153,246,136,177,26,110,40,68,145,230,229,182,38,170,170,55,159,49,75,81,141,131,162,100,53,67,107,139,8,74,139,216,16,50,210,187,85,98,68,5,149,35,133,74,210,58,161,47,29,254,252,120,252,242,90,112,100,62,250,174,145,148,244,68,95,184,183,8,49,240,94,185,203,197,67,144,21,100,59,47,86,86,159,59,172,26,228,149,153,82,167,137,82,63,183,241,246,54,236,250,140,10,134,144,228,201,18,87,216,207,29,65,186,178,25,123,6,101,21,6,6,212,170,185,201,9,241,214,42,32,105,181,39,7,226,98,31,127,73,25,50,159,117,103,30,242,105,169,156,166,201,29,245,172,188,153,95,64,144,82,177,140,225,179,50,214,25,105,35,69,41,78,74,211,242,176,239,10,90,154,247,94,20,191,191,73,253,135,34,
+165,37,75,120,35,90,92,10,26,45,168,33,224,244,103,71,253,2,239,221,147,45,162,172,96,131,208,3,181,23,61,243,243,157,64,235,105,220,190,168,120,0,11,77,78,43,6,131,193,127,203,62,195,124,28,46,197,25,34,157,151,217,89,84,103,36,164,231,129,143,50,214,87,141,136,111,136,73,33,130,100,236,103,219,177,250,8,223,19,231,75,180,45,156,51,55,185,15,49,157,25,111,244,86,161,185,212,2,190,148,138,163,225,184,74,234,42,235,209,143,146,79,94,143,63,190,49,171,91,193,44,50,164,225,102,146,122,111,228,185,16,34,82,72,72,156,139,242,138,237,185,125,105,245,0,110,39,70,111,64,95,160,92,181,105,230,20,52,53,237,212,180,165,167,168,11,99,143,225,218,237,204,129,210,120,127,15,71,145,109,194,26,116,200,56,222,10,32,142,100,15,104,122,109,204,88,118,6,210,149,177,87,11,98,113,156,223,91,52,182,188,165,160,228,163,6,74,52,115,125,150,211,97,158,16,52,242,28,213,112,96,186,33,86,96,70,229,135,91,83,146,77,218,98,45,226,
+68,102,51,132,219,105,217,156,40,114,242,14,177,52,129,50,26,0,123,10,25,181,23,238,95,36,5,20,105,20,140,120,123,210,207,119,235,87,199,165,200,242,111,162,208,103,86,206,149,230,135,87,25,23,202,26,197,243,219,222,130,24,105,215,3,49,152,22,225,25,84,232,212,38,35,204,156,87,128,73,119,238,145,100,10,197,230,166,161,107,178,3,170,215,64,89,43,154,180,142,127,110,249,217,176,1,139,15,126,112,135,231,37,141,37,27,38,165,61,180,100,212,72,146,9,17,126,44,247,241,233,163,247,36,227,84,183,42,21,0,35,175,27,152,11,131,87,146,55,239,173,205,199,160,8,37,34,155,192,119,47,46,1,62,166,177,134,23,75,39,161,17,139,94,54,129,13,231,153,145,73,123,6,240,214,1,78,97,57,209,129,135,242,184,201,196,77,25,195,249,132,115,178,47,169,170,91,34,94,41,14,144,233,187,31,229,102,23,115,25,200,30,17,223,52,180,106,160,42,251,13,42,180,9,135,161,80,0,151,217,28,98,136,172,235,249,67,44,118,121,81,242,197,104,69,138,
+233,121,128,102,120,165,17,198,204,2,70,8,86,18,112,98,80,174,217,155,36,171,70,109,1,228,250,161,102,54,81,240,102,141,210,235,187,157,131,130,210,188,73,164,175,171,147,166,238,217,202,96,88,128,240,221,8,193,196,152,45,79,187,176,16,235,223,172,143,101,39,143,15,74,14,14,14,235,59,121,24,135,247,159,212,167,242,78,198,239,87,29,143,92,186,147,245,178,90,60,250,245,229,131,40,16,142,105,88,12,79,234,151,141,162,25,0,127,149,9,250,32,249,231,140,73,35,45,231,92,28,161,46,232,255,20,65,50,219,240,167,0,193,41,125,122,93,116,213,160,101,5,218,195,137,192,209,3,254,132,174,181,77,234,62,161,249,48,5,18,211,28,94,112,214,121,107,36,123,222,3,216,39,154,32,66,33,217,48,234,63,224,72,20,147,195,7,45,6,79,188,29,98,30,2,52,37,204,120,177,139,158,4,28,171,144,78,87,240,149,223,85,150,87,220,199,135,224,109,252,58,146,190,241,100,82,96,212,155,105,241,240,4,146,117,224,131,61,17,73,139,84,145,42,147,104,
+57,64,14,30,159,161,186,72,202,119,105,202,183,149,114,226,156,215,15,88,141,222,223,22,150,53,118,91,212,102,164,184,97,42,127,213,47,182,134,156,93,140,96,217,12,189,74,148,189,140,154,171,115,173,51,177,80,147,240,38,115,163,70,253,140,182,160,221,30,79,48,136,221,88,53,88,250,244,37,32,220,119,68,187,190,104,151,115,247,217,119,15,77,78,254,18,214,177,176,180,255,246,198,27,135,205,82,144,64,10,79,101,176,43,209,219,34,76,204,81,221,177,200,10,155,34,86,104,199,48,12,142,149,115,158,248,240,240,99,90,78,82,102,197,41,171,57,52,198,43,172,122,215,24,207,80,34,226,195,118,101,243,129,201,178,142,103,228,251,149,102,40,112,3,251,209,130,249,65,155,136,104,101,225,147,200,29,100,133,54,115,99,182,226,120,222,64,214,158,149,135,131,233,7,206,90,91,251,204,13,85,63,235,187,250,2,101,80,182,32,9,5,9,106,98,232,72,85,190,86,72,225,18,217,159,175,248,19,151,75,194,135,104,173,112,79,225,132,79,220,59,124,34,182,8,170,
+140,81,4,102,209,81,3,3,76,65,77,88,78,147,158,212,89,137,217,236,67,192,8,28,129,49,148,137,58,223,22,43,112,142,69,113,70,56,4,168,26,198,219,19,100,241,46,34,109,252,116,1,240,77,210,48,94,35,245,178,79,38,159,127,136,103,188,66,69,171,249,201,24,181,108,159,11,187,209,99,166,211,46,111,147,133,29,243,25,188,23,39,177,213,240,102,79,180,10,206,248,162,5,0,94,3,65,154,197,110,32,182,200,53,80,212,214,211,62,79,180,247,235,146,94,55,218,224,100,205,171,231,117,101,243,102,224,81,34,207,63,224,234,21,94,128,74,249,44,94,75,17,195,44,247,133,223,224,74,236,6,9,127,205,107,51,236,97,156,235,105,47,190,167,14,162,200,74,23,210,195,53,46,5,148,240,193,88,74,53,149,120,206,15,211,48,172,250,15,52,0,218,22,171,1,104,40,33,184,4,42,225,241,14,156,192,41,222,82,240,22,9,171,2,7,229,212,56,169,215,105,102,208,53,122,116,140,151,31,146,61,197,219,37,130,180,231,125,80,219,7,106,154,13,55,203,
+155,160,94,103,22,84,33,243,79,158,133,40,112,26,13,103,70,205,130,96,77,217,49,52,202,115,225,115,64,212,247,91,180,2,33,87,55,254,172,245,204,209,49,52,68,119,111,144,58,248,161,20,136,24,237,130,14,17,203,234,251,145,251,88,224,65,136,240,69,66,118,12,186,250,111,196,195,1,232,241,155,38,71,36,223,191,234,44,66,247,38,179,33,109,31,71,114,163,12,13,80,183,40,198,42,21,194,125,44,84,55,193,33,81,140,106,1,63,25,81,138,7,177,194,14,221,70,164,59,209,57,188,135,24,14,8,190,75,244,99,69,96,99,246,77,213,138,247,117,195,28,29,95,57,214,213,13,122,172,32,239,241,119,60,92,89,147,71,89,5,30,195,168,25,82,208,58,22,26,180,31,223,133,221,69,27,161,8,185,45,197,119,34,141,1,136,33,49,125,255,139,54,72,174,172,214,244,252,50,12,212,167,62,83,112,106,27,130,13,65,233,16,232,150,75,97,42,253,27,8,219,168,199,126,46,66,186,46,59,183,164,10,217,204,110,107,69,96,104,92,220,70,251,120,249,72,
+160,213,102,17,100,143,148,161,87,176,214,160,22,135,150,169,222,166,51,204,223,28,41,112,105,136,11,193,97,221,175,20,23,130,195,47,52,163,68,72,51,128,189,89,153,116,24,133,30,93,166,39,166,56,46,38,227,90,5,240,86,150,154,35,52,147,78,173,163,239,114,178,160,134,166,42,202,81,81,48,159,177,244,226,213,230,220,63,27,164,235,242,147,154,38,181,164,113,85,27,4,51,101,61,237,226,157,231,109,64,11,226,83,155,56,194,38,96,95,70,232,121,242,242,162,79,57,165,224,140,194,253,41,0,247,224,206,102,251,189,37,246,110,231,16,10,26,51,62,10,32,207,9,9,64,245,34,105,27,43,196,151,68,47,41,89,90,237,126,60,95,68,122,217,131,201,47,46,163,115,105,172,83,129,205,200,243,138,146,194,162,120,72,101,178,138,245,113,121,70,112,148,248,188,196,222,192,194,118,192,66,245,152,150,8,48,221,105,12,25,29,60,72,159,100,202,81,187,139,108,209,143,10,89,19,150,130,186,47,47,104,123,197,142,137,112,186,32,47,89,43,174,56,121,170,103,
+206,125,253,160,73,254,40,190,77,71,19,61,233,195,115,3,76,89,225,9,53,108,127,106,2,150,155,69,225,126,106,179,173,91,148,140,113,176,211,27,6,56,224,29,129,85,147,65,111,45,110,176,0,165,195,113,195,184,93,218,111,155,237,92,60,196,90,41,249,92,97,180,82,22,244,164,143,29,17,208,231,47,182,144,38,183,196,234,129,224,58,88,137,10,185,34,1,148,214,36,246,69,130,82,115,220,226,39,62,242,147,227,3,52,165,198,32,233,57,228,198,99,67,24,220,101,97,128,242,141,6,248,186,77,177,27,158,123,129,228,5,28,114,199,121,114,96,143,120,83,243,195,201,6,149,125,212,180,19,69,172,72,81,28,104,95,141,8,36,248,176,86,81,26,177,211,68,240,122,221,9,21,31,49,14,104,154,239,238,164,154,164,133,232,52,86,29,212,79,22,37,113,189,164,13,33,219,146,148,24,147,205,40,183,207,97,162,168,73,76,160,22,130,197,97,232,218,195,224,131,157,94,195,252,76,114,102,225,52,242,133,97,79,248,18,119,241,76,4,185,217,213,104,139,32,47,
+123,142,24,77,148,2,174,156,11,181,163,202,151,241,4,114,71,205,241,33,111,207,130,207,4,249,89,62,184,61,181,94,44,84,60,207,212,196,2,233,92,207,138,127,184,33,251,129,167,247,29,176,251,150,244,175,1,159,97,111,239,202,215,19,142,124,208,149,192,36,220,8,164,163,31,238,208,180,195,182,49,144,173,125,234,213,213,61,67,194,163,47,111,62,35,165,168,94,16,235,209,105,80,209,126,45,75,157,137,18,128,196,146,129,228,107,55,127,54,99,45,22,114,155,34,2,108,143,184,230,74,112,180,115,89,60,99,232,71,168,7,128,137,173,151,76,114,243,115,37,137,217,21,113,168,71,170,151,117,154,16,24,40,174,57,128,175,169,212,97,15,39,97,109,62,143,134,225,14,161,85,193,108,211,9,63,175,56,16,181,109,210,84,69,230,93,208,225,54,123,30,204,176,117,112,235,89,124,81,83,137,108,110,49,9,100,242,109,148,37,131,234,28,134,36,200,92,99,213,63,58,52,202,13,38,126,184,3,131,29,206,36,98,235,2,34,108,125,135,253,232,117,34,58,128,101,
+112,211,81,62,42,89,164,45,111,168,254,105,105,131,158,158,68,102,179,174,204,44,241,163,172,218,129,58,183,47,73,233,196,84,124,154,248,84,1,69,67,247,122,121,173,61,207,123,160,55,187,0,129,93,39,65,228,135,253,25,85,187,36,38,210,77,120,254,88,47,139,148,119,136,88,8,42,102,63,214,220,163,226,189,106,170,213,56,217,9,249,214,172,250,198,121,198,113,185,157,155,215,7,68,191,186,234,106,119,170,107,216,196,54,222,78,54,242,117,106,99,91,207,77,213,23,12,130,189,54,47,65,249,202,134,107,149,205,111,11,146,225,162,234,164,13,172,123,118,90,33,95,122,59,76,253,74,168,34,236,231,0,61,95,93,86,226,188,114,114,177,44,32,88,244,185,110,117,184,33,216,88,136,105,113,64,146,1,238,244,209,24,183,179,63,223,37,10,186,45,169,198,210,66,146,193,193,27,106,195,9,78,75,233,244,88,208,75,15,218,170,22,66,214,54,118,11,198,204,50,215,45,237,197,42,5,65,51,97,229,140,46,134,182,126,7,209,63,139,218,16,147,144,211,96,3,
+207,113,233,176,224,227,75,195,35,98,187,42,148,90,88,233,44,133,217,173,58,227,44,232,185,211,124,76,107,186,64,205,194,222,57,134,3,189,130,24,135,218,209,41,157,15,66,42,125,161,50,153,217,148,250,89,234,206,206,105,251,43,172,142,177,201,242,167,156,2,1,239,47,214,113,242,125,246,73,89,23,76,108,20,100,93,94,3,34,246,78,171,231,121,211,155,61,222,45,50,234,118,138,222,134,47,31,172,231,77,38,30,201,112,105,171,47,13,199,165,172,106,140,77,236,113,42,113,52,244,60,61,50,217,138,185,65,227,66,56,233,26,45,142,64,160,183,185,109,191,121,200,73,163,210,68,129,104,117,194,59,146,54,146,181,47,7,92,107,89,105,171,104,181,234,170,32,176,73,132,0,153,220,179,126,173,29,60,99,166,242,122,252,121,18,21,5,195,96,197,38,19,197,5,98,155,214,115,152,58,151,32,1,209,56,65,221,101,25,125,135,188,4,190,234,111,1,205,248,172,121,232,52,247,181,110,216,194,232,23,49,132,173,137,114,118,48,97,165,129,154,84,69,23,6,20,
+106,152,226,16,19,97,209,40,182,200,225,3,232,113,93,45,123,126,180,122,97,100,3,204,199,111,149,190,63,148,87,218,89,174,219,170,178,181,200,124,232,192,220,40,156,174,151,201,198,235,15,251,20,153,138,251,45,6,236,148,188,78,173,119,150,237,101,190,152,153,181,50,5,139,64,70,150,221,55,28,87,59,213,120,67,87,107,103,254,105,207,170,81,150,12,145,243,163,254,167,11,50,205,100,226,18,255,180,147,10,11,20,28,112,231,109,245,118,137,117,215,169,200,13,54,234,16,214,202,20,41,65,4,54,221,199,8,103,190,213,34,119,142,241,226,61,174,18,181,87,159,51,195,116,251,158,190,145,73,20,161,27,28,215,180,56,237,29,207,217,20,165,244,188,182,111,172,125,77,163,246,36,169,252,160,109,90,37,68,3,245,165,16,193,234,32,20,186,133,189,60,12,139,108,209,116,151,98,97,186,235,70,26,96,160,110,112,77,98,145,55,18,180,208,60,207,208,169,221,89,199,158,143,248,251,23,139,83,3,252,35,21,58,134,107,185,61,108,27,245,174,231,116,167,208,207,
+184,99,186,50,166,103,236,238,22,127,3,99,168,27,108,211,128,243,110,113,203,162,213,132,64,136,152,148,206,65,118,40,168,138,30,171,44,227,91,105,189,133,54,145,9,107,105,222,160,109,88,58,71,81,79,49,73,52,71,167,167,115,42,128,84,91,4,189,218,121,13,161,187,230,231,181,92,237,153,181,137,243,167,148,72,154,47,97,254,186,249,33,65,40,231,198,41,237,104,180,137,212,7,134,17,176,94,236,19,159,41,171,231,160,63,143,221,128,97,243,167,196,226,12,227,176,49,231,246,130,66,142,28,222,137,111,47,49,99,226,225,183,250,163,50,62,186,193,127,190,11,6,109,134,222,135,28,174,145,26,191,228,92,36,110,188,193,162,250,49,177,33,212,176,77,76,11,224,226,176,208,141,164,163,247,186,231,135,216,180,101,134,55,247,157,230,180,214,232,139,243,244,177,65,56,189,217,192,245,130,33,151,10,238,134,63,95,141,179,33,130,176,163,52,145,39,188,82,220,132,53,236,88,53,11,218,230,98,95,95,97,220,37,135,134,228,176,135,78,137,223,18,206,138,173,40,
+239,88,243,97,23,196,18,34,73,27,174,161,10,131,107,252,199,27,204,124,6,46,188,176,162,113,62,67,127,89,129,96,86,45,46,148,6,227,188,175,212,120,40,127,248,41,241,124,169,108,221,190,114,115,189,33,211,59,228,242,195,88,110,95,35,144,32,99,133,20,88,225,51,130,240,135,9,126,47,82,51,230,192,117,32,217,96,60,163,2,216,1,49,228,229,226,50,224,27,34,119,142,228,83,217,178,52,187,140,102,212,10,128,100,138,78,164,250,193,161,124,24,197,226,181,216,230,51,116,12,124,54,244,23,125,218,58,41,84,39,224,91,97,18,235,196,195,68,216,1,48,15,11,52,51,151,76,251,235,239,198,11,51,110,177,208,21,100,186,71,238,166,251,137,160,53,185,215,68,143,162,88,121,245,169,25,88,61,130,59,67,34,70,49,14,224,3,31,110,241,113,68,70,194,21,10,119,102,138,78,21,49,182,217,198,106,197,165,45,167,189,130,226,147,190,38,30,49,180,39,162,99,94,7,103,186,206,12,7,225,11,154,209,183,140,108,251,209,199,188,92,140,175,149,133,81,
+121,76,106,165,229,115,197,228,69,31,55,180,87,95,115,43,38,212,61,227,241,52,9,236,111,167,205,176,102,248,144,49,123,213,236,46,147,232,167,217,189,171,172,60,188,165,203,82,125,218,42,139,149,30,66,70,229,162,78,149,96,207,2,15,137,143,39,11,109,239,49,237,137,103,119,255,226,132,77,124,246,222,38,247,42,109,156,143,253,85,109,221,154,7,28,7,246,186,166,152,183,230,102,234,212,199,169,97,159,1,1,123,13,56,155,244,108,91,117,64,207,78,87,239,109,23,63,120,78,28,54,107,150,45,114,15,218,50,73,83,142,136,80,212,239,109,220,60,54,223,214,202,116,107,54,54,182,123,146,24,235,136,106,187,234,178,123,211,89,87,23,122,52,243,227,104,121,100,136,250,139,134,95,178,66,178,162,201,251,166,189,108,154,78,247,57,32,28,168,84,111,153,70,75,121,93,54,222,107,227,70,67,105,183,6,172,139,22,157,143,190,87,247,119,158,131,61,14,98,142,247,243,154,16,56,96,60,43,255,25,98,233,212,48,19,172,122,158,232,111,87,247,39,104,22,91,
+210,127,235,230,252,223,115,44,32,192,152,86,94,54,149,44,202,164,90,188,163,118,110,35,48,196,105,62,127,2,159,192,110,232,226,93,224,132,186,163,156,15,112,187,5,248,255,122,123,19,231,196,179,252,78,240,95,209,84,196,76,100,245,100,229,180,187,221,19,27,110,175,55,108,111,143,167,119,199,246,132,221,19,142,216,142,138,72,85,165,178,74,237,204,84,58,149,213,221,53,49,179,33,132,16,183,16,66,2,113,11,16,32,110,113,223,72,28,226,144,4,58,64,2,129,0,33,46,33,196,41,110,4,218,31,160,43,175,114,219,27,187,21,81,197,239,120,239,251,190,239,251,190,239,123,189,95,233,131,224,129,182,225,211,226,6,99,22,150,201,69,234,235,135,145,200,4,88,101,151,24,87,252,153,13,150,120,11,189,188,71,238,182,36,73,111,27,119,225,181,132,248,233,25,195,92,18,151,46,187,156,248,72,36,187,118,152,162,30,153,188,93,185,64,185,99,74,135,104,9,30,202,233,129,167,216,233,189,189,112,119,214,77,213,80,231,244,112,184,16,175,192,212,225,36,58,
+68,153,205,179,206,115,76,110,156,36,82,74,221,59,76,146,67,28,223,180,179,160,229,93,196,169,202,181,195,193,56,196,105,92,70,210,46,234,177,90,135,219,169,13,19,151,121,185,169,77,242,73,62,204,75,179,133,90,227,202,250,212,197,74,157,181,121,93,205,149,220,24,70,194,44,161,37,87,248,91,116,209,133,184,157,180,202,187,141,235,61,127,151,48,135,236,102,187,123,106,255,181,226,170,142,198,224,11,173,179,54,135,60,47,108,248,93,24,151,250,234,194,71,77,97,85,215,151,20,71,44,185,78,199,180,50,155,106,58,193,190,17,63,153,96,207,78,168,85,21,8,102,98,53,21,109,158,48,84,72,58,178,6,10,109,72,18,120,99,178,37,89,77,31,53,38,23,175,249,32,103,180,219,214,200,214,67,110,159,7,8,144,215,29,123,242,170,216,207,95,158,89,169,122,9,219,96,29,55,114,144,220,212,237,105,215,241,198,10,227,26,150,98,76,166,166,93,156,152,80,219,244,201,131,172,253,99,135,40,72,152,72,238,25,200,251,224,21,130,209,160,81,37,216,245,9,
+135,38,229,167,139,155,201,85,214,108,149,124,140,215,87,15,208,202,203,204,214,181,110,18,28,13,95,158,37,68,123,200,107,210,134,15,138,227,23,162,157,203,115,124,222,120,29,57,173,182,9,103,6,255,177,76,172,62,203,193,165,238,120,211,189,211,221,84,99,18,230,48,124,131,198,221,199,53,21,60,245,241,36,77,89,130,31,205,64,42,19,199,146,108,62,3,82,10,22,93,145,5,19,205,189,211,112,77,192,211,53,222,226,38,122,246,96,127,197,71,199,37,163,230,34,176,194,225,188,151,112,64,231,46,24,136,19,14,252,124,17,138,98,82,14,151,104,8,193,17,142,4,91,47,122,193,51,214,165,147,114,67,17,12,40,16,123,237,99,215,10,148,91,222,11,34,2,145,244,254,149,210,116,36,53,6,25,87,130,232,137,17,67,114,206,199,54,101,101,91,87,176,70,76,149,211,114,94,146,206,99,69,51,66,156,158,15,226,180,188,204,77,26,179,206,156,40,78,196,181,124,238,222,250,20,200,155,71,212,153,182,9,209,46,164,185,185,182,97,179,187,89,155,231,71,177,
+120,99,139,104,231,103,43,19,84,31,219,22,36,241,10,71,157,125,66,153,188,25,47,158,175,30,139,140,212,43,73,113,27,112,3,43,205,174,67,126,177,19,186,2,175,53,167,231,46,114,101,243,198,165,76,159,234,206,137,44,109,180,206,234,42,77,99,182,66,28,42,150,73,226,137,14,152,208,130,25,127,77,74,205,151,131,14,218,158,15,171,202,130,231,233,83,148,206,161,64,173,42,192,183,79,171,81,181,163,91,177,37,146,74,125,44,237,135,208,154,37,112,209,69,135,92,119,179,184,98,137,108,78,56,10,252,9,44,77,99,119,117,166,252,112,129,56,153,215,67,162,215,209,186,108,106,74,59,181,16,90,168,91,84,52,72,77,177,54,193,179,92,107,245,22,99,67,149,65,27,16,75,155,1,123,215,32,51,29,105,107,39,107,77,169,21,106,223,115,9,15,99,11,107,157,204,132,208,188,236,129,156,80,56,126,222,181,202,219,169,169,242,66,111,171,29,197,101,175,77,184,107,7,178,116,221,156,22,215,212,233,211,235,46,141,223,130,58,88,215,1,26,185,227,182,98,
+253,52,21,108,77,163,171,28,239,108,76,238,92,237,6,46,149,208,235,26,50,120,24,89,0,35,214,212,210,150,132,206,55,205,251,137,118,206,12,43,172,148,46,120,209,58,122,90,224,237,38,46,138,140,0,60,86,179,214,87,200,152,8,124,159,135,85,24,4,11,145,64,244,48,217,37,171,19,138,144,87,127,221,37,30,23,29,182,236,181,196,118,221,221,10,92,163,12,132,78,86,183,68,161,183,189,184,189,168,17,159,239,84,99,197,173,250,116,136,182,38,104,92,134,108,215,80,9,56,111,80,100,36,36,201,132,131,111,88,90,155,168,103,173,56,195,4,141,178,189,125,206,35,54,178,214,36,78,202,179,76,48,235,231,123,7,218,85,26,173,86,241,4,107,43,80,36,5,226,86,134,217,2,11,175,100,143,118,96,235,134,20,223,207,141,116,66,215,167,74,66,252,186,221,164,6,162,180,153,110,55,199,74,248,49,142,136,110,77,126,181,213,182,236,136,80,54,99,157,43,11,27,74,51,214,230,94,1,137,185,82,65,117,89,89,78,25,189,58,104,72,32,243,43,6,196,
+73,222,104,110,195,10,217,4,187,141,35,119,103,243,87,233,157,245,154,68,175,219,201,52,147,49,167,36,83,64,26,213,252,70,197,159,51,59,10,120,122,243,218,116,85,172,46,173,237,214,25,184,67,97,186,160,175,33,76,237,114,184,190,115,97,52,20,252,186,133,146,240,10,188,44,212,173,71,231,209,141,204,156,4,161,185,62,80,81,100,69,219,105,161,24,40,71,228,234,149,163,85,111,195,28,19,150,142,48,4,156,164,131,64,97,66,101,203,82,162,237,184,6,244,101,66,84,89,143,212,55,59,251,70,127,209,85,143,192,37,58,138,100,86,167,157,136,236,94,122,109,153,61,174,216,71,155,33,240,89,245,221,128,181,153,95,136,185,178,203,116,90,4,116,85,50,48,170,234,44,152,120,72,196,117,117,121,113,75,175,76,186,78,192,56,245,20,61,196,88,235,86,114,203,185,112,116,222,121,24,229,28,95,106,13,212,115,89,184,238,217,107,240,36,220,249,237,66,19,131,32,25,147,145,182,5,42,110,224,146,222,169,106,133,158,74,208,185,7,219,75,181,53,60,133,148,
+204,54,14,124,112,137,118,177,158,220,94,46,84,48,59,54,243,177,14,116,108,106,57,19,133,141,246,22,237,132,67,77,42,194,85,116,38,9,89,219,231,35,33,7,81,11,38,223,194,119,219,233,157,141,98,151,160,49,72,22,29,147,19,40,93,5,83,156,21,55,153,254,105,163,115,169,161,43,236,107,227,226,85,76,188,56,211,229,57,175,154,40,9,106,197,137,0,197,226,107,19,72,112,210,212,44,134,28,235,66,114,190,155,49,237,74,242,180,70,109,14,107,72,147,205,68,122,100,57,90,173,54,29,7,144,211,29,137,189,144,53,4,138,225,35,156,129,113,62,49,157,198,79,16,186,26,176,39,4,102,51,56,100,186,70,188,55,121,160,42,159,204,95,101,228,27,75,202,147,16,246,240,122,97,58,65,42,30,151,81,141,69,28,148,187,92,52,93,205,132,19,132,186,45,218,156,90,69,224,17,146,181,197,86,183,20,73,38,78,143,80,122,78,58,6,149,96,74,225,186,235,172,10,97,28,30,164,33,135,84,73,120,187,3,170,225,144,168,168,207,232,141,133,205,103,166,
+245,29,15,234,100,181,181,115,222,232,44,69,192,42,82,204,193,21,207,242,84,236,140,64,145,140,200,202,203,188,34,78,11,216,37,37,136,125,20,193,172,29,30,165,113,228,109,80,44,41,81,119,187,2,235,181,82,6,45,11,218,44,201,218,108,168,115,64,90,157,133,173,117,86,207,131,103,104,161,182,178,92,46,64,98,250,29,25,176,250,14,83,150,210,190,168,93,162,252,20,49,184,24,89,202,228,103,231,189,17,228,106,178,50,25,81,94,50,54,40,69,177,182,186,30,146,133,203,137,70,154,201,173,75,34,106,96,189,65,121,35,123,167,64,166,163,248,87,137,134,118,109,115,65,71,95,96,234,230,232,110,131,111,49,203,169,99,229,19,206,171,140,90,111,38,169,174,144,122,80,228,2,80,124,139,36,82,147,243,116,121,136,174,20,146,72,143,43,93,36,51,42,216,153,17,182,206,139,105,143,228,116,77,231,53,28,93,33,17,5,247,158,251,212,205,100,94,177,89,69,97,55,201,178,32,243,124,165,161,116,112,24,163,78,110,9,82,75,145,253,245,116,211,102,242,206,
+166,231,224,211,146,179,179,52,66,182,52,59,119,24,17,74,194,88,113,171,230,136,17,242,51,212,235,114,117,57,119,185,86,71,8,219,230,10,207,149,89,176,94,84,143,246,244,73,15,42,82,154,46,89,57,18,146,88,147,156,36,216,167,80,49,153,100,209,190,142,40,100,152,251,57,115,24,218,105,77,228,36,145,110,244,234,106,109,61,183,95,36,152,52,10,190,1,177,130,162,77,50,155,167,222,206,156,131,187,140,50,112,76,48,88,35,228,193,209,194,58,85,195,135,177,236,196,187,203,66,98,55,175,146,59,229,106,7,205,196,200,182,124,245,120,86,178,136,159,55,93,110,197,66,59,198,141,66,131,146,9,109,201,22,34,122,25,98,153,191,32,60,158,53,172,35,103,142,168,24,246,166,215,114,84,169,241,133,193,204,34,105,150,45,233,78,21,205,248,115,227,53,13,150,10,67,107,75,252,203,61,100,10,222,192,164,22,14,154,96,112,85,65,143,64,97,26,242,134,137,31,185,100,7,192,124,80,76,10,117,75,195,141,250,86,35,236,142,113,47,252,54,154,206,212,178,
+121,15,164,14,9,114,237,42,130,222,93,83,43,101,53,107,220,107,81,119,240,107,27,181,68,92,77,216,41,118,38,39,34,217,248,166,43,189,97,75,44,241,32,158,5,40,103,230,204,123,1,34,196,247,9,92,190,225,28,134,134,93,172,24,151,214,13,139,54,209,234,138,207,81,214,158,215,117,220,121,55,137,30,198,192,2,244,171,22,113,27,115,218,217,74,238,59,76,132,99,61,179,129,105,32,78,130,100,75,54,182,70,8,182,195,13,233,134,128,133,57,166,117,138,107,167,129,78,26,76,4,69,80,225,51,17,29,41,174,104,136,250,148,52,54,167,216,64,20,194,16,56,104,25,213,32,96,248,134,104,246,114,161,201,69,135,217,251,18,99,125,49,4,38,230,78,68,4,99,132,178,141,146,150,104,89,191,119,174,50,109,179,85,185,123,106,7,197,26,169,242,234,133,205,235,114,86,140,165,93,233,103,86,83,218,226,122,89,80,2,9,216,74,2,164,93,208,107,52,173,171,93,91,56,13,233,94,217,207,54,240,94,176,90,140,19,47,71,41,141,29,183,119,35,70,130,
+71,14,22,139,252,107,156,213,108,224,23,109,151,49,161,129,97,40,199,160,12,195,117,164,129,63,234,194,44,12,31,148,70,207,31,159,155,186,168,58,58,152,110,231,141,235,117,199,229,134,73,47,46,133,187,22,244,53,149,0,201,175,213,38,116,57,67,69,37,167,238,209,169,240,112,101,90,160,59,85,92,180,233,27,196,181,246,254,9,127,163,147,36,100,72,215,69,147,101,185,189,83,90,138,172,174,74,200,22,193,161,245,0,68,50,104,105,228,105,67,114,59,165,17,230,164,116,156,64,174,16,149,76,242,28,94,136,110,230,212,145,224,86,61,231,85,250,59,60,79,179,153,65,251,175,181,133,18,31,184,167,51,66,250,22,170,83,150,144,14,196,186,131,171,36,239,240,76,96,138,235,46,120,25,246,62,251,176,32,222,191,142,88,89,29,115,179,100,211,215,183,245,90,76,108,225,122,211,112,158,179,53,39,107,50,20,18,42,218,220,244,100,167,247,183,13,162,115,97,91,44,73,166,72,59,199,39,120,106,82,168,215,18,41,154,102,46,146,86,77,17,76,164,24,146,189,
+182,57,161,226,94,43,174,119,147,199,122,116,253,32,115,170,188,182,237,197,202,149,92,83,230,51,42,125,221,227,211,246,249,121,236,124,115,107,109,250,72,76,72,201,166,49,139,77,139,176,34,4,215,5,16,248,193,17,56,14,37,65,107,124,16,57,27,71,108,106,124,133,3,180,170,156,119,157,231,55,87,36,234,243,53,60,55,148,129,18,237,2,24,114,211,149,59,195,71,153,161,14,242,172,224,221,23,107,4,27,155,103,108,154,49,184,107,18,64,202,7,103,86,1,144,66,73,10,84,234,177,184,179,205,57,177,138,175,22,185,142,136,101,133,160,89,191,58,164,56,209,62,91,56,67,158,177,229,64,234,232,36,119,225,120,103,251,248,188,178,43,201,76,108,91,203,172,200,169,183,177,101,73,34,19,86,123,216,236,106,242,174,121,24,74,216,231,231,209,51,120,183,74,222,78,106,89,136,214,190,80,140,167,120,202,162,246,76,149,158,186,204,236,8,99,233,67,93,154,114,6,205,145,152,244,180,66,189,75,66,158,145,148,105,67,105,178,190,138,43,112,27,105,165,219,31,
+239,92,192,35,59,10,59,207,112,162,105,228,55,106,240,72,243,76,30,63,216,23,58,107,21,91,202,103,229,148,186,41,109,115,234,218,80,88,187,150,116,218,221,181,99,125,221,42,149,86,48,8,8,166,172,173,171,229,196,186,156,87,247,70,225,245,57,105,125,14,187,214,145,238,118,87,12,146,32,51,143,188,108,91,46,216,145,37,163,159,227,96,195,174,142,45,14,91,99,123,21,54,15,137,98,235,243,83,77,63,136,204,43,90,35,77,15,49,221,186,164,152,88,142,106,74,147,23,98,252,196,100,80,126,156,197,78,103,93,151,135,138,2,205,83,178,207,47,237,192,233,193,229,192,252,60,105,46,176,31,182,136,225,80,129,227,148,129,104,52,234,23,155,154,184,209,167,234,172,251,84,166,131,195,0,33,129,174,77,19,141,50,165,120,18,27,103,170,56,75,113,225,164,47,209,217,240,132,228,137,99,72,94,177,62,195,77,31,153,13,250,217,184,178,93,22,178,28,149,68,232,72,44,12,97,99,161,150,76,104,116,7,247,41,135,236,13,226,62,133,177,1,206,206,89,46,
+247,207,182,145,176,42,156,167,18,251,187,2,131,25,17,40,57,14,67,42,183,91,234,182,181,163,72,71,221,97,105,91,88,230,78,44,19,93,153,72,8,228,109,246,249,113,121,217,14,57,65,206,148,44,69,44,114,94,27,197,238,85,231,3,126,16,209,21,144,91,155,118,98,188,213,184,220,142,206,228,221,251,202,240,17,71,110,85,164,67,139,135,10,239,92,74,136,231,29,82,78,209,60,15,142,158,168,184,76,90,144,167,1,105,105,2,100,2,139,31,47,39,133,26,46,31,31,92,232,248,138,226,213,144,135,194,40,44,231,200,181,78,165,213,73,148,51,22,85,80,181,80,119,229,174,34,240,176,96,63,14,99,106,197,39,113,131,174,105,7,133,86,156,45,164,4,165,94,215,32,183,207,168,52,154,199,11,214,182,182,151,28,245,244,138,3,207,58,119,237,135,137,58,86,202,170,102,103,218,36,149,153,61,33,137,123,164,246,149,101,100,67,9,23,243,68,102,181,13,162,131,248,145,194,25,215,130,180,185,51,83,97,92,210,212,241,8,123,67,117,221,77,33,114,65,84,
+192,94,131,90,219,30,75,217,116,50,31,2,77,147,210,112,233,12,57,110,198,50,145,11,196,147,172,74,176,75,155,204,109,122,39,88,205,243,21,135,246,178,227,91,159,185,216,154,51,90,142,100,122,107,45,181,98,172,41,14,72,156,11,94,122,19,207,20,241,130,243,187,9,148,203,78,56,81,158,195,85,60,143,210,214,100,233,52,187,56,156,224,20,182,191,49,95,156,174,111,184,102,228,145,3,213,129,204,136,230,70,144,27,53,7,119,83,181,111,114,5,4,197,114,27,146,162,112,237,199,218,19,36,70,122,134,21,128,144,149,37,103,27,161,159,87,175,107,47,19,103,97,26,197,131,5,107,247,169,68,86,75,62,197,218,202,85,18,48,49,106,15,203,225,132,188,137,44,226,98,218,133,61,156,79,122,246,165,156,229,156,115,87,55,101,246,82,210,228,133,136,184,43,182,251,109,83,252,149,229,0,118,161,230,152,89,219,4,70,199,238,95,176,24,252,92,35,186,170,217,241,136,67,178,184,193,232,193,98,227,66,147,253,100,67,65,226,237,239,98,203,4,138,179,0,170,
+36,224,64,46,179,232,194,90,181,167,178,85,40,38,81,50,9,49,17,178,89,47,111,248,45,164,130,19,151,227,89,164,52,230,5,207,66,90,238,184,93,251,139,75,149,9,141,218,163,118,16,237,26,91,136,30,63,7,21,20,77,27,25,100,40,139,139,249,146,157,188,73,89,69,147,11,24,91,29,234,11,157,55,233,43,249,133,134,113,222,160,247,72,227,66,229,158,125,54,174,88,221,64,46,205,31,47,131,33,251,126,221,146,161,105,161,58,28,204,203,70,113,134,190,25,163,122,132,135,244,13,10,177,42,84,131,171,92,169,39,162,56,164,89,66,251,26,154,17,18,154,155,98,187,140,139,184,9,130,207,193,187,20,89,182,212,246,197,214,202,98,136,156,60,103,94,93,29,216,86,96,48,189,149,232,160,75,86,209,236,133,100,168,232,58,156,201,225,138,190,80,76,226,64,203,181,219,26,43,122,47,177,8,71,19,120,10,39,115,227,108,146,63,219,157,204,187,201,113,154,33,181,25,99,57,181,23,26,232,76,106,15,13,18,6,9,102,42,177,170,224,162,107,236,189,153,
+153,249,32,205,18,244,6,166,182,230,228,236,210,214,100,81,205,134,89,41,187,142,121,87,142,114,142,0,69,114,58,211,166,207,126,116,158,135,113,139,211,32,73,69,204,139,117,182,177,151,147,212,16,108,21,157,195,216,107,155,42,115,103,82,65,152,247,231,142,74,211,135,23,22,30,211,121,186,49,25,192,90,32,134,221,245,171,38,114,155,236,8,107,43,138,40,116,38,49,203,16,158,30,108,51,59,196,101,9,184,80,225,96,243,138,253,133,9,139,110,223,25,66,228,202,110,166,200,229,35,173,251,132,240,237,121,199,150,161,52,165,178,171,54,86,166,247,207,224,234,253,83,244,37,108,33,102,142,161,69,199,97,96,221,44,194,50,71,98,192,218,186,187,174,195,50,162,128,219,82,81,52,92,66,210,65,172,81,82,60,251,202,57,106,25,49,53,29,177,237,49,103,8,171,128,37,104,93,174,168,49,149,70,25,38,128,162,82,151,39,128,35,94,132,80,153,68,205,26,88,191,95,84,20,72,121,143,153,202,131,107,88,16,53,27,219,158,157,203,184,150,14,167,206,211,51,
+44,142,38,5,139,163,117,139,98,52,214,189,151,145,49,54,15,28,103,193,34,204,75,77,9,44,20,184,133,60,135,209,71,78,2,2,199,150,138,209,49,108,30,203,22,236,196,60,101,255,212,238,108,161,150,144,194,169,61,155,148,57,61,175,218,213,76,76,151,97,18,39,166,125,185,170,135,234,153,229,93,39,158,180,105,97,128,137,103,75,184,179,45,27,148,146,89,223,65,156,207,247,152,88,49,194,25,74,118,172,61,169,98,23,79,178,20,94,137,57,109,95,228,20,237,32,201,158,109,150,145,101,249,114,139,123,188,189,166,245,138,182,126,78,190,242,21,105,205,99,33,242,98,195,105,98,36,98,91,155,109,98,140,146,130,56,120,170,196,214,66,9,202,132,197,54,230,69,75,148,34,8,84,94,93,195,176,155,229,89,46,84,123,9,6,237,93,156,104,200,139,254,205,6,149,120,189,30,92,139,18,106,117,206,149,113,149,119,237,231,239,18,81,25,5,23,44,130,59,105,153,137,139,146,147,4,117,79,150,108,139,86,148,212,135,39,108,40,246,12,188,253,189,83,52,56,
+162,227,108,35,124,144,0,68,189,34,212,37,34,11,194,148,129,136,190,228,171,98,157,227,93,130,148,189,81,66,208,185,74,173,116,146,104,205,48,23,237,248,61,3,236,4,98,91,228,173,23,105,136,196,34,227,90,124,226,134,24,206,181,107,130,44,221,213,234,76,203,77,102,212,14,17,90,171,114,59,29,94,148,86,216,244,83,203,85,246,73,135,234,186,110,91,162,84,18,44,16,7,205,73,60,137,25,179,125,241,2,70,98,234,86,248,232,19,119,25,107,144,110,251,160,46,108,112,245,0,199,4,21,90,201,89,176,65,159,140,111,161,8,146,35,89,217,181,114,184,200,213,72,41,84,171,245,140,185,185,128,101,78,194,226,144,69,209,186,243,194,52,145,188,14,177,136,203,213,201,212,98,2,53,185,27,9,16,204,10,172,66,199,67,41,167,75,173,213,213,61,194,126,67,0,70,237,156,136,102,155,59,240,2,20,187,99,188,56,147,224,136,199,91,174,248,178,198,131,45,198,53,234,105,233,6,104,94,204,76,96,57,8,231,236,33,108,169,185,70,233,212,173,90,109,177,
+229,182,238,77,240,16,68,38,144,232,23,167,247,82,115,5,138,21,86,156,83,154,17,213,226,161,75,120,18,150,67,102,155,220,136,84,191,111,136,144,2,155,241,41,77,108,6,25,95,84,79,203,16,27,83,98,139,15,203,20,34,64,134,19,199,165,169,182,92,0,151,35,235,20,74,163,147,90,137,206,195,109,139,204,89,19,42,107,157,112,94,46,230,80,49,52,147,97,16,59,87,12,50,24,186,33,192,88,35,115,57,128,218,226,234,116,121,49,14,11,77,17,153,54,24,1,156,48,239,204,95,69,2,17,100,202,88,244,148,193,73,195,101,188,74,130,177,76,94,91,1,6,149,86,98,78,194,52,217,186,238,244,194,114,176,211,42,99,194,207,201,38,116,193,173,88,146,191,12,204,219,136,141,20,54,64,34,77,108,26,17,95,245,79,5,90,167,19,226,22,111,18,35,20,54,74,6,194,86,187,61,75,33,123,180,12,138,127,139,78,197,73,216,167,36,37,164,99,95,141,210,17,51,103,150,89,213,148,154,15,217,179,175,11,226,85,148,236,72,80,148,29,204,169,252,218,
+213,230,14,89,170,144,240,209,140,117,188,4,101,57,222,219,153,239,84,142,204,200,11,184,1,186,83,215,239,81,144,46,237,137,249,248,108,73,47,179,70,28,144,163,25,147,68,56,115,98,182,72,39,46,142,152,77,12,175,193,155,132,110,215,245,112,3,114,11,205,52,107,247,150,213,147,73,168,12,124,20,139,166,214,210,122,103,219,239,158,91,59,83,121,90,242,84,134,174,160,111,181,72,224,14,186,204,137,82,143,253,162,250,65,24,214,209,111,152,168,147,180,56,121,119,141,72,111,228,160,244,192,186,62,122,122,68,41,20,193,18,41,221,239,165,172,77,8,26,94,153,36,115,220,89,54,128,10,140,179,52,210,36,62,107,36,17,52,221,9,167,28,16,51,215,16,105,251,170,242,24,70,34,79,203,173,43,187,181,149,89,34,69,107,42,28,213,48,164,29,157,154,148,136,180,180,234,67,121,94,52,215,174,195,140,116,253,84,36,55,25,23,172,69,213,196,66,200,166,183,169,202,157,194,37,56,27,37,130,252,129,29,73,203,221,154,20,158,82,3,139,92,247,162,159,59,
+111,60,22,236,89,241,199,219,230,13,81,218,225,186,130,97,201,27,246,75,107,32,15,115,165,102,44,71,230,149,120,197,147,166,152,42,219,205,45,163,234,122,151,178,31,94,153,169,251,93,97,229,169,159,181,16,8,51,42,133,185,142,174,94,12,135,26,180,5,247,85,65,79,137,131,115,233,6,46,211,6,231,100,215,104,83,181,4,65,130,87,17,234,108,4,19,157,168,92,66,8,161,197,164,180,204,242,117,23,183,209,76,172,150,97,80,195,82,27,84,231,33,60,61,189,180,181,61,177,22,94,187,140,196,101,57,58,190,99,146,219,247,242,43,4,253,185,173,234,217,100,196,49,187,218,44,178,48,105,8,53,197,11,238,227,58,71,220,102,33,189,109,124,54,176,163,95,142,64,13,4,209,58,63,25,81,68,88,209,69,173,181,97,89,241,47,198,202,71,214,74,23,182,137,158,211,106,205,204,180,77,6,110,157,169,232,174,138,149,216,49,173,235,118,232,249,75,42,59,181,41,8,136,117,234,100,29,105,186,110,111,232,185,74,37,44,167,60,229,132,148,187,135,108,197,193,
+90,49,167,111,204,228,174,146,142,67,241,165,220,175,149,192,51,65,103,109,109,131,91,23,114,219,17,174,167,18,42,151,0,73,186,33,173,86,1,230,95,76,73,47,173,219,221,89,143,182,192,163,224,182,209,39,71,23,93,97,8,154,106,205,50,80,96,143,126,50,19,105,93,243,235,41,3,63,71,45,224,169,53,253,70,84,180,170,134,213,116,230,72,144,165,56,4,2,245,134,64,21,190,202,206,136,115,121,129,223,68,204,68,109,87,181,139,101,125,132,163,167,71,150,117,209,37,143,158,156,33,35,123,162,44,69,24,226,53,103,138,186,189,157,159,240,160,119,181,168,46,51,4,77,83,3,56,59,40,213,194,86,36,89,74,30,190,220,186,226,173,229,137,128,101,92,11,215,175,32,81,113,119,78,105,55,175,30,32,68,74,131,94,132,40,240,78,114,250,77,109,187,38,174,146,189,94,29,36,215,38,228,67,231,78,117,97,73,23,89,206,234,34,75,107,197,50,187,214,31,109,1,76,198,109,97,86,181,93,78,199,191,147,110,57,133,224,29,103,237,148,24,17,122,119,192,
+28,61,182,162,166,120,207,167,247,195,93,31,33,32,209,122,35,81,17,141,190,218,113,207,121,69,232,235,73,246,140,218,87,60,68,240,35,65,243,81,189,148,81,81,183,183,84,135,38,53,68,181,182,165,54,89,169,202,194,114,48,202,212,179,14,113,209,227,214,209,228,53,32,75,146,154,190,149,174,74,181,38,78,26,216,139,198,132,10,234,172,92,198,137,121,97,24,194,185,212,207,250,184,148,243,41,213,62,21,148,112,108,55,179,160,92,1,191,162,146,68,196,77,25,15,164,62,200,150,56,164,200,241,6,177,34,208,92,138,237,50,112,78,121,193,18,133,50,120,78,157,135,175,175,180,237,33,89,53,39,235,184,203,18,228,150,201,8,108,56,171,60,85,45,106,161,228,116,150,45,7,18,7,178,107,187,130,37,138,13,225,45,56,91,191,235,131,206,9,206,39,188,185,93,153,145,61,123,81,231,166,54,145,206,139,40,68,197,237,52,181,126,110,103,99,119,157,28,59,111,90,209,105,225,233,6,106,1,149,193,100,131,93,23,89,189,135,23,205,159,85,229,201,144,77,101,
+72,89,131,81,78,40,106,131,174,85,142,4,248,147,133,211,194,225,101,65,66,200,214,98,178,112,69,133,220,76,85,230,136,51,204,48,136,203,13,73,125,122,210,249,172,117,63,87,148,161,55,121,170,233,57,145,60,221,225,86,151,189,215,97,89,167,144,76,92,239,42,203,58,141,206,227,223,202,240,137,176,14,36,27,176,146,107,200,61,59,117,62,67,78,102,130,150,96,132,45,34,7,157,33,251,113,23,95,58,96,123,197,199,19,7,6,35,252,116,119,91,82,175,201,46,143,196,170,144,43,49,167,59,219,214,47,228,185,46,111,206,198,71,239,40,45,167,188,67,69,198,49,183,82,211,196,160,115,181,245,238,21,199,176,94,91,192,181,22,66,126,60,237,192,183,224,84,250,47,131,65,59,51,228,62,23,100,114,180,90,80,141,148,93,44,163,22,66,174,245,108,112,59,72,83,197,14,209,83,85,176,184,214,74,139,131,19,7,108,195,209,101,173,124,52,163,82,121,61,137,224,89,101,82,176,144,103,123,107,76,102,210,225,21,5,100,144,83,183,106,9,78,166,172,94,152,
+75,161,237,38,40,103,220,218,186,142,39,217,105,174,209,80,201,162,209,199,243,113,163,55,224,80,29,56,188,238,5,192,84,176,171,97,119,166,54,167,203,149,150,187,130,204,241,36,89,20,97,111,147,87,179,118,193,21,202,43,137,76,28,240,12,214,6,166,146,207,73,211,178,220,5,103,193,85,8,101,20,212,77,229,44,133,71,198,202,98,46,114,26,175,96,194,5,115,171,25,75,73,176,156,224,24,10,136,156,76,222,85,94,76,102,215,130,53,79,24,103,240,70,119,14,253,123,104,172,178,98,85,30,4,92,231,202,28,131,92,199,6,157,212,245,69,127,129,141,82,132,86,227,156,227,171,25,126,205,158,241,11,215,249,151,17,97,51,164,69,81,79,221,234,213,12,153,42,3,2,34,1,81,54,231,66,33,97,180,213,19,184,124,130,164,102,149,228,20,245,146,85,122,185,148,170,57,10,110,211,202,17,89,58,33,107,88,240,245,192,57,66,19,114,88,85,216,217,220,190,38,32,155,87,96,54,195,34,143,214,205,187,194,23,73,242,104,252,132,95,157,57,70,227,121,185,
+84,182,70,202,4,91,58,49,190,192,23,48,206,5,46,192,65,203,74,234,35,5,178,85,136,120,182,207,144,100,50,158,229,221,32,43,11,30,36,65,37,205,8,112,156,73,233,46,79,190,160,224,225,92,114,236,106,12,190,130,195,171,25,155,40,167,104,27,230,64,237,250,230,9,48,210,21,22,39,57,173,151,167,221,75,180,213,163,26,85,166,177,28,238,45,237,86,151,207,200,248,208,180,56,209,158,61,214,173,92,49,240,155,114,127,242,148,127,140,222,102,211,68,121,78,65,64,62,59,159,230,115,234,51,124,17,35,203,119,133,231,86,35,171,228,179,96,20,238,134,212,207,124,37,82,202,157,77,238,227,197,235,201,148,55,197,73,50,65,56,14,63,179,140,91,90,156,102,230,215,227,211,194,245,222,127,151,83,19,104,214,230,18,140,49,43,149,55,172,246,104,224,12,141,36,27,24,56,110,162,230,129,186,197,75,73,159,138,48,227,84,97,181,201,69,24,76,176,1,53,226,243,105,12,241,40,126,82,63,195,102,16,162,240,145,237,0,166,220,63,168,38,170,162,179,163,
+176,245,208,119,170,156,95,176,117,104,194,152,250,194,68,136,244,36,81,83,74,136,59,68,205,252,17,214,77,36,46,131,166,186,158,51,222,20,13,149,93,133,179,117,6,142,245,116,94,167,224,91,153,58,13,149,9,5,89,90,235,1,115,1,67,190,98,204,178,108,234,179,202,148,59,127,132,187,152,19,137,143,116,8,255,20,27,143,133,212,9,86,200,81,50,85,39,101,154,225,233,150,122,38,24,182,108,231,50,76,1,201,153,219,108,201,248,120,9,127,145,113,206,151,6,17,148,8,108,167,47,7,4,32,135,132,119,90,204,101,167,231,90,42,94,188,56,167,35,45,139,217,167,83,65,25,240,223,32,197,179,204,223,96,6,21,204,196,198,186,37,168,17,130,189,22,221,186,51,141,201,36,59,102,163,228,172,184,25,180,99,46,202,206,148,122,246,162,180,117,72,72,144,19,7,166,173,154,64,111,221,180,20,86,189,122,148,111,217,99,84,122,183,242,231,13,78,93,141,213,103,75,57,132,142,41,195,11,248,84,123,150,191,74,66,84,72,30,131,131,13,88,106,90,196,56,
+187,95,114,81,89,4,95,25,46,34,159,209,82,167,110,197,28,135,111,60,180,217,73,176,149,57,149,97,127,106,131,180,91,156,149,195,230,242,211,214,224,20,108,121,5,57,85,237,166,142,10,56,180,233,232,172,185,224,142,184,18,216,109,124,222,117,58,103,150,23,240,57,134,58,120,150,75,121,206,245,240,96,106,73,189,149,117,81,221,235,139,209,206,129,243,66,236,168,249,136,49,118,76,161,59,247,176,88,254,56,188,237,142,41,37,210,11,249,212,21,98,169,48,155,159,97,162,101,232,224,82,188,138,144,28,44,179,164,7,115,109,84,99,65,105,145,17,167,118,20,251,37,56,71,21,129,89,32,54,114,102,209,9,94,176,229,150,88,104,219,212,114,177,247,63,147,178,151,24,203,156,101,223,20,148,108,134,45,29,145,103,171,160,35,26,102,182,51,103,230,18,173,160,85,191,162,61,31,73,186,69,149,20,89,185,1,179,228,148,184,144,123,217,51,27,225,88,235,103,112,52,213,29,240,216,175,234,19,224,89,187,96,62,150,152,19,27,242,91,1,112,195,230,102,64,252,
+116,212,25,123,114,87,142,82,187,206,182,88,150,45,159,203,39,170,216,192,17,126,105,177,104,87,193,93,118,6,104,159,181,238,32,107,216,213,11,186,144,6,63,240,238,177,57,190,101,218,20,220,143,211,198,90,134,227,9,40,9,180,186,11,38,93,76,153,177,9,78,32,63,157,20,89,214,167,151,195,235,251,83,234,14,115,143,75,50,76,78,54,82,238,218,185,23,137,84,186,236,166,44,67,29,39,59,69,156,43,36,77,18,224,91,85,153,18,53,3,8,47,124,132,201,117,122,194,243,192,253,194,36,90,239,102,96,120,210,132,114,186,211,90,138,250,184,80,133,236,88,200,82,184,101,135,75,177,234,220,212,17,119,79,201,244,118,206,46,26,228,101,155,113,113,99,133,112,90,93,186,50,172,205,32,15,38,87,247,130,192,240,251,91,142,115,94,108,117,78,118,236,152,154,7,159,152,91,40,91,126,221,156,180,251,242,147,230,101,74,42,176,111,153,155,153,99,87,65,123,179,179,168,174,20,82,183,146,149,123,30,83,94,129,45,4,156,238,50,254,42,140,147,30,193,230,
+115,170,147,80,117,125,209,27,22,195,88,122,210,172,221,88,45,30,55,28,34,4,131,192,6,28,176,81,109,95,242,47,181,43,229,245,117,174,53,72,204,204,73,119,237,240,194,44,76,151,197,242,23,136,164,216,34,18,200,47,224,65,94,100,74,192,231,97,79,149,64,114,160,152,70,30,202,177,62,246,182,102,122,106,198,63,181,203,152,13,202,2,91,200,9,103,85,115,28,221,132,129,57,74,230,62,142,111,83,178,152,120,124,117,85,190,4,157,2,219,192,105,78,87,128,158,106,134,60,137,252,153,89,29,128,163,109,248,11,28,113,41,78,246,86,207,240,75,66,171,74,163,102,233,201,39,84,116,240,242,148,42,133,216,69,124,51,65,123,166,114,209,182,88,23,114,103,215,120,18,95,56,73,193,115,115,171,135,118,236,10,129,167,3,185,196,70,149,65,89,54,40,72,54,132,31,41,229,83,102,25,252,41,12,176,95,151,98,124,213,60,199,55,179,1,229,103,78,148,144,105,166,127,182,156,227,85,147,83,62,204,22,90,227,211,195,224,238,197,0,10,49,31,180,237,50,
+12,180,195,86,195,95,159,205,134,92,87,234,80,73,125,97,11,113,68,129,144,234,138,181,96,111,59,80,121,217,105,129,73,194,138,90,9,228,76,54,114,136,42,92,76,166,246,44,250,11,228,76,0,188,192,194,31,37,241,70,14,252,40,59,101,216,95,231,50,204,65,120,6,47,229,156,97,11,179,206,22,72,12,142,99,224,133,131,213,25,223,62,207,193,103,7,32,147,243,162,89,51,115,97,114,218,169,153,196,248,139,75,88,6,66,229,115,77,11,24,196,147,5,150,127,175,12,171,242,148,243,190,45,87,185,186,236,115,192,170,83,237,192,4,18,173,217,69,81,75,65,148,159,65,105,132,82,126,189,203,175,47,206,168,131,240,106,46,0,87,16,97,44,178,48,96,143,200,101,46,148,33,59,229,86,47,158,136,116,103,250,229,188,199,96,21,153,1,15,105,56,93,8,227,143,14,115,0,147,174,244,108,114,98,117,25,23,19,193,156,42,100,131,181,174,40,70,124,29,41,112,187,49,45,152,148,26,151,202,243,167,9,245,252,30,115,122,97,10,182,196,48,26,156,69,10,
+134,32,60,73,32,14,141,98,33,27,129,229,155,237,103,188,105,124,150,39,173,206,204,157,187,24,160,147,10,25,110,34,166,21,26,181,165,189,147,191,162,135,115,182,44,53,144,205,53,92,173,218,133,145,218,241,198,103,140,73,171,42,48,235,66,227,27,56,98,215,191,4,203,73,215,67,149,75,247,41,85,177,101,21,149,143,96,110,154,114,51,143,148,38,164,174,8,43,161,94,128,129,140,176,236,148,77,33,56,113,27,246,156,222,32,250,88,26,11,83,103,112,160,11,196,198,194,20,203,190,153,88,157,131,47,43,206,182,166,224,249,185,73,253,46,164,169,150,20,120,236,248,36,142,111,14,240,16,164,5,1,81,58,141,61,143,100,24,51,169,44,207,36,7,157,146,92,98,162,47,111,218,186,206,176,187,123,2,116,39,58,129,154,210,23,118,253,161,85,117,112,54,165,206,57,67,162,98,104,89,213,96,45,180,28,147,197,156,204,28,66,129,180,188,162,46,148,100,232,13,82,33,108,75,44,72,168,132,91,17,220,153,28,1,98,131,39,50,16,155,35,222,8,210,10,41,
+167,93,219,190,148,121,187,217,77,172,188,236,137,235,219,155,27,198,244,177,50,113,44,216,233,234,234,36,220,78,59,95,223,191,148,132,107,213,236,197,90,219,92,247,104,139,161,233,157,104,5,236,93,147,149,226,4,177,41,179,149,37,28,95,181,216,234,237,56,92,237,166,249,166,216,32,44,62,51,15,11,217,68,152,163,10,105,106,109,143,56,129,50,8,211,123,212,35,104,86,43,107,46,22,209,158,168,119,59,180,0,4,213,211,193,100,154,172,40,249,248,104,129,133,185,21,225,232,68,147,126,97,131,178,125,181,238,180,78,207,228,246,46,23,103,88,138,11,102,201,174,223,57,48,100,212,153,194,236,116,144,109,214,108,4,40,42,36,75,116,57,185,197,105,8,13,59,92,75,219,77,73,156,206,78,178,160,196,128,101,45,157,137,44,200,105,237,180,100,38,147,18,33,212,162,14,153,186,191,14,77,92,16,60,208,144,45,118,24,179,149,197,154,96,67,141,174,11,131,218,53,8,114,81,11,13,216,152,118,188,122,53,233,32,22,12,7,37,142,96,99,143,93,173,35,192,
+211,84,166,60,188,120,142,99,79,135,154,123,250,66,158,23,51,168,60,233,228,100,3,143,87,201,87,136,230,160,155,190,92,144,65,214,27,125,238,12,97,202,105,148,16,136,242,52,41,61,196,60,211,213,80,43,244,76,252,88,68,113,148,60,205,80,96,13,13,1,9,81,167,177,85,121,135,75,41,121,188,11,146,78,126,61,127,70,208,181,151,103,196,80,95,110,182,221,166,108,56,48,187,126,17,42,85,41,121,60,221,21,240,60,57,147,182,135,52,245,25,65,86,41,239,234,193,29,229,42,12,109,23,58,202,228,30,155,65,202,204,126,123,194,39,93,170,178,106,200,112,231,20,99,5,159,229,22,40,198,171,235,188,186,112,113,58,173,215,28,197,60,121,5,184,170,212,203,105,42,187,127,115,234,224,66,113,108,97,137,28,251,131,254,80,242,178,202,204,11,243,106,30,20,140,218,177,212,233,233,221,248,9,117,198,36,233,16,200,103,49,74,248,88,179,75,208,239,187,116,186,21,226,14,52,158,229,130,231,115,138,227,77,86,237,92,226,49,92,204,71,39,117,234,154,225,
+210,183,33,199,76,129,99,210,220,238,69,253,28,65,245,48,178,19,133,108,62,221,110,107,160,96,87,182,94,244,68,106,171,108,40,53,159,178,235,23,13,117,110,46,183,220,161,50,21,62,15,35,231,32,195,251,108,216,109,220,246,106,64,39,84,160,43,112,42,248,138,139,43,20,203,101,35,152,194,162,199,179,217,56,148,114,177,4,1,19,207,147,246,214,25,197,175,6,2,156,78,152,57,239,115,49,168,137,18,163,175,22,228,45,231,5,113,225,130,101,201,34,86,163,166,237,58,170,164,11,131,143,213,184,108,85,47,155,1,169,214,232,165,82,77,106,237,84,96,224,124,173,186,79,163,109,250,43,86,136,206,165,201,226,164,39,198,2,8,88,10,251,194,206,57,254,66,204,80,111,108,132,28,77,21,54,39,238,76,101,41,41,157,127,58,64,51,31,74,157,238,138,150,8,2,181,86,69,116,90,158,235,104,175,64,213,224,178,206,121,45,225,195,235,179,61,149,169,29,148,182,35,230,243,216,85,46,111,218,112,43,117,89,141,106,79,28,159,207,25,40,49,61,148,24,97,
+228,56,5,88,158,190,76,157,247,180,156,46,52,106,55,151,239,238,135,118,90,109,29,204,89,50,0,227,123,22,118,18,113,145,41,114,121,158,188,160,121,242,49,93,48,124,161,71,230,42,62,105,152,181,189,3,203,137,23,25,109,104,38,61,187,162,84,216,208,168,57,241,28,55,83,154,51,129,38,185,231,142,244,149,11,122,132,223,237,175,195,116,164,33,167,203,27,90,129,27,147,45,201,106,146,80,44,21,211,25,182,185,100,81,190,182,103,20,235,10,174,121,210,34,99,218,225,148,198,98,229,202,98,17,101,193,154,204,134,213,134,1,215,83,199,157,137,75,11,7,38,135,106,182,38,66,202,230,145,158,158,169,146,164,57,147,206,187,85,159,107,158,209,48,201,162,87,212,201,239,103,152,80,135,0,190,183,103,49,78,182,77,142,226,122,17,216,155,179,192,42,24,45,68,172,210,51,37,79,45,42,45,168,109,164,45,0,174,132,118,38,242,69,111,216,196,207,56,28,90,67,98,141,96,171,180,96,12,140,244,180,105,15,139,143,179,150,14,142,21,224,22,141,117,134,131,
+170,116,3,12,64,21,165,105,148,146,41,36,46,37,133,176,184,245,12,159,91,204,67,50,53,216,185,122,106,37,63,113,148,229,70,219,87,182,9,204,98,69,27,99,69,142,147,27,198,67,218,118,65,27,105,164,29,60,4,151,29,48,154,183,73,69,59,192,1,138,161,58,173,32,55,67,123,108,62,154,161,155,149,33,157,156,246,137,5,132,237,4,102,77,139,235,80,112,67,180,66,191,108,72,233,152,82,103,170,73,176,84,35,155,144,64,234,186,196,65,28,155,229,109,45,10,151,219,132,133,224,145,102,206,123,216,192,20,211,167,30,133,143,117,1,61,46,24,205,213,182,75,133,51,92,6,183,241,65,118,67,147,149,251,219,12,17,46,7,11,201,122,173,229,109,163,18,218,187,171,68,141,116,147,185,13,87,225,252,64,219,153,102,166,53,141,51,208,19,250,210,217,22,217,95,155,172,71,66,229,65,251,234,65,166,215,30,30,161,52,115,208,50,173,91,208,56,23,34,53,175,134,116,158,164,227,136,225,137,28,224,244,188,205,29,35,24,211,58,237,92,241,214,24,248,29,
+29,113,151,117,60,59,49,13,106,119,143,243,194,213,36,164,189,4,205,123,215,206,215,74,235,180,115,92,132,214,162,64,107,59,5,84,12,227,138,69,206,206,175,175,209,222,72,196,97,96,171,175,47,125,244,54,42,12,53,21,103,235,53,170,38,122,217,228,166,12,231,2,72,125,219,88,70,121,39,246,155,39,241,115,62,70,158,152,189,214,213,79,40,151,65,137,169,24,12,243,22,119,32,248,72,250,144,166,207,43,103,18,199,96,121,61,7,74,211,100,215,14,181,233,154,120,37,206,208,185,151,215,117,14,230,146,182,195,95,64,203,235,43,134,110,52,194,57,166,57,175,244,137,107,16,15,162,78,189,3,22,58,244,171,177,161,175,123,8,7,35,67,195,67,175,70,126,55,0,54,120,124,251,236,225,159,195,31,123,62,244,102,228,159,190,27,125,51,242,108,104,124,244,191,15,208,134,199,71,95,190,126,241,253,208,248,200,219,193,159,186,127,61,250,251,145,23,227,189,182,3,56,3,160,251,147,119,168,220,224,8,3,77,94,143,188,25,126,59,246,230,233,175,159,126,9,
+16,126,251,221,155,87,61,180,130,94,183,215,99,125,116,225,30,40,194,248,215,195,175,94,140,190,26,25,127,50,244,15,223,142,188,186,225,235,217,227,161,225,241,30,42,242,59,164,71,251,56,204,95,143,244,250,253,114,48,242,223,140,1,147,232,195,8,191,253,118,244,118,204,209,49,128,206,139,145,225,62,194,240,187,115,124,244,124,12,96,113,228,13,240,243,178,79,10,24,110,124,236,213,248,0,30,249,94,106,255,237,197,91,96,110,111,71,250,127,70,127,228,247,175,71,190,126,59,62,152,251,208,179,225,183,195,61,14,190,26,185,65,57,190,249,219,243,61,208,228,225,23,175,191,29,30,234,19,127,59,244,244,139,135,127,153,126,8,152,232,208,179,177,1,179,61,46,122,172,253,238,219,177,23,239,49,8,188,233,223,127,222,163,62,254,246,205,240,232,55,223,190,189,33,249,228,131,165,237,227,85,0,12,142,142,191,189,3,167,184,147,221,232,219,59,73,13,168,63,190,105,127,179,136,125,192,139,65,211,175,134,191,254,199,91,140,138,27,209,254,121,255,205,29,213,247,
+72,125,32,224,161,71,195,223,12,143,190,122,60,244,73,9,247,144,162,251,171,244,245,240,56,192,228,157,126,252,104,8,120,214,71,141,6,134,248,122,236,229,87,61,0,230,129,36,251,240,24,253,191,12,223,7,187,238,13,246,119,64,187,175,123,80,194,143,1,202,227,61,225,246,177,184,129,103,111,222,0,171,4,8,250,221,37,185,215,218,135,210,251,233,207,135,254,248,201,208,127,25,27,126,118,55,193,241,161,231,111,198,94,246,193,187,111,128,61,254,252,197,139,158,162,247,117,245,213,240,139,158,106,247,176,60,122,61,122,123,101,120,188,39,203,27,12,239,158,82,0,92,252,183,190,194,0,243,185,145,192,200,179,27,144,142,30,235,183,171,9,188,248,221,240,155,27,214,254,248,247,255,203,211,47,190,26,189,91,226,158,148,198,222,60,27,236,142,155,17,135,198,128,238,183,67,221,104,87,239,201,0,83,187,135,66,209,231,229,203,254,138,222,221,254,226,85,15,182,4,120,58,128,33,191,65,251,126,114,243,246,30,170,100,124,232,233,103,163,175,94,127,247,246,233,103,
+183,10,244,14,1,224,245,216,119,111,251,239,159,220,138,170,55,238,13,115,3,180,239,222,62,126,250,197,96,39,223,163,167,223,2,164,223,200,106,192,250,248,80,31,175,252,47,254,250,191,2,19,29,250,171,95,254,167,247,168,125,245,253,29,50,57,48,250,232,111,129,71,253,149,1,38,246,247,111,1,109,122,121,51,219,39,239,220,222,27,158,129,168,1,51,240,245,3,16,115,64,152,111,70,190,25,237,183,252,237,240,155,62,48,57,208,25,24,96,252,231,253,139,193,156,250,208,44,64,219,103,35,111,1,101,2,246,231,72,95,242,195,67,223,0,124,244,247,35,48,96,111,125,129,41,15,191,6,134,124,253,102,180,103,71,111,23,239,29,142,222,246,13,218,216,171,183,192,190,24,191,101,233,6,229,124,32,3,64,180,61,29,252,79,128,206,253,249,171,239,1,249,255,238,219,209,175,191,189,25,125,48,147,155,229,6,20,110,248,22,22,126,128,47,15,44,245,139,177,30,223,128,238,220,235,216,67,166,222,97,166,47,210,247,144,102,126,253,111,127,252,227,47,128,205,245,
+67,136,51,95,254,75,33,103,110,137,254,243,208,51,95,190,215,227,22,131,102,168,143,66,243,225,219,158,152,254,30,176,192,207,199,127,254,229,199,199,252,226,127,244,177,50,254,246,245,72,15,190,225,211,141,126,8,208,230,195,113,127,0,217,230,6,125,163,7,145,113,59,234,208,211,255,249,33,137,15,159,124,10,237,230,195,150,183,176,55,239,191,121,250,63,63,53,195,247,128,112,62,232,248,17,201,63,31,127,242,43,128,163,71,79,63,251,229,157,142,61,253,236,49,160,160,79,127,244,228,171,151,175,127,14,252,188,126,245,77,239,231,237,232,243,155,159,254,239,111,94,127,51,248,25,233,255,126,51,250,252,233,103,31,147,226,61,186,198,71,102,242,137,137,252,16,60,203,31,50,171,31,4,108,249,176,249,232,243,62,48,202,135,47,222,197,108,249,241,227,161,31,223,32,182,124,216,180,135,173,243,105,2,125,196,249,65,255,167,159,253,205,216,205,134,238,237,227,145,103,255,166,39,239,63,7,182,238,139,71,63,253,241,231,79,126,249,118,24,216,48,143,62,255,215,138,
+107,160,142,127,136,148,128,105,3,203,255,139,223,143,124,253,221,219,145,126,183,167,159,253,229,183,99,99,227,35,247,65,222,192,232,0,150,17,112,219,175,128,5,254,252,163,148,238,16,119,190,188,121,246,174,201,238,193,215,220,155,187,219,54,67,143,158,254,223,207,199,63,38,203,135,216,46,31,190,253,112,159,125,82,48,239,34,192,252,33,50,25,108,75,192,154,126,100,96,224,233,147,247,76,204,187,47,7,232,49,159,224,238,62,126,251,229,203,215,99,111,128,136,182,31,188,246,236,247,216,208,171,94,60,59,58,62,136,18,1,103,0,200,28,48,179,255,216,247,185,207,70,0,133,0,154,245,67,161,113,32,36,29,125,14,24,212,91,159,58,62,242,226,249,211,47,238,124,92,47,10,3,98,170,65,227,7,66,127,60,244,253,216,119,64,34,48,136,182,134,159,61,187,167,244,241,129,110,195,141,177,161,95,125,59,242,203,255,253,23,61,63,251,155,158,111,124,244,250,197,119,223,140,190,250,15,128,113,120,60,116,115,13,88,136,187,107,192,46,220,93,3,182,226,238,26,
+48,16,159,191,23,138,253,236,9,16,41,223,197,86,15,3,171,241,94,52,112,151,35,220,4,22,127,63,6,56,209,209,151,35,125,215,215,243,197,247,114,188,15,153,110,186,247,230,0,68,47,253,45,214,7,121,3,98,186,126,24,217,139,189,110,162,182,155,184,247,229,200,203,177,55,223,247,3,176,241,239,0,47,220,11,83,111,131,165,143,7,86,55,33,199,187,97,198,45,3,0,201,151,239,112,255,4,144,32,192,237,200,239,135,129,148,170,135,41,247,234,183,35,111,222,142,223,251,117,160,243,55,111,134,191,7,58,0,175,31,1,93,7,206,246,55,223,141,191,29,250,171,161,175,191,29,126,245,106,228,197,231,131,180,108,248,183,131,233,15,3,145,196,216,239,158,126,241,79,128,131,26,125,251,253,208,255,241,95,255,106,64,237,79,254,245,174,254,195,182,247,75,218,251,247,255,77,84,240,47,223,137,31,241,250,255,127,186,45,192,56,254,155,63,220,58,222,44,106,207,64,126,204,156,13,210,224,143,57,199,183,125,212,193,231,175,122,198,179,103,14,63,210,230,222,166,
+2,139,124,171,131,183,175,135,128,249,60,250,201,143,63,54,131,158,0,1,157,30,125,245,232,249,171,143,189,191,167,251,183,175,70,254,244,161,189,254,179,219,189,8,48,245,158,29,239,9,2,48,39,143,70,95,125,126,199,195,39,164,55,160,241,41,135,241,139,223,3,145,233,203,126,210,222,91,197,87,64,202,55,218,203,40,250,249,198,199,157,194,39,165,248,177,200,171,55,251,191,5,12,0,96,4,30,245,196,251,239,1,221,120,2,220,244,20,224,227,3,244,52,252,129,255,2,226,134,254,212,239,221,21,208,251,159,239,215,135,149,28,121,52,152,252,211,47,254,236,46,254,248,65,121,221,162,167,141,222,192,5,142,14,253,233,208,29,137,123,226,0,177,255,60,210,75,37,239,153,2,2,207,209,91,180,182,143,9,237,190,243,96,13,255,11,96,146,238,181,167,143,230,246,241,129,222,105,248,104,244,227,75,50,40,10,252,105,207,170,254,89,95,212,31,167,245,15,163,207,222,126,251,128,231,143,19,187,21,194,111,110,132,240,155,79,10,225,125,122,64,219,31,146,193,23,
+255,3,96,237,233,175,127,243,244,203,39,253,40,229,238,238,171,119,238,250,250,254,226,166,221,71,57,124,64,104,128,152,248,179,159,125,180,221,199,20,242,125,69,249,135,30,76,232,187,66,254,132,130,253,115,1,15,32,170,95,127,16,112,221,108,212,219,18,28,224,110,222,205,11,111,83,236,126,126,8,248,188,215,253,20,184,95,11,28,120,204,190,145,235,109,199,219,236,183,87,162,26,121,249,26,112,54,128,189,24,26,125,254,48,77,5,252,27,16,194,0,125,191,30,251,230,21,160,238,207,222,47,172,253,250,29,253,123,55,105,31,125,53,160,210,171,223,1,12,244,124,10,192,74,207,119,246,110,7,221,0,247,12,56,189,23,227,99,67,223,222,245,123,54,218,83,190,145,87,95,247,194,133,145,183,191,27,1,210,238,55,35,131,71,183,51,184,45,208,220,59,250,161,71,128,239,236,123,141,143,21,16,110,158,221,123,246,94,64,5,68,87,223,189,24,190,43,208,245,28,241,192,243,125,53,168,137,1,14,160,23,103,12,42,16,119,5,145,65,245,226,67,49,246,124,198,
+231,79,110,4,243,163,7,2,186,221,116,119,75,118,87,150,125,151,220,173,68,238,139,160,61,217,15,162,198,27,26,247,147,122,250,217,27,128,223,177,151,79,63,123,15,146,118,64,229,113,191,239,8,224,188,190,31,122,95,30,207,129,123,32,190,28,249,199,241,126,157,240,201,208,47,158,124,211,95,135,126,160,10,136,25,144,205,8,16,75,254,118,116,252,182,126,50,220,79,69,122,125,250,226,233,85,23,1,69,121,61,6,68,120,64,139,27,10,247,81,69,175,148,247,118,248,205,77,201,227,86,243,128,69,239,251,213,223,245,234,40,61,90,55,132,6,2,1,122,244,234,196,253,121,247,106,171,95,245,66,101,64,133,190,123,209,171,87,3,65,209,135,154,119,191,213,6,224,188,189,205,112,163,101,55,142,174,47,224,27,193,12,138,94,239,215,194,190,24,104,209,93,25,243,215,239,184,227,247,2,219,255,120,83,48,3,218,126,253,237,109,89,241,193,147,62,227,253,50,43,16,128,3,1,108,143,243,215,189,216,252,187,215,189,72,105,48,243,7,37,183,111,70,94,245,138,
+166,189,34,89,191,166,55,54,80,232,94,117,30,16,214,235,225,55,64,4,6,48,59,40,237,246,223,0,15,6,175,31,190,125,51,242,122,164,151,51,140,61,127,59,242,234,255,67,244,225,193,76,7,158,240,47,128,200,187,111,213,1,85,251,203,94,253,118,80,197,253,8,92,105,191,209,155,59,32,218,55,63,127,247,205,79,250,174,234,189,55,15,43,211,95,61,122,211,43,14,191,249,103,64,125,223,188,185,197,55,189,107,246,113,184,222,94,195,143,195,245,246,220,221,211,127,55,212,119,1,3,36,212,62,160,233,187,24,182,195,3,127,210,159,237,19,96,91,254,221,251,104,188,195,3,103,116,215,224,175,62,108,240,213,59,13,254,226,253,6,61,142,255,169,215,228,81,15,181,247,139,161,94,176,53,64,240,29,92,255,251,161,30,172,240,221,243,155,235,254,205,79,126,246,31,135,254,3,32,212,247,71,236,207,233,159,134,254,116,224,220,134,254,55,224,250,79,134,222,129,236,125,0,204,250,224,152,227,209,67,248,221,129,253,26,250,36,250,238,77,137,176,167,26,127,61,
+252,143,192,210,253,201,208,45,86,109,255,254,203,135,2,127,160,52,239,106,196,208,67,69,24,92,252,168,71,7,136,121,110,43,119,55,225,245,255,57,242,253,163,207,123,49,250,248,219,159,223,54,188,47,239,13,180,181,55,240,123,141,62,68,154,190,161,119,199,56,224,103,31,208,254,80,165,129,220,237,205,208,183,79,127,221,59,86,27,123,222,211,176,254,170,252,244,161,174,60,253,81,95,243,158,254,232,243,111,251,26,126,255,230,221,142,3,192,220,143,171,211,135,67,252,209,123,205,255,234,135,155,255,228,189,230,239,168,218,205,114,14,38,255,232,219,199,67,239,79,231,147,8,188,3,209,62,20,215,67,49,127,40,175,155,145,30,88,14,96,71,15,236,197,15,15,113,223,227,47,123,246,245,217,31,102,113,238,21,240,229,253,108,95,14,246,237,155,135,79,250,4,238,4,244,129,100,0,165,235,145,233,179,242,229,163,151,159,228,245,95,128,202,254,213,216,216,139,129,175,120,246,47,194,101,127,215,84,253,97,192,213,31,183,147,63,253,113,255,2,48,128,255,43,112,253,
+46,128,243,59,233,202,31,221,228,43,63,251,113,255,162,223,97,20,48,46,63,253,192,110,222,109,230,94,183,254,229,35,32,119,237,195,63,143,2,141,255,93,207,228,60,30,122,244,71,63,251,224,209,79,223,107,245,1,60,249,195,58,237,232,227,62,223,125,38,126,246,248,189,134,67,15,254,121,52,16,48,96,229,222,215,31,96,117,238,31,125,254,168,71,233,39,128,38,126,254,222,184,31,131,38,255,248,50,125,242,248,224,1,189,27,110,0,217,0,122,50,242,112,164,95,141,190,125,209,43,118,252,13,160,36,183,173,190,0,90,125,63,56,223,234,159,218,247,207,149,7,122,212,59,95,31,25,60,233,135,21,189,124,247,7,24,189,57,46,248,20,51,207,129,176,251,19,220,188,253,215,112,211,171,210,60,160,54,88,138,167,159,125,13,236,133,254,89,244,240,215,111,71,127,59,252,118,208,163,79,255,29,254,31,158,40,60,249,191,198,198,94,222,28,46,124,56,193,15,204,247,31,10,8,254,17,20,240,7,213,219,155,48,240,166,158,247,248,129,162,12,189,1,98,199,94,
+36,57,248,154,225,225,41,121,63,48,3,108,196,224,89,175,138,217,63,110,4,68,51,246,100,8,200,211,126,55,252,253,227,219,60,165,191,165,31,223,199,113,247,231,221,3,90,189,100,11,144,35,32,246,151,195,175,190,239,19,27,127,255,19,129,187,240,188,207,235,248,40,160,137,253,252,106,180,23,251,126,51,54,246,172,23,130,62,27,125,118,115,136,249,32,56,5,198,121,210,255,122,164,31,168,246,152,120,56,193,62,43,227,239,86,147,239,190,51,25,228,146,239,31,222,62,240,235,79,122,247,128,199,252,114,232,118,115,12,142,69,135,94,246,106,157,183,81,238,208,119,175,70,129,56,255,214,219,222,133,188,247,95,169,188,31,247,62,190,57,64,29,255,118,236,187,23,207,122,41,193,205,241,107,239,219,140,241,27,190,128,244,239,43,160,237,147,91,115,253,229,237,224,111,239,63,64,25,239,105,223,125,80,240,48,218,30,31,121,48,224,135,57,198,189,3,24,122,254,221,171,175,251,194,238,19,238,37,132,227,15,74,134,3,185,222,126,9,50,250,238,56,128,108,110,100,
+60,244,168,127,190,11,112,244,119,191,250,213,47,251,185,201,8,176,0,64,158,254,230,237,221,73,246,189,104,251,223,89,60,191,73,163,110,196,52,122,167,45,192,70,189,209,173,193,232,223,143,0,250,53,40,162,223,124,120,115,19,213,247,104,245,117,117,176,175,63,212,42,64,229,126,63,250,242,187,151,55,132,6,223,11,61,235,149,170,129,133,255,30,72,10,128,124,166,151,136,245,207,16,94,191,24,238,125,244,240,242,254,172,225,182,247,163,63,254,235,191,232,203,0,240,124,63,253,201,93,177,224,203,255,7,121,164,93,56,
diff --git a/uppsrc/Draw/srcdoc.tpp/all.i b/uppsrc/Draw/srcdoc.tpp/all.i
new file mode 100644
index 000000000..cc2e1510f
--- /dev/null
+++ b/uppsrc/Draw/srcdoc.tpp/all.i
@@ -0,0 +1,12 @@
+TOPIC("DrawOutput$en-us")
+#include "DrawOutput$en-us.tpp"
+END_TOPIC
+
+TOPIC("ImgTutorial$en-us")
+#include "ImgTutorial$en-us.tpp"
+END_TOPIC
+
+TOPIC("DrawTutorial$en-us")
+#include "DrawTutorial$en-us.tpp"
+END_TOPIC
+
diff --git a/uppsrc/DropGrid/DropGrid.cpp b/uppsrc/DropGrid/DropGrid.cpp
new file mode 100644
index 000000000..a91a3cf6d
--- /dev/null
+++ b/uppsrc/DropGrid/DropGrid.cpp
@@ -0,0 +1,953 @@
+#include "DropGrid.h"
+
+NAMESPACE_UPP
+
+DropGrid::PopUpGrid::PopUpGrid()
+{
+	LiveCursor();
+	FullColResizing(false);
+	HorzGrid(false);
+	DrawLastVertLine(false);
+	TabAddsRow(false);
+	SearchMoveCursor(true);
+	SearchHideRows(false);
+	SearchDisplay(false);
+	ResizePanel();
+	WhenLeftClick = THISBACK(CloseData);
+	WhenEnter = THISBACK(CloseData);
+	WhenEscape = THISBACK(CloseNoData);
+	GridCtrl::WhenClose = THISBACK(CloseNoData);
+}
+
+void DropGrid::PopUpGrid::PopUp(Ctrl *owner, const Rect &r)
+{
+	Close();
+	SetRect(r);
+	Ctrl::PopUp(owner, true, true, GUI_DropShadows());
+	SetFocus();
+}
+
+void DropGrid::PopUpGrid::CloseNoData()
+{
+	WhenCloseNoData();
+	Deactivate();
+}
+
+void DropGrid::PopUpGrid::CloseData()
+{
+	WhenCloseData();
+	Deactivate();
+}
+
+void DropGrid::PopUpGrid::Deactivate()
+{
+	if(IsOpen() && IsPopUp())
+	{
+		WhenPopDown();
+		IgnoreMouseClick();
+		GridCtrl::Close();
+		WhenClose();
+	}
+}
+
+DropGrid::DropGrid()
+{
+	list.WhenCloseData = THISBACK(CloseData);
+	list.WhenCloseNoData = THISBACK(CloseNoData);
+	list.WhenClose = THISBACK(Close);
+	list.WhenSearchCursor = THISBACK(SearchCursor);
+	list.BackPaint();
+	drop.AddButton().Main().WhenPush = THISBACK(Drop);
+	drop.SetStyle(drop.StyleFrame());
+	drop.NoDisplay();
+	drop.AddTo(*this);
+	list_width = 0;
+	list_height = 0;
+	drop_lines = 16;
+	display_all = false;
+	header = true;
+	valuekey = false;
+	key_col = 0;
+	find_col = 0;
+	value_col = -1;
+	rowid = -1;
+	trowid = -2;
+	notnull = false;
+	format_columns = true;
+	drop_enter = false;
+	data_action = false;
+	Searching(true);
+	always_drop = true;
+	must_change = false;
+	null_action = true;
+	display = this;
+	change = false;
+	EnableDrop(always_drop);
+}
+
+void DropGrid::Close()
+{
+	Rect r = list.GetRect();
+	list_width = r.Width();
+	list_height = r.Height();
+	SetFocus();
+}
+
+void DropGrid::CloseData()
+{
+	UpdateValue();
+	DoAction(list.GetCursor());
+}
+
+void DropGrid::CloseNoData()
+{
+	if(list.GetRowId() != rowid)
+		list.SetCursorId(rowid);
+}
+
+void DropGrid::Drop()
+{
+	if(!IsEditable())
+		return;
+
+	GridDisplay &dsp = list.GetDisplay();
+	if(!header)
+	{
+		list.HideRow(0, false);
+		dsp.SetHorzMargin(2, 2);
+	}
+	else
+		dsp.SetHorzMargin();
+
+	list.UpdateRows(true); //TODO: try to avoid it..
+
+	Rect rs = GetScreenRect();
+	int width = rs.Width();
+	int resize_height = list.GetResizePanelHeight();
+	int list_height = max(list.GetHeight(), GridCtrl::GD_ROW_HEIGHT + GridCtrl::GD_HDR_HEIGHT * header);
+	int height = list_height + 4 + resize_height;
+	int drop_height = drop_lines * GridCtrl::GD_ROW_HEIGHT + header * GridCtrl::GD_HDR_HEIGHT + 4 + resize_height;
+	if(!display_all && height > drop_height)
+		height = drop_height;
+
+	list.resize_panel.SetMinSize(Size(width, height));
+
+	if(list_width > width)
+		width = list_width;
+	if(display_all && list_height > height) //check this
+		height = list_height;
+
+	Rect rw = Ctrl::GetWorkArea();
+	Rect r;
+	r.left   = rs.left;
+	r.right  = rs.left + width;
+	r.top    = rs.bottom;
+	r.bottom = rs.bottom + height;
+
+	if(r.bottom > rw.bottom)
+	{
+		r.top = rs.top - height;
+		r.bottom = rs.top;
+	}
+	if(r.right > rw.right)
+	{
+		int diff;
+		if(rs.right <= rw.right)
+			diff = rs.right - r.right;
+		else
+			diff = rw.right - r.right;
+
+		r.left += diff;
+		r.right += diff;
+	}
+	if(r.left < rw.left)
+	{
+		int diff = rw.left - r.left;
+		r.left += diff;
+		r.right += diff;
+
+	}
+
+	if(searching)
+		list.ClearFound();
+	list.PopUp(this, r);
+	list.CenterCursor();
+}
+
+
+void DropGrid::Paint(Draw& w)
+{
+	Size sz = GetSize();
+	w.DrawRect(sz, SColorPaper());
+	GridDisplay &disp = display ? *display : list.GetDisplay();
+	bool hf = HasFocus();
+	bool isnull = rowid < 0;
+	Color fg = hf ? SColorHighlightText() : IsEnabled() ? SColorText() : SColorDisabled();
+	Color bg = !IsEnabled() ? SColorFace
+	                        : notnull && isnull ? Blend(SColorPaper, Color(255, 0, 0), /*hf ? 55 :*/ 32)
+	                                            : hf ? SColorHighlight() : SColorPaper();
+
+	const int d = 1;
+	if(isnull)
+		w.DrawRect(d, d, sz.cx - d * 2, sz.cy - d * 2, bg);
+	else
+	{
+		Font fnt(StdFont());
+		Paint0(w, 1, 1, d, d, sz.cx - d * 2, sz.cy - d * 2, Format0(Null, rowid), 0, fg, bg/*SColorPaper()*/, fnt);
+	}
+
+	if(hf)
+		DrawFocus(w, d - 1, d - 1, sz.cx - (d - 1) * 2, sz.cy - (d - 1) * 2);
+}
+
+
+void DropGrid::LeftDown(Point p, dword keyflags)
+{
+	Drop();
+}
+
+void DropGrid::GotFocus()
+{
+	drop.RefreshFrame();
+}
+
+void DropGrid::LostFocus()
+{
+	drop.RefreshFrame();
+}
+
+void DropGrid::Serialize(Stream& s)
+{
+	s % rowid;
+	if(s.IsLoading())
+		list.SetCursorId(rowid);
+}
+
+bool DropGrid::Accept()
+{
+	if(!Ctrl::Accept())
+		return false;
+	if(must_change && !change)
+	{
+		Exclamation(t_("Select a value."));
+		SetWantFocus();
+		return false;
+	}
+	return true;
+}
+
+Size DropGrid::GetMinSize() const
+{
+	return drop.GetMinSize();
+}
+
+void DropGrid::Paint0(Draw &w, int lm, int rm, int x, int y, int cx, int cy, const Value &val, dword style, Color &fg, Color &bg, Font &fnt, bool found, int fs, int fe)
+{
+	w.DrawRect(x, y, cx, cy, bg);
+	int nx = x + lm;
+	int ny = y + tm;
+	int ncx = cx - lm - rm;
+
+	if(IsType< Vector<String> >(val))
+	{
+		const Vector<String> &v = ValueTo< Vector<String> >(val);
+		const char * SPACE = " ";
+
+		int tcx = 0;
+		int scx = GetTextSize(SPACE, fnt).cx;
+
+		int cnt = v.GetCount();
+		Size isz = GridImg::Dots2().GetSize();
+		for(int i = 0; i < cnt; i++)
+		{
+			fnt.Bold((i + 1) & 1);
+			Size tsz = GetTextSize(v[i], fnt);
+			DrawText(w, nx, x + lm + tcx,
+			         ny, tcx + tsz.cx > ncx - isz.cx ? ncx - tcx: tsz.cx + isz.cx, cy,
+			         GD::VCENTER, WString(v[i]), fnt, fg, bg, found, fs, fe, false);
+			tcx += tsz.cx + scx;
+		}
+	}
+	else
+		DrawText(w, nx, nx, ny, ncx, cy, GD::VCENTER, GetStdConvertedValue(val), fnt, fg, bg, found, fs, fe, false);
+}
+
+
+void DropGrid::Paint(Draw &w, int x, int y, int cx, int cy, const Value &val, dword style, Color &fg, Color &bg, Font &fnt, bool found, int fs, int fe)
+{
+	Paint0(w, lm, rm, x, y, cx, cy, val, style, fg, bg, fnt, found, fs, fe);
+}
+
+DropGrid& DropGrid::Width(int w)
+{
+	list_width = w;
+	return *this;
+}
+
+DropGrid& DropGrid::Height(int h)
+{
+	list_height = h;
+	return *this;
+}
+
+DropGrid& DropGrid::SetKeyColumn(int n)
+{
+	key_col = find_col = n;
+	return *this;
+}
+
+DropGrid& DropGrid::SetFindColumn(int n)
+{
+	find_col = n;
+	return *this;
+}
+
+DropGrid& DropGrid::SetValueColumn(int n)
+{
+	value_col = n;
+	return *this;
+}
+
+DropGrid& DropGrid::AddValueColumn(int n)
+{
+	value_cols.Add(n);
+	return *this;
+}
+
+DropGrid& DropGrid::AddValueColumns(int first /* = -1*/, int last /* = -1*/)
+{
+	int s = first < 0 ? 0: first;
+	int e = last < 0 ? list.GetColumnCount() - 1: last;
+	for(int i = s; i <= e; i++)
+		 value_cols.Add(i);
+
+	return *this;
+}
+
+DropGrid& DropGrid::DisplayAll(bool b)
+{
+	display_all = b;
+	return *this;
+}
+
+DropGrid& DropGrid::SetDropLines(int d)
+{
+	drop_lines = d;
+	return *this;
+}
+
+DropGrid& DropGrid::Header(bool b /* = true*/)
+{
+	header = b;
+	return *this;
+}
+
+DropGrid& DropGrid::NoHeader()
+{
+	return Header(false);
+}
+
+DropGrid& DropGrid::Resizeable(bool b /* = true*/)
+{
+	list.ResizePanel(b);
+	return *this;
+}
+
+DropGrid& DropGrid::ColorRows(bool b)
+{
+	list.ColorRows(b);
+	return *this;
+}
+
+DropGrid& DropGrid::NotNull(bool b)
+{
+	notnull = b;
+	return *this;
+}
+
+DropGrid& DropGrid::ValueAsKey(bool b)
+{
+	valuekey = b;
+	return *this;
+}
+
+DropGrid& DropGrid::SetDisplay(GridDisplay &d)
+{
+	display = &d;
+	return *this;
+}
+
+DropGrid& DropGrid::FormatColumns(bool b /* = true*/)
+{
+	format_columns = b;
+	return *this;
+}
+
+DropGrid& DropGrid::DropEnter(bool b /* = true*/)
+{
+	drop_enter = b;
+	return *this;
+}
+
+DropGrid& DropGrid::DataAction(bool b /* = true*/)
+{
+	data_action = b;
+	return *this;
+}
+
+DropGrid& DropGrid::Searching(bool b /* = true*/)
+{
+	searching = b;
+	list.Searching(b);
+	return *this;
+}
+
+DropGrid& DropGrid::AlwaysDrop(bool b /* = true*/)
+{
+	always_drop = b;
+	EnableDrop();
+	return *this;
+}
+
+DropGrid& DropGrid::MustChange(bool b /* = true*/)
+{
+	must_change = b;
+	return *this;
+}
+
+DropGrid& DropGrid::NullAction(bool b /* = true*/)
+{
+	null_action = b;
+	return *this;
+}
+
+int DropGrid::GetCount() const
+{
+	return list.GetCount();
+}
+
+Value DropGrid::GetData() const
+{
+	return valuekey ? value
+	                : rowid >= 0 ? list.Get(key_col) : notnull ? NotNullError() : Null;
+}
+
+Value DropGrid::GetValue() const
+{
+	return value;
+}
+
+Value DropGrid::GetValue(int r) const
+{
+	return MakeValue(r);
+}
+
+Value DropGrid::FindValue(const Value& v) const
+{
+	int r = list.Find(v, key_col);
+	if(r < 0)
+		return Null;
+
+	return MakeValue(r);
+}
+
+Vector<String> DropGrid::FindVector(const Value& v) const
+{
+	int r = list.Find(v, key_col);
+	if(r < 0)
+		return Vector<String>();
+
+	return MakeVector(r);
+}
+
+Value DropGrid::GetKey() const
+{
+	return rowid >= 0 ? list.Get(key_col) : Null;
+}
+
+void DropGrid::UpdateValue()
+{
+	if(!list.IsCursor())
+		return;
+
+	value = MakeValue();
+}
+
+void DropGrid::SetData(const Value& v)
+{
+	int row = list.Find(v, key_col);
+	if(row >= 0)
+	{
+		list.SetCursor(row);
+		UpdateValue();
+		DoAction(row, data_action, false);
+		Refresh();
+	}
+	else
+		ClearValue();
+}
+
+void DropGrid::DoAction(int row, bool action, bool chg)
+{
+	int rid = list.GetRowId(row);
+	if(rid != (trowid >= -1 ? trowid : rowid))
+	{
+		change = chg;
+		rowid = rid;
+		trowid = -2;
+		if(action)
+			UpdateAction();
+	}
+}
+
+GridCtrl::ItemRect& DropGrid::AddColumn(const char *name, int width, bool idx)
+{
+	return list.AddColumn(name, width, idx);
+}
+
+GridCtrl::ItemRect& DropGrid::AddColumn(Id id, const char *name, int width, bool idx)
+{
+	return list.AddColumn(id, name, width, idx);
+}
+
+GridCtrl::ItemRect& DropGrid::AddIndex(const char *name)
+{
+	return list.AddIndex(name);
+}
+
+GridCtrl::ItemRect& DropGrid::AddIndex(Id id)
+{
+	return list.AddIndex(id);
+}
+
+MultiButton::SubButton& DropGrid::AddButton(int type, const Callback &cb)
+{
+	MultiButton::SubButton& btn = drop.InsertButton(1);
+	switch(type)
+	{
+		case BTN_PLUS:
+			btn.SetImage(GridImg::SelPlus);
+			break;
+		case BTN_SELECT:
+			btn.SetImage(GridImg::SelDots);
+			break;
+		case BTN_LEFT:
+			btn.SetImage(GridImg::SelLeft);
+			break;
+		case BTN_RIGHT:
+			btn.SetImage(GridImg::SelRight);
+			break;
+		case BTN_UP:
+			btn.SetImage(GridImg::SelUp);
+			break;
+		case BTN_DOWN:
+			btn.SetImage(GridImg::SelDn);
+			break;
+	}
+	btn.WhenPush = cb;
+	return btn;
+}
+
+MultiButton::SubButton& DropGrid::AddSelect(const Callback &cb)
+{
+	return AddButton(BTN_SELECT, cb);
+}
+
+MultiButton::SubButton& DropGrid::AddPlus(const Callback &cb)
+{
+	return AddButton(BTN_PLUS, cb);
+}
+
+MultiButton::SubButton& DropGrid::AddEdit(const Callback &cb)
+{
+	return AddButton(BTN_RIGHT, cb);
+}
+
+MultiButton::SubButton& DropGrid::GetButton(int n)
+{
+	return drop.GetButton(n);
+}
+
+void DropGrid::ClearValue()
+{
+	change = false;
+	value = Null;
+	rowid = -1;
+	list.ClearCursor();
+	if(null_action)
+		UpdateActionRefresh();
+	else
+		UpdateRefresh();
+}
+
+void DropGrid::Reset()
+{
+	list.Reset();
+	ClearValue();
+	value_cols.Clear();
+	EnableDrop(always_drop);
+}
+
+void DropGrid::Clear()
+{
+	list.Clear();
+	ClearValue();
+	EnableDrop(always_drop);
+}
+
+Value DropGrid::Get(int c) const
+{
+	return list.Get(c);
+}
+
+Value DropGrid::Get(Id id) const
+{
+	return list.Get(id);
+}
+
+Value DropGrid::Get(int r, int c) const
+{
+	return list.Get(r, c);
+}
+
+Value DropGrid::Get(int r, Id id) const
+{
+	return list.Get(r, id);
+}
+
+void DropGrid::Set(int c, const Value& v)
+{
+	list.Set(c, v);
+}
+
+void DropGrid::Set(Id id, const Value& v)
+{
+	list.Set(id, v);
+}
+
+void DropGrid::Set(int r, int c, const Value& v)
+{
+	list.Set(r, c, v);
+}
+
+void DropGrid::Set(int r, Id id, const Value& v)
+{
+	list.Set(r, id, v);
+}
+
+void DropGrid::Set(int r, const Vector<Value> &v, int data_offset, int column_offset)
+{
+	list.Set(r, v, data_offset, column_offset);
+}
+
+void DropGrid::Add(const Vector<Value> &v, int data_offset, int column_offset)
+{
+	list.AddRow();
+	list.Set(v, data_offset, column_offset);
+	EnableDrop(always_drop);
+}
+
+Value& DropGrid::operator() (int r, int c)
+{
+	return list(r, c);
+}
+
+Value& DropGrid::operator() (int c)
+{
+	return list(c);
+}
+
+Value& DropGrid::operator() (Id id)
+{
+	return list(id);
+}
+
+Value& DropGrid::operator() (int r, Id id)
+{
+	return list(r, id);
+}
+
+GridCtrl::ItemRect& DropGrid::GetRow(int r)
+{
+	return list.GetRow(r);
+}
+
+int DropGrid::Find(const Value& v, int col, int opt)
+{
+	return list.Find(v, col, 0, opt);
+}
+
+int DropGrid::Find(const Value& v, Id id, int opt)
+{
+	return list.Find(v, id, opt);
+}
+
+int DropGrid::GetCurrentRow() const
+{
+	return list.GetCurrentRow();
+}
+
+void DropGrid::CancelUpdate()
+{
+	int prevrow = list.GetPrevCursor();
+	if(prevrow >= 0)
+	{
+		list.SetCursor(prevrow);
+		UpdateValue();
+		rowid = list.GetRowId(prevrow);
+		Refresh();
+	}
+	else
+		ClearValue();
+}
+
+void DropGrid::Change(int dir)
+{
+	int c = -1;
+	if(!list.IsCursor())
+	{
+		if(dir < 0)
+			list.GoEnd();
+		else
+			list.GoBegin();
+
+		c = list.GetCursor();
+	}
+	else
+		c = list.GetCursor() + dir;
+
+	if(list.IsValidCursor(c))
+	{
+		list.SetCursor(c);
+		UpdateValue();
+		DoAction(c);
+	}
+
+	Refresh();
+}
+
+void DropGrid::SearchCursor()
+{
+	if(trowid < -1)
+		trowid = rowid;
+	value = list.Get(value_col);
+	rowid = list.GetRowId();
+	Refresh();
+}
+
+bool DropGrid::Key(dword k, int)
+{
+	if(IsReadOnly()) return false;
+
+	if(drop_enter && k == K_ENTER)
+		k = K_ALT_DOWN;
+
+	switch(k)
+	{
+		case K_ALT_DOWN:
+			Drop();
+			break;
+		case K_DOWN:
+		case K_RIGHT:
+			Change(1);
+			break;
+		case K_UP:
+		case K_LEFT:
+			Change(-1);
+			break;
+		case K_DELETE:
+			ClearValue();
+			break;
+		default:
+			if(searching && k >= 32 && k < 65536)
+			{
+				if(!list.IsOpen())
+					Drop();
+				list.Search(k);
+			}
+			return false;
+	}
+	return true;
+}
+
+int DropGrid::AddColumns(int cnt)
+{
+	if(!list.GetColumnCount())
+	{
+		if(cnt <= 2)
+		{
+			NoHeader();
+			Resizeable(false);
+		}
+		if(cnt == 1)
+		{
+			list.AddColumn();
+			key_col = value_col = 0;
+		}
+		else if(cnt == 2)
+		{
+			list.AddIndex();
+			list.AddColumn();
+			key_col = 0;
+			value_col = 1;
+		}
+		else
+			for(int i = 0; i < cnt; i++)
+				list.AddColumn();
+	}
+	return list.GetCount();
+}
+
+void DropGrid::GoTop()
+{
+	if(list.IsFilled())
+		SetIndex(0);
+}
+
+int DropGrid::SetIndex(int n)
+{
+	int r = rowid;
+	n = list.GetRowId(n);
+	if(n >= 0)
+	{
+		list.SetCursor(n);
+		UpdateValue();
+		DoAction(n);
+	}
+	return r;
+}
+
+int DropGrid::GetIndex() const
+{
+	return rowid;
+}
+
+bool DropGrid::IsSelected()
+{
+	return rowid >= 0;
+}
+
+bool DropGrid::IsEmpty()
+{
+	return list.IsEmpty();
+}
+
+bool DropGrid::IsChange()
+{
+	return change;
+}
+
+bool DropGrid::IsInit()
+{
+	return !change;
+}
+
+Vector<String> DropGrid::MakeVector(int r) const
+{
+	Vector<String> v;
+	int cnt = value_cols.GetCount();
+	int fc = list.GetFixedColumnCount();
+	if(cnt > 0)
+	{
+		for(int i = 0; i < cnt; i++)
+		{
+			Value val = list.Get(r, value_cols[i]);
+			if(IsNull(val))
+				continue;
+			v.Add(list.GetColumnName(value_cols[i]));
+			v.Add(list.GetStdConvertedColumn(value_cols[i] + fc, val));
+		}
+	}
+	return v;
+}
+
+Value DropGrid::MakeValue(int r, bool columns) const
+{
+	if(r < 0)
+		r = list.GetCursor();
+
+	if(r < 0)
+		return Null;
+
+	int cnt = value_cols.GetCount();
+	if(cnt > 0)
+	{
+		String v;
+		int fc = list.GetFixedColumnCount();
+		for(int i = 0; i < cnt; i++)
+		{
+			Value val = list.Get(r, value_cols[i]);
+			if(IsNull(val))
+				continue;
+			if(columns)
+			{
+				v += list.GetColumnName(value_cols[i]);
+				v += ' ';
+			}
+			v += list.GetStdConvertedColumn(value_cols[i] + fc, val);
+			v += ' ';
+		}
+		return v;
+	}
+	else
+		return list.Get(r, value_col);
+}
+
+Value DropGrid::Format0(const Value& q, int rowid) const
+{
+	int r = rowid >= 0 ? list.FindRow(rowid) : list.Find(q, key_col);
+	if(r < 0)
+		return Null;
+
+	if(value_cols.GetCount() > 0)
+		return RawPickToValue< Vector<String> >(MakeVector(r));
+	else
+		return list.GetConvertedColumn(value_col + list.GetFixedColumnCount(), list.Get(r, value_col));
+}
+
+Value DropGrid::Format(const Value& q) const
+{
+	return Format0(q, -1);
+}
+
+void DropGrid::EnableDrop(bool b)
+{
+	if(IsEnabled() == b)
+		return;
+	Enable(b);
+}
+
+GridCtrl::ItemRect& DropGrid::AddRow(int n, int size)
+{
+	EnableDrop(always_drop);
+	return list.AddRow(n, size);
+}
+
+DropGrid& DropGrid::AddSeparator(Color c)
+{
+	list.AddSeparator(c);
+	return *this;
+}
+
+#define E__Addv0(I)    list.Set(q, I - 1, p##I)
+#define E__AddF0(I) \
+DropGrid& DropGrid::Add(__List##I(E__Value)) { \
+	EnableDrop(true); \
+	int q = AddColumns(I); \
+	__List##I(E__Addv0); \
+	return *this; \
+}
+__Expand(E__AddF0)
+
+#define E__Addv1(I)    list.Set(q, I - 1, p##I)
+#define E__AddF1(I) \
+GridCtrl::ItemRect& DropGrid::AddRow(__List##I(E__Value)) { \
+	EnableDrop(true); \
+	int q = AddColumns(I); \
+	GridCtrl::ItemRect& ir = list.AddRow(); \
+	__List##I(E__Addv1); \
+	return ir; \
+}
+__Expand(E__AddF1)
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/DropGrid/DropGrid.h b/uppsrc/DropGrid/DropGrid.h
new file mode 100644
index 000000000..0cc4cbd60
--- /dev/null
+++ b/uppsrc/DropGrid/DropGrid.h
@@ -0,0 +1,219 @@
+#ifndef _DropGrid_DropGrid_h_
+#define _DropGrid_DropGrid_h_
+
+#include <CtrlLib/CtrlLib.h>
+#include <GridCtrl/GridCtrl.h>
+
+NAMESPACE_UPP
+
+class DropGrid : public Convert, public GridDisplay, public Ctrl
+{
+	public:
+		enum
+		{
+			BTN_SELECT,
+			BTN_LEFT,
+			BTN_RIGHT,
+			BTN_UP,
+			BTN_DOWN,
+			BTN_PLUS
+		};
+	private:
+		class PopUpGrid : public GridCtrl
+		{
+			private:
+
+				void CloseNoData();
+				void CloseData();
+
+			public:
+				Callback WhenPopDown;
+				Callback WhenClose;
+				Callback WhenCloseData;
+				Callback WhenCloseNoData;
+
+				typedef PopUpGrid CLASSNAME;
+
+				virtual void Deactivate();
+				void PopUp(Ctrl *owner, const Rect &r);
+
+				PopUpGrid();
+		};
+
+	protected:
+
+		int key_col;
+		int find_col;
+		int value_col;
+		Vector<int> value_cols;
+		PopUpGrid list;
+		MultiButtonFrame drop;
+
+	private:
+		int rowid;
+		int trowid;
+		Value value;
+		bool change;
+
+		int list_width;
+		int list_height;
+		int drop_lines;
+
+		bool display_all:1;
+		bool header:1;
+		bool valuekey:1;
+		bool notnull:1;
+		bool format_columns:1;
+		bool drop_enter:1;
+		bool data_action:1;
+		bool searching:1;
+		bool always_drop:1;
+		bool must_change:1;
+		bool null_action:1;
+
+		GridDisplay *display;
+
+		void Change(int dir);
+		void SearchCursor();
+		void DoAction(int row, bool action = true, bool chg = true);
+		Vector<String> MakeVector(int r) const;
+		Value MakeValue(int r = -1, bool columns = true) const;
+		void UpdateValue();
+		Value Format0(const Value& q, int rowid) const;
+		void EnableDrop(bool b = true);
+
+	public:
+
+		typedef DropGrid CLASSNAME;
+		DropGrid();
+
+		void Close();
+		void CloseData();
+		void CloseNoData();
+		void Drop();
+
+		DropGrid& Width(int w);
+		DropGrid& Height(int h);
+		DropGrid& SetKeyColumn(int n);
+		DropGrid& SetFindColumn(int n);
+		DropGrid& SetValueColumn(int n);
+		DropGrid& AddValueColumn(int n);
+		DropGrid& AddValueColumns(int first = -1, int last = -1);
+		DropGrid& DisplayAll(bool b = true);
+		DropGrid& SetDropLines(int d);
+		DropGrid& Header(bool b = true);
+		DropGrid& NoHeader();
+		DropGrid& Resizeable(bool b = true);
+		DropGrid& ColorRows(bool b = true);
+		DropGrid& NotNull(bool b = true);
+		DropGrid& ValueAsKey(bool b = true);
+		DropGrid& SetDisplay(GridDisplay &d);
+		DropGrid& FormatColumns(bool b = true);
+		DropGrid& DropEnter(bool b = true);
+		DropGrid& DataAction(bool b = true);
+		DropGrid& Searching(bool b = true);
+		DropGrid& AlwaysDrop(bool b = true);
+		DropGrid& MustChange(bool b = true);
+		DropGrid& NullAction(bool b = true);
+
+		GridCtrl::ItemRect& AddColumn(const char *name, int width = GridCtrl::GD_COL_WIDTH, bool idx = false);
+		GridCtrl::ItemRect& AddColumn(Id id, const char *name, int width = GridCtrl::GD_COL_WIDTH, bool idx = false);
+		GridCtrl::ItemRect& AddIndex(const char *name = NULL);
+		GridCtrl::ItemRect& AddIndex(Id id);
+
+		MultiButton::SubButton& AddButton(int type, const Callback &cb);
+		MultiButton::SubButton& AddSelect(const Callback &cb);
+		MultiButton::SubButton& AddPlus(const Callback &cb);
+		MultiButton::SubButton& AddEdit(const Callback &cb);
+
+		MultiButton::SubButton& GetButton(int n);
+
+		int AddColumns(int cnt);
+
+		void GoTop();
+
+		int SetIndex(int n);
+		int GetIndex() const;
+
+		int GetCount() const;
+
+		void Reset();
+		void Clear();
+		void ClearValue();
+
+		virtual Value GetData() const;
+		virtual void SetData(const Value& v);
+
+		Value GetValue() const;
+		Value GetValue(int r) const;
+		Value FindValue(const Value& v) const;
+		Vector<String> FindVector(const Value& v) const;
+		Value GetKey() const;
+
+		virtual bool Key(dword k, int);
+		virtual void Paint(Draw& draw);
+		virtual void LeftDown(Point p, dword keyflags);
+		virtual void GotFocus();
+		virtual void LostFocus();
+		virtual void Serialize(Stream& s);
+		virtual bool Accept();
+		virtual Size GetMinSize() const;
+
+		void Paint0(Draw &w, int lm, int rm, int x, int y, int cx, int cy, const Value &val, dword style, Color &fg, Color &bg, Font &fnt, bool found = false, int fs = 0, int fe = 0);
+		virtual void Paint(Draw &w, int x, int y, int cx, int cy, const Value &val, dword style, Color &fg, Color &bg, Font &fnt, bool found = false, int fs = 0, int fe = 0);
+
+		Value Get(int c) const;
+		Value Get(Id id) const;
+		Value Get(int r, int c) const;
+		Value Get(int r, Id id) const;
+		void  Set(int c, const Value& v);
+		void  Set(Id id, const Value& v);
+		void  Set(int r, int c, const Value& v);
+		void  Set(int r, Id id, const Value& v);
+		void  Set(int r, const Vector<Value> &v, int data_offset = 0, int column_offset = 0);
+		void  Add(const Vector<Value> &v, int data_offset = 0, int column_offset = 0);
+
+		Value& operator() (int r, int c);
+		Value& operator() (int c);
+		Value& operator() (Id id);
+		Value& operator() (int r, Id id);
+
+		GridCtrl::ItemRect& GetRow(int r);
+
+		bool IsSelected();
+		bool IsEmpty();
+		bool IsChange();
+		bool IsInit();
+
+		int Find(const Value& v, int col = 0, int opt = 0);
+		int Find(const Value& v, Id id, int opt = 0);
+		int GetCurrentRow() const;
+
+		void CancelUpdate();
+
+		GridCtrl& GetList() { return list; }
+
+		virtual Value Format(const Value& q) const;
+
+		GridCtrl::ItemRect& AddRow(int n = 1, int size = GridCtrl::GD_ROW_HEIGHT);
+		DropGrid& Add() { AddRow(); return *this; }
+
+		//$-DropCtrl& Add(const Value& [, const Value& ]...);
+		#define  E__Add(I)      DropGrid& Add(__List##I(E__Value));
+			__Expand(E__Add)
+		#undef   E__Add
+		//$+
+
+		//$-GridCtrl::ItemRect& Add(const Value& [, const Value& ]...);
+		#define  E__Add(I)      GridCtrl::ItemRect& AddRow(__List##I(E__Value));
+			__Expand(E__Add)
+		#undef   E__Add
+		//$+
+
+		DropGrid& AddSeparator(Color c);
+
+};
+
+END_UPP_NAMESPACE
+
+#endif
diff --git a/uppsrc/DropGrid/DropGrid.upp b/uppsrc/DropGrid/DropGrid.upp
new file mode 100644
index 000000000..9bfd221a6
--- /dev/null
+++ b/uppsrc/DropGrid/DropGrid.upp
@@ -0,0 +1,14 @@
+description "DropGrid";
+
+uses
+	CtrlLib,
+	GridCtrl;
+
+file
+	DropGrid.h,
+	DropGrid.cpp,
+	DropGrid.usc,
+	main.cpp;
+
+mainconfig
+	"" = "GUI";
diff --git a/uppsrc/DropGrid/DropGrid.usc b/uppsrc/DropGrid/DropGrid.usc
new file mode 100644
index 000000000..fdb5d7b4e
--- /dev/null
+++ b/uppsrc/DropGrid/DropGrid.usc
@@ -0,0 +1,32 @@
+ctrl DropGrid {
+	group "Input fields";
+
+	GetMinSize() { sz = GetTextSize("X"); sz.cy += 6; return sz; }
+	GetStdSize() { sz = GetMinSize(); sz.cx *= 8; return sz; }
+
+	Frame SetFrame = InsetFrame();
+	bool  WantFocus = true;
+	bool  DisplayAll = false;
+	bool  NoHeader = false;
+	bool  Resizeable = true;
+	bool  ColorRows = false;
+	bool  DataAction = false;
+	bool  AlwaysDrop = false;
+	bool  DropEnter = false;
+	bool  Searching = true;
+	bool  NotNull = false;
+	bool  SetEditable = true @2 ? "Editable";
+
+	Text  Tip;
+
+	Paint(w) {
+		r = GetRect();
+		DrawCtrlFrame(w, r, .SetFrame);
+		w.DrawRect(r, :SWhite);
+		n = r.bottom - r.top;
+		DrawEdgeButton(w, RectC(r.right - n, r.top, n, n));
+		w.DrawImage((n - 7) / 2 + r.right - n, (n - 6) / 2 + r.top, "ClassicCtrlsImg::DA");
+		w.DrawText(3, (GetSize().cy - GetTextSize("", Arial(10)).cy) / 2,
+			(.SetEditable ? "" : "R/O ") + "DropGrid", Arial(10), :SMagenta);
+	}
+}
diff --git a/uppsrc/DropGrid/main.cpp b/uppsrc/DropGrid/main.cpp
new file mode 100644
index 000000000..6052be799
--- /dev/null
+++ b/uppsrc/DropGrid/main.cpp
@@ -0,0 +1,63 @@
+#include <CtrlLib/CtrlLib.h>
+#include <GridCtrl/GridCtrl.h>
+#include <DropGrid/DropGrid.h>
+
+using namespace Upp;
+
+struct App : public TopWindow
+{
+	DropGrid drop, dg;
+	DropList classic_drop, dl;
+	GridCtrl grid;
+	ArrayCtrl array;
+
+	App()
+	{
+		//CtrlLayout(*this, "DropGrid");
+		Sizeable().Zoomable();
+		Title("DropGrid");
+
+		dl.Add("Item 0").Add("Item 1").Add("Item 2");
+		dg.Add("Item 0").Add("Item 1").Add("Item 2");
+
+		//Add(drop.LeftPos(20, 150).TopPos(20, 19));
+		Add(grid.LeftPos(20, 300).TopPos(100, 150));
+		Add(array.LeftPos(350, 300).TopPos(100, 150));
+
+//		array.AddColumn("Col 0").Edit(dg);
+//		array.AddColumn("Col 1").Edit(dl);
+		//array.AddColumn("Col 2").Option();
+		array.Appending();
+		grid.Searching();
+
+//		grid.AddColumn("Col 0").Edit(dg);
+//		grid.AddColumn("Col 1").Edit(dl);
+//		grid.AddColumn("Col 2").Option();
+		grid.Appending();
+
+		drop.AddColumn("ID");
+		drop.AddColumn("Value");
+		drop.AddColumn("Description");
+		for(int i = 0; i < 20; i++)
+			drop.Add(i, Format("Hello %d", i), "How are you now?");
+
+		drop.Width(300);
+		drop.DisplayAll(0);/*NoHeader(0)*///NotNull();
+		drop.ColorRows();
+		//drop.NotNull();
+		drop.SetDropLines(15);
+		drop.SetValueColumn(1);
+		drop.AddValueColumn(0).AddValueColumn(1);
+		Add(classic_drop.LeftPos(20, 150).TopPos(60, 19));
+		classic_drop.Add("ALA").Add("ELA").Add("BABA");
+	}
+};
+
+#ifdef flagMAIN
+
+GUI_APP_MAIN
+{
+	App().Run();
+}
+
+#endif
diff --git a/uppsrc/Esc/AUTHORS b/uppsrc/Esc/AUTHORS
new file mode 100644
index 000000000..f782e5b62
--- /dev/null
+++ b/uppsrc/Esc/AUTHORS
@@ -0,0 +1,2 @@
+Mirek Fidler <cxl@ntllib.org>
+Tomas Rylek  <rylek@volny.cz>
\ No newline at end of file
diff --git a/uppsrc/Esc/COPYING b/uppsrc/Esc/COPYING
new file mode 100644
index 000000000..33aa39102
--- /dev/null
+++ b/uppsrc/Esc/COPYING
@@ -0,0 +1,30 @@
+Copyright (C) 2005 Mirek Fidler, Tomas Rylek and various contributors (see AUTHORS)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to
+deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies of the Software and its Copyright notices. In addition publicly
+documented acknowledgment must be given that this software has been used if no
+source code of this software is made available publicly. This includes
+acknowledgments in either Copyright notices, Manuals, Publicity and Marketing
+documents or any documentation provided with any product containing this
+software. This License does not apply to any software that links to the
+libraries provided by this software (statically or dynamically), but only to
+the software provided.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+-----------
+
+Please see the COPYING.PLAIN for a plain-english explanation of this notice
+and it's intent.
diff --git a/uppsrc/Esc/COPYING-PLAIN b/uppsrc/Esc/COPYING-PLAIN
new file mode 100644
index 000000000..770a8132f
--- /dev/null
+++ b/uppsrc/Esc/COPYING-PLAIN
@@ -0,0 +1,33 @@
+Plain English Copyright Notice
+
+This file is not intended to be the actual License. The reason this file
+exists is that we here are programmers and engineers. We aren't lawyers. We
+provide licenses that we THINK say the right things, but we have our own
+intentions at heart. This is a plain-english explanation of what those
+intentions are, and if you follow them you will be within the "spirit" of
+the license.
+
+The intent is for us to enjoy writing software that is useful to us (the
+AUTHORS) and allow others to use it freely and also benefit from the work we
+put into making it. We don't want to restrict others using it. They should
+not *HAVE* to make the source code of the applications they write that
+simply link to these libraries (be that statically or dynamically), or for
+them to be limited as to what license they choose to use (be it open, closed
+or anything else). But we would like to know you are using these libraries.
+We simply would like to know that it has been useful to someone. This is why
+we ask for acknowledgement of some sort.
+
+You can do what you want with the source of this software - it doesn't
+matter. We still have it here for ourselves and it is open and free to use
+and download and play with. It can't be taken away. We don't really mind what
+you do with the source to your software. We would simply like to know that
+you are using it - especially if it makes it to a commerical product. If you
+simply e-mail all the AUTHORS (see COPYING and AUTHORS files) telling us, and
+then make sure you include a paragraph or page in the manual or in the "About.."
+box for the product with the copyright notice and state that you used this
+software, we will be very happy. If you want to contribute back modifications
+and fixes you may have made we will welcome those too with open arms (generally).
+If you want help with changes needed, ports needed or features to be added,
+arrangements can be easily made with some dialogue.
+
+Mirek Fidler <cxl@ntllib.org>
diff --git a/uppsrc/Esc/Esc.cpp b/uppsrc/Esc/Esc.cpp
new file mode 100644
index 000000000..d9fdba214
--- /dev/null
+++ b/uppsrc/Esc/Esc.cpp
@@ -0,0 +1,1201 @@
+#include <Esc/Esc.h>
+
+
+NAMESPACE_UPP
+
+#ifdef _MSC_VER
+#pragma inline_depth(255)
+#pragma optimize("t", on)
+#endif
+
+#define LTIMING(x)  // RTIMING(x)
+
+void Esc::OutOfMemory()
+{
+	ThrowError("Out of memory");
+}
+
+void Esc::TestLimit()
+{
+	if(!IsNull(op_limit))
+		if(op_limit < 0)
+			ThrowError("out of operations limit - considered frozen");
+	if(EscValue::GetTotalCount() >= EscValue::GetMaxTotalCount())
+		OutOfMemory();
+}
+
+EscValue Esc::Get(const SRVal& val)
+{
+	LTIMING("Get");
+	if(skipexp)
+		return 1;
+	EscValue v = val.lval ? *val.lval : val.rval;
+	if(val.sbs.IsArray()) {
+		const Vector<EscValue>& sbs = val.sbs.GetArray();
+		for(int i = 0; i < sbs.GetCount(); i++) {
+			const EscValue& ss = sbs[i];
+			if(v.IsMap()) //!!!! (problem with a[1, 2]
+				v = v.MapGet(ss);
+			else
+			if(v.IsArray()) {
+				int count = v.GetCount();
+				if(ss.IsArray()) {
+					EscValue v1 = ss.ArrayGet(0);
+					EscValue v2 = ss.ArrayGet(1);
+					int i = v1.IsInt() ? v1.GetInt() : 0;
+					int n = count - i;
+					if(ss.GetCount() == 2)
+						n = v2.IsInt() ? v2.GetInt() : n;
+					else {
+						if(v2.IsInt()) {
+							n = v2.GetInt();
+							if(n < 0)
+								n += count;
+							n -= i;
+						}
+					}
+					if(i >= 0 && n >= 0 && i + n <= count)
+						v = v.ArrayGet(i, n);
+					else
+						ThrowError("slice out of range");
+				}
+				else {
+					int i = Int(ss, "index");
+					if(i < 0)
+						i += count;
+					if(i >= 0 && i < count)
+						v = v.ArrayGet(i);
+					else
+						ThrowError("index out of range");
+				}
+			}
+			else
+				ThrowError("invalid indirection");
+			TestLimit();
+		}
+	}
+	return v;
+}
+
+void Esc::Assign(EscValue& val, const Vector<EscValue>& sbs, int si, const EscValue& src)
+{
+	LTIMING("Assign");
+	const EscValue& ss = sbs[si++];
+	if(val.IsVoid())
+		val.SetEmptyMap();
+	if(val.IsMap()) {
+		if(si < sbs.GetCount()) {
+			EscValue x = val.MapGet(ss);
+			val.MapSet(ss, 0.0);
+			Assign(x, sbs, si, src);
+			val.MapSet(ss, x);
+		}
+		else
+			val.MapSet(ss, src);
+		return;
+	}
+	else
+	if(val.IsArray()) {
+		if(si < sbs.GetCount()) {
+			if(ss.IsArray())
+				ThrowError("slice must be last subscript");
+			int i = Int(ss, "index");
+			if(i >= 0 && i < val.GetCount()) {
+				EscValue x = val.ArrayGet(i);
+				val.ArraySet(i, 0.0);
+				Assign(x, sbs, si, src);
+				if(!val.ArraySet(i, x))
+					OutOfMemory();
+				return;
+			}
+		}
+		else {
+			int count = val.GetCount();
+			if(ss.IsArray()) {
+				if(!src.IsArray())
+					ThrowError("only array can be assigned to the slice");
+				EscValue v1 = ss.ArrayGet(0);
+				EscValue v2 = ss.ArrayGet(1);
+				int i = v1.IsInt() ? v1.GetInt() : 0;
+				int n = count - i;
+				if(ss.GetCount() == 2)
+					n = v2.IsInt() ? v2.GetInt() : n;
+				else {
+					if(v2.IsInt()) {
+						n = v2.GetInt();
+						if(n < 0)
+							n += count;
+						n -= i;
+					}
+				}
+				if(i >= 0 && n >= 0 && i + n <= count) {
+					val.Replace(i, n, src);
+					return;
+				}
+				else
+					ThrowError("slice out of range");
+			}
+			else {
+				int i = ss.IsVoid() ? val.GetCount() : Int(ss, "index");
+				if(i < 0)
+					i = count + i;
+				if(i >= 0) {
+					if(!val.ArraySet(i, src))
+						ThrowError("out of memory");
+					return;
+				}
+			}
+		}
+	}
+	ThrowError("invalid indirection");
+}
+
+void Esc::Assign(const SRVal& val, const EscValue& src)
+{
+	if(skipexp)
+		return;
+	if(!val.lval)
+		ThrowError("l-value required");
+	if(val.sbs.IsArray() && val.sbs.GetCount())
+		Assign(*val.lval, val.sbs.GetArray(), 0, src);
+	else
+		*val.lval = src;
+}
+
+EscValue Esc::ExecuteLambda(const String& id, EscValue lambda, SRVal self, Vector<SRVal>& arg)
+{
+	LTIMING("ExecuteLambda");
+	if(!lambda.IsLambda())
+		ThrowError(NFormat("'%s' is not a lambda", id));
+	const EscLambda& l = lambda.GetLambda();
+	if(!l.varargs && arg.GetCount() > l.arg.GetCount()
+	   || arg.GetCount() < l.arg.GetCount() - l.def.GetCount())
+		ThrowError("invalid number of arguments in call to '" + id + "'");
+	Esc sub(global, l.code, op_limit, l.filename, l.line);
+	sub.self = Get(self);
+	for(int i = 0; i < l.arg.GetCount(); i++) {
+		sub.var.GetAdd(l.arg[i]) =
+			i < arg.GetCount() ? Get(arg[i])
+		                       : Evaluatex(l.def[i - (l.arg.GetCount() - l.def.GetCount())], global, op_limit);
+		TestLimit();
+	}
+	EscValue retval;
+	Array<EscValue> argvar;
+	if(l.escape) {
+		argvar = sub.var.PickValues();
+		for(int i = l.arg.GetCount(); i < arg.GetCount(); i++) {
+			argvar.Add(Get(arg[i]));
+		}
+		EscValue v = Get(self);
+		EscEscape e(*this, v, argvar);
+		e.id = id;
+		l.escape(e);
+		retval = e.ret_val;
+		self = e.self;
+	}
+	else {
+		if(l.varargs) {
+			EscValue& argv = sub.var.GetAdd("argv");
+			argv.SetEmptyArray();
+			for(int i = l.arg.GetCount(); i < arg.GetCount(); i++)
+				argv.ArrayAdd(Get(arg[i]));
+		}
+		sub.Run();
+		retval = sub.return_value;
+		argvar = sub.var.PickValues();
+	}
+	for(int i = 0; i < l.inout.GetCount(); i++)
+		if(l.inout[i] && i < arg.GetCount() && arg[i].lval)
+			Assign(arg[i], argvar[i]);
+	if(self.lval)
+		Assign(self, sub.self);
+	return retval;
+}
+
+void Esc::Subscript(Esc::SRVal& r, Esc::SRVal _self, String id)
+{
+	LTIMING("Subscript");
+	for(;;) {
+		TestLimit();
+		if(Char('['))
+			if(Char(']'))
+				r.sbs.ArrayAdd(EscValue());
+			else {
+				EscValue v1, v2;
+				if(!IsChar(',') && !IsChar(':'))
+					v1 = GetExp();
+				if(Char(',')) {
+					if(!IsChar(']'))
+						v2 = GetExp();
+					EscValue x;
+					x.ArrayAdd(v1);
+					x.ArrayAdd(v2);
+					r.sbs.ArrayAdd(x);
+				}
+				else
+				if(Char(':')) {
+					if(!IsChar(']'))
+						v2 = GetExp();
+					EscValue x;
+					x.ArrayAdd(v1);
+					x.ArrayAdd(v2);
+					x.ArrayAdd(EscValue());
+					r.sbs.ArrayAdd(x);
+				}
+				else
+					r.sbs.ArrayAdd(v1);
+				PassChar(']');
+			}
+		else
+		if(Char('.')) {
+			_self = r;
+			r.sbs.ArrayAdd(id = ReadId());
+		}
+		else
+		if(Char('(')) {
+			LTIMING("call fn");
+			Vector<SRVal> arg;
+			if(!Char(')'))
+				for(;;) {
+					LTIMING("make args");
+					Exp(arg.Add());
+					if(Char(')')) break;
+					PassChar(',');
+				}
+			if(!IsChar2('!', '=') && Char('!')) {
+				Term(_self);
+				EscValue g = Get(_self);
+				if(!_self.lval || (!g.IsVoid() && !g.IsMap()))
+					ThrowError("l-value map or l-value void expected on the right side of !");
+				if(g.IsVoid()) {
+					EscValue v;
+					v.SetEmptyMap();
+					Assign(_self, v);
+				}
+			}
+			if(!skipexp)
+				try {
+					r = ExecuteLambda(id, Get(r), _self, arg);
+				}
+				catch(Exc e) {
+					throw Error(NFormat("%s.%s(): %s", Get(r).GetTypeName(), id, e));
+				}
+		}
+		else
+			return;
+	}
+}
+
+void Esc::Subscript(Esc::SRVal& r)
+{
+	Subscript(r, SRVal(), String());
+}
+
+void Esc::Term(SRVal& r)
+{
+	LTIMING("Term");
+
+	r.sbs = EscValue();
+
+	op_limit--;
+	TestLimit();
+	if(Char2('0', 'x') || Char2('0', 'X')) {
+		r = ReadNumber(16);
+		return;
+	}
+	if(Char2('0', 'b') || Char2('0', 'B')) {
+		r = ReadNumber(2);
+		return;
+	}
+	if(IsChar2('0', '.')) {
+		r = ReadDouble();
+		return;
+	}
+	if(Char('0')) {
+		r = IsNumber() ? ReadNumber(8) : 0;
+		return;
+	}
+	if(IsNumber()) {
+		r = ReadDouble();
+		return;
+	}
+	if(IsString()) {
+		r = EscValue(FromUtf8(ReadString()));
+		return;
+	}
+	if(IsChar('\'')) {
+		WString s = FromUtf8(ReadString('\''));
+		if(s.GetLength() != 1)
+			ThrowError("invalid character literal");
+		r = s[0];
+		return;
+	}
+	if(Char('@')) {
+		r = ReadLambda(*this);
+		Subscript(r);
+		return;
+	}
+	if(Id("void")) {
+		r = EscValue();
+		return;
+	}
+	if(Char('{')) {
+		EscValue map;
+		map.SetEmptyMap();
+		if(!Char('}'))
+			for(;;) {
+				EscValue v = GetExp();
+				PassChar(':');
+				map.MapSet(v, GetExp());
+				if(Char('}'))
+					break;
+				PassChar(',');
+				TestLimit();
+			}
+		r = map;
+		Subscript(r);
+		return;
+	}
+	if(Char('[')) {
+		EscValue array;
+		array.SetEmptyArray();
+		if(!Char(']'))
+			for(;;) {
+				array.ArrayAdd(GetExp());
+				if(Char(']'))
+					break;
+				PassChar(',');
+				TestLimit();
+			}
+		r = array;
+		Subscript(r);
+		return;
+	}
+	if(Char('(')) {
+		Exp(r);
+		PassChar(')');
+		Subscript(r);
+		return;
+	}
+	SRVal _self;
+	bool  _global = false;
+	if(Char('.')) {
+		if(!self.IsMap())
+			ThrowError("member-access in non-member code");
+		_self.lval = &self;
+	}
+	else
+	if(Char(':'))
+		_global = true;
+	if(IsId()) {
+		String id = ReadId();
+		EscValue method;
+		int locali = var.Find(id);
+		int ii;
+
+		if(id == "self") {
+			if(!self.IsMap())
+				ThrowError("self in non-member code");
+			_self.lval = &self;
+			r = self;
+		}
+		else
+		if(!_self.lval && !_global && locali < 0 && IsChar('(') &&
+		   self.IsMap() && (method = self.MapGet(id)).IsLambda()) {
+		    _self.lval = &self;
+			r = method;
+		}
+		else
+		if(!_self.lval && !_global && locali < 0 && IsChar('(') &&
+		   (ii = global.Find(id)) >= 0 && global[ii].IsLambda()) {
+			r = global[ii];
+		}
+		else
+		if(_self.lval) {
+			r = _self;
+			r.sbs.ArrayAdd(id);
+		}
+		else
+		if(_global)
+			r.lval = &global.GetPut(id);
+		else
+			r.lval = &var.GetPut(id);
+
+		try {
+			Subscript(r, _self, id);
+		}
+		catch(CParser::Error e) {
+			throw CParser::Error(id + ": " + e);
+		}
+	}
+	else
+		ThrowError("invalid expression");
+}
+
+String Lims(const String& s)
+{
+	return s.GetLength() > 80 ? s.Mid(0, 80) : s;
+}
+
+double Esc::Number(const EscValue& a, const char *oper)
+{
+	if(!a.IsNumber())
+		ThrowError(String().Cat() << "number expected for '" << oper << "', encountered " << Lims(a.ToString()));
+	return a.GetNumber();
+}
+
+int Esc::Int(const EscValue& a, const char *oper)
+{
+	if(!a.IsInt())
+		ThrowError(String().Cat() << "integer expected for '" << oper << "', encountered " << Lims(a.ToString()));
+	return a.GetInt();
+}
+
+double Esc::Number(const Esc::SRVal& a, const char *oper)
+{
+	return Number(Get(a), oper);
+}
+
+int Esc::Int(const Esc::SRVal& a, const char *oper)
+{
+	return Int(Get(a), oper);
+}
+
+void Esc::Unary(Esc::SRVal& r)
+{
+	if(Char2('+', '+')) {
+		Unary(r);
+		Assign(r, Number(r, "++") + 1);
+	}
+	else
+	if(Char2('-', '-')) {
+		Unary(r);
+		Assign(r, Number(r, "++") - 1);
+	}
+	else
+	if(Char('-')) {
+		Unary(r);
+		r = -Number(r, "-");
+	}
+	else
+	if(Char('+')) {
+		Unary(r);
+		r = -Number(r, "+");
+	}
+	else
+	if(Char('!')) {
+		Unary(r);
+		r = !IsTrue(Get(r));
+	}
+	else
+	if(Char('~')) {
+		Unary(r);
+		r = ~Int(Get(r), "~");
+	}
+	else
+		Term(r);
+
+	if(Char2('+', '+')) {
+		EscValue v = Get(r);
+		Assign(r, Number(v, "++") + 1);
+		r = v;
+	}
+	if(Char2('-', '-')) {
+		EscValue v = Get(r);
+		Assign(r, Number(v, "--") - 1);
+		r = v;
+	}
+}
+
+EscValue Esc::MulArray(EscValue array, EscValue times)
+{
+	EscValue r;
+	r.SetEmptyArray();
+	for(int n = times.GetInt(); n > 0; n >>= 1) {
+		if(n & 1)
+			if(!r.Append(array))
+				OutOfMemory();
+		if(!array.Append(array))
+			OutOfMemory();
+		TestLimit();
+	}
+	return r;
+}
+
+void Esc::Mul(Esc::SRVal& r)
+{
+	Unary(r);
+	for(;;)
+		if(!IsChar2('*', '=') && Char('*')) {
+			EscValue x = Get(r);
+			SRVal w;
+			Unary(w);
+			EscValue y = Get(w);
+			if(x.IsArray() && y.IsInt())
+				r = MulArray(x, y);
+			else
+			if(y.IsArray() && x.IsInt())
+				r = MulArray(y, x);
+			else
+				r = Number(x, "*") * Number(y, "*");
+		}
+		else
+		if(!IsChar2('/', '=') && Char('/')) {
+			SRVal w;
+			Unary(w);
+			double b = Number(w, "/");
+			if(b == 0)
+				ThrowError("divide by zero");
+			r = Number(r, "/") / b;
+		}
+		else
+		if(!IsChar2('%', '=') && Char('%')) {
+			SRVal w;
+			Unary(w);
+			int b = Int(w, "%");
+			if(b == 0)
+				ThrowError("divide by zero");
+			r = Int(r, "%") % b;
+		}
+		else
+			return;
+}
+
+void Esc::Add(Esc::SRVal& r)
+{
+	Mul(r);
+	for(;;)
+		if(!IsChar2('+', '=') && Char('+')) {
+			EscValue v = Get(r);
+			SRVal w;
+			Mul(w);
+			EscValue b = Get(w);
+			if(v.IsArray() && b.IsArray()) {
+				if(!v.Replace(v.GetCount(), 0, b))
+					OutOfMemory();
+				r = v;
+			}
+			else
+			if(!(v.IsArray() && b.IsVoid()))
+				r = Number(v, "+") + Number(b, "+");
+		}
+		else
+		if(!IsChar2('-', '=') && Char('-')) {
+			SRVal w;
+			Mul(w);
+			r = Number(r, "-") - Number(w, "-");
+		}
+		else
+			return;
+}
+
+void Esc::Shift(Esc::SRVal& r)
+{
+	Add(r);
+	for(;;)
+		if(Char2('<', '<')) {
+			EscValue v = Get(r);
+			SRVal w;
+			Add(w);
+			EscValue b = Get(w);
+			if(v.IsArray() && b.IsArray()) {
+				if(!v.Replace(v.GetCount(), 0, b))
+					OutOfMemory();
+				Assign(r, v);
+			}
+			else
+			if(!(v.IsArray() && b.IsVoid()))
+				r = Int(v, "<<") << Int(b, "<<");
+		}
+		else
+		if(Char2('>', '>')) {
+			SRVal w;
+			Add(w);
+			r = Int(r, ">>") >> Int(w,  ">>");
+		}
+		else
+			return;
+}
+
+double Esc::DoCompare(const EscValue& a, const EscValue& b, const char *op)
+{
+	LTIMING("DoCompare");
+	if(a.IsNumber() && b.IsNumber())
+		return a.GetNumber() - b.GetNumber();
+	if(a.IsArray() && b.IsArray()) {
+		const Vector<EscValue>& x = a.GetArray();
+		const Vector<EscValue>& y = b.GetArray();
+		int i = 0;
+		for(;;) {
+			if(i >= x.GetCount())
+				return i < y.GetCount() ? -1 : 0;
+			if(i >= y.GetCount())
+				return i < x.GetCount() ? 1 : 0;
+			double q = DoCompare(x[i], y[i], op);
+			if(q) return q;
+			i++;
+		}
+	}
+	if(a.IsVoid() && b.IsVoid())
+		return 0;
+	if(!a.IsVoid() && b.IsVoid())
+		return 1;
+	if(a.IsVoid() && !b.IsVoid())
+		return -1;
+	ThrowError("invalid values for comparison " + a.GetTypeName() + ' ' + op + ' ' + b.GetTypeName());
+	return 0;
+}
+
+double Esc::DoCompare(const SRVal& a, const char *op)
+{
+	SRVal w;
+	Shift(w);
+	return DoCompare(Get(a), Get(w), op);
+}
+
+void Esc::Compare(Esc::SRVal& r)
+{
+	Shift(r);
+	for(;;)
+		if(Char2('>', '='))
+			r = DoCompare(r, ">=") >= 0;
+		else
+		if(Char2('<', '='))
+			r = DoCompare(r, "<=") <= 0;
+		else
+		if(Char('>'))
+			r = DoCompare(r, ">") > 0;
+		else
+		if(Char('<'))
+			r = DoCompare(r, "<") < 0;
+		else
+			return;
+}
+
+void Esc::Equal(Esc::SRVal& r)
+{
+	Compare(r);
+	for(;;)
+		if(Char2('=', '=')) {
+			SRVal w;
+			Compare(w);
+			r = Get(r) == Get(w);
+		}
+		else
+		if(Char2('!', '=')) {
+			SRVal w;
+			Compare(w);
+			r = Get(r) != Get(w);
+		}
+		else
+			return;
+}
+
+void Esc::BinAnd(Esc::SRVal& r)
+{
+	Equal(r);
+	while(!IsChar2('&', '&') && Char('&')) {
+		SRVal w;
+		Equal(w);
+		r = Int(r, "&") & Int(w, "&");
+	}
+}
+
+void Esc::BinXor(Esc::SRVal& r)
+{
+	BinAnd(r);
+	while(Char('^')) {
+		SRVal w;
+		BinAnd(w);
+		r = Int(r, "^") ^ Int(w, "^");
+	}
+}
+
+void Esc::BinOr(Esc::SRVal& r)
+{
+	BinXor(r);
+	while(!IsChar2('|', '|') && Char('|')) {
+		SRVal w;
+		BinXor(w);
+		r = Int(r, "|") | Int(w, "|");
+	}
+}
+
+void Esc::And(Esc::SRVal& r)
+{
+	BinOr(r);
+	if(IsChar2('&', '&')) {
+		bool b = IsTrue(Get(r));
+		while(Char2('&', '&')) {
+			SRVal w;
+			if(b) {
+				BinOr(w);
+				b = b && IsTrue(Get(w));
+			}
+			else {
+				skipexp++;
+				BinOr(w);
+				skipexp--;
+			}
+		}
+		r = b;
+	}
+}
+
+void Esc::Or(Esc::SRVal& r)
+{
+	And(r);
+	if(IsChar2('|', '|')) {
+		bool b = IsTrue(Get(r));
+		while(Char2('|', '|')) {
+			SRVal w;
+			if(b) {
+				skipexp++;
+				And(w);
+				skipexp--;
+			}
+			else {
+				And(w);
+				b = b || IsTrue(Get(w));
+			}
+		}
+		r = b;
+	}
+}
+
+void Esc::Cond(Esc::SRVal& r)
+{
+	Or(r);
+	if(Char('?')) {
+		bool t = IsTrue(Get(r));
+		SRVal dummy;
+		if(t) {
+			Cond(r);
+			PassChar(':');
+			skipexp++;
+			Cond(dummy);
+			skipexp--;
+		}
+		else {
+			skipexp++;
+			Cond(dummy);
+			skipexp--;
+			PassChar(':');
+			Cond(r);
+		}
+	}
+}
+
+void Esc::Assign(Esc::SRVal& r)
+{
+	Cond(r);
+	if(Char('=')) {
+		SRVal w;
+		Assign(w);
+		Assign(r, Get(w));
+	}
+	else
+	if(Char2('+', '=')) {
+		EscValue v = Get(r);
+		SRVal w;
+		Cond(w);
+		EscValue b = Get(w);
+		if(v.IsArray() && b.IsArray()) {
+			if(!v.Replace(v.GetCount(), 0, b))
+				OutOfMemory();
+			Assign(r, v);
+		}
+		else
+		if(!(v.IsArray() && b.IsVoid()))
+			Assign(r, Number(v, "+=") + Number(b, "+="));
+	}
+	else
+	if(Char2('-', '=')) {
+		SRVal w;
+		Cond(w);
+		Assign(r, Number(r, "-=") - Number(w, "-="));
+	}
+	else
+	if(Char2('*', '=')) {
+		SRVal w;
+		Cond(w);
+		Assign(r, Number(r, "*=") * Number(w, "*="));
+	}
+	else
+	if(Char2('/', '=')) {
+		SRVal w;
+		Cond(w);
+		double b = Number(w, "/=");
+		if(b == 0)
+			ThrowError("divide by zero");
+		Assign(r, Number(r, "/=") / b);
+	}
+	else
+	if(Char2('%', '=')) {
+		SRVal w;
+		Cond(w);
+		double b = Number(w, "%=");
+		if(b == 0)
+			ThrowError("divide by zero");
+		Assign(r, Number(r, "%=") / b);
+	}
+}
+
+int Esc::stack_level = 50;
+
+void Esc::Exp(Esc::SRVal& r)
+{
+	LTIMING("Exp");
+	Spaces();
+	stack_level--;
+	if(stack_level <= 0)
+		ThrowError("stack overflow");
+	Assign(r);
+	stack_level++;
+}
+
+EscValue Esc::GetExp() {
+	SRVal r;
+	Exp(r);
+	return Get(r);
+}
+
+void Esc::SkipTerm()
+{
+	if(IsEof())
+		ThrowError("unexpected end of file");
+	CParser::SkipTerm();
+	Spaces();
+}
+
+void Esc::SkipExp()
+{
+	int level = 0;
+	for(;;) {
+		if(IsChar(';'))
+			return;
+		if(IsChar(')') && level == 0)
+			return;
+		if(Char(')'))
+			level--;
+		else
+		if(Char('('))
+			level++;
+		else
+			SkipTerm();
+		if(IsEof())
+			ThrowError("unexpected end of file");
+	}
+}
+
+void SkipBlock(CParser& p)
+{
+	int level = 1;
+	while(level > 0 && !p.IsEof()) {
+		if(p.Char('{')) level++;
+		else
+		if(p.Char('}')) level--;
+		else
+			p.SkipTerm();
+	}
+}
+
+void Esc::SkipStatement()
+{
+	stack_level--;
+	if(stack_level <= 0)
+		ThrowError("stack overflow");
+	if(Id("if")) {
+		PassChar('(');
+		SkipExp();
+		PassChar(')');
+		SkipStatement();
+		if(Id("else"))
+			SkipStatement();
+	}
+	else
+	if(Id("for")) {
+		PassChar('(');
+		if(!IsChar(';'))
+			SkipExp();
+		PassChar(';');
+		if(!IsChar(';'))
+			SkipExp();
+		PassChar(';');
+		if(!IsChar(')'))
+			SkipExp();
+		PassChar(')');
+		SkipStatement();
+	}
+	else
+	if(Id("while") || Id("switch")) {
+		PassChar('(');
+		SkipExp();
+		PassChar(')');
+		SkipStatement();
+	}
+	else
+	if(Id("do")) {
+		SkipBlock(*this);
+		PassId("while");
+		PassChar('(');
+		SkipExp();
+		PassChar(')');
+		PassChar(';');
+	}
+	else
+	if(Char('{'))
+		SkipBlock(*this);
+	else {
+		SkipExp();
+		PassChar(';');
+	}
+	stack_level++;
+}
+
+bool  Esc::PCond()
+{
+	PassChar('(');
+	bool c = IsTrue(GetExp());
+	PassChar(')');
+	return c;
+}
+
+void Esc::FinishSwitch()
+{
+	while(no_break && no_return) {
+		if(Id("case")) {
+			SRVal r;
+			Exp(r);
+			PassChar(':');
+		}
+		else
+		if(Id("default"))
+			PassChar(':');
+		else
+			if(Char('}'))
+				return;
+		DoStatement();
+	}
+	while(!Char('}'))
+		SkipStatement();
+}
+
+void  Esc::DoStatement()
+{
+	op_limit--;
+	TestLimit();
+	if(Id("if"))
+		if(PCond()) {
+			DoStatement();
+			if(Id("else"))
+				SkipStatement();
+		}
+		else {
+			SkipStatement();
+			if(Id("else"))
+				DoStatement();
+		}
+	else
+	if(Id("do")) {
+		loop++;
+		Pos pos = GetPos();
+		do {
+			SetPos(pos);
+			DoStatement();
+			PassId("while");
+		}
+		while(PCond() && no_break && no_return);
+		PassChar(';');
+		no_break = true;
+		loop--;
+	}
+	else
+	if(Id("while")) {
+		loop++;
+		Pos pos = GetPos();
+		for(;;) {
+			SetPos(pos);
+			if(!PCond() || !no_break || !no_return) {
+				SkipStatement();
+				break;
+			}
+			DoStatement();
+		}
+		no_break = true;
+		loop--;
+	}
+	else
+	if(Id("for")) {
+		loop++;
+		PassChar('(');
+		SRVal var;
+		if(!IsChar(';'))
+			Exp(var);
+		if(Id("in")) {
+			EscValue range = GetExp();
+			PassChar(')');
+			Pos stmt = GetPos();
+			int i = 0;
+			for(;;) {
+				SetPos(stmt);
+				if(range.IsArray()) {
+					if(i >= range.GetCount())
+						break;
+					Assign(var, i);
+				}
+				else
+				if(range.IsMap()) {
+					const VectorMap<EscValue, EscValue>& map = range.GetMap();
+					if(i >= map.GetCount())
+						break;
+					if(map.IsUnlinked(i)) {
+						i++;
+						continue;
+					}
+					Assign(var, map.GetKey(i));
+				}
+				if(!no_break || !no_return) {
+					SkipStatement();
+					break;
+				}
+				DoStatement();
+				i++;
+			}
+			SkipStatement();
+		}
+		else {
+			PassChar(';');
+			Pos cond;
+			if(!IsChar(';')) {
+				cond = GetPos();
+				SkipExp();
+			}
+			PassChar(';');
+			Pos after;
+			if(!IsChar(')')) {
+				after = GetPos();
+				SkipExp();
+			}
+			PassChar(')');
+			Pos stmt = GetPos();
+			for(;;) {
+				bool c = true;
+				if(cond.ptr) {
+					SetPos(cond);
+					c = IsTrue(GetExp());
+				}
+				SetPos(stmt);
+				if(!c || !no_break || !no_return) {
+					SkipStatement();
+					break;
+				}
+				DoStatement();
+				if(after.ptr) {
+					SetPos(after);
+					SRVal r;
+					Exp(r);
+				}
+			}
+		}
+		no_break = true;
+		loop--;
+	}
+	else
+	if(Id("break")) {
+		if(!loop)
+			ThrowError("misplaced 'break'");
+		no_break = false;
+		PassChar(';');
+	}
+	else
+	if(Id("case"))
+		ThrowError("misplaced 'case'");
+	else
+	if(Id("default"))
+		ThrowError("misplaced 'default'");
+	else
+	if(Id("else"))
+		ThrowError("misplaced 'else'");
+	else
+	if(Id("return")) {
+		no_return = false;
+		if(!Char(';')) {
+			return_value = GetExp();
+			PassChar(';');
+		}
+		else
+			return_value = EscValue();
+	}
+	else
+	if(Id("switch")) {
+		loop++;
+		PassChar('(');
+		EscValue a = GetExp();
+		PassChar(')');
+		PassChar('{');
+		while(!Char('}')) {
+			if(Id("case")) {
+				EscValue b = GetExp();
+				PassChar(':');
+				if(a == b) {
+					FinishSwitch();
+					break;
+				}
+			}
+			else
+			if(Id("default")) {
+				PassChar(':');
+				FinishSwitch();
+				break;
+			}
+			else
+				SkipStatement();
+		}
+		loop--;
+		no_break = true;
+	}
+	else
+	if(Char('#')) {
+		int type = 0;
+		if(Char('.'))
+			type = 1;
+		else
+		if(Char(':'))
+			type = 2;
+		String id = ReadId();
+		EscValue l = ReadLambda(*this);
+		if(type == 1) {
+			if(self.IsVoid())
+				ThrowError("no instance");
+			self.MapSet(id, l);
+		}
+		else
+		if(type == 2)
+			global.GetAdd(id) = l;
+		else
+			var.GetAdd(id) = l;
+	}
+	else
+	if(Char('{')) {
+		while(!Char('}') && no_break && no_return)
+			DoStatement();
+	}
+	else
+	if(!Char(';')) {
+		SRVal v;
+		Exp(v);
+		PassChar(';');
+	}
+}
+
+void  Esc::Run()
+{
+	no_return = no_break = true;
+	loop = 0;
+	skipexp = 0;
+	while(!IsEof() && no_return && no_break)
+		DoStatement();
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/Esc/Esc.h b/uppsrc/Esc/Esc.h
new file mode 100644
index 000000000..873b72451
--- /dev/null
+++ b/uppsrc/Esc/Esc.h
@@ -0,0 +1,313 @@
+#ifndef _ESC_ESC_H_
+#define _ESC_ESC_H_
+
+#include <Core/Core.h>
+
+
+NAMESPACE_UPP
+
+enum { ESC_VOID, ESC_NUMBER, ESC_ARRAY, ESC_MAP, ESC_LAMBDA };
+
+String EscTypeName(int sv_type);
+
+struct EscEscape;
+class  EscLambda;
+struct EscHandle;
+struct Esc;
+
+class EscValue : Moveable<EscValue> {
+	struct RefCount {
+		Atomic   refcount;
+		RefCount()              { AtomicWrite(refcount, 1); }
+	};
+
+	int              type;
+	mutable unsigned hash;
+
+	struct EscMap;
+	struct EscArray;
+
+	union {
+		double         number;
+		EscArray      *array;
+		EscMap        *map;
+		EscLambda     *lambda;
+	};
+
+	void                  Free();
+	void                  Assign(const EscValue& s);
+
+	void                  InitString(const WString& w);
+	Vector<EscValue>&     CloneArray();
+
+	VectorMap<EscValue, EscValue>& CloneMap();
+
+	static int             total;
+	static int             max_total;
+
+public:
+	static int             GetTotalCount();
+	static void            SetMaxTotalCount(int n);
+	static int             GetMaxTotalCount();
+
+	bool IsVoid() const                          { return type == ESC_VOID; }
+	EscValue();
+
+	bool                   IsNumber() const      { return type == ESC_NUMBER; }
+	double                 GetNumber() const     { return IsNumber() ? number : 0; }
+	bool                   IsInt() const;
+	int                    GetInt() const;
+	EscValue(double n);
+
+	bool                    IsArray() const      { return type == ESC_ARRAY; }
+	const Vector<EscValue>& GetArray() const;
+	EscValue                ArrayGet(int i) const;
+	EscValue                ArrayGet(int i, int n) const;
+	bool                    ArraySet(int i, EscValue val);
+	bool                    Replace(int i, int n, EscValue a);
+	void                    SetEmptyArray();
+	void                    ArrayAdd(EscValue val);
+	bool                    Append(EscValue a);
+
+	operator WString() const;
+	operator String() const                     { return operator WString().ToString(); }
+
+	EscValue(const char *s)                     { InitString(WString(s)); }
+	EscValue(const WString& s)                  { InitString(s); }
+	EscValue(const String& s)                   { InitString(s.ToWString()); }
+
+	bool                                 IsMap() const         { return type == ESC_MAP; }
+	const VectorMap<EscValue, EscValue>& GetMap() const;
+	EscValue                             MapGet(EscValue key) const;
+	void                                 MapSet(EscValue key, EscValue value);
+	void                                 SetEmptyMap();
+
+	bool                                 IsLambda() const     { return type == ESC_LAMBDA; }
+	const EscLambda&                     GetLambda() const;
+	EscLambda&                           CreateLambda();
+
+
+	void    Escape(const char *method, Callback1<EscEscape&> escape);
+	void    Escape(const char *method, EscHandle *h, Callback1<EscEscape&> escape);
+	bool    HasNumberField(const char *id) const;
+	int     GetFieldInt(const char *id) const;
+
+	int     GetType() const                                   { return type; }
+	String  GetTypeName() const                               { return UPP::EscTypeName(type); }
+
+	int     GetCount() const;
+
+	unsigned GetHashValue() const;
+	bool     operator==(const EscValue& a) const;
+	bool     operator!=(const EscValue& a) const              { return !(*this == a); }
+
+	String ToString(int maxlen = INT_MAX, int indent_step = 4, bool hex = false, int indent = 0) const;
+
+	EscValue& operator=(const EscValue& s);
+	EscValue(const EscValue& src);
+
+	~EscValue();
+};
+
+struct EscValue::EscArray : EscValue::RefCount {
+	Vector<EscValue> array;
+
+	void     Retain()        { AtomicInc(refcount); }
+	void     Release()       { if(AtomicDec(refcount) == 0) delete this; }
+};
+
+struct EscValue::EscMap : EscValue::RefCount {
+	VectorMap<EscValue, EscValue> map;
+	int                           count;
+
+	void     Retain()        { AtomicInc(refcount); }
+	void     Release()       { if(AtomicDec(refcount) == 0) delete this; }
+
+	EscMap()                 { count = 0; }
+};
+
+struct EscHandle {
+	Atomic   refcount;
+
+	void       Retain()        { AtomicInc(refcount); }
+	void       Release()       { if(AtomicDec(refcount) == 0) delete this; }
+
+	EscHandle()              { AtomicWrite(refcount, 0); }
+	virtual ~EscHandle()     {}
+};
+
+class EscLambda {
+	Atomic   refcount;
+
+	void     Retain()        { AtomicInc(refcount); }
+	void     Release()       { if(AtomicDec(refcount) == 0) delete this; }
+
+	EscLambda()                 { AtomicWrite(refcount, 1); varargs = false; handle = NULL; }
+	~EscLambda()                { if(handle) handle->Release(); }
+
+	friend class EscValue;
+
+public:
+	Vector<String>        arg;
+	Vector<String>        def;
+	Vector<bool>          inout;
+	String                code;
+	EscHandle            *handle;
+	Callback1<EscEscape&> escape;
+	bool                  varargs;
+	String                filename;
+	int                   line;
+
+private:
+	EscLambda(const EscLambda&);
+	void operator=(const EscLambda&);
+};
+
+template <>
+inline unsigned GetHashValue(const EscValue& v)
+{
+	return v.GetHashValue();
+}
+
+bool     IsTrue(const EscValue& a);
+
+void     SkipBlock(CParser& p);
+EscValue ReadLambda(CParser& p);
+EscValue ReadLambda(const char *s);
+
+struct Esc : public CParser {
+	struct SRVal : Moveable<SRVal> {
+		EscValue *lval;
+		EscValue  rval;
+		EscValue  sbs;
+
+		SRVal()                    { lval = NULL; }
+		SRVal(const EscValue& v)   { lval = NULL; rval = v; }
+		SRVal(double n)            { lval = NULL; rval = n; }
+	};
+
+	ArrayMap<String, EscValue>& global;
+	EscValue                    self;
+	ArrayMap<String, EscValue>  var;
+
+	int      skipexp;
+	int      loop;
+	bool     no_break, no_return;
+	int&     op_limit;
+	int      r_stack_level;
+	EscValue return_value;
+
+	static int stack_level;
+
+	void       OutOfMemory();
+
+	void       TestLimit();
+	double     DoCompare(const EscValue& a, const EscValue& b, const char *op);
+	double     DoCompare(const SRVal& a, const char *op);
+	String     ReadName();
+	EscValue   ExecuteLambda(const String& id, EscValue lambda, SRVal self, Vector<SRVal>& arg);
+
+	void       Assign(EscValue& val, const Vector<EscValue>& sbs, int si, const EscValue& src);
+
+	EscValue   Get(const SRVal& val);
+	void       Assign(const SRVal& val, const EscValue& src);
+
+	EscValue   GetExp();
+
+	double Number(const EscValue& a, const char *oper);
+	int    Int(const EscValue& a, const char *oper);
+	double Number(const SRVal& a, const char *oper);
+	int    Int(const SRVal& a, const char *oper);
+
+	EscValue   MulArray(EscValue array, EscValue times);
+
+	void  Subscript(SRVal& r, SRVal _self, String id);
+	void  Subscript(SRVal& r);
+	void  Term(SRVal& r);
+	void  Unary(SRVal& r);
+	void  Mul(SRVal& r);
+	void  Add(SRVal& r);
+	void  Shift(SRVal& r);
+	void  Compare(SRVal& r);
+	void  Equal(SRVal& r);
+	void  BinAnd(SRVal& r);
+	void  BinXor(SRVal& r);
+	void  BinOr(SRVal& r);
+	void  And(SRVal& r);
+	void  Or(SRVal& r);
+	void  Cond(SRVal& r);
+	void  Assign(SRVal& r);
+	void  Exp(SRVal& r);
+
+	void  SkipTerm();
+	void  SkipStatement();
+	void  SkipExp();
+	bool  PCond();
+	void  FinishSwitch();
+	void  DoStatement();
+
+	void  Run();
+
+	Esc(ArrayMap<String, EscValue>& global, const char *s, int& oplimit,
+	    const String& fn, int line = 1)
+	: CParser(s, fn, line), global(global), op_limit(oplimit)
+	{ r_stack_level = stack_level;  skipexp = false; }
+	~Esc() { stack_level = r_stack_level; }
+};
+
+struct EscEscape {
+	Esc&             esc;
+	EscValue         self;
+	Array<EscValue>& arg;
+	EscValue         ret_val;
+	String           id;
+
+	EscValue&    operator[](int i)             { return arg[i]; }
+	int          GetCount() const              { return arg.GetCount(); }
+	void         operator=(const EscValue& v)  { ret_val = v; }
+	operator     EscValue&()                   { return ret_val; }
+	void         ThrowError(const char *s)     { esc.ThrowError(s); }
+
+	String       DumpType(int i);
+	String       InCall();
+
+	void         CheckNumber(int i);
+	void         CheckArray(int i);
+	void         CheckMap(int i);
+
+	double       Number(int i);
+	int          Int(int i);
+
+	EscEscape(Esc& esc, EscValue self, Array<EscValue>& arg)
+	  : esc(esc), self(self), arg(arg) {}
+};
+
+void Escape(ArrayMap<String, EscValue>& globals, const char *function, void (*escape)(EscEscape& e));
+void Escape(ArrayMap<String, EscValue>& globals, const char *function, Callback1<EscEscape&> escape);
+
+void Scan(ArrayMap<String, EscValue>& global, const char *code, const char *filename = "");
+
+void StdLib(ArrayMap<String, EscValue>& global);
+
+EscValue Execute(ArrayMap<String, EscValue>& global, EscValue *self,
+                 const EscValue& lambda, Vector<EscValue>& arg, int oplimit = 50000);
+EscValue Execute(ArrayMap<String, EscValue>& global, EscValue *self,
+                 const char *name, Vector<EscValue>& arg, int oplimit = 50000);
+EscValue Execute(ArrayMap<String, EscValue>& global, const char *name, int oplimit = 50000);
+
+EscValue Evaluatex(const char *expression, ArrayMap<String, EscValue>& global, int oplimit = 50000);
+EscValue Evaluate(const char *expression, ArrayMap<String, EscValue>& global, int oplimit = 50000);
+
+EscValue EscFromStdValue(const Value& v);
+Value    StdValueFromEsc(const EscValue& v);
+void     StdValueLib(ArrayMap<String, EscValue>& global);
+
+bool     IsDate(const EscValue& v);
+bool     IsTime(const EscValue& v);
+
+String   Expand(const String& doc, ArrayMap<String, EscValue>& global,
+                int oplimit = 50000, String (*format)(const Value& v) = StdFormat);
+
+END_UPP_NAMESPACE
+
+#endif
diff --git a/uppsrc/Esc/Esc.upp b/uppsrc/Esc/Esc.upp
new file mode 100644
index 000000000..b0f296737
--- /dev/null
+++ b/uppsrc/Esc/Esc.upp
@@ -0,0 +1,25 @@
+description "Esc scripting language interpreter";
+
+optimize_speed;
+
+uses
+	Core;
+
+file
+	Esc.h,
+	EscValue.cpp,
+	EscArray.cpp,
+	EscMap.cpp,
+	Esc.cpp,
+	EscRun.cpp,
+	EscStdLib.cpp,
+	Value.cpp,
+	Info readonly separator,
+	srcdoc.tpp,
+	COPYING,
+	COPYING-PLAIN,
+	AUTHORS;
+
+mainconfig
+	"" = "";
+
diff --git a/uppsrc/Esc/EscArray.cpp b/uppsrc/Esc/EscArray.cpp
new file mode 100644
index 000000000..689c25b80
--- /dev/null
+++ b/uppsrc/Esc/EscArray.cpp
@@ -0,0 +1,152 @@
+#include "Esc.h"
+
+NAMESPACE_UPP
+
+#define LTIMING(x) // RTIMING(x)
+
+Vector<EscValue>& EscValue::CloneArray()
+{
+	LTIMING("CloneArray");
+	ASSERT(IsArray());
+	if(AtomicRead(array->refcount) != 1) {
+		EscArray *c = new EscArray;
+		c->array <<= array->array;
+		array->Release();
+		array = c;
+	}
+	hash = 0;
+	return array->array;
+}
+
+const Vector<EscValue>& EscValue::GetArray() const
+{
+	ASSERT(IsArray());
+	return array->array;
+}
+
+EscValue EscValue::ArrayGet(int i) const
+{
+	return GetArray()[i];
+}
+
+EscValue EscValue::ArrayGet(int i, int n) const
+{
+	LTIMING("ArrayGet");
+	const Vector<EscValue>& sa = GetArray();
+	ASSERT(i >= 0 && i + n <= sa.GetCount());
+	EscValue t;
+	t.SetEmptyArray();
+	t.array->array.Append(sa, i, n);
+	return t;
+}
+
+void EscValue::SetEmptyArray()
+{
+	Free();
+	type = ESC_ARRAY;
+	hash = 0;
+	array = new EscArray;
+}
+
+bool EscValue::ArraySet(int i, EscValue val)
+{
+	LTIMING("ArraySet");
+	Vector<EscValue>& ta = CloneArray();
+	if(i > max_total || i - ta.GetCount() + total > max_total)
+		return false;
+	CloneArray().At(i) = val;
+	return true;
+}
+
+void EscValue::ArrayAdd(EscValue val)
+{
+	LTIMING("ArrayAdd");
+	if(IsVoid())
+		SetEmptyArray();
+	CloneArray().Add(val);
+}
+
+bool EscValue::Replace(int i, int n, EscValue a)
+{
+	LTIMING("Array Replace");
+	ASSERT(i >= 0);
+	Vector<EscValue>& ta = CloneArray();
+	if(i > max_total || i + n > max_total || i + n - ta.GetCount() + total > max_total)
+		return false;
+	if(i > 0)
+		ta.At(i - 1);
+	const Vector<EscValue>& sa = a.GetArray();
+	int q = sa.GetCount() - n;
+	if(q > 0)
+		ta.InsertN(i, q);
+	else
+		ta.Remove(i, -q);
+	for(q = 0; q < sa.GetCount(); q++)
+		ta[q + i] = sa[q];
+	return true;
+}
+
+bool EscValue::Append(EscValue a)
+{
+	if(IsVoid())
+		SetEmptyArray();
+	return Replace(GetCount(), 0, a);
+}
+
+EscValue::operator WString() const
+{
+	LTIMING("operator String");
+	WStringBuffer s;
+	if(IsArray()) {
+		const Vector<EscValue>& a = GetArray();
+		for(int i = 0; i < a.GetCount(); i++)
+			if(a[i].IsInt()) {
+				int c = a[i].GetInt();
+				if(c >= 0 && c < 65536)
+					s.Cat(c);
+			}
+	}
+	return s;
+}
+
+void EscValue::InitString(const WString& s)
+{
+	type = ESC_ARRAY;
+	array = new EscArray();
+	hash = 0;
+	Vector<EscValue>& a = array->array;
+	a.SetCount(s.GetCount());
+	for(int i = 0; i < s.GetCount(); i++)
+		a[i] = s[i];
+	total++;
+}
+
+int   EscValue::GetTotalCount()
+{
+	return total;
+}
+
+void  EscValue::SetMaxTotalCount(int n)
+{
+	max_total = n;
+}
+
+int   EscValue::GetMaxTotalCount()
+{
+	return max_total;
+}
+
+EscValue::EscValue()
+{
+	type = ESC_VOID; hash = 0; total++;
+}
+
+EscValue::EscValue(double n)
+{
+	number = n;
+	type = ESC_NUMBER;
+	hash = 0;
+	total++;
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/Esc/EscMap.cpp b/uppsrc/Esc/EscMap.cpp
new file mode 100644
index 000000000..8462d9da2
--- /dev/null
+++ b/uppsrc/Esc/EscMap.cpp
@@ -0,0 +1,73 @@
+#include "Esc.h"
+
+NAMESPACE_UPP
+
+#define LTIMING(x) // RTIMING(x)
+
+VectorMap<EscValue, EscValue>& EscValue::CloneMap()
+{
+	LTIMING("CloneMap");
+	ASSERT(IsMap());
+	if(AtomicRead(map->refcount) != 1) {
+		EscMap *c = new EscMap;
+		c->map <<= map->map;
+		map->Release();
+		map = c;
+	}
+	hash = 0;
+	return map->map;
+}
+
+const VectorMap<EscValue, EscValue>& EscValue::GetMap() const
+{
+	ASSERT(IsMap());
+	return map->map;
+}
+
+void  EscValue::SetEmptyMap()
+{
+	Free();
+	type = ESC_MAP;
+	hash = 0;
+	map = new EscMap;
+}
+
+EscValue EscValue::MapGet(EscValue key) const
+{
+	LTIMING("MapGet");
+	return GetMap().Get(key, EscValue());
+}
+
+void EscValue::MapSet(EscValue key, EscValue value)
+{
+	LTIMING("MapSet");
+	if(IsVoid())
+		SetEmptyMap();
+	VectorMap<EscValue, EscValue>& m = CloneMap();
+	int q = m.Find(key);
+	if(q >= 0) {
+		if(value.IsVoid()) {
+			m.Unlink(q);
+			map->count--;
+		}
+		else
+			m[q] = value;
+	}
+	else
+		if(!value.IsVoid()) {
+			map->count++;
+			m.Add(key, value);
+		}
+}
+
+bool EscValue::HasNumberField(const char *id) const
+{
+	return IsMap() && GetMap().Find(id) >= 0;
+}
+
+int  EscValue::GetFieldInt(const char *id) const
+{
+	return HasNumberField(id) ? MapGet(id).GetInt() : 0;
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/Esc/EscRun.cpp b/uppsrc/Esc/EscRun.cpp
new file mode 100644
index 000000000..fa0185917
--- /dev/null
+++ b/uppsrc/Esc/EscRun.cpp
@@ -0,0 +1,292 @@
+#include "Esc.h"
+
+
+NAMESPACE_UPP
+
+#define LTIMING(x) // RTIMING(x)
+
+void LambdaArgs(CParser& p, EscLambda& l)
+{
+	p.PassChar('(');
+	if(!p.Char(')'))
+		for(;;) {
+			if(p.Char3('.', '.', '.')) {
+				l.varargs = true;
+				p.PassChar(')');
+				break;
+			}
+			l.inout.Add(p.Char('&'));
+			l.arg.Add(p.ReadId());
+			if(p.Char('=')) {
+				const char *s = p.GetPtr();
+				int level = 0;
+				for(;;) {
+					if((p.IsChar(')') || p.IsChar(',')) && level == 0)
+						break;
+					if(p.Char(')'))
+						level--;
+					else
+					if(p.Char('('))
+						level++;
+					else
+						p.SkipTerm();
+					if(p.IsEof())
+						p.ThrowError("unexpected end of file while reading default value for argument "
+						             + l.arg.Top());
+				}
+				l.def.Add(String(s, p.GetPtr()));
+			}
+			else
+				if(l.def.GetCount())
+					p.ThrowError("missing default value for argument " + l.arg.Top());
+			if(p.Char(')'))
+				break;
+			p.PassChar(',');
+		}
+	l.inout.Shrink();
+	l.arg.Shrink();
+}
+
+EscValue ReadLambda(CParser& p)
+{
+	EscValue lambda;
+	EscLambda& l = lambda.CreateLambda();
+	LambdaArgs(p, l);
+	const char *t = p.GetPtr();
+	l.filename = p.GetFileName();
+	l.line = p.GetLine();
+	if(!p.Char('{'))
+		p.ThrowError("missing '{'");
+	SkipBlock(p);
+	l.code = String(t, p.GetPtr());
+	return lambda;
+}
+
+EscValue ReadLambda(const char *s)
+{
+	CParser p(s);
+	return ReadLambda(p);
+}
+
+String EscEscape::InCall()
+{
+	return IsNull(id) ? String() : " in call to '" + id + "'";
+}
+
+String EscEscape::DumpType(int i)
+{
+	if(i < arg.GetCount())
+		return String().Cat() << " (" << arg[i].GetTypeName() << " present)";
+	else
+		return " (not enough arguments)";
+}
+
+void  EscEscape::CheckNumber(int i)
+{
+	if(i < arg.GetCount() && arg[i].IsNumber())
+		return;
+	ThrowError(String().Cat() << "number expected as parameter " << i + 1 << InCall()
+	           << DumpType(i));
+}
+
+double EscEscape::Number(int i)
+{
+	if(i >= arg.GetCount())
+		ThrowError("too little parameters" + InCall());
+	return esc.Number(arg[i], "parameter" + InCall());
+}
+
+int EscEscape::Int(int i)
+{
+	if(i >= arg.GetCount())
+		ThrowError("too little parameters" + InCall());
+	return esc.Int(arg[i], "parameter" + InCall());
+}
+
+void  EscEscape::CheckArray(int i)
+{
+	if(i < arg.GetCount() && arg[i].IsArray())
+		return;
+	ThrowError(String().Cat() << "array expected as parameter " << i + 1 << InCall()
+	           << DumpType(i));
+}
+
+void  EscEscape::CheckMap(int i)
+{
+	if(i < arg.GetCount() && arg[i].IsMap())
+		return;
+	ThrowError(String().Cat() << "map expected as parameter " << i + 1 << InCall());
+}
+
+void Escape(ArrayMap<String, EscValue>& globals, const char *function, Callback1<EscEscape&> escape)
+{
+	CParser p(function);
+	EscValue& v = globals.GetPut(p.ReadId());
+	EscLambda& l = v.CreateLambda();
+	l.escape = escape;
+	LambdaArgs(p, l);
+}
+
+void Escape(ArrayMap<String, EscValue>& globals, const char *function, void (*escape)(EscEscape& e))
+{
+	Escape(globals, function, callback(escape));
+}
+
+void  EscValue::Escape(const char *method, Callback1<EscEscape&> escape)
+{
+	CParser p(method);
+	String id = p.ReadId();
+	EscValue v;
+	EscLambda& l = v.CreateLambda();
+	l.escape = escape;
+	LambdaArgs(p, l);
+	MapSet(id, v);
+}
+
+void  EscValue::Escape(const char *method, EscHandle *h, Callback1<EscEscape&> escape)
+{
+	CParser p(method);
+	String id = p.ReadId();
+	EscValue v;
+	EscLambda& l = v.CreateLambda();
+	l.escape = escape;
+	l.handle = h;
+	h->Retain();
+	LambdaArgs(p, l);
+	if(IsVoid())
+		SetEmptyMap();
+	MapSet(id, v);
+}
+
+void Scan(ArrayMap<String, EscValue>& global, const char *file, const char *filename)
+{
+	LTIMING("Scan");
+	CParser p(file, filename);
+	while(!p.IsEof()) {
+		EscValue& v = global.GetPut(p.ReadId());;
+		v = ReadLambda(p);
+	}
+}
+
+EscValue Execute(ArrayMap<String, EscValue>& global, EscValue *self,
+                 const EscValue& lambda, Vector<EscValue>& arg, int op_limit)
+{
+	const EscLambda& l = lambda.GetLambda();
+	if(arg.GetCount() != l.arg.GetCount()) {
+		String argnames;
+		for(int i = 0; i < l.arg.GetCount(); i++)
+			argnames << (i ? ", " : "") << l.arg[i];
+		throw CParser::Error(NFormat("invalid number of arguments (%d passed, expected: %s)", arg.GetCount(), argnames));
+	}
+	EscValue ret;
+	{
+		Esc sub(global, l.code, op_limit, l.filename, l.line);
+		if(self)
+			sub.self = *self;
+		for(int i = 0; i < l.arg.GetCount(); i++)
+			sub.var.GetPut(l.arg[i]) = arg[i];
+		sub.Run();
+		if(self)
+			*self = sub.self;
+		ret = sub.return_value;
+	}
+	return ret;
+}
+
+EscValue Execute(ArrayMap<String, EscValue>& global, EscValue *self,
+                 const char *name, Vector<EscValue>& arg, int op_limit)
+{
+	if(!self->IsMap())
+		return EscValue();
+	const VectorMap<EscValue, EscValue>& m = self->GetMap();
+	int ii = m.Find(String(name));
+	if(ii >= 0 && m[ii].IsLambda())
+		return Execute(global, self, m[ii], arg, op_limit);
+	return EscValue();
+}
+
+EscValue Execute(ArrayMap<String, EscValue>& global, const char *name, int op_limit)
+{
+	int ii = global.Find(String(name));
+	Vector<EscValue> arg;
+	if(ii >= 0 && global[ii].IsLambda())
+		return Execute(global, NULL, global[ii], arg, op_limit);
+	return EscValue();
+}
+
+EscValue Evaluatex(const char *expression, ArrayMap<String, EscValue>& global, int oplimit)
+{
+	Esc sub(global, expression, oplimit, "", 0);
+	for(int i = 0; i < global.GetCount(); i++)
+		sub.var.Add(global.GetKey(i), global[i]);
+	EscValue v;
+	v = sub.GetExp();
+	for(int i = 0; i < sub.var.GetCount(); i++)
+		global.GetAdd(sub.var.GetKey(i)) = sub.var[i];
+	return v;
+}
+
+EscValue Evaluate(const char *expression, ArrayMap<String, EscValue>& global, int oplimit)
+{
+	try {
+		return Evaluatex(expression, global, oplimit);
+	}
+	catch(CParser::Error&) {}
+	return EscValue();
+}
+
+String   Expand(const String& doc, ArrayMap<String, EscValue>& global,
+                int oplimit, String (*format)(const Value& v))
+{
+	String out;
+	const char *term = doc;
+	bool cond = true;
+	while(*term)
+		if(term[0] == '<' && term[1] == ':') {
+			term += 2;
+			try {
+				Esc sub(global, term, oplimit, "", 0);
+				for(int i = 0; i < global.GetCount(); i++)
+					sub.var.Add(global.GetKey(i), global[i]);
+				EscValue v;
+				if(*term == '{') {
+					sub.Run();
+					v = sub.return_value;
+				}
+				else
+				if(sub.Char('!')) {
+					EscValue& v = global.GetPut(sub.ReadId());
+					v = ReadLambda(sub);
+				}
+				else
+				if(sub.Char('?'))
+					cond = IsTrue(sub.GetExp());
+				else
+				if(sub.Char('/'))
+					cond = !cond;
+				else
+				if(sub.Char('.'))
+					cond = true;
+				else
+					v = sub.GetExp();
+				if(cond)
+					out << format(StdValueFromEsc(v));
+				sub.Spaces();
+				term = sub.GetPtr();
+				if(term[0] != ':' || term[1] != '>')
+					throw CParser::Error("missing :>" + String(term));
+				term += 2;
+			}
+			catch(CParser::Error& e) {
+				out << "(#ERROR: " << e << "#)";
+			}
+		}
+		else {
+			if(cond)
+				out.Cat(*term);
+			term++;
+		}
+	return out;
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/Esc/EscStdLib.cpp b/uppsrc/Esc/EscStdLib.cpp
new file mode 100644
index 000000000..997a0f430
--- /dev/null
+++ b/uppsrc/Esc/EscStdLib.cpp
@@ -0,0 +1,276 @@
+#include <Esc/Esc.h>
+
+
+NAMESPACE_UPP
+
+#define LTIMING(x)  // RTIMING(x)
+
+void ESC_count(EscEscape& e)
+{
+	e = e[0].GetCount();
+}
+
+void ESC_is_void(EscEscape& e)
+{
+	e = e[0].IsVoid();
+}
+
+void ESC_is_number(EscEscape& e)
+{
+	e = e[0].IsNumber();
+}
+
+void ESC_is_array(EscEscape& e)
+{
+	e = e[0].IsArray();
+}
+
+void ESC_is_map(EscEscape& e)
+{
+	e = e[0].IsMap();
+}
+
+void ESC_int(EscEscape& e)
+{
+	if(e[0].IsNumber())
+		e = (int)e[0].GetNumber();
+}
+
+void ESC_to_string(EscEscape& e)
+{
+	e = e[0].ToString();
+}
+
+void ESC_to_number(EscEscape& e)
+{
+	if(e[0].IsArray())
+		e = ScanDouble((String)e[0]);
+}
+
+void ESC_rand(EscEscape& e)
+{
+	e = rand();
+}
+
+void ESC_keys(EscEscape& e)
+{
+	e.CheckMap(0);
+	EscValue v;
+	const VectorMap<EscValue, EscValue>& m = e[0].GetMap();
+	for(int i = 0; i < m.GetCount(); i++)
+		if(!m.IsUnlinked(i))
+			v.ArrayAdd(m.GetKey(i));
+	e = v;
+}
+
+void ESC_values(EscEscape& e)
+{
+	e.CheckMap(0);
+	EscValue v;
+	const VectorMap<EscValue, EscValue>& m = e[0].GetMap();
+	for(int i = 0; i < m.GetCount(); i++)
+		if(!m.IsUnlinked(i))
+			v.ArrayAdd(m[i]);
+	e = v;
+}
+
+void ESC_reverse(EscEscape& e)
+{
+	e.CheckArray(0);
+	const Vector<EscValue>& a = e[0].GetArray();
+	EscValue r;
+	for(int i = a.GetCount() - 1; i >= 0; i--)
+		r.ArrayAdd(a[i]);
+	e = r;
+}
+
+struct EscCmp {
+	Esc *esc;
+	bool operator()(const EscValue& a, const EscValue& b) const {
+		return esc->DoCompare(a, b, "< (sort)") < 0;
+	}
+};
+
+Vector<int> EscGetSortOrder(EscEscape& e)
+{
+	e.CheckArray(0);
+	const Vector<EscValue>& va = e[0].GetArray();
+	EscCmp cmp;
+	cmp.esc = &e.esc;
+	return GetSortOrder(va, cmp);
+}
+
+void ESC_sort(EscEscape& e)
+{
+	Vector<int> so = EscGetSortOrder(e);
+	EscValue r;
+	for(int i = 0; i < so.GetCount(); i++)
+		r.ArrayAdd(e[0].ArrayGet(so[i]));
+	e = r;
+}
+
+void ESC_order(EscEscape& e)
+{
+	Vector<int> so = EscGetSortOrder(e);
+	EscValue r;
+	for(int i = 0; i < so.GetCount(); i++)
+		r.ArrayAdd(so[i]);
+	e = r;
+}
+
+// ---------------------------
+
+void ESC_mid(EscEscape& e)
+{
+	e.CheckArray(0);
+	int pos = e.Int(1);
+	int count = e.Int(2);
+	if(pos < 0 || pos + count > e[0].GetCount())
+		e.ThrowError("out of bounds in call to 'mid'");
+	e.ret_val = e[0].ArrayGet(pos, count);
+}
+
+void ESC_exists(EscEscape& e)
+{
+	e.CheckMap(0);
+	e = !e[0].MapGet(e[1]).IsVoid();
+}
+
+struct ESC_FileOut : public EscHandle {
+	FileStream file;
+	void Put(EscEscape& e)         { if(file) file.Put(e.Int(0)); }
+	void PutLine(EscEscape& e)     { if(file) file.PutLine(String(e[0])); }
+	void Close(EscEscape& e)       { if(file) file.Close(); }
+
+	typedef ESC_FileOut CLASSNAME;
+
+	ESC_FileOut(EscEscape& e, EscValue& v, int style) {
+		file.Open(String(e[0]), style);
+		v.Escape("Put(a)", this, THISBACK(Put));
+		v.Escape("PutLine(a)", this, THISBACK(PutLine));
+		v.Escape("Close()", this, THISBACK(Close));
+	}
+};
+
+void ESC_OpenFileOut(EscEscape& e)
+{
+	EscValue v;
+	ESC_FileOut *f = new ESC_FileOut(e, v, FileStream::CREATE);
+	if(f->file)
+		e = v;
+}
+
+void ESC_OpenFileAppend(EscEscape& e)
+{
+	EscValue v;
+	ESC_FileOut *f = new ESC_FileOut(e, v, FileStream::APPEND);
+	if(f->file)
+		e = v;
+}
+
+struct ESC_FileIn : public EscHandle {
+	FileIn file;
+	void IsEof(EscEscape& e)       { e = file.IsEof(); }
+	void Get(EscEscape& e)         { e = file.Get(); }
+	void GetLine(EscEscape& e)     { e = file.GetLine(); }
+	void Close(EscEscape& e)       { if(file) file.Close(); }
+
+	typedef ESC_FileIn CLASSNAME;
+
+	ESC_FileIn(EscEscape& e, EscValue& v) {
+		file.Open(String(e[0]));
+		v.Escape("IsEof()", this, THISBACK(IsEof));
+		v.Escape("Get()", this, THISBACK(Get));
+		v.Escape("GetLine()", this, THISBACK(GetLine));
+		v.Escape("Close()", this, THISBACK(Close));
+	}
+};
+
+void ESC_OpenFileIn(EscEscape& e)
+{
+	EscValue v;
+	ESC_FileIn *f = new ESC_FileIn(e, v);
+	if(f->file)
+		e = v;
+}
+
+// ---------------------------
+
+void ESC_sin(EscEscape& e)
+{
+	e = sin(e[0].GetNumber());
+}
+
+void ESC_cos(EscEscape& e)
+{
+	e = cos(e[0].GetNumber());
+}
+
+
+bool IsDate(const EscValue& v)
+{
+	return v.HasNumberField("year") && v.HasNumberField("month") && v.HasNumberField("day");
+}
+
+bool IsTime(const EscValue& v)
+{
+	return IsDate(v) && v.HasNumberField("hour") && v.HasNumberField("minute") && v.HasNumberField("second");
+}
+
+void SIC_IsDate(EscEscape& e)
+{
+	e = IsDate(e[0]);
+}
+
+void SIC_IsTime(EscEscape& e)
+{
+	e = IsTime(e[0]);
+}
+
+void SIC_GetSysTime(EscEscape& e)
+{
+	Time tm = GetSysTime();
+	EscValue v;
+	v.MapSet("year", (int)tm.year);
+	v.MapSet("month", (int)tm.month);
+	v.MapSet("day", (int)tm.day);
+	v.MapSet("hour", (int)tm.hour);
+	v.MapSet("minute", (int)tm.minute);
+	v.MapSet("second", (int)tm.second);
+	e = v;
+}
+
+void StdLib(ArrayMap<String, EscValue>& global)
+{
+	Escape(global, "is_number(value)", ESC_is_number);
+	Escape(global, "is_array(value)", ESC_is_array);
+	Escape(global, "is_map(value)", ESC_is_map);
+	Escape(global, "is_void(value)", ESC_is_void);
+	Escape(global, "int(value)", ESC_int);
+	Escape(global, "to_string(value)", ESC_to_string);
+	Escape(global, "to_number(value)", ESC_to_number);
+	Escape(global, "count(value)", ESC_count);
+	Escape(global, "keys(map)", ESC_keys);
+	Escape(global, "values(map)", ESC_values);
+	Escape(global, "rand()", ESC_rand);
+	Escape(global, "reverse(array)", ESC_reverse);
+	Escape(global, "sort(array)", ESC_sort);
+	Escape(global, "order(array)", ESC_order);
+
+	Escape(global, "len(x)", ESC_count);
+	Escape(global, "mid(array, pos, count)", ESC_mid);
+	Escape(global, "exists(map, key)", ESC_exists);
+
+	Escape(global, "OpenFileOut(x)", ESC_OpenFileOut);
+	Escape(global, "OpenFileAppend(x)", ESC_OpenFileOut);
+	Escape(global, "OpenFileIn(x)", ESC_OpenFileIn);
+
+	Escape(global, "GetSysTime()", SIC_GetSysTime);
+	Escape(global, "IsDate(x)", SIC_IsDate);
+	Escape(global, "IsTime(x)", SIC_IsTime);
+
+	Escape(global, "sin(value)", ESC_sin);
+	Escape(global, "cos(value)", ESC_cos);
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/Esc/EscValue.cpp b/uppsrc/Esc/EscValue.cpp
new file mode 100644
index 000000000..fa674685c
--- /dev/null
+++ b/uppsrc/Esc/EscValue.cpp
@@ -0,0 +1,318 @@
+#include <Esc/Esc.h>
+
+
+NAMESPACE_UPP
+
+#define LTIMING(x)  // RTIMING(x)
+
+String EscTypeName(int sv_type)
+{
+	switch(sv_type)
+	{
+	case ESC_VOID:   return "void";
+	case ESC_NUMBER: return "number";
+	case ESC_ARRAY:  return "array";
+	case ESC_MAP:    return "map";
+	case ESC_LAMBDA: return "lambda";
+	default:         return NFormat("unknown(%d)", sv_type);
+	}
+}
+
+int EscValue::total;
+int EscValue::max_total = 1000000;
+
+void EscValue::Free()
+{
+	LTIMING("Free");
+	if(type == ESC_ARRAY)
+		array->Release();
+	if(type == ESC_MAP)
+		map->Release();
+	if(type == ESC_LAMBDA)
+		lambda->Release();
+	type = ESC_VOID;
+	hash = 0;
+}
+
+EscValue::~EscValue()
+{
+	LTIMING("~EscValue");
+	total--;
+	Free();
+}
+
+void EscValue::Assign(const EscValue& s)
+{
+	LTIMING("Assign");
+	type = s.type;
+	hash = s.hash;
+	switch(type) {
+	case ESC_ARRAY:
+		array = s.array;
+		array->Retain();
+		break;
+	case ESC_MAP:
+		map = s.map;
+		map->Retain();
+		break;
+	case ESC_LAMBDA:
+		lambda = s.lambda;
+		lambda->Retain();
+		break;
+	case ESC_NUMBER:
+		number = s.number;
+		break;
+	}
+}
+
+EscValue& EscValue::operator=(const EscValue& s)
+{
+	LTIMING("Sval=Sval");
+	Free();
+	Assign(s);
+	return *this;
+}
+
+EscValue::EscValue(const EscValue& s)
+{
+	LTIMING("Sval(Sval)");
+	Assign(s);
+	total++;
+}
+
+EscLambda& EscValue::CreateLambda()
+{
+	Free();
+	lambda = new EscLambda;
+	type = ESC_LAMBDA;
+	hash = 0;
+	return *lambda;
+}
+
+const EscLambda& EscValue::GetLambda() const
+{
+	ASSERT(IsLambda());
+	return *lambda;
+}
+
+int EscValue::GetCount() const
+{
+	switch(type) {
+	case ESC_VOID:
+		return 0;
+	case ESC_ARRAY:
+		return array->array.GetCount();
+	case ESC_MAP:
+		return map->count;
+	}
+	return 1;
+}
+
+unsigned EscValue::GetHashValue() const
+{
+	LTIMING("GetHashValue");
+	if(hash == 0) {
+		switch(type) {
+		case ESC_VOID:
+			hash = 1;
+			break;
+		case ESC_NUMBER:
+			hash = UPP::GetHashValue(number) | 0x80000;
+			break;
+		case ESC_ARRAY:
+			for(int i = 0; i < array->array.GetCount(); i++)
+				hash = hash ^ array->array[i].GetHashValue();
+			hash |= 0x40000;
+			break;
+		case ESC_MAP:
+			for(int i = 0; i < map->map.GetCount(); i++)
+				if(!map->map[i].IsVoid())
+					hash ^= map->map.GetKey(i).GetHashValue() ^ map->map[i].GetHashValue();
+			hash |= 0x8000000;
+			break;
+		case ESC_LAMBDA:
+			hash = UPP::GetHashValue(lambda->code) | 0x4000000;
+			break;
+		}
+	}
+	return hash;
+}
+
+template <class T>
+bool EqVector(const T& a, const T& b)
+{
+	if(a.GetCount() != b.GetCount())
+		return false;
+	for(int i = 0; i < a.GetCount(); i++)
+		if(a[i] != b[i])
+			return false;
+	return true;
+}
+
+bool EscValue::operator==(const EscValue& a) const
+{
+	LTIMING("operator==");
+	int i;
+	switch(type) {
+	case ESC_VOID:
+		return a.type == ESC_VOID;
+	case ESC_NUMBER:
+		return a.type == ESC_NUMBER && number == a.number;
+	case ESC_ARRAY:
+		if(a.type != ESC_ARRAY) return false;
+		if(array->array.GetCount() != a.array->array.GetCount())
+			return false;
+		return EqVector(array->array, a.array->array);
+	case ESC_MAP: {
+		if(a.type != ESC_MAP) return false;
+		const VectorMap<EscValue, EscValue>& x = GetMap();
+		const VectorMap<EscValue, EscValue>& y = a.GetMap();
+		for(i = 0; i < x.GetCount(); i++)
+			if(!x.IsUnlinked(i)) {
+				int q = y.Find(x.GetKey(i));
+				if(q < 0)
+					return false;
+				if(x[i] != y[q])
+					return false;
+			}
+		for(i = 0; i < y.GetCount(); i++)
+			if(!y.IsUnlinked(i))
+				if(x.Find(y.GetKey(i)) < 0)
+					return false;
+		return true;
+	}
+	case ESC_LAMBDA:
+		return lambda->code == a.lambda->code &&
+		       EqVector(lambda->arg, a.lambda->arg) && EqVector(lambda->inout, a.lambda->inout);
+	}
+	return false;
+}
+
+String EscValue::ToString(int maxlen, int indent_step, bool hex, int indent) const
+{
+	String ind(' ', indent);
+	StringBuffer r;
+	String s;
+	int i;
+	switch(type) {
+	case ESC_NUMBER:
+		{
+			s = ind;
+			if((int64)number == number)
+				s << FormatInt64((int64)number);
+			else
+				s << Format("%.8g", number);
+			if(hex && number >= INT64_MIN && number <= INT64_MAX && (int64)number == number)
+				s << " 0x" << Format64Hex((int64)number);
+			if(hex && number >= 0 && number < 65536 && (int)number == number)
+				s << ' ' << AsCString(ToUtf8(WString((int)number, 1)));
+			return s;
+		}
+	case ESC_ARRAY:
+		{
+			const Vector<EscValue>& a = GetArray();
+			int i;
+			int c = min(100, a.GetCount());
+			for(i = 0; i < a.GetCount(); i++) {
+				if(!a[i].IsInt())
+					break;
+				int c = a[i].GetInt();
+				if(c >= 32 && c < 256)
+					s.Cat(c);
+				else
+					break;
+			}
+			if(i < a.GetCount()) {
+				r << ind << "[ ";
+				for(i = 0; i < c; i++) {
+					if(i)
+						r << ", ";
+					r << array->array[i].ToString(maxlen, indent_step, hex, 0);
+				}
+				r << " ]";
+				if(r.GetLength() >= maxlen) {
+					r.Clear();
+					r << ind << "[\n";
+					for(i = 0; i < c; i++) {
+						if(i)
+							r << ",\n";
+						r << array->array[i].ToString(maxlen, indent_step, hex, indent + indent_step);
+					}
+					r << '\n' << ind << "]";
+				}
+				s = r;
+			}
+			else {
+				r << ind << '\"' << s << '\"';
+				s = r;
+			}
+			if(a.GetCount() > 100)
+				s << ind << "\n...more than 100 elements";
+			return s;
+		}
+	case ESC_LAMBDA:
+		r << ind << "@(";
+		for(i = 0; i < lambda->arg.GetCount(); i++) {
+			if(i)
+				r << ", ";
+			if(lambda->inout[i])
+				r << "&";
+			r << lambda->arg[i];
+		}
+		r << ")\n" << lambda->code;
+		return r;
+	case ESC_MAP:
+		r << ind << "{ ";
+		int c = min(map->map.GetCount(), 100);
+		bool q = false;
+		for(i = 0; i < c; i++) {
+			if(q)
+				r << ", ";
+			if(!map->map.IsUnlinked(i)) {
+				r << map->map.GetKey(i).ToString(maxlen, indent_step, hex, 0)
+				  << ":" << map->map[i].ToString(maxlen, indent_step, hex, 0);
+				q = true;
+			}
+		}
+		r << " }";
+		if(r.GetLength() >= maxlen) {
+			r.Clear();
+			r << ind << "{\n";
+			q = false;
+			for(i = 0; i < c; i++) {
+				if(q)
+					r << ",\n";
+				if(!map->map.IsUnlinked(i)) {
+					r << map->map.GetKey(i).ToString(maxlen, indent_step, hex, indent + indent_step)
+					  << ":\n" << map->map[i].ToString(maxlen, indent_step, hex, indent + indent_step);
+					q = true;
+				}
+			}
+			r << '\n' << ind << "}";
+		}
+		s = r;
+		if(map->map.GetCount() > 100)
+			s << ind << "\n...more than 100 elements";
+		return s;
+	}
+	return "void";
+}
+
+bool EscValue::IsInt() const
+{
+	return IsNumber() && number >= (double)INT_MIN && number <= (double)INT_MAX;
+}
+
+int  EscValue::GetInt() const
+{
+	return (int)minmax(GetNumber(), (double)INT_MIN, (double)INT_MAX);
+}
+
+bool IsTrue(const EscValue& a)
+{
+	if(a.IsNumber())
+		return a.GetNumber();
+	return a.GetCount();
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/Esc/Value.cpp b/uppsrc/Esc/Value.cpp
new file mode 100644
index 000000000..f3f27fd4a
--- /dev/null
+++ b/uppsrc/Esc/Value.cpp
@@ -0,0 +1,65 @@
+#include <Esc/Esc.h>
+
+
+NAMESPACE_UPP
+
+EscValue EscFromStdValue(const Value& v)
+{
+	EscValue r;
+	Time t;
+	if(!IsNull(v))
+		switch(v.GetType()) {
+		case BOOL_V:
+		case INT_V:
+		case DOUBLE_V:
+			r = (double)v;
+			break;
+		case STRING_V:
+		case WSTRING_V:
+			r = (WString)v;
+			break;
+		case TIME_V:
+			t = v;
+			r.MapSet("hour", t.hour);
+			r.MapSet("minute", t.minute);
+			r.MapSet("second", t.second);
+		case DATE_V:
+			t = v;
+			r.MapSet("year", t.year);
+			r.MapSet("month", t.month);
+			r.MapSet("day", t.day);
+			break;
+		case VALUEARRAY_V:
+			ValueArray va = v;
+			r.SetEmptyArray();
+			for(int i = 0; i < va.GetCount(); i++)
+				r.ArrayAdd(EscFromStdValue(va[i]));
+		}
+	return r;
+}
+
+Value StdValueFromEsc(const EscValue& v)
+{
+	if(v.IsNumber())
+		return v.GetNumber();
+	if(v.IsArray())
+		return (WString)v;
+	if(IsTime(v))
+		return Time(v.GetFieldInt("year"), v.GetFieldInt("month"), v.GetFieldInt("day"),
+			v.GetFieldInt("hour"), v.GetFieldInt("minute"), v.GetFieldInt("second"));
+	if(IsDate(v))
+		return Date(v.GetFieldInt("year"), v.GetFieldInt("month"), v.GetFieldInt("day"));
+	return Value();
+}
+
+void SIC_StdFormat(EscEscape& e)
+{
+	e = StdFormat(StdValueFromEsc(e[0]));
+}
+
+void StdValueLib(ArrayMap<String, EscValue>& global)
+{
+	Escape(global, "StdFormat(x)", SIC_StdFormat);
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/Esc/init b/uppsrc/Esc/init
new file mode 100644
index 000000000..8a92b5ff2
--- /dev/null
+++ b/uppsrc/Esc/init
@@ -0,0 +1,4 @@
+#ifndef _Esc_icpp_init_stub
+#define _Esc_icpp_init_stub
+#include "Core/init"
+#endif
diff --git a/uppsrc/Esc/prj.aux b/uppsrc/Esc/prj.aux
new file mode 100644
index 000000000..2e191ea30
--- /dev/null
+++ b/uppsrc/Esc/prj.aux
@@ -0,0 +1,6 @@
+file
+	E:\sic.sic,
+	e:\out\upp/Sic/CONSOLE-DEBUG-IA32-MAIN-MSC-ST-STATIC-WIN32\Sic.log,
+	e:\out\upp/Sic/CONSOLE-DEBUG-IA32-MAIN-MSC-ST-STATIC-WIN32\Sic.log,
+	e:\out\upp/Sic/CONSOLE-DEBUG-IA32-MAIN-MSC-ST-STATIC-WIN32\Sic.log,
+	e:\out\upp/Sic/CONSOLE-IA32-MAIN-MSC-RELEASE-ST-STATIC-WIN32\Sic.log;
diff --git a/uppsrc/Esc/srcdoc.tpp/Esc$en-us.tpp b/uppsrc/Esc/srcdoc.tpp/Esc$en-us.tpp
new file mode 100644
index 000000000..88e3db732
--- /dev/null
+++ b/uppsrc/Esc/srcdoc.tpp/Esc$en-us.tpp
@@ -0,0 +1,22 @@
+TITLE("Esc scripting language")
+COMPRESSED
+120,156,173,59,139,146,218,70,182,191,210,153,108,98,176,129,65,192,188,192,201,58,59,113,238,78,85,226,164,226,36,187,85,148,54,18,162,1,173,133,68,212,210,12,115,237,220,111,191,231,209,221,106,73,48,158,241,174,147,170,209,163,207,251,244,121,181,152,143,196,95,254,50,236,13,63,31,126,228,223,244,91,185,10,203,164,240,231,11,111,60,158,133,151,227,217,243,23,158,119,1,224,30,128,143,189,177,55,244,206,71,147,139,201,104,56,30,142,38,222,232,204,187,188,156,120,23,103,151,227,171,243,243,169,42,23,69,92,36,18,224,25,244,108,8,160,35,164,124,113,121,62,241,0,112,114,54,26,95,156,77,0,193,100,226,121,112,237,157,93,156,95,92,76,53,92,50,30,121,179,98,52,57,159,93,191,58,155,121,0,61,238,141,63,31,13,175,134,163,243,139,171,201,200,155,156,195,127,222,248,234,202,27,95,94,14,207,38,64,194,27,79,163,108,9,192,239,127,255,243,139,215,111,250,191,190,21,115,53,156,61,255,249,82,188,86,145,80,81,30,239,138,56,93,139,36,
+76,215,101,184,150,95,250,248,94,232,63,184,38,86,34,20,42,222,238,18,121,96,189,136,211,66,166,75,185,20,171,44,23,114,187,144,203,37,190,143,83,241,107,82,196,219,176,144,193,139,224,133,8,119,187,36,142,194,34,206,82,53,168,19,185,41,144,70,113,191,147,137,84,170,39,110,195,164,148,34,203,99,9,168,151,21,165,187,184,216,24,70,144,106,190,10,35,36,69,207,175,145,202,233,175,68,11,37,30,104,180,183,50,191,55,64,247,178,16,127,148,113,33,97,5,62,128,11,131,220,101,105,52,19,191,17,11,200,146,194,39,222,76,220,102,241,82,233,69,223,36,9,48,153,199,225,2,24,22,155,240,86,210,107,205,248,66,130,38,164,8,149,138,215,41,240,31,166,247,34,43,54,50,231,247,3,241,27,174,69,220,0,170,128,183,116,13,188,209,59,135,137,49,147,172,107,42,76,151,66,238,119,57,168,9,244,40,162,48,5,106,162,144,170,208,250,71,144,20,222,138,18,209,138,249,171,142,55,186,28,12,7,163,179,179,46,104,35,248,29,23,248,98,85,166,17,
+90,98,160,133,75,75,176,91,110,196,123,67,119,168,188,85,146,133,100,237,93,6,10,215,203,68,39,202,114,96,97,151,165,100,233,34,19,215,44,206,50,43,65,35,221,129,120,189,15,81,191,74,100,43,3,148,128,218,243,48,81,211,186,140,158,249,59,0,127,119,175,101,208,191,58,231,7,175,38,32,200,153,24,238,225,113,255,67,255,131,127,122,42,54,114,31,46,101,4,254,149,212,23,193,26,97,22,101,81,209,124,189,128,77,58,196,255,205,154,69,156,134,249,125,109,81,240,108,31,60,195,247,188,34,218,132,121,24,1,247,228,87,237,253,161,202,221,46,203,11,133,78,181,5,171,92,7,253,36,126,7,14,188,3,129,201,223,201,52,90,15,100,103,101,20,31,230,121,120,111,221,138,110,224,25,58,255,82,230,96,211,28,44,158,109,69,24,69,104,84,37,255,40,101,26,177,94,217,165,144,1,70,41,58,41,251,1,227,132,29,18,37,37,236,75,48,7,33,54,203,16,189,218,129,234,86,49,44,62,228,39,193,60,240,125,177,0,161,223,201,162,97,48,163,34,88,
+194,26,98,29,201,237,174,184,103,202,218,136,193,92,120,61,49,234,137,113,79,76,122,2,64,252,6,6,124,31,204,113,69,224,195,26,193,24,17,27,225,1,117,166,69,24,131,246,92,185,234,56,78,254,46,147,36,11,78,28,70,96,127,131,160,16,57,208,47,129,205,103,127,15,158,1,157,103,146,255,36,181,63,89,240,236,32,91,200,148,8,158,139,48,89,133,196,23,161,182,27,79,153,157,87,42,228,75,137,59,96,163,238,24,122,15,129,157,32,168,109,129,29,52,136,0,147,25,225,24,65,46,11,8,115,183,128,101,1,81,170,0,107,135,249,210,110,79,80,65,153,22,141,104,249,13,249,2,90,205,98,6,42,198,232,74,236,242,236,54,94,106,140,229,130,35,118,203,194,2,77,204,30,154,229,141,61,25,6,243,161,81,11,222,120,129,47,130,175,196,184,206,199,119,113,174,10,195,131,101,65,84,177,65,161,5,98,72,13,251,22,117,64,239,55,196,122,35,215,176,89,110,37,67,104,63,13,193,186,119,20,66,151,98,41,49,158,66,58,169,228,94,229,176,55,80,
+167,144,128,44,7,211,182,55,247,61,148,22,116,147,132,7,88,238,29,0,24,33,0,173,94,148,176,50,5,18,69,52,104,169,137,48,215,229,0,42,53,31,108,193,144,77,59,33,208,233,139,22,244,63,54,50,213,58,139,21,187,23,198,14,148,49,15,250,156,95,58,228,39,232,0,25,123,84,30,175,55,5,228,145,165,68,153,26,194,124,229,119,123,21,70,136,39,144,72,163,141,132,173,189,28,136,239,0,119,162,241,194,42,8,214,89,26,244,211,154,41,42,197,43,171,186,29,106,6,73,3,61,235,211,61,237,1,168,129,253,46,164,154,128,82,115,149,27,201,37,162,92,162,21,139,77,108,17,54,124,33,56,121,141,241,36,56,57,226,62,104,156,99,92,145,209,208,95,220,45,10,84,195,229,178,114,28,184,183,108,55,156,127,143,232,209,221,33,95,109,159,98,218,189,49,237,190,123,12,193,207,164,253,42,38,96,72,168,133,131,108,129,17,15,24,6,187,64,218,129,213,38,66,43,40,158,100,51,121,18,108,48,223,101,80,52,17,237,166,59,57,74,98,58,132,134,
+188,228,148,33,252,74,41,224,86,121,97,235,41,88,0,120,253,67,22,98,97,105,249,20,118,222,147,136,226,78,5,199,39,224,135,104,235,5,13,199,248,41,204,57,220,177,58,172,218,182,91,80,246,242,168,114,44,135,89,222,122,57,125,226,6,182,128,98,42,244,86,198,71,221,38,26,112,193,131,144,189,186,161,154,28,77,15,218,241,81,60,13,143,56,1,197,20,173,48,12,170,38,105,85,27,191,94,207,237,64,201,181,141,77,129,67,238,146,48,146,203,134,7,42,116,244,224,4,138,174,73,112,50,171,101,82,5,137,99,42,40,66,242,162,253,63,247,176,134,115,41,101,170,52,187,67,88,120,14,192,117,158,223,66,78,132,106,209,102,40,107,106,106,35,244,142,118,107,39,87,21,158,192,126,3,175,70,117,172,80,81,64,7,34,217,55,139,59,131,162,119,0,7,102,127,174,216,244,83,93,190,97,81,96,234,144,10,49,104,7,98,154,241,119,189,20,154,31,169,154,57,131,113,191,0,133,48,171,79,182,179,48,160,86,200,6,14,168,177,15,194,189,124,105,180,99,
+174,70,246,106,252,223,96,163,210,186,189,106,224,197,98,149,82,186,194,45,206,173,136,110,246,14,101,50,91,6,106,163,97,69,228,116,63,16,70,32,126,170,50,218,128,115,40,9,49,208,120,11,245,85,105,38,228,106,37,163,194,212,218,219,112,103,188,229,7,184,52,245,165,120,39,239,77,106,221,133,80,212,224,222,0,185,161,46,83,3,241,38,203,161,197,168,10,41,117,48,25,217,109,133,110,201,181,58,80,51,88,26,123,6,222,4,115,36,74,251,162,217,247,233,246,82,131,162,132,136,169,216,132,5,81,73,179,194,233,44,57,95,59,189,103,163,23,29,136,95,48,203,222,129,26,25,8,247,55,189,214,25,16,113,3,43,102,119,129,74,80,249,57,7,136,92,110,161,148,196,66,19,152,185,175,170,45,0,122,80,162,86,219,74,249,24,187,84,7,25,88,105,33,45,59,7,233,35,4,250,1,50,136,86,199,214,71,43,68,171,244,218,112,16,175,58,166,187,237,84,220,116,193,62,239,197,96,48,16,193,159,13,21,43,146,132,250,32,48,175,220,71,114,135,254,213,
+19,119,24,45,67,183,159,135,144,35,67,112,11,211,215,167,54,114,30,242,5,40,163,104,238,96,210,183,86,52,55,72,21,231,54,145,26,141,205,4,132,69,170,209,140,254,56,205,214,29,165,90,133,193,179,110,8,227,215,92,56,171,204,122,164,46,184,112,230,1,249,1,42,233,176,8,33,193,230,101,84,148,57,58,249,47,25,160,122,167,75,178,127,103,11,33,67,21,203,188,103,245,3,187,117,0,237,98,2,251,85,221,195,174,33,14,116,223,219,202,9,123,94,90,241,252,196,42,42,56,33,248,224,196,149,187,37,167,41,40,209,115,72,218,69,187,173,13,222,7,127,82,31,219,218,131,244,198,246,173,90,143,244,28,50,18,118,125,193,201,212,131,132,26,156,44,100,129,55,35,184,25,13,167,193,201,100,8,101,41,187,19,175,31,81,78,128,106,0,82,217,144,95,34,230,109,157,69,19,108,156,38,82,135,165,36,220,46,150,161,137,76,223,243,29,102,20,242,120,104,87,246,50,42,11,28,53,81,252,228,217,22,47,115,91,250,24,182,85,182,44,163,99,61,253,43,
+191,26,100,52,149,241,10,106,86,20,5,186,209,50,79,89,162,253,236,192,166,49,33,36,113,200,163,135,153,97,88,203,184,80,12,174,98,2,9,109,87,123,112,160,48,93,101,25,149,9,71,121,209,149,3,33,4,153,215,73,182,0,207,180,173,50,192,215,185,189,89,25,54,195,124,93,114,185,141,221,177,4,21,153,206,164,161,163,47,29,29,209,62,118,74,217,56,221,149,69,208,207,202,2,254,86,40,59,60,134,49,247,198,22,59,234,26,147,251,110,163,128,157,63,175,81,196,208,228,135,133,219,195,114,213,165,177,39,49,54,51,156,49,173,142,83,59,90,168,168,22,228,255,218,101,6,226,38,229,140,129,121,177,135,173,79,140,58,2,117,65,109,23,110,37,136,199,140,66,199,132,49,2,252,114,142,83,151,245,173,95,145,65,94,112,168,71,89,184,81,198,76,85,185,213,214,2,17,200,94,84,9,194,10,136,145,157,152,27,155,245,109,23,31,115,177,179,190,13,230,113,224,183,189,234,167,138,37,220,40,148,193,150,60,106,55,254,173,36,242,93,240,76,163,213,223,
+54,188,121,186,8,115,227,73,196,211,209,36,96,194,94,18,175,164,13,121,97,2,172,164,220,255,130,44,91,212,131,117,50,246,102,186,196,169,248,109,24,39,168,171,6,7,159,163,51,63,180,165,70,179,216,59,27,206,126,188,194,65,179,25,35,83,207,10,81,66,238,11,85,231,243,55,107,121,80,20,149,4,24,8,86,25,250,133,184,6,171,199,105,20,211,184,181,131,70,69,163,131,202,32,147,162,16,61,110,165,216,223,195,100,183,9,33,162,197,145,51,213,132,76,220,208,233,239,190,237,160,77,220,58,4,169,90,147,19,13,168,199,201,77,231,71,174,151,49,85,1,101,172,54,88,131,111,114,169,199,236,168,231,106,166,110,20,97,98,89,99,219,48,153,198,211,169,179,123,15,79,45,1,191,153,19,38,89,212,24,13,15,156,183,113,138,51,150,72,214,67,148,179,128,163,79,93,188,239,17,165,35,131,51,104,141,112,131,26,47,234,153,216,213,88,10,188,99,221,179,205,48,90,38,85,104,83,184,159,153,31,7,164,234,60,116,158,112,18,78,7,138,6,229,12,204,
+110,107,14,212,69,85,227,234,187,77,166,100,61,150,199,232,94,183,217,59,185,236,209,12,130,203,50,216,7,85,94,225,129,121,195,242,159,249,248,124,121,108,162,8,12,12,120,51,206,156,39,111,192,194,122,167,242,30,221,227,233,13,197,250,166,217,104,109,167,59,171,6,189,140,82,23,66,158,67,200,171,83,106,225,248,140,22,205,28,60,158,131,232,112,132,216,229,217,26,162,212,86,230,193,51,85,143,23,52,27,52,229,163,110,79,201,127,35,8,35,168,47,237,202,216,174,220,241,116,15,244,235,36,81,42,171,147,154,239,144,119,235,215,196,88,97,66,59,110,254,184,232,89,7,165,149,218,157,236,158,233,208,164,25,0,233,20,161,75,222,133,221,132,29,85,55,172,131,37,14,132,43,125,103,68,167,246,3,220,118,45,11,203,42,198,67,102,21,242,5,130,57,249,98,133,243,224,30,230,175,20,56,192,81,98,5,6,85,103,151,5,181,140,107,4,194,175,9,13,225,21,92,255,158,16,64,160,128,93,96,209,104,4,90,88,67,127,32,126,92,225,216,35,199,68,247,
+232,48,1,110,205,216,157,1,97,181,93,180,34,15,215,41,90,89,238,225,7,232,35,177,5,9,9,37,111,209,208,43,173,43,216,72,86,108,122,205,117,8,218,211,33,49,130,0,89,47,14,173,31,158,162,184,52,198,113,207,32,106,179,156,108,29,179,7,97,0,232,81,15,209,19,255,43,243,204,148,11,168,9,220,244,89,174,251,106,74,8,180,194,78,225,170,96,226,175,160,166,150,64,181,231,30,93,50,77,31,58,7,115,94,122,106,171,173,84,39,36,58,17,68,123,162,43,196,209,59,216,45,88,174,45,227,91,234,234,237,60,135,200,83,15,6,49,9,115,88,150,199,197,125,79,63,207,118,219,12,74,31,28,161,210,1,43,97,133,197,155,120,189,193,174,208,172,119,108,36,222,191,159,76,206,47,167,103,103,227,209,198,155,189,234,140,188,243,46,29,118,139,31,53,85,127,58,229,7,215,217,150,36,134,7,255,122,53,226,19,241,107,112,20,42,219,253,96,142,87,16,67,125,232,231,12,136,109,57,4,212,85,115,126,61,48,111,79,175,17,16,161,6,62,247,73,
+6,236,45,74,23,210,188,131,81,7,39,112,201,107,176,195,177,40,52,125,178,141,230,128,134,223,46,15,124,142,103,134,199,192,199,46,83,92,141,204,205,234,135,240,241,76,181,71,207,121,248,219,194,205,163,90,59,141,101,81,245,44,246,224,212,248,227,244,166,120,9,197,237,49,98,238,17,153,33,6,229,26,129,208,25,201,17,10,61,87,12,118,131,198,138,233,65,65,29,139,152,133,208,219,205,171,149,166,106,249,184,100,71,232,58,186,126,152,110,165,219,230,44,121,208,164,206,49,208,239,48,157,181,242,187,22,241,13,37,108,66,172,87,57,155,75,22,218,110,4,52,112,186,34,234,224,205,241,160,110,60,192,69,123,20,37,22,50,202,184,214,212,113,11,231,53,14,1,110,74,209,243,58,60,239,138,49,130,223,198,33,48,11,123,0,86,98,169,225,83,109,249,28,184,72,86,126,215,221,45,140,7,133,233,248,200,25,94,65,21,33,124,67,240,1,233,122,92,136,192,3,203,158,143,138,173,241,170,133,252,143,248,4,213,211,147,138,21,38,128,11,138,241,248,212,59,
+51,226,32,251,88,187,248,73,208,175,166,198,213,171,126,208,175,94,57,248,162,156,29,255,116,41,205,165,253,94,66,207,152,136,216,176,73,171,239,55,112,253,74,69,217,54,78,75,229,234,153,22,255,95,115,241,223,98,232,100,239,98,101,190,131,161,3,158,6,212,103,62,145,183,48,223,235,12,3,197,200,0,234,45,42,101,56,30,218,172,161,4,101,141,158,24,114,210,64,10,205,248,80,105,1,149,82,219,62,206,43,84,165,33,252,19,36,130,160,31,27,93,9,58,151,130,39,86,101,238,71,38,174,210,106,22,162,141,133,84,176,17,243,27,54,226,91,251,150,183,167,161,255,51,117,112,206,190,165,117,62,143,252,33,251,162,15,49,219,122,226,223,52,88,3,123,195,22,63,64,159,27,219,79,163,92,43,56,112,167,45,176,111,33,159,170,227,0,95,180,233,100,203,50,201,30,84,204,139,166,232,215,238,121,137,149,255,97,9,95,180,40,127,163,199,15,71,88,133,16,223,132,120,91,46,10,236,227,52,80,157,97,176,113,197,243,203,151,143,226,25,106,150,140,34,136,
+134,133,24,114,143,41,152,122,203,234,49,224,170,142,197,192,175,21,216,230,33,97,145,122,147,245,77,188,130,122,89,174,138,35,226,126,253,245,17,24,58,251,104,139,235,146,123,200,113,191,126,232,229,75,104,136,30,130,173,94,187,37,210,14,42,115,5,161,147,19,136,126,223,182,190,99,13,109,12,75,163,122,245,245,241,87,196,220,81,56,251,242,56,103,174,91,214,116,71,118,100,39,251,10,241,212,35,218,235,63,202,48,129,26,178,37,80,5,246,89,27,234,38,149,46,220,49,91,5,95,182,52,250,55,110,156,161,16,63,182,19,254,117,12,102,159,229,199,96,62,28,131,169,131,56,170,248,18,121,59,28,220,145,55,44,17,168,151,171,70,2,58,172,43,40,10,210,101,245,24,251,82,137,119,24,7,123,226,223,37,192,168,119,241,110,39,151,71,72,127,64,118,15,147,6,118,15,80,198,86,227,63,35,76,169,229,175,190,115,51,213,55,110,200,176,3,210,170,193,130,206,50,133,78,52,149,88,54,160,66,155,189,151,229,160,86,216,232,232,161,189,174,41,45,143,208,
+77,190,173,121,93,45,174,209,208,180,225,247,182,128,172,214,34,133,234,90,31,186,250,13,126,106,209,249,192,78,175,227,53,231,220,95,185,55,47,204,238,127,0,117,255,211,80,247,31,129,250,249,167,161,126,254,113,212,167,159,132,249,244,227,136,191,248,36,196,95,84,136,255,108,12,171,245,136,224,109,1,30,71,133,98,189,243,61,27,66,231,59,185,106,118,190,118,249,71,90,223,89,21,21,233,68,76,25,184,102,253,86,109,2,223,129,113,54,205,77,129,19,35,117,96,119,0,134,224,189,208,205,145,230,106,166,7,243,181,224,78,135,148,109,14,116,97,26,175,58,126,100,118,44,247,13,190,58,32,102,181,167,63,13,85,173,130,151,16,0,31,77,134,219,175,6,173,187,77,156,200,199,112,254,125,150,237,6,149,225,104,88,36,115,28,189,153,81,15,54,230,124,126,77,93,171,70,232,155,120,217,148,114,153,181,164,2,83,48,63,220,33,27,12,221,199,49,145,153,193,35,205,250,248,227,32,174,133,159,196,30,48,129,135,69,60,233,136,171,193,132,1,224,123,91,248,
+251,221,154,69,250,31,14,232,78,239,48,243,113,192,92,99,158,153,7,90,232,154,204,224,148,230,117,255,195,188,230,156,181,231,21,35,246,121,229,183,142,44,38,3,248,116,172,102,199,2,79,231,158,16,186,248,248,128,173,246,232,165,158,27,216,42,168,107,153,195,127,238,90,108,170,28,38,234,60,180,71,30,71,197,193,49,214,35,132,185,193,207,253,11,62,227,201,202,245,198,76,192,122,206,151,40,116,76,225,206,127,104,227,52,191,105,209,95,80,184,178,184,62,180,200,101,248,174,138,69,215,97,169,240,155,208,125,92,152,137,115,42,115,154,38,38,224,212,216,233,43,32,19,109,142,135,5,126,223,241,109,34,63,184,79,127,8,97,17,247,24,90,65,248,241,79,146,232,243,55,27,167,113,46,129,163,79,45,67,133,168,71,131,102,232,216,113,174,202,103,192,4,90,159,140,234,79,244,128,109,122,110,78,70,121,192,110,63,126,66,121,85,161,244,135,210,122,137,114,14,132,97,185,140,105,146,187,69,190,233,96,2,225,92,0,198,209,131,128,33,169,198,194,85,174,166,
+9,0,245,161,107,154,202,113,89,161,248,222,93,175,241,86,235,244,47,168,140,1,154,235,63,71,220,52,143,113,198,92,213,225,173,89,9,70,250,198,230,210,106,132,195,7,73,243,54,220,204,37,49,248,20,26,131,39,18,153,126,10,145,233,99,136,212,170,130,209,108,140,33,154,127,51,144,196,139,92,255,144,101,8,207,185,44,24,77,46,174,166,23,103,35,175,81,22,124,167,143,22,63,82,21,224,39,85,92,144,144,28,123,39,65,152,169,136,135,158,56,199,119,252,59,49,94,126,116,4,132,24,41,80,61,26,161,254,180,252,1,124,16,85,30,141,141,6,156,15,224,162,15,200,30,135,140,143,88,142,225,194,152,252,220,214,137,109,92,58,26,152,201,81,142,53,15,157,67,221,129,49,21,157,203,184,248,138,44,248,93,21,57,108,200,35,220,105,190,66,243,13,170,29,202,209,199,227,4,89,61,171,143,154,52,250,35,134,134,10,231,86,230,20,90,52,234,14,163,235,154,192,204,128,181,64,193,57,169,129,233,134,149,39,124,171,188,92,43,99,104,70,238,176,100,95,
+247,35,179,196,107,45,73,141,107,152,37,213,119,49,238,15,99,232,32,180,246,13,139,131,129,220,225,0,124,245,241,37,129,211,97,249,129,212,84,59,253,192,100,214,177,9,178,101,112,214,29,127,205,168,204,9,124,135,78,104,233,231,146,170,10,249,33,255,96,108,254,92,83,241,157,79,7,172,183,209,239,67,82,251,197,91,109,106,205,96,143,97,70,31,235,61,146,29,100,253,201,204,224,79,216,58,109,22,244,47,219,180,210,65,211,252,211,148,225,96,48,30,93,156,95,212,48,224,199,224,74,118,156,98,170,141,142,215,44,171,121,80,109,140,159,229,197,131,224,138,62,100,60,12,76,74,249,40,52,47,59,244,131,175,131,72,111,212,183,80,7,60,96,34,10,54,104,20,251,51,184,224,100,25,222,7,39,248,81,226,22,158,109,130,19,202,222,193,201,189,12,115,184,65,235,28,13,72,55,234,151,120,251,84,122,60,119,209,36,161,80,41,36,95,111,178,50,231,171,135,57,218,74,250,14,232,40,83,255,35,139,183,247,204,88,155,161,168,204,115,250,136,48,102,31,180,
+155,240,191,198,151,211,100,251,255,15,155,94,20,96,
diff --git a/uppsrc/Esc/srcdoc.tpp/all.i b/uppsrc/Esc/srcdoc.tpp/all.i
new file mode 100644
index 000000000..23cf273c6
--- /dev/null
+++ b/uppsrc/Esc/srcdoc.tpp/all.i
@@ -0,0 +1,4 @@
+TOPIC("Esc$en-us")
+#include "Esc$en-us.tpp"
+END_TOPIC
+
diff --git a/uppsrc/GLCtrl/GLCtrl.h b/uppsrc/GLCtrl/GLCtrl.h
new file mode 100644
index 000000000..d6526e9e8
--- /dev/null
+++ b/uppsrc/GLCtrl/GLCtrl.h
@@ -0,0 +1,133 @@
+#ifndef _GLCtrl_GLCtrl_h
+#define _GLCtrl_GLCtrl_h
+
+#include <CtrlLib/CtrlLib.h>
+
+#include <GL/gl.h>
+#include <GL/glu.h>
+
+NAMESPACE_UPP
+
+#ifdef PLATFORM_X11
+
+#include <GL/glx.h>
+
+class GLCtrl : public DHCtrl
+{
+	private:
+
+		// OpenGL Context
+		GLXContext WindowContext;
+
+		// Number of instances
+		static int Instances;
+
+		// Current instance number
+		int InstanceNum;
+
+		// OpenGL parameters
+		int DepthSize;
+		int StencilSize;
+		int NumberOfSamples;
+		bool DoubleBuffering;
+		bool MultiSampleBuffering;
+
+		// Currently activated context number
+		static int ContextActivated;
+
+		// Activates current OpenGL context
+		void ActivateContext();
+
+		// Ovverridden method to choose the correct visual
+		virtual XVisualInfo *CreateVisual(void);
+
+		// Overridden method for attribute setting
+		virtual void SetAttributes(unsigned long &ValueMask, XSetWindowAttributes &attr);
+
+		// Overridden method to create and destroy OpenGL context
+		virtual void AfterInit(bool Error);
+		virtual void BeforeTerminate(void);
+
+		// Overridden method to resize GL windows
+		virtual void Resize(int w, int h);
+
+		// Internal OpenGL Paint method
+		void doPaint(void);
+
+		// Paint method - with graphic context
+		// Called from DHCtrl - Graphic context is *not* uses
+		virtual void Paint(Draw &/*draw*/);
+
+	protected:
+
+		// Overridable methods for derived controls
+
+		// Called after succesful OpenGL initialization
+		virtual void GLInit() {};
+
+		// Called just before OpenGL termination
+		virtual void GLDone() {};
+
+		// Called on resize events
+		virtual void GLResize( int w, int h ) {};
+
+		// Called on paint events
+		virtual void GLPaint() {};
+
+	public:
+
+		typedef GLCtrl CLASSNAME;
+
+		// Constructor class GLCtrl
+		GLCtrl(	int		depthsize            = 24,
+	    		int		stencilsize          = 0,
+	    		bool	doublebuffer         = true,
+				bool	multisamplebuffering = false,
+				int		numberofsamples      = 0 );
+
+		// Destructor class GLCtrl
+		~GLCtrl();
+
+		// Initializes OpenGL context to a standard view
+		void StdView();
+
+		// Forces control repaint
+		void PostPaintGL(); // same as Refresh()
+
+		// Forces control resize
+		void PostResizeGL();
+
+}; // END Class GLCtrl
+
+#else
+
+class GLCtrl : public DHCtrl {
+public:
+	virtual void    State(int reason);
+	virtual LRESULT WindowProc(UINT message, WPARAM wParam, LPARAM lParam);
+
+private:
+	HDC   hDC;
+	HGLRC hRC;
+
+	void OpenGL();
+	void CloseGL();
+
+public:
+	virtual void GLPaint();
+
+	Callback WhenGLPaint;
+
+	void    StdView();
+
+	HDC     GetDC() const            { return hDC; }
+	HGLRC   GetHGLRC() const         { return hRC; }
+
+	GLCtrl();
+	~GLCtrl();
+};
+#endif
+
+END_UPP_NAMESPACE
+
+#endif
diff --git a/uppsrc/GLCtrl/GLCtrl.upp b/uppsrc/GLCtrl/GLCtrl.upp
new file mode 100644
index 000000000..73f5e635e
--- /dev/null
+++ b/uppsrc/GLCtrl/GLCtrl.upp
@@ -0,0 +1,13 @@
+uses
+	CtrlLib;
+
+library(WIN32 GCC) "glaux glu32 opengl32";
+
+library(LINUX) "GL GLU";
+
+library(FREEBSD) "GL GLU";
+
+file
+	GLCtrl.h,
+	Win32GlCtrl.cpp,
+	X11GLCtrl.cpp;
diff --git a/uppsrc/GLCtrl/Win32GlCtrl.cpp b/uppsrc/GLCtrl/Win32GlCtrl.cpp
new file mode 100644
index 000000000..5b50b369e
--- /dev/null
+++ b/uppsrc/GLCtrl/Win32GlCtrl.cpp
@@ -0,0 +1,109 @@
+#include "GLCtrl.h"
+
+NAMESPACE_UPP
+
+#ifdef PLATFORM_WIN32
+
+#pragma comment( lib, "opengl32.lib" )	// Search For OpenGL32.lib While Linking
+#pragma comment( lib, "glu32.lib" )		// Search For GLu32.lib While Linking
+#pragma comment( lib, "glaux.lib" )		// Search For GLaux.lib While Linking
+
+GLCtrl::GLCtrl()
+{
+	hDC = NULL;
+	hRC = NULL;
+}
+
+GLCtrl::~GLCtrl()
+{
+	CloseGL();
+}
+
+void GLCtrl::OpenGL()
+{
+	HWND hwnd = GetHWND();
+	if(!hwnd)
+		return;
+	hDC = ::GetDC(hwnd);
+	if(!hDC)
+		return;
+	PIXELFORMATDESCRIPTOR pfd;
+	memset(&pfd, 0, sizeof(pfd));
+	pfd.nSize = sizeof(pfd);
+	pfd.nVersion = 1;
+	pfd.dwFlags = PFD_DRAW_TO_WINDOW | PFD_SUPPORT_OPENGL | PFD_DOUBLEBUFFER;
+	pfd.iPixelType = PFD_TYPE_RGBA;
+	pfd.cColorBits = 32;
+	pfd.cDepthBits = 32;
+	pfd.iLayerType = PFD_MAIN_PLANE;
+	int pf = ChoosePixelFormat(hDC, &pfd);
+	if(!pf) {
+		CloseGL();
+		return;
+	}
+	if(!SetPixelFormat(hDC, pf, &pfd)) {
+		CloseGL();
+		return;
+	}
+	DescribePixelFormat(hDC, pf, sizeof(PIXELFORMATDESCRIPTOR), &pfd);
+	hRC = wglCreateContext(hDC);
+}
+
+void GLCtrl::CloseGL()
+{
+	if(hRC)
+	    wglDeleteContext(hRC);
+	if(hDC)
+	    ReleaseDC(GetHWND(), hDC);
+}
+
+void GLCtrl::State(int reason)
+{
+	if(reason == CLOSE)
+		CloseGL();
+	DHCtrl::State(reason);
+	if(reason == OPEN)
+		OpenGL();
+}
+
+void GLCtrl::GLPaint()
+{
+	WhenGLPaint();
+}
+
+void GLCtrl::StdView()
+{
+	glShadeModel(GL_SMOOTH);
+	glClearColor(0.0f, 0.0f, 0.0f, 0.5f);
+	glClearDepth(1.0f);
+	glEnable(GL_DEPTH_TEST);
+	glDepthFunc(GL_LEQUAL);
+	glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST);
+
+	Size sz = GetSize();
+	glViewport(0, 0, (GLsizei)sz.cx, (GLsizei)sz.cy);
+	glMatrixMode(GL_PROJECTION);
+	glLoadIdentity();
+	gluPerspective(45.0f, (GLfloat)(sz.cx)/(GLfloat)(sz.cy), 1.0f, 100.0f);
+	glMatrixMode(GL_MODELVIEW);
+	glLoadIdentity();
+}
+
+LRESULT GLCtrl::WindowProc(UINT message, WPARAM wParam, LPARAM lParam)
+{
+	if(message == WM_PAINT && hDC && hRC) {
+		wglMakeCurrent(hDC, hRC);
+		GLPaint();
+		SwapBuffers(hDC);
+		wglMakeCurrent(NULL, NULL);
+		PAINTSTRUCT ps;
+		BeginPaint(GetHWND(), &ps);
+		EndPaint(GetHWND(), &ps);
+		return 0;
+	}
+	return DHCtrl::WindowProc(message, wParam, lParam);
+}
+
+#endif
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/GLCtrl/X11GLCtrl.cpp b/uppsrc/GLCtrl/X11GLCtrl.cpp
new file mode 100644
index 000000000..cb42c854a
--- /dev/null
+++ b/uppsrc/GLCtrl/X11GLCtrl.cpp
@@ -0,0 +1,244 @@
+#include "GLCtrl.h"
+
+NAMESPACE_UPP
+
+#ifdef PLATFORM_X11
+
+/////////////////////////////////////////////////////////////////////////////////////////
+// Static members initialization
+int GLCtrl::Instances = 0;
+int GLCtrl::ContextActivated = 0;
+
+/////////////////////////////////////////////////////////////////////////////////////////
+// Constructor
+GLCtrl::GLCtrl( int depthsize, int stencilsize, bool doublebuffer,
+				bool multisamplebuffering, int numberofsamples )
+{
+	// Sets the current instance number and updates total instances
+	InstanceNum = ++Instances;
+
+	WindowContext = NULL;
+
+	DepthSize        = depthsize;
+	StencilSize      = stencilsize;
+	DoubleBuffering  = doublebuffer;
+	NumberOfSamples  = numberofsamples;
+
+} // END Constructor class GLCtrl
+
+/////////////////////////////////////////////////////////////////////////////////////////
+// Destructor
+GLCtrl::~GLCtrl()
+{
+	// If glx context is still there, destroy it
+	// That can happen on unclean exit
+	if(WindowContext)
+	{
+		glXDestroyContext( (Display *)Xdisplay, WindowContext );
+		WindowContext = NULL;
+	}
+
+} // END Destructor class GLCtrl
+
+/////////////////////////////////////////////////////////////////////////////////////////
+// Ovverridden method to choose the correct visual
+XVisualInfo *GLCtrl::CreateVisual(void)
+{
+	Vector<int> visual;
+	visual << GLX_RGBA << GLX_DEPTH_SIZE << DepthSize;
+
+	if( StencilSize > 0 )
+		visual << GLX_STENCIL_SIZE << StencilSize;
+
+	if( DoubleBuffering )
+		visual << GLX_DOUBLEBUFFER;
+
+	if( MultiSampleBuffering && NumberOfSamples > 1 )
+	{
+		visual << GLX_SAMPLE_BUFFERS_ARB << 1 << GLX_SAMPLES_ARB << NumberOfSamples;
+	}
+
+	visual << None;
+
+	// Try to find a visual
+	XVisualInfo *visualInfo = NULL;
+	visualInfo = glXChooseVisual( (Display*)Xdisplay, DefaultScreen(Xdisplay), visual );
+
+	if( visualInfo == NULL )
+	{
+		SetError(true);
+		SetErrorMessage("GLCtrl : Impossible to find a suitable visual.");
+	}
+
+	return visualInfo;
+
+} // END GLCtrl::CreateVisual()
+
+
+/////////////////////////////////////////////////////////////////////////////////////////
+// Overridden method for attribute setting
+void GLCtrl::SetAttributes(unsigned long &ValueMask, XSetWindowAttributes &winAttributes)
+{
+	ValueMask |=
+		CWBorderPixel
+		| CWEventMask
+		| CWSaveUnder
+	;
+	winAttributes.border_pixel = 0;
+	winAttributes.event_mask   = ExposureMask;
+	winAttributes.save_under   = XFalse;
+
+} // END GLCtrl::SetAttributes()
+
+
+/////////////////////////////////////////////////////////////////////////////////////////
+// Activates current OpenGL context
+void GLCtrl::ActivateContext()
+{
+	if( Instances > 0 && ContextActivated != InstanceNum )
+	{
+		glXMakeCurrent( (Display*)Xdisplay, GetWindow(), WindowContext );
+		ContextActivated = InstanceNum;
+	}
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+// Overridden method to create OpenGL context
+void GLCtrl::AfterInit(bool Error)
+{
+	// Gets the activw XVisualInfo
+	XVisualInfo visualInfo = GetVisualInfo();
+
+	// Create an OpenGL rendering context
+	WindowContext = glXCreateContext
+	(
+		(Display *)Xdisplay,
+		&visualInfo,
+		NULL,		// No sharing of display lists
+		GL_TRUE		// Direct rendering if possible
+	);
+
+	if( WindowContext == NULL )
+	{
+		SetErrorMessage("GLCtrl : Error creating GLX context.");
+		SetError(true);
+	}
+
+	// Activate the created glxwindow
+	glXMakeCurrent( (Display*)Xdisplay, GetWindow(), WindowContext );
+
+	// Call user init function
+	GLInit();
+
+	// Calls resize and paint functions
+	GLResize( GetSize().cx, GetSize().cy );
+	GLPaint();
+
+} // END GLCtrl::AfterInit()
+
+
+/////////////////////////////////////////////////////////////////////////////////////////
+// Overridden method to destroy OpenGL context
+void GLCtrl::BeforeTerminate(void)
+{
+	// Calls user terminate function
+	GLDone();
+
+	// Resets context and destroys it
+	glXMakeCurrent( (Display*)Xdisplay, None, NULL );
+	glXDestroyContext( (Display *)Xdisplay, WindowContext );
+	WindowContext = NULL;
+
+} // END GLCtrl::BeforeTerminate()
+
+
+/////////////////////////////////////////////////////////////////////////////////////////
+// Overridden method to resize GL windows
+void GLCtrl::Resize(int x, int y)
+{
+	// Activates the current context
+	ActivateContext();
+
+	// Calls user resize hook
+	GLResize(x, y);
+
+} // END GLCtrl::Resize()
+
+
+/////////////////////////////////////////////////////////////////////////////////////////
+// Internal OpenGL Paint method
+void GLCtrl::doPaint(void)
+{
+	// Activates the current context
+	ActivateContext();
+
+	// Calls user paint hook
+	GLPaint();
+
+	// Swap buffers or flush as needed
+	if( DoubleBuffering )
+		glXSwapBuffers( (Display*)Xdisplay, GetWindow() ); // Buffer swap does implicit glFlush
+	else
+		glFlush();
+
+} // END GLCtrl::doPaint()
+
+
+/////////////////////////////////////////////////////////////////////////////////////////
+// Paint method - with graphic context
+void GLCtrl::Paint(Draw &draw)
+{
+	// Calls internal OpenGL Paint method
+	doPaint();
+
+} // END GLCtrl::Paint()
+
+
+/////////////////////////////////////////////////////////////////////////////////////////
+// Forces control resize
+void GLCtrl::PostResizeGL()
+{
+	// Gets sizes from Control
+	int w = GetSize().cx,
+		h = GetSize().cy;
+
+	// Calls Resize method
+	Resize(w, h);
+
+}
+
+
+/////////////////////////////////////////////////////////////////////////////////////////
+// Forces control repaint
+void GLCtrl::PostPaintGL()
+{
+	// Calls internal OpenGL Paint method
+	doPaint();
+
+} // END GLCtrl::PostPaintGL()
+
+
+/////////////////////////////////////////////////////////////////////////////////////////
+// Initializes OpenGL context to a standard view
+void GLCtrl::StdView()
+{
+	glShadeModel(GL_SMOOTH);
+	glClearColor(0.0f, 0.0f, 0.0f, 0.5f);
+	glClearDepth(1.0f);
+	glEnable(GL_DEPTH_TEST);
+	glDepthFunc(GL_LEQUAL);
+	glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST);
+
+	Size sz = GetSize();
+	glViewport(0, 0, (GLsizei)sz.cx, (GLsizei)sz.cy);
+	glMatrixMode(GL_PROJECTION);
+	glLoadIdentity();
+	gluPerspective(45.0f, (GLfloat)(sz.cx)/(GLfloat)(sz.cy), 1.0f, 100.0f);
+	glMatrixMode(GL_MODELVIEW);
+	glLoadIdentity();
+
+} // END GLCtrl::StdView()
+
+#endif
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/GLCtrl/init b/uppsrc/GLCtrl/init
new file mode 100644
index 000000000..85141d075
--- /dev/null
+++ b/uppsrc/GLCtrl/init
@@ -0,0 +1,4 @@
+#ifndef _GLCtrl_icpp_init_stub
+#define _GLCtrl_icpp_init_stub
+#include "CtrlLib/init"
+#endif
diff --git a/uppsrc/Geom/AUTHORS b/uppsrc/Geom/AUTHORS
new file mode 100644
index 000000000..f782e5b62
--- /dev/null
+++ b/uppsrc/Geom/AUTHORS
@@ -0,0 +1,2 @@
+Mirek Fidler <cxl@ntllib.org>
+Tomas Rylek  <rylek@volny.cz>
\ No newline at end of file
diff --git a/uppsrc/Geom/COPYING b/uppsrc/Geom/COPYING
new file mode 100644
index 000000000..33aa39102
--- /dev/null
+++ b/uppsrc/Geom/COPYING
@@ -0,0 +1,30 @@
+Copyright (C) 2005 Mirek Fidler, Tomas Rylek and various contributors (see AUTHORS)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to
+deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies of the Software and its Copyright notices. In addition publicly
+documented acknowledgment must be given that this software has been used if no
+source code of this software is made available publicly. This includes
+acknowledgments in either Copyright notices, Manuals, Publicity and Marketing
+documents or any documentation provided with any product containing this
+software. This License does not apply to any software that links to the
+libraries provided by this software (statically or dynamically), but only to
+the software provided.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+-----------
+
+Please see the COPYING.PLAIN for a plain-english explanation of this notice
+and it's intent.
diff --git a/uppsrc/Geom/COPYING-PLAIN b/uppsrc/Geom/COPYING-PLAIN
new file mode 100644
index 000000000..770a8132f
--- /dev/null
+++ b/uppsrc/Geom/COPYING-PLAIN
@@ -0,0 +1,33 @@
+Plain English Copyright Notice
+
+This file is not intended to be the actual License. The reason this file
+exists is that we here are programmers and engineers. We aren't lawyers. We
+provide licenses that we THINK say the right things, but we have our own
+intentions at heart. This is a plain-english explanation of what those
+intentions are, and if you follow them you will be within the "spirit" of
+the license.
+
+The intent is for us to enjoy writing software that is useful to us (the
+AUTHORS) and allow others to use it freely and also benefit from the work we
+put into making it. We don't want to restrict others using it. They should
+not *HAVE* to make the source code of the applications they write that
+simply link to these libraries (be that statically or dynamically), or for
+them to be limited as to what license they choose to use (be it open, closed
+or anything else). But we would like to know you are using these libraries.
+We simply would like to know that it has been useful to someone. This is why
+we ask for acknowledgement of some sort.
+
+You can do what you want with the source of this software - it doesn't
+matter. We still have it here for ourselves and it is open and free to use
+and download and play with. It can't be taken away. We don't really mind what
+you do with the source to your software. We would simply like to know that
+you are using it - especially if it makes it to a commerical product. If you
+simply e-mail all the AUTHORS (see COPYING and AUTHORS files) telling us, and
+then make sure you include a paragraph or page in the manual or in the "About.."
+box for the product with the copyright notice and state that you used this
+software, we will be very happy. If you want to contribute back modifications
+and fixes you may have made we will welcome those too with open arms (generally).
+If you want help with changes needed, ports needed or features to be added,
+arrangements can be easily made with some dialogue.
+
+Mirek Fidler <cxl@ntllib.org>
diff --git a/uppsrc/Geom/Coords/AUTHORS b/uppsrc/Geom/Coords/AUTHORS
new file mode 100644
index 000000000..f782e5b62
--- /dev/null
+++ b/uppsrc/Geom/Coords/AUTHORS
@@ -0,0 +1,2 @@
+Mirek Fidler <cxl@ntllib.org>
+Tomas Rylek  <rylek@volny.cz>
\ No newline at end of file
diff --git a/uppsrc/Geom/Coords/COPYING b/uppsrc/Geom/Coords/COPYING
new file mode 100644
index 000000000..33aa39102
--- /dev/null
+++ b/uppsrc/Geom/Coords/COPYING
@@ -0,0 +1,30 @@
+Copyright (C) 2005 Mirek Fidler, Tomas Rylek and various contributors (see AUTHORS)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to
+deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies of the Software and its Copyright notices. In addition publicly
+documented acknowledgment must be given that this software has been used if no
+source code of this software is made available publicly. This includes
+acknowledgments in either Copyright notices, Manuals, Publicity and Marketing
+documents or any documentation provided with any product containing this
+software. This License does not apply to any software that links to the
+libraries provided by this software (statically or dynamically), but only to
+the software provided.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+-----------
+
+Please see the COPYING.PLAIN for a plain-english explanation of this notice
+and it's intent.
diff --git a/uppsrc/Geom/Coords/COPYING-PLAIN b/uppsrc/Geom/Coords/COPYING-PLAIN
new file mode 100644
index 000000000..770a8132f
--- /dev/null
+++ b/uppsrc/Geom/Coords/COPYING-PLAIN
@@ -0,0 +1,33 @@
+Plain English Copyright Notice
+
+This file is not intended to be the actual License. The reason this file
+exists is that we here are programmers and engineers. We aren't lawyers. We
+provide licenses that we THINK say the right things, but we have our own
+intentions at heart. This is a plain-english explanation of what those
+intentions are, and if you follow them you will be within the "spirit" of
+the license.
+
+The intent is for us to enjoy writing software that is useful to us (the
+AUTHORS) and allow others to use it freely and also benefit from the work we
+put into making it. We don't want to restrict others using it. They should
+not *HAVE* to make the source code of the applications they write that
+simply link to these libraries (be that statically or dynamically), or for
+them to be limited as to what license they choose to use (be it open, closed
+or anything else). But we would like to know you are using these libraries.
+We simply would like to know that it has been useful to someone. This is why
+we ask for acknowledgement of some sort.
+
+You can do what you want with the source of this software - it doesn't
+matter. We still have it here for ourselves and it is open and free to use
+and download and play with. It can't be taken away. We don't really mind what
+you do with the source to your software. We would simply like to know that
+you are using it - especially if it makes it to a commerical product. If you
+simply e-mail all the AUTHORS (see COPYING and AUTHORS files) telling us, and
+then make sure you include a paragraph or page in the manual or in the "About.."
+box for the product with the copyright notice and state that you used this
+software, we will be very happy. If you want to contribute back modifications
+and fixes you may have made we will welcome those too with open arms (generally).
+If you want help with changes needed, ports needed or features to be added,
+arrangements can be easily made with some dialogue.
+
+Mirek Fidler <cxl@ntllib.org>
diff --git a/uppsrc/Geom/Coords/Coords.upp b/uppsrc/Geom/Coords/Coords.upp
new file mode 100644
index 000000000..daf643df3
--- /dev/null
+++ b/uppsrc/Geom/Coords/Coords.upp
@@ -0,0 +1,15 @@
+uses
+	TCore,
+	Geom;
+
+file
+	GeomCoords.h,
+	util.cpp,
+	ellipsoid.cpp,
+	coords.cpp,
+	method.h,
+	method.cpp,
+	Info readonly separator,
+	COPYING,
+	COPYING-PLAIN,
+	AUTHORS;
diff --git a/uppsrc/Geom/Coords/GeomCoords.h b/uppsrc/Geom/Coords/GeomCoords.h
new file mode 100644
index 000000000..d7696b29a
--- /dev/null
+++ b/uppsrc/Geom/Coords/GeomCoords.h
@@ -0,0 +1,597 @@
+#ifndef _Geom_Coords_Coords_h_
+#define _Geom_Coords_Coords_h_
+
+#include <Geom/Geom.h>
+#include <TCore/TCore.h>
+
+NAMESPACE_UPP
+
+#define MINRAD (DEGRAD / 60.0)
+#define SECRAD (DEGRAD / 3600.0)
+#define ANGDEG(d, m, s) ((d) + (m) / 60.0 + (s) / 3600.0)
+#define ANGRAD(d, m, s) (DEGRAD * ANGDEG((d), (m), (s)))
+
+double DegreeStep(double min_degrees);
+int    GisLengthDecimals(double pixel_len);
+int    DegreeDecimals(double pixel_angle);
+String FormatDegree(double degrees, int decimals);
+Value  ScanDegree(const char *p);
+int    DegreeMask(double start_angle, double end_angle);
+enum { AM_E0 = 1, AM_E1 = 2, AM_E2 = 4, AM_E3 = 8, AM_Q0 = 16, AM_Q1 = 32, AM_Q2 = 64, AM_Q3 = 128 };
+Rectf  DegreeToExtent(const Rectf& eps_rho);
+inline Rectf DegreeToExtent(double minphi, double minrho, double maxphi, double maxrho) { return DegreeToExtent(Rectf(minphi, minrho, maxphi, maxrho)); }
+Rectf  ExtentToDegree(const Rectf& xy);
+
+inline double SafeArcCos(double d) { return d <= -1 ? M_PI : d >= 1 ? 0 : acos(d); }
+inline double SafeArcCos(double d, bool turn) { return turn ? -SafeArcCos(d) : SafeArcCos(d); }
+inline double SafeArcSin(double d) { return d <= -1 ? -M_PI / 2 : d >= 1 ? +M_PI / 2 : asin(d); }
+
+inline double Determinant(double a1, double a2, double a3, double b1, double b2, double b3, double c1, double c2, double c3)
+{
+	return a1 * (b2 * c3 - b3 * c2) + a2 * (b3 * c1 - b1 * c3) + a3 * (b1 * c2 - b2 * c1);
+}
+
+class GisBSPTree
+{
+public:
+	struct Split;
+
+	struct Node
+	{
+		Node() {}
+		Node(int branch) : branch(branch) {}
+		Node(One<Split> split) : branch(-1), split(split) {}
+		int        branch;
+		One<Split> split;
+	};
+
+	struct Split
+	{
+		Split(Pointf n, double c, pick_ Node& minus, pick_ Node& plus)
+			: n(n), c(c), minus(minus), plus(plus) {}
+
+		Pointf     n;
+		double     c; // np = c
+		Node       minus; // np - c < 0
+		Node       plus; // np - c > 0
+	};
+
+	struct Tree : RefBase
+	{
+		Tree(pick_ Node& root) : root(root) {}
+
+		Node root;
+	};
+
+public:
+	GisBSPTree() {}
+	GisBSPTree(int branch) : tree(new Tree(Node(branch))) {}
+	GisBSPTree(pick_ Node& root) : tree(new Tree(root)) {}
+
+	bool         IsEmpty() const   { return !tree->root.split; }
+	int          GetBranch() const { return tree->root.branch; }
+	const Node&  GetRoot() const   { return tree->root; }
+
+private:
+	RefCon<Tree> tree;
+};
+
+class ConvertDegree : public Convert
+{
+public:
+	ConvertDegree(int decimals = 3, bool not_null = true, double min = -360, double max = +360);
+	virtual ~ConvertDegree();
+
+	virtual Value    Format(const Value& v) const;
+	virtual Value    Scan(const Value& v) const;
+	virtual int      Filter(int c) const;
+
+	ConvertDegree&   Decimals(int d)                 { decimals = d; return *this; }
+	int              GetDecimals() const             { return decimals; }
+
+	ConvertDegree&   NotNull(bool nn = true)         { not_null = nn; return *this; }
+	bool             IsNotNull() const               { return not_null; }
+
+	ConvertDegree&   MinMax(double l, double h)      { min = l; max = h; return *this; }
+	double           GetMin() const                  { return min; }
+	double           GetMax() const                  { return max; }
+
+private:
+	int              decimals;
+	bool             not_null;
+	double           min, max;
+};
+
+class GisFunction
+{
+public:
+	virtual ~GisFunction() {}
+	virtual double Get(double x) const = 0;
+	double         operator () (double x) const { return Get(x); }
+	void           Dump(double xmin, double xmax, int steps) const;
+};
+
+class GisInverse : public GisFunction
+{
+public:
+	GisInverse(double xmin, double xmax, const GisFunction& fn, int sections, double epsilon);
+
+	double              GetXMin() const { return xmin; }
+	double              GetXMax() const { return xmin; }
+	double              GetYMin() const { return ymin; }
+	double              GetYMax() const { return ymax; }
+
+	virtual double      Get(double y) const;
+
+private:
+	double              xmin, xmax;
+	double              ymin, ymax;
+	double              rawxmin, rawxmax;
+	double              rawymin, rawymax;
+	double              xstep, ystep;
+	double              epsilon;
+	const GisFunction&  fn;
+	Vector<double>      ymap;
+	VectorMap<int, int> accel;
+};
+
+String GisInverseDelta(double xmin, double xmax, const GisFunction& fn, int sections, double epsilon, int samples);
+String GisInverseTiming(double xmin, double xmax, const GisFunction& fn, int sections, double epsilon);
+
+class GisInterpolator
+{
+public:
+	GisInterpolator() {}
+//	Interpolator(Callback2<double, double&> calc, double xmin, double xmax, int min_depth, int max_depth, double epsilon)
+//	{ Create(calc, xmin, xmax, min_depth, max_depth, epsilon); }
+	GisInterpolator(double xmin, double xmax, const GisFunction& fn, int buckets, int sections, int samples) { Create(xmin, xmax, fn, buckets, sections, samples); }
+
+	void           Clear()                      { bucket_index.Clear(); abc.Clear(); }
+	bool           IsEmpty() const              { return bucket_index.IsEmpty(); }
+
+//	void           Create(Callback2<double, double&> calc, double xmin, double xmax, int min_depth, int max_depth, double epsilon);
+	void           Create(double xmin, double xmax, const GisFunction& fn, int buckets, int sections, int samples);
+	void           CreateInverse(double xmin, double xmax, const GisFunction& fn, int buckets, int sections, int samples);
+	String         CreateDump(double xmin, double xmax, const GisFunction& fn, int buckets, int sections, int samples, int check);
+	String         CreateInverseDump(double xmin, double xmax, const GisFunction& fn, int buckets, int sections, int samples, int check);
+	String         Dump(const GisFunction& fn, int check);
+
+	double         GetXMin() const              { return xmin; }
+	double         GetXMax() const              { return xmax; }
+
+	double         Get(double x) const;
+	double         operator () (double x) const { return Get(x); }
+//	double         Linear(double x) const;
+
+private:
+/*
+	struct Tree
+	{
+		double    mid_y;
+		One<Tree> left;
+		One<Tree> right;
+	};
+
+	One<Tree> CreateTree(Callback2<double, double&> calc,
+		const Rectf& extent, const Pointf& mid,
+		int depth, int min_depth, int max_depth, double epsilon);
+*/
+
+private:
+	struct Bucket : Moveable<Bucket>
+	{
+		int    begin, count;
+		double a0, a1, a2;
+	};
+
+	double         xmin, xmax;
+	double         step;
+	int            limit;
+/*
+	Vector<short>  index;
+	Vector<short>  begin;
+	Vector<short>  len;
+	Vector<double> abc;
+*/
+//	Vector<Bucket> bucket_list;
+	Vector<unsigned> bucket_index;
+	Vector<double> abc;
+//	Rectf     extent;
+//	double         divisor;
+//	Vector<double> y;
+//	int       scale;
+//	One<Tree> tree;
+};
+
+String GisInterpolatorDelta(double xmin, double xmax, const GisFunction& fn, int buckets, int sections, int samples, int check);
+String GisInterpolatorTiming(double xmin, double xmax, const GisFunction& fn, int buckets, int sections, int samples, int check);
+
+class GisOrientation
+{
+public:
+	GisOrientation(Pointf lonlat_pole = Pointf(0, 90));
+
+	Pointf       Local(double lon, double lat) const                       { return (this->*localproc)(lon, lat); }
+	Pointf       Local(Pointf lonlat) const                                { return (this->*localproc)(lonlat.x, lonlat.y); }
+
+	Rectf        LocalExtent(const Rectf& lonlat) const                    { return (this->*localextent)(lonlat); }
+	Rectf        LocalExtent(double l, double t, double r, double b) const { return (this->*localextent)(Rectf(l, t, r, b)); }
+
+	Pointf       Global(double lon, double lat) const                      { return (this->*globalproc)(lon, lat); }
+	Pointf       Global(Pointf lonlat) const                               { return (this->*globalproc)(lonlat.x, lonlat.y); }
+
+	Rectf        GlobalExtent(const Rectf& lonlat) const                   { return (this->*globalextent)(lonlat); }
+	Rectf        GlobalExtent(double l, double t, double r, double b) const { return (this->*globalextent)(Rectf(l, t, r, b)); }
+
+	bool         IsIdentity() const        { return identity; }
+
+private:
+	Pointf       LocalAny(double lon, double lat) const;
+	Pointf       GlobalAny(double lon, double lat) const;
+	Pointf       LocalDelta(double lon, double lat) const;
+	Pointf       GlobalDelta(double lon, double lat) const;
+	Pointf       Identity(double lon, double lat) const;
+
+	Rectf        LocalAnyExtent(const Rectf& lonlat) const;
+	Rectf        GlobalAnyExtent(const Rectf& lonlat) const;
+	Rectf        LocalDeltaExtent(const Rectf& lonlat) const;
+	Rectf        GlobalDeltaExtent(const Rectf& lonlat) const;
+	Rectf        IdentityExtent(const Rectf& lonlat) const;
+
+private:
+	Pointf       (GisOrientation::*localproc)(double lon, double lat) const;
+	Pointf       (GisOrientation::*globalproc)(double lon, double lat) const;
+	Rectf        (GisOrientation::*localextent)(const Rectf& rc) const;
+	Rectf        (GisOrientation::*globalextent)(const Rectf& rc) const;
+	bool         identity;
+	Pointf       pole;
+	double       delta_phi;
+	double       suk, cuk;
+	bool         sukneg, cukneg;
+};
+
+class GisEllipsoid
+{
+public:
+	GisEllipsoid() : a(0), from_wgs84(Matrixf3_1()) {}
+
+	static const Index<int>&  EnumEPSG();
+	static GisEllipsoid       GetEPSG(int code);
+
+	static GisEllipsoid       AB(double a, double b);
+	static GisEllipsoid       AI(double a, double i);
+	static GisEllipsoid       AE2(double a, double e2);
+	static GisEllipsoid       R(double r);
+
+	enum
+	{
+		BESSEL_1841     = 7004,
+		HAYFORD_1909    = 7022,
+		KRASSOWSKY_1940 = 7024,
+		WGS_1984        = 7030,
+	};
+
+	bool                      IsNullInstance() const { return !a; }
+	bool                      IsSphere() const       { return b == a; }
+
+	double                    M(double phi) const    { double t = 1 - e2 * sqr(sin(phi)); return a * a / (b * t * sqrt(t)); }
+	double                    N(double phi) const    { double t = 1 - e2 * sqr(sin(phi)); return a / sqrt(t); }
+
+	Pointf3                   To3D(double lon, double lat, double elev = 0) const;
+	Pointf3                   To3D(const Pointf& lonlat, double elev = 0) const { return To3D(lonlat.x, lonlat.y, elev); }
+	Pointf3                   To3D(const Pointf3& lonlatelev) const             { return To3D(lonlatelev.x, lonlatelev.y, lonlatelev.z); }
+	Pointf                    From3D(double x, double y, double z) const;
+	Pointf                    From3D(const Pointf3& xyz) const { return From3D(xyz.x, xyz.y, xyz.z); }
+
+public:
+	double                    a;
+	double                    b;
+	double                    e2;
+	double                    i;
+
+	Matrixf3                  from_wgs84;
+
+	int                       epsg_code;
+	String                    name;
+	String                    description;
+	String                    source;
+};
+
+bool operator == (const GisEllipsoid& ea, const GisEllipsoid& eb);
+inline bool operator != (const GisEllipsoid& ea, const GisEllipsoid& eb) { return !(ea == eb); }
+
+class GisCoords : Moveable<GisCoords>
+{
+public:
+	enum STYLE
+	{
+		STYLE_EDIT,
+		STYLE_ANGLE,
+		STYLE_DROPLIST,
+		STYLE_OPTION,
+		STYLE_OPTION3,
+	};
+
+	struct Arg
+	{
+		Arg() : vtype(ERROR_V), min(Null), max(Null), not_null(true) {}
+
+		static Arg Edit(double& v, String ident, String name, String help_topic = Null, double min = Null, double max = Null, bool not_null = true);
+		static Arg Angle(double& v, String ident, String name, String help_topic = Null, double min = -2 * M_PI, double max = +2 * M_PI, bool not_null = true);
+		static Arg Edit(String& v, String ident, String name, String help_topic = Null, bool not_null = true);
+		static Arg Edit(Date& d, String ident, String name, String help_topic = Null, bool not_null = true);
+		static Arg Edit(Time& t, String ident, String name, String help_topic = Null, bool not_null = true);
+		static Arg DropList(String& v, String ident, String name, String help_topic, String variants, bool not_null = true);
+		static Arg Option(bool& b, String ident, String name, String help_topic = Null);
+		static Arg Option3(int& b, String ident, String name, String help_topic = Null);
+
+		Arg&       Cond(String ident, Value value) { cond_ident = ident; cond_value = value; return *this; }
+
+		String     ident;
+		String     name;
+		String     help_topic;
+		int        vtype;
+		STYLE      style;
+		String     variants;
+		String     cond_ident;
+		Value      cond_value;
+		double     min;
+		double     max;
+		bool       not_null;
+		Ref        ref;
+	};
+
+	struct ConstArg
+	{
+		ConstArg(String ident, String name, Value value, String help_topic = Null)
+		: ident(ident), name(name), value(value), help_topic(help_topic) {}
+
+		String     ident;
+		String     name;
+		Value      value;
+		String     help_topic;
+	};
+
+	class Data : public RefBase
+	{
+	public:
+		Data();
+
+		virtual GisCoords             DeepCopy() const = 0;
+
+		virtual int                   GetBranchCount() const;
+		virtual Array<Pointf>         LonLatBoundary(const Rectf& lonlat_extent, int branch) const;
+		virtual GisBSPTree            GetBranchTree(const Rectf& lonlat_extent) const;
+
+		virtual Pointf                LonLat(Pointf xy) const = 0;
+		virtual Rectf                 LonLatExtent(const Rectf& xy_extent) const;
+		Pointf3                       LonLat3D(Pointf xy, double elevation = 0) const { return ellipsoid.To3D(LonLat(xy), elevation); }
+		virtual Pointf                Project(Pointf lonlat, int branch) const = 0;
+		virtual Rectf                 ProjectExtent(const Rectf& lonlat_extent) const;
+		Pointf                        Project3D(Pointf3 xyz, int branch) const        { return Project(ellipsoid.From3D(xyz), branch); }
+		virtual double                ProjectDeviation(Pointf lonlat1, Pointf lonlat2, int branch) const;
+		virtual double                ProjectRatio(Pointf lonlat, int branch) const;
+		virtual double                ExtentDeviation(const Rectf& lonlat_extent) const;
+		virtual Sizef                 MinMaxRatio(const Rectf& lonlat_extent) const;
+
+//		virtual String                ToString() const = 0;
+		virtual Array<Arg>            EnumArgs() = 0;
+		virtual Array<ConstArg>       EnumConstArgs() const = 0;
+		virtual void                  SyncArgs() = 0;
+
+		virtual bool                  IsProjected() const;
+		bool                          IsIdentity(const Data *data) const;
+
+	public:
+		String                        ident;
+		GisEllipsoid                  ellipsoid;
+		Rectf                         lonlat_limits;
+		int                           epsg_code;
+		String                        name;
+		String                        description;
+		String                        coordsys;
+	};
+
+	GisCoords(const Nuller& = Null) {}
+	GisCoords(RefPtr<Data> data) : data(data) {}
+	GisCoords(Data *data) : data(data) {}
+	GisCoords(const Value& v)                                                                  { if(IsTypeRaw<GisCoords>(v)) *this = ValueTo<GisCoords>(v); }
+
+	operator Value() const                                                                     { return RawToValue(*this); }
+
+	bool                  IsNullInstance() const                                               { return !data; }
+	bool                  Equals(const GisCoords& co) const;
+
+	GisCoords             DeepCopy() const                                                     { return data->DeepCopy(); }
+
+	int                   GetBranchCount() const                                               { return data->GetBranchCount(); }
+	Array<Pointf>         LonLatBoundary(const Rectf& lonlat_extent, int branch) const         { return data->LonLatBoundary(lonlat_extent, branch); }
+	GisBSPTree            GetBranchTree(const Rectf& lonlat_extent) const                      { return data->GetBranchTree(lonlat_extent); }
+
+	Pointf                LonLat(Pointf xy) const                                              { return data->LonLat(xy); }
+	Rectf                 LonLatExtent(const Rectf& xy_extent) const                           { return data->LonLatExtent(xy_extent); }
+	Pointf3               LonLat3D(Pointf xy, double elevation = 0) const                      { return data->LonLat3D(xy, elevation); }
+	Pointf                Project(Pointf lonlat, int branch) const                             { return data->Project(lonlat, branch); }
+	Rectf                 ProjectExtent(const Rectf& lonlat_extent) const                      { return data->ProjectExtent(lonlat_extent); }
+	Pointf                Project3D(Pointf3 xyz, int branch) const                             { return data->Project3D(xyz, branch); }
+	double                ProjectDeviation(Pointf lonlat1, Pointf lonlat2, int branch) const   { return data->ProjectDeviation(lonlat1, lonlat2, branch); }
+	double                ProjectRatio(Pointf lonlat, int branch) const                        { return data->ProjectRatio(lonlat, branch); }
+	double                ExtentDeviation(const Rectf& lonlat_extent) const                    { return data->ExtentDeviation(lonlat_extent); }
+	Sizef                 MinMaxRatio(const Rectf& lonlat_extent) const                        { return data->MinMaxRatio(lonlat_extent); }
+	Rectf                 LonLatLimits() const                                                 { return data->lonlat_limits; }
+
+//	String                ToString() const                                                     { return data->ToString(); }
+	String                GetIdent() const                                                     { return !!data ? data->ident : String::GetVoid(); }
+	int                   GetEPSGCode() const                                                  { return !!data ? data->epsg_code : (int)Null; }
+	String                GetName() const                                                      { return !!data ? data->name : String::GetVoid(); }
+	String                GetDescription() const                                               { return !!data ? data->description : String::GetVoid(); }
+	String                GetCoordsys() const                                                  { return !!data ? data->coordsys : String::GetVoid(); }
+	Array<Arg>            EnumArgs()                                                           { return data->EnumArgs(); }
+	Array<ConstArg>       EnumConstArgs() const                                                { return data->EnumConstArgs(); }
+	void                  SyncArgs()                                                           { data->SyncArgs(); }
+
+	bool                  IsProjected() const                                                  { return data->IsProjected(); }
+	bool                  IsIdentity(GisCoords gp) const                                       { return data->IsIdentity(~gp.data); }
+
+	const GisEllipsoid&   GetEllipsoid() const                                                 { return data->ellipsoid; }
+	void                  SetEllipsoid(const GisEllipsoid& e)                                  { data->ellipsoid = e; }
+	Pointf3               To3D(Pointf lonlat, double elevation = 0) const                      { return data->ellipsoid.To3D(lonlat, elevation); }
+	Pointf                From3D(Pointf3 xyz) const                                            { return data->ellipsoid.From3D(xyz); }
+	const Matrixf3&       FromWGS84() const                                                    { return data->ellipsoid.from_wgs84; }
+
+	Data                 *operator ~ () const                                                  { return ~data; }
+
+	static const Vector<int>& EnumEPSG();
+	static GisCoords      GetEPSG(int code);
+
+public:
+	RefPtr<Data>          data;
+};
+
+inline bool operator == (const GisCoords& a, const GisCoords& b) { return a.Equals(b); }
+inline bool operator != (const GisCoords& a, const GisCoords& b) { return !a.Equals(b); }
+
+class GisTransform : Moveable<GisTransform>
+{
+public:
+	class Data : public RefBase
+	{
+	public:
+		virtual ~Data() {}
+
+		virtual bool         IsNullInstance() const { return IsNull(source) && IsNull(target); }
+		virtual GisTransform DeepCopy() const = 0;
+
+		virtual Pointf       Target(Pointf src) const = 0;
+		virtual Pointf       Source(Pointf trg) const = 0;
+		virtual Rectf        TargetExtent(const Rectf& src) const = 0;
+		virtual Rectf        SourceExtent(const Rectf& src) const = 0;
+		virtual double       SourceDeviation(Pointf src1, Pointf src2) const = 0;
+		virtual double       TargetDeviation(Pointf trg1, Pointf trg2) const = 0;
+		virtual double       SourceExtentDeviation(const Rectf& src) const = 0;
+		virtual double       TargetExtentDeviation(const Rectf& trg) const = 0;
+		virtual Sizef        SourceMinMaxRatio(const Rectf& src) const = 0;
+		virtual Sizef        TargetMinMaxRatio(const Rectf& trg) const = 0;
+		virtual GisBSPTree   TargetBranchTree(const Rectf& trg) const = 0;
+		virtual GisBSPTree   SourceBranchTree(const Rectf& src) const = 0;
+		virtual Rectf        TargetLimits() const = 0;
+		virtual Rectf        SourceLimits() const = 0;
+		virtual bool         IsProjected() const = 0;
+		virtual bool         IsIdentity() const = 0;
+
+	public:
+		GisCoords            source;
+		GisCoords            target;
+	};
+
+public:
+	GisTransform(const Nuller& = Null);
+	GisTransform(RefPtr<Data> data) : data(data) {}
+	GisTransform(Data *data) : data(data) {}
+	GisTransform(GisCoords source, GisCoords target);
+
+	bool         IsNullInstance() const                          { return data->IsNullInstance(); }
+
+	GisTransform DeepCopy() const                                { return data->DeepCopy(); }
+
+	Pointf       Target(Pointf src) const                        { return data->Target(src); }
+	Pointf       Source(Pointf trg) const                        { return data->Source(trg); }
+	Rectf        TargetExtent(const Rectf& src) const            { return data->TargetExtent(src); }
+	Rectf        SourceExtent(const Rectf& trg) const            { return data->SourceExtent(trg); }
+	double       SourceDeviation(Pointf src1, Pointf src2) const { return data->SourceDeviation(src1, src2); }
+	double       TargetDeviation(Pointf trg1, Pointf trg2) const { return data->TargetDeviation(trg1, trg2); }
+	double       SourceExtentDeviation(const Rectf& src) const   { return data->SourceExtentDeviation(src); }
+	double       TargetExtentDeviation(const Rectf& trg) const   { return data->TargetExtentDeviation(trg); }
+	Sizef        SourceMinMaxRatio(const Rectf& src) const       { return data->SourceMinMaxRatio(src); }
+	Sizef        TargetMinMaxRatio(const Rectf& trg) const       { return data->TargetMinMaxRatio(trg); }
+	GisBSPTree   SourceBranchTree(const Rectf& src) const        { return data->SourceBranchTree(src); }
+	GisBSPTree   TargetBranchTree(const Rectf& trg) const        { return data->TargetBranchTree(trg); }
+	Rectf        TargetLimits() const                            { return data->TargetLimits(); }
+	Rectf        SourceLimits() const                            { return data->SourceLimits(); }
+	bool         IsProjected() const                             { return data->IsProjected(); }
+	bool         IsIdentity() const                              { return data->IsIdentity(); }
+
+	GisCoords    Source() const                                  { return data->source; }
+	GisCoords    Target() const                                  { return data->target; }
+	GisTransform Reverse() const                                 { return GisTransform(Target(), Source()); }
+
+	Data        *operator ~ () const                             { return ~data; }
+
+	bool         Equals(const GisTransform& t) const;
+
+public:
+	RefPtr<Data> data;
+};
+
+inline bool   operator == (const GisTransform& a, const GisTransform& b) { return a.Equals(b); }
+inline bool   operator != (const GisTransform& a, const GisTransform& b) { return !a.Equals(b); }
+
+inline Pointf operator * (Pointf pt, const GisTransform& t)       { return t.Target(pt); }
+inline Rectf  operator * (const Rectf& rc, const GisTransform& t) { return t.TargetExtent(rc); }
+inline Pointf operator / (Pointf pt, const GisTransform& t)       { return t.Source(pt); }
+inline Rectf  operator / (const Rectf& rc, const GisTransform& t) { return t.SourceExtent(rc); }
+
+struct SegmentTreeInfo
+{
+	Matrixf      img_src;
+	GisTransform src_trg;
+	Matrixf      trg_pix;
+	int          branch;
+	int          max_depth;
+	double       max_deviation;
+	bool         antialias;
+};
+
+inline Point operator * (Point pt, const SegmentTreeInfo& sti) { return PointfToPoint(Pointf(pt) * sti.img_src * sti.src_trg * sti.trg_pix); }
+
+class LinearSegmentTree
+{
+public:
+	struct Node
+	{
+		Point     source;
+		Point     target;
+		One<Node> below;
+		One<Node> above;
+	};
+
+public:
+	Point     source1;
+	Point     source2;
+
+	Point     target1;
+	Point     target2;
+	One<Node> split;
+};
+
+LinearSegmentTree CreateLinearTree(Point s1, Point s2, const SegmentTreeInfo& info);
+
+class PlanarSegmentTree
+{
+public:
+	struct Split;
+	struct Node
+	{
+		Rect       source;
+		Point      trg_topleft, trg_topright, trg_bottomleft, trg_bottomright;
+		One<Split> split;
+	};
+
+	struct Split
+	{
+		Node topleft;
+		Node topright;
+		Node bottomleft;
+		Node bottomright;
+	};
+
+public:
+	Node root;
+};
+
+PlanarSegmentTree CreatePlanarTree(const LinearSegmentTree& left, const LinearSegmentTree& top,
+	const LinearSegmentTree& right, const LinearSegmentTree& bottom, const SegmentTreeInfo& info);
+
+END_UPP_NAMESPACE
+
+#endif
diff --git a/uppsrc/Geom/Coords/coords.cpp b/uppsrc/Geom/Coords/coords.cpp
new file mode 100644
index 000000000..d3eee6bb5
--- /dev/null
+++ b/uppsrc/Geom/Coords/coords.cpp
@@ -0,0 +1,481 @@
+#include "GeomCoords.h"
+#pragma hdrstop
+
+NAMESPACE_UPP
+
+GisCoords::Arg GisCoords::Arg::Edit(double& v, String ident, String name, String help_topic, double min, double max, bool not_null)
+{
+	Arg out;
+	out.vtype = DOUBLE_V;
+	out.ident = ident;
+	out.name = name;
+	out.help_topic = help_topic;
+	out.style = STYLE_EDIT;
+	out.min = min;
+	out.max = max;
+	out.not_null = not_null;
+	out.ref = Ref(v);
+	return out;
+}
+
+GisCoords::Arg GisCoords::Arg::Angle(double& v, String ident, String name, String help_topic, double min, double max, bool not_null)
+{
+	Arg out;
+	out.vtype = DOUBLE_V;
+	out.ident = ident;
+	out.name = name;
+	out.help_topic = help_topic;
+	out.style = STYLE_ANGLE;
+	out.min = min;
+	out.max = max;
+	out.not_null = not_null;
+	out.ref = Ref(v);
+	return out;
+}
+
+GisCoords::Arg GisCoords::Arg::Edit(String& v, String ident, String name, String help_topic, bool not_null)
+{
+	Arg out;
+	out.vtype = STRING_V;
+	out.ident = ident;
+	out.name = name;
+	out.help_topic = help_topic;
+	out.style = STYLE_EDIT;
+	out.not_null = not_null;
+	out.ref = Ref(v);
+	return out;
+}
+
+GisCoords::Arg GisCoords::Arg::Edit(Date& d, String ident, String name, String help_topic, bool not_null)
+{
+	Arg out;
+	out.vtype = DATE_V;
+	out.ident = ident;
+	out.name = name;
+	out.help_topic = help_topic;
+	out.style = STYLE_EDIT;
+	out.not_null = not_null;
+	out.ref = Ref(d);
+	return out;
+}
+
+GisCoords::Arg GisCoords::Arg::Edit(Time& t, String ident, String name, String help_topic, bool not_null)
+{
+	Arg out;
+	out.vtype = TIME_V;
+	out.ident = ident;
+	out.name = name;
+	out.help_topic = help_topic;
+	out.style = STYLE_EDIT;
+	out.not_null = not_null;
+	out.ref = Ref(t);
+	return out;
+}
+
+GisCoords::Arg GisCoords::Arg::DropList(String& v, String ident, String name, String help_topic, String variants, bool not_null)
+{
+	Arg out;
+	out.vtype = STRING_V;
+	out.ident = ident;
+	out.name = name;
+	out.help_topic = help_topic;
+	out.style = STYLE_DROPLIST;
+	out.variants = variants;
+	out.not_null = not_null;
+	out.ref = Ref(v);
+	return out;
+}
+
+GisCoords::Arg GisCoords::Arg::Option(bool& b, String ident, String name, String help_topic)
+{
+	Arg out;
+	out.vtype = INT_V;
+	out.ident = ident;
+	out.name = name;
+	out.help_topic = help_topic;
+	out.style = STYLE_OPTION;
+	out.not_null = true;
+	out.ref = BoolAsRef(b);
+	return out;
+}
+
+GisCoords::Arg GisCoords::Arg::Option3(int& b, String ident, String name, String help_topic)
+{
+	Arg out;
+	out.vtype = INT_V;
+	out.ident = ident;
+	out.name = name;
+	out.help_topic = help_topic;
+	out.style = STYLE_OPTION3;
+	out.not_null = false;
+	out.ref = Ref(b);
+	return out;
+}
+
+GisCoords::Data::Data()
+{
+	epsg_code = 0;
+	lonlat_limits = Rectf(-180, -90, 180, 90);
+}
+
+bool GisCoords::Data::IsProjected() const
+{
+	return true;
+}
+
+int GisCoords::Data::GetBranchCount() const
+{
+	return 1;
+}
+
+Array<Pointf> GisCoords::Data::LonLatBoundary(const Rectf& lonlat_extent, int b) const
+{
+	Array<Pointf> out;
+	out.SetCount(5);
+	out[0] = lonlat_extent.TopLeft();
+	out[1] = lonlat_extent.TopRight();
+	out[2] = lonlat_extent.BottomRight();
+	out[3] = lonlat_extent.BottomLeft();
+	out[4] = lonlat_extent.TopLeft();
+	return out;
+}
+
+GisBSPTree GisCoords::Data::GetBranchTree(const Rectf& lonlat_extent) const
+{
+	return GisBSPTree::Node(0);
+}
+
+Rectf GisCoords::Data::LonLatExtent(const Rectf& xy_extent) const
+{
+	Rectf lonlat_extent = Null;
+	lonlat_extent |= LonLat(xy_extent.TopLeft());
+	lonlat_extent |= LonLat(xy_extent.TopRight());
+	lonlat_extent |= LonLat(xy_extent.BottomLeft());
+	lonlat_extent |= LonLat(xy_extent.BottomRight());
+	return lonlat_extent;
+}
+
+Rectf GisCoords::Data::ProjectExtent(const Rectf& lonlat_extent) const
+{
+//	ASSERT(GetBranchCount() == 1);
+	Rectf xy_extent = Null;
+	xy_extent |= Project(lonlat_extent.TopLeft(), 0);
+	xy_extent |= Project(lonlat_extent.TopRight(), 0);
+	xy_extent |= Project(lonlat_extent.BottomLeft(), 0);
+	xy_extent |= Project(lonlat_extent.BottomRight(), 0);
+	return xy_extent;
+}
+
+double GisCoords::Data::ProjectDeviation(Pointf lonlat1, Pointf lonlat2, int branch) const
+{
+	Pointf mid = (lonlat1 + lonlat2) / 2.0;
+	Pointf p1 = Project(lonlat1, branch), p2 = Project(mid, branch), p3 = Project(lonlat2, branch);
+	Pointf pmid = (p1 + p3) / 2.0;
+	double length = Distance(p1, p3);
+	if(length <= 1e-10)
+		return Distance(p2, pmid);
+	return ((p1 - pmid) ^ (p3 - p1)) / length;
+}
+
+double GisCoords::Data::ProjectRatio(Pointf lonlat, int branch) const
+{
+	Pointf proj = Project(lonlat, branch);
+	static const double DELTA = 1e-3;
+	Sizef east = Project(lonlat + Sizef(DELTA, 0), branch);
+	Sizef north = Project(lonlat + Sizef(0, DELTA), branch);
+	return (Length(east) + Length(north)) * (DELTA / 2);
+}
+
+double GisCoords::Data::ExtentDeviation(const Rectf& lonlat_extent) const
+{
+	return 0;
+}
+
+Sizef GisCoords::Data::MinMaxRatio(const Rectf& lonlat_extent) const
+{
+	return Sizef(1, 1);
+}
+
+bool GisCoords::Data::IsIdentity(const Data *data) const
+{
+	if(strcmp(typeid(*this).name(), typeid(*data).name()))
+		return false;
+	Array<Arg> args = const_cast<GisCoords::Data *>(this)->EnumArgs();
+	Array<Arg> args2 = const_cast<GisCoords::Data *>(data)->EnumArgs();
+	if(args.GetCount() != args2.GetCount())
+		return false;
+	for(int i = 0; i < args.GetCount(); i++)
+		if(args[i].name != args2[i].name
+		|| args[i].vtype != args2[i].vtype
+		|| Value(args[i].ref) != Value(args2[i].ref))
+			return false;
+	return true;
+}
+
+bool GisCoords::Equals(const GisCoords& co) const
+{
+	bool na = IsNullInstance(), nb = co.IsNullInstance();
+	if(na || nb)
+		return na && nb;
+	return GetIdent() == co.GetIdent();
+}
+
+class GisTransformIdentity : public GisTransform::Data
+{
+public:
+	GisTransformIdentity()                                               {}
+	virtual GisTransform DeepCopy() const                                { return new GisTransformIdentity(*this); }
+
+	virtual Pointf       Target(Pointf s) const                          { return s; }
+	virtual Pointf       Source(Pointf t) const                          { return t; }
+	virtual Rectf        TargetExtent(const Rectf& s) const              { return s; }
+	virtual Rectf        SourceExtent(const Rectf& t) const              { return t; }
+	virtual double       SourceDeviation(Pointf src1, Pointf src2) const { return 0; }
+	virtual double       TargetDeviation(Pointf trg1, Pointf trg2) const { return 0; }
+	virtual double       SourceExtentDeviation(const Rectf& src) const   { return 0; }
+	virtual double       TargetExtentDeviation(const Rectf& trg) const   { return 0; }
+	virtual Sizef        SourceMinMaxRatio(const Rectf& s) const         { return Sizef(1, 1); }
+	virtual Sizef        TargetMinMaxRatio(const Rectf& t) const         { return Sizef(1, 1); }
+	virtual GisBSPTree   TargetBranchTree(const Rectf& t) const          { return GisBSPTree(0); }
+	virtual GisBSPTree   SourceBranchTree(const Rectf& t) const          { return GisBSPTree(0); }
+	virtual Rectf        TargetLimits() const                            { return Null; }
+	virtual Rectf        SourceLimits() const                            { return Null; }
+	virtual bool         IsProjected() const                             { return true; }
+	virtual bool         IsIdentity() const                              { return true; }
+};
+
+class GisTransformProjectIdentity : public GisTransform::Data
+{
+public:
+	GisTransformProjectIdentity(GisCoords st)                            { source = target = st; }
+	virtual GisTransform DeepCopy() const                                { return new GisTransformProjectIdentity(*this); }
+
+	virtual Pointf       Target(Pointf s) const                          { return s; }
+	virtual Pointf       Source(Pointf t) const                          { return t; }
+	virtual Rectf        TargetExtent(const Rectf& s) const              { return s; }
+	virtual Rectf        SourceExtent(const Rectf& t) const              { return t; }
+	virtual double       SourceDeviation(Pointf src1, Pointf src2) const { return 0; }
+	virtual double       TargetDeviation(Pointf trg1, Pointf trg2) const { return 0; }
+	virtual double       SourceExtentDeviation(const Rectf& src) const   { return 0; }
+	virtual double       TargetExtentDeviation(const Rectf& trg) const   { return 0; }
+	virtual Sizef        SourceMinMaxRatio(const Rectf& s) const         { return Sizef(1, 1); }
+	virtual Sizef        TargetMinMaxRatio(const Rectf& t) const         { return Sizef(1, 1); }
+	virtual GisBSPTree   TargetBranchTree(const Rectf& t) const          { return GisBSPTree(0); }
+	virtual GisBSPTree   SourceBranchTree(const Rectf& s) const          { return GisBSPTree(0); }
+	virtual Rectf        TargetLimits() const                            { return target.ProjectExtent(source.LonLatLimits()); }
+	virtual Rectf        SourceLimits() const                            { return source.ProjectExtent(source.LonLatLimits()); }
+	virtual bool         IsProjected() const                             { return target.IsProjected(); }
+	virtual bool         IsIdentity() const                              { return true; }
+};
+
+class GisTransformSameEllip : public GisTransform::Data
+{
+public:
+	GisTransformSameEllip(GisCoords src, GisCoords trg)                  { source = src; target = trg; }
+
+	virtual GisTransform DeepCopy() const                                { return new GisTransformSameEllip(*this); }
+
+	virtual Pointf       Target(Pointf s) const                          { return target.Project(source.LonLat(s), 0); }
+	virtual Pointf       Source(Pointf t) const                          { return source.Project(target.LonLat(t), 0); }
+	virtual Rectf        TargetExtent(const Rectf& s) const              { return target.ProjectExtent(source.LonLatExtent(s)); }
+	virtual Rectf        SourceExtent(const Rectf& t) const              { return source.ProjectExtent(target.LonLatExtent(t)); }
+	virtual double       SourceDeviation(Pointf src1, Pointf src2) const;
+	virtual double       TargetDeviation(Pointf trg1, Pointf trg2) const;
+	virtual double       SourceExtentDeviation(const Rectf& src) const;
+	virtual double       TargetExtentDeviation(const Rectf& trg) const;
+	virtual Sizef        SourceMinMaxRatio(const Rectf& s) const;
+	virtual Sizef        TargetMinMaxRatio(const Rectf& t) const;
+	virtual GisBSPTree   TargetBranchTree(const Rectf& t) const          { return target.GetBranchTree(target.LonLatExtent(t)); }
+	virtual GisBSPTree   SourceBranchTree(const Rectf& s) const          { return target.GetBranchTree(source.LonLatExtent(s)); }
+	virtual Rectf        TargetLimits() const                            { return target.ProjectExtent(source.LonLatLimits() & target.LonLatLimits()); }
+	virtual Rectf        SourceLimits() const                            { return source.ProjectExtent(source.LonLatLimits() & target.LonLatLimits()); }
+	virtual bool         IsProjected() const                             { return target.IsProjected(); }
+	virtual bool         IsIdentity() const                              { return false; }
+
+	Matrixf3             source_ellip;
+	Matrixf3             target_ellip;
+};
+
+double GisTransformSameEllip::SourceDeviation(Pointf src1, Pointf src2) const
+{
+	Pointf ll1 = source.LonLat(src1), ll2 = source.LonLat(src2);
+	Rectf ll = SortRectf(ll1, ll2);
+	return target.ProjectDeviation(ll1, ll2, 0) + source.ProjectDeviation(ll1, ll2, 0)
+			* (target.MinMaxRatio(ll).cy / source.MinMaxRatio(ll).cx);
+}
+
+double GisTransformSameEllip::TargetDeviation(Pointf trg1, Pointf trg2) const
+{
+	Pointf ll1 = target.LonLat(trg1), ll2 = target.LonLat(trg2);
+	Rectf ll = SortRectf(ll1, ll2);
+	return target.ProjectDeviation(ll1, ll2, 0) + source.ProjectDeviation(ll1, ll2, 0)
+		* (target.MinMaxRatio(ll).cy / source.MinMaxRatio(ll).cx);
+}
+
+double GisTransformSameEllip::SourceExtentDeviation(const Rectf& src) const
+{
+	Rectf ll = source.LonLatExtent(src);
+	return target.ExtentDeviation(ll) + source.ExtentDeviation(ll)
+		* (target.MinMaxRatio(ll).cy / source.MinMaxRatio(ll).cx);
+}
+
+double GisTransformSameEllip::TargetExtentDeviation(const Rectf& trg) const
+{
+	Rectf ll = target.LonLatExtent(trg);
+	return target.ExtentDeviation(ll) + source.ExtentDeviation(ll)
+		* (target.MinMaxRatio(ll).cy / source.MinMaxRatio(ll).cx);
+}
+
+Sizef GisTransformSameEllip::SourceMinMaxRatio(const Rectf& s) const
+{
+	Rectf ll = source.LonLatExtent(s);
+	Sizef sr = source.MinMaxRatio(ll);
+	Sizef dr = target.MinMaxRatio(ll);
+	return Sizef(dr.cx / sr.cy, dr.cy / sr.cx);
+}
+
+Sizef GisTransformSameEllip::TargetMinMaxRatio(const Rectf& t) const
+{
+	Rectf ll = target.LonLatExtent(t);
+	Sizef sr = source.MinMaxRatio(ll);
+	Sizef dr = target.MinMaxRatio(ll);
+	return Sizef(dr.cx / sr.cy, dr.cy / sr.cx);
+}
+
+class GisTransformGeneric : public GisTransform::Data
+{
+public:
+	GisTransformGeneric(GisCoords src, GisCoords trg);
+	virtual GisTransform DeepCopy() const                                { return new GisTransformGeneric(*this); }
+
+	virtual Pointf       Target(Pointf s) const;
+	virtual Pointf       Source(Pointf t) const;
+	virtual Rectf        TargetExtent(const Rectf& s) const;
+	virtual Rectf        SourceExtent(const Rectf& t) const;
+	virtual double       SourceDeviation(Pointf src1, Pointf src2) const;
+	virtual double       TargetDeviation(Pointf trg1, Pointf trg2) const;
+	virtual double       SourceExtentDeviation(const Rectf& src) const;
+	virtual double       TargetExtentDeviation(const Rectf& trg) const;
+	virtual Sizef        SourceMinMaxRatio(const Rectf& s) const;
+	virtual Sizef        TargetMinMaxRatio(const Rectf& t) const;
+	virtual GisBSPTree   TargetBranchTree(const Rectf& t) const          { return target.GetBranchTree(target.LonLatExtent(t)); }
+	virtual GisBSPTree   SourceBranchTree(const Rectf& s) const          { return target.GetBranchTree(source.LonLatExtent(s)); }
+	virtual Rectf        TargetLimits() const                            { return target.ProjectExtent(source.LonLatLimits() & target.LonLatLimits()); }
+	virtual Rectf        SourceLimits() const                            { return source.ProjectExtent(source.LonLatLimits() & target.LonLatLimits()); }
+	virtual bool         IsProjected() const                             { return target.IsProjected(); }
+	virtual bool         IsIdentity() const                              { return false; }
+
+	Matrixf3             source_ellip;
+	Matrixf3             target_ellip;
+};
+
+GisTransformGeneric::GisTransformGeneric(GisCoords src, GisCoords trg)
+{
+	source = src;
+	target = trg;
+	target_ellip = Matrixf3Inverse(source.FromWGS84()) * target.FromWGS84();
+	source_ellip = Matrixf3Inverse(target_ellip);
+}
+
+Pointf GisTransformGeneric::Target(Pointf s) const
+{
+	return target.Project3D(source.LonLat3D(s) * target_ellip, 0);
+}
+
+Pointf GisTransformGeneric::Source(Pointf t) const
+{
+	return source.Project3D(target.LonLat3D(t) * source_ellip, 0);
+}
+
+Rectf GisTransformGeneric::TargetExtent(const Rectf& s) const
+{
+	Rectf lonlat = source.LonLatExtent(s);
+	Rectf lontar = Null;
+	lontar |= target.From3D(source.To3D(lonlat.TopLeft()) * target_ellip);
+	lontar |= target.From3D(source.To3D(lonlat.TopRight()) * target_ellip);
+	lontar |= target.From3D(source.To3D(lonlat.BottomLeft()) * target_ellip);
+	lontar |= target.From3D(source.To3D(lonlat.BottomRight()) * target_ellip);
+	return target.ProjectExtent(lontar);
+}
+
+Rectf GisTransformGeneric::SourceExtent(const Rectf& t) const
+{
+	Rectf lonlat = target.LonLatExtent(t);
+	Rectf lonsrc = Null;
+	lonsrc |= source.From3D(target.To3D(lonlat.TopLeft()) * source_ellip);
+	lonsrc |= source.From3D(target.To3D(lonlat.TopRight()) * source_ellip);
+	lonsrc |= source.From3D(target.To3D(lonlat.BottomLeft()) * source_ellip);
+	lonsrc |= source.From3D(target.To3D(lonlat.BottomRight()) * source_ellip);
+	return source.ProjectExtent(lonsrc);
+}
+
+double GisTransformGeneric::SourceDeviation(Pointf src1, Pointf src2) const
+{
+	Pointf ll1 = source.LonLat(src1), ll2 = source.LonLat(src2);
+	Rectf ll = SortRectf(ll1, ll2);
+	return target.ProjectDeviation(ll1, ll2, 0) + source.ProjectDeviation(ll1, ll2, 0)
+			* (target.MinMaxRatio(ll).cy / source.MinMaxRatio(ll).cx);
+}
+
+double GisTransformGeneric::TargetDeviation(Pointf trg1, Pointf trg2) const
+{
+	Pointf ll1 = target.LonLat(trg1), ll2 = target.LonLat(trg2);
+	Rectf ll = SortRectf(ll1, ll2);
+	return target.ProjectDeviation(ll1, ll2, 0) + source.ProjectDeviation(ll1, ll2, 0)
+		* (target.MinMaxRatio(ll).cy / source.MinMaxRatio(ll).cx);
+}
+
+double GisTransformGeneric::SourceExtentDeviation(const Rectf& src) const
+{
+	Rectf ll = source.LonLatExtent(src);
+	return target.ExtentDeviation(ll) + source.ExtentDeviation(ll)
+		* (target.MinMaxRatio(ll).cy / source.MinMaxRatio(ll).cx);
+}
+
+double GisTransformGeneric::TargetExtentDeviation(const Rectf& trg) const
+{
+	Rectf ll = target.LonLatExtent(trg);
+	return target.ExtentDeviation(ll) + source.ExtentDeviation(ll)
+		* (target.MinMaxRatio(ll).cy / source.MinMaxRatio(ll).cx);
+}
+
+Sizef GisTransformGeneric::SourceMinMaxRatio(const Rectf& s) const
+{
+	Rectf ll = source.LonLatExtent(s);
+	Sizef sr = source.MinMaxRatio(ll);
+	Sizef dr = target.MinMaxRatio(ll);
+	return Sizef(dr.cx / sr.cy, dr.cy / sr.cx);
+}
+
+Sizef GisTransformGeneric::TargetMinMaxRatio(const Rectf& t) const
+{
+	Rectf ll = target.LonLatExtent(t);
+	Sizef sr = source.MinMaxRatio(ll);
+	Sizef dr = target.MinMaxRatio(ll);
+	return Sizef(dr.cx / sr.cy, dr.cy / sr.cx);
+}
+
+GisTransform::GisTransform(const Nuller&) : data(new GisTransformIdentity) {}
+
+GisTransform::GisTransform(GisCoords src, GisCoords dest)
+{
+	if(IsNull(src) && IsNull(dest))
+		data = new GisTransformIdentity();
+	else if(IsNull(src))
+		data = new GisTransformProjectIdentity(dest);
+	else if(IsNull(dest))
+		data = new GisTransformProjectIdentity(src);
+	else if(src.IsIdentity(dest))
+		data = new GisTransformProjectIdentity(dest);
+	else if(src.GetEllipsoid() == dest.GetEllipsoid())
+		data = new GisTransformSameEllip(src, dest);
+	else
+		data = new GisTransformGeneric(src, dest);
+}
+
+bool GisTransform::Equals(const GisTransform& t) const
+{
+	return Source() == t.Source() && Target() == t.Target();
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/Geom/Coords/ellipsoid.cpp b/uppsrc/Geom/Coords/ellipsoid.cpp
new file mode 100644
index 000000000..3db51fd02
--- /dev/null
+++ b/uppsrc/Geom/Coords/ellipsoid.cpp
@@ -0,0 +1,763 @@
+#include "GeomCoords.h"
+#pragma hdrstop
+
+NAMESPACE_UPP
+
+struct EPSGEllipsoid
+{
+	int         code;
+	const char *name;
+	double      a;
+	int         unit;
+	double      i;
+	double      b;
+	double      from_wgs84[4][3];
+	const char *description;
+	const char *source;
+};
+
+static EPSGEllipsoid epsg_ellipsoids[] =
+{
+	{
+		7001,
+		"Airy 1830",
+		6377563.396,
+		9001,
+		299.3249646,
+		0,
+		{ { 1, 0, 0 }, { 0, 1, 0 }, { 0, 0, 1 }, { 0, 0, 0 } },
+		"Original definition is a=20923713 and b=20853810 feet of 1796.   "
+		"For the 1936 retriangulation OSGB defines the relationship of feet of 1796 "
+		"to the International metre through log(1.48401603) exactly [=0.3048007491...]. "
+		"1/f is given to 7 decimal places.",
+		"Ordnance Survey of Great Britain."
+	},
+
+	{
+		7002,
+		"Airy Modified 1849",
+		6377340.189,
+		9001,
+		299.3249646,
+		0,
+		{ { 1, 0, 0 }, { 0, 1, 0 }, { 0, 0, 1 }, { 0, 0, 0 } },
+		"OSGB Airy 1830 figure (ellipsoid code 7001) rescaled by 0.999965 to best fit "
+		"the scale of the 19th century primary triangulation of Ireland.",
+		"\"The Irish Grid - A Description of the Co-ordinate Reference System\" published by "
+		"Ordnance Survey of Ireland, Dublin and Ordnance Survey of Northern Ireland, Belfast."
+	},
+
+	{
+		7003,
+		"Australian National Spheroid",
+		6378160,
+		9001,
+		298.25,
+		0,
+		{ { 1, 0, 0 }, { 0, 1, 0 }, { 0, 0, 1 }, { 0, 0, 0 } },
+		"Based on the GRS 1967 figure but with 1/f taken to 2 decimal places exactly.  "
+		"The dimensions are also used as the GRS 1967 (SAD69) ellipsoid (see code 7050).",
+		"\"Australian Map Grid Technical Manual\"; National Mapping Council of Australia "
+		"Special Publication #7; 1972"
+	},
+
+	{
+		7004,
+		"Bessel 1841",
+		6377397.15508,
+		9001,
+		299.152812853,
+		0,
+/*
+		{
+			{ 0.9999001532, 0.0001003391, 0.0001410308 },
+			{ 0.000000035, 0.9999890082, 0.000006789 },
+			{ -0.0000892616, 0.0001700881, 1.0001042705 },
+			{ -752.6802330762, -118.3304874504, -671.1345682954 }
+		},
+*/
+/*
+		{
+			{ 0.9999587017, 0.0000771428, 0.0001469385 },
+			{ 0.0000018086, 1.0000315577, 0.0000089026 },
+			{ -0.0000715101, 0.0001430558, 1.0001561833 },
+			{ -569.8893823209, -64.387031166, -439.280263002 }
+		},
+*/
+/*
+		{
+			{ 0.9999470981, 0.0001003053, 0.0001410471 },
+			{ 0.0000000365, 1.000035941,  0.0000067921 },
+			{ -0.0000894093, 0.0001700079, 1.0001513634 },
+			{ -565.889445039, -66.6072244279, -442.284815087 }
+		},
+*/
+/*
+		{
+			{ 0.9999470671, 0.0002844202, 0.0001410362 },
+			{ -0.0001840925, 1.0000359244, 0.000006789 },
+			{ -0.0000894353, 0.0001699928, 1.00015135 },
+			{ 77.7166364223, -1328.5538510867, -1743.8357660789 }
+		},
+*/
+/*
+		{
+			{ 0.9999470981, 0.0001003053, 0.0001410471 },
+			{ 0.0000000365, 1.000035941, 0.0000067921  },
+			{ -0.0000894093, 0.0001700079, 1.0001513634 },
+			{ -565.889445039, -66.6072244279, -442.284815087 }
+		},
+//*/
+//*
+#define BCOEF (1 - 3.543e-6)
+#define A_RAD (-4.99821 * SECRAD)
+#define B_RAD (-1.58676 * SECRAD)
+#define C_RAD (-5.26110 * SECRAD)
+
+		{
+/*
+			{      1 * BCOEF, -C_RAD * BCOEF,  B_RAD * BCOEF },
+			{  C_RAD * BCOEF,      1 * BCOEF, -A_RAD * BCOEF },
+			{ -B_RAD * BCOEF,  A_RAD * BCOEF,      1 * BCOEF },
+			{ -570.690, -85.690, -462.840 }
+*/
+			{      1 * BCOEF, +C_RAD * BCOEF, -B_RAD * BCOEF },
+			{ -C_RAD * BCOEF,      1 * BCOEF, +A_RAD * BCOEF },
+			{ +B_RAD * BCOEF, -A_RAD * BCOEF,      1 * BCOEF },
+			{ -570.690, -85.690, -462.840 }
+		},
+#undef BCOEF
+//*/
+		"Original Bessel definition is a=3272077.14 and b=3261139.33 toise. "
+		"This used a weighted mean of values from several authors but did not account "
+		"for differences in the length of the various toise: the \"Bessel toise\" "
+		"is therefore of uncertain length.",
+		"US Army Map Service Technical Manual; 1943."
+	},
+
+	{
+		7005,
+		"Bessel Modified",
+		6377492.018,
+		9001,
+		299.1528128,
+		0,
+		{ { 1, 0, 0 }, { 0, 1, 0 }, { 0, 0, 1 }, { 0, 0, 0 } },
+		"Used in Norway and also in Sweden with a 1mm increase in semi-major axis.",
+		""
+	},
+
+	{
+		7006,
+		"Bessel Namibia",
+		6377483.865,
+		9001,
+		299.1528128,
+		0,
+		{ { 1, 0, 0 }, { 0, 1, 0 }, { 0, 0, 1 }, { 0, 0, 0 } },
+		"a = 6377397.155 German legal metres. This is the same value as the Bessel 1841 figure "
+		"(code 7004) but in different units.  Used in Namibia.",
+		"Chief Directorate: Surveys and Mapping, Mowbray, South Africa."
+	},
+
+	{
+		7007,
+		"Clarke 1858",
+		20926348,
+		9005,
+		0,
+		20855233,
+		{ { 1, 0, 0 }, { 0, 1, 0 }, { 0, 0, 1 }, { 0, 0, 0 } },
+		"Clarke's 1858/II solution. Derived parameters: a = 6378293.645m using his 1865 "
+		"ratio of 0.304797265 feet per metre; 1/f = 294.26068�  In Australia and Amoco "
+		"Trinidad 1/f taken to two decimal places (294.26 exactly}, elsewhere a and b "
+		"used to derive 1/f.",
+		"\"Ellipsoidisch Parameter der Erdfigur (1800-1950)\" by Georg Strasser."
+	},
+
+	{
+		7008,
+		"Clarke 1866",
+		6378206.4,
+		9001,
+		0,
+		6356583.8,
+		{ { 1, 0, 0 }, { 0, 1, 0 }, { 0, 0, 1 }, { 0, 0, 0 } },
+		"Original definition a=20926062 and b=20855121 (British) feet. Uses Clarke's "
+		"1865 inch-metre ratio of 39.370432 to obtain metres. (Metric value then converted "
+		"to US survey feet for use in the United States using 39.37 exactly giving "
+		"a=20925832.16 ft US).", "US Army Map Service Technical Manual No. 7; 1943."
+	},
+
+	{
+		7009,
+		"Clarke 1866 Michigan",
+		20926631.531,
+		9003,
+		0,
+		20855688.674,
+		{ { 1, 0, 0 }, { 0, 1, 0 }, { 0, 0, 1 }, { 0, 0, 0 } },
+		"Used for Michigan NAD27 State Plane zones.  Radius = ellipsoid radius + 800 feet; "
+		"this approximates the average elevation of the state.   Derived parameter: "
+		"1/f = 294.97870", "USGS Professional Paper #1395."
+	},
+
+	{
+		7010,
+		"Clarke 1880 (Benoit)",
+		6378300.789,
+		9001,
+		0,
+		6356566.435,
+		{ { 1, 0, 0 }, { 0, 1, 0 }, { 0, 0, 1 }, { 0, 0, 0 } },
+		"Adopts Clarke's values for a and b.  Uses Benoit's 1895 ratio of 0.9143992 metres "
+		"per yard to convert to metres."
+	},
+
+	{
+		7011,
+		"Clarke 1880 (IGN)",
+		6378249.2,
+		9001,
+		0,
+		6356515,
+		{ { 1, 0, 0 }, { 0, 1, 0 }, { 0, 0, 1 }, { 0, 0, 0 } },
+		"Adopts Clarke's values for a and b using his 1865 ratio of 39.370432 inches per metre "
+		"to convert axes to metres."
+	},
+
+	{
+		7012,
+		"Clarke 1880 (RGS)",
+		6378249.145,
+		9001,
+		293.465,
+		0,
+		{ { 1, 0, 0 }, { 0, 1, 0 }, { 0, 0, 1 }, { 0, 0, 0 } },
+		"Adopts Clarke's values for a and 1/f.  Adopts his 1865 ratio of 39.370432 inches per metre "
+		"to convert semi-major axis to metres. Also known as Clarke Modified 1880.",
+		"Empire Survey Review #32; 1939."
+	},
+
+	{
+		7013,
+		"Clarke 1880 (Arc)",
+		6378249.145,
+		9001,
+		293.4663077,
+		0,
+		{ { 1, 0, 0 }, { 0, 1, 0 }, { 0, 0, 1 }, { 0, 0, 0 } },
+		"Adopts Clarke's value for a with derived 1/f.  Uses his 1865 ratio of 39.370432 "
+		"inch per metre to convert semi-major axis to metres.",
+		"Chief Directorate: Surveys and Mapping, Mowbray, South Africa."
+	},
+
+	{
+		7014,
+		"Clarke 1880 (SGA 1922)",
+		6378249.2,
+		9001,
+		293.46598,
+		0,
+		{ { 1, 0, 0 }, { 0, 1, 0 }, { 0, 0, 1 }, { 0, 0, 0 } },
+		"Used in Old French Triangulation (ATF).   Uses Clarke's 1865 inch-metre ratio "
+		"of 39.370432 to convert axes to metres.", ""
+	},
+
+	{
+		7015,
+		"Everest 1830 (1937 Adjustment)",
+		6377276.345,
+		9001,
+		300.8017,
+		0,
+		{ { 1, 0, 0 }, { 0, 1, 0 }, { 0, 0, 1 }, { 0, 0, 0 } },
+		"Used for the 1937 readjustment of Indian triangulation.  Clarke's 1865 "
+		"Indian-British foot ratio (0.99999566) and Benoit's 1898 British inch-metre "
+		"ratio (39.370113) rounded as 0.30479841 exactly and applied to Everest's "
+		"1830 definition taken as a and 1/f",
+		"Survey of India professional paper #28; 1939"
+	},
+
+	{
+		7016,
+		"Everest 1830 (1967 Definition)",
+		6377298.556,
+		9001,
+		300.8017,
+		0,
+		{ { 1, 0, 0 }, { 0, 1, 0 }, { 0, 0, 1 }, { 0, 0, 0 } },
+		"Adopted 1967 for use in East Malaysia.  Applies Sears 1922 inch-metre ratio of "
+		"39.370147 to Everest 1830 original definition of a and 1/f but with a taken "
+		"to be in British rather than Indian feet."
+	},
+
+	{
+		7018,
+		"Everest 1830 Modified",
+		6377304.063,
+		9001,
+		300.8017,
+		0,
+		{ { 1, 0, 0 }, { 0, 1, 0 }, { 0, 0, 1 }, { 0, 0, 0 } },
+		"Adopted 1967 for use in West Malaysia.  Applies Benoit 1898 inch-metre ratio "
+		"of 39.370113 to Everest 1830 original definition of a and 1/f but with a taken "
+		"to be in British rather than Indian feet."
+	},
+
+	{
+		7019,
+		"GRS 1980",
+		6378137,
+		9001,
+		298.257222101,
+		0,
+		{ { 1, 0, 0 }, { 0, 1, 0 }, { 0, 0, 1 }, { 0, 0, 0 } },
+		"Adopted by IUGG 1979 Canberra.  Inverse flattening is derived from geocentric "
+		"gravitational constant GM = 3986005e8 m*m*m/s/s; dynamic form factor "
+		"J2 = 108263e8 and Earth's angular velocity = 7292115e-11 rad/s.",
+		"\"Geodetic Reference System 1980\" by H. Moritz; Bulletin Geodesique"
+	},
+
+	{
+		7020,
+		"Helmert 1906",
+		6378200,
+		9001,
+		298.3,
+		0,
+		{ { 1, 0, 0 }, { 0, 1, 0 }, { 0, 0, 1 }, { 0, 0, 0 } },
+		"Helmert 1906/III solution.",
+		"\"Ellipsoidisch Parameter der Erdfigur (1800-1950)\" by Georg Strasser"
+	},
+
+	{
+		7021,
+		"Indonesian National Spheroid",
+		6378160,
+		9001,
+		298.247,
+		0,
+		{ { 1, 0, 0 }, { 0, 1, 0 }, { 0, 0, 1 }, { 0, 0, 0 } },
+		"Based on the GRS 1967 figure but with 1/f taken to 3 decimal places exactly.",
+		"Rais paper."
+	},
+
+	{
+		7022,
+		"International 1924",
+		6378388,
+		9001,
+		297,
+		0,
+		{ { 1, 0, 0 }, { 0, 1, 0 }, { 0, 0, 1 }, { 0, 0, 0 } },
+		"Adopted by IUGG 1924 in Madrid. Based on Hayford 1909/1910 figures. ",
+		""
+	},
+
+	{
+		7024,
+		"Krassowsky 1940",
+		6378245,
+		9001,
+		298.3,
+		0,
+		{ { 1, 0, 0 }, { 0, 1, 0 }, { 0, 0, 1 }, { -25, 122.5, 81.25 } },
+		"",
+		""
+	},
+
+	{
+		7025,
+		"NWL 9D",
+		6378145,
+		9001,
+		298.25,
+		0,
+		{ { 1, 0, 0 }, { 0, 1, 0 }, { 0, 0, 1 }, { 0, 0, 0 } },
+		"Used by Transit Precise Ephemeris between October 1971 and January 1987.",
+		""
+	},
+
+	{
+		7027,
+		"Plessis 1817",
+		6376523,
+		9001,
+		308.64,
+		0,
+		{ { 1, 0, 0 }, { 0, 1, 0 }, { 0, 0, 1 }, { 0, 0, 0 } },
+		"Rescaling of Delambre 1810 figure (a=6376985 m) to make meridional arc "
+		"from equator to pole equal to 10000000 metres exactly. (Ref: Strasser).",
+		"IGN Paris \"Constants d\'Ellipsoides\" February 1972."
+	},
+
+	{
+		7028,
+		"Struve 1860",
+		6378298.3,
+		9001,
+		294.73,
+		0,
+		{ { 1, 0, 0 }, { 0, 1, 0 }, { 0, 0, 1 }, { 0, 0, 0 } },
+		"Original definition of semi-major axis given as 3272539 toise.  In "
+		"\"Ellipsoidisch Parameter der Erdfigur (1800-1950)\" , Strasser suggests "
+		"a conversion factor of 1.94903631 which gives a=6378297.337 metres.",
+		"\"Geodesia y Cartografia Matematica\" by Fernando Martin Asin; ISBN 84-398-0248-X."
+	},
+
+	{
+		7029,
+		"War Office",
+		6378300,
+		9001,
+		296,
+		0,
+		{ { 1, 0, 0 }, { 0, 1, 0 }, { 0, 0, 1 }, { 0, 0, 0 } },
+		"In non-metric form, a=20926201 Gold Coast feet.",
+		"Tables for the use of the Gold Coast Survey Department, 1935."
+	},
+
+	{
+		7030,
+		"WGS 84",
+		6378137,
+		9001,
+		298.257223563,
+		0,
+		{ { 1, 0, 0 }, { 0, 1, 0 }, { 0, 0, 1 }, { 0, 0, 0 } },
+		"Inverse flattening derived from four defining parameters (semi-major axis; "
+		"C20 = -484.16685*10e-6; earth's angular velocity w = 7292115e11 rad/sec; "
+		"gravitational constant GM = 3986005e8 m*m*m/s/s).",
+		"DMA Technical Manual 8350.2-B "
+	},
+
+	{
+		7031,
+		"GEM 10C",
+		6378137,
+		9001,
+		298.257223563,
+		0,
+		{ { 1, 0, 0 }, { 0, 1, 0 }, { 0, 0, 1 }, { 0, 0, 0 } },
+		"Used for  GEM 10C Gravity Potential Model.",
+		""
+	},
+
+	{
+		7032,
+		"OSU86F",
+		6378136.2,
+		9001,
+		298.257223563,
+		0,
+		{ { 1, 0, 0 }, { 0, 1, 0 }, { 0, 0, 1 }, { 0, 0, 0 } },
+		"Used for OSU86 gravity potential (geoidal) model.",
+		""
+	},
+
+	{
+		7033,
+		"OSU91A",
+		6378136.3,
+		9001,
+		298.257223563,
+		0,
+		{ { 1, 0, 0 }, { 0, 1, 0 }, { 0, 0, 1 }, { 0, 0, 0 } },
+		"Used for OSU91 gravity potential (geoidal) model.",
+		""
+	},
+
+	{
+		7034,
+		"Clarke 1880",
+		20926202,
+		9005,
+		293.465,
+		20854895,
+		{ { 1, 0, 0 }, { 0, 1, 0 }, { 0, 0, 1 }, { 0, 0, 0 } },
+		"Clarke gave a and b and also 1/f=293.465 (to 3 decimal places).  "
+		"1/f derived from a and b = 293.4663077�",
+		"\"Ellipsoidisch Parameter der Erdfigur (1800-1950)\" by Georg Strasser."
+	},
+
+	{
+		7035,
+		"Sphere",
+		6371000,
+		9001,
+		0,
+		6371000,
+		{ { 1, 0, 0 }, { 0, 1, 0 }, { 0, 0, 1 }, { 0, 0, 0 } },
+		"Authalic sphere.  1/f is infinite. Superseded by GRS 1980 authalic sphere (code 7047).",
+		""
+	},
+
+	{
+		7036,
+		"GRS 1967",
+		6378160,
+		9001,
+		298.247167427,
+		0,
+		{ { 1, 0, 0 }, { 0, 1, 0 }, { 0, 0, 1 }, { 0, 0, 0 } },
+		"Adopted by IUGG 1967 Lucerne.  Inverse flattening given is derived from "
+		"geocentric gravitational constant (GM)= 398603e9 m*m*m/s/s; dynamic form "
+		"factor (J2) = 0.0010827 and Earth's angular velocity w = 7.2921151467e-5 rad/s. "
+		"See also GRS 1967 (SAD69).",
+		"\"Geodetic Reference System 1967\"; International Association of Geodesy "
+		"special publication number 3; August 1971."
+	},
+
+	{
+		7041,
+		"Average Terrestrial System 1977",
+		6378135,
+		9001,
+		298.257,
+		0,
+		{ { 1, 0, 0 }, { 0, 1, 0 }, { 0, 0, 1 }, { 0, 0, 0 } },
+		"",
+		"New Brunswick Geographic Information Corporation land and water information standards manual"
+	},
+
+	{
+		7042,
+		"Everest (1830 Definition)",
+		20922931.8,
+		9080,
+		300.8017,
+		20853374.58,
+		{ { 1, 0, 0 }, { 0, 1, 0 }, { 0, 0, 1 }, { 0, 0, 0 } },
+		"Everest gave a and b to 2 decimal places and also 1/f=300.8017 (to 4 decimal places).",
+		"\"Ellipsoidisch Parameter der Erdfigur (1800-1950)\" by Georg Strasser"
+	},
+
+	{
+		7043,
+		"WGS 72",
+		6378135,
+		9001,
+		298.26,
+		0,
+		{ { 1, 0, 0 }, { 0, 1, 0 }, { 0, 0, 1 }, { 0, 0, 0 } },
+		"",
+		""
+	},
+
+	{
+		7044,
+		"Everest 1830 (1962 Definition)",
+		6377301.243,
+		9001,
+		300.8017255,
+		0,
+		{ { 1, 0, 0 }, { 0, 1, 0 }, { 0, 0, 1 }, { 0, 0, 0 } },
+		"Used by Pakistan since metrication.  Clarke's 1865 Indian foot-British "
+		"foot ratio (0.99999566) and his 1865 British inch-metre ratio (39.369971) "
+		"rounded with slight error as 1 Ind ft = 0.3047995m exactly and applied to "
+		"Everest's 1830 definition of a & b.",
+		""
+	},
+
+	{
+		7045,
+		"Everest 1830 (1975 Definition)",
+		6377299.151,
+		9001,
+		300.8017255,
+		0,
+		{ { 1, 0, 0 }, { 0, 1, 0 }, { 0, 0, 1 }, { 0, 0, 0 } },
+		"Used by India since metrication.  Clarke's 1865 Indian foot-British foot "
+		"ratio (0.99999566) and his 1865 British inch-metre ratio (39.369971) "
+		"rounded as 1 Ind ft = 0.3047995m exactly applied to Everest's 1830 "
+		"original definition taken as a and b.",
+		""
+	},
+
+	{
+		7046,
+		"Bessel Namibia (GLM)",
+		6377397.155,
+		9031,
+		299.1528128,
+		0,
+		{ { 1, 0, 0 }, { 0, 1, 0 }, { 0, 0, 1 }, { 0, 0, 0 } },
+		"The semi-major axis has the same value as the Bessel 1841 ellipsoid (code 7004) "
+		"but is in different units - German Legal Metres rather than International metres "
+		"- hence a different size.  a = 6377483.865 International metres. Used in Namibia.",
+		"Chief Directorate: Surveys and Mapping, Mowbray, South Africa."
+	},
+
+	{
+		7047,
+		"GRS 1980 Authalic Sphere",
+		6370997,
+		9001,
+		0,
+		6370997,
+		{ { 1, 0, 0 }, { 0, 1, 0 }, { 0, 0, 1 }, { 0, 0, 0 } },
+		"Authalic sphere derived from Clarke 1866 ellipsoid (code 7008).  Deprecated "
+		"as name and parameter values do not match; replaced by 7048.", "EPSG"
+	},
+
+	{
+		7048,
+		"GRS 1980 Authalic Sphere",
+		6371007,
+		9001,
+		0,
+		6371007,
+		{ { 1, 0, 0 }, { 0, 1, 0 }, { 0, 0, 1 }, { 0, 0, 0 } },
+		"Authalic sphere derived from GRS 1980 ellipsoid (code 7019).  (An authalic sphere "
+		"is one with a surface area equal to the surface area of the ellipsoid). 1/f is infinite.",
+		"EPSG"
+	},
+
+	{
+		7049,
+		"Xian 1980",
+		6378140,
+		9001,
+		298.257,
+		0,
+		{ { 1, 0, 0 }, { 0, 1, 0 }, { 0, 0, 1 }, { 0, 0, 0 } },
+		"",
+		"BP"
+	},
+
+	{
+		7050,
+		"GRS 1967 (SAD69)",
+		6378160,
+		9001,
+		298.25,
+		0,
+		{ { 1, 0, 0 }, { 0, 1, 0 }, { 0, 0, 1 }, { 0, 0, 0 } },
+		"Based on the GRS 1967 figure (code 7036) but with 1/f taken to 2 decimal places "
+		"exactly. Used with SAD69 datum. The dimensions are also used as the Australian "
+		"National Spheroid (code 7003).", "\"Geodetic Reference System 1967\"; International "
+		"Association of Geodesy special publication number 3; August 1971."
+	},
+
+	{
+		7051,
+		"Danish 1876",
+		6377019.27,
+		9001,
+		300,
+		0,
+		{ { 1, 0, 0 }, { 0, 1, 0 }, { 0, 0, 1 }, { 0, 0, 0 } },
+		"Semi-major axis originally given as 3271883.25 toise. Uses toise to French "
+		"metre ratio of 1.94903631 to two decimal place precision. An alternative ratio "
+		"with the German legal metre of 1.9490622 giving 6377104m has not been used in Danish work.",
+		"Kort og Matrikelstyrelsen (KMS), Copenhagen."
+	},
+};
+
+Pointf3 GisEllipsoid::To3D(double lon, double lat, double elev) const
+{
+	lon *= DEGRAD;
+	lat *= DEGRAD;
+	double cl = cos(lon), sl = sin(lon), cp = cos(lat), sp = sin(lat);
+	double n = a / sqrt(1 - e2 * sp * sp);
+	return Pointf3((n + elev) * cp * cl, (n + elev) * cp * sl, (n * (1 - e2) + elev) * sp);
+}
+
+Pointf GisEllipsoid::From3D(double x, double y, double z) const
+{
+	double p = hypot(x, y);
+	double th = atan2(z * a, p * b);
+	double st = sin(th);
+	double ct = cos(th);
+	double tn = (z + e2 * a * a / b * st * st * st);
+	double td = (p - e2 * a * ct * ct * ct);
+	return Pointf((2 / DEGRAD) * atan2(y, p + x), atan2(tn, td) / DEGRAD);
+}
+
+const Index<int>& GisEllipsoid::EnumEPSG()
+{
+	static Index<int> eem;
+	if(eem.IsEmpty())
+	{
+		eem.Reserve(__countof(epsg_ellipsoids));
+		for(int i = 0; i < __countof(epsg_ellipsoids); i++)
+			eem.Add(epsg_ellipsoids[i].code);
+	}
+	return eem;
+}
+
+GisEllipsoid GisEllipsoid::GetEPSG(int code)
+{
+	int c = EnumEPSG().Find(code);
+	GisEllipsoid out;
+	if(c >= 0)
+	{
+		const EPSGEllipsoid& ee = epsg_ellipsoids[c];
+		out.name = ee.name;
+		out.description = ee.description;
+		out.source = ee.source;
+		out.a = ee.a;
+		out.b = ee.b;
+		out.i = ee.i;
+		if(out.a == out.b)
+			out.e2 = 0;
+		else
+		{
+			if(!out.i) out.i = out.a / (out.a - out.b);
+			if(!out.b) out.b = out.a * (1 - 1 / out.i);
+			out.e2 = 1 - sqr(out.b / out.a);
+		}
+		out.from_wgs84 = Matrixf3(ee.from_wgs84[0][0], ee.from_wgs84[0][1], ee.from_wgs84[0][2],
+			ee.from_wgs84[1][0], ee.from_wgs84[1][1], ee.from_wgs84[1][2],
+			ee.from_wgs84[2][0], ee.from_wgs84[2][1], ee.from_wgs84[2][2],
+			ee.from_wgs84[3][0], ee.from_wgs84[3][1], ee.from_wgs84[3][2]);
+	}
+	return out;
+}
+
+GisEllipsoid GisEllipsoid::AB(double a, double b)
+{
+	GisEllipsoid r;
+	r.a = a;
+	r.b = b;
+	r.e2 = 1 - sqr(b / a);
+	r.i = 1 - b / a;
+	return r;
+}
+
+GisEllipsoid GisEllipsoid::AI(double a, double i)
+{
+	GisEllipsoid r;
+	r.a = a;
+	r.i = i;
+	r.b = a * (1 - 1 / i);
+	r.e2 = 1 - sqr(r.a / r.b);
+	return r;
+}
+
+GisEllipsoid GisEllipsoid::AE2(double a, double e2)
+{
+	GisEllipsoid r;
+	r.a = a;
+	r.b = sqrt((1 - e2) * (a * a));
+	r.e2 = e2;
+	r.i = 1 - r.b / a;
+	return r;
+}
+
+GisEllipsoid GisEllipsoid::R(double rad)
+{
+	GisEllipsoid r;
+	r.a = r.b = rad;
+	r.e2 = 0;
+	r.i = Null;
+	return r;
+}
+
+bool operator == (const GisEllipsoid& ea, const GisEllipsoid& eb)
+{
+	return ea.a == eb.a && ea.b == eb.b && ea.from_wgs84 == eb.from_wgs84;
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/Geom/Coords/method.cpp b/uppsrc/Geom/Coords/method.cpp
new file mode 100644
index 000000000..d5e5e2357
--- /dev/null
+++ b/uppsrc/Geom/Coords/method.cpp
@@ -0,0 +1,815 @@
+#include "GeomCoords.h"
+#pragma hdrstop
+
+#include "method.h"
+
+NAMESPACE_UPP
+
+#define LLOG(x) // RLOG(x)
+
+GisCoordsLonLat::GisCoordsLonLat(double prime_meridian)
+: prime_meridian(prime_meridian)
+{
+}
+
+Pointf GisCoordsLonLat::LonLat(Pointf xy) const
+{
+	return Pointf(xy.x + prime_meridian, xy.y);
+}
+
+Rectf GisCoordsLonLat::LonLatExtent(const Rectf& xy_extent) const
+{
+	return xy_extent.OffsetedHorz(prime_meridian);
+}
+
+Pointf GisCoordsLonLat::Project(Pointf lonlat, int branch) const
+{
+	return Pointf(lonlat.x - prime_meridian, lonlat.y);
+}
+
+Rectf GisCoordsLonLat::ProjectExtent(const Rectf& lonlat_extent) const
+{
+	return lonlat_extent.OffsetedHorz(-prime_meridian);
+}
+
+double GisCoordsLonLat::ProjectDeviation(Pointf lonlat1, Pointf lonlat2, int branch) const
+{
+	return 0;
+}
+
+double GisCoordsLonLat::ProjectRatio(Pointf lonlat, int branch) const
+{
+	return 1;
+}
+
+/*
+String GisCoordsLonLat::ToString() const
+{
+	return NFormat("%s, PM=%s", GetName(), FormatAngle(prime_meridian, 3));
+}
+*/
+
+Array<GisCoords::Arg> GisCoordsLonLat::EnumArgs()
+{
+	Array<GisCoords::Arg> args;
+	args.Add(GisCoords::Arg::Angle(prime_meridian, "PM", "Prime meridian", Null));
+	return args;
+}
+
+Array<GisCoords::ConstArg> GisCoordsLonLat::EnumConstArgs() const
+{
+	Array<GisCoords::ConstArg> args;
+	return args;
+}
+
+void GisCoordsLonLat::SyncArgs()
+{
+}
+
+bool GisCoordsLonLat::IsProjected() const
+{
+	return false;
+}
+
+GisCoordsSpherical::GisCoordsSpherical(double bp)
+{
+	base_parallel = bp;
+	SyncArgs();
+}
+
+Pointf GisCoordsSpherical::LonLat(Pointf xy) const
+{
+	CheckInterpolator();
+	return Pointf(minmax(xy.x / alpha, -M_PI, +M_PI),
+		gauss_latitude(minmax(xy.y, -M_PI / 2, +M_PI / 2)));
+}
+
+Rectf GisCoordsSpherical::LonLatExtent(const Rectf& xy_extent) const
+{
+	CheckInterpolator();
+	return Rectf(xy_extent.left / alpha, gauss_latitude(xy_extent.top),
+		xy_extent.right / alpha, gauss_latitude(xy_extent.bottom));
+}
+
+Pointf GisCoordsSpherical::Project(Pointf lonlat, int branch) const
+{
+	CheckInterpolator();
+	return Pointf(lonlat.x * alpha, gauss_projected(lonlat.y));
+}
+
+Rectf GisCoordsSpherical::ProjectExtent(const Rectf& lonlat_extent) const
+{
+	CheckInterpolator();
+	return Rectf(lonlat_extent.left * alpha, gauss_projected(lonlat_extent.top),
+		lonlat_extent.right * alpha, gauss_projected(lonlat_extent.bottom));
+}
+
+double GisCoordsSpherical::ProjectDeviation(Pointf lonlat1, Pointf lonlat2, int branch) const
+{
+	CheckInterpolator();
+	return 0;
+}
+
+double GisCoordsSpherical::ProjectRatio(Pointf lonlat, int branch) const
+{
+	double U = gauss_projected(lonlat.y);
+	double coef = alpha * R * ellipsoid.N(lonlat.y);
+	double cu = cos(U), cp = cos(lonlat.y);
+	return (cp ? coef * cu / cp : 1);
+}
+
+/*
+String GisCoordsSpherical::ToString() const
+{
+	return NFormat("%s, base parallel = %s", GetName(), FormatAngle(base_parallel, 3));
+}
+*/
+
+Array<GisCoords::Arg> GisCoordsSpherical::EnumArgs()
+{
+	Array<GisCoords::Arg> out;
+	out.Add(GisCoords::Arg::Angle(base_parallel, "BP", "Base parallel", Null));
+	return out;
+}
+
+Array<GisCoords::ConstArg> GisCoordsSpherical::EnumConstArgs() const
+{
+	Array<GisCoords::ConstArg> args;
+	args.Add(GisCoords::ConstArg("A",  "alpha", alpha));
+	args.Add(GisCoords::ConstArg("K",  "k",     k));
+	args.Add(GisCoords::ConstArg("R",  "R",     R));
+	args.Add(GisCoords::ConstArg("e",  "e",     e));
+	args.Add(GisCoords::ConstArg("U0", "U0",    FormatDegree(U0, 3)));
+	return args;
+}
+
+void GisCoordsSpherical::SyncArgs()
+{
+	e = sqrt(ellipsoid.e2);
+	double phi0 = base_parallel * DEGRAD;
+	alpha = sqrt(1 + (ellipsoid.e2 * sqr(sqr(cos(phi0)))) / (1 - ellipsoid.e2));
+	double sinphi = sin(phi0);
+	U0 = asin(sinphi / alpha);
+	k = exp(alpha * (log(tan(phi0 / 2 + M_PI / 4)) + e / 2 * log((1 - e * sinphi) / (1 + e * sinphi))))
+		/ tan(U0 / 2 + M_PI / 4);
+//	k = pow(tan(base_parallel / 2 + M_PI / 4), alpha)
+//		* pow((1 - e * sinphi) / (1 + e * sinphi), alpha * e / 2)
+//		/ tan(U0 / 2 + M_PI / 4);
+	R = ellipsoid.a * sqrt(1 - ellipsoid.e2) / (1 - ellipsoid.e2 * sqr(sinphi));
+	gauss_projected.Clear();
+	gauss_latitude.Clear();
+}
+
+void GisCoordsSpherical::SyncInterpolator() const
+{
+	SphericalLatitudeFunction gslf(alpha, k, R, e, U0);
+	gslf.Dump(-1.58, +1.58, 1000);
+	gslf.Dump(-1.58, -1.56, 1000);
+	gslf.Dump(+1.56, +1.58, 1000);
+	gauss_projected.Create(-M_PI / 2, +M_PI / 2, gslf, 300, 5000, 4);
+	gauss_latitude.CreateInverse(-M_PI / 2, +M_PI / 2, gslf, 300, 5000, 4);
+}
+
+double SphericalLatitudeFunction::Get(double phi) const
+{
+//	RTIMING("SphericalLatitudeFunction::Get");
+	phi *= DEGRAD;
+	double esx = e * sin(phi);
+	double eps = pow((1 - esx) / (1 + esx), e * alpha / 2) / k;
+	double dpi = M_PI / 4 - phi / 2;
+	if(dpi <= 0.001)
+	{
+//		RLOG("first dpi = " << FormatDouble(x, 5));
+//		RLOG("saturation: " << dpi);
+		return 90 - 2 / DEGRAD * (pow(fabs(dpi), alpha) / (dpi >= 0 ? eps : -eps));
+	}
+	else
+	{
+		double rho = phi / 2 + M_PI / 4;
+		return 2 / DEGRAD * atan(pow(fabs(tan(rho)), alpha) * (rho >= 0 ? eps : -eps)) - 90;
+	}
+}
+
+GisCoordsConical::GisCoordsConical(
+//	bool gauss_sphere_,
+	double gauss_base_parallel_,
+	double pole_meridian_,
+	double pole_parallel_,
+	double central_parallel_,
+//	double prime_meridian_,
+	double north_parallel_,
+	double south_parallel_,
+	double multiplier_,
+	double xmeteroffset_,
+	double ymeteroffset_)
+{
+//	gauss_sphere = gauss_sphere_;
+	gauss_base_parallel = gauss_base_parallel_;
+	pole_meridian = pole_meridian_;
+	pole_parallel = pole_parallel_;
+	central_parallel = central_parallel_;
+//	prime_meridian = prime_meridian_;
+	north_parallel = north_parallel_;
+	south_parallel = south_parallel_;
+	multiplier = multiplier_;
+	xmeteroffset = xmeteroffset_;
+	ymeteroffset = ymeteroffset_;
+	SyncArgs();
+}
+
+Pointf GisCoordsConical::LonLat(Pointf xy) const
+{
+	CheckInterpolator();
+	xy.x -= xmeteroffset;
+	xy.y -= ymeteroffset;
+	double eps = (modulo(Bearing(xy) / DEGRAD - 90, 360) - 180) / n;
+	double rho = Length(xy);
+	double lat = tgsin_latitude(rho);
+//	double prcr = 2 / DEGRAD * atan(pow(rho_coef / rho, 1 / n)) - 90;
+	Pointf global = orientation.Global(eps, lat);
+	return Pointf(global.x / gauss_alpha, gauss_latitude(global.y));
+}
+
+Rectf GisCoordsConical::LonLatExtent(const Rectf& xy_extent) const
+{
+//	CheckInterpolator();
+//	xy_extent.Offset(-xmeteroffset, -ymeteroffset);
+
+	return GisCoords::Data::LonLatExtent(xy_extent);
+}
+
+int GisCoordsConical::GetBranchCount() const
+{
+	return 3;
+}
+
+Array<Pointf> GisCoordsConical::LonLatBoundary(const Rectf& lonlat_extent, int branch) const
+{
+	Array<Pointf> out;
+	int em = DegreeMask(lonlat_extent.left /* - prime_meridian*/, lonlat_extent.right /*- prime_meridian*/);
+	if(em & AM_E2)
+	{
+		if(branch == 1)
+		{
+			out.SetCount(4);
+			double x0 = (em & 1 ? 0 : modulo(lonlat_extent.left + 180, 360) - 180);
+			out[0] = Pointf(x0, lonlat_extent.top);
+			out[1] = Pointf(180, lonlat_extent.top);
+			out[2] = Pointf(180, lonlat_extent.bottom);
+			out[3] = Pointf(x0, lonlat_extent.bottom);
+		}
+		if(branch == 2)
+		{
+			out.SetCount(4);
+			double x0 = (em & 1 ? 0 : modulo(lonlat_extent.right - 180, 360) + 180);
+			out[0] = Pointf(x0, lonlat_extent.top);
+			out[1] = Pointf(-180, lonlat_extent.top);
+			out[2] = Pointf(-180, lonlat_extent.bottom);
+			out[3] = Pointf(x0, lonlat_extent.bottom);
+		}
+	}
+	else if(!branch)
+		out = Data::LonLatBoundary(lonlat_extent, 0);
+	return out;
+}
+
+GisBSPTree GisCoordsConical::GetBranchTree(const Rectf& lonlat_extent) const
+{
+	double pm = modulo(pole_parallel - lonlat_extent.left, 360) + lonlat_extent.left;
+	double l = lonlat_extent.left - pm, r = lonlat_extent.right - pm;
+	if(l >= -90 + 1 / 60.0 && r <= +90 - 1 / 60.0)
+		return GisBSPTree::Node(0);
+	GisBSPTree::Node minus = (l >= -90 + 1 / 60.0
+		? GisBSPTree::Node(2)
+		: GisBSPTree::Node(new GisBSPTree::Split(Pointf(1, 0), pm - 180,
+			GisBSPTree::Node(1),
+			GisBSPTree::Node(2))));
+	GisBSPTree::Node plus = (r <= 180 - 1 / 60.0
+		? GisBSPTree::Node(1)
+		: GisBSPTree::Node(new GisBSPTree::Split(Pointf(1, 0), pm + 180,
+			GisBSPTree::Node(1),
+			GisBSPTree::Node(2))));
+	return GisBSPTree::Node(new GisBSPTree::Split(Pointf(1, 0), pm, minus, plus));
+}
+
+Pointf GisCoordsConical::Project(Pointf lonlat, int branch) const
+{
+	CheckInterpolator();
+	lonlat = orientation.Local(lonlat.x * gauss_alpha, gauss_projected(lonlat.y));
+	double comp = (branch == 0 ? 180 : branch == 1 ? 90 : 270);
+	double l = modulo(lonlat.x /*- prime_meridian*/ + comp, 360) - comp;
+	double eps = n * l;
+	double rho = tgsin_projected(lonlat.y);
+	Pointf out = PolarPointf(rho, (eps - 90) * DEGRAD);
+	out.x += xmeteroffset;
+	out.y += ymeteroffset;
+	return out;
+}
+
+Rectf GisCoordsConical::ProjectExtent(const Rectf& lonlat_extent) const
+{
+//	Rectf local = orientation.LocalExtent(lonlat_extent);
+//	return PolarToExtent(local.left * n, tgsin_projected(local.top),
+//		local.right * n, tgsin_projected(local.bottom));
+	return GisCoords::Data::ProjectExtent(lonlat_extent);
+}
+
+double GisCoordsConical::ProjectDeviation(Pointf lonlat1, Pointf lonlat2, int branch) const
+{
+	return ExtentDeviation(SortRectf(lonlat1, lonlat2));
+}
+
+double GisCoordsConical::ExtentDeviation(const Rectf& lonlat_extent) const
+{
+	CheckInterpolator();
+	Rectf local = orientation.LocalExtent(lonlat_extent);
+	double rho = tgsin_projected(local.bottom);
+	return rho * (1 + sin(local.Width() * (DEGRAD / 2) - M_PI / 2));
+}
+
+double GisCoordsConical::ProjectRatio(Pointf lonlat, int branch) const
+{
+	Pointf local = orientation.Local(lonlat);
+	double den = ellipsoid.N(local.y) * cos(local.y);
+	return n * tgsin_projected(local.y) / (den ? den : 1);
+}
+
+Sizef GisCoordsConical::MinMaxRatio(const Rectf& lonlat_extent) const
+{
+	CheckInterpolator();
+	Rectf local = orientation.LocalExtent(lonlat_extent);
+	double a = n * tgsin_projected(local.top) * DEGRAD;
+	double b = n * tgsin_projected(local.bottom) * DEGRAD;
+	double c = a;
+	if(local.top < central_parallel && local.bottom > central_parallel)
+		c = n * tgsin_projected(central_parallel) * DEGRAD;
+	return Sizef(min(a, min(b, c)), max(a, max(b, c)));
+}
+
+/*
+String GisCoordsConical::ToString() const
+{
+	return NFormat("%s, central parallel = %s, "
+		"north parallel = %s, south parallel = %s, "
+		"x meter offset = %3n, y meter offset = %3n",
+		GetName(),
+		FormatAngle(central_parallel, 3), FormatAngle(prime_meridian, 3),
+		FormatAngle(north_parallel, 3), FormatAngle(south_parallel, 3),
+		xmeteroffset, ymeteroffset);
+}
+*/
+
+Array<GisCoords::Arg> GisCoordsConical::EnumArgs()
+{
+	Array<GisCoords::Arg> out;
+//	out.Add(GisCoords::Arg::Option(gauss_sphere,        "GAUSS",   "Gauss preprocess"));
+	out.Add(GisCoords::Arg::Angle (gauss_base_parallel, "GAUSSBP", "Gauss base parallel"));
+	out.Add(GisCoords::Arg::Angle (pole_meridian,       "POLEM",   "Cone pole meridian"));
+	out.Add(GisCoords::Arg::Angle (pole_parallel,       "POLEP",   "Cone pole parallel"));
+	out.Add(GisCoords::Arg::Angle (central_parallel,    "CP",      "Central parallel"));
+//	out.Add(GisCoords::Arg::Angle (prime_meridian,      "PM",      "Prime meridian"));
+	out.Add(GisCoords::Arg::Angle (north_parallel,      "NP",      "North parallel"));
+	out.Add(GisCoords::Arg::Angle (south_parallel,      "SP",      "South parallel"));
+	out.Add(GisCoords::Arg::Edit  (multiplier,          "MUL",     "Multiplier"));
+	out.Add(GisCoords::Arg::Edit  (xmeteroffset,        "DX",      "X meter offset"));
+	out.Add(GisCoords::Arg::Edit  (ymeteroffset,        "DY",      "Y meter offset"));
+	return out;
+}
+
+Array<GisCoords::ConstArg> GisCoordsConical::EnumConstArgs() const
+{
+	Array<GisCoords::ConstArg> args;
+//	if(gauss_sphere)
+	{
+		args.Add(GisCoords::ConstArg("GA",  "gauss_alpha", gauss_alpha));
+		args.Add(GisCoords::ConstArg("GK",  "gauss_k", gauss_k));
+		args.Add(GisCoords::ConstArg("GR",  "gauss_R", gauss_R));
+		args.Add(GisCoords::ConstArg("GE",  "gauss_e", gauss_e));
+		args.Add(GisCoords::ConstArg("GU0", "gauss_U0", FormatDegree(gauss_U0, 3)));
+	}
+
+	args.Add(GisCoords::ConstArg("R0", "rho0", rho0));
+	args.Add(GisCoords::ConstArg("N",  "n", n));
+//	args.Add(GisCoords::ConstArg("e", e));
+	args.Add(GisCoords::ConstArg("RC", "rho_coef", rho_coef));
+	return args;
+}
+
+void GisCoordsConical::SyncArgs()
+{
+//	double NN, NS;
+//	if(gauss_sphere)
+	{
+		gauss_e = sqrt(ellipsoid.e2);
+		gauss_alpha = sqrt(1 + (ellipsoid.e2 * sqr(sqr(cos(gauss_base_parallel * DEGRAD)))) / (1 - ellipsoid.e2));
+		double sinphi = sin(gauss_base_parallel * DEGRAD);
+		gauss_U0 = asin(sinphi / gauss_alpha);
+		gauss_k = exp(gauss_alpha * (log(tan(gauss_base_parallel * (DEGRAD / 2) + M_PI / 4))
+			+ gauss_e / 2 * log((1 - gauss_e * sinphi) / (1 + gauss_e * sinphi)))) / tan(gauss_U0 / 2 + M_PI / 4);
+	//	k = pow(tan(base_parallel / 2 + M_PI / 4), alpha)
+	//		* pow((1 - e * sinphi) / (1 + e * sinphi), alpha * e / 2)
+	//		/ tan(U0 / 2 + M_PI / 4);
+		gauss_R = ellipsoid.a * sqrt(1 - ellipsoid.e2) / (1 - ellipsoid.e2 * sqr(sinphi));
+//		e = 0;
+//		NN = NS = gauss_R;
+	}
+//	else
+//	{
+//		e = sqrt(ellipsoid.e2);
+//		NN = ellipsoid.N(north_parallel);
+//		NS = ellipsoid.N(south_parallel);
+//	}
+/*
+	double esin_n = e * sin(north_parallel), esin_s = e * sin(south_parallel);
+	double esin_0 = e * sin(central_parallel);
+	double nc_n = NN * cos(north_parallel);
+	double nc_s = NS * cos(south_parallel);
+	double tan_n = tan(north_parallel / 2 + M_PI / 4);
+	double tan_s = tan(south_parallel / 2 + M_PI / 4);
+	double tan_0 = tan(central_parallel / 2 + M_PI / 4);
+	n = (log(nc_n) - log(nc_s)) / (log(tan_s) - log(tan_n)
+			+ e / 2 * (log((1 + esin_n) * (1 - esin_s)) - log((1 - esin_n) * (1 + esin_s))));
+	rho0 = nc_n / n * pow(tan_n / tan_0, n)
+		* pow((1 + esin_0) * (1 - esin_n) / ((1 - esin_0) * (1 + esin_n)), n * e / 2);
+	rho_coef = rho0 * pow(tan_0, n) * pow((1 - esin_0) / (1 + esin_0), n * e / 2);
+*/
+	SphericalLatitudeFunction gslf(gauss_alpha, gauss_k, gauss_R, gauss_e, gauss_U0);
+	double Us = south_parallel * DEGRAD, Un = north_parallel * DEGRAD, Uc = central_parallel * DEGRAD;
+	double Tn = tan(Un / 2 + M_PI / 4), Ts = tan(Us / 2 + M_PI / 4), Tc = tan(Uc / 2 + M_PI / 4);
+	if(fabs(Un - Us) <= SECRAD)
+	{
+		rho0 = 1.0 / tan(Us);
+		n = sin(Us);
+	}
+	else
+	{
+		n = log(cos(Us) / cos(Un)) / log(Tn / Ts);
+		rho0 = cos(Us) / n * pow(Ts / Tc, n);
+	}
+	rho_coef = gauss_R * rho0 * pow(Tc, n) * multiplier;
+
+	gauss_projected.Clear();
+	gauss_latitude.Clear();
+	tgsin_projected.Clear();
+	tgsin_latitude.Clear();
+
+	orientation = Pointf(pole_meridian, pole_parallel);
+}
+
+String GisCoordsConical::DumpProjectedDelta() const
+{
+	ConicalRadiusFunction lcrf(n, rho_coef);
+	return GisInterpolatorDelta(-45, 90.1, lcrf, 100, 10000, 8, 80000);
+}
+
+void GisCoordsConical::SyncInterpolator() const
+{
+//	if(gauss_sphere)
+	{
+		enum { BUCKETS = 50, SPLITS = 200 };
+		LLOG("gauss_projected");
+		SphericalLatitudeFunction gslf(gauss_alpha, gauss_k, gauss_R, gauss_e, gauss_U0);
+		gauss_projected.Create(lonlat_limits.top, lonlat_limits.bottom, gslf, BUCKETS, SPLITS, 4);
+		LLOG("gauss_latitude");
+		gauss_latitude.CreateInverse(lonlat_limits.top, lonlat_limits.bottom, gslf, BUCKETS, SPLITS, 4);
+	}
+	{
+		enum { BUCKETS = 50, SPLITS = 200 };
+		ConicalRadiusFunction lcrf(n /*, e*/, rho_coef);
+//	lcrf.Dump(+1.4, +1.6, 1000);
+		double max_phi = min(0.0, gauss_projected(lonlat_limits.bottom) - pole_parallel) + 90;
+		double min_phi = gauss_projected(lonlat_limits.top);
+		LLOG("tgsin_projected");
+		tgsin_projected.Create(min_phi, max_phi, lcrf, BUCKETS, SPLITS, 4);
+		LLOG("tgsin_inverse");
+		tgsin_latitude.CreateInverse(min_phi, max_phi, lcrf, BUCKETS, SPLITS, 4);
+	}
+}
+
+static const double LAMBERT_LIMDIFF = 1 * DEGRAD;
+
+ConicalRadiusFunction::ConicalRadiusFunction(double n /*, double e*/, double rho_coef)
+: n(n), rho_coef(rho_coef) //, e(e)
+{
+	static const double DELTA = 1e-6;
+	static const double ANG = M_PI / 2 - LAMBERT_LIMDIFF, ANG1 = ANG + DELTA;
+	double out0 = pow(cos(ANG) / sin(ANG), n), out1 = pow(cos(ANG1) / sin(ANG1), n);
+	double slope = (out0 - out1) / DELTA;
+	k1 = (out0 - LAMBERT_LIMDIFF * slope) / (LAMBERT_LIMDIFF * LAMBERT_LIMDIFF);
+	k0 = slope + 2 * k1 * LAMBERT_LIMDIFF;
+}
+
+double ConicalRadiusFunction::Get(double phi) const
+{
+//	RTIMING("GisCoordsConical::CalcTgSinProjected");
+	phi *= DEGRAD;
+	double ang = phi / 2 + M_PI / 4;
+	double diff = M_PI / 2 - ang;
+	double out;
+	static double prev = 0;
+//	bool limit = false;
+	out = (diff <= LAMBERT_LIMDIFF ? diff * (k0 - k1 * diff) : pow(cos(ang) / sin(ang), n));
+	return out * rho_coef;
+/*
+	{
+//		limit = true;
+		static const double tglim = tan(0.001);
+		out = pow(tglim, n) * (1e3 * diff);
+	}
+	else
+	if(phi >= -1.5)
+*/
+//	else
+//		out = slope * phi + sat;
+//	LLOG(NFormat("tg_sin(%5nf): limit = %[0:no;yes]s, out = %10nf, diff = %10nf",
+//		phi, limit, out, out - prev));
+//	prev = out;
+//	double esin = e * sin(phi);
+//	return out * pow((1 + esin) / (1 - esin), n * e / 2);
+}
+
+static double pow3(double x) { return x * x * x; }
+
+GisCoordsUTM::GisCoordsUTM(
+	double central_meridian_,
+	double multiplier_,
+	double xmeteroffset_,
+	double ymeteroffset_)
+{
+	central_meridian = central_meridian_;
+	multiplier = multiplier_;
+	xmeteroffset = xmeteroffset_;
+	ymeteroffset = ymeteroffset_;
+	SyncArgs();
+}
+
+Pointf GisCoordsUTM::LonLat(Pointf xy) const
+{
+	int paspol = ffloor(xy.x / 1000000);
+	xy.x = xy.x - xmeteroffset;
+	double xyx2 = xy.x * xy.x;
+	double b1 = (xy.y - ymeteroffset) / 111134.861084 * DEGRAD, b = b1;
+	b = b1 - (-0.002518467884 * sin(2 * b) + 0.26428e-5 * sin(4 * b) - 3.681e-9 * sin(6 * b));
+	b = b1 - (-0.002518467884 * sin(2 * b) + 0.26428e-5 * sin(4 * b) - 3.681e-9 * sin(6 * b));
+	double sb = sin(b), cb = cos(b);
+	double T = sb / cb, T2 = T * T;
+	double ETA2 = E12 * sqr(cb);
+	double N = sqr(ellipsoid.a) / (ellipsoid.b * sqrt(ETA2 + 1)), N2 = N * N;
+	double L = central_meridian + (1 / DEGRAD) * xy.x * (
+		+ 1 / (N * cb)
+		- xyx2 / (6 * N * N2 * cb) * (1 + 2 * T2 + ETA2
+			+ xyx2 * (5 + T2 * (28 + 24 * T2 + 8 * ETA2) + 6 * ETA2) / (20 * N2)));
+	b -= (T * xyx2 / (2 * N2)) * (1 + ETA2
+		+ xyx2 * (5 + 3 * ETA2 * (2 - ETA2) + T2 * (3 - 6 * ETA2 - 9 * sqr(ETA2))) / (12 * N2));
+	return Pointf(L, b / DEGRAD);
+}
+
+Pointf GisCoordsUTM::Project(Pointf lonlat, int branch) const
+{
+	double LL = (lonlat.x - central_meridian) * DEGRAD;
+	double LL2 = LL * LL, LL3 = LL2 * LL;
+	lonlat *= DEGRAD;
+	double sx = sin(lonlat.y), cx = cos(lonlat.y);
+	double cx2 = cx * cx, cx3 = cx2 * cx;
+	double B = 111134.861084 / DEGRAD * lonlat.y - 16036.480269 * sin(2 * lonlat.y)
+		+ 16.828067 * sin(4 * lonlat.y) - 0.021975 * sin(6 * lonlat.y) + 0.000031 * sin(8 * lonlat.y);
+	double T = sx / cx, T2 = T * T;
+	double ETA2 = ellipsoid.e2 * cx2;
+	double N = ellipsoid.a / sqrt(1 - E21 * sqr(sx));
+
+	double xout = B + N * sx * cx * (LL2 / 2) * (1 + cx2 * (5 - T2 + (9 + 4 * ETA2) * ETA2) * (LL2 / 12))
+		+ ymeteroffset;
+
+	double yout = N * cx * LL * (1
+		+ cx2 * (LL2 / 6) * ((1 - T2 + ETA2) + cx2 * (5 - 18 * pow3(T2) + (14 - 58 * T2) * ETA2) * (LL2 / 20)))
+		+ xmeteroffset;
+
+	return Pointf(yout, xout);
+}
+
+Array<GisCoords::Arg> GisCoordsUTM::EnumArgs()
+{
+	Array<GisCoords::Arg> out;
+//	out.Add(GisCoords::Arg::Option(gauss_sphere,        "GAUSS",   "Gauss preprocess"));
+	out.Add(GisCoords::Arg::Angle (central_meridian,    "CM",      "Central meridian"));
+	out.Add(GisCoords::Arg::Edit  (multiplier,          "MUL",     "Multiplier"));
+	out.Add(GisCoords::Arg::Edit  (xmeteroffset,        "DX",      "X meter offset"));
+	out.Add(GisCoords::Arg::Edit  (ymeteroffset,        "DY",      "Y meter offset"));
+	return out;
+}
+
+Array<GisCoords::ConstArg> GisCoordsUTM::EnumConstArgs() const
+{
+	Array<GisCoords::ConstArg> args;
+	args.Add(GisCoords::ConstArg("E21", "1 - b^2/a^2", E21));
+	args.Add(GisCoords::ConstArg("E12", "a^2/b^2 - 1", E12));
+	return args;
+}
+
+void GisCoordsUTM::SyncArgs()
+{
+	E21 = 1 - sqr(ellipsoid.b / ellipsoid.a);
+	E12 = sqr(ellipsoid.a / ellipsoid.b) - 1;
+}
+
+GisCoordsAzimuthal::GisCoordsAzimuthal(Pointf p)
+{
+	pole = p;
+}
+
+int GisCoordsAzimuthal::GetBranchCount() const
+{
+	return 1;
+}
+
+Array<Pointf> GisCoordsAzimuthal::LonLatBoundary(const Rectf& lonlat_extent, int branch) const
+{
+	return Array<Pointf>();
+}
+
+GisBSPTree GisCoordsAzimuthal::GetBranchTree(const Rectf& lonlat_extent) const
+{
+	return 0;
+}
+
+Pointf GisCoordsAzimuthal::LonLat(Pointf xy) const
+{
+	double rho = Length(xy);
+	double eps = atan2(xy.x, -xy.y) / DEGRAD;
+	double psi = rho / Rdeg;
+//	return Pointf(eps, M_PI / 2 - psi);
+	return orientation.Global(eps, 90 - psi);
+}
+
+Rectf GisCoordsAzimuthal::LonLatExtent(const Rectf& xy_extent) const
+{
+	Rectf lonlat = ExtentToDegree(xy_extent);
+	return orientation.GlobalExtent(lonlat.left, 90 - lonlat.bottom / Rdeg, lonlat.right, 90 - lonlat.top / Rdeg);
+}
+
+Pointf GisCoordsAzimuthal::Project(Pointf lonlat, int branch) const
+{
+	lonlat = orientation.Local(lonlat);
+	double psi = 90 - lonlat.y;
+//	double rho = R * E * sin(psi) / (c + R * cos(psi));
+	double rho = Rdeg * psi;
+	return PolarPointf(rho, lonlat.x - 90);
+}
+
+Rectf GisCoordsAzimuthal::ProjectExtent(const Rectf& lonlat_extent) const
+{
+	Rectf local = orientation.LocalExtent(lonlat_extent);
+	return DegreeToExtent(local.left, Rdeg * (90 - local.bottom), local.right, Rdeg * (90 - local.top));
+}
+
+double GisCoordsAzimuthal::ProjectDeviation(Pointf lonlat1, Pointf lonlat2, int branch) const
+{
+	return 0;
+}
+
+double GisCoordsAzimuthal::ProjectRatio(Pointf lonlat, int branch) const
+{
+	return 1;
+}
+
+Array<GisCoords::Arg> GisCoordsAzimuthal::EnumArgs()
+{
+	Array<GisCoords::Arg> out;
+	out.Add(GisCoords::Arg::Angle(pole.x, "POLE_M", "Pole meridian", "", -180, +180));
+	out.Add(GisCoords::Arg::Angle(pole.y, "POLE_P", "Pole parallel", "", -90, +90));
+	return out;
+}
+
+Array<GisCoords::ConstArg> GisCoordsAzimuthal::EnumConstArgs() const
+{
+	Array<GisCoords::ConstArg> out;
+	return out;
+}
+
+void GisCoordsAzimuthal::SyncArgs()
+{
+	orientation = pole;
+	R = 6378e3;
+	Rdeg = R * DEGRAD;
+	c = R * 1.7;
+	E = 1;
+}
+
+void GisCoordsAzimuthal::SyncInterpolator() const
+{
+}
+
+const Vector<int>& GisCoords::EnumEPSG()
+{
+	static Vector<int> epsg;
+	if(epsg.IsEmpty())
+		epsg
+		<< 2065 // JTSK
+		<< 4326 // WGS-84
+		<< 4818 // JTSK-geo
+		<< 28403 // S-42
+		<< 102065 // JTSK
+		<< 102067 // JTSK ?
+	;
+	return epsg;
+}
+
+GisCoords GisCoords::GetEPSG(int code)
+{
+	RefPtr<GisCoords::Data> gc;
+	switch(code)
+	{
+	case 2065:
+	case 102065:
+	case 102067:
+		gc = new GisCoordsConical(
+			49.5,
+			ANGDEG(24, 50, 53.41635),
+			ANGDEG(59, 42, 42.6969),
+			78.5,
+			78.5,
+			78.5,
+			0.9999,
+			0, 0);
+		gc->lonlat_limits = Rectf(10, 45, 20, 55);
+		gc->ellipsoid = GisEllipsoid::GetEPSG(GisEllipsoid::BESSEL_1841);
+//		gc->ellipsoid = GisEllipsoid::GetEPSG(GisEllipsoid::WGS_1984);
+		gc->name = "S-JTSK (Ferro) / Krovak";
+		gc->coordsys =
+		"PROJCS[\"S-JTSK (Ferro) / Krovak\", "
+			"GEOGCS[\"S-JTSK (Ferro)\", "
+			"DATUM[\"D_S_JTSK_Ferro\", "
+			"SPHEROID[\"Bessel 1841\",6377397.155,299.1528128]], "
+			"PRIMEM[\"Ferro\",-17.66666666666667], "
+			"UNIT[\"degree\",0.0174532925199433]], "
+		"PROJECTION[\"Krovak\"], "
+		"PARAMETER[\"latitude_of_center\",49.5], "
+		"PARAMETER[\"longitude_of_center\",42.5], "
+		"PARAMETER[\"azimuth\",30.28813972222222], "
+		"PARAMETER[\"pseudo_standard_parallel_1\",78.5], "
+		"PARAMETER[\"scale_factor\",0.9999], "
+		"PARAMETER[\"false_easting\",0], "
+		"PARAMETER[\"false_northing\",0], "
+		"UNIT[\"metre\",1]]";
+		break;
+
+	case 4326:
+		gc = new GisCoordsLonLat(0);
+		gc->ellipsoid = GisEllipsoid::GetEPSG(GisEllipsoid::WGS_1984);
+		gc->name = "WGS 84";
+		gc->description = "World Geodetic System 1984";
+		gc->coordsys =
+		"GEOGCS[\"WGS 84\", "
+			"DATUM[\"WGS_1984\", "
+				"SPHEROID[\"WGS 84\",6378137,298.257223563, "
+				"AUTHORITY[\"EPSG\",7030]], "
+				"TOWGS84[0,0,0,0,0,0,0], "
+				"AUTHORITY[\"EPSG\",6326]], "
+		"PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",8901]], "
+		"UNIT[\"DMSH\",0.0174532925199433,AUTHORITY[\"EPSG\",9108]], "
+		"AXIS[\"Lat\",NORTH], "
+		"AXIS[\"Long\",EAST], "
+		"AUTHORITY[\"EPSG\",4326]]";
+		break;
+
+	case 4818:
+		gc = new GisCoordsLonLat(-ANGDEG(17, 40, 0)); // Ferro
+		gc->ellipsoid = GisEllipsoid::GetEPSG(GisEllipsoid::BESSEL_1841);
+		gc->name = "S-JTSK (Ferro)";
+		gc->description = "Modification of Austrian MGI (Ferro) datum.";
+		break;
+
+	case 28403:
+		gc = new GisCoordsUTM(15, 1, 3500e3, 0);
+		gc->ellipsoid = GisEllipsoid::GetEPSG(GisEllipsoid::KRASSOWSKY_1940);
+		gc->name = "Pulkovo 1942 / Gauss-Kruger zone 3";
+		gc->description = "Military mapping. Czech Republic and Germany ( former DDR) - east of 12 deg East; "
+			"Poland and Slovakia - west of 18 deg East.";
+		gc->lonlat_limits = Rectf(12, 45, 18, 55);
+		gc->coordsys =
+		"PROJCS[\"Pulkovo 1942(83) / Gauss Kruger zone 3\", "
+			"GEOGCS[\"Pulkovo 1942(83)\", "
+				"DATUM[\"Pulkovo_1942_83\", "
+				"SPHEROID[\"Krassowsky 1940\",6378245,298.3, "
+					"AUTHORITY[\"EPSG\",\"7024\"]], "
+				"TOWGS84[24,-123,-94,0.02,-0.25,-0.13,1.1], "
+				"AUTHORITY[\"EPSG\",\"6178\"]], "
+			"PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]], "
+		"UNIT[\"degree\",0.01745329251994328,AUTHORITY[\"EPSG\",\"9122\"]], "
+		"AUTHORITY[\"EPSG\",\"4178\"]], "
+		"PROJECTION[\"Transverse_Mercator\"], "
+		"PARAMETER[\"latitude_of_origin\",0], "
+		"PARAMETER[\"central_meridian\",9], "
+		"PARAMETER[\"scale_factor\",1], "
+		"PARAMETER[\"false_easting\",3500000], "
+		"PARAMETER[\"false_northing\",0], "
+		"UNIT[\"metre\",1,AUTHORITY[\"EPSG\",\"9001\"]], "
+		"AUTHORITY[\"EPSG\",\"2166\"]]";
+		break;
+	}
+	gc->ident = NFormat("EPSG:%d", code);
+	gc->SyncArgs();
+	return GisCoords(gc);
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/Geom/Coords/method.h b/uppsrc/Geom/Coords/method.h
new file mode 100644
index 000000000..4a462a616
--- /dev/null
+++ b/uppsrc/Geom/Coords/method.h
@@ -0,0 +1,239 @@
+#ifndef _Gis3_Coords_method_h_
+#define _Gis3_Coords_method_h_
+
+NAMESPACE_UPP
+
+class GisCoordsLonLat : public GisCoords::Data
+{
+public:
+	GisCoordsLonLat(double prime_meridian = 0.0);
+
+	virtual GisCoords     DeepCopy() const { return new GisCoordsLonLat(*this); }
+
+	virtual Pointf        LonLat(Pointf xy) const;
+	virtual Rectf         LonLatExtent(const Rectf& xy_extent) const;
+	virtual Pointf        Project(Pointf lonlat, int branch) const;
+	virtual Rectf         ProjectExtent(const Rectf& lonlat_extent) const;
+	virtual double        ProjectDeviation(Pointf lonlat1, Pointf lonlat2, int branch) const;
+	virtual double        ProjectRatio(Pointf lonlat, int branch) const;
+
+//	virtual String        ToString() const;
+	virtual Array<GisCoords::Arg> EnumArgs();
+	virtual Array<GisCoords::ConstArg> EnumConstArgs() const;
+	virtual void          SyncArgs();
+	virtual bool          IsProjected() const;
+
+public:
+	double                prime_meridian;
+};
+
+class GisCoordsSphericalData
+{
+public:
+	double                base_parallel;
+};
+
+class SphericalLatitudeFunction : public GisFunction
+{
+public:
+	SphericalLatitudeFunction(double alpha, double k, double R, double e, double U0)
+	: alpha(alpha), k(k), R(R), e(e), U0(U0) {}
+
+	virtual double Get(double x) const;
+
+private:
+	double alpha, k, R, e, U0;
+};
+
+class GisCoordsSpherical : public GisCoords::Data
+	, public GisCoordsSphericalData
+{
+public:
+	typedef GisCoordsSpherical CLASSNAME;
+	GisCoordsSpherical(double base_parallel = 50.0);
+	GisCoordsSpherical(const GisCoordsSpherical& cgs)
+		: GisCoords::Data(cgs), GisCoordsSphericalData(cgs) { SyncArgs(); }
+
+	virtual GisCoords DeepCopy() const { return new GisCoordsSpherical(*this); }
+
+	virtual Pointf        LonLat(Pointf xy) const;
+	virtual Rectf         LonLatExtent(const Rectf& xy_extent) const;
+	virtual Pointf        Project(Pointf lonlat, int branch) const;
+	virtual Rectf         ProjectExtent(const Rectf& lonlat_extent) const;
+	virtual double        ProjectDeviation(Pointf lonlat1, Pointf lonlat2, int branch) const;
+	virtual double        ProjectRatio(Pointf lonlat, int branch) const;
+
+//	virtual String        ToString() const;
+	virtual Array<GisCoords::Arg> EnumArgs();
+	virtual Array<GisCoords::ConstArg> EnumConstArgs() const;
+	virtual void          SyncArgs();
+
+private:
+	void                  CheckInterpolator() const { if(gauss_projected.IsEmpty()) SyncInterpolator(); }
+	void                  SyncInterpolator() const;
+
+private:
+	mutable GisInterpolator gauss_projected;
+	mutable GisInterpolator gauss_latitude;
+	double                alpha, k, R, e, U0;
+};
+
+class ConicalRadiusFunction : public GisFunction
+{
+public:
+	ConicalRadiusFunction(double n, double rho_coef);
+
+	virtual double Get(double x) const;
+
+private:
+	double n;
+	double k0, k1;
+	double rho_coef;
+};
+
+class GisCoordsConicalData
+{
+public:
+//	bool                  gauss_sphere;
+	double                gauss_base_parallel;
+	double                pole_meridian;
+	double                pole_parallel;
+	double                central_parallel;
+//	double                prime_meridian;
+	double                north_parallel;
+	double                south_parallel;
+	double                multiplier;
+	double                xmeteroffset;
+	double                ymeteroffset;
+};
+
+class GisCoordsConical : public GisCoords::Data
+	, public GisCoordsConicalData
+{
+public:
+	typedef GisCoordsConical CLASSNAME;
+	GisCoordsConical(
+		double gauss_base_parallel = 49.5,
+		double pole_meridian = ANGDEG(42, 31, 31.41725),
+		double pole_parallel = ANGDEG(59, 42, 42.6969),
+		double central_parallel = 78.5,
+		double north_parallel = 78.5,
+		double south_parallel = 78.5,
+		double multiplier = 0.9999,
+		double xmeteroffset = 0, double ymeteroffset = 0);
+	GisCoordsConical(const GisCoordsConical& cgs)
+		: GisCoords::Data(cgs), GisCoordsConicalData(cgs) { SyncArgs(); }
+
+	virtual GisCoords DeepCopy() const { return new GisCoordsConical(*this); }
+
+	virtual int           GetBranchCount() const;
+	virtual Array<Pointf> LonLatBoundary(const Rectf& lonlat_extent, int branch) const;
+	virtual GisBSPTree    GetBranchTree(const Rectf& lonlat_extent) const;
+
+	virtual Pointf        LonLat(Pointf xy) const;
+	virtual Rectf         LonLatExtent(const Rectf& xy_extent) const;
+	virtual Pointf        Project(Pointf lonlat, int branch) const;
+	virtual Rectf         ProjectExtent(const Rectf& lonlat_extent) const;
+	virtual double        ProjectDeviation(Pointf lonlat1, Pointf lonlat2, int branch) const;
+	virtual double        ExtentDeviation(const Rectf& lonlat_extent) const;
+	virtual double        ProjectRatio(Pointf lonlat, int branch) const;
+	virtual Sizef         MinMaxRatio(const Rectf& lonlat_extent) const;
+
+//	virtual String        ToString() const;
+	virtual Array<GisCoords::Arg> EnumArgs();
+	virtual Array<GisCoords::ConstArg> EnumConstArgs() const;
+	virtual void          SyncArgs();
+
+	String                DumpProjectedDelta() const;
+
+private:
+	void                  CheckInterpolator() const { if(tgsin_projected.IsEmpty()) SyncInterpolator(); }
+	void                  SyncInterpolator() const;
+
+private:
+	mutable GisInterpolator gauss_projected;
+	mutable GisInterpolator gauss_latitude;
+	mutable GisInterpolator tgsin_projected;
+	mutable GisInterpolator tgsin_latitude;
+	GisOrientation        orientation;
+	double                gauss_alpha, gauss_k, gauss_R, gauss_e, gauss_U0;
+	double                rho0;
+	double                n;
+//	double                e;
+	double                rho_coef;
+};
+
+class GisCoordsUTMData
+{
+public:
+	double                central_meridian;
+	double                multiplier;
+	double                xmeteroffset;
+	double                ymeteroffset;
+};
+
+class GisCoordsUTM : public GisCoords::Data, public GisCoordsUTMData
+{
+public:
+	typedef GisCoordsUTM CLASSNAME;
+	GisCoordsUTM(
+		double central_meridian = 0.0,
+		double multiplier = 1.0,
+		double xmeteroffset = 0.0,
+		double ymeteroffset = 0.0);
+	GisCoordsUTM(const GisCoordsUTM& cgs)
+		: GisCoords::Data(cgs), GisCoordsUTMData(cgs) { SyncArgs(); }
+
+	virtual GisCoords     DeepCopy() const { return new GisCoordsUTM(*this); }
+
+	virtual Pointf        LonLat(Pointf xy) const;
+	virtual Pointf        Project(Pointf lonlat, int branch) const;
+
+	virtual Array<GisCoords::Arg> EnumArgs();
+	virtual Array<GisCoords::ConstArg> EnumConstArgs() const;
+	virtual void          SyncArgs();
+
+	String                DumpProjectedDelta() const;
+
+private:
+	double                E21, E12;
+};
+
+class GisCoordsAzimuthal : public GisCoords::Data
+{
+public:
+	typedef GisCoordsAzimuthal CLASSNAME;
+	GisCoordsAzimuthal(Pointf pole = Pointf(0, 90));
+//	GisCoordsAzimuthal(const GisCoordsAzimuthal& a)
+
+	virtual GisCoords     DeepCopy() const { return new GisCoordsAzimuthal(*this); }
+
+	virtual int           GetBranchCount() const;
+	virtual Array<Pointf> LonLatBoundary(const Rectf& lonlat_extent, int branch) const;
+	virtual GisBSPTree    GetBranchTree(const Rectf& lonlat_extent) const;
+
+	virtual Pointf        LonLat(Pointf xy) const;
+	virtual Rectf         LonLatExtent(const Rectf& xy_extent) const;
+	virtual Pointf        Project(Pointf lonlat, int branch) const;
+	virtual Rectf         ProjectExtent(const Rectf& lonlat_extent) const;
+	virtual double        ProjectDeviation(Pointf lonlat1, Pointf lonlat2, int branch) const;
+	virtual double        ProjectRatio(Pointf lonlat, int branch) const;
+
+//	virtual String        ToString() const;
+	virtual Array<GisCoords::Arg> EnumArgs();
+	virtual Array<GisCoords::ConstArg> EnumConstArgs() const;
+	virtual void          SyncArgs();
+
+private:
+	void                  CheckInterpolator() const {} // if(false) SyncInterpolator(); }
+	void                  SyncInterpolator() const;
+
+public:
+	Pointf                pole;
+	GisOrientation        orientation;
+	double                R, Rdeg, E, c;
+};
+
+END_UPP_NAMESPACE
+
+#endif
diff --git a/uppsrc/Geom/Coords/util.cpp b/uppsrc/Geom/Coords/util.cpp
new file mode 100644
index 000000000..a9e4c0bd6
--- /dev/null
+++ b/uppsrc/Geom/Coords/util.cpp
@@ -0,0 +1,1181 @@
+#include "GeomCoords.h"
+#pragma hdrstop
+
+NAMESPACE_UPP
+
+#define LLOG(x) // RLOG(x)
+
+double DegreeStep(double min_step)
+{
+	static const double step[] =
+	{
+//		90,
+//		45,
+//		30,
+		15,
+		10,
+		5,
+		2,
+		1,
+		30 / 60.0,
+		20 / 60.0,
+		15 / 60.0,
+		10 / 60.0,
+		5 / 60.0,
+		2 / 60.0,
+		1 / 60.0,
+		30 / 3600.0,
+		20 / 3600.0,
+		15 / 3600.0,
+		10 / 3600.0,
+		5 / 3600.0,
+		2 / 3600.0,
+		1 / 3600.0,
+	};
+	const double *p = step;
+	while(p < step + __countof(step) - 1 && p[1] >= min_step)
+		p++;
+	return *p;
+}
+
+int DegreeMask(double start_angle, double end_angle)
+{
+	if(end_angle < start_angle)
+		Swap(start_angle, end_angle);
+	double len = end_angle - start_angle;
+	if(len >= 360)
+		return 0xFF;
+	if(len <= 0)
+		return 0;
+	int sx = fceil(start_angle / 90);
+	int nx = 1 << ((ffloor(end_angle / 90) - sx + 1) & 7);
+	int em = (nx - 1) << (sx & 3);
+	int qm = (2 * nx - 1) << ((sx - 1) & 3);
+	return ((em | (em >> 4)) & 0x0F) | ((qm | (qm << 4)) & 0xF0);
+}
+
+Rectf DegreeToExtent(const Rectf& lonlat)
+{
+	Rectf out;
+	int mask = DegreeMask(lonlat.left, lonlat.right);
+	double lrad = lonlat.left * DEGRAD, rrad = lonlat.right * DEGRAD;
+	double a, b;
+	a = sin(lrad);
+	b = sin(rrad);
+	if(a > b) Swap(a, b);
+	out.left   = (mask & AM_E3 ? -lonlat.bottom : a * (a >= 0 ? lonlat.top : lonlat.bottom));
+	out.right  = (mask & AM_E1 ? +lonlat.bottom : b * (b >= 0 ? lonlat.bottom : lonlat.top));
+	a = -cos(lrad);
+	b = -cos(rrad);
+	if(a > b) Swap(a, b);
+	out.top    = (mask & AM_E0 ? -lonlat.bottom : a * (a >= 0 ? lonlat.top : lonlat.bottom));
+	out.bottom = (mask & AM_E2 ? +lonlat.bottom : b * (b >= 0 ? lonlat.bottom : lonlat.top));
+	return out;
+}
+
+Rectf ExtentToDegree(const Rectf& xy)
+{
+	double mineps, maxeps, minrho, maxrho;
+	if(xy.left >= 0)
+	{
+		mineps = atan2(xy.left, -xy.top);
+		maxeps = atan2(xy.left, -xy.bottom);
+		minrho = hypot(xy.left, xy.top > 0 ? xy.top : xy.bottom < 0 ? xy.bottom : 0);
+		maxrho = hypot(xy.right, max(fabs(xy.top), fabs(xy.bottom)));
+	}
+	else if(xy.right <= 0)
+	{
+		mineps = atan2(xy.right, -xy.bottom);
+		maxeps = atan2(xy.right, -xy.top);
+		minrho = hypot(xy.right, xy.top > 0 ? xy.top : xy.bottom < 0 ? xy.bottom : 0);
+		maxrho = hypot(xy.left, max(fabs(xy.top), fabs(xy.bottom)));
+	}
+	else if(xy.top >= 0)
+	{
+		mineps = atan2(xy.right, -xy.top);
+		maxeps = atan2(xy.left, -xy.top);
+		minrho = hypot(xy.top, xy.left > 0 ? xy.left : xy.right < 0 ? xy.right : 0);
+		maxrho = hypot(xy.bottom, max(fabs(xy.left), fabs(xy.right)));
+	}
+	else if(xy.bottom <= 0)
+	{
+		mineps = atan2(xy.left, -xy.bottom);
+		maxeps = atan2(xy.right, -xy.bottom);
+		minrho = hypot(xy.bottom, xy.left > 0 ? xy.left : xy.right < 0 ? xy.right : 0);
+		maxrho = hypot(xy.top, max(fabs(xy.left), fabs(xy.right)));
+	}
+	else
+	{
+		mineps = -M_PI;
+		maxeps = +M_PI;
+		minrho = 0;
+		maxrho = hypot(max(-xy.left, xy.right), max(-xy.top, xy.bottom));
+	}
+	return Rectf(mineps / DEGRAD, minrho, maxeps / DEGRAD, maxrho);
+}
+
+int GisLengthDecimals(double pixel_len)
+{
+	return minmax<int>(1 - ilog10(pixel_len), 0, 8);
+}
+
+int DegreeDecimals(double pixel_angle)
+{
+	pixel_angle = fabs(pixel_angle);
+	if(pixel_angle >= 1)
+		return -2;
+	if(pixel_angle >= 1 / 60.0)
+		return -1;
+	return minmax<int>(-ilog10(pixel_angle / (1 / 3600.0)), 0, 3);
+}
+
+String FormatDegree(double d, int decimals)
+{
+	if(IsNull(d))
+		return Null;
+	d = modulo(d + 180, 360) - 180;
+	char sign = (d < 0 ? '-' : '+');
+	if(d < 0) d = -d;
+	int deg = ffloor(d);
+	if(decimals <= -2)
+		return NFormat("%c%d�", sign, deg);
+	d = (d - deg) * 60;
+	int min = ffloor(d);
+	if(decimals <= -1)
+		return NFormat("%c%d� %02d\'", sign, deg, min);
+	d = (d - min) * 60;
+	String sec = FormatDoubleFix(d, decimals);
+	if(!IsDigit(sec[1]))
+		sec.Insert(0, '0');
+	return NFormat("%c%d� %02d\' %s\"", sign, deg, min, sec);
+}
+
+Value ScanDegree(const char *p)
+{
+	int deg = ScanInt(p, &p);
+	int min = 0;
+	double sec = 0;
+	if(IsNull(deg))
+		return Null;
+	if(deg < -360 || deg > 360)
+		return ErrorValue(NFormat("Neplatn� po�et �hlov�ch stup��: %d", deg));
+	while(*p && !IsDigit(*p))
+		p++;
+	if(*p)
+	{
+		min = ScanInt(p, &p);
+		if(min < 0 || min >= 60)
+			return ErrorValue(NFormat("Neplatn� po�et �hlov�ch minut: %d", min));
+		while(*p && !IsDigit(*p))
+			p++;
+		if(*p)
+		{
+			sec = ScanDouble(p);
+			if(IsNull(sec) || sec < 0 || sec > 60)
+				return ErrorValue(NFormat("Neplatn� po�et �hlov�ch sekund: %d", sec));
+		}
+	}
+	return ((sec / 60.0 + min) / 60.0 + tabs(deg)) * (deg >= 0 ? 1 : -1);
+}
+
+ConvertDegree::ConvertDegree(int decimals, bool not_null, double min, double max)
+: decimals(decimals), not_null(not_null), min(min), max(max)
+{}
+
+ConvertDegree::~ConvertDegree() {}
+
+Value ConvertDegree::Format(const Value& v) const
+{
+	if(IsNull(v) || !IsNumber(v))
+		return v;
+	return FormatDegree(v, decimals);
+}
+
+Value ConvertDegree::Scan(const Value& v) const
+{
+	if(IsNull(v) || !IsString(v))
+		return v;
+	double d = ScanDegree((String)v);
+	if(IsNull(d))
+	{
+		if(not_null)
+			return ErrorValue("Hodnota nesm� b�t pr�zdn�.");
+		return Null;
+	}
+	if(!IsNull(min) && d < min)
+		return ErrorValue(NFormat("Zadan� �hel je men�� ne� povolen� doln� mez, %s.", FormatDegree(min, 0)));
+	if(!IsNull(max) && d > max)
+		return ErrorValue(NFormat("Zadan� �hel je v�t�� ne� povolen� horn� mez, %s.", FormatDegree(max, 0)));
+	return d;
+}
+
+int ConvertDegree::Filter(int c) const
+{
+	return IsDigit(c) || c == ':' || c == '\'' || c == '\"' || c == ',' || c == '.' || c == '/'
+		|| c == '+' || c == '-' ? c : 0;
+}
+
+void GisFunction::Dump(double xmin, double xmax, int steps) const
+{
+	double dy = 0;
+	for(int i = 0; i <= steps; i++)
+	{
+		double x = xmin + (xmax - xmin) * i / steps;
+		double y = Get(x);
+		RLOG(NFormat("%10nl\t%10nl\t%10nl", x, y, y - dy));
+		dy = y;
+	}
+}
+
+GisInverse::GisInverse(double xmin_, double xmax_, const GisFunction& fn_, int sections_, double epsilon_)
+: fn(fn_)
+{
+	xstep = (xmax_ - xmin_) / sections_;
+	rawxmin = (xmin = xmin_) - xstep;
+	rawxmax = (xmax = xmax_) + xstep;
+	epsilon = epsilon_;
+	ymap.SetCount(sections_ + 3);
+	ymap[0] = fn(xmin - xstep);
+	ymap.Top() = fn(xmax + xstep);
+	rawymin = min(ymap[0], ymap.Top());
+	rawymax = max(ymap[0], ymap.Top());
+	ymin = ymax = ymap[1] = fn(xmin);
+	for(int i = 1; i <= sections_; i++)
+	{
+		double y = fn(xmin + i * xstep);
+		if(y < ymin) ymin = y;
+		if(y > ymax) ymax = y;
+		ymap[i + 1] = y;
+	}
+	if(ymin < rawymin) rawymin = ymin;
+	if(ymax > rawymax) rawymax = ymax;
+	ystep = (rawymax - rawymin) / sections_;
+	int prev = minmax(ffloor((ymap[0] - rawymin) / ystep), 0, sections_ + 1);
+	for(int i = 0; i < sections_ + 2; i++)
+	{
+		int next = minmax(ffloor((ymap[i + 1] - rawymin) / ystep), 0, sections_ + 1);
+		if(prev <= next)
+			while(prev < next)
+				accel.Add(prev++, i);
+		else
+			while(prev > next)
+				accel.Add(prev--, i);
+		accel.Add(prev = next, i);
+	}
+}
+
+double GisInverse::Get(double y) const
+{
+	for(int f = accel.Find(minmax<int>((int)((y - rawymin) / ystep), 0, accel.GetCount() - 1)); f >= 0;
+		f = accel.FindNext(f))
+	{
+		int sec = accel[f];
+		if(ymap[sec] == y)
+			return rawxmin + xstep * sec;
+		else if(ymap[sec + 1] == y)
+			return rawxmin + xstep * (sec + 1);
+		else if(ymap[sec] > y && ymap[sec + 1] < y)
+		{
+			double lx = rawxmin + xstep * sec, hx = lx + xstep;
+			double ly = ymap[sec], hy = ymap[sec + 1];
+			while(hx - lx > epsilon)
+			{
+/*				double dh = hy - ly, mx, my;
+				if(fabs(dh) > epsilon)
+					mx = lx + (y - ly) * (hx - lx) / dh;
+				else
+*/
+				double mx = (lx + hx) / 2;
+				double my = fn(mx);
+				if(my > y)
+				{
+					lx = mx;
+					ly = my;
+				}
+				else
+				{
+					hx = mx;
+					hy = my;
+				}
+			}
+			return (lx + hx) / 2;
+		}
+		else if(ymap[sec] < y && ymap[sec + 1] > y)
+		{
+			double lx = rawxmin + xstep * sec, hx = lx + xstep;
+			double ly = ymap[sec], hy = ymap[sec + 1];
+			while(hx - lx > epsilon)
+			{
+				double dh = hy - ly;
+				double mx = (fabs(dh) > epsilon ? lx + (y - ly) * (hx - lx) / dh : (lx + hx) / 2);
+				if(mx - lx <= epsilon)
+					return mx;
+				if(hx - mx <= epsilon)
+					return mx;
+				double my = fn(mx);
+				if(my < y)
+				{
+					lx = mx;
+					ly = my;
+				}
+				else
+				{
+					hx = mx;
+					hy = my;
+				}
+			}
+			return (lx + hx) / 2;
+		}
+	}
+	return 0;
+}
+
+String GisInverseDelta(double xmin, double xmax, const GisFunction& fn, int sections, double epsilon, int samples)
+{
+	String out;
+	GisInverse inverse(xmin, xmax, fn, sections, epsilon);
+	int show_samples = min(samples, 1000);
+	double show_step = (xmax - xmin) / show_samples;
+	for(int i = 0; i < show_samples; i++)
+	{
+		double x = xmin + i * show_step;
+		double y = fn(x);
+		double ix = inverse(y);
+		out << NFormat("%15>10!nf %15>10!nf %15>10!nf %15>10!nf\n", x, y, ix, ix - x);
+	}
+	double step = (xmax - xmin) / samples;
+	double max_error = 0;
+	for(int i = 0; i < samples; i++)
+	{
+		double x = xmin + i * step;
+		double y = fn(x);
+		double ix = inverse(y);
+		max_error = max(max_error, fabs(ix - x));
+	}
+	return NFormat("max delta = %10n\n%s", max_error, out);
+}
+
+String GisInverseTiming(double xmin, double xmax, const GisFunction& fn, int sections, double epsilon)
+{
+	String out;
+	GisInverse inverse(xmin, xmax, fn, sections, epsilon);
+	Buffer<double> yval(1000);
+	for(int i = 0; i < 1000; i++)
+		yval[i] = inverse.GetYMin() + (inverse.GetYMax() - inverse.GetYMin()) * i / 999.0;
+	int start = msecs(), duration;
+	int count = 0;
+	do
+	{
+		count++;
+		double x;
+		for(int i = 0; i < 1000; i++)
+			x = inverse(yval[i]);
+	}
+	while((duration = msecs(start)) < 500);
+	double nsecs = duration * 1000.0 / double(count);
+	return NFormat("Function inverse: %4v nsecs", nsecs);
+}
+
+void QuadraticLeastSquare(const double *vx, const double *vy, int count, double coef_out[3])
+{
+	double left[3][3], right[3];
+	ZeroArray(left);
+	ZeroArray(right);
+	double xpow[3] = { 1 };
+	for(int s = 0; s < count; s++)
+	{
+		xpow[1] = vx[s];
+		xpow[2] = sqr(xpow[1]);
+		double sy = vy[s];
+		for(int y = 0; y < 3; y++)
+		{
+			double xy = xpow[y];
+			const double *xp = xpow;
+			double *dest = left[y];
+			for(int x = 0; x < 3; x++)
+				*dest++ += *xp++ * xy;
+			right[y] += sy * xy;
+		}
+	}
+	double D = Determinant(
+		left[0][0], left[0][1], left[0][2],
+		left[1][0], left[1][1], left[1][2],
+		left[2][0], left[2][1], left[2][2]);
+	double D1 = Determinant(
+		right[0], left[0][1], left[0][2],
+		right[1], left[1][1], left[1][2],
+		right[2], left[2][1], left[2][2]);
+	double DX = Determinant(
+		left[0][0], right[0], left[0][2],
+		left[1][0], right[1], left[1][2],
+		left[2][0], right[2], left[2][2]);
+	double DXX = Determinant(
+		left[0][0], left[0][1], right[0],
+		left[1][0], left[1][1], right[1],
+		left[2][0], left[2][1], right[2]);
+	coef_out[0] = D1 / D;
+	coef_out[1] = DX / D;
+	coef_out[2] = DXX / D;
+}
+
+void GisInterpolator::Create(double xmin_, double xmax_, const GisFunction& fn, int buckets, int sections, int samples)
+{
+	samples &= ~1;
+	ASSERT(sections >= buckets);
+	bucket_index.SetCount(sections);
+	abc.SetCount(3 * sections);
+	xmin = xmin_;
+	xmax = xmax_;
+	step = (xmax_ - xmin_) / buckets;
+	limit = buckets - 1;
+	Vector<int> bucket_sections;
+	bucket_sections.SetCount(buckets, 1);
+	int section_count = buckets;
+	Vector<double> bucket_error;
+	bucket_error.SetCount(buckets);
+	Buffer<double> xsmpl(samples + 1), ysmpl(samples + 1);
+	for(int b = 0; b < buckets; b++)
+	{
+		double error = 0;
+		int nsec = bucket_sections[b];
+		double buck_begin = xmin + b * step;
+		double sec_step = step / nsec;
+		for(int s = 0; s < nsec; s++)
+		{
+			double sec_begin = buck_begin + s * sec_step;
+			double sample_step = sec_step / samples;
+			for(int m = 0; m <= samples; m++)
+			{
+				xsmpl[m] = m / double(samples);
+				ysmpl[m] = fn(sec_begin + sample_step * m);
+			}
+			double abc[3];
+			abc[0] = ysmpl[0];
+			abc[1] = 4 * ysmpl[samples >> 1] - ysmpl[samples] - 3 * ysmpl[0];
+			abc[2] = ysmpl[samples] - ysmpl[0] - abc[1];
+//			QuadraticLeastSquare(xsmpl, ysmpl, samples + 1, abc);
+			for(int m = 0; m <= samples; m++)
+				error = max(error, fabs(abc[0] + xsmpl[m] * (abc[1] + xsmpl[m] * abc[2]) - ysmpl[m]));
+		}
+		bucket_error[b] = error;
+		LLOG(NFormat("bucket[%d] (%4v .. %4v) error = %4ne", b, buck_begin, buck_begin + step, error));
+	}
+	Vector<int> order = GetSortOrder(bucket_error);
+	while(section_count + 1 < sections)
+	{
+		int worst = order.Top();
+		int add_sections = min(bucket_sections[worst], sections - section_count);
+		bucket_sections[worst] += add_sections;
+		section_count += add_sections;
+		double error = 0;
+		int nsec = bucket_sections[worst];
+		double buck_begin = xmin + worst * step;
+		double sec_step = step / nsec;
+		for(int s = 0; s < nsec; s++)
+		{
+			double sec_begin = buck_begin + s * sec_step;
+			double sample_step = sec_step / samples;
+			for(int m = 0; m <= samples; m++)
+			{
+				xsmpl[m] = m / double(samples);
+				ysmpl[m] = fn(sec_begin + sample_step * m);
+			}
+			double abc[3];
+			abc[0] = ysmpl[0];
+			abc[1] = 4 * ysmpl[samples >> 1] - ysmpl[samples] - 3 * ysmpl[0];
+			abc[2] = ysmpl[samples] - ysmpl[0] - abc[1];
+//			QuadraticLeastSquare(xsmpl, ysmpl, samples + 1, abc);
+			for(int m = 0; m <= samples; m++)
+			{
+				double abcval = abc[0] + xsmpl[m] * (abc[1] + xsmpl[m] * abc[2]);
+				double new_error = fabs(abcval - ysmpl[m]);
+				if(new_error > error)
+				{
+//					LLOG(NFormat("error at %10nf: abc = %10nf, y = %10nf, error = %10nf",
+//						sec_begin + sample_step * xsmpl[m], abcval, ysmpl[m], new_error));
+					error = new_error;
+				}
+			}
+		}
+		LLOG("total = " << section_count << ": bucket[" << worst << "] expand to " << nsec << ", error: "
+			<< FormatDoubleExp(bucket_error[worst], 4) << " -> " << FormatDoubleExp(error, 4));
+		bucket_error[worst] = error;
+		for(int b = order.GetCount() - 2; b >= 0 && bucket_error[order[b]] > bucket_error[order[b + 1]]; b--)
+			Swap(order[b], order[b + 1]);
+	}
+
+	int bucket = 0;
+//	double y0, ym, y1;
+	for(int b = 0; b < buckets; b++)
+	{
+		int nsec = bucket_sections[b];
+		LLOG("# bucket sections[" << b << "] = " << bucket_sections[b]);
+		double buck_begin = xmin + b * step;
+		double sec_step = step / nsec;
+		for(int s = 0; s < nsec; s++)
+		{
+			double sec_begin = buck_begin + s * sec_step;
+			double y0 = fn(sec_begin);
+			double ym = fn(sec_begin + sec_step / 2);
+			double y1 = fn(sec_begin + sec_step);
+//			double sample_step = sec_step / samples;
+//			for(int m = 0; m <= samples; m++)
+//			{
+//				xsmpl[m] = m / double(samples);
+//				fn(sec_begin + sample_step * m, ysmpl[m]);
+//			}
+			double a0 = y0;
+			double a1 = 4 * ym - y1 - 3 * y0;
+			double a2 = y1 - y0 - a1;
+			abc[3 * (bucket + s) + 0] = a0 - a1 * s + a2 * s * s;
+			abc[3 * (bucket + s) + 1] = a1 * nsec - 2 * a2 * s * nsec;
+			abc[3 * (bucket + s) + 2] = a2 * nsec * nsec;
+//			QuadraticLeastSquare(xsmpl, ysmpl, samples + 1, abc.GetIter(3 * (bucket_index[b] + s)));
+		}
+
+		bucket_index[b] = bucket | (nsec << 16);
+		bucket += nsec;
+	}
+
+/*
+	for(int i = 0; i < split; i++)
+	{
+		double left[3][3], right[3];
+		ZeroArray(left);
+		ZeroArray(right);
+		double xpow[3] = { 1 };
+		for(int s = 0; s <= samples; s++)
+		{
+			xpow[1] = s / (double)samples;
+			xpow[2] = sqr(xpow[1]);
+			double sy;
+			fn(xmin + (i + xpow[1]) * step, sy);
+			for(int y = 0; y < 3; y++)
+			{
+				double xy = xpow[y];
+				const double *xp = xpow;
+				double *dest = left[y];
+				for(int x = 0; x < 3; x++)
+					*dest++ += *xp++ * xy;
+				right[y] += sy * xy;
+			}
+			double D = Determinant(
+				left[0][0], left[0][1], left[0][2],
+				left[1][0], left[1][1], left[1][2],
+				left[2][0], left[2][1], left[2][2]);
+			double D1 = Determinant(
+				right[0], left[0][1], left[0][2],
+				right[1], left[1][1], left[1][2],
+				right[2], left[2][1], left[2][2]);
+			double DX = Determinant(
+				left[0][0], right[0], left[0][2],
+				left[1][0], right[1], left[1][2],
+				left[2][0], right[2], left[2][2]);
+			double DXX = Determinant(
+				left[0][0], left[0][1], right[0],
+				left[1][0], left[1][1], right[1],
+				left[2][0], left[2][1], right[2]);
+			abc[3 * i + 0] = D1 / D;
+			abc[3 * i + 1] = DX / D;
+			abc[3 * i + 2] = DXX / D;
+		}
+	}
+*/
+/*
+	Vector<double> ys;
+	split &= ~1;
+	ys.SetCount(split + 1);
+	double step = (xmax_ - xmin_) / split;
+	for(int i = 0; i <= split; i++)
+		fn(xmin_ + i * step, ys[i]);
+	Create(xmin_, xmax_, ys, epsilon);
+*/
+}
+
+void GisInterpolator::CreateInverse(double xmin, double xmax, const GisFunction& fn, int buckets, int sections, int samples)
+{
+	GisInverse inverse(xmin, xmax, fn, buckets, 1e-10);
+	Create(inverse.GetYMin(), inverse.GetYMax(), inverse, buckets, sections, samples);
+}
+
+String GisInterpolator::CreateDump(double xmin_, double xmax_, const GisFunction& fn, int buckets, int sections, int samples, int check)
+{
+	Create(xmin_, xmax_, fn, buckets, sections, samples);
+	return Dump(fn, check);
+}
+
+String GisInterpolator::CreateInverseDump(double xmin_, double xmax_, const GisFunction& fn, int buckets, int sections, int samples, int check)
+{
+	CreateInverse(xmin_, xmax_, fn, buckets, sections, samples);
+	return Dump(fn, check);
+}
+
+String GisInterpolator::Dump(const GisFunction& fn, int check)
+{
+/*
+	String out = NFormat("Interpolator: index(%d), abc(%d), xmin = %4v, xmax = %4v\n"
+		"     X               Y               I               D\n",
+		index.GetCount(), abc.GetCount(), xmin, xmax);
+//*/
+//	String out = NFormat("Interpolator: y(%d), xmin %4v, xmax %4v\n"
+//		"     X               Y               I               D\n", y.GetCount(), xmin, xmax);
+	String out = NFormat("Interpolator: abc(%d), xmin %4v, xmax %4v\n"
+		"     X               Y               I               D\n", abc.GetCount(), xmin, xmax);
+	for(int t = 0; t < check; t++)
+	{
+		double x = xmin + t * (xmax - xmin) / (check - 1);
+		double f = fn(x);
+		double i = Get(x);
+		out << NFormat("%15>10!nf %15>10!nf %15>10!nf %15>10!nf\n", x, f, i, f - i);
+	}
+	return out;
+}
+
+double GisInterpolator::Get(double x) const
+{
+	int i = (int)(x = (x - xmin) / step);
+	if(i < 0) i = 0;
+	else if(i > limit) i = limit;
+	x -= i;
+	unsigned buck_sec = bucket_index[i];
+	int nsec = (buck_sec >> 16);
+	int bucket = (word)buck_sec;
+//	int b = bucket_index[i], nsec = bucket_index[i + 1] - b;
+//	int b = 0, nsec = 1;
+	if(nsec > 1)
+	{
+		int s = (int)(x * nsec);
+		if(s < 0)
+			s = 0;
+		else if(s >= nsec)
+			s = nsec - 1;
+//		x -= s;
+		bucket += s;
+	}
+	const double *a = &abc[3 * bucket];
+	return a[0] + x * (a[1] + x * a[2]);
+
+/*
+	x = (x - xmin) / step;
+	int i = x < 0 ? 0 : x >= limit ? limit : (int)x;
+	const double *a = abc.GetIter(index[i]);
+	x = (x - begin[i]) / len[i];
+	return a[0] + x * (a[1] + x * a[2]);
+//*/
+
+/*
+	x = (x - xmin) * divisor;
+	int ifac = (x < 0 ? 0 : x >= limit ? limit : (int)x);
+	x -= ifac;
+	const double *yfac = &y[2 * ifac];
+	return yfac[0] + x * (yfac[1] + x * (yfac[2] - yfac[1] - yfac[0]));
+//*/
+}
+
+String GisInterpolatorDelta(double xmin, double xmax, const GisFunction& fn, int buckets, int sections, int samples, int check)
+{
+	GisInterpolator interpolator;
+	String dump = interpolator.CreateDump(xmin, xmax, fn, buckets, sections, samples, min(check, 1000));
+	double dmax = 0;
+	double step_check = (xmax - xmin) / check;
+	for(int ix = 0; ix <= check; ix++)
+	{
+		double fx = xmin + ix * step_check;
+		double fy = fn(fx);
+		double fiy = interpolator(fx);
+		double d = fabs(fiy - fy);
+		if(d > dmax)
+			dmax = d;
+	}
+	return NFormat("d-max = %4v\n\n%s", dmax, dump);
+}
+
+String GisInterpolatorTiming(double xmin, double xmax, const GisFunction& fn, int buckets, int sections, int samples, int check)
+{
+	GisInterpolator interpolator;
+	String dump = interpolator.CreateDump(xmin, xmax, fn, buckets, sections, samples, check);
+	double dmax = 0;
+	double step_check = (xmax - xmin) / check;
+	double step_64K = (xmax - xmin) / 65536;
+	Buffer<double> check_table(1000);
+	for(int c = 0; c < 1000; c++)
+		check_table[c] = xmin + c / 999.0;
+	for(int ix = 0; ix <= check; ix++)
+	{
+		double fx = xmin + ix * step_check;
+		double fy = fn(fx);
+		double fiy = interpolator(fx);
+		dmax = max(dmax, fabs(fiy - fy));
+	}
+	int start, duration_e, duration_f, duration_i;
+	int count_e = 0, count_f = 0, count_i = 0;
+	start = msecs();
+	while((duration_e = msecs(start)) == 0);
+	start += duration_e;
+	Callback2<double, double&> empty;
+	double y;
+	do
+	{
+		count_e++;
+		for(int t = 0; t < 1000; t++)
+			empty(check_table[t], y);
+	}
+	while((duration_e = msecs(start)) < 500);
+	start += duration_e;
+	do
+	{
+		count_f++;
+		for(int t = 0; t < 1000; t++)
+			y = fn(check_table[t]);
+	}
+	while((duration_f = msecs(start)) < 500);
+	start += duration_f;
+	do
+	{
+		count_i++;
+		for(int t = 0; t < 1000; t++)
+			interpolator(check_table[t]);
+	}
+	while((duration_i = msecs(start)) < 500);
+	double e_nsecs = duration_e * 1000 / count_e;
+	double f_nsecs = duration_f * 1000 / count_f - e_nsecs;
+	double i_nsecs = duration_i * 1000 / count_i - e_nsecs;
+
+	return NFormat("d-max = %4v, f = %4v nsecs, i = %4v nsecs\n\n%s", dmax, f_nsecs, i_nsecs, dump);
+}
+
+/*
+void Interpolator::Create(Callback2<double, double&> calc, double xmin, double xmax, int min_depth, int max_depth, double epsilon)
+{
+	calc(extent.left = xmin, extent.top);
+	calc(extent.right = xmax, extent.bottom);
+	Pointf mid;
+	calc(mid.x = (extent.left + extent.right) * 0.5, mid.y);
+	scale = 1 << max_depth;
+	divisor = extent.Width() / scale;
+	tree = CreateTree(calc, extent, mid, 1, min_depth, max_depth, epsilon);
+}
+*/
+
+/*
+One<Interpolator::Tree> Interpolator::CreateTree(Callback2<double, double&> calc, const Rectf& extent, const Pointf& mid,
+	int depth, int min_depth, int max_depth, double epsilon)
+{
+	One<Tree> out = new Tree;
+	out->mid_y = mid.y;
+	if(++depth <= max_depth)
+	{
+		Pointf lmid, rmid;
+		calc(lmid.x = (extent.left + mid.x) / 2, lmid.y);
+		calc(rmid.x = (mid.x + extent.right) / 2, rmid.y);
+		double a1_2 = (extent.bottom - extent.top) / 4;
+		double a2_4_a0 = (extent.top + extent.bottom + mid.y * 6) / 8;
+		if(depth <= min_depth || fabs(a2_4_a0 - a1_2 - lmid.y) > epsilon)
+			out->left = CreateTree(calc, Rectf(extent.left, extent.top, mid.x, mid.y), lmid, depth, min_depth, max_depth, epsilon);
+		if(depth <= min_depth || fabs(a2_4_a0 + a1_2 - rmid.y) > epsilon)
+			out->right = CreateTree(calc, Rectf(mid.x, mid.y, extent.right, extent.bottom), rmid, depth, min_depth, max_depth, epsilon);
+	}
+	return out;
+}
+*/
+
+/*
+double Interpolator::operator [] (double x) const
+{
+	x = (x - extent.left) / divisor;
+	int ifac = ffloor(minmax<double>(x, 0, scale - 1));
+	x -= ifac;
+	int bit = scale >> 1;
+	const Tree *node = ~tree;
+	double ymin = extent.top, ymax = extent.bottom;
+	for(;;)
+		if(ifac & bit)
+		{
+			if(node->right)
+			{
+				ymin = node->mid_y;
+				node = ~node->right;
+				bit >>= 1;
+			}
+			else
+				break;
+		}
+		else
+		{
+			if(node->left)
+			{
+				ymax = node->mid_y;
+				node = ~node->left;
+				bit >>= 1;
+			}
+			else
+				break;
+		}
+	x = (x + ((ifac & (2 * bit - 1)) - bit)) / bit;
+	double a1 = (ymax - ymin) / 2;
+	double a2 = (ymin + ymax) / 2 - node->mid_y;
+	return node->mid_y + x * (a1 + x * a2);
+}
+*/
+
+/*
+double Interpolator::Linear(double x) const
+{
+	x = (x - extent.left) / divisor;
+	int ifac = ffloor(minmax<double>(x, 0, scale - 1));
+	x -= ifac;
+	int bit = scale;
+	double ymin = extent.top, ymax = extent.bottom;
+	for(const Tree *node = ~tree; node;)
+		if(ifac & (bit >>= 1))
+		{
+			ymin = node->mid_y;
+			node = ~node->right;
+		}
+		else
+		{
+			ymax = node->mid_y;
+			node = ~node->left;
+		}
+	x = (x + ((ifac & (bit - 1)))) / bit;
+	return ymin + (ymax - ymin) * x;
+}
+*/
+
+GisOrientation::GisOrientation(Pointf p)
+{
+	static const double EPS = 1 / 3600.0;
+	pole = p;
+	delta_phi = M_PI / 2 - pole.y * DEGRAD;
+//	int lquad = ffloor((pole.y + EPS) / (M_PI / 2));
+//	double reduced = pole.y - lquad * (M_PI / 2);
+	pole.x = modulo(pole.x + 180, 360) - 180;
+//	pole.y -= lquad * (M_PI / 2);
+//	int gquad = lquad;
+	identity = false;
+	if(fabs(delta_phi) <= EPS)
+	{
+		if(fabs(pole.x) <= EPS)
+		{
+			identity = true;
+			localproc = globalproc = &GisOrientation::Identity;
+			localextent = globalextent = &GisOrientation::IdentityExtent;
+		}
+		else
+		{
+			localproc = &GisOrientation::LocalDelta;
+			globalproc = &GisOrientation::GlobalDelta;
+			localextent = &GisOrientation::LocalDeltaExtent;
+			globalextent = &GisOrientation::GlobalDeltaExtent;
+		}
+	}
+	else
+	{
+//		lquad++;
+		suk = sin(pole.y * DEGRAD);
+		sukneg = (suk < 0);
+		cuk = cos(pole.y * DEGRAD);
+		cukneg = (cuk < 0);
+		localproc = &GisOrientation::LocalAny;
+		globalproc = &GisOrientation::GlobalAny;
+		localextent = &GisOrientation::LocalAnyExtent;
+		globalextent = &GisOrientation::GlobalAnyExtent;
+	}
+/*
+	switch(lquad & 3)
+	{
+	case 1: localproc = localquad; break;
+	case 2: localproc = &WorldTransform::Local1; break;
+	case 3: localproc = &WorldTransform::Local2; break;
+	case 0: localproc = &WorldTransform::Local3; break;
+	}
+	switch(gquad & 3)
+	{
+	case 1: globalproc = globalquad; break;
+	case 0: globalproc = &WorldTransform::Global1; break;
+	case 3: globalproc = &WorldTransform::Global2; break;
+	case 2: globalproc = &WorldTransform::Global3; break;
+	}
+*/
+}
+
+Pointf GisOrientation::LocalAny(double lon, double lat) const
+{
+	double dv = (lon - pole.x) * DEGRAD;
+	lat *= DEGRAD;
+	double su = sin(lat), cu = cos(lat), sv = sin(dv), cv = cos(dv);
+	double cuv = cu * cv;
+	double s = suk * su + cuk * cuv;
+	double d = dv;
+	if(s <= -1.0)
+		s = -M_PI / 2;
+	else if(s >= +1.0)
+		s = +M_PI / 2;
+	else
+	{
+		double cs = sqrt(1 - s * s);
+		s = asin(s);
+		d = SafeArcCos((suk * cuv - cuk * su) / cs, sv < 0);
+	}
+	return Pointf(d / DEGRAD, s / DEGRAD);
+}
+
+Pointf GisOrientation::GlobalAny(double lon, double lat) const
+{
+	lon *= DEGRAD;
+	lat *= DEGRAD;
+	double su = sin(lat), cu = cos(lat), sv = sin(lon), cv = cos(lon);
+	double cuv = cu * cv;
+	double s = suk * su - cuk * cuv;
+	double d = lon;
+	if(s <= -1.0)
+		s = -M_PI / 2;
+	else if(s >= +1.0)
+		s = +M_PI / 2;
+	else
+	{
+		double cs = sqrt(1 - s * s);
+		s = asin(s);
+		d = SafeArcCos((suk * cuv + cuk * su) / cs, sv < 0);
+	}
+	return Pointf(d / DEGRAD + pole.x, s / DEGRAD);
+}
+
+Pointf GisOrientation::LocalDelta(double lon, double lat) const
+{
+	return Pointf(lon - pole.x, lat);
+}
+
+Pointf GisOrientation::GlobalDelta(double lon, double lat) const
+{
+	return Pointf(lon + pole.x, lat);
+}
+
+Pointf GisOrientation::Identity(double lon, double lat) const
+{
+	return Pointf(lon, lat);
+}
+
+static inline double CalcRatio(double x, double y)
+{
+	double den = 1 - y * y;
+	return den > 0 ? x / sqrt(den) : double(Null);
+}
+
+Rectf GisOrientation::LocalAnyExtent(const Rectf& lonlat) const
+{
+	Rectf out = Null;
+	out |= Local(lonlat.TopLeft());
+	out |= Local(lonlat.TopRight());
+	out |= Local(lonlat.BottomLeft());
+	out |= Local(lonlat.BottomRight());
+	return out;
+/*
+//	if(lonlat.Width() >= 2 * M_PI)
+//		return Rectf(-M_PI, -M_PI / 2, +M_PI, +M_PI / 2);
+	double dv1 = (lonlat.left - pole.x) * DEGRAD, sv1 = sin(dv1), cv1 = cos(dv1);
+	double dv2 = (lonlat.right - pole.x) * DEGRAD, sv2 = sin(dv2), cv2 = cos(dv2);
+	double trad = lonlat.top * DEGRAD, brad = lonlat.bottom * DEGRAD;
+	int xmask = DegreeMask(dv1, dv2);
+	int yfmask = DegreeMask(trad + delta_phi, brad + delta_phi);
+	int ybmask = DegreeMask(trad - delta_phi, brad - delta_phi);
+	if(xmask & AM_E0 && yfmask & AM_E1 && yfmask & AM_E3
+	|| xmask & AM_E2 && ybmask & AM_E1 && ybmask & AM_E3)
+		return Rectf(-M_PI, -M_PI / 2, +M_PI, +M_PI / 2);
+	double su1 = sin(trad), su2 = sin(brad);
+	double cu1 = cos(trad), cu2 = cos(brad);
+	double ccv1 = cuk * cv1, ccv2 = cuk * cv2;
+	double cvmin = ccv1, cvmax = ccv2;
+	if(cvmin > cvmax)
+		Swap(cvmin, cvmax);
+	if(xmask & AM_E2) (cukneg ? cvmax : cvmin) = -cuk;
+	if(xmask & AM_E0) (cukneg ? cvmin : cvmax) = +cuk;
+	double suks1 = suk * su1, suks2 = suk * su2;
+	double smin = min(suks1 + cu1 * cvmin, suks2 + cu2 * cvmin);
+	double smax = max(suks1 + cu1 * cvmax, suks2 + cu2 * cvmax);
+	if(xmask & (AM_E0 | AM_E2))
+	{
+		if(xmask & AM_E0 ? yfmask & AM_E1 : ybmask & AM_E3)
+			return Rectf(-M_PI, SafeArcSin(smin), +M_PI, +M_PI / 2);
+		if(xmask & AM_E0 ? yfmask & AM_E3 : ybmask & AM_E1)
+			return Rectf(-M_PI, -M_PI / 2, +M_PI, SafeArcSin(smin));
+	}
+//	if(ymask & AM_E1)
+//		smax = (sukneg ? min(su1, su2) : max(su1, su2)) / suk;
+//	if(ymask & AM_E3)
+//		smin = (sukneg ? max(su1, su2) : min(su1, su2)) / suk;
+	double cuks1 = cuk * su1, cuks2 = cuk * su2;
+	double scv1 = cv1 * suk, scv2 = cv2 * suk;
+	double lt = CalcRatio(scv1 * cu1 - cuks1, ccv1 * cu1 + suks1);
+	double lb = CalcRatio(scv1 * cu2 - cuks2, ccv1 * cu2 + suks2);
+	double rt = CalcRatio(scv2 * cu1 - cuks1, ccv2 * cu1 + suks1);
+	double rb = CalcRatio(scv2 * cu2 - cuks2, ccv2 * cu2 + suks2);
+	if(IsNull(lt)) lt = lb; else if(IsNull(lb)) lb = lt;
+	if(IsNull(rt)) rt = rb; else if(IsNull(rb)) rb = rt;
+	double cmin = -M_PI, cmax = +M_PI;
+	if(yfmask & AM_E1)
+	{
+		cmin = (lt >= rt ? SafeArcCos(lt, sv1 < 0) : SafeArcCos(rt, sv2 < 0));
+		cmax = (lb <= rb ? SafeArcCos(lb, sv1 < 0) : SafeArcCos(rb, sv2 < 0));
+		if(sv1 < 0)
+			Swap(cmin, cmax);
+	}
+	else if(yfmask & AM_E3)
+	{
+		cmin = (lb >= rb ? SafeArcCos(lb, sv1 < 0) : SafeArcCos(rb, sv2 < 0));
+		cmax = (lt <= rt ? SafeArcCos(lt, sv1 < 0) : SafeArcCos(rt, sv2 < 0));
+		if(sv1 < 0)
+			Swap(cmin, cmax);
+	}
+	else if(yfmask & (AM_Q0 | AM_Q3))
+	{ // front octants
+		cmin = SafeArcCos(sv1 >= 0 ? max(lt, lb) : min(lt, lb), sv1 < 0);
+		cmax = SafeArcCos(sv2 >= 0 ? min(rt, rb) : max(rt, rb), sv2 < 0);
+	}
+	else
+	{
+		cmin = SafeArcCos(sv1 >= 0 ? max(rt, rb) : min(rt, rb), sv2 < 0);
+		cmax = SafeArcCos(sv2 >= 0 ? min(lt, lb) : max(lt, lb), sv1 < 0);
+	}
+//	return Rectf(cmin, SafeArcSin(smin), cmax >= cmin ? cmax : cmax + 2 * M_PI, SafeArcSin(smax));
+	cmin /= DEGRAD;
+	cmax /= DEGRAD;
+	return Rectf(cmin, -90, cmax >= cmin ? cmax : cmax + 360, 90);
+*/
+}
+
+Rectf GisOrientation::GlobalAnyExtent(const Rectf& lonlat) const
+{
+	Rectf out = Null;
+	out |= Global(lonlat.TopLeft());
+	out |= Global(lonlat.TopRight());
+	out |= Global(lonlat.BottomLeft());
+	out |= Global(lonlat.BottomRight());
+	return out;
+}
+
+Rectf GisOrientation::LocalDeltaExtent(const Rectf& lonlat) const
+{
+	return lonlat.OffsetedHorz(-pole.x);
+}
+
+Rectf GisOrientation::GlobalDeltaExtent(const Rectf& lonlat) const
+{
+	return lonlat.OffsetedHorz(pole.x);
+}
+
+Rectf GisOrientation::IdentityExtent(const Rectf& lonlat) const
+{
+	return lonlat;
+}
+
+/*
+Pointf WorldTransform::Local1(const Pointf& pt) const
+{
+	return Pointf((pt.x >= 0
+	Pointf out = (this->*localquad)(pt);
+	return Pointf((out.x >= 0 ? M_PI / 2 + out.y : -M_PI / 2 - out.y), M_PI / 2 - fabs(out.x));
+}
+
+Pointf WorldTransform::Local2(const Pointf& pt) const
+{
+	Pointf out = (this->*localquad)(pt);
+	return Pointf(M_PI - out.x, -out.y);
+}
+
+Pointf WorldTransform::Local3(const Pointf& pt) const
+{
+	Pointf out = (this->*localquad)(pt);
+	return Pointf((out.x >= 0 ? M_PI / 2 - out.y : -M_PI / 2 + out.y), fabs(out.x) - M_PI / 2);
+}
+*/
+
+/*
+Pointf WorldTransform::Global1(const Pointf& pt) const
+{
+	Pointf out = (this->*globalquad)(pt);
+	return Pointf((out.x >= 0 ? M_PI / 2 - out.y : -M_PI / 2 + out.y), fabs(out.x) - M_PI / 2);
+}
+
+Pointf WorldTransform::Global2(const Pointf& pt) const
+{
+	Pointf out = (this->*globalquad)(pt);
+	return Pointf(M_PI - out.x, -out.y);
+}
+
+Pointf WorldTransform::Global3(const Pointf& pt) const
+{
+	Pointf out = (this->*globalquad)(pt);
+	return Pointf((out.x >= 0 ? M_PI / 2 + out.y : -M_PI / 2 - out.y), M_PI / 2 - fabs(out.x));
+}
+*/
+
+static One<LinearSegmentTree::Node> CreateLinearSplit(Point s1, Point s2, Point t1, Point t2, const SegmentTreeInfo& info, int depth)
+{
+	double m = info.src_trg.SourceDeviation(Pointf(s1) * info.img_src, Pointf(s2) * info.img_src);
+	if(m <= info.max_deviation)
+		return NULL;
+	One<LinearSegmentTree::Node> split = new LinearSegmentTree::Node;
+	split->source = (s1 + s2) >> 1;
+	split->target = split->source * info;
+	if(++depth <= info.max_depth)
+	{
+		split->below = CreateLinearSplit(s1, split->source, t1, split->target, info, depth);
+		split->above = CreateLinearSplit(split->source, s2, split->target, t2, info, depth);
+	}
+	return split;
+}
+
+LinearSegmentTree CreateLinearTree(Point s1, Point s2, const SegmentTreeInfo& info)
+{
+	LinearSegmentTree out;
+	out.source1 = s1;
+	out.source2 = s2;
+	out.target1 = s1 * info;
+	out.target2 = s2 * info;
+	out.split = CreateLinearSplit(out.source1, out.source2, out.target1, out.target2, info, 0);
+	return out;
+}
+
+static void CreatePlanarSplit(PlanarSegmentTree::Node& node,
+	const LinearSegmentTree::Node *left, const LinearSegmentTree::Node *top,
+	const LinearSegmentTree::Node *right, const LinearSegmentTree::Node *bottom,
+	const Rect& src, const SegmentTreeInfo& info, int depth,
+	Point trg_topleft, Point trg_topright, Point trg_bottomleft, Point trg_bottomright)
+{
+	double m = info.src_trg.SourceExtentDeviation(Rectf(src) * info.img_src);
+	node.source = src;
+	node.trg_topleft = trg_topleft;
+	node.trg_topright = trg_topright;
+	node.trg_bottomleft = trg_bottomleft;
+	node.trg_bottomright = trg_bottomright;
+	if(m > info.max_deviation && ++depth <= info.max_depth) {
+		node.split = new PlanarSegmentTree::Split;
+		Point mid = src.CenterPoint();
+		Point mtrg = mid * info;
+		Point lmid = (left   ? left->target   : (trg_topleft + trg_bottomleft) >> 1); //src.CenterLeft() * info);
+		Point tmid = (top    ? top->target    : (trg_topleft + trg_topright) >> 1); // src.TopCenter() * info);
+		Point rmid = (right  ? right->target  : (trg_topright + trg_bottomright) >> 1); //src.CenterRight() * info);
+		Point bmid = (bottom ? bottom->target : (trg_bottomleft + trg_bottomright) >> 1); // src.BottomCenter() * info);
+		CreatePlanarSplit(node.split->topleft, left ? ~left->below : NULL, top ? ~top->below : NULL, NULL, NULL,
+			Rect(src.left, src.top, mid.x, mid.y), info, depth, trg_topleft, tmid, lmid, mtrg);
+		CreatePlanarSplit(node.split->topright, NULL, top ? ~top->above : NULL, right ? ~right->below : NULL, NULL,
+			Rect(mid.x, src.top, src.right, mid.y), info, depth, tmid, trg_topright, mtrg, rmid);
+		CreatePlanarSplit(node.split->bottomleft, left ? ~left->above : NULL, NULL, NULL, bottom ? ~bottom->below : NULL,
+			Rect(src.left, mid.y, mid.x, src.bottom), info, depth, lmid, mtrg, trg_bottomleft, bmid);
+		CreatePlanarSplit(node.split->bottomright, NULL, NULL, right ? ~right->above : NULL, bottom ? ~bottom->above : NULL,
+			Rect(mid.x, mid.y, src.right, src.bottom), info, depth, mtrg, rmid, bmid, trg_bottomright);
+	}
+}
+
+PlanarSegmentTree CreatePlanarTree(const LinearSegmentTree& left, const LinearSegmentTree& top,
+	const LinearSegmentTree& right, const LinearSegmentTree& bottom, const SegmentTreeInfo& info)
+{
+	PlanarSegmentTree out;
+	CreatePlanarSplit(out.root, ~left.split, ~top.split, ~right.split, ~bottom.split,
+		Rect(left.source1, right.source2), info, 0,
+		left.target1, right.target1, left.target2, right.target2);
+	return out;
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/Geom/Ctrl/AUTHORS b/uppsrc/Geom/Ctrl/AUTHORS
new file mode 100644
index 000000000..f782e5b62
--- /dev/null
+++ b/uppsrc/Geom/Ctrl/AUTHORS
@@ -0,0 +1,2 @@
+Mirek Fidler <cxl@ntllib.org>
+Tomas Rylek  <rylek@volny.cz>
\ No newline at end of file
diff --git a/uppsrc/Geom/Ctrl/COPYING b/uppsrc/Geom/Ctrl/COPYING
new file mode 100644
index 000000000..33aa39102
--- /dev/null
+++ b/uppsrc/Geom/Ctrl/COPYING
@@ -0,0 +1,30 @@
+Copyright (C) 2005 Mirek Fidler, Tomas Rylek and various contributors (see AUTHORS)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to
+deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies of the Software and its Copyright notices. In addition publicly
+documented acknowledgment must be given that this software has been used if no
+source code of this software is made available publicly. This includes
+acknowledgments in either Copyright notices, Manuals, Publicity and Marketing
+documents or any documentation provided with any product containing this
+software. This License does not apply to any software that links to the
+libraries provided by this software (statically or dynamically), but only to
+the software provided.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+-----------
+
+Please see the COPYING.PLAIN for a plain-english explanation of this notice
+and it's intent.
diff --git a/uppsrc/Geom/Ctrl/COPYING-PLAIN b/uppsrc/Geom/Ctrl/COPYING-PLAIN
new file mode 100644
index 000000000..770a8132f
--- /dev/null
+++ b/uppsrc/Geom/Ctrl/COPYING-PLAIN
@@ -0,0 +1,33 @@
+Plain English Copyright Notice
+
+This file is not intended to be the actual License. The reason this file
+exists is that we here are programmers and engineers. We aren't lawyers. We
+provide licenses that we THINK say the right things, but we have our own
+intentions at heart. This is a plain-english explanation of what those
+intentions are, and if you follow them you will be within the "spirit" of
+the license.
+
+The intent is for us to enjoy writing software that is useful to us (the
+AUTHORS) and allow others to use it freely and also benefit from the work we
+put into making it. We don't want to restrict others using it. They should
+not *HAVE* to make the source code of the applications they write that
+simply link to these libraries (be that statically or dynamically), or for
+them to be limited as to what license they choose to use (be it open, closed
+or anything else). But we would like to know you are using these libraries.
+We simply would like to know that it has been useful to someone. This is why
+we ask for acknowledgement of some sort.
+
+You can do what you want with the source of this software - it doesn't
+matter. We still have it here for ourselves and it is open and free to use
+and download and play with. It can't be taken away. We don't really mind what
+you do with the source to your software. We would simply like to know that
+you are using it - especially if it makes it to a commerical product. If you
+simply e-mail all the AUTHORS (see COPYING and AUTHORS files) telling us, and
+then make sure you include a paragraph or page in the manual or in the "About.."
+box for the product with the copyright notice and state that you used this
+software, we will be very happy. If you want to contribute back modifications
+and fixes you may have made we will welcome those too with open arms (generally).
+If you want help with changes needed, ports needed or features to be added,
+arrangements can be easily made with some dialogue.
+
+Mirek Fidler <cxl@ntllib.org>
diff --git a/uppsrc/Geom/Ctrl/CoordCtrl.cpp b/uppsrc/Geom/Ctrl/CoordCtrl.cpp
new file mode 100644
index 000000000..1783b4702
--- /dev/null
+++ b/uppsrc/Geom/Ctrl/CoordCtrl.cpp
@@ -0,0 +1,48 @@
+#include "GeomCtrl.h"
+#pragma hdrstop
+
+NAMESPACE_UPP
+
+EditDegree::EditDegree()
+{
+	AddFrame(spin);
+	spin.inc.WhenRepeat = spin.inc.WhenPush = THISBACK(OnInc);
+	spin.dec.WhenRepeat = spin.dec.WhenPush = THISBACK(OnDec);
+}
+
+void EditDegree::OnInc()
+{
+	double a = GetData();
+	a = floor(Nvl(a) + 1.5);
+	if(a >= Nvl(GetMax(), +360.0))
+		a = Nvl(GetMin(), -360.0);
+	SetData(a);
+	Action();
+}
+
+void EditDegree::OnDec()
+{
+	double a = GetData();
+	a = ceil(Nvl(a) - 1.5);
+	if(a <= Nvl(GetMin(), -360.0))
+		a = Nvl(GetMax(), +360.0);
+	SetData(a);
+	Action();
+}
+
+bool EditDegree::Key(dword key, int repcnt)
+{
+	if(key == K_ALT_UP)
+	{
+		OnInc();
+		return true;
+	}
+	if(key == K_ALT_DOWN)
+	{
+		OnDec();
+		return true;
+	}
+	return EditValue<double, ConvertDegree>::Key(key, repcnt);
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/Geom/Ctrl/CoordCtrl.h b/uppsrc/Geom/Ctrl/CoordCtrl.h
new file mode 100644
index 000000000..3743c5c22
--- /dev/null
+++ b/uppsrc/Geom/Ctrl/CoordCtrl.h
@@ -0,0 +1,24 @@
+#ifndef _Geom_Ctrl_CoordCtrl_h_
+#define _Geom_Ctrl_CoordCtrl_h_
+
+NAMESPACE_UPP
+
+class EditDegree : public EditValue<double, ConvertDegree>
+{
+public:
+	typedef EditDegree CLASSNAME;
+	EditDegree();
+
+	virtual bool  Key(dword key, int repcnt);
+
+private:
+	void          OnInc();
+	void          OnDec();
+
+private:
+	SpinButtons   spin;
+};
+
+END_UPP_NAMESPACE
+
+#endif
diff --git a/uppsrc/Geom/Ctrl/Ctrl.upp b/uppsrc/Geom/Ctrl/Ctrl.upp
new file mode 100644
index 000000000..9ddcd16c5
--- /dev/null
+++ b/uppsrc/Geom/Ctrl/Ctrl.upp
@@ -0,0 +1,21 @@
+uses
+	Geom\Draw,
+	TCtrlLib;
+
+file
+	GeomCtrl.h,
+	GeomCtrl.t charset "UTF-8",
+	GeomCtrl_init.icpp,
+	pathCtrl.h,
+	pathCtrl.cpp,
+	pathedit.iml,
+	pathedit.lay,
+	PlotterCtrl.h,
+	PlotterCtrl.cpp,
+	PlotterCtrl.iml,
+	CoordCtrl.h,
+	CoordCtrl.cpp,
+	Info readonly separator,
+	COPYING,
+	COPYING-PLAIN,
+	AUTHORS;
diff --git a/uppsrc/Geom/Ctrl/GeomCtrl.h b/uppsrc/Geom/Ctrl/GeomCtrl.h
new file mode 100644
index 000000000..d3f41189c
--- /dev/null
+++ b/uppsrc/Geom/Ctrl/GeomCtrl.h
@@ -0,0 +1,10 @@
+#ifndef __Geom_Ctrl__
+#define __Geom_Ctrl__
+
+#include <TCtrlLib/TCtrlLib.h>
+#include <Geom/Draw/GeomDraw.h>
+#include "pathCtrl.h"
+#include "PlotterCtrl.h"
+#include "CoordCtrl.h"
+
+#endif//__Geom_Ctrl__
diff --git a/uppsrc/Geom/Ctrl/GeomCtrl.t b/uppsrc/Geom/Ctrl/GeomCtrl.t
new file mode 100644
index 000000000..386a52008
--- /dev/null
+++ b/uppsrc/Geom/Ctrl/GeomCtrl.t
@@ -0,0 +1,110 @@
+#ifdef _MSC_VER
+#pragma setlocale("C")
+#endif
+// pathedit.lay
+
+T_("&Initial segment:")
+csCZ("&Začátek:")
+
+T_("&Line segment:")
+csCZ("&Segment:")
+
+T_("&End segment:")
+csCZ("&Konec:")
+
+T_("&Relative width:")
+csCZ("&Vztažná šířka:")
+
+T_("&Cap style:")
+csCZ("St&yl zlomu čáry:")
+
+T_("&Chamfer length:")
+csCZ("V&elikost zkosu:")
+
+T_("OK")
+csCZ("OK")
+
+T_("Cancel")
+csCZ("Storno")
+
+T_("&Grid:")
+csCZ("&Mřížka:")
+
+T_("&Snap:")
+csCZ("&Přichytit do mřížky:")
+
+T_("&Ruler")
+csCZ("&Pravítko")
+
+T_("&Axis")
+csCZ("&Osa čáry")
+
+
+// PlotterCtrl.cpp
+
+T_("Zoom in horz.")
+csCZ("Zvětšit horiz.")
+
+T_("Zoom in horizontally")
+csCZ("Zvětšit vodorovné měřítko")
+
+T_("Zoom out horz.")
+csCZ("Zmenšit horiz.")
+
+T_("Zoom out horizontally")
+csCZ("Zmenšit vodorovné měřítko")
+
+T_("Zoom full horz.")
+csCZ("Celý rozsah horiz.")
+
+T_("Display full x axis range in view")
+csCZ("Zobrazit celý rozsah vodorovné osy")
+
+T_("Zoom in vert.")
+csCZ("Zvětšit vert.")
+
+T_("Zoom in vertically")
+csCZ("Zvětšit svislé měřítko")
+
+T_("Zoom out vert.")
+csCZ("Zmenšit vert.")
+
+T_("Zoom out vertically")
+csCZ("Zmenšit svislé měřítko")
+
+T_("Zoom full vert.")
+csCZ("Celý rozsah vert.")
+
+T_("Display full y axis range in view")
+csCZ("Zobrazit celý rozsah svislé osy")
+
+T_("Zoom out")
+csCZ("Zmenšit")
+
+T_("Zoom out current view")
+csCZ("Zmenšit měřítko zobrazení")
+
+T_("Zoom full")
+csCZ("Skutečný rozměr")
+
+T_("Zoom everything into view")
+csCZ("Nastavit měřítko zobrazení podle velikosti okna")
+
+T_("Zoom in")
+csCZ("Zvětšit\tNum[+]")
+
+T_("Zoom in current view (click to zoom in 2x, drag & drop to zoom in area)")
+csCZ("Zvětšovat oblasti plochy (kliknutím zvětšíte 2x, tažením myši "
+     "zvětšíte zadanou oblast)")
+
+T_("Lock aspect ratio")
+csCZ("Stejné měřítko os")
+
+T_("Keep temporarily x and y scale factors in sync")
+csCZ("Dočasně udržovat stálé měřítko os x a y")
+
+T_("Pan")
+csCZ("Posouvat")
+
+T_("Drag & drop view position")
+csCZ("Posouvat zobrazenou oblast tažením myši")
diff --git a/uppsrc/Geom/Ctrl/GeomCtrl_init.icpp b/uppsrc/Geom/Ctrl/GeomCtrl_init.icpp
new file mode 100644
index 000000000..682fa2572
--- /dev/null
+++ b/uppsrc/Geom/Ctrl/GeomCtrl_init.icpp
@@ -0,0 +1,8 @@
+#include "GeomCtrl.h"
+
+NAMESPACE_UPP
+
+#define TFILE <Geom/Ctrl/GeomCtrl.t>
+#include <Core/t.h>
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/Geom/Ctrl/HPlanImg.h b/uppsrc/Geom/Ctrl/HPlanImg.h
new file mode 100644
index 000000000..add70ca4c
--- /dev/null
+++ b/uppsrc/Geom/Ctrl/HPlanImg.h
@@ -0,0 +1,19 @@
+//////////////////////////////////////////////////////////////////////
+// HPlanImg: image header file generated from F:\src\uppsrc\Geom\Ctrl\PlotterCtrl.iml
+
+#ifndef __HPlanImg__
+#define __HPlanImg__
+
+namespace HPlanImg
+{
+	const Image& view_zoom_in();
+	const Image& view_zoom_out();
+	const Image& view_zoom_horz_full();
+	const Image& view_zoom_vert_full();
+	const Image& view_zoom_full();
+	const Image& view_pan();
+	const Image& drag_horz();
+	const Image& drag_vert();
+} // namespace HPlanImg
+
+#endif//__HPlanImg__
diff --git a/uppsrc/Geom/Ctrl/PlotterCtrl.cpp b/uppsrc/Geom/Ctrl/PlotterCtrl.cpp
new file mode 100644
index 000000000..dabd8dac9
--- /dev/null
+++ b/uppsrc/Geom/Ctrl/PlotterCtrl.cpp
@@ -0,0 +1,1132 @@
+#include "GeomCtrl.h"
+#pragma hdrstop
+
+NAMESPACE_UPP
+
+#define IMAGECLASS PlotterImg
+#define IMAGEFILE  <Geom/Ctrl/PlotterCtrl.iml>
+#include           <Draw/iml.h>
+
+#define LLOG(x) // LOG(x)
+#define LLOGBLOCK(x) // LOGBLOCK(x)
+
+PlotterCtrl::ViewPlot::ViewPlot(PlotterCtrl& ctrl, int extra_gap)
+: viewdraw(&ctrl)
+{
+	Plotter::Set(viewdraw, ctrl.scale, ctrl.delta, extra_gap);
+	PathMap(&PathStyleMap::App());
+}
+
+PlotterCtrl::ViewPlot::ViewPlot(PlotterCtrl& ctrl, Pointf scale, Pointf delta, int extra_gap)
+: viewdraw(&ctrl)
+{
+	Plotter::Set(viewdraw, scale, delta, extra_gap);
+	PathMap(&PathStyleMap::App());
+}
+
+PlotterCtrl::ViewPlot::ViewPlot(PlotterCtrl& ctrl, const Matrixf& preform, int extra_gap)
+: viewdraw(&ctrl)
+{
+	Plotter::Set(viewdraw, ctrl.scale, ctrl.delta, extra_gap);
+	Plotter::Set(viewdraw, preform * physical, extra_gap);
+	PathMap(&PathStyleMap::App());
+}
+
+PlotterCtrl::PlotterCtrl()
+: extent(Null)
+, scale(1, 1)
+, delta(0, 0)
+, push_scale(1, 1)
+, push_delta(0, 0)
+, max_scale(Null, Null)
+, aspect(1)
+, gap(10, 10, 10, 10)
+, rev_x(false)
+, rev_y(false)
+, aspect_lock(false)
+, halign(ALIGN_CENTER)
+, valign(ALIGN_CENTER)
+, old_size(Null)
+//, paint_draw(NULL)
+, buffer_paint(false)
+, buffer_pan(false)
+, pan_offset(0, 0)
+, show_scroll(true)
+, lock_drag_drop(false)
+, lock_short_drag_drop(false)
+, is_painting(false)
+, background(White())
+{
+	hscroll  .NoAutoHide().NoAutoDisable();
+	vscroll  .NoAutoHide().NoAutoDisable();
+	horz_in  .SetImage(PlotterImg::view_zoom_in())       .NoWantFocus() <<= THISBACK(UserZoomInX);
+	horz_out .SetImage(PlotterImg::view_zoom_out())      .NoWantFocus() <<= THISBACK(UserZoomOutX);
+	horz_full.SetImage(PlotterImg::view_zoom_horz_full()).NoWantFocus() <<= THISBACK(UserZoomFullX);
+	vert_in  .SetImage(PlotterImg::view_zoom_in())       .NoWantFocus() <<= THISBACK(UserZoomInY);
+	vert_out .SetImage(PlotterImg::view_zoom_out())      .NoWantFocus() <<= THISBACK(UserZoomOutY);
+	vert_full.SetImage(PlotterImg::view_zoom_vert_full()).NoWantFocus() <<= THISBACK(UserZoomFullY);
+	full     .SetImage(PlotterImg::view_zoom_full_icon()).NoWantFocus() <<= THISBACK(UserZoomFull);
+	AddFrame(*this);
+	hscroll <<= THISBACK(OnHScroll);
+	vscroll <<= THISBACK(OnVScroll);
+	hscroll.WhenLeftClick = vscroll.WhenLeftClick = THISBACK(DoSetFocus);
+	hscroll.SetLine(50);
+	vscroll.SetLine(50);
+}
+
+PlotterCtrl::~PlotterCtrl() {}
+
+void PlotterCtrl::Layout()
+{
+	Size phys_size(0, 0);
+	if(extent.right > extent.left)
+		phys_size.cx = fround(fabs(extent.Width() * scale.cx));
+	if(extent.bottom > extent.top)
+		phys_size.cy = fround(fabs(extent.Height() * scale.cy));
+	Size ocli = old_size;
+	Size cli = old_size = GetSize();
+	phys_size += gap.TopLeft() + gap.BottomRight();
+	hscroll.Set(hscroll, cli.cx, phys_size.cx);
+	vscroll.Set(vscroll, cli.cy, phys_size.cy);
+	if(!IsNull(ocli))
+	{
+		Size dlog = cli - ocli;
+		Pointf pos = delta;
+		switch(halign)
+		{
+		case ALIGN_LEFT:  break;
+		default:          pos.x += dlog.cx * 0.5; break;
+		case ALIGN_RIGHT: pos.x += dlog.cx; break;
+		}
+		switch(valign)
+		{
+		case ALIGN_TOP:    break;
+		default:           pos.y += dlog.cy * 0.5; break;
+		case ALIGN_BOTTOM: pos.y += dlog.cy; break;
+		}
+		if(pos != delta)
+		{
+			SetDelta(pos);
+			WhenZoom();
+		}
+	}
+	RefreshBuffer();
+}
+
+void PlotterCtrl::FrameAdd(Ctrl& ctrl)
+{
+	ctrl
+	<< (Ctrl&)vscroll << vert_in << vert_out << vert_full
+	<< (Ctrl&)hscroll << horz_in << horz_out << horz_full
+	<< full;
+}
+
+void PlotterCtrl::FrameRemove()
+{
+	vscroll.Remove();
+	vert_in.Remove();
+	vert_out.Remove();
+	vert_full.Remove();
+	hscroll.Remove();
+	horz_in.Remove();
+	horz_out.Remove();
+	horz_full.Remove();
+	full.Remove();
+}
+
+void PlotterCtrl::FrameLayout(Rect& rc)
+{
+	int box = (show_scroll ? ScrollBarSize() : 0);
+	Rect out = rc;
+	rc.right -= box;
+	rc.bottom -= box;
+	int sbx = (IsAspectLocked() ? 0 : box);
+	vscroll  .SetFrameRect(rc.right, rc.top, box, rc.Height() - 3 * sbx);
+	vert_in  .SetFrameRect(rc.right, rc.bottom - 3 * sbx, box, sbx);
+	vert_in  .Enable(sbx);
+	vert_out .SetFrameRect(rc.right, rc.bottom - 2 * sbx, box, sbx);
+	vert_out .Enable(sbx);
+	vert_full.SetFrameRect(rc.right, rc.bottom - sbx, box, sbx);
+	hscroll  .SetFrameRect(rc.left, rc.bottom, rc.Width() - 3 * sbx, box);
+	horz_in  .SetFrameRect(rc.right - 3 * sbx, rc.bottom, sbx, box);
+	horz_in  .Enable(sbx);
+	horz_out .SetFrameRect(rc.right - 2 * sbx, rc.bottom, sbx, box);
+	horz_out .Enable(sbx);
+	horz_full.SetFrameRect(rc.right - sbx, rc.bottom, sbx, box);
+	full     .SetFrameRect(rc.right, rc.bottom, box, box);
+}
+
+void PlotterCtrl::FrameAddSize(Size& sz)
+{
+	int box = (show_scroll ? ScrollBarSize() : 0);
+	sz += box;
+}
+
+Rectf PlotterCtrl::FromClient(const Rect& rc) const
+{
+	if(IsNull(rc))
+		return Null;
+	Rectf c = (Rectf(rc) - delta) / scale;
+	if(scale.cx < 0)
+		Swap(c.left, c.right);
+	if(scale.cy < 0)
+		Swap(c.top,  c.bottom);
+	return c;
+}
+
+Rect PlotterCtrl::ToClient(const Rectf& rc) const
+{
+	if(IsNull(rc))
+		return Null;
+	Rect out = RectfToRect(rc * scale + delta);
+	if(scale.cx < 0)
+		Swap(out.left, out.right);
+	if(scale.cy < 0)
+		Swap(out.top, out.bottom);
+	return out;
+}
+
+double PlotterCtrl::GetAvgScale() const
+{
+	return (fabs(scale.cx) + fabs(scale.cy)) * 0.5;
+}
+
+void PlotterCtrl::SetAspectRatio(double a)
+{
+	aspect = a;
+	ZoomFull();
+	WhenRescan();
+}
+
+void PlotterCtrl::SetExtent(const Rectf& e)
+{
+	if(e != extent)
+	{
+		extent = e;
+		Pointf d = delta;
+		Layout();
+		SetDelta(d);
+	}
+}
+
+void PlotterCtrl::PanOffset(Point o)
+{
+	if(pan_offset != o) {
+		pan_offset = o;
+		Refresh();
+	}
+}
+
+void PlotterCtrl::ScrollInto(Rectf rc)
+{
+	Rectf view = GetViewRect();
+	Sizef shift(0, 0);
+	if(rc.Width() > view.Width())
+		shift.cx = (rc.left + rc.right - view.left - view.right) / 2;
+	else if(rc.left < view.left)
+		shift.cx = rc.left - view.left;
+	else if(rc.right > view.right)
+		shift.cx = rc.right - view.right;
+	if(rc.Height() > view.Height())
+		shift.cy = (rc.top + rc.bottom - view.top - view.bottom) / 2;
+	else if(rc.top < view.top)
+		shift.cy = rc.top - view.top;
+	else if(rc.bottom > view.bottom)
+		shift.cy = rc.bottom - view.bottom;
+	if(shift.cx || shift.cy)
+	{
+		Pointf new_pos = delta - shift * scale;
+		AdjustPos(new_pos, Point(Null));
+		if(new_pos != delta)
+			SetDelta(new_pos);
+	}
+}
+
+void PlotterCtrl::ScrollInto(Pointf pt)
+{
+	ScrollInto(Rectf(pt, Sizef(0, 0)));
+}
+
+void PlotterCtrl::SetScale(Sizef s)
+{
+	Size half = GetSize() >> 1;
+	Pointf mid = FromClient(Point(half));
+	SetZoom(s, Sizef(half) - Sizef(mid) * s);
+}
+
+void PlotterCtrl::SetDelta(Pointf d)
+{
+	LLOG("PlotterCtrl::SetDelta");
+	DragHide();
+	delta = d;
+//	AdjustPos(delta, Null);
+	if(!IsNull(extent))
+	{
+		Rectf sx = extent * scale;
+		if(scale.cx < 0) Swap(sx.left, sx.right);
+		if(scale.cy < 0) Swap(sx.top, sx.bottom);
+		Size sb(gap.left - fround(delta.x + sx.left), gap.top - fround(delta.y + sx.top));
+		hscroll.Set(sb.cx);
+		vscroll.Set(sb.cy);
+		RefreshBuffer();
+		UpdateMousePos();
+	}
+}
+
+void PlotterCtrl::SetZoom(Sizef s, Pointf d)
+{
+	Sizef mid(GetSize() >> 1);
+	scale = AdjustScale(s);
+	Layout();
+	SetDelta(mid - (mid - d) * (scale / s));
+	WhenZoom();
+	WhenRescan();
+}
+
+void PlotterCtrl::SetZoom(double s, Pointf d)
+{
+	ASSERT(IsAspectLocked());
+	double a = (aspect_lock ? 1 : aspect);
+	SetZoom(Sizef(rev_x ? -s : s, (rev_y ? -s : s) * a), d);
+	Layout();
+	SetDelta(d);
+	WhenZoom();
+	WhenRescan();
+}
+
+Sizef PlotterCtrl::GetPhysicalZoom() const
+{
+	Size client = GetSize();
+	Size ppm = GetPixelsPerMeter(ScreenInfo());
+	Sizef vrc = fpmax(GetViewRect().Size(), Sizef(1e-20, 1e-20));
+	return Sizef(client) / Sizef(ppm) / vrc;
+}
+
+Sizef PlotterCtrl::AdjustScale(Sizef sc) const
+{
+	if(max_scale.cx > 0 && fabs(sc.cx) >= max_scale.cx)
+		sc.cx = (sc.cx >= 0 ? max_scale.cx : -max_scale.cx);
+	if(max_scale.cy > 0 && fabs(sc.cy) >= max_scale.cy)
+		sc.cy = (sc.cy >= 0 ? max_scale.cy : -max_scale.cy);
+	return sc;
+}
+
+void PlotterCtrl::AdjustPos(Pointf& d, Point scpos) const
+{
+	Rectf c = extent * scale;
+	if(rev_x)
+		Swap(c.left, c.right);
+	if(rev_y)
+		Swap(c.top, c.bottom);
+	Size sz = GetSize();
+	if(c.Width() <= sz.cx - gap.left - gap.right)
+		switch(halign)
+		{
+		case ALIGN_LEFT:   d.x = gap.left - c.left; break;
+		default:           d.x = (sz.cx + gap.left - gap.right - c.left - c.right) / 2; break;
+		case ALIGN_RIGHT:  d.x = sz.cx - gap.right - c.right; break;
+		}
+	else
+	{
+		if(!IsNull(scpos))
+			d.x = gap.left - scpos.x - c.left;
+		d.x = minmax(d.x, sz.cx - gap.right - c.right, gap.left - c.left);
+	}
+	if(c.Height() <= sz.cy - gap.top - gap.bottom)
+		switch(valign)
+		{
+		case ALIGN_TOP:    d.y = gap.top - c.top; break;
+		default:           d.y = (sz.cy + gap.top - gap.bottom - c.top - c.bottom) / 2; break;
+		case ALIGN_BOTTOM: d.y = sz.cy - gap.top - c.bottom; break;
+		}
+	else
+	{
+		if(!IsNull(scpos))
+			d.y = gap.top - scpos.y - c.top;
+		d.y = minmax(d.y, sz.cy - gap.bottom - c.bottom, gap.top - c.top);
+	}
+}
+
+void PlotterCtrl::AdjustPos(Point scpos, int xymask)
+{
+	if(!IsNull(extent))
+	{
+		Pointf d = delta;
+		AdjustPos(d, scpos);
+		if(xymask & 1) delta.x = d.x;
+		if(xymask & 2) delta.y = d.y;
+		RefreshBuffer();
+		UpdateMousePos();
+	}
+}
+
+void PlotterCtrl::OnHScroll()
+{
+	AdjustPos(Point(hscroll, vscroll), 1);
+	WhenUserZoom();
+}
+
+void PlotterCtrl::OnVScroll()
+{
+	AdjustPos(Point(hscroll, vscroll), 2);
+	WhenUserZoom();
+}
+
+Pointf PlotterCtrl::GetSc() const
+{
+//	if(IsNull(extent))
+//		return Pointf(0, 0);
+	Pointf sc;
+	Size cli = GetSize();
+//	if(fabs(extent.Width() * scale.cx) <= cli.cx - gap.left - gap.right)
+//		sc.x = (extent.left + extent.right) / 2;
+//	else
+	sc.x = ((cli.cx >> 1) - delta.x) / scale.cx;
+//	if(fabs(extent.Height() * scale.cy) <= cli.cy - gap.top - gap.bottom)
+//		sc.y = (extent.top + extent.bottom) / 2;
+//	else
+	sc.y = ((cli.cy >> 1) - delta.y) / scale.cy;
+	return sc;
+}
+
+void PlotterCtrl::SetSc(Pointf center)
+{
+	if(!IsNull(center) && !IsNull(extent))
+		SetDelta(Sizef(GetSize() >> 1) - Sizef(center) * scale);
+}
+
+void PlotterCtrl::SetZoomSc(Sizef new_scale)
+{
+	new_scale = AdjustScale(new_scale);
+	SetZoom(new_scale, Sizef(GetSize() >> 1) - Sizef(GetSc()) * new_scale);
+}
+
+void PlotterCtrl::SetZoomSc(double s)
+{
+	ASSERT(IsAspectLocked());
+	SetZoomSc(rev_x ? -s : s, (rev_y ? -s : s) * (aspect_lock ? 1 : aspect));
+}
+
+void PlotterCtrl::SetAspectLock(bool a)
+{
+	aspect_lock = a;
+	RefreshParentLayout();
+	if(IsAspectLocked())
+		Zoom(GetViewRect(), false, true);
+	WhenRescan();
+}
+
+void PlotterCtrl::ZoomInX()
+{
+	SetZoomSc(scale.cx * 2, scale.cy);
+}
+
+void PlotterCtrl::ZoomOutX()
+{
+	SetZoomSc(scale.cx / 2, scale.cy);
+}
+
+void PlotterCtrl::ZoomX(double min, double max, bool add_gap)
+{
+	if(min != max)
+	{
+		int gl = (add_gap ? gap.left : 0), gr = (add_gap ? gap.right : 0);
+		int s = GetSize().cx;
+		double sc = (rev_x ? -1 : 1) * (s - gl - gr) / (max - min);
+		double dx = (rev_x ? s - gr : gl) - sc * min;
+		SetZoom(Pointf(sc, scale.cy), Pointf(dx, delta.y));
+	}
+}
+
+void PlotterCtrl::ZoomInY()
+{
+	SetZoomSc(scale.cx, scale.cy * 2);
+}
+
+void PlotterCtrl::ZoomOutY()
+{
+	SetZoomSc(scale.cx, scale.cy / 2);
+}
+
+void PlotterCtrl::ZoomY(double min, double max, bool add_gap)
+{
+	if(min != max) {
+		int gt = (add_gap ? gap.top : 0), gb = (add_gap ? gap.bottom : 0);
+		int s = GetSize().cy;
+		double sc = (rev_y ? -1 : 1) * (s - gt - gb) / (max - min);
+		double dx = (rev_y ? s - gb : gt) - sc * min;
+		SetZoom(Pointf(scale.cx, sc), Pointf(delta.x, dx));
+	}
+}
+
+void PlotterCtrl::Zoom(const Rectf& rc, bool keep_ratio, bool add_gap)
+{
+	if(rc.right < rc.left && rc.bottom < rc.top)
+		return;
+	Rectf tmp = rc;
+	if(tmp.right  < tmp.left) tmp.left = tmp.right  = 0;
+	if(tmp.bottom < tmp.top)  tmp.top  = tmp.bottom = 0;
+	Rect g = (add_gap ? gap : Rect(0, 0, 0, 0));
+	double use_aspect = (aspect_lock ? 1.0 : aspect);
+	if(use_aspect || keep_ratio) {
+		Size avail = GetSize() - g.TopLeft() - g.BottomRight();
+		Sizef size = tmp.Size();
+		double d = Abs(size * scale) % Sizef(avail);
+		if(d >= 0) {
+			d /= 2 * avail.cx * fabs(scale.cy);
+			tmp.top -= d;
+			tmp.bottom += d;
+		}
+		else {
+			d /= -2 * avail.cy * fabs(scale.cx);
+			tmp.left -= d;
+			tmp.right += d;
+		}
+	}
+	if(use_aspect) {
+		Rect inset = Rect(GetSize()).Deflated(g);
+		Point inc = inset.CenterPoint();
+		Sizef sc;
+		Pointf dl;
+		sc.cx = tmp.Width() <= 1e-20 ? scale.cx : inset.Width() / tmp.Width();
+		sc.cy = sc.cx * use_aspect;
+		if(rev_x) { sc.cx = -sc.cx; Swap(tmp.left, tmp.right); }
+		if(rev_y) { sc.cy = -sc.cy; Swap(tmp.top, tmp.bottom); }
+		Pointf tmpc = tmp.CenterPoint();
+		switch(halign) {
+			case ALIGN_LEFT:   dl.x = inset.left - sc.cx * tmp.left; break;
+			case ALIGN_RIGHT:  dl.x = inset.right - sc.cx * tmp.right; break;
+			default:           dl.x = inc.x - sc.cx * tmpc.x; break;
+		}
+		switch(valign) {
+			case ALIGN_TOP:    dl.y = inset.top - sc.cy * tmp.top; break;
+			case ALIGN_BOTTOM: dl.y = inset.bottom - sc.cy * tmp.bottom; break;
+			default:           dl.y = inc.y - sc.cy * tmpc.y; break;
+		}
+		SetZoom(sc, dl);
+//		AdjustPos(Null);
+	}
+	else {
+		if(rc.left < rc.right)  ZoomX(tmp.left, tmp.right);
+		if(rc.top  < rc.bottom) ZoomY(tmp.top,  tmp.bottom);
+	}
+}
+
+ImageDraw& PlotterCtrl::BeginBufferPaint()
+{
+	LLOGBLOCK("PlotterCtrl::BeginBufferPaint");
+	ASSERT(!is_painting);
+	paint_buffer = Null;
+	Size sz = max(GetSize(), Size(1, 1));
+//	paint_buffer = Image(max(GetSize(), Size(1, 1)));
+	LLOG("-> size = " << paint_buffer.GetSize());
+	paint_draw = new ImageDraw(sz);
+	paint_draw->DrawRect(sz, background);
+	is_painting = true;
+	abort_repaint = false;
+	return *paint_draw;
+}
+
+void PlotterCtrl::EndBufferPaint()
+{
+	LLOGBLOCK("PlotterCtrl::EndBufferPaint");
+	ASSERT(is_painting);
+	Plotter plotter(*paint_draw, scale, delta);
+	plotter.PathMap(&PathStyleMap::App());
+	if(drag_drop) {
+		lock_drag_drop = true;
+		drag_drop->Plot(plotter);
+		lock_drag_drop = false;
+	}
+	if(!abort_repaint)
+		paint_buffer = *paint_draw;
+	paint_draw.Clear();
+	is_painting = false;
+	PostRefresh();
+}
+
+void PlotterCtrl::PostRefresh()
+{
+	tcb_refresh.KillSet(1, THISBACK(Refresh0));
+}
+
+void PlotterCtrl::Paint(Draw& draw)
+{
+	LOGBLOCK("PlotterCtrl::Paint");
+	LLOG("PlotterCtrl::Paint @ " << GetSysTime());
+	bool shown = IsDragging();
+	DragHide();
+	Rect clip = draw.GetClip();
+	if(is_painting) {
+#ifdef PLATFORM_WIN32
+		if(!paint_buffer.IsEmpty()) {
+			LLOG("-> blit paint_buffer");
+			if(!BitBlt(draw, pan_offset, *paint_draw, paint_buffer.GetSize())) {
+				LLOG("-> blit error");
+			}
+		}
+#endif
+	}
+	else {
+		if(buffer_paint && !draw.Dots()) {
+			Size size = GetSize();
+			if(paint_buffer.IsEmpty() || paint_buffer.GetSize() != size) {
+				LLOG("-> refresh paint buffer");
+				Draw& idraw = BeginBufferPaint();
+				Plotter plotter(idraw, scale, delta);
+				plotter.PathMap(&PathStyleMap::App());
+				Plot(plotter);
+				EndBufferPaint();
+			}
+			else {
+				LLOG("-> DrawImage paint_buffer");
+				draw.DrawImage(pan_offset.x, pan_offset.y, paint_buffer);
+			}
+		}
+		else {
+			LLOG("-> Plot (direct)");
+			draw.DrawRect(clip, background);
+			Plotter plotter(draw, scale, delta + Pointf(pan_offset));
+			plotter.PathMap(&PathStyleMap::App());
+			Plot(plotter);
+			if(drag_drop) {
+				lock_drag_drop = true;
+				drag_drop->Plot(plotter);
+				lock_drag_drop = false;
+			}
+		}
+	}
+	if(shown)
+		DragShow();
+}
+
+/*
+void PlotterCtrl::AsyncPaint()
+{
+	if(paint_draw && !paint_buffer.IsEmpty())
+	{
+//		ViewDraw vdraw(this);
+//		BitBlt(vdraw, Point(0, 0), *paint_draw, paint_buffer.GetRect());
+	}
+}
+*/
+
+void PlotterCtrl::RefreshBuffer()
+{
+	LLOGBLOCK("PlotterCtrl::RefreshBuffer");
+	if(IsBufferPaint()) {
+		if(!is_painting)
+			paint_buffer.Clear();
+		else {
+			abort_repaint = true;
+			AbortPlot();
+		}
+	}
+	Refresh();
+}
+
+void PlotterCtrl::RefreshBuffer(const Rect& rc)
+{
+	LLOGBLOCK("PlotterCtrl::RefreshBuffer");
+	if(IsBufferPaint()) {
+		if(!is_painting)
+			paint_buffer.Clear();
+		else {
+			abort_repaint = true;
+			AbortPlot();
+		}
+	}
+	Refresh(rc);
+}
+
+Image PlotterCtrl::CursorImage(Point pt, dword keyflags)
+{
+	Image out = Image::Arrow();
+	if(drag_drop) {
+		lock_drag_drop = true;
+		out = drag_drop->Cursor(FromClient(pt), keyflags, IsDragging());
+		lock_drag_drop = false;
+	}
+	return out;
+}
+
+void PlotterCtrl::SyncPush()
+{
+	push_scale = scale;
+	push_delta = delta;
+}
+
+bool PlotterCtrl::Push(Point pt, dword keyflags)
+{
+	bool push = false;
+	SyncPush();
+	drag_start = FromPushClient(pt);
+	if(drag_drop) {
+//		lock_drag_drop = true;
+		push = drag_drop->Push(drag_start, keyflags);
+//		lock_drag_drop = false;
+	}
+	return push;
+}
+
+void PlotterCtrl::Drag(Point start, Point prev, Point curr, dword keyflags)
+{
+	LOG("PlotterCtrl::Drag(" << start << "; prev = " << prev << ", curr = " << curr << ", flags = " << FormatIntHex(keyflags));
+//	LLOG("PlotterCtrl::Drag, short = " << ~short_drag_drop << ", " << (~short_drag_drop
+//		? typeid(*short_drag_drop).name() : "NULL") << ", long = " << ~drag_drop << ", "
+//		<< (~drag_drop ? typeid(*drag_drop).name() : "NULL"));
+	if(drag_drop) {
+		lock_drag_drop = true;
+//		LLOG("PlotterCtrl::Drag->drag_drop::Drag");
+		drag_drop->Drag(drag_start, FromPushClientNull(prev), FromPushClientNull(curr), keyflags);
+//		LLOG("//PlotterCtrl::Drag->drag_drop::Drag");
+		lock_drag_drop = false;
+	}
+//	LLOG("//PlotterCtrl::Drag");
+}
+
+void PlotterCtrl::Drop(Point start, Point end, dword keyflags)
+{
+	if(drag_drop) {
+		lock_drag_drop = true;
+		drag_drop->Drop(drag_start, FromPushClient(end), keyflags);
+		lock_drag_drop = false;
+	}
+}
+
+void PlotterCtrl::Click(Point pt, dword keyflags)
+{
+	if(drag_drop) {
+		lock_drag_drop = true;
+		drag_drop->Click(FromPushClient(pt), keyflags);
+		lock_drag_drop = false;
+	}
+}
+
+void PlotterCtrl::Cancel()
+{
+	if(drag_drop) {
+		lock_drag_drop = true;
+		drag_drop->Cancel();
+		lock_drag_drop = false;
+	}
+}
+
+bool PlotterCtrl::Key(dword key, int repcnt)
+{
+	bool dd_key = false;
+	if(drag_drop) {
+		lock_drag_drop = true;
+		dd_key = drag_drop->Key(key);
+		lock_drag_drop = false;
+	}
+	if(dd_key)
+		return true;
+	if(hscroll.HorzKey(key))
+	{
+		OnHScroll();
+		return true;
+	}
+	if(vscroll.VertKey(key))
+	{
+		OnVScroll();
+		return true;
+	}
+	switch(key)
+	{
+	case K_ADD:      ZoomIn();  return true;
+	case K_SUBTRACT: ZoomOut(); return true;
+	}
+	return DragDropCtrl::Key(key, repcnt);
+}
+
+void PlotterCtrl::MouseWheel(Point p, int zdelta, dword keyflags)
+{
+	if(keyflags & K_SHIFT)
+	{
+		hscroll.Wheel(zdelta, 3);
+		OnHScroll();
+	}
+	else
+	{
+		vscroll.Wheel(zdelta, 3);
+		OnVScroll();
+	}
+}
+
+void PlotterCtrl::MouseMove(Point pt, dword keyflags)
+{
+	UpdateMousePos();
+	DragDropCtrl::MouseMove(pt, keyflags);
+}
+
+void PlotterCtrl::UpdateMousePos()
+{
+	mouse_pos = FromClient(UPP::GetMousePos() - Size(GetScreenView().TopLeft()));
+	RefreshPos();
+	WhenMousePos();
+}
+
+void PlotterCtrl::PickDragDrop(One<PlotterDragDrop> dd)
+{
+	ASSERT(!lock_short_drag_drop && !lock_drag_drop);
+	DragStop();
+	drag_drop = dd;
+	RefreshDragDrop();
+	WhenRescan();
+}
+
+One<PlotterDragDrop> PlotterCtrl::ClearDragDrop()
+{
+	ASSERT(!lock_drag_drop);
+	One<PlotterDragDrop> out = drag_drop;
+	drag_drop.Clear();
+	RefreshDragDrop();
+	WhenRescan();
+	return out;
+}
+
+void PlotterCtrl::ToolView(Bar& bar)
+{
+	if(IsAspectLocked()) {
+		ToolViewZoomIn(bar);
+		ToolViewZoomOut(bar);
+		ToolViewZoomFull(bar);
+		bar.Separator();
+	}
+	else {
+		ToolViewZoomInX(bar);
+		ToolViewZoomOutX(bar);
+		ToolViewZoomFullX(bar);
+		bar.MenuSeparator();
+		ToolViewZoomInY(bar);
+		ToolViewZoomOutY(bar);
+		ToolViewZoomFullY(bar);
+		bar.MenuSeparator();
+		ToolViewZoomIn(bar);
+		ToolViewZoomOut(bar);
+		ToolViewZoomFull(bar);
+	}
+	if(!aspect)
+		ToolViewAspectLock(bar);
+	ToolViewPan(bar);
+}
+
+void PlotterCtrl::ToolViewZoomInX(Bar& bar)
+{
+	bar.AddMenu(t_("Zoom in horz."), PlotterImg::view_zoom_in(), THISBACK(OnViewZoomInX))
+		.Help(t_("Zoom in horizontally"));
+}
+
+void PlotterCtrl::OnViewZoomInX()
+{
+	UserZoomInX();
+}
+
+void PlotterCtrl::ToolViewZoomOutX(Bar& bar)
+{
+	bar.AddMenu(t_("Zoom out horz."), PlotterImg::view_zoom_out(), THISBACK(OnViewZoomOutX))
+		.Help(t_("Zoom out horizontally"));
+}
+
+void PlotterCtrl::OnViewZoomOutX()
+{
+	UserZoomOutX();
+}
+
+void PlotterCtrl::ToolViewZoomFullX(Bar& bar)
+{
+	bar.AddMenu(t_("Zoom full horz."), PlotterImg::view_zoom_full(), THISBACK(OnViewZoomFullX))
+		.Help(t_("Display full x axis range in view"));
+}
+
+void PlotterCtrl::OnViewZoomFullX()
+{
+	UserZoomFullX();
+}
+
+void PlotterCtrl::ToolViewZoomInY(Bar& bar)
+{
+	bar.AddMenu(t_("Zoom in vert."), PlotterImg::view_zoom_in(), THISBACK(OnViewZoomInY))
+		.Help(t_("Zoom in vertically"));
+}
+
+void PlotterCtrl::OnViewZoomInY()
+{
+	UserZoomInY();
+}
+
+void PlotterCtrl::ToolViewZoomOutY(Bar& bar)
+{
+	bar.AddMenu(t_("Zoom out vert."), PlotterImg::view_zoom_out(), THISBACK(OnViewZoomOutY))
+		.Help(t_("Zoom out vertically"));
+}
+
+void PlotterCtrl::OnViewZoomOutY()
+{
+	UserZoomOutY();
+}
+
+void PlotterCtrl::ToolViewZoomFullY(Bar& bar)
+{
+	bar.AddMenu(t_("Zoom full vert."), PlotterImg::view_zoom_full(), THISBACK(OnViewZoomFullY))
+		.Help(t_("Display full y axis range in view"));
+}
+
+void PlotterCtrl::OnViewZoomFullY()
+{
+	UserZoomFullY();
+}
+
+void PlotterCtrl::ToolViewZoomOut(Bar& bar)
+{
+	bar.Add(t_("Zoom out"), PlotterImg::view_zoom_out(), THISBACK(OnViewZoomOut))
+		.Check(IsDragDrop<ZoomOutDragDrop>(this))
+		.Help(t_("Zoom out current view"));
+}
+
+void PlotterCtrl::OnViewZoomOut()
+{
+	if(!IsDragDrop<ZoomOutDragDrop>(this))
+		PickDragDrop(new ZoomOutDragDrop(*this));
+	else
+		UserZoomOut();
+}
+
+void PlotterCtrl::ToolViewZoomFull(Bar& bar)
+{
+	bar.Add(t_("Zoom full"), PlotterImg::view_zoom_full(), THISBACK(OnViewZoomFull))
+		.Help(t_("Zoom everything into view"));
+}
+
+void PlotterCtrl::OnViewZoomFull()
+{
+	UserZoomFull();
+}
+
+void PlotterCtrl::ToolViewZoomIn(Bar& bar)
+{
+	bar.Add(t_("Zoom in"), PlotterImg::view_zoom_in(), THISBACK(OnViewZoomIn))
+		.Check(IsDragDrop<ZoomInDragDrop>(this))
+		.Help(t_("Zoom in current view (click to zoom in 2x, drag & drop to zoom in area)"));
+}
+
+void PlotterCtrl::OnViewZoomIn()
+{
+	if(!IsDragDrop<ZoomInDragDrop>(this))
+		PickDragDrop(new ZoomInDragDrop(*this));
+	else
+		UserZoomIn();
+}
+
+void PlotterCtrl::ToolViewAspectLock(Bar& bar)
+{
+	bar.Add(!aspect, t_("Lock aspect ratio"), PlotterImg::view_aspect_lock(), THISBACK(OnViewAspectLock))
+		.Check(aspect_lock)
+		.Help(t_("Keep temporarily x and y scale factors in sync"));
+}
+
+void PlotterCtrl::OnViewAspectLock()
+{
+	UserAspectLock();
+}
+
+void PlotterCtrl::ToolViewPan(Bar& bar)
+{
+	bar.Add(t_("Pan"), PlotterImg::view_pan(), THISBACK(OnViewPan))
+		.Check(IsDragDrop<PanDragDrop>(this))
+		.Help(t_("Drag & drop view position"));
+}
+
+void PlotterCtrl::OnViewPan()
+{
+	if(!IsDragDrop<PanDragDrop>(this))
+		PickDragDrop(new PanDragDrop(*this));
+	else
+		ClearDragDrop();
+}
+
+void PlotterCtrl::UserAspectLock()
+{
+	SetAspectLock(!IsAspectLock());
+	WhenUserZoom();
+}
+
+void PlotterCtrl::UserZoomInX()
+{
+	ZoomInX();
+	WhenUserZoom();
+}
+
+void PlotterCtrl::UserZoomOutX()
+{
+	ZoomOutX();
+	WhenUserZoom();
+}
+
+void PlotterCtrl::UserZoomFullX()
+{
+	if(extent.left < extent.right)
+	{
+		ZoomX(extent.left, extent.right);
+		WhenUserZoom();
+	}
+}
+
+void PlotterCtrl::UserZoomX(double min, double max)
+{
+	ZoomX(min, max);
+	WhenUserZoom();
+}
+
+void PlotterCtrl::UserZoomInY()
+{
+	ZoomInY();
+	WhenUserZoom();
+}
+
+void PlotterCtrl::UserZoomOutY()
+{
+	ZoomOutY();
+	WhenUserZoom();
+}
+
+void PlotterCtrl::UserZoomFullY()
+{
+	if(extent.top < extent.bottom)
+	{
+		ZoomY(extent.top, extent.bottom);
+		WhenUserZoom();
+	}
+}
+
+void PlotterCtrl::UserZoomY(double min, double max)
+{
+	ZoomY(min, max);
+	WhenUserZoom();
+}
+
+void PlotterCtrl::UserZoomIn()
+{
+	ZoomInX();
+	ZoomInY();
+	WhenUserZoom();
+}
+
+void PlotterCtrl::UserZoomOut()
+{
+	ZoomOutX();
+	ZoomOutY();
+	WhenUserZoom();
+}
+
+void PlotterCtrl::UserZoomFull()
+{
+	Zoom(extent, false);
+	WhenUserZoom();
+}
+
+void PlotterCtrl::UserZoom(const Rectf& rc, bool keep_ratio)
+{
+	Zoom(rc, keep_ratio);
+	WhenUserZoom();
+}
+
+//////////////////////////////////////////////////////////////////////
+// PlotterDragDrop::
+
+void PlotterDragDrop::Drag(Pointf pt, Pointf prev, Pointf curr, dword keyflags)
+{
+	Rectf rc_prev = (IsNull(prev) ? Rectf(Null) : SortRectf(pt, prev));
+	Rectf rc_curr = (IsNull(curr) ? Rectf(Null) : SortRectf(pt, curr));
+	if(rc_prev != rc_curr)
+		DragRect(rc_prev, rc_curr, keyflags);
+}
+
+void PlotterDragDrop::DragRect(const Rectf& prev, const Rectf& curr, dword keyflags)
+{
+	PlotterCtrl& ctrl = GetOwner();
+	PlotterCtrl::ViewPlot plot(ctrl);
+	PlotDragRect(plot, prev);
+	PlotDragRect(plot, curr);
+}
+
+void PlotterDragDrop::Drop(Pointf pt, Pointf end, dword keyflags)
+{
+	DropRect(SortRectf(pt, end), keyflags);
+}
+
+//////////////////////////////////////////////////////////////////////
+// ZoomInDragDrop::
+
+Image ZoomInDragDrop::Cursor(Pointf pt, dword keyflags, bool dragging) const
+{
+	return keyflags & K_CTRL && !owner.IsAspectRatio()
+		? PlotterImg::view_zoom_in_aniso() : PlotterImg::view_zoom_in();
+}
+
+void ZoomInDragDrop::DropRect(const Rectf& rc, dword keyflags)
+{
+	owner.Zoom(rc, !(keyflags & K_CTRL) || owner.IsAspectRatio());
+	owner.WhenUserZoom();
+}
+
+void ZoomInDragDrop::Click(Pointf pt, dword keyflags)
+{
+	PlotterCtrl& owner = GetOwner();
+	Pointf d = Sizef(owner.GetSize()) / Abs(4.0 * owner.GetScale());
+	owner.Zoom(Rectf(pt - d, pt + d), true);
+	owner.WhenUserZoom();
+}
+
+//////////////////////////////////////////////////////////////////////
+// ZoomOutDragDrop::
+
+Image ZoomOutDragDrop::Cursor(Pointf pt, dword keyflags, bool dragging) const
+{
+	return PlotterImg::view_zoom_out();
+}
+
+bool ZoomOutDragDrop::Push(Pointf pt, dword keyflags)
+{
+	Rectf rc = GetOwner().GetViewRect();
+	rc.Inflate(rc.Size() * 0.5);
+	owner.Zoom(rc + pt - rc.CenterPoint());
+	owner.WhenUserZoom();
+	return false;
+}
+
+//////////////////////////////////////////////////////////////////////
+// PanDragDrop::
+
+Image PanDragDrop::Cursor(Pointf pt, dword keyflags, bool dragging) const
+{
+	return PlotterImg::view_pan();
+}
+
+bool PanDragDrop::Push(Pointf pt, dword keyflags)
+{
+	return true;
+}
+
+void PanDragDrop::Drag(Pointf start, Pointf prev, Pointf curr, dword keyflags)
+{
+	PlotterCtrl& owner = GetOwner();
+	if(!IsNull(curr))
+		owner.PanOffset(PointfToPoint((curr - start) * owner.GetPushScale()));
+}
+
+void PanDragDrop::Drop(Pointf start, Pointf end, dword keyflags)
+{
+	PlotterCtrl& owner = GetOwner();
+	owner.SetDelta(owner.GetDelta() + (end - start) * owner.GetPushScale());
+	owner.PanOffset(Point(0, 0));
+	owner.WhenUserZoom();
+}
+
+void PanDragDrop::Cancel()
+{
+	GetOwner().PanOffset(Point(0, 0));
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/Geom/Ctrl/PlotterCtrl.h b/uppsrc/Geom/Ctrl/PlotterCtrl.h
new file mode 100644
index 000000000..790962380
--- /dev/null
+++ b/uppsrc/Geom/Ctrl/PlotterCtrl.h
@@ -0,0 +1,334 @@
+NAMESPACE_UPP
+
+class PlotterDragDrop;
+
+class PlotterCtrl : public DragDropCtrl, public CtrlFrame
+{
+public:
+	class ViewPlot : public Plotter
+	{
+	public:
+		ViewPlot(PlotterCtrl& ctrl, int extra_gap = 0);
+		ViewPlot(PlotterCtrl& ctrl, Pointf scale, Pointf delta, int extra_gap = 0);
+		ViewPlot(PlotterCtrl& ctrl, const Matrixf& preform, int extra_gap = 0);
+
+	private:
+		ViewDraw viewdraw;
+	};
+	friend class ViewPlot;
+
+	typedef PlotterCtrl CLASSNAME;
+	PlotterCtrl();
+	virtual ~PlotterCtrl();
+
+	virtual void            FrameAdd(Ctrl& ctrl);
+	virtual void            FrameRemove();
+	virtual void            FrameLayout(Rect& rc);
+	virtual void            FrameAddSize(Size& sz);
+
+	virtual void            Layout();
+	virtual void            Paint(Draw& draw);
+//	void                    AsyncPaint();
+	bool                    IsPainting() const               { return is_painting; }
+
+	ImageDraw&              BeginBufferPaint();
+	virtual void            EndBufferPaint();
+
+	virtual void            Plot(Plotter& plotter) = 0;
+	virtual void            AbortPlot()                      {}
+
+	void                    BufferPaint(bool bp = true)      { buffer_paint = bp; RefreshBuffer(); }
+	bool                    IsBufferPaint() const            { return buffer_paint; }
+	void                    RefreshBuffer();
+	void                    RefreshBuffer(const Rect& rc);
+
+	void                    BufferPan(bool bp = true)        { buffer_pan = bp; }
+	bool                    IsBufferPan() const              { return buffer_pan; }
+	void                    PanOffset(Point o);
+	void                    ClearPanOffset()                 { PanOffset(Point(0, 0)); }
+	Point                   GetPanOffset() const             { return pan_offset; }
+
+	void                    PostRefresh();
+	void                    Refresh0()                       { Refresh(); }
+
+	void                    ShowScroll(bool ssc)             { show_scroll = ssc; Layout(); }
+	bool                    IsScrollShown() const            { return show_scroll; }
+
+	void                    MaxScale(double d)               { max_scale.cx = max_scale.cy = d; }
+	void                    MaxScale(Sizef ms)               { max_scale = ms; }
+	Sizef                   GetMaxScale() const              { return max_scale; }
+
+	void                    Gap(Rect g)                      { gap = g; Layout(); }
+	void                    Gap(int i)                       { gap = Rect(i, i, i, i); Layout(); }
+	Rect                    GetGap() const                   { return gap; }
+
+	virtual Image           CursorImage(Point pt, dword keyflags);
+	virtual bool            Push(Point pt, dword keyflags);
+	virtual void            Drag(Point start, Point prev, Point curr, dword keyflags);
+	virtual void            Drop(Point start, Point end, dword keyflags);
+	virtual void            Click(Point pt, dword keyflags);
+	virtual void            Cancel();
+	virtual bool            Key(dword key, int repcnt);
+	virtual void            MouseWheel(Point p, int zdelta, dword keyflags);
+	virtual void            MouseMove(Point pt, dword keyflags);
+
+	virtual void            RefreshPos()                     {}
+	virtual void            RefreshDragDrop()                { RefreshBuffer(); }
+
+	Pointf                  FromClient(Point pt) const       { return (Pointf(pt) - delta) / scale; }
+	Pointf                  FromClientNull(Point pt) const   { return IsNull(pt) ? Pointf(Null) : FromClient(pt); }
+	Rectf                   FromClient(const Rect& rc) const;
+
+	Pointf                  FromPushClient(Point pt) const   { return (Pointf(pt) - push_delta) / push_scale; }
+	Pointf                  FromPushClientNull(Point pt) const { return IsNull(pt) ? Pointf(Null) : FromPushClient(pt); }
+
+	Point                   ToClient(Pointf pt) const        { return PointfToPoint(Sizef(pt) * scale + delta); }
+	Point                   ToClientNull(Pointf pt) const    { return IsNull(pt) ? Point(Null) : PointfToPoint(Sizef(pt) * scale + delta); }
+	Rect                    ToClient(const Rectf& rc) const;
+
+	Point                   ToPushClient(Pointf pt) const    { return PointfToPoint(Sizef(pt) * push_scale + push_delta); }
+	Point                   ToPushClientNull(Pointf pt) const { return IsNull(pt) ? Point(Null) : ToPushClient(pt); }
+
+	void                    SyncPush();
+
+	void                    SetExtent(const Rectf& extent);
+	const Rectf&            GetExtent() const                { return extent; }
+
+	Rectf                   GetViewRect() const              { return FromClient(Rect(GetSize()).Deflated(gap)); }
+
+	void                    ScrollInto(Rectf rc);
+	void                    ScrollInto(Pointf pt);
+
+	void                    SetAspectRatio(double aspect);
+	void                    NoAspectRatio()                  { SetAspectRatio(0); }
+	double                  GetAspectRatio() const           { return aspect; }
+	bool                    IsAspectRatio() const            { return aspect != 0; }
+
+	void                    SetAspectLock(bool a = true);
+	void                    NoAspectLock()                   { SetAspectLock(false); }
+	bool                    IsAspectLock() const             { return aspect_lock; }
+	bool                    IsAspectLocked() const           { return IsAspectRatio() || IsAspectLock(); }
+
+	void                    SetScale(Sizef scale);
+	void                    SetDelta(Pointf delta);
+	void                    SetZoom(Sizef scale, Pointf delta);
+	void                    SetZoom(double scale, Pointf delta);
+	void                    SetZoomSc(Sizef scale);
+	void                    SetZoomSc(double sx, double sy)  { SetZoomSc(Pointf(sx, sy)); }
+	void                    SetZoomSc(double z);
+
+	Sizef                   GetScale() const                 { return scale; }
+	Sizef                   GetPushScale() const             { return push_scale; }
+	double                  GetAvgScale() const;
+	Pointf                  GetDelta() const                 { return delta; }
+	Pointf                  GetPushDelta() const             { return push_delta; }
+	bool                    IsReversing() const              { return scale.cx * scale.cy < 0; }
+
+	Sizef                   GetPhysicalZoom() const;
+
+	void                    AdjustPos(Pointf& delta, Point scpos) const;
+	Sizef                   AdjustScale(Sizef sc) const;
+
+	Pointf                  GetSc() const;
+	void                    SetSc(Pointf center);
+
+	void                    ZoomInX();
+	void                    ZoomOutX();
+	void                    ZoomFullX()                      { if(extent.left < extent.right) ZoomX(extent.left, extent.right); }
+	void                    ZoomX(double min, double max, bool add_gap = true);
+	void                    ZoomInY();
+	void                    ZoomOutY();
+	void                    ZoomFullY()                      { if(extent.top < extent.bottom) ZoomY(extent.right, extent.bottom); }
+	void                    ZoomY(double min, double max, bool add_gap = true);
+	void                    ZoomIn()                         { ZoomInX(); ZoomInY(); }
+	void                    ZoomOut()                        { ZoomOutX(); ZoomOutY(); }
+	void                    ZoomFull()                       { Zoom(extent, false); }
+	void                    Zoom(const Rectf& rc, bool keep_ratio = true, bool add_gap = true);
+
+	void                    UserZoomInX();
+	void                    UserZoomOutX();
+	void                    UserZoomFullX();
+	void                    UserZoomX(double min, double max);
+	void                    UserZoomInY();
+	void                    UserZoomOutY();
+	void                    UserZoomFullY();
+	void                    UserZoomY(double min, double max);
+	void                    UserZoomIn();
+	void                    UserZoomOut();
+	virtual void            UserZoomFull();
+	void                    UserAspectLock();
+	void                    UserZoom(const Rectf& rc, bool keep_ratio = true);
+
+	void                    PickDragDrop(One<PlotterDragDrop> dd);
+	One<PlotterDragDrop>    ClearDragDrop();
+	PlotterDragDrop        *GetDragDrop()                    { return ~drag_drop; }
+	const PlotterDragDrop  *GetDragDrop() const              { return ~drag_drop; }
+
+	void                    UpdateMousePos();
+	Pointf                  GetMousePos() const              { return mouse_pos; }
+
+	void                    DoSetFocus()                     { SetWantFocus(); }
+
+	TOOL(View)
+		TOOL(ViewZoomInX)
+		TOOL(ViewZoomOutX)
+		TOOL(ViewZoomFullX)
+		TOOL(ViewZoomInY)
+		TOOL(ViewZoomOutY)
+		TOOL(ViewZoomFullY)
+		TOOL(ViewZoomIn)
+		TOOL(ViewZoomOut)
+		TOOL(ViewZoomFull)
+		TOOL(ViewAspectLock)
+		TOOL(ViewPan)
+
+public:
+	Callback                WhenRescan;
+	Callback                WhenZoom;
+	Callback                WhenUserZoom;
+	Callback                WhenMousePos;
+
+protected:
+	void                    AdjustPos(Point scpos, int xymask); // 1 = x, 2 = y
+
+protected:
+	bool                    rev_x, rev_y, aspect_lock;
+	Rect                    gap;
+	Alignment               halign, valign;
+	Color                   background;
+	Sizef                   scale;
+	Pointf                  delta;
+	Sizef                   push_scale;
+	Pointf                  push_delta;
+	Sizef                   max_scale;
+	Pointf                  mouse_pos;
+	Rectf                   extent;
+	double                  aspect;
+
+	Image                   paint_buffer;
+	One<ImageDraw>          paint_draw;
+	bool                    is_painting;
+	bool                    abort_repaint;
+	bool                    buffer_paint;
+	bool                    buffer_pan;
+	Point                   pan_offset;
+
+private:
+	void                    OnHScroll();
+	void                    OnVScroll();
+
+private:
+	TimeCallback            tcb_refresh;
+	Size                    old_size;
+	One<PlotterDragDrop>    drag_drop;
+	Pointf                  drag_start;
+	HScrollBar              hscroll;
+	VScrollBar              vscroll;
+	Button                  horz_in, horz_out, horz_full;
+	Button                  vert_in, vert_out, vert_full;
+	Button                  full;
+	bool                    show_scroll;
+	bool                    lock_drag_drop;
+	bool                    lock_short_drag_drop;
+};
+
+template <class T>
+inline const T *GetDragDrop(const PlotterCtrl *ctrl, T * = 0)
+{
+	if(const T *p = dynamic_cast<const T *>(ctrl->GetShortDragDrop()))
+		return p;
+	return dynamic_cast<const T *>(ctrl->GetDragDrop());
+}
+
+template <class T>
+inline T *GetDragDrop(PlotterCtrl *ctrl, T * = 0)
+{
+	return dynamic_cast<T *>(ctrl->GetDragDrop());
+}
+
+template <class T>
+inline bool IsDragDrop(const PlotterCtrl *ctrl, T * = 0)
+{
+	return dynamic_cast<const T *>(ctrl->GetDragDrop());;
+}
+// make member template as soon as possible
+
+class PlotterDragDrop
+{
+public:
+	virtual ~PlotterDragDrop() {}
+
+	virtual PlotterCtrl&    GetOwner() = 0;
+
+	virtual void            Plot(Plotter& plotter)                                    {}
+	virtual bool            Push(Pointf pt, dword keyflags)                           { return true; }
+	virtual Image           Cursor(Pointf pt, dword keyflags, bool dragging) const    { return Image::Arrow(); }
+	virtual void            Drag(Pointf pt, Pointf prev, Pointf curr, dword keyflags);
+	virtual void            DragRect(const Rectf& prev, const Rectf& curr, dword keyflags);
+	virtual void            Drop(Pointf pt, Pointf end, dword keyflags);
+	virtual void            DropRect(const Rectf& rc, dword keyflags)                    {}
+	virtual void            Click(Pointf pt, dword keyflags)                          {}
+	virtual bool            Key(dword key)                                            { return false; }
+	virtual void            Cancel()                                                  {}
+};
+
+class EmptyDragDrop : public PlotterDragDrop
+{
+public:
+	EmptyDragDrop(PlotterCtrl& owner) : owner(owner) {}
+
+	virtual PlotterCtrl& GetOwner()                      { return owner; }
+
+	virtual bool         Push(Pointf pt, dword keyflags) { return false; }
+
+private:
+	PlotterCtrl&         owner;
+};
+
+class ZoomInDragDrop : public PlotterDragDrop
+{
+public:
+	ZoomInDragDrop(PlotterCtrl& owner) : owner(owner) {}
+
+	virtual PlotterCtrl&    GetOwner() { return owner; }
+
+	virtual Image           Cursor(Pointf pt, dword keyflags, bool dragging) const;
+	virtual void            DropRect(const Rectf& rc, dword keyflags);
+	virtual void            Click(Pointf pt, dword keyflags);
+
+private:
+	PlotterCtrl&            owner;
+};
+
+class ZoomOutDragDrop : public PlotterDragDrop
+{
+public:
+	ZoomOutDragDrop(PlotterCtrl& owner) : owner(owner) {}
+
+	virtual PlotterCtrl&    GetOwner() { return owner; }
+
+	virtual Image           Cursor(Pointf pt, dword keyflags, bool dragging) const;
+	virtual bool            Push(Pointf pt, dword keyflags);
+
+private:
+	PlotterCtrl&            owner;
+};
+
+class PanDragDrop : public PlotterDragDrop
+{
+public:
+	PanDragDrop(PlotterCtrl& owner) : owner(owner) {}
+
+	virtual PlotterCtrl&    GetOwner() { return owner; }
+
+	virtual Image           Cursor(Pointf pt, dword keyflags, bool dragging) const;
+	virtual bool            Push(Pointf pt, dword keyflags);
+	virtual void            Drag(Pointf start, Pointf prev, Pointf curr, dword keyflags);
+	virtual void            Drop(Pointf start, Pointf end, dword keyflags);
+	virtual void            Cancel();
+
+private:
+	PlotterCtrl&            owner;
+};
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/Geom/Ctrl/PlotterCtrl.iml b/uppsrc/Geom/Ctrl/PlotterCtrl.iml
new file mode 100644
index 000000000..22572bbf0
--- /dev/null
+++ b/uppsrc/Geom/Ctrl/PlotterCtrl.iml
@@ -0,0 +1,29 @@
+PREMULTIPLIED
+IMAGE_ID(view_zoom_in)
+IMAGE_ID(view_zoom_in_aniso)
+IMAGE_ID(view_zoom_out)
+IMAGE_ID(view_zoom_full)
+IMAGE_ID(view_zoom_horz_full)
+IMAGE_ID(view_zoom_vert_full)
+IMAGE_ID(view_zoom_full_icon)
+IMAGE_ID(view_aspect_lock)
+IMAGE_ID(view_pan)
+IMAGE_ID(drag_horz)
+IMAGE_ID(drag_vert)
+
+IMAGE_BEGIN_DATA
+IMAGE_DATA(120,156,237,88,217,110,3,33,12,164,15,169,242,146,40,255,255,179,116,87,21,21,235,216,158,177,77,87,61,226,21,10)
+IMAGE_DATA(193,51,62,192,64,54,237,222,238,237,125,123,86,75,159,36,130,223,187,163,33,190,192,63,153,83,198,37,239,107,200,209)
+IMAGE_DATA(121,227,29,97,196,88,87,26,195,163,253,101,243,27,58,109,206,197,218,88,114,88,51,185,150,128,219,12,28,203,245,236)
+IMAGE_DATA(229,229,177,61,151,237,81,173,7,11,92,242,166,0,105,59,145,130,239,197,194,216,249,221,209,75,190,196,12,254,176,17)
+IMAGE_DATA(217,8,93,107,69,255,213,252,7,134,221,32,218,252,207,185,23,54,202,193,142,146,79,192,134,90,115,128,175,47,143,97)
+IMAGE_DATA(43,96,35,42,21,238,108,131,148,215,77,201,233,136,155,226,140,155,178,28,43,210,177,7,129,70,23,38,162,7,192,130)
+IMAGE_DATA(141,175,218,203,203,126,83,146,190,10,59,182,114,98,84,79,44,105,39,43,17,190,134,179,248,114,44,123,34,207,125,52)
+IMAGE_DATA(87,222,77,80,225,87,227,159,199,24,156,133,101,253,68,100,197,109,183,106,15,100,132,224,222,212,159,204,200,97,166,128)
+IMAGE_DATA(81,209,106,216,76,161,177,197,101,232,47,219,148,184,128,167,0,81,66,149,10,102,5,249,64,19,234,76,216,77,157,16)
+IMAGE_DATA(38,0,132,143,30,175,217,45,193,96,81,197,252,246,138,143,238,8,22,35,99,168,172,107,68,28,60,87,176,171,37,91)
+IMAGE_DATA(64,222,66,91,122,249,105,197,98,157,0,204,119,43,110,203,23,235,199,226,32,95,90,46,178,143,56,94,220,104,252,27)
+IMAGE_DATA(229,243,7,249,27,133,141,188,125,74,206,252,246,18,121,131,29,156,217,148,232,187,92,131,3,99,65,124,217,215,114,206)
+IMAGE_DATA(240,201,156,85,126,212,231,89,252,73,55,231,216,60,190,228,160,53,210,190,35,249,105,252,136,13,15,135,108,152,250,71)
+IMAGE_DATA(187,30,80,135,214,196,95,15,47,253,223,214,95,231,191,106,36,248,236,38,131,59,187,253,243,252,63,0,58,106,65,102)
+IMAGE_END_DATA(448, 11)
diff --git a/uppsrc/Geom/Ctrl/appdoc.tpp/PathStyles$cs-cz.tpp b/uppsrc/Geom/Ctrl/appdoc.tpp/PathStyles$cs-cz.tpp
new file mode 100644
index 000000000..62e4f9a31
--- /dev/null
+++ b/uppsrc/Geom/Ctrl/appdoc.tpp/PathStyles$cs-cz.tpp
@@ -0,0 +1,44 @@
+TITLE("Styly čar")
+TOPIC_TEXT(
+"[2 $$0,0#00000000000000000000000000000000:Default][b100;a50;K* $$1,0#23046025415494101427921008701515:Paragraph][i167;b50;a25;kKN1;~~~>.3917;* "
+"$$2,0#52185223490867151055420261384346:Toc1`.Heading1][i333;kN11;~~~>.3917;* $$3,0#36545033421193513457240054113541:Toc2`.Heading2][i500;kN111;~~~>.3917; "
+"$$4,0#65092512416424580164828413186219:Toc3`.Heading3][i167;b50;a25;kKNA;~~~>.3917;* "
+"$$5,5#92291332474308709450111162202673:AppToc1`.AppHeading1][i333;kNA1;~~~>.3917;* "
+"$$6,15#61887903412252554674480251236992:AppToc2`.AppHeading2][i500;kNA11;~~~>.3917; "
+"$$7,7#03533551421653050355120437860335:AppToc3`.AppHeading3][i500;b100;a100;KN1;*4 "
+"$$8,0#94145093439740438411010082165944:Heading1][i500;b100;a50;kKN11;*+117 $$9,0#10901425421210535753260366156531:Heading2][i500;b100;a25;kKN111;* "
+"$$10,0#53209141402041366431858192225431:Heading3][i500;b100;a100;KNA;*4 $$11,8#32912651424211307887950041245434:AppHeading1][i500;b100;a50;kKNA1;*+117 "
+"$$12,8#51232055453458524230328032001901:AppHeading2][i500;b100;a25;kKNA11;* $$13,8#34108020439428305453439845463579:AppHeading3][b100;a50;k*4 "
+"$$14,0#49239115434362547028389207250014:Heading][b50;a25;k~~~>.3917;* $$15,15#40743698422276745552070108434023:Toc`.Heading][b100;a50;K~~~>.3917;*+117 "
+"$$16,16#15422850471211852294098111138263:Topics1][l167;b50;a50;K~~~>.3917;* $$17,17#35241722455500657380289596243808:Topics2][l333;~~~>.3917; "
+"$$18,18#31041344429742018840308064013200:Topics3][b83;a42;K* $$19,0#46440151113795363000000595230845:Paragraph][{_}%EN-US "
+"[s0; Dialog slouží k výběru stylu čáry nebo editaci stylů čar. V dialogu "
+"se zobrazují všechny styly čar, které jsou právě v systému k dispozici. Každý "
+"styl čáry je označen textovým názvem, který se používá jako odkaz na styl "
+"čáry. Kromě názvu se při vykreslování čáry zadává ještě šířka čáry "
+"a implicitní barva (některé segmenty čar mohou být vykresleny touto implicitní "
+"barvou, jiné pevně zadanou barvou).&][s0; &][s0;= @@PNG:3100&2612����Ǎ���������Ƞ�Ҁ�����")
+TOPIC_TEXT(
+"������������̀���������������������ϯ��\377힞����Ç������О�������������������������������Ġ�����Ȣ���������ݘ������܄��ħ�������������޿�������߾�������߭������֭���������\377���������ق�˥ٱ��ɩ�ќׅ괖����������ɔ�ᮈ����̺�������瀗��ަ�������꿹Ԅ�ު���ϧ�̔˪�ү����ə�����ꟳӋ����������������۹�������ɻ��㡚��ܻ����������숫�����ۯ�����Ω�֖�����\377��⎵�ڒ����ׯ�����������߽�Չ�仿��ݒ�쬛��������᪲��̒����ͬ�����������܏������ٚ۹���ȓҡ�\377������������Ծ���ǿ�\377���Ձ���������������ʒ���̮������ꉤ����٘󒪕ո���Ι��֊����ˆ�����ė�˭���׫��݈ᮭ����򳯢�ë��뤒̼�ܣؗ�٢˴��ꌆ�Β�ڳ��������󿅊׋����ӝ��ٸ��ˆ�ə��«���ʩ���������«�����߰�„��獘����ʸ�����������ɲ���̒�̒����\377��͒������ҍ�ӻ���ߗ��􌧗�ͬ��䦵���������պ���ݾ���������������ҥ�����������ݣ����¢����符��𲔤Ҕ�ή���ƒ��\377ʦ��Ί�ώ�����ٳ��⤪�������󦅅������������������ޥ������\377��ɤ�̊���ɤ��\377�����ˤ�ޒ��ۚ�������ϖ��Ċ�\377�ˏ��Ҫ��ڣ�������\377��棇��Ȟ�����ޮ����ȕ�Ϳ����������������Ũ�ĥ鮡�ͽ�Ū�����ȱ������������;���\377�����쑗�֖惼���䃤������ɬ�����Ź�����������������\377����\377����ӭ��ʙ�˥�����Քڅ�˭�ܳ�����Ƈ߼ߖ����������������������򘙶����Š��բ����˲����އ�ե�������\377���������ډ����\377�����������ͳ�ӄԍ��������\377륉����������ܽ����߁����������\377��򦉥�����媽���抦�Ͳ�������\377䅵�О����ʏ�ױ�߸��Ǟ��ӿҾ���婦��괏څ���Й���������׻����\377��������ڟ����������˳������ٳ���ߵ�������˙�޲���������ڳ�������ϻ\377�\377�쭻���Б�������� ����㒴�֘���α���¼ɤƛ����ڎ����������Ǘ������ؐ��ͨ������Ͷ����񢮕�������̒����������Քʉ��ھ��Dz���������������������Ӣ��⹙�����Ě���Ο˝ꌰԝ���ײ۟�����沆���ઋ��ɲ�Ĝ�ܢ���͒��Ν�����͆����������������ڧ�Ԟ�ܟ���ު��˦�Λ�޲���ȅ㷟�������������ߒ���՝������\377ͱز��������ۈ�Ӟ���񖅗֔������僼����ަΚ��扜˒���ɍ熐��������탫�����Չ���������奊�›��ʒ�ս�����ߏ���ܖ��Ƨڳ��۞�����������ّ˗�֖潒����ɲ��ҌȤ��ͽź���޼������䒛����β�\377���������ޟ��\377�������˘����Ղ�����τ�����𳹒��")
+TOPIC_TEXT(
+"��Ѩ��ކ΂���������ɿҤ������ק�ʹ�Ҳ���������Ӵ�˜����������������������ܿ��������핅��������������󂹤���ع�����㔔����������Ӧ���������ͭ�럾���������ݾ�����ޜ���މǿ���ǿ����������������ٟ���л����禧����՚�եļ�ũ閒ĸ������Թ��轕���̫ͬ���\377㝒����ϼ���̪������ߣ������������\377����٪�꼠�����Ƚ��Ǚ�٩���������ͼ�Ν������ݎ�����я�����������ױ�蔦�޻���삌�������޻߉ʇ���а�����̅���ܰě�擂���ܢ�纅�����������������̋�\377����έ��\377�몕����������������ޮ����Ǩ����ʒŸﮯ����ϊ�ɬ�\377ϣ�������Ӛ晷������������뽺��̖�ȁ���Β��Μ������������Ʌ��ș���̒��ژǭ�’�°ɿ��󭼷���������ݐ�Ԇ����ͅ���Ѭ�����ݲ��ш��ܽ����ߖ����\377�ď���ۿ����ÿ�ي���������֔��ݢ�����Ԙ�餇�ʌ��������Ӫ�����͢ў��������ջ���Ω����뻫��������������������������܇��嶀���������睔�����䮊�禤������ѹ��ۻ�������ʻ�ĺ�ꜹ������׿Ћ��ը���恈������䲐��ٙ�����\377��ɷ���������ۓ����������Þ�����������ܥϤ��ܪ�֭�������η��ϝ��������ݽ�݂�Ν������筚�����ԥ���Ӯ��ǿ�����᧽��������������ݍ���\377łӒ�ͼ�������ظޒ��·җ����Ʒ���ԩɔ�喤��˒���ޥމ����ũ֮����ә����ι��Զ����坫瞸�Ώ������ń���µ�\377�柽���������̹˼��䝕�ʈ��ɍ̍����ҹ��͒���ҧ읙ͻ������ד��������������ɾ�����ĩ�͜\377������ڿ������צ�ν���������������ۭ��眷�͌ռ����ᒋ����ɘ̖���ˮ܉���΃�����Ҥ�އ���κ�������������ΦҺƙ۔�ő�ؼ�ӹ���\377�����ݓ���\377��������䂇��������ȭ�͍����ɦ�Ȥ������물��Ү�����������ϓ����ڦڞ������������ק���������پ������������߳��Ҭ������؆΢���ꃜ�󡩃����򮻆���������њ��񦤸�Į鎹��������������Ή���鐂����󬝓����ՠ��΃����򶥩�ʲ������\377���Ͻ������ɇ\377�㧮�������ޅ����Տ�ٔ���������ذ������林�η��Ӄ���ұ�ɉ����������ㇺ��ٗ����Қ���ݫ���������������䮙���׳��ަ�φ������Ԙ���Σ�状���ԟ�����޸�����ӱ�Ճ�Зˆʽ����ն������ڙ�����Ģ���ԃ�檧���������ӗÙ������Ѳ���ɭ�������������\377�ﾅ������������������޻ﭜ���܍��ȸ�֥�ӥ���������ҡ�埾�����Ή����ľ���뜩�嵷�ݰ�������˝���楂����������������Ɲ��ބ�������׋����͢����缬��Ԯ��˺���")
+TOPIC_TEXT(
+"��Л���һ������ͩ��ڄ�ޡ������ͪ����޶��������՛�ٷ����\377�Nj����ӿ��ɇ���̅\377��񥍕�Ր��̘����槴��֍��̝��������ٴ��������ѷ슫����������Ӣ�ɏ��ᗛէ����Ž���Ɗ�����ܫݠ����ۛ߫��庿���۬�������ߴ�����������ÖȤ�����˜��������ԫז�����޺��ʱ��ҫ���ռ��Ӯ���ɭݲ�ݓ���Ǧ��������ʋ���������⫟�𷟿��į����˕�����􍩭�����Ҧ����\377�奧�������������Ɋ�܂��ܸ������������퍶����Ϛ�􍶮����ū\377����������⭨�������ծݕ�������ݲ�������ѷ�ؘ�Ҥ��Ȫ������ݏ���������ܐ弔��������݄˝����󥝩���\377��������΅���۔��ҭ���ʯ��ͺ�������ھ�Ҵ���������Ȃ����С���䋢������ʪﾴﻷڨ���������Ɛ������ֹ��β���������������������\377��ȩ��ߵ��枍������������ն�����\377���Җ��������������ə‘�̍��������Շ�����������ᡚ��ʒ�������������Π��ξ�����妼�ܫ̬����������˥��Şڳ�˨݈����ҺŸ���ȗ�����Ϋʲ�ř��㻑������ں��̒�ҫͺ���������ͥ���׈׳������������󺹁���򽺿�����˷��Ϸ���������Ѩ�������⬄���������󷅜�������⤬׻��批����ǝ޽������������ړϽ���ܻ����\377�ݹ������馹���Μ�羳�������ז��������������ސ���������䢕����י�����������皙��ȇ􍪆�����ݒ�ͯ��������\377����Ώ��������ݵ��ԛ����\377���و�䖘������������\377���Ͻ���������ϝ�\377Ľ댹��������箳�˅˂��쨨������\377�ͯ\377���Ҹ���������֟�����������΅��������������������Ӌ����ԯ��ï\377�ϵ������������ݩ�ݩ�̾Ԛ��������ʹ��¹牀�򷵘���ܝ���ۉٌ�ۏ�������\377����֘�΍�\377���\377�孆���������߻������̓�����𱬰�ĥ�ɸ�۷�����������ٿ�íӏ����Ӳ�ʊݓ��\377ѓ�ɴ���ν��٢���ܗ������ش򧬕��ҕ��飆��̹���ȩ��������͂��̛��������������é��Ԫ�������ɢ����ݯ����ג��󝧧���ܒ�������������ۢ�֌և؀�ЦА��������ʼ���������ɢ���ъ������΅���Ӧ��������Ѵ�������ޤ�����ܳ�󣮝���������������������������\377�ڹ��ꛪ�̭���������鬝���ͱ׮��⃻��������џ���Ω��̉��������͐�Р�������Ξ�������\377�������ٷ֛׿�����侀��������������ߙ����������������ݸ������Ǝ��\377���ֲ����������Ӓ������������ܾ����ɩǾ�������榓�耰��������������߽����͗����Ǟ����ܡ���������\377�����񯽻���Ʉ��耰̇\377")
+TOPIC_TEXT(
+"��\377\377������גǹ��ԁ��Ȭ��\377�����\377�ޕ��읤���͘������\377�������������َ၎��֥��ɇ�֯���ϵ��Ȅ������ݏ�������ٽ��ԯğ�׃돹����틷������������ѡ���֬������������ߺ�������ҵ������̍��ѿ����҉��봨����������������ʹ����ɩ�����􀘚��ƞ㜜�߳Ч݋���֬��������\377����\377���޻���٧����������\377�����ˣЁ����DZ�������αۢ�����������ָ������ō��Ԇ���ܝ�ڽ�����������Ӹϑ��ջ������ˡ����Ͽ���ʭ�\377��՚���󥌻������ӳ��ݪ��ɚ鱞����Ώ�������ۭ�����������������������ȵ޻�������������跭�����������ݽ�ˎ��ҽ����Ї��霣�ϥ���������퇄������Ԇְ����ۄîۊ�惭ǭ۾ڈ�ͷҤ����������ۘʭ�����î���������򖉞�����ݲ�����ۖķ���ȫ�����������׺�֋��ܰ��܀��衃���ʃ�����à�؃�𽪒ɶ��Ѭ����Ɍ�����耠Г���Ԅ����������͐蘙�����졈֖�����踎�趇�����灬����ɠ���څ���ӿ��Į�ւ������Б���ڋ�������Ǽ������맓������ŵݵ�����簝�ٿ��Ƒ������링����������ٻ�����ͭ������������񴬕���ɠ�֢ιែ����링������������􀨉�ȝ��������Ё�������͙�����†�������ͻ趴����\377����򰎛\377��ξ�Ç���Ȥ��륀���β���蘡���밒�꧁��ѐ�������������ᭅ�ּ�������������ς�ѷ�������迉�ī��΂�������յ���ǻ�������������Ԏ�з�ѫ�������܁��Ʊ�����������܈�敆�ܐ���ˌ�ݟ���ςܝ񉹵������Б���������߰��ɶ쓀��\377棶���맹�ή�����汄ŭ�߿��և���Ё�覶�����ڻ������ա����˃����ਟذ�򁀚��Ё����������ꂬ�����Ёᠦ�􀨉��Ҭ�̀���Დ��è�������ۇ��������ςҿ������Ͱ�����ϒ�ۙ��ۊÀ��Г����Ԅ���������͐耈Г������ۆ�������\377��Ą���ф�ր����ïч������\377�ݐ޷�ܟ��۟��践����������Ԟ���������\377��ۻ�����������������˷翸恛Բ���������î����������߳������р�Ɨî�����������������������\377ɡ��ز��������ڈ��ֺ��ц墭�����⛠�ힻ��퀯�ܓ��򍝽\377�µܽ�����Ľ�����ʓ�����ݠ�������䎙�������Ʒ����������б䂀�����������ȍ��̀���ﲢ�������򁀚Ȥه��ʅ��ݎ��顃�͂��Г����Ԅ��������䜸�ƛӌ�ڱ��ς������۞����օ���꧁�����끖ԕ���Б���ڋ��������Ԣꭍ����ς��񊭵�������΅��ϭ����ױ�����������������������㟉����ʀ��������������������������������˼�慈����݈��͏�Š߿��Ą�����⯟�����͐耠Г���Ԅ�")
+TOPIC_TEXT(
+"��������������׸���򰎛��������ߎ���������آ����Ģɢ��۞М�و�����ɏ�������Űӿ��Ȭڋ����߁����ڀϥ���������끖��������҅������Ī��Ǎ��������烬�����ؠ�޳����������������������ȅ�ٶ�ģ��������Б��ۋ����䌝����������������\377�������ψ����\377��������Ē����退�������Г����������͝���򅯍�꼀����Ż�ȅ�ꂬ�����Ё����􀨉�����������Ё��؈􀨉����Œ�����������������ه�ςҿ������Ͱ����ϒۙ���ۊ�耠Г���Ԅ����������͐�Г���Ը񎱏��Õ����������������Ζ�����\377�͇�������݅��賮�ޮݸ�Ǘ�������֭��ﻛ����Ͱ��������Ż���������ב߻������Ε�������ߌ���ㆱ�ٽ����\377���Ԇ�ձ���Ї�ފƣ²�\377���޿��ҕ\377����Ո�����׶�����ϱ�ˎ������\377����������Ͻ��������������������������运���������������Ɓ�������������楱�޻��������׻��\377����������������������������՛��������������������г��뷣���ʁ�������䕴��������Ҕ��������Ё����􀨉�������� б����Ս�̑���������폿��ϰ��ޤ����Lj����˳������⼭�ت���ɠ��ѵ�����꧁�����ڀޑ��Ϧ�¤���������Ν����ˋ����nj��������ς��ٶ�����������Б��ۋ����䌝��������������Ĝ��þ�����ς�����������Г����Ԅ�����������є���п������р����Ё���􌉌������֌����舰������ϰ�����ւ�����ɠ����੨�꧁���ղڀ�⫟���������ؿ������������굻Ν��ل���ٿ������������È������ȅ�ٶ�����������Б��ۋ�����ȅ�����������������\377�����װς���ҥ��\377�䌝����������҆����찧���槶����刋ߚ���������Ð���Ԅ���������͐���Г����„����������ς�����������͐�Г����Ԅ�������΢Ё����􀨉�����������Ё����􀨉����������Ё���􂀨����Ꙃ����Ȥ�ٰς����Ё���􂀨�����ق���������􀨠������և���Ё����􀨉�ȝ��������䦂����������Ё����������ꂬ�����Ё����􀨉�����������Ё����􀨉����Ɵ���������ꂬ�����Ё����􀨉�����������Ё����􀨉��������ҠЁ�Ĺ���ˠ��͐��Г����Ԅ���������͐耠Г���Ԅ����������͐�Г����Ԅ�������΄���Ԇ���������͐���Г����„���������͐��Г���Ԅ����������͐�Г�᪹݀��˖��Ё����􀨉�����������Ё����������ꂬ�����Ё����􀨉����ꢑ䥲ំ���˙ɹ�Ç��ڠЁ����􀨉�����������Ё��������ׯ��������ф����͡�����έ��������ؚ��")
+TOPIC_TEXT(
+"僸�������\377���\377���޻���Ϯ�ҍ�������\377������˂�Ё�����DZ��������ݸ��齛��Ǝ��\377���֬������ꧩ�����򃪄���������ܓ���Ц��Ё�����������������ػ��醗��\377�����\377ṡ�ϯٗ��Ё��ν٫���\377��󉫹���煭���������Ҹ�푀��•�������������֙��颇���������շ����ƥ���Й���뼯������鋁������������֧ﷹ�����������ɳ���ӭ���ङ���������耰�̲��Μ�޼𮦇���Μ��ȅ�����������מ߸�����˲�Ё��毯����͒�����������틀�̗�����\377�륅�������������ßߘ��˭�������̃�Ώ�ހ���Ё�����������ܺ\377���솀�����\377\377����ă�����������󀀀쐏����͐�Г����Ԅ���ĵ����������������΋�����ڣ�莰�����҆�����Ԍ����������篽��߻����ߙ��������Ͽ����Ý���߿����丽�����������Ǥ��ϼ��ǎ��؝��р������箾������������\377�͘�Ç��������׿��������������з����\377���Ͼ��������顃�������ӎ���ޏ�Ķ���ɗ\377��Ȫ�����©ǎ��ߟ�쳢��׃߀��П����������������ʄ��������ع������Կ�ͼ�ύ�����\377������П����Ч���������\377�Վ������ެ���������î�������������ի�����ջ������ڽ���˖�Ё������ٷ\377�ȫ���������������˽Ǫ�������ϥۀ���������������\377����������Ӂ��߾���ڲ��ݗ���������ܹ�薋����˫�����뫅ů���������������������������٧������˥۪����Ǡ�è���񜾿������ߜ�������珲�����ۧ����ڍ�Ʉ���������ǿ����ޕݣ����������������������°��������ڇ��ٌ�����������������ܝֹЧ�������������䵚��۞�����\377�ϛ۽�����‘��֦������ϼ֖�镶�Ё�������������ࣟ��󯭾��躹��ǟ������˫˲��Ҷ������������������ʧ����ٴʲ�������������۾���р�����������茡����κ��ַݱ�������㱛�ր������կՋ������Å�ݙ��֓�������������\377�ٺ�ۍ�������ϑ����\377�������������������囐�ɑ������\377���䯷�������ɂܪ��\377������꾘��୭��Ѷϡ�⿳��ϭ��硌�ٵ��������������ڎܟ�����┞�ҩ��޲���������\377�������Ԭ�뀀���Ť�Į���&][s0; "
+"&][s0; Tabulka v horní části dialogu slouží k výběru stylu čáry. V obdélníkovém "
+"poli jsou uspořádány náhledy všech dostupných stylů čar. Dvojitým kliknutím "
+"na náhled čáry vyberete styl čáry pro další použití v místě, odkud byl "
+"dialog vyvolán. Pravým tlačítkem můžete zobrazit ")
+TOPIC_TEXT(
+"lokální nabídku funkcí pro práci se styly čar:&][s0; &][s0; @@PNG:718&968����Ǎ���������Ȁ�Ҁ��󀄀��������޶�ހ������������͒۠Ȑơ��ʛ�Ι�䪐��Ԗ�Є��ž�����ֶ������욖��߿����\377�������������ؖ癥�ي����ي���˫������������������\377����݌墘�ɫ�����Ǟ�������ұ�僞����������������Ņ�葼僦�緔��ۘ����歫����������\377��������֩�������汻���ˡ����ˡ���ˡ᳔��ᜭ�����旛��ߠ�����������α؞�ɲ�ד�������€ּ�՞��٫����ቝ�ᘆ��ןל㶐����Þ����瞦ӈ㮏�܅��Ƭ����ƽ��⦙���������ﰇ��յ�͐Ŭ����Ȭ��ҭȬ���Ȭ��붸��ŋ���������ٟ����������������Ϧ���ɠ׈睸��������▣�����������𾝼ٸ����ݹ���������Ԓ�����α��\377�ڬ����ի��򆨞�����ޙ�������ٴ�����即�±��ߠ�޼ȟֳ��������\377��Ïؔ����괢á����ˡ����ˡ���˱��٭���\377Υ�����������ٚ���݃���������˱��Ϟޖ���儖�����蕠����ȴ���������Ƚ������ɔ����ڋ�����𸍡����쵮�������򷹣������ח�\377�����֜�ө����򮚞����������О������֬���Ȭ���Ҥ��ޏ߆�dž����������ͨ���ي��ي����ي���ي�����ŝ�¤���똿������ӿ��󋒙����������������������ͺ������П������ڼ�����\377��฿�����ь�ޣ߭���ԟʗ��ӧ�穂��ݴ�����ˡ����¡���ˡ����ˡ���筸����֬�˳����������������ؾ�������ߘ��ќ��������������ٍɐي�������������ۣͨ�ж��±ˡ����ˡ��������ԫނ�����ˡ����ˡ����ˡ����򡳔�Ւ���ך��ΰ��������Կ����ƴ�ثؐ�֛��䜻�ފ�ݵ�������剆ݷ������ϥ��̽������������������������й��ε������ӧ�������ˡ����ˡ��������\377��އռ�㄀������Ť�Į���&][s0; "
+"&][s0;i150;O0; [* Nový:] definovat nový styl čáry&][s0;i150;O0; [* Upravit:] "
+"upravit vlastnosti zvoleného stylu čáry&][s0;i150;O0; [* Přejmenovat:] změnit "
+"název stylu čar&][s0;i150;O0; [* Duplikovat:] vytvořit kopii vybraného stylu "
+"čar&][s0;i150;O0; [* Export:] uložit definice stylů čar do souboru&][s0;i150;O0; "
+"[* Import:] načíst styly čar ze souboru&][s0;i150;O0; [* Smazat:] odstranit styl "
+"čar ze systému&][s0;3 ]")
diff --git a/uppsrc/Geom/Ctrl/appdoc.tpp/all.i b/uppsrc/Geom/Ctrl/appdoc.tpp/all.i
new file mode 100644
index 000000000..d88793809
--- /dev/null
+++ b/uppsrc/Geom/Ctrl/appdoc.tpp/all.i
@@ -0,0 +1,3 @@
+TOPIC("PathStyles$cs-cz")
+#include "PathStyles$cs-cz.tpp"
+END_TOPIC
diff --git a/uppsrc/Geom/Ctrl/doc.dpp/AppDoc_DlgPathStyleMap_CS-CZ15.dpx b/uppsrc/Geom/Ctrl/doc.dpp/AppDoc_DlgPathStyleMap_CS-CZ15.dpx
new file mode 100644
index 000000000..fc9f40de8
--- /dev/null
+++ b/uppsrc/Geom/Ctrl/doc.dpp/AppDoc_DlgPathStyleMap_CS-CZ15.dpx
@@ -0,0 +1,116 @@
+HELP_TOPIC("AppDoc", "", "DlgPathStyleMap", "CS-CZ windows-1250", "Styly �ar")
+HELP_TEXT(
+	"[ [A@0+84 Dialog slou�� k v�b�ru stylu ��ry nebo editaci styl� \r\n"
+	"�ar. V dialogu se zobrazuj� v�echny styly �ar, kter� jsou pr�v� \r\n"
+	"v syst�mu k dispozici. Ka�d� styl ��ry je ozna�en textov�m n�zvem, \r\n"
+	"kter� se pou��v� jako odkaz na styl ��ry. Krom� n�zvu se p�i \r\n"
+	"vykreslov�n� ��ry zad�v� je�t� ���ka ��ry a implicitn� barva \r\n"
+	"(n�kter� segmenty �ar mohou b�t vykresleny touto implicitn� barvou, \r\n"
+	"jin� pevn� zadanou barvou).]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[= \r\n"
+	"@@GIF:3570*2970\r\n"
+	"���Ƹ���ʁ��̀����ߏ��\377\377\377\377������\377����Ͽ�\377�Ͽ����\377��ϿϿ�珏���\377�����������������\r\n"
+	"���������������������������������������������������聖����\377������誮�뾤������\r\n"
+	"�����ہ���Ȭ��Ȥ���얆����ʭگج���������̮�����������ί���������\377���Ҁ�����\r\n"
+	"\377�������\377�������\377�������ߞ����ӂ\377���������������􂇴��������������ӈ����\377�������\r\n"
+	"\377�������\377������ܷ��ۢ�����ᾇ�����������������������\377�����Ȱ���������߰�Ç\377Ơ\r\n"
+	"���˞Ċ�øϞ������똒䤿���\377���ɲ�˗���ʌ��ͱ����Ĉ���Ξ��Ι���侢�����ʴ�ӧ\r\n"
+	"�У����͊��򤺉��ů��������م��Κ���ڨ��ɴ����ڻ���ݿ˷�߿�����̸���񈓫�̸�\r\n"
+	"�܃՟�ù���˘�ײ�̀���ಏ������胤Σ������׬͋��ͺ��٪�\377��ͻ��������μ����ȓ���\r\n"
+	"�����\377�Ϧ����������������ޭ���������׶���������˟Ͽ������뇾��կ����覌Ȇ�瞝\r\n"
+	"��\377��Ѝ���������ɸ߅���ᆜ����������������⁸���������蘒㌳�砀����㵎�⨣��\r\n"
+	"��ȣ������Ȧ�䒜̶����Ʃ����幕��喵���Ճ��𳣀����׫��禂����恢��畜�Ч��\r\n"
+	"��������꧞��蠹���衈��袌����ƪ餔���饘�٥�ֻ��������銟��Ȁ������瞃\r\n"
+	"��������\377뭸�뮗��ꫣ���������꯱NJ�����Ǭ����������\377��������Ҥ�����➺��\r\n"
+	"�����������������\377������￀�������������������Ì�˚������Ř笷��۹ˀ�\r\n"
+	"������Չ�ũ����ʬ����ޚ���̧����ȧ���Ξ�������Ō��ė����ȣ���������۱��������\r\n"
+	"��ύ���������Ǣ�������蓧����ԑ����ǭ�������������������߀�����ܗ��ሧ����ˍ��\r\n"
+	"����ה����叿����׼��砏���\377�����碧���ꬿ��鐸ϼ����Ļ����繒��������������\r\n"
+	"��㉯��̐�������\377��ȗ����؇�����Ύ��������羷�����������׮׽�����\377����������\r\n"
+	"���蜀��������ޫ��������������̟բ�����ꜜ„������΋�����˜�敎�����\r\n"
+	"��—�Ń��ڈ��ͅ���������بġ�����������¢������ᖄ���ԩ�����ҿ��ţ���ҥ������\r\n"
+	"�\377�����ܝ����Ƴ�ӡ�޼����迬���𽄣�҈��������ڎ���Ǚڱ��������������������ڏ\r\n"
+	"����䀳���ƒ�Ė��ƻޞ��ի��Ϯ�Ղ�媟��ȟ�򍍜����Ğ�҂������ɺ�����\r\n"
+	"������ꒋ�����\377���߆�����ܭ����ʓ��ۦ�ǫ����Қ������䛑�򲌧�׏�������򌦽ɹ�\r\n"
+	"�����������Ϯ�뒞�津���������׉Ʌ�̝����҉ͮ�\377͙��שъ��Ϙ������Ƿ���\r\n"
+	"���������Ҟ���������͎�����������������Г����Ґ�ǥ���׶ԩ�̩���������֡���ê\r\n"
+	"����є���߽��Ċ޾�Δ������ڱ��ۯ�嵂��ڇ��Տ��͢޷�ӿ��̯�����ǹط�����ì���\r\n"
+	"߁�Ԭ�լ����ٶ�����ͨї����ځ�������ڪ�ޖ�����鮰������㨭�Ë�Ѭ�ӯ���ļ���஡�\r\n"
+	"���Œ��د��ָ��Ԃ�ݷ��۷\377���۝�����Ӈ˘��������ׂ������޳Ѕ������ۛ����漮ͯ\r\n"
+	"�������ᦜ�������������������ۂ�ݡ���������س�����������ל��������������߻�\r\n"
+	"�Ƕ��ʕס����ʘ���������ݚ���헮��鷠��׿۽ᶁ�������;�ܓ������ٌ׎��籌�����\r\n"
+	"��ƃ����֥�틈�����츶���־������չ˿���憱���ɝ峗��ׅ��ƴ��缶�����\377�\r\n"
+	"�Ѩ��������鋹��Һ����ܟ�����ʟ��ѓ�����ֿ�������\377��ג������������Կ����ɨ�\r\n"
+	"�ٗ�צ���\377�녮�����ꦁݱ�׫������������՗��������ۻ������������́޷��������\r\n"
+	"��ƶ��������������\377Ϛ��������������������ﻢ�܃������������ߎ��ٝ��Į������\r\n"
+	"���倿���\377���������㡯��������ʋ����̕؝��ף����\377�����ν��ۉ�������ՙ��\r\n"
+	"�������������Վ٠����\377ώ���������������à�����������������ҋ�����Ǎ�鞟��\r\n"
+	"�������ڍȗ��\377��������������϶�Ї��֫�������������̫�����\377������������\r\n"
+	"���������������Ы\377욮����\377�ɏ���տ�З�\377����������������，����������������\r\n"
+	"��\377�����������\377��\377��\377��؀�����������������ķ�����������������ၦ������Ɓ����\r\n"
+	"�؂������զ�������ł��׮����؃�����僺�����޻��䏀�����ح��׃��������؄����Θ�Ҹ\r\n"
+	"�������\377����\377�����\377��\377����ȅ�����������dž�熒���鈅�������ǁ����옂���\377����ȇ\r\n"
+	"�Ҧ�������汇�ۄˈ�Ԉ��ƣ���贇ܸ�����֣�贇�È�������ȑ��ʹ����ɿ����\377���\r\n"
+	"����Ê�ڃ��臼�����ʋ�����������Ț�������㋴�����̎�ˊ�����������Ӎ�����؇�\r\n"
+	"���̽�\377�ڈ�Ѩ��Ռ�ӎ����胡؉���������ȍ���Ļ������؞��ȱ쇥�������̫�ʊ�\r\n"
+	"�������ʄ�����\377ח��퇋�����؎�����Ƶ�������爋�����ג�Ȍ�\377���ǒ�ظ������ˑ򗏯ɓ\r\n"
+	"���������蓺��锬�������葚����ǔ���ߘ��Ή�ʩ��\377�ɕ���������\377�Й�ש����\377������\r\n"
+	"ƿ������ϗ�\377�����������ۯڇ�ا������ɖ�����门��������������֗�ষ��������ө��\r\n"
+	"�������ّ������ܡ���陙늉�։�������������蒈����������ȑ�֚䧙�ə�阀��ܩ����\r\n"
+	"���������ₛ���ﶉ��������ז��������ԙ���������ч�Ϩ��ۗ�ߵ��҈������鞰��ڧ�\r\n")
+	HELP_TEXT(
+	"ļ矚�����Ϸ�������\377������������ꋗ��홟��������\377��������ן�����򱇢���\r\n"
+	"������󨈺��髪��ڟ����ݙ��ˎ����������桝�������ąĂڤ��ų�ۋ洠剤������\r\n"
+	"�ʠ�������ؚ��������\377����꤁ڤК�����Қ������ڦ��ꦖ����ɥ斦约��ǣ䚦�ӊ������\r\n"
+	"릂�������������ֺ������ߨ������ک����ϕ�ˈ���٨������������������毪��\377����\r\n"
+	"�������›����ק⪩��������ʫ����̓���ǚ�Ɋ�˪�����Ū��ؖ�����٭��٫�ɣ�ɕ\r\n"
+	"\377‰��ɛѳ�蘗��ߝ���ҹ������ٙ������������ڭ����񙯰��خɛ����ڕ���ڳ����ڇ����\r\n"
+	"�����������ۯ۪����������ڰ����͙�������Љ����������ډ���ֲ�����ꮙ��֞���ؙ��\r\n"
+	"ͳ≳������ફ���شƫ�����ʻ��೤��Л�󳪜���\377��鯵�ګ���˭ջ��������֖ۯ�ʶ��\r\n"
+	"�����۫���ʶ��Ԓ��쫷��ɷ嫶�����۷������������酫���ٵ斫������紜����ɳ�Ƹ���\r\n"
+	"���������˹���\377�빙˒�څ��ߣ���̳����֥ۆ�벷����͗É��������ċ���Ώ���\r\n"
+	"�Ê�����߻���Ҥ��Ј���ʨ�����ɍ����딩�����Ӹ�վ�܄���˾���������ֈ�����ƫ��\r\n"
+	"��ɘڈ���������؋\377����������׻���鵘����������Պ���δ������Ð���Ͽ��қ�������\r\n"
+	"��ܫ�������޺�����㛴��ۗ���Օõ�幌������黝��۹�˻���������������ۆƜ�õ��Ѕ�\r\n"
+	"��Ļ�Ķ�ދŢ���Ĺ������ܳˬ��ک������뉑��Ռƶ�̮���ٺ������������������ٜƨ\r\n"
+	"����������ʚ�ު��ӓʸ��������ի몰�������ǟ������ϴ����ۓ\377������\377ŋ�����\r\n"
+	"����隤���������\377��ȷ�ɧ�����ď������ƹ�ݛ�ʜ����̿�ɩƜ鮼�Ș����ݰ��������ˏ�\r\n"
+	"�ʧ�Ÿ�Ž�������ڌ�͌ȼ��ƚ�Ʋ��䥸ɨ���̺ռ�������Ńܸ�����Ȗܧ�������\377����\r\n"
+	"�������������¼둸�ј݄�çͫ�̐�ܰ��Ѣ�Ϥ��ю�ͭ�ܹ�죣��҆��������ȥȇ��Ҹ��\r\n"
+	"�ʲ�Ȣ����������̯��ρ҉Ԅ��������Ҳ�љތ�\377�������ؽ��\377����ū�隒�ն͜���˼��\r\n"
+	"޼���ǂ��������־������җ�Й��Ѣܜ㝱�����Ɲ����ކ�������Ч�����ȁ��������\r\n"
+	"�΀����������Ǵ���ڿ�����ڦ̓����ѫʌ�ڿ��ڏ�ں��۹�۶�۴��۵��ϳ����Ծ�߄�͙���\r\n"
+	"���ܳ��ȿ��ʽܿ��ֽ��������ý��������ٍ\377����������ީ����ݓ����\377�ح�������\377�߿\r\n"
+	"����������Ǘ�����\377�������������������������⦎�൜ᒲ�����������Ƨ�ើ��\r\n"
+	"�����������৞����à���ҵ⬎㓾����㵮޷�����⼚�վ��֥�㷮䵙�ƞ�ľ�������䪮\r\n"
+	"��э墎�Ԟ����\377�ر�吕���Μ֞�ф�������箾澉杻���ì�牵������������������\r\n"
+	"���������������Ԉ��µ軌�ӎ��خ�蒞����������\377���̣�ԮĠ���޷餮�\377���꿳ꪮ�\r\n"
+	"\377�����갶�詾묣��ξ������뼮�����ד���������\377��ʾ�ɿ��ή�О�����Ծ���������\r\n"
+	"�޻������������̫��澺������������������������ƾ�����ނ����������“�\377ш�\r\n"
+	"�����Ե�Ë��ҏ�����ҋ���ស��ښ��������⟏�������㥏ￂ���𮱿ְ��������\r\n"
+	"������뻑����¿������\377������۳����Ο��\377П��������\377�\377����ҟ����������р����\r\n"
+	"��\377��������揅�����������ϴ��͒������������������\377\377������������ﲉ\377ˮ�������\r\n"
+	"À��������������Ŷ����Δ�����������뢏������܀ۆ��р�׼����������ϱ����乎��\r\n"
+	"���놻�ꋽ\377ǿ������֏�\377����������ư��ϵ��ӯ������������ѥ�ћ����߾Ὼ�����\377�\r\n"
+	"��ļ�����������������ꠐ舂К���Ϋۺ됄��ڷ������������ƣ��ܾ��̧���ՠ�֖���޻\r\n"
+	"�ޯ������䧔������횭���������������ޟỡ���������䎤夌��Й��ܦ��蓌��\r\n"
+	"�����������ޛ砨�ﳝ���ʰ�����������������������ึ�����˹޸����\r\n"
+	"����������֭�����\377�\377����Ї������ɖ����ơĈ��Ҭ���ƌ�€���]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [A@0+84 Tabulka v horn� ��sti dialogu slou�� k v�b�ru stylu \r\n"
+	"��ry. V obd�ln�kov�m poli jsou uspo��d�ny n�hledy v�ech dostupn�ch \r\n"
+	"styl� �ar. Dvojit�m kliknut�m na n�hled ��ry vyberete styl ��ry \r\n"
+	"pro dal�� pou�it� v m�st�, odkud byl dialog vyvol�n (odpov�d� \r\n"
+	"funkci tla��tka ]\r\n"
+	"@@GIF:343*99\r\n"
+	"���Ƹ��Ȁ��������ߏ������\377\377\377�������������œ��ˬ�����ڋ﯋�����ȯ��������������\r\n"
+	"�����߲ț��п���̂������ʧԠ�����ׂ��[A@0+84 ). Prav�m tla��tkem m��ete zobrazit \r\n"
+	"lok�ln� nab�dku funkc� pro pr�ci se styly �ar`:]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n")
+HELP_END
diff --git a/uppsrc/Geom/Ctrl/pathCtrl.cpp b/uppsrc/Geom/Ctrl/pathCtrl.cpp
new file mode 100644
index 000000000..dd1c58e5b
--- /dev/null
+++ b/uppsrc/Geom/Ctrl/pathCtrl.cpp
@@ -0,0 +1,2353 @@
+#include "GeomCtrl.h"
+#pragma hdrstop
+
+NAMESPACE_UPP
+
+#define LAYOUTFILE <Geom/Ctrl/pathedit.lay>
+#include           <CtrlCore/lay.h>
+
+#define IMAGEFILE  <Geom/Ctrl/pathedit.iml>
+#define IMAGECLASS PathImg
+#include           <Draw/iml.h>
+
+class DlgPathStyleSetup
+{
+public:
+	typedef DlgPathStyleSetup CLASSNAME;
+	DlgPathStyleSetup();
+
+	bool Run(PathStyleMisc& style);
+
+	void PutHelp();
+
+private:
+	void Pump(PathStyleMisc& style, bool write);
+	void OnMiter();
+
+private:
+//	WithHelp<
+	WithPathStyleSetupLayout<TopWindow>
+//	>
+	dialog;
+};
+
+bool RunDlgPathStyleSetup(PathStyleMisc& style) { return DlgPathStyleSetup().Run(style); }
+
+RegisterHelpTopicObjectTitle(DlgPathStyleSetup, "Vlastnosti stylu")
+
+DlgPathStyleSetup::DlgPathStyleSetup()
+{
+	CtrlLayoutOKCancel(dialog, DlgPathStyleSetupHelpTitle());
+	dialog.HelpTopic("DlgPathStyleSetup");
+	dialog.width.MinMax(0.001, 20);
+	dialog.begin.MinMax(0, 100);
+	dialog.segment.MinMax(0, 100);
+	dialog.end.MinMax(0, 100);
+	dialog.miter.Hide();
+	dialog.miter.GetPrev()->Hide();
+	dialog.miter.Add(PathStyle::MITER_ROUND, "zaoblit");
+	dialog.miter.Add(PathStyle::MITER_SHARP, "ostr� roh");
+	dialog.miter.Add(PathStyle::MITER_FLAT,  "zkosit");
+	dialog.miter <<= THISBACK(OnMiter);
+	dialog.chamfer.NotNull().MinMax(0, 5);
+}
+
+bool DlgPathStyleSetup::Run(PathStyleMisc& style)
+{
+	Pump(style, false);
+	OnMiter();
+	if(dialog.Run() != IDOK)
+		return false;
+	Pump(style, true);
+	return true;
+}
+
+void DlgPathStyleSetup::OnMiter()
+{
+	dialog.chamfer.Enable((int)~dialog.miter == PathStyle::MITER_SHARP);
+	if(dialog.chamfer.IsEnabled() && dialog.chamfer.GetText().IsEmpty())
+		dialog.chamfer <<= STD_CHAMFER;
+}
+
+void DlgPathStyleSetup::Pump(PathStyleMisc& style, bool write)
+{
+	UPP::Pump pump;
+	pump
+		<< PumpData(style.width,   dialog.width)
+		<< PumpData(style.begin,   dialog.begin)
+		<< PumpData(style.segment, dialog.segment)
+		<< PumpData(style.end,     dialog.end)
+		<< PumpData(style.miter,   dialog.miter);
+	if(style.miter == style.MITER_SHARP)
+		pump << PumpData(style.chamfer, dialog.chamfer);
+	pump << write;
+}
+
+static double CalcDecadicStep(double scale, int minfine, int mincoarse, int& fine)
+{
+	double mu = mincoarse / scale;
+	if(mu <= 1e-20)
+	{
+		fine = 0;
+		return Null;
+	}
+	int exp = ffloor(log10(mu));
+	double lo = pow(10.0, exp);
+	int tc = (lo * 5 <= mu ? 5 : lo * 2 <= mu ? 2 : 1);
+	double mf = scale * lo * tc / minfine;
+	int tf = 1;
+	while(tf < 100 && mf >= 10)
+		mf /= 10, tf *= 10;
+	if(tf <= tc)
+		tf = 1;
+	else
+		tf *= (mf >= 5 && tc != 2 ? 5 : mf >= 2 && tc != 5 ? 2 : 1);
+	fine = tf;
+	return lo * tc;
+}
+
+//////////////////////////////////////////////////////////////////////
+// DlgPathEditorSetup::
+
+class DlgPathEditorSetup
+{
+public:
+	typedef DlgPathEditorSetup CLASSNAME;
+	DlgPathEditorSetup();
+
+	bool Run(PathEditorCtrl::Setup& setup);
+	void PutHelp();
+
+private:
+	void Pump(PathEditorCtrl::Setup& setup, bool write);
+
+private:
+//	WithHelp<
+	WithPathEditorSetupLayout<TopWindow>
+//	>
+	dialog;
+};
+
+bool RunDlgPathEditorSetup(PathEditorCtrl::Setup& setup) { return DlgPathEditorSetup().Run(setup); }
+
+RegisterHelpTopicObjectTitle(DlgPathEditorSetup, "Vlastnosti editoru")
+
+DlgPathEditorSetup::DlgPathEditorSetup()
+{
+	CtrlLayoutOKCancel(dialog, DlgPathEditorSetupHelpTitle());
+	dialog.HelpTopic("DlgPathEditorSetup");
+	dialog.grid.MinMax(1e-5, 100);
+	dialog.snap.MinMax(1e-5, 100);
+}
+
+bool DlgPathEditorSetup::Run(PathEditorCtrl::Setup& setup)
+{
+	Pump(setup, false);
+	if(dialog.Run() != IDOK)
+		return false;
+	Pump(setup, true);
+	return true;
+}
+
+void DlgPathEditorSetup::Pump(PathEditorCtrl::Setup& setup, bool write)
+{
+	UPP::Pump pump;
+	pump
+		<< PumpEnumData(setup.do_grid,   dialog.do_grid)
+		<< PumpData    (setup.grid,      dialog.grid)
+		<< PumpEnumData(setup.do_snap,   dialog.do_snap)
+		<< PumpData    (setup.snap,      dialog.snap)
+		<< PumpEnumData(setup.do_ruler,  dialog.do_ruler)
+		<< PumpEnumData(setup.do_axis,   dialog.do_axis)
+		<< write;
+}
+
+//////////////////////////////////////////////////////////////////////
+// PathEditorCtrl::Setup::
+
+void PathEditorCtrl::Setup::Serialize(Stream& stream)
+{
+	int version = StreamHeading(stream, 4, 4, 4, "PathEditorCtrl::Setup");
+	if(version >= 1)
+	{
+		stream.Pack(do_grid, do_snap, do_ruler, do_axis);
+		stream % grid % snap / sample_size / sample_width;
+	}
+}
+
+//////////////////////////////////////////////////////////////////////
+// PathEditorCtrl::ViewPlotter::
+
+PathEditorCtrl::ViewPlotter::ViewPlotter(PathEditorCtrl *ctrl)
+: draw(ctrl)
+{
+	Set(draw, ctrl->GetScale(), ctrl->GetDelta(), 10);
+	PathMap(&PathStyleMap::App());
+}
+
+PathEditorCtrl::PathEditorCtrl()
+: style(0)
+{
+	edit_mode = EDIT_NORMAL;
+	drag_mode = DRAG_NONE;
+	SetFrame(InsetFrame());
+	zoom_horz_in  .SetImage(PathImg::view_zoom_in());
+	zoom_vert_in  .SetImage(PathImg::view_zoom_in());
+	zoom_horz_out .SetImage(PathImg::view_zoom_out());
+	zoom_vert_out .SetImage(PathImg::view_zoom_out());
+	zoom_horz_full.SetImage(PathImg::view_zoom_horz_full());
+	zoom_vert_full.SetImage(PathImg::view_zoom_vert_full());
+	zoom_full     .SetImage(PathImg::view_zoom_full());
+	zoom_horz_in   <<= THISBACK(OnViewZoomHorzIn);
+	zoom_horz_out  <<= THISBACK(OnViewZoomHorzOut);
+	zoom_vert_in   <<= THISBACK(OnViewZoomVertIn);
+	zoom_vert_out  <<= THISBACK(OnViewZoomVertOut);
+	zoom_horz_full <<= THISBACK(OnViewZoomHorzFull);
+	zoom_vert_full <<= THISBACK(OnViewZoomVertFull);
+	zoom_full      <<= THISBACK(OnViewZoomFull);
+	sample_size_tag.SetLabel("Uk�zka: ");
+	sample_size.Add(0,  "skr�t");
+	sample_size.Add(40, "mal�");
+	sample_size.Add(70, "st�edn�");
+	sample_size.Add(100, "velk�");
+//	sample_size.SetRect(LayoutZoom(80, 0));
+	sample_size <<= 40;
+	sample_size <<= THISBACK(OnSampleSize);
+	sample_width_tag.SetLabel("���ka: ");
+	sample_width.NotNull().MinMax(0, MAX_WIDTH);
+	sample_width <<= THISBACK(OnSampleWidth);
+	sample_width <<= 2;
+//	sample_width.SetRect(LayoutZoom(40, 0));
+	zoom_horz_in.NoWantFocus();
+	zoom_horz_out.NoWantFocus();
+	zoom_horz_full.NoWantFocus();
+	zoom_vert_in.NoWantFocus();
+	zoom_vert_out.NoWantFocus();
+	zoom_vert_full.NoWantFocus();
+	zoom_full.NoWantFocus();
+	AddFrame(*this);
+	hruler.Horz();
+	vruler.Vert();
+	hruler.SetZoom(500, 0);
+	hruler.MinMax(0, 20);
+//	hruler.Units(1, 5);
+	vruler.SetZoom(500, 0);
+	vruler.MinMax(-5, 5);
+//	vruler.Units(1, 5);
+	hscroll <<= vscroll <<= THISBACK(OnScroll);
+	hscroll.NoAutoDisable();
+	vscroll.NoAutoDisable();
+}
+
+void PathEditorCtrl::FrameLayout(Rect& rc)
+{
+	if(!style)
+		return;
+
+	outer_sample = rc;
+	rc.right -= setup.sample_size;
+	rc.bottom -= setup.sample_size;
+	inner_sample = rc;
+
+	Size avail = rc.Size();
+	int box = ScrollBarSize();
+	int rsz = RulerCtrl::GetStdWidth();
+	if(setup.do_ruler)
+		avail -= rsz;
+	double pwd = hruler.GetLength() * hruler.GetScale() + 2 * GAP + HGAP;
+	double pht = vruler.GetLength() * vruler.GetScale() + 2 * GAP;
+	zoom_horz_in.SetFrameRect(rc.left, rc.bottom - box, box, box);
+	hscroll.SetFrameRect(rc.left + box, rc.bottom - box, rc.Width() - 4 * box, box);
+	zoom_horz_out.SetFrameRect(rc.right - 3 * box, rc.bottom - box, box, box);
+	zoom_horz_full.SetFrameRect(rc.right - 2 * box, rc.bottom - box, box, box);
+	hscroll.Set(hscroll, avail.cx - box, fround(pwd));
+	zoom_vert_in.SetFrameRect(rc.right - box, rc.top, box, box);
+	vscroll.SetFrameRect(rc.right - box, rc.top + box, box, rc.Height() - 4 * box);
+	zoom_vert_out.SetFrameRect(rc.right - box, rc.bottom - 3 * box, box, box);
+	zoom_vert_full.SetFrameRect(rc.right - box, rc.bottom - 2 * box, box, box);
+	vscroll.Set(vscroll, avail.cy - box, fround(pht));
+	zoom_full.SetFrameRect(rc.right - box, rc.bottom - box, box, box);
+	rc.right  -= box;
+	rc.bottom -= box;
+	if(setup.do_ruler)
+	{
+		hruler.SetFrameRect(rc.left + rsz, rc.top, rc.Width() - rsz, rsz);
+		vruler.SetFrameRect(rc.left, rc.top + rsz, rsz, rc.Height() - rsz);
+		rc.left += rsz;
+		rc.top += rsz;
+	}
+}
+
+void PathEditorCtrl::FrameAddSize(Size& sz)
+{
+	if(!style)
+		return;
+	int box = ScrollBarSize();
+	int rsz = RulerCtrl::GetStdWidth();
+	if(setup.do_ruler)
+		sz += rsz;
+	sz += box;
+}
+
+static void PaintSamplePath(PathDraw& path, const Rect& mid)
+{
+	path.MoveTo(mid.left, mid.bottom);
+	path.LineTo(mid.left + 20, mid.bottom);
+	path.LineTo(mid.left + 40, mid.bottom - 10);
+	path.LineTo(mid.left + 50, mid.bottom + 10);
+	path.LineTo(mid.left + 70, mid.bottom);
+	if(mid.Width() >= 200)
+	{
+		path.LineTo(mid.left + 100, mid.bottom);
+		path.LineTo(mid.left + 130, mid.bottom - 10);
+		path.LineTo(mid.left + 170, mid.bottom + 10);
+		path.LineTo(mid.left + 200, mid.bottom);
+	}
+	if(mid.Width() >= 300)
+	{
+		path.LineTo(mid.left + 240, mid.bottom - 10);
+		path.LineTo(mid.left + 250, mid.bottom + 10);
+		path.LineTo(mid.left + 260, mid.bottom - 10);
+		path.LineTo(mid.left + 300, mid.bottom);
+	}
+	path.LineTo(mid.right, mid.bottom);
+	path.LineTo(mid.right, mid.bottom - 20);
+	path.LineTo(mid.right - 10, mid.bottom - 40);
+	path.LineTo(mid.right + 10, mid.bottom - 50);
+	path.LineTo(mid.right, mid.bottom - 70);
+	if(mid.Height() >= 200)
+	{
+		path.LineTo(mid.right,      mid.bottom - 100);
+		path.LineTo(mid.right - 10, mid.bottom - 130);
+		path.LineTo(mid.right + 10, mid.bottom - 170);
+		path.LineTo(mid.right,      mid.bottom - 200);
+	}
+	path.LineTo(mid.right, mid.top);
+	path.Paint();
+}
+
+void PathEditorCtrl::FramePaint(Draw& draw, const Rect& r)
+{
+	Rect rc = r;
+	if(setup.sample_size > 0)
+	{
+		PumpTraces(true);
+		draw.Clip(outer_sample);
+		draw.ExcludeClip(inner_sample);
+		draw.DrawRect(outer_sample, SLtGray);
+		PathDraw path(draw, *style, Black, setup.sample_width);
+		int half = setup.sample_size >> 1;
+		Rect mid(outer_sample.left + 10, outer_sample.top + 10,
+			(outer_sample.right  + inner_sample.right)  >> 1,
+			(outer_sample.bottom + inner_sample.bottom) >> 1);
+		PaintSamplePath(path, mid);
+		if(setup.do_axis)
+		{
+			path.Set(draw, PathStyle::solid(), LtRed, 0);
+			PaintSamplePath(path, mid);
+		}
+		draw.End();
+		rc = inner_sample;
+	}
+	if(setup.do_ruler)
+	{
+		int r = RulerCtrl::GetStdWidth();
+		draw.DrawRect(rc.left, rc.top, r, r, SGray);
+	}
+	Size scb(vscroll.GetRect().Width(), hscroll.GetRect().Height());
+	if(scb.cx && scb.cy)
+		draw.DrawRect(rc.right - scb.cx, rc.bottom - scb.cy, scb.cx, scb.cy, SGray);
+}
+
+void PathEditorCtrl::FrameAdd(Ctrl& ctrl)
+{
+	ctrl << hruler << vruler << (Ctrl &)hscroll << (Ctrl &)vscroll
+		<< zoom_horz_in << zoom_horz_out << zoom_horz_full
+		<< zoom_vert_in << zoom_vert_out << zoom_vert_full
+		<< zoom_full;
+}
+
+void PathEditorCtrl::FrameRemove()
+{
+	hruler.Remove();
+	vruler.Remove();
+	hscroll.Remove();
+	vscroll.Remove();
+	zoom_horz_in.Remove();
+	zoom_horz_out.Remove();
+	zoom_horz_full.Remove();
+	zoom_vert_in.Remove();
+	zoom_vert_out.Remove();
+	zoom_vert_full.Remove();
+	zoom_full.Remove();
+}
+
+static inline bool PathStyleTraceLeftLess(const PathStyle::Trace& a, const PathStyle::Trace& b)
+{ return a.left < b.left; }
+
+void PathEditorCtrl::PumpTraces(bool write)
+{
+	if(write)
+	{
+		style->traces <<= traces;
+		Sort(style->traces, &PathStyleTraceLeftLess);
+	}
+	else
+	{
+		selection.Clear();
+		traces <<= style->traces;
+	}
+}
+
+void PathEditorCtrl::Layout()
+{
+	if(!style)
+		return;
+	Size size = GetSize();
+	double cx = style->begin + style->segment + style->end, cy = style->width / 2;
+	int fine;
+	double dstep = CalcDecadicStep(hruler.GetScale(), 5, 100, fine);
+	hruler.MinMax(0, cx);
+	hruler.SetTextStep(dstep);
+	hruler.SetSmallStep(dstep / fine);
+	vruler.MinMax(-cy, cy);
+	dstep = CalcDecadicStep(vruler.GetScale(), 5, 100, fine);
+	vruler.SetTextStep(dstep);
+	vruler.SetSmallStep(dstep / fine);
+/*	if(cx * hruler.GetScale() <= size.cx)
+		hruler.SetZoomDelta(GAP);
+	if(style->width * vruler.GetScale() <= size.cy)
+		vruler.Delta(GAP + cy * vruler.GetScale());
+*/	OnScroll();
+	Refresh();
+}
+
+void PathEditorCtrl::UpdateScroll()
+{
+	Size size = GetSize();
+	double pwd = hruler.GetLength() * hruler.GetScale() + 2 * GAP + HGAP;
+	double pht = vruler.GetLength() * vruler.GetScale() + 2 * GAP;
+	hruler.SetZoom(hruler.GetScale(), pwd <= size.cx ? GAP : minmax(hruler.GetDelta(), size.cx - double(GAP) - pwd, double(GAP)));
+	double t = style->width / 2 * vruler.GetScale();
+	vruler.SetZoom(vruler.GetScale(), pht <= size.cy ? pht / 2 : minmax(vruler.GetDelta(), size.cy - double(GAP) - t, double(GAP) + t));
+	int hpos = GAP - fround(hruler.GetDelta());
+	int vpos = GAP + fround(style->width * vruler.GetScale() / 2 - vruler.GetDelta());
+	Layout();
+	hscroll = hpos;
+	vscroll = vpos;
+	OnScroll();
+	Refresh();
+}
+
+void PathEditorCtrl::OnScroll()
+{
+	double dx = hruler.GetDelta(), dy = vruler.GetDelta();
+	if(!hscroll.GetRect().IsEmpty())
+		dx = GAP - (int)hscroll;
+	if(!vscroll.GetRect().IsEmpty())
+		dy = GAP + style->width * vruler.GetScale() / 2 - (int)vscroll;
+	if(dx != hruler.GetDelta() || dy != vruler.GetDelta())
+	{
+		hruler.SetZoom(hruler.GetScale(), dx);
+		vruler.SetZoom(vruler.GetScale(), dy);
+		Refresh();
+	}
+}
+
+void PathEditorCtrl::UpdateSetup()
+{
+	sample_size <<= setup.sample_size;
+	sample_width <<= setup.sample_width;
+	Layout();
+	sample_width.Enable(setup.sample_size > 0);
+}
+
+void PathEditorCtrl::OnSampleSize()
+{
+	setup.sample_size = ~sample_size;
+	Layout();
+	sample_width.Enable(setup.sample_size > 0);
+}
+
+void PathEditorCtrl::OnSampleWidth()
+{
+	setup.sample_width = ~sample_width;
+	UpdateSample();
+}
+
+static void PaintSizeBreak(PlotterTool& tool, double x, double y, Pointf size)
+{
+	tool.MoveTo(x, -y + size.y);
+	tool.LineTo(x - size.x, -y);
+	tool.LineTo(x + size.x, -y);
+	tool.LineTo(x, -y + size.y);
+	tool.LineTo(x, y - size.y);
+	tool.LineTo(x + size.x, y);
+	tool.LineTo(x - size.x, y);
+	tool.LineTo(x, y - size.y);
+	tool.Paint();
+}
+
+void PathEditorCtrl::Paint(Draw& draw)
+{
+	Rectf full = GetFullExtent();
+	Rectf vis = ClientToUnits(draw.GetClip()) & full;
+	Rect cvis = UnitsToClient(vis) & draw.GetClip();
+	DrawRectMinusRect(draw, draw.GetClip(), cvis, SGray);
+	if(cvis.IsEmpty())
+		return;
+	draw.Clip(cvis);
+	draw.DrawRect(cvis, White);
+	if(setup.do_grid && setup.grid >= 1e-10)
+	{
+		double s = setup.grid;
+		while(s * hruler.GetScale() < 4)
+			s *= 10;
+		int l, h;
+		for(l = ffloor(vis.left / s), h = fceil(vis.right / s); l <= h; l++)
+		{
+			Point top = UnitsToClient(Pointf(l * s, vis.top));
+			draw.DrawRect(top.x, cvis.top, 1, cvis.Height(), LtGray);
+		}
+		s = setup.grid;
+		while(s * vruler.GetScale() < 4)
+			s *= 10;
+		for(l = ffloor(vis.top / s), h = fceil(vis.bottom / s); l <= h; l++)
+		{
+			Point left = UnitsToClient(Pointf(vis.left, l * s));
+			draw.DrawRect(cvis.left, left.y, cvis.Width(), 1, LtGray);
+		}
+	}
+	Plotter plotter;
+	plotter.Set(draw, GetScale(), GetDelta(), 10);
+	plotter.PathMap(&PathStyleMap::App());
+	AreaTool area;
+	PathTool path;
+	for(int i = 0; i < traces.GetCount(); i++)
+	{
+		const PathStyle::Trace& trace = traces[i];
+		int s = (selection.Find(i) >= 0 ? i == selection.Top() ? 2 : 1 : 0);
+		Color color = Nvl(trace.color, Black);
+		Color outline = (s == 0 ? color : s == 1 ? LtBlue : Color(192, 192, 255));
+		if(trace.IsAreaEmpty())
+		{
+			path.Set(plotter, ".dot", outline, 3);
+			if(path.SetExtent(trace.GetExtent()))
+				trace.Paint(path, true, outline);
+		}
+		else
+		{
+			area.Set(plotter, Nvl(trace.color, Black), INT64(0xaa55aa55aa55aa55), Null, outline, 3);
+			if(area.SetExtent(trace.GetExtent()))
+				trace.Paint(area, false, outline);
+		}
+	}
+	draw.End();
+	{ // draw begin & end bar
+		Pointf size = Pointf(16, 16) / GetScale();
+		AreaTool area;
+		area.Set(plotter, LtGreen, 0, Null, Green, 2);
+		double x = style->begin;
+		double h = style->width / 2;
+		PaintSizeBreak(area, x, h, size);
+		x += style->segment;
+		PaintSizeBreak(area, x, h, size);
+		x += style->end;
+		PaintSizeBreak(area, x, h, size);
+	}
+	if(!selection.IsEmpty())
+	{
+		const PathStyle::Trace& trace = traces[selection.Top()];
+		Pointf list[] =
+		{
+			trace.LeftTop(), trace.CenterTop(), trace.RightTop(),
+			trace.LeftCenter(), trace.RightCenter(),
+			trace.LeftBottom(), trace.CenterBottom(), trace.RightBottom(),
+		};
+		for(int i = 0; i < __countof(list); i++)
+			if(vis.Contains(list[i]))
+			{
+				enum { DELTA = 3 };
+				Point pt = UnitsToClient(list[i]);
+				Rect rc(pt.x - DELTA, pt.y - DELTA, pt.x + DELTA + 1, pt.y + DELTA + 1);
+				draw.DrawRect(rc, LtRed);
+				rc.Inflate(1);
+				DrawFrame(draw, rc, White, Black);
+			}
+	}
+}
+
+Image PathEditorCtrl::CursorImage(Point pt, dword keyflags)
+{
+	switch(edit_mode)
+	{
+	case EDIT_ZOOM: return PathImg::drag_zoom_cursor();
+	case EDIT_PAN:  return PathImg::drag_pan_cursor();
+	}
+	if(IsDragging())
+		switch(drag_mode)
+		{
+		default: NEVER();
+		case DRAG_SELECT: return Image::Arrow();
+		case DRAG_BEGIN:
+		case DRAG_SEGMENT:
+		case DRAG_END:    return Image::SizeHorz();
+		case DRAG_INSERT: return PathImg::drag_insert_cursor();
+		case DRAG_TRACK:  return PathStyle::Trace::GetTrackCursor(track_style);
+		case DRAG_MOVE:   return Image::SizeAll();
+		}
+	Pointf up = ClientToUnits(pt), start;
+	int i = GetTrackStyle(up, start);
+	if(i)
+		return PathStyle::Trace::GetTrackCursor(i);
+	if(GetDragSize(up))
+		return Image::SizeHorz();
+	i = FindObject(up);
+	if(i >= 0 && selection.Find(i) >= 0)
+		return Image::SizeAll(); // move
+	return Image::Arrow();
+}
+
+int PathEditorCtrl::AddObject(const PathStyle::Trace& trace)
+{
+	int i = traces.GetCount();
+	traces.Add(trace);
+	RefreshObject(i);
+	Update();
+	UpdateSample();
+	return i;
+}
+
+void PathEditorCtrl::SetObject(int i, const PathStyle::Trace& trace)
+{
+	RefreshObject(i);
+	traces[i] = trace;
+	RefreshObject(i);
+	Update();
+	UpdateSample();
+}
+
+void PathEditorCtrl::UpdateSample()
+{
+	if(setup.sample_size > 0)
+	{
+		RefreshFrame(Rect(outer_sample.left,  outer_sample.top,    outer_sample.right, inner_sample.top));
+		RefreshFrame(Rect(outer_sample.left,  inner_sample.bottom, outer_sample.right, outer_sample.bottom));
+		RefreshFrame(Rect(outer_sample.left,  inner_sample.top,    outer_sample.right, inner_sample.bottom));
+		RefreshFrame(Rect(inner_sample.right, inner_sample.top,    outer_sample.right, inner_sample.bottom));
+	}
+}
+
+void PathEditorCtrl::RefreshObject(int item)
+{
+	if(item >= 0 && item < traces.GetCount())
+	{
+		const PathStyle::Trace& trace = traces[item];
+		Rectf rc(trace.left, min(trace.left_top, trace.right_top), trace.right, max(trace.left_bottom, trace.right_bottom));
+		Rect cl = UnitsToClient(rc);
+		cl.Inflate(selection.Find(item) >= 0 ? 10 : 5);
+		Refresh(cl);
+	}
+}
+
+bool PathEditorCtrl::WriteClipboard()
+{
+	if(!IsSelection())
+		return false; // no-op
+	PathStyle::Clip clip;
+	for(int i = 0; i < selection.GetCount(); i++)
+		clip.traces.Add(traces[selection[i]]);
+	clip.Write();
+	return true;
+//	return clip.Write();
+}
+
+bool PathEditorCtrl::ReadClipboard()
+{
+	PathStyle::Clip clip;
+	if(!clip.Read())
+		return false;
+	Rectf extent = clip.GetExtent();
+	Rectf full = GetFullExtent();
+	bool setwd = false, setsg = false;
+	if(extent.top < full.top || extent.bottom > full.bottom)
+	{
+		int r = PromptYesNoCancel("Vybran� objekty p�esahuj� limit dan� ���kou ��ry. "
+			"Chcete ���ku ��ry upravit?");
+		if(r < 0)
+			return true;
+		setwd = !!r;
+	}
+	if(extent.right > full.right)
+	{
+		int r = PromptYesNoCancel("Vybran� objekty p�esahuj� limit dan� d�lkou segmentu. "
+			"Chcete d�lku segmentu upravit?");
+		if(r < 0)
+			return true;
+		setsg = !!r;
+	}
+
+	if(setwd)
+		style->width = max(style->width, max(-extent.top, extent.bottom));
+
+	if(setsg)
+		style->segment += full.right - extent.right;
+
+	ClearSelection();
+	int c = traces.GetCount();
+	Append(traces, clip.traces);
+	Vector<int> to_add;
+	while(c < traces.GetCount())
+		to_add.Add(c++);
+	AddSelection(to_add);
+
+	if(setwd || setsg)
+		Layout();
+	UpdateSample();
+	return true;
+}
+
+Rectf PathEditorCtrl::GetFullExtent() const
+{
+	return Rectf(0, -style->width / 2,
+		style->begin + style->segment + style->end, style->width / 2);
+}
+
+Rectf PathEditorCtrl::GetSelectionExtent() const
+{
+	if(selection.IsEmpty())
+		return Null;
+	Rectf rc = traces[selection[0]].GetExtent();
+	for(int i = 1; i < selection.GetCount(); i++)
+		rc |= traces[selection[i]].GetExtent();
+	return rc;
+}
+
+int PathEditorCtrl::GetSelectionLeader() const
+{
+	return selection.IsEmpty() ? -1 : selection.Top();
+}
+
+void PathEditorCtrl::AddSelection(const Vector<int>& list)
+{
+	int old = GetSelectionLeader();
+	for(int i = 0; i < list.GetCount(); i++)
+		if(selection.Find(list[i]) < 0)
+		{
+			RefreshObject(list[i]);
+			selection.Add(list[i]);
+		}
+	RefreshObject(old);
+	WhenRescan();
+}
+
+void PathEditorCtrl::XorSelection(const Vector<int>& list)
+{
+	int old_leader = GetSelectionLeader();
+	for(int i = 0; i < list.GetCount(); i++)
+	{
+		RefreshObject(list[i]);
+		int pos = selection.Find(list[i]);
+		if(pos >= 0)
+			selection.Remove(pos);
+		else
+			selection.Add(list[i]);
+	}
+	int new_leader = GetSelectionLeader();
+	if(new_leader != old_leader)
+	{
+		RefreshObject(old_leader);
+		RefreshObject(new_leader);
+	}
+	WhenRescan();
+}
+
+void PathEditorCtrl::RemoveSelection(const Vector<int>& list)
+{
+	int count = selection.GetCount();
+	for(int i = 0; i < list.GetCount(); i++)
+	{
+		int pos = selection.Find(list[i]);
+		if(pos >= 0)
+		{
+			RefreshObject(list[i]);
+			selection.Remove(pos);
+		}
+	}
+	if(selection.GetCount() != count && !selection.IsEmpty())
+		RefreshObject(selection.Top());
+	WhenRescan();
+}
+
+void PathEditorCtrl::RefreshSelection()
+{
+	for(int i = 0; i < selection.GetCount(); i++)
+		RefreshObject(selection[i]);
+}
+
+void PathEditorCtrl::ClearSelection()
+{
+	RefreshSelection();
+	selection.Clear();
+	WhenRescan();
+}
+
+void PathEditorCtrl::SetSelection(const Vector<int>& list)
+{
+	ClearSelection();
+	Append(selection, list);
+//	selection <<= list;
+	RefreshSelection();
+	WhenRescan();
+}
+
+Pointf PathEditorCtrl::ClientToUnits(Point pt) const
+{
+	return Pointf(hruler.FromClient(pt.x), vruler.FromClient(pt.y));
+}
+
+Point PathEditorCtrl::UnitsToClient(Pointf pt) const
+{
+	return Point(hruler.ToClient(pt.x), vruler.ToClient(pt.y));
+}
+
+Rectf PathEditorCtrl::ClientToUnits(const Rect& rc) const
+{
+	return SortRectf(ClientToUnits(rc.TopLeft()), ClientToUnits(rc.BottomRight()));
+}
+
+Rect PathEditorCtrl::UnitsToClient(const Rectf& rc) const
+{
+	return RectSort(UnitsToClient(rc.TopLeft()), UnitsToClient(rc.BottomRight()));
+}
+
+Pointf PathEditorCtrl::Snap(Pointf pt) const
+{
+	if(IsNull(pt) || !setup.do_snap || setup.snap <= 1e-10)
+		return pt;
+	return Pointf(floor(pt.x / setup.snap + 0.5) * setup.snap, floor(pt.y / setup.snap + 0.5) * setup.snap);
+}
+
+Pointf PathEditorCtrl::ClientToSnap(Point pt) const
+{
+	return Snap(ClientToUnits(pt));
+}
+
+bool PathEditorCtrl::Key(dword key, int repcnt)
+{
+	Size shift(0, 0);
+	switch(key)
+	{
+	case K_ADD:      if(setup.sample_width < MAX_WIDTH) { sample_width <<= ++setup.sample_width; UpdateSample(); } return true;
+	case K_SUBTRACT: if(setup.sample_width > 0)         { sample_width <<= --setup.sample_width; UpdateSample(); }; return true;
+
+	case K_LEFT:  shift.cx = -1; break;
+	case K_UP:    shift.cy = -1; break;
+	case K_RIGHT: shift.cx = +1; break;
+	case K_DOWN:  shift.cy = +1; break;
+
+	default:
+		return DragDropCtrl::Key(key, repcnt);
+	}
+
+	if((shift.cx | shift.cy) && IsSelection())
+	{
+		Rectf ext = GetSelectionExtent();
+		Rectf full = GetFullExtent();
+		Pointf snap(setup.snap, setup.snap);
+		if(!setup.do_snap || setup.snap <= 1e-10)
+			snap = Pointf(1, 1) / GetScale();
+		Pointf step = snap * shift;
+		Pointf lt = traces[GetSelectionLeader()].LeftTop();
+		if(step.x)
+			step.x = snap.x * floor((lt.x + step.x) / snap.x + 0.5) - lt.x;
+		if(step.y)
+			step.y = snap.y * floor((lt.y + step.y) / snap.y + 0.5) - lt.y;
+		for(int i = 0; i < selection.GetCount(); i++)
+			SetObject(selection[i], traces[selection[i]].GetMove(step));
+	}
+
+	return true;
+}
+
+bool PathEditorCtrl::Push(Point pt, dword keyflags)
+{
+	if(edit_mode == EDIT_ZOOM)
+	{
+		drag_mode = DRAG_ZOOM;
+		return true;
+	}
+	if(edit_mode == EDIT_PAN)
+	{
+		track_start = GetDelta();
+		drag_mode = DRAG_PAN;
+		return true;
+	}
+
+	track_limit = GetFullExtent();
+
+	Pointf up = ClientToUnits(pt);
+	if(track_style = GetTrackStyle(up, track_start))
+	{
+		drag_mode = DRAG_TRACK;
+		return true;
+	}
+	int i = FindObject(up);
+	if(i < 0)
+	{
+		if((drag_mode = GetDragSize(up)) == 0)
+			drag_mode = (keyflags & (K_SHIFT | K_CTRL) ? DRAG_SELECT : DRAG_INSERT);
+		return true;
+	}
+	if(keyflags & K_CTRL)
+		XorSelection(i);
+	else if(keyflags & K_SHIFT)
+	{
+		RemoveSelection(i);
+		AddSelection(i);
+	}
+	else if(selection.Find(i) < 0)
+		SetSelection(i);
+	track_start = traces[i].LeftTop();
+	drag_mode = DRAG_MOVE;
+	Rectf rc = GetSelectionExtent();
+	track_limit.left   -= rc.left;
+	track_limit.top    -= rc.top;
+	track_limit.right  -= rc.right;
+	track_limit.bottom -= rc.bottom;
+	return true;
+}
+
+void PathEditorCtrl::MouseMove(Point pt, dword keyflags)
+{
+	Pointf up = ClientToSnap(pt);
+//	hruler.Mouse(up.x);
+	hruler.Sync();
+//	vruler.Mouse(up.y);
+	vruler.Sync();
+	if(coords)
+	{
+		String s;
+		s << "x = " << up.x << ", y = " << up.y;
+		*coords <<= s;
+		coords->Sync();
+	}
+
+	DragDropCtrl::MouseMove(pt, keyflags);
+}
+
+void PathEditorCtrl::RightDown(Point pt, dword keyflags)
+{
+	Pointf up = ClientToUnits(pt);
+	int i = FindObject(up);
+	if(i >= 0)
+	{
+		RemoveSelection(i);
+		AddSelection(i);
+	}
+	MenuBar::Execute(THISBACK(ToolEdit));
+}
+
+void PathEditorCtrl::Drag(Point pt, Point last, Point next, dword keyflags)
+{
+	ViewPlotter plotter(this);
+	PathTool path;
+	bool drag_size = (drag_mode == DRAG_BEGIN || drag_mode == DRAG_SEGMENT || drag_mode == DRAG_END);
+	path.Set(plotter, ".dot", drag_mode == DRAG_SELECT ? LtRed : drag_size ? Green : LtBlue, 3);
+	Pointf up = ClientToSnap(pt);
+//	int rop = SetROP2(plotter.draw, R2_NOTXORPEN);
+	if(drag_mode == DRAG_INSERT)
+	{
+		if(!IsNull(next))
+			path.Rectangle(SortRectf(up, ClientToSnap(next)) & track_limit, true);
+		if(!IsNull(last))
+			path.Rectangle(SortRectf(up, ClientToSnap(last)) & track_limit, true);
+	}
+	else if(drag_mode == DRAG_SELECT)
+	{
+		up = ClientToUnits(pt);
+		if(!IsNull(next))
+			path.Rectangle(SortRectf(up, ClientToUnits(next)), true);
+		if(!IsNull(last))
+			path.Rectangle(SortRectf(up, ClientToUnits(last)), true);
+	}
+	else if(drag_mode == DRAG_TRACK)
+	{
+		if(IsSelection())
+		{
+			const PathStyle::Trace& base = traces[selection.Top()];
+			if(!IsNull(next))
+				PathStyle::Trace(base).Track(ClientToSnap(next) - track_start, track_style).Bind(track_limit).Paint(path);
+			if(!IsNull(last))
+				PathStyle::Trace(base).Track(ClientToSnap(last) - track_start, track_style).Bind(track_limit).Paint(path);
+		}
+		else
+			NEVER();
+	}
+	else if(drag_mode == DRAG_MOVE)
+	{
+		if(IsSelection())
+		{
+			Size delta = UnitsToClient(track_start) - pt;
+			Pointf un(Null), ul(Null);
+			if(!IsNull(next))
+				un = fpminmax(ClientToSnap(next + delta) - track_start, track_limit);
+			if(!IsNull(last))
+				ul = fpminmax(ClientToSnap(last + delta) - track_start, track_limit);
+			for(int i = 0; i < selection.GetCount(); i++)
+			{
+				const PathStyle::Trace& base = traces[selection[i]];
+				if(!IsNull(next))
+					base.GetMove(un).Paint(path, true);
+				if(!IsNull(last))
+					base.GetMove(ul).Paint(path, true);
+			}
+		}
+		else
+			NEVER();
+	}
+	else if(drag_size)
+	{
+		Pointf size = Pointf(16, 16) / GetScale();
+		if(!IsNull(next))
+		{
+			Pointf un = ClientToSnap(next);
+			PaintSizeBreak(path, un.x, style->width / 2, size);
+		}
+		if(!IsNull(last))
+		{
+			Pointf ul = ClientToSnap(last);
+			PaintSizeBreak(path, ul.x, style->width / 2, size);
+		}
+	}
+	else if(drag_mode == DRAG_ZOOM)
+	{
+		up = ClientToUnits(pt);
+		if(!IsNull(next))
+			path.Rectangle(SortRectf(up, ClientToUnits(next)), true);
+		if(!IsNull(last))
+			path.Rectangle(SortRectf(up, ClientToUnits(last)), true);
+		path.Paint();
+	}
+	else if(drag_mode == DRAG_PAN)
+	{
+		Pointf new_offset = track_start;
+		if(!IsNull(next))
+			new_offset += next - pt;
+		hruler.SetZoom(hruler.GetScale(), new_offset.x);
+		vruler.SetZoom(vruler.GetScale(), new_offset.y);
+		UpdateScroll();
+		if(!IsNull(next))
+			Sync();
+	}
+	else
+		NEVER();
+	path.Paint();
+}
+
+void PathEditorCtrl::Drop(Point pt, Point end, dword keyflags)
+{
+	Pointf up = ClientToSnap(end);
+	if(drag_mode == DRAG_INSERT)
+	{
+		Rectf rc = SortRectf(ClientToSnap(pt), up) & track_limit;
+		if(rc.left == rc.right && rc.top == rc.bottom)
+			return;
+		PathStyle::Trace trace;
+		trace.left = rc.left;
+		trace.right = rc.right;
+		trace.left_top = trace.right_top = rc.top;
+		trace.left_bottom = trace.right_bottom = rc.bottom;
+		SetSelection(AddObject(trace));
+	}
+	else if(drag_mode == DRAG_SELECT)
+	{
+		Rectf rc = SortRectf(ClientToUnits(pt), ClientToUnits(end));
+		Vector<int> list = FindObject(rc);
+		if(keyflags & K_SHIFT)
+			AddSelection(list);
+		else if(keyflags & K_CTRL)
+			XorSelection(list);
+		else
+			SetSelection(list);
+	}
+	else if(drag_mode == DRAG_TRACK)
+	{
+		up -= track_start;
+		if(IsSelection())
+		{
+			int i = selection.Top();
+			SetObject(i, PathStyle::Trace(traces[i]).Track(up, track_style).Bind(track_limit));
+		}
+		else
+			NEVER();
+	}
+	else if(drag_mode == DRAG_MOVE)
+	{
+		Size delta = UnitsToClient(track_start) - pt;
+		up = fpminmax(ClientToSnap(end + delta) - track_start, track_limit);
+		for(int i = 0; i < selection.GetCount(); i++)
+			SetObject(selection[i], traces[selection[i]].GetMove(up));
+	}
+	else if(drag_mode == DRAG_BEGIN || drag_mode == DRAG_SEGMENT || drag_mode == DRAG_END)
+	{
+		double lse = style->begin + style->segment;
+		double le = lse + style->end;
+		switch(drag_mode)
+		{
+		case DRAG_BEGIN:
+			style->begin = max(0.0, up.x);
+			style->segment = max(0.0, lse - style->begin);
+			style->end = max(0.0, le - style->segment - style->begin);
+			break;
+
+		case DRAG_SEGMENT:
+			style->segment = up.x - style->begin;
+			if(style->segment < 0)
+			{
+				style->begin = max(0.0, style->begin + style->segment);
+				style->segment = 0;
+			}
+			style->end = max(0.0, le - style->begin - style->segment);
+			break;
+
+		case DRAG_END:
+			style->end = up.x - style->segment - style->begin;
+			if(style->end < 0)
+			{
+				if(up.x < style->begin)
+					style->begin = max(0.0, up.x);
+				if(up.x < style->begin + style->segment)
+					style->segment = max(0.0, up.x - style->begin);
+				style->end = 0;
+			}
+			break;
+
+		default:
+			NEVER();
+		}
+		Layout();
+		UpdateSample();
+	}
+	else if(drag_mode == DRAG_ZOOM)
+	{
+		Rectf rc = SortRectf(ClientToUnits(pt), ClientToUnits(end));
+		rc &= GetFullExtent();
+		Size client = GetSize();
+		Size avail = max(client - 2 * GAP, Size(1, 1));
+		double ratio = min(avail.cx / max(rc.Width(), 1e-3), avail.cy / max(rc.Height(), 1e-3));
+		hruler.SetZoom(ratio, (client.cx - (rc.left + rc.right)  * ratio) / 2);
+		vruler.SetZoom(ratio, (client.cy - (rc.top  + rc.bottom) * ratio) / 2);
+		UpdateScroll();
+	}
+	else if(drag_mode == DRAG_PAN)
+	{
+		Pointf dest = track_start + Sizef(end - pt);
+		hruler.SetZoom(hruler.GetScale(), dest.x);
+		vruler.SetZoom(vruler.GetScale(), dest.y);
+		UpdateScroll();
+	}
+	else
+		NEVER();
+}
+
+void PathEditorCtrl::Click(Point pt, dword keyflags)
+{
+	if(drag_mode == DRAG_INSERT && !(keyflags & (K_CTRL | K_SHIFT)))
+		ClearSelection();
+}
+
+int PathEditorCtrl::FindObject(Pointf pt) const
+{
+	enum { TOLERANCE = 10 };
+	Pointf inflate = Pointf(TOLERANCE, TOLERANCE) / GetScale();
+	double best = TOLERANCE;
+	int found = -1;
+	for(int i = 0; i < traces.GetCount(); i++)
+	{
+		PathStyle::Trace t = traces[i];
+		t.Inflate(inflate);
+		if(!t.Contains(pt))
+			continue;
+		double d = t.GetDistance(pt);
+		if(d < best)
+		{
+			best = d;
+			found = i;
+		}
+	}
+	return found;
+}
+
+Vector<int> PathEditorCtrl::FindObject(const Rectf& rc) const
+{
+	Vector<int> list;
+	for(int i = 0; i < traces.GetCount(); i++)
+		if(rc.Contains(traces[i].GetExtent()))
+			list.Add(i);
+	return list;
+}
+
+int PathEditorCtrl::GetTrackStyle(Pointf pt, Pointf& track_start) const
+{
+	Pointf tolerance = Pointf(10, 10) / GetScale();
+	return selection.IsEmpty() ? 0
+		: traces[selection.Top()].GetTrackStyle(pt, tolerance, track_start);
+}
+
+int PathEditorCtrl::GetDragSize(Pointf pt) const
+{
+	Pointf tolerance = Pointf(16, 16) / GetScale();
+	double h = style->width / 2;
+	if(pt.y >= -h + tolerance.y && pt.y <= h - tolerance.y)
+		return 0;
+	double db = fabs(pt.x - style->begin);
+	double ds = fabs(pt.x - style->begin - style->segment);
+	double de = fabs(pt.x - style->begin - style->segment - style->end);
+	if(db >= tolerance.x && ds >= tolerance.x && de >= tolerance.x)
+		return 0;
+	return (ds <= db && ds <= de ? DRAG_SEGMENT : de <= db && de <= ds ? DRAG_END : DRAG_BEGIN);
+}
+
+void PathEditorCtrl::ToolEdit(Bar& bar)
+{
+	ToolEditColor(bar);
+	bar.Separator();
+	ToolEditCut(bar);
+	ToolEditCopy(bar);
+	ToolEditPaste(bar);
+	ToolEditDelete(bar);
+	bar.Separator();
+//	bar.Add("Z�kladn�", THISBACK(ToolEditBasic))
+//		.Help("Na��st do editoru jeden ze z�kladn�ch styl� ��r");
+//	bar.Separator();
+	ToolEditSelectAll(bar);
+}
+
+void PathEditorCtrl::ToolEditCopy(Bar& bar)
+{
+	bar.Add(IsSelection(), "Kop�rovat", CtrlImg::copy(), THISBACK(OnEditCopy))
+		.Key(K_CTRL_C) //, K_CTRL_INSERT)
+		.Help("Zkop�rovat vybran� objekty do schr�nky");
+}
+
+void PathEditorCtrl::OnEditCopy()
+{
+	if(IsSelection() && !WriteClipboard())
+		PromptOK("Chyba p�i z�pisu do schr�nky.");
+}
+
+void PathEditorCtrl::ToolEditCut(Bar& bar)
+{
+	bar.Add(IsSelection(), "Vyjmout", CtrlImg::cut(), THISBACK(OnEditCut))
+		.Key(K_CTRL_X) //, K_CTRL_DELETE)
+		.Help("Odstranit vybran� objekty ze stylu a p�esunout je do schr�nky");
+}
+
+void PathEditorCtrl::OnEditCut()
+{
+	if(IsSelection())
+		if(WriteClipboard())
+			OnEditDelete();
+		else
+			PromptOK("Chyba p�i z�pisu do schr�nky.");
+}
+
+void PathEditorCtrl::ToolEditPaste(Bar& bar)
+{
+	bar.Add("Vlo�it", CtrlImg::paste(), THISBACK(OnEditPaste))
+		.Key(K_CTRL_V) //, K_SHIFT_INSERT)
+		.Help("Zkop�rovat vybran� objekty do schr�nky");
+}
+
+void PathEditorCtrl::OnEditPaste()
+{
+	if(IsSelection() && !ReadClipboard())
+		PromptOK("Chyba p�i z�pisu do schr�nky.");
+}
+
+void PathEditorCtrl::ToolEditSelectAll(Bar& bar)
+{
+	bar.Add("Vybrat v�e", THISBACK(OnEditSelectAll))
+		.Key(K_CTRL_A)
+		.Help("Ozna�it v�echny �seky jako vybran�");
+}
+
+void PathEditorCtrl::OnEditSelectAll()
+{
+	ClearSelection();
+	Vector<int> to_add;
+	for(int i = 0; i < traces.GetCount(); i++)
+		to_add.Add(i);
+	AddSelection(to_add);
+}
+
+void PathEditorCtrl::ToolEditColor(Bar& bar)
+{
+	bar.Add(IsSelection(), "Barva...", PathImg::edit_color(), THISBACK(OnEditColor))
+		.Key(K_CTRL_R)
+		.Help("Nastavit barvu vybran�ch objekt�");
+}
+
+void PathEditorCtrl::OnEditColor()
+{
+	if(!IsSelection())
+		return;
+	bool ok;
+	Color c = RunDlgSelectColor(traces[GetSelectionLeader()].color, false, "Barva objekt�...", &ok);
+	if(ok)
+		for(int i = 0; i < selection.GetCount(); i++)
+			SetObject(selection[i], traces[selection[i]].GetTraceColor(c));
+}
+
+void PathEditorCtrl::ToolEditDelete(Bar& bar)
+{
+	bar.Add(IsSelection(), "Smazat", CtrlImg::remove(), THISBACK(OnEditDelete))
+		.Key(K_DELETE)
+		.Help("Smazat vybran� objekty");
+}
+
+void PathEditorCtrl::OnEditDelete()
+{
+	RefreshSelection();
+	Vector<int> sel = selection.PickKeys();
+	selection.Clear();
+	Sort(sel);
+	while(!sel.IsEmpty())
+		traces.Remove(sel.Pop());
+	WhenRescan();
+	Update();
+	UpdateSample();
+}
+
+void PathEditorCtrl::ToolView(Bar& bar)
+{
+	ToolViewZoomIn(bar);
+	ToolViewZoomOut(bar);
+	if(bar.IsMenuBar())
+		ToolViewZoomFull(bar);
+	ToolViewPan(bar);
+	bar.MenuSeparator();
+	ToolViewZoomHorzIn(bar);
+	ToolViewZoomHorzOut(bar);
+	ToolViewZoomVertIn(bar);
+	ToolViewZoomVertOut(bar);
+}
+
+void PathEditorCtrl::ToolViewZoomIn(Bar& bar)
+{
+	bar.Add("Zv�t�it", PathImg::view_zoom_in(), THISBACK(OnViewZoomIn))
+		.Check(edit_mode == EDIT_ZOOM)
+		.Help("Zv�t�it vybran� m�sto nebo oblast");
+}
+
+void PathEditorCtrl::OnViewZoomIn()
+{
+	edit_mode = (edit_mode == EDIT_ZOOM ? EDIT_NORMAL : EDIT_ZOOM);
+	WhenRescan();
+}
+
+void PathEditorCtrl::ToolViewZoomOut(Bar& bar)
+{
+	bar.Add("Zmen�it", PathImg::view_zoom_out(), THISBACK(OnViewZoomOut))
+		.Help("Zmen�it m���tko zobrazen� stylu ��ry");
+}
+
+void PathEditorCtrl::OnViewZoomOut()
+{
+	OnViewZoomHorzOut();
+	OnViewZoomVertOut();
+}
+
+void PathEditorCtrl::ToolViewZoomFull(Bar& bar)
+{
+	bar.Add("Podle okna", PathImg::view_zoom_full(), THISBACK(OnViewZoomFull))
+		.Help("Nastavit m���tko zobrazen� podle velikosti okna");
+}
+
+void PathEditorCtrl::OnViewZoomFull()
+{
+	OnViewZoomHorzFull();
+	OnViewZoomVertFull();
+}
+
+void PathEditorCtrl::ToolViewZoomHorzIn(Bar& bar)
+{
+	bar.Add("Horiz. zv�t�it", THISBACK(OnViewZoomHorzIn))
+		.Help("Zv�t�it m���tko vodorovn� osy");
+}
+
+void PathEditorCtrl::OnViewZoomHorzIn()
+{
+	int half = GetSize().cx >> 1;
+	double mpos = hruler.FromClient(half);
+	hruler.SetZoom(min(hruler.GetScale() * 1.5, 1000.0), 0);
+	hruler.SetZoom(hruler.GetScale(), half - hruler.ToClient(mpos));
+	UpdateScroll();
+}
+
+void PathEditorCtrl::ToolViewZoomHorzOut(Bar& bar)
+{
+	bar.Add("Horiz. zmen�it", THISBACK(OnViewZoomHorzOut))
+		.Help("Zmen�it m���tko vodorovn� osy");
+}
+
+void PathEditorCtrl::OnViewZoomHorzOut()
+{
+	int half = GetSize().cx >> 1;
+	double mpos = hruler.FromClient(half);
+	hruler.SetZoom(max(hruler.GetScale() / 1.5, 1.0), 0);
+	hruler.SetZoom(hruler.GetScale(), half - hruler.ToClient(mpos));
+	UpdateScroll();
+}
+
+void PathEditorCtrl::ToolViewZoomHorzFull(Bar& bar)
+{
+	bar.Add("Horiz. podle okna", THISBACK(OnViewZoomHorzFull))
+		.Help("Nastavit vodorovn� m���tko podle velikosti okna");
+}
+
+void PathEditorCtrl::OnViewZoomHorzFull()
+{
+	int avail = GetSize().cx - 2 * GAP;
+	double wd = max(1e-3, style->begin + style->segment + style->end);
+	hruler.SetZoom(avail / wd, GAP);
+	UpdateScroll();
+}
+
+void PathEditorCtrl::ToolViewZoomVertIn(Bar& bar)
+{
+	bar.Add("Vert. zv�t�it", THISBACK(OnViewZoomVertIn))
+		.Help("Zv�t�it m���tko svisl� osy");
+}
+
+void PathEditorCtrl::OnViewZoomVertIn()
+{
+	int half = GetSize().cy >> 1;
+	double mpos = vruler.FromClient(half);
+	vruler.SetZoom(min(vruler.GetScale() * 1.5, 1000.0), 0);
+	vruler.SetZoom(vruler.GetScale(), half - vruler.ToClient(mpos));
+	UpdateScroll();
+}
+
+void PathEditorCtrl::ToolViewZoomVertOut(Bar& bar)
+{
+	bar.Add("Vert. zmen�it", THISBACK(OnViewZoomVertOut))
+		.Help("Zmen�it m���tko svisl� osy");
+}
+
+void PathEditorCtrl::OnViewZoomVertOut()
+{
+	int half = GetSize().cy >> 1;
+	double mpos = vruler.FromClient(half);
+	vruler.SetZoom(max(vruler.GetScale() / 1.5, 1.0), 0);
+	vruler.SetZoom(vruler.GetScale(), half - vruler.ToClient(mpos));
+	UpdateScroll();
+}
+
+void PathEditorCtrl::ToolViewZoomVertFull(Bar& bar)
+{
+	bar.Add("Vert. podle okna", THISBACK(OnViewZoomVertFull))
+		.Help("Nastavit m���tko svisl� osy podle velikosti okna");
+}
+
+void PathEditorCtrl::OnViewZoomVertFull()
+{
+	int avail = GetSize().cy - 2 * GAP;
+	double ht = max(1e-3, style->width);
+	vruler.SetZoom(avail / ht, GetSize().cy >> 1);
+	UpdateScroll();
+}
+
+void PathEditorCtrl::ToolViewPan(Bar& bar)
+{
+	bar.Add("Posunout", PathImg::view_pan(), THISBACK(OnViewPan))
+		.Check(edit_mode == EDIT_PAN)
+		.Help("Posunout my�� zobrazen� v��ez");
+}
+
+void PathEditorCtrl::OnViewPan()
+{
+	edit_mode = (edit_mode == EDIT_PAN ? EDIT_NORMAL : EDIT_PAN);
+	WhenRescan();
+}
+
+void PathEditorCtrl::ToolSetup(Bar& bar)
+{
+	ToolSetupGrid(bar);
+	ToolSetupSnap(bar);
+	ToolSetupRuler(bar);
+	ToolSetupAxis(bar);
+//	bar.ThinBar();
+	bar.Separator();
+	ToolSetupStyle(bar);
+	ToolSetupSetup(bar);
+	if(bar.IsToolBar())
+	{
+		bar.Separator();
+//		bar.ThinBar();
+		bar.Add(sample_size_tag);
+		bar.Add(sample_size.SizePos(), 80);
+		bar.Add(sample_width_tag);
+		bar.Add(sample_width.SizePos(), 40);
+	}
+}
+
+void PathEditorCtrl::ToolSetupGrid(Bar& bar)
+{
+	bar.Add("M��ka", PathImg::setup_grid(), THISBACK(OnSetupGrid))
+		.Check(setup.do_grid)
+		.Help("Zobrazit / skr�t pomocnou m��ku");
+}
+
+void PathEditorCtrl::OnSetupGrid()
+{
+	setup.do_grid = !setup.do_grid;
+	WhenRescan();
+	Refresh();
+}
+
+void PathEditorCtrl::ToolSetupRuler(Bar& bar)
+{
+	bar.Add("Prav�tko", PathImg::setup_ruler(), THISBACK(OnSetupRuler))
+		.Check(setup.do_ruler)
+		.Help("Zobrazit / skr�t prav�tko");
+}
+
+void PathEditorCtrl::OnSetupRuler()
+{
+	setup.do_ruler = !setup.do_ruler;
+	WhenRescan();
+	Layout();
+}
+
+void PathEditorCtrl::ToolSetupAxis(Bar& bar)
+{
+	bar.Add("Osa", PathImg::setup_axis(), THISBACK(OnSetupAxis))
+		.Check(setup.do_axis)
+		.Help("Zobrazit / skr�t osu uk�zkov� �se�ky");
+}
+
+void PathEditorCtrl::OnSetupAxis()
+{
+	setup.do_axis = !setup.do_axis;
+	WhenRescan();
+	UpdateSample();
+}
+
+void PathEditorCtrl::ToolSetupSnap(Bar& bar)
+{
+	bar.Add("P�ichytit do m��ky", PathImg::setup_snap(), THISBACK(OnSetupSnap))
+		.Check(setup.do_snap)
+		.Help("P�ichytit sou�adnice my�i do m��ky");
+}
+
+void PathEditorCtrl::OnSetupSnap()
+{
+	setup.do_snap = !setup.do_snap;
+	WhenRescan();
+	Refresh();
+}
+
+void PathEditorCtrl::ToolSetupStyle(Bar& bar)
+{
+	bar.Add("Styl ��ry", THISBACK(OnSetupStyle))
+		.Help("Zobrazit/zm�nit vlastnosti stylu ��ry");
+}
+
+void PathEditorCtrl::OnSetupStyle()
+{
+	if(RunDlgPathStyleSetup(*style))
+	{
+		WhenRescan();
+		Layout();
+		UpdateSample();
+	}
+}
+
+void PathEditorCtrl::ToolSetupSetup(Bar& bar)
+{
+	bar.Add("Editor", PathImg::setup_setup(), THISBACK(OnSetupSetup))
+		.Help("Zobrazit/zm�nit vlastnosti editoru styl� �ar");
+}
+
+void PathEditorCtrl::OnSetupSetup()
+{
+	if(RunDlgPathEditorSetup(setup))
+	{
+		WhenRescan();
+		Layout();
+	}
+}
+
+//////////////////////////////////////////////////////////////////////
+// DlgPathEditor::
+
+class DlgPathEditor
+{
+public:
+	typedef DlgPathEditor CLASSNAME;
+	DlgPathEditor();
+
+	bool              Run(PathStyle& style, const String& title);
+	void              Serialize(Stream& stream);
+	static ConfigItem& config();
+
+	void              Rescan() { tool_bar.Set(THISBACK(ToolRoot)); menu_bar.Set(THISBACK(ToolRoot)); }
+
+public:
+	TOOL(Root)
+	TOOL(Edit)
+		TOOL(EditSave)
+
+private:
+	TopWindow         dialog;
+	MenuBar           menu_bar;
+	ToolBar           tool_bar;
+	StatusBar         status_bar;
+	EditField         coords;
+
+	PathEditorCtrl    path;
+};
+
+CONFIG_ITEM(DlgPathEditor::config, "DlgPathEditor", 1, 1, 1)
+
+bool RunDlgPathEditor(PathStyle& style, const String& title) { return DlgPathEditor().Run(style, title); }
+
+//////////////////////////////////////////////////////////////////////
+// DlgPathEditor::
+
+DlgPathEditor::DlgPathEditor()
+{
+#ifdef DEBUG_DRAW
+	dialog.NoBackPaint();
+#endif
+	dialog.AddFrame(menu_bar);
+	dialog.AddFrame(tool_bar);
+	dialog.AddFrame(status_bar);
+	status_bar << coords.VSizePos(0, 0).RightPos(0, 200);
+	coords.SetReadOnly();
+	menu_bar.Set(THISBACK(ToolRoot));
+	tool_bar.Set(THISBACK(ToolRoot));
+	dialog << path.SizePos();
+//	dialog.SetRect(CalcWindowRect(dialog, Ctrl::GetWorkStock.GetScreenSize() >> 1));
+	dialog.Sizeable().Zoomable();
+	dialog.SetMinSize(Size(300, 200));
+	path.WhenRescan = THISBACK(Rescan);
+}
+
+bool DlgPathEditor::Run(PathStyle& style, const String& title)
+{
+	dialog.Title(Nvl(title, "Styl ��ry").ToWString());
+	ReadConfigSelf();
+	path.SetOwner(style);
+	path.SetCoords(coords);
+	path.PumpTraces(false);
+	dialog.Open();
+	path.OnViewZoomFull();
+	bool ok = (dialog.Run() == IDOK);
+	WriteConfigSelf();
+	if(ok)
+		path.PumpTraces(true);
+	Ctrl::IgnoreMouseUp();
+	return ok;
+}
+
+void DlgPathEditor::Serialize(Stream& stream)
+{
+	stream % path.setup;
+	if(stream.IsLoading())
+		path.UpdateSetup();
+}
+
+void DlgPathEditor::ToolRoot(Bar& bar)
+{
+	bar.Add("Edit", THISBACK(ToolEdit))
+		.Help("Z�kladn� edita�n� p��kazy");
+	bar.Add("Pohled", callback(&path, &PathEditorCtrl::ToolView))
+		.Help("M���tko a poloha zobrazen�ho v��ezu");
+	bar.Add("Vlastnosti", callback(&path, &PathEditorCtrl::ToolSetup))
+		.Help("Vlastnosti ��ry a editoru");
+}
+
+void DlgPathEditor::ToolEdit(Bar& bar)
+{
+	if(bar.IsToolBar())
+	{
+		ToolEditSave(bar);
+//		bar.ThinBar();
+		bar.Separator();
+	}
+	path.ToolEdit(bar);
+	if(bar.IsMenuBar())
+	{
+		bar.Separator();
+		ToolEditSave(bar);
+	}
+}
+
+void DlgPathEditor::ToolEditSave(Bar& bar)
+{
+	bar.Add("Ulo�it a zav��t", CtrlImg::save(), THISBACK(OnEditSave))
+		.Key(K_CTRL_S)
+		.Help("Zav��t editor a pou��t nadefinovan� styl ��ry");
+}
+
+void DlgPathEditor::OnEditSave()
+{
+	dialog.AcceptBreak(IDOK);
+}
+
+template <class T>
+class WithPopupEdit : public T
+{
+public:
+	WithPopupEdit();
+
+	virtual void Deactivate();
+	virtual bool Key(dword key, int);
+	bool         PopUp(Ctrl *parent, const Rect& prect);
+
+public:
+	Callback     WhenCancel;
+	Callback     WhenSelect;
+
+protected:
+	virtual void DoClose(bool ok);
+
+protected:
+	bool         open;
+};
+
+template <class T>
+WithPopupEdit<T>::WithPopupEdit()
+{
+	this->SetFrame(BlackFrame());
+	open = false;
+}
+
+template <class T>
+void WithPopupEdit<T>::Deactivate()
+{
+	if(open) {
+		if(!this->Accept())
+		{
+			this->SetFocus();
+			return;
+		}
+		DoClose(true);
+		this->IgnoreMouseClick();
+		WhenSelect();
+	}
+}
+
+template <class T>
+void WithPopupEdit<T>::DoClose(bool ok)
+{
+	open = false;
+//	EndModalLoop(ok ? 1 : 0);
+	this->EndLoop(ok ? 1 : 0);
+}
+
+template <class T>
+bool WithPopupEdit<T>::Key(dword key, int repcnt)
+{
+	if(key == K_ENTER)
+	{
+		if(this->Accept())
+		{
+			DoClose(true);
+			WhenSelect();
+		}
+		return true;
+	}
+	else if(key == K_ESCAPE)
+	{
+		this->Reject();
+		DoClose(false);
+		WhenCancel();
+		return true;
+	}
+	return T::Key(key, repcnt);
+}
+
+template <class T>
+bool WithPopupEdit<T>::PopUp(Ctrl *parent, const Rect& prect)
+{
+	ASSERT(parent);
+	if(!this->IsOpen())
+	{
+		Ctrl *wnd = parent->GetTopCtrl();
+		if(!wnd || !wnd->IsOpen() || !wnd->IsVisible())
+			return false;
+		open = false;
+		this->SetRect(prect);
+		T::PopUp(parent);
+	}
+	this->Enable();
+	this->SetFocus();
+	open = true;
+	EventLoop(this);
+	bool ok = !!GetExitCode();
+//	bool ok = !!RunModalLoop();
+	this->Disable();
+	return ok;
+}
+
+PathStyleMapCtrl::PathStyleMapCtrl()
+{
+	cursor = -1;
+	map = 0;
+	scroll_pos = 0;
+	SetFrame(InsetFrame());
+	scroll.NoAutoHide().NoAutoDisable();
+	scroll.WhenScroll = THISBACK(OnScroll);
+	AddFrame(scroll);
+	WhenBar = THISBACK(ToolLocal);
+}
+
+void PathStyleMapCtrl::Set(PathStyleMap *m)
+{
+	map = m;
+	Layout();
+}
+
+bool PathStyleMapCtrl::Key(dword key, int repcnt)
+{
+	int c = cursor;
+	int pg = max(1, GetSize().cy / pos_add.cx - 1);
+	switch(key)
+	{
+	case K_LEFT:     c--; break;
+	case K_RIGHT:    c++; break;
+	case K_UP:       c -= count.cx; break;
+	case K_DOWN:     c += count.cx; break;
+	case K_PAGEUP:   c -= count.cx * pg; break;
+	case K_PAGEDOWN: c += count.cx * pg; break;
+	case K_HOME:     c = 0; break;
+	case K_END:      c = map->GetCount() - 1; break;
+	default:
+		return Bar::Scan(WhenBar, key) || Ctrl::Key(key, repcnt);
+	}
+	SetCursor(minmax(c, 0, map->GetCount() - 1));
+	return true;
+}
+
+void PathStyleMapCtrl::Layout()
+{
+	if(!map)
+	{
+		count = total = Size(0, 0);
+		pos_add = Size(1, 1);
+		cell = Size(0, 0);
+		gap_offset = offset = Point(0, 0);
+		scroll_pos = 0;
+		return;
+	}
+	Size size = scroll.GetReducedViewSize();
+	count.cx = max(1, (size.cx - GAP) / WIDTH);
+	count.cy = idivceil(map->map.GetCount(), count.cx);
+	pos_add.cx = (size.cx - GAP) / count.cx;
+	pos_add.cy = HEIGHT + GAP;
+	cell = pos_add - GAP;
+	total = count * pos_add - GAP;
+	offset.x = (size.cx - total.cx) >> 1;
+	offset.y = GAP;
+	gap_offset.x = offset.x - (GAP >> 1);
+	gap_offset.y = GAP >> 1;
+	scroll.Set(scroll_pos, size.cy, 2 * GAP + total.cy);
+	scroll_pos = scroll;
+	Refresh();
+}
+
+Rect PathStyleMapCtrl::GetEditRect(int right, int bottom)
+{
+	Size size = PathImg::rename().GetSize();
+	return RectC(right - size.cx, bottom - size.cy, size.cx, size.cy);
+}
+
+bool PathStyleMapCtrl::InEditRect(int right, int bottom, Point mouse)
+{
+	Rect rc = GetEditRect(right, bottom).Inflated(2);
+	if(!rc.Contains(mouse))
+		return false;
+	Point pt = rc.CenterPoint();
+	return mouse.x + mouse.y >= pt.x + pt.y;
+}
+
+void PathStyleMapCtrl::Paint(Draw& draw)
+{
+	Rect rc = draw.GetClip();
+	draw.Begin();
+	Size todo = ClientToRange(rc);
+	for(int i = todo.cx; i < todo.cy; i++)
+	{
+		Rect item = IndexToClient(i);
+		if(item && rc)
+		{
+			DrawFrame(draw, item, Black, White);
+			draw.DrawRect(item.Deflated(1), i == cursor ? LtCyan : SLtGray);
+			Rect box = item.Deflated(IGAP);
+			draw.Clipoff(Rect(box.left, box.top, box.right, box.top + TEXT_HEIGHT));
+			String qtf;
+			qtf << "[=A+108";
+			if(i == cursor)
+				qtf << '*';
+			qtf << " \1" << map->GetSortName(i);
+			Document doc(qtf);
+			doc.Paint(DOC_SCREEN_ZOOM, draw, 0, 0, box.Width(), SLtGray);
+			draw.DrawImage(GetEditRect(box.Width(), TEXT_HEIGHT), PathImg::rename());
+			draw.End();
+			draw.Clipoff(Rect(box.left, box.top + TEXT_HEIGHT, box.right, box.bottom));
+			PathDraw path;
+			path.Set(draw, map->GetSortStyle(i), Black, LINE_HEIGHT / 2);
+			Rect er = GetEditRect(box.Width(), box.Height() - TEXT_HEIGHT);
+			path.Line(0, LINE_HEIGHT / 2, er.left, LINE_HEIGHT / 2);
+			path.Paint();
+			draw.DrawImage(er, PathImg::edit());
+			draw.End();
+			draw.ExcludeClip(item);
+		}
+	}
+	draw.DrawRect(rc, SLtGray);
+	draw.End();
+}
+
+int PathStyleMapCtrl::ClientToIndex(Point pt) const
+{
+	pt = idivfloor(pt - gap_offset + Size(0, scroll_pos), pos_add);
+	if(pt.x < 0 || pt.x >= count.cx || pt.y < 0)
+		return -1;
+	return pt.x + pt.y * count.cx;
+}
+
+Size PathStyleMapCtrl::ClientToRange(const Rect& rc) const
+{
+	if(rc.IsEmpty())
+		return Size(-1, -1);
+	int top = idivfloor(rc.top - gap_offset.y + scroll_pos, pos_add.cy);
+	int bottom = idivfloor(rc.bottom - 1 - gap_offset.y + scroll_pos, pos_add.cy);
+	int left = idivfloor(rc.left - gap_offset.x, pos_add.cx);
+	int right = idivfloor(rc.right - 1 - gap_offset.x, pos_add.cx);
+	if(bottom < 0 || right < 0 || left >= count.cx)
+		return Size(-1, -1);
+	if(top < bottom) // multiple lines
+		return Size(max(0, count.cx * top), min(map->GetCount(), count.cx * (bottom + 1)));
+	return Size(max(0, count.cx * top + max(0, left)), min(map->GetCount(), count.cx * top + min(count.cx, right + 1)));
+}
+
+Rect PathStyleMapCtrl::IndexToClient(int i) const
+{
+	return Rect(offset - Size(0, scroll_pos) + pos_add * Size(i % count.cx, i / count.cx), cell);
+}
+
+void PathStyleMapCtrl::OnScroll()
+{
+	scroll_pos = scroll;
+	Refresh();
+}
+
+void PathStyleMapCtrl::LeftDown(Point pt, dword keyflags)
+{
+	int i = ClientToIndex(pt);
+	if(IsValid(i))
+		SetCursor(i);
+	SetWantFocus();
+	Rect rc = IndexToClient(i).Deflated(IGAP);
+	if(InEditRect(rc.right, rc.top + TEXT_HEIGHT, pt))
+		OnRename();
+	if(InEditRect(rc.right, rc.bottom, pt))
+		OnEdit();
+}
+
+void PathStyleMapCtrl::LeftDouble(Point pt, dword keyflags)
+{
+	int i = ClientToIndex(pt);
+	if(IsCursor() && i == cursor)
+		WhenLeftDouble();
+}
+
+void PathStyleMapCtrl::LeftUp(Point pt, dword keyflags)
+{
+}
+
+void PathStyleMapCtrl::RightDown(Point pt, dword keyflags)
+{
+	int i = ClientToIndex(pt);
+	if(IsValid(i))
+		SetCursor(i);
+	SetWantFocus();
+	MenuBar::Execute(this, WhenBar, UPP::GetMousePos());
+}
+
+void PathStyleMapCtrl::SetCursor(int c)
+{
+	RefreshItem(cursor);
+	RefreshItem(cursor = c);
+	if(IsCursor() && IsOpen() && IsVisible())
+	{
+		Rect rc = IndexToClient(c) + Size(0, scroll);
+		rc.Inflate(GAP);
+		scroll.ScrollInto(rc.top, rc.Height());
+	}
+}
+
+void PathStyleMapCtrl::RefreshItem(int i)
+{
+	if(i >= 0 && i < map->map.GetCount())
+		Refresh(IndexToClient(i));
+}
+
+void PathStyleMapCtrl::ToolLocal(Bar& bar)
+{
+	ToolNew(bar);
+	ToolEdit(bar);
+	ToolRename(bar);
+	ToolCopy(bar);
+	bar.Separator();
+	ToolExport(bar);
+	ToolImport(bar);
+	bar.Separator();
+	ToolRemove(bar);
+}
+
+void PathStyleMapCtrl::ToolNew(Bar& bar)
+{
+	bar.Add("Nov�", THISBACK(OnNew));
+}
+
+void PathStyleMapCtrl::OnNew()
+{
+	PathStyle new_style;
+	new_style <<= PathStyle::solid();
+	String px = "Nov� styl";
+	if(RunDlgPathEditor(new_style, px))
+	{
+		String n = map->GetUniqueName(px);
+		map->Set(n, new_style);
+		map->Touch();
+		Layout();
+		SetCursor(n);
+		OnRename();
+	}
+}
+
+void PathStyleMapCtrl::ToolEdit(Bar& bar)
+{
+	bar.Add(IsCursor(), "Upravit", THISBACK(OnEdit));
+}
+
+void PathStyleMapCtrl::OnEdit()
+{
+	if(IsCursor())
+	{
+		int c = GetCursor();
+		String n = map->GetSortName(c);
+		PathStyle edited_style;
+		edited_style <<= map->GetSortStyle(c);
+		if(RunDlgPathEditor(edited_style, "Upravit styl '" + n + "'"))
+		{
+			map->Set(n, edited_style);
+			map->Touch();
+			RefreshItem(c);
+		}
+	}
+}
+
+void PathStyleMapCtrl::ToolRename(Bar& bar)
+{
+	bar.Add(IsCursor(), "P�ejmenovat", THISBACK(OnRename));
+}
+
+void PathStyleMapCtrl::OnRename()
+{
+	if(!IsCursor())
+	{
+		BeepExclamation();
+		return;
+	}
+	int i = GetCursor();
+	Rect rc = IndexToClient(i) + Size(0, scroll);
+	scroll.ScrollInto(rc.top, rc.Height());
+	rc = IndexToClient(i) + GetScreenView().TopLeft();
+	rc.bottom = rc.top + 2 * IGAP + TEXT_HEIGHT;
+	rc.Deflate(IGAP);
+	WithPopupEdit<DocEdit> pedit;
+	pedit <<= map->GetSortName(i);
+	while(pedit.PopUp(this, rc))
+	{
+		String n = ~pedit;
+		if(map->FindSortName(n, i) >= 0)
+		{ // duplicate name
+			Exclamation("Styl ��ry [* \1" + n + "\1] ji� v syst�mu existuje. Zadejte pros�m jin� n�zev.");
+			continue;
+		}
+		int x = map->GetSort(i);
+		map->Rename(x, n);
+		map->Touch();
+		Refresh();
+		SetCursor(n);
+		break;
+	}
+}
+
+void PathStyleMapCtrl::ToolCopy(Bar& bar)
+{
+	bar.Add("Duplikovat", THISBACK(OnCopy));
+}
+
+void PathStyleMapCtrl::OnCopy()
+{
+	if(IsCursor())
+	{
+		int c = GetCursor();
+		String prefix = map->GetSortName(c);
+		int l = prefix.GetLength();
+		if(l > 0 && IsDigit(prefix[l - 1]))
+		{
+			while(l > 0 && IsDigit(prefix[l - 1]))
+				l--;
+			if(l > 0 && prefix[l - 1] == ' ')
+				prefix.Trim(l - 1);
+		}
+		PathStyle new_style;
+		new_style <<= map->GetSortStyle(c);
+		String q = map->GetUniqueName(prefix);
+		map->Set(q, new_style);
+		map->Touch();
+		Layout();
+		SetCursor(q);
+		OnRename();
+	}
+}
+
+void PathStyleMapCtrl::ToolExport(Bar& bar)
+{
+	bar.Add("Export", THISBACK(OnExport))
+		.Help("Exportovat styly �ar do souboru");
+}
+
+String recent;
+
+void PathStyleMapCtrl::OnExport()
+{
+	if(map->IsEmpty())
+	{
+		PromptOK("V syst�mu nebyly nalezeny ��dn� styly �ar.");
+		return;
+	}
+	FileSelector fsel;
+	fsel.Type("Styly �ar (*.wml)", "*.wml")
+		.DefaultExt("wml");
+	fsel <<= recent;
+	if(!fsel.ExecuteSaveAs("Exportovat styly �ar..."))
+		return;
+	String exp = map->Export();
+	if(!SaveFile(~fsel, exp))
+		PromptOK("Chyba p�i z�pisu do souboru [* \1" + ~fsel + "\1].");
+}
+
+void PathStyleMapCtrl::ToolImport(Bar& bar)
+{
+	bar.Add("Import", THISBACK(OnImport))
+		.Help("Importovat styly �ar ze souboru...");
+}
+
+void PathStyleMapCtrl::OnImport()
+{
+	FileSelector fsel;
+	fsel.Type("Styly �ar (*.wml)", "*.wml")
+		.DefaultExt("wml");
+	fsel <<= recent;
+	if(!fsel.ExecuteOpen("Importovat styly �ar"))
+		return;
+	String imp = LoadFile(recent = ~fsel);
+	if(imp.IsVoid())
+	{
+		PromptOK("Nelze na��st soubor [* \1" + ~fsel + "\1].");
+		return;
+	}
+	int old_count = map->GetCount();
+	String old_name = map->GetName();
+	try
+	{
+		map->Import(imp);
+	}
+	catch(Exc e)
+	{
+		PromptOK("Chyba p�i importu souboru [* \1" + ~fsel + "\1]: \1" + e + "\1.");
+	}
+	map->Touch();
+	if((old_count > 0 && !IsNull(old_name)) || IsNull(map->GetName()))
+		map->SetName(old_name);
+	if(map->GetCount() > old_count)
+		SetCursor(map->map.GetKey(old_count));
+	WhenRename();
+}
+
+void PathStyleMapCtrl::ToolRemove(Bar& bar)
+{
+	bar.Add("Smazat", THISBACK(OnRemove))
+		.Help("Odstranit styl ��ry ze syst�mu");
+}
+
+void PathStyleMapCtrl::OnRemove()
+{
+	if(IsCursor())
+	{
+		int c = cursor;
+		map->Remove(map->GetSortName(c));
+		map->Touch();
+		c = min(c, map->GetCount() - 1);
+		Layout();
+		SetCursor(c);
+	}
+}
+
+class PathStyleMapLayoutEx : public WithPathStyleMapLayout<TopWindow>
+{
+public:
+	PathStyleMapCtrl browser;
+};
+
+//////////////////////////////////////////////////////////////////////
+// DlgPathStyleMap::
+
+class DlgPathStyleMap
+{
+public:
+	typedef DlgPathStyleMap CLASSNAME;
+	DlgPathStyleMap();
+
+	String               Run(PathStyleMap& map, String dflt = Null, bool editor = false, bool read_only = false);
+
+private:
+//	void                 UpdateMaps();
+//	void                 OnTab();
+
+private:
+	PathStyleMapLayoutEx dialog;
+	PathStyleMap        *map;
+//	const Vector<PathStyleMap *> *maps;
+//	Vector<int> map_index;
+};
+
+String RunDlgPathStyleMap(PathStyleMap& map, const String& dflt, bool editor, bool read_only)
+{ return DlgPathStyleMap().Run(map, dflt, editor, read_only); }
+
+RegisterHelpTopicObjectTitle(DlgPathStyleMap, "Mapa styl�")
+
+DlgPathStyleMap::DlgPathStyleMap()
+{
+	map = 0;
+//	HelpLayoutOKCancel(dialog, this);
+	CtrlLayoutOKCancel(dialog, DlgPathStyleMapHelpTitle());
+	dialog.HelpTopic("DlgPathStyleMap");
+	dialog.Sizeable().MaximizeBox();
+//	dialog.browser.WhenRename = THISBACK(UpdateMaps);
+	dialog.tab.Hide();
+//	dialog.tab <<= THISBACK(OnTab);
+}
+
+/*
+MEMBER_HELP(DlgPathStyleMap, "Styly �ar",
+"��ra, mapa styl�\n"
+"mapa styl� �ar\n"
+"styly �ar, mapa\n"
+)
+
+void DlgPathStyleMap::PutHelp()
+{
+	HelpBody() <<
+		"Dialog slou�� k v�b�ru stylu ��ry nebo editaci styl� �ar. "
+		"V dialogu se zobrazuj� v�echny styly �ar, kter� jsou pr�v� "
+		"v syst�mu k dispozici. Ka�d� styl ��ry je ozna�en textov�m "
+		"n�zvem, kter� se pou��v� jako odkaz na styl ��ry. Krom� "
+		"n�zvu se p�i vykreslov�n� ��ry zad�v� je�t� ���ka ��ry "
+		"a implicitn� barva (n�kter� segmenty �ar mohou b�t vykresleny "
+		"touto implicitn� barvou, jin� pevn� zadanou barvou).";
+
+	DlgPathStyleMap d;
+	d.dialog.browser.Set(d.map = &PathStyleMap::App());
+	HelpCenterImage(d.dialog) <<
+		"Tabulka v horn� ��sti dialogu slou�� k v�b�ru stylu ��ry. "
+		"V obd�ln�kov�m poli jsou uspo��d�ny n�hledy v�ech dostupn�ch "
+		"styl� �ar. Dvojit�m kliknut�m na n�hled ��ry vyberete styl "
+		"��ry pro dal�� pou�it� v m�st�, odkud byl dialog vyvol�n "
+		"(odpov�d� funkci tla��tka " << HelpButton("OK", 600) << "). "
+		"Prav�m tla��tkem m��ete zobrazit lok�ln� nab�dku funkc� pro pr�ci "
+		"se styly �ar:\n\n";
+
+	MenuBar menu;
+	d.dialog.browser.ToolLocal(menu);
+
+//	HelpBody()
+//		<< HelpImage(menu);
+}
+*/
+
+String DlgPathStyleMap::Run(PathStyleMap& m, String dflt, bool editor, bool read_only)
+{
+	if(editor)
+	{
+		dialog.ok.Hide();
+		dialog.cancel.SetLabel("Zav��t");
+	}
+
+	map = &m;
+//	ASSERT(!maps->IsEmpty());
+//	UpdateMaps();
+
+	dialog.browser.Set(map);
+	while(dialog.Run() == IDOK)
+	{
+		int c = dialog.browser.GetCursor();
+		if(c >= 0)
+			return map->GetSortName(c);
+		BeepExclamation();
+	}
+	return Null;
+}
+
+/*
+void DlgPathStyleMap::UpdateMaps()
+{
+	int tab = dialog.tab.Get();
+	tab = (tab >= 0 && tab < map_index.GetCount() ? map_index[tab] : -1);
+	map_index = GetSortOrder(*maps, XRelation<const PathStyleMap *>(StdCsNumSort, XDeref(XField(&PathStyleMap::name))));
+	dialog.tab.Clear();
+	int new_tab = -1;
+	for(int i = 0; i < map_index.GetCount(); i++)
+	{
+		int x = map_index[i];
+		dialog.tab.Add(Nvl((*maps)[x]->GetName(), "(bez n�zvu)"));
+		if(x == tab)
+			new_tab = i;
+	}
+	dialog.tab.Set(new_tab);
+}
+*/
+
+/*
+void DlgPathStyleMap::OnTab()
+{
+	int x = dialog.tab.Get();
+	if(x >= 0 && x < map_index.GetCount())
+		dialog.browser.Set((*maps)[map_index[x]]);
+}
+*/
+
+PathStyleCtrl::PathStyleCtrl()
+: path_map(0)
+{
+	SetDisplay(display);
+}
+
+void PathStyleCtrl::DoAction()
+{
+	String s = RunDlgPathStyleMap(*path_map, GetData(), false, false);
+	if(!IsNull(s))
+		SetDataAction(s);
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/Geom/Ctrl/pathCtrl.h b/uppsrc/Geom/Ctrl/pathCtrl.h
new file mode 100644
index 000000000..47aeda3cb
--- /dev/null
+++ b/uppsrc/Geom/Ctrl/pathCtrl.h
@@ -0,0 +1,292 @@
+//////////////////////////////////////////////////////////////////////
+// pathCtrl: Ctrl-related path functions.
+
+//////////////////////////////////////////////////////////////////////
+// PathEditorCtrl::
+
+NAMESPACE_UPP
+
+class PathEditorCtrl : public DragDropCtrl, public CtrlFrame
+{
+public:
+	typedef PathEditorCtrl CLASSNAME;
+	PathEditorCtrl();
+
+	void               SetOwner(PathStyle& s) { style = &s; }
+	void               SetCoords(Ctrl& c)     { coords = &c; }
+
+	void               PumpTraces(bool write);
+
+	virtual void       FrameLayout(Rect& rc);
+	virtual void       FrameAddSize(Size& sz);
+	virtual void       FramePaint(Draw& draw, const Rect& rc);
+	virtual void       FrameAdd(Ctrl& ctrl);
+	virtual void       FrameRemove();
+
+	virtual void       Layout();
+	virtual void       Paint(Draw& draw);
+
+	virtual Image      CursorImage(Point pt, dword keyflags);
+
+	Pointf             ClientToUnits(Point pt) const;
+	Point              UnitsToClient(Pointf pt) const;
+
+	Rectf              ClientToUnits(const Rect& rc) const;
+	Rect               UnitsToClient(const Rectf& rc) const;
+
+	Pointf             GetScale() const  { return Pointf(hruler.GetScale(), vruler.GetScale()); }
+	Pointf             GetDelta() const  { return Pointf(hruler.GetDelta(), vruler.GetDelta()); }
+
+	Pointf             Snap(Pointf pt) const;
+	Pointf             ClientToSnap(Point pt) const;
+
+	virtual bool       Key(dword key, int repcnt);
+
+	virtual bool       Push(Point pt, dword keyflags);
+	virtual void       Drag(Point pt, Point last, Point next, dword keyflags);
+	virtual void       Drop(Point pt, Point end, dword keyflags);
+	virtual void       Click(Point pt, dword keyflags);
+
+	virtual void       MouseMove(Point pt, dword keyflags);
+	virtual void       RightDown(Point pt, dword keyflags);
+
+	const Vector<int>& GetSelection() const { return selection.GetKeys(); }
+	Rectf              GetSelectionExtent() const;
+	int                GetSelectionLeader() const;
+	void               RefreshSelection();
+	void               ClearSelection();
+	void               AddSelection(const Vector<int>& list);
+	void               AddSelection(int object)    { AddSelection(Vector<int>() << object); }
+	void               XorSelection(const Vector<int>& list);
+	void               XorSelection(int object)    { XorSelection(Vector<int>() << object); }
+	void               RemoveSelection(const Vector<int>& list);
+	void               RemoveSelection(int object) { RemoveSelection(Vector<int>() << object); }
+	void               SetSelection(const Vector<int>& list);
+	void               SetSelection(int object)    { SetSelection(Vector<int>() << object); }
+	bool               IsSelection() const         { return !selection.IsEmpty(); }
+
+	Rectf              GetFullExtent() const;
+	int                FindObject(Pointf pt) const;
+	Vector<int>        FindObject(const Rectf& rc) const;
+	int                AddObject(const PathStyle::Trace& trace);
+	void               SetObject(int i, const PathStyle::Trace& trace);
+	void               RefreshObject(int i);
+
+	bool               WriteClipboard();
+	bool               ReadClipboard();
+
+	int                GetTrackStyle(Pointf pt, Pointf& start) const;
+	int                GetDragSize(Pointf pt) const;
+
+	void               UpdateSample();
+
+public:
+	TOOL(Edit)
+		TOOL(EditDelete)
+		TOOL(EditSelectAll)
+		TOOL(EditCut)
+		TOOL(EditCopy)
+		TOOL(EditPaste)
+		TOOL(EditColor)
+
+	TOOL(View)
+		TOOL(ViewZoomIn)
+		TOOL(ViewZoomOut)
+		TOOL(ViewZoomFull)
+		TOOL(ViewZoomHorzIn)
+		TOOL(ViewZoomHorzOut)
+		TOOL(ViewZoomHorzFull)
+		TOOL(ViewZoomVertIn)
+		TOOL(ViewZoomVertOut)
+		TOOL(ViewZoomVertFull)
+		TOOL(ViewPan)
+
+	TOOL(Setup)
+		TOOL(SetupGrid)
+		TOOL(SetupSnap)
+		TOOL(SetupRuler)
+		TOOL(SetupAxis)
+		TOOL(SetupStyle)
+		TOOL(SetupSetup)
+
+	void               UpdateSetup();
+	void               UpdateScroll();
+	void               OnScroll();
+	void               OnSampleSize();
+	void               OnSampleWidth();
+
+public:
+	class Setup
+	{
+	public:
+		Setup() : do_grid(true), do_snap(true), do_ruler(true), do_axis(true), sample_size(40), sample_width(5), grid(0.1), snap(0.1) {}
+
+		void   Serialize(Stream& stream);
+
+	public:
+		bool   do_grid;
+		bool   do_snap;
+		bool   do_ruler;
+		bool   do_axis;
+		int    sample_size;
+		int    sample_width;
+		double grid;
+		double snap;
+	};
+
+	class ViewPlotter : public Plotter
+	{
+	public:
+		ViewPlotter(PathEditorCtrl *ctrl);
+
+	public:
+		ViewDraw draw;
+	};
+
+	friend class ViewPlotter;
+
+public:
+	enum
+	{
+		GAP = 10,
+		HGAP = 100,
+		MAX_WIDTH = 100,
+	};
+
+	Callback           WhenRescan;
+	PathStyle         *style;
+	Ctrl              *coords;
+	Setup              setup;
+
+protected:
+	Rect               outer_sample, inner_sample;
+	RulerCtrl          vruler, hruler;
+	HScrollBar         hscroll;
+	VScrollBar         vscroll;
+	Button             zoom_horz_in, zoom_horz_out, zoom_horz_full;
+	Button             zoom_vert_in, zoom_vert_out, zoom_vert_full;
+	Button             zoom_full;
+	Label              sample_size_tag, sample_width_tag;
+	DropList           sample_size;
+	EditIntSpin        sample_width;
+
+	Array<PathStyle::Trace> traces;
+	Index<int>         selection;
+
+	enum { EDIT_NORMAL, EDIT_ZOOM, EDIT_PAN };
+	int                edit_mode;
+	enum
+	{
+		DRAG_NONE, DRAG_INSERT, DRAG_SELECT, DRAG_MOVE, DRAG_TRACK,
+		DRAG_BEGIN, DRAG_SEGMENT, DRAG_END,
+		DRAG_ZOOM, DRAG_PAN,
+	};
+	int                drag_mode;
+	int                track_style;
+	Pointf             track_start;
+	Rectf              track_limit;
+};
+
+bool RunDlgPathStyleSetup(PathStyleMisc& style);
+
+//////////////////////////////////////////////////////////////////////
+
+class PathStyleMapCtrl : public Ctrl
+{
+public:
+	typedef PathStyleMapCtrl CLASSNAME;
+	PathStyleMapCtrl();
+
+	void                Set(PathStyleMap *m); // sorts the map as well
+
+	virtual void        Layout();
+	virtual void        Paint(Draw& draw);
+
+	virtual bool        Key(dword key, int repcnt);
+
+	virtual void        LeftDown(Point pt, dword keyflags);
+	virtual void        LeftDouble(Point pt, dword keyflags);
+	virtual void        LeftUp(Point pt, dword keyflags);
+	virtual void        RightDown(Point pt, dword keyflags);
+
+	int                 ClientToIndex(Point pt) const;
+	Size                ClientToRange(const Rect& rc) const; // cx = min, cy = max
+	Rect                IndexToClient(int i) const;
+
+	bool                IsValid(int i) const { return i >= 0 && i < map -> GetCount(); }
+	bool                IsCursor() const     { return IsValid(cursor); }
+	int                 GetCursor() const    { return cursor; }
+	void                SetCursor(int cursor);
+	void                SetCursor(const String& name) { SetCursor(map -> FindSortName(name)); }
+	void                KillCursor()         { SetCursor(-1); }
+
+	void                RefreshItem(int i);
+
+	TOOL(Local)
+		TOOL(New)
+		TOOL(Edit)
+		TOOL(Rename)
+		TOOL(Copy)
+		TOOL(Export)
+		TOOL(Import)
+		TOOL(Remove)
+
+public:
+	Callback1<Bar&>     WhenBar;
+	Callback            WhenLeftDouble;
+	Callback            WhenRename;
+
+private:
+	void                OnScroll();
+	static Rect         GetEditRect(int right, int bottom);
+	static bool         InEditRect(int right, int bottom, Point mouse);
+
+private:
+	enum
+	{
+		GAP = 10,
+		IGAP = 4,
+		WIDTH = 200,
+		TEXT_HEIGHT = 35,
+		LINE_HEIGHT = 20,
+		HEIGHT = TEXT_HEIGHT + LINE_HEIGHT + 2 * IGAP,
+		FONT_HEIGHT = TEXT_HEIGHT / 2,
+	};
+
+	PathStyleMap       *map;
+
+	Size                count, cell, pos_add, total;
+	Point               offset, gap_offset;
+	int                 scroll_pos;
+
+	VScrollBar          scroll;
+
+	int                 cursor;
+};
+
+//////////////////////////////////////////////////////////////////////
+
+bool RunDlgPathEditor(PathStyle& style, const String& title = Null);
+String RunDlgPathStyleMap(PathStyleMap& map, const String& dflt = Null, bool editor = false, bool read_only = false);
+
+//////////////////////////////////////////////////////////////////////
+
+class PathStyleCtrl : public DataPusher
+{
+public:
+	PathStyleCtrl();
+
+	void             PathMap(PathStyleMap *pm) { path_map = pm; display.PathMap(pm); }
+	PathStyleMap    *GetPathMap() const        { return path_map; }
+
+private:
+	virtual void     DoAction();
+
+private:
+	PathStyleMap    *path_map;
+	PathStyleDisplay display;
+};
+
+//////////////////////////////////////////////////////////////////////
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/Geom/Ctrl/pathCtrl.hpp b/uppsrc/Geom/Ctrl/pathCtrl.hpp
new file mode 100644
index 000000000..01100aaf3
--- /dev/null
+++ b/uppsrc/Geom/Ctrl/pathCtrl.hpp
@@ -0,0 +1,112 @@
+HELP_TOPIC_BEGIN("DlgPathStyleMap", LNG_ENGLISH, "Styly �ar")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 Dialog slou�� k v�b�ru stylu ��ry nebo editaci styl� \r\n"
+	"�ar. V dialogu se zobrazuj� v�echny styly �ar, kter� jsou pr�v� \r\n"
+	"v syst�mu k dispozici. Ka�d� styl ��ry je ozna�en textov�m n�zvem, \r\n"
+	"kter� se pou��v� jako odkaz na styl ��ry. Krom� n�zvu se p�i \r\n"
+	"vykreslov�n� ��ry zad�v� je�t� ���ka ��ry a implicitn� barva \r\n"
+	"(n�kter� segmenty �ar mohou b�t vykresleny touto implicitn� barvou, \r\n"
+	"jin� pevn� zadanou barvou).]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[= \r\n"
+	"@@GIF:3570*2970\r\n"
+	"���Ƹ���ʁ��������Ϗ����\377�\377\377\377���\377������߳�ߏ�\377������������������������������聖�\r\n"
+	"܀�\377��ɫ����ͻ\377�Ҩ����ݮ����̴���������\377���Ȭ���Ȥ���º���쀨�گج�������̮\r\n"
+	"�������ϻ��٪����������\377�������������\377�������\377�������\377���������Մ�\377�������\r\n"
+	"���������������Ө���ÿ����Ȕ�\377�̹�˸��ϸ������������ߟ���㑴��݊��������Չ��\r\n"
+	"\377�����������\377������Њ����𡼗�ޕ����̈����ċ�����ȱ�Ǐ�\377�Ê�ɲ��铨Ӫ�ɲ��˗����\r\n"
+	"������������튀�������ƁΚ���Ī���̧Уʽ�ʵ�ի؜�ҩ��������������ذ�������쁡ʇ\r\n"
+	"��ֻ꣩�����ʷ��߿�����������ݕ��������ӮŜ�Я��ǭ�ۑ��碛�朾̺��Ө�ۛ���ω\r\n"
+	"���̖��˯ڶ����棠�����ø������\377������У˟νߺ��س��\377ν��������Ͼ��ީ͌�����\r\n"
+	"�������������������ܹ\377�ü���\377�����ށ���โ��������ǚ؊������Ŗ���������ߕ̍��\r\n"
+	"�\377��ǃ��������ƨ�㌴�裄��ވᇆ�ٖ���ٯ����މ����܊̎�����������ؖ��͖���\r\n"
+	"��������ͱǤ�ƒ���충����������������矀���蠄���衈�����޶�š�Ԫ����Ƀ\r\n"
+	"�����馜���駠���ꨈ�Ȝ��Š����غ���ƪ������뭸��ژ�����ꯈ��諹����Ȧ�������\r\n"
+	"�\377�Ϊ�紭���������������ݚ��佖��覛\377�������ƫ�������櫯�����￀�������\r\n"
+	"�������ƒ�������Ƭ�Ĕ���Ř��Ɯ����Ǡ����Ȥ���ɞ����ʬ�ۜޠ�����������\377성�ñÌ\r\n"
+	"��������؃�����ɦ���̷�����ͳ�ʬ�����ϋ�����س��ه�������׶�홝�������۱�����\r\n"
+	"��������񃐱���������Ψ��̬��ޮ�������όӍ�������\377ߋ�����۴���褗�������ꬷ\r\n"
+	"���Ʃ������������̝�ϱס������쿦��ใ������ϳ��ε��߾���۬���ه����������\r\n"
+	"����������Ƿ���ޜ�������Ͻ�ȓ������\377����������������ΐ���������̗��𿘊�����ڄ\r\n"
+	"�����������ہ���������򈛆����݅�����ܴ�Ҭ���ʡ��������ﴌߗ��׼�������ڎ����\r\n"
+	"�񐃵���Ӗ�Ħ���Đ�����¢�\377�⃅݊�� ⓱�М�����Ɨ���֊̜���������닣�񒸴�‘�\r\n"
+	"��ԣ�ٸǮ�������擻ȅ�������Ш��ſ�����Ԙ���ɸ��ч�̟������������\377�Ŧ���ߛ��\r\n"
+	"𑩷��򺣩�������\377������¼�Щ������̱��꺜���Ո���ΰ�֌״���ʻ���ٸ��é��\r\n"
+	"��ҏד���������������ξ����悧�����������Ħ����颓�\377������镓�򼢯�������\377�\r\n"
+	"ď��������������꣫�͆��Ѡ�����ʖ���ϝ�ݩ��㊭���Υ�̨́���ݱ���������镾ԧ�僕\r\n"
+	"���Ӥ�ᩄÝ����������������Ј�ʵ騛���ߠ���������ԛ�̈��Ҭ�݃�̮�ո����݂�ۊ��\r\n"
+	"��Ӯ�ݙ\377�ز����č������²�䱢�֝˴����������ʛ������ଌ�����ڝ֬���橲�������\r\n"
+	"���䥋�ش�����ל��֔ږ���ɭ���۴��������ۗ��Ɩ�ݸ�\377�����Λ����������������˘�\r\n"
+	"�ڰ���������������欄��޲���������̮�������ڳޢ�����ʔ���������䘃���\r\n"
+	"�����밈他ۀÔ������������ċ��㉹�ቫؔ�ְ�Ǽ��ט��ծ����������������⌗ٍ�\r\n"
+	"������LJ��Ͼ����؆�����������Ȩ���݆���������������䒵������Ʊ�Э�����沚�\r\n"
+	"���\377ٴɎij�ͼ�������\377��ܹ��ӳٕ������\377�ҊƏ��Ր�����Ӫ�����桯��Зݭ�����\r\n"
+	"ͣ����������Ǻ��������܋��ק�����̆���۞�����ݔ�\377ھ�����ӛ�����ϖ��\377����ߛ��\r\n"
+	"������̦��і�����폛���ή�ѝ�������������������̶��򭫵������մ����\r\n"
+	"��܉����Ʞ߿���Ԗغ����핻���㌝��Ǔ����׵˵���ӎ؄ؼ���ƹ͇���ӻ��\377���\377��\r\n"
+	"既繯�Ι�х�\377�������َ�ϝܜⳏ����������ҽ�������������ֵ��������נ�Ѩ���󵅛\r\n"
+	"��҉���\377������䣾��׼�\377������ͱ����\377��씿�Ɵ���ﳿڎʋ��ė����қ��������\r\n"
+	"���ֻ������۹���\377��՗��������������������������ʠ���ߪ\377����蝏�����������φ�\r\n"
+	"ֳ�܏\377�����Ћ\377����������׻\377��۞����\377������������\377����ŧ���������ڷ\377������\377�����\r\n"
+	"���׀����ʇ��ǀ��������ئ������ə��¸�Ť����⁄�܂���������‚���������遵�΃�\r\n"
+	"�ӧ�ߢ˺����䀄�������Â������»Ȅ�䂁��������ň���Մ����ި��������؃��������\r\n"
+	"��ˉ����冢����雗�����������璣������ɭ�Ň���ʃ������ׁ��������ԅ���涨��†��\r\n"
+	"lj�课������풉˘��Ƙ\377����؄�����������Ը�����������蝅ϸ������Ӌڷ���׋�؉��\r\n"
+	"݋�������ŧ��nj��ǂ�����݈������ۥ�ӧ���Ǎ�nj�緌��\377������騋�����ȋਖ����޸�\r\n"
+	"﮸���،�������������ֿ������������݇����������ؐ����ø������鍖������ť֣���\r\n"
+	"�Ɏ��族�𸒂�՞����‰����鹑�������鐽ْ����������������ڶ����鏵��\377�ְۇ\r\n"
+	"ϩ���������������Օ�蕷���ٔ�ً��ӏץ��������\377�������������ܦ�ڗ�ߓ�����￨���\r\n"
+	"�ւ��֗��������ⰵ�������ہ�������탹��IJ������٣����͉�����ɝ�𸙇��\r\n"
+	"ݚ���������ȶ��얛�֛�������Ü��铓�����ə߆�͹������ɝϙ����\377ڹ��������\r\n"
+	"������������剛��ؙ֝�ܧ�����ۗ���鵞�\377���\377��乞�ٟ���񹠄�͞�������΄��ٛ�\r\n")
+	HELP_TOPIC_TEXT(
+	"�韀ʟ��˛����Ԡ�ʦ�����ʖ������������������뺢��������ș��䕊��ꢫ���飥�\r\n"
+	"���ټ��������������ĉ���ޗ��������י���������ʡ�����������ߚ������ڥ���嚄̐�\r\n"
+	"���Ԩ��۩�𺑋�͏穒�ٍ�㹔���ځ�ڐ��٨�Ч����˹�\377�������柋�匀����������ꗱ\r\n"
+	"�������햑驾�����\377��ɩ��������ʨ�٦���ҹ��窢����׫��������������쉠����ŗ�\r\n"
+	"����ʖ��٫���ƺ���𺉪�ޗ��š��ۨ������ޟ�����ڮ�������꺮캄���藯��ਓ����\r\n"
+	"���ڭ����̚��ʯ��ۤ�����ϰ�ڡ�믦���������������������닠��������ڱ����������ڪ�\r\n"
+	"�Շ��ղ�����ɕ��ϯ�����殛��������ڳ��ٮ����ʳ��ڳ�����›����Ո���\377Ե����چ\r\n"
+	"���������굷����Ŋ����ۯ�ܺ�����������ޚ௧���؂��ˋ������ŶԄ�����Ե��ȁ�������\r\n"
+	"����������\377��ܤ���Ȭ������Ň�������눐���ٕ����������������ꂹ��۴����\r\n"
+	"񠫻ɬ�����Ŕ���狅��ơ�߅�ۯ������������ŷ��������꼴��﹄�ٺ�ۖڸ����ڿ����Ћ�\r\n"
+	"��٪�إ�������Ɍ�˽������狫�����˾�����\377������˾뻶��ۯ����������ܛ��������\r\n"
+	"����������\377����������������������̨�앞�ݴ���ߺ¾��������ܲ�����鰘�����쪼��ڪ�\r\n"
+	"�ڼ�܍̙\377���������Ո��ĻׅėŪ�����˕����Ҭ��ū���¶�ٳ��������Ħ���ڬ�㒔������\r\n"
+	"�����൬������ŭ���\377���������匾�������ۛ����������۽��Ƕ����������������ɺ�ȍ��\r\n"
+	"\377��Ɖܾ�޳�������\377������\377�����ǚ͔����򠯪ʲ���Я›��������˼ܝú�ˊ�����Ľ�̫��\r\n"
+	"������ʓ�����̣����������ʥМ��إ�����������άͣ����Ŵ��������ߩ���ϸ�ƅ��ͼ\r\n"
+	"��������Ʊ����Ɯ������ֹ��������Ў�͍���œ�ͧ�Ӟ�����ߌ��\377������ԬВ�ǹ��۠ݨ��\r\n"
+	"�Е��������̎�ȍ�����љ��ǯ����ӷ�Ӻ�ӵې�������������������������ʽ\377����έ���\r\n"
+	"��э�����ƽՈ�������������֭Ռ�֕������ߝ�ķ�������ֺ��������י���������ׅ�����\r\n"
+	"倝ش�؄����ؒ��؊��������ؐ�ܒ��ٿ�ٖ��ۘ�ٟ�����؞�ـ��ڢ�פݙ���ڨ��������ڮ\r\n"
+	"��Ӱ�۱��۴�Ҷ��Ν�ۺ�Ѽ��ۊ������½�����ƽ�ȝ�����������Ô���������������ڽ���\r\n"
+	"������������䝹���ޗ��������ކ�ީ�͸�����\377������������ζ����ࠂ��������������\r\n"
+	"������δ����ó�О���ΐ������ᆵ�ᠾ��Ҿ������������򬞯������㲾��ޫ������\r\n"
+	"������㾱���������ޮ��������̟�����������Ӿ�����ؒ��Ѿ�䍱ݾ���αᎹ��������\r\n"
+	"پ����������������������ފ��Ӭ�����������΃���Ӻ���Չ��������锭���\r\n"
+	"�ƕ��񕮽��\377�������̢��㣹�֏蓎�ؓ�������꯾��������ز�湺�Ͷ����뚓���\r\n"
+	"���ރ��˿��쮴췎�����\377Η��δ����מ���޷�����⾕��޾����ݓ��������������\r\n"
+	"����������������｠������ρ�������𘠅ܳ�����⌡���\377�о���������\r\n"
+	"��ǟ�����������������\377Љ���㰟��҅ܔ��������񩞕������ƾ�󆬫�������ߦ\r\n"
+	"���������È�������톀����֟н�фȈ��������φ⯦����ѯӮ����������ӯ���\r\n"
+	"��دΘ�Ƞ���������ɏ��\377������˰���������ü�Ϗ\377��ڏ����ϕ\377�߮������Ʈ�����\r\n"
+	"�������\377���������������������̌���������غ�����ΔϸП�����ԟ��\377�����߶�\r\n"
+	"���������䏋�������Ϻ�����]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [A@0+84 Tabulka v horn� ��sti dialogu slou�� k v�b�ru stylu \r\n"
+	"��ry. V obd�ln�kov�m poli jsou uspo��d�ny n�hledy v�ech dostupn�ch \r\n"
+	"styl� �ar. Dvojit�m kliknut�m na n�hled ��ry vyberete styl ��ry \r\n"
+	"pro dal�� pou�it� v m�st�, odkud byl dialog vyvol�n (odpov�d� \r\n"
+	"funkci tla��tka ]\r\n"
+	"@@GIF:343*99\r\n"
+	"���Ƹ��Ȁ��������Ϗ��������߬������������œ��ˬ�����ڋ﯋�����ȯ��������������\r\n"
+	"�����߲ț��п���̂������ʧԠ�����ׂ��[A@0+84 ). Prav�m tla��tkem m��ete zobrazit \r\n"
+	"lok�ln� nab�dku funkc� pro pr�ci se styly �ar`:]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n")
+HELP_TOPIC_END()
diff --git a/uppsrc/Geom/Ctrl/pathedit.iml b/uppsrc/Geom/Ctrl/pathedit.iml
new file mode 100644
index 000000000..ab34dc9e0
--- /dev/null
+++ b/uppsrc/Geom/Ctrl/pathedit.iml
@@ -0,0 +1,334 @@
+IMAGE_BEGIN(setup_grid)
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�\1\0\0\0�\1\0\0\0�\1\0\0\0�")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�\1\0\0\0�\1\0\0\0�\1\0\0\0�")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�\1\0\0\0�\1\0\0\0�\1\0\0\0�")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�")
+IMAGE_PACKED(setup_grid, "\2\20\0\0\0\20\0\0\0\377\377\377\377\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(setup_snap)
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�\1\0\0\0�\1\0\0\0�\1\0\0\0�")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0��\0\0\0�\1\0\0\0�")
+	IMAGE_SCAN("ǂ\0\0\0�")
+	IMAGE_SCAN("�\3\0\0\0\377\377\377\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\377\377\377\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\1\0\0\0�\377\377\377\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\377\377\377\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\377\377\377�\0\0\0�")
+	IMAGE_SCAN("�\2\0\0\0\377\377\377�\0\0\0�")
+	IMAGE_SCAN("ǂ\0\0\0�")
+IMAGE_PACKED(setup_snap, "\2\20\0\0\0\20\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(setup_ruler)
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�\377\377\377")
+	IMAGE_SCAN("�\0\377\377\1\0\0\0�\0\377\377\1\0\0\0�\0\377\377\1\0\0\0�\0\377\377\1\0\0\0�\0\377\377\1\0\0\0\1\0\377\377")
+	IMAGE_SCAN("�\0\377\377\1\0\0\0�\0\377\377\1\0\0\0�\0\377\377\1\0\0\0�\0\377\377\1\0\0\0�\0\377\377\1\0\0\0\1\0\377\377")
+	IMAGE_SCAN("�\0\377\377\1\0\0\0�\0\377\377\1\0\0\0�\0\377\377\1\0\0\0�\0\377\377\1\0\0\0�\0\377\377\1\0\0\0\1\0\377\377")
+	IMAGE_SCAN("�\0\377\377\1\0\0\0�\0\377\377\1\0\0\0�\0\377\377\1\0\0\0\1\0\377\377")
+	IMAGE_SCAN("�\0\377\377\1\0\0\0�\0\377\377\1\0\0\0�\0\377\377\1\0\0\0\1\0\377\377")
+	IMAGE_SCAN("�\0\377\377")
+	IMAGE_SCAN("�\0\377\377")
+	IMAGE_SCAN("�\0\377\377")
+	IMAGE_SCAN("���\0")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�")
+IMAGE_PACKED(setup_ruler, "\2\20\0\0\0\20\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(setup_setup)
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("‚\377\377\377�")
+	IMAGE_SCAN("�\1\377\377\377�\1\0\0\0‚\0\0\0�\1\0\0\0�\1\0\0\0��\0\0\0")
+	IMAGE_SCAN("�\1\377\377\377�\1\0\0\0�\1\0\0\0��\0\0\0�\1\0\0\0�\1\0\0\0�")
+	IMAGE_SCAN("‚\0\0\0�")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("‚\377\377\377�")
+	IMAGE_SCAN("�\1\377\377\377�\0\0\377\1\0\0\0‚\0\0\0�\1\0\0\0�\1\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("�\1\377\377\377�\0\0\377\1\0\0\0�\1\0\0\0�\1\0\0\0��\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("‚\0\0\0�")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("‚\377\377\377�")
+	IMAGE_SCAN("�\1\377\377\377�\1\0\0\0�\1\0\0\0�\1\0\0\0�\1\0\0\0�\1\0\0\0�")
+	IMAGE_SCAN("�\1\377\377\377�\1\0\0\0Â\0\0\0��\0\0\0�\1\0\0\0�")
+	IMAGE_SCAN("‚\0\0\0�")
+	IMAGE_SCAN("�")
+IMAGE_PACKED(setup_setup, "\2\20\0\0\0\20\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(setup_sample)
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("ɂ\0\0\0‚\0\0\0�")
+	IMAGE_SCAN("ɂ\0\0\0‚\0\0\0�")
+	IMAGE_SCAN("ɂ\0\0\0‚\0\0\0�")
+	IMAGE_SCAN("ɂ\0\0\0‚\0\0\0�")
+	IMAGE_SCAN("ɂ\0\0\0�")
+	IMAGE_SCAN("ɂ\0\0\0�")
+	IMAGE_SCAN("ɂ\0\0\0‚\0\0\0�")
+	IMAGE_SCAN("ɂ\0\0\0‚\0\0\0�")
+	IMAGE_SCAN("��\0\0\0�")
+	IMAGE_SCAN("��\0\0\0�")
+	IMAGE_SCAN("͂\0\0\0�")
+	IMAGE_SCAN("͂\0\0\0�")
+	IMAGE_SCAN("��\0\0\0‚\0\0\0„\0\0\0�")
+	IMAGE_SCAN("��\0\0\0‚\0\0\0„\0\0\0�")
+	IMAGE_SCAN("�")
+IMAGE_PACKED(setup_sample, "\2\20\0\0\0\20\0\0\0\1\0\0\0\377\377\377\377\0\0\0\0")
+IMAGE_BEGIN(setup_axis)
+	IMAGE_SCAN("�\1��\27�\1\0\0\0")
+	IMAGE_SCAN("˃��\27\1\0\0\0�")
+	IMAGE_SCAN("ʃ��\27\2\0\0\0��\27�")
+	IMAGE_SCAN("Ƀ��\27\1\0\0\0���\27")
+	IMAGE_SCAN("ȃ��\27\1\0\0\0���\27�")
+	IMAGE_SCAN("�\2��\27\0\0\0���\27�")
+	IMAGE_SCAN("�\1\0\0\0���\27�")
+	IMAGE_SCAN("�\1\0\0\0�\1��\27�")
+	IMAGE_SCAN("�\1��\27�\1\0\0\0�")
+	IMAGE_SCAN("��\27\1\0\0\0�")
+	IMAGE_SCAN("ƒ��\27\2\0\0\0��\27�")
+	IMAGE_SCAN("����\27\1\0\0\0���\27�")
+	IMAGE_SCAN("���\27\1\0\0\0���\27�")
+	IMAGE_SCAN("�\2��\27\0\0\0���\27�")
+	IMAGE_SCAN("�\1\0\0\0���\27�")
+	IMAGE_SCAN("\1\0\0\0�\1��\27�")
+IMAGE_PACKED(setup_axis, "\2\20\0\0\0\20\0\0\0\1\0\0\0\377\377\377\377\0\0\0\0")
+IMAGE_BEGIN(view_zoom_in)
+	IMAGE_SCAN("Ń\377\377\377�")
+	IMAGE_SCAN("Â\377\377\377�\0\0\0�\377\377\377�")
+	IMAGE_SCAN("�\1\377\377\377�\0\0\0Â\0\0\0\1\377\377\377�")
+	IMAGE_SCAN("�\2\377\377\377\0\0\0�\2\377\377\377\0\0\0�")
+	IMAGE_SCAN("�\2\377\377\377\0\0\0�\1\0\0\0�\2\377\377\377\0\0\0�")
+	IMAGE_SCAN("\2\377\377\377\0\0\0�\1\0\0\0�\2\377\377\377\0\0\0�")
+	IMAGE_SCAN("\2\377\377\377\0\0\0…\0\0\0�\2\377\377\377\0\0\0�")
+	IMAGE_SCAN("\2\377\377\377\0\0\0�\1\0\0\0�\2\377\377\377\0\0\0�")
+	IMAGE_SCAN("�\2\377\377\377\0\0\0�\1\0\0\0�\2\377\377\377\0\0\0�")
+	IMAGE_SCAN("�\2\377\377\377\0\0\0�\2\377\377\377\0\0\0�")
+	IMAGE_SCAN("ƒ\377\377\377Â\377\377\377�\0\0\0�")
+	IMAGE_SCAN("Â\0\0\0�\377\377\377�\0\0\0�")
+	IMAGE_SCAN("Ń\0\0\0Ã\0\0\0")
+	IMAGE_SCAN("̂\0\0\0")
+IMAGE_PACKED(view_zoom_in, "\2\16\0\0\0\16\0\0\0\2\0\0\0\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(view_zoom_out)
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("Ń\377\377\377�")
+	IMAGE_SCAN("Â\377\377\377�\0\0\0�\377\377\377�")
+	IMAGE_SCAN("�\1\377\377\377�\0\0\0�\3\0\0\0\377\377\377\0\0\0�")
+	IMAGE_SCAN("�\2\377\377\377\0\0\0�\2\377\377\377\0\0\0�")
+	IMAGE_SCAN("�\2\377\377\377\0\0\0�\2\377\377\377\0\0\0�")
+	IMAGE_SCAN("�\2\377\377\377\0\0\0��\0\0\0�\2\377\377\377\0\0\0�")
+	IMAGE_SCAN("�\2\377\377\377\0\0\0�\2\377\377\377\0\0\0�")
+	IMAGE_SCAN("�\2\377\377\377\0\0\0�\2\377\377\377\0\0\0�")
+	IMAGE_SCAN("ƒ\377\377\377Â\377\377\377\1\0\0\0�")
+	IMAGE_SCAN("Â\0\0\0�\377\377\377�\0\0\0�")
+	IMAGE_SCAN("Ń\0\0\0ƒ\0\0\0�")
+	IMAGE_SCAN("˂\0\0\0�")
+	IMAGE_SCAN("�")
+IMAGE_PACKED(view_zoom_out, "\2\16\0\0\0\16\0\0\0\1\0\0\0\1\0\0\0\0\0\0\0")
+IMAGE_BEGIN(view_zoom_horz_full)
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("‹\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\1\0\0\0�\1\0\0\0�\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0��\0\0\0Â\0\0\0�\1\0\0\0�")
+	IMAGE_SCAN("„\0\0\0Ä\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0��\0\0\0Â\0\0\0�\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\1\0\0\0�\1\0\0\0�\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\1\0\0\0�")
+	IMAGE_SCAN("‹\0\0\0�")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�")
+IMAGE_PACKED(view_zoom_horz_full, "\2\20\0\0\0\20\0\0\0\3\0\0\0\3\0\0\0\0\0\0\0")
+IMAGE_BEGIN(view_zoom_vert_full)
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("‹\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\1\0\0\0�\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0Ã\0\0\0�\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0…\0\0\0�\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0…\0\0\0�\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0Ã\0\0\0�\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\1\0\0\0�\1\0\0\0�")
+	IMAGE_SCAN("‹\0\0\0�")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�")
+IMAGE_PACKED(view_zoom_vert_full, "\2\20\0\0\0\20\0\0\0\2\0\0\0\4\0\0\0\0\0\0\0")
+IMAGE_BEGIN(view_zoom_full)
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("Œ\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0Ă\0\0\0�\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0Ä\0\0\0�\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\1\0\0\0�\1\0\0\0�\1\0\0\0�")
+	IMAGE_SCAN("ƒ\0\0\0ƃ\0\0\0�")
+	IMAGE_SCAN("ƒ\0\0\0ƃ\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\1\0\0\0�\1\0\0\0�\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0Ä\0\0\0�\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0Ă\0\0\0�\1\0\0\0�")
+	IMAGE_SCAN("Œ\0\0\0�")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�")
+IMAGE_PACKED(view_zoom_full, "\2\20\0\0\0\20\0\0\0\2\0\0\0\4\0\0\0\0\0\0\0")
+IMAGE_BEGIN(view_pan)
+	IMAGE_SCAN("Ȃ\0\0\0�")
+	IMAGE_SCAN("Ń\0\0\0�\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\1\0\0\0ƒ\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\1\0\0\0�\1\0\0\0�\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\1\0\0\0�\1\0\0\0�\1\0\0\0�")
+	IMAGE_SCAN("ƒ\0\0\0�\1\0\0\0�\1\0\0\0�\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\1\0\0\0�\1\0\0\0�\1\0\0\0�\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\1\0\0\0�\1\0\0\0�\1\0\0\0�\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\1\0\0\0�\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\1\0\0\0�")
+	IMAGE_SCAN("�")
+IMAGE_PACKED(view_pan, "\2\20\0\0\0\20\0\0\0\377\377\377\377\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(edit_color)
+	IMAGE_SCAN("Ä\377\0\0�")
+	IMAGE_SCAN("†\377\0\0�")
+	IMAGE_SCAN("��\377\0\0�")
+	IMAGE_SCAN("�\377\0\0�")
+	IMAGE_SCAN("�\377\0\0�\0\0\377�")
+	IMAGE_SCAN("�\377\0\0�\0\0\377�")
+	IMAGE_SCAN("�\377\0\0�\0\377\0�\377\0\0�\0\0\377�")
+	IMAGE_SCAN("�\1\377\0\0�\0\377\0\1\377\0\0�\0\0\377")
+	IMAGE_SCAN("��\0\377\0�\0\0\377")
+	IMAGE_SCAN("�\0\377\0�\0\0\377")
+	IMAGE_SCAN("�\0\377\0�\0\0\377")
+	IMAGE_SCAN("�\0\377\0�\0\0\377�")
+	IMAGE_SCAN("�\0\377\0�\0\0\377�")
+	IMAGE_SCAN("��\0\377\0�\0\0\377�")
+	IMAGE_SCAN("†\0\377\0�")
+	IMAGE_SCAN("Ä\0\377\0�")
+IMAGE_PACKED(edit_color, "\2\20\0\0\0\20\0\0\0\377\377\377\377\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(drag_pan_cursor)
+	IMAGE_SCAN("Ƀ\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0���\377\1\0\0\0�")
+	IMAGE_SCAN("ń\0\0\0���\377\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0���\377\1\0\0\0���\377\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0���\377\1\0\0\0���\377�\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0���\377\1\0\0\0���\377\1\0\0\0���\377\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0���\377\1\0\0\0���\377\1\0\0\0���\377\1\0\0\0")
+	IMAGE_SCAN("��\0\0\0���\377\1\0\0\0���\377\1\0\0\0���\377\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0���\377\1\0\0\0���\377\1\0\0\0���\377\1\0\0\0���\377\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0���\377\1\0\0\0���\377\1\0\0\0���\377\1\0\0\0���\377\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0���\377\1\0\0\0���\377\1\0\0\0���\377\1\0\0\0���\377\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0���\377\1\0\0\0���\377\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0���\377\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0���\377\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0���\377\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0���\377\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0���\377\1\0\0\0�")
+IMAGE_PACKED(drag_pan_cursor, "\2\21\0\0\0\21\0\0\0\12\0\0\0\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(drag_insert_cursor)
+	IMAGE_SCAN("\1\0\0\0�")
+	IMAGE_SCAN("�\0\0\0�")
+	IMAGE_SCAN("\3\0\0\0\377\377\377\0\0\0�\1\377\0\0��\377\0\0��\377\0\0��\377\0\0��\377\0\0�")
+	IMAGE_SCAN("\1\0\0\0�\377\377\377\1\0\0\0‚\377\0\0��\377\0\0��\377\0\0��\377\0\0�")
+	IMAGE_SCAN("\1\0\0\0�\377\377\377\1\0\0\0�")
+	IMAGE_SCAN("\1\0\0\0�\377\377\377\1\0\0\0ɂ\377\0\0�")
+	IMAGE_SCAN("\1\0\0\0�\377\377\377\1\0\0\0Ȃ\377\0\0�")
+	IMAGE_SCAN("\1\0\0\0�\377\377\377\1\0\0\0�")
+	IMAGE_SCAN("\1\0\0\0�\377\377\377\1\0\0\0Ƃ\377\0\0�")
+	IMAGE_SCAN("\1\0\0\0�\377\377\377\1\0\0\0ł\377\0\0�")
+	IMAGE_SCAN("\1\0\0\0�\377\377\377\1\0\0\0�")
+	IMAGE_SCAN("\1\0\0\0�\377\377\377�\0\0\0Â\377\0\0�")
+	IMAGE_SCAN("\1\0\0\0�\377\377\377\3\0\0\0\377\377\377\0\0\0Ȃ\377\0\0�")
+	IMAGE_SCAN("\1\0\0\0�\377\377\377�\0\0\0�\377\377\377\1\0\0\0�")
+	IMAGE_SCAN("\3\0\0\0\377\377\377\0\0\0�\3\0\0\0\377\377\377\0\0\0��\377\0\0��\377\0\0��\377\0\0�")
+	IMAGE_SCAN("�\0\0\0�\1\0\0\0�\377\377\377\1\0\0\0�\377\0\0�\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\3\0\0\0\377\377\377\0\0\0�\1\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377\377\377\1\0\0\0�\1\0\0\0�\1\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("�\3\0\0\0\377\377\377\0\0\0�\1\0\0\0�\1\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377\377\377�\0\0\0��\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("Ȃ\0\0\0�\1\0\0\0�\1\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\1\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("ˉ\0\0\0")
+IMAGE_PACKED(drag_insert_cursor, "\2\24\0\0\0\30\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(drag_zoom_cursor)
+	IMAGE_SCAN("Ņ\377\377\377�")
+	IMAGE_SCAN("Â\377\377\377�\0\0\0�\377\377\377�")
+	IMAGE_SCAN("�\1\377\377\377�\0\0\0ł\0\0\0\1\377\377\377�")
+	IMAGE_SCAN("�\2\377\377\377\0\0\0�\2\377\377\377\0\0\0�")
+	IMAGE_SCAN("�\2\377\377\377\0\0\0�\1\0\0\0�\2\377\377\377\0\0\0�")
+	IMAGE_SCAN("\2\377\377\377\0\0\0�\1\0\0\0�\2\377\377\377\0\0\0�")
+	IMAGE_SCAN("\2\377\377\377\0\0\0�\1\0\0\0�\2\377\377\377\0\0\0�")
+	IMAGE_SCAN("\2\377\377\377\0\0\0‡\0\0\0�\2\377\377\377\0\0\0�")
+	IMAGE_SCAN("\2\377\377\377\0\0\0�\1\0\0\0�\2\377\377\377\0\0\0�")
+	IMAGE_SCAN("\2\377\377\377\0\0\0�\1\0\0\0�\2\377\377\377\0\0\0�")
+	IMAGE_SCAN("�\2\377\377\377\0\0\0�\1\0\0\0�\2\377\377\377\0\0\0�")
+	IMAGE_SCAN("�\2\377\377\377\0\0\0�\2\377\377\377\0\0\0�")
+	IMAGE_SCAN("ƒ\377\377\377ł\377\377\377�\0\0\0�")
+	IMAGE_SCAN("Â\0\0\0�\377\377\377�\0\0\0�")
+	IMAGE_SCAN("Ņ\0\0\0Ã\0\0\0�")
+	IMAGE_SCAN("΃\0\0\0�")
+	IMAGE_SCAN("σ\0\0\0�")
+	IMAGE_SCAN("Ѓ\0\0\0")
+	IMAGE_SCAN("т\0\0\0")
+IMAGE_PACKED(drag_zoom_cursor, "\2\23\0\0\0\23\0\0\0\7\0\0\0\7\0\0\0\0\0\0\0")
+IMAGE_BEGIN(fill_dither)
+	IMAGE_SCAN("\1\0\0\0�\1\0\0\0�\1\0\0\0�\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\1\0\0\0�\1\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\1\0\0\0�\1\0\0\0�\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\1\0\0\0�\1\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\1\0\0\0�\1\0\0\0�\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\1\0\0\0�\1\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\1\0\0\0�\1\0\0\0�\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\1\0\0\0�\1\0\0\0�\1\0\0\0")
+IMAGE_PACKED(fill_dither, "\2\10\0\0\0\10\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(rename)
+	IMAGE_SCAN("�\1\377\377\377\1\0\0\0")
+	IMAGE_SCAN("�\2\377\377\377���\1\0\0\0")
+	IMAGE_SCAN("�\1\377\377\377����\1\0\0\0")
+	IMAGE_SCAN("�\1\377\377\377����\1\0\0\0")
+	IMAGE_SCAN("�\1\377\377\377����\1\0\0\0")
+	IMAGE_SCAN("�\1\377\377\377����\1\0\0\0")
+	IMAGE_SCAN("�\2\377\377\377����\377\0\0\1���\1\0\0\0")
+	IMAGE_SCAN("�\1\377\377\377�����\377\0\0\1���\1\0\0\0")
+	IMAGE_SCAN("�\1\377\377\377�����\377\0\0����\1\0\0\0")
+	IMAGE_SCAN("�\1\377\377\377�����\377\0\0����\1\0\0\0")
+	IMAGE_SCAN("\1\377\377\377����\1\0\0\0")
+	IMAGE_SCAN("�\0\0\0")
+IMAGE_PACKED(rename, "\2\14\0\0\0\14\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(edit)
+	IMAGE_SCAN("�\1\377\377\377\1\0\0\0")
+	IMAGE_SCAN("�\2\377\377\377���\1\0\0\0")
+	IMAGE_SCAN("�\1\377\377\377����\1\0\0\0")
+	IMAGE_SCAN("�\1\377\377\377����\1\0\0\0")
+	IMAGE_SCAN("�\1\377\377\377����\1\0\0\0")
+	IMAGE_SCAN("�\1\377\377\377����\1\0\0\0")
+	IMAGE_SCAN("�\2\377\377\377����\0\0�\1���\1\0\0\0")
+	IMAGE_SCAN("�\1\377\377\377�����\0\0�\1���\1\0\0\0")
+	IMAGE_SCAN("�\1\377\377\377�����\0\0�����\1\0\0\0")
+	IMAGE_SCAN("�\1\377\377\377�����\0\0�����\1\0\0\0")
+	IMAGE_SCAN("\1\377\377\377����\1\0\0\0")
+	IMAGE_SCAN("�\0\0\0")
+IMAGE_PACKED(edit, "\2\14\0\0\0\14\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0")
diff --git a/uppsrc/Geom/Ctrl/pathedit.lay b/uppsrc/Geom/Ctrl/pathedit.lay
new file mode 100644
index 000000000..0c86f5e29
--- /dev/null
+++ b/uppsrc/Geom/Ctrl/pathedit.lay
@@ -0,0 +1,34 @@
+LAYOUT(PathStyleSetupLayout, 340, 102)
+	ITEM(Label, dv___0, SetLabel(t_("&Initial segment:")).LeftPosZ(4, 80).TopPosZ(4, 19))
+	ITEM(EditDoubleNotNullSpin, begin, LeftPosZ(84, 80).TopPosZ(4, 19))
+	ITEM(Label, dv___2, SetLabel(t_("&Line segment:")).LeftPosZ(4, 80).TopPosZ(26, 19))
+	ITEM(EditDoubleNotNullSpin, segment, LeftPosZ(84, 80).TopPosZ(26, 19))
+	ITEM(Label, dv___4, SetLabel(t_("&End segment:")).LeftPosZ(4, 80).TopPosZ(48, 19))
+	ITEM(EditDoubleNotNullSpin, end, LeftPosZ(84, 80).TopPosZ(48, 19))
+	ITEM(Label, dv___6, SetLabel(t_("&Relative width:")).LeftPosZ(176, 80).TopPosZ(4, 19))
+	ITEM(EditDoubleNotNullSpin, width, LeftPosZ(256, 80).TopPosZ(4, 19))
+	ITEM(Label, dv___8, SetLabel(t_("&Cap style:")).LeftPosZ(176, 80).TopPosZ(26, 19))
+	ITEM(DropList, miter, LeftPosZ(256, 80).TopPosZ(26, 19))
+	ITEM(Label, dv___10, SetLabel(t_("&Chamfer length:")).LeftPosZ(176, 80).TopPosZ(48, 19))
+	ITEM(EditDoubleNotNullSpin, chamfer, LeftPosZ(256, 80).TopPosZ(48, 19))
+	ITEM(Button, ok, SetLabel(t_("OK")).RightPosZ(88, 80).BottomPosZ(4, 22))
+	ITEM(Button, cancel, SetLabel(t_("Cancel")).RightPosZ(4, 80).BottomPosZ(3, 23))
+END_LAYOUT
+
+LAYOUT(PathEditorSetupLayout, 202, 100)
+	ITEM(Option, do_grid, SetLabel(t_("&Grid:")).LeftPosZ(4, 114).TopPosZ(4, 19))
+	ITEM(EditDoubleNotNullSpin, grid, LeftPosZ(118, 80).TopPosZ(4, 19))
+	ITEM(Option, do_snap, SetLabel(t_("&Snap:")).LeftPosZ(4, 114).TopPosZ(24, 19))
+	ITEM(EditDoubleNotNullSpin, snap, LeftPosZ(118, 80).TopPosZ(24, 19))
+	ITEM(Option, do_ruler, SetLabel(t_("&Ruler")).LeftPosZ(4, 80).TopPosZ(44, 19))
+	ITEM(Option, do_axis, SetLabel(t_("&Axis")).LeftPosZ(118, 80).TopPosZ(44, 19))
+	ITEM(Button, ok, SetLabel(t_("OK")).RightPosZ(88, 80).BottomPosZ(4, 22))
+	ITEM(Button, cancel, SetLabel(t_("Cancel")).RightPosZ(4, 80).BottomPosZ(4, 22))
+END_LAYOUT
+
+LAYOUT(PathStyleMapLayout, 484, 384)
+	ITEM(TabCtrl, tab, HSizePosZ(4, 4).VSizePosZ(4, 32))
+	UNTYPED(browser, HSizePosZ(4, 4).VSizePosZ(4, 32))
+	ITEM(Button, ok, SetLabel(t_("OK")).RightPosZ(90, 80).BottomPosZ(4, 22))
+	ITEM(Button, cancel, SetLabel(t_("Cancel")).RightPosZ(4, 80).BottomPosZ(4, 22))
+END_LAYOUT
diff --git a/uppsrc/Geom/Draw/AUTHORS b/uppsrc/Geom/Draw/AUTHORS
new file mode 100644
index 000000000..f782e5b62
--- /dev/null
+++ b/uppsrc/Geom/Draw/AUTHORS
@@ -0,0 +1,2 @@
+Mirek Fidler <cxl@ntllib.org>
+Tomas Rylek  <rylek@volny.cz>
\ No newline at end of file
diff --git a/uppsrc/Geom/Draw/COPYING b/uppsrc/Geom/Draw/COPYING
new file mode 100644
index 000000000..33aa39102
--- /dev/null
+++ b/uppsrc/Geom/Draw/COPYING
@@ -0,0 +1,30 @@
+Copyright (C) 2005 Mirek Fidler, Tomas Rylek and various contributors (see AUTHORS)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to
+deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies of the Software and its Copyright notices. In addition publicly
+documented acknowledgment must be given that this software has been used if no
+source code of this software is made available publicly. This includes
+acknowledgments in either Copyright notices, Manuals, Publicity and Marketing
+documents or any documentation provided with any product containing this
+software. This License does not apply to any software that links to the
+libraries provided by this software (statically or dynamically), but only to
+the software provided.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+-----------
+
+Please see the COPYING.PLAIN for a plain-english explanation of this notice
+and it's intent.
diff --git a/uppsrc/Geom/Draw/COPYING-PLAIN b/uppsrc/Geom/Draw/COPYING-PLAIN
new file mode 100644
index 000000000..770a8132f
--- /dev/null
+++ b/uppsrc/Geom/Draw/COPYING-PLAIN
@@ -0,0 +1,33 @@
+Plain English Copyright Notice
+
+This file is not intended to be the actual License. The reason this file
+exists is that we here are programmers and engineers. We aren't lawyers. We
+provide licenses that we THINK say the right things, but we have our own
+intentions at heart. This is a plain-english explanation of what those
+intentions are, and if you follow them you will be within the "spirit" of
+the license.
+
+The intent is for us to enjoy writing software that is useful to us (the
+AUTHORS) and allow others to use it freely and also benefit from the work we
+put into making it. We don't want to restrict others using it. They should
+not *HAVE* to make the source code of the applications they write that
+simply link to these libraries (be that statically or dynamically), or for
+them to be limited as to what license they choose to use (be it open, closed
+or anything else). But we would like to know you are using these libraries.
+We simply would like to know that it has been useful to someone. This is why
+we ask for acknowledgement of some sort.
+
+You can do what you want with the source of this software - it doesn't
+matter. We still have it here for ourselves and it is open and free to use
+and download and play with. It can't be taken away. We don't really mind what
+you do with the source to your software. We would simply like to know that
+you are using it - especially if it makes it to a commerical product. If you
+simply e-mail all the AUTHORS (see COPYING and AUTHORS files) telling us, and
+then make sure you include a paragraph or page in the manual or in the "About.."
+box for the product with the copyright notice and state that you used this
+software, we will be very happy. If you want to contribute back modifications
+and fixes you may have made we will welcome those too with open arms (generally).
+If you want help with changes needed, ports needed or features to be added,
+arrangements can be easily made with some dialogue.
+
+Mirek Fidler <cxl@ntllib.org>
diff --git a/uppsrc/Geom/Draw/Draw.upp b/uppsrc/Geom/Draw/Draw.upp
new file mode 100644
index 000000000..804cda2ef
--- /dev/null
+++ b/uppsrc/Geom/Draw/Draw.upp
@@ -0,0 +1,27 @@
+acceptflags
+	NOHRRPNG;
+
+uses
+	TDraw,
+	plugin\png,
+	plugin\gif,
+	plugin\jpg,
+	Geom\Coords;
+
+file
+	GeomDraw.h,
+	imgtran.h,
+	imgtran.cpp,
+	plotter.h,
+	plotter.cpp,
+	pathDraw.h,
+	pathDraw.cpp,
+	path_aux.cpp,
+	coordutil.h,
+	coordutil.cpp,
+	hrr.h,
+	hrr.cpp,
+	Info readonly separator,
+	COPYING,
+	COPYING-PLAIN,
+	AUTHORS;
diff --git a/uppsrc/Geom/Draw/GeomDraw.h b/uppsrc/Geom/Draw/GeomDraw.h
new file mode 100644
index 000000000..2499d0e84
--- /dev/null
+++ b/uppsrc/Geom/Draw/GeomDraw.h
@@ -0,0 +1,12 @@
+#ifndef __GeomDraw__
+#define __GeomDraw__
+
+#include <Geom/Coords/GeomCoords.h>
+#include <CtrlCore/CtrlCore.h>
+#include <TDraw/TDraw.h>
+#include "imgtran.h"
+#include "pathDraw.h"
+#include "plotter.h"
+#include "coordutil.h"
+
+#endif//__Geom__
diff --git a/uppsrc/Geom/Draw/coordutil.cpp b/uppsrc/Geom/Draw/coordutil.cpp
new file mode 100644
index 000000000..550885b04
--- /dev/null
+++ b/uppsrc/Geom/Draw/coordutil.cpp
@@ -0,0 +1,205 @@
+#include "GeomDraw.h"
+#pragma hdrstop
+
+NAMESPACE_UPP
+
+static void ExpandSegmentUp(Vector<Point>& src, Vector<Point>& dest, const LinearSegmentTree::Node *node, Point smin, Point dmin)
+{
+	if(node) {
+		ExpandSegmentUp(src, dest, ~node->below, smin, dmin);
+		ExpandSegmentUp(src, dest, ~node->above, node->source, node->target);
+	}
+	else {
+		src.Add(smin);
+		dest.Add(dmin);
+	}
+}
+
+static void ExpandSegmentDown(Vector<Point>& src, Vector<Point>& dest, const LinearSegmentTree::Node *node, Point smax, Point dmax)
+{
+	if(node) {
+		ExpandSegmentDown(src, dest, ~node->above, smax, dmax);
+		ExpandSegmentDown(src, dest, ~node->below, node->source, node->target);
+	}
+	else {
+		src.Add(smax);
+		dest.Add(dmax);
+	}
+}
+
+static void PaintSplit(ImageBuffer& out, const Image& in,
+	const PlanarSegmentTree::Node& planar,
+	const LinearSegmentTree::Node *left, const LinearSegmentTree::Node *top,
+	const LinearSegmentTree::Node *right, const LinearSegmentTree::Node *bottom,
+	const SegmentTreeInfo& info, Color background, int index)
+{
+	if(planar.split) {
+		index <<= 2;
+		PaintSplit(out, in, planar.split->topleft,
+			left ? ~left->below : NULL, top ? ~top->below : NULL, NULL, NULL,
+			info, background, index + 0);
+		PaintSplit(out, in, planar.split->topright,
+			NULL, top ? ~top->above : NULL, right ? ~right->below : NULL, NULL,
+			info, background, index + 1);
+		PaintSplit(out, in, planar.split->bottomleft,
+			left ? ~left->above : NULL, NULL, NULL, bottom ? ~bottom->below : NULL,
+			info, background, index + 2);
+		PaintSplit(out, in, planar.split->bottomright,
+			NULL, NULL, right ? ~right->above : NULL, bottom ? ~bottom->above : NULL,
+			info, background, index + 3);
+	}
+	else if(!left && !top && !right && !bottom) {
+		Sizef d01 = Length(planar.trg_topright - planar.trg_topleft, 1);
+		Sizef d12 = Length(planar.trg_bottomright - planar.trg_topright, 1);
+		Sizef d23 = Length(planar.trg_bottomleft - planar.trg_bottomright, 1);
+		Sizef d30 = Length(planar.trg_topleft - planar.trg_bottomleft, 1);
+		Size d0 = Length(d30 - d01, 2), d1 = Length(d01 - d12, 2), d2 = Length(d12 - d23, 2), d3 = Length(d23 - d30, 2);
+		Point destpos[4];
+		destpos[0] = planar.trg_topleft + d0;
+		destpos[1] = planar.trg_topright + d1;
+		destpos[2] = planar.trg_bottomright + d2;
+		destpos[3] = planar.trg_bottomleft + d3;
+		if(!in)
+			BilinearSet(out, destpos, background);
+		else
+			BilinearCopy(out, destpos, in, planar.source, NULL, info.antialias);
+	}
+	else {
+		bool empty = !in;
+		Point msrc = planar.source.CenterPoint();
+		Point mdest = msrc * info;
+		Vector<Point> bsrc;
+		Vector<Point> bdest;
+		ExpandSegmentUp  (bsrc, bdest, top,    planar.source.TopLeft(),     planar.trg_topleft);
+		ExpandSegmentUp  (bsrc, bdest, right,  planar.source.TopRight(),    planar.trg_topright);
+		ExpandSegmentDown(bsrc, bdest, bottom, planar.source.BottomRight(), planar.trg_bottomright);
+		ExpandSegmentDown(bsrc, bdest, left,   planar.source.BottomLeft(),  planar.trg_bottomleft);
+		Point psrc = bsrc.Top();
+		Point pdest = bdest.Top();
+		for(int i = 0; i < bsrc.GetCount(); i++) {
+			Point nsrc = bsrc[i];
+			Point ndest = bdest[i];
+			Sizef pn = Length(nsrc - psrc, 1);
+			Sizef nm = Length(msrc - nsrc, 1);
+			Sizef mp = Length(psrc - msrc, 1);
+			Size dp = Length(mp - pn, 2), dn = Length(pn - nm, 2), dm = Length(nm - mp, 2);
+			if(empty)
+				LinearSet(out, mdest + dm, pdest + dp, ndest + dn, background);
+			else
+				LinearCopy(out, mdest + dm, pdest + dp, ndest + dn, in, msrc + dm, psrc + dp, nsrc + dn, NULL, info.antialias);
+			psrc = nsrc;
+			pdest = ndest;
+		}
+	}
+}
+
+void AlphaTransformPaint(ImageBuffer& out, const Image& in,
+	const PlanarSegmentTree& planar,
+	const LinearSegmentTree& left, const LinearSegmentTree& top,
+	const LinearSegmentTree& right, const LinearSegmentTree& bottom,
+	const SegmentTreeInfo& info, Color background)
+{
+	PaintSplit(out, in, planar.root, ~left.split, ~top.split, ~right.split, ~bottom.split, info, background, 1);
+}
+
+static void PaintTreeSplit(Draw& draw, const PlanarSegmentTree::Node& planar,
+	const LinearSegmentTree::Node *left, const LinearSegmentTree::Node *top,
+	const LinearSegmentTree::Node *right, const LinearSegmentTree::Node *bottom, int index)
+{
+	if(planar.split) {
+		index <<= 2;
+		PaintTreeSplit(draw, planar.split->topleft,     left ? ~left->below : NULL, top ? ~top->below : NULL, NULL, NULL, index + 0);
+		PaintTreeSplit(draw, planar.split->topright,    NULL, top ? ~top->above : NULL, right ? ~right->below : NULL, NULL, index + 1);
+		PaintTreeSplit(draw, planar.split->bottomleft,  left ? ~left->above : NULL, NULL, NULL, bottom ? ~bottom->below : NULL, index + 2);
+		PaintTreeSplit(draw, planar.split->bottomright, NULL, NULL, right ? ~right->above : NULL, bottom ? ~bottom->above : NULL, index + 3);
+	}
+	else {
+		Vector<Point> bsrc;
+		Vector<Point> bdest;
+		ExpandSegmentUp  (bsrc, bdest, top,    planar.source.TopLeft(),     planar.trg_topleft);
+		ExpandSegmentUp  (bsrc, bdest, right,  planar.source.TopRight(),    planar.trg_topright);
+		ExpandSegmentDown(bsrc, bdest, bottom, planar.source.BottomRight(), planar.trg_bottomright);
+		ExpandSegmentDown(bsrc, bdest, left,   planar.source.BottomLeft(),  planar.trg_bottomleft);
+		Point center = (planar.trg_topleft + planar.trg_topright + planar.trg_bottomleft + planar.trg_bottomright) >> 2;
+		String fmt = FormatIntHex(index, 4);
+		Font font = StdFont();
+		Size fmtsize = GetTextSize(fmt, font);
+		draw.DrawText(center.x - (fmtsize.cx >> 1), center.y - (fmtsize.cy >> 1), fmt, font, LtGreen());
+		Point pdest = bdest[0];
+		bdest.Add(pdest);
+		draw.DrawPolyline(bdest, 0, LtBlue());
+		for(int i = 1; i < bdest.GetCount(); i++)
+			draw.DrawRect(bdest[i].x - 1, bdest[i].y - 1, 3, 3, LtGreen());
+	}
+}
+
+void PaintPlanarTree(Draw& draw, const PlanarSegmentTree& planar,
+	const LinearSegmentTree& left, const LinearSegmentTree& top,
+	const LinearSegmentTree& right, const LinearSegmentTree& bottom)
+{
+	PaintTreeSplit(draw, planar.root, ~left.split, ~top.split, ~right.split, ~bottom.split, 1);
+}
+
+static void PlotLine(PlotterTool& tool, GisTransform transform, Pointf src1, Pointf src2, int level, double maxdev)
+{
+	double dev;
+	if(--level <= 0 || (dev = transform.SourceDeviation(src1, src2)) <= maxdev) {
+		tool.LineTo(transform.Target(src2));
+		return;
+	}
+	Pointf mid = (src1 + src2) / 2.0;
+	PlotLine(tool, transform, src1, mid, level, maxdev);
+	PlotLine(tool, transform, mid, src2, level, maxdev);
+}
+
+/*
+void PlotLine(PlotterTool& tool, GisCoords proj, Pointf lonlat1, Pointf lonlat2, int branch)
+{
+	tool.MoveTo(proj.Project(lonlat1, branch));
+	PlotLine(tool, proj, lonlat1, lonlat2, branch, 8,
+		(tool.GetPlotter().GetDraw().Dots() ? 5 : 2) / tool.GetPlotter().measure);
+}
+
+void PlotLineSafe(PlotterTool& tool, GisCoords proj, Pointf lonlat1, Pointf lonlat2, int branch)
+{
+	int nseg = minmax<int>((int)fpabsmax(lonlat2 - lonlat1), 1, 360);
+	tool.MoveTo(proj.Project(lonlat1, branch));
+	for(int i = 1; i <= nseg; i++)
+		tool.LineTo(proj.Project(lonlat1 + (lonlat2 - lonlat1) * (i / double(nseg)), branch));
+}
+
+void PlotRectSafe(PlotterTool& tool, GisCoords proj, const Rectf& lonlat, int branch)
+{
+	PlotLineSafe(tool, proj, lonlat.TopLeft(),     lonlat.TopRight(),    branch);
+	PlotLineSafe(tool, proj, lonlat.TopRight(),    lonlat.BottomRight(), branch);
+	PlotLineSafe(tool, proj, lonlat.BottomRight(), lonlat.BottomLeft(),  branch);
+	PlotLineSafe(tool, proj, lonlat.BottomLeft(),  lonlat.TopLeft(),     branch);
+}
+*/
+
+void PlotLine(PlotterTool& tool, GisTransform transform, Pointf source1, Pointf source2)
+{
+	if(transform.IsIdentity())
+		tool.Line(source1, source2);
+	else {
+		Pointf target1 = transform.Target(source1), target2 = transform.Target(source2);
+		if(!tool.GetPlotter().InLClip(target1) || !tool.GetPlotter().InLClip(target2)) {
+			if(!ClipLine(source1, source2, transform.SourceExtent(tool.GetPlotter().logclip)))
+				return;
+			target1 = transform.Target(source1);
+		}
+		tool.MoveTo(target1);
+		PlotLine(tool, transform, source1, source2, 8,
+			(tool.GetPlotter().GetDraw().Dots() ? 5 : 2) / tool.GetPlotter().measure);
+	}
+}
+
+void PlotRect(PlotterTool& tool, GisTransform transform, const Rectf& src)
+{
+	PlotLine(tool, transform, src.TopLeft(),     src.TopRight());
+	PlotLine(tool, transform, src.TopRight(),    src.BottomRight());
+	PlotLine(tool, transform, src.BottomRight(), src.BottomLeft());
+	PlotLine(tool, transform, src.BottomLeft(),  src.TopLeft());
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/Geom/Draw/coordutil.h b/uppsrc/Geom/Draw/coordutil.h
new file mode 100644
index 000000000..332e0128a
--- /dev/null
+++ b/uppsrc/Geom/Draw/coordutil.h
@@ -0,0 +1,21 @@
+#ifndef _Geom_Draw_coordutil_h_
+#define _Geom_Draw_coordutil_h_
+
+NAMESPACE_UPP
+
+void AlphaTransformPaint(ImageBuffer& out, const Image& in,
+	const PlanarSegmentTree& planar,
+	const LinearSegmentTree& left, const LinearSegmentTree& top,
+	const LinearSegmentTree& right, const LinearSegmentTree& bottom,
+	const SegmentTreeInfo& info, Color background);
+
+void PaintPlanarTree(Draw& draw, const PlanarSegmentTree& planar,
+	const LinearSegmentTree& left, const LinearSegmentTree& top,
+	const LinearSegmentTree& right, const LinearSegmentTree& bottom);
+
+void   PlotLine(PlotterTool& tool, GisTransform transform, Pointf source1, Pointf source2);
+void   PlotRect(PlotterTool& tool, GisTransform transform, const Rectf& src);
+
+END_UPP_NAMESPACE
+
+#endif
diff --git a/uppsrc/Geom/Draw/hrr.cpp b/uppsrc/Geom/Draw/hrr.cpp
new file mode 100644
index 000000000..7cbc8099f
--- /dev/null
+++ b/uppsrc/Geom/Draw/hrr.cpp
@@ -0,0 +1,1624 @@
+//////////////////////////////////////////////////////////////////////
+// hrr: high resolution raster.
+
+#include "GeomDraw.h"
+#pragma hdrstop
+
+#include "hrr.h"
+
+#include <plugin/jpg/jpg.h>
+#include <plugin/gif/gif.h>
+#include <plugin/png/png.h>
+
+NAMESPACE_UPP
+
+#define LLOG(x) // LOG(x)
+
+void RasterCopy(RasterEncoder& dest, Raster& src, const Rect& src_rc)
+{
+	dest.Start(src_rc.Size());
+	for(int y = src_rc.top; y < src_rc.bottom; y++)
+		dest.WriteLine((const RGBA *)src.GetLine(y) + src_rc.left);
+}
+
+void ImageWriter::Open(ImageBuffer& output_, Point pos_, Rect clip_, bool merge_)
+{
+	format.SetRGBA();
+	output = &output_;
+	pos = pos_;
+	clip = clip_;
+	merge = merge_;
+}
+
+void ImageWriter::Start(Size sz)
+{
+	src_size = sz;
+	line = 0;
+	left = max(pos.x, clip.left);
+	width = max(min(pos.x + src_size.cx, clip.right) - left, 0);
+	offset = (width > 0 ? left - pos.x : 0);
+}
+
+void ImageWriter::WriteLineRaw(const byte *s)
+{
+	if(line >= src_size.cy || width <= 0)
+		return;
+	int y = line++ + pos.y;
+	if(y >= clip.top && y < clip.bottom) {
+		const RGBA *l = (const RGBA *)s;
+		if(merge)
+			AlphaBlend(&(*output)[y][left], l + offset, width);
+		else
+			memcpy(&(*output)[y][left], l + offset, width * sizeof(RGBA));
+	}
+}
+
+Size ImageBufferRaster::GetSize()
+{
+	return buffer.GetSize();
+}
+
+Raster::Info ImageBufferRaster::GetInfo()
+{
+	Info info;
+	info.bpp = 32;
+	info.colors = 0;
+	info.dots = Null;
+	info.hotspot = Null;
+	info.kind = buffer.GetKind();
+	return info;
+}
+
+Raster::Line ImageBufferRaster::GetLine(int line)
+{
+	return Line(buffer[line], false);
+}
+
+inline Stream& operator % (Stream& strm, Color& color)
+{
+	dword dw = color.GetRaw();
+	strm % dw;
+	if(strm.IsLoading())
+		color = Color::FromRaw(dw);
+	return strm;
+}
+
+inline Stream& operator % (Stream& strm, Rectf& rc)
+{
+	strm % rc.left % rc.top % rc.right % rc.bottom;
+	return strm;
+}
+
+static int64 Unpack64(dword i)
+{
+	if(!(i & 0x80000000))
+		return i;
+	return int64(i & 0x7fffffff) << 8;
+}
+
+static dword CeilPack64(int64 i)
+{
+	if(i < 0x7fffffff)
+		return (dword)i;
+	if(i < INT64(0x3fffffff00))
+		return (dword)((i + INT64(0x80000000ff)) >> 8);
+	return 0xffffffff;
+}
+
+One<StreamRaster> HRRInfo::GetDecoder() const
+{
+	switch(method) {
+	case METHOD_JPG: return new JPGRaster;
+	case METHOD_GIF: return new GIFRaster;
+	case METHOD_PNG: return new PNGRaster;
+	default:              return 0;
+	}
+}
+
+One<StreamRasterEncoder> HRRInfo::GetEncoder() const
+{
+	switch(method) {
+	case METHOD_JPG: return new JPGEncoder(quality);
+	case METHOD_GIF: return new GIFEncoder;
+	case METHOD_PNG: return new PNGEncoder;
+	default:              return 0;
+	}
+}
+
+/*
+One<StreamRasterEncoder> HRR::StdCreateEncoder(const HRRInfo& info)
+{
+	switch(info.GetMethod())
+	{
+	case HRRInfo::METHOD_JPG: return new JpgEncoder(info.GetQuality());
+	case HRRInfo::METHOD_GIF: return new GifEncoder;
+	case HRRInfo::METHOD_RLE: return new RleEncoder;
+//	case HRRInfo::METHOD_ZIM: return new ZImageEncoder;
+#ifndef flagNOHRRPNG
+	case HRRInfo::METHOD_PNG: return new PngEncoder;
+#endif
+	default:              return 0;
+	}
+}
+*/
+
+Vector<int> HRRInfo::EnumMethods()
+{
+	Vector<int> out;
+	out << METHOD_JPG << METHOD_GIF /* << METHOD_RLE*/ << METHOD_PNG; // << METHOD_ZIM;
+	return out;
+}
+
+/*
+enum { wAlphaBlend = 200 };
+
+static void Mask1Blt(byte *dest, const byte *src, const byte *mask, int count)
+{
+	while(count >= 4)
+	{
+		if(mask[0]) { dest[0] = src[0]; dest[1] = src[1]; dest[2] = src[2]; }
+		if(mask[1]) { dest[3] = src[3]; dest[4] = src[4]; dest[5] = src[5]; }
+		if(mask[2]) { dest[6] = src[6]; dest[7] = src[7]; dest[8] = src[8]; }
+		if(mask[3]) { dest[9] = src[9]; dest[10] = src[10]; dest[11] = src[11]; }
+		dest += 12;
+		src += 12;
+		mask += 4;
+		count -= 4;
+	}
+	if(count & 2)
+	{
+		if(mask[0]) { dest[0] = src[0]; dest[1] = src[1]; dest[2] = src[2]; }
+		if(mask[1]) { dest[3] = src[3]; dest[4] = src[4]; dest[5] = src[5]; }
+		dest += 6;
+		src += 6;
+		mask += 2;
+	}
+	if(count & 1)
+		if(mask[0]) { dest[0] = src[0]; dest[1] = src[1]; dest[2] = src[2]; }
+}
+*/
+
+/*
+static void Mask1Copy(PixelArray& dest, const PixelArray& src, const PixelArray& mask)
+{
+	ASSERT(mask.bpp == 8 && src.bpp == 24 && dest.bpp == 24);
+	Size size = dest.GetSize();
+	ASSERT(src.GetSize() == size && mask.GetSize() == size);
+	for(int i = 0; i < size.cy; i++)
+		Mask1Blt(dest.GetUpScan(i), src.GetUpScan(i), mask.GetUpScan(i), size.cx);
+}
+*/
+
+/*
+static void StreamAlphaBlend(Stream& stream, Rect& dest, Rect& src, int& alpha,
+							 AlphaArray& image, Color& blend_bgnd)
+{
+	int version = 2;
+	stream / version / alpha;
+	Pack16(stream, dest);
+	Pack16(stream, src);
+	stream % image;
+	if(version >= 2)
+		stream % blend_bgnd;
+	else if(stream.IsLoading())
+	{
+		alpha = tabs(alpha);
+		blend_bgnd = Null;
+	}
+}
+*/
+
+/*
+static void DrawAlphaBlend(Draw& draw, Rect dest, Rect src, int alpha, AlphaArray& image, Color blend_bgnd)
+{
+	ASSERT(alpha >= 0);
+
+	Rect clip = draw.GetClip(), dclip = dest & clip, dclip0 = dclip.Size();
+	if(dclip.IsEmpty() || alpha == 0)
+		return;
+
+	Color c0 = (image.pixel.palette.GetCount() >= 1 ? image.pixel.palette[0] : Color(Null));
+	Color c1 = (image.pixel.palette.GetCount() >= 2 ? image.pixel.palette[1] : Color(Null));
+	bool mono_pixel = (image.pixel.IsMono() && (IsNull(c0) || IsNull(c1)));
+	if(mono_pixel && IsNull(c0) && IsNull(c1))
+		return;
+
+	if(draw.IsDrawing())
+	{
+		StreamAlphaBlend(draw.DrawingOp(wAlphaBlend), dest, src, alpha, image, blend_bgnd);
+		return;
+	}
+
+	PixelArray in_blend;
+	if(alpha < 100 && IsNull(blend_bgnd))
+	{
+#ifdef PLATFORM_WIN32
+		in_blend = ImageToPixelArray(DrawToImage(draw, dest), draw, -3);
+#else
+		in_blend = DrawableToPixelArray(draw.GetDrawable(), dest, false, -3, 4);
+#endif
+	}
+	bool resize = (src.Size() != dest.Size() || (dest.Size() != dclip.Size() && draw.Dots()));
+
+	if(mono_pixel)
+	{
+		if(resize)
+		{
+			PixelArray new_data = PixelArray::Mono(dclip.Size(), 8);
+			PixelCopyAntiAliasMaskOnly(new_data, dest - dclip.TopLeft(), image.pixel, src, false, false, dclip0);
+			new_data.palette = image.pixel.palette;
+			image.pixel = new_data;
+			src = dclip0;
+			dest = dclip;
+		}
+		if(!in_blend.IsEmpty())
+		{
+			PixelArray copy_blend;
+			copy_blend <<= in_blend;
+			PixelKillMask(copy_blend, image.pixel, Nvl(c0, c1), !IsNull(c0));
+			PixelAlphaBlend(copy_blend, src, in_blend, Point(0, 0), alpha);
+			copy_blend.Paint(draw, src, dest);
+		}
+		else
+			image.pixel.Paint(draw, src, dest, c0, c1);
+		return;
+	}
+
+	if(resize)
+	{ // scale image offhand
+		if(image.pixel.GetBPP() > 8)
+			PixelSetConvert(image.pixel, -3);
+		if(!image.HasAlpha())
+		{
+			PixelArray new_data(dclip.Size(), -3);
+			PixelCopyAntiAlias(new_data, dest - dclip.TopLeft(), image.pixel, src, dclip0);
+			image.pixel = new_data;
+		}
+		else
+		{
+			AlphaArray new_image(dclip.Size(), -3);
+			PixelCopyAntiAliasMaskOut(new_image, dest - dclip.TopLeft(), image, src, false, false, dclip0);
+			image = new_image;
+		}
+		src = dclip0;
+		dest = dclip;
+	}
+	if(!in_blend.IsEmpty())
+	{ // blend with display contents
+		if(image.HasAlpha())
+		{
+			PixelSetConvert(image.pixel, -3);
+			Mask1Copy(image.pixel, in_blend, image.alpha);
+		}
+		PixelAlphaBlend(image.pixel, src, in_blend, Point(0, 0), alpha);
+		image.pixel.Paint(draw, src, dest);
+	}
+	else {
+		if(alpha < 100)
+			PixelAlphaBlend(image.pixel, blend_bgnd, alpha, src);
+		if(image.HasAlpha())
+			image.Paint(draw, src, dest);
+		else
+			image.pixel.Paint(draw, src, dest);
+	}
+//	RTIMING("DrawAlphaBlend (raw)");
+}
+*/
+
+/*
+static void wsAlphaBlend(Draw& draw, Stream& stream, const DrawingPos& pos)
+{
+	Rect src, dest;
+	int alpha;
+	AlphaArray image;
+	Color blend_bgnd;
+	StreamAlphaBlend(stream, dest, src, alpha, image, blend_bgnd);
+	DrawAlphaBlend(draw, pos(dest), src, alpha, image, blend_bgnd);
+}
+*/
+
+//static DrawerRegistrator MK__s(wAlphaBlend, wsAlphaBlend);
+
+static int GetMaskInfo(const RGBA *rgba, int count)
+{
+	if(count == 0)
+		return 0;
+	if(rgba->a == 255) {
+		for(; count > 0 && rgba->a == 255; count--, rgba++)
+			;
+		return (count ? 2 : 1);
+	}
+	else if(rgba->a == 0) {
+		for(; count > 0 && rgba->a == 0; count--, rgba++)
+			;
+		return (count ? 2 : 0);
+	}
+	return 2;
+}
+
+static String EncodeMask(const ImageBuffer& mask, bool write_size)
+{
+	StringBuffer out;
+	if(write_size) {
+		char temp[4];
+		Poke16le(temp + 0, mask.GetWidth());
+		Poke16le(temp + 2, mask.GetHeight());
+		out.Cat(temp, 4);
+	}
+	int full = out.GetLength();
+	Size size = mask.GetSize();
+	for(int i = 0; i < size.cy; i++) {
+		const RGBA *p = mask[size.cy - i - 1], *e = p + size.cx;
+		int start = out.GetLength();
+		while(p < e) {
+			bool init0 = false;
+			if(p->a >= 128)
+			{ // full part
+				const RGBA *b = p;
+				while(++p < e && p->a >= 128)
+					;
+				int n = p - b;
+				while(n > 253) {
+					out.Cat(255);
+					out.Cat(2);
+					n -= 253;
+				}
+				if(n > 0)
+					out.Cat(n + 2);
+			}
+			else
+				init0 = true;
+			if(p < e) {
+				const RGBA *b = p;
+				while(++p < e && p->a < 128)
+					;
+				if(p < e) {
+					if(init0)
+						out.Cat(2);
+					int n = p - b;
+					while(n > 253) {
+						out.Cat(255);
+						out.Cat(2);
+						n -= 253;
+					}
+					if(n > 0)
+						out.Cat(n + 2);
+				}
+			}
+		}
+		if(out.GetLength() > start)
+			full = out.GetLength();
+		out.Cat(1);
+	}
+	if(full < out.GetLength())
+		out.SetLength(full);
+	return out;
+}
+
+static void DecodeMask(ImageBuffer& mask, String s, bool read_size)
+{
+	Size size = mask.GetSize();
+	const byte *p = s;
+	if(read_size) {
+		size.cx = Peek16le(p);
+		size.cy = Peek16le(p + 2);
+		p += 4;
+	}
+	for(int i = 0; i < size.cy && *p; i++) {
+		RGBA *d = mask[size.cy - i - 1], *e = d + size.cx;
+		while(*p >= 2 && d < e) {
+			int n1 = *p++ - 2;
+			if(e - d <= n1) {
+				while(d < e)
+					d++->a = 0;
+				break;
+			}
+			RGBA *dd = d + n1;
+			while(d < dd)
+				d++->a = 0;
+			if(*p >= 2) {
+				n1 = *p++ - 2;
+				if(e - d <= n1)
+					break;
+				d += n1;
+			}
+		}
+		while(*p >= 2)
+			p++;
+		if(*p)
+			p++;
+	}
+}
+
+/*
+static String EncodeMask(const RawImage& mask)
+{
+	ASSERT(mask.bpp == 8);
+	String out;
+	int full = 0;
+	Size size = mask.GetSize();
+	for(int i = 0; i < size.cy; i++)
+	{
+		const byte *p = mask.GetUpScan(i), *e = p + size.cx;
+		int start = out.GetLength();
+		while(p < e)
+		{
+			const byte *b = p;
+			while(++p < e && *p)
+				;
+			if(p >= e)
+				break;
+			int n = p - b;
+			while(n > 253)
+			{
+				out.Cat(255);
+				out.Cat(2);
+				n -= 253;
+			}
+			out.Cat(n + 2);
+			b = p;
+			while(++p < e && !*p)
+				;
+			n = p - b;
+			while(n > 253)
+			{
+				out.Cat(255);
+				out.Cat(2);
+				n -= 253;
+			}
+			if(n > 0 || p < e)
+				out.Cat(n + 2);
+		}
+		if(out.GetLength() > start)
+			full = out.GetLength();
+		out.Cat(1);
+	}
+	if(full < out.GetLength())
+		out.Trim(full);
+	return out;
+}
+
+static void DecodeMask(RawImage& mask, const String& s)
+{
+	ASSERT(mask.bpp == 8);
+	Size size = mask.GetSize();
+	mask.Set(1);
+	const byte *p = s;
+	for(int i = 0; i < size.cy && *p; i++)
+	{
+		byte *d = mask.GetUpScan(i), *e = d + size.cx;
+		while(*p >= 2 && d < e)
+		{
+			int n1 = *p++ - 2;
+			if(e - d <= n1)
+				break;
+			d += n1;
+			if(*p < 2)
+				break;
+			n1 = *p++ - 2;
+			if(e - d <= n1)
+			{
+				memset(d, 0, e - d);
+				break;
+			}
+			memset(d, 0, n1);
+			d += n1;
+		}
+		while(*p >= 2)
+			p++;
+		if(*p)
+			p++;
+	}
+}
+*/
+
+HRRInfo::HRRInfo()
+: levels(0)
+, log_rect(0, 0, 0, 0)
+, map_rect(0, 0, 0, 0)
+, background(White)
+, method(METHOD_JPG)
+, quality(50)
+, mono(false)
+, mono_black(Black)
+, mono_white(White)
+{
+}
+
+HRRInfo::HRRInfo(Rectf log_rect, int levels, Color background, int method, int quality,
+	bool mono, Color mono_black, Color mono_white)
+: log_rect(log_rect), levels(levels), background(background), method(method), quality(quality)
+, mono(mono), mono_black(mono_black), mono_white(mono_white)
+{
+	double wadd = log_rect.Height() - log_rect.Width();
+	map_rect = log_rect;
+	if(wadd >= 0)
+		map_rect.right += wadd;
+	else
+		map_rect.top += wadd;
+}
+
+void HRRInfo::Serialize(Stream& stream)
+{
+	int outver = (stream.IsStoring() && !mono && method != METHOD_ZIM && method != METHOD_BZM ? 4 : 5);
+	int version = StreamHeading(stream, outver, 2, 5, "HRRInfo");
+	if(version >= 2)
+		stream / levels % background % log_rect % map_rect;
+	if(version >= 3)
+		stream / method;
+	else if(stream.IsLoading())
+		method = METHOD_JPG;
+	if(version >= 4)
+		stream / quality;
+	else if(stream.IsLoading())
+		quality = 0;
+	if(version >= 5)
+		stream % mono % mono_black % mono_white;
+	else if(stream.IsLoading())
+	{
+		mono = false;
+		mono_black = Null;
+		mono_white = Null;
+	}
+}
+
+Vector<int> HRRInfo::EnumQualities(int method)
+{
+	Vector<int> out;
+	switch(method)
+	{
+	case METHOD_JPG:
+		{
+			for(int i = 10; i <= 100; i += 10)
+				out << i;
+		}
+		break;
+
+	case METHOD_GIF:
+	case METHOD_RLE:
+	case METHOD_PNG:
+	case METHOD_ZIM:
+	case METHOD_BZM:
+		out << 0;
+		break;
+
+	default:
+		NEVER();
+		break;
+	}
+	return out;
+}
+
+VectorMap<int, String> HRRInfo::GetPackMap()
+{
+	VectorMap<int, String> out;
+	Vector<int> methods = EnumMethods();
+	for(int m = 0; m < methods.GetCount(); m++)
+	{
+		Vector<int> qualities = EnumQualities(methods[m]);
+		if(qualities.IsEmpty())
+			qualities.Add(0);
+		for(int q = 0; q < qualities.GetCount(); q++)
+			out.FindAdd(Pack(methods[m], qualities[q]), GetName(methods[m], qualities[q]));
+	}
+	return out;
+}
+
+String HRRInfo::GetName(int method, int quality)
+{
+	String out;
+	switch(method)
+	{
+	case METHOD_JPG:
+		out << "JPEG " << (quality ? quality : DFLT_JPG_QUALITY) << "%";
+		break;
+
+	case METHOD_GIF:
+		out << "GIF";
+		break;
+/*
+	case METHOD_RLE:
+		out << "RLE";
+		break;
+*/
+	case METHOD_PNG:
+		out << "PNG";
+		break;
+
+/*
+	case METHOD_ZIM:
+		out << "ZIM";
+		break;
+
+	case METHOD_BZM:
+		out << "BZM";
+		break;
+*/
+	default:
+		out << "?? (" << method << ")";
+	}
+	return out;
+}
+
+double HRRInfo::GetEstimatedFileSize(int _levels, int method, int quality)
+{
+	int images = 0;
+	for(int i = 0; i < _levels; i++)
+		images += 1 << (2 * i);
+	int dir_size = images * sizeof(int) // offset table
+		+ 256; // estimated heading size
+	double data_size = images * double(UNIT * UNIT);
+	switch(method)
+	{
+	case METHOD_JPG:
+		data_size *= (quality ? quality : DFLT_JPG_QUALITY) / 400.0; // guessed JPEG size
+		break;
+
+	case METHOD_GIF:
+		data_size /= 2;
+		break;
+
+	case METHOD_RLE:
+		data_size /= 1.5;
+		break;
+
+	case METHOD_PNG:
+		data_size /= 1.6;
+		break;
+
+	case METHOD_ZIM:
+		data_size /= 1.6;
+		break;
+
+	case METHOD_BZM:
+		data_size /= 1.8;
+		break;
+
+	default:
+		NEVER();
+		break;
+	}
+	return data_size;
+}
+
+//////////////////////////////////////////////////////////////////////
+// HRR::Block::
+
+void HRR::Block::Init(Size s, RGBA color)
+{
+//	static TimingInspector ti("HRR::Block::Init");
+//	ti.Start();
+	size = s;
+	block.Create(size);
+	Fill(~block, color, block.GetLength());
+}
+
+//////////////////////////////////////////////////////////////////////
+// HRR::
+
+One<StreamRaster> (*HRR::CreateDecoder)(const HRRInfo& info) = &HRR::StdCreateDecoder;
+One<StreamRasterEncoder> (*HRR::CreateEncoder)(const HRRInfo& info) = &HRR::StdCreateEncoder;
+
+static const Size SUNIT(HRRInfo::UNIT, HRRInfo::UNIT);
+static const Rect RUNIT(0, 0, HRRInfo::UNIT, HRRInfo::UNIT);
+
+HRR::HRR()
+{
+	cache_sizeof_limit = DEFAULT_CACHE_SIZEOF_LIMIT;
+}
+
+HRR::HRR(const char *path, bool read_only)
+{
+	Open(path, read_only);
+}
+
+One<StreamRaster> HRR::StdCreateDecoder(const HRRInfo& info)
+{
+	switch(info.GetMethod()) {
+		case HRRInfo::METHOD_GIF: return new GIFRaster;
+		case HRRInfo::METHOD_PNG: return new PNGRaster;
+		case HRRInfo::METHOD_JPG: return new JPGRaster;
+//		case HRRInfo::METHOD_BMP: return new BMPRaster;
+	}
+	return NULL;
+}
+
+One<StreamRasterEncoder> HRR::StdCreateEncoder(const HRRInfo& info)
+{
+	switch(info.GetMethod()) {
+		case HRRInfo::METHOD_GIF: return new GIFEncoder;
+		case HRRInfo::METHOD_PNG: return new PNGEncoder;
+		case HRRInfo::METHOD_JPG: return new JPGEncoder(info.GetQuality());
+//		case HRRInfo::METHOD_BMP: return new BMPEncoder;
+	}
+	return NULL;
+}
+
+bool HRR::Open(const char *path, bool read_only)
+{
+	Close();
+	if(!path || !*path || !stream.Open(path, read_only ? stream.READ : stream.READWRITE))
+		return false;
+	stream.SetLoading();
+	Serialize();
+	if(stream.IsError() || info.levels <= 0
+		|| info.map_rect.Width() <= 0 || info.map_rect.Height() <= 0)
+	{
+		Close();
+		return false;
+	}
+	return true;
+}
+
+void HRR::Close()
+{
+	stream.Close();
+	pixel_directory.Clear();
+	mask_directory.Clear();
+	image_cache.Clear();
+	directory_sizeof = 0;
+	cache_sizeof = 0;
+	info = HRRInfo();
+}
+
+static int GetImageSize(Size sz)
+{
+	return sizeof(Image) + 32 + sz.cx * sz.cy * sizeof(RGBA);
+}
+
+inline static int GetImageSize(const Image& im) { return GetImageSize(im.GetSize()); }
+
+void HRR::FlushCache(int limit)
+{
+	while(!image_cache.IsEmpty() && cache_sizeof > limit) {
+		cache_sizeof -= GetImageSize(image_cache[0]);
+		image_cache.Remove(0);
+	}
+}
+
+void HRR::ClearCache()
+{
+	image_cache.Clear();
+	cache_sizeof = 0;
+}
+
+static Size GetLogBlockSize(Rectf box_rc, Rectf map_rc)
+{
+	Size part_size(HRRInfo::UNIT, HRRInfo::UNIT);
+	if(box_rc.left >= map_rc.right)
+		return Size(0, 0);
+	if(box_rc.right >= map_rc.right)
+		part_size.cx = fround(part_size.cx * (map_rc.right - box_rc.left) / box_rc.Width());
+	if(box_rc.bottom <= map_rc.top)
+		return Size(0, 0);
+	else if(box_rc.top < map_rc.top)
+		part_size.cy = fround(part_size.cy * (box_rc.bottom - map_rc.top) / box_rc.Height());
+	return part_size;
+}
+
+static Color BlendColor(Color a, int percent, Color b)
+{
+	return Color(
+		b.GetR() + iscale(a.GetR() - b.GetR(), percent, 100),
+		b.GetG() + iscale(a.GetG() - b.GetG(), percent, 100),
+		b.GetB() + iscale(a.GetB() - b.GetB(), percent, 100));
+}
+
+static int StopMsec(int start = 0)
+{
+	return GetTickCount() - start;
+}
+
+static void DrawAlphaImage(Draw& draw, Rect dest, Image img, Rect src, int alpha)
+{
+	if(alpha <= 0)
+		return;
+	alpha += alpha >> 7;
+	if(alpha >= 256) {
+		draw.DrawImage(dest, img, src);
+		return;
+	}
+	Size outsz = min(src.Size(), dest.Size());
+	ImageBuffer temp(outsz);
+	Rescale(ImageWriter(temp, false), outsz, ImageRaster(img), src);
+	for(RGBA *p = ~temp, *e = ~temp + temp.GetLength(); p < e; p++) {
+//		int a = (p->a + (p->a >> 7)) * alpha;
+//		p->r = p->r * a >> 16;
+//		p->g = p->g * a >> 16;
+//		p->b = p->b * a >> 16;
+		p->a = p->a * alpha >> 8;
+	}
+//	temp.SetKind(IMAGE_PREMULTIPLIED);
+	draw.DrawImage(dest, Image(temp));
+}
+
+void HRR::Paint(Draw& draw, Rect dest, Rectf src,
+	int alpha, int max_pixel, Color mono_black, Color mono_white, Color blend_bgnd)
+{
+	LLOG("HRR::Paint: alpha = " << alpha
+		<< ", max_pixel = " << max_pixel << ", mono_black = " << mono_black
+		<< ", mono_white = " << mono_white << ", blend_bgnd = " << blend_bgnd
+		<< ", dest = " << dest << ", src = " << src << BeginIndent);
+	Swap(dest.top, dest.bottom);
+	draw.Clip(dest);
+	Paint(draw, MatrixfScale(src, dest), Null, alpha, max_pixel, mono_black, mono_white, blend_bgnd);
+	draw.End();
+	LLOG(EndIndent << "// HRR::Paint");
+}
+
+HRR::Cursor::Cursor(HRR& owner_, const Rectf& extent_, double measure_,
+	int alpha_, Color mono_black_, Color mono_white_, Color blend_bgnd_)
+: owner(owner_)
+, extent(extent_)
+, measure(measure_)
+, alpha(alpha_)
+, mono_black(mono_black_)
+, mono_white(mono_white_)
+, blend_bgnd(blend_bgnd_)
+{
+	bool use_pixel = (IsNull(mono_black) && IsNull(mono_white));
+
+	if(owner.info.IsMono() && use_pixel) {
+		mono_black = owner.info.GetMonoBlack();
+		mono_white = owner.info.GetMonoWhite();
+		use_pixel = (IsNull(mono_black) && IsNull(mono_white));
+		if(use_pixel) {
+			LLOG(EndIndent << "//HRR::Paint, null color, empty case");
+			return;
+		}
+	}
+
+//	bool use_bg = (alpha < 100 && IsNull(blend_bgnd) || do_transform);
+//	bool use_alpha = !use_pixel || IsNull(info.background);
+	bool is_bw = (!IsNull(mono_black) && !IsNull(mono_white));
+//	bool out_pixel = (use_pixel || is_bw);
+//	bool out_alpha = (use_pixel ? IsNull(info.background) : !is_bw);
+
+//	LLOG("[" << StopMsec(ticks) << "] use_bg = " << use_bg << ", use_pixel = " << use_pixel << ", use_alpha = " << use_alpha
+//		<< ", is_bw = " << is_bw << ", out_pixel = " << out_pixel << ", out_alpha = " << out_alpha);
+
+	double r = HRRInfo::UNIT / owner.info.GetMapRect().Width();
+//	if(draw.Dots())
+//		r /= 5; // ad hoc conversion from screen space to dot resolution
+	level = 0;
+	for(; level < owner.info.GetLevels() - 1 && r < measure; r *= 2, level++)
+		;
+//	DUMP(level);
+
+	if(!IsNull(mono_black))
+		mono_black = BlendColor(mono_black, alpha, Nvl(owner.info.GetBackground(), White));
+	if(!IsNull(mono_white))
+		mono_white = BlendColor(mono_white, alpha, Nvl(owner.info.GetBackground(), White));
+
+	// calculate interest area in Q-tree blocks
+	total = 1 << level;
+	Rectf blocks = (extent - owner.info.GetMapRect().BottomLeft()) / owner.info.GetMapRect().Size() * double(total);
+	rc = Rect(ffloor(blocks.left), ffloor(-blocks.bottom), fceil(blocks.right), fceil(-blocks.top));
+	rc &= Rect(0, 0, total, total);
+
+	// prepare clipping & image loader
+	if(!owner.info.IsMono()) {
+		raster = CreateDecoder(owner.info);
+		if(!raster) {
+			LLOG(EndIndent << "//HRR:x: decoder not found, exiting");
+			return;
+		}
+	}
+
+	// adjust transform parameters to convert from Q-tree space to device coords
+//	delta += info.map_rect.BottomLeft() * scale;
+//	scale *= Sizef(1, -1) * info.map_rect.Size() / double(1 << level);
+
+#ifdef _DEBUG
+//	int ti = 0;
+#endif
+
+	block = rc.TopLeft();
+	block.x--;
+}
+
+bool HRR::Cursor::Fetch(Rectf& part)
+{
+	for(;;) {
+		if(++block.x >= rc.right) {
+			block.x = rc.left;
+			if(++block.y >= rc.bottom)
+				return false;
+		}
+		LLOG("[" << StopMsec(ticks) << "] block = [" << x << ", " << y << "]");
+		int pixel_offset = owner.pixel_directory[level][block.x + block.y * total];
+		int mask_offset = owner.mask_directory[level][block.x + block.y * total];
+		int coff;
+		if(pixel_offset)
+			coff = pixel_offset;
+		else if(mask_offset)
+			coff = -mask_offset;
+		else
+			continue;
+		int cimg = -1;
+		if((cimg = owner.image_cache.Find(coff)) < 0) {
+			ImageBuffer new_image;
+			if(pixel_offset) {
+				owner.stream.Seek(Unpack64(pixel_offset));
+				new_image = raster->Load(owner.stream);
+				if(new_image.IsEmpty()) {
+					RLOG(NFormat("Failed to load block [%d, %d].", block.x, block.y));
+					continue;
+				}
+//				PixelSetConvert(new_image.pixel, -3);
+			}
+			if(mask_offset) {
+				owner.stream.Seek(Unpack64(mask_offset));
+				int len = owner.stream.GetIL();
+				ASSERT(len >= 0 && len < HRRInfo::UNIT * (HRRInfo::UNIT + 1) + 1);
+				StringBuffer databuf(len);
+				owner.stream.Get(databuf, len);
+				String data = databuf;
+				if(owner.version < 5) {
+					Size sz(0, 0);
+					if(cimg >= 0)
+						sz = new_image.GetSize();
+					else if(pixel_offset) {
+						int csize = owner.size_cache.Find(pixel_offset);
+						if(csize < 0) {
+							if(owner.size_cache.GetCount() >= 10000)
+								owner.size_cache.Clear();
+							int64 pixpos = Unpack64(pixel_offset);
+							if(pixpos > owner.stream.GetSize())
+								owner.stream.SetSize(pixpos);
+	//								stream.Seek(pixpos);
+							csize = owner.size_cache.GetCount();
+	//								Stream64Stream pixel_stream(stream, pixpos);
+							owner.stream.Seek(pixpos);
+							raster->Open(owner.stream);
+							owner.size_cache.Add(pixel_offset, raster->GetSize());
+						}
+						sz = owner.size_cache[csize];
+					}
+					if(sz.cx <= 0 || sz.cy <= 0)
+						continue;
+//					new_image.alpha = PixelArray::Mono(sz);
+				}
+				DecodeMask(new_image, data, owner.version >= 5);
+			}
+			int new_len = new_image.GetLength() * sizeof(RGBA);
+			owner.FlushCache(owner.cache_sizeof_limit - new_len);
+			owner.cache_sizeof += new_len;
+			cimg = owner.image_cache.GetCount();
+			owner.image_cache.Add(coff, new_image);
+		}
+		if(cimg >= 0) {
+			part = owner.GetLogBlockRect(level, RectC(block.x, block.y, 1, 1));
+			Size sz = owner.image_cache[cimg].GetSize();
+			part.right = part.left + part.Width() * sz.cx / HRRInfo::UNIT;
+			part.top = part.bottom - part.Height() * sz.cy / HRRInfo::UNIT;
+			return true;
+		}
+	}
+}
+
+Image HRR::Cursor::Get()
+{
+	ASSERT(cimg >= 0);
+	return owner.image_cache[cimg];
+}
+
+void HRR::Paint(Draw& draw, const Matrixf& trg_pix, GisTransform transform,
+	int alpha, int max_pixel, Color mono_black, Color mono_white, Color blend_bgnd)
+{
+	LLOG("HRR::Paint: alpha = " << alpha
+		<< ", max_pixel = " << max_pixel << ", mono_black = " << mono_black
+		<< ", mono_white = " << mono_white << ", blend_bgnd = " << blend_bgnd
+		<< ", trg_pix = " << trg_pix << BeginIndent);
+
+	int ticks = StopMsec();
+	ASSERT(alpha >= 0);
+
+	if(alpha == 0 || info.IsEmpty() || !IsOpen()) {
+		LLOG(EndIndent << "//HRR::Paint, empty case");
+		return;
+	}
+
+	bool do_transform = !transform.IsIdentity();
+	bool is_straight = !do_transform && fabs(trg_pix.x.y) <= 1e-10 && fabs(trg_pix.y.x) <= 1e-10;
+	bool use_pixel = (IsNull(mono_black) && IsNull(mono_white));
+
+	if(info.mono && use_pixel) {
+		mono_black = info.mono_black;
+		mono_white = info.mono_white;
+		use_pixel = (IsNull(mono_black) && IsNull(mono_white));
+		if(use_pixel) {
+			LLOG(EndIndent << "//HRR::Paint, null color, empty case");
+			return;
+		}
+	}
+
+	bool use_bg = (alpha < 100 && IsNull(blend_bgnd) || do_transform);
+	bool use_alpha = !use_pixel || IsNull(info.background);
+	bool is_bw = (!IsNull(mono_black) && !IsNull(mono_white));
+	bool out_pixel = (use_pixel || is_bw);
+	bool out_alpha = (use_pixel ? IsNull(info.background) : !is_bw);
+
+	LLOG("[" << StopMsec(ticks) << "] use_bg = " << use_bg << ", use_pixel = " << use_pixel << ", use_alpha = " << use_alpha
+		<< ", is_bw = " << is_bw << ", out_pixel = " << out_pixel << ", out_alpha = " << out_alpha);
+
+	Matrixf pix_trg = MatrixfInverse(trg_pix);
+	Rect clip = draw.GetClip();
+	Rectf csrc = info.log_rect & transform.SourceExtent(Rectf(clip) * pix_trg);
+//	Pointf scale = Sizef(1, -1) * Sizef(dest.Size()) / Sizef(src.Size());
+//	Pointf delta = Pointf(dest.TopLeft()) - src.BottomLeft() * scale;
+//	Rectf  csrc  = src & info.log_rect;
+	Rect   cdest = RectfToRect(transform.TargetExtent(csrc) * trg_pix) & clip;
+//	Rect   cdest = RectfToRect(csrc * scale + delta);
+//	Swap(cdest.top, cdest.bottom);
+//	DrawRectMinusRect(draw, dest, cdest, info.background);
+	if(cdest.IsEmpty())
+	{ // intersection is less than 1 pixel wide / high
+		LLOG(EndIndent << "//HRR::Paint: empty destination, exiting");
+		return;
+	}
+	double r = fpmax(Sizef(cdest.Size()) * Sizef(info.map_rect.Size()) / csrc.Size()) / info.UNIT;
+	if(draw.Dots())
+		r /= 5; // ad hoc conversion from screen space to dot resolution
+	int level = 0;
+	for(; level < info.levels - 1 && r > max_pixel; r /= 2, level++)
+		;
+//	DUMP(level);
+
+	if(!IsNull(mono_black))
+		mono_black = BlendColor(mono_black, alpha, Nvl(info.background, White));
+	if(!IsNull(mono_white))
+		mono_white = BlendColor(mono_white, alpha, Nvl(info.background, White));
+
+	ImageBuffer out_blend;
+	if(use_bg) {
+		out_blend.Create(cdest.Size());
+		Fill(out_blend, info.background, out_blend.GetLength());
+	}
+	LOG("out blend: " << out_blend.GetSize());
+
+	// calculate interest area in Q-tree blocks
+	int total = 1 << level;
+	Rectf blocks = (csrc - info.map_rect.BottomLeft()) / info.map_rect.Size() * double(total);
+	Rect rc(ffloor(blocks.left), ffloor(-blocks.bottom), fceil(blocks.right), fceil(-blocks.top));
+	rc &= Rect(0, 0, total, total);
+
+	// prepare clipping & image loader
+	draw.Clip(cdest);
+	One<StreamRaster> decoder;
+	if(!info.mono) {
+		decoder = CreateDecoder(info);
+		if(decoder.IsEmpty()) {
+			draw.DrawText(cdest.left, cdest.top,
+				String().Cat() << "Unsupported HRR encoding: " << info.GetMethod(), StdFont());
+			draw.End();
+			LLOG(EndIndent << "//HRR:x: encoder not found, exiting");
+			return;
+		}
+	}
+
+	// adjust transform parameters to convert from Q-tree space to device coords
+//	delta += info.map_rect.BottomLeft() * scale;
+//	scale *= Sizef(1, -1) * info.map_rect.Size() / double(1 << level);
+
+#ifdef _DEBUG
+//	int ti = 0;
+#endif
+
+	SegmentTreeInfo seginfo;
+	seginfo.src_trg = transform;
+	seginfo.trg_pix = trg_pix;
+	seginfo.trg_pix.a -= cdest.TopLeft();
+	seginfo.antialias = true;
+	seginfo.branch = 0;
+	seginfo.max_depth = HRRInfo::HALF_BITS - 1;
+	double trg_dv = 2 / sqrt(fabs(Determinant(trg_pix)));
+	Rect rclip = clip - cdest.TopLeft();
+	Font err_font = StdFont();
+	for(int y = rc.top; y < rc.bottom; y++)
+		for(int x = rc.left; x < rc.right; x++)
+		{
+			LLOG("[" << StopMsec(ticks) << "] block = [" << x << ", " << y << "]");
+			seginfo.img_src = GetPixMapMatrix(level, x, y);
+			seginfo.img_src.x.x /= HRRInfo::UNIT;
+			seginfo.img_src.y.y /= HRRInfo::UNIT;
+			Matrixf src_img = MatrixfInverse(seginfo.img_src);
+			Rect src = RectfToRect((RUNIT * seginfo.img_src & csrc) * src_img).Inflated(2) & RUNIT;
+			Rectf map = src * seginfo.img_src;
+			Rect dest = (transform.TargetExtent(map) * trg_pix).Inflated(1) & Rectf(clip);
+//			Rect dest = RectfToRect(Rectf(x, y, x + 1, y + 1) * scale + delta);
+//			Rect clip = dest & draw.GetClip();
+			if(dest.IsEmpty())
+				continue;
+			Rect rdest = dest - cdest.TopLeft();
+			LinearSegmentTree tleft, ttop, tright, tbottom;
+			PlanarSegmentTree tplanar;
+			if(!is_straight) {
+				seginfo.max_deviation = trg_dv;
+				tleft = CreateLinearTree(src.TopLeft(), src.BottomLeft(), seginfo);
+				ttop = CreateLinearTree(src.TopLeft(), src.TopRight(), seginfo);
+				tright = CreateLinearTree(src.TopRight(), src.BottomRight(), seginfo);
+				tbottom = CreateLinearTree(src.BottomLeft(), src.BottomRight(), seginfo);
+				tplanar = CreatePlanarTree(tleft, ttop, tright, tbottom, seginfo);
+			}
+//			Rect src = (clip - dest.TopLeft()) * SUNIT / dest.Size();
+//			src.Inflate(2);
+//			src &= RUNIT;
+			int pixel_offset = pixel_directory[level][x + y * total];
+			int cimg = -1;
+			bool newimg = false;
+			if(pixel_offset && use_pixel && (cimg = image_cache.Find(pixel_offset)) < 0) {
+				newimg = true;
+//				Stream64Stream pixel_stream(stream, Unpack64(pixel_offset));
+				stream.Seek(Unpack64(pixel_offset));
+				Image ni = decoder->Load(stream);
+				if(ni.IsEmpty()) {
+					String warn = NFormat("Failed to load block [%d, %d].", x, y);
+					Size sz = GetTextSize(warn, err_font);
+					draw.DrawRect(Rect(dest.CenterPoint(), Size(1, 1)).Inflated(sz + 2), Color(255, 192, 192));
+					draw.DrawText((dest.left + dest.right - sz.cx) >> 1, (dest.top + dest.bottom - sz.cy) >> 1,
+						warn, StdFont(), Black);
+					continue;
+				}
+				cimg = image_cache.GetCount();
+				FlushCache(cache_sizeof_limit - GetImageSize(ni));
+				cache_sizeof += GetImageSize(ni);
+				cimg = image_cache.GetCount();
+				image_cache.Add(pixel_offset) = ni;
+#ifdef _DEBUG
+//				static int part_id = 0;
+//				JpgEncoder().SaveArrayFile(Format("h:\\temp\\part%d.jpg", ++part_id), new_image);
+#endif
+//				if(!out_blend.IsEmpty())
+//					PixelSetConvert(new_image.pixel, -3);
+			}
+			if(newimg) {
+				int mask_offset = mask_directory[level][x + y * total];
+				int cmask = -1;
+				if(mask_offset && use_alpha && (cmask = image_cache.Find(-mask_offset)) < 0) {
+					Size sz(0, 0);
+					stream.Seek(Unpack64(mask_offset));
+					int len = stream.GetIL();
+					ASSERT(len >= 0 && len < HRRInfo::UNIT * (HRRInfo::UNIT + 1) + 1);
+					StringBuffer data(len);
+					stream.Get(data, len);
+//					String s = data;
+					if(version < 5) {
+						if(cimg >= 0)
+							sz = image_cache[cimg].GetSize();
+						else {
+							if(!pixel_offset)
+								continue;
+							int csize = size_cache.Find(pixel_offset);
+							if(csize < 0) {
+								if(size_cache.GetCount() >= 10000)
+									size_cache.Clear();
+								int64 pixpos = Unpack64(pixel_offset);
+								if(pixpos > stream.GetSize())
+									stream.SetSize(pixpos);
+	//								stream.Seek(pixpos);
+								csize = size_cache.GetCount();
+	//								Stream64Stream pixel_stream(stream, pixpos);
+								stream.Seek(pixpos);
+								Size sz = 0;
+								if(decoder->Open(stream))
+									sz = decoder->GetSize();
+								size_cache.Add(pixel_offset, sz);
+							}
+							sz = size_cache[csize];
+						}
+					}
+					if(sz.cx > 0 && sz.cy > 0) {
+						if(cimg < 0) {
+							FlushCache(cache_sizeof_limit - GetImageSize(sz));
+							cmask = image_cache.GetCount();
+							cache_sizeof += GetImageSize(sz);
+							ImageBuffer ibuf(sz);
+							Fill(~ibuf, RGBAZero(), ibuf.GetLength());
+							DecodeMask(ibuf, data, version >= 5);
+							image_cache.Add(-mask_offset) = Image(ibuf);
+						}
+						else {
+							ImageBuffer ibuf(image_cache[cimg]);
+							DecodeMask(ibuf, data, version >= 5);
+							image_cache[cimg] = ibuf;
+						}
+					}
+				}
+				if(cimg < 0)
+					cimg = cmask;
+			}
+			if(cimg < 0) {
+				LLOG("[" << StopMsec(ticks) << "] pixel off, mask off");
+				if(!is_straight && !IsNull(info.background))
+					AlphaTransformPaint(out_blend, Image(), tplanar, tleft, ttop, tright, tbottom, seginfo, info.background);
+				else if(use_pixel)
+					draw.DrawRect(dest, info.background);
+			}
+			else {
+				const Image& img = image_cache[cimg];
+				if(!use_bg) {
+					LLOG("[" << StopMsec(ticks) << "] !use_bg -> direct mask blend");
+					if(alpha >= 100)
+						draw.DrawImage(dest, img, src);
+					else
+						DrawAlphaImage(draw, dest, img, src, minmax(alpha * 256 / 100, 0, 255));
+//					DrawAlphaBlend(draw, dest, src, 100, out_part, blend_bgnd);
+				}
+				else if(!is_straight) {
+					LLOG("[" << StopMsec(ticks) << "] use_bg -> twisted mask blend");
+					AlphaTransformPaint(out_blend, img,
+						tplanar, tleft, ttop, tright, tbottom, seginfo, LtRed());
+				}
+				else {
+					LLOG("[" << StopMsec(ticks) << "] use_bg -> buffered colored mask blend");
+					ImageWriter writer(out_blend, rdest.TopLeft(), rclip);
+					Rescale(writer, rdest.Size(), ImageRaster(img), src);
+				}
+			}
+		}
+
+	if(use_bg) {
+		if(alpha < 100) {
+			int coef = alpha * 255 / 100;
+			for(RGBA *p = ~out_blend, *e = p + out_blend.GetLength(); p < e; p++)
+				p->a = (p->a * coef) >> 8;
+		}
+		draw.DrawImage(cdest, out_blend);
+	}
+	draw.End();
+	LLOG(EndIndent << "[" << StopMsec(ticks) << "] //HRR::Paint");
+}
+
+int HRR::GetProgressCount(int levels, bool downscale)
+{
+	ASSERT(levels > 0);
+	int images = 0;
+	if(downscale)
+		images = 1 << (2 * (levels - 1));
+	else
+		for(int i = 0; i < levels; i++)
+			images += 1 << (2 * i);
+	return images;
+}
+
+bool HRR::Create(const HRRInfo& _info, const char *path)
+{
+	ASSERT(_info.levels > 0);
+	Close();
+	if(!stream.Open(path, stream.CREATE))
+		return false;
+	info = _info;
+	map_offset = 0;
+	Serialize();
+	return true;
+}
+
+static void StreamHRRString(Stream& stream, String& string)
+{
+	int version = 1, len = string.GetLength();
+	stream / version / len;
+	if(version > 1 || stream.IsLoading() && (unsigned)len > stream.GetLeft())
+	{
+		stream.SetError();
+		return;
+	}
+	if(stream.IsStoring())
+		stream.SerializeRaw((byte *)(const char *)string, len);
+	else {
+		StringBuffer stringbuf(len);
+		stream.SerializeRaw((byte *)~stringbuf, len);
+		string = stringbuf;
+	}
+}
+
+void HRR::Serialize()
+{
+	int outver = (stream.IsStoring() && (info.mono || info.method >= info.METHOD_ZIM) ? 5 : 4);
+	version = StreamHeading(stream, outver, 1, 5, "\r\n"
+		"High-Resolution Raster\r\n"
+		"Copyright �1999 Cybex Development, spol. s r.o.\r\n");
+	if(version >= 1)
+		stream % info;
+	if(version >= 2)
+		stream % map_offset;
+	else
+		map_offset = 0;
+	if(version >= 1)
+	{
+		if(stream.IsLoading() || pixel_directory.IsEmpty() || mask_directory.IsEmpty())
+		{
+			directory_sizeof = 0;
+			pixel_directory.Clear();
+			pixel_directory.SetCount(info.levels);
+			for(int i = 0; i < info.levels; i++)
+			{
+				int c = 1 << (2 * i);
+				pixel_directory[i].SetCount(c, 0);
+				directory_sizeof += c * 2 * sizeof(int);
+			}
+			mask_directory <<= pixel_directory;
+		}
+		if(version <= 3 || !info.mono)
+			for(int l = 0; l < info.levels; l++)
+				stream.SerializeRaw((byte *)pixel_directory[l].Begin(),
+					sizeof(pixel_directory[0][0]) * pixel_directory[l].GetCount());
+		if(version >= 3 && (IsNull(info.background) || info.mono))
+			for(int m = 0; m < info.levels; m++)
+				stream.SerializeRaw((byte *)mask_directory[m].Begin(),
+					sizeof(mask_directory[0][0]) * mask_directory[m].GetCount());
+	}
+	if(map_offset && version > 3)
+	{
+		int64 mappos = Unpack64(map_offset);
+		if(stream.IsStoring() && stream.GetSize() < mappos) {
+			stream.Seek(stream.GetSize());
+			stream.Put(0, (int)(mappos - stream.GetSize()));
+		}
+		if(stream.IsStoring() || mappos >= 0 && mappos < stream.GetSize()) {
+			stream.Seek(mappos);
+			int count = map.GetCount();
+			stream / count;
+			for(int i = 0; i < count; i++)
+			{
+				String key;
+				String val;
+				if(stream.IsStoring())
+				{
+					key = map.GetKey(i);
+					val = map[i];
+				}
+				StreamHRRString(stream, key);
+				StreamHRRString(stream, val);
+				if(stream.IsLoading())
+					map.Add(key, val);
+			}
+		}
+	}
+	else
+		map.Clear();
+}
+
+void HRR::Write(Writeback drawback, bool downscale)
+{
+	ASSERT(stream.IsOpen());
+	if(map_offset > 0)
+	{
+		int64 mu = Unpack64(map_offset);
+		stream.Seek(mu);
+		stream.SetSize(mu);
+		map_offset = 0;
+	}
+	One<StreamRasterEncoder> encoder = CreateEncoder(info);
+	if(!encoder)
+		throw Exc(String().Cat() << "Unsupported HRR encoding: " << info.GetMethod());
+
+	bool abort = false;
+	try
+	{
+		Write(drawback, downscale, 0, 0, 0, *encoder, 0);
+	}
+	catch(AbortExc)
+	{
+		abort = true;
+	}
+	map_offset = CeilPack64(stream.GetPos());
+	stream.Seek(0);
+	Serialize(); // update header
+	if(abort)
+		throw AbortExc();
+}
+
+Matrixf HRR::GetPixMapMatrix(int level, int x, int y) const
+{
+	double fac = 1 << level;
+	double xx = info.map_rect.Width() / fac, yy = -info.map_rect.Height() / fac;
+	return Matrixf(xx, 0, 0, yy, info.map_rect.left + xx * x, info.map_rect.bottom + yy * y);
+}
+
+int64 HRR::GetFileWriteSize() const
+{
+	ASSERT(stream.IsOpen());
+	return stream.GetSize();
+}
+
+Rectf HRR::GetLogBlockRect(int level, const Rect& rc) const
+{
+	return Rectf(rc) * GetPixMapMatrix(level, 0, 0);
+/*	Rectf r(rc);
+	double fac = 1.0 / (1 << level);
+	r = r * fac;
+	double t = r.bottom; r.bottom = 1 - r.top; r.top = 1 - t;
+	return r * info.map_rect.Size() + info.map_rect.TopLeft();
+*/
+}
+
+bool HRR::Write(Writeback drawback, bool downscale, int level, int px, int py,
+				StreamRasterEncoder& format, Block *put)
+{
+	static const Size SUNIT(info.UNIT, info.UNIT);
+	Block block(*this);
+//	TIMING("HRR::Write");
+
+	if(level >= info.levels - info.LCOUNT)
+	{ // generate all at once
+//		TIMING("HRR::Write(short step)");
+//		static TimingInspector __part("HRR::Write(part)");
+//		__part.Start();
+		int count = info.levels - level - 1;
+		// step & render individual images
+		block.Init(SUNIT << count, info.background);
+//		__part.End();
+		block.level = level + count;
+		block.area = RectC(px << count, py << count, 1 << count, 1 << count);
+		block.log_area = GetLogBlockRect(block.level, block.area);
+		bool done = drawback(block);
+		if(!done && downscale)
+			return false;
+
+		while(count >= 0)
+		{
+			int n = 1 << count;
+			for(Size a(0, 0); a.cy < n; a.cy++)
+				for(a.cx = 0; a.cx < n; a.cx++)
+				{
+					Point src = a * info.UNIT;
+					Size part_size = GetLogBlockSize(GetLogBlockRect(level + count, RectC(a.cx, a.cy, 1, 1)), info.log_rect);
+					if(part_size.cx <= 0 || part_size.cy <= 0)
+						continue;
+					ImageBuffer part(part_size);
+					RasterCopy(ImageWriter(part, false), ImageBufferRaster(block.block), Rect(src, part_size));
+					int lin = (int)((px << count) + a.cx + (((py << count) + a.cy) << (count + level)));
+//					TIMING("HRR::Write / save (direct)");
+					if(info.mono || IsNull(info.background)) {
+						int kind = GetMaskInfo(~part, part.GetLength());
+						if(kind != 1 && !info.mono) {
+							int pixoff = CeilPack64(stream.GetPos());
+							pixel_directory[level + count][lin] = pixoff;
+							int64 pixpos = Unpack64(pixoff);
+							if(stream.GetSize() < pixpos)
+								stream.Put(0, (int)(pixpos - stream.GetSize()));
+							stream.Seek(pixpos);
+//							Stream64Stream pixstream(stream, pixpos);
+							format.Save(stream, ImageBufferRaster(part));
+						}
+						if(kind == 2 || (kind == 1 && info.mono)) {
+							String s = EncodeMask(part, version >= 5);
+							ASSERT(s.GetLength() >= 4);
+							int maskoff = CeilPack64(stream.GetPos());
+							mask_directory[level + count][lin] = maskoff;
+							int64 maskpos = Unpack64(maskoff);
+							if(stream.GetSize() < maskpos)
+								stream.Put(0, (int)(maskpos - stream.GetSize()));
+							stream.Seek(maskpos);
+							stream.PutIL(s.GetLength());
+							stream.Put(s, s.GetLength());
+						}
+					}
+					else
+					{
+						int pixoff = CeilPack64(stream.GetPos());
+						pixel_directory[level + count][lin] = pixoff;
+						int64 pixpos = Unpack64(pixoff);
+						if(stream.GetSize() < pixpos)
+							stream.Put(0, (int)(pixpos - stream.GetSize()));
+						stream.Seek(pixpos);
+//						Stream64Stream pixstream(stream, pixpos);
+						format.Save(stream, ImageBufferRaster(part));
+					}
+				}
+			if(--count >= 0) // reduce image
+				if(downscale) {
+					Size sz = SUNIT << count;
+					ImageBuffer new_data(sz);
+					Rescale(ImageWriter(new_data, false), sz, ImageBufferRaster(block.block), block.size);
+					block.block = new_data;
+				}
+				else {
+					block.Init(SUNIT << count, info.background);
+					block.level = level + count;
+					block.area = RectC(px << count, py << count, 1 << count, 1 << count);
+					drawback(block);
+				}
+		}
+	}
+	else
+	{ // too big - bisect to generate higher level
+//		TIMING("HRR::Write (long step)");
+		Block *ptr = 0;
+		if(downscale) {
+			Size part_size = GetLogBlockSize(GetLogBlockRect(level, RectC(px, py, 1, 1)), info.log_rect);
+			if(part_size.cx <= 0 || part_size.cy <= 0)
+				return false;
+			block.Init(part_size, info.background);
+			ptr = &block;
+		}
+		bool done = Write(drawback, downscale, level + 1, 2 * px + 0, 2 * py + 0, format, ptr);
+		done     |= Write(drawback, downscale, level + 1, 2 * px + 1, 2 * py + 0, format, ptr);
+		done     |= Write(drawback, downscale, level + 1, 2 * px + 0, 2 * py + 1, format, ptr);
+		done     |= Write(drawback, downscale, level + 1, 2 * px + 1, 2 * py + 1, format, ptr);
+		if(!done && downscale)
+			return false;
+		if(!downscale) {
+			block.Init(SUNIT, info.background);
+			block.level = level;
+			block.area = RectC(px, py, 1, 1);
+			block.log_area = GetLogBlockRect(block.level, block.area);
+			drawback(block);
+		}
+		int lin = px + (py << level);
+//		TIMING("HRR::Write / save (indirect)");
+		if(info.mono || IsNull(info.background)) {
+			int kind = GetMaskInfo(block.block, block.block.GetLength());
+			if(kind != 1 && !info.mono) {
+				int pixoff = CeilPack64(stream.GetPos());
+				pixel_directory[level][lin] = pixoff;
+				int64 pixpos = Unpack64(pixoff);
+				if(stream.GetSize() < pixpos)
+					stream.Put(0, (int)(pixpos - stream.GetSize()));
+				stream.Seek(pixpos);
+				//Stream64Stream pixstream(stream, pixpos);
+				format.Save(stream, ImageBufferRaster(block.block));
+			}
+			if(kind == 2 || (kind == 1 && info.mono)) {
+				String s = EncodeMask(block.block, version >= 5);
+				ASSERT(s.GetLength() >= 4);
+				int maskoff = CeilPack64(stream.GetPos());
+				mask_directory[level][lin] = maskoff;
+				int64 maskpos = Unpack64(maskoff);
+				if(stream.GetSize() < maskpos)
+					stream.Put(0, (int)(maskpos - stream.GetSize()));
+				stream.Seek(maskpos);
+				stream.PutIL(s.GetLength());
+				stream.Put(s, s.GetLength());
+			}
+		}
+		else
+		{
+			int pixoff = CeilPack64(stream.GetPos());
+			pixel_directory[level][lin] = pixoff;
+			int64 pixpos = Unpack64(pixoff);
+			while(stream.GetSize() < pixpos)
+				stream.Put(0, (int)min<int64>(pixpos - stream.GetSize(), 1 << 24));
+			stream.Seek(pixpos);
+			//Stream64Stream pixstream(stream, pixpos);
+			format.Save(stream, ImageBufferRaster(block.block));
+		}
+	}
+	if(put) {
+//		TIMING("HRR::Write / put");
+		Rect org = RectC((px & 1) << info.HALF_BITS, (py & 1) << info.HALF_BITS,
+			1 << info.HALF_BITS, 1 << info.HALF_BITS);
+		Rescale(ImageWriter(put->block, org.TopLeft(), false), org.Size(), ImageBufferRaster(block.block), RUNIT);
+	}
+	return true;
+}
+
+void HRR::SetMap(String key, String value)
+{
+	if(IsNull(value))
+	{
+		int i = map.Find(key);
+		if(i >= 0)
+			map.Remove(i);
+	}
+	else
+		map.GetAdd(key) = value;
+}
+
+void HRR::FlushMap()
+{
+	ASSERT(stream.IsOpen());
+	if(map_offset == 0)
+		map_offset = CeilPack64(stream.GetSize());
+	stream.Seek(0);
+	stream.SetStoring();
+	Serialize();
+}
+
+int HRR::SizeOfInstance() const
+{
+	return sizeof(*this) + directory_sizeof + cache_sizeof;
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/Geom/Draw/hrr.h b/uppsrc/Geom/Draw/hrr.h
new file mode 100644
index 000000000..390e4475d
--- /dev/null
+++ b/uppsrc/Geom/Draw/hrr.h
@@ -0,0 +1,234 @@
+#ifndef __Geom_Draw_hrr__
+#define __Geom_Draw_hrr__
+
+NAMESPACE_UPP
+
+//#include "Stream.h"
+
+class ImageWriter : public RasterEncoder {
+public:
+	ImageWriter() : output(NULL) {}
+	ImageWriter(ImageBuffer& output, bool merge = true)                       { Open(output, merge); }
+	ImageWriter(ImageBuffer& output, Point pos, bool merge = true)            { Open(output, pos, merge); }
+	ImageWriter(ImageBuffer& output, Point pos, Rect clip, bool merge = true) { Open(output, pos, clip, merge); }
+
+	void         Open(ImageBuffer& output, bool merge = true)                 { Open(output, Point(0, 0), merge); }
+	void         Open(ImageBuffer& output, Point pos, bool merge = true)      { Open(output, pos, Rect(output.GetSize()), merge); }
+	void         Open(ImageBuffer& output, Point pos, Rect clip, bool merge = true);
+
+	virtual void Start(Size sz);
+	virtual void WriteLineRaw(const byte *data);
+
+private:
+	ImageBuffer  *output;
+	Point        pos;
+	int          left, width, offset;
+	Rect         clip;
+	int          line;
+	Size         src_size;
+	bool         merge;
+};
+
+class ImageBufferRaster : public Raster {
+public:
+	ImageBufferRaster(const ImageBuffer& buffer) : buffer(buffer) {}
+
+	virtual Size    GetSize();
+	virtual Info    GetInfo();
+	virtual Line    GetLine(int line);
+
+private:
+	const ImageBuffer& buffer;
+};
+
+class HRRInfo
+{
+	friend class HRR;
+
+public:
+	HRRInfo();
+	HRRInfo(Rectf log_rect, int levels = 5, Color background = White,
+		int method = METHOD_JPG, int quality = DFLT_JPG_QUALITY,
+		bool mono = false, Color mono_black = Black, Color mono_white = White);
+
+	void               Serialize(Stream& stream);
+
+	bool               IsEmpty() const       { return levels == 0; }
+
+	int                GetLevels() const     { return levels; }
+	int                GetMaxSize() const    { return levels ? UNIT << (levels - 1) : 0; }
+	Rectf              GetLogRect() const    { return log_rect; }
+	Rectf              GetMapRect() const    { return map_rect; }
+	Color              GetBackground() const { return background; }
+	bool               IsMono() const        { return mono; }
+	Color              GetMonoBlack() const  { return mono_black; }
+	Color              GetMonoWhite() const  { return mono_white; }
+	int                GetMethod() const     { return method; }
+	int                GetQuality() const    { return quality; }
+
+	One<StreamRaster>  GetDecoder() const;
+	One<StreamRasterEncoder> GetEncoder() const;
+
+	static double      GetEstimatedFileSize(int _levels, int method, int quality);
+
+	static int         Pack(int method, int quality) { return (method << 16) | (quality & 0xFFFF); }
+	static int         Method(int p)         { return p >> 16; }
+	static int         Quality(int p)        { return p & 0xFFFF; }
+
+	static Vector<int> EnumMethods();
+	static Vector<int> EnumQualities(int method);
+	static String      GetName(int method, int quality);
+	static VectorMap<int, String> GetPackMap();
+
+public:
+	enum
+	{
+		HALF_BITS = 8,
+		HALF      = 1 << HALF_BITS,
+		UNIT      = HALF << 1,
+		STDLEVEL  = 6,
+		MAXLEVELS = 12,
+		LCOUNT    = 2,
+		UCOUNT    = 1 << LCOUNT,
+	};
+
+	enum
+	{
+		METHOD_JPG,
+		METHOD_GIF,
+		METHOD_RLE,
+		METHOD_PNG,
+		METHOD_ZIM,
+		METHOD_BZM,
+
+		DFLT_JPG_QUALITY = 50,
+	};
+
+protected:
+	Color      background;
+	Color      mono_black;
+	Color      mono_white;
+	Rectf      log_rect;
+	Rectf      map_rect; // logical rectangle inflated to tightly bounding square
+	int        levels;
+	int        method;
+	int        quality;
+	bool       mono;
+};
+
+class HRR
+{
+public:
+	struct Block
+	{
+		Block(const HRR& hrr) : hrr(hrr) {}
+
+		void        Init(Size size, RGBA color);
+
+		ImageBuffer block;
+		Size        size;
+		Rect        area;
+		Rectf       log_area;
+		int         level;
+		const HRR&  hrr;
+	};
+
+	struct Cursor {
+		Cursor(HRR& owner, const Rectf& extent, double measure, int alpha = 100,
+			Color mono_black = Null, Color mono_white = Null, Color blend_bgnd = Null);
+
+		bool Fetch(Rectf& part_rc);
+		Image Get();
+
+		HRR& owner;
+		Rectf extent;
+		double measure;
+		Color mono_black;
+		Color mono_white;
+		int alpha;
+		Color blend_bgnd;
+
+		One<StreamRaster> raster;
+		int level;
+		int total;
+		Rect rc;
+		Point block;
+		int cimg;
+	};
+
+	friend struct Cursor;
+
+	enum
+	{
+		DEFAULT_CACHE_SIZEOF_LIMIT = 20000000,
+	};
+
+	typedef Gate1<Block&>      Writeback;
+
+	HRR();
+	HRR(const char *path, bool read_only = true);
+
+	bool                       Open(const char *path, bool read_only = true);
+	void                       Close();
+
+	bool                       Create(const HRRInfo& _info, const char *path);
+	void                       Write(Writeback drawback, bool downscale = true);
+	Rectf                      GetLogBlockRect(int level, const Rect& rc) const;
+	Matrixf                    GetPixMapMatrix(int level, int x, int y) const;
+	int64                      GetFileWriteSize() const;
+
+	void                       SetCacheSizeLimit(int cl)       { FlushCache(cache_sizeof_limit = cl); }
+	int                        GetCacheSizeLimit() const       { return cache_sizeof_limit; }
+	int                        GetCacheSize() const            { return cache_sizeof + directory_sizeof; }
+	void                       ClearCache();
+
+	String                     GetMap(String key) const        { return map.Get(key, Null); }
+	void                       SetMap(String key, String value);
+	void                       ClearMap(String key)            { SetMap(key, Null); }
+	void                       ClearMap()                      { map.Clear(); }
+	const VectorMap<String, String>& GetMap() const            { return map; }
+	void                       FlushMap();
+
+	bool                       IsOpen() const                  { return stream.IsOpen(); }
+	bool                       IsError() const                 { return stream.IsError(); }
+	int                        SizeOfInstance() const;
+
+	void                       Paint(Draw& draw, Rect dest, Rectf src,
+		int wash = 100, int max_pixel = 1, Color mono_black = Null, Color mono_white = Null, Color blend_bgnd = Null);
+
+	void                       Paint(Draw& draw, const Matrixf& trg_pix, GisTransform transform,
+		int wash = 100, int max_pixel = 1, Color mono_black = Null, Color mono_white = Null, Color blend_bgnd = Null);
+
+	static int                 GetProgressCount(int levels, bool downscale = true);
+
+	const HRRInfo&             GetInfo() const                 { return info; }
+
+	static One<StreamRasterEncoder> (*CreateEncoder)(const HRRInfo& info);
+	static One<StreamRaster>        (*CreateDecoder)(const HRRInfo& info);
+	static One<StreamRasterEncoder> StdCreateEncoder(const HRRInfo& info);
+	static One<StreamRaster>        StdCreateDecoder(const HRRInfo& info);
+
+private:
+	bool                       Write(Writeback drawback, bool downscale, int level, int px, int py,
+		StreamRasterEncoder& format, Block *put);
+	void                       Serialize();
+	void                       FlushCache(int limit);
+
+private:
+	HRRInfo                    info;
+	FileStream                 stream;
+	int                        version;
+	Vector< Vector<int> >      pixel_directory;
+	Vector< Vector<int> >      mask_directory;
+	int                        directory_sizeof;
+	ArrayMap<int, Image>       image_cache;
+	VectorMap<int, Size>       size_cache;
+	int                        cache_sizeof;
+	int                        cache_sizeof_limit;
+	VectorMap<String, String>  map;
+	int                        map_offset;
+};
+
+END_UPP_NAMESPACE
+
+#endif//__Geom_Draw_hrr__
diff --git a/uppsrc/Geom/Draw/imgtran.cpp b/uppsrc/Geom/Draw/imgtran.cpp
new file mode 100644
index 000000000..3dc22bc5d
--- /dev/null
+++ b/uppsrc/Geom/Draw/imgtran.cpp
@@ -0,0 +1,570 @@
+#include "GeomDraw.h"
+#pragma hdrstop
+
+NAMESPACE_UPP
+
+//#define BILINEAR_TIMING
+
+#define RGBA_SET(d, s) *(dword *)&(d) = *(const dword *)&(s)
+
+#define MINMAX0(x, hi) ((x) < 0 ? 0 : (x) > (hi) ? (hi) : (int)(x))
+
+struct SideSegment
+{
+	Point64 src16;
+	Size64  src16add;
+	int64   dest16;
+	int64   dest16add;
+
+	void  operator -- ()      { src16 -= src16add; dest16 -= dest16add; }
+	void  operator ++ ()      { src16 += src16add; dest16 += dest16add; }
+	void  operator += (int i) { src16 += i * src16add; dest16 += i * dest16add; }
+};
+
+static SideSegment CalcSideSegment(Point d1, Point d2, Point s1, Point s2, int y1)
+{
+	if(d2.y < d1.y) {
+		Swap(d1, d2);
+		Swap(s1, s2);
+	}
+	SideSegment sgm;
+	int ht = max<int>(d2.y - d1.y, 1);
+	sgm.dest16 = ((int64)d1.x << 16) + 0x8000;
+	sgm.dest16add = (int64)(d2.x - d1.x) * 0x10000 / ht;
+	sgm.src16 = ((Point64)s1 << 16) + (int64)0x8000;
+	sgm.src16add = (Size64)(s2 - s1) * (int64)0x10000 / (int64)ht;
+	if((y1 -= d1.y) > 0)
+		sgm += y1;
+	return sgm;
+}
+
+#ifdef BILINEAR_TIMING
+int64 linsec_pixels = 0;
+int   linsec_msecs = 0;
+EXITBLOCK {
+	RLOG("LinearSection: #pixels = " << linsec_pixels << ", " << linsec_msecs << " msecs, "
+		<< linsec_pixels / max<int64>(1000 * linsec_msecs, 1) << " MPixels/s");
+}
+#endif
+
+typedef void (*TransformScanProc)(RGBA *dest, int count, Point64 sl16, Size64 sd16,
+	const RGBA *src, Size src_size, int enterclip, int leaveclip);
+
+static void TransformScanOpaqueNearest(RGBA *dest, int count, Point64 sl16, Size64 sd16,
+	const RGBA *src, Size src_size, int enterclip, int leaveclip)
+{
+	int xmax = (src_size.cx << 16) - 0x10001;
+	int ymax = (src_size.cy << 16) - 0x10001;
+	for(int i = enterclip; --i >= 0; dest++, sl16 += sd16)
+		RGBA_SET(*dest, src[(MINMAX0(sl16.x, xmax) >> 16)
+			+ ((int)MINMAX0(sl16.y, ymax) >> 16) * src_size.cx]);
+	if(enterclip < count) {
+		Point sl16i(sl16);
+		Size sd16i(sd16);
+		for(int i = leaveclip - enterclip; --i >= 0; dest++, sl16i += sd16i) {
+			ASSERT(sl16i.x >= 0 && sl16i.x <= xmax && sl16i.y >= 0 && sl16i.y <= ymax);
+			RGBA_SET(*dest, src[(sl16i.x >> 16) + (sl16i.y >> 16) * src_size.cx]);
+		}
+		sl16 = sl16i;
+		for(int i = count - leaveclip; --i >= 0; dest++, sl16 += sd16)
+			RGBA_SET(*dest, src[(MINMAX0(sl16.x, xmax) >> 16)
+				+ ((int)MINMAX0(sl16.y, ymax) >> 16) * src_size.cx]);
+	}
+}
+
+static void TransformScanAlphaNearest(RGBA *dest, int count, Point64 sl16, Size64 sd16,
+	const RGBA *src, Size src_size, int enterclip, int leaveclip)
+{
+	int xmax = (src_size.cx << 16) - 0x10001;
+	int ymax = (src_size.cy << 16) - 0x10001;
+	for(int i = enterclip; --i >= 0; dest++, sl16 += sd16) {
+		RGBA pixel = src[(MINMAX0(sl16.x, xmax) >> 16)
+			+ ((int)MINMAX0(sl16.y, ymax) >> 16) * src_size.cx];
+		if(pixel.a) {
+			if(pixel.a > dest->a) dest->a = pixel.a;
+			int coef = pixel.a * 256 / dest->a;
+			dest->r += ((pixel.r - dest->r) * coef) >> 8;
+			dest->g += ((pixel.g - dest->g) * coef) >> 8;
+			dest->b += ((pixel.b - dest->b) * coef) >> 8;
+		}
+	}
+	if(enterclip < count) {
+		Point sl16i(sl16);
+		Size sd16i(sd16);
+		for(int i = leaveclip - enterclip; --i >= 0; dest++, sl16i += sd16i) {
+			ASSERT(sl16i.x >= 0 && sl16i.x <= xmax && sl16i.y >= 0 && sl16i.y <= ymax);
+			RGBA pixel = src[(sl16i.x >> 16) + (sl16i.y >> 16) * src_size.cx];
+			if(pixel.a) {
+				if(pixel.a > dest->a) dest->a = pixel.a;
+				int coef = pixel.a * 256 / dest->a;
+				dest->r += ((pixel.r - dest->r) * coef) >> 8;
+				dest->g += ((pixel.g - dest->g) * coef) >> 8;
+				dest->b += ((pixel.b - dest->b) * coef) >> 8;
+			}
+		}
+		sl16 = sl16i;
+		for(int i = count - leaveclip; --i >= 0; dest++, sl16 += sd16) {
+			RGBA pixel = src[(MINMAX0(sl16.x, xmax) >> 16)
+				+ ((int)MINMAX0(sl16.y, ymax) >> 16) * src_size.cx];
+			if(pixel.a) {
+				if(pixel.a > dest->a) dest->a = pixel.a;
+				int coef = pixel.a * 256 / dest->a;
+				dest->r += ((pixel.r - dest->r) * coef) >> 8;
+				dest->g += ((pixel.g - dest->g) * coef) >> 8;
+				dest->b += ((pixel.b - dest->b) * coef) >> 8;
+			}
+		}
+	}
+}
+
+static void TransformScanOpaqueBilinear(RGBA *dest, int count, Point64 sl16, Size64 sd16,
+	const RGBA *src, Size src_size, int enterclip, int leaveclip)
+{
+	int xmax = (src_size.cx << 16) - 0x10001;
+	int ymax = (src_size.cy << 16) - 0x10001;
+	for(; --count >= 0; dest++, sl16 += sd16) {
+		int x = MINMAX0(sl16.x, xmax) >> 8;
+		int y = MINMAX0(sl16.y, ymax) >> 8;
+		const RGBA *row1 = &src[(y >> 8) * src_size.cx + (x >> 8)];
+		const RGBA *row2 = row1 + src_size.cx;
+		int t1, t2;
+		t1 = row1[0].r * 256 + (row1[1].r - row1[0].r) * (byte)x;
+		t2 = row2[0].r * 256 + (row2[1].r - row2[0].r) * (byte)x;
+		dest->r = (t1 * 256 + (t2 - t1) * (byte)y) >> 16;
+		t1 = row1[0].g * 256 + (row1[1].g - row1[0].g) * (byte)x;
+		t2 = row2[0].g * 256 + (row2[1].g - row2[0].g) * (byte)x;
+		dest->g = (t1 * 256 + (t2 - t1) * (byte)y) >> 16;
+		t1 = row1[0].b * 256 + (row1[1].b - row1[0].b) * (byte)x;
+		t2 = row2[0].b * 256 + (row2[1].b - row2[0].b) * (byte)x;
+		dest->b = (t1 * 256 + (t2 - t1) * (byte)y) >> 16;
+		dest->a = 255;
+	}
+}
+
+static void TransformScanAlphaBilinear(RGBA *dest, int count, Point64 sl16, Size64 sd16,
+	const RGBA *src, Size src_size, int enterclip, int leaveclip)
+{
+	int xmax = (src_size.cx << 16) - 0x10001;
+	int ymax = (src_size.cy << 16) - 0x10001;
+	for(; --count >= 0; dest++, sl16 += sd16) {
+		int x = MINMAX0(sl16.x, xmax) >> 8;
+		int y = MINMAX0(sl16.y, ymax) >> 8;
+		const RGBA *row1 = &src[(y >> 8) * src_size.cx + (x >> 8)];
+		const RGBA *row2 = row1 + src_size.cx;
+		int t1, t2;
+		t1 = row1[0].r * 256 + (row1[1].r - row1[0].r) * (byte)x;
+		t2 = row2[0].r * 256 + (row2[1].r - row2[0].r) * (byte)x;
+		byte r = (t1 * 256 + (t2 - t1) * (byte)y) >> 16;
+		t1 = row1[0].g * 256 + (row1[1].g - row1[0].g) * (byte)x;
+		t2 = row2[0].g * 256 + (row2[1].g - row2[0].g) * (byte)x;
+		byte g = (t1 * 256 + (t2 - t1) * (byte)y) >> 16;
+		t1 = row1[0].b * 256 + (row1[1].b - row1[0].b) * (byte)x;
+		t2 = row2[0].b * 256 + (row2[1].b - row2[0].b) * (byte)x;
+		byte b = (t1 * 256 + (t2 - t1) * (byte)y) >> 16;
+		t1 = row1[0].a * 256 + (row1[1].a - row1[0].a) * (byte)x;
+		t2 = row2[0].a * 256 + (row2[1].a - row2[0].a) * (byte)x;
+		if(byte a = (t1 * 256 + (t2 - t1) * (byte)y) >> 16) {
+			if(a > dest->a) dest->a = a;
+			int coef = a * 256 / dest->a;
+			dest->r += ((r - dest->r) * coef) >> 8;
+			dest->g += ((g - dest->g) * coef) >> 8;
+			dest->b += ((b - dest->b) * coef) >> 8;
+		}
+	}
+}
+
+static int TransformSection(ImageBuffer& dest, const RGBA *src, Size src_size,
+	SideSegment& left, SideSegment& right, Rect clip, TransformScanProc scanproc)
+{
+	int xmax = (src_size.cx << 16) - 0x10001;
+	int ymax = (src_size.cy << 16) - 0x10001;
+	int npixels = 0;
+	for(int y = clip.top; y < clip.bottom; ++y, ++left, ++right) {
+		int dl = (int)(left.dest16 >> 16), n = (int)((right.dest16 >> 16) - dl + 1);
+		if(n <= 0)
+			continue;
+		Size64 sd16 = (right.src16 - left.src16) / (int64)n;
+		Point64 sl16 = left.src16;
+		if(dl < clip.left) {
+			n += dl - clip.left;
+			sl16 += sd16 * (int64)(clip.left - dl);
+			dl = clip.left;
+		}
+		if(dl + n > clip.right)
+			n = clip.right - dl;
+		int enterclip = 0;
+		int leaveclip = n;
+		Point64 sr16 = sl16 + sd16 * (n - 1);
+		if(sd16.cx > 0) {
+			if(sl16.x < 0)
+				enterclip = (int)(~sl16.x / sd16.cx) + 1;
+			if(sr16.x > xmax)
+				leaveclip = n - 1 - (int)((sr16.x - xmax - 1) / sd16.cx);
+		}
+		else if(sd16.cx < 0) {
+			if(sl16.x > xmax)
+				enterclip = (int)((sl16.x - xmax - 1) / -sd16.cx) + 1;
+			if(sr16.x < 0)
+				leaveclip = n - 1 - (int)(~sr16.x / -sd16.cx);
+		}
+		else {
+			sl16.x = minmax<int64>(sl16.x, 0, xmax);
+			if(src_size.cy == 1)
+				enterclip = n;
+		}
+
+		if(sd16.cy > 0) {
+			if(sl16.y < 0)
+				enterclip = max(enterclip, (int)(~sl16.y / sd16.cy) + 1);
+			if(sr16.y > ymax)
+				leaveclip = min(leaveclip, n - 1 - (int)((sr16.y - ymax - 1) / sd16.cy));
+		}
+		else if(sd16.cy < 0) {
+			if(sl16.y > ymax)
+				enterclip = max(enterclip, (int)((sl16.y - ymax - 1) / -sd16.cy) + 1);
+			if(sr16.y < 0)
+				leaveclip = min(leaveclip, n - 1 - (int)(~sr16.y / -sd16.cy));
+		}
+		else {
+			sl16.y = minmax<int64>(sl16.y, 0, ymax);
+			if(src_size.cy == 1)
+				enterclip = n;
+		}
+		enterclip = minmax(enterclip, 0, n);
+		leaveclip = minmax(leaveclip, 0, n);
+		if(leaveclip <= enterclip)
+			enterclip = leaveclip = n;
+
+		npixels += n;
+		RGBA *d = &dest[y][dl];
+		scanproc(d, n, sl16, sd16, src, src_size, enterclip, leaveclip);
+	}
+	return npixels;
+}
+
+static int TransformSet(ImageBuffer& dest, RGBA color, SideSegment& left, SideSegment& right, Rect clip)
+{
+	int npixels = 0;
+	for(int y = clip.top; y < clip.bottom; ++y, ++left, ++right) {
+		int dl = (int)(left.dest16 >> 16), n = (int)((right.dest16 >> 16) - dl + 1);
+		if(n <= 0)
+			continue;
+		if(dl < clip.left) {
+			n += dl - clip.left;
+			dl = clip.left;
+		}
+		if(dl + n > clip.right)
+			n = clip.right - dl;
+		npixels += n;
+		RGBA *d = &dest[y][dl];
+		if(color.a == 255)
+			Fill(d, color, n);
+		else {
+			for(; --n >= 0; d++) {
+				if(color.a > d->a) d->a = color.a;
+				int coef = color.a * 256 / d->a;
+				d->r += ((color.r - d->r) * coef) >> 8;
+				d->g += ((color.g - d->g) * coef) >> 8;
+				d->b += ((color.b - d->b) * coef) >> 8;
+			}
+		}
+	}
+	return npixels;
+}
+
+#ifdef BILINEAR_TIMING
+static void TransformTiming(ImageBuffer& dest, const RGBA *src, Size src_size,
+	SideSegment& left, SideSegment& right, Rect clip, TransformScanProc scanproc)
+{
+	SideSegment old_left = left, old_right = right;
+	int start = msecs(), total;
+	int npixels = 0;
+	do {
+		left = old_left;
+		right = old_right;
+		npixels += TransformSection(dest, src, src_size, left, right, clip, scanproc);
+	}
+	while((total = msecs(start)) < 20);
+	linsec_pixels += npixels;
+	linsec_msecs += total;
+}
+#else
+#define TransformTiming TransformSection
+#endif
+
+static TransformScanProc GetTransformProc(int kind, bool interpolate)
+{
+	if(kind == IMAGE_OPAQUE) return interpolate
+		? &TransformScanOpaqueBilinear : &TransformScanOpaqueNearest;
+	return interpolate ? &TransformScanAlphaBilinear : &TransformScanAlphaNearest;
+}
+
+void LinearSet(ImageBuffer& dest, Point d0, Point d1, Point d2, RGBA color, const Rect *opt_clip)
+{
+	Rect clip(dest.GetSize());
+	if(opt_clip)
+		clip &= *opt_clip;
+	if(clip.IsEmpty())
+		return;
+	if(d0.y > d1.y) { Swap(d0, d1); }
+	if(d1.y > d2.y) { Swap(d1, d2); if(d0.y > d1.y) { Swap(d0, d1); } }
+	if(d0.y > clip.top) clip.top = d0.y;
+	if(d2.y < clip.bottom) clip.bottom = d2.y + 1;
+	Rect clip01, clip12;
+	clip01 = clip12 = clip;
+	clip01.bottom = clip12.top = minmax(d1.y, clip.top, clip.bottom);
+	SideSegment sg01 = CalcSideSegment(d0, d1, Point(0, 0), Point(0, 0), clip01.top);
+	SideSegment sg12 = CalcSideSegment(d1, d2, Point(0, 0), Point(0, 0), clip12.top);
+	SideSegment sg02 = CalcSideSegment(d0, d2, Point(0, 0), Point(0, 0), clip.top);
+	if(sg01.dest16add < sg02.dest16add) {
+		TransformSet(dest, color, sg01, sg02, clip01);
+		TransformSet(dest, color, sg12, sg02, clip12);
+	}
+	else {
+		TransformSet(dest, color, sg02, sg01, clip01);
+		TransformSet(dest, color, sg02, sg12, clip12);
+	}
+}
+
+void LinearCopy(ImageBuffer& dest, Point d0, Point d1, Point d2,
+	const Image& src, Point s0, Point s1, Point s2, const Rect *opt_clip, bool interpolate)
+{
+	Rect clip(dest.GetSize());
+	if(opt_clip)
+		clip &= *opt_clip;
+	if(clip.IsEmpty())
+		return;
+	TransformScanProc scanproc = GetTransformProc(src.GetKind(), interpolate);
+	if(d0.y > d1.y) { Swap(d0, d1); Swap(s0, s1); }
+	if(d1.y > d2.y) { Swap(d1, d2); Swap(s1, s2); if(d0.y > d1.y) { Swap(d0, d1); Swap(s0, s1); } }
+	if(d0.y > clip.top) clip.top = d0.y;
+	if(d2.y < clip.bottom) clip.bottom = d2.y + 1;
+	Rect clip01, clip12;
+	clip01 = clip12 = clip;
+	clip01.bottom = clip12.top = minmax(d1.y, clip.top, clip.bottom);
+	SideSegment sg01 = CalcSideSegment(d0, d1, s0, s1, clip01.top);
+	SideSegment sg12 = CalcSideSegment(d1, d2, s1, s2, clip12.top);
+	SideSegment sg02 = CalcSideSegment(d0, d2, s0, s2, clip.top);
+	if(sg01.dest16add < sg02.dest16add) {
+		TransformTiming(dest, ~src, src.GetSize(), sg01, sg02, clip01, scanproc);
+		TransformTiming(dest, ~src, src.GetSize(), sg12, sg02, clip12, scanproc);
+	}
+	else {
+		TransformTiming(dest, ~src, src.GetSize(), sg02, sg01, clip01, scanproc);
+		TransformTiming(dest, ~src, src.GetSize(), sg02, sg12, clip12, scanproc);
+	}
+}
+
+void BilinearSet(ImageBuffer& dest, Point d1, Point d2, Point d3, Point d4, RGBA color, const Rect *clip)
+{
+	Point destpos[] = { d1, d2, d3, d4 };
+	BilinearSet(dest, destpos, color, clip);
+}
+
+void BilinearSet(ImageBuffer& dest, Point destpos[4], RGBA color, const Rect *opt_clip)
+{
+	Rect clip(dest.GetSize());
+	if(opt_clip)
+		clip &= *opt_clip;
+	if(clip.IsEmpty())
+		return;
+
+	int ybrk[4];
+	SideSegment sides[4];
+	int i;
+	for(i = 0; i < 4; i++) {
+//		ASSERT(src_pixel.GetRect().Contains(srcpos[i]));
+		sides[i].dest16 = Null;
+		ybrk[i] = destpos[i].y;
+		for(int j = i; --j >= 0 && ybrk[j] > ybrk[j + 1]; Swap(ybrk[j], ybrk[j + 1]))
+			;
+	}
+	ybrk[3]++;
+
+	for(i = 0; i < 3; i++) {
+		int top = ybrk[i], bottom = ybrk[i + 1];
+		if(top >= clip.bottom)
+			return;
+		if(bottom <= clip.top)
+			continue;
+		Rect subclip(clip.left, max(top, clip.top), clip.right, min(bottom, clip.bottom));
+		int half = subclip.Height() >> 1;
+		int active[4];
+		int64 mid[4];
+		int acount = 0;
+		Point prev = destpos[3];
+		for(int s = 0; s < 4; s++) {
+			Point next = destpos[s];
+			if(next.y < prev.y)
+				Swap(prev, next);
+			if(prev.y < subclip.bottom && next.y > subclip.top) {
+				if(IsNull(sides[s].dest16))
+					sides[s] = CalcSideSegment(prev, next, Point(0, 0), Point(0, 0), subclip.top);
+				mid[acount] = sides[s].dest16 + sides[s].dest16add * half;
+				active[acount] = s;
+				for(int t = acount++; --t >= 0 && mid[t] > mid[t + 1]; Swap(mid[t], mid[t + 1]), Swap(active[t], active[t + 1]))
+					;
+			}
+			prev = destpos[s];
+		}
+		if(acount != 2 && acount != 4)
+			continue;
+		SideSegment *sal = &sides[active[(acount >> 1) - 1]];
+		SideSegment *sar = &sides[active[(acount >> 1) - 0]];
+		int64 dt = sar->dest16 - sal->dest16, dw = sar->dest16add - sal->dest16add, db = dt + dw * (subclip.Height() - 1);
+		int ycross = Null;
+		Rect crossclip;
+		if(dt >= +0x10000 && db <= -0x10000 || dt <= -0x10000 && db >= +0x10000) {
+			ycross = (int)(subclip.top - dt / dw);
+			crossclip = subclip;
+			crossclip.top = subclip.bottom = ycross;
+			if(dt < 0)
+				Swap(sal, sar);
+		}
+		if(acount == 4) {
+			TransformSet(dest, color, sides[active[0]], *sal, subclip);
+			TransformSet(dest, color, *sar, sides[active[3]], subclip);
+			if(!IsNull(ycross)) {
+				TransformSet(dest, color, sides[active[0]], *sar, crossclip);
+				TransformSet(dest, color, *sal, sides[active[3]], crossclip);
+			}
+		}
+		else {
+			TransformSet(dest, color, *sal, *sar, subclip);
+			if(!IsNull(ycross))
+				TransformSet(dest, color, *sar, *sal, crossclip);
+		}
+	}
+}
+
+void BilinearCopy(ImageBuffer& dest, Point destpos[4], const Image& src, Point srcpos[4],
+	const Rect *opt_clip, bool interpolate)
+{
+	Rect clip(dest.GetSize());
+	if(opt_clip)
+		clip &= *opt_clip;
+	if(clip.IsEmpty())
+		return;
+
+	TransformScanProc scanproc = GetTransformProc(src.GetKind(), interpolate);
+	int ybrk[4];
+	SideSegment sides[4];
+	int i;
+	for(i = 0; i < 4; i++) {
+//		ASSERT(src_pixel.GetRect().Contains(srcpos[i]));
+		sides[i].dest16 = Null;
+		ybrk[i] = destpos[i].y;
+		for(int j = i; --j >= 0 && ybrk[j] > ybrk[j + 1]; Swap(ybrk[j], ybrk[j + 1]))
+			;
+	}
+	ybrk[3]++;
+
+	for(i = 0; i < 3; i++) {
+		int top = ybrk[i], bottom = ybrk[i + 1];
+		if(top >= clip.bottom)
+			return;
+		if(bottom <= clip.top)
+			continue;
+		Rect subclip(clip.left, max(top, clip.top), clip.right, min(bottom, clip.bottom));
+		int half = subclip.Height() >> 1;
+		int active[4];
+		int64 mid[4];
+		int acount = 0;
+		Point prev = destpos[3], sprev = srcpos[3];
+		for(int s = 0; s < 4; s++) {
+			Point next = destpos[s], snext = srcpos[s];
+			if(next.y < prev.y) {
+				Swap(prev, next);
+				Swap(sprev, snext);
+			}
+			if(prev.y < subclip.bottom && next.y > subclip.top) {
+				if(IsNull(sides[s].dest16))
+					sides[s] = CalcSideSegment(prev, next, sprev, snext, subclip.top);
+				mid[acount] = sides[s].dest16 + sides[s].dest16add * half;
+				active[acount] = s;
+				for(int t = acount++; --t >= 0 && mid[t] > mid[t + 1]; Swap(mid[t], mid[t + 1]), Swap(active[t], active[t + 1]))
+					;
+			}
+			prev = destpos[s];
+			sprev = srcpos[s];
+		}
+		if(acount != 2 && acount != 4)
+			continue;
+		SideSegment *sal = &sides[active[(acount >> 1) - 1]];
+		SideSegment *sar = &sides[active[(acount >> 1) - 0]];
+		int64 dt = sar->dest16 - sal->dest16, dw = sar->dest16add - sal->dest16add, db = dt + dw * (subclip.Height() - 1);
+		int ycross = Null;
+		Rect crossclip;
+		if(dt >= +0x10000 && db <= -0x10000 || dt <= -0x10000 && db >= +0x10000) {
+			ycross = (int)(subclip.top - dt / dw);
+			crossclip = subclip;
+			crossclip.top = subclip.bottom = ycross;
+			if(dt < 0)
+				Swap(sal, sar);
+		}
+		if(acount == 4) {
+			TransformTiming(dest, ~src, src.GetSize(), sides[active[0]], *sal, subclip, scanproc);
+			TransformTiming(dest, ~src, src.GetSize(), *sar, sides[active[3]], subclip, scanproc);
+			if(!IsNull(ycross)) {
+				TransformTiming(dest, ~src, src.GetSize(), sides[active[0]], *sar, crossclip, scanproc);
+				TransformTiming(dest, ~src, src.GetSize(), *sal, sides[active[3]], crossclip, scanproc);
+			}
+		}
+		else {
+			TransformTiming(dest, ~src, src.GetSize(), *sal, *sar, subclip, scanproc);
+			if(!IsNull(ycross))
+				TransformTiming(dest, ~src, src.GetSize(), *sar, *sal, crossclip, scanproc);
+		}
+	}
+}
+
+void BilinearCopy(ImageBuffer& dest, Point d1, Point d2, Point d3, Point d4,
+	const Image& src, Point s1, Point s2, Point s3, Point s4, const Rect *opt_clip, bool interpolate)
+{
+	Point destpos[4] = { d1, d2, d3, d4 }, srcpos[4] = { s1, s2, s3, s4 };
+	BilinearCopy(dest, destpos, src, srcpos, opt_clip, interpolate);
+}
+
+void BilinearCopy(ImageBuffer& dest, Point d1, Point d2, Point d3, Point d4,
+	const Image& src, Rect sr, const Rect *opt_clip, bool interpolate)
+{
+	Point destpos[4] = { d1, d2, d3, d4 };
+	Point srcpos[4] = { Point(sr.left, sr.top), Point(sr.right - 1, sr.top),
+		Point(sr.right - 1, sr.bottom - 1), Point(sr.left, sr.bottom - 1) };
+	BilinearCopy(dest, destpos, src, srcpos, opt_clip, interpolate);
+}
+
+void BilinearCopy(ImageBuffer& dest, Point destpos[4], const Image& src, Rect sr,
+	const Rect *opt_clip, bool interpolate)
+{
+	Point srcpos[4] = { Point(sr.left, sr.top), Point(sr.right - 1, sr.top),
+		Point(sr.right - 1, sr.bottom - 1), Point(sr.left, sr.bottom - 1) };
+	BilinearCopy(dest, destpos, src, srcpos, opt_clip, interpolate);
+}
+
+static inline Pointf Cvp(double x, double y, double sina, double cosa)
+{
+	return Pointf(x * cosa + y * sina, -x * sina + y * cosa);
+}
+
+Image BilinearRotate(const Image& m, int angle)
+{
+	RTIMING("Rotate");
+	Size isz = m.GetSize();
+	Point center = isz / 2;
+	Pointf centerf = Pointf(Point(isz)) / 2;
+	double sina, cosa;
+	Draw::SinCos(angle, sina, cosa);
+	Pointf p1 = Cvp(-centerf.x, -centerf.y, sina, cosa);
+	Pointf p2 = Cvp(centerf.x, -centerf.y, sina, cosa);
+	Size sz2 = Size(2 * (int)max(tabs(p1.x), tabs(p2.x)),
+	                2 * (int)max(tabs(p1.y), tabs(p2.y)));
+	Point dcenter = sz2 / 2;
+	ImageBuffer ib(sz2);
+	Fill(~ib, RGBAZero(), ib.GetLength());
+	BilinearCopy(ib, dcenter + (Point)p1, dcenter + (Point)p2, dcenter - (Point)p1, dcenter - (Point)p2,
+	             m, Point(0, 0), Point(isz.cx, 0), isz, Point(0, isz.cy));
+	return ib;
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/Geom/Draw/imgtran.h b/uppsrc/Geom/Draw/imgtran.h
new file mode 100644
index 000000000..9d9e2e2d8
--- /dev/null
+++ b/uppsrc/Geom/Draw/imgtran.h
@@ -0,0 +1,26 @@
+#ifndef _Geom_Draw_imgtran_h_
+#define _Geom_Draw_imgtran_h_
+
+NAMESPACE_UPP
+
+void LinearSet(ImageBuffer& dest, Point d0, Point d1, Point d2, RGBA color, const Rect *opt_clip = NULL);
+void LinearCopy(ImageBuffer& dest, Point d0, Point d1, Point d2,
+	const Image& src, Point s0, Point s1, Point s2, const Rect *opt_clip = NULL, bool interpolate = true);
+
+void BilinearSet(ImageBuffer& dest, Point d1, Point d2, Point d3, Point d4, RGBA color, const Rect *clip = NULL);
+void BilinearSet(ImageBuffer& dest, Point destpos[4], RGBA color, const Rect *clip = NULL);
+
+void BilinearCopy(ImageBuffer& dest, Point d1, Point d2, Point d3, Point d4,
+	const Image& src, Point s1, Point s2, Point s3, Point s4, const Rect *clip = NULL, bool interpolate = true);
+void BilinearCopy(ImageBuffer& dest, Point destpos[4],
+	const Image& src, Point srcpos[4], const Rect *opt_clip = NULL, bool interpolate = true);
+void BilinearCopy(ImageBuffer& dest, Point d1, Point d2, Point d3, Point d4,
+	const Image& src, Rect sr, const Rect *opt_clip = NULL, bool interpolate = true);
+void BilinearCopy(ImageBuffer& dest, Point destpos[4],
+	const Image& src, Rect sr, const Rect *opt_clip = NULL, bool interpolate = true);
+
+Image BilinearRotate(const Image& m, int angle);
+
+END_UPP_NAMESPACE
+
+#endif
diff --git a/uppsrc/Geom/Draw/pathDraw.cpp b/uppsrc/Geom/Draw/pathDraw.cpp
new file mode 100644
index 000000000..c5bfe4c6f
--- /dev/null
+++ b/uppsrc/Geom/Draw/pathDraw.cpp
@@ -0,0 +1,2037 @@
+#include "GeomDraw.h"
+#pragma hdrstop
+
+NAMESPACE_UPP
+
+#define LLOG(x) // LOG(x)
+
+enum { THICK = 5, THICKDOT = 20 };
+extern void (*PathDraw_Output_Thick[THICK][THICK])(PathDraw::Output& out, Point a, Point b);
+
+static const char *ParseCString(const char *p, String& out)
+{
+	try
+	{
+		CParser parser(p);
+		out = parser.ReadOneString();
+		return parser.GetPtr();
+	}
+	catch(CParser::Error e)
+	{
+		throw Exc(e);
+	}
+}
+
+static String FormatPrec(double d)
+{
+	return Format("%+.*g", PathStyle::PREC, d);
+}
+
+//////////////////////////////////////////////////////////////////////
+// PathStyle::Trace::
+
+String PathStyle::Trace::Encode() const
+{
+	String out;
+	out << FormatPrec(left) << FormatPrec(left_top) << FormatPrec(left_bottom)
+		<< FormatPrec(right) << FormatPrec(right_top) << FormatPrec(right_bottom);
+	if(!IsNull(color))
+		out << Format("*%02x%02x%02x", color.GetR(), color.GetG(), color.GetB());
+	return out;
+}
+
+const char *PathStyle::Trace::Decode(const char *s)
+{
+	if(IsNull(left  = ScanDouble(s, &s)) || IsNull(left_top  = ScanDouble(s, &s)) || IsNull(left_bottom  = ScanDouble(s, &s))
+	|| IsNull(right = ScanDouble(s, &s)) || IsNull(right_top = ScanDouble(s, &s)) || IsNull(right_bottom = ScanDouble(s, &s)))
+		return 0;
+	if(*s == '*')
+	{ // color
+		for(int i = 1; i <= 6; i++)
+			if(!IsXDigit(s[i]))
+				return 0; // error
+		color = Color(16 * ctoi(s[1]) + ctoi(s[2]), 16 * ctoi(s[3]) + ctoi(s[4]), 16 * ctoi(s[5]) + ctoi(s[6]));
+		s += 7;
+	}
+	return s;
+}
+
+void PathStyle::Trace::Serialize(Stream& stream)
+{
+	String s;
+	if(stream.IsStoring())
+		s = Encode();
+	stream % s;
+	if(stream.IsLoading())
+	{
+		const char *p = Decode(s);
+		if(!p || *p)
+			stream.SetError();
+	}
+}
+
+bool PathStyle::Trace::IsEqual(const Trace& t) const
+{
+	return left == t.left && left_top == t.left_top && left_bottom == t.left_bottom
+		&& right == t.right && right_top == t.right_top && right_bottom == t.right_bottom
+		&& color == t.color;
+}
+
+PathStyle::Trace& PathStyle::Trace::Crop(double l, double r)
+{
+	if(l <= left && r >= right)
+		return *this;
+
+	if(r <= l || right <= l)
+	{
+		left = right = l;
+		left_top = right_top;
+		left_bottom = right_bottom;
+	}
+	else if(left >= r)
+	{
+		right = left = r;
+		right_top = left_top;
+		right_bottom = left_bottom;
+	}
+	else
+	{
+		if(l < left)  l = left;
+		if(r > right) r = right;
+		double rl = (l - left) / Width(), rr = (right - r) / Width();
+		double th = TopHeight(), bh = BottomHeight();
+		left = l;
+		right = r;
+		left_top += rl * th;
+		right_top -= rr * th;
+		left_bottom += rl * bh;
+		right_bottom -= rr * bh;
+	}
+	return *this;
+}
+
+void PathStyle::Trace::Inflate(Pointf amount)
+{
+	left -= amount.x;
+	right += amount.x;
+	left_top -= amount.y;
+	right_top -= amount.y;
+	left_bottom += amount.y;
+	right_bottom += amount.y;
+}
+
+bool PathStyle::Trace::Contains(Pointf pt) const
+{
+	if(pt.x < left || pt.x > right
+		|| pt.y < min(left_top, right_top) || pt.y > max(left_bottom, right_bottom))
+		return false;
+	double wd = right - left;
+	if(left_top != right_top && wd * (pt.y - left_top) < (pt.x - left) * (right_top - left_top))
+		return false;
+	if(left_bottom != right_bottom && wd * (pt.y - left_bottom) > (pt.x - left) * (right_bottom - left_bottom))
+		return false;
+	return true;
+}
+
+double PathStyle::Trace::GetDistance(Pointf pt) const
+{
+	double dl = (pt.y < left_top  ? pt | LeftTop()  : pt.y > left_bottom  ? pt | LeftBottom()  : tabs(pt.x - left));
+	double dr = (pt.y < right_top ? pt | RightTop() : pt.y > right_bottom ? pt | RightBottom() : tabs(pt.x - right));
+	double dt = Distance(pt, LeftTop(), RightTop());
+	double db = Distance(pt, LeftBottom(), RightBottom());
+	return min(min(dl, dr), min(dt, db));
+}
+
+static bool CheckTrack(Pointf A, Pointf B, Pointf tolerance)
+{
+	return tabs(A.x - B.x) <= tolerance.x && tabs(A.y - B.y) <= tolerance.y;
+}
+
+int PathStyle::Trace::GetTrackStyle(Pointf pt, Pointf tolerance, Pointf& start) const
+{
+	return CheckTrack(pt, start = LeftTop(),      tolerance) ? LEFT | LEFT_TOP
+		:  CheckTrack(pt, start = CenterTop(),    tolerance) ? LEFT_TOP | RIGHT_TOP
+		:  CheckTrack(pt, start = RightTop(),     tolerance) ? RIGHT | RIGHT_TOP
+		:  CheckTrack(pt, start = LeftCenter(),   tolerance) ? LEFT
+		:  CheckTrack(pt, start = RightCenter(),  tolerance) ? RIGHT
+		:  CheckTrack(pt, start = LeftBottom(),   tolerance) ? LEFT | LEFT_BOTTOM
+		:  CheckTrack(pt, start = CenterBottom(), tolerance) ? LEFT_BOTTOM | RIGHT_BOTTOM
+		:  CheckTrack(pt, start = RightBottom(),  tolerance) ? RIGHT | RIGHT_BOTTOM
+		:  0;
+}
+
+Image PathStyle::Trace::GetTrackCursor(int style)
+{
+	switch(style)
+	{
+	case LEFT | LEFT_TOP:      return Image::SizeTopLeft();
+	case RIGHT | RIGHT_BOTTOM: return Image::SizeBottomRight();
+	case RIGHT | RIGHT_TOP:    return Image::SizeTopRight();
+	case LEFT | LEFT_BOTTOM:   return Image::SizeBottomLeft();
+	case LEFT_TOP | RIGHT_TOP:
+	case LEFT_BOTTOM | RIGHT_BOTTOM:
+		return Image::SizeVert();
+
+	case LEFT:
+	case RIGHT:
+		return Image::SizeHorz();
+	}
+	return Null;
+}
+
+void PathStyle::Trace::Paint(PlotterTool& tool, bool reduce, Color outline) const
+{
+	bool he = IsHorzEmpty();
+	bool ve = IsVertEmpty();
+
+	if(he && ve)
+	{ // point
+		Plotter& plot = tool.GetPlotter();
+		if(plot.InLClip(LeftTop()))
+		{
+			Point pt = plot.LtoPoint(LeftTop());
+			plot.draw->DrawRect(pt.x - 4, pt.y - 4, 9, 9, outline);
+		}
+	}
+	else if(reduce && (he || ve))
+	{
+		tool.MoveTo(left, Top());
+		tool.LineTo(right, Bottom());
+		tool.Paint();
+	}
+	else
+	{
+		tool.MoveTo(left,  left_top);
+		tool.LineTo(right, right_top);
+		tool.LineTo(right, right_bottom);
+		tool.LineTo(left,  left_bottom);
+		tool.LineTo(left,  left_top);
+		tool.Paint();
+	}
+}
+
+PathStyle::Trace& PathStyle::Trace::Track(Pointf delta, int style)
+{
+	if(style & LEFT)         left         += delta.x;
+	if(style & LEFT_TOP)     left_top     += delta.y;
+	if(style & RIGHT_TOP)    right_top    += delta.y;
+
+	if(style & RIGHT)        right        += delta.x;
+	if(style & LEFT_BOTTOM)  left_bottom  += delta.y;
+	if(style & RIGHT_BOTTOM) right_bottom += delta.y;
+
+	if(left > right)
+	{
+		Swap(left, right);
+		Swap(left_top, right_top);
+		Swap(left_bottom, right_bottom);
+	}
+	if(left_top > left_bottom)
+		Swap(left_top, left_bottom);
+	if(right_top > right_bottom)
+		Swap(right_top, right_bottom);
+	return *this;
+}
+
+PathStyle::Trace& PathStyle::Trace::Bind(const Rectf& rc)
+{
+	if(rc.left   > left)         left         = rc.left;
+	if(rc.right  < right)        right        = rc.right;
+	if(rc.top    > left_top)     left_top     = rc.top;
+	if(rc.top    > right_top)    right_top    = rc.top;
+	if(rc.bottom < left_bottom)  left_bottom  = rc.bottom;
+	if(rc.bottom < right_bottom) right_bottom = rc.bottom;
+	return *this;
+}
+
+//////////////////////////////////////////////////////////////////////
+// PathStyle::Clip::
+
+void PathStyle::Clip::Serialize(Stream& stream)
+{
+	int version = StreamHeading(stream, 1, 1, 1, "PathStyle::Clip");
+	if(version >= 1)
+		stream % traces;
+}
+
+Rectf PathStyle::Clip::GetExtent() const
+{
+	Rectf rc = Null;
+	for(int i = 0; i < traces.GetCount(); i++)
+		rc |= traces[i].GetExtent();
+	return rc;
+}
+
+//////////////////////////////////////////////////////////////////////
+// PathStyle::
+
+PathStyle::PathStyle(pick_ PathStyle& style)
+: PathStyleMisc(style), traces(style.traces)
+{
+	ASSERT(&style != &PathStyle::solid());
+}
+
+PathStyle& PathStyle::operator = (pick_ PathStyle& style)
+{
+	ASSERT(&style != &PathStyle::solid());
+	PathStyleMisc::operator = (style);
+	traces = style.traces;
+	return *this;
+}
+
+bool PathStyle::IsSolid(double& wd, Color& co) const
+{
+	double tol = 1e-6;
+	if(traces.GetCount() != 1 || tabs(begin) > tol || tabs(end) > tol)
+		return false;
+	const Trace& tr = traces[0];
+	if(tabs(tr.left) > tol || tabs(tr.right - segment) > tol
+	|| tabs(tr.left_top - tr.right_top) > tol || tabs(tr.left_bottom - tr.right_bottom) > tol
+	|| tabs(tr.left_top + tr.left_bottom) > tol)
+		return false;
+	wd = 2 * tabs(tr.left_top);
+	co = tr.color;
+	return true;
+}
+
+String PathStyle::Encode() const
+{
+	String out;
+	out << 'p' << FormatPrec(width)
+		<< FormatPrec(begin) << FormatPrec(segment) << FormatPrec(end)
+		<< '<';
+	for(int i = 0; i < traces.GetCount(); i++)
+		out.Cat(traces[i].Encode());
+	out << '>' << (miter == MITER_ROUND ? 'r' : miter == MITER_SHARP ? 's' : 'f');
+	if(miter == MITER_SHARP)
+		out << FormatPrec(chamfer);
+	return out;
+}
+
+const char *PathStyle::Decode(const char *s)
+{
+	if(*s++ == 'p'
+		&& !IsNull(width   = ScanDouble(s, &s))
+		&& !IsNull(begin   = ScanDouble(s, &s))
+		&& !IsNull(segment = ScanDouble(s, &s))
+		&& !IsNull(end     = ScanDouble(s, &s))
+		&& *s++ == '<')
+	{
+		while(*s == '+' || *s == '-')
+		{
+			Trace t;
+			if((s = t.Decode(s)) == 0)
+				return 0;
+			traces.Add(t);
+		}
+		if(*s++ == '>' && (*s == 'r' || *s == 's' || *s == 'f'))
+		{
+			chamfer = STD_CHAMFER;
+			miter = (*s == 'r' ? MITER_ROUND : *s == 's' ? MITER_SHARP : MITER_FLAT);
+			s++;
+			if(miter != MITER_SHARP || !IsNull(chamfer = ScanDouble(s, &s)))
+				return s;
+		}
+	}
+	return 0;
+}
+
+void PathStyle::Serialize(Stream& stream)
+{
+	String s;
+	if(stream.IsStoring())
+		s = Encode();
+	stream % s;
+	if(stream.IsLoading() && !Decode(s))
+		stream.SetError();
+}
+
+const PathStyle& PathStyle::empty()
+{
+	static PathStyle p;
+	return p;
+}
+
+const PathStyle& PathStyle::solid()
+{
+	static PathStyle p;
+	if(p.IsEmpty())
+		p.traces << PathStyle::Trace(0, -0.5, +0.5, 1, -0.5, +0.5);
+	return p;
+}
+
+const PathStyle& PathStyle::dash()
+{
+	static PathStyle p;
+	if(p.IsEmpty())
+	{
+		p.segment = 4;
+		p.traces
+			<< PathStyle::Trace(0, -0.5, +0.5, 1, -0.5, +0.5)
+			<< PathStyle::Trace(3, -0.5, +0.5, 4, -0.5, +0.5);
+	}
+	return p;
+}
+
+const PathStyle& PathStyle::dot()
+{
+	static PathStyle p;
+	if(p.IsEmpty())
+	{
+		p.segment = 2;
+		p.traces << PathStyle::Trace(0.5, -0.5, +0.5, 1.5, -0.5, +0.5);
+	}
+	return p;
+}
+
+const PathStyle& PathStyle::dash_dot()
+{
+	static PathStyle p;
+	if(p.IsEmpty())
+	{
+		p.segment = 7;
+		p.traces
+			<< PathStyle::Trace(0, -0.5, +0.5, 1, -0.5, +0.5)
+			<< PathStyle::Trace(3, -0.5, +0.5, 4, -0.5, +0.5)
+			<< PathStyle::Trace(6, -0.5, +0.5, 7, -0.5, +0.5);
+	}
+	return p;
+}
+
+const PathStyle& PathStyle::dash_dot_dot()
+{
+	static PathStyle p;
+	if(p.traces.IsEmpty())
+	{
+		p.segment = 10;
+		p.traces
+			<< PathStyle::Trace(0, -0.5, +0.5, 1, -0.5, +0.5)
+			<< PathStyle::Trace(3, -0.5, +0.5, 4, -0.5, +0.5)
+			<< PathStyle::Trace(6, -0.5, +0.5, 7, -0.5, +0.5)
+			<< PathStyle::Trace(9, -0.5, +0.5, 10, -0.5, +0.5);
+	}
+	return p;
+}
+
+void PathStyleMap::Serialize(Stream& stream)
+{
+	int version = 1;
+	stream / version % map;
+	if(stream.IsLoading())
+		sort.Clear();
+}
+
+String PathStyleMap::Export() const
+{
+	String out;
+	out << "# PathStyleMap version 1\n"
+		"$" << AsCString(name) << "\n";
+	for(int i = 0; i < map.GetCount(); i++)
+		out << AsCString(map.GetKey(i)) << '=' << map[i].Encode() << '\n';
+	return out;
+}
+
+void PathStyleMap::Import(String s, bool update_existing)
+{
+	int line = 1;
+	try
+	{
+		for(const char *p = s; *p;)
+			if((byte)*p <= ' ')
+			{
+				if(*p++ == '\n')
+					line++;
+			}
+			else if(*p == '#')
+			{ // comment - skip until end of line
+				while(*p && *p++ != '\n')
+					;
+				line++;
+			}
+			else if(*p == '$')
+			{ // style name
+				if(*++p != '\"')
+					throw Exc(String().Cat() << "o�ek�v�n znak \", nalezeno: " << StringSample(p, 10));
+				p = ParseCString(p + 1, name);
+			}
+			else if(*p == '\"')
+			{
+				String sn;
+				p = ParseCString(p + 1, sn);
+				if(*p != '=')
+					throw Exc(String().Cat() << "o�ek�v�no '=', nalezeno: " << StringSample(p, 10));
+				if(IsNull(sn))
+					throw Exc(String().Cat() << "n�zev stylu je pr�zdn�");
+				for(p++; *p && *p != '\n' && (byte)*p <= ' '; p++)
+					;
+				PathStyle ps;
+				p = ps.Decode(p);
+				if(!p)
+					throw Exc(String().Cat() << "neplatn� definice stylu '" << name << "'");
+				if(map.Find(sn) < 0 || update_existing)
+					Set(sn, ps);
+			}
+			else
+				throw Exc(String().Cat() << "neplatn� za��tek ��dku: " << StringSample(p, 10));
+	}
+	catch(Exc e)
+	{
+		throw Exc(String().Cat() << "��dek " << line << ": " << e);
+	}
+}
+
+const Vector<int>& PathStyleMap::GetSort() const
+{
+	if(sort.IsEmpty() && !map.IsEmpty())
+		sort = GetSortOrder(map.GetKeys(), GetLanguageInfo());
+	return sort;
+}
+
+PathStyle PathStyleMap::Scan(String name, const PathStyle& dflt) const
+{
+	if(IsNull(name))
+		return PathStyle(dflt, 0);
+	if(this)
+	{
+		int i = map.Find(name);
+		if(i >= 0)
+			return PathStyle(map[i], 0);
+	}
+	PathStyle ps;
+	const char *end = ps.Decode(name);
+	if(!end || *end)
+		return PathStyle(dflt, 0);
+	return ps;
+}
+
+int PathStyleMap::FindSortName(String name, int exclude) const
+{
+	for(int i = 0; i < GetCount(); i++)
+		if(i != exclude && GetSortName(i) == name)
+			return i;
+	return -1;
+}
+
+String PathStyleMap::GetUniqueName(String prefix) const
+{
+	int max_index = -1;
+	int pl = prefix.GetLength();
+	for(int i = 0; i < GetCount(); i++)
+	{
+		String s = map.GetKey(i);
+		if(s.GetLength() >= pl + 2 && !memcmp(s, prefix, pl))
+		{
+			const char *p = s.Begin() + pl;
+			if(*p == ' ' && IsDigit(*++p))
+			{
+				int x = stou(p, &p);
+				if(*p == 0)
+					max_index = max(max_index, x);
+			}
+		}
+		else if(s == prefix)
+			max_index = 0;
+	}
+	if(max_index < 0)
+		return prefix;
+	return prefix + ' ' + IntStr(max_index + 1);
+}
+
+PathStyleMap& PathStyleMap::App()
+{
+	static PathStyleMap psm;
+	if(psm.IsEmpty())
+	{
+		psm.Set(".empty",        PathStyle::empty());
+		psm.Set(".solid",        PathStyle::solid());
+		psm.Set(".dash",         PathStyle::dash());
+		psm.Set(".dot",          PathStyle::dot());
+		psm.Set(".dash_dot",     PathStyle::dash_dot());
+		psm.Set(".dash_dot_dot", PathStyle::dash_dot_dot());
+	}
+	return psm;
+}
+
+static void RecurseArc(Vector<Point>& out, Pointf begin, Pointf end, double l, double h, int maxvert)
+{
+	if(maxvert <= 1 || tabs(h) <= 1 || l <= 1)
+	{
+		out.Add(PointfToPoint(end));
+		return;
+	}
+	Pointf normal = Left(end - begin) * (h / l);
+	Pointf centre = Mid(begin, end) + normal;
+	double ll = centre | end;
+	double hh = h * ll / (2 * ll + l);
+	maxvert >>= 1;
+	RecurseArc(out, begin,  centre, ll, hh, maxvert);
+	RecurseArc(out, centre, end,    ll, hh, maxvert);
+}
+
+static Vector<Point>& GetArcPath(Vector<Point>& out, Point begin, Point end, double height, int maxvert = 256)
+{
+	RecurseArc(out, begin, end, hypot(begin.x - end.x, begin.y - end.y), height, maxvert);
+	return out;
+}
+
+static Vector<Point> GetArcPath(Point begin, Point end, double height, int maxvert = 256)
+{
+	Vector<Point> out;
+	return GetArcPath(out, begin, end, height, maxvert);
+}
+
+void PathDraw::Output::AddNext(const Vector<Point>& list)
+{
+	Point old = vertices.Top();
+	int c = vertices.GetCount();
+	for(const Point *p = list.Begin(), *e = list.End(); p != e; ++p)
+		if(*p != old)
+			vertices.Add(old = *p);
+	counts.Top() += vertices.GetCount() - c;
+}
+
+void PathDraw::Output::AddFirst(Point pt)
+{
+	if(!counts.IsEmpty() && counts.Top() == 1)
+		vertices.Top() = pt;
+	else if(vertices.IsEmpty() || vertices.Top() != pt)
+	{
+		vertices.Add(pt);
+		counts.Add(1);
+	}
+}
+
+void PathDraw::Output::AddThick(void (*ln)(Output& out, Point a, Point b), Point start, const Vector<Point>& list)
+{
+	if(!list.IsEmpty())
+	{
+		ln(*this, start, list[0]);
+		for(const Point *p = list.Begin() + 1, *e = list.End(); p < e; p++)
+			ln(*this, p[-1], p[0]);
+	}
+}
+
+Point *PathDraw::Output::AddSeg(int segments, int seg_count)
+{
+	int c = vertices.GetCount();
+	int n = counts.GetCount();
+	if(c > 0 && counts[n - 1] == 1)
+		c--, n--;
+	vertices.SetCountR(c + segments * seg_count);
+	counts.SetCountR(n + segments);
+	Fill(counts.Begin() + n, counts.End(), seg_count);
+	return vertices.Begin() + c;
+}
+
+Point *PathDraw::Output::AddSeg(int count)
+{
+	int c = vertices.GetCount();
+	int n = counts.GetCount();
+	if(n > 0 && counts[n - 1] == 1)
+	{
+		c--;
+		counts[n - 1] = count;
+	}
+	else
+		counts.Add(count);
+	vertices.SetCountR(c + count);
+	return &vertices[c];
+}
+
+void PathDraw::Output::Flush()
+{
+	int cc = counts.GetCount();
+	if(cc == 0)
+		return;
+	int vc = vertices.GetCount();
+	if(counts[cc - 1] == 1)
+	{
+		if(--cc == 0)
+			return;
+		vc--;
+	}
+	draw.DrawPolyPolyline(vertices.Begin(), vc, counts.Begin(), cc, width, color);
+	Point end = vertices.Top();
+	vertices.SetCountR(1);
+	vertices[0] = end;
+	counts.SetCountR(1);
+	counts[0] = 1;
+}
+
+PathDraw::PathDraw()
+{
+	moveto = 0;
+	lineto = 0;
+}
+
+PathDraw::PathDraw(Draw& _draw, const PathStyle& _style, Color _color, double _width, double _dash, bool _closed)
+{
+	Set(_draw, _style, _color, _width, _dash, _closed);
+}
+
+void PathDraw::Clear()
+{
+	draw = 0;
+	style = 0;
+	split_buffer.Clear();
+	outputs.Clear();
+	segment_lines.Clear();
+	open_traces.Clear();
+	traces.Clear();
+}
+
+void PathDraw::AddSegment(const PathStyle::Trace& trace, bool infinite)
+{
+	int ltop, lbot;
+	ltop = fround(width * trace.Top());
+	lbot = fround(width * trace.Bottom());
+	if(width * trace.LeftHeight() > 1)
+	{
+		ltop = fround(width * trace.left_top);
+		lbot = ltop + fround(width * trace.LeftHeight());
+	}
+	else
+		ltop = lbot = fround(width * (trace.left_top + trace.left_bottom) / 2);
+	Color c = Nvl(trace.color, std_color);
+/*
+	int   wd =
+	int x = outputs.Find(c);
+	if(x < 0 || infinite)
+	{
+		x = outputs.GetCount();
+		outputs.Add(c, new Output(c, *draw));
+	}
+*/
+	if(infinite)
+	{
+		Linear& ln = segment_lines.Add();
+		ln = Linear(ltop, lbot, c, -1);
+		int w = ln.bottom - ln.top;
+		ln.ground = false;
+		ln.color = c;
+		if(w <= (draw->Pixels() ? THICK : THICKDOT))
+		{
+			w = max<int>(w - 1, 0);
+			ln.ground = (tabs(ln.top + ln.bottom) <= 1);
+			ln.top = ln.bottom = (ln.top + ln.bottom) >> 1;
+			if(draw->Pixels())
+			{
+				ln.hline = PathDraw_Output_Thick[w][w];
+				w = 0;
+			}
+			else
+				ln.hline = PathDraw_Output_Thick[0][0];
+		}
+		if(!ln.ground && (ltop || lbot))
+			calc_miter = true;
+		int x;
+		for(x = outputs.Find(c); x >= 0 && outputs[x].width != w; x = outputs.FindNext(c))
+			;
+		if(x < 0)
+		{
+			x = outputs.GetCount();
+			outputs.Add(c, new Output(c, w, *draw));
+		}
+		ln.index = x;
+	}
+	else
+	{
+		if(traces.GetCount() == seg.start)
+		{
+			seg.top = ltop;
+			seg.bottom = lbot;
+		}
+		else
+		{
+			seg.top = min(seg.top, ltop);
+			seg.bottom = max(seg.bottom, lbot);
+		}
+
+		Trace& t = traces.Add();
+		t.left_top = ltop;
+		t.left_bottom = lbot;
+		t.right_top = fround(width * trace.right_top);
+		t.right_bottom = t.right_top + fround(width * trace.RightHeight());
+		double wd = dash * trace.Width();
+		t.top_step = (t.right_top - t.left_top) / wd;
+		t.bottom_step = (t.right_bottom - t.left_bottom) / wd;
+		t.start = fround(dash * trace.left);
+		t.width = fround(dash * trace.right) - t.start + 1;
+		t.vline = (t.width <= 1);
+		t.hline = 0;
+		int lw = t.left_bottom - t.left_top;
+		int rw = t.right_bottom - t.right_top;
+		int sw = 0;
+		if(draw->Dots() && lw <= THICKDOT && tabs(rw - lw) <= 5)
+		{
+			sw = (rw + lw) >> 1;
+			t.hline = PathDraw_Output_Thick[0][0];
+/*			if(t.width > 0)
+			{
+				t.start++;
+				t.width = max<int>(t.width - 2, 1);
+			}
+*/		}
+		else if(draw->Pixels() && lw <= THICK && rw <= THICK)
+		{
+			sw = 0;
+			t.hline = PathDraw_Output_Thick[max<int>(0, lw - 1)]
+				[max<int>(0, rw - 1)];
+			t.left_top  = t.left_bottom  = (t.left_top  + t.left_bottom)  >> 1;
+			t.right_top = t.right_bottom = (t.right_top + t.right_bottom) >> 1;
+/*			if(t.width > 0 && lw > 1)
+			{
+				t.start++;
+				t.width = max<int>(t.width - 2, 1);
+			}
+*/		}
+		t.left_ground = (t.left_top ^ t.left_bottom) < 0;
+		t.right_ground = (t.right_top ^ t.right_bottom) < 0;
+		t.color = c;
+		int x;
+		for(x = outputs.Find(c); x >= 0 && outputs[x].width != sw; x = outputs.FindNext(x))
+			;
+		if(x < 0)
+		{
+			x = outputs.GetCount();
+			outputs.Add(c, new Output(c, sw, *draw));
+		}
+		t.index = x;
+		calc_miter = true;
+	}
+}
+
+void PathDraw::Set(Draw& _draw, const PathStyle& _style, Color _color, double _width, double _dash, bool _closed)
+{
+	//RTIMING("PathDraw::Set");
+
+	ASSERT(_dash != 0);
+
+	Clear();
+
+	draw = &_draw;
+
+	style = &_style;
+	std_color = _color;
+	width = _width;
+	double avg = GetAvgPixelsPerDot(*draw);
+	if(width < 0)
+		width *= -avg;
+	if(width < 1)
+		width = 1;
+	LLOG("PathDraw::Set: pixels = " << draw->Pixels() << ", avg pixels per dot = " << avg << ", px width = " << width);
+	dash = Nvl(_dash, width);
+	if(dash < 0)
+		dash *= -avg;
+
+	miter = style->miter;
+	clip_rect = draw->GetClip();
+	double cr = style->width;
+	if(style->miter == style->MITER_SHARP)
+	{
+		double ca = 2 * atan2(1, style->chamfer);
+		chamfer_ratio = -cos(ca);
+		chamfer_dist = style->chamfer;
+		cr = hypot(cr, style->chamfer);
+	}
+	clip_radius = fceil(width * cr);
+	clip_rect.Inflate(clip_radius);
+	closed = _closed;
+	calc_miter = false;
+
+	Array<PathStyle::Trace> bseg, sseg, eseg;
+	Index<int> overlap_begin, overlap_end;
+	double prec = 1.0 / width;
+	double endpos = style->begin + style->segment;
+	double bsub = style->begin - prec, badd = style->begin + prec;
+	double ssub = endpos - prec, sadd = endpos + prec;
+
+	{ // split style traces
+		double prec2 = sqr(prec);
+		double total = endpos + style->end;
+		int i;
+		for(i = 0; i < style->traces.GetCount(); i++)
+		{
+			const PathStyle::Trace& t = style->traces[i];
+			if(t.left <= bsub)
+				bseg.Add(t.GetCropRel(0, style->begin));
+			if(t.left <= ssub && t.right >= badd)
+				sseg.Add(t.GetCropRel(style->begin, endpos));
+			if(t.right >= sadd)
+				eseg.Add(t.GetCropRel(endpos, total));
+		}
+
+		// generate overlaps
+/*
+		for(i = 0; i < sseg.GetCount() && sseg[i].left <= prec; i++)
+		{
+			const PathStyle::Trace& beg = sseg[i];
+			for(int j = i; ++j < sseg.GetCount();)
+			{
+				const PathStyle::Trace& end = sseg[j];
+				if(end.color == beg.color
+				&& end.left > beg.right && end.right >= ssub
+				&& tabs(beg.left_top - end.right_top) <= prec
+				&& tabs(beg.left_bottom - end.right_bottom) <= prec
+				&& tabs(end.Width() * beg.TopHeight() - beg.Width() * end.TopHeight()) <= prec2
+				&& tabs(end.Width() * beg.BottomHeight() -beg.Width() * end.BottomHeight()) <= prec2)
+				{ // join segments
+					overlap_begin.Add(i);
+					overlap_end.Add(j);
+					break;
+				}
+			}
+		}
+//*/
+	}
+
+	seg = Segment(0, 0, 0, 0, 0);
+	if(!closed)
+	{ // process begin segment
+		seg.length = style->begin * dash;
+		int i;
+		for(i = 0; i < bseg.GetCount(); i++)
+			AddSegment(bseg[i], false);
+		// add left overlap segments to begin segment
+		for(i = 0; i < overlap_begin.GetCount(); i++)
+			AddSegment(sseg[overlap_begin[i]], false);
+	}
+	seg.end = traces.GetCount();
+	seg_begin = seg;
+
+	// process main segment
+	seg = Segment(0, 0, seg.end, seg.end, dash * style->segment);
+	for(int i = 0; i < sseg.GetCount(); i++)
+		if(overlap_begin.Find(i) < 0)
+		{
+			const PathStyle::Trace& ti = sseg[i];
+			int o = overlap_end.Find(i);
+			if(o >= 0)
+			{ // join with begin segment
+				const PathStyle::Trace& ji = sseg[overlap_begin[o]];
+				PathStyle::Trace new_trace;
+				new_trace.left = ti.left;
+				new_trace.left_top = ti.left_top;
+				new_trace.left_bottom = ti.left_bottom;
+				new_trace.right = ji.right + style->segment;
+				new_trace.right_top = ji.right_top;
+				new_trace.right_bottom = ji.right_bottom;
+				AddSegment(new_trace, false);
+			}
+			else
+				AddSegment(sseg[i], ti.left <= 0 && ti.right >= style->segment
+					&& tabs(ti.TopHeight()) <= prec && tabs(ti.BottomHeight()) <= prec);
+		}
+
+	seg.end = traces.GetCount();
+	seg_segment = seg;
+
+	seg = Segment(0, 0, seg.end, seg.end, 0);
+	if(!closed)
+	{
+		seg.length = dash * style->end;
+		for(int i = 0; i < eseg.GetCount(); i++)
+			AddSegment(eseg[i], false);
+	}
+	seg.end = traces.GetCount();
+	seg_end = seg;
+
+	moveto = &PathDraw::MoveToFull;
+	lineto = &PathDraw::LineToFull;
+	if(seg_begin.IsEmpty() && seg_end.IsEmpty()
+		&& traces.IsEmpty() && segment_lines.GetCount() == 1)
+	{
+		const Linear& l = segment_lines[0];
+		one_output = &outputs[0];
+		if(l.hline == PathDraw_Output_Thick[0][0])
+		{
+			moveto = &PathDraw::MoveToSimple;
+			lineto = &PathDraw::LineToSimple;
+		}
+		else if(l.hline && l.ground && draw->Pixels() && tabs(l.top + l.bottom) <= 1)
+		{
+			moveto = &PathDraw::MoveToThick;
+			lineto = &PathDraw::LineToThick;
+			one_thick = l.hline;
+		}
+	}
+
+	init_empty = false;
+	init_part = (closed ? PART_OPEN : seg_begin.IsEmpty() ? PART_SEGMENT : PART_BEGIN);
+	init_seg = (init_part == PART_BEGIN ? seg_begin : seg_segment);
+	if(init_seg.IsEmpty() && seg_segment.IsEmpty() && segment_lines.IsEmpty())
+		if(closed)
+		{
+			empty = init_empty = true;
+			return;
+		}
+		else
+			init_part = PART_SKIPEND;
+	if(init_part == PART_SKIPEND && seg_end.IsEmpty())
+		init_empty = true;
+
+	Restart();
+}
+
+void PathDraw::SetSegment(const Segment& s, PART p)
+{
+	seg = s;
+	part = p;
+	next_index = seg.start;
+	skip_size = (seg.IsEmpty() ? 1e100 : traces[next_index].start);
+}
+
+void PathDraw::Restart()
+{
+	if(empty = init_empty)
+		return;
+	open_traces.Clear();
+	Fill<Point>(raw_pos, raw_pos + __countof(raw_pos), Null);
+	Fill<Point>(split_pos, split_pos + __countof(split_pos), Null);
+	pos = raw_pos;
+	part_total = 0;
+	ASSERT(init_seg.end <= traces.GetCount());
+	SetSegment(init_seg, init_part);
+}
+
+bool PathDraw::SetExtent(const Rect& rc)
+{
+	if(!IsNull(rc) && !rc.Intersects(clip_rect))
+		return false;
+	// todo: clip optimization
+	return true;
+}
+
+void PathDraw::MoveToSimple(Point pt)
+{
+	//RTIMING("PathDraw::MoveToSimple");
+	if(closed && !IsNull(close_line[0]) && !IsNull(pos[0]))
+		one_output->AddNext(close_line[0]);
+	pos[0] = close_line[0] = pt;
+	one_output->AddFirst(pt);
+}
+
+void PathDraw::LineToSimple(Point pt)
+{
+	//RTIMING("PathDraw::LineToSimple");
+	one_output->CheckFlush();
+	one_output->AddNext(pos[0] = pt);
+}
+
+void PathDraw::MoveToThick(Point pt)
+{
+	//RTIMING("PathDraw::MoveToThick");
+	if(closed && !IsNull(close_line[0]) && !IsNull(pos[0]))
+		one_thick(*one_output, pos[0], close_line[0]);
+	one_output->CheckFlush();
+	pos[0] = close_line[0] = pt;
+}
+
+void PathDraw::LineToThick(Point pt)
+{
+	//RTIMING("PathDraw::LineToThick");
+	one_output->CheckFlush();
+	one_thick(*one_output, pos[0], pt);
+	pos[0] = pt;
+}
+
+void PathDraw::MoveToFull(Point p)
+{
+	//RTIMING("PathDraw::MoveToFull");
+	if(empty)
+		return;
+
+	if(!closed)
+		AddPos(Null);
+	bool split_this = true;
+	if(pos[2] != Null)
+		switch(part)
+		{
+		case PART_OPEN:
+			break;
+
+		case PART_BEGIN:
+			if(!DoBegin())
+				break;
+			split_this = false;
+
+		case PART_SKIPEND:
+		case PART_SEGMENT:
+			if(closed)
+			{
+				for(int i = 0; i < __countof(close_line); i++)
+					if(close_line[i] != raw_pos[0])
+					{
+						AddPos(close_line[i]);
+						LineToRaw();
+					}
+			}
+			else if(seg_end.length > 0)
+			{ // process split buffer
+				if(split_this)
+					AddSplit();
+				FlushSplit(seg_end.length);
+				if(split_buffer.IsEmpty())
+					break;
+				pos = split_pos;
+				Split sp = split_buffer.Head();
+				split_buffer.DropHead();
+				AddPos(sp.pos);
+				part_total -= seg_end.length;
+				double t = sp.GetEndPos(sp.total - part_total);
+				pos[0].x = pos[1].x + fround((pos[0].x - pos[1].x) * t);
+				pos[0].y = pos[1].y + fround((pos[0].y - pos[1].y) * t);
+				Point bk = pos[0];
+				if(pos[0] != pos[1])
+				{
+					if(part != PART_SKIPEND)
+						LineToRaw();
+					AddPos();
+				}
+				pos[0] = Null;
+				if(part != PART_SKIPEND)
+					LineToRaw();
+				Restart();
+				pos[1] = bk;
+				pos[2] = pos[3] = Null;
+				pos[0] = sp.pos;
+				if(pos[0] == pos[1])
+					pos[1] = Null;
+				SetSegment(seg_end, PART_END);
+				while(!split_buffer.IsEmpty())
+				{
+					AddPos(split_buffer.Head().pos);
+					split_buffer.DropHead();
+					LineToRaw();
+				}
+				AddPos(Null);
+				LineToRaw();
+				pos = raw_pos;
+			}
+			else
+				LineToRaw();
+			break;
+		}
+	Restart();
+	split_pos[0] = raw_pos[0] = p;
+}
+
+void PathDraw::CheckSplit()
+{
+	double tl = 0;
+	for(int i = 0; i < split_buffer.GetCount(); i++)
+		tl += split_buffer[i].total;
+	if(tabs(tl - part_total) >= 0.1)
+	{
+		NEVER();
+	}
+}
+
+void PathDraw::FlushSplit(double keep_length)
+{
+//	CheckSplit();
+	pos = split_pos;
+	if(part == PART_SKIPEND)
+	{
+		while(!split_buffer.IsEmpty())
+		{ // flush part of buffer
+			const Split& sp = split_buffer.Head();
+			if(part_total - sp.total < seg_end.length)
+				break;
+			AddPos(sp.pos);
+			part_total -= sp.total;
+			split_buffer.DropHead();
+		}
+	}
+	else
+	{
+		while(!split_buffer.IsEmpty())
+		{ // flush part of buffer
+			const Split& sp = split_buffer.Head();
+			if(part_total - sp.total < seg_end.length)
+				break;
+			AddPos(sp.pos);
+			LineToRaw();
+			part_total -= sp.total;
+			split_buffer.DropHead();
+		}
+	}
+	pos = raw_pos;
+//	CheckSplit();
+}
+
+#define CALC_MITER() \
+	bool start = IsNull(pos[3]); \
+	bool end = IsNull(pos[0]); \
+	Pointf a, b, a0, b0, at, bt, ar, up; \
+	double al, bl; \
+	double a_b, axb, /* rseg, */ ulen; \
+	bool too_sharp; \
+	if(calc_miter) \
+	{ \
+		a = Sizef(pos[1] - pos[2]); \
+		al = Length(a); \
+		a0 = a / al; \
+		ar = Left(a0); \
+		too_sharp = false; \
+		if(!end) \
+		{ \
+			b = Sizef(pos[0] - pos[1]); \
+			bl = Length(b); \
+			b0 = b / bl; \
+			a_b = a0 ^ b0; \
+			axb = a0 % b0; \
+			/* rseg = (axb + 1) / 2; */ \
+			if(a_b < 0) /* sharp angle */ \
+				up = a0 - b0; \
+			else \
+			{ \
+				up.x = b0.y + a0.y; \
+				up.y = -b0.x - a0.x; \
+			} \
+			double ua = a0 % up; \
+			up /= (ua <= 1 && ua >= -1 ? (ua >= 0 ? 1 : -1) : ua); \
+			ulen = -(up ^ a0); \
+			if(miter == PathStyle::MITER_SHARP) \
+			{ \
+				ASSERT(a0 % up >= 0); \
+				too_sharp = (a_b <= chamfer_ratio); \
+				if(too_sharp) \
+				{ \
+					double cd = (axb >= 0 ? -chamfer_dist : chamfer_dist); \
+					at = Left(a0) + a0 * cd; \
+					bt = Left(b0) - b0 * cd; \
+				} \
+			} \
+			else if(miter == PathStyle::MITER_FLAT) \
+			{ /* calc flat miter */ \
+				Pointf mr = Unit(up); \
+				if(tabs(mr % ar) <= 1e-5) \
+					at = bt = mr; \
+				else \
+				{ \
+					double k = (tabs(ar.x + mr.x) >= tabs(ar.y + mr.y) \
+						? (ar.y - mr.y) / (ar.x + mr.x) : (mr.x - ar.x) / (ar.y + mr.y)); \
+					at = mr + k * Left(mr); \
+					bt = mr + k * Right(mr); \
+				} \
+			} \
+		} \
+		else \
+		{ \
+			up.x = -a0.y; \
+			up.y = +a0.x; \
+			/* rseg = 0; */ \
+		} \
+		if(start) \
+		{ \
+			old_ulen = 0; \
+			old_up.x = -a0.y; \
+			old_up.y = +a0.x; \
+		} \
+	}
+
+#define CALC_TOP_SHARP(t) \
+	if(top_sharp) \
+		new_top = next_top = pos[1] + PointfToSize(up * double(t)); \
+	else \
+	{ \
+		new_top = pos[1] + PointfToSize(at * double(t)); \
+		next_top = pos[1] + PointfToSize(bt * double(t)); \
+	}
+
+#define CALC_TOP_ROUND(t) \
+	if(!top_sharp) \
+		next_top = new_top = pos[1] + PointfToSize(up * double(t)); \
+	else \
+	{ \
+		new_top.x = pos[1].x - fround((t) * a0.y); \
+		new_top.y = pos[1].y + fround((t) * a0.x); \
+		next_top.x = pos[1].x - fround((t) * b0.y); \
+		next_top.y = pos[1].y + fround((t) * b0.x); \
+		if(miter == PathStyle::MITER_ROUND) \
+		{ \
+			double ht = tabs((t)) - sqrt(max(0.0, (t) * (t) - Squared(next_top - new_top) * 0.25)); \
+			GetArcPath(arc_path, new_top, next_top, (t) >= 0 ? ht : -ht); \
+		} \
+	}
+
+#define DRAW_TOP_SHARP(ln, ot) \
+	ln(out, ot, new_top); \
+	ln(out, new_top, next_top);
+
+#define DRAW_TOP_ROUND(ln, ot) \
+	ln(out, ot, new_top); \
+	if(!arc_path.IsEmpty()) \
+		out.AddThick(ln, new_top, arc_path); \
+	else \
+		ln(out, new_top, next_top);
+
+#define DRAW_BOTTOM_SHARP(b, col) \
+	bool bot_sharp = (!too_sharp || axb > 0 || (b) < 0); \
+	if(bot_sharp) \
+		new_bot = next_bot = pos[1] + PointfToSize(up * double(b)); \
+	else \
+	{ \
+		new_bot  = pos[1] + PointfToSize(at * double(b)); \
+		next_bot = pos[1] + PointfToSize(bt * double(b)); \
+	} \
+	poly[px++] = new_top; \
+	if(too_sharp) \
+	{ \
+		poly[px++] = next_top; \
+		poly[px++] = next_bot; \
+	} \
+	poly[px++] = new_bot; \
+	DrawPolygon(*draw, poly, px, col, 0, Null, 0);
+
+#define DRAW_BOTTOM_ROUND(b, col) \
+	if(top_sharp && arc_path.IsEmpty()) \
+		arc_path.Add(next_top); \
+	new_bot.x = pos[1].x - fround(b * a0.y); \
+	new_bot.y = pos[1].y + fround(b * a0.x); \
+	if(end || too_sharp) \
+		arc_path.Add(new_bot); \
+	else if((b < 0) == (axb < 0)) \
+		arc_path.Add(next_bot = pos[1] + PointfToSize(up * double(b))); \
+	else \
+	{ \
+		next_bot.x = pos[1].x - fround(b * b0.y); \
+		next_bot.y = pos[1].y + fround(b * b0.x); \
+		arc_path.Add(next_bot); \
+		double ht = tabs(b) - sqrt(max(0.0, b * b - Squared(next_bot - new_bot) * 0.25)); \
+		GetArcPath(arc_path, next_bot, new_bot, b <= 0 ? ht : -ht); \
+	} \
+	if(px) \
+	{ \
+		int pos = arc_path.GetCount(); \
+		arc_path.InsertN(pos, px); \
+		Copy(&arc_path[pos], poly, poly + px); \
+	} \
+	arc_path.Add(new_top); \
+	DrawPolygon(*draw, arc_path, col, 0, Null, 0);
+
+enum { LEADER_DELTA = 0 };
+
+#define CALC_SHARP_LEADER(dest, y, ix) \
+	{ \
+		bool ll = (!start && (ix) <= (y) * old_ulen - LEADER_DELTA); \
+		bool rl = (!end   && atotal - (ix) <= (y) * ulen - LEADER_DELTA); \
+		if(ll && rl) \
+			dest = pos[2] + PointfToSize(old_up * double(atotal / (old_ulen + ulen))); \
+		else if(ll) \
+			dest = pos[2] + PointfToSize(old_up * double(y)); \
+		else if(rl) \
+			dest = pos[1] + PointfToSize(up * double(y)); \
+		else \
+			dest = pos[2] + PointfToSize(a0 * double(ix) + ar * double(y)); \
+	}
+
+#define CALC_START_TOP_LEADER() \
+	Point old_top; \
+	old_top = pos[1] - (apart + ar * t.left_top).AsSize();
+/*
+	bool start_top_leader = (!start && old_axb_left == (t.left_top > 0) && atotal - al <= t.left_top * old_ulen - LEADER_DELTA); \
+	if(start_top_leader) \
+		old_top = pos[1] - (apart + old_up * t.left_top).AsSize(); \
+	else \
+		old_top = pos[1] - (apart + ar * t.left_top).AsSize(); \
+*/
+#define CALC_START_BOTTOM_LEADER() \
+	poly[px++] = pos[1] - (apart + ar * t.left_bottom).AsSize(); \
+	poly[px++] = old_top;
+/*
+	bool start_bot_leader = (!start && old_axb_left == (t.left_bottom > 0) && atotal - al <= t.left_bottom * old_ulen - LEADER_DELTA); \
+	if(start_bot_leader) \
+		poly[px++] = pos[1] - (apart + old_up * t.left_bottom).AsSize(); \
+	else \
+		poly[px++] = pos[1] - (apart + ar * t.left_bottom).AsSize(); \
+	if(t.left_ground && start_bot_leader != start_top_leader) \
+		poly[px++] = pos[1] - apart.AsSize(); \
+	poly[px++] = old_top;
+*/
+
+#define CALC_END_TOP_LEADER(rem) \
+	Point new_top; \
+	new_top = pos[1] - (bpart + ar * t.right_top).AsSize();
+
+/*
+	bool end_top_leader = (!end && (axb < 0) == (t.right_top > 0) && al - (rem) <= t.right_top * ulen - LEADER_DELTA); \
+	if(end_top_leader) \
+		new_top = pos[1] - (bpart + up * t.right_top).AsSize(); \
+	else \
+		new_top = pos[1] - (bpart + ar * t.right_top).AsSize();
+*/
+
+#define CALC_END_BOTTOM_LEADER(rem) \
+	poly[px++] = new_top; \
+	poly[px++] = pos[1] - (bpart + ar * t.right_bottom).AsSize();
+/*
+	bool end_bot_leader = (!end && (axb < 0) == (t.right_bottom > 0) && al - (rem) <= t.right_bottom * ulen - LEADER_DELTA); \
+	if(t.right_ground && end_top_leader != end_bot_leader) \
+		poly[px++] = pos[1] - bpart.AsSize(); \
+	if(end_bot_leader) \
+		poly[px++] = pos[1] - (bpart + up * t.right_bottom).AsSize(); \
+	else \
+		poly[px++] = pos[1] - (bpart + ar * t.right_bottom).AsSize();
+*/
+
+void PathDraw::CalcLineBegin()
+{
+	CALC_MITER();
+	for(int i = 0; i < segment_lines.GetCount(); i++)
+	{
+		Linear& sl = segment_lines[i];
+		bool top_sharp = (!too_sharp || axb < 0 || sl.top > 0);
+		sl.last_top = pos[1] + PointfToSize((top_sharp ? up : bt) * double(sl.top));
+		bool bot_sharp = (!too_sharp || axb > 0 || sl.bottom < 0);
+		sl.last_bottom = pos[1] + PointfToSize((bot_sharp ? up : bt) * double(sl.bottom));
+	}
+	old_up = up;
+	old_ulen = ulen;
+	old_axb_left = (axb < 0);
+}
+
+bool PathDraw::DoBegin()
+{
+	if(IsNull(pos[2]))
+		return false;
+
+	Split split = SplitLine();
+	if((part_total += split.total) >= seg.length)
+	{ // break segment
+		Point p0 = pos[0], p1 = pos[1], p2 = pos[2], p3 = pos[3], px;
+		double t = minmax<double>(split.GetEndPos(part_total - seg.length), 0, 1);
+		pos[1].x = pos[2].x + fround((pos[1].x - pos[2].x) * t);
+		pos[1].y = pos[2].y + fround((pos[1].y - pos[2].y) * t);
+		px = pos[1];
+		if(pos[1] != pos[2])
+		{
+			pos[0] = (px == p1 ? p0 : p1);
+			LineToRaw();
+		}
+		Restart();
+		pos[3] = Null;
+		pos[0] = p1;
+		bool end_seg = (px != p1);
+		if(end_seg)
+		{
+			pos[1] = px;
+			pos[2] = (px == p2 ? Null : p2);
+		}
+		else
+		{
+			pos[1] = p2;
+			pos[2] = p3;
+		}
+		if(!seg_segment.IsEmpty() || !segment_lines.IsEmpty())
+		{
+			SetSegment(seg_segment, PART_SEGMENT);
+			CalcLineBegin();
+		}
+		else if(!seg_end.IsEmpty())
+			part = PART_SKIPEND;
+		else
+		{
+			empty = true;
+			return false;
+		}
+		AddPos(p0);
+		if(seg_end.length > 0)
+		{
+			if(!end_seg)
+				split_pos[0] = pos[1];
+			else
+			{
+				split_pos[0] = pos[2];
+				AddSplit();
+			}
+		}
+		if(end_seg && part == PART_SEGMENT && seg_end.length <= 0)
+			LineToRaw();
+	}
+	else
+		LineToRaw();
+	return true;
+}
+
+void PathDraw::LineToFull(Point p)
+{
+	//RTIMING("PathDraw::LineToFull");
+	if(p == raw_pos[0] || empty)
+		return;
+	AddPos(p);
+	if(part == PART_SEGMENT)
+	{
+		if(seg_end.length <= 0)
+		{
+			LineToRaw();
+			return;
+		}
+		else if(!IsNull(pos[2]))
+		{
+			AddSplit();
+			FlushSplit(seg_end.length);
+		}
+		return;
+	}
+
+	switch(part)
+	{
+	case PART_OPEN:
+		if(!IsNull(pos[2]))
+		{
+			close_line[0] = pos[2];
+			close_line[1] = pos[1];
+			close_line[2] = pos[0];
+			part = PART_SEGMENT;
+			CalcLineBegin();
+		}
+		return;
+
+	case PART_BEGIN:
+		if(!DoBegin())
+			return;
+		if(part != PART_SKIPEND)
+			break;
+
+	case PART_SKIPEND:
+		{
+			AddSplit();
+			FlushSplit(seg_end.length);
+		}
+		break;
+	}
+}
+
+PathDraw::Split PathDraw::SplitLine()
+{
+	ASSERT(pos[0] != pos[1] && pos[1] != pos[2] && pos[2] != pos[3]);
+	if(IsNull(pos[2]) || IsNull(pos[1]))
+		return Split(0, 0, 0, Null);
+	CALC_MITER();
+	double pos_start = (start ? 0 : max<double>(-(old_up ^ a0) * (old_axb_left ? seg.bottom : seg.top), 0));
+	double pos_end   = (end ? 0 : max<double>((up ^ a0) * (axb < 0 ? seg.bottom : seg.top), 0));
+	return Split(pos_start, pos_end, pos_end + pos_start + al, pos[1]);
+}
+
+void PathDraw::LineToRaw()
+{
+	if(IsNull(pos[1]) || IsNull(pos[2]))
+		return;
+
+	ASSERT(part != PART_SKIPEND);
+	ASSERT(pos[0] != pos[1] && pos[1] != pos[2] && pos[2] != pos[3]);
+	CALC_MITER();
+
+	if(!traces.IsEmpty())
+	{
+		double pos_start = (start ? 0 : (old_up ^ a0) * (old_axb_left ? seg.bottom : seg.top));
+		double pos_end   = al + (end ? 0 : (up ^ a0) * (axb < 0 ? seg.bottom : seg.top));
+		double atotal = al, adelta = pos_end - pos_start, aindex = pos_start;
+
+		for(int o = open_traces.GetCount(); --o >= 0;)
+		{
+			Trace& t = traces[open_traces[o]];
+			Output& out = outputs[t.index];
+			out.CheckFlush();
+			if(adelta <= t.width - t.pos)
+			{ // segment spans the whole line - draw joint
+				double top = t.left_top + t.top_step * (t.pos += adelta);
+				Point new_top, next_top;
+				bool top_sharp = (!too_sharp || axb < 0 || t.left_top > 0);
+				CALC_TOP_SHARP(top);
+				if(t.hline)
+				{ // single line
+					DRAW_TOP_SHARP(t.hline, t.last_top);
+				}
+				else
+				{
+					Point poly[6];
+					Point next_bot, new_bot;
+					double bottom = t.left_bottom + t.bottom_step * t.pos;
+					poly[0] = t.last_bottom;
+					poly[1] = t.last_top;
+					int px = 2;
+					DRAW_BOTTOM_SHARP(bottom, t.color);
+					t.last_bottom = next_bot;
+				}
+				t.last_top = next_top;
+/*
+				double top = t.left_top + t.top_step * (t.pos += adelta);
+				Point new_top = pos[1] + (top * up).AsSize();
+				if(t.hline)
+				{
+					out.AddFirst(t.last_top);
+					out.AddNext(new_top);
+				}
+				else
+				{
+					double bottom = t.left_bottom + t.bottom_step * t.pos;
+					Point poly[6];
+					poly[0] = t.last_bottom;
+					poly[1] = t.last_top;
+					Point new_bot = pos[1] + (up * bottom).AsSize();
+					poly[2] = new_top;
+					poly[3] = new_bot;
+					DrawPolygon(*draw, poly, 4, t.color, 0, Null, 0);
+					t.last_bottom = new_bot;
+				}
+				t.last_top = new_top;
+*/
+			}
+			else
+			{ // finish segment
+				double end_pos = pos_start + t.width - t.pos;
+				Point new_top;
+				CALC_SHARP_LEADER(new_top, t.right_top, end_pos);
+				if(t.hline)
+					t.hline(out, t.last_top, new_top);
+				else
+				{
+					Point poly[6];
+					poly[0] = t.last_bottom;
+					poly[1] = t.last_top;
+					Point new_bot;
+					CALC_SHARP_LEADER(new_bot, t.right_bottom, end_pos);
+					poly[2] = new_top;
+					poly[3] = new_bot;
+					DrawPolygon(*draw, poly, 4, t.color, 0, Null, 0);
+				}
+				open_traces.Remove(o);
+			}
+		}
+
+		while((aindex += skip_size) < pos_end)
+		{
+			double left = pos_end - aindex;
+			int tix = next_index++;
+//			bool skip = (done.Find(next_index) >= 0);
+			Trace& t = traces[tix];
+			Output& out = outputs[t.index];
+			skip_size = (next_index == seg.end
+				? (part == PART_SEGMENT
+					? seg.length + traces[next_index = seg.start].start - t.start : 1e100)
+				: traces[next_index].start - t.start);
+//			if(skip)
+//				continue;
+			Point old_top;
+			CALC_SHARP_LEADER(old_top, t.left_top, aindex);
+			Point new_top;
+			if(left >= t.width)
+			{ // full trace fits here
+				CALC_SHARP_LEADER(new_top, t.right_top, aindex + t.width);
+				if(t.hline)
+					t.hline(out, old_top, new_top);
+				else
+				{
+					Point poly[4];
+					CALC_SHARP_LEADER(poly[0], t.right_bottom, aindex + t.width);
+					CALC_SHARP_LEADER(poly[1], t.left_bottom, aindex);
+					poly[2] = old_top;
+					poly[3] = new_top;
+					DrawPolygon(*draw, poly, 4, t.color, 0, Null, 0);
+				}
+			}
+			else
+			{ // split trace & add to open list
+				double top = t.left_top + t.top_step * (t.pos = left);
+				Point new_top, next_top;
+				bool top_sharp = (!too_sharp || axb < 0 || t.left_top > 0);
+				CALC_TOP_SHARP(top);
+				if(t.hline)
+				{ // single line
+					DRAW_TOP_SHARP(t.hline, old_top);
+				}
+				else
+				{
+					Point poly[6];
+					Point next_bot, new_bot;
+					double bottom = t.left_bottom + t.bottom_step * t.pos;
+					CALC_SHARP_LEADER(poly[0], t.left_bottom, aindex);
+					poly[1] = old_top;
+					int px = 2;
+					DRAW_BOTTOM_SHARP(bottom, t.color);
+					t.last_bottom = next_bot;
+				}
+				t.last_top = next_top;
+/*
+				Point new_top = pos[1] + (up * top).AsSize();
+				if(t.hline)
+				{
+					out.AddFirst(old_top);
+					out.AddNext(new_top);
+				}
+				else
+				{
+					Point poly[4];
+					double bottom = t.left_bottom + t.bottom_step * t.pos;
+					poly[0] = pos[1] + (up * bottom).AsSize();
+					CALC_SHARP_LEADER(poly[1], t.left_bottom, aindex);
+					poly[2] = old_top;
+					poly[3] = new_top;
+					DrawPolygon(*draw, poly, 4, t.color, 0, Null, 0);
+					t.last_bottom = poly[0];
+				}
+				t.last_top = new_top;
+*/				open_traces.Add(tix);
+			}
+#ifdef DEBUG_DRAW
+			FlushLines();
+			GdiFlush();
+#endif
+		}
+		skip_size = aindex - pos_end;
+	}
+
+
+/*
+		bool try_rep = (al >= 2 * segment);
+		for(int o = open_traces.GetCount(); --o >= 0;)
+		{
+			int x = open_traces[o];
+//			done.Add(x);
+			Trace& t = traces[x];
+			Output& out = outputs[t.index];
+			out.CheckFlush();
+			if(al <= t.width - t.pos)
+			{ // segment spans the whole line - draw joint
+				double top = t.left_top + t.top_step * (t.pos += al);
+				Point new_top, next_top;
+				if(miter == PathStyle::MITER_SHARP)
+				{
+					bool top_sharp = (!too_sharp || (axb < 0) == (top >= 0));
+					CALC_TOP_SHARP(top)
+					if(t.hline)
+					{
+						DRAW_TOP_SHARP(t.hline, t.last_top);
+					}
+					else
+					{
+						Point new_bot, next_bot;
+						double bottom = t.left_bottom + t.bottom_step * t.pos;
+						Point poly[6];
+						poly[0] = t.last_bottom;
+						poly[1] = t.last_top;
+						int px = 2;
+						DRAW_BOTTOM_SHARP(bottom, t.color);
+						t.last_bottom = next_bot;
+					}
+				}
+				else
+				{
+					ASSERT(miter == PathStyle::MITER_ROUND || miter == PathStyle::MITER_FLAT);
+					Vector<Point> arc_path;
+					bool top_sharp = (!end && (axb < 0) != (top >= 0));
+					CALC_TOP_ROUND(top)
+					if(t.hline)
+					{
+						DRAW_TOP_ROUND(t.last_top);
+					}
+					else
+					{
+						Point poly[2];
+						poly[0] = t.last_bottom;
+						poly[1] = t.last_top;
+						enum { px = 2 };
+						Point new_bot, next_bot;
+						double bottom = t.left_bottom + t.bottom_step * t.pos;
+						DRAW_BOTTOM_ROUND(bottom, t.color);
+						t.last_bottom = next_bot;
+					}
+				}
+				t.last_top = next_top;
+			}
+			else
+			{ // segment is shorter, just calculate end & join
+				double rem = t.width - t.pos;
+				Pointf bpart = a0 * (al - rem);
+				CALC_END_TOP_LEADER(rem);
+				if(t.hline)
+				{
+					out.AddFirst(t.last_top);
+					out.AddNext(new_top);
+				}
+				else
+				{
+					Point poly[8];
+					poly[0] = t.last_bottom;
+					poly[1] = t.last_top;
+					int px = 2;
+					CALC_END_BOTTOM_LEADER(rem);
+					DrawPolygon(*draw, poly, px, t.color, 0, Null, 0);
+				}
+//				if(al > segment - t.pos + 1)
+//				{ // repeat segment
+//
+//				}
+
+				open_traces.Remove(o);
+			}
+#ifdef DEBUG_DRAW
+			FlushLines();
+			GdiFlush();
+#endif
+		}
+
+		double atotal = al;
+		while(skip_size <= al)
+		{
+			al -= skip_size;
+			int tix = next_index++;
+//			bool skip = (done.Find(next_index) >= 0);
+			Trace& t = traces[tix];
+			Output& out = outputs[t.index];
+			if(next_index == end_index)
+				skip_size = (repeat ? segment + traces[next_index = seg_segment.start].start - t.start : 1e100);
+			else
+				skip_size = traces[next_index].start - t.start;
+//			if(skip)
+//				continue;
+			Pointf apart = a0 * al;
+			CALC_START_TOP_LEADER();
+			if(al >= t.width)
+			{ // full trace fits here
+				Pointf bpart = a0 * (al - t.width);
+				CALC_END_TOP_LEADER(t.width);
+				if(t.hline)
+				{
+					out.AddFirst(old_top);
+					out.AddNext(new_top);
+				}
+				else
+				{
+					Point poly[6];
+					int px = 0;
+					CALC_START_BOTTOM_LEADER();
+					CALC_END_BOTTOM_LEADER(t.width);
+					DrawPolygon(*draw, poly, px, t.color, 0, Null, 0);
+				}
+			}
+			else
+			{ // split trace & add to open list
+				double top = t.left_top + t.top_step * (t.pos = al);
+				Point new_top, next_top;
+				if(miter == PathStyle::MITER_SHARP)
+				{
+					bool top_sharp = (!too_sharp || (axb < 0) == (top >= 0));
+					CALC_TOP_SHARP(top);
+					if(t.hline)
+					{
+						DRAW_TOP_SHARP(t.hline, old_top);
+					}
+					else
+					{
+						Point poly[8];
+						int px = 0;
+						CALC_START_BOTTOM_LEADER();
+						double bottom = t.left_bottom + t.bottom_step * t.pos;
+						Point new_bot, next_bot;
+						DRAW_BOTTOM_SHARP(bottom, t.color);
+						t.last_bottom = next_bot;
+					}
+				}
+				else
+				{
+					ASSERT(miter == PathStyle::MITER_ROUND || miter == PathStyle::MITER_FLAT);
+					Vector<Point> arc_path;
+					bool top_sharp = (!end && (axb < 0) != (top >= 0));
+					CALC_TOP_ROUND(top);
+					if(t.hline)
+					{
+						DRAW_TOP_ROUND(old_top);
+					}
+					else
+					{
+						Point poly[4];
+						int px = 0;
+						CALC_START_BOTTOM_LEADER();
+						double bottom = t.left_bottom + t.bottom_step * t.pos;
+						Point new_bot, next_bot;
+						DRAW_BOTTOM_ROUND(bottom, t.color);
+						t.last_bottom = next_bot;
+					}
+				}
+				t.last_top = next_top;
+				open_traces.Add(tix);
+			}
+#ifdef DEBUG_DRAW
+			FlushLines();
+			GdiFlush();
+#endif
+		}
+		skip_size -= al;
+*/
+
+	if(part == PART_SEGMENT)
+	{
+		for(int i = 0; i < segment_lines.GetCount(); i++)
+		{
+			Linear& sl = segment_lines[i];
+			Output& out = outputs[sl.index];
+			out.CheckFlush();
+			if(sl.ground)
+			{ // simple case
+				sl.hline(out, pos[2], pos[1]);
+			}
+			else if(miter == PathStyle::MITER_SHARP)
+			{ // complex case
+				Point old_top = start ? pos[2] + PointfToSize(ar * double(sl.top)) : sl.last_top;
+				Point new_top, next_top;
+				bool top_sharp = (!too_sharp || axb < 0 || sl.top > 0);
+				CALC_TOP_SHARP(sl.top);
+				if(sl.hline)
+				{ // single line
+					DRAW_TOP_SHARP(sl.hline, old_top);
+				}
+				else
+				{
+					Point poly[6];
+					Point next_bot, new_bot;
+					poly[0] = start ? pos[2] + PointfToSize(ar * double(sl.bottom)) : sl.last_bottom;
+					poly[1] = old_top;
+					int px = 2;
+					DRAW_BOTTOM_SHARP(sl.bottom, sl.color);
+					sl.last_bottom = next_bot;
+				}
+				sl.last_top = next_top;
+			}
+			else if(miter == PathStyle::MITER_ROUND)
+			{
+				Point new_top, next_top;
+				Point old_top = start ? pos[2] + PointfToSize(ar * double(sl.top)) : sl.last_top;
+				Vector<Point> arc_path;
+				bool top_sharp = (!end && (axb < 0) == (sl.top >= 0));
+				CALC_TOP_ROUND(sl.top);
+				if(sl.hline)
+				{ // single line
+					DRAW_TOP_ROUND(sl.hline, old_top);
+				}
+				else
+				{
+					Point poly[2];
+					poly[0] = (start ? pos[2] + PointfToSize(ar * double(sl.bottom)) : sl.last_bottom);
+					poly[1] = old_top;
+					enum { px = 2 };
+					Point new_bot, next_bot;
+					DRAW_BOTTOM_ROUND(sl.bottom, sl.color);
+					sl.last_bottom = next_bot;
+				}
+				sl.last_top = next_top;
+			}
+			else if(miter == PathStyle::MITER_FLAT)
+			{
+				Point old_top = start ? pos[2] + PointfToSize(ar * double(sl.top)) : sl.last_top;
+				Point new_top, next_top;
+				bool top_sharp = (!end && (axb < 0) == (sl.top >= 0));
+				if(top_sharp)
+				{
+					new_top = pos[1] + PointfToSize(at * double(sl.top));
+					next_top = pos[1] + PointfToSize(bt * double(sl.top));
+				}
+				else
+					new_top = next_top = pos[1] + PointfToSize(up * double(sl.top));
+				if(sl.hline)
+				{
+					sl.hline(out, old_top, new_top);
+					sl.hline(out, new_top, next_top);
+				}
+				else
+				{
+					Point poly[6];
+					poly[0] = (start ? pos[2] + PointfToSize(ar * double(sl.bottom)) : sl.last_bottom);
+					poly[1] = old_top;
+					poly[2] = new_top;
+					int px = 3;
+					if(top_sharp)
+						poly[px++] = next_top;
+					bool bot_sharp = (!too_sharp || axb > 0 || sl.bottom < 0);
+					if(bot_sharp)
+					{
+						poly[px++] = sl.last_bottom = pos[1] + PointfToSize(bt * double(sl.bottom));
+						poly[px++] = pos[1] + PointfToSize(at * double(sl.bottom));
+					}
+					else
+						poly[px++] = sl.last_bottom = pos[1] + PointfToSize(up * double(sl.bottom));
+					DrawPolygon(*draw, poly, px, sl.color, 0, Null, 0);
+				}
+				sl.last_top = next_top;
+			}
+			else
+				NEVER();
+#ifdef DEBUG_DRAW
+			FlushLines();
+			GdiFlush();
+#endif
+		}
+	}
+
+	if(calc_miter)
+	{
+		old_up = up;
+		old_ulen = ulen;
+		old_axb_left = (axb < 0);
+	}
+}
+
+void PathDraw::Paint()
+{
+	MoveTo(Null);
+	FlushLines();
+	Restart();
+}
+
+void PathDraw::FlushLines()
+{
+	for(int i = 0; i < outputs.GetCount(); i++)
+		outputs[i].Flush();
+}
+
+void PathDraw::RecurseArc(Point next, int length, int bulge, int levels)
+{
+	if(--levels < 0 || tabs(bulge) <= 1 || length <= 2)
+		LineTo(next); // degenerate next line
+	else
+	{ // bisect arc
+		Size normal = iscale(Size(next.y - pos[0].y, pos[0].x - next.x), bulge, length);
+		Point centre = ((pos[0] + next) >> 1) + normal;
+		int ll = (int)Length(centre - next);
+		int hh = iscale(bulge, ll, 2 * ll + length);
+		RecurseArc(centre, ll, hh, levels);
+		RecurseArc(next, ll, hh, levels);
+	}
+}
+
+void PathDraw::ArcTo(Point pt, int bulge)
+{
+	ASSERT(!IsNull(raw_pos[0]));
+	RecurseArc(pt, (int)Length(pt - pos[0]), bulge, 10);
+}
+
+void PathDraw::Circle(Point pt, int radius)
+{
+	MoveTo(pt.x - radius, pt.y);
+	ArcTo(pt.x + radius, pt.y, radius);
+	ArcTo(pt.x - radius, pt.y, radius);
+}
+
+PathStyleDisplay::PathStyleDisplay(const PathStyleMap *path_map) : path_map(path_map) {}
+PathStyleDisplay::~PathStyleDisplay() {}
+
+void PathStyleDisplay::Paint(Draw& draw, const Rect& rc, const Value& v, Color i, Color p, dword s) const
+{
+	draw.DrawRect(rc, p);
+	if(IsNull(v) || IsString(v))
+	{
+		String s = v;
+		PathStyle style = path_map->Scan(s);
+		PathDraw pd;
+		pd.Set(draw, style, i, rc.Height() >> 2, rc.Height() >> 2, false);
+		int mid = (rc.top + rc.bottom) >> 1;
+		pd.MoveTo(rc.left, mid);
+		pd.LineTo(rc.right, mid);
+		pd.Paint();
+	}
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/Geom/Draw/pathDraw.h b/uppsrc/Geom/Draw/pathDraw.h
new file mode 100644
index 000000000..d5eaba967
--- /dev/null
+++ b/uppsrc/Geom/Draw/pathDraw.h
@@ -0,0 +1,397 @@
+NAMESPACE_UPP
+
+class PlotterTool;
+
+#define CATCH_PATH_MAP 0 // 1 = turn path catching on
+
+#if CATCH_PATH_MAP
+	#define PATH_MAP_NULL NULL
+#else
+	#define PATH_MAP_NULL &PathStyleMap::App()
+#endif
+
+const double STD_CHAMFER = 1.5;
+
+class PathStyleMisc
+{
+public:
+	PathStyleMisc() : width(1), begin(0), segment(1), end(0),
+		miter(MITER_SHARP), chamfer(STD_CHAMFER) {}
+
+public:
+	double begin, segment, end;
+	double width;
+	double chamfer; // relative chamfer size
+	enum { MITER_ROUND, MITER_SHARP, MITER_FLAT };
+	int    miter;
+};
+
+class PathStyle : public PathStyleMisc, MoveableAndDeepCopyOption<PathStyle>
+{
+public:
+	PathStyle() {}
+	PathStyle(pick_ PathStyle& style);
+	PathStyle(const PathStyle& ps, int) : PathStyleMisc(ps), traces(ps.traces, 0) {}
+
+	PathStyle&    operator = (pick_ PathStyle& style);
+
+	String        Encode() const;
+	const char   *Decode(const char *s); // returns NULL on error, otherwise end of part
+
+	bool          IsEmpty() const             { return traces.IsEmpty(); }
+	bool          IsSolid(double& wd, Color& co) const;
+
+	void          Serialize(Stream& stream);
+
+	static const PathStyle& empty();
+	static const PathStyle& solid();
+	static const PathStyle& dash();
+	static const PathStyle& dot();
+	static const PathStyle& dash_dot();
+	static const PathStyle& dash_dot_dot();
+
+public:
+	enum // track styles
+	{
+		LEFT         = 0x00000001,
+		LEFT_TOP     = 0x00000002,
+		LEFT_BOTTOM  = 0x00000004,
+		RIGHT        = 0x00000008,
+		RIGHT_TOP    = 0x00000010,
+		RIGHT_BOTTOM = 0x00000020,
+
+		PREC         = 5,
+	};
+
+	class Trace {
+	public:
+		Trace() {}
+		Trace(double left, double left_top, double left_bottom,
+			double right, double right_top, double right_bottom,
+			Color color = Null)
+			: left(left), left_top(left_top), left_bottom(left_bottom)
+			, right(right), right_top(right_top), right_bottom(right_bottom)
+			, color(color) {}
+
+		void          Serialize(Stream& stream);
+
+		String        Encode() const;
+		const char   *Decode(const char *p);
+
+		Rectf         GetExtent() const                    { return Rectf(left, Top(), right, Bottom()); }
+		void          Inflate(Pointf amount);
+		bool          Contains(Pointf pt) const;
+		bool          ContainsHorz(double x) const         { return left <= x && right >= x; }
+		bool          ContainsHorz(double l, double r) const { return left <= l && right >= r; }
+		double        GetDistance(Pointf pt) const;
+		int           GetTrackStyle(Pointf pt, Pointf tolerance, Pointf& start) const;
+		static Image  GetTrackCursor(int trackinfo);
+		Trace&        Track(Pointf delta, int style); // -1 = move
+		Trace&        Move(Pointf delta)                      { return Track(delta, -1); }
+		Trace&        Move(double dx, double dy)           { return Track(Pointf(dx, dy), -1); }
+		Trace&        Bind(const Rectf& rc);
+		Trace&        TraceColor(Color c)                  { color = c; return *this; }
+		Trace&        Crop(double l, double r);
+		Trace&        CropRel(double l, double r)          { return Crop(l, r).Move(-l, 0); }
+		Trace         GetTrack(Pointf delta, int style) const { Trace t(*this); t.Track(delta, style); return t; }
+		Trace         GetMove(Pointf delta) const             { return GetTrack(delta, -1); }
+		Trace         GetMove(double dx, double dy) const  { Trace t(*this); t.Track(Pointf(dx, dy), -1); return t; }
+		Trace         GetTraceColor(Color c) const         { Trace t(*this); t.TraceColor(c); return t; }
+		Trace         GetCrop(double l, double r) const    { Trace t(*this); t.Crop(l, r); return t; }
+		Trace         GetCropRel(double l, double r) const { Trace t(*this); t.CropRel(l, r); return t; }
+
+		void          Paint(PlotterTool& tool, bool reduce = false, UPP::Color outline = Null) const;
+
+		double        Width() const                        { return right - left; }
+		double        Top() const                          { return min(left_top, right_top); }
+		double        Bottom() const                       { return max(left_bottom, right_bottom); }
+		double        LeftHeight() const                   { return left_bottom - left_top; }
+		double        RightHeight() const                  { return right_bottom - right_top; }
+		double        TopHeight() const                    { return right_top - left_top; }
+		double        BottomHeight() const                 { return right_bottom - left_bottom; }
+
+		bool          IsHorzEmpty() const                  { return right <= left; }
+		bool          IsVertEmpty() const                  { return left_bottom <= left_top && right_bottom <= right_top; }
+		bool          IsBothEmpty() const                  { return IsHorzEmpty() && IsVertEmpty(); }
+		bool          IsAreaEmpty() const                  { return IsHorzEmpty() || IsVertEmpty(); }
+
+		Pointf        LeftTop() const                      { return Pointf(left, left_top); }
+		Pointf        LeftCenter() const                   { return Pointf(left, (left_top + left_bottom) / 2); }
+		Pointf        LeftBottom() const                   { return Pointf(left, left_bottom); }
+		Pointf        CenterTop() const                    { return Pointf((left + right) / 2, (left_top + right_top) / 2); }
+		Pointf        CenterBottom() const                 { return Pointf((left + right) / 2, (left_bottom + right_bottom) / 2); }
+		Pointf        RightTop() const                     { return Pointf(right, right_top); }
+		Pointf        RightCenter() const                  { return Pointf(right, (right_top + right_bottom) / 2); }
+		Pointf        RightBottom() const                  { return Pointf(right, right_bottom); }
+
+		bool          IsEqual(const Trace& t) const;
+
+	public:
+		double        left, left_top, left_bottom, right, right_top, right_bottom;
+		Color         color; // Null = default line color
+	};
+
+	Array<Trace>      traces;
+
+	class Clip
+	{
+	public:
+		Clip() {}
+
+		void          Serialize(Stream& stream);
+
+		Rectf         GetExtent() const;
+
+		void          Write()   { WriteClipboardFormat(*this); }
+		bool          Read()    { return ReadClipboardFormat(*this); }
+		static bool   IsAvail() { return IsClipboardFormatAvailable<Clip>(); }
+
+		Array<Trace>  traces;
+	};
+
+private:
+	void          Encode(String& out, char tag, double size, const Array<Trace>& list) const;
+	const char   *Decode(const char *s, char tag, double& size, Array<Trace>& list);
+};
+
+inline bool operator == (const PathStyle::Trace& a, const PathStyle::Trace& b) { return  a.IsEqual(b); }
+inline bool operator != (const PathStyle::Trace& a, const PathStyle::Trace& b) { return !a.IsEqual(b); }
+
+class PathStyleMap : Moveable<PathStyleMap>, DeepCopyOption<PathStyleMap>
+{
+public:
+	PathStyleMap() : dirty(false) {}
+	PathStyleMap(const PathStyleMap& m, int)
+		: name(m.name), map(m.map, 0), dirty(m.dirty) {}
+
+	void             Serialize(Stream& stream);
+
+	void             SetName(String n)                                { name = n; } // todo: dirty ?
+	String           GetName() const                                  { return name; }
+
+	void             Set(String sn, const PathStyle& style)           { map.GetAdd(sn) <<= style; sort.Clear(); }
+	void             Remove(String sn)                                { int i = map.Find(sn); if(i >= 0) { map.Remove(i); sort.Clear(); } }
+	void             Rename(int i, String new_name)                   { map.SetKey(i, new_name); sort.Clear(); }
+
+	void             Touch(bool t = true)                             { dirty = t; }
+	bool             IsDirty() const                                  { return dirty; }
+
+	PathStyle        Scan(String name, const PathStyle& dflt = PathStyle::solid()) const;
+	// accepts NULL this
+
+	const PathStyle& Get(String name, const PathStyle& dflt = PathStyle::solid()) const { return map.Get(name, dflt); }
+	const PathStyle& operator [] (String name) const                  { return Get(name); }
+
+	bool             IsEmpty() const                                  { return map.IsEmpty(); }
+	int              GetCount() const                                 { return map.GetCount(); }
+	const Vector<int>& GetSort() const;
+	int              GetSort(int si) const                            { return GetSort()[si]; }
+	String           GetSortName(int si) const                        { return map.GetKey(GetSort(si)); }
+	const PathStyle& GetSortStyle(int si) const                       { return map[GetSort(si)]; }
+
+	int              FindSortName(String name, int exclude = -1) const;
+	String           GetUniqueName(String prefix) const;
+
+	String           Export() const;
+	void             Import(String s, bool update_existing = true); // throw Exc
+
+	static PathStyleMap& App();
+
+public:
+	String           name;
+	ArrayMap<String, PathStyle> map;
+	mutable Vector<int> sort;
+	bool             dirty;
+};
+
+//#define DEBUG_DRAW // comment to turn draw debugging off
+
+class PathDraw
+{
+public:
+	PathDraw();
+	PathDraw(Draw& draw, const PathStyle& style, Color color = Black, double width = -10, double dash = Null, bool closed = false);
+
+	void                Clear();
+	void                Set(Draw& draw, const PathStyle& style, Color color = Black, double width = -10, double dash = Null, bool closed = false);
+
+	bool                IsEmpty() const                      { return empty; }
+
+	bool                SetExtent(const Rect& rc);
+	void                ClearExtent()                        { SetExtent(Null); }
+
+	void                MoveTo(Point pt)                     { (this ->* moveto)(pt); }
+	void                MoveTo(int x, int y)                 { (this ->* moveto)(Point(x, y)); }
+	void                LineTo(Point pt)                     { (this ->* lineto)(pt); }
+	void                LineTo(int x, int y)                 { (this ->* lineto)(Point(x, y)); }
+
+	void                Line(Point p, Point q)               { MoveTo(p); LineTo(q); }
+	void                Line(int x1, int y1, int x2, int y2) { MoveTo(Point(x1, y1)); LineTo(Point(x2, y2)); }
+
+	void                Rectangle(const Rect& rc);
+	void                Rectangle(int x, int y, int cx, int cy) { Rectangle(RectC(x, y, cx, cy)); }
+
+	void                ArcTo(Point pt, int bulge);
+	void                ArcTo(int x, int y, int bulge)       { ArcTo(Point(x, y), bulge); }
+	void                Arc(Point p, Point q, int bulge)     { MoveTo(p); ArcTo(q, bulge); }
+	void                Arc(int x1, int y1, int x2, int y2, int bulge) { MoveTo(Point(x1, y1)); ArcTo(Point(x2, y2), bulge); }
+
+	void                Circle(Point pt, int radius);
+
+	void                Paint();
+
+public:
+	enum { LINE_BATCH = 6000, POLY_BATCH = 6000 };
+
+	class Output
+	{
+	public:
+		Output(Color color, int width, Draw& draw) : color(color), width(width), draw(draw) {}
+
+		bool          MustFlush() const  { return vertices.GetCount() >= LINE_BATCH; }
+		void          CheckFlush()       { if(MustFlush()) Flush(); }
+		void          Flush();
+		void          AddFirst(Point pt);
+		void          AddNext(Point pt)  { if(vertices.Top() != pt) { vertices.Add(pt); counts.Top()++; } }
+		void          AddNext(const Vector<Point>& list);
+		void          AddThick(void (*ln)(Output& out, Point a, Point b), Point start, const Vector<Point>& list);
+		Point        *AddSeg(int segments, int counts);
+		Point        *AddSeg(int count);
+
+	public:
+		Color         color;
+		int           width;
+		Draw&         draw;
+
+	private:
+		Vector<Point> vertices;
+		Vector<int>   counts;
+	};
+
+private:
+	struct Split;
+	struct Segment;
+	enum PART { PART_BEGIN, PART_OPEN, PART_SEGMENT, PART_SKIPEND, PART_END };
+
+	void                MoveToSimple(Point pt);
+	void                LineToSimple(Point pt);
+	void                MoveToThick(Point pt);
+	void                LineToThick(Point pt);
+	void                MoveToFull(Point pt);
+	void                LineToFull(Point pt);
+
+	void                CalcLineBegin();
+	void                AddSegment(const PathStyle::Trace& trace, bool infinite);
+	void                Restart();
+	void                FlushLines();
+	void                LineToRaw();
+	Split               SplitLine();
+	void                SetSegment(const Segment& s, PART part);
+	void                AddPos()                             { pos[3] = pos[2]; pos[2] = pos[1]; pos[1] = pos[0]; }
+	void                AddPos(Point p)                      { AddPos(); pos[0] = p; }
+	void                FlushSplit(double keep_length);
+	void                AddSplit()                           { CheckSplit(); Split s = SplitLine(); split_buffer.AddTail(s); part_total += s.total; CheckSplit(); }
+	void                CheckSplit();
+	void                RecurseArc(Point next, int length, int bulge, int levels);
+
+	bool                DoBegin();
+
+private:
+	const PathStyle    *style;
+	Draw               *draw;
+	Color               std_color;
+	struct Trace
+	{
+		int    start, left_top, left_bottom, right_top, right_bottom, width;
+		int    index; // output stream index
+		Color  color;
+		double pos, top_step, bottom_step;
+		Point  last_top, last_bottom;
+		void (*hline)(Output& out, Point a, Point b);
+		bool   vline, left_ground, right_ground;
+	};
+	struct Linear
+	{
+		Linear(int top = 0, int bottom = 0, Color color = Null, int index = 0)
+			: top(top), bottom(bottom), color(color), index(index), hline(0) {}
+		int    top, bottom;
+		void (*hline)(Output& out, Point a, Point b);
+		Point  last_top, last_bottom;
+		Color  color;
+		int    index;
+		bool   ground;
+	};
+	struct Segment
+	{
+		Segment() {}
+		Segment(int top, int bottom, int start, int end, double length)
+			: top(top), bottom(bottom), start(start), end(end), length(length) {}
+
+		bool   IsEmpty() const { return start == end; }
+
+		int    top;    // top y
+		int    bottom; // bottom y
+		int    start;  // start index in traces array
+		int    end;    // end index in traces array
+		double length;
+	};
+	struct Split
+	{
+		Split() {}
+		Split(double begin, double end, double total, Point pos)
+			: begin(begin), end(end), total(total), pos(pos) {}
+
+		double GetStartPos(double excess) const { return 1 - (excess - end) / (total - begin - end); }
+		double GetEndPos(double excess) const   { return GetStartPos(excess >= total - begin ? total : excess); }
+		double begin, end, total;
+		Point  pos; // segment end vertex
+	};
+
+	void    (PathDraw::*moveto)(Point pt);
+	void    (PathDraw::*lineto)(Point pt);
+	void              (*one_thick)(Output& out, Point a, Point b);
+	Output             *one_output;
+	BiArray<Split>      split_buffer;
+//	double              avail_length;
+	double              width; // pixel width
+	double              dash; // pixel dash length
+	double              chamfer_ratio; // a^b < -chamfer_ratio * fabs(a%b) -> chamfer
+	double              chamfer_dist;  // B' = B + y*a0.Left() + chamfer_dist*a0
+	int                 clip_radius;   // maximum line radius (distance from original line)
+	Rect                clip_rect;
+	PART                part, init_part;
+	bool                closed;
+	bool                empty, init_empty;
+	bool                calc_miter;
+	Array<Trace>        traces;
+	Segment             seg_begin, seg_segment, seg_end, seg, init_seg;
+	int                 next_index, clip_index;
+	int                 miter;
+	Array<Linear>       segment_lines;
+	Vector<int>         open_traces;
+	double              part_total;
+	double              skip_size; // pixels left until beginning of next trace in pixels
+	Point              *pos, raw_pos[4], split_pos[4]; // previous positions
+	Point               close_line[3];
+	Pointf              old_up;
+	double              old_ulen;
+	bool                old_axb_left;
+	ArrayMap<Color, Output> outputs;
+};
+
+class PathStyleDisplay : public Display
+{
+public:
+	PathStyleDisplay(const PathStyleMap *path_map = PATH_MAP_NULL);
+	virtual ~PathStyleDisplay();
+
+	PathStyleDisplay&   PathMap(const PathStyleMap *pm) { path_map = pm; return *this; }
+	const PathStyleMap *GetPathMap() const              { return path_map; }
+
+	virtual void        Paint(Draw& draw, const Rect& rc, const Value& v, Color i, Color p, dword s) const;
+
+protected:
+	const PathStyleMap *path_map;
+};
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/Geom/Draw/path_aux.cpp b/uppsrc/Geom/Draw/path_aux.cpp
new file mode 100644
index 000000000..bfd41b817
--- /dev/null
+++ b/uppsrc/Geom/Draw/path_aux.cpp
@@ -0,0 +1,3102 @@
+//////////////////////////////////////////////////////////////////////
+// path_aux: support functions for fast line element generation.
+
+#include "GeomDraw.h"
+
+NAMESPACE_UPP
+
+static void PathDraw_Output_1_1(PathDraw::Output& out, Point a, Point b)
+{
+	//RTIMING("PathDraw_Output_1_1");
+	out.AddFirst(a);
+	out.AddNext(b);
+}
+
+static void PathDraw_Output_1_2(PathDraw::Output& out, Point a, Point b)
+{
+	//RTIMING("PathDraw_Output_1_2");
+	Point *p;
+	int dx = b.x - a.x, dy = b.y - a.y;
+	if(dy >= 0)
+	{
+		if(dx >= 0)
+		{
+			if(dx >= dy)
+			{
+				p = out.AddSeg(2, 2);
+				p[0].y = a.y - 0;
+				p[0].x = a.x + 0;
+				p[1].y = b.y - 1;
+				p[1].x = b.x + 0;
+				p[2].y = a.y + 1;
+				p[2].x = a.x + 0;
+				p[3].y = b.y + 0;
+				p[3].x = b.x + 0;
+			}
+			else
+			{
+				p = out.AddSeg(2, 2);
+				p[0].x = a.x - 0;
+				p[0].y = a.y + 0;
+				p[1].x = b.x - 1;
+				p[1].y = b.y + 0;
+				p[2].x = a.x + 1;
+				p[2].y = a.y + 0;
+				p[3].x = b.x + 0;
+				p[3].y = b.y + 0;
+			}
+		}
+		else
+		{
+			if(0 >= dx + dy)
+			{
+				p = out.AddSeg(2, 2);
+				p[0].y = a.y - 0;
+				p[0].x = a.x + 0;
+				p[1].y = b.y - 1;
+				p[1].x = b.x + 0;
+				p[2].y = a.y + 1;
+				p[2].x = a.x + 0;
+				p[3].y = b.y + 0;
+				p[3].x = b.x + 0;
+			}
+			else
+			{
+				p = out.AddSeg(2, 2);
+				p[0].x = a.x - 0;
+				p[0].y = a.y + 0;
+				p[1].x = b.x - 1;
+				p[1].y = b.y + 0;
+				p[2].x = a.x + 1;
+				p[2].y = a.y + 0;
+				p[3].x = b.x + 0;
+				p[3].y = b.y + 0;
+			}
+		}
+	}
+	else
+	{
+		if(dx >= 0)
+		{
+			if(dx + dy >= 0)
+			{
+				p = out.AddSeg(2, 2);
+				p[0].y = a.y - 0;
+				p[0].x = a.x + 0;
+				p[1].y = b.y - 1;
+				p[1].x = b.x + 0;
+				p[2].y = a.y + 1;
+				p[2].x = a.x + 0;
+				p[3].y = b.y + 0;
+				p[3].x = b.x + 0;
+			}
+			else
+			{
+				p = out.AddSeg(2, 2);
+				p[0].x = a.x - 0;
+				p[0].y = a.y + 0;
+				p[1].x = b.x - 1;
+				p[1].y = b.y + 0;
+				p[2].x = a.x + 1;
+				p[2].y = a.y + 0;
+				p[3].x = b.x + 0;
+				p[3].y = b.y + 0;
+			}
+		}
+		else
+		{
+			if(dy >= dx)
+			{
+				p = out.AddSeg(2, 2);
+				p[0].y = a.y - 0;
+				p[0].x = a.x + 0;
+				p[1].y = b.y - 1;
+				p[1].x = b.x + 0;
+				p[2].y = a.y + 1;
+				p[2].x = a.x + 0;
+				p[3].y = b.y + 0;
+				p[3].x = b.x + 0;
+			}
+			else
+			{
+				p = out.AddSeg(2, 2);
+				p[0].x = a.x - 0;
+				p[0].y = a.y + 0;
+				p[1].x = b.x - 1;
+				p[1].y = b.y + 0;
+				p[2].x = a.x + 1;
+				p[2].y = a.y + 0;
+				p[3].x = b.x + 0;
+				p[3].y = b.y + 0;
+			}
+		}
+	}
+}
+
+//////////////////////////////////////////////////////////////////////
+
+static void PathDraw_Output_1_3(PathDraw::Output& out, Point a, Point b)
+{
+	//RTIMING("PathDraw_Output_1_3");
+	Point *p;
+	int dx = b.x - a.x, dy = b.y - a.y;
+	if(dy >= 0)
+	{
+		if(dx >= 0)
+		{
+			if(dx >= dy)
+			{
+				p = out.AddSeg(3);
+				p[2].y = 1 + (p[0].y = b.y - 1);
+				p[2].x = p[0].x = b.x + 0;
+				p[1].y = a.y - 0;
+				p[1].x = a.x + 0;
+				p = out.AddSeg(2);
+				p[0].y = a.y + 1;
+				p[0].x = a.x + 0;
+				p[1].y = b.y + 1;
+				p[1].x = b.x + 0;
+			}
+			else
+			{
+				p = out.AddSeg(3);
+				p[2].x = 1 + (p[0].x = b.x - 1);
+				p[2].y = p[0].y = b.y + 0;
+				p[1].x = a.x - 0;
+				p[1].y = a.y + 0;
+				p = out.AddSeg(2);
+				p[0].x = a.x + 1;
+				p[0].y = a.y + 0;
+				p[1].x = b.x + 1;
+				p[1].y = b.y + 0;
+			}
+		}
+		else
+		{
+			if(0 >= dx + dy)
+			{
+				p = out.AddSeg(3);
+				p[2].y = 1 + (p[0].y = b.y - 1);
+				p[2].x = p[0].x = b.x + 0;
+				p[1].y = a.y - 0;
+				p[1].x = a.x + 0;
+				p = out.AddSeg(2);
+				p[0].y = a.y + 1;
+				p[0].x = a.x + 0;
+				p[1].y = b.y + 1;
+				p[1].x = b.x + 0;
+			}
+			else
+			{
+				p = out.AddSeg(3);
+				p[2].x = 1 + (p[0].x = b.x - 1);
+				p[2].y = p[0].y = b.y + 0;
+				p[1].x = a.x - 0;
+				p[1].y = a.y + 0;
+				p = out.AddSeg(2);
+				p[0].x = a.x + 1;
+				p[0].y = a.y + 0;
+				p[1].x = b.x + 1;
+				p[1].y = b.y + 0;
+			}
+		}
+	}
+	else
+	{
+		if(dx >= 0)
+		{
+			if(dx + dy >= 0)
+			{
+				p = out.AddSeg(3);
+				p[2].y = 1 + (p[0].y = b.y - 1);
+				p[2].x = p[0].x = b.x + 0;
+				p[1].y = a.y - 0;
+				p[1].x = a.x + 0;
+				p = out.AddSeg(2);
+				p[0].y = a.y + 1;
+				p[0].x = a.x + 0;
+				p[1].y = b.y + 1;
+				p[1].x = b.x + 0;
+			}
+			else
+			{
+				p = out.AddSeg(3);
+				p[2].x = 1 + (p[0].x = b.x - 1);
+				p[2].y = p[0].y = b.y + 0;
+				p[1].x = a.x - 0;
+				p[1].y = a.y + 0;
+				p = out.AddSeg(2);
+				p[0].x = a.x + 1;
+				p[0].y = a.y + 0;
+				p[1].x = b.x + 1;
+				p[1].y = b.y + 0;
+			}
+		}
+		else
+		{
+			if(dy >= dx)
+			{
+				p = out.AddSeg(3);
+				p[2].y = 1 + (p[0].y = b.y - 1);
+				p[2].x = p[0].x = b.x + 0;
+				p[1].y = a.y - 0;
+				p[1].x = a.x + 0;
+				p = out.AddSeg(2);
+				p[0].y = a.y + 1;
+				p[0].x = a.x + 0;
+				p[1].y = b.y + 1;
+				p[1].x = b.x + 0;
+			}
+			else
+			{
+				p = out.AddSeg(3);
+				p[2].x = 1 + (p[0].x = b.x - 1);
+				p[2].y = p[0].y = b.y + 0;
+				p[1].x = a.x - 0;
+				p[1].y = a.y + 0;
+				p = out.AddSeg(2);
+				p[0].x = a.x + 1;
+				p[0].y = a.y + 0;
+				p[1].x = b.x + 1;
+				p[1].y = b.y + 0;
+			}
+		}
+	}
+}
+
+//////////////////////////////////////////////////////////////////////
+
+static void PathDraw_Output_1_4(PathDraw::Output& out, Point a, Point b)
+{
+	//RTIMING("PathDraw_Output_1_4");
+	Point *p;
+	int dx = b.x - a.x, dy = b.y - a.y;
+	if(dy >= 0)
+	{
+		if(dx >= 0)
+		{
+			if(dx >= dy)
+			{
+				p = out.AddSeg(3);
+				p[2].y = 1 + (p[0].y = b.y - 2);
+				p[2].x = p[0].x = b.x + 1;
+				p[1].y = a.y - 0;
+				p[1].x = a.x + 0;
+				p = out.AddSeg(2, 2);
+				p[0].y = a.y - 0;
+				p[0].x = a.x + 0;
+				p[1].y = b.y - 0;
+				p[1].x = b.x + 1;
+				p[2].y = a.y + 1;
+				p[2].x = a.x + 0;
+				p[3].y = b.y + 1;
+				p[3].x = b.x + 1;
+			}
+			else
+			{
+				p = out.AddSeg(3);
+				p[2].x = 1 + (p[0].x = b.x - 2);
+				p[2].y = p[0].y = b.y + 1;
+				p[1].x = a.x - 0;
+				p[1].y = a.y + 0;
+				p = out.AddSeg(2, 2);
+				p[0].x = a.x - 0;
+				p[0].y = a.y + 0;
+				p[1].x = b.x - 0;
+				p[1].y = b.y + 1;
+				p[2].x = a.x + 1;
+				p[2].y = a.y + 0;
+				p[3].x = b.x + 1;
+				p[3].y = b.y + 1;
+			}
+		}
+		else
+		{
+			if(0 >= dx + dy)
+			{
+				p = out.AddSeg(3);
+				p[2].y = 1 + (p[0].y = b.y - 2);
+				p[2].x = p[0].x = b.x + -1;
+				p[1].y = a.y - 0;
+				p[1].x = a.x + 0;
+				p = out.AddSeg(2, 2);
+				p[0].y = a.y - 0;
+				p[0].x = a.x + 0;
+				p[1].y = b.y - 0;
+				p[1].x = b.x + -1;
+				p[2].y = a.y + 1;
+				p[2].x = a.x + 0;
+				p[3].y = b.y + 1;
+				p[3].x = b.x + -1;
+			}
+			else
+			{
+				p = out.AddSeg(3);
+				p[2].x = 1 + (p[0].x = b.x - 2);
+				p[2].y = p[0].y = b.y + 1;
+				p[1].x = a.x - 0;
+				p[1].y = a.y + 0;
+				p = out.AddSeg(2, 2);
+				p[0].x = a.x - 0;
+				p[0].y = a.y + 0;
+				p[1].x = b.x - 0;
+				p[1].y = b.y + 1;
+				p[2].x = a.x + 1;
+				p[2].y = a.y + 0;
+				p[3].x = b.x + 1;
+				p[3].y = b.y + 1;
+			}
+		}
+	}
+	else
+	{
+		if(dx >= 0)
+		{
+			if(dx + dy >= 0)
+			{
+				p = out.AddSeg(3);
+				p[2].y = 1 + (p[0].y = b.y - 2);
+				p[2].x = p[0].x = b.x + 1;
+				p[1].y = a.y - 0;
+				p[1].x = a.x + 0;
+				p = out.AddSeg(2, 2);
+				p[0].y = a.y - 0;
+				p[0].x = a.x + 0;
+				p[1].y = b.y - 0;
+				p[1].x = b.x + 1;
+				p[2].y = a.y + 1;
+				p[2].x = a.x + 0;
+				p[3].y = b.y + 1;
+				p[3].x = b.x + 1;
+			}
+			else
+			{
+				p = out.AddSeg(3);
+				p[2].x = 1 + (p[0].x = b.x - 2);
+				p[2].y = p[0].y = b.y + -1;
+				p[1].x = a.x - 0;
+				p[1].y = a.y + 0;
+				p = out.AddSeg(2, 2);
+				p[0].x = a.x - 0;
+				p[0].y = a.y + 0;
+				p[1].x = b.x - 0;
+				p[1].y = b.y + -1;
+				p[2].x = a.x + 1;
+				p[2].y = a.y + 0;
+				p[3].x = b.x + 1;
+				p[3].y = b.y + -1;
+			}
+		}
+		else
+		{
+			if(dy >= dx)
+			{
+				p = out.AddSeg(3);
+				p[2].y = 1 + (p[0].y = b.y - 2);
+				p[2].x = p[0].x = b.x + -1;
+				p[1].y = a.y - 0;
+				p[1].x = a.x + 0;
+				p = out.AddSeg(2, 2);
+				p[0].y = a.y - 0;
+				p[0].x = a.x + 0;
+				p[1].y = b.y - 0;
+				p[1].x = b.x + -1;
+				p[2].y = a.y + 1;
+				p[2].x = a.x + 0;
+				p[3].y = b.y + 1;
+				p[3].x = b.x + -1;
+			}
+			else
+			{
+				p = out.AddSeg(3);
+				p[2].x = 1 + (p[0].x = b.x - 2);
+				p[2].y = p[0].y = b.y + -1;
+				p[1].x = a.x - 0;
+				p[1].y = a.y + 0;
+				p = out.AddSeg(2, 2);
+				p[0].x = a.x - 0;
+				p[0].y = a.y + 0;
+				p[1].x = b.x - 0;
+				p[1].y = b.y + -1;
+				p[2].x = a.x + 1;
+				p[2].y = a.y + 0;
+				p[3].x = b.x + 1;
+				p[3].y = b.y + -1;
+			}
+		}
+	}
+}
+
+//////////////////////////////////////////////////////////////////////
+
+static void PathDraw_Output_1_5(PathDraw::Output& out, Point a, Point b)
+{
+	//RTIMING("PathDraw_Output_1_5");
+	Point *p;
+	int dx = b.x - a.x, dy = b.y - a.y;
+	if(dy >= 0)
+	{
+		if(dx >= 0)
+		{
+			if(dx >= dy)
+			{
+				p = out.AddSeg(2, 3);
+				p[5].y = 1 + (p[3].y = 1 + (p[2].y = 1 + (p[0].y = b.y - 2)));
+				p[3].x = p[5].x = p[2].x = p[0].x = b.x + 1;
+				p[4].y = p[1].y = a.y - 0;
+				p[4].x = p[1].x = a.x + 0;
+				p = out.AddSeg(2);
+				p[0].y = a.y + 1;
+				p[0].x = a.x + 0;
+				p[1].y = b.y + 2;
+				p[1].x = b.x + 1;
+			}
+			else
+			{
+				p = out.AddSeg(2, 3);
+				p[5].x = 1 + (p[3].x = 1 + (p[2].x = 1 + (p[0].x = b.x - 2)));
+				p[3].y = p[5].y = p[2].y = p[0].y = b.y + 1;
+				p[4].x = p[1].x = a.x - 0;
+				p[4].y = p[1].y = a.y + 0;
+				p = out.AddSeg(2);
+				p[0].x = a.x + 1;
+				p[0].y = a.y + 0;
+				p[1].x = b.x + 2;
+				p[1].y = b.y + 1;
+			}
+		}
+		else
+		{
+			if(0 >= dx + dy)
+			{
+				p = out.AddSeg(2, 3);
+				p[5].y = 1 + (p[3].y = 1 + (p[2].y = 1 + (p[0].y = b.y - 2)));
+				p[3].x = p[5].x = p[2].x = p[0].x = b.x + -1;
+				p[4].y = p[1].y = a.y - 0;
+				p[4].x = p[1].x = a.x + 0;
+				p = out.AddSeg(2);
+				p[0].y = a.y + 1;
+				p[0].x = a.x + 0;
+				p[1].y = b.y + 2;
+				p[1].x = b.x + -1;
+			}
+			else
+			{
+				p = out.AddSeg(2, 3);
+				p[5].x = 1 + (p[3].x = 1 + (p[2].x = 1 + (p[0].x = b.x - 2)));
+				p[3].y = p[5].y = p[2].y = p[0].y = b.y + 1;
+				p[4].x = p[1].x = a.x - 0;
+				p[4].y = p[1].y = a.y + 0;
+				p = out.AddSeg(2);
+				p[0].x = a.x + 1;
+				p[0].y = a.y + 0;
+				p[1].x = b.x + 2;
+				p[1].y = b.y + 1;
+			}
+		}
+	}
+	else
+	{
+		if(dx >= 0)
+		{
+			if(dx + dy >= 0)
+			{
+				p = out.AddSeg(2, 3);
+				p[5].y = 1 + (p[3].y = 1 + (p[2].y = 1 + (p[0].y = b.y - 2)));
+				p[3].x = p[5].x = p[2].x = p[0].x = b.x + 1;
+				p[4].y = p[1].y = a.y - 0;
+				p[4].x = p[1].x = a.x + 0;
+				p = out.AddSeg(2);
+				p[0].y = a.y + 1;
+				p[0].x = a.x + 0;
+				p[1].y = b.y + 2;
+				p[1].x = b.x + 1;
+			}
+			else
+			{
+				p = out.AddSeg(2, 3);
+				p[5].x = 1 + (p[3].x = 1 + (p[2].x = 1 + (p[0].x = b.x - 2)));
+				p[3].y = p[5].y = p[2].y = p[0].y = b.y + -1;
+				p[4].x = p[1].x = a.x - 0;
+				p[4].y = p[1].y = a.y + 0;
+				p = out.AddSeg(2);
+				p[0].x = a.x + 1;
+				p[0].y = a.y + 0;
+				p[1].x = b.x + 2;
+				p[1].y = b.y + -1;
+			}
+		}
+		else
+		{
+			if(dy >= dx)
+			{
+				p = out.AddSeg(2, 3);
+				p[5].y = 1 + (p[3].y = 1 + (p[2].y = 1 + (p[0].y = b.y - 2)));
+				p[3].x = p[5].x = p[2].x = p[0].x = b.x + -1;
+				p[4].y = p[1].y = a.y - 0;
+				p[4].x = p[1].x = a.x + 0;
+				p = out.AddSeg(2);
+				p[0].y = a.y + 1;
+				p[0].x = a.x + 0;
+				p[1].y = b.y + 2;
+				p[1].x = b.x + -1;
+			}
+			else
+			{
+				p = out.AddSeg(2, 3);
+				p[5].x = 1 + (p[3].x = 1 + (p[2].x = 1 + (p[0].x = b.x - 2)));
+				p[3].y = p[5].y = p[2].y = p[0].y = b.y + -1;
+				p[4].x = p[1].x = a.x - 0;
+				p[4].y = p[1].y = a.y + 0;
+				p = out.AddSeg(2);
+				p[0].x = a.x + 1;
+				p[0].y = a.y + 0;
+				p[1].x = b.x + 2;
+				p[1].y = b.y + -1;
+			}
+		}
+	}
+}
+
+//////////////////////////////////////////////////////////////////////
+
+static void PathDraw_Output_2_1(PathDraw::Output& out, Point a, Point b)
+{
+	//RTIMING("PathDraw_Output_2_1");
+	Point *p;
+	int dx = b.x - a.x, dy = b.y - a.y;
+	if(dy >= 0)
+	{
+		if(dx >= 0)
+		{
+			if(dx >= dy)
+			{
+				p = out.AddSeg(2, 2);
+				p[0].y = b.y - 0;
+				p[0].x = b.x + 0;
+				p[1].y = a.y - 1;
+				p[1].x = a.x + 0;
+				p[2].y = b.y + 1;
+				p[2].x = b.x + 0;
+				p[3].y = a.y + 0;
+				p[3].x = a.x + 0;
+			}
+			else
+			{
+				p = out.AddSeg(2, 2);
+				p[0].x = b.x - 0;
+				p[0].y = b.y + 0;
+				p[1].x = a.x - 1;
+				p[1].y = a.y + 0;
+				p[2].x = b.x + 1;
+				p[2].y = b.y + 0;
+				p[3].x = a.x + 0;
+				p[3].y = a.y + 0;
+			}
+		}
+		else
+		{
+			if(0 >= dx + dy)
+			{
+				p = out.AddSeg(2, 2);
+				p[0].y = b.y - 0;
+				p[0].x = b.x + 0;
+				p[1].y = a.y - 1;
+				p[1].x = a.x + 0;
+				p[2].y = b.y + 1;
+				p[2].x = b.x + 0;
+				p[3].y = a.y + 0;
+				p[3].x = a.x + 0;
+			}
+			else
+			{
+				p = out.AddSeg(2, 2);
+				p[0].x = b.x - 0;
+				p[0].y = b.y + 0;
+				p[1].x = a.x - 1;
+				p[1].y = a.y + 0;
+				p[2].x = b.x + 1;
+				p[2].y = b.y + 0;
+				p[3].x = a.x + 0;
+				p[3].y = a.y + 0;
+			}
+		}
+	}
+	else
+	{
+		if(dx >= 0)
+		{
+			if(dx + dy >= 0)
+			{
+				p = out.AddSeg(2, 2);
+				p[0].y = b.y - 0;
+				p[0].x = b.x + 0;
+				p[1].y = a.y - 1;
+				p[1].x = a.x + 0;
+				p[2].y = b.y + 1;
+				p[2].x = b.x + 0;
+				p[3].y = a.y + 0;
+				p[3].x = a.x + 0;
+			}
+			else
+			{
+				p = out.AddSeg(2, 2);
+				p[0].x = b.x - 0;
+				p[0].y = b.y + 0;
+				p[1].x = a.x - 1;
+				p[1].y = a.y + 0;
+				p[2].x = b.x + 1;
+				p[2].y = b.y + 0;
+				p[3].x = a.x + 0;
+				p[3].y = a.y + 0;
+			}
+		}
+		else
+		{
+			if(dy >= dx)
+			{
+				p = out.AddSeg(2, 2);
+				p[0].y = b.y - 0;
+				p[0].x = b.x + 0;
+				p[1].y = a.y - 1;
+				p[1].x = a.x + 0;
+				p[2].y = b.y + 1;
+				p[2].x = b.x + 0;
+				p[3].y = a.y + 0;
+				p[3].x = a.x + 0;
+			}
+			else
+			{
+				p = out.AddSeg(2, 2);
+				p[0].x = b.x - 0;
+				p[0].y = b.y + 0;
+				p[1].x = a.x - 1;
+				p[1].y = a.y + 0;
+				p[2].x = b.x + 1;
+				p[2].y = b.y + 0;
+				p[3].x = a.x + 0;
+				p[3].y = a.y + 0;
+			}
+		}
+	}
+}
+
+//////////////////////////////////////////////////////////////////////
+
+static void PathDraw_Output_2_2(PathDraw::Output& out, Point a, Point b)
+{
+	//RTIMING("PathDraw_Output_2_2");
+	Point *p;
+	int dx = b.x - a.x, dy = b.y - a.y;
+	if(dy >= 0)
+	{
+		if(dx >= 0)
+		{
+			if(dx >= dy)
+			{
+				p = out.AddSeg(2, 2);
+				p[2].y = 1 + (p[0].y = a.y + -1);
+				p[2].x = p[0].x = a.x + 0;
+				p[3].y = 1 + (p[1].y = b.y + -1);
+				p[3].x = p[1].x = b.x + 0;
+			}
+			else
+			{
+				p = out.AddSeg(2, 2);
+				p[2].x = 1 + (p[0].x = a.x + -1);
+				p[2].y = p[0].y = a.y + 0;
+				p[3].x = 1 + (p[1].x = b.x + -1);
+				p[3].y = p[1].y = b.y + 0;
+			}
+		}
+		else
+		{
+			if(0 >= dx + dy)
+			{
+				p = out.AddSeg(2, 2);
+				p[2].y = 1 + (p[0].y = a.y + -1);
+				p[2].x = p[0].x = a.x + 0;
+				p[3].y = 1 + (p[1].y = b.y + -1);
+				p[3].x = p[1].x = b.x + 0;
+			}
+			else
+			{
+				p = out.AddSeg(2, 2);
+				p[2].x = 1 + (p[0].x = a.x + -1);
+				p[2].y = p[0].y = a.y + 0;
+				p[3].x = 1 + (p[1].x = b.x + -1);
+				p[3].y = p[1].y = b.y + 0;
+			}
+		}
+	}
+	else
+	{
+		if(dx >= 0)
+		{
+			if(dx + dy >= 0)
+			{
+				p = out.AddSeg(2, 2);
+				p[2].y = 1 + (p[0].y = a.y + -1);
+				p[2].x = p[0].x = a.x + 0;
+				p[3].y = 1 + (p[1].y = b.y + -1);
+				p[3].x = p[1].x = b.x + 0;
+			}
+			else
+			{
+				p = out.AddSeg(2, 2);
+				p[2].x = 1 + (p[0].x = a.x + -1);
+				p[2].y = p[0].y = a.y + 0;
+				p[3].x = 1 + (p[1].x = b.x + -1);
+				p[3].y = p[1].y = b.y + 0;
+			}
+		}
+		else
+		{
+			if(dy >= dx)
+			{
+				p = out.AddSeg(2, 2);
+				p[2].y = 1 + (p[0].y = a.y + -1);
+				p[2].x = p[0].x = a.x + 0;
+				p[3].y = 1 + (p[1].y = b.y + -1);
+				p[3].x = p[1].x = b.x + 0;
+			}
+			else
+			{
+				p = out.AddSeg(2, 2);
+				p[2].x = 1 + (p[0].x = a.x + -1);
+				p[2].y = p[0].y = a.y + 0;
+				p[3].x = 1 + (p[1].x = b.x + -1);
+				p[3].y = p[1].y = b.y + 0;
+			}
+		}
+	}
+}
+
+//////////////////////////////////////////////////////////////////////
+
+static void PathDraw_Output_2_3(PathDraw::Output& out, Point a, Point b)
+{
+	//RTIMING("PathDraw_Output_2_3");
+	Point *p;
+	int dx = b.x - a.x, dy = b.y - a.y;
+	if(dy >= 0)
+	{
+		if(dx >= 0)
+		{
+			if(dx >= dy)
+			{
+				p = out.AddSeg(3, 2);
+				p[0].y = a.y - 1;
+				p[0].x = a.x + 0;
+				p[1].y = b.y - 1;
+				p[1].x = b.x + 0;
+				p[4].y = 1 + (p[2].y = a.y + 0);
+				p[4].x = p[2].x = a.x + 0;
+				p[5].y = 1 + (p[3].y = b.y + 0);
+				p[5].x = p[3].x = b.x + 0;
+			}
+			else
+			{
+				p = out.AddSeg(3, 2);
+				p[0].x = a.x - 1;
+				p[0].y = a.y + 0;
+				p[1].x = b.x - 1;
+				p[1].y = b.y + 0;
+				p[4].x = 1 + (p[2].x = a.x + 0);
+				p[4].y = p[2].y = a.y + 0;
+				p[5].x = 1 + (p[3].x = b.x + 0);
+				p[5].y = p[3].y = b.y + 0;
+			}
+		}
+		else
+		{
+			if(0 >= dx + dy)
+			{
+				p = out.AddSeg(3, 2);
+				p[0].y = a.y - 1;
+				p[0].x = a.x + 0;
+				p[1].y = b.y - 1;
+				p[1].x = b.x + 0;
+				p[4].y = 1 + (p[2].y = a.y + 0);
+				p[4].x = p[2].x = a.x + 0;
+				p[5].y = 1 + (p[3].y = b.y + 0);
+				p[5].x = p[3].x = b.x + 0;
+			}
+			else
+			{
+				p = out.AddSeg(3, 2);
+				p[0].x = a.x - 1;
+				p[0].y = a.y + 0;
+				p[1].x = b.x - 1;
+				p[1].y = b.y + 0;
+				p[4].x = 1 + (p[2].x = a.x + 0);
+				p[4].y = p[2].y = a.y + 0;
+				p[5].x = 1 + (p[3].x = b.x + 0);
+				p[5].y = p[3].y = b.y + 0;
+			}
+		}
+	}
+	else
+	{
+		if(dx >= 0)
+		{
+			if(dx + dy >= 0)
+			{
+				p = out.AddSeg(3, 2);
+				p[0].y = a.y - 1;
+				p[0].x = a.x + 0;
+				p[1].y = b.y - 1;
+				p[1].x = b.x + 0;
+				p[4].y = 1 + (p[2].y = a.y + 0);
+				p[4].x = p[2].x = a.x + 0;
+				p[5].y = 1 + (p[3].y = b.y + 0);
+				p[5].x = p[3].x = b.x + 0;
+			}
+			else
+			{
+				p = out.AddSeg(3, 2);
+				p[0].x = a.x - 1;
+				p[0].y = a.y + 0;
+				p[1].x = b.x - 1;
+				p[1].y = b.y + 0;
+				p[4].x = 1 + (p[2].x = a.x + 0);
+				p[4].y = p[2].y = a.y + 0;
+				p[5].x = 1 + (p[3].x = b.x + 0);
+				p[5].y = p[3].y = b.y + 0;
+			}
+		}
+		else
+		{
+			if(dy >= dx)
+			{
+				p = out.AddSeg(3, 2);
+				p[0].y = a.y - 1;
+				p[0].x = a.x + 0;
+				p[1].y = b.y - 1;
+				p[1].x = b.x + 0;
+				p[4].y = 1 + (p[2].y = a.y + 0);
+				p[4].x = p[2].x = a.x + 0;
+				p[5].y = 1 + (p[3].y = b.y + 0);
+				p[5].x = p[3].x = b.x + 0;
+			}
+			else
+			{
+				p = out.AddSeg(3, 2);
+				p[0].x = a.x - 1;
+				p[0].y = a.y + 0;
+				p[1].x = b.x - 1;
+				p[1].y = b.y + 0;
+				p[4].x = 1 + (p[2].x = a.x + 0);
+				p[4].y = p[2].y = a.y + 0;
+				p[5].x = 1 + (p[3].x = b.x + 0);
+				p[5].y = p[3].y = b.y + 0;
+			}
+		}
+	}
+}
+
+//////////////////////////////////////////////////////////////////////
+
+static void PathDraw_Output_2_4(PathDraw::Output& out, Point a, Point b)
+{
+	//RTIMING("PathDraw_Output_2_4");
+	Point *p;
+	int dx = b.x - a.x, dy = b.y - a.y;
+	if(dy >= 0)
+	{
+		if(dx >= 0)
+		{
+			if(dx >= dy)
+			{
+				p = out.AddSeg(3);
+				p[2].y = 1 + (p[0].y = b.y - 2);
+				p[2].x = p[0].x = b.x + 1;
+				p[1].y = a.y - 1;
+				p[1].x = a.x + 0;
+				p = out.AddSeg(2, 2);
+				p[2].y = 1 + (p[0].y = a.y + 0);
+				p[2].x = p[0].x = a.x + 0;
+				p[3].y = 1 + (p[1].y = b.y + 0);
+				p[3].x = p[1].x = b.x + 1;
+			}
+			else
+			{
+				p = out.AddSeg(3);
+				p[2].x = 1 + (p[0].x = b.x - 2);
+				p[2].y = p[0].y = b.y + 1;
+				p[1].x = a.x - 1;
+				p[1].y = a.y + 0;
+				p = out.AddSeg(2, 2);
+				p[2].x = 1 + (p[0].x = a.x + 0);
+				p[2].y = p[0].y = a.y + 0;
+				p[3].x = 1 + (p[1].x = b.x + 0);
+				p[3].y = p[1].y = b.y + 1;
+			}
+		}
+		else
+		{
+			if(0 >= dx + dy)
+			{
+				p = out.AddSeg(3);
+				p[2].y = 1 + (p[0].y = b.y - 2);
+				p[2].x = p[0].x = b.x + -1;
+				p[1].y = a.y - 1;
+				p[1].x = a.x + 0;
+				p = out.AddSeg(2, 2);
+				p[2].y = 1 + (p[0].y = a.y + 0);
+				p[2].x = p[0].x = a.x + 0;
+				p[3].y = 1 + (p[1].y = b.y + 0);
+				p[3].x = p[1].x = b.x + -1;
+			}
+			else
+			{
+				p = out.AddSeg(3);
+				p[2].x = 1 + (p[0].x = b.x - 2);
+				p[2].y = p[0].y = b.y + 1;
+				p[1].x = a.x - 1;
+				p[1].y = a.y + 0;
+				p = out.AddSeg(2, 2);
+				p[2].x = 1 + (p[0].x = a.x + 0);
+				p[2].y = p[0].y = a.y + 0;
+				p[3].x = 1 + (p[1].x = b.x + 0);
+				p[3].y = p[1].y = b.y + 1;
+			}
+		}
+	}
+	else
+	{
+		if(dx >= 0)
+		{
+			if(dx + dy >= 0)
+			{
+				p = out.AddSeg(3);
+				p[2].y = 1 + (p[0].y = b.y - 2);
+				p[2].x = p[0].x = b.x + 1;
+				p[1].y = a.y - 1;
+				p[1].x = a.x + 0;
+				p = out.AddSeg(2, 2);
+				p[2].y = 1 + (p[0].y = a.y + 0);
+				p[2].x = p[0].x = a.x + 0;
+				p[3].y = 1 + (p[1].y = b.y + 0);
+				p[3].x = p[1].x = b.x + 1;
+			}
+			else
+			{
+				p = out.AddSeg(3);
+				p[2].x = 1 + (p[0].x = b.x - 2);
+				p[2].y = p[0].y = b.y + -1;
+				p[1].x = a.x - 1;
+				p[1].y = a.y + 0;
+				p = out.AddSeg(2, 2);
+				p[2].x = 1 + (p[0].x = a.x + 0);
+				p[2].y = p[0].y = a.y + 0;
+				p[3].x = 1 + (p[1].x = b.x + 0);
+				p[3].y = p[1].y = b.y + -1;
+			}
+		}
+		else
+		{
+			if(dy >= dx)
+			{
+				p = out.AddSeg(3);
+				p[2].y = 1 + (p[0].y = b.y - 2);
+				p[2].x = p[0].x = b.x + -1;
+				p[1].y = a.y - 1;
+				p[1].x = a.x + 0;
+				p = out.AddSeg(2, 2);
+				p[2].y = 1 + (p[0].y = a.y + 0);
+				p[2].x = p[0].x = a.x + 0;
+				p[3].y = 1 + (p[1].y = b.y + 0);
+				p[3].x = p[1].x = b.x + -1;
+			}
+			else
+			{
+				p = out.AddSeg(3);
+				p[2].x = 1 + (p[0].x = b.x - 2);
+				p[2].y = p[0].y = b.y + -1;
+				p[1].x = a.x - 1;
+				p[1].y = a.y + 0;
+				p = out.AddSeg(2, 2);
+				p[2].x = 1 + (p[0].x = a.x + 0);
+				p[2].y = p[0].y = a.y + 0;
+				p[3].x = 1 + (p[1].x = b.x + 0);
+				p[3].y = p[1].y = b.y + -1;
+			}
+		}
+	}
+}
+
+//////////////////////////////////////////////////////////////////////
+
+static void PathDraw_Output_2_5(PathDraw::Output& out, Point a, Point b)
+{
+	//RTIMING("PathDraw_Output_2_5");
+	Point *p;
+	int dx = b.x - a.x, dy = b.y - a.y;
+	if(dy >= 0)
+	{
+		if(dx >= 0)
+		{
+			if(dx >= dy)
+			{
+				p = out.AddSeg(3);
+				p[2].y = 1 + (p[0].y = b.y - 2);
+				p[2].x = p[0].x = b.x + 1;
+				p[1].y = a.y - 1;
+				p[1].x = a.x + 0;
+				p = out.AddSeg(3, 2);
+				p[0].y = a.y - 1;
+				p[0].x = a.x + 0;
+				p[1].y = b.y - 0;
+				p[1].x = b.x + 1;
+				p[4].y = 1 + (p[2].y = a.y + 0);
+				p[4].x = p[2].x = a.x + 0;
+				p[5].y = 1 + (p[3].y = b.y + 1);
+				p[5].x = p[3].x = b.x + 1;
+			}
+			else
+			{
+				p = out.AddSeg(3);
+				p[2].x = 1 + (p[0].x = b.x - 2);
+				p[2].y = p[0].y = b.y + 1;
+				p[1].x = a.x - 1;
+				p[1].y = a.y + 0;
+				p = out.AddSeg(3, 2);
+				p[0].x = a.x - 1;
+				p[0].y = a.y + 0;
+				p[1].x = b.x - 0;
+				p[1].y = b.y + 1;
+				p[4].x = 1 + (p[2].x = a.x + 0);
+				p[4].y = p[2].y = a.y + 0;
+				p[5].x = 1 + (p[3].x = b.x + 1);
+				p[5].y = p[3].y = b.y + 1;
+			}
+		}
+		else
+		{
+			if(0 >= dx + dy)
+			{
+				p = out.AddSeg(3);
+				p[2].y = 1 + (p[0].y = b.y - 2);
+				p[2].x = p[0].x = b.x + -1;
+				p[1].y = a.y - 1;
+				p[1].x = a.x + 0;
+				p = out.AddSeg(3, 2);
+				p[0].y = a.y - 1;
+				p[0].x = a.x + 0;
+				p[1].y = b.y - 0;
+				p[1].x = b.x + -1;
+				p[4].y = 1 + (p[2].y = a.y + 0);
+				p[4].x = p[2].x = a.x + 0;
+				p[5].y = 1 + (p[3].y = b.y + 1);
+				p[5].x = p[3].x = b.x + -1;
+			}
+			else
+			{
+				p = out.AddSeg(3);
+				p[2].x = 1 + (p[0].x = b.x - 2);
+				p[2].y = p[0].y = b.y + 1;
+				p[1].x = a.x - 1;
+				p[1].y = a.y + 0;
+				p = out.AddSeg(3, 2);
+				p[0].x = a.x - 1;
+				p[0].y = a.y + 0;
+				p[1].x = b.x - 0;
+				p[1].y = b.y + 1;
+				p[4].x = 1 + (p[2].x = a.x + 0);
+				p[4].y = p[2].y = a.y + 0;
+				p[5].x = 1 + (p[3].x = b.x + 1);
+				p[5].y = p[3].y = b.y + 1;
+			}
+		}
+	}
+	else
+	{
+		if(dx >= 0)
+		{
+			if(dx + dy >= 0)
+			{
+				p = out.AddSeg(3);
+				p[2].y = 1 + (p[0].y = b.y - 2);
+				p[2].x = p[0].x = b.x + 1;
+				p[1].y = a.y - 1;
+				p[1].x = a.x + 0;
+				p = out.AddSeg(3, 2);
+				p[0].y = a.y - 1;
+				p[0].x = a.x + 0;
+				p[1].y = b.y - 0;
+				p[1].x = b.x + 1;
+				p[4].y = 1 + (p[2].y = a.y + 0);
+				p[4].x = p[2].x = a.x + 0;
+				p[5].y = 1 + (p[3].y = b.y + 1);
+				p[5].x = p[3].x = b.x + 1;
+			}
+			else
+			{
+				p = out.AddSeg(3);
+				p[2].x = 1 + (p[0].x = b.x - 2);
+				p[2].y = p[0].y = b.y + -1;
+				p[1].x = a.x - 1;
+				p[1].y = a.y + 0;
+				p = out.AddSeg(3, 2);
+				p[0].x = a.x - 1;
+				p[0].y = a.y + 0;
+				p[1].x = b.x - 0;
+				p[1].y = b.y + -1;
+				p[4].x = 1 + (p[2].x = a.x + 0);
+				p[4].y = p[2].y = a.y + 0;
+				p[5].x = 1 + (p[3].x = b.x + 1);
+				p[5].y = p[3].y = b.y + -1;
+			}
+		}
+		else
+		{
+			if(dy >= dx)
+			{
+				p = out.AddSeg(3);
+				p[2].y = 1 + (p[0].y = b.y - 2);
+				p[2].x = p[0].x = b.x + -1;
+				p[1].y = a.y - 1;
+				p[1].x = a.x + 0;
+				p = out.AddSeg(3, 2);
+				p[0].y = a.y - 1;
+				p[0].x = a.x + 0;
+				p[1].y = b.y - 0;
+				p[1].x = b.x + -1;
+				p[4].y = 1 + (p[2].y = a.y + 0);
+				p[4].x = p[2].x = a.x + 0;
+				p[5].y = 1 + (p[3].y = b.y + 1);
+				p[5].x = p[3].x = b.x + -1;
+			}
+			else
+			{
+				p = out.AddSeg(3);
+				p[2].x = 1 + (p[0].x = b.x - 2);
+				p[2].y = p[0].y = b.y + -1;
+				p[1].x = a.x - 1;
+				p[1].y = a.y + 0;
+				p = out.AddSeg(3, 2);
+				p[0].x = a.x - 1;
+				p[0].y = a.y + 0;
+				p[1].x = b.x - 0;
+				p[1].y = b.y + -1;
+				p[4].x = 1 + (p[2].x = a.x + 0);
+				p[4].y = p[2].y = a.y + 0;
+				p[5].x = 1 + (p[3].x = b.x + 1);
+				p[5].y = p[3].y = b.y + -1;
+			}
+		}
+	}
+}
+
+//////////////////////////////////////////////////////////////////////
+
+static void PathDraw_Output_3_1(PathDraw::Output& out, Point a, Point b)
+{
+	//RTIMING("PathDraw_Output_3_1");
+	Point *p;
+	int dx = b.x - a.x, dy = b.y - a.y;
+	if(dy >= 0)
+	{
+		if(dx >= 0)
+		{
+			if(dx >= dy)
+			{
+				p = out.AddSeg(3);
+				p[2].y = 1 + (p[0].y = a.y - 1);
+				p[2].x = p[0].x = a.x + 0;
+				p[1].y = b.y - 0;
+				p[1].x = b.x + 0;
+				p = out.AddSeg(2);
+				p[0].y = b.y + 1;
+				p[0].x = b.x + 0;
+				p[1].y = a.y + 1;
+				p[1].x = a.x + 0;
+			}
+			else
+			{
+				p = out.AddSeg(3);
+				p[2].x = 1 + (p[0].x = a.x - 1);
+				p[2].y = p[0].y = a.y + 0;
+				p[1].x = b.x - 0;
+				p[1].y = b.y + 0;
+				p = out.AddSeg(2);
+				p[0].x = b.x + 1;
+				p[0].y = b.y + 0;
+				p[1].x = a.x + 1;
+				p[1].y = a.y + 0;
+			}
+		}
+		else
+		{
+			if(0 >= dx + dy)
+			{
+				p = out.AddSeg(3);
+				p[2].y = 1 + (p[0].y = a.y - 1);
+				p[2].x = p[0].x = a.x + 0;
+				p[1].y = b.y - 0;
+				p[1].x = b.x + 0;
+				p = out.AddSeg(2);
+				p[0].y = b.y + 1;
+				p[0].x = b.x + 0;
+				p[1].y = a.y + 1;
+				p[1].x = a.x + 0;
+			}
+			else
+			{
+				p = out.AddSeg(3);
+				p[2].x = 1 + (p[0].x = a.x - 1);
+				p[2].y = p[0].y = a.y + 0;
+				p[1].x = b.x - 0;
+				p[1].y = b.y + 0;
+				p = out.AddSeg(2);
+				p[0].x = b.x + 1;
+				p[0].y = b.y + 0;
+				p[1].x = a.x + 1;
+				p[1].y = a.y + 0;
+			}
+		}
+	}
+	else
+	{
+		if(dx >= 0)
+		{
+			if(dx + dy >= 0)
+			{
+				p = out.AddSeg(3);
+				p[2].y = 1 + (p[0].y = a.y - 1);
+				p[2].x = p[0].x = a.x + 0;
+				p[1].y = b.y - 0;
+				p[1].x = b.x + 0;
+				p = out.AddSeg(2);
+				p[0].y = b.y + 1;
+				p[0].x = b.x + 0;
+				p[1].y = a.y + 1;
+				p[1].x = a.x + 0;
+			}
+			else
+			{
+				p = out.AddSeg(3);
+				p[2].x = 1 + (p[0].x = a.x - 1);
+				p[2].y = p[0].y = a.y + 0;
+				p[1].x = b.x - 0;
+				p[1].y = b.y + 0;
+				p = out.AddSeg(2);
+				p[0].x = b.x + 1;
+				p[0].y = b.y + 0;
+				p[1].x = a.x + 1;
+				p[1].y = a.y + 0;
+			}
+		}
+		else
+		{
+			if(dy >= dx)
+			{
+				p = out.AddSeg(3);
+				p[2].y = 1 + (p[0].y = a.y - 1);
+				p[2].x = p[0].x = a.x + 0;
+				p[1].y = b.y - 0;
+				p[1].x = b.x + 0;
+				p = out.AddSeg(2);
+				p[0].y = b.y + 1;
+				p[0].x = b.x + 0;
+				p[1].y = a.y + 1;
+				p[1].x = a.x + 0;
+			}
+			else
+			{
+				p = out.AddSeg(3);
+				p[2].x = 1 + (p[0].x = a.x - 1);
+				p[2].y = p[0].y = a.y + 0;
+				p[1].x = b.x - 0;
+				p[1].y = b.y + 0;
+				p = out.AddSeg(2);
+				p[0].x = b.x + 1;
+				p[0].y = b.y + 0;
+				p[1].x = a.x + 1;
+				p[1].y = a.y + 0;
+			}
+		}
+	}
+}
+
+//////////////////////////////////////////////////////////////////////
+
+static void PathDraw_Output_3_2(PathDraw::Output& out, Point a, Point b)
+{
+	//RTIMING("PathDraw_Output_3_2");
+	Point *p;
+	int dx = b.x - a.x, dy = b.y - a.y;
+	if(dy >= 0)
+	{
+		if(dx >= 0)
+		{
+			if(dx >= dy)
+			{
+				p = out.AddSeg(3, 2);
+				p[0].y = b.y - 1;
+				p[0].x = b.x + 0;
+				p[1].y = a.y - 1;
+				p[1].x = a.x + 0;
+				p[4].y = 1 + (p[2].y = b.y + 0);
+				p[4].x = p[2].x = b.x + 0;
+				p[5].y = 1 + (p[3].y = a.y + 0);
+				p[5].x = p[3].x = a.x + 0;
+			}
+			else
+			{
+				p = out.AddSeg(3, 2);
+				p[0].x = b.x - 1;
+				p[0].y = b.y + 0;
+				p[1].x = a.x - 1;
+				p[1].y = a.y + 0;
+				p[4].x = 1 + (p[2].x = b.x + 0);
+				p[4].y = p[2].y = b.y + 0;
+				p[5].x = 1 + (p[3].x = a.x + 0);
+				p[5].y = p[3].y = a.y + 0;
+			}
+		}
+		else
+		{
+			if(0 >= dx + dy)
+			{
+				p = out.AddSeg(3, 2);
+				p[0].y = b.y - 1;
+				p[0].x = b.x + 0;
+				p[1].y = a.y - 1;
+				p[1].x = a.x + 0;
+				p[4].y = 1 + (p[2].y = b.y + 0);
+				p[4].x = p[2].x = b.x + 0;
+				p[5].y = 1 + (p[3].y = a.y + 0);
+				p[5].x = p[3].x = a.x + 0;
+			}
+			else
+			{
+				p = out.AddSeg(3, 2);
+				p[0].x = b.x - 1;
+				p[0].y = b.y + 0;
+				p[1].x = a.x - 1;
+				p[1].y = a.y + 0;
+				p[4].x = 1 + (p[2].x = b.x + 0);
+				p[4].y = p[2].y = b.y + 0;
+				p[5].x = 1 + (p[3].x = a.x + 0);
+				p[5].y = p[3].y = a.y + 0;
+			}
+		}
+	}
+	else
+	{
+		if(dx >= 0)
+		{
+			if(dx + dy >= 0)
+			{
+				p = out.AddSeg(3, 2);
+				p[0].y = b.y - 1;
+				p[0].x = b.x + 0;
+				p[1].y = a.y - 1;
+				p[1].x = a.x + 0;
+				p[4].y = 1 + (p[2].y = b.y + 0);
+				p[4].x = p[2].x = b.x + 0;
+				p[5].y = 1 + (p[3].y = a.y + 0);
+				p[5].x = p[3].x = a.x + 0;
+			}
+			else
+			{
+				p = out.AddSeg(3, 2);
+				p[0].x = b.x - 1;
+				p[0].y = b.y + 0;
+				p[1].x = a.x - 1;
+				p[1].y = a.y + 0;
+				p[4].x = 1 + (p[2].x = b.x + 0);
+				p[4].y = p[2].y = b.y + 0;
+				p[5].x = 1 + (p[3].x = a.x + 0);
+				p[5].y = p[3].y = a.y + 0;
+			}
+		}
+		else
+		{
+			if(dy >= dx)
+			{
+				p = out.AddSeg(3, 2);
+				p[0].y = b.y - 1;
+				p[0].x = b.x + 0;
+				p[1].y = a.y - 1;
+				p[1].x = a.x + 0;
+				p[4].y = 1 + (p[2].y = b.y + 0);
+				p[4].x = p[2].x = b.x + 0;
+				p[5].y = 1 + (p[3].y = a.y + 0);
+				p[5].x = p[3].x = a.x + 0;
+			}
+			else
+			{
+				p = out.AddSeg(3, 2);
+				p[0].x = b.x - 1;
+				p[0].y = b.y + 0;
+				p[1].x = a.x - 1;
+				p[1].y = a.y + 0;
+				p[4].x = 1 + (p[2].x = b.x + 0);
+				p[4].y = p[2].y = b.y + 0;
+				p[5].x = 1 + (p[3].x = a.x + 0);
+				p[5].y = p[3].y = a.y + 0;
+			}
+		}
+	}
+}
+
+//////////////////////////////////////////////////////////////////////
+
+static void PathDraw_Output_3_3(PathDraw::Output& out, Point a, Point b)
+{
+	//RTIMING("PathDraw_Output_3_3");
+	Point *p;
+	int dx = b.x - a.x, dy = b.y - a.y;
+	if(dy >= 0)
+	{
+		if(dx >= 0)
+		{
+			if(dx >= dy)
+			{
+				p = out.AddSeg(3, 2);
+				p[4].y = 1 + (p[2].y = 1 + (p[0].y = a.y + -1));
+				p[4].x = p[2].x = p[0].x = a.x + 0;
+				p[5].y = 1 + (p[3].y = 1 + (p[1].y = b.y + -1));
+				p[5].x = p[3].x = p[1].x = b.x + 0;
+			}
+			else
+			{
+				p = out.AddSeg(3, 2);
+				p[4].x = 1 + (p[2].x = 1 + (p[0].x = a.x + -1));
+				p[4].y = p[2].y = p[0].y = a.y + 0;
+				p[5].x = 1 + (p[3].x = 1 + (p[1].x = b.x + -1));
+				p[5].y = p[3].y = p[1].y = b.y + 0;
+			}
+		}
+		else
+		{
+			if(0 >= dx + dy)
+			{
+				p = out.AddSeg(3, 2);
+				p[4].y = 1 + (p[2].y = 1 + (p[0].y = a.y + -1));
+				p[4].x = p[2].x = p[0].x = a.x + 0;
+				p[5].y = 1 + (p[3].y = 1 + (p[1].y = b.y + -1));
+				p[5].x = p[3].x = p[1].x = b.x + 0;
+			}
+			else
+			{
+				p = out.AddSeg(3, 2);
+				p[4].x = 1 + (p[2].x = 1 + (p[0].x = a.x + -1));
+				p[4].y = p[2].y = p[0].y = a.y + 0;
+				p[5].x = 1 + (p[3].x = 1 + (p[1].x = b.x + -1));
+				p[5].y = p[3].y = p[1].y = b.y + 0;
+			}
+		}
+	}
+	else
+	{
+		if(dx >= 0)
+		{
+			if(dx + dy >= 0)
+			{
+				p = out.AddSeg(3, 2);
+				p[4].y = 1 + (p[2].y = 1 + (p[0].y = a.y + -1));
+				p[4].x = p[2].x = p[0].x = a.x + 0;
+				p[5].y = 1 + (p[3].y = 1 + (p[1].y = b.y + -1));
+				p[5].x = p[3].x = p[1].x = b.x + 0;
+			}
+			else
+			{
+				p = out.AddSeg(3, 2);
+				p[4].x = 1 + (p[2].x = 1 + (p[0].x = a.x + -1));
+				p[4].y = p[2].y = p[0].y = a.y + 0;
+				p[5].x = 1 + (p[3].x = 1 + (p[1].x = b.x + -1));
+				p[5].y = p[3].y = p[1].y = b.y + 0;
+			}
+		}
+		else
+		{
+			if(dy >= dx)
+			{
+				p = out.AddSeg(3, 2);
+				p[4].y = 1 + (p[2].y = 1 + (p[0].y = a.y + -1));
+				p[4].x = p[2].x = p[0].x = a.x + 0;
+				p[5].y = 1 + (p[3].y = 1 + (p[1].y = b.y + -1));
+				p[5].x = p[3].x = p[1].x = b.x + 0;
+			}
+			else
+			{
+				p = out.AddSeg(3, 2);
+				p[4].x = 1 + (p[2].x = 1 + (p[0].x = a.x + -1));
+				p[4].y = p[2].y = p[0].y = a.y + 0;
+				p[5].x = 1 + (p[3].x = 1 + (p[1].x = b.x + -1));
+				p[5].y = p[3].y = p[1].y = b.y + 0;
+			}
+		}
+	}
+}
+
+//////////////////////////////////////////////////////////////////////
+
+static void PathDraw_Output_3_4(PathDraw::Output& out, Point a, Point b)
+{
+	//RTIMING("PathDraw_Output_3_4");
+	Point *p;
+	int dx = b.x - a.x, dy = b.y - a.y;
+	if(dy >= 0)
+	{
+		if(dx >= 0)
+		{
+			if(dx >= dy)
+			{
+				p = out.AddSeg(4, 2);
+				p[0].y = a.y - 1;
+				p[0].x = a.x + 0;
+				p[1].y = b.y - 2;
+				p[1].x = b.x + 1;
+				p[6].y = 1 + (p[4].y = 1 + (p[2].y = a.y + 0));
+				p[6].x = p[4].x = p[2].x = a.x + 0;
+				p[7].y = 1 + (p[5].y = 1 + (p[3].y = b.y + -1));
+				p[7].x = p[5].x = p[3].x = b.x + 1;
+			}
+			else
+			{
+				p = out.AddSeg(4, 2);
+				p[0].x = a.x - 1;
+				p[0].y = a.y + 0;
+				p[1].x = b.x - 2;
+				p[1].y = b.y + 1;
+				p[6].x = 1 + (p[4].x = 1 + (p[2].x = a.x + 0));
+				p[6].y = p[4].y = p[2].y = a.y + 0;
+				p[7].x = 1 + (p[5].x = 1 + (p[3].x = b.x + -1));
+				p[7].y = p[5].y = p[3].y = b.y + 1;
+			}
+		}
+		else
+		{
+			if(0 >= dx + dy)
+			{
+				p = out.AddSeg(4, 2);
+				p[0].y = a.y - 1;
+				p[0].x = a.x + 0;
+				p[1].y = b.y - 2;
+				p[1].x = b.x + -1;
+				p[6].y = 1 + (p[4].y = 1 + (p[2].y = a.y + 0));
+				p[6].x = p[4].x = p[2].x = a.x + 0;
+				p[7].y = 1 + (p[5].y = 1 + (p[3].y = b.y + -1));
+				p[7].x = p[5].x = p[3].x = b.x + -1;
+			}
+			else
+			{
+				p = out.AddSeg(4, 2);
+				p[0].x = a.x - 1;
+				p[0].y = a.y + 0;
+				p[1].x = b.x - 2;
+				p[1].y = b.y + 1;
+				p[6].x = 1 + (p[4].x = 1 + (p[2].x = a.x + 0));
+				p[6].y = p[4].y = p[2].y = a.y + 0;
+				p[7].x = 1 + (p[5].x = 1 + (p[3].x = b.x + -1));
+				p[7].y = p[5].y = p[3].y = b.y + 1;
+			}
+		}
+	}
+	else
+	{
+		if(dx >= 0)
+		{
+			if(dx + dy >= 0)
+			{
+				p = out.AddSeg(4, 2);
+				p[0].y = a.y - 1;
+				p[0].x = a.x + 0;
+				p[1].y = b.y - 2;
+				p[1].x = b.x + 1;
+				p[6].y = 1 + (p[4].y = 1 + (p[2].y = a.y + 0));
+				p[6].x = p[4].x = p[2].x = a.x + 0;
+				p[7].y = 1 + (p[5].y = 1 + (p[3].y = b.y + -1));
+				p[7].x = p[5].x = p[3].x = b.x + 1;
+			}
+			else
+			{
+				p = out.AddSeg(4, 2);
+				p[0].x = a.x - 1;
+				p[0].y = a.y + 0;
+				p[1].x = b.x - 2;
+				p[1].y = b.y + -1;
+				p[6].x = 1 + (p[4].x = 1 + (p[2].x = a.x + 0));
+				p[6].y = p[4].y = p[2].y = a.y + 0;
+				p[7].x = 1 + (p[5].x = 1 + (p[3].x = b.x + -1));
+				p[7].y = p[5].y = p[3].y = b.y + -1;
+			}
+		}
+		else
+		{
+			if(dy >= dx)
+			{
+				p = out.AddSeg(4, 2);
+				p[0].y = a.y - 1;
+				p[0].x = a.x + 0;
+				p[1].y = b.y - 2;
+				p[1].x = b.x + -1;
+				p[6].y = 1 + (p[4].y = 1 + (p[2].y = a.y + 0));
+				p[6].x = p[4].x = p[2].x = a.x + 0;
+				p[7].y = 1 + (p[5].y = 1 + (p[3].y = b.y + -1));
+				p[7].x = p[5].x = p[3].x = b.x + -1;
+			}
+			else
+			{
+				p = out.AddSeg(4, 2);
+				p[0].x = a.x - 1;
+				p[0].y = a.y + 0;
+				p[1].x = b.x - 2;
+				p[1].y = b.y + -1;
+				p[6].x = 1 + (p[4].x = 1 + (p[2].x = a.x + 0));
+				p[6].y = p[4].y = p[2].y = a.y + 0;
+				p[7].x = 1 + (p[5].x = 1 + (p[3].x = b.x + -1));
+				p[7].y = p[5].y = p[3].y = b.y + -1;
+			}
+		}
+	}
+}
+
+//////////////////////////////////////////////////////////////////////
+
+static void PathDraw_Output_3_5(PathDraw::Output& out, Point a, Point b)
+{
+	//RTIMING("PathDraw_Output_3_5");
+	Point *p;
+	int dx = b.x - a.x, dy = b.y - a.y;
+	if(dy >= 0)
+	{
+		if(dx >= 0)
+		{
+			if(dx >= dy)
+			{
+				p = out.AddSeg(3);
+				p[2].y = 1 + (p[0].y = b.y - 2);
+				p[2].x = p[0].x = b.x + 1;
+				p[1].y = a.y - 1;
+				p[1].x = a.x + 0;
+				p = out.AddSeg(3, 2);
+				p[4].y = 1 + (p[2].y = 1 + (p[0].y = a.y + 0));
+				p[4].x = p[2].x = p[0].x = a.x + 0;
+				p[5].y = 1 + (p[3].y = 1 + (p[1].y = b.y + 0));
+				p[5].x = p[3].x = p[1].x = b.x + 1;
+			}
+			else
+			{
+				p = out.AddSeg(3);
+				p[2].x = 1 + (p[0].x = b.x - 2);
+				p[2].y = p[0].y = b.y + 1;
+				p[1].x = a.x - 1;
+				p[1].y = a.y + 0;
+				p = out.AddSeg(3, 2);
+				p[4].x = 1 + (p[2].x = 1 + (p[0].x = a.x + 0));
+				p[4].y = p[2].y = p[0].y = a.y + 0;
+				p[5].x = 1 + (p[3].x = 1 + (p[1].x = b.x + 0));
+				p[5].y = p[3].y = p[1].y = b.y + 1;
+			}
+		}
+		else
+		{
+			if(0 >= dx + dy)
+			{
+				p = out.AddSeg(3);
+				p[2].y = 1 + (p[0].y = b.y - 2);
+				p[2].x = p[0].x = b.x + -1;
+				p[1].y = a.y - 1;
+				p[1].x = a.x + 0;
+				p = out.AddSeg(3, 2);
+				p[4].y = 1 + (p[2].y = 1 + (p[0].y = a.y + 0));
+				p[4].x = p[2].x = p[0].x = a.x + 0;
+				p[5].y = 1 + (p[3].y = 1 + (p[1].y = b.y + 0));
+				p[5].x = p[3].x = p[1].x = b.x + -1;
+			}
+			else
+			{
+				p = out.AddSeg(3);
+				p[2].x = 1 + (p[0].x = b.x - 2);
+				p[2].y = p[0].y = b.y + 1;
+				p[1].x = a.x - 1;
+				p[1].y = a.y + 0;
+				p = out.AddSeg(3, 2);
+				p[4].x = 1 + (p[2].x = 1 + (p[0].x = a.x + 0));
+				p[4].y = p[2].y = p[0].y = a.y + 0;
+				p[5].x = 1 + (p[3].x = 1 + (p[1].x = b.x + 0));
+				p[5].y = p[3].y = p[1].y = b.y + 1;
+			}
+		}
+	}
+	else
+	{
+		if(dx >= 0)
+		{
+			if(dx + dy >= 0)
+			{
+				p = out.AddSeg(3);
+				p[2].y = 1 + (p[0].y = b.y - 2);
+				p[2].x = p[0].x = b.x + 1;
+				p[1].y = a.y - 1;
+				p[1].x = a.x + 0;
+				p = out.AddSeg(3, 2);
+				p[4].y = 1 + (p[2].y = 1 + (p[0].y = a.y + 0));
+				p[4].x = p[2].x = p[0].x = a.x + 0;
+				p[5].y = 1 + (p[3].y = 1 + (p[1].y = b.y + 0));
+				p[5].x = p[3].x = p[1].x = b.x + 1;
+			}
+			else
+			{
+				p = out.AddSeg(3);
+				p[2].x = 1 + (p[0].x = b.x - 2);
+				p[2].y = p[0].y = b.y + -1;
+				p[1].x = a.x - 1;
+				p[1].y = a.y + 0;
+				p = out.AddSeg(3, 2);
+				p[4].x = 1 + (p[2].x = 1 + (p[0].x = a.x + 0));
+				p[4].y = p[2].y = p[0].y = a.y + 0;
+				p[5].x = 1 + (p[3].x = 1 + (p[1].x = b.x + 0));
+				p[5].y = p[3].y = p[1].y = b.y + -1;
+			}
+		}
+		else
+		{
+			if(dy >= dx)
+			{
+				p = out.AddSeg(3);
+				p[2].y = 1 + (p[0].y = b.y - 2);
+				p[2].x = p[0].x = b.x + -1;
+				p[1].y = a.y - 1;
+				p[1].x = a.x + 0;
+				p = out.AddSeg(3, 2);
+				p[4].y = 1 + (p[2].y = 1 + (p[0].y = a.y + 0));
+				p[4].x = p[2].x = p[0].x = a.x + 0;
+				p[5].y = 1 + (p[3].y = 1 + (p[1].y = b.y + 0));
+				p[5].x = p[3].x = p[1].x = b.x + -1;
+			}
+			else
+			{
+				p = out.AddSeg(3);
+				p[2].x = 1 + (p[0].x = b.x - 2);
+				p[2].y = p[0].y = b.y + -1;
+				p[1].x = a.x - 1;
+				p[1].y = a.y + 0;
+				p = out.AddSeg(3, 2);
+				p[4].x = 1 + (p[2].x = 1 + (p[0].x = a.x + 0));
+				p[4].y = p[2].y = p[0].y = a.y + 0;
+				p[5].x = 1 + (p[3].x = 1 + (p[1].x = b.x + 0));
+				p[5].y = p[3].y = p[1].y = b.y + -1;
+			}
+		}
+	}
+}
+
+//////////////////////////////////////////////////////////////////////
+
+static void PathDraw_Output_4_1(PathDraw::Output& out, Point a, Point b)
+{
+	//RTIMING("PathDraw_Output_4_1");
+	Point *p;
+	int dx = b.x - a.x, dy = b.y - a.y;
+	if(dy >= 0)
+	{
+		if(dx >= 0)
+		{
+			if(dx >= dy)
+			{
+				p = out.AddSeg(3);
+				p[2].y = 1 + (p[0].y = a.y - 2);
+				p[2].x = p[0].x = a.x + -1;
+				p[1].y = b.y - 0;
+				p[1].x = b.x + 0;
+				p = out.AddSeg(2, 2);
+				p[0].y = b.y - 0;
+				p[0].x = b.x + 0;
+				p[1].y = a.y - 0;
+				p[1].x = a.x + -1;
+				p[2].y = b.y + 1;
+				p[2].x = b.x + 0;
+				p[3].y = a.y + 1;
+				p[3].x = a.x + -1;
+			}
+			else
+			{
+				p = out.AddSeg(3);
+				p[2].x = 1 + (p[0].x = a.x - 2);
+				p[2].y = p[0].y = a.y + -1;
+				p[1].x = b.x - 0;
+				p[1].y = b.y + 0;
+				p = out.AddSeg(2, 2);
+				p[0].x = b.x - 0;
+				p[0].y = b.y + 0;
+				p[1].x = a.x - 0;
+				p[1].y = a.y + -1;
+				p[2].x = b.x + 1;
+				p[2].y = b.y + 0;
+				p[3].x = a.x + 1;
+				p[3].y = a.y + -1;
+			}
+		}
+		else
+		{
+			if(0 >= dx + dy)
+			{
+				p = out.AddSeg(3);
+				p[2].y = 1 + (p[0].y = a.y - 2);
+				p[2].x = p[0].x = a.x + 1;
+				p[1].y = b.y - 0;
+				p[1].x = b.x + 0;
+				p = out.AddSeg(2, 2);
+				p[0].y = b.y - 0;
+				p[0].x = b.x + 0;
+				p[1].y = a.y - 0;
+				p[1].x = a.x + 1;
+				p[2].y = b.y + 1;
+				p[2].x = b.x + 0;
+				p[3].y = a.y + 1;
+				p[3].x = a.x + 1;
+			}
+			else
+			{
+				p = out.AddSeg(3);
+				p[2].x = 1 + (p[0].x = a.x - 2);
+				p[2].y = p[0].y = a.y + -1;
+				p[1].x = b.x - 0;
+				p[1].y = b.y + 0;
+				p = out.AddSeg(2, 2);
+				p[0].x = b.x - 0;
+				p[0].y = b.y + 0;
+				p[1].x = a.x - 0;
+				p[1].y = a.y + -1;
+				p[2].x = b.x + 1;
+				p[2].y = b.y + 0;
+				p[3].x = a.x + 1;
+				p[3].y = a.y + -1;
+			}
+		}
+	}
+	else
+	{
+		if(dx >= 0)
+		{
+			if(dx + dy >= 0)
+			{
+				p = out.AddSeg(3);
+				p[2].y = 1 + (p[0].y = a.y - 2);
+				p[2].x = p[0].x = a.x + -1;
+				p[1].y = b.y - 0;
+				p[1].x = b.x + 0;
+				p = out.AddSeg(2, 2);
+				p[0].y = b.y - 0;
+				p[0].x = b.x + 0;
+				p[1].y = a.y - 0;
+				p[1].x = a.x + -1;
+				p[2].y = b.y + 1;
+				p[2].x = b.x + 0;
+				p[3].y = a.y + 1;
+				p[3].x = a.x + -1;
+			}
+			else
+			{
+				p = out.AddSeg(3);
+				p[2].x = 1 + (p[0].x = a.x - 2);
+				p[2].y = p[0].y = a.y + 1;
+				p[1].x = b.x - 0;
+				p[1].y = b.y + 0;
+				p = out.AddSeg(2, 2);
+				p[0].x = b.x - 0;
+				p[0].y = b.y + 0;
+				p[1].x = a.x - 0;
+				p[1].y = a.y + 1;
+				p[2].x = b.x + 1;
+				p[2].y = b.y + 0;
+				p[3].x = a.x + 1;
+				p[3].y = a.y + 1;
+			}
+		}
+		else
+		{
+			if(dy >= dx)
+			{
+				p = out.AddSeg(3);
+				p[2].y = 1 + (p[0].y = a.y - 2);
+				p[2].x = p[0].x = a.x + 1;
+				p[1].y = b.y - 0;
+				p[1].x = b.x + 0;
+				p = out.AddSeg(2, 2);
+				p[0].y = b.y - 0;
+				p[0].x = b.x + 0;
+				p[1].y = a.y - 0;
+				p[1].x = a.x + 1;
+				p[2].y = b.y + 1;
+				p[2].x = b.x + 0;
+				p[3].y = a.y + 1;
+				p[3].x = a.x + 1;
+			}
+			else
+			{
+				p = out.AddSeg(3);
+				p[2].x = 1 + (p[0].x = a.x - 2);
+				p[2].y = p[0].y = a.y + 1;
+				p[1].x = b.x - 0;
+				p[1].y = b.y + 0;
+				p = out.AddSeg(2, 2);
+				p[0].x = b.x - 0;
+				p[0].y = b.y + 0;
+				p[1].x = a.x - 0;
+				p[1].y = a.y + 1;
+				p[2].x = b.x + 1;
+				p[2].y = b.y + 0;
+				p[3].x = a.x + 1;
+				p[3].y = a.y + 1;
+			}
+		}
+	}
+}
+
+//////////////////////////////////////////////////////////////////////
+
+static void PathDraw_Output_4_2(PathDraw::Output& out, Point a, Point b)
+{
+	//RTIMING("PathDraw_Output_4_2");
+	Point *p;
+	int dx = b.x - a.x, dy = b.y - a.y;
+	if(dy >= 0)
+	{
+		if(dx >= 0)
+		{
+			if(dx >= dy)
+			{
+				p = out.AddSeg(3);
+				p[2].y = 1 + (p[0].y = a.y - 2);
+				p[2].x = p[0].x = a.x + -1;
+				p[1].y = b.y - 1;
+				p[1].x = b.x + 0;
+				p = out.AddSeg(2, 2);
+				p[2].y = 1 + (p[0].y = b.y + 0);
+				p[2].x = p[0].x = b.x + 0;
+				p[3].y = 1 + (p[1].y = a.y + 0);
+				p[3].x = p[1].x = a.x + -1;
+			}
+			else
+			{
+				p = out.AddSeg(3);
+				p[2].x = 1 + (p[0].x = a.x - 2);
+				p[2].y = p[0].y = a.y + -1;
+				p[1].x = b.x - 1;
+				p[1].y = b.y + 0;
+				p = out.AddSeg(2, 2);
+				p[2].x = 1 + (p[0].x = b.x + 0);
+				p[2].y = p[0].y = b.y + 0;
+				p[3].x = 1 + (p[1].x = a.x + 0);
+				p[3].y = p[1].y = a.y + -1;
+			}
+		}
+		else
+		{
+			if(0 >= dx + dy)
+			{
+				p = out.AddSeg(3);
+				p[2].y = 1 + (p[0].y = a.y - 2);
+				p[2].x = p[0].x = a.x + 1;
+				p[1].y = b.y - 1;
+				p[1].x = b.x + 0;
+				p = out.AddSeg(2, 2);
+				p[2].y = 1 + (p[0].y = b.y + 0);
+				p[2].x = p[0].x = b.x + 0;
+				p[3].y = 1 + (p[1].y = a.y + 0);
+				p[3].x = p[1].x = a.x + 1;
+			}
+			else
+			{
+				p = out.AddSeg(3);
+				p[2].x = 1 + (p[0].x = a.x - 2);
+				p[2].y = p[0].y = a.y + -1;
+				p[1].x = b.x - 1;
+				p[1].y = b.y + 0;
+				p = out.AddSeg(2, 2);
+				p[2].x = 1 + (p[0].x = b.x + 0);
+				p[2].y = p[0].y = b.y + 0;
+				p[3].x = 1 + (p[1].x = a.x + 0);
+				p[3].y = p[1].y = a.y + -1;
+			}
+		}
+	}
+	else
+	{
+		if(dx >= 0)
+		{
+			if(dx + dy >= 0)
+			{
+				p = out.AddSeg(3);
+				p[2].y = 1 + (p[0].y = a.y - 2);
+				p[2].x = p[0].x = a.x + -1;
+				p[1].y = b.y - 1;
+				p[1].x = b.x + 0;
+				p = out.AddSeg(2, 2);
+				p[2].y = 1 + (p[0].y = b.y + 0);
+				p[2].x = p[0].x = b.x + 0;
+				p[3].y = 1 + (p[1].y = a.y + 0);
+				p[3].x = p[1].x = a.x + -1;
+			}
+			else
+			{
+				p = out.AddSeg(3);
+				p[2].x = 1 + (p[0].x = a.x - 2);
+				p[2].y = p[0].y = a.y + 1;
+				p[1].x = b.x - 1;
+				p[1].y = b.y + 0;
+				p = out.AddSeg(2, 2);
+				p[2].x = 1 + (p[0].x = b.x + 0);
+				p[2].y = p[0].y = b.y + 0;
+				p[3].x = 1 + (p[1].x = a.x + 0);
+				p[3].y = p[1].y = a.y + 1;
+			}
+		}
+		else
+		{
+			if(dy >= dx)
+			{
+				p = out.AddSeg(3);
+				p[2].y = 1 + (p[0].y = a.y - 2);
+				p[2].x = p[0].x = a.x + 1;
+				p[1].y = b.y - 1;
+				p[1].x = b.x + 0;
+				p = out.AddSeg(2, 2);
+				p[2].y = 1 + (p[0].y = b.y + 0);
+				p[2].x = p[0].x = b.x + 0;
+				p[3].y = 1 + (p[1].y = a.y + 0);
+				p[3].x = p[1].x = a.x + 1;
+			}
+			else
+			{
+				p = out.AddSeg(3);
+				p[2].x = 1 + (p[0].x = a.x - 2);
+				p[2].y = p[0].y = a.y + 1;
+				p[1].x = b.x - 1;
+				p[1].y = b.y + 0;
+				p = out.AddSeg(2, 2);
+				p[2].x = 1 + (p[0].x = b.x + 0);
+				p[2].y = p[0].y = b.y + 0;
+				p[3].x = 1 + (p[1].x = a.x + 0);
+				p[3].y = p[1].y = a.y + 1;
+			}
+		}
+	}
+}
+
+//////////////////////////////////////////////////////////////////////
+
+static void PathDraw_Output_4_3(PathDraw::Output& out, Point a, Point b)
+{
+	//RTIMING("PathDraw_Output_4_3");
+	Point *p;
+	int dx = b.x - a.x, dy = b.y - a.y;
+	if(dy >= 0)
+	{
+		if(dx >= 0)
+		{
+			if(dx >= dy)
+			{
+				p = out.AddSeg(4, 2);
+				p[0].y = b.y - 1;
+				p[0].x = b.x + 0;
+				p[1].y = a.y - 2;
+				p[1].x = a.x + -1;
+				p[6].y = 1 + (p[4].y = 1 + (p[2].y = b.y + 0));
+				p[6].x = p[4].x = p[2].x = b.x + 0;
+				p[7].y = 1 + (p[5].y = 1 + (p[3].y = a.y + -1));
+				p[7].x = p[5].x = p[3].x = a.x + -1;
+			}
+			else
+			{
+				p = out.AddSeg(4, 2);
+				p[0].x = b.x - 1;
+				p[0].y = b.y + 0;
+				p[1].x = a.x - 2;
+				p[1].y = a.y + -1;
+				p[6].x = 1 + (p[4].x = 1 + (p[2].x = b.x + 0));
+				p[6].y = p[4].y = p[2].y = b.y + 0;
+				p[7].x = 1 + (p[5].x = 1 + (p[3].x = a.x + -1));
+				p[7].y = p[5].y = p[3].y = a.y + -1;
+			}
+		}
+		else
+		{
+			if(0 >= dx + dy)
+			{
+				p = out.AddSeg(4, 2);
+				p[0].y = b.y - 1;
+				p[0].x = b.x + 0;
+				p[1].y = a.y - 2;
+				p[1].x = a.x + 1;
+				p[6].y = 1 + (p[4].y = 1 + (p[2].y = b.y + 0));
+				p[6].x = p[4].x = p[2].x = b.x + 0;
+				p[7].y = 1 + (p[5].y = 1 + (p[3].y = a.y + -1));
+				p[7].x = p[5].x = p[3].x = a.x + 1;
+			}
+			else
+			{
+				p = out.AddSeg(4, 2);
+				p[0].x = b.x - 1;
+				p[0].y = b.y + 0;
+				p[1].x = a.x - 2;
+				p[1].y = a.y + -1;
+				p[6].x = 1 + (p[4].x = 1 + (p[2].x = b.x + 0));
+				p[6].y = p[4].y = p[2].y = b.y + 0;
+				p[7].x = 1 + (p[5].x = 1 + (p[3].x = a.x + -1));
+				p[7].y = p[5].y = p[3].y = a.y + -1;
+			}
+		}
+	}
+	else
+	{
+		if(dx >= 0)
+		{
+			if(dx + dy >= 0)
+			{
+				p = out.AddSeg(4, 2);
+				p[0].y = b.y - 1;
+				p[0].x = b.x + 0;
+				p[1].y = a.y - 2;
+				p[1].x = a.x + -1;
+				p[6].y = 1 + (p[4].y = 1 + (p[2].y = b.y + 0));
+				p[6].x = p[4].x = p[2].x = b.x + 0;
+				p[7].y = 1 + (p[5].y = 1 + (p[3].y = a.y + -1));
+				p[7].x = p[5].x = p[3].x = a.x + -1;
+			}
+			else
+			{
+				p = out.AddSeg(4, 2);
+				p[0].x = b.x - 1;
+				p[0].y = b.y + 0;
+				p[1].x = a.x - 2;
+				p[1].y = a.y + 1;
+				p[6].x = 1 + (p[4].x = 1 + (p[2].x = b.x + 0));
+				p[6].y = p[4].y = p[2].y = b.y + 0;
+				p[7].x = 1 + (p[5].x = 1 + (p[3].x = a.x + -1));
+				p[7].y = p[5].y = p[3].y = a.y + 1;
+			}
+		}
+		else
+		{
+			if(dy >= dx)
+			{
+				p = out.AddSeg(4, 2);
+				p[0].y = b.y - 1;
+				p[0].x = b.x + 0;
+				p[1].y = a.y - 2;
+				p[1].x = a.x + 1;
+				p[6].y = 1 + (p[4].y = 1 + (p[2].y = b.y + 0));
+				p[6].x = p[4].x = p[2].x = b.x + 0;
+				p[7].y = 1 + (p[5].y = 1 + (p[3].y = a.y + -1));
+				p[7].x = p[5].x = p[3].x = a.x + 1;
+			}
+			else
+			{
+				p = out.AddSeg(4, 2);
+				p[0].x = b.x - 1;
+				p[0].y = b.y + 0;
+				p[1].x = a.x - 2;
+				p[1].y = a.y + 1;
+				p[6].x = 1 + (p[4].x = 1 + (p[2].x = b.x + 0));
+				p[6].y = p[4].y = p[2].y = b.y + 0;
+				p[7].x = 1 + (p[5].x = 1 + (p[3].x = a.x + -1));
+				p[7].y = p[5].y = p[3].y = a.y + 1;
+			}
+		}
+	}
+}
+
+//////////////////////////////////////////////////////////////////////
+
+static void PathDraw_Output_4_4(PathDraw::Output& out, Point a, Point b)
+{
+	//RTIMING("PathDraw_Output_4_4");
+	Point *p;
+	int dx = b.x - a.x, dy = b.y - a.y;
+	if(dy >= 0)
+	{
+		if(dx >= 0)
+		{
+			if(dx >= dy)
+			{
+				p = out.AddSeg(4, 2);
+				p[6].y = 1 + (p[4].y = 1 + (p[2].y = 1 + (p[0].y = a.y + -2)));
+				p[6].x = p[4].x = p[2].x = p[0].x = a.x + -1;
+				p[7].y = 1 + (p[5].y = 1 + (p[3].y = 1 + (p[1].y = b.y + -2)));
+				p[7].x = p[5].x = p[3].x = p[1].x = b.x + 1;
+			}
+			else
+			{
+				p = out.AddSeg(4, 2);
+				p[6].x = 1 + (p[4].x = 1 + (p[2].x = 1 + (p[0].x = a.x + -2)));
+				p[6].y = p[4].y = p[2].y = p[0].y = a.y + -1;
+				p[7].x = 1 + (p[5].x = 1 + (p[3].x = 1 + (p[1].x = b.x + -2)));
+				p[7].y = p[5].y = p[3].y = p[1].y = b.y + 1;
+			}
+		}
+		else
+		{
+			if(0 >= dx + dy)
+			{
+				p = out.AddSeg(4, 2);
+				p[6].y = 1 + (p[4].y = 1 + (p[2].y = 1 + (p[0].y = a.y + -2)));
+				p[6].x = p[4].x = p[2].x = p[0].x = a.x + 1;
+				p[7].y = 1 + (p[5].y = 1 + (p[3].y = 1 + (p[1].y = b.y + -2)));
+				p[7].x = p[5].x = p[3].x = p[1].x = b.x + -1;
+			}
+			else
+			{
+				p = out.AddSeg(4, 2);
+				p[6].x = 1 + (p[4].x = 1 + (p[2].x = 1 + (p[0].x = a.x + -2)));
+				p[6].y = p[4].y = p[2].y = p[0].y = a.y + -1;
+				p[7].x = 1 + (p[5].x = 1 + (p[3].x = 1 + (p[1].x = b.x + -2)));
+				p[7].y = p[5].y = p[3].y = p[1].y = b.y + 1;
+			}
+		}
+	}
+	else
+	{
+		if(dx >= 0)
+		{
+			if(dx + dy >= 0)
+			{
+				p = out.AddSeg(4, 2);
+				p[6].y = 1 + (p[4].y = 1 + (p[2].y = 1 + (p[0].y = a.y + -2)));
+				p[6].x = p[4].x = p[2].x = p[0].x = a.x + -1;
+				p[7].y = 1 + (p[5].y = 1 + (p[3].y = 1 + (p[1].y = b.y + -2)));
+				p[7].x = p[5].x = p[3].x = p[1].x = b.x + 1;
+			}
+			else
+			{
+				p = out.AddSeg(4, 2);
+				p[6].x = 1 + (p[4].x = 1 + (p[2].x = 1 + (p[0].x = a.x + -2)));
+				p[6].y = p[4].y = p[2].y = p[0].y = a.y + 1;
+				p[7].x = 1 + (p[5].x = 1 + (p[3].x = 1 + (p[1].x = b.x + -2)));
+				p[7].y = p[5].y = p[3].y = p[1].y = b.y + -1;
+			}
+		}
+		else
+		{
+			if(dy >= dx)
+			{
+				p = out.AddSeg(4, 2);
+				p[6].y = 1 + (p[4].y = 1 + (p[2].y = 1 + (p[0].y = a.y + -2)));
+				p[6].x = p[4].x = p[2].x = p[0].x = a.x + 1;
+				p[7].y = 1 + (p[5].y = 1 + (p[3].y = 1 + (p[1].y = b.y + -2)));
+				p[7].x = p[5].x = p[3].x = p[1].x = b.x + -1;
+			}
+			else
+			{
+				p = out.AddSeg(4, 2);
+				p[6].x = 1 + (p[4].x = 1 + (p[2].x = 1 + (p[0].x = a.x + -2)));
+				p[6].y = p[4].y = p[2].y = p[0].y = a.y + 1;
+				p[7].x = 1 + (p[5].x = 1 + (p[3].x = 1 + (p[1].x = b.x + -2)));
+				p[7].y = p[5].y = p[3].y = p[1].y = b.y + -1;
+			}
+		}
+	}
+}
+
+//////////////////////////////////////////////////////////////////////
+
+static void PathDraw_Output_4_5(PathDraw::Output& out, Point a, Point b)
+{
+	//RTIMING("PathDraw_Output_4_5");
+	Point *p;
+	int dx = b.x - a.x, dy = b.y - a.y;
+	if(dy >= 0)
+	{
+		if(dx >= 0)
+		{
+			if(dx >= dy)
+			{
+				p = out.AddSeg(5, 2);
+				p[0].y = a.y - 2;
+				p[0].x = a.x + -1;
+				p[1].y = b.y - 2;
+				p[1].x = b.x + 1;
+				p[8].y = 1 + (p[6].y = 1 + (p[4].y = 1 + (p[2].y = a.y + -1)));
+				p[8].x = p[6].x = p[4].x = p[2].x = a.x + -1;
+				p[9].y = 1 + (p[7].y = 1 + (p[5].y = 1 + (p[3].y = b.y + -1)));
+				p[9].x = p[7].x = p[5].x = p[3].x = b.x + 1;
+			}
+			else
+			{
+				p = out.AddSeg(5, 2);
+				p[0].x = a.x - 2;
+				p[0].y = a.y + -1;
+				p[1].x = b.x - 2;
+				p[1].y = b.y + 1;
+				p[8].x = 1 + (p[6].x = 1 + (p[4].x = 1 + (p[2].x = a.x + -1)));
+				p[8].y = p[6].y = p[4].y = p[2].y = a.y + -1;
+				p[9].x = 1 + (p[7].x = 1 + (p[5].x = 1 + (p[3].x = b.x + -1)));
+				p[9].y = p[7].y = p[5].y = p[3].y = b.y + 1;
+			}
+		}
+		else
+		{
+			if(0 >= dx + dy)
+			{
+				p = out.AddSeg(5, 2);
+				p[0].y = a.y - 2;
+				p[0].x = a.x + 1;
+				p[1].y = b.y - 2;
+				p[1].x = b.x + -1;
+				p[8].y = 1 + (p[6].y = 1 + (p[4].y = 1 + (p[2].y = a.y + -1)));
+				p[8].x = p[6].x = p[4].x = p[2].x = a.x + 1;
+				p[9].y = 1 + (p[7].y = 1 + (p[5].y = 1 + (p[3].y = b.y + -1)));
+				p[9].x = p[7].x = p[5].x = p[3].x = b.x + -1;
+			}
+			else
+			{
+				p = out.AddSeg(5, 2);
+				p[0].x = a.x - 2;
+				p[0].y = a.y + -1;
+				p[1].x = b.x - 2;
+				p[1].y = b.y + 1;
+				p[8].x = 1 + (p[6].x = 1 + (p[4].x = 1 + (p[2].x = a.x + -1)));
+				p[8].y = p[6].y = p[4].y = p[2].y = a.y + -1;
+				p[9].x = 1 + (p[7].x = 1 + (p[5].x = 1 + (p[3].x = b.x + -1)));
+				p[9].y = p[7].y = p[5].y = p[3].y = b.y + 1;
+			}
+		}
+	}
+	else
+	{
+		if(dx >= 0)
+		{
+			if(dx + dy >= 0)
+			{
+				p = out.AddSeg(5, 2);
+				p[0].y = a.y - 2;
+				p[0].x = a.x + -1;
+				p[1].y = b.y - 2;
+				p[1].x = b.x + 1;
+				p[8].y = 1 + (p[6].y = 1 + (p[4].y = 1 + (p[2].y = a.y + -1)));
+				p[8].x = p[6].x = p[4].x = p[2].x = a.x + -1;
+				p[9].y = 1 + (p[7].y = 1 + (p[5].y = 1 + (p[3].y = b.y + -1)));
+				p[9].x = p[7].x = p[5].x = p[3].x = b.x + 1;
+			}
+			else
+			{
+				p = out.AddSeg(5, 2);
+				p[0].x = a.x - 2;
+				p[0].y = a.y + 1;
+				p[1].x = b.x - 2;
+				p[1].y = b.y + -1;
+				p[8].x = 1 + (p[6].x = 1 + (p[4].x = 1 + (p[2].x = a.x + -1)));
+				p[8].y = p[6].y = p[4].y = p[2].y = a.y + 1;
+				p[9].x = 1 + (p[7].x = 1 + (p[5].x = 1 + (p[3].x = b.x + -1)));
+				p[9].y = p[7].y = p[5].y = p[3].y = b.y + -1;
+			}
+		}
+		else
+		{
+			if(dy >= dx)
+			{
+				p = out.AddSeg(5, 2);
+				p[0].y = a.y - 2;
+				p[0].x = a.x + 1;
+				p[1].y = b.y - 2;
+				p[1].x = b.x + -1;
+				p[8].y = 1 + (p[6].y = 1 + (p[4].y = 1 + (p[2].y = a.y + -1)));
+				p[8].x = p[6].x = p[4].x = p[2].x = a.x + 1;
+				p[9].y = 1 + (p[7].y = 1 + (p[5].y = 1 + (p[3].y = b.y + -1)));
+				p[9].x = p[7].x = p[5].x = p[3].x = b.x + -1;
+			}
+			else
+			{
+				p = out.AddSeg(5, 2);
+				p[0].x = a.x - 2;
+				p[0].y = a.y + 1;
+				p[1].x = b.x - 2;
+				p[1].y = b.y + -1;
+				p[8].x = 1 + (p[6].x = 1 + (p[4].x = 1 + (p[2].x = a.x + -1)));
+				p[8].y = p[6].y = p[4].y = p[2].y = a.y + 1;
+				p[9].x = 1 + (p[7].x = 1 + (p[5].x = 1 + (p[3].x = b.x + -1)));
+				p[9].y = p[7].y = p[5].y = p[3].y = b.y + -1;
+			}
+		}
+	}
+}
+
+//////////////////////////////////////////////////////////////////////
+
+static void PathDraw_Output_5_1(PathDraw::Output& out, Point a, Point b)
+{
+	//RTIMING("PathDraw_Output_5_1");
+	Point *p;
+	int dx = b.x - a.x, dy = b.y - a.y;
+	if(dy >= 0)
+	{
+		if(dx >= 0)
+		{
+			if(dx >= dy)
+			{
+				p = out.AddSeg(2, 3);
+				p[5].y = 1 + (p[3].y = 1 + (p[2].y = 1 + (p[0].y = a.y - 2)));
+				p[3].x = p[5].x = p[2].x = p[0].x = a.x + -1;
+				p[4].y = p[1].y = b.y - 0;
+				p[4].x = p[1].x = b.x + 0;
+				p = out.AddSeg(2);
+				p[0].y = b.y + 1;
+				p[0].x = b.x + 0;
+				p[1].y = a.y + 2;
+				p[1].x = a.x + -1;
+			}
+			else
+			{
+				p = out.AddSeg(2, 3);
+				p[5].x = 1 + (p[3].x = 1 + (p[2].x = 1 + (p[0].x = a.x - 2)));
+				p[3].y = p[5].y = p[2].y = p[0].y = a.y + -1;
+				p[4].x = p[1].x = b.x - 0;
+				p[4].y = p[1].y = b.y + 0;
+				p = out.AddSeg(2);
+				p[0].x = b.x + 1;
+				p[0].y = b.y + 0;
+				p[1].x = a.x + 2;
+				p[1].y = a.y + -1;
+			}
+		}
+		else
+		{
+			if(0 >= dx + dy)
+			{
+				p = out.AddSeg(2, 3);
+				p[5].y = 1 + (p[3].y = 1 + (p[2].y = 1 + (p[0].y = a.y - 2)));
+				p[3].x = p[5].x = p[2].x = p[0].x = a.x + 1;
+				p[4].y = p[1].y = b.y - 0;
+				p[4].x = p[1].x = b.x + 0;
+				p = out.AddSeg(2);
+				p[0].y = b.y + 1;
+				p[0].x = b.x + 0;
+				p[1].y = a.y + 2;
+				p[1].x = a.x + 1;
+			}
+			else
+			{
+				p = out.AddSeg(2, 3);
+				p[5].x = 1 + (p[3].x = 1 + (p[2].x = 1 + (p[0].x = a.x - 2)));
+				p[3].y = p[5].y = p[2].y = p[0].y = a.y + -1;
+				p[4].x = p[1].x = b.x - 0;
+				p[4].y = p[1].y = b.y + 0;
+				p = out.AddSeg(2);
+				p[0].x = b.x + 1;
+				p[0].y = b.y + 0;
+				p[1].x = a.x + 2;
+				p[1].y = a.y + -1;
+			}
+		}
+	}
+	else
+	{
+		if(dx >= 0)
+		{
+			if(dx + dy >= 0)
+			{
+				p = out.AddSeg(2, 3);
+				p[5].y = 1 + (p[3].y = 1 + (p[2].y = 1 + (p[0].y = a.y - 2)));
+				p[3].x = p[5].x = p[2].x = p[0].x = a.x + -1;
+				p[4].y = p[1].y = b.y - 0;
+				p[4].x = p[1].x = b.x + 0;
+				p = out.AddSeg(2);
+				p[0].y = b.y + 1;
+				p[0].x = b.x + 0;
+				p[1].y = a.y + 2;
+				p[1].x = a.x + -1;
+			}
+			else
+			{
+				p = out.AddSeg(2, 3);
+				p[5].x = 1 + (p[3].x = 1 + (p[2].x = 1 + (p[0].x = a.x - 2)));
+				p[3].y = p[5].y = p[2].y = p[0].y = a.y + 1;
+				p[4].x = p[1].x = b.x - 0;
+				p[4].y = p[1].y = b.y + 0;
+				p = out.AddSeg(2);
+				p[0].x = b.x + 1;
+				p[0].y = b.y + 0;
+				p[1].x = a.x + 2;
+				p[1].y = a.y + 1;
+			}
+		}
+		else
+		{
+			if(dy >= dx)
+			{
+				p = out.AddSeg(2, 3);
+				p[5].y = 1 + (p[3].y = 1 + (p[2].y = 1 + (p[0].y = a.y - 2)));
+				p[3].x = p[5].x = p[2].x = p[0].x = a.x + 1;
+				p[4].y = p[1].y = b.y - 0;
+				p[4].x = p[1].x = b.x + 0;
+				p = out.AddSeg(2);
+				p[0].y = b.y + 1;
+				p[0].x = b.x + 0;
+				p[1].y = a.y + 2;
+				p[1].x = a.x + 1;
+			}
+			else
+			{
+				p = out.AddSeg(2, 3);
+				p[5].x = 1 + (p[3].x = 1 + (p[2].x = 1 + (p[0].x = a.x - 2)));
+				p[3].y = p[5].y = p[2].y = p[0].y = a.y + 1;
+				p[4].x = p[1].x = b.x - 0;
+				p[4].y = p[1].y = b.y + 0;
+				p = out.AddSeg(2);
+				p[0].x = b.x + 1;
+				p[0].y = b.y + 0;
+				p[1].x = a.x + 2;
+				p[1].y = a.y + 1;
+			}
+		}
+	}
+}
+
+//////////////////////////////////////////////////////////////////////
+
+static void PathDraw_Output_5_2(PathDraw::Output& out, Point a, Point b)
+{
+	//RTIMING("PathDraw_Output_5_2");
+	Point *p;
+	int dx = b.x - a.x, dy = b.y - a.y;
+	if(dy >= 0)
+	{
+		if(dx >= 0)
+		{
+			if(dx >= dy)
+			{
+				p = out.AddSeg(3);
+				p[2].y = 1 + (p[0].y = a.y - 2);
+				p[2].x = p[0].x = a.x + -1;
+				p[1].y = b.y - 1;
+				p[1].x = b.x + 0;
+				p = out.AddSeg(3, 2);
+				p[0].y = b.y - 1;
+				p[0].x = b.x + 0;
+				p[1].y = a.y - 0;
+				p[1].x = a.x + -1;
+				p[4].y = 1 + (p[2].y = b.y + 0);
+				p[4].x = p[2].x = b.x + 0;
+				p[5].y = 1 + (p[3].y = a.y + 1);
+				p[5].x = p[3].x = a.x + -1;
+			}
+			else
+			{
+				p = out.AddSeg(3);
+				p[2].x = 1 + (p[0].x = a.x - 2);
+				p[2].y = p[0].y = a.y + -1;
+				p[1].x = b.x - 1;
+				p[1].y = b.y + 0;
+				p = out.AddSeg(3, 2);
+				p[0].x = b.x - 1;
+				p[0].y = b.y + 0;
+				p[1].x = a.x - 0;
+				p[1].y = a.y + -1;
+				p[4].x = 1 + (p[2].x = b.x + 0);
+				p[4].y = p[2].y = b.y + 0;
+				p[5].x = 1 + (p[3].x = a.x + 1);
+				p[5].y = p[3].y = a.y + -1;
+			}
+		}
+		else
+		{
+			if(0 >= dx + dy)
+			{
+				p = out.AddSeg(3);
+				p[2].y = 1 + (p[0].y = a.y - 2);
+				p[2].x = p[0].x = a.x + 1;
+				p[1].y = b.y - 1;
+				p[1].x = b.x + 0;
+				p = out.AddSeg(3, 2);
+				p[0].y = b.y - 1;
+				p[0].x = b.x + 0;
+				p[1].y = a.y - 0;
+				p[1].x = a.x + 1;
+				p[4].y = 1 + (p[2].y = b.y + 0);
+				p[4].x = p[2].x = b.x + 0;
+				p[5].y = 1 + (p[3].y = a.y + 1);
+				p[5].x = p[3].x = a.x + 1;
+			}
+			else
+			{
+				p = out.AddSeg(3);
+				p[2].x = 1 + (p[0].x = a.x - 2);
+				p[2].y = p[0].y = a.y + -1;
+				p[1].x = b.x - 1;
+				p[1].y = b.y + 0;
+				p = out.AddSeg(3, 2);
+				p[0].x = b.x - 1;
+				p[0].y = b.y + 0;
+				p[1].x = a.x - 0;
+				p[1].y = a.y + -1;
+				p[4].x = 1 + (p[2].x = b.x + 0);
+				p[4].y = p[2].y = b.y + 0;
+				p[5].x = 1 + (p[3].x = a.x + 1);
+				p[5].y = p[3].y = a.y + -1;
+			}
+		}
+	}
+	else
+	{
+		if(dx >= 0)
+		{
+			if(dx + dy >= 0)
+			{
+				p = out.AddSeg(3);
+				p[2].y = 1 + (p[0].y = a.y - 2);
+				p[2].x = p[0].x = a.x + -1;
+				p[1].y = b.y - 1;
+				p[1].x = b.x + 0;
+				p = out.AddSeg(3, 2);
+				p[0].y = b.y - 1;
+				p[0].x = b.x + 0;
+				p[1].y = a.y - 0;
+				p[1].x = a.x + -1;
+				p[4].y = 1 + (p[2].y = b.y + 0);
+				p[4].x = p[2].x = b.x + 0;
+				p[5].y = 1 + (p[3].y = a.y + 1);
+				p[5].x = p[3].x = a.x + -1;
+			}
+			else
+			{
+				p = out.AddSeg(3);
+				p[2].x = 1 + (p[0].x = a.x - 2);
+				p[2].y = p[0].y = a.y + 1;
+				p[1].x = b.x - 1;
+				p[1].y = b.y + 0;
+				p = out.AddSeg(3, 2);
+				p[0].x = b.x - 1;
+				p[0].y = b.y + 0;
+				p[1].x = a.x - 0;
+				p[1].y = a.y + 1;
+				p[4].x = 1 + (p[2].x = b.x + 0);
+				p[4].y = p[2].y = b.y + 0;
+				p[5].x = 1 + (p[3].x = a.x + 1);
+				p[5].y = p[3].y = a.y + 1;
+			}
+		}
+		else
+		{
+			if(dy >= dx)
+			{
+				p = out.AddSeg(3);
+				p[2].y = 1 + (p[0].y = a.y - 2);
+				p[2].x = p[0].x = a.x + 1;
+				p[1].y = b.y - 1;
+				p[1].x = b.x + 0;
+				p = out.AddSeg(3, 2);
+				p[0].y = b.y - 1;
+				p[0].x = b.x + 0;
+				p[1].y = a.y - 0;
+				p[1].x = a.x + 1;
+				p[4].y = 1 + (p[2].y = b.y + 0);
+				p[4].x = p[2].x = b.x + 0;
+				p[5].y = 1 + (p[3].y = a.y + 1);
+				p[5].x = p[3].x = a.x + 1;
+			}
+			else
+			{
+				p = out.AddSeg(3);
+				p[2].x = 1 + (p[0].x = a.x - 2);
+				p[2].y = p[0].y = a.y + 1;
+				p[1].x = b.x - 1;
+				p[1].y = b.y + 0;
+				p = out.AddSeg(3, 2);
+				p[0].x = b.x - 1;
+				p[0].y = b.y + 0;
+				p[1].x = a.x - 0;
+				p[1].y = a.y + 1;
+				p[4].x = 1 + (p[2].x = b.x + 0);
+				p[4].y = p[2].y = b.y + 0;
+				p[5].x = 1 + (p[3].x = a.x + 1);
+				p[5].y = p[3].y = a.y + 1;
+			}
+		}
+	}
+}
+
+//////////////////////////////////////////////////////////////////////
+
+static void PathDraw_Output_5_3(PathDraw::Output& out, Point a, Point b)
+{
+	//RTIMING("PathDraw_Output_5_3");
+	Point *p;
+	int dx = b.x - a.x, dy = b.y - a.y;
+	if(dy >= 0)
+	{
+		if(dx >= 0)
+		{
+			if(dx >= dy)
+			{
+				p = out.AddSeg(3);
+				p[2].y = 1 + (p[0].y = a.y - 2);
+				p[2].x = p[0].x = a.x + -1;
+				p[1].y = b.y - 1;
+				p[1].x = b.x + 0;
+				p = out.AddSeg(3, 2);
+				p[4].y = 1 + (p[2].y = 1 + (p[0].y = b.y + 0));
+				p[4].x = p[2].x = p[0].x = b.x + 0;
+				p[5].y = 1 + (p[3].y = 1 + (p[1].y = a.y + 0));
+				p[5].x = p[3].x = p[1].x = a.x + -1;
+			}
+			else
+			{
+				p = out.AddSeg(3);
+				p[2].x = 1 + (p[0].x = a.x - 2);
+				p[2].y = p[0].y = a.y + -1;
+				p[1].x = b.x - 1;
+				p[1].y = b.y + 0;
+				p = out.AddSeg(3, 2);
+				p[4].x = 1 + (p[2].x = 1 + (p[0].x = b.x + 0));
+				p[4].y = p[2].y = p[0].y = b.y + 0;
+				p[5].x = 1 + (p[3].x = 1 + (p[1].x = a.x + 0));
+				p[5].y = p[3].y = p[1].y = a.y + -1;
+			}
+		}
+		else
+		{
+			if(0 >= dx + dy)
+			{
+				p = out.AddSeg(3);
+				p[2].y = 1 + (p[0].y = a.y - 2);
+				p[2].x = p[0].x = a.x + 1;
+				p[1].y = b.y - 1;
+				p[1].x = b.x + 0;
+				p = out.AddSeg(3, 2);
+				p[4].y = 1 + (p[2].y = 1 + (p[0].y = b.y + 0));
+				p[4].x = p[2].x = p[0].x = b.x + 0;
+				p[5].y = 1 + (p[3].y = 1 + (p[1].y = a.y + 0));
+				p[5].x = p[3].x = p[1].x = a.x + 1;
+			}
+			else
+			{
+				p = out.AddSeg(3);
+				p[2].x = 1 + (p[0].x = a.x - 2);
+				p[2].y = p[0].y = a.y + -1;
+				p[1].x = b.x - 1;
+				p[1].y = b.y + 0;
+				p = out.AddSeg(3, 2);
+				p[4].x = 1 + (p[2].x = 1 + (p[0].x = b.x + 0));
+				p[4].y = p[2].y = p[0].y = b.y + 0;
+				p[5].x = 1 + (p[3].x = 1 + (p[1].x = a.x + 0));
+				p[5].y = p[3].y = p[1].y = a.y + -1;
+			}
+		}
+	}
+	else
+	{
+		if(dx >= 0)
+		{
+			if(dx + dy >= 0)
+			{
+				p = out.AddSeg(3);
+				p[2].y = 1 + (p[0].y = a.y - 2);
+				p[2].x = p[0].x = a.x + -1;
+				p[1].y = b.y - 1;
+				p[1].x = b.x + 0;
+				p = out.AddSeg(3, 2);
+				p[4].y = 1 + (p[2].y = 1 + (p[0].y = b.y + 0));
+				p[4].x = p[2].x = p[0].x = b.x + 0;
+				p[5].y = 1 + (p[3].y = 1 + (p[1].y = a.y + 0));
+				p[5].x = p[3].x = p[1].x = a.x + -1;
+			}
+			else
+			{
+				p = out.AddSeg(3);
+				p[2].x = 1 + (p[0].x = a.x - 2);
+				p[2].y = p[0].y = a.y + 1;
+				p[1].x = b.x - 1;
+				p[1].y = b.y + 0;
+				p = out.AddSeg(3, 2);
+				p[4].x = 1 + (p[2].x = 1 + (p[0].x = b.x + 0));
+				p[4].y = p[2].y = p[0].y = b.y + 0;
+				p[5].x = 1 + (p[3].x = 1 + (p[1].x = a.x + 0));
+				p[5].y = p[3].y = p[1].y = a.y + 1;
+			}
+		}
+		else
+		{
+			if(dy >= dx)
+			{
+				p = out.AddSeg(3);
+				p[2].y = 1 + (p[0].y = a.y - 2);
+				p[2].x = p[0].x = a.x + 1;
+				p[1].y = b.y - 1;
+				p[1].x = b.x + 0;
+				p = out.AddSeg(3, 2);
+				p[4].y = 1 + (p[2].y = 1 + (p[0].y = b.y + 0));
+				p[4].x = p[2].x = p[0].x = b.x + 0;
+				p[5].y = 1 + (p[3].y = 1 + (p[1].y = a.y + 0));
+				p[5].x = p[3].x = p[1].x = a.x + 1;
+			}
+			else
+			{
+				p = out.AddSeg(3);
+				p[2].x = 1 + (p[0].x = a.x - 2);
+				p[2].y = p[0].y = a.y + 1;
+				p[1].x = b.x - 1;
+				p[1].y = b.y + 0;
+				p = out.AddSeg(3, 2);
+				p[4].x = 1 + (p[2].x = 1 + (p[0].x = b.x + 0));
+				p[4].y = p[2].y = p[0].y = b.y + 0;
+				p[5].x = 1 + (p[3].x = 1 + (p[1].x = a.x + 0));
+				p[5].y = p[3].y = p[1].y = a.y + 1;
+			}
+		}
+	}
+}
+
+//////////////////////////////////////////////////////////////////////
+
+static void PathDraw_Output_5_4(PathDraw::Output& out, Point a, Point b)
+{
+	//RTIMING("PathDraw_Output_5_4");
+	Point *p;
+	int dx = b.x - a.x, dy = b.y - a.y;
+	if(dy >= 0)
+	{
+		if(dx >= 0)
+		{
+			if(dx >= dy)
+			{
+				p = out.AddSeg(5, 2);
+				p[0].y = b.y - 2;
+				p[0].x = b.x + 1;
+				p[1].y = a.y - 2;
+				p[1].x = a.x + -1;
+				p[8].y = 1 + (p[6].y = 1 + (p[4].y = 1 + (p[2].y = b.y + -1)));
+				p[8].x = p[6].x = p[4].x = p[2].x = b.x + 1;
+				p[9].y = 1 + (p[7].y = 1 + (p[5].y = 1 + (p[3].y = a.y + -1)));
+				p[9].x = p[7].x = p[5].x = p[3].x = a.x + -1;
+			}
+			else
+			{
+				p = out.AddSeg(5, 2);
+				p[0].x = b.x - 2;
+				p[0].y = b.y + 1;
+				p[1].x = a.x - 2;
+				p[1].y = a.y + -1;
+				p[8].x = 1 + (p[6].x = 1 + (p[4].x = 1 + (p[2].x = b.x + -1)));
+				p[8].y = p[6].y = p[4].y = p[2].y = b.y + 1;
+				p[9].x = 1 + (p[7].x = 1 + (p[5].x = 1 + (p[3].x = a.x + -1)));
+				p[9].y = p[7].y = p[5].y = p[3].y = a.y + -1;
+			}
+		}
+		else
+		{
+			if(0 >= dx + dy)
+			{
+				p = out.AddSeg(5, 2);
+				p[0].y = b.y - 2;
+				p[0].x = b.x + -1;
+				p[1].y = a.y - 2;
+				p[1].x = a.x + 1;
+				p[8].y = 1 + (p[6].y = 1 + (p[4].y = 1 + (p[2].y = b.y + -1)));
+				p[8].x = p[6].x = p[4].x = p[2].x = b.x + -1;
+				p[9].y = 1 + (p[7].y = 1 + (p[5].y = 1 + (p[3].y = a.y + -1)));
+				p[9].x = p[7].x = p[5].x = p[3].x = a.x + 1;
+			}
+			else
+			{
+				p = out.AddSeg(5, 2);
+				p[0].x = b.x - 2;
+				p[0].y = b.y + 1;
+				p[1].x = a.x - 2;
+				p[1].y = a.y + -1;
+				p[8].x = 1 + (p[6].x = 1 + (p[4].x = 1 + (p[2].x = b.x + -1)));
+				p[8].y = p[6].y = p[4].y = p[2].y = b.y + 1;
+				p[9].x = 1 + (p[7].x = 1 + (p[5].x = 1 + (p[3].x = a.x + -1)));
+				p[9].y = p[7].y = p[5].y = p[3].y = a.y + -1;
+			}
+		}
+	}
+	else
+	{
+		if(dx >= 0)
+		{
+			if(dx + dy >= 0)
+			{
+				p = out.AddSeg(5, 2);
+				p[0].y = b.y - 2;
+				p[0].x = b.x + 1;
+				p[1].y = a.y - 2;
+				p[1].x = a.x + -1;
+				p[8].y = 1 + (p[6].y = 1 + (p[4].y = 1 + (p[2].y = b.y + -1)));
+				p[8].x = p[6].x = p[4].x = p[2].x = b.x + 1;
+				p[9].y = 1 + (p[7].y = 1 + (p[5].y = 1 + (p[3].y = a.y + -1)));
+				p[9].x = p[7].x = p[5].x = p[3].x = a.x + -1;
+			}
+			else
+			{
+				p = out.AddSeg(5, 2);
+				p[0].x = b.x - 2;
+				p[0].y = b.y + -1;
+				p[1].x = a.x - 2;
+				p[1].y = a.y + 1;
+				p[8].x = 1 + (p[6].x = 1 + (p[4].x = 1 + (p[2].x = b.x + -1)));
+				p[8].y = p[6].y = p[4].y = p[2].y = b.y + -1;
+				p[9].x = 1 + (p[7].x = 1 + (p[5].x = 1 + (p[3].x = a.x + -1)));
+				p[9].y = p[7].y = p[5].y = p[3].y = a.y + 1;
+			}
+		}
+		else
+		{
+			if(dy >= dx)
+			{
+				p = out.AddSeg(5, 2);
+				p[0].y = b.y - 2;
+				p[0].x = b.x + -1;
+				p[1].y = a.y - 2;
+				p[1].x = a.x + 1;
+				p[8].y = 1 + (p[6].y = 1 + (p[4].y = 1 + (p[2].y = b.y + -1)));
+				p[8].x = p[6].x = p[4].x = p[2].x = b.x + -1;
+				p[9].y = 1 + (p[7].y = 1 + (p[5].y = 1 + (p[3].y = a.y + -1)));
+				p[9].x = p[7].x = p[5].x = p[3].x = a.x + 1;
+			}
+			else
+			{
+				p = out.AddSeg(5, 2);
+				p[0].x = b.x - 2;
+				p[0].y = b.y + -1;
+				p[1].x = a.x - 2;
+				p[1].y = a.y + 1;
+				p[8].x = 1 + (p[6].x = 1 + (p[4].x = 1 + (p[2].x = b.x + -1)));
+				p[8].y = p[6].y = p[4].y = p[2].y = b.y + -1;
+				p[9].x = 1 + (p[7].x = 1 + (p[5].x = 1 + (p[3].x = a.x + -1)));
+				p[9].y = p[7].y = p[5].y = p[3].y = a.y + 1;
+			}
+		}
+	}
+}
+
+//////////////////////////////////////////////////////////////////////
+
+static void PathDraw_Output_5_5(PathDraw::Output& out, Point a, Point b)
+{
+	//RTIMING("PathDraw_Output_5_5");
+	Point *p;
+	int dx = b.x - a.x, dy = b.y - a.y;
+	if(dy >= 0)
+	{
+		if(dx >= 0)
+		{
+			if(dx >= dy)
+			{
+				p = out.AddSeg(5, 2);
+				p[8].y = 1 + (p[6].y = 1 + (p[4].y = 1 + (p[2].y = 1 + (p[0].y = a.y + -2))));
+				p[8].x = p[6].x = p[4].x = p[2].x = p[0].x = a.x + -1;
+				p[9].y = 1 + (p[7].y = 1 + (p[5].y = 1 + (p[3].y = 1 + (p[1].y = b.y + -2))));
+				p[9].x = p[7].x = p[5].x = p[3].x = p[1].x = b.x + 1;
+			}
+			else
+			{
+				p = out.AddSeg(5, 2);
+				p[8].x = 1 + (p[6].x = 1 + (p[4].x = 1 + (p[2].x = 1 + (p[0].x = a.x + -2))));
+				p[8].y = p[6].y = p[4].y = p[2].y = p[0].y = a.y + -1;
+				p[9].x = 1 + (p[7].x = 1 + (p[5].x = 1 + (p[3].x = 1 + (p[1].x = b.x + -2))));
+				p[9].y = p[7].y = p[5].y = p[3].y = p[1].y = b.y + 1;
+			}
+		}
+		else
+		{
+			if(0 >= dx + dy)
+			{
+				p = out.AddSeg(5, 2);
+				p[8].y = 1 + (p[6].y = 1 + (p[4].y = 1 + (p[2].y = 1 + (p[0].y = a.y + -2))));
+				p[8].x = p[6].x = p[4].x = p[2].x = p[0].x = a.x + 1;
+				p[9].y = 1 + (p[7].y = 1 + (p[5].y = 1 + (p[3].y = 1 + (p[1].y = b.y + -2))));
+				p[9].x = p[7].x = p[5].x = p[3].x = p[1].x = b.x + -1;
+			}
+			else
+			{
+				p = out.AddSeg(5, 2);
+				p[8].x = 1 + (p[6].x = 1 + (p[4].x = 1 + (p[2].x = 1 + (p[0].x = a.x + -2))));
+				p[8].y = p[6].y = p[4].y = p[2].y = p[0].y = a.y + -1;
+				p[9].x = 1 + (p[7].x = 1 + (p[5].x = 1 + (p[3].x = 1 + (p[1].x = b.x + -2))));
+				p[9].y = p[7].y = p[5].y = p[3].y = p[1].y = b.y + 1;
+			}
+		}
+	}
+	else
+	{
+		if(dx >= 0)
+		{
+			if(dx + dy >= 0)
+			{
+				p = out.AddSeg(5, 2);
+				p[8].y = 1 + (p[6].y = 1 + (p[4].y = 1 + (p[2].y = 1 + (p[0].y = a.y + -2))));
+				p[8].x = p[6].x = p[4].x = p[2].x = p[0].x = a.x + -1;
+				p[9].y = 1 + (p[7].y = 1 + (p[5].y = 1 + (p[3].y = 1 + (p[1].y = b.y + -2))));
+				p[9].x = p[7].x = p[5].x = p[3].x = p[1].x = b.x + 1;
+			}
+			else
+			{
+				p = out.AddSeg(5, 2);
+				p[8].x = 1 + (p[6].x = 1 + (p[4].x = 1 + (p[2].x = 1 + (p[0].x = a.x + -2))));
+				p[8].y = p[6].y = p[4].y = p[2].y = p[0].y = a.y + 1;
+				p[9].x = 1 + (p[7].x = 1 + (p[5].x = 1 + (p[3].x = 1 + (p[1].x = b.x + -2))));
+				p[9].y = p[7].y = p[5].y = p[3].y = p[1].y = b.y + -1;
+			}
+		}
+		else
+		{
+			if(dy >= dx)
+			{
+				p = out.AddSeg(5, 2);
+				p[8].y = 1 + (p[6].y = 1 + (p[4].y = 1 + (p[2].y = 1 + (p[0].y = a.y + -2))));
+				p[8].x = p[6].x = p[4].x = p[2].x = p[0].x = a.x + 1;
+				p[9].y = 1 + (p[7].y = 1 + (p[5].y = 1 + (p[3].y = 1 + (p[1].y = b.y + -2))));
+				p[9].x = p[7].x = p[5].x = p[3].x = p[1].x = b.x + -1;
+			}
+			else
+			{
+				p = out.AddSeg(5, 2);
+				p[8].x = 1 + (p[6].x = 1 + (p[4].x = 1 + (p[2].x = 1 + (p[0].x = a.x + -2))));
+				p[8].y = p[6].y = p[4].y = p[2].y = p[0].y = a.y + 1;
+				p[9].x = 1 + (p[7].x = 1 + (p[5].x = 1 + (p[3].x = 1 + (p[1].x = b.x + -2))));
+				p[9].y = p[7].y = p[5].y = p[3].y = p[1].y = b.y + -1;
+			}
+		}
+	}
+}
+
+//////////////////////////////////////////////////////////////////////
+
+void (*PathDraw_Output_Thick[5][5])(PathDraw::Output& out, Point a, Point b) =
+{
+	{
+		PathDraw_Output_1_1,
+		PathDraw_Output_1_2,
+		PathDraw_Output_1_3,
+		PathDraw_Output_1_4,
+		PathDraw_Output_1_5,
+	},
+	{
+		PathDraw_Output_2_1,
+		PathDraw_Output_2_2,
+		PathDraw_Output_2_3,
+		PathDraw_Output_2_4,
+		PathDraw_Output_2_5,
+	},
+	{
+		PathDraw_Output_3_1,
+		PathDraw_Output_3_2,
+		PathDraw_Output_3_3,
+		PathDraw_Output_3_4,
+		PathDraw_Output_3_5,
+	},
+	{
+		PathDraw_Output_4_1,
+		PathDraw_Output_4_2,
+		PathDraw_Output_4_3,
+		PathDraw_Output_4_4,
+		PathDraw_Output_4_5,
+	},
+	{
+		PathDraw_Output_5_1,
+		PathDraw_Output_5_2,
+		PathDraw_Output_5_3,
+		PathDraw_Output_5_4,
+		PathDraw_Output_5_5,
+	},
+};
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/Geom/Draw/plotter.cpp b/uppsrc/Geom/Draw/plotter.cpp
new file mode 100644
index 000000000..2e78be25b
--- /dev/null
+++ b/uppsrc/Geom/Draw/plotter.cpp
@@ -0,0 +1,2549 @@
+#include "GeomDraw.h"
+#pragma hdrstop
+
+NAMESPACE_UPP
+
+#define LLOG(x) // LOG(x)
+
+#define DEBUG_AREA 0
+#define CHECK_DIST 0 // 0 = off, 1 = on (purging very short line segments)
+
+#define STAT_LINES 0 // 0 = off, 1 = on, 2 = log individual vertices
+
+#if defined(CPU_IA32) && defined(COMPILER_MSC)
+	#define MSC_ASSEMBLY
+#endif
+
+static void DrawFatPolyPolygonOutline(Draw& draw,
+	const Point *vertices, int vertex_counts,
+	const int *polygon_counts, int polygon_count_counts,
+	Color color, int width)
+{
+	if(IsNull(color))
+		return;
+	if(width <= 1)
+	{
+		DrawPolyPolygon(draw, vertices, vertex_counts, polygon_counts, polygon_count_counts, Null, 0, color);
+		return;
+	}
+	enum { BATCH = 4000 };
+	int nsegs = min<int>(BATCH, (vertex_counts + polygon_count_counts + 1) * width);
+	int batch = 2 * nsegs;
+	Buffer<Point> buffer(batch);
+	Buffer<int> counts(nsegs);
+	Fill(counts + 0, counts + nsegs, 2);
+	int half = width >> 1;
+	Point *gen = buffer, *genend = buffer + batch - 2 * width;
+
+	for(; --polygon_count_counts >= 0; vertices += *polygon_counts++)
+	{
+		int vert = *polygon_counts;
+		int vw = vert * width;
+		int pc = 2 * vw;
+		Point prev = *vertices;
+		for(const Point *next = vertices + vert; next-- > vertices; prev = *next)
+		{
+			int dx = next->x - prev.x, dy = next->y - prev.y;
+			bool vert = (tabs(dx) < tabs(dy));
+			if(vert)
+			{
+//				if(dy >= 0) { dy += width; prev.y -= half; }
+//				else        { dy -= width; prev.y += half; }
+
+				prev.x -= half;
+				for(int i = 0; i < width; i++, gen += 2)
+				{
+					gen[1].x = dx + (gen[0].x = prev.x + i);
+					gen[1].y = dy + (gen[0].y = prev.y);
+				}
+			}
+			else
+			{
+//				if(dx >= 0) { dx += width; prev.x -= half; }
+//				else        { dx -= width; prev.x += half; }
+
+				prev.y -= half;
+				for(int i = 0; i < width; i++, gen += 2)
+				{
+					gen[1].x = dx + (gen[0].x = prev.x);
+					gen[1].y = dy + (gen[0].y = prev.y + i);
+				}
+			}
+			if(gen >= genend)
+			{
+				int pc = gen - buffer;
+				ASSERT(pc <= batch);
+				ASSERT(!(pc & 1));
+				draw.DrawPolyPolyline(buffer, pc, counts, pc >> 1, 0, color);
+				gen = buffer;
+			}
+		}
+	}
+	if(int pc = gen - buffer)
+	{
+		ASSERT(pc <= batch);
+		ASSERT(!(pc & 1));
+		draw.DrawPolyPolyline(buffer, pc, counts, pc >> 1, 0, color);
+		gen = buffer;
+	}
+}
+
+static void DrawFatPolyPolygonOutline(Draw& draw,
+	const Vector<Point>& vertices, const Vector<int>& counts,
+	Color color, int width)
+{
+	DrawFatPolyPolygonOutline(draw, vertices.Begin(), vertices.GetCount(),
+		counts.Begin(), counts.GetCount(), color, width);
+}
+
+LineStyle SolidLine      = { 0 };
+LineStyle EmptyLine      = { -1 };
+LineStyle DashLine       = { 8, -4, 0 };
+LineStyle DotLine        = { 2, -4, 0 };
+LineStyle DashDotLine    = { 8, -4, 2, -4, 0 };
+LineStyle DashDotDotLine = { 8, -4, 2, -4, 2, -4, 0 };
+
+enum { MAX_COUNT = 2048, MAX_MANUAL = 50 };
+
+LineDraw::LineDraw()
+: draw(0)
+, MoveToRaw(0)
+, LineToRaw(0)
+, AddVector(0)
+{
+}
+
+LineDraw::LineDraw(Draw& draw, LineStyle pattern, Color color, int width, double dash)
+{
+	Set(draw, pattern, color, width, dash);
+}
+
+void LineDraw::Set(Draw& _draw, LineStyle pattern, Color color, int width, double dash)
+{
+	draw = &_draw;
+	empty = (*pattern < 0 || IsNull(color));
+	if(empty)
+	{
+		active = 0;
+		ClearExtent();
+		return;
+	}
+	pen_width = (width >= 0 ? width : DotsToPixels(*draw, -width));
+	if(dash < 0)
+		dash *= -GetAvgPixelsPerDot(*draw);
+	else if(dash == 0)
+		dash = max(pen_width, 1);
+	dash = max<double>(dash, 1);
+	pen_color = color;
+	if(pen_width <= 1)
+		AddVector = &LineDraw::AddVectorThin;
+	else if(draw->Pixels() && pen_width <= 5)
+	{
+		AddVector = &LineDraw::AddVectorThick;
+		half_width = pen_width >> 1;
+	}
+	else
+	{
+		AddVector = &LineDraw::AddVectorArea;
+		factor = pen_width / 2.0;
+	}
+	if(*pattern > 0)
+	{
+		if(dash == 0)
+			dash = width;
+		const signed char *p = pattern;
+		while(*p++)
+			;
+		p--;
+		while(p > pattern)
+			segments.Add(*--p * dash);
+		active = segments.End();
+		remains = *--active;
+	}
+	else
+	{
+		remains = 1e100;
+		active = NULL;
+	}
+	first = last = Null;
+	clip = draw->GetClip();
+	Size size = draw->GetPagePixels();
+	max_rad = max(size.cx, size.cy);
+	vertices.Clear();
+	indices.Clear();
+	ClearExtent();
+}
+
+bool LineDraw::SetExtent(const Rect& rc)
+{
+	if(!(rc && clip) || empty)
+		return false;
+	bool in = clip.Contains(rc);
+	MoveToRaw = active ? &LineDraw::MoveToDashed : &LineDraw::MoveToSolid;
+	if(active)
+		LineToRaw = in ? &LineDraw::LineToDashedSimple : &LineDraw::LineToDashedClip;
+	else
+		LineToRaw = in ? &LineDraw::LineToSolidSimple : &LineDraw::LineToSolidClip;
+	return true;
+}
+
+void LineDraw::ClearExtent()
+{
+	MoveToRaw = empty ? &LineDraw::MoveToEmpty : active ? &LineDraw::MoveToDashed : &LineDraw::MoveToSolid;
+	LineToRaw = empty ? &LineDraw::LineToEmpty : active ? &LineDraw::LineToDashedClip : &LineDraw::LineToSolidClip;
+}
+
+void LineDraw::Clear()
+{
+	indices.Clear();
+	vertices.Clear();
+}
+
+void LineDraw::Flush()
+{
+	if(indices.IsEmpty())
+		return;
+	draw->DrawPolyPolyline(vertices, indices, 0, pen_color);
+	vertices.Clear();
+	indices.Clear();
+}
+
+void LineDraw::AddVectorThin(Point a, Point b)
+{
+	if(a == b)
+		return;
+	if(!vertices.IsEmpty())
+		if(vertices.Top() == a)
+		{
+			vertices.Add(b);
+			indices.Top()++;
+			return;
+		}
+		else if(vertices.Top() == b)
+		{
+			vertices.Add(a);
+			indices.Top()++;
+			return;
+		}
+	indices.Add(2);
+	vertices.Add(a);
+	vertices.Add(b);
+	if(vertices.GetCount() >= MAX_COUNT)
+		Flush();
+}
+
+void LineDraw::AddVectorThick(Point a, Point b)
+{
+	Size vector = b - a;
+	if((vector.cx | vector.cy) == 0)
+		return;
+	Size sh(sgn(vector.cx), sgn(vector.cy));
+	Size mv(0, 0);
+	if(tabs(vector.cx) > tabs(vector.cy))
+	{
+		mv.cy = 1;
+		a.y += half_width;
+		b.y += half_width;
+	}
+	else
+	{
+		mv.cx = 1;
+		a.x += half_width;
+		b.x += half_width;
+	}
+	indices.Add(2 * pen_width);
+	int i = pen_width;
+	while(i >= 2)
+	{
+		vertices.Add(a);
+		vertices.Add(b);
+		a -= mv;
+		b -= mv;
+		vertices.Add(b);
+		vertices.Add(a);
+		a -= mv;
+		b -= mv;
+		i -= 2;
+	}
+	if(i)
+	{
+		vertices.Add(a);
+		vertices.Add(b);
+	}
+	if(vertices.GetCount() >= MAX_COUNT)
+		Flush();
+}
+
+void LineDraw::AddVectorArea(Point a, Point b)
+{
+//	static Point last(0, 0);
+//	LOG(a << " - " << b << ": " << abs(a - b) << " (" << abs(a - last) << ")");
+//	last = b;
+
+	Size vector = b - a;
+	if((vector.cx | vector.cy) == 0)
+		vector.cx = 1;
+	double f = factor / sqrt(double(vector.cx * vector.cx + vector.cy * vector.cy));
+	vector.cx = fround(f * vector.cx);
+	vector.cy = fround(f * vector.cy);
+	Size larger((vector.cy - vector.cx) * 3 >> 2, (vector.cy + vector.cx) * 3 >> 2);
+	Point polygon[10];
+	polygon[0].x = a.x + vector.cy; polygon[0].y = a.y - vector.cx;
+	polygon[1].x = a.x + larger.cx; polygon[1].y = a.y - larger.cy;
+	polygon[2].x = a.x - vector.cx; polygon[2].y = a.y - vector.cy;
+	polygon[3].x = a.x - larger.cy; polygon[3].y = a.y - larger.cx;
+	polygon[4].x = a.x - vector.cy; polygon[4].y = a.y + vector.cx;
+	polygon[5].x = b.x - vector.cy; polygon[5].y = b.y + vector.cx;
+	polygon[6].x = b.x - larger.cx; polygon[6].y = b.y + larger.cy;
+	polygon[7].x = b.x + vector.cx; polygon[7].y = b.y + vector.cy;
+	polygon[8].x = b.x + larger.cy; polygon[8].y = b.y + larger.cx;
+	polygon[9].x = b.x + vector.cy; polygon[9].y = b.y - vector.cx;
+	DrawPolygon(*draw, polygon, 10, pen_color, PEN_NULL, Black, 0);
+//	draw->SetColor(pen_color);
+//	draw->SetDrawPen(PEN_NULL, Black);
+//	Polygon(*draw, polygon, 10);
+}
+
+void LineDraw::MoveToEmpty(Point pt) {}
+
+void LineDraw::MoveToSolid(Point pt)
+{
+	first = last = pt;
+}
+
+void LineDraw::MoveToDashed(Point pt)
+{
+	first = last = pt;
+	active = segments.End();
+	remains = *--active;
+}
+
+void LineDraw::LineToEmpty(Point pt)
+{
+}
+
+void LineDraw::LineToSolidSimple(Point pt)
+{
+	if(!IsNull(last) && pt != last)
+		(this ->* AddVector)(last, pt);
+	last = pt;
+}
+
+void LineDraw::LineToSolidClip(Point pt)
+{
+	if(!IsNull(last))
+	{
+		if(pt == last)
+			return;
+		Point next = pt;
+		if(!clip.Contains(next) || !clip.Contains(last))
+		{
+			Pointf A = last, B = next;
+			if(!ClipLine(A, B, clip))
+			{
+				last = pt;
+				return;
+			}
+			last = PointfToPoint(A);
+			next = PointfToPoint(B);
+		}
+		(this ->* AddVector)(last, next);
+	}
+	last = pt;
+}
+
+void LineDraw::LineToDashedClip(Point pt)
+{
+	if(pt == last)
+		return;
+	if(!IsNull(last))
+	{
+		Point next = pt;
+		if(!clip.Contains(next) || !clip.Contains(last))
+		{
+			Pointf A = last, B = next;
+			if(!ClipLine(A, B, clip))
+			{
+				last = pt;
+				return;
+			}
+			last = PointfToPoint(A);
+			next = PointfToPoint(B);
+		}
+		LineToDashedSimple(next);
+	}
+	last = pt;
+}
+
+void LineDraw::LineToDashedSimple(Point pt)
+{
+	if(IsNull(last))
+	{
+		last = pt;
+		return;
+	}
+	Size vector = pt - last;
+	if((vector.cx | vector.cy) == 0)
+		return;
+	double segment = hypot(vector.cx, vector.cy), left = segment;
+	for(;;)
+	{
+		if(remains > 0)
+		{
+			if(left < segment)
+			{
+				double r = left / segment;
+				last.x = pt.x - fround(vector.cx * r);
+				last.y = pt.y - fround(vector.cy * r);
+			}
+			if(remains >= left)
+			{
+				remains -= left;
+				(this ->* AddVector)(last, pt);
+				break;
+			}
+			else
+			{
+				double r = (left -= remains) / segment;
+				Point end(pt.x - fround(vector.cx * r), pt.y - fround(vector.cy * r));
+				(this ->* AddVector)(last, end);
+				last = end;
+			}
+		}
+		else
+		{
+			if(remains + left <= 0)
+			{
+				remains += left;
+				break;
+			}
+			else
+				left += remains;
+		}
+		if(active == segments.Begin())
+			active = segments.End();
+		remains = *--active;
+	}
+	last = pt;
+}
+
+void LineDraw::Close()
+{
+	if(empty)
+		return;
+	if(!IsNull(first.x) && first != last)
+		LineTo(first);
+	first = Null;
+}
+
+void LineDraw::Rectangle(const Rect& rc)
+{
+	if(empty)
+		return;
+	MoveTo(rc.TopLeft());
+	LineTo(Point(rc.right, rc.top));
+	LineTo(rc.BottomRight());
+	LineTo(Point(rc.left, rc.bottom));
+	Close();
+}
+
+void LineDraw::RecurseArc(Point next, int length, int bulge, int levels)
+{
+	if(--levels < 0 || tabs(bulge) <= 1 || length <= 2)
+		LineTo(next); // degenerate next line
+	else
+	{ // bisect arc
+		Size normal = iscale(Size(next.y - last.y, last.x - next.x), bulge, length);
+		Point centre = ((last + next) >> 1) + normal;
+		int ll = (int)Length(centre - next);
+		int hh = iscale(bulge, ll, 2 * ll + length);
+		RecurseArc(centre, ll, hh, levels);
+		RecurseArc(next, ll, hh, levels);
+	}
+}
+
+void LineDraw::ArcTo(Point p, int bulge, int levels)
+{
+	if(empty)
+		return;
+	if(p == last)
+		return;
+	if(bulge >= -1 && bulge <= 1)
+	{
+		LineTo(p);
+		return;
+	}
+	VecArcInfo info(last, Pointf(p), -bulge);
+	if(!info.IsCurved())
+	{
+		LineTo(p);
+		return;
+	}
+	if(info.radius >= max_rad)
+	{
+		RecurseArc(p, (int)Length(p - last), bulge, levels);
+		return;
+	}
+	Point c = PointfToPoint(info.C);
+	int rad = fround(info.radius);
+	Rect rc(c.x - rad, c.y - rad, c.x + rad, c.y + rad);
+	if(!active)
+	{ // draw simple arc
+		if(bulge >= 0)
+			draw->DrawArc(rc, last, p, pen_width, pen_color);
+		else
+			draw->DrawArc(rc, p, last, pen_width, pen_color);
+		last = p;
+		return;
+	}
+
+	double left = info.Length();
+	double end_angle = info.reversed ? info.alpha : info.beta;
+	double len_ang = (info.reversed ? info.beta - info.alpha : info.alpha - info.beta) / left;
+
+	int part = 1000;
+	for(;;)
+	{
+		if(--part < 0)
+			break;
+
+		if(remains > 0)
+		{
+			Point start = PointfToPoint(PolarPointf(info.C, info.radius, end_angle + len_ang * left));
+			Point end;
+			if(remains >= left)
+			{
+				remains -= left;
+				left = 0;
+				end = p;
+			}
+			else
+				end = PointfToPoint(PolarPointf(info.C, info.radius, end_angle + len_ang * (left -= remains)));
+			if(bulge >= 0)
+				Swap(start, end);
+			if(max(start.x - end.x, start.y - end.y) <= 2)
+				draw->DrawLine(start, end, pen_width, pen_color);
+			else
+			{
+				if(bulge >= 0)
+					draw->DrawArc(rc, start, end, pen_width, pen_color);
+				else
+					draw->DrawArc(rc, end, start, pen_width, pen_color);
+			}
+			if(left == 0)
+				break;
+		}
+		else if(remains < 0)
+		{
+			if(remains + left <= 0)
+			{
+				remains += left;
+				break;
+			}
+			else
+				left += remains;
+		}
+		if(active == segments.Begin())
+			active = segments.End();
+		remains = *--active;
+	}
+	last = p;
+}
+
+void LineDraw::Circle(Point centre, int radius)
+{
+	if(empty)
+		return;
+	Point east(centre.x + radius, centre.y), west(centre.x - radius, centre.y);
+	MoveTo(east);
+	ArcTo(west, radius);
+	ArcTo(east, radius);
+}
+
+void LineDraw::Ellipse(const Rect& rc)
+{
+	enum { SEGMENTS = 16 };
+	Point centre = rc.CenterPoint();
+	Size radius = rc.Size() >> 1;
+	Point beg = Point(centre.x + radius.cx, centre.y);
+	MoveTo(beg);
+	for(int i = 1; i <= SEGMENTS; i++)
+	{
+		double a = i * (2 * M_PI / SEGMENTS) - M_PI / SEGMENTS;
+		Point mid(centre.x + fround(radius.cx * cos(a)), centre.y + fround(radius.cy * sin(a)));
+		a += M_PI / SEGMENTS;
+		Point end(centre.x + fround(radius.cx * cos(a)), centre.y + fround(radius.cy * sin(a)));
+		int bulge = 0;
+		int dist = Squared(end - beg);
+		if(dist)
+			bulge = fround(tabs(VectorProduct(mid - beg, end - beg)) / sqrt(double(dist)));
+		ArcTo(end, bulge);
+		beg = end;
+	}
+}
+
+void Plotter::Set(Draw& _draw, const Rectf& _src, const Rectf& _dest, int flags, int reserve, double meter)
+{
+	Rectf src = _src;
+	if(src.right  <= src.left) src.right  = src.left + 1;
+	if(src.bottom <= src.top)  src.bottom = src.top  + 1;
+	Rectf dest = _dest;
+	if(flags & MIRROR_X) Swap(dest.left, dest.right);
+	if(flags & MIRROR_Y) Swap(dest.top,  dest.bottom);
+	Pointf scale = dest.Size() / src.Size();
+	if(flags & ISOTROPIC)
+	{
+		scale.x = sgn(scale.x) * AbsMin(scale);
+		scale.y = sgn(scale.y) * fabs(scale.x);
+	}
+	Pointf delta = dest.CenterPoint() - src.CenterPoint() * scale;
+	Set(_draw, scale, delta, reserve, meter);
+}
+
+void Plotter::Set(Draw& _draw, Sizef _scale, Pointf _delta, int reserve, double meter)
+{
+	Set(_draw, Matrixf(Pointf(_scale.cx, 0), Pointf(0, _scale.cy), _delta), reserve, meter);
+}
+
+void Plotter::Set(Draw& _draw, const Matrixf& matrix, int reserve, double meter)
+{
+	Rect rc = _draw.GetClip();
+	if(reserve < 0)
+		reserve = DotsToPixels(_draw, -reserve);
+	rc.Inflate(reserve);
+	Set(_draw, matrix, rc, meter);
+}
+
+void Plotter::Set(Draw& _draw, const Matrixf& _transform, const Rect& _clip, double meter)
+{
+	physical = _transform;
+	logical = MatrixfInverse(_transform);
+	measure = fabs(MatrixfMeasure(physical));
+	logprec = 1.0 / measure;
+	ortho = (physical.x.y == 0 && physical.y.x == 0);
+	ltop = (ortho ? &Plotter::LtoPOrtho : &Plotter::LtoPFull);
+	ltopoint = (ortho ? &Plotter::LtoPointOrtho : &Plotter::LtoPointFull);
+	SetDraw(_draw, _clip, meter);
+}
+
+void Plotter::SetDraw(Draw& _draw, const Rect& _clip, double meter)
+{
+	draw = &_draw;
+	SetPixelsPerDot(GetAvgPixelsPerDot(*draw));
+	clip = _clip;
+	logclip = PtoL(clip);
+	logdiag = Diagonal(logclip);
+	path_map = PATH_MAP_NULL;
+	SetMapMeters(meter);
+}
+
+void Plotter::Set(const Plotter& info, const Rect& clip)
+{
+	ASSERT(info.draw);
+	Set(*info.draw, info.physical, clip, info.map_meters);
+	path_map = info.path_map;
+	pixels_per_dot = info.pixels_per_dot;
+	SetMapMeters(info.map_meters);
+}
+
+void Plotter::Set(const Plotter& info, int reserve)
+{
+	ASSERT(info.draw);
+	Set(*info.draw, info.physical, reserve);
+	path_map = info.path_map;
+	pixels_per_dot = info.pixels_per_dot;
+	SetMapMeters(info.map_meters);
+}
+
+void Plotter::SetMapMeters(double mm)
+{
+	map_meters = mm;
+	physical_scale = fabs(measure) / (map_meters * GetPixelsPerMeter());
+	LLOG("Plotter::SetMapMeters(" << mm << "): pixel per dot = " << pixels_per_dot << ", physical scale = " << physical_scale);
+}
+
+void Plotter::SetXorMode(bool xm)
+{
+#ifdef PLATFORM_WIN32
+	SetROP2(*draw, xm ? R2_NOTXORPEN : R2_COPYPEN);
+#endif
+#ifdef PLATFORM_X11
+	XSetFunction(Xdisplay, draw->GetGC(), xm ? X11_ROP2_NOT_XOR : X11_ROP2_COPY);
+#endif
+}
+
+static inline void AddRectMatrix(Rectf& out, const Rectf& rc, const Matrixf& mx)
+{
+	out.left   += mx.x.x * (mx.x.x >= 0 ? rc.left : rc.right) + mx.y.x * (mx.y.x >= 0 ? rc.top : rc.bottom);
+	out.top    += mx.x.y * (mx.x.y >= 0 ? rc.left : rc.right) + mx.y.y * (mx.y.y >= 0 ? rc.top : rc.bottom);
+	out.right  += mx.x.x * (mx.x.x <= 0 ? rc.left : rc.right) + mx.y.x * (mx.y.x <= 0 ? rc.top : rc.bottom);
+	out.bottom += mx.x.y * (mx.x.y <= 0 ? rc.left : rc.right) + mx.y.y * (mx.y.y <= 0 ? rc.top : rc.bottom);
+}
+
+Rectf Plotter::LtoPrel(const Rectf& rc) const
+{
+	Rectf result(0, 0, 0, 0);
+	AddRectMatrix(result, rc, physical);
+	return result;
+}
+
+Rectf Plotter::LtoP(const Rectf& rc) const
+{
+	Rectf result = PointfRectf(physical.a);
+	AddRectMatrix(result, rc, physical);
+	return result;
+}
+
+Rectf Plotter::PtoLrel(const Rectf& rc) const
+{
+	Rectf result = Rectf(0, 0, 0, 0);
+	AddRectMatrix(result, rc, logical);
+	return result;
+}
+
+Rectf Plotter::PtoL(const Rectf& rc) const
+{
+	Rectf result = PointfRectf(logical.a);
+	AddRectMatrix(result, rc, logical);
+	return result;
+}
+
+Point Plotter::LtoPointFull(Pointf pt) const
+{
+#ifdef MSC_ASSEMBLY
+	Point result;
+	const Matrixf& mx = physical;
+	__asm mov    ebx, [mx]
+	__asm fld    qword ptr [ebx]Matrixf.a.y
+	__asm fld    qword ptr [ebx]Matrixf.a.x
+	__asm fld    qword ptr [pt]Pointf.x
+	__asm fld    st(0)
+	__asm fmul   qword ptr [ebx]Matrixf.x.x
+	__asm faddp  st(2), st
+	__asm fmul   qword ptr [ebx]Matrixf.x.y
+	__asm faddp  st(2), st
+	__asm fld    qword ptr [pt]Pointf.y
+	__asm fld    st(0)
+	__asm fmul   qword ptr [ebx]Matrixf.y.x
+	__asm faddp  st(2), st
+	__asm fmul   qword ptr [ebx]Matrixf.y.y
+	__asm faddp  st(2), st
+	__asm fistp  dword ptr [result + 0]
+	__asm fistp  dword ptr [result + 4]
+	return result;
+#else
+	return PointfToPoint(pt * physical);
+#endif
+}
+
+Point Plotter::LtoPointOrtho(Pointf pt) const
+{
+#ifdef MSC_ASSEMBLY
+	Point result;
+	const Matrixf& mx = physical;
+	__asm mov    ebx, [mx]
+	__asm fld    qword ptr [ebx]Matrixf.a.y
+	__asm fld    qword ptr [ebx]Matrixf.a.x
+	__asm fld    qword ptr [pt]Pointf.y
+	__asm fmul   qword ptr [ebx]Matrixf.y.y
+	__asm fld    qword ptr [pt]Pointf.x
+	__asm fmul   qword ptr [ebx]Matrixf.x.x
+	__asm faddp  st(2), st
+	__asm faddp  st(2), st
+	__asm fistp  dword ptr [result + 0]
+	__asm fistp  dword ptr [result + 4]
+	return result;
+#else
+	return Point((int)(pt.x * physical.x.x + physical.a.x), (int)(pt.y * physical.y.y + physical.a.y));
+#endif
+}
+
+static void PaintRectPart(Draw& draw, int x, int y, int w, int h)
+{
+#if defined(PLATFORM_WIN32)
+	::PatBlt(draw, x, y, w, h, PATINVERT);
+#elif defined(PLATFORM_X11)
+	Point offset = draw.GetOffset();
+	XFillRectangle(Xdisplay, draw.GetDrawable(), draw.GetGC(), x + offset.x, y + offset.y, w, h);
+#endif
+}
+
+static void PaintRectPart(Draw& draw, const Rect& rc) { PaintRectPart(draw, rc.left, rc.top, rc.Width(), rc.Height()); }
+
+enum { DRAG_STEP = 4 };
+
+void PaintDragHorzLine(Draw& draw, const Rect& rc, Color c1, Color c2, Color bgnd, int mingap)
+{
+	Size sz = rc.Size();
+#if defined(PLATFORM_WIN32)
+	draw.BeginGdi();
+	static word bmp_bits[8];
+	HBITMAP hbmp = CreateBitmap(8, 8, 1, 1, bmp_bits);
+	HBRUSH brush = CreatePatternBrush(hbmp);
+	DeleteObject(hbmp);
+	COLORREF cc1 = (COLORREF)c1 ^ (COLORREF)bgnd, cc2 = (COLORREF)c2 ^ (COLORREF)bgnd;
+	COLORREF old_bk = SetTextColor(draw, cc1);
+	HGDIOBJ old_brush = SelectObject(draw, brush);
+#elif defined(PLATFORM_X11)
+	XGCValues gcv_old, gcv_new;
+	XGetGCValues(Xdisplay, draw.GetGC(), GCForeground | GCFunction, &gcv_old);
+	gcv_new.function = X11_ROP2_XOR;
+	gcv_new.foreground = GetXPixel(c1) ^ GetXPixel(bgnd);
+	XChangeGC(Xdisplay, draw.GetGC(), GCForeground | GCFunction, &gcv_new);
+#endif
+	int whites = (sz.cx - 2 * mingap + DRAG_STEP) / (2 * DRAG_STEP);
+	if(rc.Width() <= 2 * mingap)
+		PaintRectPart(draw, rc);
+	else if(whites <= 0)
+	{
+		PaintRectPart(draw, rc.left, rc.top, mingap, sz.cy);
+		PaintRectPart(draw, rc.right - mingap, rc.top, mingap, sz.cy);
+#if defined(PLATFORM_WIN32)
+		SetTextColor(draw, cc2);
+#elif defined(PLATFORM_X11)
+		gcv_new.foreground = GetXPixel(c2) ^ GetXPixel(bgnd);
+		XChangeGC(Xdisplay, draw.GetGC(), GCForeground, &gcv_new);
+#endif
+		PaintRectPart(draw, rc.left + mingap, rc.top, sz.cx - 2 * mingap, sz.cy);
+	}
+	else
+	{
+		int rem = sz.cx - whites * 2 * DRAG_STEP + DRAG_STEP;
+		int lrem = rem >> 1, rrem = (rem + 1) >> 1;
+		PaintRectPart(draw, rc.left, rc.top, lrem, sz.cy);
+		PaintRectPart(draw, rc.right - rrem, rc.top, rrem, sz.cy);
+		int i;
+		int start = rc.left + lrem - DRAG_STEP;
+		for(i = 1; i < whites; i++)
+			PaintRectPart(draw, start + 2 * DRAG_STEP * i, rc.top, DRAG_STEP, sz.cy);
+#if defined(PLATFORM_WIN32)
+		SetTextColor(draw, cc2);
+#elif defined(PLATFORM_X11)
+		gcv_new.foreground = GetXPixel(c2) ^ GetXPixel(bgnd);
+		XChangeGC(Xdisplay, draw.GetGC(), GCForeground, &gcv_new);
+#endif
+		start = rc.left + lrem;
+		for(i = 0; i < whites; i++)
+			PaintRectPart(draw, start + 2 * DRAG_STEP * i, rc.top, DRAG_STEP, sz.cy);
+	}
+#if defined(PLATFORM_WIN32)
+	SelectObject(draw, old_brush);
+	DeleteObject(brush);
+	SetTextColor(draw, old_bk);
+	draw.EndGdi();
+#elif defined(PLATFORM_X11)
+	XChangeGC(Xdisplay, draw.GetGC(), GCForeground | GCFunction, &gcv_old);
+#endif
+}
+
+void PaintDragVertLine(Draw& draw, const Rect& rc, Color c1, Color c2, Color bgnd, int mingap)
+{
+	Size sz = rc.Size();
+#if defined(PLATFORM_WIN32)
+	draw.BeginGdi();
+	static word bmp_bits[8];
+	HBITMAP hbmp = CreateBitmap(8, 8, 1, 1, bmp_bits);
+	HBRUSH brush = CreatePatternBrush(hbmp);
+	DeleteObject(hbmp);
+	COLORREF cc1 = (COLORREF)c1 ^ (COLORREF)bgnd, cc2 = (COLORREF)c2 ^ (COLORREF)bgnd;
+	COLORREF old_bk = SetTextColor(draw, cc1);
+	HGDIOBJ old_brush = SelectObject(draw, brush);
+#elif defined(PLATFORM_X11)
+	XGCValues gcv_old, gcv_new;
+	XGetGCValues(Xdisplay, draw.GetGC(), GCForeground | GCFunction, &gcv_old);
+	gcv_new.function = X11_ROP2_XOR;
+	gcv_new.foreground = GetXPixel(c1) ^ GetXPixel(bgnd);
+	XChangeGC(Xdisplay, draw.GetGC(), GCForeground | GCFunction, &gcv_new);
+#endif
+	int whites = (sz.cy - 2 * mingap + DRAG_STEP) / (2 * DRAG_STEP);
+	if(rc.Height() <= 2 * mingap)
+		PaintRectPart(draw, rc);
+	else if(whites <= 0)
+	{
+		PaintRectPart(draw, rc.left, rc.top, sz.cx, mingap);
+		PaintRectPart(draw, rc.left, rc.bottom - mingap, sz.cx, mingap);
+#if defined(PLATFORM_WIN32)
+		SetTextColor(draw, cc2);
+#elif defined(PLATFORM_X11)
+		gcv_new.foreground = GetXPixel(c2) ^ GetXPixel(bgnd);
+		XChangeGC(Xdisplay, draw.GetGC(), GCForeground, &gcv_new);
+#endif
+		PaintRectPart(draw, rc.left, rc.top + mingap, sz.cx, sz.cy - 2 * mingap);
+	}
+	else
+	{
+		int rem = sz.cy - whites * 2 * DRAG_STEP + DRAG_STEP;
+		int lrem = rem >> 1, rrem = (rem + 1) >> 1;
+		PaintRectPart(draw, rc.left, rc.top, sz.cx, lrem);
+		PaintRectPart(draw, rc.left, rc.bottom - rrem, sz.cx, rrem);
+		int i;
+		int start = rc.top + lrem - DRAG_STEP;
+		for(i = 1; i < whites; i++)
+			PaintRectPart(draw, rc.left, start + 2 * DRAG_STEP * i, sz.cx, DRAG_STEP);
+#if defined(PLATFORM_WIN32)
+		SetTextColor(draw, cc2);
+#elif defined(PLATFORM_X11)
+		gcv_new.foreground = GetXPixel(c2) ^ GetXPixel(bgnd);
+		XChangeGC(Xdisplay, draw.GetGC(), GCForeground, &gcv_new);
+#endif
+		start = rc.left + lrem;
+		for(i = 0; i < whites; i++)
+			PaintRectPart(draw, rc.left, start + 2 * DRAG_STEP * i, sz.cx, DRAG_STEP);
+	}
+#if defined(PLATFORM_WIN32)
+	SelectObject(draw, old_brush);
+	DeleteObject(brush);
+	SetTextColor(draw, old_bk);
+	draw.EndGdi();
+#elif defined(PLATFORM_X11)
+	XChangeGC(Xdisplay, draw.GetGC(), GCForeground | GCFunction, &gcv_old);
+#endif
+}
+
+void PaintDragRect(Draw& draw, const Rect& rc, Color c1, Color c2, Color bgnd, int width)
+{
+	if(rc.IsEmpty())
+		return;
+	if(rc.Height() <= 2 * width)
+		PaintDragHorzLine(draw, rc, LtRed, White, SWhite, width);
+	else if(rc.Width() <= 2 * width)
+		PaintDragVertLine(draw, rc, LtRed, White, SWhite, width);
+	else
+	{
+		PaintDragHorzLine(draw, Rect(rc.left, rc.top, rc.right, rc.top + width), LtRed, White, SWhite, width);
+		PaintDragHorzLine(draw, Rect(rc.left, rc.bottom - width, rc.right, rc.bottom), LtRed, White, SWhite, width);
+		PaintDragVertLine(draw, Rect(rc.left, rc.top + width, rc.left + width, rc.bottom - width), LtRed, White, SWhite, 0);
+		PaintDragVertLine(draw, Rect(rc.right - width, rc.top + width, rc.right, rc.bottom - width), LtRed, White, SWhite, 0);
+	}
+}
+
+void PlotDragRect(Plotter& plotter, const Rectf& r)
+{
+	if(!IsNull(r))
+	{
+		Rect rc = RectfToRect(plotter.LtoP(r).Inflated(1, 1, 2, 2)) & plotter.clip.Inflated(10);
+		PaintDragRect(plotter.GetDraw(), rc, LtRed, White, SWhite, 3);
+	}
+}
+
+PlotterTool::PlotterTool()
+: last_point(0, 0)
+, clip_arcs(true)
+, LineToRaw(0) // acts like a pure virtual function: throws exception when called
+, MoveToRaw(0)
+{
+}
+
+PlotterTool::~PlotterTool() {}
+
+void PlotterTool::Paint()
+{
+}
+
+void PlotterTool::Clear()
+{
+}
+
+void PlotterTool::Line(const Array<Pointf>& points)
+{
+	if(!points.IsEmpty()) {
+		bool line = false;
+		for(int i = 0; i < points.GetCount(); i++)
+			if(IsNull(points[i]))
+				line = false;
+			else {
+				DrawTo(points[i], line);
+				line = true;
+			}
+	}
+}
+
+bool PlotterTool::ArcToRaw(Pointf pt, double bulge)
+{
+	return false;
+}
+
+void PlotterTool::ArcTo(Pointf pt, double bulge, int levels)
+{
+	if(fabs(bulge) <= plotter.logprec)
+		LineTo(pt);
+	else
+	{
+		VecArcIterator arc(last_point, pt, bulge, LineToRaw);
+		arc.Precision(plotter.logprec).ArcTo(THISBACK(ArcToRaw));
+		if(clip_arcs)
+			arc.Clip(plotter.logclip, MoveToRaw);
+		arc.Go();
+	}
+}
+
+void PlotterTool::Rectangle(double x1, double y1, double x2, double y2, bool r)
+{
+	MoveTo(x1, y1);
+	LineTo(x2, y1);
+	LineTo(x2, y2);
+	if(!r || min(fabs(x2 - x1), fabs(y2 - y1)) * plotter.measure > 1)
+	{
+		LineTo(x1, y2);
+		LineTo(x1, y1);
+	}
+}
+
+void PlotterTool::Ellipse(const Rectf& rc)
+{
+	enum { SEGMENTS = 16 };
+	Pointf centre = rc.CenterPoint();
+	Pointf radius = Sizef(rc.Size()) / 2.0;
+	Pointf beg(centre.x + radius.x, centre.y);
+	MoveTo(beg);
+//	int sign = sgn(plotter.measure);
+	for(int i = 1; i <= SEGMENTS; i++)
+	{
+		double a = i * (2 * M_PI / SEGMENTS) - M_PI / SEGMENTS;
+		Pointf mid = centre + radius * PolarPointf(a);
+		Pointf end = centre + radius * PolarPointf(a + M_PI / SEGMENTS);
+		double bulge = 0, dist = end | beg;
+		if(dist)
+			bulge = fabs((mid - beg) % (end - beg)) / dist;
+		ArcTo(end, bulge);
+		beg = end;
+	}
+}
+
+void PlotterTool::ArrowHead(Pointf P, Pointf Q, double length, double angle)
+{
+	double base = Bearing(P, Q);
+	Line(PolarPointf(Q, length, base + angle), Q);
+	Line(PolarPointf(Q, length, base - angle), Q);
+}
+
+void PlotterTool::Arrow(Pointf P, Pointf Q, double length, double angle)
+{
+	Line(P, Q);
+	ArrowHead(P, Q, min(length, P | Q), angle);
+}
+
+void PlotterTool::BiArrow(Pointf P, Pointf Q, double length, double angle)
+{
+	Line(P, Q);
+	length = min(length, (P | Q) / 2);
+	ArrowHead(P, Q, length, angle);
+	ArrowHead(Q, P, length, angle);
+}
+
+void PlotterTool::Circle(double x, double y, double radius)
+{
+	Pointf right(x + radius, y);
+	Pointf left(x - radius, y);
+	MoveTo(right);
+	ArcTo(left, radius);
+	ArcTo(right, radius);
+}
+
+#ifdef PLOTTER_TIMING
+int  PathTool::segments = 0;
+int  PathTool::drawn = 0;
+long PathTool::ticks = 0;
+#endif
+
+PathTool::PathTool()
+: use_last(false)
+{
+	ClearExtent();
+}
+
+PathTool::~PathTool() {}
+
+void PathTool::Set(const Plotter& _info, const String& pattern, Color color, int width, double dash)
+{
+	Clear();
+	plotter = _info;
+	pathdraw.Set(*plotter.draw, plotter.GetPath(pattern), color, width, dash, false);
+	use_last = false;
+}
+
+bool PathTool::SetExtent(const Rectf& rc)
+{
+	if(rc && plotter.logclip)
+	{
+		Rectf rcc = plotter.LtoP(rc);
+		simple = rcc.left  >= plotter.clip.left  && rcc.top    >= plotter.clip.top
+			&&   rcc.right <= plotter.clip.right && rcc.bottom <= plotter.clip.bottom;
+		bool within = true;
+		if(simple)
+			within = pathdraw.SetExtent(RectfToRect(rcc));
+		else
+			pathdraw.ClearExtent();
+		MoveToRaw = (simple ? THISBACK(MoveToRawSimple) : THISBACK(MoveToRawClip));
+		LineToRaw = (simple ? THISBACK(LineToRawSimple) : THISBACK(LineToRawClip));
+		return within;
+	}
+	else
+		return false;
+}
+
+void PathTool::ClearExtent()
+{
+	MoveToRaw = THISBACK(MoveToRawClip);
+	LineToRaw = THISBACK(LineToRawClip);
+	simple = false;
+	pathdraw.ClearExtent();
+}
+
+void PathTool::Paint()
+{
+	if(plotter.draw)
+	{
+//		if(is_closed)
+//			LineTo(last_point);
+		pathdraw.Paint();
+	}
+	ClearExtent();
+}
+
+void PathTool::Clear()
+{
+	pathdraw.Clear();
+	ClearExtent();
+}
+
+void PathTool::MoveToRawSimple(Pointf pt)
+{
+	pathdraw.MoveTo(plotter.LtoPoint(last_point = pt));
+}
+
+void PathTool::MoveToRawClip(Pointf pt)
+{
+	last_phys = plotter.LtoP(last_point = pt);
+	use_last = false;
+}
+
+void PathTool::LineToRawSimple(Pointf pt)
+{
+	if(IsNull(pt.x) || IsNull(pt.y))
+	{
+		use_last = false;
+		return;
+	}
+#ifdef PLOTTER_TIMING
+	ticks -= GetTickCount();
+	segments++;
+	drawn++;
+#endif
+	pathdraw.LineTo(plotter.LtoPoint(pt));
+}
+
+void PathTool::LineToRawClip(Pointf pt)
+{
+	if(IsNull(pt.x) || IsNull(pt.y))
+	{
+		use_last = false;
+		return;
+	}
+	ASSERT(pt.x <= 1e100);
+#ifdef PLOTTER_TIMING
+	ticks -= GetTickCount();
+	segments++;
+#endif
+	Pointf B = plotter.LtoP(pt);
+#if CHECK_DIST
+	if(use_last && fabs(B.x - last_phys.x) < 1 && fabs(B.y - last_phys.y) < 1)
+	{
+#ifdef PLOTTER_TIMING
+		ticks += GetTickCount();
+#endif
+		return;
+	}
+#endif//CHECK_DIST
+	Pointf A = last_phys, end = B;
+	last_point = pt;
+	last_phys = B;
+	if(ClipLine(A, B, plotter.clip))
+	{ // draw line
+#ifdef PLOTTER_TIMING
+		drawn++;
+#endif
+		if(!use_last)
+			pathdraw.MoveTo(PointfToPoint(A));
+		pathdraw.LineTo(PointfToPoint(B));
+		use_last = (B | end) <= 1;
+	}
+	else
+		use_last = false;
+#ifdef PLOTTER_TIMING
+	ticks += GetTickCount();
+#endif
+}
+
+bool PathTool::ArcToRaw(Pointf pt, double bulge)
+{
+	if(bulge >= plotter.logdiag)
+		return false;
+	if(bulge <= plotter.logprec)
+	{
+		LineTo(pt);
+		return true;
+	}
+	Pointf pt_phys = plotter.LtoP(pt);
+	pathdraw.Arc(PointfToPoint(last_phys), PointfToPoint(pt_phys), fround(bulge * fabs(plotter.measure)));
+	last_point = pt;
+	last_phys = pt_phys;
+	return true;
+}
+
+AreaTool::AreaTool()
+{
+	prev_ghost = false;
+	clip_arcs = false;
+	fill_color = Black;
+	Clear();
+}
+
+AreaTool::~AreaTool() {}
+
+bool AreaTool::SetExtent(const Rectf& rc)
+{
+	if(rc && plotter.logclip)
+	{
+		Rectf rcc = plotter.LtoP(rc);
+		simple = rcc.left  >= plotter.clip.left  && rcc.top    >= plotter.clip.top
+			&&   rcc.right <= plotter.clip.right && rcc.bottom <= plotter.clip.bottom;
+		MoveToRaw = (simple ? THISBACK(MoveToRawSimple) : THISBACK(MoveToRawClip));
+		LineToRaw = (simple ? THISBACK(LineToRawSimple) : THISBACK(LineToRawClip));
+		return true;
+	}
+	else
+		return false;
+}
+
+void AreaTool::ClearExtent()
+{
+	MoveToRaw = THISBACK(MoveToRawClip);
+	LineToRaw = THISBACK(LineToRawClip);
+	simple = false;
+}
+
+void AreaTool::Clear()
+{
+	begin_index = 0;
+	disjunct_begin_index = 0;
+	last_start = Null;
+	last_in = true;
+	vertices.Clear();
+	counts.Clear();
+	disjunct_counts.Clear();
+	ClearExtent();
+}
+
+void AreaTool::MoveToRawSimple(Pointf pt)
+{
+	Flush();
+	if(prev_ghost)
+		ghost_lines.Add(vertices.GetCount());
+	vertices.Add(plotter.LtoPoint(last_point = pt));
+}
+
+void AreaTool::MoveToRawClip(Pointf pt)
+{
+	Flush();
+	if(prev_ghost)
+		ghost_lines.Add(vertices.GetCount());
+	vertices.Add(ClipBind(last_phys = plotter.LtoP(last_point = last_start = pt)));
+	last_in = (last_phys.x >= plotter.clip.left && last_phys.x <= plotter.clip.right
+		&&     last_phys.y >= plotter.clip.top  && last_phys.y <= plotter.clip.bottom);
+}
+
+void AreaTool::LineToRawSimple(Pointf pt)
+{
+//	RTIMING("AreaTool::LineToRawSimple");
+	Point ipt = plotter.LtoPoint(last_point = pt);
+	if(ipt != vertices.Top())
+	{
+		if(prev_ghost)
+			ghost_lines.Add(vertices.GetCount());
+		vertices.Add(ipt);
+	}
+}
+
+void AreaTool::LineToRawClip(Pointf pt)
+{
+	if(IsNull(pt.x) || IsNull(pt.y))
+		return;
+//	RTIMING("AreaTool::LineToRawClip");
+#if DEBUG_AREA
+	Pointf anchor(-747102, -1043537);
+	bool show = (pt | anchor) <= 500 || (last_point | anchor) <= 500;
+#endif
+	Pointf next_phys = plotter.LtoP(pt);
+#if CHECK_DIST
+	if(fabs(next_phys.x - last_phys.x) < 1 && fabs(next_phys.y - last_phys.y) < 1)
+		return;
+#endif//CHECK_DIST
+	last_point = pt;
+	bool next_in = (next_phys.x >= plotter.clip.left && next_phys.x <= plotter.clip.right
+		&&          next_phys.y >= plotter.clip.top  && next_phys.y <= plotter.clip.bottom);
+#if DEBUG_AREA
+	int vc = vertices.GetCount();
+	if(show)
+	{
+		LOG("[" << vc << "/" << begin_index << "] AreaTool::LineToRawClip " << pt << ", next_phys " << next_phys
+			<< ", top = " << vertices.Top() << ", last_in " << last_in << ", next_in " << next_in);
+	}
+#endif
+	if(next_in && last_in)
+	{
+		Point ppt = PointfToPoint(next_phys);
+		if(ppt != vertices.Top())
+		{
+			if(prev_ghost)
+				ghost_lines.Add(vertices.GetCount());
+			vertices.Add(ppt);
+		}
+		last_phys = next_phys;
+		last_in = next_in;
+	}
+	else
+	{
+		Pointf A = last_phys, B = next_phys;
+		bool clipped = ClipLine(A, B, plotter.clip);
+		Point cb = ClipBind(clipped ? B : next_phys);
+		Point ca = clipped ? ClipBind(A) : cb;
+		if(vertices.GetCount() > begin_index || clipped)
+			SkipTo(ca, (next_phys - last_phys) % (clip_center - last_phys) >= 0);
+		if(clipped && cb != vertices.Top())
+		{
+			if(prev_ghost)
+				ghost_lines.Add(vertices.GetCount());
+			vertices.Add(cb);
+		}
+		last_phys = next_phys;
+		last_in = (clipped && B == next_phys);
+	}
+#if DEBUG_AREA
+	Point check = plotter.LtoP(anchor);
+	for(int t = vc; t < vertices.GetCount(); t++)
+		if(tabs(vertices[t].x - check.x) <= 50 && tabs(vertices[t].y - check.y) <= 50)
+		{
+			LOG("AreaTool::LineToRawClip / orphan [" << t << "] = " << vertices[t] << " for " << pt);
+		}
+
+	if(show)
+	{
+		String plist;
+		while(vc < vertices.GetCount())
+			plist << " " << vertices[vc++];
+		LOG("//AreaTool::LineToRawClip " << plist);
+	}
+#endif
+}
+
+void AreaTool::SkipTo(Point pt, bool clockwise)
+{
+/*
+	if(vertices.GetCount() == begin_index)
+	{
+		vertices.Add(pt);
+		return;
+	}
+*/
+	Point la = vertices.Top();
+	if(la == pt)
+		return;
+
+//	Size diff(pt.x + la.x - plotter.clip.left - plotter.clip.right, pt.y + la.y - plotter.clip.top - plotter.clip.bottom);
+	if(la.y <= plotter.clip.top)
+	{
+		if(pt.y <= plotter.clip.top)
+			Horz(pt.x);
+		else if(pt.y >= plotter.clip.bottom)
+			Horz(clockwise ? plotter.clip.right : plotter.clip.left).Vert(plotter.clip.bottom).Horz(pt.x);
+		else if(pt.x <= plotter.clip.left)
+			Horz(plotter.clip.left).Vert(pt.y);
+		else if(pt.x >= plotter.clip.right)
+			Horz(plotter.clip.right).Vert(pt.y);
+		else
+			NEVER();
+	}
+	else if(la.y >= plotter.clip.bottom)
+	{
+		if(pt.y <= plotter.clip.top)
+			Horz(clockwise ? plotter.clip.left : plotter.clip.right).Vert(plotter.clip.top).Horz(pt.x);
+		else if(pt.y >= plotter.clip.bottom)
+			Horz(pt.x);
+		else if(pt.x <= plotter.clip.left)
+			Horz(plotter.clip.left).Vert(pt.y);
+		else if(pt.x >= plotter.clip.right)
+			Horz(plotter.clip.right).Vert(pt.y);
+		else
+			NEVER();
+	}
+	else if(la.x <= plotter.clip.left)
+	{
+		if(pt.y <= plotter.clip.top)
+			Vert(plotter.clip.top).Horz(pt.x);
+		else if(pt.y >= plotter.clip.bottom)
+			Vert(plotter.clip.bottom).Horz(pt.x);
+		else if(pt.x <= plotter.clip.left)
+			Vert(pt.y);
+		else if(pt.x >= plotter.clip.right)
+			Vert(clockwise ? plotter.clip.top : plotter.clip.bottom).Horz(plotter.clip.right).Vert(pt.y);
+		else
+			NEVER();
+	}
+	else if(la.x >= plotter.clip.right)
+	{
+		if(pt.y <= plotter.clip.top)
+			Vert(plotter.clip.top).Horz(pt.x);
+		else if(pt.y >= plotter.clip.bottom)
+			Vert(plotter.clip.bottom).Horz(pt.x);
+		else if(pt.x <= plotter.clip.left)
+			Vert(clockwise ? plotter.clip.bottom : plotter.clip.top).Horz(plotter.clip.left).Vert(pt.y);
+		else if(pt.x >= plotter.clip.right)
+			Vert(pt.y);
+		else
+			NEVER();
+	}
+	else
+		NEVER(); // invalid case
+}
+
+void AreaTool::Flush()
+{
+	if((vertices.GetCount() - begin_index >= 3) && !simple)
+	{
+		ASSERT(!IsNull(last_start));
+		LineTo(last_start);
+	}
+	int add = vertices.GetCount() - begin_index;
+	ASSERT(add >= 0);
+	if(add >= 2 && vertices.Top() == vertices[begin_index])
+	{
+		vertices.Drop(); // remove superfluous end point
+		if(!ghost_lines.IsEmpty() && ghost_lines.Top() == vertices.GetCount())
+			ghost_lines.Drop();
+		add--;
+	}
+	if(add <= 2)
+	{
+		vertices.SetCountR(begin_index);
+		while(!ghost_lines.IsEmpty() && ghost_lines.Top() >= begin_index)
+			ghost_lines.Drop();
+	}
+	else
+	{
+		counts.Add(add);
+		begin_index = vertices.GetCount();
+	}
+}
+
+AreaTool& AreaTool::Horz(int x)
+{
+	int count = vertices.GetCount() - begin_index;
+	ASSERT(count > 0);
+	Point *p = vertices.End();
+	int y = p[-1].y;
+	if(count >= 2 && y == p[-2].y)
+	{
+		while(count > 2 && y == p[-3].y)
+		{
+			count--;
+			p--;
+		}
+		p[-1].x = x;
+		int end = begin_index + count;
+		vertices.SetCountR(end);
+		while(!ghost_lines.IsEmpty() && ghost_lines.Top() >= end)
+			ghost_lines.Drop();
+	}
+	else
+	{
+		if(prev_ghost)
+			ghost_lines.Add(vertices.GetCount());
+		vertices.Add(Point(x, y));
+	}
+	return *this;
+}
+
+AreaTool& AreaTool::Vert(int y)
+{
+	int count = vertices.GetCount() - begin_index;
+	ASSERT(count > 0);
+	Point *p = vertices.End();
+	int x = p[-1].x;
+	if(count >= 2 && x == p[-2].x)
+	{
+		while(count > 2 && x == p[-3].x)
+		{
+			count--;
+			p--;
+		}
+		p[-1].y = y;
+		int end = begin_index + count;
+		vertices.SetCountR(end);
+		while(!ghost_lines.IsEmpty() && ghost_lines.Top() >= end)
+			ghost_lines.Drop();
+	}
+	else
+	{
+		if(prev_ghost)
+			ghost_lines.Add(vertices.GetCount());
+		vertices.Add(Point(x, y));
+	}
+	return *this;
+}
+
+void AreaTool::Set(const Plotter& _info, Color _fill_color, uint64 _fill_pattern,
+	const String& outline_pattern, Color outline_color, int outline_width, double outline_dash)
+{
+	if(outline_width < 0)
+		outline_width = DotsToPixels(*_info.draw, -outline_width);
+	const PathStyle& path = _info.GetPath(outline_pattern);
+	plotter = Plotter(_info, int(outline_width * path.width) + 2);
+	clip_center = Pointf(plotter.clip.CenterPoint());
+	fill_color = _fill_color;
+	fill_pattern = _fill_pattern;
+	double pw;
+	Color pc;
+	bool is_solid = path.IsSolid(pw, pc);
+	outline_pixels = (outline_width >= 0 ? outline_width : fround(_info.GetPixelsPerDot() * -outline_width));
+	pw *= outline_width;
+	is_line = !path.IsEmpty();
+	std_pen = !is_line || IsNull(outline_color)
+	|| (ghost_lines.IsEmpty() && is_solid && pw < (_info.draw->Dots() ? 20 : 2.5) /*&& !IsNull(fill_color)*/ && !fill_pattern);
+	if(std_pen)
+//		|| *outline_pattern == 0 && !fill_pattern && outline_width <= 1)
+	{
+		fill_outline_color = is_solid ? Nvl(pc, outline_color) : Color(Null);
+		fill_outline_style = is_solid ? fround(pw) : 0;
+		if(_info.draw->Pixels() && outline_width > 1)
+		{
+			thick_outline_color = fill_outline_color;
+			fill_outline_color = Null;
+			fill_outline_style = 0;
+		}
+	}
+	else
+	{
+		raw_outline.Set(*plotter.draw, path, outline_color, outline_width, outline_dash, true);
+		fill_outline_color = thick_outline_color = Null;
+		fill_outline_style = 0;
+	}
+	point_pixels = outline_pixels;
+	point_color = Nvl(Nvl(pc, outline_color), fill_color);
+	Clear();
+#if DEBUG_AREA
+	LOG("AreaTool::Set, phys clip = " << plotter.clip << ", log clip = " << plotter.logclip
+		<< ", a = " << plotter.physical.a);
+#endif
+}
+
+void AreaTool::FlushFill()
+{
+	Flush();
+	if(IsFill() && disjunct_begin_index < vertices.GetCount())
+	{
+		disjunct_counts.Add(vertices.GetCount() - disjunct_begin_index);
+		disjunct_begin_index = vertices.GetCount();
+	}
+	if(vertices.GetCount() >= FLUSH_BATCH)
+		Paint();
+}
+
+void AreaTool::Paint()
+{
+	if(!plotter.draw)
+		return;
+	if(!(plotter.clip && plotter.draw->GetClip()))
+	{
+		Clear();
+		return;
+	}
+	Flush();
+	if(vertices.IsEmpty() || counts.IsEmpty())
+	{
+		Clear();
+		return;
+	}
+	if(disjunct_begin_index < vertices.GetCount())
+		disjunct_counts.Add(vertices.GetCount() - disjunct_begin_index);
+	if(!IsNull(fill_color) || !IsNull(fill_outline_color))
+		DrawPolyPolyPolygon(*plotter.draw, vertices, counts, disjunct_counts,
+			fill_color, fill_outline_style, fill_outline_color, fill_pattern);
+	if(!IsNull(thick_outline_color))
+		DrawFatPolyPolygonOutline(*plotter.draw, vertices, counts,
+			thick_outline_color, outline_pixels);
+/*
+	else if(fill_pattern)
+	{
+//		RTIMING("AreaTool::Fill(pattern)");
+		HDC hdc = *plotter.draw;
+		int old_rop = SetROP2(hdc, R2_MASKPEN);
+		HGDIOBJ old_brush = SelectObject(hdc, fill_pattern.GetBrush(Null, Null));
+		int old_color = SetTextColor(hdc, Black);
+		int old_bk = SetBkColor(hdc, White);
+		plotter.draw->SetDrawPen(PEN_NULL, Black);
+		if(counts.GetCount() == 1)
+			Polygon(*plotter.draw, (const POINT *)vertices.Begin(), vertices.GetCount());
+		else
+			PolyPolygon(*plotter.draw, (const POINT *)vertices.Begin(), counts.Begin(), counts.GetCount());
+		SetROP2(hdc, R2_MERGEPEN);
+		if(IsNull(fill_color)) // use color fill brush
+			SelectObject(hdc, fill_pattern.GetBrush(Null, Black));
+		else
+		{ // just change text color
+			SetTextColor(hdc, fill_color);
+			SetBkColor(hdc, Black);
+		}
+		if(counts.GetCount() == 1)
+			Polygon(*plotter.draw, (const POINT *)vertices.Begin(), vertices.GetCount());
+		else
+			PolyPolygon(*plotter.draw, (const POINT *)vertices.Begin(), counts.Begin(), counts.GetCount());
+		SetTextColor(hdc, old_color);
+		SetBkColor(hdc, old_bk);
+		SetROP2(hdc, old_rop);
+		SelectObject(hdc, old_brush);
+	}
+	else if(!IsNull(fill_color) || (std_pen && raw_outline_style != PEN_NULL))
+	{ // simple fill
+//		RTIMING("AreaTool::Fill(solid color)");
+		plotter.draw->SetDrawPen(raw_outline_style, raw_outline_color);
+		HGDIOBJ old_brush = 0;
+		if(IsNull(fill_color))
+		{
+			static HGDIOBJ null_brush = GetStockObject(NULL_BRUSH);
+			old_brush = SelectObject(*plotter.draw, null_brush);
+		}
+		else
+			plotter.draw->SetColor(fill_color);
+		if(counts.GetCount() == 1)
+			Polygon(*plotter.draw, (const POINT *)vertices.Begin(), vertices.GetCount());
+		else
+			PolyPolygon(*plotter.draw, (const POINT *)vertices.Begin(), counts.Begin(), counts.GetCount());
+		if(old_brush)
+			SelectObject(*plotter.draw, old_brush);
+	}
+*/
+	if(!std_pen)
+	{ // manual outline
+//		RTIMING("AreaTool::Outline()");
+		if(ghost_lines.IsEmpty())
+		{
+			const Point *p = vertices.Begin();
+			for(int i = 0; i < counts.GetCount(); i++)
+			{
+				const Point *b = p, *n = p + counts[i];
+				raw_outline.MoveTo(*p);
+				while(++p < n)
+					raw_outline.LineTo(*p);
+/*
+				if((p[0].x >= plotter.clip.right || p[0].x <= plotter.clip.left) && p[-1].x == p[0].x
+				|| (p[0].y >= plotter.clip.bottom || p[0].y <= plotter.clip.top) && p[-1].y == p[0].y)
+					outline.MoveTo(*p);
+				else
+					outline.LineTo(*p);
+*/
+//			if((b[0].x >= plotter.clip.right || b[0].x <= plotter.clip.left) && p[-1].x == b[0].x
+//			|| (b[0].y >= plotter.clip.bottom || b[0].y <= plotter.clip.top) && p[-1].y == b[0].y)
+//				;
+//			else
+//				outline.LineTo(*b);
+			}
+		}
+		else
+		{
+			int gl = 0;
+			int ngl = (gl >= ghost_lines.GetCount() ? vertices.GetCount() : ghost_lines[gl]);
+			int v = 0;
+			for(int i = 0; i < counts.GetCount(); i++)
+			{
+				int nv = v + counts[i];
+				if(nv >= v + 2)
+				{
+					for(raw_outline.MoveTo(vertices[nv - 1]); v < nv; v++)
+					{
+						if(ngl == v)
+						{
+							ngl = (++gl >= ghost_lines.GetCount() ? vertices.GetCount() : ghost_lines[gl]);
+							raw_outline.MoveTo(vertices[v]);
+						}
+						else
+							raw_outline.LineTo(vertices[v]);
+					}
+				}
+				else if(ngl < nv)
+					ngl = (++gl >= ghost_lines.GetCount() ? vertices.GetCount() : ghost_lines[gl]);
+				v = nv;
+			}
+		}
+		raw_outline.Paint();
+	}
+	Clear();
+}
+
+class EmptyMarker : public MarkTool::Marker
+{
+public:
+	virtual void Paint(Draw& draw, const Vector<Point>& pt) {}
+	virtual int  GetSize() const                            { return 0; }
+};
+
+
+One<MarkTool::Marker> MarkTool::Empty()
+{
+	return new EmptyMarker;
+}
+
+class ImageMarker : public MarkTool::Marker
+{
+public:
+	ImageMarker(const Image& img, int size, Color color, bool antialias, bool ignore_hotspot);
+
+	virtual void  Paint(Draw& draw, const Vector<Point>& pt);
+	virtual int   GetSize() const { return linear_size; }
+
+private:
+	Image         img;
+	Size          imgsize;
+	Size          outsize;
+	Point         hotspot;
+	int           linear_size;
+	Color         color;
+//	bool          body;
+	bool          mask;
+	bool          antialias;
+	bool          ignore_hotspot;
+};
+
+ImageMarker::ImageMarker(const Image& srcimg, int size_, Color color_, bool antialias_, bool ignore_hotspot_)
+: imgsize(srcimg.GetSize())
+, color(color_)
+, antialias(antialias_)
+, ignore_hotspot(ignore_hotspot_)
+, outsize(0, 0)
+{
+	hotspot = (ignore_hotspot ? (Point)(srcimg.GetSize() >> 1) : srcimg.GetHotSpot());
+	if(imgsize.cx > 0 && imgsize.cy > 0) {
+		hotspot = iscale(hotspot, size_, max(imgsize.cx, imgsize.cy));
+		if(imgsize.cx > imgsize.cy)
+			outsize = Size(size_, iscale(size_, imgsize.cy, imgsize.cx));
+		else
+			outsize = Size(iscale(size_, imgsize.cx, imgsize.cy), size_);
+		if(imgsize == outsize || outsize.cx >= imgsize.cx && outsize.cy >= imgsize.cy && !antialias)
+			img = srcimg;
+		else {
+			Size xsize = 2 * imgsize;
+			while(2 * xsize.cx <= outsize.cx && 2 * xsize.cy <= outsize.cy && xsize.cx <= 256 && xsize.cy <= 256)
+				xsize <<= 2;
+			Size tmpsize = min(outsize, xsize);
+//			if(antialias)
+			img = Rescale(srcimg, tmpsize);
+			// else RescaleNoAA !! todo
+		}
+		imgsize = img.GetSize();
+	}
+	linear_size = max(
+		max(hotspot.x, outsize.cx - hotspot.x),
+		max(hotspot.y, outsize.cy - hotspot.y));
+	mask = (srcimg.GetKind() == IMAGE_OPAQUE);
+}
+
+void ImageMarker::Paint(Draw& draw, const Vector<Point>& pts)
+{
+	if(img.IsEmpty())
+		return;
+	for(int t = 0; t < pts.GetCount(); t++) {
+		Point pt = pts[t] - hotspot;
+		draw.DrawImage(Rect(pt, outsize), img);
+	}
+}
+
+One<MarkTool::Marker> MarkTool::Picture(Image pic, int size, Color color, bool antialias, bool ignore_hotspot)
+{
+	return new ImageMarker(pic, size, color, antialias, ignore_hotspot);
+}
+
+class AreaMarker : public MarkTool::Marker
+{
+public:
+	AreaMarker(int size, Color color, Color outline, int outline_width)
+	: size(size), color(color), outline(outline), outline_width(outline_width)
+	{ out_size = (size + outline_width) >> 1; }
+
+	virtual int  GetSize() const { return out_size; }
+
+public:
+	int          size;
+	Color        color;
+	Color        outline;
+	int          outline_width;
+	int          out_size;
+};
+
+class SquareMarker : public AreaMarker
+{
+public:
+	SquareMarker(int size, Color color, Color outline, int outline_width)
+	: AreaMarker(size, color, outline, outline_width) {}
+
+	virtual void Paint(Draw& draw, const Vector<Point>& pt);
+};
+
+void SquareMarker::Paint(Draw& draw, const Vector<Point>& pt)
+{
+	Vector<Point> outpt;
+	int obj = pt.GetCount();
+	outpt.SetCount(4 * obj);
+	Point *op = outpt.Begin();
+	int half = size >> 1;
+	for(const Point *ip = pt.Begin(), *ie = pt.End(); ip < ie; ip++, op += 4)
+	{
+		op[0].x = op[3].x = ip->x - half;
+		op[0].y = op[1].y = ip->y - half;
+		op[1].x = op[2].x = ip->x + half;
+		op[2].y = op[3].y = ip->y + half;
+	}
+	Vector<int> outix;
+	outix.SetCount(obj, 4);
+	DrawPolygons(draw, outpt, outix, color, outline_width, outline);
+}
+
+One<MarkTool::Marker> MarkTool::Square(int size, Color color, Color outline, int outline_width)
+{
+	return new SquareMarker(size, color, outline, outline_width);
+}
+
+class Square45Marker : public AreaMarker
+{
+public:
+	Square45Marker(int size, Color color, Color outline, int outline_width)
+	: AreaMarker(size, color, outline, outline_width) {}
+
+	virtual void Paint(Draw& draw, const Vector<Point>& pt);
+};
+
+void Square45Marker::Paint(Draw& draw, const Vector<Point>& pt)
+{
+	Vector<Point> outpt;
+	int obj = pt.GetCount();
+	outpt.SetCount(4 * obj);
+	Point *op = outpt.Begin();
+	int half = size >> 1;
+	for(const Point *ip = pt.Begin(), *ie = pt.End(); ip < ie; ip++, op += 4)
+	{
+		op[0].x = ip->x - half;
+		op[0].y = op[2].y = ip->y;
+		op[1].x = op[3].x = ip->x;
+		op[1].y = ip->y + half;
+		op[2].x = ip->x + half;
+		op[3].y = ip->y - half;
+	}
+	Vector<int> outix;
+	outix.SetCount(obj, 4);
+	DrawPolygons(draw, outpt, outix, color, outline_width, outline);
+}
+
+One<MarkTool::Marker> MarkTool::Square45(int size, Color color, Color outline, int outline_width)
+{
+	return new Square45Marker(size, color, outline, outline_width);
+}
+
+class TriangleMarker : public AreaMarker
+{
+public:
+	TriangleMarker(int size, Color color, Color outline, int outline_width)
+	: AreaMarker(size, color, outline, outline_width) {}
+
+	virtual void Paint(Draw& draw, const Vector<Point>& pt);
+};
+
+void TriangleMarker::Paint(Draw& draw, const Vector<Point>& pt)
+{
+	int half = size >> 1;
+	Vector<Point> outpt;
+	int obj = pt.GetCount();
+	outpt.SetCount(3 * obj);
+	Point *op = outpt.Begin();
+	for(const Point *ip = pt.Begin(), *ie = pt.End(); ip < ie; ip++, op += 3)
+	{
+		op[0].x = ip->x - half;
+		op[1].x = ip->x + half;
+		op[0].y = op[1].y = ip->y + half + 1;
+		op[2].x = ip->x;
+		op[2].y = ip->y - half;
+	}
+	Vector<int> outix;
+	outix.SetCount(obj, 3);
+	DrawPolygons(draw, outpt, outix, color, outline_width, outline);
+}
+
+One<MarkTool::Marker> MarkTool::Triangle(int size, Color color, Color outline, int outline_width)
+{
+	return new TriangleMarker(size, color, outline, outline_width);
+}
+
+class NablaMarker : public AreaMarker
+{
+public:
+	NablaMarker(int size, Color color, Color outline, int outline_width)
+	: AreaMarker(size, color, outline, outline_width) {}
+
+	virtual void Paint(Draw& draw, const Vector<Point>& pt);
+};
+
+void NablaMarker::Paint(Draw& draw, const Vector<Point>& pt)
+{
+	int half = size >> 1;
+	Vector<Point> outpt;
+	int obj = pt.GetCount();
+	outpt.SetCount(3 * obj);
+	Point *op = outpt.Begin();
+	for(const Point *ip = pt.Begin(), *ie = pt.End(); ip < ie; ip++, op += 3)
+	{
+		op[0].x = ip->x - half;
+		op[1].x = ip->x + half;
+		op[0].y = op[1].y = ip->y - half;
+		op[2].x = ip->x;
+		op[2].y = ip->y + half + 1;
+	}
+	Vector<int> outix;
+	outix.SetCount(obj, 3);
+	DrawPolygons(draw, outpt, outix, color, outline_width, outline);
+}
+
+One<MarkTool::Marker> MarkTool::Nabla(int size, Color color, Color outline, int outline_width)
+{
+	return new NablaMarker(size, color, outline, outline_width);
+}
+
+class CircleMarker : public AreaMarker
+{
+public:
+	CircleMarker(int size, Color color, Color outline, int outline_width)
+	: AreaMarker(size, color, outline, outline_width) {}
+
+	virtual void Paint(Draw& draw, const Vector<Point>& pt);
+};
+
+void CircleMarker::Paint(Draw& draw, const Vector<Point>& pt)
+{
+	int half = size >> 1;
+	for(int t = 0; t < pt.GetCount(); t++)
+		draw.DrawEllipse(RectC(pt[t].x - half, pt[t].y - half, size, size),
+			color, outline_width, outline);
+}
+
+One<MarkTool::Marker> MarkTool::Circle(int size, Color color, Color outline, int outline_width)
+{
+	return new CircleMarker(size, color, outline, outline_width);
+}
+
+class CrossMarker : public AreaMarker
+{
+public:
+	CrossMarker(int size, Color outline, int outline_width)
+	: AreaMarker(size, Null, outline, outline_width) {}
+
+	virtual void Paint(Draw& draw, const Vector<Point>& pt);
+};
+
+void CrossMarker::Paint(Draw& draw, const Vector<Point>& pt)
+{
+	int half = size >> 1;
+	Vector<Point> out;
+	out.SetCount(pt.GetCount() * 4);
+	Point *op = out.Begin();
+	for(const Point *ip = pt.Begin(), *ie = pt.End(); ip < ie; ip++, op += 4)
+	{
+		op[0].x = ip->x - half;
+		op[1].x = ip->x + half;
+		op[0].y = op[1].y = ip->y;
+		op[2].x = op[3].x = ip->x;
+		op[2].y = ip->y - half;
+		op[3].y = ip->y + half;
+	}
+	Vector<int> seg;
+	seg.SetCount(2 * pt.GetCount(), 2);
+	draw.DrawPolyPolyline(out, seg, outline_width, outline);
+}
+
+One<MarkTool::Marker> MarkTool::Cross(int size, Color outline, int outline_width)
+{
+	return new CrossMarker(size, outline, outline_width);
+}
+
+class DiamondMarker : public AreaMarker
+{
+public:
+	DiamondMarker(int size, Color color, Color outline, int outline_width);
+
+	virtual void Paint(Draw& draw, const Vector<Point>& pt);
+
+private:
+	int x2, y2, x4;
+};
+
+DiamondMarker::DiamondMarker(int size, Color color, Color outline, int outline_width)
+: AreaMarker(size, color, outline, outline_width)
+{
+	y2 = size >> 1;
+	x2 = size * 17 >> 5;
+	x4 = x2 >> 1;
+}
+
+void DiamondMarker::Paint(Draw& draw, const Vector<Point>& pt)
+{
+	Vector<Point> out;
+	out.SetCount(pt.GetCount() * 5);
+	Point *op = out.Begin();
+	for(const Point *ip = pt.Begin(), *ie = pt.End(); ip < ie; ip++, op += 5)
+	{
+		op[0].x = ip->x - x4; op[0].y = ip->y + y2;
+		op[1].x = ip->x + x4; op[1].y = ip->y + y2;
+		op[2].x = ip->x + x2; op[2].y = ip->y;
+		op[3].x = ip->x;      op[3].y = ip->y - y2;
+		op[4].x = ip->x - x2; op[4].y = ip->y;
+	}
+	Vector<int> seg;
+	seg.SetCount(pt.GetCount(), 5);
+	DrawPolygons(draw, out, seg, color, outline_width, outline);
+}
+
+One<MarkTool::Marker> MarkTool::Diamond(int size, Color color, Color outline, int outline_width)
+{
+	return new DiamondMarker(size, color, outline, outline_width);
+}
+
+class HexagonMarker : public AreaMarker
+{
+public:
+	HexagonMarker(int size, Color color, Color outline, int outline_width);
+
+	virtual void Paint(Draw& draw, const Vector<Point>& pt);
+
+private:
+	int x2, y2, x4;
+};
+
+HexagonMarker::HexagonMarker(int size, Color color, Color outline, int outline_width)
+: AreaMarker(size, color, outline, outline_width)
+{
+	y2 = size >> 1;
+	x2 = size * 19 >> 5;
+	x4 = x2 >> 1;
+}
+
+void HexagonMarker::Paint(Draw& draw, const Vector<Point>& pt)
+{
+	Vector<Point> out;
+	out.SetCount(pt.GetCount() * 6);
+	Point *op = out.Begin();
+	for(const Point *ip = pt.Begin(), *ie = pt.End(); ip < ie; ip++, op += 6)
+	{
+		op[0].x = ip->x - x4; op[0].y = ip->y + y2;
+		op[1].x = ip->x + x4; op[1].y = ip->y + y2;
+		op[2].x = ip->x + x2; op[2].y = ip->y;
+		op[3].x = ip->x + x4; op[3].y = ip->y - y2;
+		op[4].x = ip->x - x4; op[4].y = ip->y - y2;
+		op[5].x = ip->x - x2; op[5].y = ip->y;
+	}
+	Vector<int> seg;
+	seg.SetCount(pt.GetCount(), 6);
+	DrawPolygons(draw, out, seg, color, outline_width, outline);
+}
+
+One<MarkTool::Marker> MarkTool::Hexagon(int size, Color color, Color outline, int outline_width)
+{
+	return new HexagonMarker(size, color, outline, outline_width);
+}
+
+class StarMarker : public AreaMarker
+{
+public:
+	StarMarker(int size, Color color, Color outline, int outline_width);
+
+	virtual void Paint(Draw& draw, const Vector<Point>& pt);
+
+private:
+	int x2, x4, X2, X4, y2, y4, Y2, Y4, dy;
+};
+
+StarMarker::StarMarker(int size, Color color, Color outline, int outline_width)
+: AreaMarker(size, color, outline, outline_width)
+{
+	y2 = size >> 1;
+	x2 = size * 18 >> 5;
+	x4 = size * 11 >> 5;
+	Y2 = y2 * 5 >> 4;
+	Y4 = Y2 * 5 >> 4;
+	X2 = x2 * 5 >> 4;
+	X4 = x4 * 5 >> 4;
+	dy = size / 18;
+}
+
+void StarMarker::Paint(Draw& draw, const Vector<Point>& pt)
+{
+	Vector<Point> out;
+	out.SetCount(pt.GetCount() * 10);
+	Point *op = out.Begin();
+	for(const Point *ip = pt.Begin(), *ie = pt.End(); ip < ie; ip++, op += 10)
+	{
+		int sy = ip->y + dy;
+		op[0].x = ip->x - x4; op[0].y = ip->y + y2;
+		op[1].x = ip->x;      op[1].y = sy      + Y2;
+		op[2].x = ip->x + x4; op[2].y = ip->y + y2;
+		op[3].x = ip->x + X2; op[3].y = sy      + Y4;
+		op[4].x = ip->x + x2; op[4].y = ip->y - Y4;
+		op[5].x = ip->x + X4; op[5].y = sy      - Y2;
+		op[6].x = ip->x;      op[6].y = ip->y - y2;
+		op[7].x = ip->x - X4; op[7].y = sy      - Y2;
+		op[8].x = ip->x - x2; op[8].y = ip->y - Y4;
+		op[9].x = ip->x - X2; op[9].y = sy      + Y4;
+	}
+	Vector<int> seg;
+	seg.SetCount(pt.GetCount(), 10);
+	DrawPolygons(draw, out, seg, color, outline_width, outline);
+}
+
+One<MarkTool::Marker> MarkTool::Star(int size, Color color, Color outline, int outline_width)
+{
+	return new StarMarker(size, color, outline, outline_width);
+}
+
+class LetterMarker : public MarkTool::Marker
+{
+public:
+	LetterMarker(char ascii, int angle, Font font, Color color, Color outline);
+
+	virtual void Paint(Draw& draw, const Vector<Point>& pt);
+	virtual int  GetSize() const;
+
+private:
+	void         PaintSimple(Point pt);
+	void         PaintOutline(Point pt);
+	void         PaintImage(Point pt);
+	void         PaintEmpty(Point pt);
+
+private:
+	Draw         *draw;
+	char          ascii;
+	Font          font;
+	Font          raw_font;
+	Color         color;
+	Color         outline;
+//	Image         image;
+//	ImageDraw     data;
+//	ImageMaskDraw mask;
+	int           angle;
+	int           img_size;
+	int           raw_angle;
+	Size          offset;
+
+//	HFONT        new_font, old_font;
+//	int          old_align;
+};
+
+LetterMarker::LetterMarker(char ascii, int angle, Font font, Color color, Color outline)
+: ascii(ascii)
+, angle(angle)
+, font(font)
+, color(color)
+, outline(outline)
+{
+}
+
+int LetterMarker::GetSize() const
+{
+	Font raw = font;
+	if(raw.GetHeight() >= 0)
+		raw.Height(-raw.GetHeight());
+	else
+		raw.Height(-DotsToPixels(ScreenInfo(), -raw.GetHeight()));
+	FontInfo info = raw.Info();
+	return fceil(hypot(info[(byte)ascii], info.GetHeight())) >> 1;
+}
+
+static void DrawTextWithMask(Draw& data, Draw& mask, int x, int y, char letter, int angle, Font font, Color cdata, Color cmask)
+{
+	data.DrawText(x, y, angle, &letter, font, cdata, 1);
+	mask.DrawText(x, y, angle, &letter, font, cmask, 1);
+}
+
+void LetterMarker::Paint(Draw& draw, const Vector<Point>& pt)
+{
+	double ang = angle * (M_PI / 180), c = cos(ang), s = sin(ang);
+
+	raw_font = font;
+	if(raw_font.GetHeight() >= 0)
+		raw_font.Height(-raw_font.GetHeight());
+	else
+		raw_font.Height(-DotsToPixels(draw, -raw_font.GetHeight()));
+	Size size = GetTextSize(&ascii, raw_font, 1);
+//	offset = Pointf(size).Rotated(-angle * M_PI / 1800.0).AsSize() >> 1;
+
+/*
+	new_font = CreateFont(raw_font.GetHeight(),
+		                  0, 10 * angle, 10 * angle, raw_font.IsBold() ? FW_BOLD : FW_NORMAL,
+		                  raw_font.IsItalic(), raw_font.IsUnderline(), raw_font.IsStrikeout(),
+						  raw_font.GetCharSet() ? raw_font.GetCharSet() : DEFAULT_CHARSET,
+						  OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS,
+						  DEFAULT_QUALITY, DEFAULT_PITCH|FF_DONTCARE,
+						  raw_font.GetFaceName());
+	draw->BeginGdi();
+	old_font = (HFONT)SelectObject(*draw, new_font);
+*/
+//	Size size;
+//	GetTextExtentPoint32(*draw, &ascii, 1, &size);
+
+	raw_angle = 10 * angle;
+	offset.cx = fround((size.cx * c + size.cy * s) * 0.5);
+	offset.cy = fround((size.cx * s - size.cy * c) * -0.5);
+
+	if(IsNull(color))
+		;
+	else if(IsNull(outline))
+	{
+		for(int i = 0; i < pt.GetCount(); i++)
+			draw.DrawText(pt[i].x - offset.cx, pt[i].y - offset.cy, raw_angle, &ascii, raw_font, color, 1);
+	}
+	else
+	{
+		for(int i = 0; i < pt.GetCount(); i++)
+		{
+			Point pos = pt[i] - offset;
+			draw.DrawText(pos.x + 1, pos.y + 0, raw_angle, &ascii, raw_font, outline, 1);
+			draw.DrawText(pos.x + 0, pos.y - 1, raw_angle, &ascii, raw_font, outline, 1);
+			draw.DrawText(pos.x - 1, pos.y + 0, raw_angle, &ascii, raw_font, outline, 1);
+			draw.DrawText(pos.x + 0, pos.y + 1, raw_angle, &ascii, raw_font, outline, 1);
+			draw.DrawText(pos.x + 0, pos.y + 0, raw_angle, &ascii, raw_font, color, 1);
+		}
+	}
+
+/*
+	if(!IsNull(outline))
+	{
+		if(IsNull(color))
+		{ // generate image with outline
+			img_size = abs(size);
+			image = Image(*draw, img_size, img_size);
+			data.Open(*draw, image);
+			mask.Open(image);
+			Point pos((img_size >> 1) - offset.cx, (img_size >> 1) - offset.cy);
+			data.DrawRect(0, 0, img_size, img_size, Black);
+			mask.DrawRect(0, 0, img_size, img_size, White);
+			DrawTextWithMask(data, mask, pos.x + 1, pos.y + 0, ascii, raw_angle, raw_font, outline, Black);
+			DrawTextWithMask(data, mask, pos.x + 0, pos.y - 1, ascii, raw_angle, raw_font, outline, Black);
+			DrawTextWithMask(data, mask, pos.x - 1, pos.y + 0, ascii, raw_angle, raw_font, outline, Black);
+			DrawTextWithMask(data, mask, pos.x + 0, pos.y + 1, ascii, raw_angle, raw_font, outline, Black);
+			DrawTextWithMask(data, mask, pos.x + 0, pos.y + 0, ascii, raw_angle, raw_font, Black, White);
+			offset.cx = offset.cy = img_size >> 1;
+			PaintRaw = &LetterMarker::PaintImage;
+		}
+		else
+			PaintRaw = &LetterMarker::PaintOutline;
+	}
+*/
+
+//	old_align = SetTextAlign(*draw, TA_LEFT | TA_TOP);
+//	SetTextColor(*draw, color);
+}
+
+One<MarkTool::Marker> MarkTool::Letter(char ascii, int angle, Font font, Color color, Color outline)
+{
+	return new LetterMarker(ascii, angle, font, color, outline);
+}
+
+One<MarkTool::Marker> MarkTool::StandardMarker(int type, int size, Color color, Color outline, int outline_width)
+{
+	switch(type)
+	{
+	case CIRCLE:   return Circle(size, color, outline, outline_width);
+	case SQUARE:   return Square(size, color, outline, outline_width);
+	case TRIANGLE: return Triangle(size, color, outline, outline_width);
+	case CROSS:    return Cross(size, outline, outline_width);
+	case DIAMOND:  return Diamond(size, color, outline, outline_width);
+	case HEXAGON:  return Hexagon(size, color, outline, outline_width);
+	case STAR:     return Star(size, color, outline, outline_width);
+	case SQUARE45: return Square45(size, color, outline, outline_width);
+	case NABLA:    return Nabla(size, color, outline, outline_width);
+	default:       return Empty();
+	}
+}
+
+MarkTool::MarkTool()
+{
+	PutRaw = &MarkTool::PutDummy;
+}
+
+MarkTool::~MarkTool() {}
+
+void MarkTool::Set(const Plotter& info, One<Marker> _marker)
+{
+	marker = _marker;
+	size = marker->GetSize();
+	plotter.Set(info, size);
+	Clear();
+}
+
+bool MarkTool::SetExtent(const Rectf& rc)
+{
+	if(plotter.IntersectsLClip(rc)) {
+		Rectf crc = plotter.LtoP(rc);
+		if(plotter.InPClip(crc))
+			PutRaw = &MarkTool::PutSimple;
+		else
+			PutRaw = &MarkTool::PutClip;
+		return true;
+	}
+	else
+		return false;
+}
+
+void MarkTool::ClearExtent()
+{
+	PutRaw = &MarkTool::PutClip;
+}
+
+void MarkTool::Put(const Array<Pointf>& pt)
+{
+	for(int i = 0; i < pt.GetCount(); i++)
+		Put(pt[i]);
+}
+
+void MarkTool::Paint()
+{
+	if(!plotter.draw)
+		return;
+	Flush();
+	ClearExtent();
+}
+
+void MarkTool::Flush()
+{
+	if(!vertices.IsEmpty()) {
+		marker->Paint(*plotter.draw, vertices);
+		vertices.Clear();
+	}
+}
+
+void MarkTool::Clear()
+{
+	vertices.Clear();
+	ClearExtent();
+}
+
+void MarkTool::PutDummy(Pointf pt) {}
+
+void MarkTool::PutSimple(Pointf pt)
+{
+	if(IsNull(pt.x) || IsNull(pt.y))
+		return;
+	vertices.Add(plotter.LtoPoint(pt));
+	if(vertices.GetCount() >= BUF_COUNT)
+		Flush();
+}
+
+void MarkTool::PutClip(Pointf pt)
+{
+	if(IsNull(pt.x) || IsNull(pt.y))
+		return;
+	Pointf cpt = plotter.LtoP(pt);
+	if(plotter.InPClip(cpt))
+	{
+		vertices.Add(PointfToPoint(cpt));
+		if(vertices.GetCount() >= BUF_COUNT)
+			Flush();
+	}
+}
+
+Size TextTool::Type::GetTextSize(const String& s) const
+{
+	int wd = 0;
+	const byte *b = s;
+	unsigned len = s.GetLength();
+	for(unsigned rep = len >> 2; rep; rep--)
+	{
+		wd += widths[b[0]] + widths[b[1]] + widths[b[2]] + widths[b[3]];
+		b += 4;
+	}
+	switch(len & 3)
+	{
+	case 3: wd += widths[b[0]] + widths[b[1]] + widths[b[2]]; break;
+	case 2: wd += widths[b[0]] + widths[b[1]]; break;
+	case 1: wd += widths[b[0]]; break;
+	}
+	return Size(wd, height);
+}
+
+TextTool::TextTool()
+{
+}
+
+TextTool::~TextTool() {}
+
+void TextTool::Set(const Plotter& info, Font _f, Color _c, Color _o, double _a, Alignment _x, Alignment _y, bool _flip, int _aprec)
+{
+	cache_size = 0;
+	font_index = 0;
+	plotter    = info;
+	color      = _c;
+	outline    = _o;
+	angle      = _a;
+	x_align    = _x;
+	y_align    = _y;
+	flip       = _flip;
+	angle_prec = _aprec;
+	ASSERT(angle_prec > 0 && angle_prec <= 36000);
+	SetFont(_f);
+}
+
+void TextTool::SetFont(Font _font)
+{
+	if((font_index = font_map.Find(font = _font)) < 0)
+	{
+		if(font_map.GetCount() >= FONT_LIMIT)
+			Paint();
+		font_index = font_map.GetCount();
+		Type& type = font_map.Add(_font);
+		FontInfo fi = _font.Info();
+		short *out = type.widths;
+		for(int c = 256; --c >= 0; out[c] = fi.GetWidth(c))
+			;
+		type.height = fi.GetHeight();
+	}
+}
+
+void TextTool::PutFlip(const String& text, Pointf pt, double angle)
+{
+	if(flip && (angle >= 0.5 * M_PI && angle <= 1.5 * M_PI || angle <= -0.5 * M_PI))
+		angle -= M_PI;
+	Put(text, pt, angle);
+}
+
+void TextTool::Put(const String& text, Pointf pt, double angle)
+{
+	if(IsNull(pt.x) || IsNull(pt.y))
+		return;
+	Size size = font_map[font_index].GetTextSize(text);
+	int delta = size.cx + size.cy;
+	Pointf pos = plotter.LtoP(pt);
+	if(pos.x >= plotter.clip.right + delta  || pos.x <= plotter.clip.left - delta
+	|| pos.y >= plotter.clip.bottom + delta || pos.y <= plotter.clip.top - delta)
+		return;
+	Pointf offset(0, 0);
+	switch(x_align)
+	{
+	case ALIGN_LEFT:   break;
+	case ALIGN_RIGHT:  offset.x -= size.cx; break;
+	default:           offset.x -= size.cx >> 1; break;
+	}
+	switch(y_align)
+	{
+	case ALIGN_TOP:    break;
+	case ALIGN_BOTTOM: offset.y -= size.cy; break;
+	default:           offset.y -= size.cy >> 1; break;
+	}
+	int apart = fround(angle * angle_prec / (2 * M_PI)) % angle_prec;
+	if(apart < 0) apart += angle_prec;
+	if(apart)
+		offset = Rotated(offset, (-2 * M_PI * apart) / angle_prec);
+	One<Item> item = new Item(PointfToPoint(pos + offset), text, color, outline);
+	int sz = item->GetSize();
+	if(cache_size + sz > CACHE_LIMIT) // flush
+		Paint();
+	cache_size += sz;
+	cache.GetAdd(font_index * angle_prec + apart).Add(item.Detach());
+}
+
+void TextTool::Paint()
+{
+	if(plotter.draw)
+		Flush();
+	Clear();
+}
+
+void TextTool::Clear()
+{
+	ClearCache();
+	SetFont(font);
+}
+
+void TextTool::Flush()
+{
+	Draw& draw = *plotter.draw;
+	for(int i = 0; i < cache.GetCount(); i++)
+	{
+		int angle = cache.GetKey(i);
+		Font font = font_map.GetKey(angle / angle_prec);
+		Font font_naa = Font(font).NonAntiAliased();
+		angle = (angle % angle_prec) * 3600 / angle_prec;
+		const Array<Item>& items = cache[i];
+		for(int t = 0; t < items.GetCount(); t++)
+		{
+			const Item& ii = items[t];
+			if(!IsNull(ii.outline))
+			{
+				draw.DrawText(ii.point.x - 1, ii.point.y, angle, ii.text, font_naa, ii.outline);
+				draw.DrawText(ii.point.x + 1, ii.point.y, angle, ii.text, font_naa, ii.outline);
+				draw.DrawText(ii.point.x, ii.point.y - 1, angle, ii.text, font_naa, ii.outline);
+				draw.DrawText(ii.point.x, ii.point.y + 1, angle, ii.text, font_naa, ii.outline);
+				draw.DrawText(ii.point.x, ii.point.y, angle, ii.text, font_naa, ii.color);
+			}
+			else
+				draw.DrawText(ii.point.x, ii.point.y, angle, ii.text, font, ii.color);
+		}
+	}
+	ClearCache();
+}
+
+void TextTool::ClearCache()
+{
+	font_map.Clear();
+	cache.Clear();
+	cache_size = 0;
+}
+
+#if 0
+class TestWindow : public TopWindow
+{
+public:
+	virtual void Paint(Draw& draw);
+};
+
+void TestWindow::Paint(Draw& draw)
+{
+	draw.DrawRect(draw.GetClip(), LtCyan);
+	Plotter plotter(draw);
+	PathTool path;
+	path.Set(plotter, SolidLine);
+	for(int i = 0; i < 320; i += 20)
+	{
+		Rectf rc = Pointf(300, 200);
+		rc.Inflate(i);
+		path.Rectangle(rc);
+		path.Circle(Pointf(300, 200), i);
+	}
+	Rect rc = RectC(GetSize());
+	rc.DeflateRect(20, 20);
+	AreaTool area;
+	area.Set(Plotter(plotter, rc), LtBlue, Image(), DashDotDotLine, Black, -50, 0);
+	area.Rectangle(100, 100, 400, 400);
+	area.Circle(400, 250, 100);
+//	area.MoveTo(100, 0);
+//	area.LineTo(0, 400);
+//	area.LineTo(300, 500);
+//	area.Circle(300, 200, 200);
+	area.Paint();
+}
+
+void PlotterTest()
+{
+	Size size(600, 400);
+	TestWindow window;
+	window.SetRect(CalcWindowRect(window, size));
+	window.Sizeable().Zoomable();
+
+	window.Run();
+}
+#endif
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/Geom/Draw/plotter.h b/uppsrc/Geom/Draw/plotter.h
new file mode 100644
index 000000000..5f460a8c4
--- /dev/null
+++ b/uppsrc/Geom/Draw/plotter.h
@@ -0,0 +1,498 @@
+NAMESPACE_UPP
+
+typedef const signed char  LineStyle[];
+typedef const signed char *LineStyleArg;
+
+extern LineStyle SolidLine;
+extern LineStyle DashLine;
+extern LineStyle DotLine;
+extern LineStyle DashDotLine;
+extern LineStyle DashDotDotLine;
+extern LineStyle EmptyLine;
+
+class LineDraw
+{
+public:
+	LineDraw();
+	LineDraw(Draw& draw, LineStyleArg pattern = SolidLine, Color color = Black, int width = -10, double dash = 0);
+
+	operator bool () const                { return draw && !empty; }
+
+	void           Set(Draw& draw, LineStyleArg pattern = SolidLine, Color color = Black, int width = -10, double dash = 0);
+
+	bool           SetExtent(const Rect& rc);
+	void           ClearExtent();
+
+	void           Clear();
+	void           Flush(); // flush polyline buffer
+
+	void           MoveTo(Point pt)       { ASSERT(MoveToRaw); (this->*MoveToRaw)(pt); }
+	void           LineTo(Point pt)       { ASSERT(LineToRaw); (this->*LineToRaw)(pt); }
+	void           Close();
+
+	LineDraw&      operator << (Point pt) { LineTo(pt); return *this; }
+
+	void           Line(Point p, Point q) { MoveTo(p); LineTo(q); }
+
+	void           Rectangle(const Rect& rc);
+
+	void           ArcTo(Point p, int bulge, int levels = 10);
+	void           Arc(Point p, Point q, int bulge, int levels = 10) { MoveTo(p); ArcTo(q, bulge, levels); }
+	void           Circle(Point centre, int radius);
+	void           Ellipse(const Rect& rc);
+
+private:
+	void           RecurseArc(Point to, int length, int bulge, int levels);
+	void           MoveToEmpty(Point pt);
+	void           MoveToSolid(Point pt);
+	void           MoveToDashed(Point pt);
+	void           LineToEmpty(Point pt);
+	void           LineToSolidSimple(Point pt);
+	void           LineToSolidClip(Point pt);
+	void           LineToDashedSimple(Point pt);
+	void           LineToDashedClip(Point pt);
+	void           AddVectorThin(Point a, Point b);
+	void           AddVectorThick(Point a, Point b);
+	void           AddVectorArea(Point a, Point b);
+
+private:
+	void (LineDraw::*MoveToRaw)(Point pt);
+	void (LineDraw::*LineToRaw)(Point pt);
+	void (LineDraw::*AddVector)(Point a, Point b);
+
+	Draw          *draw;
+	int            max_rad;
+	int            pen_width;
+	Color          pen_color;
+	Rect           clip;
+	Point          first;
+	Point          last;
+	Vector<double> segments;
+	const double  *active;
+	double         remains;
+	double         factor;
+	bool           empty;
+	int            half_width;
+	Vector<Point>  vertices;
+	Vector<int>    indices;
+};
+
+class Plotter
+{
+public:
+	Plotter() : draw(0), ltop(0), ltopoint(0), path_map(0) {}
+
+	Plotter(Draw& draw, const Rectf& src, const Rectf& dest,
+		int flags = ISOTROPIC | MIRROR_Y, int reserve = 0, double map_meters = 1)
+	{ Set(draw, src, dest, flags, reserve, map_meters); }
+
+	Plotter(Draw& draw, Sizef scale, Pointf delta = Pointf(0, 0), int reserve = 0, double map_meters = 1)
+	{ Set(draw, scale, delta, reserve, map_meters); }
+
+	Plotter(Draw& draw, const Matrixf& matrix = Matrixf_1(), int reserve = 0, double map_meters = 1)
+	{ Set(draw, matrix, reserve, map_meters); }
+
+	Plotter(Draw& draw, const Matrixf& matrix, const Rect& clip, double map_meters = 1)
+	{ Set(draw, matrix, clip, map_meters); }
+
+	Plotter(const Plotter& info, const Rect& clip)
+	{ Set(info, clip); }
+
+	Plotter(const Plotter& info, int reserve)
+	{ Set(info, reserve); }
+
+	Plotter(const Plotter& info)
+	{ Set(info); }
+
+	enum
+	{
+		MIRROR_X  = 0x01,
+		MIRROR_Y  = 0x02,
+		ISOTROPIC = 0x04,
+	};
+
+	void                Set(Draw& draw, const Rectf& src, const Rectf& dest, int flags = ISOTROPIC | MIRROR_Y, int reserve = 0, double map_meters = 1);
+	void                Set(Draw& draw, Sizef scale, Pointf delta = Pointf(0, 0), int reserve = 0, double map_meters = 1);
+	void                Set(Draw& draw, const Matrixf& matrix = Matrixf_1(), int reserve = 0, double map_meters = 1);
+	void                Set(Draw& draw, const Matrixf& matrix, const Rect& clip, double map_meters = 1);
+	void                Set(const Plotter& info, const Rect& clip);
+	void                Set(const Plotter& info, int reserve);
+	void                Set(const Plotter& info)                          { *this = info; }
+	void                SetDraw(Draw& draw, const Rect& clip, double map_meters);
+
+	void                SetPixelsPerDot(double  _ppd)                     { pixels_per_dot = _ppd; }
+	double              GetPixelsPerDot() const                           { return pixels_per_dot; }
+	double              GetPixelsPerPoint() const                         { return pixels_per_dot * (600.0 / 72.0); }
+	double              GetPixelsPerInch() const                          { return pixels_per_dot * 600.0; }
+	double              GetPixelsPerMeter() const                         { return pixels_per_dot * (6e5 / 25.4); }
+
+	void                SetMapMeters(double mm);
+	double              GetPhysicalScale() const                          { return physical_scale; }
+
+	Draw&               GetDraw()                                         { ASSERT(draw); return *draw; }
+	void                SetXorMode(bool xm);
+
+	Point               LtoPoint(Pointf pt) const                         { ASSERT(ltopoint); return (this->*ltopoint)(pt); }
+
+	double              LtoP(double dist) const                           { return dist * measure; }
+	double              PtoL(double dist) const                           { return dist / measure; }
+
+	Pointf              LtoP(Pointf pt) const                             { ASSERT(ltop); return (this->*ltop)(pt); }
+	Pointf              LtoPrel(Pointf pt) const                          { return pt % physical; }
+
+	Pointf              PtoL(Pointf pt) const                             { return pt * logical; }
+	Pointf              PtoLrel(Pointf pt) const                          { return pt % logical; }
+
+	Rectf               LtoP(const Rectf& rc) const;
+	Rectf               LtoPrel(const Rectf& rc) const;
+
+	Rectf               PtoL(const Rectf& rc) const;
+	Rectf               PtoLrel(const Rectf& rc) const;
+
+	const Matrixf&      LtoP() const                                      { return physical; }
+	const Matrixf&      PtoL() const                                      { return logical; }
+
+	const Rectf&        GetLClip() const                                  { return logclip; }
+	const Rect&         GetPClip() const                                  { return clip; }
+
+	bool                IntersectsLClip(const Rectf& rc) const            { return logclip && rc; }
+	bool                IntersectsPClip(const Rectf& rc) const            { return rc.left < clip.right && rc.top < clip.bottom && rc.right > clip.left && rc.bottom > clip.top; }
+	bool                InLClip(const Rectf& rc) const                    { return logclip.Contains(rc); }
+	bool                InPClip(const Rectf& rc) const                    { return rc.left >= clip.left && rc.top >= clip.top && rc.right <= clip.right && rc.bottom <= clip.bottom; }
+	bool                InLClip(Pointf pt) const                          { return logclip.Contains(pt); }
+	bool                InPClip(Pointf pt) const                          { return pt.x >= clip.left && pt.y >= clip.top && pt.x <= clip.right && pt.y <= clip.bottom; }
+	bool                InLClipX(double x) const                          { return x >= logclip.left && x <= logclip.right; }
+	bool                InLClipY(double y) const                          { return y >= logclip.top  && y <= logclip.bottom; }
+
+	void                PathMap(const PathStyleMap *pm)                   { path_map = pm; }
+	const PathStyleMap *GetPathMap() const                                { return path_map; }
+	PathStyle           GetPath(const String& spec) const                 { ASSERT(path_map); return path_map -> Scan(spec); }
+
+public:
+	Draw               *draw;
+	const PathStyleMap *path_map;
+	double              pixels_per_dot;
+	double              map_meters;
+	Matrixf             physical;
+	Matrixf             logical;
+	Rectf               logclip;
+	Rect                clip;
+	double              logdiag;
+	double              logprec;
+	double              measure;
+	double              physical_scale;
+	bool                ortho;
+
+private:
+	Pointf              LtoPFull(Pointf pt) const                   { return pt * physical; }
+	Pointf              LtoPOrtho(Pointf pt) const                  { return Pointf(pt.x * physical.x.x + physical.a.x, pt.y * physical.y.y + physical.a.y); }
+
+	Point               LtoPointFull(Pointf pt) const;
+	Point               LtoPointOrtho(Pointf pt) const;
+
+	Pointf              (Plotter::*ltop)(Pointf pt) const;
+	Point               (Plotter::*ltopoint)(Pointf pt) const;
+};
+
+void PlotDragRect(Plotter& plotter, const Rectf& rc);
+
+class PlotterTool
+{
+public:
+	typedef PlotterTool CLASSNAME;
+	PlotterTool();
+	virtual ~PlotterTool();
+
+	Plotter&          GetPlotter()                      { return plotter; }
+	const Plotter&    GetPlotter() const                { return plotter; }
+
+	virtual void      Paint(); // flush & clear paint buffer
+	virtual void      Clear(); // clear paint buffer
+
+	void              MoveTo(double x, double y)        { MoveToRaw(Pointf(x, y)); }
+	void              MoveTo(Pointf pt)                 { MoveToRaw(pt); }
+	void              MoveRel(Pointf pt)                { MoveToRaw(pt + last_point); }
+	Callback1<Pointf> GetMoveTo() const                 { return MoveToRaw; }
+
+	void              LineTo(double x, double y)        { LineToRaw(Pointf(x, y)); }
+	void              LineTo(Pointf pt)                 { LineToRaw(pt); }
+	void              LineRel(Pointf pt)                { LineToRaw(pt + last_point); }
+	Callback1<Pointf> GetLineTo() const                 { return LineToRaw; }
+
+	void              DrawTo(double x, double y, bool d) { if(d) LineTo(x, y); else MoveTo(x, y); }
+	void              DrawTo(Pointf pt, bool d)         { if(d) LineTo(pt); else MoveTo(pt); }
+	void              DrawRel(Point pt, bool d)         { if(d) LineRel(pt); else MoveRel(pt); }
+
+	void              Line(Pointf p, Pointf q)          { MoveTo(p); LineTo(q); }
+	void              Line(double x1, double y1, double x2, double y2) { MoveTo(x1, y1); LineTo(x2, y2); }
+	void              Line(const Array<Pointf>& points);
+
+	virtual void      ArcTo(Pointf pt, double bulge, int levels = 10);
+
+	void              Rectangle(double x1, double y1, double x2, double y2, bool r = false);
+	void              Rectangle(Pointf p, Pointf q, bool r = false) { Rectangle(p.x, p.y, q.x, q.y, r); }
+	void              Rectangle(const Rectf& rc, bool r = false)    { Rectangle(rc.left, rc.top, rc.right, rc.bottom, r); }
+
+	void              Circle(double x, double y, double radius);
+	void              Circle(Pointf centre, double radius) { Circle(centre.x, centre.y, radius); }
+
+	void              Ellipse(const Rectf& rc);
+
+	void              ArrowHead(Pointf P, Pointf Q, double length, double angle);
+	void              Arrow(Pointf P, Pointf Q, double length, double angle);
+	void              BiArrow(Pointf P, Pointf Q, double length, double angle);
+
+protected:
+	virtual bool      ArcToRaw(Pointf pt, double bulge);
+
+protected:
+	Plotter           plotter;
+	Pointf            last_point;
+	bool              clip_arcs;
+
+	Callback1<Pointf> MoveToRaw;
+	Callback1<Pointf> LineToRaw;
+};
+
+class PathTool : public PlotterTool
+{
+public:
+	typedef PathTool CLASSNAME;
+	PathTool();
+	virtual ~PathTool();
+
+	virtual void   Paint(); // flush & clear paint buffer
+	virtual void   Clear(); // clear paint buffer
+
+	void           Set(const Plotter& info, const String& style = Null,
+		Color color = Black, int width = -10, double dash = Null);
+
+	bool           SetExtent(const Rectf& rc);
+	void           ClearExtent();
+
+public:
+#ifdef PLOTTER_TIMING
+	static int     segments;
+	static int     drawn;
+	static long    ticks;
+#endif
+
+protected:
+	virtual bool   ArcToRaw(Pointf pt, double bulge);
+
+	void           MoveToRawSimple(Pointf pt);
+	void           MoveToRawClip(Pointf pt);
+	void           LineToRawSimple(Pointf pt);
+	void           LineToRawClip(Pointf pt);
+
+protected:
+	bool           use_last;
+	Pointf         last_phys;
+	PathDraw       pathdraw;
+	bool           simple;
+};
+
+class AreaTool : public PlotterTool
+{
+public:
+	typedef AreaTool CLASSNAME;
+	AreaTool();
+	virtual ~AreaTool();
+
+	void           FlushFill();
+
+	virtual void   Paint(); // flush & clear paint buffer
+	virtual void   Clear(); // clear paint buffer
+
+	void           Set(const Plotter& info, Color fill_color = Black, uint64 fill_pattern = 0,
+		const String& outline_pattern = Null, Color outline_color = Black,
+		int outline_width = -10, double outline_dash = Null);
+
+	bool           SetExtent(const Rectf& rc);
+	void           ClearExtent();
+
+	int            GetPointPixels() const { return point_pixels; }
+	Color          GetPointColor() const  { return point_color; }
+
+	bool           IsFill() const { return !IsNull(fill_color); }
+	bool           IsLine() const { return is_line; }
+#ifdef _DEBUG
+	void           ShowIndices();
+#endif
+
+	void           MoveToGhost(Pointf pt) { prev_ghost = true; MoveTo(pt); prev_ghost = false; }
+	void           LineToGhost(Pointf pt) { prev_ghost = true; LineTo(pt); prev_ghost = false; }
+
+protected:
+	void           MoveToRawSimple(Pointf pt);
+	void           MoveToRawClip(Pointf pt);
+	void           LineToRawSimple(Pointf pt);
+	void           LineToRawClip(Pointf pt);
+
+private:
+	void           SkipTo(Point pt, bool clockwise);
+	void           Flush();
+	AreaTool&      Horz(int x);
+	AreaTool&      Vert(int y);
+	Point          ClipBind(Pointf pt) const
+	{
+		return Point(
+			pt.x < plotter.clip.left ? plotter.clip.left : pt.x > plotter.clip.right  ? plotter.clip.right  : fround(pt.x),
+			pt.y < plotter.clip.top  ? plotter.clip.top  : pt.y > plotter.clip.bottom ? plotter.clip.bottom : fround(pt.y));
+	}
+
+private:
+	enum { FLUSH_BATCH = 6000 };
+	Vector<Point>  vertices;
+	Vector<int>    counts;
+	Vector<int>    disjunct_counts;
+	Vector<int>    ghost_lines;
+	bool           prev_ghost;
+	int            begin_index;
+	int            disjunct_begin_index;
+	Pointf         last_phys;
+	Pointf         last_start;
+	Pointf         clip_center;
+	bool           last_in;
+	bool           std_pen;
+	bool           simple;
+	bool           is_line;
+
+	int            point_pixels;
+	Color          point_color;
+	int            outline_pixels;
+	PathDraw       raw_outline;
+	Color          fill_outline_color;
+	int            fill_outline_style;
+	Color          thick_outline_color;
+	uint64         fill_pattern;
+	Color          fill_color;
+};
+
+class MarkTool {
+public:
+	class Marker {
+	public:
+		Marker() {}
+		virtual ~Marker() {}
+
+		virtual int  GetSize() const = 0;
+		virtual void Paint(Draw& draw, const Vector<Point>& pt) = 0;
+	};
+
+	static One<Marker> Empty();
+	static One<Marker> Square(int size = 10, Color color = LtRed, Color outline = Black, int outline_width = 0);
+	static One<Marker> Triangle(int size = 10, Color color = LtRed, Color outline = Black, int outline_width = 0);
+	static One<Marker> Circle(int size = 10, Color color = LtRed, Color outline = Black, int outline_width = 0);
+	static One<Marker> Cross(int size = 10, Color outline = Black, int outline_width = 0);
+	static One<Marker> Diamond(int size = 10, Color color = LtRed, Color outline = Black, int outline_width = 0);
+	static One<Marker> Hexagon(int size = 10, Color color = LtRed, Color outline = Black, int outline_width = 0);
+	static One<Marker> Star(int size = 10, Color color = LtRed, Color outline = Black, int outline_width = 0);
+	static One<Marker> Square45(int size = 10, Color color = LtRed, Color outline = Black, int outline_width = 0);
+	static One<Marker> Nabla(int size = 10, Color color = LtRed, Color outline = Black, int outline_width = 0);
+	static One<Marker> Letter(char ascii, int angle = 0, Font font = StdFont(), Color color = LtRed, Color outline = Black);
+	static One<Marker> Picture(Image pic, int size = 0, Color color = LtRed, bool antialias = false, bool ignore_hotspot = false);
+	// angle in degrees, 360 = full circle
+
+	enum { CIRCLE, SQUARE, TRIANGLE, CROSS, DIAMOND, HEXAGON, STAR, SQUARE45, NABLA, STD_MARK_COUNT }; // standard markers
+	static One<Marker> StandardMarker(int type, int size = 10, Color color = LtRed, Color outline = Black, int outline_width = 0);
+
+	MarkTool();
+	virtual ~MarkTool();
+
+	void             Set(const Plotter& info, One<Marker> marker);
+	bool             SetExtent(const Rectf& rc);
+	void             ClearExtent();
+
+	virtual void     Paint(); // flush & clear paint buffer
+	virtual void     Clear(); // clear paint buffer
+	void             Flush();
+
+	void             Put(Pointf pt)  { ASSERT(PutRaw); (this->*PutRaw)(pt); }
+	void             Put(const Array<Pointf>& pt);
+
+private:
+	void             PutDummy(Pointf pt);
+	void             PutClip(Pointf pt);
+	void             PutSimple(Pointf pt);
+
+private:
+	void (MarkTool::*PutRaw)(Pointf pt);
+	Vector<Point>    vertices;
+	One<Marker>      marker;
+	Plotter          plotter;
+	int              size;
+	enum { BUF_COUNT = 8192 };
+};
+
+class TextTool
+{
+public:
+	TextTool();
+	virtual ~TextTool();
+
+	void Set(const Plotter& info, Font font = Arial(0), Color color = Black, Color outline = Null,
+		double angle = 0, Alignment x_align = ALIGN_CENTER, Alignment y_align = ALIGN_CENTER,
+		bool flip = false, int angle_prec = 24);
+	// angle in radians
+
+	void             SetFont(Font _font);
+	void             SetColor(Color _color)          { color   = _color; }
+	void             SetOutline(Color _outline)      { outline = _outline; }
+	void             SetAngle(double _angle)         { angle   = _angle; }
+	void             SetXAlign(Alignment _x)         { x_align = _x; }
+	void             SetYAlign(Alignment _y)         { y_align = _y; }
+	void             SetFlip(bool _flip)             { flip    = _flip; }
+
+	void             Put(const String& text, Pointf pt, double angle);
+	void             Put(const String& text, Pointf pt) { Put(text, pt, angle); }
+	void             PutFlip(const String& text, Pointf pt, double angle);
+
+	virtual void     Paint(); // flush & clear paint buffer
+	virtual void     Clear(); // clear paint buffer
+
+public:
+	Plotter          plotter;
+	Font             font;
+	Color            color;
+	Color            outline;
+	double           angle;
+	Alignment        x_align;
+	Alignment        y_align;
+	bool             flip;
+	int              angle_prec;
+
+private:
+	void             Flush();
+	void             ClearCache();
+
+private:
+	struct Type
+	{
+		int   height;
+		short widths[256];
+
+		Size  GetTextSize(const String& text) const;
+	};
+
+	struct Item
+	{
+		Item(Point point, const String& text, Color color, Color outline)
+		: point(point), text(text), color(color), outline(outline) {}
+
+		int    GetSize() const { return sizeof(*this) + text.GetLength(); }
+
+		Point  point;
+		String text;
+		Color  color;
+		Color  outline;
+	};
+
+	enum { CACHE_LIMIT = 1000000, FONT_LIMIT = 100 };
+	int              cache_size;
+	int              font_index;
+	ArrayMap<Font, Type> font_map;
+	VectorMap<int, Array<Item> > cache;
+};
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/Geom/Geom.h b/uppsrc/Geom/Geom.h
new file mode 100644
index 000000000..359154472
--- /dev/null
+++ b/uppsrc/Geom/Geom.h
@@ -0,0 +1,15 @@
+#ifndef __Geom__
+#define __Geom__
+
+#include <Core/Core.h>
+
+NAMESPACE_UPP
+
+#include "geometry.h"
+#include "fp3.h"
+#include "linsolv.h"
+#include "delaunay.h"
+
+END_UPP_NAMESPACE
+
+#endif//__Geom__
diff --git a/uppsrc/Geom/Geom.upp b/uppsrc/Geom/Geom.upp
new file mode 100644
index 000000000..974457a6d
--- /dev/null
+++ b/uppsrc/Geom/Geom.upp
@@ -0,0 +1,19 @@
+uses
+	Core;
+
+file
+	Geom.h,
+	fp3.h,
+	fp3.cpp,
+	geometry.h,
+	geometry.cpp,
+	polyalg.cpp,
+	vecalg.cpp,
+	linsolv.h,
+	linsolv.cpp,
+	delaunay.h,
+	delaunay.cpp,
+	Info readonly separator,
+	COPYING,
+	COPYING-PLAIN,
+	AUTHORS;
diff --git a/uppsrc/Geom/delaunay.cpp b/uppsrc/Geom/delaunay.cpp
new file mode 100644
index 000000000..bcae5c85b
--- /dev/null
+++ b/uppsrc/Geom/delaunay.cpp
@@ -0,0 +1,240 @@
+#include "Geom.h"
+#pragma hdrstop
+
+NAMESPACE_UPP
+
+#define DELDUMP
+
+#ifdef DELDUMP
+	#define LINK(ta, ia, tb, ib) \
+		RLOG("Link " << ta << "[" << ia << "] to " << tb << "[" << ib << "]"); \
+		Link(ta, ia, tb, ib)
+#else
+	#define LINK(ta, ia, tb, ib) Link(ta, ia, tb, ib)
+#endif
+
+static bool PointOrder(const Pointf& a, const Pointf& b) { return a.x < b.x || a.x == b.x && a.y < b.y; }
+
+void Delaunay::Build(const Array<Pointf>& p, double e)
+{
+	epsilon = e;
+	epsilon2 = e * e;
+	points <<= p;
+	order = GetSortOrder(points, &PointOrder);
+	tihull = -1;
+	int npoints = p.GetCount();
+
+#ifdef DELDUMP
+	RLOG("Delaunay(" << npoints << " points)");
+	for(int dd = 0; dd < npoints; dd++)
+		RLOG("[" << dd << "] = " << points[dd]);
+#endif
+
+	triangles.Clear();
+	if(order.IsEmpty())
+		return;
+	const Pointf *p0 = &points[order[0]];
+	int xi = 0;
+	do
+		if(++xi >= points.GetCount())
+			return;
+	while(IsNear(*p0, points[order[xi]]));
+
+	// pass 1: create pair of improper triangles
+	CreatePair(order[0], order[xi]);
+	while(++xi < npoints)
+		AddHull(order[xi]);
+
+#ifdef DELDUMP
+	RLOG("//Delaunay: " << triangles.GetCount() << " triangles");
+	for(int td = 0; td < triangles.GetCount(); td++)
+	{
+		const Triangle& t = triangles[td];
+		RLOG(NFormat("[%d] = [%d, %d, %d] (%4v)",
+			td, t[0], t[1], t[2],
+			t.IsProper() ? (At(t, 1) - At(t, 0)) % (At(t, 2) - At(t, 1)) : double(Null))
+			<< NFormat(" -> [%d & %d, %d & %d, %d & %d]",
+			t.Next(0), t.NextIndex(0),
+			t.Next(1), t.NextIndex(1),
+			t.Next(2), t.NextIndex(2)));
+	}
+	RLOG("");
+#endif
+
+	int clean = 0;
+	do
+	{
+		int old_clean = clean;
+		clean = triangles.GetCount();
+		for(int i = clean; --i >= old_clean;)
+			if(triangles[i].IsProper())
+			{
+				Triangle& t = triangles[i];
+				for(int x = 0; x < 3; x++)
+				{
+					int j = t.Next(x);
+					Triangle& u = triangles[j];
+					if(u.IsProper())
+					{
+						int x1 = x + 1, x2 = x + 2;
+						if(x1 >= 3) x1 -= 3;
+						if(x2 >= 3) x2 -= 3;
+						Pointf A = At(t, x);
+						Pointf B = At(t, x1);
+						Pointf C = At(t, x2);
+						int y = t.NextIndex(x);
+						Pointf D = At(u, y);
+						double t1 = (A - C) ^ (B - A);
+						double t2 = (B - C) % (B - A);
+						double u1 = (D - C) ^ (B - D);
+						double u2 = (B - C) % (B - D);
+						if(t1 * u2 < t2 * u1)
+						{ // not locally Delaunay, flip
+							int y1 = y + 1, y2 = y + 2;
+							if(y1 >= 3) y1 -= 3;
+							if(y2 >= 3) y2 -= 3;
+#ifdef DELDUMP
+							RLOG("Delaunay flip (" << i << " / " << x << ", " << j << " / " << y << ")");
+							RLOG(i << ": " << t[x] << " - " << A << ", " << t[x1] << " - " << B << ", " << t[x2] << " - " << C);
+							RLOG(j << ": " << u[y] << " - " << D << ", " << u[y1] << " - " << At(u, y1) << ", " << u[y2] << " - " << At(u, y2));
+							RLOG("t1 = " << t1 << ", t2 = " << t2 << ", t = " << t1 / t2);
+							RLOG("u1 = " << u1 << ", u2 = " << u2 << ", u = " << u1 / u2);
+#endif
+							Triangle ot = t;
+							Triangle ou = u;
+							ASSERT(ot[x1] == ou[y2] && ot[x2] == ou[y1]);
+							t.Set(ot[x1], ou[y], ot[x]);
+							u.Set(ou[y1], ot[x], ou[y]);
+							Link(i, 0, j, 0);
+							Link(i, 1, ot.Next(x2), ot.NextIndex(x2));
+							Link(i, 2, ou.Next(y1), ou.NextIndex(y1));
+							Link(j, 1, ou.Next(y2), ou.NextIndex(y2));
+							Link(j, 2, ot.Next(x1), ot.NextIndex(x1));
+							clean = i;
+#ifdef DELDUMP
+							RLOG("After flip: [" << i << "] = " << t[x] << ", " << t[x1] << ", " << t[y2]
+								<< "; [" << j << "] = " << u[y] << ", " << u[y1] << ", " << u[y2]);
+#endif
+						}
+					}
+				}
+			}
+	}
+	while(clean < triangles.GetCount());
+}
+
+void Delaunay::CreatePair(int i, int j)
+{
+#ifdef DELDUMP
+	RLOG("CreatePair(" << i << ": " << points[i] << ", " << j << ": " << points[j] << ")");
+#endif
+	int ia = triangles.GetCount(), ib = ia + 1;
+	triangles.Add().Set(-1, i, j);
+	triangles.Add().Set(-1, j, i);
+	LINK(ia, 0, ib, 0);
+	LINK(ia, 1, ib, 2);
+	LINK(ia, 2, ib, 1);
+
+	tihull = ia;
+}
+
+void Delaunay::AddHull(int i)
+{
+#ifdef DELDUMP
+	RLOG("AddHull(" << i << ": " << points[i] << ")");
+#endif
+	ASSERT(tihull >= 0);
+	Pointf newpt = points[i];
+	int hi = tihull;
+	int vf = -1, vl = -1;
+	bool was_out = true, fix_out = false;
+	int im = -1;
+	double nd2 = 1e300;
+	do
+	{
+		const Triangle& t = triangles[hi];
+		Pointf t1 = At(t, 1), t2 = At(t, 2), tm = (t1 + t2) * 0.5;
+		double d2 = Squared(t1 - newpt);
+		if(d2 <= epsilon2)
+		{
+#ifdef DELDUMP
+			RLOG("-> too close to " << t[1] << ": " << t1);
+#endif
+			return; // too close
+		}
+		if(d2 < nd2)
+		{
+			im = hi;
+			nd2 = d2;
+		}
+		if((t2 - t1) % (newpt - tm) > epsilon2)
+		{
+#ifdef DELDUMP
+			RLOG("IN[" << hi << "], was_out = " << was_out);
+#endif
+			if(was_out)
+				vf = hi;
+			if(!fix_out)
+				vl = hi;
+			was_out = false;
+		}
+		else
+		{
+#ifdef DELDUMP
+			RLOG("OUT[" << hi << "], was_out = " << was_out);
+#endif
+			was_out = true;
+			if(vl >= 0)
+				fix_out = true;
+		}
+		hi = t.Next(1);
+	}
+	while(hi != tihull);
+	if(vf < 0)
+	{ // collinear, extend fan
+		Triangle& tm = triangles[im];
+		int in = tm.Next(2);
+		Triangle& tn = triangles[in];
+
+		int j = tm[1];
+
+		int ia = triangles.GetCount(), ib = ia + 1;
+#ifdef DELDUMP
+		RLOG("collinear -> connect " << im << " -> " << ia << " -> " << ib << " -> " << in);
+#endif
+		triangles.Add().Set(-1, i, j);
+		triangles.Add().Set(-1, j, i);
+		LINK(ia, 0, ib, 0);
+		LINK(ia, 2, ib, 1);
+		LINK(ia, 1, im, 2);
+		LINK(ib, 2, in, 1);
+	}
+	else
+	{
+		Triangle& tf = triangles[vf];
+		Triangle& tl = triangles[vl];
+		int xfn = tf.Next(2), xln = tl.Next(1);
+
+		int xf = triangles.GetCount(), xl = xf + 1;
+#ifdef DELDUMP
+		RLOG("adding vertex " << i << ": " << points[i] << " to hull between " << vf << " and " << vl);
+#endif
+		triangles.Add().Set(-1, tf[1], i);
+		triangles.Add().Set(-1, i, tl[2]);
+
+		tihull = xf;
+		tf[0] = i;
+		for(int f = vf; f != vl; triangles[f = triangles[f].Next(1)][0] = i)
+			;
+
+		LINK(xf, 0, vf, 2);
+		LINK(xl, 0, vl, 1);
+
+		LINK(xf, 2, xfn, 1);
+		LINK(xl, 1, xln, 2);
+
+		LINK(xf, 1, xl, 2);
+	}
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/Geom/delaunay.h b/uppsrc/Geom/delaunay.h
new file mode 100644
index 000000000..99ab6e9c1
--- /dev/null
+++ b/uppsrc/Geom/delaunay.h
@@ -0,0 +1,45 @@
+class Delaunay
+{
+public:
+	Delaunay() : tihull(-1) {}
+	Delaunay(const Array<Pointf>& points, double epsilon = 1e-6) { Build(points, epsilon); }
+
+	void                          Build(const Array<Pointf>& points, double epsilon = 1e-6);
+
+public:
+	struct Triangle // anticlockwise
+	{
+		bool IsProper() const                       { return vertex[0] >= 0; }
+		int  operator [] (int i) const              { return vertex[i]; }
+		int& operator [] (int i)                    { return vertex[i]; }
+
+		int  Next(int i) const                      { return nextindex[i] >> 2; }
+		int  NextIndex(int i) const                 { return nextindex[i] & 3; }
+
+		void Set(int a, int b, int c)               { vertex[0] = a; vertex[1] = b; vertex[2] = c; }
+		void SetNext(int i, int next, int index)    { ASSERT(index >= 0 && index <= 2); nextindex[i] = next * 4 + index; }
+
+		int  vertex[3];    // [0] = -1 => infinity
+		int  nextindex[3]; // neighbour[i] is opposite to vertex[i]; bit 0 & 1 = my index in neighbour's neighbour list
+	};
+
+	int                           GetCount() const                             { return triangles.GetCount(); }
+	const Triangle&               operator [] (int i) const                    { return triangles[i]; }
+	Pointf                        At(int i) const                              { return points[i]; }
+	Pointf                        At(const Triangle& t, int i) const           { return points[t[i]]; }
+	int                           GetHullIndex() const                         { return tihull; }
+
+private:
+	bool                          IsNear(const Pointf& a, const Pointf& b) const { return fabs(a.x - b.x) <= epsilon && fabs(a.y - b.y) <= epsilon; }
+	void                          CreatePair(int i, int j);
+	void                          AddHull(int i);
+	void                          Link(int ta, int ia, int tb, int ib)         { triangles[ta].SetNext(ia, tb, ib); triangles[tb].SetNext(ib, ta, ia); }
+
+private:
+	Array<Pointf>                 points;
+	Vector<int>                   order;
+	Array<Triangle>               triangles;
+	double                        epsilon;
+	double                        epsilon2;
+	int                           tihull;
+};
diff --git a/uppsrc/Geom/fp3.cpp b/uppsrc/Geom/fp3.cpp
new file mode 100644
index 000000000..ed82fdb32
--- /dev/null
+++ b/uppsrc/Geom/fp3.cpp
@@ -0,0 +1,384 @@
+#include "Geom.h"
+#pragma hdrstop
+
+NAMESPACE_UPP
+
+Pointf3 Length(Pointf3 p, double length)
+{
+	double l = max(Length(p), fpabsmax(p));
+	if(l)
+		return p * length / l;
+	return p;
+}
+
+String AsString(const Pointf3& p)
+{
+	String out;
+	if(IsNull(p))
+		out = "Pointf3(Null)";
+	else
+		out << "Pointf3(" << DblStr(p.x) << ", " << DblStr(p.y) << ", " << DblStr(p.z) << ")";
+	return out;
+}
+
+Pointf3 Bezier2(Pointf3 a, Pointf3 b, Pointf3 c, double t)
+{
+	double u = 1 - t;
+	return a * (u * u) + b * (2 * u * t) + c * (t * t);
+}
+
+Pointf3 Orthogonal(Pointf3 v, Pointf3 against)
+{
+	return v - against * ((v ^ against) / Squared(against));
+}
+
+Pointf3 Orthonormal(Pointf3 v, Pointf3 against)
+{
+	return Unit(Orthogonal(v, against));
+}
+
+Pointf3 FarthestAxis(Pointf3 v)
+{
+	double tx = fabs(v.x), ty = fabs(v.y), tz = fabs(v.z);
+	return tx <= ty && tx <= tz ? Pointf3(1, 0, 0)
+		:  ty <= tx && ty <= tz ? Pointf3(0, 1, 0)
+		:                         Pointf3(0, 0, 1);
+}
+
+Pointf3 AtLine(Pointf3 a, double ta, Pointf3 b, double tb, double tx, double *ratio)
+{
+	double r = (ta == tb ? 0 : (tx - ta) / (tb - ta));
+	if(ratio)
+		*ratio = r;
+	return a + (b - a) * r;
+}
+
+Pointf3 RotateX(Pointf3 v, double angle, Pointf3 centre)
+{
+	double c = cos(angle), s = sin(angle), y = v.y - centre.y, z = v.z - centre.z;
+	return Pointf3(v.x, y * c - z * s + centre.y, y * s + z * c + centre.z);
+}
+
+Pointf3 RotateY(Pointf3 v, double angle, Pointf3 centre)
+{
+	double c = cos(angle), s = sin(angle), z = v.z - centre.z, x = v.x - centre.x;
+	return Pointf3(z * s + x * c + centre.x, v.y, z * c - x * s + centre.z);
+}
+
+Pointf3 RotateZ(Pointf3 v, double angle, Pointf3 centre)
+{
+	double c = cos(angle), s = sin(angle), x = v.x - centre.x, y = v.y - centre.y;
+	return Pointf3(x * c - y * s + centre.x, x * s + y * c + centre.y, v.z);
+}
+
+Pointf3 Rotate(Pointf3 v, Pointf3 axis, double angle, Pointf3 centre)
+{
+	Matrixf3 m = Matrixf3Rotate(axis, angle);
+	m.Fix(centre);
+	return v * m;
+}
+
+double Angle(Pointf3 a, Pointf3 b)
+{
+	double da = sqrt(Squared(a) * Squared(b));
+	if(da == 0)
+		return 0;
+	da = (a ^ b) / da;
+	if(da <= -1)
+		return M_PI;
+	else if(da >= 1)
+		return 0;
+	else
+		return acos(da);
+}
+
+//////////////////////////////////////////////////////////////////////
+// Plane3::
+
+Plane3 Unit(Plane3 p)
+{
+	double nt = max(Length(p.normal), fpabsmax(p.normal));
+	if(nt)
+		return Plane3(p.delta / nt, p.normal / nt);
+	return p;
+}
+
+double Intersect(Plane3 p, Pointf3 la, Pointf3 lb)
+{
+	double an = la ^ p.normal, bn = lb ^ p.normal;
+	if(an == bn)
+		return 0;
+	return (an + p.delta) / (an - bn);
+}
+
+//////////////////////////////////////////////////////////////////////
+// Box3::
+
+void Box3::Union(Pointf3 pt)
+{
+	double c0 = pt ^ normal[0], c1 = pt ^ normal[1], c2 = pt ^ normal[2];
+	if(c0 < low[0]) low[0] = c0; if(c0 > high[0]) high[0] = c0;
+	if(c1 < low[1]) low[1] = c0; if(c1 > high[1]) high[1] = c0;
+	if(c2 < low[2]) low[2] = c0; if(c2 > high[2]) high[2] = c0;
+}
+
+//////////////////////////////////////////////////////////////////////
+// Matrix3::
+
+GLOBAL_VARP_INIT(const Matrixf3, Matrixf3_0, (0, 0, 0, 0, 0, 0, 0, 0, 0))
+GLOBAL_VARP_INIT(const Matrixf3, Matrixf3_1, (1, 0, 0, 0, 1, 0, 0, 0, 1))
+GLOBAL_VARP_INIT(const Matrixf3, Matrixf3_Null, (0, 0, 0, 0, 0, 0, 0, 0, 0, Null, Null, Null))
+GLOBAL_VARP_INIT(const Matrixf3, Matrixf3_MirrorX, (-1, 0, 0, 0, 1, 0, 0, 0, 1))
+GLOBAL_VARP_INIT(const Matrixf3, Matrixf3_MirrorY, (1, 0, 0, 0, -1, 0, 0, 0, 1))
+GLOBAL_VARP_INIT(const Matrixf3, Matrixf3_MirrorZ, (1, 0, 0, 0, 1, 0, 0, 0, -1))
+
+void Matrixf3::Serialize(Stream& stream)
+{
+	stream % x % y % z % a;
+}
+
+Matrixf3& Matrixf3::operator *= (const Matrixf3& m)
+{
+	Pointf3 nx(x ^ m.CX(), x ^ m.CY(), x ^ m.CZ());
+	Pointf3 ny(y ^ m.CX(), y ^ m.CY(), y ^ m.CZ());
+	Pointf3 nz(z ^ m.CX(), z ^ m.CY(), z ^ m.CZ());
+	x = nx;
+	y = ny;
+	z = nz;
+	a *= m;
+	return *this;
+}
+
+String Matrixf3::ToString() const
+{
+	return String().Cat() << "[x = " << x << ", y = " << y << ", z = " << z << ", a = " << a << "]";
+}
+
+Matrixf3 Matrixf3Move(Pointf3 vector)
+{
+	return Matrixf3(Pointf3(1, 0, 0), Pointf3(0, 1, 0), Pointf3(0, 0, 1), vector);
+}
+
+Matrixf3 Matrixf3RotateX(double angle, Pointf3 fix)
+{
+	double c = cos(angle), s = sin(angle);
+	return Matrixf3(1, 0, 0, 0, c, s, 0, -s, c).Fix(fix);
+}
+
+Matrixf3 Matrixf3RotateY(double angle, Pointf3 fix)
+{
+	double c = cos(angle), s = sin(angle);
+	return Matrixf3(c, 0, s, 0, 1, 0, -s, 0, c).Fix(fix);
+}
+
+Matrixf3 Matrixf3RotateZ(double angle, Pointf3 fix)
+{
+	double c = cos(angle), s = sin(angle);
+	return Matrixf3(c, s, 0, -s, c, 0, 0, 0, 1).Fix(fix);
+}
+
+Matrixf3 Matrixf3Scale(double scale, Pointf3 fix)
+{
+	return Matrixf3(Pointf3(scale, 0, 0), Pointf3(0, scale, 0),
+		Pointf3(0, 0, scale), fix * (1 - scale));
+}
+
+Matrixf3 Matrixf3Scale(Pointf3 scale, Pointf3 fix)
+{
+	return Matrixf3(Pointf3(scale.x, 0, 0), Pointf3(0, scale.y, 0),
+		Pointf3(0, 0, scale.z), fix - scale * fix);
+}
+
+Matrixf3 Matrixf3Inverse(const Matrixf3& mx)
+{
+	double det = Determinant(mx);
+	Matrixf3 m(
+		Pointf3(
+			(mx.y.y * mx.z.z - mx.z.y * mx.y.z),
+			(mx.z.y * mx.x.z - mx.x.y * mx.z.z),
+			(mx.x.y * mx.y.z - mx.y.y * mx.x.z)) / det,
+		Pointf3(
+			(mx.y.z * mx.z.x - mx.z.z * mx.y.x),
+			(mx.z.z * mx.x.x - mx.x.z * mx.z.x),
+			(mx.x.z * mx.y.x - mx.y.z * mx.x.x)) / det,
+		Pointf3(
+			(mx.y.x * mx.z.y - mx.z.x * mx.y.y),
+			(mx.z.x * mx.x.y - mx.x.x * mx.z.y),
+			(mx.x.x * mx.y.y - mx.y.x * mx.x.y)) / det);
+	m.a = -mx.a % m;
+	return m;
+}
+
+Matrixf3 Matrixf3Affine(Pointf3 src1, Pointf3 dest1, Pointf3 src2, Pointf3 dest2)
+{
+	return Matrixf3Affine(src1, dest1, src2, dest2, src1 + FarthestAxis(src2 - src1),
+		dest1 + FarthestAxis(dest2 - dest1));
+}
+
+Matrixf3 Matrixf3Affine(Pointf3 src1, Pointf3 dest1, Pointf3 src2, Pointf3 dest2,
+	Pointf3 src3, Pointf3 dest3)
+{
+	return Matrixf3Affine(src1, dest1, src2, dest2, src3, dest3,
+		src1 + (src2 - src1) % (src3 - src1),
+		dest1 + (dest2 - dest1) % (dest3 - dest1));
+}
+
+Matrixf3 Matrixf3Affine(Pointf3 src1, Pointf3 dest1, Pointf3 src2, Pointf3 dest2,
+	Pointf3 src3, Pointf3 dest3, Pointf3 src4, Pointf3 dest4)
+{
+	Matrixf3 rev(src2 - src1, src3 - src1, src4 - src1, src1);
+	if(fabs(Determinant(rev)) <= 1e-100)
+		return Matrixf3Move((dest1 - src1 + dest2 - src2 + dest3 - src3 + dest4 - src4) / 4.0);
+	return Matrixf3Inverse(rev) * Matrixf3(dest2 - dest1, dest3 - dest1, dest4 - dest1, dest1);
+}
+
+double Determinant(const Matrixf3& mx)
+{
+	return mx.x.x * mx.y.y * mx.z.z
+		+  mx.y.x * mx.z.y * mx.x.z
+		+  mx.z.x * mx.x.y * mx.y.z
+		-  mx.x.z * mx.y.y * mx.z.x
+		-  mx.y.z * mx.z.y * mx.x.x
+		-  mx.z.z * mx.x.y * mx.y.x;
+}
+
+double Matrixf3Measure(const Matrixf3& mx)
+{
+	double d = Determinant(mx);
+	return (d >= 0 ? +1 : -1) * pow(fabs(d), 1.0 / 3.0);
+}
+
+Matrixf3 Matrixf3Rotate(Pointf3 axis, double angle)
+{
+	Matrixf3 to_space = Matrixf3_1();
+	to_space.z = Unit(axis);
+	to_space.y = Orthonormal(FarthestAxis(to_space.z), to_space.z);
+	to_space.x = to_space.y % to_space.z;
+	double ca = cos(angle), sa = sin(angle);
+	return Matrixf3Inverse(to_space) * Matrixf3(ca, -sa, 0, sa, ca, 0, 0, 0, 1) * to_space;
+}
+
+//////////////////////////////////////////////////////////////////////
+// Camera::
+
+Camera::Camera()
+{
+	ViewingAngle(120 * DEGRAD); // default viewing angle in radians
+	Location(Pointf3(-100, 100, 0)); // 150 m from origin in the -x+y distance
+	Target(Pointf3(0, 0, 0));
+	Upwards(Pointf3(0, 1, 0));
+	FarDistance(10000); // 10 km
+	NearDistance(100); // 100 m
+	Viewport(320, 240);
+	ViewportOffset(0, 0);
+	ViewportSize(1, 1);
+	Projection(Matrixf3_1());
+	Update();
+}
+
+void Camera::Serialize(Stream& stream)
+{
+	int version = StreamHeading(stream, 1, 1, 1, "Camera");
+	if(version >= 1)
+	{
+		stream % location % target % upwards
+			% viewing_angle % width_mm % height_mm
+			% shift_x % shift_y % near_distance % far_distance
+			% projection_matrix;
+	}
+}
+
+void Camera::Update()
+{
+	direction = Unit(target - location);
+	distance_delta = -(location ^ direction);
+	viewing_distance = double(min(width_mm, height_mm) / (2e3 * tan(viewing_angle / 2.0)));
+	Pointf3 up = Orthogonal(upwards, direction);
+	if(Squared(up) <= 1e-10)
+		up = Orthogonal(FarthestAxis(direction), direction);
+	straight_up = Unit(up);
+	straight_right = direction % straight_up;
+	camera_matrix = Matrixf3(straight_right, straight_up, direction, location);
+	invcam_matrix = Matrixf3Inverse(camera_matrix);
+	double dw = viewing_distance * view_px * 2e3 / width_mm;
+	double dh = viewing_distance * view_py * 2e3 / height_mm;
+	double z_times = far_distance - near_distance;
+	z_delta = -near_distance / z_times;
+	transform_matrix = invcam_matrix * Matrixf3(
+		Pointf3(dw / z_times, 0, 0),
+		Pointf3(0, dh / z_times, 0),
+		Pointf3(shift_x, shift_y, 1) / z_times);
+}
+
+Pointf3 Camera::Transform(Pointf3 point) const
+{
+	Pointf3 axon = point * transform_matrix;
+	static const double MIN_DISTANCE = 1e-3; // 1 mm should be good enough
+	if(axon.z >= -MIN_DISTANCE && axon.z <= +MIN_DISTANCE)
+		axon.z = MIN_DISTANCE;
+	return Pointf3(axon.x / axon.z, axon.y / axon.z, axon.z + z_delta);
+}
+
+void Camera::SetPolar(Pointf3 dz, Pointf3 dx, double d, double a, double b, double r)
+{
+	Pointf3 dy = dz % dx;
+	Pointf3 az = RotateX(Pointf3(0, 0, -1), -b);
+	az = d * RotateY(az, a);
+	Pointf3 loc = az * Matrixf3(dx, dy, dz, target);
+	Pointf3 dir = Unit(target - loc);
+	Pointf3 su = Orthogonal(dy, dir);
+	if(Length(su) <= 1e-10)
+		su = Orthogonal(FarthestAxis(dir), dir);
+	su = Unit(su);
+	Location(loc).Upwards(Rotate(su, dir, r));
+}
+
+void Camera::GetPolar(Pointf3 dz, Pointf3 dx,
+double& distance, double& azimuth, double& bearing, double& rotation) const
+{
+	distance = Distance(location, target);
+	Pointf3 dy = dz % dx;
+	Pointf3 back = direction * Matrixf3Inverse(Matrixf3(dx, dy, dz));
+	azimuth = GetZXBearing(back);
+	bearing = asin(back.y);
+	double r = Determinant(straight_up, dy, direction);
+	rotation = asin(2 * r) * 0.5;
+}
+
+bool Camera::TransformClip(Pointf3 a, Pointf3 b, Pointf& outa, Pointf& outb) const
+{
+	Pointf3 a1 = a * transform_matrix, b1 = b * transform_matrix;
+	double az = a1.z + z_delta, bz = b1.z + z_delta;
+	bool na = (az <= 0), nb = (bz <= 0);
+	bool fa = (az >= 1), fb = (bz >= 1);
+	if(na && nb || fa && fb)
+		return false;
+	/**/ if(na) a1 += (b1 - a1) * (0 - az) / (b1.z - a1.z);
+	else if(nb) b1 += (a1 - b1) * (0 - bz) / (a1.z - b1.z);
+	/**/ if(fa) a1 += (b1 - a1) * (1 - az) / (b1.z - a1.z);
+	else if(fb) b1 += (a1 - b1) * (1 - bz) / (a1.z - b1.z);
+	outa.x = a1.x / a1.z;
+	outa.y = a1.y / a1.z;
+	outb.x = b1.x / b1.z;
+	outb.y = b1.y / b1.z;
+	return ClipLine(outa, outb, Rectf(-view_px, -view_py, +view_px, +view_py));
+}
+
+Pointf3 Camera::InverseXY(Pointf point, double z) const
+{
+	double dax = point.x * transform_matrix.x.z - transform_matrix.x.x;
+	double day = point.x * transform_matrix.y.z - transform_matrix.y.x;
+	double dar = z * transform_matrix.z.x + transform_matrix.a.x - point.x * (z * transform_matrix.z.z + transform_matrix.a.z);
+	double dbx = point.y * transform_matrix.x.z - transform_matrix.x.y;
+	double dby = point.y * transform_matrix.y.z - transform_matrix.y.y;
+	double dbr = z * transform_matrix.z.y + transform_matrix.a.y - point.y * (z * transform_matrix.z.z + transform_matrix.a.z);
+	double dx = dar * dby - dbr * day;
+	double dy = dax * dbr - dar * dbx;
+	double dr = dax * dby - dbx * day;
+	double lim = fabs(dr) * 1e6;
+	if(lim <= fabs(dx) || lim <= fabs(dy))
+		return Null;
+	return Pointf3(dx / dr, dy / dr, z);
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/Geom/fp3.h b/uppsrc/Geom/fp3.h
new file mode 100644
index 000000000..7191b7743
--- /dev/null
+++ b/uppsrc/Geom/fp3.h
@@ -0,0 +1,291 @@
+//////////////////////////////////////////////////////////////////////
+// fp3: 3D point class.
+
+struct Pointf3 : Moveable<Pointf3>
+{
+public:
+	Pointf3() {}
+	Pointf3(const Nuller&) : x(Null), y(Null), z(Null) {}
+	Pointf3(double x, double y, double z) : x(x), y(y), z(z) {}
+	Pointf3(Pointf p, double z = 0) : x(p.x), y(p.y), z(z) {}
+	explicit Pointf3(double t) : x(t), y(t), z(t) {}
+
+	void              Serialize(Stream& stream)                    { stream % x % y % z; }
+
+	double            operator [] (int i) const                    { return i == 0 ? x : i == 1 ? y : z; }
+	double&           operator [] (int i)                          { return i == 0 ? x : i == 1 ? y : z; }
+
+	Pointf            XY() const                                   { return Pointf(x, y); }
+	Pointf            YX() const                                   { return Pointf(y, x); }
+
+	Pointf            YZ() const                                   { return Pointf(y, z); }
+	Pointf            ZY() const                                   { return Pointf(y, z); }
+
+	Pointf            XZ() const                                   { return Pointf(x, z); }
+	Pointf            ZX() const                                   { return Pointf(z, x); }
+
+	Pointf3&          operator += (Pointf3 p)               { x += p.x; y += p.y; z += p.z; return *this; }
+	Pointf3&          operator -= (Pointf3 p)               { x -= p.x; y -= p.y; z -= p.z; return *this; }
+	Pointf3&          operator *= (double val)                     { x *= val; y *= val; z *= val; return *this; }
+	Pointf3&          operator *= (Pointf3 p)               { x *= p.x; y *= p.y; z *= p.z; return *this; }
+	Pointf3&          operator /= (double val)                     { x /= val; y /= val; z /= val; return *this; }
+	Pointf3&          operator /= (Pointf3 p)               { x /= p.x; y /= p.y; z /= p.z; return *this; }
+
+public:
+	double            x, y, z;
+};
+
+//inline Pointf3        Pointf3_0()                             { return Pointf3(0, 0, 0); }
+//inline Pointf3        Pointf3_X()                             { return Pointf3(1, 0, 0); }
+//inline Pointf3        Pointf3_Y()                             { return Pointf3(0, 1, 0); }
+//inline Pointf3        Pointf3_Z()                             { return Pointf3(0, 0, 1); }
+//inline Pointf3        Pointf3_Null()                          { return Pointf3(Null); }
+
+inline bool           IsNull(Pointf3 p)                         { return IsNull(p.x); }
+inline Pointf3        Nvl(Pointf3 p, Pointf3 q)                 { return !IsNull(p) ? p : q; }
+extern String         AsString(const Pointf3& p);
+
+inline bool           operator == (Pointf3 p, Pointf3 q)        { return q.x == p.x && q.y == p.y && q.z == p.z; }
+inline bool           operator != (Pointf3 p, Pointf3 q)        { return !(q == p); }
+
+inline Pointf3        operator - (Pointf3 p)                    { return Pointf3(-p.x, -p.y, -p.z); }
+inline Pointf3        operator + (Pointf3 p, Pointf3 q)         { return Pointf3(p.x + q.x, p.y + q.y, p.z + q.z); }
+inline Pointf3        operator - (Pointf3 p, Pointf3 q)         { return Pointf3(p.x - q.x, p.y - q.y, p.z - q.z); }
+inline Pointf3        operator * (Pointf3 p, double val)        { return Pointf3(p.x * val, p.y * val, p.z * val); }
+inline Pointf3        operator * (Pointf3 p, Pointf3 q)         { return Pointf3(p.x * q.x, p.y * q.y, p.z * q.z); }
+inline Pointf3        operator * (double val, Pointf3 p)        { return Pointf3(p.x * val, p.y * val, p.z * val); }
+inline Pointf3        operator / (Pointf3 p, double val)        { return Pointf3(p.x / val, p.y / val, p.z / val); }
+inline Pointf3        operator / (Pointf3 p, Pointf3 q)         { return Pointf3(p.x / q.x, p.y / q.y, p.z / q.z); }
+
+inline double         operator ^ (Pointf3 p, Pointf3 q)         { return p.x * q.x + p.y * q.y + p.z * q.z; }
+inline Pointf3        operator % (Pointf3 p, Pointf3 q)         { return Pointf3(p.y * q.z - p.z * q.y, p.z * q.x - p.x * q.z, p.x * q.y - p.y * q.x); }
+
+inline Pointf3        Mid(Pointf3 p, Pointf3 q)                 { return Pointf3((p.x + q.x) / 2, (p.y + q.y) / 2, (p.z + q.z) / 2); }
+inline Pointf3        Mid(Pointf3 p, Pointf3 q, double w)       { return p + (q - p) * w; }
+inline double         Squared(Pointf3 p)                        { return p.x * p.x + p.y * p.y + p.z * p.z; }
+inline double         Length(Pointf3 p)                         { return sqrt(Squared(p)); }
+extern Pointf3        Length(Pointf3 p, double l);
+inline double         Distance(Pointf3 p, Pointf3 q)            { return Length(p - q); }
+inline Pointf3        Unit(Pointf3 p)                           { return Length(p, 1.0); }
+inline Pointf3        Scale(Pointf3 p, double d, Pointf3 c = Pointf(0, 0)) { return (p - c) * d + c; }
+inline double         Determinant(Pointf3 a, Pointf3 b, Pointf3 c) { return (a % b) ^ c; }
+extern Pointf3        Bezier2(Pointf3 a, Pointf3 b, Pointf3 c, double t);
+extern Pointf3        Orthogonal(Pointf3 v, Pointf3 against);
+extern Pointf3        Orthonormal(Pointf3 v, Pointf3 against);
+extern Pointf3        FarthestAxis(Pointf3 v);
+extern Pointf3        AtLine(Pointf3 a, double ta, Pointf3 b, double tb, double tx, double *ratio = NULL);
+
+inline double         GetXYBearing(Pointf3 a)                   { return atan2(a.y, a.x); }
+inline double         GetYZBearing(Pointf3 a)                   { return atan2(a.z, a.y); }
+inline double         GetZXBearing(Pointf3 a)                   { return atan2(a.x, a.z); }
+extern double         Angle(Pointf a, Pointf b);
+
+inline Pointf3        fpmin(Pointf3 p, Pointf3 q)               { return Pointf3(min(p.x, q.x), min(p.y, q.y), min(p.z, q.z)); }
+inline Pointf3        fpmax(Pointf3 p, Pointf3 q)               { return Pointf3(max(p.x, q.x), max(p.y, q.y), max(p.z, q.z)); }
+
+inline double         fpmin(Pointf3 p)                          { return min(min(p.x, p.y), p.z); }
+inline double         fpmax(Pointf3 p)                          { return max(max(p.x, p.y), p.z); }
+inline double         fpabsmin(Pointf3 p)                       { return min(min(fabs(p.x), fabs(p.y)), fabs(p.z)); }
+inline double         fpabsmax(Pointf3 p)                       { return max(max(fabs(p.x), fabs(p.y)), fabs(p.z)); }
+
+inline Pointf3        PolarPointf3XY(double angle)              { return Pointf3(cos(angle), sin(angle), 0.0); }
+inline Pointf3        PolarPointf3YZ(double angle)              { return Pointf3(0.0, cos(angle), sin(angle)); }
+inline Pointf3        PolarPointf3ZX(double angle)              { return Pointf3(sin(angle), 0.0, cos(angle)); }
+
+extern Pointf3        RotateX(Pointf3 v, double angle, Pointf3 centre = Pointf3(0, 0, 0));
+extern Pointf3        RotateY(Pointf3 v, double angle, Pointf3 centre = Pointf3(0, 0, 0));
+extern Pointf3        RotateZ(Pointf3 v, double angle, Pointf3 centre = Pointf3(0, 0, 0));
+extern Pointf3        Rotate(Pointf3 v, Pointf3 axis, double angle, Pointf3 centre = Pointf3(0, 0, 0));
+
+class Plane3
+{
+public:
+	Plane3() {}
+	Plane3(double delta, Pointf3 normal) : delta(delta), normal(normal) {}
+	Plane3(Pointf3 A, Pointf3 normal) : delta(-(normal ^ A)), normal(normal) {}
+	Plane3(Pointf3 A, Pointf3 B, Pointf3 C) { normal = (B - A) % (C - A); delta = -(normal ^ A); }
+
+public:
+	double      delta;
+	Pointf3     normal; // (normal ^ point) + delta = 0
+};
+
+String          AsString(const Plane3& plane);
+
+inline double   Distance(Plane3 plane, Pointf3 point)       { return (point ^ plane.normal) + plane.delta; }
+extern double   Intersect(Plane3 p, Pointf3 la, Pointf3 lb);
+
+inline Plane3   operator - (Plane3 p)                              { return Plane3(-p.delta, -p.normal); }
+
+inline Plane3&  operator += (Plane3& p, Pointf3 v)                 { p.delta += v ^ p.normal; return p; }
+inline Plane3&  operator -= (Plane3& p, Pointf3 v)                 { p.delta -= v ^ p.normal; return p; }
+
+inline Plane3   operator +  (Plane3 p, Pointf3 v)           { Plane3 r = p; r += v; return r; }
+inline Plane3   operator -  (Plane3 p, Pointf3 v)           { Plane3 r = p; r -= v; return r; }
+
+extern Plane3   Unit(Plane3 p);
+
+struct Matrixf3;
+
+const Matrixf3& Matrixf3_0();
+const Matrixf3& Matrixf3_1();
+const Matrixf3& Matrixf3_Null();
+const Matrixf3& Matrixf3_MirrorX(); // mirror X axis
+const Matrixf3& Matrixf3_MirrorY(); // mirror Y axis
+const Matrixf3& Matrixf3_MirrorZ(); // mirror Z axis
+
+struct Matrixf3 : Moveable<Matrixf3>
+{
+	Pointf3 x, y, z, a;
+
+	Matrixf3()                                         { *this = Matrixf3_1(); }
+	Matrixf3(const Nuller&) : a(Null)                  {}
+	Matrixf3(Pointf3 x, Pointf3 y, Pointf3 z, Pointf3 a = Pointf3(0, 0, 0))
+		: x(x), y(y), z(z), a(a) {}
+	Matrixf3(const Matrixf3& (*fn)())                  { *this = fn(); }
+	Matrixf3(double xx, double xy, double xz,
+		double yx, double yy, double yz,
+		double zx, double zy, double zz,
+		double ax = 0, double ay = 0, double az = 0)
+		: x(xx, xy, xz), y(yx, yy, yz), z(zx, zy, zz), a(ax, ay, az) {}
+
+	void             Serialize(Stream& stream);
+
+	bool             IsIdentity() const                    { return x.x == 1 && x.y == 0 && x.z == 0 && y.x == 0 && y.y == 1 && y.z == 0 && z.x == 0 && z.y == 0 && z.z == 1 && a.x == 0 && a.y == 0 && a.z == 0; }
+	bool             IsZero() const                        { return x.x == 0 && x.y == 0 && x.z == 0 && y.x == 0 && y.y == 0 && y.z == 0 && z.x == 0 && z.y == 0 && z.z == 0 && a.x == 0 && a.y == 0 && a.z == 0; }
+	bool             IsNullInstance() const                { return IsNull(a); }
+
+	Matrixf3&        Fix(const Pointf3& v)                 { a = v - v.x * x - v.y * y - v.z * z; return *this; }
+	Matrixf3&        operator *= (const Matrixf3& another);
+
+	Pointf3          CX() const                            { return Pointf3(x.x, y.x, z.x); }
+	Pointf3          CY() const                            { return Pointf3(x.y, y.y, z.y); }
+	Pointf3          CZ() const                            { return Pointf3(x.z, y.z, z.z); }
+
+	String           ToString() const;
+};
+
+inline Matrixf3& operator *= (Matrixf3& m, double d) { m.x *= d; m.y *= d; m.z *= d; m.a *= d; return m; }
+inline Matrixf3& operator /= (Matrixf3& m, double d) { m.x /= d; m.y /= d; m.z /= d; m.a /= d; return m; }
+
+//template DumpType<Matrixf3>;
+
+extern Matrixf3 Matrixf3Move   (Pointf3 vector);
+extern Matrixf3 Matrixf3RotateX(double angle, Pointf3 fix = Pointf3(0, 0, 0));
+extern Matrixf3 Matrixf3RotateY(double angle, Pointf3 fix = Pointf3(0, 0, 0));
+extern Matrixf3 Matrixf3RotateZ(double angle, Pointf3 fix = Pointf3(0, 0, 0));
+extern Matrixf3 Matrixf3Rotate (Pointf3 axis, double angle);
+extern Matrixf3 Matrixf3Scale  (double scale, Pointf3 fix = Pointf3(0, 0, 0));
+extern Matrixf3 Matrixf3Scale  (Pointf3 scale, Pointf3 fix = Pointf3(0, 0, 0));
+//extern Matrixf3  Matrixf3Mirror (Pointf A, Pointf B);
+extern Matrixf3  Matrixf3Affine(Pointf3 src1, Pointf3 dest1, Pointf3 src2, Pointf3 dest2);
+extern Matrixf3  Matrixf3Affine(Pointf3 src1, Pointf3 dest1, Pointf3 src2, Pointf3 dest2,
+	Pointf3 src3, Pointf3 dest3);
+extern Matrixf3  Matrixf3Affine(Pointf3 src1, Pointf3 dest1, Pointf3 src2, Pointf3 dest2,
+	Pointf3 src3, Pointf3 dest3, Pointf3 src4, Pointf3 dest4);
+
+extern Matrixf3 Matrixf3Inverse(const Matrixf3& mx);
+extern double   Determinant    (const Matrixf3& mx);
+inline bool     IsReversing    (const Matrixf3& mx)                        { return Determinant(mx) < 0; }
+extern double   Matrixf3Measure(const Matrixf3& mx);
+
+inline bool     operator ==   (const Matrixf3& m1, const Matrixf3& m2)     { return m1.x == m2.x && m1.y == m2.y && m1.z == m2.z && m1.a == m2.a; }
+inline bool     operator !=   (const Matrixf3& m1, const Matrixf3& m2)     { return !(m1 == m2); }
+
+inline Pointf3  operator %    (Pointf3 vector, const Matrixf3& matrix)     { return vector.x * matrix.x + vector.y * matrix.y + vector.z * matrix.z; }
+inline Pointf3  operator *    (Pointf3 point,  const Matrixf3& matrix)     { return point % matrix + matrix.a; }
+
+inline Pointf3& operator %=   (Pointf3& point, const Matrixf3& matrix)     { return point = point % matrix; }
+inline Pointf3& operator *=   (Pointf3& point, const Matrixf3& matrix)     { return point = point * matrix; }
+
+inline Matrixf3  operator *   (const Matrixf3& m1, const Matrixf3& m2)     { return Matrixf3(m1) *= m2; }
+inline Matrixf3  operator /   (const Matrixf3& m1, const Matrixf3& m2)     { return m1 * Matrixf3Inverse(m2); }
+
+extern Plane3 operator * (Plane3 p, const Matrixf3& m);
+
+const double BIGDOUBLE = 1e300;
+
+class Box3
+{
+public:
+	Box3(const Nuller& = Null) { low[0] = Null; }
+	Box3(const Pointf3 *n, const double *l, const double *h)
+	{
+		normal[0] = n[0]; normal[1] = n[1]; normal[2] = n[2];
+		low[0] = l[0]; low[1] = l[1]; low[2] = l[2];
+		high[0] = h[0]; high[1] = h[1]; high[2] = h[2];
+	}
+
+	Plane3  GetMinPlane(int coord) const { return Plane3(low[coord], normal[coord]); }
+	Plane3  GetMaxPlane(int coord) const { return Plane3(-high[coord], -normal[coord]); }
+
+	bool    IsEmpty() const              { return low[0] > high[0] || low[1] > high[1] || low[2] > high[2]; }
+	void    Clear()                      { low[0] = low[1] = low[2] = BIGDOUBLE; high[0] = high[1] = high[2] = -BIGDOUBLE; }
+	void    Union(Pointf3 pt);
+
+	Pointf3 normal[3];
+	double  low[3];
+	double  high[3];
+};
+
+inline bool IsNull(Box3 b) { return IsNull(b.low[0]); }
+
+class Camera
+{
+public:
+	Camera();
+
+	void     Serialize(Stream& stream);
+
+	Camera&  Location(Pointf3 new_location)             { location = new_location; return *this; }
+	Camera&  Target(Pointf3 new_target)                 { target = new_target; return *this; }
+	Camera&  Upwards(Pointf3 new_upwards)               { upwards = new_upwards; return *this; }
+	Camera&  ViewingAngle(double new_va)                { viewing_angle = new_va; return *this; }
+	Camera&  Viewport(double wmm, double hmm)           { width_mm = wmm; height_mm = hmm; return *this; }
+	Camera&  Viewport(Sizef mm)                         { width_mm = mm.cx; height_mm = mm.cy; return *this; }
+	Camera&  ViewportOffset(double xc, double yc)       { shift_x = xc; shift_y = yc; return *this; }
+	Camera&  ViewportSize(Sizef px)                     { view_px = px.cx; view_py = px.cy; return *this; }
+	Camera&  ViewportSize(double px, double py)         { view_px = px; view_py = py; return *this; }
+	Camera&  Projection(const Matrixf3& pm)             { projection_matrix = pm; return *this; }
+	Camera&  FarDistance(double new_fd)                 { far_distance = new_fd; return *this; }
+	Camera&  NearDistance(double new_nd)                { near_distance = new_nd; return *this; }
+
+	double   GetDistance(Pointf3 v) const               { return (v ^ direction) + distance_delta; }
+
+	double   GetLengthByDistance(double l, double d)    { return l * near_distance / d; }
+	double   GetDistanceByLength(double l, double t)    { return near_distance * l / t; }
+
+	void     Update(); // recalculates camera parameters
+
+	Pointf3  Transform(Pointf3 point) const;
+	bool     TransformClip(Pointf3 a, Pointf3 b, Pointf& outa, Pointf& outb) const;
+	Pointf3  InverseXY(Pointf point, double z) const;
+
+	void     SetPolar(Pointf3 dz, Pointf3 dx,
+		double distance, double azimuth, double bearing, double rotation);
+	void     GetPolar(Pointf3 dz, Pointf3 dx,
+		double& distance, double& azimuth, double& bearing, double& rotation) const;
+
+public:
+	Pointf3  location;
+	Pointf3  target;
+	Pointf3  upwards;
+	double   viewing_angle;
+	double   width_mm, height_mm;
+	double   view_px, view_py;
+	double   shift_x, shift_y;
+	double   near_distance;
+	double   far_distance;
+	Matrixf3 projection_matrix;
+
+	// calculated parameters
+	Pointf3  straight_up;
+	Pointf3  straight_right;
+	Pointf3  direction;
+	double   distance_delta;
+	Matrixf3 camera_matrix;
+	Matrixf3 invcam_matrix;
+	Matrixf3 transform_matrix;
+	double   z_delta;
+	double   viewing_distance;
+};
diff --git a/uppsrc/Geom/geometry.cpp b/uppsrc/Geom/geometry.cpp
new file mode 100644
index 000000000..474c4ed1a
--- /dev/null
+++ b/uppsrc/Geom/geometry.cpp
@@ -0,0 +1,285 @@
+#include "Geom.h"
+
+NAMESPACE_UPP
+
+Pointf Length(Pointf p, double length)
+{
+	double l = max(Length(p), AbsMax(p));
+	if(l)
+		p *= length / l;
+	return p;
+}
+
+Sizef Length(Sizef p, double length)
+{
+	double l = max(Length(p), AbsMax(p));
+	if(l)
+		p *= length / l;
+	return p;
+}
+
+Pointf Project(Pointf p, Pointf A, Pointf B)
+{
+	Pointf AB = B - A;
+	double length = Squared(AB);
+	if(length == 0)
+		return A;
+	return A + AB * ((AB ^ (p - A)) / length);
+}
+
+double Bearing(Pointf p)
+{
+	if(p.y == 0)
+		return (p.x >= 0 ? 0 : M_PI);
+	if(p.x == 0)
+		return (p.y >= 0 ? M_PI_2 : 3 * M_PI_2);
+	double b = atan2(p.y, p.x);
+	if(b < 0)
+		b += 2 * M_PI;
+	return b;
+}
+
+Pointf Bezier2(Pointf a, Pointf b, Pointf c, double t)
+{
+	Pointf ab = b - a, bc = c - b;
+	return a + (ab * (2 * t) + (bc - ab) * (t * t));
+}
+
+double Bezier2Length(Pointf a, Pointf b, Pointf c, double t)
+{
+	Pointf v = b - a, w = (c - b) - v;
+	v *= 2;
+	double w2 = Squared(w);
+	if(fabs(w2) <= 1e-100)
+		return t * Distance(c, a);
+	double k = ScalarProduct(v, w) / (2 * w2);
+	double d = fabs(VectorProduct(v, w)) / (2 * w2);
+	double wl = sqrt(w2);
+	double x = t + k;
+	if(fabs(d) <= 1e-100)
+		return wl * x * fabs(x) / 2;
+	return wl * (x * hypot(x, d) + (d * d) * argsinh(x / d));
+}
+
+Sizef Bezier2Tangent(Pointf a, Pointf b, Pointf c, double t)
+{
+	Sizef ab = b - a, bc = c - b;
+	return 2.0 * (ab + t * (bc - ab));
+}
+
+Sizef Orthogonal(Sizef v, Sizef against)
+{
+	return v - against * ((v ^ against) / Squared(against));
+}
+
+Sizef Orthonormal(Sizef v, Sizef against)
+{
+	return Unit(Orthogonal(v, against));
+}
+
+Sizef GetFarthestAxis(Sizef v)
+{
+	return fabs(v.cx) <= fabs(v.cy) ? Sizef(1, 0) : Sizef(0, 1);
+}
+
+double Distance(Rectf rc, Pointf pt)
+{
+	double dx = (pt.x >= rc.right  ? pt.x - rc.right  : pt.x <= rc.left ? pt.x - rc.left : 0);
+	double dy = (pt.y >= rc.bottom ? pt.y - rc.bottom : pt.y <= rc.top  ? pt.y - rc.top  : 0);
+	if(dx == 0)
+		return fabs(dy);
+	if(dy == 0)
+		return fabs(dx);
+	return hypot(dx, dy);
+}
+
+Rectf& SetUnion(Rectf& rc, Pointf pt)
+{
+	if(IsNull(pt))
+		return rc;
+	if(IsNull(rc))
+	{
+		rc.left = rc.right = pt.x;
+		rc.top = rc.bottom = pt.y;
+		return rc;
+	}
+	if(pt.x < rc.left)   rc.left   = pt.x;
+	if(pt.x > rc.right)  rc.right  = pt.x;
+	if(pt.y < rc.top)    rc.top    = pt.y;
+	if(pt.y > rc.bottom) rc.bottom = pt.y;
+	return rc;
+}
+
+Rectf GetUnion(const Array<Pointf>& pt)
+{
+	if(pt.IsEmpty())
+		return Null;
+	Rectf rc = PointfRectf(pt[0]);
+	for(int i = 1; i < pt.GetCount(); i++)
+		rc |= pt[i];
+	return rc;
+}
+
+Rectf& SetMinMaxMove(Rectf& rc, Rectf outer_rc)
+{
+	if(IsNull(rc))
+		return rc;
+	if(IsNull(outer_rc))
+		return rc = Null;
+	if(rc.right  > outer_rc.right)  rc.OffsetHorz(outer_rc.right  - rc.right);
+	if(rc.bottom > outer_rc.bottom) rc.OffsetVert(outer_rc.bottom - rc.bottom);
+	if(rc.left   < outer_rc.left)   rc.OffsetHorz(outer_rc.left   - rc.left);
+	if(rc.top    < outer_rc.top)    rc.OffsetVert(outer_rc.top    - rc.top);
+	rc &= outer_rc;
+	return rc;
+}
+
+const Matrixf& Matrixf_0()       { static Matrixf m(0, 0, 0, 0, 0, 0);                   return m; }
+const Matrixf& Matrixf_1()       { static Matrixf m(1, 0, 0, 1, 0, 0);                   return m; }
+const Matrixf& Matrixf_Null()    { static Matrixf m(Null, Null, Null, Null, Null, Null); return m; }
+const Matrixf& Matrixf_MirrorX() { static Matrixf m(1, 0, 0, -1, 0, 0);                  return m; }
+const Matrixf& Matrixf_MirrorY() { static Matrixf m(-1, 0, 0, 1, 0, 0);                  return m; }
+
+Matrixf MatrixfMove(Pointf vector)
+{
+	return Matrixf(1, 0, 0, 1, vector.x, vector.y);
+}
+
+Matrixf MatrixfRotate(double angle, Pointf f)
+{
+	Pointf temp = PolarPointf(angle);
+	Matrixf out(temp, Left(temp));
+	out.Fix(f);
+	return out;
+}
+
+Matrixf MatrixfScale(double scale, Pointf f)
+{
+	Matrixf out(Pointf(scale, 0), Pointf(0, scale));
+	out.Fix(f);
+	return out;
+}
+
+Matrixf MatrixfScale(Pointf scale, Pointf f)
+{
+	Matrixf out(Pointf(scale.x, 0), Pointf(0, scale.y));
+	out.Fix(f);
+	return out;
+}
+
+Matrixf MatrixfScale(Rectf src, Rectf dest)
+{
+	Matrixf result(Pointf(dest.Width() / src.Width(), 0), Pointf(0, dest.Height() / src.Height()));
+	result.a = dest.TopLeft() - src.TopLeft() * result;
+	return result;
+}
+
+Matrixf MatrixfMirror(Pointf A, Pointf B)
+{
+	Pointf V = B - A;
+	double vx2 = sqr(V.x);
+	double vy2 = sqr(V.y);
+	double det = vx2 + vy2;
+	double dif = (vx2 - vy2) / det;
+	double mul = 2 * V.x * V.y / det;
+	Matrixf out(Pointf(vx2 - vy2, mul), Pointf(mul, vy2 - vx2));
+	out.Fix(A);
+	return out;
+}
+
+Matrixf MatrixfAffine (Pointf src1, Pointf dest1, Pointf src2, Pointf dest2)
+{
+	return MatrixfAffine(src1, dest1, src2, dest2, src1 + Right(src2 - src1), dest1 + Right(dest2 - dest1));
+}
+
+Matrixf MatrixfAffine (Pointf src1, Pointf dest1, Pointf src2, Pointf dest2, Pointf src3, Pointf dest3)
+{
+	Matrixf rev(src2 - src1, src3 - src1, src1);
+	if(fabs(Determinant(rev)) <= 1e-100)
+		return MatrixfMove((dest1 - src1 + dest2 - src2 + dest3 - src3) / 3.0);
+	return MatrixfInverse(rev) * Matrixf(dest2 - dest1, dest3 - dest1, dest1);
+}
+
+Matrixf& Matrixf::operator *= (const Matrixf& m)
+{
+	double xx = m.x.x * x.x + m.y.x * x.y;
+	double xy = m.x.x * y.x + m.y.x * y.y;
+	double yx = m.x.y * x.x + m.y.y * x.y;
+	double yy = m.x.y * y.x + m.y.y * y.y;
+	x = Pointf(xx, yx);
+	y = Pointf(xy, yy);
+	a *= m;
+	return *this;
+}
+
+Pointf operator * (Pointf point, const Matrixf& matrix)
+{
+#if defined(CPU_IA32) && defined(COMPILER_MSC)
+	Pointf result;
+	__asm mov    ebx, [matrix]
+	__asm fld    qword ptr [ebx]Matrixf.a.y
+	__asm fld    qword ptr [ebx]Matrixf.a.x
+	__asm fld    qword ptr [point.x]
+	__asm fld    st(0)
+	__asm fmul   qword ptr [ebx]Matrixf.x.x
+	__asm faddp  st(2), st
+	__asm fmul   qword ptr [ebx]Matrixf.x.y
+	__asm faddp  st(2), st
+	__asm fld    qword ptr [point.y]
+	__asm fld    st(0)
+	__asm fmul   qword ptr [ebx]Matrixf.y.x
+	__asm faddp  st(2), st
+	__asm fmul   qword ptr [ebx]Matrixf.y.y
+	__asm faddp  st(2), st
+	__asm fstp   [result]Pointf.x
+	__asm fstp   [result]Pointf.y
+	return result;
+#else
+	return point.x * matrix.x + point.y * matrix.y + matrix.a;
+#endif
+}
+
+Pointf operator / (Pointf point, const Matrixf& matrix)
+{
+	return point * MatrixfInverse(matrix);
+}
+
+Rectf operator * (const Rectf& rect, const Matrixf& matrix)
+{
+	if(IsNull(rect))
+		return Null;
+	double xl = min(rect.left, rect.right),  xh = max(rect.left, rect.right);
+	double yl = min(rect.top,  rect.bottom), yh = max(rect.top,  rect.bottom);
+	Rectf out;
+	out.left   = matrix.x.x * (matrix.x.x >= 0 ? xl : xh) + matrix.y.x * (matrix.y.x >= 0 ? yl : yh) + matrix.a.x;
+	out.top    = matrix.x.y * (matrix.x.y >= 0 ? xl : xh) + matrix.y.y * (matrix.y.y >= 0 ? yl : yh) + matrix.a.y;
+	out.right  = matrix.x.x * (matrix.x.x >= 0 ? xh : xl) + matrix.y.x * (matrix.y.x >= 0 ? yh : yl) + matrix.a.x;
+	out.bottom = matrix.x.y * (matrix.x.y >= 0 ? xh : xl) + matrix.y.y * (matrix.y.y >= 0 ? yh : yl) + matrix.a.y;
+	return out;
+}
+
+Rectf operator / (const Rectf& rect, const Matrixf& matrix)
+{
+	return rect * MatrixfInverse(matrix);
+}
+
+double MatrixfMeasure(const Matrixf& mx)
+{
+	double det = Determinant(mx);
+	return (det >= 0 ? +1 : -1) * sqrt(fabs(det));
+}
+
+Matrixf MatrixfInverse(const Matrixf& mx)
+{
+	double det = Determinant(mx);
+	Matrixf m(Pointf(mx.y.y, -mx.x.y) / det, Pointf(-mx.y.x, mx.x.x) / det);
+	m.a = -mx.a % m;
+	return m;
+}
+
+String Matrixf::ToString() const
+{
+	return String().Cat() << "[x = " << x << ", y = " << y << ", a = " << a << "]";
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/Geom/geometry.h b/uppsrc/Geom/geometry.h
new file mode 100644
index 000000000..e78d70841
--- /dev/null
+++ b/uppsrc/Geom/geometry.h
@@ -0,0 +1,538 @@
+//////////////////////////////////////////////////////////////////////
+
+struct Matrixf;
+
+static const double TWOPI = 2 * M_PI;
+static const double DEGRAD = M_PI / 180.0;
+
+//////////////////////////////////////////////////////////////////////
+
+//inline Pointf Pointf_0     ()                                 { return Pointf(0, 0); }
+//inline Pointf Pointf_X     ()                                 { return Pointf(1, 0); }
+//inline Pointf Pointf_Y     ()                                 { return Pointf(0, 1); }
+//inline Pointf Pointf_RX    ()                                 { return Pointf(-1, 1); }
+//inline Pointf Pointf_RY    ()                                 { return Pointf(1, -1); }
+
+inline Pointf fpmin        (Pointf p, Pointf q)               { return Pointf(min(p.x, q.x), min(p.y, q.y)); }
+inline Pointf fpmax        (Pointf p, Pointf q)               { return Pointf(max(p.x, q.x), max(p.y, q.y)); }
+inline Pointf fpminmax     (Pointf p, Pointf mn, Pointf mx)   { return Pointf(minmax(p.x, mn.x, mx.x), minmax(p.y, mn.y, mx.y)); }
+
+inline double fpmin        (Pointf p)                         { return min(p.x, p.y); }
+inline double fpmax        (Pointf p)                         { return max(p.x, p.y); }
+inline double fpabsmin     (Pointf p)                         { return min(fabs(p.x), fabs(p.y)); }
+inline double fpabsmax     (Pointf p)                         { return max(fabs(p.x), fabs(p.y)); }
+
+// temporary fix by Mirek Fidler:
+//inline double ScalarProduct(Sizef a, Sizef b) { return a.cx * b.cx + a.cy * b.cy; }
+//inline double VectorProduct(Sizef a, Sizef b) { return a.cx * b.cy - a.cy * b.cx; }
+//inline double Squared(Sizef a)             { return a.cx * a.cx + a.cy * a.cy; }
+//inline double Length(Sizef a)              { return hypot(a.cx, a.cy); }
+
+//inline int    ScalarProduct(Size a, Size b) { return a.cx * b.cx + a.cy * b.cy; }
+//inline int    VectorProduct(Size a, Size b) { return a.cx * b.cy - a.cy * b.cx; }
+//inline int    Squared(Size a)             { return a.cx * a.cx + a.cy * a.cy; }
+//inline double Length(Size a)              { return hypot(a.cx, a.cy); }
+
+
+inline Pointf Move         (Pointf p, double dx, double dy)   { return Pointf(p.x + dx, p.y + dy); }
+inline Pointf Mid          (Pointf p, Pointf q)               { return Pointf((p.x + q.x) / 2, (p.y + q.y) / 2); }
+inline Pointf Mid          (Pointf p, Pointf q, double wt)    { return p + (q - p) * wt; }
+inline double Squared      (Pointf p)                         { return p.x * p.x + p.y * p.y; }
+inline double Squared      (Pointf p, Pointf q)               { return Squared(q - p); }
+inline double Length       (Pointf p)                         { return sqrt(Squared(p)); }
+Pointf        Length       (Pointf p, double l);
+inline Pointf Unit         (Pointf p)                         { return Length(p, 1); }
+inline Pointf Rotated      (Pointf p, double a)               { double s = sin(a), c = cos(a); return Pointf(p.x * c - p.y * s, p.x * s + p.y * c); }
+inline Pointf Rotated      (Pointf p, double angle, Pointf c) { return c + Rotated(p - c, angle); }
+Pointf        Project      (Pointf p, Pointf a, Pointf b);
+Pointf        Bezier2      (Pointf a, Pointf b, Pointf c, double t);
+double        Bezier2Length(Pointf a, Pointf b, Pointf c, double t);
+Sizef         Bezier2Tangent(Pointf a, Pointf b, Pointf c, double t);
+Sizef         Orthogonal   (Sizef  p, Sizef against);
+Sizef         Orthonormal  (Sizef  p, Sizef against);
+Sizef         FarthestAxis (Sizef  p);
+inline Pointf Reversed     (Pointf p)                         { return Pointf(-p.x, -p.y); }
+inline Pointf ReversedX    (Pointf p)                         { return Pointf(-p.x, p.y); }
+inline Pointf ReversedY    (Pointf p)                         { return Pointf(p.x, -p.y); }
+//inline Pointf Abs          (Pointf p)                         { return Pointf(fabs(p.x), fabs(p.y)); }
+inline Pointf Left         (Pointf p)                         { return Pointf(-p.y, p.x); }
+inline Pointf Right        (Pointf p)                         { return Pointf(p.y, -p.x); }
+
+inline double Distance     (Pointf p, Pointf q)               { return Length(p - q); }
+double        Bearing      (Pointf p); // 0 to 2 * M_PI
+inline double Bearing      (Pointf p, Pointf c)               { return Bearing(p - c); }
+inline bool   Select       (Pointf p, Pointf A, Pointf B)     { return Squared(p - A) < Squared(p - B); }
+
+inline double operator ^   (Pointf p, Pointf q)               { return p.x * q.x + p.y * q.y; }
+inline double operator %   (Pointf p, Pointf q)               { return p.x * q.y - p.y * q.x; }
+inline double operator |   (Pointf p, Pointf q)               { return Distance(p, q); }
+
+inline Pointf PolarPointf  (double a)                         { return Pointf(cos(a), sin(a)); }
+inline Pointf PolarPointf  (double r, double a)               { return Pointf(r * cos(a), r * sin(a)); }
+inline Pointf PolarPointf  (Pointf c, double r, double a)     { return Pointf(c.x + r * cos(a), c.y + r * sin(a)); }
+
+inline Point  PointfToPoint(Pointf p)                         { return Point(fround(p.x), fround(p.y)); }
+inline Size   PointfToSize (Pointf p)                         { return Size(fround(p.x), fround(p.y)); }
+
+//////////////////////////////////////////////////////////////////////
+
+//inline Sizef  Sizef_0      ()                                 { return Sizef(0, 0); }
+//inline Sizef  Sizef_X      ()                                 { return Sizef(1, 0); }
+//inline Sizef  Sizef_Y      ()                                 { return Sizef(0, 1); }
+//inline Sizef  Sizef_RX     ()                                 { return Sizef(-1, 1); }
+//inline Sizef  Sizef_RY     ()                                 { return Sizef(1, -1); }
+
+inline Sizef  fpmin        (Sizef p, Sizef q)                 { return Sizef(min(p.cx, q.cx), min(p.cy, q.cy)); }
+inline Sizef  fpmax        (Sizef p, Sizef q)                 { return Sizef(max(p.cx, q.cx), max(p.cy, q.cy)); }
+inline Sizef  fpminmax     (Sizef p, Sizef mn, Sizef mx)      { return Sizef(minmax(p.cx, mn.cx, mx.cx), minmax(p.cy, mn.cy, mx.cy)); }
+
+inline double fpmin        (Sizef p)                          { return min(p.cx, p.cy); }
+inline double fpmax        (Sizef p)                          { return max(p.cx, p.cy); }
+inline double AbsMin       (Sizef p)                          { return min(fabs(p.cx), fabs(p.cy)); }
+inline double AbsMax       (Sizef p)                          { return max(fabs(p.cx), fabs(p.cy)); }
+
+inline Sizef  Mid          (Sizef p, Sizef q)                 { return Sizef((p.cx + q.cx) / 2, (p.cy + q.cy) / 2); }
+//inline double Squared      (Sizef p)                          { return p.cx * p.cx + p.cy * p.cy; }
+inline double Squared      (Sizef p, Sizef q)                 { return Squared(q - p); }
+//inline double Length       (Sizef p)                          { return sqrt(Squared(p)); }
+Sizef         Length       (Sizef p, double l);
+inline Sizef  Unit         (Sizef p)                          { return Length(p, 1); }
+inline Sizef  Reversed     (Sizef s)                          { return Sizef(-s.cx, -s.cy); }
+inline Sizef  ReversedX    (Sizef s)                          { return Sizef(-s.cx, s.cy); }
+inline Sizef  ReversedY    (Sizef s)                          { return Sizef(s.cx, -s.cy); }
+inline Sizef  Abs          (Sizef s)                          { return Sizef(fabs(s.cx), fabs(s.cy)); }
+inline Sizef  Left         (Sizef s)                          { return Sizef(-s.cy, s.cx); }
+inline Sizef  Right        (Sizef s)                          { return Sizef(s.cy, -s.cx); }
+
+inline Point  SizefToPoint (Sizef s)                          { return Point(fround(s.cx), fround(s.cy)); }
+inline Size   SizefToSize  (Sizef s)                          { return Size(fround(s.cx), fround(s.cy)); }
+
+//////////////////////////////////////////////////////////////////////
+// Rectf::
+
+//inline Rectf  Rectf_0()                                       { return Rectf(0, 0, 0, 0); }
+//inline Rectf  Rectf_1()                                       { return Rectf(0, 0, 1, 1); }
+
+//////////////////////////////////////////////////////////////////////
+
+inline Rectf  operator *   (Rectf r, double f)                { return Rectf(r.left * f, r.top * f, r.right * f, r.bottom * f); }
+inline Rectf  operator *   (Rectf r, Sizef s)                 { return Rectf(r.left * s.cx, r.top * s.cy, r.right * s.cx, r.bottom * s.cy); }
+inline Rectf  operator *   (Rectf r, Pointf p)                { return Rectf(r.left * p.x, r.top * p.y, r.right * p.x, r.bottom * p.y); }
+inline Rectf  operator *   (Rectf r, Rectf s)                 { return Rectf(r.left * s.left, r.top * s.top, r.right * s.right, r.bottom * s.bottom); }
+
+inline Rectf  operator /   (Rectf r, double f)                { return Rectf(r.left / f, r.top / f, r.right / f, r.bottom / f); }
+inline Rectf  operator /   (Rectf r, Sizef s)                 { return Rectf(r.left / s.cx, r.top / s.cy, r.right / s.cx, r.bottom / s.cy); }
+inline Rectf  operator /   (Rectf r, Pointf p)                { return Rectf(r.left / p.x, r.top / p.y, r.right / p.x, r.bottom / p.y); }
+inline Rectf  operator /   (Rectf r, Rectf s)                 { return Rectf(r.left / s.left, r.top / s.top, r.right / s.right, r.bottom / s.bottom); }
+
+extern Rectf& SetUnion     (Rectf& rc, Pointf pt);
+inline Rectf  GetUnion     (Rectf rc, Pointf pt)              { return SetUnion(rc, pt); }
+extern Rectf  GetUnion     (const Array<Pointf>& pt);
+extern Rectf& SetMinMaxMove(Rectf& rc, Rectf outer_rc);
+inline Rectf  GetMinMaxMove(Rectf rc, Rectf outer_rc)         { return SetMinMaxMove(rc, outer_rc); }
+extern double Distance     (Rectf rc, Pointf pt);
+inline double Diagonal     (Rectf rc)                         { return Length(rc.Size()); }
+inline double Area         (Rectf rc)                         { return rc.Width() * rc.Height(); }
+inline Rectf  PointfRectf  (Pointf pt)                        { return Rectf(pt.x, pt.y, pt.x, pt.y); }
+inline Rectf  SortRectf    (Pointf p, Pointf q)               { return Rectf(fpmin(p, q), fpmax(p, q)); }
+inline Rect   RectfToRect  (Rectf rc)                         { return Rect(fround(rc.left), fround(rc.top), fround(rc.right), fround(rc.bottom)); }
+
+inline Pointf fpminmax     (Pointf p, Rectf rc)               { return Pointf(minmax(p.x, rc.left, rc.right), minmax(p.y, rc.top, rc.bottom)); }
+
+//////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////
+
+const Matrixf& Matrixf_0();
+const Matrixf& Matrixf_1();
+const Matrixf& Matrixf_Null();
+const Matrixf& Matrixf_MirrorX(); // mirror around X axis
+const Matrixf& Matrixf_MirrorY(); // mirror around Y axis
+
+//////////////////////////////////////////////////////////////////////
+
+struct Matrixf : Moveable<Matrixf>
+{
+	Pointf x, y, a;
+
+	Matrixf()                                         { *this = Matrixf_1(); }
+	Matrixf(const Nuller&) : a(Null)                  {}
+	Matrixf(Pointf x, Pointf y, Pointf a = Pointf(0, 0)) : x(x), y(y), a(a) {}
+	Matrixf(const Matrixf& (*fn)())                   { *this = fn(); }
+	Matrixf(double xx, double xy, double yx, double yy, double ax, double ay)
+		: x(xx, xy), y(yx, yy), a(ax, ay) {}
+
+	bool             IsIdentity() const                    { return x.x == 1 && x.y == 0 && y.x == 0 && y.y == 1 && a.x == 0 && a.y == 0; }
+	bool             IsZero() const                        { return x.x == 0 && x.y == 0 && y.x == 0 && y.y == 0 && a.x == 0 && a.y == 0; }
+
+	void             Fix(Pointf vector)                    { a = vector - vector.x * x - vector.y * y; }
+	Matrixf&         operator *= (const Matrixf& another);
+
+	String           ToString() const;
+};
+
+//template DumpType<Matrixf>;
+
+extern Matrixf  MatrixfMove   (Pointf vector);
+extern Matrixf  MatrixfRotate (double angle, Pointf fix = Pointf(0, 0));
+extern Matrixf  MatrixfScale  (double scale, Pointf fix = Pointf(0, 0));
+extern Matrixf  MatrixfScale  (Pointf scale, Pointf fix = Pointf(0, 0));
+extern Matrixf  MatrixfScale  (Rectf src, Rectf dest);
+extern Matrixf  MatrixfMirror (Pointf A, Pointf B);
+extern Matrixf  MatrixfAffine (Pointf src1, Pointf dest1, Pointf src2, Pointf dest2);
+extern Matrixf  MatrixfAffine (Pointf src1, Pointf dest1, Pointf src2, Pointf dest2, Pointf src3, Pointf dest3);
+
+extern Matrixf  MatrixfInverse(const Matrixf& mx);
+inline double   Determinant   (const Matrixf& mx)                         { return mx.x % mx.y; }
+inline bool     IsReversing   (const Matrixf& mx)                         { return Determinant(mx) < 0; }
+extern double   MatrixfMeasure(const Matrixf& mx);
+
+template<>
+inline bool     IsNull        (const Matrixf& mx)                         { return IsNull(mx.a); }
+inline bool     operator ==   (const Matrixf& m1, const Matrixf& m2)      { return m1.x == m2.x && m1.y == m2.y && m1.a == m2.a; }
+inline bool     operator !=   (const Matrixf& m1, const Matrixf& m2)      { return !(m1 == m2); }
+
+inline Pointf   operator %    (Pointf vector, const Matrixf& matrix)      { return vector.x * matrix.x + vector.y * matrix.y; }
+extern Pointf   operator *    (Pointf point,  const Matrixf& matrix);
+extern Pointf   operator /    (Pointf point,  const Matrixf& matrix);
+extern Rectf    operator *    (const Rectf& rect, const Matrixf& matrix);
+extern Rectf    operator /    (const Rectf& rect, const Matrixf& matrix);
+
+inline Pointf&  operator %=   (Pointf& point, const Matrixf& matrix)      { return point = point % matrix; }
+inline Pointf&  operator *=   (Pointf& point, const Matrixf& matrix)      { return point = point * matrix; }
+
+inline Matrixf  operator *    (const Matrixf& m1, const Matrixf& m2)      { return Matrixf(m1) *= m2; }
+inline Matrixf  operator /    (const Matrixf& m1, const Matrixf& m2)      { return m1 * MatrixfInverse(m2); }
+
+//////////////////////////////////////////////////////////////////////
+// set distance of point from an object
+
+double          Distance      (Pointf X, Pointf A, Pointf B, double *arg = NULL);
+double          Distance      (Pointf X, Pointf A, Pointf B, double bulge, double *arg = NULL);
+double          Distance      (Pointf X, Pointf C, double radius, double *arg = NULL);
+
+//////////////////////////////////////////////////////////////////////
+// set intersection with rectangle
+
+bool            Crosses       (Rectf R, Pointf A, Pointf B);
+bool            Crosses       (Rectf R, Pointf A, Pointf B, double bulge);
+bool            Crosses       (Rectf R, Pointf C, double radius);
+
+//////////////////////////////////////////////////////////////////////
+// set intersection with polygon
+
+enum { CMP_OUT = -1, CMP_SECT = 0, CMP_IN = +1 };
+
+int             ContainsPoints(const Array<Pointf>& polygon, const Array<Pointf>& points);
+int             ContainsPoints(const Array<Pointf>& polygon, const Vector<int>& polyend, const Array<Pointf>& points);
+int             ContainsPoint (const Array<Pointf>& polygon, Pointf pt);
+int             ContainsPoint (const Array<Pointf>& polygon, const Vector<int>& polyend, Pointf pt);
+int             ContainsPoly  (const Array<Pointf>& chkpoly, const Array<Pointf>& polygon, const Vector<int>& polyend, bool closed);
+int             ContainsPoly  (const Array<Pointf>& chkpoly, const Array<Pointf>& polygon, bool closed);
+
+//////////////////////////////////////////////////////////////////////
+
+bool            ClipLine      (Pointf& A, Pointf& B, Rectf box);
+bool            ClipLine      (Pointf& A, Pointf& B, Rect box);
+bool            ClipLine      (Point& A, Point& B, Rect box);
+
+//////////////////////////////////////////////////////////////////////
+
+Rectf           GetBoundingBox(const Array<Pointf>& vertices);
+Rect            GetBoundingBox(const Point *vertices, int vertex_count);
+Rect            GetBoundingBox(const Vector<Point>& vertices);
+
+void            SplitPolygon  (const Point *vertices, int vertex_count, const int *counts, int count_count,
+	Vector<Point>& out_vertices, Vector<int>& out_counts, Rect clip = Null, int max_trace_points = 8000);
+void            SplitPolygon  (const Vector<Point>& vertices, const Vector<int>& counts,
+	Vector<Point>& out_vertices, Vector<int>& out_counts, Rect clip = Null, int max_trace_points = 8000);
+void            SplitPolygon  (Array<Pointf>::ConstIterator vertices, int vertex_count, const int *counts, int count_count,
+	Array<Pointf>& out_vertices, Vector<int>& out_counts, Rectf clip = Null, int max_trace_points = 8000);
+void            SplitPolygon  (const Array<Pointf>& vertices, const Vector<int>& counts,
+	Array<Pointf>& out_vertices, Vector<int>& out_counts, Rectf clip = Null, int max_trace_points = 8000);
+
+//////////////////////////////////////////////////////////////////////
+
+extern double   Vec_outer_tolerance; // maximum reasonable coordinate value
+extern double   Vec_tolerance;       // linear tolerance
+extern double   Vec_ang_tolerance;   // angular tolerance
+
+extern bool     VecTolEq      (double x, double y);
+extern bool     VecTolEq      (Pointf a, Pointf b);
+
+//////////////////////////////////////////////////////////////////////
+
+class VecLine
+{
+public:
+	VecLine();
+	VecLine(Pointf A, Pointf B) : A(A), B(B) {}
+	VecLine(double x1, double y1, double x2, double y2) : A(x1, y1), B(x2, y2) {}
+
+	String        ToString() const;
+
+	VecLine&      SetNull();
+
+	double        Length() const { return A | B; }
+	Pointf        Mid()    const;
+	Pointf        Right()  const;
+	Pointf        Left()   const;
+	Pointf        Vector() const;
+
+	double        GetArg(Pointf pt) const;
+	Pointf        GetPointAt(double arg) const;
+
+	VecLine       Reversed() const;
+	VecLine&      SetReversed();
+
+	Pointf        Intersect(VecLine another) const;
+	VecLine&      SetClip(Rectf rect);
+	VecLine       Clip(Rectf rect) const { return VecLine(*this).Clip(rect); }
+
+	double        Distance(Pointf point, double *arg = NULL) const;
+
+	bool          IsNullInstance() const                   { return IsNull(A); }
+
+	// algorithms
+	static Pointf GetPointAt(Pointf A, Pointf B, double arg);
+
+public:
+	Pointf        A, B;
+};
+
+//template BitWiseType<VecLine>;
+//template DumpType<VecLine>;
+
+inline Pointf  operator & (VecLine l1, VecLine l2)        { return l1.Intersect(l2); }
+inline VecLine operator & (VecLine line, Rectf rect)      { return line.Clip(rect); }
+inline double  operator | (VecLine ln, Pointf pt)         { return ln.Distance(pt); }
+inline double  operator | (Pointf pt, VecLine ln)         { return ln.Distance(pt); }
+
+//////////////////////////////////////////////////////////////////////
+
+class VecArc : public VecLine
+{
+public:
+	VecArc();
+	VecArc(VecLine line, double bulge = 0) : VecLine(line), bulge(bulge) {}
+	VecArc(Pointf A, Pointf B, double bulge = 0) : VecLine(A, B), bulge(bulge) {}
+	VecArc(double x1, double y1, double x2, double y2, double bulge = 0)
+		: VecLine(x1, y1, x2, y2), bulge(bulge) {}
+
+	String        ToString() const;
+
+	Pointf        ArcMid() const;
+	double        ArcLength() const;
+
+	VecArc        Reversed() const;
+	VecArc&       SetReversed();
+
+	Pointf        GetPointAt(double t) const;
+	Rectf         GetBoundingBox() const;
+
+	// arc algorithms
+	static Pointf ArcMid(Pointf P, Pointf Q, double l, double h);
+	static double ArcLength(Pointf P, Pointf Q, double l, double h);
+	static void   Bisect(Pointf P, Pointf Q, double l, double h,
+		Pointf& centre, double& ll, double& hh);
+	static Pointf GetPointAt(Pointf P, Pointf Q, double l, double h, double t);
+
+public:
+	double        bulge;
+};
+
+//template BitWiseType<VecArc>;
+//template DumpType<VecArc>;
+
+//////////////////////////////////////////////////////////////////////
+
+/*
+struct VecVertex : public Pointf
+{
+	VecVertex();
+	VecVertex(Pointf point, double bulge = 0) : Pointf(point), bulge(bulge) {}
+	VecVertex(double x, double y, double bulge = 0) : Pointf(x, y), bulge(bulge) {}
+
+	String Dump() const;
+
+	double bulge; // bulge of segment __ENDING AT THIS VERTEX__
+};
+
+template BitWiseType<VecVertex>;
+template DumpType<VecVertex>;
+*/
+
+//////////////////////////////////////////////////////////////////////
+
+/*
+class VecCurve : public Vector<VecVertex>
+{
+public:
+	typedef Vector<VecVertex> Base;
+
+	VecCurve();
+	VecCurve(const VecCurve& another, int);
+
+	void       Add(const VecVertex& vertex);
+	void       Add(Pointf point); // can be used as lineto callback for Arc::Iterator
+	void       Add(Pointf point, double bulge);
+	void       Add(double x, double y, double bulge = 0);
+
+	VecArc     Segment(int i) const;
+
+	Vector<Pointf> Check() const; // find self-intersections; empty return value = OK
+
+	String     Dump() const;
+};
+
+template class DeepCopyOption<VecCurve>;
+template DumpType<VecCurve>;
+*/
+
+//////////////////////////////////////////////////////////////////////
+
+#ifdef p
+#undef p
+#endif
+
+class VecArcInfo : public VecArc
+{
+public:
+	VecArcInfo();
+	VecArcInfo(Pointf p, Pointf q)                                  { Set(p, q); }
+	VecArcInfo(Pointf p, Pointf q, Pointf x)                        { Set(p, q, x); }
+	VecArcInfo(Pointf p, Pointf q, double bulge)                    { Set(p, q, bulge); }
+	VecArcInfo(Pointf c, double r, double a, double b)              { Set(c, r, a, b); }
+	VecArcInfo(Pointf c, double r)                                  { Set(c, r); }
+	VecArcInfo(Pointf c, Pointf a, Pointf b, bool anticlockwise)    { Set(c, a, b, anticlockwise); }
+	VecArcInfo(const VecArc& arc)                                   { Set(arc); }
+	VecArcInfo(const VecArcInfo& arc)                               { *this = arc; }
+
+	String      ToString() const;
+
+	void        Set(Pointf P, Pointf Q);
+	void        Set(Pointf P, Pointf Q, Pointf X);
+	void        Set(Pointf P, Pointf Q, double bulge);
+	void        Set(Pointf C, double r, double a, double b);
+	void        Set(Pointf C, double r);
+	void        Set(Pointf C, Pointf A, Pointf B, bool anticlockwise);
+
+	void        Set(const VecArc& arc)                              { Set(arc.A, arc.B, arc.bulge); }
+
+	void        Move(Pointf offset);
+
+	bool        IsCircle() const   { return circle; }
+	bool        IsCurved() const   { return curved; }
+	bool        IsReversed() const { return reversed; }
+
+	double      Length() const;
+	Pointf      CentreOfMass() const;
+
+	bool        ContainsBearing(double bearing) const;
+	double      Distance(Pointf point, double *arg = NULL) const;
+	bool        Crosses(Rectf rect) const;
+	Pointf      GetPointAt(double t) const;
+	double      GetMaxDistance(Pointf point, Pointf *farthest = NULL) const;
+
+	double      GetArg(double bearing) const;
+	double      GetArg(Pointf point) const;
+	VecArcInfo  Subset(double start, double end) const;
+
+	Rectf       GetBoundingBox() const;
+
+	double      GetAngle() const; // oriented included angle
+	double      GetStartTangent() const;
+	double      GetEndTangent() const;
+	Pointf      GetStartDir() const;
+	Pointf      GetEndDir() const;
+
+	VecArcInfo  Offset(double dist) const;
+
+	VecArcInfo  Reversed() const                                    { return VecArcInfo(*this).SetReversed(); }
+	VecArcInfo& SetReversed();
+
+	Pointf      C;        // centre of circle (Null when not bulged)
+	double      bow;      // bow length
+	double      alpha;    // start angle (rad); most clockwise point on arc
+	double      beta;     // end angle (rad); most anticlockwise point on arc
+	double      radius;   // circle radius (Null when not bulged)
+	bool        curved;   // true = it's an arc, false = it's a circle
+	bool        reversed; // true = arc has been entered as clockwise
+	bool        circle;   // true = it's a full circle
+};
+
+//////////////////////////////////////////////////////////////////////
+
+class VecIntersection
+{
+public:
+	VecIntersection() { count = 0; }
+
+	void   Mirror();
+	bool   Nothing() { count = 0; return false; }
+	void   Remove(int index);
+
+	bool   LL(Pointf P1, Pointf Q1, Pointf P2, Pointf Q2);
+	bool   LC(Pointf P1, Pointf Q1, Pointf C2, double r2);
+	bool   LA(Pointf P1, Pointf Q1, const VecArcInfo& a2);
+	bool   CC(Pointf C1, double r1, Pointf C2, double r2);
+	bool   CA(Pointf C1, double r1, const VecArcInfo& a2);
+	bool   AA(const VecArcInfo& a1, const VecArcInfo& a2);
+
+	bool   IsEmpty() const  { return count == 0; }
+	int    GetCount() const { return count; }
+
+public:
+	int    count; // number of intersections
+	double t[2], u[2];
+
+protected:
+	void   CheckBearing(double *hints, const VecArcInfo& a);
+};
+
+//////////////////////////////////////////////////////////////////////
+
+class VecArcIterator
+{
+public:
+	typedef Callback1<Pointf>     DrawProc;
+	typedef Gate2<Pointf, double> ArcProc;
+
+	VecArcIterator(const VecArc& arc, DrawProc _lineto);
+	VecArcIterator(Pointf start, Pointf end, double bulge, DrawProc _lineto);
+
+	VecArcIterator& Level(int _level)              { level = _level; return *this; }
+	VecArcIterator& Precision(double prec  )       { precision = prec; return *this; }
+	VecArcIterator& Clip(Rectf rect, DrawProc _mv) { clip = rect; moveto = _mv; return *this; }
+	VecArcIterator& ArcTo(ArcProc _arc)            { arcto = _arc; return *this; }
+
+	void            Go(); // recurse the arc
+
+public:
+	double          arclen;    // degenerate to simple arc under such length
+	int             level;     // maximum # segments = 2 ^ level
+	double          precision; // degenerate to line whenever |bulge| <= precision
+	VecArc          arc;       // arc to interpolate
+	Rectf           clip;      // clipping rectangle
+	DrawProc        moveto;    // moveto callback (needed only when clipping is on)
+	DrawProc        lineto;    // lineto callback
+	ArcProc         arcto;     // simple arcto callback
+
+protected:
+	enum
+	{
+		CF_XL = 001,
+		CF_XG = 002,
+		CF_YL = 010,
+		CF_YG = 020,
+
+		DEFAULT_LEVEL = 10,
+	};
+
+	Pointf          last;      // last iteration point
+	int             last_clip; // clipping status of last vertex
+
+	int             GetClip(Pointf point) const;
+	void            Recurse(Pointf to, double l, double h, int depth, int next_flclip);
+};
+
+//////////////////////////////////////////////////////////////////////
diff --git a/uppsrc/Geom/linsolv.cpp b/uppsrc/Geom/linsolv.cpp
new file mode 100644
index 000000000..132c17d8e
--- /dev/null
+++ b/uppsrc/Geom/linsolv.cpp
@@ -0,0 +1,129 @@
+#include "Geom.h"
+
+NAMESPACE_UPP
+
+LinearSolver::LinearSolver(int count, double tolerance)
+: rows(count)
+, col1(count + 1)
+, tolerance(tolerance)
+{
+	ASSERT(tolerance >= 0);
+	matrix.SetCount(count * (count + 1), 0);
+	left_rows.SetCount(rows);
+	left_cols.SetCount(rows);
+	for(int i = 0; i < rows; i++)
+		left_rows[i] = left_cols[i] = i;
+}
+
+void LinearSolver::AddLSI(const double *bases, double value)
+{
+	double *row = matrix.Begin();
+	const double *bi = bases;
+	for(int i = 0; i < rows; i++) {
+		const double *bj = bases;
+		for(int j = 0; j < rows; j++)
+			*row++ += *bi * *bj++;
+		*row++ += *bi++ * value;
+	}
+}
+
+Vector<double> LinearSolver::Solve()
+{
+	while(!left_rows.IsEmpty())
+	{
+		int er = -1, ec = -1;
+		double best = tolerance;
+		for(int pr = 0; pr < left_rows.GetCount(); pr++)
+		{
+			const double *p = Row(left_rows[pr]);
+			for(int pc = 0; pc < left_cols.GetCount(); pc++)
+			{
+				double v = fabs(p[left_cols[pc]]);
+				if(v > best)
+				{
+					best = v;
+					ec = pc;
+					er = pr;
+				}
+			}
+		}
+
+		if(er < 0 || best <= 0) // just to be sure
+		{ // no more fixed variables
+			for(int i = 0; i < left_rows.GetCount(); i++)
+				if(fabs(Right(left_rows[i])) > tolerance)
+					return Vector<double>(); // error
+			break;
+		}
+
+		int cr = left_rows[er], cc = left_cols[ec];
+
+		int p = left_rows.Pop();
+		if(er < left_rows.GetCount()) left_rows[er] = p;
+		p = left_cols.Pop();
+		if(ec < left_cols.GetCount()) left_cols[ec] = p;
+
+		const double *src = Row(cr);
+		const int *xb = left_cols.Begin(), *xe = left_cols.End();
+		for(int i = 0; i < left_rows.GetCount(); i++)
+		{
+			double *dest = Row(left_rows[i]);
+			double r = -dest[cc] / src[cc];
+			for(const int *xp = xb; xp < xe; xp++)
+				dest[*xp] += src[*xp] * r;
+			dest[rows] += src[rows] * r;
+		}
+
+		pivots.Add(Point(cc, cr));
+	}
+
+	Vector<double> result;
+	result.SetCount(rows, Null);
+	for(int r = pivots.GetCount(); --r >= 0;)
+	{
+		Point pivot = pivots[r];
+		const double *row = Row(pivot.y);
+		int px = pivot.x;
+		double out = row[rows]; // right side
+		for(int s = r; ++s < pivots.GetCount();)
+		{
+			int c = pivots[s].x;
+			out -= row[c] * result[c];
+		}
+		result[pivot.x] = out / row[pivot.x];
+	}
+
+	return result;
+}
+
+void LinearSolver::SelfTest()
+{
+	for(int i = 0; i < 1000; i++)
+	{
+		int ord = rand() % 10 + 1;
+		Vector<double> res;
+		while(res.GetCount() < ord)
+			res.Add(rand());
+		LinearSolver ls(ord);
+		for(int r = 0; r < ord; r++)
+		{
+			double rs = 0;
+			for(int c = 0; c < ord; c++)
+				rs += res[c] * (ls(r, c) = rand());
+			ls(r) = rs;
+		}
+		Vector<double> out = ls.Solve();
+		if(!out.IsEmpty())
+		{
+			ASSERT(out.GetCount() == ord);
+			for(int c = 0; c < out.GetCount(); c++)
+				if(!IsNull(out[c]))
+				{
+					double d = out[c] - res[c];
+					ASSERT(fabs(d) <= 1e-3);
+				}
+		}
+	}
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/Geom/linsolv.h b/uppsrc/Geom/linsolv.h
new file mode 100644
index 000000000..d49671f04
--- /dev/null
+++ b/uppsrc/Geom/linsolv.h
@@ -0,0 +1,30 @@
+class LinearSolver
+{
+public:
+	LinearSolver(int count, double tolerance = 1e-10);
+
+	double        *Row(int r)                        { return &matrix[r * col1]; }
+	const double  *Row(int r) const                  { return &matrix[r * col1]; }
+	double&        Left(int r, int c)                { return matrix[r * col1 + c]; }
+	double         Left(int r, int c) const          { return matrix[r * col1 + c]; }
+	double&        Right(int r)                      { return matrix[(r + 1) * col1 - 1]; }
+	double         Right(int r) const                { return matrix[(r + 1) * col1 - 1]; }
+	double&        operator () (int r, int c)        { return Left(r, c); }
+	double         operator () (int r, int c) const  { return Left(r, c); }
+	double&        operator () (int r)               { return Right(r); }
+	double         operator () (int r) const         { return Right(r); }
+
+	void           AddLSI(const double *bases, double value);
+
+	Vector<double> Solve();
+
+	static void    SelfTest();
+
+private:
+	int            rows;
+	int            col1;
+	Vector<double> matrix;
+	Vector<Point>  pivots;
+	double         tolerance;
+	Vector<int>    left_rows, left_cols;
+};
diff --git a/uppsrc/Geom/polyalg.cpp b/uppsrc/Geom/polyalg.cpp
new file mode 100644
index 000000000..cb6a56820
--- /dev/null
+++ b/uppsrc/Geom/polyalg.cpp
@@ -0,0 +1,1035 @@
+#include "Geom.h"
+#pragma hdrstop
+
+#include <float.h>
+
+NAMESPACE_UPP
+
+#define POLY_TIMING(n) // RTIMING(n)
+#define POLY_LOGGING   0 // 1 = on, 0 = off
+
+static bool ContainsPoints(const Point *poly, int count, Point P)
+{
+	if(count <= 2 || IsNull(P))
+		return false;
+	bool in = false;
+	Point A = poly[count - 1];
+	Size ap(cmp(A.x, P.x), cmp(A.y, P.y));
+	for(Point B; --count >= 0; A = B)
+	{
+		B = *poly++;
+		Size bp(cmp(B.x, P.x), cmp(B.y, P.y));
+		if(ap.cx < 0 && bp.cx < 0 || ap.cy > 0 && bp.cy > 0 || ap.cy < 0 && bp.cy < 0)
+			continue;
+		if((ap.cx | ap.cy) == 0 || (bp.cx | bp.cy) == 0)
+			return true;
+		else if(ap.cy == 0 && bp.cy == 0)
+		{
+			if(ap.cx <= 0 || bp.cx <= 0)
+				return true;
+		}
+		else if(ap.cy == 0)
+		{
+			if(ap.cx > 0 && bp.cy > 0)
+				in = !in;
+		}
+		else if(bp.cy == 0)
+		{
+			if(bp.cx > 0 && ap.cy > 0)
+				in = !in;
+		}
+		else if(ap.cx > 0 && bp.cx > 0)
+		{
+			in = !in;
+		}
+		else
+		{
+			int s = (B.x - A.x) * (P.y - A.y) - (B.y - A.y) * (P.x - A.x);
+			if(ap.cy > 0)
+				s = -s;
+			if(s == 0)
+				return true;
+			if(s > 0)
+				in = !in;
+		}
+	}
+	return in;
+}
+
+static inline int PolyCompare(Pointf P, Pointf A, Pointf B, Size ap, Size bp)
+{
+	if(ap.cx < 0 && bp.cx < 0 || ap.cy > 0 && bp.cy > 0 || ap.cy < 0 && bp.cy < 0)
+		return -1;
+	if((ap.cx | ap.cy) == 0 || (bp.cx | bp.cy) == 0)
+		return 0;
+	else if(ap.cy == 0 && bp.cy == 0)
+		return (ap.cx <= 0 || bp.cx <= 0 ? 0 : -1);
+	else if(ap.cy == 0)
+		return (ap.cx > 0 && bp.cy > 0 ? 1 : -1);
+	else if(bp.cy == 0)
+		return (bp.cx > 0 && ap.cy > 0 ? 1 : -1);
+	else if(ap.cx > 0 && bp.cx > 0)
+		return 1;
+	else
+	{
+		double s = (B.x - A.x) * (P.y - A.y) - (B.y - A.y) * (P.x - A.x);
+		if(ap.cy > 0)
+			s = -s;
+		return cmp(s, 0.0);
+	}
+}
+
+struct PolyPart : public Rectf
+{
+	PolyPart(Rectf rc, int first, int begin, int end)
+		: Rectf(rc), first(first), begin(begin), end(end) {}
+	int first, begin, end;
+};
+
+static Rectf SplitPoly(const Array<Pointf>& polygon, const Vector<int>& polyend, bool closed,
+	Array<PolyPart>& parts)
+{
+	if(polyend.IsEmpty())
+		return Null;
+	unsigned c = polygon.GetCount();
+	int n = 1;
+	if(c >= 1 << 16) { c >>= 16; n <<= 8; }
+	if(c >= 1 <<  8) { c >>=  8; n <<= 4; }
+	if(c >= 1 <<  4) { c >>=  4; n <<= 2; }
+	if(c >= 2) n <<= 1;
+	Rectf sum = Null;
+	int i = 0;
+	for(int p = 0; p < polyend.GetCount(); p++)
+	{
+		int e = polyend[p], f = (closed ? e - 1 : i++);
+		while(i < e)
+		{
+//			RTIMING("SplitPoly / part");
+			int ib = i;
+			int ie = min(i + n, e);
+			const Pointf *A = &polygon[f];
+			Rectf rc;
+			rc.left = rc.right = A -> x;
+			rc.top = rc.bottom = A -> y;
+			while(i < ie)
+			{
+//				RTIMING("SplitPoly / vertex");
+				A = &polygon[i++];
+				double Ax = A -> x, Ay = A -> y;
+				if     (Ax < rc.left)   rc.left   = Ax;
+				else if(Ax > rc.right)  rc.right  = Ax;
+				if     (Ay < rc.top)    rc.top    = Ay;
+				else if(Ay > rc.bottom) rc.bottom = Ay;
+			}
+//			RTIMING("SplitPoly / new");
+			parts.Add(new PolyPart(rc, f, ib, ie));
+			sum |= rc;
+			f = ie - 1;
+		}
+	}
+	return sum;
+}
+
+int ContainsPoints(const Array<Pointf>& polygon, const Vector<int>& polyend, const Array<Pointf>& points)
+{
+	if(points.IsEmpty() || polygon.GetCount() <= 1)
+		return false;
+	Array<PolyPart> parts;
+	Rectf prect = SplitPoly(polygon, polyend, true, parts);
+	bool is_in = false, is_out = false;
+	for(int p = 0; p < points.GetCount(); p++)
+	{
+		const Pointf& P = points[p];
+		if(!prect.Contains(P))
+		{
+			if(is_in)
+				return CMP_SECT;
+			is_out = true;
+			continue;
+		}
+		bool in = false;
+		for(int pp = 0; pp < parts.GetCount(); pp++)
+		{
+			const PolyPart& part = parts[pp];
+			if(part.right < P.x || part.top > P.y || part.bottom < P.y)
+				continue;
+			const Pointf *A = &polygon[part.first];
+			Size ap(cmp(A -> x, P.x), cmp(A -> y, P.y));
+			for(int j = part.begin; j < part.end; j++)
+			{
+				const Pointf *B = &polygon[j];
+				Size bp(cmp(B -> x, P.x), cmp(B -> y, P.y));
+				switch(PolyCompare(P, *A, *B, ap, bp))
+				{
+				case 0: return CMP_SECT;
+				case 1: in = !in; break;
+				}
+				A = B;
+				ap = bp;
+			}
+		}
+		(in ? is_in : is_out) = true;
+		if(is_in && is_out)
+			return CMP_SECT;
+	}
+	return is_in ? CMP_IN : CMP_OUT;
+}
+
+int ContainsPoints(const Array<Pointf>& polygon, const Array<Pointf>& points)
+{
+	if(points.IsEmpty() || polygon.GetCount() <= 1)
+		return false;
+	Vector<int> polyend;
+	polyend.SetCount(1);
+	polyend[0] = polygon.GetCount();
+	return ContainsPoints(polygon, polyend, points);
+}
+
+int ContainsPoint(const Array<Pointf>& polygon, const Vector<int>& polyend, Pointf pt)
+{
+	if(IsNull(pt) || polygon.GetCount() < 3 || polyend.IsEmpty())
+		return CMP_OUT;
+	Array<Pointf> plist;
+	plist.SetCount(1, pt);
+	return ContainsPoints(polygon, polyend, plist);
+}
+
+int ContainsPoint(const Array<Pointf>& polygon, Pointf pt)
+{
+	if(IsNull(pt) || polygon.GetCount() <= 1)
+		return CMP_OUT;
+	Array<Pointf> plist;
+	plist.SetCount(1, pt);
+	return ContainsPoints(polygon, plist);
+}
+
+int ContainsPoly(const Array<Pointf>& chkpoly,
+	const Array<Pointf>& polygon, const Vector<int>& polyend, bool closed)
+{
+//	RTIMING("Contains(Poly / Poly)");
+	if(chkpoly.IsEmpty() || polyend.IsEmpty())
+		return CMP_OUT;
+	if(polyend.GetCount() == polygon.GetCount())
+		return ContainsPoints(chkpoly, polygon);
+//	static TimingInspector prep("Contains(Poly / Poly) -> preprocess");
+//	prep.Start();
+	Array<PolyPart> pp, cp;
+	Rectf pfull = SplitPoly(polygon, polyend, closed, pp);
+	Vector<int> chkend;
+	chkend.SetCount(1);
+	chkend[0] = chkpoly.GetCount();
+	Rectf cfull = SplitPoly(chkpoly, chkend, true, cp);
+	int i, j;
+	for(i = pp.GetCount(); --i >= 0;)
+		if(!(pp[i] && cfull))
+			pp.Remove(i);
+//	prep.End();
+	if(pp.IsEmpty())
+		return CMP_OUT;
+	for(i = 0; i < pp.GetCount(); i++)
+	{
+		const PolyPart& api = pp[i];
+		if(!(api && cfull))
+			continue;
+		const Pointf *A0 = &polygon[api.first];
+		for(j = 0; j < cp.GetCount(); j++)
+		{
+			const PolyPart& bpi = cp[j];
+			if(api && bpi)
+			{
+				const Pointf *A = A0;
+				const Pointf *C0 = &chkpoly[bpi.first];
+				for(int ia = api.begin; ia < api.end; ia++)
+				{
+					const Pointf *B = &polygon[ia];
+					Pointf AB = *B - *A;
+					const Pointf *C = C0;
+					for(int ib = bpi.begin; ib < bpi.end; ib++)
+					{
+//						RTIMING("Contains(Poly / Poly) -> cross");
+						const Pointf *D = &chkpoly[ib];
+						Pointf CD = *D - *C, AC = *C - *A, BD = *D - *B;
+						int acd = sgn(AC % CD) + 1, bcd = sgn(BD % CD) + 1;
+						int cab = sgn(AC % AB) + 1, dab = sgn(BD % AB) + 1;
+						static const int clss[3] = { 0376104000, 0104104104, 0000104376 };
+						if(clss[acd] & (1 << (9 * bcd + 3 * cab + dab)))
+							return CMP_SECT;
+						C = D;
+					}
+					A = B;
+				}
+			}
+		}
+	}
+	if(!cfull.Contains(pfull))
+		return CMP_OUT;
+//	RTIMING("Contains(Poly / Poly) -> in / out");
+	Pointf P = polygon[0];
+	bool in = false;
+	for(i = 0; i < cp.GetCount(); i++)
+	{
+		const PolyPart& api = cp[i];
+		if(api.right < P.x || api.top > P.y || api.bottom < P.y)
+			continue;
+		const Pointf *A = &chkpoly[api.first];
+		Size cap(cmp(A -> x, P.x), cmp(A -> y, P.y));
+		for(j = api.begin; j < api.end; j++)
+		{
+			const Pointf *B = &chkpoly[j];
+			Size cbp(cmp(B -> x, P.x), cmp(B -> y, P.y));
+			switch(PolyCompare(P, *A, *B, cap, cbp))
+			{
+			case 0: return CMP_SECT;
+			case 1: in = !in; break;
+			}
+			A = B;
+			cap = cbp;
+		}
+	}
+	return (in ? CMP_IN : CMP_OUT);
+}
+
+int ContainsPoly(const Array<Pointf>& chkpoly, const Array<Pointf>& polygon, bool closed)
+{
+	if(chkpoly.GetCount() <= 2 || polygon.IsEmpty())
+		return CMP_OUT;
+	if(polygon.GetCount() == 1)
+		return ContainsPoint(chkpoly, polygon[0]);
+	Vector<int> polyend;
+	polyend.SetCount(1);
+	polyend[0] = polygon.GetCount();
+	return ContainsPoly(chkpoly, polygon, polyend, closed);
+}
+
+template <class T>
+struct PIUtils
+{
+	typedef int             PointList;
+	typedef int             Iterator;
+	typedef int             ConstIterator;
+};
+
+template <>
+struct PIUtils<int>
+{
+	typedef Vector<Point>   PointList;
+	typedef Point          *Iterator;
+	typedef const Point    *ConstIterator;
+
+	static int              tscale(int x, int y, int z)  { return iscale(x, y, z); }
+	static Size             tscale(Size x, int y, int z) { return iscale(x, y, z); }
+	static Rect             EmptyRect(Point pt)          { return Rect(pt.x, pt.y, pt.x + 1, pt.y + 1); }
+	static void             Copy(Iterator dst, ConstIterator src, ConstIterator lim)
+	{
+		while(src != lim)
+			*dst = *src, ++dst, ++src;
+	}
+	static int              MAXVAL()                     { return INT_MAX; }
+	static int              MulVector(Size a, Size b)    { return a.cx * b.cy - a.cy * b.cx; }
+};
+
+template <>
+struct PIUtils<double>
+{
+	typedef Array<Pointf>   PointList;
+	typedef Array<Pointf>::Iterator Iterator;
+	typedef Array<Pointf>::ConstIterator ConstIterator;
+
+	static double           tscale(double x, double y, double z) { return x * y / z; }
+	static Sizef            tscale(Sizef x, double y, double z)  { return x * (y / z); }
+	static Rectf            EmptyRect(Pointf pt)                 { return Rectf(pt.x, pt.y, pt.x, pt.y); }
+	static void             Copy(Iterator dst, ConstIterator src, ConstIterator lim)
+	{
+		while(src != lim)
+			*dst = *src, ++dst, ++src;
+	}
+	static double           MAXVAL()                    { return DBL_MAX; }
+	static double           MulVector(Sizef a, Sizef b) { return a.cx * b.cy - a.cy * b.cx; }
+};
+
+template <class T>
+struct PolygonIterator
+{
+	PolygonIterator(Rect_<T> clip, int max_trace_points);
+
+	void                    Add(typename PIUtils<T>::ConstIterator vertices, int vertex_count, const int *counts, int count_count);
+	void                    Run();
+
+	static bool             SegmentLess(const typename PIUtils<T>::PointList& a, const typename PIUtils<T>::PointList& b)
+	{
+		Point_<T> a0 = a[0], b0 = b[0];
+		if(a0.y != b0.y) return a0.y < b0.y;
+		if(a0.x != b0.x) return a0.x < b0.x;
+		return a[1].x < b[1].x; // this is guess but perhaps usually true
+	}
+
+	struct Trace
+	{
+		typename PIUtils<T>::PointList     done;
+		typename PIUtils<T>::PointList     avail;
+		typename PIUtils<T>::ConstIterator next;
+		typename PIUtils<T>::ConstIterator stop;
+		Point_<T>                 ypos;
+		Point_<T>                 end;
+		Size_<T>                  delta;
+
+		T                         GetX(T y) const
+		{ return delta.cy ? end.x - PIUtils<T>::tscale(end.y - y, delta.cx, delta.cy) : end.x; }
+
+		void                      Add(Point_<T> p)
+		{
+			while(done.GetCount() >= 2
+			&& PIUtils<T>::MulVector(p - done.Top(), p - done[done.GetCount() - 2]) == 0)
+				done.Drop();
+			done.Add(p);
+		}
+	};
+
+	void                    Step(T ymax);
+	void                    Flush(int index, T ypos);
+	void                    CheckTraces();
+
+	void                    DumpTraces(T y) const;
+	void                    DumpSegments() const;
+	void                    DumpDone(int i) const;
+
+	Rect_<T>                clip;
+	T                       ymin, ymax;
+	Rect_<T>                src_clip;
+	int                     max_trace_points;
+	Array<Trace>            traces;
+	Vector< typename PIUtils<T>::PointList > segments;
+	typename PIUtils<T>::PointList out_vertices;
+	Vector<int>             out_counts;
+};
+
+void SplitPolygon(const Point *vertices, int vertex_count, const int *counts, int count_count,
+	Vector<Point>& out_vertices, Vector<int>& out_counts, Rect clip, int max_trace_points)
+{
+	POLY_TIMING("SplitPolygon");
+	PolygonIterator<int> pi(clip, max_trace_points);
+	pi.Add(vertices, vertex_count, counts, count_count);
+	pi.Run();
+	out_vertices = pi.out_vertices;
+	out_counts = pi.out_counts;
+}
+
+void SplitPolygon(const Vector<Point>& vertices, const Vector<int>& counts,
+	Vector<Point>& out_vertices, Vector<int>& out_counts, Rect clip, int max_trace_points)
+{
+	SplitPolygon(vertices.Begin(), vertices.GetCount(), counts.Begin(), counts.GetCount(),
+		out_vertices, out_counts, clip, max_trace_points);
+}
+
+void SplitPolygon(Array<Pointf>::ConstIterator vertices, int vertex_count, const int *counts, int count_count,
+	Array<Pointf>& out_vertices, Vector<int>& out_counts, Rectf clip, int max_trace_points)
+{
+	POLY_TIMING("SplitPolygon");
+	PolygonIterator<double> pi(clip, max_trace_points);
+	pi.Add(vertices, vertex_count, counts, count_count);
+	pi.Run();
+	out_vertices = pi.out_vertices;
+	out_counts = pi.out_counts;
+}
+
+void SplitPolygon(const Array<Pointf>& vertices, const Vector<int>& counts,
+	Array<Pointf>& out_vertices, Vector<int>& out_counts, Rectf clip, int max_trace_points)
+{
+	SplitPolygon(vertices.Begin(), vertices.GetCount(), counts.Begin(), counts.GetCount(),
+		out_vertices, out_counts, clip, max_trace_points);
+}
+
+template <class T>
+PolygonIterator<T>::PolygonIterator(Rect_<T> clip, int max_trace_points)
+: clip(clip), max_trace_points(max_trace_points)
+{
+	ymax = INT_MIN;
+}
+
+template <class T>
+void PolygonIterator<T>::Add(typename PIUtils<T>::ConstIterator vertices, int vertex_count, const int *counts, int count_count)
+{
+	POLY_TIMING("PolygonIterator::Add");
+	if(vertex_count <= 2)
+		return;
+	T cmin = IsNull(clip) ? -PIUtils<T>::MAXVAL() : clip.top;
+	T cmax = IsNull(clip) ? +PIUtils<T>::MAXVAL() : clip.bottom;
+	src_clip = PIUtils<T>::EmptyRect(vertices[0]);
+	for(; --count_count >= 0; vertices += *counts++)
+	{
+		typename PIUtils<T>::ConstIterator p = vertices, e = vertices + *counts, l = e - 1;
+		T ytop = p -> y;
+		typename PIUtils<T>::ConstIterator q = p;
+		for(; p != e; ++p)
+		{
+			if(p -> y > ytop)
+				ytop = (q = p) -> y;
+#if POLY_LOGGING
+			src_clip |= PIUtils<T>::EmptyRect(*p);
+#endif
+		}
+		ymax = max(ymax, ytop);
+		p = q;
+		do
+		{
+			typename PIUtils<T>::ConstIterator ub = p;
+			ASSERT(ub < e);
+			if(++p > q)
+			{
+				while(p != e && p[0].y <= p[-1].y)
+					p++;
+				if(p == e && q != vertices && vertices[0].y <= p[-1].y)
+					p = vertices + 1;
+			}
+			while(p < q && p[0].y <= p[-1].y)
+				p++;
+			if(p == q && p[-1].y == ub -> y)
+				break;
+			typename PIUtils<T>::ConstIterator ue = --p;
+			bool degen1 = (ub -> y == ue -> y || ub -> y <= cmin || ue -> y >= cmax);
+			if(!degen1 && ub > ue)
+			{
+				while(ue > vertices && (ue[-1].y == ue[0].y || ue[-1].y <= cmin))
+					ue--;
+				while(ub < l && (ub[1].y == ub[0].y || ub[1].y >= cmax))
+					ub++;
+				if(ub == l && ue > vertices && (l -> y == vertices -> y || vertices -> y >= cmax))
+					ub = vertices;
+				else if(ue == vertices && ub < l && (l -> y == ue -> y || l -> y <= cmin))
+					ue = l;
+			}
+			if(!degen1)
+			{
+				while(ub < ue && (ub[1].y == ub[0].y || ub[1].y >= cmax))
+					ub++;
+				while(ue > ub && (ue[0].y == ue[-1].y || ue[-1].y <= cmin))
+					ue--;
+			}
+			typename PIUtils<T>::PointList& seg1 = segments.Add();
+			seg1.SetCount(degen1 ? 2 : ue - ub + 1 + (ue > ub ? 0 : *counts));
+			ASSERT(seg1.GetCount() >= 2);
+			ASSERT(ub != e);
+			typename PIUtils<T>::Iterator sp = seg1.End();
+			if(degen1)
+			{
+				sp -= 2;
+				sp[0] = sp[1] = (ub -> y <= cmin ? Point_<T>(ub -> x, cmin)
+				: ue -> y >= cmax ? Point_<T>(ue -> x, cmax) : *ub);
+			}
+			else
+			{
+				if(ub -> y > cmax)
+				{
+					Size_<T> delta = (ub == l ? vertices[0] : ub[1]) - *ub;
+					*--sp = Point_<T>(ub -> x + PIUtils<T>::tscale(cmax - ub -> y, delta.cx, delta.cy), cmax);
+					if(++ub == e)
+						ub = vertices;
+				}
+				else
+					*--sp = *ub++;
+				if(ub > ue)
+				{
+					for(; ub < e; *--sp = *ub++)
+						;
+					ub = vertices;
+				}
+				while(ub < ue)
+					*--sp = *ub++;
+				if(ue -> y < cmin)
+				{
+					Size delta = (ue == vertices ? *l : ue[-1]) - *ue;
+					*--sp = Point_<T>(ue -> x + PIUtils<T>::tscale(cmin - ue -> y, delta.cx, delta.cy), cmin);
+				}
+				else
+					*--sp = *ub++;
+			}
+			ASSERT(sp == seg1.Begin());
+			ub = p;
+			if(p >= q)
+			{
+				while(p < l && p[1].y >= p[0].y)
+					p++;
+				if(p == l && vertices -> y >= p -> y)
+					p = vertices;
+			}
+			while(p < q && p[1].y >= p[0].y)
+				p++;
+			ue = p;
+			bool degen2 = (ub -> y == ue -> y || ub -> y >= cmax || ue -> y <= cmin);
+			if(!degen2 && ub > ue)
+			{
+				while(ue > vertices && (ue[-1].y == ue[0].y || ue[-1].y >= cmax))
+					ue--;
+				while(ub < l && (ub[1].y == ub[0].y || ub[1].y <= cmin))
+					ub++;
+				if(ub == l && ue > vertices && (l -> y == vertices -> y || vertices -> y <= cmin))
+					ub = vertices;
+				else if(ue == vertices && ub < l && (l -> y == ue -> y || l -> y >= cmax))
+					ue = l;
+			}
+			if(!degen2)
+			{
+				while(ub < ue && (ub[1].y == ub[0].y || ub[1].y <= cmin))
+					ub++;
+				while(ue > ub && (ue[0].y == ue[-1].y || ue[-1].y >= cmax))
+					ue--;
+			}
+			typename PIUtils<T>::PointList& seg2 = segments.Add();
+			seg2.SetCount(degen2 ? 2 : ue - ub + 1 + (ue > ub ? 0 : *counts));
+			ASSERT(seg2.GetCount() >= 2);
+			sp = seg2.Begin();
+			if(degen2)
+				sp[0] = sp[1] = (ub -> y >= cmax ? Point_<T>(ub -> x, cmax) : ue -> y <= cmin ? Point_<T>(ue -> x, cmin) : *ub);
+			else
+			{
+				if(ub -> y < cmin)
+				{
+					Size_<T> delta = (ub == l ? vertices[0] : ub[1]) - *ub;
+					*sp++ = Point_<T>(ub -> x + PIUtils<T>::tscale(cmin - ub -> y, delta.cx, delta.cy), cmin);
+				}
+				else
+					*sp++ = *ub;
+				if(++ub == e)
+					ub = vertices;
+
+				if(ue -> y > cmax)
+				{
+					Size_<T> delta = (ue == vertices ? *l : ue[-1]) - *ue;
+					seg2.Top() = Point_<T>(ue -> x + PIUtils<T>::tscale(cmax - ue -> y, delta.cx, delta.cy), cmax);
+				}
+				else
+					seg2.Top() = *ue;
+
+				if(ub > ue)
+				{
+					PIUtils<T>::Copy(sp, ub, e);
+					sp += e - ub;
+					PIUtils<T>::Copy(sp, vertices, ue);
+					sp += ue - vertices;
+				}
+				else
+				{
+					PIUtils<T>::Copy(sp, ub, ue);
+					sp += ue - ub;
+				}
+				ASSERT(sp == seg2.End() - 1);
+			}
+			if(degen1 && degen2)
+				segments.Remove(segments.GetCount() - 2, 2);
+		}
+		while(p != q);
+		ASSERT(!(segments.GetCount() & 1));
+	}
+	ymax = min(ymax, cmax);
+
+#if POLY_LOGGING
+	{ // check segment pair integrity
+		VectorMap<T, int> counts;
+		int i;
+		for(i = 0; i < segments.GetCount(); i++)
+			counts.GetAdd(segments[i].Top().y, 0)++;
+		for(i = 0; i < counts.GetCount(); i++)
+			if(counts[i] & 1)
+				RLOG("odd bottom position " << counts.GetKey(i));
+	}
+#endif//POLY_LOGGING
+}
+
+template <class T>
+void PolygonIterator<T>::DumpSegments() const
+{
+	for(int i = 0; i < segments.GetCount(); i++)
+	{
+		String seglog;
+		seglog << "[" << i << "]: " << segments[i][0];
+		for(int j = 1; j < segments[i].GetCount(); j++)
+			seglog << " -> " << segments[i][j];
+		RLOG(seglog);
+	}
+}
+
+template <class T>
+void PolygonIterator<T>::Run()
+{
+	POLY_TIMING("PolygonIterator::Run");
+	if(segments.GetCount() < 2)
+		return;
+	Sort(segments, &PolygonIterator::SegmentLess);
+#if POLY_LOGGING
+	RLOG("PolygonIterator::Run");
+	DumpSegments();
+#endif//POLY_LOGGING
+
+	ymin = segments[0][0].y;
+	for(int s = 0; s < segments.GetCount();)
+	{
+		T y = segments[s][0].y;
+		Step(y);
+		int t = 0;
+		for(; s < segments.GetCount() && segments[s][0].y == y; s += 2)
+		{
+			ASSERT(segments[s + 1][0].y == y);
+			T x1 = segments[s + 0][0].x;
+			while(t < traces.GetCount() && traces[t].ypos.x < x1)
+				t++;
+			int i1 = t;
+			T x2 = segments[s + 1][0].x;
+			while(t < traces.GetCount() && traces[t].ypos.x < x2)
+				t++;
+			int i2 = t;
+#if POLY_LOGGING
+			RLOG("y = " << y << ", insert[" << i1 << " - " << i2 << "]: segment #" << s);
+#endif//POLY_LOGGING
+			for(int flush = (i1 + 1) | 1; flush <= i2; flush += 2)
+				Flush(flush, y);
+			Trace& n = traces.Insert(i1);
+			i2++;
+			n.avail = segments[s];
+			n.next = n.avail.Begin();
+			n.stop = n.avail.End() - 1;
+			n.end = *++n.next;
+			n.delta = n.end - n.next[-1];
+			if(i1 & 1)
+			{ // hole opening
+				Trace& r = traces[i1 + 1];
+				n.done = r.done;
+#if POLY_LOGGING
+				RLOG("insert: r.ypos = " << r.ypos);
+				if(r.ypos.y < n.done.Top().y)
+					RLOG("join-insert (1) y reversal: " << n.done.Top() << " -> " << r.ypos);
+#endif//POLY_LOGGING
+				n.Add(r.ypos);
+				if(r.ypos.x != x1)
+				{
+#if POLY_LOGGING
+					if(r.ypos.y < n.done.Top().y)
+						RLOG("join-insert (2) y reversal: " << n.done.Top() << " -> " << r.ypos);
+#endif//POLY_LOGGING
+					n.Add(n.next[-1]);
+				}
+				r.done.Clear();
+				r.Add(r.ypos);
+#if POLY_LOGGING
+				DumpDone(i1 + 1);
+#endif//POLY_LOGGING
+			}
+			else // simply insert segment
+				n.Add(n.next[-1]);
+			Trace& o = traces.Insert(i2);
+			o.avail = segments[s + 1];
+			o.next = o.avail.Begin();
+			o.stop = o.avail.End() - 1;
+			o.Add(*o.next);
+			o.end = *++o.next;
+			o.delta = o.end - o.next[-1];
+#if POLY_LOGGING
+			RLOG("insert: o.avail = " << o.avail.GetCount() << ", end = " << o.end);
+			DumpDone(i2);
+#endif//POLY_LOGGING
+			t += 2;
+		}
+	}
+#if POLY_LOGGING
+	CheckTraces();
+#endif//POLY_LOGGING
+	Step(ymax + 1);
+#if POLY_LOGGING
+	LOG("//PolygonIterator::Run");
+#endif//POLY_LOGING
+}
+
+template <class T>
+void PolygonIterator<T>::Step(T ymax)
+{
+	POLY_TIMING("PolygonIterator::Step");
+	while(ymin < ymax && !traces.IsEmpty())
+	{
+		Trace *p, *q;
+		for(;;)
+		{ // check for trace swaps
+			p = &traces[0];
+			p -> ypos.y = min(p -> end.y, ymax);
+			p -> ypos.x = p -> GetX(p -> ypos.y);
+			int swap_index = -1;
+			Point_<T> swap;
+			int t;
+			for(t = 1; t < traces.GetCount(); t++)
+			{
+				q = &traces[t];
+				if(q -> end.y >= p -> ypos.y)
+					q -> ypos.x = q -> GetX(q -> ypos.y = p -> ypos.y);
+				else
+				{
+					q -> ypos = q -> end;
+					p -> ypos.x = p -> GetX(p -> ypos.y = q -> end.y);
+					swap_index = -1;
+				}
+				if(q -> ypos.x <= p -> ypos.x)
+				{
+					T det = PIUtils<T>::MulVector(p -> delta, q -> delta);
+					if(det > 0)
+					{
+						T num = PIUtils<T>::MulVector(p -> end - q -> end, q -> delta);
+						Point_<T> new_swap = p -> end - PIUtils<T>::tscale(p -> delta, minmax<T>(num, 0, det), det);
+						if(new_swap.y <= q -> ypos.y)
+						{
+							swap_index = t;
+							swap = new_swap;
+							q -> ypos = new_swap;
+						}
+					}
+				}
+				p = q;
+			}
+			if(swap_index < 0)
+				break;
+			p = &traces[swap_index - 1];
+			q = &traces[swap_index - 0];
+#if POLY_LOGGING
+			RLOG("ymin = " << ymin << ", swap[" << swap_index << "]: " << swap << ": l = "
+				<< (p -> end - p -> delta) << " -> " << p -> end << " (" << p -> delta << "), "
+				"r = " << (q -> end - q -> delta) << " -> " << q -> end << " (" << q -> delta << ")");
+			DumpDone(swap_index - 1);
+			if(swap.y < p -> done.Top().y)
+				RLOG("swap y reversal in p: " << p -> done.Top() << " -> " << swap);
+			DumpDone(swap_index - 0);
+			if(swap.y < q -> done.Top().y)
+				RLOG("swap y reversal in q: " << q -> done.Top() << " -> " << swap);
+#endif//POLY_LOGGING
+			p -> Add(swap);
+			q -> Add(swap);
+			Swap(p -> done, q -> done);
+			traces.Swap(swap_index, swap_index - 1);
+		}
+
+		ymin = p -> ypos.y;
+
+#if POLY_LOGGING
+		RLOG("after swap: ymin = " << ymin);
+		DumpTraces(ymin);
+#endif//POLY_LOGGING
+
+		if(p -> ypos.y >= ymax)
+			return;
+
+		ASSERT(!(traces.GetCount() & 1));
+		Buffer<bool> remove(traces.GetCount());
+		Fill<bool>(remove, remove + traces.GetCount(), false);
+		int nremove = 0;
+		bool hseg = false;
+		for(int t = 0; t < traces.GetCount(); t++)
+		{
+			Trace& p = traces[t];
+
+			while(p.end.y <= ymin)
+			{
+#if POLY_LOGGING
+				if(p.end.y < p.done.Top().y)
+					RLOG("remove y reversal[" << t << "]: " << p.done.Top() << " -> " << p.end);
+#endif//POLY_LOGGING
+				p.Add(p.end);
+				if(p.next < p.stop)
+				{
+					p.delta = (p.end = p.next[1]) - p.next[0];
+					if(p.delta.cy == 0)
+						hseg = true;
+					p.next++;
+				}
+				else
+				{
+					nremove++;
+					remove[t] = true;
+					break;
+				}
+			}
+		}
+		if(nremove)
+		{
+			ASSERT(!(nremove & 1));
+			int t = traces.GetCount();
+			if(t == nremove)
+			{
+				for(int i = 1; i < traces.GetCount(); i += 2)
+					Flush(i, ymin);
+				traces.Clear();
+				return;
+			}
+			while(--t >= 0)
+			{
+				while(t >= 0 && !remove[t])
+					t--;
+				if(t < 0)
+					break;
+				int i2 = t;
+				ASSERT(i2 >= 1);
+				while(!remove[--t])
+					;
+				int i1 = t;
+				ASSERT(i1 >= 0);
+#if POLY_LOGGING
+				LOG("ymin = " << ymin << ", remove[" << i1 << " - " << i2 << "] & " << ymin << ": l = "
+				<< (traces[i1].end - traces[i1].delta) << " -> " << traces[i1].end << " (" << traces[i1].delta << "), "
+				"r = " << (traces[i2].end - traces[i2].delta) << " -> " << traces[i2].end << " (" << traces[i2].delta << ")");
+#endif//POLY_LOGGING
+				for(int flush = i2 | 1; flush >= i1; flush -= 2)
+					Flush(flush, ymin);
+				if(i2 == i1 + 1)
+					traces.Remove(i1, 2);
+				else
+				{
+					traces.Remove(i2);
+					traces.Remove(i1);
+				}
+			}
+		}
+#if POLY_LOGGING
+		RLOG("After removals:");
+		DumpTraces(ymin);
+#endif//POLY_LOGGING
+		if(hseg)
+		{ // horizontal segments present, check for horizontal swaps
+			ASSERT(!traces.IsEmpty());
+			Trace *p = &traces[0];
+			p -> ypos.x = p -> GetX(p -> ypos.y = ymin);
+			for(int t = 1; t < traces.GetCount(); t++)
+			{
+				Trace *q = &traces[t];
+				if((q -> ypos.x = q -> GetX(q -> ypos.y = ymin)) >= p -> ypos.x)
+					p = q;
+				else
+				{
+					int u = t - 1;
+					do
+					{
+						Trace *r = &traces[u];
+						q -> Add(q -> ypos);
+						q -> Add(r -> ypos);
+						r -> Add(r -> ypos);
+						r -> Add(q -> ypos);
+						Swap(q -> done, r -> done);
+						traces.Swap(u, u + 1);
+					}
+					while(--u >= 0 && q -> ypos.x < traces[u].ypos.x);
+				}
+			}
+#if POLY_LOGGING
+			RLOG("After horizontal swaps:");
+			DumpTraces(ymin);
+#endif//POLY_LOGGING
+		}
+	}
+}
+
+template <class T>
+void PolygonIterator<T>::Flush(int index, T ypos)
+{
+	POLY_TIMING("PolygonIterator::Flush");
+	ASSERT(index & 1);
+	Trace& p = traces[index - 1];
+	Trace& q = traces[index - 0];
+	p.ypos.x = p.GetX(p.ypos.y = ypos);
+	q.ypos.x = q.GetX(q.ypos.y = ypos);
+	int count = out_vertices.GetCount();
+#if POLY_LOGGING
+	RLOG("flush[" << index << "] at pos " << ypos << ": left done = " << p.done.GetCount()
+		<< ", right done = " << q.done.GetCount());
+	String plist, qlist;
+	int c;
+	for(c = 1; c < p.done.GetCount(); c++)
+	{
+		plist << ' ' << p.done[c];
+		if(p.done[c].y < p.done[c - 1].y)
+		{
+			RLOG("y reversal in p & " << c << ": " << p.done[c - 1] << " -> " << p.done[c]);
+		}
+	}
+	RLOG("plist = " << p.done[0] << plist);
+	for(c = 1; c < q.done.GetCount(); c++)
+	{
+		qlist << ' ' << q.done[c];
+		if(q.done[c].y < q.done[c - 1].y)
+		{
+			RLOG("y reversal in q & " << c << ": " << q.done[c - 1] << " -> " << q.done[c]);
+		}
+	}
+	RLOG("qlist = " << q.done[0] << qlist);
+#endif
+	out_vertices.Append(p.done);
+	if(out_vertices.Top() != p.ypos)
+		out_vertices.Add(p.ypos);
+	if(q.ypos != p.ypos)
+		out_vertices.Add(q.ypos);
+	typename PIUtils<T>::ConstIterator qe = q.done.End();
+	if(*--qe != q.ypos)
+		out_vertices.Add(*qe);
+	typename PIUtils<T>::ConstIterator qb = q.done.Begin();
+	if(*qb == p.done[0] && qb < qe)
+		qb++;
+	out_vertices.SetCountR(out_vertices.GetCount() + (qe - qb));
+	typename PIUtils<T>::Iterator out = out_vertices.End();
+	while(qb < qe)
+		*--out = *qb++;
+	if(out_vertices.GetCount() <= count + 2)
+		out_vertices.SetCountR(count); // trash degenerate segment
+	else
+	{
+#if POLY_LOGGING
+		String seg;
+		Rect_<T> extent = PIUtils<T>::EmptyRect(out_vertices[count]);
+		for(int i = count; i < out_vertices.GetCount(); i++)
+		{
+			seg << ' ' << out_vertices[i];
+			extent |= PIUtils<T>::EmptyRect(out_vertices[i]);
+		}
+		RLOG("extent = " << extent << ":" << seg);
+		if(!src_clip.Contains(extent))
+			RLOG("-> out of source clip " << src_clip);
+#endif
+		out_counts.Add(out_vertices.GetCount() - count);
+	}
+	p.done.Clear();
+	p.done.Add(p.ypos);
+	q.done.Clear();
+	q.done.Add(q.ypos);
+#if POLY_LOGGING
+	DumpDone(index - 1);
+	DumpDone(index - 0);
+#endif//POLY_LOGGING
+}
+
+template <class T>
+void PolygonIterator<T>::CheckTraces()
+{
+	VectorMap<T, int> counts;
+	int i;
+	for(i = 0; i < traces.GetCount(); i++)
+		counts.GetAdd(traces[i].stop -> y, 0)++;
+	for(i = 0; i < counts.GetCount(); i++)
+		if(counts[i] & 1)
+		{
+			RLOG("unpaired end of trace #" << i << ": " << traces[i].stop -> y);
+			NEVER();
+		}
+}
+
+template <class T>
+void PolygonIterator<T>::DumpTraces(T y) const
+{
+	String out;
+	out << traces.GetCount() << " traces & " << y << ":";
+	for(int t = 0; t < traces.GetCount(); t++)
+		out << ' ' << traces[t].GetX(y);
+	RLOG(out);
+}
+
+template <class T>
+void PolygonIterator<T>::DumpDone(int i) const
+{
+	String out;
+	out << "done[" << i << "]:";
+	for(int t = 0; t < traces[i].done.GetCount(); t++)
+		out << ' ' << traces[i].done[t];
+	RLOG(out);
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/Geom/vecalg.cpp b/uppsrc/Geom/vecalg.cpp
new file mode 100644
index 000000000..0775ec53b
--- /dev/null
+++ b/uppsrc/Geom/vecalg.cpp
@@ -0,0 +1,1721 @@
+#include "Geom.h"
+
+
+NAMESPACE_UPP
+
+//////////////////////////////////////////////////////////////////////
+// Distance: Distance from point to line.
+//////////////////////////////////////////////////////////////////////
+
+double Distance(Pointf X, Pointf A, Pointf B, double *arg)
+{
+	Pointf AB = B - A;
+	Pointf AX = X - A;
+	double ab2 = Squared(AB);
+	double abx = AB ^ AX;
+	if(abx <= 0 || ab2 == 0)
+	{
+		if(arg)
+			*arg = 0;
+		return X | A;
+	}
+	if(abx >= ab2)
+	{
+		if(arg)
+			*arg = 1;
+		return X | B;
+	}
+	if(arg)
+		*arg = abx / ab2;
+	return sqrt(sqr(AX % AB) / ab2);
+}
+
+//////////////////////////////////////////////////////////////////////
+// Distance: Distance from point to arc.
+//////////////////////////////////////////////////////////////////////
+
+double Distance(Pointf X, Pointf A, Pointf B, double bulge, double* arg)
+{
+	if(bulge == 0)
+		return Distance(X, A, B, arg);
+	return VecArcInfo(A, B, bulge).Distance(X, arg);
+}
+
+//////////////////////////////////////////////////////////////////////
+// Distance: Distance from point to circle.
+//////////////////////////////////////////////////////////////////////
+
+double Distance(Pointf X, Pointf C, double radius, double *arg)
+{
+	if(arg)
+		*arg = Bearing(X, C) / TWOPI;
+	return fabs((X | C) - radius);
+}
+
+//////////////////////////////////////////////////////////////////////
+// CheckAgainstInterval: checks a real value against an interval.
+//////////////////////////////////////////////////////////////////////
+
+enum { FI_B = 0x01, FI_I = 0x02, FI_A = 0x04 };
+
+static inline char CheckAgainstInterval(double x, double l, double h)
+{
+	return x < l ? FI_B : x > h ? FI_A : FI_I;
+}
+
+//////////////////////////////////////////////////////////////////////
+// Crosses: checks whether a line crosses a rectangle.
+//////////////////////////////////////////////////////////////////////
+
+bool Crosses(Rectf R, Pointf A, Pointf B)
+{
+	if(R.Contains(A) || R.Contains(B))
+		return true;
+	char ax = CheckAgainstInterval(A.x, R.left, R.right);
+	char ay = CheckAgainstInterval(A.y, R.top,  R.bottom);
+	char bx = CheckAgainstInterval(B.x, R.left, R.right);
+	char by = CheckAgainstInterval(B.y, R.top,  R.bottom);
+	if(((ax & bx) & (FI_B | FI_A)) || ((ay & by) & (FI_B | FI_A)))
+		return false; // all in a by-plane
+	if((ax & bx) & FI_I || (ay & by) & FI_I)
+		return true; // crossing through
+	if(!((ax | ay | bx | by) & FI_I))
+	{ // diagonal cross
+		double t, u;
+		Pointf AB = B - A;
+		double n = A % B;
+		if(ax == ay)
+		{
+			t = R.TopRight()   % AB;
+			u = R.BottomLeft() % AB;
+		}
+		else
+		{
+			t = R.TopLeft()     % AB;
+			u = R.BottomRight() % AB;
+		}
+		return (t >= n && u <= n) || (t <= n && u >= n);
+	}
+
+	static const char clue1[4][4] =
+	{
+		{ 9, 0, 9, 1 },
+		{ 2, 9, 9, 3 },
+		{ 9, 9, 9, 9 },
+		{ 4, 5, 9, 9 },
+	};
+
+	ax = clue1[bx - 1][ax - 1];
+	ay = clue1[by - 1][ay - 1];
+
+	ASSERT(ax != 9 && ay != 9);
+
+	static const char clue2[6][6] =
+	{
+		{ 9, 7, 4, 7, 4, 9 },
+		{ 0, 9, 4, 7, 9, 3 },
+		{ 5, 5, 9, 9, 6, 6 },
+		{ 0, 0, 9, 9, 3, 3 },
+		{ 5, 9, 1, 2, 9, 6 },
+		{ 9, 2, 1, 2, 1, 9 },
+	};
+
+	ax = clue2[ay][ax];
+
+	double temp;
+	switch(ax >> 1)
+	{
+	default: ASSERT(0); // invalid choice
+	case 0: temp = (B - A) % (R.BottomLeft() - A); break;
+	case 1: temp = (B - A) % (R.BottomRight() - A); break;
+	case 2: temp = (B - A) % (R.TopLeft() - A); break;
+	case 3: temp = (B - A) % (R.TopRight() - A); break;
+	}
+
+	return (ax & 1) ? temp >= 0 : temp <= 0;
+}
+
+//////////////////////////////////////////////////////////////////////
+// Crosses: checks whether a bulge crosses a rectangle.
+//////////////////////////////////////////////////////////////////////
+
+bool Crosses(Rectf R, Pointf A, Pointf B, double bulge)
+{
+	if(R.Contains(A) || R.Contains(B))
+		return true;
+
+	return VecArcInfo(A, B, bulge).Crosses(R);
+}
+
+//////////////////////////////////////////////////////////////////////
+// Crosses: checks whether a circle crosses a rectangle.
+//////////////////////////////////////////////////////////////////////
+
+bool Crosses(Rectf R, Pointf C, double radius)
+{
+	Rectf box = PointfRectf(C);
+	box.Inflate(radius);
+	if(R.Contains(box))
+		return true;
+	if(!box.Intersects(R))
+		return false;
+
+	box = R - C;
+	radius *= radius;
+
+	int temp = 0;
+	if(Squared(box.TopLeft())     > radius) temp |= 1;
+	if(Squared(box.TopRight())    > radius) temp |= 2;
+	if(Squared(box.BottomLeft())  > radius) temp |= 4;
+	if(Squared(box.BottomRight()) > radius) temp |= 8;
+	if(temp != 15)
+		return temp != 0;
+	return (box.left * box.right < 0 || box.top * box.bottom < 0);
+}
+
+//////////////////////////////////////////////////////////////////////
+
+bool ClipLine(Pointf& A, Pointf& B, Rectf R)
+{
+	if(IsNull(R) || R.IsEmpty()) // null rectangle
+		return false;
+
+	if(R.Contains(A) && R.Contains(B)) // both are in
+		return true;
+
+	bool rev = false;
+	if(A.x > B.x)
+	{
+		rev ^= true;
+		Swap(A, B);
+	}
+
+	// now clip x coordinate; A.x <= B.x
+	if(B.x <= R.left || A.x >= R.right)
+		return false;
+
+	if(A.x < R.left)
+	{
+		A.y += (B.y - A.y) * (A.x - R.left) / (A.x - B.x);
+		A.x  = R.left;
+	}
+	if(B.x > R.right)
+	{
+		B.y += (A.y - B.y) * (B.x - R.right) / (B.x - A.x);
+		B.x  = R.right;
+	}
+
+	if(A.y > B.y)
+	{
+		rev ^= true;
+		Swap(A, B);
+	}
+
+	// now clip y coordinate. A.y <= B.y
+	if(B.y <= R.top || A.y >= R.bottom)
+		return false;
+
+	if(A.y < R.top)
+	{
+		A.x += (B.x - A.x) * (A.y - R.top) / (A.y - B.y);
+		A.y  = R.top;
+	}
+	if(B.y > R.bottom)
+	{
+		B.x += (A.x - B.x) * (B.y - R.bottom) / (B.y - A.y);
+		B.y  = R.bottom;
+	}
+
+	if(rev)
+		Swap(A, B);
+
+	return true;
+}
+
+//////////////////////////////////////////////////////////////////////
+
+bool ClipLine(Pointf& A, Pointf& B, Rect R)
+{
+	if(R.IsEmpty()) // null rectangle
+		return false;
+
+	if(A.x >= R.left && A.x <= R.right && A.y >= R.top && A.y <= R.bottom
+	&& B.x >= R.left && B.x <= R.right && B.y >= R.top && B.y <= R.bottom)
+		return true; // both are in
+
+	bool rev = false;
+	if(A.x > B.x)
+	{
+		rev ^= true;
+		Swap(A, B);
+	}
+
+	// now clip x coordinate; A.x <= B.x
+	if(B.x <= R.left || A.x >= R.right)
+		return false;
+
+	if(A.x < R.left)
+	{
+		A.y += (B.y - A.y) * (A.x - R.left) / (A.x - B.x);
+		A.x  = R.left;
+	}
+	if(B.x > R.right)
+	{
+		B.y += (A.y - B.y) * (B.x - R.right) / (B.x - A.x);
+		B.x  = R.right;
+	}
+
+	if(A.y > B.y)
+	{
+		rev ^= true;
+		Swap(A, B);
+	}
+
+	// now clip y coordinate. A.y <= B.y
+	if(B.y <= R.top || A.y >= R.bottom)
+		return false;
+
+	if(A.y < R.top)
+	{
+		A.x += (B.x - A.x) * (A.y - R.top) / (A.y - B.y);
+		A.y  = R.top;
+	}
+	if(B.y > R.bottom)
+	{
+		B.x += (A.x - B.x) * (B.y - R.bottom) / (B.y - A.y);
+		B.y  = R.bottom;
+	}
+
+	if(rev)
+		Swap(A, B);
+
+	return true;
+}
+
+//////////////////////////////////////////////////////////////////////
+
+bool ClipLine(Point& A, Point& B, Rect R)
+{
+	if(R.IsEmpty()) // null rectangle
+		return false;
+
+	if(A.x >= R.left && A.x <= R.right && A.y >= R.top && A.y <= R.bottom
+	&& B.x >= R.left && B.x <= R.right && B.y >= R.top && B.y <= R.bottom)
+		return true; // both are in
+
+	bool rev = false;
+	if(A.x > B.x)
+	{
+		rev ^= true;
+		Swap(A, B);
+	}
+
+	// now clip x coordinate; A.x <= B.x
+	if(B.x <= R.left || A.x >= R.right)
+		return false;
+
+	if(A.x < R.left)
+	{
+		A.y += (B.y - A.y) * (A.x - R.left) / (A.x - B.x);
+		A.x  = R.left;
+	}
+	if(B.x > R.right)
+	{
+		B.y += (A.y - B.y) * (B.x - R.right) / (B.x - A.x);
+		B.x  = R.right;
+	}
+
+	if(A.y > B.y)
+	{
+		rev ^= true;
+		Swap(A, B);
+	}
+
+	// now clip y coordinate. A.y <= B.y
+	if(B.y <= R.top || A.y >= R.bottom)
+		return false;
+
+	if(A.y < R.top)
+	{
+		A.x += (B.x - A.x) * (A.y - R.top) / (A.y - B.y);
+		A.y  = R.top;
+	}
+	if(B.y > R.bottom)
+	{
+		B.x += (A.x - B.x) * (B.y - R.bottom) / (B.y - A.y);
+		B.y  = R.bottom;
+	}
+
+	if(rev)
+		Swap(A, B);
+
+	return true;
+}
+
+//////////////////////////////////////////////////////////////////////
+
+Rectf GetBoundingBox(const Array<Pointf>& vertices)
+{
+	if(vertices.IsEmpty())
+		return Null;
+	Rectf rc = PointfRectf(vertices[0]);
+	for(int i = 1; i < vertices.GetCount(); i++)
+		SetUnion(rc, vertices[i]);
+	return rc;
+}
+
+//////////////////////////////////////////////////////////////////////
+
+Rect GetBoundingBox(const Point *vertices, int vertex_count)
+{
+	if(vertex_count == 0)
+		return Null;
+	Rect rc(*vertices, Size(1, 1));
+	const Point *e = vertices + vertex_count;
+	while(++vertices < e)
+	{
+		if(vertices -> x < rc.left)    rc.left   = vertices -> x;
+		if(vertices -> x >= rc.right)  rc.right  = vertices -> x + 1;
+		if(vertices -> y < rc.top)     rc.top    = vertices -> y;
+		if(vertices -> y >= rc.bottom) rc.bottom = vertices -> y + 1;
+	}
+	return rc;
+}
+
+//////////////////////////////////////////////////////////////////////
+
+Rect GetBoundingBox(const Vector<Point>& vertices)
+{
+	return GetBoundingBox(vertices.Begin(), vertices.GetCount());
+}
+
+//////////////////////////////////////////////////////////////////////
+// VecArcIterator::
+
+VecArcIterator::VecArcIterator(Pointf start, Pointf end, double bulge, Callback1<Pointf> lineto)
+	: clip(Null), arc(start, end, bulge), lineto(lineto)
+{
+	level = DEFAULT_LEVEL;
+	precision = 1; // default precision
+}
+
+//////////////////////////////////////////////////////////////////////
+
+VecArcIterator::VecArcIterator(const VecArc& arc, Callback1<Pointf> lineto)
+	: clip(Null), arc(arc), lineto(lineto)
+{
+	level = DEFAULT_LEVEL;
+	precision = 1; // default precision
+}
+
+//////////////////////////////////////////////////////////////////////
+
+void VecArcIterator::Go()
+{
+	ASSERT(precision >= 0);
+	last = arc.A;
+	last_clip = (IsNull(clip) ? 0 : GetClip(arc.A));
+	int end_clip = (IsNull(clip) ? 0 : GetClip(arc.B));
+	arclen = 0;
+	if(!IsNull(clip) && arcto)
+		arclen = Diagonal(clip);
+	double l = arc.VecLine::Length();
+	if(l <= precision && fabs(arc.bulge) <= precision)
+		return;
+	if(2 * fabs(arc.bulge) <= l) // less than semicircle - generate all in one go
+		Recurse(arc.B, l, arc.bulge, level, end_clip);
+	else
+	{ // divide in two halves
+		double ll, hh;
+		Pointf centre;
+		VecArc::Bisect(arc.A, arc.B, l, arc.bulge, centre, ll, hh);
+		int centre_clip = IsNull(clip) ? 0 : GetClip(centre);
+		Recurse(centre, ll, hh, level - 1, centre_clip);
+		Recurse(arc.B, ll, hh, level - 1, end_clip);
+	}
+}
+
+//////////////////////////////////////////////////////////////////////
+
+void VecArcIterator::Recurse(Pointf next, double l, double h, int depth, int next_clip)
+{
+	if(--depth < 0 || fabs(h) <= precision || fabs(l) <= precision)
+		lineto(next); // degenerate to line
+	else
+	{ // bisect arc
+		if(l < arclen)
+    	{
+			ASSERT(!IsNull(clip) && arcto);
+			if(2 * Distance(clip, Mid(last, next)) <= l + precision)
+				if(arcto(next, h))
+				{
+					last = next;
+					last_clip = next_clip;
+					return;
+				}
+		}
+		Pointf normal = Right(next - last) * h / l;
+		Pointf centre = Mid(last, next) + normal;
+		double ll = centre | next;
+		double hh = h * ll / (ll + ll + l);
+		int centre_clip = 0;
+		if(last_clip | next_clip)
+		{
+			if(last_clip & next_clip & GetClip(last + normal) & GetClip(next + normal))
+			{ // clip this out
+				moveto(next);
+				last = next;
+				last_clip = next_clip;
+				return;
+			}
+			centre_clip = GetClip(centre);
+		}
+		Recurse(centre, ll, hh, depth, centre_clip);
+		Recurse(next, ll, hh, depth, next_clip);
+	}
+	last = next;
+	last_clip = next_clip;
+}
+
+//////////////////////////////////////////////////////////////////////
+
+int VecArcIterator::GetClip(Pointf point) const
+{
+	return (point.x < clip.left ? CF_XL : point.x > clip.right  ? CF_XG : 0)
+		|  (point.y < clip.top  ? CF_YL : point.y > clip.bottom ? CF_YG : 0);
+}
+
+//////////////////////////////////////////////////////////////////////
+
+double Vec_tolerance       = 1e-6;
+double Vec_ang_tolerance   = 1e-6;
+double Vec_outer_tolerance = 1e30;
+
+//////////////////////////////////////////////////////////////////////
+
+bool VecTolEq(double x, double y)
+{
+	return fabs(x - y) <= Vec_tolerance;
+}
+
+//////////////////////////////////////////////////////////////////////
+
+bool VecTolEq(Pointf a, Pointf b)
+{
+	return VecTolEq(a.x, b.x) && VecTolEq(a.y, b.y);
+}
+
+//////////////////////////////////////////////////////////////////////
+
+VecLine::VecLine()
+: A(Null), B(Null)
+{
+}
+
+//////////////////////////////////////////////////////////////////////
+
+VecLine& VecLine::SetNull()
+{
+	A = B = Null;
+	return *this;
+}
+
+//////////////////////////////////////////////////////////////////////
+
+double VecLine::Distance(Pointf point, double* arg) const
+{
+	if(IsNull(point) || IsNull(*this))
+		return Null;
+	return UPP::Distance(point, A, B, arg);
+}
+
+//////////////////////////////////////////////////////////////////////
+
+Pointf VecLine::Mid() const
+{
+	return UPP::Mid(A, B);
+}
+
+//////////////////////////////////////////////////////////////////////
+
+Pointf VecLine::Right() const
+{
+	return UPP::Right(Vector());
+}
+
+//////////////////////////////////////////////////////////////////////
+
+Pointf VecLine::Left() const
+{
+	return UPP::Left(Vector());
+}
+
+//////////////////////////////////////////////////////////////////////
+
+Pointf VecLine::Vector() const
+{
+	return B - A;
+}
+
+//////////////////////////////////////////////////////////////////////
+
+VecLine VecLine::Reversed() const
+{
+	return VecLine(B, A);
+}
+
+//////////////////////////////////////////////////////////////////////
+
+VecLine& VecLine::SetReversed()
+{
+	Swap(A, B);
+	return *this;
+}
+
+//////////////////////////////////////////////////////////////////////
+
+VecLine& VecLine::SetClip(Rectf R)
+{
+	if(IsNull(*this)) // null line
+		return *this;
+
+	if(IsNull(R) || R.IsEmpty()) // null rectangle
+		return SetNull();
+
+	if(R.Contains(A) && R.Contains(B)) // both are in
+		return *this;
+
+	bool rev = false;
+	if(A.x > B.x)
+	{
+		rev ^= true;
+		SetReversed();
+	}
+
+	// now clip x coordinate; A.x <= B.x
+	if(B.x <= R.left || A.x >= R.right)
+		return SetNull();
+
+	if(A.x < R.left)
+	{
+		A.y += (B.y - A.y) * (A.x - R.left) / (A.x - B.x);
+		A.x  = R.left;
+	}
+	if(B.x > R.right)
+	{
+		B.y += (A.y - B.y) * (B.x - R.right) / (B.x - A.x);
+		B.x  = R.right;
+	}
+
+	if(A.y > B.y)
+	{
+		rev ^= true;
+		SetReversed();
+	}
+
+	// now clip y coordinate. A.y <= B.y
+	if(B.y <= R.top || A.y >= R.bottom)
+		return SetNull();
+
+	if(A.y < R.top)
+	{
+		A.x += (B.x - A.x) * (A.y - R.top) / (A.y - B.y);
+		A.y  = R.top;
+	}
+	if(B.y > R.bottom)
+	{
+		B.x += (A.x - B.x) * (B.y - R.bottom) / (B.y - A.y);
+		B.y  = R.bottom;
+	}
+
+	if(rev)
+		SetReversed();
+
+	return *this;
+}
+
+//////////////////////////////////////////////////////////////////////
+
+double VecLine::GetArg(Pointf pt) const
+{
+	Pointf AB = Vector();
+	return minmax<double>(((pt - A) ^ AB) / Squared(AB), 0, 1);
+}
+
+//////////////////////////////////////////////////////////////////////
+
+Pointf VecLine::GetPointAt(Pointf A, Pointf B, double arg)
+{
+	return A + (B - A) * arg;
+}
+
+//////////////////////////////////////////////////////////////////////
+
+Pointf VecLine::GetPointAt(double arg) const
+{
+	return GetPointAt(A, B, arg);
+}
+
+//////////////////////////////////////////////////////////////////////
+
+String Dump(VecLine line)
+{
+	String out;
+	if(IsNull(line))
+		out = "Null(VecLine)";
+	else
+		out << "VecLine(" << line.A << " -> " << line.B << ")";
+	return out;
+}
+
+//////////////////////////////////////////////////////////////////////
+// VecArc::
+
+VecArc::VecArc()
+	: bulge(Null)
+{
+}
+
+//////////////////////////////////////////////////////////////////////
+
+VecArc VecArc::Reversed() const
+{
+	return VecArc(B, A, -bulge);
+}
+
+//////////////////////////////////////////////////////////////////////
+
+VecArc& VecArc::SetReversed()
+{
+	VecLine::SetReversed();
+	bulge = -bulge;
+	return *this;
+}
+
+//////////////////////////////////////////////////////////////////////
+
+Pointf VecArc::ArcMid() const
+{
+	return ArcMid(A, B, A | B, bulge);
+}
+
+//////////////////////////////////////////////////////////////////////
+
+double VecArc::ArcLength() const
+{
+	return ArcLength(A, B, A | B, bulge);
+}
+
+//////////////////////////////////////////////////////////////////////
+
+Rectf VecArc::GetBoundingBox() const
+{
+	Rectf result = SortRectf(A, B);
+	double l = A | B;
+	if(fabs(bulge) <= Vec_tolerance || tabs(l) <= Vec_tolerance)
+		return result;
+	if(2 * fabs(bulge) >= l)
+	{ // more than semiarc - split in two
+		Pointf centre;
+		double ll, hh;
+		Bisect(A, B, l, bulge, centre, ll, hh);
+		return VecArc(A, centre, hh).GetBoundingBox()
+		| VecArc(centre, B, hh).GetBoundingBox();
+	}
+
+	double r = bulge / 2 + l * l / (8 * bulge);
+	Pointf C = UPP::Mid(A, B) + UPP::Right(B - A) * ((bulge - r) / l);
+	int q1 = (A.x < C.x) ^ (A.y < C.y ? 3 : 0);
+	int q2 = (B.x < C.x) ^ (B.y < C.y ? 3 : 0);
+	if(r < 0) // swap quadrants
+	{
+		int temp = q2; q2 = q1; q1 = temp;
+		r = -r;
+	}
+	if(q2 < q1 || (q2 == q1 && bulge >= r))
+		q2 += 4;
+	q1 = ((1 << q2) - 1) ^ ((1 << q1) - 1);
+	if(q1 & 0x11)
+		SetUnion(result, C + Pointf(0, +r));
+	if(q1 & 0x22)
+		SetUnion(result, C + Pointf(-r, 0));
+	if(q1 & 0x44)
+		SetUnion(result, C + Pointf(0, -r));
+	if(q1 & 0x88)
+		SetUnion(result, C + Pointf(+r, 0));
+
+	return result;
+}
+
+//////////////////////////////////////////////////////////////////////
+
+String Dump(const VecArc& arc)
+{
+	String out;
+	if(IsNull(arc))
+		out = "Null(VecArc)";
+	else
+		out << "VecArc(" << arc.A << " -> " << arc.B << ", bulge = " << arc.bulge << ")";
+	return out;
+}
+
+//////////////////////////////////////////////////////////////////////
+
+Pointf VecArc::ArcMid(Pointf P, Pointf Q, double l, double h)
+{
+	Pointf result = UPP::Mid(P, Q);
+	if(l > Vec_tolerance)
+		result += UPP::Right(Q - P) * (h / l);
+	return result;
+}
+
+//////////////////////////////////////////////////////////////////////
+
+double VecArc::ArcLength(Pointf P, Pointf Q, double l, double h)
+{
+	l *= 0.5;
+	double ll = sqrt(l * l + h * h);
+	if(l <= Vec_tolerance)
+		return 0; // too short, sorry
+	if((l /= ll) <= 1e-10) // arcsin(x) \approx x
+		return 4 * ll;
+	return 4 * ll * asin(l) / l;
+}
+
+//////////////////////////////////////////////////////////////////////
+
+Pointf VecArc::GetPointAt(double t) const
+{
+	return GetPointAt(A, B, A | B, bulge, t);
+}
+
+//////////////////////////////////////////////////////////////////////
+
+Pointf VecArc::GetPointAt(Pointf P, Pointf Q, double l, double h, double t)
+{
+	if(l <= Vec_tolerance || fabs(h) <= Vec_tolerance)
+		return VecLine::GetPointAt(P, Q, t);
+	double k = l * 0.5;
+	double lambda = h / k;
+	Pointf C = UPP::Mid(P, Q);
+	double beta = 2 * atan(lambda);
+	t = sin((2 * t - 1) * beta) / sin(beta);
+	C += (Q - P) * (t / 2);
+	double k2 = k * k;
+	double k4 = k2 * k2;
+	double l2 = lambda * lambda;
+	double opl = 1 + l2;
+	t *= t;
+	double denom = sqrt(opl * opl - 4 * l2 * t) + 1 - l2;
+	if(denom > Vec_tolerance)
+		C += UPP::Right(Q - P) * (4 * l2 * (1 - t) / denom);
+	return C;
+}
+
+//////////////////////////////////////////////////////////////////////
+
+void VecArc::Bisect(Pointf P, Pointf Q, double l, double h, Pointf& centre, double& ll, double& hh)
+{
+	centre = UPP::Mid(P, Q) + UPP::Right(Q - P) * h / l;
+	ll = sqrt(l * l / 4 + h * h);
+	hh = h * ll / (2 * ll + l);
+}
+
+//////////////////////////////////////////////////////////////////////
+// VecVertex::
+
+/*
+VecVertex::VecVertex()
+	: Pointf(Null), bulge(0)
+{
+}
+
+//////////////////////////////////////////////////////////////////////
+
+String VecVertex::Dump() const
+{
+	return Pointf::Dump() + Format(" (%.10g)", bulge);
+}
+
+//////////////////////////////////////////////////////////////////////
+// VecCurve::
+
+VecCurve::VecCurve()
+{
+}
+
+//////////////////////////////////////////////////////////////////////
+
+VecCurve::VecCurve(const VecCurve& another, int)
+	: Base(another, 0)
+{
+}
+
+//////////////////////////////////////////////////////////////////////
+
+void VecCurve::Add(const VecVertex& vertex)
+{
+	Base::Add(vertex);
+}
+
+//////////////////////////////////////////////////////////////////////
+
+void VecCurve::Add(Pointf point)
+{
+	Base::Add(point);
+}
+
+//////////////////////////////////////////////////////////////////////
+
+void VecCurve::Add(Pointf point, double bulge)
+{
+	Base::Add(VecVertex(point, bulge));
+}
+
+//////////////////////////////////////////////////////////////////////
+
+void VecCurve::Add(double x, double y, double bulge)
+{
+	Base::Add(VecVertex(x, y, bulge));
+}
+
+//////////////////////////////////////////////////////////////////////
+
+String VecCurve::Dump() const
+{
+	if(IsEmpty())
+		return "Null(VecCurve)";
+	String dump = '(' + (*this)[0].Dump();
+	for(int i = 1; i < GetCount(); i++)
+		dump << " -> " << (*this)[i].Dump();
+	return dump + ')';
+}
+
+//////////////////////////////////////////////////////////////////////
+
+Vector<Pointf> VecCurve::Check() const
+{
+	Vector<Pointf> errors;
+	int count = GetCount();
+	if(count < 2)
+		return errors; // 1 or 0 vertices - no errors
+	if(count == 2)
+	{ // special case: segment bulges & vertices should differ
+		const VecVertex& A = (*this)[0];
+		const VecVertex& B = (*this)[1];
+		if(VecTolEq(A, B))
+			errors.Add(A);
+		else if(VecTolEq(A.bulge, -B.bulge)) // same bulges - add centre of the arc
+			errors.Add(VecArc(A, B, B.bulge).ArcMid());
+		return errors;
+	}
+	return errors;
+}
+
+//////////////////////////////////////////////////////////////////////
+
+VecArc VecCurve::Segment(int i) const
+{
+	int count = GetCount();
+	ASSERT(i >= 0 && i < count);
+	int j = i + 1;
+	if(j >= count)
+		j = 0;
+	const VecVertex& A = (*this)[i];
+	const VecVertex& B = (*this)[j];
+	return VecArc(A, B, B.bulge);
+}
+*/
+
+//////////////////////////////////////////////////////////////////////
+///// VecArcInfo::
+
+VecArcInfo::VecArcInfo()
+	: C(Null)
+	, radius(Null)
+	, alpha(Null)
+	, beta(Null)
+	, bow(Null)
+{
+}
+
+///// methods
+
+//////////////////////////////////////////////////////////////////////
+// Set: sets arc defined by centre, endpoints & orientation.
+
+void VecArcInfo::Set(Pointf _C, Pointf _A, Pointf _B, bool anticlockwise)
+{
+	A = _A;
+	B = _B;
+	C = _C;
+	reversed = !anticlockwise;
+	bow = A | B;
+	alpha = UPP::Bearing(A - C);
+	beta = UPP::Bearing(B - C);
+	radius = B | C;
+	circle = (A == B);
+	curved = circle || (bow > Vec_tolerance);
+	if(reversed)
+		Swap(alpha, beta);
+	while(beta <= alpha)
+		beta += 2 * M_PI;
+	bulge = Null;
+	if(circle)
+		bulge = 2 * radius;
+	else if(curved)
+	{
+		bulge = (reversed ? -radius : +radius) - ((B - A) % (C - A)) / bow;
+		curved = (fabs(bulge) > Vec_tolerance);
+	}
+}
+
+//////////////////////////////////////////////////////////////////////
+// Set: sets up a line segment (degenerated arc).
+//////////////////////////////////////////////////////////////////////
+
+void VecArcInfo::Set(Pointf _P, Pointf _Q)
+{
+	A        = _P;
+	B        = _Q;
+	bow      = A | B;
+	bulge    = 0;
+
+	alpha    = Null;
+	beta     = Null;
+	radius   = Null;
+	C        = Null;
+
+	curved   = false;
+	reversed = false;
+	circle   = false;
+}
+
+//////////////////////////////////////////////////////////////////////
+// Set: sets up arc defined by endpoints and a point on arc.
+//////////////////////////////////////////////////////////////////////
+
+void VecArcInfo::Set(Pointf _P, Pointf _Q, Pointf X)
+{
+	circle = false;
+
+	bow = _P | _Q;
+
+	if(bow <= Vec_tolerance)
+	{ // singular bow: A = B
+		Set(_P, _Q);
+		return;
+	}
+
+	double x2  = UPP::Squared(X);
+	Pointf     AX  = X - _P;
+	Pointf     BX  = X - _Q;
+	double m1x = (x2 - UPP::Squared(_P)) / 2;
+	double m1y = (x2 - UPP::Squared(_Q)) / 2;
+	double det = AX % BX;
+	Pointf     dc(m1x * BX.y - m1y * AX.y, m1y * AX.x - m1x * BX.x);
+
+	if(fabs(det) * Vec_outer_tolerance <= max(fabs(dc.x), fabs(dc.y)))
+		Set(_P, _Q);
+	else
+	{
+		A = _P;
+		B = _Q;
+		curved    = true;
+		reversed  = false;
+
+		C         = dc / det;
+		radius    = X | C;
+		alpha     = UPP::Bearing(A - C);
+		beta      = UPP::Bearing(B - C);
+
+		if(det >= 0)
+		{ // reverse arc direction
+			Swap(alpha, beta);
+			reversed = true;
+		}
+		if(beta < alpha)
+			beta += TWOPI;
+
+		bulge = (det >= 0 ? -radius : +radius) - ((B - A) % (C - A)) / bow;
+	}
+}
+
+//////////////////////////////////////////////////////////////////////
+// Set: sets up arc defined by chord and bulge.
+//////////////////////////////////////////////////////////////////////
+
+void VecArcInfo::Set(Pointf _P, Pointf _Q, double _bulge)
+{
+	circle = false;
+
+	bow = _P | _Q;
+
+	if(bow <= Vec_tolerance || fabs(_bulge) <= Vec_tolerance)
+	{ // singular bow
+		Set(_P, _Q);
+		return;
+	}
+
+	A        = _P;
+	B        = _Q;
+	bulge    = _bulge;
+	curved   = true;
+	reversed = false;
+
+	radius = _bulge / 2 + bow * bow / (8 * _bulge);
+	C      = UPP::Mid(A, B) + UPP::Right(B - A) * ((_bulge - radius) / bow);
+	alpha  = UPP::Bearing(A - C);
+	beta   = UPP::Bearing(B - C);
+
+	if(bulge < 0)
+	{ // reverse arc direction
+		double temp;
+		temp = alpha; alpha = beta; beta = temp;
+		reversed = true;
+	}
+	if(beta < alpha)
+		beta += TWOPI;
+	if(radius < 0)
+		radius = -radius;
+}
+
+//////////////////////////////////////////////////////////////////////
+// Set: sets up arc defined by centre, radius & angles.
+//////////////////////////////////////////////////////////////////////
+
+void VecArcInfo::Set(Pointf _C, double r, double a, double b)
+{
+	if((r = fabs(r)) <= Vec_tolerance)
+	{ // singular arc: zero radius
+		Set(_C, _C);
+		return;
+	}
+
+	C      = _C;
+	radius = r;
+	alpha  = modulo(a, TWOPI);
+
+	double delta = modulo(b - a, TWOPI);
+	beta   = alpha + delta;
+
+	A        = C + PolarPointf(r, a);
+	B        = C + PolarPointf(r, b);
+	bulge    = radius * (1 - cos(delta / 2));
+	bow      = A | B;
+	circle   = false;
+	curved   = true;
+	reversed = false;
+}
+
+//////////////////////////////////////////////////////////////////////
+// Set: sets the arc to a full circle.
+//////////////////////////////////////////////////////////////////////
+
+void VecArcInfo::Set(Pointf _C, double r)
+{
+	circle   = true;
+	curved   = true;
+	reversed = false;
+	C        = _C;
+	radius   = fabs(r);
+	alpha    = 0;
+	beta     = 2 * M_PI;
+	A        = C;
+	A.x     += radius;
+	B        = A;
+	bow      = 0;
+	bulge    = 2 * radius;
+}
+
+//////////////////////////////////////////////////////////////////////
+
+Pointf VecArcInfo::CentreOfMass() const
+{
+	if(IsCircle())
+		return C;
+	Pointf M = UPP::Mid(A, B);
+	if(!IsCurved())
+		return M;
+	double extrusion = bow / (beta - alpha) - radius + fabs(bulge);
+	return M + Unit(IsReversed() ? UPP::Left(M) : UPP::Right(M)) * extrusion;
+}
+
+//////////////////////////////////////////////////////////////////////
+
+void VecArcInfo::Move(Pointf offset)
+{
+	if(!IsNull(A)) A += offset;
+	if(!IsNull(B)) B += offset;
+	if(!IsNull(C)) C += offset;
+}
+
+//////////////////////////////////////////////////////////////////////
+
+double VecArcInfo::Length() const
+{
+	if(IsCircle())
+		return TWOPI * radius;
+	if(IsCurved())
+		return (beta - alpha) * radius;
+	return bow;
+}
+
+//////////////////////////////////////////////////////////////////////
+// ContainsBearing: checks whether arc contains given bearing.
+//////////////////////////////////////////////////////////////////////
+
+bool VecArcInfo::ContainsBearing(double bearing) const
+{
+	if(IsCircle())
+		return true;
+
+	if(radius <= Vec_tolerance)
+		return false;
+
+	double tol = Vec_tolerance / radius;
+
+	if(bearing >= alpha - tol && bearing <= beta + tol
+	|| modulo(bearing - alpha + tol, TWOPI) <= beta - alpha + 2 * tol)
+		return true;
+
+	return false;
+}
+
+//////////////////////////////////////////////////////////////////////
+// GetPointAt: returns point on parametric curve.
+//////////////////////////////////////////////////////////////////////
+
+Pointf VecArcInfo::GetPointAt(double t) const
+{
+	if(IsCircle())
+		return PolarPointf(C, radius, t * (reversed ? -TWOPI : TWOPI) + alpha);
+	else if(IsCurved())
+		return PolarPointf(C, radius, alpha
+		+ (reversed ? 1 - t : t) * (beta - alpha));
+	else
+		return A + (B - A) * t;
+}
+
+//////////////////////////////////////////////////////////////////////
+
+VecArcInfo& VecArcInfo::SetReversed()
+{
+	if(IsCircle())
+		reversed ^= true;
+	else if(IsCurved())
+	{
+		Swap(A, B);
+		bulge = -bulge;
+		reversed ^= true;
+	}
+	else
+		Swap(A, B);
+	return *this;
+}
+
+//////////////////////////////////////////////////////////////////////
+// Dump: displays arc information on given stream.
+//////////////////////////////////////////////////////////////////////
+
+String Dump(const VecArcInfo& arc)
+{
+	String output;
+	if(arc.IsCircle())
+	{
+		output
+			<< "VecArcInfo (circle) { centre: " << arc.C
+			<< ", radius: " << arc.radius;
+	}
+	else
+	{
+		output << "VecArcInfo" << (arc.IsCurved() ? " (arc)" : " (line)")
+			<< " { bow " << arc.A << " -> " << arc.B << ", length: " << arc.bow;
+		if(arc.IsCurved())
+			output
+				<< ", bulge: "  << arc.bulge
+				<< ", centre: " << arc.C
+				<< ", radius: " << arc.radius
+				<< ", alpha: "  << arc.alpha / DEGRAD
+				<< ", beta: "   << arc.beta / DEGRAD;
+	}
+	output << " }";
+	return output;
+}
+
+//////////////////////////////////////////////////////////////////////
+// Distance: distance between arc and point.
+
+double VecArcInfo::Distance(Pointf X, double* arg) const
+{
+	if(IsCircle())
+	{
+		if(arg)
+			*arg = GetArg(X);
+		return fabs((X | C) - radius);
+	}
+	if(!IsCurved())
+		return UPP::Distance(X, A, B, arg);
+
+	bool a = (A - C) % (X - C) > 0;
+	bool b = (X - C) % (B - C) > 0;
+	if(IsReversed())
+	{
+		a ^= true;
+		b ^= true;
+	}
+
+	if(2 * fabs(bulge) < bow)
+	{
+		if(a && b)
+		{
+			if(arg)
+				*arg = GetArg(X);
+			return fabs((X | C) - radius);
+		}
+	}
+	else
+	{
+		if(a || b)
+		{
+			if(arg)
+				*arg = GetArg(X);
+			return fabs((X | C) - radius);
+		}
+	}
+	double da = X | A, db = X | B;
+	if(da < db)
+	{
+		if(arg)
+			*arg = 0;
+		return da;
+	}
+	else
+	{
+		if(arg)
+			*arg = 1;
+		return db;
+	}
+}
+
+//////////////////////////////////////////////////////////////////////
+
+double VecArcInfo::GetMaxDistance(Pointf point, Pointf *farthest) const
+{
+	if(IsCircle() || IsCurved() && ContainsBearing(UPP::Bearing(C, point)))
+	{
+		double distance = (point | C) + radius;
+		if(farthest)
+			*farthest = point + UPP::Length(C - point, radius);
+		return distance;
+	}
+
+	double l1 = point | A, l2 = point | B;
+	if(farthest)
+		*farthest = (l1 >= l2 ? A : B);
+	return max(l1, l2);
+}
+
+//////////////////////////////////////////////////////////////////////
+
+bool VecArcInfo::Crosses(Rectf R) const
+{
+	if(IsNull(*this))
+		return false;
+
+	if(!IsCurved())
+		return UPP::Crosses(R, A, B);
+
+	if(R.Contains(A) || R.Contains(B))
+		return true;
+
+	if(!UPP::Crosses(R, C, radius))
+		return false;
+
+	if(IsCircle())
+		return true;
+
+	VecIntersection dummy;
+	Pointf K = R.TopLeft();
+	Pointf L = R.TopRight();
+	Pointf M = R.BottomRight();
+	Pointf N = R.BottomLeft();
+
+	return dummy.LA(K, L, *this) || dummy.LA(L, M, *this)
+		|| dummy.LA(M, N, *this) || dummy.LA(N, K, *this);
+}
+
+//////////////////////////////////////////////////////////////////////
+
+double VecArcInfo::GetArg(double bearing) const
+{
+	bearing = modulo(bearing - alpha, 2 * M_PI);
+	double included = beta - alpha;
+	if(included)
+		bearing /= included;
+	return minmax<double>(IsReversed() ? 1 - bearing : bearing, 0, 1);
+}
+
+//////////////////////////////////////////////////////////////////////
+
+double VecArcInfo::GetArg(Pointf point) const
+{
+	if(!IsCurved())
+		return VecLine::GetArg(point);
+	return GetArg(UPP::Bearing(point, C));
+}
+
+//////////////////////////////////////////////////////////////////////
+
+Rectf VecArcInfo::GetBoundingBox() const
+{
+	if(IsCircle())
+		return Rectf(C.x - radius, C.y - radius, C.x + radius, C.y + radius);
+	else if(IsCurved())
+		return VecArc::GetBoundingBox();
+	return SortRectf(A, B);
+}
+
+//////////////////////////////////////////////////////////////////////
+// GetAngle: orientovany stredovy uhel oblouku. Kladny, pokud jde
+// oblouk proti smeru h.r.
+
+double VecArcInfo::GetAngle() const
+{
+	if(IsCircle())
+		return IsReversed() ? -TWOPI : +TWOPI;
+	if(!IsCurved())
+		return 0;
+	double angle = beta - alpha;
+	if(angle <= 0)
+		angle += 2 * M_PI;
+	return (IsReversed() ? -angle : +angle);
+}
+
+//////////////////////////////////////////////////////////////////////
+// GetStartDir: returns tangent direction at entity beginning.
+
+Pointf VecArcInfo::GetStartDir() const
+{
+	if(IsCurved())
+	{
+		Pointf CA = UPP::Left(A - C);
+		if(IsReversed())
+			CA = -CA;
+		return CA;
+	}
+	return B - A;
+}
+
+//////////////////////////////////////////////////////////////////////
+// GetEndDir: returns tangent direction at entity end.
+
+Pointf VecArcInfo::GetEndDir() const
+{
+	if(IsCurved())
+	{
+		Pointf CB = UPP::Left(B - C);
+		if(IsReversed())
+			CB = -CB;
+		return CB;
+	}
+	return B - A;
+}
+
+//////////////////////////////////////////////////////////////////////
+// GetStartTangent: returns tangent angle at entita beginning.
+
+double VecArcInfo::GetStartTangent() const
+{
+	return UPP::Bearing(GetStartDir());
+}
+
+//////////////////////////////////////////////////////////////////////
+// GetEndTangent: returns tangent angle at entita end.
+
+double VecArcInfo::GetEndTangent() const
+{
+	return UPP::Bearing(GetEndDir());
+}
+
+//////////////////////////////////////////////////////////////////////
+
+VecArcInfo VecArcInfo::Offset(double dist) const
+{
+	if(dist == 0)
+		return *this;
+	Pointf last = A + UPP::Unit(UPP::Right(GetStartDir())) * dist;
+	Pointf next = B + UPP::Unit(UPP::Right(GetEndDir())) * dist;
+	if(IsCurved())
+		return VecArcInfo(C, last, next, !IsReversed());
+	else
+		return VecArcInfo(last, next);
+}
+
+//////////////////////////////////////////////////////////////////////
+
+VecArcInfo VecArcInfo::Subset(double start, double end) const
+{
+	if(IsCircle())
+	{
+		VecArcInfo info;
+		if(IsReversed())
+		{
+			info.Set(C, radius, alpha - end * TWOPI, alpha - start * TWOPI);
+			info.SetReversed();
+		}
+		else
+			info.Set(C, radius, alpha + start * TWOPI, alpha + end * TWOPI);
+		return info;
+	}
+	else if(IsCurved())
+		return VecArcInfo(GetPointAt(start), GetPointAt(end),
+			(IsReversed() ? -radius : +radius) * (1 - cos(0.5 * (end - start) * GetAngle())));
+	else
+		return VecArcInfo(GetPointAt(start), GetPointAt(end));
+}
+
+//////////////////////////////////////////////////////////////////////
+// VecIntersection::
+
+//////////////////////////////////////////////////////////////////////
+// mirror: swaps <t> and <u> - fields in intersection descriptor.
+
+void VecIntersection::Mirror()
+{
+	Swap(t[0], u[0]);
+	Swap(t[1], u[1]);
+}
+
+//////////////////////////////////////////////////////////////////////
+// remove: removes n-th intersection.
+
+void VecIntersection::Remove(int index)
+{
+	ASSERT(index >= 0 && index < count);
+	if(--count > index && index == 0)
+	{
+		t[0] = t[1];
+		u[0] = u[1];
+	}
+}
+
+///// intersections
+
+//////////////////////////////////////////////////////////////////////
+// CheckBearing: checks whether circle intersection is an arc
+// intersection as well.
+
+void VecIntersection::CheckBearing(double *hints, const VecArcInfo &a)
+{
+	double temp;
+	hints += count - 1;
+	for(int k = count; --k >= 0; hints--)
+		if(a.ContainsBearing(temp = *hints * TWOPI))
+		{
+			double gap = (TWOPI - (a.beta - a.alpha)) / 2;
+			*hints =
+				minmax<double>((modulo(temp - a.alpha + gap, TWOPI) - gap)
+				/ (a.beta - a.alpha), 0, 1);
+			if(a.reversed)
+				*hints = 1 - *hints;
+		}
+		else
+			Remove(k);
+}
+
+//////////////////////////////////////////////////////////////////////
+// LL: line vs line.
+
+bool VecIntersection::LL(Pointf P1, Pointf Q1, Pointf P2, Pointf Q2)
+{
+	if(min(P2.x, Q2.x) - max(P1.x, Q1.x) > Vec_tolerance
+	|| min(P2.y, Q2.y) - max(P1.y, Q1.y) > Vec_tolerance
+	|| min(P1.x, Q1.x) - max(P2.x, Q2.x) > Vec_tolerance
+	|| min(P1.y, Q1.y) - max(P2.y, Q2.y) > Vec_tolerance)
+		return Nothing();
+
+	double l1  = P1 | Q1;
+	double l2  = P2 | Q2;
+
+	if(l1 <= Vec_tolerance || l2 <= Vec_tolerance)
+		return Nothing();
+
+	Pointf PQ1     = Q1 - P1;
+	Pointf PQ2     = P2 - Q2;
+	Pointf PP      = P2 - P1;
+	double d   = PQ1 % PQ2;
+	double dt1 = PP % PQ2;
+	double dt2 = PQ1 % PP;
+
+	if(d < 0)
+	{
+		d = -d;
+		dt1 = -dt1;
+		dt2 = -dt2;
+	}
+
+	l1 = Vec_tolerance * d / l1;
+	l2 = Vec_tolerance * d / l2;
+
+	if(d == 0 || dt1 < -l1 || dt1 > d + l1 || dt2 < -l2 || dt2 > d + l2)
+		return Nothing();
+
+	count = 1;
+	t[0] = minmax<double>(dt1 / d, 0, 1);
+	u[0] = minmax<double>(dt2 / d, 0, 1);
+	return true;
+}
+
+//////////////////////////////////////////////////////////////////////
+// LC: line vs circle.
+
+bool VecIntersection::LC(Pointf P1, Pointf Q1, Pointf C2, double r2)
+{
+	Pointf PQ    = Q1 - P1;
+	Pointf CP    = P1 - C2;
+	double a = Squared(PQ);
+
+	count = 0;
+	if(fabs(r2) <= Vec_tolerance || fabs(PQ.x) <= Vec_tolerance && fabs(PQ.y) <= Vec_tolerance)
+		return false;
+
+	double mb = -(PQ ^ CP);
+	double c = Squared(CP) - r2 * r2;
+	double d = mb * mb - a * c;
+
+	double tol2 = Vec_tolerance * Vec_tolerance;
+
+	if(d > tol2)
+	{ // two possible solutions
+		d = sqrt(d);
+		double r;
+		r = mb + d;
+		if(r >= -Vec_tolerance && r <= a + Vec_tolerance)
+		{ // 1st solution is valid
+			t[0] = r = minmax<double>(r / a, 0, 1);
+			u[0] = Bearing(CP + PQ * r) / TWOPI;
+//			Pointf temp = Pointf::Polar(C2, r2, u[0] * TWOPI);
+//			LOG("P = " << P1 << ", Q = " << Q1 << ", C = " << C2 << ", r = " << r2
+//				<< ": temp = " << temp);
+			count = 1;
+		}
+		r = mb - d;
+		if(r >= -Vec_tolerance && r <= a + Vec_tolerance)
+		{ // 2nd solution is valid
+			t[count] = r = minmax<double>(r / a, 0, 1);
+			u[count] = Bearing(CP + PQ * r) / TWOPI;
+			count++;
+		}
+	}
+	else if(d >= -tol2)
+	{ // one solution
+		if(mb >= -Vec_tolerance && mb <= a + Vec_tolerance)
+		{
+			double r;
+			t[0] = r = minmax<double>(mb / a, 0, 1);
+			u[0] = Bearing(CP + PQ * r) / TWOPI;
+			count = 1;
+		}
+	}
+	return count != 0;
+}
+
+//////////////////////////////////////////////////////////////////////
+// LA: line vs arc.
+
+bool VecIntersection::LA(Pointf P1, Pointf Q1, const VecArcInfo &a2)
+{
+	if(!a2.IsCurved())
+		return LL(P1, Q1, a2.A, a2.B);
+
+	if(LC(P1, Q1, a2.C, a2.radius))
+		CheckBearing(u, a2);
+	return count != 0;
+}
+
+//////////////////////////////////////////////////////////////////////
+// CC: circle vs circle.
+
+bool VecIntersection::CC(Pointf C1, double r1, Pointf C2, double r2)
+{
+	if(fabs(r1) <= Vec_tolerance || fabs(r2) <= Vec_tolerance
+		|| (C1 | C2) >= r1 + r2 + Vec_tolerance)
+		return Nothing();
+	Pointf CC  = C2 - C1;
+	Pointf P   = C1 + CC * (0.5 + (r1 * r1 - r2 * r2) / (2 * Squared(CC)));
+	Pointf CP1 = P - C1;
+	Pointf CP2 = P - C2;
+	double r;
+	if(r1 >= r2)
+		r = r1 * r1 - Squared(CP1);
+	else
+		r = r2 * r2 - Squared(CP2);
+	double tol2 = Vec_tolerance * Vec_tolerance;
+
+	if(r > tol2)
+	{ // two solutions
+		Pointf D = Unit(Right(CC)) * sqrt(r);
+		count = 2;
+		t[0] = Bearing(CP1 + D) / TWOPI;
+		u[0] = Bearing(CP2 + D) / TWOPI;
+		t[1] = Bearing(CP1 - D) / TWOPI;
+		u[1] = Bearing(CP2 - D) / TWOPI;
+		return true;
+	}
+	else if(r >= -tol2)
+	{ // one solution
+		count = 1;
+		t[0] = Bearing(CP1) / TWOPI;
+		u[0] = Bearing(CP2) / TWOPI;
+		return true;
+	}
+	else
+		return Nothing();
+}
+
+//////////////////////////////////////////////////////////////////////
+// CA: circle vs arc.
+
+bool VecIntersection::CA(Pointf C1, double r1, const VecArcInfo &a2)
+{
+	if(!a2.IsCurved())
+	{
+		LC(a2.A, a2.B, C1, r1);
+		Mirror();
+		return count != 0;
+	}
+
+	if(CC(C1, r1, a2.C, a2.radius))
+		CheckBearing(u, a2);
+	return count != 0;
+}
+
+//////////////////////////////////////////////////////////////////////
+// AA: arc vs arc.
+
+bool VecIntersection::AA(const VecArcInfo &a1, const VecArcInfo &a2)
+{
+	if(!a1.IsCurved())
+		if(!a2.IsCurved())
+			return LL(a1.A, a1.B, a2.A, a2.B);
+		else
+			return LA(a1.A, a1.B, a2);
+	else if(!a2.IsCurved())
+	{
+		LA(a2.A, a2.B, a1);
+		Mirror();
+		return count != 0;
+	}
+
+	if(CC(a1.C, a1.radius, a2.C, a2.radius))
+	{
+		CheckBearing(t, a1);
+		CheckBearing(u, a2);
+	}
+	return count != 0;
+}
+
+//////////////////////////////////////////////////////////////////////
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/GridCtrl/GridBase.cpp b/uppsrc/GridCtrl/GridBase.cpp
new file mode 100644
index 000000000..6d261d766
--- /dev/null
+++ b/uppsrc/GridCtrl/GridBase.cpp
@@ -0,0 +1,244 @@
+#include "GridCtrl.h"
+
+NAMESPACE_UPP
+
+int GridCtrl::ItemRect::sortCol;
+int GridCtrl::ItemRect::sortMode;
+
+/*---------------------------------------------------*/
+
+void GridCtrl::Item::SetCtrl(Ctrl * newCtrl)
+{
+	ctrl = newCtrl;
+	ctrl->Hide();
+	ctrl->WantFocus();
+	ctrl->SetFrame(NullFrame());
+	//ctrl->SetFrame(BlackFrame());
+}
+
+void GridCtrl::Item::DropCtrl()
+{
+	ctrl = NULL;
+}
+
+VectorMap<Id, int> *GridCtrl::ItemRect::aliases = NULL;
+
+/*---------------------------------------------------*/
+
+GridCtrl::ItemRect& GridCtrl::ItemRect::Alias(Id _id)
+{
+	aliases->SetKey(id, _id);
+	return *this;
+}
+
+GridCtrl::ItemRect& GridCtrl::ItemRect::Alias(const char * s)
+{
+	aliases->SetKey(id, s);
+	return *this;
+}
+
+GridCtrl::ItemRect& GridCtrl::ItemRect::Name(String &s)
+{
+	(*items)[0][id].val = s;
+	return *this;
+}
+
+GridCtrl::ItemRect& GridCtrl::ItemRect::Hidden(bool b)
+{
+	hidden = b;
+	size = 0;
+	return *this;
+}
+
+GridCtrl::ItemRect& GridCtrl::ItemRect::Name(const char * s)
+{
+	(*items)[0][id].val = s;
+	return *this;
+}
+
+GridCtrl::ItemRect& GridCtrl::ItemRect::Size(int n)
+{
+	hidden = n == 0;
+
+	if(!hidden)
+	{
+		if(n < min) { n = min; ismin = true; }
+		if(n > max) { n = max; ismax = true; }
+	}
+	else
+		n = 0;
+
+	size = nsize = n;
+	return *this;
+}
+
+GridCtrl::ItemRect& GridCtrl::ItemRect::Width(int n)
+{
+	return Size(n);
+}
+
+GridCtrl::ItemRect& GridCtrl::ItemRect::Height(int n)
+{
+	return Size(n);
+}
+
+GridCtrl::ItemRect& GridCtrl::ItemRect::Min(int n)
+{
+	if(hidden)
+		return *this;
+	min = n;
+	if(size < min)
+		size = min;
+	return *this;
+}
+
+GridCtrl::ItemRect& GridCtrl::ItemRect::Max(int n)
+{
+	if(hidden)
+		return *this;
+	max = n;
+	if(size > max)
+		size = max;
+	return *this;
+}
+
+GridCtrl::ItemRect& GridCtrl::ItemRect::Fixed(int n)
+{
+	return Min(n).Max(n);
+}
+
+GridCtrl::ItemRect& GridCtrl::ItemRect::FixedAuto()
+{
+	return Fixed(GetTextSize((String)(*items)[0][id].val, StdFont()).cx + 15);
+}
+
+GridCtrl::ItemRect& GridCtrl::ItemRect::Edit(Ctrl &ctrl)
+{
+	ctrl.Hide();
+	ctrl.SetFrame(BlackFrame());
+	//ctrl.SetFrame(NullFrame());
+	(*edits)[id].ctrl = &ctrl;
+	parent->holder.AddChild(&ctrl);
+	return *this;
+}
+
+//GridCtrl::ItemRect& GridCtrl::ItemRect::EditConvert(Ctrl &ctrl)
+//{
+//	return Edit(ctrl).SetConvert(ctrl);
+//}
+
+void GridCtrl::ItemRect::ChangeSortMode(bool idsort)
+{
+	if(++sortmode > 2) sortmode = (int) !idsort;
+}
+
+GridCtrl::ItemRect& GridCtrl::ItemRect::SetConvert(Convert &c)
+{
+	(*edits)[id].convert = &c;
+	return *this;
+}
+
+GridCtrl::ItemRect& GridCtrl::ItemRect::NoConvert()
+{
+	(*edits)[id].convert = NULL;
+	return *this;
+}
+
+GridCtrl::ItemRect& GridCtrl::ItemRect::NoConvertion()
+{
+	convertion = false;
+	return *this;
+}
+
+GridCtrl::ItemRect& GridCtrl::ItemRect::Default(Value v)
+{
+	defval = v;
+	return *this;
+}
+
+GridCtrl::ItemRect& GridCtrl::ItemRect::Index(bool b)
+{
+	Size(0);
+	index = b;
+	return *this;
+}
+
+String GridCtrl::ItemRect::GetName() const
+{
+	return (*items)[0][id].val;
+}
+
+GridCtrl::ItemRect& GridCtrl::ItemRect::SetFormat(const char *fmt)
+{
+	//(*items)[0][id].convert = &c;
+	return *this;
+}
+
+GridCtrl::ItemRect& GridCtrl::ItemRect::SetDisplay(GridDisplay &gd)
+{
+	//(*items)[0][id].display = &gd;
+	display = &gd;
+	return *this;
+}
+
+GridCtrl::ItemRect& GridCtrl::ItemRect::IgnoreDisplay()
+{
+	ignore_display = true;
+	return *this;
+}
+
+void GridCtrl::ItemRect::Clear()
+{
+	fnt = StdFont();
+	bg = Null;
+	fg = Null;
+}
+
+void GridCtrl::ItemRect::Serialize(Stream &s)
+{
+	s % balign % halign % calign;
+	s % fg % bg;
+	s % fnt;
+	s % id;
+	s % size;
+	s % prop;
+	s % hidden;
+}
+
+static void MakeOption(One<Ctrl>& ctrl)
+{
+	ctrl.Create<Option>();
+	ctrl->SetData(0);
+	ctrl->WantFocus();
+}
+
+GridCtrl::ItemRect& GridCtrl::ItemRect::Option()
+{
+	return Ctrls(MakeOption).CtrlAlignHorzCenter(CtrlsImg::O0().GetSize().cx);
+}
+
+GridCtrl::Item& GridCtrl::Item::Editable(bool b)
+{
+	editable = b;
+	//SyncCtrls(id);
+	return *this;
+}
+
+GridCtrl::Item& GridCtrl::Item::NoEditable()
+{
+	return Editable(false);
+}
+
+GridCtrl::ItemRect& GridCtrl::ItemRect::Editable(bool b)
+{
+	editable = b;
+	parent->SyncCtrls(id);
+	return *this;
+}
+
+GridCtrl::ItemRect& GridCtrl::ItemRect::NoEditable()
+{
+	return Editable(false);
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/GridCtrl/GridCtrl.cpp b/uppsrc/GridCtrl/GridCtrl.cpp
new file mode 100644
index 000000000..9dfcfef2e
--- /dev/null
+++ b/uppsrc/GridCtrl/GridCtrl.cpp
@@ -0,0 +1,7419 @@
+#include <GridCtrl/GridCtrl.h>
+
+NAMESPACE_UPP
+
+#pragma warning(disable: 4355)
+
+#define TFILE <GridCtrl/GridCtrl.t>
+#include <Core/t.h>
+
+int GridCtrl::GD_COL_WIDTH;
+int GridCtrl::GD_ROW_HEIGHT;
+int GridCtrl::GD_HDR_HEIGHT;
+int GridCtrl::GD_IND_WIDTH;
+
+GridCtrl::GridCtrl() : holder(*this)
+{
+	sortCol = -1;
+	hcol = -1;
+	hrow = -1;
+
+	fixed_click = false;
+	fixed_top_click = false;
+	fixed_left_click = false;
+	fixed_size_changed = true;
+
+	resize_panel_open = false;
+
+	synced = false;
+	sc_fr = -1;
+	sc_lr = -1;
+
+	resizeCol = false;
+	resizeRow = false;
+
+	ready = false;
+	doscroll = true;
+	firstRow = lastRow = -1;
+	firstCol = lastCol = -1;
+
+	firstVisCol = -1;
+	lastVisCol  = -1;
+	firstVisRow = -1;
+	lastVisRow  = -1;
+
+	colidx = -1;
+	rowidx = -1;
+	rowfnd = -1;
+
+	GD_COL_WIDTH  = 50;
+	GD_ROW_HEIGHT = Draw::GetStdFontCy() + 5;
+	GD_HDR_HEIGHT = GD_ROW_HEIGHT + 2;
+	GD_IND_WIDTH  = 9;
+
+	display = new GridDisplay();
+	display->SetTextAlign(GD::VCENTER);
+	orgdisp = display;
+
+	sbx.Horz();
+	sby.Vert();
+	sbx.WhenScroll = THISBACK(Scroll);
+	sby.WhenScroll = THISBACK(Scroll);
+	sbx.SetLine(5);
+	sby.SetLine(GridCtrl::GD_ROW_HEIGHT);
+
+	fixed_cols = 1;
+	fixed_rows = 1;
+
+	total_cols = 0;
+	total_rows = 0;
+
+	minRowSelected = -1;
+	maxRowSelected = -1;
+
+	bains = 0;
+	coluid = 0;
+	rowuid = 0;
+
+	close.SetLabel(t_("Close"));
+	close <<= THISBACK(CloseGrid);
+
+	oldpos.Clear();
+
+	indicator           = false;
+	resizing_cols       = true;
+	resizing_rows       = true;
+	resizing_fixed_cols = true;
+	resizing_fixed_rows = false;
+	resize_paint_mode   = 2;
+	resize_col_mode     = 1;
+	resize_row_mode     = 0;
+	multi_select        = false;
+	select_row          = true;
+	moving_cols         = false;
+	moving_rows         = false;
+	dragging            = false;
+	horz_grid           = true;
+	vert_grid           = true;
+	draw_last_horz_line = true;
+	draw_last_vert_line = true;
+	sorting             = false;
+	live_cursor         = false;
+	row_changing        = true;
+	edit_mode           = GE_ROW;
+	one_click_edit      = false;
+	coloringMode        = 0;
+	ctrls               = false;
+	genr_ctrls          = false;
+	edit_ctrls          = false;
+	sorting             = true;
+	sorting_multicol    = true;
+	header              = true;
+
+	cancel_update_cell  = false;
+	cancel_update       = false;
+	cancel_insert       = false;
+	cancel_remove       = false;
+	cancel_accept       = false;
+	cancel_cursor       = false;
+
+	inserting           = false;
+	appending           = false;
+	duplicating         = false;
+	removing            = false;
+	accepting           = false;
+	canceling           = false;
+	moving              = false;
+	navigating          = false;
+	searching           = false;
+	editing             = false;
+	edits_in_new_row    = true;
+	closing             = false;
+	hiding              = false;
+	clipboard           = false;
+	extra_paste         = true;
+	fixed_paste         = false;
+	draw_focus          = false;
+	cancel_all          = false;
+	ask_remove          = false;
+
+	search_hide            = true;
+	search_highlight       = true;
+	search_highlight_first = false;
+	search_immediate       = true;
+	search_case            = false;
+	search_move_cursor     = true;
+	search_display         = true;
+
+	row_order         = false;
+	row_data          = false;
+
+	reject_null_row   = true;
+	tab_changes_row   = true;
+	tab_adds_row      = false;
+	enter_like_tab    = false;
+	keep_last_row     = false;
+	remove_hides      = false;
+	full_col_resizing = true;
+	full_row_resizing = false;
+	chameleon         = false;
+
+	mouse_move        = false;
+	row_modified      = 0;
+
+	valid_cursor      = false;
+
+	curpos.x  = curpos.y  = -1;
+	oldcur.x  = oldcur.y  = -1;
+	curid.x   = curid.y   = -1;
+	ctrlid.x  = ctrlid.y  = -1;
+	osz.cx    = osz.cy    = -1;
+	livecur.x = livecur.y = -1;
+	leftpnt.x = leftpnt.y = -1;
+	shiftpos.x = shiftpos.y = -1;
+
+	fixed_width  = 0;
+	fixed_height = 0;
+	total_width  = 0;
+	total_height = 0;
+
+	ItemRect &ir = vitems.Add();
+	ir.parent = this;
+	ir.edits = &edits;
+	items.Add();
+
+	/* add indicator, total_cols = 1 */
+	AddColumn("", 0);
+
+	shiftmode = false;
+	recalc_cols = false;
+	recalc_rows = false;
+	selected_rows = 0;
+	selected_items = 0;
+
+	WhenMenuBar = THISBACK(StdMenuBar);
+	WhenToolBar = THISBACK(StdToolBar);
+
+	find <<= THISBACK(DoFind);
+
+	StdAppend = THISBACK(DoAppend);
+	StdRemove = THISBACK(DoRemove);
+	StdInsert = THISBACK(DoInsertBefore);
+	StdDuplicate = THISBACK(DoDuplicate);
+	StdEdit = THISBACK(DoEdit);
+
+	newrow_inserted = false;
+	newrow_appended = false;
+	row_removed = false;
+	just_clicked = false;
+
+	call_whenchangecol = true;
+	call_whenchangerow = true;
+	call_whenremoverow = true;
+	call_whenupdaterow = true;
+	call_wheninsertrow = true;
+
+	sel_begin = false;
+	sel_end = false;
+
+	moving_header = false;
+	moving_body = false;
+	moving_allowed = false;
+
+	join_group = 0;
+
+	curSplitCol = -1;
+	curSplitRow = -1;
+
+	moveCol = moveRow = -1;
+	find_offset = 0;
+
+	scrollLeftRight = false;
+
+	fg_focus  = SColorHighlightText;
+	bg_focus  = SColorHighlight;
+	fg_select = Black;
+	bg_select = Color(217, 198, 251);
+	fg_live   = SColorText;
+	bg_live   = Blend(SColorHighlight, White, 100);
+	fg_found  = Color(0, 0, 0);
+	bg_found  = Color(189,231,237);
+	fg_even   = SColorText;
+	fg_odd    = SColorText;
+	bg_even   = SColorPaper;
+	bg_odd    = SColorPaper;
+	fg_grid   = SColorShadow;
+
+	focused_ctrl = NULL;
+	focused_ctrl_id = -1;
+	focused_col = -1;
+
+	find.NullText(t_("Search"));
+	find.WhenBar = THISBACK(FindOptsBar);
+
+	/* frames added at the very end, otherwise there will be strange crash in optimal mode... */
+	sbx.AutoHide();
+	sby.AutoHide();
+	SetFrame(ViewFrame());
+	AddFrame(sbx);
+	AddFrame(sby);
+	Ctrl::Add(holder);
+
+	resize_panel_open = false;
+	resize_panel.WhenClose = Proxy(WhenClose);
+
+	resizing = false;
+	selecting = false;
+	is_clipboard = false;
+	enabled = true;
+	sync_flag = 0;
+	paint_flag = 0;
+}
+
+GridCtrl::~GridCtrl()
+{
+	delete orgdisp;
+}
+
+void GridCtrl::StdToolBar(Bar &bar)
+{
+	bool e = IsEnabled();
+	bool c = e && IsCursor();
+	bool d = c && IsRowEditable();
+
+	if(appending)
+		bar.Add(e, t_("Append"), GridImg::Append(), StdAppend);
+
+	if(inserting)
+		bar.Add(c, t_("Insert "), GridImg::Insert(), StdInsert);
+
+	if(duplicating)
+		bar.Add(d, t_("Duplicate"), GridImg::Duplicate(), StdDuplicate);
+
+	if(removing)
+		bar.Add(d, t_("Delete "), GridImg::Delete(), StdRemove);
+
+	if(editing)
+	{
+		bar.Add(!ctrls && d, t_("Edit"), GridImg::Modify(), StdEdit);
+		if(accepting)
+			bar.Add(ctrls, t_("Accept"), GridImg::Commit(), THISBACK(DoEndEdit));
+		if(canceling)
+			bar.Add(ctrls, t_("Cancel"), GridImg::Cancel(), THISBACK(DoCancelEdit));
+	}
+
+	if(searching)
+	{
+		if(inserting || appending || removing)
+			bar.Separator();
+		FindBar(bar, 150);
+	}
+
+	if(moving)
+	{
+		if(searching)
+			bar.Separator();
+
+		bar.Add(c, t_("Move up"), GridImg::MoveUp(), THISBACK(DoSwapUp));
+		bar.Add(c, t_("Move down"), GridImg::MoveDn(), THISBACK(DoSwapDown));
+	}
+
+	if(navigating)
+	{
+		if(!closing)
+			bar.GapRight();
+		else
+			bar.Separator();
+
+		NavigatingBar(bar);
+	}
+
+	if(closing)
+	{
+		bar.GapRight();
+		bar.Add(close, 76, 24);
+	}
+}
+
+void GridCtrl::FindBar(Bar &bar, int cx)
+{
+	bar.Add(find, cx);
+}
+
+void GridCtrl::InfoBar(Bar &bar, int cx)
+{
+	bar.Add(info, cx);
+}
+
+void GridCtrl::SetToolBarInfo(String inf)
+{
+	info.SetLabel(inf);
+}
+
+void GridCtrl::NavigatingBar(Bar &bar)
+{
+	bar.Add(RowFormat(t_("First %s")), GridImg::FirstRec(), THISBACK(DoGoBegin));
+	bar.Add(RowFormat(t_("Previous %s")), GridImg::PrevRec(), THISBACK(DoGoPrev));
+	bar.Add(RowFormat(t_("Next %s")), GridImg::NextRec(), THISBACK(DoGoNext));
+	bar.Add(RowFormat(t_("Last %s")), GridImg::LastRec(), THISBACK(DoGoEnd));
+}
+
+GridCtrl& GridCtrl::SetToolBar(bool b, int align, int frame)
+{
+	RemoveFrame(bar);
+
+	if(!b)
+		return *this;
+
+	InsertFrame(frame, bar.Align(align));
+	bar.SetStyle(ToolBar::StyleDefault());
+
+	if(frame == 1)
+		switch(align)
+		{
+			case BarCtrl::BAR_TOP:
+				RemoveFrame(TopSeparatorFrame());
+				InsertFrame(2, TopSeparatorFrame());
+				break;
+			case BarCtrl::BAR_BOTTOM:
+				RemoveFrame(BottomSeparatorFrame());
+				InsertFrame(2, BottomSeparatorFrame());
+				break;
+			case BarCtrl::BAR_LEFT:
+				RemoveFrame(LeftSeparatorFrame());
+				InsertFrame(2, LeftSeparatorFrame());
+				break;
+			case BarCtrl::BAR_RIGHT:
+				RemoveFrame(RightSeparatorFrame());
+				InsertFrame(2, RightSeparatorFrame());
+				break;
+		}
+	WhenToolBar(bar);
+	return *this;
+}
+
+GridCtrl& GridCtrl::ResizePanel(bool b)
+{
+	resize_panel_open = b;
+	RemoveFrame(resize_panel);
+	RemoveFrame(BottomSeparatorFrame());
+	if(!b)
+		return *this;
+	InsertFrame(1, resize_panel);
+	InsertFrame(2, BottomSeparatorFrame());
+	return *this;
+}
+
+void GridCtrl::FindOptsBar(Bar &bar)
+{
+	bar.Add(t_("Immediate search"), THISBACK1(SetFindOpts, 0)).Check(search_immediate);
+	bar.Add(t_("Hide rows"), THISBACK1(SetFindOpts, 1)).Check(search_hide);
+	bar.Add(t_("Highlight found cells"), THISBACK1(SetFindOpts, 2)).Check(search_highlight);
+	bar.Add(t_("Case sensitive"), THISBACK1(SetFindOpts, 3)).Check(search_case);
+}
+
+void GridCtrl::SetFindOpts(int n)
+{
+	switch(n)
+	{
+		case 0:
+			search_immediate = !search_immediate;
+			if(!search_immediate)
+			{
+				find <<= THISBACK(Nothing);
+				find.WhenEnter = THISBACK(DoFind);
+			}
+			else
+			{
+				find <<= THISBACK(DoFind);
+				find.WhenEnter = THISBACK(Nothing);
+			}
+			break;
+		case 1:
+			search_hide = !search_hide;
+			if(!String(~find).IsEmpty())
+			{
+				if(!search_hide)
+					ShowRows();
+				else
+					DoFind();
+			}
+			break;
+		case 2:
+			search_highlight = !search_highlight;
+			if(!search_highlight)
+			{
+				ClearFound(false);
+				Refresh();
+			}
+			else
+				DoFind();
+			break;
+		case 3:
+			search_case = !search_case;
+			DoFind();
+			break;
+	}
+}
+
+String GridCtrl::RowFormat(const char *s)
+{
+	String row = t_("row");
+	return Sprintf(s, ~row);
+}
+
+void GridCtrl::StdMenuBar(Bar &bar)
+{
+	bool c = IsCursor();
+	bool e = c && IsRowEditable();
+	bool isitem = false;
+
+	if(inserting)
+	{
+		if(bains == 0)
+		{
+			bar.Add(c, t_("Insert "), StdInsert)
+			   .Image(GridImg::Insert())
+			   .Help(RowFormat(t_("Insert a new %s into the table.")))
+			   .Key(K_INSERT);
+		}
+		else if(bains == 1)
+		{
+			bar.Add(c, t_("Insert before"), THISBACK(DoInsertBefore))
+			   .Image(GridImg::InsertBefore())
+			   .Help(RowFormat(t_("Insert a new %s into the table before current")))
+			   .Key(K_INSERT);
+			bar.Add(c, t_("Insert after"), THISBACK(DoInsertAfter))
+			   .Image(GridImg::InsertAfter())
+			   .Help(RowFormat(t_("Insert a new %s into the table after current")))
+			   .Key(K_ALT_INSERT);
+		}
+		else if(bains == 2)
+		{
+			bar.Add(c, t_("Insert after"), THISBACK(DoInsertAfter))
+			   .Image(GridImg::InsertAfter())
+			   .Help(RowFormat(t_("Insert a new %s into the table after current")))
+			   .Key(K_INSERT);
+			bar.Add(c, t_("Insert before"), THISBACK(DoInsertBefore))
+			   .Image(GridImg::InsertBefore())
+			   .Help(RowFormat(t_("Insert a new %s into the table before current")))
+			   .Key(K_ALT_INSERT);
+		}
+		isitem = true;
+	}
+	if(appending)
+	{
+		bar.Add(t_("Append"), StdAppend)
+		   .Image(GridImg::Append())
+		   .Help(RowFormat(t_("Append a new %s at the end of the table.")))
+		   .Key(inserting ? (dword) K_CTRL_INSERT : (dword) K_INSERT);
+
+		isitem = true;
+	}
+	if(duplicating)
+	{
+		bar.Add(c, t_("Duplicate"), THISBACK(DoDuplicate))
+		   .Image(GridImg::Duplicate())
+		   .Help(RowFormat(t_("Duplicate current table %s.")))
+		   .Key(K_CTRL_D);
+
+		isitem = true;
+	}
+
+	if(editing)
+	{
+		bar.Add(!ctrls && e, t_("Edit"), StdEdit)
+		   .Image(GridImg::Modify())
+		   .Help(RowFormat(t_("Edit active %s.")))
+		   .Key(K_ENTER);
+
+		isitem = true;
+	}
+
+	if(removing)
+	{
+		RemovingMenu(bar);
+		isitem = true;
+	}
+
+	if(moving)
+	{
+		MovingMenu(bar);
+		isitem = true;
+	}
+
+	if(multi_select)
+	{
+		SelectMenu(bar);
+		isitem = true;
+	}
+
+	if(clipboard)
+	{
+		if(isitem)
+			bar.Separator();
+		ClipboardMenu(bar);
+		isitem = true;
+	}
+
+	if(hiding)
+	{
+		if(isitem)
+			bar.Separator();
+		ColumnsMenu(bar);
+	}
+}
+
+void GridCtrl::RemovingMenu(Bar &bar)
+{
+	bool c = IsCursor() && IsRowEditable();
+	bar.Add(c && (keep_last_row ? GetCount() > 1 : true), t_("Delete "), StdRemove)
+	   .Image(GridImg::Delete())
+	   .Help(RowFormat(t_("Delete active %s.")))
+	   .Key(K_DELETE);
+}
+
+void GridCtrl::MovingMenu(Bar &bar)
+{
+	bool c = IsCursor();
+	bar.Add(c && curpos.y > fixed_rows, t_("Move up"), THISBACK(DoSwapUp))
+	   .Image(GridImg::MoveUp())
+	   .Key(K_CTRL_UP);
+	bar.Add(c && curpos.y >= fixed_rows && curpos.y < total_rows - 1, t_("Move down"), THISBACK(DoSwapDown))
+	   .Image(GridImg::MoveDn())
+	   .Key(K_CTRL_DOWN);
+}
+
+void GridCtrl::SelectMenu(Bar &bar)
+{
+	bar.Add(total_rows > fixed_rows, RowFormat(t_("Select all")), THISBACK(DoSelectAll))
+	   .Image(GridImg::SelectAll())
+	   .Help(t_("Select all table rows"))
+	   .Key(K_CTRL_A);
+}
+
+void GridCtrl::ColumnsMenu(Bar &bar)
+{
+	bar.Add(t_("Columns"), THISBACK(ColumnList));
+}
+
+void GridCtrl::ColumnList(Bar &bar)
+{
+	int cnt = 0;
+	for(int i = fixed_cols; i < total_cols; i++)
+		if(!hitems[i].index && !hitems[i].hidden)
+			cnt++;
+
+	for(int i = fixed_cols; i < total_cols; i++)
+	{
+		if(!hitems[i].index)
+			bar.Add((String) items[0][hitems[i].id].val, THISBACK1(MenuHideColumn, i))
+			   .Check(!hitems[i].hidden)
+			   .Enable(cnt > 1 || (cnt == 1 && hitems[i].hidden));
+	}
+}
+
+void GridCtrl::ClipboardMenu(Bar &bar)
+{
+	bool c = IsCursor();
+	bool s = c || IsSelection();
+	bar.Add(t_("Copy"), THISBACK(DoCopy)).Image(CtrlImg::copy()).Key(K_CTRL_C).Enable(s);
+	bar.Add(t_("Cut"), THISBACK(Nothing)).Image(CtrlImg::cut()).Key(K_CTRL_X).Enable(s);
+	bar.Add(t_("Paste"), THISBACK(DoPaste)).Image(CtrlImg::paste()).Key(K_CTRL_V).Enable(c && IsClipboardAvailable());
+	if(extra_paste)
+		bar.Add(t_("Paste as"), THISBACK(PasteAsMenu));
+}
+
+void GridCtrl::PasteAsMenu(Bar &bar)
+{
+	bool c = IsCursor();
+	bool s = IsClipboardAvailable();
+	bar.Add(t_("appended"), THISBACK(DoPasteAppendedRows)).Key(K_CTRL_E).Enable(s);
+	bar.Add(t_("inserted"), THISBACK(DoPasteInsertedRows)).Key(K_CTRL_I).Enable(c && s);
+}
+
+bool GridCtrl::IsClipboardAvailable()
+{
+	return IsClipboardFormatAvailable<GridClipboard>() ||
+	       IsClipboardAvailableText();
+}
+
+GridClipboard GridCtrl::GetClipboard()
+{
+	GridClipboard gc = ReadClipboardFormat<GridClipboard>();
+	return gc;
+}
+
+void GridCtrl::SetClipboard()
+{
+	if(!clipboard)
+		return;
+
+	GridClipboard gc;
+
+	Point minpos(total_cols, total_rows);
+	Point maxpos(fixed_cols, fixed_rows);
+
+	String tc;
+	int prev_row = -1;
+
+	for(int i = fixed_rows; i < total_rows; i++)
+	{
+		bool row_selected = select_row && IsSelected(i, false);
+		for(int j = fixed_cols; j < total_cols; j++)
+			if(row_selected || IsSelected(i, j, false))
+			{
+				if(prev_row < 0)
+					prev_row = i;
+
+				GridClipboard::ClipboardData &d = gc.data.Add();
+				d.col = j;
+				d.row = i;
+				d.v = Get0(i, j);
+
+				if(i < minpos.y) minpos.y = i;
+				else if(i > maxpos.y) maxpos.y = i;
+				if(j < minpos.x) minpos.x = j;
+				else if(j > maxpos.x) maxpos.x = j;
+
+				if(i != prev_row)
+				{
+					tc += "\r\n";
+					prev_row = i;
+				}
+				tc += d.v.ToString() + '\t';
+			}
+	}
+
+	gc.minpos = minpos;
+	gc.maxpos = maxpos;
+
+	bool row_selected = select_row && IsSelected(curpos.y, false);
+	gc.shiftmode = row_selected ? true : shiftmode;
+
+	WriteClipboardFormat(gc);
+	AppendClipboardText(tc);
+
+	Color c0 = bg_select;
+	Color c1 = White;
+	Color c2 = bg_focus;
+
+	for(int i = 0; i < 256; i += 64)
+	{
+		bg_select = Blend(c0, c1, i);
+		bg_focus = Blend(c2, c1, i);
+		Refresh(); Sync();
+		Sleep(1);
+	}
+
+	for(int i = 0; i < 256; i += 32)
+	{
+		bg_select = Blend(c1, c0, i);
+		bg_focus = Blend(c1, c2, i);
+		Refresh(); Sync();
+		Sleep(1);
+	}
+}
+
+void GridCtrl::PasteCallbacks(bool new_row)
+{
+	if(new_row)
+	{
+		LOG("WhenInsertRow() - paste");
+		#ifdef LOG_CALLBACKS
+		LGR(2, "WhenInsertRow() - paste");
+		#endif
+		WhenInsertRow();
+	}
+	else
+	{
+		#ifdef LOG_CALLBACKS
+		LGR(2, "WhenUpdateRow() - paste");
+		#endif
+		WhenUpdateRow();
+	}
+}
+
+void GridCtrl::Paste(int mode)
+{
+	if(!clipboard)
+		return;
+
+	GridClipboard gc = GetClipboard();
+
+	bool is_gc = !gc.data.IsEmpty();
+	bool is_tc = IsClipboardAvailableText();
+
+	if(!is_gc && !is_tc)
+		return;
+
+	if(is_gc && select_row && !gc.shiftmode)
+		return;
+
+	Point cp(curpos);
+
+	if(cp.x < 0 || select_row)
+		cp.x = fixed_cols;
+	if(cp.y < 0)
+		cp.y = fixed_rows;
+
+	Vector<String> lines;
+
+	if(is_tc && !is_gc)
+		lines = Upp::Split(ReadClipboardText(), '\n');
+
+	if(mode == 1)
+	{
+		int dy = is_gc ? gc.maxpos.y - gc.minpos.y + 1
+		               : lines.GetCount();
+		Insert0(curpos.y, dy);
+		curpos.y += dy;
+	}
+	else if(mode == 2)
+		cp.y = total_rows;
+
+	int lc = -1, lr = -1;
+
+	int tr = total_rows;
+
+	if(!is_gc)
+	{
+		if(is_tc)
+		{
+			int pr = 0;
+			bool new_row = false;
+
+			for(int i = 0; i < lines.GetCount(); i++)
+			{
+				Vector<String> cells = Upp::Split(lines[i], '\t');
+				for(int j = 0; j < cells.GetCount(); j++)
+				{
+					int r = i;
+					int c = j;
+
+					if(r > pr)
+					{
+						PasteCallbacks(new_row);
+						pr = r;
+					}
+
+					if(cp.x + c < total_cols)
+					{
+						lc = cp.x + c;
+						lr = cp.y + r;
+
+						rowidx = lr;
+
+						new_row = lr >= tr || mode > 0;
+
+						if(fixed_paste && new_row)
+							break;
+						Set0(lr, lc, cells[j], true);
+					}
+
+					if(i == lines.GetCount() - 1 && j == cells.GetCount() - 1)
+						PasteCallbacks(new_row);
+				}
+			}
+		}
+	}
+	else if(!select_row && gc.shiftmode)
+	{
+		lc = cp.x;
+		lr = cp.y;
+
+		for(int i = 0; i < gc.data.GetCount(); i++)
+		{
+			Set0(lr, lc, gc.data[i].v, true);
+
+			bool data_end = i == gc.data.GetCount() - 1;
+			bool new_row = ++lc > total_cols - 1;
+			if(new_row || data_end)
+			{
+				bool nr = lr + 1 >= tr;
+				if(new_row && nr && fixed_paste)
+					break;
+
+				PasteCallbacks(new_row && (nr || mode > 0));
+
+				if(!data_end)
+				{
+					lc = fixed_cols;
+					++lr;
+					rowidx = lr;
+				}
+			}
+		}
+	}
+	else
+	{
+		int pr = gc.data[0].row - gc.minpos.y;
+		bool new_row = false;
+
+		for(int i = 0; i < gc.data.GetCount(); i++)
+		{
+			int r = gc.data[i].row - gc.minpos.y;
+			int c = gc.data[i].col - gc.minpos.x;
+
+			if(r > pr)
+			{
+				PasteCallbacks(new_row);
+				pr = r;
+			}
+
+			if(cp.x + c < total_cols)
+			{
+				lc = cp.x + c;
+				lr = cp.y + r;
+
+				rowidx = lr;
+
+				new_row = lr >= tr || mode > 0;
+
+				if(fixed_paste && new_row)
+					break;
+				Set0(lr, lc, gc.data[i].v, true);
+			}
+
+			if(i == gc.data.GetCount() - 1)
+				PasteCallbacks(new_row);
+		}
+	}
+	if(lc >= 0 && lr >= 0)
+	{
+		SetCursor0(lc, lr);
+		sby.Set(vitems[curpos.y].nBottom() - GetSize().cy);
+	}
+	ClearSelection();
+}
+
+void GridCtrl::DoCopy()
+{
+	SetClipboard();
+}
+
+void GridCtrl::DoPaste()
+{
+	Paste(0);
+}
+
+void GridCtrl::DoPasteInsertedRows()
+{
+	Paste(1);
+}
+
+void GridCtrl::DoPasteAppendedRows()
+{
+	Paste(2);
+}
+
+void GridCtrl::Nothing()
+{
+}
+
+void GridCtrl::DrawLine(bool iniLine, bool delLine)
+{
+	if((resizeCol || resizeRow) && resize_paint_mode < 2)
+	{
+		int sx = resize_paint_mode == 1 ? fixed_width : 0;
+		int sy = resize_paint_mode == 1 ? fixed_height : 0;
+		ViewDraw w(this);
+		Size sz = GetSize();
+
+		Point curPnt;
+		static Point oldPnt = curPnt;
+
+		if(resizeCol)
+		{
+			curPnt.x = hitems[splitCol].nRight(sbx) - 1;
+			if(delLine) w.DrawRect(oldPnt.x, sy, 1, sz.cy, InvertColor());
+			if(iniLine) w.DrawRect(curPnt.x, sy, 1, sz.cy, InvertColor());
+	    }
+		if(resizeRow)
+		{
+			curPnt.y = vitems[splitRow].nBottom(sby) - 1;
+			if(delLine) w.DrawRect(sx, oldPnt.y, sz.cx, 1, InvertColor());
+			if(iniLine) w.DrawRect(sx, curPnt.y, sz.cx, 1, InvertColor());
+		}
+
+		oldPnt = curPnt;
+	}
+}
+
+GridCtrl::Item& GridCtrl::GetItemSize(int &r, int &c, int &x, int &y, int &cx, int &cy, bool &skip, bool relx, bool rely)
+{
+	int idx = hitems[c].id;
+	int idy = vitems[r].id;
+
+	int dx = 0;
+	int dy = 0;
+
+	Item *it = &items[idy][idx];
+
+	if(it->isjoined)
+	{
+		int group = it->group;
+		it = &items[it->idy][it->idx];
+		skip = it->paint_flag == paint_flag;
+		it->paint_flag = paint_flag;
+		if(skip)
+			return *it;
+
+		while(c >= 0 && items[idy][hitems[c].id].group == group) --c; ++c;
+		while(r >= 0 && items[vitems[r].id][idx].group == group) --r; ++r;
+
+		dx = it->cx;
+		dy = it->cy;
+	}
+	else
+		skip = false;
+
+	x  = hitems[c].nLeft();
+	y  = vitems[r].nTop();
+	cx = hitems[c + dx].nRight() - x;
+	cy = vitems[r + dy].nBottom() - y;
+
+	if(!draw_last_vert_line && c == total_cols - 1 && r >= fixed_rows) cx += 1;
+	if(!draw_last_horz_line && r == total_rows - 1 && c >= fixed_cols) cy += 1;
+
+	if(relx) x -= sbx;
+	if(rely) y -= sby;
+
+	return *it;
+}
+
+void GridCtrl::Paint(Draw &w)
+{
+	static int paintcnt = 0;
+
+	Font stdfont(StdFont());
+
+	Size sz = GetSize();
+	Rect rc = Rect(sz);  //w.GetClip() - it always returns view rect now. bug??
+
+	if(!ready)
+	{
+		w.DrawRect(rc, SColorPaper);
+		return;
+	}
+
+	int i, j, cx, cy, x, y;
+	bool skip;
+	Rect r;
+
+	LG("---- Paint(%d)", ++paintcnt);
+
+	if(total_cols <= 1 || total_rows == 0)
+	{
+		LG("empty");
+		w.DrawRect(sz, SColorPaper);
+		return;
+	}
+
+	if(UpdateCols() || UpdateRows())
+		UpdateSizes();
+
+	if(firstCol < 0) firstCol = GetFirstVisCol(fixed_width);
+	if(firstRow < 0) firstRow = GetFirstVisRow(fixed_height);
+
+	LG("firstCol %d", firstCol);
+	LG("firstRow %d", firstRow);
+
+	int en = IsShowEnabled() ? 0 : GD::READONLY;
+
+	//---------------------------------------------------------------------------------------
+
+	if(fixed_width > 0 && fixed_height > 0)
+	{
+		w.Clip(0, 0, fixed_width, fixed_height);
+		dword style = chameleon ? GD::CHAMELEON : 0;
+
+		display->PaintFixed(w, 1, 1, 0, 0, fixed_width, fixed_height,
+							Value(""),
+							style, stdfont, false, false,
+							0, -1, 0,
+							true);
+		w.End();
+	}
+
+	r.Set(fixed_width, 0, sz.cx, fixed_height);
+
+	LG("painting %d, tc %d", (int)w.IsPainting(r), total_cols);
+	LG("%d, %d, %d, %d", r.left, r.top, r.right, r.bottom);
+	if(w.IsPainting(r) && total_cols > 1)
+	{
+		LG("Top header");
+		w.Clip(r);
+
+		x = hitems[total_cols - 1].nRight(sbx);
+		int rx = x;
+
+		int firstcol = indicator ? 0 : (fixed_cols > 1 ? 1 : firstVisCol);
+		if(firstCol < 0) firstCol = 0;
+		int jfc = chameleon ? 0 : firstCol;
+
+		for(i = 0; i < fixed_rows; i++)
+		{
+			for(j = jfc; j < total_cols; j++)
+			{
+				if(hitems[j].hidden)
+					continue;
+
+				int jj = j;
+				Item &it = GetItemSize(i, j, x, y, cx, cy, skip, true, false);
+				if(skip)
+					continue;
+
+				if(x >= rc.right)
+					break;
+
+				if(w.IsPainting(x, y, cx, cy))
+				{
+					GridDisplay * gd = it.display ? it.display : display;
+
+					dword style = hitems[j].style | hitems[j].halign;
+					if(i > 0) style &= ~GD::HIGHLIGHT;
+					if(chameleon)
+						style |= GD::CHAMELEON;
+
+					gd->SetLeftImage(hitems[j].img);
+					gd->PaintFixed(w, jj == firstcol, i == 0, x, y, cx, cy,
+								i == 0 ? it.val : GetConvertedColumn(hitems[j].id, it.val),
+								style | en, stdfont, false, false,
+								i == 0 ? hitems[j].sortmode : 0,
+								hitems[j].sortcol,
+								sortOrder.GetCount(),
+								true);
+				}
+			}
+		}
+		if(rx < sz.cx || chameleon)
+		{
+			int cx = sz.cx - rx + 1;
+			dword style = 0;
+			if(chameleon)
+			{
+				cx = max(10, cx);
+				style = GD::CHAMELEON;
+			}
+			display->PaintFixed(w, 0, 1, rx, 0, cx, fixed_height,
+								Value(""),
+								style, stdfont, false, false,
+								0, -1, 0,
+								true);
+		}
+
+		w.End();
+	}
+	//---------------------------------------------------------------------------------------
+
+	bool can_paint = firstCol >= 0 && firstRow >= 0;
+	r.Set(0, fixed_height, fixed_width, sz.cy);
+
+	if(can_paint && w.IsPainting(r))
+	{
+		LG("Left header");
+		w.Clip(r);
+		y = vitems[total_rows - 1].nBottom(sby);
+
+		if(y < sz.cy)
+			w.DrawRect(Rect(0, y, fixed_width, sz.cy), SColorPaper);
+
+		for(i = 0; i < fixed_cols; i++)
+		{
+			bool firstx = (i == !indicator);
+			bool indicator = (i == 0);
+			int id = hitems[i].id;
+
+			for(j = firstRow; j < total_rows; j++)
+			{
+				if(vitems[j].hidden)
+					continue;
+
+				Item &it = GetItemSize(j, i, x, y, cx, cy, skip, false, true);
+
+				if(skip)
+					continue;
+
+				if(y >= rc.bottom)
+					break;
+
+				if(w.IsPainting(x, y, cx, cy))
+				{
+					GridDisplay * gd = it.display ? it.display : display;
+
+					dword style = vitems[j].style;
+					if(i > 0) style &= ~GD::HIGHLIGHT;
+					if(chameleon)
+						style |= GD::CHAMELEON;
+
+					gd->PaintFixed(w, firstx, j == 0, x, y, cx, cy,
+									GetConvertedColumn(id, it.val),
+									style | en, stdfont,
+									indicator, false, 0, -1, 0, false);
+				}
+			}
+		}
+
+		w.End();
+	}
+
+	//---------------------------------------------------------------------------------------
+
+	r.Set(fixed_width, fixed_height, sz.cx, sz.cy);
+
+	if(can_paint && w.IsPainting(r))
+	{
+		LG("Body");
+		w.Clip(r);
+
+		x = hitems[total_cols - 1].nRight(sbx);
+		y = vitems[total_rows - 1].nBottom(sby);
+
+		if(x < sz.cx) w.DrawRect(Rect(max(x, rc.left), max(fixed_height, rc.top), sz.cx, sz.cy), SColorPaper);
+		if(y < sz.cy) w.DrawRect(Rect(max(fixed_width, rc.left), max(y, rc.top), sz.cx, sz.cy), SColorPaper);
+
+/*
+		if(fixed_rows <= total_rows)
+		{
+			w.DrawText(
+		}
+*/
+
+		bool hasfocus = HasFocusDeep();
+
+
+		for(i = max(firstRow, fixed_rows); i < total_rows; i++)
+		{
+			ItemRect& vi = vitems[i];
+			if(vi.hidden) continue;
+
+			bool even = coloringMode == 2 ? (i - vi.n - fixed_rows) & 1 : false;
+
+			for(j = max(firstCol, fixed_cols); j < total_cols; j++)
+			{
+				const ItemRect& hi = hitems[j];
+
+				if(hi.hidden)
+					continue;
+
+				Item &it = GetItemSize(i, j, x, y, cx, cy, skip);
+				if(skip)
+					continue;
+
+				if(y >= rc.bottom)
+					goto end_paint;
+
+				if(x >= rc.right)
+					break;
+
+				if(!w.IsPainting(0, y, sz.cx, cy))
+					break;
+
+				if(w.IsPainting(x, y, cx, cy))
+				{
+					bool iscur = draw_focus ? (i == curpos.y && j == curpos.x) : false;
+
+					if(coloringMode == 1)
+						even = (j - hi.n - fixed_cols) & 1;
+
+					int id = hi.id;
+
+					dword style = (select_row ? vi.style : it.style) | hi.balign;
+					dword istyle = it.style;
+
+					if(hitems[j].wrap)
+						style |= GD::WRAP;
+					if(ctrlpos.y == i && edits[id].ctrl && edits[id].ctrl->IsShown())
+						style |= GD::NOTEXT;
+					if(it.ctrl)
+						style |= GD::NOTEXT;
+
+					if(coloringMode > 0)
+						style |= (even ? GD::EVEN : GD::ODD);
+					if(hasfocus)
+						style |= GD::FOCUS;
+
+					Color cfg = IsNull(vi.fg) ? hi.fg : vi.fg;
+					Color cbg = IsNull(vi.bg) ? hi.bg : vi.bg;
+
+					Font fnt = StdFont();
+
+					if(!IsNull(vi.fnt))
+						fnt = vi.fnt;
+					else if(!IsNull(hi.fnt))
+						fnt = hi.fnt;
+
+					Color fg = SColorText;
+					Color bg = SColorPaper;
+
+					bool custom = true;
+
+					if(style & GD::CURSOR)
+					{
+						if(style & GD::FOCUS)
+						{
+							fg = iscur ? Blend(bg_focus, Black, 230) : fg_focus;
+							bg = iscur ? Blend(bg_focus, White, 230) : bg_focus;
+						}
+						else
+						{
+							fg = fg_focus;
+							bg = Blend(bg_focus, White, 170);
+						}
+						custom = false;
+					}
+					else if(style & GD::LIVE)
+					{
+						fg = fg_live;
+						bg = bg_live;
+						custom = false;
+					}
+					else if(istyle & GD::FOUND)
+					{
+						fg = fg_found;
+						bg = bg_found;
+						custom = false;
+					}
+					else if(style & GD::SELECT)
+					{
+						fg = fg_select;
+						bg = bg_select;
+						custom = false;
+					}
+					else if(style & GD::EVEN)
+					{
+						fg = fg_even;
+						bg = bg_even;
+					}
+					else if(style & GD::ODD)
+					{
+						fg = fg_odd;
+						bg = bg_odd;
+					}
+
+					if(custom)
+					{
+						if(!IsNull(cfg)) fg = cfg;
+						if(!IsNull(cbg)) bg = cbg;
+					}
+
+					Value val;
+					if(IsType<AttrText>(it.val))
+					{
+						const AttrText& t = ValueTo<AttrText>(it.val);
+						val = t.text;
+						if(custom)
+						{
+							if(!IsNull(t.paper)) bg  = t.paper;
+							if(!IsNull(t.ink))   fg  = t.ink;
+						}
+						if(!IsNull(t.font))  fnt = t.font;
+						dword s = 0;
+						if(!IsNull(t.align))
+						{
+							if(t.align == ALIGN_LEFT)
+								s = GD::LEFT;
+							else if(t.align == ALIGN_RIGHT)
+								s = GD::RIGHT;
+							else if(t.align == ALIGN_CENTER)
+								s = GD::HCENTER;
+							style &= ~GD::HALIGN;
+							style |= s;
+						}
+					}
+					else
+						val = hi.IsConvertion() && vi.IsConvertion() ? GetConvertedColumn(id, it.val) : it.val;
+
+					GridDisplay * hd = hi.display;
+					GridDisplay * vd = vi.display;
+					GridDisplay * gd = display;
+					if(!hi.ignore_display && !vi.ignore_display)
+						gd = vd ? vd : (hd ? hd : (it.display ? it.display : display));
+
+					gd->SetBgImage(vi.img);
+					gd->col = j - fixed_rows;
+					gd->row = i - fixed_cols;
+					gd->parent = this;
+					gd->Paint(w, x, y, cx, cy,
+					          val, style | en,
+					          fg, bg, fnt, it.style & GD::FOUND, it.fs, it.fe);
+
+					if(vert_grid)
+					{
+						bool skip = false;
+						if(!draw_last_vert_line && j == total_cols - 1)
+							skip = true;
+
+						if(!skip)
+							w.DrawRect(x + cx - 1, y, 1, cy, fg_grid);
+					}
+					if(horz_grid)
+					{
+						bool skip = false;
+						if(!draw_last_horz_line && i == total_rows - 1)
+							skip = true;
+
+						if(!skip)
+							w.DrawRect(x, y + cy - 1, cx, 1, fg_grid);
+					}
+
+					if(iscur && draw_focus)
+						Upp::DrawFocus(w, x, y, cx, cy);
+				}
+				//if(curpos.y == i)
+				//	DrawFocus(w, hitems[fixed_cols].nLeft(), y, hitems[total_cols - 1].nRight() - 1, cy - 1);
+			}
+		}
+
+	end_paint:
+
+		w.End();
+
+		lastCol = j - 1;
+		lastRow = i - 1;
+	}
+
+
+	if(moving_header && fixed_top_click && curSplitCol >= 0)
+	{
+		r.Set(fixed_width, 0, sz.cx, fixed_height);
+		w.Clip(r);
+		bool lastcol = curSplitCol == lastVisCol;
+
+		int cp = curSplitCol;
+		if(!lastcol)
+			while(++cp < total_cols && hitems[cp].hidden);
+
+		int cx = hitems[cp].nWidth() / 2;
+		int x = lastcol ? hitems[curSplitCol].nLeft(sbx) + cx
+		                : hitems[curSplitCol].nRight(sbx) - 1;
+		DrawFatFrame(w, x, 0, cx, vitems[fixed_rows - 1].nBottom(), moving_allowed ? LtBlue : Red, 2);
+		w.End();
+	}
+
+	if(moving_header && fixed_left_click)
+	{
+		int dy = curSplitRow == lastVisRow ? -2 : -1;
+		int y = curSplitRow >= 0 ? vitems[curSplitRow].nBottom(sby) + dy : 0;
+		if(y >= fixed_height - 1)
+			DrawVertDragLine(w, y, hitems[fixed_cols - 1].nRight(), 0, moving_allowed ? LtBlue : Red);
+	}
+
+	if(moving_body)
+	{
+		int dy = curSplitRow == lastVisRow ? -2 : -1;
+		int y = curSplitRow >= 0 ? vitems[curSplitRow].nBottom(sby) + dy : 0;
+		if(y >= fixed_height - 1)
+			DrawVertDragLine(w, y, sz.cx, fixed_width - 1, LtBlue);
+	}
+
+	if(search_display && !search_string.IsEmpty())
+	{
+		Size tsz = GetTextSize(search_string, StdFont());
+		w.DrawRect(Rect(0, sz.cy - tsz.cy - 4, tsz.cx + 4, sz.cy), SRed);
+		w.DrawText(2, sz.cy - tsz.cy - 2, search_string, StdFont(), SYellow);
+	}
+
+	if(!can_paint)
+		w.DrawRect(Rect(0, total_cols > 1 ? fixed_height : 0, sz.cx, sz.cy), SColorPaper);
+	if(++paint_flag > 100)
+		paint_flag = 0;
+
+	LG("---- Paint(%d).", paintcnt);
+}
+
+void GridCtrl::DrawHorzDragLine(Draw &w, int pos, int cx, int size, Color c)
+{
+	//w.DrawRect(pos, 0, cx / 2, size - 1, Color(100, 100, 100, 100);
+	DrawFrame(w, pos + 1, 1, cx / 2 - 2, size - 2, c);
+	DrawFrame(w, pos, 0, cx / 2, size, c);
+//	DrawFatFrame(w, x, 0,� int cx� int cy� Color color� int n)
+}
+
+void GridCtrl::DrawVertDragLine(Draw &w, int pos, int size, int dx, Color c)
+{
+	w.DrawRect(1 + dx, pos, size - dx - 1, 2, c);
+}
+
+Value GridCtrl::GetConvertedColumn(int col, const Value &v) const
+{
+	Convert *conv = edits[col].convert;
+	return conv ? conv->Format(v) : v;
+}
+
+String GridCtrl::GetStdConvertedColumn(int col, const Value &v) const
+{
+	Convert *conv = edits[col].convert;
+	Value val = conv ? conv->Format(v) : v;
+	return IsString(val) ? val : StdConvert().Format(val);
+}
+
+GridCtrl::ItemRect& GridCtrl::InsertColumn(int pos, const char *name, int size, bool idx)
+{
+	return hitems[0];
+}
+
+GridCtrl::ItemRect& GridCtrl::AddColumn(const char *name, int size, bool idx)
+{
+	ItemRect::aliases = &aliases;
+
+	if(total_rows > 1)
+		for(int i = 1; i < total_rows; ++i)
+			items[i].Add();
+	else
+		total_rows = 1;
+
+	Item &it = items[0].Add();
+	it.val = name;
+
+	ItemRect &ib = hitems.Add();
+
+	ib.parent = this;
+	ib.items  = &items;
+	ib.edits  = &edits;
+	ib.prop   = size;
+	ib.id     = total_cols;
+	ib.uid    = coluid++;
+	ib.index  = idx;
+
+	ib.Size(size);
+	if(!ib.hidden)
+	{
+		lastVisCol = total_cols;
+		if(firstVisCol < 0)
+			firstVisCol = lastVisCol;
+	}
+
+	if(header && vitems[0].nsize == 0)
+	{
+		vitems[0].size = vitems[0].nsize = GD_HDR_HEIGHT;
+		vitems[0].hidden = false;
+	}
+	if(!header)
+	{
+		vitems[0].size = vitems[0].nsize = 0;
+		vitems[0].hidden = true;
+	}
+
+	edits.Add();
+
+	String lname(name);
+	aliases.Add(ToLower(lname), ib.id);
+	rowbkp.Add();
+	total_cols++;
+
+	if(ready && IsOpen())
+	{
+		recalc_cols = true;
+		RefreshLayout();
+	}
+
+	return ib;
+}
+
+GridCtrl::ItemRect& GridCtrl::AddColumn(const Id id, const char *name, int size, bool idx)
+{
+	return AddColumn(name ? name : (const char *) ~id, size, idx).Alias(id);
+}
+
+GridCtrl::ItemRect& GridCtrl::AddColumn(const String& name, int size, bool idx)
+{
+	return AddColumn((const char *) name, size, idx);
+}
+
+void GridCtrl::RemoveColumn(int n, int count)
+{
+	n += fixed_cols;
+	if(count < 0)
+		count = total_cols - n;
+	if(n < fixed_cols || n + count > total_cols)
+		return;
+	for(int i = 0; i < total_rows; i++)
+		items[i].Remove(n, count);
+	hitems.Remove(n, count);
+	rowbkp.Remove(n, count);
+	total_cols -= count;
+	recalc_cols = true;
+	RefreshLayout();
+}
+
+GridCtrl::ItemRect& GridCtrl::AddRow(int n, int size)
+{
+	Append0(n, size);
+	return GetRow();
+}
+
+GridCtrl& GridCtrl::AddSeparator(Color c)
+{
+	Append0(1, 3);
+	ItemRect& ir = GetRow();
+	ir.Bg(c);
+	ir.Editable(false);
+	ir.Clickable(false);
+	ir.Skip(true);
+	return *this;
+}
+
+void GridCtrl::SetRowCount(int n, int size)
+{
+	Clear();
+	Append0(n, size);
+}
+
+void GridCtrl::SetColCount(int n, int size)
+{
+	Reset();
+	for(int i = 0; i < n; i++)
+		AddColumn(NULL, size, false);
+}
+
+void GridCtrl::MouseMove(Point p, dword keyflags)
+{
+	//LG("MouseMove");
+	mouse_move = true;
+
+	if(resizing)
+	{
+		int si, lp, mp, off;
+		RectItems *its;
+		static int sub = 0;
+
+		if(resizeCol)
+		{
+			mp = p.x;
+			lp = leftpnt.x;
+			si = splitCol;
+			its = &hitems;
+			bool top = fixed_top_click || (!fixed_left_click && full_col_resizing);
+			off = top ? sbx : 0;
+		}
+		else
+		{
+			mp = p.y;
+			lp = leftpnt.y;
+			si = splitRow;
+			its = &vitems;
+			bool left = fixed_left_click || (!fixed_top_click && full_row_resizing);
+			off = left ? sby : 0;
+		}
+
+		int right = (*its)[si].nRight(off);
+
+		if(just_clicked)
+		{
+			sub = right - lp;
+			just_clicked = false;
+		}
+
+		if(SetDiffItemSize(resizeCol, *its, si, mp - right + sub))
+		{
+			Split(GS_MOVE);
+		}
+
+		return;
+	}
+	else if(fixed_click)
+	{
+		if((fixed_top_click && !moving_cols) ||
+		   (fixed_left_click && !moving_rows) ||
+		   moveCol < 0 || moveRow < 0)
+		   return;
+
+		if(!moving_header)
+		{
+			int diffx = p.x - leftpnt.x;
+			int diffy = p.y - leftpnt.y;
+			if(abs(diffx) < 5 && abs(diffy) < 5)
+				return;
+
+			p -= Point(diffx, diffy);
+
+			moving_header = true;
+			int idx = hitems[moveCol].id;
+			int idy = vitems[moveRow].id;
+			pophdr.val = idy > 0 ? GetConvertedColumn(moveCol, items[idy][idx].val) : items[idy][idx].val;
+
+			if(fixed_top_click)
+			{
+				pophdr.sortmode = hitems[moveCol].sortmode;
+				pophdr.sortcol = hitems[moveCol].sortcol;
+				pophdr.sortcnt = sortOrder.GetCount();
+
+				UpdateHighlighting(GS_POPUP, p);
+			}
+			else
+			{
+				pophdr.sortmode = 0;
+				pophdr.sortcol = -1;
+				pophdr.sortcnt = 0;
+			}
+
+			dx = hitems[moveCol].nLeft(fixed_top_click ? sbx : 0) - p.x;
+			dy = vitems[moveRow].nTop(fixed_left_click ? sby : 0) - p.y;
+		}
+
+
+		Point pt = p + GetScreenRect().TopLeft() + GetBarOffset();
+
+		pophdr.display = display;
+		pophdr.chameleon = chameleon;
+		pophdr.PopUp(this, pt.x + dx, pt.y + dy, hitems[moveCol].nWidth(), vitems[moveRow].nHeight());
+
+		if(fixed_top_click && curSplitCol != oldMoveCol)
+		{
+			moving_allowed = CanMoveCol(moveCol, curSplitCol);
+			RefreshTop();
+			//Refresh(oldMoveCol >= 0 ? hitems[oldMoveCol].nRight(sbx) : 0, 0, hitems[curSplitCol].nRight(sbx), fixed_height);
+			oldMoveCol = curSplitCol;
+		}
+
+		if(fixed_left_click && curSplitRow != oldMoveRow)
+		{
+			Refresh(0, 0, fixed_width, fixed_height);
+			RefreshLeft();
+			oldMoveRow = curSplitRow;
+		}
+		return;
+	}
+
+	if(leftpnt != p && p.y < fixed_height)
+	{
+		UpdateHighlighting(GS_MOVE, p);
+	}
+
+	if(live_cursor)
+	{
+		if(IsMouseBody(p))
+			SetCursor0(p, true, true);
+		else
+			SetCursor0(-1, -1, false, true);
+	}
+	if(HasCapture())
+	{
+		if(!moving_body)
+		{
+			if(keyflags & K_SHIFT)
+			{
+				if(SetCursor0(p, true))
+				{
+					DoShiftSelect();
+					selecting = true;
+				}
+				return;
+			}
+
+			bool select = true;
+			if(select_row && !multi_select)
+				select = false;
+
+			if(select && (keyflags & K_CTRL))
+			{
+				if(SetCursor0(p, true))
+				{
+					DoCtrlSelect();
+					selecting = true;
+				}
+				return;
+			}
+		}
+
+		if(moveCol < 0 || moveRow < 0)
+			return;
+
+		if(!dragging)
+			return;
+
+		if(!moving_body)
+		{
+			if(!top_click && valid_cursor &&
+			   p.x < total_width &&
+			   p.y < total_height &&
+			   (abs(p.y - leftpnt.y) > 5 ||
+			    abs(p.x - leftpnt.x) > 5))
+				moving_body = true;
+
+			oldMoveRow = -1;
+		}
+		else
+		{
+			Point pt = p + GetScreenRect().TopLeft();
+
+			int row = curSplitRow - fixed_rows + 2;
+			if(select_row)
+			{
+				int count = max(1, selected_rows);
+
+				if(vitems[curpos.y].IsSelect())
+					popup.text = Format(t_("Moving selection (%d %s) before row %d"), count, count == 1 ? t_("row") : t_("rows"), row);
+				else
+					popup.text = Format(t_("Moving row %d before row %d"), curpos.y - fixed_rows + 1, row);
+			}
+			else
+			{
+				int count = max(1, selected_items);
+				popup.text = Format(t_("Moving %d %s before row %d"), count, count == 1 ? t_("cell") : t_("cells"), row);
+			}
+
+			int px = pt.x + 15;
+			int py = pt.y + GD_ROW_HEIGHT;
+
+			popup.PopUp(this, px, py, GetTextSize(popup.text, StdFont()).cx + 6, GD_ROW_HEIGHT);
+			SetFocus();
+
+			if(curSplitRow != oldMoveRow || scrollLeftRight)
+			{
+				int dy = sby;
+				if(oldMoveRow >= 0)
+					Refresh(Rect(0, vitems[oldMoveRow].nBottom(dy) - 5, GetSize().cx, vitems[oldMoveRow].nBottom(dy) + 5));
+				else
+					Refresh(Rect(0, 0, GetSize().cx, 5));
+				if(curSplitRow >= 0)
+					Refresh(Rect(0, vitems[curSplitRow].nBottom(dy) - 5, GetSize().cx, vitems[curSplitRow].nBottom(dy) + 5));
+				else
+					Refresh(Rect(0, 0, GetSize().cx, 5));
+
+				oldMoveRow = curSplitRow;
+				popup.Refresh();
+
+				scrollLeftRight = false;
+			}
+		}
+	}
+}
+
+void GridCtrl::LeftDown(Point p, dword keyflags)
+{
+	LG("LeftDown");
+
+	SetCapture();
+	leftpnt = p;
+	just_clicked = true;
+	selecting = false;
+
+	fixed_top_click  = p.x >= fixed_width && p.y < fixed_height;
+	fixed_left_click = p.x < fixed_width && p.y >= fixed_height;
+	fixed_click      = fixed_top_click || fixed_left_click;
+	top_click        = p.y < fixed_height;
+
+	resizing = curResizeCol || curResizeRow;
+
+	if(resizing)
+	{
+		splitCol  = curSplitCol;
+		splitRow  = curSplitRow;
+		resizeCol = curResizeCol;
+		resizeRow = curResizeRow;
+
+		Split(GS_DOWN);
+		return;
+	}
+	else if(fixed_click)
+	{
+		moveCol = oldMoveCol = GetMouseCol(p, fixed_top_click, 1);
+		moveRow = oldMoveRow = GetMouseRow(p, fixed_left_click, 1);
+		return;
+	}
+
+	SetFocus();
+
+	if(IsEmpty() || IsReadOnly())
+		return;
+
+	bool is_shift = keyflags & K_SHIFT;
+	bool is_ctrl = keyflags & K_CTRL;
+
+	CurState cs = SetCursor0(p, true);
+	bool state_change = cs.IsValid() && !cs.IsNew() && (is_ctrl || is_shift);
+
+	if(cs.IsAccepted())
+	{
+		if(edit_mode == GE_CELL || (edit_mode == GE_ROW && (cs.IsNewRow() || !cs.IsValid())))
+		{
+			UpdateCtrls(UC_HIDE | UC_CTRLS | UC_OLDCUR);
+			if(!one_click_edit || !cs.IsValid())
+				WhenEndEdit();
+		}
+	}
+	else if(!state_change)
+		return;
+
+	if(cs || state_change)
+	{
+		moveCol = curpos.x;
+		moveRow = curpos.y;
+
+		if(keyflags & K_CTRL)
+		{
+			bool select = true;
+			if(!select_row)
+				ClearSelection();
+			else if(!multi_select)
+				select = false;
+
+			if(select)
+			{
+				shiftpos = curpos;
+				SelectRange(curpos, curpos, !vitems[curpos.y].IsSelect(), select_row);
+				selecting = true;
+			}
+		}
+		else if(keyflags & K_SHIFT)
+		{
+			DoShiftSelect();
+			selecting = true;
+		}
+	}
+
+	#ifdef LOG_CALLBACKS
+	//LGR(2, "WhenLeftClick()");
+	#endif
+
+	WhenLeftClick();
+
+	if(editing && cs.IsValid() && one_click_edit) //&& IsRowEditable() ?
+		StartEdit(true);
+	else
+		RebuildToolBar();
+}
+
+void GridCtrl::LeftUp(Point p, dword keyflags)
+{
+	LG("LeftUp");
+
+	ReleaseCapture();
+	fixed_click = false;
+
+	UpdateHighlighting(GS_UP, p);
+
+	if(moving_header)
+	{
+		LG("moving_header");
+		pophdr.Close();
+
+		moving_header = false;
+		if(fixed_top_click)
+			MoveCol(moveCol, curSplitCol);
+		else
+			MoveRow(moveRow, curSplitRow);
+
+		if(focused_ctrl)
+			focused_ctrl->SetFocus();
+
+		fixed_top_click = false;
+		fixed_left_click = false;
+
+		return;
+	}
+
+	if(resizing)
+	{
+		Split(GS_UP);
+		resizeCol = resizeRow = resizing = false;
+		return;
+	}
+
+	if(fixed_top_click && sorting && Distance(leftpnt, p) < 3)
+	{
+		int i = GetMouseRow(leftpnt, false, true);
+		int j = GetMouseCol(leftpnt, true, false);
+
+		if(j >= fixed_cols && i == 0 && hitems[i].sortable)
+		{
+			LG("Sorting");
+			int newSortCol = hitems[j].id;
+
+			if(sorting_multicol && (keyflags & K_CTRL))
+			{
+				if(sortCol >= 0)
+				{
+					sortOrder.Add(sortCol);
+					sortCol = -1;
+			    }
+
+				int colidx = InMultisort(newSortCol);
+
+				if(colidx < 0)
+				    sortOrder.Add(newSortCol);
+
+				int cnt = sortOrder.GetCount();
+
+				hitems[j].ChangeSortMode(newSortCol == sortOrder[cnt - 1]);
+
+				if(colidx >= 0)
+				{
+					if(hitems[j].sortmode == 0)
+					{
+						sortOrder.Remove(colidx);
+						cnt--;
+					}
+
+					if(hitems[j].sortmode > 0 && colidx == cnt - 1)
+						GSort();
+					else
+						Multisort();
+				}
+				else
+				{
+					hitems[j].sortcol = cnt;
+					GSort();
+				}
+			}
+			else
+			{
+				if(sortCol >= 0 && sortCol != newSortCol)
+				{
+					int idx = GetIdCol(sortCol, true);
+					hitems[idx].sortmode = 0;
+				}
+
+				ClearMultisort();
+				hitems[j].ChangeSortMode();
+				hitems[j].sortcol = 1;
+
+				if(hitems[j].sortmode == 0)
+					sortCol = -1;
+				else
+					sortCol = newSortCol;
+
+				sortOrder.Clear();
+				GSort(newSortCol, hitems[j].sortmode, fixed_rows);
+			}
+
+			UpdateCursor();
+			Repaint(false, true);
+		}
+    }
+
+	if(moving_body)
+	{
+		popup.Close();
+		moving_body = false;
+		MoveRows(curSplitRow + 1, !vitems[curpos.y].IsSelect());
+		return;
+	}
+
+	if(selected_rows > 0 && !selecting)
+		ClearSelection();
+}
+
+void GridCtrl::LeftDouble(Point p, dword keyflags)
+{
+	LG("LeftDouble");
+
+	if(full_col_resizing && curSplitCol >= 0)
+		return;
+
+	if(full_row_resizing && curSplitRow >= 0)
+		return;
+
+	if(IsEmpty() || !IsMouseBody(p) || IsReadOnly())
+		return;
+
+	if(keyflags & K_SHIFT || keyflags & K_CTRL)
+		return;
+
+	if(!valid_cursor)
+		return;
+
+	if(editing)
+		StartEdit(true);
+
+	if(!IsCtrl(curpos))
+	{
+		#ifdef LOG_CALLBACKS
+		LGR(2, "WhenLeftDouble()");
+		#endif
+		WhenLeftDouble();
+	}
+}
+
+void GridCtrl::LeftRepeat(Point p, dword keyflags)
+{
+	if(!moving_header && !resizeCol && !resizeRow)
+		MouseAccel(p, resize_col_mode == 0, resize_row_mode == 0, keyflags);
+}
+
+void GridCtrl::RightDown(Point p, dword keyflags)
+{
+	if(IsReadOnly())
+		return;
+
+	if(total_rows > fixed_rows)
+	{
+		//ClearSelection();
+		if(!EndEdit())
+			return;
+
+		if(!SetCursor0(p, true).IsAccepted())
+			return;
+
+		//UpdateCtrls(UC_HIDE | UC_CTRLS);
+	}
+
+	SetFocus(); //jak nie bedzie menu to fokous zostanie na danym wierszu
+	MenuBar::Execute(WhenMenuBar);
+}
+
+void GridCtrl::Init()
+{
+	bar.Set(WhenToolBar);
+	UpdateCols(true);
+	/* recalc_rows bo przed otworzeniem grida moglo zostac wywolane setrowheight */
+	UpdateRows(resize_row_mode > 0 || recalc_rows);
+
+	UpdateSizes();
+	UpdateSb();
+	UpdateHolder(true);
+	SyncCtrls();
+}
+
+void GridCtrl::State(int reason)
+{
+	if(reason == OPEN)
+	{
+		Init();
+		ready = true;
+		//ready po init - updatesb wola layout() a ten syncctrl
+		//(ktory w sumie wola sie 3 razy zanim grid sie wyswietli - niepotrzebnie)
+	}
+	else if(reason == CLOSE)
+	{
+		if(live_cursor)
+			SetCursor0(-1, -1, false, true);
+	}
+	else if(reason == ENABLE)
+	{
+		bool e = IsEnabled();
+		if(e != enabled)
+		{
+			RebuildToolBar();
+			enabled = e;
+		}
+	}
+}
+
+void GridCtrl::Layout()
+{
+	if(!ready)
+		return;
+
+	LG("Layout");
+
+	UpdateCols();
+	UpdateRows();
+	UpdateSizes();
+	UpdateSb();
+	UpdateHolder();
+	UpdateCtrls(UC_CHECK_VIS | UC_SHOW);
+	SyncCtrls();
+}
+
+void GridCtrl::ChildAction(Ctrl *child, int event)
+{
+	if(child != focused_ctrl)
+	{
+		if(event == LEFTDOWN || event == RIGHTDOWN)
+		{
+			LG(2, "got event :%x child: %x", event, child);
+			Point cp = GetCtrlPos(child);
+			if(cp.x < 0 || cp.y < 0)
+				return;
+
+			SetCursor0(cp, false);
+			UpdateCtrls(UC_SHOW | UC_FOCUS | UC_CTRLS_OFF);
+			WhenCtrlAction();
+		}
+	}
+}
+
+void GridCtrl::ChildMouseEvent(Ctrl *child, int event, Point p, int zdelta, dword keyflags)
+{
+	ChildAction(child, event);
+	return Ctrl::ChildMouseEvent(child, event, p, zdelta, keyflags);
+}
+
+void GridCtrl::ChildFrameMouseEvent(Ctrl *child, int event, Point p, int zdelta, dword keyflags)
+{
+	ChildAction(child, event);
+	return Ctrl::ChildFrameMouseEvent(child, event, p, zdelta, keyflags);
+}
+
+void GridCtrl::DragAndDrop(Point p, PasteClip& d)
+{
+	/*
+	moving_body = true;
+	if(curSplitRow != oldMoveRow || scrollLeftRight)
+	{
+		int dy = sby;
+		if(oldMoveRow >= 0)
+			Refresh(Rect(0, vitems[oldMoveRow].nBottom(dy) - 5, GetSize().cx, vitems[oldMoveRow].nBottom(dy) + 5));
+		else
+			Refresh(Rect(0, 0, GetSize().cx, 5));
+		if(curSplitRow >= 0)
+			Refresh(Rect(0, vitems[curSplitRow].nBottom(dy) - 5, GetSize().cx, vitems[curSplitRow].nBottom(dy) + 5));
+		else
+			Refresh(Rect(0, 0, GetSize().cx, 5));
+
+		oldMoveRow = curSplitRow;
+		popup.Refresh();
+
+		scrollLeftRight = false;
+	}
+	*/
+}
+
+Rect GridCtrl::GetItemRect(int r, int c, bool hgrid, bool vgrid, bool ctrlmode)
+{
+	int dx = sbx + (ctrlmode ? fixed_width : 0);
+	int dy = sby + (ctrlmode ? fixed_height : 0);
+
+	int idx = hitems[c].id;
+	int idy = vitems[r].id;
+
+	Item &it = items[idy][idx];
+
+	int left, top, right, bottom;
+
+	if(it.isjoined)
+	{
+		int group = it.group;
+
+		while(r > fixed_rows && items[vitems[r].id][idx].group == group) --r; ++r;
+
+		top = vitems[r].nTop(dy);
+		bottom = vitems[r + it.cy].nBottom(dy);
+
+		while(c > fixed_cols && items[idy][hitems[c].id].group == group) --c; ++c;
+
+		left = hitems[c].nLeft(dx);
+		right = hitems[c + it.cx].nRight(dx);
+	}
+	else
+	{
+		left = hitems[c].nLeft(dx);
+		top = vitems[r].nTop(dy);
+		right = hitems[c].nRight(dx);
+		bottom = vitems[r].nBottom(dy);
+	}
+
+	return Rect(left, top, right - (int) vgrid, bottom - (int) hgrid);
+}
+
+Rect& GridCtrl::AlignRect(Rect &r, int i)
+{
+	Rect c(r);
+	int align = hitems[i].calign;
+	int sx = hitems[i].sx;
+	int sy = hitems[i].sy;
+
+	if(sx > 0)
+	{
+		if(align & GD::HCENTER)
+		{
+			int d = (r.Width() - sx) / 2;
+			r.left += d;
+			r.right -= d;
+		}
+		else if(align & GD::LEFT)
+		{
+			r.left += hitems[i].sl;
+			r.right = r.left + sx;
+		}
+		else if(align & GD::RIGHT)
+		{
+			r.right -= hitems[i].sr;
+			r.left = r.right - sx;
+		}
+		else if(align & GD::HPOS)
+		{
+			r.left += hitems[i].sl;
+			r.right -= hitems[i].sr;
+		}
+	}
+
+	if(sy > 0)
+	{
+		if(align & GD::VCENTER)
+		{
+			int d = (r.Height() - sy) / 2;
+			r.top += d;
+			r.bottom -= d;
+		}
+		else if(align & GD::TOP)
+		{
+			r.top += hitems[i].st;
+			r.bottom = r.top + sy;
+		}
+		else if(align & GD::RIGHT)
+		{
+			r.bottom -= hitems[i].sb;
+			r.top = r.bottom - sy;
+		}
+		else if(align & GD::VPOS)
+		{
+			r.top += hitems[i].st;
+			r.bottom -= hitems[i].sb;
+		}
+	}
+
+	if(r.left   < c.left)   r.left   = c.left;
+	if(r.right  > c.right)  r.right  = c.right;
+	if(r.top    < c.top)    r.top    = c.top;
+	if(r.bottom > c.bottom) r.bottom = c.bottom;
+
+	return r;
+}
+
+
+void GridCtrl::Scroll()
+{
+	Point newpos(sbx, sby);
+	Size delta = oldpos - newpos;
+	oldpos = newpos;
+
+	if(delta.cx != 0) firstCol = -1;
+	if(delta.cy != 0) firstRow = -1;
+
+	if(!doscroll)
+		return;
+
+	LG("Scroll (%d, %d)", delta.cx, delta.cy);
+
+	SyncCtrls();
+	UpdateCtrls(UC_CHECK_VIS | UC_SHOW | UC_SCROLL);
+
+	if(resizeCol || resizeRow)
+		return;
+
+	if(!IsFullRefresh())
+	{
+		Size sz = GetSize();
+		holder.ScrollView(delta);
+		if(delta.cx != 0)
+		{
+			ScrollView(Rect(fixed_width, 0, sz.cx, fixed_height), delta.cx, 0);
+			scrollLeftRight = true;
+		}
+		if(delta.cy != 0)
+		{
+			ScrollView(Rect(0, fixed_height, fixed_width, sz.cy), 0, delta.cy);
+		}
+	}
+	if(live_cursor)
+		SetCursor0(GetMousePos() - GetScreenRect().TopLeft(), true, true);
+
+}
+
+void GridCtrl::SetFixedRows(int n)
+{
+	if(n >= 0 && n <= total_rows)
+	{
+		LG("SetFixedRows");
+		fixed_rows = n;
+		firstRow = -1;
+		UpdateSizes();
+		UpdateHolder();
+		UpdateVisColRow(false);
+		if(ready)
+			SyncCtrls();
+		Refresh();
+	}
+}
+
+void GridCtrl::SetFixedCols(int n)
+{
+	if(n >= 0 && n < total_cols)
+	{
+		LG("SetFixedCols");
+		fixed_cols = n + 1; /* +1 - indicator! */
+		firstCol = -1;
+		UpdateSizes();
+		UpdateHolder();
+		UpdateVisColRow(true);
+		if(ready)
+			SyncCtrls();
+		Refresh();
+	}
+}
+
+void GridCtrl::Set0(int r, int c, const Value &val, bool paste)
+{
+	if(c > total_cols - 1)
+		return;
+	if(r > total_rows - 1)
+		AddRow(r - total_rows + 1);
+
+	int ri = vitems[r].id;
+	Item &it = items[ri][c];
+
+	if(it.isjoined)
+	{
+		ri = it.idy;
+		c  = it.idx;
+	}
+	Ctrl * ctrl = items[ri][c].ctrl;
+	if(ctrl)
+		ctrl->SetData(val);
+	else
+	{
+		ctrl = edits[c].ctrl;
+		if(ctrl && ctrlid.y == ri)
+			ctrl->SetData(val);
+	}
+
+	items[ri][c].val = val;
+	RefreshItem(r, c, false);
+
+	if(paste)
+		WhenUpdateCell();
+}
+
+void GridCtrl::Set(int r, int c, const Value &val)
+{
+	Set0(r + fixed_rows, c + fixed_cols, val);
+}
+
+void GridCtrl::Set(int r, Id id, const Value &val)
+{
+	Set0(r + fixed_rows, aliases.Get(id), val);
+}
+
+void GridCtrl::Set(int r, const char *s, const Value &val)
+{
+	Set0(r + fixed_rows, aliases.Get(s), val);
+}
+
+void GridCtrl::Set(int c, const Value &val)
+{
+	Set0(rowidx, c + fixed_cols, val);
+}
+
+void GridCtrl::Set(Id id, const Value &val)
+{
+	Set0(rowidx, aliases.Get(id), val);
+}
+
+void GridCtrl::Set(int r, const Vector<Value> &v, int data_offset /* = 0*/, int column_offset /* = 0*/)
+{
+	r += fixed_rows;
+	int cnt = min(v.GetCount(), total_cols - fixed_cols);
+	int r0 = vitems[r].id;
+	int c = fixed_cols + column_offset;
+	for(int i = data_offset; i < cnt; i++)
+		items[r0][c++].val = v[i];
+
+	RefreshRow(r, false, 0);
+}
+
+void GridCtrl::Set(const Vector<Value> &v, int data_offset /* = 0*/, int column_offset /* = 0*/)
+{
+	int r = rowidx - fixed_rows;
+	Set(r, v, data_offset, column_offset);
+}
+
+void GridCtrl::SetCtrlValue(int r, int c, const Value &val)
+{
+	c += fixed_cols;
+	int ri = vitems[r].id;
+	Ctrl * ctrl = items[ri][c].ctrl;
+	if(ctrl)
+		ctrl->SetData(val);
+	else
+	{
+		ctrl = edits[c].ctrl;
+		if(ctrl && ctrlid.y == ri)
+			ctrl->SetData(val);
+	}
+}
+
+void GridCtrl::SetCtrlValue(int c, const Value &val)
+{
+	SetCtrlValue(rowidx, c, val);
+}
+
+void GridCtrl::SetLast(int c, const Value &val)
+{
+	c += fixed_cols;
+	items[vitems[rowidx].id][c].val = val;
+	RefreshItem(rowidx, c, false);
+}
+
+void GridCtrl::SetFixed(int r, int c, const Value &val)
+{
+	items[r][c + 1].val = val;
+	Refresh();
+}
+
+Value GridCtrl::GetFixed(int r, int c) const
+{
+	return items[vitems[r].id][c + fixed_cols].val;
+}
+
+Value GridCtrl::GetFixed(int c) const
+{
+	return items[0][c + fixed_cols].val;
+}
+
+Value GridCtrl::Get0(int r, int c) const
+{
+	r = vitems[r].id;
+	const Item &it = items[r][c];
+	if(it.isjoined)
+	{
+		r = it.idy;
+		c = it.idx;
+	}
+
+	Ctrl * ctrl = items[r][c].ctrl;
+
+	if(!ctrl && /*ctrls &&*/ ctrlid.y == r)
+		ctrl = edits[c].ctrl;
+
+	return ctrl ? ctrl->GetData() : items[r][c].val;
+}
+
+Value GridCtrl::Get(int r, int c) const
+{
+	return Get0(r + fixed_rows, c + fixed_cols);
+}
+
+Value GridCtrl::Get(int c) const
+{
+	return Get0(rowidx, c + fixed_cols);
+}
+
+Value GridCtrl::Get(Id id) const
+{
+	return Get0(rowidx, aliases.Get(id));
+}
+
+Value GridCtrl::Get(int r, Id id) const
+{
+	return Get0(r + fixed_rows, aliases.Get(id));
+}
+
+Value GridCtrl::Get() const
+{
+	return Get0(curpos.y, curpos.x);
+}
+
+Value GridCtrl::Get(const char * alias) const
+{
+	return Get0(rowidx, aliases.Get(alias));
+}
+
+Value GridCtrl::Get(int r, const char * alias) const
+{
+	return Get0(r + fixed_rows, aliases.Get(alias));
+}
+
+Value GridCtrl::GetFirst(int c) const
+{
+	return Get0(fixed_rows, c + fixed_cols);
+}
+
+Value GridCtrl::GetLast(int c) const
+{
+	return Get0(total_rows - 1, c + fixed_cols);
+}
+
+Value GridCtrl::GetNew(int c) const
+{
+	return Get0(rowidx, c + fixed_cols);
+}
+
+Value& GridCtrl::operator() (int r, int c)
+{
+	return items[vitems[r + fixed_rows].id][c + fixed_cols].val;
+}
+
+Value& GridCtrl::operator() (int c)
+{
+	return items[vitems[rowidx].id][c + fixed_cols].val;
+}
+
+Value& GridCtrl::operator() (Id id)
+{
+	return items[vitems[rowidx].id][aliases.Get(id)].val;
+}
+
+Value& GridCtrl::operator() (int r, Id id)
+{
+	return items[vitems[r + fixed_rows].id][aliases.Get(id)].val;
+}
+
+Value& GridCtrl::operator() (const char * alias)
+{
+	return items[vitems[rowidx].id][aliases.Get(alias)].val;
+}
+
+Value& GridCtrl::operator() (int r, const char * alias)
+{
+	return items[vitems[r + fixed_rows].id][aliases.Get(alias)].val;
+}
+
+bool GridCtrl::IsModified(int r, int c)
+{
+	return items[vitems[r + fixed_rows].id][c + fixed_cols].modified;
+}
+
+bool GridCtrl::IsModified(int c)
+{
+	return items[vitems[rowidx].id][c + fixed_cols].modified;
+}
+
+bool GridCtrl::IsModified(int r, Id id)
+{
+	return items[vitems[r + fixed_rows].id][aliases.Get(id)].modified;
+}
+
+bool GridCtrl::IsModified(Id id)
+{
+	return items[vitems[rowidx].id][aliases.Get(id)].modified;
+}
+
+Vector<Value> GridCtrl::ReadRow(int n) const
+{
+	Vector<Value> v;
+	int idy = vitems[n < 0 ? rowidx : n].id;
+	for(int i = fixed_cols; i < total_cols; i++)
+		v.Add(items[idy][i].val);
+	return v;
+}
+
+GridCtrl& GridCtrl::Add(const Vector<Value> &v, int offset, int count)
+{
+	Append0(1, GD_ROW_HEIGHT);
+
+	int cnt = min(count < 0 ? v.GetCount() : count,
+	              total_cols - fixed_cols);
+
+	int r0 = total_rows - 1;
+	int r = vitems[r0].id;
+	for(int i = offset; i < cnt; i++)
+		items[r][i + fixed_cols].val = v[i];
+
+	RefreshRow(r0, 0, 0);
+
+	return *this;
+}
+
+bool GridCtrl::IsColumn(const Id& id)
+{
+	return valid_cursor ? hitems[curpos.x].id == aliases.Get(id) : false;
+}
+
+GridCtrl::ItemRect& GridCtrl::GetColumn(int n)
+{
+	return hitems[GetIdCol(n + fixed_cols)];
+}
+
+GridCtrl::ItemRect& GridCtrl::GetColumn()
+{
+	return hitems[curpos.x];
+}
+
+GridCtrl::ItemRect& GridCtrl::GetRow(int n)
+{
+	return vitems[n + fixed_rows];
+}
+
+GridCtrl::ItemRect& GridCtrl::GetRow()
+{
+	return vitems[rowidx];
+}
+
+int GridCtrl::GetCurrentRow() const
+{
+	return rowidx - fixed_rows;
+}
+
+bool GridCtrl::IsCurrentRow() const
+{
+	return rowidx == curpos.y;
+}
+
+void GridCtrl::RestoreCurrentRow()
+{
+	rowidx = curpos.y;
+}
+
+GridCtrl::Item& GridCtrl::GetCell(int n, int m)
+{
+	return items[vitems[n + fixed_rows].id][hitems[m + fixed_cols].id];
+}
+
+GridCtrl::Item& GridCtrl::GetCell(int n, Id id)
+{
+	return items[vitems[n + fixed_rows].id][hitems[aliases.Get(id)].id];
+}
+
+int GridCtrl::GetMouseCol(Point &p, bool relative, bool fixed, bool full)
+{
+	if(!full && p.x < fixed_width)
+	{
+		LG("%d %d", fixed_width, p.x);
+		return -1;
+	}
+
+	int dx = 0;
+
+	if(relative)
+		dx += sbx;
+
+	int first_col = fixed ? 0 : max(firstVisCol, fixed_cols);
+	int last_col = max(lastVisCol, fixed_cols - 1);
+
+	for(int i = first_col; i <= last_col; i++)
+	{
+		if(p.x >= hitems[i].nLeft(dx) &&
+		   p.x  < hitems[i].nRight(dx))
+			return i;
+	}
+	return -1;
+}
+
+int GridCtrl::GetMouseRow(Point &p, bool relative, bool fixed, bool full)
+{
+	if(!full && p.y < fixed_height)
+		return -1;
+
+	int dy = 0;
+
+	if(relative)
+		dy += sby;
+
+	int first_row = fixed ? 0 : max(firstVisRow, fixed_rows);
+	int last_row = max(lastVisRow, fixed_rows - 1);
+
+	for(int i = first_row; i <= last_row; i++)
+	{
+		if(p.y >= vitems[i].nTop(dy) &&
+		   p.y  < vitems[i].nBottom(dy))
+			return i;
+	}
+	return -1;
+}
+
+void GridCtrl::MouseAccel(const Point &p, bool horz, bool vert, dword keyflags)
+{
+	Size sz = GetSize();
+	int speedx = 0, speedy = 0;
+	const int bound = 5;
+
+	if(horz)
+	{
+		if(p.x > sz.cx - bound)
+			speedx = p.x - (sz.cx - bound);
+		else if(p.x < fixed_width + bound)
+			speedx = -(bound - p.x + fixed_width);
+	}
+
+	if(vert)
+	{
+		if(p.y > sz.cy - bound)
+			speedy = p.y - (sz.cy - bound);
+		else if(p.y < fixed_height + bound)
+			speedy = -(bound - p.y + fixed_height);
+	}
+
+	if(speedx) sbx.Set(sbx + speedx);
+	if(speedy) sby.Set(sby + speedy);
+
+	if(speedx || speedy)
+	{
+		LG("speedx %d, speedy %d", speedx, speedy);
+		MouseMove(p, keyflags);
+	}
+
+}
+
+Image GridCtrl::CursorImage(Point p, dword keyflags)
+{
+	if(!moving_header && !moving_body && HasCapture())
+	{
+		if(resizing_cols && curSplitCol >= 0)
+			return GridImg::HorzPos();
+		if(resizing_rows && curSplitRow >= 0)
+			return GridImg::VertPos();
+		else
+			return Image::Arrow();
+	}
+
+	if(moving_header)
+	{
+		curSplitCol = GetSplitCol(p, -1);
+		curSplitRow = GetSplitRow(p, -1);
+
+		if(resize_col_mode == 0 || resize_row_mode == 0)
+			MouseAccel(p, fixed_top_click, fixed_left_click, keyflags);
+
+		return Image::Arrow();
+	}
+	else if(moving_body)
+	{
+		curSplitRow = GetSplitRow(Point(0, p.y), -1);
+		return Image::Arrow();
+	}
+	else if(mouse_move)
+	{
+		curSplitCol = GetSplitCol(p);
+		curSplitRow = GetSplitRow(p);
+		mouse_move = false;
+	}
+
+	curResizeCol = curResizeRow = false;
+
+	if(resizing_cols && curSplitCol >= 0 || resizeCol)
+	{
+		if(hitems[curSplitCol].join > 0)
+		{
+			int idy = GetMouseRow(p, true, p.y < fixed_height, true);
+			if(idy >= 0)
+			{
+				Item &it = items[vitems[idy].id][hitems[curSplitCol].id];
+				if(it.isjoined && it.idx + it.cx != curSplitCol)
+					return Image::Arrow();
+			}
+		}
+		curResizeCol = true;
+		return GridImg::HorzPos();
+	}
+	else if(resizing_rows && curSplitRow >= 0 || resizeRow)
+	{
+		if(vitems[curSplitRow].join > 0)
+		{
+			int idx = GetMouseCol(p, true, p.x < fixed_width, true);
+			if(idx >= 0)
+			{
+				Item &it = items[vitems[curSplitRow].id][hitems[idx].id];
+				if(it.isjoined && it.idy + it.cy != curSplitRow)
+					return Image::Arrow();
+			}
+		}
+		curResizeRow = true;
+		return GridImg::VertPos();
+	}
+	return Image::Arrow();
+}
+
+
+void GridCtrl::UpdateHolder(bool force)
+{
+	if(fixed_size_changed || force)
+	{
+		holder.SetOffset(Point(fixed_width, fixed_height));
+		holder.HSizePos(fixed_width, 0).VSizePos(fixed_height, 0);
+		fixed_size_changed = false;
+	}
+}
+
+GridCtrl::CurState GridCtrl::SetCursor0(int x, int y, bool mouse, bool highlight, int dirx, int diry, bool ctrlmode)
+{
+	return SetCursor0(Point(x, y), mouse, highlight, dirx, diry, ctrlmode);
+}
+
+GridCtrl::CurState GridCtrl::SetCursor0(Point p, bool mouse, bool highlight, int dirx, int diry, bool ctrlmode)
+{
+	CurState cs;
+	if(!row_changing)
+		return cs;
+
+	WhenCursor();
+	if(cancel_cursor)
+	{
+		cancel_cursor = false;
+		return cs;
+	}
+
+	Point tmpcur;
+
+	bool mouse_valid = true;
+
+	if(mouse)
+	{
+		tmpcur.x = GetMouseCol(p, true, false);
+		tmpcur.y = GetMouseRow(p, true, false);
+		if(tmpcur.x < 0 || tmpcur.y < 0)
+			mouse_valid = false;
+	}
+	else
+		tmpcur = p;
+
+	Point oldcur = highlight ? livecur : curpos;
+
+	bool oldvalid = IsValidCursorAll(oldcur);
+	bool newvalid = false;
+	Item *nit = NULL;
+
+	if(!highlight && mouse_valid)
+	{
+		bool quit = false;
+
+		int fc = max(fixed_cols, firstVisCol);
+		int lc = lastVisCol;
+		int fr = max(fixed_rows, firstVisRow);
+		int lr = lastVisRow;
+
+		Item *oit = oldvalid ? &GetItem(oldcur) : NULL;
+
+		bool diry_change = false;
+
+		while(true)
+		{
+			bool cur = IsValidCursor(tmpcur, fc, lc, fr, lr);
+
+			bool hidden = true;
+			bool clickable = true;
+			bool editable = true;
+			bool group = true;
+
+			if(cur)
+			{
+				ItemRect& h = hitems[tmpcur.x];
+				ItemRect& v = vitems[tmpcur.y];
+				bool hx   = dirx != 0 ? h.hidden : false;
+				bool hy   = diry != 0 ? v.hidden : false;
+				hidden    = hx || hy;
+				clickable = h.clickable && v.clickable;
+				editable  = h.editable  && v.editable;
+				if(oit && oit->group >= 0 && !select_row)
+				{
+					nit = &GetItem(tmpcur);
+					group = nit->group != oit->group;
+				}
+			}
+
+			newvalid = cur && !hidden && clickable && group;
+
+			if(newvalid)
+			{
+				int idx = hitems[tmpcur.x].id;
+				int idy = vitems[tmpcur.y].id;
+
+				Item &it = items[idy][idx];
+
+				newvalid = it.clickable;
+
+				if(newvalid && ctrlmode)
+				{
+					Ctrl * ctrl = it.ctrl;
+					if(!ctrl && ctrls)
+						ctrl = edits[idx].ctrl;
+
+					if(ctrl && it.editable && ctrl->IsEnabled())
+						break;
+				}
+			}
+
+			if(newvalid && !ctrlmode)
+				break;
+
+			if(quit || (dirx == 0 && diry == 0))
+				return cs;
+
+			if(dirx != 0)
+			{
+				tmpcur.x += dirx;
+
+				if(tmpcur.x > lc)
+				{
+					if(tab_changes_row && diry == 0)
+					{
+						tmpcur.y += 1;
+						if(tmpcur.y > lr)
+						{
+							tmpcur.y = lr;
+							tmpcur.x = lc;
+							quit = true;
+						}
+						else
+							tmpcur.x = fc;
+					}
+					else
+						quit = true;
+				}
+				else if(tmpcur.x < fc)
+				{
+					if(tab_changes_row && diry == 0)
+					{
+						tmpcur.y -= 1;
+						if(tmpcur.y < fr)
+						{
+							tmpcur.y = fr;
+							tmpcur.x = fc;
+							quit = true;
+						}
+						else
+							tmpcur.x = lc;
+					}
+					else
+						quit = true;
+				}
+				continue;
+			}
+
+			if(diry != 0)
+			{
+				tmpcur.y += diry;
+
+				if(tmpcur.y < fr)
+				{
+					tmpcur.y = fr;
+					quit = true;
+				}
+				else if(tmpcur.y > lr)
+				{
+					tmpcur.y = lr;
+					quit = true;
+				}
+			}
+		}
+	}
+	else
+	{
+		newvalid = IsValidCursor(tmpcur);
+		if(newvalid && highlight)
+		{
+			if(!vitems[tmpcur.y].clickable || !hitems[tmpcur.x].clickable)
+				newvalid = false;
+		}
+	}
+
+	bool isnewcol = oldcur.x != tmpcur.x;
+	bool isnewrow = oldcur.y != tmpcur.y;
+
+	if(isnewcol || isnewrow)
+		this->oldcur = oldcur;
+
+	cs.valid = newvalid;
+
+	if(!highlight)
+	{
+		if(!GetCtrlsData(!isnewrow))
+		{
+			cs.accepted = false;
+			return cs;
+		}
+		else
+			cs.accepted = true;
+
+		oldvalid = IsValidCursorAll(oldcur);
+	}
+
+	if(tmpcur == oldcur)
+		return cs;
+
+	if(highlight)
+	{
+		livecur = tmpcur;
+
+		if(oldvalid)
+		{
+			SetItemCursor(oldcur, false, true);
+			RefreshRow(oldcur.y, 0);
+		}
+		if(newvalid)
+		{
+			SetItemCursor(tmpcur, true, true);
+			RefreshRow(tmpcur.y, 0);
+		}
+		return cs;
+	}
+
+	if(!newvalid)
+		return cs;
+
+	cs.newx = isnewcol;
+	cs.newy = isnewrow;
+
+	if(oldvalid)
+	{
+		SetItemCursor(oldcur, false, highlight);
+		RefreshRow(oldcur.y, 0);
+	}
+
+	SetItemCursor(tmpcur, true, false);
+	if(isnewrow || (!select_row && isnewcol))
+		RefreshRow(tmpcur.y, 0);
+
+	valid_cursor = true;
+
+	curpos = tmpcur;
+	colidx = curpos.x;
+	rowidx = curpos.y;
+
+	curid.x = hitems[curpos.x].id;
+	curid.y = vitems[curpos.y].id;
+
+	if(call_whenchangerow && isnewrow)
+	{
+		#ifdef LOG_CALLBACKS
+		LGR(2, "WhenChangeRow()");
+		LGR(2, Format("[row: %d]", rowidx));
+		#endif
+		WhenChangeRow();
+	}
+
+	if(call_whenchangecol && isnewcol)
+	{
+		#ifdef LOG_CALLBACKS
+		LGR(2, "WhenChangeCol()");
+		LGR(2, Format("[col: %d]",colidx));
+		#endif
+		WhenChangeCol();
+	}
+
+	if(isnewrow)
+		SetCtrlsData();
+
+	LG("cur(%d, %d)", curpos.x, curpos.y);
+
+	return cs;
+}
+
+int GridCtrl::GetWidth(int n)
+{
+	if(n < 0) n = total_cols;
+	if(n == 0) return 0;
+	return hitems[n - 1].nRight();
+}
+
+int GridCtrl::GetHeight(int n)
+{
+	if(n < 0) n = total_rows;
+	if(n == 0) return 0;
+	return vitems[n - 1].nBottom();
+}
+
+int GridCtrl::GetFixedWidth()
+{
+	return GetWidth(fixed_cols);
+}
+
+int GridCtrl::GetFixedHeight()
+{
+	return GetHeight(fixed_rows);
+}
+
+int GridCtrl::GetFirst0(Vector<ItemRect> &its, int total, int sb, int p)
+{
+	int l = 0;
+	int r = total - 1;
+
+	while(l <= r)
+	{
+		int i = (l + r) / 2;
+
+		int p0 = its[i].nLeft(sb);
+		int p1 = its[i].nRight(sb);
+
+		if(p0 <= p && p1 >= p)
+		{
+			if(!its[i].hidden)
+			{
+				LG("!");
+				return i;
+			}
+			else
+			{
+				for(int j = i + 1; j < total; j++)
+					if(!its[j].hidden)
+						return j;
+				for(int j = i - 1; j > 0; j--)
+					if(!its[j].hidden)
+						return j;
+
+				return -1;
+			}
+		}
+
+		if(p1 < p)
+			l = i + 1;
+		else
+			r = i - 1;
+	}
+	return -1;
+}
+
+int GridCtrl::GetFirstVisCol(int p)
+{
+	return total_cols <= 2 ? fixed_cols : GetFirst0(hitems, total_cols, sbx, p);
+}
+
+int GridCtrl::GetFirstVisRow(int p)
+{
+	return total_rows <= 1 ? fixed_rows : GetFirst0(vitems, total_rows, sby, p);
+}
+
+GridCtrl& GridCtrl::SetColWidth(int n, int width, bool recalc /* = true */)
+{
+	if(resize_col_mode > 0 && n >= fixed_cols)
+		return *this;
+
+	hitems[n].Width(width);
+	Repaint(true, false);
+
+	return *this;
+}
+
+GridCtrl& GridCtrl::SetRowHeight(int n, int height, bool recalc)
+{
+	LG("SetRowHeight %d %d", n, height);
+
+	if(resize_row_mode > 0 && n >= fixed_rows)
+		return *this;
+
+	vitems[n].Height(height);
+	Repaint(false, true);
+
+	return *this;
+}
+
+bool GridCtrl::SetDiffItemSize(bool horizontal, RectItems &its, int n, int diff, bool newsize)
+{
+	if(diff == 0)
+		return false;
+
+	if(diff < 0 && its[n].IsMin())
+		return false;
+
+	if(diff > 0 && its[n].IsMax())
+		return false;
+
+	int resize_mode = horizontal ? resize_col_mode : resize_row_mode;
+
+	if(resize_mode > 0 && diff > 0)
+	{
+		bool ismin = true;
+		for(int i = n + 1; i < (horizontal ? total_cols : total_rows); i++)
+			if(!its[i].IsMin())
+			{
+				ismin = false;
+				break;
+			}
+		if(ismin)
+			return false;
+	}
+
+	double size = its[n].size + diff;
+
+	if(size <= its[n].min)
+	{
+		size = its[n].min;
+		its[n].ismin = true;
+	}
+	else if(size >= its[n].max)
+	{
+		size = its[n].max;
+		its[n].ismax = true;
+	}
+	else
+	{
+		its[n].ismin = false;
+		its[n].ismax = false;
+	}
+
+	double ddiff = size - its[n].size;
+
+	if(ddiff != 0)
+	{
+		Recalc(horizontal, its, n, size, ddiff);
+		return true;
+	}
+	return false;
+}
+
+void GridCtrl::Recalc(bool horizontal, RectItems &its, int n, double size, double diff)
+{
+	its[n].size = size;
+
+	Size sz = GetSize();
+	int cnt = horizontal ? total_cols : total_rows;
+	int maxsize = horizontal ? sz.cx : sz.cy;
+	int tcnt = cnt;
+
+	int resize_mode = horizontal ? resize_col_mode : resize_row_mode;
+
+	if(resize_mode == 0)
+	{
+		for(int i = n + 1; i < cnt; i++)
+			its[i].pos += diff;
+	}
+	else if(resize_mode == 1)
+	{
+		double imaxsize = 1.0 / (double) maxsize;
+		double ms = maxsize;
+
+		loop:
+			double sumprop = 0;
+
+			for(int i = cnt - 1; i >= n + 1; --i)
+			{
+				if(its[i].hidden) continue;
+
+				bool prop = (diff > 0 && its[i].IsMin() || diff < 0 && its[i].IsMax());
+				if(!prop)
+					sumprop += its[i].prop;
+			}
+
+			double cps = sumprop != 0 ? -diff / sumprop : 0;
+
+			bool isminmax = false;
+
+			for(int i = cnt - 1; i >= n + 1; --i)
+			{
+				if(its[i].hidden)
+				{
+					its[i].pos = ms;
+					continue;
+				}
+
+				if(!(diff > 0 && its[i].IsMin() || diff < 0 && its[i].IsMax()))
+				{
+					double size = its[i].size + its[i].prop * cps;
+
+					bool minsize = (diff > 0 && size < its[i].min);
+					bool maxsize = (diff < 0 && size > its[i].max);
+
+					its[i].ismin = minsize;
+					its[i].ismax = maxsize;
+
+					if(minsize || maxsize)
+					{
+						diff += size - its[i].size;
+						double ns = minsize ? its[i].min : its[i].max;
+						its[i].size = ns;
+						its[i].prop = ns * imaxsize;
+						cnt = i + 1;
+						goto loop;
+					}
+					its[i].size = size;
+					its[i].prop = size * imaxsize;
+				}
+				ms -= its[i].size;
+				its[i].pos = ms;
+			}
+
+			its[n].size -= its[n].pos + its[n].size - ms;
+			its[n].prop = its[n].size * imaxsize;
+	}
+
+	CalcIntPos(its, n, maxsize, tcnt - 1, resize_mode, false);
+}
+
+void GridCtrl::CalcIntPos(RectItems &its, int n, int maxsize, int cnt, int resize_mode, bool renumber)
+{
+	its[0].npos = 0;
+
+	int last_vis = 1;
+	int hidden = 0;
+
+	for(int i = (renumber ? 1 : max(1, n)); i <= cnt ; i++)
+	{
+		its[i].npos = Round(its[i].Left());
+		its[i - 1].nsize = its[i].npos - its[i - 1].npos;
+
+		if(renumber)
+			its[i].n = hidden;
+
+		if(its[i].hidden)
+			hidden++;
+		else
+			last_vis = i;
+	}
+
+	last_vis = cnt;
+	if(resize_mode > 0)
+	{
+		int size = maxsize - its[last_vis].npos;
+		its[last_vis].nsize = size ;//>= its[cnt].min && size <= its[cnt].max ? size : Round(its[cnt].size);
+	}
+	else
+		its[last_vis].nsize = Round(its[last_vis].size);
+}
+
+bool GridCtrl::UpdateSizes()
+{
+	total_width  = total_cols ? hitems[total_cols - 1].nRight() : 0;
+	total_height = total_rows ? vitems[total_rows - 1].nRight() : 0;
+
+	int new_fixed_width  = fixed_cols ? hitems[fixed_cols - 1].nRight() : 0;
+	int new_fixed_height = fixed_rows ? vitems[fixed_rows - 1].nRight() : 0;
+
+	Size sz = GetSize();
+
+	if(resize_col_mode > 0 && new_fixed_width >= sz.cx)
+		new_fixed_width = GridCtrl::GD_IND_WIDTH;
+
+	if(resize_row_mode > 0 && new_fixed_height >= sz.cy)
+		new_fixed_height = GridCtrl::GD_HDR_HEIGHT;
+
+	if(fixed_cols == 1 && !indicator)
+		new_fixed_width = 0;
+
+	fixed_size_changed = false;
+
+	if(new_fixed_width != fixed_width)
+	{
+		fixed_width = new_fixed_width;
+		fixed_size_changed = true;
+	}
+
+	if(new_fixed_height != fixed_height)
+	{
+		fixed_height = new_fixed_height;
+		fixed_size_changed = true;
+	}
+
+	return fixed_size_changed;
+}
+
+bool GridCtrl::UpdateCols(bool force)
+{
+	Size sz = GetSize();
+	bool change = false;;
+
+	if((osz.cx != sz.cx && resize_col_mode > 0) || force || recalc_cols)
+	{
+		LG("   RecalcCols");
+		RecalcCols(-1);
+		recalc_cols = false;
+		change = true;
+	}
+
+	osz.cx = sz.cx;
+	return change;
+}
+
+bool GridCtrl::UpdateRows(bool force)
+{
+	Size sz = GetSize();
+	bool change = false;;
+
+	if((osz.cy != sz.cy && resize_row_mode > 0) || force || recalc_rows)
+	{
+		LG("   RecalcRows");
+		RecalcRows(-1);
+		recalc_rows = false;
+		change = true;
+	}
+	osz.cy = sz.cy;
+	return change;
+}
+
+bool GridCtrl::Recalc(bool horizontal, RectItems &its, int resize_mode)
+{
+	Size sz = GetSize();
+
+	if(resize_mode < 0)
+		resize_mode = horizontal ? resize_col_mode : resize_row_mode;
+
+	int fixed = horizontal ? fixed_cols : fixed_rows;
+	int cnt = horizontal ? total_cols : total_rows;
+	int tcnt = cnt;
+
+	its[0].pos = 0;
+
+	if(!horizontal && !header)
+		its[0].size = 0;
+
+	if(resize_mode == 0)
+	{
+		for(int i = 1; i < cnt; i++)
+			its[i].pos = its[i - 1].pos + its[i - 1].size;
+	}
+	else if(resize_mode == 1)
+	{
+		int cs = horizontal ? sz.cx - fixed_width
+		                    : sz.cy - fixed_height;
+
+		//int cs = horizontal ? sz.cx : sz.cy;
+
+		if(cs <= 0)
+			return false;
+
+		double imaxsize = 1.0 / cs;
+
+		for(int i = fixed; i < cnt; i++)
+		{
+			its[i].ismin = false;
+			its[i].ismax = false;
+		}
+
+		double sumprop = 0;
+		for(int i = fixed; i < cnt; i++)
+			if(!its[i].hidden)
+				sumprop += its[i].prop;
+
+		double ics = cs / sumprop;
+		sumprop = 0;
+
+		for(int i = fixed; i < cnt; i++)
+		{
+			if(its[i].hidden)
+				continue;
+
+			its[i].size = its[i].prop * ics;
+
+			if(its[i].size < its[i].min)
+			{
+				cs -= its[i].min;
+				its[i].size = its[i].min;
+				its[i].ismin = true;
+				its[i].prop = its[i].min * imaxsize;
+			}
+			else if(its[i].size > its[i].max)
+			{
+				cs -= its[i].max;
+				its[i].size = its[i].max;
+				its[i].ismax = true;
+				its[i].prop = its[i].max * imaxsize;
+			}
+			else
+				sumprop += its[i].prop;
+		}
+
+		ics = sumprop <= 0 ? 0 : cs / sumprop;
+
+		for(int i = fixed; i < cnt; i++)
+		{
+			its[i].pos = i == 0 ? 0 : its[i - 1].Right();
+			if(its[i].hidden)
+			{
+				its[i].size = 0;
+				//its[i].prop = 0;
+				continue;
+			}
+
+			if(!its[i].ismin && !its[i].ismax)
+				its[i].size = its[i].prop * ics;
+			its[i].prop = its[i].size * imaxsize;
+		}
+	}
+
+	CalcIntPos(its, 0, horizontal ? sz.cx : sz.cy, tcnt - 1, resize_mode, true);
+
+	UpdateVisColRow(horizontal);
+	oldpos.x = sbx;
+	oldpos.y = sby;
+
+	return true;
+}
+
+bool GridCtrl::RecalcCols(int mode)
+{
+	return Recalc(true, hitems, mode);
+}
+
+bool GridCtrl::RecalcRows(int mode)
+{
+	return Recalc(false, vitems, mode);
+}
+
+int GridCtrl::GetSplitCol(const Point &p, int splitSize, bool full)
+{
+	if(total_cols < 2)
+		return -1;
+
+	int diff = 0;
+	if(p.x > fixed_width || moving_body || moving_header)
+	{
+		if(!full && !full_col_resizing && p.y >= fixed_height)
+			return -1;
+		diff = sbx;
+	}
+	else if(p.y < fixed_height - splitSize)
+		return -1;
+
+	int tc = splitSize >= 0 ? (resize_col_mode == 0 ? 0 : 1) : 0;
+
+	int fc = lastVisCol - tc;
+	int lc = resizing_fixed_cols ? 1 : firstVisCol;
+
+	if(splitSize >= 0)
+	{
+		for(int i = fc; i >= lc; i--)
+		{
+			if(hitems[i].hidden) continue;
+			int x = hitems[i].nRight(diff);
+			if(p.x >= x - splitSize &&
+			   p.x <= x + splitSize)
+				return i;
+		}
+	}
+	else
+	{
+		int c = fc;
+		for(int i = fc; i >= lc; i--)
+		{
+			if(!hitems[i].hidden) c = i;
+			int x = hitems[c].nLeft(diff) + hitems[c].nWidth() / 2;
+			if(p.x >= x)
+				return c < fixed_cols ? firstVisCol - 1 : c;
+			else if(i == lc)
+				return c - 1;
+		}
+	}
+
+	return -1;
+}
+
+int GridCtrl::GetSplitRow(const Point &p, int splitSize, bool full)
+{
+	if(total_rows < 2)
+		return -1;
+
+	int diff = 0;
+	if(p.y > fixed_height || moving_body || moving_header)
+	{
+		if(!full && !moving_header && !full_row_resizing && p.x >= fixed_width)
+			return -1;
+		diff = sby;
+	}
+	else if(p.x < fixed_width)
+		return -1;
+
+	int tr = splitSize >= 0 ? (resize_row_mode == 0 ? 0 : 1) : 0;
+
+	int fr = lastVisRow - tr;
+	int lr = p.y < fixed_height && resizing_fixed_rows ? 0 : firstVisRow;
+
+	if(splitSize >= 0)
+	{
+		for(int i = fr; i >= lr; i--)
+		{
+			if(vitems[i].hidden)
+				continue;
+			int y = vitems[i].nBottom(diff);
+			if(p.y >= y - splitSize &&
+			   p.y <= y + splitSize)
+				return i;
+		}
+	}
+	else
+	{
+		int c = fr;
+		for(int i = fr; i >= lr; i--)
+		{
+			if(!vitems[i].hidden) c = i;
+			int y = vitems[c].nTop(diff) + vitems[c].nHeight() / 2;
+			if(p.y >= y)
+				return c < fixed_rows ? firstVisRow - 1 : c;
+			else if(i == lr)
+				return c - 1;
+		}
+	}
+
+	return -1;
+}
+
+bool GridCtrl::IsValidCursor(const Point &p, int fc, int lc, int fr, int lr) const
+{
+	return p.x >= fc && p.x <= lc &&
+		   p.y >= fr && p.y <= lr;
+}
+
+bool GridCtrl::IsValidCursorVis(const Point &p) const
+{
+	return p.x >= firstVisCol && p.x <= lastVisCol &&
+	       p.y >= firstVisRow && p.y <= lastVisRow;
+}
+
+bool GridCtrl::IsValidCursorAll(const Point &p) const
+{
+	return p.x >= fixed_cols && p.x < total_cols &&
+	       p.y >= fixed_rows && p.y < total_rows;
+}
+
+bool GridCtrl::IsValidCursor(const Point &p) const
+{
+	return ready ? IsValidCursorVis(p) : IsValidCursorAll(p);
+}
+
+bool GridCtrl::IsValidCursor(int c) const
+{
+	c += fixed_rows;
+	return c >= fixed_rows && c < total_rows;
+}
+
+bool GridCtrl::IsRowEditable()
+{
+	return vitems[curpos.y].editable &&
+	       hitems[curpos.x].editable &&
+	       (select_row || (!select_row && edits[curid.x].ctrl));
+}
+
+void GridCtrl::SetItemCursor(Point p, bool b, bool highlight)
+{
+	if(highlight)
+	{
+		hitems[p.x].Live(b);
+		vitems[p.y].Live(b);
+		GetItem(p).Live(b);
+	}
+	else
+	{
+		hitems[p.x].Cursor(b);
+		vitems[p.y].Cursor(b);
+		GetItem(p).Cursor(b);
+	}
+}
+
+GridCtrl& GridCtrl::Indicator(bool b, int size)
+{
+	indicator = b;
+	fixed_width += (size + 1) * (b ? 1 : -1);
+	SetColWidth(0, b ? size : 0);
+	return *this;
+}
+
+void GridCtrl::RefreshRow(int n, bool relative, bool fixed)
+{
+	if(!ready)
+		return;
+	if(n < 0) { n = rowidx; relative = false; }
+	if(relative) n += fixed_rows;
+	if(vitems[n].hidden) return;
+	int dy = fixed ? 0 : sby;
+	int join = vitems[n].join;
+	if(join > 0)
+	{
+		int s = n;
+		while(s >= 0 && vitems[s].join > 0) s--; s++;
+		int e = n;
+		while(e < total_rows && vitems[e].join > 0) e++; e--;
+		Refresh(Rect(0, vitems[s].nTop(dy), GetSize().cx, vitems[e].nBottom(dy)));
+	}
+	else
+		Refresh(Rect(0, vitems[n].nTop(dy), GetSize().cx, vitems[n].nBottom(dy)));
+}
+
+void GridCtrl::RefreshCol(int n, bool relative, bool fixed)
+{
+	if(!ready)
+		return;
+	if(n < 0) { n = curpos.x; relative = false; }
+	if(relative) n += fixed_cols;
+	if(hitems[n].hidden) return;
+	int dx = fixed ? 0 : sbx;
+	Refresh(Rect(hitems[n].nLeft(dx), 0, hitems[n].nRight(dx), GetSize().cy));
+}
+
+void GridCtrl::RefreshRows(int from, int to, bool relative, bool fixed)
+{
+	if(!ready)
+		return;
+	if(relative)
+	{
+		from += fixed_rows;
+		to += fixed_rows;
+	}
+	Refresh(Rect(0, vitems[from].nTop(sby), GetSize().cx, vitems[to].nBottom(sby)));
+}
+
+void GridCtrl::RefreshFrom(int from)
+{
+	Size sz = GetSize();
+	int y = 0;
+	if(resize_row_mode == 0)
+		if(from > 2 && from <= total_rows)
+			y = vitems[from - 1].nBottom(sby);
+	Refresh(Rect(0, y, sz.cx, sz.cy));
+}
+
+void GridCtrl::RefreshItem(int r, int c, bool relative)
+{
+	if(!ready)
+		return;
+	if(relative)
+	{
+		c += fixed_cols;
+		r += fixed_rows;
+	}
+	Refresh(GetItemRect(r, c));
+}
+
+void GridCtrl::RefreshNewRow()
+{
+	RefreshRow(rowidx, 0);
+}
+
+void GridCtrl::RefreshTop()
+{
+	Refresh(0, 0, GetSize().cx, fixed_height);
+}
+
+void GridCtrl::RefreshLeft()
+{
+	Refresh(0, fixed_height, fixed_width, GetSize().cy - fixed_height);
+}
+
+bool GridCtrl::IsMouseBody(Point &p)
+{
+	return p.x >= fixed_width && p.x < total_width && p.y >= fixed_height && p.y < total_height;
+}
+
+int GridCtrl::GetIdCol(int id, bool checkall) const
+{
+	for(int i = checkall ? 1 : fixed_cols; i < total_cols; i++)
+	{
+		if(id == hitems[i].id)
+			return i;
+	}
+	return -1;
+}
+
+int GridCtrl::GetIdRow(int id, bool checkall) const
+{
+	for(int i = checkall ? 0 : fixed_rows; i < total_rows; i++)
+	{
+		if(id == vitems[i].id)
+			return i;
+	}
+	return -1;
+}
+
+int GridCtrl::GetNextRow(int n)
+{
+	n += fixed_rows;
+	for(int i = n + 1; i < total_rows; i++)
+		if(!vitems[i].hidden)
+			return i - fixed_rows;
+	return -1;
+}
+
+int GridCtrl::GetPrevRow(int n)
+{
+	n += fixed_rows;
+	for(int i = n - 1; i >= fixed_rows; i--)
+		if(!vitems[i].hidden)
+			return i - fixed_rows;
+	return -1;
+}
+
+void GridCtrl::UpdateCursor()
+{
+	curpos.x = GetIdCol(curid.x);
+	curpos.y = GetIdRow(curid.y);
+	rowidx = curpos.y;
+	shiftpos = curpos;
+	ctrlid.y = curpos.y < 0 ? -1 : curid.y;
+	ctrlpos.y = curpos.y;
+	rowfnd = curpos.y;
+}
+
+int GridCtrl::Find(const Value &v, int col, int start_from, int opt) const
+{
+	for(int i = fixed_rows + start_from; i < total_rows; i++)
+	{
+		if(opt & GF::SKIP_CURRENT_ROW && i == rowidx)
+			continue;
+		if(opt & GF::SKIP_HIDDEN && vitems[i].hidden)
+			continue;
+		if(!vitems[i].skip && items[vitems[i].id][col + fixed_cols].val == v)
+			return i - fixed_rows;
+	}
+	return -1;
+}
+
+int GridCtrl::Find(const Value &v, Id id, int opt) const
+{
+	return Find(v, aliases.Get(id) - fixed_cols, 0, opt);
+}
+
+int GridCtrl::FindInRow(const Value& v, int row, int start_from) const
+{
+	for(int i = fixed_cols + start_from; i < total_cols; i++)
+	{
+		if(!hitems[i].skip && items[row + fixed_rows][hitems[i].id].val == v)
+			return i - fixed_cols;
+	}
+	return -1;
+}
+
+int GridCtrl::FindCurrent(Id id, int opt) const
+{
+	int col = aliases.Get(id) - fixed_cols;
+	return Find(Get(col), col, 0, opt);
+}
+
+int GridCtrl::Find(const Value &v0, Id id0, const Value&v1, Id id1, int opt) const
+{
+	int col0 = aliases.Get(id0);
+	int col1 = aliases.Get(id1);
+
+	for(int i = fixed_rows; i < total_rows; i++)
+	{
+		if(opt & GF::SKIP_CURRENT_ROW && i == rowidx)
+			continue;
+		if(opt & GF::SKIP_HIDDEN && vitems[i].hidden)
+			continue;
+		if(!vitems[i].skip &&
+		   items[vitems[i].id][col0].val == v0 &&
+		   items[vitems[i].id][col1].val == v1)
+			return i - fixed_rows;
+	}
+	return -1;
+}
+
+int GridCtrl::FindCurrent(Id id0, Id id1, int opt) const
+{
+	int col0 = aliases.Get(id0);
+	int col1 = aliases.Get(id1);
+
+	const Value& val0 = items[vitems[rowidx].id][col0].val;
+	const Value& val1 = items[vitems[rowidx].id][col1].val;
+
+	return Find(val0, id0, val1, id1, opt);
+}
+
+void GridCtrl::UpdateDefaults(int ri)
+{
+	for(int i = 1; i < total_cols; i++)
+		if(!IsNull(hitems[i].defval))
+			items[ri][hitems[i].id].val = hitems[i].defval;
+}
+
+void GridCtrl::SetCtrlsData()
+{
+	if(!valid_cursor)
+		return;
+
+	for(int i = 1; i < total_cols; i++)
+	{
+		int idx = hitems[i].id;
+		Item &it = items[curid.y][idx];
+		Ctrl * ctrl = it.ctrl;
+		if(!ctrl)
+			ctrl = edits[idx].ctrl;
+		if(ctrl)
+		{
+			ctrl->SetData(it.val);
+			rowbkp[idx] = it.val;
+		}
+	}
+}
+
+bool GridCtrl::GetCtrlsData(bool samerow, bool doall, bool updates)
+{
+	if(!valid_cursor || !HasCtrls())
+		return true;
+
+	bool newrow = newrow_inserted || newrow_appended;
+
+	if(focused_ctrl)
+	{
+		Item &it = items[curid.y][focused_ctrl_id];
+
+		if(updates && edit_mode == GE_CELL && !focused_ctrl->Accept())
+			return false;
+
+		Value v = focused_ctrl->GetData();
+
+		bool was_modified = it.modified;
+
+		it.modified = edit_mode == GE_CELL ? it.val != v : rowbkp[focused_ctrl_id] != v;
+
+		if(it.modified)
+		{
+			if(!was_modified)
+				row_modified++;
+
+			it.val = v;
+
+			if(updates)
+			{
+				#ifdef LOG_CALLBACKS
+				LGR(2, "WhenUpdateCell()");
+				LGR(2, Format("[row: %d, colid: %d]", curid.y, focused_ctrl_id));
+				LGR(2, Format("[oldval : %s]", AsString(rowbkp[focused_ctrl_id])));
+				LGR(2, Format("[newval : %s]", AsString(v)));
+				#endif
+				WhenUpdateCell();
+
+				if(cancel_update_cell)
+				{
+					it.val = rowbkp[focused_ctrl_id];
+					it.modified = false;
+					if(edit_mode == GE_CELL)
+						rowbkp[focused_ctrl_id] = it.val;
+					cancel_update_cell = false;
+					row_modified--;
+				}
+			}
+		}
+	}
+
+	if(!updates)
+		return false;
+
+	if(!samerow || doall)
+	{
+		if(edit_mode == GE_ROW)
+		{
+			for(int i = fixed_cols; i < total_cols; ++i)
+			{
+				int idx = hitems[i].id;
+				Ctrl * ctrl = GetCtrl(rowidx, i, true, false);
+				if(ctrl && !ctrl->Accept())
+				{
+					focused_ctrl = ctrl;
+					focused_ctrl_id = idx;
+					ctrl->SetFocus();
+					curpos.x = i;
+					return false;
+				}
+			}
+		}
+
+		WhenAcceptRow();
+		if(cancel_accept)
+		{
+			cancel_accept = false;
+			return false;
+		}
+
+		bool removed = false;
+		if(newrow)
+		{
+			#ifdef LOG_CALLBACKS
+			LGR(2, Format("WhenInsertRow()", curid.y));
+			LGR(2, Format("[row: %d]", curid.y));
+			#endif
+			removed = !WhenInsertRow0();
+
+		}
+		else if(row_modified)
+		{
+			vitems[curid.y].operation = GridOperation::UPDATE;
+			row_data = true;
+			SetModify();
+
+			#ifdef LOG_CALLBACKS
+			LGR(2, Format("WhenUpdateRow()", curid.y));
+			LGR(2, Format("[row: %d]", curid.y));
+			#endif
+			WhenUpdateRow();
+		}
+
+		if(!removed)
+		{
+			if(!cancel_accept && row_modified)
+			{
+				WhenAcceptedRow();
+				/*
+				if(auto_sorting)
+				{
+					GSort();
+					UpdateCursor();
+					Repaint(false, true);
+				}
+				*/
+			}
+
+			if(cancel_accept)
+			{
+				cancel_accept = false;
+				return false;
+			}
+
+			if(cancel_update)
+				CancelCtrlsData(true);
+			else
+				ClearModified();
+		}
+	}
+
+	if(newrow && (!samerow || doall))
+	{
+		newrow_inserted = false;
+		newrow_appended = false;
+	}
+
+	return true;
+}
+
+bool GridCtrl::CancelCtrlsData(bool all)
+{
+	cancel_update = false;
+
+	if(!row_modified)
+		return false;
+
+	int ie = total_cols;
+	int is = 1;
+
+	if(!cancel_all && edit_mode == GE_CELL && !all)
+	{
+		is = curpos.x;
+		ie = is + 1;
+	}
+
+	vitems[curid.y].operation = GridOperation::NONE;
+
+	for(int i = is; i < ie; i++)
+	{
+		int id = hitems[i].id;
+		Item &it = items[curid.y][id];
+
+		Ctrl * ctrl = it.ctrl;
+		if(!ctrl)
+			ctrl = edits[id].ctrl;
+		if(ctrl)
+		{
+			ctrl->Reject();
+			if(it.modified)
+			{
+				it.modified = false;
+				row_modified--;
+				ctrl->SetData(rowbkp[id]); // dla ctrls
+				it.val = rowbkp[id];
+			}
+		}
+	}
+	return true;
+}
+
+void GridCtrl::UpdateCtrls(int opt /*= UC_CHECK_VIS | UC_SHOW | UC_CURSOR | UC_FOCUS*/)
+{
+	if(!valid_cursor)
+		return;
+
+	if((opt & UC_CHECK_VIS) && !ctrls)
+		return;
+
+	Point cp(opt & UC_OLDCUR ? oldcur : curpos);
+
+	bool show = opt & UC_SHOW;
+
+	ctrlid.y  = show ? (cp.y < 0 ? -1 : vitems[cp.y].id) : -1;
+	ctrlpos.y = show ? cp.y : -1;
+
+	if(cp.y < 0)
+		return;
+
+	Size sz = GetSize();
+
+	bool isctrl = false;
+
+	Ctrl * first_ctrl = NULL;
+	focused_ctrl = NULL;
+	focused_ctrl_id = -1;
+	focused_col = -1;
+
+	bool gofirst = opt & UC_GOFIRST && select_row && !ctrls && !draw_focus;
+	if(opt & UC_MOUSE)
+		 gofirst = gofirst && !GetCtrl(cp, false, false);
+
+	for(int i = 1; i < total_cols; i++)
+	{
+		if(hitems[i].hidden)
+			continue;
+
+		Ctrl * ctrl = GetCtrl(cp.y, i, show == false);
+
+		if(!ctrl)
+			continue;
+
+		int id = hitems[i].id;
+
+		if(!first_ctrl)
+			first_ctrl = ctrl;
+
+		bool dorect = false;
+		bool dofocus = false;
+
+		bool factory = edits[id].factory;
+
+		if(show)
+		{
+			bool dorf = gofirst ? ctrl == first_ctrl : i == curpos.x;
+			dofocus = dorf;
+			dorect = edit_mode == GE_CELL ? dorf : (ctrls || opt & UC_CTRLS);
+			dorect = dorect && GetItem(cp.y, i).editable;
+		}
+		if(dorect)
+		{
+			Rect r = GetItemRect(ctrlpos.y, i, horz_grid, vert_grid, true);
+
+			if(!r.Intersects(sz))
+				r.Set(0, 0, 0, 0);
+
+			if(!factory)
+			{
+				ctrl->SetRect(AlignRect(r, i));
+				ctrl->Show();
+				isctrl = true;
+			}
+
+		}
+		else if(!factory)
+		{
+			ctrl->SetRect(0, 0, 0, 0);
+			ctrl->Hide();
+		}
+
+		if(dofocus)
+		{
+			LG(2, "Focus on %d", i);
+			ctrl->SetFocus();
+			focused_ctrl = ctrl;
+			focused_ctrl_id = id;
+			focused_ctrl_val = hitems[i].defval;
+			focused_col = i;
+
+			if(opt & UC_CURSOR)
+				SetCursor0(i, cp.y);
+		}
+	}
+
+	edit_ctrls = isctrl;
+
+	if(!show && ctrls)
+		SetFocus();
+
+	if(opt & UC_CTRLS)
+		ctrls = isctrl;
+
+	if(opt & UC_CTRLS_OFF && !isctrl)
+		ctrls = false;
+
+	//if(opt & UC_FOCUS)
+	//	SetFocus();
+
+	if(!(opt & UC_SCROLL))
+		RebuildToolBar();
+}
+
+void GridCtrl::SyncCtrls(int row)
+{
+	//if(!ready)
+	//	return;
+
+	Size sz = GetSize();
+	genr_ctrls = false;
+
+	Vector<int> cols;
+
+	for(int i = 1; i < total_cols; i++)
+		if(edits[hitems[i].id].factory && hitems[i].editable)
+			cols.Add(i);
+
+	if(cols.IsEmpty())
+		return;
+
+	int dy = sby + fixed_height;
+	int dx = sbx + fixed_width;
+	Rect r;
+
+	int js = row < 0 ? 0 : row;
+	int je = row < 0 ? total_rows : row + 1;
+
+	for(int j = js; j < je; j++)
+	{
+		int idy = vitems[j].id;
+		bool fixed = j < fixed_rows;
+		bool create = !fixed && vitems[j].editable;
+
+		for(int i = 0; i < cols.GetCount(); i++)
+		{
+			int c = cols[i];
+			int idx = hitems[c].id;
+			int oid = idx;
+
+			Item *it = &items[idy][idx];
+
+			if(it->isjoined)
+			{
+				it = &items[it->idy][it->idx];
+				idx = it->idx;
+			}
+
+			if(!it->ctrl && create && it->editable && edits[idx].factory && !edits[idx].nofactory)
+			{
+				One<Ctrl> newctrl;
+				edits[idx].factory(newctrl);
+				newctrl->SetData(it->val);
+				newctrl->WhenAction << Proxy(WhenCtrlsAction);
+				it->ctrl = newctrl.Detach();
+				holder.AddChild(it->ctrl);
+			}
+
+			if(it->ctrl)
+			{
+				if(it->isjoined && it->sync_flag == sync_flag)
+					continue;
+
+				r = GetItemRect(j, c, horz_grid, vert_grid, true);
+				AlignRect(r, c);
+
+				if(r.Intersects(sz) && !fixed && !vitems[j].hidden && !hitems[c].hidden)
+				{
+					it->ctrl->SetRect(r);
+					it->ctrl->Show();
+				}
+				else if(it->ctrl->IsShown())
+				{
+					it->ctrl->SetRect(0, 0, 0, 0);
+					it->ctrl->Hide();
+				}
+
+				genr_ctrls = true;
+			}
+
+			if(it->isjoined)
+				it->sync_flag = sync_flag;
+
+		}
+	}
+	sync_flag = 1 - sync_flag;
+}
+
+bool GridCtrl::HasCtrls()
+{
+	return edit_ctrls || genr_ctrls;
+}
+
+void GridCtrl::SetCtrlFocus(int col)
+{
+	//SetCursor0(rowidx, col);
+	oldcur.x = curpos.x;
+	Ctrl * ctrl = GetCtrl(col + fixed_cols, rowidx, false, false);
+	focused_ctrl = ctrl;
+	focused_ctrl_id = hitems[col + fixed_cols].id;
+	ctrl->SetFocus();
+	curpos.x = col + fixed_cols;
+
+//	oldcur.x = curpos.x;
+//	curpos.x = col + fixed_cols;
+//	if(ctrls)
+//		UpdateCtrls(UC_CHECK_VIS | UC_SHOW | UC_FOCUS);
+}
+
+void GridCtrl::SetCtrlFocus(Id id)
+{
+	SetCtrlFocus(aliases.Get(id));
+}
+
+bool GridCtrl::Accept()
+{
+	if(!EndEdit())
+		return false;
+	return Ctrl::Accept();
+}
+
+void GridCtrl::Reject()
+{
+	CancelEdit();
+	Ctrl::Reject();
+}
+
+void GridCtrl::RestoreFocus()
+{
+	if(focused_ctrl)
+		focused_ctrl->SetFocus();
+}
+
+bool GridCtrl::ShowNextCtrl()
+{
+	if(GoRight(1, 1))
+	{
+		UpdateCtrls(UC_CHECK_VIS | UC_SHOW | UC_FOCUS);
+		return true;
+	}
+	return false;
+}
+
+bool GridCtrl::ShowPrevCtrl()
+{
+	if(GoLeft(1, 1))
+	{
+		UpdateCtrls(UC_CHECK_VIS | UC_SHOW | UC_FOCUS);
+		return true;
+	}
+	return false;
+}
+
+int GridCtrl::GetFocusedCtrlIndex()
+{
+	for(int i = 1; i < total_cols; i++)
+	{
+		int id = hitems[i].id;
+
+		Ctrl * ctrl = items[0][id].ctrl;
+		if(ctrl && ctrl->HasFocusDeep())
+			return i;
+	}
+	return -1;
+}
+
+Point GridCtrl::GetCtrlPos(Ctrl * ctrl)
+{
+	for(int i = fixed_rows; i < total_rows; i++)
+	{
+		int idy = vitems[i].id;
+		for(int j = fixed_cols; j < total_cols; j++)
+		{
+			int idx = hitems[j].id;
+			Ctrl * ci = items[idy][idx].ctrl;
+			bool isedit = false;
+			if(!ci)
+			{
+				ci = edits[idx].ctrl;
+				isedit = true;
+			}
+			if(ci == ctrl || ci->HasChildDeep(ctrl))
+				return Point(j, isedit ? ctrlpos.y : i);
+		}
+	}
+	return Point(-1, -1);
+}
+
+void GridCtrl::Split(int state, bool sync)
+{
+	if(resize_paint_mode < 2)
+	{
+		if(resize_paint_mode > 0 && state != GS_DOWN)
+		{
+			if(resizeCol) RefreshTop();
+			if(resizeRow) RefreshLeft();
+		}
+
+		if(state == GS_DOWN)
+			DrawLine(true, false);
+		else if(state == GS_MOVE)
+			DrawLine(true, true);
+		else
+			DrawLine(false, true);
+	}
+
+	if(state == GS_DOWN)
+	{
+		firstCol = firstRow = -1;
+		return;
+	}
+
+	if(state != GS_DOWN && (resize_paint_mode == 2 || state == GS_UP))
+	{
+		UpdateSizes();
+		UpdateHolder();
+		UpdateSb();
+		Refresh();
+	}
+
+	if((resize_paint_mode > 1 && state > GS_UP) || state == GS_UP)
+	{
+		SyncCtrls();
+		UpdateCtrls(UC_CHECK_VIS | UC_SHOW | (UC_FOCUS * int(state == GS_UP)));
+	}
+
+	if(sync)
+		Sync();
+}
+
+bool GridCtrl::TabKey(bool enter_mode)
+{
+	bool has_ctrls = HasCtrls();
+
+	if(has_ctrls)
+	{
+		bool isnext = ShowNextCtrl();
+		if(tab_adds_row && !isnext && curpos.y == lastVisRow)
+		{
+			DoAppend();
+			return true;
+		}
+		else
+			return focused_ctrl ? true : isnext;
+	}
+
+	if(tab_changes_row && ((enter_mode && has_ctrls) || (!enter_mode && !has_ctrls)))
+	{
+		bool isnext = false;
+		if(select_row)
+		{
+			isnext = GoNext();
+			if(!isnext && tab_adds_row)
+				DoAppendNoEdit();
+		}
+		else
+		{
+			isnext = GoRight();
+			if(!isnext && tab_adds_row)
+				DoAppendNoEdit();
+		}
+		ClearSelection();
+
+		if(isnext)
+			return true;
+	}
+	else if(!enter_mode)
+		return false;
+
+	if(enter_mode && !has_ctrls)
+	{
+		SwitchEdit();
+		return true;
+	}
+
+	return false;
+}
+
+bool GridCtrl::Key(dword key, int)
+{
+	if(!IsReadOnly())
+	switch(key)
+	{
+		case K_ENTER:
+			ClearSelection();
+			#ifdef LOG_CALLBACKS
+			LGR(2, "WhenEnter()");
+			WhenEnter();
+			#endif
+
+			if(enter_like_tab)
+				return TabKey(true);
+			else if(!SwitchEdit())
+				return true;
+			/*
+			if(th.IsSorted())
+			{
+				th.Multisort();
+				Refresh();
+			}*/
+
+			return true;
+		case K_ESCAPE:
+		{
+			bool quit = true;
+			if(search_string.GetCount() > 0)
+			{
+				ClearFound();
+				quit = false;
+			}
+			else if(HasCtrls())
+			{
+				bool canceled = CancelEdit();
+				quit = !canceled;
+			}
+			if(quit)
+			{
+				WhenEscape();
+				return false;
+			}
+			else
+				return true;
+		}
+		case K_SHIFT|K_LEFT:
+			GoLeft();
+			DoShiftSelect();
+			return true;
+		case K_SHIFT|K_RIGHT:
+			GoRight();
+			DoShiftSelect();
+			return true;
+		case K_SHIFT|K_UP:
+			GoPrev();
+			DoShiftSelect();
+			return true;
+		case K_SHIFT|K_DOWN:
+			GoNext();
+			DoShiftSelect();
+			return true;
+		case K_SHIFT|K_PAGEUP:
+			GoPageUp();
+			DoShiftSelect();
+			return true;
+		case K_SHIFT|K_PAGEDOWN:
+			GoPageDn();
+			DoShiftSelect();
+			return true;
+		case K_SHIFT_HOME:
+			GoBegin();
+			DoShiftSelect();
+			return true;
+		case K_SHIFT_END:
+			GoEnd();
+			DoShiftSelect();
+			return true;
+		case K_CTRL|K_LEFT:
+			GoLeft();
+			DoCtrlSelect();
+			return true;
+		case K_CTRL|K_RIGHT:
+			GoRight();
+			DoCtrlSelect();
+			return true;
+		case K_CTRL|K_UP:
+			if(select_row)
+				break;
+			GoPrev();
+			DoCtrlSelect();
+			return true;
+		case K_CTRL|K_DOWN:
+			if(select_row)
+				break;
+			GoNext();
+			DoCtrlSelect();
+			return true;
+		case K_UP:
+			GoPrev();
+			ClearSelection();
+			return true;
+		case K_DOWN:
+			GoNext();
+			ClearSelection();
+			return true;
+		case K_LEFT:
+			GoLeft();
+			ClearSelection();
+			return true;
+		case K_RIGHT:
+			GoRight();
+			ClearSelection();
+			return true;
+
+		case K_HOME:
+		case K_CTRL_HOME:
+		case K_CTRL_PAGEUP:
+			GoBegin();
+			ClearSelection();
+			return true;
+		case K_END:
+		case K_CTRL_END:
+		case K_CTRL_PAGEDOWN:
+			GoEnd();
+			ClearSelection();
+			return true;
+		case K_PAGEUP:
+			GoPageUp();
+			ClearSelection();
+			return true;
+		case K_PAGEDOWN:
+			GoPageDn();
+			ClearSelection();
+			return true;
+		case K_TAB:
+			return TabKey(false);
+		case K_SHIFT|K_TAB:
+			if(HasCtrls())
+			{
+				bool isprev = ShowPrevCtrl();
+				return focused_ctrl ? true : isprev;
+			}
+			else if(tab_changes_row)
+			{
+				bool isprev = false;
+				if(select_row)
+					isprev = GoPrev();
+				else
+					isprev = GoLeft();
+				ClearSelection();
+
+				return isprev;
+			}
+			else
+				return false;
+		case K_CTRL|K_F:
+			if(searching)
+			{
+				find.SetFocus();
+				return true;
+			}
+			else
+				return false;
+		case K_BACKSPACE:
+		{
+			if(searching)
+			{
+				int cnt = search_string.GetCount();
+				if(cnt > 0)
+				{
+					search_string.Remove(cnt - 1);
+					find <<= search_string;
+					ShowMatchedRows(search_string);
+				}
+				return true;
+			}
+			else
+				return false;
+		}
+		case K_F3:
+			if(rowfnd >= 0)
+			{
+				for(int i = rowfnd + 1; i < total_rows; i++)
+				{
+					if(vitems[i].IsFound())
+					{
+						rowfnd = i;
+						SetCursor0(i);
+						CenterCursor();
+						WhenSearchCursor();
+						return true;
+					}
+				}
+				for(int i = fixed_rows; i < rowfnd; i++)
+				{
+					if(vitems[i].IsFound())
+					{
+						rowfnd = i;
+						SetCursor0(i);
+						CenterCursor();
+						WhenSearchCursor();
+						return true;
+					}
+				}
+
+				return true;
+			}
+			return false;
+		default:
+			if(searching && !ctrls && Search(key))
+				return true;
+	}
+
+	return MenuBar::Scan(WhenMenuBar, key);
+}
+
+bool GridCtrl::Search(dword key)
+{
+	//if(key & K_UP)
+	//	return false;
+
+	if(key >= 32 && key < 65536)
+	{
+		search_string += (wchar) key;
+		if(!ShowMatchedRows(search_string) && search_string.GetCount() > 0)
+			search_string.Remove(search_string.GetCount() - 1);
+		else
+			find <<= search_string;
+
+		return true;
+	}
+	return false;
+}
+
+int GridCtrl::GetResizePanelHeight() const
+{
+	return (resize_panel.GetHeight() + 2) * resize_panel_open;
+}
+
+String GridCtrl::GetColumnName(int n) const
+{
+	return hitems[GetIdCol(n + fixed_cols)].GetName();
+}
+
+void GridCtrl::SwapCols(int n, int m)
+{
+	if(m == n ||
+	   n < fixed_cols || n > total_cols - 1 ||
+	   m < fixed_cols || m > total_cols - 1)
+		return;
+
+	Swap(hitems[m], hitems[n]);
+	UpdateCursor();
+	Repaint(true, false);
+}
+
+bool GridCtrl::CanMoveCol(int n, int m)
+{
+	if(m == n || m == n - 1 ||
+	   n < 0 || n > total_cols - 1 ||
+	   m < 0 || m > total_cols - 1)
+		return false;
+	else
+	{
+		if(hitems[n].join > 0)
+		{
+			LG(2, "n=%d(%d) m=%d(%d)", n, hitems[n].join, m, hitems[m].join);
+			if(m == n - 2 && hitems[n].join == hitems[n - 1].join)
+				return true;
+
+			if(hitems[m].join != hitems[n].join)
+				return false;
+		}
+		//tu sprawdzic join
+		return true;
+	}
+}
+
+void GridCtrl::MoveCol(int n, int m)
+{
+	LG("%d->%d", n, m);
+
+	if(!CanMoveCol(n, m))
+	{
+		Repaint();
+		return;
+	}
+
+	LG("Moved");
+
+	ItemRect ir = hitems[n];
+	if(m > total_cols)
+		hitems.Add(ir);
+	else
+		hitems.Insert(m + 1, ir);
+	if(m > n)
+		hitems.Remove(n);
+	else
+		hitems.Remove(n + 1);
+
+	UpdateCursor();
+	Repaint(true, false);
+}
+
+bool GridCtrl::MoveRow(int n, int m, bool repaint)
+{
+	LG("%d->%d", n, m);
+
+	if(m == n || m == n - 1 ||
+	   n < 0 || n > total_rows - 1 ||
+	   m < -1 || m > total_rows - 1)
+	{
+		Repaint();
+		return false;
+	}
+
+	LG("Moved");
+
+	ItemRect ir = vitems[n];
+	if(m > total_rows)
+		vitems.Add(ir);
+	else
+		vitems.Insert(m + 1, ir);
+	if(m > n)
+		vitems.Remove(n);
+	else
+		vitems.Remove(n + 1);
+
+	if(repaint)
+	{
+		UpdateCursor();
+		Repaint(false, true);
+	}
+
+	row_order = true;
+	SetModify();
+
+	return true;
+}
+
+void GridCtrl::MoveRows(int n, bool onerow)
+{
+	if(selected_rows && !onerow)
+	{
+		Vector<ItemRect> vi;
+		vi.Reserve(selected_rows);
+		for(int i = fixed_rows; i < total_rows; i++)
+			if(vitems[i].IsSelect())
+				vi.Add(vitems[i]);
+
+		int cnt = 0;
+
+		for(int i = total_rows - 1; i >= fixed_rows; i--)
+			if(vitems[i].IsSelect())
+			{
+				vitems.Remove(i);
+				if(i < n)
+					cnt++;
+			}
+
+		vitems.Insert(n - cnt, vi);
+
+		row_order = true;
+		SetModify();
+
+		UpdateCursor();
+		Repaint(false, true);
+	}
+	else
+	{
+		MoveRow(curpos.y, n - 1);
+	}
+}
+
+bool GridCtrl::SwapRows(int n, int m, bool repaint)
+{
+	if(ctrls || m == n ||
+	   n < fixed_rows || n > total_rows - 1 ||
+	   m < fixed_rows || m > total_rows - 1)
+		return false;
+
+	Swap(vitems[m], vitems[n]);
+	if(repaint)
+	{
+		UpdateCursor();
+		Repaint(false, true);
+	}
+	row_order = true;
+	SetModify();
+	return true;
+}
+
+void GridCtrl::SwapUp(int cnt)
+{
+	int yp = 0;
+	bool first = false;
+	bool repaint = false;
+
+	if(selected_rows == 0)
+	{
+		if(SwapRows(curpos.y, curpos.y - cnt))
+			yp = vitems[curpos.y + cnt].nTop(sby + fixed_height);
+		else
+			return;
+	}
+	else
+	{
+		for(int i = fixed_rows; i < total_rows; i++)
+		{
+			if(vitems[i].IsSelect())
+			{
+				if(!SwapRows(i, i - cnt, false))
+					return;
+				if(!first)
+				{
+					yp = vitems[i].nTop(sby + fixed_height);
+					first = true;
+				}
+			}
+		}
+		repaint = true;
+	}
+
+	if(resize_row_mode == 0 && yp < 0)
+		sby.Set(sby + yp);
+
+	if(repaint)
+	{
+		UpdateCursor();
+		Repaint(false, true);
+	}
+}
+
+void GridCtrl::SwapDown(int cnt)
+{
+	int yp = 0;
+	bool first = false;
+	bool repaint = false;
+
+	if(selected_rows == 0)
+	{
+		if(SwapRows(curpos.y, curpos.y + cnt))
+			yp = vitems[curpos.y - cnt].nBottom(sby);
+		else
+			return;
+	}
+	else
+	{
+		for(int i = total_rows - 1; i >= fixed_rows; i--)
+		{
+			if(vitems[i].IsSelect())
+			{
+				if(!SwapRows(i, i + cnt, false))
+					return;
+				if(!first)
+				{
+					yp = vitems[i].nBottom(sby);
+					first = true;
+				}
+			}
+		}
+		repaint = true;
+	}
+
+	int cy = GetSize().cy;
+	if(resize_row_mode == 0 && yp > cy)
+		sby.Set(sby + yp - cy);
+
+	if(repaint)
+	{
+		UpdateCursor();
+		Repaint(false, true);
+	}
+}
+
+void GridCtrl::MouseLeave()
+{
+	if(live_cursor)
+		SetCursor0(-1, -1, false, true);
+	UpdateHighlighting(GS_BORDER, Point(0, 0));
+}
+
+void GridCtrl::MouseWheel(Point p, int zdelta, dword keyflags)
+{
+	if(resize_row_mode == 0)
+	{
+		sby.Set(sby - zdelta / 4);
+	}
+}
+
+GridCtrl& GridCtrl::GridColor(Color fg)
+{
+	fg_grid = fg;
+	return *this;
+}
+
+GridCtrl& GridCtrl::FocusColor(Color fg, Color bg)
+{
+	fg_focus = fg;
+	bg_focus = bg;
+	return *this;
+}
+
+GridCtrl& GridCtrl::LiveColor(Color fg, Color bg)
+{
+	fg_live = fg;
+	bg_live = bg;
+	return *this;
+}
+
+GridCtrl& GridCtrl::OddColor(Color fg, Color bg)
+{
+	fg_odd = fg;
+	bg_odd = bg;
+	return *this;
+}
+
+GridCtrl& GridCtrl::EvenColor(Color fg, Color bg)
+{
+	fg_even = fg;
+	bg_even = bg;
+	return *this;
+}
+
+GridCtrl& GridCtrl::ColoringMode(int m)
+{
+	coloringMode = m;
+	return *this;
+}
+
+void GridCtrl::ClearCursor(bool remove)
+{
+	if(!remove && valid_cursor)
+	{
+		SetItemCursor(curpos, false, false);
+		RefreshRow(curpos.y, 0);
+	}
+
+	curpos.x = curpos.y = -1;
+	curid.x = curid.y = -1;
+	rowidx = -1;
+	valid_cursor = false;
+}
+
+void GridCtrl::ClearRow(int r, int column_offset)
+{
+	if(r < 0)
+		r = rowidx;
+	else
+		r -= fixed_rows;
+	for(int i = fixed_cols + column_offset; i < total_cols; i++)
+		items[vitems[r].id][hitems[i].id].val = Null;
+
+	SetCtrlsData();
+	RefreshRow(rowidx, 0);
+}
+
+void GridCtrl::Clear(bool columns)
+{
+	doscroll = false;
+
+	UpdateCtrls(UC_HIDE | UC_CTRLS);
+
+	items.Remove(1, items.GetCount() - 1);
+	vitems.Remove(1, vitems.GetCount() - 1);
+
+	if(columns)
+	{
+		hitems.Remove(1, hitems.GetCount() - 1);
+		items[0].Remove(1, items[0].GetCount() - 1);
+		rowbkp.Remove(1, rowbkp.GetCount() - 1);
+		edits.Remove(1, edits.GetCount() - 1);
+		total_cols = 1;
+		total_width = 0;
+		total_height = 0;
+		firstVisCol = 0;
+		lastVisCol = -1;
+		firstCol = -1;
+		lastCol = -1;
+		fixed_cols = 1;
+		firstVisRow = -1;
+		lastVisRow = -1;
+		coluid = 0;
+	}
+	else
+	{
+		total_height = fixed_height;
+		firstVisRow = fixed_rows;
+		lastVisRow = fixed_rows;
+//		firstVisRow = /*1*/ 0;
+//		lastVisRow = /*1*/ 0; dlaczego 0..zapomnialem
+	}
+
+	valid_cursor = false;
+
+	total_rows = 1;
+	fixed_rows = 1;
+
+	firstRow = -1;
+	lastRow = -1;
+
+	curpos.x = curpos.y = -1;
+	curid.x  = curid.y  = -1;
+
+	hcol = -1;
+	hrow = -1;
+
+	rowidx = -1;
+	rowuid = 0;
+
+	row_modified = 0;
+
+	if(ready)
+	{
+		UpdateSizes();
+		UpdateHolder();
+		UpdateSb();
+
+		oldpos.x = sbx;
+		oldpos.y = sby;
+
+		RebuildToolBar();
+		Refresh();
+	}
+
+	doscroll = true;
+}
+
+void GridCtrl::Reset()
+{
+	Clear(true);
+}
+
+void GridCtrl::Begin()
+{
+	bkp_rowidx = rowidx;
+	rowidx = fixed_rows;
+}
+
+void GridCtrl::End()
+{
+	rowidx = total_rows - 1;
+}
+
+bool GridCtrl::IsEnd()
+{
+	if(rowidx < total_rows)
+		return true;
+	else
+	{
+		rowidx = bkp_rowidx;
+		return false;
+	}
+}
+
+void GridCtrl::Next()
+{
+	++rowidx;
+}
+
+void GridCtrl::Prev()
+{
+	--rowidx;
+}
+
+bool GridCtrl::IsNext()
+{
+	return rowidx < total_rows - 1;
+}
+
+bool GridCtrl::IsPrev()
+{
+	return rowidx > fixed_rows;
+}
+
+bool GridCtrl::IsFirst()
+{
+	return rowidx == fixed_rows;
+}
+
+bool GridCtrl::IsLast()
+{
+	return rowidx == total_rows - 1;
+}
+
+int GridCtrl::SetCursor0(int n)
+{
+	int t = curpos.y;
+	SetCursor0(curpos.x < 0 ? firstVisCol : curpos.x, n);
+	return t;
+}
+
+int GridCtrl::SetCursor(int n)
+{
+	return SetCursor0(n + fixed_rows) - fixed_rows;
+}
+
+void GridCtrl::SetCursor(const Point& p)
+{
+	SetCursor0(Point(p.x + fixed_cols, p.y + fixed_rows), false);
+}
+
+int GridCtrl::SetCursorId(int id)
+{
+	id += fixed_rows;
+	for(int i = fixed_rows; i < total_rows; i++)
+	{
+		if(vitems[i].id == id)
+			return SetCursor(i - fixed_rows);
+	}
+	return -1;
+}
+
+int GridCtrl::GetCursor(bool rel) const
+{
+	if(rel)
+		return valid_cursor ? vitems[curpos.y].id  - fixed_rows : -1;
+	else
+		return valid_cursor ? curpos.y - fixed_rows : -1;
+}
+
+int GridCtrl::GetPrevCursor(bool rel) const
+{
+	if(rel)
+		return IsValidCursor(oldcur) ? vitems[oldcur.y].id  - fixed_rows : -1;
+	else
+		return IsValidCursor(oldcur) ? oldcur.y - fixed_rows : -1;
+}
+
+int GridCtrl::GetCursor(int uid) const
+{
+	for(int i = fixed_rows; i < total_rows; i++)
+		if(vitems[i].uid == uid)
+			return i - fixed_rows;
+	return -1;
+}
+
+Point GridCtrl::GetCursorPos() const
+{
+	return valid_cursor ? Point(curpos.x - fixed_cols, curpos.y - fixed_rows) : Point(-1, -1);
+}
+
+int GridCtrl::GetRowId() const
+{
+	return valid_cursor ? vitems[curpos.y].id - fixed_rows : -1;
+}
+
+int GridCtrl::GetColId() const
+{
+	return valid_cursor ? hitems[curpos.x].id - fixed_cols: -1;
+}
+
+int GridCtrl::GetRowId(int n) const { return vitems[n + fixed_rows].id - fixed_rows; }
+int GridCtrl::GetColId(int n) const { return hitems[n + fixed_cols].id - fixed_cols; }
+
+int GridCtrl::GetColUId() const
+{
+	return valid_cursor ? hitems[curpos.x].uid : -1;
+}
+
+int GridCtrl::GetRowUId() const
+{
+	return valid_cursor ? vitems[curpos.y].uid : -1;
+}
+
+int GridCtrl::FindCol(int id) const
+{
+	id += fixed_cols;
+	for(int i = fixed_cols; i < total_cols; i++)
+		if(hitems[i].id == id)
+			return i - fixed_cols;
+	return -1;
+}
+
+int GridCtrl::FindRow(int id) const
+{
+	id += fixed_rows;
+	for(int i = fixed_rows; i < total_rows; i++)
+		if(vitems[i].id == id)
+			return i - fixed_rows;
+	return -1;
+}
+
+int GridCtrl::GetNewRowPos()
+{
+	return rowidx > 0 ? rowidx - fixed_rows : -1;
+}
+
+int GridCtrl::GetNewRowId()
+{
+	return rowidx > 0 ? vitems[rowidx].id - fixed_rows : -1;
+}
+
+int GridCtrl::GetRemovedRowPos()
+{
+	return rowidx > 0 ? rowidx - fixed_rows : -1;
+}
+
+void GridCtrl::CenterCursor()
+{
+	if(IsEmpty() || !IsCursor())
+		return;
+
+	sbx.Set(hitems[curpos.x].nLeft() - GetSize().cx / 2);
+	sby.Set(vitems[curpos.y].nTop() - GetSize().cy / 2);
+}
+
+bool GridCtrl::Go0(int jump, bool scroll, bool goleft, bool ctrlmode)
+{
+	if(IsEmpty())
+		return false;
+
+	bool samerow = false;
+	bool doall = true;
+
+	if(jump == GO_LEFT || jump == GO_RIGHT)
+	{
+		if(select_row && !ctrlmode && !draw_focus)
+		{
+			if(jump == GO_LEFT)
+				sbx.Set(sbx.Get() - 5);
+			else
+				sbx.Set(sbx.Get() + 5);
+			return false;
+		}
+
+		samerow = true;
+		doall = false;
+	}
+
+	if(jump == GO_PREV)
+		if(curpos.y >= 0 && curpos.y <= firstVisRow)
+			return false;
+
+	if(jump == GO_NEXT)
+		if(curpos.y >= 0 && curpos.y >= lastVisRow)
+			return false;
+
+	if(jump == GO_PAGEUP || jump == GO_PAGEDN)
+	{
+		if(jump == GO_PAGEDN && curpos.y == lastVisRow)
+			return false;
+
+		if(jump == GO_PAGEUP && curpos.y == firstVisRow)
+			return false;
+
+		if(!valid_cursor)
+		{
+			GoFirstVisible();
+			return true;
+		}
+	}
+
+	Size sz = GetSize();
+	int sy = -1;
+
+	switch(jump)
+	{
+		case GO_BEGIN:
+		{
+			if(!SetCursor0(curpos.x < 0 ? firstVisCol : curpos.x, firstVisRow, false, false, 0, 1, ctrls))
+				return false;
+			sy = 0;
+
+			break;
+		}
+		case GO_END:
+		{
+			if(!SetCursor0((curpos.x < 0 || goleft) ? firstVisCol : curpos.x, lastVisRow, false, false, 0, -1, ctrls))
+				return false;
+			if(goleft)
+				GoCursorLeftRight();
+			else
+				sy = total_height - fixed_height;
+
+			break;
+		}
+		case GO_NEXT:
+		{
+			if(!SetCursor0(curpos.x < 0 ? firstVisCol : curpos.x,
+			               curpos.y < 0 ? firstVisRow : curpos.y + 1,
+					       0, 0, 0, 1, ctrls))
+				return false;
+
+			int b = vitems[curpos.y].nBottom(sby);
+			int r = sz.cy;
+
+			if(b > r)
+				sy = sby + b - r;
+
+			break;
+		}
+		case GO_PREV:
+		{
+			if(!SetCursor0(curpos.x < 0 ? firstVisCol : curpos.x,
+			               curpos.y < 0 ? firstVisRow : curpos.y - 1,
+			               0, 0, 0, -1, ctrls))
+				return false;
+
+			int t = vitems[curpos.y].nTop(sby + fixed_height);
+
+			if(t < 0)
+				sy = sby + t;
+
+			break;
+		}
+		case GO_LEFT:
+		{
+			if(!SetCursor0(curpos.x < 0 ? firstVisCol : curpos.x - 1,
+						   curpos.y < 0 ? firstVisRow : curpos.y,
+						   0, 0, -1, 0, ctrlmode))
+				return false;
+
+			break;
+		}
+		case GO_RIGHT:
+		{
+			if(!SetCursor0(curpos.x < 0 ? firstVisCol : curpos.x + 1,
+						   curpos.y < 0 ? firstVisRow : curpos.y,
+						   0, 0, 1, 0, ctrlmode))
+				return false;
+
+			break;
+		}
+		case GO_PAGEUP:
+		{
+			int cp = curpos.y;
+			int c = cp;
+
+			int yn = vitems[c].nTop() - sz.cy;
+			int ya = vitems[c].nTop(sby);
+
+			bool found = false;
+			int i;
+			for(i = c - 1; i >= fixed_rows; i--)
+				if(yn >= vitems[i].nTop() && yn < vitems[i].nBottom() && !vitems[i].hidden && !vitems[i].clickable)
+				{
+					found = true;
+					break;
+				}
+
+			c = found ? i : firstVisRow;
+
+			if(!SetCursor0(curpos.x < 0 ? firstVisCol : curpos.x, c, 0, 0, 0, 1, ctrls))
+				return false;
+
+			if(scroll && resize_row_mode == 0)
+			{
+				int yc = vitems[c].nTop();
+				int yt = vitems[curpos.y].nTop(sby);
+				int yb = vitems[curpos.y].nBottom(sby);
+
+				if(yt < 0 || yb > sz.cy - 1)
+					sby.Set(yc - sz.cy + vitems[c].nHeight());
+				else
+					sby.Set(yc - ya);
+			}
+
+			break;
+		}
+		case GO_PAGEDN:
+		{
+			int cp = curpos.y;
+			int c = cp;
+
+			int yn = vitems[c].nTop() + sz.cy;
+			int ya = vitems[c].nTop(sby);
+
+			bool found = false;
+			int i;
+			for(i = c + 1; i < total_rows; i++)
+				if(yn >= vitems[i].nTop() && yn < vitems[i].nBottom() && !vitems[i].hidden && !vitems[i].clickable)
+				{
+					found = true;
+					break;
+				}
+
+			c = found ? i : lastVisRow;
+
+			if(!SetCursor0(curpos.x < 0 ? firstVisCol : curpos.x, c, 0, 0, 0, -1, ctrls))
+				return false;
+
+			if(scroll && resize_row_mode == 0)
+			{
+				int yc = vitems[c].nTop();
+				int yt = vitems[cp].nTop(sby);
+				int yb = vitems[cp].nBottom(sby);
+
+				if(yt < 0 || yb > sz.cy - 1)
+					sby.Set(yc);
+				else
+					sby.Set(yc - ya);
+			}
+
+			break;
+		}
+	}
+
+	if(jump == GO_LEFT || jump == GO_RIGHT)
+	{
+		if(scroll)
+			GoCursorLeftRight();
+	}
+	else
+	{
+		if(scroll && resize_row_mode == 0 && sy >= 0)
+			sby.Set(sy);
+
+		if(ctrls)
+			UpdateCtrls(UC_CHECK_VIS | UC_SHOW | UC_FOCUS);
+	}
+
+	if(!ctrls)
+	{
+		Ctrl * ctrl = valid_cursor ? GetItem(curpos).ctrl : NULL;
+		if(ctrl)
+		{
+			focused_ctrl = ctrl;
+			focused_ctrl_id = hitems[curpos.x].id;
+			focused_col = curpos.x;
+			ctrl->SetFocus();
+		}
+		else
+			focused_ctrl = NULL;
+	}
+	return true;
+}
+
+void GridCtrl::GoCursorLeftRight()
+{
+	if(resize_col_mode == 0)
+	{
+		int l = hitems[curpos.x].nLeft(sbx + fixed_width);
+		int r = hitems[curpos.x].nRight(sbx);
+		int w = GetSize().cx;
+
+		if(l < 0)
+			sbx.Set(sbx + l);
+		else if(r > w)
+			sbx.Set(sbx + r - w);
+	}
+
+	if(resize_row_mode == 0)
+	{
+		int t = vitems[curpos.y].nTop(sby + fixed_height);
+		int b = vitems[curpos.y].nBottom(sby);
+		int h = GetSize().cy;
+
+		if(t < 0)
+			sby.Set(sby + t);
+		else if(b > h)
+			sby.Set(sby + b - h);
+	}
+}
+
+bool GridCtrl::GoFirstVisible(bool scroll)
+{
+	if(IsEmpty())
+		return false;
+
+	SetCursor0(curpos.x < 0 ? firstVisCol : curpos.x, max(firstVisRow, firstRow));
+	if(scroll && resize_row_mode == 0)
+		sby.Set(vitems[firstRow].nTop(/*fixed_height*/));
+	if(ctrls)
+		UpdateCtrls();
+
+	return true;
+}
+
+bool GridCtrl::GoBegin(bool scroll)                { return Go0(GO_BEGIN, scroll);                  }
+bool GridCtrl::GoEnd(bool scroll, bool goleft)     { return Go0(GO_END, scroll, goleft);            }
+bool GridCtrl::GoNext(bool scroll)                 { return Go0(GO_NEXT, scroll);                   }
+bool GridCtrl::GoPrev(bool scroll)                 { return Go0(GO_PREV, scroll);                   }
+bool GridCtrl::GoLeft(bool scroll, bool ctrlmode)  { return Go0(GO_LEFT, scroll, false, ctrlmode);  }
+bool GridCtrl::GoRight(bool scroll, bool ctrlmode) { return Go0(GO_RIGHT, scroll, false, ctrlmode); }
+bool GridCtrl::GoPageUp(bool scroll)               { return Go0(GO_PAGEUP, scroll);                 }
+bool GridCtrl::GoPageDn(bool scroll)               { return Go0(GO_PAGEDN, scroll);                 }
+
+Ctrl * GridCtrl::GetCtrl(const Point &p, bool check_visibility, bool relative)
+{
+	return GetCtrl(p.y, p.x, check_visibility, relative);
+}
+
+Ctrl * GridCtrl::GetCtrl(int r, int c, bool check_visibility, bool relative)
+{
+	int idx = relative ? fixed_cols + c : hitems[c].id;
+	int idy = vitems[r].id;
+	Ctrl * ctrl = items[idy][idx].ctrl;
+	if(!ctrl)
+		ctrl = edits[idx].ctrl;
+	if(check_visibility && ctrl && !ctrl->IsShown())
+		ctrl = NULL;
+	return ctrl;
+}
+
+Ctrl * GridCtrl::GetCtrl(int r, int c)
+{
+	return GetCtrl(r, c, true, true);
+}
+
+Ctrl * GridCtrl::GetCtrl(int c)
+{
+	return GetCtrl(curpos.y, c, true, true);
+}
+
+bool GridCtrl::IsCtrl(Point &p)
+{
+	return GetCtrl(p, true);
+}
+
+void GridCtrl::GoTo(int r, bool setcursor, bool scroll)
+{
+	r += fixed_rows;
+
+	if(setcursor)
+		if(!SetCursor0(r))
+			return;
+
+	if(scroll)
+	{
+		Size sz = GetSize();
+		sby.Set(vitems[r].nTop() + vitems[r].nHeight() / 2 - sz.cy / 2);
+	}
+}
+
+void GridCtrl::GoTo(int r, int c, bool setcursor, bool scroll)
+{
+	c += fixed_cols;
+	r += fixed_rows;
+
+	if(setcursor)
+		if(!SetCursor0(c, r))
+			return;
+
+	if(scroll)
+	{
+		Size sz = GetSize();
+		sbx.Set(hitems[c].nLeft() + hitems[c].nWidth() / 2 - sz.cx / 2);
+		sby.Set(vitems[r].nTop() + vitems[r].nHeight() / 2 - sz.cy / 2);
+	}
+}
+
+
+int GridCtrl::GetCount() const      { return total_rows - fixed_rows; }
+int GridCtrl::GetFixedCount() const { return fixed_rows;              }
+int GridCtrl::GetTotalCount() const { return total_rows;              }
+
+GridCtrl& GridCtrl::SetColsMin(int size)
+{
+	for(int i = 1; i < total_cols; i++)
+		hitems[i].min = size;
+
+	return *this;
+}
+
+GridCtrl& GridCtrl::SetColsMax(int size)
+{
+	for(int i = 0; i < total_rows; i++)
+		hitems[i].max = size;
+
+	return *this;
+}
+
+void GridCtrl::GotFocus()
+{
+	LG("GotFocus");
+	RestoreFocus();
+	if(valid_cursor)
+		RefreshRow(curpos.y, 0, 0);
+}
+
+void GridCtrl::LostFocus()
+{
+	LG("LostFocus");
+	if(valid_cursor)
+		RefreshRow(curpos.y, 0, 0);
+}
+
+void GridCtrl::ChildGotFocus()
+{
+	LG("ChildGotFocus");
+	if(valid_cursor)
+		RefreshRow(curpos.y, 0, 0);
+	Ctrl::ChildGotFocus();
+}
+
+void GridCtrl::ChildLostFocus()
+{
+	LG("ChildLostFocus");
+	if(valid_cursor)
+		RefreshRow(curpos.y, 0, 0);
+	Ctrl::ChildLostFocus();
+}
+
+void GridCtrl::Repaint(bool do_recalc_cols /* = false*/, bool do_recalc_rows /* = false*/)
+{
+	if(do_recalc_cols)
+	{
+		if(ready)
+		{
+			UpdateCols(true);
+			firstCol = fixed_cols;
+		}
+		else
+			recalc_cols = true;
+	}
+
+	if(do_recalc_rows)
+	{
+		if(ready)
+		{
+			UpdateRows(true);
+			firstRow = fixed_rows;
+		}
+		else
+			recalc_rows = true;
+	}
+
+	if(ready)
+	{
+		doscroll = false;
+		UpdateSizes();
+		UpdateSb();
+		UpdateHolder();
+		UpdateCtrls();
+		SyncCtrls();
+		doscroll = true;
+		Refresh();
+	}
+}
+
+void GridCtrl::Ready(bool b)
+{
+	ready = b;
+	if(b)
+		Repaint(true);
+}
+
+GridCtrl& GridCtrl::ResizeColMode(int m)
+{
+	resize_col_mode = m;
+	recalc_cols = true;
+	RefreshLayout();
+	return *this;
+}
+
+GridCtrl& GridCtrl::ResizeRowMode(int m)
+{
+	resize_row_mode = m;
+	recalc_rows = true;
+	RefreshLayout();
+	return *this;
+}
+
+void GridCtrl::UpdateSb(bool horz, bool vert)
+{
+	if(horz)
+	{
+		sbx.SetTotal(resize_col_mode == 0 ? total_width - fixed_width : 0);
+		sbx.SetPage(GetSize().cx - fixed_width);
+	}
+
+	if(vert)
+	{
+		sby.SetTotal(resize_row_mode == 0 ? total_height - fixed_height : 0);
+		sby.SetPage(GetSize().cy - fixed_height);
+	}
+}
+
+bool GridCtrl::SwitchEdit()
+{
+	if(!valid_cursor)
+		return false;
+
+	if(ctrls)
+		EndEdit(true, true);
+	else
+		StartEdit();
+	return true;
+}
+
+bool GridCtrl::StartEdit(bool mouse)
+{
+	if(!valid_cursor || !IsRowEditable())
+		return false;
+
+	ctrls = true;
+
+	WhenStartEdit();
+
+	SetCtrlsData();
+	int opt = UC_SHOW | UC_FOCUS | UC_GOFIRST | UC_CURSOR | UC_CTRLS;
+	if(mouse)
+		opt |= UC_MOUSE;
+	UpdateCtrls(opt);
+	return true;
+}
+
+bool GridCtrl::EndEdit(bool accept, bool doall, bool remove_row)
+{
+	if(!valid_cursor)
+		return true;
+
+	if(accept && !GetCtrlsData(false, doall, accept))
+		return false;
+
+	UpdateCtrls(UC_HIDE | UC_CTRLS);
+
+	if(!accept)
+	{
+		CancelCtrlsData();
+		if(newrow_inserted || newrow_appended)
+		{
+			newrow_inserted = false;
+			newrow_appended = false;
+			if(remove_row)
+			{
+				WhenCancelNewRow();
+				Remove0(curpos.y, 1, true, true, false);
+			}
+		}
+	}
+	WhenEndEdit();
+	return true;
+}
+
+void GridCtrl::Insert0(int row, int cnt /* = 1*/, bool recalc /* = true*/, bool refresh /* = true*/, int size /* = GD_ROW_HEIGHT*/)
+{
+	int id;
+
+	if(row < total_rows)
+	{
+		id = vitems[row].id;
+		for(int i = 0; i < total_rows; i++)
+		{
+			if(vitems[i].id >= id)
+				vitems[i].id += cnt;
+		}
+	}
+	else
+		id = total_rows;
+
+	ItemRect ir;
+	ir.size = size;
+	vitems.Insert(row, ir, cnt);
+	items.InsertN(id, cnt);
+
+	for(int i = 0; i < cnt; i++)
+	{
+		int nid = id + i;
+		int r = row + i;
+		vitems[r].id = nid;
+		vitems[r].uid = rowuid++;
+		vitems[r].items = &items;
+		vitems[r].operation = ready ? GridOperation::INSERT : GridOperation::NONE;
+		items[nid].SetCount(total_cols);
+		UpdateDefaults(nid);
+		rowidx = r;
+		total_rows++;
+		WhenCreateRow();
+	}
+
+	firstRow = -1;
+
+	if(ready && recalc)
+	{
+		RecalcRows();
+		UpdateSizes();
+
+		if(refresh)
+		{
+			UpdateSb();
+			SyncCtrls();
+			RefreshFrom(row);
+		}
+	}
+
+	row_order = true;
+	SetModify();
+}
+
+bool GridCtrl::Remove0(int row, int cnt /* = 1*/, bool recalc /* = true*/, bool refresh /* = true*/, bool whens /* = true*/)
+{
+	if(cnt < 0)
+		return false;
+
+	int minid = total_rows;
+	bool cancel = true;
+	int x = -1;
+	int y = -1;
+
+	for(int	i = 0; i < cnt; i++)
+	{
+		int rid = row + i;
+		rowidx = remove_hides ? rid : row;
+
+		int id = vitems[rowidx].id;
+		int op = vitems[rowidx].operation;
+
+		if(remove_hides)
+		{
+			vitems[rowidx].operation = GridOperation::REMOVE;
+			vitems[rowidx].hidden = true;
+			vitems[rowidx].tsize = vitems[rowidx].size;
+			vitems[rowidx].size = 0;
+			vitems[rowidx].nsize = 0;
+			//for this row in hitems selected flag should be cleared too
+		}
+
+		if(whens)
+		{
+			if(call_whenremoverow)
+			{
+				#ifdef LOG_CALLBACKS
+				LGR(2, "WhenRemoveRow()");
+				LGR(2, Format("[row: %d]", rowidx));
+				WhenRemoveRow();
+				#endif
+			}
+
+			if(cancel_remove)
+			{
+				vitems[rowidx].operation = op;
+				cancel_remove = false;
+				cancel = false;
+				if(i == cnt - 1)
+					return cancel;
+				else
+					continue;
+			}
+			if(call_whenremoverow)
+				WhenAcceptRow();
+		}
+
+		if(vitems[rowidx].IsSelect())
+		{
+			int si = 0;
+			for(int j = fixed_cols; j < total_cols; j++)
+				if(GetItem(rowidx, j).IsSelect())
+					si++;
+
+			selected_items -= si;
+			selected_rows -= 1;
+		}
+
+		if(!remove_hides)
+		{
+			for(int j = 0; j < total_rows; j++)
+				if(vitems[j].id > id)
+					vitems[j].id--;
+		}
+		else
+			vitems[rowidx].style = 0; //bo IsSelect korzysta z pola style
+
+
+		total_height -= vitems[rowidx].nHeight();
+
+		if(rid == ctrlid.y)
+			UpdateCtrls(UC_HIDE | UC_CTRLS);
+
+		if(!remove_hides)
+		{
+			total_rows--;
+			vitems.Remove(rowidx);
+			items.Remove(id);
+		}
+
+		if(rid == curpos.y)
+		{
+			x = curpos.x;
+			y = remove_hides ? curpos.y + cnt : curpos.y;
+			ClearCursor(true);
+		}
+
+		if(rid == oldcur.y)
+		{
+			oldcur.x = oldcur.y = -1;
+		}
+	}
+
+	if(IsEmpty())
+		WhenEmpty();
+
+	if(ready && recalc)
+	{
+		RecalcRows();
+		UpdateSizes();
+
+		if(refresh)
+		{
+			UpdateSb();
+			SyncCtrls();
+			RefreshFrom(row);
+
+			if(x >= 0 && y >= 0)
+				SetCursor0(x, max(fixed_rows, min(total_rows - 1, y)), false, false, 0, -1);
+
+			if(!valid_cursor)
+				RebuildToolBar();
+		}
+	}
+
+	firstRow = -1;
+
+	return cancel;
+}
+
+int GridCtrl::Append0(int cnt, int size, bool refresh)
+{
+	vitems.AddN(cnt);
+	items.AddN(cnt);
+
+	int j = total_rows;
+	int k = j;
+	int n = j > 0 ? vitems[j - 1].n + (int) vitems[j - 1].hidden : 0;
+	for(int i = 0; i < cnt; i++)
+	{
+		ItemRect &ir = vitems[j];
+		ir.parent = this;
+		ir.items = &items;
+		ir.size = ir.nsize = size;
+		ir.operation = ready ? GridOperation::INSERT : GridOperation::NONE;
+
+		if(total_rows > 0)
+		{
+			ir.pos = ir.npos = vitems[j - 1].nBottom();
+			ir.n = n;
+		}
+
+		if(size == 0)
+			ir.hidden = true;
+		else
+		{
+			lastVisRow = j;
+			if(firstVisRow < 0)
+				firstVisRow = lastVisRow;
+		}
+
+		items[j].SetCount(total_cols);
+		ir.id = j++;
+		ir.uid = rowuid++;
+		UpdateDefaults(ir.id);
+		rowidx = j - 1;
+		total_rows = j;
+		WhenCreateRow();
+	}
+
+	total_height += size * cnt;
+
+	if(refresh && ready)
+	{
+		if(resize_row_mode > 0)
+			UpdateRows(true);
+		UpdateSb();
+		SyncCtrls();
+		RefreshFrom(k);
+	}
+
+	row_order = true;
+	SetModify();
+	return total_rows - fixed_rows;
+}
+
+void GridCtrl::Duplicate0(int row, int cnt, bool recalc, bool refresh)
+{
+	int id;
+	int nrow = row + cnt;
+
+	if(nrow < total_rows)
+	{
+		id = vitems[nrow].id;
+		for(int i = 0; i < total_rows; i++)
+		{
+			if(vitems[i].id >= id)
+				vitems[i].id += cnt;
+		}
+	}
+	else
+		id = total_rows;
+
+	ItemRect ir;
+	vitems.Insert(nrow, ir, cnt);
+	items.InsertN(id, cnt);
+
+	for(int i = 0; i < cnt; i++)
+	{
+		int nid = id + i;
+		int r = nrow + i;
+		vitems[r].id = nid;
+		vitems[r].uid = rowuid++;
+		vitems[r].items = &items;
+		vitems[r].size = vitems[row + i].size;
+		items[nid].SetCount(total_cols);
+
+		int oid = vitems[row + i].id;
+		for(int j = 1; j < total_cols; j++)
+			items[nid][j].val = items[oid][j].val;
+
+		rowidx = r;
+		total_rows++;
+		WhenCreateRow();
+	}
+
+	firstRow = -1;
+
+	if(ready && recalc)
+	{
+		RecalcRows();
+		UpdateSizes();
+
+		if(refresh)
+		{
+			UpdateSb();
+			SyncCtrls();
+			RefreshFrom(nrow);
+		}
+	}
+
+	row_order = true;
+	SetModify();
+}
+
+int GridCtrl::Append(int cnt, bool refresh, int height)
+{
+	return Append0(cnt, height, refresh);
+}
+
+void GridCtrl::Insert(int i, int cnt)
+{
+	Insert0(fixed_rows + i, cnt);
+}
+
+void GridCtrl::Remove(int i, int cnt)
+{
+	Remove0(i < 0 ? rowidx : fixed_rows + i, cnt);
+}
+
+void GridCtrl::RemoveFirst(int cnt /* = 1*/)
+{
+	Remove0(fixed_rows, min(total_rows - fixed_rows, cnt));
+}
+
+void GridCtrl::RemoveLast(int cnt /* = 1*/)
+{
+	Remove0(total_rows - cnt, min(total_rows - fixed_rows, cnt));
+}
+
+void GridCtrl::Duplicate(int i, int cnt)
+{
+	Duplicate0(fixed_rows + i, cnt);
+}
+
+void GridCtrl::Select(int n, int cnt /* = 1*/)
+{
+	SelectCount(n + fixed_rows, cnt, true);
+}
+
+void GridCtrl::SelectCount(int i, int cnt, bool sel)
+{
+	if(cnt <= 0)
+		return;
+	SelectRange(Point(fixed_cols, i), Point(total_cols - 1, i + cnt - 1), sel);
+}
+
+void GridCtrl::SelectRange(int from, int to, bool sel)
+{
+	SelectRange(Point(fixed_cols, from), Point(total_cols - 1, to), sel);
+}
+
+void GridCtrl::ShiftSelect(int from, int to)
+{
+	ShiftSelect(Point(fixed_cols, from), Point(total_cols - 1, to));
+}
+
+void GridCtrl::SelectRange(Point from, Point to, bool sel /* = true*/, bool fullrow /* = false*/)
+{
+	Point f, t;
+
+	if(fullrow)
+	{
+		from.x = fixed_cols;
+		to.x = total_cols - 1;
+	}
+
+	if(from.y < to.y)
+	{
+		f = from;
+		t = to;
+	}
+	else
+	{
+		f = to;
+		t = from;
+	}
+
+	int ymin = f.y;
+	int ymax = t.y;
+
+	int xmin = f.x;
+	int xmax = t.x;
+
+	if(xmin > xmax)
+	{
+		int t = xmin;
+		xmin = xmax;
+		xmax = t;
+	}
+
+	for(int i = ymin; i <= ymax; i++)
+	{
+		ItemRect &ir = vitems[i];
+		int yid = ir.id;
+
+		bool is_row_selected = false;
+		bool do_refresh = false;
+
+		for(int j = fixed_cols; j < total_cols; j++)
+		{
+			int xid = hitems[j].id;
+			Item &it = items[yid][xid];
+
+			if(j >= xmin && j <= xmax)
+			{
+				if(it.IsSelect() != sel)
+				{
+					it.Select(sel);
+					do_refresh = true;
+				}
+				if(sel)
+				{
+					is_row_selected = true;
+					selected_items++;
+				}
+				else
+					selected_items--;
+			}
+			else if(it.IsSelect())
+				is_row_selected = true;
+		}
+
+		if(!ir.IsSelect())
+		{
+			if(is_row_selected)
+				selected_rows++;
+		}
+		else if(!is_row_selected)
+			selected_rows--;
+
+		ir.Select(is_row_selected);
+
+		if(do_refresh)
+			RefreshRow(i, false, false);
+
+	}
+}
+
+void GridCtrl::SelectInverse(int from, int to)
+{
+	int nfrom = min(from, to);
+	int nto = max(from, to);
+
+	for(int i = nfrom ; i <= nto; i++)
+	{
+		vitems[i].Select(!vitems[i].IsSelect());
+		if(vitems[i].IsSelect())
+			selected_rows++;
+		else
+			selected_rows--;
+		RefreshRow(i, 0);
+	}
+}
+
+void GridCtrl::ShiftSelect(Point from, Point to)
+{
+	Point f, t;
+
+	if(from.y < to.y)
+	{
+		f = from;
+		t = to;
+	}
+	else
+	{
+		f = to;
+		t = from;
+	}
+
+	if(select_row)
+	{
+		f.x = fixed_cols;
+		t.x = total_cols;
+	}
+
+	int ymin = f.y;
+	int ymax = t.y;
+
+	int xmin = f.x;
+	int xmax = t.x;
+
+	if(ymin == ymax && xmin > xmax)
+	{
+		int t = xmin;
+		xmin = xmax;
+		xmax = t;
+	}
+
+	selected_rows = 0;
+	selected_items = 0;
+
+	for(int i = fixed_rows; i < total_rows; i++)
+	{
+		ItemRect &ir = vitems[i];
+		int yid = ir.id;
+
+		bool is_row_selected = false;
+		bool do_refresh = false;
+
+		if((i >= ymin && i <= ymax))
+		{
+			for(int j = fixed_cols; j < total_cols; j++)
+			{
+				int xid = hitems[j].id;
+
+				bool s = true;
+				if(i == ymin && ymin == ymax)
+					s = (j >= xmin && j <= xmax);
+				else if(i == ymin) s = (j >= xmin);
+				else if(i == ymax) s = (j <= xmax);
+
+				if(items[yid][xid].IsSelect() != s)
+				{
+					items[yid][xid].Select(s);
+					do_refresh = true;
+				}
+				if(s)
+				{
+					is_row_selected = true;
+					selected_items++;
+				}
+			}
+		}
+		else
+		{
+			for(int j = fixed_cols; j < total_cols; j++)
+				if(items[yid][j].IsSelect())
+				{
+					items[yid][j].Select(false);
+					do_refresh = true;
+				}
+		}
+
+		if(is_row_selected)
+			selected_rows++;
+
+		ir.Select(is_row_selected);
+
+		if(do_refresh)
+			RefreshRow(i, false, false);
+	}
+}
+
+void GridCtrl::DoShiftSelect()
+{
+	if(!shiftmode)
+	{
+		if(!IsValidCursor(oldcur))
+			return;
+		shiftpos = oldcur;
+		shiftmode = true;
+		ShiftSelect(oldcur, curpos);
+	}
+	else
+		ShiftSelect(shiftpos, curpos);
+}
+
+void GridCtrl::DoCtrlSelect()
+{
+	if(!IsValidCursor(oldcur))
+		return;
+
+	if(shiftmode && !select_row)
+	{
+		ClearSelection();
+		shiftpos = oldcur;
+	}
+
+	if(!IsValidCursor(shiftpos))
+		shiftpos = oldcur;
+
+	SelectRange(shiftpos, oldcur, false, select_row);
+	SelectRange(shiftpos, curpos, true, select_row);
+}
+
+bool GridCtrl::IsSelected(int n, bool relative)
+{
+	//int id = vitems[n + (relative ? fixed_rows : 0)].id;
+	int id = n + (relative ? fixed_rows : 0);
+	return vitems[id].IsSelect() || vitems[id].IsCursor();
+}
+
+bool GridCtrl::IsSelected(int n, int m, bool relative)
+{
+	int r = relative ? fixed_rows + n : n;
+	int c = relative ? fixed_cols + m : m;
+	Item &it = GetItem(r, c);
+	return it.IsSelect() || it.IsCursor();
+}
+
+bool GridCtrl::IsSelected()
+{
+	return IsSelected(rowidx, false);
+}
+
+void GridCtrl::ClearSelection()
+{
+	LG("Cleared %d", selected_rows);
+	shiftmode = false;
+	shiftpos = curpos;
+	if(selected_rows > 0)
+	{
+		for(int i = fixed_rows; i < total_rows; i++)
+		{
+			vitems[i].Select(0);
+			for(int j = fixed_cols; j < total_cols; j++)
+				items[i][j].Select(0);
+		}
+
+		Refresh();
+		selected_rows = 0;
+		selected_items = 0;
+	}
+}
+
+void GridCtrl::DoInsert0(bool edit, bool after)
+{
+	if(!valid_cursor)
+		return;
+
+	if(!EndEdit())
+		return;
+
+	SetItemCursor(curpos, false, false);
+	RefreshRow(curpos.y, false);
+	curpos.y += int(after);
+	Insert0(curpos.y, 1, true, true, GD_ROW_HEIGHT);
+	int y = curpos.y;
+	curpos.y = -1;
+	call_whenchangecol = false;
+	call_whenchangerow = false;
+	SetCursor0(curpos.x, y > total_rows - 1 ? total_rows - 1 : y);
+	call_whenchangecol = true;
+	call_whenchangerow = true;
+
+	newrow_inserted = true;
+
+	if(edit)
+		StartEdit();
+
+	if(!ctrls)
+		WhenInsertRow0();
+
+	WhenNewRow();
+
+	if(!edit)
+		newrow_inserted = false;
+}
+
+void GridCtrl::DoInsertBefore0(bool edit)
+{
+	DoInsert0(edit, false);
+}
+
+void GridCtrl::DoInsertAfter0(bool edit)
+{
+	DoInsert0(edit, true);
+}
+
+void GridCtrl::DoDuplicate0()
+{
+	int cy = 0;
+	if(selected_rows == 0)
+	{
+		if(!valid_cursor)
+			return;
+		cy = curpos.y + 1;
+		Duplicate0(curpos.y);
+	}
+	else if(!multi_select)
+	{
+		cy = GetMinRowSelected() + selected_rows * 2 - 1;
+		Duplicate0(GetMinRowSelected(), selected_rows);
+	}
+
+	WhenDuplicateRow();
+
+	if(cy > 0)
+		SetCursor0(curpos.x < 0 ? firstVisCol : curpos.x, max(fixed_rows, min(total_rows - 1, cy)));
+}
+
+void GridCtrl::DoRemove()
+{
+	if(keep_last_row && GetCount() == 1)
+		return;
+
+	if(!valid_cursor && selected_rows == 0)
+		return;
+
+	if(ask_remove)
+	{
+		if(!PromptYesNo(Format(t_("Do you really want to delete selected %s ?"), selected_rows > 0 ? t_("rows") : t_("row"))))
+			return;
+	}
+
+	bool newrow = IsNewRow();
+	CancelEdit(false);
+
+	int y = curpos.y;
+	int ocy = curpos.y;
+
+	if(selected_rows == 0)
+	{
+		//do not call WhenRemoveRow when not new (not inserted) row
+		Remove0(curpos.y, 1, true, true, !newrow);
+	}
+	else
+	{
+		int removed = 0;
+		int not_removed = 0;
+		int tc = total_rows;
+
+		minRowSelected = GetMinRowSelected();
+		maxRowSelected = GetMaxRowSelected();
+
+		if(keep_last_row && (maxRowSelected - minRowSelected + 1) == GetCount())
+			maxRowSelected--;
+
+		LG("Min:%d, Max:%d", minRowSelected, maxRowSelected);
+
+		for(int i = minRowSelected; i <= maxRowSelected; i++)
+		{
+			int rid = remove_hides ? i : minRowSelected + not_removed;
+			if(vitems[rid].IsSelect())
+			{
+				sel_begin = i == minRowSelected;
+				sel_end = i == maxRowSelected;
+
+				if(Remove0(rid, 1, false, false))
+				{
+					/* curpos.y tez sie zmienia bo gdy w whenromoverow jest woloanie innego okna to
+					   grid traci fokus i wola sie lostfoucs, ktory wymaga poprawnego curpos.y */
+					if(i == ocy)
+						y = curpos.y = rid - 1;
+				}
+				else
+					not_removed++;
+			}
+			else
+				not_removed++;
+		}
+		RecalcRows();
+		//UpdateSizes();
+		SyncCtrls();
+		UpdateSb();
+		Refresh();
+		curpos.y = -1;
+		SetCursor0(curpos.x < 0 ? firstVisCol : curpos.x, max(fixed_rows, min(total_rows - 1, y)), false, false, 0, -1);
+		shiftpos = curpos;
+	}
+}
+
+void GridCtrl::DoAppend0(bool edit)
+{
+	if(!EndEdit())
+		return; //powinno byc zakomentowane ale wtedy goend wola endedit ale juz dla rowidx wiekszego o 1..
+
+	Append0(1, GD_ROW_HEIGHT, true);
+
+	call_whenchangecol = false;
+	call_whenchangerow = false;
+	GoEnd(true, true);
+	call_whenchangecol = true;
+	call_whenchangerow = true;
+
+	newrow_appended = true;
+
+	if(edit)
+	{
+		StartEdit();
+		GoCursorLeftRight();
+	}
+
+	if(!ctrls)
+		WhenInsertRow0();
+
+	WhenNewRow();
+
+	if(!edit)
+		newrow_appended = false;
+
+}
+
+void GridCtrl::DoAppend()             { DoAppend0(edits_in_new_row); }
+void GridCtrl::DoAppendNoEdit()       { DoAppend0(0);                }
+void GridCtrl::DoInsertBefore()       { DoInsertBefore0(1);          }
+void GridCtrl::DoInsertBeforeNoEdit() {	DoInsertBefore0(0);          }
+void GridCtrl::DoInsertAfter()        { DoInsertAfter0(1);           }
+void GridCtrl::DoInsertAfterNoEdit()  { DoInsertAfter0(0);           }
+void GridCtrl::DoDuplicate()          { DoDuplicate0();              }
+void GridCtrl::DoEdit()               { StartEdit();                 }
+void GridCtrl::DoEndEdit()            { EndEdit();                   }
+void GridCtrl::DoCancelEdit()         { EndEdit(false);              }
+void GridCtrl::DoSwapUp()             { SwapUp();                    }
+void GridCtrl::DoSwapDown()           { SwapDown();                  }
+void GridCtrl::DoGoBegin()            { GoBegin();                   }
+void GridCtrl::DoGoEnd()              { GoEnd();                     }
+void GridCtrl::DoGoNext()             { GoNext();                    }
+void GridCtrl::DoGoPrev()             { GoPrev();                    }
+void GridCtrl::DoGoLeft()             { GoLeft();                    }
+void GridCtrl::DoGoRight()            { GoRight();                   }
+void GridCtrl::DoGoPageUp()           { GoPageUp();                  }
+void GridCtrl::DoGoPageDn()           { GoPageDn();                  }
+
+void GridCtrl::DoSelectAll()
+{
+	SelectCount(fixed_rows, total_rows - fixed_rows);
+}
+
+GridCtrl& GridCtrl::ShowRow(int n, bool refresh)
+{
+	if(!vitems[n].hidden)
+		return *this;
+	vitems[n].hidden = false;
+	vitems[n].size = vitems[n].tsize;
+	if(refresh)
+		Repaint(false, true);
+
+	return *this;
+}
+
+GridCtrl& GridCtrl::HideRow(int n, bool refresh)
+{
+	if(vitems[n].hidden)
+		return *this;
+	vitems[n].hidden = true;
+	vitems[n].tsize = vitems[n].size;
+	vitems[n].size = 0;
+	if(refresh)
+		Repaint(false, true);
+
+	return *this;
+}
+
+GridCtrl& GridCtrl::ShowColumn(int n, bool refresh)
+{
+	if(!hitems[n].hidden)
+		return *this;
+	hitems[n].hidden = false;
+	hitems[n].size = hitems[n].tsize;
+	if(refresh)
+		Repaint(true, false);
+
+	return *this;
+}
+
+GridCtrl& GridCtrl::HideColumn(int n, bool refresh)
+{
+	if(hitems[n].hidden)
+		return *this;
+	hitems[n].hidden = true;
+	hitems[n].tsize = hitems[n].size;
+	if(refresh)
+		Repaint(true, false);
+
+	return *this;
+}
+
+void GridCtrl::HideRows(bool repaint)
+{
+	bool change = false;
+	for(int i = fixed_rows; i < total_rows; i++)
+		if(!vitems[i].hidden)
+		{
+			change = true;
+			vitems[i].hidden = true;
+			vitems[i].tsize = vitems[i].size;
+			vitems[i].size = 0;
+		}
+	if(change || repaint)
+		Repaint(false, true);
+}
+
+void GridCtrl::ShowRows(bool repaint)
+{
+	bool change = false;
+	for(int i = fixed_rows; i < total_rows; i++)
+		if(vitems[i].hidden)
+		{
+			change = true;
+			vitems[i].hidden = false;
+			vitems[i].size = vitems[i].tsize;
+		}
+	if(change || repaint)
+		Repaint(false, true);
+}
+
+void GridCtrl::MenuHideColumn(int n)
+{
+	if(hitems[n].hidden)
+		ShowColumn(n);
+	else
+		HideColumn(n);
+}
+
+
+int GridCtrl::ShowMatchedRows(const WString &f)
+{
+	if(f.IsEmpty())
+	{
+		if(search_highlight)
+			ClearFound();
+		else
+			ShowRows(true);
+		return 0;
+	}
+
+	if(!search_immediate && search_highlight)
+	{
+		ClearFound(true, false);
+		//search_string = f;
+	}
+
+	int first_matched_row = -1;
+
+	int s, e;
+	for(int i = fixed_rows; i < total_rows; i++)
+	{
+		int idv = vitems[i].id;
+		for(int j = fixed_cols; j < total_cols; j++)
+		{
+			int idh = hitems[j].id;
+			Item &it = items[idv][idh];
+			it.Found(false);
+			it.fs = it.fe = 0;
+
+			if(hitems[j].hidden)
+				continue;
+
+			if(Match(f, (WString) GetStdConvertedColumn(j, it.val), s, e))
+			{
+				first_matched_row = i;
+				rowfnd = i;
+				goto found_first_matched_row;
+			}
+		}
+	}
+
+	if(first_matched_row < 0)
+		return 0;
+
+	found_first_matched_row:
+
+	bool change = false;
+	int rows = 0;
+	for(int i = first_matched_row; i < total_rows; i++)
+	{
+		bool match = false;
+		int idv = vitems[i].id;
+		for(int j = fixed_cols; j < total_cols; j++)
+		{
+			int idh = hitems[j].id;
+			Item &it = items[idv][idh];
+			it.Found(false);
+			it.fs = it.fe = 0;
+
+			if(hitems[j].hidden)
+				continue;
+
+			if(Match(f, (WString) GetStdConvertedColumn(j, it.val), s, e))
+			{
+				match = true;
+				it.Found(search_highlight);
+				it.fs = s;
+				it.fe = e;
+
+				if(!search_highlight)
+					break;
+			}
+		}
+
+		if(match)
+		{
+			rows++;
+			if(search_hide && vitems[i].hidden)
+			{
+				vitems[i].hidden = false;
+				vitems[i].size = vitems[i].tsize;
+				change = true;
+			}
+
+			if(search_highlight_first)
+				break;
+		}
+		else if(search_hide && !vitems[i].hidden)
+		{
+			vitems[i].hidden = true;
+			vitems[i].tsize = vitems[i].size;
+			vitems[i].size = 0;
+			change = true;
+		}
+		vitems[i].found = match;
+	}
+
+	if(rows > 0)
+	{
+		if(change || search_highlight)
+		{
+			LG("Repaint %d", search_hide);
+			Repaint(false, search_hide);
+		}
+	}
+	else if(search_hide)
+	{
+		for(int i = fixed_rows; i < total_rows; i++)
+		{
+			vitems[i].hidden = false;
+			vitems[i].size = vitems[i].tsize;
+		}
+	}
+
+	if(search_move_cursor && first_matched_row >= 0)
+	{
+		SetCursor0(first_matched_row);
+		CenterCursor();
+		WhenSearchCursor();
+	}
+
+	LG("Matched rows %d", rows);
+	return rows;
+}
+
+void GridCtrl::ClearFound(bool showrows, bool clear_string)
+{
+	for(int i = 0; i < total_rows; i++)
+	{
+		vitems[i].found = false;
+		for(int j = 0; j < total_cols; j++)
+		{
+			items[i][j].Found(false);
+			items[i][j].fs = items[i][j].fe = 0;
+		}
+	}
+	if(showrows)
+		ShowRows(true);
+
+	if(clear_string)
+		search_string.Clear();
+}
+
+bool GridCtrl::Match(const WString &f, const WString &s, int &fs, int &fe)
+{
+	int i = 0;
+
+	int fl = f.GetLength();
+	int sl = s.GetLength();
+
+	if(fl > sl)
+		return false;
+
+	for(int j = find_offset; j < sl; j++)
+	{
+		bool match;
+		if(search_case)
+			match = f[i] == s[j];
+		else
+			match = ToUpper(f[i]) == ToUpper(s[j]);
+
+		if(match)
+		{
+			if(++i == fl)
+			{
+				fs = j + 1 - fl;
+				fe = j;
+				return true;
+			}
+		}
+		else
+			i = 0;
+	}
+	return false;
+}
+
+void GridCtrl::DoFind()
+{
+	UpdateCtrls(UC_CHECK_VIS | UC_HIDE);
+	ShowMatchedRows((WString) ~find);
+}
+
+bool GridCtrl::WhenInsertRow0()
+{
+	WhenInsertRow();
+	if(cancel_insert)
+	{
+		WhenCancelNewRow();
+		Remove0(curpos.y, 1, true, true, false);
+		cancel_insert = false;
+		return false;
+	}
+	return true;
+}
+
+int GridCtrl::GetMinRowSelected()
+{
+	int i = fixed_rows;
+	while(i < total_rows && !vitems[i].IsSelect()) i++;
+	return i > total_rows - 1 ? -1 : i;
+}
+
+int GridCtrl::GetMaxRowSelected()
+{
+	int i = total_rows - 1;
+	while(i >= fixed_rows && !vitems[i].IsSelect()) i--;
+	return i < fixed_rows ? -1 : i;
+}
+
+void GridCtrl::CloseGrid()
+{
+	GetTopWindow()->Close();
+}
+
+void GridCtrl::UpdateVisColRow(bool col)
+{
+	if(col)
+	{
+		firstVisCol = fixed_cols;
+		lastVisCol = total_cols - 1;
+
+		for(int i = fixed_cols; i < total_cols; i++)
+			if(!hitems[i].hidden)
+			{
+				firstVisCol = i;
+				break;
+			}
+
+		for(int i = total_cols - 1; i >= fixed_cols; i--)
+			if(!hitems[i].hidden)
+			{
+				lastVisCol = i;
+				break;
+			}
+	}
+	else
+	{
+		firstVisRow = fixed_rows;
+		lastVisRow = total_rows - 1;
+
+		for(int i = fixed_rows; i < total_rows; i++)
+			if(!vitems[i].hidden)
+			{
+				firstVisRow = i;
+				break;
+			}
+
+		for(int i = total_rows - 1; i >= fixed_rows; i--)
+			if(!vitems[i].hidden)
+			{
+				lastVisRow = i;
+				break;
+			}
+	}
+}
+
+Point GridCtrl::GetBarOffset()
+{
+	Size bsz = bar.GetSize();
+	return Point(bar.GetAlign() == BarCtrl::BAR_LEFT ? bsz.cx : 0,
+	             bar.GetAlign() == BarCtrl::BAR_TOP ? bsz.cy : 0);
+}
+
+void GridCtrl::ClearModified()
+{
+	row_modified = 0;
+	for(int i = 0; i < total_cols; ++i)
+		items[curid.y][i].modified = false;
+}
+
+void GridCtrl::Debug(int n)
+{
+	if(n == 0)
+	{
+		LG("---- DEBUG 0 ----------");
+		LG("firstVisCol    %d", firstVisCol);
+		LG("lastVisCol     %d", lastVisCol);
+		LG("firstVisRow    %d", firstVisRow);
+		LG("lastVisRow     %d", lastVisRow);
+		LG("firstCol       %d", firstCol);
+		LG("firstRow       %d", firstRow);
+		LG("lastCol        %d", lastCol);
+		LG("lastRow        %d", lastRow);
+		LG("total_cols     %d", total_cols);
+		LG("total_rows     %d", total_rows);
+		LG("curpos         %d, %d", curpos.x, curpos.y);
+		LG("sbPos          %d, %d", sbx.Get(), sby.Get());
+		LG("sbTotal        %d, %d", sbx.GetTotal(), sby.GetTotal());
+		LG("sbPage         %d, %d", sbx.GetPage(), sby.GetPage());
+		LG("Size           %d, %d", GetSize().cx, GetSize().cy);
+		LG("fixed_width    %d", fixed_width);
+		LG("fixed_height   %d", fixed_height);
+		LG("total_width    %d", total_width);
+		LG("total_height   %d", total_height);
+		LG("row_modified   %d", row_modified);
+		LG("selected_rows  %d", selected_rows);
+		LG("selected_items %d", selected_items);
+		LG("---- END --------------");
+	}
+	if(n == 1)
+	{
+		LG("---- DEBUG 1 ----------");
+		for(int i = 0; i < total_cols; i++)
+		{
+			LG("Col %d h:%d p:%d s:%d", i, hitems[i].hidden, hitems[i].npos, hitems[i].nsize);
+			//LG("ismin %d ismax %d", hitems[i].ismin, hitems[i].ismax);
+		}
+		LG("---- END --------------");
+	}
+	if(n == 2)
+	{
+		LG("---- DEBUG 2 ----------");
+		for(int i = 0; i < total_rows; i++)
+		{
+			LG("Row %d p:%d s:%d", i, vitems[i].npos, vitems[i].nsize);
+		}
+		LG("---- END --------------");
+	}
+	if(n == 3)
+	{
+		Point p = GetCtrlPos(focused_ctrl);
+		LG(2, "Focused %x (%d, %d)", focused_ctrl, p.x, p.y);
+	}
+}
+
+void GridCtrl::Serialize(Stream &s)
+{
+	if(s.IsStoring())
+	{
+		s % total_cols;
+		for(int i = 1; i < total_cols; i++)
+		{
+			int id = hitems[i].id;
+			//s % String(aliases[id]);
+			s % id;
+			s % hitems[id];
+		}
+	}
+	else
+	{
+		int tc;
+		s % tc;
+		for(int i = 1; i < tc; i++)
+		{
+			//String alias;
+			//s % alias;
+			//int n = aliases.Find(alias);
+			int id;
+			s % id;
+			//if(id >= 0 && id < total_cols)
+			s % hitems[id];
+		}
+	}
+}
+
+void GridCtrl::JoinCells(int left, int top, int right, int bottom, bool relative)
+{
+	int fc = relative ? fixed_cols : 0;
+	int fr = relative ? fixed_rows : 0;
+
+	left   += fc;
+	top    += fr;
+	right  += fc;
+	bottom += fr;
+
+	for(int i = top; i <= bottom; ++i)
+	{
+		vitems[i].join++;
+
+		for(int j = left; j <= right; ++j)
+		{
+			Item &it = items[i][j];
+
+			it.idx = hitems[left].id;
+			it.idy = vitems[top].id;
+			it.cx  = right - left;
+			it.cy  = bottom - top;
+			it.group = join_group;
+			it.isjoined = true;
+
+			if(i == top)
+				hitems[j].join++;
+		}
+	}
+	join_group++;
+}
+
+void GridCtrl::JoinFixedCells(int left, int top, int right, int bottom)
+{
+	JoinCells(left, top, right, bottom, false);
+}
+
+void GridCtrl::JoinRow(int n, int left, int right)
+{
+	if(n < 0)
+		n = rowidx;
+
+	if(left < 0)
+		left = fixed_cols;
+	else
+		left += fixed_cols;
+
+	if(right < 0)
+		right = total_cols - fixed_cols;
+	else
+		right = total_cols - fixed_cols - right;
+
+	JoinCells(left, n, right, n, false);
+}
+
+void GridCtrl::JoinRow(int left, int right)
+{
+	JoinRow(-1, left, right);
+}
+
+
+/*----------------------------------------------------------------------------------------*/
+
+void GridPopUp::Paint(Draw &w)
+{
+	Size sz = GetSize();
+
+	DrawBorder(w, sz, BlackBorder);
+	w.DrawRect(1, 1, sz.cx - 2, sz.cy - 2, Color(240, 240, 240));
+	Size tsz = GetTextSize(text, StdFont());
+	w.DrawText((sz.cx - tsz.cx) / 2, (sz.cy - tsz.cy) / 2, text);
+}
+
+void GridPopUp::PopUp(Ctrl *owner, int x, int y, int width, int height)
+{
+	SetRect(Rect(x, y, x + width, y + height));
+	if(open)
+		return;
+	Ctrl::PopUp(owner, true, true, GUI_DropShadows());
+	SetAlpha(230);
+	open = true;
+}
+
+void GridPopUp::Close()
+{
+	open = false;
+	Ctrl::Close();
+}
+
+void GridCtrl::UpdateHighlighting(int mode, Point p)
+{
+	if(resize_paint_mode < 1 && (resizeCol || resizeRow))
+		return;
+
+	bool refresh = false;
+
+	if(mode == GS_UP)
+	{
+		if((p.x < 0 || p.x > GetSize().cx - 1) && hcol >= 0 && hitems[hcol].IsHighlight())
+		{
+			hitems[hcol].Highlight(0);
+			refresh = true;
+			hcol = -1;
+		}
+	}
+	else if(mode == GS_MOVE)
+	{
+		int col = GetMouseCol(p, true, true, false);
+		int row = hrow = GetMouseRow(p, false, true, true);
+
+		if(hcol >= 0 && (hcol != col || row != 0) && hitems[hcol].IsHighlight())
+		{
+			hitems[hcol].Highlight(0);
+			refresh = true;
+		}
+		if(col >= 0 && row == 0 && !hitems[col].IsHighlight())
+		{
+			hitems[col].Highlight(1);
+			hcol = col;
+			refresh = true;
+		}
+	}
+	else if(mode == GS_POPUP)
+	{
+		if(hcol >= 0)
+			hitems[hcol].Highlight(0);
+		refresh = true;
+		hcol = moveCol;
+	}
+	else if(mode == GS_BORDER)
+	{
+		if(hcol >= 0 && hitems[hcol].IsHighlight())
+		{
+			hitems[hcol].Highlight(0);
+			refresh = true;
+		}
+	}
+	if(refresh)
+		RefreshRow(0, 0, 1);
+}
+
+#ifdef GRIDSQL
+void GridCtrl::FieldLayout(FieldOperator& f)
+{
+	for(int i = 1; i < total_cols; i++)
+	{
+		if(hitems[i].hidden)
+			continue;
+		int id = hitems[i].id;
+		const Id& key = aliases.GetKey(id);
+		f(key, items[vitems[rowidx].id][id].val);
+	}
+}
+
+SqlSet GridCtrl::GetColumnList(bool skip_hidden) const
+{
+	SqlSet s;
+	for(int i = 1; i < total_cols; i++)
+	{
+		if(skip_hidden && hitems[i].hidden)
+			continue;
+		int id = hitems[i].id;
+		s.Cat(SqlId(aliases.GetKey(id)));
+	}
+	return s;
+}
+
+#endif
+
+
+/*----------------------------------------------------------------------------------------*/
+GridFind::GridFind()
+{
+	MultiButton::SubButton& btn = button.AddButton().Main();
+	btn.WhenPush = THISBACK(Push);
+	btn.SetMonoImage(CtrlImg::smallright());
+
+	button.SetStyle(button.StyleFrame());
+	button.NoDisplay();
+	button.AddTo(*this);
+}
+
+bool GridFind::Key(dword key, int count)
+{
+	if(key == K_ENTER && WhenEnter)
+	{
+		WhenEnter();
+		return true;
+	}
+
+	return EditString::Key(key, count);
+}
+
+Size GridFind::GetMinSize() const
+{
+	return button.GetMinSize();
+}
+
+void GridFind::Push()
+{
+	MenuBar::Execute(WhenBar, GetScreenRect().TopRight());
+}
+
+/*----------------------------------------------------------------------------------------*/
+void GridPopUpHeader::Paint(Draw &w)
+{
+	Size sz = GetSize();
+	dword style = chameleon ? GD::CHAMELEON : 0;
+	Font stdfont(StdFont());
+	display->PaintFixed(w, 1, 1, 0, 0, sz.cx, sz.cy,
+		                val, style, stdfont, false, true,
+		                sortmode, sortcol, sortcnt, true);
+}
+
+void GridPopUpHeader::PopUp(Ctrl *owner, int x, int y, int width, int height)
+{
+	SetRect(Rect(x, y, x + width, y + height));
+	if(open)
+		return;
+	Ctrl::PopUp(owner, true, true, GUI_DropShadows());
+	SetAlpha(200);
+	open = true;
+}
+
+void GridPopUpHeader::Close()
+{
+	open = false;
+	Ctrl::Close();
+}
+
+/*----------------------------------------------------------------------------------------*/
+GridButton::GridButton()
+{
+	img = GridImg::CloseN;
+}
+
+void GridButton::Paint(Draw& w)
+{
+	Size sz = GetSize();
+	w.DrawImage(0, 0, sz.cx, sz.cy, img);
+}
+
+void GridButton::LeftDown(Point p, dword flags)
+{
+	img = GridImg::CloseP;
+	Refresh();
+}
+
+void GridButton::LeftUp(Point p, dword flags)
+{
+	img = GridImg::CloseH;
+	Refresh();
+	WhenAction();
+}
+
+void GridButton::MouseEnter(Point p, dword flags)
+{
+	img = flags & K_MOUSELEFT ? GridImg::CloseP : GridImg::CloseH;
+	Refresh();
+}
+
+void GridButton::MouseLeave()
+{
+	img = GridImg::CloseN;
+	Refresh();
+}
+
+void GridButton::State(int reason)
+{
+	if(reason == CLOSE)
+		img = GridImg::CloseN;
+}
+
+Size GridButton::GetStdSize() const
+{
+	return img.GetSize();
+}
+
+GridResizePanel::GridResizePanel()
+{
+	int h = max(16, Draw::GetStdFontCy()) + 5;
+	Height(h);
+	Size csz = close.GetStdSize();
+	Add(close.LeftPos(1, csz.cx).TopPos((h - csz.cy) / 2, csz.cy));
+	minsize.Clear();
+	close.WhenAction = Proxy(WhenClose);
+}
+
+void GridResizePanel::Paint(Draw& w)
+{
+	Size sz = GetSize();
+	w.DrawRect(sz, SColorFace);
+	Size isz = CtrlsImg::SizeGrip().GetSize();
+	w.DrawImage(sz.cx - isz.cx, sz.cy - isz.cy, CtrlsImg::SizeGrip());
+}
+
+bool GridResizePanel::MouseOnGrip(const Point &p)
+{
+	Size isz = CtrlsImg::SizeGrip().GetSize();
+	Size sz = GetSize();
+	return (p.x > sz.cx - isz.cx && p.y > sz.cy - isz.cy);
+}
+
+void GridResizePanel::SetMinSize(Size sz)
+{
+	minsize = sz;
+}
+
+Image GridResizePanel::CursorImage(Point p, dword flags)
+{
+	if(MouseOnGrip(p) || HasCapture())
+		return Image::SizeBottomRight();
+	return Image::Arrow();
+}
+
+void GridResizePanel::LeftDown(Point p, dword flags)
+{
+	if(MouseOnGrip(p))
+	{
+		r = GetParent()->GetScreenRect();
+		pos = GetMousePos();
+		SetCapture();
+	}
+}
+
+void GridResizePanel::LeftUp(Point p, dword flags)
+{
+	ReleaseCapture();
+}
+
+void GridResizePanel::MouseMove(Point p, dword flags)
+{
+	if(HasCapture())
+	{
+		Point curpos = GetMousePos();
+		Point diff = curpos - pos;
+		Rect r(this->r);
+		r.right += diff.x;
+		r.bottom += diff.y;
+		bool setmin = false;
+
+		if(!minsize.IsEmpty())
+		{
+			if(r.right < r.left + minsize.cx)
+			{
+				r.right = r.left + minsize.cx;
+				setmin = true;
+			}
+			if(r.bottom < r.top + minsize.cy)
+			{
+				r.bottom = r.top + minsize.cy;
+				setmin = true;
+			}
+		}
+		if(this->r != r || setmin)
+		{
+			GetParent()->SetRect(r);
+			GetParent()->Sync();
+		}
+	}
+}
+
+/*----------------------------------------------------------------------------------------*/
+
+/* after this assist++ sees nothing */
+
+#define E__Addv0(I)    Set(q, I - 1, p##I)
+#define E__AddF0(I) \
+GridCtrl& GridCtrl::Add(__List##I(E__Value)) { \
+	int q = GetCount(); \
+	__List##I(E__Addv0); \
+	return *this; \
+}
+__Expand(E__AddF0)
+
+#define E__Addv1(I)    Set(q, I - 1, p##I)
+#define E__AddF1(I) \
+GridCtrl::ItemRect& GridCtrl::AddRow(__List##I(E__Value)) { \
+	int q = GetCount(); \
+	ItemRect& ir = AddRow(); \
+	__List##I(E__Addv1); \
+	return ir; \
+}
+__Expand(E__AddF1)
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/GridCtrl/GridCtrl.h b/uppsrc/GridCtrl/GridCtrl.h
new file mode 100644
index 000000000..521d66ea4
--- /dev/null
+++ b/uppsrc/GridCtrl/GridCtrl.h
@@ -0,0 +1,1639 @@
+#ifndef _GridCtrl_GridCtrl_h_
+#define _GridCtrl_GridCtrl_h_
+//#define GRIDSQL
+#include <CtrlLib/CtrlLib.h>
+#ifdef GRIDSQL
+#include <Sql/Sql.h>
+#endif
+
+NAMESPACE_UPP
+
+#include "GridUtils.h"
+#include "GridDisplay.h"
+
+#define FOREACH_ROW(x) for(x.Begin(); x.IsEnd(); x.Next())
+#define FOREACH_SELECTED_ROW(x) FOREACH_ROW(x) if(x.IsSelected())
+#define FOREACH_MODIFIED_ROW(x) FOREACH_ROW(x) if(x.IsUpdatedRow())
+#define FOREACH_ROW_NOT_CURRENT(x) FOREACH_ROW(x) if(!x.IsCurrentRow())
+
+namespace GF
+{
+	enum {
+		SKIP_CURRENT_ROW = BIT(0),
+		SKIP_HIDDEN = BIT(1)
+	};
+};
+
+class GridFind : public EditString
+{
+	private:
+		MultiButtonFrame button;
+	public:
+
+		GridFind();
+
+		Callback WhenEnter;
+		Callback1<Bar &> WhenBar;
+
+		virtual bool Key(dword key, int count);
+		virtual Size GetMinSize() const;
+		void Push();
+
+		typedef GridFind CLASSNAME;
+
+};
+
+class GridPopUpHeader : public Ctrl
+{
+	private:
+		bool open;
+
+	public:
+
+		GridDisplay *display;
+		Value val;
+		int sortmode;
+		int sortcol;
+		int sortcnt;
+		bool chameleon;
+
+		GridPopUpHeader() : open(false) {}
+
+		virtual void Paint(Draw &w);
+		void PopUp(Ctrl *owner, int x, int y, int width, int height);
+		void Close();
+};
+
+class GridButton : public Ctrl
+{
+	private:
+		Image img;
+	public:
+		typedef GridButton CLASSNAME;
+		GridButton();
+		virtual void Paint(Draw& w);
+		virtual void LeftDown(Point p, dword flags);
+		virtual void LeftUp(Point p, dword flags);
+		virtual void MouseEnter(Point p, dword flags);
+		virtual void MouseLeave();
+		virtual void State(int reason);
+		virtual Size GetStdSize() const;
+
+};
+
+class GridResizePanel : public FrameBottom<Ctrl>
+{
+	private:
+		GridButton close;
+		Point pos;
+		Rect r;
+		Size minsize;
+	public:
+
+		typedef GridResizePanel CLASSNAME;
+		GridResizePanel();
+		virtual void Paint(Draw& w);
+		virtual Image CursorImage(Point p, dword flags);
+		virtual void LeftDown(Point p, dword flags);
+		virtual void LeftUp(Point p, dword flags);
+		virtual void MouseMove(Point p, dword flags);
+		bool MouseOnGrip(const Point &p);
+		void SetMinSize(Size sz);
+
+		Callback WhenClose;
+};
+
+class GridPopUp : public Ctrl
+{
+	public:
+
+		bool open;
+		String text;
+
+		GridPopUp() : open(false) {}
+		virtual void Paint(Draw &w);
+		void PopUp(Ctrl *owner, int x, int y, int width, int height);
+		void Close();
+};
+
+class GridOperation
+{
+	public:
+
+		enum
+		{
+			INSERT,
+			UPDATE,
+			REMOVE,
+			NONE
+		};
+
+	private:
+
+		int operation;
+
+	public:
+
+		GridOperation() : operation(NONE) {}
+
+		void SetOperation(int op)
+		{
+			switch(operation)
+			{
+				case NONE: operation = op; break;
+				case UPDATE:
+					if(op == REMOVE || op == NONE)
+						op = NONE;
+					break;
+				case INSERT:
+					if(op == REMOVE || op == NONE)
+						operation = NONE;
+					break;
+			}
+		}
+
+		void Clear() { operation = NONE; }
+
+		GridOperation& operator=(const int op)
+		{
+			SetOperation(op);
+			return *this;
+		}
+
+		operator int()          { return operation;       }
+		bool operator!=(int op) { return operation != op; }
+		bool operator==(int op) { return operation == op; }
+
+};
+
+
+class CtrlsHolder : public Ctrl
+{
+	private:
+		Ctrl &parent;
+		Point offset;
+	public:
+		CtrlsHolder(Ctrl &p) : parent(p)
+		{
+			Transparent();
+		}
+		virtual void  LeftUp(Point p, dword flags)      { parent.LeftUp(p + offset, flags);      }
+		virtual void  LeftDown(Point p, dword flags)    { parent.LeftDown(p + offset, flags);    }
+		virtual void  LeftDouble(Point p, dword flags)  { parent.LeftDouble(p + offset, flags);  }
+		virtual void  RightUp(Point p, dword flags)     { parent.RightUp(p + offset, flags);     }
+		virtual void  RightDown(Point p, dword flags)   { parent.RightDown(p + offset, flags);   }
+		virtual void  RightDouble(Point p, dword flags) { parent.RightDouble(p + offset, flags); }
+		virtual void  MouseMove(Point p, dword flags)   { parent.MouseMove(p + offset, flags);   }
+		virtual void  MouseLeave()                      { parent.MouseLeave();                   }
+	    virtual Image CursorImage(Point p, dword flags) { return parent.CursorImage(p + offset, flags); }
+
+		virtual void ChildMouseEvent(Ctrl *child, int event, Point p, int zdelta, dword keyflags)
+		{
+			Ctrl::ChildMouseEvent(child, event, p, zdelta, keyflags);
+		}
+	    virtual void  Paint(Draw &w)
+		{
+			//DrawFrame(w, GetSize(), Red);
+		}
+
+		virtual void  MouseWheel(Point p, int zdelta, dword keyflags)
+		{
+			parent.MouseWheel(p + offset, zdelta, keyflags);
+		}
+
+		void SetOffset(Point p)
+		{
+			offset = p;
+		}
+};
+
+class GridClipboard : Moveable<GridClipboard>
+{
+	public:
+		struct ClipboardData : Moveable<ClipboardData>
+		{
+			int col, row;
+			Value v;
+			virtual void Serialize(Stream &s)
+			{
+				s % col % row;
+				s % v;
+			}
+		};
+
+		Vector<ClipboardData> data;
+		Point minpos, maxpos;
+		bool shiftmode;
+
+		virtual void Serialize(Stream &s)
+		{
+			s % shiftmode;
+			s % minpos % maxpos;
+			s % data;
+		}
+};
+
+class GridCtrl : public Ctrl
+{
+	friend class DropGrid;
+
+	public:
+
+		static int GD_COL_WIDTH;
+		static int GD_ROW_HEIGHT;
+		static int GD_HDR_HEIGHT;
+		static int GD_IND_WIDTH;
+
+		enum GridOrder
+		{
+			SORT_ID   = 0,
+			SORT_UP   = 1,
+			SORT_DOWN = 2
+		};
+
+	private:
+
+		enum
+		{
+			GO_PREV,
+			GO_NEXT,
+			GO_LEFT,
+			GO_RIGHT,
+			GO_BEGIN,
+			GO_END,
+			GO_PAGEUP,
+			GO_PAGEDN
+		};
+
+		enum
+		{
+			UC_SHOW      = BIT(0),
+			UC_HIDE      = BIT(1),
+			UC_FOCUS     = BIT(2),
+			UC_GOFIRST   = BIT(3),
+			UC_SCROLL    = BIT(4),
+			UC_NEXT      = BIT(5),
+			UC_CTRLS     = BIT(6),
+			UC_CURSOR    = BIT(7),
+			UC_CHECK_VIS = BIT(8),
+			UC_MOUSE     = BIT(9),
+			UC_CTRLS_OFF = BIT(10),
+			UC_UPDATES   = BIT(11),
+			UC_OLDCUR    = BIT(12)
+		};
+
+		enum GridState
+		{
+			GS_UP     = 0,
+			GS_MOVE   = 1,
+			GS_DOWN   = 2,
+			GS_BORDER = 3,
+			GS_POPUP  = 4
+		};
+
+		enum GridEdit
+		{
+			GE_ROW  = 0,
+			GE_CELL = 1
+		};
+
+		struct CurState
+		{
+			bool newx;
+			bool newy;
+			bool accepted;
+			bool valid;
+
+			CurState() : newx(false), newy(false), accepted(false), valid(true) {}
+			bool IsNewRow()   { return newy;         }
+			bool IsNewCol()   { return newx;         }
+			bool IsNew()      { return newx || newy; }
+			bool IsAccepted() { return accepted;     }
+			bool IsValid()    { return valid;        }
+
+			operator bool() { return IsNew() && IsAccepted(); }
+		};
+
+		struct Edit : Moveable<Edit>
+		{
+			Ptr<Ctrl> ctrl;
+			Convert * convert;
+			Callback1<One<Ctrl>&> factory;
+			bool nofactory;
+
+			Edit()
+			{
+				ctrl = NULL;
+				convert = NULL;
+				nofactory = false;
+			}
+		};
+
+		struct Item : Moveable<Item>
+		{
+			friend class ItemRect;
+			friend class GridCtrl;
+
+			Item()
+			{
+				ctrl    = NULL;
+				convert = NULL;
+				display = NULL;
+
+				fs = fe = 0;
+				style = 0;
+				editable = true;
+				clickable = true;
+				idx = 0;
+				idy = 0;
+				cx = 0;
+				cy = 0;
+				group = -1;
+				isjoined = false;
+
+				modified = false;
+				sync_flag = -1;
+				paint_flag = -1;
+			}
+			~Item()
+			{
+				delete ctrl;
+			}
+
+			private:
+
+				bool InvertSelect() { return BitInverse(style, GD::SELECT); }
+				bool IsSelect() { return style & GD::SELECT; }
+				bool IsLive()   { return style & GD::LIVE;   }
+				bool IsCursor() { return style & GD::CURSOR; }
+				bool IsFound()  { return style & GD::FOUND;  }
+
+				void Select(bool s) { BitSet(style, GD::SELECT, s); }
+				void Cursor(bool s) { BitSet(style, GD::CURSOR, s); }
+				void Live(bool s)   { BitSet(style, GD::LIVE, s);   }
+				void Found(bool s)  { BitSet(style, GD::FOUND, s);  }
+
+				bool IsJoined() { return isjoined; }
+
+				int idx, idy, cx, cy, group;
+				bool isjoined:1;
+				int fs, fe;
+				dword style;
+				bool editable:1;
+				bool clickable:1;
+				bool modified:1;
+				int sync_flag;
+				int paint_flag;
+
+				Ptr<Ctrl> ctrl;
+
+				Convert     *convert;
+				GridDisplay *display;
+
+				void SetCtrl(Ctrl * newCtrl);
+				void DropCtrl();
+
+			public:
+				Value val;
+
+				Item& Editable(bool b);
+				Item& NoEditable();
+
+				Item& Clickable(bool b)  { clickable = b;     return *this; }
+				Item& NoClickable()      { clickable = false; return *this; }
+
+		};
+
+		typedef Vector< Vector<Item> > Items;
+		typedef Vector< Edit > Edits;
+
+		class ItemRect : public Moveable<ItemRect>
+		{
+			friend class GridCtrl;
+
+			public:
+				ItemRect()
+				{
+					min = 5; max = 1000000;
+					pos = npos = 0;
+					id  = uid = n = 0;
+					prop = 1;
+					size = nsize = 0;
+					tsize = 0;
+					sortmode = 0;
+					hidden = false;
+					index = false;
+					convertion = true;
+					editable = true;
+					sortable = true;
+					clickable = true;
+					skip = false;
+					ignore_display = false;
+					style = 0;
+
+					calign = 0;
+					sl = sr = st = sb = 0;
+					sx = sy = 0;
+					join = 0;
+
+					ismin = false;
+					ismax = false;
+
+					fnt = Null;
+					balign = halign = GD::LEFT | GD::VCENTER;
+					wrap = false;
+					fg = Null;
+					bg = Null;
+
+					ctrl    = NULL;
+					convert = NULL;
+					display = NULL;
+
+					found = false;
+
+					level = 0;
+
+					operation = GridOperation::NONE;
+				}
+
+			private:
+
+				Items *items;
+				GridCtrl *parent;
+				Edits *edits;
+
+				int level;
+
+				Ptr<Ctrl>   ctrl;
+				Convert     *convert;
+				GridDisplay *display;
+
+				Callback1<One<Ctrl>&> factory;
+
+				static VectorMap<Id, int> *aliases;
+
+				double pos, size, prop;
+				int npos, nsize;
+				int min, max;
+				int id, uid, n;
+				int sl, sr, st, sb, sx, sy;
+
+
+				double tsize;
+				int  join;
+
+				bool hidden;
+				bool index;
+				bool convertion;
+				bool editable;
+				bool sortable;
+				bool clickable;
+				bool found:1;
+				bool skip:1;
+
+				Value defval;
+
+				dword style;
+
+				bool ismin;
+				bool ismax;
+
+				/* operatory typu friend moga odwolywac sie tylko do zmiennych statycznych klasy */
+
+				static int sortCol;
+				static int sortMode;
+
+				int sortcol;
+				int sortmode;
+
+				int balign, halign, calign;
+				bool wrap;
+				Font fnt;
+				Color fg, bg;
+				Image img;
+
+				GridOperation operation;
+
+				bool ignore_display:1;
+
+				double Left(int scroll = 0)    { return pos - scroll;          }
+				double Right(int scroll = 0)   { return pos + size - scroll;   }
+				double Top(int scroll = 0)     { return pos - scroll;          }
+				double Bottom(int scroll = 0)  { return pos + size - scroll;   }
+				double Width()                 { return size; 				   }
+				double Height()                { return size;				   }
+
+				bool   InvertSelect()          { return BitInverse(style, GD::SELECT); }
+				bool   IsSelect()              { return style & GD::SELECT;    }
+				bool   IsLive()                { return style & GD::LIVE;      }
+				bool   IsCursor()              { return style & GD::CURSOR;    }
+				bool   IsHighlight()           { return style & GD::HIGHLIGHT; }
+
+				bool   IsFound()               { return found;                 }
+
+				void   Select(bool s)          { BitSet(style, GD::SELECT, s);    }
+				void   Cursor(bool s)          { BitSet(style, GD::CURSOR, s);    }
+				void   Live(bool s)            { BitSet(style, GD::LIVE, s);      }
+				void   Highlight(bool s)       { BitSet(style, GD::HIGHLIGHT, s); }
+
+				int    nLeft(int scroll = 0)   { return npos - scroll;         }
+				int    nRight(int scroll = 0)  { return npos + nsize - scroll; }
+				int    nTop(int scroll = 0)    { return npos - scroll;         }
+				int    nBottom(int scroll = 0) { return npos + nsize - scroll; }
+				int    nWidth()                { return nsize; 				   }
+				int    nHeight()               { return nsize;				   }
+
+				ItemRect& Size(int n);
+
+				bool IsMin()   { return ismin; }
+				bool IsMax()   { return ismax; }
+				bool IsFixed() { return ismin && ismax; }
+
+				void ChangeSortMode(bool idsort = true);
+
+				friend bool operator<(const ItemRect& a, const ItemRect& b)
+				{
+					if(sortMode)
+						return (StdValueCompare((*a.items)[a.id][sortCol].val, (*b.items)[b.id][sortCol].val, 0) < 0);
+					else
+						return a.id < b.id;
+				}
+				friend bool operator>(const ItemRect& a, const ItemRect& b)
+				{
+					if(sortMode)
+						return (StdValueCompare((*a.items)[a.id][sortCol].val, (*b.items)[b.id][sortCol].val, 0) > 0);
+					else
+						return a.id > b.id;
+				}
+
+				Callback1<int> SyncCtrls;
+
+			public:
+
+				ItemRect& Alias(Id id);
+				ItemRect& Alias(const char * s);
+				ItemRect& Name(String &s);
+				ItemRect& Name(const char * s);
+				ItemRect& Hidden(bool b = true);
+				ItemRect& Width(int n);
+				ItemRect& Height(int n);
+				ItemRect& Min(int n);
+				ItemRect& Max(int n);
+				ItemRect& Fixed(int n);
+				ItemRect& FixedAuto();
+				ItemRect& Edit(Ctrl &ctrl);
+				template<typename T>
+				ItemRect& EditConvert(T &ctrl)                   { return Edit(ctrl).SetConvert(ctrl); }
+				template<typename T>
+				ItemRect& EditConvertDisplay(T &ctrl)            { return Edit(ctrl).SetConvert(ctrl).SetDisplay(ctrl); }
+				ItemRect& SetConvert(Convert &c);
+				ItemRect& NoConvert();
+				ItemRect& SetFormat(const char *fmt);
+				ItemRect& SetDisplay(GridDisplay &gd);
+				ItemRect& IgnoreDisplay();
+				ItemRect& NoConvertion();
+				ItemRect& Default(Value v);
+				ItemRect& Index(bool b = true);
+
+				String GetName() const;
+
+				ItemRect& AlignTop()                             { balign = GD::TOP     | GD::LEFT;                return *this; }
+				ItemRect& AlignBottom()                          { balign = GD::BOTTOM  | GD::LEFT;                return *this; }
+				ItemRect& AlignLeft()                            { balign = GD::LEFT    | GD::VCENTER;             return *this; }
+				ItemRect& AlignRight()                           { balign = GD::RIGHT   | GD::VCENTER;             return *this; }
+				ItemRect& AlignTopLeft()                         { balign = GD::LEFT    | GD::TOP;                 return *this; }
+				ItemRect& AlignTopRight()                        { balign = GD::RIGHT   | GD::TOP;                 return *this; }
+				ItemRect& AlignTopCenter()                       { balign = GD::HCENTER | GD::TOP;                 return *this; }
+				ItemRect& AlignCenterLeft()                      { balign = GD::VCENTER | GD::LEFT;                return *this; }
+				ItemRect& AlignCenterRight()                     { balign = GD::VCENTER | GD::RIGHT;               return *this; }
+				ItemRect& AlignCenter()                          { balign = GD::HCENTER | GD::VCENTER;             return *this; }
+				ItemRect& AlignBottomLeft()                      { balign = GD::LEFT    | GD::BOTTOM;              return *this; }
+				ItemRect& AlignBottomRight()                     { balign = GD::RIGHT   | GD::BOTTOM;              return *this; }
+				ItemRect& AlignBottomCenter()                    { balign = GD::HCENTER | GD::BOTTOM;              return *this; }
+
+				ItemRect& HeaderAlignTop()                       { halign = GD::TOP     | GD::LEFT;                return *this; }
+				ItemRect& HeaderAlignBottom()                    { halign = GD::BOTTOM  | GD::LEFT;                return *this; }
+				ItemRect& HeaderAlignLeft()                      { halign = GD::LEFT    | GD::VCENTER;             return *this; }
+				ItemRect& HeaderAlignRight()                     { halign = GD::RIGHT   | GD::VCENTER;             return *this; }
+				ItemRect& HeaderAlignTopLeft()                   { halign = GD::LEFT    | GD::TOP;                 return *this; }
+				ItemRect& HeaderAlignTopRight()                  { halign = GD::RIGHT   | GD::TOP;                 return *this; }
+				ItemRect& HeaderAlignTopCenter()                 { halign = GD::HCENTER | GD::TOP;                 return *this; }
+				ItemRect& HeaderAlignCenterLeft()                { halign = GD::VCENTER | GD::LEFT;                return *this; }
+				ItemRect& HeaderAlignCenterRight()               { halign = GD::VCENTER | GD::RIGHT;               return *this; }
+				ItemRect& HeaderAlignCenter()                    { halign = GD::HCENTER | GD::VCENTER;             return *this; }
+				ItemRect& HeaderAlignBottomLeft()                { halign = GD::LEFT    | GD::BOTTOM;              return *this; }
+				ItemRect& HeaderAlignBottomRight()               { halign = GD::RIGHT   | GD::BOTTOM;              return *this; }
+				ItemRect& HeaderAlignBottomCenter()              { halign = GD::HCENTER | GD::BOTTOM;              return *this; }
+
+				ItemRect& CtrlAlignTop(int t = 0, int s = 0)     { calign |= GD::TOP;     st = t; sy = s;         return *this; }
+				ItemRect& CtrlAlignBottom(int b = 0, int s = 0)  { calign |= GD::BOTTOM;  sb = b; sy = s;         return *this; }
+				ItemRect& CtrlAlignLeft(int l = 0, int s = 0)    { calign |= GD::LEFT;    sl = l; sx = s;         return *this; }
+				ItemRect& CtrlAlignRight(int r = 0, int s = 0)   { calign |= GD::RIGHT;   sr = r; sx = s;         return *this; }
+				ItemRect& CtrlAlignHorzCenter(int s = 0)         { calign |= GD::HCENTER; sx = s;                 return *this; }
+				ItemRect& CtrlAlignVertCenter(int s = 0)         { calign |= GD::VCENTER; sy = s;                 return *this; }
+				ItemRect& CtrlAlignCenter(int s = 0, int d = 0)  { calign |= GD::VCENTER | GD::HCENTER; sx = s; sy = d; return *this; }
+				ItemRect& CtrlAlignHorzPos(int l = 0, int r = 0) { calign |= GD::HPOS;    sl = l; sr = r; sx = 1; return *this; }
+				ItemRect& CtrlAlignVertPos(int t = 0, int b = 0) { calign |= GD::VPOS;    st = t; sb = b; sy = 1; return *this; }
+
+				int       GetAlign() const                       { return balign; }
+				int       GetHeaderAlign() const                 { return halign; }
+				int       GetCtrlAlign() const                   { return calign; }
+
+				ItemRect& WrapText()                             { wrap = true; return *this; }
+
+				ItemRect& SetFont(Font &f)                       { fnt = f; return *this; }
+				ItemRect& Bg(Color c)                            { bg = c;  return *this; }
+				ItemRect& Fg(Color c)                            { fg = c;  return *this; }
+				ItemRect& SetImage(const Image& i)               { img = i; return *this; }
+				ItemRect& ClearImage()                           { img = Null; return *this;}
+				ItemRect& Ctrls(Callback1<One<Ctrl>&> _factory)	 { (*edits)[id].factory = _factory; return *this; }
+				ItemRect& Ctrls(void (*factory)(One<Ctrl>&))     { return Ctrls(callback(factory)); }
+				template<class T> ItemRect&  Ctrls()             { return Ctrls(DefaultCtrlFactory<T>()); }
+				ItemRect& NoCtrls()                              { (*edits)[id].nofactory = true; return *this; }
+				ItemRect& Option();
+
+				ItemRect& Editable(bool b);
+				ItemRect& NoEditable();
+
+				ItemRect& Sortable(bool b)                       { sortable = b;      return *this; }
+				ItemRect& NoSortable()                           { sortable = false;  return *this; }
+
+				ItemRect& Clickable(bool b)                      { clickable = b;     return *this; }
+				ItemRect& NoClickable()                          { clickable = false; return *this; }
+
+				ItemRect& Skip(bool b)                           { skip = b;          return *this; }
+
+				int  GetId()                                     { return id;                       }
+				int  GetNumber()                                 { return id - parent->fixed_cols;  }
+
+				bool IsConvertion() const                        { return convertion; }
+				bool IsHidden() const                            { return hidden;     }
+
+				void Serialize(Stream &s);
+				void Clear();
+		};
+
+		typedef Vector<ItemRect> RectItems;
+		typedef Vector<ItemRect> VItems;
+		typedef Vector<ItemRect> HItems;
+
+		typedef GridCtrl CLASSNAME;
+
+		Items  items;
+		HItems hitems;
+		VItems vitems;
+
+		Vector<Value> rowbkp;
+
+		VectorMap<Id, int> aliases;
+		Edits edits;
+
+		CtrlsHolder holder;
+
+		ScrollBar      sbx;
+		ScrollBar      sby;
+		ToolBar        bar;
+
+		GridResizePanel resize_panel;
+		GridPopUp popup;
+
+		bool resize_panel_open:1;
+
+		GridFind find;
+		Label info;
+		Button close;
+
+		GridDisplay *display;
+		GridDisplay *orgdisp;
+
+		/* Properties */
+
+		bool select_row:1;
+		bool multi_select:1;
+		bool indicator:1;
+		bool resizing_cols:1;
+		bool resizing_rows:1;
+		bool moving_cols:1;
+		bool moving_rows:1;
+		bool resizing_fixed_cols:1;
+		bool resizing_fixed_rows:1;
+		bool dragging:1;
+		bool horz_grid:1;
+		bool vert_grid:1;
+		bool draw_last_horz_line:1;
+		bool draw_last_vert_line:1;
+		bool sorting:1;
+		bool sorting_multicol:1;
+		bool header:1;
+		bool live_cursor:1;
+		bool ctrlRowMode:1;
+		bool ctrlColMode:1;
+		bool row_changing:1;
+		int  coloringMode;
+
+		int  resize_paint_mode;
+		int  resize_col_mode;
+		int  resize_row_mode;
+		int  edit_mode;
+		bool one_click_edit:1;
+
+		bool inserting:1;
+		bool appending:1;
+		bool duplicating:1;
+		bool removing:1;
+		bool accepting:1;
+		bool canceling:1;
+		bool moving:1;
+		bool navigating:1;
+		bool searching:1;
+		bool closing:1;
+		bool editing:1;
+		bool edits_in_new_row:1;
+		bool hiding:1;
+		bool clipboard:1;
+		bool extra_paste:1;
+		bool fixed_paste:1;
+		bool draw_focus:1;
+		bool cancel_all:1;
+		bool ask_remove:1;
+
+		bool reject_null_row:1;
+		bool tab_changes_row:1;
+		bool tab_adds_row:1;
+		bool enter_like_tab:1;
+		bool keep_last_row:1;
+		bool remove_hides:1;
+
+		bool full_col_resizing:1;
+		bool full_row_resizing:1;
+
+		bool chameleon:1;
+
+		bool search_hide:1;
+		bool search_highlight:1;
+		bool search_highlight_first:1;
+		bool search_immediate:1;
+		bool search_case:1;
+		bool search_move_cursor:1;
+		bool search_display:1;
+		int  find_offset;
+
+		/* States */
+
+		bool newrow_inserted:1;
+		bool newrow_appended:1;
+		int  row_modified;
+		bool row_removed:1;
+		bool sel_begin:1;
+		bool sel_end:1;
+		bool moving_header:1;
+		bool moving_body:1;
+		bool moving_allowed:1;
+		bool row_order:1;
+		bool row_data:1;
+		bool scrollLeftRight:1;
+		bool doscroll:1;
+		bool ready:1;
+		bool ctrls:1;
+		bool genr_ctrls:1;
+		bool edit_ctrls:1;
+		bool shiftmode:1;
+		bool recalc_cols;
+		bool recalc_rows;
+		bool cancel_update_cell:1;
+		bool cancel_update:1;
+		bool cancel_insert:1;
+		bool cancel_remove:1;
+		bool cancel_accept:1;
+		bool cancel_cursor:1;
+		bool mouse_move:1;
+		bool is_clipboard:1;
+		bool selecting:1;
+		bool enabled:1;
+
+		bool call_whenchangecol:1;
+		bool call_whenchangerow:1;
+		bool call_whenremoverow:1;
+		bool call_whenupdaterow:1;
+		bool call_wheninsertrow:1;
+
+		bool resizing;
+		bool fixed_click;
+		bool fixed_top_click;
+		bool fixed_left_click;
+		bool fixed_size_changed;
+		bool top_click;
+		bool just_clicked;
+		bool synced;
+
+		bool valid_cursor;
+
+
+		/* Values */
+
+		int  curSplitCol, curSplitRow;
+		int  firstRow,    lastRow;
+		int  firstCol,    lastCol;
+		int  firstVisCol, lastVisCol;
+		int  firstVisRow, lastVisRow;
+		int  moveCol,     oldMoveCol;
+		int  moveRow,     oldMoveRow;
+		int  total_cols,  total_rows;
+		int  fixed_cols,  fixed_rows;
+		int  total_width, total_height;
+		int  fixed_width, fixed_height;
+
+		int  selected_rows;
+		int  selected_items;
+		int  colidx;
+		int  rowidx;
+		int  bains;
+		int  coluid;
+		int  rowuid;
+		int  rowfnd;
+
+		int  bkp_rowidx;
+
+		int  minRowSelected;
+		int  maxRowSelected;
+
+		int  sc_fr;
+		int  sc_lr;
+
+		int  join_group;
+
+		int  sync_flag;
+		int  paint_flag;
+
+		/* Points */
+
+		Point oldpos;
+		Point curpos;
+		Point oldcur;
+		Point curid;
+		Point livecur;
+		Point ctrlpos;
+		Point ctrlid;
+		Point shiftpos;
+		Point leftpnt;
+		Size  osz;
+
+		/* Others */
+
+		Ctrl * focused_ctrl;
+		int    focused_ctrl_id;
+		Value  focused_ctrl_val;
+		int    focused_col;
+
+		WString search_string;
+
+		bool curResizeCol;
+		bool curResizeRow;
+
+		bool resizeCol;
+		bool resizeRow;
+
+		int splitCol, splitRow;
+		int firstColPos, firstRowPos;
+		int hcol, hrow;
+		int dx, dy;
+
+		GridPopUpHeader pophdr;
+
+		int sortCol;
+
+//		struct SortColumn {
+//			SortColumn(int c, bool f) : col(c), fixed(f) {}
+//			int col;
+//			bool fixed;
+//		};
+//
+//		Vector<SortColumn> sortOrder;
+		Vector<int> sortOrder;
+
+	public:
+
+		/* Colors */
+
+		Color fg_focus,  bg_focus;
+		Color fg_select, bg_select;
+		Color fg_live,   bg_live;
+		Color fg_found,  bg_found;
+		Color fg_even,   bg_even;
+		Color fg_odd,    bg_odd;
+		Color fg_grid;
+
+
+	public:
+		GridCtrl();
+		~GridCtrl();
+
+		/* Properties */
+		GridCtrl& HorzGrid(bool b = true) 	      { horz_grid           = b; return *this; }
+		GridCtrl& VertGrid(bool b = true) 	      { vert_grid           = b; return *this; }
+		GridCtrl& DrawLastHorzLine(bool b = true) { draw_last_horz_line = b; return *this; }
+		GridCtrl& DrawLastVertLine(bool b = true) { draw_last_vert_line = b; return *this; }
+		GridCtrl& MultiSelect(bool b = true)      { multi_select        = b; return *this; }
+		GridCtrl& ResizingCols(bool b = true) 	  { resizing_cols       = b; return *this; }
+		GridCtrl& ResizingRows(bool b = true) 	  { resizing_rows       = b; return *this; }
+		GridCtrl& MovingCols(bool b = true)   	  { moving_cols         = b; return *this; }
+		GridCtrl& MovingRows(bool b = true)   	  { moving_rows         = b; return *this; }
+		GridCtrl& Dragging(bool b = true)         { dragging            = b; return *this; }
+		GridCtrl& ResizePaintMode(int m = 0) 	  { resize_paint_mode   = m; return *this; }
+		GridCtrl& LiveCursor(bool b = true)   	  { live_cursor         = b; return *this; }
+		GridCtrl& Sorting(bool b = true)      	  { sorting             = b; return *this; }
+		GridCtrl& MultiSorting(bool b = true) 	  { sorting_multicol    = b; return *this; }
+		GridCtrl& Header(bool b = true)           { header              = b; return *this; }
+		GridCtrl& EditMode(int m)      			  { edit_mode           = m; return *this; }
+		GridCtrl& EditRow()         			  { edit_mode           = GE_ROW;  return *this; }
+		GridCtrl& EditCell()         			  { edit_mode           = GE_CELL; return *this; }
+		GridCtrl& OneClickEdit(bool b = true)     { one_click_edit      = b; return *this; }
+		GridCtrl& Absolute()					  { return ResizeColMode(0);               }
+		GridCtrl& Proportional()				  { return ResizeColMode(1);               }
+		GridCtrl& SelectRow(bool b = true)        { select_row          = b; return *this; }
+		GridCtrl& AutoHideHorzSb(bool b = true)   { sbx.AutoHide(b);         return *this; }
+		GridCtrl& AutoHideVertSb(bool b = true)   { sby.AutoHide(b);         return *this; }
+		GridCtrl& AutoHideSb(bool b = true)       { sbx.AutoHide(b);
+		                                            sby.AutoHide(b);         return *this; }
+
+		GridCtrl& ResizeColMode(int m = 0);
+		GridCtrl& ResizeRowMode(int m = 0);
+
+		GridCtrl& Indicator(bool b = true, int size = GD_IND_WIDTH);
+
+		GridCtrl& GridColor(Color fg = SColorShadow);
+		GridCtrl& FocusColor(Color fg = SColorHighlightText, Color bg = SColorHighlight);
+		GridCtrl& LiveColor(Color fg = SColorText, Color bg = SColorHighlight);
+		GridCtrl& OddColor(Color fg = SColorText, Color bg = SColorInfo);
+		GridCtrl& EvenColor(Color fg = SColorText, Color bg = Blend(SColorHighlight, SColorPaper, 220));
+		GridCtrl& ColoringMode(int m);
+
+		GridCtrl& ColorRows(bool b = true) { return ColoringMode(2 * b).EvenColor(); }
+		GridCtrl& ColorCols(bool b = true) { return ColoringMode(1 * b).EvenColor(); }
+
+
+		GridCtrl& SetDefaultRowHeight(int h)    { GD_ROW_HEIGHT = h; sby.SetLine(h); return *this; }
+		GridCtrl& SetColWidth(int n, int width, bool recalc = true);
+		GridCtrl& SetRowHeight(int n, int height, bool recalc = true);
+		GridCtrl& SetColsMin(int size);
+		GridCtrl& SetColsMax(int size);
+
+		int GetDefaultRowHeight() { return GD_ROW_HEIGHT; }
+
+		GridCtrl& Inserting(bool b = true)        { inserting         = b;  return *this; }
+		GridCtrl& Appending(bool b = true)        { appending         = b;  return *this; }
+		GridCtrl& Duplicating(bool b = true)      { duplicating       = b;  return *this; }
+		GridCtrl& Moving(bool b = true)           { moving            = b;  return *this; }
+		GridCtrl& Removing(bool b = true)         { removing          = b;  return *this; }
+		GridCtrl& Accepting(bool b = true)        { accepting         = b;  return *this; }
+		GridCtrl& Canceling(bool b = true)        { canceling         = b;  return *this; }
+		GridCtrl& Navigating(bool b = true)       { navigating        = b;  return *this; }
+		GridCtrl& Searching(bool b = true)        { searching         = b;  return *this; }
+		GridCtrl& Closing(bool b = true)          { closing           = b;  return *this; }
+		GridCtrl& Editing(bool b = true)          { editing           = b;  return *this; }
+		GridCtrl& EditsInNewRow(bool b = true)    { edits_in_new_row  = b;  return *this; }
+		GridCtrl& Hiding(bool b = true)           { hiding            = b;  return *this; }
+		GridCtrl& Clipboard(bool b = true)        { clipboard         = b;  return *this; }
+		GridCtrl& ExtraPaste(bool b = true)       { extra_paste       = b;  return *this; }
+		GridCtrl& FixedPaste(bool b = true)       { fixed_paste       = b;  return *this; }
+		GridCtrl& AskRemove(bool b = true)        { ask_remove        = b;  return *this; }
+		GridCtrl& RowChanging(bool b = true)      { row_changing      = b;  return *this; }
+
+		GridCtrl& DrawFocus(bool b = true)        { draw_focus        = b;  return *this; }
+		GridCtrl& CancelAll(bool b = true)        { cancel_all        = b;  return *this; }
+
+		GridCtrl& RejectNullRow(bool b = true)    { reject_null_row   = b;  return *this; }
+		GridCtrl& KeepLastRow(bool b = true)      { keep_last_row     = b;  return *this; }
+		GridCtrl& RemoveHides(bool b = true)      { remove_hides      = b;  return *this; }
+		GridCtrl& TabChangesRow(bool b = true)    { tab_changes_row   = b;  return *this; }
+		GridCtrl& TabAddsRow(bool b = true)       { tab_adds_row      = b;  return *this; }
+		GridCtrl& EnterLikeTab(bool b = true)     { enter_like_tab    = b;  return *this; }
+		GridCtrl& FullColResizing(bool b = true)  { full_col_resizing = b;  return *this; }
+		GridCtrl& FullRowResizing(bool b = true)  { full_row_resizing = b;  return *this; }
+		GridCtrl& Chameleon(bool b = true)        { chameleon         = b;  return *this; }
+
+		GridCtrl& SearchOffset(int offset)        { find_offset = offset;   return *this; }
+		GridCtrl& SearchMoveCursor(bool b = true) { search_move_cursor = b; return *this; }
+		GridCtrl& SearchImmediate(bool b = true)  { search_immediate = b;   return *this; }
+		GridCtrl& SearchHideRows(bool b = true)   { search_hide = b;        return *this; }
+		GridCtrl& SearchDisplay(bool b = true)    { search_display = b;     return *this; }
+
+		GridCtrl& SetToolBar(bool b = true, int align = BarCtrl::BAR_BOTTOM, int frame = 1);
+		ToolBar&  GetToolBar() { return bar; }
+
+		GridCtrl& ResizePanel(bool b = true);
+
+		GridCtrl& BeforeAfterInserting()     { bains = 1; return *this; }
+		GridCtrl& AfterBeforeInserting()     { bains = 2; return *this; }
+
+		GridCtrl& HideColumn(int n = -1, bool refresh = true);
+		GridCtrl& ShowColumn(int n, bool refresh = true);
+
+		GridCtrl& HideRow(int n = -1, bool refresh = true);
+		GridCtrl& ShowRow(int n, bool refresh = true);
+
+		void MenuHideColumn(int n);
+
+		void HideRows(bool repaint = false);
+		void ShowRows(bool repaint = false);
+
+		/* Virutals */
+
+		virtual void Paint(Draw &w);
+		virtual void MouseMove(Point p, dword keyflags);
+		virtual void LeftDown(Point p, dword keyflags);
+		virtual void LeftUp(Point p, dword keyflags);
+	    virtual void LeftDouble(Point p, dword keyflags);
+	    virtual void LeftRepeat(Point p, dword keyflags);
+	    virtual void RightDown(Point p, dword keyflags);
+		virtual void Layout();
+	    virtual void MouseLeave();
+	    virtual bool Key(dword key, int);
+		virtual void GotFocus();
+		virtual void LostFocus();
+		virtual void ChildGotFocus();
+		virtual void ChildLostFocus();
+		virtual void MouseWheel(Point p, int zdelta, dword keyflags);
+	    virtual Image CursorImage(Point p, dword);
+	    virtual void State(int reason);
+	    virtual void ChildMouseEvent(Ctrl *child, int event, Point p, int zdelta, dword keyflags);
+		virtual void ChildFrameMouseEvent(Ctrl *child, int event, Point p, int zdelta, dword keyflags);
+		virtual bool Accept();
+		virtual void Reject();
+
+		virtual void DragAndDrop(Point p, PasteClip& d);
+
+		void ChildAction(Ctrl *child, int event);
+		void RestoreFocus();
+
+		/* Methods */
+
+		ItemRect& InsertColumn(int pos, const char *name = NULL, int size = GD_COL_WIDTH, bool idx = false);
+		ItemRect& AddColumn(const Id id, const char *name = NULL, int size = GD_COL_WIDTH, bool idx = false);
+		ItemRect& AddColumn(const String& name, int size = GD_COL_WIDTH, bool idx = false);
+		ItemRect& AddColumn(const char *name = NULL, int size = GD_COL_WIDTH, bool idx = false);
+
+		void RemoveColumn(int n, int count = 1);
+
+		ItemRect& AddHiddenColumn()                 { return AddColumn(0, 0);    }
+		ItemRect& AddHiddenColumn(const char *name) { return AddColumn(name, 0); }
+		ItemRect& AddHiddenColumn(String &name)     { return AddColumn(name, 0); }
+
+		ItemRect& AddIndex()                        { return AddColumn(0, 0, true);    }
+		ItemRect& AddIndex(Id id)                   { return AddColumn(id, ~id, 0, true); }
+		ItemRect& AddIndex(const char *name)        { return AddColumn(name, 0, true); }
+		ItemRect& AddIndex(String &name)            { return AddColumn(name, 0, true); }
+
+		ItemRect& AddRow(int n = 1, int size = GD_ROW_HEIGHT);
+		GridCtrl& Add() { AddRow(); return *this; }
+
+		//$-GridCtrl& Add(const Value& [, const Value& ]...);
+		#define  E__Add(I)      GridCtrl& Add(__List##I(E__Value));
+			__Expand(E__Add)
+		#undef   E__Add
+		//$+
+
+		//$-ItemRect& AddRow(const Value& [, const Value& ]...);
+		#define  E__Add(I)      ItemRect& AddRow(__List##I(E__Value));
+			__Expand(E__Add)
+		#undef   E__Add
+		//$+
+
+		GridCtrl& AddSeparator(Color c);
+
+		int       GetColumnCount() const      { return total_cols - fixed_cols; }
+		int       GetFixedColumnCount() const { return fixed_cols;              }
+
+		ItemRect& GetColumn(int n);
+		ItemRect& GetColumn();
+		ItemRect& GetRow(int n);
+		ItemRect& GetRow();
+		Item&     GetCell(int n, int m);
+		Item&     GetCell(int n, Id id);
+
+		bool IsColumn(const Id& id);
+
+		int  GetCurrentRow() const;
+		bool IsCurrentRow() const;
+		void RestoreCurrentRow();
+
+		int GetWidth(int n = -1);
+		int GetHeight(int n = -1);
+		int GetFixedWidth();
+		int GetFixedHeight();
+
+		void Set(int r, int c, const Value &val);
+		void Set(int r, Id id, const Value &val);
+		void Set(int r, const char *s, const Value &val);
+		void Set(int c, const Value &val);
+		void Set(Id id, const Value &val);
+		void Set(int r, const Vector<Value> &v, int data_offset = 0, int column_offset = 0);
+		void Set(const Vector<Value> &v, int data_offset = 0, int column_offset = 0);
+
+		void SetCtrlValue(int r, int c, const Value &val);
+		void SetCtrlValue(int c, const Value &val);
+
+		void   SetLast(int c, const Value &val);
+		void   SetFixed(int r, int c, const Value &val);
+		Value  GetFixed(int r, int c) const;
+		Value  GetFixed(int c) const;
+		Value  Get(int r, int c) const;
+		Value  Get(int c) const;
+		Value  Get(Id id) const;
+		Value  Get(int r, Id id) const;
+		Value  Get() const;
+		Value  Get(const char * alias) const;
+		Value  Get(int r, const char * alias) const;
+		Value  GetNew(int c) const;
+		Value  GetFirst(int c) const;
+		Value  GetLast(int c) const;
+		Value& operator() (int r, int c);
+		Value& operator() (int c);
+		Value& operator() (Id id);
+		Value& operator() (int r, Id id);
+		Value& operator() (const char * alias);
+		Value& operator() (int r, const char * alias);
+
+		using Ctrl::IsModified;
+
+		bool IsModified(int r, int c);
+		bool IsModified(int c);
+		bool IsModified(int r, Id id);
+		bool IsModified(Id id);
+
+		/* valid only in callbacks */
+
+		bool IsNewRow()         { return newrow_inserted || newrow_appended; }
+		bool IsNewRowInserted() { return newrow_inserted; }
+		bool IsNewRowAppended() { return newrow_appended; }
+		bool IsModifiedRow()    { return row_modified > 0; }
+		void CommitNewRow()     { newrow_inserted = newrow_appended = false; }
+
+		bool IsUpdatedRow()     { return vitems[rowidx].operation == GridOperation::UPDATE; }
+		bool IsInsertedRow()    { return vitems[rowidx].operation == GridOperation::INSERT; }
+		bool IsRemovedRow()     { return vitems[rowidx].operation == GridOperation::REMOVE; }
+		int  GetRowOperation()  { return vitems[rowidx].operation;                          }
+
+		Vector<Value> ReadRow(int n = -1) const;
+		GridCtrl& Add(const Vector<Value> &v, int offset = 0, int count = -1);
+
+		void SetFixedRows(int n = 1);
+		void SetFixedCols(int n = 1);
+
+		static int GetStdRowHeight() { return GD_ROW_HEIGHT; }
+
+		void RefreshRow(int n = -1, bool relative = true, bool fixed = false);
+		void RefreshCol(int n = -1, bool relative = true, bool fixed = false);
+		void RefreshRows(int from, int to, bool relative = true, bool fixed = false);
+		void RefreshItem(int r, int c, bool relative = true);
+		void RefreshNewRow();
+		void RefreshFrom(int from);
+
+		void RefreshTop();
+		void RefreshLeft();
+
+		void Repaint(bool recalc_cols = false, bool recalc_rows = false);
+		void Ready(bool b);
+
+		int  GetMouseRow(Point &p, bool relative = true, bool fixed = false, bool full = true);
+		int  GetMouseCol(Point &p, bool relative = true, bool fixed = false, bool full = true);
+
+		void UpdateCursor();
+
+		int Find(const Value &v, int col = 0, int start_from = 0, int opt = 0) const;
+		int Find(const Value &v, Id id, int opt = 0) const;
+		int Find(const Value &v0, Id id0, const Value &v1, Id id1, int opt = 0) const;
+		int FindCurrent(Id id, int opt = GF::SKIP_CURRENT_ROW) const;
+		int FindCurrent(Id id0, Id id1, int opt = GF::SKIP_CURRENT_ROW) const;
+
+		int FindInRow(const Value& v, int row = 0, int start_from = 0) const;
+
+		GridDisplay& GetDisplay() { return *display; }
+		GridCtrl&    SetDisplay(GridDisplay &gd) { display = &gd; return *this; }
+
+		bool IsEdit()  { return ctrls; }
+		bool StartEdit(bool mouse = false);
+		bool SwitchEdit();
+		bool EndEdit(bool accept = true, bool doall = false, bool remove_row = true);
+		bool CancelEdit(bool remove_row = true) { return EndEdit(false, false, remove_row); }
+
+		int  Append(int cnt = 1, bool refresh = true, int height = GD_ROW_HEIGHT);
+		void Insert(int i, int cnt = 1);
+		void Remove(int i = -1, int cnt = 1);
+		void RemoveFirst(int cnt = 1);
+		void RemoveLast(int cnt = 1);
+		void Duplicate(int i, int cnt = 1);
+
+		void CancelRemove()     { cancel_remove      = true; }
+		void CancelUpdate()     { cancel_update      = true; }
+		void CancelInsert()     { cancel_insert      = true; }
+		void CancelUpdateCell() { cancel_update_cell = true; }
+		void CancelAccept()     { cancel_accept      = true; }
+		void CancelCursor()     { cancel_cursor      = true; }
+
+		void ClearCursor(bool remove = false);
+		void ClearRow(int r = -1, int column_offset = 0);
+		void Clear(bool columns = false);
+		void Reset();
+
+		void Begin();
+		void Next();
+		void Prev();
+		void End();
+		bool IsEnd();
+
+		bool IsFirst();
+		bool IsLast();
+		bool IsNext();
+		bool IsPrev();
+
+		int  SetCursor(int n);
+		void SetCursor(const Point& p);
+		int  SetCursorId(int n);
+		int  GetCursor(bool rel = false) const;
+		int  GetPrevCursor(bool rel = false) const;
+		int  GetCursor(int uid) const;
+		Point GetCursorPos() const;
+		void CenterCursor();
+		bool IsCursor() const      { return valid_cursor; }
+		bool IsCursorBegin() const { return curpos.y == fixed_rows; }
+		bool IsCursorEnd() const   { return curpos.y == total_rows - 1; }
+
+		int  GetNewRowPos();
+		int  GetNewRowId();
+		int  GetRemovedRowPos();
+
+		int  GetCursorId() const { return GetCursor(true); }
+		int  GetPrevCursorId() const { return GetPrevCursor(true); }
+		int  GetColId() const;
+		int  GetRowId() const;
+		int  GetColId(int n) const;
+		int  GetRowId(int n) const;
+		int  GetColUId() const;
+		int  GetRowUId() const;
+		int  FindCol(int id) const;
+		int  FindRow(int id) const;
+
+		int  GetNextRow(int n);
+		int  GetPrevRow(int n);
+
+		bool GoBegin(bool scroll = true);
+		bool GoEnd(bool scroll = true, bool goleft = false);
+		bool GoNext(bool scroll = true);
+		bool GoPrev(bool scroll = true);
+		bool GoLeft(bool scroll = true, bool ctrlmode = false);
+		bool GoRight(bool scroll = true, bool ctrlmode = false);
+		bool GoPageUp(bool scroll = true);
+		bool GoPageDn(bool scroll = true);
+		bool GoFirstVisible(bool scroll = true);
+		void GoTo(int r, bool setcursor = true, bool scroll = true);
+		void GoTo(int r, int c, bool setcursor = true, bool scroll = true);
+		bool GoTop() { return GoBegin(); }
+
+		void SwapCols(int n, int m);
+		bool SwapRows(int n, int m, bool repaint = true);
+
+		void SwapUp(int cnt = 1);
+		void SwapDown(int cnt = 1);
+
+		bool CanMoveCol(int n, int m);
+
+		void MoveCol(int n, int m);
+		bool MoveRow(int n, int m, bool repaint = true);
+
+		void MoveRows(int n, bool onerow = false);
+
+		int  GetCount() const;
+		int  GetRowCount() const { return GetCount(); }
+		int  GetFixedCount() const;
+		int  GetTotalCount() const;
+
+		void SetRowCount(int n, int size = GD_ROW_HEIGHT);
+		void SetColCount(int n, int size = 100);
+
+		void Select(int n, int cnt = 1);
+		void ClearSelection();
+		bool IsSelection()           { return selected_rows > 0; }
+		bool IsSelectionBegin()      { return sel_begin;         }
+		bool IsSelectionEnd()        { return sel_end;           }
+		int  GetSelectedCount()      { return selected_rows;     }
+		int  GetSelectedItemsCount() { return selected_items;    }
+		bool IsSelected(int n, bool relative = true);
+		bool IsSelected(int n, int m, bool relative = true);
+		bool IsSelected();
+
+		void DoInsert0(bool edit, bool after);
+		void DoInsertBefore0(bool edit);
+		void DoInsertBefore();
+		void DoInsertBeforeNoEdit();
+		void DoInsertAfter0(bool edit);
+		void DoInsertAfter();
+		void DoInsertAfterNoEdit();
+		void DoRemove();
+		void DoAppend0(bool edit);
+		void DoAppend();
+		void DoAppendNoEdit();
+		void DoDuplicate0();
+		void DoDuplicate();
+		void DoEdit();
+		void DoEndEdit();
+		void DoCancelEdit();
+		void DoSelectAll();
+		void DoSwapUp();
+		void DoSwapDown();
+		void DoShiftSelect();
+		void DoCtrlSelect();
+		void DoGoBegin();
+		void DoGoEnd();
+		void DoGoNext();
+		void DoGoPrev();
+		void DoGoLeft();
+		void DoGoRight();
+		void DoGoPageUp();
+		void DoGoPageDn();
+		void DoFind();
+
+		void StdMenuBar(Bar &bar);
+		void StdToolBar(Bar &bar);
+		void FindOptsBar(Bar &bar);
+		void FindBar(Bar &bar, int cx);
+		void InfoBar(Bar &bar, int cx);
+		void NavigatingBar(Bar &bar);
+		void RemovingMenu(Bar &bar);
+		void MovingMenu(Bar &bar);
+		void SelectMenu(Bar &bar);
+		void ColumnsMenu(Bar &bar);
+		void ColumnList(Bar &bar);
+		void ClipboardMenu(Bar &bar);
+		void PasteAsMenu(Bar &bar);
+
+		void RebuildToolBar() { bar.Set(WhenToolBar); }
+		void SetToolBarInfo(String inf);
+
+		void ClearFound(bool showrows = true, bool clear_string = true);
+
+		bool IsEmpty()        { return total_rows <= fixed_rows; }
+		bool IsFilled()       { return total_rows > fixed_rows;  }
+		bool IsOrderChanged() { return row_order; }
+		bool IsDataChanged()  { return row_data; }
+		bool IsChanged()      { return row_order || row_data; }
+
+		bool IsRowEditable();
+
+		void Serialize(Stream &s);
+
+		Ctrl * GetCtrl(int r, int c);
+		Ctrl * GetCtrl(int c);
+
+		static int GetStdHeight() { return Draw::GetStdFontCy() + 4; }
+
+		void Debug(int n = 0);
+		void UpdateScrollbars() { UpdateSb(); }
+
+		void JoinCells(int left, int top, int right, int bottom, bool relative = true);
+		void JoinFixedCells(int left, int top, int right, int bottom);
+		void JoinRow(int n, int left, int right);
+		void JoinRow(int left = -1, int right = -1);
+
+		GridCtrl& Sort(int sort_col, int sort_mode = SORT_UP, bool multisort = false, bool repaint = true);
+		GridCtrl& Sort(Id id, int sort_mode = SORT_UP, bool multisort = false, bool repaint = true);
+		GridCtrl& MultiSort(int sort_col, int sort_mode = SORT_UP);
+		GridCtrl& MultiSort(Id id, int sort_mode = SORT_UP);
+		void ClearSort();
+
+		ScrollBar& HorzScroll() { return sbx; }
+		ScrollBar& VertScroll() { return sby; }
+
+		Value GetConvertedColumn(int col, const Value &v) const;
+		String GetStdConvertedColumn(int col, const Value &v) const;
+
+		bool Search(dword key);
+		int GetResizePanelHeight() const;
+		String GetColumnName(int n) const;
+
+		void SetCtrlFocus(int col);
+		void SetCtrlFocus(Id id);
+
+		#ifdef GRIDSQL
+		void FieldLayout(FieldOperator& f);
+		operator Fields() { return THISBACK(FieldLayout); }
+		operator SqlSet() const { return GetColumnList(); }
+		SqlSet GetColumnList(bool skip_hidden = false) const;
+		#endif
+
+	private:
+
+		bool TabKey(bool enter_mode);
+
+		bool Go0(int jump, bool scroll = true, bool goleft = false, bool ctrlmode = false);
+
+		CurState SetCursor0(Point p, bool mouse = false, bool highlight = false, int dirx = 0, int diry = 0, bool ctrlmode = false);
+		CurState SetCursor0(int x, int y, bool mouse = false, bool highlight = false, int dirx = 0, int diry = 0, bool ctrlmode = false);
+		int SetCursor0(int n);
+
+		bool IsValidCursor(const Point &p, int fc, int lc, int fr, int lr) const;
+		bool IsValidCursorVis(const Point &p) const;
+		bool IsValidCursorAll(const Point &p) const;
+		bool IsValidCursor(const Point &p) const;
+		bool IsValidCursor(int c) const;
+
+		void SetItemCursor(Point p, bool b, bool highlight);
+
+		void Insert0(int row, int cnt = 1, bool recalc = true, bool refresh = true, int size = GD_ROW_HEIGHT);
+		bool Remove0(int row, int cnt = 1, bool recalc = true, bool refresh = true, bool whens = true);
+		void Duplicate0(int row, int cnt = 1, bool recalc = true, bool refresh = true);
+		int  Append0(int cnt = 1, int size = GD_ROW_HEIGHT, bool refresh = true);
+
+		void GoCursorLeftRight();
+
+		void UpdateSb(bool horz = true, bool vert = true);
+		void UpdateHolder(bool force = false);
+		bool UpdateCols(bool force = false);
+		bool UpdateRows(bool force = false);
+		bool UpdateSizes();
+		void UpdateHighlighting(int mode, Point p = Null);
+		void UpdateVisColRow(bool col);
+
+		bool HasCtrls();
+		bool ShowNextCtrl();
+		bool ShowPrevCtrl();
+		public:
+		void SyncCtrls(int r = -1);
+		private:
+		void UpdateCtrls(int opt = UC_CHECK_VIS | UC_SHOW | UC_CURSOR | UC_FOCUS);
+
+		void SetCtrlsData();
+		bool GetCtrlsData(bool samerow = false, bool doall = false, bool updates = true);
+		bool CancelCtrlsData(bool all = false);
+		void UpdateDefaults(int ri);
+
+		int  GetFocusedCtrlIndex();
+		Point GetCtrlPos(Ctrl * ctrl);
+
+		void Split(int state = 0, bool sync = false);
+		void Scroll();
+
+		bool IsTopHeader()  { return fixed_rows > 0; }
+		bool IsLeftHeader() { return fixed_cols > 1 || indicator; }
+
+		bool IsMouseBody(Point &p);
+
+		void DrawLine(bool iniLine, bool delLine);
+
+		Rect GetItemRect(int r, int c, bool hgrid = false, bool vgrid = false, bool ctrlmode = false);
+
+		bool Match(const WString &f, const WString &s, int &fs, int &fe);
+		int  ShowMatchedRows(const WString &f);
+
+		void SelectCount(int i, int cnt = 1, bool sel = true);
+		void SelectRange(int from, int to, bool sel = true);
+		void SelectRange(Point from, Point to, bool sel = true, bool fullrow = false);
+		void ShiftSelect(int from, int to);
+		void ShiftSelect(Point from, Point to);
+		void SelectInverse(int from, int to);
+		int  GetMinRowSelected();
+		int  GetMaxRowSelected();
+
+
+		void CloseGrid();
+		String RowFormat(const char *s);
+
+		void SetFindOpts(int n);
+
+		Item& GetItem(const Point &p) { return GetItem(p.y, p.x); }
+		Item& GetItem(int n, int m)   { return items[vitems[n].id][hitems[m].id]; }
+
+		void Set0(int r, int c, const Value &val, bool paste = false);
+		Value Get0(int r, int c) const;
+
+		int GetSplitCol(const Point &p, int splitSize = 5, bool full = false);
+		int GetSplitRow(const Point &p, int splitSize = 5, bool full = false);
+
+		int GetFirst0(Vector<ItemRect> &its, int total, int sb, int diff);
+		int GetFirstVisCol(int diff);
+		int GetFirstVisRow(int diff);
+
+		bool SetDiffItemSize(bool horizontal, RectItems &its, int n, int diff, bool newsize = true);
+		void Recalc(bool horizontal, RectItems &its, int n, double size, double diff);
+		bool Recalc(bool horizontal, RectItems &its, int mode = -1);
+		bool RecalcCols(int mode = -1);
+		bool RecalcRows(int mode = -1);
+		void CalcIntPos(RectItems &its, int n, int maxsize, int cnt, int resize_mode, bool renumber = false);
+
+		Rect& AlignRect(Rect &r, int i);
+
+		void MouseAccel(const Point &p, bool horz, bool vert, dword keyflags);
+
+		void GSort(int scol = -1);
+		void GSort(int col, int order, int from, int count = -1);
+		void Multisort();
+		int  InMultisort(int col);
+		bool ClearMultisort();
+		bool ClearSorted();
+		bool IsSorted();
+
+		void DrawHorzDragLine(Draw &w, int pos, int cx, int size, Color c);
+		void DrawVertDragLine(Draw &w, int pos, int size, int dx, Color c);
+
+		void Nothing();
+		void Init();
+
+		Ctrl * GetCtrl(int x, int y, bool check_visibility, bool relative = false);
+		Ctrl * GetCtrl(const Point &p, bool check_visibility, bool relative = false);
+		bool IsCtrl(Point &p);
+
+		GridClipboard GetClipboard();
+		void SetClipboard();
+		bool IsClipboardAvailable();
+		void PasteCallbacks(bool new_row);
+		void Paste(int mode = 0);
+		void DoCopy();
+		void DoPaste();
+		void DoPasteInsertedRows();
+		void DoPasteAppendedRows();
+
+		Point GetBarOffset();
+		void ClearModified();
+
+		int  GetIdCol(int id, bool checkall = false) const;
+		int  GetIdRow(int id, bool checkall = false) const;
+		Item& GetItemSize(int &r, int &c, int &x, int &y, int &cx, int &cy, bool &skip, bool relx = true, bool rely = true);
+
+	private:
+		bool WhenInsertRow0();
+
+	public:
+
+		Callback1<Bar&> WhenMenuBar;
+		Callback1<Bar&> WhenToolBar;
+
+		Callback WhenLeftDouble;
+		Callback WhenLeftClick;
+		Callback WhenEnter;
+		Callback WhenEscape;
+
+		Callback WhenStartEdit;
+		Callback WhenEndEdit;
+
+		Callback WhenCreateRow;
+
+		Callback WhenAcceptRow;
+		Callback WhenAcceptedRow;
+
+		Callback WhenInsertRow;
+		Callback WhenUpdateRow;
+		Callback WhenRemoveRow;
+		Callback WhenDuplicateRow;
+
+		Callback WhenCancelNewRow;
+
+		Callback WhenUpdateCell;
+
+		Callback WhenNewRow;
+		Callback WhenChangeCol;
+		Callback WhenChangeRow;
+		Callback WhenCursor;
+		Callback WhenEmpty;
+
+		Callback WhenCtrlAction;
+		Callback WhenCtrlsAction;
+
+		Callback WhenSearchCursor;
+		Callback WhenClose;
+
+		Callback StdInsert;
+		Callback StdAppend;
+		Callback StdRemove;
+		Callback StdDuplicate;
+		Callback StdEdit;
+};
+
+class GridText : Ctrl
+{
+	private:
+		GridDisplay display;
+		GridCtrl* parent;
+		const Id* column;
+		Color fg, bg;
+		Font fnt;
+		int align;
+
+	public:
+
+		GridText() {}
+
+		virtual void Paint(Draw& w)
+		{
+			Rect r = GetRect();
+			display.Paint(w, r.left, r.top, r.Width(), r.Height(), parent->Get(*column), 0, fg, bg, fnt);
+		}
+
+		void Ink(Color c)    { fg = c;  }
+		void Paper(Color c)  { bg = c;  }
+		void SetFont(Font f) { fnt = f; }
+		void Column(const Id& c) { column = &c; }
+};
+
+END_UPP_NAMESPACE
+
+#endif
diff --git a/uppsrc/GridCtrl/GridCtrl.iml b/uppsrc/GridCtrl/GridCtrl.iml
new file mode 100644
index 000000000..fb5cc3178
--- /dev/null
+++ b/uppsrc/GridCtrl/GridCtrl.iml
@@ -0,0 +1,146 @@
+PREMULTIPLIED
+IMAGE_ID(Append)
+IMAGE_ID(InsertBefore)
+IMAGE_ID(InsertAfter)
+IMAGE_ID(Insert)
+IMAGE_ID(Delete)
+IMAGE_ID(Duplicate)
+IMAGE_ID(SelectAll)
+IMAGE_ID(Modify)
+IMAGE_ID(Commit)
+IMAGE_ID(Cancel)
+IMAGE_ID(Find)
+IMAGE_ID(FindOpts)
+IMAGE_ID(NextRec)
+IMAGE_ID(LastRec)
+IMAGE_ID(FirstRec)
+IMAGE_ID(PrevRec)
+IMAGE_ID(MoveUp)
+IMAGE_ID(MoveDn)
+IMAGE_ID(HorzPos)
+IMAGE_ID(VertPos)
+IMAGE_ID(VHdr0)
+IMAGE_ID(VHdr1)
+IMAGE_ID(VHdr2)
+IMAGE_ID(VHdr3)
+IMAGE_ID(VHdr4)
+IMAGE_ID(VHdr5)
+IMAGE_ID(VHdr6)
+IMAGE_ID(VHdr5H)
+IMAGE_ID(BodyVertHigh)
+IMAGE_ID(BodyVertHigh2)
+IMAGE_ID(Focused)
+IMAGE_ID(FocSel)
+IMAGE_ID(Selected)
+IMAGE_ID(NewRow)
+IMAGE_ID(SortAsc)
+IMAGE_ID(SelUp)
+IMAGE_ID(SelDn)
+IMAGE_ID(SelLeft)
+IMAGE_ID(SelRight)
+IMAGE_ID(SelPlus)
+IMAGE_ID(SelDots)
+IMAGE_ID(SortDsc)
+IMAGE_ID(CloseN)
+IMAGE_ID(CloseH)
+IMAGE_ID(CloseP)
+IMAGE_ID(Dots1)
+IMAGE_ID(Dots2)
+
+IMAGE_BEGIN_DATA
+IMAGE_DATA(120,156,237,154,203,79,84,119,20,199,239,194,69,145,68,219,164,186,114,227,202,164,9,127,64,215,198,88,91,107,75,172)
+IMAGE_DATA(125,211,98,165,105,218,116,209,238,72,140,169,146,152,154,72,98,105,168,148,55,45,193,133,49,54,98,52,169,177,245,81)
+IMAGE_DATA(30,51,248,38,34,90,80,97,100,96,120,20,6,42,86,152,25,190,61,119,122,135,14,119,126,239,59,51,136,114,200,55)
+IMAGE_DATA(204,204,239,124,206,249,61,206,185,115,153,193,90,101,173,178,132,86,100,193,250,148,180,139,100,63,86,53,98,74,231,74)
+IMAGE_DATA(97,221,33,166,80,131,43,114,184,16,49,31,105,112,187,28,46,72,204,135,26,220,78,135,235,35,230,125,14,87,228,172)
+IMAGE_DATA(221,214,39,206,122,10,29,238,46,61,126,151,244,54,233,45,210,118,82,254,255,254,182,143,91,214,61,235,191,125,185,73)
+IMAGE_DATA(186,78,186,76,242,145,90,72,175,57,57,236,241,17,210,32,41,64,186,79,250,147,212,69,186,65,186,226,48,173,164,139)
+IMAGE_DATA(164,45,78,206,143,73,5,164,15,72,239,145,222,33,221,114,152,55,73,219,72,91,157,60,175,10,206,116,7,189,222,73)
+IMAGE_DATA(186,234,48,170,182,221,97,58,156,60,170,150,239,48,109,206,188,84,237,141,164,189,219,162,87,103,241,60,175,8,246,64)
+IMAGE_DATA(212,28,235,94,242,169,39,75,98,118,124,227,3,131,5,67,11,152,175,143,50,89,46,167,192,42,205,117,49,89,91,170)
+IMAGE_DATA(172,9,103,50,207,39,153,113,179,166,53,170,228,152,197,230,144,50,75,181,192,151,155,35,35,140,210,69,81,231,34,156)
+IMAGE_DATA(204,202,230,22,183,229,230,88,110,142,165,196,184,217,140,190,115,172,166,159,101,51,179,77,155,54,65,87,201,44,62,219)
+IMAGE_DATA(170,172,188,188,188,84,150,174,138,42,74,39,107,63,215,81,246,78,227,41,177,231,93,13,89,88,248,50,76,148,204,7)
+IMAGE_DATA(112,88,75,60,190,160,160,64,40,25,239,53,63,111,30,186,188,110,126,47,251,239,213,14,28,176,96,162,100,158,58,89)
+IMAGE_DATA(75,60,94,118,254,50,222,107,126,222,60,116,121,221,252,198,251,239,110,102,147,128,44,222,100,33,110,94,229,48,23,43)
+IMAGE_DATA(191,140,87,109,100,17,223,212,212,180,64,186,124,186,243,179,230,144,237,252,238,121,100,43,191,9,239,37,191,81,255,45)
+IMAGE_DATA(55,115,102,154,57,19,249,117,249,76,172,127,177,243,47,214,254,155,240,94,242,27,245,223,106,43,215,29,75,221,116,190)
+IMAGE_DATA(123,115,113,27,143,109,212,251,238,46,137,91,219,183,54,149,23,197,162,177,252,134,124,46,103,143,49,121,9,183,190,115)
+IMAGE_DATA(61,54,4,55,196,125,214,124,181,38,37,38,147,227,240,137,239,230,18,220,186,246,117,226,253,161,177,156,174,156,121,222)
+IMAGE_DATA(214,230,177,205,200,109,205,85,219,87,242,89,121,109,101,156,183,243,173,240,173,208,59,15,219,183,219,145,73,29,20,41)
+IMAGE_DATA(114,172,79,45,75,24,31,131,202,124,236,231,88,99,65,196,186,125,18,207,177,141,207,242,124,68,172,44,46,107,92,101)
+IMAGE_DATA(46,44,86,133,97,178,138,140,41,103,50,79,147,125,49,57,135,116,156,187,78,157,37,191,46,218,179,20,31,149,79,45)
+IMAGE_DATA(195,225,48,70,71,71,209,223,223,15,251,177,20,112,172,173,181,21,229,21,213,56,244,227,79,40,171,106,68,249,225,42)
+IMAGE_DATA(92,56,127,94,202,31,63,254,11,126,104,108,198,233,43,15,208,118,239,17,252,15,162,104,233,125,136,99,103,46,161,161)
+IMAGE_DATA(190,30,115,115,115,204,24,29,29,126,28,106,56,137,139,61,83,232,13,3,93,35,192,45,82,207,4,112,103,28,56,117)
+IMAGE_DATA(190,19,39,155,155,153,108,117,77,29,142,182,5,208,57,12,248,2,81,180,7,98,148,55,134,171,193,40,110,143,68,209)
+IMAGE_DATA(61,8,148,125,95,142,233,233,233,5,252,236,236,44,42,27,142,80,206,105,92,35,223,27,131,81,116,14,197,112,115,56)
+IMAGE_DATA(134,110,226,122,198,34,232,165,152,149,53,71,208,211,211,147,194,86,55,52,225,218,192,99,220,37,191,254,137,40,238,143)
+IMAGE_DATA(199,208,55,17,67,32,28,195,224,84,4,193,49,160,170,166,9,93,93,93,41,243,174,171,171,199,205,129,41,244,253,21)
+IMAGE_DATA(193,224,100,20,193,112,52,254,123,104,42,138,145,191,35,24,8,69,176,127,255,183,8,6,131,41,172,223,239,195,175,231)
+IMAGE_DATA(90,16,154,140,96,108,58,138,241,233,24,198,31,197,16,126,20,197,228,67,224,236,239,126,148,149,125,135,72,36,194,220)
+IMAGE_DATA(175,198,159,27,113,233,250,45,12,135,255,193,227,24,48,67,154,160,156,191,157,243,97,207,158,61,204,156,182,13,5,135)
+IMAGE_DATA(113,250,212,25,124,249,197,231,56,120,176,20,53,117,13,168,172,174,195,190,125,37,40,47,47,71,40,20,98,114,129,190)
+IMAGE_DATA(1,252,113,193,135,226,226,98,248,253,254,120,13,168,212,228,72,104,4,237,173,151,81,81,81,129,218,218,90,204,204,204)
+IMAGE_DATA(40,215,175,191,253,42,78,156,104,70,73,73,73,60,151,42,103,91,75,75,27,118,239,222,141,238,238,110,189,119,182,220)
+IMAGE_DATA(103,236,107,132,215,119,238,103,110,144,251,117,251,121,66,38,175,243,252,88,254,34,63,89,94,221,117,46,57,203,210,247)
+IMAGE_DATA(92,94,54,11,30,120,236,221,187,215,148,71,227,217,136,140,7,79,54,43,225,231,125,68,226,240,74,44,135,247,148,215)
+IMAGE_DATA(195,122,121,102,202,197,89,47,231,107,200,37,216,204,88,134,27,50,19,141,8,193,216,188,143,66,35,113,89,89,35,113)
+IMAGE_DATA(230,162,82,152,202,141,193,106,36,85,150,193,167,45,175,135,245,186,77,103,159,83,198,188,156,175,32,159,180,174,4,99)
+IMAGE_DATA(233,177,44,255,39,136,202,70,137,54,75,55,174,202,21,148,153,207,230,236,130,209,100,231,185,36,214,45,22,187,128,99)
+IMAGE_DATA(137,195,74,57,1,235,37,175,215,245,166,240,156,113,17,59,207,43,176,166,117,37,179,244,55,232,19,126,203,106,124,59)
+IMAGE_DATA(226,229,22,72,161,64,184,156,160,48,153,239,32,42,13,197,106,12,85,142,179,22,211,188,94,215,155,194,11,124,68,230)
+IMAGE_DATA(229,86,213,146,204,77,149,207,140,61,233,13,233,181,177,52,249,148,66,85,228,185,5,46,187,181,146,53,134,234,223,114)
+IMAGE_DATA(140,38,82,105,12,139,195,170,218,51,199,50,148,94,203,194,223,144,166,11,88,146,7,150,37,214,107,67,154,94,8,164)
+IMAGE_DATA(188,233,5,204,244,194,185,8,31,6,89,30,56,185,189,104,189,96,229,88,207,169,205,194,101,94,115,59,49,144,8,253)
+IMAGE_DATA(180,197,115,51,162,120,178,248,172,61,151,197,227,197,76,112,6,243,147,50,140,26,81,26,115,199,242,42,86,76,175,243)
+IMAGE_DATA(203,196,254,37,143,235,198,227,197,114,241,58,243,211,50,81,60,19,91,10,241,92,245,33,180,127,1,187,97,33,181,0)
+IMAGE_END_DATA(1504, 19)
+
+IMAGE_BEGIN_DATA
+IMAGE_DATA(120,156,221,152,219,139,220,116,20,199,167,218,181,85,159,170,254,5,138,85,183,182,42,162,32,250,36,248,224,131,168,160)
+IMAGE_DATA(173,125,169,215,39,17,159,170,143,34,125,177,21,193,186,221,90,68,193,11,8,197,150,22,65,176,90,74,171,133,125,216)
+IMAGE_DATA(98,183,107,247,58,183,205,92,50,183,36,51,73,230,62,153,153,175,191,147,152,153,100,230,55,59,201,102,45,197,179,124)
+IMAGE_DATA(216,201,239,156,239,57,249,101,146,95,206,111,66,59,66,247,132,182,135,110,15,121,49,48,243,20,184,190,30,27,205,99)
+IMAGE_DATA(235,109,252,230,25,212,251,205,131,1,227,12,109,232,124,130,92,215,27,153,99,104,178,30,174,199,168,184,141,178,153,57)
+IMAGE_DATA(130,206,101,51,174,233,205,154,195,203,245,240,83,127,144,141,156,79,16,253,96,158,32,215,212,145,103,125,219,18,218,209)
+IMAGE_DATA(251,172,202,121,12,34,103,146,16,215,194,72,70,23,250,68,134,89,152,155,53,113,37,44,73,89,20,11,25,134,8,37)
+IMAGE_DATA(159,134,148,75,65,206,38,33,101,18,40,136,2,114,201,152,73,54,17,133,40,132,145,97,133,196,248,10,210,177,101,164)
+IMAGE_DATA(24,148,152,37,188,187,151,80,211,106,184,190,16,198,194,98,4,139,75,81,44,45,199,176,188,26,199,106,88,64,56,146)
+IMAGE_DATA(64,36,154,68,52,158,66,108,45,141,184,32,66,72,100,145,72,229,144,76,231,145,18,11,72,103,36,136,89,25,179,87)
+IMAGE_DATA(174,81,226,187,122,137,5,65,64,50,153,68,58,157,70,38,147,65,54,155,69,62,159,135,36,73,80,20,5,197,98,17)
+IMAGE_DATA(170,170,66,215,117,84,42,21,212,106,53,212,235,117,52,155,77,24,134,129,78,167,131,110,183,235,62,91,26,108,49,103)
+IMAGE_DATA(131,5,213,88,112,165,90,131,94,174,64,213,116,40,37,21,146,82,66,94,82,144,205,211,89,209,25,230,32,164,50,136)
+IMAGE_DATA(39,210,136,174,37,17,142,37,176,18,89,195,210,106,236,255,144,184,221,110,155,201,155,173,150,89,160,94,111,176,235,104)
+IMAGE_DATA(21,41,87,170,208,204,66,101,148,84,13,197,146,6,185,104,21,44,200,10,242,5,42,42,35,147,43,184,111,177,138,86)
+IMAGE_DATA(194,32,154,82,128,156,19,81,200,8,125,196,97,132,88,216,196,149,176,90,86,65,148,245,34,202,170,2,189,36,153,104)
+IMAGE_DATA(197,2,84,37,63,116,63,75,185,4,242,44,153,73,122,205,186,103,39,66,119,184,158,68,222,211,201,25,7,103,124,112)
+IMAGE_DATA(89,226,141,121,101,92,141,245,207,249,6,76,202,143,102,115,38,117,107,104,43,111,18,94,10,210,21,153,24,74,200,173)
+IMAGE_DATA(50,126,38,222,180,219,66,119,242,10,142,18,14,22,27,53,238,245,222,242,82,239,230,246,109,115,127,221,126,30,22,175)
+IMAGE_DATA(247,182,231,226,163,3,199,23,240,255,237,109,101,229,61,20,247,115,43,120,127,234,6,138,143,154,13,111,118,126,78,132)
+IMAGE_DATA(159,255,54,246,199,177,81,223,155,215,117,103,220,67,226,45,255,246,208,45,163,156,235,93,1,190,127,3,203,195,205,238)
+IMAGE_DATA(187,177,79,232,14,103,35,208,236,34,93,50,16,201,55,125,67,58,210,11,74,11,245,22,107,13,89,235,211,169,86,61)
+IMAGE_DATA(67,241,164,35,253,162,216,48,143,213,211,63,65,154,58,234,25,138,39,29,233,175,165,26,232,148,203,40,28,249,196,55)
+IMAGE_DATA(164,35,253,21,161,206,62,235,200,125,252,145,111,72,71,250,153,104,13,29,93,67,230,195,131,61,108,27,55,70,58,210)
+IMAGE_DATA(95,90,173,162,173,169,72,189,247,110,15,167,241,142,109,72,71,250,223,23,43,104,171,37,36,222,122,221,5,207,6,99)
+IMAGE_DATA(72,71,250,95,230,203,104,151,138,136,239,123,117,8,167,241,252,164,35,253,153,171,58,12,182,181,136,188,248,130,11,158)
+IMAGE_DATA(13,198,144,142,244,39,103,53,24,138,140,149,231,158,237,225,52,222,177,13,233,72,255,195,140,10,67,150,176,248,244,83)
+IMAGE_DATA(61,108,27,55,70,58,210,127,115,185,4,131,109,151,174,63,249,184,111,72,71,250,19,151,172,28,243,123,118,97,254,145)
+IMAGE_DATA(135,189,195,226,73,71,250,169,11,69,243,25,138,188,113,0,243,143,237,233,113,109,247,36,230,30,218,137,185,201,7,48)
+IMAGE_DATA(255,232,110,151,143,160,120,210,145,254,228,21,13,169,162,129,22,219,146,212,217,214,176,158,72,152,52,68,17,77,182,45)
+IMAGE_DATA(108,230,114,168,179,237,162,61,110,194,226,40,158,116,164,207,233,109,156,254,75,199,231,231,21,223,144,142,244,174,5,169)
+IMAGE_DATA(204,22,148,53,182,176,44,178,5,198,47,164,35,253,138,220,130,212,236,112,111,176,113,70,58,210,207,176,197,192,52,45)
+IMAGE_DATA(6,44,95,244,14,197,51,35,253,197,248,191,57,102,206,250,135,25,233,127,93,173,91,57,206,125,239,31,102,164,255,121)
+IMAGE_DATA(169,102,229,56,53,213,199,54,15,99,164,63,245,119,213,242,125,125,168,143,211,120,199,142,56,210,255,120,181,98,249,166)
+IMAGE_DATA(14,186,225,25,39,134,244,223,206,150,45,255,161,183,135,113,218,8,63,233,191,154,209,173,152,15,246,186,225,25,39,134)
+IMAGE_DATA(244,211,127,106,150,255,253,231,251,56,141,119,236,136,35,253,209,139,170,229,123,231,153,62,182,121,24,35,253,103,23,74)
+IMAGE_DATA(150,239,192,19,254,97,70,250,79,207,23,173,28,123,39,129,125,187,188,67,241,204,72,127,228,55,197,202,113,248,77,96)
+IMAGE_DATA(255,174,62,175,236,4,94,186,23,120,249,62,224,181,73,183,143,160,120,102,164,63,246,135,138,239,230,107,232,118,169,153)
+IMAGE_DATA(168,58,104,154,47,249,110,219,96,212,6,124,140,78,199,212,145,126,85,54,112,252,178,138,195,231,20,223,144,142,244,255)
+IMAGE_DATA(89,135,212,105,52,208,98,43,171,87,40,222,217,33,209,113,120,255,62,204,61,120,191,103,40,158,116,118,135,20,228,205)
+IMAGE_DATA(99,119,72,65,222,128,118,135,20,228,77,108,119,72,65,58,2,187,67,10,210,153,108,102,135,20,164,83,179,59,164,32)
+IMAGE_DATA(29,163,221,33,5,233,92,237,14,41,72,7,109,119,72,65,58,121,187,67,234,26,6,212,179,103,32,159,56,222,67,154)
+IMAGE_DATA(158,178,118,15,199,190,128,252,229,180,203,71,80,60,233,156,29,82,187,197,208,180,30,84,195,222,197,56,199,123,52,91)
+IMAGE_DATA(155,219,33,77,132,182,140,218,211,89,255,39,70,255,240,49,122,35,232,222,60,242,198,198,255,232,49,198,254,1,26,190)
+IMAGE_DATA(249,232,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0)
+IMAGE_END_DATA(1440, 28)
diff --git a/uppsrc/GridCtrl/GridCtrl.t b/uppsrc/GridCtrl/GridCtrl.t
new file mode 100644
index 000000000..cff1a504f
--- /dev/null
+++ b/uppsrc/GridCtrl/GridCtrl.t
@@ -0,0 +1,403 @@
+#ifdef _MSC_VER
+#pragma setlocale("C")
+#endif
+// GridCtrl.cpp
+
+T_("Close")
+deDE("Schließen")
+esES("Cerra")
+fiFI("Sulje")
+huHU("Bezár")
+plPL("Zamknij")
+ruRU("Закрыть")
+
+T_("Search")
+deDE("Suchen")
+esES("")
+fiFI("")
+huHU("Keresés")
+plPL("")
+ruRU("Поиск")
+
+T_("Append")
+deDE("Anfügen")
+esES("")
+fiFI("Lisää loppuun")
+huHU("Hozzáfűzés")
+plPL("Dodaj")
+ruRU("Добавить")
+
+T_("Insert ")
+deDE("Einfügen")
+esES("")
+fiFI("Lisää väliin ")
+huHU("Beszúrás")
+plPL("Wstaw")
+ruRU("Вставить")
+
+T_("Duplicate")
+deDE("Duplizieren")
+esES("")
+fiFI("Kahdenna")
+huHU("Duplikálás")
+plPL("Zduplikuj")
+ruRU("Дублировать")
+
+T_("Delete ")
+deDE("Löschen")
+esES("")
+fiFI("Poista")
+huHU("Törlés")
+plPL("Usuń")
+ruRU("Удалить")
+
+T_("Edit")
+deDE("Bearbeiten")
+esES("")
+fiFI("Muokkaa")
+huHU("Szerkesztés")
+plPL("Edytuj")
+ruRU("Редактировать")
+
+T_("Accept")
+deDE("Bestätigen")
+esES("")
+fiFI("Hyväksy")
+huHU("Elfogadás")
+plPL("Zatwierdź")
+ruRU("Подтвердить")
+
+T_("Cancel")
+deDE("Abruch")
+esES("Cancelar")
+fiFI("Peruuta")
+huHU("Mégsem")
+plPL("Anuluj")
+ruRU("Отмена")
+
+T_("Move up")
+deDE("Nach oben")
+esES("")
+fiFI("Siirrä ylös")
+huHU("Mozgatás fel")
+plPL("Przesuń do góry")
+ruRU("Вверх")
+
+T_("Move down")
+deDE("Nach unten")
+esES("")
+fiFI("Siirrä alas")
+huHU("Mozgatás le")
+plPL("Przesuń w dół")
+ruRU("Вниз")
+
+T_("First %s")
+deDE("Erster %s")
+esES("")
+fiFI("Ensimmäinen %s")
+huHU("Első %s")
+plPL("Pierwszy %s")
+ruRU("Первые %s")
+
+T_("Previous %s")
+deDE("Vorheriger %s")
+esES("")
+fiFI("Edellinen %s")
+huHU("Előző %s")
+plPL("Poprzedni %s")
+ruRU("Предыдущие $s")
+
+T_("Next %s")
+deDE("Nächster %s")
+esES("")
+fiFI("Seuraava %s")
+huHU("Következő %s")
+plPL("Następny %s")
+ruRU("Следующие %s")
+
+T_("Last %s")
+deDE("Letzter %s")
+esES("")
+fiFI("Viimeinen %s")
+huHU("Utolsó %s")
+plPL("Ostatni %s")
+ruRU("Последние %s")
+
+T_("Immediate search")
+deDE("Sofort suchen")
+esES("")
+fiFI("Välitön haku")
+huHU("Azonnali keresés")
+plPL("Wyszukiwanie natychmiastowe")
+ruRU("Непосредственный поиск")
+
+T_("Hide rows")
+deDE("Reihen ausblenden")
+esES("")
+fiFI("Piilota rivit")
+huHU("Sorok rejtése")
+plPL("Ukrywaj niepasujące wiersze")
+ruRU("Спрятать строки")
+
+T_("Highlight found cells")
+deDE("Markiere gefundene Zellen")
+esES("")
+fiFI("Korosta löydetyt solut")
+huHU("Talált cellák kiemelése")
+plPL("Podświetlaj znalezione komórki")
+ruRU("Подсветить найденные ячейки")
+
+T_("Case sensitive")
+deDE("Gross-/Kleinschreibung beachten")
+esES("")
+fiFI("Huomioi isot/pienet kirjaimet")
+huHU("Kis-/nagybetű érzékeny")
+plPL("Rozróżniaj małe i duże litery")
+ruRU("Учитывать регистр")
+
+T_("row")
+deDE("Reihe")
+esES("fila")
+fiFI("rivi")
+huHU("sor")
+plPL("wiersz")
+ruRU("ряды")
+
+T_("Insert a new %s into the table.")
+deDE("Neuen %s in die Tabelle einfügen")
+esES("Insertar un nuevo %s en la tabla.")
+fiFI("Lisää uusi %s taulukkoon.")
+huHU("Új %s beszúrása a táblázatba")
+plPL("Wstawia nowy %s do tabeli.")
+ruRU("Вставить новый %s в таблицу.")
+
+T_("Insert before")
+deDE("Davor einfügen")
+esES("")
+fiFI("Lisää ennen")
+huHU("Beszúrás elé")
+plPL("Wstaw przed")
+ruRU("Вставить до")
+
+T_("Insert a new %s into the table before current")
+deDE("Neuen %s in die Tabelle vor aktuellen einfügen")
+esES("Insertar un nuevo %s en la tabla antes del actual")
+fiFI("Lisää uusi %s taulukkoon ennen nykyistä")
+huHU("Új %s beszúrása a táblázatba az aktuális elé")
+plPL("Wstawia nowy %s do tabeli przed aktualnym")
+ruRU("Вставить новый %s в таблицу перед существующим")
+
+T_("Insert after")
+deDE("Danach einfügen")
+esES("")
+fiFI("Lisää jälkeen")
+huHU("Beszúrás utána")
+plPL("Wstaw za")
+ruRU("Вставить после")
+
+T_("Insert a new %s into the table after current")
+deDE("Neuen %s in die Tabelle nach aktuellen einfügen")
+esES("Insertar un nuevo %s en la tabla después de la actual")
+fiFI("Lisää uusi %s taulukkoon nykyisen jälkeen")
+huHU("Új %s beszúrása a táblázatba az aktuális mögé")
+plPL("Wstawia nowy %s do tabeli po aktualnym")
+ruRU("Вставить новый %s в таблицу после существующего")
+
+T_("Append a new %s at the end of the table.")
+deDE("Neue %s am Ende der Tabelle hinzufügen")
+esES("Añadir un nuevo %s en el final de la tabla.")
+fiFI("Lisää uusi %s taulukon loppuun.")
+huHU("Új %s hozzáfűzése a táblázat végéhez")
+plPL("Dodaje nowy %s na końcu tabeli.")
+ruRU("Добавить новый %s в конце таблицы.")
+
+T_("Duplicate current table %s.")
+deDE("Neuen %s in die Tabelle am Ende einfügen")
+esES("Duplicar la tabla actual %s.")
+fiFI("Kahdenna tämänhetkinen taulukko %s.")
+huHU("Az aktuális táblázat megkettőzése")
+plPL("Utwórz duplikat aktualnej tabeli %s.")
+ruRU("Дублировать текущий %s таблицы.")
+
+T_("Edit active %s.")
+deDE("Aktuellen %s bearbeiten")
+esES("Editar activa %s")
+fiFI("Muokkaa aktiivista %s.")
+huHU("Az aktuális %s szerkesztése")
+plPL("Edytuje aktualny %s.")
+ruRU("Редактировать активный %s.")
+
+T_("Delete active %s.")
+deDE("Aktuellen %s löschen")
+esES("Borrar activa %s.")
+fiFI("Poista aktiivinen %s.")
+huHU("Az aktív %s törlése")
+plPL("Usuń aktualny %s.")
+ruRU("Удалить активный %s.")
+
+T_("Select all")
+deDE("Alle auswählen")
+esES("Seleccionar todo")
+fiFI("Valitse kaikki")
+huHU("Minden kiválasztása")
+plPL("Zaznacz wszystkie")
+ruRU("Выделить всё")
+
+T_("Select all table rows")
+deDE("Alle Reihen auswählen")
+esES("Seleccionar todas las filas de la tabla")
+fiFI("Valitse kaikki taulukon rivit")
+huHU("Az összes sor kijelölése")
+plPL("Zaznacz wszystkie wiersze tabeli")
+ruRU("Выделить все ряды таблицы")
+
+T_("Columns")
+deDE("Spalten")
+esES("")
+fiFI("Sarakkeet")
+huHU("Oszlopok")
+plPL("Kolumny")
+ruRU("Колонки")
+
+T_("Copy")
+deDE("Kopieren")
+esES("Copiar")
+fiFI("Kopioi")
+huHU("Másolás")
+plPL("Kopiuj")
+ruRU("Копировать")
+
+T_("Cut")
+deDE("Ausschneiden")
+esES("Cortar")
+fiFI("Leikkaa")
+huHU("Kivágás")
+plPL("Wytnij")
+ruRU("Вырезать")
+
+T_("Paste")
+deDE("Einfügen")
+esES("Pegar")
+fiFI("Liitä")
+huHU("Beillesztés")
+plPL("Wklej")
+ruRU("Вставить")
+
+T_("Paste as")
+deDE("Einfügen als")
+esES("")
+fiFI("Liitä nimellä")
+huHU("Beillesztés másként")
+plPL("Wklej jako")
+ruRU("Вставить как")
+
+T_("appended")
+deDE("anhängen")
+esES("")
+fiFI("lisätty loppuun")
+huHU("hozzáfűzve")
+plPL("dodane")
+ruRU("добавлено")
+
+T_("inserted")
+deDE("einfügen")
+esES("")
+fiFI("lisätty väliin")
+huHU("beszúrva")
+plPL("wstawione")
+ruRU("вставлено")
+
+T_("Moving selection (%d %s) before row %d")
+deDE("Verschieben der Auswahl (%d %s) vor Reihe %d")
+esES("")
+fiFI("Siirtää valintaa (%d %s) ennen riviä %d")
+huHU("Kijelölés mozgatása (%d %s) a %d. sor elé")
+plPL("Przenoszenie selekcji (%d %s) przed %d wiersz")
+ruRU("Переместить отмеченное (%d %s) до строки "
+     "%d")
+
+T_("rows")
+deDE("Reihen")
+esES("")
+fiFI("rivit")
+huHU("sorok")
+plPL("wierszy")
+ruRU("строк")
+
+T_("Moving row %d before row %d")
+deDE("Verschieben der Reihe %d vor Reihe %d")
+esES("")
+fiFI("Siirtää riviä %d ennen riviä %d")
+huHU("%d. sor mozgatása %d. sor elé")
+plPL("Przenoszenie wiersza %d przed wiersz %d")
+ruRU("Переместить строку %d до строки %d")
+
+T_("Moving %d %s before row %d")
+deDE("Verschieben %d %s vor Reihe %d")
+esES("")
+fiFI("Siirtää %d %s ennen riviä %d")
+huHU("%d %s mozgatása a %d. sor elé")
+plPL("Przenoszenie %d %s przed wiersz %d")
+ruRU("Переместить %d %s до строки %d")
+
+T_("cell")
+deDE("Zelle")
+esES("")
+fiFI("solu")
+huHU("cella")
+plPL("komórki")
+ruRU("ячейка")
+
+T_("cells")
+deDE("Zellen")
+esES("")
+fiFI("solut")
+huHU("cellák")
+plPL("komórek")
+ruRU("ячейки")
+
+
+// Obsolete
+
+T_("Do you really want to delete selected %s ?")
+deDE("Möchten sie wirklich die ausgewählte %s löschen?")
+esES("")
+fiFI("Haluatko varmasti poistaa valitun %s ?")
+huHU("Biztosan töröljük a kijelölt %s ?")
+plPL("Czy na pewno chcesz usunąć zaznaczone %s ?")
+ruRU("Вы действительно хотите удалить выделенный "
+     "%s?")
+
+T_("Swap %s with previous thus moving it up.")
+deDE("Vertauschen der %s mit dem Vorgänger zum Aufwärtsbewegen.")
+esES("Intercambiar %s con el anterior y así moverlo arriba.")
+fiFI("Vaihda %s yläpuolella sijaitsevan kanssa.")
+huHU("%s felcserélése az előzővel - felfelé mozgatás")
+plPL("Zamień %s z poprzednim przesuwając go do góry.")
+ruRU("Поменять местами %s с предыдущим, подвинув "
+     "вверх.")
+
+T_("Swap %s with next thus moving it down.")
+deDE("Vertauschen der %s mit dem Nachfolger zum Abwärtsbewegen")
+esES("Intercambiar %s con el siguiente y así moverlo abajo")
+fiFI("Vaihda %s alapuolella sijaitsevan kanssa.")
+huHU("%s felcserélése a következővel - lefelé mozgatás")
+plPL("Zamień %s z następnym przesuwając go w dół.")
+ruRU("Поменять местами %s со следующим, подвинув "
+     "вниз.")
+
+T_("Find")
+deDE("Suchen")
+esES("")
+fiFI("Etsi")
+huHU("Keresés")
+plPL("Znajdź")
+ruRU("Найти")
+
+T_("Find options")
+deDE("Suche Optionen")
+esES("")
+fiFI("Haku optiot")
+huHU("Keresés beállításai")
+plPL("Opcje szukania")
+ruRU("Опции поиска")
diff --git a/uppsrc/GridCtrl/GridCtrl.upp b/uppsrc/GridCtrl/GridCtrl.upp
new file mode 100644
index 000000000..f9035b78b
--- /dev/null
+++ b/uppsrc/GridCtrl/GridCtrl.upp
@@ -0,0 +1,36 @@
+description "Grid control";
+
+charset "windows-1250";
+
+uses
+	CtrlLib;
+
+library
+	,
+	,
+	,
+	,
+	;
+
+options
+	-DLOG_CALLBACKS;
+
+file
+	GridCtrl.h,
+	GridCtrl.cpp,
+	GridDisplay.h,
+	GridDisplay.cpp,
+	GridText.cpp,
+	GridBase.cpp,
+	GridSort.cpp,
+	GridCtrl.iml,
+	GridUtils.h,
+	GridUtils.cpp,
+	ToDo.txt,
+	changelog.txt,
+	GridCtrl.t charset "UTF-8",
+	GridCtrl.usc,
+	src.tpp;
+
+mainconfig
+	"" = "GUI";
diff --git a/uppsrc/GridCtrl/GridCtrl.usc b/uppsrc/GridCtrl/GridCtrl.usc
new file mode 100644
index 000000000..7834808f3
--- /dev/null
+++ b/uppsrc/GridCtrl/GridCtrl.usc
@@ -0,0 +1,322 @@
+fn PaintVertSb(w, r)
+{
+	wd = r.right - r.left;
+	up = r;
+	r.top = (up.bottom = up.top + wd);
+	down = r;
+	r.bottom = (down.top = down.bottom - wd);
+	DrawButtonFrame(w, up);
+	PaintRcCenterImage(w, up, "ClassicCtrlsImg::UA");
+	DrawButtonFrame(w, down);
+	PaintRcCenterImage(w, down, "ClassicCtrlsImg::DA");
+	w.DrawRect(r, :SWhiteGray);
+}
+
+fn PaintHorzSb(w, r)
+{
+	hg = r.bottom - r.top;
+	left = r;
+	r.left = (left.right = left.left + hg);
+	right = r;
+	r.right = (right.left = right.right - hg);
+	w.DrawRect(left, :SLtGray);
+	DrawButtonFrame(w, left);
+	PaintRcCenterImage(w, left, "ClassicCtrlsImg::LA");
+	DrawButtonFrame(w, right);
+	PaintRcCenterImage(w, right, "ClassicCtrlsImg::RA");
+	w.DrawRect(r, :SWhiteGray);
+}
+
+fn PaintHeader(w, r, text, sorting = 0)
+{
+	ty = (r.top + r.bottom - GetTextSize(text).cy) >> 1;
+	DrawButtonFrame(w, r);
+	r.left += 2;
+
+	if(sorting)
+	{
+		if(sorting == 2)
+		{
+			w.DrawText(r.left, ty, "1", StdFont());
+			r.left += 6;
+		}
+		w.DrawImage(r.left, r.top + 2, "GridCtrl:GridCtrl.iml:SortAsc");
+		r.left += 10;
+	}
+	w.DrawText(r.left, ty, text, StdFont());
+}
+
+fn PaintImageCenter(w, r, img)
+{
+	isz = GetImageSize(img);
+	w.DrawImage((r.left + r.right) / 2 - isz.cx / 2, (r.top + r.bottom) / 2 - isz.cy / 2, img);
+}
+
+enum_property ColoringModes
+{
+	"0" : "None",
+	"1" : "Row",
+	"2" : "Column"
+}
+
+enum_property ResizeModes
+{
+	"0" : "Absolute",
+	"1" : "Proportional"
+}
+
+enum_property ResizePaintModes
+{
+	"0" : "Line",
+	"1" : "Fixed + Line",
+	"2" : "Fixed + NonFixed"
+}
+
+enum_property EditModes
+{
+	"0" : "Row",
+	"1" : "Cell"
+}
+
+enum_property ToolBarPos
+{
+	"0" : "Off",
+	"1" : "Top",
+	"2" : "Bottom"
+}
+
+ctrl GridCtrl {
+	group "Complex";
+
+	ViewRect(w)
+	{
+		r = GetRect();
+		DrawCtrlFrame(w, r, .SetFrame);
+		return r;
+	}
+	ViewSize(w)
+	{
+		r = ViewRect(w);
+		return Size(r.right - r.left, r.bottom - r.top);
+	}
+
+
+	GetStdSize() { return Size(150, 100); }
+	Frame SetFrame = InsetFrame();
+
+	bool Indicator = false;
+	bool SelectRow = true;
+	bool AutoHideHorzSb = true;
+	bool AutoHideVertSb = true;
+	bool HorzGrid = true;
+	bool VertGrid = true;
+	Color GridColor = :SLtGray;
+	bool MultiSelect = true;
+	bool ResizingCols = true;
+	bool FullColResizing = true;
+	bool ResizingRows = false;
+	bool FullRowResizing = false;
+	bool MovingCols = false;
+	bool MovingRows = false
+	bool Dragging = false;
+	ResizePaintModes ResizePaintMode = 2;
+	ResizeModes ResizeColMode = 1;
+	ResizeModes ResizeRowMode = 0;
+	bool LiveCursor = false;
+	bool Sorting = true;
+	bool MultiSorting = true;
+	EditModes EditMode = 0;
+	bool OneClickEdit = false;
+
+	//Color LiveColor;
+	//Color FocusColor(Color fg = SColorHighlightText, Color bg = SColorHighlight);
+	//Color OddColor(Color fg = SColorText, Color bg = SColorInfo);
+	//Color EvenColor(Color fg = SColorText, Color bg = Blend(SColorHighlight, SColorPaper, 220));
+	bool ColorRows = false;
+	ColoringModes ColoringMode;
+
+	bool Inserting = false;
+	bool Appending = false;
+	bool Duplicating = false;
+	bool Moving = false;
+	bool Removing = false;
+	bool Accepting = false;
+	bool Canceling = false;
+	bool Navigating = false;
+	bool Searching = false;
+	bool Closing = false;
+	bool Editing = false;
+	bool EditsInNewRow = true;
+	bool Hiding = false;
+	bool Clipboard = false;
+	bool FixedPaste = false;
+	bool ExtraPaste = true;
+
+	bool RejectNullRow = true;
+	bool KeepLastRow = false;
+	bool TabChangesRow = true;
+	bool TabAddsRow = false;
+	bool EnterLikeTab = false;
+	bool Chameleon = false;
+	bool DrawFocus = false;
+
+	//bool SetToolBar
+
+	Paint(w)
+	{
+		PaintGrid(w, GetRect());
+
+//		sz = ViewSize(w);
+//		w.DrawRect(0, 0, sz.cx, sz.cy, :Gray);
+		//w.DrawText(px, (sz.cy - textsize.cy) / 2, .SetText, .SetFont, .SetInkOff);
+	}
+
+	PaintGrid(w, r) {
+		fontcy = GetTextSize("X").cy;
+		cols = 3;
+		ind_width = fontcy;
+
+		focus_bg = Color(0, 102, 204);
+		live_bg = Color(187, 214, 241);
+		multi_bg = Color(217, 198, 251);
+
+		DrawCtrlFrame(w, r, .SetFrame);
+
+
+		if(!.AutoHideVertSb)
+		{
+			vsb = r;
+			r.right = vsb.left = vsb.right - fontcy - 4;
+			PaintVertSb(w, vsb);
+		}
+
+		if(!.AutoHideHorzSb)
+		{
+			hsb = r;
+			r.bottom = hsb.top = hsb.bottom - fontcy - 4;
+		}
+
+		if(.Indicator)
+			r.left = r.left + ind_width;
+
+		wd = r.right - r.left;
+
+		col_width = wd / cols;
+		row_height = fontcy + 4;
+		header_height = fontcy + 6;
+
+		body = r;
+		body.top = r.top + header_height;
+
+		for(i = 0; i < cols; i++)
+		{
+			rt = r;
+			rt.left = r.left + i * col_width;
+			rt.right = rt.left + col_width;
+			rt.bottom = body.top;
+			sorting = 0;
+			if(i == 0 && .Sorting)
+			{
+				sorting = 1;
+				if(.MultiSorting)
+					sorting = 2;
+			}
+			PaintHeader(w, rt, "Column " + to_string(i + 1), sorting);
+		}
+
+		if(.Indicator)
+		{
+			rt.right = r.left;
+			rt.left = r.left - ind_width;
+			PaintHeader(w, rt, "", 0);
+		}
+
+		hg = body.bottom - body.top;
+		rows = hg / row_height;
+
+		w.DrawRect(body.left, body.top, wd, hg, :SWhite);
+		if(.SelectRow)
+			w.DrawRect(body.left, body.top, wd, row_height, focus_bg);
+		else
+			w.DrawRect(body.left, body.top, col_width - 1, row_height, focus_bg);
+
+		if(.LiveCursor)
+		{
+			if(.SelectRow)
+				w.DrawRect(body.left, body.top + row_height, wd, row_height, live_bg);
+			else
+				w.DrawRect(body.left, body.top + row_height, col_width - 1, row_height, live_bg);
+		}
+
+		for(i = 0; i <= rows; i++)
+		{
+			row = body;
+			row.top = body.top + i * row_height;
+			row.bottom = row.top + row_height;
+
+			if(i > 0 && .HorzGrid)
+				w.DrawRect(row.left, row.top, row.right - row.left, 1, .GridColor);
+
+			if(.Indicator)
+			{
+				rt = row;
+				rt.right = rt.left;
+				rt.left = rt.left - ind_width;
+				PaintHeader(w, rt, "");
+				if(i == 0)
+				{
+					PaintImageCenter(w, rt, "GridCtrl:GridCtrl.iml:Focused");
+				}
+			}
+			if(.MultiSelect && (i == 3 || i == 6 || i == 7))
+			{
+				w.DrawRect(row.left, row.top + 1, wd, row_height - .HorzGrid, multi_bg);
+				if(.Indicator)
+					PaintImageCenter(w, rt, "GridCtrl:GridCtrl.iml:Selected");
+			}
+
+		}
+
+		if(.VertGrid)
+			for(i = 1; i <= cols; i++)
+				w.DrawRect(body.left + i * col_width - 1, body.top, 1, hg, .GridColor);
+
+		if(.MovingCols)
+		{
+			rt = body;
+			rt.left += col_width + col_width / 3;
+			rt.top += 10;
+			rt.right = rt.left + col_width;
+			rt.bottom = rt.top + header_height;
+			w.DrawRect(rt, :SLtGray);
+			PaintHeader(w, rt, "Moving columns");
+		}
+
+		if(.MovingRows)
+		{
+			rt = body;
+			rt.left += 5;
+			rt.top += 55;
+			rt.right = rt.left + col_width;
+			rt.bottom = rt.top + header_height;
+			w.DrawRect(rt, :SLtGray);
+			PaintHeader(w, rt, "Moving rows");
+		}
+
+		if(.ResizingCols)
+			w.DrawImage(body.left + col_width - 10, 8 + (body.top + 4 * row_height) * .FullColResizing, "GridCtrl:GridCtrl.iml:HorzPos");
+
+		if(.ResizingRows)
+			w.DrawImage((body.left + col_width / 2) * .FullRowResizing, body.top + row_height * 5 + 7, "GridCtrl:GridCtrl.iml:VertPos");
+
+		if(!.AutoHideHorzSb)
+			PaintHorzSb(w, hsb);
+
+	}
+
+	Sample()
+	{
+		.SetText = "Text";
+		.SetFont = Arial(10).Bold().Italic();
+	}
+};
diff --git a/uppsrc/GridCtrl/GridDisplay.cpp b/uppsrc/GridCtrl/GridDisplay.cpp
new file mode 100644
index 000000000..8d3eb1881
--- /dev/null
+++ b/uppsrc/GridCtrl/GridDisplay.cpp
@@ -0,0 +1,392 @@
+#include <CtrlLib/CtrlLib.h>
+
+NAMESPACE_UPP
+
+#include "GridDisplay.h"
+#define  IMAGECLASS GridImg
+#define  IMAGEFILE <GridCtrl/GridCtrl.iml>
+#include <Draw/iml_source.h>
+#include "GridUtils.h"
+
+GridDisplay StdGridDisplay;
+
+static Image (*vhdr[])() =
+{
+	GridImg::VHdr0,
+	GridImg::VHdr1,
+	GridImg::VHdr2,
+	GridImg::VHdr3,
+	GridImg::VHdr4,
+	GridImg::VHdr5,
+	GridImg::VHdr6
+};
+
+void GridDisplay::SetDefault()
+{
+	SetTextAlign();
+	SetHorzMargin();
+	SetVertMargin();
+	SetTheme();
+}
+
+WString GridDisplay::GetStdConvertedValue(const Value &v) const
+{
+	return IsString(v) ? v : StdConvert().Format(v);
+}
+
+void GridDisplay::Paint(Draw &w, int x, int y, int cx, int cy, const Value &val, dword style,
+						Color &fg, Color &bg, Font &fnt, bool found, int fs, int fe)
+{
+	if(cx == 0 || cy == 0) return;
+
+	if(style & GD::READONLY)
+	{
+		bg = Blend(bg, SGray(), 40);
+		fg = Blend(fg, SGray(), 200);
+	}
+
+	Color mg = bg;
+
+	int al = style & GD::ALIGN ? style & GD::ALIGN : align;
+
+	if(cx > lm + rm && cy > tm + bm)
+	{
+		int nx = x + lm;
+		int ny = y + tm;
+		int ncx = cx - lm - rm;
+		int ncy = cy - tm - bm;
+
+		if(IsNull(bgImg))
+		{
+			if(lm > 0) w.DrawRect(x, y, lm, cy, mg);
+			if(rm > 0) w.DrawRect(x + cx - rm, y, rm, cy, mg);
+			if(tm > 0) w.DrawRect(x, y, cx, tm, mg);
+			if(bm > 0) w.DrawRect(x, y + cy - bm, cx, bm, mg);
+
+			w.DrawRect(nx, ny, ncx, ncy, bg);
+		}
+		else
+			w.DrawImage(x, y, cx, cy, bgImg);
+
+		w.Clip(nx, ny, ncx, ncy);
+
+		if(!leftImg.IsEmpty())
+		{
+			Size isz = leftImg.GetSize();
+			w.DrawImage(nx, ny + (cy - isz.cy) / 2, leftImg);
+			nx += isz.cx + 3;
+		}
+		if(!rightImg.IsEmpty())
+		{
+			Size isz = rightImg.GetSize();
+			w.DrawImage(nx + ncx - isz.cx, y + (cy - isz.cy) / 2, rightImg);
+		}
+		if(!centerImg.IsEmpty())
+		{
+			Size isz = centerImg.GetSize();
+			w.DrawImage(x + (cx - isz.cx) / 2, y + (cy - isz.cy) / 2, centerImg);
+		}
+
+		if(!(style & GD::NOTEXT))
+		{
+			DrawText(w, nx, nx, ny, ncx, ncy, al, GetStdConvertedValue(val), fnt, fg, bg, found, fs, fe, style & GD::WRAP);
+		}
+
+		w.End();
+	}
+	else
+		w.DrawRect(x, y, cx, cy, bg);
+}
+
+void GridDisplay::PaintFixed(Draw &w, bool firstx, bool firsty, int x, int y, int cx, int cy, const Value &val, dword style, Font &fnt,
+		                     bool indicator, bool moved, int sortmode, int sortcol, int sortcnt, bool horizontal)
+{
+	bool chameleon = style & GD::CHAMELEON;
+	bool highlight = style & GD::HIGHLIGHT;
+	bool readonly  = style & GD::READONLY;
+
+	if(chameleon)
+	{
+		int ncx = cx;
+		int nx = x;
+
+		int ht = HeaderCtrl::StyleDefault().gridadjustment;
+
+		if(firstx)
+		{
+			if(ncx >= -ht)
+			{
+				ncx -= ht;
+				if(ncx < 0)
+					ncx = 0;
+			}
+		}
+		else
+			nx -= ht;
+
+		int q = CTRL_NORMAL;
+		if(highlight)
+			q = CTRL_HOT;
+		if(readonly)
+			q = CTRL_DISABLED;
+
+		ChPaint(w, nx, y, ncx, cy, HeaderCtrl::StyleDefault().look[q]);
+	}
+	else
+	{
+		if(theme < 0)
+			w.DrawRect(x, y, cx, cy, highlight ? Blend(SColorFace(), White, 128) : SColorFace());
+		else
+		{
+			int sx = cx > 1 ? cx : 1;
+			int sy = cy - 1;
+			if(sx > 0 && sy > 0)
+				w.DrawImage(x, y, sx, sy, highlight ? Contrast(vhdr[theme](), 230) : vhdr[theme]());
+		}
+
+		Color dark(76, 83, 92);
+		Color bright(White);
+
+		if(!firstx) w.DrawRect(x, y, 1, cy, bright);
+		if(!firsty) w.DrawRect(x, y, cx, 1, bright);
+
+		if(firstx) w.DrawRect(x, y, 1, cy, dark);
+		if(firsty) w.DrawRect(x, y, cx, 1, dark);
+
+		w.DrawRect(x + cx - 1, y, 1, cy, dark);
+		w.DrawRect(x, y + cy - 1, cx, 1, dark);
+
+	}
+
+	int tx = x + lm;
+
+	if(firsty)
+	{
+		if(!leftImg.IsEmpty())
+		{
+			Size isz = leftImg.GetSize();
+			w.DrawImage(tx, y + (cy - isz.cy) / 2, leftImg);
+			tx += isz.cx + 3;
+		}
+		if(!rightImg.IsEmpty())
+		{
+			Size isz = rightImg.GetSize();
+			w.DrawImage(x + cx - isz.cx - 3, y + (cy - isz.cy) / 2, rightImg);
+		}
+		if(!centerImg.IsEmpty())
+		{
+			Size isz = centerImg.GetSize();
+			w.DrawImage(x + (cx - isz.cx) / 2, y + (cy - isz.cy) / 2, centerImg);
+		}
+	}
+
+	if(moved)
+	    DrawBorder(w, x, y, cx, cy, BlackBorder);
+
+	Color col = style & GD::READONLY ? Gray : Black;
+
+	if(sortmode > 0)
+	{
+		Size isz = GridImg::SortAsc().GetSize();
+
+		int yf = y + (cy - isz.cy) / 2;
+		int xf = tx + 2;
+		tx = xf + isz.cx + 1;
+
+		if(sortcol > 0 && sortcnt > 1)
+		{
+			String tcol = AsString(sortcol);
+
+			Size tsz = GetTextSize(tcol, fnt);
+			w.DrawText(tx, y + (cy - tsz.cy) / 2, tcol, fnt);
+			tx += tsz.cx;
+		}
+
+		if(sortmode == 1)
+			w.DrawImage(xf, yf, GridImg::SortAsc(), col);
+		else
+			w.DrawImage(xf, yf, GridImg::SortDsc(), col);
+
+		tx += 3;
+	}
+	if(indicator)
+	{
+		w.Clip(x, y, cx, cy);
+		if((style & GD::CURSOR) && (style & GD::SELECT))
+		{
+			Size isz = GridImg::FocSel().GetSize();
+			w.DrawImage(x + (cx - isz.cx) / 2, y + (cy - isz.cy) / 2, GridImg::FocSel(), col);
+		}
+		else if(style & GD::CURSOR)
+		{
+			Size isz = GridImg::Focused().GetSize();
+			w.DrawImage(x + (cx - isz.cx) / 2, y + (cy - isz.cy) / 2, GridImg::Focused(), col);
+		}
+		else if(style & GD::SELECT)
+		{
+			Size isz = GridImg::Selected().GetSize();
+			w.DrawImage(x + (cx - isz.cx) / 2, y + (cy - isz.cy) / 2, GridImg::Selected(), col);
+		}
+		w.End();
+	}
+	else if(cx > lm + rm && cy > tm + bm)
+	{
+		int nx = x + lm;
+		int ny = y + tm;
+		int ncx = cx - lm - rm;
+		int ncy = cy - tm - bm;
+
+		w.Clip(nx, ny, ncx, ncy);
+
+		int al = style & GD::ALIGN ? style & GD::ALIGN : align;
+
+		Color fg = style & GD::READONLY ? SColorDisabled() : SColorText();
+
+		DrawText(w, tx, nx, ny, ncx, ncy, al, GetStdConvertedValue(val), fnt, fg, SColorPaper, 0, 0, 0, style & GD::WRAP);
+
+		w.End();
+	}
+}
+
+void GridDisplay::DrawText(Draw &w, int mx, int x, int y, int cx, int cy, int align, const wchar *s, const Font &font, const Color &fg, const Color &bg, bool found, int fs, int fe, bool wrap)
+{
+	if(*s == 0)
+		return;
+
+	int tcy = font.Info().GetHeight();
+
+	const wchar *p = s;
+	const wchar *t = s;
+
+	int lines = 0;
+
+	int ty = y;
+	Size tsz;
+
+	if((align & GD::VCENTER) || (align & GD::BOTTOM))
+	{
+		const wchar * e = t;
+		int ccx = max(5, cx);
+
+		while(*p)
+		{
+			if(*p == '\n' || *(p + 1) == '\0')
+			{
+				if(wrap)
+				{
+					int tcx = GetTextSize(e, font, p - e).cx;
+					if(tcx > cx)
+					{
+						lines += tcx / ccx;
+						if(tcx % ccx > 0)
+							lines++;
+					}
+					else
+						lines++;
+				}
+				else
+					lines++;
+				e = p;
+			}
+			p++;
+		}
+		if(align & GD::VCENTER)
+			ty = y + (cy - tcy * lines) / 2;
+		else
+			ty = y + cy - tcy * lines;
+		p = s;
+	}
+
+	Size isz = GridImg::Dots2().GetSize();
+	int gcx = cx - (wrap ? 0 : isz.cx);
+
+	while(true)
+	{
+		bool nextline = *p == '\n';
+		bool caret    = *p == '\r';
+		bool endtext  = *p == '\0';
+
+		const wchar * pp = p;
+
+		bool textbreak = false;
+		if(nextline || endtext)
+		{
+			int tx = x;
+			tsz = GetTextSize(t, font, p - t);
+
+			if(tsz.cx > gcx)
+			{
+				int size = 0;
+				const wchar * e = t;
+				while(e < p)
+				{
+					int tcx = GetTextSize(e, font, 1).cx;
+					size += tcx;
+					if(size > gcx)
+						break;
+					e++;
+				}
+
+				p = e;
+				if(wrap)
+				{
+					textbreak = true;
+					if(p == t)
+						p = t + 1;
+				}
+			}
+
+			if(align & GD::RIGHT)
+				tx = x + cx - tsz.cx;
+			else if(align & GD::HCENTER)
+				tx = x + (cx - tsz.cx) / 2;
+
+			Color tfg = fg;
+			if(found)
+			{
+				int chs = t - s;
+				int che = p - s - 1;
+
+				if(fs <= che && fe >= chs)
+				{
+					int scx = GetTextSize(t, font, max(chs, fs) - chs).cx;
+					int ecx = GetTextSize(t, font, min(che, fe) - chs + 1).cx;
+					w.DrawRect(max(mx, tx) + scx, ty, ecx - scx, tcy, Color(255, 239, 45));
+				}
+				tfg = Black();
+			}
+
+			bool dots = !wrap && tsz.cx > gcx;
+			if(dots)
+			{
+				w.Clip(x, y, cx, cy);
+				w.DrawImage(x + cx - isz.cx, ty + font.Info().GetAscent() - isz.cy, GridImg::Dots2, tfg);
+				w.End();
+				if(p > t)
+				{
+					w.Clip(x, y, cx - isz.cx , cy);
+					w.DrawText(max(mx, tx), ty, t, font, tfg, p - t);
+					w.End();
+				}
+			}
+			else
+				w.DrawText(max(mx, tx), ty, t, font, tfg, p - t);
+
+			ty += tcy;
+			t = textbreak ? p : (p = pp + 1);
+		}
+		if(caret)
+			*(char *) p = ' ';
+
+		if(!textbreak)
+		{
+			if(endtext)
+				break;
+			else
+				p++;
+		}
+
+	}
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/GridCtrl/GridDisplay.h b/uppsrc/GridCtrl/GridDisplay.h
new file mode 100644
index 000000000..be24d9441
--- /dev/null
+++ b/uppsrc/GridCtrl/GridDisplay.h
@@ -0,0 +1,99 @@
+#ifndef _GridCtrl_GridDisplay_h_
+#define _GridCtrl_GridDisplay_h_
+
+#define  IMAGEFILE <GridCtrl/GridCtrl.iml>
+#define  IMAGECLASS GridImg
+#include <Draw/iml_header.h>
+
+#define BIT(x) (1 << x)
+
+class GridCtrl;
+
+namespace GD
+{
+	enum
+	{
+		CURSOR    = BIT(0),
+		SELECT    = BIT(1),
+		LIVE      = BIT(2),
+		FOCUS     = BIT(3),
+		READONLY  = BIT(4),
+		FOUND     = BIT(5),
+		HIGHLIGHT = BIT(6),
+		EVEN      = BIT(7),
+		ODD       = BIT(8),
+		LEFT      = BIT(9),
+		RIGHT     = BIT(10),
+		TOP       = BIT(11),
+		BOTTOM    = BIT(12),
+		HCENTER   = BIT(13),
+		VCENTER   = BIT(14),
+		HPOS      = BIT(15),
+		VPOS      = BIT(16),
+		WRAP      = BIT(17),
+		CHAMELEON = BIT(18),
+		NOTEXT    = BIT(19),
+		BOLDKEY   = BIT(20),
+		BOLDVALUE = BIT(21),
+		HALIGN    = LEFT | RIGHT | HCENTER,
+		VALIGN    = TOP | BOTTOM | VCENTER,
+		ALIGN     = HALIGN | VALIGN
+	};
+}
+
+class GridDisplay
+{
+	public:
+
+		Image	leftImg;
+		Image	rightImg;
+		Image   centerImg;
+		Image	bgImg;
+		int 	align;
+		int		lm, rm, tm, bm;
+		int     theme;
+
+		int 	col, row;
+
+		GridCtrl *parent;
+
+		GridDisplay()
+		{
+			SetDefault();
+		}
+
+		void SetDefault();
+
+		~GridDisplay() {};
+
+		void SetLeftImage(const Image &img)			    { leftImg = img;               }
+		void SetRightImage(const Image &img)		    { rightImg = img;              }
+		void SetCenterImage(const Image &img)		    { centerImg = img;  	       }
+		void SetBgImage(Image &img)					    { bgImg = img;    	           }
+		void SetTextAlign(int al = GD::TOP | GD::LEFT)  { align = al;                  }
+		void SetHorzMargin(int left = 4, int right = 4) { lm = left; rm = right;  	   }
+		void SetVertMargin(int top = 0, int bottom = 0) { tm = top;  bm = bottom;      }
+		void SetTheme(int th = 6)                       { theme = th;                  }
+		int  GetThemeCount()                            { return 7;                    }
+
+		WString GetStdConvertedValue(const Value &v) const;
+
+		void DrawText(Draw &w, int mx, int x, int y, int cx, int cy, int align,
+					  const wchar *s, const Font &font, const Color &fg, const Color &bg,
+					  bool found = false, int fs = 0, int fe = 0, bool wrap = false);
+
+		virtual void Paint(Draw &w, int x, int y, int cx, int cy, const Value &val, dword style,
+				           Color &fg, Color &bg, Font &fnt, bool found = false, int fs = 0, int fe = 0);
+
+		virtual void PaintFixed(Draw &w, bool firstx, bool firsty, int x, int y, int cx, int cy, const Value &val, dword style, Font &fnt,
+								bool indicator = false, bool moved = false,
+								int sortmode = 0, int sortcol = -1, int sortcnt = 0, bool horizontal = true);
+
+};
+
+struct GridDisplayCtrl : GridDisplay, StaticRect
+{};
+
+extern GridDisplay StdGridDisplay;
+
+#endif
diff --git a/uppsrc/GridCtrl/GridSort.cpp b/uppsrc/GridCtrl/GridSort.cpp
new file mode 100644
index 000000000..105f92aec
--- /dev/null
+++ b/uppsrc/GridCtrl/GridSort.cpp
@@ -0,0 +1,195 @@
+#include "GridCtrl.h"
+
+NAMESPACE_UPP
+
+/*
+bool GridCtrl::operator<(const Vector<Value>& a, const Vector<Value>& b)
+{
+	for(int i = 0; i < SortOrder.GetCount(); i++)
+	{
+		if(sortMode)
+			return (StdValueCompare((*a.items)[a.id][sortCol].val, (*b.items)[b.id][sortCol].val, 0) < 0);
+		else
+			return a.id < b.id;
+
+	}
+}
+*/
+
+void GridCtrl::GSort(int scol)
+{
+	int col;
+
+	int cnt = sortOrder.GetCount();
+
+	if(cnt == 0)
+		return;
+
+	if(scol < 0)
+		scol = cnt - 1;
+
+	col = sortOrder[scol];
+
+	//int order = 1;
+	int order = hitems[col].sortmode;
+
+	/* dla trybu multisort nie mozna w ten sposob
+	   sortowac dla pierwszej kolumny */
+
+	if(cnt > 1 && scol != 0)
+	{
+		int match = 1;
+		int is = fixed_rows;
+
+		for(int i = fixed_rows + 1; i < total_rows; i++)
+		{
+			int n = vitems[i].id;
+			int m = vitems[is].id;
+
+			bool found = true;
+			for(int j = 0; j < scol; j++)
+			{
+				int k = sortOrder[j];
+				if(items[n][k].val != items[m][k].val)
+				{
+					found = false;
+					break;
+				}
+			}
+
+			if(found)
+			{
+				match++;
+				continue;
+			}
+			else
+			{
+				if(match > 1)
+					GSort(col, order, is, match);
+
+				match = 1;
+				is = i;
+			}
+		}
+		if(match > 1)
+			GSort(col, order, is, match);
+	}
+	else
+		GSort(col, order, fixed_rows);
+
+}
+
+void GridCtrl::GSort(int col, int order, int from, int count)
+{
+	if(count == 0)
+		return;
+
+	ItemRect::sortCol = col;
+	ItemRect::sortMode = (order != 0);
+
+	VItems::Iterator its, ite;
+
+	its = vitems.Begin() + from;
+
+	if(count < 0)
+		ite = vitems.End();
+	else
+		ite = its + count;
+
+	if(order < 2)
+		Upp::Sort(its, ite, StdLess<ItemRect>());
+	else
+		Upp::Sort(its, ite, StdGreater<ItemRect>());
+}
+
+
+void GridCtrl::Multisort()
+{
+	GSort(-1, 0, fixed_rows);
+	for(int i = 0; i < sortOrder.GetCount(); i++)
+		GSort(i);
+}
+
+int GridCtrl::InMultisort(int col)
+{
+	for(int i = 0; i < sortOrder.GetCount(); i++)
+		if(col == sortOrder[i])
+			return i;
+
+	return -1;
+}
+
+bool GridCtrl::ClearMultisort()
+{
+	if(sortOrder.IsEmpty())
+		return false;
+
+	return ClearSorted();
+}
+
+bool GridCtrl::ClearSorted()
+{
+	bool sorted = false;
+
+	for(int i = 0; i < total_cols; i++)
+	{
+		if(hitems[i].sortMode > 0)
+			sorted = true;
+		hitems[i].sortmode = 0;
+		hitems[i].sortcol = 0;
+	}
+
+	return sorted;
+}
+
+bool GridCtrl::IsSorted()
+{
+	return sortOrder.GetCount() > 0 || sortCol >= 0;
+}
+
+GridCtrl& GridCtrl::Sort(int sort_col, int sort_mode, bool multisort, bool repaint)
+{
+	int col = GetIdCol(sort_col + fixed_cols);
+	if(col < 0)
+		return *this;
+
+	if(!multisort)
+	{
+		sortOrder.Clear();
+		ClearSorted();
+	}
+
+	sortOrder.Add(col);
+
+	hitems[col].sortmode = sort_mode;
+	hitems[col].sortcol = sortOrder.GetCount();
+	GSort();
+
+	UpdateCursor();
+
+	if(repaint)
+		Repaint(false, true);
+	return *this;
+}
+
+GridCtrl& GridCtrl::Sort(Id id, int sort_mode, bool multisort, bool repaint)
+{
+	return Sort(aliases.Get(id) - fixed_cols, sort_mode, multisort, repaint);
+}
+
+GridCtrl& GridCtrl::MultiSort(int sort_col, int sort_mode)
+{
+	return Sort(sort_col, sort_mode, true);
+}
+
+GridCtrl& GridCtrl::MultiSort(Id id, int sort_mode)
+{
+	return Sort(aliases.Get(id) - fixed_cols, sort_mode, true);
+}
+
+void GridCtrl::ClearSort()
+{
+	Sort(0, SORT_ID);
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/GridCtrl/GridText.cpp b/uppsrc/GridCtrl/GridText.cpp
new file mode 100644
index 000000000..9fc143c8b
--- /dev/null
+++ b/uppsrc/GridCtrl/GridText.cpp
@@ -0,0 +1,21 @@
+//#include "GridCtrl.h"
+
+
+//class GridText : Ctrl
+//{
+//	private:
+//		GridDisplay display;
+//		WString* text;
+//
+//	public:
+//
+//		GridText() {}
+//
+//		virtual void Paint(Draw& w)
+//		{
+//			Rect r = GetRect();
+//			display->Paint(w, r.left, r.top, r.Width(), r.Height(), *text, 0, fg, bg, fnt);
+//		}
+//
+//
+//};
diff --git a/uppsrc/GridCtrl/GridUtils.cpp b/uppsrc/GridCtrl/GridUtils.cpp
new file mode 100644
index 000000000..659f39d02
--- /dev/null
+++ b/uppsrc/GridCtrl/GridUtils.cpp
@@ -0,0 +1,67 @@
+#include <CtrlLib/CtrlLib.h>
+
+NAMESPACE_UPP
+
+LineEdit *dlog = NULL;
+DropList *dlev = NULL;
+
+static int pos = 0;
+
+void LogCon(const char *fmt, ...)
+{
+	char buffer[1024];
+	va_list argptr;
+	va_start(argptr, fmt);
+	int l = vsprintf(buffer, fmt, argptr);
+	va_end(argptr);
+	LOG(buffer);
+}
+
+void LogCon(int level, const char *fmt, ...)
+{
+	char buffer[1024];
+	va_list argptr;
+	va_start(argptr, fmt);
+	int l = vsprintf(buffer, fmt, argptr);
+	va_end(argptr);
+	LOG(buffer);
+}
+
+
+void LogGui(const char *fmt, ...)
+{
+	if(!dlog || !dlev || int(~(*dlev)) > 0)
+		return;
+
+	char buffer[1024];
+	va_list argptr;
+	va_start(argptr, fmt);
+	int l = vsprintf(buffer, fmt, argptr);
+	va_end(argptr);
+
+	dlog->Insert(pos, buffer);
+	pos += l;
+	dlog->Insert(pos, "\n");
+	pos++;
+	dlog->SetCursor(pos);
+}
+
+void LogGui(int level, const char *fmt, ...)
+{
+	if(!dlog || !dlev || level < int(~(*dlev)))
+		return;
+
+	char buffer[1024];
+	va_list argptr;
+	va_start(argptr, fmt);
+	int l = vsprintf(buffer, fmt, argptr);
+	va_end(argptr);
+
+	dlog->Insert(pos, buffer);
+	pos += l;
+	dlog->Insert(pos, "\n");
+	pos++;
+	dlog->SetCursor(pos);
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/GridCtrl/GridUtils.h b/uppsrc/GridCtrl/GridUtils.h
new file mode 100644
index 000000000..84fcd4608
--- /dev/null
+++ b/uppsrc/GridCtrl/GridUtils.h
@@ -0,0 +1,58 @@
+#ifndef _GridCtrl_GridUtils_h_
+#define _GridCtrl_GridUtils_h_
+
+#define BIT(x) (1 << x)
+
+inline bool IsSet(int s, int b)
+{
+	return s & b;
+}
+
+inline void BitSet(dword &k, dword v, bool s)
+{
+	if(s) k |= v; else  k &= ~v;
+}
+
+inline bool BitInverse(dword &k, dword v)
+{
+	bool s = k & v;
+	BitSet(k, v, !s);
+	return s;
+}
+
+inline int Distance(const Point &p0, const Point &p1)
+{
+	return max(abs(p0.x - p1.x), abs(p0.y - p1.y));
+}
+
+inline int32 Round(double a)
+{
+	#ifdef flagGCC
+	return (int32) a;
+	#else
+	int32 retval;
+
+	__asm fld a
+	__asm fistp retval
+	return retval;
+
+	#endif
+}
+
+#ifdef flagDEBUG
+#define LG //LogCon
+#else
+#define LG
+#endif
+#define LGR //LogCon
+
+extern LineEdit *dlog;
+extern DropList *dlev;
+
+void LogGui(const char *fmt, ...);
+void LogGui(int level, const char *fmt, ...);
+
+void LogCon(const char *fmt, ...);
+void LogCon(int level, const char *fmt, ...);
+
+#endif
diff --git a/uppsrc/GridCtrl/ToDo.txt b/uppsrc/GridCtrl/ToDo.txt
new file mode 100644
index 000000000..c362f4780
--- /dev/null
+++ b/uppsrc/GridCtrl/ToDo.txt
@@ -0,0 +1,49 @@
+To do
+---------------------------------
+
+- modify GSort to use stable sort (faster?)
+- optimize resizeing in absolute mode (more than 10.000 rows)
+- many Hide/Show in proportional mode for the same column cause it's getting smaller and smaller
+- fix selecting proper column index during moiving columns when some columns are hidden
+- optimized version of SyncCtrls (yep, over 1000 rows there are performance problems)
+
+Done
+---------------------------------
+
+- when edits are visible switching off/on indicator make their positions incorrect
+- tab/shift+tab does not store the new cell value -> done
+- focus is not restored after moving column/row -> done
+- port to linux -> almost done
+- when line resizing mode is set and user is resizeing columns and scrollbar suddenly appears
+  line isn't cleared correctly
+- Hide doesn't update scrollbar total size
+- SetRowHeight should not call directly lh.Recalc, it should set lh.ready to false
+- add update of first/last/vis/col/row in SetFixedCols(), SetFixedRows()
+- add scrolling during moving cursor left/right when selectRow is true
+
+Critical
+---------------------------------
+
+
+Polish
+---------------------------------
+
+gdy czesc kolumn jest ukryta problem przy ctrl->up/down (a selekcje??)
+
+SetCursor sie wywala jesli do gridu dodalo sie wiersz ale nie ma dodanej kolumny (w arrayctrl taka
+kombinacja dziala)
+
+jak jest wlaczony droplist i zmieni sie w nim wartosc i nacisnie sortowanie to dokonuje sie ono po
+niezmienionych wartosciach items (a powinno po widocznych w kontrolce).
+Wyjscie: albo zabronic sortowania w takim przypadku, albo na chwile zaakceptowac wartosc z kontrolki
+posortowac o podmienic na stara.
+
+gdy np sa dwie pierwsze wiersze w trybie read-only i nizej jest aktywna kontrolka i nacisnie sie pageup
+to kursor nie zmienia pozycji (bo tam gdzie chce skoczyc jest read-only) a powinien sie ustawic na pierwszej edytowalnej
+komorce
+
+gdy nie ma zadnych kolumn Clear ustawia lastVisRow i firstVisRow na 1 co powoduje crash gdy kliknie sie na ciele kontrolki
+
+
+
+gdy index jest na koncu zle czarne miejsce sie rysuje po prawej
\ No newline at end of file
diff --git a/uppsrc/GridCtrl/changelog.txt b/uppsrc/GridCtrl/changelog.txt
new file mode 100644
index 000000000..e74dc81a3
--- /dev/null
+++ b/uppsrc/GridCtrl/changelog.txt
@@ -0,0 +1,265 @@
+[+] - new feature
+[-] - bugfix
+[*] - change
+
+
+0.95
+	> first public version
+
+0.96
+	* abandomed header/body structure - back to one control layout
+	+ each column can have control binded that is visible in each row
+	+ resizeing of fixed columns/rows is now possible
+	+ Fixed, Min and Max finally works in proportional mode
+	+ Sortable() - determines if column can be sorted
+	+ auto highlighing for fixed columns in any theme
+	+ usc file, now gridctrl is visible in layout editor (Complex->GridCtrl)
+	+ rows, columns as well as individual cell can work in read-only mode
+	+ Tutorial started..
+	+ GetSelectedItemsCount() - returns number of selected items
+	- if there are no fixed rows moving row before firsrt row is now possible
+	- if immediate search is off searching is executing on enter
+	  GetRow().Editable(0/1)
+	  GetColumn().Editable(0/1)
+	  GetCell().Editable(0/1)
+	- some corner cases fixed..
+	- many internal fixes, code clean up
+
+	after 612-dev2
+
+	* iml converted to the newer format
+	- if fixed rows == 0 nothing was displayed
+	- controls were not hidden if cell changed to fixed and part of ctrl interesced its cell rect
+	+ moved column/row use chameleon theme if active
+	- updated gcc compatibility
+	- blue line is properly painted at first/last col/row (before its witdth was 1 instead of 2)
+	+ content of grid can be scrolled left/right in row select mode
+	- fixed controls synchronization
+
+	after 612-dev3
+
+	* line resizing mode now works in linux
+	+ copy/paste
+	- set() crashed if row was greater than total rows count
+	* Block selection can be one only now
+	- RefreshRows refreshed wrong ctrl area
+	- selection was lost if shift/ctrl was realeased before mouse button
+	- fixed positioning cursor after deleting selected rows
+	- fixed deleting selected rows if rows are not in continous block
+	* Append and Insert refresh new rows
+
+	after 701-dev1
+
+	- fixed copy/paste in cell, shift mode
+	- fixed canecling new row
+	- fixed refreshing after appending/inserting/removing operations in proportional row mdoe
+	* in select_row mode first ctrl is always activated after first edits show
+	+ ExtraPaste() enables/disables paste as new rows, paste as appended rows menu
+	+ FixedPaste() disables adding rows during pasting
+	+ paste now calls WhenUpdateCell/WhenInsertRow/WhenUpdateRow callbacks
+	- fixed coping/paste of cursor line (which is not formaly selected)
+	+ pasting text clipboard
+
+	after 2007.1beta
+
+	* row/col coloring always starts from white color no matter how many fixed rows/cols are
+	+ usc: ColorRows, ColorCols options
+	+ usc: added missing new functionality (cliborad)
+	* Add(n, size) removed becouse of conflict with Add(Value v, ...). Added Add() - adds one row
+
+	after 2007.1beta2
+
+	- fixed calling WhenUpdateCell in Ctrls mode (regression)
+	- tab key in select_row mode went into editing mode instead of changing row or setting focus on visible ctrl (regression)
+	+ Value Get() - returns value of cursor cell
+	+ Point GetCursorPos() - returns full cursor position
+	+ Ctrl * GetCtrl(...) - return pointer to cell's control
+	+ Option() - makes given column the option column (AddColumn().Option() = AddColumn().Ctrls(MakeOption))
+	+ Value GetFixed(r, c) - returns value of fixed column c at row r
+	+ Value GetFixed(c) - returns value of fixed column c at first row
+
+	after 2007.1beta3
+
+	* Set() now always store value in cell data structure even if that cell has ctrl
+	* All Set(int c, ...) methods now use rowidx for selecting row instead of curpos.y
+	- Set did not set ctrl value if ctrl was created by Ctrls()
+	+ SetCtrlValue(..) - sets value of cell control
+	- In WhenUpdate/WhenInsert rowidx had wrong value (regression)
+	* control focusig code cleanup
+	- fixed 's' key problem (cursor went up after pressing it)
+	- there was unnecessary WhenUpdateRow/WhenInsertRow call after sorting and then changing row
+
+	after 2007.1rc1
+
+	- moving cols/rows - popuped cell was paint in wrong position if internal toolbar was on top or left side of grid
+	- highlighting of fixed cells was broken if there were no non-fixed rows/cols
+	- edits no longer appear in edit row mode if "factory" ctrl is clicked
+	- edits' values were not properly updated when row was change after clicking "factory" ctrl (regression)
+	- fixed crash after removing a row and then changing cursor position (regression)
+	- Clear() didn't update rowidx
+	- RefreshRow(n) use rowidx if n	< 0 instead of curpos.y
+
+	ok seems to be ready for 2007.2
+
+	after 2007.1rc2
+
+	+ Sort/MultiSort methods
+
+	after 2007.1rc3
+
+	* WhenUpdateCell is always called no metter what edit mode is set
+	- Esc corectly restores values in row edit mode (regression)
+	- Sort(...) now updates cursor positon
+	- rectangular selections were possible only if multiselect mode was set
+	+ rectangular selections can be marked with keyboard (CTRL + arrows)
+	- fixed usc script (wrong initial states for accepting/removing/inserting)
+	- it's now impossible to change cursor position if value in active control is wrong
+	- Remove updates selected_rows/items values (before only DoRemove did that)
+	+ IsModified(..) - returns if value of cell was changed
+
+	after 2007.1rc5/final
+
+	+ introduced joined cells - JoinCells(), JointFixedCells()
+	- cursor is not hidden after clicking below rows (only edits are closed then) (regression)
+	+ AddRow returns ItemRect& now, but Add still returns GridCtrl&
+	+ clicking on edit's child control move focus
+
+	after 704-dev1
+
+	* Esc pass control to parent if there is nothing to cancel
+	- focused ctrl lost focus if its position was changed by cursor keys (regression)
+	- new column move indicator had 0 width if hidden column was pointed
+	- in some cases cursor was hidden after removing row
+	- scrollbars were not updated after reomoving selected rows
+	+ DrawFocus() - shows active cell even in select_row mode
+	- fixed column widths calculation bug related to min max restrictions
+	- after paste selection was not cleared
+	- rectangular selection caused crash in some cases if they were made with keyboard
+	- fixed crash if inserted row was canceled (removed) in insert callback
+	- enter accepted row with wrong values in controls
+	- if last cell had worng value in embeded control and tab was pressed focus of that control was lost
+	- WhenRemoveRow was called if new (not commited) row was canceled (eg. by pressing ESC)
+	- toolbar icons were not properly refreshed
+	+ CancelInsert() - should be called in WhenInsertRow to cancel inserting a new row
+	+ CancelUpdate() - should be called in WhenUpdateRow to restore original values of a row
+	+ CancelRemove() - should be called in WhenRemoveRow to cancel removing a current row
+	* Remove() without aguments remove current row
+
+	after 705-dev1
+
+	- cancel did not work as it should in edit row mode
+	- focus was not set to control which could not be accepted
+	- edit in right menu was disabled in some cases
+	+ CancelAll - in this mode esc restore all previous values in edit cell mode (it is default for edit row mode)
+	- fixed some problems with accepting and rejecting grid
+
+	after 705-dev3
+
+	- fixed issues with removing an edited row and calling WhenRemoveRow - now finally is should work fine
+	- edits where not resized if layout changed (regression)
+	- fixed text wrapping for single line
+	- aligning for header can now be set using HeaderAlign and variations
+	- fixed GetItem and inline attribute problem in GCC
+	- fixed updating cell's value after changing focus from ctrl to ctrl with invalid (not accepted) data
+	- fixed tab key and selecting control focus problem
+
+	after 707-dev1
+
+	* find's options open at fixed position instead of mouse click position
+	- find's edit use GetStdSize() to determine its height (to proper scale at dpi > 96)
+	* in select full row mode ctrl_up/down swaps rows position
+	+ inserting after and duplicating finally implemented
+	- fixed key bindings for inserting/appending
+	- added missing icons in popup menu
+	- fixed cursor entering
+	- fixed SetCursorId()
+	- fixed wrong value returned by SetCursor(n)
+	+ searching without toolbar
+
+	after 708-dev1
+
+	- toolbar is rebuilt when grid is enabled/disabled (Ctrl::Enable should be virtual!)
+	+ GetCurrentRow() - returns "current row" index - mostly cursor position, but sometimes cursor and current row position can be different
+	- more const correctness fixes
+	- if some rows were hidden it was still possible to navigate by those rows using cursor up/down (R)
+	- fixed crash in Append0(n) if n > 1 (R)
+	- fixed crash in Editable called for a row
+	+ EditConvert(Ctrl &ctrl) - synonym for sequence Edit().SetConvert()
+
+	after 708-dev2
+
+	+ CancelAccept() - called in callback When(Insert/Update) cancel inserting/updating operation but do not close edits
+	- fixed crash when dupliacing a row in empty grid
+	+ IsFilled() - opposite to IsEmpty()
+
+	after 709-dev2
+
+	+ IsRowInserted(), IsRowUpdated(), IsRowRemoved - valid in all life-cycle of grid
+	+ RemoveHides() - in this mode grid hide row instead of phisicly remove it
+	- fixed rare crash in PaintFixed()
+	+ searching is now able to highlight letters in multiline text
+	- fixed resize panel - min size was not set properly in some cases
+	- fixed rare scrolling artifacts
+	+ added FindInRow to find value in given row - returns column number
+
+	after 710-dev1
+
+	- in edit row mode null values in not null controls were not respected if grid was "prefilled" with null data
+	- fixed crash when adding column to filled grid
+	+ grid respects read-only mode now (only resizeing/moving/scrolling works in this mode)
+	- fixed bug in GridCtrl::ItemRect::SetFont - it doesn't work and may lead to crash
+	- fixed strage bug connected with focus and bulit-in toolbar
+	- added WhenChangeCol
+	- added GoTo(int r, int c)
+	- fixed SetCursor(Point). Point was not relative.
+	- fixed searching. If search_hide was disabled after matching 0 rows and then peressing esc or backspace grid displayed nothing
+	- fixed selection removing in remove hides mode (mostly crashes, for one row it worked ok).
+	- fixed row inserting (after). Previous cursor position didn't disapear (regression)
+	+ SetImage() works for row now
+
+	after 711-dev1
+
+	- fixed Remove0 - it didn't clear cursor position if cnt > 1
+	- fixed Searching - now the searching flag is respected in immediate searching
+	+ AddSeparator(Color c) - inserts 3 pixel height separator
+	* IsEnd restores rowidx now - it's now more safe to use FOREACH* macros
+	- fixed elipsses in multiline texts
+	- fixed Searching() one more time
+	- some fixes to sorting
+	+ added Skip to ItemRect. If true the given row/col is skipped during Find()
+	+ fixed some regressions with painting header
+	+ added WhenCursor callback and CancelCursor() to cancel changing cursor position from body
+	  of this callback.
+
+	after 711-dev2
+
+	do not remember :)
+
+	after 712-dev1
+
+	* made find string control vista compatabile, removed unecessary members
+	- fixed coping/paste and WhenInsertRow/WhenUpdateRow issues (wrong rowidx, one callback call
+	  for multiple rows)
+	+ added German translation
+	* WhenEditRow removed - added WhenStartEdit
+	* WhenAcceptRow is always called now - no metter if any cell in row changed its value or not,
+	  WhenAcceptedRow is called only if there was chanage in a row
+
+	after 2008.1beta
+
+	- commented out DragAndDrop. It caused crashes
+	* IsNewRowOrder() renamed to IsOrderChanged()
+	+ IsDataChanged() - returns true if data in grid were edited
+	+ Crlc-C creates now 2 clipboards - one internal and one textual
+	+ AskRemove() - if set question is shown before deleting a row
+	+ editing of row was possible (through double click) even if editing flag was not set
+	- Clear refreshes toolbar now
+	+ added Get*Align() to ItemRect
+
+	after 2008.1beta2
+
+	- hiding/showing columns works again in proportional mode (R)
+	- align value from AttrText was inproperly passed to cell style
+	+ added Header(bool) - to turn on/off the header
+	- some fixes to Ready()
+	+ added RowChanging(bool) - false -> changing row is not possible
diff --git a/uppsrc/GridCtrl/init b/uppsrc/GridCtrl/init
new file mode 100644
index 000000000..7c9a2f5a5
--- /dev/null
+++ b/uppsrc/GridCtrl/init
@@ -0,0 +1,4 @@
+#ifndef _GridCtrl_icpp_init_stub
+#define _GridCtrl_icpp_init_stub
+#include "CtrlLib/init"
+#endif
diff --git a/uppsrc/GridCtrl/src.tpp/API$en-us.tpp b/uppsrc/GridCtrl/src.tpp/API$en-us.tpp
new file mode 100644
index 000000000..d31ddf810
--- /dev/null
+++ b/uppsrc/GridCtrl/src.tpp/API$en-us.tpp
@@ -0,0 +1,5 @@
+TITLE("API")
+COMPRESSED
+120,156,133,148,95,143,219,84,16,197,191,74,164,44,18,4,239,106,254,222,59,215,126,169,180,229,181,72,80,158,162,136,58,169,65,17,233,110,73,92,21,9,177,159,157,51,78,10,188,17,43,78,30,124,230,204,252,230,92,111,101,117,119,71,29,173,233,127,62,253,235,233,151,241,211,105,222,109,79,18,49,28,43,217,48,114,29,190,111,195,203,203,203,67,107,50,100,41,70,41,38,83,22,102,35,50,169,236,141,154,7,7,105,53,241,74,222,127,28,207,227,135,221,118,12,29,54,63,20,168,164,243,181,178,50,113,17,195,83,164,36,198,226,28,97,92,61,180,149,210,31,198,143,243,241,249,105,183,221,167,46,205,20,50,170,81,140,33,50,23,173,110,16,155,49,227,63,123,45,181,246,243,113,62,77,16,113,169,195,104,50,60,166,210,186,178,70,123,82,33,53,177,98,26,162,28,34,165,169,53,67,223,44,253,113,158,208,229,30,154,212,165,204,97,104,110,172,0,98,213,21,143,85,252,26,53,22,184,6,185,195,112,250,227,11,165,4,148,186,2,59,169,158,79,135,5,
+107,13,49,41,130,6,168,98,202,116,247,254,253,116,57,64,167,194,195,140,150,134,199,87,62,48,196,181,171,107,161,70,82,106,131,33,154,197,192,218,26,107,192,208,216,137,181,63,60,191,207,33,197,73,23,199,192,30,10,42,47,76,188,48,26,22,13,88,86,86,197,221,45,106,127,153,114,19,243,243,121,183,221,188,250,154,30,232,65,220,191,73,121,131,60,212,84,173,52,99,82,216,160,134,37,175,66,216,37,187,68,191,31,47,240,156,45,201,46,84,57,131,4,240,26,174,176,46,184,97,169,24,80,193,70,154,133,106,80,127,56,141,151,203,127,0,109,114,72,230,142,121,93,147,171,171,88,75,56,42,0,44,197,27,131,176,23,35,233,207,211,239,159,142,231,233,195,244,4,196,71,100,99,248,178,158,91,14,209,204,53,135,210,177,32,137,94,10,37,47,71,26,68,29,192,137,195,208,17,46,172,120,190,69,113,255,239,12,218,177,174,155,152,162,147,102,6,2,40,192,141,153,41,112,97,50,112,89,178,193,104,97,25,226,106,127,149,91,199,182,174,200,48,54,213,44,
+237,155,38,63,1,126,41,228,216,131,92,229,146,212,229,14,220,89,34,191,11,121,246,142,113,24,208,34,187,99,110,5,106,9,204,238,96,175,75,190,185,70,255,102,250,124,121,61,206,211,45,48,155,199,187,107,210,184,116,92,214,148,122,143,134,5,178,37,63,53,107,210,84,93,154,107,33,112,188,92,207,114,138,243,60,45,103,241,159,34,181,227,138,147,133,89,221,49,253,34,195,228,149,179,21,137,86,146,194,173,200,187,251,211,241,41,251,64,50,134,107,24,54,143,223,50,215,44,20,56,48,17,133,180,1,6,24,144,35,233,120,27,4,22,141,61,11,142,65,190,14,14,191,141,191,78,239,238,111,71,245,207,159,255,250,234,187,55,247,63,253,184,218,94,104,88,189,125,94,237,167,213,231,243,113,158,167,167,135,221,223,12,101,25,156,
diff --git a/uppsrc/GridCtrl/src.tpp/Tutorial$en-us.tpp b/uppsrc/GridCtrl/src.tpp/Tutorial$en-us.tpp
new file mode 100644
index 000000000..01e6c4eaf
--- /dev/null
+++ b/uppsrc/GridCtrl/src.tpp/Tutorial$en-us.tpp
@@ -0,0 +1,56 @@
+TITLE("Tutorial")
+COMPRESSED
+120,156,157,188,137,87,226,89,150,39,254,175,112,170,186,167,35,242,151,25,229,26,75,198,111,230,116,85,86,117,79,254,166,186,170,79,85,205,204,249,157,58,117,58,141,8,34,211,169,8,141,81,163,162,114,166,187,15,32,251,174,178,200,34,130,8,136,34,251,234,6,130,34,178,185,32,8,162,34,178,184,128,130,184,161,130,204,251,162,177,86,213,76,255,126,70,102,128,223,247,238,125,247,125,238,231,222,119,191,39,223,205,223,214,193,254,234,175,106,62,175,249,97,205,255,225,231,203,159,194,159,55,189,126,209,241,187,223,190,168,123,248,240,113,243,131,154,134,199,77,181,15,30,255,242,209,227,127,253,215,127,189,247,232,81,221,99,72,85,45,80,85,91,211,80,95,91,87,91,219,80,83,211,80,247,160,182,241,81,205,163,198,135,181,15,107,234,31,52,212,53,62,168,105,252,242,85,83,91,211,203,223,253,182,233,97,253,227,207,126,117,31,72,213,125,222,248,195,250,218,250,218,154,218,251,117,13,96,86,77,125,77,93,67,109,93,99,237,195,135,13,181,15,26,31,214,
+63,186,127,255,203,167,77,175,58,154,91,91,126,247,219,39,144,28,180,88,61,16,171,121,240,240,126,67,45,16,106,104,172,171,127,208,216,0,132,27,26,106,107,193,247,218,198,7,247,31,60,248,178,163,185,227,5,28,8,213,222,127,240,184,169,161,238,241,87,144,100,195,231,247,127,8,204,171,123,0,68,27,234,26,238,55,212,63,172,171,175,125,88,87,119,255,81,125,195,163,6,96,119,109,221,151,205,29,112,96,229,19,32,3,201,65,98,141,96,193,134,198,134,218,122,0,72,195,131,198,122,48,237,1,248,108,168,121,84,91,7,86,125,88,211,216,8,22,132,255,241,45,74,16,64,144,220,125,176,92,221,131,70,104,246,195,134,135,181,245,15,30,214,53,212,221,175,3,6,212,60,0,187,132,86,111,252,242,25,188,253,41,144,171,175,171,125,220,1,76,122,252,213,223,54,62,174,5,194,15,62,127,240,195,186,154,71,53,117,247,31,60,2,11,2,99,193,134,235,31,61,170,173,127,8,22,108,168,109,172,169,173,255,242,105,235,51,104,147,117,141,53,245,213,21,31,
+2,63,220,7,154,171,152,52,222,175,5,6,215,213,63,4,75,62,168,173,175,7,127,55,54,60,124,240,101,59,28,242,68,71,107,219,239,126,251,217,223,222,169,185,87,115,175,174,177,241,46,36,254,8,136,63,172,111,168,175,111,184,255,168,161,182,166,30,44,3,116,52,64,120,221,175,1,190,172,109,172,123,248,229,147,166,118,176,102,71,3,132,108,21,213,90,136,72,0,248,250,135,141,245,96,233,251,224,47,224,84,176,193,122,128,77,221,163,134,135,245,245,15,107,190,124,250,162,169,189,253,3,128,62,131,54,89,91,251,121,109,237,15,31,64,184,54,214,215,53,60,130,192,169,175,3,0,215,221,111,124,84,11,16,110,188,223,80,83,247,101,27,252,191,191,110,110,131,191,132,183,0,136,155,1,55,30,191,117,207,45,15,129,49,55,60,172,251,188,182,14,48,177,241,254,253,26,8,175,70,192,134,186,250,70,0,120,77,237,195,6,96,17,248,3,92,220,113,75,197,39,239,247,80,255,121,109,253,15,31,213,53,212,3,75,30,53,52,0,4,128,130,218,71,181,181,
+181,53,15,193,31,176,51,128,75,149,27,181,192,132,234,38,110,150,191,17,111,248,188,182,225,135,15,0,135,129,167,30,53,64,203,63,170,135,240,171,3,240,215,221,175,105,4,126,168,187,17,175,131,80,175,251,43,128,123,109,221,67,232,223,42,242,181,141,159,215,130,96,0,38,214,54,54,130,125,215,3,168,235,30,130,189,55,2,236,235,171,252,174,125,240,240,203,95,192,223,180,255,180,169,3,126,75,152,207,190,250,171,27,166,213,222,255,188,246,254,15,107,32,249,198,135,143,128,3,107,27,32,252,234,27,26,30,213,61,170,175,111,172,123,212,88,127,191,6,224,216,126,19,203,144,48,20,79,213,88,124,167,228,193,231,181,15,64,100,129,189,54,54,130,221,87,197,192,206,31,212,66,166,212,61,124,116,31,66,225,86,201,55,95,188,104,110,129,236,0,204,120,124,67,134,207,190,250,191,106,107,31,64,138,30,130,128,121,248,240,126,77,253,35,0,6,192,160,166,17,48,29,100,131,135,192,209,192,207,117,32,12,160,116,240,244,247,77,223,194,191,249,226,54,84,255,
+231,63,253,203,95,255,236,23,95,252,231,95,195,126,219,94,243,248,51,88,237,61,216,79,154,218,155,159,182,255,187,223,221,60,184,249,132,125,241,207,191,105,133,189,110,135,195,154,96,223,182,53,63,131,61,109,109,233,104,107,125,1,107,110,129,125,223,250,186,13,214,244,234,213,139,230,167,77,80,210,128,53,61,123,6,235,248,14,14,251,123,48,241,171,142,182,23,176,219,69,97,29,173,55,147,95,181,181,254,55,248,211,14,88,83,75,117,98,11,236,191,189,110,239,168,138,85,117,55,181,131,145,239,97,173,96,168,237,195,133,94,52,1,233,14,24,252,89,51,8,35,216,157,175,90,95,190,122,1,255,227,55,95,252,135,119,43,221,133,129,129,151,77,45,175,155,94,188,248,30,246,10,76,110,111,125,9,135,65,1,91,253,246,6,104,132,127,104,51,164,190,189,163,237,245,83,72,35,252,219,47,111,119,11,125,60,120,12,251,97,115,203,211,23,175,129,236,255,13,41,255,121,243,147,31,221,126,222,251,238,63,252,201,148,183,54,252,232,237,151,247,147,110,63,110,22,
+130,253,24,44,251,37,236,55,173,175,254,107,115,203,179,214,55,183,131,223,252,207,219,47,95,252,115,199,247,175,224,207,224,207,171,19,191,250,249,143,127,253,235,95,252,248,31,126,246,248,99,93,95,252,243,59,116,33,204,254,100,20,200,222,185,251,238,183,15,148,131,161,103,207,238,64,50,247,126,221,252,63,224,255,216,218,126,231,238,221,199,239,103,254,203,91,123,254,229,19,157,127,255,159,191,254,230,159,126,252,143,255,248,205,63,253,195,143,191,254,197,159,90,93,93,241,222,175,94,183,220,121,167,238,70,217,45,158,224,227,23,173,111,96,111,224,176,239,154,254,0,255,152,69,237,175,154,90,90,224,207,96,224,215,214,42,117,94,54,1,39,189,169,226,115,15,246,31,91,223,192,255,0,168,80,21,121,211,220,241,29,196,130,167,173,47,94,191,108,105,135,53,183,67,180,124,1,111,111,191,7,48,173,146,232,214,231,55,227,111,218,64,252,127,226,215,234,238,1,12,95,85,231,220,249,230,7,191,104,122,9,255,230,7,239,236,254,147,241,31,127,251,225,240,7,31,
+64,231,207,225,29,223,252,77,251,251,133,159,53,117,52,1,138,129,141,52,119,252,133,117,33,141,45,45,223,252,224,115,88,93,237,91,39,65,63,183,99,255,15,8,23,104,176,190,225,207,12,254,180,233,15,205,207,160,209,218,198,27,131,222,195,251,227,118,136,215,176,167,77,45,176,118,56,188,138,227,243,230,54,16,89,109,0,247,214,231,239,33,7,224,54,183,124,123,11,17,172,5,108,190,138,227,43,240,188,3,120,225,89,243,243,231,32,78,90,58,94,124,127,15,246,117,7,52,212,250,188,3,132,233,83,16,86,96,252,59,120,211,51,224,142,59,32,78,129,151,160,101,154,218,218,154,190,127,235,205,187,159,195,158,0,7,85,67,237,235,170,12,64,2,88,242,71,32,10,89,114,231,9,252,105,19,148,74,58,170,83,32,115,1,108,47,91,219,160,39,224,151,214,22,248,251,217,119,239,193,126,1,206,120,216,55,63,128,50,95,251,55,63,0,107,193,111,242,69,107,219,179,230,150,166,182,239,161,105,237,247,62,134,226,151,45,79,225,16,24,223,252,13,160,26,112,
+13,180,171,119,126,129,44,174,98,241,22,173,167,96,89,144,158,254,188,191,126,13,239,184,83,243,57,12,252,3,129,223,210,12,127,241,150,10,239,151,251,187,42,204,77,109,223,190,134,78,75,8,107,72,234,46,132,92,83,117,207,45,175,95,62,129,183,125,14,252,2,64,122,118,243,252,22,254,219,36,8,178,27,80,241,205,23,96,160,5,254,6,246,135,166,23,175,171,9,243,9,200,92,240,142,123,176,95,129,131,24,210,1,97,212,81,21,128,244,214,64,170,62,118,116,19,112,85,219,123,0,111,194,226,118,135,208,204,27,205,192,196,155,41,208,233,88,77,236,192,226,191,131,158,252,5,12,170,99,16,16,181,16,16,32,32,32,21,175,224,109,237,173,45,111,241,120,244,14,143,175,159,223,238,24,154,4,140,248,209,237,94,1,93,128,42,200,230,111,219,224,77,29,55,187,185,161,208,251,249,29,173,29,77,47,170,166,255,232,109,16,3,88,170,14,131,112,123,221,209,250,18,156,51,79,171,41,254,155,31,128,164,10,239,120,250,29,28,196,4,4,215,243,230,27,112,
+32,12,161,173,253,246,27,88,237,239,62,33,7,176,14,242,252,155,38,224,170,142,119,216,188,195,229,233,235,54,136,252,85,48,223,50,164,245,229,173,222,231,127,222,211,255,27,226,188,101,13,172,246,147,20,2,89,210,2,123,2,142,57,176,68,59,252,125,240,222,198,6,172,253,187,214,54,16,56,173,109,47,255,140,250,42,39,239,194,190,249,247,31,208,242,241,71,227,31,13,66,171,127,66,218,183,105,245,38,12,161,176,234,120,211,250,46,248,159,194,219,111,87,109,6,85,239,227,95,2,129,247,246,192,154,94,188,105,250,30,100,222,87,32,170,160,228,1,242,70,91,11,240,26,20,100,128,112,16,69,95,194,155,160,244,252,252,86,63,228,186,150,234,217,253,46,235,55,61,237,104,134,194,243,73,235,31,224,55,39,114,149,140,205,213,124,122,227,142,55,128,93,127,211,241,214,69,128,6,173,45,192,235,175,91,64,254,1,213,0,148,196,110,231,53,131,44,115,51,235,222,95,182,186,165,186,223,54,248,115,80,77,125,7,111,191,113,211,199,160,252,250,131,61,182,221,
+156,67,96,65,144,63,160,226,6,132,11,224,11,72,71,80,85,12,30,63,135,66,246,45,6,213,56,190,169,145,154,111,82,229,19,144,199,219,97,119,160,92,220,2,229,48,96,223,43,128,211,221,63,61,20,95,220,156,33,207,90,97,173,175,94,181,182,3,24,238,189,61,87,190,133,223,16,175,154,190,158,183,181,190,188,177,26,10,234,103,208,17,3,107,111,6,101,208,247,213,117,255,190,154,116,94,194,193,9,249,105,24,255,151,42,76,127,168,129,56,81,85,240,247,183,105,237,238,99,216,143,126,84,93,229,6,201,234,18,55,169,5,218,209,109,224,214,124,172,166,246,99,53,119,171,39,212,159,170,1,145,212,14,234,170,106,86,250,139,186,222,153,244,214,156,91,93,31,248,13,10,74,16,33,176,218,191,96,197,91,11,254,178,100,221,199,152,3,171,223,82,24,100,143,215,109,45,55,249,248,213,247,144,192,71,100,6,238,123,175,237,237,92,192,160,155,16,129,221,158,38,239,68,170,155,191,251,9,167,106,239,2,39,3,21,175,161,140,5,121,171,250,78,5,229,222,
+150,119,201,6,16,179,29,212,206,159,223,16,28,240,179,249,127,64,236,190,73,159,32,135,223,148,34,239,7,170,132,7,103,67,211,31,154,154,95,52,61,121,81,37,29,180,2,168,224,107,222,106,251,216,142,207,96,117,64,207,91,94,126,82,223,255,6,236,2,14,10,127,120,123,199,45,129,160,189,189,43,106,170,27,132,226,21,148,247,31,158,160,239,170,243,246,183,220,127,71,124,40,13,188,77,44,160,36,255,190,250,59,56,230,193,2,79,160,55,12,104,224,203,143,129,250,237,103,176,255,10,94,7,126,14,127,222,241,21,120,155,248,253,239,160,136,191,45,58,222,64,239,9,47,192,8,80,1,173,3,74,140,14,96,12,84,182,188,6,193,252,46,142,63,208,241,211,214,215,0,152,255,47,74,64,6,108,126,10,255,68,213,175,90,223,124,85,205,44,127,162,233,150,223,0,249,27,48,170,179,64,206,235,0,250,160,40,254,192,5,183,186,126,6,225,248,39,122,32,54,180,193,126,15,255,190,106,9,240,113,59,252,211,188,244,227,103,207,222,2,15,189,205,124,18,221,
+127,104,5,203,131,212,245,230,235,150,231,173,239,234,254,15,138,243,127,4,225,248,170,227,151,255,233,206,223,1,30,55,117,128,58,242,175,171,37,223,95,131,34,8,222,212,6,10,188,23,213,162,242,54,154,110,191,212,222,189,251,73,45,255,224,227,35,238,99,164,161,112,252,205,127,252,250,215,63,249,241,87,255,233,206,91,107,254,164,72,173,150,39,109,175,91,170,37,104,181,120,252,240,213,17,164,137,103,55,202,158,66,12,128,230,52,117,124,80,221,64,103,36,136,200,215,47,158,65,53,238,199,252,249,247,176,191,253,219,230,151,224,69,243,203,90,240,10,254,239,106,193,155,57,190,115,0,185,128,120,247,83,116,240,15,202,132,69,126,228,128,147,158,245,30,122,149,132,185,241,113,221,184,102,60,125,104,154,155,236,161,10,156,145,243,236,201,149,113,66,181,169,118,28,8,76,59,156,131,163,243,232,193,225,66,42,90,136,141,173,141,94,217,236,56,60,97,3,143,196,15,29,46,173,187,248,195,243,195,8,228,246,226,81,108,143,141,94,206,160,145,102,91,142,110,199,
+217,249,221,184,205,107,142,74,55,50,178,161,27,150,15,12,175,72,78,183,43,71,179,206,254,138,234,106,129,157,19,235,220,200,65,33,26,71,229,155,169,249,45,27,178,19,71,13,243,205,121,115,98,49,190,96,67,58,156,241,17,107,39,127,46,198,55,79,156,18,195,243,125,211,233,253,237,53,52,210,22,70,71,87,245,107,8,247,140,88,167,212,171,152,200,162,82,228,93,215,19,60,83,135,229,50,69,69,93,191,84,93,141,247,91,211,129,139,254,242,152,170,226,61,15,85,54,206,79,51,57,234,201,117,16,105,165,90,79,50,197,177,243,141,171,74,52,118,116,218,31,56,83,245,241,47,180,134,185,141,212,168,104,162,123,149,165,50,133,66,172,8,97,75,125,134,139,97,88,243,232,92,114,152,194,94,225,105,149,35,198,138,100,237,228,252,130,102,138,93,208,162,74,219,148,98,237,132,96,241,31,90,78,176,105,151,97,231,122,121,97,57,45,80,236,85,100,230,201,194,17,42,234,81,225,237,14,155,73,53,118,122,182,77,201,13,231,99,68,207,76,143,46,235,223,94,
+24,221,30,49,145,150,84,103,140,216,222,22,85,72,62,212,114,129,196,184,110,119,249,202,226,49,173,147,148,134,140,138,92,74,218,202,7,203,158,30,143,66,69,180,59,182,2,33,43,219,108,118,179,237,151,56,150,102,255,98,196,22,242,72,207,196,30,58,117,110,86,27,143,240,73,132,209,2,218,215,99,23,160,150,18,92,134,32,201,177,199,93,121,97,64,123,178,166,115,168,55,87,35,9,147,199,43,232,209,10,75,170,171,110,173,188,39,130,205,155,199,215,137,41,148,70,171,34,97,14,20,60,211,249,56,85,55,125,137,54,38,57,58,123,60,223,195,226,156,218,86,149,167,243,138,128,147,102,199,22,51,108,149,126,110,172,52,32,156,32,83,149,41,206,122,248,146,229,219,227,116,31,44,45,247,77,75,180,62,77,204,16,10,205,89,170,227,30,11,54,69,202,238,104,103,221,97,227,232,24,38,130,237,205,155,249,87,17,183,64,18,59,16,244,178,37,189,180,173,35,234,144,52,201,9,84,215,177,84,46,162,180,177,116,132,199,189,146,28,37,113,82,203,148,76,106,
+79,177,49,241,248,84,222,121,142,62,60,243,165,174,207,99,196,171,61,95,143,141,125,205,117,241,43,254,244,140,41,54,33,157,246,142,88,163,193,197,192,222,66,129,132,202,171,21,184,203,10,83,176,187,151,29,91,191,112,80,121,171,42,79,239,209,78,41,12,52,33,227,241,48,85,225,16,78,173,147,82,249,168,29,111,66,123,142,38,166,46,180,93,24,240,144,79,75,14,114,80,241,172,208,67,103,224,119,28,92,214,198,161,104,120,70,72,247,32,124,99,138,30,30,96,164,35,121,161,64,166,114,214,10,185,11,133,84,119,123,210,11,145,146,29,197,215,11,131,17,57,218,96,195,156,76,77,132,29,218,136,197,130,183,236,218,116,1,124,198,128,32,237,94,168,113,41,183,142,38,152,159,238,228,78,247,217,195,157,235,182,5,66,231,164,130,119,109,22,35,112,148,221,51,98,156,146,207,35,39,105,103,234,172,227,186,115,15,18,117,1,217,124,150,69,151,95,167,208,108,211,184,119,98,139,230,57,220,28,87,153,113,148,33,254,242,136,188,52,101,200,96,212,122,4,43,
+205,94,242,111,5,139,108,39,88,164,39,112,62,146,18,34,49,129,177,201,145,25,89,122,146,206,98,141,44,102,181,107,132,9,34,101,161,23,104,223,46,32,220,84,238,162,25,51,119,17,31,234,218,165,247,19,57,167,5,15,13,151,68,226,124,74,65,49,162,24,45,203,7,237,3,172,2,98,34,221,55,58,129,103,161,74,202,5,176,33,13,129,62,15,172,138,51,248,1,140,56,28,94,177,13,108,154,50,153,46,186,66,152,177,111,135,45,139,110,231,118,136,75,224,122,216,203,171,210,110,22,47,27,143,200,92,97,52,128,37,143,34,82,183,167,75,195,228,29,11,39,188,185,189,119,180,1,100,32,145,236,98,154,146,186,24,37,28,202,53,93,227,97,183,150,234,85,246,21,12,27,220,113,15,214,233,76,10,145,113,76,32,207,32,109,139,103,214,115,243,215,145,233,169,126,68,183,104,2,81,8,43,246,178,20,78,132,98,80,72,70,29,153,33,236,164,90,193,235,229,50,59,177,131,12,255,244,146,34,16,160,16,150,21,93,248,130,103,142,134,179,163,134,21,164,105,
+187,93,206,139,238,25,29,67,98,159,100,212,20,166,57,180,155,200,184,101,87,11,109,102,86,155,199,14,95,199,21,70,221,8,18,223,55,41,32,146,118,147,103,17,69,100,200,34,137,161,40,165,110,206,169,222,20,12,167,72,153,66,38,56,166,103,157,158,83,220,100,224,67,200,133,139,81,54,93,73,113,20,16,99,195,84,59,245,42,236,60,27,145,197,0,180,169,44,195,206,13,91,16,56,59,197,177,116,209,215,155,36,138,144,147,138,204,238,220,126,79,39,86,63,142,233,83,99,205,8,1,238,138,26,14,109,70,196,56,10,226,198,251,200,82,213,251,78,31,93,121,67,156,253,204,13,113,92,41,60,218,238,86,112,122,83,5,221,176,234,96,223,53,173,224,244,173,170,204,146,9,44,58,129,92,61,153,156,87,240,120,253,236,78,116,36,93,97,30,93,80,66,248,57,187,128,53,201,21,247,49,59,161,71,106,240,12,122,180,199,242,89,249,200,201,146,36,149,145,177,200,242,13,223,212,174,127,106,64,169,90,67,198,195,192,193,58,148,202,232,9,75,169,219,235,129,
+56,43,203,22,121,38,189,74,225,156,170,83,102,152,22,176,124,27,147,178,249,18,22,229,98,20,88,38,14,147,77,166,197,54,66,221,44,206,134,77,82,58,93,177,155,233,192,242,209,179,190,158,243,120,156,177,42,180,105,215,34,83,93,158,126,162,129,165,216,152,50,66,203,176,164,124,194,181,152,116,148,221,162,141,120,156,185,216,18,135,26,92,12,207,107,9,206,41,108,133,113,42,32,123,20,7,14,153,115,135,125,166,174,120,179,25,189,113,211,179,206,74,113,80,146,57,59,81,225,81,148,79,236,19,82,54,224,183,67,154,43,23,136,42,12,49,193,59,75,113,10,125,238,229,73,139,55,107,91,232,140,228,150,173,201,180,192,74,21,32,208,87,97,163,90,63,176,181,72,78,18,51,83,229,82,152,235,97,237,76,122,135,151,173,208,48,154,124,21,14,5,172,51,242,2,22,133,24,177,206,155,18,5,194,82,86,46,56,181,111,185,34,210,152,67,87,240,16,243,81,0,8,79,185,137,92,116,44,145,175,74,27,180,43,21,222,147,207,216,204,172,51,181,55,190,76,
+202,40,115,251,22,63,86,235,61,6,49,121,173,152,84,167,11,82,65,50,35,244,76,0,23,58,188,55,19,250,44,55,19,144,30,5,114,123,128,142,63,211,176,188,90,11,7,69,21,224,152,157,155,93,252,83,129,62,27,231,72,76,203,230,254,3,156,192,72,223,79,9,76,208,3,137,233,230,65,144,126,243,96,213,222,191,184,81,80,243,212,229,8,37,201,217,161,0,251,165,121,217,137,68,52,117,18,14,208,180,222,37,191,214,67,194,103,78,227,19,208,200,132,37,45,199,74,174,56,90,47,193,45,138,115,138,211,131,74,173,50,120,172,205,198,233,156,242,65,0,53,27,57,147,86,230,21,33,188,111,147,31,150,74,186,243,91,251,121,215,226,230,222,153,58,157,45,157,245,89,20,86,29,91,238,221,147,8,79,18,69,225,72,224,216,32,155,222,119,155,248,75,182,105,189,127,154,147,1,251,239,137,211,174,214,136,54,175,33,39,156,225,123,4,200,189,217,75,167,12,49,191,51,203,69,30,97,40,67,194,179,45,171,218,82,28,148,236,141,102,104,30,198,181,249,88,
+38,193,15,71,100,100,196,78,73,149,24,50,26,167,153,201,93,191,86,63,235,102,173,200,250,50,168,25,76,58,32,138,40,6,11,194,0,69,106,196,78,135,179,3,122,146,108,155,236,84,82,210,100,31,209,151,158,39,147,6,49,163,92,117,87,100,125,220,200,20,29,25,115,233,117,138,118,147,194,99,173,243,188,171,137,35,201,30,67,107,221,89,221,30,57,189,94,212,69,87,5,26,22,33,119,72,140,211,85,172,249,83,42,151,145,170,112,39,214,6,7,164,131,113,187,212,63,180,79,76,99,208,233,197,65,150,65,70,103,29,5,6,144,126,141,198,185,130,160,100,130,138,81,243,177,19,179,50,148,88,214,99,236,201,158,117,66,120,192,183,221,37,209,154,237,114,205,150,220,63,32,219,145,247,132,243,169,188,51,87,152,234,238,37,102,186,11,222,253,61,163,212,197,156,150,109,173,177,184,250,85,231,172,110,48,165,188,18,237,206,4,230,216,254,161,197,116,89,57,43,119,232,140,11,89,212,212,64,112,117,9,239,198,148,103,103,55,119,245,204,133,233,46,178,252,138,
+111,159,78,112,203,113,170,114,135,83,76,249,142,162,123,252,238,185,121,135,176,36,213,137,37,56,23,174,103,133,130,98,109,140,97,70,152,93,139,225,226,182,151,162,230,79,79,29,73,185,108,115,152,226,77,173,168,141,110,10,121,209,69,194,80,12,132,19,226,190,127,101,144,163,221,140,95,22,242,7,67,4,225,144,97,177,39,32,165,112,119,249,103,238,222,4,142,162,232,238,198,200,139,40,145,48,49,203,236,210,7,14,166,212,120,47,126,139,226,76,44,77,46,117,207,152,179,24,225,96,161,111,208,216,155,145,111,173,117,117,175,246,14,13,119,50,185,11,230,193,109,204,48,131,141,90,243,97,179,244,139,224,62,47,26,199,236,206,51,52,106,60,80,61,184,229,244,24,50,107,234,50,129,18,141,44,27,92,138,253,61,215,80,46,194,102,101,137,61,221,248,185,89,140,58,59,117,161,36,100,44,194,221,163,140,139,88,138,173,77,58,180,243,87,60,123,148,198,167,74,176,157,184,147,236,210,213,232,106,114,250,66,83,38,163,9,1,22,63,64,88,176,240,121,152,48,
+190,50,32,206,39,175,195,39,78,13,221,101,54,115,211,186,96,156,67,230,217,183,180,110,189,37,120,178,125,132,98,247,246,19,124,107,70,118,151,179,216,231,198,33,206,173,161,78,173,99,50,116,182,131,87,41,53,212,105,35,58,41,213,38,23,178,67,150,110,91,18,55,49,136,138,59,78,82,66,28,79,39,100,8,236,2,31,87,127,85,217,141,44,232,229,102,199,197,72,15,98,10,129,24,193,28,68,72,27,33,141,43,149,103,201,75,193,200,244,57,127,113,118,99,244,116,179,104,230,114,54,240,204,216,98,255,226,98,63,135,19,196,204,237,234,130,39,184,132,142,54,183,143,20,200,199,87,230,193,247,161,233,41,6,175,79,106,176,239,250,87,156,201,32,74,161,41,202,13,18,209,218,132,99,23,27,15,207,151,22,125,126,9,79,166,205,211,146,145,190,185,158,189,18,59,134,215,151,187,214,204,54,76,118,146,75,58,178,173,79,13,138,209,99,115,106,253,60,114,139,122,196,57,9,116,173,45,30,104,176,218,227,185,62,100,34,134,95,73,141,34,53,139,157,46,225,
+57,50,107,51,15,205,177,117,75,187,157,254,84,192,156,95,212,241,167,169,174,1,255,198,162,75,33,229,173,249,247,132,152,89,182,81,109,155,31,233,49,39,232,102,2,107,143,163,208,196,122,153,186,249,125,241,5,145,227,61,31,155,61,161,6,232,7,250,101,6,163,39,140,64,218,183,181,243,22,31,203,65,241,6,135,122,117,93,56,29,218,21,212,107,251,49,244,99,217,252,30,63,52,177,69,74,144,104,174,110,58,59,212,31,115,249,153,177,16,207,124,60,75,58,96,205,228,103,121,87,221,99,69,67,132,37,21,4,36,227,59,200,241,241,206,196,208,42,129,108,63,34,217,135,71,68,4,149,226,122,180,194,225,39,34,210,252,14,206,176,113,188,40,115,154,75,197,180,193,126,154,2,135,209,169,208,177,49,60,147,225,229,41,174,72,182,95,188,123,110,57,43,40,188,151,190,217,36,86,128,45,244,5,79,137,105,252,236,174,222,128,77,204,239,88,215,251,101,215,241,116,231,138,69,167,29,90,202,162,43,201,137,29,172,64,70,17,170,45,212,229,105,146,255,178,111,
+65,49,193,23,199,56,12,97,207,252,148,105,32,168,194,178,123,149,177,82,18,205,30,150,93,40,86,188,36,90,220,147,68,175,77,140,200,141,9,233,214,240,206,113,0,139,89,103,108,117,226,153,133,139,89,146,49,187,185,213,185,189,40,55,82,19,235,52,91,24,97,27,93,73,99,57,108,212,169,41,226,144,135,156,249,157,192,138,102,96,254,180,196,31,198,103,187,237,114,161,188,115,126,201,50,135,102,152,28,33,113,178,247,120,214,49,121,225,140,34,142,244,108,243,249,148,185,152,136,103,151,9,188,131,193,205,21,44,81,230,15,25,46,135,122,182,168,134,252,200,16,11,61,86,60,97,10,36,161,34,110,16,81,178,117,206,157,116,31,31,1,59,10,135,52,223,233,152,2,100,201,172,240,106,152,122,182,25,98,243,151,244,220,43,35,75,232,31,170,144,230,71,40,190,145,227,78,74,40,55,198,159,61,8,219,204,189,163,209,30,110,154,69,103,156,47,138,163,33,1,99,171,71,128,114,75,14,166,9,155,211,71,177,120,54,152,155,224,79,238,205,44,50,92,87,246,
+192,121,6,43,43,29,50,243,33,190,44,42,207,173,149,227,30,97,37,175,235,159,60,13,17,201,177,62,46,241,16,65,207,159,239,114,103,58,119,109,73,124,1,39,232,13,111,209,228,161,195,96,224,34,96,205,158,93,121,51,130,33,38,39,139,36,216,45,71,56,195,101,239,196,216,144,33,58,193,160,204,58,226,41,161,99,92,195,199,166,250,182,47,183,245,26,161,105,137,133,242,120,35,99,103,244,45,70,151,13,187,52,211,123,128,138,80,250,113,120,13,53,205,194,232,79,229,211,107,92,181,178,119,33,238,230,242,2,106,20,107,73,41,50,49,61,190,35,45,146,194,221,247,166,150,247,51,152,101,143,119,162,48,210,155,61,33,202,59,207,12,211,187,51,204,16,49,27,40,14,102,109,206,13,207,152,63,117,52,27,112,121,229,203,19,135,162,176,200,203,156,64,246,98,69,164,41,243,236,218,145,110,85,211,107,50,99,14,8,212,232,209,138,87,172,176,6,241,178,225,77,36,119,17,97,235,21,172,155,17,107,218,190,248,240,30,53,21,57,62,103,209,101,39,75,21,
+49,141,181,98,84,111,208,123,86,197,9,0,175,91,21,74,110,4,249,248,16,128,103,80,116,216,159,179,232,197,37,245,117,66,52,116,138,11,12,32,124,177,98,254,202,216,207,96,96,78,78,2,14,149,120,69,44,176,57,5,134,41,145,245,50,59,62,83,185,180,143,43,82,167,145,77,250,229,88,124,139,113,190,85,56,102,102,102,169,7,214,13,19,155,104,45,17,139,158,220,234,101,128,99,46,157,163,103,173,227,251,104,217,228,198,165,66,48,60,138,219,143,108,79,15,81,78,188,58,155,6,187,135,26,236,65,69,206,244,22,195,1,56,73,21,88,50,233,108,79,166,88,28,17,57,83,22,195,182,121,218,41,23,110,79,81,117,204,158,40,211,129,29,156,39,37,10,139,25,67,137,232,151,178,137,243,211,233,29,148,54,160,178,24,20,182,11,2,81,50,194,84,77,168,22,181,252,253,237,153,174,192,238,114,104,173,119,201,217,51,162,228,44,154,83,94,166,39,58,159,30,192,45,17,143,41,164,73,221,134,58,176,87,50,248,246,178,3,201,80,126,211,104,49,228,139,
+56,26,15,21,237,28,136,187,48,104,75,31,90,62,60,200,28,93,193,20,216,91,167,34,62,37,171,75,149,88,50,215,201,82,65,163,27,99,227,46,148,137,93,119,87,73,134,94,77,134,48,131,12,246,37,154,191,174,217,179,118,26,34,71,138,179,133,162,97,236,124,119,222,54,55,158,163,42,195,73,25,53,159,184,102,243,251,174,13,203,167,36,162,117,211,114,220,55,178,96,92,138,200,78,24,171,91,101,195,212,201,137,46,84,81,196,8,7,220,254,173,173,75,34,10,61,88,232,207,228,148,3,246,225,254,232,169,211,209,101,221,24,15,224,4,118,78,174,50,223,99,81,141,211,45,98,245,161,191,23,229,242,250,44,236,32,66,44,199,120,217,81,75,80,202,229,15,43,177,170,197,94,252,214,58,83,226,227,117,174,34,118,54,17,152,0,215,191,21,18,119,113,137,235,182,177,41,187,154,56,22,76,145,189,210,163,32,126,254,216,60,40,92,141,119,167,123,87,35,174,9,234,236,242,246,172,19,137,42,217,16,70,161,238,116,158,168,163,10,231,143,103,55,229,189,92,
+185,115,101,72,208,125,174,20,101,142,221,199,140,141,161,222,241,197,94,135,222,171,88,217,190,62,24,241,11,123,109,172,202,16,99,154,158,67,206,51,248,238,128,223,160,45,107,14,66,69,140,108,252,108,243,108,110,125,114,150,176,161,95,31,221,29,231,243,43,219,222,45,166,141,110,20,132,20,231,97,151,38,123,165,9,91,202,75,107,211,41,31,109,35,180,28,23,31,204,33,247,165,185,146,187,107,159,18,63,15,5,144,122,107,145,177,171,99,138,252,2,33,66,209,79,76,30,37,233,105,244,5,46,87,246,90,210,124,114,169,180,144,191,58,140,101,187,162,174,245,184,109,101,93,71,52,226,35,224,252,238,87,236,135,75,194,65,148,0,143,68,9,37,155,179,221,114,186,13,188,225,196,56,71,107,26,133,255,234,112,115,59,25,14,97,66,253,156,141,11,161,72,201,166,42,232,184,185,50,175,75,102,13,219,14,210,54,122,232,170,191,146,243,145,15,47,47,157,57,179,209,124,96,166,95,236,29,10,55,144,84,212,245,193,130,233,144,176,18,29,157,178,92,87,22,9,
+177,227,9,68,96,5,216,95,217,17,87,58,183,29,190,28,105,144,169,195,108,176,232,87,135,220,144,50,187,96,93,31,28,20,135,197,83,132,64,174,212,63,213,41,176,235,118,119,23,157,132,209,41,226,232,230,57,109,111,96,216,61,36,71,117,159,166,6,102,230,13,204,149,145,5,110,98,232,120,216,216,181,204,27,214,109,134,174,157,136,139,109,12,27,31,67,145,156,82,3,105,194,184,130,31,112,18,164,91,155,75,3,188,56,49,192,230,203,11,209,65,146,179,215,165,204,34,104,9,222,33,13,227,232,34,22,40,211,51,11,179,139,34,163,105,146,24,27,27,94,40,251,135,205,172,148,191,72,10,108,198,195,21,218,10,125,218,179,184,220,197,9,118,9,220,193,41,213,25,25,223,165,137,48,133,124,178,111,157,183,51,55,154,30,158,156,30,24,49,242,47,115,62,229,216,229,165,177,226,195,230,74,73,238,214,121,105,206,148,50,77,165,166,74,147,227,103,233,243,156,233,80,92,200,76,185,78,212,145,233,40,34,107,238,190,26,50,30,227,39,251,57,94,180,145,32,
+58,28,41,219,207,228,61,91,171,23,56,130,49,167,98,30,51,215,207,135,123,172,229,205,235,94,1,138,115,142,32,76,6,116,129,210,25,125,38,116,129,142,98,248,194,105,2,74,207,20,248,194,134,173,64,220,163,119,177,252,179,125,113,202,72,201,147,208,138,247,86,248,153,178,96,227,208,51,35,199,211,92,202,124,10,165,69,45,41,8,190,46,255,172,255,144,213,141,237,212,240,24,70,255,197,178,33,185,31,223,144,150,18,189,131,93,10,39,123,20,183,48,205,158,192,78,116,143,237,232,80,1,47,109,36,75,210,237,225,232,163,157,217,93,101,86,52,184,53,200,158,228,13,16,76,22,244,166,120,198,211,77,150,245,234,60,219,235,148,149,120,217,93,190,80,238,186,253,66,185,109,246,88,106,235,158,202,31,208,204,26,95,220,214,91,116,112,92,62,97,87,127,193,40,219,74,30,115,76,39,145,212,56,91,172,167,166,56,134,220,216,145,187,18,112,184,69,123,166,115,188,135,27,189,28,43,15,232,64,161,21,71,94,106,233,3,218,233,33,82,76,57,181,119,58,113,
+68,34,89,157,135,3,37,250,65,148,65,223,98,247,88,50,28,83,196,34,203,235,186,39,167,187,19,106,139,112,84,139,188,58,16,201,206,194,88,71,114,207,218,165,232,91,239,59,177,184,250,214,213,131,198,69,154,89,101,85,39,151,151,243,99,211,178,147,181,126,165,170,147,203,113,42,195,219,211,8,159,153,52,181,30,21,239,92,119,173,204,198,210,125,163,59,210,49,173,7,100,78,44,83,107,19,35,19,78,146,201,33,229,106,211,6,155,43,171,32,121,208,169,165,128,220,181,213,227,47,106,184,38,46,170,111,123,162,87,43,114,207,166,212,198,248,73,200,45,222,49,120,25,230,253,171,0,49,114,105,167,40,13,186,211,252,230,102,41,28,207,42,247,103,131,174,9,86,204,105,114,156,248,71,101,187,114,125,90,52,141,200,81,98,19,171,113,14,113,163,95,189,38,95,157,56,141,202,71,35,187,40,157,101,169,51,21,186,192,100,201,36,179,38,104,37,162,217,99,133,12,213,165,191,22,138,242,68,55,221,38,225,240,55,118,240,58,217,48,207,161,81,232,210,163,126,
+63,238,218,201,72,132,67,193,205,254,97,213,6,147,57,220,53,156,8,113,208,234,197,242,94,254,114,233,178,98,52,247,171,87,84,9,130,121,164,236,136,155,35,86,212,37,51,55,196,71,198,164,2,124,129,176,112,186,48,226,222,232,102,144,81,11,238,226,218,176,83,218,149,117,115,120,98,50,165,56,77,144,87,182,253,161,253,30,25,107,236,204,198,48,243,189,11,170,53,219,140,191,19,84,205,89,226,90,105,102,170,211,62,60,57,113,181,153,113,122,22,196,49,143,52,139,144,128,98,208,149,49,209,156,23,178,148,141,145,244,33,221,148,185,132,16,227,87,27,139,102,173,125,37,137,61,233,150,142,108,244,248,244,1,98,225,48,132,234,25,86,117,138,188,171,71,206,243,53,162,239,144,24,88,214,160,50,222,203,3,25,113,5,163,217,244,14,76,171,55,189,182,112,207,254,152,192,141,95,49,147,157,151,84,241,145,121,112,5,107,160,244,204,94,238,153,47,55,134,86,123,53,106,237,166,7,235,19,204,115,116,135,182,49,145,60,195,223,203,122,73,32,0,10,134,12,
+218,194,147,166,55,183,142,29,204,165,245,184,94,24,29,210,82,122,221,210,13,137,100,127,128,161,36,89,167,142,244,1,229,120,134,217,43,141,141,7,173,133,131,41,167,129,142,103,15,164,80,75,243,43,43,82,171,226,82,180,188,80,18,243,61,90,86,102,115,123,165,152,218,74,204,171,180,238,108,146,21,166,198,35,75,152,179,49,76,228,12,157,113,156,74,184,162,177,101,85,254,132,158,160,202,152,135,99,44,189,51,38,62,39,120,34,186,1,171,123,92,129,73,158,166,112,137,178,126,172,50,51,168,227,209,36,24,9,75,164,49,18,230,186,23,248,3,243,94,36,210,108,136,89,196,157,9,55,131,130,156,34,204,5,136,168,176,89,189,133,216,140,6,101,66,215,245,226,218,146,83,170,61,247,243,40,100,214,150,217,211,69,233,116,171,104,115,243,8,137,111,58,189,128,209,12,66,19,87,108,75,81,221,181,151,136,239,93,71,93,45,162,119,221,225,204,118,192,17,86,78,216,69,6,97,126,35,105,91,153,36,172,246,178,76,34,138,133,181,152,8,57,195,5,62,158,
+105,215,43,216,61,251,106,6,201,229,244,111,57,88,24,130,43,144,100,112,212,92,167,208,41,90,119,19,149,228,77,243,134,162,64,136,143,144,83,235,152,11,132,55,62,33,101,144,42,138,158,48,131,72,166,108,201,133,123,46,108,223,246,194,248,214,6,230,242,12,189,66,64,90,204,246,129,108,116,75,199,163,88,204,250,128,170,219,85,222,99,85,56,174,81,5,65,193,232,150,21,134,49,203,229,129,83,76,53,218,143,214,150,183,57,51,9,66,138,58,94,78,197,241,139,43,83,93,234,209,65,166,145,104,155,162,27,177,131,195,114,169,137,177,52,116,234,148,31,32,69,123,219,9,67,78,188,123,182,131,238,115,137,117,74,133,107,157,179,46,210,99,175,228,26,50,119,113,181,184,239,221,239,30,97,144,186,28,135,131,9,226,162,159,18,222,231,50,50,115,59,174,237,206,50,97,77,153,98,74,79,36,82,75,145,215,37,85,247,229,20,186,81,135,32,87,206,184,214,240,149,176,179,119,100,69,175,70,47,47,241,151,149,218,76,74,124,70,203,32,207,197,94,252,198,124,
+90,220,133,144,4,175,58,89,76,155,249,152,236,115,137,115,193,93,109,159,71,11,40,176,206,57,217,148,90,250,34,99,81,38,110,205,142,192,251,138,38,156,93,63,203,235,212,7,236,122,172,193,136,14,161,13,198,240,168,65,61,205,221,190,38,234,133,252,208,178,142,59,74,246,17,12,107,73,226,229,244,138,156,53,54,187,182,120,30,240,26,248,100,191,116,102,198,236,193,68,172,19,148,254,57,129,48,140,167,204,218,241,149,158,129,153,93,73,218,221,189,165,35,25,183,14,183,122,38,205,140,253,128,210,139,115,211,199,120,227,148,46,39,38,73,241,216,189,20,170,35,204,189,48,75,88,232,125,227,188,100,115,243,200,181,124,52,126,120,60,138,152,48,196,215,182,139,19,251,1,219,0,170,119,100,22,67,44,39,15,210,76,221,142,199,58,187,199,74,165,45,154,227,108,56,180,184,238,220,84,165,156,194,158,147,105,161,9,43,57,182,111,205,59,18,43,123,99,167,90,180,79,215,69,166,4,246,3,211,114,223,180,204,55,208,175,102,233,187,19,157,114,233,57,39,216,
+59,200,28,84,247,210,231,20,248,245,78,230,132,219,39,197,204,239,107,46,122,89,105,117,175,125,134,185,177,165,221,94,14,78,50,246,148,236,153,30,69,38,184,99,153,96,33,165,168,153,156,87,154,136,164,125,220,40,159,136,214,58,207,162,206,201,108,89,51,56,182,173,56,35,96,113,179,154,147,5,243,100,182,123,172,194,52,108,97,202,160,198,239,226,248,114,71,238,220,254,118,97,82,226,30,203,71,61,180,216,65,222,41,228,251,137,115,218,236,69,137,148,232,201,111,8,233,126,68,111,4,59,106,50,153,9,18,45,57,238,53,243,83,158,133,68,148,143,142,96,139,121,41,223,175,221,57,66,143,250,81,10,135,185,135,79,221,137,28,23,89,50,12,152,183,178,136,181,248,246,71,253,59,71,66,15,150,238,199,74,176,93,201,36,7,21,23,10,61,116,97,10,191,211,25,193,42,240,14,51,207,165,77,114,70,236,17,27,75,228,161,75,252,88,45,57,130,205,239,27,233,41,151,22,173,59,66,42,142,25,30,39,182,136,147,74,157,209,75,231,230,21,214,57,55,151,
+115,116,246,242,147,71,87,133,82,177,84,216,42,29,142,138,102,229,164,209,213,220,250,184,42,94,32,81,139,78,219,44,203,130,78,249,192,35,235,216,82,57,127,121,221,229,192,157,247,251,38,74,236,66,81,99,158,13,216,231,210,224,103,167,31,73,158,152,172,36,189,75,27,158,43,202,25,59,118,57,147,213,117,106,189,126,214,105,136,70,57,163,209,84,222,235,73,126,127,31,135,211,87,218,160,31,141,232,211,19,220,41,89,233,114,137,60,153,223,40,218,211,105,129,215,226,211,97,207,211,130,52,167,47,147,191,8,206,77,76,240,132,30,150,87,59,78,75,56,86,199,157,206,57,165,243,112,115,82,87,206,91,211,243,1,217,182,218,186,114,157,163,185,79,197,204,241,253,185,202,201,104,108,114,156,219,207,62,177,105,174,250,105,130,245,126,78,84,88,25,28,212,76,74,15,81,81,207,57,2,130,196,62,202,73,153,46,157,216,5,220,229,156,83,38,240,138,252,158,109,99,236,112,105,67,126,45,186,76,119,5,79,72,251,204,253,96,72,88,66,45,18,41,210,29,193,
+40,213,235,247,42,233,36,219,70,192,130,9,42,99,131,88,188,12,21,49,234,103,89,27,7,92,65,239,46,185,95,208,103,54,77,206,37,18,94,171,136,182,51,47,37,95,217,204,234,107,155,231,180,63,52,188,233,43,94,5,151,4,193,17,185,102,127,71,217,149,150,119,173,51,5,162,243,162,214,55,121,121,185,108,58,202,251,189,177,68,150,203,187,192,164,186,76,115,184,141,41,14,125,198,143,210,102,9,138,113,75,68,119,50,50,62,94,241,238,102,11,215,10,74,225,48,143,92,239,23,7,142,71,146,211,124,206,133,125,119,169,212,195,139,21,77,101,84,174,132,11,97,244,157,60,141,180,191,103,126,46,41,42,137,56,87,224,181,204,215,29,57,219,43,100,47,5,71,171,97,7,33,82,40,9,199,84,74,229,124,74,194,67,198,7,133,158,236,84,42,146,12,231,49,153,185,13,211,216,21,78,118,120,164,41,13,216,12,227,52,76,111,52,184,193,162,9,242,188,126,106,255,209,220,145,139,163,29,243,109,21,185,90,242,166,184,124,62,175,167,143,159,102,182,149,87,
+165,156,116,234,248,140,106,13,247,243,14,138,179,226,29,20,62,146,30,241,140,93,97,143,149,134,211,147,51,202,166,246,90,141,80,240,184,18,85,143,46,233,23,167,67,12,12,74,77,22,8,119,74,248,99,244,85,208,33,19,36,119,55,237,97,49,74,221,123,105,195,230,122,144,36,97,120,99,121,124,246,82,116,168,77,39,142,147,238,133,88,231,212,213,130,245,152,64,244,251,125,156,126,129,51,127,193,178,153,249,174,45,109,52,18,58,221,11,197,152,103,74,129,104,252,28,203,118,77,98,180,26,159,66,154,118,21,59,211,75,238,252,118,23,103,77,152,33,83,247,43,105,92,116,243,234,194,36,142,93,25,42,254,74,37,198,91,169,28,205,103,64,214,166,17,28,42,213,230,248,96,134,120,50,176,208,21,61,119,205,161,143,246,174,108,210,254,238,145,94,199,241,234,101,110,199,176,122,54,26,185,44,141,93,119,242,12,192,223,233,145,136,135,124,202,246,199,14,226,187,130,114,126,71,32,18,7,243,101,45,170,55,45,60,12,138,105,28,22,198,59,104,42,227,42,19,
+67,145,203,64,44,72,154,30,86,177,87,134,85,7,5,75,113,9,163,200,76,129,56,28,57,238,62,241,118,159,237,217,204,123,60,97,167,78,150,188,220,45,37,174,102,216,123,204,174,254,235,66,96,125,243,218,226,49,161,237,147,113,27,43,226,214,30,251,130,163,134,209,131,62,71,129,230,156,165,33,17,215,68,249,114,165,159,236,239,81,8,25,91,81,43,109,101,118,146,47,186,28,141,156,106,40,226,107,130,239,156,96,221,155,112,208,71,14,140,123,150,169,105,37,210,233,98,6,53,203,71,180,117,62,134,63,98,29,91,191,62,160,21,163,149,82,60,233,61,198,142,156,161,20,157,158,253,115,177,110,44,143,155,186,160,167,140,58,133,209,96,29,184,112,82,166,175,28,227,129,172,76,49,62,184,35,34,34,39,112,103,154,94,74,111,122,42,82,220,73,172,18,247,103,17,193,12,129,51,204,166,94,56,13,190,177,110,86,44,145,92,27,162,88,38,156,91,68,254,92,192,69,153,47,76,229,252,165,252,145,186,180,239,50,45,110,70,187,24,93,251,229,210,89,55,182,
+239,106,81,97,188,94,82,167,117,227,165,172,71,236,89,63,14,187,173,218,210,62,75,43,229,89,217,87,135,211,178,97,101,252,76,180,88,164,78,204,147,167,136,155,99,30,41,43,231,226,141,108,7,99,5,233,234,36,11,161,136,242,34,171,122,108,191,85,234,74,73,150,10,204,173,94,253,42,181,155,36,30,60,69,115,215,5,66,202,228,241,108,146,141,91,216,224,94,167,115,35,86,19,56,150,55,232,46,35,70,195,43,19,228,140,115,51,61,117,104,41,102,83,17,172,40,178,72,205,27,36,199,212,69,114,94,128,26,63,236,57,139,250,188,229,97,74,153,138,158,147,77,243,2,201,162,192,84,58,57,46,6,73,115,70,185,103,34,193,197,246,227,122,84,206,222,244,70,239,178,116,7,55,239,81,91,102,212,51,126,154,230,100,68,126,88,12,135,181,194,204,198,110,37,30,140,141,82,176,169,194,168,210,202,204,8,21,145,181,158,69,75,119,68,151,38,50,24,222,249,209,76,68,79,158,29,119,244,179,44,14,53,51,181,199,150,176,23,66,198,80,73,30,172,164,178,
+71,209,62,194,153,40,143,90,231,200,148,171,115,243,204,174,244,82,52,127,57,184,199,147,84,36,218,238,195,212,28,71,198,113,230,4,107,163,123,92,70,120,235,112,125,7,231,154,62,22,238,241,7,125,101,201,96,87,82,180,28,91,192,19,149,190,164,241,100,238,154,101,176,230,247,137,137,98,215,94,136,165,217,21,167,184,73,182,91,207,58,225,185,221,18,134,102,87,73,194,184,71,203,232,176,158,164,117,228,78,206,80,145,19,16,174,5,143,63,211,239,225,30,239,43,77,103,164,245,241,51,158,136,93,30,160,78,152,221,74,13,173,11,185,42,117,157,147,47,14,18,199,110,45,58,72,210,224,206,156,166,83,175,118,154,191,223,43,60,45,15,110,10,168,147,94,77,156,110,100,152,22,146,161,243,180,222,120,82,73,7,8,185,169,210,121,76,188,125,18,90,0,70,140,238,44,177,74,242,48,119,99,159,20,34,168,135,250,188,172,189,148,36,101,60,98,71,210,135,76,71,136,181,49,126,237,216,138,158,58,86,11,83,66,156,69,102,57,71,30,110,158,231,87,86,137,
+11,200,147,25,81,158,190,206,23,155,42,210,249,76,255,113,191,71,177,57,177,43,177,196,52,101,7,224,82,255,202,73,160,107,127,106,57,232,25,190,184,156,223,91,237,81,164,173,93,43,110,35,222,158,25,83,149,119,55,42,229,138,61,179,192,10,133,35,78,222,128,73,144,201,165,136,102,36,211,120,49,16,221,196,136,38,82,187,68,230,176,146,45,95,52,100,144,10,143,142,153,66,12,109,80,162,198,100,105,76,36,177,42,83,66,81,110,62,211,59,112,220,191,207,77,30,250,102,242,217,62,225,36,41,25,147,141,112,114,249,96,140,29,28,186,190,172,140,25,140,116,210,10,165,123,120,138,187,28,242,185,199,231,83,138,126,249,212,233,76,204,124,196,93,41,77,202,39,202,217,206,216,65,255,117,134,157,203,76,162,70,43,61,107,75,89,231,26,215,195,56,212,167,66,130,53,157,100,84,126,80,26,129,168,177,159,228,140,211,36,106,5,206,52,146,201,187,83,246,210,161,207,109,97,77,28,147,59,13,27,199,62,49,153,52,187,37,82,119,29,238,196,196,131,201,244,
+73,204,122,45,24,186,148,153,85,147,161,235,75,90,140,84,62,50,251,78,151,174,38,215,68,168,229,136,195,125,53,31,97,208,228,251,197,225,3,190,136,50,121,62,58,102,61,205,206,173,7,251,203,59,147,170,220,164,230,114,229,50,98,200,84,28,238,235,153,20,43,164,82,95,165,104,217,165,2,37,107,196,12,146,230,36,8,82,247,204,182,226,122,221,34,113,177,198,212,6,253,148,75,203,38,75,48,106,50,61,186,94,81,204,138,167,206,188,190,237,105,235,172,23,59,181,109,228,76,20,25,232,241,96,16,183,49,99,186,232,222,95,152,218,95,44,151,215,77,177,209,195,98,42,192,170,20,205,227,41,76,140,89,89,202,76,139,112,218,177,253,57,252,104,156,53,111,25,227,45,103,199,75,3,249,253,149,136,38,52,41,227,93,31,202,246,120,155,197,212,164,170,172,88,58,88,141,174,79,245,115,248,232,243,240,190,18,29,215,102,247,20,157,51,131,46,94,169,219,157,40,100,252,137,2,183,219,125,184,187,201,197,29,171,124,43,39,87,93,235,35,58,66,240,188,82,
+88,35,28,142,92,232,15,142,117,242,157,29,55,206,131,63,27,25,56,40,51,24,231,229,179,149,242,174,183,56,63,87,220,148,224,215,227,164,168,127,165,180,227,91,239,171,92,247,153,172,209,235,188,126,120,108,41,197,219,155,190,128,234,36,215,218,114,101,14,101,14,88,28,35,180,52,118,199,196,159,115,41,41,99,199,83,210,233,252,126,105,254,234,178,236,95,220,60,197,205,154,118,164,228,190,99,102,231,224,126,5,205,56,235,89,207,232,54,231,131,157,93,152,3,81,36,50,42,138,236,208,50,19,202,210,22,251,116,167,146,171,68,43,71,214,88,217,153,63,136,15,56,152,215,3,198,41,92,103,196,152,244,177,144,78,44,246,36,178,129,93,48,98,149,20,255,233,241,130,124,37,147,161,206,101,50,165,5,147,32,136,233,167,121,179,4,235,85,193,96,73,15,94,173,37,70,2,163,180,1,74,95,156,104,97,163,116,74,190,107,92,85,81,12,109,165,76,41,83,185,156,171,148,11,100,218,212,230,118,207,102,200,189,68,99,28,103,133,158,120,54,206,153,117,36,48,
+140,78,164,38,55,74,46,198,202,9,113,255,225,194,105,138,58,18,229,197,210,108,244,250,69,62,25,92,60,43,101,10,142,62,244,90,116,102,218,178,106,116,50,42,39,201,148,203,58,97,56,63,92,152,58,82,85,174,22,244,149,98,46,16,27,10,143,108,72,60,236,141,41,220,26,29,250,47,188,215,44,55,242,242,106,140,44,9,86,174,104,78,101,113,219,165,95,176,230,47,46,230,98,103,165,28,123,51,106,47,140,117,158,142,106,12,166,64,94,233,237,119,89,139,148,74,78,117,233,201,77,28,31,149,77,171,149,147,84,92,181,184,27,48,156,250,28,35,229,73,101,12,129,223,65,35,146,28,71,216,137,188,94,207,100,14,15,51,135,227,195,138,253,226,106,44,107,45,95,143,95,117,46,108,122,40,195,189,161,205,72,190,236,219,189,26,175,28,207,199,176,125,251,19,168,130,185,88,161,208,78,44,165,101,162,88,192,161,167,168,73,31,167,119,116,52,86,206,29,238,100,66,232,85,52,59,122,34,141,113,163,103,251,169,75,235,117,210,183,44,103,243,231,53,34,118,
+236,132,51,163,3,251,152,87,92,118,38,217,44,107,161,167,203,208,143,97,246,239,95,196,212,23,43,20,118,197,220,171,85,90,60,169,85,254,220,81,22,84,202,2,15,21,17,12,82,114,149,66,105,43,227,14,30,92,10,54,216,215,249,11,130,185,60,57,131,191,182,146,60,212,3,151,86,166,37,47,6,117,17,77,170,114,66,11,97,157,101,85,37,66,82,140,58,84,7,108,17,61,181,228,79,115,16,135,177,203,227,236,128,99,154,176,67,28,25,57,218,52,146,145,10,196,21,86,225,80,28,11,59,61,244,106,229,46,2,191,66,149,187,34,201,169,86,238,76,15,189,90,185,203,177,249,106,229,46,67,235,144,10,7,75,180,196,167,36,57,224,93,128,12,93,202,1,146,104,168,232,7,146,26,168,232,7,146,65,168,232,7,146,131,80,209,15,36,55,160,162,31,236,132,56,200,218,11,4,86,4,195,122,97,31,91,37,119,136,16,138,192,5,209,51,212,55,187,62,201,167,242,5,69,135,62,201,153,83,123,123,19,220,174,197,216,133,239,32,213,85,153,158,210,122,179,
+9,163,76,226,60,36,239,210,72,139,84,161,81,63,67,240,40,35,22,188,246,128,44,244,172,147,245,93,246,241,132,67,203,34,19,44,234,25,65,4,41,146,116,179,17,10,177,75,107,82,119,30,36,151,199,70,14,122,34,201,132,35,100,239,206,132,180,146,21,49,118,134,179,148,116,167,73,10,241,17,152,211,57,167,213,96,167,231,157,105,61,138,113,42,101,245,5,109,203,19,82,150,135,10,41,8,155,128,130,51,87,5,151,220,69,244,246,132,28,146,109,188,8,237,117,167,135,71,37,139,126,37,149,64,95,28,194,166,187,82,232,181,72,58,45,164,120,123,179,135,137,61,165,17,115,202,214,217,173,113,130,33,77,79,165,4,242,21,169,10,143,141,56,193,249,143,37,32,83,61,142,50,75,36,22,119,119,23,85,120,69,63,59,133,114,32,21,98,36,100,199,65,178,212,63,180,170,65,168,243,140,193,220,245,112,87,127,31,186,55,201,153,102,89,56,187,122,113,162,115,50,193,210,12,165,199,133,10,142,207,118,66,43,35,208,72,100,80,182,164,80,225,128,1,73,52,
+48,192,198,178,92,142,210,83,2,167,22,25,62,36,56,175,198,209,46,196,14,27,227,145,232,184,61,71,75,243,54,86,87,114,135,195,67,26,7,210,12,62,95,44,85,47,247,14,160,60,201,165,80,175,129,201,100,33,82,219,244,20,250,178,186,15,242,137,100,99,217,182,27,147,161,244,12,62,38,87,152,229,174,234,10,221,58,247,78,215,110,10,93,157,209,77,62,61,115,157,13,239,174,160,201,231,103,68,145,128,215,189,48,188,45,149,43,244,107,195,178,69,63,85,81,128,192,239,180,105,151,68,130,30,50,73,24,193,28,59,38,77,190,248,145,251,44,172,167,50,182,157,136,121,173,91,232,139,119,245,108,145,170,126,162,2,39,28,158,241,132,196,20,39,21,102,132,68,163,152,81,144,248,81,138,228,177,110,209,137,29,143,42,177,227,107,179,244,92,244,104,158,145,80,96,81,98,202,204,242,244,210,137,219,94,224,131,23,8,78,225,58,61,195,178,240,249,158,177,153,228,202,254,126,143,90,184,132,159,150,109,105,24,105,85,102,144,10,233,25,60,214,229,21,81,180,
+219,20,210,121,69,172,80,207,96,228,144,12,45,76,54,117,150,99,167,91,59,230,75,242,74,209,154,17,102,60,235,180,162,117,214,130,146,209,83,195,180,109,142,196,62,249,255,139,239,125,55,124,119,204,178,68,85,201,101,50,116,125,109,37,187,155,43,59,104,120,244,113,31,66,225,64,38,56,100,158,46,154,227,168,201,56,4,149,77,77,114,168,252,89,191,192,165,229,155,249,168,73,122,202,156,55,95,13,11,61,249,173,252,153,205,202,138,219,226,32,21,196,28,72,71,4,212,44,43,34,58,94,98,187,100,209,193,231,21,208,181,44,228,83,48,44,95,92,152,67,12,208,169,40,73,5,204,71,130,185,199,206,156,31,186,178,137,232,132,110,111,230,21,166,216,81,5,137,216,138,35,17,31,220,230,175,222,152,126,254,186,229,247,223,195,218,59,94,63,127,254,231,46,235,254,170,169,229,89,235,203,175,90,95,180,182,253,185,251,186,111,239,214,255,170,245,205,157,187,247,126,242,237,157,155,153,109,64,234,206,93,216,95,195,234,26,27,63,135,253,229,223,254,13,215,118,
+223,221,106,254,232,214,238,7,102,189,189,184,251,254,138,120,219,247,31,180,203,220,222,125,126,123,207,25,118,231,117,123,181,167,236,230,241,239,225,223,183,87,123,49,161,107,214,119,239,221,222,250,133,55,61,253,238,189,196,7,61,73,208,133,241,111,219,90,95,223,52,9,180,222,180,1,129,231,175,218,224,127,104,6,42,222,182,138,64,55,128,155,219,111,37,223,94,145,254,236,221,253,246,250,123,176,159,61,3,202,91,190,253,28,214,220,242,12,254,199,219,182,12,232,246,250,183,109,55,55,140,161,254,193,234,205,126,168,163,250,211,91,240,63,109,110,127,117,219,87,210,222,1,53,25,221,118,141,181,67,55,234,171,61,22,207,95,191,184,105,111,107,110,185,185,203,126,211,186,83,117,57,212,59,208,1,123,9,245,166,61,129,191,51,18,246,203,22,56,236,77,211,247,183,119,228,219,191,171,118,67,220,52,183,222,116,56,194,238,192,191,173,54,189,194,218,224,183,119,236,193,63,31,94,131,190,91,221,6,212,207,90,189,42,254,182,155,173,218,100,209,220,241,113,87,219,
+61,216,175,111,154,204,222,175,89,237,186,169,74,60,107,110,131,63,237,128,218,16,90,110,39,191,107,35,109,127,253,234,21,212,233,0,53,1,85,5,94,182,62,123,215,3,244,174,149,225,30,12,16,167,58,14,64,122,123,71,253,139,127,254,26,106,226,2,139,65,50,48,168,227,239,195,70,159,118,216,19,200,27,31,92,96,191,233,234,130,58,3,32,56,90,238,193,254,223,219,214,167,151,80,43,80,117,91,80,23,96,85,9,212,134,112,11,215,147,239,111,110,199,87,111,142,55,61,169,222,152,191,3,53,238,86,239,207,55,63,135,181,191,130,63,109,110,2,123,1,94,6,84,131,26,23,91,0,251,62,222,3,212,5,1,191,53,17,104,250,243,123,168,182,97,188,179,225,131,54,135,103,55,20,129,28,251,27,96,2,100,240,77,7,222,45,243,111,247,88,109,248,249,72,246,14,176,239,93,183,198,221,79,184,11,251,9,64,8,218,22,36,210,126,67,210,15,58,92,171,236,131,55,181,127,255,174,45,232,101,211,239,129,145,175,193,222,255,216,4,117,148,84,97,122,241,
+226,214,55,213,158,206,42,103,154,190,133,223,187,109,79,124,3,89,117,227,133,103,240,167,47,32,244,63,242,210,151,239,178,207,237,23,40,150,126,221,209,6,153,5,233,123,252,193,227,175,91,58,32,213,159,180,179,253,6,106,102,0,203,220,182,36,85,91,63,127,86,165,210,77,71,201,243,214,219,28,112,179,181,127,99,87,238,61,72,197,29,200,130,255,83,131,238,205,76,96,215,167,125,118,191,248,160,149,175,202,32,88,181,17,3,202,80,213,248,122,27,108,63,255,135,159,84,99,180,163,169,173,227,29,201,97,63,129,26,192,170,255,67,142,170,203,219,127,223,252,170,253,61,73,159,66,92,250,128,164,119,170,206,187,101,60,164,3,16,240,235,106,102,184,109,213,172,54,122,222,42,191,145,126,71,106,72,125,211,179,103,237,183,77,160,109,80,247,243,251,46,154,118,168,125,13,176,187,218,183,244,62,19,191,85,245,4,254,93,19,148,45,1,198,247,62,237,100,175,2,6,180,3,204,218,161,51,229,73,43,96,228,147,187,192,215,240,22,136,143,237,63,2,188,174,126,
+129,214,175,122,252,102,253,219,118,210,63,9,187,79,244,222,28,37,31,170,254,51,154,171,246,66,74,254,141,122,171,62,250,121,243,239,225,96,129,255,141,90,248,203,215,47,110,114,59,116,106,0,61,32,77,188,235,168,249,80,31,72,196,213,182,162,42,75,254,178,190,230,151,47,1,164,77,29,239,145,189,177,21,34,71,149,45,159,116,85,53,0,134,188,126,209,220,241,205,23,80,55,52,80,251,164,169,237,115,112,204,189,122,253,10,16,191,229,245,167,167,84,227,61,216,63,182,181,190,130,183,117,52,127,122,0,125,6,187,15,206,11,136,70,237,191,251,95,95,247,93,49,
diff --git a/uppsrc/GridCtrl/src.tpp/all.i b/uppsrc/GridCtrl/src.tpp/all.i
new file mode 100644
index 000000000..c50f6e87e
--- /dev/null
+++ b/uppsrc/GridCtrl/src.tpp/all.i
@@ -0,0 +1,7 @@
+TOPIC("API$en-us")
+#include "API$en-us.tpp"
+END_TOPIC
+
+TOPIC("Tutorial$en-us")
+#include "Tutorial$en-us.tpp"
+END_TOPIC
diff --git a/uppsrc/HexView/AUTHORS b/uppsrc/HexView/AUTHORS
new file mode 100644
index 000000000..f782e5b62
--- /dev/null
+++ b/uppsrc/HexView/AUTHORS
@@ -0,0 +1,2 @@
+Mirek Fidler <cxl@ntllib.org>
+Tomas Rylek  <rylek@volny.cz>
\ No newline at end of file
diff --git a/uppsrc/HexView/COPYING b/uppsrc/HexView/COPYING
new file mode 100644
index 000000000..33aa39102
--- /dev/null
+++ b/uppsrc/HexView/COPYING
@@ -0,0 +1,30 @@
+Copyright (C) 2005 Mirek Fidler, Tomas Rylek and various contributors (see AUTHORS)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to
+deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies of the Software and its Copyright notices. In addition publicly
+documented acknowledgment must be given that this software has been used if no
+source code of this software is made available publicly. This includes
+acknowledgments in either Copyright notices, Manuals, Publicity and Marketing
+documents or any documentation provided with any product containing this
+software. This License does not apply to any software that links to the
+libraries provided by this software (statically or dynamically), but only to
+the software provided.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+-----------
+
+Please see the COPYING.PLAIN for a plain-english explanation of this notice
+and it's intent.
diff --git a/uppsrc/HexView/COPYING-PLAIN b/uppsrc/HexView/COPYING-PLAIN
new file mode 100644
index 000000000..770a8132f
--- /dev/null
+++ b/uppsrc/HexView/COPYING-PLAIN
@@ -0,0 +1,33 @@
+Plain English Copyright Notice
+
+This file is not intended to be the actual License. The reason this file
+exists is that we here are programmers and engineers. We aren't lawyers. We
+provide licenses that we THINK say the right things, but we have our own
+intentions at heart. This is a plain-english explanation of what those
+intentions are, and if you follow them you will be within the "spirit" of
+the license.
+
+The intent is for us to enjoy writing software that is useful to us (the
+AUTHORS) and allow others to use it freely and also benefit from the work we
+put into making it. We don't want to restrict others using it. They should
+not *HAVE* to make the source code of the applications they write that
+simply link to these libraries (be that statically or dynamically), or for
+them to be limited as to what license they choose to use (be it open, closed
+or anything else). But we would like to know you are using these libraries.
+We simply would like to know that it has been useful to someone. This is why
+we ask for acknowledgement of some sort.
+
+You can do what you want with the source of this software - it doesn't
+matter. We still have it here for ourselves and it is open and free to use
+and download and play with. It can't be taken away. We don't really mind what
+you do with the source to your software. We would simply like to know that
+you are using it - especially if it makes it to a commerical product. If you
+simply e-mail all the AUTHORS (see COPYING and AUTHORS files) telling us, and
+then make sure you include a paragraph or page in the manual or in the "About.."
+box for the product with the copyright notice and state that you used this
+software, we will be very happy. If you want to contribute back modifications
+and fixes you may have made we will welcome those too with open arms (generally).
+If you want help with changes needed, ports needed or features to be added,
+arrangements can be easily made with some dialogue.
+
+Mirek Fidler <cxl@ntllib.org>
diff --git a/uppsrc/HexView/HexView.cpp b/uppsrc/HexView/HexView.cpp
new file mode 100644
index 000000000..9d7182cf8
--- /dev/null
+++ b/uppsrc/HexView/HexView.cpp
@@ -0,0 +1,492 @@
+#include "HexView.h"
+
+NAMESPACE_UPP
+
+#ifdef PLATFORM_WIN32
+
+inline int FormatHexDigit(int c) {
+	return c < 10 ? c + '0' : c - 10 + 'a';
+}
+
+void FormatHex(char *buffer, int64 number, int n) {
+	buffer[n] = '\0';
+	while(n) {
+		buffer[--n] = FormatHexDigit((byte)number & 0x0f);
+		number >>= 4;
+	}
+}
+
+void HexViewInfo::PrintValue(Draw& w, int x, int y, int bytes, bool be)
+{
+	dword d = 0;
+	Size fsz = GetTextSize("X", font);
+	for(int i = 0; i < bytes; i++) {
+		int b = data[be ? i : bytes - i - 1];
+		if(b < 0) {
+			w.DrawText(x, y, String('?', 2 * bytes), font, SColorHighlight);
+			x += 2 * bytes * fsz.cx;
+			w.DrawText(x, y, "=", font);
+			x += fsz.cx;
+			w.DrawText(x, y, "?", font, Red);
+			return;
+		}
+		d = (d << 8) | (byte) b;
+	}
+	w.DrawText(x, y, FormatIntHex(d, 2 * bytes), font, SColorHighlight);
+	x += 2 * bytes * fsz.cx;
+	w.DrawText(x, y, "=", font);
+	x += fsz.cx;
+	String txt = FormatUnsigned(d);
+	w.DrawText(x, y, txt, font, Red);
+	x += GetTextSize(txt, font).cx;
+	w.DrawText(x, y, "=", font);
+	x += fsz.cx;
+	int q = d;
+	if(bytes == 1)
+		q = (int8) d;
+	else
+	if(bytes == 2)
+		q = (int16) d;
+	w.DrawText(x, y, FormatInt(q), font, Magenta);
+}
+
+void HexViewInfo::Paint(Draw& w)
+{
+	Size sz = GetSize();
+	w.DrawRect(sz, SColorLtFace);
+	if(mode < 1)
+		return;
+	Size fsz = GetTextSize("X", font);
+	char h[17];
+	FormatHex(h, pos, longmode ? 16 : 8);
+	int xx = 0;
+	w.DrawText(xx, 0, h, font, SColorHighlight);
+	xx += (longmode ? 16 : 8) * fsz.cx;
+	w.DrawText(xx, 0, "=", font);
+	xx += fsz.cx;
+	w.DrawText(xx, 0, Format64(pos), font, Red);
+	xx += (longmode ? 22 : 12) * fsz.cx;
+	int y = 0;
+	int x;
+	for(int q = 0; q < mode; q++) {
+		x = xx;
+		if(q < 1)
+			PrintValue(w, x, y, 1, q);
+		x += 12 * fsz.cx;
+		PrintValue(w, x, y, 2, q);
+		x += 18 * fsz.cx;
+		PrintValue(w, x, y, 4, q);
+		x += 32 * fsz.cx;
+		y += fsz.cy;
+	}
+	wchar wh[40];
+	memset(wh, 0, sizeof(wh));
+	int i = 0;
+	for(i = 0; i < 40; i++) {
+		if(data[2 * i] < 0 || data[2 * i + 1] < 0)
+			break;
+		wh[i] = MAKEWORD(data[2 * i], data[2 * i + 1]);
+	}
+	w.DrawText(x, 0, wh, font, Cyan, i);
+	if(mode < 2)
+		return;
+	char sh[80];
+	memset(sh, 0, sizeof(sh));
+	for(i = 0; i < 80; i++) {
+		if(data[i] < 0)
+			break;
+		sh[i] = data[i];
+	}
+	WString ws = FromUtf8(sh, i);
+	w.DrawText(x, fsz.cy, ws, font, Cyan, i);
+	String txt;
+	String ftxt;
+	i = 0;
+	for(;;) {
+		if(data[i] < 0) {
+			if(i < sizeof(float))
+				ftxt = "?";
+			txt = "?";
+			break;
+		}
+		if(i >= sizeof(double)) {
+			double h;
+			memcpy(&h, sh, sizeof(double));
+			txt = Sprintf("%.8g", h);
+			break;
+		}
+		if(i == sizeof(float)) {
+			float h;
+			memcpy(&h, sh, sizeof(float));
+			ftxt = Sprintf("%.6g", h);
+		}
+		sh[i] = data[i];
+		i++;
+	}
+	w.DrawText(0, fsz.cy, txt, font, Red);
+	w.DrawText(18 * fsz.cx, fsz.cy, ftxt, font, Red);
+}
+
+void HexViewInfo::SetMode(int _mode)
+{
+	mode = _mode;
+	Height(mode * GetTextSize("X", Courier(12)).cy + 3);
+	Show(mode);
+}
+
+HexViewInfo::HexViewInfo()
+{
+	SetMode(0);
+	AddFrame(TopSeparatorFrame());
+	AddFrame(RightSeparatorFrame());
+	font = Courier(12);
+}
+
+int HexView::Byte(int64 adr)
+{
+	return IsBadReadPtr((byte *)(uintptr_t)adr, 1) ? -1 : *(byte *)(unsigned)adr;
+}
+
+void HexView::Paint(Draw& w)
+{
+	Size sz = GetSize();
+	w.DrawRect(sz, SColorPaper);
+	int y = 0;
+	int64 adr = sc;
+	while(y < sz.cy) {
+		char h[17];
+		FormatHex(h, adr, IsLongMode() ? 16 : 8);
+		w.DrawText(0, y, h, font);
+		int x = (IsLongMode() ? 17 : 9) * fsz.cx;
+		int tx = x + columns * fcx3;
+		for(int q = columns; q--;) {
+			if(adr >= total)
+				return;
+			if(adr == cursor) {
+				w.DrawRect(x, y, fsz.cx * 2, fsz.cy, LtCyan);
+				w.DrawRect(tx, y, fsz.cx, fsz.cy, LtCyan);
+			}
+			int b = Byte(adr++);
+			if(b < 0) {
+				w.DrawText(x, y, "??", font, Brown);
+				w.DrawText(tx, y, "?", font, Brown);
+			}
+			else {
+				h[0] = FormatHexDigit((b & 0xf0) >> 4);
+				h[1] = FormatHexDigit(b & 0x0f);
+				h[2] = '\0';
+				w.DrawText(x, y, h, font, SColorText);
+				Color color = SColorMark;
+				switch(b) {
+				case '\a': *h = 'a'; break;
+				case '\b': *h = 'b'; break;
+				case '\t': *h = 't'; break;
+				case '\f': *h = 'f'; break;
+				case '\r': *h = 'r'; break;
+				case '\n': *h = 'n'; break;
+				case '\v': *h = 'v'; break;
+				case '\0': *h = '0'; break;
+				default:
+					if(b >= 32) {
+						*h = b;
+						color = SColorText;
+					}
+					else {
+						*h = '.';
+						color = SColorDisabled;
+					}
+				}
+				h[1] = '\0';
+				w.DrawText(tx, y, h, charset, font, color);
+			}
+			tx += fsz.cx;
+			x += fcx3;
+		}
+		y += fsz.cy;
+	}
+}
+
+void HexView::MouseWheel(Point, int zdelta, dword)
+{
+	sb.Wheel(zdelta);
+}
+
+void HexView::SetSb()
+{
+	sbm = 0;
+	while((total >> sbm) > (1 << 30))
+		sbm++;
+	sb.SetTotal(int(total >> sbm) / columns + 1);
+	sb.SetPage(int(rows >> sbm));
+	sb.Set(int(sc >> sbm) / columns + 1);
+}
+
+void HexView::Layout()
+{
+	Size sz = GetSize();
+	columns = fixed ? fixed : max(4, (sz.cx - (IsLongMode() ? 18 : 10) * fsz.cx) / (4 * fsz.cx));
+	rows = max(1, sz.cy / fsz.cy);
+	bytes = columns * rows;
+	SetSb();
+}
+
+void HexView::SetTotal(int64 _total)
+{
+	total = _total;
+	Layout();
+	SetSb();
+}
+
+void HexView::SetSc(int64 address)
+{
+	sc = minmax(address, (int64)0, total);
+	SetSb();
+	Refresh();
+}
+
+void HexView::Scroll()
+{
+	int64 q = (int)sb << sbm;
+	if(q == 0)
+		sc = 0;
+	else
+		sc = (q - 1) * columns + sc % columns;
+	Refresh();
+}
+
+void HexView::SetCursor(int64 _cursor)
+{
+	cursor = _cursor;
+	if(cursor > total)
+		cursor = total - 1;
+	if(cursor < 0)
+		cursor = 0;
+	int q = int(sc % columns);
+	if(cursor >= sc + bytes)
+		sc = cursor - bytes + columns;
+	if(cursor < sc) {
+		sc = cursor;
+	}
+	if(sc > q)
+		sc = (sc - q) / columns * columns + q;
+	if(sc >= total)
+		sc = total - 1;
+	if(sc < 0)
+		sc = 0;
+	SetSb();
+	Refresh();
+	info.SetPos(cursor, IsLongMode());
+	for(int i = 0; i < 80; i++)
+		info.Set(i, Byte(cursor + i));
+}
+
+void HexView::LeftDown(Point p, dword)
+{
+	int rowi = p.y / fsz.cy;
+	int x = (IsLongMode() ? 17 : 9) * fsz.cx;
+	int tx = x + columns * fcx3;
+	if(p.x >= x && p.x < tx) {
+		x = p.x - x;
+		int q = x / fcx3;
+		if(x - q * fcx3 < 2 * fsz.cx && q < columns) {
+			int64 c = sc + rowi * columns + q;
+			if(c < total)
+				SetCursor(c);
+		}
+	}
+	else
+	if(p.x >= tx) {
+		int q = (p.x - tx) / fsz.cx;
+		if(q >= 0 && q < columns) {
+			int64 c = sc + rowi * columns + q;
+			if(c < total)
+				SetCursor(c);
+		}
+	}
+	SetFocus();
+}
+
+bool HexView::Key(dword key, int)
+{
+	int pg = max(columns, bytes - columns);
+	int q = int(sc % columns);
+	int64 c = cursor & ~1023;
+	switch(key) {
+	case K_LEFT:
+		SetCursor(cursor - 1);
+		return true;
+	case K_RIGHT:
+		SetCursor(cursor + 1);
+		return true;
+	case K_UP:
+		SetCursor(cursor - columns);
+		return true;
+	case K_DOWN:
+		SetCursor(cursor + columns);
+		return true;
+	case K_PAGEUP:
+		SetSc(sc - pg);
+		SetCursor(cursor - pg);
+		return true;
+	case K_PAGEDOWN:
+		SetSc(sc + pg);
+		SetCursor(cursor + pg);
+		return true;
+	case K_CTRL_LEFT:
+		SetSc(sc - 1);
+		break;
+	case K_CTRL_RIGHT:
+		SetSc(sc + 1);
+		break;
+	case K_CTRL_UP:
+		SetSc(sc - columns);
+		break;
+	case K_CTRL_DOWN:
+		SetSc(sc + columns);
+		break;
+	case K_HOME:
+		SetCursor((cursor - q) / columns * columns + q);
+		break;
+	case K_END:
+		SetCursor((cursor - q) / columns * columns + q + columns - 1);
+		break;
+	case K_CTRL_HOME:
+	case K_CTRL_PAGEUP:
+		SetCursor(0);
+		break;
+	case K_CTRL_END:
+	case K_CTRL_PAGEDOWN:
+		SetCursor(total - 1);
+		break;
+	}
+	return MenuBar::Scan(WhenBar, key);
+}
+
+void HexView::SetColumns(int x)
+{
+	FixedColumns(x);
+}
+
+void HexView::SetCharset(int chr)
+{
+	Charset(chr);
+}
+
+void HexView::StdGoto(const String& s)
+{
+	CParser p(s);
+	int n = 10;
+	if(p.Char2('0', 'x') || p.Char('$') || p.Char('#'))
+		n = 16;
+	if(p.IsNumber(n)) {
+		int64 a = p.ReadNumber(n);
+		if(a >= 0 && a < total) {
+			SetCursor(a);
+			SetSc(a);
+			return;
+		}
+	}
+	Exclamation("Invalid position!");
+}
+
+void HexView::Goto()
+{
+	if(go.Execute() == IDOK)
+		WhenGoto((String)~go.text);
+}
+
+void HexView::ColumnsMenu(Bar& bar)
+{
+	bar.Add("Auto", THISBACK1(SetColumns, 0))
+	   .Radio(fixed == 0);
+	bar.Add("8", THISBACK1(SetColumns, 8))
+	   .Radio(fixed == 8);
+	bar.Add("16", THISBACK1(SetColumns, 16))
+	   .Radio(fixed == 16);
+	bar.Add("32", THISBACK1(SetColumns, 32))
+	   .Radio(fixed == 32);
+}
+
+void HexView::SetInfo(int m)
+{
+	info.SetMode(m);
+}
+
+void HexView::InfoMenu(Bar& bar)
+{
+	bar.Add("None", THISBACK1(SetInfo, 0))
+	   .Check(info.GetMode() == 0);
+	bar.Add("Standard", THISBACK1(SetInfo, 1))
+	   .Check(info.GetMode() == 1);
+	bar.Add("Extended", THISBACK1(SetInfo, 2))
+	   .Check(info.GetMode() == 2);
+}
+
+void HexView::CharsetMenu(Bar& bar)
+{
+	for(int i = 1; i < CharsetCount(); i++)
+		bar.Add(CharsetName(i), THISBACK1(SetCharset, i))
+		   .Radio(charset == i);
+}
+
+void HexView::StdMenu(Bar& bar)
+{
+	bar.Add("Go to..", THISBACK(Goto))
+	   .Key(K_CTRL_G);
+	bar.Add("Columns", THISBACK(ColumnsMenu));
+	bar.Add("Charset", THISBACK(CharsetMenu));
+	bar.Add("Position info", THISBACK(InfoMenu));
+}
+
+void HexView::RightDown(Point p, dword w)
+{
+	LeftDown(p, w);
+	MenuBar::Execute(WhenBar);
+}
+
+HexView& HexView::SetFont(Font fnt)
+{
+	font = fnt;
+	fsz = GetTextSize("X", font);
+	fcx3 = 3 * fsz.cx;
+	Layout();
+	Refresh();
+	SetSb();
+	return *this;
+}
+
+void  HexView::SerializeSettings(Stream& s)
+{
+	int version = 0;
+	s / version;
+	s / fixed;
+	s % charset;
+	int mode = info.GetMode();
+	s / mode;
+	info.SetMode(mode);
+	go.text.SerializeList(s);
+}
+
+HexView::HexView()
+{
+	SetFont(Courier(12));
+	BackPaint();
+	charset = CHARSET_WIN1252;
+	sb <<= THISBACK(Scroll);
+	SetFrame(InsetFrame());
+	AddFrame(sb);
+	cursor = sc = 0;
+	total = 0;
+	fixed = 0;
+	SetSc(0);
+	SetCursor(0);
+	AddFrame(info);
+	info.SetMode(1);
+	WhenBar = THISBACK(StdMenu);
+	CtrlLayoutOKCancel(go, "Go to");
+	WhenGoto = THISBACK(StdGoto);
+}
+
+#endif
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/HexView/HexView.h b/uppsrc/HexView/HexView.h
new file mode 100644
index 000000000..4cb034bb7
--- /dev/null
+++ b/uppsrc/HexView/HexView.h
@@ -0,0 +1,99 @@
+#ifndef _HexView_HexView_h
+#define _HexView_HexView_h
+
+#include <CtrlLib/CtrlLib.h>
+
+
+NAMESPACE_UPP
+
+#define LAYOUTFILE <HexView/HexView.lay>
+#include <CtrlCore/lay.h>
+
+class HexViewInfo : public FrameBottom<Ctrl> {
+	virtual void Paint(Draw& w);
+
+private:
+	Font  font;
+	int64 pos;
+	int   data[80];
+	int   mode;
+	bool  longmode;
+
+	void  PrintValue(Draw& w, int x, int y, int bytes, bool be);
+
+public:
+	void  SetPos(int64 p, bool lm)     { pos = p; longmode = lm; }
+	void  Set(int i, int d)            { ASSERT(i >= 0 && i < 80); data[i] = d; Refresh(); }
+	void  SetMode(int m);
+	int   GetMode() const              { return mode; }
+
+	HexViewInfo();
+};
+
+class HexView : public Ctrl {
+public:
+	virtual void Paint(Draw& w);
+	virtual void Layout();
+	virtual void LeftDown(Point p, dword);
+	virtual bool Key(dword key, int);
+	virtual void MouseWheel(Point, int zdelta, dword);
+	virtual void RightDown(Point, dword);
+
+private:
+	Font      font;
+	int       fcx3;
+	Size      fsz;
+	int       fixed;
+	int       columns, rows, bytes;
+	int       sbm;
+	int64     sc, cursor, total;
+	byte      charset;
+	ScrollBar sb;
+
+	HexViewInfo info;
+
+	WithHexGotoLayout<TopWindow> go;
+
+	void      SetSb();
+	void      Scroll();
+	void      SetCharset(int chr);
+	void      SetColumns(int x);
+	void      SetInfo(int m);
+	void      Goto();
+
+public:
+	virtual int Byte(int64 adr);
+
+	Callback1<Bar&>          WhenBar;
+	Callback1<const String&> WhenGoto;
+
+	void  ColumnsMenu(Bar& bar);
+	void  CharsetMenu(Bar& bar);
+	void  InfoMenu(Bar& bar);
+	void  StdMenu(Bar& bar);
+
+	void  StdGoto(const String& text);
+
+	void  GotoAddHistory()            { go.text.AddHistory(); }
+
+	bool  IsLongMode() const          { return total > 0xffffffff; }
+	void  SetTotal(int64 _total);
+	void  SetSc(int64 address);
+	int64 GetSc() const               { return sc; }
+	void  SetCursor(int64 address);
+	int64 GetCursor() const           { return cursor; }
+
+	void  SerializeSettings(Stream& s);
+
+	HexView& SetFont(Font fnt);
+	HexView& Charset(byte chrset)     { charset = chrset; Refresh(); return *this; }
+	HexView& FixedColumns(int c = 0)  { fixed = c; Layout(); Refresh(); return *this; }
+
+	typedef HexView CLASSNAME;
+
+	HexView();
+};
+
+END_UPP_NAMESPACE
+
+#endif
diff --git a/uppsrc/HexView/HexView.lay b/uppsrc/HexView/HexView.lay
new file mode 100644
index 000000000..e8719393a
--- /dev/null
+++ b/uppsrc/HexView/HexView.lay
@@ -0,0 +1,6 @@
+LAYOUT(HexGotoLayout, 280, 68)
+	ITEM(Label, dv___0, SetLabel(t_("New position")).LeftPosZ(4, 68).TopPosZ(8, 19))
+	ITEM(WithDropChoice<EditString>, text, LeftPosZ(76, 196).TopPosZ(8, 19))
+	ITEM(Button, ok, SetLabel(t_("OK")).LeftPosZ(140, 64).TopPosZ(36, 24))
+	ITEM(Button, cancel, SetLabel(t_("Cancel")).LeftPosZ(208, 64).TopPosZ(36, 24))
+END_LAYOUT
diff --git a/uppsrc/HexView/HexView.upp b/uppsrc/HexView/HexView.upp
new file mode 100644
index 000000000..4072ed7af
--- /dev/null
+++ b/uppsrc/HexView/HexView.upp
@@ -0,0 +1,17 @@
+description "Widget to display hexadecimal dumps (e.g. memory in debugger)";
+
+uses
+	CtrlLib;
+
+file
+	HexView.h,
+	HexView.cpp,
+	HexView.lay,
+	Info readonly separator,
+	COPYING,
+	COPYING-PLAIN,
+	AUTHORS;
+
+mainconfig
+	"" = "";
+
diff --git a/uppsrc/HexView/app.tpp/search$en-us.tpp b/uppsrc/HexView/app.tpp/search$en-us.tpp
new file mode 100644
index 000000000..fc3ad8996
--- /dev/null
+++ b/uppsrc/HexView/app.tpp/search$en-us.tpp
@@ -0,0 +1,37 @@
+TITLE("Search pattern format")
+COMPRESSED
+120,156,173,147,237,110,155,48,24,70,111,197,90,187,45,169,
+146,212,126,109,130,129,31,219,148,246,71,165,180,157,84,69,
+153,132,208,112,130,155,88,226,35,2,167,107,181,45,215,62,
+67,232,148,65,154,116,211,64,194,2,251,28,191,126,140,125,
+116,122,138,123,248,4,31,185,220,11,121,47,214,177,14,124,
+3,16,3,88,212,226,24,3,101,12,40,181,44,112,48,117,
+28,140,135,230,11,231,22,16,119,33,86,129,63,35,67,219,
+19,12,188,145,193,192,96,204,48,54,35,134,98,67,70,57,
+80,194,1,134,14,101,14,195,12,8,184,74,203,36,240,99,
+224,220,19,196,246,12,70,123,244,4,108,163,180,25,103,156,
+80,155,3,131,33,24,17,182,193,34,165,197,114,35,89,204,
+107,76,217,152,85,236,173,227,109,54,155,129,227,64,169,97,
+102,118,130,25,37,64,136,169,130,129,77,44,7,59,22,39,
+28,83,155,129,101,99,203,93,137,92,152,233,191,127,253,249,
+246,242,166,63,185,67,126,129,189,51,134,238,164,200,231,75,
+180,18,90,203,60,69,247,89,158,8,253,46,40,123,81,217,
+16,15,77,10,25,161,52,211,66,171,44,117,203,143,224,185,
+161,185,63,229,185,120,26,233,60,46,95,174,179,117,33,167,
+75,41,227,176,243,57,83,169,14,123,213,35,250,150,229,81,
+216,117,209,86,90,214,205,169,169,219,63,255,216,33,192,7,
+120,96,158,93,116,17,244,127,68,114,174,18,17,163,116,157,
+204,100,126,120,252,23,51,126,41,31,197,51,19,169,133,210,
+135,17,45,31,181,161,202,6,21,58,87,233,162,49,190,94,
+118,35,18,25,203,68,166,186,112,119,82,57,80,87,179,176,
+176,143,10,51,85,44,209,236,73,203,99,112,133,67,53,180,
+64,42,69,177,210,58,150,97,95,166,145,18,41,234,92,165,
+90,198,221,63,182,233,144,172,22,178,255,34,44,183,104,103,
+41,168,94,97,19,58,67,211,96,15,89,254,6,207,72,163,
+138,182,97,188,207,16,253,149,226,186,169,104,135,59,83,139,
+223,65,36,89,212,218,156,23,36,237,80,255,65,52,109,101,
+178,35,121,5,63,110,242,109,38,124,211,132,170,19,176,237,
+217,158,131,61,201,31,161,38,55,87,163,219,139,75,180,151,
+62,71,225,251,23,232,170,171,62,124,115,81,72,19,91,33,
+211,66,105,245,176,39,174,241,49,207,110,25,175,240,125,40,
+195,82,113,52,23,121,84,31,227,224,23,136,243,202,73,
\ No newline at end of file
diff --git a/uppsrc/HexView/init b/uppsrc/HexView/init
new file mode 100644
index 000000000..b6b7121f4
--- /dev/null
+++ b/uppsrc/HexView/init
@@ -0,0 +1,4 @@
+#ifndef _HexView_icpp_init_stub
+#define _HexView_icpp_init_stub
+#include "CtrlLib/init"
+#endif
diff --git a/uppsrc/I18NCtrlLayoutTest/I18NCtrlLayoutTest.h b/uppsrc/I18NCtrlLayoutTest/I18NCtrlLayoutTest.h
new file mode 100644
index 000000000..1863be028
--- /dev/null
+++ b/uppsrc/I18NCtrlLayoutTest/I18NCtrlLayoutTest.h
@@ -0,0 +1,27 @@
+#ifndef _I18NCtrlLayoutTest_I18NCtrlLayoutTest_h
+#define _I18NCtrlLayoutTest_I18NCtrlLayoutTest_h
+
+#include <CtrlLib/CtrlLib.h>
+
+using namespace Upp;
+
+#define LAYOUTFILE <I18NCtrlLayoutTest/Layout.lay>
+#include <CtrlCore/lay.h>
+
+class MainDlg : public WithMainDlg<TopWindow> {
+	MenuBar m_menu;
+	typedef MainDlg CLASSNAME;
+
+public:
+	void OnFile();
+	void OnPallette();
+	void OnPrinter();
+	void OnMenu(Bar& bar );
+	void OnLanguage(Bar& bar );
+	void OnChangeLanguage(int language );
+
+	MainDlg();
+};
+
+#endif
+
diff --git a/uppsrc/I18NCtrlLayoutTest/I18NCtrlLayoutTest.upp b/uppsrc/I18NCtrlLayoutTest/I18NCtrlLayoutTest.upp
new file mode 100644
index 000000000..bbee94553
--- /dev/null
+++ b/uppsrc/I18NCtrlLayoutTest/I18NCtrlLayoutTest.upp
@@ -0,0 +1,11 @@
+uses
+	CtrlLib;
+
+file
+	Layout.lay,
+	I18NCtrlLayoutTest.h,
+	main.cpp;
+
+mainconfig
+	"" = "GUI";
+
diff --git a/uppsrc/I18NCtrlLayoutTest/Layout.lay b/uppsrc/I18NCtrlLayoutTest/Layout.lay
new file mode 100644
index 000000000..2b1589750
--- /dev/null
+++ b/uppsrc/I18NCtrlLayoutTest/Layout.lay
@@ -0,0 +1,8 @@
+LAYOUT(MainDlg, 328, 108)
+	ITEM(Button, m_file, SetLabel(t_("File Selection...")).LeftPosZ(12, 116).TopPosZ(12, 24))
+	ITEM(Button, m_pallette, SetLabel(t_("Pallette...")).LeftPosZ(136, 92).TopPosZ(12, 24))
+	ITEM(Button, m_printer, SetLabel(t_("Printer...")).LeftPosZ(236, 80).TopPosZ(12, 24))
+	ITEM(Button, m_close, SetLabel(t_("Close")).SetFont(StdFont(11).Bold()).RightPosZ(12, 56).BottomPosZ(12, 24))
+	ITEM(EditString, m_current, SetEditable(false).HSizePosZ(12, 84).BottomPosZ(13, 19))
+END_LAYOUT
+
diff --git a/uppsrc/I18NCtrlLayoutTest/main.cpp b/uppsrc/I18NCtrlLayoutTest/main.cpp
new file mode 100644
index 000000000..380710f6d
--- /dev/null
+++ b/uppsrc/I18NCtrlLayoutTest/main.cpp
@@ -0,0 +1,74 @@
+#include "I18NCtrlLayoutTest.h"
+
+MainDlg::MainDlg()
+{
+	::CtrlLayout( *this, "I18n Layout Test" );
+	
+	AddFrame( m_menu );
+	m_menu.Set( THISBACK(OnMenu) );
+	AddFrame( InsetFrame() );
+	
+	m_file <<= THISBACK(OnFile);
+	m_pallette <<= THISBACK(OnPallette);
+	m_printer <<= THISBACK(OnPrinter);
+	
+	OnChangeLanguage( ::GetCurrentLanguage() );
+	
+	m_close <<= Rejector( IDCANCEL );
+}
+
+void MainDlg::OnFile()
+{
+	FileSel dlg;
+	dlg.ReadOnlyOption();
+	dlg.ExecuteOpen( t_("Test") );
+	dlg.ExecuteSaveAs( t_("Test") );
+	dlg.ExecuteSelectDir( t_("Test") );
+}
+
+void MainDlg::OnPallette()
+{
+	::RunDlgSelectColor();
+}
+
+void MainDlg::OnPrinter()
+{
+	PrinterJob dlg;
+	dlg.Execute();
+}
+
+void MainDlg::OnMenu(Bar& bar )
+{
+	bar.Add( t_("Language"), THISBACK(OnLanguage) ).Key( K_F1 );
+}
+
+void MainDlg::OnLanguage(Bar& bar )
+{
+	const int* languages = GetAllLanguages();
+	// We have a tremendous amount of redundancy here... we'll use this as a filter.
+	// Note that sometimes, the number changes, but it still comes up as 'English'.
+	// This is perhaps because we don't have any translations for the other languages.
+	VectorMap< String, int > oldLangs;
+	for (int i = 0; languages[i] != 0; i++ )
+	{
+		String langName = ::GetNativeLangName( languages[ i ] );
+		if ( oldLangs.Find( langName ) < 0 )
+		{
+			bar.Add( langName , THISBACK1( OnChangeLanguage, languages[i] ) );
+			oldLangs.Add( langName, languages[i] );
+		}
+	}
+}
+
+void MainDlg::OnChangeLanguage(int language )
+{
+	m_current.SetData( ::GetNativeLangName( language ) );
+	::SetLanguage( language );
+}
+
+GUI_APP_MAIN
+{
+	MainDlg dlg;
+	dlg.Run();
+}
+
diff --git a/uppsrc/IconDes/AlphaCtrl.cpp b/uppsrc/IconDes/AlphaCtrl.cpp
new file mode 100644
index 000000000..b0a58da7c
--- /dev/null
+++ b/uppsrc/IconDes/AlphaCtrl.cpp
@@ -0,0 +1,125 @@
+#include "IconDes.h"
+
+NAMESPACE_UPP
+
+void AlphaCtrl::Layout()
+{
+	MakeImage();
+}
+
+void AlphaCtrl::Paint(Draw& w)
+{
+	Size sz = GetSize();
+	Size isz = IconDesImg::Alpha().GetSize();
+	w.DrawImage(0, isz.cy, img);
+	DrawFrame(w, 0, isz.cy, sz.cx, sz.cy - isz.cy, SColorText());
+	int h = sz.cy - isz.cy - 2;
+	if(!mask) {
+		w.DrawRect(15, isz.cy + 1, 1, h, SColorPaper());
+		w.DrawRect(16, isz.cy + 1, 1, h, SColorText());
+		w.DrawRect(17, isz.cy + 1, 1, h, SColorPaper());
+		w.DrawRect(sz.cx - 17, isz.cy + 1, 1, h, SColorPaper());
+		w.DrawRect(sz.cx - 16, isz.cy + 1, 1, h, SColorText());
+		w.DrawRect(sz.cx - 15, isz.cy + 1, 1, h, SColorPaper());
+	}
+	int a = mask ? maskvalue : alpha;
+	int x = a == 0   ? 8 - isz.cx / 2 :
+	        a == 255 ? sz.cx - 8 - isz.cx / 2
+	                 : 16 + a * (sz.cx - 32) / 255 - isz.cx / 2;
+	w.DrawImage(x, 0, IconDesImg::Alpha());
+}
+
+void AlphaCtrl::DoPoint(Point p)
+{
+	Size sz = GetSize();
+	if(mask)
+		maskvalue = p.x < sz.cx / 2 ? 0 : 255;
+	else
+		if(p.x < 16 || sz.cx < 32)
+			alpha = 0;
+		else
+		if(p.x > sz.cx - 16)
+			alpha = 255;
+		else
+			alpha = 255 * (p.x - 16) / (sz.cx - 32);
+	Refresh();
+	UpdateActionRefresh();
+}
+
+void AlphaCtrl::LeftDown(Point p, dword keyflags)
+{
+	DoPoint(p);
+	SetCapture();
+}
+
+void AlphaCtrl::MouseMove(Point p, dword keyflags)
+{
+	if(HasCapture())
+		DoPoint(p);
+}
+
+static void sPaintCol(ImageBuffer& b, int x, int y, int h, RGBA c)
+{
+	RGBA *t = b[y] + x;
+	while(h-- > 0) {
+		*t = c;
+		t += b.GetWidth();
+	}
+}
+
+void AlphaCtrl::MakeImage()
+{
+	Size sz = GetSize();
+	sz.cy -= IconDesImg::Alpha().GetHeight();
+	if(sz.cx <= 32 || sz.cy < 0) {
+		img = Null;
+		return;
+	}
+	ImageBuffer b(GetSize());
+	Color c = mask ? Black() : color;
+	for(int i = 1; i < sz.cx; i++) {
+		int a = mask ? i < sz.cx / 2 ? 0 : 255
+		             : i < 16 ? 0 : i > sz.cx - 16 ? 255 : min(255, 255 * i / (sz.cx - 32) - 1);
+		int h = sz.cy / 2;
+		sPaintCol(b, i, 0, h, Blend((i & 8) ? White : Black, c, a));
+		sPaintCol(b, i, h, h, Blend((i & 8) ? Black : White, c, a));
+	}
+	img = b;
+	Refresh();
+}
+
+void AlphaCtrl::SetColor(Color c)
+{
+	color = c;
+	MakeImage();
+}
+
+void AlphaCtrl::Mask(bool m)
+{
+	mask = m;
+	MakeImage();
+	Refresh();
+}
+
+
+void AlphaCtrl::Set(int a)
+{
+	(mask ? maskvalue : alpha) = a;
+	UpdateRefresh();
+}
+
+int AlphaCtrl::Get() const
+{
+	return mask ? maskvalue : alpha;
+}
+
+AlphaCtrl::AlphaCtrl()
+{
+	BackPaint();
+	Transparent();
+	alpha = 255;
+	mask = false;
+	maskvalue = 255;
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/IconDes/Bar.cpp b/uppsrc/IconDes/Bar.cpp
new file mode 100644
index 000000000..9f357035e
--- /dev/null
+++ b/uppsrc/IconDes/Bar.cpp
@@ -0,0 +1,295 @@
+#include "IconDes.h"
+
+NAMESPACE_UPP
+
+void IconDes::SetPen(int _pen)
+{
+	pen = _pen;
+	SetBar();
+}
+
+bool IconDes::Key(dword key, int count)
+{
+	switch(key) {
+	case K_SHIFT_LEFT:  KeyMove(-1, 0); return true;
+	case K_SHIFT_RIGHT: KeyMove(1, 0); return true;
+	case K_SHIFT_UP:    KeyMove(0, -1); return true;
+	case K_SHIFT_DOWN:  KeyMove(0, 1); return true;
+	}
+	return false;
+}
+
+void IconDes::SetMagnify(int mag)
+{
+	if( !IsCurrent() )
+		return;
+
+	magnify = minmax(mag, 1, 27);
+
+	sb = Point(0, 0);
+	SetSb();
+	Refresh();
+
+	SetBar();
+}
+
+
+void IconDes::ZoomIn()
+{
+	SetMagnify(magnify+2);
+}
+
+void IconDes::ZoomOut()
+{
+	SetMagnify(magnify-2);
+}
+
+void IconDes::DoPaste()
+{
+	if(!IsCurrent())
+		return;
+	Image m = ReadClipboardImage();
+	if(m)
+		Paste(m);
+}
+
+void IconDes::DoCopy()
+{
+	if(!IsCurrent())
+		return;
+	WriteClipboardImage(IsPasting() ? Current().paste_image : Copy(SelectionRect()));
+}
+
+void IconDes::DoCut()
+{
+	if(!IsCurrent())
+		return;
+	DoCopy();
+	if(IsPasting()) {
+		Current().paste_image.Clear();
+		MakePaste();
+	}
+	else
+		Delete();
+}
+
+void IconDes::ToolEx(Bar& bar) {}
+
+void IconDes::EditBar(Bar& bar)
+{
+	Slot *c = IsCurrent() ? &Current() : NULL;
+	bar.Add(c, "Cut", CtrlImg::cut(), THISBACK(DoCut)).Key(K_DELETE).Key(K_CTRL_X);
+	bar.Add(c, "Copy", CtrlImg::copy(), THISBACK(DoCopy)).Key(K_CTRL_C);
+	bar.Add(c, "Paste", CtrlImg::paste(), THISBACK(DoPaste)).Key(K_CTRL_V);
+	bar.Separator();
+	bar.Add(c && c->undo.GetCount(), "Undo", CtrlImg::undo(), THISBACK(Undo))
+	   .Key(K_CTRL_Z)
+	   .Repeat();
+	bar.Add(c && c->redo.GetCount(), "Redo", CtrlImg::redo(), THISBACK(Redo))
+	   .Key(K_SHIFT_CTRL_Z)
+	   .Repeat();
+}
+
+void IconDes::SettingBar(Bar& bar)
+{
+	Slot *c = IsCurrent() ? &Current() : NULL;
+	bar.Add(c, "Zoom out", IconDesImg::ZoomMinus(), THISBACK(ZoomOut))
+		.Enable(magnify > 1)
+		.Key(K_SHIFT_CTRL_SUBRACT);
+	bar.Add(c, "Zoom in",  IconDesImg::ZoomPlus(), THISBACK(ZoomIn))
+		.Enable(magnify < 27)
+		.Key(K_SHIFT_CTRL_ADD);
+	bar.Add("Paste transparent/opaque",
+	        paste_opaque ? IconDesImg::PasteOpaque()
+	                     : IconDesImg::PasteTransparent(),
+	        THISBACK(TogglePaste))
+	   .Key(K_CTRL_T);
+}
+
+void IconDes::SelectBar(Bar& bar)
+{
+	Slot *c = IsCurrent() ? &Current() : NULL;
+	bar.Add(c, "Select", IconDesImg::Select(), THISBACK(Select))
+	   .Check(doselection)
+	   .Key(K_SPACE);
+	bar.Add(c, "Invert selection", IconDesImg::InvertSelect(), THISBACK(InvertSelect))
+	   .Key(K_CTRL_I);
+	bar.Add(c, "Cancel selection", IconDesImg::CancelSelect(), THISBACK(CancelSelect))
+	   .Key(K_CTRL_E);
+	bar.Add(c, "Select and move rectangle", IconDesImg::SelectRect(), THISBACK(SelectRect))
+	   .Check(selectrect)
+	   .Key(K_CTRL_R);
+	bar.Add(c, "Move", IconDesImg::Move(), THISBACK(Move))
+	   .Check(IsPasting())
+	   .Key(K_CTRL_M);
+}
+
+void IconDes::ImageBar(Bar& bar)
+{
+	Slot *c = IsCurrent() ? &Current() : NULL;
+	if(c && c->supersampling)
+		bar.Add(c, "Smooth resize 3x down", IconDesImg::ResizeDown(), THISBACK(ResizeDown))
+		   .Key(K_TAB);
+	else
+		bar.Add(c && c->image.GetLength() < 256 * 256, "Resize 3x up (supersampling)",
+	    	    IconDesImg::ResizeUp(), THISBACK(ResizeUp))
+	       .Key(K_TAB);
+	bar.Separator();
+	bar.Add(c, "Set color", IconDesImg::SetColor(), THISBACK(SetColor));
+	bar.Add(c, "Empty", IconDesImg::Delete(), THISBACK(DoDelete))
+	   .Key(K_DELETE);
+	bar.Add(c, "Interpolate", IconDesImg::Interpolate(), THISBACK(Interpolate));
+	bar.Add(c, "Horizontal mirror", IconDesImg::MirrorX(), THISBACK(MirrorX));
+	bar.Add(c, "Vertical mirror", IconDesImg::MirrorY(), THISBACK(MirrorY));
+	bar.Add(c, "Horizontal symmetry", IconDesImg::SymmX(), THISBACK(SymmX));
+	bar.Add(c, "Vertical symmetry", IconDesImg::SymmY(), THISBACK(SymmY));
+	bar.Add(c, "Rotate", IconDesImg::Rotate(), THISBACK(Rotate));
+	bar.Add(c, "Smooth Rescale", IconDesImg::Rescale(), THISBACK(SmoothRescale));
+	bar.Add(c, "Blur/Sharpen", IconDesImg::BlurSharpen(), THISBACK(BlurSharpen));
+	bar.Add(c, "Colorize", IconDesImg::Colorize(), THISBACK(Colorize));
+	bar.Add(c, "Chroma", IconDesImg::Chroma(), THISBACK(Chroma));
+	bar.Add(c, "Contrast", IconDesImg::Contrast(), THISBACK(Contrast));
+	bar.Add(c, "Alpha", IconDesImg::AlphaI(), THISBACK(Alpha));
+	bar.Add(c, "Colors", IconDesImg::Colors(), THISBACK(Colors));
+}
+
+void IconDes::DrawBar(Bar& bar)
+{
+	bool notpasting = !IsPasting();
+	bar.Add("FreeHand", IconDesImg::FreeHand(), THISBACK1(SetTool, &IconDes::FreehandTool))
+	   .Check(tool == &IconDes::FreehandTool && notpasting)
+	   .Key(K_H);
+	bar.Add("Lines", IconDesImg::Lines(), THISBACK1(SetTool, &IconDes::LineTool))
+	   .Check(tool == &IconDes::LineTool && notpasting)
+	   .Key(K_L);
+	bar.Add("Ellipses", IconDesImg::Circles(), THISBACK1(SetTool, &IconDes::EllipseTool))
+	   .Check(tool == &IconDes::EllipseTool && notpasting)
+	   .Key(K_E);
+	bar.Add("Empty ellipses", IconDesImg::EmptyCircles(), THISBACK1(SetTool, &IconDes::EmptyEllipseTool))
+	   .Check(tool == &IconDes::EmptyEllipseTool && notpasting)
+	   .Key(K_W);
+	bar.Add("Rectangles", IconDesImg::Rects(), THISBACK1(SetTool, &IconDes::RectTool))
+	   .Check(tool == &IconDes::RectTool && notpasting)
+	   .Key(K_R);
+	bar.Add("Empty rectangles", IconDesImg::EmptyRects(), THISBACK1(SetTool, &IconDes::EmptyRectTool))
+	   .Check(tool == &IconDes::EmptyRectTool && notpasting && !selectrect)
+	   .Key(K_T);
+	bar.Add("Hotspots", IconDesImg::HotSpot(), THISBACK1(SetTool, &IconDes::HotSpotTool))
+	   .Check(tool == &IconDes::HotSpotTool)
+	   .Key(K_H);
+	bar.Separator();
+	for(int i = 1; i <= 6; i++)
+		bar.Add("Pen " + AsString(i), IconDesImg::Get(IconDesImg::I_Pen1 + i - 1), THISBACK1(SetPen, i))
+		   .Check(pen == i)
+		   .Key(K_1 + i - 1);
+}
+
+void IconDes::MainToolBar(Bar& bar)
+{
+	EditBar(bar);
+	bar.Separator();
+	SelectBar(bar);
+	bar.Separator();
+	ImageBar(bar);
+	bar.Break();
+	DrawBar(bar);
+	ToolEx(bar);
+	bar.Separator();
+	SettingBar(bar);
+}
+
+void IconDes::SetBar()
+{
+	toolbar.Set(THISBACK(MainToolBar));
+}
+
+struct CachedIconImage : public Display {
+	virtual void Paint(Draw& w, const Rect& r, const Value& q,
+	                   Color ink, Color paper, dword style) const
+	{
+		w.DrawRect(r, paper);
+		Image m = q;
+		if(IsNull(m))
+			return;
+		Size isz = m.GetSize();
+		if(isz.cx > 200 || isz.cy > 200)
+			m = IconDesImg::LargeImage();
+		else
+		if(isz.cx > r.GetWidth() || isz.cy > r.GetHeight())
+			m = CachedRescale(m, GetFitSize(m.GetSize(), r.GetSize()));
+		Point p = r.CenterPos(m.GetSize());
+		w.DrawImage(p.x, p.y, m);
+	}
+};
+
+void IconDes::SerializeSettings(Stream& s)
+{
+
+	void (IconDes::*toollist[])(Point p, dword flags) = {
+		&IconDes::LineTool,
+		&IconDes::FreehandTool,
+		&IconDes::EllipseTool,
+		&IconDes::EmptyEllipseTool,
+		&IconDes::RectTool,
+		&IconDes::EmptyRectTool,
+		&IconDes::HotSpotTool,
+	};
+
+	int version = 2;
+	s / version;
+	s / magnify;
+	s % leftpane % bottompane;
+	int i;
+	for(i = 0; i < __countof(toollist); i++)
+		if(toollist[i] == tool)
+			break;
+	s % i;
+	if(i >= 0 && i < __countof(toollist))
+		tool = toollist[i];
+	if(version >= 1)
+		s % pen;
+	SetSb();
+	Refresh();
+	SetBar();
+	if(version >= 2)
+		s % ImgFile();
+}
+
+IconDes::IconDes()
+{
+	sb.WhenScroll = THISBACK(Scroll);
+
+	paste_opaque = false;
+	doselection = false;
+
+	tool = &IconDes::FreehandTool;
+
+	AddFrame(leftpane);
+	AddFrame(bottompane);
+	AddFrame(toolbar);
+	AddFrame(sb);
+	AddFrame(ViewFrame());
+
+	leftpane.Left(rgbactrl, 256);
+	rgbactrl.SubCtrl(&list);
+	rgbactrl <<= THISBACK(ColorChanged);
+
+	list.AddColumn("", 4);
+	list.AddColumn("").SetDisplay(Single<CachedIconImage>());
+	list.NoHeader().NoVertGrid();
+	list.WhenBar = THISBACK(ListMenu);
+	list.WhenCursor = THISBACK(ListCursor);
+	list.WhenLeftDouble = THISBACK(EditImage);
+	list.NoWantFocus();
+
+	bottompane.Bottom(iconshow, 64);
+
+	SetBar();
+	ColorChanged();
+	BackPaint();
+
+	magnify = 13;
+	pen = 1;
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/IconDes/EditPos.cpp b/uppsrc/IconDes/EditPos.cpp
new file mode 100644
index 000000000..36ced5f15
--- /dev/null
+++ b/uppsrc/IconDes/EditPos.cpp
@@ -0,0 +1,63 @@
+#include "IconDes.h"
+
+NAMESPACE_UPP
+
+bool IsSelection(const Image& m) {
+	const RGBA *s = m;
+	const RGBA *e = s + m.GetLength();
+	while(s < e) {
+		if(s->r != 255)
+			return true;
+		s++;
+	}
+	return false;
+}
+
+IconDes::EditPos IconDes::GetEditPos()
+{
+	EditPos e;
+	e.cursor = list.GetCursor();
+	e.sc = list.GetCursorSc();
+	e.slot.Clear();
+	e.slot.SetCount(slot.GetCount());
+	for(int i = 0; i < slot.GetCount(); i++) {
+		EditPosSlot& es = e.slot[i];
+		Slot& c = slot[i];
+		if(IsSelection(c.selection))
+			es.selection = StoreImageAsString(c.selection);
+		es.undo = c.undo;
+		es.redo = c.redo;
+		es.supersampling = c.supersampling;
+		if(c.supersampling)
+			es.supersample = StoreImageAsString(c.image);
+	}
+	return e;
+}
+
+void IconDes::SetEditPos(const EditPos& e)
+{
+	if(e.slot.GetCount() == slot.GetCount()) {
+		for(int i = 0; i < slot.GetCount(); i++) {
+			const EditPosSlot& es = e.slot[i];
+			Slot& c = slot[i];
+			c.supersampling = es.supersampling;
+			if(c.supersampling)
+				c.image = LoadImageFromString(es.supersample);
+			Image sel = LoadImageFromString(es.selection);
+			if(sel.GetSize() == c.image.GetSize())
+				c.selection = sel;
+			else
+				c.selection.Clear();
+			c.undo = es.undo;
+			c.redo = es.redo;
+		}
+		if(e.cursor >= 0 && e.cursor < list.GetCount()) {
+			list.SetCursor(e.cursor);
+			list.ScCursor(e.sc);
+		}
+	}
+	list.ScrollIntoCursor();
+	SyncImage();
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/IconDes/Event.cpp b/uppsrc/IconDes/Event.cpp
new file mode 100644
index 000000000..7d73e8cd2
--- /dev/null
+++ b/uppsrc/IconDes/Event.cpp
@@ -0,0 +1,111 @@
+#include "IconDes.h"
+
+NAMESPACE_UPP
+
+void IconDes::LeftDown(Point p, dword flags)
+{
+	if(!IsCurrent())
+		return;
+	SaveUndo();
+	startpoint = GetPos(p);
+	if(IsPasting()) {
+		if(Rect(Current().pastepos, Current().paste_image.GetSize()).Contains(startpoint)) {
+			startpoint -= Current().pastepos;
+			SetCapture();
+		}
+		else
+			FinishPaste();
+		return;
+	}
+	SetCapture();
+	Current().base_image = CurrentImage();
+	if(flags & K_SHIFT) {
+		ImageBuffer ib(CurrentImage());
+		if(!doselection) {
+			RGBA c = CurrentColor();
+			c.r += 127;
+			MaskFill(ib, c, 0);
+		}
+		FloodFill(ib, CurrentColor(), startpoint, ib.GetSize());
+		SetCurrentImage(ib);
+		if(!doselection)
+			MaskSelection();
+		return;
+	}
+	if(selectrect)
+		EmptyRectTool(startpoint, flags);
+	else
+	if(tool)
+		(this->*tool)(startpoint, flags);
+}
+
+void IconDes::MouseMove(Point p, dword keyflags)
+{
+	if(!HasCapture() || !IsCurrent())
+		return;
+	p = GetPos(p);
+	if(IsPasting()) {
+		Current().pastepos = p - startpoint;
+		MakePaste();
+		return;
+	}
+	if(selectrect)
+		EmptyRectTool(p, keyflags);
+	else
+	if(tool)
+		(this->*tool)(p, keyflags);
+}
+
+void IconDes::LeftUp(Point p, dword keyflags)
+{
+	if(!IsCurrent())
+		return;
+	if(IsPasting() && HasCapture())
+		Refresh();
+	else
+	if(HasCapture() && selectrect)
+		Move();
+	else
+		Current().base_image.Clear();
+	SetBar();
+	SyncShow();
+}
+
+void IconDes::RightDown(Point p, dword flags)
+{
+	p = GetPos(p);
+	if(!InImage(p))
+		return;
+	if(tool == &IconDes::HotSpotTool) {
+		if(p != Current().image.Get2ndSpot()) {
+			ImageBuffer ib(Current().image);
+			ib.Set2ndSpot(p);
+			Current().image = ib;
+			Refresh();
+		}
+		return;
+	}
+	RGBA ic = CurrentImage()[p.y][p.x];
+	RGBA c = CurrentColor();
+	if(flags & K_ALT) {
+		c.a = ic.a;
+		ic = c;
+	}
+	if(flags & K_CTRL)
+		ic.a = c.a;
+	rgbactrl.Set(ic);
+	ColorChanged();
+}
+
+Image IconDes::CursorImage(Point p, dword flags)
+{
+	if(IsHotSpot())
+		return Image::Arrow();
+	if(IsPasting())
+		return HasCapture() ? IconDesImg::MoveMove()
+		       : Rect(Current().pastepos, Current().paste_image.GetSize()).Contains(GetPos(p)) ? IconDesImg::MoveCursor()
+		       : IconDesImg::MoveOk();
+	return flags & K_SHIFT ? fill_cursor : cursor_image;
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/IconDes/Fast.cpp b/uppsrc/IconDes/Fast.cpp
new file mode 100644
index 000000000..6561b8dd9
--- /dev/null
+++ b/uppsrc/IconDes/Fast.cpp
@@ -0,0 +1,90 @@
+#include "IconDes.h"
+
+NAMESPACE_UPP
+
+void IconDes::MaskSelection()
+{
+	ImageBuffer ib(Current().image);
+	RGBA *t = ~ib;
+	const RGBA *e = t + ib.GetLength();
+	const RGBA *s = Current().base_image;
+	const RGBA *k = ~Current().selection;
+	while(t < e) {
+		if(!k->r)
+			*t = *s;
+		t++;
+		s++;
+		k++;
+	}
+	Current().image = ib;
+	Refresh();
+	SyncShow();
+}
+
+void IconDes::ApplyDraw(const ImageDraw& iw, dword flags)
+{
+	if(!IsCurrent())
+		return;
+	Slot& c = Current();
+	Image m = iw;
+	Size isz = GetImageSize();
+	RGBA cc = CurrentColor();
+	int empty = doselection ? cc.r : 0;
+	ImageBuffer ib(CurrentImage());
+	for(int y = 0; y < isz.cy; y++) {
+		const RGBA *s = c.base_image[y];
+		RGBA *t = ib[y];
+		const RGBA *d = m[y];
+		const RGBA *k = doselection ? d : c.selection[y];
+		for(int x = 0; x < isz.cx; x++) {
+			RGBA c = *s;
+			if(d->r == 255)
+				if(flags & K_ALT)
+					c.a = cc.a;
+				else
+				if(flags & K_CTRL) {
+					RGBA h = cc;
+					h.a = c.a;
+					c = h;
+				}
+				else
+					c = cc;
+			if(d->r == 128)
+				c.a = c.r = c.g = c.b = empty;
+			if(c != *t && (doselection || k->r)) {
+				*t = c;
+				RefreshPixel(x, y);
+			}
+			t++;
+			s++;
+			d++;
+			k++;
+		}
+	}
+	CurrentImage() = ib;
+}
+
+void IconDes::Set(Point p, RGBA rgba, dword flags)
+{
+	if(!IsCurrent())
+		return;
+	if(InImage(p)) {
+		ImageBuffer ib(CurrentImage());
+		RGBA& t = ib[p.y][p.x];
+		if(t != rgba && (doselection || Current().selection[p.y][p.x].r)) {
+			if(flags & K_ALT)
+				t.a = rgba.a;
+			else
+			if(flags & K_CTRL) {
+				rgba.a = t.a;
+				t = rgba;
+			}
+			else
+				t = rgba;
+			RefreshPixel(p);
+		}
+		CurrentImage() = ib;
+	}
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/IconDes/IconDes.cpp b/uppsrc/IconDes/IconDes.cpp
new file mode 100644
index 000000000..4cf82b1ec
--- /dev/null
+++ b/uppsrc/IconDes/IconDes.cpp
@@ -0,0 +1,579 @@
+#include "IconDes.h"
+
+NAMESPACE_UPP
+
+IconDes::Slot::Slot()
+{
+	pastepos = Null;
+	supersampling = false;
+	exp = false;
+}
+
+IconDes::Slot& IconDes::Current()
+{
+	if(list.IsCursor())
+		return slot[list.GetCursor()];
+	NEVER();
+	return dummy;
+}
+
+Image& IconDes::CurrentImage()
+{
+	return doselection ? Current().selection : Current().image;
+}
+
+Size IconDes::GetImageSize()
+{
+	return IsCurrent() ? Current().image.GetSize() : Size(0, 0);
+}
+
+bool IconDes::InImage(int x, int y)
+{
+	if(!IsCurrent())
+		return false;
+	Size sz = GetImageSize();
+	return x >= 0 && x < sz.cx && y >= 0 && y < sz.cy;
+}
+
+void IconDes::SyncShow()
+{
+	iconshow.image.Clear();
+	if(IsCurrent()) {
+		Slot& c = Current();
+		Image image = c.image;
+		if(c.supersampling) {
+			int l = c.image.GetLength();
+			if(l > 0 && l <= 256 * 256)
+				image = DownSample3x(image);
+			else
+				image = IconDesImg::LargeImage();
+		}
+		iconshow.image = image;
+		list.Set(1, image);
+	}
+	iconshow.Refresh();
+}
+
+void IconDes::SetSb()
+{
+	if(IsCurrent()) {
+		sb.SetTotal(GetImageSize());
+		sb.SetPage(GetSize() / max(magnify, 1));
+	}
+}
+
+void IconDes::Scroll()
+{
+	scroller.Scroll(*this, GetSize(), sb, Size(magnify, magnify));
+}
+
+void IconDes::Layout()
+{
+	SetSb();
+}
+
+void IconDes::RefreshPixel(int x, int y, int cx, int cy)
+{
+	Point p = sb;
+	x -= p.x;
+	y -= p.y;
+	if(magnify == 1) {
+		if(IsNull(m1refresh))
+			m1refresh = RectC(x, y, cx, cx);
+		else {
+			if(m1refresh.Contains(x, y))
+				return;
+			m1refresh = m1refresh | RectC(x, y, 1, 1);
+		}
+		Refresh(m1refresh);
+	}
+	else
+		Refresh(x * magnify - 4, y * magnify - 4, cx * magnify + 10, cy * magnify + 10);
+}
+
+void IconDes::RefreshPixel(Point p, int cx, int cy)
+{
+	RefreshPixel(p.x, p.y, cx, cy);
+}
+
+void IconDes::SetCurrentImage(ImageBuffer& ib)
+{
+	CurrentImage() = ib;
+	Refresh();
+	SyncShow();
+}
+
+Point IconDes::GetPos(Point p)
+{
+	return p / magnify + sb;
+}
+
+void IconDes::FinishPaste()
+{
+	if(IsCurrent()) {
+		Current().pastepos = Null;
+		Current().base_image.Clear();
+	}
+	Refresh();
+	rgbactrl.Show();
+}
+
+void IconDes::MakePaste()
+{
+	if(!IsCurrent() || !IsPasting())
+		return;
+	Slot& c = Current();
+	c.image = c.base_image;
+	if(paste_opaque)
+		UPP::Copy(c.image, c.pastepos, c.paste_image, c.paste_image.GetSize());
+	else
+		UPP::Over(c.image, c.pastepos, Premultiply(c.paste_image), c.paste_image.GetSize());
+	MaskSelection();
+}
+
+void IconDes::PenSet(Point p, dword flags)
+{
+	return;
+	p -= (pen - 1) / 2;
+	Over(CurrentImage(), p, IconDesImg::Get(IconDesImg::I_pen1 + minmax(pen - 1, 0, 5)),
+	     Size(pen, pen));
+	RefreshPixel(p, pen, pen);
+}
+
+void IconDes::LineTool(Point p, dword flags)
+{
+	Size isz = GetImageSize();
+	ImageDraw iw(isz);
+	iw.DrawRect(isz, GrayColor(0));
+	iw.DrawLine(startpoint, p, pen, GrayColor(255));
+	ApplyDraw(iw, flags);
+	Set(p, CurrentColor(), flags);
+	RefreshPixel(p);
+}
+
+void IconDes::EllipseTool0(Point p, dword flags, Color inner)
+{
+	Size isz = GetImageSize();
+	ImageDraw iw(isz);
+	iw.DrawRect(isz, GrayColor(0));
+	iw.DrawEllipse(Rect(startpoint, p).Normalized(), inner, pen, GrayColor(255));
+	ApplyDraw(iw, flags);
+}
+
+void IconDes::EllipseTool(Point p, dword flags)
+{
+	EllipseTool0(p, flags, Null);
+}
+
+void IconDes::EmptyEllipseTool(Point p, dword flags)
+{
+	EllipseTool0(p, flags, GrayColor(128));
+}
+
+void IconDes::RectTool0(Point p, dword flags, bool empty)
+{
+	Size isz = GetImageSize();
+	ImageDraw iw(isz);
+	iw.DrawRect(isz, GrayColor(0));
+	Rect r = Rect(startpoint, p + 1).Normalized();
+	if(empty)
+		iw.DrawRect(r.Deflated(pen, pen), GrayColor(128));
+	DrawFatFrame(iw, r, GrayColor(255), pen);
+	ApplyDraw(iw, flags);
+}
+
+void IconDes::RectTool(Point p, dword flags)
+{
+	RectTool0(p, flags, false);
+}
+
+void IconDes::EmptyRectTool(Point p, dword flags)
+{
+	RectTool0(p, flags, true);
+}
+
+void IconDes::FreehandTool(Point p, dword flags)
+{
+	LineTool(p, flags);
+	Current().base_image = CurrentImage();
+	startpoint = p;
+}
+
+void IconDes::HotSpotTool(Point p, dword f)
+{
+	if(p != Current().image.GetHotSpot()) {
+		ImageBuffer ib(Current().image);
+		ib.SetHotSpot(p);
+		Current().image = ib;
+		Refresh();
+	}
+}
+
+Image IconDes::MakeIconDesCursor(const Image& arrow, const Image& cmask)
+{
+	RGBA c = CurrentColor();
+	c.a = 255;
+	ImageBuffer ib(arrow.GetSize());
+	const RGBA *a = ~arrow;
+	const RGBA *m = ~cmask;
+	RGBA *t = ~ib;
+	RGBA *e = ~ib + ib.GetLength();
+	while(t < e) {
+		*t++ = m->a ? c : *a;
+		m++;
+		a++;
+	}
+	return ib;
+}
+
+void IconDes::ColorChanged()
+{
+	cursor_image = MakeIconDesCursor(IconDesImg::Arrow(), IconDesImg::ArrowColor());
+	fill_cursor = MakeIconDesCursor(IconDesImg::Fill(), IconDesImg::FillColor());
+}
+
+void IconDes::SetTool(void (IconDes::*_tool)(Point p, dword flags))
+{
+	FinishPaste();
+	if(HasCapture())
+		ReleaseCapture();
+	tool = _tool;
+	SetBar();
+}
+
+RGBA IconDes::CurrentColor()
+{
+	return rgbactrl.Get();
+}
+
+void IconDes::Paste(const Image& img)
+{
+	FinishPaste();
+	if(!IsCurrent())
+		return;
+	Slot& c = Current();
+	c.base_image = c.image;
+	c.paste_image = img;
+	c.pastepos = Point(0, 0);
+	MakePaste();
+	SetBar();
+}
+
+Rect  IconDes::SelectionRect()
+{
+	if(!IsCurrent())
+		return Null;
+	Size isz = GetImageSize();
+	int minx = isz.cx - 1;
+	int maxx = 0;
+	int miny = isz.cy - 1;
+	int maxy = 0;
+	for(int y = 0; y < isz.cy; y++) {
+		const RGBA *k = Current().selection[y];
+		for(int x = 0; x < isz.cx; x++)
+			if((k++)->r == 255) {
+				if(x < minx) minx = x;
+				if(x > maxx) maxx = x;
+				if(y < miny) miny = y;
+				if(y > maxy) maxy = y;
+			}
+	}
+	return Rect(minx, miny, maxx + 1, maxy + 1);
+}
+
+Image IconDes::Copy(const Rect& r)
+{
+	if(!IsCurrent() || r.IsEmpty())
+		return Image();
+	ImageBuffer ib(r.GetSize());
+	Slot& c = Current();
+	for(int y = r.top; y < r.bottom; y++) {
+		const RGBA *s = c.image[y] + r.left;
+		const RGBA *e = c.image[y] + r.right;
+		const RGBA *k = c.selection[y] + r.left;
+		RGBA *t = ib[y - r.top];
+		while(s < e) {
+			*t = *s;
+			if(!k->r)
+				*t = RGBAZero();
+			t++;
+			k++;
+			s++;
+		}
+	}
+	return ib;
+}
+
+void IconDes::Delete()
+{
+	SetColor0(RGBAZero());
+}
+
+void IconDes::TogglePaste()
+{
+	paste_opaque = !paste_opaque;
+	MakePaste();
+	SetBar();
+}
+
+void IconDes::SetSelect(int a)
+{
+	if(!IsCurrent())
+		return;
+	ImageBuffer ib(GetImageSize());
+	memset(ib, a, ib.GetLength() * sizeof(RGBA));
+	Current().selection = ib;
+	Refresh();
+}
+
+void IconDes::Select()
+{
+	if(!IsCurrent())
+		return;
+	ReleaseCapture();
+	FinishPaste();
+	doselection = !doselection;
+	rgbactrl.Mask(doselection);
+	if(doselection && SelectionRect() == GetImageSize()) {
+		SetSelect(0);
+		rgbactrl.MaskSet(255);
+	}
+	Refresh();
+	SetBar();
+}
+
+void IconDes::CancelSelect()
+{
+	ReleaseCapture();
+	doselection = false;
+	rgbactrl.Mask(false);
+	FinishPaste();
+	SetSelect(255);
+	SetBar();
+}
+
+void IconDes::InvertSelect()
+{
+	if(!IsCurrent())
+		return;
+	ImageBuffer ib(Current().selection);
+	RGBA *s = ib;
+	const RGBA *e = s + ib.GetLength();
+	while(s < e) {
+		s->r = s->g = s->b = s->a = ~s->r;
+		s++;
+	}
+	Current().selection = ib;
+	Refresh();
+}
+
+void IconDes::Move()
+{
+	if(!IsCurrent())
+		return;
+	Slot& c = Current();
+	selectrect = false;
+	if(IsPasting())
+		FinishPaste();
+	else {
+		doselection = false;
+		rgbactrl.Mask(false);
+		rgbactrl.Hide();
+		Rect r = SelectionRect();
+		Image m = Copy(r);
+		Delete();
+		SetSelect(255);
+		c.base_image = c.image;
+		c.paste_image = m;
+		c.pastepos = r.TopLeft();
+		MakePaste();
+	}
+	SetBar();
+}
+
+void IconDes::SelectRect()
+{
+	doselection = false;
+	Select();
+	selectrect = true;
+	SetBar();
+}
+
+static void sSetSsFlag(Image& m, bool ss)
+{
+	if(ss) {
+		Point p = m.GetHotSpot();
+		p.x |= 0x8000;
+		ImageBuffer ib(m);
+		ib.SetHotSpot(p);
+		m = ib;
+	}
+}
+
+static bool sRemoveSsFlag(Image& m)
+{
+	Point p = m.GetHotSpot();
+	if(p.x & 0x8000) {
+		p.x &= 0x7fff;
+		ImageBuffer ib(m);
+		ib.SetHotSpot(p);
+		m = ib;
+		return true;
+	}
+	return false;
+}
+
+void IconDes::SaveUndo()
+{
+	if(!IsCurrent())
+		return;
+	Slot& c = Current();
+	Vector<Image> undo = UnpackImlData(c.undo);
+	int maxn = minmax(400000 / max(c.image.GetLength(), 1), 4, 128);
+	while(undo.GetCount() > maxn)
+		undo.Remove(0);
+	if(undo.GetCount() && undo.Top() == c.image)
+		return;
+	sSetSsFlag(c.image, c.supersampling);
+	undo.Add(c.image);
+	c.undo = PackImlData(undo);
+	c.redo.Clear();
+	SetBar();
+	undo.Clear();
+	sRemoveSsFlag(c.image);
+}
+
+void IconDes::Undo()
+{
+	if(!IsCurrent())
+		return;
+	Slot& c = Current();
+	Vector<Image> undo = UnpackImlData(c.undo);
+	if(undo.GetCount() == 0)
+		return;
+	Vector<Image> redo = UnpackImlData(c.redo);
+	redo.Add(c.image);
+	c.image = undo.Pop();
+	c.supersampling = sRemoveSsFlag(c.image);
+	c.undo = PackImlData(undo);
+	c.redo = PackImlData(redo);
+	SyncImage();
+	SetBar();
+}
+
+void IconDes::Redo()
+{
+	if(!IsCurrent())
+		return;
+	Slot& c = Current();
+	Vector<Image> redo = UnpackImlData(c.redo);
+	if(c.redo.GetCount() == 0)
+		return;
+	Vector<Image> undo = UnpackImlData(c.undo);
+	sSetSsFlag(c.image, c.supersampling);
+	undo.Add(c.image);
+	c.image = redo.Pop();
+	c.supersampling = sRemoveSsFlag(c.image);
+	c.undo = PackImlData(undo);
+	c.redo = PackImlData(redo);
+	SyncImage();
+	SetBar();
+}
+
+void IconDes::SyncImage()
+{
+	ReleaseCapture();
+	SyncShow();
+	if(IsCurrent()) {
+		Slot& c = Current();
+		SyncShow();
+		c.pastepos = Null;
+		if(c.selection.GetSize() != c.image.GetSize())
+			SetSelect(255);
+	}
+	selectrect = false;
+	SetBar();
+	Refresh();
+}
+
+void IconDes::Reset()
+{
+	SetSelect(255);
+	SyncImage();
+}
+
+void IconDes::MaskFill(ImageBuffer& ib, RGBA color, int mask)
+{
+	if(!IsCurrent())
+		return;
+	if(doselection)
+		Fill(ib, color, ib.GetLength());
+	else {
+		RGBA *t = ib;
+		RGBA *e = ib + ib.GetLength();
+		const RGBA *s = Current().selection;
+		while(t < e) {
+			if((s++)->r == mask)
+				*t = color;
+			t++;
+		}
+	}
+}
+
+void IconDes::SetColor0(RGBA color)
+{
+	FinishPaste();
+	doselection = false;
+	rgbactrl.Mask(false);
+	SaveUndo();
+	ImageBuffer ib(Current().image);
+	MaskFill(ib, color, 255);
+	Refresh();
+	SetCurrentImage(ib);
+	SyncShow();
+	SetBar();
+}
+
+void IconDes::SetColor()
+{
+	SetColor0(CurrentColor());
+}
+
+void IconDes::DoDelete()
+{
+	SetColor0(RGBAZero());
+}
+
+void IconDes::BeginResize()
+{
+	CancelSelect();
+	FinishPaste();
+	SaveUndo();
+	Refresh();
+	SyncShow();
+}
+
+void IconDes::ResizeUp()
+{
+	if(!IsCurrent())
+		return;
+	Slot& c = Current();
+	BeginResize();
+	c.image = Magnify(c.image, 3, 3);
+	c.supersampling = true;
+	Reset();
+}
+
+void IconDes::ResizeDown()
+{
+	if(!IsCurrent())
+		return;
+	Slot& c = Current();
+	BeginResize();
+	c.image = (c.image.GetSize() / 3).IsEmpty() ? CreateImage(Size(1, 1), White)
+	                                            : DownSample3x(c.image);
+	c.supersampling = false;
+	Reset();
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/IconDes/IconDes.h b/uppsrc/IconDes/IconDes.h
new file mode 100644
index 000000000..86cfcebf8
--- /dev/null
+++ b/uppsrc/IconDes/IconDes.h
@@ -0,0 +1,325 @@
+#ifndef _IconDes_IconDes_h_
+#define _IconDes_IconDes_h_
+
+#include <CtrlLib/CtrlLib.h>
+
+
+NAMESPACE_UPP
+
+#define IMAGECLASS IconDesImg
+#define IMAGEFILE <IconDes/IconDes.iml>
+#include <Draw/iml_header.h>
+
+#define LAYOUTFILE <IconDes/IconDes.lay>
+#include <CtrlCore/lay.h>
+
+class AlphaCtrl : public Ctrl {
+public:
+	virtual void Layout();
+	virtual void Paint(Draw& w);
+	virtual void LeftDown(Point p, dword keyflags);
+	virtual void MouseMove(Point p, dword keyflags);
+
+private:
+	Image img;
+	Color color;
+	int   alpha;
+	bool  mask;
+	int   maskvalue;
+
+	void MakeImage();
+	void DoPoint(Point p);
+
+public:
+	void SetColor(Color c);
+	void Set(int a);
+	int  Get() const;
+	void Mask(bool m);
+	bool IsMask() const                   { return mask; }
+
+	AlphaCtrl();
+};
+
+class RGBACtrl : public Ctrl {
+public:
+	virtual void Paint(Draw& w);
+	virtual void Layout();
+	virtual void LeftDown(Point p, dword keyflags);
+	virtual void MouseMove(Point p, dword keyflags);
+
+private:
+	Size  cbox;
+	Point cs;
+	enum { COLORCOUNT = 216 + 18 + 18 };
+
+	Color         color;
+	ColorRampCtrl ramp;
+	AlphaCtrl     alpha;
+	EditString    text;
+	Ptr<Ctrl>     subctrl;
+
+	Color GetColor(int i) const;
+	void  Ramp();
+	void  Alpha();
+	void  SyncText();
+
+public:
+	typedef RGBACtrl CLASSNAME;
+
+	void Set(RGBA c);
+	void MaskSet(int a);
+	RGBA Get() const;
+
+	void Mask(bool b);
+
+	void SubCtrl(Ctrl *c);
+
+	RGBACtrl();
+};
+
+struct IconShow : public Ctrl {
+	Image image;
+
+	void Paint(Draw& w);
+
+	IconShow() { BackPaint(); }
+};
+
+void   FloodFill(ImageBuffer& img, RGBA color, Point pt, const Rect& rc);
+void   InterpolateImage(Image& img, const Rect& _rc);
+void   MirrorHorz(Image& img, const Rect& rect);
+void   MirrorVert(Image& img, const Rect& rect);
+String PackImlData(const Vector<Image>& image);
+Image  DownSample3x(const Image& src);
+
+class IconDes : public Ctrl {
+public:
+	virtual void  Layout();
+	virtual void  Paint(Draw& w);
+	virtual void  LeftDown(Point p, dword keyflags);
+	virtual void  MouseMove(Point p, dword keyflags);
+	virtual void  LeftUp(Point p, dword keyflags);
+	virtual void  RightDown(Point p, dword keyflags);
+	virtual bool  Key(dword key, int count);
+	virtual Image CursorImage(Point p, dword keyflags);
+
+private:
+	struct Slot {
+		String          name;
+		Image           image;
+		Image           base_image;
+		Image           selection;
+		Point           pastepos;
+		Image           paste_image;
+		String          undo;
+		String          redo;
+		bool            supersampling;
+		bool            exp;
+
+		Slot();
+	};
+
+	Array<Slot>  slot;
+	Slot         dummy;
+
+	int          magnify;
+	int          pen;
+	Point        startpoint;
+	Rect         m1refresh;
+	void        (IconDes::*tool)(Point p, dword flags);
+	bool         doselection;
+	bool         selectrect;
+	bool         paste_opaque;
+
+	ScrollBars   sb;
+	Scroller     scroller;
+	ToolBar      toolbar;
+
+	SplitterFrame  leftpane;
+	SplitterFrame  bottompane;
+	ArrayCtrl      list;
+	RGBACtrl       rgbactrl;
+	IconShow       iconshow;
+	Image          cursor_image;
+	Image          fill_cursor;
+
+	Array<Slot>    removed;
+
+	void  PenSet(Point p, dword flags);
+
+	void  LineTool(Point p, dword f);
+	void  FreehandTool(Point p, dword f);
+
+	void  EllipseTool0(Point p, dword flags, Color inner);
+	void  EllipseTool(Point p, dword f);
+	void  EmptyEllipseTool(Point p, dword f);
+
+	void  RectTool0(Point p, dword f, bool empty);
+	void  RectTool(Point p, dword f);
+	void  EmptyRectTool(Point p, dword f);
+
+	void  HotSpotTool(Point p, dword f);
+
+	bool         IsCurrent()            { return list.IsCursor(); }
+	Slot&        Current();
+
+	Image&       CurrentImage();
+	void         SetCurrentImage(ImageBuffer& ib);
+	RGBA         CurrentColor();
+	Size         GetImageSize();
+	bool         InImage(int x, int y);
+	bool         InImage(Point p)       { return InImage(p.x, p.y); }
+
+
+	bool  IsHotSpot() const             { return tool == &IconDes::HotSpotTool; }
+
+	Image MakeIconDesCursor(const Image& arrow, const Image& cmask);
+
+	void  SyncShow();
+
+	void  RefreshPixel(Point p, int cx = 1, int cy = 1);
+	void  RefreshPixel(int x, int y, int cx = 1, int cy = 1);
+	Point GetPos(Point p);
+	void  Set(Point p, RGBA rgba, dword flags);
+	void  ApplyDraw(const ImageDraw& iw, dword flags);
+
+	void  SyncImage();
+	void  Reset();
+
+	bool  IsPasting()                   { return IsCurrent() && !IsNull(Current().pastepos); }
+	void  MakePaste();
+	void  Paste(const Image& img);
+	void  FinishPaste();
+
+	void  SetSelect(int a);
+	Rect  SelectionRect();
+	void  Select();
+	void  InvertSelect();
+	void  CancelSelect();
+	void  SelectRect();
+	Image Copy(const Rect& r);
+	void  Delete();
+	void  Move();
+	void  MaskSelection();
+
+	void  SetSb();
+	void  Scroll();
+
+	void  SetTool(void (IconDes::*tool)(Point p, dword flags));
+
+	void  SetMagnify(int mag);
+	void  ZoomIn();
+	void  ZoomOut();
+
+	void  TogglePaste();
+
+	void  SetPen(int pen);
+
+	void  MainToolBar(Bar& bar);
+	void  SetBar();
+
+	void  SaveUndo();
+	void  Undo();
+	void  Redo();
+
+	void  DoPaste();
+	void  DoCopy();
+	void  DoCut();
+
+	void  ColorChanged();
+
+	void  MaskFill(ImageBuffer& ib, RGBA color, int mask);
+	void  SetColor0(RGBA color);
+	void  SetColor();
+	void  DoDelete();
+	void  Interpolate();
+	bool  BeginTransform();
+	void  MirrorX();
+	void  MirrorY();
+	void  SymmX();
+	void  SymmY();
+	void  Rotate();
+	void  SmoothRescale();
+	void  KeyMove(int dx, int dy);
+
+	void  BeginResize();
+	void  ResizeUp();
+	void  ResizeDown();
+
+	void  PlaceDlg(TopWindow& dlg);
+	Image ImageStart();
+	void  ImageSet(const Image& m);
+	void  BlurSharpen();
+	void  Colorize();
+	void  Chroma();
+	void  Contrast();
+	void  Alpha();
+	void  Colors();
+
+	void  SyncList();
+	void  ListCursor();
+	void  PrepareImageDlg(WithImageLayout<TopWindow>& dlg);
+	void  ImageInsert(const String& name, const Image& m, bool exp = false);
+	void  InsertImage();
+	void  InsertRemoved(int ii);
+	void  EditImage();
+	void  RemoveImage();
+	void  Duplicate();
+	void  InsertPaste();
+	void  InsertFile();
+	void  MoveSlot(int d);
+
+	static FileSel& ImgFile();
+
+public:
+	virtual void ToolEx(Bar& bar);
+
+	void  ListMenu(Bar& bar);
+	void  EditBar(Bar& bar);
+	void  SettingBar(Bar& bar);
+	void  SelectBar(Bar& bar);
+	void  ImageBar(Bar& bar);
+	void  DrawBar(Bar& bar);
+
+	struct EditPosSlot : Moveable<EditPosSlot> {
+		String          undo;
+		String          redo;
+		String          selection;
+		bool            supersampling;
+		String          supersample;
+	};
+
+	struct EditPos {
+		Vector<EditPosSlot> slot;
+		int                 cursor, sc;
+	};
+
+	void   Clear();
+	void   AddImage(const String& name, const Image& image, bool exp = false);
+	int    GetCount() const;
+	Image  GetImage(int ii) const;
+	String GetName(int ii) const;
+	bool   GetExport(int ii) const;
+
+	EditPos GetEditPos();
+	void    SetEditPos(const EditPos& o);
+
+	void    SerializeSettings(Stream& s);
+
+	typedef IconDes CLASSNAME;
+
+	IconDes();
+};
+
+struct ImlImage {
+	String name;
+	Image  image;
+	bool   exp;
+};
+
+bool   LoadIml(const String& data, Array<ImlImage>& img, int& format);
+String SaveIml(const Array<ImlImage>& iml, int format);
+
+END_UPP_NAMESPACE
+
+#endif
diff --git a/uppsrc/IconDes/IconDes.iml b/uppsrc/IconDes/IconDes.iml
new file mode 100644
index 000000000..b4ff95b2e
--- /dev/null
+++ b/uppsrc/IconDes/IconDes.iml
@@ -0,0 +1,220 @@
+IMAGE_ID(Arrow)
+IMAGE_ID(ArrowColor)
+IMAGE_ID(ZoomMinus)
+IMAGE_ID(ZoomPlus)
+IMAGE_ID(Fill)
+IMAGE_ID(FillColor)
+IMAGE_ID(Move)
+IMAGE_ID(MoveCursor)
+IMAGE_ID(MoveMove)
+IMAGE_ID(MoveOk)
+IMAGE_ID(Lines)
+IMAGE_ID(FreeHand)
+IMAGE_ID(Circles)
+IMAGE_ID(EmptyCircles)
+IMAGE_ID(Rects)
+IMAGE_ID(EmptyRects)
+IMAGE_ID(Select)
+IMAGE_ID(SelectRect)
+IMAGE_ID(InvertSelect)
+IMAGE_ID(CancelSelect)
+IMAGE_ID(SetColor)
+IMAGE_ID(Interpolate)
+IMAGE_ID(Delete)
+IMAGE_ID(MirrorX)
+IMAGE_ID(SymmX)
+IMAGE_ID(MirrorY)
+IMAGE_ID(SymmY)
+IMAGE_ID(Rotate)
+IMAGE_ID(PasteTransparent)
+IMAGE_ID(PasteOpaque)
+IMAGE_ID(Masked)
+IMAGE_ID(Alpha)
+IMAGE_ID(HotSpotA)
+IMAGE_ID(HotSpotB)
+IMAGE_ID(HotSpot)
+IMAGE_ID(ResizeUp)
+IMAGE_ID(ResizeDown)
+IMAGE_ID(Rescale)
+IMAGE_ID(LargeImage)
+IMAGE_ID(FileIcon)
+IMAGE_ID(FileProperties)
+IMAGE_ID(Colors)
+IMAGE_ID(BlurSharpen)
+IMAGE_ID(Colorize)
+IMAGE_ID(Chroma)
+IMAGE_ID(Contrast)
+IMAGE_ID(AlphaI)
+IMAGE_ID(Duplicate)
+IMAGE_ID(MoveUp)
+IMAGE_ID(MoveDown)
+IMAGE_ID(Insert)
+IMAGE_ID(Edit)
+IMAGE_ID(Remove)
+IMAGE_ID(InsertFile)
+IMAGE_ID(InsertPaste)
+IMAGE_ID(Pen1)
+IMAGE_ID(Pen2)
+IMAGE_ID(Pen3)
+IMAGE_ID(Pen4)
+IMAGE_ID(Pen5)
+IMAGE_ID(Pen6)
+IMAGE_ID(pen1)
+IMAGE_ID(pen2)
+IMAGE_ID(pen3)
+IMAGE_ID(pen4)
+IMAGE_ID(pen5)
+IMAGE_ID(pen6)
+
+IMAGE_BEGIN_DATA
+IMAGE_DATA(120,156,237,154,77,110,131,48,16,133,173,182,155,170,82,21,117,211,77,22,201,17,184,75,114,140,46,186,233,174,18,221)
+IMAGE_DATA(86,170,122,143,220,35,28,132,139,184,24,194,159,153,177,199,54,216,52,153,23,141,200,15,239,155,7,1,27,133,136,157)
+IMAGE_DATA(216,137,129,228,165,82,73,42,37,204,32,91,37,202,32,135,74,144,65,234,138,156,97,210,63,114,6,176,127,196,12,104)
+IMAGE_DATA(255,72,25,140,253,35,100,176,246,95,56,131,173,231,176,22,239,47,226,143,71,147,237,77,209,95,235,21,51,3,212,35)
+IMAGE_DATA(118,127,240,253,200,223,195,218,250,175,33,67,234,254,66,164,191,62,99,177,88,44,214,53,74,251,49,128,181,2,229,213)
+IMAGE_DATA(132,159,39,154,244,219,222,169,50,164,234,203,253,251,254,169,122,175,161,63,139,197,98,177,88,44,22,139,117,51,218,84)
+IMAGE_DATA(15,64,219,170,10,49,190,19,86,92,222,183,233,168,214,127,43,10,249,35,101,87,234,245,133,115,48,120,21,95,126,150)
+IMAGE_DATA(165,84,191,195,79,74,189,223,48,176,28,69,221,7,242,182,213,228,40,16,127,157,85,28,78,120,153,239,12,52,126,145)
+IMAGE_DATA(227,69,241,31,79,120,153,253,246,237,63,159,149,247,140,248,235,253,47,252,247,191,210,161,94,71,207,209,244,149,223,251)
+IMAGE_DATA(189,252,205,50,249,108,102,64,199,159,202,188,205,171,231,202,79,96,128,122,190,82,198,87,150,149,174,254,150,241,46,68)
+IMAGE_DATA(249,177,217,148,235,30,12,212,201,167,78,160,246,36,112,29,12,116,191,207,96,160,252,169,6,131,97,127,159,193,0,218)
+IMAGE_DATA(126,151,193,192,125,255,43,241,96,144,128,49,219,96,112,87,61,52,133,252,55,70,14,229,200,144,186,66,252,237,107,7)
+IMAGE_DATA(198,196,11,228,176,253,119,104,226,197,152,150,108,32,163,241,52,21,194,104,57,115,49,176,125,97,83,106,127,207,241,247)
+IMAGE_DATA(27,246,29,113,27,172,199,167,201,71,62,182,129,26,11,185,50,96,93,161,242,128,251,129,186,215,133,129,121,111,197,143)
+IMAGE_DATA(49,168,222,104,82,131,193,189,120,0,62,145,1,97,251,217,43,140,17,226,211,151,84,47,86,205,10,218,210,165,127,55)
+IMAGE_DATA(154,211,102,131,81,238,145,207,238,31,229,158,248,28,251,155,252,228,89,13,91,82,103,214,80,127,192,204,188,168,223,226)
+IMAGE_DATA(181,50,102,245,191,136,87,241,40,158,8,188,30,76,12,96,242,234,97,130,47,229,1,230,181,114,200,7,95,96,54,31)
+IMAGE_DATA(14,148,207,139,3,228,11,226,96,108,34,103,210,127,14,142,190,14,38,195,247,101,245,154,152,11,112,188,89,11,114,156)
+IMAGE_DATA(89,8,99,78,142,19,107,14,142,133,65,98,17,25,29,203,80,99,121,76,66,172,255,35,215,9,30,245,107,7,34,122)
+IMAGE_DATA(178,3,159,141,188,216,115,205,7,29,248,36,142,206,4,78,34,31,14,148,41,152,163,175,131,9,225,76,88,46,90,136)
+IMAGE_DATA(227,205,90,144,227,204,66,24,115,114,156,88,115,112,44,12,18,139,200,232,88,134,26,233,15,147,184,148,119,0,0,0)
+IMAGE_END_DATA(672, 9)
+
+IMAGE_BEGIN_DATA
+IMAGE_DATA(120,156,237,91,93,75,84,65,24,62,209,85,116,211,109,116,19,65,221,121,215,69,80,100,88,146,96,34,20,37,137,149)
+IMAGE_DATA(174,149,26,65,234,178,106,88,54,165,161,101,74,126,212,69,69,70,31,16,97,10,65,23,94,68,23,221,245,3,250,59)
+IMAGE_DATA(79,219,182,199,102,103,103,222,121,231,99,221,173,246,93,14,231,236,217,121,222,231,121,231,204,60,51,187,104,178,39,217)
+IMAGE_DATA(157,236,72,118,38,14,129,226,81,169,72,243,35,13,249,94,76,30,57,191,233,186,206,21,133,43,6,39,139,43,82,141)
+IMAGE_DATA(149,226,210,245,69,197,184,52,152,216,92,101,115,85,194,197,228,66,225,101,168,35,34,151,202,83,194,165,230,49,5,131)
+IMAGE_DATA(11,155,175,242,207,173,249,41,94,7,158,152,92,54,30,22,95,66,143,167,248,92,82,30,13,23,151,199,139,79,203,19)
+IMAGE_DATA(137,171,132,79,246,28,119,30,255,218,252,120,220,106,243,175,199,173,182,176,190,43,227,35,142,36,9,235,59,119,45,91)
+IMAGE_DATA(195,243,135,143,27,187,242,175,26,136,24,15,58,132,215,7,15,195,181,43,214,21,175,95,232,252,177,84,78,110,141,54)
+IMAGE_DATA(60,103,131,99,227,231,224,169,73,207,209,31,138,87,239,133,60,151,173,196,255,14,141,25,184,118,4,71,132,75,46,121)
+IMAGE_DATA(117,224,230,47,195,51,115,104,181,106,86,41,91,148,76,26,195,74,231,141,103,228,224,240,155,114,148,77,250,20,227,193)
+IMAGE_DATA(173,230,163,240,212,253,146,247,134,28,236,137,18,136,55,229,240,153,23,186,123,49,118,9,113,118,25,14,59,131,152,230)
+IMAGE_DATA(64,221,87,219,112,242,251,98,169,182,33,248,173,222,105,248,98,40,124,232,96,175,198,202,232,179,178,235,38,56,7,207)
+IMAGE_DATA(49,201,144,186,66,77,34,202,206,192,150,60,212,12,212,7,231,131,85,243,248,98,41,29,92,172,78,131,11,150,210,26)
+IMAGE_DATA(162,33,68,143,78,19,167,61,133,247,233,127,238,115,241,49,3,83,31,215,205,192,144,200,245,144,241,174,81,199,199,195)
+IMAGE_DATA(251,132,235,96,175,69,188,203,100,174,4,94,151,207,133,135,131,231,70,77,154,129,207,234,96,114,109,234,154,147,175,146)
+IMAGE_DATA(215,181,164,223,20,92,253,62,26,40,188,143,126,219,96,214,233,15,25,159,92,124,168,254,90,55,131,109,1,156,149,143)
+IMAGE_DATA(124,69,16,249,67,62,115,177,162,216,86,8,81,122,102,228,128,9,155,63,219,52,24,121,153,252,133,90,77,216,226,153)
+IMAGE_DATA(210,96,229,183,232,224,240,83,253,80,109,254,52,55,133,53,113,115,116,184,142,65,117,12,115,177,91,26,26,51,8,21)
+IMAGE_DATA(90,112,36,221,4,166,206,50,222,225,87,252,148,176,12,239,146,67,199,239,146,195,196,207,205,65,241,115,114,48,249,141)
+IMAGE_DATA(57,116,252,137,67,63,170,252,82,123,175,250,213,244,46,245,107,38,169,21,47,243,11,125,59,50,135,133,95,250,136,199)
+IMAGE_DATA(239,58,119,92,140,137,140,26,249,59,3,50,66,138,23,245,157,129,131,142,66,89,222,135,235,170,155,242,167,56,110,109)
+IMAGE_DATA(114,200,207,200,181,143,133,210,71,37,88,139,14,221,216,160,250,88,29,195,186,118,90,172,195,57,4,91,32,175,97,51)
+IMAGE_DATA(40,113,91,225,103,6,198,142,23,140,28,69,30,219,54,81,187,98,40,188,101,57,76,56,153,91,193,164,239,55,113,46)
+IMAGE_DATA(102,144,152,106,33,6,187,202,167,171,133,208,96,236,187,146,251,154,149,60,73,159,53,61,120,97,51,101,193,200,97,194)
+IMAGE_DATA(106,250,129,122,254,100,8,131,25,212,92,252,50,3,96,123,181,101,144,17,96,6,191,7,155,40,63,4,215,12,52,216)
+IMAGE_DATA(95,135,77,131,137,151,203,79,113,115,52,216,248,109,58,56,252,148,134,106,243,115,52,152,184,57,58,92,199,96,221,12)
+IMAGE_DATA(34,69,168,25,60,56,55,134,238,134,12,198,186,22,112,231,68,15,222,15,221,102,15,132,217,75,2,205,13,19,249,75)
+IMAGE_DATA(81,56,46,28,31,197,43,177,196,50,131,119,163,51,24,104,155,220,196,238,63,144,195,217,230,1,140,183,119,176,204,96)
+IMAGE_DATA(117,238,5,114,153,41,52,53,222,196,193,163,89,52,182,93,67,199,229,12,70,6,187,241,234,222,176,117,34,60,205,244)
+IMAGE_DATA(99,226,106,22,221,189,131,104,239,237,67,107,238,34,206,76,158,69,223,226,57,60,92,238,195,199,133,113,114,50,174,207)
+IMAGE_DATA(207,225,209,173,17,12,141,14,160,107,234,34,78,45,182,163,105,245,24,90,54,142,32,183,118,30,31,214,166,73,51,120)
+IMAGE_DATA(222,211,137,199,163,253,184,53,115,5,151,159,116,224,228,167,99,216,247,99,111,225,111,243,59,54,14,97,122,162,133,228)
+IMAGE_DATA(95,27,27,198,203,201,27,152,157,239,199,240,219,78,180,126,61,188,249,63,4,61,27,141,120,54,151,177,246,193,250,212)
+IMAGE_DATA(24,86,150,179,152,127,115,29,217,245,211,184,244,189,5,87,190,157,196,194,74,15,123,12,124,126,124,23,159,215,23,177)
+IMAGE_DATA(116,191,19,239,190,220,199,235,149,108,221,12,170,21,161,102,80,216,214,21,35,253,110,37,152,3,33,109,175,226,57,102)
+IMAGE_DATA(160,197,165,239,25,102,64,226,25,91,100,19,142,163,3,76,60,101,6,54,253,212,115,224,212,207,253,154,96,202,99,226)
+IMAGE_DATA(102,233,248,207,205,128,245,29,235,223,193,67,251,93,214,210,70,186,207,197,171,237,228,31,229,184,248,180,109,216,15,128)
+IMAGE_DATA(225,252,49,234,151,63,227,224,217,241,151,141,191,232,120,107,252,4,19,243,133,0,0,0,0,0,0,0,0,0,0,0)
+IMAGE_END_DATA(1216, 15)
+
+IMAGE_BEGIN_DATA
+IMAGE_DATA(120,156,237,155,107,110,219,48,12,199,181,118,192,176,13,24,250,97,103,204,57,116,180,92,38,231,208,226,248,37,81,164)
+IMAGE_DATA(248,146,157,56,51,13,194,77,204,223,159,122,210,78,218,134,175,240,21,82,250,12,2,75,147,91,237,13,249,164,209,35)
+IMAGE_DATA(120,177,70,131,159,53,210,195,176,179,204,189,249,173,188,200,54,24,127,149,29,157,231,77,94,12,84,3,143,176,170,137)
+IMAGE_DATA(39,88,173,134,121,225,19,90,30,219,133,79,180,167,198,181,101,145,121,121,111,251,95,140,239,177,126,122,173,61,43,155)
+IMAGE_DATA(107,48,182,79,49,24,239,81,30,254,204,127,22,131,253,249,179,24,100,147,107,234,68,99,113,120,59,148,235,44,185,20)
+IMAGE_DATA(249,43,13,44,86,200,23,237,208,24,96,42,13,46,63,114,189,208,160,248,134,166,248,35,2,177,46,138,121,21,230,23)
+IMAGE_DATA(241,194,121,36,215,213,214,115,137,10,25,189,23,111,55,225,147,129,39,113,53,235,10,13,178,52,11,52,216,15,201,136)
+IMAGE_DATA(70,209,79,33,95,46,222,56,185,148,143,27,241,140,6,204,133,242,132,6,150,135,228,215,235,171,227,215,105,158,243,119)
+IMAGE_DATA(226,237,238,55,180,24,196,56,126,241,52,159,171,201,172,174,23,6,89,124,49,173,26,85,163,26,44,170,129,229,111,176)
+IMAGE_DATA(80,35,71,179,247,68,124,54,62,35,31,3,219,118,36,63,88,76,29,242,51,26,11,75,228,111,105,228,108,43,63,208)
+IMAGE_DATA(95,156,184,142,230,23,157,153,252,220,185,206,255,159,22,131,191,247,35,132,111,22,84,211,0,111,99,225,134,237,165,213)
+IMAGE_DATA(51,118,79,173,61,115,29,117,188,142,208,238,61,251,216,83,235,149,230,249,89,185,206,250,7,237,103,248,17,190,7,244)
+IMAGE_DATA(59,39,234,238,149,134,123,55,233,92,92,221,64,238,122,25,199,119,208,54,216,191,239,71,253,144,106,18,94,31,27,5)
+IMAGE_DATA(113,137,143,95,227,82,51,190,140,75,100,60,30,167,141,151,182,67,211,63,197,184,9,226,150,120,244,221,97,194,77,32)
+IMAGE_DATA(26,39,93,153,121,95,27,43,125,30,191,20,90,241,69,220,104,104,60,18,151,148,241,242,118,104,250,167,27,55,231,132)
+IMAGE_DATA(15,31,162,15,98,158,251,133,118,119,84,172,98,39,226,172,108,215,211,44,95,97,120,182,135,134,167,15,222,49,116,206)
+IMAGE_DATA(161,145,93,52,28,236,49,236,21,139,65,68,43,171,108,50,6,118,118,228,114,83,99,102,224,25,225,169,247,11,29,38)
+IMAGE_DATA(55,165,69,241,108,94,37,175,201,15,199,223,210,127,177,113,188,247,58,23,19,179,53,196,57,151,199,211,198,45,216,166)
+IMAGE_DATA(109,95,12,152,79,22,155,178,82,247,228,231,98,212,215,149,119,48,82,95,168,193,242,76,1,66,121,113,225,83,180,159)
+IMAGE_DATA(136,19,241,72,254,153,131,103,77,225,147,172,33,206,60,108,103,219,174,24,244,218,200,30,214,51,81,222,73,58,121,91)
+IMAGE_DATA(92,181,57,5,124,206,120,220,155,31,190,231,185,153,60,161,72,252,9,191,194,71,214,2,179,183,190,50,189,123,132,49)
+IMAGE_DATA(144,67,116,98,254,56,134,197,61,206,211,49,189,151,51,5,203,112,195,57,198,213,3,228,22,62,227,38,31,227,227,202)
+IMAGE_DATA(229,30,67,249,151,40,217,235,42,31,17,167,248,229,173,245,151,190,54,31,238,36,159,65,244,111,95,71,49,235,96,172)
+IMAGE_DATA(188,109,35,212,188,110,67,148,188,126,99,176,124,104,111,144,122,252,116,27,101,229,109,27,6,231,229,27,160,230,117,27)
+IMAGE_DATA(168,238,191,109,253,28,215,134,98,240,193,135,229,38,29,16,116,161,96,70,241,215,235,245,225,57,11,207,66,30,101,185)
+IMAGE_DATA(246,67,22,190,230,198,41,207,63,255,12,95,55,116,198,235,141,34,164,225,35,44,32,98,126,60,138,77,60,29,123,242)
+IMAGE_DATA(216,33,225,91,222,96,89,158,97,155,188,128,13,225,25,133,231,213,190,125,78,97,125,64,47,142,236,185,253,118,187,61)
+IMAGE_DATA(252,114,185,60,124,111,126,230,102,157,189,249,179,255,239,219,255,103,218,63,91,247,95,126,0,0,0,0,0,0,0,0)
+IMAGE_END_DATA(896, 18)
+
+IMAGE_BEGIN_DATA
+IMAGE_DATA(120,156,237,153,207,139,20,71,20,199,31,57,108,8,203,50,203,34,193,69,188,137,36,136,4,117,144,176,65,150,96,8)
+IMAGE_DATA(226,28,188,137,12,145,108,8,145,221,191,34,101,140,196,227,122,217,83,64,50,97,241,16,200,97,9,24,136,39,73,200)
+IMAGE_DATA(33,144,67,46,57,230,232,193,91,34,30,22,236,202,171,234,170,174,87,213,245,171,187,103,182,71,153,39,95,170,171,187)
+IMAGE_DATA(62,239,85,85,87,189,173,105,97,21,86,193,99,188,165,12,207,121,84,204,109,19,226,181,111,135,213,138,242,178,84,255)
+IMAGE_DATA(212,61,202,90,62,50,121,81,50,102,4,33,190,234,55,225,149,74,142,25,222,232,49,234,79,88,89,126,10,199,7,135)
+IMAGE_DATA(112,113,80,192,205,1,135,79,215,56,12,87,76,187,55,81,167,143,113,88,81,117,227,231,57,220,189,243,2,126,124,120)
+IMAGE_DATA(8,223,238,190,132,201,110,1,191,30,112,248,251,15,14,7,63,112,216,254,130,15,68,187,237,91,28,246,191,47,96,247)
+IMAGE_DATA(110,1,39,160,168,248,245,245,2,217,2,254,121,84,192,55,27,5,220,67,61,123,194,225,249,51,14,79,30,243,115,39)
+IMAGE_DATA(223,230,87,176,157,40,225,209,1,182,221,127,9,239,46,29,86,252,49,236,231,253,59,28,110,159,229,240,27,214,127,71)
+IMAGE_DATA(221,27,98,219,125,62,248,248,60,191,138,109,110,161,68,57,216,60,131,254,111,31,194,218,27,79,173,57,184,190,201,97)
+IMAGE_DATA(140,229,95,74,159,160,62,251,8,125,3,191,180,14,252,198,169,178,196,101,91,192,213,205,23,114,190,220,121,191,136,154)
+IMAGE_DATA(40,109,160,150,80,111,1,63,125,14,245,78,89,226,189,2,219,254,135,250,197,226,79,160,54,81,103,81,162,221,53,212)
+IMAGE_DATA(251,98,110,128,47,93,1,126,114,92,150,176,134,252,50,252,139,204,207,22,47,184,203,168,227,168,15,81,55,160,28,207)
+IMAGE_DATA(117,212,77,49,247,170,188,134,252,41,15,191,42,222,173,210,25,21,123,67,233,3,212,37,85,158,71,126,213,195,231,75)
+IMAGE_DATA(140,223,230,23,201,96,174,146,65,59,17,63,60,161,137,83,15,241,62,127,19,162,24,47,175,63,87,242,176,212,135,59)
+IMAGE_DATA(150,16,47,202,201,178,17,216,124,125,222,9,15,132,255,14,12,239,93,183,23,148,244,51,82,119,227,147,118,126,254,66)
+IMAGE_DATA(134,66,124,174,66,227,111,166,210,102,149,12,246,246,246,162,26,14,135,86,61,196,107,223,46,171,21,227,221,254,185,44)
+IMAGE_DATA(245,145,203,139,146,178,78,219,172,249,19,220,104,52,170,248,169,170,93,18,174,243,30,127,130,213,138,242,178,132,38,73)
+IMAGE_DATA(56,201,139,114,134,73,216,240,12,172,228,70,235,181,248,44,193,179,12,133,248,92,53,88,119,17,149,182,56,25,4,22)
+IMAGE_DATA(85,15,139,114,107,107,171,149,244,162,144,245,7,15,162,98,110,155,16,175,253,59,172,86,148,151,165,146,186,71,89,203)
+IMAGE_DATA(135,224,33,205,139,146,49,163,45,155,151,102,205,11,229,149,74,142,25,94,207,31,229,153,146,126,78,234,181,248,44,193)
+IMAGE_DATA(179,12,133,248,92,133,198,223,100,253,104,91,36,131,249,73,6,168,29,37,14,35,37,253,140,212,71,35,35,249,140,17)
+IMAGE_DATA(158,243,29,216,222,230,240,147,18,189,70,13,5,67,234,210,167,143,215,241,28,86,43,202,139,235,109,37,121,141,44,150)
+IMAGE_DATA(174,100,28,119,252,37,143,165,18,185,135,243,85,201,106,107,108,167,18,229,149,74,142,25,222,200,240,76,73,63,35,245)
+IMAGE_DATA(90,124,150,224,89,134,66,124,174,66,227,111,166,210,156,100,208,118,243,27,62,55,1,52,228,89,124,243,214,121,112,120)
+IMAGE_DATA(186,129,99,60,35,18,62,212,181,197,179,200,248,89,216,71,228,120,23,155,127,144,62,252,207,27,24,111,216,190,22,207)
+IMAGE_DATA(231,35,213,151,250,187,4,207,251,105,194,107,22,120,106,45,132,227,107,62,190,22,74,222,243,238,50,215,66,144,207,92)
+IMAGE_DATA(11,0,221,246,98,115,11,156,12,50,173,213,2,35,108,91,222,126,169,221,227,27,31,140,137,191,216,113,217,62,186,240)
+IMAGE_DATA(174,159,238,124,251,185,168,46,115,18,121,35,222,147,136,33,248,254,242,54,207,204,172,221,252,207,15,223,201,186,37,131)
+IMAGE_DATA(186,245,61,25,189,78,166,176,86,155,41,206,207,126,51,77,47,153,244,157,12,187,38,243,102,99,110,203,79,251,143,89)
+IMAGE_DATA(91,115,248,68,50,104,27,76,30,93,184,253,91,57,155,213,156,91,54,141,173,69,250,144,84,248,71,142,106,147,254,230)
+IMAGE_DATA(17,142,159,247,205,35,60,254,38,223,60,220,249,39,113,102,248,205,195,240,38,241,112,183,94,139,207,18,124,94,130,243)
+IMAGE_DATA(243,185,10,141,191,153,94,109,155,246,201,96,78,172,235,203,140,126,251,72,36,3,155,119,55,227,235,253,1,212,240,139)
+IMAGE_DATA(100,240,234,25,77,6,227,241,120,106,98,56,57,61,250,224,90,202,71,82,78,44,62,222,223,175,36,159,145,186,188,167)
+IMAGE_DATA(218,48,181,33,149,159,58,175,125,59,44,115,239,251,120,89,150,210,109,41,171,175,115,120,221,143,74,108,44,53,14,241)
+IMAGE_DATA(90,62,94,114,204,240,70,134,103,74,132,179,234,52,62,11,243,21,231,168,118,223,195,135,216,20,239,188,211,212,154,177)
+IMAGE_DATA(198,223,116,205,246,188,79,44,249,78,6,93,50,93,147,227,121,146,143,30,215,143,136,79,140,193,29,79,141,253,250,171)
+IMAGE_DATA(82,162,174,175,93,249,120,202,198,120,103,44,222,184,174,2,44,232,177,248,226,72,191,177,89,37,188,79,46,207,0,124)
+IMAGE_DATA(124,216,210,39,171,124,158,158,76,114,121,114,138,168,253,111,2,203,216,43,233,147,73,255,118,4,63,19,154,30,165,188)
+IMAGE_DATA(11,41,178,49,45,150,125,249,94,37,205,82,63,160,22,59,109,227,227,19,125,205,229,107,125,208,74,241,180,143,130,167)
+IMAGE_DATA(227,114,199,24,26,127,36,17,6,147,89,40,126,34,17,88,60,101,125,60,171,39,130,90,252,218,24,51,191,183,208,248)
+IMAGE_DATA(186,180,120,127,34,72,199,143,39,130,244,79,140,120,34,72,237,139,163,249,137,210,211,55,131,46,157,79,110,212,25,199)
+IMAGE_DATA(127,29,248,89,90,147,211,212,116,23,243,194,186,89,15,201,160,107,34,72,249,200,205,180,109,249,105,244,191,11,63,239)
+IMAGE_DATA(155,167,107,50,88,36,147,190,236,136,147,193,180,94,92,215,205,158,98,187,38,132,174,207,99,220,188,47,252,190,147,193)
+IMAGE_DATA(34,153,180,180,255,1,160,236,138,193,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0)
+IMAGE_END_DATA(1440, 16)
+
+IMAGE_BEGIN_DATA
+IMAGE_DATA(120,156,229,84,91,18,128,32,8,180,231,119,247,191,172,81,126,52,49,128,104,5,89,187,211,168,228,2,153,16,150,176)
+IMAGE_DATA(4,67,68,35,125,100,246,70,52,74,90,202,7,103,215,234,113,30,57,31,210,251,183,2,127,191,246,249,138,190,93,56)
+IMAGE_DATA(52,131,43,135,87,218,12,184,98,214,106,115,77,197,90,175,61,59,207,75,234,93,140,173,235,253,96,220,12,54,148,94)
+IMAGE_DATA(104,108,43,137,81,83,76,210,207,194,227,19,122,41,127,141,22,251,176,134,119,49,253,93,95,143,14,120,74,164,7,178)
+IMAGE_DATA(153,13,64,132,72,108,60,236,35,144,16,80,34,169,126,210,124,2,50,206,180,14,181,193,210,122,6,10,1,239,8,90)
+IMAGE_DATA(147,216,110,91,1,29,2,114,39,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0)
+IMAGE_END_DATA(192, 9)
diff --git a/uppsrc/IconDes/IconDes.lay b/uppsrc/IconDes/IconDes.lay
new file mode 100644
index 000000000..11e5e38e1
--- /dev/null
+++ b/uppsrc/IconDes/IconDes.lay
@@ -0,0 +1,65 @@
+LAYOUT(ImageLayout, 168, 108)
+	ITEM(Label, dv___0, SetLabel(t_("Name")).LeftPosZ(8, 40).TopPosZ(8, 19))
+	ITEM(EditString, name, LeftPosZ(52, 108).TopPosZ(8, 19))
+	ITEM(Label, dv___2, SetLabel(t_("Size")).LeftPosZ(8, 40).TopPosZ(32, 19))
+	ITEM(EditIntSpin, cx, Min(1).Max(8192).LeftPosZ(52, 44).TopPosZ(32, 19))
+	ITEM(EditIntSpin, cy, Min(1).Max(8192).LeftPosZ(116, 44).TopPosZ(32, 19))
+	ITEM(Label, dv___5, SetLabel(t_("x")).LeftPosZ(100, 12).TopPosZ(32, 16))
+	ITEM(Option, exp, SetLabel(t_("Export as icon.ico and .png")).LeftPosZ(8, 152).TopPosZ(56, 16))
+	ITEM(Button, ok, SetLabel(t_("OK")).LeftPosZ(28, 64).TopPosZ(80, 24))
+	ITEM(Button, cancel, SetLabel(t_("Cancel")).LeftPosZ(96, 64).TopPosZ(80, 24))
+END_LAYOUT
+
+LAYOUT(FilePropertiesLayout, 176, 68)
+	ITEM(Option, format, SetLabel(t_("Legacy .iml format")).LeftPosZ(8, 160).TopPosZ(8, 15))
+	ITEM(Button, ok, SetLabel(t_("OK")).LeftPosZ(36, 64).TopPosZ(36, 24))
+	ITEM(Button, cancel, SetLabel(t_("Cancel")).LeftPosZ(104, 64).TopPosZ(36, 24))
+END_LAYOUT
+
+LAYOUT(SharpenLayout, 220, 68)
+	ITEM(Label, dv___0, SetLabel(t_("Level")).LeftPosZ(8, 32).TopPosZ(8, 19))
+	ITEM(EditDoubleSpin, level, SetInc(0.05).Min(-2).Max(2).NotNull(true).LeftPosZ(44, 64).TopPosZ(8, 19))
+	ITEM(Label, dv___2, SetLabel(t_("Passes")).LeftPosZ(128, 36).TopPosZ(8, 19))
+	ITEM(EditIntSpin, passes, Min(1).Max(10).NotNull(true).LeftPosZ(168, 44).TopPosZ(8, 19))
+	ITEM(Button, ok, SetLabel(t_("OK")).LeftPosZ(80, 64).TopPosZ(36, 24))
+	ITEM(Button, cancel, SetLabel(t_("Cancel")).LeftPosZ(148, 64).TopPosZ(36, 24))
+END_LAYOUT
+
+LAYOUT(ColorizeLayout, 148, 68)
+	ITEM(Label, dv___0, SetLabel(t_("Level")).LeftPosZ(8, 32).TopPosZ(8, 19))
+	ITEM(EditDoubleSpin, level, SetInc(0.05).Min(0).Max(1).NotNull(true).LeftPosZ(44, 64).TopPosZ(8, 19))
+	ITEM(Button, ok, SetLabel(t_("OK")).LeftPosZ(8, 64).TopPosZ(36, 24))
+	ITEM(Button, cancel, SetLabel(t_("Cancel")).LeftPosZ(76, 64).TopPosZ(36, 24))
+END_LAYOUT
+
+LAYOUT(RescaleLayout, 192, 92)
+	ITEM(Label, dv___0, SetLabel(t_("Width")).LeftPosZ(8, 32).TopPosZ(8, 19))
+	ITEM(EditInt, cx, Min(1).Max(9999).NotNull(true).LeftPosZ(44, 44).TopPosZ(8, 19))
+	ITEM(Label, dv___2, SetLabel(t_("Height")).LeftPosZ(100, 36).TopPosZ(8, 19))
+	ITEM(EditInt, cy, Min(1).Max(9999).NotNull(true).LeftPosZ(140, 44).TopPosZ(8, 19))
+	ITEM(Option, keep, SetLabel(t_("Keep aspect ratio")).LeftPosZ(8, 176).TopPosZ(32, 20))
+	ITEM(Button, ok, SetLabel(t_("OK")).LeftPosZ(52, 64).TopPosZ(60, 24))
+	ITEM(Button, cancel, SetLabel(t_("Cancel")).LeftPosZ(120, 64).TopPosZ(60, 24))
+END_LAYOUT
+
+LAYOUT(ImgColorLayout, 188, 164)
+	ITEM(Label, dv___0, SetLabel(t_("R = R * ")).LeftPosZ(8, 40).TopPosZ(8, 19))
+	ITEM(EditDoubleSpin, r_mul, SetInc(0.05).Min(-10).Max(10).NotNull(true).LeftPosZ(48, 52).TopPosZ(8, 19))
+	ITEM(Label, dv___2, SetLabel(t_("+")).LeftPosZ(112, 12).TopPosZ(8, 19))
+	ITEM(EditDoubleSpin, r_add, SetInc(0.05).Min(-10).Max(10).NotNull(true).LeftPosZ(128, 52).TopPosZ(8, 19))
+	ITEM(Label, dv___4, SetLabel(t_("G = G * ")).LeftPosZ(8, 40).TopPosZ(32, 19))
+	ITEM(EditDoubleSpin, g_mul, SetInc(0.05).Min(-10).Max(10).NotNull(true).LeftPosZ(48, 52).TopPosZ(32, 19))
+	ITEM(Label, dv___6, SetLabel(t_("+")).LeftPosZ(112, 12).TopPosZ(32, 19))
+	ITEM(EditDoubleSpin, g_add, SetInc(0.05).Min(-10).Max(10).NotNull(true).LeftPosZ(128, 52).TopPosZ(32, 19))
+	ITEM(Label, dv___8, SetLabel(t_("B = B * ")).LeftPosZ(8, 40).TopPosZ(56, 19))
+	ITEM(EditDoubleSpin, b_mul, SetInc(0.05).Min(-10).Max(10).NotNull(true).LeftPosZ(48, 52).TopPosZ(56, 19))
+	ITEM(Label, dv___10, SetLabel(t_("+")).LeftPosZ(112, 12).TopPosZ(56, 19))
+	ITEM(EditDoubleSpin, b_add, SetInc(0.05).Min(-10).Max(10).NotNull(true).LeftPosZ(128, 52).TopPosZ(56, 19))
+	ITEM(Option, all, SetLabel(t_("All color channels equal")).LeftPosZ(8, 148).TopPosZ(80, 15))
+	ITEM(Label, dv___13, SetLabel(t_("A = A * ")).LeftPosZ(8, 40).TopPosZ(104, 19))
+	ITEM(EditDoubleSpin, a_mul, SetInc(0.05).Min(-10).Max(10).NotNull(true).LeftPosZ(48, 52).TopPosZ(104, 19))
+	ITEM(Label, dv___15, SetLabel(t_("+")).LeftPosZ(112, 12).TopPosZ(104, 19))
+	ITEM(EditDoubleSpin, a_add, SetInc(0.05).Min(-10).Max(10).NotNull(true).LeftPosZ(128, 52).TopPosZ(104, 19))
+	ITEM(Button, ok, SetLabel(t_("OK")).LeftPosZ(44, 64).TopPosZ(132, 24))
+	ITEM(Button, cancel, SetLabel(t_("Cancel")).LeftPosZ(116, 64).TopPosZ(132, 24))
+END_LAYOUT
diff --git a/uppsrc/IconDes/IconDes.upp b/uppsrc/IconDes/IconDes.upp
new file mode 100644
index 000000000..fb0032519
--- /dev/null
+++ b/uppsrc/IconDes/IconDes.upp
@@ -0,0 +1,24 @@
+description "Image designer";
+
+uses
+	CtrlLib,
+	plugin\gif,
+	plugin\jpg;
+
+file
+	IconDes.h,
+	AlphaCtrl.cpp,
+	RGBACtrl.cpp,
+	ImageOp.cpp optimize_speed,
+	Paint.cpp,
+	Event.cpp,
+	Fast.cpp optimize_speed,
+	IconDes.cpp,
+	List.cpp,
+	Image.cpp,
+	Bar.cpp,
+	EditPos.cpp,
+	ImlFile.cpp,
+	IconDes.lay,
+	IconDes.iml;
+
diff --git a/uppsrc/IconDes/Image.cpp b/uppsrc/IconDes/Image.cpp
new file mode 100644
index 000000000..38ac23491
--- /dev/null
+++ b/uppsrc/IconDes/Image.cpp
@@ -0,0 +1,400 @@
+#include "IconDes.h"
+
+NAMESPACE_UPP
+
+void IconDes::Interpolate()
+{
+	if(!IsCurrent())
+		return;
+	FinishPaste();
+	SaveUndo();
+	Slot& c = Current();
+	c.base_image = c.image;
+	UPP::InterpolateImage(c.image, c.image.GetSize());
+	MaskSelection();
+}
+
+bool IconDes::BeginTransform()
+{
+	SaveUndo();
+	Refresh();
+	SyncShow();
+	if(!IsPasting()) {
+		if(SelectionRect() == GetImageSize())
+			return false;
+		Move();
+	}
+	return true;
+}
+
+void IconDes::KeyMove(int dx, int dy)
+{
+	if(!IsCurrent())
+		return;
+	Slot& c = Current();
+	if(BeginTransform()) {
+		c.pastepos.x += dx;
+		c.pastepos.y += dy;
+		MakePaste();
+	}
+	else {
+		Image h = c.image;
+		c.image = CreateImage(h.GetSize(), Null);
+		UPP::Copy(c.image, Point(dx, dy), h, h.GetSize());
+	}
+	Sync();
+}
+
+void IconDes::MirrorX()
+{
+	if(!IsCurrent())
+		return;
+	Slot& c = Current();
+	if(BeginTransform()) {
+		MirrorHorz(c.paste_image, c.paste_image.GetSize());
+		MakePaste();
+	}
+	else
+		MirrorHorz(c.image, c.image.GetSize());
+	SyncShow();
+}
+
+void IconDes::SymmX()
+{
+	if(!IsCurrent())
+		return;
+	Slot& c = Current();
+	if(BeginTransform()) {
+		if(c.paste_image.GetLength() > 1024 * 1024)
+			return;
+		Image m = c.paste_image;
+		Size sz = m.GetSize();
+		MirrorHorz(m, m.GetSize());
+		Image h = CreateImage(Size(2 * sz.cx, sz.cy), Null);
+		UPP::Copy(h, Point(0, 0), c.paste_image, sz);
+		UPP::Copy(h, Point(sz.cx, 0), m, sz);
+		c.paste_image = h;
+		MakePaste();
+	}
+	else {
+		Size sz = c.image.GetSize();
+		if(sz.cx < 2)
+			return;
+		UPP::Copy(c.image, Point(sz.cx - sz.cx / 2, 0), c.image, Size(sz.cx / 2, sz.cy));
+		MirrorHorz(c.image, RectC(sz.cx - sz.cx / 2, 0, sz.cx / 2, sz.cy));
+	}
+	SyncShow();
+}
+
+void IconDes::MirrorY()
+{
+	if(!IsCurrent())
+		return;
+	Slot& c = Current();
+	if(BeginTransform()) {
+		MirrorVert(c.paste_image, c.paste_image.GetSize());
+		MakePaste();
+	}
+	else
+		MirrorVert(c.image, c.image.GetSize());
+	SyncShow();
+}
+
+void IconDes::SymmY()
+{
+	if(!IsCurrent())
+		return;
+	Slot& c = Current();
+	if(BeginTransform()) {
+		if(c.paste_image.GetLength() > 1024 * 1024)
+			return;
+		Image m = c.paste_image;
+		Size sz = m.GetSize();
+		MirrorVert(m, m.GetSize());
+		Image h = CreateImage(Size(sz.cx, 2 * sz.cy), Null);
+		UPP::Copy(h, Point(0, 0), c.paste_image, sz);
+		UPP::Copy(h, Point(0, sz.cy), m, sz);
+		c.paste_image = h;
+		MakePaste();
+	}
+	else {
+		Size sz = c.image.GetSize();
+		if(sz.cy < 2)
+			return;
+		UPP::Copy(c.image, Point(0, sz.cy - sz.cy / 2), c.image, Size(sz.cx, sz.cy / 2));
+		MirrorVert(c.image, RectC(0, sz.cy - sz.cy / 2, sz.cx, sz.cy / 2));
+	}
+	SyncShow();
+}
+
+void IconDes::Rotate()
+{
+	if(!IsCurrent())
+		return;
+	Slot& c = Current();
+	if(BeginTransform()) {
+		c.paste_image = RotateClockwise(c.paste_image);
+		MakePaste();
+	}
+	else
+		c.image = RotateClockwise(c.image);
+	SyncShow();
+}
+
+void IconDes::SmoothRescale()
+{
+	if(!IsCurrent())
+		return;
+	WithRescaleLayout<TopWindow> dlg;
+	CtrlLayoutOKCancel(dlg, "Rescale");
+	dlg.cx <<= dlg.cy <<= dlg.Breaker();
+	Slot& c = Current();
+	BeginTransform();
+	Image bk = IsPasting() ? c.paste_image : c.image;
+	dlg.cx <<= bk.GetWidth();
+	dlg.cy <<= bk.GetHeight();
+	dlg.keep <<= true;
+	for(;;) {
+		Size sz(minmax((int)~dlg.cx, 1, 9999), minmax((int)~dlg.cy, 1, 9999));
+		if(IsPasting()) {
+			c.paste_image = Rescale(bk, sz);
+			MakePaste();
+		}
+		else {
+			c.image = Rescale(bk, sz);
+			Refresh();
+		}
+		SyncImage();
+		SyncShow();
+		switch(dlg.Run()) {
+		case IDCANCEL:
+			if(IsPasting()) {
+				c.paste_image = bk;
+				MakePaste();
+			}
+			else {
+				c.image = bk;
+				Refresh();
+			}
+			SyncImage();
+			SyncShow();
+			return;
+		case IDOK:
+			return;
+		}
+		if(dlg.keep) {
+			if(dlg.cx.HasFocus() && bk.GetWidth() > 0)
+				dlg.cy <<= (int)~dlg.cx * bk.GetHeight() / bk.GetWidth();
+			if(dlg.cy.HasFocus() && bk.GetHeight() > 0)
+				dlg.cx <<= (int)~dlg.cy * bk.GetWidth() / bk.GetHeight();
+		}
+	}
+}
+
+Image IconDes::ImageStart()
+{
+	if(!IsCurrent())
+		return CreateImage(Size(1, 1), Black);
+	SaveUndo();
+	Refresh();
+	SyncShow();
+	Slot& c = Current();
+	if(!IsPasting())
+		c.base_image = c.image;
+	return IsPasting() ? c.paste_image : c.image;
+}
+
+void IconDes::ImageSet(const Image& m)
+{
+	if(!IsCurrent())
+		return;
+	Slot& c = Current();
+	if(IsPasting()) {
+		c.paste_image = m;
+		MakePaste();
+	}
+	else {
+		c.image = m;
+		MaskSelection();
+	}
+	Refresh();
+	SyncShow();
+}
+
+void IconDes::BlurSharpen()
+{
+	WithSharpenLayout<TopWindow> dlg;
+	CtrlLayoutOKCancel(dlg, "Blur/Sharpen");
+	PlaceDlg(dlg);
+	dlg.level <<= 0;
+	dlg.level <<= dlg.Breaker();
+	dlg.passes <<= 1;
+	dlg.passes <<= dlg.Breaker();
+	Image bk = ImageStart();
+	for(;;) {
+		Image m = bk;
+		for(int q = 0; q < (int)~dlg.passes; q++)
+			m = Sharpen(m, -int(256 * (double)~dlg.level));
+		ImageSet(m);
+		switch(dlg.Run()) {
+		case IDCANCEL:
+			ImageSet(bk);
+			return;
+		case IDOK:
+			return;
+		}
+	}
+}
+
+void IconDes::Colorize()
+{
+	WithColorizeLayout<TopWindow> dlg;
+	CtrlLayoutOKCancel(dlg, "Colorize");
+	PlaceDlg(dlg);
+	dlg.level.Max(10);
+	dlg.level <<= 1;
+	dlg.level <<= dlg.Breaker();
+	Image bk = ImageStart();
+	for(;;) {
+		ImageSet(UPP::Colorize(bk, CurrentColor(),
+		         (int)(minmax((double)~dlg.level, 0.0, 1.0) * 255)));
+		switch(dlg.Run()) {
+		case IDCANCEL:
+			ImageSet(bk);
+			return;
+		case IDOK:
+			return;
+		}
+	}
+}
+
+void IconDes::Chroma()
+{
+	WithColorizeLayout<TopWindow> dlg;
+	CtrlLayoutOKCancel(dlg, "Chroma");
+	PlaceDlg(dlg);
+	dlg.level.Max(10);
+	dlg.level <<= 1;
+	dlg.level <<= dlg.Breaker();
+	Image bk = ImageStart();
+	for(;;) {
+		ImageSet(UPP::Grayscale(bk, 256 - (int)(minmax((double)~dlg.level, 0.0, 4.0) * 255)));
+		switch(dlg.Run()) {
+		case IDCANCEL:
+			ImageSet(bk);
+			return;
+		case IDOK:
+			return;
+		}
+	}
+}
+
+void IconDes::Contrast()
+{
+	WithColorizeLayout<TopWindow> dlg;
+	CtrlLayoutOKCancel(dlg, "Contrast");
+	PlaceDlg(dlg);
+	dlg.level.Max(10);
+	dlg.level <<= 1;
+	dlg.level <<= dlg.Breaker();
+	Image bk = ImageStart();
+	for(;;) {
+		ImageSet(UPP::Contrast(bk, (int)(minmax((double)~dlg.level, 0.0, 4.0) * 255)));
+		switch(dlg.Run()) {
+		case IDCANCEL:
+			ImageSet(bk);
+			return;
+		case IDOK:
+			return;
+		}
+	}
+}
+
+void IconDes::Alpha()
+{
+	WithColorizeLayout<TopWindow> dlg;
+	CtrlLayoutOKCancel(dlg, "Alpha");
+	PlaceDlg(dlg);
+	dlg.level.Max(4);
+	dlg.level <<= 1;
+	dlg.level <<= dlg.Breaker();
+	Image bk = ImageStart();
+	for(;;) {
+		int a = (int)(minmax((double)~dlg.level, 0.0, 4.0) * 255);
+		ImageBuffer ib(bk.GetSize());
+		RGBA *t = ib;
+		const RGBA *s = bk;
+		const RGBA *e = bk + bk.GetLength();
+		while(s < e) {
+			*t = *s;
+			t->a = Saturate255((s->a * a) >> 8);
+			s++;
+			t++;
+		}
+		ImageSet(ib);
+		switch(dlg.Run()) {
+		case IDCANCEL:
+			ImageSet(bk);
+			return;
+		case IDOK:
+			return;
+		}
+	}
+}
+
+void IconDes::Colors()
+{
+	WithImgColorLayout<TopWindow> dlg;
+	CtrlLayoutOKCancel(dlg, "Alpha");
+	PlaceDlg(dlg);
+	dlg.r_mul <<= dlg.g_mul <<= dlg.b_mul <<= dlg.a_mul <<= 1;
+	dlg.r_add <<= dlg.g_add <<= dlg.b_add <<= dlg.a_add <<= 0;
+	dlg.all = true;
+	dlg.r_mul <<= dlg.g_mul <<= dlg.b_mul <<= dlg.a_mul <<=
+	dlg.r_add <<= dlg.g_add <<= dlg.b_add <<= dlg.a_add <<=
+	dlg.all <<= dlg.Breaker();
+	Image bk = ImageStart();
+	for(;;) {
+		bool all = dlg.all;
+		dlg.g_mul.Enable(!all);
+		dlg.g_add.Enable(!all);
+		dlg.b_mul.Enable(!all);
+		dlg.b_add.Enable(!all);
+		if(all) {
+			dlg.g_mul <<= dlg.b_mul <<= ~dlg.r_mul;
+			dlg.g_add <<= dlg.b_add <<= ~dlg.r_add;
+		}
+		ImageBuffer ib(bk.GetSize());
+		RGBA *t = ib;
+		const RGBA *s = bk;
+		const RGBA *e = bk + bk.GetLength();
+		int r_mul = int(256 * (double)~dlg.r_mul);
+		int r_add = int(256 * (double)~dlg.r_add);
+		int g_mul = int(256 * (double)~dlg.g_mul);
+		int g_add = int(256 * (double)~dlg.g_add);
+		int b_mul = int(256 * (double)~dlg.b_mul);
+		int b_add = int(256 * (double)~dlg.b_add);
+		int a_mul = int(256 * (double)~dlg.a_mul);
+		int a_add = int(256 * (double)~dlg.a_add);
+		while(s < e) {
+			Unmultiply(t, t, 1);
+			t->r = Saturate255(((r_mul * s->r) >> 8) + r_add);
+			t->g = Saturate255(((g_mul * s->g) >> 8) + g_add);
+			t->b = Saturate255(((b_mul * s->b) >> 8) + b_add);
+			t->a = Saturate255(((a_mul * s->a) >> 8) + a_add);
+			Premultiply(t, t, 1);
+			s++;
+			t++;
+		}
+		ImageSet(ib);
+		switch(dlg.Run()) {
+		case IDCANCEL:
+			ImageSet(bk);
+			return;
+		case IDOK:
+			return;
+		}
+	}
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/IconDes/ImageOp.cpp b/uppsrc/IconDes/ImageOp.cpp
new file mode 100644
index 000000000..160d99512
--- /dev/null
+++ b/uppsrc/IconDes/ImageOp.cpp
@@ -0,0 +1,205 @@
+#include "IconDes.h"
+
+NAMESPACE_UPP
+
+struct sFloodFill {
+	Rect         rc;
+	Size         sz;
+	Buffer<byte> flag;
+	ImageBuffer& ib;
+	RGBA         scolor;
+	RGBA         color;
+	bool         done;
+
+	RGBA& At(int x, int y)         { return ib[y + rc.top][x + rc.left]; }
+	bool  Eq(int x, int y, RGBA c) { RGBA& q = At(x, y); return (q.a | c.a) == 0 || c == q; }
+	byte& Flag(int x, int y) { return flag[y * sz.cx + x]; }
+	void  Fill(RGBA color, Point pt, const Rect& rc);
+	void  Try(int x, int y);
+
+	sFloodFill(ImageBuffer& ib) : ib(ib) {}
+};
+
+void sFloodFill::Try(int x, int y)
+{
+	if(x >= 0 && x < sz.cx && y >= 0 && y < sz.cy && Flag(x, y) == 0 && Eq(x, y, scolor)) {
+		Flag(x, y) = 1;
+		At(x, y) = color;
+		done = false;
+	}
+}
+
+void sFloodFill::Fill(RGBA _color, Point pt, const Rect& _rc)
+{
+	rc = _rc & ib.GetSize();
+	if(!rc.Contains(pt))
+		return;
+	scolor = ib[pt.y][pt.x];
+	color = _color;
+	sz = rc.GetSize();
+	flag.Alloc(sz.cx * sz.cy, 0);
+	pt -= rc.TopLeft();
+	Flag(pt.x, pt.y) = 1;
+	At(pt.x, pt.y) = color;
+	do {
+		done = true;
+		for(int y = 0; y < sz.cy; y++)
+			for(int x = 0; x < sz.cx; x++) {
+				if(Flag(x, y) == 1) {
+					Flag(x, y) = 2;
+					Try(x + 1, y);
+					Try(x - 1, y);
+					Try(x, y + 1);
+					Try(x, y - 1);
+				}
+			}
+	}
+	while(!done);
+}
+
+void FloodFill(ImageBuffer& img, RGBA color, Point pt, const Rect& rc)
+{
+	sFloodFill(img).Fill(color, pt, rc);
+}
+
+struct InterpolateFilter : ImageFilter9 {
+	int todo;
+
+	virtual RGBA operator()(const RGBA **mx);
+};
+
+RGBA InterpolateFilter::operator()(const RGBA **mx)
+{
+	RGBA t = mx[1][1];
+	int na = mx[0][1].a, wa = mx[1][0].a, ea = mx[1][2].a, sa = mx[2][1].a;
+	int suma = na + wa + ea + sa, half = suma >> 1;
+	if(suma > 0) {
+		t.r = (mx[0][1].r * na + mx[1][0].r * wa + mx[1][2].r * ea + mx[2][1].r * sa + half) / suma;
+		t.g = (mx[0][1].g * na + mx[1][0].g * wa + mx[1][2].g * ea + mx[2][1].g * sa + half) / suma;
+		t.b = (mx[0][1].b * na + mx[1][0].b * wa + mx[1][2].b * ea + mx[2][1].b * sa + half) / suma;
+		t.a = max(max(na, sa), max(wa, ea));
+		if(t != mx[1][1])
+			todo++;
+	}
+	return t;
+}
+
+void InterpolateImage(Image& img, const Rect& _rc)
+{
+	Rect rc = _rc & img.GetSize();
+	Image m = Crop(img, rc);
+	TimeStop tm;
+	Image imp = CreateImage(rc.GetSize(), Null);
+	Over(imp, Point(0, 0), m, m.GetSize());
+	Progress pi("Interpolating...");
+	for(int qq = 0; qq < 2000; qq++) {
+		InterpolateFilter f;
+		f.todo = 0;
+		imp = Filter(imp, f);
+		Over(imp, Point(0, 0), m, m.GetSize());
+		if(f.todo == 0)
+			break;
+		if(pi.SetCanceled(qq, 2000))
+			break;
+	}
+	Copy(img, rc.TopLeft(), imp, imp.GetSize());
+}
+
+void MirrorHorz(Image& img, const Rect& rect)
+{
+	ImageBuffer ib(img);
+	Rect rc = rect & ib.GetSize();
+	for(int y = rc.top; y < rc.bottom; y++) {
+		RGBA *b = ib[y] + rc.left;
+		RGBA *e = ib[y] + rc.right - 1;
+		while(b < e) {
+			Swap(*b, *e);
+			b++;
+			e--;
+		}
+	}
+	img = ib;
+}
+
+void MirrorVert(Image& img, const Rect& rect)
+{
+	ImageBuffer ib(img);
+	Rect rc = rect & ib.GetSize();
+	int b = rc.top;
+	int e = rc.bottom - 1;
+	int n = rc.right - rc.left;
+	if(n > 0) {
+		Buffer<RGBA> h(n);
+		n *= sizeof(RGBA);
+		while(b < e) {
+			memcpy(h, ib[b] + rc.left, n);
+			memcpy(ib[b] + rc.left, ib[e] + rc.left, n);
+			memcpy(ib[e] + rc.left, h, n);
+			b++;
+			e--;
+		}
+	}
+	img = ib;
+}
+
+String PackImlData(const Vector<Image>& image)
+{
+	StringBuffer block;
+	for(int i = 0; i < image.GetCount(); i++) {
+		Image img = image[i];
+		StringStream ss;
+		ss.Put(0);
+		Size sz = img.GetSize();
+		ss.Put16le(sz.cx);
+		ss.Put16le(sz.cy);
+		Point p = img.GetHotSpot();
+		ss.Put16le(p.x);
+		ss.Put16le(p.y);
+		p = img.Get2ndSpot();
+		ss.Put16le(p.x);
+		ss.Put16le(p.y);
+		block.Cat(ss.GetResult());
+		const RGBA *s = img;
+		const RGBA *e = s + img.GetLength();
+		while(s < e) {
+			block.Cat(s->r);
+			block.Cat(s->g);
+			block.Cat(s->b);
+			block.Cat(s->a);
+			s++;
+		}
+	}
+	return ZCompress(block);
+}
+
+Image DownSample3x(const Image& src)
+{
+	Size tsz = src.GetSize() / 3;
+	ImageBuffer ib(tsz);
+	int w = src.GetSize().cx;
+	int w2 = 2 * w;
+	for(int y = 0; y < tsz.cy; y++) {
+		RGBA *t = ib[y];
+		RGBA *e = t + tsz.cx;
+		const RGBA *s = src[3 * y];
+		while(t < e) {
+			int r, g, b, a;
+			const RGBA *q;
+			r = g = b = a = 0;
+#define S__SUM(delta) q = s + delta; r += q->r; g += q->g; b += q->b; a += q->a;
+			S__SUM(0) S__SUM(1) S__SUM(2)
+			S__SUM(w + 0) S__SUM(w + 1) S__SUM(w + 2)
+			S__SUM(w2 + 0) S__SUM(w2 + 1) S__SUM(w2 + 2)
+#undef  S__SUM
+			t->a = a / 9;
+			t->r = r / 9;
+			t->g = g / 9;
+			t->b = b / 9;
+			t++;
+			s += 3;
+		}
+	}
+	return ib;
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/IconDes/ImlFile.cpp b/uppsrc/IconDes/ImlFile.cpp
new file mode 100644
index 000000000..32ded06f0
--- /dev/null
+++ b/uppsrc/IconDes/ImlFile.cpp
@@ -0,0 +1,369 @@
+#include "IconDes.h"
+
+NAMESPACE_UPP
+
+class AlphaImageInfo
+{
+public:
+	enum ENCODING { COLOR_RLE, MONO_RLE, MONO_PACKED };
+
+	AlphaImageInfo(Size size = Size(0, 0), int encoding = COLOR_RLE, Point hotspot = Point(0, 0))
+		: encoding(encoding), size(size), hotspot(hotspot) {}
+
+	void               Serialize(Stream& stream);
+
+public:
+	int                encoding;
+	Size               size;
+	Point              hotspot;
+};
+
+String AlphaToRLE(const Image& aa)
+{
+	String result;
+	for(int y = 0; y < aa.GetHeight(); y++) {
+		result.Cat(PackRLE(aa[y], aa.GetWidth()));
+		result.Cat(0x80);
+	}
+	return result;
+}
+
+Image RLEToAlpha(const String& rle, Size sz)
+{
+	ImageBuffer ib(sz);
+	const byte *s = rle;
+	for(int y = 0; y < sz.cy; y++)
+		if((const char *)s < rle.End())
+			s = UnpackRLE(ib[y], s, sz.cx) + 1;
+		else
+			memset(ib[y], 0, sz.cx * sizeof(RGBA));
+	return ib;
+}
+
+void AlphaImageInfo::Serialize(Stream& stream)
+{
+	int version = 1;
+	stream / version;
+	if(version >= 1)
+		stream % size % hotspot % encoding;
+}
+
+void ScanIML(CParser& parser, Array<ImlImage>& out_images,
+             VectorMap<String, String>& out_settings)
+{
+	String name, bid;
+	bool exp = false;
+	while(!parser.IsEof())
+	{
+		if((bid = parser.ReadId()) == "IMAGE_META")
+		{
+			parser.Char('(');
+			if(parser.IsString())
+				name = parser.ReadString();
+			else
+				name = parser.ReadId();
+			parser.PassChar(',');
+			String value = parser.ReadString();
+			parser.PassChar(')');
+			out_settings.Add(name, value);
+			if(value == "exp")
+				exp = true;
+		}
+		else if(bid == "IMAGE_BEGIN" && parser.Char('(') && !IsNull(name = parser.ReadId()) && parser.Char(')'))
+		{
+			String encoded_data;
+			out_settings.GetAdd("wince_16bit", "0");
+			String id;
+			bool first = true;
+			while((id = parser.ReadId()) == "IMAGE_SCAN" && parser.Char('('))
+			{
+				bool first_in_row = true;
+				while(parser.IsChar('\"'))
+				{
+					String scan = parser.ReadOneString();
+					if(!first && first_in_row)
+						encoded_data.Cat('\x80');
+					first_in_row = first = false;
+					encoded_data.Cat(scan);
+				}
+				if(!parser.Char(')'))
+					break;
+			}
+			AlphaImageInfo image;
+			bool accepted = false;
+			if(parser.Char('(') && parser.ReadId() == name && parser.Char(','))
+				if(id == "IMAGE_END"
+				&& (image.size.cx = parser.ReadInt()) > 0 && parser.Char(',')
+				&& (image.size.cy = parser.ReadInt()) > 0 && parser.Char(')'))
+				{
+					accepted = true;
+				}
+				else if(id == "IMAGE_PACKED" && parser.IsChar('\"'))
+				{
+					String d = parser.ReadOneString();
+					if(parser.Char(')'))
+					{
+						StringStream ss(d);
+						ss % image;
+						if(!ss.IsError())
+							accepted = true;
+					}
+				}
+
+			if(name.GetLength() >= 6 && !memcmp(name, "_java_", 6))
+				accepted = false;
+
+			if(accepted)
+			{
+				if(name.GetLength() >= 4 && !memcmp(name, "im__", 4))
+					name = Null;
+
+				Image m = RLEToAlpha(encoded_data, image.size);
+				ImageBuffer ib(m);
+				ib.SetHotSpot(image.hotspot);
+				m = ib;
+				ImlImage& c = out_images.Add();
+				c.name = name;
+				c.image = m;
+				c.exp = exp;
+				exp = false;
+			}
+		}
+		else if(bid == "IMAGE_BEGIN16" && parser.Char('(') && !IsNull(name = parser.ReadId()) && parser.Char(')'))
+		{ //TODO: FIX THESE!!!
+			out_settings.GetAdd("wince_16bit", "1");
+			String encoded_data;
+			String id;
+			bool first = true;
+			while((id = parser.ReadId()) == "IMAGE_SCAN16" && parser.Char('(') && parser.Char('L'))
+			{
+				bool first_in_row = true;
+				while(parser.Char('\"'))
+				{
+					CParser::Pos pos = parser.GetPos();
+					const char *end;
+					end = pos.ptr; // TODO - remove
+					String scan; // TODO = GetUnicodeScan(pos.ptr, &end);
+					pos.ptr = end;
+					parser.SetPos(pos);
+					if(!parser.Char('\"'))
+						break;
+					if(!first && first_in_row)
+						encoded_data.Cat('\x80');
+					first_in_row = first = false;
+					encoded_data.Cat(scan);
+				}
+				if(!parser.Char(')'))
+					break;
+			}
+			AlphaImageInfo idata;
+			bool accepted = false;
+			if(id == "IMAGE_END16" && parser.Char('(') && parser.ReadId() == name && parser.Char(',')
+			&& (idata.size.cx = parser.ReadInt()) > 0 && parser.Char(',')
+			&& (idata.size.cy = parser.ReadInt()) > 0 && parser.Char(',')
+			&& !IsNull(idata.hotspot.x = parser.ReadInt()) && parser.Char(',')
+			&& !IsNull(idata.hotspot.y = parser.ReadInt()) && parser.Char(')'))
+			{
+				accepted = true;
+			}
+
+			if(accepted)
+			{
+				if(name.GetLength() >= 4 && !memcmp(name, "im__", 4))
+					name = Null;
+
+				Image m = RLEToAlpha(encoded_data, idata.size);
+				ImageBuffer ib(m);
+				ib.SetHotSpot(idata.hotspot);
+				m = ib;
+				ImlImage& c = out_images.Add();
+				c.name = name;
+				c.image = m;
+				c.exp = exp;
+				exp = false;
+			}
+		}
+		else
+			break;
+	}
+}
+
+bool LoadIml(const String& data, Array<ImlImage>& img, int& format)
+{
+	CParser p(data);
+	format = 0;
+	try {
+		bool premultiply = !p.Id("PREMULTIPLIED");
+		Vector<String> name;
+		Vector<bool> exp;
+		while(p.Id("IMAGE_ID")) {
+			p.PassChar('(');
+			String n;
+			if(p.IsId())
+				n = p.ReadId();
+			if(n.StartsWith("im__", 4))
+				n = Null;
+			name.Add(n);
+			p.PassChar(')');
+			bool e = false;
+			if(p.Id("IMAGE_META")) {
+				p.PassChar('(');
+				e = p.ReadString() == "exp";
+				if(p.Char(',') && p.IsString())
+					p.ReadString();
+				p.PassChar(')');
+			}
+			exp.Add(e);
+		}
+		int ii = 0;
+		while(p.Id("IMAGE_BEGIN_DATA")) {
+			String data;
+			while(p.Id("IMAGE_DATA")) {
+				p.PassChar('(');
+				for(int j = 0; j < 32; j++) {
+					if(j) p.PassChar(',');
+					data.Cat(p.ReadInt());
+				}
+				p.PassChar(')');
+			}
+			p.PassId("IMAGE_END_DATA");
+			p.PassChar('(');
+			int zlen = p.ReadInt();
+			p.PassChar(',');
+			int count = p.ReadInt();
+			p.PassChar(')');
+
+			data.Trim(zlen);
+			Vector<Image> m = UnpackImlData(data, data.GetCount());
+			if(m.GetCount() != count || ii + count > name.GetCount())
+				p.ThrowError("");
+			for(int i = 0; i < count; i++) {
+				ImlImage& c = img.Add();
+				c.name = name[ii];
+				c.exp = exp[ii++];
+				c.image = m[i];
+				if(premultiply)
+					c.image = Premultiply(c.image);
+			}
+		}
+		if(!p.IsEof())
+			p.ThrowError("");
+	}
+	catch(CParser::Error) {
+		try {
+			CParser p(data);
+			Array<ImlImage> m;
+			VectorMap<String, String> s;
+			ScanIML(p, img, s);
+			if(img.GetCount())
+				format = 1;
+		}
+		catch(...) {
+			return false;
+		}
+	}
+	return true;
+}
+
+static void PutOctalString(Stream& out, const char *b, const char *e, bool split = false)
+{
+	out.Put('\"');
+	int64 start = out.GetPos();
+	while(b < e) {
+		if(split && out.GetPos() >= start + 200u) {
+			out.Put("\"\r\n\t\"");
+			start = out.GetPos();
+		}
+		if((byte)*b >= ' ' && *b != '\x7F' && *b != '\xFF') {
+			if(*b == '\\' || *b == '\"' || *b == '\'')
+				out.Put('\\');
+			out.Put(*b++);
+		}
+		else if(IsDigit(b[1]))
+			out.Put(Sprintf("\\%03o", (byte)*b++));
+		else
+			out.Put(Sprintf("\\%o", (byte)*b++));
+	}
+	out.Put('\"');
+}
+
+String SaveIml(const Array<ImlImage>& iml, int format) {
+	StringStream out;
+	if(format == 1) {
+		for(int i = 0; i < iml.GetCount(); i++) {
+			const ImlImage& c = iml[i];
+			if(c.exp)
+				out.PutLine("IMAGE_META(\"exp\", \"\")");
+			String name = c.name;
+			Image buffer = c.image;
+			if(IsNull(name))
+				name = "im__" + IntStr(i);
+			out.PutLine(NFormat("IMAGE_BEGIN(%s)", name));
+			int last = 0;
+			for(int i = 0; i < buffer.GetHeight(); i++) {
+				String scan = PackRLE(buffer[i], buffer.GetWidth());
+				if(!scan.IsEmpty() || i == 0) // force at least 1 scan
+				{
+					for(; last < i; last++)
+						out.PutLine("\tIMAGE_SCAN(\"\")");
+					out.Put("\tIMAGE_SCAN(");
+					PutOctalString(out, scan.Begin(), scan.End(), true);
+					out.Put(")\r\n");
+					last = i + 1;
+				}
+			}
+			out.Put("IMAGE_PACKED(");
+			out.Put(name);
+			out.Put(", ");
+			StringStream datastrm;
+			Size size = buffer.GetSize();
+			Point hotspot = buffer.GetHotSpot();
+			int encoding = AlphaImageInfo::COLOR_RLE;
+			int version = 1;
+			datastrm / version;
+			datastrm % size % hotspot % encoding;
+			ASSERT(!datastrm.IsError());
+			String s = datastrm.GetResult();
+			PutOctalString(out, s.Begin(), s.End());
+			out.Put(")\r\n");
+		}
+	}
+	else {
+		out << "PREMULTIPLIED\r\n";
+		for(int i = 0; i < iml.GetCount(); i++) {
+			const ImlImage& c = iml[i];
+			out << "IMAGE_ID(" << c.name << ")";
+			if(c.exp)
+				out.PutLine(" IMAGE_META(\"exp\", \"\")");
+			out << "\r\n";
+		}
+		int ii = 0;
+		while(ii < iml.GetCount()) {
+			int bl = 0;
+			int bn = 0;
+			Vector<Image> bimg;
+			while(bl < 4096 && ii < iml.GetCount()) {
+				const ImlImage& c = iml[ii++];
+				bimg.Add(c.image);
+				bl += c.image.GetLength();
+				bn++;
+			}
+			String bs = PackImlData(bimg);
+			out << "\r\nIMAGE_BEGIN_DATA\r\n";
+			bs.Cat(0, ((bs.GetCount() + 31) & ~31) - bs.GetCount());
+			const byte *s = bs;
+			for(int n = bs.GetCount() / 32; n--;) {
+				out << "IMAGE_DATA(";
+				for(int j = 0; j < 32; j++) {
+					if(j) out << ',';
+					out << (int)*s++;
+				}
+				out << ")\r\n";
+			}
+			out << "IMAGE_END_DATA(" << bs.GetCount() << ", " << bn << ")\r\n";
+		}
+	}
+	return out.GetResult();
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/IconDes/List.cpp b/uppsrc/IconDes/List.cpp
new file mode 100644
index 000000000..ada7492e3
--- /dev/null
+++ b/uppsrc/IconDes/List.cpp
@@ -0,0 +1,290 @@
+#include "IconDes.h"
+
+NAMESPACE_UPP
+
+static String sFormatImageName(const String& name, const Image& img, bool exp)
+{
+	Size sz = img.GetSize();
+	String r;
+	r << name << " (" << sz.cx << " x " << sz.cy << ')';
+	if(exp)
+		r << " ex.";
+	return r;
+}
+
+void IconDes::SyncList()
+{
+	int a = list.GetCursorSc();
+	int ii = list.GetCursor();
+	list.Clear();
+	for(int i = 0; i < slot.GetCount(); i++) {
+		Slot& c = slot[i];
+		list.Add(sFormatImageName(c.name, c.image, c.exp), c.image);
+	}
+	if(ii >= 0) {
+		list.SetCursor(ii);
+		list.ScCursor(a);
+	}
+}
+
+static int sCharFilterCid(int c)
+{
+	return IsAlNum(c) || c == '_' ? c : 0;
+}
+
+void IconDes::PlaceDlg(TopWindow& dlg)
+{
+	Rect r = list.GetScreenRect();
+	Size sz = dlg.GetSize();
+	dlg.NoCenter().SetRect(max(0, r.left + (r.Width() - sz.cx) / 2), r.bottom + 32, sz.cx, sz.cy);
+}
+
+void IconDes::PrepareImageDlg(WithImageLayout<TopWindow>& dlg)
+{
+	CtrlLayoutOKCancel(dlg, "New image");
+	dlg.cx <<= 16;
+	dlg.cy <<= 16;
+	if(IsCurrent()) {
+		Size sz = GetImageSize();
+		dlg.cx <<= sz.cx;
+		dlg.cy <<= sz.cy;
+	}
+	dlg.name.SetFilter(sCharFilterCid);
+}
+
+bool CheckName(WithImageLayout<TopWindow>& dlg)
+{
+	String n = dlg.name;
+	CParser p(n);
+	if(p.IsId()) return true;
+	Exclamation("Invalid name!");
+	return false;
+}
+
+void IconDes::InsertRemoved(int q)
+{
+	if(q >= 0 && q < removed.GetCount()) {
+		int ii = list.IsCursor() ? list.GetCursor() : 0;
+		slot.Insert(ii) = removed[q];
+		removed.Remove(q);
+		SyncList();
+		list.SetCursor(ii);
+	}
+}
+
+void IconDes::ImageInsert(const String& name, const Image& m, bool exp)
+{
+	int ii = list.IsCursor() ? list.GetCursor() : 0;
+	if(ii == list.GetCount() - 1)
+		ii = list.GetCount();
+	Slot& c = slot.Insert(ii);
+	c.name = name;
+	c.image = m;
+	c.exp = exp;
+	SyncList();
+	list.SetCursor(ii);
+}
+
+void IconDes::InsertImage()
+{
+	WithImageLayout<TopWindow> dlg;
+	PrepareImageDlg(dlg);
+	do {
+		if(dlg.Run() != IDOK)
+			return;
+	}
+	while(!CheckName(dlg));
+	ImageInsert(~dlg.name, CreateImage(Size(~dlg.cx, ~dlg.cy), Null), dlg.exp);
+}
+
+void IconDes::Duplicate()
+{
+	if(!IsCurrent())
+		return;
+	Slot& c = Current();
+	ImageInsert(c.name, c.image);
+	EditImage();
+}
+
+void IconDes::InsertPaste()
+{
+	Image m = ReadClipboardImage();
+	if(IsNull(m)) {
+		Exclamation("Clipboard does not contain an image.");
+		return;
+	}
+	ImageInsert("", m);
+	EditImage();
+}
+
+FileSel& IconDes::ImgFile()
+{
+	static FileSel sel;
+	ONCELOCK {
+		sel.Type("Image files", "*.png *.bmp *.jpg *.jpeg *.gif");
+		sel.AllFilesType();
+		sel.Multi();
+	}
+	return sel;
+}
+
+int CharFilterImageId(int c)
+{
+	return IsAlNum(c) ? c : '_';
+}
+
+void IconDes::InsertFile()
+{
+	if(!ImgFile().ExecuteOpen()) return;
+	for(int i = 0; i < ImgFile().GetCount(); i++) {
+		String fn = ImgFile()[i];
+		Image m = StreamRaster::LoadFileAny(fn);
+		if(IsNull(m))
+			Exclamation(DeQtf(fn) + " not an image.");
+		ImageInsert(Filter(GetFileTitle(fn), CharFilterImageId), m);
+	}
+}
+
+void IconDes::ListCursor()
+{
+	SyncImage();
+}
+
+void IconDes::EditImage()
+{
+	if(!IsCurrent())
+		return;
+	Slot& c = Current();
+	WithImageLayout<TopWindow> dlg;
+	PrepareImageDlg(dlg);
+	dlg.Breaker(dlg.cx);
+	dlg.Breaker(dlg.cy);
+	Image img = c.image;
+	dlg.cx <<= img.GetWidth();
+	dlg.cy <<= img.GetHeight();
+	dlg.name <<= c.name;
+	dlg.exp <<= c.exp;
+	for(;;) {
+		switch(dlg.Run()) {
+		case IDCANCEL:
+			c.image = img;
+			Reset();
+			return;
+		case IDOK:
+			if(!CheckName(dlg)) break;
+			c.name = ~dlg.name;
+			c.exp = ~dlg.exp;
+			list.Set(0, sFormatImageName(c.name, c.image, c.exp));
+			Reset();
+			return;
+		}
+		c.image = CreateImage(Size(minmax((int)~dlg.cx, 1, 8192), minmax((int)~dlg.cy, 1, 8192)), Null);
+		UPP::Copy(c.image, Point(0, 0), img, img.GetSize());
+		Reset();
+	}
+}
+
+void IconDes::RemoveImage()
+{
+	if(!IsCurrent() || !PromptYesNo("Remove current image?"))
+		return;
+	int ii = list.GetCursor();
+	while(removed.GetCount() > 12)
+		removed.Remove(0);
+	Slot& r = removed.Add();
+	r = slot[ii];
+	if(r.image.GetWidth() <= 128 && r.image.GetHeight() <= 128)
+		r.base_image = Rescale(r.image, Size(16, 16));
+	else
+		r.base_image = IconDesImg::LargeImage();
+	slot.Remove(ii);
+	list.KillCursor();
+	SyncList();
+	if(ii < slot.GetCount())
+		list.SetCursor(ii);
+	else
+		list.GoEnd();
+}
+
+void IconDes::MoveSlot(int d)
+{
+	if(!IsCurrent())
+		return;
+	int c = list.GetCursor();
+	d = c + d;
+	if(d >= 0 && d < slot.GetCount()) {
+		slot.Swap(c, d);
+		SyncList();
+		list.SetCursor(d);
+	}
+}
+
+void IconDes::ListMenu(Bar& bar)
+{
+	bar.Add("Insert image..", IconDesImg::Insert(), THISBACK(InsertImage))
+	   .Key(K_INSERT);
+	bar.Add(IsCurrent(), "Image..", IconDesImg::Edit(), THISBACK(EditImage));
+	bar.Add(IsCurrent(), "Remove image", IconDesImg::Remove(), THISBACK(RemoveImage));
+	bar.Add(IsCurrent(), "Duplicate", IconDesImg::Duplicate(), THISBACK(Duplicate))
+	   .Key(K_CTRL_D);
+	bar.Add("Insert from clipboard", IconDesImg::InsertPaste(), THISBACK(InsertPaste))
+	   .Key(K_ALT_V);
+	bar.Add("Insert from file(s)..", IconDesImg::InsertFile(), THISBACK(InsertFile))
+	   .Key(K_ALT_O);
+	bar.Separator();
+	bar.Add(IsCurrent() && list.GetCursor() > 0, "Move up", IconDesImg::MoveUp(),
+	        THISBACK1(MoveSlot, -1))
+	   .Key(K_ALT|K_CTRL_UP);
+	bar.Add(IsCurrent() && list.GetCursor() < slot.GetCount() - 1, "Move down", IconDesImg::MoveDown(),
+	        THISBACK1(MoveSlot, 1))
+	   .Key(K_ALT|K_CTRL_DOWN);
+	if(removed.GetCount()) {
+		bar.Separator();
+		for(int i = removed.GetCount() - 1; i >= 0; i--) {
+			Slot& r = removed[i];
+			bar.Add("Insert " + sFormatImageName(r.name, r.image, r.exp), r.base_image,
+			        THISBACK1(InsertRemoved, i));
+		}
+	}
+}
+
+void IconDes::Clear()
+{
+	list.Clear();
+	slot.Clear();
+	Reset();
+}
+
+void IconDes::AddImage(const String& name, const Image& image, bool exp)
+{
+	Slot& c = slot.Add();
+	c.name = name;
+	c.image = image;
+	c.exp = exp;
+	list.Add(sFormatImageName(c.name, c.image, c.exp), c.image);
+	list.GoBegin();
+}
+
+int IconDes::GetCount() const
+{
+	return slot.GetCount();
+}
+
+Image IconDes::GetImage(int ii) const
+{
+	const Slot& c = slot[ii];
+	Image m = slot[ii].image;
+	return c.supersampling ? DownSample3x(m) : m;
+}
+
+String IconDes::GetName(int ii) const
+{
+	return slot[ii].name;
+}
+
+bool IconDes::GetExport(int ii) const
+{
+	return slot[ii].exp;
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/IconDes/Paint.cpp b/uppsrc/IconDes/Paint.cpp
new file mode 100644
index 000000000..8a6cc6f4f
--- /dev/null
+++ b/uppsrc/IconDes/Paint.cpp
@@ -0,0 +1,171 @@
+#include "IconDes.h"
+
+NAMESPACE_UPP
+
+#define IMAGECLASS IconDesImg
+#define IMAGEFILE <IconDes/IconDes.iml>
+#include <Draw/iml_source.h>
+
+void IconShow::Paint(Draw& w)
+{
+	Size sz = GetSize();
+	static Color color[] = { White(), WhiteGray(), LtGray(), Gray(), Black(),
+	                         Yellow(), Brown(), Red(), Green(), Blue(), Cyan(), Magenta() };
+	Size isz = image.GetSize();
+	int n = isz.cx ? minmax(sz.cx / isz.cx, 1, __countof(color)) : 1;
+	for(int i = 0; i < n; i++) {
+		int x = i * sz.cx / n;
+		int cx = (i + 1) * sz.cx / n - x;
+		w.DrawRect(x, 0, cx, sz.cy, color[i]);
+		if(isz.cx)
+			w.DrawImage(x + (cx - isz.cx) / 2, (sz.cy - isz.cy) / 2, image);
+	}
+}
+
+void sDrawChRect(Draw& w, int x0, int y, int cx, int cy, bool start = false)
+{
+	w.DrawRect(x0, y, cx, cy, Color(255, 150, 200));
+}
+
+void IconDes::Paint(Draw& w)
+{
+	Size sz = GetSize();
+	if(!IsCurrent()) {
+		w.DrawRect(sz, SColorPaper());
+		return;
+	}
+	const Image& image = Current().image;
+	const Image& selection = Current().selection;
+	Point spos = sb;
+	scroller.Set(spos);
+	Size isz = image.GetSize();
+	bool pastepaint = HasCapture() && IsPasting();
+	if(magnify == 1) {
+		w.DrawRect(sz, SColorPaper());
+		ImageBuffer pb(isz);
+		RGBA c1 = GrayColor(102);
+		RGBA c2 = GrayColor(153);
+		int xn = isz.cx / 4;
+		for(int y = 0; y < isz.cy; y++) {
+			RGBA *b = pb[y];
+			RGBA cc1 = c1;
+			RGBA cc2 = c2;
+			if(y & 4)
+				Swap(cc1, cc2);
+			for(int q = xn; q--;) {
+				b[0] = b[1] = b[2] = b[3] = cc1;
+				Swap(cc1, cc2);
+				b += 4;
+			}
+			while(b < pb[y] + isz.cx)
+				*b++ = cc1;
+		}
+		AlphaBlend(pb, image, image.GetLength());
+		if(!pastepaint)
+			for(int y = 0; y < isz.cy; y++) {
+				const RGBA *m = selection[y];
+				RGBA *t = pb[y];
+				const RGBA *e = m + isz.cx;
+				while(m < e) {
+					if(!m->r)
+						t->r = t->g = t->b = ((t->r + t->g + t->b) >> 2);
+					m++;
+					t++;
+				}
+			}
+		w.DrawImage(-spos.x, -spos.y, pb);
+		m1refresh = Null;
+		if(IsPasting() && IsPasting())
+			DrawFrame(w, Rect(spos, Current().paste_image.GetSize()), LtRed);
+		return;
+	}
+	Point hotspot = image.GetHotSpot();
+	Point spot2 = image.Get2ndSpot();
+	if(!IsHotSpot()) {
+		hotspot = Null;
+		spot2 = Null;
+	}
+	int m = isz.cx * magnify + 1;
+	Point mpos = magnify * spos;
+	for(int y = isz.cy * magnify; y >= 0; y -= magnify)
+		w.DrawRect(-mpos.x, y - mpos.y, m, 1, Black());
+	m = isz.cy * magnify + 1;
+	for(int x = isz.cx * magnify; x >= 0; x -= magnify)
+		w.DrawRect(x - mpos.x, -mpos.y, 1, m, Black());
+	w.DrawRect(isz.cx * magnify - mpos.x + 1, 0, 9999, 9999, SColorPaper());
+	w.DrawRect(0, isz.cy * magnify - mpos.y + 1, 9999, 9999, SColorPaper());
+	int my0 = -magnify * spos.y;
+	int magnify4 = 4 * magnify;
+	int md = (magnify + 1) / 2;
+	int mc = (magnify - 1) / 2;
+	Image masked = Crop(IconDesImg::Masked(), Size(magnify - 1, magnify - 1));
+	for(int y0 = 0; y0 < isz.cy; y0 += 4, my0 += magnify4) {
+		int mx0 = -magnify * spos.x;
+		for(int x0 = 0; x0 < isz.cx; x0 += 4, mx0 += magnify4) {
+			if(w.IsPainting(mx0, my0, magnify4, magnify4)) {
+				int ex = min(x0 + 4, isz.cx);
+				int my = my0;
+				for(int y = y0; y < min(y0 + 4, isz.cy); y++, my += magnify) {
+					const RGBA *s = image[y] + x0;
+					const RGBA *k = selection[y] + x0;
+					const RGBA *pk = y ? selection[y - 1] + x0 : NULL;
+					const RGBA *nk = y + 1 < isz.cy ? selection[y + 1] + x0 : NULL;
+					int mx = mx0;
+					for(int x = x0; x < ex; x++) {
+						if(s->a == 255)
+							w.DrawRect(mx + 1, my + 1, magnify - 1, magnify - 1, *s);
+						else {
+							Color c = StraightColor(*s);
+							Color c1 = Blend(GrayColor(102), c, s->a);
+							w.DrawRect(mx + 1, my + 1, magnify - 1, magnify - 1, c1);
+							Color c2 = Blend(GrayColor(153), c, s->a);
+							w.DrawRect(mx + md, my + 1, mc, mc, c2);
+							w.DrawRect(mx + 1, my + md, mc, mc, c2);
+						}
+						if(!pastepaint)
+							if(!k->r) {
+								w.DrawImage(mx + 1, my + 1, masked);
+								if(x > 0) {
+									if(pk && pk[-1].r)
+										sDrawChRect(w, mx + 1, my + 1, 4, 4);
+									if(k[-1].r)
+										sDrawChRect(w, mx + 1, my + 1, 4, magnify - 1);
+									if(nk && nk[-1].r)
+										sDrawChRect(w, mx + 1, my + magnify - 4, 4, 4, true);
+								}
+								if(pk && pk->r)
+									sDrawChRect(w, mx + 1, my + 1, magnify - 1, 4);
+								if(nk && nk->r)
+									sDrawChRect(w, mx + 1, my + magnify - 4, magnify - 1, 4, true);
+								if(x + 1 < isz.cx) {
+									if(pk && pk[1].r)
+										sDrawChRect(w, mx + magnify - 4, my + 1, 4, 4, true);
+									if(k[1].r)
+										sDrawChRect(w, mx + magnify - 4, my + 1, 4, magnify - 1, true);
+									if(nk && nk[1].r)
+										sDrawChRect(w, mx + magnify - 4, my + magnify - 4, 4, 4);
+								}
+							}
+						if(spot2.x == x && spot2.y == y)
+							w.DrawImage(mx + 1, my + 1, Rescale(IconDesImg::HotSpotB(), magnify - 1, magnify - 1));
+						if(hotspot.x == x && hotspot.y == y)
+							w.DrawImage(mx + 1, my + 1, Rescale(IconDesImg::HotSpotA(), magnify - 1, magnify - 1));
+						s++;
+						k++;
+						mx += magnify;
+						if(pk)
+							pk++;
+						if(nk)
+							nk++;
+					}
+				}
+			}
+		}
+	}
+	if(IsPasting() && !pastepaint)
+		DrawFatFrame(w, Rect(magnify * (Current().pastepos - spos),
+		                     magnify * Current().paste_image.GetSize() + Size(1, 1)),
+		             Color(200, 200, 255), 3);
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/IconDes/RGBACtrl.cpp b/uppsrc/IconDes/RGBACtrl.cpp
new file mode 100644
index 000000000..018e53722
--- /dev/null
+++ b/uppsrc/IconDes/RGBACtrl.cpp
@@ -0,0 +1,192 @@
+#include "IconDes.h"
+
+NAMESPACE_UPP
+
+Color s_stdcolor[] = {
+	Black,
+	Red,
+	Green,
+	Brown,
+	Blue,
+	Magenta,
+	Cyan,
+	Gray,
+	LtGray,
+	LtRed,
+	LtGreen,
+	LtYellow,
+	LtBlue,
+	LtMagenta,
+	LtCyan,
+	Yellow,
+	WhiteGray,
+	White,
+};
+
+Color RGBACtrl::GetColor(int i) const
+{
+	if(i < 18)
+		return s_stdcolor[i];
+	i -= 18;
+	if(i < 18)
+		return GrayColor(255 * (i + 1) / 20);
+	i -= 18;
+	int q = i % 18;
+	i /= 18;
+	Color c = Color(255 * (q < 9 ? q + 1 : 18 - q) / 9,
+	                255 * (i < 6 ? i + 1 : 12 - i) / 6,
+	                q < 9 ? i < 6 ? 0 : 200 : i < 6 ? 150 : 255);
+	return c == White() || c == Yellow() ? Color(c.GetR(), c.GetG() - 1, c.GetB()) : c;
+}
+
+void RGBACtrl::Layout()
+{
+	Size sz = GetSize();
+	int ah = IconDesImg::Alpha().GetHeight() + 20;
+	int th = text.GetStdHeight(text.GetFont());
+	int eh = 4 - 20 - ah - th - 4;
+	int rh = min(sz.cx - (sz.cx >> 3), sz.cy - eh);
+	ramp.BottomPos(0, rh).HSizePos();
+	int y = sz.cy - rh - 4 - ah;
+	alpha.TopPos(y, ah).HSizePos(1, 0);
+	text.TopPos((y -= 4 + th), th).HSizePos(1, 0);
+	cbox.cx = (sz.cx - 3) / 18;
+	cbox.cy = minmax(cbox.cx, 4, 16);
+	int ch = 14 * cbox.cy;
+	cs.x = (sz.cx - 18 * cbox.cx) / 2 + 1;
+	cs.y = (y -= ch + 4);
+	if(subctrl)
+		subctrl->TopPos(0, y - 4).HSizePos(1, 0);
+}
+
+void RGBACtrl::Paint(Draw& w)
+{
+	w.DrawRect(GetSize(), SColorFace);
+	if(alpha.IsMask())
+		return;
+	for(int x = 0; x <= 18; x++)
+		w.DrawRect(x * cbox.cx + cs.x, cs.y, 1, cbox.cy * 14, SColorText());
+	int i = 0;
+	int my = cs.y + 1;
+	w.DrawRect(cs.x, cs.y + 14 * cbox.cy, cbox.cx * 18 + 1, 1, SColorText());
+	Point pp = Null;
+	for(int y = 0; y < 14; y++) {
+		w.DrawRect(cs.x, my - 1, cbox.cx * 18 + 1, 1, SColorText());
+		int mx = cs.x + 1;
+		for(int x = 0; x < 18; x++) {
+			Color c = GetColor(i++);
+			w.DrawRect(mx, my, cbox.cx - 1, cbox.cy - 1, c);
+			if(c == color)
+				pp = Point(mx, my);
+			mx += cbox.cx;
+		}
+		my += cbox.cy;
+	}
+	if(!IsNull(pp)) {
+		Size isz = CtrlImg::wheel_cursor().GetSize();
+		pp = pp + (cbox - isz) / 2;
+		w.DrawImage(pp.x, pp.y, CtrlImg::wheel_cursor(),
+		            Grayscale(color) < 120 ? White() : Black());
+	}
+}
+
+void RGBACtrl::LeftDown(Point p, dword keyflags)
+{
+	int x = (p.x - cs.x) / cbox.cx;
+	int y = (p.y - cs.y) / cbox.cy;
+	if(x >= 0 && x < 18 && y >= 0 && y < 18) {
+		color = GetColor(x + 18 * y);
+		ramp <<= color;
+		alpha.Set(255);
+		alpha.SetColor(color);
+		UpdateActionRefresh();
+		SyncText();
+	}
+}
+
+void RGBACtrl::MouseMove(Point p, dword keyflags)
+{
+	if(keyflags & K_MOUSELEFT)
+		LeftDown(p, keyflags);
+}
+
+void RGBACtrl::SyncText()
+{
+	RGBA x = Get();
+	text <<= Format("RGBA(%3d, %3d, %3d, %3d)", (int)x.r, (int)x.g, (int)x.b, (int)x.a);
+}
+
+void RGBACtrl::Ramp()
+{
+	color = ~ramp;
+	alpha.SetColor(color);
+	UpdateActionRefresh();
+	SyncText();
+}
+
+void RGBACtrl::Alpha()
+{
+	SyncText();
+	UpdateAction();
+}
+
+
+void RGBACtrl::MaskSet(int a)
+{
+	alpha.Set(a);
+	UpdateRefresh();
+	SyncText();
+}
+
+void RGBACtrl::Set(RGBA c)
+{
+	Unmultiply(&c, &c, 1);
+	color = StraightColor(c);
+	ramp <<= color;
+	alpha.SetColor(color);
+	MaskSet(c.a);
+}
+
+RGBA RGBACtrl::Get() const
+{
+	RGBA c = color;
+	c.a = alpha.Get();
+	if(alpha.IsMask())
+		c.r = c.g = c.b = c.a;
+	Premultiply(&c, &c, 1);
+	return c;
+}
+
+void RGBACtrl::Mask(bool b)
+{
+	alpha.Mask(b);
+	ramp.Show(!b);
+	Refresh();
+}
+
+void RGBACtrl::SubCtrl(Ctrl *c)
+{
+	if(subctrl)
+		subctrl->Remove();
+	subctrl = c;
+	if(c)
+		Add(*c);
+	Layout();
+}
+
+RGBACtrl::RGBACtrl()
+{
+	color = Black();
+	BackPaint();
+	Add(ramp);
+	ramp <<= THISBACK(Ramp);
+	Add(alpha);
+	alpha <<= THISBACK(Alpha);
+	text.SetFont(Courier(11));
+	text.NoWantFocus();
+	text.SetReadOnly();
+	Add(text);
+	SyncText();
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/IconDes/init b/uppsrc/IconDes/init
new file mode 100644
index 000000000..635965e5d
--- /dev/null
+++ b/uppsrc/IconDes/init
@@ -0,0 +1,6 @@
+#ifndef _IconDes_icpp_init_stub
+#define _IconDes_icpp_init_stub
+#include "CtrlLib/init"
+#include "plugin\gif/init"
+#include "plugin\jpg/init"
+#endif
diff --git a/uppsrc/MySql/AUTHORS b/uppsrc/MySql/AUTHORS
new file mode 100644
index 000000000..f782e5b62
--- /dev/null
+++ b/uppsrc/MySql/AUTHORS
@@ -0,0 +1,2 @@
+Mirek Fidler <cxl@ntllib.org>
+Tomas Rylek  <rylek@volny.cz>
\ No newline at end of file
diff --git a/uppsrc/MySql/COPYING b/uppsrc/MySql/COPYING
new file mode 100644
index 000000000..33aa39102
--- /dev/null
+++ b/uppsrc/MySql/COPYING
@@ -0,0 +1,30 @@
+Copyright (C) 2005 Mirek Fidler, Tomas Rylek and various contributors (see AUTHORS)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to
+deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies of the Software and its Copyright notices. In addition publicly
+documented acknowledgment must be given that this software has been used if no
+source code of this software is made available publicly. This includes
+acknowledgments in either Copyright notices, Manuals, Publicity and Marketing
+documents or any documentation provided with any product containing this
+software. This License does not apply to any software that links to the
+libraries provided by this software (statically or dynamically), but only to
+the software provided.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+-----------
+
+Please see the COPYING.PLAIN for a plain-english explanation of this notice
+and it's intent.
diff --git a/uppsrc/MySql/COPYING-PLAIN b/uppsrc/MySql/COPYING-PLAIN
new file mode 100644
index 000000000..770a8132f
--- /dev/null
+++ b/uppsrc/MySql/COPYING-PLAIN
@@ -0,0 +1,33 @@
+Plain English Copyright Notice
+
+This file is not intended to be the actual License. The reason this file
+exists is that we here are programmers and engineers. We aren't lawyers. We
+provide licenses that we THINK say the right things, but we have our own
+intentions at heart. This is a plain-english explanation of what those
+intentions are, and if you follow them you will be within the "spirit" of
+the license.
+
+The intent is for us to enjoy writing software that is useful to us (the
+AUTHORS) and allow others to use it freely and also benefit from the work we
+put into making it. We don't want to restrict others using it. They should
+not *HAVE* to make the source code of the applications they write that
+simply link to these libraries (be that statically or dynamically), or for
+them to be limited as to what license they choose to use (be it open, closed
+or anything else). But we would like to know you are using these libraries.
+We simply would like to know that it has been useful to someone. This is why
+we ask for acknowledgement of some sort.
+
+You can do what you want with the source of this software - it doesn't
+matter. We still have it here for ourselves and it is open and free to use
+and download and play with. It can't be taken away. We don't really mind what
+you do with the source to your software. We would simply like to know that
+you are using it - especially if it makes it to a commerical product. If you
+simply e-mail all the AUTHORS (see COPYING and AUTHORS files) telling us, and
+then make sure you include a paragraph or page in the manual or in the "About.."
+box for the product with the copyright notice and state that you used this
+software, we will be very happy. If you want to contribute back modifications
+and fixes you may have made we will welcome those too with open arms (generally).
+If you want help with changes needed, ports needed or features to be added,
+arrangements can be easily made with some dialogue.
+
+Mirek Fidler <cxl@ntllib.org>
diff --git a/uppsrc/MySql/MySql.cpp b/uppsrc/MySql/MySql.cpp
new file mode 100644
index 000000000..4f5f2fc69
--- /dev/null
+++ b/uppsrc/MySql/MySql.cpp
@@ -0,0 +1,466 @@
+#include "MySql.h"
+
+#ifndef flagNOMYSQL
+
+NAMESPACE_UPP
+
+class MySqlConnection : public SqlConnection {
+protected:
+	virtual void        SetParam(int i, const Value& r);
+	virtual bool        Execute();
+	virtual int         GetRowsProcessed() const;
+	virtual bool        Fetch();
+	virtual void        GetColumn(int i, Ref f) const;
+	virtual void        Cancel();
+	virtual Value       GetInsertedId() const;
+	virtual SqlSession& GetSession() const;
+	virtual String      GetUser() const;
+	virtual String      ToString() const;
+
+private:
+	MySqlSession&  session;
+	MYSQL         *mysql;
+	Vector<String> param;
+	MYSQL_RES     *result;
+	MYSQL_ROW      row;
+	unsigned long *len;
+	int            rows;
+	int            lastid;
+
+	String         MakeQuery() const;
+	void           FreeResult();
+
+public:
+	MySqlConnection(MySqlSession& session, MYSQL *mysql);
+	virtual ~MySqlConnection() { Cancel(); }
+};
+
+bool MySqlSession::IsOpen() const { return mysql; }
+
+static const char *sEmpNull(const char *s) {
+	return s && *s == '\0' ? NULL : s;
+}
+
+bool MySqlSession::Connect(const char *user, const char *password, const char *database,
+                           const char *host, int port, const char *socket) {
+	mysql = mysql_init((MYSQL*) 0);
+	if(mysql && mysql_real_connect(mysql, sEmpNull(host), sEmpNull(user),
+		                           sEmpNull(password), sEmpNull(database), port,
+								   sEmpNull(socket), 0)) {
+		Sql sql(*this);
+		username = sql.Select("substring_index(USER(),'@',1)");
+		return true;
+	}
+	Close();
+	return false;
+}
+
+inline static const char *EmpNull(const String& s)
+{
+	return *s ? (const char *)s : 0;
+}
+
+bool MySqlSession::Open(const char *connect) {
+	String user, pwd, socket;
+	String database = Null;
+	String host = Null;
+	int port = MYSQL_PORT;
+	const char *p = connect, *b;
+	for(b = p; *p && *p != '/' && *p != '@'; p++)
+		;
+	user = String(b, p);
+	if(*p == '/')
+	{
+		for(b = ++p; *p && *p != '@'; p++)
+			;
+		pwd = String(b, p);
+	}
+	if(*p == '@')
+	{
+		for(b = ++p; *p && *p != '/' && *p != ':' && *p != ','; p++)
+			;
+		if(*p == '/' || *p == 0)
+		{
+			database = String(b, p);
+			if(*p)
+				p++;
+			b = p;
+		}
+		while(*p && *p != ':' && *p != ',')
+			p++;
+		host = String(b, p);
+		if(*p == ':')
+		{ // port
+			if(!IsDigit(*++p))
+				throw Exc("Port number expected.");
+			port = stou(p, &p);
+		}
+		if(*p == ',') // socket
+			socket = p + 1;
+	}
+	return Connect(EmpNull(user), EmpNull(pwd),
+		EmpNull(database), EmpNull(host), port, EmpNull(socket));
+}
+
+void MySqlSession::Close() {
+	if(mysql) {
+		mysql_close(mysql);
+		mysql = NULL;
+	}
+}
+
+void MySqlSession::Begin()
+{
+	static const char btrans[] = "start transaction";
+	if(trace)
+		*trace << btrans << ";\n";
+	if(mysql_query(mysql, btrans))
+		SetError(mysql_error(mysql), btrans);
+}
+
+void MySqlSession::Commit()
+{
+	static const char ctrans[] = "commit";
+	if(trace)
+		*trace << ctrans << ";\n";
+	if(mysql_query(mysql, ctrans))
+		SetError(mysql_error(mysql), ctrans);
+}
+
+void MySqlSession::Rollback()
+{
+	static const char rtrans[] = "rollback";
+	if(trace)
+		*trace << rtrans << ";\n";
+	if(mysql_query(mysql, rtrans))
+		SetError(mysql_error(mysql), rtrans);
+}
+
+static Vector<String> FetchList(Sql& cursor, bool upper = false)
+{
+	Vector<String> out;
+	String s;
+	while(cursor.Fetch(s))
+		out.Add(upper ? ToUpper(s) : s);
+	return out;
+}
+
+Vector<String> MySqlSession::EnumUsers()
+{
+	Vector<String> out;
+	Sql cursor(*this);
+	if(Select(SqlId("USER")).From(SqlId("MYSQL.USER")).Execute(cursor))
+		out = FetchList(cursor);
+	return out;
+}
+
+Vector<String> MySqlSession::EnumDatabases()
+{
+	Vector<String> out;
+	Sql cursor(*this);
+	if(cursor.Execute("show databases"))
+		out = FetchList(cursor); // 06-09-12 cxl: was false; In Linux, names are case sensitive
+	return out;
+}
+
+Vector<String> MySqlSession::EnumTables(String database)
+{
+	Vector<String> out;
+	Sql cursor(*this);
+	if(cursor.Execute("show tables from " + database))
+		out = FetchList(cursor); // 06-09-12 cxl: was false; In Linux, names are case sensitive
+	return out;
+}
+
+SqlConnection *MySqlSession::CreateConnection() {
+	return new MySqlConnection(*this, mysql);
+}
+
+MySqlConnection::MySqlConnection(MySqlSession& session, MYSQL *mysql)
+  : session(session), mysql(mysql) {
+	result = NULL;
+	lastid = 0;
+}
+
+void MySqlConnection::SetParam(int i, const Value& r) {
+	String p;
+	if(IsNull(r))
+		p = "NULL";
+	else
+		switch(r.GetType()) {
+		case WSTRING_V:
+		case STRING_V: {
+				String v = r;
+				StringBuffer b(v.GetLength() * 2 + 3);
+				char *q = b;
+				*q = '\"';
+				int n = mysql_real_escape_string(mysql, q + 1, v, v.GetLength());
+				q[1 + n] = '\"';
+				b.SetCount(2 + n); //TODO - check this fix
+				p = b;
+			}
+			break;
+		case BOOL_V:
+		case INT_V:
+			p = Format("%d", int(r));
+			break;
+		case DOUBLE_V:
+			p = FormatDouble(double(r), 20);
+			break;
+		case DATE_V: {
+				Date d = r;
+				p = Format("\'%04d-%02d-%02d\'", d.year, d.month, d.day);
+			}
+			break;
+		case TIME_V: {
+				Time t = r;
+				p = Format("\'%04d-%02d-%02d %02d:%02d:%02d\'",
+						   t.year, t.month, t.day, t.hour, t.minute, t.second);
+			}
+			break;
+		default:
+			NEVER();
+		}
+	param.At(i, p);
+}
+
+bool MySqlConnection::Execute() {
+	String query;
+	int pi = 0;
+	const char *s = statement;
+	while(s < statement.End())
+		if(*s == '\'' || *s == '\"')
+			s = MySqlReadString(s, query);
+		else {
+			if(*s == '?')
+				query.Cat(param[pi++]);
+			else
+				query.Cat(*s);
+			s++;
+		}
+	Cancel();
+	Stream *trace = session.GetTrace();
+	dword time;
+	if(session.IsTraceTime())
+		time = GetTickCount();
+	if(mysql_query(mysql, query)) {
+		session.SetError(mysql_error(mysql), query);
+		return false;
+	}
+	result = mysql_store_result(mysql);
+/*	if(trace) { // cxl 2005-5-2, duplicated traces...
+		if(session.IsTraceTime())
+			*trace << Format("--------------\nexec %d ms:\n", msecs(time));
+		*trace << ToString() << '\n';
+	}*/
+	if(result) {
+		rows = (int)mysql_affected_rows(mysql);
+		int fields = mysql_num_fields(result);
+		info.SetCount(fields);
+		for(int i = 0; i < fields; i++) {
+			MYSQL_FIELD *field = mysql_fetch_field_direct(result, i);
+			SqlColumnInfo& f = info[i];
+			f.name = field->name;
+			switch(field->type) {
+			case FIELD_TYPE_TINY:
+			case FIELD_TYPE_SHORT:
+			case FIELD_TYPE_LONG:
+			case FIELD_TYPE_INT24:
+				f.type = INT_V;
+				break;
+			case FIELD_TYPE_LONGLONG:
+			case FIELD_TYPE_DECIMAL:
+			case FIELD_TYPE_FLOAT:
+			case FIELD_TYPE_DOUBLE:
+				f.type = DOUBLE_V;
+				break;
+			case FIELD_TYPE_DATE:
+				f.type = DATE_V;
+				break;
+			case FIELD_TYPE_DATETIME:
+				f.type = TIME_V;
+				break;
+			default:
+				f.type = STRING_V;
+			}
+			f.width = field->length;
+			f.scale = f.precision = 0;
+		}
+	}
+	else {
+		lastid = (int)mysql_insert_id(mysql);
+		if(lastid) {
+			SqlColumnInfo& f = info.Add();
+			f.width = f.scale = f.precision = 0;
+			f.type = DOUBLE_V;
+			f.name = "LAST_INSERT_ID";
+			rows = 1;
+		}
+	}
+	return true;
+}
+
+int  MySqlConnection::GetRowsProcessed() const {
+	return rows;
+}
+
+Value MySqlConnection::GetInsertedId() const
+{
+	return lastid;
+}
+
+bool MySqlConnection::Fetch() {
+	if(result) {
+		row = mysql_fetch_row(result);
+		if(row) {
+			len = mysql_fetch_lengths(result);
+			return true;
+		}
+	}
+	else
+	if(lastid && rows > 0) {
+		rows--;
+		return true;
+	}
+	FreeResult();
+	return false;
+}
+
+// 0123456789012345678
+// YYYY-MM-DD HH-MM-SS
+
+static Date sDate(const char *s) {
+	return Date(atoi(s), atoi(s + 5), atoi(s + 8));
+}
+
+void MySqlConnection::GetColumn(int i, Ref f) const {
+	if(lastid) {
+		f = lastid;
+		return;
+	}
+	const char *s = row[i];
+	if(s == NULL)
+		f = Null;
+	else {
+		switch(info[i].type) {
+		case INT_V:
+			f = atoi(s);
+			break;
+		case DOUBLE_V:
+			f = atof(s);
+			break;
+		case DATE_V:
+			f = Value(sDate(s));
+			break;
+		case TIME_V: {
+				Time t = ToTime(sDate(s));
+				t.hour = atoi(s + 11);
+				t.minute = atoi(s + 14);
+				t.second = atoi(s + 17);
+				f = Value(t);
+			}
+			break;
+		default:
+			f = Value(String(s, len[i]));
+			break;
+		}
+	}
+}
+
+void MySqlConnection::FreeResult() {
+	lastid = 0;
+	if(result) {
+		mysql_free_result(result);
+		result = NULL;
+	}
+}
+
+void MySqlConnection::Cancel() {
+	param.Clear();
+	info.Clear();
+	rows = 0;
+	FreeResult();
+}
+
+SqlSession& MySqlConnection::GetSession() const { return session; }
+String      MySqlConnection::GetUser() const    { return session.GetUser(); }
+String      MySqlConnection::ToString() const   { return statement; }
+
+String MySqlTextType(int n) {
+	return n < 256 ? Format("varchar(%d)", n) : String("text");
+}
+
+const char *MySqlReadString(const char *s, String& stmt) {
+	stmt.Cat(*s);
+	int c = *s++;
+	for(;;) {
+		if(*s == '\0') break;
+		else
+		if(*s == '\'' && s[1] == '\'') {
+			stmt.Cat('\'');
+			s += 2;
+		}
+//		else
+//		if(*s == '\"' && s[1] == '\"') {
+//			stmt.Cat('\"');
+//			s += 2;
+//		}
+		else
+		if(*s == c) {
+			stmt.Cat(c);
+			s++;
+			break;
+		}
+		else
+		if(*s == '\\') {
+			stmt.Cat('\\');
+			if(*++s)
+				stmt.Cat(*s++);
+		}
+		else
+			stmt.Cat(*s++);
+	}
+	return s;
+}
+
+bool MySqlPerformScript(const String& txt, StatementExecutor& se, Gate2<int, int> progress_canceled) {
+	const char *text = txt;
+	for(;;) {
+		String stmt;
+		while(*text <= 32 && *text > 0) text++;
+		if(*text == '\0') break;
+		for(;;) {
+			if(*text == '\0')
+				break;
+			if(*text == ';')
+				break;
+			else
+			if(*text == '\'')
+				text = MySqlReadString(text, stmt);
+			else
+			if(*text == '\"')
+				text = MySqlReadString(text, stmt);
+			else
+				stmt.Cat(*text++);
+		}
+		if(progress_canceled(text - txt.Begin(), txt.GetLength()))
+			return false;
+		if(!se.Execute(stmt))
+			return false;
+		if(*text) text++;
+	}
+	return true;
+}
+
+bool MySqlUpdateSchema(const SqlSchema& sch, int i, StatementExecutor& se) {
+	if(sch.UpdateNormalFile(i)) {
+		MySqlPerformScript(LoadFile(sch.NormalFileName(i + 1)), se);
+		sch.UpdateNormalFile(i + 1);
+		return MySqlPerformScript(sch.Script(i), se);
+	}
+	return true;
+}
+
+END_UPP_NAMESPACE
+
+#endif
diff --git a/uppsrc/MySql/MySql.h b/uppsrc/MySql/MySql.h
new file mode 100644
index 000000000..fe1680ba0
--- /dev/null
+++ b/uppsrc/MySql/MySql.h
@@ -0,0 +1,70 @@
+#ifndef __mysql_h__
+#define __mysql_h__
+
+#ifndef flagNOMYSQL
+
+#include <Sql/Sql.h>
+
+#ifdef PLATFORM_WIN32
+#ifndef IPPROTO_IP
+#include <winsock2.h>
+#endif
+#include <MySql.h>
+#endif
+
+#ifdef PLATFORM_POSIX
+#include </usr/include/mysql/mysql.h>
+#endif
+
+NAMESPACE_UPP
+
+const char *MySqlReadString(const char *s, String& stmt);
+
+bool MySqlPerformScript(const String& text, StatementExecutor& se, Gate2<int, int> progress_canceled = false);
+#ifdef NOAPPSQL
+bool MySqlUpdateSchema(const SqlSchema& sch, int i, StatementExecutor& se);
+#else
+bool MySqlUpdateSchema(const SqlSchema& sch, int i, StatementExecutor& se = SQLStatementExecutor());
+#endif
+
+String MySqlTextType(int n);
+
+class MySqlSession : public SqlSession {
+public:
+	virtual bool           IsOpen() const;
+	virtual RunScript      GetRunScript() const             { return &MySqlPerformScript; }
+	virtual Vector<String> EnumUsers();
+	virtual Vector<String> EnumDatabases();
+	virtual Vector<String> EnumTables(String database);
+
+protected:
+	virtual SqlConnection *CreateConnection();
+
+private:
+	MYSQL *mysql;
+	String username;
+	double lastid;
+
+public:
+	bool Connect(const char *user = NULL, const char *password = NULL, const char *database = NULL,
+		         const char *host = NULL, int port = MYSQL_PORT, const char *socket = NULL);
+	bool Open(const char *connect);
+	void Close();
+
+	String   GetUser()   { return username; }
+
+	operator MYSQL *()   { return mysql; }
+
+	virtual void   Begin();
+	virtual void   Commit();
+	virtual void   Rollback();
+
+	MySqlSession()       { mysql = NULL; Dialect(MY_SQL); }
+	~MySqlSession()      { Close(); }
+};
+
+END_UPP_NAMESPACE
+
+#endif
+
+#endif
diff --git a/uppsrc/MySql/MySql.upp b/uppsrc/MySql/MySql.upp
new file mode 100644
index 000000000..7acb04ed1
--- /dev/null
+++ b/uppsrc/MySql/MySql.upp
@@ -0,0 +1,40 @@
+description "MySQL interface";
+
+acceptflags
+	NOMYSQL,
+	MYSQLDLL;
+
+uses
+	Sql,
+	plugin\z;
+
+library(WIN32 !NOMYSQL MSC DEBUG !MYSQLDLL) debug/mysqlclient.lib;
+
+library(WIN32 !NOMYSQL MSC) ws2_32.lib;
+
+library(WIN32 GCC !NOMYSQL) mysql;
+
+library(WIN32 !NOMYSQL MSC !DEBUG !MYSQLDLL) opt/mysqlclient.lib;
+
+library(LINUX) "mysqlclient ssl";
+
+library(FREEBSD) mysqlclient;
+
+library(WIN32 !NOMYSQL MSC DEBUG MYSQLDLL) debug/libmysql.lib;
+
+library(WIN32 !NOMYSQL MSC !DEBUG MYSQLDLL) opt/libmysql.lib;
+
+link(DEBUG SO) /nodefaultlib:LIBCD;
+
+link(SHARED SO) /nodefaultlib:LIBCMT;
+
+link(FREEBSD) -L/usr/local/lib/mysql;
+
+file
+	MySql.h,
+	MySqlSchema.h,
+	MySql.cpp,
+	Info readonly separator,
+	COPYING,
+	COPYING-PLAIN,
+	AUTHORS;
diff --git a/uppsrc/MySql/MySqlSchema.h b/uppsrc/MySql/MySqlSchema.h
new file mode 100644
index 000000000..30ff4ef9f
--- /dev/null
+++ b/uppsrc/MySql/MySqlSchema.h
@@ -0,0 +1,94 @@
+#define BOOL(x)                    COLUMN("bool", int, x, 0, 0)
+#define BOOL_ARRAY(x, items)       COLUMN_ARRAY("bool", int, x, 0, 0, items)
+#define BOOL_(x)                   COLUMN_("bool", int, x, 0, 0)
+#define BOOL_ARRAY_(x, items)      COLUMN_ARRAY_("bool", int, x, 0, 0, items)
+
+#define INT(x)                     COLUMN("integer", int, x, 0, 0)
+#define INT_ARRAY(x, items)        COLUMN_ARRAY("integer", int, x, 0, 0, items)
+#define INT_(x)                    COLUMN_("integer", int, x, 0, 0)
+#define INT_ARRAY_(x, items)       COLUMN_ARRAY_("integer", int, x, 0, 0, items)
+
+#define INT64(x)                   COLUMN("bigint", int64, x, 0, 0)
+#define INT64_ARRAY(x, items)      COLUMN_ARRAY("bigint", int64, x, 0, 0, items)
+#define INT64_(x)                  COLUMN_("bigint", int64, x, 0, 0)
+#define INT64_ARRAY_(x, items)     COLUMN_ARRAY_("bigint", int64, x, 0, 0, items)
+
+#define DOUBLE(x)                  COLUMN("real", double, x, 0, 0)
+#define DOUBLE_ARRAY(x, items)     COLUMN_ARRAY("real", double, x, 0, 0, items)
+#define DOUBLE_(x)                 COLUMN_("real", double, x, 0, 0)
+#define DOUBLE_ARRAY_(x, items)    COLUMN_ARRAY_("real", double, x, 0, 0, items)
+
+#define DATE(x)                    COLUMN("date", Date, x, 0, 0)
+#define DATE_ARRAY(x, items)       COLUMN_ARRAY("date", Date, x, 0, 0, items)
+#define DATE_(x)                   COLUMN_("date", Date, x, 0, 0)
+#define DATE_ARRAY_(x, items)      COLUMN_ARRAY_("date", Date, x, 0, 0, items)
+
+#define TIME(x)                    COLUMN("datetime", Time, x, 0, 0)
+#define TIME_ARRAY(x, items)       COLUMN_ARRAY("datetime", Time, x, 0, 0, items)
+#define TIME_(x)                   COLUMN_("datetime", Time, x, 0, 0)
+#define TIME_ARRAY_(x, items)      COLUMN_ARRAY_("datetime", Time, x, 0, 0, items)
+
+#define STRING(x, n)               COLUMN(MySqlTextType(n), String, x, n, 0)
+#define STRING_ARRAY(x, n, items)  COLUMN_ARRAY(MySqlTextType(n), String, x, n, 0, items)
+#define STRING_(x, n)              COLUMN_(MySqlTextType(n), String, x, n, 0)
+#define STRING_ARRAY_(x, n, items) COLUMN_ARRAY_(MySqlTextType(n), String, x, n, 0, items)
+
+#define PRIMARY_KEY                INLINE_ATTRIBUTE("primary key")
+#define AUTO_INCREMENT             INLINE_ATTRIBUTE("auto_increment")
+#define KEY                        INLINE_ATTRIBUTE("key")
+#define NOT_NULL                   INLINE_ATTRIBUTE("not null")
+
+#define INDEX                      ATTRIBUTE("alter table @t add index IDX_@x (@c);", \
+                                             "alter table @t drop index IDX_@x;")
+#define UNIQUE                     ATTRIBUTE("alter table @t add unique UNQ_@x (@c);", \
+	                                         "alter table @t drop index UNQ_@x;")
+#define REFERENCES(x)              ATTRIBUTE("alter table @t add (constraint FK_@x foreign key "\
+                                             "(@c) references " #x ");",\
+                                             "alter table @t drop constraint FK_@x;")
+
+#define TIMESTAMP(ts)              SCHEMA("-- " ts "\n\n", NULL)
+
+#define COMMENT(txt)               SCHEMA("-- " #txt "\n", NULL)
+
+#define INNODB                     TABLE_SUFFIX(" type=InnoDB")
+
+
+#include <Sql/sch_model.h>
+
+
+#undef INT
+#undef INT_ARRAY
+#undef INT_
+#undef INT_ARRAY_
+
+#undef DOUBLE
+#undef DOUBLE_ARRAY
+#undef DOUBLE_
+#undef DOUBLE_ARRAY_
+
+#undef DATE
+#undef DATE_ARRAY
+#undef DATE_
+#undef DATE_ARRAY_
+
+#undef DATETIME
+#undef DATETIME_ARRAY
+#undef DATETIME_
+#undef DATETIME_ARRAY_
+
+#undef STRING
+#undef STRING_ARRAY
+#undef STRING_
+#undef STRING_ARRAY_
+
+#undef PRIMARY_KEY
+#undef AUTO_INCREMENT
+#undef KEY
+#undef NOT_NULL
+
+#undef INDEX
+
+#undef UNIQUE
+
+#undef TIMESTAMP
+#undef COMMENT
diff --git a/uppsrc/Ole/AUTHORS b/uppsrc/Ole/AUTHORS
new file mode 100644
index 000000000..f782e5b62
--- /dev/null
+++ b/uppsrc/Ole/AUTHORS
@@ -0,0 +1,2 @@
+Mirek Fidler <cxl@ntllib.org>
+Tomas Rylek  <rylek@volny.cz>
\ No newline at end of file
diff --git a/uppsrc/Ole/COPYING b/uppsrc/Ole/COPYING
new file mode 100644
index 000000000..33aa39102
--- /dev/null
+++ b/uppsrc/Ole/COPYING
@@ -0,0 +1,30 @@
+Copyright (C) 2005 Mirek Fidler, Tomas Rylek and various contributors (see AUTHORS)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to
+deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies of the Software and its Copyright notices. In addition publicly
+documented acknowledgment must be given that this software has been used if no
+source code of this software is made available publicly. This includes
+acknowledgments in either Copyright notices, Manuals, Publicity and Marketing
+documents or any documentation provided with any product containing this
+software. This License does not apply to any software that links to the
+libraries provided by this software (statically or dynamically), but only to
+the software provided.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+-----------
+
+Please see the COPYING.PLAIN for a plain-english explanation of this notice
+and it's intent.
diff --git a/uppsrc/Ole/COPYING-PLAIN b/uppsrc/Ole/COPYING-PLAIN
new file mode 100644
index 000000000..770a8132f
--- /dev/null
+++ b/uppsrc/Ole/COPYING-PLAIN
@@ -0,0 +1,33 @@
+Plain English Copyright Notice
+
+This file is not intended to be the actual License. The reason this file
+exists is that we here are programmers and engineers. We aren't lawyers. We
+provide licenses that we THINK say the right things, but we have our own
+intentions at heart. This is a plain-english explanation of what those
+intentions are, and if you follow them you will be within the "spirit" of
+the license.
+
+The intent is for us to enjoy writing software that is useful to us (the
+AUTHORS) and allow others to use it freely and also benefit from the work we
+put into making it. We don't want to restrict others using it. They should
+not *HAVE* to make the source code of the applications they write that
+simply link to these libraries (be that statically or dynamically), or for
+them to be limited as to what license they choose to use (be it open, closed
+or anything else). But we would like to know you are using these libraries.
+We simply would like to know that it has been useful to someone. This is why
+we ask for acknowledgement of some sort.
+
+You can do what you want with the source of this software - it doesn't
+matter. We still have it here for ourselves and it is open and free to use
+and download and play with. It can't be taken away. We don't really mind what
+you do with the source to your software. We would simply like to know that
+you are using it - especially if it makes it to a commerical product. If you
+simply e-mail all the AUTHORS (see COPYING and AUTHORS files) telling us, and
+then make sure you include a paragraph or page in the manual or in the "About.."
+box for the product with the copyright notice and state that you used this
+software, we will be very happy. If you want to contribute back modifications
+and fixes you may have made we will welcome those too with open arms (generally).
+If you want help with changes needed, ports needed or features to be added,
+arrangements can be easily made with some dialogue.
+
+Mirek Fidler <cxl@ntllib.org>
diff --git a/uppsrc/Ole/Ctrl/Ctrl.upp b/uppsrc/Ole/Ctrl/Ctrl.upp
new file mode 100644
index 000000000..274e46b38
--- /dev/null
+++ b/uppsrc/Ole/Ctrl/Ctrl.upp
@@ -0,0 +1,17 @@
+uses
+	Ole,
+	CtrlCore;
+
+file
+	OleCtrl.h,
+	util.cpp,
+	control.cpp,
+	ocx.def;
+
+mainconfig
+	"" = "DLL";
+
+custom() "idl",
+	"midl /newtlb $(!/I) /h \"$(DIR)/$(TITLE)_idl.h\" /iid \"$(DIR)/$(TITLE"
+	")_idl.cpp\" /tlb \"$(DIR)/$(TITLE).tlb\" \"$(PATH)\"\r\n",
+	"$(DIR)/$(TITLE)_idl.h\r\n$(DIR)/$(TITLE).tlb\r\n";
diff --git a/uppsrc/Ole/Ctrl/OleCtrl.h b/uppsrc/Ole/Ctrl/OleCtrl.h
new file mode 100644
index 000000000..b26be210d
--- /dev/null
+++ b/uppsrc/Ole/Ctrl/OleCtrl.h
@@ -0,0 +1,824 @@
+#ifndef _Ole_Ctrl_OleCtrl_h_
+#define _Ole_Ctrl_OleCtrl_h_
+
+#include <CtrlCore/CtrlCore.h>
+#include <Ole/Ole.h>
+
+NAMESPACE_UPP
+
+#define OCXLOG RLOG    // redefine to RLOG if you want logs in retail versions
+
+#ifdef _DEBUG
+#define LOG_SYSOCXS 1 // 1 = log system calls (DllCanUnloadNow, DllGetClassObject)
+#define LOG_METHODS 1 // 1 = log method calls
+#define LOG_CREATES 1 // 1 = log instance creations & destructions
+#define LOG_QUERIES 2 // 1 = log failed QueryInterface's
+//                    // 2 = log all QueryInterface's
+//                    // 3 = dump interface map whenever Query fails
+#define LOG_PERSIST 1 // 1 = log saves / loads
+#define LOG_RESULTS 2 // 1 = log error results
+//                    // 2 = log all results
+#define LOG_ADDREFS 1 // 1 = log AddRef's / Releases
+#define LOG_INVOKES 1 // 1 = log IDispatch::Invoke
+#else
+#define LOG_SYSOCXS 1
+#define LOG_METHODS 0
+#define LOG_CREATES 0
+#define LOG_QUERIES 0
+#define LOG_PERSIST 0
+#define LOG_RESULTS 0
+#define LOG_ADDREFS 0
+#define LOG_INVOKES 0
+#endif
+
+#if LOG_SYSOCXS >= 1
+#define LOGSYSOCX(x) OCXLOG(x)
+#else
+#define LOGSYSOCX(x)
+#endif
+
+#if LOG_METHODS >= 1
+#define LOGMETHOD(x) OCXLOG(x)
+#else
+#define LOGMETHOD(x)
+#endif
+
+#if LOG_CREATES >= 1
+#define LOGCREATE(x) OCXLOG(x)
+#else
+#define LOGCREATE(x)
+#endif
+
+#if LOG_QUERIES >= 1
+#define LOGQUERY(x) OCXLOG(x)
+#else
+#define LOGQUERY(x)
+#endif
+
+#if LOG_PERSIST >= 1
+#define LOGPERSIST(x) OCXLOG(x)
+#else
+#define LOGPERSIST(x)
+#endif
+
+#if LOG_RESULTS >= 2
+#define LOGRESULT(x) LogResult((x))
+#elif LOG_RESULTS >= 1
+#define LOGRESULT(x) LogError((x))
+#else
+#define LOGRESULT(x) (x)
+#endif
+
+#if LOG_INVOKES >= 1
+#define LOGINVOKE(x) OCXLOG(x)
+#else
+#define LOGINVOKE(x)
+#endif
+
+typedef void (*InitProc)();
+InitProc& LateInitProc();
+InitProc& LateExitProc();
+
+void DoLateInit();
+void DoLateExit();
+
+#define OCX_APP_MAIN \
+void _DllMainAppInit(); \
+\
+static void _DllMainLateExit() \
+{ \
+	RLOGBLOCK("_DllMainLateExit"); \
+	Ctrl::ExitWin32(); \
+} \
+\
+static void _DllMainLateInit() \
+{ \
+	RLOGBLOCK("_DllMainLateInit"); \
+	RLOG("Ctrl::InitWin32"); \
+	Ctrl::InitWin32(AppGetHandle()); \
+	RLOG("AppInitEnvironment"); \
+	AppInitEnvironment__(); \
+	RLOG("DllMainAppInit"); \
+	_DllMainAppInit(); \
+	LateExitProc() = &_DllMainLateExit; \
+} \
+\
+BOOL WINAPI DllMain(HINSTANCE hinstDll, DWORD fdwReason, LPVOID lpReserved) \
+{ \
+	if(fdwReason == DLL_PROCESS_ATTACH) { \
+		AppSetHandle(hinstDll); \
+		SetVppLogName(ForceExt(GetExeFilePath(), ".log")); \
+	} \
+	RLOG("DllMain(" << FormatIntHex(hinstDll) << ", reason = " << (int)fdwReason << ")"); \
+	if(fdwReason == DLL_PROCESS_ATTACH) { \
+		LateInitProc() = &_DllMainLateInit; \
+	} \
+	else if(fdwReason == DLL_PROCESS_DETACH) { \
+		DoLateExit(); \
+	} \
+	RLOG("//DllMain(" << FormatIntHex(hinstDll) << ", reason = " << (int)fdwReason << ")"); \
+	return true; \
+} \
+\
+void _DllMainAppInit()
+
+/*
+_variant_t ValueToVariant(const Value& v);
+Value      DispatchToValue(IDispatch *disp);
+Value      UnknownToValue(IUnknown *unk);
+void       ReturnVariant(VARIANT *var, const Value& v);
+HRESULT    CheckReturnString(BSTR *bstr, const String& s);
+Color      PackColor(long rgb);
+long       UnpackColor(Color c);
+HRESULT    CheckReturnColor(long *ptr, Color c);
+*/
+
+#define std_method      HRESULT STDMETHODCALLTYPE
+#define void_method     void    STDMETHODCALLTYPE
+
+class OcxTypeInfo;
+
+typedef VectorMap<Guid, IUnknown *> InterfaceMap;
+
+inline void AddInterfaceRaw(InterfaceMap& map, const Guid& guid, IUnknown *iface)
+{
+	map.Add(guid, iface);
+}
+
+template <class T>
+inline void AddInterface(InterfaceMap& map, const Guid& guid, T *iface)
+{
+	AddInterfaceRaw(map, guid, iface);
+}
+
+#define PARENT_INTERFACE(clss, base) \
+template <> \
+inline void AddInterface(InterfaceMap& map, const Guid& guid, clss *iface) \
+{ \
+	AddInterfaceRaw(map, guid, iface); \
+	AddInterface<base>(map, __uuidof(base), iface); \
+}
+
+PARENT_INTERFACE(IProvideClassInfo2, IProvideClassInfo)
+PARENT_INTERFACE(IViewObject2, IViewObject)
+PARENT_INTERFACE(IViewObjectEx, IViewObject2)
+PARENT_INTERFACE(IOleInPlaceObject, IOleWindow)
+PARENT_INTERFACE(IOleInPlaceObjectWindowless, IOleInPlaceObject)
+PARENT_INTERFACE(IOleInPlaceActiveObject, IOleWindow)
+PARENT_INTERFACE(IPersistStorage, IPersist)
+PARENT_INTERFACE(IPersistStream, IPersist)
+PARENT_INTERFACE(IPersistFile, IPersist)
+PARENT_INTERFACE(IClassFactory2, IClassFactory)
+
+class OcxObject
+{
+	friend class OcxTypeInfo;
+
+public:
+	OcxObject();
+
+	template <class T>
+	void               AddInterface(const Guid& guid, T *iface) { UPP::AddInterface<T>(interface_map, guid, iface); }
+	template <class T>
+	void               AddInterface(T *iface)                   { UPP::AddInterface<T>(interface_map, __uuidof(T), iface); }
+
+	IUnknown          *OuterUnknown()                           { return outer_unknown ? outer_unknown : &inner_unknown; }
+	IUnknown          *InnerUnknown()                           { return &inner_unknown; }
+
+	HRESULT            InternalQueryInterface(const GUID& iid, void **ppv);
+	HRESULT            ExternalQueryInterface(const GUID& iid, void **ppv);
+
+	static HRESULT     RawGetTypeInfo(IRef<ITypeInfo>& dispatch_info, unsigned tinfo, LCID lcid, ITypeInfo **ppinfo);
+	static HRESULT     RawGetIDsOfNames(IRef<ITypeInfo>& dispatch_info, REFIID riid, OLECHAR **names, unsigned cnames, LCID lcid, DISPID *dispid);
+	static HRESULT     RawInvoke(IRef<ITypeInfo>& dispatch_info, IDispatch *disp, DISPID dispid, word flags, DISPPARAMS *params, VARIANT *result, EXCEPINFO *excep, unsigned *arg_err);
+
+	static const char *GetObjectName()   { return ""; }          // programmatic object name (synthetic = <ocx name>.<class name>)
+	static const char *GetObjectHelp()   { return ""; }          // user-visible object name (synthetic = <class name> (CONTROL ? " Control " | " Object ") <version>
+//	static GUID        GetDispatchGUID() { return __uuidof(0); } // default ingoing dispatch interface
+	static GUID        GetEventGUID()    { return __uuidof(0); } // default outgoing dispatch interface
+
+	enum
+	{
+		VERSION = 0,
+		CONTROL = 0, // override with 1 to make a control class
+	};
+
+	virtual int        InternalAddRef() = 0;
+	virtual int        InternalRelease() = 0;
+
+	int                ExternalAddRef();
+	int                ExternalRelease();
+
+protected:
+	class OcxInnerUnknown : public IUnknown {
+	public:
+		OcxInnerUnknown() : owner(0) {}
+		ULONG STDMETHODCALLTYPE AddRef()                  { return owner->InternalAddRef(); }
+		ULONG STDMETHODCALLTYPE Release()                 { return owner->InternalRelease(); }
+		STDMETHOD(QueryInterface)(REFIID iid, void **ppv) { return owner->InternalQueryInterface(iid, ppv); }
+
+	public:
+		OcxObject *owner;
+	};
+
+	OcxTypeInfo       *ocx_info;
+	IUnknown          *outer_unknown;
+	InterfaceMap       interface_map;
+	OcxInnerUnknown    inner_unknown;
+};
+
+template <class I>
+class Interface : public I, virtual public OcxObject
+{
+public:
+	Interface() { AddInterface<I>(this); }
+};
+
+template <class I>
+class DispatchInterface : public Interface<I>
+{
+public:
+	DispatchInterface() { AddInterface(__uuidof(I), this); AddInterface<IDispatch>(this); }
+//	static GUID GetDispatchGUID() { return __uuidof(I); }
+
+	// IDispatch
+
+	STDMETHOD(GetTypeInfoCount)(unsigned *pctinfo);
+	STDMETHOD(GetTypeInfo)(unsigned tinfo, LCID lcid, ITypeInfo **ppinfo);
+	STDMETHOD(GetIDsOfNames)(REFIID riid, OLECHAR **names, unsigned cnames, LCID lcid, DISPID *dispid);
+	STDMETHOD(Invoke)(DISPID dispid, REFIID riid, LCID lcid, word flags, DISPPARAMS *params, VARIANT *result, EXCEPINFO *excep, unsigned *arg_err);
+
+protected:
+	void            LoadTypeInfo() { ocx_info->GetDispatchTypeInfo(dispatch_info, __uuidof(I)); }
+
+protected:
+	IRef<ITypeInfo> dispatch_info;
+};
+
+template <class I>
+STDMETHODIMP DispatchInterface<I>::GetTypeInfoCount(unsigned *pctinfo)
+{
+	if(!pctinfo) return E_POINTER;
+	*pctinfo = 1;
+	return S_OK;
+}
+
+template <class I>
+STDMETHODIMP DispatchInterface<I>::GetTypeInfo(unsigned tinfo, LCID lcid, ITypeInfo **ppinfo)
+{
+	if(!ppinfo) return E_POINTER;
+	LoadTypeInfo();
+	if(*ppinfo = ~dispatch_info) dispatch_info->AddRef();
+	return S_OK;
+}
+
+template <class I>
+STDMETHODIMP DispatchInterface<I>::GetIDsOfNames(REFIID riid, OLECHAR **names, unsigned cnames, LCID lcid, DISPID *dispid)
+{
+	LoadTypeInfo();
+	return RawGetIDsOfNames(dispatch_info, riid, names, cnames, lcid, dispid);
+}
+
+template <class I>
+STDMETHODIMP DispatchInterface<I>::Invoke(DISPID dispid, REFIID riid, LCID lcid, word flags, DISPPARAMS *params, VARIANT *result, EXCEPINFO *excep, unsigned *arg_err)
+{
+	LoadTypeInfo();
+	return RawInvoke(dispatch_info, static_cast<I *>(this), dispid, flags, params, result, excep, arg_err);
+}
+
+class OcxProvideClassInfo : public Interface<IProvideClassInfo2>
+{
+public:
+	// IProvideClassInfo
+
+	STDMETHOD(GetClassInfo)(ITypeInfo **info);
+
+	// IProvideClassInfo2
+
+	STDMETHOD(GetGUID)(dword guidkind, GUID *guid);
+};
+
+template <class T>
+class OcxObjectWrapper : public T
+{
+public:
+	OcxObjectWrapper() : refcount(0) {}
+	OcxObjectWrapper(OcxTypeInfo& _ocx_info) : refcount(0) { ocx_info = &_ocx_info; _ocx_info.object_count++; }
+
+	static OcxObject     *New()                       { return new OcxObjectWrapper<T>(); }
+	static OcxObject     *New(OcxTypeInfo& _ocx_info) { return new OcxObjectWrapper<T>(_ocx_info); }
+
+	virtual ULONG STDMETHODCALLTYPE AddRef()          { return ExternalAddRef(); }
+	virtual ULONG STDMETHODCALLTYPE Release()         { return ExternalRelease(); }
+	STDMETHOD(QueryInterface)(REFIID iid, void **ppv) { return ExternalQueryInterface(iid, ppv); }
+
+	static String         GetName();
+
+	virtual int           InternalAddRef();
+	virtual int           InternalRelease();
+
+private:
+	void                  Destroy();
+
+private:
+	ULONG                 refcount;
+};
+
+template <class T>
+int OcxObjectWrapper<T>::InternalAddRef()
+{
+	++refcount;
+#if LOG_ADDREFS
+	RLOG(GetTypeName(typeid(*this)) << "::InternalAddRef(" << refcount << ")");
+#endif
+	return refcount;
+}
+
+template <class T>
+int OcxObjectWrapper<T>::InternalRelease()
+{
+	int u = --refcount;
+#if LOG_ADDREFS
+	RLOG(GetTypeName(typeid(*this)) << "::InternalRelease(" << refcount << ")");
+#endif
+	if(!u)
+		Destroy();
+	return u;
+}
+
+template <class T>
+String OcxObjectWrapper<T>::GetName()
+{
+	if(*T::GetObjectName())
+		return T::GetObjectName();
+	return GetTypeName(typeid(T));
+}
+
+template <class T>
+void OcxObjectWrapper<T>::Destroy()
+{
+	if(ocx_info)
+	{
+		ocx_info->object_count--;
+		LOGCREATE("\tdelete " << GetTypeName(typeid(T)) << ": "
+			<< (int)ocx_info->object_count << " instances left in system");
+	}
+	else
+		LOGCREATE("\tdelete " << GetTypeName(typeid(T)));
+	delete this;
+}
+
+class OcxTypeInfo : public Interface<IClassFactory2>
+{
+	friend class OcxTypeLib;
+
+public:
+	typedef OcxObject *(*New)(OcxTypeInfo& entry);
+
+	OcxTypeInfo(const GUID& coclass_guid, /*const GUID& dispatch_guid,*/ const GUID& event_guid,
+		New new_fn, String name, const char* help = "", int ver = 0,
+		bool is_control = false);
+
+	bool            IsControl() const       { return is_control; }
+	bool            CanUnload() const;
+
+	const Guid&     GetCoClassGUID() const  { return coclass_guid; }
+//	const Guid&     GetDispatchGUID() const { return dispatch_guid; }
+	const Guid&     GetEventGUID() const    { return event_guid; }
+
+	String          GetName() const         { return name; }
+
+//	IRef<ITypeInfo> GetDispatchTypeInfo();
+	void            GetDispatchTypeInfo(IRef<ITypeInfo>& dest, Guid dispatch_iid);
+	IRef<ITypeInfo> GetCoClassTypeInfo();
+
+	// IUnknown
+
+	virtual int     InternalAddRef()              { return IncRef(); }
+	virtual int     InternalRelease()             { return DecRef(); }
+	virtual ULONG   STDMETHODCALLTYPE AddRef()    { return IncRef(); }
+	virtual ULONG   STDMETHODCALLTYPE Release()   { return DecRef(); }
+	STDMETHOD(QueryInterface)(REFIID iid, void **ppv) { return ExternalQueryInterface(iid, ppv); }
+
+	// IClassFactory
+
+	STDMETHOD(CreateInstance)(IUnknown *outer, REFIID iid, void **object);
+	STDMETHOD(LockServer)(BOOL lock);
+
+	STDMETHOD(GetLicInfo)(/* [out] */ LICINFO *pLicInfo);
+	STDMETHOD(RequestLicKey)(/* [in] */ DWORD dwReserved, /* [out] */ BSTR *pBstrKey);
+
+	STDMETHOD(CreateInstanceLic)(
+			/* [in] */ IUnknown *pUnkOuter,
+			/* [in] */ IUnknown *pUnkReserved,
+			/* [in] */ REFIID riid,
+			/* [in] */ BSTR bstrKey,
+			/* [iid_is][out] */ PVOID *ppvObj);
+
+public:
+	long            object_count;  // managed object count
+	IRef<ITypeInfo> coclass_info;  // coclass type info
+//	IRef<ITypeInfo> dispatch_info; // ingoing dispatch interface type info
+	CriticalSection critical;      // critical section used for initializations
+
+private:
+	int             IncRef();
+	int             DecRef();
+
+private:
+	Guid            coclass_guid;  // coclass GUID
+	Guid            dispatch_guid; // GUID of default ingoing dispatch interface
+	Guid            event_guid;    // GUID of default outgoing dispatch interface
+	New             new_fn;        // constructor
+	String          name;          // programmatic object name - <ocx name>.<class name>.<version> by default
+	const char     *help;          // user-visible object name - <class name> (" Control " | " Object ") <version> by default
+	int             ver;           // 0 = use main library version
+	bool            is_control;    // false = generic object, true = insertable control
+
+	long            refcount;      // AddRef/Release counter
+	Atomic          lock_count;    // LockServer lock count
+
+#ifndef _USRDLL
+	dword           registration;  // for CoRevokeClassObject
+#endif
+};
+
+class OcxTypeLib
+{
+public:
+	static OcxTypeLib&     Get();
+
+	OcxTypeLib&            Name(String name)           { lib_name = name; return *this; }
+	String                 GetName() const             { return lib_name; }
+	OcxTypeLib&            DisplayName(String dn)      { display_name = dn; return *this; }
+	String                 GetDisplayName() const      { return display_name; }
+	String                 GetLibName() const;
+	OcxTypeLib&            UsesLibrary(String name)    { uses_libraries.GetAdd(name); return *this; }
+
+	OcxTypeLib&            Version(int _ver)           { lib_ver  = _ver; return *this; }
+	int                    GetVersion() const          { return lib_ver; }
+
+	HRESULT                Register();
+	HRESULT                Unregister();
+	HRESULT                GetFactory(REFCLSID clsid, REFIID iid, void **ppv);
+	bool                   CanUnload() const;
+#ifndef _USRDLL
+	HRESULT                RegisterObjects(); // call CoRegisterClassObject for each object
+	void                   RevokeObjects();   // call CoRevokeClassObject
+#endif
+
+	void                   Add(OcxTypeInfo& entry)     { objects.FindAdd(entry.coclass_guid, &entry); }
+	void                   AddInit(void (*fn)())       { ocx_init.Add(fn); }
+
+	IRef<ITypeInfo>        GetTypeInfo(const Guid& guid);
+
+	IRef<ITypeLib>&        GetTypeLib();
+	IRef<ITypeLib>&        operator -> ()              { return GetTypeLib(); }
+
+public:
+	IRef<ITypeLib>         typelib;
+	CriticalSection        critical;
+
+private:
+	OcxTypeLib();
+
+private:
+	VectorMap<Guid, OcxTypeInfo *> objects;
+	Vector<void (*)()>     ocx_init;
+	String                 lib_name;
+	String                 display_name;
+	int                    lib_ver;
+	VectorMap<String, IRef<ITypeLib> > uses_libraries;
+};
+
+struct OcxInit { OcxInit(void (*fn)()) { OcxTypeLib::Get().AddInit(fn); } };
+#define OCX_INIT(fn) static OcxInit MK__s = fn;
+
+#define OCX_OBJECT(type) \
+	static OcxTypeInfo MK__s( \
+		__uuidof(type),                    /* coclass GUID */ \
+		/*type::GetDispatchGUID(),*/       /* default ingoing dispatch interface GUID */ \
+		type::GetEventGUID(),              /* default outgoing dispatch interface GUID */ \
+		OcxObjectWrapper<type>::New,       /* constructor */ \
+		OcxObjectWrapper<type>::GetName(), /* name */ \
+		type::GetObjectHelp(),             /* help */ \
+		type::VERSION,                     /* version */ \
+		type::CONTROL);                    /* control object */
+
+#define OCX_NEWOBJECT(type) \
+	OCX_OBJECT(type) \
+	static IRef<type> COMBINE(OcxNew_, type)() { return new OcxObjectWrapper<type>(MK__s); }
+
+Size ToHiMetric(Size pixel_size);
+Size FromHiMetric(Size himetric_size);
+Rect GetWindow(HDC hdc);
+Rect GetViewport(HDC hdc);
+
+LPOLESTR AllocString(String s);
+
+template <class T>
+class SinkMap : public VectorMap<dword, T>
+{
+public:
+	typedef VectorMap<dword, T> Base;
+	SinkMap() : next_sink_id(0) {}
+	dword Add(const T& object) { Base::Add(++next_sink_id, object); return next_sink_id; }
+	bool  Remove(dword id)     { int i = Find(id); return (i >= 0 ? (Base::Remove(i), true) : false); }
+
+private:
+	dword next_sink_id;
+};
+
+//template OleType<IAdviseSinkPtr>;
+
+class OcxControl : public Ctrl,
+	public Interface<IOleInPlaceActiveObject>,
+	public Interface<IOleInPlaceObject>,
+	public Interface<IViewObjectEx>,
+	public Interface<IDataObject>,
+	public Interface<IPersistStorage>,
+	public Interface<IPersistStreamInit>,
+	public Interface<IOleObject>,
+	public Interface<IOleControl>,
+	public Interface<IPointerInactive>,
+	public OcxProvideClassInfo
+{
+public:
+	OcxControl();
+	virtual ~OcxControl();
+
+	virtual LRESULT WindowProc(UINT message, WPARAM wParam, LPARAM lParam);
+	bool            Open(HWND parent);
+	virtual void    Serialize(Stream& stream);
+	void            SerializePos(Stream& stream);
+
+	virtual bool    IsOcxChild();
+
+	using Ctrl::GetRect;
+	using Ctrl::SetData;
+	using Ctrl::GetData;
+
+	// IOleObject
+
+	STDMETHOD(SetClientSite)(IOleClientSite *site);
+	STDMETHOD(GetClientSite)(IOleClientSite **res);
+	STDMETHOD(SetHostNames)(LPCOLESTR app_name, LPCOLESTR doc_name);
+	STDMETHOD(Close)(dword save_option);
+	STDMETHOD(SetMoniker)(dword which, IMoniker *moniker);
+	STDMETHOD(GetMoniker)(dword assign, dword which, IMoniker **moniker);
+	STDMETHOD(InitFromData)(IDataObject *data, BOOL creation, dword);
+	STDMETHOD(GetClipboardData)(dword, IDataObject **data);
+	STDMETHOD(DoVerb)(long verb, MSG *msg, IOleClientSite *active_site, long index, HWND hwnd, const RECT *rc);
+	STDMETHOD(EnumVerbs)(IEnumOLEVERB **verbs);
+	STDMETHOD(Update)();
+	STDMETHOD(IsUpToDate)();
+	STDMETHOD(GetUserClassID)(GUID *guid);
+	STDMETHOD(GetUserType)(dword form, LPOLESTR *type);
+	STDMETHOD(SetExtent)(dword aspect, SIZEL *size);
+	STDMETHOD(GetExtent)(dword aspect, SIZEL *size);
+	STDMETHOD(Advise)(IAdviseSink *sink, dword *connection);
+	STDMETHOD(Unadvise)(dword connection);
+	STDMETHOD(EnumAdvise)(IEnumSTATDATA **sink_enum);
+	STDMETHOD(GetMiscStatus)(dword aspect, dword *status);
+	STDMETHOD(SetColorScheme)(LOGPALETTE *logpal);
+
+	// IPersistStorage
+
+	STDMETHOD(GetClassID)(GUID *guid);
+	STDMETHOD(IsDirty)(); // IPersistStreamInit as well
+	STDMETHOD(InitNew)(IStorage *stg);
+	STDMETHOD(Load)(IStorage *stg);
+	STDMETHOD(Save)(IStorage *stg, BOOL same_as_load);
+	STDMETHOD(SaveCompleted)(IStorage *stg);
+	STDMETHOD(HandsOffStorage)();
+
+	// IPersistStreamInit
+
+	STDMETHOD(Load)(IStream *stream);
+	STDMETHOD(Save)(IStream *stream, BOOL clear_dirty);
+	STDMETHOD(GetSizeMax)(ULARGE_INTEGER *size);
+	STDMETHOD(InitNew)();
+
+	// IDataObject
+
+	STDMETHOD(GetData)(FORMATETC *format, STGMEDIUM *medium);
+	STDMETHOD(GetDataHere)(FORMATETC *format, STGMEDIUM *medium);
+	STDMETHOD(QueryGetData)(FORMATETC *format);
+	STDMETHOD(GetCanonicalFormatEtc)(FORMATETC *in, FORMATETC *out);
+	STDMETHOD(SetData)(FORMATETC *format, STGMEDIUM *medium, BOOL free);
+	STDMETHOD(EnumFormatEtc)(dword dir, IEnumFORMATETC **enumerator);
+	STDMETHOD(DAdvise)(FORMATETC *format, dword advf, IAdviseSink *sink, dword *connection);
+	STDMETHOD(DUnadvise)(dword connection);
+	STDMETHOD(EnumDAdvise)(IEnumSTATDATA **enumerator);
+
+	// IViewObject
+
+	STDMETHOD(Draw)(dword aspect, long index, void *aspectinfo,
+		DVTARGETDEVICE *device, HDC target, HDC draw,
+		const RECTL *bounds, const RECTL *wbounds,
+		BOOL (STDMETHODCALLTYPE *progress)(dword arg), dword arg);
+	STDMETHOD(GetColorSet)(dword aspect, long index, void *aspectinfo,
+		DVTARGETDEVICE *device, HDC target, LOGPALETTE **palette);
+	STDMETHOD(Freeze)(dword aspect, long index, void *aspectinfo,
+		dword *freeze_key);
+	STDMETHOD(Unfreeze)(dword freeze_key);
+	STDMETHOD(SetAdvise)(dword aspect, dword advf, IAdviseSink *sink);
+	STDMETHOD(GetAdvise)(dword *aspect, dword *advf, IAdviseSink **sink);
+
+	// IViewObject2
+
+	STDMETHOD(GetExtent)(dword aspect, long index, DVTARGETDEVICE *device, SIZEL *size);
+
+	// IViewObjectEx
+
+	STDMETHOD(GetRect)(dword aspect, RECTL *rc);
+	STDMETHOD(GetViewStatus)(dword *status);
+	STDMETHOD(QueryHitPoint)(dword aspect, const RECT *bounds, POINT pos, long close_hint, dword *result);
+	STDMETHOD(QueryHitRect)(dword aspect, const RECT *bounds, const RECT *, long close_hint, dword *result);
+	STDMETHOD(GetNaturalExtent)(dword aspect, long index, DVTARGETDEVICE *ptd, HDC tdc, DVEXTENTINFO *extinfo, SIZEL *psize);
+
+	// IOleWindow
+
+	STDMETHOD(GetWindow)(HWND *hwnd);
+	STDMETHOD(ContextSensitiveHelp)(BOOL enter_mode);
+
+	// IOleInPlaceObject
+
+	STDMETHOD(InPlaceDeactivate)();
+	STDMETHOD(UIDeactivate)();
+	STDMETHOD(SetObjectRects)(const RECT *pos, const RECT *clip);
+	STDMETHOD(ReactivateAndUndo)();
+
+	// IOleInPlaceActiveObject
+
+	STDMETHOD(TranslateAccelerator)(MSG *msg);
+	STDMETHOD(OnFrameWindowActivate)(BOOL activate);
+	STDMETHOD(OnDocWindowActivate)(BOOL activate);
+	STDMETHOD(ResizeBorder)(const RECT *border, IOleInPlaceUIWindow *ui, BOOL frame);
+	STDMETHOD(EnableModeless)(BOOL enable);
+
+	// IOleControl
+
+	STDMETHOD(GetControlInfo)(CONTROLINFO *cinfo);
+	STDMETHOD(OnMnemonic)(MSG *msg);
+	STDMETHOD(OnAmbientPropertyChange)(DISPID dispid);
+	STDMETHOD(FreezeEvents)(BOOL freeze);
+
+	// IPointerInactive
+
+	STDMETHOD(GetActivationPolicy)(DWORD *pdwPolicy);
+	STDMETHOD(OnInactiveMouseMove)(LPCRECT pRectBounds, LONG x, LONG y, DWORD grfKeyState);
+	STDMETHOD(OnInactiveSetCursor)(LPCRECT pRectBounds, LONG x, LONG y, DWORD dwMouseMsg, BOOL fSetAlways);
+
+	// default verb
+
+	virtual HRESULT DoVerbPrimary();
+	virtual HRESULT DoVerbShow();
+	virtual HRESULT DoVerbInPlaceActivate();
+	virtual HRESULT DoVerbUIActivate();
+	virtual HRESULT DoVerbOpen();
+	virtual HRESULT DoVerbHide();
+	virtual HRESULT DoVerbDiscardUndo();
+	virtual HRESULT DoVerbProperties();
+
+	// various helpers
+
+	bool            IsClosed() const            { return status == CLOSED; }
+//	bool            IsForged() const            { return status == FORGED; }
+	bool            IsActive() const            { return status >= ACTIVE; }
+	bool            IsUIActive() const          { return status == UIACTIVE; }
+
+	void            RefreshSink();
+
+	enum { CONTROL = 1 };
+
+protected:
+	void            UpdateControlRect();
+	HRESULT         ShowControl(bool ui_activate);
+	void            SetActiveObject(bool set);
+
+	void            TimerThread();
+
+protected:
+	static const WCHAR data_stream_name[]; // default data stream
+
+	enum STATE { CLOSED, /* FORGED, */ ACTIVE, UIACTIVE };
+
+//	Thread                       timer_thread;
+	IRef<IOleClientSite>         client_site;
+	IRef<IOleInPlaceSite>        in_place_site;
+	SinkMap< IRef<IAdviseSink> > advise_sinks;
+	dword                        view_sink_aspect;
+	dword                        view_sink_advf;
+	IRef<IAdviseSink>            view_sink;
+	Rect                         ctrl_rect;
+	Size                         extent_size;
+	STATE                        status;
+//	WPARAM                       ncmm_wParam;
+//	LPARAM                       ncmm_lParam;
+	bool                         stream_inited;
+	bool                         timer_shutdown;
+};
+
+class OcxRunnableControl : public OcxControl, public Interface<IRunnableObject>
+{
+public:
+	OcxRunnableControl() {}
+
+	// IRunnableObject
+
+	STDMETHOD(GetRunningClass)(GUID *clsid);
+	STDMETHOD(Run)(LPBC ctx);
+	BOOL STDMETHODCALLTYPE IsRunning();
+	STDMETHOD(LockRunning)(BOOL lock, BOOL last_unlock_closes);
+	STDMETHOD(SetContainedObject)(BOOL contained);
+};
+
+/*
+struct CtrlHook : public Ctrl
+{
+public:
+	void _CreateChild() { Ctrl::CreateChild(); }
+};
+*/
+
+class OcxConnectionPoint : public Interface<IConnectionPoint>
+{
+public:
+	OcxConnectionPoint() {}
+
+	void SetEventGUID(const Guid& g)                   { guid = g; }
+	void SetContainer(IConnectionPointContainer *cont) { container = cont; }
+	void FireEvent(int method_id, const Vector<Value>& values);
+
+	STDMETHOD(GetConnectionInterface)(IID *iid);
+	STDMETHOD(GetConnectionPointContainer)(IConnectionPointContainer **ppCPC);
+	STDMETHOD(Advise)(IUnknown *ptr, DWORD *cookie);
+	STDMETHOD(Unadvise)(DWORD cookie);
+	STDMETHOD(EnumConnections)(IEnumConnections **enum_conn);
+
+	class Enumerator : public Interface<IEnumConnections>
+	{
+	public:
+		Enumerator() {}
+
+		void            Attach(OcxConnectionPoint *pt) { point = IRef<OcxConnectionPoint>(pt); index = 0; }
+
+		STDMETHOD(Next)(unsigned long count, CONNECTDATA *data, unsigned long *fetched);
+		STDMETHOD(Skip)(unsigned long connections);
+		STDMETHOD(Reset)();
+		STDMETHOD(Clone)(IEnumConnections **enum_conn);
+
+	private:
+		IRef<OcxConnectionPoint> point;
+		int                          index;
+	};
+
+	friend class Enumerator;
+
+public:
+	Guid                               guid;
+
+protected:
+	IConnectionPointContainer         *container;
+	VectorMap<dword, IRef<IDispatch> > conn_map;
+	Vector<dword>                      free_id;
+};
+
+class OcxConnectionPointContainer : public Interface<IConnectionPointContainer>
+{
+public:
+	OcxConnectionPointContainer();
+
+	void AddConnectionPoint(OcxConnectionPoint *conn) { point_map.GetAdd(conn -> guid) = conn; conn -> SetContainer(this); }
+
+	STDMETHOD(EnumConnectionPoints)(IEnumConnectionPoints **ppEnum);
+	STDMETHOD(FindConnectionPoint)(REFIID riid, IConnectionPoint **ppCP);
+
+private:
+	class Enumerator : public Interface<IEnumConnectionPoints>
+	{
+	public:
+		Enumerator() {}
+
+		void            Attach(OcxConnectionPointContainer *pt) { point = pt; index = 0; }
+
+		STDMETHOD(Next)(unsigned long count, IConnectionPoint **rgpcn, unsigned long *fetched);
+		STDMETHOD(Skip)(unsigned long connections);
+		STDMETHOD(Reset)();
+		STDMETHOD(Clone)(IEnumConnectionPoints **enum_conn);
+
+	private:
+		IRef<OcxConnectionPointContainer> point;
+		int                               index;
+	};
+
+	friend class Enumerator;
+
+private:
+	VectorMap<Guid, IConnectionPoint *> point_map;
+};
+
+END_UPP_NAMESPACE
+
+#endif
diff --git a/uppsrc/Ole/Ctrl/control.cpp b/uppsrc/Ole/Ctrl/control.cpp
new file mode 100644
index 000000000..b6e291dfe
--- /dev/null
+++ b/uppsrc/Ole/Ctrl/control.cpp
@@ -0,0 +1,1209 @@
+#include <Ole/Ctrl/OleCtrl.h>
+
+#ifdef PLATFORM_WIN32
+
+NAMESPACE_UPP
+
+LPOLESTR AllocString(String s)
+{
+	LPOLESTR p = reinterpret_cast<LPOLESTR>(CoTaskMemAlloc(sizeof(OLECHAR) * (s.GetLength() + 1))), d = p;
+	const char *f = s;
+	while(*d++ = *f++)
+		;
+	return p;
+}
+
+OcxControl::OcxControl()
+{
+	ActiveX();
+	view_sink_aspect = DVASPECT_CONTENT;
+	view_sink_advf = 0;
+	status = CLOSED;
+	stream_inited = false;
+	timer_shutdown = false;
+	extent_size = GetStdSize();
+}
+
+OcxControl::~OcxControl()
+{
+	LOGMETHOD("OcxControl::~OcxControl");
+}
+
+bool OcxControl::IsOcxChild()
+{
+	return true;
+}
+
+LRESULT OcxControl::WindowProc(UINT message, WPARAM wParam, LPARAM lParam)
+{
+	LOGMETHOD("OcxControl::WindowProc");
+//	RLOG("message = " << FormatIntHex(message) << ", wParam = " << FormatIntHex(wParam) << ", lParam = " << FormatIntHex(lParam));
+	if(message == WM_GETDLGCODE)
+		return DLGC_WANTALLKEYS | DLGC_WANTARROWS | DLGC_WANTMESSAGE;
+	LRESULT res = Ctrl::WindowProc(message, wParam, lParam);
+	return res;
+}
+
+bool OcxControl::Open(HWND parent) // parent = 0 - create forged control
+{
+	LOGMETHOD("OcxControl::Open");
+//		if(!IsForged())
+	ctrl_rect = GetRect();
+	if(IsOpen())
+		Ctrl::Close();
+	if(parent && IsChild())
+		Remove();
+	status = CLOSED;
+
+//		noproc = true;
+//		visible |= !parent;
+	Rect rc = ctrl_rect;
+	if(IsNull(rc))
+		rc = Rect(0, 0, 0, 0);
+	if(!parent)
+	{ // move window away from screen in forged mode
+		rc.Offset(-30000 - rc.left, -30000 - rc.top);
+		SetRect(rc);
+	}
+//		view.SetRectEmpty();
+
+	Create(parent, (IsEnabled() ? 0 : WS_DISABLED) | (parent ? WS_CHILD : WS_POPUP) | WS_VISIBLE,
+		(parent ? 0 : WS_EX_TOOLWINDOW), false, SW_HIDE, false);
+
+	Show();
+
+/*		wnd = &stdwnd;
+	fullrefresh = false;
+	dword style = parent ? WS_CHILD : WS_POPUP, exstyle = WS_EX_TOOLWINDOW;
+	if(!enabled) style |= WS_DISABLED;
+	noproc = true;
+	visible |= !parent;
+	Rect rc = GetRect();
+	if(!parent)
+	{ // move window away from screen in forged mode
+		rc.OffsetRect(-30000 - rc.left, -30000 - rc.top);
+		SetRect(rc);
+	}
+	view.SetRectEmpty();
+	wnd->CreateEx(exstyle, CtrlWindowClass(),
+#ifdef _DEBUG
+		Name(),
+#else
+		NULL,
+#endif
+		style,
+		rc.left, rc.top, rc.Width(), rc.Height(),
+		parent ? parent : 0, 0, 0);
+
+	if(!wnd->m_hWnd)
+		return false;
+
+	type = POPUP;
+	noproc = false;
+
+	for(Ctrl *q = GetFirstChild(); q; q = q->GetNext())
+		reinterpret_cast<CtrlHook *>(q)->_CreateChild();
+
+	if(visible)
+		ShowWindow(GetHWND(), SW_SHOWNA);
+//		SetMnemonic((byte) hotchar);
+
+	RefreshLayout();
+	RefreshPos();
+	Refresh();
+	CancelMode();
+	CreateInit();
+	move = true;
+*/
+	status = ACTIVE; //(parent ? ACTIVE : FORGED);
+	return true;
+}
+
+void OcxControl::Serialize(Stream& stream)
+{
+	int version = 1;
+	SerializePos(stream);
+}
+
+void OcxControl::SerializePos(Stream& stream)
+{
+	int version = 1;
+	stream / version;
+	Rect rc;
+	if(stream.IsStoring())
+		rc = GetRect();
+	stream % rc;
+	if(stream.IsLoading())
+		SetRect(rc);
+}
+
+const WCHAR OcxControl::data_stream_name[] = L"data";
+
+HRESULT OcxControl::SetClientSite(IOleClientSite *site)
+{
+	LOGMETHOD("IOleObject::SetClientSite()");
+	in_place_site = site;
+	client_site = site;
+	if(GetRect().IsEmpty()) {
+		LOG("Setting up default control rect...");
+		SetRect(GetStdSize());
+	}
+	return LOGRESULT(S_OK);
+}
+
+HRESULT OcxControl::GetClientSite(IOleClientSite **res)
+{
+	LOGMETHOD("IOleObject::GetClientSite");
+	if(*res = ~client_site)
+		client_site->AddRef();
+	return LOGRESULT(S_OK);
+}
+
+HRESULT OcxControl::SetHostNames(LPCOLESTR app_name, LPCOLESTR doc_name)
+{
+	LOGMETHOD("IOleObject::SetHostNames");
+	return LOGRESULT(S_OK);
+}
+
+HRESULT OcxControl::Close(dword save_option)
+{
+	LOGMETHOD("IOleObject::Close");
+	InPlaceDeactivate();
+	return LOGRESULT(S_OK);
+}
+
+HRESULT OcxControl::SetMoniker(dword which, IMoniker *moniker)
+{
+	LOGMETHOD("IOleObject::SetMoniker");
+	return LOGRESULT(S_OK);
+}
+
+HRESULT OcxControl::GetMoniker(dword assign, dword which, IMoniker **moniker)
+{
+	LOGMETHOD("IOleObject::GetMoniker");
+	*moniker = 0;
+	return LOGRESULT(E_NOTIMPL);
+}
+
+HRESULT OcxControl::InitFromData(IDataObject *data, BOOL creation, dword)
+{
+	LOGMETHOD("IOleObject::InitFromData");
+	return LOGRESULT(S_FALSE);
+}
+
+HRESULT OcxControl::GetClipboardData(dword, IDataObject **data)
+{
+	LOGMETHOD("IOleObject::GetClipboardData");
+	*data = 0;
+	return LOGRESULT(E_NOTIMPL);
+}
+
+HRESULT OcxControl::DoVerb(long verb, MSG *msg, IOleClientSite *active_site,
+	long index, HWND parent, const RECT *rc)
+{
+	LOGMETHOD("IOleObject::DoVerb");
+	switch(verb)
+	{
+	case OLEIVERB_PRIMARY:          return DoVerbPrimary();
+	case OLEIVERB_SHOW:             return DoVerbShow();
+	case OLEIVERB_INPLACEACTIVATE:  return DoVerbInPlaceActivate();
+	case OLEIVERB_UIACTIVATE:       return DoVerbUIActivate();
+	case OLEIVERB_HIDE:             return DoVerbHide();
+	case OLEIVERB_OPEN:             return DoVerbOpen();
+	case OLEIVERB_DISCARDUNDOSTATE: return DoVerbDiscardUndo();
+	case OLEIVERB_PROPERTIES:       return DoVerbProperties();
+	default:                        return OLEOBJ_S_INVALIDVERB;
+	}
+}
+
+HRESULT OcxControl::EnumVerbs(IEnumOLEVERB **verbs)
+{
+	LOGMETHOD("IOleObject::EnumVerbs");
+	*verbs = 0;
+	return LOGRESULT(OLEOBJ_E_NOVERBS);
+}
+
+HRESULT OcxControl::Update()
+{
+	LOGMETHOD("IOleObject::Update");
+	return LOGRESULT(S_OK);
+}
+
+HRESULT OcxControl::IsUpToDate()
+{
+	LOGMETHOD("IOleObject::IsUpToDate");
+	return LOGRESULT(MK_E_UNAVAILABLE);
+}
+
+HRESULT OcxControl::GetUserClassID(GUID *guid)
+{
+	LOGMETHOD("IOleObject::GetUserClassID");
+	ASSERT(ocx_info);
+	*guid = ocx_info->GetCoClassGUID();
+	return LOGRESULT(S_OK);
+}
+
+HRESULT OcxControl::GetUserType(dword form, LPOLESTR *type)
+{
+//	__asm int 3
+	LOGMETHOD("IOleObject::GetUserType");
+	ASSERT(ocx_info);
+	*type = AllocString(ocx_info->GetName());
+	return LOGRESULT(S_OK);
+}
+
+HRESULT OcxControl::SetExtent(dword aspect, SIZEL *hi_size)
+{
+	LOGMETHOD("IOleObject::SetExtent(" << hi_size->cx << ", " << hi_size->cy << ")");
+	if(aspect == DVASPECT_CONTENT) {
+		extent_size = min(FromHiMetric(*hi_size), GetMaxSize());
+		OCXLOG("Ctrl size = " << extent_size);
+		SetRect(Rect(GetRect().TopLeft(), extent_size));
+	}
+	return LOGRESULT(S_OK);
+}
+
+HRESULT OcxControl::GetExtent(dword aspect, SIZEL *size)
+{
+	LOGMETHOD("IOleObject::GetExtent");
+	if(aspect == DVASPECT_CONTENT) {
+		*size = ToHiMetric(extent_size);
+		return LOGRESULT(S_OK);
+	}
+	return LOGRESULT(E_NOTIMPL);
+}
+
+HRESULT OcxControl::Advise(IAdviseSink *sink, dword *connection)
+{
+	LOGMETHOD("IOleObject::Advise");
+	if(!sink || !connection)
+		return E_INVALIDARG;
+	*connection = advise_sinks.Add(sink);
+	return LOGRESULT(S_OK);
+}
+
+HRESULT OcxControl::Unadvise(dword connection)
+{
+	LOGMETHOD("IOleObject::Unadvise");
+	return LOGRESULT(advise_sinks.Remove(connection) ? S_OK : E_INVALIDARG);
+}
+
+HRESULT OcxControl::EnumAdvise(IEnumSTATDATA **sink_enum)
+{
+	LOGMETHOD("IOleObject::EnumAdvise");
+	*sink_enum = 0;
+	return LOGRESULT(E_NOTIMPL);
+}
+
+HRESULT OcxControl::GetMiscStatus(dword aspect, dword *st)
+{
+	LOGMETHOD("IOleObject::GetMiscStatus");
+	*st = OLEMISC_RECOMPOSEONRESIZE
+		| OLEMISC_INSIDEOUT
+		| OLEMISC_ACTIVATEWHENVISIBLE;
+	return LOGRESULT(S_OK);
+}
+
+HRESULT OcxControl::SetColorScheme(LOGPALETTE *logpal)
+{
+	LOGMETHOD("IOleObject::SetColorScheme");
+	return LOGRESULT(S_OK);
+}
+
+HRESULT OcxControl::GetClassID(GUID *guid)
+{
+	LOGMETHOD("IPersist::GetClassID");
+	ASSERT(ocx_info);
+	*guid = ocx_info->GetCoClassGUID();
+	return LOGRESULT(S_OK);
+}
+
+HRESULT OcxControl::IsDirty()
+{
+	LOGMETHOD("IPersistStorage::IsDirty");
+	return LOGRESULT(IsModified() ? S_OK : S_FALSE);
+}
+
+HRESULT OcxControl::InitNew(IStorage *stg)
+{
+	LOGMETHOD("IPersistStorage::InitNew");
+	if(!stg)
+		return LOGRESULT(E_INVALIDARG);
+	HRESULT hr;
+	IStreamPtr stream;
+	if(FAILED(hr = stg->CreateStream(data_stream_name,
+		STGM_CREATE | STGM_READWRITE | STGM_SHARE_EXCLUSIVE, 0, 0, &stream)))
+		return LOGRESULT(hr);
+	return InitNew(); // call IPersistStream::InitNew
+}
+
+HRESULT OcxControl::Load(IStorage *stg)
+{
+	LOGMETHOD("IPersistStorage::Load");
+	if(!stg)
+		return LOGRESULT(E_INVALIDARG);
+	HRESULT hr;
+	IStreamPtr stream;
+	if(FAILED(hr = stg->OpenStream(data_stream_name, 0,
+		STGM_DIRECT | STGM_SHARE_EXCLUSIVE, 0, &stream)))
+		return LOGRESULT(hr);
+	return Load(stream); // delegate load to IPersistStream::Load
+}
+
+HRESULT OcxControl::Save(IStorage *stg, BOOL same_as_load)
+{
+	LOGMETHOD("IPersistStorage::Save(" << (same_as_load ? "same as load" : "full save") << ')');
+	if(!stg)
+		return LOGRESULT(E_INVALIDARG);
+	HRESULT hr;
+#if LOG_PERSIST >= 1
+	STATSTG stat;
+	Zero(stat);
+	if(FAILED(hr = stg->Stat(&stat, STATFLAG_NONAME)))
+		return LOGRESULT(hr);
+	OCXLOG(NFormat("Storage flags = %08x\r\n", (int)stat.grfMode));
+	OCXLOG("CLSID = " << GetCoClassName(stat.clsid) << " - " << Format(stat.clsid));
+#endif
+	IStreamPtr stream;
+	if(FAILED(hr = stg->CreateStream(data_stream_name,
+		STGM_CREATE | STGM_READWRITE | STGM_SHARE_EXCLUSIVE, 0, 0, &stream)))
+		return LOGRESULT(hr);
+
+	if(FAILED(hr = Save(stream, true)))
+		return hr;
+
+#if LOG_PERSIST >= 1
+	ULARGE_INTEGER ul;
+	if(FAILED(hr = stream->Seek(AsLarge(0), STREAM_SEEK_END, &ul)))
+		return hr;
+	OCXLOG("- stream size = " << ul.LowPart);
+#endif
+
+	return S_OK;
+}
+
+HRESULT OcxControl::SaveCompleted(IStorage *stg)
+{
+	LOGMETHOD("IPersistStorage::SaveCompleted");
+	return LOGRESULT(S_OK);
+}
+
+HRESULT OcxControl::HandsOffStorage()
+{
+	LOGMETHOD("IPersistStorage::HandsOffStorage");
+	return LOGRESULT(S_OK);
+}
+
+HRESULT OcxControl::Load(IStream *stream)
+{
+	LOGMETHOD("IPersistStreamInit::Load");
+	if(stream_inited)
+		return LOGRESULT(E_UNEXPECTED);
+#if LOG_PERSIST >= 1
+	ULARGE_INTEGER old_pos, len;
+	HRESULT hr;
+	if(FAILED(hr = stream->Seek(AsLarge(0), STREAM_SEEK_CUR, &old_pos))
+	|| FAILED(hr = stream->Seek(AsLarge(0), STREAM_SEEK_END, &len))
+	|| FAILED(hr = stream->Seek(reinterpret_cast<const LARGE_INTEGER&>(old_pos), STREAM_SEEK_SET, 0)))
+		return hr;
+	OCXLOG("- stream size = " << len.LowPart);
+#endif
+	OleStream os(stream);
+	if(!os.IsOpen() || os.IsError())
+	{
+		LOGPERSIST("- internal error creating OleStream");
+		return LOGRESULT(E_FAIL);
+	}
+	os.SetLoading();
+	Serialize(os);
+	ClearModify();
+	os.Close();
+	stream_inited = true;
+	if(os.IsError())
+		return LOGRESULT(os.GetError() >= 0 ? os.GetError() : E_FAIL);
+	return LOGRESULT(S_OK);
+}
+
+HRESULT OcxControl::Save(IStream *stream, BOOL clear_dirty)
+{
+	LOGMETHOD("IPersistStreamInit::Save");
+	OleStream os(stream);
+	if(!os.IsOpen() || os.IsError())
+	{
+		LOGPERSIST("- internal error creating OleStream");
+		return LOGRESULT(E_FAIL);
+	}
+	os.SetStoring();
+	Serialize(os);
+	os.Close();
+	if(os.IsError())
+		return LOGRESULT(os.GetError() >= 0 ? os.GetError() : E_FAIL);
+	if(clear_dirty)
+		ClearModify();
+	return LOGRESULT(S_OK);
+}
+
+HRESULT OcxControl::GetSizeMax(ULARGE_INTEGER *size)
+{
+	LOGMETHOD("IPersistStreamInit::GetSizeMax");
+	if(!size)
+		return LOGRESULT(E_INVALIDARG);
+	SizeStream ss;
+	Serialize(ss);
+	*size = AsULarge(ss.GetSize());
+	return LOGRESULT(S_OK);
+}
+
+HRESULT OcxControl::InitNew()
+{
+	LOGMETHOD("IPersistStreamInit::InitNew");
+	if(stream_inited)
+		return LOGRESULT(E_UNEXPECTED);
+	SetRect(Rect(Point(0, 0), GetStdSize()));
+	SetData(Value()); // default clear algorithm
+	ClearModify();
+	stream_inited = true;
+	return LOGRESULT(S_OK);
+}
+
+HRESULT OcxControl::GetData(FORMATETC *format, STGMEDIUM *medium)
+{
+	LOGMETHOD("IDataObject::GetData");
+	return LOGRESULT(E_NOTIMPL);
+}
+
+HRESULT OcxControl::GetDataHere(FORMATETC *format, STGMEDIUM *medium)
+{
+	LOGMETHOD("IDataObject::GetDataHere");
+	return LOGRESULT(E_NOTIMPL);
+}
+
+HRESULT OcxControl::QueryGetData(FORMATETC *format)
+{
+	LOGMETHOD("IDataObject::QueryGetData");
+	return LOGRESULT(E_NOTIMPL);
+}
+
+HRESULT OcxControl::GetCanonicalFormatEtc(FORMATETC *in, FORMATETC *out)
+{
+	LOGMETHOD("IDataObject::GetCanonicalFormatEtc");
+	*out = *in;
+	out->ptd = 0;
+	return LOGRESULT(DATA_S_SAMEFORMATETC);
+}
+
+HRESULT OcxControl::SetData(FORMATETC *format, STGMEDIUM *medium, BOOL free)
+{
+	LOGMETHOD("IDataObject::SetData");
+	if(free)
+		ReleaseStgMedium(medium);
+	return LOGRESULT(E_NOTIMPL);
+}
+
+HRESULT OcxControl::EnumFormatEtc(dword dir, IEnumFORMATETC **enumerator)
+{
+	LOGMETHOD("IDataObject::EnumFormatEtc");
+	*enumerator = 0;
+	return LOGRESULT(E_NOTIMPL);
+}
+
+HRESULT OcxControl::DAdvise(FORMATETC *format, dword advf, IAdviseSink *sink, dword *connection)
+{
+	LOGMETHOD("IDataObject::DAdvise");
+	*connection = advise_sinks.Add(sink);
+	return LOGRESULT(S_OK);
+}
+
+HRESULT OcxControl::DUnadvise(dword connection)
+{
+	LOGMETHOD("IDataObject::DUnadvise");
+	return LOGRESULT(advise_sinks.Remove(connection) ? S_OK : E_FAIL);
+}
+
+HRESULT OcxControl::EnumDAdvise(IEnumSTATDATA **enumerator)
+{
+	LOGMETHOD("IDataObject::EnumDAdvise");
+	*enumerator = 0;
+	return LOGRESULT(E_NOTIMPL);
+}
+
+HRESULT OcxControl::Draw(dword aspect, long index, void *aspectinfo,
+	DVTARGETDEVICE *device, HDC target_dc, HDC draw_dc,
+	const RECTL *bounds, const RECTL *wbounds,
+	BOOL (STDMETHODCALLTYPE *progress)(dword arg), dword arg)
+{
+	LOGMETHOD("IViewObject::Draw");
+	if(aspect != DVASPECT_CONTENT)
+		return DV_E_DVASPECT;
+//	if(IsClosed() && !CreateControl(0)) // create forged control to make paint routines work
+//		return E_FAIL;
+	Rect rc(GetSize());
+	if(bounds)
+	{
+		rc.left   = bounds->left;
+		rc.top    = bounds->top;
+		rc.right  = bounds->right;
+		rc.bottom = bounds->bottom;
+		LPtoDP(draw_dc, reinterpret_cast<POINT *>(&rc), 2);
+	}
+//	if(IsForged())
+//		SetCtrlRect(rc);
+
+	Point worg, vorg;
+	Size wext, vext;
+	SetWindowOrgEx(draw_dc, 0, 0, worg);
+	SetWindowExtEx(draw_dc, 1, 1, wext);
+	SetViewportOrgEx(draw_dc, 0, 0, vorg);
+	SetViewportExtEx(draw_dc, 1, 1, vext);
+	int old_mode = SetMapMode(draw_dc, MM_TEXT);
+
+	UPP::Draw draw(draw_dc);
+	draw.Offset(rc.TopLeft());
+	DrawCtrl(draw);
+	draw.End();
+
+	SetMapMode(draw_dc, old_mode);
+	SetWindowOrgEx(draw_dc, worg.x, worg.y, 0);
+	SetWindowExtEx(draw_dc, wext.cx, wext.cy, 0);
+	SetViewportOrgEx(draw_dc, vorg.x, vorg.y, 0);
+	SetViewportExtEx(draw_dc, vext.cx, vext.cy, 0);
+
+//	DUMP(GetMapMode(draw_dc));
+//	DUMP(::GetWindow(draw_dc));
+//	DUMP(GetViewport(draw_dc));
+//	::Draw draw(draw_dc);
+//	draw.DrawRect(rc, Yellow);
+//	draw.Clipoff(rc);
+//	CtrlPaint(draw);
+//	draw.End();
+
+	return LOGRESULT(S_OK);
+}
+
+HRESULT OcxControl::GetColorSet(dword aspect, long index, void *aspectinfo,
+	DVTARGETDEVICE *device, HDC target, LOGPALETTE **palette)
+{
+	LOGMETHOD("IViewObject::GetColorSet");
+	return LOGRESULT(E_NOTIMPL);
+}
+
+HRESULT OcxControl::Freeze(dword aspect, long index, void *aspectinfo, dword *freeze_key)
+{
+	LOGMETHOD("IViewObject::Freeze");
+	return LOGRESULT(E_NOTIMPL);
+}
+
+HRESULT OcxControl::Unfreeze(dword freeze_key)
+{
+	LOGMETHOD("IViewObject::Unfreeze");
+	return LOGRESULT(E_NOTIMPL);
+}
+
+HRESULT OcxControl::SetAdvise(dword aspect, dword advf, IAdviseSink *sink)
+{
+	LOGMETHOD("IViewObject::SetAdvise(aspect = " << aspect << ", advf = " << advf << ")");
+	view_sink_aspect = aspect;
+	view_sink_advf = advf;
+	view_sink = sink;
+	return LOGRESULT(S_OK);
+}
+
+HRESULT OcxControl::GetAdvise(dword *aspect, dword *advf, IAdviseSink **sink)
+{
+	LOGMETHOD("IViewObject::GetAdvise");
+	if(aspect) *aspect = view_sink_aspect;
+	if(advf)   *advf   = view_sink_advf;
+	if(sink && (*sink = ~view_sink))
+		(**sink).AddRef();
+	return LOGRESULT(S_OK);
+}
+
+HRESULT OcxControl::GetExtent(dword aspect, long index, DVTARGETDEVICE *device, SIZEL *size)
+{
+	LOGMETHOD("IViewObject2::GetExtent");
+	*size = GetRect().Size();
+	return LOGRESULT(S_OK);
+}
+
+HRESULT OcxControl::GetRect(dword aspect, RECTL *rc)
+{
+	LOGMETHOD("IViewObjectEx::GetRect(aspect = " << aspect << ")");
+	if(aspect != DVASPECT_CONTENT)
+		return E_NOTIMPL;
+	if(!rc)
+		return E_INVALIDARG;
+	*rc = ToRectL(GetRect());
+	return S_OK;
+}
+
+HRESULT OcxControl::GetViewStatus(dword *status)
+{
+	LOGMETHOD("IViewObjectEx::GetViewStatus");
+	*status = (IsTransparent() ? 0 : DVASPECT_OPAQUE);
+	return S_OK;
+}
+
+HRESULT OcxControl::QueryHitPoint(dword aspect, const RECT *bounds, POINT pos, long close_hint, dword *result)
+{
+	LOGMETHOD("IViewObjectEx::QueryHitPoint");
+	if(!result)
+		return E_INVALIDARG;
+	if(aspect != DVASPECT_CONTENT)
+		return E_FAIL;
+	*result = PtInRect(bounds, pos) ? HITRESULT_HIT : HITRESULT_OUTSIDE;
+	return S_OK;
+}
+
+HRESULT OcxControl::QueryHitRect(dword aspect, const RECT *bounds, const RECT *rc, long close_hint, dword *result)
+{
+	LOGMETHOD("IViewObjectEx::QueryHitRect");
+	if(!result)
+		return E_INVALIDARG;
+	if(aspect != DVASPECT_CONTENT)
+		return E_FAIL;
+	*result = Rect(*bounds).Contains(Rect(*rc)) ? HITRESULT_HIT : HITRESULT_OUTSIDE;
+	return S_OK;
+}
+
+HRESULT OcxControl::GetNaturalExtent(dword aspect, long index, DVTARGETDEVICE *ptd, HDC tdc, DVEXTENTINFO *extinfo, SIZEL *psize)
+{
+	LOGMETHOD("IViewObjectEx::GetNaturalExtent");
+	if(aspect != DVASPECT_CONTENT)
+		return E_FAIL;
+	if(psize)
+		*psize = GetRect().Size();
+	return S_OK;
+}
+
+HRESULT OcxControl::GetWindow(HWND *hwnd)
+{
+	LOGMETHOD("IOleWindow::GetWindow");
+	if(!hwnd)
+		return LOGRESULT(E_INVALIDARG);
+	return LOGRESULT((*hwnd = GetHWND()) ? S_OK : E_FAIL);
+}
+
+HRESULT OcxControl::ContextSensitiveHelp(BOOL enter_mode)
+{
+	LOGMETHOD("IOleWindow::ContextSensitiveHelp");
+	return LOGRESULT(S_OK);
+}
+
+HRESULT OcxControl::InPlaceDeactivate()
+{
+	LOGMETHOD("IOleInPlaceObject::InPlaceDeactivate");
+	if(!IsActive())
+		return LOGRESULT(S_OK);
+	UIDeactivate();
+	if(!!in_place_site)
+		in_place_site->OnInPlaceDeactivate();
+	if(IsOpen() && !IsChild())
+		Ctrl::Close();
+	in_place_site.Clear();
+	client_site.Clear();
+	status = CLOSED;
+	return LOGRESULT(S_OK);
+}
+
+HRESULT OcxControl::UIDeactivate()
+{
+	LOGMETHOD("IOleInPlaceObject::UIDeactivate");
+
+	if(!IsUIActive())
+		return LOGRESULT(S_OK); // no work needed when not UI active
+
+	if(!in_place_site)
+		return LOGRESULT(E_FAIL);
+
+	SetActiveObject(false);
+	return LOGRESULT(in_place_site->OnUIDeactivate(false));
+}
+
+HRESULT OcxControl::SetObjectRects(const RECT *pos, const RECT *clip)
+{
+	LOGMETHOD("IOleInPlaceObject::SetObjectRects(pos = " << Rect(*pos) << ", clip = " << Rect(*clip) << ")");
+	if(!pos || !clip)
+		return LOGRESULT(E_INVALIDARG);
+	Rect rc(Point(pos->left, pos->top), extent_size);
+	OCXLOG("-> Ctrl rc = " << rc << " (extent size = " << extent_size << ")");
+	SetRect(rc);
+	return LOGRESULT(S_OK);
+}
+
+HRESULT OcxControl::ReactivateAndUndo()
+{
+	LOGMETHOD("IOleInPlaceObject::ReactivateAndUndo");
+	if(!IsActive())
+		return OLE_E_NOT_INPLACEACTIVE;
+	return DoVerbUIActivate();
+}
+
+HRESULT OcxControl::TranslateAccelerator(MSG *msg)
+{
+	LOGMETHOD("IOleInPlaceObject::TranslateAccelerator");
+	dword keycode = 0;
+	if(msg->message == WM_KEYDOWN)
+		keycode = KEYtoK(msg->wParam);
+	else if(msg->message == WM_KEYUP)
+		keycode = KEYtoK(msg->wParam) | K_KEYUP;
+	else if(msg->message == WM_SYSKEYDOWN && (msg->lParam & 0x20000000))
+		keycode = KEYtoK(msg->wParam);
+	else if(msg->message == WM_SYSKEYUP && (msg->lParam & 0x20000000))
+		keycode = KEYtoK(msg->wParam) | K_KEYUP;
+	else if(msg->message == WM_CHAR)
+		keycode = msg->wParam;
+	if(keycode == 0 || !IsActive() || !IsEnabled() || !IsVisible())
+		return LOGRESULT(S_FALSE);
+
+	return LOGRESULT(HotKey(keycode) ? S_OK : S_FALSE);
+}
+
+HRESULT OcxControl::OnFrameWindowActivate(BOOL activate)
+{
+	LOGMETHOD("IOleInPlaceObject::OnFrameWindowActivate");
+	Refresh();
+	return LOGRESULT(S_OK);
+}
+
+HRESULT OcxControl::OnDocWindowActivate(BOOL activate)
+{
+	LOGMETHOD("IOleInPlaceObject::OnDocWindowActivate");
+	Refresh();
+	return LOGRESULT(S_OK);
+}
+
+HRESULT OcxControl::ResizeBorder(const RECT *border, IOleInPlaceUIWindow *ui, BOOL frame)
+{
+	LOGMETHOD("IOleInPlaceObject::ResizeBorder");
+	Refresh();
+	return LOGRESULT(S_OK);
+}
+
+HRESULT OcxControl::EnableModeless(BOOL enable)
+{
+	LOGMETHOD("IOleInPlaceObject::EnableModeless");
+	return LOGRESULT(S_OK);
+}
+
+HRESULT OcxControl::GetControlInfo(CONTROLINFO *cinfo)
+{
+	LOGMETHOD("IOleControl::GetControlInfo");
+	if(!cinfo)
+		return LOGRESULT(E_INVALIDARG);
+	cinfo->hAccel = 0;
+	cinfo->cAccel = 0;
+	cinfo->dwFlags = 0; // by default eat neither Return nor Escape
+	return LOGRESULT(S_OK);
+}
+
+HRESULT OcxControl::OnMnemonic(MSG *msg)
+{
+	LOGMETHOD("IOleControl::OnMnemonic");
+	return LOGRESULT(S_OK);
+}
+
+HRESULT OcxControl::OnAmbientPropertyChange(DISPID dispid)
+{
+	LOGMETHOD("IOleControl::OnAmbientPropertyChange");
+	return LOGRESULT(S_OK);
+}
+
+HRESULT OcxControl::FreezeEvents(BOOL freeze)
+{
+	LOGMETHOD("IOleControl::FreezeEvents(" << (freeze ? "on" : "off") << ")");
+	return LOGRESULT(S_OK);
+}
+
+HRESULT OcxControl::DoVerbPrimary()
+{
+	LOGMETHOD("DoVerbPrimary");
+	return LOGRESULT(ShowControl(true));
+}
+
+HRESULT OcxControl::DoVerbShow()
+{
+	LOGMETHOD("DoVerbShow");
+	return LOGRESULT(ShowControl(false));
+}
+
+HRESULT OcxControl::ShowControl(bool ui_activate)
+{
+	LOGMETHOD("OcxControl::ShowControl(" << (ui_activate ? "UI activate" : "") << ")");
+
+	if(!in_place_site)
+		return LOGRESULT(E_FAIL);
+
+	HRESULT hr;
+
+	if(!IsActive())
+	{
+		HWND parent = 0;
+
+		if((hr = in_place_site->CanInPlaceActivate()) != S_OK
+		|| FAILED(hr = in_place_site->OnInPlaceActivate())
+		|| FAILED(hr = in_place_site->GetWindow(&parent)))
+			return LOGRESULT(hr);
+
+		if(!parent || !::IsWindow(parent))
+			return E_FAIL;
+
+		UpdateControlRect();
+
+		if(!Open(parent))
+			return LOGRESULT(E_FAIL);
+
+		Show();
+		Enable();
+
+// todo: fire view change
+//		if(view_sink)
+//		{
+//			view_sink->OnViewChange(DVASPECT_CONTENT, -1);
+//			if(view_sink_advf & ADVF_ONLYONCE)
+//				view_sink = 0;
+//		}
+//
+	}
+
+	if(ui_activate && !IsUIActive() && SUCCEEDED(in_place_site->OnUIActivate()))
+		status = UIACTIVE;
+
+	Show();
+	Enable();
+	if(!HasFocusDeep() && !SetWantFocus() && GetFirstChild())
+		IterateFocusForward(GetFirstChild(), this);
+	SetActiveObject(true);
+
+	return LOGRESULT(client_site->ShowObject());
+}
+
+HRESULT OcxControl::DoVerbInPlaceActivate()
+{
+	LOGMETHOD("DoVerbInPlaceActivate");
+	return LOGRESULT(ShowControl(false));
+}
+
+HRESULT OcxControl::DoVerbUIActivate()
+{
+	LOGMETHOD("DoVerbUIActivate");
+	return LOGRESULT(ShowControl(true));
+}
+
+HRESULT OcxControl::DoVerbHide()
+{
+	LOGMETHOD("DoVerbHide");
+	Hide();
+//	Close(false);
+	return LOGRESULT(S_OK);
+}
+
+HRESULT OcxControl::DoVerbOpen()
+{
+	LOGMETHOD("DoVerbOpen");
+	return LOGRESULT(ShowControl(false));
+}
+
+HRESULT OcxControl::DoVerbDiscardUndo()
+{
+	LOGMETHOD("DoVerbDiscardUndo");
+	return LOGRESULT(S_OK);
+}
+
+HRESULT OcxControl::DoVerbProperties()
+{
+	LOGMETHOD("DoVerbProperties");
+	return LOGRESULT(S_OK);
+}
+
+void OcxControl::UpdateControlRect()
+{
+	LOGMETHOD("OcxControl::UpdateControlRect");
+
+	if(!in_place_site)
+		return;
+
+	IOleInPlaceFramePtr frame;
+	IOleInPlaceUIWindowPtr ui_window;
+	OLEINPLACEFRAMEINFO frame_info = { sizeof(frame_info) };
+	Rect rc, clip;
+	if(FAILED(in_place_site->GetWindowContext(&frame, &ui_window, rc, clip, &frame_info)))
+		return;
+
+	OCXLOG("Control rect: " << rc << ", clip = " << clip);
+	SetRect(rc);
+}
+
+void OcxControl::SetActiveObject(bool set)
+{
+	LOGMETHOD("OcxControl::SetActiveObject");
+	if(!in_place_site)
+		return;
+
+	IRef<IOleInPlaceFrame> frame;
+	IRef<IOleInPlaceUIWindow> ui_window;
+	OLEINPLACEFRAMEINFO frame_info = { sizeof(frame_info) };
+	Rect rc, clip;
+	if(FAILED(in_place_site->GetWindowContext(frame.Set(), ui_window.Set(), rc, clip, &frame_info)))
+		return;
+
+	if(!!frame) {
+		frame->SetActiveObject(set ? this : 0, 0);
+		if(set)
+			frame->SetBorderSpace(0);
+	}
+	if(!!ui_window) {
+		ui_window->SetActiveObject(set ? this : 0, 0);
+		if(set)
+			ui_window->SetBorderSpace(0);
+	}
+}
+
+void OcxControl::RefreshSink()
+{
+	LOGMETHOD("OcxControl::RefreshSink");
+	if(!!view_sink)
+		view_sink->OnViewChange(DVASPECT_CONTENT, -1);
+}
+
+HRESULT OcxControl::GetActivationPolicy(DWORD *pdwPolicy)
+{
+	LOGMETHOD("IPointerInactive::GetActivationPolicy");
+	*pdwPolicy = POINTERINACTIVE_ACTIVATEONENTRY;
+	return LOGRESULT(S_OK);
+}
+
+HRESULT OcxControl::OnInactiveMouseMove(LPCRECT pRectBounds, LONG x, LONG y, DWORD grfKeyState)
+{
+	LOGMETHOD("IPointerInactive::OnInactiveMouseMove");
+	return S_OK;
+}
+
+HRESULT OcxControl::OnInactiveSetCursor(LPCRECT pRectBounds, LONG x, LONG y, DWORD dwMouseMsg, BOOL fSetAlways)
+{
+	LOGMETHOD("IPointerInactive::InactiveSetCursor");
+	return S_OK;
+}
+
+HRESULT OcxRunnableControl::GetRunningClass(GUID *clsid)
+{
+	LOGMETHOD("IRunnableObject::GetRunningClass");
+	*clsid = __uuidof(0);
+	return LOGRESULT(E_UNEXPECTED);
+}
+
+HRESULT OcxRunnableControl::Run(LPBC ctx)
+{
+	LOGMETHOD("IRunnableObject::Run");
+	return LOGRESULT(S_OK);
+}
+
+BOOL OcxRunnableControl::IsRunning()
+{
+	LOGMETHOD("IRunnableObject::IsRunning");
+	return true;
+}
+
+HRESULT OcxRunnableControl::LockRunning(BOOL lock, BOOL last_unlock_closes)
+{
+	LOGMETHOD("IRunnableObject::LockRunning");
+	return LOGRESULT(S_OK);
+}
+
+HRESULT OcxRunnableControl::SetContainedObject(BOOL contained)
+{
+	LOGMETHOD("IRunnableObject::SetContainedObject");
+	return LOGRESULT(S_OK);
+}
+
+HRESULT STDMETHODCALLTYPE OcxConnectionPoint::Enumerator::Next(unsigned long count, CONNECTDATA *data, unsigned long *fetched)
+{
+	LOGMETHOD("IConnectionPoint::IEnumConnections::Next(" << (int)count << ")");
+	if(!point)
+		return LOGRESULT(E_FAIL);
+	if(count == 0 || !data || !fetched)
+		return LOGRESULT(E_INVALIDARG);
+	int avail = min<int>(count, point->conn_map.GetCount() - index);
+	if(avail <= 0)
+	{
+		*fetched = 0;
+		return LOGRESULT(S_OK);
+	}
+	*fetched = avail;
+	while(--avail >= 0)
+	{
+		data->pUnk = point->conn_map[index].AddRef();
+		data->dwCookie = point->conn_map.GetKey(index);
+		index++;
+		data++;
+	}
+	return LOGRESULT(S_OK);
+}
+
+HRESULT STDMETHODCALLTYPE OcxConnectionPoint::Enumerator::Skip(unsigned long connections)
+{
+	LOGMETHOD("IConnectionPoint::IEnumConnections::Skip(" << (int)connections << ")");
+	index += connections;
+	return LOGRESULT(S_OK);
+}
+
+HRESULT STDMETHODCALLTYPE OcxConnectionPoint::Enumerator::Reset()
+{
+	LOGMETHOD("IConnectionPoint::IEnumConnections::Reset()");
+	index = 0;
+	return LOGRESULT(S_OK);
+}
+
+HRESULT STDMETHODCALLTYPE OcxConnectionPoint::Enumerator::Clone(IEnumConnections **enum_conn)
+{
+	LOGMETHOD("IConnectionPoint::IEnumConnections::Clone()");
+	Enumerator *enumerator = new OcxObjectWrapper<Enumerator>;
+	enumerator->Attach(~point);
+	*enum_conn = enumerator;
+	return LOGRESULT(S_OK);
+}
+
+HRESULT STDMETHODCALLTYPE OcxConnectionPoint::GetConnectionInterface(IID *iid)
+{
+	LOGMETHOD("IConnectionPoint::GetConnectionInterface()");
+	*iid = guid;
+	return LOGRESULT(S_OK);
+}
+
+HRESULT STDMETHODCALLTYPE OcxConnectionPoint::GetConnectionPointContainer(IConnectionPointContainer **cpc)
+{
+	LOGMETHOD("IConnectionPoint::GetConnectionPointContainer()");
+	*cpc = container;
+	if(container)
+	{
+		container->AddRef();
+		return LOGRESULT(S_OK);
+	}
+	return LOGRESULT(E_FAIL);
+}
+
+HRESULT STDMETHODCALLTYPE OcxConnectionPoint::Advise(IUnknown *ptr, DWORD *cookie)
+{
+	LOGMETHOD("IConnectionPoint::Advise()");
+	IRef<IDispatch> pif;
+	if(!cookie || !ptr || FAILED(ptr->QueryInterface(guid, pif.SetVoid())))
+		return LOGRESULT(E_INVALIDARG); // required interface not found
+	*cookie = (free_id.IsEmpty() ? conn_map.GetCount() : free_id.Pop());
+	conn_map.Add(*cookie) = pif;
+	return LOGRESULT(S_OK);
+}
+
+HRESULT STDMETHODCALLTYPE OcxConnectionPoint::Unadvise(DWORD cookie)
+{
+	LOGMETHOD("IConnectionPoint::Unadvise(" << (int)cookie << ")");
+	int p = conn_map.Find(cookie);
+	if(p < 0)
+		return LOGRESULT(E_INVALIDARG);
+	conn_map.Remove(p);
+	free_id.Add(cookie);
+	return LOGRESULT(S_OK);
+}
+
+HRESULT STDMETHODCALLTYPE OcxConnectionPoint::EnumConnections(IEnumConnections **enum_conn)
+{
+	LOGMETHOD("IConnectionPoint::EnumConnections()");
+	Enumerator *enumerator = new OcxObjectWrapper<Enumerator>;
+	enumerator->Attach(this);
+	*enum_conn = enumerator;
+	return LOGRESULT(S_OK);
+}
+
+void OcxConnectionPoint::FireEvent(int method_id, const Vector<Value>& values)
+{
+	LOGMETHOD("OcxConnectionPoint::FireEvent");
+	int i, nargs = values.GetCount();
+	Buffer<VARIANTARG> args(nargs);
+	for(i = 0; i < nargs; i++)
+	{
+		VARIANTARG& out = args[i];
+		out.vt = VT_EMPTY;
+		VariantCopy(&out, &ValueToVariant(values[nargs - i - 1]));
+	}
+	DISPPARAMS disp = { args, 0, nargs, 0 };
+	for(i = 0; i < conn_map.GetCount(); i++)
+		conn_map[i]->Invoke(method_id, IID_NULL, 0, DISPATCH_METHOD, &disp, NULL,  NULL, NULL);
+	for(i = 0; i < nargs; i++)
+		VariantClear(&args[i]);
+}
+
+HRESULT STDMETHODCALLTYPE OcxConnectionPointContainer::Enumerator::Next(unsigned long count, IConnectionPoint **data, unsigned long *fetched)
+{
+	LOGMETHOD("IConnectionPointContainer::IEnumConnectionPoints::Next(" << (int)count << ")");
+	if(!point)
+		return LOGRESULT(E_FAIL);
+	if(count == 0 || !data || !fetched)
+		return LOGRESULT(E_INVALIDARG);
+	int avail = min<int>(count, point->point_map.GetCount() - index);
+	if(avail <= 0)
+	{
+		*fetched = 0;
+		return LOGRESULT(S_OK);
+	}
+	*fetched = avail;
+	while(--avail >= 0)
+	{
+		*data = point->point_map[index];
+		(*data)->AddRef();
+		index++;
+		data++;
+	}
+	return LOGRESULT(S_OK);
+}
+
+HRESULT STDMETHODCALLTYPE OcxConnectionPointContainer::Enumerator::Skip(unsigned long connections)
+{
+	LOGMETHOD("IConnectionPointContainer::IEnumConnectionPoints::Skip(" << (int)connections << ")");
+	index += connections;
+	return LOGRESULT(S_OK);
+}
+
+HRESULT STDMETHODCALLTYPE OcxConnectionPointContainer::Enumerator::Reset()
+{
+	LOGMETHOD("IConnectionPointContainer::IEnumConnectionPoints::Reset()");
+	index = 0;
+	return LOGRESULT(S_OK);
+}
+
+HRESULT STDMETHODCALLTYPE OcxConnectionPointContainer::Enumerator::Clone(IEnumConnectionPoints **enum_conn)
+{
+	LOGMETHOD("IConnectionPointContainer::IEnumConnectionPoints::Clone()");
+	Enumerator *enumerator = new OcxObjectWrapper<Enumerator>;
+	enumerator->Attach(~point);
+	*enum_conn = enumerator;
+	return LOGRESULT(S_OK);
+}
+
+OcxConnectionPointContainer::OcxConnectionPointContainer()
+{
+}
+
+HRESULT OcxConnectionPointContainer::EnumConnectionPoints(IEnumConnectionPoints **ppEnum)
+{
+	LOGMETHOD("IConnectionPointContainer::EnumConnectionPoints()");
+	Enumerator *enumerator = new OcxObjectWrapper<Enumerator>;
+	enumerator->Attach(this);
+	*ppEnum = enumerator;
+	return LOGRESULT(S_OK);
+}
+
+HRESULT OcxConnectionPointContainer::FindConnectionPoint(REFIID riid, IConnectionPoint **ppCP)
+{
+	Guid guid(riid);
+	LOGMETHOD("IConnectionPointContainer::FindConnectionPoint(" << guid << ", ppCP = " << FormatIntHex(ppCP) << ")");
+	int i = point_map.Find(guid);
+	RLOG("point_map.Find(guid) = " << i);
+	if(i < 0) {
+		*ppCP = 0;
+		return LOGRESULT(CONNECT_E_NOCONNECTION);
+	}
+	(*ppCP = point_map[i])->AddRef();
+	return LOGRESULT(S_OK);
+}
+
+END_UPP_NAMESPACE
+
+#endif
diff --git a/uppsrc/Ole/Ctrl/ocx.def b/uppsrc/Ole/Ctrl/ocx.def
new file mode 100644
index 000000000..6f15a241b
--- /dev/null
+++ b/uppsrc/Ole/Ctrl/ocx.def
@@ -0,0 +1,7 @@
+LIBRARY	"test.ocx"
+
+EXPORTS
+	DllCanUnloadNow     PRIVATE
+	DllGetClassObject   PRIVATE
+	DllRegisterServer   PRIVATE
+	DllUnregisterServer	PRIVATE
diff --git a/uppsrc/Ole/Ctrl/selftest.cpp b/uppsrc/Ole/Ctrl/selftest.cpp
new file mode 100644
index 000000000..6c5e358b9
--- /dev/null
+++ b/uppsrc/Ole/Ctrl/selftest.cpp
@@ -0,0 +1,25 @@
+#include <Ole/Ctrl/OleCtrl.h>
+
+#ifdef flagMAIN
+
+BOOL WINAPI DllMain(HINSTANCE hinstDll, DWORD fdwReason, LPVOID lpReserved)
+{
+	switch(fdwReason) {
+		case DLL_PROCESS_ATTACH: {
+			Ctrl::InitWin32(hinstDll);
+			AppInitEnvironment__();
+			break;
+		}
+		case DLL_PROCESS_DETACH: {
+			Ctrl::CloseTopCtrls();
+			break;
+		}
+		case DLL_THREAD_ATTACH:
+			break;
+		case DLL_THREAD_DETACH:
+			break;
+	}
+	return true;
+}
+
+#endif
diff --git a/uppsrc/Ole/Ctrl/util.cpp b/uppsrc/Ole/Ctrl/util.cpp
new file mode 100644
index 000000000..d81136573
--- /dev/null
+++ b/uppsrc/Ole/Ctrl/util.cpp
@@ -0,0 +1,740 @@
+#include <Ole/Ctrl/OleCtrl.h>
+
+#ifdef PLATFORM_WIN32
+
+NAMESPACE_UPP
+
+enum { HIMETRIC_INCH = 2540 }; // HIMETRIC units per inch
+
+Draw& ScreenInfo();
+
+Size ToHiMetric(Size pixel_size)
+{
+	static Size logdpi = ScreenInfo().GetSizeCaps(LOGPIXELSX, LOGPIXELSY);
+	return Size(
+		iscaleceil(pixel_size.cx, HIMETRIC_INCH, logdpi.cx),
+		iscaleceil(pixel_size.cy, HIMETRIC_INCH, logdpi.cy));
+}
+
+Size FromHiMetric(Size himetric_size)
+{
+	static Size logdpi = ScreenInfo().GetSizeCaps(LOGPIXELSX, LOGPIXELSY);
+	return Size(
+		iscalefloor(himetric_size.cx, logdpi.cx, HIMETRIC_INCH),
+		iscalefloor(himetric_size.cy, logdpi.cy, HIMETRIC_INCH));
+}
+
+Rect GetWindow(HDC hdc)
+{
+	Point pt;
+	Size sz;
+	GetWindowOrgEx(hdc, pt);
+	GetWindowExtEx(hdc, sz);
+	return Rect(pt, sz);
+}
+
+Rect GetViewport(HDC hdc)
+{
+	Point pt;
+	Size sz;
+	GetViewportOrgEx(hdc, pt);
+	GetViewportExtEx(hdc, sz);
+	return Rect(pt, sz);
+}
+
+OcxObject::OcxObject()
+: ocx_info(0)
+{
+	inner_unknown.owner = this;
+	outer_unknown = NULL;
+}
+
+int OcxObject::ExternalAddRef()
+{
+	if(outer_unknown) {
+		int res = outer_unknown->AddRef();
+#if LOG_ADDREFS
+		OCXLOG("OcxObject::ExternalAddRef -> outer(" << FormatIntHex(outer_unknown) << ") -> " << res);
+#endif
+		return res;
+	}
+	return InternalAddRef();
+}
+
+int OcxObject::ExternalRelease()
+{
+	if(outer_unknown) {
+		int res = outer_unknown->Release();
+#if LOG_ADDREFS
+		// note: this might have been destructed by this time
+		OCXLOG("OcxObject::ExternalRelease -> outer(" << FormatIntHex(outer_unknown) << ") -> " << res);
+#endif
+		return res;
+	}
+	return InternalRelease();
+}
+
+HRESULT OcxObject::ExternalQueryInterface(const GUID& iid, void **ppv)
+{
+	if(outer_unknown) {
+		HRESULT hr = outer_unknown->QueryInterface(iid, ppv);
+#if LOG_QUERIES >= 2
+		OCXLOG("OcxObject::ExternalQueryInterface(" << GetInterfaceName(iid) << ") -> outer(" << FormatIntHex(outer_unknown) << ") -> " << FormatIntHex(hr));
+#endif
+		return hr;
+	}
+	return InternalQueryInterface(iid, ppv);
+}
+
+HRESULT OcxObject::InternalQueryInterface(const GUID& iid, void **ppv)
+{
+#if LOG_QUERIES >= 2
+	OCXLOG("OcxObject::InternalQueryInterface -> " << GetInterfaceName(iid));
+#endif
+	int i;
+	IUnknown *punk;
+	if(iid == IID_IUnknown)
+		punk = static_cast<IUnknown *>(&inner_unknown);
+	else if((i = interface_map.Find(iid)) >= 0)
+		punk = interface_map[i];
+	else {
+		*ppv = 0;
+#if LOG_QUERIES >= 1
+		String name;
+		if(ocx_info)
+			name = ocx_info->GetName();
+		else
+			name = "<unknown object>";
+#endif
+		LOGQUERY("\t\tcast ERROR: " << name << " -> "<< GetInterfaceName(iid) << ", " << Guid(iid));
+#if LOG_QUERIES >= 3
+		OCXLOG("\tGUID = " << Format(iid));
+		for(int i = 0; i < interface_map.GetCount(); i++) {
+			const GUID& imid = interface_map.GetKey(i);
+			String n = GetInterfaceName(imid);
+			if(n.GetLength() < 30)
+				n.Cat(' ', 30 - n.GetLength());
+			OCXLOG("\t\t\t" << n << " - " << Format(imid));
+		}
+#endif
+		return E_NOINTERFACE;
+	}
+	punk->AddRef();
+	*ppv = punk;
+#if LOG_QUERIES >= 2
+	String name;
+	if(ocx_info)
+		name = ocx_info->GetName();
+	else
+		name = "<unknown object>";
+	OCXLOG("\t\tcast OK:    " << name << " -> " << GetInterfaceName(iid));
+#endif
+	return S_OK;
+}
+
+HRESULT OcxObject::RawGetTypeInfo(IRef<ITypeInfo>& typeinfo, unsigned tinfo, LCID lcid, ITypeInfo **ppinfo)
+{
+	if(tinfo != 0)
+		return DISP_E_BADINDEX;
+	if(!typeinfo)
+		return E_FAIL;
+	// currently ignore lcid
+	*ppinfo = typeinfo.AddRef();
+	return S_OK;
+}
+
+HRESULT OcxObject::RawGetIDsOfNames(IRef<ITypeInfo>& typeinfo, REFIID riid, OLECHAR **names, unsigned cnames, LCID lcid, DISPID *dispid)
+{
+	if(!typeinfo)
+		return E_FAIL;
+	return typeinfo->GetIDsOfNames(names, cnames, dispid);
+}
+
+HRESULT OcxObject::RawInvoke(IRef<ITypeInfo>& typeinfo, IDispatch *dispatch, DISPID dispid, word flags, DISPPARAMS *params, VARIANT *result, EXCEPINFO *excep, unsigned *arg_err)
+{
+	LOGINVOKE("IDispatch::Invoke");
+	if(dispid == 0) { // convert object to dispatch value
+		if(!result) return E_INVALIDARG;
+		result->vt = VT_DISPATCH;
+		result->pdispVal = dispatch;
+		if(dispatch) dispatch->AddRef();
+		return S_OK;
+	}
+	if(!typeinfo) {
+		LOG("dispid = " << FormatIntHex(dispid) << ": typeinfo = NULL");
+		return E_FAIL;
+	}
+#if LOG_INVOKES >= 1
+	BSTR names[1] = { NULL };
+	unsigned count = 0;
+	typeinfo->GetNames(dispid, names, 1, &count);
+	String name;
+	if(names[0])
+		name = BSTRToString(names[0]);
+	else
+		name = FormatIntHex(dispid);
+	switch(flags) {
+	case DISPATCH_METHOD:         name << " - method"; break;
+	case DISPATCH_PROPERTYGET:    name << " - propget"; break;
+	case DISPATCH_PROPERTYPUT:    name << " - propput"; break;
+	case DISPATCH_PROPERTYPUTREF: name << " - propputref"; break;
+	}
+	LOG("Member name: " << name);
+#endif
+	if(!typeinfo)
+		return E_FAIL;
+	TYPEATTR *attr;
+	typeinfo->GetTypeAttr(&attr);
+	LOGINVOKE("GetTypeInfo: typekind = " << (int)attr->typekind);
+//	HRESULT res = typeinfo->Invoke(dispatch, dispid, flags, params, result, excep, arg_err);
+	HRESULT res = DispInvoke(dispatch, ~typeinfo, dispid, flags, params, result, excep, arg_err);
+	if(FAILED(res)) {
+		RLOG("failure: dispid = " << (int)dispid << ", #args = " << (int)params->cArgs
+			<< ", #named args = " << (int)params->cNamedArgs << ", return " << FormatIntHex(result));
+		for(int i = 0; i < (int)params->cArgs; i++) {
+			RLOG("arg[" << i << "] (vt = " << (int)params->rgvarg[i].vt << "): " << StdFormat(AsValue(params->rgvarg[i])));
+		}
+		RLOG("#funcs = " << attr->cFuncs);
+		for(int i = 0; i < attr->cFuncs; i++) {
+			FUNCDESC *func;
+			typeinfo->GetFuncDesc(i, &func);
+			RLOG("memid = " << func->memid << ", cParams " << func->cParams
+			<< ", cParamsOpt = " << func->cParamsOpt << ", cScodes " << func->cScodes
+			<< ", funckind = " << (int)func->funckind << ", invkind " << (int)func->invkind
+			<< ", flags = " << FormatIntHex(func->wFuncFlags));
+
+			typeinfo->ReleaseFuncDesc(func);
+		}
+	}
+	typeinfo->ReleaseTypeAttr(attr);
+	LOGINVOKE("//IDispatch::Invoke");
+	return LOGRESULT(res);
+}
+
+HRESULT OcxProvideClassInfo::GetClassInfo(ITypeInfo **info)
+{
+	if(!info) return E_INVALIDARG;
+	if(!ocx_info) {
+		*info = NULL;
+		return E_POINTER;
+	}
+	*info = ocx_info->GetCoClassTypeInfo().AddRef();
+	return S_OK;
+}
+
+HRESULT OcxProvideClassInfo::GetGUID(dword guidkind, GUID *guid)
+{
+	if(!guid)
+		return E_POINTER;
+	if(!ocx_info) {
+		*guid = __uuidof(0);
+		return E_NOTIMPL;
+	}
+	if(guidkind == GUIDKIND_DEFAULT_SOURCE_DISP_IID) {
+		*guid = ~ocx_info->GetEventGUID();
+		return ocx_info->GetEventGUID().IsEmpty() ? E_UNEXPECTED : S_OK;
+	}
+	return E_INVALIDARG;
+}
+
+OcxTypeInfo::OcxTypeInfo(const GUID& coclass_guid, /*const GUID& dispatch_guid,*/ const GUID& event_guid,
+	New new_fn, String name, const char* help, int ver, bool is_control)
+: coclass_guid(coclass_guid), /*dispatch_guid(dispatch_guid),*/ event_guid(event_guid)
+, new_fn(new_fn), name(name), help(help), ver(ver), is_control(is_control)
+, object_count(0)
+, refcount(1)
+, lock_count(0)
+#ifndef _USRDLL
+, registration(0)
+#endif
+{
+	RLOG("OcxTypeInfo ctr (" << name << ", " << Guid(coclass_guid) << ")");
+	OcxTypeLib::Get().Add(*this);
+}
+
+bool OcxTypeInfo::CanUnload() const
+{
+	RLOG("OcxTypeInfo::CanUnload(" << name << ", " << Guid(coclass_guid) << ")");
+	RDUMP(object_count);
+	RDUMP(refcount);
+	RDUMP(lock_count);
+	return object_count == 0 && refcount <= 1 && lock_count <= 0;
+}
+
+int OcxTypeInfo::IncRef()
+{
+	int res = InterlockedIncrement(&refcount);
+	RLOG("OcxTypeInfo::IncRef(" << name << " -> " << res << ")");
+	return res;
+}
+
+int OcxTypeInfo::DecRef()
+{
+	int res = InterlockedDecrement(&refcount);
+	RLOG("OcxTypeInfo::DecRef(" << name << " -> " << res << ")");
+	VERIFY(res > 0); // if this throws, the factory has been over-released
+	return res;
+}
+
+GLOBAL_VAR(InitProc, LateInitProc);
+GLOBAL_VAR(InitProc, LateExitProc);
+static bool inited = false;
+
+void DoLateInit()
+{
+	if(!inited) {
+		INTERLOCKED
+			if(!inited) {
+				inited = true;
+				if(LateInitProc())
+					LateInitProc()();
+			}
+	}
+}
+
+void DoLateExit()
+{
+	if(inited) {
+		INTERLOCKED
+			if(inited) {
+				inited = false;
+				if(LateExitProc())
+					LateExitProc()();
+			}
+	}
+}
+
+HRESULT OcxTypeInfo::CreateInstance(IUnknown *outer, REFIID iid, void **object)
+{
+	RLOG("OcxTypeInfo::CreateInstance(" << name << ", iid = " << Guid(iid) << ", outer = " << FormatIntHex(outer) << ")");
+	if(outer && iid != IID_IUnknown)
+		return CLASS_E_NOAGGREGATION;
+	try {
+		DoLateInit();
+		OcxObject *ocxobj = new_fn(*this);
+		LOGCREATE("\tnew " << name << ": " << object_count << " instances in system");
+		if(outer)
+			ocxobj->outer_unknown = outer;
+		HRESULT hr = ocxobj->InternalQueryInterface(iid, object);
+		LOGCREATE("//OcxTypeInfo::CreateInstance -> " << FormatIntHex(hr));
+		return hr;
+	}
+	catch(Exc e) {
+		RLOG("OcxTypeInfo::CreateInstance error: " << e);
+		return E_OUTOFMEMORY;
+	}
+	catch(...) {
+		return E_OUTOFMEMORY;
+	}
+}
+
+HRESULT OcxTypeInfo::LockServer(BOOL lock)
+{
+	RLOG("OcxTypeInfo::LockServer(" << name << ", " << lock << ")");
+	if(lock)
+		AtomicInc(lock_count);
+	else
+		VERIFY(AtomicDec(lock_count) >= 0); // over-unlock check
+	return S_OK;
+}
+
+HRESULT OcxTypeInfo::GetLicInfo(/* [out] */ LICINFO *pLicInfo)
+{
+	RLOG("OcxTypeInfo::GetLicInfo(" << name << ")");
+	if(!pLicInfo)
+		return E_INVALIDARG;
+	pLicInfo->fLicVerified = TRUE;
+	pLicInfo->fRuntimeKeyAvail = 0;
+	return S_OK;
+}
+
+HRESULT OcxTypeInfo::RequestLicKey(/* [in] */ DWORD dwReserved, /* [out] */ BSTR *pBstrKey)
+{
+	RLOG("OcxTypeInfo::RequestLicKey(" << name << ")");
+	if(!pBstrKey) return E_INVALIDARG;
+	*pBstrKey = 0;
+	return S_OK;
+}
+
+HRESULT OcxTypeInfo::CreateInstanceLic(
+	/* [in] */ IUnknown *pUnkOuter,
+	/* [in] */ IUnknown *pUnkReserved,
+	/* [in] */ REFIID riid,
+	/* [in] */ BSTR bstrKey,
+	/* [iid_is][out] */ PVOID *ppvObj)
+{
+	RLOG("OcxTypeInfo::CreateInstanceLic(" << name << ")");
+	return CreateInstance(pUnkOuter, riid, ppvObj);
+}
+
+void OcxTypeInfo::GetDispatchTypeInfo(IRef<ITypeInfo>& dest, Guid dispatch_iid)
+{
+	if(!dest) {
+		CriticalSection::Lock lock(critical);
+		if(!dest)
+			dest = OcxTypeLib::Get().GetTypeInfo(dispatch_iid);
+	}
+}
+
+IRef<ITypeInfo> OcxTypeInfo::GetCoClassTypeInfo()
+{
+	if(!coclass_info && !coclass_guid.IsEmpty()) { // oportunity lock used to initialize type info
+		critical.Enter();
+		if(!coclass_info)
+			coclass_info = OcxTypeLib::Get().GetTypeInfo(coclass_guid);
+		critical.Leave();
+	}
+	return coclass_info;
+}
+
+OcxTypeLib::OcxTypeLib()
+: lib_ver(1)
+{
+	CoInitialize(0);
+}
+
+OcxTypeLib& OcxTypeLib::Get()
+{
+	static OcxTypeLib ocx;
+	return ocx;
+}
+
+String OcxTypeLib::GetLibName() const
+{
+	if(!IsNull(lib_name))
+		return lib_name;
+	String s = ToLower(GetFileTitle(GetModuleFileName()));
+	if(!IsNull(s))
+		s.Set(0, ToUpper(s[0]));
+	return s;
+}
+
+bool OcxTypeLib::CanUnload() const
+{
+	for(int i = 0; i < objects.GetCount(); i++)
+		if(!objects[i]->CanUnload()) {
+			OCXLOG("OcxTypeLib::CanUnload failed for " << objects[i]->GetName());
+			return false;
+		}
+	OCXLOG("OcxTypeLib::CanUnload succeeded");
+	return true;
+}
+
+IRef<ITypeInfo> OcxTypeLib::GetTypeInfo(const Guid& guid)
+{
+	IRef<ITypeInfo> outinfo;
+	HRESULT hr = GetTypeLib()->GetTypeInfoOfGuid(guid, outinfo.Set());
+	if(FAILED(hr)) {
+		LOGSYSOCX("OcxTypeLib::GetTypeInfo(" << guid << ") -> hr = " << FormatIntHex(hr));
+		for(int i = 0; i < uses_libraries.GetCount(); i++) {
+			if(!uses_libraries[i]) {
+				String libname = uses_libraries.GetKey(i);
+				WString wlibname = libname.ToWString();
+				hr = LoadTypeLib(wlibname, uses_libraries[i].Set());
+				if(!uses_libraries[i]) {
+					LOGSYSOCX("LoadTypeLib(" << libname << ") -> hr = " << FormatIntHex(hr));
+				}
+				else {
+					LOGSYSOCX("LoadTypeLib(" << uses_libraries.GetKey(i) << ") -> succeeded");
+					if(IsFullPath(libname)) {
+						hr = RegisterTypeLib(~uses_libraries[i], const_cast<OLECHAR *>(~wlibname), NULL);
+						LOGSYSOCX("RegisterTypeLib(" << libname << ") -> hr = " << FormatIntHex(hr));
+					}
+				}
+			}
+			if(!!uses_libraries[i]) {
+				hr = uses_libraries[i]->GetTypeInfoOfGuid(guid, outinfo.Set());
+				if(!!outinfo)
+					return outinfo;
+				LOGSYSOCX("GetTypeInfoOfGuid(" << uses_libraries.GetKey(i) << ") -> hr = " << FormatIntHex(hr));
+			}
+		}
+	}
+	return outinfo;
+}
+
+HRESULT OcxTypeLib::Register()
+{
+	String modname = GetModuleFileName();
+	String lib_name = GetLibName();
+	LOGSYSOCX("Registering library \"" << modname << '\"');
+
+	HRESULT hr;
+	IRef<ITypeLib>& typelib = GetTypeLib();
+	if(!typelib)
+		return SELFREG_E_TYPELIB;
+	TLIBATTR *attr;
+	if(FAILED(hr = typelib->GetLibAttr(&attr)))
+		return hr;
+	String lib_guid = Guid(attr->guid);
+	typelib->ReleaseTLibAttr(attr);
+
+	for(int i = 0; i < objects.GetCount(); i++) {
+		const OcxTypeInfo& entry = *objects[i];
+		String progID = lib_name;
+		String verID = progID << '.' << entry.name;
+		verID << '.' << (entry.ver ? entry.ver : lib_ver);
+		String guid = entry.coclass_guid;
+		LOGSYSOCX("Registering object " << verID << ", CLSID = " << guid);
+		String clss_key = "CLSID\\" + guid;
+#ifdef _USRDLL
+		String server = clss_key + "\\InprocServer32";
+#endif
+		String version;
+		version << lib_ver << '.' << entry.ver;
+		String help = entry.help;
+		if(IsNull(help)) {
+			if(!IsNull(display_name))
+				help << display_name << ' ';
+			help << entry.name << (entry.IsControl() ? " Control " : " Object ") << version;
+		}
+		DeleteWinReg(verID, HKEY_CLASSES_ROOT);
+		DeleteWinReg(progID, HKEY_CLASSES_ROOT);
+		DeleteWinReg(clss_key, HKEY_CLASSES_ROOT);
+		if(!SetWinRegString(help,        NULL,              verID, HKEY_CLASSES_ROOT)
+		|| !SetWinRegString(guid,        NULL,              verID + "\\CLSID", HKEY_CLASSES_ROOT)
+		|| !SetWinRegString(help,        NULL,              progID, HKEY_CLASSES_ROOT)
+		|| !SetWinRegString(guid,        NULL,              progID + "\\CLSID", HKEY_CLASSES_ROOT)
+		|| !SetWinRegString(help,        NULL,              clss_key, HKEY_CLASSES_ROOT)
+		|| !SetWinRegString(verID,       NULL,              clss_key + "\\ProgID", HKEY_CLASSES_ROOT)
+		|| !SetWinRegString(progID,      NULL,              clss_key + "\\VersionIndependentProgID", HKEY_CLASSES_ROOT)
+		|| !SetWinRegString(lib_guid,    NULL,              clss_key + "\\TypeLib", HKEY_CLASSES_ROOT)
+#ifdef _USRDLL
+		|| !SetWinRegString(modname,     NULL,              server, HKEY_CLASSES_ROOT)
+		|| !SetWinRegString("Apartment", "ThreadingModel",  server, HKEY_CLASSES_ROOT)
+#else
+		|| !SetWinRegString(modname,     NULL,              clss_key + "\\LocalServer32", HKEY_CLASSES_ROOT)
+		|| !SetWinRegString(modname,     NULL,              clss_key + "\\LocalServer", HKEY_CLASSES_ROOT)
+		|| !SetWinRegString("ole32.dll", NULL,              clss_key + "\\InprocHandler32", HKEY_CLASSES_ROOT)
+		|| !SetWinRegString("ole2.dll",  NULL,              clss_key + "\\InprocHandler", HKEY_CLASSES_ROOT)
+#endif
+		|| !SetWinRegString(version,     NULL,              clss_key + "\\Version", HKEY_CLASSES_ROOT))
+			return REGDB_E_WRITEREGDB;
+		if(entry.IsControl()) {
+			if(!SetWinRegString("",              NULL, clss_key + "\\Control", HKEY_CLASSES_ROOT)
+			|| !SetWinRegString(modname + ", 1", NULL, clss_key + "\\ToolboxBitmap32", HKEY_CLASSES_ROOT)
+			|| !SetWinRegString("",              NULL, verID + "\\Insertable", HKEY_CLASSES_ROOT)
+			|| !SetWinRegString("",              NULL, progID + "\\Insertable", HKEY_CLASSES_ROOT)
+			|| !SetWinRegString("",              NULL, clss_key + "\\Insertable", HKEY_CLASSES_ROOT))
+				return REGDB_E_WRITEREGDB;
+		}
+	}
+
+//	UniStr ulib = modname;
+	OleBstr ulib(modname);
+	if(FAILED(hr = RegisterTypeLib(~typelib, (wchar_t *)~ulib, ~ulib)))
+		return hr;
+	return S_OK;
+}
+
+HRESULT OcxTypeLib::Unregister()
+{
+	String lib = GetModuleFileName();
+	String lib_name = GetLibName();
+	LOGSYSOCX("Unregistering library \"" << lib << '\"');
+	for(int i = 0; i < objects.GetCount(); i++) {
+		const OcxTypeInfo& entry = *objects[i];
+		String progID = lib_name;
+		String verID = progID << '.' << entry.name;
+		verID << '.' << (entry.ver ? entry.ver : lib_ver);
+		DeleteWinReg(verID, HKEY_CLASSES_ROOT);
+		DeleteWinReg(progID, HKEY_CLASSES_ROOT);
+		DeleteWinReg("CLSID\\" + String(entry.coclass_guid), HKEY_CLASSES_ROOT);
+		DeleteWinReg("SOFTWARE\\Classes\\" + verID, HKEY_LOCAL_MACHINE);
+	}
+
+	IRef<ITypeLib>& typelib = GetTypeLib();
+	if(!typelib)
+		return SELFREG_E_TYPELIB;
+	TLIBATTR *attr;
+	HRESULT hr;
+	if(FAILED(hr = typelib->GetLibAttr(&attr)))
+		return hr;
+	hr = UnRegisterTypeLib(attr->guid,
+		attr->wMajorVerNum, attr->wMinorVerNum,
+		attr->lcid, attr->syskind);
+	typelib->ReleaseTLibAttr(attr);
+	return hr;
+}
+
+/*
+#ifndef _USRDLL
+HRESULT OcxTypeLib::RegisterObjects()
+{
+	for(int i = 0; i < objects.GetCount(); i++) {
+		OcxTypeInfo& entry = *objects[i];
+		HRESULT hr;
+		if(FAILED(hr = CoRegisterClassObject(entry.GetCoClassGUID(), &entry,
+			CLSCTX_SERVER, REGCLS_MULTIPLEUSE, &entry.registration))) {
+			RevokeObjects();
+			return hr;
+		}
+	}
+	return S_OK;
+}
+#endif
+
+#ifndef _USRDLL
+void OcxTypeLib::RevokeObjects()
+{
+	for(int i = 0; i < objects.GetCount(); i++) {
+		OcxTypeInfo& entry = *objects[i];
+		if(entry.registration) {
+			CoRevokeClassObject(entry.registration);
+			entry.registration = 0;
+		}
+	}
+}
+#endif
+*/
+
+HRESULT OcxTypeLib::GetFactory(REFCLSID rclsid, REFIID iid, void **ppv)
+{
+	Guid clsid = rclsid;
+	LOGSYSOCX("OcxTypeLib::GetFactory(clsid = " << clsid << ", iid = " << Guid(iid) << ")");
+	RLOG("#ocx_init = " << ocx_init.GetCount());
+
+	for(int i = 0; i < ocx_init.GetCount(); i++)
+		ocx_init[i]();
+	ocx_init.Clear();
+
+	RLOG("#objects = " << objects.GetCount());
+	for(int i = 0; i < objects.GetCount(); i++)
+		RLOG("object[" << i << "] = " << Guid(objects.GetKey(i)));
+
+	*ppv = 0;
+	int f = objects.Find(clsid);
+	if(f < 0)
+		return CLASS_E_CLASSNOTAVAILABLE;
+	OcxTypeInfo *entry = objects[f];
+	HRESULT res = entry->QueryInterface(iid, ppv);
+	LOGSYSOCX("//OcxTypeLib::GetFactory -> " << FormatIntHex(res));
+	return res;
+}
+
+IRef<ITypeLib>& OcxTypeLib::GetTypeLib()
+{
+	if(!typelib) { // opportunity lock used to initialize type library info
+		critical.Enter();
+		if(!typelib) {
+			WString tlibname = GetModuleFileName().ToWString();
+			HRESULT hr = LoadTypeLib(tlibname, typelib.Set());
+			LOGSYSOCX("LoadTypeLib(" << tlibname << ") -> " << FormatIntHex(~typelib) << ", hr = " << FormatIntHex(hr));
+			if(!!typelib) {
+				hr = RegisterTypeLib(~typelib, const_cast<OLECHAR *>(~tlibname), NULL);
+				LOGSYSOCX("RegisterTypeLib -> hr = " << FormatIntHex(hr));
+			}
+		}
+		critical.Leave();
+	}
+	return typelib;
+}
+
+#ifdef _USRDLL
+STDAPI DllCanUnloadNow()
+{
+	LOGSYSOCX("DllCanUnloadNow");
+//	DoLateInit();
+	return (OcxTypeLib::Get().CanUnload() ? S_OK : S_FALSE);
+}
+#endif
+
+#ifdef _USRDLL
+STDAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID* ppv)
+{
+	LOGSYSOCX("DllGetClassObject, riid = " << Guid(riid));
+	HRESULT res = OcxTypeLib::Get().GetFactory(rclsid, riid, ppv);
+	LOGSYSOCX("//DllGetClassObject -> " << FormatIntHex(res, 8) << ", ppv = " << FormatIntHex(*ppv));
+	return res;
+}
+#endif
+
+#ifdef _USRDLL
+STDAPI DllRegisterServer()
+{
+	LOGSYSOCX("DllRegisterServer");
+	try {
+		DoLateInit();
+		HRESULT hr = OcxTypeLib::Get().Register();
+		if(SUCCEEDED(hr))
+			LOGSYSOCX("-> succeeded");
+		else
+			LOGSYSOCX("-> failed: " << GetErrorMessage(hr));
+		return hr;
+	}
+	catch(_com_error e) {
+		LOGSYSOCX(e.Error());
+		return e.Error();
+	}
+}
+#endif
+
+#ifdef _USRDLL
+STDAPI DllUnregisterServer()
+{
+	LOGSYSOCX("DllUnregisterServer");
+	try {
+		DoLateInit();
+		HRESULT hr = OcxTypeLib::Get().Unregister();
+		LOGSYSOCX((SUCCEEDED(hr) ? "-> succeeded" : "-> failed"));
+		return hr;
+	}
+	catch(_com_error e) {
+		LOGSYSOCX(e.Error());
+		return e.Error();
+	}
+}
+#endif
+
+/*
+#ifndef _USRDLL
+bool ExeRegisterServer()
+{
+	LOGSYSOCX("ExeRegisterServer");
+	HRESULT hr = OcxTypeLib::Get().Register();
+	if(FAILED(hr))
+		LOGSYSOCX("-> error: " << GetErrorMessage(hr));
+	return SUCCEEDED(hr);
+}
+#endif
+*/
+
+/*
+#ifndef _USRDLL
+bool ExeUnregisterServer()
+{
+	LOGSYSOCX("ExeRegisterServer");
+	HRESULT hr = OcxTypeLib::Get().Unregister();
+	if(FAILED(hr))
+		LOGSYSOCX("-> error: " << GetErrorMessage(hr));
+	return SUCCEEDED(hr);
+}
+#endif
+*/
+
+/*
+#ifndef _USRDLL
+void ExeRunServer()
+{
+	LOGSYSOCX("ExeRunServer");
+//	PromptOK("Running server!");
+	HRESULT hr;
+	if(FAILED(hr = OcxTypeLib::Get().RegisterObjects())) {
+		LOGSYSOCX("-> registration error: " << GetErrorMessage(hr));
+		return;
+	}
+	LOGSYSOCX("-> registration OK");
+
+	MSG msg;
+	while(GetMessage(&msg, 0, 0, 0)) {
+		TranslateMessage(&msg);
+		DispatchMessage(&msg);
+	}
+	LOGSYSOCX("end of message loop");
+}
+#endif
+*/
+
+END_UPP_NAMESPACE
+
+#endif
diff --git a/uppsrc/Ole/Ole.h b/uppsrc/Ole/Ole.h
new file mode 100644
index 000000000..d73956bb9
--- /dev/null
+++ b/uppsrc/Ole/Ole.h
@@ -0,0 +1,25 @@
+#ifndef OLE_H
+#define OLE_H
+
+#include <Core/Core.h>
+
+#if defined(PLATFORM_WIN32) && !defined(PLATFORM_WINCE) && defined(COMPILER_MSC)
+
+#define Ptr Ptr_
+#define StdFont StdFont_
+#define Picture Picture_
+#define byte win32_byte_ // RpcNdr defines byte -> class with Upp::byte
+#define CY win32_CY_
+#include <comdef.h>
+#include <comip.h>
+#undef Ptr
+#undef StdFont
+#undef Picture
+#undef byte
+#undef CY
+
+#endif
+
+#include "util.h"
+
+#endif//OLE_H
diff --git a/uppsrc/Ole/Ole.upp b/uppsrc/Ole/Ole.upp
new file mode 100644
index 000000000..dfae0499f
--- /dev/null
+++ b/uppsrc/Ole/Ole.upp
@@ -0,0 +1,13 @@
+uses
+	Core;
+
+library(WIN32) ole32;
+
+file
+	Ole.h,
+	util.h,
+	util.cpp,
+	Info readonly separator,
+	COPYING,
+	COPYING-PLAIN,
+	AUTHORS;
diff --git a/uppsrc/Ole/srcdoc.tpp/all.i b/uppsrc/Ole/srcdoc.tpp/all.i
new file mode 100644
index 000000000..40b71bf53
--- /dev/null
+++ b/uppsrc/Ole/srcdoc.tpp/all.i
@@ -0,0 +1,3 @@
+TOPIC("ocx$en-us")
+#include "ocx$en-us.tpp"
+END_TOPIC
diff --git a/uppsrc/Ole/srcdoc.tpp/ocx$en-us.tpp b/uppsrc/Ole/srcdoc.tpp/ocx$en-us.tpp
new file mode 100644
index 000000000..6e956fc59
--- /dev/null
+++ b/uppsrc/Ole/srcdoc.tpp/ocx$en-us.tpp
@@ -0,0 +1,50 @@
+TITLE("Creating OCX Controls using U++")
+TOPIC_TEXT(
+"[2 $$0,0#00000000000000000000000000000000:Default][l288;i1120;a17;O9;~~~.1408;2 "
+"$$1,0#10431211400427159095818037425705:param][a83;*R6 $$2,5#31310162474203024125188417583966:caption][b83;*4 "
+"$$3,5#07864147445237544204411237157677:title][i288;O9;C2 $$4,6#40027414424643823182269349404212:item][b42;a42;2 "
+"$$5,5#45413000475342174754091244180557:text][l288;b17;a17;2 $$6,6#27521748481378242620020725143825:desc][l321;t246;C@5;1 "
+"$$7,7#20902679421464641399138805415013:code][b2503; $$8,0#65142375456100023862071332075487:separator][*@(0.0.255)2 "
+"$$9,0#83433469410354161042741608181528:base][t4167;C $$10,0#37138531426314131251341829483380:class][l288;a17;*1 "
+"$$11,11#70004532496200323422659154056402:requirement][i417;b42;a42;O9;~~~.416;2 $$12,12#10566046415157235020018451313112:tparam][b167;C2 "
+"$$13,13#92430459443460461911108080531343:item1][i288;a42;O9;C2 $$14,14#77422149456609303542238260500223:item2][*@2$(0.128.128) "
+"$$15,15#34511555403152284025741354420178:NewsDate][l321;*C$7;2 $$16,16#03451589433145915344929335295360:result][l321;b83;a83;*C$7;2 "
+"$$17,17#07531550463529505371228428965313:result`-line][l160;t4167;*C+117 $$18,5#88603949442205825958800053222425:package`-title][ "
+"$$19,0#53580023442335529039900623488521:gap][t4167;C2 $$20,20#70211524482531209251820423858195:class`-nested][b50;2 "
+"$$21,21#03324558446220344731010354752573:Par][{_}%EN-US [s2; Creating OCX Controls "
+"using U`+`+&][s0; &][s0;i150;O9; 1.-|Use the U`+`+ version later than 2005`-11`-24. "
+"There was a very nasty bug in the OCX registration routine, capable of deleting half "
+"of CLSID registry keys and consequently nuking Windows installation. (Actually, this "
+"was not a bug in the routine as such, it was a bug in one of the overloads of the "
+"AsString routine).&][s0; &][s0;i150;O9; 2.-|Add DLL to the main configuration flags. "
+"This is more or less all that`'s needed to build into aDLL (OCX is technically a "
+"DLL).&][s0; &][s0;i150;O9; 3.-|You have to build the OCX interface using MIDL. You "
+"can use a custom step to do this:&][s0; &")
+TOPIC_TEXT(
+"][s7; Custom step (extension `= idl), output files: `$(DIR)/`$(TITLE)`_idl.h,&][s7; "
+"`$(DIR)/`$(TITLE)`_idl.cpp, `$(DIR)/`$(TITLE).tlb&][s7; &][s7; midl /newtlb `$(!/I) "
+"/h `\"`$(DIR)/`$(TITLE)`_idl.h`\" /iid&][s7; `\"`$(DIR)/`$(TITLE)`_idl.cpp`\" /tlb "
+"`\"`$(DIR)/`$(TITLE).tlb`\" `\"`$(PATH)`\"&][s0; &][s0;i150;O9; 4.-|You have to define "
+"a def`-file to declare public exports, like this:&][s0; &][s7; LIBRARY `\"mycontrol.ocx`\"&][s7; "
+"&][s7; EXPORTS&][s7; DllCanUnloadNow     PRIVATE&][s7; DllGetClassObject   PRIVATE&][s7; "
+"DllRegisterServer   PRIVATE&][s7; DllUnregisterServer PRIVATE&][s0; &][s0;i150;O9; "
+"5.-|You need to put the type library (the TLB file created by MIDL from the IDL file) "
+"into your resources. Put this line on the beginning of your resource file:&][s0; "
+"&][s7; 1 TYPELIB `\"mycontrol.tlb`\"&][s0; &][s0; Do not forget to manually add `\"mycontrol.tlb`\" "
+"to the list of the resource file`'s dependencies. Otherwise next time you change "
+"the IDL file and the MIDL recompiles your TLB, TheIDE builder won`'t find out it "
+"needs to rebuild the resource script.&][s0; &][s0;i150;O9; 6.-|In the application, "
+"#include <Ole/Ctrl/OleCtrl.h> and use OCX`_APP`_MAIN to declare the `\"main`\" initialization "
+"routine. To be honest, the initialization routine is not really called during the "
+"very startup (DllMain `-> DLL`_PROCESS`_ATTACH), its invocation is postponed until "
+"1st object from the library is requested from the type factory. The reason for this "
+"is that too heavy initializations tend to deadlock or crash the Windows DLL loader.&][s0; "
+"&][s0;i150;O9; 7.-|To make an object an OCX control, derive it from OcxControl. You "
+"should also use multiple inheritance to derive it from your custom interfaces, perhaps "
+"like this:&][s0; &][s7; class MyViewOcx&][s7; : public OcxControl // handles OCX "
+"control client functionality&][s7; , public DispatchInterface<IMyView> // custom "
+"control`'s interface&][s7; , public OcxConnectionPointContainer // needed only for "
+"callback (aka event) interface&][s0; &][s0;i150;")
+TOPIC_TEXT(
+"O9; 8.-|The whole project should be demonstrated in a simple project called Ole/Ctrl/Calc.&][s0;i150;O9; "
+"]")
diff --git a/uppsrc/Ole/util.cpp b/uppsrc/Ole/util.cpp
new file mode 100644
index 000000000..8c8669411
--- /dev/null
+++ b/uppsrc/Ole/util.cpp
@@ -0,0 +1,380 @@
+#include "Ole.h"
+
+#if defined(PLATFORM_WIN32) && defined(COMPILER_MSC)
+
+NAMESPACE_UPP
+
+//////////////////////////////////////////////////////////////////////
+// GUID
+
+GUID GetCoClassGUID(const char *name, bool prog_id)
+{
+	OleBstr uni = String(name);
+	GUID guid;
+	Zero(guid);
+	if(prog_id && *name != '{')
+		CLSIDFromProgID(~uni, &guid);
+	else
+		CLSIDFromString(~uni, &guid);
+	return guid;
+}
+
+unsigned GetHashValue(const GUID& guid) {
+	const dword *p = reinterpret_cast<const dword *>(&guid);
+	return CombineHash(p[0], p[1], p[2], p[3]);
+}
+
+String Format(const GUID& guid) {
+	String result;
+	wchar_t buffer[128];
+	int length;
+	if((length = StringFromGUID2(guid, buffer, __countof(buffer))) > 0)
+		result = AsString(buffer, length - 1);
+	return result;
+}
+
+String CFormat(const GUID& guid) {
+	String value = Format("{ 0x%08x, 0x%04x, 0x%04x, { ", (int)guid.Data1, (int)guid.Data2, (int)guid.Data3);
+	for(int i = 0; i < 8; i++)
+		value << Format("0x%02x, ", guid.Data4[i]);
+	return value << "} }";
+}
+
+String GetInterfaceName(const GUID& guid) {
+	if(IsNull(guid))
+		return Null;
+	String goo = Format(guid);
+	return Nvl(GetWinRegString(NULL, "Interface\\" + goo, HKEY_CLASSES_ROOT), goo);
+}
+
+String GetCoClassName(const GUID& guid) {
+	if(IsNull(guid))
+		return Null;
+	String goo = Format(guid);
+	return Nvl(GetWinRegString(NULL, "CLSID\\" + goo + "\\ProgID", HKEY_CLASSES_ROOT), goo);
+}
+
+String GetDisplayName(const GUID& guid) {
+	if(IsNull(guid))
+		return Null;
+	String goo = Format(guid);
+	return Nvl(GetWinRegString(NULL, "CLSID\\" + goo, HKEY_CLASSES_ROOT), goo);
+}
+
+bool IsNull(const GUID& guid) {
+	const dword *p = reinterpret_cast<const dword *>(&guid);
+	return (p[0] | p[1] | p[2] | p[3]) == 0;
+}
+
+//////////////////////////////////////////////////////////////////////
+// VARIANT
+
+Value AsValue(const VARIANT& variant)
+{
+	switch(variant.vt) {
+		case VT_ERROR: return ErrorValue(GetErrorMessage(variant.scode));
+		case VT_EMPTY: return Value(); // void
+		case VT_NULL:  return Null;
+
+		case VT_UI1:   return (int)variant.bVal;
+		case VT_I2:    return (int)variant.iVal;
+		case VT_I4:    return (int)variant.lVal;
+
+		case VT_R4:    return variant.fltVal;
+		case VT_R8:    return variant.dblVal;
+
+		case VT_CY:    return GetCurrency(variant.cyVal);
+
+		case VT_DATE:  return FromDATE(variant.date);
+
+		case VT_BSTR:  return BSTRToWString(variant.bstrVal);
+
+		case VT_DECIMAL: {
+			const DECIMAL& d = variant.decVal;
+			double h = (d.Lo32 + d.Mid32 * (65536.0 * 65536.0)) * pow(0.1, d.scale);
+			return d.sign ? -h : h;
+		}
+
+		case VT_ARRAY | VT_UI1: {
+			int nelem = variant.parray->rgsabound[0].cElements;
+			void *bits = 0;
+			if(SUCCEEDED(SafeArrayAccessData(variant.parray, &bits)) && bits) {
+				String out((const char *)bits, nelem);
+				SafeArrayUnaccessData(variant.parray);
+				return out;
+			}
+			break;
+		}
+	}
+	return ErrorValue(Format("Unknown variant type %d", variant.vt));
+}
+
+OleVariant AsVariant(Value value) {
+	OleVariant out(VT_NULL);
+	if(value.IsNull())
+		return out;
+	switch(value.GetType()) {
+	case BOOL_V:
+	case INT_V:     out.vt = VT_I4; out.lVal = (int)value; break;
+	case DOUBLE_V:  out.vt = VT_R8; out.dblVal = value; break;
+	case STRING_V:
+	case WSTRING_V: out.vt = VT_BSTR; out.bstrVal = StringToBSTR(value); break;
+	case DATE_V:    out.vt = VT_BSTR; out.bstrVal = WStringToBSTR(value); break;
+	case TIME_V:    out.vt = VT_DATE; out.date = ToDATE((Time)value);
+	// todo: VALUEARRAY_V ??
+	default:        break;
+	}
+	return out;
+}
+
+double GetCurrency(const win32_CY_& currency) {
+	return (currency.Hi * (65536.0 * 65536.0) + currency.Lo) / 10000.0;
+}
+
+OleVariant ValueToVariant(Value v)
+{
+	if(IsTypeRaw< IRef<IDispatch> >(v))
+	{
+		OleVariant out(VT_DISPATCH);
+		IRef<IDispatch> disp = ValueTo< IRef<IDispatch> >(v);
+		if(!!disp) disp -> AddRef();
+		out.pdispVal = ~disp;
+		return out;
+	}
+	if(IsTypeRaw< IRef<IUnknown> >(v))
+	{
+		OleVariant out(VT_UNKNOWN);
+		IRef<IUnknown> unk = ValueTo< IRef<IUnknown> >(v);
+		if(!!unk) unk -> AddRef();
+		out.punkVal = ~unk;
+		return out;
+	}
+	return AsVariant(v);
+}
+
+void ReturnVariant(VARIANT *var, const Value& v)
+{
+	*var = AsVariant(v);
+}
+
+//////////////////////////////////////////////////////////////////////
+// BSTR
+
+String BSTRToString(BSTR bstr)
+{
+	int l;
+	if(!bstr || !(l = SysStringLen(bstr)))
+		return Null;
+	byte cs = GetDefaultCharset();
+	if(cs == CHARSET_UTF8)
+ 		return ToUtf8(TWchar(bstr));
+	StringBuffer out(l);
+	FromUnicode(out, TWchar(bstr), l, cs);
+	return out;
+}
+
+BSTR StringToBSTR(String s)
+{
+	int len = s.GetLength();
+	if(len == 0)
+		return NULL;
+	byte cs = GetDefaultCharset();
+	if(cs == CHARSET_UTF8)
+		return WStringToBSTR(FromUtf8(s));
+	BSTR bstr = SysAllocStringLen(NULL, len);
+	ToUnicode(TWchar(bstr), s, len, cs);
+	return bstr;
+}
+
+void ReturnString(BSTR *dest, String s)
+{
+	if(*dest)
+		SysFreeString(*dest);
+	*dest = StringToBSTR(s);
+}
+
+HRESULT CheckReturnString(BSTR *bstr, String s)
+{
+	if(!bstr) return E_INVALIDARG;
+	ReturnString(bstr, s);
+	return S_OK;
+}
+
+void ReturnWString(BSTR *dest, WString s)
+{
+	if(*dest)
+		SysFreeString(*dest);
+	*dest = WStringToBSTR(s);
+}
+
+HRESULT CheckReturnWString(BSTR *bstr, WString s)
+{
+	if(!bstr) return E_INVALIDARG;
+	ReturnWString(bstr, s);
+	return S_OK;
+}
+
+//////////////////////////////////////////////////////////////////////
+// special types
+
+Color PackColor(long rgb)
+{
+	if(rgb < 0)
+		return Null;
+	return Color((rgb >> 16) & 255, (rgb >> 8) & 255, (rgb >> 0) & 255);
+}
+
+long UnpackColor(Color c)
+{
+	if(IsNull(c))
+		return -1;
+	return (c.GetR() << 16) | (c.GetG() << 8) | (c.GetB() << 0);
+}
+
+HRESULT CheckReturnColor(long *ptr, Color c)
+{
+	if(!ptr)
+		return E_INVALIDARG;
+	*ptr = UnpackColor(c);
+	return S_OK;
+}
+
+//////////////////////////////////////////////////////////////////////
+// errors
+
+OleExc::OleExc(HRESULT hresult)
+: Exc(NFormat("COM[%08x]: %s", (int)hresult, GetErrorMessage(hresult)))
+, hresult(hresult)
+{
+}
+
+OleExc::OleExc(HRESULT hresult, const char *text)
+: Exc(NFormat("COM[%08x]: %s: %s", (int)hresult, GetErrorMessage(hresult), text))
+, hresult(hresult)
+{
+	LOG("OleExc::OleExc " << *this);
+}
+
+HRESULT LogResult(HRESULT hr)
+{
+	LOGF("<= return 0x%08x: %s\r\n", hr, GetErrorMessage(hr));
+	return hr;
+}
+
+HRESULT LogError(HRESULT hr)
+{
+	if(FAILED(hr))
+		LogResult(hr);
+	return hr;
+}
+
+//////////////////////////////////////////////////////////////////////
+// interfaces
+
+Value DispatchToValue(IDispatch *disp)
+{
+	return RawPickToValue(IRef<IDispatch>(disp));
+}
+
+Value UnknownToValue(IUnknown *unk)
+{
+	return RawPickToValue(IRef<IUnknown>(unk));
+}
+
+//////////////////////////////////////////////////////////////////////
+// OleStream::
+
+OleStream::OleStream(IUnknown *stream)
+{
+	Open(stream);
+}
+
+bool OleStream::Open(IUnknown *stream)
+{
+	Close();
+	if(!stream)
+		return false;
+	if(FAILED(stream -> QueryInterface(IID_IStream, (void **)&istream)))
+		return false;
+	STATSTG stat;
+	Zero(stat);
+//	HRESULT statres = istream -> Stat(&stat, STATFLAG_NONAME);
+	int mode = READWRITE;
+//	if(SUCCEEDED(statres) && (stat.grfMode & (STGM_READ | STGM_WRITE | STGM_READWRITE)) == STGM_READ)
+//		mode = READ;
+
+	ULARGE_INTEGER pos = AsULarge(0), len;
+	HRESULT hr;
+	if(FAILED(hr = istream -> Seek(AsLarge(0), STREAM_SEEK_CUR, &pos))
+	|| FAILED(hr = istream -> Seek(AsLarge(0), STREAM_SEEK_END, &len)))
+		SetError(hr);
+	current_offset = len.QuadPart;
+	OpenInit(mode, len.QuadPart);
+	Seek(pos.QuadPart);
+	return true;
+}
+
+void OleStream::Close()
+{
+	if(!(bool)istream)
+		return;
+	int64 pos = GetPos();
+	Flush();
+	HRESULT hr;
+	if(FAILED(hr = istream -> Seek(AsLarge(pos), STREAM_SEEK_SET, 0)))
+		SetError(hr);
+	istream = 0;
+}
+
+void OleStream::SetStreamSize(dword size)
+{
+	ASSERT((bool)istream && (GetStyle() & STRM_WRITE));
+	HRESULT hr;
+	if(FAILED(hr = istream -> SetSize(AsULarge(size))))
+		SetError(hr);
+	ULARGE_INTEGER pos = AsULarge(0);
+	if(FAILED(hr = istream -> Seek(AsLarge(0), STREAM_SEEK_CUR, &pos)))
+		SetError(hr);
+	current_offset = pos.LowPart;
+}
+
+dword OleStream::Read(int64 at, void *ptr, dword size)
+{
+	ASSERT((bool)istream && (GetStyle() & STRM_READ));
+	RawSeek(at);
+	dword done = 0;
+	HRESULT hr;
+	if(FAILED(hr = istream -> Read(ptr, size, &done)))
+		SetError(hr);
+	else
+		current_offset += done;
+	return done;
+}
+
+void OleStream::Write(int64 at, const void *data, dword size)
+{
+	ASSERT((bool)istream && (GetStyle() & STRM_WRITE));
+	RawSeek(at);
+	dword done = 0;
+	HRESULT hr;
+	if(FAILED(hr = istream -> Write(data, size, &done)) || done != size)
+		SetError(hr);
+	current_offset += done;
+}
+
+void OleStream::RawSeek(int64 pos)
+{
+	if(current_offset == pos)
+		return;
+	ULARGE_INTEGER new_pos = AsULarge(pos);
+	HRESULT hr;
+	if(FAILED(hr = istream -> Seek(AsLarge(pos), STREAM_SEEK_SET, &new_pos)))
+		SetError(hr);
+	pos = new_pos.LowPart;
+}
+
+//////////////////////////////////////////////////////////////////////
+
+END_UPP_NAMESPACE
+
+#endif
diff --git a/uppsrc/Ole/util.h b/uppsrc/Ole/util.h
new file mode 100644
index 000000000..75bfdea64
--- /dev/null
+++ b/uppsrc/Ole/util.h
@@ -0,0 +1,303 @@
+#if defined(PLATFORM_WIN32) && defined(COMPILER_MSC)
+
+NAMESPACE_UPP
+
+#ifdef COMPILER_MSC
+typedef __int64 longlong_t;
+#define LL_(x) COMBINE(x, i64)
+#else
+typedef long long longlong_t;
+#define LL_(x) COMBINE(x, LL)
+#endif//COMPILER
+
+inline void           OleInit() { CoInitialize(NULL); }
+
+inline const wchar_t *WcharT(const wchar *w)   { return (const wchar_t *)w; }
+inline wchar_t       *WcharT(wchar *w)         { return (wchar_t *)w; }
+inline const wchar   *TWchar(const wchar_t *w) { return (const wchar *)w; }
+inline wchar         *TWchar(wchar_t *w)       { return (wchar *)w; }
+
+template <class T>
+class OleBuffer
+{
+public:
+	OleBuffer(T *ptr = 0) : ptr(ptr) {}
+	~OleBuffer()                { Clear(); }
+
+	void     Clear()            { if(ptr) { CoTaskMemFree(ptr); ptr = 0; } }
+	T      **Set()              { Clear(); return &ptr; }
+
+	operator T * ()             { return ptr; }
+	operator const T * () const { return ptr; }
+
+private:
+	T       *ptr;
+};
+
+unsigned              GetHashValue(const GUID& guid);
+String                Format(const GUID& guid);
+String                CFormat(const GUID& guid);
+inline void           Serialize(Stream& stream, GUID& guid) { stream.SerializeRaw((byte *)&guid, sizeof(GUID)); }
+String                GetInterfaceName(const GUID& guid);
+String                GetCoClassName(const GUID& guid);
+String                GetDisplayName(const GUID& guid);
+template <> bool      IsNull(const GUID& guid);
+GUID                  GetCoClassGUID(const char *name, bool prog_id = true);
+
+class Guid : public AssignValueTypeNo<Guid, 70, Moveable<Guid> >
+{
+public:
+	Guid(const Nuller& = Null)               { Clear(); }
+	Guid(const char *text, bool prid = true) { guid = GetCoClassGUID(text, prid); }
+	Guid(const GUID& guid_) : guid(guid_) {}
+	Guid(const Guid& guid_) : guid(guid_.guid) {}
+	Guid(IDispatchPtr& dispatch); // dynamic GUID of a dispatch object
+	Guid(Value v)                            { *this = ValueTo<Guid>(v); }
+
+	operator Value () const                  { return RichValue<Guid>(*this); }
+	operator const GUID& () const            { return guid; }
+	operator GUID& ()                        { return guid; }
+	const GUID& operator ~() const           { return guid; }
+
+	Guid&    operator = (const GUID& _guid)  { guid = _guid; return *this; }
+
+	bool     IsNullInstance() const          { return UPP::IsNull(guid); }
+	bool     IsEmpty() const                 { return IsNull(guid); }
+	void     Clear()                         { Zero(guid); }
+
+	operator String () const                 { return UPP::Format(guid); }
+	String   CFormat() const                 { return UPP::CFormat(guid); }
+
+	void     Serialize(Stream& stream)       { UPP::Serialize(stream, guid); }
+
+private:
+	GUID     guid;
+};
+
+template <>
+inline unsigned GetHashValue(const Guid& guid) { return GetHashValue(~guid); }
+template <>
+inline String   AsString(const GUID& guid) { return Format(guid); }
+template <>
+inline String   AsString(const Guid& guid) { return Format(~guid); }
+
+inline bool     operator == (const Guid& a, const Guid& b) { return ~a == ~b; }
+inline bool     operator != (const Guid& a, const Guid& b) { return ~a != ~b; }
+
+class OleVariant : public VARIANT
+{
+public:
+	OleVariant(int vtype = VT_EMPTY) { VariantInit(this); vt = vtype; }
+	OleVariant(const OleVariant& o) { VariantInit(this); VariantCopy(this, const_cast<OleVariant *>(&o)); }
+	~OleVariant() { VariantClear(this); }
+	OleVariant(const VARIANT& var) { VariantInit(this); VariantCopy(this, const_cast<VARIANT *>(&var)); }
+
+	OleVariant& operator = (const OleVariant& var) { if(this != &var) { VariantClear(this); VariantCopy(this, const_cast<VARIANT *>((VARIANT *)&var)); } return *this; }
+
+	VARIANT operator ~ () const { VARIANT v; VariantInit(&v); VariantCopy(&v, const_cast<OleVariant *>(this)); return v; }
+};
+
+Value                 AsValue(const VARIANT& variant);
+OleVariant            AsVariant(Value value);
+
+//inline ULARGE_INTEGER AsULarge(dword value)   { ULARGE_INTEGER i; i.QuadPart = value; return i; }
+//inline LARGE_INTEGER  AsLarge(int value)      { LARGE_INTEGER i; i.QuadPart = value; return i; }
+inline ULARGE_INTEGER AsULarge(int64 value) { ULARGE_INTEGER i; i.QuadPart = value; return i; }
+inline LARGE_INTEGER  AsLarge(int64 value)  { LARGE_INTEGER i; i.QuadPart = value; return i; }
+
+double                GetCurrency(const win32_CY_& currency);
+inline DATE           ToDATE(Date date)     { return date - Date(1899, 12, 30); }
+inline DATE           ToDATE(Time time)     { return (time - Time(1899, 12, 30)) / 86400.0; }
+inline Time           FromDATE(DATE date)   { return Time(1899, 12, 30) + (int64)floor(date * 86400.0 + 0.5); }
+
+OleVariant            ValueToVariant(Value v);
+void                  ReturnVariant(VARIANT *var, Value v);
+
+inline WString        BSTRToWString(BSTR bstr)    { return WString((wchar *)bstr, SysStringLen(bstr)); }
+inline BSTR           WStringToBSTR(WString w)    { return SysAllocStringLen((BSTR)~w, w.GetLength()); }
+String                BSTRToString(BSTR bstr);
+BSTR                  StringToBSTR(String s);
+
+void                  ReturnString(BSTR *dest, String s);
+HRESULT               CheckReturnString(BSTR *bstr, String s);
+void                  ReturnWString(BSTR *dest, WString s);
+HRESULT               CheckReturnWString(BSTR *bstr, WString s);
+
+class OleBstr
+{
+public:
+	OleBstr(const Nuller& = Null) : bstr(NULL) {}
+	OleBstr(WString w) : bstr(WStringToBSTR(w)) {}
+	OleBstr(String s) : bstr(StringToBSTR(s)) {}
+	~OleBstr() { if(bstr) SysFreeString(bstr); }
+
+	void     Clear()             { if(bstr) { SysFreeString(bstr); bstr = NULL; } }
+	BSTR    *Set()               { Clear(); return &bstr; }
+
+	operator WString () const    { return BSTRToWString(bstr); }
+	operator String () const     { return BSTRToString(bstr); }
+	String   ToString() const    { return BSTRToString(bstr); }
+//	operator BSTR () const       { return bstr; }
+	BSTR     operator ~ () const { return bstr; }
+	int      GetLength() const   { return SysStringLen(bstr); }
+
+private:
+	BSTR     bstr;
+};
+
+inline const RECTL&   ToRectL(const Rect& rc) { return reinterpret_cast<const RECTL&>(rc); }
+inline const Rect&    ToRect(const RECTL& rc) { return reinterpret_cast<const Rect&>(rc); }
+
+Color                 PackColor(long rgb);
+long                  UnpackColor(Color c);
+HRESULT               CheckReturnColor(long *ptr, Color c);
+
+class OleExc : public Exc
+{
+public:
+	OleExc(HRESULT hresult);
+	OleExc(HRESULT hresult, const char *text);
+
+public:
+	HRESULT hresult;
+};
+
+HRESULT    LogResult(HRESULT hr);
+HRESULT    LogError(HRESULT hr);
+
+inline void OleVerify(HRESULT hr) { if(FAILED(hr)) throw OleExc(hr); }
+inline void OleVerify(HRESULT hr, const char *text) { if(FAILED(hr)) throw OleExc(hr, text); }
+
+#define OLE_VERIFY(c) OleVerify(c, #c)
+
+template <class T>
+class IRefBase : Moveable< IRefBase<T> >
+{
+public:
+	IRefBase(T *ptr = NULL) : ptr(ptr)             { if(ptr) ptr->AddRef(); }
+	IRefBase(const IRefBase& i)                    { if(ptr = i.ptr) ptr->AddRef(); }
+	~IRefBase()                                    { if(ptr) ptr->Release(); }
+
+	static GUID GetIID()                           { return __uuidof(T); }
+
+	HRESULT     Create(const GUID& clsid, dword flags = CLSCTX_INPROC_SERVER)
+	{ return CoCreateInstance(clsid, NULL, flags, GetIID(), (void **)Set()); }
+
+	void        Clear()                            { if(ptr) { ptr->Release(); ptr = 0; } }
+
+	T          *operator->() const               { ASSERT(ptr); return ptr; }
+	T&          operator * () const                { ASSERT(ptr); return *ptr; }
+	T          *operator ~ () const                { return ptr; }
+
+	T         **Set()                              { Clear(); return &ptr; }
+	IUnknown  **SetUnk()                           { Clear(); return (IUnknown **)&ptr; }
+	void      **SetVoid()                          { Clear(); return (void **)&ptr; }
+	void        Set(T *p)                          { T *old = ptr; if(ptr = p) ptr->AddRef(); if(old) old->Release(); }
+
+	bool        operator !() const                 { return !ptr; }
+
+	T          *AddRef()                           { if(ptr) ptr->AddRef(); return ptr; }
+	T          *Detach()                           { T *out = ptr; ptr = 0; return out; }
+	T          *operator - ()                      { return Detach(); }
+
+protected:
+	mutable T  *ptr;
+};
+
+template <class T>
+class IRef : public Moveable< IRef<T>, IRefBase<T> >
+{
+public:
+	IRef()                                           {}
+	IRef(IUnknown *u)                                { if(u) OleVerify(u->QueryInterface(__uuidof(T), (void **)&ptr)); }
+	IRef(T *t)                                       { if(ptr = t) ptr->AddRef(); }
+	IRef(const GUID& clsid, dword flags = CLSCTX_INPROC_SERVER) { OleVerify(Create(clsid, flags)); }
+	IRef(const IRef<T>& x) : Moveable< IRef<T>, IRefBase<T> >(x) {}
+	explicit IRef(const VARIANT& v)
+	{
+		ptr = NULL;
+		if(v.vt == VT_DISPATCH)
+			OleVerify(v.pdispVal->QueryInterface(__uuidof(T), (void **)&ptr));
+		else if(v.vt == VT_UNKNOWN)
+			OleVerify(v.punkVal->QueryInterface(__uuidof(T), (void **)&ptr));
+		else
+		{
+			ASSERT(v.vt == VT_EMPTY || v.vt == VT_NULL);
+		}
+	}
+
+	IRef&       operator = (const IRef<T>& x)        { Set(x.ptr); return *this; }
+};
+
+template <>
+class IRef<IUnknown> : public IRefBase<IUnknown>
+{
+public:
+	IRef()                                           {}
+	IRef(IUnknown *u) : IRefBase<IUnknown>(u)        {}
+	IRef(const GUID& clsid, dword flags = CLSCTX_INPROC_SERVER) { OleVerify(Create(clsid, flags)); }
+	IRef(const IRef<IUnknown>& x) : IRefBase<IUnknown>(x.ptr) {}
+
+	IRef&       operator = (const IRef<IUnknown>& x) { Set(x.ptr); return *this; }
+};
+
+Value                 DispatchToValue(IDispatch *disp);
+Value                 UnknownToValue(IUnknown *unk);
+
+template <class I>
+OleVariant DispVar(I& iface)
+{
+	IRef<IDispatch> disp = iface;
+	OleVariant out(VT_DISPATCH);
+	if(!!disp) disp->AddRef();
+	out.pdispVal = ~disp;
+	return out;
+}
+
+template <class T>
+struct OleType : Moveable< OleType<T> >
+{
+	friend T   *Ptr(T& t)                           { return reinterpret_cast<T *>(&reinterpret_cast<char &>(t)); }
+	friend T&   Deref(T *t)                         { return reinterpret_cast<T&>(*reinterpret_cast<char *>(t)); }
+	friend void Destroy(T& t)                       { t.~T(); }
+	friend T&   Construct(T& t)                     { return Deref(new(Ptr(t)) T); }
+	friend void CopyConstruct(T& t, T& x)           { new(Ptr(t)) T(x); }
+	friend void DeepCopyConstruct(T& t, const T& x) { new(Ptr(t)) T(x); }
+};
+
+template <class T, class U>
+inline HRESULT QueryInterface(T& src, U& dest, const GUID& guid)
+{
+	return src->QueryInterface(guid, (void **)dest.Set());
+}
+
+template <class T, class U>
+inline HRESULT QueryInterface(T& src, U& dest)
+{
+	return QueryInterface(src, dest, dest.GetIID());
+}
+
+class OleStream : public BlockStream
+{
+public:
+	OleStream(IUnknown *stream = 0);
+
+	bool           Open(IUnknown *stream);
+	virtual  void  Close();
+	virtual  bool  IsOpen() const { return istream; }
+
+protected:
+	virtual  void  SetStreamSize(dword size);
+	virtual  dword Read(int64 at, void *ptr, dword size);
+	virtual  void  Write(int64 at, const void *data, dword size);
+
+	void           RawSeek(int64 pos);
+
+protected:
+	IStreamPtr     istream;
+	int64          current_offset;
+};
+
+END_UPP_NAMESPACE
+
+#endif
diff --git a/uppsrc/OleDB/AUTHORS b/uppsrc/OleDB/AUTHORS
new file mode 100644
index 000000000..f782e5b62
--- /dev/null
+++ b/uppsrc/OleDB/AUTHORS
@@ -0,0 +1,2 @@
+Mirek Fidler <cxl@ntllib.org>
+Tomas Rylek  <rylek@volny.cz>
\ No newline at end of file
diff --git a/uppsrc/OleDB/COPYING b/uppsrc/OleDB/COPYING
new file mode 100644
index 000000000..33aa39102
--- /dev/null
+++ b/uppsrc/OleDB/COPYING
@@ -0,0 +1,30 @@
+Copyright (C) 2005 Mirek Fidler, Tomas Rylek and various contributors (see AUTHORS)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to
+deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies of the Software and its Copyright notices. In addition publicly
+documented acknowledgment must be given that this software has been used if no
+source code of this software is made available publicly. This includes
+acknowledgments in either Copyright notices, Manuals, Publicity and Marketing
+documents or any documentation provided with any product containing this
+software. This License does not apply to any software that links to the
+libraries provided by this software (statically or dynamically), but only to
+the software provided.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+-----------
+
+Please see the COPYING.PLAIN for a plain-english explanation of this notice
+and it's intent.
diff --git a/uppsrc/OleDB/COPYING-PLAIN b/uppsrc/OleDB/COPYING-PLAIN
new file mode 100644
index 000000000..770a8132f
--- /dev/null
+++ b/uppsrc/OleDB/COPYING-PLAIN
@@ -0,0 +1,33 @@
+Plain English Copyright Notice
+
+This file is not intended to be the actual License. The reason this file
+exists is that we here are programmers and engineers. We aren't lawyers. We
+provide licenses that we THINK say the right things, but we have our own
+intentions at heart. This is a plain-english explanation of what those
+intentions are, and if you follow them you will be within the "spirit" of
+the license.
+
+The intent is for us to enjoy writing software that is useful to us (the
+AUTHORS) and allow others to use it freely and also benefit from the work we
+put into making it. We don't want to restrict others using it. They should
+not *HAVE* to make the source code of the applications they write that
+simply link to these libraries (be that statically or dynamically), or for
+them to be limited as to what license they choose to use (be it open, closed
+or anything else). But we would like to know you are using these libraries.
+We simply would like to know that it has been useful to someone. This is why
+we ask for acknowledgement of some sort.
+
+You can do what you want with the source of this software - it doesn't
+matter. We still have it here for ourselves and it is open and free to use
+and download and play with. It can't be taken away. We don't really mind what
+you do with the source to your software. We would simply like to know that
+you are using it - especially if it makes it to a commerical product. If you
+simply e-mail all the AUTHORS (see COPYING and AUTHORS files) telling us, and
+then make sure you include a paragraph or page in the manual or in the "About.."
+box for the product with the copyright notice and state that you used this
+software, we will be very happy. If you want to contribute back modifications
+and fixes you may have made we will welcome those too with open arms (generally).
+If you want help with changes needed, ports needed or features to be added,
+arrangements can be easily made with some dialogue.
+
+Mirek Fidler <cxl@ntllib.org>
diff --git a/uppsrc/OleDB/OleDB.cpp b/uppsrc/OleDB/OleDB.cpp
new file mode 100644
index 000000000..10b9a4843
--- /dev/null
+++ b/uppsrc/OleDB/OleDB.cpp
@@ -0,0 +1,1346 @@
+#include "OleDB.h"
+
+#if defined(PLATFORM_WIN32) && defined(COMPILER_MSC)
+
+NAMESPACE_UPP
+
+#define LTIMING(x) // RTIMING(x)
+
+typedef ULONG DBLENGTH;
+typedef LONG  DBROWCOUNT;
+
+typedef Value (*OutBindProc)(const DBBINDING& binding, const byte *data);
+typedef void (*InBindProc)(const DBBINDING& binding, byte *data, const Value& value);
+
+static WString GetErrorText(IRef<IErrorInfo> err)
+{
+	OleBstr bstr;
+	WString errtext;
+	if(SUCCEEDED(err->GetDescription(bstr.Set())))
+		errtext = bstr;
+	if(SUCCEEDED(err->GetSource(bstr.Set())))
+		errtext << " (" << WString(bstr) << ")";
+	return errtext;
+}
+
+WString OleDBErrorInfo(HRESULT hr)
+{
+	IRef<IErrorInfo> err;
+	WString errtext;
+	if(GetErrorInfo(0, err.Set()) == S_OK && !!err) {
+		IRef<IErrorRecords> recerr;
+		if(SUCCEEDED(QueryInterface(err, recerr)) && !!recerr) {
+			ULONG nrec = 0;
+			if(SUCCEEDED(recerr->GetRecordCount(&nrec)))
+				for(int i = nrec; --i >= 0;) {
+					IRef<IErrorInfo> suberr;
+					if(SUCCEEDED(recerr->GetErrorInfo(i, GetUserDefaultLCID(), suberr.Set())) && !!suberr) {
+						if(!IsNull(errtext))
+							errtext << '\n';
+						IRef<ISQLErrorInfo> sqlerr;
+						if(SUCCEEDED(recerr->GetCustomErrorObject(i, IID_ISQLErrorInfo, sqlerr.SetUnk())) && !!sqlerr) {
+							OleBstr state;
+							long error;
+							if(SUCCEEDED(sqlerr->GetSQLInfo(state.Set(), &error)))
+								errtext << NFormat("%s(%d): ", String(state), error).ToWString();
+						}
+						errtext << GetErrorText(suberr);
+					}
+				}
+		}
+		else
+			errtext = GetErrorText(err);
+	}
+	else
+		errtext = NFormat("OleDB(%08x): nezn�m� chyba", hr).ToWString();
+	return errtext;
+}
+
+void OleDBVerify(HRESULT hr)
+{
+	if(SUCCEEDED(hr))
+		return;
+	throw Exc(OleDBErrorInfo(hr).ToString());
+}
+
+const char *OleDBParseString(const char *s)
+{
+	ASSERT(*s == '\'');
+	s++;
+	while(*s)
+		if(*s++ == '\'' && *s++ != '\'')
+			return s - 1;
+	return NULL;
+}
+
+String OleDBParseStringError(const char *s)
+{
+	String err = "Parse error: unterminated string ";
+	int l = strlen(s);
+	enum { SAMPLE = 10 };
+	if(l <= SAMPLE)
+		err.Cat(s, l);
+	else {
+		err.Cat(s, SAMPLE);
+		err.Cat("...");
+	}
+	return err;
+}
+
+/*
+String OleDBParseRefError(const char *s)
+{
+	return NFormat("Parse error: invalid ?%% type specifier '%c'", *s);
+}
+*/
+
+int OleDBParse(const char *statement, String& out, OleDBConnection *conn, OleDBSession *session)
+{
+	String cmd;
+	int args = 0;
+	const char *s = statement;
+	while(*s) {
+		if(*s == '\'') {
+			const char *b = s;
+			s = OleDBParseString(b);
+			if(!s) {
+				if(session)
+					session->SetError(OleDBParseStringError(b), statement);
+				return -1;
+			}
+			cmd.Cat(b, s - b);
+		}
+		else if(*s == '?') {
+			++s;
+			++args;
+			cmd.Cat('?');
+/*
+			if(*s == '%') {
+				OracleRef oraref;
+				const char *p = s + 1;
+				s = oraref.Parse(p);
+				if(!s) {
+					if(session)
+						session->SetError(String() << "Parse error: invalid ?% type specifier '"
+						<< *p << "'", statement);
+					return -1;
+				}
+				conn->SetParam(args - 1, oraref);
+			}
+*/
+		}
+		else
+			cmd.Cat(*s++);
+	}
+	out = cmd;
+	return args;
+}
+
+static void DBInEmpty(const DBBINDING& binding, byte *data, const Value& v)
+{
+}
+
+static void DBInInt(const DBBINDING& binding, byte *data, const Value& v)
+{
+	*(int *)(data + binding.obValue) = v;
+}
+
+static void DBInDouble(const DBBINDING& binding, byte *data, const Value& v)
+{
+	*(double *)(data + binding.obValue) = v;
+}
+
+static void DBInString(const DBBINDING& binding, byte *data, const Value& v)
+{
+	String s(v);
+	int l = s.GetLength();
+	ASSERT(binding.cbMaxLen >= l + 1u);
+	memcpy(data + binding.obValue, s, l + 1);
+	*(DBLENGTH *)(data + binding.obLength) = l;
+}
+
+static void DBInWString(const DBBINDING& binding, byte *data, const Value& v)
+{
+	WString s(v);
+	int l = s.GetLength();
+	ASSERT(binding.cbMaxLen >= sizeof(wchar) * (l + 1));
+	memcpy(data + binding.obValue, s, sizeof(wchar) * (l + 1));
+	*(DBLENGTH *)(data + binding.obLength) = 2 * l;
+}
+
+static void DBInTime(const DBBINDING& binding, byte *data, const Value& v)
+{
+	*(DATE *)(data + binding.obValue) = ToDATE(Time(v));
+}
+
+static Value DBOutInt(const DBBINDING& binding, const byte *data)
+{
+	return *(const int *)(data + binding.obValue);
+}
+
+static Value DBOutBool(const DBBINDING& binding, const byte *data)
+{
+	return *(const byte *)(data + binding.obValue) & 1;
+}
+
+static Value DBOutI8(const DBBINDING& binding, const byte *data)
+{
+	return (double)*(const longlong_t *)(data + binding.obValue);
+}
+
+static Value DBOutDouble(const DBBINDING& binding, const byte *data)
+{
+	return *(const double *)(data + binding.obValue);
+}
+
+static Value DBOutString(const DBBINDING& binding, const byte *data)
+{
+	return String(data + binding.obValue, *(const DBLENGTH *)(data + binding.obLength));
+}
+
+static Value DBOutWString(const DBBINDING& binding, const byte *data)
+{
+	return WString((const wchar *)(data + binding.obValue), *(const DBLENGTH *)(data + binding.obLength) >> 1);
+}
+
+static Value DBOutTime(const DBBINDING& binding, const byte *data)
+{
+	return FromDATE(*(const DATE *)(data + binding.obValue));
+}
+
+/*
+static Value DBOutGuid(const DBBINDING& binding, const byte *data)
+{
+	return *(const Guid *)(data + binding.obValue);
+}
+*/
+
+static Buffer<DBBINDING> GetRowDataBindings(const DBCOLUMNINFO *col, int count, Buffer<OutBindProc>& bindproc, int& rowbytes)
+{
+	rowbytes = 0;
+	Buffer<DBBINDING> dbbind(count);
+	bindproc.Alloc(count);
+	OutBindProc *ob = bindproc;
+	DBBINDING *db = dbbind;
+	memset(db, 0, count * sizeof(DBBINDING));
+	for(; --count >= 0; col++, db++, ob++) {
+		db->iOrdinal = col->iOrdinal;
+		db->obStatus = rowbytes;
+		db->dwPart = DBPART_STATUS | DBPART_VALUE;
+		db->dwMemOwner = DBMEMOWNER_CLIENTOWNED;
+		db->eParamIO = DBPARAMIO_NOTPARAM;
+		rowbytes += sizeof(dword);
+		switch(col->wType) {
+		case DBTYPE_I1:
+		case DBTYPE_I2:
+		case DBTYPE_I4:
+		case DBTYPE_UI1:
+		case DBTYPE_UI2:
+			db->wType = DBTYPE_I4;
+			db->obValue = rowbytes;
+			*ob = &DBOutInt;
+			rowbytes += 4;
+			break;
+
+		case DBTYPE_BOOL:
+			db->wType = DBTYPE_I1;
+			db->obValue = rowbytes;
+			*ob = &DBOutBool;
+			rowbytes += 4;
+			break;
+
+		case DBTYPE_UI4:
+			db->wType = DBTYPE_UI4;
+			db->obValue = rowbytes;
+			*ob = &DBOutInt;
+			rowbytes += 4;
+			break;
+
+		case DBTYPE_UI8:
+		case DBTYPE_I8:
+			rowbytes = (rowbytes + 7) & -8;
+			db->wType = col->wType;
+			db->obValue = rowbytes;
+			*ob = &DBOutI8;
+			rowbytes += 8;
+			break;
+
+		case DBTYPE_R4:
+		case DBTYPE_R8:
+		case DBTYPE_CY:
+		case DBTYPE_DECIMAL:
+		case DBTYPE_NUMERIC:
+		case DBTYPE_VARNUMERIC:
+			rowbytes = (rowbytes + 7) & -8;
+			db->wType = DBTYPE_R8;
+			db->obValue = rowbytes;
+			*ob = &DBOutDouble;
+			rowbytes += 8;
+			break;
+
+		case DBTYPE_DATE:
+		case DBTYPE_FILETIME:
+		case DBTYPE_DBDATE:
+		case DBTYPE_DBTIME:
+		case DBTYPE_DBTIMESTAMP:
+			rowbytes = (rowbytes + sizeof(DATE) - 1) & -(int)sizeof(DATE);
+			db->wType = DBTYPE_DATE;
+			db->obValue = rowbytes;
+			*ob = &DBOutTime;
+			rowbytes += sizeof(DATE);
+			break;
+
+		case DBTYPE_BYTES:
+			db->wType = DBTYPE_BYTES;
+			db->obValue = rowbytes;
+			*ob = &DBOutString;
+			db->cbMaxLen = min<int>(col->ulColumnSize, 10000000);
+			rowbytes += (db->cbMaxLen + 1 + 3) & -4;
+			db->obLength = rowbytes;
+			db->dwPart = DBPART_VALUE | DBPART_LENGTH | DBPART_STATUS;
+			rowbytes += sizeof(DBLENGTH);
+			break;
+
+		case DBTYPE_STR:
+		case DBTYPE_GUID:
+			db->wType = DBTYPE_STR;
+			db->obValue = rowbytes;
+			*ob = &DBOutString;
+			db->cbMaxLen = min<unsigned>(col->ulColumnSize, 1000000) + 1;
+			rowbytes += (db->cbMaxLen + 1 + 3) & -4;
+			db->obLength = rowbytes;
+			db->dwPart = DBPART_VALUE | DBPART_LENGTH | DBPART_STATUS;
+			rowbytes += sizeof(DBLENGTH);
+			break;
+
+		case DBTYPE_BSTR:
+		case DBTYPE_WSTR:
+			db->wType = DBTYPE_WSTR;
+			db->obValue = rowbytes;
+			db->cbMaxLen = sizeof(OLECHAR) * (min<unsigned>(col->ulColumnSize, 1000000) + 1);
+			*ob = &DBOutWString;
+			rowbytes += (db->cbMaxLen + 3) & -4;
+			db->obLength = rowbytes;
+			db->dwPart = DBPART_VALUE | DBPART_LENGTH | DBPART_STATUS;
+			rowbytes += sizeof(DBLENGTH);
+			break;
+
+/*
+		case DBTYPE_GUID:
+			rowbytes = (rowbytes + 7) & -8;
+			db->wType = DBTYPE_GUID;
+			db->obValue = rowbytes;
+			*ob = &DBOutGuid;
+			rowbytes += sizeof(GUID);
+			break;
+*/
+		default:
+			throw Exc(NFormat("column[%d] has invalid type %d", (int)col->iOrdinal, (int)col->wType));
+		}
+	}
+
+	rowbytes = (rowbytes + 7) & -8;
+	return dbbind;
+}
+
+Vector<Value> GetRowData(const byte *buffer, const DBBINDING *dbbind, const OutBindProc *bindprocs, int count)
+{
+	Vector<Value> out;
+	out.SetCount(count);
+	for(Value *op = out.Begin(); --count >= 0; op++, dbbind++, bindprocs++)
+		switch(*(const dword *)(buffer + dbbind->obStatus)) {
+		case DBSTATUS_S_ISNULL:
+			break;
+		case DBSTATUS_S_OK: {
+//				LTIMING("GetRowData/bindproc");
+				*op = (*bindprocs)(*dbbind, buffer);
+			}
+			break;
+		default:
+			*op = ErrorValue(NFormat("column[%d]: %d", (int)dbbind->iOrdinal,
+				(int)*(const dword *)(buffer + dbbind->obStatus)));
+			break;
+		}
+	return out;
+}
+
+class OleDBConnection : public Link<OleDBConnection>, public SqlConnection
+{
+public:
+	OleDBConnection(OleDBSession *session);
+	virtual ~OleDBConnection();
+
+	void                    Clear();
+
+	virtual void            SetParam(int i, const Value& r);
+	virtual bool            Execute();
+	virtual int             GetRowsProcessed() const;
+	virtual bool            Fetch();
+	virtual void            GetColumn(int i, Ref r) const;
+	virtual void            Cancel();
+	virtual SqlSession&     GetSession() const { ASSERT(session); return *session; }
+	virtual String          GetUser() const    { ASSERT(session); return session->user; }
+	virtual String          ToString() const;
+
+	void                    Execute(IRef<IRowset> rowset);
+
+private:
+	bool                    TryExecute();
+	void                    TryPrefetch();
+	void                    ClearArgs();
+	void                    SyncArgs();
+
+private:
+	OleDBSession           *session;
+
+	struct Param {
+		Param() : vtype(VOID_V), alloc(0), bindproc(&DBInEmpty) {}
+
+		int        vtype;
+		int        alloc;
+		Value      value;
+		InBindProc bindproc;
+	};
+
+	IRef<ICommand>          cmd;
+	IRef<ICommandText>      cmd_text;
+	IRef<ICommandPrepare>   cmd_prepare;
+	IRef<IAccessor>         cmd_accessor;
+	HACCESSOR               cmd_haccessor;
+	Array<Param>            cmd_param;
+	Buffer<DBBINDING>       cmd_bindings;
+	Buffer<byte>            cmd_argbuffer;
+
+	IRef<IRowset>           fetch_rowset;
+	IRef<IAccessor>         fetch_accessor;
+	HACCESSOR               fetch_haccessor;
+	Buffer<OutBindProc>     fetch_bindprocs;
+	Buffer<DBBINDING>       fetch_bindings;
+	Buffer<byte>            fetch_rowbuffer;
+	Buffer<HROW>            fetch_hrows;
+	int                     fetch_rowbytes;
+	int                     fetch_chunk;
+	Vector< Vector<Value> > prefetch;
+	Vector<Value>           current_row;
+	DBROWCOUNT              fetch_rowcount;
+	bool                    fetch_eof;
+
+	enum {
+		MAX_FETCH_ROWS = 100,
+		MAX_FETCH_BYTES = 100000,
+	};
+};
+
+OleDBConnection::OleDBConnection(OleDBSession *session_)
+: session(session_)
+{
+	if(session)
+		LinkAfter(&session->clink);
+	fetch_haccessor = 0;
+	cmd_haccessor = 0;
+}
+
+OleDBConnection::~OleDBConnection()
+{
+	if(session)
+		Unlink();
+}
+
+void OleDBConnection::Clear()
+{
+	Cancel();
+	cmd_param.Clear();
+	cmd.Clear();
+	cmd_text.Clear();
+	cmd_prepare.Clear();
+	cmd_accessor.Clear();
+//	ClearArgs();
+//	cmd_param.Clear();
+//	fetch_rowset.Clear();
+//	cmd.Clear();
+//	cmd_text.Clear();
+//	cmd_prepare.Clear();
+//	cmd_accessor.Clear();
+	session = NULL;
+}
+
+void OleDBConnection::SetParam(int i, const Value& r)
+{
+	if(i >= cmd_param.GetCount())
+		ClearArgs();
+	Param& par = cmd_param.At(i);
+	par.value = r;
+	if(IsNull(r)) {
+		if(cmd_haccessor)
+			*(dword *)(cmd_argbuffer + cmd_bindings[i].obStatus) = DBSTATUS_S_ISNULL;
+	}
+	else {
+		int l;
+		switch(r.GetType()) {
+		case BOOL_V:
+		case INT_V:
+			if(par.vtype != INT_V && par.vtype != DOUBLE_V) {
+				ClearArgs();
+				par.vtype = INT_V;
+				par.bindproc = &DBInInt;
+			}
+			break;
+
+		case DOUBLE_V:
+			if(par.vtype != DOUBLE_V) {
+				ClearArgs();
+				par.vtype = DOUBLE_V;
+				par.bindproc = &DBInDouble;
+			}
+			break;
+
+		case STRING_V:
+			l = String(r).GetLength();
+			if(par.vtype != STRING_V && par.vtype != WSTRING_V || par.alloc < l) {
+				ClearArgs();
+				par.vtype = STRING_V;
+				par.alloc = max(2 * l, 32);
+				par.bindproc = &DBInString;
+			}
+			break;
+
+		case WSTRING_V:
+			l = WString(r).GetLength();
+			if(par.vtype != WSTRING_V || par.alloc < l) {
+				ClearArgs();
+				par.vtype = WSTRING_V;
+				par.alloc = max(2 * l, 32);
+				par.bindproc = &DBInWString;
+			}
+			break;
+
+		case DATE_V:
+		case TIME_V:
+			if(par.vtype != TIME_V) {
+				ClearArgs();
+				par.vtype = TIME_V;
+				par.bindproc = &DBInTime;
+			}
+			break;
+
+		default:
+			NEVER();
+			break;
+		}
+		if(cmd_haccessor) {
+			const DBBINDING& binding = cmd_bindings[i];
+			*(dword *)(cmd_argbuffer + binding.obStatus) = DBSTATUS_S_OK;
+			par.bindproc(binding, cmd_argbuffer, r);
+		}
+	}
+}
+
+bool OleDBConnection::Execute()
+{
+	try {
+		return TryExecute();
+	}
+	catch(Exc e) {
+		if(session)
+			session->SetError("Execute(OleDB): " + e, statement);
+		Cancel();
+		cmd.Clear();
+		return false;
+	}
+}
+
+bool OleDBConnection::TryExecute()
+{
+//	session->PreExec();
+	Stream *t = session->GetTrace();
+	if(t)
+		*t << statement << "\n";
+	int args = 0;
+	if(!session) {
+		RLOG("OleDB Execute: invalid cursor (zombie state)");
+		return false; // zombie state or closed session
+	}
+	if(!session->dbsession)
+		throw Exc("session is closed");
+	if(parse)
+		Cancel();
+	if(!cmd) {
+		OleDBVerify(session->dbsession->CreateCommand(NULL, cmd.GetIID(), cmd.SetUnk()));
+		OleDBVerify(QueryInterface(cmd, cmd_text));
+		OleDBVerify(QueryInterface(cmd, cmd_accessor));
+		QueryInterface(cmd, cmd_prepare);
+		parse = true;
+	}
+	if(parse) {
+		String rawcmd;
+		args = OleDBParse(statement, rawcmd, this, session);
+		OleDBVerify(cmd_text->SetCommandText(session->dialect, ~OleBstr(rawcmd)));
+		if(!!cmd_prepare)
+			OleDBVerify(cmd_prepare->Prepare(0));
+		if(cmd_param.GetCount() != args) {
+			ClearArgs();
+			cmd_param.SetCount(args);
+		}
+	}
+	int time = msecs();
+	DBPARAMS params;
+	params.pData = 0;
+	params.cParamSets = 0;
+	params.hAccessor = 0;
+	if(!cmd_param.IsEmpty()) {
+		if(!cmd_haccessor)
+			SyncArgs();
+		params.pData = cmd_argbuffer;
+		params.cParamSets = 1;
+		params.hAccessor = cmd_haccessor;
+	}
+	IRef<IRowset> frowset;
+	OleDBVerify(cmd->Execute(NULL, frowset.GetIID(), &params, &fetch_rowcount, frowset.SetUnk()));
+	if(t && session->IsTraceTime())
+		*t << NFormat("----- %s exec %d ms:\n", ToString(), msecs(time));
+
+//	if(!dynamic_param.IsEmpty()) {
+//		dynamic_pos = -1;
+//		for(int i = 0; i < dynamic_param.GetCount(); i++)
+//			param[dynamic_param[i]].DynaFlush();
+//		dynamic_rows = param[dynamic_param[0]].dynamic.GetCount();
+//	}
+
+	if(parse && !!frowset)
+		Execute(frowset);
+	else {
+		fetch_rowset = frowset;
+		fetch_rowcount = 0;
+	}
+	fetch_eof = info.IsEmpty();
+//	session->PostExec();
+	return true;
+}
+
+void OleDBConnection::Execute(IRef<IRowset> rowset)
+{
+	fetch_rowset = rowset;
+	fetch_eof = false;
+	fetch_rowcount = 0;
+
+	OleBuffer<DBCOLUMNINFO> columns;
+	OleBuffer<OLECHAR> names;
+	ULONG fetchcols;
+	IRef<IColumnsInfo> cinfo(~fetch_rowset);
+	OleDBVerify(cinfo->GetColumnInfo(&fetchcols, columns.Set(), names.Set()));
+	info.SetCount(fetchcols);
+	for(int i = 0; i < (int)fetchcols; i++) {
+		SqlColumnInfo& colinfo = info[i];
+		const DBCOLUMNINFO& dbci = columns[i];
+		colinfo.name = WString((const wchar *)dbci.pwszName).ToString();
+		colinfo.precision = (dbci.bPrecision == (byte)~0 ? int(Null) : dbci.bPrecision);
+		colinfo.scale = (dbci.bScale == (byte)~0 ? int(Null) : dbci.bScale);
+		colinfo.width = dbci.ulColumnSize;
+		switch(dbci.wType) {
+		case DBTYPE_I1: case DBTYPE_I2: case DBTYPE_I4:
+		case DBTYPE_UI1: case DBTYPE_UI2: case DBTYPE_UI4:
+		case DBTYPE_BOOL:
+			colinfo.type = INT_V;
+			break;
+
+		case DBTYPE_UI8: case DBTYPE_I8:
+		case DBTYPE_R4: case DBTYPE_R8:
+		case DBTYPE_CY:
+		case DBTYPE_DECIMAL:
+		case DBTYPE_NUMERIC:
+		case DBTYPE_VARNUMERIC:
+			colinfo.type = DOUBLE_V;
+			break;
+
+		case DBTYPE_DATE: case DBTYPE_FILETIME:
+		case DBTYPE_DBDATE: case DBTYPE_DBTIME:
+		case DBTYPE_DBTIMESTAMP:
+			colinfo.type = TIME_V;
+			break;
+
+		case DBTYPE_BYTES:
+		case DBTYPE_STR:
+		case DBTYPE_BSTR:
+		case DBTYPE_WSTR:
+		case DBTYPE_GUID:
+			colinfo.type = STRING_V;
+			break;
+
+		default:
+			colinfo.type = UNKNOWN_V;
+			break;
+		}
+	}
+	fetch_bindings = GetRowDataBindings(columns, fetchcols, fetch_bindprocs, fetch_rowbytes);
+	fetch_chunk = minmax<int>(MAX_FETCH_BYTES / (fetch_rowbytes + 1), 1, MAX_FETCH_ROWS);
+	fetch_rowbuffer.Alloc(fetch_rowbytes);
+	fetch_hrows.Alloc(fetch_chunk);
+	OleDBVerify(QueryInterface(fetch_rowset, fetch_accessor));
+	OleDBVerify(fetch_accessor->CreateAccessor(DBACCESSOR_ROWDATA, fetchcols,
+		fetch_bindings, fetch_rowbytes, &fetch_haccessor, NULL));
+}
+
+int OleDBConnection::GetRowsProcessed() const
+{
+	return fetch_rowcount;
+}
+
+bool OleDBConnection::Fetch()
+{
+	LTIMING("OleDBConnection::Fetch");
+	if(fetch_eof)
+		return false;
+	ASSERT(!!fetch_rowset);
+	current_row.Clear();
+	if(prefetch.IsEmpty())
+		try {
+			TryPrefetch();
+			if(prefetch.IsEmpty()) {
+				fetch_eof = true;
+				return false;
+			}
+		}
+		catch(Exc e) {
+			session->SetError("Fetch(OleDB): " + e, statement);
+			fetch_eof = true;
+			return false;
+		}
+	LTIMING("OleDBConnection::Fetch->scroll");
+	current_row = prefetch[0];
+	prefetch.Remove(0);
+	fetch_rowcount++;
+	return true;
+}
+
+void OleDBConnection::TryPrefetch()
+{
+	LTIMING("OleDBConnection::TryPrefetch");
+
+	ULONG countrows;
+	HROW *prows = fetch_hrows;
+
+	{
+		LTIMING("OleDBConnection::TryPrefetch->GetNextRows");
+		HRESULT hr;
+		if(!fetch_rowset) {
+			session->SetError("Fetch(OleDB): execute failed (null rowset)", statement);
+			return;
+		}
+		if(FAILED(hr = fetch_rowset->GetNextRows(DB_NULL_HCHAPTER, 0, fetch_chunk, &countrows, &prows))) {
+			session->SetError(("Fetch(OleDB): " + OleDBErrorInfo(hr)).ToString(), statement);
+			return;
+		}
+	}
+	if(countrows <= 0)
+		return;
+	for(unsigned i = 0; i < countrows; i++) {
+		{
+			LTIMING("OleDBConnection::TryPrefetch->GetData");
+			OleDBVerify(fetch_rowset->GetData(fetch_hrows[i], fetch_haccessor, fetch_rowbuffer));
+		}
+		LTIMING("OleDBConnection::TryPrefetch->GetRowData");
+		prefetch.Add() = GetRowData(fetch_rowbuffer, fetch_bindings, fetch_bindprocs, info.GetCount());
+	}
+	LTIMING("OleDBConnection::TryPrefetch->ReleaseRows");
+	OleDBVerify(fetch_rowset->ReleaseRows(countrows, prows, NULL, NULL, NULL));
+}
+
+void OleDBConnection::GetColumn(int i, Ref r) const
+{
+	r.SetValue(current_row[i]);
+}
+
+void OleDBConnection::SyncArgs()
+{
+	ClearArgs();
+	int nparam = cmd_param.GetCount();
+	if(nparam == 0)
+		return;
+	cmd_bindings.Alloc(nparam);
+	DBBINDING *cb = cmd_bindings;
+	memset(cb, 0, sizeof(DBBINDING) * nparam);
+	int rowbytes = 0;
+	int i;
+	for(i = 0; i < nparam; i++, cb++) {
+		const Param& par = cmd_param[i];
+		cb->iOrdinal = i + 1;
+		cb->obStatus = rowbytes;
+		cb->dwPart = DBPART_STATUS | DBPART_VALUE;
+		cb->dwMemOwner = DBMEMOWNER_CLIENTOWNED;
+		cb->eParamIO = DBPARAMIO_INPUT;
+		rowbytes += sizeof(dword);
+		switch(par.vtype) {
+		default:
+			NEVER();
+		case VOID_V:
+			cb->wType = DBTYPE_WSTR;
+			cb->dwPart = DBPART_STATUS;
+			break;
+
+		case INT_V:
+			cb->wType = DBTYPE_I4;
+			cb->obValue = rowbytes;
+			rowbytes += sizeof(int);
+			break;
+
+		case DOUBLE_V:
+			cb->wType = DBTYPE_R8;
+			rowbytes = (rowbytes + 7) & -8;
+			cb->obValue = rowbytes;
+			rowbytes += 8;
+			break;
+
+		case STRING_V:
+			cb->wType = DBTYPE_STR;
+			cb->dwPart = DBPART_STATUS | DBPART_VALUE | DBPART_LENGTH;
+			cb->cbMaxLen = par.alloc + 1;
+			cb->obValue = rowbytes;
+			rowbytes = (rowbytes + par.alloc + 1 + 3) & -4;
+			cb->obLength = rowbytes;
+			rowbytes += sizeof(DBLENGTH);
+			break;
+
+		case WSTRING_V:
+			cb->wType = DBTYPE_WSTR;
+			cb->dwPart = DBPART_STATUS | DBPART_VALUE | DBPART_LENGTH;
+			cb->cbMaxLen = sizeof(wchar) * (par.alloc + 1);
+			cb->obValue = rowbytes;
+			rowbytes = (rowbytes + sizeof(wchar) * par.alloc + sizeof(wchar) + 3) & -4;
+			cb->obLength = rowbytes;
+			rowbytes += sizeof(DBLENGTH);
+			break;
+
+		case TIME_V:
+			cb->wType = DBTYPE_DATE;
+			rowbytes = (rowbytes + 7) & -8;
+			cb->obValue = rowbytes;
+			rowbytes += sizeof(DATE);
+			break;
+		}
+	}
+	cmd_argbuffer.Alloc(rowbytes);
+	OleDBVerify(cmd_accessor->CreateAccessor(DBACCESSOR_PARAMETERDATA,
+		nparam, cmd_bindings, rowbytes, &cmd_haccessor, NULL));
+	cb = cmd_bindings;
+	for(i = 0; i < nparam; i++, cb++) {
+		const Param& par = cmd_param[i];
+		if((*(dword *)(cmd_argbuffer + cb->obStatus)
+		= IsNull(par.value) ? DBSTATUS_S_ISNULL : DBSTATUS_S_OK) == DBSTATUS_S_OK)
+			par.bindproc(*cb, cmd_argbuffer, par.value);
+	}
+}
+
+void OleDBConnection::ClearArgs()
+{
+	if(cmd_haccessor) {
+		if(!!cmd_accessor)
+			cmd_accessor->ReleaseAccessor(cmd_haccessor, NULL);
+		cmd_haccessor = NULL;
+		cmd_bindings.Clear();
+		cmd_argbuffer.Clear();
+	}
+}
+
+void OleDBConnection::Cancel()
+{
+	current_row.Clear();
+	prefetch.Clear();
+	if(!!cmd)
+		cmd->Cancel();
+
+	fetch_rowbuffer.Clear();
+	fetch_bindings.Clear();
+	fetch_bindprocs.Clear();
+	fetch_hrows.Clear();
+	if(!!fetch_accessor && !!fetch_haccessor)
+		fetch_accessor->ReleaseAccessor(fetch_haccessor, NULL);
+	fetch_haccessor = NULL;
+	fetch_accessor.Clear();
+	fetch_rowset.Clear();
+	info.Clear();
+
+	ClearArgs();
+}
+
+String OleDBConnection::ToString() const
+{
+	if(!session)
+		return "OleDB zombie connection";
+	return NFormat("OleDB[user=%s]", session->user);
+}
+
+OleDBSession::OleDBSession()
+{
+	level = -1;
+	Dialect(MSSQL);
+}
+
+OleDBSession::~OleDBSession()
+{
+	Close();
+}
+
+Array<OleDBSession::Provider> OleDBSession::EnumProviders()
+{
+	OleInit();
+	Array<OleDBSession::Provider> out;
+	try {
+		IRef<ISourcesRowset> src(CLSID_OLEDB_ENUMERATOR);
+		IRef<IRowset> rowset;
+		src->GetSourcesRowset(NULL, IID_IRowset, 0, NULL, rowset.SetUnk());
+/*
+		IRef<IColumnsInfo> cinfo;
+		OleDBVerify(QueryInterface(rowset, cinfo));
+		ULONG count;
+		OleBuffer<DBCOLUMNINFO> columns;
+		OleBuffer<OLECHAR> names;
+		OleDBVerify(cinfo->GetColumnInfo(&count, columns.Set(), names.Set()));
+		enum { ENAME, EDESC, EGUID, ECOUNT };
+		DBCOLUMNINFO fetch_cols[ECOUNT];
+		ZeroArray(fetch_cols);
+		int i;
+		for(i = 0; i < (int)count; i++) {
+			WString colname = columns[i].pwszName;
+			if(colname == L"SOURCES_NAME")        fetch_cols[ENAME] = columns[i];
+			else if(colname == L"SOURCES_DESCRIPTION") fetch_cols[EDESC] = columns[i];
+			else if(colname == L"SOURCES_CLSID")       fetch_cols[EGUID] = columns[i];
+		}
+		for(i = 0; i < ECOUNT; i++)
+			if(!fetch_cols[i].pwszName)
+				throw Exc("invalid provider enumerator");
+
+		int rowbytes;
+		Buffer<OutBindProc> bindprocs;
+		Buffer<DBBINDING> bindings = GetRowDataBindings(fetch_cols, ECOUNT, bindprocs, rowbytes);
+		Buffer<byte> rowbuffer(rowbytes);
+
+		IRef<IAccessor> accessor;
+		OleDBVerify(QueryInterface(rowset, accessor));
+		HACCESSOR haccessor;
+		OleDBVerify(accessor->CreateAccessor(DBACCESSOR_ROWDATA, ECOUNT, bindings, rowbytes, &haccessor, NULL));
+
+		HROW hrow;
+		HROW *prow = &hrow;
+		ULONG countrows;
+		while(SUCCEEDED(rowset->GetNextRows(DB_NULL_HCHAPTER, 0, 1, &countrows, &prow)) && countrows > 0) {
+			OleDBVerify(rowset->GetData(hrow, haccessor, rowbuffer));
+			Vector<Value> data = GetRowData(rowbuffer, bindings, bindprocs, ECOUNT);
+			OleDBVerify(rowset->ReleaseRows(countrows, prow, NULL, NULL, NULL));
+			Provider& provider = out.Add();
+			provider.name = data[0];
+			provider.description = data[1];
+			provider.guid = data[2];
+		}
+
+		OleDBVerify(accessor->ReleaseAccessor(haccessor, NULL));
+*/
+		OleDBSession dummy;
+		One<OleDBConnection> conn = new OleDBConnection(&dummy);
+		conn->Execute(rowset);
+		Sql cursor(-conn);
+		int cname = -1, cdesc = -1, cguid = -1;
+		for(int i = 0; i < cursor.GetColumns(); i++) {
+			String ci = cursor.GetColumnInfo(i).name;
+			if(ci == "SOURCES_NAME") cname = i;
+			else if(ci == "SOURCES_DESCRIPTION") cdesc = i;
+			else if(ci == "SOURCES_CLSID") cguid = i;
+		}
+		if(cname < 0) throw Exc("SOURCES_NAME column not found");
+		if(cdesc < 0) throw Exc("SOURCES_DESCRIPTION column not found");
+		if(cguid < 0) throw Exc("SOURCES_CLSID column not found");
+
+		while(cursor.Fetch()) {
+			Provider& provider = out.Add();
+			provider.name = cursor[cname];
+			provider.description = cursor[cdesc];
+			provider.guid = cursor[cguid];
+		}
+	}
+	catch(Exc e) {
+		RLOG("OleDB::GetProviders->" << e);
+	}
+	return out;
+}
+
+bool OleDBSession::Open(String connect)
+{
+	const char *b = connect, *p = b;
+	while(*p && *p != '/' && *p != '@')
+		p++;
+	String user(b, p);
+	String password;
+	if(*p == '/') {
+		b = ++p;
+		while(*p && *p != '@')
+			p++;
+		password = String(b, p);
+	}
+	String provider, datasource;
+	if(*p == '@') {
+		b = ++p;
+		while(*p && *p != '/')
+			p++;
+		provider = String(b, p);
+		if(*p++)
+			datasource = p;
+	}
+	return Open(user, password, datasource, provider);
+}
+
+bool OleDBSession::Open(String user, String password, String datasource, String provider)
+{
+	return OpenProp(NFormat("Provider=%s;Data Source=%s;User ID=%s;Password=%s",
+		provider, datasource, user, password));
+}
+
+bool OleDBSession::OpenProp(String propset)
+{
+	Close();
+	try {
+		OleInit();
+		IRef<IDataInitialize> init(CLSID_MSDAINITIALIZE);
+		OleDBVerify(init->GetDataSource(NULL, CLSCTX_INPROC_SERVER, ~OleBstr(propset),
+			dbinit.GetIID(), dbinit.SetUnk()));
+		HRESULT hres = dbinit->Initialize();
+		if(FAILED(hres))
+			throw Exc(OleDBErrorInfo(hres).ToString());
+		IRef<IDBCreateSession> dbcs(~dbinit);
+		if(FAILED(hres = dbcs->CreateSession(NULL, dbsession.GetIID(), dbsession.SetUnk())))
+			throw Exc(OleDBErrorInfo(hres).ToString());
+		QueryInterface(dbsession, transaction);
+		QueryInterface(dbsession, transaction_object);
+		IRef<IDBProperties> dbprop(~dbinit);
+		DBPROPID propid[] = { DBPROP_AUTH_USERID };
+		DBPROPIDSET propidset = { propid, 1 };
+		propidset.guidPropertySet = DBPROPSET_DBINIT;
+		DBPROPSET *propset = NULL;
+		ULONG outcount;
+		OleDBVerify(dbprop->GetProperties(1, &propidset, &outcount, &propset));
+		if(outcount == 1 && propset->cProperties && propset->rgProperties)
+			user = ToUpper(String(AsValue(propset->rgProperties->vValue)));
+		for(int i = 0; i < (int)outcount; i++) {
+			for(int p = 0; p < (int)propset[i].cProperties; p++)
+				VariantClear(&propset[i].rgProperties[p].vValue);
+			CoTaskMemFree(propset[i].rgProperties);
+		}
+		CoTaskMemFree(propset);
+		dialect = DBGUID_DEFAULT; // todo
+		level = 0;
+		return true;
+	}
+	catch(Exc e) {
+		SetError(e, "connect");
+		dbinit.Clear();
+		return false;
+	}
+}
+
+void OleDBSession::Close()
+{
+	if(!!dbsession && level > 0) {
+		RLOG("OleDBSession::Close->transaction level = " << level);
+	}
+	while(!clink.IsEmpty()) {
+		clink.GetNext()->Clear();
+		clink.GetNext()->Unlink();
+	}
+	user = Null;
+	transaction.Clear();
+	dbsession.Clear();
+	if(!!dbinit && FAILED(dbinit->Uninitialize())) {
+		RLOG("OleDBSession::Close error, watch out for leaks!");
+	}
+	dbinit.Clear();
+	level = -1;
+}
+
+void OleDBSession::Begin()
+{
+	level++;
+	ULONG tran_level;
+	HRESULT hr;
+	if(!transaction)
+		SetError("Transactions not supported by data source", "StartTransaction(OleDB)");
+	else if(!transaction_object && level >= 2)
+		SetError("Nested transactions not supported by data source", "StartTransaction(OleDB)");
+	else if(FAILED(hr = transaction->StartTransaction(ISOLATIONLEVEL_READCOMMITTED, 0, NULL, &tran_level)))
+		SetError(OleDBErrorInfo(hr).ToString(), "StartTransaction(OleDB)");
+}
+
+void OleDBSession::Commit()
+{
+	level--;
+	ASSERT(level >= 0);
+	try {
+		if(!transaction)
+			throw Exc("Transactions not supported by data source");
+		if(level == 0)
+			OleDBVerify(transaction->Commit(false, XACTTC_SYNC, 0));
+		else if(!transaction_object)
+			throw Exc("Nested transactions not supported by data source");
+		else {
+			IRef<ITransaction> nested_tran;
+			OleDBVerify(transaction_object->GetTransactionObject(1 + level, nested_tran.Set()));
+			OleDBVerify(nested_tran->Commit(false, XACTTC_SYNC, 0));
+		}
+	}
+	catch(Exc e) {
+		SetError(e, "Commit(OleDB)");
+	}
+}
+
+void OleDBSession::Rollback()
+{
+	level--;
+	ASSERT(level >= 0);
+	try {
+		if(!transaction)
+			throw Exc("Transactions not supported by data source");
+		if(level == 0)
+			OleDBVerify(transaction->Abort(NULL, false, false));
+		else if(!transaction_object)
+			throw Exc("Nested transactions not supported by data source");
+		else {
+			IRef<ITransaction> nested_tran;
+			OleDBVerify(transaction_object->GetTransactionObject(1 + level, nested_tran.Set()));
+			OleDBVerify(nested_tran->Abort(NULL, false, false));
+		}
+	}
+	catch(Exc e) {
+		SetError(e, "Rollback(OleDB)");
+	}
+}
+
+String OleDBSession::Savepoint()
+{
+	SetError("Savepoints not supported in OleDB", "Savepoint");
+	return Null;
+}
+
+void OleDBSession::RollbackTo(const String& savepoint)
+{
+	SetError("Savepoints not supported in OleDB", "Rollback to Savepoint");
+}
+
+bool OleDBSession::IsOpen() const
+{
+	return !!dbinit;
+}
+
+SqlConnection *OleDBSession::CreateConnection()
+{
+	return new OleDBConnection(this);
+}
+
+Vector<String> OleDBSession::EnumUsers()
+{
+	Vector<String> out;
+	return out;
+}
+
+Vector<String> OleDBSession::EnumDatabases()
+{
+	Vector<String> out;
+	IRef<IDBSchemaRowset> srowset;
+	if(SUCCEEDED(QueryInterface(dbsession, srowset)) && !!srowset) {
+		IRef<IRowset> trowset;
+		OleVerify(srowset->GetRowset(NULL, DBSCHEMA_CATALOGS, 0, NULL, trowset.GetIID(), 0, NULL, trowset.SetUnk()));
+		One<OleDBConnection> conn = new OleDBConnection(this);
+		conn->Execute(trowset);
+		Sql cursor(-conn);
+		int ccat = -1;
+		for(int i = 0; i < cursor.GetColumns(); i++) {
+			String n = cursor.GetColumnInfo(i).name;
+			if(n == "CATALOG_NAME") ccat = i;
+		}
+		if(ccat >= 0)
+			while(cursor.Fetch())
+				out.Add(cursor[ccat]);
+	}
+	return out;
+}
+
+Vector<String> OleDBSession::EnumTables(String database)
+{
+	Vector<String> out;
+	IRef<IDBSchemaRowset> srowset;
+	if(SUCCEEDED(QueryInterface(dbsession, srowset)) && !!srowset) {
+		OleVariant restrictions[1];
+		restrictions[0].vt = VT_BSTR;
+		restrictions[0].bstrVal = StringToBSTR(database);
+		IRef<IRowset> trowset;
+		OleVerify(srowset->GetRowset(NULL, DBSCHEMA_TABLES, 1, restrictions, trowset.GetIID(), 0, NULL, trowset.SetUnk()));
+		One<OleDBConnection> conn = new OleDBConnection(this);
+		conn->Execute(trowset);
+		Sql cursor(-conn);
+		int cname = -1;
+		int cschema = -1;
+		int ctype = -1;
+		for(int i = 0; i < cursor.GetColumns(); i++) {
+			String n = cursor.GetColumnInfo(i).name;
+			if(n == "TABLE_NAME") cname = i;
+			else if(n == "TABLE_SCHEMA") cschema = i;
+			else if(n == "TABLE_TYPE") ctype = i;
+		}
+		if(cname >= 0)
+			while(cursor.Fetch()) {
+				if(ctype >= 0) {
+					String t = cursor[ctype];
+					if(t == "VIEW" || t == "SYSTEM VIEW")
+						continue;
+				}
+				String t;
+				if(cschema >= 0) {
+					String s = cursor[cschema];
+					if(!IsNull(s) && s != GetUser())
+						t << s << '.';
+				}
+				t << (String)cursor[cname];
+				out.Add(t);
+			}
+	}
+	return out;
+}
+
+Vector<String> OleDBSession::EnumViews(String database)
+{
+	Vector<String> out;
+	IRef<IDBSchemaRowset> srowset;
+	if(SUCCEEDED(QueryInterface(dbsession, srowset)) && !!srowset) {
+		OleVariant restrictions[1];
+		restrictions[0].vt = VT_BSTR;
+		restrictions[0].bstrVal = StringToBSTR(database);
+		IRef<IRowset> trowset;
+		OleVerify(srowset->GetRowset(NULL, DBSCHEMA_TABLES, 1, restrictions, trowset.GetIID(), 0, NULL, trowset.SetUnk()));
+		One<OleDBConnection> conn = new OleDBConnection(this);
+		conn->Execute(trowset);
+		Sql cursor(-conn);
+		int cname = -1;
+		int cschema = -1;
+		int ctype = -1;
+		for(int i = 0; i < cursor.GetColumns(); i++) {
+			String n = cursor.GetColumnInfo(i).name;
+			if(n == "TABLE_NAME") cname = i;
+			else if(n == "TABLE_SCHEMA") cschema = i;
+			else if(n == "TABLE_TYPE") ctype = i;
+		}
+		if(cname >= 0)
+			while(cursor.Fetch()) {
+				if(ctype >= 0) {
+					String t = cursor[ctype];
+					if(t != "VIEW" && t != "SYSTEM VIEW")
+						continue;
+				}
+				String t;
+				if(cschema >= 0) {
+					String s = cursor[cschema];
+					if(!IsNull(s) && s != GetUser())
+						t << s << '.';
+				}
+				t << (String)cursor[cname];
+				out.Add(t);
+			}
+	}
+	return out;
+}
+
+Vector<String> OleDBSession::EnumSequences(String database)
+{
+	Vector<String> out;
+	return out;
+}
+
+Vector<String> OleDBSession::EnumPrimaryKeys(String database, String table)
+{
+	Vector<String> out;
+	IRef<IDBSchemaRowset> srowset;
+	if(SUCCEEDED(QueryInterface(dbsession, srowset)) && !!srowset) {
+		OleVariant restrictions[3];
+		restrictions[0].vt = VT_BSTR;
+		restrictions[0].bstrVal = StringToBSTR(database);
+		restrictions[1].vt = VT_BSTR;
+		restrictions[1].bstrVal = StringToBSTR(database);
+		restrictions[2].vt = VT_BSTR;
+		restrictions[2].bstrVal = StringToBSTR(table);
+		IRef<IRowset> trowset;
+		OleVerify(srowset->GetRowset(NULL, DBSCHEMA_PRIMARY_KEYS, __countof(restrictions), restrictions,
+			trowset.GetIID(), 0, NULL, trowset.SetUnk()));
+		One<OleDBConnection> conn = new OleDBConnection(this);
+		conn->Execute(trowset);
+		Sql cursor(-conn);
+		int cname = -1;
+		int cord = -1;
+		Vector<int> ordinal;
+		for(int i = 0; i < cursor.GetColumns(); i++) {
+			String n = cursor.GetColumnInfo(i).name;
+			if(n == "COLUMN_NAME")
+				cname = i;
+			else if(n == "ORDINAL")
+				cord = i;
+		}
+		if(cname >= 0)
+			while(cursor.Fetch()) {
+				out.Add(cursor[cname]);
+				if(cord >= 0)
+					ordinal.Add(cursor[cord]);
+			}
+		if(cord >= 0)
+			IndexSort(ordinal, out);
+	}
+	return out;
+	return out;
+}
+
+String OleDBSession::EnumRowID(String database, String table)
+{
+	Sql cursor(*this);
+	String full_name = database;
+	if(!IsNull(full_name)) full_name.Cat('.');
+	full_name.Cat(table);
+	if(cursor * Select(SqlCol("ROWID")).From(SqlCol(full_name)).Where(SqlBool::False()))
+		return "ROWID";
+	if(cursor * Select(SqlCol("IDENTITYCOL")).From(SqlCol(full_name)).Where(SqlBool::False())
+	&& cursor.GetColumns() >= 1)
+		return cursor.GetColumnInfo(0).name;
+	return Null;
+}
+
+bool OleDBPerformScript(const String& text, StatementExecutor& executor, Gate2<int, int> progress_canceled)
+{
+	const char *p = text;
+	while(*p) {
+		String cmd;
+		while(*p && *p != ';')
+			if(*p == '\'') {
+				const char *s = p;
+				while(*++p && (*p != '\'' || *++p == '\''))
+					;
+				cmd.Cat(s, p - s);
+			}
+			else {
+				if(*p > ' ')
+					cmd.Cat(*p);
+				else if(!cmd.IsEmpty() && *cmd.Last() != ' ')
+					cmd.Cat(' ');
+				p++;
+			}
+		if(progress_canceled(p - text.Begin(), text.GetLength()))
+			return false;
+		if(!IsNull(cmd) && !executor.Execute(cmd))
+			return false;
+		if(*p == ';')
+			p++;
+	}
+	return true;
+}
+
+String OleDBTextType(int width)
+{
+	if(width <= 4000)
+		return NFormat("varchar(%d)", width);
+	return "text";
+}
+
+END_UPP_NAMESPACE
+
+#endif
diff --git a/uppsrc/OleDB/OleDB.h b/uppsrc/OleDB/OleDB.h
new file mode 100644
index 000000000..70b8f3838
--- /dev/null
+++ b/uppsrc/OleDB/OleDB.h
@@ -0,0 +1,85 @@
+#ifndef __OLEDB_H__
+#define __OLEDB_H__
+
+#include <Sql/Sql.h>
+
+#if defined(PLATFORM_WIN32) && defined(COMPILER_MSC)
+
+#define Font OleFont
+#define Picture OlePicture
+#define byte win32_byte_ // RpcNdr defines byte -> class with Upp::byte
+#define CY win32_CY_
+#include <Ole/Ole.h>
+#include <winnls.h>
+#include <oleauto.h>
+#include <oledb.h>
+#include <msdasc.h>
+#include <msdaguid.h>
+#undef Font
+#undef Picture
+#undef byte
+#undef CY
+
+NAMESPACE_UPP
+
+bool   OleDBPerformScript(const String& text, StatementExecutor& executor, Gate2<int, int> progress_canceled = false);
+String OleDBTextType(int width);
+
+class OleDBSession : public SqlSession
+{
+public:
+	OleDBSession();
+	virtual ~OleDBSession();
+
+	bool                   Open(String connect);
+	bool                   Open(String user, String password, String datasource, String provider);
+	bool                   OpenProp(String propset);
+	void                   Close();
+
+	virtual void           Begin();
+	virtual void           Commit();
+	virtual void           Rollback();
+
+	virtual String         Savepoint();
+	virtual void           RollbackTo(const String& savepoint);
+
+	virtual bool           IsOpen() const;
+	virtual RunScript      GetRunScript() const { return &OleDBPerformScript; }
+
+	virtual Vector<String> EnumUsers();
+	virtual Vector<String> EnumDatabases();
+	virtual Vector<String> EnumTables(String database);
+	virtual Vector<String> EnumViews(String database);
+	virtual Vector<String> EnumSequences(String database);
+	virtual Vector<String> EnumPrimaryKeys(String database, String table);
+	virtual String         EnumRowID(String database, String table);
+
+	struct Provider
+	{
+		String name;
+		String description;
+		String guid;
+	};
+	static Array<Provider> EnumProviders();
+
+protected:
+	virtual SqlConnection *CreateConnection();
+
+protected:
+	friend class OleDBConnection;
+
+	IRef<IDBInitialize>    dbinit;
+	IRef<IDBCreateCommand> dbsession;
+	IRef<ITransactionLocal> transaction;
+	IRef<ITransactionObject> transaction_object;
+	Link<OleDBConnection>  clink;
+	Guid                   dialect;
+	String                 user;
+	int                    level;
+};
+
+END_UPP_NAMESPACE
+
+#endif
+
+#endif//__OLEDB_H__
diff --git a/uppsrc/OleDB/OleDB.upp b/uppsrc/OleDB/OleDB.upp
new file mode 100644
index 000000000..0cb962817
--- /dev/null
+++ b/uppsrc/OleDB/OleDB.upp
@@ -0,0 +1,16 @@
+description "OLEDB interface";
+
+uses
+	Ole,
+	Sql;
+
+link(MT DEBUG) /nodefaultlib:LIBCMT;
+
+file
+	OleDB.h,
+	OleDBSchema.h,
+	OleDB.cpp,
+	Info readonly separator,
+	COPYING,
+	COPYING-PLAIN,
+	AUTHORS;
diff --git a/uppsrc/OleDB/OleDBSchema.h b/uppsrc/OleDB/OleDBSchema.h
new file mode 100644
index 000000000..0843a69a1
--- /dev/null
+++ b/uppsrc/OleDB/OleDBSchema.h
@@ -0,0 +1,85 @@
+#define BOOL(x)                    COLUMN("bit", int, x, 0, 0)
+#define BOOL_ARRAY(x, items)       COLUMN_ARRAY("bit", int, x, 0, 0, items)
+#define BOOL_(x)                   COLUMN_("bit", int, x, 0, 0)
+#define BOOL_ARRAY_(x, items)      COLUMN_ARRAY_("bit", int, x, 0, 0, items)
+
+#define INT(x)                     COLUMN("integer", int, x, 0, 0)
+#define INT_ARRAY(x, items)        COLUMN_ARRAY("integer", int, x, 0, 0, items)
+#define INT_(x)                    COLUMN_("integer", int, x, 0, 0)
+#define INT_ARRAY_(x, items)       COLUMN_ARRAY_("integer", int, x, 0, 0, items)
+
+#define DOUBLE(x)                  COLUMN("double precision", double, x, 0, 0)
+#define DOUBLE_ARRAY(x, items)     COLUMN_ARRAY("double precision", double, x, 0, 0, items)
+#define DOUBLE_(x)                 COLUMN_("double precision", double, x, 0, 0)
+#define DOUBLE_ARRAY_(x, items)    COLUMN_ARRAY_("double precision", double, x, 0, 0, items)
+
+#define DATE(x)                    COLUMN("datetime", Date, x, 0, 0)
+#define DATE_ARRAY(x, items)       COLUMN_ARRAY("datetime", Date, x, 0, 0, items)
+#define DATE_(x)                   COLUMN_("datetime", Date, x, 0, 0)
+#define DATE_ARRAY_(x, items)      COLUMN_ARRAY_("datetime", Date, x, 0, 0, items)
+
+#define TIME(x)                    COLUMN("datetime", Time, x, 0, 0)
+#define TIME_ARRAY(x, items)       COLUMN_ARRAY("datetime", Time, x, 0, 0, items)
+#define TIME_(x)                   COLUMN_("datetime", Time, x, 0, 0)
+#define TIME_ARRAY_(x, items)      COLUMN_ARRAY_("datetime", Time, x, 0, 0, items)
+
+#define STRING(x, n)               COLUMN(OleDBTextType(n), String, x, n, 0)
+#define STRING_ARRAY(x, n, items)  COLUMN_ARRAY(OleDBTextType(n), String, x, n, 0, items)
+#define STRING_(x, n)              COLUMN_(OleDBTextType(n), String, x, n, 0)
+#define STRING_ARRAY_(x, n, items) COLUMN_ARRAY_(OleDBTextType(n), String, x, n, 0, items)
+
+#define PRIMARY_KEY                INLINE_ATTRIBUTE("primary key")
+#define KEY                        INLINE_ATTRIBUTE("key")
+#define NOT_NULL                   INLINE_ATTRIBUTE("not null")
+#define IDENTITY                   INLINE_ATTRIBUTE("identity")
+
+#define INDEX                      ATTRIBUTE("create index IDX_@x on @t(@c);", \
+                                             "drop index IDX_@x;")
+#define UNIQUE                     ATTRIBUTE("create unique index UNQ_@x on @t(@c);", \
+	                                         "drop index UNQ_@x;")
+#define REFERENCES(x)              ATTRIBUTE("alter table @t add constraint FK_@x foreign key "\
+                                             "(@c) references @s" #x ";",\
+                                             "alter table @t drop constraint FK_@x;")
+
+#define TIMESTAMP(ts)              SCHEMA("-- " ts "\n\n", NULL)
+
+#define COMMENT(txt)               SCHEMA("-- " #txt "\n", NULL)
+
+#include <Sql/sch_model.h>
+
+#undef INT
+#undef INT_ARRAY
+#undef INT_
+#undef INT_ARRAY_
+
+#undef DOUBLE
+#undef DOUBLE_ARRAY
+#undef DOUBLE_
+#undef DOUBLE_ARRAY_
+
+#undef DATE
+#undef DATE_ARRAY
+#undef DATE_
+#undef DATE_ARRAY_
+
+#undef DATETIME
+#undef DATETIME_ARRAY
+#undef DATETIME_
+#undef DATETIME_ARRAY_
+
+#undef STRING
+#undef STRING_ARRAY
+#undef STRING_
+#undef STRING_ARRAY_
+
+#undef PRIMARY_KEY
+#undef KEY
+#undef NOT_NULL
+#undef IDENTITY
+
+#undef INDEX
+
+#undef UNIQUE
+
+#undef TIMESTAMP
+#undef COMMENT
diff --git a/uppsrc/Oracle/AUTHORS b/uppsrc/Oracle/AUTHORS
new file mode 100644
index 000000000..f782e5b62
--- /dev/null
+++ b/uppsrc/Oracle/AUTHORS
@@ -0,0 +1,2 @@
+Mirek Fidler <cxl@ntllib.org>
+Tomas Rylek  <rylek@volny.cz>
\ No newline at end of file
diff --git a/uppsrc/Oracle/COPYING b/uppsrc/Oracle/COPYING
new file mode 100644
index 000000000..33aa39102
--- /dev/null
+++ b/uppsrc/Oracle/COPYING
@@ -0,0 +1,30 @@
+Copyright (C) 2005 Mirek Fidler, Tomas Rylek and various contributors (see AUTHORS)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to
+deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies of the Software and its Copyright notices. In addition publicly
+documented acknowledgment must be given that this software has been used if no
+source code of this software is made available publicly. This includes
+acknowledgments in either Copyright notices, Manuals, Publicity and Marketing
+documents or any documentation provided with any product containing this
+software. This License does not apply to any software that links to the
+libraries provided by this software (statically or dynamically), but only to
+the software provided.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+-----------
+
+Please see the COPYING.PLAIN for a plain-english explanation of this notice
+and it's intent.
diff --git a/uppsrc/Oracle/COPYING-PLAIN b/uppsrc/Oracle/COPYING-PLAIN
new file mode 100644
index 000000000..770a8132f
--- /dev/null
+++ b/uppsrc/Oracle/COPYING-PLAIN
@@ -0,0 +1,33 @@
+Plain English Copyright Notice
+
+This file is not intended to be the actual License. The reason this file
+exists is that we here are programmers and engineers. We aren't lawyers. We
+provide licenses that we THINK say the right things, but we have our own
+intentions at heart. This is a plain-english explanation of what those
+intentions are, and if you follow them you will be within the "spirit" of
+the license.
+
+The intent is for us to enjoy writing software that is useful to us (the
+AUTHORS) and allow others to use it freely and also benefit from the work we
+put into making it. We don't want to restrict others using it. They should
+not *HAVE* to make the source code of the applications they write that
+simply link to these libraries (be that statically or dynamically), or for
+them to be limited as to what license they choose to use (be it open, closed
+or anything else). But we would like to know you are using these libraries.
+We simply would like to know that it has been useful to someone. This is why
+we ask for acknowledgement of some sort.
+
+You can do what you want with the source of this software - it doesn't
+matter. We still have it here for ourselves and it is open and free to use
+and download and play with. It can't be taken away. We don't really mind what
+you do with the source to your software. We would simply like to know that
+you are using it - especially if it makes it to a commerical product. If you
+simply e-mail all the AUTHORS (see COPYING and AUTHORS files) telling us, and
+then make sure you include a paragraph or page in the manual or in the "About.."
+box for the product with the copyright notice and state that you used this
+software, we will be very happy. If you want to contribute back modifications
+and fixes you may have made we will welcome those too with open arms (generally).
+If you want help with changes needed, ports needed or features to be added,
+arrangements can be easily made with some dialogue.
+
+Mirek Fidler <cxl@ntllib.org>
diff --git a/uppsrc/Oracle/Oci7.cpp b/uppsrc/Oracle/Oci7.cpp
new file mode 100644
index 000000000..379a6a0a3
--- /dev/null
+++ b/uppsrc/Oracle/Oci7.cpp
@@ -0,0 +1,977 @@
+#include "Oracle7.h"
+#include "OciCommon.h"
+#pragma hdrstop
+
+/*
+extern "C" {
+#define dword _dword
+typedef byte text;
+#include <oratypes.h>
+#include <ocidfn.h>
+#include <ocidem.h>
+#include <ociapr.h>
+#undef dword
+};
+*/
+
+NAMESPACE_UPP
+
+#define DLLFILENAME "ociw32.dll"
+#define DLIMODULE   OCI7
+#define DLIHEADER   <Oracle/Oci7.dli>
+#include <Core/dli_source.h>
+
+void OCI7SetDllPath(String oci7_path, T_OCI7& oci7)
+{
+	static String dflt_name;
+	if(IsNull(dflt_name))
+		dflt_name = oci7.GetLibName();
+	if(oci7_path != oci7.GetLibName())
+		oci7.SetLibName(Nvl(oci7_path, dflt_name));
+}
+
+class OCI7Connection : public Link<OCI7Connection>, public OciSqlConnection {
+protected:
+	virtual void        SetParam(int i, OracleRef r);
+	virtual void        SetParam(int i, const Value& r);
+	virtual bool        Execute();
+	virtual int         GetRowsProcessed() const;
+	virtual bool        Fetch();
+	virtual void        GetColumn(int i, Ref f) const;
+	virtual void        Cancel();
+	virtual SqlSession& GetSession() const;
+	virtual String      GetUser() const;
+	virtual String      ToString() const;
+	virtual            ~OCI7Connection();
+
+protected:
+/*
+	enum {
+		O_VARCHAR2 =   1,
+		O_NUMBER   =   2,
+		O_LONG     =   8,
+		O_ROWID    =  11,
+		O_DATE     =  12,
+		O_RAW      =  23,
+		O_LONGRAW  =  24,
+		O_CHAR     =  96,
+		O_MLSLABEL = 105,
+	};
+*/
+
+	struct Param {
+		int16          type;
+		word           len;
+		sb2            ind;
+//		Vector<Value>  dynamic;
+//		bool           is_dynamic;
+///		bool           dyna_full;
+//		int            dyna_vtype;
+//		int            dyna_width;
+		OCI7Connection *refcursor;
+		union {
+			byte      *ptr;
+			byte       buffer[8];
+		};
+
+		byte *Data()                 { return len > 8u ? ptr : buffer; }
+		const byte *Data() const     { return len > 8u ? ptr : buffer; }
+		bool  IsNull() const         { return ind < 0; }
+		void  Free();
+//		void  DynaFlush();
+
+		Param()                      { len = 0; refcursor = 0; }
+		~Param()                     { Free(); }
+	};
+
+	struct Column {
+		int     type;
+		int     len;
+		byte   *data;
+		sb2    *ind;
+		ub2    *rl;
+		ub2    *rc;
+		bool    lob;
+
+		Column()          { data = NULL; }
+		~Column();
+	};
+
+ 	mutable cda_def cda;
+
+	Array<Param>   param;
+	Array<Column>  column;
+
+	String         longparam;
+	int            frows;
+	unsigned       fetched;
+	int            fetchtime;
+	int            fi;
+	bool           eof;
+//	Vector<int>    dynamic_param;
+//	int            dynamic_pos;
+//	int            dynamic_rows;
+
+	T_OCI7&        oci7;
+	Oracle7       *session;
+
+	Param&    PrepareParam(int i, int type, int len, int reserve /*, int dynamic_vtype*/);
+	void      SetParam(int i, const String& s);
+	void      SetRawParam(int i, const String& s);
+	void      SetParam(int i, int integer);
+	void      SetParam(int i, double d);
+	void      SetParam(int i, Date d);
+	void      SetParam(int i, Time d);
+	void      SetParam(int i, Sql& cursor);
+
+	void      AddColumn(int type, int len, bool lob = false);
+	void      GetColumn(int i, String& s) const;
+	void      GetColumn(int i, int& n) const;
+	void      GetColumn(int i, double& d) const;
+	void      GetColumn(int i, Date& d) const;
+	void      GetColumn(int i, Time& t) const;
+
+	void      SetError();
+	bool      GetColumnInfo();
+
+	void      Clear();
+
+    OCI7Connection(Oracle7& s);
+
+	friend class Oracle7;
+};
+
+//template MoveType<OCI7Connection::Param>;
+//template MoveType<OCI7Connection::Column>;
+
+void OCI7Connection::Param::Free() {
+	if(len != (word)-1 && len > sizeof(buffer))
+		delete[] ptr;
+	len = 0;
+}
+
+/*
+void OCI7Connection::Param::DynaFlush() {
+	Value v;
+	if(ind == 0) {
+		const byte *p = Data();
+		switch(type) {
+		case SQLT_INT:
+			v = *(const int *)p;
+			break;
+
+		case SQLT_FLT:
+			v = *(const double *)p;
+			break;
+
+		case SQLT_STR:
+			v = String((const char *)p);
+			break;
+
+		case SQLT_DAT:
+			v = OciDecodeTime(p);
+			break;
+
+		case SQLT_CLOB:
+		case SQLT_BLOB:
+		default:
+			NEVER();
+			break;
+		}
+	}
+	dynamic.Add(v);
+}
+*/
+
+OCI7Connection::Column::~Column() {
+	if(data) {
+		delete[] data;
+		delete[] ind;
+		delete[] rl;
+		delete[] rc;
+	}
+}
+
+OCI7Connection::Param& OCI7Connection::PrepareParam(int i, int type, int len, int reserve /*, int dvtype*/) {
+	Param& p = param.At(i);
+//	p.dyna_vtype = dvtype;
+//	p.is_dynamic = (dvtype != VOID_V);
+///	p.dyna_full = false;
+//	p.dyna_width = len;
+	p.ind = 0;
+	if(p.type != type || p.len < len || reserve == 0 && p.len != len) {
+		p.Free();
+		parse = true;
+	}
+	if(!p.len) {
+		p.len = len + reserve;
+		if(p.len > 8)
+			p.ptr = new byte[p.len];
+		p.type = -1;
+		parse = true;
+	}
+	if(p.type != type) {
+		p.type = type;
+		parse = true;
+	}
+	return p;
+}
+
+void OCI7Connection::SetParam(int i, const String& s) {
+	int l = s.GetLength();
+	Param& p = PrepareParam(i, SQLT_STR, l + 1, 256 /*, VOID_V*/);
+	memcpy(p.Data(), s, l + 1);
+	p.ind = l ? 0 : -1;
+}
+
+void OCI7Connection::SetRawParam(int i, const String& s) {
+	PrepareParam(i, SQLT_LBI, 0, 0 /*, VOID_V*/);
+	longparam = s;
+}
+
+void OCI7Connection::SetParam(int i, int integer) {
+	Param& p = PrepareParam(i, SQLT_INT, sizeof(int), 0 /*, VOID_V*/);
+	*(int *) p.Data() = integer;
+	p.ind = IsNull(integer) ? -1 : 0;
+}
+
+void OCI7Connection::SetParam(int i, double d) {
+	Param& p = PrepareParam(i, SQLT_FLT, sizeof(double), 0 /*, VOID_V*/);
+	*(double *) p.Data() = d;
+	p.ind = IsNull(d) ? -1 : 0;
+}
+
+void OCI7Connection::SetParam(int i, Date d) {
+	Param& w = PrepareParam(i, SQLT_DAT, 7, 0 /*, VOID_V*/);
+	w.ind = OciEncodeDate(w.Data(), d) ? 0 : -1;
+}
+
+void OCI7Connection::SetParam(int i, Time t) {
+	Param& w = PrepareParam(i, SQLT_DAT, 7, 0 /*, VOID_V*/);
+	w.ind = OciEncodeTime(w.Data(), t) ? 0 : -1;
+}
+
+void OCI7Connection::SetParam(int i, OracleRef r) {
+	NEVER(); // OCI7 dynamic's are currently not allowed
+//	PrepareParam(i, r.GetOraType(), r.GetMaxLen(), 0, r.GetType());
+}
+
+class Oracle7RefCursorStub : public SqlSource {
+public:
+	Oracle7RefCursorStub(SqlConnection *cn) : cn(cn) {}
+
+	virtual SqlConnection *CreateConnection() { return cn; }
+
+private:
+	SqlConnection         *cn;
+};
+
+void OCI7Connection::SetParam(int i, Sql& cursor) {
+	Param& w = PrepareParam(i, SQLT_CUR, -1, 0 /*, VOID_V*/);
+	w.refcursor = new OCI7Connection(*session);
+	Oracle7RefCursorStub stub(w.refcursor);
+	w.ptr = (byte *)&w.refcursor -> cda;
+	w.ind = 0;
+}
+
+void  OCI7Connection::SetParam(int i, const Value& q) {
+	if(q.IsNull())
+		SetParam(i, String(""));
+	else
+		switch(q.GetType()) {
+		case 34:
+			SetRawParam(i, SqlRaw(q));
+			break;
+		case STRING_V:
+		case WSTRING_V:
+			SetParam(i, String(q));
+			break;
+		case BOOL_V:
+		case INT_V:
+			SetParam(i, int(q));
+			break;
+		case INT64_V:
+		case DOUBLE_V:
+			SetParam(i, double(q));
+			break;
+		case DATE_V:
+			SetParam(i, Date(q));
+			break;
+		case TIME_V:
+			SetParam(i, (Time)q);
+			break;
+		default:
+			if(IsTypeRaw<Sql *>(q)) {
+				SetParam(i, *ValueTo<Sql *>(q));
+				break;
+			}
+			NEVER();
+		}
+}
+
+void  OCI7Connection::AddColumn(int type, int len, bool lob) {
+	Column& q = column.Add();
+	q.type = type;
+	q.len = len;
+	q.data = new byte[frows * len];
+	q.ind = new sb2[frows];
+	q.rl = new ub2[frows];
+	q.rc = new ub2[frows];
+	q.lob = lob;
+}
+
+bool OCI7Connection::Execute() {
+	int time = msecs();
+	session->PreExec();
+	int args = 0;
+	if(parse) {
+		String cmd;
+		args = OciParse(statement, cmd, this, session);
+		Cancel();
+		if(oci7.oparse(&cda, (OraText *)(const char *)cmd, -1, 0, 2) != 0) {
+			SetError();
+			return false;
+		}
+		while(param.GetCount() < args)
+			SetParam(param.GetCount(), String());
+		param.Trim(args);
+//		dynamic_param.Clear();
+  		for(int i = 0; i < args; i++) {
+			Param& p = param[i];
+			if(p.type == SQLT_LBI) {
+				String h = Format(":%d", i + 1);
+				if(oci7.obindps(&cda, 0, (byte *)~h, h.GetLength(), NULL,
+					            max(1, longparam.GetLength()), p.type,
+								0, NULL, NULL, NULL, 0, 0, 0, 0, 0, NULL, NULL, 0, 0)) {
+					SetError();
+					return false;
+				}
+			}
+    		else
+			if(oci7.obndrn(&cda, i + 1, (OraText *)p.Data(), p.len, p.type,
+					       -1, &p.ind, NULL, -1, -1) != 0) {
+				SetError();
+				return false;
+			}
+//			if(p.is_dynamic)
+//				dynamic_param.Add(i);
+		}
+	}
+	for(;;) {
+//		dword time;
+//		if(session->IsTraceTime())
+//			time = GetTickCount();
+		oci7.oexec(&cda);
+//		if(session->IsTraceTime() && session->GetTrace())
+//			*session->GetTrace() << Sprintf("--------------\nexec %d ms:\n", GetTickCount() - time);
+		if(cda.rc == 0)
+			break;
+		if(cda.rc != 3129) {
+			SetError();
+			longparam.Clear();
+			return false;
+		}
+		ub4 l = longparam.GetLength();
+		oci7.osetpi(&cda, OCI_LAST_PIECE, (void *)~longparam, &l);
+	}
+
+//	if(!dynamic_param.IsEmpty()) {
+//		dynamic_pos = -1;
+//		for(int i = 0; i < dynamic_param.GetCount(); i++)
+//			param[dynamic_param[i]].DynaFlush();
+//		dynamic_rows = param[dynamic_param[0]].dynamic.GetCount();
+//	}
+
+	if(parse) {
+		if(!GetColumnInfo())
+			return false;
+		for(int i = 0; i < args; i++)
+			if(param[i].refcursor && !param[i].refcursor -> GetColumnInfo())
+				return false;
+	}
+	else {
+		fetched = 0;
+		fetchtime = 0;
+		fi = -1;
+		eof = false;
+	}
+	longparam.Clear();
+	session->PostExec();
+	if(Stream *s = session->GetTrace()) {
+		if(session->IsTraceTime())
+			*s << Format("----- exec %d ms\n", msecs(time));
+	}
+	return true;
+}
+
+bool OCI7Connection::GetColumnInfo()
+{
+	fetched = 0;
+	fetchtime = 0;
+	fi = -1;
+	eof = false;
+	info.Clear();
+	column.Clear();
+	frows = fetchrows;
+	Vector<int> tp;
+	int i;
+	for(i = 0;; i++) {
+		char h[256];
+		sb4 width;
+		sb2 type, prec, scale, null;
+		sb4 hlen = 255;
+		if(oci7.odescr((cda_def *)&cda, i + 1, &width, &type, (sb1 *)h, &hlen, NULL, &prec,
+				       &scale, &null))
+			break;
+		SqlColumnInfo& ii = info.Add();
+		ii.width = width;
+		ii.precision = prec;
+		ii.scale = scale;
+		h[hlen] = '\0';
+		ii.name = h;
+		ii.name = ToUpper(TrimRight(ii.name));
+		tp.Add(type);
+		if(type == SQLT_LBI || type == SQLT_BLOB || type == SQLT_CLOB)
+			frows = 1;
+	}
+	for(i = 0; i < info.GetCount(); i++) {
+		SqlColumnInfo& ii = info[i];
+		switch(tp[i]) {
+		case SQLT_NUM:
+			ii.type = DOUBLE_V;
+			AddColumn(SQLT_FLT, sizeof(double));
+			break;
+		case SQLT_DAT:
+			ii.type = TIME_V;
+			AddColumn(SQLT_DAT, 7);
+			break;
+		case SQLT_LBI:
+			ii.type = STRING_V;
+			AddColumn(SQLT_LBI, 4096);
+			break;
+		case SQLT_CLOB:
+			ii.type = STRING_V;
+			AddColumn(SQLT_LNG, 65520, true);
+			break;
+		case SQLT_BLOB:
+			ii.type = STRING_V;
+			AddColumn(SQLT_LBI, 65520, true);
+			break;
+		default:
+			ii.type = STRING_V;
+			AddColumn(SQLT_STR, ii.width ? ii.width + 1 : longsize);
+			break;
+		}
+	}
+	for(i = 0; i < column.GetCount(); i++) {
+		Column& q = column[i];
+		if(oci7.odefin(&cda, i + 1, (OraText *)q.data, q.len, q.type, -1, q.ind, NULL, -1, -1, q.rl, q.rc)) {
+			SetError();
+			return false;
+		}
+	}
+	parse = false;
+	return true;
+}
+
+int OCI7Connection::GetRowsProcessed() const {
+	return cda.rpc;
+}
+
+bool OCI7Connection::Fetch() {
+	ASSERT(!parse);
+	if(parse || eof) return false;
+//	if(!dynamic_param.IsEmpty()) // dynamic pseudo-fetch
+//		return (dynamic_pos < dynamic_rows && ++dynamic_pos < dynamic_rows);
+	if(frows == 1) {
+		fi = 0;
+		if(oci7.ofetch(&cda)) {
+			if(cda.rc != 1403)
+				SetError();
+			return false;
+		}
+		fetched++;
+		return true;
+	}
+	if(fi < 0 || fetched >= cda.rpc) {
+		bool tt = session->IsTraceTime();
+		int fstart = tt ? msecs() : 0;
+		if(oci7.ofen(&cda, frows) && cda.rc != 1403) {
+			eof = true;
+			SetError();
+			return false;
+		}
+		if(tt) {
+			fetchtime += msecs(fstart);
+			int added = fetched + cda.rpc;
+			if(Stream *s = session->GetTrace())
+				*s << NFormat("----- fetch(%d) in %d ms, %8n ms/rec, %2n rec/s\n",
+					added, fetchtime,
+					fetchtime / max<double>(added, 1),
+					added * 1000.0 / max<double>(fetchtime, 1));
+		}
+		if(fetched >= cda.rpc) {
+			eof = true;
+			return false;
+		}
+		fi = 0;
+	}
+	else
+		fi++;
+
+	fetched++;
+	return true;
+}
+
+void OCI7Connection::GetColumn(int i, String& s) const
+{
+//	if(!dynamic_param.IsEmpty()) {
+//		s = param[dynamic_param[i]].dynamic[dynamic_pos];
+//		return;
+//	}
+	const Column& c = column[i];
+	const byte *data = c.data + fi * c.len;
+	int ind = c.ind[fi];
+	if(c.type == SQLT_STR)
+		if(ind < 0)
+			s = Null;
+		else
+			s = (const char *) data;
+	else if(c.type == SQLT_LBI || c.type == SQLT_LNG) {
+		if(ind == -1)
+			s = Null;
+		else {
+			s = String(data, *c.rl);
+			if(!c.lob) {
+				Buffer<byte> buffer(32768);
+				ub4 len;
+				while(!oci7.oflng(&cda, i + 1, buffer, 32768, c.type, &len, s.GetLength()) && len)
+					s.Cat(buffer, len);
+				if(s.GetAlloc() - s.GetLength() > 32768)
+					s.Shrink();
+			}
+		}
+	}
+	else
+		NEVER();
+}
+
+void OCI7Connection::GetColumn(int i, int& n) const {
+//	if(!dynamic_param.IsEmpty()) {
+//		n = param[dynamic_param[i]].dynamic[dynamic_pos];
+//		return;
+//	}
+	const Column& c = column[i];
+	byte *data = c.data + fi * c.len;
+	if(c.ind[fi] < 0)
+		n = INT_NULL;
+	else
+		switch(c.type) {
+		case SQLT_INT:
+			n = *(int *) data;
+			break;
+		case SQLT_FLT:
+			n = int(*(double *) data);
+			break;
+		default:
+			ASSERT(0);
+		}
+}
+
+void OCI7Connection::GetColumn(int i, double& d) const {
+//	if(!dynamic_param.IsEmpty()) {
+//		d = param[dynamic_param[i]].dynamic[dynamic_pos];
+//		return;
+//	}
+	const Column& c = column[i];
+	byte *data = c.data + fi * c.len;
+	if(c.ind[fi] < 0)
+		d = Null;
+	else
+		switch(c.type) {
+		case SQLT_INT:
+			d = *(int *) data;
+			break;
+		case SQLT_FLT:
+			d = *(double *) data;
+			break;
+		default:
+			ASSERT(0);
+		}
+}
+
+void OCI7Connection::GetColumn(int i, Date& d) const {
+//	if(!dynamic_param.IsEmpty()) {
+//		d = param[dynamic_param[i]].dynamic[dynamic_pos];
+//		return;
+//	}
+	const Column& c = column[i];
+	const byte *data = c.data + fi * c.len;
+	ASSERT(c.type == SQLT_DAT);
+	d = (c.ind[fi] < 0 ? Date(Null) : OciDecodeDate(data));
+}
+
+void OCI7Connection::GetColumn(int i, Time& t) const {
+//	if(!dynamic_param.IsEmpty()) {
+//		t = param[dynamic_param[i]].dynamic[dynamic_pos];
+//		return;
+//	}
+	const Column& c = column[i];
+	const byte *data = c.data + fi * c.len;
+	ASSERT(c.type == SQLT_DAT);
+	t = (c.ind[fi] < 0 ? Time(Null) : OciDecodeTime(data));
+}
+
+void  OCI7Connection::GetColumn(int i, Ref f) const {
+//	if(!dynamic_param.IsEmpty()) {
+//		f.SetValue(param[dynamic_param[i]].dynamic[dynamic_pos]);
+//		return;
+//	}
+	switch(f.GetType()) {
+		case STRING_V: {
+			String s;
+			GetColumn(i, s);
+			f.SetValue(s);
+			break;
+		}
+		case INT_V: {
+			int d;
+			GetColumn(i, d);
+			f.SetValue(d);
+			break;
+		}
+		case DOUBLE_V: {
+			double d;
+			GetColumn(i, d);
+			f.SetValue(d);
+			break;
+		}
+		case DATE_V: {
+			Date d;
+			GetColumn(i, d);
+			f.SetValue(d);
+			break;
+		}
+		case TIME_V: {
+			Time d;
+			GetColumn(i, d);
+			f.SetValue(d);
+			break;
+		}
+		case VALUE_V: {
+			switch(column[i].type) {
+				case SQLT_STR:
+				case SQLT_LBI:
+				case SQLT_LNG: {
+					String s;
+					GetColumn(i, s);
+					f = Value(s);
+					break;
+				}
+				case SQLT_INT: {
+					int n;
+					GetColumn(i, n);
+					f = Value(n);
+					break;
+				}
+				case SQLT_FLT: {
+					double d;
+					GetColumn(i, d);
+					f = Value(d);
+					break;
+				}
+				case SQLT_DAT: {
+					Time m;
+					GetColumn(i, m);
+					f = Value(m);
+					break;
+				}
+				default: {
+					NEVER();
+				}
+			}
+			break;
+		}
+		default: {
+			NEVER();
+		}
+	}
+}
+
+void OCI7Connection::Cancel() {
+	oci7.ocan(&cda);
+	parse = true;
+}
+
+void OCI7Connection::SetError() {
+	int code = cda.rc;
+	if(code == 0 || code == 1002) return;
+	session->SetError(session->GetErrorMsg(code), ToString());
+	parse = true;
+}
+
+SqlSession& OCI7Connection::GetSession() const {
+	ASSERT(session);
+	return *session;
+}
+
+String OCI7Connection::GetUser() const {
+	ASSERT(session);
+	return session->user;
+}
+
+String OCI7Connection::ToString() const
+{
+	String lg;
+	bool quotes = false;
+	int argn = 0;
+	for(const char *q = statement; *q; q++) {
+		if(*q== '\'' && q[1] != '\'')
+			quotes = !quotes;
+		if(!quotes && *q == '?') {
+			if(argn < param.GetCount()) {
+				const Param& m = param[argn++];
+				if(m.type == SQLT_LBI)
+					lg.Cat("<Raw data>");
+				else
+				if(m.IsNull())
+					lg << "Null";
+				else
+				switch(m.type) {
+				case SQLT_STR:
+					lg.Cat('\'');
+					lg += (const char *) m.Data();
+					lg.Cat('\'');
+					break;
+				case SQLT_INT:
+					lg << *(const int *) m.Data();
+					break;
+				case SQLT_FLT:
+					lg << *(const double *) m.Data();
+					break;
+				case SQLT_DAT:
+//					const byte *data = m.Data();
+					lg << OciDecodeTime(m.Data());
+					//(int)data[3] << '.' << (int)data[2] << '.' <<
+					//	  int(data[0] - 100) * 100 + data[1] - 100;
+					break;
+				}
+			}
+			else
+				lg += "<not supplied>";
+		}
+		else
+			lg += *q;
+	}
+	return lg;
+}
+
+OCI7Connection::OCI7Connection(Oracle7& s) : session(&s), oci7(s.oci7) {
+	eof = true;
+	memset(&cda, 0, sizeof(cda));
+	CHECK(!oci7.oopen(&cda, (cda_def *) (session->lda), 0, -1, -1, 0, -1));
+	LinkAfter(&s.clink);
+}
+
+void OCI7Connection::Clear() {
+	if(session) {
+		oci7.oclose(&cda);
+		session = NULL;
+	}
+}
+
+OCI7Connection::~OCI7Connection() {
+	Clear();
+}
+
+bool Oracle7::Open(const String& connect) {
+	Close();
+	::memset(lda, 0, sizeof(lda));
+	::memset(hda, 0, sizeof(hda));
+	if(!oci7.Load()) {
+		SetError(t_("Error loading OCI7 Oracle database client library."), t_("Connecting to server"));
+		return false;
+	}
+	int code = oci7.olog((cda_def *)lda, hda, (OraText *)(const char *)connect, -1,
+	                     NULL, -1, NULL, -1, OCI_LM_DEF);
+	if(code) {
+		SetError(GetErrorMsg(code), t_("Connecting to database server"));
+		return false;
+	}
+	connected = true;
+	level = 0;
+	ClearError();
+	user = Sql(*this).Select("USER from DUAL");
+	return true;
+}
+
+String Oracle7::GetErrorMsg(int code) const {
+	byte h[520];
+	*h = 0;
+	String r;
+	oci7.oerhms((cda_def *)lda, (sb2)code, (OraText *)h, 512);
+	for(byte *s = h; *s; s++)
+		r.Cat(*s < ' ' ? ' ' : *s);
+	r << "(code " << code << ")";
+	return r;
+}
+
+SqlConnection *Oracle7::CreateConnection() {
+	return new OCI7Connection(*this);
+}
+
+void Oracle7::Close() {
+	while(!clink.IsEmpty()) {
+		clink.GetNext()->Clear();
+		clink.GetNext()->Unlink();
+	}
+	if(connected) {
+		oci7.ologof((cda_def *)lda);
+		connected = false;
+	}
+}
+
+String Oracle7::Spn() {
+	return Format("TRANSACTION_LEVEL_%d", level);
+}
+
+void   Oracle7::PreExec() {
+	bool ac = level == 0 && tmode == NORMAL;
+	if(autocommit != ac) {
+		autocommit = ac;
+		Stream *s = GetTrace();
+		if(autocommit) {
+			if(s) *s << "%autocommit on;\n";
+			oci7.ocon((cda_def *)lda);
+		}
+		else {
+			if(s) *s << "%autocommit off;\n";
+			oci7.ocof((cda_def *)lda);
+		}
+	}
+}
+
+void   Oracle7::PostExec() {
+}
+
+void   Oracle7::Begin() {
+	if(Stream *s = GetTrace())
+		*s << user << "(OCI7) -> StartTransaction(level " << level << ")\n";
+	level++;
+//	ClearError();
+	if(level > 1)
+		Sql(*this).Execute("savepoint " + Spn());
+}
+
+void   Oracle7::Commit() {
+	int time = msecs();
+//	ASSERT(tmode == ORACLE || level > 0);
+	if(level)
+		level--;
+//	else
+//		ClearError();
+	if(level == 0) {
+		oci7.ocom((cda_def *)lda);
+//		if(Stream *s = GetTrace())
+//			*s << "%commit;\n";
+	}
+	if(Stream *s = GetTrace())
+		*s << NFormat("----- %s (OCI7) -> Commit(level %d) %d ms\n", user, level, msecs(time));
+}
+
+void   Oracle7::Rollback() {
+	ASSERT(tmode == ORACLE || level > 0);
+	if(level > 1)
+		Sql(*this).Execute("rollback to savepoint " + Spn());
+	else {
+		oci7.orol((cda_def *)lda);
+		if(Stream *s = GetTrace())
+			*s << "%rollback;\n";
+	}
+	if(level)
+		level--;
+//	else
+//		ClearError();
+	if(Stream *s = GetTrace())
+		*s << user << "(OCI7) -> Rollback(level " << level << ")\n";
+}
+
+String Oracle7::Savepoint() {
+	static dword i;
+	i = (i + 1) & 0x8fffffff;
+	String s = Sprintf("SESSION_SAVEPOINT_%d", i);
+	Sql(*this).Execute("savepoint " + s);
+	return s;
+}
+
+void   Oracle7::RollbackTo(const String& savepoint) {
+	Sql(*this).Execute("rollback to savepoint " + savepoint);
+}
+
+bool   Oracle7::IsOpen() const {
+	return connected;
+}
+
+Oracle7::Oracle7(T_OCI7& oci7_)
+: oci7(oci7_)
+{
+	connected = false;
+	autocommit = false;
+	level = 0;
+	tmode = NORMAL;
+	Dialect(ORACLE);
+}
+
+Oracle7::~Oracle7() {
+//	ASSERT(level == 0);
+	Close();
+}
+
+Vector<String> Oracle7::EnumUsers()
+{
+	Sql cursor(*this);
+	return OracleSchemaUsers(cursor);
+}
+
+Vector<String> Oracle7::EnumDatabases()
+{
+	Sql cursor(*this);
+	return OracleSchemaUsers(cursor);
+}
+
+Vector<String> Oracle7::EnumTables(String database)
+{
+	Sql cursor(*this);
+	return OracleSchemaTables(cursor, database);
+}
+
+Vector<String> Oracle7::EnumViews(String database)
+{
+	Sql cursor(*this);
+	return OracleSchemaViews(cursor, database);
+}
+
+Vector<String> Oracle7::EnumSequences(String database)
+{
+	Sql cursor(*this);
+	return OracleSchemaSequences(cursor, database);
+}
+
+Vector<String> Oracle7::EnumPrimaryKey(String database, String table)
+{
+	Sql cursor(*this);
+	return OracleSchemaPrimaryKey(cursor, database, table);
+}
+
+String Oracle7::EnumRowID(String database, String table)
+{
+	Sql cursor(*this);
+	return OracleSchemaRowID(cursor, database, table);
+}
+
+Vector<String> Oracle7::EnumReservedWords()
+{
+	return OracleSchemaReservedWords();
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/Oracle/Oci7.dli b/uppsrc/Oracle/Oci7.dli
new file mode 100644
index 000000000..d3723b58b
--- /dev/null
+++ b/uppsrc/Oracle/Oci7.dli
@@ -0,0 +1,73 @@
+FN(int, obindps, (struct cda_def *cursor, ub1 opcode, OraText *sqlvar, \
+					int sqlvl, ub1 *pvctx, int progvl, \
+					int ftype, int scale, \
+					short *indp, word *alen, word *arcode, \
+					int pv_skip, int ind_skip, int alen_skip, int rc_skip, \
+					dword maxsiz, dword *cursiz, \
+					OraText *fmt, int fmtl, int fmtt))
+
+FN(int, obreak, (struct cda_def *lda))
+FN(int, ocan,   (struct cda_def *cursor))
+FN(int, oclose, (struct cda_def *cursor))
+FN(int, ocof,   (struct cda_def *lda))
+FN(int, ocom,   (struct cda_def *lda))
+FN(int, ocon,   (struct cda_def *lda))
+
+
+FN(int, odefinps, (struct cda_def *cursor, ub1 opcode, int pos,ub1 *bufctx, \
+		int bufl, int ftype, int scale, \
+		short *indp, OraText *fmt, int fmtl, int fmtt, \
+		word *rlen, word *rcode, \
+		int pv_skip, int ind_skip, int alen_skip, int rc_skip))
+
+FN(int, odessp, (struct cda_def *cursor, OraText *objnam, size_t onlen, \
+              ub1 *rsv1, size_t rsv1ln, ub1 *rsv2, size_t rsv2ln, \
+              word *ovrld, word *pos, word *level, OraText **argnam, \
+              word *arnlen, word *dtype, ub1 *defsup, ub1* mode, \
+              dword *dtsiz, short *prec, short *scale, ub1 *radix, \
+              dword *spare, dword *arrsiz))
+
+FN(int, odescr, (struct cda_def *cursor, int pos, int *dbsize, \
+                   short *dbtype, sb1 *cbuf, int *cbufl, int *dsize, \
+                   short *prec, short *scale, short *nullok))
+
+FN(int, oerhms, (struct cda_def *lda, short rcode, OraText *buf, int bufsiz))
+FN(int, oermsg, (short rcode, OraText *buf))
+FN(int, oexec, (struct cda_def *cursor))
+FN(int, oexfet,(struct cda_def *cursor, dword nrows, int cancel, int exact))
+FN(int, oexn, (struct cda_def *cursor, int iters, int rowoff))
+FN(int, ofen, (struct cda_def *cursor, int nrows))
+FN(int, ofetch, (struct cda_def *cursor))
+FN(int, oflng, (struct cda_def *cursor, int pos, ub1 *buf, \
+                 int bufl, int dtype, dword *retl, int offset))
+FN(int, ogetpi, (struct cda_def *cursor, ub1 *piecep, dvoid **ctxpp, \
+                 dword *iterp, dword *indexp))
+FN(int, oopt, (struct cda_def *cursor, int rbopt, int waitopt))
+FN(int, opinit, (dword mode))
+FN(int, olog, (struct cda_def *lda, ub1* hda, OraText *uid, int uidl, OraText *pswd, int pswdl, \
+                 OraText *conn, int connl, dword mode))
+FN(int, ologof,  (struct cda_def *lda))
+FN(int, oopen, (struct cda_def *cursor, struct cda_def *lda, OraText *dbn, int dbnl, \
+                  int arsize, OraText *uid, int uidl))
+FN(int, oparse, (struct cda_def *cursor, OraText *sqlstm, int sqllen, int defflg, dword lngflg))
+FN(int, orol,    (struct cda_def *lda))
+FN(int, osetpi,  (struct cda_def *cursor, ub1 piece, dvoid *bufp, dword *lenp))
+
+FN(int, onbset,   (struct cda_def *lda ))
+FN(int, onbtst,   (struct cda_def *lda ))
+FN(int, onbclr,   (struct cda_def *lda ))
+FN(int, ognfd,    (struct cda_def *lda, dvoid *fdp))
+
+FN(int, obndra, (struct cda_def *cursor, OraText *sqlvar, int sqlvl,\
+                   ub1 *progv, int progvl, int ftype, int scale,\
+                   short *indp, word *alen, word *arcode, dword maxsiz,\
+                   dword *cursiz, OraText *fmt, int fmtl, int fmtt))
+FN(int, obndrn, (struct cda_def *cursor, int sqlvn, ub1 *progv,\
+                   int progvl, int ftype, int scale, short *indp,\
+                   OraText *fmt, int fmtl, int fmtt))
+FN(int, obndrv, (struct cda_def *cursor, OraText *sqlvar, int sqlvl,\
+                   ub1 *progv, int progvl, int ftype, int scale,\
+                   short *indp, OraText *fmt, int fmtl, int fmtt))
+FN(int, odefin, (struct cda_def *cursor, int pos, ub1 *buf,\
+	               int bufl, int ftype, int scale, short *indp,\
+	               OraText *fmt, int fmtl, int fmtt, word *rlen, word *rcode))
diff --git a/uppsrc/Oracle/Oci8.cpp b/uppsrc/Oracle/Oci8.cpp
new file mode 100644
index 000000000..bc59e6206
--- /dev/null
+++ b/uppsrc/Oracle/Oci8.cpp
@@ -0,0 +1,1130 @@
+#include "Oracle8.h"
+#include "OciCommon.h"
+#pragma hdrstop
+
+NAMESPACE_UPP
+
+#define LLOG(x) // LLOG(x)
+
+//#define DLLFILENAME "ora803.dll"
+#define DLLFILENAME "oci.dll"
+#define DLIMODULE   OCI8
+#define DLIHEADER   <Oracle/Oci8.dli>
+#include <Core/dli_source.h>
+
+void OCI8SetDllPath(String oci8_path, T_OCI8& oci8)
+{
+	static String dflt_name;
+	if(IsNull(dflt_name))
+		dflt_name = oci8.GetLibName();
+	if(oci8_path != oci8.GetLibName())
+		oci8.SetLibName(Nvl(oci8_path, dflt_name));
+}
+
+static String OciError(T_OCI8& oci8, OCIError *errhp, int *code)
+{
+	if(code) *code = Null;
+	if(!oci8) return t_("Error running OCI8 Oracle connection dynamic library.");
+	if(!errhp) return t_("Unknown error.");
+	OraText errbuf[512];
+	strcpy((char *)errbuf, t_("(unknown error)"));
+	sb4 errcode;
+	oci8.OCIErrorGet(errhp, 1, NULL, &errcode, errbuf, sizeof(errbuf), OCI_HTYPE_ERROR);
+	if(code) *code = errcode;
+	return (const char *) errbuf;
+}
+
+bool Oracle8::AllocOciHandle(void *hp, int type) {
+	LLOG("AllocOciHandle(" << type << "), envhp = " << envhp);
+	*(dvoid **)hp = NULL;
+	return oci8 && !oci8.OCIHandleAlloc(envhp, (dvoid **)hp, type, 0, NULL);
+}
+
+void Oracle8::FreeOciHandle(void *hp, int type) {
+	LLOG("FreeOciHandle(" << type << ")");
+	if(oci8 && hp) oci8.OCIHandleFree(hp, type);
+}
+
+void Oracle8::SetOciError(String text, OCIError *from_errhp)
+{
+	int errcode;
+	String msg = OciError(oci8, from_errhp, &errcode);
+	SetError(msg, text, errcode, NULL, OciErrorClass(errcode));
+}
+
+class OCI8Connection : public Link<OCI8Connection>, public OciSqlConnection {
+protected:
+	virtual void        SetParam(int i, const Value& r);
+	virtual void        SetParam(int i, OracleRef r);
+	virtual bool        Execute();
+	virtual int         GetRowsProcessed() const;
+	virtual bool        Fetch();
+	virtual void        GetColumn(int i, Ref f) const;
+	virtual void        Cancel();
+	virtual SqlSession& GetSession() const;
+	virtual String      GetUser() const;
+	virtual String      ToString() const;
+	virtual            ~OCI8Connection();
+
+	struct Item {
+		T_OCI8&        oci8;
+		int            type;
+		int16          len;
+		sb2            ind;
+		ub2            rl;
+		ub2            rc;
+		Vector<Value>  dynamic;
+		bool           is_dynamic;
+		bool           dyna_full;
+		int            dyna_vtype;
+		ub4            dyna_width;
+		ub4            dyna_len;
+		OCILobLocator *lob;
+		OCIBind       *bind;
+		OCIDefine     *define;
+		OCI8Connection *refcursor;
+		union {
+			byte          *ptr;
+			byte           buffer[8];
+		};
+
+		byte *Data()                 { return len > sizeof(buffer) ? ptr : buffer; }
+		const byte *Data() const     { return len > sizeof(buffer) ? ptr : buffer; }
+		bool  IsNull() const         { return ind < 0; }
+		bool  Alloc(OCIEnv *envhp, int type, int len, int res = 0);
+		void  Clear();
+		void  DynaFlush();
+
+		static sb4 DynaIn(dvoid *ictxp, OCIBind *bindp,
+			ub4 iter, ub4 index, dvoid **bufpp, ub4 *alenp, ub1 *piecep, dvoid **indp) {
+			Item *self = reinterpret_cast<Item *>(ictxp);
+			ASSERT(self -> bind == bindp);
+			*bufpp = NULL;
+			*alenp = 0;
+			*indp = NULL;
+			*piecep = OCI_ONE_PIECE;
+			return OCI_CONTINUE;
+		}
+
+		static sb4 DynaOut(dvoid *octxp, OCIBind *bindp,
+			ub4 iter, ub4 index, dvoid **bufpp, ub4 **alenp, ub1 *piecep, dvoid **indp, ub2 **rcodep) {
+			Item *self = reinterpret_cast<Item *>(octxp);
+			ASSERT(self -> bind == bindp);
+			return self -> Out(iter, index, bufpp, alenp, piecep, indp, rcodep);
+		}
+
+		sb4 Out(ub4 iter, ub4 index, dvoid **bufpp, ub4 **alenp, ub1 *piecep, dvoid **indp, ub2 **rcodep);
+
+		Item(T_OCI8& oci8);
+		~Item();
+	};
+
+	Oracle8           *session;
+	T_OCI8&            oci8;
+	OCIStmt           *stmthp;
+	OCIError          *errhp;
+	Array<Item>        param;
+	Array<Item>        column;
+	String             parsed_cmd;
+	Vector<int>        dynamic_param;
+	int                dynamic_pos;
+	int                dynamic_rows;
+	int                fetched;
+	int                fetchtime;
+	bool               refcursor;
+
+	OCISvcCtx *SvcCtx() const        { ASSERT(session); return session->svchp; }
+
+	Item&     PrepareParam(int i, int type, int len, int reserve, int dynamic_vtype);
+	void      SetParam(int i, const String& s);
+	void      SetParam(int i, int integer);
+	void      SetParam(int i, double d);
+	void      SetParam(int i, Date d);
+	void      SetParam(int i, Time d);
+	void      SetParam(int i, Sql& refcursor);
+
+	void      AddColumn(int type, int len);
+	void      GetColumn(int i, String& s) const;
+	void      GetColumn(int i, int& n) const;
+	void      GetColumn(int i, double& d) const;
+	void      GetColumn(int i, Date& d) const;
+	void      GetColumn(int i, Time& t) const;
+
+	void      SetError();
+	bool      GetColumnInfo();
+
+	void      Clear();
+
+	OCI8Connection(Oracle8& s);
+
+	friend class Oracle8;
+};
+
+void OCI8Connection::Item::Clear() {
+	if(type == SQLT_BLOB || type == SQLT_CLOB)
+		oci8.OCIDescriptorFree((dvoid *)lob, OCI_DTYPE_LOB);
+	else
+	if(len > sizeof(buffer))
+		delete[] ptr;
+	len = 0;
+	lob = NULL;
+	dynamic.Clear();
+	dyna_full = false;
+	dyna_vtype = VOID_V;
+	dyna_width = 0;
+}
+
+OCI8Connection::Item::Item(T_OCI8& oci8_)
+: oci8(oci8_)
+{
+	len = 0;
+	lob = NULL;
+	bind = NULL;
+	define = NULL;
+	refcursor = 0;
+	dyna_full = false;
+	is_dynamic = false;
+}
+
+OCI8Connection::Item::~Item() {
+	Clear();
+}
+
+bool OCI8Connection::Item::Alloc(OCIEnv *envhp, int _type, int _len, int res) {
+	if(_type == type && len >= _len) return false;
+	Clear();
+	type = _type;
+	len = _len + res;
+	if(type == SQLT_BLOB || type == SQLT_CLOB)
+		oci8.OCIDescriptorAlloc(envhp, (dvoid **) &lob, OCI_DTYPE_LOB, 0, NULL);
+	if(len > sizeof(buffer))
+		ptr = new byte[len];
+	return true;
+}
+
+void OCI8Connection::Item::DynaFlush() {
+	if(dyna_full) {
+		dyna_full = false;
+		Value v;
+		if(ind == 0) {
+			if(dyna_len > dyna_width)
+				dyna_width = dyna_len;
+			const byte *p = Data();
+			switch(type) {
+			case SQLT_INT:
+				v = *(const int *)p;
+				break;
+
+			case SQLT_FLT:
+				v = *(const double *)p;
+				break;
+
+			case SQLT_STR:
+				v = String((const char *)p, dyna_len);
+				break;
+
+			case SQLT_DAT:
+				v = OciDecodeTime(p);
+				break;
+
+			case SQLT_CLOB:
+			case SQLT_BLOB:
+			default:
+				NEVER();
+				break;
+			}
+		}
+		dynamic.Add(v);
+	}
+}
+
+sb4 OCI8Connection::Item::Out(ub4 iter, ub4 index, dvoid **bufpp, ub4 **alenp, ub1 *piecep, dvoid **indp, ub2 **rcodep) {
+	DynaFlush();
+	*bufpp = Data();
+	*alenp = &dyna_len;
+	dyna_len = len;
+	*piecep = OCI_ONE_PIECE;
+	ind = 0;
+	*indp = &ind;
+	rc = 0;
+	*rcodep = &rc;
+	dyna_full = true;
+	return OCI_CONTINUE;
+}
+
+OCI8Connection::Item& OCI8Connection::PrepareParam(int i, int type, int len, int res, int dynamic_vtype) {
+	while(param.GetCount() <= i)
+		param.Add(new Item(oci8));
+	Item& p = param[i];
+	if(p.Alloc(session -> envhp, type, len, res))
+		parse = true;
+	p.dyna_vtype = dynamic_vtype;
+	p.is_dynamic = (dynamic_vtype != VOID_V);
+	return p;
+}
+
+void OCI8Connection::SetParam(int i, const String& s) {
+	int l = s.GetLength();
+	Item& p = PrepareParam(i, SQLT_STR, l + 1, 100, VOID_V);
+	memcpy(p.Data(), s, l + 1);
+	p.ind = l ? 0 : -1;
+}
+
+void OCI8Connection::SetParam(int i, int integer) {
+	Item& p = PrepareParam(i, SQLT_INT, sizeof(int), 0, VOID_V);
+	*(int *) p.Data() = integer;
+	p.ind = IsNull(integer) ? -1 : 0;
+}
+
+void OCI8Connection::SetParam(int i, double d) {
+	Item& p = PrepareParam(i, SQLT_FLT, sizeof(double), 0, VOID_V);
+	*(double *) p.Data() = d;
+	p.ind = IsNull(d) ? -1 : 0;
+}
+
+void OCI8Connection::SetParam(int i, Date d) {
+	Item& w = PrepareParam(i, SQLT_DAT, 7, 0, VOID_V);
+	w.ind = (OciEncodeDate(w.Data(), d) ? 0 : -1);
+}
+
+void OCI8Connection::SetParam(int i, Time t) {
+	Item& w = PrepareParam(i, SQLT_DAT, 7, 0, VOID_V);
+	w.ind = (OciEncodeTime(w.Data(), t) ? 0 : -1);
+}
+
+void OCI8Connection::SetParam(int i, OracleRef r) {
+	PrepareParam(i, r.GetOraType(), r.GetMaxLen(), 0, r.GetType());
+}
+
+class Oracle8RefCursorStub : public SqlSource {
+public:
+	Oracle8RefCursorStub(SqlConnection *cn) : cn(cn) {}
+	virtual SqlConnection *CreateConnection() { return cn; }
+
+private:
+	SqlConnection *cn;
+};
+
+void OCI8Connection::SetParam(int i, Sql& rc) {
+	Item& w = PrepareParam(i, SQLT_RSET, -1, 0, VOID_V);
+	w.refcursor = new OCI8Connection(*session);
+	w.refcursor -> refcursor = true;
+	*(OCIStmt **)w.Data() = w.refcursor -> stmthp;
+	w.ind = 0;
+	Oracle8RefCursorStub stub(w.refcursor);
+	rc = stub;
+}
+
+void  OCI8Connection::SetParam(int i, const Value& q) {
+	if(q.IsNull())
+		SetParam(i, String());
+	else
+		switch(q.GetType()) {
+		case STRING_V:
+		case WSTRING_V:
+			SetParam(i, String(q));
+			break;
+		case INT_V:
+			SetParam(i, int(q));
+			break;
+		case DOUBLE_V:
+			SetParam(i, double(q));
+			break;
+		case DATE_V:
+			SetParam(i, Date(q));
+			break;
+		case TIME_V:
+			SetParam(i, (Time)q);
+			break;
+		case UNKNOWN_V:
+			if(IsTypeRaw<Sql *>(q)) {
+				SetParam(i, *ValueTo<Sql *>(q));
+				break;
+			}
+			if(OracleRef::IsValue(q)) {
+				SetParam(i, OracleRef(q));
+				break;
+			}
+		default:
+			NEVER();
+		}
+}
+
+void OCI8Connection::AddColumn(int type, int len) {
+	column.Add(new Item(oci8)).Alloc(session -> envhp, type, len);
+}
+
+bool OCI8Connection::Execute() {
+	ASSERT(session);
+	int time = msecs();
+	int args = 0;
+	if(parse) {
+//		Cancel();
+		if((args = OciParse(statement, parsed_cmd, this, session)) < 0)
+			return false;
+		ub4 fr = fetchrows;
+
+		oci8.OCIAttrSet(stmthp, OCI_HTYPE_STMT, &fr, 0, OCI_ATTR_PREFETCH_ROWS, errhp);
+		if(oci8.OCIStmtPrepare(stmthp, errhp, (byte *)~parsed_cmd, parsed_cmd.GetLength(), OCI_NTV_SYNTAX,
+			              OCI_DEFAULT)) {
+			SetError();
+			return false;
+		}
+
+		while(param.GetCount() < args)
+			SetParam(param.GetCount(), String());
+		param.Trim(args);
+		dynamic_param.Clear();
+		for(int i = 0; i < args; i++) {
+			Item& p = param[i];
+			if(oci8.OCIBindByPos(stmthp, &p.bind, errhp, i + 1, p.Data(), p.len, p.type,
+				            &p.ind, NULL, NULL, 0, NULL, p.is_dynamic ? OCI_DATA_AT_EXEC : OCI_DEFAULT)) {
+				SetError();
+				return false;
+			}
+			if(p.is_dynamic) {
+				dynamic_param.Add(i);
+				if(oci8.OCIBindDynamic(p.bind, errhp, &p, &Item::DynaIn, &p, &Item::DynaOut)) {
+					SetError();
+					return false;
+				}
+			}
+		}
+	}
+	ub2 type;
+	if(oci8.OCIAttrGet(stmthp, OCI_HTYPE_STMT, &type, NULL, OCI_ATTR_STMT_TYPE, errhp)) {
+		SetError();
+		return false;
+	}
+
+	if(oci8.OCIStmtExecute(SvcCtx(), stmthp, errhp, type != OCI_STMT_SELECT, 0, NULL, NULL,
+		              session->StdMode() && session->level == 0 ? OCI_COMMIT_ON_SUCCESS : OCI_DEFAULT)) {
+		SetError();
+		session->PostError();
+		return false;
+	}
+
+	if(!dynamic_param.IsEmpty()) {
+		dynamic_pos = -1;
+		for(int i = 0; i < dynamic_param.GetCount(); i++)
+			param[dynamic_param[i]].DynaFlush();
+		dynamic_rows = param[dynamic_param[0]].dynamic.GetCount();
+	}
+
+	if(parse) {
+		if(!GetColumnInfo())
+			return false;
+		for(int i = 0; i < param.GetCount(); i++)
+			if(param[i].refcursor && !param[i].refcursor -> GetColumnInfo())
+				return false;
+	}
+	fetched = 0;
+	fetchtime = 0;
+	if(Stream *s = session->GetTrace()) {
+		*s << ToString() << '\n';
+		if(session->IsTraceTime())
+			*s << Format("----- exec %d ms\n", msecs(time));
+	}
+	return true;
+}
+
+bool OCI8Connection::GetColumnInfo() {
+	info.Clear();
+	column.Clear();
+	ub4 argcount;
+	if(oci8.OCIAttrGet(stmthp, OCI_HTYPE_STMT, &argcount, 0, OCI_ATTR_PARAM_COUNT, errhp) != OCI_SUCCESS) {
+		SetError();
+		return false;
+	}
+	if(!dynamic_param.IsEmpty()) {
+		for(int i = 0; i < dynamic_param.GetCount(); i++) {
+			const Item& p = param[dynamic_param[i]];
+			SqlColumnInfo& ci = info.Add();
+			ci.name = Format("#%d", i + 1);
+			ci.type = p.dyna_vtype;
+			ci.width = p.dyna_width;
+			ci.precision = Null;
+			ci.scale = Null;
+		}
+		parse = false;
+		return true;
+	}
+	for(ub4 i = 1; i <= argcount; i++) {
+		OCIParam *pd;
+		if(oci8.OCIParamGet(stmthp, OCI_HTYPE_STMT, errhp, (dvoid **)&pd, i) != OCI_SUCCESS) {
+			SetError();
+			return false;
+		}
+		char *name;
+		ub4 name_len;
+		ub2 type, width;
+		ub2 prec;
+		sb1 scale;
+		oci8.OCIAttrGet(pd, OCI_DTYPE_PARAM, &type, NULL,  OCI_ATTR_DATA_TYPE, errhp);
+		oci8.OCIAttrGet(pd, OCI_DTYPE_PARAM, &width, NULL, OCI_ATTR_DATA_SIZE, errhp);
+		oci8.OCIAttrGet(pd, OCI_DTYPE_PARAM, &name, &name_len, OCI_ATTR_NAME, errhp);
+		oci8.OCIAttrGet(pd, OCI_DTYPE_PARAM, &prec, NULL,  OCI_ATTR_PRECISION, errhp);
+		oci8.OCIAttrGet(pd, OCI_DTYPE_PARAM, &scale, NULL,  OCI_ATTR_SCALE, errhp);
+		SqlColumnInfo& ii = info.Add();
+		ii.width = width;
+		ii.precision = prec;
+		ii.scale = scale;
+		ii.name = ToUpper(TrimRight(String(name, name_len)));
+		bool blob = false;
+		switch(type) {
+		case SQLT_NUM:
+			ii.type = DOUBLE_V;
+			AddColumn(SQLT_FLT, sizeof(double));
+			break;
+		case SQLT_DAT:
+			ii.type = TIME_V;
+			AddColumn(SQLT_DAT, 7);
+			break;
+		case SQLT_BLOB:
+			ii.type = ORA_BLOB_V;
+			AddColumn(SQLT_BLOB, sizeof(OCILobLocator *));
+			blob = true;
+			break;
+		case SQLT_CLOB:
+			ii.type = ORA_CLOB_V;
+			AddColumn(SQLT_CLOB, sizeof(OCILobLocator *));
+			blob = true;
+			break;
+		case SQLT_RDD:
+			ii.type = STRING_V;
+			AddColumn(SQLT_STR, 64);
+			break;
+		default:
+			ii.type = STRING_V;
+			AddColumn(SQLT_STR, ii.width ? ii.width + 1 : longsize);
+			break;
+		}
+		Item& c = column.Top();
+		oci8.OCIDefineByPos(stmthp, &c.define, errhp, i,
+			blob ? (void *)&c.lob : (void *)c.Data(), blob ? -1 : c.len,
+			c.type, &c.ind, NULL, NULL, OCI_DEFAULT);
+	}
+	parse = false;
+	return true;
+}
+
+int OCI8Connection::GetRowsProcessed() const {
+	if(!dynamic_param.IsEmpty())
+		return dynamic_pos + 1;
+	ub4 rp = 0;
+	oci8.OCIAttrGet(stmthp, OCI_HTYPE_STMT, &rp, NULL, OCI_ATTR_ROW_COUNT, errhp);
+	return rp;
+}
+
+bool OCI8Connection::Fetch() {
+	ASSERT(!parse);
+	if(parse) return false;
+	if(!dynamic_param.IsEmpty()) // dynamic pseudo-fetch
+		return (dynamic_pos < dynamic_rows && ++dynamic_pos < dynamic_rows);
+	bool tt = session->IsTraceTime();
+	int fstart = tt ? msecs() : 0;
+	sword status = oci8.OCIStmtFetch(stmthp, errhp, 1, OCI_FETCH_NEXT, OCI_DEFAULT);
+	bool ok = false;
+	if(status == OCI_SUCCESS || status == OCI_SUCCESS_WITH_INFO) {
+		fetchtime += msecs(fstart);
+		++fetched;
+		ok = true;
+	}
+	else if(status != OCI_NO_DATA)
+		SetError();
+	if(Stream *s = session->GetTrace()) {
+		if(!ok || fetched % 100 == 0 && fetchtime)
+			*s << NFormat("----- fetch(%d) in %d ms, %8n ms/rec, %2n rec/s\n",
+				fetched, fetchtime,
+				fetchtime / max<double>(fetched, 1),
+				fetched * 1000.0 / max<double>(fetchtime, 1));
+	}
+	return ok;
+}
+
+void OCI8Connection::GetColumn(int i, String& s) const {
+	if(!dynamic_param.IsEmpty()) {
+		s = param[dynamic_param[i]].dynamic[dynamic_pos];
+		return;
+	}
+	const Item& c = column[i];
+	if(c.type == SQLT_BLOB || c.type == SQLT_CLOB) {
+		int handle;
+		GetColumn(i, handle);
+		if(!IsNull(handle))
+		{
+			OracleBlob blob(*session, handle);
+			s = LoadStream(blob);
+		}
+		else
+			s = Null;
+		return;
+	}
+	ASSERT(c.type == SQLT_STR);
+	if(c.ind < 0)
+		s = Null;
+	else
+		s = (char *) c.Data();
+}
+
+void OCI8Connection::GetColumn(int i, double& n) const {
+	if(!dynamic_param.IsEmpty()) {
+		n = param[dynamic_param[i]].dynamic[dynamic_pos];
+		return;
+	}
+	const Item& c = column[i];
+	ASSERT(c.type == SQLT_FLT || c.type == SQLT_BLOB || c.type == SQLT_CLOB);
+	if(c.ind < 0)
+		n = DOUBLE_NULL;
+	else
+		n = c.type == SQLT_BLOB || c.type == SQLT_CLOB ? (int)c.lob : *(double *) c.Data();
+}
+
+void OCI8Connection::GetColumn(int i, int& n) const {
+	double d;
+	GetColumn(i, d);
+	n = IsNull(d) ? (int) Null : (int) d;
+}
+
+void OCI8Connection::GetColumn(int i, Date& d) const {
+	if(!dynamic_param.IsEmpty()) {
+		d = param[dynamic_param[i]].dynamic[dynamic_pos];
+		return;
+	}
+	const Item& c = column[i];
+	const byte *data = c.Data();
+	ASSERT(c.type == SQLT_DAT);
+	if(c.ind < 0)
+		d = Null; // d.year = d.month = d.day = 0;
+	else
+		d = OciDecodeDate(data);
+}
+
+void OCI8Connection::GetColumn(int i, Time& t) const {
+	if(!dynamic_param.IsEmpty()) {
+		t = param[dynamic_param[i]].dynamic[dynamic_pos];
+		return;
+	}
+	const Item& c = column[i];
+	const byte *data = c.Data();
+	ASSERT(c.type == SQLT_DAT);
+	if(c.ind < 0)
+		t = Null; // t.year = t.month = t.day = 0;
+	else
+		t = OciDecodeTime(data);
+}
+
+void  OCI8Connection::GetColumn(int i, Ref f) const {
+	if(!dynamic_param.IsEmpty()) {
+		f.SetValue(param[dynamic_param[i]].dynamic[dynamic_pos]);
+		return;
+	}
+	switch(f.GetType()) {
+		case STRING_V: {
+			String s;
+			GetColumn(i, s);
+			f.SetValue(s);
+			break;
+		}
+		case INT_V: {
+			int d;
+			GetColumn(i, d);
+			f.SetValue(d);
+			break;
+		}
+		case DOUBLE_V: {
+			double d;
+			GetColumn(i, d);
+			f.SetValue(d);
+			break;
+		}
+		case DATE_V: {
+			Date d;
+			GetColumn(i, d);
+			f.SetValue(d);
+			break;
+		}
+		case TIME_V: {
+			Time t;
+			GetColumn(i, t);
+			f.SetValue(t);
+			break;
+		}
+		case VALUE_V: {
+			switch(column[i].type) {
+				case SQLT_STR:
+				/*case SQLT_RDD:*/ {
+					String s;
+					GetColumn(i, s);
+					f.SetValue(s);
+					break;
+				}
+				case SQLT_BLOB:
+				case SQLT_CLOB:
+				case SQLT_FLT: {
+					double d;
+					GetColumn(i, d);
+					f.SetValue(d);
+					break;
+				}
+				case SQLT_DAT: {
+					Time m;
+					GetColumn(i, m);
+					f.SetValue(m);
+					break;
+				}
+				default: {
+					NEVER();
+				}
+			}
+			break;
+		}
+		default: {
+			NEVER();
+		}
+	}
+}
+
+void OCI8Connection::Cancel() {
+	oci8.OCIBreak(SvcCtx(), errhp);
+	parse = true;
+}
+
+void OCI8Connection::SetError() {
+	if(session)
+		session->SetOciError(statement, errhp);
+	parse = true;
+}
+
+SqlSession& OCI8Connection::GetSession() const {
+	ASSERT(session);
+	return *session;
+}
+
+String OCI8Connection::GetUser() const {
+	ASSERT(session);
+	return session->user;
+}
+
+String OCI8Connection::ToString() const {
+	String lg;
+	bool quotes = false;
+	int argn = 0;
+	for(const char *q = statement; *q; q++) {
+		if(*q== '\'' && q[1] != '\'')
+			quotes = !quotes;
+		if(!quotes && *q == '?') {
+			if(argn < param.GetCount()) {
+				const Item& m = param[argn++];
+				if(m.IsNull())
+					lg << "Null";
+				else
+				switch(m.type) {
+				case SQLT_STR:
+					lg.Cat('\'');
+					lg += (const char *) m.Data();
+					lg.Cat('\'');
+					break;
+				case SQLT_FLT:
+					lg << *(const double *) m.Data();
+					break;
+				case SQLT_DAT:
+					lg << OciDecodeTime(m.Data());
+//					const byte *data = m.Data();
+//					lg << (int)data[3] << '.' << (int)data[2] << '.' <<
+//						  int(data[0] - 100) * 100 + data[1] - 100;
+					break;
+				}
+			}
+			else
+				lg += t_("<not supplied>");
+		}
+		else
+			lg += *q;
+	}
+	return lg;
+}
+
+static int conn_count = 0;
+
+OCI8Connection::OCI8Connection(Oracle8& s)
+: session(&s)
+, oci8(s.oci8)
+{
+	LOG("OCI8Connection construct, #" << ++conn_count << " total");
+	refcursor = false;
+	if(!session->AllocOciHandle(&stmthp, OCI_HTYPE_STMT)
+	|| !session->AllocOciHandle(&errhp, OCI_HTYPE_ERROR))
+		session->SetError(t_("Error initializing connection"), t_("OCI8 connection"));
+	LinkAfter(&s.clink);
+}
+
+void OCI8Connection::Clear() {
+	if(session) {
+		if(refcursor) {
+			OCIStmt *aux = 0;
+			if(!session -> AllocOciHandle(&aux, OCI_HTYPE_STMT)) {
+				int errcode;
+				String err = OciError(oci8, errhp, &errcode);
+				session->SetError(err, t_("Closing reference cursor"), errcode, NULL, OciErrorClass(errcode));
+			}
+			static char close[] = "begin close :1; end;";
+			bool err = false;
+			OCIBind *bind = 0;
+			err = oci8.OCIStmtPrepare(aux, errhp, (OraText *)close, strlen(close), OCI_NTV_SYNTAX, OCI_DEFAULT)
+				|| oci8.OCIBindByPos(aux, &bind, errhp, 1, &stmthp, 0, SQLT_RSET, 0, 0, 0, 0, 0, OCI_DEFAULT)
+				|| oci8.OCIStmtExecute(SvcCtx(), aux, errhp, 1, 0, 0, 0, OCI_DEFAULT);
+			if(err)
+				SetError();
+			session -> FreeOciHandle(aux, OCI_HTYPE_STMT);
+		}
+		session -> FreeOciHandle(stmthp, OCI_HTYPE_STMT);
+		session -> FreeOciHandle(errhp, OCI_HTYPE_ERROR);
+		session = NULL;
+	}
+}
+
+OCI8Connection::~OCI8Connection() {
+	Clear();
+	LOG("OCI8Connection destruct, #" << --conn_count << " left");
+}
+
+SqlConnection *Oracle8::CreateConnection() {
+	return new OCI8Connection(*this);
+}
+
+bool   Oracle8::IsOpen() const {
+	return svchp;
+}
+
+bool Oracle8::Open(const String& connect_string, bool use_objects, String *warn) {
+	String name, pwd, server;
+	const char *b = connect_string, *p = b;
+	while(*p && *p != '/' && *p != '@')
+		p++;
+	name = String(b, p);
+	if(*p == '/') {
+		b = ++p;
+		while(*p && *p != '@')
+			p++;
+		pwd = String(b, p);
+	}
+	if(*p == '@')
+		server = ++p;
+	return Login(name, pwd, server, use_objects, warn);
+}
+
+static void OCIInitError(Oracle8& ora, String infn)
+{
+	ora.Logoff();
+	ora.SetError(NFormat(t_("Error initializing OCI8 library (%s)"), infn),
+		t_("Connecting to Oracle database."), 0, NULL, Sql::CONNECTION_BROKEN);
+}
+
+bool Oracle8::Login(const char *name, const char *pwd, const char *db, bool use_objects, String *warn) {
+	LLOG("Oracle8::Login");
+	level = 0;
+	Logoff();
+	ClearError();
+	user = ToUpper(String(name));
+	LLOG("Loading OCI8 library");
+	if(!oci8.Load()) {
+		SetError(t_("Error loading OCI8 Oracle connection dynamic library."),
+			t_("Connecting to Oracle database."), 0, NULL, Sql::CONNECTION_BROKEN);
+		return false;
+	}
+	LLOG("OCI8 loaded -> OCIInitialize, OCIEnvInit");
+	int accessmode = (use_objects ? OCI_OBJECT : 0)
+#if defined(_MULTITHREADED) || defined(PLATFORM_POSIX)
+		| OCI_THREADED
+#endif
+	;
+	if(oci8.OCIEnvCreate) {
+		if(oci8.OCIEnvCreate(&envhp, accessmode, 0, 0, 0, 0, 0, 0)) {
+			OCIInitError(*this, "OCIEnvCreate");
+			return false;
+		}
+	}
+	else {
+		if(oci8.OCIInitialize(accessmode, 0, 0, 0, 0)) {
+			OCIInitError(*this, "OCIInitialize");
+			return false;
+		}
+		if(oci8.OCIEnvInit(&envhp, OCI_DEFAULT, 0, 0)) {
+			OCIInitError(*this, "OCIEnvInit");
+			return false;
+		}
+	}
+	if(!AllocOciHandle(&errhp, OCI_HTYPE_ERROR)) {
+		OCIInitError(*this, "OCI_HTYPE_ERROR");
+		return false;
+	}
+	if(!AllocOciHandle(&svchp, OCI_HTYPE_SVCCTX)) {
+		OCIInitError(*this, "OCI_HTYPE_SVCCTX");
+		return false;
+	}
+	if(!AllocOciHandle(&srvhp, OCI_HTYPE_SERVER)) {
+		OCIInitError(*this, "OCI_HTYPE_SERVER");
+		return false;
+	}
+	if(!AllocOciHandle(&seshp, OCI_HTYPE_SESSION)) {
+		OCIInitError(*this, "OCI_HTYPE_SESSION");
+		return false;
+	}
+	LLOG("Attributes allocated -> OCIServerAttach");
+	if(oci8.OCIServerAttach(srvhp, errhp, (byte *)db, strlen(db), 0)) {
+		SetOciError(NFormat(t_("Connecting to server '%s'"), db), errhp);
+		Logoff();
+		return false;
+	}
+	LLOG("Server attached -> OCIAttrSet, OCISessionBegin");
+	in_server = true;
+	sword retcode;
+	if(oci8.OCIAttrSet(svchp, OCI_HTYPE_SVCCTX, srvhp, 0, OCI_ATTR_SERVER, errhp)
+	|| oci8.OCIAttrSet(seshp, OCI_HTYPE_SESSION, (byte *)name, strlen(name), OCI_ATTR_USERNAME, errhp)
+	|| oci8.OCIAttrSet(seshp, OCI_HTYPE_SESSION, (byte *)pwd, strlen(pwd), OCI_ATTR_PASSWORD, errhp)
+	|| oci8.OCIAttrSet(svchp, OCI_HTYPE_SVCCTX, seshp, 0, OCI_ATTR_SESSION, errhp)
+	|| (retcode = oci8.OCISessionBegin(svchp, errhp, seshp, OCI_CRED_RDBMS, OCI_DEFAULT)) != OCI_SUCCESS
+	&& retcode != OCI_SUCCESS_WITH_INFO) {
+		SetOciError(t_("Connecting to Oracle database."), errhp);
+		Logoff();
+		return false;
+	}
+	if(retcode == OCI_SUCCESS_WITH_INFO && warn) {
+		int errcode;
+		*warn = OciError(oci8, errhp, &errcode);
+	}
+	LLOG("Session attached, user = " + GetUser());
+	in_session = true;
+	return true;
+}
+
+void Oracle8::Logoff() {
+	LOG("Oracle8::Logoff, #" << conn_count << " connections pending");
+	while(!clink.IsEmpty()) {
+		clink.GetNext()->Clear();
+		clink.GetNext()->Unlink();
+		LOG("-> #" << conn_count << " connections left");
+	}
+	if(in_session)
+	{
+		in_session = false;
+		LLOG("OCISessionEnd");
+		oci8.OCISessionEnd(svchp, errhp, seshp, OCI_DEFAULT);
+	}
+	if(in_server)
+	{
+		in_server = false;
+		LLOG("OCIServerDetach");
+		oci8.OCIServerDetach(srvhp, errhp, OCI_DEFAULT);
+	}
+	FreeOciHandle(seshp, OCI_HTYPE_SESSION);
+	seshp = NULL;
+	FreeOciHandle(srvhp, OCI_HTYPE_SERVER);
+	srvhp = NULL;
+	FreeOciHandle(svchp, OCI_HTYPE_SVCCTX);
+	svchp = NULL;
+	FreeOciHandle(errhp, OCI_HTYPE_ERROR);
+	errhp = NULL;
+	if(envhp) {
+		FreeOciHandle(envhp, OCI_HTYPE_ENV);
+		envhp = NULL;
+		if(!oci8.OCIEnvCreate)
+			oci8.OCITerminate(OCI_DEFAULT);
+	}
+}
+
+void   Oracle8::PostError() {
+}
+
+String Oracle8::Spn() {
+	return Format("TRANSACTION_LEVEL_%d", level);
+}
+
+void   Oracle8::Begin() {
+	if(Stream *s = GetTrace())
+		*s << user << "(OCI8) -> StartTransaction(level " << level << ")\n";
+	level++;
+//	ClearError();
+	if(level > 1)
+		Sql(*this).Execute("savepoint " + Spn());
+}
+
+void   Oracle8::Commit() {
+	int time = msecs();
+	ASSERT(tmode == ORACLE || level > 0);
+	if(level)
+		level--;
+//	else
+//		ClearError();
+	if(level == 0) {
+		oci8.OCITransCommit(svchp, errhp, OCI_DEFAULT);
+//		if(Stream *s = GetTrace())
+//			*s << "%commit;\n";
+	}
+	if(Stream *s = GetTrace())
+		*s << NFormat("----- %s (OCI8) -> Commit(level %d) %d ms\n", user, level, msecs(time));
+}
+
+void   Oracle8::Rollback() {
+	ASSERT(tmode == ORACLE || level > 0);
+	if(level > 1)
+		Sql(*this).Execute("rollback to savepoint " + Spn());
+	else {
+		oci8.OCITransRollback(svchp, errhp, OCI_DEFAULT);
+//		if(Stream *s = GetTrace())
+//			*s << "%rollback;\n";
+	}
+	if(level)
+		level--;
+//	else
+//		ClearError();
+	if(Stream *s = GetTrace())
+		*s << user << "(OCI8) -> Rollback(level " << level << ")\n";
+}
+
+String Oracle8::Savepoint() {
+	static dword i;
+	i = (i + 1) & 0x8fffffff;
+	String s = Sprintf("SESSION_SAVEPOINT_%d", i);
+	Sql(*this).Execute("savepoint " + s);
+	return s;
+}
+
+void   Oracle8::RollbackTo(const String& savepoint) {
+	Sql(*this).Execute("rollback to savepoint " + savepoint);
+}
+
+Oracle8::Oracle8(T_OCI8& oci8_)
+: oci8(oci8_)
+{
+	level = 0;
+	envhp = NULL;
+	errhp = NULL;
+	srvhp = NULL;
+	seshp = NULL;
+	svchp = NULL;
+	tmode = NORMAL;
+	in_session = in_server = false;
+	Dialect(ORACLE);
+}
+
+Oracle8::~Oracle8() {
+	Logoff();
+}
+
+Vector<String> Oracle8::EnumUsers()
+{
+	Sql cursor(*this);
+	return OracleSchemaUsers(cursor);
+}
+
+Vector<String> Oracle8::EnumDatabases()
+{
+	Sql cursor(*this);
+	return OracleSchemaUsers(cursor);
+}
+
+Vector<String> Oracle8::EnumTables(String database)
+{
+	Sql cursor(*this);
+	return OracleSchemaTables(cursor, database);
+}
+
+Vector<String> Oracle8::EnumViews(String database)
+{
+	Sql cursor(*this);
+	return OracleSchemaViews(cursor, database);
+}
+
+Vector<String> Oracle8::EnumSequences(String database)
+{
+	Sql cursor(*this);
+	return OracleSchemaSequences(cursor, database);
+}
+
+Vector<String> Oracle8::EnumPrimaryKey(String database, String table)
+{
+	Sql cursor(*this);
+	return OracleSchemaPrimaryKey(cursor, database, table);
+}
+
+String Oracle8::EnumRowID(String database, String table)
+{
+	Sql cursor(*this);
+	return OracleSchemaRowID(cursor, database, table);
+}
+
+Vector<String> Oracle8::EnumReservedWords()
+{
+	return OracleSchemaReservedWords();
+}
+
+void OracleBlob::SetStreamSize(int64 pos) {
+	ASSERT(pos <= GetStreamSize());
+	if(pos < GetStreamSize())
+		session->oci8.OCILobTrim(session->svchp, session->errhp, locp, pos);
+}
+
+dword OracleBlob::Read(int64 at, void *ptr, dword size) {
+	ASSERT(IsOpen() && (style & STRM_READ) && session);
+	ASSERT(at == (dword)at);
+	ub4 n = size;
+	if(session->oci8.OCILobRead(session->svchp, session->errhp, locp, &n, (dword)at + 1, ptr, size,
+		NULL, NULL, 0, SQLCS_IMPLICIT) != OCI_SUCCESS) return 0;
+	return n;
+}
+
+void OracleBlob::Write(int64 at, const void *ptr, dword size) {
+	ASSERT(IsOpen() && (style & STRM_WRITE) && session);
+	ASSERT(at == (dword)at);
+	ub4 n = size;
+	if(session->oci8.OCILobWrite(session->svchp, session->errhp, locp, &n, (dword)at + 1, (void *)ptr, size,
+		OCI_ONE_PIECE, NULL, NULL, 0, SQLCS_IMPLICIT) != OCI_SUCCESS || n != size)
+	{
+		SetError();
+	}
+}
+
+void OracleBlob::Assign(Oracle8& s, int blob) {
+	session = &s;
+	locp = (OCILobLocator *)blob;
+	ub4 n;
+	OpenInit(READWRITE,
+		session->oci8.OCILobGetLength(session->svchp, session->errhp, locp, &n) == OCI_SUCCESS ? n : 0);
+}
+
+
+void OracleBlob::Assign(const Sql& sql, int blob) {
+	Oracle8 *session = dynamic_cast<Oracle8 *>(&sql.GetSession());
+	ASSERT(session);
+	Assign(*session, blob);
+}
+
+bool OracleBlob::IsOpen() const {
+	return locp;
+}
+
+void OracleBlob::Close() {
+	if(locp) Flush();
+	locp = NULL;
+}
+
+OracleBlob::OracleBlob(const Sql& sql, int blob) {
+	Assign(sql, blob);
+}
+
+OracleBlob::OracleBlob(Oracle8& session, int blob) {
+	Assign(session, blob);
+}
+
+OracleBlob::OracleBlob() {
+	locp = NULL;
+	session = NULL;
+}
+
+OracleBlob::~OracleBlob() {
+	Close();
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/Oracle/Oci8.dli b/uppsrc/Oracle/Oci8.dli
new file mode 100644
index 000000000..8e12787c7
--- /dev/null
+++ b/uppsrc/Oracle/Oci8.dli
@@ -0,0 +1,154 @@
+FN(sword,   OCIInitialize, (ub4 mode, dvoid *ctxp, \
+                 dvoid *(*)(dvoid *, size_t), \
+                 dvoid *(*)(dvoid *, dvoid *, size_t), \
+                 void (*)(dvoid *, dvoid *) ))
+
+FN(sword,   OCITerminate, (ub4 mode))
+
+FN(sword,   OCIHandleAlloc, (const dvoid *parenth, dvoid **hndlpp, ub4 type, \
+                             size_t xtramem_sz, dvoid **usrmempp))
+
+FN(sword,   OCIHandleFree, (dvoid *hndlp, ub4 type))
+
+
+FN(sword,   OCIDescriptorAlloc, (const dvoid *parenth, dvoid **descpp, ub4 type, \
+                               size_t xtramem_sz, dvoid **usrmempp))
+
+FN(sword,   OCIDescriptorFree, (dvoid *descp, ub4 type))
+
+FN(sword,   OCIEnvInit, (UPP::OCIEnv **envp, ub4 mode, size_t xtramem_sz, dvoid **usrmempp))
+
+FN0(sword,   OCIEnvCreate, (OCIEnv **envp, ub4 mode, const dvoid *ctxp, \
+	const dvoid *(*malocfp)(dvoid *ctxp, size_t size), \
+	const dvoid *(*ralocfp)(dvoid *ctxp, dvoid *memptr, size_t newsize), \
+	const void (*mfreexp)(dvoid *ctxp, dvoid *memptr), \
+	size_t xtramem_sz, dvoid **usrmempp))
+
+FN(sword,   OCIServerAttach,  (OCIServer *srvhp, OCIError *errhp, \
+                          const OraText *dblink, sb4 dblink_len, ub4 mode))
+
+FN(sword,   OCIServerDetach,  (OCIServer *srvhp, OCIError *errhp, ub4 mode))
+
+FN(sword,   OCISessionBegin,  (OCISvcCtx *svchp, OCIError *errhp, OCISession *usrhp, \
+                          ub4 credt, ub4 mode))
+
+FN(sword,   OCISessionEnd,   (OCISvcCtx *svchp, OCIError *errhp, OCISession *usrhp, ub4 mode))
+
+FN(sword,   OCILogon, (OCIEnv *envhp, OCIError *errhp, OCISvcCtx **svchp, \
+		  const OraText *username, ub4 uname_len, \
+		  const OraText *password, ub4 passwd_len, \
+		  const OraText *dbname, ub4 dbname_len))
+
+FN(sword,   OCILogoff, (OCISvcCtx *svchp, OCIError *errhp))
+
+
+FN(sword,   OCIPasswordChange,   (OCISvcCtx *svchp, OCIError *errhp, \
+                             const OraText *user_name, ub4 usernm_len, \
+                             const OraText *opasswd, ub4 opasswd_len, \
+                             const OraText *npasswd, ub4 npasswd_len, ub4 mode))
+
+FN(sword,   OCIStmtPrepare,   (OCIStmt *stmtp, OCIError *errhp, const OraText *stmt, \
+                          ub4 stmt_len, ub4 language, ub4 mode))
+
+FN(sword,   OCIBindByPos,  (OCIStmt *stmtp, OCIBind **bindp, OCIError *errhp, \
+		       ub4 position, dvoid *valuep, sb4 value_sz, \
+		       ub2 dty, dvoid *indp, ub2 *alenp, ub2 *rcodep, \
+		       ub4 maxarr_len, ub4 *curelep, ub4 mode))
+
+FN(sword,   OCIBindDynamic, (OCIBind *bindp, OCIError *errhp, dvoid *ictxp, \
+			  OCICallbackInBind icbfp, dvoid *octxp, \
+			  OCICallbackOutBind ocbfp))
+
+FN(sword,   OCIStmtGetBindInfo, (OCIStmt *stmtp, OCIError *errhp, ub4 size,
+	ub4 startloc, sb4 *found, OraText *bvnp[], ub1 bvnl[],
+	OraText *invp[], ub1 inpl[], ub1 dupl[], OCIBind *hndl[]))
+
+FN(sword,   OCIStmtExecute,  (OCISvcCtx *svchp, OCIStmt *stmtp, OCIError *errhp, \
+                         ub4 iters, ub4 rowoff, const OCISnapshot *snap_in, \
+                         OCISnapshot *snap_out, ub4 mode))
+
+FN(sword,   OCIDefineByPos,  (OCIStmt *stmtp, OCIDefine **defnp, OCIError *errhp, \
+			 ub4 position, dvoid *valuep, sb4 value_sz, ub2 dty, \
+			 dvoid *indp, ub2 *rlenp, ub2 *rcodep, ub4 mode))
+
+FN(sword,   OCIStmtFetch,   (OCIStmt *stmtp, OCIError *errhp, ub4 nrows, \
+                        ub2 orientation, ub4 mode))
+
+FN(sword,   OCIParamGet, (const dvoid *hndlp, ub4 htype, OCIError *errhp, \
+                     dvoid **parmdpp, ub4 pos))
+
+FN(sword,   OCIParamSet, (dvoid *hdlp, ub4 htyp, OCIError *errhp, const dvoid *dscp,\
+                    ub4 dtyp, ub4 pos))
+
+FN(sword,   OCITransStart,  (OCISvcCtx *svchp, OCIError *errhp, \
+                        uword timeout, ub4 flags ))
+
+FN(sword,   OCITransDetach,  (OCISvcCtx *svchp, OCIError *errhp, ub4 flags))
+
+FN(sword,   OCITransCommit,  (OCISvcCtx *svchp, OCIError *errhp, ub4 flags))
+
+FN(sword,   OCITransRollback,  (OCISvcCtx *svchp, OCIError *errhp, ub4 flags))
+
+FN(sword,   OCITransPrepare, (OCISvcCtx *svchp, OCIError *errhp, ub4 flags))
+
+FN(sword,   OCITransForget, (OCISvcCtx *svchp, OCIError *errhp, ub4 flags))
+
+FN(sword,   OCIErrorGet,   (dvoid *hndlp, ub4 recordno, OraText *sqlstate, \
+                            sb4 *errcodep, OraText *bufp, ub4 bufsiz, ub4 type))
+
+FN(sword,   OCILobAppend,  (OCISvcCtx *svchp, OCIError *errhp, \
+                            OCILobLocator *dst_locp,\
+                            OCILobLocator *src_locp))
+
+FN(sword,   OCILobAssign, (OCIEnv *envhp, OCIError *errhp, \
+                           const OCILobLocator *src_locp, \
+                           OCILobLocator **dst_locpp))
+
+FN(sword,   OCILobCharSetForm, (OCIEnv *envhp, OCIError *errhp, \
+                                const OCILobLocator *locp, ub1 *csfrm))
+
+FN(sword,   OCILobCharSetId, (OCIEnv *envhp, OCIError *errhp, \
+                              const OCILobLocator *locp, ub2 *csid))
+
+FN(sword,   OCILobCopy, (OCISvcCtx *svchp, OCIError *errhp, OCILobLocator *dst_locp, \
+                         OCILobLocator *src_locp, ub4 amount, ub4 dst_offset, \
+                         ub4 src_offset))
+
+FN(sword,   OCILobDisableBuffering, (OCISvcCtx *svchp, OCIError *errhp, OCILobLocator *locp))
+
+FN(sword,   OCILobEnableBuffering, (OCISvcCtx *svchp, OCIError *errhp, OCILobLocator *locp))
+
+FN(sword,   OCILobErase, (OCISvcCtx *svchp, OCIError *errhp, OCILobLocator *locp,
+                          ub4 *amount, ub4 offset))
+
+FN(sword,   OCILobFlushBuffer, (OCISvcCtx *svchp, OCIError *errhp, OCILobLocator *locp, ub4 flag))
+
+FN(sword,   OCILobGetLength, (OCISvcCtx *svchp, OCIError *errhp, OCILobLocator *locp, ub4 *lenp))
+
+FN(sword,   OCILobIsEqual, (OCIEnv *envhp, const OCILobLocator *x, const OCILobLocator *y, \
+                            oci_boolean *is_equal))
+
+FN(sword,   OCILobLocatorIsInit, (OCIEnv *envhp, OCIError *errhp, const OCILobLocator *locp,
+                                  oci_boolean *is_initialized))
+
+FN(sword,   OCILobRead, (OCISvcCtx *svchp, OCIError *errhp, OCILobLocator *locp, \
+                     ub4 *amtp, ub4 offset, dvoid *bufp, ub4 bufl, \
+                     dvoid *ctxp, sb4 (*cbfp)(dvoid *ctxp, const dvoid *bufp, ub4 len, ub1 piece), \
+                     ub2 csid, ub1 csfrm))
+
+FN(sword,   OCILobTrim, (OCISvcCtx *svchp, OCIError *errhp, OCILobLocator *locp, ub4 newlen))
+
+FN(sword,   OCILobWrite,  (OCISvcCtx *svchp, OCIError *errhp, OCILobLocator *locp, \
+                      ub4 *amtp, ub4 offset, dvoid *bufp, ub4 buflen, \
+                      ub1 piece, dvoid *ctxp, \
+                      sb4 (*cbfp)(dvoid *ctxp, dvoid *bufp, ub4 *len, ub1 *piece), \
+                      ub2 csid, ub1 csfrm))
+
+FN(sword,   OCIBreak, (dvoid *hndlp, OCIError *errhp))
+
+FN(sword,   OCIAttrGet, (const dvoid *trgthndlp, ub4 trghndltyp,
+                         dvoid *attributep, ub4 *sizep, ub4 attrtype,
+                         OCIError *errhp))
+
+FN(sword,   OCIAttrSet, (dvoid *trgthndlp, ub4 trghndltyp, dvoid *attributep,
+                         ub4 size, ub4 attrtype, OCIError *errhp))
diff --git a/uppsrc/Oracle/OciCommon.h b/uppsrc/Oracle/OciCommon.h
new file mode 100644
index 000000000..275571f90
--- /dev/null
+++ b/uppsrc/Oracle/OciCommon.h
@@ -0,0 +1,292 @@
+#ifndef __Oracle_OciCommon__
+#define __Oracle_OciCommon__
+
+// excerpt from OCI headers (OCI7 & OCI8)
+NAMESPACE_UPP
+struct OCIEnv;
+struct OCIServer;
+struct OCISession;
+struct OCIStmt;
+struct OCIBind;
+struct OCIDefine;
+struct OCISnapshot;
+struct OCIParam;
+END_UPP_NAMESPACE
+
+#define oci_boolean int
+typedef void dvoid;
+typedef int sword;
+typedef int sb4;
+typedef UPP::dword uword;
+typedef UPP::dword ub4;
+typedef short sb2;
+typedef UPP::word ub2;
+typedef signed char sb1;
+typedef UPP::byte ub1;
+typedef UPP::byte OraText;
+enum
+{
+	// OCIInitialize modes
+	OCI_THREADED   = 0x01,  // the application is in threaded environment
+	OCI_OBJECT     = 0x02,  // the application is in object environment
+	OCI_EVENTS     = 0x04,  // the application is enabled for events
+	OCI_RESERVED1  = 0x08,  // Reserved for internal use
+	OCI_SHARED     = 0x10,  // the application is in shared mode
+	OCI_RESERVED2  = 0x20,  // Reserved for internal use
+		// The following *TWO* are only valid for OCICreateEnvironment call
+	OCI_NO_UCB     = 0x40,  // No user callback called during init
+	OCI_NO_MUTEX   = 0x80,  // the environment handle will not be
+		// protected by a mutex internally
+	OCI_SHARED_EXT = 0x100, // Used for shared forms
+	OCI_CACHE      = 0x200, // used by iCache
+
+	OCI_DEFAULT      = 0x00,  // the default value for parameters and attributes
+	OCI_DATA_AT_EXEC = 0x02,  // data at execute time
+
+	OCI_HTYPE_FIRST                = 1, // start value of handle type
+	OCI_HTYPE_ENV                  = 1, // environment handle
+	OCI_HTYPE_ERROR                = 2, // error handle
+	OCI_HTYPE_SVCCTX               = 3, // service handle
+	OCI_HTYPE_STMT                 = 4, // statement handle
+	OCI_HTYPE_BIND                 = 5, // bind handle
+	OCI_HTYPE_DEFINE               = 6, // define handle
+	OCI_HTYPE_DESCRIBE             = 7, // describe handle
+	OCI_HTYPE_SERVER               = 8, // server handle
+	OCI_HTYPE_SESSION              = 9, // authentication handle
+	OCI_HTYPE_TRANS                = 10, // transaction handle
+	OCI_HTYPE_COMPLEXOBJECT        = 11, // complex object retrieval handle
+	OCI_HTYPE_SECURITY             = 12, // security handle
+	OCI_HTYPE_SUBSCRIPTION         = 13, // subscription handle
+	OCI_HTYPE_DIRPATH_CTX          = 14, // direct path context
+	OCI_HTYPE_DIRPATH_COLUMN_ARRAY = 15, // direct path column array
+	OCI_HTYPE_DIRPATH_STREAM       = 16, // direct path stream
+	OCI_HTYPE_PROC                 = 17, // process handle
+	OCI_HTYPE_LAST                 = 17, // last value of a handle type
+
+	// input data types
+	SQLT_CHR = 1, // (ORANET TYPE) character string
+	SQLT_NUM = 2, // (ORANET TYPE) oracle numeric
+	SQLT_INT = 3, // (ORANET TYPE) integer
+	SQLT_FLT = 4, // (ORANET TYPE) Floating point number
+	SQLT_STR = 5, // zero terminated string
+	SQLT_VNU = 6, // NUM with preceding length byte
+	SQLT_PDN = 7, // (ORANET TYPE) Packed Decimal Numeric
+	SQLT_LNG = 8, // long
+	SQLT_VCS = 9, // Variable character string
+	SQLT_NON = 10, // Null/empty PCC Descriptor entry
+	SQLT_RID = 11, // rowid
+	SQLT_DAT = 12, // date in oracle format
+	SQLT_VBI = 15, // binary in VCS format
+	SQLT_BIN = 23, // binary data(DTYBIN)
+	SQLT_LBI = 24, // long binary
+	SQLT_UIN = 68, // unsigned integer
+	SQLT_SLS = 91, // Display sign leading separate
+	SQLT_LVC = 94, // Longer longs (char)
+	SQLT_LVB = 95, // Longer long binary
+	SQLT_AFC = 96, // Ansi fixed char
+	SQLT_AVC = 97, // Ansi Var char
+	SQLT_CUR = 102, // cursor type
+	SQLT_RDD = 104, // rowid descriptor
+	SQLT_LAB = 105, // label type
+	SQLT_OSL = 106, // oslabel type
+
+	SQLT_NTY = 108, // named object type
+	SQLT_REF = 110, // ref type
+	SQLT_CLOB = 112, // character lob
+	SQLT_BLOB = 113, // binary lob
+	SQLT_BFILEE = 114, // binary file lob
+	SQLT_CFILEE = 115, // character file lob
+	SQLT_RSET = 116, // result set type
+	SQLT_NCO = 122, // named collection type (varray or nested table)
+	SQLT_VST = 155, // OCIString type
+	SQLT_ODT = 156, // OCIDate type
+
+	// datetimes and intervals
+	SQLT_DATE = 184, // ANSI Date
+	SQLT_TIME = 185, // TIME
+	SQLT_TIME_TZ = 186, // TIME WITH TIME ZONE
+	SQLT_TIMESTAMP = 187, // TIMESTAMP
+	SQLT_TIMESTAMP_TZ = 188, // TIMESTAMP WITH TIME ZONE
+	SQLT_INTERVAL_YM = 189, // INTERVAL YEAR TO MONTH
+	SQLT_INTERVAL_DS = 190, // INTERVAL DAY TO SECOND
+	SQLT_TIMESTAMP_LTZ = 232, // TIMESTAMP WITH LOCAL TZ
+
+	// cxcheng: this has been added for backward compatibility -
+	// it needs to be here because ocidfn.h can get included ahead of sqldef.h
+	SQLT_FILE = SQLT_BFILEE, // binary file lob
+	SQLT_CFILE = SQLT_CFILEE,
+	SQLT_BFILE = SQLT_BFILEE,
+
+	OCI_DTYPE_FIRST = 50, // start value of descriptor type
+	OCI_DTYPE_LOB = 50, // lob locator
+	OCI_DTYPE_SNAP = 51, // snapshot descriptor
+	OCI_DTYPE_RSET = 52, // result set descriptor
+	OCI_DTYPE_PARAM = 53, // a parameter descriptor obtained from ocigparm
+	OCI_DTYPE_ROWID = 54, // rowid descriptor
+	OCI_DTYPE_COMPLEXOBJECTCOMP = 55,
+	 // complex object retrieval descriptor
+	OCI_DTYPE_FILE = 56, // File Lob locator
+	OCI_DTYPE_AQENQ_OPTIONS = 57, // enqueue options
+	OCI_DTYPE_AQDEQ_OPTIONS = 58, // dequeue options
+	OCI_DTYPE_AQMSG_PROPERTIES = 59, // message properties
+	OCI_DTYPE_AQAGENT = 60, // aq agent
+	OCI_DTYPE_LOCATOR = 61, // LOB locator
+	OCI_DTYPE_INTERVAL_YM = 62, // Interval year month
+	OCI_DTYPE_INTERVAL_DS = 63, // Interval day second
+	OCI_DTYPE_AQNFY_DESCRIPTOR = 64, // AQ notify descriptor
+	OCI_DTYPE_DATE = 65, // Date
+	OCI_DTYPE_TIME = 66, // Time
+	OCI_DTYPE_TIME_TZ = 67, // Time with timezone
+	OCI_DTYPE_TIMESTAMP = 68, // Timestamp
+	OCI_DTYPE_TIMESTAMP_TZ = 69, // Timestamp with timezone
+	OCI_DTYPE_TIMESTAMP_LTZ = 70, // Timestamp with local tz
+	OCI_DTYPE_UCB = 71, // user callback descdriptor
+	OCI_DTYPE_LAST = 71, // last value of a descriptor type
+
+	OCI_V7_SYNTAX  = 2, // V815 language - for backwards compatibility
+	OCI_V8_SYNTAX  = 3, // V815 language - for backwards compatibility
+	OCI_NTV_SYNTAX = 1, // Use what so ever is the native lang of server
+
+	OCI_STMT_SELECT  = 1, // select statement
+	OCI_STMT_UPDATE  = 2, // update statement
+	OCI_STMT_DELETE  = 3, // delete statement
+	OCI_STMT_INSERT  = 4, // Insert Statement
+	OCI_STMT_CREATE  = 5, // create statement
+	OCI_STMT_DROP    = 6, // drop statement
+	OCI_STMT_ALTER   = 7, // alter statement
+	OCI_STMT_BEGIN   = 8, // begin ... (pl/sql statement)
+	OCI_STMT_DECLARE = 9, // declare ... (pl/sql statement)
+
+	OCI_BATCH_MODE             = 0x01, // batch the oci statement for execution
+	OCI_EXACT_FETCH            = 0x02, // fetch the exact rows specified
+	OCI_KEEP_FETCH_STATE       = 0x04, // unused
+	OCI_SCROLLABLE_CURSOR      = 0x08, // cursor scrollable
+	OCI_DESCRIBE_ONLY          = 0x10, // only describe the statement
+	OCI_COMMIT_ON_SUCCESS      = 0x20, // commit, if successful execution
+	OCI_NON_BLOCKING           = 0x40, // non-blocking
+	OCI_BATCH_ERRORS           = 0x80, // batch errors in array dmls
+	OCI_PARSE_ONLY             = 0x100, // only parse the statement
+	OCI_EXACT_FETCH_RESERVED_1 = 0x200, // reserved for internal use
+	OCI_SHOW_DML_WARNINGS      = 0x400,
+
+	OCI_SUCCESS              = 0,      // maps to SQL_SUCCESS of SAG CLI
+	OCI_SUCCESS_WITH_INFO    = 1,      // maps to SQL_SUCCESS_WITH_INFO
+	OCI_RESERVED_FOR_INT_USE = 200,    // reserved for internal use
+	OCI_NO_DATA              = 100,    // maps to SQL_NO_DATA
+	OCI_ERROR                = -1,     // maps to SQL_ERROR
+	OCI_INVALID_HANDLE       = -2,     // maps to SQL_INVALID_HANDLE
+	OCI_NEED_DATA            = 99,     // maps to SQL_NEED_DATA
+	OCI_STILL_EXECUTING      = -3123,  // OCI would block error
+	OCI_CONTINUE             = -24200, // Continue with the body of the OCI function
+
+	SQLCS_IMPLICIT = 1, // for CHAR, VARCHAR2, CLOB w/o a specified set
+	SQLCS_NCHAR    = 2, // for NCHAR, NCHAR VARYING, NCLOB
+	SQLCS_EXPLICIT = 3, // for CHAR, etc, with "CHARACTER SET ..." syntax
+	SQLCS_FLEXIBLE = 4, // for PL/SQL "flexible" parameters
+	SQLCS_LIT_NULL = 5, // for typecheck of NULL and empty_clob() lits
+
+	OCI_FETCH_NEXT       = 0x02, // next row
+	OCI_FETCH_FIRST      = 0x04, // first row of the result set
+	OCI_FETCH_LAST       = 0x08, // the last row of the result set
+	OCI_FETCH_PRIOR      = 0x10, // the previous row relative to current
+	OCI_FETCH_ABSOLUTE   = 0x20, // absolute offset from first
+	OCI_FETCH_RELATIVE   = 0x40, // offset relative to current
+	OCI_FETCH_RESERVED_1 = 0x80, // reserved for internal use
+
+	OCI_ONE_PIECE    = 0, // one piece
+	OCI_FIRST_PIECE  = 1, // the first piece
+	OCI_NEXT_PIECE   = 2, // the next of many pieces
+	OCI_LAST_PIECE   = 3, // the last piece
+
+	OCI_ATTR_DATA_SIZE     = 1, // maximum size of the data
+	OCI_ATTR_DATA_TYPE     = 2, // the SQL type of the column/argument
+	OCI_ATTR_NAME          = 4, // the name of the column/argument
+	OCI_ATTR_PRECISION     = 5, // precision if number type
+	OCI_ATTR_SCALE         = 6, // scale if number type
+	OCI_ATTR_ROW_COUNT     = 9, // the rows processed so far
+	OCI_ATTR_PREFETCH_ROWS = 11, // sets the number of rows to prefetch
+	OCI_ATTR_STMT_TYPE     = 24, // statement type
+	OCI_ATTR_PARAM_COUNT   = 18, // number of column in the select list
+
+	OCI_ATTR_ENV           = 5,  // the environment handle
+	OCI_ATTR_SERVER        = 6,  // the server handle
+	OCI_ATTR_SESSION       = 7,  // the user session handle
+
+	OCI_ATTR_USERNAME      = 22, // username attribute
+	OCI_ATTR_PASSWORD      = 23, // password attribute
+
+	OCI_CRED_RDBMS         = 1,  // database username/password
+
+	OCI_LM_DEF = 0, // default login
+	OCI_LM_NBL = 1, // non-blocking logon
+
+	OCI_STRING_MAXLEN = 4000, // default maximum length of a vstring
+};
+
+#if defined(SS_64BIT_SERVER) || defined(__64BIT__)
+#define CDA_SIZE 88
+#else
+# define CDA_SIZE 64
+#endif
+
+struct cda_head {
+    sb2          v2_rc;
+    ub2          ft;
+    ub4          rpc;
+    ub2          peo;
+    ub1          fc;
+    ub1          rcs1;
+    ub2          rc;
+    ub1          wrn;
+    ub1          rcs2;
+    sword        rcs3;
+    struct {
+        struct {
+           ub4    rcs4;
+           ub2    rcs5;
+           ub1    rcs6;
+        } rd;
+        ub4    rcs7;
+        ub2    rcs8;
+    } rid;
+    sword        ose;
+    ub1		 chk;
+    dvoid        *rcsp;
+};
+
+struct cda_def {
+    sb2          v2_rc;                                    /* V2 return code */
+    ub2          ft;                                    /* SQL function type */
+    ub4          rpc;                                /* rows processed count */
+    ub2          peo;                                  /* parse error offset */
+    ub1          fc;                                    /* OCI function code */
+    ub1          rcs1;                                        /* filler area */
+    ub2          rc;                                       /* V7 return code */
+    ub1          wrn;                                       /* warning flags */
+    ub1          rcs2;                                           /* reserved */
+    sword        rcs3;                                           /* reserved */
+    struct {                                              /* rowid structure */
+        struct {
+           ub4    rcs4;
+           ub2    rcs5;
+           ub1    rcs6;
+        } rd;
+        ub4    rcs7;
+        ub2    rcs8;
+    } rid;
+    sword        ose;                                 /* OSD dependent error */
+    ub1		 chk;
+    dvoid        *rcsp;                          /* pointer to reserved area */
+    ub1          rcs9[CDA_SIZE - sizeof (struct cda_head)];        /* filler */
+};
+
+typedef sb4 (*OCICallbackInBind)(dvoid *ictxp, UPP::OCIBind *bindp, ub4 iter,
+	ub4 index, dvoid **bufpp, ub4 *alenp,
+	ub1 *piecep, dvoid **indp);
+
+typedef sb4 (*OCICallbackOutBind)(dvoid *octxp, UPP::OCIBind *bindp, ub4 iter,
+	ub4 index, dvoid **bufpp, ub4 **alenp,
+	ub1 *piecep, dvoid **indp,
+	ub2 **rcodep);
+
+#endif//__Oracle_OciCommon__
diff --git a/uppsrc/Oracle/OraCommon.cpp b/uppsrc/Oracle/OraCommon.cpp
new file mode 100644
index 000000000..600259dbd
--- /dev/null
+++ b/uppsrc/Oracle/OraCommon.cpp
@@ -0,0 +1,531 @@
+#include <Sql/Sql.h>
+#include "OciCommon.h"
+#include "OraCommon.h"
+
+NAMESPACE_UPP
+
+Date OciDecodeDate(const byte data[7]) {
+	Date d;
+	d.year = int(data[0] - 100) * 100 + data[1] - 100;
+	d.month = data[2];
+	d.day = data[3];
+	return d;
+}
+
+bool OciEncodeDate(byte data[7], Date d) {
+	if(IsNull(d))
+		return false;
+	int d100 = d.year / 100, m100 = d.year % 100;
+	if(m100 < 0) {
+		m100 += 100;
+		d100--;
+	}
+	data[0] = d100 + 100;
+	data[1] = m100 + 100;
+	data[2] = d.month;
+	data[3] = d.day;
+	data[4] = data[5] = data[6] = 1;
+	return true;
+}
+
+Time OciDecodeTime(const byte data[7]) {
+	Time t;
+	t.year = int(data[0] - 100) * 100 + data[1] - 100;
+	t.month = data[2];
+	t.day = data[3];
+	t.hour = data[4] - 1;
+	t.minute = data[5] - 1;
+	t.second = data[6] - 1;
+	return t;
+}
+
+bool OciEncodeTime(byte data[7], Time t) {
+	if(IsNull(t))
+		return false;
+	int d100 = t.year / 100, m100 = t.year % 100;
+	if(m100 < 0) {
+		m100 += 100;
+		d100--;
+	}
+	data[0] = d100 + 100;
+	data[1] = m100 + 100;
+	data[2] = t.month;
+	data[3] = t.day;
+	data[4] = t.hour + 1;
+	data[5] = t.minute + 1;
+	data[6] = t.second + 1;
+	return true;
+}
+
+const char *OciParseString(const char *s) {
+	ASSERT(*s == '\'');
+	s++;
+	while(*s)
+		if(*s++ == '\'' && *s++ != '\'')
+			return s - 1;
+	return NULL;
+}
+
+String OciParseStringError(const char *s) {
+	String err = "Parse error: unterminated string ";
+	int l = strlen(s);
+	enum { SAMPLE = 10 };
+	if(l <= SAMPLE)
+		err.Cat(s, l);
+	else {
+		err.Cat(s, SAMPLE);
+		err.Cat("...");
+	}
+	return err;
+}
+
+String OciParseRefError(const char *s) {
+	return String().Cat() << "Parse error: invalid ?% type specifier '" << *s << "'";
+}
+
+int OciParse(const char *statement, String& out, OciSqlConnection *conn, SqlSession *session) {
+	String cmd;
+	int args = 0;
+	const char *s = statement;
+	while(*s) {
+		if(*s == '\'') {
+			const char *b = s;
+			s = OciParseString(b);
+			if(!s) {
+				if(session)
+					session -> SetError(OciParseStringError(b), statement);
+				return -1;
+			}
+			cmd.Cat(b, s - b);
+		}
+		else if(*s == '?') {
+			++s;
+			++args;
+			cmd.Cat(':');
+			if(args >= 10)
+				cmd.Cat(args / 10 + '0');
+			cmd.Cat(args % 10 + '0');
+			if(*s == '%') {
+				OracleRef oraref;
+				const char *p = s + 1;
+				s = oraref.Parse(p);
+				if(!s) {
+					if(session)
+						session -> SetError(String().Cat() << "Parse error: invalid ?% type specifier '"
+						<< *p << "'", statement);
+					return -1;
+				}
+				conn -> SetParam(args - 1, oraref);
+			}
+		}
+		else
+			cmd.Cat(*s++);
+	}
+	out = cmd;
+	return args;
+}
+
+const char *OracleRef::Parse(const char *stmt) {
+	switch(*stmt++) {
+	case 'i': ora_vtype = INT_V; break;
+	case 'f': ora_vtype = DOUBLE_V; break;
+	case 's': ora_vtype = STRING_V; break;
+	case 't': ora_vtype = TIME_V; break;
+	case 'c': ora_vtype = ORA_CLOB_V; break;
+	case 'b': ora_vtype = ORA_BLOB_V; break;
+	default:  return NULL;
+	}
+	return stmt;
+}
+
+int OracleRef::GetOraType() const {
+	switch(ora_vtype) {
+	case BOOL_V:
+	case INT_V:      return SQLT_INT;
+	case DOUBLE_V:   return SQLT_FLT;
+	case WSTRING_V:
+	case STRING_V:   return SQLT_STR;
+	case DATE_V:
+	case TIME_V:     return SQLT_DAT;
+	case ORA_BLOB_V: return SQLT_CLOB;
+	case ORA_CLOB_V: return SQLT_BLOB;
+	default: NEVER(); return 0;
+	}
+}
+
+int OracleRef::GetMaxLen() const {
+	switch(ora_vtype) {
+	case BOOL_V:
+	case INT_V:       return sizeof(int);
+	case DOUBLE_V:    return sizeof(double);
+	case WSTRING_V:
+	case STRING_V:    return OCI_STRING_MAXLEN + 1;
+	case DATE_V:
+	case TIME_V:      return 7;
+	case ORA_BLOB_V:  return sizeof(void *);
+	case ORA_CLOB_V:  return sizeof(void *);
+	default: NEVER(); return 0;
+	}
+}
+
+Value SqlSequence::Get() {
+	static SqlId DUAL("DUAL");
+#ifndef NOAPPSQL
+	Sql sql(session ? *session : SQL.GetSession());
+#else
+	ASSERT(session);
+	Sql sql(*session);
+#endif
+	if(!sql.Execute(Select(NextVal(seq)).From(DUAL)) || !sql.Fetch())
+		return ErrorValue();
+	return sql[0];
+}
+
+static bool scmpw(const byte *s, const char *w) {
+	for(;;) {
+		if(*w == '\0')
+			return *s == ' ' || *s == '\t';
+		if(ToUpper(*s++) != ToUpper(*w++))
+			return false;
+	}
+}
+
+bool OraclePerformScript(const String& text, StatementExecutor& exe, Gate2<int, int> progress_canceled)
+{
+	bool error = false;
+	String statement;
+	bool body = false;
+	bool chr = false;
+	StringStream in(text);
+	while(!in.IsEof()) {
+		if(progress_canceled((int)in.GetPos(), (int)in.GetSize()))
+			return false;
+		String line = in.GetLine();
+		bool exec = false;
+		int l = line.GetLength();
+		if(l && line[0] == '/' && !body && !chr)
+			exec = true;
+		else
+		if(l && line[0] == '.' && body && !chr)
+			body = false;
+		else {
+			if(!statement.IsEmpty() && !chr)
+				statement.Cat(' ');
+			bool spc = true;
+			bool create = false;
+			for(const byte *s = (const byte *)(const char *)line; *s; s++) {
+				if(s[0] == '-' && s[1] == '-' && !chr) break;
+				if(*s == '\'') chr = !chr;
+				if(!chr && spc && scmpw(s, "create"))
+					create = true;
+				if(!chr && spc && (scmpw(s, "begin") || scmpw(s, "declare") ||
+				   create && (scmpw(s, "procedure") || scmpw(s, "function") || scmpw(s, "trigger"))
+				))
+					body = true;
+				if(*s == ';' && !chr && !body) {
+					exec = true;
+					break;
+				}
+				if(*s > ' ' || chr) {
+					statement.Cat(*s);
+					spc = false;
+				}
+				else
+				if(*s == '\t' || *s == ' ') {
+					if(!spc) statement.Cat(' ');
+					spc = true;
+				}
+				else
+					spc = false;
+			}
+			if(chr) statement.Cat("\r\n");
+		}
+		if(exec) {
+			if(!exe.Execute(statement)) return false;
+			statement = Null;
+			body = chr = false;
+		}
+	}
+	return true;
+}
+
+#define LOCALID(s) static SqlId s(#s);
+
+static Vector<String> FetchList(Sql& cursor)
+{
+	Vector<String> out;
+	while(cursor.Fetch())
+		out.Add(cursor[0]);
+	return out;
+}
+
+Vector<String> OracleSchemaUsers(Sql& cursor)
+{
+	Vector<String> out;
+	if(Select(SqlId("USERNAME")).From(SqlId("ALL_USERS")).Execute(cursor))
+		out = FetchList(cursor);
+	return out;
+}
+
+Vector<String> OracleSchemaTables(Sql& cursor, String database)
+{
+	Vector<String> out;
+	if(Select(SqlId("TABLE_NAME")).From(SqlId("ALL_TABLES")).Where(SqlId("OWNER") == database).Execute(cursor))
+		out = FetchList(cursor);
+	return out;
+}
+
+Vector<String> OracleSchemaViews(Sql& cursor, String database)
+{
+	Vector<String> out;
+	if(Select(SqlId("VIEW_NAME")).From(SqlId("ALL_VIEWS")).Where(SqlId("OWNER") == database).Execute(cursor))
+		out = FetchList(cursor);
+	return out;
+}
+
+Vector<String> OracleSchemaSequences(Sql& cursor, String database)
+{
+	Vector<String> out;
+	if(Select(SqlId("SEQUENCE_NAME")).From(SqlId("ALL_SEQUENCES")).Where(SqlId("SEQUENCE_OWNER") == database).Execute(cursor))
+		out = FetchList(cursor);
+	return out;
+}
+
+Vector<String> OracleSchemaPrimaryKey(Sql& cursor, String database, String table)
+{
+	Vector<String> out;
+	if(Select(SqlId("COLUMN_NAME")).From(SqlId("ALL_CONS_COLUMNS"))
+		.Where(SqlId("OWNER") == database && SqlId("TABLE_NAME") == table
+			&& SqlId("CONSTRAINT_NAME") ==
+				Select(SqlId("CONSTRAINT_NAME"))
+					.From(SqlId("ALL_CONSTRAINTS"))
+					.Where(SqlId("OWNER") == database && SqlId("TABLE_NAME") == table
+						&& SqlId("CONSTRAINT_TYPE") == "P")
+		).OrderBy(SqlId("POSITION"))
+		.Execute(cursor))
+		out = FetchList(cursor);
+	return out;
+}
+
+String OracleSchemaRowID(Sql& cursor, String database, String table)
+{
+	if(Select(SqlId("ROWID")).From(SqlId(table).Of(SqlId(database))).Where(SqlBool(false)).Execute(cursor))
+		return "ROWID";
+	return Null;
+}
+
+Vector<String> OracleSchemaReservedWords()
+{
+	static const char *rwlist[] = {
+		"@", "ABORT", "ACCESS", "ACCESSED",
+		"ACCOUNT", "ACTIVATE", "ADD", "ADMIN",
+		"ADMINISTER", "ADMINISTRATOR", "ADVISE", "AFTER",
+		"ALGORITHM", "ALIAS", "ALL", "ALL_ROWS",
+		"ALLOCATE", "ALLOW", "ALTER", "ALWAYS",
+		"ANALYZE", "ANCILLARY", "AND", "ANY",
+		"APPLY", "ARCHIVE", "ARCHIVELOG", "ARRAY",
+		"AS", "ASC", "ASSOCIATE", "AT",
+		"ATTRIBUTE", "ATTRIBUTES", "AUDIT", "AUTHENTICATED",
+		"AUTHID", "AUTHORIZATION", "AUTO", "AUTOALLOCATE",
+		"AUTOEXTEND", "AUTOMATIC", "AVAILABILITY", "BACKUP",
+		"BECOME", "BEFORE", "BEGIN", "BEHALF",
+		"BETWEEN", "BFILE", "BINDING", "BITMAP",
+		"BITS", "BLOB", "BLOCK", "BLOCKSIZE",
+		"BLOCK_RANGE", "BODY", "BOUND", "BOTH",
+		"BROADCAST", "BUFFER_POOL", "BUILD", "BULK",
+		"BY", "BYTE", "CACHE", "CACHE_INSTANCES",
+		"CALL", "CANCEL", "CASCADE", "CASE",
+		"CAST", "CATEGORY", "CERTIFICATE", "CFILE",
+		"CHAINED", "CHANGE", "CHAR", "CHAR_CS",
+		"CHARACTER", "CHECK", "CHECKPOINT", "CHILD",
+		"CHOOSE", "CHUNK", "CLASS", "CLEAR",
+		"CLOB", "CLONE", "CLOSE", "CLOSE_CACHED_OPEN_CURSORS",
+		"CLUSTER", "COALESCE", "COLLECT", "COLUMN",
+		"COLUMNS", "COLUMN_VALUE", "COMMENT", "COMMIT",
+		"COMMITTED", "COMPATIBILITY", "COMPILE", "COMPLETE",
+		"COMPOSITE_LIMIT", "COMPRESS", "COMPUTE", "CONFORMING",
+		"CONNECT", "CONNECT_TIME", "CONSIDER", "CONSISTENT",
+		"CONSTRAINT", "CONSTRAINTS", "CONTAINER", "CONTENTS",
+		"CONTEXT", "CONTINUE", "CONTROLFILE", "CONVERT",
+		"CORRUPTION", "COST", "CPU_PER_CALL", "CPU_PER_SESSION",
+		"CREATE", "CREATE_STORED_OUTLINES", "CROSS", "CUBE",
+		"CURRENT", "CURRENT_DATE", "CURRENT_SCHEMA", "CURRENT_TIME",
+		"CURRENT_TIMESTAMP", "CURRENT_USER", "CURSOR", "CURSOR_SPECIFIC_SEGMENT",
+		"CYCLE", "DANGLING", "DATA", "DATABASE",
+		"DATAFILE", "DATAFILES", "DATAOBJNO", "DATE",
+		"DATE_MODE", "DAY", "DBA", "DBTIMEZONE",
+		"DDL", "DEALLOCATE", "DEBUG", "DEC",
+		"DECIMAL", "DECLARE", "DEFAULT", "DEFERRABLE",
+		"DEFERRED", "DEFINED", "DEFINER", "DEGREE",
+		"DELAY", "DELETE", "DEMAND", "DENSE_RANK",
+		"ROWDEPENDENCIES", "DEREF", "DESC", "DETACHED",
+		"DETERMINES", "DICTIONARY", "DIMENSION", "DIRECTORY",
+		"DISABLE", "DISASSOCIATE", "DISCONNECT", "DISK",
+		"DISKGROUP", "DISKS", "DISMOUNT", "DISPATCHERS",
+		"DISTINCT", "DISTINGUISHED", "DISTRIBUTED", "DML",
+		"DOUBLE", "DROP", "DUMP", "DYNAMIC",
+		"EACH", "ELEMENT", "ELSE", "ENABLE",
+		"ENCRYPTED", "ENCRYPTION", "END", "ENFORCE",
+		"ENTRY", "ERROR_ON_OVERLAP_TIME", "ESCAPE", "ESTIMATE",
+		"EVENTS", "EXCEPT", "EXCEPTIONS", "EXCHANGE",
+		"EXCLUDING", "EXCLUSIVE", "EXECUTE", "EXEMPT",
+		"EXISTS", "EXPIRE", "EXPLAIN", "EXPLOSION",
+		"EXTEND", "EXTENDS", "EXTENT", "EXTENTS",
+		"EXTERNAL", "EXTERNALLY", "EXTRACT", "FAILED_LOGIN_ATTEMPTS",
+		"FAILGROUP", "FALSE", "FAST", "FILE",
+		"FILTER", "FINAL", "FINISH", "FIRST",
+		"FIRST_ROWS", "FLAGGER", "FLASHBACK", "FLOAT",
+		"FLOB", "FLUSH", "FOLLOWING", "FOR",
+		"FORCE", "FOREIGN", "FREELIST", "FREELISTS",
+		"FREEPOOLS", "FRESH", "FROM", "FULL",
+		"FUNCTION", "FUNCTIONS", "GENERATED", "GLOBAL",
+		"GLOBALLY", "GLOBAL_NAME", "GLOBAL_TOPIC_ENABLED", "GRANT",
+		"GROUP", "GROUPING", "GROUPS", "GUARANTEED",
+		"GUARD", "HASH", "HASHKEYS", "HAVING",
+		"HEADER", "HEAP", "HIERARCHY", "HOUR",
+		"ID", "IDENTIFIED", "IDENTIFIER", "IDGENERATORS",
+		"IDLE_TIME", "IF", "IMMEDIATE", "IN",
+		"INCLUDING", "INCREMENT", "INCREMENTAL", "INDEX",
+		"INDEXED", "INDEXES", "INDEXTYPE", "INDEXTYPES",
+		"INDICATOR", "INITIAL", "INITIALIZED", "INITIALLY",
+		"INITRANS", "INNER", "INSERT", "INSTANCE",
+		"INSTANCES", "INSTANTIABLE", "INSTANTLY", "INSTEAD",
+		"INT", "INTEGER", "INTEGRITY", "INTERMEDIATE",
+		"INTERNAL_USE", "INTERNAL_CONVERT", "INTERSECT", "INTERVAL",
+		"INTO", "INVALIDATE", "IN_MEMORY_METADATA", "IS",
+		"ISOLATION", "ISOLATION_LEVEL", "JAVA", "JOIN",
+		"KEEP", "KERBEROS", "KEY", "KEYFILE",
+		"KEYS", "KEYSIZE", "REKEY", "KILL",
+		"<<", "LAST", "LATERAL", "LAYER",
+		"LDAP_REGISTRATION", "LDAP_REGISTRATION_ENABLED", "LDAP_REG_SYNC_INTERVAL", "LEADING",
+		"LEFT", "LESS", "LEVEL", "LEVELS",
+		"LIBRARY", "LIKE", "LIKE2", "LIKE4",
+		"LIKEC", "LIMIT", "LINK", "LIST",
+		"LOB", "LOCAL", "LOCALTIME", "LOCALTIMESTAMP",
+		"LOCATION", "LOCATOR", "LOCK", "LOCKED",
+		"LOG", "LOGFILE", "LOGGING", "LOGICAL",
+		"LOGICAL_READS_PER_CALL", "LOGICAL_READS_PER_SESSION", "LOGOFF", "LOGON",
+		"LONG", "MANAGE", "MANAGED", "MANAGEMENT",
+		"MANUAL", "MAPPING", "MASTER", "MATERIALIZED",
+		"MATCHED", "MAX", "MAXARCHLOGS", "MAXDATAFILES",
+		"MAXEXTENTS", "MAXIMIZE", "MAXINSTANCES", "MAXLOGFILES",
+		"MAXLOGHISTORY", "MAXLOGMEMBERS", "MAXSIZE", "MAXTRANS",
+		"MAXVALUE", "METHOD", "MIN", "MEMBER",
+		"MEMORY", "MERGE", "MIGRATE", "MINIMIZE",
+		"MINIMUM", "MINEXTENTS", "MINUS", "MINUTE",
+		"MINVALUE", "MIRROR", "MLSLABEL", "MODE",
+		"MODIFY", "MONITORING", "MONTH", "MOUNT",
+		"MOVE", "MOVEMENT", "MTS_DISPATCHERS", "MULTISET",
+		"NAME", "NAMED", "NATIONAL", "NATURAL",
+		"NCHAR", "NCHAR_CS", "NCLOB", "NEEDED",
+		"NESTED", "NESTED_TABLE_ID", "NETWORK", "NEVER",
+		"NEW", "NEXT", "NLS_CALENDAR", "NLS_CHARACTERSET",
+		"NLS_COMP", "NLS_NCHAR_CONV_EXCP", "NLS_CURRENCY", "NLS_DATE_FORMAT",
+		"NLS_DATE_LANGUAGE", "NLS_ISO_CURRENCY", "NLS_LANG", "NLS_LANGUAGE",
+		"NLS_LENGTH_SEMANTICS", "NLS_NUMERIC_CHARACTERS", "NLS_SORT", "NLS_SPECIAL_CHARS",
+		"NLS_TERRITORY", "NO", "NOARCHIVELOG", "NOAUDIT",
+		"NOCACHE", "NOCOMPRESS", "NOCYCLE", "NOROWDEPENDENCIES",
+		"NODELAY", "NOFORCE", "NOLOGGING", "NOMAPPING",
+		"NOMAXVALUE", "NOMINIMIZE", "NOMINVALUE", "NOMONITORING",
+		"NONE", "NOORDER", "NOOVERRIDE", "NOPARALLEL",
+		"NORELY", "NOREPAIR", "NORESETLOGS", "NOREVERSE",
+		"NORMAL", "NOSEGMENT", "NOSTRICT", "NOSTRIPE",
+		"NOSORT", "NOSWITCH", "NOT", "NOTHING",
+		"NOVALIDATE", "NOWAIT", "NULL", "NULLS",
+		"NUMBER", "NUMERIC", "NVARCHAR2", "OBJECT",
+		"OBJNO", "OBJNO_REUSE", "OF", "OFF",
+		"OFFLINE", "OID", "OIDINDEX", "OLD",
+		"ON", "ONLINE", "ONLY", "OPAQUE",
+		"OPCODE", "OPEN", "OPERATOR", "OPTIMAL",
+		"OPTIMIZER_GOAL", "OPTION", "OR", "ORDER",
+		"ORGANIZATION", "OUTER", "OUTLINE", "OVER",
+		"OVERFLOW", "OVERLAPS", "OWN", "PACKAGE",
+		"PACKAGES", "PARALLEL", "PARAMETERS", "PARENT",
+		"PARITY", "PARTIALLY", "PARTITION", "PARTITIONS",
+		"PARTITION_HASH", "PARTITION_LIST", "PARTITION_RANGE", "PASSWORD",
+		"PASSWORD_GRACE_TIME", "PASSWORD_LIFE_TIME", "PASSWORD_LOCK_TIME", "PASSWORD_REUSE_MAX",
+		"PASSWORD_REUSE_TIME", "PASSWORD_VERIFY_FUNCTION", "PCTFREE", "PCTINCREASE",
+		"PCTTHRESHOLD", "PCTUSED", "PCTVERSION", "PERCENT",
+		"PERFORMANCE", "PERMANENT", "PFILE", "PHYSICAL",
+		"PLAN", "PLSQL_DEBUG", "POLICY", "POST_TRANSACTION",
+		"PREBUILT", "PRECEDING", "PRECISION", "PREPARE",
+		"PRESERVE", "PRIMARY", "PRIOR", "PRIVATE",
+		"PRIVATE_SGA", "PRIVILEGE", "PRIVILEGES", "PROCEDURE",
+		"PROFILE", "PROTECTED", "PROTECTION", "PUBLIC",
+		"PURGE", "PX_GRANULE", "QUERY", "QUEUE",
+		"QUIESCE", "QUOTA", "RANDOM", "RANGE",
+		"RAPIDLY", "RAW", "RBA", "READ",
+		"READS", "REAL", "REBALANCE", "REBUILD",
+		"RECORDS_PER_BLOCK", "RECOVER", "RECOVERABLE", "RECOVERY",
+		"RECYCLE", "REDUCED", "REF", "REFERENCES",
+		"REFERENCING", "REFRESH", "REGISTER", "REJECT",
+		"RELATIONAL", "RELY", "RENAME", "REPAIR",
+		"REPLACE", "RESET", "RESETLOGS", "RESIZE",
+		"RESOLVE", "RESOLVER", "RESOURCE", "RESTRICT",
+		"RESTRICTED", "RESUMABLE", "RESUME", "RETENTION",
+		"RETURN", "RETURNING", "REUSE", "REVERSE",
+		"REVOKE", "REWRITE", "RIGHT", "ROLE",
+		"ROLES", "ROLLBACK", "ROLLUP", "ROW",
+		"ROWID", "ROWNUM", "ROWS", "RULE",
+		"SAMPLE", "SAVEPOINT", "SB4", "SCAN",
+		"SCAN_INSTANCES", "SCHEMA", "SCN", "SCOPE",
+		"SD_ALL", "SD_INHIBIT", "SD_SHOW", "SECOND",
+		"SECURITY", "SEGMENT", "SEG_BLOCK", "SEG_FILE",
+		"SELECT", "SELECTIVITY", "SEQUENCE", "SEQUENCED",
+		"SERIALIZABLE", "SERVERERROR", "SESSION", "SESSION_CACHED_CURSORS",
+		"SESSIONS_PER_USER", "SESSIONTIMEZONE", "SESSIONTZNAME", "SET",
+		"SETS", "SETTINGS", "SHARE", "SHARED",
+		"SHARED_POOL", "SHRINK", "SHUTDOWN", "SIBLINGS",
+		"SID", "SINGLE", "SINGLETASK", "SIMPLE",
+		"SIZE", "SKIP", "SKIP_UNUSABLE_INDEXES", "SMALLINT",
+		"SNAPSHOT", "SOME", "SORT", "SOURCE",
+		"SPACE", "SPECIFICATION", "SPFILE", "SPLIT",
+		"SQL_TRACE", "STANDBY", "START", "STARTUP",
+		"STATEMENT_ID", "STATISTICS", "STATIC", "STOP",
+		"STORAGE", "STORE", "STRIPE", "STRICT",
+		"STRUCTURE", "SUBPARTITION", "SUBPARTITIONS", "SUBPARTITION_REL",
+		"SUBSTITUTABLE", "SUCCESSFUL", "SUMMARY", "SUSPEND",
+		"SUPPLEMENTAL", "SWITCH", "SWITCHOVER", "SYS_OP_BITVEC",
+		"SYS_OP_COL_PRESENT", "SYS_OP_CAST", "SYS_OP_ENFORCE_NOT_NULL$", "SYS_OP_MINE_VALUE",
+		"SYS_OP_NOEXPAND", "SYS_OP_NTCIMG$", "SYNONYM", "SYSDATE",
+		"SYSDBA", "SYSOPER", "SYSTEM", "SYSTIMESTAMP",
+		"TABLE", "TABLES", "TABLESPACE", "TABLESPACE_NO",
+		"TABNO", "TEMPFILE", "TEMPLATE", "TEMPORARY",
+		"TEST", "THAN", "THE", "THEN",
+		"THREAD", "THROUGH", "TIMESTAMP", "TIME",
+		"TIMEOUT", "TIMEZONE_ABBR", "TIMEZONE_HOUR", "TIMEZONE_MINUTE",
+		"TIMEZONE_REGION", "TIME_ZONE", "TO", "TOPLEVEL",
+		"TRACE", "TRACING", "TRAILING", "TRANSACTION",
+		"TRANSITIONAL", "TREAT", "TRIGGER", "TRIGGERS",
+		"TRUE", "TRUNCATE", "TX", "TYPE",
+		"TYPES", "TZ_OFFSET", "UB2", "UBA",
+		"UID", "UNARCHIVED", "UNBOUND", "UNBOUNDED",
+		"UNDER", "UNDO", "UNDROP", "UNIFORM",
+		"UNION", "UNIQUE", "UNLIMITED", "UNLOCK",
+		"UNPACKED", "UNPROTECTED", "UNQUIESCE", "UNRECOVERABLE",
+		"UNTIL", "UNUSABLE", "UNUSED", "UPD_INDEXES",
+		"UPD_JOININDEX", "UPDATABLE", "UPDATE", "UPGRADE",
+		"UROWID", "USAGE", "USE", "USE_PRIVATE_OUTLINES",
+		"USE_STORED_OUTLINES", "USER", "USER_DEFINED", "USING",
+		"VALIDATE", "VALIDATION", "VALUE", "VALUES",
+		"VARCHAR", "VARCHAR2", "VARRAY", "VARYING",
+		"VERSION", "VIEW", "WAIT", "WHEN",
+		"WHENEVER", "WHERE", "WITH", "WITHIN",
+		"WITHOUT", "WORK", "WRITE", "XMLATTRIBUTES",
+		"XMLCOLATTVAL", "XMLELEMENT", "XMLFOREST", "XMLTYPE",
+		"XMLSCHEMA", "XID", "YEAR", "ZONE"
+	};
+	Vector<String> out;
+	out.SetCount(__countof(rwlist));
+	for(int i = 0; i < __countof(rwlist); i++)
+		out[i] = rwlist[i];
+	return out;
+}
+
+Sql::ERRORCLASS OciErrorClass(int errcode)
+{
+	return errcode == 3111 || errcode == 3113 || errcode == 3114 ? Sql::CONNECTION_BROKEN
+	: Sql::ERROR_UNSPECIFIED;
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/Oracle/OraCommon.h b/uppsrc/Oracle/OraCommon.h
new file mode 100644
index 000000000..e2362b8b4
--- /dev/null
+++ b/uppsrc/Oracle/OraCommon.h
@@ -0,0 +1,87 @@
+#ifndef ORACOMMON_H
+#define ORACOMMON_H
+
+class OciSqlConnection;
+
+
+NAMESPACE_UPP
+
+Date        OciDecodeDate(const byte data[7]);
+bool        OciEncodeDate(byte data[7], Date d);
+Time        OciDecodeTime(const byte data[7]);
+bool        OciEncodeTime(byte data[7], Time t);
+
+const char *OciParseString(const char *s);
+String      OciParseStringError(const char *s);
+String      OciParseRefError(const char *s);
+
+int         OciParse(const char *statement, String& out, OciSqlConnection *conn, SqlSession *session);
+Sql::ERRORCLASS OciErrorClass(int errcode);
+
+class SqlSequence : public ValueGen {
+	SqlId       ssq;
+	SqlId&      seq;
+	SqlSession *session;
+
+public:
+	virtual Value  Get();
+
+	Value operator++()                                                  { return Get(); }
+
+	void Set(SqlId id, SqlSession& s)                                   { ssq = id; session = &s; }
+
+#ifndef NOAPPSQL
+	void Set(SqlId id)                                                  { ssq = id; session = NULL; }
+	SqlSequence(const char *name) : ssq(name), seq(ssq)                 { session = NULL; }
+	SqlSequence(SqlId& seq) : seq(seq)                                  { session = NULL; }
+#endif
+	SqlSequence(const char *name, SqlSession& s) : ssq(name), seq(ssq)  { session = &s; }
+	SqlSequence(SqlId& seq, SqlSession& s) : seq(seq)                   { session = &s; }
+	SqlSequence() : seq(ssq)                                            { session = NULL; }
+};
+
+#ifndef NOAPPSQL
+bool OraclePerformScript(const String& text, StatementExecutor& se = SQLStatementExecutor(), Gate2<int, int> progress_canceled = false);
+#else
+bool OraclePerformScript(const String& text, StatementExecutor& se, Gate2<int, int> progress_canceled = false);
+#endif
+
+Vector<String> OracleSchemaUsers(Sql& cursor);
+Vector<String> OracleSchemaTables(Sql& cursor, String database);
+Vector<String> OracleSchemaViews(Sql& cursor, String database);
+Vector<String> OracleSchemaSequences(Sql& cursor, String database);
+Vector<String> OracleSchemaPrimaryKey(Sql& cursor, String database, String table);
+String         OracleSchemaRowID(Sql& cursor, String database, String table);
+Vector<String> OracleSchemaReservedWords();
+
+const int ORA_BLOB_V = -1;
+const int ORA_CLOB_V = -2;
+
+class OracleRef {
+public:
+	OracleRef(int ora_vtype = VOID_V) : ora_vtype(ora_vtype) {}
+	OracleRef(const Value& v) : ora_vtype(IsValue(v) ? ValueTo<OracleRef>(v).ora_vtype : VOID_V) {}
+
+	operator    Value () const                { return RawToValue(*this); }
+	static bool IsValue(const Value& v)       { return IsTypeRaw<OracleRef>(v); }
+
+	const char *Parse(const char *stmt);
+	int         GetType() const               { return ora_vtype; }
+
+	int         GetOraType() const;
+	int         GetMaxLen() const;
+
+private:
+	int         ora_vtype;
+};
+
+class OciSqlConnection : public SqlConnection {
+	friend int OciParse(const char *statement, String& out, OciSqlConnection *conn, SqlSession *session);
+
+protected:
+	virtual void SetParam(int i, OracleRef ref) = 0;
+};
+
+END_UPP_NAMESPACE
+
+#endif//ORACOMMON_H
diff --git a/uppsrc/Oracle/Oracle.t b/uppsrc/Oracle/Oracle.t
new file mode 100644
index 000000000..cb79710d4
--- /dev/null
+++ b/uppsrc/Oracle/Oracle.t
@@ -0,0 +1,162 @@
+#ifdef _MSC_VER
+#pragma setlocale("C")
+#endif
+// Oci7.cpp
+
+T_("Error loading OCI7 Oracle database client library.")
+csCZ("Nelze nalézt dynamickou knihovnu OCI7 pro spojení s Oracle")
+deDE("Fehler beim Laden der OCI7 Client Bibliothek.")
+esES("")
+fiFI("Virhe ladattaessa OCI7 Oracle tietokanta-asiakas kirjastoa.")
+huHU("Hiba az OCI7 Oracle database client library betöltése közben.")
+roRO("Eroare la încărcare bibliotecii client bază de date OCI7")
+ruRU("")
+trTR("Hata: OCI7 Oracle veritabanı istemci kütüphanesi (Oracle database client "
+     "library) yüklenemedi.")
+
+T_("Connecting to server")
+csCZ("Navazuji spojení")
+deDE("Verbindungsaufbau mit Server")
+esES("")
+fiFI("Yhdistää palvelimeen")
+huHU("Kapcsolódás a szerverhez")
+roRO("Se onectează la server")
+ruRU("Подключение к серверу")
+trTR("Sunucuya bağlanıyor")
+
+T_("Connecting to database server")
+csCZ("Spojuji s databází")
+deDE("Verbindsaufbau mit Datenbank Server")
+esES("")
+fiFI("Yhdistää tietokantapalvelimeen")
+huHU("Kapcsolódás az adatbázis-szerverhez")
+roRO("Se conectează la server bază de date")
+ruRU("Подключение к SQL серверу")
+trTR("Veritabanı sunucusuna bağlanıyor")
+
+
+// Oci8.cpp
+
+T_("Error running OCI8 Oracle connection dynamic library.")
+csCZ("Nelze spustit dynamickou knihovnu OCI8 pro připojení k databázi Oracle.")
+deDE("Fehler bei der Ausführung der dynamischen OCI8 Oracle Verbindungsbibliothek.")
+esES("")
+fiFI("Virhe käytettäessä dynaamista OCI8 Oracle yhteyskirjastoa.")
+huHU("Hiba az OCI8 Oracle connection dynamic library futtatása közben.")
+roRO("Eroare la rularea bibliotecii dinamice de conectare la OCI8")
+ruRU("")
+trTR("Hata: OCI8 Oracle connection dynamic library'sinin calıştırılması "
+     "sırasında bir hata meydana geldi.")
+
+T_("Unknown error.")
+csCZ("Neznámá chyba.")
+deDE("Unbekannter Fehler.")
+esES("")
+fiFI("Tuntematon virhe.")
+huHU("Ismeretlen hiba.")
+roRO("Eroare necunoscută.")
+ruRU("Неизвестная ошибка")
+trTR("Bilinmeyen hata.")
+
+T_("(unknown error)")
+csCZ("(neznámá chyba)")
+deDE("(Unbekannter Fehler)")
+esES("")
+fiFI("(tuntematon virhe)")
+huHU("(ismeretlen hiba)")
+roRO("(eroare necunoscută)")
+ruRU("(неизвестная ошибка)")
+trTR("(bilinmeyen hata)")
+
+T_("<not supplied>")
+csCZ("<není zadáno>")
+deDE("<nicht geliefert>")
+esES("")
+fiFI("<ei ole annettu>")
+huHU("<nincs megadva>")
+roRO("<nu a fost specificat>")
+ruRU("<не поддерживается>")
+trTR("<sağlanmamış>")
+
+T_("Error initializing connection")
+csCZ("Chyba při navazování spojení")
+deDE("Fehler beim Verbindungsaufbau")
+esES("")
+fiFI("Virhe yhteyden alustamisessa")
+huHU("Hiba a kapcsolat inicializálása közben")
+roRO("Eroare la inițializarea conexiunii")
+ruRU("Ошибка запуска соединения")
+trTR("Bağlantı hatası")
+
+T_("OCI8 connection")
+csCZ("Spojení OCI8")
+deDE("OCI8 Verbindung")
+esES("")
+fiFI("OCI8 yhteys")
+huHU("OCI8 kapcsolat")
+roRO("Conexiune OCI8")
+ruRU("")
+trTR("OCI8 bağlantısı")
+
+T_("Closing reference cursor")
+csCZ("Zavírám referenční kurzor")
+deDE("")
+esES("")
+fiFI("Suljetaan referenssikursoria")
+huHU("Referencia-kurzor lezárása")
+roRO("Se închide cursorul de referință")
+ruRU("Закрыть курсор связи")
+trTR("Closing reference cursor")
+
+T_("Error initializing OCI8 library (%s)")
+csCZ("Chyba při inicializaci OCI8")
+deDE("Fehler beim Initialisieren der OCI8 Bibliothek (%s)")
+esES("")
+fiFI("Virhe alustettaessa OCI8 kirjastoa (%s)")
+huHU("Hiba az OCI8 library inicializálása közben (%s)")
+roRO("Eroare la inițializarea bibliotecii OCI8 (%s)")
+ruRU("")
+trTR("")
+
+T_("Connecting to Oracle database.")
+csCZ("Připojování k databázi Oracle")
+deDE("Verbindungsaufbau mit Oracle Datenbank.")
+esES("")
+fiFI("Muodostaa yhteyttä Oracle tietokantaan")
+huHU("Kapcsolódás Oracle adatbázishoz.")
+roRO("Conectare la baza de date Oracle")
+ruRU("Подключение к базе данных Oracle")
+trTR("Oracle veritabanına bağlanılıyor...")
+
+T_("Error loading OCI8 Oracle connection dynamic library.")
+csCZ("Nelze nalézt dynamickou knihovnu OCI8 pro spojení s Oracle")
+deDE("Fehler beim Laden der dynamischen OCI8 Oracle Verbindungsbibliothek.")
+esES("")
+fiFI("Virhe ladattaessa dynaamista OCI8 Oracle yhteyskirjastoa.")
+huHU("Hiba az OCI8 Oracle connection dynamic library betöltésekor.")
+roRO("Eroare la încărcare bibliotecii client bază de date OCI8")
+ruRU("")
+trTR("")
+
+T_("Connecting to server '%s'")
+csCZ("Připojování k serveru '%s'")
+deDE("Verbindungsaufbau mit Server '%s'")
+esES("")
+fiFI("Muodostaa yhteyttä palvelimeen '%s'")
+huHU("Kapcsolódás a következő szerverhez: '%s'")
+roRO("Conectare la server '%s'")
+ruRU("Подключение к серверу %s")
+trTR("%s sunucusuna bağlanılıyor.")
+
+
+// Obsolete
+
+T_("Error initializing OCI8 library.")
+csCZ("Chyba při inicializaci knihovny OCI8")
+deDE("Fehler bei der Initialisierung der OCI8 Bibliothek.")
+esES("")
+fiFI("Virhe alustettaessa OCI8 kirjastoa")
+huHU("Hiba az OCI8 library inicializálásakor.")
+roRO("Eroare la inițializarea bibliotecii OCI8")
+ruRU("")
+trTR("OCI8 kütüphanesinin başlatılması sırasında bir hata meytdana geldi.")
diff --git a/uppsrc/Oracle/Oracle.upp b/uppsrc/Oracle/Oracle.upp
new file mode 100644
index 000000000..df9e313fe
--- /dev/null
+++ b/uppsrc/Oracle/Oracle.upp
@@ -0,0 +1,30 @@
+description "Oracle interface";
+
+uses
+	Sql;
+
+link(SOLARIS SPARC) "-Wl,-R -Wl,/usr/local/bin";
+
+file
+	OciCommon.h,
+	Oracle.t charset "UTF-8",
+	Oracle_init.icpp,
+	OracleSchema.h,
+	OraCommon.h,
+	OraCommon.cpp,
+	Oracle7.h,
+	Oci7.cpp,
+	Oci7.dli,
+	Oracle8.h,
+	Oci8.cpp,
+	Oci8.dli,
+	contest.cpp,
+	Info readonly separator,
+	COPYING,
+	COPYING-PLAIN,
+	AUTHORS;
+
+mainconfig
+	"Console Test" = "",
+	"Console Test (remote)" = "",
+	"Console Test Remote Shared" = "SHARED";
diff --git a/uppsrc/Oracle/Oracle7.h b/uppsrc/Oracle/Oracle7.h
new file mode 100644
index 000000000..03f15e384
--- /dev/null
+++ b/uppsrc/Oracle/Oracle7.h
@@ -0,0 +1,84 @@
+#ifndef ORACLE7_H
+#define ORACLE7_H
+
+#include <Sql/Sql.h>
+#include "OraCommon.h"
+#include "OciCommon.h"
+
+NAMESPACE_UPP
+
+#define DLLFILENAME "ociw32.dll"
+#define DLIMODULE   OCI7
+#define DLIHEADER   <Oracle/Oci7.dli>
+#include <Core/dli_header.h>
+
+class OCI7Connection;
+
+void OCI7SetDllPath(String oci7_path, T_OCI7& oci7 = OCI7_());
+
+class Oracle7 : public SqlSession {
+public:
+	virtual void                  Begin();
+	virtual void                  Commit();
+	virtual void                  Rollback();
+
+	virtual String                Savepoint();
+	virtual void                  RollbackTo(const String& savepoint);
+
+	virtual bool                  IsOpen() const;
+
+	virtual RunScript             GetRunScript() const          { return &OraclePerformScript; }
+
+	virtual Vector<String>        EnumUsers();
+	virtual Vector<String>        EnumDatabases();
+	virtual Vector<String>        EnumTables(String database);
+	virtual Vector<String>        EnumViews(String database);
+	virtual Vector<String>        EnumSequences(String database);
+	virtual Vector<String>        EnumPrimaryKey(String database, String table);
+	virtual String                EnumRowID(String database, String table);
+	virtual Vector<String>        EnumReservedWords();
+
+public:
+	T_OCI7&                       oci7;
+
+protected:
+	virtual SqlConnection        *CreateConnection();
+
+protected:
+	friend class OCI7Connection;
+
+	Link<OCI7Connection> clink;
+	bool                 connected;
+	byte                 lda[256];
+	byte                 hda[512];
+	String               user;
+	int                  level;
+	bool                 autocommit;
+	int                  tmode;
+
+	String         Spn();
+	void           SetSp();
+	String         GetErrorMsg(int code) const;
+	void           PreExec();
+	void           PostExec();
+
+public:
+	bool Open(const String& s);
+	void Close();
+
+	enum TransactionMode {
+		NORMAL,              // autocommit at level 0, no Commit or Rollback allowed at level 0
+		ORACLE               // Oracle-style Commit and Rollback at level 0
+	};
+
+	void    SetTransactionMode(int mode)            { tmode = mode; }
+
+	Oracle7(T_OCI7& oci7 = OCI7_());
+	~Oracle7();
+};
+
+typedef Oracle7 OracleSession;
+
+END_UPP_NAMESPACE
+
+#endif
diff --git a/uppsrc/Oracle/Oracle8.h b/uppsrc/Oracle/Oracle8.h
new file mode 100644
index 000000000..0a75095a4
--- /dev/null
+++ b/uppsrc/Oracle/Oracle8.h
@@ -0,0 +1,137 @@
+#ifndef ORACLE8_H
+#define ORACLE8_H
+
+#include <Sql/Sql.h>
+#include "OraCommon.h"
+#include "OciCommon.h"
+
+NAMESPACE_UPP
+
+#if defined(PLATFORM_WIN32) && defined(COMPILER_MSC)
+#define __STDC__ 1
+#endif
+
+// selected definitions from OCI 8 headers
+struct OCIEnv;
+struct OCIServer;
+struct OCISession;
+struct OCISvcCtx;
+struct OCIError;
+struct OCILobLocator;
+
+#define DLLFILENAME "oci.dll"
+#define DLIMODULE   OCI8
+#define DLIHEADER   <Oracle/Oci8.dli>
+#include <Core/dli_header.h>
+
+void OCI8SetDllPath(String oci8_path, T_OCI8& oci8 = OCI8_());
+
+//#define dword _dword
+//#include <oci.h>
+//#undef dword
+
+class OCI8Connection;
+
+class Oracle8 : public SqlSession {
+public:
+	virtual void                  Begin();
+	virtual void                  Commit();
+	virtual void                  Rollback();
+
+	virtual String                Savepoint();
+	virtual void                  RollbackTo(const String& savepoint);
+
+	virtual bool                  IsOpen() const;
+
+	virtual RunScript             GetRunScript() const          { return &OraclePerformScript; }
+
+	virtual Vector<String>        EnumUsers();
+	virtual Vector<String>        EnumDatabases();
+	virtual Vector<String>        EnumTables(String database);
+	virtual Vector<String>        EnumViews(String database);
+	virtual Vector<String>        EnumSequences(String database);
+	virtual Vector<String>        EnumPrimaryKey(String database, String table);
+	virtual String                EnumRowID(String database, String table);
+	virtual Vector<String>        EnumReservedWords();
+
+public:
+	T_OCI8&              oci8;
+
+protected:
+	virtual SqlConnection *CreateConnection();
+
+private:
+	bool                   AllocOciHandle(void *hp, int type);
+	void                   FreeOciHandle(void *hp, int type);
+	void                   SetOciError(String text, OCIError *errhp);
+
+private:
+	friend class OCI8Connection;
+	friend class OracleBlob;
+
+	OCIEnv              *envhp;
+	OCIError            *errhp;
+	OCIServer           *srvhp;
+	OCISession          *seshp;
+	OCISvcCtx           *svchp;
+	Link<OCI8Connection> clink;
+	bool                 in_server;
+	bool                 in_session;
+	String               user;
+	int                  level;
+	int                  tmode;
+
+	String         Spn();
+	void           PostError();
+	bool           StdMode()   { return  tmode == NORMAL; }
+
+public:
+	bool Login(const char *name, const char *password, const char *connect, bool use_objects, String *warn = NULL);
+	bool Open(const String& connect_string, bool use_objects, String *warn = NULL);
+	void Logoff();
+
+	enum TransactionMode {
+		NORMAL,              // autocommit at level 0, no Commit or Rollback allowed at level 0
+		ORACLE               // Oracle-style Commit and Rollback at level 0
+	};
+
+	void    SetTransactionMode(int mode)            { tmode = mode; }
+	Oracle8(T_OCI8& oci8 = OCI8_());
+	~Oracle8();
+};
+
+class OracleBlob : public BlockStream {
+protected:
+	virtual  void  SetStreamSize(int64 size);
+	virtual  dword Read(int64 at, void *ptr, dword size);
+	virtual  void  Write(int64 at, const void *data, dword size);
+
+public:
+	virtual  bool  IsOpen() const;
+	virtual  void  Close();
+
+protected:
+	OCILobLocator   *locp;
+	Oracle8         *session;
+
+	void      Init(dword size);
+
+public:
+	operator  bool() const                 { return IsOpen(); }
+
+	void      Assign(const Sql& sql, int blob);
+	void      Assign(Oracle8& session, int blob);
+
+	OracleBlob();
+	OracleBlob(const Sql& sql, int blob);
+	OracleBlob(Oracle8& session, int blob);
+	~OracleBlob();
+};
+
+#ifdef text
+#undef text
+#endif
+
+END_UPP_NAMESPACE
+
+#endif
diff --git a/uppsrc/Oracle/OracleSchema.h b/uppsrc/Oracle/OracleSchema.h
new file mode 100644
index 000000000..370e94b3d
--- /dev/null
+++ b/uppsrc/Oracle/OracleSchema.h
@@ -0,0 +1,143 @@
+#define INT(x)                     COLUMN("number", int, x, 0, 0)
+#define INT_ARRAY(x, items)        COLUMN_ARRAY("number", int, x, 0, 0, items)
+#define INT_(x)                    COLUMN_("number", int, x, 0, 0)
+#define INT_ARRAY_(x, items)       COLUMN_ARRAY("number", int, x, 0, 0, items)
+
+#define DOUBLE(x)                  COLUMN("number", double, x, 0, 0)
+#define DOUBLE_ARRAY(x, items)     COLUMN_ARRAY(number, double, x, 0, 0, items)
+#define DOUBLE_(x)                 COLUMN_("number", double, x, 0, 0)
+#define DOUBLE_ARRAY_(x, items)    COLUMN_ARRAY_("number", double, x, 0, 0, items)
+
+#define STRING(x, n)               COLUMN("varchar2(" #n ")", String, x, n, 0)
+#define STRING_ARRAY(x, n, items)  COLUMN_ARRAY("varchar2(" #n ")", String, x, n, 0, items)
+#define STRING_(x, n)              COLUMN_("varchar2(" #n ")", String, x, n, 0)
+#define STRING_ARRAY_(x, n, items) COLUMN_ARRAY_("varchar2(" #n ")", String, x, n, 0, items)
+
+#define DATE(x)                    COLUMN("date", Date, x, 0, 0)
+#define DATE_ARRAY(x, items)       COLUMN_ARRAY("date", Date, x, 0, 0, items)
+#define DATE_(x)                   COLUMN_("date", Date, x, 0, 0)
+#define DATE_ARRAY_(x, items)      COLUMN_ARRAY_("date", Date, x, 0, 0, items)
+
+#define TIME(x)                    COLUMN("date", Time, x, 0, 0)
+#define TIME_ARRAY(x, items)       COLUMN_ARRAY("date", Time, x, 0, 0, items)
+#define TIME_(x)                   COLUMN_("date", Time, x, 0, 0)
+#define TIME_ARRAY_(x, items)      COLUMN_ARRAY_("date", Time, x, 0, 0, items)
+
+#define BOOL(x)                    COLUMN("varchar2(1)", bool, x, 0, 0)
+#define BOOL_ARRAY(x, items)       COLUMN_ARRAY("varchar2(1)", bool, x, 0, 0, items)
+#define BOOL_(x)                   COLUMN_("varchar2(1)", bool, x, 0, 0)
+#define BOOL_ARRAY_(x, items)      COLUMN_ARRAY_("varchar2(1)", bool, x, 0, 0, items)
+
+#define LONG(x)                    COLUMN("long", String, x, 0, 0)
+#define LONG_(x)                   COLUMN_("long", String, x, 0, 0)
+
+#define LONGRAW(x)                 COLUMN("long raw", String, x, 0, 0)
+#define LONGRAW_(x)                COLUMN_("long raw", String, x, 0, 0)
+
+#define BLOB(x)                    COLUMN("blob", String, x, 0, 0)
+#define BLOB_(x)                   COLUMN_("blob", String, x, 0, 0)
+
+#define CLOB(x)                    COLUMN("clob", String, x, 0, 0)
+#define CLOB_(x)                   COLUMN_("clob", String, x, 0, 0)
+
+#define SEQUENCE(x)                SCHEMA("create sequence " #x " start with 1;",\
+                                          "drop sequence " #x ";") \
+                                   UPGRADE("create sequence " #x " start with 1;")
+#define SEQUENCE_(x)               DOID(x) SEQUENCE(x)
+
+#define PRIMARY_KEY                INLINE_ATTRIBUTE("primary key")
+#define NOT_NULL                   INLINE_ATTRIBUTE("not null")
+#define UNIQUE                     INLINE_ATTRIBUTE("unique")
+#define SQLDEFAULT(v)              INLINE_ATTRIBUTE("default " v)
+
+#define INDEX                      ATTRIBUTE("create index IDX_@x on @t(@c);", \
+                                             "drop index IDX_@x;")
+#ifndef REFERENCES
+#define REFERENCES(x)              ATTRIBUTE("alter table @t add (constraint FK_@x foreign key "\
+                                             "(@c) references " #x ");",\
+                                             "alter table @t drop constraint FK_@x;")
+#endif
+#ifndef REFERENCES_CASCADE
+#define REFERENCES_CASCADE(x)      ATTRIBUTE("alter table @t add (constraint FK_@x foreign key "\
+                                             "(@c) references " #x " on delete cascade);",\
+                                             "alter table @t drop constraint FK_@x;")
+#endif
+#ifndef REFERENCES_
+#define REFERENCES_(n, x)          ATTRIBUTE("alter table @t add (constraint FK_@x$" #n " foreign key "\
+                                             "(@c) references " #x ");",\
+                                             "alter table @t drop constraint FK_@x$" #n ";")
+#endif
+#ifndef REFERENCES_CASCADE_
+#define REFERENCES_CASCADE_(n, x)  ATTRIBUTE("alter table @t add (constraint FK_@x$" #n " foreign key "\
+                                             "(@c) references " #x " on delete cascade);",\
+                                             "alter table @t drop constraint FK_@x$" #n ";")
+#endif
+
+#define DUAL_PRIMARY_KEY(k1, k2)   INLINE_ATTRIBUTE(", primary key (" #k1 ", " #k2 ")")
+
+#define DUAL_UNIQUE(k1, k2)        ATTRIBUTE("alter table @t add constraint DQ_@t unique "\
+                                             "(" #k1 ", " #k2 ");",\
+                                             "alter table @t drop constraint DQ_@t;")
+
+#define UNIQUE_LIST(u, l)          ATTRIBUTE("alter table @t add constraint UQ_@t$" #u " unique "\
+                                             "(" l ");",\
+                                             "alter table @t drop constraint UQ_@t$" #u ";")
+
+#define SQLCHECK(n, ct)            ATTRIBUTE("alter table @t add constraint CHK_@t$" #n " check "\
+                                             "(" ct ");",\
+                                             "alter table @t drop constraint CHK_@t$" #n ";")
+
+#include <Sql/sch_model.h>
+
+
+#undef INT
+#undef INT_ARRAY
+#undef INT_
+#undef INT_ARRAY_
+
+#undef DOUBLE
+#undef DOUBLE_ARRAY
+#undef DOUBLE_
+#undef DOUBLE_ARRAY_
+
+#undef STRING
+#undef STRING_ARRAY
+#undef STRING_
+#undef STRING_ARRAY_
+
+#undef DATE
+#undef DATE_ARRAY
+#undef DATE_
+#undef DATE_ARRAY_
+
+#undef TIME
+#undef TIME_ARRAY
+#undef TIME_
+#undef TIME_ARRAY_
+
+#undef BOOL
+#undef BOOL_ARRAY
+#undef BOOL_
+#undef BOOL_ARRAY_
+
+#undef LONG
+#undef LONG_
+
+#undef LONGRAW
+#undef LONGRAW_
+
+#undef SEQUENCE
+
+#undef PRIMARY_KEY
+#undef NOT_NULL
+#undef INDEX
+#undef UNIQUE
+#undef SQLDEFAULT
+#undef REFERENCES
+#undef REFERENCES_
+#undef REFERENCES_CASCADE
+#undef REFERENCES_CASCADE_
+#undef DUAL_PRIMARY_KEY
+#undef DUAL_UNIQUE
+#undef UNIQUE_LIST
+#undef SQLCHECK
diff --git a/uppsrc/Oracle/Oracle_init.icpp b/uppsrc/Oracle/Oracle_init.icpp
new file mode 100644
index 000000000..a10bce2ea
--- /dev/null
+++ b/uppsrc/Oracle/Oracle_init.icpp
@@ -0,0 +1,8 @@
+#include <Sql/Sql.h>
+
+NAMESPACE_UPP
+
+#define TFILE <Oracle/Oracle.t>
+#include <Core/t.h>
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/Oracle/contest.cpp b/uppsrc/Oracle/contest.cpp
new file mode 100644
index 000000000..69e9336b6
--- /dev/null
+++ b/uppsrc/Oracle/contest.cpp
@@ -0,0 +1,98 @@
+#ifdef flagMAIN
+
+#include <Oracle/Oracle8.h>
+
+using namespace Upp;
+
+void Main()
+{
+	String buffer;
+	String prompt = "?";
+	Oracle8 ora8;
+	Vector<String> cmd;
+	cmd <<= CommandLine();
+	if(!cmd.IsEmpty())
+	{
+		if(ora8.Open(cmd[0]))
+		{
+			puts("Connected.");
+			prompt = ora8.GetUser();
+		}
+		else
+		{
+			puts("Error connecting to database: " + ora8.GetLastError());
+			return;
+		}
+	}
+	for(;;)
+	{
+		fputs(prompt + '>', stdout);
+		fflush(stdout);
+		char lbuf[1000];
+		*lbuf = 0;
+		fgets(lbuf, 1000, stdin);
+		if(!*lbuf && feof(stdin))
+			return;
+		char *e = lbuf + strlen(lbuf);
+		while(e > lbuf && (byte)e[-1] <= ' ')
+			e--;
+		*e = 0;
+		if(!stricmp(lbuf, "quit") || !stricmp(lbuf, "exit") || !stricmp(lbuf, "."))
+			return;
+		buffer.Cat(lbuf, e - lbuf);
+		if(buffer.GetLength() >= 8 && !memicmp(buffer, "connect ", 8))
+		{
+			ora8.Logoff();
+			if(ora8.Open(buffer.Mid(8)))
+			{
+				prompt = ora8.GetUser();
+				puts("Connected.");
+			}
+			else
+			{
+				puts("Error connecting to database: " + ora8.GetLastError());
+				prompt = "?";
+			}
+			buffer = Null;
+			continue;
+		}
+		if(e > lbuf && e[-1] != ';')
+		{
+			puts(NFormat("Accumulated query: <%s>", buffer));
+			continue;
+		}
+		String cmd = buffer;
+		buffer = Null;
+		if(!ora8.IsOpen())
+		{
+			puts("Not connected.");
+			continue;
+		}
+		if(*cmd.Last() == ';')
+			cmd.Trim(cmd.GetLength() - 1);
+		Sql cursor(ora8);
+		if(cursor.Execute(cmd))
+		{
+			for(int c = 0; c < cursor.GetColumns(); c++)
+			{
+				SqlColumnInfo ci = cursor.GetColumnInfo(c);
+				fputs(ci.name, stdout);
+				putc(';', stdout);
+			}
+			putc('\n', stdout);
+			while(cursor.Fetch())
+			{
+				for(int c = 0; c < cursor.GetColumns(); c++)
+				{
+					fputs(SqlFormat(cursor[c]), stdout);
+					putc(';', stdout);
+				}
+				putc('\n', stdout);
+			}
+		}
+		else
+			puts(NFormat("Error executing <%s>: %s", cmd, cursor.GetLastError()));
+	}
+}
+
+#endif//flagMAIN
diff --git a/uppsrc/PaintGL/AUTHORS b/uppsrc/PaintGL/AUTHORS
new file mode 100644
index 000000000..f782e5b62
--- /dev/null
+++ b/uppsrc/PaintGL/AUTHORS
@@ -0,0 +1,2 @@
+Mirek Fidler <cxl@ntllib.org>
+Tomas Rylek  <rylek@volny.cz>
\ No newline at end of file
diff --git a/uppsrc/PaintGL/COPYING b/uppsrc/PaintGL/COPYING
new file mode 100644
index 000000000..33aa39102
--- /dev/null
+++ b/uppsrc/PaintGL/COPYING
@@ -0,0 +1,30 @@
+Copyright (C) 2005 Mirek Fidler, Tomas Rylek and various contributors (see AUTHORS)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to
+deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies of the Software and its Copyright notices. In addition publicly
+documented acknowledgment must be given that this software has been used if no
+source code of this software is made available publicly. This includes
+acknowledgments in either Copyright notices, Manuals, Publicity and Marketing
+documents or any documentation provided with any product containing this
+software. This License does not apply to any software that links to the
+libraries provided by this software (statically or dynamically), but only to
+the software provided.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+-----------
+
+Please see the COPYING.PLAIN for a plain-english explanation of this notice
+and it's intent.
diff --git a/uppsrc/PaintGL/COPYING-PLAIN b/uppsrc/PaintGL/COPYING-PLAIN
new file mode 100644
index 000000000..770a8132f
--- /dev/null
+++ b/uppsrc/PaintGL/COPYING-PLAIN
@@ -0,0 +1,33 @@
+Plain English Copyright Notice
+
+This file is not intended to be the actual License. The reason this file
+exists is that we here are programmers and engineers. We aren't lawyers. We
+provide licenses that we THINK say the right things, but we have our own
+intentions at heart. This is a plain-english explanation of what those
+intentions are, and if you follow them you will be within the "spirit" of
+the license.
+
+The intent is for us to enjoy writing software that is useful to us (the
+AUTHORS) and allow others to use it freely and also benefit from the work we
+put into making it. We don't want to restrict others using it. They should
+not *HAVE* to make the source code of the applications they write that
+simply link to these libraries (be that statically or dynamically), or for
+them to be limited as to what license they choose to use (be it open, closed
+or anything else). But we would like to know you are using these libraries.
+We simply would like to know that it has been useful to someone. This is why
+we ask for acknowledgement of some sort.
+
+You can do what you want with the source of this software - it doesn't
+matter. We still have it here for ourselves and it is open and free to use
+and download and play with. It can't be taken away. We don't really mind what
+you do with the source to your software. We would simply like to know that
+you are using it - especially if it makes it to a commerical product. If you
+simply e-mail all the AUTHORS (see COPYING and AUTHORS files) telling us, and
+then make sure you include a paragraph or page in the manual or in the "About.."
+box for the product with the copyright notice and state that you used this
+software, we will be very happy. If you want to contribute back modifications
+and fixes you may have made we will welcome those too with open arms (generally).
+If you want help with changes needed, ports needed or features to be added,
+arrangements can be easily made with some dialogue.
+
+Mirek Fidler <cxl@ntllib.org>
diff --git a/uppsrc/PaintGL/PaintGL.cpp b/uppsrc/PaintGL/PaintGL.cpp
new file mode 100644
index 000000000..37f97eb26
--- /dev/null
+++ b/uppsrc/PaintGL/PaintGL.cpp
@@ -0,0 +1,98 @@
+#include "PaintGL.h"
+
+#pragma comment( lib, "opengl32.lib" )							// Search For OpenGL32.lib While Linking
+#pragma comment( lib, "glu32.lib" )								// Search For GLu32.lib While Linking
+#pragma comment( lib, "glaux.lib" )								// Search For GLaux.lib While Linking
+
+PaintGL::PaintGL()
+{
+	size = Null;
+	hbmp = ohbmp = NULL;
+	hdc = NULL;
+	hrc = NULL;
+}
+
+PaintGL::~PaintGL()
+{
+	Free();
+}
+
+void PaintGL::Free()
+{
+	if(hrc) {
+		wglMakeCurrent(NULL, NULL);
+		wglDeleteContext(hrc);
+		SelectObject(hdc, ohbmp);
+		DeleteDC(hdc);
+		DeleteObject(hbmp);
+		hrc = NULL;
+		hbmp = ohbmp = NULL;
+		hdc = NULL;
+		hbmp = NULL;
+	}
+	size = Null;
+}
+
+
+void PaintGL::Init(Size sz) {
+	Free();
+
+	size = sz;
+
+	BITMAPINFOHEADER bih;
+	memset(&bih, 0, sizeof(bih));
+	bih.biSize = sizeof(bih);
+	bih.biWidth = ((((int) sz.cx * 8) + 31) & ~31) >> 3;
+	bih.biHeight = sz.cy;
+	bih.biPlanes = 1;
+	bih.biBitCount = 32;
+	bih.biCompression = BI_RGB;
+
+	hdc = CreateCompatibleDC(NULL);
+
+	void *dummy;
+
+	hbmp = CreateDIBSection(hdc, (BITMAPINFO*)&bih, DIB_PAL_COLORS, &dummy, NULL, 0);
+
+	ohbmp = (HBITMAP)SelectObject(hdc, hbmp);
+
+	PIXELFORMATDESCRIPTOR pfd;
+	memset(&pfd, 0, sizeof(pfd));
+	pfd.nSize = sizeof(pfd);
+	pfd.nVersion = 1;
+	pfd.dwFlags = PFD_DRAW_TO_BITMAP | PFD_SUPPORT_OPENGL/* | PFD_SUPPORT_GDI | PFD_ACCELERATED*/;
+	pfd.iPixelType = PFD_TYPE_RGBA;
+	pfd.cColorBits = 32;
+	pfd.cDepthBits = 32;
+	pfd.iLayerType = PFD_MAIN_PLANE;
+
+	GLuint PixelFormat = ChoosePixelFormat(hdc, &pfd);
+	SetPixelFormat(hdc, PixelFormat, &pfd);
+	hrc = wglCreateContext(hdc);
+	wglMakeCurrent(hdc, hrc);
+
+	glShadeModel(GL_SMOOTH);
+	glClearColor(0.0f, 0.0f, 0.0f, 0.5f);
+	glClearDepth(1.0f);
+	glEnable(GL_DEPTH_TEST);
+	glDepthFunc(GL_LEQUAL);
+	glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST);
+
+	glViewport(0, 0, (GLsizei)sz.cx, (GLsizei)sz.cy);
+	glMatrixMode(GL_PROJECTION);
+	glLoadIdentity();
+	gluPerspective(45.0f, (GLfloat)(sz.cx)/(GLfloat)(sz.cy), 1.0f, 100.0f);
+	glMatrixMode(GL_MODELVIEW);
+	glLoadIdentity();
+}
+
+void PaintGL::Paint(Draw& w, const Rect& r, Callback gl)
+{
+	if(r.Size() != size)
+		Init(r.Size());
+	gl();
+	glFlush();
+	HDC whdc = w.BeginGdi();
+	BitBlt(whdc, 0, 0, size.cx, size.cy, hdc, r.left, r.top, SRCCOPY);
+	w.EndGdi();
+}
diff --git a/uppsrc/PaintGL/PaintGL.h b/uppsrc/PaintGL/PaintGL.h
new file mode 100644
index 000000000..81246f6ce
--- /dev/null
+++ b/uppsrc/PaintGL/PaintGL.h
@@ -0,0 +1,27 @@
+#ifndef _PaintGL_PaintGL_h
+#define _PaintGL_PaintGL_h
+
+#include <Draw/Draw.h>
+
+#include <gl\gl.h>
+#include <gl\glu.h>
+#include <gl\glaux.h>
+
+class PaintGL {
+	Size    size;
+	HBITMAP hbmp, ohbmp;
+	HDC     hdc;
+	HGLRC   hrc;
+
+	void Free();
+	void Init(Size sz);
+
+public:
+	void Paint(Draw& w, const Rect& r, Callback gl);
+
+	PaintGL();
+	~PaintGL();
+};
+
+
+#endif
diff --git a/uppsrc/PaintGL/PaintGL.upp b/uppsrc/PaintGL/PaintGL.upp
new file mode 100644
index 000000000..8947d6bd0
--- /dev/null
+++ b/uppsrc/PaintGL/PaintGL.upp
@@ -0,0 +1,7 @@
+file
+	PaintGL.h,
+	PaintGL.cpp,
+	Info readonly separator,
+	COPYING,
+	COPYING-PLAIN,
+	AUTHORS;
diff --git a/uppsrc/PdfDraw/AUTHORS b/uppsrc/PdfDraw/AUTHORS
new file mode 100644
index 000000000..f782e5b62
--- /dev/null
+++ b/uppsrc/PdfDraw/AUTHORS
@@ -0,0 +1,2 @@
+Mirek Fidler <cxl@ntllib.org>
+Tomas Rylek  <rylek@volny.cz>
\ No newline at end of file
diff --git a/uppsrc/PdfDraw/COPYING b/uppsrc/PdfDraw/COPYING
new file mode 100644
index 000000000..33aa39102
--- /dev/null
+++ b/uppsrc/PdfDraw/COPYING
@@ -0,0 +1,30 @@
+Copyright (C) 2005 Mirek Fidler, Tomas Rylek and various contributors (see AUTHORS)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to
+deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies of the Software and its Copyright notices. In addition publicly
+documented acknowledgment must be given that this software has been used if no
+source code of this software is made available publicly. This includes
+acknowledgments in either Copyright notices, Manuals, Publicity and Marketing
+documents or any documentation provided with any product containing this
+software. This License does not apply to any software that links to the
+libraries provided by this software (statically or dynamically), but only to
+the software provided.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+-----------
+
+Please see the COPYING.PLAIN for a plain-english explanation of this notice
+and it's intent.
diff --git a/uppsrc/PdfDraw/COPYING-PLAIN b/uppsrc/PdfDraw/COPYING-PLAIN
new file mode 100644
index 000000000..770a8132f
--- /dev/null
+++ b/uppsrc/PdfDraw/COPYING-PLAIN
@@ -0,0 +1,33 @@
+Plain English Copyright Notice
+
+This file is not intended to be the actual License. The reason this file
+exists is that we here are programmers and engineers. We aren't lawyers. We
+provide licenses that we THINK say the right things, but we have our own
+intentions at heart. This is a plain-english explanation of what those
+intentions are, and if you follow them you will be within the "spirit" of
+the license.
+
+The intent is for us to enjoy writing software that is useful to us (the
+AUTHORS) and allow others to use it freely and also benefit from the work we
+put into making it. We don't want to restrict others using it. They should
+not *HAVE* to make the source code of the applications they write that
+simply link to these libraries (be that statically or dynamically), or for
+them to be limited as to what license they choose to use (be it open, closed
+or anything else). But we would like to know you are using these libraries.
+We simply would like to know that it has been useful to someone. This is why
+we ask for acknowledgement of some sort.
+
+You can do what you want with the source of this software - it doesn't
+matter. We still have it here for ourselves and it is open and free to use
+and download and play with. It can't be taken away. We don't really mind what
+you do with the source to your software. We would simply like to know that
+you are using it - especially if it makes it to a commerical product. If you
+simply e-mail all the AUTHORS (see COPYING and AUTHORS files) telling us, and
+then make sure you include a paragraph or page in the manual or in the "About.."
+box for the product with the copyright notice and state that you used this
+software, we will be very happy. If you want to contribute back modifications
+and fixes you may have made we will welcome those too with open arms (generally).
+If you want help with changes needed, ports needed or features to be added,
+arrangements can be easily made with some dialogue.
+
+Mirek Fidler <cxl@ntllib.org>
diff --git a/uppsrc/PdfDraw/PdfDraw.cpp b/uppsrc/PdfDraw/PdfDraw.cpp
new file mode 100644
index 000000000..bf6933c13
--- /dev/null
+++ b/uppsrc/PdfDraw/PdfDraw.cpp
@@ -0,0 +1,861 @@
+#include "PdfDraw.h"
+
+NAMESPACE_UPP
+
+#define LDUMP(x) // DUMP(x)
+
+#define PDF_COMPRESS
+#define USE_TTF
+
+void PdfDraw::Init(int pagecx, int pagecy, int _margin)
+{
+	Clear();
+	margin = _margin;
+	pgsz.cx = pagecx;
+	pgsz.cy = pagecy;
+	pageMMs = iscale(pgsz, 254, 6000);
+	inchPixels = Size(600, 600);
+	pagePixels = pgsz;
+	pgsz += margin;
+	sheetPixels = pgsz;
+	pageOffset = Point(0, 0);
+	pixels = false;
+	actual_offset = Point(0, 0);
+	actual_clip = Rect(pgsz);
+}
+
+void  PdfDraw::Clear()
+{
+	out.Clear();
+	page.Clear();
+	offset.Clear();
+	out << "%PDF-1.3\n";
+	out << "%\xf1\xf2\xf3\xf4\n\n";
+}
+
+int PdfDraw::BeginObj()
+{
+	offset.Add(out.GetLength());
+	out << offset.GetCount() << " 0 obj\n";
+	return offset.GetCount();
+}
+
+void PdfDraw::EndObj()
+{
+	out << "endobj\n\n";
+}
+
+void PdfDraw::PutRect(const Rect& rc)
+{
+	page << Pt(rc.left) << ' ' << Pt(pgsz.cy - rc.bottom) << ' '
+		<< Pt(rc.Width()) << ' ' << Pt(rc.Height()) << " re\n";
+}
+
+int PdfDraw::PutStream(const String& data, const String& keys)
+{
+#ifdef PDF_COMPRESS
+	String c = ZCompress(data);
+	if(c.GetLength() < data.GetLength()) {
+		BeginObj();
+		out << "<< " << keys
+		    << "/Length " << c.GetLength() << " "
+		    << "/Length1 " << data.GetLength() << " "
+		    << "/Filter /FlateDecode "
+		    << " >>\n"
+		    << "stream\r\n" << c << "\r\nendstream\n";
+		EndObj();
+		return offset.GetCount();
+	}
+#endif
+	BeginObj();
+	out << "<< " << keys << " /Length " << data.GetLength() <<
+	       " /Length1 "<< data.GetLength() << " >>\n"
+	    << "stream\r\n" << data << "\r\nendstream\n";
+	EndObj();
+	return offset.GetCount();
+}
+
+void PdfDraw::PutrgColor(Color rg)
+{
+	if(IsNull(rgcolor) || rg != rgcolor)
+		page << PdfColor(rgcolor = rg) << " rg\n";
+}
+
+void PdfDraw::PutRGColor(Color RG)
+{
+	if(IsNull(RGcolor) || RG != RGcolor)
+		page << PdfColor(RGcolor = RG) << " RG\n";
+}
+
+void PdfDraw::PutLineWidth(int lw)
+{
+	lw = max(Nvl(lw, 0), 5);
+	if(linewidth != lw)
+		page << Pt(linewidth = lw) << " w\n";
+}
+
+void PdfDraw::StartPage()
+{
+	offstack.Clear();
+	clipstack.Clear();
+	actual_offset = Point(0, 0);
+	actual_clip = Rect(pgsz);
+	rgcolor = RGcolor = Null;
+	fontid = -1;
+	textht = Null;
+	linewidth = -1;
+	if(margin)
+		OffsetOp(Point(margin, margin));
+}
+
+void PdfDraw::EndPage()
+{
+	if(margin)
+		EndOp();
+	ASSERT(offstack.IsEmpty());
+	PutStream(page);
+	page.Clear();
+}
+
+void PdfDraw::BeginOp()
+{
+	offstack.Add(actual_offset);
+	clipstack.Add(actual_clip);
+	page << "q\n";
+}
+
+void PdfDraw::EndOp()
+{
+	fontid = -1;
+	textht = Null;
+	rgcolor = RGcolor = Null;
+	linewidth = -1;
+	page << "Q\n";
+	if(offstack.GetCount()) {
+		actual_offset = offstack.Pop();
+		actual_clip = clipstack.Pop();
+	}
+	else { NEVER(); }
+}
+
+void PdfDraw::OffsetOp(Point p)
+{
+	offstack.Add(actual_offset);
+	clipstack.Add(actual_clip);
+	page << "q\n";
+	if(p.x || p.y) {
+		page << "1 0 0 1 " << Pt(p.x) << ' ' << Pt(-p.y) << " cm\n";
+		actual_offset += p;
+		actual_clip -= p;
+	}
+}
+
+bool PdfDraw::ClipOp(const Rect& r)
+{
+	offstack.Add(actual_offset);
+	clipstack.Add(actual_clip);
+	page << "q ";
+	PutRect(r);
+	page << "W* n\n";
+	actual_clip &= r;
+	return !actual_clip.IsEmpty();
+}
+
+bool PdfDraw::ClipoffOp(const Rect& r)
+{
+	offstack.Add(actual_offset);
+	clipstack.Add(actual_clip);
+	actual_offset += r.TopLeft();
+	actual_clip &= r;
+	page << "q ";
+	PutRect(actual_clip);
+	actual_clip -= r.TopLeft();
+	page << "W* n\n";
+	if(r.left || r.top)
+		page << "1 0 0 1 " << Pt(r.left) << ' ' << Pt(-r.top) << " cm\n";
+	return !actual_clip.IsEmpty();
+}
+
+bool PdfDraw::ExcludeClipOp(const Rect& r)
+{
+	if(r.left <= actual_clip.left && r.right >= actual_clip.right) {
+		if(r.top <= actual_clip.top) actual_clip.top = max(actual_clip.top, r.bottom);
+		if(r.bottom >= actual_clip.bottom) actual_clip.bottom = min(actual_clip.bottom, r.top);
+	}
+	if(r.top <= actual_clip.top && r.bottom >= actual_clip.bottom) {
+		if(r.left <= actual_clip.left) actual_clip.left = max(actual_clip.left, r.right);
+		if(r.right >= actual_clip.right) actual_clip.right = min(actual_clip.right, r.left);
+	}
+
+	PutRect(actual_clip);
+	PutRect(r & actual_clip);
+	page << "W* n\n";
+	return !actual_clip.IsEmpty();
+}
+
+bool PdfDraw::IntersectClipOp(const Rect& r)
+{
+	PutRect(r);
+	page << "W* n\n";
+	actual_clip &= r;
+	return !actual_clip.IsEmpty();
+}
+
+Rect PdfDraw::GetClipOp() const
+{
+	return actual_clip;
+}
+
+bool PdfDraw::IsPaintingOp(const Rect&) const
+{
+	return true;
+}
+
+PdfDraw::CharPos PdfDraw::GetCharPos(Font fnt, wchar chr)
+{
+	fnt.Underline(false);
+	VectorMap<wchar, CharPos>& fc = fontchars.GetAdd(fnt);
+	int q = fc.Find(chr);
+	if(q >= 0)
+		return fc[q];
+	CharPos& p = fc.Add(chr);
+	q = pdffont.FindLast(fnt);
+	if(q < 0 || pdffont[q].GetCount() > 250) {
+		p.fi = pdffont.GetCount();
+		p.ci = 0;
+		pdffont.Add(fnt).Add(chr);
+	}
+	else {
+		p.fi = q;
+		p.ci = pdffont[q].GetCount();
+		pdffont[q].Add(chr);
+	}
+	return p;
+}
+
+void  PdfDraw::FlushText(int dx, int fi, int height, const String& txt)
+{
+	if(fi < 0)
+		return;
+	if(dx)
+		page << Pt(dx) << " 0 Td ";
+	PutFontHeight(fi, height);
+	page << "<" << txt << "> Tj\n";
+}
+
+String PdfDraw::PdfColor(Color c)
+{
+	return NFormat("%3nf %3nf %3nf", c.GetR() / 255.0, c.GetG() / 255.0, c.GetB() / 255.0);
+}
+
+void PdfDraw::PutFontHeight(int fi, double ht)
+{
+	if(fi != fontid || IsNull(textht) || ht != textht)
+		page << "/F" << ((fontid = fi) + 1) << ' ' << Pt(textht = ht) << " Tf\n";
+}
+
+PdfDraw::OutlineInfo PdfDraw::GetOutlineInfo(Font fnt)
+{
+	fnt.Height(0);
+	int q = outline_info.Find(fnt);
+	if(q >= 0)
+		return outline_info[q];
+	OutlineInfo of;
+	of.sitalic = of.ttf = false;
+
+#ifdef USE_TTF
+#ifdef PLATFORM_WIN32
+	ScreenDraw info;
+	info.SetFont(fnt().Underline(false));
+	TEXTMETRIC tm;
+	GetTextMetrics(info.GetHandle(), &tm);
+	if(tm.tmPitchAndFamily & TMPF_TRUETYPE) {
+		of.ttf = true;
+		int c = GetOutlineTextMetrics(info.GetHandle(), 0, NULL);
+		if(c > 0) {
+			Buffer<byte> h(c);
+			OUTLINETEXTMETRIC *otm = (OUTLINETEXTMETRIC *)~h;
+			GetOutlineTextMetrics(info.GetHandle(), c, otm);
+			of.sitalic = otm->otmItalicAngle == 0 && fnt.IsItalic();
+		}
+	}
+#endif
+#ifdef PLATFORM_X11
+	FontInfo fi = fnt.Info();
+	String fn = fi.GetFileName();
+	String ext = ToLower(GetFileExt(fn));
+	if(ext == ".ttf" || ext == ".otf") {
+		String data = LoadFile(fn);
+		TTFReader ttf;
+		if(ttf.Open(data, false, true)) {
+			LOG("TTF!");
+			DUMP(ttf.post.italicAngle);
+			of.ttf = true;
+			of.sitalic = ttf.post.italicAngle == 0 && fnt.IsItalic();
+		}
+	}
+#endif
+#endif
+
+	outline_info.Add(fnt, of);
+
+	return of;
+}
+
+void PdfDraw::DrawTextOp(int x, int y, int angle, const wchar *s, Font fnt,
+		                 Color ink, int n, const int *dx)
+{
+	if(!n) return;
+	if(fnt.GetHeight() == 0)
+		fnt.Height(100);
+	FontInfo ff = fnt.Info();
+	#ifdef PLATFORM_WIN32
+	int fh = ff.GetHeight() - ff.GetInternal();//TODO
+	#endif
+	#ifdef PLATFORM_X11
+	int fh = fnt.GetHeight();
+	#endif
+	OutlineInfo of = GetOutlineInfo(fnt);
+	if(of.ttf)
+		fnt.Height(0);
+	String txt;
+	PutrgColor(ink);
+	PutRGColor(ink);
+	page << "BT ";
+	double sina = 0, cosa = 1;
+	int posx = 0;
+	if(angle || dx || (of.sitalic && !fnt.IsItalic())) {
+		M22 m;
+		if(of.sitalic)
+			m.c = 0.165;
+		if(angle) {
+			Draw::SinCos(angle, sina, cosa);
+			m.Mul(cosa, sina, -sina, cosa);
+		}
+		int fi = -1;
+		bool straight = (fabs(m.a - 1) <= 1e-8 && fabs(m.b) <= 1e-8 && fabs(m.c) <= 1e-8 && fabs(m.d - 1) <= 1e-8);
+		Pointf prev(0, 0);
+		for(int i = 0; i < n; i++) {
+			Pointf next(Pt(x + posx * cosa + fround(ff.GetAscent() * sina)),
+				Pt(pgsz.cy - (y - posx * sina) - fround(ff.GetAscent() * cosa)));
+			CharPos fp = GetCharPos(fnt, s[i]);
+			if(fi != fp.fi) {
+				fi = fp.fi;
+				PutFontHeight(fi, fh);
+			}
+			if(straight)
+				page << (next.x - prev.x) << ' ' << (next.y - prev.y) << " Td";
+			else
+				page << m.a << ' ' << m.b << ' ' << m.c << ' ' << m.d << ' ' << next.x << ' ' << next.y << " Tm";
+			page << " <" << FormatIntHex(fp.ci, 2);
+			while(i + 1 < n) {
+				int cw = ff[s[i]];
+				if(dx && dx[i] != cw)
+					break;
+				posx += cw;
+				CharPos np = GetCharPos(fnt, s[i + 1]);
+				if(np.fi != fp.fi)
+					break;
+				page << FormatIntHex(np.ci, 2);
+				i++;
+			}
+			page << "> Tj\n";
+			posx += dx ? dx[i] : ff[s[i]];
+			prev = next;
+		}
+	}
+	else {
+		page << Pt(x) << " " << Pt(pgsz.cy - y - ff.GetAscent()) << " Td\n";
+		int fi = -1;
+		int ppos = 0;
+		int np = 0;
+		for(int i = 0; i < n; i++) {
+			CharPos fp = GetCharPos(fnt, s[i]);
+			if(fp.fi != fi) {
+				FlushText(np, fi, fnt.GetHeight(), txt);
+				txt.Clear();
+				np = posx - ppos;
+				ppos = posx;
+				fi = fp.fi;
+			}
+			txt.Cat(Sprintf("%02.2X", fp.ci));
+			posx += ff[s[i]];
+		}
+		FlushText(np, fi, fh, txt);
+	}
+	page << "ET\n";
+	if(fnt.IsUnderline()) {
+		int w = ff.GetAscent() / 15;
+		int dy = ff.GetAscent() + max((ff.GetDescent() - w) / 2, ff.GetAscent() / 10);
+		DrawLine(fround(x + sina * dy),
+		         fround(y + cosa * dy),
+		         fround(x + cosa * posx + sina * dy),
+		         fround(y + cosa * dy - sina * posx), w, ink);
+	}
+}
+
+Image RenderGlyph(int cx, int x, Font font, int chr, int py, int pcy)
+{
+	ImageDraw iw(cx, pcy);
+	iw.DrawRect(0, 0, cx, pcy, White);
+	iw.DrawText(x, -py, WString(chr, 1), font, Black);
+	return iw;
+}
+
+PdfDraw::RGlyph PdfDraw::RasterGlyph(Font fnt, int chr)
+{
+	RGlyph rg;
+	FontInfo fi = fnt.Info();
+	rg.x = 0;
+	rg.sz.cx = fi[chr];
+	rg.sz.cy = fi.GetHeight();
+	int l = fi.GetLeftSpace(chr);
+	if(l < 0) {
+		rg.x = -l;
+		rg.sz.cx -= l;
+	}
+	int r = fi.GetRightSpace(chr);
+	if(r < 0)
+		rg.sz.cx -= r;
+	RasterFormat fmt;
+	fmt.Set1mf();
+	int linebytes = fmt.GetByteCount(rg.sz.cx);
+	Buffer<byte> ob(linebytes);
+	int y = 0;
+	while(y < rg.sz.cy) {
+		int ccy = min(16, rg.sz.cy - y);
+		Image m = RenderGlyph(rg.sz.cx, rg.x, fnt, chr, y, ccy);
+		for(int i = 0; i < m.GetHeight(); i++) {
+			fmt.Write(ob, m[i], rg.sz.cx, NULL);
+			rg.data.Cat((const char *)~ob, linebytes);
+		}
+		y += ccy;
+	}
+	return rg;
+}
+
+void PdfDraw::DrawRectOp(int x, int y, int cx, int cy, Color color)
+{
+	if(IsNull(color) || cx <= 0 || cy <= 0) return;
+	PutrgColor(color);
+	PutRGColor(color);
+	PutRect(RectC(x, y, cx, cy));
+	page << "f\n";
+}
+
+void PdfDraw::DrawLineOp(int x1, int y1, int x2, int y2, int width, Color color)
+{
+	if(!IsNull(width)) {
+		PutRGColor(color);
+		PutLineWidth(width);
+		page << " 1 J "
+		     << Pt(x1) << ' ' << Pt(pgsz.cy - y1) << " m "
+		     << Pt(x2) << ' ' << Pt(pgsz.cy - y2) << " l S\n";
+	}
+}
+
+void PdfDraw::DrawImageOp(int x, int y, int cx, int cy, const Image& _img, const Rect& src, Color c)
+{
+	Image img = _img;
+	if(!IsNull(c))
+		img = SetColorKeepAlpha(img, c);
+	image.Add(img);
+	imagerect.Add(src);
+	page << "q "
+	     << Pt(cx) << " 0 0 " << Pt(cy) << ' '
+	     << Pt(x) << ' ' << Pt(pgsz.cy - y - cy)
+	     << " cm /Image" << image.GetCount() << " Do Q\n";
+}
+
+void PdfDraw::DrawPolyPolylineOp(const Point *vertices, int vertex_count,
+	                    const int *counts, int count_count,
+	                    int width, Color color, Color doxor)
+{
+	if(IsNull(color) || IsNull(width))
+		return;
+	PutRGColor(color);
+	PutLineWidth(width);
+	while(--count_count >= 0) {
+		int part = *counts++;
+		page << Pt(vertices->x) << ' ' << Pt(pgsz.cy - vertices->y) << " m\n";
+		vertices++;
+		for(; --part > 0; vertices++)
+			page << Pt(vertices->x) << ' ' << Pt(pgsz.cy - vertices->y) << " l\n";
+		page << "S\n";
+	}
+}
+
+void PdfDraw::DrawEllipseOp(const Rect& r, Color color, int pen, Color outline)
+{
+	bool fill = !IsNull(color), stroke = !IsNull(outline) && !IsNull(pen);
+	if(fill) PutrgColor(color);
+	if(stroke) { PutRGColor(outline); PutLineWidth(pen); }
+	if(!fill && !stroke)
+		return;
+	char closeop = (stroke && fill ? 'B' : fill ? 'f' : 'S');
+	int sizelim = r.Width() | r.Height();
+	int bits = 1;
+	while(bits < 20 && sizelim > (1 << bits))
+		bits++;
+	int parts = 3 + max(((bits * (bits - 6)) >> 3) | 1, 1);
+	double k = 2 * M_PI / 3 / parts;
+	Pointf center(Pt((r.left + r.right) / 2.0), Pt(pgsz.cy - ((r.top + r.bottom) / 2.0)));
+	Pointf size(Pt(r.Width() / 2.0), Pt(r.Height() / 2.0));
+	for(int partid = 0; partid < parts; partid++) {
+		double phi1 = (partid + 0) * (2 * M_PI / parts);
+		double phi2 = (partid + 1) * (2 * M_PI / parts);
+		double s1 = sin(phi1), c1 = cos(phi1), s2 = sin(phi2), c2 = cos(phi2);
+		Pointf A = center + Pointf(c1, s1) * size;
+		Pointf D = center + Pointf(c2, s2) * size;
+		Pointf dA = Pointf(-s1, c1) * size;
+		Pointf dD = Pointf(-s2, c2) * size;
+		Pointf B = A + k * dA;
+		Pointf C = D - k * dD;
+		if(!partid)
+			page << FormatDoubleFix(A.x, 2) << ' ' << FormatDoubleFix(A.y, 2) << " m\n";
+		page << FormatDoubleFix(B.x, 2) << ' ' << FormatDoubleFix(B.y, 2) << ' '
+			<< FormatDoubleFix(C.x, 2) << ' ' << FormatDoubleFix(C.y, 2) << ' '
+			<< FormatDoubleFix(D.x, 2) << ' ' << FormatDoubleFix(D.y, 2) << " c\n";
+	}
+	page << closeop << '\n';
+}
+
+void PdfDraw::DrawArcOp(const Rect& rc, Point start, Point end, int width, Color color)
+{
+	//TODO!!
+	NEVER();
+}
+
+void PdfDraw::DrawPolyPolyPolygonOp(const Point *vertices, int vertex_count,
+	const int *subpolygon_counts, int subpolygon_count_count,
+	const int *disjunct_polygon_counts, int disjunct_polygon_count_count,
+	Color color, int width, Color outline, uint64 pattern, Color doxor)
+{
+	bool fill = !IsNull(color), stroke = !IsNull(outline) && !IsNull(width);
+	if(fill)   PutrgColor(color);
+	if(stroke) { PutRGColor(outline); PutLineWidth(width); }
+	if(!fill && !stroke) return;
+	const char *closeop = (fill & stroke ? "B*" : fill ? "f*" : "S");
+	while(--disjunct_polygon_count_count >= 0) {
+		int disj = *disjunct_polygon_counts++;
+		while(disj > 0) {
+			int sub = *subpolygon_counts++;
+			disj -= sub;
+			page << Pt(vertices->x) << ' ' << Pt(pgsz.cy - vertices->y) << " m\n";
+			vertices++;
+			for(; --sub > 0; vertices++)
+				page << Pt(vertices->x) << ' ' << Pt(pgsz.cy - vertices->y) << " l\n";
+			page << "h\n";
+		}
+		page << closeop << '\n';
+	}
+}
+
+String PdfDraw::Finish()
+{
+	if(!IsNull(page))
+		PutStream(page);
+
+	int pagecount = offset.GetCount();
+
+	Vector<int> imageobj;
+	for(int i = 0; i < image.GetCount(); i++) {
+		Size sz = image[i].GetSize();
+		Rect sr = sz & imagerect[i];
+		String data;
+		const Image& m = image[i];
+		int mask = -1;
+		int smask = -1;
+		if(m.GetKind() == IMAGE_MASK) {
+			for(int y = sr.top; y < sr.bottom; y++) {
+				const RGBA *p = m[y] + sr.left;
+				const RGBA *e = m[y] + sr.right;
+				while(p < e) {
+					int bit = 0x80;
+					byte b = 0;
+					while(bit && p < e) {
+						if(p->a != 255)
+							b |= bit;
+						bit >>= 1;
+						p++;
+					}
+					data.Cat(b);
+				}
+			}
+			mask = PutStream(data, String().Cat()
+			                    << "/Type /XObject /Subtype /Image /Width " << sr.Width()
+				                << " /Height " << sr.Height()
+				                << " /BitsPerComponent 1 /ImageMask true /Decode [0 1]");
+		}
+		if(m.GetKind() == IMAGE_ALPHA) {
+			for(int y = sr.top; y < sr.bottom; y++) {
+				const RGBA *p = m[y] + sr.left;
+				const RGBA *e = m[y] + sr.right;
+				while(p < e)
+					data.Cat((p++)->a);
+			}
+			smask = PutStream(data, String().Cat()
+			                    << "/Type /XObject /Subtype /Image /Width " << sr.Width()
+				                << " /Height " << sr.Height()
+				                << " /BitsPerComponent 8 /ColorSpace /DeviceGray /Decode [0 1]");
+		}
+		data.Clear();
+		for(int y = sr.top; y < sr.bottom; y++) {
+			const RGBA *p = m[y] + sr.left;
+			const RGBA *e = m[y] + sr.right;
+			while(p < e) {
+				data.Cat(p->r);
+				data.Cat(p->g);
+				data.Cat(p->b);
+				p++;
+			}
+		}
+		String imgobj;
+		imgobj << "/Type /XObject /Subtype /Image /Width " << sr.Width()
+		       << " /Height " << sr.Height() << " /BitsPerComponent 8 /ColorSpace /DeviceRGB";
+		if(mask >= 0)
+			imgobj << " /Mask " << mask << " 0 R";
+		if(smask >= 0)
+			imgobj << " /SMask " << smask << " 0 R";
+		imageobj << PutStream(data, imgobj);
+	}
+
+/*
+	Vector<int>  rgobj;
+	Vector<Size> rgsz;
+	Vector<int>  rgx;
+	for(int i = 0; i < pdffont.GetCount(); i++) {
+		Font fnt = pdffont.GetKey(i);
+		if(fnt.GetHeight()) {
+			for(int c = 0; c < pdffont[i].GetCount(); c++) {
+				RGlyph rg = RasterGlyph(fnt, pdffont[i][c]);
+				int ii = rgobj.GetCount();
+				rgobj << PutStream(rg.data, String().Cat()
+				                   << "/Type /XObject /Subtype /Image "
+				                   << " /Width " << rg.sz.cx << " /Height " << rg.sz.cy
+					               << " /BitsPerComponent 1 /ImageMask true /Decode [0 1]");
+				rgsz.Add(rg.sz);
+				rgx.Add(rg.x);
+			}
+		}
+	}
+*/
+	Vector<int> fontobj;
+	for(int i = 0; i < pdffont.GetCount(); i++) {
+		Font fnt = pdffont.GetKey(i);
+		const Vector<wchar>& cs = pdffont[i];
+		String cmap;
+		cmap <<
+			"/CIDInit /ProcSet findresource begin\n"
+			"12 dict begin\n"
+			"begincmap\n"
+			"/CIDSystemInfo\n"
+			"<< /Registry (Adobe)\n"
+			"/Ordering (UCS)\n"
+			"/Supplement 0\n"
+			">> def\n"
+			"/CMapName /UCS" << i << " def\n"
+			"/CMapType 2 def\n"
+			"1 begincodespacerange\n"
+			"<00> <" << FormatIntHex(cs.GetCount() - 1, 2) << ">\n"
+			"endcodespacerange\n"
+			"1 beginbfrange\n"
+			"<00> <" << FormatIntHex(cs.GetCount() - 1, 2) << ">\n"
+			"[\n";
+		for(int c = 0; c < cs.GetCount(); c++)
+			cmap << '<' << FormatIntHex(cs[c], 4) << ">\n";
+		cmap <<
+			"]\n"
+			"endbfrange\n"
+			"endcmap\n"
+			"CMapName currentdict /CMap defineresource pop\n"
+			"end\n"
+			"end\n";
+		int cmapi = PutStream(cmap);
+		if(fnt.GetHeight()) {
+			FontInfo fi = fnt.Info();
+			int t3ch = offset.GetCount() + 1;
+			int fa = fi.GetHeight() - fi.GetInternal();
+			String res;
+			for(int c = 0; c < cs.GetCount(); c++) {
+				RGlyph rg = RasterGlyph(fnt, pdffont[i][c]);
+				String proc;
+				proc
+					<< 1000 * fi[cs[c]] / fa << " 0 0 "
+					<< -1000 * fi.GetDescent() / fa << ' '
+					<< 1000 * (rg.sz.cx + rg.x) / fa << ' '
+					<< 1000 * rg.sz.cy / fa
+					<< " d1\nq "
+					<< 1000 * rg.sz.cx / fa
+					<< " 0 0 "
+					<< 1000 * rg.sz.cy / fa
+					<< " "
+					<< -1000 * rg.x / fa
+					<< " "
+					<< -1000 * fi.GetDescent() / fa
+					<< " cm BI /W " << rg.sz.cx << " /H " << rg.sz.cy
+					<< " /BPC 1 /IM true /D [0 1] ID\n"
+					<< rg.data
+					<< "\nEI Q"
+				;
+				PutStream(proc);
+			}
+			int charprocs = BeginObj();
+			out << "<<";
+			for(int c = 0; c < cs.GetCount(); c++)
+				out << " /Rgch" << c << ' ' << t3ch + c<< " 0 R";
+			out << " >>\n";
+			EndObj();
+			int encoding = BeginObj();
+			out << "<< /Type /Encoding /Differences [0";
+			for(int c = 0; c < cs.GetCount(); c++)
+				out << " /Rgch" << c;
+			out << "] >>\n";
+			EndObj();
+			fontobj.Add() = BeginObj();
+			out <<
+				"<< /Name /F" << i + 1 <<
+				" /Type /Font\n"
+				"/Subtype /Type3\n"
+				"/FontBBox [0 0 0 0]\n"
+				"/FontMatrix [0.001 0 0 0.001 0 0]\n"
+				"/CharProcs " << charprocs << " 0 R\n"
+				"/Encoding " << encoding << " 0 R\n"
+				"/FirstChar 0\n"
+				"/LastChar " << cs.GetCount() - 1 << "\n"
+				"/Widths [";
+			for(int i = 0; i < cs.GetCount(); i++)
+				out << ' ' << 1000 * fi[cs[i]] / fa;
+			out <<
+				"]\n";
+			out << "/Resources << /ProcSet [ /PDF /Text /ImageB  ] >>\n"
+			    << "/FirstChar 0 /LastChar " << cs.GetCount() - 1 <<" /ToUnicode "
+				<< cmapi
+				<< " 0 R\n>>\n";
+			EndObj();
+		}
+		else {
+	#ifdef PLATFORM_POSIX
+			FontInfo fi = pdffont.GetKey(i).Info();
+			String fontbuffer = LoadFile(fi.GetFileName());
+	#endif
+	#ifdef PLATFORM_WIN32
+			ScreenDraw sd;
+			sd.SetFont(pdffont.GetKey(i));
+
+			int size = GetFontData(sd.GetHandle(), 0, 0, NULL, 0);
+			if(size == GDI_ERROR) {
+				RLOG("PdfDraw::Finish: GDI_ERROR on font " << pdffont.GetKey(i));
+				return Null;
+			}
+			StringBuffer fontbuffer(size);
+			GetFontData(sd.GetHandle(), 0, 0, fontbuffer, size);
+	#endif
+
+			TTFReader ttf;
+			if(!ttf.Open(fontbuffer))
+				return Null;
+
+
+			String name = FormatIntAlpha(i + 1, true);
+			name.Cat('A', 6 - name.GetLength());
+			name << '+' << ttf.ps_name;
+
+			int fonti = PutStream(ttf.Subset(cs));
+
+			BeginObj();
+			int ascent = ttf.hhea.ascent * 1000 / ttf.head.unitsPerEm;
+			int descent = ttf.hhea.descent * 1000 / ttf.head.unitsPerEm;
+			out <<
+				"<< /Type /FontDescriptor\n"
+				"/FontName /" << name << "\n"
+				"/Flags 4\n"
+				"/FontBBox [ -1000 " << descent << " 3000 " << ascent << " ]\n" //?????
+				"/ItalicAngle " << ttf.post.italicAngle / 65536.0 << "\n"
+				"/Ascent " << ascent << "\n"
+				"/Descent " << -descent << "\n"
+				"/CapHeight " << ttf.hhea.ascent * 1000 / ttf.head.unitsPerEm << "\n"
+				"/StemV 80\n"
+				"/FontFile2 " << fonti << " 0 R\n" <<
+				">>\n";
+			EndObj();
+
+			fontobj.Add() = BeginObj();
+			out <<
+				"<< /Type /Font\n"
+				"/Subtype /TrueType\n"
+				"/BaseFont /" << name << "\n"
+				"/FirstChar 0\n"
+				"/LastChar " << cs.GetCount() - 1 << "\n"
+				"/Widths [ ";
+			for(int i = 0; i < cs.GetCount(); i++)
+				out << ttf.GetAdvanceWidth(cs[i]) * 1000 / ttf.head.unitsPerEm << ' ';
+			out <<
+				"]\n"
+				"/FontDescriptor " << fonti + 1 << " 0 R\n"
+				"/ToUnicode " << cmapi << " 0 R\n" <<
+				">>\n";
+			EndObj();
+		}
+	}
+
+	int pages = BeginObj();
+	out << "<< /Type /Pages\n"
+	    << "/Kids [";
+	for(int i = 0; i < pagecount; i++)
+		out << i + pages + 1 << " 0 R ";
+	out << "]\n"
+	    << "/Count " << pagecount << "\n"
+	    << "/Resources << /ProcSet [ /PDF /Text /ImageB /ImageC ]\n";
+	if(pdffont.GetCount()) {
+	    out << "/Font << ";
+		for(int i = 0; i < pdffont.GetCount(); i++)
+			out << "/F" << i + 1 << ' ' << fontobj[i] << " 0 R ";
+		out << ">>\n";
+	}
+	if(!imageobj.IsEmpty()) {
+		out << "/XObject << ";
+		for(int i = 0; i < imageobj.GetCount(); i++)
+			out << "/Image" << i + 1 << ' ' << imageobj[i] << " 0 R ";
+		out << ">>\n";
+	}
+	out << ">> >>\n";
+	EndObj();
+	for(int i = 0; i < pagecount; i++) {
+		BeginObj();
+		out << "<< /Type /Page\n"
+		    << "/Parent " << pages << " 0 R\n"
+		    << "/MediaBox [0 0 " << Pt(pgsz.cx) << ' ' << Pt(pgsz.cy) << "]\n"
+		    << "/Contents " << i + 1 << " 0 R\n"
+		    << ">>\n";
+		EndObj();
+	}
+	int outlines = BeginObj();
+	out << "<< /Type /Outlines\n"
+	       "/Count 0\n"
+	       ">>\n";
+	EndObj();
+	int catalog = BeginObj();
+	out << "<< /Type /Catalog\n"
+	    << "/Outlines " << outlines << " 0 R\n"
+	    << "/Pages " << pages << " 0 R\n"
+	    << ">>\n";
+	EndObj();
+	int startxref = out.GetCount();
+	out << "xref\n"
+	    << "0 " << offset.GetCount() + 1 << "\n";
+	out << "0000000000 65535 f\r\n";
+	for(int i = 0; i < offset.GetCount(); i++)
+		out << Sprintf("%010d 00000 n\r\n", offset[i]);
+	out << "\n"
+	    << "trailer\n"
+	    << "<< /Size " << offset.GetCount() + 1 << "\n"
+	    << "/Root " << catalog << " 0 R\n"
+	    << ">>\n"
+	    << "startxref\r\n"
+	    << startxref << "\r\n"
+	    << "%%EOF\r\n";
+	return out;
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/PdfDraw/PdfDraw.h b/uppsrc/PdfDraw/PdfDraw.h
new file mode 100644
index 000000000..34f5c53f9
--- /dev/null
+++ b/uppsrc/PdfDraw/PdfDraw.h
@@ -0,0 +1,344 @@
+#ifndef _PDF_pdf_h_
+#define _PDF_pdf_h_
+
+#include <Draw/Draw.h>
+#include <plugin/z/z.h>
+
+
+NAMESPACE_UPP
+
+class TTFReader {
+	struct TTFStream {
+		struct Fail {};
+
+		virtual void Raw(void *ptr, int count) = 0;
+
+		TTFStream& operator%(byte& q);
+		TTFStream& operator%(int32& q);
+		TTFStream& operator%(uint32& q);
+		TTFStream& operator%(int16& q);
+		TTFStream& operator%(uint16& q);
+		
+		virtual ~TTFStream() {}
+	};
+
+	struct TTFStreamIn : TTFStream {
+		const char *beg;
+		const char *s;
+		const char *lim;
+
+		virtual void Raw(void *ptr, int count);
+
+		void   Seek(int offset);
+		int    Get8();
+		int    Get16();
+		int    Get32();
+		String Get(int n);
+		
+		virtual ~TTFStreamIn() {}
+	};
+
+	struct TTFStreamOut : TTFStream {
+		String out;
+
+		virtual void Raw(void *ptr, int count) { out.Cat((const char *)ptr, count); }
+
+		void   Put8(int data)       { out.Cat(data); }
+		void   Put16(int data)      { Put8(HIBYTE(data)); Put8(LOBYTE(data)); }
+		void   Put32(int data)      { Put16(HIWORD(data)); Put16(LOWORD(data)); }
+		void   Put(const String& s) { out.Cat(s); }
+
+		operator String() const     { return out; }
+
+		virtual ~TTFStreamOut() {}
+	};
+
+	String font;
+
+	struct Table : Moveable<Table> {
+		int offset;
+		int length;
+	};
+	VectorMap<String, Table> table;
+
+	word  zero[256];
+	word *cmap[256];
+
+	struct GlyphInfo : Moveable<GlyphInfo> {
+		int    offset;
+		int    size;
+    	uint16 advanceWidth;
+    	int16  leftSideBearing;
+	};
+
+	Vector<GlyphInfo> glyphinfo;
+
+	void   SetGlyph(wchar ch, word glyph);
+
+	struct Fail {};
+
+	static void Error() { throw Fail(); }
+
+	int    Peek8(const char *s);
+	int    Peek16(const char *s);
+	int    Peek32(const char *s);
+	int    Peek8(const char *s, int i);
+	int    Peek16(const char *s, int i);
+	int    Peek32(const char *s, int i);
+	int    Read8(const char *&s);
+	int    Read16(const char *&s);
+	int    Read32(const char *&s);
+	String Read(const char *&s, int n);
+
+	void   Free();
+	void   Reset();
+
+	const char *Seek(const char *tab, int& len);
+	const char *Seek(const char *tab);
+	void        Seek(const char *tab, TTFStreamIn& s);
+	String      GetTable(const char *tab);
+
+	enum {
+		ARG_1_AND_2_ARE_WORDS     = (1<<0),
+		ARGS_ARE_XY_VALUES        = (1<<1),
+		ROUND_XY_TO_GRID          = (1<<2),
+		WE_HAVE_A_SCALE           = (1<<3),
+		MORE_COMPONENTS           = (1<<5),
+		WE_HAVE_AN_X_AND_Y_SCALE  = (1<<6),
+		WE_HAVE_A_TWO_BY_TWO      = (1<<7),
+		WE_HAVE_INSTRUCTIONS      = (1<<8),
+		USE_MY_METRICS            = (1<<9),
+	};
+
+	struct NewTable {
+		String name;
+		String data;
+		dword  checksum;
+	};
+
+	static void   Add(Array<NewTable>& t, const char *name, const String& data);
+	static void   Set(NewTable& m, const String& data);
+	static String CreateHeader(const Array<NewTable>& t);
+
+	static inline int    Copy8(TTFStreamOut& out, TTFStreamIn& in)
+		{ int q = in.Get8(); out.Put8(q); return q; }
+	static inline int    Copy16(TTFStreamOut& out, TTFStreamIn& in)
+		{ int q = in.Get16(); out.Put16(q); return q; }
+	static inline int    Copy32(TTFStreamOut& out, TTFStreamIn& in)
+		{ int q = in.Get32(); out.Put32(q); return q; }
+	static inline String Copy(TTFStreamOut& out, TTFStreamIn& in, int n)
+		{ String q = in.Get(n); out.Put(q); return q; }
+
+public:
+	struct Head {
+		dword   version;
+		dword   fontRevision;
+		uint32  checkSumAdjustment;
+		uint32  magicNumber;
+		uint16 	flags;
+		uint16 	unitsPerEm;
+		byte    created[8];
+		byte    modified[8];
+		int16   xMin;
+		int16   yMin;
+		int16   xMax;
+		int16   yMax;
+		uint16  macStyle;
+		uint16  lowestRecPPEM;
+		int16   fontDirectionHint;
+		int16   indexToLocFormat;
+		int16   glyphDataFormat;
+
+		void Serialize(TTFStream& s);
+	};
+
+	struct Hhea {
+		uint32  version;
+		int16   ascent;
+		int16   descent;
+		int16   lineGap;
+		uint16  advanceWidthMax;
+		int16   minLeftSideBearing;
+		int16   minRightSideBearing;
+		int16   xMaxExtent;
+		int16   caretSlopeRise;
+		int16   caretSlopeRun;
+		int16   caretOffset;
+		int16   reserved1;
+		int16   reserved2;
+		int16   reserved3;
+		int16   reserved4;
+		int16   metricDataFormat;
+		uint16  numOfLongHorMetrics;
+
+		void Serialize(TTFStream& s);
+	};
+
+	struct Maxp {
+		uint32  version;
+		uint16  numGlyphs;
+		uint16  maxPoints;
+		uint16  maxContours;
+		uint16  maxComponentPoints;
+		uint16  maxComponentContours;
+		uint16  maxZones;
+		uint16  maxTwilightPoints;
+		uint16  maxStorage;
+		uint16  maxFunctionDefs;
+		uint16  maxInstructionDefs;
+		uint16  maxStackElements;
+		uint16  maxSizeOfInstructions;
+		uint16  maxComponentElements;
+		uint16  maxComponentDepth;
+
+		void Serialize(TTFStream& s);
+	};
+
+	struct Post {
+		uint32  format;
+		int32   italicAngle;
+		int16   underlinePosition;
+		int16   underlineThickness;
+		uint16  isFixedPitch;
+		uint16  reserved;
+		uint32  minMemType42;
+		uint32  maxMemType42;
+		uint32  minMemType1;
+		uint32  maxMemType1;
+
+		void Serialize(TTFStream& s);
+	};
+
+	Head   head;
+	Hhea   hhea;
+	Maxp   maxp;
+	Post   post;
+	String ps_name;
+
+	int    GetGlyph(wchar chr)               { return cmap[HIBYTE(chr)][LOBYTE(chr)]; }
+	word   GetAdvanceWidth(wchar chr)        { return glyphinfo[GetGlyph(chr)].advanceWidth; }
+
+	String Subset(const Vector<wchar>& chars, int first = 0, bool os2 = false);
+	bool   Open(const String& fnt, bool symbol = false, bool justcheck = false);
+
+	TTFReader();
+	~TTFReader();
+};
+
+class PdfDraw : public Draw {
+public:
+	virtual void StartPage();
+	virtual void EndPage();
+
+	virtual void BeginOp();
+	virtual void EndOp();
+	virtual void OffsetOp(Point p);
+	virtual bool ClipOp(const Rect& r);
+	virtual bool ClipoffOp(const Rect& r);
+	virtual bool ExcludeClipOp(const Rect& r);
+	virtual bool IntersectClipOp(const Rect& r);
+	virtual Rect GetClipOp() const;
+	virtual bool IsPaintingOp(const Rect& r) const;
+
+	virtual	void DrawRectOp(int x, int y, int cx, int cy, Color color);
+	virtual void DrawImageOp(int x, int y, int cx, int cy, const Image& img, const Rect& src, Color color);
+	virtual void DrawLineOp(int x1, int y1, int x2, int y2, int width, Color color);
+	virtual void DrawPolyPolylineOp(const Point *vertices, int vertex_count,
+	                                const int *counts, int count_count,
+	                                int width, Color color, Color doxor);
+	virtual void DrawPolyPolyPolygonOp(const Point *vertices, int vertex_count,
+	                                   const int *subpolygon_counts, int scc,
+	                                   const int *disjunct_polygon_counts, int dpcc,
+	                                   Color color, int width, Color outline,
+	                                   uint64 pattern, Color doxor);
+	virtual void DrawEllipseOp(const Rect& r, Color color, int pen, Color pencolor);
+	virtual void DrawArcOp(const Rect& rc, Point start, Point end, int width, Color color);
+	virtual void DrawTextOp(int x, int y, int angle, const wchar *text, Font font,
+		                    Color ink, int n, const int *dx);
+
+private:
+	struct CharPos : Moveable<CharPos>   { word fi, ci; };
+
+	struct OutlineInfo : Moveable<OutlineInfo> {
+		bool ttf;
+		bool sitalic;
+	};
+
+	VectorMap<Font, OutlineInfo>                outline_info;
+	VectorMap<Font, Vector<wchar> >             pdffont;
+	VectorMap<Font, VectorMap<wchar, CharPos> > fontchars;
+	Vector<Image>                               image;
+	Vector<Rect>                                imagerect;
+
+	Vector<int>   offset;
+	Vector<Point> offstack;
+	Vector<Rect> clipstack;
+	Rect        actual_clip;
+	String      out;
+	String      page;
+	Size        pgsz;
+	Color       rgcolor;
+	Color       RGcolor;
+	int         fontid;
+	double      textht;
+	double      linewidth;
+	int         margin;
+
+	inline double Pt(double dot)        { return 0.12 * dot; }
+
+	int    Pos()                        { return offset.GetCount() + 1; }
+	int    BeginObj();
+	void   EndObj();
+	int    PutStream(const String& data, const String& keys = Null);
+
+	void    PutRect(const Rect& rc);
+	void    PutrgColor(Color rg);
+	void    PutRGColor(Color RG);
+	void    PutFontHeight(int fi, double ht);
+	void    PutLineWidth(int lw);
+
+	CharPos GetCharPos(Font fnt, wchar chr);
+	void    FlushText(int dx, int fi, int height, const String& txt);
+	static String PdfColor(Color c);
+
+	OutlineInfo GetOutlineInfo(Font fnt);
+
+	struct M22 {
+		double a, b, c, d;
+
+		void Mul(double a1, double b1, double c1, double d1) {
+			M22 t;
+			t.a = a * a1 + b * c1;
+			t.b = a * b1 + b * d1;
+			t.c = c * a1 + d * c1;
+			t.d = c * b1 + d * d1;
+			*this = t;
+		}
+
+		M22(double a, double b, double c, double d) : a(a), b(b), c(c), d(d) {}
+		M22() : a(1), b(0), c(0), d(1) {}
+	};
+
+	void Init(int pagecx, int pagecy, int margin);
+
+	struct RGlyph : Moveable<RGlyph> {
+		String data;
+		Size   sz;
+		int    x;
+	};
+
+	RGlyph RasterGlyph(Font fnt, int chr);
+
+public:
+	String Finish();
+	void   Clear();
+
+	PdfDraw(int pagecx, int pagecy)                { Init(pagecx, pagecy, 0); }
+	PdfDraw(Size pgsz = Size(5100, 6600))          { Init(pgsz.cx, pgsz.cy, 0); }
+};
+
+String Pdf(const Array<Drawing>& report, Size pagesize, int margin);
+
+END_UPP_NAMESPACE
+
+#endif
diff --git a/uppsrc/PdfDraw/PdfDraw.upp b/uppsrc/PdfDraw/PdfDraw.upp
new file mode 100644
index 000000000..6913acf80
--- /dev/null
+++ b/uppsrc/PdfDraw/PdfDraw.upp
@@ -0,0 +1,21 @@
+description "PDF output as Draw derived class";
+
+uses
+	Draw;
+
+file
+	PdfDraw.h,
+	TTFStream.cpp,
+	TTFStruct.cpp,
+	TTFReader.cpp,
+	TTFSubset.cpp,
+	PdfDraw.cpp,
+	PdfReport.icpp,
+	Info readonly separator,
+	COPYING,
+	COPYING-PLAIN,
+	AUTHORS;
+
+mainconfig
+	"" = "GUI";
+
diff --git a/uppsrc/PdfDraw/PdfReport.icpp b/uppsrc/PdfDraw/PdfReport.icpp
new file mode 100644
index 000000000..46cdfc7f9
--- /dev/null
+++ b/uppsrc/PdfDraw/PdfReport.icpp
@@ -0,0 +1,21 @@
+#include "PdfDraw.h"
+
+NAMESPACE_UPP
+
+String Pdf(const Array<Drawing>& report, Size sz, int margin)
+{
+	PdfDraw w(sz + 2 * margin);
+	for(int i = 0; i < report.GetCount(); i++) {
+		w.StartPage();
+		w.DrawDrawing(margin, margin, sz.cx, sz.cy, report[i]);
+		w.EndPage();
+	}
+	return w.Finish();
+}
+
+INITBLOCK
+{
+	SetDrawingToPdfFn(Pdf);
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/PdfDraw/TTFReader.cpp b/uppsrc/PdfDraw/TTFReader.cpp
new file mode 100644
index 000000000..361da2313
--- /dev/null
+++ b/uppsrc/PdfDraw/TTFReader.cpp
@@ -0,0 +1,311 @@
+#include "PdfDraw.h"
+
+NAMESPACE_UPP
+
+#define LLOG(x)   // LOG(x)
+#define LDUMP(x)  // LLOG(#x << " = " << x);
+
+int    TTFReader::Peek8(const char *s)
+{
+	if(s + 1 > font.End())
+		Error();
+	return (byte)*s;
+}
+
+int    TTFReader::Peek16(const char *s)
+{
+	if(s + 2 > font.End())
+		Error();
+	return ((byte)s[0] << 8) | (byte)s[1];
+}
+
+int    TTFReader::Peek32(const char *s)
+{
+	if(s + 4 > font.End())
+		Error();
+	return ((byte)s[0] << 24) | ((byte)s[1] << 16) | ((byte)s[2] << 8) | (byte)s[3];
+}
+
+int    TTFReader::Peek8(const char *s, int i)
+{
+	return Peek16(s + i);
+}
+
+int    TTFReader::Peek16(const char *s, int i)
+{
+	return Peek16(s + 2 * i);
+}
+
+int    TTFReader::Peek32(const char *s, int i)
+{
+	return Peek32(s + 4 * i);
+}
+
+int    TTFReader::Read8(const char *&s)
+{
+	int q = byte(*s); s++; return q;
+}
+
+int    TTFReader::Read16(const char *&s)
+{
+	int q = Peek16(s); s += 2; return q;
+}
+
+int    TTFReader::Read32(const char *&s)
+{
+	int q = Peek32(s); s += 4; return q;
+}
+
+String TTFReader::Read(const char *&s, int n)
+{
+	if(s + n > font.End())
+		Error();
+	String q(s, n);
+	s += n;
+	return q;
+}
+
+void TTFReader::Reset()
+{
+	memset(zero, 0, sizeof(zero));
+	for(int i = 0; i < 256; i++)
+		cmap[i] = zero;
+}
+
+void TTFReader::Free()
+{
+	for(int i = 0; i < 256; i++)
+		if(cmap[i] != zero)
+			delete[] cmap[i];
+}
+
+void TTFReader::SetGlyph(wchar chr, word glyph)
+{
+	int h = HIBYTE(chr);
+	if(cmap[h] == zero)
+		memset(cmap[h] = new word[256], 0, 256 * sizeof(word));
+	cmap[h][LOBYTE(chr)] = glyph;
+}
+
+const char *TTFReader::Seek(const char *tab, int& len)
+{
+	ASSERT(strlen(tab) == 4);
+	int q = table.Find(tab);
+	if(q < 0)
+		Error();
+	len = table[q].length;
+	return ~font + table[q].offset;
+}
+
+const char *TTFReader::Seek(const char *tab)
+{
+	int dummy;
+	return Seek(tab, dummy);
+}
+
+void TTFReader::Seek(const char *tab, TTFStreamIn& s)
+{
+	int len;
+	s.beg = s.s = Seek(tab, len);
+	s.lim = s.s + len;
+}
+
+String TTFReader::GetTable(const char *tab)
+{
+	ASSERT(strlen(tab) == 4);
+	int q = table.Find(tab);
+	if(q < 0)
+		return Null;
+	return String(~font + table[q].offset, table[q].length);
+}
+
+bool TTFReader::Open(const String& fnt, bool symbol, bool justcheck)
+{
+	try {
+		int i;
+		Free();
+		Reset();
+		table.Clear();
+		glyphinfo.Clear();
+		font = fnt;
+		const char *s = fnt;
+		int q = Read32(s);
+		if(q != 0x74727565 && q != 0x00010000)
+			Error();
+		int n = Read16(s);
+		s += 6;
+		while(n--) {
+			Table& t = table.Add(Read(s, 4));
+			s += 4;
+			t.offset = Read32(s);
+			t.length = Read32(s);
+		}
+		for(i = 0; i < table.GetCount(); i++)
+			LLOG("table: " << table.GetKey(i) << " offset: " << table[i].offset << " length: " << table[i].length);
+
+		TTFStreamIn is;
+		Seek("head", is);
+		head.Serialize(is);
+		if(head.magicNumber != 0x5F0F3CF5)
+			Error();
+
+		LDUMP(head.unitsPerEm);
+		LDUMP(head.xMin);
+		LDUMP(head.yMin);
+		LDUMP(head.xMax);
+		LDUMP(head.yMax);
+		LDUMP(head.indexToLocFormat);
+
+		Seek("maxp", is);
+		maxp.Serialize(is);
+		LDUMP(maxp.numGlyphs);
+
+		Seek("post", is);
+		post.Serialize(is);
+//		LLOGHEXLDUMP(is.s, is.lim - is.s);
+		LDUMP((post.format >> 16));
+		LDUMP(post.italicAngle);
+		LDUMP(post.italicAngle);
+		LDUMP(post.underlinePosition);
+		LDUMP(post.underlineThickness);
+		LDUMP(post.italicAngle);
+
+		if(justcheck)
+			return true;
+
+		Seek("hhea", is);
+		hhea.Serialize(is);
+		LDUMP(hhea.ascent);
+		LDUMP(hhea.descent);
+		LDUMP(hhea.lineGap);
+		LDUMP(hhea.advanceWidthMax);
+		LDUMP(hhea.numOfLongHorMetrics);
+
+		if(hhea.numOfLongHorMetrics > maxp.numGlyphs)
+			Error();
+
+		glyphinfo.SetCount(maxp.numGlyphs);
+
+		s = Seek("hmtx");
+		int aw = 0;
+		for(i = 0; i < hhea.numOfLongHorMetrics; i++) {
+			aw = glyphinfo[i].advanceWidth = (uint16)Read16(s);
+			glyphinfo[i].leftSideBearing = (int16)Read16(s);
+		}
+		for(; i < maxp.numGlyphs; i++) {
+			glyphinfo[i].advanceWidth = aw;
+			glyphinfo[i].leftSideBearing = (int16)Read16(s);
+		}
+
+		s = Seek("loca");
+		for(i = 0; i < maxp.numGlyphs; i++)
+			if(head.indexToLocFormat) {
+				glyphinfo[i].offset = Peek32(s, i);
+				glyphinfo[i].size = Peek32(s, i + 1) - glyphinfo[i].offset;
+			}
+			else {
+				glyphinfo[i].offset = 2 * (word)Peek16(s, i);
+				glyphinfo[i].size = 2 * (word)Peek16(s, i + 1) - glyphinfo[i].offset;
+			}
+
+		for(i = 0; i < maxp.numGlyphs; i++)
+			LLOG(i << " advance: " << glyphinfo[i].advanceWidth << ", left: " << glyphinfo[i].leftSideBearing
+			      << ", offset: " << glyphinfo[i].offset << ", size: " << glyphinfo[i].size);
+
+		s = Seek("cmap");
+		const char *p = s;
+		p += 2;
+		n = Read16(p);
+		while(n--) {
+			int pid = Read16(p);
+			int psid = Read16(p);
+			int offset = Read32(p);
+			LLOG("cmap pid: " << pid << " psid: " << psid << " format: " << Peek16(s + offset));
+			//Test with Symbol font !!!; improve - Unicode first, 256 bytes later..., symbol...
+			if(symbol) {
+				if(pid == 1 && psid == 0 && Peek16(s + offset) == 0) {
+					LLOG("Reading symbol table");
+					p = s + offset + 6;
+					for(int i = 0; i < 256; i++)
+						SetGlyph(i, (byte)p[i]);
+					break;
+				}
+			}
+			else
+			if(pid == 3 && psid == 1) {
+				p = s + offset;
+				n = Peek16(p + 6) >> 1;
+				LLOG("Found UNICODE encoding, offset " << offset << ", segments " << n);
+				const char *seg_end = p + 14;
+				const char *seg_start = seg_end + 2 * n + 2;
+				const char *idDelta = seg_start + 2 * n;
+				const char *idRangeOffset = idDelta + 2 * n;
+				for(int i = 0; i < n; i++) {
+					int start = Peek16(seg_start, i);
+					int end = Peek16(seg_end, i);
+					int delta = Peek16(idDelta, i);
+					int ro = Peek16(idRangeOffset, i);
+				    if (ro && delta == 0) {
+				        LLOG("RangeOffset start: " << start << ", end: " << end << ", delta: " << (int16)delta);
+				        LLOG("ro " << ro);
+						const char *q = idRangeOffset + 2 * i + ro;
+						for(int c = start; c <= end; c++) {
+							SetGlyph(c, (word)Read16(q));
+						}
+				    }
+				    else {
+				        LLOG("start: " << start << ", end: " << end << ", delta: " << (int16)delta);
+						for(int c = start; c <= end; c++)
+							SetGlyph(c, c + delta);
+				    }
+				}
+				break;
+			}
+		}
+
+
+		const char *strings = Seek("name");
+		s = strings + 2;
+		int count = Read16(s);
+		strings += (word)Read16(s);
+		for(int i = 0; i < count; i++) {
+			int platform = Read16(s);
+			s += 4;
+			if(Read16(s) == 6) {
+				int len = Read16(s);
+				int offset = Read16(s);
+				if(platform == 1)
+					ps_name = String(strings + offset, len);
+				else {
+					s = strings + offset;
+					len >>= 1;
+					while(len--)
+						ps_name.Cat(Read16(s));
+				}
+				break;
+			}
+			s += 4;
+		}
+		LDUMP(ps_name);
+	}
+	catch(Fail) {
+		return false;
+	}
+	catch(TTFStream::Fail) {
+		return false;
+	}
+
+	return true;
+}
+
+TTFReader::TTFReader()
+{
+	Reset();
+}
+
+TTFReader::~TTFReader()
+{
+	Free();
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/PdfDraw/TTFStream.cpp b/uppsrc/PdfDraw/TTFStream.cpp
new file mode 100644
index 000000000..77fbeeac1
--- /dev/null
+++ b/uppsrc/PdfDraw/TTFStream.cpp
@@ -0,0 +1,110 @@
+#include "PdfDraw.h"
+
+NAMESPACE_UPP
+
+TTFReader::TTFStream& TTFReader::TTFStream::operator%(byte& q) {
+	Raw(&q, 1);
+	return *this;
+}
+
+#ifdef CPU_LE
+TTFReader::TTFStream& TTFReader::TTFStream::operator%(int32& q) {
+	byte *h = (byte *)&q;
+	*this % h[3] % h[2] % h[1] % h[0];
+	return *this;
+}
+
+TTFReader::TTFStream& TTFReader::TTFStream::operator%(uint32& q) {
+	byte *h = (byte *)&q;
+	*this % h[3] % h[2] % h[1] % h[0];
+	return *this;
+}
+
+TTFReader::TTFStream& TTFReader::TTFStream::operator%(int16& q) {
+	byte *h = (byte *)&q;
+	*this % h[1] % h[0];
+	return *this;
+}
+
+TTFReader::TTFStream& TTFReader::TTFStream::operator%(uint16& q) {
+	byte *h = (byte *)&q;
+	*this % h[1] % h[0];
+	return *this;
+}
+#else
+TTFReader::TTFStream& TTFReader::TTFStream::operator%(int32& q) {
+	byte *h = (byte *)&q;
+	*this % h[0] % h[1] % h[2] % h[3];
+	return *this;
+}
+
+TTFReader::TTFStream& TTFReader::TTFStream::operator%(uint32& q) {
+	byte *h = (byte *)&q;
+	*this % h[0] % h[1] % h[2] % h[3];
+	return *this;
+}
+
+TTFReader::TTFStream& TTFReader::TTFStream::operator%(int16& q) {
+	byte *h = (byte *)&q;
+	*this % h[0] % h[1];
+	return *this;
+}
+
+TTFReader::TTFStream& TTFReader::TTFStream::operator%(uint16& q) {
+	byte *h = (byte *)&q;
+	*this % h[0] % h[1];
+	return *this;
+}
+#endif
+
+void TTFReader::TTFStreamIn::Seek(int offset)
+{
+	ASSERT(offset >= 0 && offset < lim - beg);
+	s = beg + offset;
+}
+
+int TTFReader::TTFStreamIn::Get8()
+{
+	if(s + 1 > lim)
+		throw Fail();
+	int q = (byte)*s;
+	s++;
+	return q;
+}
+
+int TTFReader::TTFStreamIn::Get16()
+{
+	if(s + 2 > lim)
+		throw Fail();
+	int q = ((byte)s[0] << 8) | (byte)s[1];
+	s += 2;
+	return q;
+
+}
+
+int TTFReader::TTFStreamIn::Get32()
+{
+	if(s + 4 > lim)
+		throw Fail();
+	int q = ((byte)s[0] << 24) | ((byte)s[1] << 16) | ((byte)s[2] << 8) | (byte)s[3];
+	s += 2;
+	return q;
+}
+
+String TTFReader::TTFStreamIn::Get(int n)
+{
+	if(s + n > lim)
+		throw Fail();
+	String r(s, n);
+	s += n;
+	return r;
+}
+
+void TTFReader::TTFStreamIn::Raw(void *ptr, int count) {
+	if(s + count > lim)
+		throw Fail();
+	memcpy(ptr, s, count);
+	s += count;
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/PdfDraw/TTFStruct.cpp b/uppsrc/PdfDraw/TTFStruct.cpp
new file mode 100644
index 000000000..a5878083f
--- /dev/null
+++ b/uppsrc/PdfDraw/TTFStruct.cpp
@@ -0,0 +1,37 @@
+#include "PdfDraw.h"
+
+NAMESPACE_UPP
+
+void   TTFReader::Head::Serialize(TTFStream& s)
+{
+	s % version % fontRevision % checkSumAdjustment % magicNumber % flags % unitsPerEm;
+	s.Raw(created, 8);
+	s.Raw(modified, 8);
+	s % xMin % yMin % xMax % yMax % macStyle % lowestRecPPEM % fontDirectionHint
+	  % indexToLocFormat % glyphDataFormat;
+}
+
+void   TTFReader::Hhea::Serialize(TTFStream& s)
+{
+	reserved1 = reserved2 = reserved3 = reserved4 = 0;
+	s % version % ascent % descent % lineGap % advanceWidthMax % minLeftSideBearing
+	  % minRightSideBearing % xMaxExtent % caretSlopeRise % caretSlopeRun % caretOffset
+	  % reserved1 % reserved2 % reserved3 % reserved4 % metricDataFormat % numOfLongHorMetrics;
+}
+
+void   TTFReader::Maxp::Serialize(TTFStream& s)
+{
+	s % version % numGlyphs % maxPoints % maxContours % maxComponentPoints
+	  % maxComponentContours % maxZones % maxTwilightPoints % maxStorage
+	  % maxFunctionDefs % maxInstructionDefs % maxStackElements
+	  % maxSizeOfInstructions % maxComponentElements % maxComponentDepth;
+}
+
+void   TTFReader::Post::Serialize(TTFStream& s)
+{
+	reserved = 0;
+	s % format % italicAngle % underlinePosition % underlineThickness % isFixedPitch
+	  % reserved % minMemType42 % maxMemType42 % minMemType1 % maxMemType1;
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/PdfDraw/TTFSubset.cpp b/uppsrc/PdfDraw/TTFSubset.cpp
new file mode 100644
index 000000000..55c0f2e0e
--- /dev/null
+++ b/uppsrc/PdfDraw/TTFSubset.cpp
@@ -0,0 +1,207 @@
+#include "PdfDraw.h"
+
+NAMESPACE_UPP
+
+dword sCheckSum(const String& data)
+{
+	const byte *s = (byte *)~data;
+	const byte *lim = s + (data.GetCount() & ~3);
+	dword sum = 0;
+	while(s < lim) {
+		sum += (s[0] << 24) | (s[1] << 16) | (s[2] << 8) | s[3];
+		s += 4;
+	}
+	byte h[4];
+	h[0] = h[1] = h[2] = h[3] = 0;
+	byte *t = h;
+	while(s < (byte *)data.End())
+		*t++ = *s++;
+	sum += (h[0] << 24) | (h[1] << 16) | (h[2] << 8) | h[3];
+	return sum;
+}
+
+void TTFReader::Set(NewTable& m, const String& data)
+{
+	m.data = data;
+	m.checksum = sCheckSum(data);
+}
+
+void TTFReader::Add(Array<NewTable>& t, const char *name, const String& data)
+{
+	if(IsNull(data))
+		return;
+	NewTable& m = t.Add();
+	m.name = name;
+	ASSERT(m.name.GetCount() == 4);
+	Set(m, data);
+	m.checksum = sCheckSum(m.data);
+}
+
+String TTFReader::CreateHeader(const Array<NewTable>& t)
+{
+	TTFStreamOut out;
+	int i = 1;
+	int k = 0;
+	while(i <= t.GetCount()) {
+		i <<= 1;
+		k++;
+	}
+	out.Put32(0x00010000);
+	out.Put16(t.GetCount());
+	out.Put16(i << 3);
+	out.Put16(k - 1);
+	out.Put16((t.GetCount() << 4) - (i << 3));
+	int offset = 16 * t.GetCount() + 12;
+	for(int i = 0; i < t.GetCount(); i++) {
+		const NewTable& m = t[i];
+		out.Put(m.name);
+		out.Put32(m.checksum);
+		out.Put32(offset);
+		out.Put32(m.data.GetLength());
+		offset += (m.data.GetLength() + 3) & ~3;
+	}
+	return out;
+}
+
+String TTFReader::Subset(const Vector<wchar>& chars, int first, bool os2)
+{
+	try {
+		ASSERT(chars.GetCount() + first < 256);
+
+		TTFStreamOut cmap;
+		cmap.Put16(0);
+		cmap.Put16(1);
+		cmap.Put16(1);
+		cmap.Put16(0);
+		cmap.Put32(cmap.out.GetLength() + 4);
+		cmap.Put16(0);
+		cmap.Put16(262);
+		cmap.Put16(0);
+
+		Index<int> glyph;
+		glyph.Add(0);
+		for(int i = 0; i < first; i++)
+			cmap.Put8(0);
+		for(int i = 0; i < chars.GetCount(); i++) {
+			int q = GetGlyph(chars[i]);
+			if(q) {
+				cmap.Put8(glyph.GetCount());
+				glyph.Add(q);
+			}
+			else
+				cmap.Put8(0);
+		}
+		for(int i = chars.GetCount(); i < 256; i++)
+			cmap.Put8(0);
+
+		TTFStreamOut loca;
+		TTFStreamIn  in;
+		TTFStreamOut glyf;
+		TTFStreamOut hmtx;
+		Seek("glyf", in);
+		for(int i = 0; i < glyph.GetCount(); i++) {
+			int gi = glyph[i];
+			if(gi >= glyphinfo.GetCount())
+				throw Fail();
+			const GlyphInfo &gf = glyphinfo[gi];
+			loca.Put32(glyf.out.GetLength());
+			hmtx.Put16(gf.advanceWidth);
+			hmtx.Put16(gf.leftSideBearing);
+			if(gf.size) {
+				if(gf.size < 10)
+					Error();
+				in.Seek(gf.offset);
+				int c = (int16)Copy16(glyf, in);
+				Copy(glyf, in, 8);
+				if(c < 0) {
+					int flags;
+					do {
+						flags = Copy16(glyf, in);
+						glyf.Put16(glyph.FindAdd(in.Get16()));
+						if(flags & ARG_1_AND_2_ARE_WORDS)
+							Copy(glyf, in, 4);
+						else
+							Copy(glyf, in, 2);
+						if(flags & WE_HAVE_A_SCALE)
+							Copy16(glyf, in);
+						else
+						if(flags & WE_HAVE_AN_X_AND_Y_SCALE)
+							Copy(glyf, in, 4);
+						else
+						if(flags & WE_HAVE_A_TWO_BY_TWO)
+							Copy(glyf, in, 8);
+					}
+					while(flags & MORE_COMPONENTS);
+					if(flags & WE_HAVE_INSTRUCTIONS)
+						Copy(glyf, in, Copy16(glyf, in));
+				}
+				else
+					Copy(glyf, in, gf.size - 10);
+			}
+		}
+		loca.Put32(glyf.out.GetLength());
+
+		Hhea nhhea = hhea;
+		nhhea.numOfLongHorMetrics = glyph.GetCount();
+		TTFStreamOut hhea;
+		nhhea.Serialize(hhea);
+
+		Maxp nmaxp = maxp;
+		nmaxp.numGlyphs = glyph.GetCount();
+		TTFStreamOut maxp;
+		nmaxp.Serialize(maxp);
+
+		Post npost = post;
+		npost.format = 0x00030000;
+		TTFStreamOut post;
+		npost.Serialize(post);
+
+		Head nhead = head;
+		nhead.checkSumAdjustment = 0;
+		nhead.indexToLocFormat = 1;
+		TTFStreamOut head;
+		nhead.Serialize(head);
+
+		Array<NewTable> tab;
+		if(os2)
+			Add(tab, "OS/2", GetTable("OS/2"));
+		Add(tab, "cmap", cmap);
+		Add(tab, "cvt ", GetTable("cvt "));
+		Add(tab, "fpgm", GetTable("fpgm"));
+		Add(tab, "glyf", glyf);
+		int headi = tab.GetCount();
+		Add(tab, "head", head);
+		Add(tab, "hhea", hhea);
+		Add(tab, "hmtx", hmtx);
+		Add(tab, "loca", loca);
+		Add(tab, "maxp", maxp);
+		Add(tab, "name", GetTable("name"));
+		Add(tab, "post", post);
+		Add(tab, "prep", GetTable("prep"));
+
+		dword chksum = sCheckSum(CreateHeader(tab));
+		for(int i = 0; i < tab.GetCount(); i++)
+			chksum += tab[i].checksum;
+
+		nhead.checkSumAdjustment = 0xB1B0AFBA - chksum;
+		head.out.Clear();
+		nhead.Serialize(head);
+		Set(tab[headi], head);
+
+		String result = CreateHeader(tab);
+		for(int i = 0; i < tab.GetCount(); i++) {
+			result.Cat(tab[i].data);
+			result.Cat(0, (4 - result.GetCount()) & 3);
+		}
+
+		return result;
+	}
+	catch(Fail) {
+		return String::GetVoid();
+	}
+	catch(TTFStream::Fail) {
+		return String::GetVoid();
+	}
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/PdfDraw/init b/uppsrc/PdfDraw/init
new file mode 100644
index 000000000..5cee68b54
--- /dev/null
+++ b/uppsrc/PdfDraw/init
@@ -0,0 +1,5 @@
+#ifndef _PdfDraw_icpp_init_stub
+#define _PdfDraw_icpp_init_stub
+#include "Draw/init"
+#include "PdfReport.icpp"
+#endif
diff --git a/uppsrc/PdfDraw/ttf.h b/uppsrc/PdfDraw/ttf.h
new file mode 100644
index 000000000..6a31d760e
--- /dev/null
+++ b/uppsrc/PdfDraw/ttf.h
@@ -0,0 +1,6 @@
+#ifndef _PDF_ttf_h_
+#define _PDF_ttf_h_
+
+
+
+#endif
diff --git a/uppsrc/PlatformRef/PlatformRef.h b/uppsrc/PlatformRef/PlatformRef.h
new file mode 100644
index 000000000..06c96c578
--- /dev/null
+++ b/uppsrc/PlatformRef/PlatformRef.h
@@ -0,0 +1,9 @@
+#ifndef _PlatformRef_PlatformRef_h
+#define _PlatformRef_PlatformRef_h
+
+#include <CtrlLib/CtrlLib.h>
+
+using namespace Upp;
+
+#endif
+
diff --git a/uppsrc/PlatformRef/PlatformRef.upp b/uppsrc/PlatformRef/PlatformRef.upp
new file mode 100644
index 000000000..8f9b8948a
--- /dev/null
+++ b/uppsrc/PlatformRef/PlatformRef.upp
@@ -0,0 +1,10 @@
+uses
+	CtrlLib;
+
+file
+	PlatformRef.h,
+	main.cpp;
+
+mainconfig
+	"" = "GUI";
+
diff --git a/uppsrc/PlatformRef/main.cpp b/uppsrc/PlatformRef/main.cpp
new file mode 100644
index 000000000..8876b754d
--- /dev/null
+++ b/uppsrc/PlatformRef/main.cpp
@@ -0,0 +1,49 @@
+#include "PlatformRef.h"
+
+struct PlatformRef : public TopWindow {
+public:
+	String mouse, keyboard;
+
+	virtual void Paint(Draw& w);
+	virtual void MouseMove(Point p, dword flags);
+	virtual bool Key(dword key, int count);
+
+	typedef PlatformRef CLASSNAME;
+
+	PlatformRef();
+};
+
+void PlatformRef::MouseMove(Point p, dword flags)
+{
+	mouse = AsString(p);
+	Refresh();
+	Title(mouse);
+}
+
+void PlatformRef::Paint(Draw& w)
+{
+	Size sz = GetSize();
+	w.DrawRect(sz, White);
+	w.DrawText(0, 0, keyboard);
+	Size tsz = GetTextSize(mouse, StdFont());
+	w.DrawText(sz.cx - tsz.cx, 0, mouse);
+	
+	ImageBuffer ib(128, 128);
+	
+}
+
+bool PlatformRef::Key(dword key, int count)
+{
+	keyboard = GetKeyDesc(key);
+	Refresh();
+	return false;
+}
+
+PlatformRef::PlatformRef()
+{
+}
+
+GUI_APP_MAIN
+{
+	PlatformRef().Run();
+}
diff --git a/uppsrc/PostgreSQL/PostgreSQL.cpp b/uppsrc/PostgreSQL/PostgreSQL.cpp
new file mode 100644
index 000000000..b50250b6a
--- /dev/null
+++ b/uppsrc/PostgreSQL/PostgreSQL.cpp
@@ -0,0 +1,609 @@
+#include "PostgreSQL.h"
+
+#ifndef flagNOPOSTGRESQL
+
+NAMESPACE_UPP
+
+enum PGSQL_StandardOid {
+	PGSQL_BOOLOID = 16,
+	PGSQL_BYTEAOID = 17,
+	PGSQL_CHAROID = 18,
+	PGSQL_NAMEOID = 19,
+	PGSQL_INT8OID = 20,
+	PGSQL_INT2OID = 21,
+	PGSQL_INT2VECTOROID = 22,
+	PGSQL_INT4OID = 23,
+	PGSQL_REGPROCOID = 24,
+	PGSQL_TEXTOID = 25,
+	PGSQL_OIDOID = 26,
+	PGSQL_TIDOID = 27,
+	PGSQL_XIDOID = 28,
+	PGSQL_CIDOID = 29,
+	PGSQL_OIDVECTOROID = 30,
+	PGSQL_FLOAT4OID = 700,
+	PGSQL_FLOAT8OID = 701,
+	PGSQL_DATEOID = 1082,
+	PGSQL_TIMEOID = 1083,
+	PGSQL_TIMESTAMPOID = 1114,
+	PGSQL_TIMESTAMPZOID = 1184,
+	PGSQL_NUMERICOID = 1700
+};
+
+int OidToType(Oid oid)
+{
+	switch(oid) {
+		case PGSQL_BOOLOID:
+			return BOOL_V;
+		case PGSQL_INT8OID:
+			return INT64_V;
+		case PGSQL_INT2OID:
+		case PGSQL_INT2VECTOROID:
+		case PGSQL_INT4OID:
+			return INT_V;
+		case PGSQL_FLOAT4OID:
+		case PGSQL_FLOAT8OID:
+		case PGSQL_NUMERICOID:
+			return DOUBLE_V;
+		case PGSQL_DATEOID:
+			return DATE_V;
+		case PGSQL_TIMEOID:
+		case PGSQL_TIMESTAMPOID:
+		case PGSQL_TIMESTAMPZOID:
+			return TIME_V;
+		case PGSQL_BYTEAOID:
+			return BYTEA_V;
+	}
+	return STRING_V;
+}
+
+class PostgreSQLConnection : public SqlConnection {
+protected:
+	virtual void        SetParam(int i, const Value& r);
+	virtual bool        Execute();
+	virtual int         GetRowsProcessed() const;
+	virtual Value       GetInsertedId() const;
+	virtual bool        Fetch();
+	virtual void        GetColumn(int i, Ref f) const;
+	virtual void        Cancel();
+	virtual SqlSession& GetSession() const;
+	virtual String      GetUser() const;
+	virtual String      ToString() const;
+
+private:
+	PostgreSQLSession& session;
+
+	PGconn         *conn;
+	Vector<String>  param;
+	PGresult       *result;
+	Vector<Oid>     oid;
+	int             rows;
+	int             fetched_row; //-1, if not fetched yet
+
+	void            FreeResult();
+	String          ErrorMessage();
+	String          ErrorCode();
+
+public:
+	PostgreSQLConnection(PostgreSQLSession& a_session, PGconn *a_conn);
+	virtual ~PostgreSQLConnection() { Cancel(); }
+};
+
+const char *PostgreSQLReadString(const char *s, String& stmt)
+{
+	//TODO: to clear this, currently this is based on sqlite
+	stmt.Cat(*s);
+	int c = *s++;
+	for(;;) {
+		if(*s == '\0') break;
+		else
+		if(*s == '\'' && s[1] == '\'') {
+			stmt.Cat('\'');
+			s += 2;
+		}
+		else
+		if(*s == c) {
+			stmt.Cat(c);
+			s++;
+			break;
+		}
+		else
+		if(*s == '\\') {
+			stmt.Cat('\\');
+			if(*++s)
+				stmt.Cat(*s++);
+		}
+		else
+			stmt.Cat(*s++);
+	}
+	return s;
+}
+
+bool PostgreSQLPerformScript(const String& txt, StatementExecutor& se, Gate2<int, int> progress_canceled)
+{
+	const char *text = txt;
+	for(;;) {
+		String stmt;
+		while(*text <= 32 && *text > 0) text++;
+		if(*text == '\0') break;
+		for(;;) {
+			if(*text == '\0')
+				break;
+			if(*text == ';')
+				break;
+			else
+			if(*text == '\'')
+				text = PostgreSQLReadString(text, stmt);
+			else
+			if(*text == '\"')
+				text = PostgreSQLReadString(text, stmt);
+			else
+				stmt.Cat(*text++);
+		}
+		if(progress_canceled(text - txt.Begin(), txt.GetLength()))
+			return false;
+		if(!se.Execute(stmt))
+			return false;
+		if(*text) text++;
+	}
+	return true;
+}
+
+String PostgreSQLConnection::ErrorMessage()
+{
+	return FromSystemCharset(PQerrorMessage(conn));
+}
+
+String PostgreSQLConnection::ErrorCode()
+{
+	return PQresultErrorField(result, PG_DIAG_SQLSTATE);
+}
+
+String PostgreSQLSession::ErrorMessage()
+{
+	return FromSystemCharset(PQerrorMessage(conn));
+}
+
+String PostgreSQLSession::ErrorCode()
+{
+	return PQresultErrorField(result, PG_DIAG_SQLSTATE);
+}
+
+Vector<String> PostgreSQLSession::EnumUsers()
+{
+	Vector<String> vec;
+	Sql sql(*this);
+	sql.Execute("select rolname from pg_authid where rolcanlogin");
+	while(sql.Fetch())
+		vec.Add(sql[0]);
+	return vec;
+}
+
+Vector<String> PostgreSQLSession::EnumDatabases()
+{
+	Vector<String> vec;
+	Sql sql(*this);
+	sql.Execute("select datname from pg_database");
+	while(sql.Fetch())
+		vec.Add(sql[0]);
+	return vec;
+}
+
+Vector<String> PostgreSQLSession::EnumData(char type, const char *schema)
+{
+	Vector<String> vec;
+	Sql sql(Format("select n.nspname || '.' || c.relname from pg_catalog.pg_class c "
+		             "left join pg_catalog.pg_namespace n "
+		               "on n.oid = c.relnamespace "
+		            "where c.relkind = '%c' "
+		              "and n.nspname like '%s' "
+		              "and pg_catalog.pg_table_is_visible(c.oid)",
+		              type, schema ? schema : "%"), *this);
+	sql.Execute();
+	while(sql.Fetch())
+		vec.Add(sql[0]);
+	return vec;
+}
+
+Vector<String> PostgreSQLSession::EnumTables(String database)
+{
+	return EnumData('r', database);
+}
+
+Vector<String> PostgreSQLSession::EnumViews(String database)
+{
+	return EnumData('v', database);
+}
+
+Vector<String> PostgreSQLSession::EnumSequences(String database)
+{
+	return EnumData('S', database);
+}
+
+Vector<SqlColumnInfo> PostgreSQLSession::EnumColumns(String database, String table)
+{
+	/* database means schema here - support for schemas is a something to fix in sql interface */
+
+	int q = table.Find('.');
+	if(q) table = table.Mid(q + 1);
+	Vector<SqlColumnInfo> vec;
+	Sql sql(Format("select a.attname, a.atttypid, a.attlen, a.atttypmod, a.attnotnull "
+	                 "from pg_catalog.pg_attribute a "
+	                "inner join pg_catalog.pg_class c "
+	                   "on a.attrelid = c.oid "
+	                "inner join pg_catalog.pg_namespace n "
+	                   "on c.relnamespace = n.oid "
+	                "where c.relname = '%s' "
+	                  "and n.nspname = '%s' "
+	                  "and a.attnum > 0 "
+	                  "and a.attisdropped = '0' "
+	                "order by a.attnum", table, database), *this);
+	sql.Execute();
+	while(sql.Fetch())
+	{
+		SqlColumnInfo &ci = vec.Add();
+		int type_mod = int(sql[3]) - sizeof(int32);
+		ci.name = sql[0];
+		ci.type = OidToType(IsString(sql[1]) ? atoi(String(sql[1])) : (int)sql[1]);
+		ci.width = sql[2];
+		if(ci.width < 0)
+			ci.width = type_mod;
+		ci.precision = (type_mod >> 16) & 0xffff;
+		ci.scale = type_mod & 0xffff;
+		ci.nullable = sql[4] == "0";
+	}
+	return vec;
+}
+
+Vector<String> PostgreSQLSession::EnumPrimaryKey(String database, String table)
+{
+//	SELECT cc.conname, a.attname
+//	 FROM pg_constraint cc
+//	 INNER JOIN pg_class c
+//	    ON c.oid=conrelid
+//	 INNER JOIN pg_attribute a
+//	    ON a.attnum = ANY(conkey)
+//	   AND a.attrelid = c.oid
+//	WHERE contype='p'
+//	AND relname = '?'
+	return Vector<String>(); //TODO
+}
+
+String PostgreSQLSession::EnumRowID(String database, String table)
+{
+	return ""; //TODO
+}
+
+Vector<String> PostgreSQLSession::EnumReservedWords()
+{
+	return Vector<String>(); //TODO
+}
+
+SqlConnection * PostgreSQLSession::CreateConnection()
+{
+	return new PostgreSQLConnection(*this, conn);
+}
+
+void PostgreSQLSession::ExecTrans(const char * statement)
+{
+	if(trace)
+		*trace << statement << "\n";
+	result = PQexec(conn, statement);
+	if(PQresultStatus(result) == PGRES_COMMAND_OK)
+	{
+		PQclear(result);
+		return;
+	}
+	if(trace)
+		*trace << statement << " failed: " << ErrorMessage() << "\n";
+	SetError(ErrorMessage(), statement, 0, ErrorCode());
+	PQclear(result);
+}
+
+bool PostgreSQLSession::Open(const char *connect)
+{
+	Close();
+	conn = PQconnectdb(connect);
+	if(PQstatus(conn) != CONNECTION_OK)
+	{
+		SetError(ErrorMessage(), "Opening database");
+		Close();
+		return false;
+	}
+	level = 0;
+	return true;
+}
+
+void PostgreSQLSession::Close()
+{
+	if(!conn)
+		return;
+#ifndef flagNOAPPSQL
+	if(SQL.IsOpen() && &SQL.GetSession() == this)
+		SQL.Cancel();
+#endif
+
+	PQfinish(conn);
+	conn = NULL;
+	level = 0;
+}
+
+void PostgreSQLSession::Begin()
+{
+	ExecTrans("begin");
+	level++;
+}
+
+void PostgreSQLSession::Commit()
+{
+	ExecTrans("commit");
+	level--;
+}
+
+void PostgreSQLSession::Rollback()
+{
+	ExecTrans("rollback");
+	level--;
+}
+
+int PostgreSQLSession::GetTransactionLevel() const
+{
+	return level;
+}
+
+void PostgreSQLConnection::SetParam(int i, const Value& r)
+{
+	String p;
+	if(IsNull(r))
+		p = "NULL";
+	else
+		switch(r.GetType()) {
+		case BYTEA_V: {
+			String raw = SqlRaw(r);
+			size_t rl;
+			unsigned char *s = PQescapeByteaConn(conn, (const byte *)~raw, raw.GetLength(), &rl);
+			p.Reserve(rl + 16);
+			p = "\'" + String(s, rl - 1) + "\'::bytea";
+			PQfreemem(s);
+			break;
+		}
+		case WSTRING_V:
+		case STRING_V: {
+				String v = r;
+				StringBuffer b(v.GetLength() * 2 + 3);
+				char *q = b;
+				*q = '\'';
+				int *err = NULL;
+				int n = PQescapeStringConn(conn, q + 1, v, v.GetLength(), err);
+				q[1 + n] = '\'';
+				b.SetCount(2 + n);
+				p = b;
+			}
+			break;
+		case BOOL_V:
+		case INT_V:
+			p << int(r);
+			break;
+		case INT64_V:
+			p << int64(r);
+			break;
+		case DOUBLE_V:
+			p = FormatDouble(double(r), 20);
+			break;
+		case DATE_V: {
+				Date d = r;
+				p = Format("\'%04d-%02d-%02d\'", d.year, d.month, d.day);
+			}
+			break;
+		case TIME_V: {
+				Time t = r;
+				p = Format("\'%04d-%02d-%02d %02d:%02d:%02d\'",
+						   t.year, t.month, t.day, t.hour, t.minute, t.second);
+			}
+			break;
+		default:
+			NEVER();
+		}
+	param.At(i, p);
+}
+
+bool PostgreSQLConnection::Execute()
+{
+	Cancel();
+	if(statement.GetLength() == 0) {
+		session.SetError("Empty statement", statement);
+		return false;
+	}
+	String query;
+	int pi = 0;
+	const char *s = statement;
+	while(s < statement.End())
+		if(*s == '\'' || *s == '\"')
+			s = PostgreSQLReadString(s, query);
+		else {
+			if(*s == '?')
+				query.Cat(param[pi++]);
+			else
+				query.Cat(*s);
+			s++;
+		}
+	param.Clear();
+
+	Stream *trace = session.GetTrace();
+	dword time;
+	if(session.IsTraceTime())
+		time = GetTickCount();
+
+	result = PQexecParams(conn, query, 0, NULL, NULL, NULL, NULL, 0);
+
+	if(trace) {
+		if(session.IsTraceTime())
+			*trace << Format("--------------\nexec %d ms:\n", msecs(time));
+	}
+	if(PQresultStatus(result) == PGRES_TUPLES_OK) //result set
+	{
+		rows = PQntuples(result);
+		int fields = PQnfields(result);
+		info.SetCount(fields);
+		oid.SetCount(fields);
+		for(int i = 0; i < fields; i++)
+		{
+			SqlColumnInfo& f = info[i];
+			f.name = ToUpper(PQfname(result, i));
+			f.width = PQfsize(result, i);
+			int type_mod = PQfmod(result, i) - sizeof(int32);
+			if(f.width < 0)
+				f.width = type_mod;
+			f.precision = (type_mod >> 16) & 0xffff;
+			f.scale = type_mod & 0xffff;
+			f.nullable = true;
+			Oid type_oid = PQftype(result, i);
+			f.type = OidToType(type_oid);
+			oid[i] = type_oid;
+		}
+		return true;
+	}
+	if(PQresultStatus(result) == PGRES_COMMAND_OK) //command executed OK
+	{
+		rows = atoi(PQcmdTuples(result));
+		return true;
+	}
+
+	session.SetError(ErrorMessage(), query, 0, ErrorCode());
+	FreeResult();
+	return false;
+}
+
+int PostgreSQLConnection::GetRowsProcessed() const
+{
+	return rows;
+}
+
+Value PostgreSQLConnection::GetInsertedId() const
+{
+	//it needs GetInsertedId(const char * sequence)
+	//there is no other/better way to retrieve last inserted id
+	const char * sequence = NULL;
+
+	Sql sql(Format("select currval('%s')", sequence), session);
+	if(sql.Execute() && sql.Fetch())
+		return sql[0];
+	else
+		return Null;
+}
+
+bool PostgreSQLConnection::Fetch()
+{
+	fetched_row++;
+	if(result && rows > 0 && fetched_row < rows)
+		return true;
+	Cancel();
+	return false;
+}
+
+static Date sDate(const char *s)
+{
+	// 0123456789012345678
+	// YYYY-MM-DD HH-MM-SS
+	return Date(atoi(s), atoi(s + 5), atoi(s + 8));
+}
+
+void PostgreSQLConnection::GetColumn(int i, Ref f) const
+{
+	if(PQgetisnull(result, fetched_row, i))
+	{
+		f = Null;
+		return;
+	}
+	char *s = PQgetvalue(result, fetched_row, i);
+	switch(info[i].type)
+	{
+		case INT64_V:
+			f.SetValue(ScanInt64(s));
+			break;
+		case INT_V:
+			f.SetValue(atoi(s));
+			break;
+		case DOUBLE_V:
+			f.SetValue(atof(s));
+			break;
+		case BOOL_V:
+			f.SetValue(*s == 't' ? true : false);
+			break;
+		case DATE_V:
+			f.SetValue(sDate(s));
+			break;
+		case TIME_V: {
+				Time t = ToTime(sDate(s));
+				t.hour = atoi(s + 11);
+				t.minute = atoi(s + 14);
+				t.second = atoi(s + 17);
+				f.SetValue(t);
+			}
+			break;
+		default: {
+			if(oid[i] == PGSQL_BYTEAOID) {
+				size_t len;
+				unsigned char *q = PQunescapeBytea((const unsigned char *)s, &len);
+				f.SetValue(String(q, len));
+				PQfreemem(q);
+			}
+			else
+				f.SetValue(String(s));
+		}
+	}
+}
+
+void PostgreSQLConnection::Cancel()
+{
+	info.Clear();
+	rows = 0;
+	fetched_row = -1;
+	FreeResult();
+}
+
+SqlSession& PostgreSQLConnection::GetSession() const
+{
+	return session;
+}
+
+String PostgreSQLConnection::GetUser() const
+{
+	return PQuser(conn);
+}
+
+String PostgreSQLConnection::ToString() const
+{
+	return statement;
+}
+
+void PostgreSQLConnection::FreeResult()
+{
+	if(result)
+	{
+		PQclear(result);
+		result = NULL;
+	}
+}
+
+PostgreSQLConnection::PostgreSQLConnection(PostgreSQLSession& a_session, PGconn *a_conn)
+  : session(a_session), conn(a_conn)
+{
+	result = NULL;
+}
+
+Value PgSequence::Get()
+{
+#ifndef NOAPPSQL
+	Sql sql(session ? *session : SQL.GetSession());
+#else
+	ASSERT(session);
+	Sql sql(*session);
+#endif
+	if(!sql.Execute(Select(NextVal(seq)).Get()) || !sql.Fetch())
+		return ErrorValue();
+	return sql[0];
+}
+
+END_UPP_NAMESPACE
+
+#endif
diff --git a/uppsrc/PostgreSQL/PostgreSQL.h b/uppsrc/PostgreSQL/PostgreSQL.h
new file mode 100644
index 000000000..71571217e
--- /dev/null
+++ b/uppsrc/PostgreSQL/PostgreSQL.h
@@ -0,0 +1,104 @@
+#ifndef _PostgreSQL_PostgeSQL_h_
+#define _PostgreSQL_PostgeSQL_h_
+
+#ifndef flagNOPOSTGRESQL
+
+#include <Sql/Sql.h>
+#ifdef PLATFORM_WIN32
+#include <libpq-fe.h>
+#elif defined(PLATFORM_POSIX)
+#include <postgresql/libpq-fe.h>
+#endif
+
+NAMESPACE_UPP
+
+// Postgre -> Value types
+// Bytea_v values are stored as bytea data, but recived as string type
+const int BYTEA_V = 34;
+
+const char *PostgreSQLReadString(const char *s, String& stmt);
+
+bool PostgreSQLPerformScript(const String& text,
+#ifdef NOAPPSQL
+	StatementExecutor& se,
+#else
+	StatementExecutor& se = SQLStatementExecutor(),
+#endif
+	Gate2<int, int> progress_canceled = false
+);
+
+
+String PostgreSQLTextType(int n);
+
+class PostgreSQLSession : public SqlSession {
+public:
+	virtual bool                  IsOpen() const                   { return conn; }
+	virtual RunScript             GetRunScript() const             { return &PostgreSQLPerformScript; }
+
+	virtual Vector<String>        EnumUsers();
+	virtual Vector<String>        EnumDatabases();
+	virtual Vector<String>        EnumTables(String database);
+	virtual Vector<String>        EnumViews(String database);
+	virtual Vector<String>        EnumSequences(String database);
+	virtual Vector<SqlColumnInfo> EnumColumns(String database, String table);
+	virtual Vector<String>        EnumPrimaryKey(String database, String table);
+	virtual String                EnumRowID(String database, String table);
+	virtual Vector<String>        EnumReservedWords();
+
+protected:
+	virtual SqlConnection *CreateConnection();
+
+private:
+	PGconn               *conn;
+	PGresult             *result;
+
+	void                  ExecTrans(const char * statement);
+	Vector<String>        EnumData(char type, const char *schema = NULL);
+	String                ErrorMessage();
+	String                ErrorCode();
+	int                   level;
+
+public:
+	bool                  Open(const char *connect);
+	void                  Close();
+
+	String                GetUser() { return PQuser(conn); }
+	operator PGconn *     ()        { return conn; }
+
+	virtual void          Begin();
+	virtual void          Commit();
+	virtual void          Rollback();
+	virtual int           GetTransactionLevel() const;
+
+	PostgreSQLSession()  { conn = NULL; Dialect(PGSQL); level = 0; }
+	~PostgreSQLSession() { Close(); }
+	PGconn * GetPGConn() { return conn; }
+};
+
+class PgSequence : public ValueGen {
+	SqlId       ssq;
+	SqlId&      seq;
+	SqlSession *session;
+
+public:
+	virtual Value  Get();
+
+	Value operator++()                                                  { return Get(); }
+
+	void Set(SqlId id, SqlSession& s)                                   { ssq = id; session = &s; }
+
+#ifndef NOAPPSQL
+	void Set(SqlId id)                                                  { ssq = id; session = NULL; }
+	PgSequence(const char *name) : ssq(name), seq(ssq)                  { session = NULL; }
+	PgSequence(SqlId& seq) : seq(seq)                                   { session = NULL; }
+#endif
+	PgSequence(const char *name, SqlSession& s) : ssq(name), seq(ssq)   { session = &s; }
+	PgSequence(SqlId& seq, SqlSession& s) : seq(seq)                    { session = &s; }
+	PgSequence() : seq(ssq)                                             { session = NULL; }
+};
+
+END_UPP_NAMESPACE
+
+#endif
+
+#endif
diff --git a/uppsrc/PostgreSQL/PostgreSQL.upp b/uppsrc/PostgreSQL/PostgreSQL.upp
new file mode 100644
index 000000000..77cf9723f
--- /dev/null
+++ b/uppsrc/PostgreSQL/PostgreSQL.upp
@@ -0,0 +1,14 @@
+uses
+	Sql;
+
+library(WIN32 !NOPOSTGRESQL MSC) ms\libpq;
+
+library(WIN32 !NOPOSTGRESQL GCC) pq;
+
+library(LINUX !NOPOSTGRESQL) pq;
+
+file
+	PostgreSQL.h,
+	PostgreSQLSchema.h,
+	PostgreSQL.cpp;
+
diff --git a/uppsrc/PostgreSQL/PostgreSQLSchema.h b/uppsrc/PostgreSQL/PostgreSQLSchema.h
new file mode 100644
index 000000000..b6889ef71
--- /dev/null
+++ b/uppsrc/PostgreSQL/PostgreSQLSchema.h
@@ -0,0 +1,187 @@
+#define INT(x)                     COLUMN("integer", int, x, 0, 0)
+#define INT_ARRAY(x, items)        COLUMN_ARRAY("integer", int, x, 0, 0, items)
+#define INT_(x)                    COLUMN_("integer", int, x, 0, 0)
+#define INT_ARRAY_(x, items)       COLUMN_ARRAY("integer", int, x, 0, 0, items)
+
+#define INT64(x)                   COLUMN("bigint", int64, x, 0, 0)
+#define INT64_ARRAY(x, items)      COLUMN_ARRAY("bigint", int64, x, 0, 0, items)
+#define INT64_(x)                  COLUMN_("bigint", int64, x, 0, 0)
+#define INT64_ARRAY_(x, items)     COLUMN_ARRAY_("bigint", int64, x, 0, 0, items)
+
+#define SERIAL(x)                  COLUMN("serial", int64, x, 0, 0) //int is not enough, as it is unsigned
+#define SERIAL_ARRAY(x, items)     COLUMN_ARRAY("serial", int64, x, 0, 0, items)
+#define SERIAL_(x)                 COLUMN_("serial", int64, x, 0, 0)
+#define SERIAL_ARRAY_(x, items)    COLUMN_ARRAY_("serial", int64, x, 0, 0, items)
+
+#define BIGSERIAL(x)               COLUMN("bigserial", int64, x, 0, 0)
+#define BIGSERIAL_ARRAY(x, items)  COLUMN_ARRAY("bigserial", int64, x, 0, 0, items)
+#define BIGSERIAL_(x)              COLUMN_("bigserial", int64, x, 0, 0)
+#define BIGSERIAL_ARRAY_(x, items) COLUMN_ARRAY_("bigserial", int64, x, 0, 0, items)
+
+#define DOUBLE(x)                  COLUMN("double precision", double, x, 0, 0)
+#define DOUBLE_ARRAY(x, items)     COLUMN_ARRAY("double precision", double, x, 0, 0, items)
+#define DOUBLE_(x)                 COLUMN_("double precision", double, x, 0, 0)
+#define DOUBLE_ARRAY_(x, items)    COLUMN_ARRAY_("double precision", double, x, 0, 0, items)
+
+#define STRING(x, n)               COLUMN("varchar(" #n ")", String, x, n, 0)
+#define STRING_ARRAY(x, n, items)  COLUMN_ARRAY("varchar(" #n ")", String, x, n, 0, items)
+#define STRING_(x, n)              COLUMN_("varchar(" #n ")", String, x, n, 0)
+#define STRING_ARRAY_(x, n, items) COLUMN_ARRAY_("varchar(" #n ")", String, x, n, 0, items)
+
+#define DATE(x)                    COLUMN("date", Date, x, 0, 0)
+#define DATE_ARRAY(x, items)       COLUMN_ARRAY("date", Date, x, 0, 0, items)
+#define DATE_(x)                   COLUMN_("date", Date, x, 0, 0)
+#define DATE_ARRAY_(x, items)      COLUMN_ARRAY_("date", Date, x, 0, 0, items)
+
+#define TIME(x)                    COLUMN("timestamp", Time, x, 0, 0)
+#define TIME_ARRAY(x, items)       COLUMN_ARRAY("timestamp", Time, x, 0, 0, items)
+#define TIME_(x)                   COLUMN_("timestamp", Time, x, 0, 0)
+#define TIME_ARRAY_(x, items)      COLUMN_ARRAY_("timestamp", Time, x, 0, 0, items)
+
+#define BOOL(x)                    COLUMN("char(1)", bool, x, 0, 0)
+#define BOOL_ARRAY(x, items)       COLUMN_ARRAY("char(1)", bool, x, 0, 0, items)
+#define BOOL_(x)                   COLUMN_("char(1)", bool, x, 0, 0)
+#define BOOL_ARRAY_(x, items)      COLUMN_ARRAY_("char(1)", bool, x, 0, 0, items)
+
+#define LONG(x)                    COLUMN("text", String, x, 0, 0)
+#define LONG_(x)                   COLUMN_("text", String, x, 0, 0)
+
+#define LONGRAW(x)                 COLUMN("bytea", String, x, 0, 0)
+#define LONGRAW_(x)                COLUMN_("bytea", String, x, 0, 0)
+
+#define BLOB(x)                    COLUMN("bytea", String, x, 0, 0)
+#define BLOB_(x)                   COLUMN_("bytea", String, x, 0, 0)
+
+#define CLOB(x)                    COLUMN("text", String, x, 0, 0)
+#define CLOB_(x)                   COLUMN_("text", String, x, 0, 0)
+
+#define SEQUENCE(x)                SCHEMA("create sequence " #x " start with 1;",\
+                                          "drop sequence " #x ";") \
+                                   UPGRADE("create sequence " #x " start with 1;")
+#define SEQUENCE_(x)               DOID(x) SEQUENCE(x)
+
+#define PRIMARY_KEY                INLINE_ATTRIBUTE("primary key")
+#define NOT_NULL                   INLINE_ATTRIBUTE("not null")
+#define UNIQUE                     INLINE_ATTRIBUTE("unique")
+#define SQLDEFAULT(v)              INLINE_ATTRIBUTE("default " #v)
+
+#define INDEX                      ATTRIBUTE("create index IDX_@x on @t(@c);", \
+                                             "drop index IDX_@x;")
+#ifndef REFERENCES
+#define REFERENCES(x)              ATTRIBUTE("alter table @t add constraint FK_@x foreign key "\
+                                             "(@c) references " #x ";",\
+                                             "alter table @t drop constraint FK_@x;")
+#endif
+#ifndef REFERENCES_CASCADE
+#define REFERENCES_CASCADE(x)      ATTRIBUTE("alter table @t add constraint FK_@x foreign key "\
+                                             "(@c) references " #x " on delete cascade;",\
+                                             "alter table @t drop constraint FK_@x;")
+#endif
+#ifndef REFERENCES_
+#define REFERENCES_(n, x)          ATTRIBUTE("alter table @t add constraint FK_@x$" #n " foreign key "\
+                                             "(@c) references " #x ";",\
+                                             "alter table @t drop constraint FK_@x$" #n ";")
+#endif
+#ifndef REFERENCES_CASCADE_
+#define REFERENCES_CASCADE_(n, x)  ATTRIBUTE("alter table @t add constraint FK_@x$" #n " foreign key "\
+                                             "(@c) references " #x " on delete cascade;",\
+                                             "alter table @t drop constraint FK_@x$" #n ";")
+#endif
+
+#define DUAL_PRIMARY_KEY(k1, k2)   ATTRIBUTE("alter table @t add constraint DK_@t primary key "\
+                                             "(" #k1 ", " #k2 ");",\
+                                             "alter table @t drop constraint DK_@t;")
+
+#define DUAL_UNIQUE(k1, k2)        ATTRIBUTE("alter table @t add constraint DQ_@t unique "\
+                                             "(" #k1 ", " #k2 ");",\
+                                             "alter table @t drop constraint DQ_@t;")
+
+#define SQLCHECK(name, chk)        ATTRIBUTE("alter table @t add constraint CHK_@t$" #name " check "\
+                                             "(" chk ");",\
+                                             "alter table @t drop constraint CHK_@t$" #name ";")
+
+#define PRIMARY_KEY_LIST(name, keys) \
+ATTRIBUTE("alter table @t add constraint PKL_@t$" #name " primary key (" keys ");", \
+          "alter table @t drop constraint PKL_@t$" #name  ";")
+
+#define REFERENCES_LIST(name, fks, tab, keys) \
+ATTRIBUTE("alter table @t add constraint FKL_@t$" #name " foreign key " \
+          "(" fks ") references " #tab "(" keys ");", \
+          "alter table @t drop constraint FKL_@t$" #name ";")
+
+#define INDEX_LIST(name, keys) \
+ATTRIBUTE("create index IDXL_@t$" #name " on @t(" keys ");", \
+          "drop index IDXL_@t$" #name ";");
+
+#define UNIQUE_LIST(name, list) \
+ATTRIBUTE("alter table @t add constraint UQ_@t$" #name " unique (" list ");", \
+          "alter table @t drop constraint UQ_@t$" #name ";")
+
+#include <Sql/sch_model.h>
+
+#undef INT
+#undef INT_ARRAY
+#undef INT_
+#undef INT_ARRAY_
+
+#undef INT64
+#undef INT64_ARRAY
+#undef INT64_
+#undef INT64_ARRAY_
+
+#undef SERIAL
+#undef SERIAL_ARRAY
+#undef SERIAL_
+#undef SERIAL_ARRAY_
+
+#undef BIGSERIAL
+#undef BIGSERIAL_ARRAY
+#undef BIGSERIAL_
+#undef BIGSERIAL_ARRAY_
+
+#undef DOUBLE
+#undef DOUBLE_ARRAY
+#undef DOUBLE_
+#undef DOUBLE_ARRAY_
+
+#undef STRING
+#undef STRING_ARRAY
+#undef STRING_
+#undef STRING_ARRAY_
+
+#undef DATE
+#undef DATE_ARRAY
+#undef DATE_
+#undef DATE_ARRAY_
+
+#undef TIME
+#undef TIME_ARRAY
+#undef TIME_
+#undef TIME_ARRAY_
+
+#undef BOOL
+#undef BOOL_ARRAY
+#undef BOOL_
+#undef BOOL_ARRAY_
+
+#undef LONG
+#undef LONG_
+
+#undef LONGRAW
+#undef LONGRAW_
+
+#undef SEQUENCE
+
+#undef PRIMARY_KEY
+#undef NOT_NULL
+#undef INDEX
+#undef UNIQUE
+#undef SQLDEFAULT
+#undef REFERENCES
+#undef REFERENCES_
+#undef REFERENCES_CASCADE
+#undef REFERENCES_CASCADE_
+#undef DUAL_PRIMARY_KEY
+#undef DUAL_UNIQUE
+#undef UNIQUE_LIST
+#undef SQLCHECK
diff --git a/uppsrc/PostgreSQL/init b/uppsrc/PostgreSQL/init
new file mode 100644
index 000000000..7b511f8a9
--- /dev/null
+++ b/uppsrc/PostgreSQL/init
@@ -0,0 +1,4 @@
+#ifndef _PostgreSQL_icpp_init_stub
+#define _PostgreSQL_icpp_init_stub
+#include "Sql/init"
+#endif
diff --git a/uppsrc/Report/Report.cpp b/uppsrc/Report/Report.cpp
new file mode 100644
index 000000000..753f82ff0
--- /dev/null
+++ b/uppsrc/Report/Report.cpp
@@ -0,0 +1,170 @@
+#include "Report.h"
+
+NAMESPACE_UPP
+
+Report::Report()
+{
+	mg.x = mg.y = Null;
+	Clear();
+}
+
+Report::Report(int cx, int cy)
+{
+	mg.x = mg.y = Null;
+	SetPageSize(cx, cy);
+}
+
+Report::Report(const Size &sz)
+{
+	mg.x = mg.y = Null;
+	SetPageSize(sz);
+}
+
+Report& Report::SetPageSize(Size sz)
+{
+	page.Clear();
+	header = footer = Null;
+	headercy = footercy = headerspc = footerspc = 0;
+	pagei = -1;
+	Page(0);
+	Create(sz);
+	StartPage(0);
+	return *this;
+}
+
+void Report::Clear()
+{
+	SetPageSize(3968, 6074);
+}
+
+Draw& Report::Info()
+{
+	return *this;
+}
+
+Rect Report::GetPageRect()
+{
+	Rect r = GetSize();
+	r.top += headercy + headerspc;
+	r.bottom -= footercy + footerspc;
+	return r;
+}
+
+void Report::PaintHF(Draw& w, int y, const char *qtf, int i)
+{
+	RichText txt = ParseQTF(FormatHF(qtf, i));
+	txt.Paint(w, 0, y, GetSize().cx);
+}
+
+void Report::StartPage(int i)
+{
+	DrawingDraw dw;
+	PaintHF(dw, 0, header, i);
+	PaintHF(dw, GetSize().cy - footercy, footer, i);
+	Drawing& g = page.At(i);
+	g = dw;
+	g.SetSize(GetSize());
+	Create(GetSize());
+	y = GetPageRect().top;
+}
+
+Draw& Report::Page(int i)
+{
+	ASSERT(i >= 0);
+	if(i != pagei) {
+		Flush();
+		pagei = i;
+		while(page.GetCount() <= pagei)
+			StartPage(page.GetCount());
+		y = GetPageRect().top;
+		Create(GetSize());
+	}
+	return *this;
+}
+
+String  Report::FormatHF(const char *s, int pageno)
+{
+	String result;
+	while(*s) {
+		if(s[0] == '$' && s[1] == '$') {
+			if(s[2] == 'P') {
+				result << pageno + 1;
+				s += 3;
+			}
+			else
+			if(s[2] == 'D') {
+				result.Cat(Format(GetSysDate()));
+				s += 3;
+			}
+		}
+		result.Cat(*s++);
+	}
+	return result;
+}
+
+int Report::GetHeightHF(const char *s)
+{
+	RichText txt = ParseQTF(FormatHF(s, 9999));
+	return txt.GetHeight(GetSize().cx);
+}
+
+Report& Report::Header(const char *qtf, int spc)
+{
+	header = qtf;
+	headerspc = spc;
+	headercy = qtf ? GetHeightHF(qtf) : 0;
+	RestartPage();
+	return *this;
+}
+
+Report& Report::Footer(const char *qtf, int spc)
+{
+	footer = qtf;
+	footerspc = spc;
+	footercy = qtf ? GetHeightHF(qtf) : 0;
+	RestartPage();
+	return *this;
+}
+
+void Report::RestartPage()
+{
+	page.SetCount(pagei + 1);
+	StartPage(pagei);
+}
+
+void Report::Flush()
+{
+	if(pagei >= 0) {
+		Drawing dw = GetResult();
+		page.At(pagei).Append(dw);
+		Create(GetSize());
+	}
+}
+
+Report& Report::Landscape()
+{
+	Size sz = GetSize();
+	SetPageSize(sz.cy, sz.cx);
+	return *this;
+}
+
+void Report::Put(const RichText& txt)
+{
+	PageY py(pagei, y);
+	PaintInfo paintinfo;
+	paintinfo.top = PageY(0, 0);
+	paintinfo.bottom = PageY(INT_MAX, INT_MAX);
+	paintinfo.indexentry = Null;
+	paintinfo.hyperlink = Null;
+	txt.Paint(*this, py, GetPageRect(), paintinfo);
+	py = txt.GetHeight(py, GetPageRect());
+	Page(py.page);
+	y = py.y;
+}
+
+void Report::Put(const char *qtf)
+{
+	Put(ParseQTF(qtf));
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/Report/Report.h b/uppsrc/Report/Report.h
new file mode 100644
index 000000000..1e7bd9bad
--- /dev/null
+++ b/uppsrc/Report/Report.h
@@ -0,0 +1,145 @@
+#ifndef _Report_Report_h
+#define _Report_Report_h
+
+#include <CtrlLib/CtrlLib.h>
+#include <RichText/RichText.h>
+
+NAMESPACE_UPP
+
+#define  LAYOUTFILE <Report/Report.lay>
+#include <CtrlCore/lay.h>
+
+class Report : public DrawingDraw, public PageDraw {
+public:
+	virtual Draw& Info();
+	virtual Draw& Page(int i);
+
+private:
+	Array<Drawing> page;
+	int            pagei;
+	int            y;
+	String         header, footer;
+	int            headercy, headerspc, footercy, footerspc;
+	Point          mg;
+
+	void    Flush();
+	String  FormatHF(const char *s, int pageno);
+	int     GetHeightHF(const char *s);
+	void    PaintHF(Draw& w, int y, const char *qtf, int i);
+	void    StartPage(int i);
+	void    RestartPage();
+
+public:
+	int                   GetCount()                  { Flush(); return page.GetCount(); }
+	Drawing               GetPage(int i)              { Flush(); return page[i]; }
+	Drawing               operator[](int i)           { return GetPage(i); }
+	const Array<Drawing>& GetPages()                  { Flush(); return page; }
+
+	void                  Clear();
+
+	Rect                  GetPageRect();
+	Size                  GetPageSize()               { return GetPageRect().Size(); }
+
+	void                  SetY(int _y)                { y = _y; }
+	int                   GetY() const                { return y; }
+
+	void                  NewPage()                   { Page(pagei + 1); }
+
+	void                  Put(const RichText& txt);
+	void                  Put(const char *qtf);
+	Report&               operator<<(const char *qtf) { Put(qtf); return *this; }
+
+	Point                 GetMargins() const          { return mg; }
+
+	Report&               SetPageSize(Size sz);
+	Report&               SetPageSize(int cx, int cy) { return SetPageSize(Size(cx, cy)); }
+	Report&               Landscape();
+	Report&               Margins(int top, int left)  { mg.x = top; mg.y = left; return *this; }
+	Report&               Header(const char *qtf, int spc = 150);
+	Report&               Footer(const char *qtf, int spc = 150);
+	Report&               NoHeader()                  { return Header(NULL, 0); }
+	Report&               NoFooter()                  { return Footer(NULL, 0); }
+
+	Report();
+	Report(int cx, int cy);
+	Report(const Size &sz);
+};
+
+class ReportView : public Ctrl {
+public:
+	virtual void Paint(Draw& w);
+	virtual void Layout();
+	virtual bool Key(dword key, int);
+	virtual void LeftDown(Point p, dword);
+	virtual void MouseWheel(Point, int zdelta, dword);
+
+protected:
+	ScrollBar sb;
+	Report   *report;
+	Image     page[64];
+	int       pagei[64];
+	Size      pagesize;
+	int       vsize;
+
+	int       pm;
+	int       pvn;
+	bool      numbers;
+	int       pages;
+
+	Image     GetPage(int i);
+
+	void      Init();
+	void      Sb();
+	void      Numbers()               { Refresh(); }
+	Size      GetReportSize();
+
+public:
+	Callback  WhenGoPage;
+
+	enum Pages {
+		PG1, PG2, PG4, PG16
+	};
+	ReportView& Pages(int pags)       { pages = pags; Layout(); return *this; }
+	ReportView& Numbers(bool nums)    { numbers = nums; Refresh(); return *this; }
+
+	void      Set(Report& report);
+	int       GetFirst() const        { return sb / pagesize.cy * pvn; }
+
+	void      ScrollInto(int toppage, int top, int bottompage, int bottom);
+
+	typedef ReportView CLASSNAME;
+
+	ReportView();
+};
+
+class ReportWindow : public WithReportWindowLayout<TopWindow> {
+	void Pages()   { pg.Pages(~sw); }
+	void Numbers() { pg.Numbers(numbers); }
+	void GoPage()  { sw <<= ReportView::PG1; Pages(); }
+	void Pdf();
+
+	Array<Button>         button;
+	Report               *report;
+
+public:
+	ReportView pg;
+
+	typedef ReportWindow CLASSNAME;
+
+	static void SetPdfRoutine(String (*pdf)(const Report& report, int margin));
+
+	void SetButton(int i, const char *label, int id);
+
+	int  Perform(Report& report, int zoom = 100, const char *caption = t_("Report"));
+
+	ReportWindow();
+};
+
+String Pdf(Report& report);
+bool   DefaultPrint(Report& r, int i, const char *_name = t_("Report"));
+bool   Print(Report& r, int i, const char *name = t_("Report"));
+bool   Perform(Report& r, const char *name = t_("Report"));
+
+END_UPP_NAMESPACE
+
+#endif
diff --git a/uppsrc/Report/Report.lay b/uppsrc/Report/Report.lay
new file mode 100644
index 000000000..923823c0f
--- /dev/null
+++ b/uppsrc/Report/Report.lay
@@ -0,0 +1,10 @@
+LAYOUT(ReportWindowLayout, 340, 276)
+	UNTYPED(pg, HSizePosZ(6, 104).VSizePosZ(3, 4))
+	ITEM(LabelBox, dv___1, SetLabel(t_("Page")).RightPosZ(8, 88).TopPosZ(0, 44))
+	ITEM(Label, lbl, SetLabel(t_("1 / 1")).RightPosZ(16, 72).TopPosZ(12, 28))
+	ITEM(LabelBox, dv___3, SetLabel(t_("Sideways")).RightPosZ(8, 88).TopPosZ(48, 86))
+	ITEM(Switch, sw, SetLabel(t_("&1 page\n&2 pages\n&4 pages\n&8 pages")).RightPosZ(12, 76).TopPosZ(66, 60))
+	ITEM(Option, numbers, SetLabel(t_("Page &numbers")).RightPosZ(8, 88).TopPosZ(142, 18))
+	ITEM(Button, pdf, SetLabel(t_("PDF export..")).RightPosZ(8, 88).TopPosZ(168, 24))
+	ITEM(Button, cancel, SetLabel(t_("Cancel")).RightPosZ(8, 88).BottomPosZ(4, 24))
+END_LAYOUT
diff --git a/uppsrc/Report/Report.t b/uppsrc/Report/Report.t
new file mode 100644
index 000000000..5ce80d667
--- /dev/null
+++ b/uppsrc/Report/Report.t
@@ -0,0 +1,67 @@
+#ifdef _MSC_VER
+#pragma setlocale("C")
+#endif
+// Report.h
+
+T_("Report")
+csCZ("Výstupní sestava")
+huHU("Jelentés")
+itIT("Report")
+ruRU("Отчёт")
+plPL("Raport")
+
+
+// ReportDlg.cpp
+
+T_("&Print")
+csCZ("&Tisk")
+huHU("&Nyomtatás")
+itIT("&Stampa")
+ruRU("&Печать")
+plPL("Drukuj")
+
+
+// Report.lay
+
+T_("Page")
+plPL("Strona")
+
+T_("1 / 1")
+csCZ("1 / 1")
+huHU("1 / 1")
+itIT("1 / 1")
+ruRU("1 / 1")
+
+T_("Sideways")
+csCZ("Na šířku")
+huHU("Oldalsáv")
+itIT("Direzione")
+ruRU("По бокам")
+plPL("Liczba stron")
+
+T_("&1 page\n&2 pages\n&4 pages\n&8 pages")
+csCZ("&1 strana\n&2 strany\n&4 strany\n&8 stran")
+huHU("&1 oldal\n&2 oldal\n&4 oldal\n&8 oldal")
+itIT("&1 pagina\n&2 pagine\n&4 pagine\n&8 pagine")
+ruRU("&1 страница\n&2 страницы\n&4 страницы\n&8 страниц")
+
+T_("Page &numbers")
+csCZ("Čísla &stránek")
+huHU("&Oldalszámok")
+itIT("&Numero pagine")
+ruRU("&Номера страниц")
+plPL("Numery stron")
+
+T_("PDF export..")
+csCZ("PDF export..")
+huHU("PDF export..")
+itIT("")
+ruRU("")
+plPL("Eksportuj PDF..")
+
+T_("Cancel")
+csCZ("Storno")
+huHU("Mégsem")
+itIT("Annulla")
+ruRU("Отмена")
+plPL("Anuluj")
\ No newline at end of file
diff --git a/uppsrc/Report/Report.upp b/uppsrc/Report/Report.upp
new file mode 100644
index 000000000..00a73fbd7
--- /dev/null
+++ b/uppsrc/Report/Report.upp
@@ -0,0 +1,16 @@
+description "Preview and printing of reports";
+
+uses
+	CtrlLib,
+	RichText;
+
+file
+	Report.h,
+	Report.cpp,
+	ReportDlg.cpp,
+	ReportI.icpp,
+	Report.lay,
+	Report.t charset "UTF-8";
+
+mainconfig
+	"" = "GUI";
diff --git a/uppsrc/Report/ReportDlg.cpp b/uppsrc/Report/ReportDlg.cpp
new file mode 100644
index 000000000..08455cc0e
--- /dev/null
+++ b/uppsrc/Report/ReportDlg.cpp
@@ -0,0 +1,264 @@
+#include "Report.h"
+
+NAMESPACE_UPP
+
+#define LLOG(x) // LOG(x)
+
+bool Print0(Report& r, int i, const char *_name, bool dodlg) {
+	PrinterJob pd(_name);
+	pd.CurrentPage(i);
+	pd.MinMaxPage(0, r.GetCount() - 1);
+	Size pgsz = r.GetPage(0).GetSize();
+	pd.Landscape(pgsz.cx > pgsz.cy);
+	if(dodlg && !pd.Execute())
+		return false;
+	Draw& w = pd;
+	Size sz = w.GetPageMMs();
+	Point mg = r.GetMargins();
+	int x = Nvl(mg.x, (6000 * sz.cx / 254 - pgsz.cx) / 2);
+	int y = Nvl(mg.y, (6000 * sz.cy / 254 - pgsz.cy) / 2);
+	for(int i = 0; i < pd.GetPageCount(); i++) {
+		Drawing iw = r.GetPage(pd[i]);
+		Size sz = iw.GetSize();
+		w.StartPage();
+		w.DrawDrawing(x, y, sz.cx, sz.cy, iw);
+		w.EndPage();
+	}
+	return true;
+}
+
+bool Print(Report& r, int i, const char *_name)
+{
+	return Print0(r, i, _name, true);
+}
+
+bool DefaultPrint(Report& r, int i, const char *_name)
+{
+	return Print0(r, i, _name, false);
+}
+
+void ReportView::MouseWheel(Point, int zdelta, dword) {
+	sb.Wheel(zdelta);
+}
+
+ReportView::ReportView() {
+	report = NULL;
+	vsize = 0;
+	pagesize.cx = pagesize.cy = 0;
+	sb.WhenScroll = callback(this, &ReportView::Sb);
+	sb.SetLine(16);
+	AddFrame(sb);
+	SetFrame(FieldFrame());
+	numbers = false;
+	pages = PG1;
+}
+
+void ReportView::Set(Report& p) {
+	Init();
+	report = &p;
+	Refresh();
+	Layout();
+}
+
+Size ReportView::GetReportSize()
+{
+	return report->GetPage(0).GetSize();
+}
+
+bool ReportView::Key(dword key, int) {
+	return sb.VertKey(key);
+}
+
+void ReportView::LeftDown(Point p, dword) {
+	if(!report || pagesize.cy == 0 || pagesize.cx == 0) return;
+	int pg = (sb + p.y) / pagesize.cy * pvn + min(pvn - 1, p.x / pagesize.cx);
+	WhenGoPage();
+	Layout();
+	sb = pg * pagesize.cy;
+}
+
+void ReportView::Sb() {
+	Refresh();
+	WhenAction();
+}
+
+void ReportView::Init() {
+	for(int i = 0; i < 64; i++) {
+		page[i].Clear();
+		pagei[i] = -1;
+	}
+}
+
+void ReportView::Layout() {
+	Size sz = GetSize();
+	if(report && report->GetCount()) {
+		ASSERT(pages >= PG1 && pages <= PG16);
+		pvn = 1 << pages;
+		static int h[] = { 1, 3, 15, 63 };
+		pm = h[pages];
+		Size sr = report->GetPage(0).GetSize();
+		pagesize.cx = sz.cx / pvn;
+		pagesize.cy = sr.cy * pagesize.cx / sr.cx;
+		vsize = (report->GetCount() + pvn - 1) / pvn * pagesize.cy;
+		sb.SetPage(sz.cy);
+		sb.SetTotal(vsize);
+		Init();
+		Refresh();
+	}
+	else {
+		vsize = 0;
+		sb.Set(0, 0, 0);
+		return;
+	}
+}
+
+Image ReportView::GetPage(int i) {
+	ASSERT(report);
+	int ii = i & pm;
+	if(pagei[ii] != i) {
+		pagei[ii] = i;
+		Size sz = Size(max(pagesize.cx - 2, 1), max(pagesize.cy - 2, 1));
+		ImageDraw iw(sz);
+		iw.DrawRect(sz, White);
+		iw.DrawDrawing(0, 0, sz.cx, sz.cy, report->GetPage(i));
+		page[ii] = iw;
+	}
+	return page[ii];
+}
+
+void ReportView::ScrollInto(int toppage, int top, int bottompage, int bottom) {
+	sb.ScrollInto(toppage * pagesize.cy + top * pagesize.cy / GetReportSize().cy,
+	              (bottompage - toppage) * pagesize.cy +
+	                (bottom - top) * pagesize.cy / GetReportSize().cy);
+}
+
+void ReportView::Paint(Draw& w) {
+	Size sz = GetSize();
+	if(sz.cx <= 0 || sz.cy <= 0) return;
+	if(!vsize || !report) {
+		w.DrawRect(0, 0, sz.cx, sz.cy, SGray);
+		return;
+	}
+	int i = sb / pagesize.cy;
+	int y = i * pagesize.cy - sb;
+	i *= pvn;
+	while(y < sz.cy) {
+		int x = 0;
+		for(int j = pvn; j--;) {
+			if(i < report->GetCount()) {
+				w.DrawImage(x + 1, y + 1, GetPage(i));
+				if(j == 0) {
+					w.DrawRect(x + pagesize.cx - 1, y, sz.cx - x - pagesize.cx, pagesize.cy, White);
+					DrawFrame(w, x, y, sz.cx - x, pagesize.cy, White, LtGray);
+				}
+				else
+					DrawFrame(w, x, y, pagesize.cx, pagesize.cy, White, LtGray);
+				if(numbers) {
+					String n = Format("%d", i + 1);
+					Size tsz = GetTextSize(n, StdFont());
+					tsz += Size(8, 4);
+					int tx = x + pagesize.cx - tsz.cx;
+					DrawFrame(w, tx, y, tsz.cx, tsz.cy, Black, Black);
+					w.DrawRect(tx + 1, y + 1, tsz.cx - 2, tsz.cy - 2, Yellow);
+					w.DrawText(tx + 4, y + 2, n);
+				}
+			}
+			else {
+				w.DrawRect(x, y, sz.cx - x, pagesize.cy, Gray);
+				break;
+			}
+			x += pagesize.cx;
+			i++;
+		}
+		y += pagesize.cy;
+	}
+}
+
+ReportWindow::ReportWindow()
+{
+	CtrlLayoutCancel(*this, "");
+	sw <<= ReportView::PG1;
+	sw <<= THISBACK(Pages);
+	numbers <<= THISBACK(Numbers);
+	pg.WhenGoPage = THISBACK(GoPage);
+	lbl.SetFont(Arial(20).Italic());
+	lbl.SetAlign(ALIGN_CENTER);
+	pg.WhenAction = Breaker(-1);
+	Sizeable();
+	MaximizeBox();
+	Icon(CtrlImg::smallreporticon());
+	SetButton(0, t_("&Print"), 999995);
+	pdf.Show(GetDrawingToPdfFn());
+	pdf <<= THISBACK(Pdf);
+}
+
+String Pdf(Report& report)
+{
+	return GetDrawingToPdfFn() && report.GetCount() ?
+	      (*GetDrawingToPdfFn())(report.GetPages(), report.GetPage(0).GetSize(), 200)
+	      : String();
+}
+
+void ReportWindow::Pdf()
+{
+	static FileSel fs;
+	static bool b;
+	if(!b) {
+		fs.Type("PDF file", "*.pdf");
+		fs.AllFilesType();
+	}
+	if(!fs.ExecuteSaveAs("Output PDF file"))
+		return;
+	SaveFile(~fs, UPP::Pdf(*report));
+}
+
+void ReportWindow::SetButton(int i, const char *label, int id)
+{
+	LogPos p = cancel.GetPos();
+	Button& b = button.At(i);
+	b.SetLabel(label);
+	b.RightPos(p.x.GetA(), p.x.GetB()).BottomPos(p.y.GetA() + (p.y.GetB() + 6) * (i + 1), p.y.GetB());
+	b <<= Breaker(id);
+	for(int i = 0; i < button.GetCount(); i++)
+		button[i].Remove();
+	for(int i = 0; i < button.GetCount(); i++)
+		AddChildBefore(&button[i], &cancel);
+}
+
+int ReportWindow::Perform(Report& report, int zoom, const char *caption)
+{
+	this->report = &report;
+//	if(report.dortf)
+//		WriteClipboard(GetClipboardFormatCode("Rich text format"), report.rtf.Get());
+	pg.Set(report);
+	Size sz;
+	Rect area = Ctrl::GetWorkArea();
+	sz = area.Size() * 4 * abs(zoom) / 500;
+	SetRect(sz);
+
+	ActiveFocus(pg);
+	Title(caption);
+	Open();
+	int n = -1;
+	for(;;) {
+		int nn = pg.GetFirst() + 1;
+		if(n != nn)
+			lbl = Format("%d / %d", n = nn, report.GetCount());
+		int c = Run();
+		switch(c) {
+		case IDCANCEL:
+			return false;
+		case 999995:
+			return Print(report, pg.GetFirst(), caption);
+		}
+		if(c > 0)
+			return c;
+	}
+}
+
+bool Perform(Report& r, const char *caption)
+{
+	return ReportWindow().Perform(r, 100, caption);
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/Report/ReportI.icpp b/uppsrc/Report/ReportI.icpp
new file mode 100644
index 000000000..deb6a3324
--- /dev/null
+++ b/uppsrc/Report/ReportI.icpp
@@ -0,0 +1,8 @@
+#include "Report.h"
+
+NAMESPACE_UPP
+
+#define  TFILE <Report/Report.t>
+#include <Core/t.h>
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/RichBook/RichBook.cpp b/uppsrc/RichBook/RichBook.cpp
new file mode 100644
index 000000000..797fa2511
--- /dev/null
+++ b/uppsrc/RichBook/RichBook.cpp
@@ -0,0 +1,678 @@
+#include "RichBook.h"
+#pragma hdrstop
+
+#include <DocTypes/DocTypes.h>
+#include <PdfDraw/PdfDraw.h>
+
+NAMESPACE_UPP
+
+struct FieldTypeVarCls : public RichPara::FieldType
+{
+	virtual Array<RichPara::Part> Evaluate(const String& param, VectorMap<String, Value>& vars,
+		const RichPara::CharFormat& fmt);
+};
+
+Array<RichPara::Part> FieldTypeVarCls::Evaluate(const String& dest,
+	VectorMap<String, Value>& vars, const RichPara::CharFormat& linkfmt)
+{
+	RichPara para;
+	RichPara::CharFormat fmt = linkfmt;
+	int f = vars.Find(dest);
+	if(f < 0) {
+		fmt.ink = LtRed();
+		fmt.paper = WhiteGray();
+		para.Cat(dest, fmt);
+	}
+	else
+		para.Cat(StdFormat(vars[f]), fmt);
+	return para.part;
+}
+
+RichPara::FieldType& GLOBAL_V(FieldTypeVarCls, FieldTypeVar);
+
+Id FieldTypeVarID()
+{
+	static Id ftv("VAR");
+	return ftv;
+}
+
+INITBLOCK {
+	RichPara::Register(FieldTypeVarID(), FieldTypeVar());
+}
+
+/*
+RichPara::FieldType& FieldTypeIndexEntry()
+{
+}
+
+Id FieldTypeIndexEntryID()
+{
+}
+
+String EncodeIndexEntry(const RichIndexEntry& idx)
+{
+}
+
+RichIndexEntry DecodeIndexEntry(String encoded_indexentry)
+{
+}
+*/
+
+RichBookSection::RichBookSection()
+{
+//	pagesize = pg;
+	columns = 1;
+	firstpage = 1;
+	margin = Rect(0, 0, 0, 0);
+	header_space = 200;
+	footer_space = 200;
+	column_space = 200;
+//	footer[1] = "- # -";
+}
+
+Rect RichBookSection::GetPageRect(Size pagesize) const
+{
+	return Rect(pagesize).Deflated(margin);
+}
+
+Rect RichBookSection::GetTextRect(Size pagesize, int colindex) const
+{
+	Rect textarea = GetPageRect(pagesize).Deflated(0, header_space, 0, footer_space);
+	if(columns <= 1)
+		return textarea;
+	int colwd = (textarea.Width() - column_space * (columns - 1)) / columns;
+	int offset = iscale(textarea.Width() - colwd, colindex, columns - 1);
+	textarea.left += offset;
+	textarea.right = textarea.left + colwd;
+	return textarea;
+}
+
+Size RichBookSection::GetTextSize(Size pagesize) const
+{
+	return GetTextRect(pagesize, 0).Size();
+}
+
+class RichSectionPageDraw : public PageDraw
+{
+public:
+	RichSectionPageDraw(Size drawingsize, Gate2<int, int> progress, int& progress_pos);
+
+	virtual Draw&   Page(int page);
+	virtual Draw&   Info();
+
+	Vector<Drawing> Close();
+
+private:
+	Gate2<int, int> progress;
+	int&            progress_pos;
+	Size            drawingsize;
+	Vector<Drawing> pages;
+	DrawingDraw     ddraw;
+	DrawingDraw     info;
+	int             currentpage;
+};
+
+RichSectionPageDraw::RichSectionPageDraw(Size dsz, Gate2<int, int> progress, int& progress_pos)
+: progress(progress)
+, progress_pos(progress_pos)
+{
+	currentpage = -1;
+	info.Create(drawingsize = dsz);
+}
+
+Draw& RichSectionPageDraw::Page(int page)
+{
+	if(page != currentpage) {
+		ASSERT(ddraw.GetCloffLevel() == 0);
+		progress(progress_pos + page, -1);
+		if(currentpage >= 0)
+			pages.At(currentpage) = ddraw;
+		ddraw.Create(drawingsize);
+		ddraw.DrawDrawing(drawingsize, pages.At(currentpage = page));
+	}
+	return ddraw;
+}
+
+Draw& RichSectionPageDraw::Info()
+{
+	return Page(0);
+}
+
+Vector<Drawing> RichSectionPageDraw::Close()
+{
+	if(currentpage >= 0) {
+		ASSERT(ddraw.GetCloffLevel() == 0);
+		pages.At(currentpage) = ddraw;
+	}
+	return pages;
+}
+
+static String ExpandHFText(const char *text, int pageno)
+{
+	String out;
+	for(char c; c = *text++;)
+		if(c == '#')
+			switch(*text++) {
+			case 'r': out.Cat(FormatIntRoman(pageno, false)); break;
+			case 'R': out.Cat(FormatIntRoman(pageno, true)); break;
+			case 'a': out.Cat(FormatIntAlpha(pageno, false)); break;
+			case 'A': out.Cat(FormatIntAlpha(pageno, true)); break;
+			default:  text--; out.Cat(FormatInt(pageno)); break;
+			}
+		else
+			out.Cat(c);
+	return out;
+}
+
+Vector<Drawing> RichPrintSection::Print(Size pagesize, Gate2<int, int> progress, int& progress_pos) const
+{
+	ASSERT(columns > 0);
+	Size drawingsize = GetTextSize(pagesize);
+	RichSectionPageDraw spdraw(drawingsize, progress, progress_pos);
+	PaintInfo paintinfo;
+	paintinfo.top = PageY(0, 0);
+	paintinfo.bottom = PageY(32767, 0);
+	paintinfo.indexentry = Null;
+	text.Paint(spdraw, drawingsize, paintinfo);
+	Vector<Drawing> in = spdraw.Close();
+	Vector<Drawing> out;
+	for(int i = 0; i < in.GetCount(); i += columns) {
+		int pageno = firstpage + out.GetCount();
+		DrawingDraw ddraw(pagesize);
+		Rect pagerect = GetPageRect(pagesize);
+		for(int c = 0; c < columns && c + i < in.GetCount(); c++)
+			ddraw.DrawDrawing(GetTextRect(pagesize, c), in[i + c]);
+		for(int hf = 0; hf < 3; hf++) {
+			if(!IsNull(header[hf])) {
+				String s = ExpandHFText(header[hf], pageno);
+				Size sz = UPP::GetTextSize(s, charformat);
+				int x;
+				switch(hf) {
+				case 0: x = pagerect.left; break;
+				case 1: x = (pagerect.left + pagerect.right - sz.cx) >> 1; break;
+				case 2: x = pagerect.right - sz.cx; break;
+				}
+				ddraw.DrawText(x, pagerect.top, s, charformat);
+			}
+			if(!IsNull(footer[hf])) {
+				String s = ExpandHFText(footer[hf], pageno);
+				Size sz = UPP::GetTextSize(s, charformat);
+				int x;
+				switch(hf) {
+				case 0: x = pagerect.left; break;
+				case 1: x = (pagerect.left + pagerect.right - sz.cx) >> 1; break;
+				case 2: x = pagerect.right - sz.cx; break;
+				}
+				ddraw.DrawText(x, pagerect.bottom - sz.cy, s, charformat);
+			}
+		}
+		out.Add() = ddraw;
+	}
+	return out;
+}
+
+String GetLangSuffix(int language = GetCurrentLanguage())
+{
+	String lt = LNGAsText(language);
+	String out;
+	out << '$' << (char)ToLower(lt[0]) << (char)ToLower(lt[1]) << '-' << (char)ToLower(lt[3]) << (char)ToLower(lt[4]);
+	return out;
+}
+
+void MakeStdToc(RichText& out, const RichToc& toc, int print_width)
+{
+	VectorMap< String, ArrayMap<String, RichPara> > subparts;
+	String suffix = GetLangSuffix();
+	for(int i = 0; i < toc.entries.GetCount(); i++) {
+		const RichTocEntry& e = toc.entries[i];
+		RichPara::Format pfmt = out.GetStyle(out.GetStyleId("Toc" + FormatInt(e.level))).format;
+		RichPara para;
+		para.format = pfmt;
+		WString name = e.text;
+		String tname = e.topic, subpart;
+		int th = tname.Find('#');
+		if(th >= 0) {
+			subpart = tname.Mid(th);
+			tname.Trim(th);
+		}
+		tname.Cat(suffix);
+		Topic tp = GetTopic(tname);
+		if(!IsNull(name))
+			para.Cat(name, pfmt);
+		else {
+			if(!IsNull(subpart)) {
+				int sp = subparts.Find(tname);
+				if(sp < 0) {
+					sp = subparts.GetCount();
+					ArrayMap<String, RichPara>& spmap = subparts.Add(tname);
+					RichText rt = ParseQTF(tp.text);
+					for(int p = 0; p < rt.GetPartCount(); p++)
+						if(rt.IsPara(p)) {
+							RichPara rp = rt.Get(p);
+//							if(*rp.format.label == '#')
+							spmap.AddPick("#" + rp.format.label, rp);
+						}
+				}
+				para <<= subparts[sp].Get(subpart, RichPara());
+				Array<RichObject> objs;
+				String packed = para.Pack(para.format, objs);
+				para.Unpack(packed, objs, pfmt);
+			}
+			else if(!IsNull(tp.title))
+				para.Cat(FromUtf8(tp.title), pfmt);
+		}
+		if(para.part.IsEmpty()) {
+			pfmt.ink = LtRed();
+			pfmt.paper = WhiteGray();
+			para.Cat((WString)(tname + subpart), pfmt);
+		}
+		para.Cat("\t", pfmt);
+		para.Cat(FieldTypeVarID(), String().Cat() << tname << subpart << "$page", pfmt);
+		out.Cat(para);
+	}
+	RLOG("MakeStdToc:\n" << AsQTF(out));
+}
+
+void MakeOnlineToc(RichText& out, const RichToc& toc)
+{
+	String suffix = GetLangSuffix();
+	VectorMap< String, ArrayMap<String, RichPara> > subparts;
+	for(int i = 0; i < toc.entries.GetCount(); i++) {
+		const RichTocEntry& e = toc.entries[i];
+		RichPara::Format pfmt = out.GetStyle(out.GetStyleId("Topics" + FormatInt(e.level))).format;
+		RichPara para;
+		para.format = pfmt;
+		WString name = e.text;
+		String tname = e.topic, subpart;
+		int th = tname.Find('#');
+		if(th >= 0) {
+			subpart = tname.Mid(th);
+			tname.Trim(th);
+		}
+		tname.Cat(suffix);
+		Topic tp = GetTopic(tname);
+		pfmt.link = tname;
+		if(!IsNull(name))
+			para.Cat(name, pfmt);
+		else {
+			if(!IsNull(subpart)) {
+				int sp = subparts.Find(tname);
+				if(sp < 0) {
+					sp = subparts.GetCount();
+					ArrayMap<String, RichPara>& spmap = subparts.Add(tname);
+					RichText rt = ParseQTF(tp.text);
+					for(int p = 0; p < rt.GetPartCount(); p++)
+						if(rt.IsPara(p)) {
+							RichPara rp = rt.Get(p);
+//							if(*rp.format.label == '#')
+							spmap.AddPick("#" + rp.format.label, rp);
+						}
+				}
+				para <<= subparts[sp].Get(subpart, RichPara());
+				Array<RichObject> objs;
+				String packed = para.Pack(para.format, objs);
+				para.Unpack(packed, objs, pfmt);
+			}
+			else if(!IsNull(tp.title))
+				para.Cat(FromUtf8(tp.title), pfmt);
+		}
+		if(para.part.IsEmpty()) {
+			pfmt.ink = LtRed();
+			pfmt.paper = WhiteGray();
+			para.Cat((WString)(tname + subpart), pfmt);
+		}
+		out.Cat(para);
+	}
+	RLOG("MakeOnlineToc:\n" << AsQTF(out));
+}
+
+void MakeTocTopics(RichText& out, const RichToc& toc)
+{
+	String suffix = GetLangSuffix();
+	VectorMap< String, VectorMap<String, int> > topic_tocrefs;
+	for(int i = 0; i < toc.entries.GetCount(); i++) {
+		String tname = toc.entries[i].topic;
+		int th = tname.Find('#');
+		if(th >= 0)
+			topic_tocrefs.GetAdd(tname.Left(th)).GetAdd(tname.Mid(th), i);
+	}
+	Index<String> done;
+	for(int i = 0; i < toc.entries.GetCount(); i++) {
+		const RichTocEntry& e = toc.entries[i];
+		WString name = e.text;
+		String tname = e.topic;
+		int th = tname.Find('#');
+		if(th >= 0)
+			tname.Trim(th);
+		int tr = topic_tocrefs.Find(tname);
+		tname << suffix;
+		if(done.Find(tname) >= 0)
+			continue;
+		done.Add(tname);
+		Topic tp = GetTopic(tname);
+		RichPara title_para;
+		title_para.format = out.GetStyle(out.GetStyleId("Heading" + FormatInt(e.level))).format;
+		if(IsNull(name) && IsNull(name = FromUtf8(tp.title))) {
+			name = (WString)tname;
+			title_para.format.ink = LtRed();
+			title_para.format.paper = WhiteGray();
+		}
+		title_para.format.label = tname;
+		title_para.Cat(name, title_para.format);
+		out.Cat(title_para);
+		RichText data = ParseQTF(tp.text);
+		int pcount = out.GetPartCount();
+		out.CatPick(data);
+		for(int t = pcount; t < out.GetPartCount(); t++)
+			if(out.IsPara(t)) {
+				RichPara p = out.Get(t);
+				String lbl = "#" + p.format.label;
+				int tx;
+				if(tr >= 0 && (tx = topic_tocrefs[tr].Find(lbl)) >= 0) {
+					const RichTocEntry& ex = toc.entries[topic_tocrefs[tr][tx]];
+					Array<RichObject> objs;
+					String pack = p.Pack(p.format, objs);
+					p.format = out.GetStyle(out.GetStyleId("Heading" + FormatInt(ex.level))).format;
+					p.Unpack(pack, objs, p.format);
+					p.format.label = tname + lbl;
+					out.Set(t, p, out.GetStyles());
+				}
+			}
+	}
+}
+
+//RichText MakeStdIndex(
+
+RichBook::RichBook(Size pg)
+: page_size(pg)
+{
+	RichStyle toc1, toc2, toc3, toc4;
+	RichPara::Tab& t1tab = toc1.format.tab.Add();
+	t1tab.pos = pg.cx - 300;
+	t1tab.align = ALIGN_RIGHT;
+	t1tab.fillchar = 1;
+	toc2 = toc3 = toc4 = toc1;
+	t1tab.fillchar = 0;
+
+	toc1.name = "Toc1";
+	(Font&)toc1.format = Arial(90).Bold();
+	toc1.format.indent = 100;
+	toc1.format.before = 100;
+	toc1.format.number[0] = RichPara::NUMBER_1;
+
+	toc2.name = "Toc2";
+	(Font&)toc2.format = Arial(84).Bold();
+	toc2.format.indent = 200;
+	toc2.format.lm = 200;
+	toc2.format.number[0] = toc2.format.number[1] = RichPara::NUMBER_1;
+
+	toc3.name = "Toc3";
+	(Font&)toc3.format = Arial(84);
+	toc3.format.indent = 300;
+	toc3.format.lm = 300;
+	toc3.format.number[0] = toc3.format.number[1] = toc3.format.number[2] = RichPara::NUMBER_1;
+
+	toc4.name = "Toc4";
+	toc4.format.number[0] = toc4.format.number[1] = toc4.format.number[2] = toc4.format.number[3] = RichPara::NUMBER_1;
+
+	RichStyle head1, head2, head3, head4;
+	head1.name = "Heading1";
+	(Font&)head1.format = Arial(144).Bold();
+	head1.format.newpage = true;
+	head1.format.before = 300;
+	head1.format.after = 100;
+	head1.format.indent = 150;
+	head1.format.number[0] = RichPara::NUMBER_1;
+
+	head2.name = "Heading2";
+	(Font&)head2.format = Arial(120).Bold();
+	head2.format.before = 200;
+	head2.format.after = 100;
+	head2.format.indent = 200;
+	head2.format.number[0] = head2.format.number[1] = RichPara::NUMBER_1;
+
+	head3.name = "Heading3";
+	(Font&)head3.format = Arial(100).Bold();
+	head3.format.before = 100;
+	head3.format.after = 50;
+	head3.format.indent = 250;
+	head3.format.number[0] = head3.format.number[1] = head3.format.number[2] = RichPara::NUMBER_1;
+
+	head4 = head3;
+	head4.name = "Heading4";
+	head4.format.number[0] = head4.format.number[1] = head4.format.number[2] = head4.format.number[3] = RichPara::NUMBER_1;
+
+	default_styles.Add(Uuid::Create(), toc1);
+	default_styles.Add(Uuid::Create(), toc2);
+	default_styles.Add(Uuid::Create(), toc3);
+	default_styles.Add(Uuid::Create(), toc4);
+
+	default_styles.Add(Uuid::Create(), head1);
+	default_styles.Add(Uuid::Create(), head2);
+	default_styles.Add(Uuid::Create(), head3);
+	default_styles.Add(Uuid::Create(), head4);
+}
+
+RichPrintSection& RichBook::AddSection()
+{
+	RichText init;
+	init.OverrideStyles(default_styles);
+	return sections.Add(new RichPrintSection(default_section, init));
+}
+
+Vector<Drawing> RichBook::Print(Size pagesize, Gate2<int, int> progress)
+{
+	Vector<Drawing> out;
+	int pos = 0;
+
+	VectorMap<String, Value> vars;
+	vars.GetAdd("$book") = 1;
+	bool stable = false;
+	enum { MAX_PASSES = 10 };
+	int pass;
+	for(pass = 1; !stable && pass <= MAX_PASSES; pass++) {
+		if(progress(pass, 0))
+			throw AbortExc();
+		stable = true;
+		int pageno = 1;
+		Index<String> chkdup;
+		for(int s = 0; s < sections.GetCount(); s++) {
+			RichPrintSection& psec = sections[s];
+			if(psec.text.GetPartCount() > 0 && psec.text.IsPara(0)) {
+				RichPara p0 = psec.text.Get(0);
+				if(p0.format.newpage) {
+					p0.format.newpage = false;
+					psec.text.Set(0, p0, psec.text.GetStyles());
+				}
+			}
+			Size textsize = psec.GetTextSize(pagesize);
+			PageY begin;
+			pageno = Nvl(psec.firstpage, pageno);
+			psec.text.EvaluateFields(vars);
+			int numpages = psec.text.GetHeight(textsize).page / psec.columns + 1;
+			Vector<RichValPos> posinfo = psec.text.GetValPos(textsize, RichText::LABELS);
+			for(int i = 0; i < posinfo.GetCount(); i++) {
+				String key = posinfo[i].data.ToString() + "$page";
+				if(chkdup.Find(key) >= 0) {
+					if(pass == 1)
+						RLOG("Duplicate: " << key);
+					continue;
+				}
+				chkdup.Add(key);
+				int oldpage = vars.Get(key, Value());
+				int newpage = pageno + posinfo[i].py.page;
+				if(newpage != oldpage) {
+					if(pass > 2)
+						RLOG("Unstable: " << key << ": " << oldpage << " -> " << newpage);
+					vars.GetAdd(key) = newpage;
+					stable = false;
+				}
+			}
+			pageno += numpages;
+		}
+	}
+	for(int i = 0; i < sections.GetCount(); i++)
+		out.AppendPick(sections[i].Print(pagesize, progress, pos));
+#ifdef _DEBUG
+	RichText symtext;
+	Vector<int> order = GetSortOrder(vars.GetKeys());
+	for(int o = 0; o < order.GetCount(); o++) {
+		RichPara para;
+		para.Cat(NFormat("<%s> %vt", vars.GetKey(order[o]), vars[order[o]]), para.format);
+		symtext.Cat(para);
+	}
+	RichPrintSection symsec(default_section, symtext);
+	out.AppendPick(symsec.Print(pagesize, progress, pos));
+#endif
+	return out;
+}
+
+void CreateHelpBook(RichBook& book)
+{
+	Progress progress(t_("Typesetting page %d..."));
+	DocReport report;
+	Vector<Drawing> pages = book.Print(report.GetPageSize(), progress);
+	progress.SetText(t_("Printing page %d..."));
+	for(int i = 0; i < pages.GetCount(); i++) {
+		if(progress.SetCanceled(i, pages.GetCount()))
+			throw AbortExc();
+		if(i)
+			report.NextPage();
+		report.DrawDrawing(pages[i].GetSize(), pages[i]);
+	}
+	report.Perform();
+}
+
+String CreateHelpPDF(RichBook& book)
+{
+	PdfDraw pdf(210 * 6000 / 254, 297 * 6000 / 254);
+	Rect margin = Rect(pdf.GetPagePixels()).Deflated(236);
+	Progress progress(t_("Typesetting..."));
+	Vector<Drawing> pages = book.Print(margin.Size(), progress);
+	progress.SetText(t_("Exporting PDF..."));
+	progress.SetTotal(pages.GetCount());
+	for(int i = 0; i < pages.GetCount(); i++) {
+		if(progress.StepCanceled())
+			throw AbortExc();
+		pdf.StartPage();
+		pdf.DrawDrawing(margin, pages[i]);
+		pdf.EndPage();
+	}
+	return pdf.Finish();
+}
+
+String CreateHelpRTF(RichBook& book, byte charset)
+{
+	RichText richtext;
+	for(int i = 0; i < book.sections.GetCount(); i++)
+		richtext.CatPick(book.sections[i].text);
+	return EncodeRTF(richtext, charset);
+}
+
+RichBookHtml::RichBookHtml()
+{
+}
+
+void RichBookHtml::AddFile(String url, String data)
+{
+}
+
+void RichBookHtml::AddImage(String url, String data)
+{
+}
+
+String RichBookHtml::GetURLFile(String url) const
+{
+	String out;
+	return out;
+}
+
+void CreateHelpHtml(RichBook& book, RichBookHtml& html)
+{
+}
+
+GLOBAL_VAR(Callback1<RichBook&>, DefaultBook)
+
+void CreateDefaultBook()
+{
+	RichBook book;
+	DefaultBook()(book);
+	CreateHelpBook(book);
+}
+
+void CreateDefaultPDF()
+{
+	RichBook book;
+	DefaultBook()(book);
+	try {
+		String data = CreateHelpPDF(book);
+		FileSelector fsel;
+		fsel.Type(t_("PDF documents (*.pdf)"), "*.pdf")
+			.DefaultExt("pdf")
+			.AllFilesType();
+		static String recent;
+		fsel <<= recent;
+		if(fsel.ExecuteSaveAs(t_("PDF export"))) {
+			recent = ~fsel;
+			if(!SaveFile(recent, data))
+				throw Exc(NFormat("Error saving file '%s' (%d B).", recent, data.GetLength()));
+		}
+	}
+	catch(Exc e) {
+		ShowExc(e);
+	}
+}
+
+void CreateDefaultRTF()
+{
+	RichBook book;
+	DefaultBook()(book);
+	try {
+		String data = CreateHelpRTF(book, GetDefaultCharset());
+		FileSelector fsel;
+		fsel.Type(t_("Rich text documents (*.rtf)"), "*.rtf")
+			.DefaultExt("rtf")
+			.AllFilesType();
+		static String recent;
+		fsel <<= recent;
+		if(fsel.ExecuteSaveAs(t_("Save manual as"))) {
+			recent = ~fsel;
+			if(!SaveFile(recent, data))
+				throw Exc(NFormat("Error saving file '%s' (%d B).", recent, data.GetLength()));
+		}
+	}
+	catch(Exc e) {
+		ShowExc(e);
+	}
+}
+
+void CreateDefaultHTML()
+{
+	RichBook book;
+	DefaultBook()(book);
+	try {
+		RichBookHtml html;
+		CreateHelpHtml(book, html);
+	}
+	catch(Exc e) {
+		ShowExc(e);
+	}
+}
+
+void ManualMenu()
+{
+	MenuBar menu;
+	bool isdb = DefaultBook();
+	menu.Add(isdb, t_("Print manual"), callback(&CreateDefaultBook));
+	menu.Add(isdb, t_("PDF export"), callback(&CreateDefaultPDF));
+	menu.Add(isdb, t_("RTF export"), callback(&CreateDefaultRTF));
+	menu.Add(isdb, t_("HTML export"), callback(&CreateDefaultHTML));
+	menu.Execute();
+}
+
+void HelpBookMenu(Bar& bar)
+{
+	bar.Add(t_("Save manual"), CtrlImg::save(), callback(&ManualMenu));
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/RichBook/RichBook.h b/uppsrc/RichBook/RichBook.h
new file mode 100644
index 000000000..c6ae31314
--- /dev/null
+++ b/uppsrc/RichBook/RichBook.h
@@ -0,0 +1,134 @@
+#ifndef _RichBook_RichBook_h
+#define _RichBook_RichBook_h
+
+#include <RichText/RichText.h>
+
+NAMESPACE_UPP
+
+RichPara::FieldType& FieldTypeVar();
+Id                   FieldTypeVarID();
+
+class RichIndexEntry : DeepCopyOption<RichIndexEntry>
+{
+public:
+	RichIndexEntry() {}
+	RichIndexEntry(const RichIndexEntry& rti, bool deep) : reflist(rti.reflist, deep) {}
+
+public:
+	Vector<String> reflist;
+};
+
+RichPara::FieldType& FieldTypeIndexEntry();
+Id                   FieldTypeIndexEntryID();
+String               EncodeIndexEntry(const RichIndexEntry& idx);
+RichIndexEntry       DecodeIndexEntry(String encoded_indexentry);
+
+class RichBookSection {
+public:
+	RichBookSection();
+
+	Rect                 GetPageRect(Size pagesize) const;
+	Rect                 GetTextRect(Size pagesize, int columnindex) const;
+	Size                 GetTextSize(Size pagesize) const;
+
+public:
+	bool                 nested;
+	int                  columns;
+	int                  firstpage;
+	Rect                 margin;
+	int                  header_space;
+	int                  footer_space;
+	int                  column_space;
+	String               header[3], footer[3];
+	RichPara::CharFormat charformat;
+};
+
+class RichPrintSection : public RichBookSection {
+public:
+	RichPrintSection(const RichBookSection& s, pick_ RichText& t)
+		: RichBookSection(s), text(t) {}
+
+	Vector<Drawing>      Print(Size pagesize, Gate2<int, int> progress, int& progress_pos) const;
+
+public:
+	RichText text;
+};
+
+class RichTocEntry {
+public:
+	RichTocEntry(String topic = Null, int level = 1, bool numbered = true, bool appendix = false, WString text = Null)
+		: topic(topic), level(level), numbered(numbered), text(text) {}
+
+	String topic;
+	int level;
+	bool numbered;
+	bool appendix;
+	WString text;
+};
+
+class RichToc : DeepCopyOption<RichToc> {
+public:
+	RichToc() {}
+	RichToc(const RichToc& rtoc, int deep) : entries(rtoc.entries, deep) {}
+
+	void Add(String topic, int level, bool numbered = true, bool appendix = false, WString text = Null)
+	{ entries.Add(new RichTocEntry(topic, level, numbered, appendix, text)); }
+
+	Array<RichTocEntry> entries;
+};
+
+void MakeOnlineToc(RichText& out, const RichToc& toc);
+void MakeStdToc(RichText& out, const RichToc& toc, int print_width);
+void MakeTocTopics(RichText& out, const RichToc& toc);
+//RichText MakeStdIndex(
+
+class RichBook {
+public:
+	RichBook(Size page_size = Size(3968, 6074));
+
+	RichPrintSection&        AddSection();
+
+	Vector<Drawing>          Print(Size pagesize, Gate2<int, int> progress);
+
+public:
+	Size                     page_size;
+	RichBookSection          default_section;
+	RichStyles               default_styles;
+	enum { TOC_DEPTH = 4 };
+	Array<RichPrintSection>  sections;
+};
+
+void   CreateHelpBook(RichBook& book);
+String CreateHelpPDF(RichBook& book);
+String CreateHelpRTF(RichBook& book, byte charset);
+
+class RichBookHtml {
+public:
+	RichBookHtml();
+
+	void     AddFile(String url, String data);
+	void     AddImage(String url, String data);
+	String   GetURLFile(String url) const;
+
+public:
+	String output_path;
+	enum { STYLE_DEEP, STYLE_FLAT, STYLE_ONEFILE };
+	int style;
+	VectorMap<String, String> files;
+	VectorMap<String, String> images;
+};
+
+void CreateHelpHtml(const RichBook& book, RichBookHtml& html);
+
+Callback1<RichBook&>& DefaultBook();
+
+void CreateDefaultBook();
+void CreateDefaultPDF();
+void CreateDefaultRTF();
+void CreateDefaultHTML();
+
+void HelpBookMenu(Bar& bar);
+
+END_UPP_NAMESPACE
+
+#endif
diff --git a/uppsrc/RichBook/RichBook.t b/uppsrc/RichBook/RichBook.t
new file mode 100644
index 000000000..1be4fc304
--- /dev/null
+++ b/uppsrc/RichBook/RichBook.t
@@ -0,0 +1,38 @@
+
+// RichBook.cpp
+
+T_("Typesetting page %d...")
+csCZ("S�z�m stranu %d...")
+
+T_("Printing page %d...")
+csCZ("Tisknu stranu %d...")
+
+T_("Typesetting...")
+csCZ("S�z�m...")
+
+T_("Exporting PDF...")
+csCZ("Exportuji PDF...")
+
+T_("PDF documents (*.pdf)")
+csCZ("Dokumenty PDF (*.pdf)")
+
+T_("PDF export")
+csCZ("Export PDF")
+
+T_("Rich text documents (*.rtf)")
+csCZ("Dokumenty Rich text (*.rtf)")
+
+T_("Save manual as")
+csCZ("Ulo�it p��ru�ku jako")
+
+T_("Print manual")
+csCZ("Tisk p��ru�ky")
+
+T_("RTF export")
+csCZ("Export do RTF")
+
+T_("HTML export")
+csCZ("Export do HTML")
+
+T_("Save manual")
+csCZ("Ulo�it p��ru�ku")
diff --git a/uppsrc/RichBook/RichBook.upp b/uppsrc/RichBook/RichBook.upp
new file mode 100644
index 000000000..be67ca334
--- /dev/null
+++ b/uppsrc/RichBook/RichBook.upp
@@ -0,0 +1,9 @@
+uses
+	RichText,
+	CtrlLib;
+
+file
+	RichBook.h,
+	RichBook_init.icpp,
+	RichBook.t,
+	RichBook.cpp;
diff --git a/uppsrc/RichBook/RichBook_init.icpp b/uppsrc/RichBook/RichBook_init.icpp
new file mode 100644
index 000000000..b674f63b5
--- /dev/null
+++ b/uppsrc/RichBook/RichBook_init.icpp
@@ -0,0 +1,8 @@
+#include "RichBook.h"
+
+NAMESPACE_UPP
+
+#define TFILE <RichBook/RichBook.t>
+#include <Core/t.h>
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/RichEdit/AUTHORS b/uppsrc/RichEdit/AUTHORS
new file mode 100644
index 000000000..f782e5b62
--- /dev/null
+++ b/uppsrc/RichEdit/AUTHORS
@@ -0,0 +1,2 @@
+Mirek Fidler <cxl@ntllib.org>
+Tomas Rylek  <rylek@volny.cz>
\ No newline at end of file
diff --git a/uppsrc/RichEdit/COPYING b/uppsrc/RichEdit/COPYING
new file mode 100644
index 000000000..33aa39102
--- /dev/null
+++ b/uppsrc/RichEdit/COPYING
@@ -0,0 +1,30 @@
+Copyright (C) 2005 Mirek Fidler, Tomas Rylek and various contributors (see AUTHORS)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to
+deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies of the Software and its Copyright notices. In addition publicly
+documented acknowledgment must be given that this software has been used if no
+source code of this software is made available publicly. This includes
+acknowledgments in either Copyright notices, Manuals, Publicity and Marketing
+documents or any documentation provided with any product containing this
+software. This License does not apply to any software that links to the
+libraries provided by this software (statically or dynamically), but only to
+the software provided.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+-----------
+
+Please see the COPYING.PLAIN for a plain-english explanation of this notice
+and it's intent.
diff --git a/uppsrc/RichEdit/COPYING-PLAIN b/uppsrc/RichEdit/COPYING-PLAIN
new file mode 100644
index 000000000..770a8132f
--- /dev/null
+++ b/uppsrc/RichEdit/COPYING-PLAIN
@@ -0,0 +1,33 @@
+Plain English Copyright Notice
+
+This file is not intended to be the actual License. The reason this file
+exists is that we here are programmers and engineers. We aren't lawyers. We
+provide licenses that we THINK say the right things, but we have our own
+intentions at heart. This is a plain-english explanation of what those
+intentions are, and if you follow them you will be within the "spirit" of
+the license.
+
+The intent is for us to enjoy writing software that is useful to us (the
+AUTHORS) and allow others to use it freely and also benefit from the work we
+put into making it. We don't want to restrict others using it. They should
+not *HAVE* to make the source code of the applications they write that
+simply link to these libraries (be that statically or dynamically), or for
+them to be limited as to what license they choose to use (be it open, closed
+or anything else). But we would like to know you are using these libraries.
+We simply would like to know that it has been useful to someone. This is why
+we ask for acknowledgement of some sort.
+
+You can do what you want with the source of this software - it doesn't
+matter. We still have it here for ourselves and it is open and free to use
+and download and play with. It can't be taken away. We don't really mind what
+you do with the source to your software. We would simply like to know that
+you are using it - especially if it makes it to a commerical product. If you
+simply e-mail all the AUTHORS (see COPYING and AUTHORS files) telling us, and
+then make sure you include a paragraph or page in the manual or in the "About.."
+box for the product with the copyright notice and state that you used this
+software, we will be very happy. If you want to contribute back modifications
+and fixes you may have made we will welcome those too with open arms (generally).
+If you want help with changes needed, ports needed or features to be added,
+arrangements can be easily made with some dialogue.
+
+Mirek Fidler <cxl@ntllib.org>
diff --git a/uppsrc/RichEdit/Clip.cpp b/uppsrc/RichEdit/Clip.cpp
new file mode 100644
index 000000000..5f631ce96
--- /dev/null
+++ b/uppsrc/RichEdit/Clip.cpp
@@ -0,0 +1,229 @@
+#include "RichEdit.h"
+
+NAMESPACE_UPP
+
+#define RTFS "Rich Text Format;text/rtf;application/rtf"
+
+bool RichEdit::Accept(PasteClip& d, RichText& clip)
+{
+	if(IsReadOnly())
+		return false;
+	for(int i = 0; i < RichObject::GetTypeCount(); i++) {
+		RichObjectType& rt = RichObject::GetType(i);
+		if(rt.Accept(d)) {
+			Value data = rt.Read(d);
+			if(!IsNull(data)) {
+				RichPara p;
+				p.Cat(RichObject(&rt, data, pagesz), formatinfo);
+				clip.Cat(p);
+			}
+			return true;
+		}
+	}
+	if(d.Accept("text/QTF"))
+		clip = ParseQTF(~d);
+	else
+	if(d.Accept(RTFS))
+		clip = ParseRTF(~d);
+	else
+	if(AcceptText(d))
+		clip = AsRichText(GetWString(d), formatinfo);
+	else
+		return false;
+	return true;
+}
+
+void RichEdit::ClipPaste(RichText& clip)
+{
+	NextUndo();
+	if(clip.GetPartCount() == 1 && clip.IsTable(0)) {
+		CancelSelection();
+		if(cursorp.table) {
+			NextUndo();
+			SaveTable(cursorp.table);
+			text.PasteTable(cursorp.table, cursorp.cell, clip.GetTable(0));
+			Finish();
+			return;
+		}
+	}
+	clip.Normalize();
+	PasteText(clip);
+}
+
+void RichEdit::DragAndDrop(Point p, PasteClip& d)
+{
+	int dropcursor = GetMousePos(p);
+	if(dropcursor >= 0) {
+		RichText clip;
+		if(Accept(d, clip)) {
+			NextUndo();
+			int a = sb;
+			int c = dropcursor;
+			if(InSelection(c)) {
+				RemoveSelection();
+				if(IsDragAndDropSource())
+					d.SetAction(DND_COPY);
+			}
+			int sell, selh;
+			if(GetSelection(sell, selh) && d.GetAction() == DND_MOVE && IsDragAndDropSource()) {
+				if(c > sell)
+					c -= selh - sell;
+				RemoveSelection();
+				d.SetAction(DND_COPY);
+			}
+			Move(c);
+			clip.Normalize();
+			ClipPaste(clip);
+			sb = a;
+			Select(c, clip.GetLength());
+			SetFocus();
+			Action();
+			return;
+		}
+	}
+	if(!d.IsAccepted()) dropcursor = -1;
+	Rect r = Null;
+	if(dropcursor >= 0 && dropcursor < text.GetLength()) {
+		RichCaret pr = text.GetCaret(dropcursor, pagesz);
+		Zoom zoom = GetZoom();
+		Rect tr = GetTextRect();
+		r = RectC(pr.left * zoom + tr.left - 1,
+		          GetPosY(pr) + (pr.lineascent - pr.caretascent) * zoom,
+		          2, (pr.caretascent + pr.caretdescent) * zoom);
+	}
+	if(r != dropcaret) {
+		RefreshDropCaret();
+		dropcaret = r;
+		RefreshDropCaret();
+	}
+}
+
+void RichEdit::DragRepeat(Point p)
+{
+	sb = (int)sb + GetDragScroll(this, p, 16).y;
+}
+
+void RichEdit::RefreshDropCaret()
+{
+	Refresh(dropcaret.OffsetedVert(-sb));
+}
+
+void RichEdit::Paste()
+{
+	if(IsReadOnly())
+		return;
+	RichText clip;
+	PasteClip d = Clipboard();
+	if(!Accept(d, clip))
+		return;
+	ClipPaste(clip);
+}
+
+void RichEdit::DragLeave()
+{
+	RefreshDropCaret();
+	dropcaret.Clear();
+}
+
+static String sRTF(const Value& data)
+{
+	const RichText& txt = ValueTo<RichText>(data);
+	return EncodeRTF(txt);
+}
+
+static String sQTF(const Value& data)
+{
+	const RichText& txt = ValueTo<RichText>(data);
+	return AsQTF(txt);
+}
+
+void RichEdit::Copy()
+{
+	if(IsSelection()) {
+		ClearClipboard();
+		RichText txt = GetSelection();
+		AppendClipboardUnicodeText(txt.GetPlainText());
+		Value clip = RawPickToValue(txt);
+		AppendClipboard("text/QTF", clip, sQTF);
+		AppendClipboard(RTFS, clip, sRTF);
+	}
+	else
+	if(objectpos >= 0) {
+		RichObject o = GetObject();
+		Vector<String> v = Split(o.GetType().GetClipFmts(), ';');
+		for(int i = 0; i < v.GetCount(); i++) {
+			if(i == 0)
+				ClearClipboard();
+			AppendClipboard(v[i], o.GetType().GetClip(o.GetData(), v[i]));
+		}
+	}
+}
+
+String RichEdit::GetSelectionData(const String& fmt) const
+{
+	String f = fmt;
+	if(IsSelection()) {
+		RichText clip = GetSelection();
+		if(f == "text/QTF")
+			return AsQTF(clip);
+		if(InScList(f, RTFS))
+			return EncodeRTF(clip);
+		return GetTextClip(clip.GetPlainText(), fmt);
+	}
+/*	else
+	if(objectpos >= 0) {
+		RichObject o = GetObject();
+		if(InScList(fmt, o.GetType().GetClipFmts()))
+			return o.GetType().GetClip(o.GetData(), fmt);
+	}*/
+	return Null;
+}
+
+void RichEdit::LeftDrag(Point p, dword flags)
+{
+	int c = GetMousePos(p);
+	Size ssz = StdSampleSize();
+	if(!HasCapture() && InSelection(c)) {
+		RichText sample = GetSelection(5000);
+		sample.ApplyZoom(Zoom(1, 8));
+		ImageDraw iw(ssz);
+		iw.DrawRect(0, 0, ssz.cx, ssz.cy, White);
+		sample.Paint(iw, 0, 0, 128);
+		NextUndo();
+		if(DoDragAndDrop(String().Cat() << "text/QTF;" RTFS ";" << ClipFmtsText(),
+		                 ColorMask(iw, White)) == DND_MOVE) {
+			RemoveSelection();
+			Action();
+		}
+	}
+/*	else
+	if(objectpos >= 0 && c == objectpos) {
+		ReleaseCapture();
+		RichObject o = GetObject();
+		Size sz = o.GetPhysicalSize();
+		NextUndo();
+		if(DoDragAndDrop(o.GetType().GetClipFmts(),
+		                 o.ToImage(Size(ssz.cx, sz.cy * ssz.cx / sz.cx))) == DND_MOVE
+		   && objectpos >= 0) {
+			if(droppos > objectpos)
+				droppos--;
+			Remove(objectpos, 1);
+		}
+		Move(droppos);
+		SetObjectPos(droppos);
+	}*/
+}
+
+void  RichEdit::MiddleDown(Point p, dword flags)
+{
+	RichText clip;
+	if(IsReadOnly())
+		return;
+	if(Accept(Selection(), clip)) {
+		selclick = false;
+		LeftDown(p, flags);
+		ClipPaste(clip);
+	}
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/RichEdit/Cursor.cpp b/uppsrc/RichEdit/Cursor.cpp
new file mode 100644
index 000000000..2900a838a
--- /dev/null
+++ b/uppsrc/RichEdit/Cursor.cpp
@@ -0,0 +1,421 @@
+#include "RichEdit.h"
+
+NAMESPACE_UPP
+
+void RichEdit::FinishNF()
+{
+	anchorp = text.GetRichPos(anchor);
+	cursorp = text.GetRichPos(cursor);
+	tablesel = 0;
+	if(anchor != cursor) {
+		RichPos p = text.GetRichPos(cursor, anchorp.level);
+		if(anchorp.level == 0 || anchorp.level < cursorp.level) {
+			cursor = text.AdjustCursor(anchor, cursor);
+			cursorp = text.GetRichPos(cursor);
+		}
+		else
+		if(p.table != anchorp.table) {
+			tablesel = anchorp.table;
+			if(cursor < anchor) {
+				cells.left = 0;
+				cells.right = anchorp.cell.x;
+				cells.top = 0;
+				cells.bottom = anchorp.cell.y;
+			}
+			else {
+				cells.left = anchorp.cell.x;
+				cells.right = anchorp.tabsize.cx - 1;
+				cells.top = anchorp.cell.y;
+				cells.bottom = anchorp.tabsize.cy - 1;
+			}
+			text.AdjustTableSel(tablesel, cells);
+		}
+		else
+		if(p.cell != anchorp.cell) {
+			tablesel = anchorp.table;
+			cells.left = min(anchorp.cell.x, p.cell.x);
+			cells.right = max(anchorp.cell.x, p.cell.x);
+			cells.top = min(anchorp.cell.y, p.cell.y);
+			cells.bottom = max(anchorp.cell.y, p.cell.y);
+			text.AdjustTableSel(tablesel, cells);
+		}
+	}
+	cursorc = text.GetCaret(cursor, pagesz);
+	Size sz = GetSize();
+	SetSb();
+	Rect r = PlaceCaret();
+	if(r.top == GetPosY(text.GetCaret(0, pagesz)))
+		sb = 0;
+	else
+		sb.ScrollInto(r.top, r.Height());
+	PageY top, bottom;
+	int sell = min(cursor, anchor);
+	int selh = max(cursor, anchor);
+	if(tablesel)
+		Refresh();
+	else
+	if(text.GetInvalid(top, bottom, pagesz, sell, selh, osell, oselh)) {
+		int y = GetPosY(top);
+		Refresh(0, y - sb, sz.cx, GetPosY(bottom) - y);
+		y = GetPosY(text.GetHeight(pagesz)) - sb;
+		if(y < sz.cy)
+			Refresh(0, y, sz.cx, sz.cy - y);
+	}
+	osell = sell;
+	oselh = selh;
+	text.Validate();
+	FixObjectRect();
+	SetupRuler();
+	if(modified) {
+		if(useraction)
+			WhenAction();
+	}
+	useraction = modified = false;
+}
+
+void RichEdit::Finish()
+{
+	FinishNF();
+	ReadFormat();
+}
+
+void RichEdit::MoveNG(int newpos, bool select)
+{
+	if(newpos < 0) newpos = 0;
+	if(newpos >= text.GetLength() + select) newpos = text.GetLength() + select;
+	CloseFindReplace();
+	cursor = newpos;
+	if(!select)
+		anchor = cursor;
+	objectpos = -1;
+	Finish();
+	if(select)
+		SetSelectionSource(String().Cat() << "text/QTF;Rich Text Format;text/rtf;application/rtf;"
+		                   << ClipFmtsText());
+}
+
+void RichEdit::Move(int newpos, bool select)
+{
+	MoveNG(newpos, select);
+	gx = cursorc.left;
+}
+
+void RichEdit::MoveUpDown(int dir, bool select, int pg)
+{
+	Rect page = pagesz;
+	PageY h = text.GetHeight(pagesz);
+	if(dir > 0 && cursor >= GetLength() && select) {
+		Move(GetLength() + 1, true);
+		return;
+	}
+	if(dir < 0 && cursor > GetLength()) {
+		Move(GetLength(), select);
+		return;
+	}
+	int c = text.GetVertMove(min(GetLength(), cursor), gx, page, dir);
+	if(c >= 0)
+		MoveNG(c, select);
+	else
+		Move(dir < 0 ? 0 : GetLength(), select);
+	if(pg) {
+		RichCaret pr = text.GetCaret(cursor, pagesz);
+		PageY py;
+		py.page = pr.page;
+		py.y = pr.top + dir * pg;
+		while(py.y > pagesz.cy) {
+			py.y -= pagesz.cy;
+			py.page++;
+		}
+		while(py.y < 0) {
+			py.y += pagesz.cy;
+			py.page--;
+		}
+		MoveNG(text.GetPos(pr.left, py, pagesz), select);
+	}
+}
+
+void RichEdit::MovePageUpDown(int dir, bool select)
+{
+	PageRect p = text.GetCaret(cursor, pagesz);
+	int q = GetPosY(p) - sb;
+	MoveUpDown(dir, select, 4 * GetTextRect().Height() / GetZoom() / 5);
+	p = text.GetCaret(cursor, pagesz);
+	sb = GetPosY(p) - q;
+}
+
+void RichEdit::MoveHomeEnd(int dir, bool select)
+{
+	int c = cursor;
+	while(c + dir >= 0 && c + dir <= text.GetLength()) {
+		PageRect p1 = text.GetCaret(c + dir, pagesz);
+		if(p1.page != cursorc.page || p1.top != cursorc.top)
+			break;
+		c += dir;
+	}
+	Move(c, select);
+}
+
+bool RichEdit::IsW(int c)
+{
+	return IsLetter(c) || IsDigit(c) || c == '_';
+}
+
+void RichEdit::MoveWordRight(bool select)
+{
+	Move(GetNextWord(cursor), select);
+}
+
+void RichEdit::MoveWordLeft(bool select)
+{
+	Move(GetPrevWord(cursor), select);
+}
+
+bool RichEdit::SelBeg(bool select)
+{
+	if(IsSelection() && !select) {
+		Move(min(cursor, anchor), false);
+		return true;
+	}
+	return false;
+}
+
+bool RichEdit::SelEnd(bool select)
+{
+	if(IsSelection() && !select) {
+		Move(max(cursor, anchor), false);
+		return true;
+	}
+	return false;
+}
+
+void RichEdit::SelCell(int dx, int dy)
+{
+	Move(text.GetCellPos(tablesel, minmax(cursorp.cell.y + dy, 0, cursorp.tabsize.cy - 1),
+	                               minmax(cursorp.cell.x + dx, 0, cursorp.tabsize.cx - 1)).pos, true);
+}
+
+bool RichEdit::CursorKey(dword key, int count)
+{
+	bool select = key & K_SHIFT;
+	if(select && tablesel)
+		switch(key & ~K_SHIFT) {
+		case K_LEFT:
+			SelCell(-1, 0);
+			break;
+		case K_RIGHT:
+			SelCell(1, 0);
+			break;
+		case K_UP:
+			SelCell(0, -1);
+			break;
+		case K_DOWN:
+			SelCell(0, 1);
+			break;
+		default:
+			return false;
+		}
+	else {
+		switch(key) {
+		case K_CTRL_UP:
+			sb.PrevLine();
+			break;
+		case K_CTRL_DOWN:
+			sb.NextLine();
+			break;
+		default:
+			switch(key & ~K_SHIFT) {
+			case K_LEFT:
+				if(!SelBeg(select))
+					Move(cursor - 1, select);
+				break;
+			case K_RIGHT:
+				if(!SelEnd(select))
+					Move(cursor + 1, select);
+				break;
+			case K_UP:
+				if(!SelBeg(select))
+					MoveUpDown(-1, select);
+				break;
+			case K_DOWN:
+				if(!SelEnd(select))
+					MoveUpDown(1, select);
+				break;
+			case K_PAGEUP:
+				if(!SelBeg(select))
+					MovePageUpDown(-1, select);
+				break;
+			case K_PAGEDOWN:
+				if(!SelEnd(select))
+					MovePageUpDown(1, select);
+				break;
+			case K_END:
+				MoveHomeEnd(1, select);
+				break;
+			case K_HOME:
+				MoveHomeEnd(-1, select);
+				break;
+			case K_CTRL_LEFT:
+				if(!SelBeg(select))
+					MoveWordLeft(select);
+				break;
+			case K_CTRL_RIGHT:
+				if(!SelEnd(select))
+					MoveWordRight(select);
+				break;
+			case K_CTRL_HOME:
+			case K_CTRL_PAGEUP:
+				Move(0, select);
+				break;
+			case K_CTRL_END:
+			case K_CTRL_PAGEDOWN:
+				Move(text.GetLength(), select);
+				break;
+			case K_CTRL_A:
+				Move(0, false);
+				Move(text.GetLength(), true);
+				break;
+			default:
+				return false;
+			}
+		}
+	}
+	Sync();
+	return true;
+}
+
+bool RichEdit::IsSelection() const
+{
+	return anchor >= 0 && anchor != cursor;
+}
+
+bool RichEdit::GetSelection(int& l, int& h) const
+{
+	if(IsSelection()) {
+		l = min(anchor, cursor);
+		h = max(anchor, cursor);
+		return true;
+	}
+	l = h = cursor;
+	return false;
+}
+
+bool RichEdit::InSelection(int& c) const
+{
+	int sell, selh;
+	if(GetSelection(sell, selh) && c >= sell && c < selh) {
+		c = sell;
+		return true;
+	}
+	return false;
+}
+
+void RichEdit::CancelSelection()
+{
+	if(IsSelection()) {
+		tablesel = 0;
+		anchor = cursor;
+		found = notfoundfw = false;
+		CloseFindReplace();
+		Finish();
+	}
+}
+
+bool RichEdit::RemoveSelection(bool joinnext)
+{
+	if(IsSelection()) {
+		if(tablesel) {
+			NextUndo();
+			SaveTable(tablesel);
+			text.ClearTable(tablesel, cells);
+			Move(text.GetCellPos(tablesel, cells.top, cells.left).pos);
+		}
+		else {
+			int c = min(cursor, anchor);
+			Remove(c, abs(cursor - anchor), joinnext);
+			found = notfoundfw = false;
+			CloseFindReplace();
+			Move(c);
+		}
+		return true;
+	}
+	return false;
+}
+
+WString RichEdit::GetWordAtCursor()
+{
+	WString w;
+	int c = cursor;
+	if(IsLetter(text[c])) {
+		while(c > 0 && IsLetter(text[c - 1]))
+			c--;
+		while(w.GetLength() < 64 && IsLetter(text[c])) {
+			w.Cat(text[c]);
+			c++;
+		}
+	}
+	return w;
+}
+
+void RichEdit::AddUserDict()
+{
+	if(IsSelection()) return;
+	WString w = GetWordAtCursor();
+	if(w.IsEmpty()) return;
+	SpellerAdd(w, formatinfo.language);
+	text.ClearSpelling();
+	Refresh();
+}
+
+void RichEdit::Goto()
+{
+	SetFocus();
+	if(gototable.IsCursor())
+	{
+		Move(gototable.Get(1), false);
+		Move(gototable.Get(2), true);
+	}
+}
+
+void RichEdit::GotoType(int type, Ctrl& l)
+{
+	Vector<RichValPos> f = text.GetValPos(pagesz, type);
+	gototable.Clear();
+	for(int i = 0; i < f.GetCount(); i++) {
+		const RichValPos& q = f[i];
+		int endpos = q.pos;
+		if(type == RichText::INDEXENTRIES) {
+			WString ie = text.GetRichPos(endpos).format.indexentry;
+			int l = text.GetLength();
+			while(endpos < l) {
+				RichPos p = text.GetRichPos(++endpos);
+				if(p.format.indexentry != ie || p.chr == '\n')
+					break;
+			}
+		}
+		gototable.Add(q.data, q.pos, endpos);
+	}
+	if(gototable.GetCount())
+		gototable.PopUp(&l);
+}
+
+void RichEdit::GotoLbl()
+{
+	GotoType(RichText::LABELS, label);
+}
+
+void RichEdit::GotoEntry()
+{
+	GotoType(RichText::INDEXENTRIES, indexentry);
+}
+
+void RichEdit::GotoLabel(const String& lbl)
+{
+	Vector<RichValPos> f = text.GetValPos(pagesz, RichText::LABELS);
+	for(int i = 0; i < f.GetCount(); i++)
+		if(f[i].data == WString(lbl)) {
+			Move(f[i].pos);
+			break;
+		}
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/RichEdit/Editor.cpp b/uppsrc/RichEdit/Editor.cpp
new file mode 100644
index 000000000..45ee5cc2f
--- /dev/null
+++ b/uppsrc/RichEdit/Editor.cpp
@@ -0,0 +1,697 @@
+#include "RichEdit.h"
+
+NAMESPACE_UPP
+
+bool FontHeight::Key(dword key, int count)
+{
+	if(key == K_ENTER) {
+		WhenSelect();
+		return true;
+	}
+	return WithDropChoice<EditDouble>::Key(key, count);
+}
+
+
+double RichEdit::DotToPt(int dt)
+{
+	return 7200 * minmax(dt, 8, 8000) / 600 / 10 / 10.0;
+}
+
+int RichEdit::PtToDot(double pt)
+{
+	return int((600 * pt + 71) / 72);
+}
+
+struct EditPageDraw : public PageDraw {
+	virtual Draw& Page(int _page);
+	virtual Draw& Info()                                { return w; }
+
+	Draw&              w;
+	int                page;
+	int                x, y;
+	Size               size;
+
+	EditPageDraw(Draw& w) : w(w) { w.Begin(); w.Begin(); page = -1; }
+	~EditPageDraw() { w.End(); w.End(); }
+};
+
+Draw& EditPageDraw::Page(int _page)
+{
+	if(page == _page) return w;
+	page = _page;
+	w.End();
+	w.End();
+	if(size.cy < INT_MAX)
+		w.Clipoff(0, y + (size.cy + 3) * page + 2, 9999, size.cy);
+	else
+		w.Offset(0, y + 2);
+	w.Offset(x, 0);
+	return w;
+}
+
+Rect RichEdit::GetTextRect() const
+{
+	Size sz = GetSize();
+	if(sz.cy < 16)
+		sz.cy = 16;
+	if(sz.cx < 80)
+		return RectC(0, 0, 48, max(sz.cy, 16));
+	int cx = zoom * (sz.cx - 32) / 100;
+	return RectC((sz.cx - cx) / 2, 0, cx, sz.cy);
+}
+
+Zoom RichEdit::GetZoom() const
+{
+	return Zoom(GetTextRect().Width(), pagesz.cx);
+}
+
+Size RichEdit::GetZoomedPage() const
+{
+	return Size(GetTextRect().Width(), GetZoom() * pagesz.cy);
+}
+
+int  RichEdit::GetPosY(PageY py) const
+{
+	return py.page * (GetZoomedPage().cy + 3) + py.y * GetZoom() + 2;
+}
+
+PageY RichEdit::GetPageY(int y) const
+{
+	PageY py;
+	int q = GetZoomedPage().cy + 3;
+	py.page = y / q;
+	py.y = (y % q - 2) / GetZoom();
+	return py;
+}
+
+static void sPaintHotSpot(Draw& w, int x, int y)
+{
+	w.DrawRect(x + 1, y + 1, 6, 6, LtRed);
+	DrawFrame(w, x, y, 8, 8, SColorText);
+}
+
+void RichEdit::Paint(Draw& w)
+{
+	Size sz = GetSize();
+	p_size = sz;
+	Rect tr = GetTextRect();
+	Zoom zoom = GetZoom();
+	w.DrawRect(sz, White);
+	PageY py = text.GetHeight(pagesz);
+	{
+		EditPageDraw pw(w);
+		pw.x = tr.left;
+		pw.y = -sb;
+		pw.size = GetZoomedPage();
+		if(pagesz.cy == INT_MAX) {
+			pw.size.cy = INT_MAX;
+			DrawFrame(w, tr.left, (int)sb ? -1 : 0, pw.size.cx + 2, 9999, SColorShadow);
+		}
+		else
+			for(int i = 0; i <= py.page; i++)
+				DrawFrame(w, tr.left, i * (pw.size.cy + 3) + 1 - sb,
+				          pw.size.cx + 2, pw.size.cy + 2, SColorShadow);
+		PaintInfo pi;
+		pi.zoom = zoom;
+		pi.top = GetPageY(sb);
+		pi.bottom = GetPageY(sb + sz.cy);
+		pi.usecache = true;
+		pi.sizetracking = sizetracking;
+		pi.showcodes = showcodes;
+		if(spellcheck)
+			pi.spellingchecker = SpellParagraph;
+		if(IsSelection())
+			if(tablesel) {
+				pi.tablesel = tablesel;
+				pi.cells = cells;
+			}
+			else {
+				pi.sell = min(cursor, anchor);
+				pi.selh = max(cursor, anchor);
+			}
+		text.Paint(pw, pagesz, pi);
+	}
+	w.DrawRect(tr.left, GetPosY(py) - sb, 20, 3, showcodes);
+	if(objectpos >= 0) {
+		Rect r = objectrect;
+		r.Offset(tr.left, -sb);
+		DrawFrame(w, r, SColorText);
+		r.Deflate(1);
+		DrawFatFrame(w, r, Blend(SColorHighlight, SColorLight), 2);
+		r.Deflate(2);
+		DrawFrame(w, r, SColorText);
+		r.Deflate(1);
+		sPaintHotSpot(w, r.left + r.Width() / 2 - 3, r.bottom - 7);
+		sPaintHotSpot(w, r.right - 7, r.bottom - 7);
+		sPaintHotSpot(w, r.right - 7, r.top + r.Height() / 2 - 3);
+		w.Clip(r);
+		w.End();
+	}
+	else
+	if(paintcarect)
+		w.DrawRect(GetCaretRect(), InvertColor);
+	if(!IsNull(dropcaret))
+		DrawTiles(w, dropcaret.OffsetedVert(-sb), CtrlImg::checkers());
+	scroller.Set(sb);
+}
+
+int RichEdit::GetHotSpot(Point p) const
+{
+	if(objectpos < 0) return -1;
+	Rect r = objectrect;
+	r.Offset(GetTextRect().left, -sb);
+	r.Deflate(4, 4);
+	if(RectC(r.right - 7, r.bottom - 7, 8, 12).Contains(p))
+		return 0;
+	if(RectC(r.left + r.Width() / 2 - 3, r.bottom - 7, 12, 12).Contains(p))
+		return 1;
+	if(RectC(r.right - 7, r.top + r.Height() / 2 - 3, 12, 8).Contains(p))
+		return 2;
+	return -1;
+}
+
+void RichEdit::SetSb()
+{
+	sb.SetTotal(GetPosY(text.GetHeight(pagesz)) + 10);
+}
+
+void RichEdit::Scroll()
+{
+	scroller.Scroll(*this, GetSize(), sb);
+	PlaceCaret();
+}
+
+void RichEdit::EndSizeTracking()
+{
+	if(sizetracking) {
+		sizetracking = false;
+		Refresh();
+	}
+}
+
+void RichEdit::FixObjectRect()
+{
+	if(objectpos >= 0) {
+		Rect r = GetObjectRect(objectpos);
+		if(r != objectrect) {
+			objectrect = r;
+			Refresh(objectrect);
+		}
+	}
+}
+
+void RichEdit::Layout()
+{
+	Size sz = GetTextRect().Size();
+	sb.SetPage(sz.cy > 10 ? sz.cy - 4 : sz.cy);
+	SetupRuler();
+	SetSb();
+	PlaceCaret();
+	if(GetSize() != p_size) {
+		sizetracking = true;
+		KillSetTimeCallback(250, THISBACK(EndSizeTracking), TIMEID_ENDSIZETRACKING);
+	}
+	FixObjectRect();
+}
+
+Rect RichEdit::GetCaretRect(const RichCaret& pr) const
+{
+	Zoom zoom = GetZoom();
+	Rect tr = GetTextRect();
+	Rect r = RectC(pr.left * zoom + tr.left, GetPosY(pr) + (pr.lineascent - pr.caretascent) * zoom - sb,
+	               overwrite && GetChar(cursor) != '\n' ? pr.Width() * zoom
+	                         : (pr.caretascent * pr.caretdescent) * zoom > 20 ? 2 : 1,
+	               (pr.caretascent + pr.caretdescent) * zoom);
+	if(r.right > tr.right)
+		return Rect(tr.right - r.Width(), r.top, tr.right, r.bottom);
+	return r;
+}
+
+Rect RichEdit::GetCaretRect() const
+{
+	return GetCaretRect(text.GetCaret(cursor, pagesz));
+}
+
+Rect RichEdit::PlaceCaret()
+{
+	Zoom zoom = GetZoom();
+	Rect rr = Rect(zoom * cursorc.left, GetPosY(cursorc), zoom * cursorc.right,
+	               GetPosY(PageY(cursorc.page, cursorc.bottom)));
+	if(objectpos >= 0) {
+		KillCaret();
+		return rr;
+	}
+	if(!IsNull(objectrect)) {
+		objectrect = Null;
+		Refresh();
+	}
+	if(IsSelection()) {
+		KillCaret();
+	}
+	else
+		SetCaret(GetCaretRect(cursorc));
+	return rr;
+}
+
+void RichEdit::SetupRuler()
+{
+	Zoom zoom = GetZoom();
+	static struct Tl {
+		double grid;
+		int    numbers;
+		double numbermul;
+		int    marks;
+	}
+	tl[] = {
+		{ 25, 20, 25, 4 },
+		{ 600 / 72 * 4, 9, 4, 1000 },
+		{ 600 / 10, 10, 1 / 10.0, 5 },
+		{ 600 / 25.4, 10, 1, 5 },
+		{ 600 / 25.4, 10, 1 / 10.0, 5 },
+	};
+	const Tl& q = tl[unit];
+	ruler.SetLayout(GetTextRect().left + zoom * cursorc.textpage.left, cursorc.textpage.Width(),
+	                zoom, q.grid, q.numbers, q.numbermul, q.marks);
+}
+
+void RichEdit::SetupUnits()
+{
+	WithUnitLayout<TopWindow> d;
+	CtrlLayoutOKCancel(d, t_("Units"));
+	for(int i = 1; i <= 10; i++)
+		d.zoom.Add(10 * i, Format(t_("%d%% of width"), 10 * i));
+	CtrlRetriever r;
+	r(d.unit, unit)(d.showcodes, showcodes)(d.zoom, zoom);
+	if(d.Execute() == IDOK) {
+		r.Retrieve();
+		Refresh();
+		FinishNF();
+	}
+}
+
+int  RichEdit::GetNearestPos(int x, PageY py)
+{
+	int c = text.GetPos(x, py, pagesz);
+	String dummy;
+	RichPos p = text.GetRichPos(c);
+	if(c >= text.GetLength() - 1 || c < 0 || p.object || p.field
+	   || p.table && (p.posincell == 0 || p.posincell == p.celllen))
+		return c;
+	Rect r1 = text.GetCaret(c, pagesz);
+	Rect r2 = text.GetCaret(c + 1, pagesz);
+	return r1.top == r2.top && x - r1.left > r2.left - x ? c + 1 : c;
+}
+
+int RichEdit::GetX(int x)
+{
+	return (x - GetTextRect().left) / GetZoom();
+}
+
+int RichEdit::GetSnapX(int x)
+{
+	return (GetX(x) + GetTextRect().left) / 32 * 32;
+}
+
+void RichEdit::GetPagePoint(Point p, PageY& py, int& x)
+{
+	py = GetPageY(p.y + sb);
+	x = GetX(p.x);
+}
+
+int  RichEdit::GetMousePos(Point p) {
+	PageY py;
+	int    x;
+	GetPagePoint(p, py, x);
+	return GetNearestPos(x, py);
+}
+
+Rect RichEdit::GetObjectRect(int pos) const {
+	Zoom zoom = GetZoom();
+	RichCaret pr = text.GetCaret(pos, pagesz);
+	Rect r = Rect(zoom * pr.left,
+	              GetPosY(PageY(pr.page, pr.top + pr.lineascent - pr.objectcy + pr.objectyd)),
+	              zoom * pr.right,
+	              GetPosY(PageY(pr.page, pr.top + pr.lineascent + pr.objectyd)));
+	return r;
+}
+
+bool RichEdit::Print()
+{
+	text.SetFooter(footer);
+	text.PrintNoLinks(nolinks);
+	return UPP::Print(text, pagesz, cursorc.page);
+}
+
+struct DisplayFont : public Display {
+	void Paint(Draw& w, const Rect& r, const Value& q, Color ink, Color paper, dword style) const
+	{
+		Font fnt;
+		fnt.Face((int)q);
+		fnt.Height(r.Height() - 4);
+		w.DrawRect(r, paper);
+		w.DrawText(r.left, r.top + (r.Height() - fnt.Info().GetHeight()) / 2,
+		           Font::GetFaceName((int)q), fnt, ink);
+	}
+};
+
+struct ValueDisplayFont : public Display {
+	void Paint(Draw& w, const Rect& r, const Value& q, Color ink, Color paper, dword style) const
+	{
+		w.DrawRect(r, paper);
+		w.DrawText(r.left, r.top + (r.Height() - StdFont().Info().GetHeight()) / 2,
+		           Font::GetFaceName((int)q), StdFont(), ink);
+	}
+};
+
+void RichEdit::Clear()
+{
+	undo.Clear();
+	redo.Clear();
+	text.Clear();
+	Reset();
+	RichPara h;
+	h.format.language = GetCurrentLanguage();
+	text.Cat(h);
+	Refresh();
+	Finish();
+	ReadStyles();
+	SetModify();
+	modified = true;
+}
+
+void RichEdit::SetupLanguage(pick_ Vector<int>& _lng)
+{
+	Vector<int>& lng = const_cast<Vector<int>&>(_lng);
+	Sort(lng);
+	language.ClearList();
+	for(int i = 0; i < lng.GetCount(); i++)
+		language.Add(lng[i], lng[i] ? LNGAsText(lng[i]) : String(t_("None")));
+}
+
+void RichEdit::Pick(pick_ RichText& t)
+{
+	Clear();
+	text = t;
+	if(text.GetPartCount() == 0)
+		text.Cat(RichPara());
+	ReadStyles();
+	EndSizeTracking();
+	Vector<int> all_lang = text.GetAllLanguages();
+	SetupLanguage(all_lang);
+	Move(0);
+	Update();
+}
+
+Value RichEdit::GetData() const
+{
+	return AsQTF(text);
+}
+
+void  RichEdit::SetData(const Value& v)
+{
+	Pick(ParseQTF((String)v));
+}
+
+void  RichEdit::Serialize(Stream& s)
+{
+	int version = 0;
+	s / version;
+	String h;
+	if(s.IsStoring())
+		h = AsQTF(text);
+	s % h;
+	if(s.IsLoading())
+		Pick(ParseQTF(h));
+}
+
+int RichEdit::fh[] = {
+	6, 7, 8, 9, 10, 11, 12, 14, 16, 18, 20, 22, 24, 26, 28, 36, 42, 48, 60, 72, 0
+};
+
+RichEdit& RichEdit::FontFaces(const Vector<int>& ff)
+{
+	face.ClearList();
+	for(int i = 0; i < ff.GetCount(); i++)
+		face.Add(ff[i]);
+	return *this;
+}
+
+void RichEdit::SetupFaceList(DropList& face)
+{
+	face.ValueDisplay(Single<ValueDisplayFont>());
+	face.SetDisplay(Single<DisplayFont>());
+	face.SetLineCy(20);
+}
+
+void RichEdit::SpellCheck()
+{
+	spellcheck = !spellcheck;
+	Refresh();
+	RefreshBar();
+}
+
+void RichEdit::SerializeSettings(Stream& s)
+{
+	int version = 1;
+	s / version;
+	s % unit;
+	s % showcodes;
+	if(version >= 1)
+		s % zoom;
+	s % spellcheck;
+	s % findreplace.find;
+	findreplace.find.SerializeList(s);
+	s % findreplace.replace;
+	findreplace.replace.SerializeList(s);
+	s % findreplace.wholeword;
+	s % findreplace.ignorecase;
+	RefreshBar();
+}
+
+void RichEdit::Reset()
+{
+	undoserial = 0;
+	incundoserial = false;
+
+	objectpos = -1;
+	objectrect = Null;
+	sizetracking = true;
+
+	anchor = cursor = 0;
+	gx = 0;
+	oselh = osell = 0;
+
+	RichPara::Format pmt;
+	formatinfo.Set(pmt);
+
+	tabmove.table = 0;
+}
+
+RichEdit::UndoInfo RichEdit::PickUndoInfo()
+{
+	UndoInfo f;
+	f.undoserial = undoserial;
+	f.undo = undo;
+	f.redo = redo;
+	Clear();
+	return f;
+}
+
+void RichEdit::SetPickUndoInfo(pick_ UndoInfo& f)
+{
+	undoserial = f.undoserial;
+	incundoserial = true;
+	undo = f.undo;
+	redo = f.redo;
+	Finish();
+}
+
+RichEdit::PosInfo RichEdit::GetPosInfo() const
+{
+	PosInfo f;
+	f.cursor = cursor;
+	f.anchor = anchor;
+	f.sbpos = sb;
+	return f;
+}
+
+void RichEdit::SetPosInfo(const PosInfo& f)
+{
+	int l = text.GetLength();
+	cursor = min(l, f.cursor);
+	anchor = min(l, f.anchor);
+	sb = f.sbpos;
+	Finish();
+}
+
+void RichEdit::DoRefreshBar()
+{
+	WhenRefreshBar();
+}
+
+void RichEdit::RefreshBar()
+{
+	KillTimeCallback(TIMEID_REFRESHBAR);
+	SetTimeCallback(0, THISBACK(DoRefreshBar), TIMEID_REFRESHBAR);
+}
+
+void StdLinkDlg(String& s, WString&)
+{
+	EditText(s, t_("Hyperlink"), t_("Hyperlink"), CharFilterAscii128, 1000);
+}
+
+void StdLabelDlg(String& s)
+{
+	EditText(s, t_("Paragraph label"), t_("Label"), CharFilterAscii128, 100);
+}
+
+RichEdit::RichEdit()
+{
+	Unicode();
+	BackPaint();
+
+	face.NoWantFocus();
+	height.NoWantFocus();
+	style.NoWantFocus();
+	language.NoWantFocus();
+
+	setstyle = &style.InsertButton(0).SetMonoImage(CtrlImg::smallleft()).Tip(t_("Store as style"));
+	setstyle->WhenClick = THISBACK(SetStyle);
+	style.InsertButton(0).SetMonoImage(RichEditImg::ManageStyles()).Tip(t_("Style manager"))
+	     .WhenClick = THISBACK(Styles);
+	style.Tip(t_("Style"));
+
+	style <<= THISBACK(Style);
+
+	pagesz = Size(3968, 6074);
+	unit = UNIT_POINT;
+	zoom = 100;
+	Clear();
+
+	nolinks = false;
+
+	showcodes = LtBlue;
+	spellcheck = true;
+
+	overwrite = false;
+
+	sb.WhenScroll = THISBACK(Scroll);
+	sb.SetLine(16);
+	Layout();
+	SetSb();
+
+	adjustunits.Image(RichEditImg::AdjustUnits());
+	adjustunits <<= THISBACK(SetupUnits);
+	ruler.Add(adjustunits.RightPos(4, 16).TopPos(2, 16));
+
+	undosteps = 500;
+
+	AddFrame(ViewFrame());
+	AddFrame(ruler);
+	AddFrame(sb);
+	RefreshBar();
+
+	ruler.WhenBeginTrack = THISBACK(BeginRulerTrack);
+	ruler.WhenTrack = THISBACK(RulerTrack);
+	ruler.WhenEndTrack = THISBACK(ReadFormat);
+	ruler.WhenLeftDown = THISBACK(AddTab);
+	ruler.WhenRightDown = THISBACK(TabMenu);
+
+	SetupFaceList(face);
+	face <<= THISBACK(SetFace);
+	face.Tip(t_("Font face"));
+	Vector<int> ff;
+	ff.Add(Font::ARIAL);
+	ff.Add(Font::ROMAN);
+	ff.Add(Font::COURIER);
+	FontFaces(ff);
+
+	language <<= THISBACK(SetLanguage);
+	language.Tip(t_("Language"));
+	language.WhenClick = THISBACK(Language);
+	language.Add(0, t_("None"));
+
+	for(int i = 0; fh[i]; i++)
+		height.AddList(fh[i]);
+	height.WhenSelect = THISBACK(SetHeight);
+	height.Tip(t_("Font height"));
+
+	hyperlink <<= THISBACK(Hyperlink);
+	hyperlink.Tip(t_("Hyperlink"));
+	hyperlink.NoWantFocus();
+	label <<= THISBACK(Label);
+	label.Tip(t_("Paragraph label"));
+	indexentry << THISBACK(IndexEntry);
+	indexentry.Tip(t_("Index entry"));
+	indexentry.NoWantFocus();
+
+	gotolabel.SetMonoImage(RichEditImg::GoTo());
+	label.AddFrame(gotolabel);
+	gotolabel.Tip(t_("Go to label"));
+	gotolabel <<= THISBACK(GotoLbl);
+	gotolabel.NoWantFocus();
+
+	gotoentry.SetMonoImage(RichEditImg::GoTo());
+	indexentry.AddFrame(gotoentry);
+	gotoentry.Tip(t_("Go to index entry"));
+	gotoentry <<= THISBACK(GotoEntry);
+
+	gototable.Normal();
+	gototable.AddIndex();
+	gototable.AddIndex();
+
+	gototable.WhenSelect = THISBACK(Goto);
+
+	ink.ColorImage(RichEditImg::InkColor())
+	   .NullImage(RichEditImg::NullInkColor())
+	   .StaticImage(RichEditImg::ColorA());
+	ink.NotNull();
+	paper.ColorImage(RichEditImg::PaperColor())
+	     .NullImage(RichEditImg::NullPaperColor())
+	     .StaticImage(RichEditImg::ColorA());
+	ink <<= THISBACK(SetInk);
+	ink.Tip(t_("Text color"));
+	paper <<= THISBACK(SetPaper);
+	paper.Tip(t_("Background color"));
+
+	ReadStyles();
+
+	paintcarect = false;
+
+	CtrlLayoutOKCancel(findreplace, t_("Find / Replace"));
+	findreplace.cancel <<= THISBACK(CloseFindReplace);
+	findreplace.ok <<= THISBACK(Find);
+	findreplace.amend <<= THISBACK(Replace);
+	notfoundfw = found = false;
+	findreplace.NoCenter();
+
+	WhenHyperlink = callback(StdLinkDlg);
+	WhenLabel = callback(StdLabelDlg);
+
+	p_size = Size(-1, -1);
+
+	useraction = modified = false;
+	ClearModify();
+	Finish();
+}
+
+RichEdit::~RichEdit() {}
+
+void RichEditWithToolBar::TheBar(Bar& bar)
+{
+	DefaultBar(bar, extended);
+}
+
+void RichEditWithToolBar::RefreshBar()
+{
+	toolbar.Set(THISBACK(TheBar));
+}
+
+RichEditWithToolBar::RichEditWithToolBar()
+{
+	InsertFrame(0, toolbar);
+	WhenRefreshBar = callback(this, &RichEditWithToolBar::RefreshBar);
+	extended = true;
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/RichEdit/Find.cpp b/uppsrc/RichEdit/Find.cpp
new file mode 100644
index 000000000..55d7a87a6
--- /dev/null
+++ b/uppsrc/RichEdit/Find.cpp
@@ -0,0 +1,191 @@
+#include <RichEdit/RichEdit.h>
+
+NAMESPACE_UPP
+
+void RichEdit::FindReplaceAddHistory() {
+	if(!String(findreplace.find).IsEmpty())
+		findreplace.find.AddHistory();
+	if(!String(findreplace.replace).IsEmpty())
+		findreplace.replace.AddHistory();
+}
+
+void RichEdit::CloseFindReplace()
+{
+	if(findreplace.IsOpen())
+		findreplace.Close();
+}
+
+bool compare3(const wchar *s, const wchar *a, const wchar *b, int len)
+{
+	const wchar *e = s + len;
+	while(s < e) {
+		if(*s != *a && *s != *b)
+			return false;
+		s++;
+		a++;
+		b++;
+	}
+	return true;
+}
+
+struct RichFindIterator : RichText::Iterator {
+	int cursor;
+	int fpos;
+	WString upperw, lowerw;
+	bool ww;
+	int  len;
+
+	virtual bool operator()(int pos, const RichPara& para)
+	{
+		WString ptext = para.GetText();
+		if(pos + ptext.GetLength() > cursor && ptext.GetLength() >= len) {
+			const wchar *q = ptext;
+			const wchar *e = ptext.End() - len;
+			if(cursor >= pos)
+				q += cursor - pos;
+			while(q <= e) {
+				if(compare3(q, upperw, lowerw, len) &&
+				   (!ww || (q + len == e || !IsLetter(q[len])) &&
+				           (q == ptext || !IsLetter(q[-1])))) {
+					fpos = int(q - ~ptext + pos);
+					return true;
+				}
+				q++;
+			}
+		}
+		return false;
+	}
+};
+
+int  RichEdit::FindPos()
+{
+	RichFindIterator fi;
+	WString w = findreplace.find.GetText();
+	if(findreplace.ignorecase) {
+		fi.upperw = ToUpper(w);
+		fi.lowerw = ToLower(w);
+	}
+	else
+		fi.upperw = fi.lowerw = w;
+	fi.len = w.GetLength();
+	fi.ww = findreplace.wholeword;
+	if(w.GetLength()) {
+		fi.cursor = cursor;
+		if(text.Iterate(fi))
+			return fi.fpos;
+	}
+	return -1;
+}
+
+void RichEdit::Find()
+{
+	CancelSelection();
+	FindReplaceAddHistory();
+	if(notfoundfw)
+		Move(0, false);
+	found = notfoundfw = false;
+	int pos = FindPos();
+	if(pos >= 0) {
+		anchor = pos;
+		cursor = pos + findreplace.find.GetText().GetLength();
+		Finish();
+		found = true;
+		Size sz = findreplace.GetSize();
+		Rect sw = GetScreenView();
+		Rect r = sw.CenterRect(sz);
+		Rect cr = GetCaretRect();
+		if(cr.top < sz.cy + 2 * cr.Height()) {
+			r.bottom = sw.bottom - 8;
+			r.top = r.bottom - sz.cy;
+		}
+		else {
+			r.top = sw.top + 24;
+			r.bottom = r.top + sz.cy;
+		}
+		findreplace.SetRect(r);
+		if(!findreplace.IsOpen()) {
+			findreplace.Open();
+		}
+		SetFocus();
+	}
+	else {
+		CancelSelection();
+		CloseFindReplace();
+		notfoundfw = true;
+	}
+}
+
+RichText RichEdit::ReplaceText()
+{
+	RichText clip;
+	RichPara p;
+	formatinfo.ApplyTo(p.format);
+	p.part.Add();
+	formatinfo.ApplyTo(p[0].format);
+	p.part.Top().text = findreplace.replace.GetText();
+	clip.Cat(p);
+	return clip;
+}
+
+void RichEdit::Replace()
+{
+	NextUndo();
+	if(IsSelection() && found) {
+		FindReplaceAddHistory();
+		int c = min(cursor, anchor);
+		Remove(c, abs(cursor - anchor));
+		anchor = cursor = c;
+		Insert(cursor, ReplaceText(), false);
+		cursor += findreplace.replace.GetText().GetLength();
+		anchor = cursor;
+		Finish();
+		Find();
+	}
+}
+
+void RichEdit::OpenFindReplace()
+{
+	NextUndo();
+	if(!findreplace.IsOpen()) {
+		Size sz = findreplace.GetSize();
+		findreplace.SetRect(GetScreenView().CenterRect(sz));
+		int l, h;
+		if(GetSelection(l, h)) {
+			findreplace.amend.Hide();
+			findreplace.ok.SetLabel(t_("Replace"));
+			findreplace.Title(t_("Replace in selection"));
+			findreplace.cancel <<= findreplace.Breaker(IDCANCEL);
+			findreplace.ok <<= findreplace.Breaker(IDOK);
+			if(findreplace.Execute() == IDOK) {
+				int len = findreplace.find.GetText().GetLength();
+				int rlen = findreplace.replace.GetText().GetLength();
+				RichText rtext = ReplaceText();
+				cursor = l;
+				for(;;) {
+					int pos = FindPos();
+					if(pos < 0 || pos + len >= h)
+						break;
+					Select(pos, len);
+					Remove(pos, len);
+					Insert(pos, ReplaceText(), false);
+					cursor += pos + rlen;
+					h += rlen - len;
+				}
+				CancelSelection();
+				Move(h, false);
+			}
+			FindReplaceAddHistory();
+			findreplace.amend.Show();
+			findreplace.ok.SetLabel(t_("Find"));
+			findreplace.Title(t_("Find / Replace"));
+			findreplace.cancel <<= THISBACK(CloseFindReplace);
+			findreplace.ok <<= THISBACK(Find);
+		}
+		else {
+			findreplace.Open();
+			findreplace.find.SetFocus();
+		}
+	}
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/RichEdit/Formating.cpp b/uppsrc/RichEdit/Formating.cpp
new file mode 100644
index 000000000..fbaf3a02f
--- /dev/null
+++ b/uppsrc/RichEdit/Formating.cpp
@@ -0,0 +1,627 @@
+#include "RichEdit.h"
+
+NAMESPACE_UPP
+
+void RichEdit::ApplyFormat(dword charvalid, dword paravalid)
+{
+	if(IsReadOnly())
+		return;
+	RichText::FormatInfo f = formatinfo;
+	f.charvalid = charvalid;
+	f.paravalid = paravalid;
+	if(objectpos >= 0) {
+		ModifyFormat(objectpos, f, 1);
+		Finish();
+	}
+	if(IsSelection()) {
+		if(tablesel) {
+			NextUndo();
+			SaveTable(tablesel);
+			text.ApplyTableFormatInfo(tablesel, cells, f);
+		}
+		else {
+			int l = min(cursor, anchor);
+			int h = max(cursor, anchor);
+			RichPos rp = text.GetRichPos(h);
+			if(rp.posinpara == 0 && h > l) {
+				RichPos rp1 = text.GetRichPos(h - 1);
+				if(InSameTxt(rp, rp1))
+					h--;
+			}
+			ModifyFormat(l, f, h - l);
+		}
+		Finish();
+	}
+	else
+	if(cursorp.paralen == 0) {
+		ModifyFormat(cursor, f, 0);
+		Finish();
+	}
+	else
+	if(f.paravalid) {
+		ModifyFormat(cursor, f, 0);
+		Finish();
+	}
+	else
+		RefreshBar();
+}
+
+void RichEdit::ApplyFormatInfo(const RichText::FormatInfo& fi)
+{
+	fi.ApplyTo(formatinfo);
+	formatinfo.charvalid |= fi.charvalid;
+	formatinfo.paravalid |= fi.paravalid;
+	ApplyFormat(fi.charvalid, fi.paravalid);
+}
+
+void RichEdit::Bold()
+{
+	NextUndo();
+	formatinfo.Bold(!(formatinfo.IsBold() && (formatinfo.charvalid & RichText::BOLD)));
+	ApplyFormat(RichText::BOLD);
+}
+
+void RichEdit::Italic()
+{
+	NextUndo();
+	formatinfo.Italic(!(formatinfo.IsItalic() && (formatinfo.charvalid & RichText::ITALIC)));
+	ApplyFormat(RichText::ITALIC);
+}
+
+void RichEdit::Underline()
+{
+	NextUndo();
+	formatinfo.Underline(!(formatinfo.IsUnderline() && (formatinfo.charvalid & RichText::UNDERLINE)));
+	ApplyFormat(RichText::UNDERLINE);
+}
+
+void RichEdit::Strikeout()
+{
+	NextUndo();
+	formatinfo.Strikeout(!(formatinfo.IsStrikeout() && (formatinfo.charvalid & RichText::STRIKEOUT)));
+	ApplyFormat(RichText::STRIKEOUT);
+}
+
+void RichEdit::Capitals()
+{
+	NextUndo();
+	formatinfo.capitals = !formatinfo.capitals && (formatinfo.charvalid & RichText::CAPITALS);
+	ApplyFormat(RichText::CAPITALS);
+}
+
+void RichEdit::SetScript(int i)
+{
+	NextUndo();
+	formatinfo.sscript = i;
+	ApplyFormat(RichText::SSCRIPT);
+}
+
+void RichEdit::SetFace()
+{
+	NextUndo();
+	formatinfo.Face(~face);
+	ApplyFormat(RichText::FACE);
+	SetFocus();
+}
+
+void RichEdit::SetHeight()
+{
+	NextUndo();
+	formatinfo.Height(PtToDot(~height));
+	ApplyFormat(RichText::HEIGHT);
+	SetFocus();
+}
+
+void RichEdit::SetInk()
+{
+	NextUndo();
+	formatinfo.ink = ~ink;
+	ApplyFormat(RichText::INK);
+	SetFocus();
+}
+
+void RichEdit::SetPaper()
+{
+	NextUndo();
+	formatinfo.paper = ~paper;
+	ApplyFormat(RichText::PAPER);
+	SetFocus();
+}
+
+void RichEdit::SetLanguage()
+{
+	NextUndo();
+	formatinfo.language = (int)~language;
+	ApplyFormat(RichText::LANGUAGE);
+	SetFocus();
+}
+
+void RichEdit::Language()
+{
+	WithRichLanguageLayout<TopWindow> d;
+	CtrlLayoutOKCancel(d, t_("Language"));
+	d.lang <<= ~language;
+	if(d.Run() != IDOK)
+		return;
+	formatinfo.language = (int)~d.lang;
+	ApplyFormat(RichText::LANGUAGE);
+	SetFocus();
+	if(!language.HasKey((int)~d.lang)) {
+		Vector<int> h;
+		for(int i = 0; i < language.GetCount(); i++)
+			h.Add(language.GetKey(i));
+		h.Add(~d.lang);
+		SetupLanguage(h);
+	}
+}
+
+void RichEdit::IndentMark()
+{
+	RichRuler::Marker m;
+	int l = formatinfo.lm;
+	int r = cursorc.textpage.Width() - formatinfo.rm;
+	m.pos = l + formatinfo.indent;
+	m.minpos = max(l, 0);
+	m.maxpos = max(r - 120, 0);
+	m.top = true;
+	m.image = formatinfo.paravalid & RichText::INDENT ? RichEditImg::Indent()
+	                                                  : RichEditImg::IndentMixed();
+	ruler.Set(2, m);
+}
+
+void RichEdit::ReadFormat()
+{
+	if(objectpos >= 0)
+		formatinfo = text.GetFormatInfo(objectpos, 1);
+	else
+	if(IsSelection())
+		if(tablesel)
+			formatinfo = text.GetTableFormatInfo(tablesel, cells);
+		else
+			formatinfo = text.GetFormatInfo(min(cursor, anchor), abs(cursor - anchor));
+	else {
+		RichPos p = cursorp;
+		if(cursor && p.posinpara)
+			p = text.GetRichPos(cursor - 1);
+		formatinfo.Set(p.format);
+	}
+	ShowFormat();
+}
+
+void RichEdit::ShowFormat()
+{
+	RefreshBar();
+
+	if(formatinfo.charvalid & RichText::FACE)
+		face <<= formatinfo.GetFace();
+	else
+		face <<= Null;
+
+	if(formatinfo.charvalid & RichText::HEIGHT)
+		height <<= DotToPt(formatinfo.GetHeight());
+	else
+		height <<= Null;
+
+	if(formatinfo.charvalid & RichText::LINK)
+		hyperlink <<= formatinfo.link;
+	else
+		hyperlink <<= Null;
+
+	if(formatinfo.charvalid & RichText::INDEXENTRY)
+		indexentry <<= formatinfo.indexentry;
+	else
+		indexentry <<= Null;
+
+	if(formatinfo.charvalid & RichText::INK)
+		ink <<= formatinfo.ink;
+	else
+		ink <<= Null;
+
+	if(formatinfo.charvalid & RichText::PAPER)
+		paper <<= formatinfo.paper;
+	else
+		paper <<= Null;
+
+	if(formatinfo.charvalid & RichText::LANG)
+		language <<= (int)formatinfo.language;
+	else
+		language <<= Null;
+
+	if(IsSelection())
+		label <<= Null;
+	else
+		label <<= formatinfo.label;
+
+	int l = formatinfo.lm;
+	int r = cursorc.textpage.Width() - formatinfo.rm;
+
+	RichRuler::Marker m;
+	m.pos = l;
+	m.minpos = 0;
+	m.maxpos = max(r - formatinfo.indent - 120, 0);
+	m.image = formatinfo.paravalid & RichText::LM ? RichEditImg::Margin() : RichEditImg::MarginMixed();
+	ruler.Set(0, m);
+
+	m.pos = r;
+	m.minpos = max(l + formatinfo.indent + 120, 0);
+	m.maxpos = cursorc.textpage.Width();
+	m.image = formatinfo.paravalid & RichText::RM ? RichEditImg::Margin() : RichEditImg::MarginMixed();
+	ruler.Set(1, m);
+	IndentMark();
+
+	int maxpos = 0;
+	m.minpos = 0;
+	m.deletable = true;
+	if(formatinfo.paravalid & RichText::TABS) {
+		for(int i = 0; i < formatinfo.tab.GetCount(); i++) {
+			RichPara::Tab tab = formatinfo.tab[i];
+			m.pos = tab.pos;
+			if(tab.pos > maxpos)
+				maxpos = tab.pos;
+			switch(tab.align) {
+			case ALIGN_LEFT:
+				m.image = RichEditImg::LeftTab();
+				break;
+			case ALIGN_RIGHT:
+				m.image = RichEditImg::RightTab();
+				break;
+			case ALIGN_CENTER:
+				m.image = RichEditImg::CenterTab();
+				break;
+			}
+			ruler.Set(i + 3, m);
+		}
+		ruler.SetTabs(maxpos, formatinfo.tabsize);
+		ruler.SetCount(formatinfo.tab.GetCount() + 3);
+	}
+	else {
+		ruler.SetTabs(INT_MAX / 2, 1);
+		ruler.SetCount(3);
+	}
+
+	if(formatinfo.paravalid & RichText::STYLE)
+		style <<= formatinfo.styleid;
+	else
+		style <<= Null;
+	setstyle->Enable(!IsSelection());
+}
+
+void RichEdit::HighLightTab(int r)
+{
+	RichRuler::Marker m = ruler[r + 3];
+	RichPara::Tab tab = formatinfo.tab[r];
+	m.image = tab.align == ALIGN_RIGHT  ? RichEditImg::RightTabTrack() :
+	          tab.align == ALIGN_CENTER ? RichEditImg::CenterTabTrack() :
+	                                      RichEditImg::LeftTabTrack();
+	ruler.Set(r + 3, m);
+}
+
+void RichEdit::Hyperlink()
+{
+	String s = formatinfo.link;
+	if(!IsSelection() && !IsNull(s) && cursorp.format.link == s && text[cursor] != '\n') {
+		int l = cursor - 1;
+		while(l >= 0 && text[l] != '\n' && text.GetRichPos(l).format.link == s)
+			l--;
+		l++;
+		int h = cursor;
+		while(h < text.GetLength() && text[h] != '\n' && text.GetRichPos(h).format.link == s)
+			h++;
+		if(l < h)
+			Select(l, h - l);
+	}
+	WString linktext;
+	WhenHyperlink(s, linktext);
+	if(s != formatinfo.link || linktext.GetLength()) {
+		formatinfo.link = s;
+		hyperlink <<= s;
+		NextUndo();
+		ApplyFormat(RichText::LINK);
+		if(linktext.GetLength()) {
+			RemoveSelection();
+			RichPara p;
+			p.format = formatinfo;
+			p.Cat(linktext, formatinfo);
+			RichText txt;
+			txt.SetStyles(text.GetStyles());
+			txt.Cat(p);
+			Insert(cursor, txt, true);
+			Move(cursor + linktext.GetCount(), false);
+		}
+	}
+	SetFocus();
+}
+
+void RichEdit::Label()
+{
+	if(IsSelection()) return;
+	String s = formatinfo.label;
+	WhenLabel(s);
+	if(s != formatinfo.label) {
+		formatinfo.label = s;
+		NextUndo();
+		ApplyFormat(0, RichText::LABEL);
+		SetFocus();
+	}
+}
+
+void RichEdit::IndexEntry()
+{
+	if(EditText(formatinfo.indexentry, t_("Index Entry"), t_("Index entry"))) {
+		indexentry <<= formatinfo.indexentry;
+		ApplyFormat(RichText::INDEXENTRY);
+		NextUndo();
+		SetFocus();
+	}
+}
+
+void RichEdit::BeginRulerTrack()
+{
+	NextUndo();
+	SaveFormat();
+	int r = ruler.GetTrack();
+	if(r < 0) return;
+	RichRuler::Marker m = ruler[r];
+	switch(r) {
+	case 0:
+	case 1:
+		m.image = RichEditImg::MarginTrack();
+		break;
+	case 2:
+		m.image = RichEditImg::IndentTrack();
+		break;
+	default:
+		HighLightTab(r - 3);
+		return;
+	}
+	ruler.Set(r, m);
+}
+
+void RichEdit::SetParaFormat(dword paravalid)
+{
+	RichText::FormatInfo f = formatinfo;
+	f.charvalid = 0;
+	f.paravalid = paravalid;
+	if(IsSelection())
+		if(tablesel)
+			text.ApplyTableFormatInfo(tablesel, cells, f);
+		else
+			text.ApplyFormatInfo(min(cursor, anchor), f, abs(cursor - anchor));
+	else
+		text.ApplyFormatInfo(cursor, f, 0);
+}
+
+void RichEdit::RulerTrack()
+{
+	int r = ruler.GetTrack();
+	if(r < 0) return;
+	RichRuler::Marker m = ruler[r];
+	switch(r) {
+	case 0:
+		formatinfo.lm = m.pos;
+		SetParaFormat(RichText::LM);
+		IndentMark();
+		break;
+	case 1:
+		formatinfo.rm = cursorc.textpage.Width() - m.pos;
+		SetParaFormat(RichText::RM);
+		break;
+	case 2:
+		formatinfo.indent = m.pos - formatinfo.lm;
+		SetParaFormat(RichText::INDENT);
+		break;
+	default:
+		formatinfo.tab[r - 3].pos = m.pos;
+		SetParaFormat(RichText::TABS);
+		int maxpos = 0;
+		for(int i = 0; i < formatinfo.tab.GetCount(); i++) {
+			RichPara::Tab tab = formatinfo.tab[i];
+			if(tab.pos > maxpos)
+				maxpos = tab.pos;
+		}
+		ruler.SetTabs(maxpos, formatinfo.tabsize);
+		break;
+	}
+	FinishNF();
+}
+
+void RichEdit::TabAdd(int align)
+{
+	RichPara::Tab tab;
+	tab.pos = ruler.GetPos();
+	tab.align = align;
+	if(formatinfo.tab.GetCount() > 30000 || tab.pos < 0 || tab.pos >= cursorc.textpage.Width()) return;
+	formatinfo.tab.Add(tab);
+	SetParaFormat(RichText::TABS);
+	Finish();
+}
+
+void RichEdit::AddTab()
+{
+	NextUndo();
+	SaveFormat();
+	TabAdd(ruler.GetNewTabAlign());
+}
+
+void RichEdit::TabMenu()
+{
+	NextUndo();
+	int r = ruler.GetTrack() - 3;
+	if(r >= 0)
+		HighLightTab(r);
+	CallbackArgTarget<int> align;
+	CallbackArgTarget<int> fill;
+	MenuBar menu;
+	menu.Add(t_("Left"), RichEditImg::LeftTab(), align[ALIGN_LEFT]);
+	menu.Add(t_("Right"), RichEditImg::RightTab(), align[ALIGN_RIGHT]);
+	menu.Add(t_("Center"), RichEditImg::CenterTab(), align[ALIGN_CENTER]);
+	if(r >= 0) {
+		int f = formatinfo.tab[r].fillchar;
+		menu.Separator();
+		menu.Add(t_("No fill"), fill[0])
+		    .Radio(f == 0);
+		menu.Add(t_("Fill with ...."), fill[1])
+		    .Radio(f == 1);
+		menu.Add(t_("Fill with ----"), fill[2])
+		    .Radio(f == 2);
+		menu.Add(t_("Fill with __"), fill[3])
+		    .Radio(f == 3);
+		menu.Separator();
+		menu.Add(t_("Remove"), fill[-1]);
+	}
+	menu.Execute();
+	if(!IsNull(align)) {
+		SaveFormat();
+		if(r >= 0) {
+			formatinfo.tab[r].align = (int)align;
+			SetParaFormat(RichText::TABS);
+		}
+		else
+			TabAdd(align);
+	}
+	if(!IsNull(fill) && r >= 0) {
+		SaveFormat();
+		if(r >= 0) {
+			if(fill == -1)
+				formatinfo.tab[r].pos = Null;
+			else
+				formatinfo.tab[r].fillchar = (int)fill;
+			SetParaFormat(RichText::TABS);
+		}
+	}
+	Finish();
+}
+
+void RichEdit::AlignLeft()
+{
+	NextUndo();
+	formatinfo.align = ALIGN_LEFT;
+	ApplyFormat(0, RichText::ALIGN);
+}
+
+void RichEdit::AlignRight()
+{
+	NextUndo();
+	formatinfo.align = ALIGN_RIGHT;
+	ApplyFormat(0, RichText::ALIGN);
+}
+
+void RichEdit::AlignCenter()
+{
+	NextUndo();
+	formatinfo.align = ALIGN_CENTER;
+	ApplyFormat(0, RichText::ALIGN);
+}
+
+void RichEdit::AlignJustify()
+{
+	NextUndo();
+	formatinfo.align = ALIGN_JUSTIFY;
+	ApplyFormat(0, RichText::ALIGN);
+}
+
+void  RichEdit::SetBullet(int bullet)
+{
+	NextUndo();
+	if((formatinfo.paravalid & RichText::BULLET) && formatinfo.bullet == bullet) {
+		formatinfo.bullet = RichPara::BULLET_NONE;
+		formatinfo.indent = formatinfo.paravalid & RichText::STYLE ?
+		                       text.GetStyle(formatinfo.styleid).format.indent : 0;
+	}
+	else {
+		formatinfo.bullet = bullet;
+		formatinfo.indent = 150;
+	}
+	ApplyFormat(0, RichText::INDENT|RichText::BULLET);
+}
+
+void RichEdit::Style()
+{
+	NextUndo();
+	SaveFormat(cursor, 0);
+	formatinfo.Set(text.GetStyle((Uuid)~style).format);
+	ApplyFormat(0, RichText::STYLE);
+	SetFocus();
+	Finish();
+}
+
+void RichEdit::AdjustObjectSize()
+{
+	NextUndo();
+	RichObject obj = cursorp.object;
+	if(!obj) return;
+	WithObjectSizeLayout<TopWindow> d;
+	CtrlLayoutOKCancel(d, t_("Object position"));
+	Size sz = obj.GetSize();
+	Size psz = obj.GetPhysicalSize();
+	if(psz.cx == 0) psz.cx = 2000;
+	if(psz.cy == 0) psz.cy = 2000;
+	d.width.Set(unit, sz.cx);
+	d.height.Set(unit, sz.cy);
+	d.widthp.SetInc(5).Pattern("%.1f");
+	d.widthp <<= 100.0 * sz.cx / psz.cx;
+	d.heightp.SetInc(5).Pattern("%.1f");
+	d.heightp <<= 100.0 * sz.cy / psz.cy;
+	d.keepratio = obj.IsKeepRatio();
+	d.width <<= d.height <<= d.widthp <<= d.heightp <<= d.Breaker(IDYES);
+	d.ydelta.WithSgn().Set(unit, obj.GetYDelta());
+	d.keepratio <<= d.Breaker(IDNO);
+	for(;;) {
+		switch(d.Run()) {
+		case IDCANCEL:
+			return;
+		case IDYES:
+			if(d.width.HasFocus() && !IsNull(d.width)) {
+				d.widthp <<= 100 * (double)~d.width / psz.cx;
+				if(d.keepratio) {
+					d.height <<= psz.cy * (double)~d.width / psz.cx;
+					d.heightp <<= ~d.widthp;
+				}
+			}
+			if(d.height.HasFocus() && !IsNull(d.height)) {
+				d.heightp <<= 100 * (double)~d.height / psz.cy;
+				if(d.keepratio) {
+					d.width <<= psz.cx * (double)~d.height / psz.cy;
+					d.widthp <<= ~d.heightp;
+				}
+			}
+			if(d.widthp.HasFocus() && !IsNull(d.widthp)) {
+				d.width <<= psz.cx * (double)~d.widthp / 100;
+				if(d.keepratio) {
+					d.height <<= psz.cy * (double)~d.width / psz.cx;
+					d.heightp <<= ~d.widthp;
+				}
+			}
+			if(d.heightp.HasFocus() && !IsNull(d.heightp)) {
+				d.height <<= psz.cy * (double)~d.heightp / 100;
+				if(d.keepratio) {
+					d.width <<= psz.cx * (double)~d.height / psz.cy;
+					d.widthp <<= ~d.heightp;
+				}
+			}
+			break;
+		case IDNO:
+			if(d.keepratio && !IsNull(d.width)) {
+				d.widthp <<= 100 * (double)~d.width / psz.cx;
+				if(d.keepratio) {
+					d.height  <<= psz.cy * (double)~d.width / psz.cx;
+					d.heightp <<= ~d.widthp;
+				}
+			}
+			break;
+		case IDOK:
+			if(!IsNull(d.width) && (int)~d.width >= 0)
+				sz.cx = ~d.width;
+			if(!IsNull(d.height) && (int)~d.height >= 0)
+				sz.cy = ~d.height;
+			obj.SetSize(sz);
+			if(!IsNull(d.ydelta))
+				obj.SetYDelta(~d.ydelta);
+			obj.KeepRatio(d.keepratio);
+			ReplaceObject(obj);
+			return;
+		}
+	}
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/RichEdit/Kbd.cpp b/uppsrc/RichEdit/Kbd.cpp
new file mode 100644
index 000000000..91bf8d5ce
--- /dev/null
+++ b/uppsrc/RichEdit/Kbd.cpp
@@ -0,0 +1,169 @@
+#include "RichEdit.h"
+
+NAMESPACE_UPP
+
+bool RichEdit::Key(dword key, int count)
+{
+	useraction = true;
+	NextUndo();
+	if(CursorKey(key, count))
+		return true;
+	if(IsReadOnly())
+		return false;
+	switch(key) {
+	case K_CTRL_BACKSPACE:
+		if(RemoveSelection()) return true;
+		if(cursor > 0 && IsW(text[cursor - 1])) {
+			int c = cursor;
+			ReadFormat();
+			MoveWordLeft(false);
+			if(InvalidRange(cursor, c))
+				return true;
+			Remove(cursor, c - cursor);
+			objectpos = -1;
+			FinishNF();
+			return true;
+		}
+	case K_BACKSPACE:
+		if(RemoveSelection()) return true;
+		if(cursor <= 0 || RemoveSpecial(cursor, cursor - 1, true))
+			return true;
+		ReadFormat();
+		Remove(cursor - 1, 1);
+		cursor--;
+		anchor = cursor;
+		objectpos = -1;
+		FinishNF();
+		return true;
+	case K_DELETE:
+		if(RemoveSelection(true)) return true;
+		if(cursor < text.GetLength() && !RemoveSpecial(cursor, cursor + 1, false))
+			Remove(cursor, 1, true);
+		break;
+	case K_INSERT:
+		overwrite = !overwrite;
+		PlaceCaret();
+		break;
+	case K_CTRL_DELETE:
+		if(RemoveSelection(true)) return true;
+		if(cursor < text.GetLength()) {
+			int c = cursor;
+			if(IsW(text[c]))
+				MoveWordRight(false);
+			else
+				cursor++;
+			if(InvalidRange(cursor, c))
+				return true;
+			Remove(c, cursor - c, true);
+			cursor = anchor = c;
+			break;
+		}
+		break;
+	case K_CTRL_Z:
+		Undo();
+		return true;
+	case K_SHIFT_CTRL_Z:
+		Redo();
+		return true;
+	case K_ENTER:
+		if(!RemoveSelection() && InsertLineSpecial())
+			return true;
+		InsertLine();
+		ShowFormat();
+		FinishNF();
+		return true;
+	case K_CTRL_ENTER:
+		{
+			int c = GetCursor(), l = GetLength();
+			RichObject object;
+			while(c < l) {
+				RichPos p = text.GetRichPos(c);
+				object = p.object;
+				if(object || p.chr > ' ')
+					break;
+				c++;
+			}
+			if(object) {
+				NextUndo();
+				objectpos = c;
+				RichObject o = object;
+				o.DefaultAction();
+				if(o.GetSerialId() != object.GetSerialId())
+					ReplaceObject(o);
+				return true;
+			}
+		}
+		return false;
+	case K_F9:
+		EvaluateFields();
+		break;
+	case K_F3:
+		Find();
+		break;
+	case K_CTRL_H:
+		Hyperlink();
+		break;
+	case K_CTRL_Q:
+		IndexEntry();
+		break;
+	case K_ESCAPE:
+		CloseFindReplace();
+		return false;
+	case K_CTRL_C:
+	case K_CTRL_INSERT:
+		Copy();
+		return true;
+	case K_CTRL_X:
+	case K_SHIFT_DELETE:
+		Cut();
+		return true;
+	case K_CTRL_V:
+	case K_SHIFT_INSERT:
+		Paste();
+		return true;
+	case K_SHIFT_CTRL_SPACE:
+	case K_CTRL_SPACE:
+		key = 160;
+	case K_TAB:
+		if(cursorp.table && cursorp.posintab == cursorp.tablen) {
+			TableInsertRow();
+			return true;
+		}
+		if(cursorp.table && cursorp.posincell == cursorp.celllen) {
+			cursor = anchor = cursor + 1;
+			break;
+		}
+	default:
+		if(key == K_SHIFT_SPACE)
+			key = ' ';
+		if(key == 9 || key >= 32 && key < 65536) {
+			RichPara::Format f;
+			if(IsSelection()) {
+				f = text.GetRichPos(min(cursor, anchor)).format;
+				RemoveSelection();
+			}
+			else
+				f = formatinfo;
+			RichPara p;
+			p.format = f;
+			p.Cat(WString(key, count), f);
+			RichText txt;
+			txt.SetStyles(text.GetStyles());
+			txt.Cat(p);
+			if(overwrite) {
+				RichPos p = text.GetRichPos(cursor);
+				if(p.posinpara < p.paralen)
+					Remove(cursor, 1);
+			}
+			Insert(cursor, txt, true);
+			Move(cursor + count, false);
+			break;
+		}
+		return false;
+	}
+	objectpos = -1;
+	Finish();
+	return true;
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/RichEdit/Modify.cpp b/uppsrc/RichEdit/Modify.cpp
new file mode 100644
index 000000000..383c1137d
--- /dev/null
+++ b/uppsrc/RichEdit/Modify.cpp
@@ -0,0 +1,348 @@
+#include "RichEdit.h"
+
+NAMESPACE_UPP
+
+bool RichEdit::InvalidRange(int l, int h)
+{
+	return !InSameTxt(text.GetRichPos(min(l, h)), text.GetRichPos(max(l, h)));
+}
+
+void RichEdit::AddUndo(UndoRec *ur)
+{
+	redo.Clear();
+	SetModify();
+	modified = true;
+	incundoserial = true;
+	while(undo.GetCount() > undosteps)
+		undo.DropHead();
+	found = false;
+	ur->cursor = cursor;
+	ur->serial = undoserial;
+	undo.AddTail(ur);
+}
+
+void RichEdit::SaveStylesUndo()
+{
+	AddUndo(new UndoStyles(text));
+}
+
+void RichEdit::SaveStyleUndo(const Uuid& id)
+{
+	AddUndo(new UndoStyle(text, id));
+}
+
+void RichEdit::SaveFormat(int pos, int count)
+{
+	Limit(pos, count);
+	AddUndo(new UndoFormat(text, pos, count));
+}
+
+void RichEdit::SaveFormat()
+{
+	int pos, count;
+	if(IsSelection()) {
+		if(tablesel) {
+			SaveTable(tablesel);
+			return;
+		}
+		pos = min(cursor, anchor);
+		count = abs(cursor - anchor);
+	}
+	else {
+		pos = cursor;
+		count = 0;
+	}
+	SaveFormat(pos, count);
+}
+
+void RichEdit::Limit(int& pos, int& count)
+{
+	int h = pos + count;
+	pos = min(GetLength(), pos);
+	count = min(GetLength(), h) - pos;
+}
+
+void RichEdit::ModifyFormat(int pos, const RichText::FormatInfo& fi, int count)
+{
+	if(IsReadOnly())
+		return;
+	Limit(pos, count);
+	SaveFormat(pos, count);
+	text.ApplyFormatInfo(pos, fi, count);
+}
+
+void RichEdit::Remove(int pos, int len, bool joinnext)
+{
+	if(IsReadOnly())
+		return;
+	Limit(pos, len);
+	if(InvalidRange(pos, pos + len))
+		return;
+	AddUndo(new UndoRemove(text, pos, len));
+	RichText::FormatInfo fmt;
+	RichPara::Format f = text.GetRichPos(pos).format;
+	if(joinnext)
+		fmt.Set(f);
+	text.Remove(pos, len);
+	if(!joinnext)
+		fmt.Set(text.GetRichPos(pos).format);
+	fmt.newpage = f.newpage;
+	ModifyFormat(pos, fmt, 0);
+	SetModify();
+	modified = true;
+}
+
+void RichEdit::Insert(int pos, const RichText& txt, bool typing)
+{
+	if(IsReadOnly())
+		return;
+	Index<int> lng;
+	for(int i = 0; i < language.GetCount(); i++)
+		lng.Add(language.GetKey(i));
+	Vector<int> lngn = txt.GetAllLanguages();
+	for(int i = 0; i < lngn.GetCount(); i++)
+		lng.FindAdd(lngn[i]);
+	SetupLanguage(lng.PickKeys());
+	int l = text.GetLength();
+	text.Insert(pos, txt);
+	l = text.GetLength() - l;
+	SetModify();
+	modified = true;
+	if(undo.GetCount()) {
+		UndoRec& u = undo.Tail();
+		if(typing) {
+			UndoInsert *ui = dynamic_cast<UndoInsert *>(&u);
+			if(ui && ui->length > 0 && ui->typing && ui->pos + ui->length == pos) {
+				ui->length += l;
+				return;
+			}
+		}
+	}
+	AddUndo(new UndoInsert(pos, l, typing));
+}
+
+void RichEdit::Undo()
+{
+	if(IsReadOnly())
+		return;
+	if(undo.IsEmpty()) return;
+	CancelSelection();
+	int serial = undo.Tail().serial;
+	int c = cursor;
+	while(undo.GetCount()) {
+		UndoRec& u = undo.Tail();
+		if(u.serial != serial) break;
+		UndoRec *r = u.GetRedo(text);
+		r->serial = u.serial;
+		r->cursor = cursor;
+		redo.Add(r);
+		u.Apply(text);
+		c = u.cursor;
+		undo.DropTail();
+	}
+	ReadStyles();
+	Move(c);
+}
+
+void RichEdit::Redo()
+{
+	if(IsReadOnly())
+		return;
+	if(redo.IsEmpty()) return;
+	NextUndo();
+	CancelSelection();
+	int serial = redo.Top().serial;
+	int c = cursor;
+	while(redo.GetCount()) {
+		UndoRec& r = redo.Top();
+		if(r.serial != serial) break;
+		UndoRec *u = r.GetRedo(text);
+		u->serial = r.serial;
+		u->cursor = cursor;
+		undo.AddTail(u);
+		r.Apply(text);
+		c = r.cursor;
+		redo.Drop();
+	}
+	ReadStyles();
+	Move(c);
+}
+
+#ifdef PLATFORM_WIN32
+#define RTFS "Rich Text Format"
+#else
+#define RTFS "text/richtext"
+#endif
+
+RichText RichEdit::GetSelection(int maxcount) const
+{
+	RichText clip;
+	if(tablesel) {
+		RichTable tab = text.CopyTable(tablesel, cells);
+		clip.SetStyles(text.GetStyles());
+		clip.CatPick(tab);
+	}
+	else
+		clip = text.Copy(min(cursor, anchor), min(maxcount, abs(cursor - anchor)));
+	return clip;
+}
+
+void RichEdit::Cut()
+{
+	if(IsReadOnly())
+		return;
+	Copy();
+	if(IsSelection())
+		RemoveSelection();
+	else
+	if(objectpos >= 0) {
+		Remove(cursor, 1);
+		Move(cursor, false);
+	}
+}
+
+void RichEdit::PasteText(const RichText& text)
+{
+	SetModify();
+	modified = true;
+	RemoveSelection();
+	Insert(cursor, text, false);
+	ReadStyles();
+	Move(cursor + text.GetLength(), false);
+}
+
+struct ToParaIterator : RichText::Iterator {
+	RichPara para;
+	bool     space;
+
+	virtual bool operator()(int pos, const RichPara& p) {
+		for(int i = 0; i < p.GetCount(); i++) {
+			const RichPara::Part& part = p[i];
+			if(part.IsText()) {
+				const wchar *s = part.text;
+				while(*s) {
+					while(*s && *s <= ' ') {
+						space = true;
+						s++;
+					}
+					const wchar *t = s;
+					while(*s > ' ') s++;
+					if(s > t) {
+						if(space)
+							para.Cat(" ", part.format);
+						para.Cat(WString(t, s), part.format);
+						space = false;
+					}
+				}
+			}
+		}
+		space = true;
+		return false;
+	}
+
+	ToParaIterator() { space = false; }
+};
+
+void RichEdit::ToPara()
+{
+	if(IsReadOnly())
+		return;
+	if(!IsSelection() || tablesel)
+		return;
+	NextUndo();
+	RichText txt = text.Copy(min(cursor, anchor), abs(cursor - anchor));
+	ToParaIterator it;
+	txt.Iterate(it);
+	RichText h;
+	h.SetStyles(txt.GetStyles());
+	h.Cat(it.para);
+	PasteText(h);
+}
+
+void RichEdit::RemoveText(int count)
+{
+	CancelSelection();
+	Remove(cursor, count);
+	Finish();
+}
+
+RichText RichEdit::CopyText(int pos, int count) const
+{
+	return text.Copy(pos, count);
+}
+
+void RichEdit::InsertObject(int type)
+{
+	RichObjectType& richtype = RichObject::GetType(type);
+	RichObject object = RichObject(&richtype, Value());
+	RichObject o = object;
+	o.DefaultAction();
+	if(o.GetSerialId() != object.GetSerialId()) {
+		RichText::FormatInfo finfo = GetFormatInfo();
+		RemoveSelection();
+		RichPara p;
+		p.Cat(o, finfo);
+		RichText clip;
+		clip.Cat(p);
+		Insert(GetCursor(), clip, false);
+		Finish();
+	}
+}
+
+void RichEdit::ReplaceObject(const RichObject& obj)
+{
+	Remove(objectpos, 1);
+	RichPara p;
+	p.Cat(obj, formatinfo);
+	RichText clip;
+	clip.Cat(p);
+	Insert(objectpos, clip, false);
+	Finish();
+	objectrect = GetObjectRect(objectpos);
+}
+
+RichObject RichEdit::GetObject() const
+{
+	return text.GetRichPos(objectpos).object;
+}
+
+void RichEdit::Select(int pos, int count)
+{
+	found = false;
+	Move(pos);
+	Move(pos + count, true);
+}
+
+void RichEdit::InsertLine()
+{
+	if(IsReadOnly())
+		return;
+	RichText::FormatInfo b = formatinfo;
+	RichText h;
+	h.SetStyles(text.GetStyles());
+	RichPara p;
+	p.format = formatinfo;
+	h.Cat(p);
+	h.Cat(p);
+	bool st = cursorp.paralen == cursorp.posinpara;
+	bool f = cursorp.posinpara == 0 && formatinfo.label.GetCount();
+	Insert(cursor, h, false);
+	if(f) {
+		String lbl = formatinfo.label;
+		formatinfo.label.Clear();
+		ApplyFormat(0, RichText::LABEL);
+		formatinfo.label = lbl;
+	}
+	anchor = cursor = cursor + 1;
+	formatinfo.newpage = false;
+	if(st) {
+		formatinfo.label.Clear();
+		formatinfo.styleid = text.GetStyle(b.styleid).next;
+		ApplyFormat(0, RichText::STYLE|RichText::NEWPAGE|RichText::LABEL);
+		return;
+	}
+	ApplyFormat(0, RichText::NEWPAGE|RichText::LABEL);
+	objectpos = -1;
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/RichEdit/Mouse.cpp b/uppsrc/RichEdit/Mouse.cpp
new file mode 100644
index 000000000..f613f7ca6
--- /dev/null
+++ b/uppsrc/RichEdit/Mouse.cpp
@@ -0,0 +1,371 @@
+#include "RichEdit.h"
+
+NAMESPACE_UPP
+
+void RichEdit::CancelMode()
+{
+	tabmove.table = 0;
+	selclick = false;
+	dropcaret.Clear();
+}
+
+void RichEdit::MouseWheel(Point p, int zdelta, dword keyflags)
+{
+	sb.Wheel(zdelta);
+}
+
+RichHotPos RichEdit::GetHotPos(Point p)
+{
+	int x;
+	PageY py;
+	GetPagePoint(p, py, x);
+	return text.GetHotPos(x, py, 4 / GetZoom(), pagesz);
+}
+
+void RichEdit::SetObjectPercent(int p)
+{
+	if(objectpos >= 0) {
+		RichObject obj = GetObject();
+		obj.SetSize(obj.GetPhysicalSize() * p / 100);
+		obj.KeepRatio(true);
+		ReplaceObject(obj);
+	}
+}
+
+void RichEdit::SetObjectYDelta(int pt)
+{
+	if(objectpos >= 0) {
+		RichObject obj = GetObject();
+		obj.SetYDelta(pt * 25 / 3);
+		ReplaceObject(obj);
+	}
+}
+
+void RichEdit::SetObjectPos(int pos)
+{
+	Rect r = GetObjectRect(cursor);
+	Rect rr = r.Offseted(16, -sb);
+	objectrect = GetObjectRect(pos);
+	objectpos = cursor;
+	PageRect pr = text.GetCaret(cursor, pagesz);
+	PlaceCaret();
+	Refresh(rr);
+	ReadFormat();
+}
+
+void RichEdit::LeftDown(Point p, dword flags)
+{
+	useraction = true;
+	NextUndo();
+	SetFocus();
+	selclick = false;
+	tabmove = GetHotPos(p);
+	if(tabmove.table && tabmove.column >= -2) {
+		SaveTableFormat(tabmove.table);
+		SetCapture();
+		Move(text.GetCellPos(tabmove.table, 0, max(tabmove.column, 0)).pos);
+		return;
+	}
+	int c = GetHotSpot(p);
+	if(c >= 0 && objectpos >= 0) {
+		int pos = objectpos;
+		RectTracker tracker(*this);
+		RichObject obj = text.GetRichPos(pos).object;
+		tracker.MinSize(Size(16, 16))
+		       .MaxSize(GetZoom() * pagesz)
+		       .Animation()
+		       .Dashed()
+		       .KeepRatio(obj.IsKeepRatio());
+		int tx, ty;
+		switch(c) {
+		case 1:
+			tracker.SetCursorImage(Image::SizeHorz());
+			tx = ALIGN_CENTER; ty = ALIGN_BOTTOM;
+			break;
+		case 2:
+			tracker.SetCursorImage(Image::SizeHorz());
+			tx = ALIGN_RIGHT; ty = ALIGN_CENTER;
+			break;
+		default:
+			tracker.SetCursorImage(Image::SizeBottomRight());
+			tx = ALIGN_RIGHT; ty = ALIGN_RIGHT;
+			break;
+		}
+		double zoom = GetZoom().AsDouble();
+		Size sz = obj.GetSize();
+		sz.cx = int(zoom * sz.cx + 0.5);
+		sz.cy = int(zoom * sz.cy + 0.5);
+		sz = tracker.Track(Rect(objectrect.Offseted(16, -sb).TopLeft(), sz), tx, ty).Size();
+		sz.cx = int(sz.cx / zoom + 0.5);
+		sz.cy = int(sz.cy / zoom + 0.5);
+		obj.SetSize(sz);
+		ReplaceObject(obj);
+	}
+	else {
+		c = GetMousePos(p);
+		if(c >= 0) {
+			if(InSelection(c)) {
+				selclick = true;
+				return;
+			}
+			Move(c, flags & K_SHIFT);
+			mpos = c;
+			SetCapture();
+			if(cursorp.object && GetObjectRect(cursor).Offseted(16, -sb).Contains(p))
+				SetObjectPos(cursor);
+		}
+	}
+}
+
+void RichEdit::LeftUp(Point p, dword flags)
+{
+	useraction = true;
+	NextUndo();
+	int c = GetMousePos(p);
+	int d = c;
+	if(!HasCapture() && InSelection(d) && selclick) {
+		CancelSelection();
+		Move(c);
+	}
+	selclick = false;
+}
+
+void RichEdit::MouseMove(Point p, dword flags)
+{
+	useraction = true;
+	if(HasCapture() && (flags & K_MOUSELEFT)) {
+		if(tabmove.table && tabmove.column >= 0) {
+			RichTable::Format fmt = text.GetTableFormat(tabmove.table);
+			if(tabmove.column >= fmt.column.GetCount() - 1)
+				return;
+			int sum = Sum0(fmt.column);
+			int nl = 0;
+			for(int i = 0; i < tabmove.column; i++)
+				nl += fmt.column[i];
+			int xn = fmt.column[tabmove.column] + fmt.column[tabmove.column + 1];
+			int xl = tabmove.left + tabmove.cx * nl / sum + 120;
+			int xh = tabmove.left + tabmove.cx * (nl + xn) / sum - 120;
+			if(xl >= xh)
+				return;
+			int xx = minmax(GetSnapX(p.x) - tabmove.delta, xl, xh) - tabmove.left;
+			fmt.column[tabmove.column] = xx * sum / tabmove.cx - nl;
+			fmt.column[tabmove.column + 1] = xn - fmt.column[tabmove.column];
+			text.SetTableFormat(tabmove.table, fmt);
+			Finish();
+		}
+		else
+		if(tabmove.table && tabmove.column == -1) {
+			RichTable::Format fmt = text.GetTableFormat(tabmove.table);
+			fmt.lm = minmax(GetSnapX(p.x) - tabmove.textleft, 0, max(tabmove.textcx - fmt.rm - 120, 0));
+			text.SetTableFormat(tabmove.table, fmt);
+			Finish();
+		}
+		else
+		if(tabmove.table && tabmove.column == -2) {
+			RichTable::Format fmt = text.GetTableFormat(tabmove.table);
+			fmt.rm = minmax(tabmove.textcx - GetSnapX(p.x) + tabmove.textleft, 0, tabmove.textcx - fmt.lm - 120);
+			text.SetTableFormat(tabmove.table, fmt);
+			Finish();
+		}
+		else {
+			PageY py = GetPageY(p.y + sb);
+			int c;
+			if(py > text.GetHeight(pagesz))
+				c = GetLength() + 1;
+			else
+				c = GetNearestPos((p.x - 16) / GetZoom(), py);
+			if(c != mpos) {
+				mpos = -1;
+				Move(c, true);
+			}
+		}
+	}
+}
+
+void RichEdit::RightDown(Point p, dword flags)
+{
+	useraction = true;
+	NextUndo();
+	MenuBar menu;
+	int l, h;
+	Rect ocr = GetCaretRect();
+	int c = GetMousePos(p);
+	int fieldpos = -1;
+	Id field;
+	String fieldparam;
+	String ofieldparam;
+	RichObject object, o;
+	if(GetSelection(l, h)) {
+		if(c >= l && c < h) {
+			CopyTool(menu);
+			CutTool(menu);
+		}
+		PasteTool(menu);
+	}
+	else {
+		LeftDown(p, flags);
+		if(objectpos >= 0) {
+			object = GetObject();
+			if(!object) return;
+			o = object;
+			o.Menu(menu);
+			if(!menu.IsEmpty())
+				menu.Separator();
+			menu.Add(t_("Object position.."), THISBACK(AdjustObjectSize));
+			menu.Separator();
+			menu.Add("20 %", THISBACK1(SetObjectPercent, 20));
+			menu.Add("40 %", THISBACK1(SetObjectPercent, 40));
+			menu.Add("60 %", THISBACK1(SetObjectPercent, 60));
+			menu.Add("80 %", THISBACK1(SetObjectPercent, 80));
+			menu.Add("90 %", THISBACK1(SetObjectPercent, 90));
+			menu.Add("100 %", THISBACK1(SetObjectPercent, 100));
+			menu.Break();
+			menu.Add(t_("3 pt up"), THISBACK1(SetObjectYDelta, -3));
+			menu.Add(t_("2 pt up"), THISBACK1(SetObjectYDelta, -2));
+			menu.Add(t_("1 pt up"), THISBACK1(SetObjectYDelta, -1));
+			menu.Add(t_("Baseline"), THISBACK1(SetObjectYDelta, 0));
+			menu.Add(t_("1 pt down"), THISBACK1(SetObjectYDelta, 1));
+			menu.Add(t_("2 pt down"), THISBACK1(SetObjectYDelta, 2));
+			menu.Add(t_("3 pt down"), THISBACK1(SetObjectYDelta, 3));
+			menu.Separator();
+			CopyTool(menu);
+			CutTool(menu);
+		}
+		else {
+			RichPos p = cursorp;
+			field = p.field;
+			fieldparam = p.fieldparam;
+			RichPara::FieldType *ft = RichPara::fieldtype().Get(field, NULL);
+			if(ft) {
+				ofieldparam = fieldparam;
+				fieldpos = cursor;
+				ft->Menu(menu, &fieldparam);
+				if(!menu.IsEmpty())
+					menu.Separator();
+				CopyTool(menu);
+				CutTool(menu);
+			}
+			else {
+				WString w = GetWordAtCursor();
+				if(!w.IsEmpty() && !SpellWord(w, w.GetLength(),
+				                              fixedlang ? fixedlang : formatinfo.language)) {
+					menu.Add(t_("Add to user dictionary"), THISBACK(AddUserDict));
+					menu.Separator();
+				}
+				PasteTool(menu);
+				ObjectTool(menu);
+			}
+		}
+	}
+	Rect r = GetCaretRect();
+	Refresh(r);
+	Refresh(ocr);
+	paintcarect = true;
+	menu.Execute();
+	paintcarect = false;
+	Refresh(r);
+	if(object && o && o.GetSerialId() != object.GetSerialId())
+		ReplaceObject(o);
+	if(fieldpos >= 0 && fieldparam != ofieldparam) {
+		RichText::FormatInfo f = text.GetFormatInfo(fieldpos, 1);
+		Remove(fieldpos, 1);
+		RichPara p;
+		p.Cat(field, fieldparam, f);
+		RichText clip;
+		clip.Cat(p);
+		Insert(fieldpos, clip, false);
+		Finish();
+	}
+}
+
+void RichEdit::LeftDouble(Point p, dword flags)
+{
+	NextUndo();
+	int c = GetMousePos(p);
+	if(c >= 0) {
+		if(objectpos == c) {
+			RichObject object = GetObject();
+			if(!object) return;
+			RichObject o = object;
+			o.DefaultAction();
+			if(object.GetSerialId() != o.GetSerialId())
+				ReplaceObject(o);
+		}
+		else {
+			RichPos rp = cursorp;
+			RichPara::FieldType *ft = RichPara::fieldtype().Get(rp.field, NULL);
+			if(ft) {
+				int fieldpos = cursor;
+				ft->DefaultAction(&rp.fieldparam);
+				RichText::FormatInfo f = text.GetFormatInfo(fieldpos, 1);
+				Remove(fieldpos, 1);
+				RichPara p;
+				p.Cat(rp.field, rp.fieldparam, f);
+				RichText clip;
+				clip.Cat(p);
+				Insert(fieldpos, clip, false);
+				Finish();
+			}
+			else {
+				int l, h;
+				if(GetWordSelection(c, l, h))
+					SetSelection(l, h);
+			}
+		}
+	}
+}
+
+void RichEdit::LeftTriple(Point p, dword flags)
+{
+	NextUndo();
+	int c = GetMousePos(p);
+	if(c >= 0 && c != objectpos) {
+		RichPos rp = text.GetRichPos(c);
+		Select(c - rp.posinpara, rp.paralen + 1);
+	}
+}
+
+Image RichEdit::CursorImage(Point p, dword flags)
+{
+	if(tablesel)
+		return Image::Arrow();
+
+	switch(GetHotSpot(p)) {
+	case 0:
+		return Image::SizeBottomRight();
+	case 1:
+		return Image::SizeVert();
+	case 2:
+		return Image::SizeHorz();
+	default:
+		if(text.GetRichPos(GetMousePos(p)).object) {
+			return Image::Arrow();
+		}
+		else
+		if(HasCapture() && tabmove.table && tabmove.column >= -2)
+			return Image::SizeHorz();
+		else {
+			RichHotPos hp = GetHotPos(p);
+			if(hp.table > 0)
+				return Image::SizeHorz();
+			else {
+				int c = GetMousePos(p);
+				return InSelection(c) && !HasCapture() ? Image::Arrow() : CtrlImg::ibeam0;
+			}
+		}
+	}
+	return Image::Arrow();
+}
+
+void RichEdit::LeftRepeat(Point p, dword flags)
+{
+	NextUndo();
+	if(HasCapture() && (flags & K_MOUSELEFT)) {
+		if(p.y < 0)
+			MoveUpDown(-1, true);
+		if(p.y > GetSize().cy)
+			MoveUpDown(1, true);
+	}
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/RichEdit/ParaFormat.cpp b/uppsrc/RichEdit/ParaFormat.cpp
new file mode 100644
index 000000000..2dd0b2aa5
--- /dev/null
+++ b/uppsrc/RichEdit/ParaFormat.cpp
@@ -0,0 +1,596 @@
+#include "RichEdit.h"
+
+NAMESPACE_UPP
+
+struct ParaFormating : public WithParaLayout<StaticRect>
+{
+	DropList n[8];
+	UnitEdit tabpos;
+	DropList tabtype;
+	DropList tabfill;
+	bool     keepindent;
+	Font     font;
+	bool     modified;
+
+	void                   EnableNumbering();
+	RichPara::NumberFormat GetNumbering();
+	bool                   IsNumbering();
+	void                   SetupIndent();
+	int                    ComputeIndent();
+	void                   SetMod()                  { modified = true; }
+	bool                   IsChanged()               { return IsModified() || modified; }
+
+	void  Set(int unit, const RichText::FormatInfo& formatinfo);
+	dword Get(RichText::FormatInfo& formatinfo);
+
+	typedef ParaFormating CLASSNAME;
+
+	ParaFormating();
+};
+
+RichPara::NumberFormat ParaFormating::GetNumbering()
+{
+	RichPara::NumberFormat f;
+	f.before_number = before_number;
+	f.after_number = after_number;
+	f.reset_number = reset_number;
+	for(int i = 0; i < 8; i++)
+		f.number[i] = Nvl((int)~n[i]);
+	return f;
+}
+
+bool ParaFormating::IsNumbering()
+{
+	if(!IsNull(before_number) || !IsNull(after_number) || reset_number)
+		return true;
+	for(int i = 0; i < 8; i++)
+		if(!IsNull(n[i]))
+		   return true;
+	return false;
+}
+
+void ParaFormating::EnableNumbering()
+{
+	bool b = !IsNull(bullet) && !(int)~bullet;
+	before_number.Enable(b);
+	after_number.Enable(b);
+	for(int i = 0; i < 8; i++)
+		n[i].Enable(b);
+}
+
+int  ParaFormating::ComputeIndent()
+{
+	if(!IsNull(bullet) && (int)~bullet)
+		return 150;
+	if(IsNumbering()) {
+		RichPara::NumberFormat f = GetNumbering();
+		RichPara::Number n;
+		static byte n0[] = { 0, 37, 38, 48, 48, 37, 37 };
+		static byte n1[] = { 0, 17, 18, 12, 12, 17, 17 };
+		if(f.number[0] && f.number[0] < 8)
+			n.n[0] = n0[f.number[0]];
+		if(f.number[1] && f.number[1] < 8)
+			n.n[1] = n1[f.number[1]];
+		for(int i = 2; i < 8; i++) {
+			static byte nn[] = { 0,  7,  8,  1,  1,  7,  7 };
+			if(f.number[i] && f.number[i] < 8)
+				n.n[i] = nn[f.number[i]];
+		}
+		String s = n.AsText(f);
+		s.Cat(' ');
+		return GetTextSize(s, font).cx;
+	}
+	return 0;
+}
+
+void ParaFormating::SetupIndent()
+{
+	EnableNumbering();
+	if(indent.IsModified() || keepindent) return;
+	indent <<= ComputeIndent();
+	indent.ClearModify();
+}
+
+void ParaFormating::Set(int unit, const RichText::FormatInfo& formatinfo)
+{
+	font = formatinfo;
+	before.Set(unit, RichText::BEFORE & formatinfo.paravalid ? formatinfo.before : Null);
+	lm.Set(unit, RichText::LM & formatinfo.paravalid ? formatinfo.lm : Null);
+	indent.Set(unit, RichText::INDENT & formatinfo.paravalid ? formatinfo.indent : Null);
+	rm.Set(unit, RichText::RM & formatinfo.paravalid ? formatinfo.rm : Null);
+	after.Set(unit, RichText::AFTER & formatinfo.paravalid ? formatinfo.after : Null);
+	if(RichText::ALIGN & formatinfo.paravalid)
+		align <<= formatinfo.align == ALIGN_LEFT    ? 0 :
+		          formatinfo.align == ALIGN_CENTER  ? 1 :
+		          formatinfo.align == ALIGN_RIGHT   ? 2 :
+		                                            3;
+	if(RichText::NEWPAGE & formatinfo.paravalid)
+		page = formatinfo.newpage;
+	else {
+		page = Null;
+		page.ThreeState();
+	}
+	if(RichText::KEEP & formatinfo.paravalid)
+		keep = formatinfo.keep;
+	else {
+		keep = Null;
+		keep.ThreeState();
+	}
+	if(RichText::KEEPNEXT & formatinfo.paravalid)
+		keepnext = formatinfo.keepnext;
+	else {
+		keepnext = Null;
+		keepnext.ThreeState();
+	}
+	if(RichText::ORPHAN & formatinfo.paravalid)
+		orphan = formatinfo.orphan;
+	else {
+		orphan = Null;
+		orphan.ThreeState();
+	}
+	tabpos.SetUnit(unit);
+	if(RichText::BULLET & formatinfo.paravalid)
+		bullet <<= formatinfo.bullet;
+	else
+		bullet <<= Null;
+	if(RichText::SPACING & formatinfo.paravalid)
+		linespacing <<= formatinfo.linespacing;
+	else
+		linespacing <<= Null;
+	if(RichText::NUMBERING & formatinfo.paravalid) {
+		before_number = formatinfo.before_number.ToWString();
+		after_number = formatinfo.after_number.ToWString();
+		reset_number = formatinfo.reset_number;
+		for(int i = 0; i < 8; i++)
+			n[i] = formatinfo.number[i];
+	}
+	else {
+		before_number <<= Null;
+		after_number <<= Null;
+		reset_number <<= Null;
+		reset_number.ThreeState();
+		for(int i = 0; i < 8; i++)
+			n[i] = Null;
+	}
+	tabs.Clear();
+	if(RichText::TABS & formatinfo.paravalid)
+		for(int i = 0; i < formatinfo.tab.GetCount(); i++)
+			tabs.Add(formatinfo.tab[i].pos, formatinfo.tab[i].align, formatinfo.tab[i].fillchar);
+	tabsize.Set(unit, RichText::TABSIZE & formatinfo.paravalid ? formatinfo.tabsize : Null);
+	keepindent = formatinfo.indent != ComputeIndent();
+	SetupIndent();
+	ClearModify();
+	modified = false;
+}
+
+dword ParaFormating::Get(RichText::FormatInfo& formatinfo)
+{
+	dword v = 0;
+	if(!IsNull(before)) {
+		formatinfo.before = ~before;
+		v |= RichText::BEFORE;
+	}
+	if(!IsNull(lm)) {
+		formatinfo.lm = ~lm;
+		v |= RichText::LM;
+	}
+	if(!IsNull(indent)) {
+		formatinfo.indent = ~indent;
+		v |= RichText::INDENT;
+	}
+	if(!IsNull(rm)) {
+		formatinfo.rm = ~rm;
+		v |= RichText::RM;
+	}
+	if(!IsNull(after)) {
+		formatinfo.after = ~after;
+		v |= RichText::AFTER;
+	}
+	if(!IsNull(align)) {
+		static int sw[] = { ALIGN_LEFT, ALIGN_CENTER, ALIGN_RIGHT, ALIGN_JUSTIFY };
+		formatinfo.align = sw[(int)~align];
+		v |= RichText::ALIGN;
+	}
+	if(!IsNull(page)) {
+		formatinfo.newpage = page;
+		v |= RichText::NEWPAGE;
+	}
+	if(!IsNull(keep)) {
+		formatinfo.keep = keep;
+		v |= RichText::KEEP;
+	}
+	if(!IsNull(keepnext)) {
+		formatinfo.keepnext = keepnext;
+		v |= RichText::KEEPNEXT;
+	}
+	if(!IsNull(orphan)) {
+		formatinfo.orphan = orphan;
+		v |= RichText::ORPHAN;
+	}
+	if(!IsNull(bullet)) {
+		formatinfo.bullet = ~bullet;
+		v |= RichText::BULLET;
+	}
+	if(!IsNull(linespacing)) {
+		formatinfo.linespacing = ~linespacing;
+		v |= RichText::SPACING;
+	}
+	if(IsNumbering()) {
+		(RichPara::NumberFormat&)formatinfo = GetNumbering();
+		v |= RichText::NUMBERING;
+	}
+	if((RichText::TABS & formatinfo.paravalid) || tabs.GetCount()) {
+		formatinfo.tab.Clear();
+		for(int i = 0; i < tabs.GetCount(); i++) {
+			RichPara::Tab tab;
+			tab.pos = tabs.Get(i, 0);
+			tab.align = (int)tabs.Get(i, 1);
+			tab.fillchar = (int)tabs.Get(i, 2);
+			formatinfo.tab.Add(tab);
+		}
+		v |= RichText::TABS;
+	}
+	if(!IsNull(tabsize)) {
+		formatinfo.tabsize = ~tabsize;
+		v |= RichText::TABSIZE;
+	}
+	return v;
+}
+
+ParaFormating::ParaFormating()
+{
+	CtrlLayout(*this);
+	tabtype.Add(ALIGN_LEFT, t_("Left"));
+	tabtype.Add(ALIGN_RIGHT, t_("Right"));
+	tabtype.Add(ALIGN_CENTER, t_("Centered"));
+	tabfill.Add(0, t_("None"));
+	tabfill.Add(1, t_("...."));
+	tabfill.Add(2, t_("----"));
+	tabfill.Add(3, t_("__"));
+	tabs.AddColumn(t_("Tab position"), 2).Edit(tabpos).SetConvert(tabpos);
+	tabs.AddColumn(t_("Type"), 2).Edit(tabtype).SetConvert(tabtype).InsertValue(ALIGN_LEFT);
+	tabs.AddColumn(t_("Fill"), 1).Edit(tabfill).SetConvert(tabfill).InsertValue(0);
+	tabs.ColumnWidths("103 89 78");
+	tabs.Appending().Removing().NoAskRemove();
+	tabs.WhenAcceptEdit = tabs.WhenArrayAction = THISBACK(SetMod);
+	linespacing.Add(0, "1.0");
+	linespacing.Add(-1, "1.5");
+	linespacing.Add(-2, "2.0");
+	bullet.Add(RichPara::BULLET_NONE, RichEditImg::NoneBullet());
+	bullet.Add(RichPara::BULLET_ROUND, RichEditImg::RoundBullet());
+	bullet.Add(RichPara::BULLET_ROUNDWHITE, RichEditImg::RoundWhiteBullet());
+	bullet.Add(RichPara::BULLET_BOX, RichEditImg::BoxBullet());
+	bullet.Add(RichPara::BULLET_BOXWHITE, RichEditImg::BoxWhiteBullet());
+	bullet.Add(RichPara::BULLET_TEXT, RichEditImg::TextBullet());
+	bullet.SetDisplay(CenteredHighlightImageDisplay());
+	bullet.SetLineCy(18);
+	for(int i = 0; i < 8; i++) {
+		DropList& list = n[i];
+		list.Add(Null);
+		list.Add(RichPara::NUMBER_NONE, " - ");
+		list.Add(RichPara::NUMBER_1, "1, 2, 3");
+		list.Add(RichPara::NUMBER_0, "0, 1, 2");
+		list.Add(RichPara::NUMBER_a, "a, b, c");
+		list.Add(RichPara::NUMBER_A, "A, B, C");
+		list.Add(RichPara::NUMBER_i, "i, ii, iii");
+		list.Add(RichPara::NUMBER_I, "I, II, III");
+		list <<= THISBACK(SetupIndent);
+	}
+	before_number <<=
+	after_number <<=
+	reset_number <<=
+	bullet <<= THISBACK(SetupIndent);
+	EnableNumbering();
+}
+
+struct ParaFormatDlg : public WithParaFormatLayout<TopWindow> {
+	ParaFormating para;
+
+	ParaFormatDlg() {
+		CtrlLayoutOKCancel(*this, t_("Paragraph format"));
+		ActiveFocus(para.before);
+	}
+};
+
+void RichEdit::ParaFormat()
+{
+	ParaFormatDlg d;
+	d.para.Set(unit, formatinfo);
+	d.para.font = formatinfo;
+	if(d.Execute() != IDOK || !d.para.IsChanged()) return;
+	dword v = d.para.Get(formatinfo);
+	if(v) ApplyFormat(0, v);
+}
+
+static int sCompareStyle(const Value& a, const Value& b)
+{
+	return CompareNoCase(String(a), String(b));
+}
+
+struct sCompareLess {
+	bool operator()(const Value& a, const Value& b) const { return sCompareStyle(a, b) < 0; }
+};
+
+void RichEdit::ReadStyles()
+{
+	int i;
+	style.Clear();
+	Vector<Uuid> id;
+	Vector<String> name;
+	for(i = 0; i < text.GetStyleCount(); i++) {
+		id.Add(text.GetStyleId(i));
+		name.Add(text.GetStyle(i).name);
+	}
+	IndexSort(name, id, sCompareLess());
+	for(i = 0; i < id.GetCount(); i++)
+		style.Add(id[i], name[i]);
+}
+
+struct DisplayDefault : public Display {
+	virtual void Paint(Draw& w, const Rect& r, const Value& q,
+	                   Color ink, Color paper, dword style) const {
+		String text = q;
+		w.DrawRect(r, paper);
+		DrawSmartText(w, r.left, r.top, r.Width(), text, StdFont().Bold(), ink);
+	}
+};
+
+void RichEdit::SetStyle()
+{
+	if(!IsSelection()) {
+		NextUndo();
+		WithSetStyleLayout<TopWindow> d;
+		CtrlLayoutOKCancel(d, t_("Set style"));
+		d.newstyle <<= d.Breaker(IDYES);
+		d.style.AddKey();
+		d.style.AddColumn();
+		d.style.NoHeader().NoGrid();
+		for(int i = 0; i < text.GetStyleCount(); i++)
+			d.style.Add(text.GetStyleId(i), text.GetStyle(i).name);
+		d.style.Sort(1, sCompareStyle);
+		int q = d.style.Find(RichStyle::GetDefaultId());
+		if(q >= 0)
+			d.style.SetDisplay(q, 0, Single<DisplayDefault>());
+		d.style.FindSetCursor(formatinfo.styleid);
+		RichStyle cs;
+		cs.format = formatinfo;
+		cs.format.sscript = 0;
+		cs.format.link.Clear();
+		cs.format.indexentry.Clear();
+		cs.format.language = LNG_ENGLISH;
+		cs.format.label.Clear();
+
+		Uuid id;
+		switch(d.Run()) {
+		case IDCANCEL:
+			return;
+		case IDOK:
+			if(d.style.IsCursor()) {
+				id = d.style.GetKey();
+				const RichStyle& st = text.GetStyle(id);
+				cs.name = st.name;
+				cs.next = st.next;
+				SaveStyleUndo(id);
+				break;
+			}
+			return;
+		case IDYES:
+			String newname;
+			if(EditText(newname, Format(t_("New style no. %d"), text.GetStyleCount()),
+			            "Name", CharFilterAscii128)) {
+				cs.name = newname;
+				id = Uuid::Create();
+				cs.next = id;
+				SaveStylesUndo();
+				break;
+			}
+			return;
+		}
+		text.SetStyle(id, cs);
+		ReadStyles();
+		formatinfo.styleid = id;
+		SaveFormat(GetCursor(), 0);
+		text.ReStyle(GetCursor(), id);
+		Finish();
+	}
+}
+
+struct StyleManager : public WithStylesLayout<TopWindow> {
+	ParaFormating             para;
+	int                       unit;
+	ArrayMap<Uuid, RichStyle> style;
+	Index<Uuid>               dirty;
+	FontHeight                height;
+	EditString                name;
+
+	void EnterStyle();
+	void SaveStyle();
+	void SetupFont();
+	void SetupFont0();
+	void Create();
+	void ReloadNextStyles();
+	void Remove();
+
+	void GetFont(Font& font);
+
+	void Menu(Bar& bar);
+
+	typedef StyleManager CLASSNAME;
+
+	StyleManager();
+};
+
+void StyleManager::EnterStyle()
+{
+	RichText::FormatInfo f;
+	const RichStyle& s = style.Get(list.GetKey());
+	f.Set(s.format);
+	para.Set(unit, f);
+	height <<= RichEdit::DotToPt(s.format.GetHeight());
+	face <<= s.format.GetFace();
+	bold = s.format.IsBold();
+	italic = s.format.IsItalic();
+	underline = s.format.IsUnderline();
+	strikeout = s.format.IsStrikeout();
+	capitals = s.format.capitals;
+	ink <<= s.format.ink;
+	paper <<= s.format.paper;
+	next <<= s.next;
+	ClearModify();
+	SetupFont0();
+	para.EnableNumbering();
+}
+
+void StyleManager::GetFont(Font& font)
+{
+	if(!IsNull(face))
+		font.Face(~face);
+	if(!IsNull(height))
+		font.Height(RichEdit::PtToDot(~height));
+	font.Bold(bold);
+	font.Italic(italic);
+	font.Underline(underline);
+	font.Strikeout(strikeout);
+}
+
+void StyleManager::SetupFont0()
+{
+	Font font = Arial(120);
+	GetFont(font);
+	para.font = font;
+}
+
+void StyleManager::SetupFont()
+{
+	SetupFont0();
+	para.SetupIndent();
+}
+
+void StyleManager::SaveStyle()
+{
+	if(list.IsCursor()) {
+		Uuid id = list.GetKey();
+		RichStyle& s = style.Get(list.GetKey());
+		if(IsModified() || para.IsChanged()) {
+			dirty.FindAdd(id);
+			RichText::FormatInfo f;
+			para.Get(f);
+			s.format = f;
+			GetFont(s.format);
+			s.format.capitals = capitals;
+			s.format.ink = ~ink;
+			s.format.paper = ~paper;
+		}
+		if(String(list.Get(1)) != s.name) {
+			dirty.FindAdd(id);
+			s.name = list.Get(1);
+		}
+		if((Uuid)~next != s.next) {
+			dirty.FindAdd(id);
+			s.next = ~next;
+		}
+	}
+}
+
+void StyleManager::Create()
+{
+	Uuid id = Uuid::Create();
+	style.Add(id, style.Get(list.GetKey()));
+	style.Top().next = id;
+	dirty.FindAdd(id);
+	list.Add(id);
+	list.GoEnd();
+	list.StartEdit();
+}
+
+void StyleManager::Remove()
+{
+	if(list.GetCount() > 1 && (Uuid)list.GetKey() != RichStyle::GetDefaultId()) {
+		dirty.FindAdd(list.GetKey());
+		style.Remove(list.GetCursor());
+		list.Remove(list.GetCursor());
+	}
+}
+
+void StyleManager::Menu(Bar& bar)
+{
+	bar.Add(t_("Create new style.."), THISBACK(Create))
+	   .Key(K_INSERT);
+	bar.Add(t_("Remove style"), THISBACK(Remove))
+	   .Key(K_DELETE);
+	bar.Add(t_("Rename.."), callback(&list, &ArrayCtrl::DoEdit))
+	   .Key(K_CTRL_ENTER);
+}
+
+void StyleManager::ReloadNextStyles()
+{
+	next.ClearList();
+	for(int i = 0; i < list.GetCount(); i++)
+		next.Add(list.Get(i, 0), list.Get(i, 1));
+}
+
+StyleManager::StyleManager()
+{
+	CtrlLayoutOKCancel(*this, t_("Styles"));
+	list.NoHeader().NoGrid();
+	list.AddKey();
+	list.AddColumn().Edit(name);
+	list.WhenEnterRow = THISBACK(EnterStyle);
+	list.WhenKillCursor = THISBACK(SaveStyle);
+	list.WhenBar = THISBACK(Menu);
+	list.WhenAcceptEdit = THISBACK(ReloadNextStyles);
+	ink.NotNull();
+	face <<= height <<= italic <<= bold <<= underline <<= strikeout <<= THISBACK(SetupFont);
+}
+
+void RichEdit::Styles()
+{
+	NextUndo();
+	StyleManager s;
+	s.unit = unit;
+	int i;
+	for(i = 0; i < text.GetStyleCount(); i++)
+		s.list.Add(text.GetStyleId(i), text.GetStyle(i).name);
+	s.list.Sort(1, sCompareStyle);
+	for(i = 0; i < text.GetStyleCount(); i++) {
+		Uuid id = s.list.Get(i, 0);
+		s.style.Add(id, text.GetStyle(id));
+	}
+	for(i = 0; fh[i]; i++)
+		s.height.AddList(fh[i]);
+	SetupFaceList(s.face);
+	for(i = 0; i < face.GetCount(); i++)
+		s.face.Add(face.GetKey(i));
+	int q = s.list.Find(RichStyle::GetDefaultId());
+	if(q >= 0)
+		s.list.SetDisplay(q, 0, Single<DisplayDefault>());
+	s.list.FindSetCursor(formatinfo.styleid);
+	s.ReloadNextStyles();
+	if(s.Execute() != IDOK)
+		return;
+	s.SaveStyle();
+	SaveStylesUndo();
+	for(i = 0; i < s.dirty.GetCount(); i++) {
+		SetModify();
+		modified = true;
+		Uuid id = s.dirty[i];
+		int q = s.style.Find(id);
+		if(q >= 0)
+			text.SetStyle(id, s.style.Get(id));
+		else
+			text.RemoveStyle(id);
+	}
+	ReadStyles();
+	Finish();
+}
+
+void RichEdit::ApplyStylesheet(const RichText& r)
+{
+	NextUndo();
+	SaveStylesUndo();
+	text.OverrideStyles(r.GetStyles(), false, false);
+	ReadStyles();
+	Finish();
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/RichEdit/RichEdit.h b/uppsrc/RichEdit/RichEdit.h
new file mode 100644
index 000000000..321763fbb
--- /dev/null
+++ b/uppsrc/RichEdit/RichEdit.h
@@ -0,0 +1,678 @@
+#ifndef RICHEDIT_H
+#define RICHEDIT_H
+
+#include <CtrlLib/CtrlLib.h>
+
+NAMESPACE_UPP
+
+#define IMAGECLASS RichEditImg
+#define IMAGEFILE <RichEdit/RichEdit.iml>
+#include <Draw/iml_header.h>
+
+class RichRuler : public FrameCtrl<Ctrl> {
+public:
+	virtual void FrameLayout(Rect& r);
+	virtual void FrameAddSize(Size& sz);
+	virtual void Paint(Draw& w);
+	virtual void LeftDown(Point p, dword);
+	virtual void RightDown(Point p, dword);
+	virtual void LeftDouble(Point p, dword);
+	virtual void MouseMove(Point p, dword);
+	virtual void LeftUp(Point, dword);
+
+public:
+	struct Marker {
+		int   pos, minpos, maxpos;
+		Image image;
+		bool  top;
+		bool  deletable;
+
+		bool operator!=(const Marker& m) {
+			return pos != m.pos || minpos != m.minpos || maxpos != m.maxpos ||
+			       !image.IsSame(m.image) || top != m.top || deletable != m.deletable;
+		}
+		Marker() { top = false; deletable = false; }
+	};
+
+private:
+	int    x0, pgcx, numbers, marks;
+	double grid, numbermul;
+	Zoom   zoom;
+
+	int    track, pos;
+	int    trackdx;
+	int    snap;
+
+	Array<Marker> marker;
+	int           tabpos;
+	int           tabsize;
+	int           newtabalign;
+
+public:
+	Callback      WhenLeftDouble;
+	Callback      WhenLeftDown;
+	Callback      WhenRightDown;
+	Callback      WhenBeginTrack;
+	Callback      WhenTrack;
+	Callback      WhenEndTrack;
+
+	void          SetLayout(int x, int pgcx, Zoom zoom, double grid,
+	                        int numbers = INT_MAX, double numbermul = 1, int marks = INT_MAX,
+	                        int snap = 32);
+
+	void          Clear();
+	void          Set(int i, const Marker& m);
+	void          SetCount(int n);
+	int           GetCount() const        { return marker.GetCount(); }
+	const Marker& operator[](int i)       { return marker[i]; }
+
+	int           FindMarker(Point p);
+	int           GetTrack()              { return track; }
+	int           GetPos()                { return pos; }
+
+	void          SetTabs(int pos, int size);
+
+	int           GetNewTabAlign()        { return newtabalign; }
+
+	RichRuler();
+	virtual ~RichRuler();
+};
+
+enum {
+	UNIT_DOT,
+	UNIT_POINT,
+	UNIT_INCH,
+	UNIT_MM,
+	UNIT_CM,
+};
+
+class UnitEdit : public EditField, public Convert {
+public:
+	virtual Value GetData() const;
+	virtual Value Format(const Value& v) const;
+	virtual void  SetData(const Value& v);
+	virtual bool  Key(dword key, int repcnt);
+
+private:
+	SpinButtons spin;
+	int         unit;
+	bool        sgn;
+
+	static String AsText(double d, int unit);
+	static String DotAsText(int dot, int unit);
+	void Spin(int delta);
+	void Read(double& q, int& u) const;
+
+public:
+	UnitEdit& SetUnit(int _unit)                        { unit = _unit; return *this; }
+	void      Set(int _unit, int d)                     { unit = _unit; SetData(d); }
+	UnitEdit& WithSgn(bool b = true);
+
+	typedef UnitEdit CLASSNAME;
+
+	UnitEdit();
+};
+
+struct FontHeight : public WithDropChoice<EditDouble> {
+	virtual bool Key(dword key, int);
+};
+
+#define LAYOUTFILE <RichEdit/RichEdit.lay>
+#include <CtrlCore/lay.h>
+
+class RichEdit : public Ctrl, private TextArrayOps {
+public:
+	virtual void  Layout();
+	virtual void  Paint(Draw& w);
+	virtual bool  Key(dword key, int count);
+	virtual void  LeftDown(Point p, dword flags);
+	virtual void  MiddleDown(Point p, dword flags);
+	virtual void  LeftUp(Point p, dword flags);
+	virtual void  LeftDrag(Point p, dword flags);
+	virtual void  RightDown(Point p, dword flags);
+	virtual void  LeftDouble(Point p, dword flags);
+	virtual void  LeftTriple(Point p, dword flags);
+	virtual void  MouseMove(Point p, dword flags);
+	virtual void  LeftRepeat(Point p, dword flags);
+	virtual void  MouseWheel(Point p, int zdelta, dword keyflags);
+	virtual void  CancelMode();
+	virtual Image CursorImage(Point p, dword flags);
+	virtual Value GetData() const;
+	virtual void  SetData(const Value& v);
+	virtual void  Serialize(Stream& s);
+	virtual void  DragAndDrop(Point p, PasteClip& d);
+	virtual void  DragRepeat(Point p);
+	virtual void  DragLeave();
+	virtual String GetSelectionData(const String& fmt) const;
+
+
+private:
+	Size                     p_size;
+	bool                     sizetracking;
+	ScrollBar                sb;
+	Scroller                 scroller;
+	RichRuler                ruler;
+	RichText                 text;
+	RichText::FormatInfo     formatinfo;
+	int                      cursor, anchor;
+	RichCaret                cursorc;
+	RichPos                  cursorp;
+	RichPos                  anchorp;
+	int                      tablesel;
+	Rect                     cells;
+	int                      gx;
+	int                      oselh, osell;
+	int                      objectpos;
+	Rect                     objectrect;
+	RichHotPos               tabmove;
+	int                      mpos;
+	int                      undosteps;
+	Rect                     dropcaret;
+	bool                     selclick;
+	DropList                 face;
+	FontHeight               height;
+	DataPusher               hyperlink;
+	DataPusher               label;
+	DataPusher               indexentry;
+	FrameRight<Button>       gotolabel, gotoentry;
+	MultiButton::SubButton  *setstyle;
+	PopUpTable               gototable;
+	ColorButton              ink, paper;
+	ToolButton               adjustunits;
+	DropList                 style;
+	DropList                 language;
+	Size                     pagesz;
+	String                   footer;
+	bool                     nolinks;
+	bool                     overwrite;
+	bool                     useraction, modified;
+	static int               fixedlang;
+
+	WithRichFindReplaceLayout<TopWindow> findreplace;
+
+	bool                     found, notfoundfw;
+
+	VectorMap<String, Value> vars;
+
+	int                      unit;
+	Color                    showcodes;
+	int                      zoom;
+	bool                     spellcheck;
+	bool                     paintcarect;
+
+	int                      undoserial;
+	bool                     incundoserial;
+
+	static int fh[];
+
+	struct UndoRec {
+		int     serial;
+		int     cursor;
+
+		virtual void     Apply(RichText& txt) = 0;
+		virtual UndoRec *GetRedo(const RichText& txt) = 0;
+
+		UndoRec *Serial(int s) { serial = s; return this; }
+
+		virtual ~UndoRec() {}
+	};
+
+	struct UndoInsert : UndoRec {
+		int                  pos;
+		int                  length;
+		bool                 typing;
+
+		virtual void     Apply(RichText& txt);
+		virtual UndoRec *GetRedo(const RichText& txt);
+
+		UndoInsert(int pos, int length, bool typing = false);
+	};
+
+	struct UndoRemove : UndoRec {
+		int                  pos;
+		RichText             text;
+
+		virtual void     Apply(RichText& txt);
+		virtual UndoRec *GetRedo(const RichText& txt);
+
+		UndoRemove(const RichText& txt, int pos, int length);
+	};
+
+	struct UndoFormat : UndoRec {
+		int                 pos;
+		int                 length;
+		RichText::Formating format;
+
+		virtual void     Apply(RichText& txt);
+		virtual UndoRec *GetRedo(const RichText& txt);
+
+		UndoFormat(const RichText& txt, int pos, int length);
+	};
+
+	struct UndoStyle : UndoRec {
+		Uuid                 id;
+		RichStyle            style;
+
+		virtual void     Apply(RichText& txt);
+		virtual UndoRec *GetRedo(const RichText& txt);
+
+		UndoStyle(const RichText& txt, const Uuid& id);
+	};
+
+	struct UndoStyles : UndoRec {
+		RichStyles           styles;
+
+		virtual void     Apply(RichText& txt);
+		virtual UndoRec *GetRedo(const RichText& txt);
+
+		UndoStyles(const RichText& txt);
+	};
+
+	struct UndoTableFormat : UndoRec {
+		int                 table;
+		RichTable::Format   format;
+
+		virtual void     Apply(RichText& txt);
+		virtual UndoRec *GetRedo(const RichText& txt);
+
+		UndoTableFormat(const RichText& txt, int table);
+	};
+
+	struct UndoCreateTable : UndoRec {
+		int              table;
+
+		virtual void     Apply(RichText& txt);
+		virtual UndoRec *GetRedo(const RichText& txt);
+
+		UndoCreateTable(int table) : table(table) {}
+	};
+
+	struct UndoDestroyTable : UndoRec {
+		int              pos;
+		RichTable        table;
+
+		virtual void     Apply(RichText& txt);
+		virtual UndoRec *GetRedo(const RichText& txt);
+
+		UndoDestroyTable(const RichText& txt, int pos);
+	};
+
+	struct UndoRemoveParaSpecial : UndoRec {
+		int              table;
+		bool             before;
+		RichPara::Format format;
+
+		virtual void     Apply(RichText& txt);
+		virtual UndoRec *GetRedo(const RichText& txt);
+
+		UndoRemoveParaSpecial(const RichText& txt, int table, bool before);
+	};
+
+	struct UndoInsertParaSpecial : UndoRec {
+		int              table;
+		bool             before;
+
+		virtual void     Apply(RichText& txt);
+		virtual UndoRec *GetRedo(const RichText& txt);
+
+		UndoInsertParaSpecial(int table, bool before) : table(table), before(before) {}
+	};
+
+	struct UndoTable : UndoRec {
+		int             table;
+		RichTable       copy;
+
+		virtual void     Apply(RichText& txt);
+		virtual UndoRec *GetRedo(const RichText& txt);
+
+		UndoTable(const RichText& txt, int table);
+	};
+
+	BiArray<UndoRec> undo;
+	Array<UndoRec>   redo;
+
+	Rect       GetTextRect() const;
+	Size       GetZoomedPage() const;
+	int        GetPosY(PageY py) const;
+	void       GetPagePoint(Point p, PageY& py, int& x);
+	int        GetX(int x);
+	int        GetSnapX(int x);
+	PageY      GetPageY(int y) const;
+	int        GetNearestPos(int x, PageY py);
+	void       SetSb();
+	void       Scroll();
+	Rect       PlaceCaret();
+	void       FinishNF();
+	void       Finish();
+	void       ReadFormat();
+	void       ShowFormat();
+	int        GetMousePos(Point p);
+	RichHotPos GetHotPos(Point p);
+	int        GetHotSpot(Point p) const;
+	Rect       GetObjectRect(int pos) const;
+	void       FixObjectRect();
+
+	void       SetObjectPos(int pos);
+	void       AdjustObjectSize();
+	void       SetObjectPercent(int p);
+	void       SetObjectYDelta(int pt);
+	void       SetFace();
+	void       SetHeight();
+
+	bool       SelBeg(bool select);
+	bool       SelEnd(bool select);
+	void       SelCell(int dx, int dy);
+
+	void       Limit(int& pos, int& count);
+	bool       InvalidRange(int c1, int c2);
+	void       NextUndo()                 { undoserial += incundoserial; incundoserial = false; }
+	void       AddUndo(UndoRec *undo);
+
+	void       BeginRulerTrack();
+	void       RulerTrack();
+	void       IndentMark();
+	void       HighLightTab(int r);
+	void       TabAdd(int align);
+	void       AddTab();
+	void       TabMenu();
+
+	void       Hyperlink();
+	void       Label();
+	void       IndexEntry();
+	void       GotoLbl();
+	void       GotoEntry();
+	void       GotoType(int type, Ctrl& l);
+	void       Goto();
+
+	void       SetInk();
+	void       SetPaper();
+	void       SetLanguage();
+	void       Language();
+	void       SetupLanguage(pick_ Vector<int>& lng);
+
+	void       SetBullet(int bullet);
+
+	void       SetupRuler();
+
+	void       ReadStyles();
+
+	void       SetStyle();
+
+	void       EndSizeTracking();
+
+	RichObject GetObject() const;
+	void       ReplaceObject(const RichObject& obj);
+
+	static bool   IsW(int c);
+	static void   SetupFaceList(DropList& face);
+
+	void Insert(int pos, const RichText& text, bool typing = false);
+	void Remove(int pos, int len, bool joinnext = false);
+	void SaveFormat(int pos, int count);
+	void SaveFormat();
+	void ModifyFormat(int pos, const RichText::FormatInfo& fi, int count);
+	void SetParaFormat(dword paravalid);
+
+	void SaveStylesUndo();
+	void SaveStyleUndo(const Uuid& id);
+
+	bool CursorKey(dword key, int count);
+
+	void ApplyFormat(dword charvalid, dword paravalid = 0);
+
+	void MoveNG(int newpos, bool select);
+	void MoveUpDown(int dir, bool select, int firststep = 0);
+	void MovePageUpDown(int dir, bool select);
+	void MoveWordRight(bool select);
+	void MoveWordLeft(bool select);
+	void MoveHomeEnd(int dir, bool select);
+
+	void InsertLine();
+
+	void Bold();
+	void Italic();
+	void Underline();
+	void Strikeout();
+	void Capitals();
+	void SetScript(int script);
+
+	void AlignLeft();
+	void AlignRight();
+	void AlignCenter();
+	void AlignJustify();
+
+	void Style();
+
+	void ParaFormat();
+	void ToPara();
+
+	void SetupUnits();
+	void SpellCheck();
+
+	void    AddUserDict();
+	WString GetWordAtCursor();
+
+	Rect     GetCaretRect(const RichCaret& pr) const;
+	Rect     GetCaretRect() const;
+
+	void     SaveTableFormat(int table);
+	void     SaveTable(int table);
+	void     InsertTable();
+	void     DestroyTable();
+	void     TableProps();
+	bool     RemoveSpecial(int ll, int hh, bool back);
+	bool     InsertLineSpecial();
+	void     TableInsertRow();
+	void     TableRemoveRow();
+	void     TableInsertColumn();
+	void     TableRemoveColumn();
+	void     SplitCell();
+	void     JoinCell();
+	void     CellProperties();
+
+	void     OpenFindReplace();
+	void     CloseFindReplace();
+	int      FindPos();
+	RichText ReplaceText();
+	void     Find();
+	void     Replace();
+	void     FindReplaceAddHistory();
+
+	void     Reset();
+
+	void     DoRefreshBar();
+	void     RefreshBar();
+
+	bool     Accept(PasteClip& d, RichText& clip);
+	void     ClipPaste(RichText& clip);
+	bool     InSelection(int& c) const;
+	void     RefreshDropCaret();
+
+	static bool   SpellWord(const wchar *wrd, int len, int lang);
+	static void   SpellerAdd(const WString& w, int lang);
+
+protected:
+	enum {
+		TIMEID_ENDSIZETRACKING = Ctrl::TIMEID_COUNT,
+		TIMEID_REFRESHBAR,
+		TIMEID_COUNT
+	};
+
+public:
+	static double DotToPt(int dot);
+	static int    PtToDot(double pt);
+	static Bits   SpellParagraph(const RichPara& p);
+	static void   FixedLang(int lang)              { fixedlang = lang; }
+
+	Callback                     WhenRefreshBar;
+	Callback                     WhenStartEvaluating;
+	Callback2<String&, WString&> WhenHyperlink;
+	Callback1<String&>           WhenLabel;
+
+	void   SerializeSettings(Stream& s);
+
+	Zoom   GetZoom() const;
+
+	int    GetCursor() const                       { return cursor; }
+	int    GetAnchor() const                       { return anchor; }
+
+	void     Select(int pos, int count);
+	bool     IsSelection() const;
+	bool     GetSelection(int& l, int& h) const;
+	RichText GetSelection(int maxlen = INT_MAX) const;
+	void     SetSelection(int l, int h)            { Select(l, h - l); }
+	bool     RemoveSelection(bool joinnext = false);
+	void     CancelSelection();
+
+	void   BeginOp()                               { NextUndo(); }
+
+	int                  GetLength() const         { return text.GetLength(); }
+	void                 PasteText(const RichText& text);
+	void                 RemoveText(int count);
+	RichText             CopyText(int pos, int count) const;
+	RichText::FormatInfo GetFormatInfo() const     { return formatinfo; }
+	void                 ApplyFormatInfo(const RichText::FormatInfo& fi);
+	int                  GetChar(int pos) const    { return text[pos]; }
+	int                  operator[](int pos) const { return text[pos]; }
+
+	void   Undo();
+	void   Redo();
+
+	void   ScrollToCursor()                     { Finish(); }
+
+	void   Move(int newpos, bool select = false);
+
+	void   Copy();
+	void   Cut();
+	void   Paste();
+	void   InsertObject(int type);
+
+	void   Styles();
+
+	bool   Print();
+	void   DoPrint()                             { Print(); }
+
+	void   StyleTool(Bar& bar, int width = 120);
+	void   FaceTool(Bar& bar, int width = 130);
+	void   HeightTool(Bar& bar, int width = 50);
+	void   BoldTool(Bar& bar, dword key = K_CTRL_B);
+	void   ItalicTool(Bar& bar, dword key = K_CTRL_I);
+	void   UnderlineTool(Bar& bar, dword key = K_CTRL_U);
+	void   StrikeoutTool(Bar& bar, dword key = 0);
+	void   CapitalsTool(Bar& bar, dword key = 0);
+	void   SuperscriptTool(Bar& bar, dword key = 0);
+	void   SubscriptTool(Bar& bar, dword key = 0);
+	void   InkTool(Bar& bar);
+	void   PaperTool(Bar& bar);
+	void   LanguageTool(Bar& bar, int width = HZoom(60));
+	void   HyperlinkTool(Bar& bar, int width = 180);
+	void   SpellCheckTool(Bar& bar);
+	void   IndexEntryTool(Bar& bar, int width = 80);
+
+	void   LeftTool(Bar& bar, dword key = K_CTRL_L);
+	void   RightTool(Bar& bar, dword key = K_CTRL_R);
+	void   CenterTool(Bar& bar, dword key = K_CTRL_E);
+	void   JustifyTool(Bar& bar, dword key = K_CTRL_J);
+	void   RoundBulletTool(Bar& bar, dword key = 0);
+	void   RoundWhiteBulletTool(Bar& bar, dword key = 0);
+	void   BoxBulletTool(Bar& bar, dword key = 0);
+	void   BoxWhiteBulletTool(Bar& bar, dword key = 0);
+	void   TextBulletTool(Bar& bar, dword key = 0);
+	void   ParaFormatTool(Bar& bar, dword key = 0);
+	void   LabelTool(Bar& bar, int width = 80);
+	void   ToParaTool(Bar& bar, dword key = K_CTRL_K);
+
+	void   UndoTool(Bar& bar, dword key = K_CTRL_Z);
+	void   RedoTool(Bar& bar, dword key = K_SHIFT_CTRL_Z);
+	void   CutTool(Bar& bar, dword key = K_CTRL_X);
+	void   CopyTool(Bar& bar, dword key = K_CTRL_C);
+	void   PasteTool(Bar& bar, dword key = K_CTRL_V);
+	void   ObjectTool(Bar& bar, dword key = 0);
+	void   FindReplaceTool(Bar& bar, dword key = K_CTRL_F);
+
+	void   InsertTableTool(Bar& bar, dword key = K_CTRL_F12);
+	void   TablePropertiesTool(Bar& bar, dword key = K_SHIFT_F12);
+	void   InsertTableRowTool(Bar& bar, dword key = 0);
+	void   RemoveTableRowTool(Bar& bar, dword key = 0);
+	void   InsertTableColumnTool(Bar& bar, dword key = 0);
+	void   RemoveTableColumnTool(Bar& bar, dword key = 0);
+	void   SplitJoinCellTool(Bar& bar, dword key = 0);
+	void   CellPropertiesTool(Bar& bar, dword key = 0);
+
+	void   PrintTool(Bar& bar, dword key = K_CTRL_P);
+
+	void   FontTools(Bar& bar);
+	void   ParaTools(Bar& bar);
+	void   EditTools(Bar& bar);
+	void   TableTools(Bar& bar);
+
+	void   DefaultBar(Bar& bar, bool extended = true);
+
+	void            EvaluateFields()               { WhenStartEvaluating(); text.EvaluateFields(vars); }
+
+	void            GotoLabel(const String& lbl);
+
+	void            Clear();
+	void            Pick(pick_ RichText& t);
+	void            SetQTF(const char *qtf)               { Pick(ParseQTF(qtf)); }
+	const RichText& Get() const                           { return text; }
+	String          GetQTF(byte cs = CHARSET_UTF8) const  { return AsQTF(text, cs); }
+	void            ApplyStylesheet(const RichText& r);
+	void            SetPage(const Size& sz)               { pagesz = sz; Finish(); }
+	Size            GetPage()                             { return pagesz; }
+
+	void            NoRuler()                             { RemoveFrame(ruler); }
+
+	RichEdit&       FontFaces(const Vector<int>& face);
+	RichEdit&       ShowCodes(Color c)                    { showcodes = c; Refresh(); return *this; }
+	RichEdit&       Unit(int u)                           { unit = u; Refresh(); return *this; }
+	RichEdit&       SpellCheck(bool b)                    { spellcheck = b; Refresh(); return *this; }
+	RichEdit&       SetZoom(int z)                        { zoom = z; Refresh(); return *this; }
+
+	struct UndoInfo {
+		int              undoserial;
+		BiArray<UndoRec> undo;
+		Array<UndoRec>   redo;
+	};
+
+	struct PosInfo {
+		int cursor;
+		int anchor;
+		int sbpos;
+
+		void Serialize(Stream& s)  { int version = 0; s / version % cursor % anchor % sbpos; }
+	};
+
+	UndoInfo PickUndoInfo();
+	void     SetPickUndoInfo(pick_ UndoInfo& f);
+
+	PosInfo  GetPosInfo() const;
+	void     SetPosInfo(const PosInfo& pos);
+
+	void     SetFooter(const String& s)                   { footer = s; }
+	void     PrintNoLinks(bool b = true)                  { nolinks = b; }
+
+	typedef RichEdit CLASSNAME;
+
+	RichEdit();
+	virtual ~RichEdit();
+};
+
+class RichEditWithToolBar : public RichEdit {
+	ToolBar  toolbar;
+	bool     extended;
+	void RefreshBar();
+	void TheBar(Bar& bar);
+
+public:
+	RichEditWithToolBar& Extended(bool b = true) { extended = b; return *this; }
+	RichEditWithToolBar& NoExtended()            { return Extended(false); }
+
+	typedef RichEditWithToolBar CLASSNAME;
+
+	RichEditWithToolBar();
+};
+
+END_UPP_NAMESPACE
+
+#endif
diff --git a/uppsrc/RichEdit/RichEdit.icpp b/uppsrc/RichEdit/RichEdit.icpp
new file mode 100644
index 000000000..b789cb65f
--- /dev/null
+++ b/uppsrc/RichEdit/RichEdit.icpp
@@ -0,0 +1,8 @@
+#include "RichEdit.h"
+
+NAMESPACE_UPP
+
+#define TFILE <RichEdit/RichEdit.t>
+#include <Core/t.h>
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/RichEdit/RichEdit.iml b/uppsrc/RichEdit/RichEdit.iml
new file mode 100644
index 000000000..1d7531f70
--- /dev/null
+++ b/uppsrc/RichEdit/RichEdit.iml
@@ -0,0 +1,147 @@
+IMAGE_ID(RightTab)
+IMAGE_ID(RightTabTrack)
+IMAGE_ID(LeftTab)
+IMAGE_ID(LeftTabTrack)
+IMAGE_ID(CenterTab)
+IMAGE_ID(CenterTabTrack)
+IMAGE_ID(Margin)
+IMAGE_ID(MarginMixed)
+IMAGE_ID(MarginTrack)
+IMAGE_ID(Indent)
+IMAGE_ID(IndentMixed)
+IMAGE_ID(IndentTrack)
+IMAGE_ID(Bold)
+IMAGE_ID(BoldMixed)
+IMAGE_ID(Italic)
+IMAGE_ID(ItalicMixed)
+IMAGE_ID(Underline)
+IMAGE_ID(UnderlineMixed)
+IMAGE_ID(Left)
+IMAGE_ID(SuperScript)
+IMAGE_ID(SuperScriptMixed)
+IMAGE_ID(SubScript)
+IMAGE_ID(SubScriptMixed)
+IMAGE_ID(Capitals)
+IMAGE_ID(CapitalsMixed)
+IMAGE_ID(Right)
+IMAGE_ID(Strikeout)
+IMAGE_ID(StrikeoutMixed)
+IMAGE_ID(Center)
+IMAGE_ID(Justify)
+IMAGE_ID(bullet)
+IMAGE_ID(boxbullet)
+IMAGE_ID(firstnumberbullet)
+IMAGE_ID(numberbullet)
+IMAGE_ID(print)
+IMAGE_ID(newpage)
+IMAGE_ID(InkColor)
+IMAGE_ID(NullInkColor)
+IMAGE_ID(PaperColor)
+IMAGE_ID(ColorA)
+IMAGE_ID(NullPaperColor)
+IMAGE_ID(ManageStyles)
+IMAGE_ID(AdjustUnits)
+IMAGE_ID(ParaFormat)
+IMAGE_ID(ToPara)
+IMAGE_ID(RoundBullet)
+IMAGE_ID(RoundWhiteBullet)
+IMAGE_ID(BoxBullet)
+IMAGE_ID(BoxWhiteBullet)
+IMAGE_ID(NoneBullet)
+IMAGE_ID(SpellCheck)
+IMAGE_ID(TextBullet)
+IMAGE_ID(FindReplace)
+IMAGE_ID(GoTo)
+IMAGE_ID(InsertTable)
+IMAGE_ID(TableProperties)
+IMAGE_ID(TableInsertRow)
+IMAGE_ID(TableRemoveRow)
+IMAGE_ID(TableInsertColumn)
+IMAGE_ID(TableRemoveColumn)
+IMAGE_ID(SplitCell)
+IMAGE_ID(JoinCell)
+IMAGE_ID(CellProperties)
+
+IMAGE_BEGIN_DATA
+IMAGE_DATA(120,156,237,90,219,114,196,32,8,181,211,78,247,242,212,79,222,79,219,63,75,147,236,58,37,22,1,197,123,100,199,135)
+IMAGE_DATA(8,71,4,1,73,102,205,197,92,204,247,250,35,104,121,143,210,188,184,193,25,180,74,45,139,71,121,78,94,236,216,13)
+IMAGE_DATA(50,127,6,213,58,13,138,23,126,66,214,160,90,167,65,241,130,79,232,186,26,244,137,135,28,229,189,90,124,93,126,249)
+IMAGE_DATA(140,165,60,91,139,175,206,189,219,106,238,151,191,152,80,158,223,249,27,17,114,59,255,249,124,46,143,199,3,61,41,203)
+IMAGE_DATA(183,195,145,251,199,71,228,68,50,246,25,27,86,134,29,148,179,222,11,121,105,227,111,228,147,179,124,184,81,31,31,26)
+IMAGE_DATA(104,229,48,190,43,39,149,161,156,37,29,234,200,242,68,204,129,191,198,158,55,178,44,223,14,55,178,92,62,34,39,150)
+IMAGE_DATA(73,20,89,31,208,57,236,240,209,118,122,80,38,65,250,236,123,98,248,198,149,147,28,32,193,135,190,56,18,116,150,52)
+IMAGE_DATA(28,41,103,133,164,6,39,99,247,68,241,45,65,57,140,15,229,40,62,148,35,157,101,132,145,37,9,233,68,233,99,48)
+IMAGE_DATA(57,46,165,179,69,214,207,250,187,154,59,131,235,146,36,7,31,186,6,54,175,197,83,107,164,214,63,162,253,185,252,151)
+IMAGE_DATA(34,126,250,162,81,139,129,168,123,11,92,3,155,215,226,169,53,82,235,31,209,254,92,254,75,17,63,221,209,86,12,110)
+IMAGE_DATA(3,22,3,132,82,84,118,237,141,160,193,79,221,101,241,231,232,6,32,157,165,24,164,168,236,218,27,65,131,159,186,203)
+IMAGE_DATA(234,62,77,55,0,105,224,98,160,125,223,52,132,76,232,59,247,196,247,137,135,178,165,59,4,201,55,139,180,251,24,181)
+IMAGE_DATA(24,104,223,55,161,172,116,126,226,199,194,67,217,210,29,130,228,155,69,242,125,188,138,193,53,233,154,74,146,86,196,92)
+IMAGE_DATA(85,186,164,174,24,253,211,254,177,237,175,71,129,197,64,227,20,23,163,117,172,6,223,54,118,171,248,118,28,177,124,96)
+IMAGE_DATA(186,183,133,246,246,136,193,195,253,135,226,181,251,135,242,49,250,93,220,232,223,9,32,133,20,3,77,123,226,98,180,45)
+IMAGE_DATA(142,246,163,82,211,88,36,145,196,45,226,44,6,179,24,196,82,131,175,9,253,83,108,34,88,44,245,172,93,79,138,201)
+IMAGE_DATA(147,204,124,103,233,79,102,121,103,41,75,230,182,187,195,60,88,186,179,156,197,32,3,205,98,128,62,139,58,75,79,49)
+IMAGE_DATA(8,234,44,5,197,160,249,238,48,3,150,237,44,95,255,64,188,196,234,104,145,106,126,215,200,133,247,217,228,206,81,120)
+IMAGE_DATA(233,28,118,123,112,120,137,126,110,175,28,94,171,63,102,205,80,255,247,77,163,117,6,53,191,107,228,194,251,108,114,231)
+IMAGE_DATA(40,188,116,14,187,61,56,124,204,254,67,241,90,253,49,107,134,250,191,123,106,176,24,96,183,19,55,106,239,169,164,174)
+IMAGE_DATA(105,255,216,246,87,163,95,148,238,35,138,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0)
+IMAGE_END_DATA(672, 26)
+
+IMAGE_BEGIN_DATA
+IMAGE_DATA(120,156,237,154,109,110,131,48,12,134,179,77,147,214,105,63,122,228,104,234,193,122,51,86,196,160,193,56,137,191,72,82)
+IMAGE_DATA(200,43,89,20,154,199,118,76,112,144,90,119,117,87,119,113,95,174,107,165,225,223,224,249,144,25,231,220,150,227,92,147)
+IMAGE_DATA(242,218,248,144,135,243,197,230,143,241,144,229,154,85,254,92,158,82,127,234,253,127,93,245,102,176,149,247,126,24,13,158)
+IMAGE_DATA(135,215,176,113,243,53,248,153,122,77,202,107,227,99,115,10,231,134,205,31,227,33,203,181,90,243,167,212,159,122,255,95)
+IMAGE_DATA(90,13,54,3,233,142,82,58,151,26,49,91,202,165,70,204,150,114,57,158,122,51,232,241,123,252,166,226,215,211,212,12)
+IMAGE_DATA(62,106,167,1,228,135,201,52,236,202,199,252,58,23,61,218,241,218,252,91,80,175,255,41,213,94,51,64,23,131,150,47)
+IMAGE_DATA(184,24,181,249,215,86,175,255,105,213,94,51,152,228,21,175,95,35,11,120,242,98,154,57,41,111,145,255,17,120,32,118)
+IMAGE_DATA(253,140,249,46,138,218,107,6,150,93,221,236,53,147,185,51,105,115,174,185,179,89,198,151,214,127,197,50,121,111,112,47)
+IMAGE_DATA(78,250,86,81,160,25,12,4,139,178,57,81,120,44,38,149,221,57,118,172,6,164,216,247,251,125,117,156,89,138,33,236)
+IMAGE_DATA(114,78,177,148,15,142,133,254,82,241,111,191,183,197,176,28,230,185,199,248,71,197,22,131,49,185,181,195,234,24,222,59)
+IMAGE_DATA(110,253,176,181,195,48,59,77,205,224,221,210,101,118,33,103,30,170,38,120,23,60,184,185,115,200,75,207,195,5,43,49)
+IMAGE_DATA(224,143,107,77,213,255,196,124,61,237,208,12,98,210,78,88,195,107,59,169,134,199,118,158,82,60,54,158,227,67,195,167)
+IMAGE_DATA(198,81,124,104,118,69,237,206,202,201,79,194,166,198,106,121,185,78,212,12,172,124,148,142,143,45,22,41,107,225,163,84)
+IMAGE_DATA(124,88,179,216,81,195,82,124,72,190,231,60,204,82,86,58,62,46,208,12,164,175,152,212,14,92,139,15,85,154,15,57)
+IMAGE_DATA(137,15,13,143,141,231,248,208,240,169,113,20,31,20,105,88,171,252,36,236,158,247,71,110,140,55,3,110,145,49,86,234)
+IMAGE_DATA(67,195,67,70,178,88,164,124,234,97,222,155,199,198,115,124,104,120,78,51,200,241,212,28,185,108,108,188,164,25,228,62)
+IMAGE_DATA(231,226,90,222,31,105,51,133,111,6,126,192,143,80,212,113,18,229,124,199,190,183,200,129,234,171,228,252,75,230,192,245)
+IMAGE_DATA(177,231,252,107,228,32,245,81,98,253,83,159,73,133,46,143,102,240,237,222,212,126,186,88,10,187,183,230,115,91,26,119)
+IMAGE_DATA(150,31,247,89,59,141,132,198,39,102,54,25,255,252,109,176,148,15,44,95,207,226,183,99,249,252,115,188,164,6,62,241)
+IMAGE_DATA(27,43,221,71,104,50,31,241,156,90,240,113,164,63,198,252,1,158,192,167,158,0,0,0,0,0,0,0,0,0,0,0)
+IMAGE_END_DATA(640, 17)
+
+IMAGE_BEGIN_DATA
+IMAGE_DATA(120,156,237,90,219,114,196,32,8,245,161,125,104,167,15,253,100,63,188,51,105,221,174,89,130,128,224,37,184,109,206,142)
+IMAGE_DATA(147,155,71,14,72,48,201,108,248,12,159,225,35,188,4,3,54,161,85,185,20,148,252,189,47,220,42,249,36,87,169,31)
+IMAGE_DATA(246,165,142,139,254,196,120,184,175,38,86,173,144,230,103,166,93,173,253,217,154,158,201,255,181,144,138,193,107,248,90,79)
+IMAGE_DATA(88,3,182,116,163,54,182,157,191,53,52,196,15,149,36,168,241,103,219,47,180,252,83,255,167,216,239,200,63,119,164,98)
+IMAGE_DATA(240,54,120,204,24,227,30,240,251,126,19,23,143,145,182,92,3,67,176,85,248,12,190,164,191,37,6,86,110,109,92,133)
+IMAGE_DATA(255,203,242,189,225,237,255,244,248,173,90,12,224,43,128,181,24,96,4,99,49,232,225,75,250,207,136,95,109,220,63,157)
+IMAGE_DATA(204,147,225,237,255,51,22,3,118,101,237,229,107,111,230,85,249,189,254,247,194,59,25,175,98,176,120,252,86,44,6,158)
+IMAGE_DATA(43,251,76,254,73,241,99,225,157,140,87,49,88,60,126,51,94,19,70,67,10,130,38,24,222,252,51,161,209,42,233,247)
+IMAGE_DATA(230,123,195,219,127,215,248,165,98,240,62,100,164,95,68,176,138,165,253,136,86,53,124,76,93,211,110,53,124,172,135,160)
+IMAGE_DATA(61,86,254,123,127,131,253,227,68,86,236,75,92,35,92,184,134,196,43,158,102,238,60,139,109,60,70,139,110,120,179,152)
+IMAGE_DATA(125,6,188,174,120,183,216,38,198,152,207,31,93,12,122,33,85,190,158,202,122,22,127,101,244,234,247,230,123,195,219,255)
+IMAGE_DATA(167,123,50,24,12,234,157,217,242,30,77,189,179,91,222,227,123,236,67,59,135,134,206,107,249,181,243,35,237,83,253,56)
+IMAGE_DATA(62,30,131,229,41,199,224,248,53,109,18,95,19,155,101,248,130,239,150,62,118,188,254,148,130,183,219,255,30,14,70,40)
+IMAGE_DATA(112,21,136,58,79,38,137,112,238,96,31,62,158,81,215,131,28,188,252,33,100,119,234,167,164,254,94,72,219,244,47,17)
+IMAGE_DATA(120,204,56,187,3,114,184,125,203,24,120,171,225,230,134,125,129,231,57,192,127,199,96,251,185,229,174,84,211,218,79,217)
+IMAGE_DATA(157,38,142,254,242,42,251,159,251,83,124,109,252,153,229,178,208,76,205,191,100,159,143,235,118,224,26,248,213,15,0,88)
+IMAGE_DATA(63,97,154,180,167,181,223,203,55,54,95,224,98,160,64,143,51,27,5,37,127,239,11,183,74,62,201,21,244,31,170,170)
+IMAGE_DATA(192,173,250,9,198,43,182,66,34,137,137,167,72,68,245,77,196,220,72,221,246,255,187,254,134,230,143,134,98,160,69,107)
+IMAGE_DATA(64,14,55,97,195,132,236,251,205,252,200,62,98,233,244,71,52,198,246,248,221,146,23,254,168,68,2,92,220,95,197,111)
+IMAGE_DATA(211,62,42,254,97,20,255,42,8,39,99,112,49,176,38,157,121,2,0,151,220,86,38,236,214,39,34,29,209,62,97,59)
+IMAGE_DATA(39,114,126,128,118,211,1,142,25,29,42,126,197,190,73,59,229,255,204,248,231,227,220,145,138,219,85,0,28,81,41,6)
+IMAGE_DATA(35,156,120,172,148,81,197,165,11,71,68,199,188,22,110,194,200,132,85,241,243,183,130,173,188,97,40,126,145,176,104,37)
+IMAGE_DATA(183,36,52,213,191,73,63,176,127,233,183,233,199,205,172,223,120,157,104,150,235,237,152,240,154,208,235,204,140,96,155,38)
+IMAGE_DATA(179,72,94,208,168,235,53,251,152,111,213,111,189,153,6,235,15,136,31,106,246,33,55,95,199,79,21,53,253,251,62,90)
+IMAGE_DATA(20,224,113,77,63,230,64,174,33,254,133,221,154,255,129,209,140,125,65,253,40,136,254,43,65,233,35,241,13,245,223,34)
+IMAGE_DATA(108,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0)
+IMAGE_END_DATA(832, 17)
+
+IMAGE_BEGIN_DATA
+IMAGE_DATA(120,156,237,148,209,10,128,32,12,69,247,218,91,159,236,167,249,103,11,131,197,178,45,215,52,141,240,194,69,35,142,27)
+IMAGE_DATA(203,46,172,176,194,2,136,208,78,232,240,137,39,133,16,176,164,55,248,196,89,93,170,159,158,128,234,104,251,63,243,149)
+IMAGE_DATA(223,127,120,255,3,120,135,219,104,134,65,167,48,208,60,249,201,103,188,195,109,212,57,12,76,124,140,113,119,26,38,237)
+IMAGE_DATA(147,141,231,139,60,189,147,148,243,194,15,127,176,249,42,241,188,254,29,91,234,223,192,22,231,199,102,118,89,89,29,84)
+IMAGE_DATA(121,229,18,103,179,253,20,255,36,204,133,64,87,239,31,183,181,127,15,239,116,181,54,86,71,37,187,0,0,0,0,0)
+IMAGE_END_DATA(160, 3)
diff --git a/uppsrc/RichEdit/RichEdit.lay b/uppsrc/RichEdit/RichEdit.lay
new file mode 100644
index 000000000..23797ee58
--- /dev/null
+++ b/uppsrc/RichEdit/RichEdit.lay
@@ -0,0 +1,197 @@
+LAYOUT(ParaLayout, 488, 320)
+	ITEM(LabelBox, dv___0, SetLabel(t_("Alignment")).LeftPosZ(8, 100).TopPosZ(8, 88))
+	ITEM(Switch, align, SetLabel(t_("Left\nCenter\nRight\nJustify")).LeftPosZ(16, 84).TopPosZ(24, 68))
+	ITEM(LabelBox, dv___2, SetLabel(t_("Spacing")).LeftPosZ(116, 176).TopPosZ(8, 88))
+	ITEM(Label, dv___3, SetLabel(t_("Before")).LeftPosZ(128, 88).TopPosZ(24, 19))
+	ITEM(UnitEdit, before, LeftPosZ(216, 68).TopPosZ(24, 19))
+	ITEM(Label, dv___5, SetLabel(t_("After")).LeftPosZ(128, 88).TopPosZ(48, 19))
+	ITEM(UnitEdit, after, LeftPosZ(216, 68).TopPosZ(48, 19))
+	ITEM(Label, dv___7, SetLabel(t_("Line spacing")).LeftPosZ(128, 88).TopPosZ(72, 19))
+	ITEM(DropList, linespacing, LeftPosZ(216, 68).TopPosZ(72, 19))
+	ITEM(LabelBox, dv___9, SetLabel(t_("Text flow")).LeftPosZ(300, 180).TopPosZ(8, 88))
+	ITEM(Option, page, SetLabel(t_("Break page before")).LeftPosZ(308, 164).TopPosZ(24, 16))
+	ITEM(Option, keep, SetLabel(t_("Keep together")).LeftPosZ(308, 164).TopPosZ(40, 16))
+	ITEM(Option, keepnext, SetLabel(t_("Keep with next")).LeftPosZ(308, 164).TopPosZ(56, 16))
+	ITEM(Option, orphan, SetLabel(t_("Allow orphans")).LeftPosZ(308, 164).TopPosZ(72, 16))
+	ITEM(LabelBox, dv___14, SetLabel(t_("Indentation")).LeftPosZ(8, 176).TopPosZ(104, 124))
+	ITEM(Label, dv___15, SetLabel(t_("Left margin")).LeftPosZ(16, 88).TopPosZ(124, 19))
+	ITEM(UnitEdit, lm, LeftPosZ(108, 68).TopPosZ(124, 19))
+	ITEM(Label, dv___17, SetLabel(t_("ParaLayout_rm_1_SetLabel\aRight margin")).LeftPosZ(16, 88).TopPosZ(148, 19))
+	ITEM(UnitEdit, rm, LeftPosZ(108, 68).TopPosZ(148, 19))
+	ITEM(Label, dv___19, SetLabel(t_("First line")).LeftPosZ(16, 88).TopPosZ(172, 19))
+	ITEM(UnitEdit, indent, LeftPosZ(108, 68).TopPosZ(172, 19))
+	ITEM(Label, dv___21, SetLabel(t_("Bullet")).LeftPosZ(16, 104).TopPosZ(196, 24))
+	ITEM(DropList, bullet, LeftPosZ(124, 52).TopPosZ(196, 24))
+	ITEM(LabelBox, dv___23, SetLabel(t_("Tabs")).LeftPosZ(192, 288).TopPosZ(104, 124))
+	ITEM(ArrayCtrl, tabs, AutoHideSb(true).LeftPosZ(200, 272).TopPosZ(120, 72))
+	ITEM(Label, dv___25, SetLabel(t_("Default tab size")).LeftPosZ(200, 196).TopPosZ(200, 20))
+	ITEM(UnitEdit, tabsize, LeftPosZ(404, 68).TopPosZ(200, 19))
+	ITEM(LabelBox, dv___27, SetLabel(t_("Numbering")).LeftPosZ(8, 472).TopPosZ(236, 76))
+	ITEM(Label, dv___28, SetLabel(t_("Before number")).LeftPosZ(16, 100).TopPosZ(252, 20))
+	ITEM(EditString, before_number, LeftPosZ(116, 72).TopPosZ(252, 19))
+	ITEM(Label, dv___30, SetLabel(t_("After number")).LeftPosZ(208, 100).TopPosZ(252, 20))
+	ITEM(EditString, after_number, LeftPosZ(308, 72).TopPosZ(252, 19))
+	ITEM(Option, reset_number, SetLabel(t_("Reset")).LeftPosZ(400, 72).TopPosZ(252, 20))
+	UNTYPED(n[0], LeftPosZ(16, 54).TopPosZ(284, 19))
+	UNTYPED(n[1], LeftPosZ(72, 54).TopPosZ(284, 19))
+	UNTYPED(n[2], LeftPosZ(128, 54).TopPosZ(284, 19))
+	UNTYPED(n[3], LeftPosZ(184, 54).TopPosZ(284, 19))
+	UNTYPED(n[4], LeftPosZ(240, 54).TopPosZ(284, 19))
+	UNTYPED(n[5], LeftPosZ(296, 54).TopPosZ(284, 19))
+	UNTYPED(n[6], LeftPosZ(352, 54).TopPosZ(284, 19))
+	UNTYPED(n[7], LeftPosZ(408, 54).TopPosZ(284, 19))
+END_LAYOUT
+
+LAYOUT(UnitLayout, 244, 144)
+	ITEM(LabelBox, dv___0, SetLabel(t_("Units")).LeftPosZ(8, 228).TopPosZ(4, 40))
+	ITEM(Switch, unit, SetLabel(t_("dot\npoint\ninch\nmm\ncm")).LeftPosZ(16, 216).TopPosZ(20, 16))
+	ITEM(Label, dv___2, SetLabel(t_("Reveal codes")).LeftPosZ(12, 76).TopPosZ(55, 13))
+	ITEM(ColorPusher, showcodes, LeftPosZ(92, 144).TopPosZ(52, 19))
+	ITEM(Label, dv___4, SetLabel(t_("Zoom")).LeftPosZ(12, 76).TopPosZ(80, 19))
+	ITEM(DropList, zoom, LeftPosZ(92, 144).TopPosZ(80, 19))
+	ITEM(Button, ok, SetLabel(t_("OK")).LeftPosZ(104, 64).TopPosZ(112, 24))
+	ITEM(Button, cancel, SetLabel(t_("Cancel")).LeftPosZ(172, 64).TopPosZ(112, 24))
+END_LAYOUT
+
+LAYOUT(SetStyleLayout, 216, 280)
+	ITEM(ArrayCtrl, style, AutoHideSb(true).LeftPosZ(8, 200).TopPosZ(8, 232))
+	ITEM(Button, newstyle, SetLabel(t_("New")).LeftPosZ(8, 64).TopPosZ(248, 24))
+	ITEM(Button, ok, SetLabel(t_("OK")).LeftPosZ(76, 64).TopPosZ(248, 24))
+	ITEM(Button, cancel, SetLabel(t_("Cancel")).LeftPosZ(144, 64).TopPosZ(248, 24))
+END_LAYOUT
+
+LAYOUT(ObjectSizeLayout, 290, 102)
+	ITEM(Label, dv___0, SetLabel(t_("Wi&dth:")).LeftPosZ(4, 54).TopPosZ(4, 19))
+	ITEM(UnitEdit, width, LeftPosZ(58, 80).TopPosZ(4, 19))
+	ITEM(Label, dv___2, SetLabel(t_("H&eight:")).LeftPosZ(148, 58).TopPosZ(4, 19))
+	ITEM(UnitEdit, height, LeftPosZ(206, 80).TopPosZ(4, 19))
+	ITEM(Label, dv___4, SetLabel(t_("&Width (%):")).LeftPosZ(4, 54).TopPosZ(26, 19))
+	ITEM(EditDoubleNotNullSpin, widthp, LeftPosZ(58, 80).TopPosZ(26, 19))
+	ITEM(Label, dv___6, SetLabel(t_("Height (%):")).LeftPosZ(148, 58).TopPosZ(26, 19))
+	ITEM(EditDoubleNotNullSpin, heightp, LeftPosZ(206, 80).TopPosZ(26, 19))
+	ITEM(Label, dv___8, SetLabel(t_("&Descent:")).LeftPosZ(148, 58).TopPosZ(48, 19))
+	ITEM(UnitEdit, ydelta, LeftPosZ(206, 80).TopPosZ(48, 19))
+	ITEM(Option, keepratio, SetLabel(t_("Keep aspect ratio")).LeftPosZ(4, 104).BottomPosZ(6, 18))
+	ITEM(Button, ok, SetLabel(t_("OK")).RightPosZ(78, 64).BottomPosZ(4, 24))
+	ITEM(Button, cancel, SetLabel(t_("Cancel")).RightPosZ(4, 64).BottomPosZ(4, 24))
+END_LAYOUT
+
+LAYOUT(ParaFormatLayout, 488, 352)
+	UNTYPED(para, LeftPosZ(0, 488).TopPosZ(0, 320))
+	ITEM(Button, ok, SetLabel(t_("OK")).LeftPosZ(348, 64).TopPosZ(320, 24))
+	ITEM(Button, cancel, SetLabel(t_("Cancel")).LeftPosZ(416, 64).TopPosZ(320, 24))
+END_LAYOUT
+
+LAYOUT(StylesLayout, 700, 464)
+	ITEM(ArrayCtrl, list, AutoHideSb(true).LeftPosZ(8, 196).TopPosZ(8, 448))
+	UNTYPED(para, LeftPosZ(204, 496).TopPosZ(0, 320))
+	ITEM(Label, dv___2, SetLabel(t_("Font")).LeftPosZ(224, 52).TopPosZ(348, 20))
+	ITEM(DropList, face, LeftPosZ(280, 172).TopPosZ(349, 19))
+	ITEM(Label, dv___4, SetLabel(t_("Height")).LeftPosZ(476, 104).TopPosZ(348, 20))
+	UNTYPED(height, LeftPosZ(580, 64).TopPosZ(348, 19))
+	ITEM(Option, italic, SetLabel(t_("Italic")).LeftPosZ(224, 64).TopPosZ(377, 18))
+	ITEM(Option, bold, SetLabel(t_("Bold")).LeftPosZ(224, 64).TopPosZ(396, 18))
+	ITEM(Option, underline, SetLabel(t_("Underline")).LeftPosZ(292, 76).TopPosZ(376, 18))
+	ITEM(Option, strikeout, SetLabel(t_("Strikeout")).LeftPosZ(292, 74).TopPosZ(396, 18))
+	ITEM(Option, capitals, SetLabel(t_("Capitals")).LeftPosZ(372, 88).TopPosZ(376, 18))
+	ITEM(Label, dv___11, SetLabel(t_("Ink")).LeftPosZ(476, 104).TopPosZ(372, 20))
+	ITEM(ColorPusher, ink, LeftPosZ(580, 92).TopPosZ(372, 19))
+	ITEM(Label, dv___13, SetLabel(t_("Paper")).LeftPosZ(476, 104).TopPosZ(396, 20))
+	ITEM(ColorPusher, paper, LeftPosZ(580, 92).TopPosZ(396, 19))
+	ITEM(Label, dv___15, SetLabel(t_("Style of next paragraph")).LeftPosZ(212, 152).TopPosZ(436, 20))
+	ITEM(DropList, next, LeftPosZ(368, 132).TopPosZ(436, 19))
+	ITEM(Button, ok, SetLabel(t_("OK")).LeftPosZ(560, 64).TopPosZ(432, 24))
+	ITEM(Button, cancel, SetLabel(t_("Cancel")).LeftPosZ(628, 64).TopPosZ(432, 24))
+	ITEM(LabelBox, dv___19, SetLabel(t_("Character")).LeftPosZ(212, 472).TopPosZ(328, 96))
+END_LAYOUT
+
+LAYOUT(RichFindReplaceLayout, 264, 128)
+	ITEM(Label, dv___0, SetLabel(t_("&Find:")).LeftPosZ(4, 46).TopPosZ(4, 19))
+	ITEM(WithDropChoice<EditString>, find, HSizePosZ(50, 4).TopPosZ(4, 19))
+	ITEM(Label, dv___2, SetLabel(t_("&Replace:")).LeftPosZ(4, 46).TopPosZ(28, 19))
+	ITEM(WithDropChoice<EditString>, replace, HSizePosZ(50, 4).TopPosZ(28, 19))
+	ITEM(Option, wholeword, SetLabel(t_("&Whole word")).LeftPosZ(4, 256).TopPosZ(56, 18))
+	ITEM(Option, ignorecase, SetLabel(t_("&Ignore case")).LeftPosZ(4, 256).TopPosZ(76, 18))
+	ITEM(Button, amend, SetLabel(t_("&Replace")).LeftPosZ(4, 72).BottomPosZ(4, 24))
+	ITEM(Button, ok, SetLabel(t_("Find")).RightPosZ(72, 64).BottomPosZ(4, 24))
+	ITEM(Button, cancel, SetLabel(t_("Cancel")).RightPosZ(4, 64).BottomPosZ(4, 24))
+END_LAYOUT
+
+LAYOUT(RichLanguageLayout, 148, 68)
+	ITEM(LNGCtrl, lang, LeftPosZ(8, 128).TopPosZ(8, 20))
+	ITEM(Button, ok, SetLabel(t_("OK")).LeftPosZ(8, 64).TopPosZ(36, 24))
+	ITEM(Button, cancel, SetLabel(t_("Cancel")).LeftPosZ(76, 64).TopPosZ(36, 24))
+END_LAYOUT
+
+LAYOUT(CreateTableLayout, 164, 88)
+	ITEM(Option, header, SetLabel(t_("Header")).LeftPosZ(8, 128).TopPosZ(8, 15))
+	ITEM(Label, dv___1, SetLabel(t_("Number of columns")).LeftPosZ(8, 100).TopPosZ(28, 19))
+	ITEM(EditIntSpin, columns, Min(1).Max(20).NotNull(true).LeftPosZ(112, 44).TopPosZ(28, 19))
+	ITEM(Button, ok, SetLabel(t_("OK")).LeftPosZ(24, 64).TopPosZ(56, 24))
+	ITEM(Button, cancel, SetLabel(t_("Cancel")).LeftPosZ(92, 64).TopPosZ(56, 24))
+END_LAYOUT
+
+LAYOUT(TablePropertiesLayout, 300, 168)
+	ITEM(Label, dv___0, SetLabel(t_("Before")).LeftPosZ(8, 60).TopPosZ(8, 19))
+	ITEM(UnitEdit, before, LeftPosZ(72, 68).TopPosZ(8, 19))
+	ITEM(Label, dv___2, SetLabel(t_("After")).LeftPosZ(160, 60).TopPosZ(8, 19))
+	ITEM(UnitEdit, after, LeftPosZ(224, 68).TopPosZ(8, 19))
+	ITEM(Label, dv___4, SetLabel(t_("Left margin")).LeftPosZ(8, 60).TopPosZ(32, 19))
+	ITEM(UnitEdit, lm, LeftPosZ(72, 68).TopPosZ(32, 20))
+	ITEM(Label, dv___6, SetLabel(t_("Right margin")).LeftPosZ(160, 60).TopPosZ(32, 19))
+	ITEM(UnitEdit, rm, LeftPosZ(224, 68).TopPosZ(32, 19))
+	ITEM(Label, dv___8, SetLabel(t_("Frame")).LeftPosZ(8, 60).TopPosZ(56, 19))
+	ITEM(UnitEdit, frame, LeftPosZ(72, 68).TopPosZ(56, 19))
+	ITEM(Label, dv___10, SetLabel(t_("color")).LeftPosZ(160, 56).TopPosZ(56, 19))
+	ITEM(ColorPusher, framecolor, LeftPosZ(224, 68).TopPosZ(56, 19))
+	ITEM(Label, dv___12, SetLabel(t_("Grid")).LeftPosZ(8, 60).TopPosZ(80, 19))
+	ITEM(UnitEdit, grid, LeftPosZ(72, 68).TopPosZ(80, 19))
+	ITEM(Label, dv___14, SetLabel(t_("color")).LeftPosZ(160, 56).TopPosZ(80, 19))
+	ITEM(ColorPusher, gridcolor, LeftPosZ(224, 68).TopPosZ(80, 19))
+	ITEM(Option, equalize, SetLabel(t_("Equalize")).LeftPosZ(8, 64).TopPosZ(108, 20))
+	ITEM(EditString, ratios, LeftPosZ(72, 220).TopPosZ(108, 19))
+	ITEM(Button, destroy, SetLabel(t_("Remove table")).LeftPosZ(8, 96).TopPosZ(136, 24))
+	ITEM(Button, ok, SetLabel(t_("OK")).LeftPosZ(160, 64).TopPosZ(136, 24))
+	ITEM(Button, cancel, SetLabel(t_("Cancel")).LeftPosZ(228, 64).TopPosZ(136, 24))
+END_LAYOUT
+
+LAYOUT(SplitCellLayout, 148, 92)
+	ITEM(Label, dv___0, SetLabel(t_("Horizontal")).LeftPosZ(8, 60).TopPosZ(8, 19))
+	ITEM(EditIntSpin, cx, LeftPosZ(76, 44).TopPosZ(8, 19))
+	ITEM(Label, dv___2, SetLabel(t_("Vertical")).LeftPosZ(8, 60).TopPosZ(32, 19))
+	ITEM(EditIntSpin, cy, LeftPosZ(76, 44).TopPosZ(32, 19))
+	ITEM(Button, ok, SetLabel(t_("OK")).LeftPosZ(8, 64).TopPosZ(60, 24))
+	ITEM(Button, cancel, SetLabel(t_("Cancel")).LeftPosZ(76, 64).TopPosZ(60, 24))
+END_LAYOUT
+
+LAYOUT(CellPropertiesLayout, 300, 260)
+	ITEM(LabelBox, dv___0, SetLabel(t_("Borders")).LeftPosZ(12, 132).TopPosZ(8, 116))
+	ITEM(Label, dv___1, SetLabel(t_("Left")).LeftPosZ(20, 40).TopPosZ(24, 19))
+	ITEM(UnitEdit, leftb, LeftPosZ(64, 68).TopPosZ(24, 19))
+	ITEM(Label, dv___3, SetLabel(t_("Right")).LeftPosZ(20, 40).TopPosZ(48, 19))
+	ITEM(UnitEdit, rightb, LeftPosZ(64, 68).TopPosZ(48, 19))
+	ITEM(Label, dv___5, SetLabel(t_("Top")).LeftPosZ(20, 40).TopPosZ(72, 19))
+	ITEM(UnitEdit, topb, LeftPosZ(64, 68).TopPosZ(72, 19))
+	ITEM(Label, dv___7, SetLabel(t_("Bottom")).LeftPosZ(20, 40).TopPosZ(96, 19))
+	ITEM(UnitEdit, bottomb, LeftPosZ(64, 68).TopPosZ(96, 19))
+	ITEM(LabelBox, dv___9, SetLabel(t_("Margins")).LeftPosZ(152, 144).TopPosZ(8, 116))
+	ITEM(Label, dv___10, SetLabel(t_("Left")).LeftPosZ(160, 52).TopPosZ(24, 19))
+	ITEM(UnitEdit, leftm, LeftPosZ(216, 68).TopPosZ(24, 19))
+	ITEM(Label, dv___12, SetLabel(t_("Right")).LeftPosZ(160, 52).TopPosZ(48, 19))
+	ITEM(UnitEdit, rightm, LeftPosZ(216, 68).TopPosZ(48, 19))
+	ITEM(Label, dv___14, SetLabel(t_("Top")).LeftPosZ(160, 52).TopPosZ(72, 19))
+	ITEM(UnitEdit, topm, LeftPosZ(216, 68).TopPosZ(72, 19))
+	ITEM(Label, dv___16, SetLabel(t_("Bottom")).LeftPosZ(160, 52).TopPosZ(96, 19))
+	ITEM(UnitEdit, bottomm, LeftPosZ(216, 68).TopPosZ(96, 19))
+	ITEM(LabelBox, dv___18, SetLabel(t_("Align")).LeftPosZ(12, 132).TopPosZ(128, 76))
+	ITEM(Switch, align, SetLabel(t_("Top\nCenter\nBottom")).LeftPosZ(20, 72).TopPosZ(148, 52))
+	ITEM(Label, dv___20, SetLabel(t_("Border")).LeftPosZ(156, 76).TopPosZ(156, 19))
+	ITEM(ColorPusher, border, LeftPosZ(232, 64).TopPosZ(156, 19))
+	ITEM(Label, dv___22, SetLabel(t_("Background")).LeftPosZ(156, 76).TopPosZ(180, 19))
+	ITEM(ColorPusher, color, LeftPosZ(232, 64).TopPosZ(180, 19))
+	ITEM(Label, dv___24, SetLabel(t_("Minimal height")).LeftPosZ(156, 76).TopPosZ(132, 19))
+	ITEM(UnitEdit, minheight, LeftPosZ(232, 64).TopPosZ(132, 19))
+	ITEM(Option, keep, SetLabel(t_("Keep with next line")).LeftPosZ(12, 284).TopPosZ(212, 19))
+	ITEM(Button, ok, SetLabel(t_("OK")).LeftPosZ(164, 64).TopPosZ(232, 24))
+	ITEM(Button, cancel, SetLabel(t_("Cancel")).LeftPosZ(232, 64).TopPosZ(232, 24))
+END_LAYOUT
diff --git a/uppsrc/RichEdit/RichEdit.t b/uppsrc/RichEdit/RichEdit.t
new file mode 100644
index 000000000..f162f41fa
--- /dev/null
+++ b/uppsrc/RichEdit/RichEdit.t
@@ -0,0 +1,2383 @@
+#ifdef _MSC_VER
+#pragma setlocale("C")
+#endif
+// Editor.cpp
+
+T_("Units")
+csCZ("Jednotky")
+deDE("Einheiten")
+esES("")
+fiFI("Yksiköt")
+frFR("Unités")
+huHU("Egységek")
+itIT("Unit�")
+plPL("Jednostki")
+roRO("Unități")
+ruRU("Единицы")
+srSP("Jedinice")
+trTR("Birimler")
+zhCN("单位")
+
+T_("%d%% of width")
+csCZ("%d%% šířky")
+deDE("%d%% der Breite")
+esES("")
+fiFI("%d%% leveydestä")
+frFR("%d%% de la largeur")
+huHU("%d%% szélesség")
+itIT("%d%% di larghezza")
+plPL("%d%% szerokości")
+roRO("%d%% din lățime")
+ruRU("%d%% длинны")
+srSP("%d%% širine")
+trTR("%d%%")
+zhCN("宽的%d%%")
+
+T_("None")
+csCZ("Není")
+deDE("Ohne")
+esES("")
+fiFI("Ei mitään")
+frFR("Aucun")
+huHU("Semmi")
+itIT("Nulla")
+plPL("Brak")
+roRO("Nimic")
+ruRU("Нет")
+srSP("NIšta")
+trTR("Hiçbiri")
+zhCN("无")
+
+T_("Hyperlink")
+csCZ("Propojení")
+deDE("Hyperlink")
+esES("")
+fiFI("Hyperlinkki")
+frFR("Hyperlien")
+huHU("Hiperhivatkozás")
+itIT("Collegamento")
+plPL("Odnośnik")
+roRO("Hiperlegătură")
+ruRU("Ссылка")
+srSP("Hiperveza")
+trTR("Hiperlink")
+zhCN("超级链接")
+
+T_("Paragraph label")
+csCZ("Návěští odstavce")
+deDE("Absatzmarke")
+esES("")
+fiFI("Kappaleen otsake")
+frFR("Marque de paragraphe")
+huHU("Bekezdéscímke")
+itIT("Etichetta paragrafo")
+plPL("Etykieta paragrafu")
+roRO("Etichetă paragraf")
+ruRU("Метка параграфа")
+srSP("Labela paragrafa")
+trTR("Paragraf etiketi")
+zhCN("段标")
+
+T_("Label")
+csCZ("Návěští")
+deDE("Absatz")
+esES("")
+fiFI("Merkintä")
+frFR("Marque")
+huHU("Címke")
+itIT("Etichetta")
+plPL("Etykieta")
+roRO("Etichetă")
+ruRU("Метка")
+srSP("Labela")
+trTR("Etiket")
+zhCN("标签")
+
+T_("Store as style")
+csCZ("Uložit jako styl")
+deDE("Als Stil speichern")
+esES("")
+fiFI("Tallenna tyylinä")
+frFR("Enregistrer comme style")
+huHU("Tárolás stílusként")
+itIT("Salva come stile")
+plPL("Zapisz jako styl")
+roRO("Salvează ca stil")
+ruRU("Сохранить как стиль")
+srSP("Sačuvaj kao stil")
+trTR("Stil olarak sakla")
+zhCN("存为类型")
+
+T_("Style manager")
+csCZ("Styly")
+deDE("Stilmanager")
+esES("")
+fiFI("Tyylimanageri")
+frFR("Gestionnaire de styles")
+huHU("Stíluskezelő")
+itIT("Manager stili")
+plPL("Menadżer styli")
+roRO("Manager de stiluri")
+ruRU("Менеджер стилей")
+srSP("Menadžer stilova")
+trTR("Stil yöneticisi")
+zhCN("类型管理器")
+
+T_("Style")
+csCZ("Styl")
+deDE("Stil")
+esES("")
+fiFI("Tyyli")
+frFR("Style")
+huHU("Stílus")
+itIT("Stile")
+plPL("Styl")
+roRO("Stil")
+ruRU("Стиль")
+srSP("Stil")
+trTR("Stil")
+zhCN("类型")
+
+T_("Font face")
+csCZ("Písmo")
+deDE("Schriftart")
+esES("")
+fiFI("Kirjasinlaji")
+frFR("Police")
+huHU("Font jelleg")
+itIT("Tipo carattere")
+plPL("Czcionka")
+roRO("Nume font")
+ruRU("Шрифт")
+srSP("Izgled fonta")
+trTR("Yazı tipi")
+zhCN("Font face")
+
+T_("Language")
+csCZ("Jazyk")
+deDE("Sprache")
+esES("")
+fiFI("Kieli")
+frFR("Langue")
+huHU("Nyelv")
+itIT("Lingua")
+plPL("Język")
+roRO("Limbă")
+ruRU("Язык")
+srSP("Jezik")
+trTR("Dil")
+zhCN("语言")
+
+T_("Font height")
+csCZ("Výška písma")
+deDE("Schriftgrad")
+esES("")
+fiFI("Kirjasinkorkeus")
+frFR("Taille de police")
+huHU("Font magasság")
+itIT("Altezza carattere")
+plPL("Wysokość czcionki")
+roRO("Înalțime font")
+ruRU("Высота шрифта")
+srSP("Visina fonta")
+trTR("Yazı tipi boyutu")
+zhCN("字体高度")
+
+T_("Index entry")
+csCZ("Resjtříkový odkaz")
+deDE("Indexeintrag")
+esES("")
+fiFI("Hakusana")
+frFR("Marque l'index")
+huHU("Belépés mutató")
+itIT("")
+plPL("Indeks")
+roRO("Index entitate")
+ruRU("Точка входа")
+srSP("Indeks ulaza")
+trTR("Dizin girdisi")
+zhCN("索引项")
+
+T_("Go to label")
+csCZ("Přejít na návěští")
+deDE("Gehe zu Marke")
+esES("")
+fiFI("Siirry merkintään")
+frFR("Aller à la marque")
+huHU("Ugrás a címkéhez")
+itIT("Vai ad etichetta")
+plPL("Idź do etykiety")
+roRO("Salt la eticheta")
+ruRU("Перейти к метке")
+srSP("Idi na labelu")
+trTR("Etikete git")
+zhCN("转到标签")
+
+T_("Go to index entry")
+csCZ("Přejít na rejstříkový odkaz")
+deDE("Gehe zu Indexeintrag")
+esES("")
+fiFI("Siirry hakusanaan")
+frFR("Aller à la marque d'index")
+huHU("Ugrás a belépés mutatóhoz")
+itIT("")
+plPL("Przejdź do indeksu")
+roRO("Salt la index entitate")
+ruRU("Перейти к точке входа")
+srSP("Idi na indeks ulaza")
+trTR("Dizin girdisine git")
+zhCN("转到索引项")
+
+T_("Text color")
+csCZ("Barva textu")
+deDE("Textfarbe")
+esES("")
+fiFI("Tekstin väri")
+frFR("Couleur du texte")
+huHU("Szövegszín")
+itIT("Colore testo")
+plPL("Kolor tekstu")
+roRO("Culoare text")
+ruRU("Цвет текста")
+srSP("Boja teksta")
+trTR("Yazı rengi")
+zhCN("文本颜色")
+
+T_("Background color")
+csCZ("Barva pozadí")
+deDE("Hintergrundfarbe")
+esES("")
+fiFI("Taustaväri")
+frFR("Couleur d'arrière plan")
+huHU("Háttérszín")
+itIT("Colore sfondo")
+plPL("Kolor tła")
+roRO("Culoare fundal")
+ruRU("Цвет фона")
+srSP("Pozadinska boja")
+trTR("Arkaplan rengi")
+zhCN("背景颜色")
+
+T_("Find / Replace")
+csCZ("Vyhledat / Nahradit")
+deDE("Suchen / Ersetzen")
+esES("")
+fiFI("Etsi / Korvaa")
+frFR("Rechercher / Remplacer")
+huHU("Keresés / Csere")
+itIT("Trova / Sostituisci")
+plPL("Znajdź / Zamień")
+roRO("Găsește / Înlocuiește")
+ruRU("Найти / Заменить")
+srSP("Pronađi / Zameni")
+trTR("Bul / Değiştir")
+zhCN("查找/替换")
+
+
+// Mouse.cpp
+
+T_("Object position..")
+csCZ("Pozice objektu..")
+deDE("Objektposition ...")
+esES("")
+fiFI("Kohteen sijainti..")
+frFR("Position de l'objet")
+huHU("Objektum pozíció..")
+itIT("Posizione oggetto..")
+plPL("Pozycja obiektu..")
+roRO("Poziție obiect..")
+ruRU("Позиция объекта...")
+srSP("Pozicija objekta..")
+trTR("Nesne konumu...")
+zhCN("对象位置..")
+
+T_("3 pt up")
+csCZ("3 body nahoru")
+deDE("3 pt hoch")
+esES("")
+fiFI("3 pt ylös")
+frFR("3 points vers le haut")
+huHU("3 pont fel")
+itIT("3 pt su")
+plPL("3 pt w górę")
+roRO("3 pt sus")
+ruRU("на 3 pt больше")
+srSP("3 pt na gore")
+trTR("3 punto yukarı")
+zhCN("3 pt up")
+
+T_("2 pt up")
+csCZ("2 body nahoru")
+deDE("2 pt hoch")
+esES("")
+fiFI("2 pt ylös")
+frFR("2 points vers le haut")
+huHU("2 pont fel")
+itIT("2 pt su")
+plPL("2 pt w dół")
+roRO("2 pt sus")
+ruRU("на 2 pt больше")
+srSP("2 pt na gore")
+trTR("2 punto yukarı")
+zhCN("2 pt up")
+
+T_("1 pt up")
+csCZ("1 bod nahoru")
+deDE("1 pt hoch")
+esES("")
+fiFI("1 pt ylös")
+frFR("1 point vers le haut")
+huHU("1 pont fel")
+itIT("1 pt su")
+plPL("1 pt w górę")
+roRO("1 pt sus")
+ruRU("на 1 pt больше")
+srSP("1 pt na gore")
+trTR("1 punto yukarı")
+zhCN("1 pt up")
+
+T_("Baseline")
+csCZ("Základní pozice")
+deDE("Schriftlinie")
+esES("")
+fiFI("Perusviiva")
+frFR("Ligne de base")
+huHU("Alapvonal")
+itIT("Normale")
+plPL("Linia bazowa")
+roRO("Aliniat la bază")
+ruRU("Базовая линия")
+srSP("Osnovna linija")
+trTR("Taban çizgisi")
+zhCN("基线")
+
+T_("1 pt down")
+csCZ("1 bod dolů")
+deDE("1 pt runter")
+esES("")
+fiFI("1 pt alas")
+frFR("1 point vers le bas")
+huHU("1 pont le")
+itIT("1 pt gi�")
+plPL("1 pt w dół")
+roRO("1 pt jos")
+ruRU("на 1 pt меньше")
+srSP("1 pt na dole")
+trTR("1 punto aşağı")
+zhCN("1 pt down")
+
+T_("2 pt down")
+csCZ("2 body dolů")
+deDE("2 pt runter")
+esES("")
+fiFI("2 pt alas")
+frFR("2 points vers le bas")
+huHU("2 pont le")
+itIT("2 pt gi�")
+plPL("2 pt w dół")
+roRO("2 pt jos")
+ruRU("на 2 pt меньше")
+srSP("2 pt na dole")
+trTR("2 punto aşağı")
+zhCN("2 pt down")
+
+T_("3 pt down")
+csCZ("3 body dolů")
+deDE("3 pt runter")
+esES("")
+fiFI("3 pt alas")
+frFR("3 points vers le bas")
+huHU("3 pont le")
+itIT("3 pt gi�")
+plPL("3 pt w dół")
+roRO("3 pt jos")
+ruRU("на 3 pt меньше")
+srSP("3 pt na dole")
+trTR("3 punto aşağı")
+zhCN("3 pt down")
+
+T_("Add to user dictionary")
+csCZ("Přidat do uživatelského slovníku")
+deDE("Zum Benutzerwörterbuch hinzufügen")
+esES("")
+fiFI("Lisää käyttäjän sanastoon")
+frFR("Ajouter au dictionnaire utilisateur")
+huHU("Hozzáadás a felhasználó mappájához")
+itIT("Aggiungi al dizionario")
+plPL("Dodaj do słownika użytkownika")
+roRO("Adaugă la dicționarul utilizatorului")
+ruRU("Добавить в словарь пользователя")
+srSP("Dodaj u korisnički rečnik")
+trTR("Kullanıcı sözlüğüne ekle")
+zhCN("添加到用户词典")
+
+
+// Formating.cpp
+
+T_("Index Entry")
+csCZ("Rejstříkový Odkaz")
+deDE("Indexeintrag")
+esES("")
+fiFI("Hakusana")
+frFR("Marque d'index")
+huHU("Belépés mutató")
+itIT("")
+plPL("Index")
+roRO("Index entitate")
+ruRU("Точка входа")
+srSP("Indeks ulaza")
+trTR("Dizin girdisi")
+zhCN("索引项")
+
+T_("Left")
+csCZ("Vlevo")
+deDE("Links")
+esES("")
+fiFI("Vasen")
+frFR("Gauche")
+huHU("Bal")
+itIT("Sinistra")
+plPL("Do lewej")
+roRO("Stânga")
+ruRU("Влево")
+srSP("Levo")
+trTR("Sol")
+zhCN("左")
+
+T_("Right")
+csCZ("Vpravo")
+deDE("Rechts")
+esES("")
+fiFI("Oikea")
+frFR("Droite")
+huHU("Jobb")
+itIT("Destra")
+plPL("Do prawej")
+roRO("Dreapta")
+ruRU("Вправо")
+srSP("Desno")
+trTR("Sağ")
+zhCN("右")
+
+T_("Center")
+csCZ("Na střed")
+deDE("Mitte")
+esES("")
+fiFI("Keskikohta")
+frFR("Centrer")
+huHU("Közép")
+itIT("Centro")
+plPL("Wyśrodkowany")
+roRO("Centru")
+ruRU("По центру")
+srSP("Na sredini")
+trTR("Orta")
+zhCN("中")
+
+T_("No fill")
+csCZ("Bez výplně")
+deDE("Kein Füllzeichen")
+esES("")
+fiFI("Ei täyttöä")
+frFR("Ne pas remplir")
+huHU("Nincs kitöltés")
+itIT("Nessuno riempimento")
+plPL("Bez wypełnienia")
+roRO("Fără umplutură")
+ruRU("Без заливки")
+srSP("Bez ispune")
+trTR("Doldurma")
+zhCN("无填充")
+
+T_("Fill with ....")
+csCZ("Vyplnit ....")
+deDE("Füllen mit ....")
+esES("")
+fiFI("Täytä käyttäen ....")
+frFR("Remplir avec ....")
+huHU("Kitöltés ....")
+itIT("Riempi con ....")
+plPL("Wypełnij ....")
+roRO("Umple cu ....")
+ruRU("Залить ....")
+srSP("Ispuni sa ....")
+trTR(".... ile doldur")
+zhCN("填充为 ....")
+
+T_("Fill with ----")
+csCZ("Vyplnit ----")
+deDE("Füllen mit ----")
+esES("")
+fiFI("Täytä käyttäen ----")
+frFR("Remplir avec ----")
+huHU("Kitöltés ----")
+itIT("Riempi con ----")
+plPL("Wypełnij ----")
+roRO("Umple cu ----")
+ruRU("Залить ----")
+srSP("Ispuni sa ----")
+trTR("---- ile doldur")
+zhCN("填充为 ----")
+
+T_("Fill with __")
+csCZ("Vyplnit __")
+deDE("Füllen mit ____")
+esES("")
+fiFI("Täytä käyttäen __")
+frFR("Remplir avec __")
+huHU("Kitöltés __")
+itIT("Riempi con __")
+plPL("Wypełnij __")
+roRO("Umple cu __")
+ruRU("Залить __")
+srSP("Ispuni sa __")
+trTR("__ ile doldur")
+zhCN("填充为 __")
+
+T_("Remove")
+csCZ("Odstranit")
+deDE("Entfernen")
+esES("")
+fiFI("Poista")
+frFR("Eliminer")
+huHU("Eltávolítás")
+itIT("Elimina")
+plPL("Usuń")
+roRO("Înlătură")
+ruRU("Удалить")
+srSP("Uklonu")
+trTR("Kaldır")
+zhCN("删除")
+
+T_("Object position")
+csCZ("Pozice objektu")
+deDE("Objektposition")
+esES("")
+fiFI("Kohteen sijainti")
+frFR("Position de l'objet")
+huHU("Objektum pozíció")
+itIT("Posizione oggetto")
+plPL("Pozycja obiektu")
+roRO("Poziție obiect")
+ruRU("Позиция объекта")
+srSP("Pozicija objekta")
+trTR("Nesne konumu")
+zhCN("对象位置")
+
+
+// ParaFormat.cpp
+
+T_("Centered")
+csCZ("Uprostřed")
+deDE("Zentriert")
+esES("")
+fiFI("Keskitetty")
+frFR("Centré")
+huHU("Középre zárt")
+itIT("Centrato")
+plPL("Wyśrodkowany")
+roRO("Centrat")
+ruRU("Центрованный")
+srSP("Centrirano")
+trTR("Ortalanmış")
+zhCN("居中")
+
+T_("....")
+csCZ("....")
+deDE("....")
+esES("")
+fiFI("....")
+frFR("....")
+huHU("....")
+itIT("....")
+plPL("....")
+roRO("....")
+ruRU("")
+srSP("....")
+trTR("....")
+zhCN("....")
+
+T_("----")
+csCZ("----")
+deDE("----")
+esES("")
+fiFI("----")
+frFR("----")
+huHU("----")
+itIT("----")
+plPL("----")
+roRO("----")
+ruRU("")
+srSP("----")
+trTR("----")
+zhCN("----")
+
+T_("__")
+csCZ("__")
+deDE("____")
+esES("")
+fiFI("__")
+frFR("__")
+huHU("__")
+itIT("__")
+plPL("__")
+roRO("__")
+ruRU("")
+srSP("__")
+trTR("__")
+zhCN("__")
+
+T_("Tab position")
+csCZ("Pozice tabelace")
+deDE("Tabulatorposition")
+esES("")
+fiFI("Tabulaattori positio")
+frFR("Position de tabulation")
+huHU("Tabulátor pozíció")
+itIT("Posizione tabulatore")
+plPL("Pozycja")
+roRO("Poziție tab")
+ruRU("Позиция табуляции")
+srSP("Pozicija tabulatora")
+trTR("Sekme konumu")
+zhCN("Tab位置")
+
+T_("Type")
+csCZ("Typ")
+deDE("Typ")
+esES("Tipo")
+fiFI("Tyyppi")
+frFR("Type")
+huHU("Típus")
+itIT("Tipo")
+plPL("Wyrównanie")
+roRO("Tip")
+ruRU("Тип")
+srSP("Tip")
+trTR("Tip")
+zhCN("类型")
+
+T_("Fill")
+csCZ("Výplň")
+deDE("Füllen")
+esES("")
+fiFI("Täytä")
+frFR("Remplir")
+huHU("Kitöltés")
+itIT("Riempi")
+plPL("Wypełnienie")
+roRO("Umplutură")
+ruRU("Заливка")
+srSP("Ispuni")
+trTR("Doldur")
+zhCN("填充")
+
+T_("Paragraph format")
+csCZ("Formát odstavce")
+deDE("Absatzformat")
+esES("")
+fiFI("Kappaleformaatti")
+frFR("Format de paragraphe")
+huHU("Bekezdésformátum")
+itIT("Formato paragrafo")
+plPL("Format paragrafu")
+roRO("Format paragraf")
+ruRU("Формат параграфа")
+srSP("Fromat paragrafa")
+trTR("Paragraf düzeni")
+zhCN("段格式")
+
+T_("Set style")
+csCZ("Nastavit styl")
+deDE("Stil einstellen")
+esES("")
+fiFI("Aseta tyyli")
+frFR("Utiliser le style")
+huHU("Stílus beállítása")
+itIT("Imposta stile")
+plPL("Ustaw styl")
+roRO("Setează stil")
+ruRU("Установить стиль")
+srSP("Postavi stil")
+trTR("Stili seç")
+zhCN("设置类型")
+
+T_("New style no. %d")
+csCZ("Nový styl č. %d")
+deDE("Neuer Stil Nr. %d")
+esES("")
+fiFI("Uusi tyyli nro %d")
+frFR("Nouveau style n° %d")
+huHU("Új stílus szám %d")
+itIT("Nuovo stile no. %d")
+plPL("Nowy styl numer %d")
+roRO("Stil nou nr. %d")
+ruRU("Новый стиль номер %d")
+srSP("Novi stil br. %d")
+trTR("Yeni stil no. %d")
+zhCN("新类型号%d")
+
+T_("Create new style..")
+csCZ("Vytvořit nový styl..")
+deDE("Neuen Stil erstellen ...")
+esES("")
+fiFI("Luo uusi tyyli...")
+frFR("Créer un nouveau style..")
+huHU("Új stílus létrehozása")
+itIT("Crea nuovo stile..")
+plPL("Utwórz nowy styl..")
+roRO("Crează stil nou..")
+ruRU("Создать новый стиль..")
+srSP("Napravi novi stil..")
+trTR("Yeni stil oluştur...")
+zhCN("创建新类型")
+
+T_("Remove style")
+csCZ("Odstranit styl")
+deDE("Stil entfernen")
+esES("")
+fiFI("Poista tyyli")
+frFR("Supprimer le style")
+huHU("Stílus eltávolítása")
+itIT("Rimuovi stile")
+plPL("Usuń styl")
+roRO("Șterge stil")
+ruRU("Удалить стиль")
+srSP("Ukloni stil")
+trTR("Stili sil")
+zhCN("删除类型")
+
+T_("Rename..")
+csCZ("Přejmenovat..")
+deDE("Umbenennen ...")
+esES("")
+fiFI("Nimeä uudelleen...")
+frFR("Renommer..")
+huHU("Átnevezés")
+itIT("Rinomina..")
+plPL("Zmień nazwę..")
+roRO("Redenumește..")
+ruRU("Переименовать..")
+srSP("Preimenuj..")
+trTR("Yeniden adlandır...")
+zhCN("重命名")
+
+T_("Styles")
+csCZ("Styly")
+deDE("Stile")
+esES("")
+fiFI("Tyylit")
+frFR("Styles")
+huHU("Stílusok")
+itIT("Stili")
+plPL("Style")
+roRO("Stiluri")
+ruRU("Стили")
+srSP("Stilovi")
+trTR("Stiller")
+zhCN("类型")
+
+
+// Table.cpp
+
+T_("Insert table")
+csCZ("Vložit tabulku")
+deDE("Tabelle einfügen")
+esES("")
+fiFI("Lisää taulukko")
+frFR("Insérer un tableau")
+huHU("Táblázat beszúrása")
+itIT("Inserisci tbella")
+plPL("Wstaw tabelę")
+roRO("Inserează tabel")
+ruRU("Вставить таблицу")
+srSP("Ubaci tabelu")
+trTR("Araya tablo ekle")
+zhCN("插入表格")
+
+T_("Table properties")
+csCZ("Vlastnosti tabulky")
+deDE("Tabelleneigenschaften")
+esES("")
+fiFI("Taulukon ominaisuudet")
+frFR("Propriétés du tableau")
+huHU("Táblázat tulajdonságok")
+itIT("Propriet� tabella")
+plPL("Właściwości tabeli")
+roRO("Proprietăți tabel")
+ruRU("Свойства таблицы")
+srSP("Svojstva tabele")
+trTR("Tablo özellikleri")
+zhCN("表格属性")
+
+T_("Split cell")
+csCZ("Rozdělit buňku")
+deDE("Zelle teilen")
+esES("")
+fiFI("Jaa solu")
+frFR("Diviser la cellule")
+huHU("Mező felosztása")
+itIT("Dividi cella")
+plPL("Podziel komórkę")
+roRO("Subdivide celulă")
+ruRU("Разбить ячейки")
+srSP("Podeli ćeliju")
+trTR("Hücreyi böl")
+zhCN("拆分单元格")
+
+T_("Cell properties")
+csCZ("Vlastnosti buňky")
+deDE("Zelleigenschaften")
+esES("")
+fiFI("Solun ominaisuudet")
+frFR("Propriétés de la cellule")
+huHU("Mező tulajdonságok")
+itIT("Propriet� cella")
+plPL("Właściwości komórki")
+roRO("Proprietăți celulă")
+ruRU("Свойства ячейки")
+srSP("Svojstva ćelije")
+trTR("Hücre özellikleri")
+zhCN("单元格属性")
+
+
+// Find.cpp
+
+T_("Replace")
+csCZ("Nahradit")
+deDE("Ersetzen")
+esES("")
+fiFI("Korvaa")
+frFR("Remplacer")
+huHU("Csere")
+itIT("Sostituisci")
+plPL("Zamień")
+roRO("Înlocuiește")
+ruRU("Заменить")
+srSP("Zameni")
+trTR("Değiştir")
+zhCN("替换")
+
+T_("Replace in selection")
+csCZ("Nahradit ve výběru")
+deDE("In der Auswahl ersetzen")
+esES("")
+fiFI("Korvaa valinnan sisällä")
+frFR("Remplacer dans la sélection")
+huHU("Csere a kijelölésben")
+itIT("Sostituisci nella selezione")
+plPL("Zamień w selekcji")
+roRO("Înlocuiește în selecție")
+ruRU("Заменить в выделении")
+srSP("Zameni u izboru")
+trTR("Seçili olan içinde değiştir")
+zhCN("替换选择")
+
+T_("Find")
+csCZ("Vyhledat")
+deDE("Suchen")
+esES("")
+fiFI("Etsi")
+frFR("Rechercher")
+huHU("Keresés")
+itIT("Trova")
+plPL("Znajdź")
+roRO("Găsește")
+ruRU("Найти")
+srSP("Pronađi")
+trTR("Bul")
+zhCN("查找")
+
+
+// Tool.cpp
+
+T_("Bold")
+csCZ("Tučně")
+deDE("Fett")
+esES("")
+fiFI("Lihavointi")
+frFR("Gras")
+huHU("Félkövér")
+itIT("Grassetto")
+plPL("Pogrubienie")
+roRO("Aldine")
+ruRU("Полужирный")
+srSP("Masno")
+trTR("Kalın")
+zhCN("粗体")
+
+T_("Italic")
+csCZ("Kurzíva")
+deDE("Kursiv")
+esES("")
+fiFI("Kursivointi")
+frFR("Italique")
+huHU("Dőlt")
+itIT("Corsivo")
+plPL("Kursywa")
+roRO("Înclinat")
+ruRU("Наклонный")
+srSP("Kurziv")
+trTR("İtalik")
+zhCN("斜体")
+
+T_("Underline")
+csCZ("Podtržené")
+deDE("Unterstrichen")
+esES("")
+fiFI("Alleviivaus")
+frFR("Souligné")
+huHU("Aláhúzott")
+itIT("Sottolineato")
+plPL("Podkreślenie")
+roRO("Subliniat")
+ruRU("Подчёркнутый")
+srSP("Podcrtano")
+trTR("Altı çizili")
+zhCN("下划线")
+
+T_("Strikeout")
+csCZ("Přeškrtnuté")
+deDE("Durchgestrichen")
+esES("")
+fiFI("Yliviivaus")
+frFR("Barré")
+huHU("Áthúzott")
+itIT("Sbarrato")
+plPL("Przekreślenie")
+roRO("Tăiat")
+ruRU("Зачёркнутый")
+srSP("Precrtano")
+trTR("Üstü çizili")
+zhCN("Strikeout")
+
+T_("Capitals")
+csCZ("Kapitálky")
+deDE("Kapitälchen")
+esES("")
+fiFI("Isot kirjaimet")
+frFR("Majuscules")
+huHU("Nagybetűk")
+itIT("Maiuscoletto")
+plPL("Kapitaliki")
+roRO("Majuscule")
+ruRU("Прописными")
+srSP("Velika slova")
+trTR("Büyük harfler")
+zhCN("大写")
+
+T_("Superscript")
+csCZ("Horní index")
+deDE("Hochgestellt")
+esES("")
+fiFI("Yläindeksi")
+frFR("Exposant")
+huHU("Felső index")
+itIT("Apice")
+plPL("Indeks górny")
+roRO("Superscript")
+ruRU("Надстрочный")
+srSP("Gornji indeks")
+trTR("Üstyazı")
+zhCN("上标")
+
+T_("Subscript")
+csCZ("Dolní index")
+deDE("Tiefgestellt")
+esES("")
+fiFI("Alaindeksi")
+frFR("Indice")
+huHU("Alsó index")
+itIT("Pedice")
+plPL("Indeks dolny")
+roRO("Subscript")
+ruRU("Подстрочный")
+srSP("Donji indeks")
+trTR("Altyazı")
+zhCN("下标")
+
+T_("Show spelling errors")
+csCZ("Ukazovat pravopisné chyby")
+deDE("Rechtschreibfehler anzeigen")
+esES("")
+fiFI("Näytä tavutusvirheet")
+frFR("Montrer les erreurs de correction")
+huHU("Helyesírásellenőrzés")
+itIT("Visualizza errori")
+plPL("Pokaż błędy pisowni")
+roRO("Arată erorile de ortografie")
+ruRU("Показать ошибки орфографии")
+srSP("Prikaži jezičke greške")
+trTR("İmla hatalarını göster")
+zhCN("显示拼写错误")
+
+T_("Justify")
+csCZ("Zarovnat do bloku")
+deDE("Blocksatz")
+esES("")
+fiFI("Rivintasaus")
+frFR("Justifier")
+huHU("Margószabályozás")
+itIT("Giustificato")
+plPL("Wyjustuj")
+roRO("Aliniat la margini")
+ruRU("По ширине")
+srSP("Poravnaj")
+trTR("Yasla")
+zhCN("调整")
+
+T_("Round bullet")
+csCZ("Kulatá zarážka")
+deDE("Rundes Aufzählungszeichen")
+esES("")
+fiFI("Pyöreä ranskalainen viiva")
+frFR("Puce ronde")
+huHU("Korong")
+itIT("Punto elenco circolare")
+plPL("Okrągłe wypunktowanie")
+roRO("Marcaj rotund")
+ruRU("Круглые списочные маркеры")
+srSP("Okruglo označavanje")
+trTR("Yuvarlak işaret imi")
+zhCN("Round bullet")
+
+T_("White round bullet")
+csCZ("Bíla kruhová odrážka")
+deDE("Weißes rundes Aufzählungszeichen")
+esES("")
+fiFI("Valkoinen pyöreä ranskalainen viiva")
+frFR("Puce ronde blanche")
+huHU("Fehér korong")
+itIT("Punto elenco circolare bianco")
+plPL("Białe, okrągłe wypunktowanie")
+roRO("Marcaj rotund alb")
+ruRU("Белые круглые списочные маркеры")
+srSP("Belo okruglo označavanje")
+trTR("Beyaz yuvarlak işaret imi")
+zhCN("White round bullet")
+
+T_("Box bullet")
+csCZ("Čtvercová odrážka")
+deDE("Quadratisches Aufzählungszeichen")
+esES("")
+fiFI("Neliö ranskalainen viiva")
+frFR("Puce boîte")
+huHU("Négyzet")
+itIT("Punto elenco quadrato")
+plPL("Kwadratowe wypunktowanie")
+roRO("Marcaj pătrat")
+ruRU("Квадратные списочные маркеры")
+srSP("Kvadratno označvanje")
+trTR("Kutu işaret imi")
+zhCN("Box bullet")
+
+T_("White box bullet")
+csCZ("Bílá čtvercová odrážka")
+deDE("Weißes quadratisches Aufzählungszeichen")
+esES("")
+fiFI("Valkoinen neliö ranskalainen viiva")
+frFR("Puce boîte blanche")
+huHU("Fehér négyzet")
+itIT("Punto elenco quadrato bianco")
+plPL("Białe kwadratowe wypunktowanie")
+roRO("Marcaj pătrat alb")
+ruRU("Белые квадратные списочные маркеры")
+srSP("Belo kvadratno označvanje")
+trTR("Beyaz kutu işaret imi")
+zhCN("White box bullet")
+
+T_("Text bullet")
+csCZ("Textová odrážka")
+deDE("Textaufzählungszeichen")
+esES("")
+fiFI("Teksti ranskalainen viiva")
+frFR("Puce texte")
+huHU("Szöveg korong")
+itIT("Punto elenco carattere")
+plPL("Tekstowe wypunktowanie")
+roRO("Marcaj cu text")
+ruRU("Текстовые списочные маркеры")
+srSP("Tekst označavanje")
+trTR("Metin işaret imi")
+zhCN("Text bullet")
+
+T_("Paragraph format..")
+csCZ("Formát odstavce")
+deDE("Absatzformat ...")
+esES("")
+fiFI("Kappaleformaatti...")
+frFR("Format de paragraphe..")
+huHU("Bekezdés formátum..")
+itIT("Formato paragrafo..")
+plPL("Format paragrafu..")
+roRO("Format paragraf..")
+ruRU("Формат параграфа")
+srSP("Format paragrafa..")
+trTR("Paragraf formatı...")
+zhCN("段格式")
+
+T_("To single paragraph")
+csCZ("Do jednoho odstavce")
+deDE("Absätze zusammenfassen")
+esES("")
+fiFI("Yksittäiseen kappaleeseen")
+frFR("Fusionner en un paragraphe")
+huHU("Egyszerű bekezdéshez")
+itIT("Paragrafo singolo")
+plPL("Do pojedynczego paragrafu")
+roRO("La un singur paragraf")
+ruRU("В один параграф")
+srSP("Ka jednom paragrafu")
+trTR("Tek paragraf haline getir")
+zhCN("转为单段")
+
+T_("Undo")
+csCZ("Zpět")
+deDE("Rückgängig")
+esES("Deshacer")
+fiFI("Kumoa")
+frFR("Annuler")
+huHU("Visszavonás")
+itIT("Annulla")
+plPL("Cofnij")
+roRO("Anulează ultima operație")
+ruRU("Отменить")
+srSP("Undo")
+trTR("Geri Al")
+zhCN("撤销")
+
+T_("Redo")
+csCZ("Znovu")
+deDE("Wiederherstellen")
+esES("Rehacer")
+fiFI("Toista")
+frFR("Refaire")
+huHU("Újra végrehajtás")
+itIT("Ripeti")
+plPL("Powtórz")
+roRO("Refă ultima operație")
+ruRU("Повторить")
+srSP("Redo")
+trTR("Yinele")
+zhCN("重做")
+
+T_("Cut")
+csCZ("Vyjmout")
+deDE("Ausschneiden")
+esES("Cortar")
+fiFI("Leikkaa")
+frFR("Couper")
+huHU("Kivágás")
+itIT("Taglia")
+plPL("Wytnij")
+roRO("Decupează")
+ruRU("Вырезать")
+srSP("Iseci")
+trTR("Kes")
+zhCN("剪切")
+
+T_("Copy")
+csCZ("Kopírovat")
+deDE("Kopieren")
+esES("Copiar")
+fiFI("Kopioi")
+frFR("Copier")
+huHU("Másolás")
+itIT("Copia")
+plPL("Kopiuj")
+roRO("Copiază")
+ruRU("Копировать")
+srSP("Kopiraj")
+trTR("Kopyala")
+zhCN("复制")
+
+T_("Paste")
+csCZ("Vložit")
+deDE("Einfügen")
+esES("Pegar")
+fiFI("Liitä")
+frFR("Coller")
+huHU("Beillesztés")
+itIT("Incolla")
+plPL("Wklej")
+roRO("Lipește")
+ruRU("Вставить")
+srSP("Zalepi")
+trTR("Yapıştır")
+zhCN("粘贴")
+
+T_("Print")
+csCZ("Tisk")
+deDE("Drucken")
+esES("Imprimir")
+fiFI("Tulosta")
+frFR("Imprimer")
+huHU("Nyomtatás")
+itIT("Stampa")
+plPL("Drukuj")
+roRO("Listează")
+ruRU("Печать")
+srSP("Štampa")
+trTR("Yazdır")
+zhCN("打印")
+
+T_("Find/Replace")
+csCZ("Vyhledat/Nahradit")
+deDE("Suchen/Ersetzen")
+esES("")
+fiFI("Etsi/Korvaa")
+frFR("Chercher/Remplacer")
+huHU("Keresés/Csere")
+itIT("Trova/Sostituisci")
+plPL("Znajdź/Zamień")
+roRO("Găsire/Înlocuire")
+ruRU("Найти/Заменить")
+srSP("Pronađi/Zameni")
+trTR("Bul/Değiştir")
+zhCN("查找/替换")
+
+T_("Insert table..")
+csCZ("Vložit tabulku..")
+deDE("Tabelle einfügen ...")
+esES("")
+fiFI("Lisää taulukko...")
+frFR("Insérer un tableau..")
+huHU("Táblázat beszútása")
+itIT("Inserisci tabella..")
+plPL("Wstaw tabelę..")
+roRO("Inserează tabel..")
+ruRU("Вставить таблицу")
+srSP("Ubaci tabelu..")
+trTR("Araya tablo ekle...")
+zhCN("插入表格..")
+
+T_("Table properties..")
+csCZ("Vlastnosti tabulky..")
+deDE("Tabelleneigenschaften ...")
+esES("")
+fiFI("Taulukon ominaisuudet...")
+frFR("Propriétés du tableau..")
+huHU("Táblázat tulajdonságai")
+itIT("Propriet� tabella..")
+plPL("Właściwości tabeli..")
+roRO("Proprietăți tabel..")
+ruRU("Свойства таблицы")
+srSP("Svojstva tabele..")
+trTR("Tablo özellikleri...")
+zhCN("表格属性..")
+
+T_("Insert row")
+csCZ("Vložit řádek")
+deDE("Zeile einfügen")
+esES("")
+fiFI("Lisää rivi")
+frFR("Insérer une ligne")
+huHU("Sor beszúrása")
+itIT("Inserisci riga")
+plPL("Wstaw wiersz")
+roRO("Inserează linie")
+ruRU("Вставить ряд")
+srSP("Ubaci red")
+trTR("Araya satır ekle")
+zhCN("插入行")
+
+T_("Remove row")
+csCZ("Odstranit řádek")
+deDE("Zeile entfernen")
+esES("")
+fiFI("Poista rivi")
+frFR("Supprimer la ligne")
+huHU("Sor törlése")
+itIT("Rimuovi riga")
+plPL("Usuń wiersz")
+roRO("Șterge linie")
+ruRU("Удалить ряд")
+srSP("Ukloni red")
+trTR("Satır sil")
+zhCN("删除行")
+
+T_("Insert column")
+csCZ("Vložit sloupec")
+deDE("Spalte einfügen")
+esES("")
+fiFI("Lisää sarake")
+frFR("Insérer une colonne")
+huHU("Oszlop beszúrása")
+itIT("Inserisci colonna")
+plPL("Wstaw kolumnę")
+roRO("Inserează coloană")
+ruRU("Вставить колонку")
+srSP("Ubaci kolonu")
+trTR("Araya sütun ekle")
+zhCN("插入列")
+
+T_("Remove column")
+csCZ("Odstranit sloupec")
+deDE("Spalte entfernen")
+esES("")
+fiFI("Poista sarake")
+frFR("Supprimer la colonne")
+huHU("Oszlop törlése")
+itIT("Rimuovi colonna")
+plPL("Usuń kolumnę")
+roRO("Șterge coloană")
+ruRU("Удалить колонку")
+srSP("Ukloni kolonu")
+trTR("Sütun sil")
+zhCN("删除列")
+
+T_("Join cells")
+csCZ("Spojit buňky")
+deDE("Zellen verbinden")
+esES("")
+fiFI("Yhdistä solut")
+frFR("Fusionner les cellules")
+huHU("Mezők egyesítése")
+itIT("Unisci celle")
+plPL("Scal komórki")
+roRO("Unește celule")
+ruRU("Объединить ячейки")
+srSP("Spoji ćelije")
+trTR("Hücreleri birleştir")
+zhCN("合并单元格")
+
+T_("Split cell..")
+csCZ("Rozdělit buňku")
+deDE("Zelle teilen ...")
+esES("")
+fiFI("Halkaise solu...")
+frFR("Diviser la cellule..")
+huHU("Mező felosztása..")
+itIT("Dividi cella..")
+plPL("Podziel komórkę..")
+roRO("Subdivide celule..")
+ruRU("Разбить ячейки...")
+srSP("Podeli ćeliju..")
+trTR("Hücreyi böl...")
+zhCN("拆分单元格")
+
+T_("Cell properties..")
+csCZ("Vlastnosti buňky..")
+deDE("Zelleigenschaften ...")
+esES("")
+fiFI("Solun ominaisuudet")
+frFR("Propriétés de la cellule")
+huHU("Mező tulajdonságok..")
+itIT("Propriet� celle..")
+plPL("Właściwości komórki")
+roRO("Proprietăți celulă..")
+ruRU("Свойства ячейки...")
+srSP("Svojstva ćelije..")
+trTR("Hücre özellikleri...")
+zhCN("单元格属性")
+
+
+// RichEdit.lay
+
+T_("Alignment")
+csCZ("&Zarovnat:")
+deDE("Ausrichtung")
+esES("")
+fiFI("Kohdistus")
+frFR("Alignement")
+huHU("Igazítás")
+itIT("Allineamento")
+plPL("Wyrównanie")
+roRO("Aliniament")
+ruRU("Выравнивание")
+srSP("Poravnanje:")
+trTR("Hizalama:")
+zhCN("对齐")
+
+T_("Left\nCenter\nRight\nJustify")
+csCZ("Vlevo\nStřed\nVpravo\nDo bloku")
+deDE("Links\nMitte\nRechts\nBlocksatz")
+esES("")
+fiFI("Vasen\nKeskitys\nOikea\nTasaus")
+frFR("Gauche\nCentrer\nDroite\nJustifier")
+huHU("Bal\nKözép\nJobb\nMargó")
+itIT("Sinistra\nCentro\nDestra\nGiustificato")
+plPL("Do lewej\nWyśrodkowane\nDo prawej\nWyjustowane")
+roRO("Stânga\nCentru\nDreapta\nAliniat la margini")
+ruRU("Влево\nПо центру\nВправо\nПо ширине")
+srSP("Levo\nPo sredini\nDesno\nporavnato")
+trTR("Sola yasla\nOrtala\nSağa yasla\nİki yana yasla")
+zhCN("左对齐\n居中\n右对齐\n两端对齐")
+
+T_("Spacing")
+csCZ("Mezery")
+deDE("Zeichenabstand")
+esES("")
+fiFI("Väli")
+frFR("")
+huHU("Térköz")
+itIT("")
+plPL("Odstęp")
+roRO("Spațiere")
+ruRU("Межсимвольное расстояние")
+srSP("")
+trTR("Aralık")
+zhCN("间隔")
+
+T_("Before")
+csCZ("Před")
+deDE("Vorher")
+esES("")
+fiFI("Ennen")
+frFR("Avant")
+huHU("Előtte")
+itIT("Prima")
+plPL("Przed")
+roRO("Înainte")
+ruRU("Перед")
+srSP("Pre")
+trTR("Önce")
+zhCN("前")
+
+T_("After")
+csCZ("Po")
+deDE("Danach")
+esES("")
+fiFI("Jälkeen")
+frFR("Après")
+huHU("Utána")
+itIT("Dopo")
+plPL("Po")
+roRO("După")
+ruRU("После")
+srSP("Posle")
+trTR("Sonra")
+zhCN("后")
+
+T_("Line spacing")
+csCZ("Řádkování")
+deDE("Zeilenabstand")
+esES("")
+fiFI("Rivinväli")
+frFR("")
+huHU("Sorköz")
+itIT("")
+plPL("Interlinia")
+roRO("Spațierea liniilor")
+ruRU("Расстояние между строками")
+srSP("")
+trTR("Satır aralığı")
+zhCN("行间隔")
+
+T_("Text flow")
+csCZ("Tok textu")
+deDE("Textfluss")
+esES("")
+fiFI("Tekstin virtaus")
+frFR("Flux du texte")
+huHU("Szöveg körbefolyatás")
+itIT("Flusso testo")
+plPL("Przepływ tekstu")
+roRO("Fluxul textului")
+ruRU("Расположение текста")
+srSP("Tok teksta")
+trTR("Metin akışı")
+zhCN("文本流")
+
+T_("Break page before")
+csCZ("&Zalomit stránku před")
+deDE("Seitenumbruch vorher")
+esES("")
+fiFI("Katkaise sivu ennen")
+frFR("Saut de page avant")
+huHU("Oldaltörés előtte")
+itIT("Precedi interruzione pagina")
+plPL("Załam stronę przed")
+roRO("Marcaj pagină nouă înainte")
+ruRU("Оборвать страницу после")
+srSP("Prelomi stranu pre")
+trTR("Önce sayfa sonu")
+zhCN("断开页前于")
+
+T_("Keep together")
+csCZ("&Svázat řádky")
+deDE("Zusammenhalten")
+esES("")
+fiFI("Pidä yhdessä")
+frFR("Garder assemblé")
+huHU("Együtt tartás")
+itIT("Mantieni assieme")
+plPL("Trzymaj razem")
+roRO("Păstrează alăturat")
+ruRU("Держать вместе")
+srSP("Drži zajedno")
+trTR("Satırları birlikte tut")
+zhCN("保持在一起")
+
+T_("Keep with next")
+csCZ("Svázat s &následujícím")
+deDE("Zusammen mit nächstem")
+esES("")
+fiFI("Pidä seuraavan kanssa")
+frFR("Assembler au suivant")
+huHU("Marad a következővel")
+itIT("Mantieni col successivo")
+plPL("Trzymaj z następną")
+roRO("Păstrează lângă următorul")
+ruRU("Придерживаться следующего")
+srSP("Drži sa sledećim")
+trTR("Sonraki ile birlikte")
+zhCN("与下一个保持")
+
+T_("Allow orphans")
+csCZ("Povolit osa&mocené řádky")
+deDE("Schusterjungen zulassen")
+esES("")
+fiFI("Salli orvot")
+frFR("Autoriser les orphelines")
+huHU("Árvák megengedése")
+itIT("Consenti isolati")
+plPL("Dopuszczaj sieroty")
+roRO("Permite izolări")
+ruRU("Разрешить висячие строки")
+srSP("Dozvoli siročiće")
+trTR("Artık satırlara izin ver")
+zhCN("Allow orphans")
+
+T_("Indentation")
+csCZ("Zarovnání")
+deDE("Einrückung")
+esES("")
+fiFI("Sisennys")
+frFR("")
+huHU("Behúzás")
+itIT("")
+plPL("Wcięcie")
+roRO("Indentare")
+ruRU("Выравнивание")
+srSP("")
+trTR("Girinti")
+zhCN("缺口")
+
+T_("Left margin")
+csCZ("Levý okraj")
+deDE("Linker Rand")
+esES("")
+fiFI("Vasen marginaali")
+frFR("Marge de gauche")
+huHU("Bal szegély")
+itIT("Margine sinistro")
+plPL("Lewy margines")
+roRO("Margine din stânga")
+ruRU("Поле слева")
+srSP("Leva margina")
+trTR("Sol boşluk")
+zhCN("左边空白")
+
+T_("ParaLayout_rm_1_SetLabel\aRight margin")
+csCZ("Pravý okraj")
+deDE("Rechter Rand")
+esES("")
+fiFI("Oikea marginaali")
+frFR("")
+huHU("Jobb szegély")
+itIT("Margine destro")
+plPL("Prawy margines")
+roRO("")
+ruRU("")
+srSP("")
+trTR("Sağ boşluk")
+zhCN("Right margin")
+
+T_("First line")
+csCZ("První řádka")
+deDE("Erste Zeile")
+esES("")
+fiFI("Ensimmäinen rivi")
+frFR("")
+huHU("Első sor")
+itIT("")
+plPL("Pierwsza linia")
+roRO("Prima linie")
+ruRU("Красная строка")
+srSP("")
+trTR("İlk satır")
+zhCN("首行")
+
+T_("Bullet")
+csCZ("Odrážka")
+deDE("Aufzählungszeichen")
+esES("")
+fiFI("Ranskalainen viiva")
+frFR("Puce")
+huHU("korong")
+itIT("Elenco puntato")
+plPL("Wypunktowanie")
+roRO("Marcaj")
+ruRU("Списочный маркер")
+srSP("Označavanje")
+trTR("Madde imi")
+zhCN("Bullet")
+
+T_("Tabs")
+csCZ("Tabelace")
+deDE("Tabulatoren")
+esES("")
+fiFI("Tabulaattorit")
+frFR("Tabulations")
+huHU("Tabulátorok")
+itIT("Tabulatori")
+plPL("Tabulatory")
+roRO("Taburi")
+ruRU("Табуляторы")
+srSP("Tabulatori")
+trTR("Sekmeler")
+zhCN("Tabs")
+
+T_("Default tab size")
+csCZ("Výchozí tabelace")
+deDE("Voreingestellte Tabulatorweite")
+esES("")
+fiFI("Tabulaattorin oletuskoko")
+frFR("Tabulation par défaut")
+huHU("Alapértelmezett tabulátorméret")
+itIT("Dimensione tabulatore predefinita")
+plPL("Domyślny rozmiar tabulacji")
+roRO("Dimensiune tab implicită")
+ruRU("Размер табуляции по умолчанию")
+srSP("Podrazumevana veličina tabulatora")
+trTR("Varsayılan sekme boyutu")
+zhCN("缺省tab大小")
+
+T_("Numbering")
+csCZ("Číslování")
+deDE("Nummerierung")
+esES("")
+fiFI("Numerointi")
+frFR("Numérotation")
+huHU("Számozás")
+itIT("Numerazione")
+plPL("Numerowanie")
+roRO("Numere")
+ruRU("Нумерование")
+srSP("Nabrajanje")
+trTR("Sayfa numaralandırma")
+zhCN("编号")
+
+T_("Before number")
+csCZ("Před číslem")
+deDE("Vor der Nummer")
+esES("")
+fiFI("Ennen numeroa")
+frFR("Nombre avant")
+huHU("Szám előtte")
+itIT("Numero prima")
+plPL("Przed numerem")
+roRO("Numar precedent")
+ruRU("Перед числом")
+srSP("Pre broja")
+trTR("Başlangıç")
+zhCN("号码前")
+
+T_("After number")
+csCZ("Po čísle")
+deDE("Nach der Nummer")
+esES("")
+fiFI("Numeron jälkeen")
+frFR("Nombre après")
+huHU("Szám utána")
+itIT("Numero successivo")
+plPL("Po numerze")
+roRO("Număr următor")
+ruRU("После числа")
+srSP("Posle broja")
+trTR("Son")
+zhCN("号码后")
+
+T_("Reset")
+csCZ("Nulovat")
+deDE("Zurücksetzen")
+esES("")
+fiFI("Resetoi")
+frFR("Réinitialiser")
+huHU("Kiinduló állapot")
+itIT("Azzera")
+plPL("Przywróć")
+roRO("Resetează")
+ruRU("Сбросить")
+srSP("Vrati")
+trTR("Sıfırla")
+zhCN("重置")
+
+T_("dot\npoint\ninch\nmm\ncm")
+csCZ("dot\nbod\npalec\nmm\ncm")
+deDE("Pixel\nPunkt\nZoll\nmm\ncm")
+esES("")
+fiFI("dot\npoint\ntuuma\nmm\ncm")
+frFR("pica\npoint\npouce\nmm\ncm")
+huHU("képpont\npont\nhüvelyk\nmm\ncm")
+itIT("dot\npunti\npollici\nmm\ncm")
+plPL("punkty\npiksele\ncale\nmm\ncm")
+roRO("")
+ruRU("точки\nпоинты\nдюймы\nмм\nсм")
+srSP("tačka\npoint\ninč\nmm\ncm")
+trTR("piksel\nnokta\ninç\nmm\ncm")
+zhCN("dot\npoint\ninch\nmm\ncm")
+
+T_("Reveal codes")
+csCZ("Pomocné znaky")
+deDE("Steuerzeichen anzeigen")
+esES("")
+fiFI("Paljasta koodit")
+frFR("Texte masqué")
+huHU("Kódok megjelenítése")
+itIT("Visualizza codici")
+plPL("Niewidoczne znaki")
+roRO("Arată coduri")
+ruRU("Показать коды")
+srSP("Pokaži kod")
+trTR("Kodları göster")
+zhCN("显示码")
+
+T_("Zoom")
+csCZ("Zmenšit")
+deDE("Zoom")
+esES("")
+fiFI("Zoom")
+frFR("Zoom")
+huHU("Nagyítás")
+itIT("Zoom")
+plPL("Powiększenie")
+roRO("Mărire")
+ruRU("Увеличить")
+srSP("Uveličaj")
+trTR("Yakınlaştır")
+zhCN("扩大")
+
+T_("OK")
+csCZ("OK")
+deDE("OK")
+esES("Aceptar")
+fiFI("OK")
+frFR("Ok")
+huHU("Rendben")
+itIT("Ok")
+plPL("OK")
+roRO("OK")
+ruRU("OK")
+srSP("OK")
+trTR("Tamam")
+zhCN("确定")
+
+T_("Cancel")
+csCZ("Storno")
+deDE("Abbrechen")
+esES("Cancelar")
+fiFI("Peruuta")
+frFR("Annuler")
+huHU("Mégsem")
+itIT("Annulla")
+plPL("Anuluj")
+roRO("Anulează")
+ruRU("Отмена")
+srSP("Otkaži")
+trTR("İptal")
+zhCN("取消")
+
+T_("New")
+csCZ("Nový")
+deDE("Neu")
+esES("")
+fiFI("Uusi")
+frFR("Nouveau")
+huHU("Új")
+itIT("Nuovo")
+plPL("Nowy")
+roRO("Nou")
+ruRU("Новый")
+srSP("Novi")
+trTR("Yeni")
+zhCN("新建")
+
+T_("Wi&dth:")
+csCZ("&Šířka")
+deDE("&Breite")
+esES("")
+fiFI("&Leveys:")
+frFR("La&rgeur :")
+huHU("&Szélesség:")
+itIT("La&rghezza:")
+plPL("Szero&kość:")
+roRO("&Lățime:")
+ruRU("&Ширина:")
+srSP("&Širina")
+trTR("Genişl&ik")
+zhCN("宽度(&d):")
+
+T_("H&eight:")
+csCZ("&Výška")
+deDE("&Höhe")
+esES("")
+fiFI("&Korkeus:")
+frFR("H&auteur :")
+huHU("&Magasság:")
+itIT("A&ltezza")
+plPL("Wysok&ość:")
+roRO("Î&nălțime:")
+ruRU("&Высота:")
+srSP("&Visina")
+trTR("&Yükseklik:")
+zhCN("高度(&e)")
+
+T_("&Width (%):")
+csCZ("Šíř&ka (%):")
+deDE("B&reite (%)")
+esES("")
+fiFI("&Leveys (%):")
+frFR("&Largeur (%) :")
+huHU("S&zélesség (%):")
+itIT("&Larghezza (%):")
+plPL("&Szerokość (%):")
+roRO("&Lățime (%):")
+ruRU("&Ширина (%):")
+srSP("&Širina (%):")
+trTR("&Genişlik (%):")
+zhCN("宽度&W(%):")
+
+T_("Height (%):")
+csCZ("Výška (%):")
+deDE("H&öhe (%)")
+esES("")
+fiFI("Korkeus (%):")
+frFR("Hauteur (%) :")
+huHU("Magasság (%):")
+itIT("Altezza (%):")
+plPL("Wysokość (%):")
+roRO("Î&nălțime (%):")
+ruRU("Высота (%):")
+srSP("&Visina (%):")
+trTR("Yükseklik (%):")
+zhCN("高度(%):")
+
+T_("&Descent:")
+csCZ("&Zanoření")
+deDE("&Unterlänge")
+esES("")
+fiFI("&Aleneva:")
+frFR("&Descente :")
+huHU("&Csökkenés:")
+itIT("&Diminuisci:")
+plPL("&Pochyłość")
+roRO("")
+ruRU("&Наклон:")
+srSP("&Nagib:")
+trTR("&Harf Kuyruğu:")
+zhCN("降序(&D):")
+
+T_("Keep aspect ratio")
+csCZ("Zachovat poměr")
+deDE("Seitenverhältnis beibehalten")
+esES("")
+fiFI("Säilytä kuvasuhde")
+frFR("Garder les proportions")
+huHU("Méretarány megtartása")
+itIT("Mantieni proporzioni")
+plPL("Zachowuj stosunek szerokości do wysokości")
+roRO("Păstrează proporții")
+ruRU("Сохранять пропорции")
+srSP("Zadrži razmeru")
+trTR("En/Boy oranını koru")
+zhCN("保持样式比例")
+
+T_("Font")
+csCZ("Písmo")
+deDE("Schriftart")
+esES("")
+fiFI("Kirjasin")
+frFR("Police")
+huHU("Font")
+itIT("Carattere")
+plPL("Czcionka")
+roRO("Font")
+ruRU("Шрифт")
+srSP("Font")
+trTR("Yazı tipi")
+zhCN("字体")
+
+T_("Height")
+csCZ("Výška")
+deDE("Schriftgrad")
+esES("")
+fiFI("Korkeus")
+frFR("Hauteur")
+huHU("Magasság")
+itIT("Altezza")
+plPL("Wysokość")
+roRO("Înălțime")
+ruRU("Высота")
+srSP("Visina")
+trTR("Yükseklik")
+zhCN("高度")
+
+T_("Ink")
+csCZ("Text")
+deDE("Textfarbe")
+esES("")
+fiFI("Muste")
+frFR("Encre")
+huHU("Tinta")
+itIT("Testo")
+plPL("Kolor tekstu")
+roRO("Cerneală")
+ruRU("Чернила")
+srSP("Tinta")
+trTR("Yazı rengi")
+zhCN("墨水")
+
+T_("Paper")
+csCZ("Papír")
+deDE("Hintergrundfarbe")
+esES("")
+fiFI("Paperi")
+frFR("Papier")
+huHU("Papír")
+itIT("Sfondo")
+plPL("Kolor tła")
+roRO("Hârtie")
+ruRU("Бумага")
+srSP("Papir")
+trTR("Kağıt")
+zhCN("页")
+
+T_("Style of next paragraph")
+csCZ("Styl následujícího odstavce")
+deDE("Stil des folgenden Absatzes")
+esES("")
+fiFI("Seuraavan kappaleen tyyli")
+frFR("Style du paragraphe suivant")
+huHU("Következő bekezdés stílusa")
+itIT("Stile paragrafo successivo")
+plPL("Styl następnego paragrafu")
+roRO("Stilul următorului paragraf")
+ruRU("Стиль следующего параграфа")
+srSP("Stil sledećeg paragrafa")
+trTR("Sonraki paragrafın stili")
+zhCN("下段格式")
+
+T_("Character")
+csCZ("Znaky")
+deDE("Zeichen")
+esES("")
+fiFI("Merkki")
+frFR("Caractère")
+huHU("Karakter")
+itIT("Carattere")
+plPL("Znak")
+roRO("Caracter")
+ruRU("Символ")
+srSP("Karakter")
+trTR("Karakter")
+zhCN("字符")
+
+T_("&Find:")
+csCZ("&Vyhledat")
+deDE("&Suchen:")
+esES("")
+fiFI("&Etsi:")
+frFR("&Rechercher :")
+huHU("&Keresés:")
+itIT("&Trova:")
+plPL("&Znajdź:")
+roRO("&Găsește:")
+ruRU("&Найти:")
+srSP("&Pronađi:")
+trTR("&Bul:")
+zhCN("查找(&F):")
+
+T_("&Replace:")
+csCZ("&Nahradit")
+deDE("&Ersetzen:")
+esES("")
+fiFI("&Korvaa:")
+frFR("&Remplacer :")
+huHU("&Csere:")
+itIT("&Sostituisci:")
+plPL("&Zamień:")
+roRO("Â&nlocuiește:")
+ruRU("&Заменить:")
+srSP("&Zameni:")
+trTR("&Değiştir:")
+zhCN("替换(&R):")
+
+T_("&Whole word")
+csCZ("&Celé slovo")
+deDE("Ganzes &Wort")
+esES("")
+fiFI("&Kokonainen sana")
+frFR("&Mot entier")
+huHU("&Egész szó")
+itIT("")
+plPL("&Całe słowo")
+roRO("&Cuvânt întreg")
+ruRU("&Слово целиком")
+srSP("&Cela reč")
+trTR("&Sözün tümü")
+zhCN("全字(&W)")
+
+T_("&Ignore case")
+csCZ("&Ignorovat velikost písma")
+deDE("&Groß-/Kleinschreibung ignorieren")
+esES("")
+fiFI("&Isot ja pienet")
+frFR("&Ignorer la casse")
+huHU("&Nagybetűk figyelmen kívül")
+itIT("Ignora maiuscole/minuscole")
+plPL("Ignoruj wielkość liter")
+roRO("&Ignoră majusucule")
+ruRU("&Игнорировать регистр")
+srSP("&Ignoriši mala/velika slova")
+trTR("Büyük/Küçük harf &ayırma")
+zhCN("忽略大小写(&I)")
+
+T_("&Replace")
+csCZ("N&ahradit")
+deDE("&Ersetzen")
+esES("")
+fiFI("&Korvaa")
+frFR("&Remplacer")
+huHU("&Csere")
+itIT("&Sostituisci")
+plPL("&Zamień")
+roRO("În&locuiește")
+ruRU("&Заменить")
+srSP("&Zameni")
+trTR("&Değiştir")
+zhCN("替换(&R)")
+
+T_("Header")
+csCZ("Záhlaví")
+deDE("Überschrift")
+esES("")
+fiFI("Otsikko")
+frFR("En-tête")
+huHU("Fejléc")
+itIT("Intestazione")
+plPL("Nagłówek")
+roRO("Antet")
+ruRU("Заголовок")
+srSP("Zaglavlje")
+trTR("Üstbilgi")
+zhCN("头")
+
+T_("Number of columns")
+csCZ("Počet sloupců")
+deDE("Anzahl der Spalten")
+esES("")
+fiFI("Sarakkeitten lukumäärä")
+frFR("Nombre de colonnes")
+huHU("Oszlopok száma")
+itIT("Numero di colonne")
+plPL("Liczba kolumn")
+roRO("Număr coloane")
+ruRU("Число столбцов")
+srSP("BRoj kolona")
+trTR("Sütun sayısı")
+zhCN("列数")
+
+T_("Right margin")
+csCZ("Pravý okraj")
+deDE("Rechter Rand")
+esES("")
+fiFI("Oikea marginaali")
+frFR("Marge de droite")
+huHU("Jobb szegély")
+itIT("Margine destro")
+plPL("Prawy margines")
+roRO("Margine din dreapta")
+ruRU("Поле справа")
+srSP("Desna margina")
+trTR("Sağdan boşluk")
+zhCN("右空白")
+
+T_("Frame")
+csCZ("Rámeček")
+deDE("Rahmen")
+esES("")
+fiFI("Kehys")
+frFR("Cadre")
+huHU("Keret")
+itIT("Riquadro")
+plPL("Obramowanie")
+roRO("Cadru")
+ruRU("Рамка")
+srSP("Okvir")
+trTR("Çerçeve")
+zhCN("边框")
+
+T_("color")
+csCZ("barva")
+deDE("Farbe")
+esES("")
+fiFI("väri")
+frFR("couleur")
+huHU("szín")
+itIT("Colore")
+plPL("kolor")
+roRO("culoare")
+ruRU("цвет")
+srSP("boja")
+trTR("renk")
+zhCN("颜色")
+
+T_("Grid")
+csCZ("Mřížka")
+deDE("Gitternetz")
+esES("")
+fiFI("Gridi")
+frFR("grille")
+huHU("Illesztőrács")
+itIT("Griglia")
+plPL("Siatka")
+roRO("Grilă")
+ruRU("Сетка")
+srSP("Mreža")
+trTR("Kılavuz")
+zhCN("格")
+
+T_("Equalize")
+csCZ("Vyrovnat")
+deDE("Angleichen")
+esES("")
+fiFI("Normalisoi")
+frFR("Egaliser")
+huHU("Kiegyenlítés")
+itIT("Equalizza")
+plPL("Wyrównaj")
+roRO("Egalizează")
+ruRU("")
+srSP("Izjednači")
+trTR("Eşitle")
+zhCN("相等")
+
+T_("Remove table")
+csCZ("Odstranit tabulku")
+deDE("Tabelle entfernen")
+esES("")
+fiFI("Poista taulukko")
+frFR("Supprimer le tableau")
+huHU("Táblázat törlése")
+itIT("Rimuovi tabella")
+plPL("Usuń tabelę")
+roRO("Șterge tabel")
+ruRU("Удалить таблицу")
+srSP("Ukloni tabelu")
+trTR("Tabloyu kaldır")
+zhCN("删除表格")
+
+T_("Horizontal")
+csCZ("Vodorovně")
+deDE("Horizontal")
+esES("")
+fiFI("Vaakasuuntainen")
+frFR("Horizontal")
+huHU("Vízszintes")
+itIT("Orizzontale")
+plPL("Poziomy")
+roRO("Orizonatal")
+ruRU("Горизонтально")
+srSP("Horizontalno")
+trTR("Yatay")
+zhCN("水平")
+
+T_("Vertical")
+csCZ("Svisle")
+deDE("Vertikal")
+esES("")
+fiFI("Pystysuuntainen")
+frFR("Vertical")
+huHU("Függőleges")
+itIT("Verticale")
+plPL("Pionowy")
+roRO("Vertical")
+ruRU("Вертикально")
+srSP("Vertikalno")
+trTR("Dikey")
+zhCN("垂直")
+
+T_("Borders")
+csCZ("Ohraničení")
+deDE("Rahmen")
+esES("")
+fiFI("Rajat")
+frFR("Bordures")
+huHU("Határvonalak")
+itIT("Bordi")
+plPL("Ramki")
+roRO("Contur")
+ruRU("Рамки")
+srSP("Granice")
+trTR("Kenarlıklar")
+zhCN("边框")
+
+T_("Top")
+csCZ("Nahoře")
+deDE("Oben")
+esES("")
+fiFI("Ylä")
+frFR("Haut")
+huHU("Felső szél")
+itIT("Alto")
+plPL("Góra")
+roRO("Partea de sus")
+ruRU("Верх")
+srSP("Vrh")
+trTR("Üst")
+zhCN("上部")
+
+T_("Bottom")
+csCZ("Dole")
+deDE("Unten")
+esES("")
+fiFI("Ala")
+frFR("Base")
+huHU("Alsó szél")
+itIT("Basso")
+plPL("Dół")
+roRO("Partea de jos")
+ruRU("Низ")
+srSP("Dno")
+trTR("Alt")
+zhCN("底部")
+
+T_("Margins")
+csCZ("Okraje")
+deDE("Ränder")
+esES("")
+fiFI("Marginaalit")
+frFR("Marges")
+huHU("Margók")
+itIT("Margini")
+plPL("Marginesy")
+roRO("Margini")
+ruRU("Поля")
+srSP("Margine")
+trTR("Kenar boşlukları")
+zhCN("空白")
+
+T_("Align")
+csCZ("Zarovnání")
+deDE("Ausrichten")
+esES("")
+fiFI("Tasaa")
+frFR("Aligner")
+huHU("Igazítás")
+itIT("Allinea")
+plPL("Wyrównanie")
+roRO("Aliniament")
+ruRU("Выровнять")
+srSP("Poravnanje")
+trTR("Yasla")
+zhCN("对齐")
+
+T_("Top\nCenter\nBottom")
+csCZ("Horní okraj\nStřed\nDolní okraj")
+deDE("Oben\nMitte\nUnten")
+esES("")
+fiFI("Ylös\nKeskelle\nAlas")
+frFR("Haut\nCentrer\nBas")
+huHU("Felülre\nKözépre\nAlulra")
+itIT("Ato\nCentro\nBasso")
+plPL("Góra\nŚrodek\nDół")
+roRO("Sus\nCentru\nJos")
+ruRU("Верх\nЦентр\nНиз")
+srSP("Vrh\nSredina\nDno")
+trTR("Üst\nOrta\nAlt")
+zhCN("上\n中\n下")
+
+T_("Border")
+csCZ("Ohraničení")
+deDE("Rahmen")
+esES("")
+fiFI("Raja")
+frFR("Bordure")
+huHU("Határvonal")
+itIT("Bordo")
+plPL("Ramka")
+roRO("Contur")
+ruRU("Рамка")
+srSP("Granica")
+trTR("Kenarlık")
+zhCN("边框")
+
+T_("Background")
+csCZ("Pozadí")
+deDE("Hintergrund")
+esES("")
+fiFI("Tausta")
+frFR("Arrière-plan")
+huHU("Háttér")
+itIT("Sfondo")
+plPL("TŁo")
+roRO("Fundal")
+ruRU("Цвет фона")
+srSP("Pozadina")
+trTR("Arkaplan")
+zhCN("背景")
+
+T_("Minimal height")
+csCZ("Minimální výška")
+deDE("Mindesthöhe")
+esES("")
+fiFI("Vähimmäiskorkeus")
+frFR("")
+huHU("Minimális magasság")
+itIT("")
+plPL("Minimalna wysokość")
+roRO("Înălțime minimă")
+ruRU("")
+srSP("")
+trTR("Asgari boyut")
+zhCN("最小高的")
+
+T_("Keep with next line")
+csCZ("Svázat s následujícím řádkem")
+deDE("Mit nächster Zeile zusammenhalten")
+esES("")
+fiFI("Pidä yhdessä seuraavan rivin kanssa")
+frFR("Garder pour la prochaine ligne")
+huHU("Következő sorral tartás")
+itIT("Mantieni con la riga successiva")
+plPL("Trzymaj z następną linią")
+roRO("Păstrează lângă linia urmatoare")
+ruRU("Придерживаться следующей линии")
+srSP("Drži sa sledećom linijom")
+trTR("Sonraki ile birlikte")
+zhCN("与下一行保持一致")
+
+
+// Obsolete
+
+T_("Indent")
+csCZ("O&dsazení:")
+deDE("Einrücken")
+esES("")
+fiFI("Sisennä")
+frFR("Indenter")
+huHU("Behúzás")
+itIT("Indent")
+plPL("Wcięcie")
+roRO("Indentare")
+ruRU("Отступ")
+srSP("")
+trTR("Girinti")
+zhCN("缩进")
+
+T_("Layout")
+csCZ("Rozvržení")
+deDE("Layout")
+esES("")
+fiFI("Asettelu")
+frFR("Agencement")
+huHU("Elrendezés")
+itIT("Layout")
+plPL("Rozkład")
+roRO("Structură")
+ruRU("Раскладка")
+srSP("Raspored")
+trTR("Düzen")
+zhCN("布局")
diff --git a/uppsrc/RichEdit/RichEdit.upp b/uppsrc/RichEdit/RichEdit.upp
new file mode 100644
index 000000000..33ac218d9
--- /dev/null
+++ b/uppsrc/RichEdit/RichEdit.upp
@@ -0,0 +1,32 @@
+description "Rich text editor";
+
+uses
+	CtrlLib;
+
+file
+	RichEdit.h,
+	Ruler.cpp,
+	UnitEdit.cpp,
+	Editor.cpp,
+	Speller.cpp,
+	Kbd.cpp,
+	Mouse.cpp,
+	Cursor.cpp,
+	Undo.cpp,
+	Modify.cpp,
+	Formating.cpp,
+	ParaFormat.cpp,
+	TableUndo.cpp,
+	Table.cpp,
+	Find.cpp optimize_speed,
+	Tool.cpp,
+	Clip.cpp,
+	RichEdit.t charset "UTF-8",
+	RichEdit.icpp,
+	RichEdit.lay,
+	RichEdit.iml,
+	Info readonly separator,
+	COPYING,
+	COPYING-PLAIN,
+	AUTHORS;
+
diff --git a/uppsrc/RichEdit/Ruler.cpp b/uppsrc/RichEdit/Ruler.cpp
new file mode 100644
index 000000000..65887b2c5
--- /dev/null
+++ b/uppsrc/RichEdit/Ruler.cpp
@@ -0,0 +1,214 @@
+#include "RichEdit.h"
+
+NAMESPACE_UPP
+
+#define IMAGECLASS RichEditImg
+#define IMAGEFILE <RichEdit/RichEdit.iml>
+#include <Draw/iml_source.h>
+
+void HotPaint(Draw& w, int x, int y, const Image& img)
+{
+	Point p = img.GetHotSpot();
+	w.DrawImage(x - p.x, y - p.y, img);
+}
+
+RichRuler::RichRuler()   { newtabalign = ALIGN_LEFT; }
+RichRuler::~RichRuler()  {}
+
+void RichRuler::FrameLayout(Rect& r)
+{
+	LayoutFrameTop(r, this, Arial(10).Info().GetHeight() + 8);
+}
+
+void RichRuler::FrameAddSize(Size& sz)
+{
+	sz.cy += Arial(10).Info().GetHeight() + 8;
+}
+
+void RichRuler::Paint(Draw& w)
+{
+	Size sz = GetSize();
+	w.DrawRect(sz, SColorFace);
+	w.DrawRect(0, sz.cy - 1, sz.cx, 1, SColorShadow);
+	int cx = zoom * pgcx;
+	w.DrawRect(x0 - 1, 3, cx + 3, sz.cy - 6, SColorPaper);
+	int i = 0;
+	for(;;) {
+		int x = fround(++i * grid) * zoom;
+		if(x >= cx) break;
+		if(i % marks == 0)
+			w.DrawRect(x0 + x, 8, 1, 5, SColorHighlight);
+		else
+			w.DrawRect(x0 + x, 9, 1, 3, SColorHighlight);
+	}
+	i = 0;
+	for(;;)
+		if(++i % numbers == 0) {
+			int x = fround(i * grid) * zoom;
+			if(x >= cx) break;
+			String n = Format("%d", (int)(i * numbermul + 0.5));
+			Size tsz = GetTextSize(n, Arial(10));
+			if(x + tsz.cx - tsz.cx / 2 < cx) {
+				int px = x0 + x - tsz.cx / 2;
+				w.DrawRect(px, 4, tsz.cx, sz.cy - 8, SColorPaper);
+				w.DrawText(x0 + x - tsz.cx / 2, 4, n, Arial(10), SColorText);
+			}
+		}
+	FieldFrame().FramePaint(w, RectC(x0 - 1, 3, cx + 3, sz.cy - 6));
+	for(i = marker.GetCount() - 1; i >= 0; --i) {
+		const Marker& m = marker[i];
+		if(!IsNull(m.pos))
+			HotPaint(w, x0 + m.pos * zoom, m.top ? 1 : sz.cy - 4, m.image);
+	}
+	i = 0;
+	if(tabsize)
+		for(;;) {
+			int xp = ++i * tabsize;
+			int x = xp * zoom;
+			if(x >= cx) break;
+			if(xp > tabpos)
+				w.DrawRect(x0 + x, sz.cy - 4, 1, 3, SColorShadow);
+		}
+	w.DrawImage(4, 6, newtabalign == ALIGN_RIGHT  ? RichEditImg::RightTab() :
+	                  newtabalign == ALIGN_CENTER ? RichEditImg::CenterTab() :
+	                                                RichEditImg::LeftTab());
+}
+
+int RichRuler::FindMarker(Point p)
+{
+	int x = p.x - x0;
+	bool top = p.y < GetSize().cy / 2;
+	for(int i = 0; i < marker.GetCount(); i++) {
+		const Marker& m = marker[i];
+		int hx = m.image.GetHotSpot().x;
+		int cx = m.image.GetSize().cx;
+		int p = zoom * m.pos;
+		if(m.top == top && x >= p - hx && x < p + cx - hx)
+			return i;
+	}
+	return -1;
+}
+
+void RichRuler::LeftDown(Point p, dword)
+{
+	track = FindMarker(p);
+	if(track >= 0) {
+		trackdx = marker[track].pos * zoom + x0 - p.x;
+		SetCapture();
+		WhenBeginTrack();
+	}
+	else
+	if(p.x < 16) {
+		newtabalign++;
+		if(newtabalign > ALIGN_CENTER) newtabalign = ALIGN_LEFT;
+		Refresh();
+		return;
+	}
+	else {
+		pos = ((p.x - x0) / zoom + snap / 2) / snap * snap;
+		WhenLeftDown();
+	}
+}
+
+void RichRuler::LeftDouble(Point p, dword)
+{
+	if(p.x < x0 - 3) {
+		newtabalign++;
+		if(newtabalign > ALIGN_CENTER) newtabalign = ALIGN_LEFT;
+		Refresh();
+		return;
+	}
+
+	WhenLeftDouble();
+}
+
+void RichRuler::RightDown(Point p, dword)
+{
+	if(p.x < x0 - 3) {
+		newtabalign--;
+		if(newtabalign < ALIGN_LEFT) newtabalign = ALIGN_CENTER;
+		Refresh();
+		return;
+	}
+
+	track = FindMarker(p);
+	if(track < 0)
+		pos = ((p.x - x0) / zoom + snap / 2) / snap * snap;
+	WhenRightDown();
+}
+
+void RichRuler::LeftUp(Point p, dword)
+{
+	track = -1;
+	WhenEndTrack();
+}
+
+void RichRuler::MouseMove(Point p, dword flags)
+{
+
+	if(HasCapture() && track >= 0) {
+		Marker& m = marker[track];
+		if((p.y < -10 || p.y >= GetSize().cy + 10) && m.deletable)
+			m.pos = Null;
+		else {
+			int x = ((p.x + trackdx - x0) / zoom);
+			if(!(flags & K_ALT))
+				x = (x + snap / 2) / snap * snap;
+			m.pos = minmax(x, m.minpos, m.maxpos);
+		}
+		Refresh();
+		WhenTrack();
+	}
+}
+
+void RichRuler::SetLayout(int x, int _pgcx, Zoom _zoom,
+                          double _grid, int _numbers, double _numbermul, int _marks, int _snap)
+{
+	if(x0 != x || pgcx != _pgcx || zoom != _zoom || grid != _grid || numbers != _numbers ||
+	   numbermul != _numbermul || marks != _marks || snap != _snap) {
+		x0 = x;
+		pgcx = _pgcx;
+		zoom = _zoom;
+		grid = _grid;
+		numbers = _numbers;
+		numbermul = _numbermul;
+		marks = _marks;
+		snap = _snap;
+		Refresh();
+	}
+}
+
+void RichRuler::Clear()
+{
+	if(marker.GetCount()) {
+		marker.Clear();
+		Refresh();
+	}
+}
+
+void RichRuler::SetCount(int n)
+{
+	if(marker.GetCount() != n) {
+		marker.SetCount(n);
+		Refresh();
+	}
+}
+
+void RichRuler::Set(int i, const Marker& m)
+{
+	if(i >= marker.GetCount() || marker[i] != m) {
+		marker.At(i) = m;
+		Refresh();
+	}
+}
+
+void RichRuler::SetTabs(int pos, int size)
+{
+	if(tabpos != pos || tabsize != size) {
+		tabpos = pos;
+		tabsize = size;
+		Refresh();
+	}
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/RichEdit/Speller.cpp b/uppsrc/RichEdit/Speller.cpp
new file mode 100644
index 000000000..ed8c47cae
--- /dev/null
+++ b/uppsrc/RichEdit/Speller.cpp
@@ -0,0 +1,228 @@
+#include "RichEdit.h"
+
+NAMESPACE_UPP
+
+#define LLOG(x) // LOG(x)
+
+struct Speller {
+	String        data;
+	byte          charset;
+	const char   *voc[256];
+	int           dict;
+	struct Line : Moveable<Line> {
+		const byte *begin;
+		const byte *end;
+	};
+	VectorMap<dword, Line> line;
+	Index<WString> user;
+
+	bool     Set(const String& data);
+	void     Clear()                        { data.Clear(); }
+	operator bool() const                   { return !data.IsEmpty(); }
+
+	bool Check(const wchar *wrd, int len) const;
+};
+
+bool Speller::Set(const String& _data)
+{
+	data = _data;
+	const char *s = data;
+	if(s >= data.End()) {
+		data.Clear();
+		return false;
+	}
+	charset = *s++;
+	s++;// reserved for prefixes
+	dict = *s++;
+	for(int i = 0; i < 256 - dict; i++) {
+		if(s >= data.End()) {
+			data.Clear();
+			return false;
+		}
+		voc[i] = s;
+		while(*s) s++;
+		s++;
+	}
+	line.Clear();
+	while(s < data.End()) {
+		if(s + 8 >= data.End()) {
+			data.Clear();
+			return false;
+		}
+		int code = Peek32le(s);
+		s += 4;
+		int len = Peek32le(s);
+		s += 4;
+		Line& l = line.Add(code);
+		l.begin = (const byte *)s;
+		s += len;
+		l.end = (const byte *)s;
+	};
+	return true;
+}
+
+bool compare3(const char *s, const char *a, const char *b, int len)
+{
+	const char *e = s + len;
+	while(s < e) {
+		if(*s != *a && *s != *b)
+			return false;
+		s++;
+		a++;
+		b++;
+	}
+	return true;
+}
+
+bool Speller::Check(const wchar *wrd, int wlen) const
+{
+	int len = wlen;
+	if(len < 64) {
+		if(len == 1) return true;
+		wchar wh[64];
+		const wchar *ws = wrd;
+		const wchar *we = wrd + len;
+		wchar *wt = wh;
+		while(ws < we)
+			*wt++ = ToLower(*ws++);
+
+		char w[64];
+		char wl[64];
+		FromUnicode(w, wrd, len, charset);
+		FromUnicode(wl, wh, len, charset);
+		if(len == 2) {
+			w[len] = 127;
+			wl[len++] = 127;
+		}
+		int i = line.Find(ToLower(wl[0], charset) +
+		                  (ToLower(wl[1], charset) << 8) +
+		                  (ToLower(wl[2], charset) << 16));
+		if(i >= 0) {
+			const byte *s = line[i].begin;
+			const byte *e = line[i].end;
+			int capitals = 0;
+			char q[64];
+			int  pos = 0;
+			while(s < e)
+				if(*s < dict) {
+					if(pos == len && compare3(q, w, wl, len))
+						return true;
+					pos = *s++;
+					ASSERT(pos < 64);
+					capitals = 0;
+				}
+				else {
+					ASSERT(*s >= dict);
+					const char *x = voc[(int)*s++ - dict];
+					while(*x)
+						q[pos++] = *x++;
+					ASSERT(pos < 64);
+				}
+			if(pos == len && compare3(q, w, wl, len))
+				return true;
+		}
+	}
+	return user.Find(WString(wrd, wlen)) >= 0;
+}
+
+String GetDicFile(int lang)
+{
+	String name = LNGAsText(lang) + ".scd";
+	String dir = ConfigFile("dict");
+	String f;
+	for(;;) {
+		f = AppendFileName(dir, name);
+		if(FileExists(f)) return f;
+		String d = GetFileFolder(dir);
+		if(d == dir) break;
+		dir = d;
+	}
+	f = GetFileOnPath(name, getenv("LIB"));
+	if(f.IsEmpty())
+		f = GetFileOnPath(name, getenv("LIB"));
+	return f;
+}
+
+static String sUserFile(int lang)
+{
+	return ConfigFile(LNGAsText(lang) + ".usp");
+}
+
+static Speller& sGetSpeller(int lang)
+{
+	static ArrayMap<int, Speller> speller;
+	int q = speller.Find(lang);
+	if(q < 0) {
+		Speller& p = speller.Add(lang);
+		String f = GetDicFile(lang);
+		if(!f.IsEmpty()) {
+			p.Set(LoadFile(f));
+			FileIn user(sUserFile(lang));
+			while(!user.IsEof()) {
+				String s = user.GetLine();
+				if(!s.IsEmpty())
+					p.user.Add(FromUtf8(s));
+			}
+		}
+		return p;
+	}
+	return speller[q];
+}
+
+bool RichEdit::SpellWord(const wchar *wrd, int len, int lang)
+{
+	Speller& p = sGetSpeller(lang);
+	return p ? p.Check(wrd, len) : true;
+}
+
+void RichEdit::SpellerAdd(const WString& w, int lang)
+{
+	Speller& p = sGetSpeller(lang);
+	if(p && !p.Check(w, w.GetLength())) {
+		FileAppend fa(sUserFile(lang));
+		fa.PutLine(ToUtf8(w));
+		p.user.Add(w);
+	}
+}
+
+int RichEdit::fixedlang;
+
+Bits RichEdit::SpellParagraph(const RichPara& para)
+{
+	int len = para.GetLength();
+	Buffer<wchar> text(len);
+	Buffer<int> lang(len);
+	wchar *s = text;
+	int *g = lang;
+	for(int i = 0; i < para.GetCount(); i++) {
+		const RichPara::Part& p = para[i];
+		if(p.IsText()) {
+			int l = p.text.GetLength();
+			memcpy(s, p.text, l * sizeof(wchar));
+			Fill(g, g + l, fixedlang ? fixedlang : p.format.language);
+			s += l;
+			g += l;
+		}
+		else {
+			*s++ = 127;
+			*g++ = 0;
+		}
+	}
+	Bits e;
+	s = text;
+	wchar *end = text + len;
+	while(s < end) {
+		if(IsLetter(*s)) {
+			const wchar *q = s;
+			while(s < end && IsLetter(*s) || s + 1 < end && *s == '\'' && IsLetter(s[1]))
+				s++;
+			if(!SpellWord(q, int(s - q), lang[q - text]))
+				e.Set(int(q - text), true, int(s - q));
+		}
+		else
+			s++;
+	}
+	return e;
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/RichEdit/Table.cpp b/uppsrc/RichEdit/Table.cpp
new file mode 100644
index 000000000..8977f3f2e
--- /dev/null
+++ b/uppsrc/RichEdit/Table.cpp
@@ -0,0 +1,317 @@
+#include "RichEdit.h"
+
+NAMESPACE_UPP
+
+void RichEdit::SaveTableFormat(int table)
+{
+	AddUndo(new UndoTableFormat(text, table));
+}
+
+void RichEdit::SaveTable(int table)
+{
+	AddUndo(new UndoTable(text, table));
+}
+
+void RichEdit::InsertTable()
+{
+	if(IsSelection())
+		return;
+	WithCreateTableLayout<TopWindow> dlg;
+	CtrlLayoutOKCancel(dlg, t_("Insert table"));
+	dlg.header = true;
+	dlg.columns <<= 2;
+	dlg.columns.MinMax(1, 20);
+	dlg.ActiveFocus(dlg.columns);
+	if(dlg.Run() != IDOK)
+		return;
+	RichTable::Format fmt;
+	int nx = minmax((int)dlg.columns, 1, 20);
+	for(int q = nx; q--;)
+		fmt.column.Add(1);
+	if(dlg.header)
+		fmt.header = 1;
+	RichTable table;
+	table.SetFormat(fmt);
+	for(int i = 0; i < (dlg.header ? 2 : 1); i++)
+		for(int j = 0; j < nx; j++) {
+			RichText h;
+			h.SetStyles(text.GetStyles());
+			RichPara p;
+			p.format = formatinfo;
+			p.format.newpage = false;
+			p.format.label.Clear();
+			h.Cat(p);
+			table.SetPick(i, j, h);
+		}
+	NextUndo();
+	if(cursorp.posinpara)
+		InsertLine();
+	if(text.GetRichPos(cursor).paralen) {
+		InsertLine();
+		cursor = anchor = cursor - 1;
+	}
+	SaveFormat(cursor, 0);
+	AddUndo(new UndoCreateTable(text.SetTable(cursor, table)));
+	Finish();
+}
+
+template <class T>
+struct CtrlRetrieveItemValueNN : public CtrlRetriever::Item {
+	Ctrl& ctrl;
+	T&    value;
+
+	virtual void Retrieve() {
+		if(!IsNull(ctrl))
+			value = ~ctrl;
+	}
+
+	CtrlRetrieveItemValueNN(Ctrl& ctrl, T& value) : ctrl(ctrl), value(value) {}
+};
+
+template <class T>
+void Advn(CtrlRetriever& r, Ctrl& ctrl, T& value) {
+	ctrl <<= value;
+	r.Put(new CtrlRetrieveItemValueNN<T>(ctrl, value));
+}
+
+void RichEdit::DestroyTable()
+{
+	AddUndo(new UndoDestroyTable(text, cursorp.table));
+	int c = text.GetCellPos(cursorp.table, 0, 0).pos;
+	text.DestroyTable(cursorp.table);
+	Move(c);
+}
+
+int CharFilterEqualize(int c)
+{
+	return IsDigit(c) || c == ':' ? c : 0;
+}
+
+void RichEdit::TableProps()
+{
+	if(IsSelection() || cursorp.table == 0)
+		return;
+	WithTablePropertiesLayout<TopWindow> dlg;
+	CtrlLayoutOKCancel(dlg, t_("Table properties"));
+	dlg.Breaker(dlg.destroy, IDNO);
+	RichTable::Format fmt = text.GetTableFormat(cursorp.table);
+	String ratios;
+	for(int i = 0; i < fmt.column.GetCount(); i++) {
+		if(i)
+			ratios << ':';
+		ratios << "1";
+	}
+	dlg.ratios.SetFilter(CharFilterEqualize);
+	dlg.ratios <<= ratios;
+	CtrlRetriever r;
+	Advn(r, dlg.before.SetUnit(unit), fmt.before);
+	Advn(r, dlg.after.SetUnit(unit), fmt.after);
+	Advn(r, dlg.lm.SetUnit(unit), fmt.lm);
+	Advn(r, dlg.rm.SetUnit(unit), fmt.rm);
+	Advn(r, dlg.frame.SetUnit(unit), fmt.frame);
+	r(dlg.framecolor, fmt.framecolor);
+	Advn(r, dlg.grid.SetUnit(unit), fmt.grid);
+	r(dlg.gridcolor, fmt.gridcolor);
+	switch(dlg.Run()) {
+	case IDCANCEL:
+		return;
+	case IDNO:
+		NextUndo();
+		DestroyTable();
+		return;
+	default:
+		r.Retrieve();
+		NextUndo();
+		SaveTableFormat(cursorp.table);
+		if(dlg.equalize) {
+			Vector<String> r = Split((String)~dlg.ratios, ':');
+			for(int i = 0; i < fmt.column.GetCount(); i++)
+				fmt.column[i] = i < r.GetCount() ? max(atoi(r[i]), 1) : 1;
+		}
+		text.SetTableFormat(cursorp.table, fmt);
+	}
+	Finish();
+}
+
+bool RichEdit::RemoveSpecial(int ll, int hh, bool back)
+{
+	NextUndo();
+	int l = min(ll, hh);
+	int h = max(ll, hh);
+	RichPos p1 = text.GetRichPos(l);
+	RichPos p2 = text.GetRichPos(h);
+	if(InSameTxt(p1, p2))
+		return false;
+	if(p1.paralen == 0 && p2.posintab == 0 && text.CanRemoveParaSpecial(p2.table, true)) {
+		AddUndo(new UndoRemoveParaSpecial(text, p2.table, true));
+		text.RemoveParaSpecial(p2.table, true);
+		Move(cursor - back);
+	}
+	else
+	if(p2.paralen == 0 && p1.posintab == p1.tablen && text.CanRemoveParaSpecial(p1.table, false)) {
+		AddUndo(new UndoRemoveParaSpecial(text, p1.table, false));
+		text.RemoveParaSpecial(p1.table, false);
+		Move(cursor - back);
+	}
+	return true;
+}
+
+bool RichEdit::InsertLineSpecial()
+{
+	NextUndo();
+	if(cursorp.table) {
+		RichPara::Format fmt;
+		fmt = formatinfo;
+		fmt.newpage = false;
+		fmt.label.Clear();
+		if(cursorp.posintab == 0 && text.ShouldInsertParaSpecial(cursorp.table, true)) {
+			AddUndo(new UndoInsertParaSpecial(cursorp.table, true));
+			text.InsertParaSpecial(cursorp.table, true, fmt);
+			Move(cursor + 1);
+			return true;
+		}
+		if(cursorp.posintab == cursorp.tablen && text.ShouldInsertParaSpecial(cursorp.table, false)) {
+			AddUndo(new UndoInsertParaSpecial(cursorp.table, false));
+			text.InsertParaSpecial(cursorp.table, false, fmt);
+			Move(cursor + 1);
+			return true;
+		}
+	}
+	return false;
+}
+
+void RichEdit::TableInsertRow()
+{
+	if(IsSelection() || !cursorp.table)
+		return;
+	NextUndo();
+	SaveTable(cursorp.table);
+	Point p = cursorp.cell;
+	if(cursorp.posintab == cursorp.tablen) {
+		p.y++;
+		p.x = 0;
+	}
+	text.InsertTableRow(cursorp.table, p.y);
+	Move(text.GetCellPos(cursorp.table, text.GetMasterCell(cursorp.table, p)).pos);
+}
+
+void RichEdit::TableRemoveRow()
+{
+
+	if(IsSelection() || !cursorp.table)
+		return;
+	NextUndo();
+	if(cursorp.tabsize.cy <= 1)
+		DestroyTable();
+	else {
+		SaveTable(cursorp.table);
+		text.RemoveTableRow(cursorp.table, cursorp.cell.y);
+		Move(text.GetCellPos(cursorp.table, text.GetMasterCell(cursorp.table, cursorp.cell)).pos);
+	}
+}
+
+void RichEdit::TableInsertColumn()
+{
+	if(IsSelection() || !cursorp.table)
+		return;
+	NextUndo();
+	SaveTable(cursorp.table);
+	Point p = cursorp.cell;
+	if(cursorp.cell.x == cursorp.tabsize.cx - 1 && cursorp.posincell == cursorp.celllen)
+		p.x++;
+	text.InsertTableColumn(cursorp.table, p.x);
+	Move(text.GetCellPos(cursorp.table, text.GetMasterCell(cursorp.table, p)).pos);
+}
+
+void RichEdit::TableRemoveColumn()
+{
+
+	if(IsSelection() || !cursorp.table)
+		return;
+	NextUndo();
+	if(cursorp.tabsize.cx <= 1)
+		DestroyTable();
+	else {
+		SaveTable(cursorp.table);
+		text.RemoveTableColumn(cursorp.table, cursorp.cell.x);
+		Move(text.GetCellPos(cursorp.table, text.GetMasterCell(cursorp.table, cursorp.cell)).pos);
+	}
+}
+
+void RichEdit::SplitCell()
+{
+	if(IsSelection() || !cursorp.table)
+		return;
+	WithSplitCellLayout<TopWindow> dlg;
+	CtrlLayoutOKCancel(dlg, t_("Split cell"));
+	dlg.cx.MinMax(1, 20);
+	dlg.cx <<= 1;
+	dlg.cy.MinMax(1, 20);
+	dlg.cy <<= 1;
+	if(dlg.Run() != IDOK)
+		return;
+	NextUndo();
+	SaveTable(cursorp.table);
+	text.SplitCell(cursorp.table, cursorp.cell, Size(~dlg.cx, ~dlg.cy));
+	Finish();
+}
+
+void RichEdit::CellProperties()
+{
+	if(!(tablesel || cursorp.table && !IsSelection()))
+		return;
+	WithCellPropertiesLayout<TopWindow> dlg;
+	CtrlLayoutOKCancel(dlg, t_("Cell properties"));
+	int  tab;
+	Rect a;
+	if(tablesel) {
+		dlg.keep.Hide();
+		tab = tablesel;
+		a = cells;
+	}
+	else {
+		tab = cursorp.table;
+		a = Rect(cursorp.cell, Size(0, 0));
+	}
+	RichCell::Format fmt = text.GetCellFormat(tab, a);
+	CtrlRetriever r;
+	r
+		(dlg.leftb.SetUnit(unit), fmt.border.left)
+		(dlg.rightb.SetUnit(unit), fmt.border.right)
+		(dlg.topb.SetUnit(unit), fmt.border.top)
+		(dlg.bottomb.SetUnit(unit), fmt.border.bottom)
+		(dlg.leftm.SetUnit(unit), fmt.margin.left)
+		(dlg.rightm.SetUnit(unit), fmt.margin.right)
+		(dlg.topm.SetUnit(unit), fmt.margin.top)
+		(dlg.bottomm.SetUnit(unit), fmt.margin.bottom)
+		(dlg.align, fmt.align)
+		(dlg.minheight.SetUnit(unit), fmt.minheight)
+		(dlg.color, fmt.color)
+		(dlg.border, fmt.bordercolor)
+		(dlg.keep, fmt.keep)
+	;
+	dlg.align.Set(0, ALIGN_TOP);
+	dlg.align.Set(1, ALIGN_CENTER);
+	dlg.align.Set(2, ALIGN_BOTTOM);
+	dlg.color.NullText("");
+	dlg.border.NullText("");
+	if(dlg.Run() != IDOK)
+		return;
+	r.Retrieve();
+	NextUndo();
+	SaveTable(tab);
+	text.SetCellFormat(tab, a, fmt, tablesel);
+	Finish();
+}
+
+void RichEdit::JoinCell()
+{
+	if(!tablesel)
+		return;
+	NextUndo();
+	SaveTable(tablesel);
+	text.JoinCell(tablesel, cells);
+	Move(text.GetCellPos(tablesel, cells.TopLeft()).pos);
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/RichEdit/TableUndo.cpp b/uppsrc/RichEdit/TableUndo.cpp
new file mode 100644
index 000000000..924382e23
--- /dev/null
+++ b/uppsrc/RichEdit/TableUndo.cpp
@@ -0,0 +1,102 @@
+#include "RichEdit.h"
+
+NAMESPACE_UPP
+
+void RichEdit::UndoTableFormat::Apply(RichText& txt)
+{
+	txt.SetTableFormat(table, format);
+}
+
+RichEdit::UndoRec *RichEdit::UndoTableFormat::GetRedo(const RichText& txt)
+{
+	return new UndoTableFormat(txt, table);
+}
+
+RichEdit::UndoTableFormat::UndoTableFormat(const RichText& txt, int table)
+: table(table)
+{
+	format = txt.GetTableFormat(table);
+}
+
+// -----------------------
+
+
+void RichEdit::UndoCreateTable::Apply(RichText& txt)
+{
+	txt.DestroyTable(table);
+}
+
+RichEdit::UndoRec *RichEdit::UndoCreateTable::GetRedo(const RichText& txt)
+{
+	return new UndoDestroyTable(txt, table);
+}
+
+// -----------------------
+
+void RichEdit::UndoDestroyTable::Apply(RichText& txt)
+{
+	txt.SetTable(pos, table);
+}
+
+RichEdit::UndoRec *RichEdit::UndoDestroyTable::GetRedo(const RichText& txt)
+{
+	return new UndoCreateTable(txt.GetRichPos(pos).table + 1);
+}
+
+RichEdit::UndoDestroyTable::UndoDestroyTable(const RichText& txt, int tab)
+{
+	pos = txt.GetCellPos(tab, 0, 0).pos;
+	table = txt.CopyTable(tab);
+}
+
+// -----------------------
+
+void RichEdit::UndoInsertParaSpecial::Apply(RichText& txt)
+{
+	txt.RemoveParaSpecial(table, before);
+	RichCellPos p = txt.GetCellPos(table, 0, 0);
+}
+
+RichEdit::UndoRec *RichEdit::UndoInsertParaSpecial::GetRedo(const RichText& txt)
+{
+	return new UndoRemoveParaSpecial(txt, table, before);
+}
+
+// -----------------------
+
+void RichEdit::UndoRemoveParaSpecial::Apply(RichText& txt)
+{
+	txt.InsertParaSpecial(table, before, format);
+}
+
+RichEdit::UndoRec *RichEdit::UndoRemoveParaSpecial::GetRedo(const RichText& txt)
+{
+	return new UndoInsertParaSpecial(table, before);
+}
+
+RichEdit::UndoRemoveParaSpecial::UndoRemoveParaSpecial(const RichText& txt, int table, bool before)
+: table(table), before(before)
+{
+	RichCellPos p = txt.GetCellPos(table, 0, 0);
+	format = txt.GetRichPos(before ? p.pos - 1 : p.pos + p.tablen + 1).format;
+}
+
+// -----------------------
+
+void RichEdit::UndoTable::Apply(RichText& txt)
+{
+	txt.ReplaceTable(table, copy);
+}
+
+RichEdit::UndoRec *RichEdit::UndoTable::GetRedo(const RichText& txt)
+{
+	return new UndoTable(txt, table);
+}
+
+RichEdit::UndoTable::UndoTable(const RichText& txt, int tab)
+{
+	table = tab;
+	copy = txt.CopyTable(tab);
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/RichEdit/Tool.cpp b/uppsrc/RichEdit/Tool.cpp
new file mode 100644
index 000000000..1e6e2f06c
--- /dev/null
+++ b/uppsrc/RichEdit/Tool.cpp
@@ -0,0 +1,427 @@
+#include "RichEdit.h"
+
+NAMESPACE_UPP
+
+void RichEdit::StyleTool(Bar& bar, int width)
+{
+	bar.Add(!IsReadOnly(), style, width);
+}
+
+void RichEdit::FaceTool(Bar& bar, int width)
+{
+	bar.Add(!IsReadOnly(), face, width);
+}
+
+void RichEdit::HeightTool(Bar& bar, int width)
+{
+	bar.Add(!IsReadOnly(), height, width);
+}
+
+void RichEdit::BoldTool(Bar& bar, dword key)
+{
+	bar.Add(!IsReadOnly(), t_("Bold"),
+	        formatinfo.charvalid & RichText::BOLD ? RichEditImg::Bold() : RichEditImg::BoldMixed(),
+	        THISBACK(Bold))
+	   .Check(formatinfo.IsBold() && (formatinfo.charvalid & RichText::BOLD))
+	   .Key(key);
+}
+
+void RichEdit::ItalicTool(Bar& bar, dword key)
+{
+	bar.Add(!IsReadOnly(), t_("Italic"),
+            formatinfo.charvalid & RichText::ITALIC ? RichEditImg::Italic() : RichEditImg::ItalicMixed(),
+	        THISBACK(Italic))
+	   .Check(formatinfo.IsItalic() && (formatinfo.charvalid & RichText::ITALIC))
+	   .Key(key);
+}
+
+void RichEdit::UnderlineTool(Bar& bar, dword key)
+{
+	bar.Add(!IsReadOnly(), t_("Underline"),
+	        formatinfo.charvalid & RichText::UNDERLINE ? RichEditImg::Underline()
+	                                               : RichEditImg::UnderlineMixed(),
+	        THISBACK(Underline))
+	   .Check(formatinfo.IsUnderline() && (formatinfo.charvalid & RichText::UNDERLINE))
+	   .Key(key);
+}
+
+void RichEdit::StrikeoutTool(Bar& bar, dword key)
+{
+	bar.Add(!IsReadOnly(), t_("Strikeout"),
+	        formatinfo.charvalid & RichText::STRIKEOUT ? RichEditImg::Strikeout()
+	                                               : RichEditImg::StrikeoutMixed(),
+	        THISBACK(Strikeout))
+	   .Check(formatinfo.IsStrikeout() && (formatinfo.charvalid & RichText::STRIKEOUT))
+	   .Key(key);
+}
+
+
+void RichEdit::CapitalsTool(Bar& bar, dword key)
+{
+	bar.Add(!IsReadOnly(), t_("Capitals"),
+	        formatinfo.charvalid & RichText::CAPITALS  ? RichEditImg::Capitals()
+	                                               : RichEditImg::CapitalsMixed(),
+	        THISBACK(Capitals))
+	   .Check(formatinfo.capitals && (formatinfo.charvalid & RichText::CAPITALS));
+}
+
+void RichEdit::SuperscriptTool(Bar& bar, dword key)
+{
+	int i = formatinfo.charvalid & RichText::SSCRIPT ? formatinfo.sscript : 0;
+	bar.Add(!IsReadOnly(), t_("Superscript"),
+	        formatinfo.charvalid & RichText::SSCRIPT ? RichEditImg::SuperScript()
+	                                             : RichEditImg::SuperScriptMixed(),
+			THISBACK1(SetScript, i == 1 ? 0 : 1))
+	   .Check(i == 1);
+}
+
+void RichEdit::SubscriptTool(Bar& bar, dword key)
+{
+	int i = formatinfo.charvalid & RichText::SSCRIPT ? formatinfo.sscript : 0;
+	bar.Add(!IsReadOnly(), t_("Subscript"),
+	        formatinfo.charvalid & RichText::SSCRIPT ? RichEditImg::SubScript()
+	                                             : RichEditImg::SubScriptMixed(),
+			THISBACK1(SetScript, i == 2 ? 0 : 2))
+	   .Check(i == 2);
+}
+
+void RichEdit::FontTools(Bar& bar)
+{
+	FaceTool(bar);
+	bar.Gap(4);
+	HeightTool(bar);
+	bar.Gap();
+	BoldTool(bar);
+	ItalicTool(bar);
+	UnderlineTool(bar);
+	StrikeoutTool(bar);
+	CapitalsTool(bar);
+	SuperscriptTool(bar);
+	SubscriptTool(bar);
+}
+
+void RichEdit::InkTool(Bar& bar)
+{
+	bar.Add(!IsReadOnly(), ink);
+}
+
+void RichEdit::PaperTool(Bar& bar)
+{
+	bar.Add(!IsReadOnly(), paper);
+}
+
+void RichEdit::LanguageTool(Bar& bar, int width)
+{
+	if(!fixedlang)
+		bar.Add(!IsReadOnly(), language, width);
+}
+
+void RichEdit::SpellCheckTool(Bar& bar)
+{
+	bar.Add(t_("Show spelling errors"), RichEditImg::SpellCheck(), THISBACK(SpellCheck))
+	   .Check(spellcheck);
+}
+
+void RichEdit::IndexEntryTool(Bar& bar, int width)
+{
+	bar.Add(!IsReadOnly(), indexentry, width);
+}
+
+void RichEdit::HyperlinkTool(Bar& bar, int width)
+{
+	bar.Add(!IsReadOnly(), hyperlink, width);
+}
+
+void RichEdit::LeftTool(Bar& bar, dword key)
+{
+	int a = formatinfo.paravalid & RichText::ALIGN ? formatinfo.align : Null;
+	bar.Add(!IsReadOnly(), t_("Left"), RichEditImg::Left(), THISBACK(AlignLeft))
+	   .Check(a == ALIGN_LEFT)
+	   .Key(K_CTRL_L);
+}
+
+void RichEdit::RightTool(Bar& bar, dword key)
+{
+	int a = formatinfo.paravalid & RichText::ALIGN ? formatinfo.align : Null;
+	bar.Add(!IsReadOnly(), t_("Right"), RichEditImg::Right(), THISBACK(AlignRight))
+	   .Check(a == ALIGN_RIGHT)
+	   .Key(key);
+}
+
+void RichEdit::CenterTool(Bar& bar, dword key)
+{
+	int a = formatinfo.paravalid & RichText::ALIGN ? formatinfo.align : Null;
+	bar.Add(!IsReadOnly(), t_("Center"), RichEditImg::Center(), THISBACK(AlignCenter))
+	   .Check(a == ALIGN_CENTER)
+	   .Key(key);
+}
+
+void RichEdit::JustifyTool(Bar& bar, dword key)
+{
+	int a = formatinfo.paravalid & RichText::ALIGN ? formatinfo.align : Null;
+	bar.Add(!IsReadOnly(), t_("Justify"), RichEditImg::Justify(), THISBACK(AlignJustify))
+	   .Check(a == ALIGN_JUSTIFY)
+	   .Key(key);
+}
+
+void  RichEdit::RoundBulletTool(Bar& bar, dword key)
+{
+	int a = formatinfo.paravalid & RichText::BULLET ? formatinfo.bullet : Null;
+	bar.Add(!IsReadOnly(), t_("Round bullet"), RichEditImg::RoundBullet(),
+	        THISBACK1(SetBullet, RichPara::BULLET_ROUND))
+	   .Check(a == RichPara::BULLET_ROUND)
+	   .Key(key);
+}
+
+void  RichEdit::RoundWhiteBulletTool(Bar& bar, dword key)
+{
+	int a = formatinfo.paravalid & RichText::BULLET ? formatinfo.bullet : Null;
+	bar.Add(!IsReadOnly(), t_("White round bullet"), RichEditImg::RoundWhiteBullet(),
+	        THISBACK1(SetBullet, RichPara::BULLET_ROUNDWHITE))
+	   .Check(a == RichPara::BULLET_ROUNDWHITE)
+	   .Key(key);
+}
+
+void  RichEdit::BoxBulletTool(Bar& bar, dword key)
+{
+	int a = formatinfo.paravalid & RichText::BULLET ? formatinfo.bullet : Null;
+	bar.Add(!IsReadOnly(), t_("Box bullet"), RichEditImg::BoxBullet(),
+	        THISBACK1(SetBullet, RichPara::BULLET_BOX))
+	   .Check(a == RichPara::BULLET_BOX)
+	   .Key(key);
+}
+
+void  RichEdit::BoxWhiteBulletTool(Bar& bar, dword key)
+{
+	int a = formatinfo.paravalid & RichText::BULLET ? formatinfo.bullet : Null;
+	bar.Add(!IsReadOnly(), t_("White box bullet"), RichEditImg::BoxWhiteBullet(),
+	        THISBACK1(SetBullet, RichPara::BULLET_BOXWHITE))
+	   .Check(a == RichPara::BULLET_BOXWHITE)
+	   .Key(key);
+}
+
+void  RichEdit::TextBulletTool(Bar& bar, dword key)
+{
+	int a = formatinfo.paravalid & RichText::BULLET ? formatinfo.bullet : Null;
+	bar.Add(!IsReadOnly(), t_("Text bullet"), RichEditImg::TextBullet(),
+	        THISBACK1(SetBullet, RichPara::BULLET_TEXT))
+	   .Check(a == RichPara::BULLET_TEXT)
+	   .Key(key);
+}
+
+void RichEdit::ParaFormatTool(Bar& bar, dword key)
+{
+	bar.Add(!IsReadOnly(), t_("Paragraph format.."), RichEditImg::ParaFormat(), THISBACK(ParaFormat))
+	   .Key(key);
+}
+
+void RichEdit::LabelTool(Bar& bar, int width)
+{
+	bar.Add(!IsReadOnly(), label, width);
+}
+
+void RichEdit::ToParaTool(Bar& bar, dword key)
+{
+	bar.Add(!IsReadOnly() && IsSelection() && !tablesel, t_("To single paragraph"),
+	        RichEditImg::ToPara(), THISBACK(ToPara))
+	   .Key(key);
+}
+
+void RichEdit::ParaTools(Bar& bar)
+{
+	LeftTool(bar);
+	CenterTool(bar);
+	RightTool(bar);
+	JustifyTool(bar);
+	bar.Gap();
+	RoundBulletTool(bar);
+	RoundWhiteBulletTool(bar);
+	BoxBulletTool(bar);
+	BoxWhiteBulletTool(bar);
+	TextBulletTool(bar);
+	bar.Gap();
+	ToParaTool(bar);
+	bar.Gap();
+	ParaFormatTool(bar);
+}
+
+void RichEdit::UndoTool(Bar& bar, dword key)
+{
+	bar.Add(!IsReadOnly() && undo.GetCount(), t_("Undo"), CtrlImg::undo(), THISBACK(Undo))
+	   .Repeat()
+	   .Key(K_ALT_BACKSPACE)
+	   .Key(key);
+}
+
+void RichEdit::RedoTool(Bar& bar, dword key)
+{
+	bar.Add(!IsReadOnly() && redo.GetCount(), t_("Redo"), CtrlImg::redo(), THISBACK(Redo))
+	   .Repeat()
+	   .Key(K_SHIFT|K_ALT_BACKSPACE)
+	   .Key(key);
+}
+
+void RichEdit::CutTool(Bar& bar, dword key)
+{
+	bar.Add(!IsReadOnly() && IsSelection() || objectpos >= 0, t_("Cut"), CtrlImg::cut(), THISBACK(Cut))
+	   .Key(K_SHIFT_DELETE)
+	   .Key(key);
+}
+
+void RichEdit::CopyTool(Bar& bar, dword key)
+{
+	bar.Add(!IsReadOnly() && IsSelection() || objectpos >= 0,
+	        t_("Copy"), CtrlImg::copy(), THISBACK(Copy))
+	   .Key(K_CTRL_INSERT)
+	   .Key(key);
+}
+
+void RichEdit::PasteTool(Bar& bar, dword key)
+{
+	bar.Add(!IsReadOnly(), t_("Paste"), CtrlImg::paste(), THISBACK(Paste))
+	   .Key(K_SHIFT_INSERT)
+	   .Key(key);
+}
+
+void RichEdit::ObjectTool(Bar& bar, dword key)
+{
+	for(int i = 0; i < RichObject::GetTypeCount(); i++) {
+		String cn = RichObject::GetType(i).GetCreateName();
+		if(!IsNull(cn))
+			bar.Add(cn, THISBACK1(InsertObject, i));
+	}
+}
+
+void RichEdit::PrintTool(Bar& bar, dword key)
+{
+	bar.Add(t_("Print"), CtrlImg::print(), THISBACK(DoPrint))
+	   .Key(key);
+}
+
+void RichEdit::FindReplaceTool(Bar& bar, dword key)
+{
+	bar.Add(!IsReadOnly(), t_("Find/Replace"), RichEditImg::FindReplace(), THISBACK(OpenFindReplace))
+	   .Key(key);
+}
+
+void RichEdit::EditTools(Bar& bar)
+{
+	CutTool(bar);
+	CopyTool(bar);
+	PasteTool(bar);
+	bar.Gap();
+	UndoTool(bar);
+	RedoTool(bar);
+	bar.Gap();
+	FindReplaceTool(bar);
+}
+
+void RichEdit::InsertTableTool(Bar& bar, dword key)
+{
+	bar.Add(!IsSelection() && !IsReadOnly(),
+	        t_("Insert table.."), RichEditImg::InsertTable(), THISBACK(InsertTable))
+	   .Key(key);
+}
+
+void RichEdit::TablePropertiesTool(Bar& bar, dword key)
+{
+	bar.Add(!IsSelection() && cursorp.table && !IsReadOnly(),
+	        t_("Table properties.."), RichEditImg::TableProperties(),
+	        THISBACK(TableProps))
+	   .Key(key);
+}
+
+void RichEdit::InsertTableRowTool(Bar& bar, dword key)
+{
+	bar.Add(!IsSelection() && cursorp.table && !IsReadOnly(),
+	        t_("Insert row"), RichEditImg::TableInsertRow(),
+	        THISBACK(TableInsertRow))
+	   .Key(key);
+}
+
+void RichEdit::RemoveTableRowTool(Bar& bar, dword key)
+{
+	bar.Add(!IsSelection() && cursorp.table && !IsReadOnly(),
+	        t_("Remove row"), RichEditImg::TableRemoveRow(), THISBACK(TableRemoveRow))
+	   .Key(key);
+}
+
+void RichEdit::InsertTableColumnTool(Bar& bar, dword key)
+{
+	bar.Add(!IsSelection() && cursorp.table && !IsReadOnly(),
+	        t_("Insert column"), RichEditImg::TableInsertColumn(),
+	        THISBACK(TableInsertColumn))
+	   .Key(key);
+}
+
+void RichEdit::RemoveTableColumnTool(Bar& bar, dword key)
+{
+	bar.Add(!IsSelection() && cursorp.table && !IsReadOnly(),
+	        t_("Remove column"), RichEditImg::TableRemoveColumn(), THISBACK(TableRemoveColumn))
+	   .Key(key);
+}
+
+void RichEdit::SplitJoinCellTool(Bar& bar, dword key)
+{
+	if(tablesel)
+		bar.Add(!IsReadOnly(), t_("Join cells"), RichEditImg::JoinCell(), THISBACK(JoinCell))
+		   .Key(key);
+	else
+		bar.Add(!IsSelection() && cursorp.table && !IsReadOnly(), t_("Split cell.."),
+		        RichEditImg::SplitCell(), THISBACK(SplitCell))
+		   .Key(key);
+}
+
+void RichEdit::CellPropertiesTool(Bar& bar, dword key)
+{
+	bar.Add(cursorp.table && (!IsSelection() || tablesel) && !IsReadOnly(),
+	        t_("Cell properties.."), RichEditImg::CellProperties(), THISBACK(CellProperties))
+	   .Key(key);
+}
+
+void RichEdit::TableTools(Bar& bar)
+{
+	InsertTableTool(bar);
+	TablePropertiesTool(bar);
+	InsertTableRowTool(bar);
+	RemoveTableRowTool(bar);
+	InsertTableColumnTool(bar);
+	RemoveTableColumnTool(bar);
+	SplitJoinCellTool(bar);
+	CellPropertiesTool(bar);
+}
+
+void RichEdit::DefaultBar(Bar& bar, bool extended)
+{
+	EditTools(bar);
+	bar.Gap();
+	PrintTool(bar);
+	bar.Gap();
+	FontTools(bar);
+	bar.Gap();
+	InkTool(bar);
+	PaperTool(bar);
+	bar.Gap();
+	LanguageTool(bar);
+	SpellCheckTool(bar);
+	if(extended) {
+		bar.Gap();
+		IndexEntryTool(bar, INT_MAX);
+	}
+	bar.Break();
+	StyleTool(bar);
+	bar.Gap();
+	ParaTools(bar);
+	bar.Gap();
+	if(extended) {
+		LabelTool(bar);
+		bar.Gap();
+	}
+	TableTools(bar);
+	if(extended) {
+		bar.Gap();
+		HyperlinkTool(bar, INT_MAX);
+	}
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/RichEdit/Tool.cpp.$old b/uppsrc/RichEdit/Tool.cpp.$old
new file mode 100644
index 000000000..214825ad0
--- /dev/null
+++ b/uppsrc/RichEdit/Tool.cpp.$old
@@ -0,0 +1,399 @@
+#include "RichEdit.h"
+
+#define LNGMODULE richedit_lay
+#define LNGFILE <RichEdit/RichEdit.lay>
+
+#define LANGUAGE LNGC_('E', 'N', 'U', 'S', 17)
+#include <Core/lng_master.h>
+
+#define LANGUAGE LNGC_('C', 'S', 'C', 'Z', 15)
+#include <Core/lng_version.h>
+
+
+void RichEdit::StyleTool(Bar& bar, int width)
+{
+	bar.Add(style, width);
+}
+
+void RichEdit::FaceTool(Bar& bar, int width)
+{
+	bar.Add(face, width);
+}
+
+void RichEdit::HeightTool(Bar& bar, int width)
+{
+	bar.Add(height, width);
+}
+
+void RichEdit::BoldTool(Bar& bar, dword key)
+{
+	bar.Add(s_(RichEditBold),
+	        formatinfo.charvalid & RichText::BOLD ? RichEditImg::Bold() : RichEditImg::BoldMixed(),
+	        THISBACK(Bold))
+	   .Check(formatinfo.IsBold() && (formatinfo.charvalid & RichText::BOLD))
+	   .Key(key);
+}
+
+void RichEdit::ItalicTool(Bar& bar, dword key)
+{
+	bar.Add(s_(RichEditItalic),
+            formatinfo.charvalid & RichText::ITALIC ? RichEditImg::Italic() : RichEditImg::ItalicMixed(),
+	        THISBACK(Italic))
+	   .Check(formatinfo.IsItalic() && (formatinfo.charvalid & RichText::ITALIC))
+	   .Key(key);
+}
+
+void RichEdit::UnderlineTool(Bar& bar, dword key)
+{
+	bar.Add(s_(RichEditUnderline),
+	        formatinfo.charvalid & RichText::UNDERLINE ? RichEditImg::Underline()
+	                                               : RichEditImg::UnderlineMixed(),
+	        THISBACK(Underline))
+	   .Check(formatinfo.IsUnderline() && (formatinfo.charvalid & RichText::UNDERLINE))
+	   .Key(key);
+}
+
+void RichEdit::StrikeoutTool(Bar& bar, dword key)
+{
+	bar.Add(s_(RichEditStrikeout),
+	        formatinfo.charvalid & RichText::STRIKEOUT ? RichEditImg::Strikeout()
+	                                               : RichEditImg::StrikeoutMixed(),
+	        THISBACK(Strikeout))
+	   .Check(formatinfo.IsStrikeout() && (formatinfo.charvalid & RichText::STRIKEOUT))
+	   .Key(key);
+}
+
+
+void RichEdit::CapitalsTool(Bar& bar, dword key)
+{
+	bar.Add(s_(RichEditCapitals),
+	        formatinfo.charvalid & RichText::CAPITALS  ? RichEditImg::Capitals()
+	                                               : RichEditImg::CapitalsMixed(),
+	        THISBACK(Capitals))
+	   .Check(formatinfo.capitals && (formatinfo.charvalid & RichText::CAPITALS));
+}
+
+void RichEdit::SuperscriptTool(Bar& bar, dword key)
+{
+	int i = formatinfo.charvalid & RichText::SSCRIPT ? formatinfo.sscript : 0;
+	bar.Add(s_(RichEditSuperscript),
+	        formatinfo.charvalid & RichText::SSCRIPT ? RichEditImg::SuperScript()
+	                                             : RichEditImg::SuperScriptMixed(),
+			THISBACK1(SetScript, i == 1 ? 0 : 1))
+	   .Check(i == 1);
+}
+
+void RichEdit::SubscriptTool(Bar& bar, dword key)
+{
+	int i = formatinfo.charvalid & RichText::SSCRIPT ? formatinfo.sscript : 0;
+	bar.Add(s_(RichEditSubscript),
+	        formatinfo.charvalid & RichText::SSCRIPT ? RichEditImg::SubScript()
+	                                             : RichEditImg::SubScriptMixed(),
+			THISBACK1(SetScript, i == 2 ? 0 : 2))
+	   .Check(i == 2);
+}
+
+void RichEdit::FontTools(Bar& bar)
+{
+	FaceTool(bar);
+	HeightTool(bar);
+	bar.Gap();
+	BoldTool(bar);
+	ItalicTool(bar);
+	UnderlineTool(bar);
+	StrikeoutTool(bar);
+	CapitalsTool(bar);
+	SuperscriptTool(bar);
+	SubscriptTool(bar);
+}
+
+void RichEdit::InkTool(Bar& bar)
+{
+	bar.Add(ink);
+}
+
+void RichEdit::PaperTool(Bar& bar)
+{
+	bar.Add(paper);
+}
+
+void RichEdit::LanguageTool(Bar& bar, int width)
+{
+	bar.Add(language, width);
+}
+
+void RichEdit::SpellCheckTool(Bar& bar)
+{
+	bar.Add(s_(RichEditShowSpellErrs), RichEditImg::SpellCheck(), THISBACK(SpellCheck))
+	   .Check(spellcheck);
+}
+
+void RichEdit::IndexEntryTool(Bar& bar, int width)
+{
+	bar.Add(indexentry, width);
+}
+
+void RichEdit::HyperlinkTool(Bar& bar, int width)
+{
+	bar.Add(hyperlink, width);
+}
+
+void RichEdit::LeftTool(Bar& bar, dword key)
+{
+	int a = formatinfo.paravalid & RichText::ALIGN ? formatinfo.align : Null;
+	bar.Add(s_(RichEditLeft), RichEditImg::Left(), THISBACK(AlignLeft))
+	   .Check(a == ALIGN_LEFT)
+	   .Key(K_CTRL_L);
+}
+
+void RichEdit::RightTool(Bar& bar, dword key)
+{
+	int a = formatinfo.paravalid & RichText::ALIGN ? formatinfo.align : Null;
+	bar.Add(s_(RichEditRight), RichEditImg::Right(), THISBACK(AlignRight))
+	   .Check(a == ALIGN_RIGHT)
+	   .Key(key);
+}
+
+void RichEdit::CenterTool(Bar& bar, dword key)
+{
+	int a = formatinfo.paravalid & RichText::ALIGN ? formatinfo.align : Null;
+	bar.Add(s_(RichEditCenter), RichEditImg::Center(), THISBACK(AlignCenter))
+	   .Check(a == ALIGN_CENTER)
+	   .Key(key);
+}
+
+void RichEdit::JustifyTool(Bar& bar, dword key)
+{
+	int a = formatinfo.paravalid & RichText::ALIGN ? formatinfo.align : Null;
+	bar.Add(s_(RichEditJustify), RichEditImg::Justify(), THISBACK(AlignJustify))
+	   .Check(a == ALIGN_JUSTIFY)
+	   .Key(key);
+}
+
+void  RichEdit::RoundBulletTool(Bar& bar, dword key)
+{
+	int a = formatinfo.paravalid & RichText::BULLET ? formatinfo.bullet : Null;
+	bar.Add(s_(RichEditRoundBullet), RichEditImg::RoundBullet(),
+	        THISBACK1(SetBullet, RichPara::BULLET_ROUND))
+	   .Check(a == RichPara::BULLET_ROUND)
+	   .Key(key);
+}
+
+void  RichEdit::RoundWhiteBulletTool(Bar& bar, dword key)
+{
+	int a = formatinfo.paravalid & RichText::BULLET ? formatinfo.bullet : Null;
+	bar.Add(s_(RichEditWhiteRndBlt), RichEditImg::RoundWhiteBullet(),
+	        THISBACK1(SetBullet, RichPara::BULLET_ROUNDWHITE))
+	   .Check(a == RichPara::BULLET_ROUNDWHITE)
+	   .Key(key);
+}
+
+void  RichEdit::BoxBulletTool(Bar& bar, dword key)
+{
+	int a = formatinfo.paravalid & RichText::BULLET ? formatinfo.bullet : Null;
+	bar.Add(s_(RichEditBxBullet), RichEditImg::BoxBullet(),
+	        THISBACK1(SetBullet, RichPara::BULLET_BOX))
+	   .Check(a == RichPara::BULLET_BOX)
+	   .Key(key);
+}
+
+void  RichEdit::BoxWhiteBulletTool(Bar& bar, dword key)
+{
+	int a = formatinfo.paravalid & RichText::BULLET ? formatinfo.bullet : Null;
+	bar.Add(s_(RichEditWhiteBxBullet), RichEditImg::BoxWhiteBullet(),
+	        THISBACK1(SetBullet, RichPara::BULLET_BOXWHITE))
+	   .Check(a == RichPara::BULLET_BOXWHITE)
+	   .Key(key);
+}
+
+void  RichEdit::TextBulletTool(Bar& bar, dword key)
+{
+	int a = formatinfo.paravalid & RichText::BULLET ? formatinfo.bullet : Null;
+	bar.Add(s_(RichEditTextBlt), RichEditImg::TextBullet(),
+	        THISBACK1(SetBullet, RichPara::BULLET_TEXT))
+	   .Check(a == RichPara::BULLET_TEXT)
+	   .Key(key);
+}
+
+void RichEdit::ParaFormatTool(Bar& bar, dword key)
+{
+	bar.Add(s_(RichEditParaFmt2), RichEditImg::ParaFormat(), THISBACK(ParaFormat))
+	   .Key(key);
+}
+
+void RichEdit::LabelTool(Bar& bar, int width)
+{
+	bar.Add(label, width);
+}
+
+void RichEdit::ParaTools(Bar& bar)
+{
+	LeftTool(bar);
+	CenterTool(bar);
+	RightTool(bar);
+	JustifyTool(bar);
+	bar.Gap();
+	RoundBulletTool(bar);
+	RoundWhiteBulletTool(bar);
+	BoxBulletTool(bar);
+	BoxWhiteBulletTool(bar);
+	TextBulletTool(bar);
+	bar.Gap();
+	ParaFormatTool(bar);
+}
+
+void RichEdit::UndoTool(Bar& bar, dword key)
+{
+	bar.Add(undo.GetCount(), s_(RichEditUndo), CtrlImg::undo(), THISBACK(Undo))
+	   .Repeat()
+	   .Key(key);
+}
+
+void RichEdit::RedoTool(Bar& bar, dword key)
+{
+	bar.Add(redo.GetCount(), s_(RichEditRedo), CtrlImg::redo(), THISBACK(Redo))
+	   .Repeat()
+	   .Key(key);
+}
+
+void RichEdit::CutTool(Bar& bar, dword key)
+{
+	bar.Add(IsSelection() || objectpos >= 0, s_(RichEditCut), CtrlImg::cut(), THISBACK(Cut))
+	   .Key(key);
+}
+
+void RichEdit::CopyTool(Bar& bar, dword key)
+{
+	bar.Add(IsSelection() || objectpos >= 0, s_(RichEditCopy), CtrlImg::copy(), THISBACK(Copy))
+	   .Key(key);
+}
+
+void RichEdit::PasteTool(Bar& bar, dword key)
+{
+	bar.Add(s_(RichEditPaste), CtrlImg::paste(), THISBACK(Paste))
+	   .Key(key);
+}
+
+void RichEdit::ObjectTool(Bar& bar, dword key)
+{
+	for(int i = 0; i < RichObject::GetTypeCount(); i++) {
+		String cn = RichObject::GetType(i).GetCreateName();
+		if(!IsNull(cn))
+			bar.Add(cn, THISBACK1(InsertObject, i));
+	}
+}
+
+void RichEdit::PrintTool(Bar& bar, dword key)
+{
+	bar.Add(s_(RichEditPrint), CtrlImg::print(), THISBACK(Print))
+	   .Key(key);
+}
+
+void RichEdit::FindReplaceTool(Bar& bar, dword key)
+{
+	bar.Add(s_(RichEditFind_Replace), RichEditImg::FindReplace(), THISBACK(OpenFindReplace))
+	   .Key(key);
+}
+
+void RichEdit::EditTools(Bar& bar)
+{
+	UndoTool(bar);
+	RedoTool(bar);
+	bar.Gap();
+	CutTool(bar);
+	CopyTool(bar);
+	PasteTool(bar);
+	bar.Gap();
+	FindReplaceTool(bar);
+}
+
+void RichEdit::InsertTableTool(Bar& bar, dword key)
+{
+	bar.Add(!IsSelection(), s_(RichEditInsertTable), RichEditImg::InsertTable(), THISBACK(InsertTable))
+	   .Key(key);
+}
+
+void RichEdit::TablePropertiesTool(Bar& bar, dword key)
+{
+	bar.Add(!IsSelection() && cursorp.table, s_(RichTextTablePropsCaption), RichEditImg::TableProperties(),
+	        THISBACK(TableProps))
+	   .Key(key);
+}
+
+void RichEdit::InsertTableRowTool(Bar& bar, dword key)
+{
+	bar.Add(!IsSelection() && cursorp.table, s_(RichEditInsertTableRow), RichEditImg::TableInsertRow(),
+	        THISBACK(TableInsertRow))
+	   .Key(key);
+}
+
+void RichEdit::RemoveTableRowTool(Bar& bar, dword key)
+{
+	bar.Add(!IsSelection() && cursorp.table, s_(RichEditRemoveTableRow),
+	        RichEditImg::TableRemoveRow(), THISBACK(TableRemoveRow))
+	   .Key(key);
+}
+
+void RichEdit::InsertTableColumnTool(Bar& bar, dword key)
+{
+	bar.Add(!IsSelection() && cursorp.table, s_(RichEditInsertTableColumn), RichEditImg::TableInsertColumn(),
+	        THISBACK(TableInsertColumn))
+	   .Key(key);
+}
+
+void RichEdit::RemoveTableColumnTool(Bar& bar, dword key)
+{
+	bar.Add(!IsSelection() && cursorp.table, s_(RichEditRemoveTableColumn),
+	        RichEditImg::TableRemoveColumn(), THISBACK(TableRemoveColumn))
+	   .Key(key);
+}
+
+void RichEdit::SplitJoinCellTool(Bar& bar, dword key)
+{
+	bar.Add(!IsSelection() && cursorp.table, s_(RichEditSplitJoinCell),
+	        RichEditImg::TableRemoveColumn(), THISBACK(TableRemoveColumn))
+	   .Key(key);
+}
+
+void RichEdit::TableTools(Bar& bar)
+{
+	InsertTableTool(bar);
+	TablePropertiesTool(bar);
+	InsertTableRowTool(bar);
+	RemoveTableRowTool(bar);
+	InsertTableColumnTool(bar);
+	RemoveTableColumnTool(bar);
+}
+
+void RichEdit::DefaultBar(Bar& bar, bool extended)
+{
+	StyleTool(bar);
+	bar.Gap();
+	FontTools(bar);
+	bar.Gap();
+	InkTool(bar);
+	PaperTool(bar);
+	bar.Gap();
+	LanguageTool(bar);
+	SpellCheckTool(bar);
+	if(extended) {
+		bar.Gap();
+		IndexEntryTool(bar);
+	}
+	bar.Break();
+	if(extended) {
+		HyperlinkTool(bar);
+		bar.Gap();
+	}
+	ParaTools(bar);
+	bar.Gap();
+	if(extended) {
+		LabelTool(bar);
+		bar.Gap();
+	}
+	EditTools(bar);
+	bar.Gap();
+	TableTools(bar);
+	bar.Gap();
+	PrintTool(bar);
+}
diff --git a/uppsrc/RichEdit/Undo.cpp b/uppsrc/RichEdit/Undo.cpp
new file mode 100644
index 000000000..84d8e10cf
--- /dev/null
+++ b/uppsrc/RichEdit/Undo.cpp
@@ -0,0 +1,89 @@
+#include "RichEdit.h"
+
+NAMESPACE_UPP
+
+void RichEdit::UndoInsert::Apply(RichText& txt)
+{
+	txt.Remove(pos, length);
+}
+
+RichEdit::UndoRec *RichEdit::UndoInsert::GetRedo(const RichText& txt)
+{
+	return new UndoRemove(txt, pos, length);
+}
+
+RichEdit::UndoInsert::UndoInsert(int pos, int length, bool typing)
+: pos(pos), length(length), typing(typing) {}
+
+// -----------------------
+
+void RichEdit::UndoRemove::Apply(RichText& txt)
+{
+	txt.Insert(pos, text);
+}
+
+RichEdit::UndoRec *RichEdit::UndoRemove::GetRedo(const RichText& txt)
+{
+	return new UndoInsert(pos, text.GetLength());
+}
+
+RichEdit::UndoRemove::UndoRemove(const RichText& txt, int pos, int length)
+: pos(pos)
+{
+	text = txt.Copy(pos, length);
+}
+
+// -----------------------
+
+void RichEdit::UndoFormat::Apply(RichText& txt)
+{
+	txt.RestoreFormat(pos, format);
+}
+
+RichEdit::UndoRec *RichEdit::UndoFormat::GetRedo(const RichText& txt)
+{
+	return new UndoFormat(txt, pos, length);
+}
+
+RichEdit::UndoFormat::UndoFormat(const RichText& txt, int pos, int length)
+: pos(pos), length(length)
+{
+	format = txt.SaveFormat(pos, length);
+}
+
+// -----------------------
+
+void RichEdit::UndoStyle::Apply(RichText& txt)
+{
+	txt.SetStyle(id, style);
+}
+
+RichEdit::UndoRec *RichEdit::UndoStyle::GetRedo(const RichText& txt)
+{
+	return new UndoStyle(txt, id);
+}
+
+RichEdit::UndoStyle::UndoStyle(const RichText& txt, const Uuid& id)
+: id(id)
+{
+	style = txt.GetStyle(id);
+}
+
+// -----------------------
+
+void RichEdit::UndoStyles::Apply(RichText& txt)
+{
+	txt.SetStyles(styles);
+}
+
+RichEdit::UndoRec *RichEdit::UndoStyles::GetRedo(const RichText& txt)
+{
+	return new UndoStyles(txt);
+}
+
+RichEdit::UndoStyles::UndoStyles(const RichText& txt)
+{
+	styles <<= txt.GetStyles();
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/RichEdit/UnitEdit.cpp b/uppsrc/RichEdit/UnitEdit.cpp
new file mode 100644
index 000000000..0e6957a1e
--- /dev/null
+++ b/uppsrc/RichEdit/UnitEdit.cpp
@@ -0,0 +1,159 @@
+#include "RichEdit.h"
+
+NAMESPACE_UPP
+
+double UnitMultiplier(int unit) {
+	static double m[] =
+	{
+		1,
+		72.0 / 600,
+		1.0 / 600,
+		25.4 / 600,
+		2.54 / 600,
+	};
+	ASSERT(unit >= UNIT_DOT && unit <= UNIT_CM);
+	return m[unit];
+}
+
+const char *UnitText(int unit) {
+	static const char *txt[] =
+	{
+		"dt",
+		"pt",
+		"\"",
+		"mm",
+		"cm"
+	};
+	return txt[unit];
+}
+
+void UnitEdit::Read(double& d, int& u) const
+{
+	String txt = GetText().ToString();
+	const char *s = txt;
+	u = unit;
+	d = Null;
+	if(s && *s) {
+		char *e;
+		int sign = 1;
+		for(;;) {
+			if(*s == '-' && sgn)
+				sign = -1;
+			else
+			if(*s != ' ')
+				break;
+			s++;
+		}
+		d = sign * strtod(s, &e);
+		if(e == s) {
+			d = Null;
+			return;
+		}
+		while(*e == ' ') e++;
+		if(*e == '\"' || *e == 'i')
+			u = UNIT_INCH;
+		if(*e == 'm')
+			u = UNIT_MM;
+		if(*e == 'p' || *e == 'b')
+			u = UNIT_POINT;
+		if(*e == 'c')
+			u = UNIT_CM;
+		if(*e == 'd')
+			u = UNIT_DOT;
+	}
+}
+
+Value UnitEdit::GetData() const
+{
+	double q;
+	int u;
+	Read(q, u);
+	return IsNull(q) ? Null : int(q / UnitMultiplier(u) + 0.5);
+}
+
+String UnitEdit::AsText(double d, int unit)
+{
+	if(IsNull(d))
+		return Null;
+	String utxt = UnitText(unit);
+	if(unit == UNIT_POINT)
+		d = floor(4 * d + 0.5) / 4;
+	return AsString(d, unit == UNIT_DOT ? 0 : unit == UNIT_MM ? 1 : 2) + ' ' + utxt;
+}
+
+String UnitEdit::DotAsText(int dot, int unit)
+{
+	if(IsNull(dot)) return Null;
+	return AsText(dot * UnitMultiplier(unit), unit);
+}
+
+Value UnitEdit::Format(const Value& v) const
+{
+	return DotAsText(v, unit);
+}
+
+void UnitEdit::SetData(const Value& v)
+{
+	SetText(DotAsText(v, unit).ToWString());
+}
+
+bool UnitEdit::Key(dword key, int repcnt)
+{
+	if(key == K_UP)   { Spin(+1); return true; }
+	if(key == K_DOWN) { Spin(-1); return true; }
+	return EditField::Key(key, repcnt);
+}
+
+void UnitEdit::Spin(int delta)
+{
+	double q;
+	int u;
+	Read(q, u);
+	if(IsNull(q))
+		q = 0;
+	else {
+		double h;
+		switch(u) {
+		case UNIT_DOT:   h = 10; break;
+		case UNIT_POINT: h = 0.5; break;
+		case UNIT_MM:    h = 0.5; break;
+		case UNIT_CM:
+		case UNIT_INCH:  h = 0.05; break;
+		default:         NEVER();
+		}
+		h *= delta;
+		q = ceil(q / h + 1e-2) * h;
+		if(!sgn && q < 0)
+			q = 0;
+	}
+	SetText(AsText(q, unit).ToWString());
+	UpdateAction();
+}
+
+int CharFilterUnitEdit(int c)
+{
+	return IsAlpha(c) ? ToLower(c) : IsDigit(c) || c == ' ' || c == '\"' || c == '.' ? c : 0;
+}
+
+int CharFilterUnitEditSgn(int c)
+{
+	return c == '-' ? c : CharFilterUnitEdit(c);
+}
+
+UnitEdit& UnitEdit::WithSgn(bool b)
+{
+	sgn = b;
+	SetFilter(b ? CharFilterUnitEditSgn : CharFilterUnitEdit);
+	return *this;
+}
+
+UnitEdit::UnitEdit()
+{
+	AddFrame(spin);
+	spin.inc.WhenRepeat = spin.inc.WhenPush = THISBACK1(Spin, 1);
+	spin.dec.WhenRepeat = spin.dec.WhenPush = THISBACK1(Spin, -1);
+	unit = UNIT_DOT;
+	WithSgn(false);
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/RichEdit/init b/uppsrc/RichEdit/init
new file mode 100644
index 000000000..c8aa774ff
--- /dev/null
+++ b/uppsrc/RichEdit/init
@@ -0,0 +1,5 @@
+#ifndef _RichEdit_icpp_init_stub
+#define _RichEdit_icpp_init_stub
+#include "CtrlLib/init"
+#include "RichEdit.icpp"
+#endif
diff --git a/uppsrc/RichText/AUTHORS b/uppsrc/RichText/AUTHORS
new file mode 100644
index 000000000..f782e5b62
--- /dev/null
+++ b/uppsrc/RichText/AUTHORS
@@ -0,0 +1,2 @@
+Mirek Fidler <cxl@ntllib.org>
+Tomas Rylek  <rylek@volny.cz>
\ No newline at end of file
diff --git a/uppsrc/RichText/COPYING b/uppsrc/RichText/COPYING
new file mode 100644
index 000000000..33aa39102
--- /dev/null
+++ b/uppsrc/RichText/COPYING
@@ -0,0 +1,30 @@
+Copyright (C) 2005 Mirek Fidler, Tomas Rylek and various contributors (see AUTHORS)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to
+deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies of the Software and its Copyright notices. In addition publicly
+documented acknowledgment must be given that this software has been used if no
+source code of this software is made available publicly. This includes
+acknowledgments in either Copyright notices, Manuals, Publicity and Marketing
+documents or any documentation provided with any product containing this
+software. This License does not apply to any software that links to the
+libraries provided by this software (statically or dynamically), but only to
+the software provided.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+-----------
+
+Please see the COPYING.PLAIN for a plain-english explanation of this notice
+and it's intent.
diff --git a/uppsrc/RichText/COPYING-PLAIN b/uppsrc/RichText/COPYING-PLAIN
new file mode 100644
index 000000000..770a8132f
--- /dev/null
+++ b/uppsrc/RichText/COPYING-PLAIN
@@ -0,0 +1,33 @@
+Plain English Copyright Notice
+
+This file is not intended to be the actual License. The reason this file
+exists is that we here are programmers and engineers. We aren't lawyers. We
+provide licenses that we THINK say the right things, but we have our own
+intentions at heart. This is a plain-english explanation of what those
+intentions are, and if you follow them you will be within the "spirit" of
+the license.
+
+The intent is for us to enjoy writing software that is useful to us (the
+AUTHORS) and allow others to use it freely and also benefit from the work we
+put into making it. We don't want to restrict others using it. They should
+not *HAVE* to make the source code of the applications they write that
+simply link to these libraries (be that statically or dynamically), or for
+them to be limited as to what license they choose to use (be it open, closed
+or anything else). But we would like to know you are using these libraries.
+We simply would like to know that it has been useful to someone. This is why
+we ask for acknowledgement of some sort.
+
+You can do what you want with the source of this software - it doesn't
+matter. We still have it here for ourselves and it is open and free to use
+and download and play with. It can't be taken away. We don't really mind what
+you do with the source to your software. We would simply like to know that
+you are using it - especially if it makes it to a commerical product. If you
+simply e-mail all the AUTHORS (see COPYING and AUTHORS files) telling us, and
+then make sure you include a paragraph or page in the manual or in the "About.."
+box for the product with the copyright notice and state that you used this
+software, we will be very happy. If you want to contribute back modifications
+and fixes you may have made we will welcome those too with open arms (generally).
+If you want help with changes needed, ports needed or features to be added,
+arrangements can be easily made with some dialogue.
+
+Mirek Fidler <cxl@ntllib.org>
diff --git a/uppsrc/RichText/EncodeHTML.cpp b/uppsrc/RichText/EncodeHTML.cpp
new file mode 100644
index 000000000..06e53b16c
--- /dev/null
+++ b/uppsrc/RichText/EncodeHTML.cpp
@@ -0,0 +1,340 @@
+#include "RichText.h"
+
+NAMESPACE_UPP
+
+String HtmlFontStyle(Font f, Font base)
+{
+	String style;
+	if(f.GetFace() != base.GetFace())
+		switch(f.GetFace()) {
+		case Font::ARIAL: style = "font-family:sans-serif;"; break;
+		case Font::ROMAN: style = "font-family:serif;"; break;
+		case Font::COURIER: style = "font-family:monospace;"; break;
+		}
+	if(f.GetHeight() != base.GetHeight())
+		style << Sprintf("font-size:%dpt;", f.GetHeight() * 72 / 600);
+	if(f.IsBold() != base.IsBold())
+		style << (f.IsBold() ? "font-weight:bold;" : "font-weight:normal;");
+	if(f.IsItalic() != base.IsItalic())
+		style << (f.IsItalic() ? "font-style:italic;" : "font-style:normal;");
+	if(f.IsUnderline() != base.IsUnderline())
+		style << (f.IsUnderline() ? "text-decoration:underline;" : "text-decoration:none;");
+	return style;
+}
+
+String HtmlFontStyle(Font f)
+{
+	String style;
+	switch(f.GetFace()) {
+		case Font::ARIAL: style = "font-family:sans-serif;"; break;
+		case Font::ROMAN: style = "font-family:serif;"; break;
+		case Font::COURIER: style = "font-family:monospace;"; break;
+	}
+	style << Sprintf("font-size:%dpt;", f.GetHeight() * 72 / 600);
+	style << (f.IsBold() ? "font-weight:bold;" : "font-weight:normal;");
+	style << (f.IsItalic() ? "font-style:italic;" : "font-style:normal;");
+	style << (f.IsUnderline() ? "text-decoration:underline;" : "text-decoration:none;");
+	return style;
+}
+
+String HtmlDot(int q, Zoom z)
+{
+	return String().Cat() << ' ' << z * q << "px";
+}
+
+String HtmlDotl(int q, Zoom z)
+{
+	return String().Cat() << ' ' << max((int)!!q, z * q) << "px";
+}
+
+String HtmlStyleColor(Color c, const char *cl = "color")
+{
+	return Format(String(cl) + ":#%02x%02x%02x;", c.GetR(), c.GetG(), c.GetB());
+}
+
+String HtmlCharStyle(const RichPara::CharFormat& cf, const RichPara::CharFormat& sf)
+{
+	String style;
+	if(cf.ink != sf.ink)
+		style = HtmlStyleColor(cf.ink);
+	return style + HtmlFontStyle(cf, sf);
+}
+
+String HtmlParaStyle(const RichPara::Format& f, Zoom z)
+{
+	String style;
+	int lm = z * f.lm;
+	if(f.bullet && f.bullet != RichPara::BULLET_TEXT) {
+		style << "display:list-item;line-style-type:";
+		switch(f.bullet) {
+		case RichPara::BULLET_ROUND: style << "disc"; break;
+		case RichPara::BULLET_ROUNDWHITE: style << "circle"; break;
+		case RichPara::BULLET_BOX:
+		case RichPara::BULLET_BOXWHITE: style << "square"; break;
+		}
+		style << ";line-style-position:inside;";
+		lm += 20;
+	}
+	style << Format("margin:%d %d %d %d;text-indent:%d;",
+	                z * f.before,
+	                z * f.rm,
+	                z * f.after,
+	                lm,
+	                z * (f.bullet ? 0 : f.indent)
+	         );
+	style << "text-align:";
+	switch(f.align) {
+	case ALIGN_LEFT: style << "left;"; break;
+	case ALIGN_RIGHT: style << "right;"; break;
+	case ALIGN_CENTER: style << "center;"; break;
+	case ALIGN_JUSTIFY: style << "justify;"; break;
+	}
+	style << HtmlStyleColor(f.ink) + HtmlFontStyle(f);
+	if(!IsNull(f.paper))
+		style << HtmlStyleColor(f.paper, "background-color");
+	return style;
+}
+
+String FormatClass(Index<String>& css, const String& fmt)
+{
+	return " CLASS=" + FormatIntAlpha(css.FindAdd(fmt) + 1);
+}
+
+void TabBorder(String& style, const char *txt, int border, Color bordercolor, const RichTable::Format& tf, Zoom z)
+{
+	style << "border-" << txt << ':' << HtmlDotl(border + tf.grid, z) << " solid "
+	      << ColorToHtml(border ? bordercolor : tf.gridcolor) << ';';
+}
+
+
+String AsHtml(const RichTxt& text, const RichStyles& styles, Index<String>& css,
+              const VectorMap<String, String>& links,
+              const VectorMap<String, String>& labels,
+              const String& outdir, const String& namebase, Zoom z, int& im,
+              const VectorMap<String, String>& escape,
+              int imtolerance)
+{
+	String html;
+	for(int i = 0; i < text.GetPartCount(); i++)
+	{
+		if(text.IsTable(i)) {
+			const RichTable& t = text.GetTable(i);
+			int nx = t.format.column.GetCount();
+			int ny = t.cell.GetCount();
+			const RichTable::Format& tf = t.format;
+			html << "<TABLE WIDTH=\"100%\" BORDER=0>";
+			if(tf.before > 0)
+				html << "<TR><TD HEIGHT=" << HtmlDot(tf.before, z) << " COLSPAN=3></TD></TR>";
+			html << "<TR><TD><TABLE BORDER=0 WIDTH=" << HtmlDot(tf.lm, z) << "><TR><TD></TD></TR></TABLE></TD>\r\n"
+					"<TD WIDTH=\"98%\">";
+
+			String style;
+			style << "border-collapse:collapse;table-layout:auto;"
+			      << "border:" << HtmlDotl(tf.frame, z) << " solid " << ColorToHtml(tf.framecolor) << ';';
+
+			html << "<TABLE WIDTH=\"100%\"" << FormatClass(css, style) << ">";
+			int sum = 0;
+			for(int i = 0; i < nx; i++)
+				sum += t.format.column[i];
+			html << "<COLGROUP>";
+			for(int i = 0; i < nx; i++)
+				html << "<COL width=\"" << 100 * t.format.column[i] / sum << "%\">";
+			html << "\r\n";
+			for(int i = 0; i < ny; i++) {
+				const Array<RichCell>& r = t.cell[i];
+				html << "<TR>";
+				for(int j = 0; j < r.GetCount(); j++) {
+					if(t(i, j)) {
+						const RichCell& c = r[j];
+						const RichCell::Format& cf = c.format;
+						String style;
+						style << "padding:" << HtmlDot(cf.margin.top, z) << HtmlDot(cf.margin.right, z)
+						                    << HtmlDot(cf.margin.bottom, z) << HtmlDot(cf.margin.left, z) << ';';
+						TabBorder(style, "left", cf.border.left, cf.bordercolor, tf, z);
+						TabBorder(style, "top", cf.border.top, cf.bordercolor, tf, z);
+						TabBorder(style, "right", cf.border.right, cf.bordercolor, tf, z);
+						TabBorder(style, "bottom", cf.border.bottom, cf.bordercolor, tf, z);
+						style << "background-color:" << ColorToHtml(cf.color) << ';';
+						style << "vertical-align:";
+						switch(cf.align) {
+						case ALIGN_TOP:    style << "top"; break;
+						case ALIGN_CENTER: style << "middle"; break;
+						case ALIGN_BOTTOM: style << "bottom"; break;
+						}
+						style << ';';
+						html << "<TD" << FormatClass(css, style);
+						if(c.hspan)
+							html << " colspan=" << c.hspan + 1;
+						if(c.vspan)
+							html << " rowspan=" << c.vspan + 1;
+						html << '>';
+						html << AsHtml(c.text, styles, css, links, labels, outdir, namebase, z,
+						               im, escape, imtolerance);
+						html << "</TD>\r\n";
+					}
+				}
+				html << "</TR>\r\n";
+			}
+			html << "</TABLE></TD>\r\n"
+			     << "<TD><TABLE BORDER=0 WIDTH=" << HtmlDot(tf.rm, z) << "><TR><TD></TD></TR></TABLE></TD>";
+			if(tf.after > 0)
+				html << "<TR><TD HEIGHT=" << HtmlDot(tf.after, z) << " COLSPAN=3></TD></TR>";
+			html << "</TABLE>\r\n";
+		}
+		else
+		if(text.IsPara(i)) {
+			RichPara p = text.Get(i, styles);
+			String lbl;
+			if(!IsNull(p.format.label)) {
+				lbl = labels.Get(p.format.label, Null);
+				if(lbl.GetCount())
+					html << "<A NAME=\"" << lbl << "\">";
+			}
+			bool bultext = false;
+			if(p.format.bullet == RichPara::BULLET_TEXT)
+				for(int i = 0; i < p.part.GetCount(); i++) {
+					const RichPara::Part& part = p.part[i];
+					if(part.text.Find(9) >= 0) {
+						bultext = true;
+						break;
+					}
+				}
+			if(bultext) {
+				html << "<TABLE WIDTH=\"100%\" BORDER=0 "
+				        "CELLPADDING=2 CELLSPACING=2>"
+				        "<TR>";
+				int q = z * p.format.lm - 8;
+				if(q > 0)
+					html << Format("<TD WIDTH=%d></TD>", q);
+				html << Format("<TD VALIGN=\"top\" WIDTH=%d BGCOLOR=\"#F0F0F0\">\r\n",
+				               max(z * p.format.indent, 0));
+				p.format.after = p.format.before = p.format.indent = p.format.lm = 0;
+			}
+			String par = "<P" + FormatClass(css, HtmlParaStyle(p.format, z)) + ">";
+			html << par;
+			for(int i = 0; i < p.part.GetCount(); i++) {
+				const RichPara::Part& part = p.part[i];
+				int q;
+				if(part.object) {
+					String name;
+					name << namebase << "_" << im++ << ".png";
+					Size psz = part.object.GetPixelSize();
+					String lname;
+					lname << "L$" << name;
+					Size sz = z * part.object.GetSize();
+					if(abs(100 * (psz.cx - sz.cx) / sz.cx) < imtolerance)
+						sz = psz;
+					PNGEncoder png;
+					png.SaveFile(AppendFileName(outdir, name), part.object.ToImage(sz));
+					if(psz.cx * psz.cy)
+						html << "<A HREF=\"" << lname << "\">";
+					html << "<IMG SRC=\"" << name << "\" BORDER=0 ALT=\"\">";
+					if(psz.cx * psz.cy) {
+						html << "</A>";
+						PNGEncoder png;
+						png.SaveFile(AppendFileName(outdir, lname), part.object.ToImage(psz));
+					}
+				}
+				else
+				if(part.format.indexentry.GetCount() &&
+				   (q = escape.Find(part.format.indexentry.ToString())) >= 0)
+					html << escape[q];
+				else {
+					String lnk = part.format.link;
+					if(lnk.GetCount()) {
+						int q = links.Find(lnk);
+						if(q < 0) {
+							int q = lnk.ReverseFind('#');
+							if(q >= 0) {
+								String l = lnk.Left(q);
+								lnk = links.Get(l, l) + '#' + lnk.Mid(q + 1);
+							}
+						}
+						else
+							lnk = links[q];
+					}
+					if(!lnk.IsEmpty() && lnk[0] != ':')
+						html << "<A HREF=\"" << lnk << "\">";
+					String cs;
+					if(part.text[0] != 9)
+						cs = HtmlCharStyle(part.format, p.format);
+					if(!cs.IsEmpty())
+						html << "<SPAN" << FormatClass(css, cs) << ">";
+					bool spc = false;
+					for(const wchar *s = part.text.Begin(); s != part.text.End(); s++) {
+						if(*s == ' ') {
+							html.Cat(spc ? "&nbsp;" : " ");
+							spc = true;
+						}
+						else {
+							spc = false;
+							if(*s == 160)  html.Cat("&nbsp;");
+							else
+							if(*s == '<')  html.Cat("&lt;");
+							else
+							if(*s == '>')  html.Cat("&gt;");
+							else
+							if(*s == '&')  html.Cat("&amp;");
+							else
+							if(*s == '\"') html.Cat("&quot;");
+							else
+							if(*s == 9) {
+								if(bultext) {
+									if(!cs.IsEmpty() && part.text[0] != 9)
+										html << "</SPAN>";
+									html << "</P>";
+									html << "</TD>\r\n<TD VALIGN=\"top\" BGCOLOR=\"#F0F0F0\">\r\n";
+									html << par;
+									if(s[1]) {
+										cs = HtmlCharStyle(part.format, p.format);
+										if(!cs.IsEmpty())
+											html << "<SPAN" << FormatClass(css, cs) << ">";
+									}
+								}
+								else
+									html.Cat("&nbsp;&nbsp;&nbsp;&nbsp;");
+							}
+							else
+								html.Cat(ToUtf8(*s));
+						}
+					}
+					if(!cs.IsEmpty())
+						html << "</SPAN>";
+					if(!lnk.IsEmpty())
+						html << "</A>";
+				}
+			}
+			if(p.part.GetCount() == 0)
+				html << "&nbsp;";
+			html << "</P>";
+			if(bultext)
+				html << "</TD></TR></TABLE>";
+			if(lbl.GetCount())
+				html << "</A>";
+			html << "\r\n";
+		}
+	}
+	return html;
+}
+
+String EncodeHtml(const RichText& text, Index<String>& css,
+                  const VectorMap<String, String>& links,
+                  const VectorMap<String, String>& labels,
+                  const String& outdir, const String& namebase, Zoom z,
+                  const VectorMap<String, String>& escape, int imt)
+{
+	int im = 0;
+	return AsHtml(text, text.GetStyles(), css, links, labels, outdir, namebase, z, im, escape, imt);
+}
+
+String AsCss(Index<String>& ss)
+{
+	String css;
+	for(int i = 0; i < ss.GetCount(); i++) {
+		css << "." + FormatIntAlpha(i + 1);
+		css << "{" << ss[i] << "}\r\n";
+	}
+	return css;
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/RichText/EncodeQtf.cpp b/uppsrc/RichText/EncodeQtf.cpp
new file mode 100644
index 000000000..604e0af2c
--- /dev/null
+++ b/uppsrc/RichText/EncodeQtf.cpp
@@ -0,0 +1,538 @@
+#include "RichText.h"
+
+NAMESPACE_UPP
+
+extern Color (*QTFColor[])();
+extern int   QTFFontHeight[];
+
+void SeparateNumber(String& s)
+{
+	if(*s.Last() >= '0' && *s.Last() <= '9')
+		s.Cat(';');
+}
+
+String FmtColor(Color c)
+{
+	if(IsNull(c)) return "N";
+	for(int i = 0; i < 10; i++)
+		if((*QTFColor[i])() == c)
+			return String(i + '0', 1);
+	if(c.GetR() == c.GetG() && c.GetG() == c.GetB())
+		return Sprintf("(%d)", c.GetR());
+	return Sprintf("(%d.%d.%d)", c.GetR(), c.GetG(), c.GetB());
+}
+
+String LngFmt(const RichPara::CharFormat& a, const RichPara::CharFormat& b, dword lang)
+{
+	String fmt;
+	if(lang != (dword)b.language)
+		if(b.language)
+			fmt << "%" << LNGAsText(b.language);
+		else
+			fmt << "%" << "00-00";
+	return fmt;
+}
+
+void CharFmt(String& fmt, const RichPara::CharFormat& a, const RichPara::CharFormat& b, dword lang)
+{
+	if(a.IsBold() != b.IsBold()) fmt.Cat('*');
+	if(a.IsItalic() != b.IsItalic()) fmt.Cat('/');
+	if(a.IsUnderline() != b.IsUnderline()) fmt.Cat('_');
+	if(a.IsStrikeout() != b.IsStrikeout()) fmt.Cat('-');
+	if(a.capitals != b.capitals) fmt.Cat('c');
+	if(a.dashed != b.dashed) fmt.Cat('d');
+	if(a.sscript != b.sscript)
+		fmt.Cat(b.sscript == 0 ? a.sscript == 1 ? '`' : ',' :
+		        b.sscript == 1 ? '`' : ',');
+	if(a.GetFace() != b.GetFace())
+		switch(b.GetFace()) {
+		case Font::ARIAL:     fmt.Cat('A'); break;
+		case Font::ROMAN:     fmt.Cat('R'); break;
+		case Font::COURIER:   fmt.Cat('C'); break;
+		case Font::STDFONT:   fmt.Cat('G'); break;
+		case Font::SYMBOL:    fmt.Cat('S'); break;
+		default:
+			fmt << "!" << b.GetFaceName() << "!";
+		}
+	if(a.link != b.link)
+		fmt << '^' << DeQtf(b.link) << '^';
+	if(a.indexentry != b.indexentry)
+		fmt << 'I' << DeQtf(ToUtf8(b.indexentry)) << ';';
+	if(a.ink != b.ink)
+		fmt << "@" << FmtColor(b.ink);
+	if(a.paper != b.paper)
+		fmt << "$" << FmtColor(b.paper);
+	if(a.GetHeight() != b.GetHeight()) {
+		for(int i = 0; i < 10; i++)
+			if(b.GetHeight() == QTFFontHeight[i]) {
+				SeparateNumber(fmt);
+				fmt.Cat('0' + i);
+				return;
+			}
+		fmt.Cat(Format("+%d", b.GetHeight()));
+	}
+}
+
+void FmtNumber(String& qtf, char c, int former, int current)
+{
+	qtf << (former != current ? Format("%c%d;", c, current) : String());
+}
+
+void QTFEncodeParaFormat(String& qtf, const RichPara::Format& format, const RichPara::Format& style)
+{
+	if(format.align != style.align)
+		switch(format.align) {
+		case ALIGN_LEFT:    qtf << '<'; break;
+		case ALIGN_RIGHT:   qtf << '>'; break;
+		case ALIGN_CENTER:  qtf << '='; break;
+		case ALIGN_JUSTIFY: qtf << '#'; break;
+		}
+	FmtNumber(qtf, 'l', style.lm, format.lm);
+	FmtNumber(qtf, 'r', style.rm, format.rm);
+	FmtNumber(qtf, 'i', style.indent, format.indent);
+	FmtNumber(qtf, 'b', style.before, format.before);
+	FmtNumber(qtf, 'a', style.after, format.after);
+	if(style.newpage != format.newpage)
+		qtf << 'P';
+	if(style.keep != format.keep)
+		qtf << 'k';
+	if(style.keepnext != format.keepnext)
+		qtf << 'K';
+	if(style.orphan != format.orphan)
+		qtf << 'Q';
+	if(style.linespacing != format.linespacing)
+		switch(format.linespacing) {
+		case RichPara::LSP15: qtf << "ph"; break;
+		case RichPara::LSP20: qtf << "pd"; break;
+		default:              qtf << "po"; break;
+		}
+	if(style.bullet != format.bullet) {
+		qtf << 'O';
+		switch(format.bullet) {
+		case RichPara::BULLET_NONE:        qtf << '_'; break;
+		case RichPara::BULLET_ROUNDWHITE:  qtf << '1'; break;
+		case RichPara::BULLET_BOX:         qtf << '2'; break;
+		case RichPara::BULLET_BOXWHITE:    qtf << '3'; break;
+		case RichPara::BULLET_TEXT:        qtf << '9'; break;
+		default:                           qtf << '0'; break;
+		}
+		qtf << ';';
+	}
+	if(!IsEmpty(format.label))
+		qtf << ':' << DeQtf(format.label) << ':';
+	if(NumberingDiffers(style, format)) {
+		if(format.before_number != style.before_number) {
+			qtf << "n";
+			qtf << DeQtf(format.before_number);
+			qtf << ';';
+		}
+		if(format.after_number != style.after_number) {
+			qtf << "m";
+			qtf << DeQtf(format.after_number);
+			qtf << ";";
+		}
+		int l;
+		for(l = 7; l >= 0; --l)
+			if(format.number[l])
+				break;
+		qtf << "N";
+		for(int i = 0; i <= l; i++) {
+			static char h[] = { '-', '1', '0', 'a', 'A', 'i', 'I' };
+			if(format.number[i] <= RichPara::NUMBER_I)
+				qtf << h[format.number[i]];
+			else
+				qtf << '-';
+			}
+		if(format.reset_number)
+			qtf << '!';
+		else
+			qtf << ';';
+	}
+	FmtNumber(qtf, 't', style.tabsize, format.tabsize);
+	if(style.tab != format.tab) {
+		qtf << "~~";
+		int i;
+		for(i = 0; i < format.tab.GetCount(); i++) {
+			RichPara::Tab tab = format.tab[i];
+			qtf << '~';
+			if(tab.align == ALIGN_RIGHT)
+				qtf << '>';
+			if(tab.align == ALIGN_CENTER)
+				qtf << '=';
+			if(tab.fillchar == 1)
+				qtf << '.';
+			if(tab.fillchar == 2)
+				qtf << '-';
+			if(tab.fillchar == 3)
+				qtf << '_';
+			qtf << tab.pos;
+		}
+		if(i)
+			qtf << ';';
+	}
+}
+
+bool s_nodeqtf[128];
+
+void QTFEncodePara(String& qtf, const RichPara& p, const RichPara::Format& style, byte charset, dword lang, bool crlf)
+{
+	int d = qtf.GetLength();
+	QTFEncodeParaFormat(qtf, p.format, style);
+	CharFmt(qtf, style, p.format, lang);
+	qtf.Cat(' ');
+	d = qtf.GetLength() - d;
+	for(int i = 0; i < p.part.GetCount(); i++) {
+		const RichPara::Part& part = p.part[i];
+		String cf = LngFmt(p.format, part.format, lang);
+		CharFmt(cf, p.format, part.format, lang);
+		if(!cf.IsEmpty()) {
+			qtf << '[' << cf << ' ';
+			d += cf.GetLength();
+		}
+		if(part.field) {
+			if(crlf)
+				qtf << "\r\n";
+			qtf << "{:" + DeQtf(part.field.ToString()) + ":" + DeQtf(part.fieldparam) + ":}";
+			if(crlf)
+				qtf << "\r\n";
+			d = 0;
+		}
+		else
+		if(part.object) {
+			const RichObject& object = part.object;
+			Size sz = object.GetSize();
+			if(crlf)
+				qtf << "\r\n";
+			qtf << "@@" << object.GetTypeName() << ':' << sz.cx
+			    << (object.IsKeepRatio() ? '&' : '*') << sz.cy;
+			if(object.GetYDelta())
+				qtf << '/' << object.GetYDelta();
+			if(crlf)
+				qtf << "\r\n";
+			String data = object.Write();
+			const char *q = data.Begin();
+			const char *slim = data.End();
+			int n = 0;
+			qtf.Reserve(8 * data.GetLength() / 7);
+			while(q < slim - 7) {
+				byte data[8];
+				data[0] = ((q[0] & 0x80) >> 7) |
+				          ((q[1] & 0x80) >> 6) |
+				          ((q[2] & 0x80) >> 5) |
+				          ((q[3] & 0x80) >> 4) |
+				          ((q[4] & 0x80) >> 3) |
+				          ((q[5] & 0x80) >> 2) |
+				          ((q[6] & 0x80) >> 1) |
+				          0x80;
+				data[1] = q[0] | 0x80;
+				data[2] = q[1] | 0x80;
+				data[3] = q[2] | 0x80;
+				data[4] = q[3] | 0x80;
+				data[5] = q[4] | 0x80;
+				data[6] = q[5] | 0x80;
+				data[7] = q[6] | 0x80;
+				qtf.Cat(data, 8);
+				if(crlf && ++n % 10 == 0)
+					qtf << "\r\n";
+				q += 7;
+			}
+			while(q < slim) {
+				byte seven = 0;
+				const char *lim = slim;
+				const char *s;
+				for(s = q; s < lim; s++)
+					seven = (seven >> 1) | (*s & 0x80);
+				seven >>= 8 - (lim - q);
+				qtf.Cat(seven | 0x80);
+				for(s = q; s < lim; s++)
+					qtf.Cat(*s | 0x80);
+				if(crlf && ++n % 10 == 0)
+					qtf << "\r\n";
+				q += 7;
+			}
+			if(crlf)
+				qtf << "\r\n";
+			d = 0;
+		}
+		else {
+			for(const wchar *s = part.text.Begin(); s != part.text.End(); s++) {
+				int c = *s;
+				if(c < 128) {
+					if(s_nodeqtf[c]) {
+						qtf.Cat(c);
+						d++;
+					}
+					else
+					if(c == 9) {
+						qtf.Cat("-|");
+						d++;
+					}
+					else
+					if(c == ':' && s[1] != ':')
+						qtf.Cat(':');
+					else {
+						qtf.Cat('`');
+					   	qtf.Cat(c);
+						d += 2;
+					}
+					if(crlf && d > 60 && c == ' ') {
+						qtf.Cat("\r\n");
+						d = 0;
+					}
+				}
+				else {
+					if(c == 160) {
+						qtf.Cat("_");
+						d++;
+					}
+					else
+					if(charset == CHARSET_UTF8) {
+						String q = ToUtf8(c);
+						d += q.GetLength();
+						qtf << q;
+					}
+					else {
+						int ch = FromUnicode(c, charset, 0);
+						if(ch)
+							qtf << (char)ch;
+						else
+							qtf << "@$" << Format("%04X", ch) << ';';
+						d++;
+					}
+				}
+				if(crlf && d > 80) {
+					qtf.Cat("\r\n");
+					d = 0;
+				}
+			}
+		}
+		if(!cf.IsEmpty()) {
+			d++;
+			qtf << ']';
+		}
+	}
+}
+
+void FmtNumber2(String& qtf, char c, int da, int a, int db, int b)
+{
+	if(da != a || db != b) {
+		qtf << c;
+		if(da != a)
+			qtf << a;
+		qtf << '/';
+		qtf << b;
+	}
+}
+
+
+void QTFEncodeTxt(String& qtf, const RichTxt& text, const RichStyles& styles, const RichStyle& defstyle,
+                  dword options, const Index<Uuid>& sm, byte charset, dword lang)
+{
+	qtf << '[';
+	for(int i = 0; i < text.GetPartCount(); i++) {
+		if(i) {
+			qtf << "&]";
+			if(options & QTF_CRLF)
+				qtf << "\r\n";
+			qtf << '[';
+		}
+		if(text.IsTable(i)) {
+			qtf << ' ';
+
+			const RichTable& t = text.GetTable(i);
+			int nx = t.format.column.GetCount();
+			int ny = t.cell.GetCount();
+			qtf << "{{";
+			for(int i = 0; i < nx; i++) {
+				if(i)
+					qtf << ':';
+				qtf << t.format.column[i];
+			}
+			const RichTable::Format& f = t.format;
+			const RichTable::Format& d = Single<RichTable::Format>();
+			FmtNumber(qtf, '<', d.lm, f.lm);
+			FmtNumber(qtf, '>', d.rm, f.rm);
+			FmtNumber(qtf, 'B', d.before, f.before);
+			FmtNumber(qtf, 'A', d.after, f.after);
+			FmtNumber(qtf, 'f', d.frame, f.frame);
+			if(f.keep)
+				qtf << "K";
+			if(f.framecolor != d.framecolor)
+				qtf << 'F' << FmtColor(f.framecolor);
+			FmtNumber(qtf, 'g', d.grid, f.grid);
+			if(f.gridcolor != d.gridcolor)
+				qtf << 'G' << FmtColor(f.gridcolor);
+			FmtNumber(qtf, 'h', d.header, f.header);
+			RichCell::Format cf = Single<RichCell::Format>();
+			for(int i = 0; i < ny; i++) {
+				const Array<RichCell>& r = t.cell[i];
+				for(int j = 0; j < r.GetCount(); j++) {
+					const RichCell& c = r[j];
+					if(i || j) {
+						if(options & QTF_CRLF)
+							qtf << "\r\n";
+						qtf << "::";
+					}
+					const RichCell::Format& f = c.format;
+					if(f.align != cf.align)
+						switch(f.align) {
+						case ALIGN_TOP:    qtf << '^'; break;
+						case ALIGN_CENTER: qtf << '='; break;
+						case ALIGN_BOTTOM: qtf << 'v'; break;
+						}
+					FmtNumber2(qtf, 'l', cf.border.left, f.border.left, cf.margin.left, f.margin.left);
+					FmtNumber2(qtf, 'r', cf.border.right, f.border.right, cf.margin.right, f.margin.right);
+					FmtNumber2(qtf, 't', cf.border.top, f.border.top, cf.margin.top, f.margin.top);
+					FmtNumber2(qtf, 'b', cf.border.bottom, f.border.bottom, cf.margin.bottom, f.margin.bottom);
+					FmtNumber(qtf, 'H', cf.minheight, f.minheight);
+					if(f.color != cf.color)
+						qtf << '@' << FmtColor(f.color);
+					if(f.bordercolor != cf.bordercolor)
+						qtf << 'R' << FmtColor(f.bordercolor);
+					cf = f;
+					if(c.hspan)
+						qtf << '-' << c.hspan;
+					if(c.vspan)
+						qtf << '|' << c.vspan;
+					if(f.keep)
+						qtf << "k";
+					qtf << ' ';
+					QTFEncodeTxt(qtf, c.text, styles, defstyle, options, sm, charset, lang);
+				}
+			}
+			qtf << "}}";
+		}
+		else {
+			RichPara p = text.Get(i, styles);
+			int si = sm.Find(text.GetParaStyle(i));
+			if(!(options & QTF_NOSTYLES))
+				qtf << "s" << si;
+			SeparateNumber(qtf);
+			const RichStyle& s = si < 0 ? defstyle : GetStyle(styles, sm[si]);
+			QTFEncodePara(qtf, p, options & QTF_NOSTYLES ? defstyle.format : s.format, charset, lang,
+			              (options & QTF_CRLF));
+		}
+	}
+	qtf << ']';
+}
+
+void init_s_nodeqtf()
+{
+	ONCELOCK {
+		for(int c = 1; c < 128; c++)
+			s_nodeqtf[c] = IsAlNum(c) || strchr(".,;!?%()/<># ", c);
+	}
+}
+
+String   AsQTF(const RichText& text, byte charset, dword options)
+{
+	int i;
+	String qtf;
+
+	init_s_nodeqtf();
+
+	RichPara::Format dpf;
+	dpf.Face(Font::ARIAL);
+	dpf.Height(100);
+	dpf.language = LNG_ENGLISH;
+
+	bool crlf = options & QTF_CRLF;
+
+	Index<Uuid> sm;
+//	if(options & QTF_ALL_STYLES) //!!!! problem -> GetUsedStyles!!!!
+		for(i = 0; i < text.GetStyleCount(); i++)
+			sm.FindAdd(text.GetStyleId(i));
+//	else
+//		for(i = 0; i < text.GetPartCount(); i++)
+//			sm.FindAdd(text.GetParaStyle(i));
+
+	if(!(options & QTF_NOSTYLES))
+		for(i = 0; i < sm.GetCount(); i++) {
+			Uuid id = sm[i];
+			const RichStyle& s = text.GetStyle(id);
+			qtf << '[';
+			QTFEncodeParaFormat(qtf, s.format, dpf);
+			CharFmt(qtf, dpf, s.format, s.format.language);
+			qtf << ' ';
+			qtf << "$$" << i << ',' << max(sm.Find(s.next), 0)
+			    << '#' << Format(id)
+			    << ':' << DeQtf(s.name) << "]";
+			if(crlf)
+			    qtf << "\r\n";
+		}
+
+	if(text.GetPartCount() && (options & QTF_BODY)) {
+		VectorMap<dword, int> lngc;
+		int m = min(text.GetPartCount(), 30);
+		for(int i = 0; i < m; i++)
+			if(text.IsPara(i)) {
+				RichPara p = text.Get(i);
+				lngc.GetAdd(p.format.language, 0)++;
+			}
+		dword lang = lngc.GetCount() ? lngc.GetKey(MaxIndex(lngc.GetValues())) : 0;
+		qtf << "[";
+		if(!(options & QTF_NOCHARSET)) {
+			qtf << "{";
+			if(charset == CHARSET_UTF8)
+				qtf << "_";
+			else
+			if(charset >= CHARSET_WIN1250 && charset <= CHARSET_WIN1258)
+				qtf << (char)('0' + charset - CHARSET_WIN1250);
+			else
+			if(charset >= CHARSET_ISO8859_1 && charset <= CHARSET_ISO8859_16)
+				qtf << (char)('A' + charset - CHARSET_ISO8859_1);
+			else
+				qtf << CharsetName(charset);
+			qtf << "}";
+		}
+		if(lang && !(options & QTF_NOLANG))
+			qtf << "%" << LNGAsText(SetLNGCharset(lang, CHARSET_DEFAULT));
+		qtf << " ";
+		if(crlf)
+			qtf << "\r\n";
+		RichStyle defstyle;
+		defstyle.format.Height(100);
+
+		QTFEncodeTxt(qtf, text, text.GetStyles(), defstyle, options, sm, charset, lang);
+	}
+	return qtf;
+}
+
+String DeQtf(const char *s) {
+	String r;
+	r.Reserve(256);
+	while(*s) {
+		if((byte)*s > ' ' && !IsDigit(*s) && !IsAlpha(*s) && (byte)*s < 128)
+			r.Cat('`');
+		r.Cat(*s++);
+	}
+	return r;
+}
+
+String DeQtfLf(const char *s) {
+	String r;
+	r.Reserve(256);
+	while(*s) {
+		if((byte)*s > ' ' && !IsDigit(*s) && !IsAlpha(*s) && (byte)*s < 128)
+			r.Cat('`');
+		if((byte)*s >= ' ')
+			r.Cat(*s);
+		else
+		if(*s == '\n')
+			r.Cat('&');
+		s++;
+	}
+	return r;
+}
+
+String AsQTF(const RichObject& obj)
+{
+	RichText x;
+	RichPara p;
+	RichPara::Format fmt;
+	p.Cat(obj, fmt);
+	x.Cat(p);
+	return AsQTF(x);
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/RichText/EncodeRTF.cpp b/uppsrc/RichText/EncodeRTF.cpp
new file mode 100644
index 000000000..b675c6930
--- /dev/null
+++ b/uppsrc/RichText/EncodeRTF.cpp
@@ -0,0 +1,658 @@
+#include "RichText.h"
+
+#include <plugin/png/png.h>
+
+NAMESPACE_UPP
+
+static int GetParaHeight(const Array<RichPara::Part>& parts)
+{
+	int ht = 0;
+ 	for(int i = 0; i < parts.GetCount(); i++) {
+		int pht = 0;
+		const RichPara::Part& part = parts[i];
+		if(part.object)
+			pht = part.object.GetSize().cy;
+		else if(part.field)
+			pht = GetParaHeight(part.fieldpart);
+		else
+			pht = tabs(part.format.GetHeight());
+		if(pht > ht)
+			ht = pht;
+	}
+	return ht;
+}
+
+class RTFEncoder {
+public:
+	RTFEncoder(Stream& stream, const RichText& richtext, byte charset);
+
+	void            Run();
+
+private:
+	void            FacesAddFormat(const RichPara::CharFormat& format);
+	void            GetFaces();
+	void            GetTxtFaces(const RichTxt& txt);
+
+	void            PutHeader();
+	void            PutDocument();
+	void            PutTxt(const RichTxt& txt, int nesting, int dot_width);
+	void            PutTable(const RichTable& table, int nesting, int dot_width);
+	void            PutParts(const Array<RichPara::Part>& parts,
+		RichPara::CharFormat& base, int bpart, int boff, int epart, int eoff);
+
+	void            Begin()                           { stream.Put('{'); }
+	void            Begin(const char *cmd)            { Begin(); Command(cmd); }
+	void            Begin(const char *cmd, int param) { Begin(); Command(cmd, param); }
+	void            End()                             { stream.Put('}'); }
+
+	void            Command(const char *cmd);
+	void            Command(const char *cmd, int param);
+	void            Space()                           { stream.Put(' '); }
+	void            PutText(const char *text);
+	void            PutObject(const RichObject& object);
+	void            PutTabs(const Vector<RichPara::Tab>& tabs);
+	void            PutBinHex(const byte *data, int count);
+	void            PutBinHex(const String& s)        { PutBinHex(s, s.GetLength()); }
+
+	bool            PutParaFormat(const RichPara::Format& pf, const RichPara::Format& difpf);
+	bool            PutCharFormat(const RichPara::CharFormat& cf, const RichPara::CharFormat& difcf, bool pn);
+
+	struct Group;
+
+	friend struct Group;
+
+	struct Group {
+		Group(RTFEncoder *owner) : owner(owner) { owner->Begin(); }
+		Group(RTFEncoder *owner, const char *cmd) : owner(owner) { owner->Begin(cmd); }
+		Group(RTFEncoder *owner, const char *cmd, int param) : owner(owner) { owner->Begin(cmd, param); }
+		~Group() { owner->End(); }
+		RTFEncoder *owner;
+	};
+
+private:
+	Stream&               stream;
+	const RichText&       richtext;
+	byte                  charset;
+
+	RichPara::CharFormat  charfmt;
+	RichPara::Format      parafmt;
+	Uuid                  oldstyle;
+	int                   old_ht;
+	int                   para_ht;
+
+	Index<int>            used_faces;
+	enum { SYMBOL_INDEX = 1, WINGDINGS_INDEX = 2 };
+	VectorMap<Color, int> used_ink, used_paper;
+	Index<Color>          phys_colors;
+	Index<Uuid>           styleid;
+};
+
+void EncodeRTF(Stream& stream, const RichText& richtext, byte charset)
+{
+	RTFEncoder(stream, richtext, charset).Run();
+}
+
+String EncodeRTF(const RichText& richtext, byte charset)
+{
+	StringStream out;
+	EncodeRTF(out, richtext, charset);
+	String s = out.GetResult();
+	LOG("EncodeRTF <<<<<\n" << s << "\n>>>>> EncodeRTF");
+	return s;
+}
+
+String EncodeRTF(const RichText& richtext)
+{
+	return EncodeRTF(richtext, GetDefaultCharset() == CHARSET_UTF8 ? GetLNGCharset(GetSystemLNG())
+	                                                               : GetDefaultCharset());
+}
+
+RTFEncoder::RTFEncoder(Stream& stream, const RichText& richtext, byte charset)
+: stream(stream)
+, richtext(richtext)
+, charset(charset)
+{
+	for(int i = 0; i < richtext.GetStyleCount(); i++)
+		styleid.Add(richtext.GetStyleId(i));
+}
+
+void RTFEncoder::Run()
+{
+	GetFaces();
+	Group docgrp(this, "rtf");
+	PutHeader();
+	PutDocument();
+}
+
+void RTFEncoder::FacesAddFormat(const RichPara::CharFormat& format)
+{
+	used_faces.FindAdd(format.GetFace());
+	if(used_ink.Find(format.ink) < 0) {
+		Color i(format.ink.GetR(), format.ink.GetG(), format.ink.GetB());
+		int x = used_ink.Get(i, -1);
+		if(x < 0)
+			x = phys_colors.FindAdd(i);
+		used_ink.Add(format.ink, x);
+	}
+	if(used_paper.Find(format.paper) < 0) {
+		Color p(format.paper.GetR(), format.paper.GetG(), format.paper.GetB());
+		int x = used_paper.Get(p, -1);
+		if(x < 0)
+			x = phys_colors.FindAdd(p);
+		used_paper.Add(format.paper, x);
+	}
+}
+
+void RTFEncoder::GetFaces()
+{
+	used_faces.Add(Font::ARIAL); // default font
+	used_faces.Add(Font::SYMBOL); // used for bullets
+#ifdef PLATFORM_WIN32
+	used_faces.Add(Font::WINGDINGS); // used for bullets
+#endif
+	phys_colors.Add(Null);
+	used_ink.Add(Null, 0);
+	used_paper.Add(Null, 0);
+	used_ink.Add(Black(), 0);
+	used_paper.Add(White(), 0);
+	GetTxtFaces(richtext);
+	for(int i = 0; i < richtext.GetStyleCount(); i++)
+		FacesAddFormat(richtext.GetStyle(i).format);
+}
+
+void RTFEncoder::GetTxtFaces(const RichTxt& rt)
+{
+	for(int i = 0; i < rt.GetPartCount(); i++) {
+		if(rt.IsTable(i)) {
+			const RichTable& table = rt.GetTable(i);
+			const RichTable::Format& tfmt = table.GetFormat();
+			phys_colors.FindAdd(tfmt.framecolor);
+			phys_colors.FindAdd(tfmt.gridcolor);
+			for(int r = 0; r < table.GetRows(); r++)
+				for(int c = 0; c < table.GetColumns(); c++) {
+					const RichCell& cell = table.cell[r][c];
+					phys_colors.FindAdd(cell.format.color);
+					phys_colors.FindAdd(cell.format.bordercolor);
+					GetTxtFaces(cell.text);
+				}
+		}
+		else {
+			const RichPara& para = rt.Get(i, richtext.GetStyles());
+			FacesAddFormat(para.format);
+			for(int p = 0; p < para.part.GetCount(); p++) {
+				const RichPara::Part& part = para.part[p];
+				if(part.IsText())
+					FacesAddFormat(part.format);
+			}
+		}
+	}
+}
+
+void RTFEncoder::Command(const char *cmd)
+{
+	stream.Put('\\');
+	stream.Put(cmd);
+}
+
+void RTFEncoder::Command(const char *cmd, int param)
+{
+	stream.Put('\\');
+	stream.Put(cmd);
+	stream.Put(IntStr(param));
+}
+
+void RTFEncoder::PutText(const char *text)
+{
+	while(*text) {
+		if(*text == '{' || *text == '}' || *text == '\\')
+			stream.Put('\\');
+		stream.Put(*text++);
+	}
+}
+
+void RTFEncoder::PutBinHex(const byte *b, int count)
+{
+	enum { BLOCK = 32 };
+	for(int l = count; l > 0; l -= BLOCK) {
+		stream.PutCrLf();
+		for(const byte *e = b + min<int>(l, BLOCK); b < e; b++) {
+			static const char binhex[] = "0123456789abcdef";
+			stream.Put(binhex[*b >> 4]);
+			stream.Put(binhex[*b & 15]);
+		}
+	}
+}
+
+bool RTFEncoder::PutCharFormat(const RichPara::CharFormat& cf, const RichPara::CharFormat& difcf, bool pn)
+{
+	int64 pos = stream.GetPos();
+	int pn2 = (pn ? 0 : 2);
+	bool f;
+	int t;
+	if(cf.GetFace() != difcf.GetFace())
+		Command("pnf" + pn2, used_faces.Find(cf.GetFace()));
+	if((t = DotPoints(2 * tabs(cf.GetHeight()))) != DotPoints(2 * tabs(difcf.GetHeight())))
+		Command("pnfs" + pn2, t);
+	if(!pn && dword(t = cf.sscript) != difcf.sscript)
+		Command(t == 0 ? "nosupersub" : t == 1 ? "super" : "sub");
+	if((f = cf.IsBold())          != difcf.IsBold())          Command((f ? "pnb" : "pnb0") + pn2);
+	if((f = cf.IsItalic())        != difcf.IsItalic())        Command((f ? "pni" : "pni0") + pn2);
+	if((f = cf.IsUnderline())     != difcf.IsUnderline())     Command((f ? "pnul" : "pnul0") + pn2);
+	if((f = cf.IsStrikeout())     != difcf.IsStrikeout())     Command((f ? "pnstrike" : "pnstrike0") + pn2);
+	if((f = cf.capitals)          != difcf.capitals)          Command((f ? "pncaps" : "pncaps0") + pn2);
+	if((t = used_ink.Get(cf.ink)) != used_ink.Get(difcf.ink)) Command("pncf" + pn2, t);
+	if((t = used_paper.Get(cf.paper)) != used_paper.Get(difcf.paper)) Command("pncb" + pn2, t);
+#ifdef PLATFORM_WIN32 //zapoznamkoval Fidler kdyz chtel zkompilovat pod Linuxem...
+	if(!pn && cf.language         != difcf.language)          Command("lang", GetLanguageLCID(cf.language));
+#endif
+	// todo: link
+	return stream.GetPos() != pos;
+}
+
+void RTFEncoder::PutObject(const RichObject& object)
+{
+#ifdef PLATFORM_WIN32
+#ifndef PLATFORM_WINCE
+	Size log_size = object.GetPixelSize(), out_size = object.GetSize();
+	if(log_size.cx <= 0 || log_size.cy <= 0) log_size = out_size;
+//	Size scale = out_size * 100 / log_size;
+	Group pict_grp(this, "pict");
+	Command("picw", log_size.cx);
+	Command("pich", log_size.cy);
+	Command("picwgoal", DotTwips(out_size.cx));
+	Command("pichgoal", DotTwips(out_size.cy));
+//	Command("picscalex", scale.cx);
+//	Command("picscaley", scale.cy);
+
+	if(object.GetTypeName() == "PING") {
+		Command("pngblip");
+		PutBinHex(object.GetData());
+	}
+	else {
+		Command("wmetafile", 8);
+		WinMetaFileDraw wmd(log_size.cx, log_size.cy);
+		object.Paint(wmd, log_size);
+		WinMetaFile wmf = wmd.Close();
+		HENHMETAFILE hemf = wmf.GetHEMF();
+		int size = GetWinMetaFileBits(hemf, 0, 0, MM_ANISOTROPIC, ScreenHDC());
+		if(size > 0) {
+			Buffer<byte> buffer(size);
+			GetWinMetaFileBits(hemf, size, buffer, MM_ANISOTROPIC, ScreenHDC());
+			PutBinHex(buffer, size);
+		}
+	}
+#endif
+#endif
+}
+
+bool RTFEncoder::PutParaFormat(const RichPara::Format& pf, const RichPara::Format& difpf)
+{
+	int64 pos = stream.GetPos();
+	if(pf.align != difpf.align)
+		switch(pf.align) {
+		case ALIGN_NULL:
+		case ALIGN_LEFT:    Command("ql"); break;
+		case ALIGN_CENTER:  Command("qc"); break;
+		case ALIGN_RIGHT:   Command("qr"); break;
+		case ALIGN_JUSTIFY: Command("qj"); break;
+		default:            NEVER();
+		}
+	int oind = difpf.indent, olm = difpf.lm;
+	if(difpf.bullet != RichPara::BULLET_NONE) {
+		olm += oind;
+		oind = -oind;
+	}
+	int nind = pf.indent, nlm = pf.lm;
+	if(pf.bullet != RichPara::BULLET_NONE) {
+		nlm += nind;
+		nind = -nind;
+	}
+	if(nind      != oind)         Command("fi", DotTwips(nind));
+	if(nlm       != olm)          Command("li", DotTwips(nlm));
+	if(pf.rm     != difpf.rm)     Command("ri", DotTwips(pf.rm));
+	if(pf.newpage)
+		Command("pagebb");
+	if(pf.before != difpf.before) Command("sb", DotTwips(pf.before));
+	if(pf.after  != difpf.after)  Command("sa", DotTwips(pf.after));
+	if(pf.tab    != difpf.tab)    PutTabs(pf.tab);
+	return stream.GetPos() != pos;
+}
+
+void RTFEncoder::PutTabs(const Vector<RichPara::Tab>& tabs)
+{
+	for(int i = 0; i < tabs.GetCount(); i++) {
+		RichPara::Tab t = tabs[i];
+		switch(t.align) {
+		case ALIGN_NULL:
+		case ALIGN_LEFT:   break;
+		case ALIGN_CENTER: Command("tqc"); break;
+		case ALIGN_RIGHT:  Command("tqr"); break;
+		default: NEVER();
+		}
+		switch(t.fillchar) {
+		case 0: break;
+		case 1: Command("tldot"); break;
+		case 2: Command("tlhyph"); break;
+		case 3: Command("tlul"); break;
+		default: NEVER();
+		}
+		Command("tx", DotTwips(t.pos));
+	}
+}
+
+void RTFEncoder::PutParts(const Array<RichPara::Part>& parts,
+	RichPara::CharFormat& base, int bpart, int boff, int epart, int eoff)
+{
+	if(epart >= parts.GetCount()) {
+		epart = parts.GetCount() - 1;
+		eoff = INT_MAX;
+	}
+	ASSERT(boff >= 0 && bpart >= 0);
+	for(int p = bpart; p <= epart; p++) {
+		const RichPara::Part& part = parts[p];
+		if(part.IsText()) {
+			WString px = part.text;
+			if(p == epart && px.GetLength() > eoff)
+				px.Trim(eoff);
+			if(p == bpart)
+				px.Remove(0, boff);
+			if(!px.IsEmpty()) {
+				if(PutCharFormat(part.format, base, false) || p == 0)
+					Space();
+				base = part.format;
+				PutText(FromUnicode(px, charset));
+			}
+		}
+		else if(part.object)
+			PutObject(part.object);
+	}
+
+}
+
+void RTFEncoder::PutHeader()
+{
+	static const short ansicpg[][2] = {
+		{ CHARSET_WIN1250, 1250 },
+		{ CHARSET_WIN1251, 1251 },
+		{ CHARSET_WIN1252, 1252 },
+		{ CHARSET_WIN1253, 1253 },
+		{ CHARSET_WIN1254, 1254 },
+		{ CHARSET_WIN1255, 1255 },
+		{ CHARSET_WIN1256, 1256 },
+		{ CHARSET_WIN1257, 1257 },
+		{ CHARSET_WIN1258, 1258 },
+	};
+	int i;
+	for(i = __countof(ansicpg); --i >= 0;)
+		if(charset == ansicpg[i][0]) {
+			Command("ansicpg", ansicpg[i][1]);
+			break;
+		}
+
+	Command("deff", 0);
+	{
+		Group ftbl(this, "fonttbl");
+		for(int i = 0; i < used_faces.GetCount(); i++) {
+			Group fnt(this, "f", i);
+			int fn = used_faces[i];
+			dword info = Font::GetFaceInfo(fn);
+			if(info & Font::SYMBOLTYPE)
+				Command("ftech");
+			else if(info & Font::FIXEDPITCH)
+				Command("fmodern");
+			else if(fn == Font::ROMAN)
+				Command("froman");
+			else if(fn == Font::ARIAL
+#ifdef PLATFORM_WIN32
+			|| fn == Font::TAHOMA
+#endif
+			)
+				Command("fswiss");
+			Space();
+			stream.Put(Font::GetFaceName(fn));
+			stream.Put(';');
+		}
+	}
+
+	if(phys_colors.GetCount() > 1) {
+		Group ctbl(this, "colortbl");
+		stream.Put(';');
+		for(int i = 1; i < phys_colors.GetCount(); i++) {
+			Color rgb = phys_colors[i];
+			Command("red",   rgb.GetR());
+			Command("green", rgb.GetG());
+			Command("blue",  rgb.GetB());
+			stream.Put(';');
+		}
+	}
+
+	Begin("stylesheet");
+		RichPara::CharFormat empcfmt;
+		RichPara::Format emppfmt;
+
+		for(i = 0; i < richtext.GetStyleCount(); i++) {
+			const RichStyle& style = richtext.GetStyle(i);
+			Begin("s", i);
+				PutParaFormat(style.format, emppfmt);
+				PutCharFormat(style.format, empcfmt, false);
+				Command("sbasedon", 222);
+				if(style.next != richtext.GetStyleId(i))
+					Command("snext", styleid.Find(style.next));
+				Space();
+				for(const char *n = style.name; *n; n++)
+					stream.Put(*n == ';' ? '_' : *n);
+				stream.Put(';');
+			End();
+		}
+	End();
+}
+
+void RTFEncoder::PutTable(const RichTable& table, int nesting, int dot_width)
+{
+	Vector<int> vspan_counts;
+	const RichTable::Format& tfmt = table.GetFormat();
+	Vector<int> column_pos;
+	column_pos.SetCount(tfmt.column.GetCount() + 1);
+	column_pos[0] = tfmt.lm;
+	int sum = 0;
+	for(int c = 0; c < tfmt.column.GetCount(); c++)
+		sum += tfmt.column[c];
+	int rem_width = dot_width - tfmt.lm - tfmt.rm;
+	for(int c = 0; c < tfmt.column.GetCount(); c++) {
+		int part = iscale(tfmt.column[c], rem_width, max(sum, 1));
+		sum -= tfmt.column[c];
+		rem_width -= part;
+		column_pos[c + 1] = column_pos[c] + part;
+	}
+	for(int r = 0; r < table.GetRows(); r++) {
+		String rowfmt;
+		if(nesting)
+			rowfmt << "\\*\\nesttableprops";
+		rowfmt << "\\trowd"
+			"\\trleft" << DotTwips(tfmt.lm)
+			// trbrdr[ltrbv]
+			;
+		Vector<int> cellindex;
+		Rect dflt_margin(600, 600, 600, 600);
+		for(int c = 0; c < table.GetColumns(); c++) {
+			const RichCell& cell = table.cell[r][c];
+			dflt_margin.left = min(dflt_margin.left, cell.format.margin.left);
+			dflt_margin.top = min(dflt_margin.top, cell.format.margin.top);
+			dflt_margin.right = min(dflt_margin.right, cell.format.margin.right);
+			dflt_margin.bottom = min(dflt_margin.bottom, cell.format.margin.bottom);
+			c += cell.hspan;
+		}
+/*
+		rowfmt <<
+			"\\trpaddl" << DotTwips(dflt_margin.left) << "\\trpaddfl3"
+			"\\trpaddt" << DotTwips(dflt_margin.top) << "\\trpaddft3"
+			"\\trpaddr" << DotTwips(dflt_margin.right) << "\\trpaddfr3"
+			"\\trpaddb" << DotTwips(dflt_margin.bottom) << "\\trpaddfb3";
+*/
+		for(int c = 0; c < table.GetColumns(); c++) {
+			const RichCell& cell = table.cell[r][c];
+/*
+			if(cell.format.margin.left != dflt_margin.left)
+				rowfmt << "\\clpadl" << DotTwips(cell.format.margin.left) << "\\clpadfl3";
+			if(cell.format.margin.top != dflt_margin.top)
+				rowfmt << "\\clpadt" << DotTwips(cell.format.margin.top) << "\\clpadft3";
+			if(cell.format.margin.right != dflt_margin.right)
+				rowfmt << "\\clpadr" << DotTwips(cell.format.margin.right) << "\\clpadfr3";
+			if(cell.format.margin.bottom != dflt_margin.bottom)
+				rowfmt << "\\clpadb" << DotTwips(cell.format.margin.bottom) << "\\clpadfb3";
+*/
+			switch(cell.format.align) {
+				case ALIGN_TOP: rowfmt << "\\clvertalt"; break;
+				default:
+				case ALIGN_CENTER: rowfmt << "\\clvertalc"; break;
+				case ALIGN_BOTTOM: rowfmt << "\\clvertalb"; break;
+			}
+			cellindex.Add(c);
+			if(cell.hspan)
+				c += cell.hspan;
+			int cell_end = column_pos[c + 1];
+			if(cell.vspan) {
+				vspan_counts.At(c, 0) = cell.vspan;
+				rowfmt << "\\clvmgf";
+			}
+			else if(c < vspan_counts.GetCount() && vspan_counts[c] > 0)
+				rowfmt << "\\clvmrg";
+			if(!IsNull(cell.format.color))
+				rowfmt << "\\clcbpat" << phys_colors.Find(cell.format.color);
+			rowfmt << "\\cellx" << DotTwips(cell_end);
+		}
+		Begin();
+		Command("pard");
+		Command("intbl");
+		parafmt = RichPara::Format();
+		charfmt = RichPara::CharFormat();
+		if(nesting)
+			Command("itap", nesting + 1);
+		if(!nesting)
+			stream.Put(rowfmt);
+		for(int c = 0; c < cellindex.GetCount(); c++) {
+			int cx = cellindex[c];
+			const RichCell& cell = table.cell[r][cx];
+			int cell_wd = column_pos[cx + cell.hspan + 1] - column_pos[cx];
+			PutTxt(cell.text, nesting + 1, cell_wd);
+			Command(nesting ? "nestcell" : "cell");
+		}
+		stream.Put(rowfmt);
+		Command(nesting ? "nestrow" : "row");
+		End();
+	}
+}
+
+void RTFEncoder::PutTxt(const RichTxt& txt, int nesting, int dot_width)
+{
+	for(int i = 0; i < txt.GetPartCount(); i++) {
+		if(txt.IsTable(i))
+			PutTable(txt.GetTable(i), nesting, dot_width);
+		else {
+			const RichPara& para = txt.Get(i, richtext.GetStyles());
+			Uuid pstyle = txt.GetParaStyle(i);
+			int para_ht = GetParaHeight(para.part);
+			int first_part = 0, first_ind = 0;
+			bool hdiff = (para.format.bullet != RichPara::BULLET_NONE
+				&& para.format.bullet != RichPara::BULLET_TEXT && para_ht != para_ht);
+			if(pstyle != oldstyle
+			|| para.format.bullet != parafmt.bullet || para.format.bullet == RichPara::BULLET_TEXT
+			|| hdiff || para.format.tab != parafmt.tab || para.format.newpage || parafmt.newpage) {
+				Command("s", styleid.Find(pstyle));
+				oldstyle = pstyle;
+				parafmt = richtext.GetStyle(pstyle).format;
+				Command("pard");
+				if(nesting)
+					Command("intbl");
+				if(nesting > 1)
+					Command("itap", nesting);
+				parafmt = RichPara::Format();
+				para_ht = 0;
+			}
+			if(para.format.bullet == RichPara::BULLET_TEXT) {
+				int epart = 0, eoff = 0;
+				while(epart < para.part.GetCount() && (eoff = para.part[epart].text.Find('\t')) < 0)
+					epart++;
+
+				RichPara::CharFormat rcf = charfmt;
+				rcf.Height(0);
+				Begin("pntext");
+					PutParts(para.part, rcf, 0, 0, epart, eoff);
+					stream.Put('\t');
+				End();
+
+				Begin("*\\pn");
+					Command("pnhang");
+					Command("pnql");
+					rcf = charfmt;
+					if(epart > 0 || eoff > 0)
+						PutCharFormat(para.part[0].format, rcf, true);
+					Begin("pntxta");
+					End();
+					Begin("pntxtb");
+						Space();
+						PutParts(para.part, rcf, 0, 0, epart, eoff);
+						stream.Put('\t');
+					End();
+				End();
+			}
+			else if(para.format.bullet != RichPara::BULLET_NONE) {
+				int sym_face = SYMBOL_INDEX;
+				byte sym_char = 0xB7;
+
+				switch(para.format.bullet) {
+				default:
+					NEVER();
+
+				case RichPara::BULLET_ROUND:      sym_face = SYMBOL_INDEX;    sym_char = 0xB7; break;
+				case RichPara::BULLET_ROUNDWHITE: sym_face = WINGDINGS_INDEX; sym_char = 0xA1; break;
+				case RichPara::BULLET_BOX:        sym_face = WINGDINGS_INDEX; sym_char = 'n'; break;
+				case RichPara::BULLET_BOXWHITE:   sym_face = WINGDINGS_INDEX; sym_char = 'o'; break;
+				}
+
+				Begin("pntext");
+	//					Command("tqr");
+	//					Command("tx", DotTwips(para.format.indent));
+	//					Command("qr");
+					Command("f", sym_face);
+					Command("fs", DotPoints(2 * para_ht));
+					Space();
+					stream.Put(sym_char);
+					stream.Put('\t');
+				End();
+
+				Begin("*\\pn");
+					Command("pnlvlblt");
+					Command("pnf", sym_face);
+					Command("pnfs", DotPoints(2 * para_ht));
+					Command("pnql");
+					Begin("pntxtb");
+						Space();
+						stream.Put(sym_char);
+	//						stream.Put('\t');
+					End();
+					Begin("pntxta");
+					End();
+				End();
+			}
+			PutParaFormat(para.format, parafmt);
+			para_ht  = para_ht;
+			parafmt = para.format;
+			PutParts(para.part, charfmt, first_part, first_ind, para.part.GetCount(), 0);
+			if(i + 1 < txt.GetPartCount())
+				Command("par");
+		}
+	}
+}
+
+void RTFEncoder::PutDocument()
+{
+	charfmt.Height(PointDots(0));
+	charfmt.language = 0;
+	old_ht = DotPoints(2 * tabs(charfmt.GetHeight()));
+	para_ht = 0;
+	oldstyle = Uuid::Create();
+	PutTxt(richtext, 0, 3600);
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/RichText/Format.cpp b/uppsrc/RichText/Format.cpp
new file mode 100644
index 000000000..b5fe76758
--- /dev/null
+++ b/uppsrc/RichText/Format.cpp
@@ -0,0 +1,199 @@
+#include "RichText.h"
+
+NAMESPACE_UPP
+
+void RichTxt::FormatInfo::Set(const RichPara::Format& fmt)
+{
+	(RichPara::Format&)*this = fmt;
+	charvalid = paravalid = 0xffffffff;
+}
+
+void RichTxt::FormatInfo::Set(const RichPara::CharFormat& fmt)
+{
+	(RichPara::CharFormat&)*this = fmt;
+	charvalid = 0xffffffff;
+}
+
+void RichTxt::FormatInfo::Combine(const RichPara::CharFormat& fmt)
+{
+	if(IsBold() != fmt.IsBold()) {
+		charvalid &= ~BOLD;
+		NoBold();
+	}
+	if(IsItalic() != fmt.IsItalic()) {
+		charvalid &= ~ITALIC;
+		NoItalic();
+	}
+	if(IsUnderline() != fmt.IsUnderline()) {
+		charvalid &= ~UNDERLINE;
+		NoUnderline();
+	}
+	if(IsStrikeout() != fmt.IsStrikeout()) {
+		charvalid &= ~STRIKEOUT;
+		NoStrikeout();
+	}
+	if(capitals != fmt.capitals) {
+		charvalid &= ~CAPITALS;
+		capitals = false;
+	}
+	if(dashed != fmt.dashed) {
+		charvalid &= ~DASHED;
+		dashed = false;
+	}
+	if(sscript != fmt.sscript) {
+		charvalid &= ~SSCRIPT;
+		sscript = 0;
+	}
+	if(GetFace() != fmt.GetFace())
+		charvalid &= ~FACE;
+	if(GetHeight() != fmt.GetHeight())
+		charvalid &= ~HEIGHT;
+	if(ink != fmt.ink) {
+		charvalid &= ~INK;
+		ink = Null;
+	}
+	if(paper != fmt.paper) {
+		charvalid &= ~PAPER;
+		paper = Null;
+	}
+	if(language != fmt.language) {
+		charvalid &= ~LANG;
+		language = 0;
+	}
+	if(link != fmt.link) {
+		charvalid &= ~LINK;
+		link = Null;
+	}
+	if(indexentry != fmt.indexentry) {
+		charvalid &= ~INDEXENTRY;
+		indexentry = Null;
+	}
+}
+
+void RichTxt::FormatInfo::Combine(const RichPara::Format& fmt)
+{
+	if(align != fmt.align)
+		paravalid &= ~ALIGN;
+	if(before != fmt.before)
+		paravalid &= ~BEFORE;
+	if(lm != fmt.lm)
+		paravalid &= ~LM;
+	if(indent != fmt.indent)
+		paravalid &= ~INDENT;
+	if(rm != fmt.rm)
+		paravalid &= ~RM;
+	if(after != fmt.after)
+		paravalid &= ~AFTER;
+	if(tabsize != fmt.tabsize)
+		paravalid &= ~TABSIZE;
+	if(bullet != fmt.bullet)
+		paravalid &= ~BULLET;
+	if(newpage != fmt.newpage)
+		paravalid &= ~NEWPAGE;
+	if(keep != fmt.keep)
+		paravalid &= ~KEEP;
+	if(keepnext != fmt.keepnext)
+		paravalid &= ~KEEPNEXT;
+	if(orphan != fmt.orphan)
+		paravalid &= ~ORPHAN;
+	if(label != fmt.label)
+		paravalid &= ~LABEL;
+	if(NumberingDiffers(*this, fmt))
+		paravalid &= ~NUMBERING;
+	if(tab.GetCount() != fmt.tab.GetCount()) {
+		paravalid &= ~TABS;
+		tab.Clear();
+	}
+	else
+		for(int i = 0; i < tab.GetCount(); i++)
+			if(tab[i].pos != fmt.tab[i].pos || tab[i].align != fmt.tab[i].align ||
+			   tab[i].fillchar != fmt.tab[i].fillchar) {
+				paravalid &= ~TABS;
+				tab.Clear();
+				break;
+			}
+	if(styleid != fmt.styleid)
+		paravalid &= ~STYLE;
+	if(linespacing != fmt.linespacing) {
+		paravalid &= ~SPACING;
+	}
+}
+
+void RichTxt::FormatInfo::ApplyTo(RichPara::CharFormat& fmt) const
+{
+	if(charvalid & BOLD)
+		fmt.Bold(IsBold());
+	if(charvalid & ITALIC)
+		fmt.Italic(IsItalic());
+	if(charvalid & UNDERLINE)
+		fmt.Underline(IsUnderline());
+	if(charvalid & STRIKEOUT)
+		fmt.Strikeout(IsStrikeout());
+	if(charvalid & CAPITALS)
+		fmt.capitals = capitals;
+	if(charvalid & DASHED)
+		fmt.dashed = dashed;
+	if(charvalid & SSCRIPT)
+		fmt.sscript = sscript;
+	if(charvalid & FACE)
+		fmt.Face(GetFace());
+	if(charvalid & HEIGHT)
+		fmt.Height(GetHeight());
+	if(charvalid & LANGUAGE)
+		fmt.language = language;
+	if(charvalid & INK)
+		fmt.ink = ink;
+	if(charvalid & PAPER)
+		fmt.paper = paper;
+	if(charvalid & LANG)
+		fmt.language = language;
+	if(charvalid & LINK)
+		fmt.link = link;
+	if(charvalid & INDEXENTRY)
+		fmt.indexentry = indexentry;
+}
+
+void RichTxt::FormatInfo::ApplyTo(RichPara::Format& fmt) const
+{
+	ApplyTo((RichPara::CharFormat &)fmt);
+	if(paravalid & ALIGN)
+		fmt.align = align;
+	if(paravalid & BEFORE)
+		fmt.before = before;
+	if(paravalid & LM)
+		fmt.lm = lm;
+	if(paravalid & INDENT)
+		fmt.indent = indent;
+	if(paravalid & RM)
+		fmt.rm = rm;
+	if(paravalid & AFTER)
+		fmt.after = after;
+	if(paravalid & TABSIZE)
+		fmt.tabsize = tabsize;
+	if(paravalid & BULLET)
+		fmt.bullet = bullet;
+	if(paravalid & NEWPAGE)
+		fmt.newpage = newpage;
+	if(paravalid & KEEP)
+		fmt.keep = keep;
+	if(paravalid & KEEPNEXT)
+		fmt.keepnext = keepnext;
+	if(paravalid & ORPHAN)
+		fmt.orphan = orphan;
+	if(paravalid & LABEL)
+		fmt.label = label;
+	if(paravalid & NUMBERING) {
+		fmt.before_number = before_number;
+		fmt.after_number = after_number;
+		fmt.reset_number = reset_number;
+		memcpy(fmt.number, number, sizeof(number));
+	}
+	if(paravalid & TABS)
+		fmt.tab = tab;
+	if(paravalid & STYLE)
+		fmt.styleid = styleid;
+	if(paravalid & SPACING)
+		fmt.linespacing = linespacing;
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/RichText/Object.cpp b/uppsrc/RichText/Object.cpp
new file mode 100644
index 000000000..ed3a9aaab
--- /dev/null
+++ b/uppsrc/RichText/Object.cpp
@@ -0,0 +1,387 @@
+#include "RichText.h"
+
+NAMESPACE_UPP
+
+RichObjectType::RichObjectType() {}
+RichObjectType::~RichObjectType() {}
+
+String RichObjectType::GetCreateName() const
+{
+	return Null;
+}
+
+Size RichObjectType::GetDefaultSize(const Value& data, Size maxsize) const
+{
+	if(IsNull(data)) return Size(0, 0);
+	Size psz = GetPhysicalSize(data);
+	if((psz.cx | psz.cy) == 0)
+		psz = 625 * GetPixelSize(data) / 100;
+	Size sz;
+	for(int i = 1; i < 10000; i++) {
+		sz = psz / i;
+		if(sz.cx <= maxsize.cx && sz.cy <= maxsize.cy)
+			break;
+	}
+	return sz;
+}
+
+Value RichObjectType::Read(const String& s) const
+{
+	return s;
+}
+
+String RichObjectType::Write(const Value& v) const
+{
+	return v;
+}
+
+bool RichObjectType::Accept(PasteClip& clip)
+{
+	return false;
+}
+
+Value RichObjectType::Read(PasteClip& clip)
+{
+	return Null;
+}
+
+String RichObjectType::GetClipFmts() const
+{
+	return Null;
+}
+
+String RichObjectType::GetClip(const Value& data, const String& fmt) const
+{
+	return Null;
+}
+
+void RichObjectType::Menu(Bar& bar, RichObject& data) const {}
+void RichObjectType::DefaultAction(RichObject& data) const {}
+Size RichObjectType::GetPhysicalSize(const Value& data) const { return Size(0, 0); }
+Size RichObjectType::GetPixelSize(const Value& data) const { return Size(1, 1); }
+void RichObjectType::Paint(const Value& data, Draw& w, Size sz) const {}
+
+Image RichObjectType::ToImage(const Value& data, Size sz) const
+{
+	ImageDraw w(sz);
+	Paint(data, w, sz);
+	return w;
+}
+
+String RichObjectType::GetLink(const Value& data, Point pt, Size sz) const
+{
+	return Null;
+}
+
+typedef VectorMap<String, RichObjectType *> RichObjectHT;
+
+GLOBAL_VAR(RichObjectHT, RichObject::Map);
+
+void RichObject::NewSerial()
+{
+	INTERLOCKED {
+		static int64 s;
+		serial = ++s;
+	}
+}
+
+void RichObject::Register(const char *name, RichObjectType *type)
+{
+	AssertST();
+	Map().FindAdd(name, type);
+}
+
+void RichObject::Paint(Draw& w, Size sz) const
+{
+	if(type)
+		type->Paint(data, w, sz);
+	else {
+		w.DrawRect(sz, SColorFace());
+		DrawFrame(w, sz, SColorText());
+		w.DrawText(2, 2, type_name);
+	}
+}
+
+Image RichObject::ToImage(Size sz) const
+{
+	if(type)
+		return type->ToImage(data, sz);
+	else {
+		ImageDraw w(sz);
+		Paint(w, sz);
+		return w;
+	}
+}
+
+struct UnknownRichObject : RichObjectType {
+	virtual String GetTypeName(const Value&) const;
+};
+
+String UnknownRichObject::GetTypeName(const Value&) const
+{
+	return Null;
+}
+
+const RichObjectType& RichObject::GetType() const
+{
+	if(type)
+		return *type;
+	return Single<UnknownRichObject>();
+}
+
+void   RichObject::Set(RichObjectType *_type, const Value& _data, Size maxsize)
+{
+	Clear();
+	type = _type;
+	if(type) {
+		data = _data;
+		physical_size = type->GetPhysicalSize(data);
+		pixel_size = type->GetPixelSize(data);
+		size = type->GetDefaultSize(data, maxsize);
+	}
+	NewSerial();
+}
+
+bool   RichObject::Set(const String& _type_name, const Value& _data, Size maxsize)
+{
+	NewSerial();
+	type_name = _type_name;
+	RichObjectType *t = Map().Get(type_name, NULL);
+	if(t) {
+		Set(t, _data);
+		return true;
+	}
+	else {
+		Clear();
+		data = _data;
+		physical_size = pixel_size = size = Size(64, 64);
+	}
+	return false;
+}
+
+bool   RichObject::Read(const String& _type_name, const String& _data, Size sz)
+{
+	NewSerial();
+	type_name = _type_name;
+	RichObjectType *t = Map().Get(type_name, NULL);
+	if(t) {
+		Clear();
+		type = t;
+		data = type->Read(_data);
+		physical_size = type->GetPhysicalSize(data);
+		pixel_size = type->GetPixelSize(data);
+		size = sz;
+		return true;
+	}
+	data = _data;
+	physical_size = pixel_size = size = sz;
+	return false;
+}
+
+String RichObject::GetTypeName() const
+{
+	return type ? type->GetTypeName(data) : type_name;
+}
+
+void   RichObject::Clear()
+{
+	NewSerial();
+	keepratio = true;
+	type = NULL;
+	data = Value();
+	size = physical_size = pixel_size = Size(0, 0);
+	ydelta = 0;
+	type_name.Clear();
+}
+
+RichObject::RichObject()
+{
+	Clear();
+}
+
+RichObject::RichObject(RichObjectType *type, const Value& data, Size maxsize)
+{
+	Set(type, data, maxsize);
+}
+
+RichObject::RichObject(const String& type, const Value& data, Size maxsize)
+{
+	Set(type, data, maxsize);
+}
+
+struct RichObjectTypeDrawingCls : public RichObjectType
+{
+	virtual String GetTypeName(const Value&) const;
+	virtual Size   GetPhysicalSize(const Value& data) const;
+	virtual Size   GetPixelSize(const Value& data) const;
+	virtual void   Paint(const Value& data, Draw& w, Size sz) const;
+	virtual Value  Read(const String& s) const;
+	virtual String Write(const Value& v) const;
+
+	struct Data
+	{
+		void    Serialize(Stream& stream);
+
+		Drawing drawing;
+		Size    dot_size;
+	};
+};
+
+RichObjectType *RichObjectTypeDrawing() { return &Single<RichObjectTypeDrawingCls>(); }
+
+void RichObjectTypeDrawingCls::Data::Serialize(Stream& stream)
+{
+	int version = 1;
+	stream % version % dot_size % drawing;
+}
+
+String RichObjectTypeDrawingCls::GetTypeName(const Value&) const
+{
+	return "Drawing";
+}
+
+RichObject CreateDrawingObject(const Drawing& dwg, Size dot_size, Size out_size)
+{
+	RichObjectTypeDrawingCls::Data data;
+	data.drawing = dwg;
+	data.dot_size = dot_size;
+	RichObject obj(RichObjectTypeDrawing(), RawToValue(data));
+	if(!IsNull(out_size))
+		obj.SetSize(out_size);
+	return obj;
+}
+
+RichObject CreateDrawingObject(const Drawing& dwg, int cx, int cy)
+{
+	Size dsz = dwg.GetSize();
+	return CreateDrawingObject(dwg, dsz, cx || cy ? GetRatioSize(dsz, cx, cy) : dsz);
+}
+
+Size RichObjectTypeDrawingCls::GetPixelSize(const Value& data) const
+{
+	if(IsTypeRaw<Data>(data))
+		return ValueTo<Data>(data).drawing.GetSize(); // dot_size; TRC 08/04/04
+	return Size(0, 0);
+}
+
+Size RichObjectTypeDrawingCls::GetPhysicalSize(const Value& data) const
+{
+	if(IsTypeRaw<Data>(data))
+		return ValueTo<Data>(data).dot_size;
+	return Size(0, 0);
+}
+
+Value RichObjectTypeDrawingCls::Read(const String& s) const
+{
+	Data data;
+	StringStream ss(s);
+	ss % data;
+	if(ss.IsError())
+		return Value();
+	return RawToValue(data);
+}
+
+String RichObjectTypeDrawingCls::Write(const Value& v) const
+{
+	if(IsTypeRaw<Data>(v))
+	{
+		StringStream ss;
+		ss % const_cast<Data&>(ValueTo<Data>(v));
+		return ss;
+	}
+	return Null;
+}
+
+void RichObjectTypeDrawingCls::Paint(const Value& data, Draw& w, Size sz) const
+{
+	w.DrawRect(sz, White);
+	if(IsTypeRaw<Data>(data))
+		w.DrawDrawing(Rect(sz), ValueTo<Data>(data).drawing);
+}
+
+INITBLOCK {
+	RichObject::Register("Drawing", &Single<RichObjectTypeDrawingCls>());
+};
+
+struct RichObjectTypePNGCls : public RichObjectType
+{
+	virtual String GetTypeName(const Value&) const;
+	virtual Size   GetPhysicalSize(const Value& data) const;
+	virtual Size   GetPixelSize(const Value& data) const;
+	virtual void   Paint(const Value& data, Draw& w, Size sz) const;
+	virtual Value  Read(const String& s) const;
+	virtual String Write(const Value& v) const;
+};
+
+RichObjectType *RichObjectTypePNG() { return &Single<RichObjectTypePNGCls>(); }
+
+String RichObjectTypePNGCls::GetTypeName(const Value&) const
+{
+	return "PING";
+}
+
+RichObject CreatePNGObject(const Image& img, Size dot_size, Size out_size)
+{
+	RichObject obj(RichObjectTypePNG(), PNGEncoder().SaveString(img));
+	if(!IsNull(out_size))
+		obj.SetSize(out_size);
+	return obj;
+}
+
+RichObject CreatePNGObject(const Image& img, int cx, int cy)
+{
+	Size dsz = img.GetSize();
+	return CreatePNGObject(img, dsz, cx || cy ? GetRatioSize(dsz, cx, cy) : dsz);
+}
+
+Size RichObjectTypePNGCls::GetPixelSize(const Value& data) const
+{
+	if(IsString(data)) {
+		StringStream strm(data);
+		One<StreamRaster> ras = StreamRaster::OpenAny(strm);
+		if(!!ras)
+			return ras->GetSize();
+	}
+	return Size(0, 0);
+}
+
+Size RichObjectTypePNGCls::GetPhysicalSize(const Value& data) const
+{
+	if(IsString(data)) {
+		StringStream strm(data);
+		One<StreamRaster> ras = StreamRaster::OpenAny(strm);
+		if(!!ras)
+			return ras->GetInfo().dots;
+	}
+	return Size(0, 0);
+}
+
+Value RichObjectTypePNGCls::Read(const String& s) const
+{
+	return s;
+}
+
+String RichObjectTypePNGCls::Write(const Value& v) const
+{
+	return v;
+}
+
+void RichObjectTypePNGCls::Paint(const Value& data, Draw& w, Size sz) const
+{
+	if(IsString(data)) {
+		StringStream strm(data);
+		One<StreamRaster> ras = StreamRaster::OpenAny(strm);
+		if(!!ras) {
+			w.DrawRect(sz, White);
+			w.DrawImage(Rect(sz), ras->GetImage());
+			return;
+		}
+	}
+	w.DrawRect(sz, LtRed());
+}
+
+INITBLOCK {
+	RichObject::Register("PING", &Single<RichObjectTypePNGCls>());
+};
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/RichText/Para.h b/uppsrc/RichText/Para.h
new file mode 100644
index 000000000..92f0d9000
--- /dev/null
+++ b/uppsrc/RichText/Para.h
@@ -0,0 +1,284 @@
+struct RichCaret;
+struct RichPos;
+
+struct RichPara {
+	enum Code {
+		NONE,
+
+		INDEXENTRY  = 2,
+		FIELD       = 3,
+		FACE        = 4,
+		HEIGHT      = 5,
+		LANGUAGE    = 6,
+		INK         = 7,
+		PAPER       = 8,
+
+		TAB         = 9, // placeholder
+
+		LINK        = 10,
+		SSCRIPT     = 11,
+
+		BOLD0       = 12,
+		BOLD1       = 13,
+		BOLDS       = 14,
+		ITALIC0     = 15,
+		ITALIC1     = 16,
+		ITALICS     = 17,
+		UNDERLINE0  = 18,
+		UNDERLINE1  = 19,
+		UNDERLINES  = 20,
+		CAPITALS0   = 21,
+		CAPITALS1   = 22,
+		CAPITALSS   = 23,
+		STRIKEOUT0  = 24,
+		STRIKEOUT1  = 25,
+		STRIKEOUTS  = 26,
+		DASHED0     = 27,
+		DASHED1     = 28,
+		DASHEDS     = 29,
+
+		OBJECT      = 31
+	};
+
+	enum BULLET_STYLE {
+		BULLET_NONE,
+		BULLET_ROUND,
+		BULLET_ROUNDWHITE,
+		BULLET_BOX,
+		BULLET_BOXWHITE,
+		BULLET_TEXT
+	};
+
+	enum NUMBER_STYLE {
+		NUMBER_NONE,
+		NUMBER_1,
+		NUMBER_0,
+		NUMBER_a,
+		NUMBER_A,
+		NUMBER_i,
+		NUMBER_I,
+	};
+	
+	enum LINESPACING {
+		LSP10 = 0,
+		LSP15 = -1,
+		LSP20 = -2,
+	};
+
+	struct CharFormat : public Font {
+		int     language;
+		Color   ink, paper;
+		String  link;
+		WString indexentry;
+		dword   sscript:2;
+		bool    capitals;
+		bool    dashed;
+
+#ifdef _DEBUG
+		String  ToString() const;
+#endif
+
+		CharFormat();
+	};
+
+	struct Tab : Moveable<Tab> {
+		int   pos;
+		byte  align;
+		byte  fillchar;
+
+		Tab() { align = ALIGN_LEFT; pos = 0; fillchar = 0; }
+	};
+
+	struct NumberFormat {
+		String      before_number, after_number;
+		bool        reset_number;
+		byte        number[8];
+
+		bool        IsNumbered() const;
+		int         GetNumberLevel() const;
+	};
+
+	struct Format : NumberFormat, CharFormat {
+		int         align;
+		int         before, lm, indent, rm, after;
+		int         tabsize;
+		int         bullet;
+		int         linespacing;
+		bool        newpage, keep, keepnext, orphan;
+		WithDeepCopy< Vector<Tab> > tab;
+		String      label;
+		Uuid        styleid;
+
+		void        SortTabs();
+
+#ifdef _DEBUG
+		String      ToString() const;
+#endif
+
+		Format();
+	};
+
+	struct Number {
+		int     n[8];
+
+		String  AsText(const NumberFormat& format) const;
+		void    TestReset(const NumberFormat& format);
+		void    Next(const NumberFormat& format);
+
+		Number();
+	};
+
+	struct Part {
+		RichObject                  object;
+		WString                     text;
+		CharFormat                  format;
+		Id                          field;
+		String                      fieldparam;
+		WithDeepCopy< Array<Part> > fieldpart;
+
+		bool        NonText() const    { return object || field; }
+		bool        IsText() const     { return !NonText(); }
+		int         GetLength() const  { return object || field ? 1 : text.GetLength(); }
+	};
+
+	struct FieldType {
+		virtual Array<Part> Evaluate(const String& param, VectorMap<String, Value>& vars,
+		                             const CharFormat& fmt) = 0;
+		virtual void        Menu(Bar& bar, String *param) const {}
+		virtual void        DefaultAction(String *param) const {}
+		virtual ~FieldType() {}
+	};
+
+	struct HeightInfo {
+		int                  ascent;
+		int                  descent;
+		int                  external;
+		int                  ydelta;
+		const RichObject    *object;
+
+		int                  Sum() const { return ascent + descent + external; }
+	};
+
+	struct Line : public HeightInfo {
+		int  pos;
+		int  len;
+		int  ppos;
+		int  plen;
+		int  xpos;
+		int  cx;
+		int  objecti;
+		bool withtabs;
+	};
+
+	struct Lines {
+		int                        len;
+		int                        clen;
+		int                        cx;
+		Buffer<wchar>              text;
+		Buffer<byte>               spell;
+		Buffer<int>                pos;
+		Buffer<int>                width;
+		Buffer<HeightInfo>         height;
+		Buffer<const CharFormat *> format;
+		Array<Line>                line;
+		Array<CharFormat>          hformat;
+		int                        first_indent;
+		int                        next_indent;
+
+
+		int                  GetCount() const        { return line.GetCount(); }
+		Line&                operator[](int i)       { return line[i]; }
+		const Line&          operator[](int i) const { return line[i]; }
+		void                 Justify(const Format& format);
+		int                  BodyHeight();
+	};
+
+	static const VectorMap<Id, FieldType *>& fieldtype();
+	static void  Register(Id id, FieldType& ft) init_;
+
+	Format      format;
+	Array<Part> part;
+
+	static void Charformat(Stream& out, const CharFormat& o, const CharFormat& n,
+	                       const CharFormat& s);
+
+	void        Cat(const WString& s, const CharFormat& f);
+	void        Cat(const char *s, const CharFormat& f);
+	void        Cat(const RichObject& o, const CharFormat& f);
+	void        Cat(Id fieldtype, const String& param, const CharFormat& f);
+
+	int         GetLength() const;
+	int         GetCount() const                          { return part.GetCount(); }
+	bool        IsEmpty() const;
+	String      Pack(const Format& style, Array<RichObject>& obj) const;
+	void        Unpack(const String& s, const Array<RichObject>& obj,
+	                   const Format& style);
+
+	Part&       operator[](int i)                         { return part[i]; }
+	const Part& operator[](int i) const                   { return part[i]; }
+	int         FindPart(int& pos) const;
+	void        Trim(int pos);
+	void        Mid(int pos);
+	void        Append(const RichPara& p)                 { part.Append(p.part); }
+
+	void        GetRichPos(RichPos& rp, int pos) const;
+
+	Lines       FormatLines(int cx) const;
+	void        Paint(PageDraw& pw, const Rect& page, PageY py, const PaintInfo& pi,
+	                  const Number& n, const Bits& spellerrors,
+	                  int nbefore, int nline) const;
+	RichCaret   GetCaret(int pos, const Rect& page, PageY py, int nbefore, int nline) const;
+	int         GetPos(int x, PageY y, const Rect& page, PageY py, int nbefore, int nline) const;
+	void        GatherLabels(Vector<RichValPos>& info, const Rect& page, PageY py,
+	                         int pos, int nbefore, int nline) const;
+	void        GatherIndexes(Vector<RichValPos>& info, const Rect& page, PageY py,
+	                          int pos, int nbefore, int nline) const;
+	int         GetVertMove(int pos, int gx, const Rect& page, int dir) const;
+
+	WString     GetText() const;
+
+	bool        HasPos() const;
+
+	bool        EvaluateFields(VectorMap<String, Value>& vars);
+
+	void        operator<<=(const RichPara& p)            { format = p.format; part <<= p.part; }
+
+#ifdef _DEBUG
+	void        Dump();
+#endif
+
+	void        ApplyZoom(Zoom z);
+
+private:
+	Tab         GetNextTab(int pos) const;
+	void        Smh(Lines& lines, HeightInfo *th, int cx) const;
+	Lines       Begin(const Rect& page, PageY& py, int nbefore, int nline) const;
+	bool        BreaksPage(PageY py, const Lines& pl, int i, const Rect& page) const;
+	void        PackParts(Stream& out, const CharFormat& chrstyle,
+	                      const Array<Part>& part, CharFormat& cf,
+	                      Array<RichObject>& obj) const;
+	void        UnpackParts(Stream& in, const CharFormat& chrstyle,
+	                        Array<Part>& part, const Array<RichObject>& obj, int& oi);
+	static void Flush(Draw& draw, const PaintInfo& pi, wchar *text, const CharFormat **i0,
+                      int *wd, int pos, int len, int x0, int x, int y0, int y, int linecy,
+                      int lineascent, Zoom z, bool highlight);
+	int         PosInLine(int x, const Rect& page, const Lines& pl, int lni) const;
+	struct StorePart;
+};
+
+inline bool operator==(const RichPara::Tab& a, const RichPara::Tab& b) {
+	return a.pos == b.pos && a.align == b.align && a.fillchar == b.fillchar;
+}
+
+bool operator==(const Vector<RichPara::Tab>& a, const Vector<RichPara::Tab>& b);
+
+inline
+bool operator!=(const Vector<RichPara::Tab>& a, const Vector<RichPara::Tab>& b) {
+	return !(a == b);
+}
+
+bool NumberingDiffers(const RichPara::Format& fmt1, const RichPara::Format& fmt2);
+
+void Sort(Vector<RichPara::Tab>& tab);
+
+void operator*=(RichPara::Format& fmt, Zoom z);
diff --git a/uppsrc/RichText/ParaData.cpp b/uppsrc/RichText/ParaData.cpp
new file mode 100644
index 000000000..418bd11e8
--- /dev/null
+++ b/uppsrc/RichText/ParaData.cpp
@@ -0,0 +1,702 @@
+#include "RichText.h"
+
+NAMESPACE_UPP
+
+PaintInfo::PaintInfo()
+{
+	sell = selh = 0;
+	tablesel = 0;
+	top = PageY(0, 0);
+	bottom = PageY(INT_MAX, INT_MAX);
+	hyperlink = SColorMark();
+	usecache = false;
+	sizetracking = false;
+	showcodes = Null;
+	spellingchecker = NULL;
+	highlightpara = -1;
+	highlight = Yellow();
+	indexentry = LtGreen();
+	coloroverride = false;
+}
+
+String RichPara::Number::AsText(const RichPara::NumberFormat& format) const
+{
+	String result;
+	for(int i = 0; i < 8; i++)
+		if(format.number[i]) {
+			if(result.GetLength())
+				result.Cat('.');
+			int q = n[i];
+			switch(format.number[i]) {
+			case NUMBER_1:
+				result << AsString(q);
+				break;
+			case NUMBER_0:
+				result << AsString(q - 1);
+				break;
+			case NUMBER_a:
+				result << FormatIntAlpha(q, false);
+				break;
+			case NUMBER_A:
+				result << FormatIntAlpha(q, true);
+				break;
+			case NUMBER_i:
+				result << FormatIntRoman(q, false);
+				break;
+			case NUMBER_I:
+				result << FormatIntRoman(q, true);
+				break;
+			}
+		}
+	return format.before_number + result + format.after_number;
+}
+
+void   RichPara::Number::TestReset(const RichPara::NumberFormat& fmt)
+{
+	if(fmt.reset_number) {
+		bool done = false;
+		for(int i = 7; i >= 0; --i)
+			if(fmt.number[i]) {
+				n[i] = 0;
+				done = true;
+				break;
+			}
+		if(!done && !IsNull(n[0]))
+			n[0] = 0;
+	}
+}
+
+void   RichPara::Number::Next(const RichPara::NumberFormat& fmt)
+{
+	for(int i = 7; i >= 0; --i)
+		if(fmt.number[i]) {
+			n[i++]++;
+			while(i <= 7)
+				n[i++] = 0;
+			break;
+		}
+}
+
+RichPara::Number::Number()
+{
+	memset(n, 0, sizeof(n));
+}
+
+bool RichPara::NumberFormat::IsNumbered() const
+{
+	if(before_number.GetLength() || after_number.GetLength())
+		return true;
+	for(int i = 0; i < 8; i++)
+		if(number[i])
+		   return true;
+	return false;
+}
+
+int RichPara::NumberFormat::GetNumberLevel() const
+{
+	for(int i = 7; i >= 0; i--)
+		if(number[i])
+		   return i + 1;
+	if(before_number.GetLength() || after_number.GetLength())
+		return 0;
+	return -1;
+}
+
+bool NumberingDiffers(const RichPara::Format& fmt1, const RichPara::Format& fmt2)
+{
+	return fmt1.before_number != fmt2.before_number ||
+	       fmt1.after_number != fmt2.after_number ||
+	       fmt1.reset_number != fmt2.reset_number ||
+	       memcmp(fmt1.number, fmt2.number, sizeof(fmt1.number));
+}
+
+bool operator==(const Vector<RichPara::Tab>& a, const Vector<RichPara::Tab>& b)
+{
+	if(a.GetCount() != b.GetCount()) return false;
+	for(int i = 0; i < a.GetCount(); i++)
+		if(a[i].pos != b[i].pos || a[i].align != b[i].align || a[i].fillchar != b[i].fillchar)
+			return false;
+	return true;
+}
+
+RichPara::CharFormat::CharFormat()
+{
+	(Font &)*this = Arial(100);
+	ink = Black;
+	paper = Null;
+	language = 0;
+	link = Null;
+	sscript = 0;
+	capitals = dashed = false;
+}
+
+RichPara::Format::Format()
+{
+	align = ALIGN_LEFT;
+	before = lm = rm = indent = after = 0;
+	bullet = 0;
+	keep = newpage = keepnext = orphan = false;
+	tabsize = 296;
+	memset(number, 0, sizeof(number));
+	reset_number = false;
+	linespacing = 0;
+	tab.Clear();
+	styleid = RichStyle::GetDefaultId();
+}
+
+void RichPara::Charformat(Stream& out, const RichPara::CharFormat& o,
+                          const RichPara::CharFormat& n, const RichPara::CharFormat& s)
+{
+	if(o.IsBold() != n.IsBold())
+		out.Put(n.IsBold() == s.IsBold() ? BOLDS : BOLD0 + n.IsBold());
+	if(o.IsItalic() != n.IsItalic())
+		out.Put(n.IsItalic() == s.IsItalic() ? ITALICS
+		                                     : ITALIC0 + n.IsItalic());
+	if(o.IsUnderline() != n.IsUnderline())
+		out.Put(n.IsUnderline() == s.IsUnderline() ? UNDERLINES
+		                                           : UNDERLINE0 + n.IsUnderline());
+	if(o.IsStrikeout() != n.IsStrikeout())
+		out.Put(n.IsStrikeout() == s.IsStrikeout() ? STRIKEOUTS
+		                                           : STRIKEOUT0 + n.IsStrikeout());
+	if(o.capitals != n.capitals)
+		out.Put(n.capitals == s.capitals ? CAPITALSS
+		                                 : CAPITALS0 + n.capitals);
+	if(o.dashed != n.dashed)
+		out.Put(n.dashed == s.dashed ? DASHEDS
+		                             : DASHED0 + n.dashed);
+	if(o.sscript != n.sscript) {
+		out.Put(SSCRIPT);
+		out.Put(n.sscript);
+	}
+	if(o.GetFace() != n.GetFace()) {
+		out.Put(FACE);
+		out.Put16(n.GetFace() == s.GetFace() ? 0xffff : n.GetFace());
+	}
+	if(o.GetHeight() != n.GetHeight()) {
+		out.Put(HEIGHT);
+		out.Put16(n.GetHeight() == s.GetHeight() ? 0xffff : n.GetHeight());
+	}
+	if(o.link != n.link) {
+		out.Put(LINK);
+		String s = n.link;
+		out % s;
+	}
+	if(o.ink != n.ink) {
+		out.Put(INK);
+		Color c = n.ink;
+		c.Serialize(out);
+	}
+	if(o.paper != n.paper) {
+		out.Put(PAPER);
+		Color c = n.paper;
+		c.Serialize(out);
+	}
+	if(o.language != n.language) {
+		out.Put(LANGUAGE);
+		out.Put32(n.language);
+	}
+	if(o.indexentry != n.indexentry) {
+		out.Put(INDEXENTRY);
+		WString s = n.indexentry;
+		out % s;
+	}
+}
+
+void RichPara::Cat(const WString& s, const RichPara::CharFormat& f)
+{
+	part.Add();
+	part.Top().text = s;
+	part.Top().format = f;
+}
+
+void RichPara::Cat(const char *s, const CharFormat& f)
+{
+	Cat(WString(s), f);
+}
+
+void RichPara::Cat(const RichObject& o, const RichPara::CharFormat& f)
+{
+	part.Add();
+	part.Top().object = o;
+	part.Top().format = f;
+}
+
+void RichPara::Cat(Id field, const String& param, const RichPara::CharFormat& f)
+{
+	Part& p = part.Add();
+	p.field = field;
+	p.fieldparam = param;
+	p.format = f;
+	VectorMap<String, Value> dummy;
+	FieldType *ft = fieldtype().Get(field, NULL);
+	if(ft)
+		p.fieldpart ^= ft->Evaluate(param, dummy, f);
+}
+
+struct TabLess {
+	bool operator () (const RichPara::Tab& a, const RichPara::Tab& b) const {
+		return a.pos == b.pos ? a.align < b.align : a.pos < b.pos;
+	}
+};
+
+void RichPara::Format::SortTabs()
+{
+	Sort(tab, TabLess());
+}
+
+void RichPara::PackParts(Stream& out, const RichPara::CharFormat& chrstyle,
+                         const Array<RichPara::Part>& part, CharFormat& cf,
+                         Array<RichObject>& obj) const
+{
+	for(int i = 0; i < part.GetCount(); i++) {
+		const Part& p = part[i];
+		Charformat(out, cf, p.format, chrstyle);
+		cf = p.format;
+		if(p.field) {
+			out.Put(FIELD);
+			out.Put32(p.field.AsNdx());
+			String s = p.fieldparam;
+			out % s;
+			StringStream oout;
+			CharFormat subf = cf;
+			PackParts(oout, chrstyle, p.fieldpart, subf, obj);
+			s = oout;
+			out % s;
+		}
+		else
+		if(p.object) {
+			obj.Add(p.object);
+			out.Put(OBJECT);
+		}
+		else {
+			String x = ToUtf8(p.text);
+			out.Put(x);
+		}
+	}
+}
+
+String RichPara::Pack(const RichPara::Format& style, Array<RichObject>& obj) const
+{
+	StringStream out;
+	word pattr = 0;
+	if(format.align != style.align)             pattr |= 1;
+	if(format.before != style.before)           pattr |= 2;
+	if(format.lm != style.lm)                   pattr |= 4;
+	if(format.indent != style.indent)           pattr |= 8;
+	if(format.rm != style.rm)                   pattr |= 0x10;
+	if(format.after != style.after)             pattr |= 0x20;
+	if(format.bullet != style.bullet)           pattr |= 0x40;
+	if(format.keep != style.keep)               pattr |= 0x80;
+	if(format.newpage != style.newpage)         pattr |= 0x100;
+	if(format.tabsize != style.tabsize)         pattr |= 0x200;
+	if(!IsNull(format.label))                   pattr |= 0x400;
+	if(format.keepnext != style.keepnext)       pattr |= 0x800;
+	if(format.orphan != style.orphan)           pattr |= 0x1000;
+	if(NumberingDiffers(format, style))         pattr |= 0x2000;
+	if(format.linespacing != style.linespacing) pattr |= 0x4000;
+	if(format.tab != style.tab)                 pattr |= 0x8000;
+	out.Put16(pattr);
+	if(pattr & 1)      out.Put16(format.align);
+	if(pattr & 2)      out.Put16(format.before);
+	if(pattr & 4)      out.Put16(format.lm);
+	if(pattr & 8)      out.Put16(format.indent);
+	if(pattr & 0x10)   out.Put16(format.rm);
+	if(pattr & 0x20)   out.Put16(format.after);
+	if(pattr & 0x40)   out.Put16(format.bullet);
+	if(pattr & 0x80)   out.Put(format.keep);
+	if(pattr & 0x100)  out.Put(format.newpage);
+	if(pattr & 0x200)  out.Put16(format.tabsize);
+	if(pattr & 0x400)  { String t = format.label; out % t; }
+	if(pattr & 0x800)  out.Put(format.keepnext);
+	if(pattr & 0x1000) out.Put(format.orphan);
+	if(pattr & 0x2000) {
+		String b = format.before_number, a = format.after_number;
+		out % b % a;
+		out.Put(format.reset_number);
+		out.Put(format.number, 8);
+	}
+	if(pattr & 0x4000)
+		out.Put(format.linespacing);
+	if(pattr & 0x8000) {
+		int c = 0;
+		int i;
+		for(i = 0; i < format.tab.GetCount(); i++) {
+			if(!IsNull(format.tab[i].pos))
+				c++;
+		}
+		out.Put16(c);
+		for(i = 0; i < format.tab.GetCount(); i++) {
+			const RichPara::Tab& w = format.tab[i];
+			if(!IsNull(w.pos)) {
+				out.Put32(w.pos);
+				out.Put(w.align);
+				out.Put(w.fillchar);
+			}
+		}
+	}
+	obj.Clear();
+	CharFormat cf = style;
+	if(part.GetCount())
+		PackParts(out, style, part, cf, obj);
+	else
+		Charformat(out, style, format, cf);
+	String r = out;
+	r.Shrink();
+	return r;
+}
+
+void RichPara::UnpackParts(Stream& in, const RichPara::CharFormat& chrstyle,
+                           Array<RichPara::Part>& part, const Array<RichObject>& obj,
+                           int& oi) {
+	part.Add();
+	part.Top().format = format;
+	int c;
+	while((c = in.Term()) >= 0)
+		if(c < 30 && c != 9 && c != FIELD) {
+			do
+				switch(in.Get()) {
+				case BOLD0:
+					format.NoBold();
+					break;
+				case BOLD1:
+					format.Bold();
+					break;
+				case BOLDS:
+					format.Bold(chrstyle.IsBold());
+					break;
+				case ITALIC0:
+					format.NoItalic();
+					break;
+				case ITALIC1:
+					format.Italic();
+					break;
+				case ITALICS:
+					format.Italic(chrstyle.IsItalic());
+					break;
+				case UNDERLINE0:
+					format.NoUnderline();
+					break;
+				case UNDERLINE1:
+					format.Underline();
+					break;
+				case UNDERLINES:
+					format.Underline(chrstyle.IsUnderline());
+					break;
+				case STRIKEOUT0:
+					format.NoStrikeout();
+					break;
+				case STRIKEOUT1:
+					format.Strikeout();
+					break;
+				case STRIKEOUTS:
+					format.Strikeout(chrstyle.IsStrikeout());
+					break;
+				case CAPITALS0:
+					format.capitals = false;
+					break;
+				case CAPITALS1:
+					format.capitals = true;
+					break;
+				case CAPITALSS:
+					format.capitals = chrstyle.capitals;
+					break;
+				case DASHED0:
+					format.dashed = false;
+					break;
+				case DASHED1:
+					format.dashed = true;
+					break;
+				case DASHEDS:
+					format.dashed = chrstyle.dashed;
+					break;
+				case SSCRIPT:
+					format.sscript = in.Get();
+					if(format.sscript == 3)
+						format.sscript = chrstyle.sscript;
+					break;
+				case FACE:
+					c = in.Get16();
+					format.Face(c == 0xffff ? chrstyle.GetFace() : c);
+					break;
+				case HEIGHT:
+					c = in.Get16();
+					format.Height(c == 0xffff ? chrstyle.GetHeight() : c);
+					break;
+				case LINK:
+					in % format.link;
+					break;
+				case INDEXENTRY:
+					in % format.indexentry;
+					break;
+				case INK:
+					in % format.ink;
+					break;
+				case PAPER:
+					in % format.paper;
+					break;
+				case LANGUAGE:
+					format.language = in.Get32();
+					break;
+				}
+			while((c = in.Term()) < 30 && c != 9 && c != FIELD && c >= 0);
+			if(part.Top().text.GetLength())
+				part.Add();
+			part.Top().format = format;
+		}
+		else
+		if(in.Term() == FIELD) {
+			RichPara::Format pformat = format;
+			if(part.Top().text.GetLength()) {
+				part.Add();
+				part.Top().format = pformat;
+			}
+			in.Get();
+			Part& p = part.Top();
+			p.field = Id(in.Get32());
+			in % p.fieldparam;
+			String s;
+			in % s;
+			StringStream sn(s);
+			UnpackParts(sn, chrstyle, p.fieldpart, obj, oi);
+			part.Add();
+			part.Top().format = format = pformat;
+		}
+		else
+		if(in.Term() == OBJECT) {
+			if(part.Top().text.GetLength()) {
+				part.Add();
+				part.Top().format = format;
+			}
+			part.Top().object = obj[oi++];
+			part.Top().format = format;
+			part.Add();
+			part.Top().format = format;
+			in.Get();
+		}
+		else
+			part.Top().text.Cat(in.GetUtf8());
+	if(part.Top().text.GetLength() == 0 && part.Top().IsText())
+		part.Drop();
+}
+
+void RichPara::Unpack(const String& data, const Array<RichObject>& obj,
+                      const RichPara::Format& style)
+{
+	part.Clear();
+	StringStream in(data);
+
+	format = style;
+
+	word pattr = in.Get16();
+
+	if(pattr & 1)      format.align = in.Get16();
+	if(pattr & 2)      format.before = in.Get16();
+	if(pattr & 4)      format.lm = in.Get16();
+	if(pattr & 8)      format.indent = in.Get16();
+	if(pattr & 0x10)   format.rm = in.Get16();
+	if(pattr & 0x20)   format.after = in.Get16();
+	if(pattr & 0x40)   format.bullet = in.Get16();
+	if(pattr & 0x80)   format.keep = in.Get();
+	if(pattr & 0x100)  format.newpage = in.Get();
+	if(pattr & 0x200)  format.tabsize = in.Get16();
+	if(pattr & 0x400)  in % format.label;
+	if(pattr & 0x800)  format.keepnext = in.Get();
+	if(pattr & 0x1000) format.orphan = in.Get();
+	if(pattr & 0x2000) {
+		in % format.before_number;
+		in % format.after_number;
+		format.reset_number = in.Get();
+		in.Get(format.number, 8);
+	}
+	if(pattr & 0x4000) {
+		format.linespacing = (int8)in.Get();
+	}
+	if(pattr & 0x8000) {
+		format.tab.Clear();
+		int n = in.Get16();
+		format.tab.Reserve(n);
+		for(int i = 0; i < n; i++) {
+			RichPara::Tab& w = format.tab.Add();
+			w.pos = in.Get32();
+			w.align = in.Get();
+			w.fillchar = in.Get();
+		}
+	}
+	part.Clear();
+	int oi = 0;
+	UnpackParts(in, style, part, obj, oi);
+}
+
+bool RichPara::IsEmpty() const
+{
+	return part.GetCount() == 0 || GetLength() == 0;
+}
+
+int RichPara::GetLength() const
+{
+	int n = 0;
+	for(int i = 0; i < part.GetCount(); i++)
+		n += part[i].GetLength();
+	return n;
+}
+
+WString RichPara::GetText() const
+{
+	WString r;
+	for(int i = 0; i < part.GetCount(); i++)
+		if(part[i].IsText())
+			r.Cat(part[i].text);
+		else
+			r.Cat(127);
+	return r;
+}
+
+typedef VectorMap<Id, RichPara::FieldType *> FieldTypeMap;
+GLOBAL_VAR(FieldTypeMap, fieldtype0)
+
+const VectorMap<Id, RichPara::FieldType *>& RichPara::fieldtype()
+{
+	return fieldtype0();
+}
+
+void RichPara::Register(Id id, FieldType& ft) init_
+{
+	AssertST();
+	fieldtype0().GetAdd(id, &ft);
+}
+
+bool RichPara::EvaluateFields(VectorMap<String, Value>& vars)
+{
+	bool b = false;
+	for(int i = 0; i < GetCount(); i++) {
+		Part& p = part[i];
+		if(p.field) {
+			FieldType *f = fieldtype().Get(p.field, NULL);
+			if(f) {
+				p.fieldpart ^= f->Evaluate(p.fieldparam, vars, p.format);
+				b = true;
+			}
+		}
+	}
+	return b;
+}
+
+bool RichPara::HasPos() const
+{
+	if(!format.label.IsEmpty()) return true;
+	for(int i = 0; i < part.GetCount(); i++)
+		if(!part[i].format.indexentry.IsEmpty())
+			return true;
+	return false;
+}
+
+int  RichPara::FindPart(int& pos) const
+{
+	int pi = 0;
+	while(pi < part.GetCount() && pos >= part[pi].GetLength()) {
+		pos -= part[pi].GetLength();
+		pi++;
+	}
+	return pi;
+}
+
+void RichPara::Trim(int pos)
+{
+	int i = FindPart(pos);
+	if(pos) {
+		ASSERT(part[i].IsText());
+		part[i].text.Trim(pos);
+		part.SetCount(i + 1);
+	}
+	else
+		part.SetCount(i);
+}
+
+void RichPara::Mid(int pos)
+{
+	int i = FindPart(pos);
+	part.Remove(0, i);
+	if(pos) {
+		ASSERT(part[0].IsText());
+		part[0].text = part[0].text.Mid(pos);
+	}
+}
+
+#ifdef _DEBUG
+void RichPara::Dump()
+{
+	LOG("RichPara dump" << LOG_BEGIN);
+	LOG("BEFORE: " << format.before);
+	LOG("INDENT: " << format.indent);
+	LOG("LM: " << format.lm);
+	LOG("RM: " << format.rm);
+	LOG("AFTER: " << format.after);
+	LOG("KEEP: " << format.keep);
+	LOG("NEWPAGE: " << format.newpage);
+	LOG("BULLET: " << format.bullet);
+	int i;
+	for(i = 0; i < format.tab.GetCount(); i++)
+		LOG("TAB " << format.tab[i].pos << " : " << format.tab[i].align);
+	for(i = 0; i < part.GetCount(); i++)
+		LOG("Part[" << i << "] = \"" << part[i].text << "\" "
+		    << part[i].format);
+	LOG(LOG_END << "---------");
+}
+
+
+String RichPara::CharFormat::ToString() const
+{
+	String out;
+	out
+	<< Font(*this)
+	<< ", ink " << DumpColor(ink);
+	if(!UPP::IsNull(paper))
+		out << ", paper " << DumpColor(paper);
+	switch(sscript)
+	{
+	case 0:  break;
+	case 1:  out << ", superscript"; break;
+	case 2:  out << ", subscript"; break;
+	default: out << ", sscript(" << (int)sscript << ")"; break;
+	}
+	out << ", lang " << DumpLanguage(language);
+	if(!UPP::IsNull(link))
+		out << ", link " << link;
+	if(capitals)
+		out << ", capitals";
+	if(dashed)
+		out << ", dashed";
+	return out;
+}
+
+String RichPara::Format::ToString() const
+{
+	String out;
+	if(!UPP::IsNull(label))
+		out << "label <" << label << ">: ";
+	out
+	<< DumpAlign(align) << ", left " << lm << ", right " << rm
+	<< ", indent " << indent << ", before " << before << ", after " << after
+	<< ", tabsize " << tabsize << ", bullet " << bullet
+	<< (newpage  ? ", newpage" : "")
+	<< (keep     ? ", keep" : "")
+	<< (keepnext ? ", keepnext" : "")
+	<< (orphan   ? ", orphan" : "");
+	int i;
+	for(i = 0; i < tab.GetCount(); i++)
+		out << (i ? "\n" : ", ")
+		<< "tab[" << i << "] = " << tab[i].pos << ", align " << DumpAlign(tab[i].align)
+		<< ", fill " << FormatIntHex(tab[i].fillchar, 2);
+	out << "\n";
+	out << "before_number " << before_number << ", after_number " << after_number
+	<< (reset_number ? ", reset_number" : "");
+	for(i = 0; i < __countof(number); i++)
+		if(number[i] != RichPara::NUMBER_NONE)
+			out << " num[" << i << "] = " << (int)number[i];
+	out << "\n";
+	return out;
+}
+
+#endif
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/RichText/ParaPaint.cpp b/uppsrc/RichText/ParaPaint.cpp
new file mode 100644
index 000000000..444c37384
--- /dev/null
+++ b/uppsrc/RichText/ParaPaint.cpp
@@ -0,0 +1,576 @@
+#include "RichText.h"
+
+NAMESPACE_UPP
+
+#define IMAGECLASS RichTextImg
+#define IMAGEFILE <RichText/RichText.iml>
+#include <Draw/iml.h>
+
+RichPara::Lines RichPara::Begin(const Rect& page, PageY& py, int nbefore, int nline) const
+{
+	Lines pl = FormatLines(page.Width());
+	int cy = format.before;
+	if(format.keep || format.keepnext)
+		cy += pl.BodyHeight();
+	else
+		cy += pl[0].Sum();
+	int after = format.after;
+	if(!format.keepnext)
+		nbefore = nline = after = 0;
+	if(page.Height() < 32000 &&
+	   (format.newpage || py.y + cy + after + nbefore + nline > page.bottom &&
+	    cy < page.Height())) {
+		py.page++;
+		py.y = page.top;
+	}
+	py.y += format.before;
+	pl.Justify(format);
+	return pl;
+}
+
+void RichPara::Flush(Draw& draw, const PaintInfo& pi, wchar *text,
+                     const CharFormat **i0,
+                     int *wd, int pos, int len, int x0, int x, int y0,
+                     int y, int linecy, int lineascent, Zoom z,
+                     bool highlight)
+{
+	if(*i0) {
+		const CharFormat& f = **i0;
+		int width = z * x - z * x0;
+		int zy0 = z * y0;
+		int zx0 = z * x0;
+		if(!IsNull(f.paper) && !highlight)
+			draw.DrawRect(zx0, z * y, width, z * (y + linecy) - z * y,
+			              pi.coloroverride ? SColorPaper() : f.paper);
+		if(!IsNull(f.indexentry) && !IsNull(pi.indexentry))
+			draw.DrawRect(zx0, zy0, width, 2, pi.indexentry);
+		Font fnt = f;
+		int zht = z * tabs(f.GetHeight());
+		int ssa;
+		int ssd;
+		if(f.sscript) {
+			FontInfo fi = fnt(zht).Info();
+			ssa = fi.GetAscent();
+			ssd = fi.GetDescent();
+			zht = 3 * zht / 5;
+		}
+		fnt.Height(zht ? zht : 1);
+		FontInfo fi = fnt.Info();
+		if(f.dashed) {
+			int dx = max(fi.GetAscent() / 5, 2);
+			for(int i = 0; dx * i < width; i++)
+				draw.DrawRect(zx0 + i * dx, zy0 + fi.GetDescent() / 2,
+				              dx / 2, max(fi.GetDescent() / 3, 1),
+				              pi.coloroverride ? SColorText() : f.ink);
+		}
+		Color ink = pi.coloroverride ? SColorText() : f.ink;
+		if(!IsNull(f.link) && !IsNull(pi.hyperlink)) {
+			fnt.Underline();
+			if(!pi.coloroverride)
+				ink = pi.hyperlink;
+		}
+		x = zx0;
+		for(int i = 0; i < len; i++) {
+			int w = wd[pos + i];
+			Image img;
+			wchar& c = text[pos + i];
+			if(c == ' ')
+				img = RichTextImg::SpaceChar();
+			if(c == 160)
+				img = RichTextImg::HardSpaceChar();
+			if(c >= 9 && c < 9 + 4) {
+				if(c > 9) {
+					static char fct[] = { ' ', '.', '-', '_' };
+					int fc = fct[c - 9];
+					int pw = fi[fc];
+					int px = (x + pw - 1) / pw * pw;
+					while(px + pw < x + w) {
+						draw.DrawText(px, zy0 - fi.GetAscent(), String(fc, 1), fnt, Black);
+						px += pw;
+					}
+				}
+				img = RichTextImg::TabChar();
+				c = ' ';
+			}
+			if(img && !IsNull(pi.showcodes)) {
+				Size sz = img.GetSize();
+				if(sz.cy < z * lineascent)
+					draw.DrawImage(x + (w - sz.cx) / 2, zy0 - sz.cy, img, pi.showcodes);
+			}
+			x += w;
+		}
+		draw.DrawText(zx0,
+		              f.sscript == 1 ? zy0 - ssa :
+		              f.sscript == 2 ? zy0 + ssd - fi.GetHeight()
+		                             : zy0 - fi.GetAscent(),
+		              text + pos, fnt, ink, len, wd + pos);
+	}
+}
+
+bool RichPara::BreaksPage(PageY py, const Lines& pl, int i, const Rect& page) const
+{
+	int linecy = pl[i].Sum();
+	if(linecy >= page.Height()) return false;
+	if(linecy + py.y > page.bottom)
+		return true;
+	if(format.orphan || pl.GetCount() < 2) return false;
+	if((i == 0 || i == pl.GetCount() - 2) && py.y + linecy + pl[i + 1].Sum() > page.bottom)
+		return true;
+	return false;
+}
+
+struct RichObjectImageMaker : ImageMaker {
+	RichObject object;
+	Size       sz;
+
+	virtual String Key() const;
+	virtual Image  Make() const;
+};
+
+String RichObjectImageMaker::Key() const
+{
+	StringBuffer b;
+	int64 id = object.GetSerialId();
+	b.Cat((const char *)&id, sizeof(id));
+	b.Cat((const char *)&sz.cx, sizeof(sz.cx));
+	b.Cat((const char *)&sz.cy, sizeof(sz.cy));
+	return b;
+}
+
+Image RichObjectImageMaker::Make() const
+{
+	ImageDraw iw(sz);
+	iw.DrawRect(sz, SColorPaper());
+	object.Paint(iw, sz);
+	return iw;
+}
+
+void RichPara::Paint(PageDraw& pw, const Rect& page, PageY py, const PaintInfo& pi,
+                     const Number& n, const Bits& spellerror,
+                     int nbefore, int nline) const
+{
+	Zoom z = pi.zoom;
+	PageY opy = py;
+	Lines pl = Begin(page, py, nbefore, nline);
+	bool highlight = pi.highlightpara >= 0 && pi.highlightpara < pl.len;
+	if(pi.sell < 0 && pi.selh > 0)
+		for(int p = opy.page; p <= py.page; p++) {
+			int top = z * (p == opy.page ? opy.y : page.top);
+			int bottom = z * (p == py.page ? py.y : page.bottom);
+			pw.Page(p).DrawRect(z * page.left, top, z * page.right - z * page.left,
+			                    bottom - top, InvertColor);
+		}
+	opy = py;
+	int oi = 0;
+	int x;
+	int y0;
+	int lineascent = 0;
+	for(int lni = 0; lni < pl.GetCount(); lni++) {
+		Line& li = pl[lni];
+		int linecy = li.Sum();
+		lineascent = li.ascent;
+		if(BreaksPage(py, pl, lni, page)) {
+			if(li.ppos > pi.sell && li.ppos < pi.selh) {
+				int y = z * py.y;
+				pw.Page(py.page).DrawRect(z * page.left, y, z * page.right - z * page.left,
+				                          z * page.bottom - y, InvertColor);
+			}
+			py.y = page.top;
+			py.page++;
+		}
+		if(py > pi.bottom)
+			break;
+
+		const CharFormat **cf = pl.format + li.pos;
+		const CharFormat **i = cf;
+		const CharFormat **ilim = i + li.len;
+		const HeightInfo *hg = pl.height + li.pos;
+		if(py + linecy >= pi.top) {
+			Draw& draw = pw.Page(py.page);
+#ifdef _DEBUG
+			int cloff = draw.GetCloffLevel();
+#endif
+			Buffer<int> wd(li.len);
+			int x0 = li.xpos + page.left;
+			x = x0;
+			int *w = pl.width + li.pos;
+			int *wl = w + li.len;
+			int *t = wd;
+			while(w < wl) {
+				int x1 = x + *w++;
+				*t++ = z * x1 - z * x;
+				x = x1;
+			}
+
+			if(highlight)
+				draw.DrawRect(z * page.left, z * py.y, z * page.Width(),
+					          z * (py.y + linecy) - z * py.y,
+					          pi.highlight);
+
+			const CharFormat **i0 = i;
+			wchar *text = pl.text + li.pos;
+			x = x0;
+			w = pl.width + li.pos;
+			y0 = py.y + li.ascent;
+			int pp = li.pos;
+			int l = page.right;
+			int h = -1;
+
+			while(i < ilim) {
+				if(pl.pos[pp] == pi.sell && x < l)
+					l = x;
+				if(pl.pos[pp] == pi.selh && h < 0)
+					h = x;
+				pp++;
+				if(*i0 != *i || hg->object) {
+					Flush(draw, pi, text, i0, wd, (int)(i0 - cf),(int)( i - i0), x0, x, y0, py.y, linecy,
+					      lineascent, z, highlight);
+					i0 = i;
+					x0 = x;
+				}
+				if(hg->object) {
+					const RichObject& o = *hg->object;
+					if(o) {
+						Size sz = z * o.GetSize();
+						draw.DrawRect(z * x, z * py.y, sz.cx, z * linecy, (*i)->paper);
+						draw.Clipoff(z * x, z * (y0 - hg->ascent), sz.cx, sz.cy);
+						if(pi.sizetracking)
+							draw.DrawRect(sz, SColorFace);
+						else
+							if(pi.usecache) {
+								RichObjectImageMaker im;
+								im.object = o;
+								im.sz = sz;
+								draw.DrawImage(0, 0, MakeImagePaintOnly(im));
+							}
+							else
+								o.Paint(draw, sz);
+						draw.End();
+					}
+					i++;
+					hg++;
+					x += *w++;
+					i0 = i;
+					x0 = x;
+				}
+				else {
+					i++;
+					hg++;
+					x += *w++;
+				}
+			}
+			if(i > i0)
+				Flush(draw, pi, text, i0, wd, (int)(i0 - cf), (int)(i - i0), x0, x, y0, py.y, linecy,
+				      lineascent, z, highlight);
+			if(lni == 0) {
+				Rect r;
+				r.left = page.left + format.lm;
+				int q = li.ascent / 2;
+				r.top = py.y + 4 * (li.ascent - q) / 5;
+				r.right = r.left + q;
+				r.bottom = r.top + q;
+				q = z * (r.Width() / 4);
+				r.left = z * r.left;
+				r.top = z * r.top;
+				r.right = z * r.right;
+				r.bottom = z * r.bottom;
+				Rect r1 = r;
+				r1.Deflate(max(1, q));
+				switch(format.bullet) {
+				case BULLET_BOX:
+					draw.DrawRect(r, pi.coloroverride ? SColorText() : format.ink);
+					break;
+				case BULLET_BOXWHITE:
+					draw.DrawRect(r, pi.coloroverride ? SColorText() : format.ink);
+					draw.DrawRect(r1, White);
+					break;
+				case BULLET_ROUNDWHITE:
+					draw.DrawEllipse(r, pi.coloroverride ? SColorText() : format.ink);
+					draw.DrawEllipse(r1, pi.coloroverride ? SColorPaper() : White);
+					break;
+				case BULLET_ROUND:
+					draw.DrawEllipse(r, pi.coloroverride ? SColorText() : format.ink);
+					break;
+				default:
+					String s = n.AsText(format);
+					if(!IsNull(s)) {
+						CharFormat cf = li.len && *pl.format ? **pl.format : format;
+						cf.Height(z * cf.GetHeight());
+						draw.DrawText(r.left,
+						              z * y0 - cf.Info().GetAscent(),
+						              s, cf, pi.coloroverride ? SColorText() : cf.ink);
+					}
+				}
+			}
+			int zlcy = z * linecy;
+			if(pi.spellingchecker && zlcy > 3) {
+				int x = z * (li.xpos + page.left);
+				w = wd;
+				wl = w + li.len;
+				int i = li.pos;
+				int q = z * (py.y + linecy);
+				while(w < wl) {
+					if(spellerror[pl.pos[i++]]) {
+						if(zlcy > 10)
+							draw.DrawRect(x, q - 3, *w, 1, Red);
+						draw.DrawRect(x, q - 2, *w, 1, LtRed);
+					}
+					x += *w++;
+				}
+			}
+
+			if(pi.selh == li.ppos + li.plen)
+				h = x;
+			if(pi.sell == li.ppos + li.plen)
+				l = x;
+			if(pi.sell < li.ppos)
+				l = page.left;
+			if(pi.selh > li.ppos + li.plen)
+				h = page.right;
+			if(pi.sell < pi.selh && pi.selh > li.ppos)
+				draw.DrawRect(z * l, z * py.y, z * h - z * l,
+							  z * (py.y + linecy) - z * py.y, InvertColor);
+			ASSERT(draw.GetCloffLevel() == cloff);
+		}
+		else
+			while(i < ilim) {
+				if(hg->object)
+					oi++;
+				i++;
+				hg++;
+			}
+		py.y += linecy;
+	}
+	Size sz = RichTextImg::EndParaChar().GetSize();
+	if(sz.cy < z * lineascent && !IsNull(pi.showcodes))
+		pw.Page(py.page).DrawImage(z * x, z * y0 - sz.cy,
+		                           RichTextImg::EndParaChar(),
+		                           format.indexentry.GetCount() ? pi.indexentry : pi.showcodes);
+	if(format.newpage && !IsNull(pi.showcodes)) {
+		Draw& w = pw.Page(opy.page);
+		int wd = z * page.right - z * page.left;
+		int step = w.Pixels() ? 8 : 50;
+		int y = z * opy.y;
+		for(int x = 0; x < wd; x += step)
+			w.DrawRect(z * page.left + x, y, step >> 1, step >> 3, pi.showcodes);
+	}
+	if(pl.len >= pi.sell && pl.len < pi.selh && py < pi.bottom) {
+		int top = z * py.y;
+		pw.Page(py.page).DrawRect(z * page.left, top, z * page.right - z * page.left,
+		                          z * min(py.y + format.after, page.bottom) - top, InvertColor);
+	}
+}
+
+void RichPara::GetRichPos(RichPos& rp, int pos) const
+{
+	rp.format = format;
+	int i = FindPart(pos);
+	if(i < GetCount()) {
+		const Part& p = part[i];
+		(CharFormat&)rp.format = p.format;
+		if(p.object) {
+			rp.chr = -1;
+			rp.object = p.object;
+		}
+		else
+		if(p.IsText())
+			rp.chr = p.text[pos];
+		else {
+			rp.chr = -2;
+			rp.field = p.field;
+			rp.fieldparam = p.fieldparam;
+			if(p.fieldpart.GetCount() > 0)
+				rp.fieldformat = p.fieldpart[0].format;
+		}
+	}
+	else
+		rp.chr = '\n';
+}
+
+RichCaret RichPara::GetCaret(int pos, const Rect& page, PageY py, int nbefore, int nline) const
+{
+	Lines pl = Begin(page, py, nbefore, nline);
+	RichCaret pr;
+	FontInfo fi = format.Info();
+	pr.caretascent = fi.GetAscent();
+	pr.caretdescent = fi.GetDescent();
+	for(int lni = 0; lni < pl.GetCount(); lni++) {
+		Line& li = pl[lni];
+		int linecy = li.Sum();
+		if(BreaksPage(py, pl, lni, page)) {
+			py.y = page.top;
+			py.page++;
+		}
+		pr.page = py.page;
+		pr.top = py.y;
+		pr.bottom = py.y + linecy;
+		pr.lineascent = li.ascent;
+		pr.line = lni;
+		if(pos < li.ppos + li.plen) {
+			int *w = pl.width + li.pos;
+			int *p = pl.pos + li.pos;
+			const CharFormat **i = pl.format + li.pos;
+			const HeightInfo *h = pl.height + li.pos;
+			int x = li.xpos + page.left;
+			if(li.len && *i) {
+				pr.caretascent = h->ascent;
+				pr.caretdescent = h->descent;
+			}
+			while(pos > *p) {
+				x += *w++;
+				if(*i) {
+					pr.caretascent = h->ascent;
+					pr.caretdescent = h->descent;
+				}
+				h++;
+				i++;
+				p++;
+			}
+			pr.objectcy = h->ascent + h->ydelta;
+			pr.objectyd = h->ydelta;
+			pr.left = x;
+			pr.right = x + *w;
+			pr.caretdescent = min(pr.caretdescent, pr.Height() - pr.lineascent);
+			return pr;
+		}
+		py.y += linecy;
+	}
+	const Line& li = pl.line.Top();
+	pr.left = li.cx + li.xpos + page.left;
+	pr.right = page.right;
+	pr.caretdescent = min(pr.caretdescent, pr.Height() - pr.lineascent);
+	return pr;
+}
+
+int RichPara::PosInLine(int x, const Rect& page, const Lines& pl, int lni) const
+{
+	const Line& li = pl[lni];
+	const int *w = pl.width + li.pos;
+	const int *wl = w + li.len;
+	if(lni < pl.GetCount() - 1 && li.len > 0 && pl.text[li.pos + li.len - 1] == ' ')
+		wl--;
+	int xp = li.xpos + page.left;
+	while(w < wl && xp + *w <= x)
+		xp += *w++;
+	int pos = (int)(w - pl.width);
+	return pos < pl.clen ? pl.pos[pos] : pl.len;
+}
+
+int RichPara::GetPos(int x, PageY y, const Rect& page, PageY py, int nbefore, int nline) const
+{
+	Lines pl = Begin(page, py, nbefore, nline);
+	if(pl.len)
+		for(int lni = 0; lni < pl.GetCount(); lni++) {
+			const Line& li = pl[lni];
+			int linecy = li.Sum();
+			if(BreaksPage(py, pl, lni, page)) {
+				py.y = page.top;
+				py.page++;
+			}
+			py.y += linecy;
+			if(y < py || lni == pl.GetCount() - 1)
+				return PosInLine(x, page, pl, lni);
+		}
+	return pl.len;
+}
+
+int RichPara::GetVertMove(int pos, int gx, const Rect& page, int dir) const
+{
+	Lines pl = FormatLines(page.Width());
+	int lni;
+	if(pos >= 0) {
+		for(lni = 0; lni < pl.GetCount() - 1; lni++) {
+			const Line& li = pl[lni];
+			if(pos < li.ppos + li.plen)
+				break;
+		}
+		lni += sgn(dir);
+		if(lni < 0 || lni >= pl.GetCount())
+			return -1;
+	}
+	else
+		lni = dir < 0 ? pl.GetCount() - 1 : 0;
+	return PosInLine(gx, page, pl, lni);
+}
+
+void  RichPara::GatherLabels(Vector<RichValPos>& info, const Rect& page, PageY py,
+                             int pos, int nbefore, int nline) const
+{
+	Lines pl = Begin(page, py, nbefore, nline);
+	WString ie;
+	if(!pl.GetCount())
+		return;
+	if(BreaksPage(py, pl, 0, page)) {
+		py.y = page.top;
+		py.page++;
+	}
+	if(format.label.IsEmpty())
+		return;
+	RichValPos& f = info.Add();
+	f.py = py;
+	f.pos = pos;
+	f.data = format.label.ToWString();
+}
+
+void  RichPara::GatherIndexes(Vector<RichValPos>& info, const Rect& page, PageY py,
+                              int pos, int nbefore, int nline) const
+{
+	Lines pl = Begin(page, py, nbefore, nline);
+	WString ie;
+	for(int lni = 0; lni < pl.GetCount(); lni++) {
+		Line& li = pl[lni];
+		int linecy = li.Sum();
+		if(BreaksPage(py, pl, lni, page)) {
+			py.y = page.top;
+			py.page++;
+		}
+		const CharFormat **i0 = pl.format + li.pos;
+		const CharFormat **i = i0;
+		const CharFormat **ilim = i + li.len;
+		while(i < ilim) {
+			if(*i && (*i)->indexentry != ie) {
+				ie = (*i)->indexentry;
+				if(!ie.IsEmpty()) {
+					RichValPos& f = info.Add();
+					f.py = py;
+					f.pos = (int)(i - i0) + pos;
+					f.data = ie;
+				}
+			}
+			i++;
+		}
+		py.y += linecy;
+	}
+}
+
+void FontHeightRound(Font& fnt, Zoom z)
+{
+	fnt.Height((fnt.GetHeight() * z.m + (z.d >> 1)) / z.d);
+}
+
+void operator*=(RichPara::Format& format, Zoom z)
+{
+	FontHeightRound(format, z);
+	format.before *= z;
+	int ll = format.lm + format.indent;
+	format.lm *= z;
+	format.indent = z * ll - format.lm;
+	format.rm *= z;
+	format.after *= z;
+	format.tabsize *= z;
+	for(int i = 0; i < format.tab.GetCount(); i++)
+		format.tab[i].pos *= z;
+}
+
+void  RichPara::ApplyZoom(Zoom z)
+{
+	format *= z;
+	for(int i = 0; i < part.GetCount(); i++)
+		if(part[i].IsText())
+			FontHeightRound(part[i].format, z);
+		else
+		if(part[i].object)
+			part[i].object.SetSize(z * part[i].object.GetSize());
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/RichText/ParaType.cpp b/uppsrc/RichText/ParaType.cpp
new file mode 100644
index 000000000..37a1dfa5d
--- /dev/null
+++ b/uppsrc/RichText/ParaType.cpp
@@ -0,0 +1,376 @@
+#include "RichText.h"
+
+NAMESPACE_UPP
+
+void RichPara::Smh(Lines& lines, HeightInfo *th, int cx) const
+{
+	Line& l = lines.line.Top();
+	l.ascent = l.descent = l.external = 0;
+	const HeightInfo *he = th + l.pos + l.len;
+	for(const HeightInfo *h = th + l.pos; h < he; h++) {
+		if(h->ascent > l.ascent) l.ascent = h->ascent;
+		if(h->descent > l.descent) l.descent = h->descent;
+		if(h->external > l.external) l.external = h->external;
+	}
+	if(format.linespacing == LSP15) {
+		l.ascent = (3 * l.ascent) >> 1;
+		l.descent = (3 * l.descent) >> 1;
+	}
+	if(format.linespacing == LSP20) {
+		l.ascent = 2 * l.ascent;
+		l.descent = 2 * l.descent;
+	}
+	l.xpos = format.lm;
+	cx -= format.lm + format.rm;
+	l.xpos += lines.GetCount() == 1 ? lines.first_indent : lines.next_indent;
+	if(!l.withtabs)
+		switch(format.align) {
+		case ALIGN_RIGHT:
+			l.xpos += cx - l.cx;
+			break;
+		case ALIGN_CENTER:
+			l.xpos += (cx - l.cx) / 2;
+			break;
+		}
+	l.cx -= lines.GetCount() == 1 ? lines.first_indent : lines.next_indent;
+}
+
+RichPara::Tab RichPara::GetNextTab(int pos) const
+{
+	int tabi = -1;
+	int dist = INT_MAX;
+	for(int i = 0; i < format.tab.GetCount(); i++) {
+		const Tab& tab = format.tab[i];
+		if(tab.pos > pos && tab.pos - pos < dist) {
+			tabi = i;
+			dist = tab.pos - pos;
+		}
+	}
+	if(format.bullet == BULLET_TEXT) {
+		int q = format.indent + format.lm;
+		if(q > pos && q - pos < dist) {
+			Tab tab;
+			tab.align = ALIGN_LEFT;
+			tab.pos = q;
+			return tab;
+		}
+	}
+	if(tabi < 0) {
+		Tab tab;
+		tab.pos = format.tabsize ? (pos + format.tabsize) / format.tabsize * format.tabsize : 0;
+		tab.align = ALIGN_LEFT;
+		return tab;
+	}
+	return format.tab[tabi];
+}
+
+struct RichPara::StorePart {
+	wchar             *t;
+	int               *w;
+	int               *p;
+	const CharFormat **f;
+	HeightInfo        *h;
+	int                pos;
+	FontInfo           pfi;
+
+	void Store(Lines& lines, const Part& p, int pinc);
+};
+
+void RichPara::StorePart::Store(Lines& lines, const Part& part, int pinc)
+{
+	if(part.field && pinc) {
+		for(int i = 0; i < part.fieldpart.GetCount(); i++)
+			Store(lines, part.fieldpart[i], 0);
+		pos++;
+	}
+	else
+	if(part.object) {
+		*f++ = &part.format;
+		Size sz = part.object.GetSize();
+		*w++ = sz.cx;
+		h->ydelta = part.object.GetYDelta();
+		h->ascent = sz.cy - h->ydelta;
+		h->descent = max(h->ydelta, 0);
+		h->external = 0;
+		h->object = &part.object;
+		h++;
+		*t++ = 'x';
+		*p++ = pos;
+		pos += pinc;
+	}
+	else {
+		const wchar *s = part.text;
+		const wchar *lim = part.text.End();
+		Font fnt = part.format;
+		FontInfo fi = fnt.Info();
+		FontInfo wfi = fi;
+		if(part.format.sscript) {
+			fnt.Height(fnt.GetHeight() * 3 / 5);
+			wfi = fnt.Info();
+		}
+		if(part.format.capitals) {
+			CharFormat& cfmt = lines.hformat.Add();
+			cfmt = part.format;
+			cfmt.Height(cfmt.GetHeight() * 4 / 5);
+			FontInfo cfi = cfmt.Info();
+			FontInfo cwfi = cfi;
+			if(part.format.sscript) {
+				Font fnt = cfmt;
+				fnt.Height(fnt.GetHeight() * 3 / 5);
+				cwfi = fnt.Info();
+			}
+
+			while(s < lim) {
+				wchar c = *s++;
+				if(c == 9) {
+					*f++ = &part.format;
+					h->ascent = pfi.GetAscent();
+					h->descent = pfi.GetDescent();
+					h->external = pfi.GetExternal();
+					*w++ = 0;
+				}
+				else
+				if(IsLower(c)) {
+					*f++ = &cfmt;
+					c = ToUpper(c);
+					h->ascent = cfi.GetAscent();
+					h->descent = cfi.GetDescent();
+					h->external = cfi.GetExternal();
+					*w++ = c >= 32 ? cwfi[c] : 0;
+				}
+				else {
+					*f++ = &part.format;
+					h->ascent = fi.GetAscent();
+					h->descent = fi.GetDescent();
+					h->external = fi.GetExternal();
+					*w++ = c >= 32 ? wfi[c] : 0;
+				}
+				h->object = NULL;
+				*t++ = c;
+				*p++ = pos;
+				pos += pinc;
+				h++;
+			}
+		}
+		else {
+			while(s < lim) {
+				wchar c = *s++;
+				*f++ = &part.format;
+				if(c == 9) {
+					h->ascent = pfi.GetAscent();
+					h->descent = pfi.GetDescent();
+					h->external = pfi.GetExternal();
+				}
+				else {
+					h->ascent = fi.GetAscent();
+					h->descent = fi.GetDescent();
+					h->external = fi.GetExternal();
+				}
+				h->object = NULL;
+				*p++ = pos;
+				pos += pinc;
+				h++;
+				*w++ = c >= 32 ? wfi[c] : 0;
+				*t++ = c;
+			}
+		}
+	}
+}
+
+static int CountChars(const Array<RichPara::Part>& part)
+{
+	int n = 0;
+	for(int i = 0; i < part.GetCount(); i++) {
+		const RichPara::Part& p = part[i];
+		if(p.field)
+			n += CountChars(p.fieldpart);
+		else
+			n += p.GetLength();
+	}
+	return n;
+}
+
+RichPara::Lines RichPara::FormatLines(int acx) const
+{
+	int i;
+	Lines lines;
+	lines.cx = acx;
+	lines.len = GetLength();
+	lines.clen = CountChars(part);
+	lines.first_indent = lines.next_indent = format.indent;
+	if(format.bullet == BULLET_TEXT)
+		lines.first_indent = 0;
+	else
+	if(!format.bullet && !format.IsNumbered())
+		lines.next_indent = 0;
+
+	FontInfo pfi = format.Info();
+	if(lines.len == 0) {
+		Line& l = lines.line.Add();
+		l.pos = 0;
+		l.ppos = 0;
+		l.plen = 0;
+		l.len = 0;
+		l.cx = lines.first_indent;
+		l.withtabs = false;
+		HeightInfo dummy;
+		Smh(lines, &dummy, lines.cx);
+		l.ascent = pfi.GetAscent();
+		l.descent = pfi.GetDescent();
+		l.external = pfi.GetExternal();
+		return lines;
+	}
+
+	lines.text.Alloc(lines.clen);
+	lines.width.Alloc(lines.clen);
+	lines.pos.Alloc(lines.clen);
+	lines.format.Alloc(lines.clen);
+	lines.height.Alloc(lines.clen);
+
+	StorePart sp;
+	sp.t = lines.text;
+	sp.w = lines.width;
+	sp.p = lines.pos;
+	sp.f = lines.format;
+	sp.h = lines.height;
+	sp.pfi = pfi;
+	sp.pos = 0;
+
+	for(i = 0; i < part.GetCount(); i++)
+		sp.Store(lines, part[i], 1);
+
+	wchar *s = lines.text;
+	wchar *text = s;
+	wchar *end = lines.text + lines.clen;
+	wchar *space = NULL;
+	int *w = lines.width;
+	int cx = lines.first_indent;
+	int rcx = lines.cx - format.lm - format.rm;
+	bool withtabs = false;
+	int scx;
+	while(s < end) {
+		Tab t;
+		if(*s == ' ') {
+			space = s;
+			scx = cx;
+		}
+		else {
+			if(*s == '\t') {
+				t = GetNextTab(cx + format.lm);
+				space = NULL;
+			}
+			if(cx + *w > rcx && s > text || *s == '\t' && t.pos - format.lm >= rcx) {
+				Line& l = lines.line.Add();
+				l.withtabs = withtabs;
+				l.pos = (int)(text - lines.text);
+				if(space) {
+					l.len = (int)(space - text) + 1;
+					l.cx = scx;
+					text = s = space + 1;
+				}
+				else {
+					l.len = (int)(s - text);
+					l.cx = cx;
+					text = s;
+				}
+				Smh(lines, lines.height, lines.cx);
+				cx = lines.next_indent;
+				w = text - ~lines.text + lines.width;
+				space = NULL;
+				rcx = lines.cx - format.lm - format.rm;
+				withtabs = false;
+				t = GetNextTab(cx + format.lm);
+			}
+		}
+		if(*s == '\t') {
+			*s += t.fillchar;
+			if(t.align == ALIGN_LEFT) {
+				*w++ = t.pos - format.lm - cx;
+				cx = t.pos - format.lm;
+			}
+			else {
+				int tcx = 0;
+				int *tw = w + 1;
+				for(wchar *ts = s + 1; ts < end && *ts != '\t'; ts++)
+					tcx += *tw++;
+				int ww = t.pos - format.lm - cx - (t.align == ALIGN_RIGHT ? tcx : tcx / 2);
+				if(ww > 0) {
+					*w++ = ww;
+					cx += ww;
+				}
+				else
+					*w++ = 0;
+			}
+			withtabs = true;
+		}
+		else
+			cx += *w++;
+		s++;
+	}
+	Line& l = lines.line.Add();
+	l.withtabs = withtabs;
+	l.pos = (int)(text - lines.text);
+	l.len = (int)(s - text);
+	l.cx = cx;
+	Smh(lines, lines.height, lines.cx);
+	for(i = 0; i < lines.line.GetCount(); i++) {
+		Line& l = lines.line[i];
+		l.ppos = lines.pos[l.pos];
+		l.plen = (l.pos + l.len < lines.clen ? lines.pos[l.pos + l.len] : lines.len) - l.ppos;
+	}
+
+	return lines;
+}
+
+void RichPara::Lines::Justify(const RichPara::Format& format)
+{
+	if(format.align != ALIGN_JUSTIFY) return;
+	for(int i = 0; i < line.GetCount() - 1; i++) {
+		const Line& li = line[i];
+		if(!li.withtabs && li.len) {
+			const wchar *s = ~text + li.pos;
+			const wchar *lim = s + li.len;
+			while(lim - 1 > s) {
+				if(*(lim - 1) != ' ') break;
+				lim--;
+			}
+			while(s < lim) {
+				if(*s != ' ' && *s != 160) break;
+				s++;
+			}
+
+			const wchar *beg = s;
+			int nspc = 0;
+			while(s < lim) {
+				if(*s == ' ' || *s == 160) nspc++;
+				s++;
+			}
+			s = beg;
+			if(nspc) {
+				int q = ((cx - format.lm - format.rm -
+				          (i == 0 ? first_indent : next_indent) - li.cx) << 16)
+				        / nspc;
+				int *w = beg - ~text + width;
+				int prec = 0;
+				while(s < lim) {
+					if(*s == ' ' || *s == 160) {
+						*w += (prec + q) >> 16;
+						prec = (prec + q) & 0xffff;
+					}
+					w++;
+					s++;
+				}
+			}
+		}
+	}
+}
+
+int RichPara::Lines::BodyHeight()
+{
+	int sum = 0;
+	for(int i = 0; i < line.GetCount(); i++)
+		sum += line[i].Sum();
+	return sum;
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/RichText/ParseQtf.cpp b/uppsrc/RichText/ParseQtf.cpp
new file mode 100644
index 000000000..1db4f7cfb
--- /dev/null
+++ b/uppsrc/RichText/ParseQtf.cpp
@@ -0,0 +1,960 @@
+#include "RichText.h"
+
+NAMESPACE_UPP
+
+Color (*QTFColor[])() = {
+	Black, LtGray, White, Red, Green, Blue, LtRed, WhiteGray, LtCyan, Yellow
+};
+
+Color (*QTFSColor[])()= {
+	SColorText, SColorFace, SColorPaper, Red, Green, Blue, LtRed, WhiteGray, LtCyan, Yellow
+};
+
+Color NullColorF()
+{
+	return Null;
+}
+
+static Color (*QTFColorl[])() = {
+	/*a*/White, /*b*/Blue, /*c*/Cyan, /*d*/White, /*e*/White, /*f*/White, /*g*/ Green, /*h*/White,
+	/*i*/White, /*j*/White, /*k*/Black, /*l*/LtGray, /*m*/Magenta, /*n*/NullColorF, /*o*/Brown, /*p*/White,
+	/*q*/White, /*r*/Red, /*s*/White, /*t*/White, /*u*/White, /*v*/White, /*w*/WhiteGray, /*x*/White,
+	/*y*/Yellow, /*z*/ White
+};
+
+static Color (*QTFColorL[])() = {
+	/*A*/White, /*B*/LtBlue, /*C*/LtCyan, /*D*/White, /*E*/White, /*F*/White, /*G*/LtGreen, /*H*/White,
+	/*I*/White, /*J*/White, /*K*/Gray, /*L*/WhiteGray, /*M*/LtMagenta, /*N*/NullColorF, /*O*/Brown, /*P*/White,
+	/*Q*/White, /*R*/LtRed, /*S*/White, /*T*/White, /*U*/White, /*V*/White, /*W*/White, /*X*/White,
+	/*Y*/LtYellow, /*Z*/White
+};
+
+static Color (*QTFSColorl[])() = { //TODO
+	/*a*/SColorPaper, /*b*/SColorHighlight, /*c*/Cyan, /*d*/SColorPaper, /*e*/SColorPaper, /*f*/SColorPaper, /*g*/ Green, /*h*/SColorPaper,
+	/*i*/SColorPaper, /*j*/SColorPaper, /*k*/SColorText, /*l*/SColorFace, /*m*/Magenta, /*n*/NullColorF, /*o*/Brown, /*p*/SColorPaper,
+	/*q*/SColorPaper, /*r*/Red, /*s*/SColorPaper, /*t*/SColorPaper, /*u*/SColorPaper, /*v*/SColorPaper, /*w*/WhiteGray, /*x*/SColorPaper,
+	/*y*/Yellow, /*z*/ White
+};
+
+static Color (*QTFSColorL[])() = { //TODO
+	/*A*/SColorPaper, /*B*/LtBlue, /*C*/LtCyan, /*D*/SColorPaper, /*E*/SColorPaper, /*F*/SColorPaper, /*G*/LtGreen, /*H*/SColorPaper,
+	/*I*/SColorPaper, /*J*/SColorPaper, /*K*/SColorShadow, /*L*/WhiteGray, /*M*/LtMagenta, /*N*/NullColorF, /*O*/Brown, /*P*/SColorPaper,
+	/*Q*/SColorPaper, /*R*/LtRed, /*S*/SColorPaper, /*T*/SColorPaper, /*U*/SColorPaper, /*V*/SColorPaper, /*W*/SColorPaper, /*X*/SColorPaper,
+	/*Y*/LtYellow, /*Z*/White
+};
+
+int QTFFontHeight[] = {
+	50, 67, 84, 100, 134, 167, 200, 234, 300, 400
+};
+
+class RichQtfParser {
+	const char *term;
+	bool        scolors;
+	WString     text;
+	RichPara    paragraph;
+	RichTable   tablepart;
+	bool        istable;
+	bool        breakpage;
+	byte        accesskey;
+
+	struct PFormat : public RichPara::Format {
+		byte                  charset;
+	};
+
+	struct Tab {
+		RichCell::Format format;
+		int              vspan, hspan;
+		RichTxt          text;
+		RichTable        table;
+		int              cell;
+		Vector<int>      rown;
+
+		void Old()                    { RichTable::Format fmt; fmt.grid = 10; table.SetFormat(fmt); }
+
+		Tab()                         { cell = 0; vspan = hspan = 0; }
+	};
+
+	PFormat          format;
+	Array<PFormat>   fstack;
+	Vector<Uuid>     styleid;
+	Vector<int>      stylenext;
+	Array<Tab>       table;
+	bool             oldtab;
+
+	bool   Key(int c)                 { if(*term == c) { term++; return true; } return false; }
+	bool   Key2(int c, int d);
+	bool   Key2(int c)                { return Key2(c, c); }
+	int    GetNumber();
+	int    ReadNumber();
+	String GetText(int delim);
+	Color  GetColor();
+	void   Number2(int& a, int& b);
+
+	void   Flush();
+	void   SetFormat();
+	void   FlushStyles();
+	void   Error(const char *s);
+
+	void   ReadObject();
+
+	RichTable& Table();
+	void       TableFormat(bool bw = false);
+	void       FinishCell();
+	void       FinishTable();
+	void       FinishOldTable();
+	void       S(int& x, int a);
+
+	void       EndPart();
+
+	void       Cat(int chr);
+
+public:
+	struct Exc {};
+
+	RichText target;
+
+	void     Parse(const char *qtf, byte accesskey);
+
+	RichQtfParser(bool scolors);
+};
+
+void init_s_nodeqtf();
+
+RichQtfParser::RichQtfParser(bool _scolors)
+{
+	format.Face(Font::ARIAL);
+	format.Height(100);
+	format.charset = GetDefaultCharset();
+	format.language = 0;
+	breakpage = false;
+	istable = false;
+	oldtab = false;
+	init_s_nodeqtf();
+	scolors = _scolors;
+}
+
+bool RichQtfParser::Key2(int c, int d)
+{
+	if(term[0] == c && term[1] == d) {
+		term += 2;
+		return true;
+	}
+	return false;
+}
+
+int  RichQtfParser::GetNumber()
+{
+	int n = 0;
+	int sgn = 1;
+	if(*term == '-') {
+		sgn = -1;
+		term++;
+	}
+	while(IsDigit(*term))
+		n = n * 10 + *term++ - '0';
+	return sgn * n;
+}
+
+String RichQtfParser::GetText(int delim) {
+	String s;
+	for(;;) {
+		if(*term == '\0') return s;
+		if(*term == '`') {
+			term++;
+			if(*term == '\0') return s;
+			s.Cat(*term++);
+		}
+		else
+		if(*term == delim) {
+			term++;
+			return s;
+		}
+		else
+			s.Cat(*term++);
+	}
+}
+
+int RichQtfParser::ReadNumber()
+{
+	if(!IsDigit(*term))
+		Error("Expected number");
+	return GetNumber();
+}
+
+void RichQtfParser::Number2(int& a, int& b)
+{
+	a = -1;
+	b = -1;
+	if(IsDigit(*term))
+		a = GetNumber();
+	if(*term == '/') {
+		term++;
+		b = GetNumber();
+	}
+}
+
+Color RichQtfParser::GetColor()
+{
+	int c = *term++;
+	if(c == '(') {
+		byte r = GetNumber();
+		if(Key(')')) {
+			r &= 255;
+			return Color(r, r, r);
+		}
+		Key('.');
+		byte g = GetNumber();
+		Key('.');
+		byte b = GetNumber();
+		Key(')');
+		return Color(r & 255, g & 255, b & 255);
+	}
+	else
+	if(c >= '0' && c <= '9')
+		return (*((scolors ? QTFSColor : QTFColor)[c - '0']))();
+	else
+	if(c >= 'a' && c <= 'z')
+		return (*((scolors ? QTFSColorl : QTFColorl)[c - 'a']))();
+	else
+	if(c >= 'A' && c <= 'Z')
+		return (*((scolors ? QTFSColorL : QTFColorL)[c - 'A']))();
+	else
+		return Red;
+}
+
+void RichQtfParser::SetFormat()
+{
+	paragraph.format = format;
+}
+
+void RichQtfParser::Flush() {
+	if(text.GetLength()) {
+		ASSERT(!istable);
+		paragraph.format = format;
+		paragraph.Cat(text, format);
+		text.Clear();
+	}
+}
+
+void RichQtfParser::EndPart()
+{
+	if(istable) {
+		if(paragraph.GetCount() == 0 && text.GetCount() == 0)
+			if(table.GetCount())
+				table.Top().text.CatPick(tablepart);
+			else
+				target.CatPick(tablepart);
+		else {
+			paragraph.part.Clear();
+			text.Clear();
+		}
+	}
+	else {
+		Flush();
+		bool b = paragraph.format.newpage;
+		if(breakpage)
+			paragraph.format.newpage = true;
+		if(table.GetCount())
+			table.Top().text.Cat(paragraph, target.GetStyles());
+		else
+			target.Cat(paragraph);
+		paragraph.part.Clear();;
+		paragraph.format.newpage = b;
+		SetFormat();
+		breakpage = false;
+	}
+	istable = false;
+}
+
+void RichQtfParser::ReadObject()
+{
+	Flush();
+	RichObject obj;
+	if(*term == '#') {
+		term++;
+	#ifdef CPU_64
+		obj = *(RichObject *)stou64(term, &term);
+	#else
+		obj = *(RichObject *)stou(term, &term);
+	#endif
+		term++;
+	}
+	else {
+		String type;
+		while(IsAlNum(*term) || *term == '_')
+			type.Cat(*term++);
+		Size sz;
+		Key(':');
+		sz.cx = ReadNumber();
+		bool keepratio = false;
+		if(Key('&'))
+			keepratio = true;
+		else
+			Key('*');
+		sz.cy = ReadNumber();
+		int yd = 0;
+		if(Key('/'))
+			yd = GetNumber();
+		StringBuffer data;
+		for(;;) {
+			while(*term < 32 && *term > 0) term++;
+			if((byte)*term >= ' ' && (byte)*term <= 127 || *term == '\0') break;
+			byte seven = *term++;
+			for(int i = 0; i < 7; i++) {
+				while((byte)*term < 32 && (byte)*term > 0) term++;
+				if((byte)*term >= ' ' && (byte)*term <= 127 || *term == '\0') break;
+				data.Cat((*term++ & 0x7f) | ((seven << 7) & 0x80));
+				seven >>= 1;
+			}
+		}
+		obj.Read(type, data, sz);
+		obj.KeepRatio(keepratio);
+		obj.SetYDelta(yd);
+	}
+	paragraph.Cat(obj, format);
+}
+
+int NoLow(int c) {
+	return (byte)c >= 32 ? c : 0;
+}
+
+void RichQtfParser::Error(const char *s) {
+	RichPara::CharFormat ef;
+	(Font&) ef = Arial(84).Bold().Underline();
+	ef.ink = Red;
+	paragraph.Cat(("ERROR: " + String(s) + ": " +
+	              Filter(String(term, min<int>((int)strlen(term), 20)), NoLow)).ToWString(), ef);
+	target.Cat(paragraph);
+	FlushStyles();
+	throw Exc();
+}
+
+dword scanX(const char *s)
+{
+	dword r = 0;
+	for(int i = 0; i < 8; i++) {
+		r = (r << 4) | (*s >= '0' && *s <= '9' ? *s - '0' :
+		                *s >= 'A' && *s <= 'F' ? *s - 'A' :
+		                *s >= 'a' && *s <= 'f' ? *s - 'a' : 0);
+		s++;
+	}
+	return r;
+}
+
+void RichQtfParser::FlushStyles()
+{
+	for(int i = 0; i < styleid.GetCount(); i++)
+		if(stylenext[i] >= 0 && stylenext[i] < styleid.GetCount()) {
+			RichStyle s = target.GetStyle(styleid[i]);
+			s.next = styleid[stylenext[i]];
+			target.SetStyle(styleid[i], s);
+		}
+}
+
+RichTable& RichQtfParser::Table()
+{
+	if(table.GetCount() == 0)
+		Error("Not in table");
+	return table.Top().table;
+}
+
+void RichQtfParser::S(int& x, int a)
+{
+	if(a >= 0)
+		x = a;
+}
+
+void RichQtfParser::TableFormat(bool bw)
+{
+	RichTable& tab = Table();
+	Tab& t = table.Top();
+	int a, b;
+	for(;;) {
+		if(bw && IsDigit(*term)) {
+			t.hspan = GetNumber();
+		}
+		else
+		switch(*term++) {
+		case ' ': return;
+		case ';': break;
+		case '<': tab.format.lm = ReadNumber(); break;
+		case '>': tab.format.rm = ReadNumber(); break;
+		case 'B': tab.format.before = ReadNumber(); break;
+		case 'A': tab.format.after = ReadNumber(); break;
+		case 'f': tab.format.frame = ReadNumber(); break;
+		case '_':
+		case 'F': tab.format.framecolor = GetColor(); break;
+		case 'g': tab.format.grid = ReadNumber(); break;
+		case 'G': tab.format.gridcolor = GetColor(); break;
+		case 'h': tab.format.header = GetNumber(); break;
+		case '~': tab.format.frame = tab.format.grid = 0; break;
+		case '^': t.format.align = ALIGN_TOP; break;
+		case '=': t.format.align = ALIGN_CENTER; break;
+		case 'v': t.format.align = ALIGN_BOTTOM; break;
+		case 'l': Number2(a, b); S(t.format.border.left, a); S(t.format.margin.left, b); break;
+		case 'r': Number2(a, b); S(t.format.border.right, a); S(t.format.margin.right, b); break;
+		case 't': Number2(a, b); S(t.format.border.top, a); S(t.format.margin.top, b); break;
+		case 'b': Number2(a, b); S(t.format.border.bottom, a); S(t.format.margin.bottom, b); break;
+		case 'H': t.format.minheight = ReadNumber(); break;
+		case '@': t.format.color = GetColor(); break;
+		case 'R': t.format.bordercolor = GetColor(); break;
+		case '!': t.format = RichCell::Format(); break;
+		case 'k': t.format.keep = true;
+		case 'K': tab.format.keep = true;
+		case 'a':
+			Number2(a, b);
+			if(a >= 0)
+				t.format.border.left = t.format.border.right = t.format.border.top = t.format.border.bottom = a;
+			if(b >= 0)
+				t.format.margin.left = t.format.margin.right = t.format.margin.top = t.format.margin.bottom = b;
+			break; //!!cell all lines
+		case '-': t.hspan = GetNumber(); break;
+		case '+':
+		case '|': t.vspan = GetNumber(); break;
+		default:
+			Error("Invalid cell format");
+		}
+	}
+}
+
+void RichQtfParser::FinishCell()
+{
+	EndPart();
+	RichTable& t = Table();
+	Tab& b = table.Top();
+	int i, j;
+	if(oldtab) {
+		i = b.rown.GetCount() - 1;
+		j = b.rown.Top();
+		b.rown.Top()++;
+	}
+	else {
+		i = b.cell / t.GetColumns();
+		j = b.cell % t.GetColumns();
+	}
+	t.SetPick(i, j, b.text);
+	b.text.Clear();
+	t.SetFormat(i, j, b.format);
+	t.SetSpan(i, j, b.vspan, b.hspan);
+	if(oldtab && b.rown.GetCount() > 1 && j + 1 < b.rown[0])
+		b.format = t.GetFormat(0, j + 1);
+	else {
+		b.cell++;
+		b.vspan = 0;
+		b.hspan = oldtab;
+	}
+	b.format.keep = false;
+}
+
+void RichQtfParser::FinishTable()
+{
+	FinishCell();
+	tablepart = Table();
+	istable = true;
+	table.Drop();
+}
+
+void RichQtfParser::FinishOldTable()
+{
+	FinishCell();
+	Index<int>  pos;
+	Vector<int> srow;
+	RichTable& t = Table();
+	Tab& b = table.Top();
+	for(int i = 0; i < t.GetRows(); i++) {
+		int& s = srow.Add();
+		s = 0;
+		int nx = b.rown[i];
+		for(int j = 0; j < nx; j++)
+			s += t.GetSpan(i, j).cx;
+		int xn = 0;
+		for(int j = 0; j < nx; j++) {
+			pos.FindAdd(xn * 10000 / s);
+			xn += t.GetSpan(i, j).cx;
+		}
+	}
+	Vector<int> h = pos.PickKeys();
+	if(h.GetCount() == 0)
+		Error("table");
+	Sort(h);
+	pos = h;
+	pos.Add(10000);
+	RichTable tab;
+	tab.SetFormat(t.GetFormat());
+	for(int i = 0; i < pos.GetCount() - 1; i++) {
+		tab.AddColumn(pos[i + 1] - pos[i]);
+	}
+	for(int i = 0; i < t.GetRows(); i++) {
+		int s = srow[i];
+		int nx = b.rown[i];
+		int xn = 0;
+		int xi = 0;
+		for(int j = 0; j < nx; j++) {
+			Size span = t.GetSpan(i, j);
+			xn += span.cx;
+			int nxi = pos.Find(xn * 10000 / s);
+			tab.SetPick(i, xi, t.GetPick(i, j));
+			tab.SetFormat(i, xi, t.GetFormat(i, j));
+			tab.SetSpan(i, xi, max(span.cy - 1, 0), nxi - xi - 1);
+			xi = nxi;
+		}
+	}
+	table.Drop();
+	if(table.GetCount())
+		table.Top().text.CatPick(tab);
+	else
+		target.CatPick(tab);
+	oldtab = false;
+}
+
+void RichQtfParser::Cat(int chr)
+{
+	if(accesskey && ToUpper(ToAscii(chr)) == accesskey) {
+		Flush();
+		format.Underline(!format.IsUnderline());
+		text.Cat(chr);
+		Flush();
+		format.Underline(!format.IsUnderline());
+		accesskey = 0;
+	}
+	else {
+		text.Cat(chr);
+	}
+}
+
+extern bool s_nodeqtf[128];
+
+void RichQtfParser::Parse(const char *qtf, byte _accesskey)
+{
+	accesskey = _accesskey;
+	term = qtf;
+	while(*term) {
+		if(Key('[')) {
+			Flush();
+			fstack.Add(format);
+			for(;;) {
+				int c = *term;
+				if(!c)
+					Error("Unexpected end of text");
+				term++;
+				if(c == ' ' || c == '\n') break;
+				switch(c) {
+				case 's': {
+					Uuid id;
+					c = *term;
+					if(Key('\"') || Key('\''))
+						id = target.GetStyleId(GetText(c));
+					else {
+						int i = ReadNumber();
+						if(i >= 0 && i < styleid.GetCount())
+							id = styleid[i];
+						else
+							id = RichStyle::GetDefaultId();
+					}
+					const RichStyle& s = target.GetStyle(id);
+					bool p = format.newpage;
+					int lng = format.language;
+					(RichPara::Format&) format = s.format;
+					format.styleid = id;
+					format.language = lng;
+					format.newpage = p;
+					break;
+				}
+				case '/': format.Italic(!format.IsItalic()); break;
+				case '*': format.Bold(!format.IsBold()); break;
+				case '_': format.Underline(!format.IsUnderline()); break;
+				case '-': format.Strikeout(!format.IsStrikeout()); break;
+				case 'c': format.capitals = !format.capitals; break;
+				case 'd': format.dashed = !format.dashed; break;
+				case '`': format.sscript = format.sscript == 1 ? 0 : 1; break;
+				case ',': format.sscript = format.sscript == 2 ? 0 : 2; break;
+				case '^': format.link = GetText('^'); break;
+				case 'I': format.indexentry = FromUtf8(GetText(';')); break;
+				case '+': format.Height(GetNumber()); break;
+				case '@': format.ink = GetColor(); break;
+				case '$': format.paper = GetColor(); break;
+				case 'A': format.Face(Font::ARIAL); break;
+				case 'R': format.Face(Font::ROMAN); break;
+				case 'C': format.Face(Font::COURIER); break;
+				case 'G': format.Face(Font::STDFONT); break;
+				case 'S': format.Face(Font::SYMBOL); break;
+				case '.': {
+					int n = GetNumber();
+					if(n >= Font::GetFaceCount())
+						Error("Invalid face number");
+					format.Face(n); break;
+				}
+				case '!': {
+						String fn = GetText('!');
+						int i = Font::FindFaceNameIndex(fn);
+						if(i < 0)
+							i = Font::ARIAL;
+						format.Face(i);
+					}
+					break;
+				case '{': {
+						String cs = GetText('}');
+						if(cs.GetLength() == 1) {
+							int c = *cs;
+							if(c == '_')
+								format.charset = CHARSET_UTF8;
+							if(c >= '0' && c <= '8')
+								format.charset = c - '0' + CHARSET_WIN1250;
+							if(c >= 'A' && c <= 'Z')
+								format.charset = c - '0' + CHARSET_ISO8859_1;
+						}
+						else {
+							for(int i = 0; i < CharsetCount(); i++)
+								if(stricmp(CharsetName(i), cs) == 0) {
+									format.charset = i;
+									break;
+								}
+						}
+						break;
+					}
+				case '%': {
+						String h;
+						while(*term && h.GetLength() < 5)
+							h.Cat(*term++);
+						format.language = LNGFromText(h);
+						break;
+					}
+				default:
+					if(c >= '0' && c <= '9') {
+						format.Height(QTFFontHeight[c - '0']);
+						break;
+					}
+					switch(c) {
+					case ':': format.label = GetText(':'); break;
+					case '<': format.align = ALIGN_LEFT; break;
+					case '>': format.align = ALIGN_RIGHT; break;
+					case '=': format.align = ALIGN_CENTER; break;
+					case '#': format.align = ALIGN_JUSTIFY; break;
+					case 'l': format.lm = GetNumber(); break;
+					case 'r': format.rm = GetNumber(); break;
+					case 'i': format.indent = GetNumber(); break;
+					case 'b': format.before = GetNumber(); break;
+					case 'a': format.after = GetNumber(); break;
+					case 'P': format.newpage = !format.newpage; break;
+					case 'k': format.keep = !format.keep; break;
+					case 'K': format.keepnext = !format.keepnext; break;
+					case 'Q': format.orphan = !format.orphan; break;
+					case 'n': format.before_number = GetText(';'); break;
+					case 'm': format.after_number = GetText(';'); break;
+					case 'N': {
+						memset(format.number, 0, sizeof(format.number));
+						format.reset_number = false;
+						int i = 0;
+						while(i < 8) {
+							int c;
+							if(Key('-'))
+								c = RichPara::NUMBER_NONE;
+							else
+							if(Key('1'))
+								c = RichPara::NUMBER_1;
+							else
+							if(Key('0'))
+								c = RichPara::NUMBER_0;
+							else
+							if(Key('a'))
+								c = RichPara::NUMBER_a;
+							else
+							if(Key('A'))
+								c = RichPara::NUMBER_A;
+							else
+							if(Key('i'))
+								c = RichPara::NUMBER_i;
+							else
+							if(Key('I'))
+								c = RichPara::NUMBER_I;
+							else
+								break;
+							format.number[i++] = c;
+						}
+						if(Key('!'))
+							format.reset_number = true;
+						break;
+					}
+					case 'o': format.bullet = RichPara::BULLET_ROUND;
+					          format.indent = 150; break;
+					case 'O':
+						if(Key('_'))
+							format.bullet = RichPara::BULLET_NONE;
+						else {
+							int c = *term++;
+							if(!c)
+								Error("Unexpected end of text");
+							format.bullet =
+							                c == '1' ? RichPara::BULLET_ROUNDWHITE :
+							                c == '2' ? RichPara::BULLET_BOX :
+							                c == '3' ? RichPara::BULLET_BOXWHITE :
+							                c == '9' ? RichPara::BULLET_TEXT :
+							                           RichPara::BULLET_ROUND;
+						}
+						break;
+					case 'p':
+						switch(*term++) {
+						case 0:   Error("Unexpected end of text");
+						case 'h': format.linespacing = RichPara::LSP15; break;
+						case 'd': format.linespacing = RichPara::LSP20; break;
+						default:  format.linespacing = RichPara::LSP10;
+						}
+						break;
+					case 't':
+						format.tabsize = ReadNumber();
+						break;
+					case '~': {
+							if(Key('~'))
+								format.tab.Clear();
+							else {
+								RichPara::Tab tab;
+								Key('<');
+								if(Key('>'))
+									tab.align = ALIGN_RIGHT;
+								if(Key('='))
+									tab.align = ALIGN_CENTER;
+								if(Key('.'))
+									tab.fillchar = 1;
+								if(Key('-'))
+									tab.fillchar = 2;
+								if(Key('_'))
+									tab.fillchar = 3;
+								tab.pos = ReadNumber();
+								format.tab.Add(tab);
+							}
+						}
+						break;
+					default:
+						continue;
+					}
+				}
+			}
+			SetFormat();
+		}
+		else
+		if(Key(']')) {
+			Flush();
+			if(fstack.GetCount()) {
+				format = fstack.Top();
+				fstack.Drop();
+			}
+			else
+				Error("Unmatched ']'");
+		}
+		else
+		if(Key2('{')) {
+			if(oldtab)
+				Error("{{ in ++ table");
+			if(text.GetLength() || paragraph.GetCount())
+				EndPart();
+			table.Add();
+			int r = IsDigit(*term) ? ReadNumber() : 1;
+			Table().AddColumn(r);
+			while(Key(':'))
+				Table().AddColumn(ReadNumber());
+			TableFormat();
+		}
+		else
+		if(Key2('}')) {
+			if(oldtab)
+				Error("}} in ++ table");
+			FinishTable();
+		}
+		else
+		if(Key2('+'))
+			if(oldtab)
+				FinishOldTable();
+			else {
+				Flush();
+				if(text.GetLength() || paragraph.GetCount())
+					EndPart();
+				Tab& b = table.Add();
+				b.rown.Add(0);
+				b.hspan = 1;
+				b.Old();
+				oldtab = true;
+			}
+		else
+		if(Key2('|'))
+			FinishCell();
+		else
+		if(Key2('-')) {
+			FinishCell();
+			table.Top().rown.Add(0);
+		}
+		else
+		if(Key2(':')) {
+			if(!oldtab)
+				FinishCell();
+			TableFormat(oldtab);
+		}
+		else
+		if(Key2('^')) {
+			EndPart();
+			breakpage = true;
+		}
+		else
+		if(Key2('@')) {
+			ReadObject();
+		}
+		else
+		if(Key2('@', '$')) {
+			String xu;
+			while(isxdigit(*term))
+				xu.Cat(*term++);
+			int c = stou(~xu, NULL, 16);
+			if(c >= 32)
+				Cat(c);
+			if(*term == ';')
+				term++;
+		}
+		else
+		if(Key2('{', ':')) {
+			Flush();
+			String field = GetText(':');
+			String param = GetText(':');
+			Id fid(field);
+			if(RichPara::fieldtype().Find(fid) >= 0)
+				paragraph.Cat(fid, param, format);
+			Key('}');
+		}
+		else
+		if(Key('&'))
+			EndPart();
+		else
+		if(Key2('$')) {
+			Flush();
+			int i = GetNumber();
+			Uuid id;
+			RichStyle style;
+			style.format = format;
+			if(Key(','))
+				stylenext.At(i, 0) = GetNumber();
+			else
+				stylenext.At(i, 0) = i;
+			if(Key('#')) {
+				String xu;
+				while(isxdigit(*term))
+					xu.Cat(*term++);
+				if(xu.GetLength() != 32)
+					Error("Invalid UUID !");
+				id.a = scanX(~xu);
+				id.b = scanX(~xu + 8);
+				id.c = scanX(~xu + 16);
+				id.d = scanX(~xu + 24);
+			}
+			else
+				if(i)
+					id = Uuid::Create();
+				else
+					id = RichStyle::GetDefaultId();
+			if(Key(':'))
+				style.name = GetText(']');
+			if(fstack.GetCount()) {
+				format = fstack.Top();
+				fstack.Drop();
+			}
+			target.SetStyle(id, style);
+			styleid.At(i, RichStyle::GetDefaultId()) = id;
+			if(id == RichStyle::GetDefaultId()) {
+				bool p = format.newpage;
+				int lng = format.language;
+				(RichPara::Format&) format = style.format;
+				format.styleid = id;
+				format.language = lng;
+				format.newpage = p;
+			}
+		}
+		else
+		if(*term == '_') {
+			text.Cat(160);
+			term++;
+		}
+		else
+		if(Key2('-', '|'))
+			text.Cat(9);
+		else
+		if(*term == '\1') {
+			if(istable)
+				EndPart();
+			const char *b = ++term;
+			for(; *term && *term != '\1'; term++)
+				if(*term == '\n') {
+					text.Cat(ToUnicode(b, (int)(term - b), format.charset));
+					EndPart();
+					b = term + 1;
+				}
+			text.Cat(ToUnicode(b, (int)(term - b), format.charset));
+			if(*term == '\1')
+				term++;
+		}
+		else {
+			if(!Key('`')) Key('\\');
+			if((byte)*term >= ' ') {
+				do {
+					if(istable)
+						EndPart();
+					if(format.charset == CHARSET_UTF8) {
+						word code = (byte)*term++;
+						if(code <= 0x7F)
+							Cat(code);
+						else
+						if(code <= 0xDF) {
+							if(*term == '\0') break;
+							int c0 = (byte)*term++;
+							if(c0 < 0x80)
+								Error("Invalid UTF-8 sequence");
+							Cat(((code - 0xC0) << 6) + c0 - 0x80);
+						}
+						else
+						if(code <= 0xEF) {
+							int c0 = (byte)*term++;
+							int c1 = (byte)*term++;
+							if(c0 < 0x80 || c1 < 0x80)
+								Error("Invalid UTF-8 sequence");
+							Cat(((code - 0xE0) << 12) + ((c0 - 0x80) << 6) + c1 - 0x80);
+						}
+						else
+							Error("Invalid UTF-8 sequence");
+					}
+					else
+						Cat(ToUnicode((byte)*term++, format.charset));
+				}
+				while((byte)*term >= 128 || s_nodeqtf[(byte)*term]);
+			}
+			else
+			if(*term)
+				term++;
+		}
+	}
+	if(paragraph.GetCount() == 0)
+		SetFormat();
+	if(oldtab)
+		FinishOldTable();
+	else
+		while(table.GetCount())
+			FinishTable();
+	EndPart();
+	FlushStyles();
+}
+
+RichText ParseQTF(const char *qtf, bool scolors, byte accesskey)
+{
+	RichQtfParser p(scolors);
+	try {
+		p.Parse(qtf, accesskey);
+	}
+	catch(RichQtfParser::Exc) {}
+	return p.target;
+}
+
+String QtfRichObject::ToString() const
+{
+	return String("@@#").Cat() << uintptr_t(&obj) << ";";
+}
+
+QtfRichObject::QtfRichObject(const RichObject& o)
+	: obj(o)
+{}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/RichText/ParseRTF.cpp b/uppsrc/RichText/ParseRTF.cpp
new file mode 100644
index 000000000..9177f3993
--- /dev/null
+++ b/uppsrc/RichText/ParseRTF.cpp
@@ -0,0 +1,1106 @@
+#include "RichText.h"
+
+NAMESPACE_UPP
+
+#define LLOG(x) LOG(x)
+
+static int TwipDotsLim(int twips) { return minmax<int>(TwipDots(twips), 0, MAX_DOTS); }
+
+static String FromCString(const char *p, const char **endptr = NULL)
+{
+	if(endptr) {
+		const char *e = p;
+		if(*e == '\"')
+			e++;
+		while(*e && *e != '\"')
+			if(*e++ == '\\' && *e)
+				e++;
+		if(*e == '\"')
+			e++;
+		*endptr = e;
+	}
+
+	try {
+		CParser parser(p);
+		return parser.ReadOneString();
+	}
+	catch(Exc e) {
+		return Null;
+	}
+}
+
+class RTFParser
+{
+public:
+	RTFParser(const char *rtf);
+
+	RichText      Run();
+
+private:
+	enum TOKEN { T_EOF, T_TEXT, T_COMMAND, T_GROUP, T_END_GROUP };
+
+	void          Flush(bool force, int itap);
+	void          OpenTable(int level);
+	void          FlushTable(int level);
+	TOKEN         Fetch();
+	void          Skip();
+	TOKEN         Token()                  { if(!is_full) Fetch(); return token; }
+	bool          PassIf(bool c)           { is_full &= !c; return c; }
+	bool          PassText()               { return PassIf(Token() == T_TEXT); }
+	bool          PassGroup()              { return PassIf(Token() == T_GROUP); }
+	bool          PassEndGroup()           { return PassIf(Token() == T_END_GROUP || token == T_EOF); }
+	bool          PassEndGroup(int level);
+	bool          PassCmd(const char *cmd) { return PassIf(Token() == T_COMMAND && command == cmd); }
+	bool          PassQ(const char *cmd)   { return PassIf(command == cmd); }
+
+	void          SkipGroup()              { SkipGroup(stack.GetCount()); }
+	void          SkipGroup(int level);
+	int           Level() const            { return stack.GetCount(); }
+
+	void          ReadItem();
+	void          ReadItemGroup(int level);
+	void          ReadItemGroup()          { ReadItemGroup(Level()); }
+	void          ReadText();
+	void          ReadText(const WString& text);
+	void          ReadChar(word ch)        { ReadText(WString(ch, 1)); }
+	void          ReadCommand();
+
+	void          ReadHeader();
+		void          ReadFaceTable();
+		void          ReadColorTable();
+		void          ReadCharSet();
+
+	void          ReadMisc();
+		void          ReadField();
+		bool          ReadField(const char *def);
+		void          ReadPict();
+		void          ReadShape();
+
+	void          ReadParaStyle();
+	void          ReadTableStyle();
+	void          DefaultParaStyle();
+
+	void          ReadCharStyle();
+
+	String        ReadBinHex(char& odd) const;
+
+private:
+	const char   *rtf_begin;
+	const char   *rtf;
+
+	TOKEN         token;
+	bool          is_full;
+//	bool          new_dest;
+	bool          next_command;
+	WString       text;
+	String        command;
+	int           command_arg;
+
+	struct Cell {
+		Cell() : end_dots(0), merge_first(false), merge(false) {}
+		RichTxt text;
+		RichCell::Format format;
+		int end_dots;
+		bool merge_first;
+		bool merge;
+	};
+
+	struct Face : Moveable<Face> {
+		int  face;
+		byte charset;
+	};
+
+	struct TableState {
+		TableState() : textcol(0), stylecol(0) { cells.Add(); }
+
+		RichTable::Format tableformat;
+		Vector< Array<Cell> > cells;
+		int textcol;
+		int stylecol;
+	};
+
+	struct State {
+		String               dest;
+		RichPara::Format     format;
+		RichPara::CharFormat charformat;
+		RichCell::Format     cellformat;
+		Rect                 rowmargin;
+		Rect                 rowmarginunits;
+		Rect                 cellmarginunits;
+		int                  uc_value;
+		int                  left_margin;
+		int                  right_margin;
+		int                  first_indent;
+		bool                 in_table;
+		int                  itap;
+		bool                 nestprop;
+		bool                 new_dest;
+		byte                 charset;
+	};
+
+	Array<State>  stack;
+	Array<TableState> table_stack;
+	State         state;
+	RichPara::CharFormat plain_format;
+	RichPara::Format pard_format;
+	RichCell::Format std_cell_format;
+	byte          plain_charset;
+	byte          default_charset;
+	int           default_font;
+	Alignment     tab_align;
+	byte          tab_fill;
+	Vector<Face>  face_table;
+	Vector<Color> color_table;
+	int           paper_width;
+	int           left_margin;
+	int           right_margin;
+
+	RichText      output;
+	RichPara      para;
+};
+
+RichText ParseRTF(const char *rtf) { return RTFParser(rtf).Run(); }
+
+RTFParser::RTFParser(const char *rtf)
+: rtf_begin(rtf)
+, rtf(rtf)
+{
+#ifdef _DEBUG
+	SaveFile(ConfigFile("rtfparser.rtf"), rtf);
+	LOG(rtf);
+#endif
+	is_full = false;
+	next_command = false;
+	default_font = 0;
+	plain_charset = default_charset = state.charset = CHARSET_WIN1250;
+	state.uc_value = 1;
+	state.new_dest = false;
+	plain_format.Face(Font::ARIAL).Height(100);
+	std_cell_format.align = ALIGN_TOP;
+	std_cell_format.margin = Rect(25, 25, 25, 25);
+	DefaultParaStyle();
+	state.charformat = plain_format;
+	tab_align = ALIGN_LEFT;
+	tab_fill = 0;
+	paper_width = 5100;
+	left_margin = right_margin = 750;
+}
+
+RichText RTFParser::Run()
+{
+	if(!PassGroup() || !PassCmd("rtf") || command_arg != 1 && !IsNull(command_arg))
+		return output;
+	while(Token() != T_EOF)
+		ReadItem();
+	Flush(false, 1);
+	FlushTable(0);
+	return output;
+}
+
+void RTFParser::FlushTable(int level)
+{
+	while(table_stack.GetCount() > level) {
+		TableState& child = table_stack.Top();
+		while(!child.cells.IsEmpty() && child.cells.Top().IsEmpty())
+			child.cells.Drop();
+		if(child.cells.IsEmpty()) {
+			table_stack.Drop();
+			continue;
+		}
+		Index<int> dot_index;
+		int pos = child.tableformat.lm;
+		dot_index.Add(pos);
+		for(int r = 0; r < child.cells.GetCount(); r++) {
+			Array<Cell>& rw = child.cells[r];
+			int pos = 0;
+			for(int c = 0; c < rw.GetCount(); c++)
+				dot_index.FindAdd(rw[c].end_dots = pos = max(pos + 100, rw[c].end_dots));
+		}
+		Vector<int> dot_order = dot_index.PickKeys();
+		Sort(dot_order);
+		RichTable table;
+		if(table_stack.GetCount() == 1)
+			child.tableformat.rm = max(paper_width - left_margin - right_margin - dot_order.Top(), 0);
+//		child.tableformat.before = state.format.before;
+//		child.tableformat.after = state.format.after;
+		table.SetFormat(child.tableformat);
+		for(int c = 1; c < dot_order.GetCount(); c++)
+			table.AddColumn(dot_order[c] - dot_order[c - 1]);
+		dot_index = dot_order;
+		for(int r = 0; r < child.cells.GetCount(); r++) {
+			Array<Cell>& rw = child.cells[r];
+			int pos = child.tableformat.lm;
+			for(int c = 0; c < rw.GetCount(); c++) {
+				Cell& cell = rw[c];
+				if(cell.merge)
+					continue;
+				int vspan = 0;
+				if(cell.merge_first) {
+					for(int m = r + 1; m < child.cells.GetCount(); m++) {
+						const Array<Cell>& mrw = child.cells[m];
+						int mc = mrw.GetCount();
+						while(--mc >= 0 && mrw[mc].end_dots > cell.end_dots)
+							;
+						if(mc >= 0 && mrw[mc].end_dots == cell.end_dots && mrw[mc].merge)
+							vspan++;
+						else
+							break;
+					}
+				}
+				int nbegin = dot_index.Find(pos);
+				int hspan = dot_index.Find(pos = cell.end_dots) - nbegin - 1;
+				hspan = max(hspan, 0);
+				vspan = max(vspan, 0);
+//				ASSERT(hspan >= 0 && vspan >= 0);
+				if(hspan || vspan)
+					table.SetSpan(r, nbegin, vspan, hspan);
+				table.SetFormat(r, nbegin, cell.format);
+				cell.text.Normalize();
+				table.SetPick(r, nbegin, cell.text);
+			}
+		}
+		table.Normalize();
+		table_stack.Drop();
+		if(table_stack.IsEmpty())
+			output.CatPick(table);
+		else {
+			TableState& par = table_stack.Top();
+			par.cells.Top().At(par.textcol).text.CatPick(table);
+		}
+	}
+}
+
+void RTFParser::Flush(bool force, int itap)
+{
+	if(!para.part.IsEmpty() || force) {
+		int fi = state.first_indent, li = state.left_margin, ri = state.right_margin;
+		if(state.format.bullet != RichPara::BULLET_NONE) {
+			li += fi;
+			fi = -fi;
+		}
+		state.format.indent = minmax<int>(fi, 0, MAX_DOTS);
+		state.format.lm = minmax<int>(li, 0, MAX_DOTS);
+		state.format.rm = minmax<int>(ri, 0, MAX_DOTS);
+		para.format = state.format;
+		if(state.in_table) {
+			FlushTable(itap);
+			OpenTable(itap);
+			TableState& ts = table_stack[itap - 1];
+			ts.cells.Top().At(ts.textcol).text.Cat(para, output.GetStyles());
+		}
+		else {
+			FlushTable(0);
+			output.Cat(para);
+		}
+		para.part.Clear();
+	}
+	else
+		FlushTable(itap);
+}
+
+RTFParser::TOKEN RTFParser::Fetch()
+{
+	is_full = true;
+	text = WString();
+	if(next_command)
+	{
+		next_command = false;
+		return token = T_COMMAND;
+	}
+
+	text = Null;
+	command = Null;
+	command_arg = Null;
+
+	int skip = 0;
+	while(*rtf && *rtf != '{' && *rtf != '}')
+	{
+		int c = 0, nskip = max(skip - 1, 0);
+		if((byte)*rtf < ' ')
+			rtf++;
+		else if(*rtf != '\\')
+			c = ToUnicode(*rtf++, state.charset);
+		else
+			switch(rtf++, *rtf++)
+			{
+				case 0: {
+					rtf--;
+					break;
+				}
+
+				case '{':
+				case '}':
+				case '\\': {
+					c = rtf[-1];
+					break;
+				}
+
+				case '~': {
+					c = 160;
+					break;
+				}
+
+				case '|':
+				case '-':
+				case '_':
+				case ':': {
+					command = String(rtf - 1, 1);
+					if(text.IsEmpty())
+						return token = T_COMMAND;
+					next_command = true;
+					return token = T_TEXT;
+				}
+
+				case '\'': {
+					int c1 = ctoi(*rtf);
+					if(c1 < 16) {
+						int c2 = ctoi(*++rtf);
+						if(c2 < 16) {
+							c1 = c1 * 16 + c2;
+							rtf++;
+						}
+						c = ToUnicode(c1, state.charset);
+					}
+					break;
+				}
+
+				default: {
+					if(IsAlpha(*--rtf) || *rtf == '*' && rtf[1] == '\\' && IsAlpha(rtf[2])) {
+						if(*rtf == '*') {
+							rtf += 2;
+							state.new_dest = true;
+						}
+						const char *b = rtf;
+						while(IsAlpha(*++rtf))
+							;
+						command = String(b, rtf);
+						if(IsDigit(*rtf) || *rtf == '-')
+							command_arg = strtol(rtf, (char **)&rtf, 10);
+						if(*rtf == ' ')
+							rtf++;
+						if(command == "uc")
+							state.uc_value = command_arg;
+						else if(command == "u") {
+							c = command_arg;
+							nskip = state.uc_value;
+						}
+						else { // command - quit reading text
+							if(text.IsEmpty())
+								return token = T_COMMAND;
+							next_command = true;
+							return token = T_TEXT;
+						}
+					}
+					break;
+				}
+			}
+		if(c && !skip)
+			text.Cat(c);
+		skip = nskip;
+	}
+
+	if(!text.IsEmpty())
+		return token = T_TEXT;
+
+	if(*rtf == '{') {
+		stack.Add(state);
+		rtf++;
+		return token = T_GROUP;
+	}
+
+	if(*rtf == '}') {
+		if(!stack.IsEmpty()) {
+			state = stack.Top();
+			stack.Drop();
+		}
+		rtf++;
+		return token = T_END_GROUP;
+	}
+
+	return token = T_EOF;
+}
+
+bool RTFParser::PassEndGroup(int level)
+{
+	if(Token() == T_EOF)
+		return true;
+	if(token != T_END_GROUP)
+		return false;
+	is_full = false;
+	return Level() < level;
+}
+
+void RTFParser::Skip()
+{
+	bool is_group = (token == T_GROUP || token == T_COMMAND && state.new_dest);
+	is_full = false;
+	if(is_group)
+		SkipGroup();
+}
+
+void RTFParser::SkipGroup(int level)
+{
+	while(!PassEndGroup(level))
+		is_full = false;
+}
+
+void RTFParser::ReadItem()
+{
+	const char *p = rtf;
+	if(token == T_COMMAND)
+		ReadCommand();
+	else if(token == T_TEXT)
+		ReadText();
+	if(rtf == p && is_full) {
+		is_full = false;
+		if(token == T_COMMAND && state.new_dest)
+			SkipGroup();
+	}
+}
+
+void RTFParser::ReadItemGroup(int level)
+{
+	while(!PassEndGroup(level))
+		ReadItem();
+}
+
+void RTFParser::ReadText()
+{
+	if(!IsNull(text))
+		ReadText(text);
+}
+
+void RTFParser::ReadText(const WString& text)
+{
+	if(!IsNull(state.dest))
+		return;
+	LLOG("Output text: <" << FromUnicode(text, state.charset) << ">, " << state.charformat);
+	para.Cat(text, state.charformat);
+}
+
+void RTFParser::ReadCommand()
+{
+	if(Token() == T_COMMAND) ReadHeader();
+	if(Token() == T_COMMAND) ReadMisc();
+	if(Token() == T_COMMAND) ReadParaStyle();
+	if(Token() == T_COMMAND) ReadTableStyle();
+	if(Token() == T_COMMAND) ReadCharStyle();
+}
+
+void RTFParser::ReadHeader()
+{
+	if(PassCmd("deff"))
+		default_font = command_arg;
+	else if(PassQ("fonttbl")) {
+		state.dest = command;
+		ReadFaceTable();
+	}
+	else if(PassQ("colortbl")) {
+		state.dest = command;
+		ReadColorTable();
+	}
+	else if(PassQ("stylesheet") || PassQ("list") || PassQ("listoverride") || PassQ("info")) {
+		state.dest = command;
+		SkipGroup();
+	}
+	else if(Token() == T_COMMAND)
+		ReadCharSet();
+}
+
+void RTFParser::ReadCharSet()
+{
+	if(PassQ("ansi")) {}
+	else if(PassQ("mac")) {}
+	else if(PassQ("pc")) {}
+	else if(PassQ("pca")) {}
+	else if(PassQ("ansicpg")) {
+		static const struct {
+			int  ansicpg;
+			byte charset;
+		}
+		charsets[] =
+		{
+			{ 1250, CHARSET_WIN1250 },
+			{ 1251, CHARSET_WIN1251 },
+			{ 1252, CHARSET_WIN1252 },
+			{ 1253, CHARSET_WIN1253 },
+			{ 1254, CHARSET_WIN1254 },
+			{ 1255, CHARSET_WIN1255 },
+			{ 1256, CHARSET_WIN1256 },
+			{ 1257, CHARSET_WIN1257 },
+		};
+		for(int c = 0; c < __countof(charsets); c++)
+			if(charsets[c].ansicpg == command_arg) {
+				default_charset = state.charset = charsets[c].charset;
+				break;
+			}
+	}
+}
+
+void RTFParser::ReadFaceTable()
+{
+	int fx = 0;
+	while(!PassEndGroup()) {
+		if(!PassGroup()) {
+			Skip();
+			continue;
+		}
+		Face n;
+		n.face = Font::ARIAL;
+		n.charset = default_charset;
+		while(!PassEndGroup()) {
+			if(PassCmd("f"))
+				fx = command_arg;
+			else if(PassCmd("fnil"))
+				;
+			else if(PassCmd("froman"))
+				n.face = Font::ROMAN;
+			else if(PassCmd("fswiss"))
+				n.face = Font::ARIAL;
+			else if(PassCmd("fmodern"))
+				n.face = Font::COURIER;
+			else if(PassCmd("ftech"))
+				n.face = Font::SYMBOL;
+			else if(PassCmd("fcharset")) {
+				switch(command_arg) {
+					case 0: n.charset = CHARSET_WIN1252; break; // ANSI
+					case 1: n.charset = default_charset; break; // Default
+					case 2: n.charset = CHARSET_WIN1252; break; // Symbol
+					case 3: break; // Invalid
+					case 77: break; // Mac
+					case 128: break; // Shift Jis
+					case 129: break; // Hangul
+					case 130: break; // Johab
+					case 134: break; // GB2312
+					case 136: break; // Big5
+					case 161: n.charset = CHARSET_WIN1253; break; // Greek
+					case 162: n.charset = CHARSET_WIN1254; break; // Turkish
+					case 163: break; // Vietnamese
+					case 177: n.charset = CHARSET_WIN1255; break; // Hebrew
+					case 178: break; // Arabic
+					case 179: break; // Arabic Traditional
+					case 180: break; // Arabic user
+					case 181: break; // Hebrew user
+					case 186: break; // Baltic
+					case 204: n.charset = CHARSET_WIN1251; break; // Russian
+					case 222: break; // Thai
+					case 238: n.charset = CHARSET_WIN1250; break; // Eastern European
+					case 254: break; // PC 437
+					case 255: n.charset = CHARSET_WIN1252; break; // OEM
+				}
+			}
+/*			else if(PassText()) {
+				String s = FromUnicode(text, charset);
+				if(!s.IsEmpty() && *s.Last() == ';')
+					s.Trim(s.GetLength() - 1);
+				if(!s.IsEmpty())
+					f = Font::FindFaceNameIndex(s);
+			}
+			else if(PassGroup()) {
+				int level = Level();
+				if(PassCmd("falt") && PassText() && f < 0)
+					f = Font::FindFaceNameIndex(FromUnicode(text, charset));
+				SkipGroup(level);
+			}*/ //Cxl 2005-11-29 - "Arial CE" makes mess here!
+			else
+				Skip();
+		}
+		if(fx >= 0 && fx < MAX_FONTS) {
+//			if(f < 0) // Cxl 2005-11-29
+			if(default_font == fx) {
+				plain_format.Face(n.face);
+				plain_charset = n.charset;
+			}
+			Face dflt;
+			dflt.face = Font::ARIAL;
+			dflt.charset = default_charset;
+			face_table.At(fx++, dflt) = n;
+		}
+	}
+}
+
+void RTFParser::ReadColorTable()
+{
+	int r = Null, g = Null, b = Null;
+	for(; !PassEndGroup(); Skip())
+		if(PassCmd("red"))
+			r = command_arg;
+		else if(PassCmd("green"))
+			g = command_arg;
+		else if(PassCmd("blue"))
+			b = command_arg;
+		else if(PassText())
+		{
+			Color c = Null;
+			if(!IsNull(r) || !IsNull(g) || !IsNull(b))
+				c = Color(Nvl(r, 0), Nvl(g, 0), Nvl(b, 0));
+			color_table.Add(c);
+		}
+}
+
+void RTFParser::ReadMisc()
+{
+	if(PassQ("field"))
+		ReadField();
+	else if(PassQ("pict"))
+		ReadPict();
+	else if(PassQ("shpinst"))
+		ReadShape();
+	else if(PassQ("endash"))
+		ReadChar(0x2013);
+	else if(PassQ("emdash"))
+		ReadChar(0x2014);
+	else if(PassQ("tab"))
+		ReadText(WString(9, 1));
+	else if(PassQ("enspace"))
+		ReadText(WString(" ")); // todo
+	else if(PassQ("emspace"))
+		ReadText(WString(" ")); // todo
+	else if(PassQ("bullet"))
+		ReadChar(0x2022);
+	else if(PassQ("lquote"))
+		ReadChar(0x2018);
+	else if(PassQ("rquote"))
+		ReadChar(0x2019);
+	else if(PassQ("ldblquote"))
+		ReadChar(0x201C);
+	else if(PassQ("rdblquote"))
+		ReadChar(0x201D);
+}
+
+void RTFParser::ReadField()
+{
+	bool ign_rslt = false;
+	int level = Level();
+	while(!PassEndGroup(level))
+		if(PassGroup() && Level() == level + 1) {
+			if(PassCmd("fldinst")) {
+				WString source;
+				for(; !PassEndGroup(); Skip())
+					if(PassText())
+						source.Cat(text);
+				if(ReadField(FromUnicode(source, state.charset)))
+					ign_rslt = true;
+				continue;
+			}
+			else if(PassCmd("fldrslt")) {
+				if(!ign_rslt)
+					ReadItemGroup();
+			}
+		}
+		else
+			Skip();
+}
+
+bool RTFParser::ReadField(const char *p)
+{
+	Index<String> symdef;
+	while(*p)
+		if((byte)*p <= ' ')
+			p++;
+		else if(*p == '\"')
+			symdef.Add(FromCString(p, &p));
+		else {
+			const char *b = p;
+			while(*++p && *p != ' ')
+				;
+			symdef.Add(String(b, p));
+		}
+	if(symdef.IsEmpty())
+		return false;
+	if(symdef[0] == "SYMBOL" && symdef.GetCount() >= 2 && IsDigit(*symdef[1])) {
+		int code = atoi(symdef[1]);
+		int face = -1;
+		int height = 0;
+		int f = symdef.Find("\\f");
+		if(f >= 0 && f + 1 < symdef.GetCount())
+			face = Font::FindFaceNameIndex(symdef[f + 1]);
+		f = symdef.Find("\\s");
+		if(f >= 0 && f + 1 < symdef.GetCount())
+			height = PointDots(fround(2 * atof(symdef[f + 1]))) >> 1;
+		if(face < 0)
+			face = Font::SYMBOL;
+		if(height <= 0 || height >= MAX_DOT_HEIGHT)
+			height = state.charformat.GetHeight();
+		if(code >= 0 && code < 255) {
+			state.charformat.Face(face).Height(height);
+			ReadText(WString(ToUnicode(code, state.charset), 1));
+			return true;
+		}
+	}
+	return false;
+}
+
+void RTFParser::DefaultParaStyle()
+{
+	state.format = pard_format;
+	state.first_indent = state.left_margin = state.right_margin = 0;
+	state.cellformat = std_cell_format;
+	state.in_table = false;
+	state.itap = 1;
+	state.nestprop = false;
+	state.rowmargin = Rect(25, 25, 25, 25);
+	state.cellmarginunits = state.rowmarginunits = Rect(0, 0, 0, 0);
+	state.charset = plain_charset;
+}
+
+void RTFParser::ReadParaStyle()
+{
+	if(PassQ("par"))
+		Flush(true, state.itap);
+	else if(PassQ("cell")) {
+		Flush(false, 1);
+		if(!table_stack.IsEmpty())
+			table_stack[0].textcol++;
+ 	}
+ 	else if(PassQ("nestcell")) {
+ 		Flush(false, state.itap);
+ 		if(state.itap <= table_stack.GetCount())
+ 			table_stack[state.itap - 1].textcol++;
+ 	}
+	else if(PassQ("pard"))
+		DefaultParaStyle();
+	else if(PassQ("pntext"))
+		SkipGroup();
+	else if(PassQ("pn")) {
+		SkipGroup();
+		state.format.bullet = RichPara::BULLET_ROUND;
+	}
+	else if(PassQ("pagebb"))
+		state.format.newpage = (command_arg != 0);
+	else if(PassQ("ql"))
+		state.format.align = ALIGN_LEFT;
+	else if(PassQ("qc"))
+		state.format.align = ALIGN_CENTER;
+	else if(PassQ("qr"))
+		state.format.align = ALIGN_RIGHT;
+	else if(PassQ("qj"))
+		state.format.align = ALIGN_JUSTIFY;
+	else if(PassQ("fi"))
+		state.first_indent = TwipDotsLim(command_arg);
+	else if(PassQ("li"))
+		state.left_margin = TwipDotsLim(command_arg);
+	else if(PassQ("ri"))
+		state.right_margin = TwipDotsLim(command_arg);
+	else if(PassQ("sb"))
+		state.format.before = TwipDotsLim(command_arg);
+	else if(PassQ("sa"))
+		state.format.after = TwipDotsLim(command_arg);
+	else if(PassQ("widctlpar"))
+		state.format.orphan = true;
+	else if(PassQ("nowidctlpar"))
+		state.format.orphan = false;
+	else if(PassQ("tql"))
+		tab_align = ALIGN_LEFT;
+	else if(PassQ("tqc"))
+		tab_align = ALIGN_CENTER;
+	else if(PassQ("tqr"))
+		tab_align = ALIGN_RIGHT;
+	else if(PassQ("tqdec"))
+		tab_align = ALIGN_RIGHT; // todo
+	else if(PassQ("tldot"))
+		tab_fill = 0;
+	else if(PassQ("tlhyph"))
+		tab_fill = 0;
+	else if(PassQ("tlul"))
+		tab_fill = 0;
+	else if(PassQ("tlth"))
+		tab_fill = 0;
+	else if(PassQ("tleq"))
+		tab_fill = 0;
+	else if(PassQ("tx") || PassQ("tb")) { // todo: bar tab ?
+		int pos = TwipDotSize(command_arg);
+		RichPara::Tab& tab = state.format.tab.Add();
+		tab.align = tab_align;
+		tab.fillchar = tab_fill;
+		tab.pos = pos;
+		state.format.SortTabs();
+	}
+	else if(PassQ("intbl"))
+		state.in_table = true;
+	else if(PassQ("itap")) {
+		state.itap = minmax(command_arg, 1, 10);
+		if(table_stack.GetCount() < state.itap)
+			OpenTable(state.itap);
+	}
+}
+
+void RTFParser::ReadCharStyle()
+{
+	if(PassQ("plain")) {
+		state.charformat = plain_format;
+		state.charset = plain_charset;
+	}
+	else if(PassQ("b"))
+		state.charformat.Bold(command_arg != 0);
+	else if(PassQ("i"))
+		state.charformat.Italic(command_arg != 0);
+	else if(PassQ("ul") || PassQ("uld") || PassQ("uldb")
+	|| PassQ("uldash") || PassQ("uldashd") || PassQ("uldashdd")
+	|| PassQ("ulth") || PassQ("ulw") || PassQ("ulwave"))
+		state.charformat.Underline();
+	else if(PassQ("ulnone"))
+		state.charformat.Underline(false);
+	else if(PassQ("strike") || PassQ("strikedl"))
+		state.charformat.Strikeout(command_arg != 0);
+	else if(PassQ("caps") || PassQ("scaps"))
+		state.charformat.capitals = (command_arg != 0);
+	else if(PassQ("super") || PassQ("up"))
+		state.charformat.sscript = 1;
+	else if(PassQ("sub") || PassQ("dn"))
+		state.charformat.sscript = 2;
+	else if(PassQ("nosupersub"))
+		state.charformat.sscript = 0;
+	else if(PassQ("f") && command_arg >= 0 && command_arg < face_table.GetCount()) {
+		LLOG("font = " << command_arg << ", face = " << face_table[command_arg].face
+			<< ", charset = " << face_table[command_arg].charset);
+		state.charformat.Face(face_table[command_arg].face);
+		state.charset = face_table[command_arg].charset;
+	}
+	else if(PassQ("fs"))
+		state.charformat.Height(PointDotHeight(command_arg));
+	else if(PassQ("cf") && command_arg >= 0 && command_arg < color_table.GetCount())
+		state.charformat.ink = Nvl(color_table[command_arg], Black);
+	else if(PassQ("cb") && command_arg >= 0 && command_arg < color_table.GetCount())
+		state.charformat.paper = color_table[command_arg];
+	else if(PassQ("lang"))
+	{} // state.language = ...
+}
+
+void RTFParser::ReadShape()
+{
+	int level = Level();
+	while(!PassEndGroup(level))
+		if(PassCmd("shppict")) {
+			state.new_dest = false;
+			ReadItemGroup();
+		}
+		else
+			is_full = false;
+}
+
+void RTFParser::ReadPict()
+{
+	Size log_size(1, 1), out_size(1, 1), scaling(100, 100);
+	Rect crop(0, 0, 0, 0);
+	enum BLIPTYPE { UNK_BLIP, EMF_BLIP, PNG_BLIP, JPEG_BLIP, WMF_BLIP, DIB_BLIP };
+	BLIPTYPE blip_type = UNK_BLIP;
+#ifdef PLATFORM_WIN32
+#ifndef PLATFORM_WINCE
+	int wmf_mode = MM_ANISOTROPIC;
+#endif
+#endif
+	String blip_data;
+	char odd = 0;
+	while(!PassEndGroup())
+		if(PassText())
+			blip_data.Cat(ReadBinHex(odd));
+		else if(Token() == T_COMMAND) {
+			if(PassQ("picw"))            log_size.cx = minmax<int>(command_arg, 0, 30000);
+			else if(PassQ("pich"))       log_size.cy = minmax<int>(command_arg, 0, 30000);
+			else if(PassQ("picwgoal"))   out_size.cx = TwipDotSize(command_arg);
+			else if(PassQ("pichgoal"))   out_size.cy = TwipDotSize(command_arg);
+			else if(PassQ("picscalex"))  scaling.cx = minmax<int>(command_arg, 1, 1000);
+			else if(PassQ("picscaley"))  scaling.cy = minmax<int>(command_arg, 1, 1000);
+			else if(PassQ("piccropl"))   crop.left   = TwipDotSize(command_arg);
+			else if(PassQ("piccropt"))   crop.top    = TwipDotSize(command_arg);
+			else if(PassQ("piccropr"))   crop.right  = TwipDotSize(command_arg);
+			else if(PassQ("piccropb"))   crop.bottom = TwipDotSize(command_arg);
+			else if(PassQ("emfblip"))    blip_type    = EMF_BLIP;
+			else if(PassQ("pngblip"))    blip_type    = PNG_BLIP;
+			else if(PassQ("jpegblip"))   blip_type    = JPEG_BLIP;
+#ifdef PLATFORM_WIN32
+#ifndef PLATFORM_WINCE
+			else if(PassQ("wmetafile"))  { blip_type = WMF_BLIP; wmf_mode = command_arg; }
+#endif
+#endif
+			else if(PassQ("dibitmap"))   blip_type = DIB_BLIP;
+			else Skip();
+		}
+		else
+			Skip();
+	Size final_size = minmax(iscale(out_size, scaling, Size(100, 100)), Size(1, 1), Size(30000, 30000));
+	Size drawing_size;
+	DrawingDraw dd;
+	RichObject object;
+#ifdef PLATFORM_WIN32
+#ifndef PLATFORM_WINCE
+	if(blip_type == EMF_BLIP || blip_type == WMF_BLIP) {
+		log_size = min(log_size, GetFitSize(log_size, final_size));
+		dd.Create(drawing_size = log_size);
+		WinMetaFile wmf;
+		if(blip_type == EMF_BLIP)
+			wmf = WinMetaFile(SetEnhMetaFileBits(blip_data.GetLength(), blip_data));
+		else {
+			METAFILEPICT mfp;
+			Zero(mfp);
+			mfp.mm = wmf_mode;
+			mfp.xExt = log_size.cx;
+			mfp.yExt = log_size.cy;
+			wmf = WinMetaFile(SetWinMetaFileBits(blip_data.GetLength(), blip_data, ScreenHDC(), &mfp));
+		}
+		wmf.Paint(dd, log_size);
+		object = CreateDrawingObject(dd, out_size, final_size);
+	}
+	else
+#endif
+#endif
+	if(blip_type == DIB_BLIP || blip_type == PNG_BLIP || blip_type == JPEG_BLIP) {
+		//FIXIMAGE
+		Image image = StreamRaster::LoadStringAny(blip_data);
+		object = CreatePNGObject(image, out_size, final_size);
+	}
+	if(object) {
+		LLOG("object (" << object.GetTypeName() << ", " << object.Write().GetLength() << " B), pixel size "
+			<< object.GetPixelSize() << ", final size " << object.GetSize());
+		para.Cat(object, state.charformat);
+	}
+}
+
+String RTFParser::ReadBinHex(char& odd) const
+{
+	int t = odd;
+	byte v = ctoi(odd);
+	String out;
+	for(const wchar *s = text.Begin(); *s; s++) {
+		byte w = (*s >= '0' && *s <= '9' ? *s - '0'
+			: *s >= 'A' && *s <= 'F' ? *s - 'A' + 10
+			: *s >= 'a' && *s <= 'f' ? *s - 'a' + 10
+			: 255);
+		if(w < 16)
+			if(v >= 16)
+			{
+				t = *s;
+				v = w;
+			}
+			else
+			{
+				out.Cat(16 * v + w);
+				v = 255;
+			}
+	}
+	odd = (v < 16 ? t : 0);
+	return out;
+}
+
+void RTFParser::OpenTable(int level)
+{
+	if(table_stack.GetCount() < level) {
+		TableState& ts = table_stack.At(level - 1);
+		ts.stylecol = 0;
+		state.cellformat = std_cell_format;
+	}
+}
+
+void RTFParser::ReadTableStyle()
+{
+	if(PassQ("nesttableprops")) {
+		state.nestprop = true;
+		return;
+	}
+	if(PassQ("nonesttables")) {
+		SkipGroup();
+		return;
+	}
+	int itap = (state.nestprop ? state.itap : 1);
+	if(PassQ("trowd")) {
+		OpenTable(itap);
+		table_stack[itap - 1].stylecol = 0;
+		return;
+	}
+	if(PassQ("row") && table_stack.GetCount() >= 1) {
+		TableState& ts0 = table_stack[0];
+		ts0.textcol = ts0.stylecol = 0;
+		ts0.cells.Add();
+		return;
+	}
+	if(PassQ("nestrow") && table_stack.GetCount() >= state.itap) {
+		TableState& ts = table_stack[state.itap - 1];
+		ts.textcol = ts.stylecol = 0;
+		ts.cells.Add();
+		return;
+	}
+	if(itap > table_stack.GetCount())
+		return;
+	TableState& ts = table_stack[itap - 1];
+	if(PassQ("trgaph")) {}
+	else if(PassQ("trql")) {}
+	else if(PassQ("trqr")) {}
+	else if(PassQ("trqc")) {}
+	else if(PassQ("trleft")) {
+		ts.tableformat.lm = TwipDotsLim(command_arg);
+	}
+	else if(PassQ("trbrdrl")) {}
+	else if(PassQ("trbrdrt")) {}
+	else if(PassQ("trbrdrr")) {}
+	else if(PassQ("trbrdrb")) {}
+	else if(PassQ("trbrdrv")) {}
+	else if(PassQ("trftsWidth")) {}
+	else if(PassQ("trautofit")) {}
+	else if(PassQ("trpaddl"))
+		state.rowmargin.left = TwipDotsLim(command_arg);
+	else if(PassQ("trpaddt"))
+		state.rowmargin.top = TwipDotsLim(command_arg);
+	else if(PassQ("trpaddr"))
+		state.rowmargin.right = TwipDotsLim(command_arg);
+	else if(PassQ("trpaddb"))
+		state.rowmargin.bottom = TwipDotsLim(command_arg);
+	else if(PassQ("trpaddfl"))
+		state.rowmarginunits.left = command_arg;
+	else if(PassQ("trpaddft"))
+		state.rowmarginunits.top = command_arg;
+	else if(PassQ("trpaddfr"))
+		state.rowmarginunits.right = command_arg;
+	else if(PassQ("trpaddfb"))
+		state.rowmarginunits.bottom = command_arg;
+	else if(PassQ("clpadl"))
+		state.cellformat.margin.left = TwipDotsLim(command_arg);
+	else if(PassQ("clpadt"))
+		state.cellformat.margin.top = TwipDotsLim(command_arg);
+	else if(PassQ("clpadr"))
+		state.cellformat.margin.right = TwipDotsLim(command_arg);
+	else if(PassQ("clpadb"))
+		state.cellformat.margin.bottom = TwipDotsLim(command_arg);
+	else if(PassQ("clpadfl"))
+		state.cellmarginunits.left = command_arg;
+	else if(PassQ("clpadft"))
+		state.cellmarginunits.top = command_arg;
+	else if(PassQ("clpadfr"))
+		state.cellmarginunits.right = command_arg;
+	else if(PassQ("clpadfb"))
+		state.cellmarginunits.bottom = command_arg;
+	else if(PassQ("clvertalt")) {}
+	else if(PassQ("clbrdrl")) {}
+	else if(PassQ("clbrdrt")) {}
+	else if(PassQ("clbrdrr")) {}
+	else if(PassQ("clbrdrb")) {}
+	else if(PassQ("cltxlrtb")) {}
+	else if(PassQ("clcbpat")) {
+		if(command_arg >= 0 && command_arg < color_table.GetCount())
+			state.cellformat.color = color_table[command_arg];
+	}
+	else if(PassQ("clvmrg"))
+		ts.cells.Top().At(ts.stylecol).merge = true;
+	else if(PassQ("clvmgf"))
+		ts.cells.Top().At(ts.stylecol).merge_first = true;
+	else if(PassQ("clftsWidth")) {}
+	else if(PassQ("clwWidth")) {}
+	else if(PassQ("cellx")) {
+		Cell& newcell = ts.cells.Top().At(ts.stylecol++);
+		newcell.end_dots = TwipDotsLim(command_arg);
+		newcell.format = state.cellformat;
+		if(state.cellmarginunits.left == 0) newcell.format.margin.left = state.rowmargin.left;
+		if(state.cellmarginunits.top == 0) newcell.format.margin.top = state.rowmargin.top;
+		if(state.cellmarginunits.right == 0) newcell.format.margin.right = state.rowmargin.right;
+		if(state.cellmarginunits.bottom == 0) newcell.format.margin.bottom = state.rowmargin.bottom;
+		state.cellformat = std_cell_format;
+	}
+	else if(PassQ("clvertalt"))
+		state.cellformat.align = ALIGN_TOP;
+	else if(PassQ("clvertalc"))
+		state.cellformat.align = ALIGN_CENTER;
+	else if(PassQ("clvertalb"))
+		state.cellformat.align = ALIGN_BOTTOM;
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/RichText/RichImage.icpp b/uppsrc/RichText/RichImage.icpp
new file mode 100644
index 000000000..cb7e75365
--- /dev/null
+++ b/uppsrc/RichText/RichImage.icpp
@@ -0,0 +1,159 @@
+#include "RichText.h"
+
+NAMESPACE_UPP
+
+#ifdef NEWIMAGE
+
+struct RichImage : public RichObjectType {
+	virtual String GetTypeName(const Value& v) const;
+	virtual Size   GetPhysicalSize(const Value& data) const;
+	virtual Size   GetPixelSize(const Value& data) const;
+	virtual void   Paint(const Value& data, Draw& w, Size sz) const;
+	virtual Image  ToImage(const Value& data, Size sz) const;
+
+	virtual bool   Accept(PasteClip& clip);
+	virtual Value  Read(PasteClip& clip);
+	virtual String GetClipFmts() const;
+	virtual String GetClip(const Value& data, const String& fmt) const;
+
+	typedef RichImage CLASSNAME;
+};
+
+String RichImage::GetTypeName(const Value& v) const
+{
+	return "image";
+}
+
+bool RichImage::Accept(PasteClip& clip)
+{
+	return AcceptImage(clip);
+}
+
+Value RichImage::Read(PasteClip& clip)
+{
+	return StoreImageAsString(GetImage(clip));
+}
+
+String RichImage::GetClipFmts() const
+{
+	return ClipFmtsImage();
+}
+
+String RichImage::GetClip(const Value& data, const String& fmt) const
+{
+	return GetImageClip(LoadImageFromString(data), fmt);
+}
+
+Size   RichImage::GetPixelSize(const Value& data) const
+{
+	return GetImageStringSize(data);
+}
+
+Size   RichImage::GetPhysicalSize(const Value& data) const
+{
+	Size sz = GetImageStringDots(data);
+	if(sz.cx == 0 || sz.cy == 0)
+		sz = 600 * GetPixelSize(data) / 96;
+	return sz;
+}
+
+void   RichImage::Paint(const Value& data, Draw& w, Size sz) const
+{
+	Image x = LoadImageFromString(data);
+//	Size outsz(min(sz.cx, 4 * x.GetWidth()), min(sz.cy, 4 * x.GetHeight()));
+	w.DrawImage(0, 0, sz.cx, sz.cy, x);
+}
+
+Image  RichImage::ToImage(const Value& data, Size sz) const
+{
+	return Rescale(LoadImageFromString(data), sz);
+}
+
+INITBLOCK {
+	RichObject::Register("image", &Single<RichImage>());
+};
+
+struct RichPNG : public RichObjectType {
+	virtual String GetTypeName(const Value& v) const;
+	virtual Value  Read(const String& s) const;
+	virtual String Write(const Value& v) const;
+	virtual Size   GetPhysicalSize(const Value& data) const;
+	virtual Size   GetPixelSize(const Value& data) const;
+	virtual void   Paint(const Value& data, Draw& w, Size sz) const;
+	virtual Image  ToImage(const Value& data, Size sz) const;
+};
+
+String RichPNG::GetTypeName(const Value& v) const
+{
+	return IsString(v) ? "PNG" : "image";
+}
+
+Value RichPNG::Read(const String& s) const
+{
+	Image img = StreamRaster::LoadStringAny(s);
+	if(img)
+		return img;
+	return s;
+}
+
+String RichPNG::Write(const Value& v) const
+{
+	if(IsString(v))
+		return v;
+	return StoreImageAsString(v);
+}
+
+Size RichPNG::GetPhysicalSize(const Value& data) const
+{
+	if(IsString(data))
+		return Size(0, 0);
+	return Image(data).GetDots();
+}
+
+Size RichPNG::GetPixelSize(const Value& data) const
+{
+	if(IsString(data))
+		return Size(0, 0);
+	return Image(data).GetDots();
+}
+
+void RichPNG::Paint(const Value& data, Draw& w, Size sz) const
+{
+	if(IsString(data)) {
+		w.DrawRect(sz, SColorFace());
+		DrawFrame(w, sz, SColorText());
+		w.DrawText(2, 2, "plugin/png missing!");
+		return;
+	}
+	Image x = Image(data);
+	Size outsz(min(sz.cx, 4 * x.GetWidth()), min(sz.cy, 4 * x.GetHeight()));
+	w.DrawImage(0, 0, outsz.cx, outsz.cy, x);
+}
+
+Image RichPNG::ToImage(const Value& data, Size sz) const
+{
+	if(IsString(data)) {
+		ImageDraw iw(sz);
+		Paint(data, iw, sz);
+		return iw;	
+	}
+	Image x = Image(data);
+	Size outsz(min(sz.cx, 4 * x.GetWidth()), min(sz.cy, 4 * x.GetHeight()));
+	return Rescale(x, outsz);
+}
+
+INITBLOCK {
+	RichObject::Register("PNG", &Single<RichPNG>());
+};
+
+RichObject CreateImageObject(const Image& img, int cx, int cy)
+{
+	RichObject o = RichObject("image", StoreImageAsString(img));
+	if(cx || cy)
+		o.SetSize(GetRatioSize(o.GetPixelSize(), cx, cy));
+	return o;
+}
+
+#endif
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/RichText/RichText.h b/uppsrc/RichText/RichText.h
new file mode 100644
index 000000000..1b54e5e6a
--- /dev/null
+++ b/uppsrc/RichText/RichText.h
@@ -0,0 +1,459 @@
+#ifndef RICHTEXT_H
+#define RICHTEXT_H
+
+#include <CtrlCore/CtrlCore.h>
+#include <plugin/png/png.h>
+
+NAMESPACE_UPP
+
+struct Zoom {
+	int m, d;
+
+	int operator*(int x) const   { return d ? iscale(x, m, d) : 0; }
+	int operator&(int x) const   { int q = d ? iscale(x, m, d) : 0; return x > 0 ? max(q, 1) : q; }
+
+	double AsDouble() const      { return (double)m / d; }
+
+	Zoom()                       { m = d = 1; }
+	Zoom(const Nuller&)          { m = d = 0; }
+	Zoom(int _m, int _d)         { m = _m, d = _d; }
+
+	void Serialize(Stream& s)    { s % m % d; }
+
+	bool operator==(Zoom a)      { return m == a.m && d == a.d; }
+	bool operator!=(Zoom a)      { return m != a.m || d != a.d; }
+
+	friend int operator/(int x, Zoom z)  { return z.m ? iscale(x, z.d, z.m) : 0; }
+};
+
+inline bool IsNull(Zoom z) { return (z.m | z.d) == 0; }
+
+inline int operator*(int x, Zoom m)
+{
+	return m * x;
+}
+
+inline void operator*=(int& i, Zoom m)
+{
+	i = m * i;
+}
+
+inline void operator*=(Rect& r, Zoom m)
+{
+	r.left *= m;
+	r.right *= m;
+	r.top *= m;
+	r.bottom *= m;
+}
+
+inline Size operator*(Zoom m, Size sz)
+{
+	return Size(m * sz.cx, m * sz.cy);
+}
+
+inline Size operator/(Size sz, Zoom m)
+{
+	return Size(sz.cx / m, sz.cy / m);
+}
+
+struct PageY : Moveable<PageY, RelOps<PageY> > {
+	int page;
+	int y;
+
+	PageY(int page, int y) : page(page), y(y) {}
+	PageY() { page = y = 0; }
+
+#ifdef _DEBUG
+	String ToString() const    { return AsString(page) + ":" + AsString(y); }
+#endif
+};
+
+inline bool operator<(PageY a, PageY b)
+{
+	return a.page < b.page ? true : a.page == b.page ? a.y < b.y : false;
+}
+
+inline bool operator==(PageY a, PageY b)
+{
+	return a.page == b.page && a.y == b.y;
+}
+
+inline PageY operator+(PageY a, int b)
+{
+	return PageY(a.page, a.y + b);
+}
+
+struct PageRect : public Rect {
+	int  page;
+
+	operator int() const                 { return page; }
+	operator PageY() const               { return PageY(page, top); }
+	PageRect& operator=(const Rect& r)   { (Rect&)(*this) = r; page = 0; return *this; }
+	PageRect(const Rect& r)              { (Rect&)(*this) = r; page = 0; }
+	PageRect()                           { Clear(); page = 0; }
+};
+
+struct PageDraw {
+	virtual Draw& Info() = 0;
+	virtual Draw& Page(int i) = 0;
+
+	operator Draw&()       { return Info(); }
+
+	virtual ~PageDraw() {}
+};
+
+class RichObject;
+class Bar;
+
+struct RichObjectType : Moveable<RichObjectType> {
+	virtual String GetTypeName(const Value& v) const = 0;
+	virtual String GetCreateName() const;
+	virtual Size   GetDefaultSize(const Value& data, Size maxsize) const;
+	virtual Size   GetPhysicalSize(const Value& data) const;
+	virtual Size   GetPixelSize(const Value& data) const;
+	virtual void   Paint(const Value& data, Draw& w, Size sz) const;
+	virtual Image  ToImage(const Value& data, Size sz) const;
+	virtual Value  Read(const String& s) const;
+	virtual String Write(const Value& v) const;
+	virtual void   Menu(Bar& bar, RichObject& ex) const;
+	virtual void   DefaultAction(RichObject& ex) const;
+	virtual String GetLink(const Value& data, Point pt, Size sz) const;
+
+	virtual bool   Accept(PasteClip& clip);
+	virtual Value  Read(PasteClip& clip);
+	virtual String GetClipFmts() const;
+	virtual String GetClip(const Value& data, const String& fmt) const;
+
+	RichObjectType();
+	virtual ~RichObjectType();
+};
+
+class RichObject : Moveable<RichObject> {
+	Value                 data;
+	int                   ydelta;
+	Size                  size;
+	Size                  physical_size;
+	Size                  pixel_size;
+	bool                  keepratio;
+	const RichObjectType *type;
+	int64                 serial;
+	String                type_name;
+
+	static VectorMap<String, RichObjectType *>& Map();
+
+	void                  NewSerial();
+
+public:
+	static void   Register(const char *name, RichObjectType *type) init_;
+	static int    GetTypeCount()                 { return Map().GetCount(); }
+	static int    FindType(const String& name)   { return Map().Find(name); }
+	static RichObjectType& GetType(int i)        { return *Map()[i]; }
+	static String GetTypeName(int i)             { return Map().GetKey(i); }
+
+	void   SetSize(int cx, int cy)               { size = Size(cx, cy); NewSerial(); }
+	void   SetSize(Size sz)                      { size = sz; NewSerial(); }
+	Size   GetSize() const                       { return size; }
+	void   Paint(Draw& w, Size sz) const;
+	Image  ToImage(Size sz) const;
+	Size   GetPhysicalSize() const               { return physical_size; }
+	Size   GetPixelSize() const                  { return pixel_size; }
+	Size   GetDefaultSize(Size maxsize) const    { return type ? type->GetDefaultSize(data, maxsize) : physical_size; }
+
+	void   Set(RichObjectType *type, const Value& data, Size maxsize = Size(3967, 3967));
+	bool   Set(const String& type_name, const Value& data, Size maxsize = Size(3967, 3967));
+
+	String GetTypeName() const;
+	Value  GetData() const                       { return data; }
+	String GetLink(Point pt, Size sz) const      { return type ? type->GetLink(data, pt, sz) : String(); }
+
+	const RichObjectType& GetType() const;
+
+	bool   Read(const String& type, const String& data, Size sz);
+	String Write() const                         { return type ? type->Write(data) : (String)data; }
+
+	void   KeepRatio(bool b)                     { keepratio = b; }
+	bool   IsKeepRatio() const                   { return keepratio; }
+
+	void   SetYDelta(int yd)                     { ydelta = yd; }
+	int    GetYDelta() const                     { return ydelta; }
+
+	void   Menu(Bar& bar)                        { if(type) type->Menu(bar, *this); }
+	void   DefaultAction()                       { if(type) type->DefaultAction(*this); }
+
+	operator bool() const                        { return !IsNull(data); }
+
+	void   Clear();
+
+	int64  GetSerialId() const                   { return serial; }
+
+	RichObject();
+	RichObject(RichObjectType *type, const Value& data, Size maxsize = Size(3967, 3967));
+	RichObject(const String& type, const Value& data, Size maxsize = Size(3967, 3967));
+};
+
+RichObject CreateDrawingObject(const Drawing& dwg, Size dot_size, Size size);
+RichObject CreateDrawingObject(const Drawing& dwg, int cx = 0, int cy = 0);
+RichObject CreatePNGObject(const Image& img, Size dot_size, Size size);
+RichObject CreatePNGObject(const Image& img, Size dot_size, Size size);
+RichObject CreateImageObject(const Image& img, int cx = 0, int cy = 0);
+
+struct RichPara;
+
+enum {
+	RICHHOT_LM = -1,
+	RICHHOT_RM = -2,
+};
+
+struct RichHotPos {
+	int table;
+	int column;
+	int delta;
+	int left, cx;
+	int textleft, textcx;
+
+	RichHotPos()       { table = 0; column = Null; }
+};
+
+struct RichValPos : Moveable<RichValPos> {
+	PageY   py;
+	int     pos;
+	WString data;
+};
+
+struct PaintInfo {
+	Zoom    zoom;
+	int     sell, selh;
+	int     tablesel;
+	Rect    cells;
+	PageY   top;
+	PageY   bottom;
+	Color   hyperlink;
+	Color   indexentry;
+	bool    usecache;
+	bool    sizetracking;
+	Color   showcodes;
+	Bits  (*spellingchecker)(const RichPara& para);
+	int     highlightpara;
+	Color   highlight;
+	bool    coloroverride;
+
+	PaintInfo();
+};
+
+int LineZoom(Zoom z, int a);
+
+class RichTable;
+
+#include "Para.h"
+
+struct RichPos {
+	int              tabtextparti;
+	int              tabtextpartcount;
+	int              tabposintabtext;
+	int              tabtextlen;
+
+	int              table;
+	Size             tabsize;
+	Point            cell;
+
+	int              tablen;
+	int              posintab;
+
+	int              celllen;
+	int              posincell;
+
+	int              parai;
+	int              partcount;
+	int              posinpara;
+	int              paralen;
+
+	int              level;
+	int              parenttab;
+
+	RichPara::Format format;
+	int              chr;
+	RichObject       object;
+	Id               field;
+	String           fieldparam;
+	RichPara::CharFormat fieldformat;
+
+#ifdef _DEBUG
+	String ToString() const;
+#endif
+
+	RichPos();
+};
+
+inline bool InSameTxt(const RichPos& a, const RichPos& b)
+{
+	return a.table == b.table && (a.table == 0 || a.cell == b.cell);
+}
+
+struct RichCaret : PageRect {
+	int  lineascent;
+	int  caretascent;
+	int  caretdescent;
+	int  objectcy;
+	int  objectyd;
+	int  line;
+	Rect textpage;
+
+	RichCaret()         { lineascent = caretascent = caretdescent = 0; }
+};
+
+struct RichStyle {
+	RichPara::Format     format;
+	String               name;
+	Uuid                 next;
+
+	static Uuid              GetDefaultId();
+	static const RichStyle&  GetDefault();
+
+	RichStyle()          { next = GetDefaultId(); }
+};
+
+typedef ArrayMap<Uuid, RichStyle> RichStyles;
+
+const RichStyle& GetStyle(const RichStyles& s, const Uuid& id);
+int   FindStyleWithName(const RichStyles& style, const String& name);
+
+struct RichContext {
+	const RichStyles& styles;
+	Rect              page;
+	PageY             py;
+
+	void              Page() { py.page++; py.y = page.top; }
+
+	RichContext(const RichStyles& styles) : styles(styles) {}
+};
+
+struct RichCellPos;
+
+#include "Txt.h"
+#include "Table.h"
+#include "Text.h"
+
+struct RichCellPos {
+	int               pos;
+
+	int               textlen;
+
+	Size              tabsize;
+	int               tabpos;
+	int               tablen;
+	int               cellpos;
+	int               celllen;
+	int               level;
+	RichCell::Format  format;
+	RichTable::Format tableformat;
+
+#ifdef _DEBUG
+	String ToString() const;
+#endif
+};
+
+String DeQtf(const char *s);
+String DeQtfLf(const char *s);
+
+struct QtfRichObject {
+	RichObject obj;
+
+public:
+	String ToString() const;
+
+	QtfRichObject() {}
+	QtfRichObject(const RichObject& o);
+};
+
+String AsQTF(const RichObject& obj);
+
+RichText ParseQTF(const char *qtf, bool scolors = false, byte accesskey = 0);
+
+RichText AsRichText(const wchar *s, const RichPara::Format& f = RichPara::Format());
+
+enum
+{
+	QTF_BODY = 1,
+	QTF_ALL_STYLES = 2,
+	QTF_NOSTYLES = 4,
+	QTF_CRLF = 8,
+	QTF_NOCHARSET = 16,
+	QTF_NOLANG = 32,
+};
+
+String   AsQTF(const RichText& doc, byte charset = CHARSET_UTF8,
+               dword options = QTF_BODY|QTF_ALL_STYLES|QTF_CRLF);
+
+inline String StylesAsQTF(const RichText& doc, byte charset = CHARSET_UTF8)
+{ return AsQTF(doc, charset, QTF_ALL_STYLES|QTF_CRLF); }
+
+inline String BodyAsQTF(const RichText& doc, byte charset = CHARSET_UTF8)
+{ return AsQTF(doc, charset, QTF_BODY|QTF_CRLF); }
+
+enum
+{
+	ROUNDOFF          = 1 << 20,
+	MAX_FONTS         = 10000,
+	MAX_DOTS          = 600 * 100,
+	MAX_DOT_HEIGHT    = 1200,
+	MAX_POINT_HEIGHT  = MAX_DOT_HEIGHT * 3 / 25,
+};
+
+inline int DotTwips (int dots) { return (dots * 12 +  5 * ROUNDOFF +  2) /  5 - ROUNDOFF; }
+inline int TwipDots (int twp)  { return (twp  *  5 + 12 * ROUNDOFF +  6) / 12 - ROUNDOFF; }
+inline int DotPoints(int dots) { return (dots *  3 + 25 * ROUNDOFF + 12) / 25 - ROUNDOFF; }
+inline int PointDots(int pts)  { return (pts  * 25 +  3 * ROUNDOFF +  1) /  3 - ROUNDOFF; }
+inline int TwipDotSize(int twp)  { return IsNull(twp) ? 0 : minmax<int>(TwipDots(twp), 0, MAX_DOTS); }
+inline int PointDotHeight(int p) { return (minmax<int>(Nvl(p, 0), 0, MAX_POINT_HEIGHT) * 25 + 5) / 6; }
+
+void       EncodeRTF(Stream& stream, const RichText& richtext, byte charset);
+String     EncodeRTF(const RichText& richtext, byte charset);
+String     EncodeRTF(const RichText& richtext);
+RichText   ParseRTF(const char *rtf);
+
+Zoom  GetRichTextStdScreenZoom();
+
+const Display& QTFDisplay();
+const Display& QTFDisplayVCenter();
+
+String EncodeHtml(const RichText& text, Index<String>& css,
+                  const VectorMap<String, String>& links,
+                  const VectorMap<String, String>& labels,
+                  const String& path, const String& base = Null, Zoom z = Zoom(8, 40),
+                  const VectorMap<String, String>& escape = VectorMap<String, String>(),
+                  int imtolerance = 0);
+String AsCss(Index<String>& ss);
+
+inline //BW - no labels
+String EncodeHtml(const RichText& text, Index<String>& css,
+                  const VectorMap<String, String>& links,
+                  const String& path, const String& base = Null, Zoom z = Zoom(8, 40)) {
+	return EncodeHtml(text, css, links, VectorMap<String, String>(), path, base, z);
+}
+
+struct SimplePageDraw : PageDraw {
+	Draw& w;
+
+	virtual Draw& Info();
+	virtual Draw& Page(int);
+
+	SimplePageDraw(Draw& w) : w(w) {}
+	virtual ~SimplePageDraw() {}
+};
+
+struct PrintPageDraw : PageDraw {
+	int     page;
+	Draw&   w;
+	NilDraw nw;
+
+	Draw& Page(int _page)     { return page == _page ? w : (Draw&)nw; }
+	Draw& Info()              { return w; }
+	void  SetPage(int _page)  { page = _page; }
+
+	PrintPageDraw(Draw& w) : w(w) {}
+	virtual ~PrintPageDraw() {}
+};
+
+END_UPP_NAMESPACE
+
+#endif
diff --git a/uppsrc/RichText/RichText.iml b/uppsrc/RichText/RichText.iml
new file mode 100644
index 000000000..b519b0238
--- /dev/null
+++ b/uppsrc/RichText/RichText.iml
@@ -0,0 +1,9 @@
+IMAGE_ID(EndParaChar)
+IMAGE_ID(TabChar)
+IMAGE_ID(SpaceChar)
+IMAGE_ID(HardSpaceChar)
+
+IMAGE_BEGIN_DATA
+IMAGE_DATA(120,156,99,96,101,224,96,192,3,254,147,33,246,31,11,141,206,70,199,232,234,176,155,205,198,192,74,138,67,73,177,28)
+IMAGE_DATA(155,122,236,230,51,1,157,129,199,34,92,6,64,0,11,225,224,198,101,16,46,62,97,75,113,0,0,165,164,44,1,0)
+IMAGE_END_DATA(64, 4)
diff --git a/uppsrc/RichText/RichText.upp b/uppsrc/RichText/RichText.upp
new file mode 100644
index 000000000..1d574d880
--- /dev/null
+++ b/uppsrc/RichText/RichText.upp
@@ -0,0 +1,42 @@
+description "Rich-text data structures and painting, including RTF and HTML export/import";
+
+uses
+	CtrlCore,
+	plugin\png;
+
+file
+	RichText.h,
+	Object.cpp,
+	RichImage.icpp,
+	Para.h,
+	ParaData.cpp optimize_speed,
+	ParaType.cpp optimize_speed,
+	ParaPaint.cpp,
+	Txt.h,
+	TxtData.cpp,
+	TxtPaint.cpp,
+	TxtOp.cpp,
+	Format.cpp,
+	Table.h,
+	TableCell.cpp,
+	TableLayout.cpp,
+	TablePaint.cpp,
+	TableData.cpp,
+	Text.h,
+	TextPaint.cpp,
+	TextStyle.cpp,
+	TextData.cpp,
+	TextTable.cpp,
+	EncodeQtf.cpp optimize_speed,
+	ParseQtf.cpp optimize_speed,
+	EncodeRTF.cpp optimize_speed,
+	ParseRTF.cpp optimize_speed,
+	EncodeHTML.cpp optimize_speed,
+	Util.cpp,
+	RichText.iml,
+	Info readonly separator,
+	srcdoc.tpp,
+	COPYING,
+	COPYING-PLAIN,
+	AUTHORS;
+
diff --git a/uppsrc/RichText/RichText.usc b/uppsrc/RichText/RichText.usc
new file mode 100644
index 000000000..e69de29bb
diff --git a/uppsrc/RichText/Table.h b/uppsrc/RichText/Table.h
new file mode 100644
index 000000000..798c92c0d
--- /dev/null
+++ b/uppsrc/RichText/Table.h
@@ -0,0 +1,220 @@
+class RichCell : DeepCopyOption<RichCell> {
+public:
+	struct Format {
+		Rect     border;
+		Rect     margin;
+		int      align;
+		int      minheight;
+		Color    color;
+		Color    bordercolor;
+		bool     keep;
+
+		Format();
+	};
+
+	Format   format;
+	int      vspan, hspan;
+	RichTxt  text;
+
+private:
+	bool     Reduce(RichContext& rc) const;
+	PageY    Align(const RichContext& rc, PageY npy) const;
+	void     DrawCell(Draw& w, int l, int r, int y, int yy, const Rect& border) const;
+
+	void        ClearText();
+	void        ClearText(const RichPara::Format& format, const RichStyles& style);
+	void        Clear();
+
+	PageY       GetTop(RichContext rc) const;
+	PageY       GetHeight(RichContext rc) const;
+	void        Paint(PageDraw& pw, RichContext rc, PageY npy,
+	                  const Rect& xpg, int y, int ny, const PaintInfo& pi,
+	                  bool select) const;
+	RichCaret   GetCaret(int pos, RichContext rc, PageY pyy) const;
+	int         GetPos(int x, PageY y, RichContext rc, PageY pyy) const;
+	RichHotPos  GetHotPos(int x, PageY y, int tolerance, RichContext rc, PageY pyy) const;
+
+	void        GatherValPos(Vector<RichValPos>& f, RichContext rc, PageY pyy, int pos, int type) const;
+
+	friend class RichTable;
+	friend class RichText;
+
+public:
+	RichCell(const RichCell& src, int);
+	RichCell();
+};
+
+class RichTable : DeepCopyOption<RichTable> {
+public:
+	struct Format {
+		int   before, lm, rm, after;
+		int   frame;
+		Color framecolor;
+		int   grid;
+		Color gridcolor;
+		WithDeepCopy< Vector<int> > column;
+		int   header;
+		bool  keep;
+
+		Format();
+	};
+
+	struct CellInfo {
+		bool  valid;
+		Point master;
+
+		operator bool() const { return valid; }
+
+		CellInfo()            { valid = true; }
+	};
+
+	Format format;
+	Array< Array<RichCell> > cell;
+
+private:
+	struct PaintCell : Moveable<PaintCell> {
+		int   left;
+		int   right;
+		Rect  page;
+		PageY hy;
+		bool  top;
+		bool  bottom;
+
+		PaintCell()    { top = true; }
+	};
+
+	struct PaintRow : Moveable<PaintRow> {
+		PageY             gpy;
+		PageY             py, pyy;
+		Buffer<PaintCell> cell;
+		bool              first;
+
+		PaintCell& operator[](int i)                { return cell[i]; }
+		const PaintCell& operator[](int i) const    { return cell[i]; }
+	};
+
+	struct Layout {
+		Buffer<Rect>      col;
+		Buffer<PaintRow>  row;
+		int               frame;
+		int               grid;
+		PageY             pyy;
+
+		PaintRow& operator[](int i)                 { return row[i]; }
+		const PaintRow& operator[](int i) const     { return row[i]; }
+	};
+
+	struct TabLayout : Layout {
+		bool              hasheader;
+		Layout            header;
+		Rect              page;
+		int               page0;
+		Size              sz;
+	};
+
+	mutable TabLayout clayout;
+	mutable Rect      cpage;
+	mutable PageY     cpy;
+
+	Buffer< Buffer<CellInfo> > ci;
+	int              r_row, r_column;
+	Rect             r_page;
+	PageY            r_py, r_pyy;
+
+	void             Invalidate();
+	void             InvalidateRefresh(int i, int j);
+	void             InvalidateRefresh(Point p)            { InvalidateRefresh(p.y, p.x); }
+
+	bool             Reduce(RichContext& rc) const;
+	Layout           Realize(RichContext rc, int ny) const;
+	bool             RowPaint(PageDraw& pw, const RichStyles& st, const Layout& tab,
+	                          int i, int ny, const Rect& pg, VectorMap<int, Rect>& frr,
+	                          PaintInfo& pi, int pd, bool sel) const;
+
+	const TabLayout& Realize(RichContext rc) const;
+
+	mutable int  length, tabcount;
+
+	static void  ExpandFrr(VectorMap<int, Rect>& frr, int pi, int l, int r, int t, int b);
+
+	friend class RichTxt;
+	friend class RichText;
+public:
+
+	Array<RichCell>&       operator[](int i)             { return cell[i]; }
+	const Array<RichCell>& operator[](int i) const       { return cell[i]; }
+	RichCell&       operator[](Point p)                  { return cell[p.y][p.x]; }
+	const RichCell& operator[](Point p) const            { return cell[p.y][p.x]; }
+	int             GetCellPos(int i, int j) const;
+	int             GetCellPos(Point p) const            { return GetCellPos(p.y, p.x); }
+	int             GetTableCount(int i, int j) const;
+	int             GetTableCount(Point p) const         { return GetTableCount(p.y, p.x); }
+	Point           GetMasterCell(int i, int j) const;
+	Point           GetMasterCell(Point p) const         { return GetMasterCell(p.y, p.x); }
+	const RichCell& GetMaster(int i, int j) const;
+
+	int           GetLength() const;
+	int           GetTableCount() const;
+
+private:
+	void          Normalize0();
+
+	RichTable     Copy(const Rect& sel) const;
+	void          Paste(Point pos, const RichTable& tab);
+	void          RemoveRow0(int rowi);
+	void          RemoveRow(int rowi);
+	void          InsertRow(int rowi, const RichStyles& style);
+	void          RemoveColumn0(int column);
+	void          RemoveColumn(int column);
+	void          InsertColumn(int column, const RichStyles& style);
+	bool          IsRowEmpty(int row);
+	bool          IsColumnEmpty(int column);
+	void          SplitCell(Point cl, Size sz, const RichStyles& style);
+	RichCell::Format GetCellFormat(const Rect& sel) const;
+	void             SetCellFormat(const Rect& sel, const RichCell::Format& fmt, bool setkeep);
+
+	PageY         GetHeight(RichContext rc) const;
+	PageY         GetTop(RichContext rc) const;
+	void          Paint(PageDraw& pw, RichContext rc, const PaintInfo& pi) const;
+	RichCaret     GetCaret(int pos, RichContext rc) const;
+	int           GetPos(int x, PageY y, RichContext rc) const;
+	int           GetVertMove(int pos, int gx, RichContext rc, int dir) const;
+	RichHotPos    GetHotPos(int x, PageY y, int tolerance, RichContext rc) const;
+	void          AdjustSel(Rect& sel) const;
+
+	void          GatherValPos(Vector<RichValPos>& f, RichContext rc, int pos, int type) const;
+	void          ClearSpelling();
+
+	Point         FindCell(int& pos) const;
+	RichPos       GetRichPos(int pos, const RichStyles& st) const;
+
+	CellInfo      GetCellInfo(int i, int j)              { return ci[i][j]; }
+
+	int           GetInvalid(PageY& top, PageY& bottom, RichContext rc) const;
+	void          Validate();
+
+	void          ApplyZoom(Zoom z, const RichStyles& ostyle, const RichStyles& zstyle);
+
+public:
+	void                    AddColumn(int cx);
+	void                    SetPick(int i, int j, pick_ RichTxt& text);
+	RichTxt                 GetPick(int i, int j);
+	const RichTxt&          Get(int i, int j) const                { return cell[i][j].text; }
+	void                    SetQTF(int i, int j, const char *qtf);
+	void                    SetFormat(int i, int j, const RichCell::Format& fmt);
+	const RichCell::Format& GetFormat(int i, int j)                { return cell[i][j].format; }
+	bool                    operator()(int i, int j) const         { return ci[i][j].valid; }
+	void                    SetSpan(int i, int j, int vspan, int hspan);
+	Size                    GetSpan(int i, int j) const;
+	void                    SetFormat(const Format& fmt);
+	const Format&           GetFormat() const                      { return format; }
+
+	int                     GetColumns() const                     { return format.column.GetCount(); }
+	int                     GetRows() const                        { return cell.GetCount(); }
+	Size                    GetSize() const                        { return Size(GetColumns(), GetRows()); }
+
+	void          Normalize();
+
+	RichTable(const RichTable& src, int);
+	RichTable();
+};
diff --git a/uppsrc/RichText/TableCell.cpp b/uppsrc/RichText/TableCell.cpp
new file mode 100644
index 000000000..f876505e3
--- /dev/null
+++ b/uppsrc/RichText/TableCell.cpp
@@ -0,0 +1,194 @@
+#include "RichText.h"
+
+NAMESPACE_UPP
+
+int LineZoom(Zoom z, int a)
+{
+	return a ? max(1, z * a) : 0;
+}
+
+RichCell::Format::Format()
+{
+	margin.left = margin.right = 25;
+	margin.top = margin.bottom = 15;
+	border.Clear();
+	align = ALIGN_CENTER;
+	color = White;
+	bordercolor = Black;
+	keep = false;
+	minheight = 0;
+}
+
+void  RichCell::ClearText()
+{
+	text.Clear();
+	RichPara h;
+	text.Cat(h, RichStyles());
+}
+
+void  RichCell::ClearText(const RichPara::Format& format, const RichStyles& style)
+{
+	text.Clear();
+	RichPara h;
+	h.format = format;
+	text.Cat(h, style);
+}
+
+void  RichCell::Clear()
+{
+	format = Format();
+	vspan = hspan = 0;
+	ClearText();
+}
+
+bool  RichCell::Reduce(RichContext& rc) const
+{
+	Rect br = rc.page;
+	rc.page.top += format.margin.top + format.border.top;
+	rc.page.bottom -= format.margin.bottom + format.border.bottom;
+	rc.page.left += format.margin.left + format.border.left;
+	rc.page.right -= format.margin.right + format.border.right;
+	if(rc.page.IsEmpty())
+		rc.page = br;
+	return !rc.page.IsEmpty();
+}
+
+PageY RichCell::GetTop(RichContext rc) const
+{
+	if(!Reduce(rc))
+		return rc.py;
+	rc.py.y += format.margin.top + format.border.top;
+	return text.GetTop(rc);
+}
+
+PageY RichCell::GetHeight(RichContext rc) const
+{
+	if(Reduce(rc)) {
+		PageY py = rc.py;
+		rc.py.y += format.margin.top + format.border.top;
+		rc.py = text.GetHeight(rc);
+		rc.py.y += format.margin.bottom + format.border.bottom;
+		py.y += format.margin.top + format.border.top +
+		        format.minheight +
+		        format.margin.bottom + format.border.bottom;
+		return py.y <= rc.page.bottom && py > rc.py ? py : rc.py;
+	}
+	else {
+		rc.py.y += format.margin.top + format.border.top;
+		rc.py.y += 80;
+		rc.py.y += format.margin.bottom + format.border.bottom;
+		if(rc.py.y >= rc.page.bottom) {
+			rc.Page();
+			rc.py.y += 80;
+		}
+	}
+	return rc.py;
+}
+
+void RichCell::DrawCell(Draw& w, int l, int r, int y, int yy, const Rect& border) const
+{
+	w.DrawRect(l, y, r - l, border.top, format.bordercolor);
+	w.DrawRect(l, y, border.left, yy - y, format.bordercolor);
+	w.DrawRect(r - border.right, y, border.right, yy - y, format.bordercolor);
+	w.DrawRect(l, yy - border.bottom, r - l, border.bottom, format.bordercolor);
+	w.DrawRect(l + border.left, y + border.top,
+	           r - l - border.left - border.right, yy - y - border.top - border.bottom,
+	           format.color);
+}
+
+PageY RichCell::Align(const RichContext& rc, PageY npy) const
+{
+	PageY y = rc.py;
+	y.y += format.margin.top + format.border.top;
+	if(rc.py.page == npy.page) {
+		int dx = npy.y - text.GetHeight(rc).y
+		         - format.margin.top - format.border.top
+		         - format.margin.bottom - format.border.bottom;
+		if(format.align == ALIGN_CENTER)
+			y.y += dx / 2;
+		else
+		if(format.align == ALIGN_BOTTOM)
+			y.y += dx;
+	}
+	return y;
+}
+
+void RichCell::Paint(PageDraw& pw, RichContext rc, PageY npy,
+                     const Rect& xpg, int y, int ny, const PaintInfo& pi, bool select) const
+{
+	if(!Reduce(rc))
+		return;
+	Rect border(LineZoom(pi.zoom, format.border.left), LineZoom(pi.zoom, format.border.top),
+	            LineZoom(pi.zoom, format.border.right), LineZoom(pi.zoom, format.border.bottom));
+	if(rc.py.page == npy.page)
+		DrawCell(pw.Page(rc.py.page), xpg.left, xpg.right, y, ny, border);
+	else {
+		DrawCell(pw.Page(rc.py.page), xpg.left, xpg.right, y, xpg.bottom, border);
+		for(int i = rc.py.page + 1; i < npy.page; i++)
+			DrawCell(pw.Page(i), xpg.left, xpg.right, xpg.top, xpg.bottom, border);
+		DrawCell(pw.Page(npy.page), xpg.left, xpg.right, xpg.top, ny, border);
+	}
+
+	rc.py = Align(rc, npy);
+	text.Paint(pw, rc, pi);
+
+	if(select) {
+		int cx = xpg.right - xpg.left;
+		if(rc.py.page == npy.page)
+			pw.Page(rc.py.page).DrawRect(xpg.left, y, cx, ny - y, InvertColor);
+		else {
+			pw.Page(rc.py.page).DrawRect(xpg.left, y, cx, xpg.bottom - y, InvertColor);
+			for(int i = rc.py.page + 1; i < npy.page; i++)
+				pw.Page(i).DrawRect(xpg.left, xpg.top, cx, xpg.Height(), InvertColor);
+			pw.Page(npy.page).DrawRect(xpg.left, xpg.top, cx, ny - xpg.top, InvertColor);
+		}
+	}
+}
+
+RichCaret RichCell::GetCaret(int pos, RichContext rc, PageY pyy) const
+{
+	if(!Reduce(rc))
+		return RichCaret();
+	rc.py = Align(rc, pyy);
+	return text.GetCaret(pos, rc);
+}
+
+int      RichCell::GetPos(int x, PageY y, RichContext rc, PageY pyy) const
+{
+	if(!Reduce(rc))
+		return 0;
+	rc.py = Align(rc, pyy);
+	return text.GetPos(x, y, rc);
+}
+
+RichHotPos  RichCell::GetHotPos(int x, PageY y, int tolerance, RichContext rc, PageY pyy) const
+{
+	if(!Reduce(rc))
+		return RichHotPos();
+	rc.py = Align(rc, pyy);
+	return text.GetHotPos(x, y, tolerance, rc);
+}
+
+void RichCell::GatherValPos(Vector<RichValPos>& f, RichContext rc, PageY pyy, int pos, int type) const
+{
+	if(!Reduce(rc))
+		return;
+	rc.py = Align(rc, pyy);
+	text.GatherValPos(f, rc, pos, type);
+}
+
+RichCell::RichCell()
+{
+	vspan = hspan = 0;
+	Clear();
+}
+
+RichCell::RichCell(const RichCell& src, int)
+{
+	format = src.format;
+	hspan = src.hspan;
+	vspan = src.vspan;
+	text <<= src.text;
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/RichText/TableData.cpp b/uppsrc/RichText/TableData.cpp
new file mode 100644
index 000000000..0e31f88cd
--- /dev/null
+++ b/uppsrc/RichText/TableData.cpp
@@ -0,0 +1,580 @@
+#include "RichText.h"
+
+NAMESPACE_UPP
+
+void RichTable::Invalidate()
+{
+	cpy.page = -1;
+	length = tabcount = -1;
+}
+
+void RichTable::InvalidateRefresh(int i, int j)
+{
+	if(i < format.header)
+		r_row = -1;
+	else
+	if(r_row != i || r_column != j)
+		if(r_row == -2 && clayout.sz == GetSize()) {
+			r_row = i;
+			r_column = j;
+			r_py = cpy;
+			r_pyy = clayout[min(GetRows() - 1, i + cell[i][j].vspan)].pyy;
+			r_page = cpage;
+		}
+		else
+			r_row = -1;
+	Invalidate();
+}
+
+void RichTable::Normalize0()
+{
+	int nx = format.column.GetCount();
+	int ny = cell.GetCount();
+
+	for(int i = 0; i < ny; i++)
+		cell[i].SetCount(nx);
+
+	Invalidate();
+	r_py.page = -1;
+	r_row = -1;
+
+	ci.Alloc(ny);
+	for(int i = 0; i < ny; i++)
+		ci[i].Alloc(nx);
+	for(int i = 0; i < ny; i++)
+		for(int j = 0; j < nx; j++)
+			if(ci[i][j].valid) {
+				RichCell& c = cell[i][j];
+				int vs = i < format.header ? min(format.header - 1, i + c.vspan) : min(ny - 1, i + c.vspan);
+				int hs = min(nx - 1, j + c.hspan);
+				c.vspan = vs - i;
+				c.hspan = hs - j;
+				for(int ii = i; ii <= vs; ii++)
+					for(int jj = j; jj <= hs; jj++) {
+						if(i != ii || j != jj) {
+							CellInfo& f = ci[ii][jj];
+							f.valid = false;
+							cell[ii][jj].Clear();
+							f.master = Point(j, i);
+							cell[ii][jj].hspan = hs - jj;
+						}
+					}
+			}
+}
+
+bool RichTable::IsRowEmpty(int row)
+{
+	for(int i = 0; i < GetColumns(); i++)
+		if(ci[row][i].valid && cell[row][i].vspan == 0)
+			return false;
+	return true;
+}
+
+bool RichTable::IsColumnEmpty(int column)
+{
+	for(int i = 0; i < GetRows(); i++)
+		if(ci[i][column].valid)
+			return false;
+	return true;
+}
+
+void RichTable::RemoveRow0(int rowi)
+{
+	if(rowi < format.header)
+		format.header--;
+	for(int i = 0; i < GetColumns(); i++) {
+		CellInfo& cf = ci[rowi][i];
+		if(!cf.valid && cf.master.x == i)
+			cell[cf.master.y][cf.master.x].vspan--;
+	}
+	cell.Remove(rowi);
+}
+
+void RichTable::RemoveColumn0(int column)
+{
+	for(int i = 0; i < cell.GetCount(); i++) {
+		CellInfo& cf = ci[i][column];
+		if(!cf.valid && cf.master.y == i)
+			cell[cf.master.y][cf.master.x].hspan--;
+		cell[i].Remove(column);
+	}
+	format.column.Remove(column);
+}
+
+void RichTable::Normalize()
+{
+	Normalize0();
+	int i = 0;
+	while(i < GetRows())
+		if(IsRowEmpty(i)) {
+			Array<RichCell> r(cell[i], 1);
+			RemoveRow0(i);
+			for(int j = 0; j < GetColumns(); j++)
+				if(ci[i][j].valid) {
+					cell[i][j] <<= r[j];
+					cell[i][j].vspan--;
+				}
+			Normalize0();
+		}
+		else
+			i++;
+	int j = 0;
+	while(j < GetColumns())
+		if(IsColumnEmpty(j)) {
+			Array<RichCell> r;
+			for(int i = 0; i < GetRows(); i++)
+				r.Add() <<= cell[i][j];
+			int c = format.column[j];
+			RemoveColumn0(j);
+			format.column[min(GetColumns() - 1, j)] += c;
+			for(int i = 0; i < GetRows(); i++)
+				if(ci[i][j].valid)
+					cell[i][j] <<= r[i];
+			Normalize0();
+		}
+		else
+			j++;
+	int sum = Sum0(format.column);
+	if(sum != 10000) {
+		r_row = -1;
+		if(format.column.GetCount()) {
+			if(format.column.GetCount() > 1) {
+				int q = 0;
+				for(int i = 0; i < format.column.GetCount() - 1; i++)
+					q += sum <= 0 ? (format.column[i] = 10000 / format.column.GetCount())
+					              : (format.column[i] = format.column[i] * 10000 / sum);
+				format.column[format.column.GetCount() - 1] = 10000 - q;
+			}
+			else
+				format.column[0] = 10000;
+		}
+	}
+}
+
+int RichTable::GetLength() const
+{
+	if(length < 0) {
+		length = 0;
+		for(int i = 0; i < cell.GetCount(); i++)
+			for(int j = 0; j < format.column.GetCount(); j++)
+				if(ci[i][j].valid)
+					length += cell[i][j].text.GetLength() + 1;
+	}
+	return length ? length - 1 : 0;
+}
+
+Point   RichTable::FindCell(int& pos) const
+{
+	for(int i = 0; i < cell.GetCount(); i++)
+		for(int j = 0; j < format.column.GetCount(); j++)
+			if(ci[i][j].valid) {
+				int l = cell[i][j].text.GetLength() + 1;
+				if(pos < l)
+					return Point(j, i);
+				pos -= l;
+			}
+	NEVER();
+	return Point();
+}
+
+int RichTable::GetCellPos(int ii, int jj) const
+{
+	int pos = 0;
+	for(int i = 0; i < ii; i++)
+		for(int j = 0; j < format.column.GetCount(); j++)
+			if(ci[i][j].valid)
+				pos += cell[i][j].text.GetLength() + 1;
+	for(int j = 0; j < jj; j++)
+		if(ci[ii][j].valid)
+			pos += cell[ii][j].text.GetLength() + 1;
+	return pos;
+}
+
+Point RichTable::GetMasterCell(int i, int j) const
+{
+	i = min(GetRows() - 1, i);
+	j = min(GetColumns() - 1, j);
+	const CellInfo& cf = ci[i][j];
+	return cf.valid ? Point(j, i) : cf.master;
+}
+
+const RichCell& RichTable::GetMaster(int i, int j) const
+{
+	Point p = GetMasterCell(i, j);
+	return cell[p.y][p.x];
+}
+
+int RichTable::GetTableCount(int ii, int jj) const
+{
+	int ti = 0;
+	for(int i = 0; i < ii; i++)
+		for(int j = 0; j < format.column.GetCount(); j++)
+			if(ci[i][j].valid)
+				ti += cell[i][j].text.GetTableCount();
+	for(int j = 0; j < jj; j++)
+		if(ci[ii][j].valid)
+			ti += cell[ii][j].text.GetTableCount();
+	return ti;
+}
+
+
+void RichTable::ClearSpelling()
+{
+	for(int i = 0; i < cell.GetCount(); i++)
+		for(int j = 0; j < format.column.GetCount(); j++)
+			if(ci[i][j].valid)
+				cell[i][j].text.ClearSpelling();
+}
+
+int RichTable::GetTableCount() const
+{
+	if(tabcount < 0) {
+		tabcount = 0;
+		for(int i = 0; i < cell.GetCount(); i++) {
+			for(int j = 0; j < format.column.GetCount(); j++)
+				if(ci[i][j].valid)
+					tabcount += cell[i][j].text.GetTableCount();
+		}
+	}
+	return tabcount;
+}
+
+void RichTable::Validate()
+{
+	r_row = -2;
+}
+
+int  RichTable::GetInvalid(PageY& top, PageY& bottom, RichContext rc) const
+{
+	if(r_row == -2)
+		return -1;
+	const TabLayout& tab = Realize(rc);
+	if(r_row >= 0 && r_page == rc.page
+	   && r_py == rc.py && tab[min(GetRows() - 1, r_row + cell[r_row][r_column].vspan)].pyy == r_pyy) {
+		const PaintRow& pr = tab[r_row];
+		const RichCell& cl = cell[r_row][r_column];
+		top = pr.py;
+		bottom = tab[min(cell.GetCount() - 1, r_row + cl.vspan)].pyy;
+		return 0;
+	}
+	return 1;
+}
+
+void RichTable::AddColumn(int cx)
+{
+	format.column.Add(cx);
+}
+
+void RichTable::SetPick(int i, int j, pick_ RichTxt& text)
+{
+	cell.At(i).At(j).text = text;
+}
+
+RichTxt RichTable::GetPick(int i, int j)
+{
+	return cell[i][j].text;
+}
+
+void RichTable::SetQTF(int i, int j, const char *qtf)
+{
+	SetPick(i, j, ParseQTF(qtf));
+}
+
+void RichTable::SetFormat(int i, int j, const RichCell::Format& fmt)
+{
+	cell.At(i).At(j).format = fmt;
+}
+
+void RichTable::SetSpan(int i, int j, int vspan, int hspan)
+{
+	RichCell& c = cell.At(i).At(j);
+	c.vspan = vspan;
+	c.hspan = hspan;
+}
+
+Size RichTable::GetSpan(int i, int j) const
+{
+	const RichCell& c = cell[i][j];
+	return Size(c.hspan, c.vspan);
+}
+
+void RichTable::SetFormat(const Format& fmt)
+{
+	format = fmt;
+}
+
+RichTable RichTable::Copy(const Rect& sel) const
+{
+	RichTable r;
+	r.format = format;
+	r.format.header = max(0, format.header - sel.top);
+	r.format.column.Remove(0, sel.left);
+	r.format.column.SetCount(sel.right - sel.left + 1);
+	for(int i = sel.top; i <= sel.bottom; i++)
+		for(int j = sel.left; j <= sel.right; j++)
+			r.cell.At(i - sel.top).At(j - sel.left) <<= cell[i][j];
+	r.Normalize();
+	return r;
+}
+
+void RichTable::RemoveRow(int rowi)
+{
+	RemoveRow0(rowi);
+	Normalize();
+}
+
+void RichTable::InsertRow(int rowi, const RichStyles& style)
+{
+	if(rowi < format.header)
+		format.header++;
+	int si;
+	if(rowi < GetRows()) {
+		for(int i = 0; i < GetColumns(); i++) {
+			CellInfo& cf = ci[rowi][i];
+			if(!cf.valid && cf.master.x == i)
+				cell[cf.master.y][cf.master.x].vspan++;
+		}
+		si = rowi + 1;
+	}
+	else
+		si = rowi - 1;
+	cell.Insert(rowi).SetCount(GetColumns());
+	if(si >= 0)
+		for(int i = 0; i < GetColumns(); i++) {
+			RichCell& c = cell[rowi][i];
+			const RichCell& sc = cell[si][i];
+			c.format = sc.format;
+			DUMP(sc.hspan);
+			c.hspan = sc.hspan;
+			c.ClearText(sc.text.GetFirstFormat(style), style);
+		}
+	Normalize();
+}
+
+void RichTable::RemoveColumn(int column)
+{
+	RemoveColumn0(column);
+	Normalize();
+}
+
+void RichTable::InsertColumn(int column, const RichStyles& style)
+{
+	int sci = column < GetColumns() ? column + 1 : column - 1;
+	for(int i = 0; i < cell.GetCount(); i++) {
+		CellInfo& cf = ci[i][column];
+		if(!cf.valid && cf.master.y == i)
+			cell[cf.master.y][cf.master.x].hspan++;
+		RichCell& c = cell[i].Insert(column);
+		if(sci >= 0) {
+			const RichCell& sc = cell[i][sci];
+			c.format = sc.format;
+			c.vspan = sc.vspan;
+			c.ClearText(sc.text.GetFirstFormat(style), style);
+		}
+	}
+	int c = format.column[min(column, GetColumns() - 1)];
+	format.column.Insert(column, c);
+	Normalize();
+}
+
+void  RichTable::SplitCell(Point cl, Size sz, const RichStyles& style)
+{
+	const RichCell& sc = cell[cl.y][cl.x];
+	int ext = sz.cy - cell[cl.y][cl.x].vspan - 1;
+	if(ext > 0) {
+		cell.InsertN(cl.y + 1, ext);
+		if(cl.y < format.header)
+			format.header += ext;
+		for(int i = 0; i < ext; i++) {
+			cell[cl.y + 1 + i].SetCount(GetColumns());
+			for(int j = 0; j < GetColumns(); j++) {
+				RichCell& c = cell[cl.y + 1 + i][j];
+				const RichCell& sc = cell[cl.y][j];
+				c.format = sc.format;
+				c.hspan = sc.hspan;
+				c.ClearText(sc.text.GetFirstFormat(style), style);
+			}
+		}
+		for(int i = 0; i < GetColumns(); i++) {
+			CellInfo& cf = ci[cl.y][i];
+			if(cf.valid)
+				cell[cl.y][i].vspan += ext;
+			else
+			if(cf.master.x == i)
+				cell[cf.master.y][cf.master.x].vspan += ext;
+		}
+	}
+
+	cell[cl.y][cl.x].vspan = 0;
+	if(ext < 0)
+		cell[cl.y + sz.cy - 1][cl.x].vspan = -ext;
+	for(int i = 1; i < sz.cy; i++) {
+		RichCell& c = cell[cl.y + i][cl.x];
+		c.format = sc.format;
+		c.hspan = sc.hspan;
+		c.ClearText(sc.text.GetFirstFormat(style), style);
+	}
+
+	Normalize0();
+	ext = sz.cx - cell[cl.y][cl.x].hspan - 1;
+	if(ext > 0) {
+		int clx = 0;
+		for(int i = 0; i <= cell[cl.y][cl.x].hspan; i++)
+			clx += format.column[cl.x + i];
+		format.column.InsertN(cl.x, ext);
+		int q = clx / sz.cx;
+		for(int i = 1; i < sz.cx; i++)
+			format.column[cl.x + i] = q;
+		format.column[cl.x] = clx - (sz.cx - 1) * q;
+		for(int i = 0; i < cell.GetCount(); i++) {
+			cell[i].InsertN(cl.x + 1, ext);
+			for(int q = 0; q < ext; q++) {
+				RichCell& c = cell[i][cl.x + 1 + q];
+				const RichCell& sc = cell[i][cl.x];
+				c.format = sc.format;
+				c.vspan = sc.vspan;
+				c.ClearText(sc.text.GetFirstFormat(style), style);
+			}
+			CellInfo& cf = ci[i][cl.x];
+			if(cf.valid)
+				cell[i][cl.x].hspan += ext;
+			else
+			if(cf.master.y == i)
+				cell[cf.master.y][cf.master.x].hspan += ext;
+		}
+	}
+	for(int i = 0; i < sz.cy; i++)
+		for(int j = 0; j < sz.cx; j++) {
+			RichCell& c = cell[cl.y + i][cl.x + j];
+			if(j < sz.cx - 1)
+				c.hspan = 0;
+			if(j) {
+				const RichCell& sc = cell[cl.y + i][cl.x];
+				c.format = sc.format;
+				c.vspan = sc.vspan;
+				c.ClearText(sc.text.GetFirstFormat(style), style);
+			}
+		}
+	Normalize();
+}
+
+void sMatchRect(Rect& t, const Rect& s)
+{
+	if(t.left != s.left)
+		t.left = Null;
+	if(t.top != s.top)
+		t.top = Null;
+	if(t.right != s.right)
+		t.right = Null;
+	if(t.bottom != s.bottom)
+		t.bottom = Null;
+}
+
+RichCell::Format RichTable::GetCellFormat(const Rect& sel) const
+{
+	RichCell::Format fmt;
+	for(int i = sel.top; i <= sel.bottom; i++)
+		for(int j = sel.left; j <= sel.right; j++)
+			if(i == sel.top && j == sel.left)
+				fmt = cell[i][j].format;
+			else
+			if(ci[i][j].valid) {
+				const RichCell::Format& f = cell[i][j].format;
+				sMatchRect(fmt.border, f.border);
+				sMatchRect(fmt.margin, f.margin);
+				if(fmt.align != f.align)
+					fmt.align = Null;
+				if(fmt.color != f.color)
+					fmt.color = Null;
+				if(fmt.bordercolor != f.bordercolor)
+					fmt.bordercolor = Null;
+			}
+	return fmt;
+}
+
+void sSetRect(Rect& t, const Rect& s)
+{
+	if(!IsNull(s.left))
+		t.left = s.left;
+	if(!IsNull(s.top))
+		t.top = s.top;
+	if(!IsNull(s.right))
+		t.right = s.right;
+	if(!IsNull(s.bottom))
+		t.bottom = s.bottom;
+}
+
+void  RichTable::SetCellFormat(const Rect& sel, const RichCell::Format& fmt, bool setkeep)
+{
+	for(int i = sel.top; i <= sel.bottom; i++)
+		for(int j = sel.left; j <= sel.right; j++)
+			if(ci[i][j].valid) {
+				RichCell::Format& f = cell[i][j].format;
+				sSetRect(f.border, fmt.border);
+				sSetRect(f.margin, fmt.margin);
+				if(!IsNull(fmt.align))
+					f.align = fmt.align;
+				if(!IsNull(fmt.color))
+					f.color = fmt.color;
+				if(!IsNull(fmt.bordercolor))
+					f.bordercolor = fmt.bordercolor;
+				if(!IsNull(fmt.minheight))
+					f.minheight = fmt.minheight;
+				if(setkeep)
+					f.keep = fmt.keep;
+			}
+
+	Normalize();
+}
+
+void  RichTable::Paste(Point pos, const RichTable& tab)
+{
+	for(int i = 0; i < tab.GetRows(); i++)
+		for(int j = 0; j < min(GetColumns() - pos.x, tab.GetColumns()); j++)
+			cell.At(i + pos.y, cell[cell.GetCount() - 1]).At(j + pos.x) <<= tab[i][j];
+	Normalize();
+}
+
+void RichTable::AdjustSel(Rect& sel) const
+{
+again:
+	for(int i = sel.top; i <= sel.bottom; i++)
+		for(int j = sel.left; j <= sel.right; j++) {
+			Point p = GetMasterCell(i, j);
+			const RichCell& c = cell[p.y][p.x];
+			Point pp = p + Point(c.hspan, c.vspan);
+			if(p.x < sel.left) {
+				sel.left = p.x;
+				goto again;
+			}
+			if(pp.x > sel.right) {
+				sel.right = pp.x;
+				goto again;
+			}
+			if(p.y < sel.top) {
+				sel.top = p.y;
+				goto again;
+			}
+			if(pp.y > sel.bottom) {
+				sel.bottom = pp.y;
+				goto again;
+			}
+		}
+}
+
+RichTable::RichTable(const RichTable& src, int)
+{
+	format = src.format;
+	cell <<= src.cell;
+	r_row = -1;
+	Normalize();
+}
+
+RichTable::RichTable()
+{
+	cpy.page = -1;
+	r_row = -1;
+	Invalidate();
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/RichText/TableLayout.cpp b/uppsrc/RichText/TableLayout.cpp
new file mode 100644
index 000000000..c80b22461
--- /dev/null
+++ b/uppsrc/RichText/TableLayout.cpp
@@ -0,0 +1,176 @@
+#include "RichText.h"
+
+NAMESPACE_UPP
+
+bool RichTable::Reduce(RichContext& rc) const
+{
+	Rect br = rc.page;
+	rc.page.left += format.lm;
+	rc.page.right -= format.rm;
+	rc.page.Deflate(format.frame);
+	if(rc.page.IsEmpty())
+		rc.page = br;
+	return !rc.page.IsEmpty();
+}
+
+
+const RichTable::TabLayout& RichTable::Realize(RichContext rc) const
+{
+	if(rc.py != cpy || rc.page != cpage) {
+		rc.py.y += format.before;
+		if(rc.py.y > rc.page.bottom) {
+			rc.py.y = rc.page.top;
+			rc.py.page++;
+		}
+		cpage = rc.page;
+		cpy = rc.py;
+		Reduce(rc);
+		clayout.page = rc.page;
+		clayout.hasheader = false;
+		clayout.sz = GetSize();
+		if(format.header && cell.GetCount()) {
+			int hy = min(format.header, cell.GetCount());
+			RichContext nrc = rc;
+			nrc.py.page = 0;
+			nrc.py.y = clayout.page.top;
+			clayout.header = Realize(nrc, hy);
+			if(clayout.header[0].py.page == clayout.header[hy - 1].pyy.page) {
+				Layout x = Realize(rc, cell.GetCount());
+				if(cell.GetCount() > hy && rc.py.page != x[hy].py.page) {
+					rc.py.page++;
+					rc.py.y = rc.page.top;
+				}
+				clayout.hasheader = true;
+				rc.page.top = clayout.page.top = clayout.header[hy - 1].pyy.y + format.grid;
+			}
+		}
+		clayout.page0 = rc.py.page;
+		(Layout&)clayout = Realize(rc, cell.GetCount());
+		if(format.keep && cell.GetCount()) {
+			if(clayout[0].py.page != clayout[cell.GetCount() - 1].pyy.page) {
+				rc.py.page++;
+				rc.py.y = rc.page.top;
+			}
+			clayout.page0 = rc.py.page;
+			(Layout&)clayout = Realize(rc, cell.GetCount());
+		}
+	}
+	return clayout;
+}
+
+RichTable::Layout RichTable::Realize(RichContext rc, int ny) const
+{
+	Layout tab;
+
+	int nx = format.column.GetCount();
+	tab.row.Alloc(ny);
+	for(int i = 0; i < ny; i++)
+		tab[i].cell.Alloc(nx);
+	tab.col.Alloc(nx);
+
+	int sum = 0;
+	for(int i = 0; i < nx; i++)
+		sum += format.column[i];
+
+	int x = 0;
+	int xx = rc.page.left;
+	int dcx = rc.page.Width();
+	for(int i = 0; i < nx; i++) {
+		Rect& cp = tab.col[i];
+		cp = rc.page;
+		cp.left = xx;
+		x += format.column[i];
+		xx = cp.right = x * dcx / sum + rc.page.left;
+	}
+
+	int f2 = format.grid / 2;
+	int ff2 = format.grid - f2;
+
+	rc.py.y += format.frame;
+	for(int i = 0; i < ny; i++) {
+		const Array<RichCell>& row = cell[i];
+		PaintRow& pr = tab[i];
+		pr.first = i == 0;
+		pr.gpy = rc.py;
+		if(i)
+			rc.py.y += format.grid;
+		for(int j = 0; j < nx;) {
+			PaintCell& pc = pr[j];
+			const RichCell& cell = row[j];
+			if(pc.top) {
+				pc.page = tab.col[j];
+				pc.page.right = tab.col[min(nx - 1, j + cell.hspan)].right;
+				pc.bottom = false;
+				int ms = min(ny - 1, i + cell.vspan);
+				for(int k = i + 1; k <= ms; k++) {
+					PaintCell& pc = tab[k][j];
+					pc.top = pc.bottom = false;
+				}
+				tab[ms][j].bottom = true;
+				pc.left = pc.page.left;
+				pc.right = pc.page.right;
+				if(j)
+					pc.page.left += f2;
+				if(j + cell.hspan < nx - 1)
+					pc.page.right -= ff2;
+			}
+			j += cell.hspan + 1;
+		}
+		bool keep = i < format.header || format.keep;
+		for(int j = 0; j < nx;) {
+			const RichCell& cell = row[j];
+			if(pr[j].top && cell.format.keep) {
+				keep = true;
+				break;
+			}
+			j += cell.hspan + 1;
+		}
+		bool span = false;
+		for(int j = 0; j < nx;) {
+			const RichCell& cell = row[j];
+			if(!pr[j].top) {
+				span = true;
+				break;
+			}
+			j += cell.hspan + 1;
+		}
+		if(!span)
+			for(int j = 0; j < nx;) {
+				const RichCell& cell = row[j];
+				PaintCell& pc = pr[j];
+				if(pc.top) {
+					rc.page = pc.page;
+					PageY ty = cell.GetTop(rc);
+					PageY ky = rc.py;
+					if(keep)
+						ky = cell.GetHeight(rc);
+					if(ty.page != rc.py.page || ky.page != rc.py.page) {
+						rc.Page();
+						pr.gpy = rc.py;
+						pr.first = true;
+						break;
+					}
+				}
+				j += cell.hspan + 1;
+			}
+		pr.py = rc.py;
+		for(int j = 0; j < nx;) {
+			const RichCell& cell = row[j];
+			PaintCell& pc = pr[j];
+			rc.page = pc.page;
+			if(pc.top)
+				tab[min(ny - 1, i + cell.vspan)][j].hy = cell.GetHeight(rc);
+			j += cell.hspan + 1;
+		}
+		for(int j = 0; j < nx;) {
+			const RichCell& cell = row[j];
+			if(pr[j].bottom)
+				rc.py = max(pr[j].hy, rc.py);
+			j += cell.hspan + 1;
+		}
+		tab.pyy = pr.pyy = rc.py;
+	}
+	return tab;
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/RichText/TablePaint.cpp b/uppsrc/RichText/TablePaint.cpp
new file mode 100644
index 000000000..a3ac9d186
--- /dev/null
+++ b/uppsrc/RichText/TablePaint.cpp
@@ -0,0 +1,367 @@
+#include "RichText.h"
+
+NAMESPACE_UPP
+
+RichTable::Format::Format()
+{
+	grid = 4;
+	gridcolor = Black;
+	frame = 10;
+	framecolor = Black;
+	before = after = lm = rm = 0;
+	header = 0;
+	keep = false;
+}
+
+#include "RichText.h"
+
+void RichTable::ExpandFrr(VectorMap<int, Rect>& frr, int pi, int l, int r, int t, int b)
+{
+	Rect& fr = frr.GetAdd(pi, Rect(INT_MAX, INT_MAX, INT_MIN, INT_MIN));
+	fr.left = min(fr.left, l);
+	fr.right = max(fr.right, r);
+	fr.top = min(fr.top, t);
+	fr.bottom = max(fr.bottom, b);
+}
+
+bool RichTable::RowPaint(PageDraw& pw, const RichStyles& st, const Layout& tab,
+                          int i, int ny, const Rect& pg, VectorMap<int, Rect>& frr,
+                          PaintInfo& pi, int pd, bool sel) const
+{
+	RichContext rc(st);
+	const Array<RichCell>& row = cell[i];
+	const PaintRow& pr = tab[i];
+	rc.py = pr.py;
+	rc.py.page += pd;
+	int gridln = LineZoom(pi.zoom, format.grid);
+	int ff2ln = gridln - gridln / 2;
+	Color gc = format.gridcolor;
+	if(gridln == 0 && !IsNull(pi.showcodes)) {
+		gridln = 1;
+		gc = pi.showcodes;
+	}
+	for(int j = 0; j < format.column.GetCount();) {
+		const RichCell& cell = row[j];
+		const PaintCell& pc = pr[j];
+		if(pc.top) {
+			PageY pyy = tab[min(ny - 1, i + cell.vspan)].pyy;
+			pyy.page += pd;
+			bool paint = pyy > pi.top;
+			rc.page = pr[j].page;
+			Rect xpg = pg;
+			int y;
+			int ny = pi.zoom * pyy.y;
+			y = pi.zoom * pr.gpy.y;
+			if(j) {
+				xpg.left = pi.zoom * pc.left - ff2ln;
+				if(pyy.page == rc.py.page)
+					pw.Page(rc.py.page).DrawRect(xpg.left, y, gridln, ny - y, gc);
+				else {
+					pw.Page(rc.py.page).DrawRect(xpg.left, y, gridln, pg.bottom - y, gc);
+					for(int i = rc.py.page + 1; i < pyy.page; i++)
+						pw.Page(i).DrawRect(xpg.left, pg.top, gridln, pg.bottom - pg.top, gc);
+					pw.Page(pyy.page).DrawRect(xpg.left, pg.top, gridln, ny - pg.top, gc);
+				}
+				xpg.left += gridln;
+			}
+			if(j + cell.hspan < format.column.GetCount() - 1)
+				xpg.right = pi.zoom * pc.right - ff2ln;
+			if(!pr.first) {
+				y += gridln;
+				if(paint)
+					pw.Page(rc.py.page).DrawRect(xpg.left, y - gridln, xpg.Width(), gridln, gc);
+			}
+			if(paint)
+				row[j].Paint(pw, rc, pyy, xpg, y, ny, pi,
+				             sel && j >= pi.cells.left && i >= pi.cells.top &&
+				             j + cell.hspan <= pi.cells.right && i + cell.vspan <= pi.cells.bottom);
+			if(pyy.page == rc.py.page)
+				ExpandFrr(frr, pyy.page, xpg.left, xpg.right, y, ny);
+			else {
+				ExpandFrr(frr, rc.py.page, xpg.left, xpg.right, y, xpg.bottom);
+				for(int i = rc.py.page + 1; i < pyy.page; i++)
+					ExpandFrr(frr, i, xpg.left, xpg.right, xpg.top, xpg.bottom);
+				ExpandFrr(frr, pyy.page, xpg.left, xpg.right, xpg.top, ny);
+			}
+			int l = cell.text.GetLength() + 1;
+			pi.sell -= l;
+			pi.selh -= l;
+			pi.tablesel -= cell.text.GetTableCount();
+		}
+		j += cell.hspan + 1;
+	}
+
+	return rc.py >= pi.bottom;
+}
+
+void RichTable::Paint(PageDraw& pw, RichContext rc, const PaintInfo& _pi) const
+{
+	const TabLayout& tab = Realize(rc);
+	if(tab.page.IsEmpty())
+		return;
+	Rect p = tab.page;
+	PaintInfo pi = _pi;
+	int frameln = LineZoom(pi.zoom, format.frame);
+	int gridln = LineZoom(pi.zoom, format.grid);
+	Rect pg = rc.page;
+	pg.left += format.lm;
+	pg.right -= format.rm;
+	pg.left = pi.zoom * pg.left;
+	pg.right = pi.zoom * pg.right;
+	pg.top = pi.zoom * pg.top;
+	pg.bottom = pi.zoom * pg.bottom;
+	pg.Deflate(frameln);
+	int hy = min(format.header, cell.GetCount());
+	Rect hpg = pg;
+	if(tab.hasheader) {
+		hpg.bottom = pi.zoom * tab.header[hy - 1].pyy.y;
+		pg.top = hpg.bottom + gridln;
+	}
+	bool allsel = false;
+	if(pi.sell < 0 && pi.selh >= 0) {
+		pi.sell = pi.selh = 0;
+		allsel = true;
+	}
+	bool sel = pi.tablesel == 0;
+	int ny = cell.GetCount();
+	VectorMap<int, Rect> frr;
+	for(int i = 0; i < ny; i++)
+		if(RowPaint(pw, rc.styles, tab, i, ny, pg, frr, pi, 0, sel))
+			break;
+
+	Color gc = format.gridcolor;
+	Color fc = format.framecolor;
+	int fl = frameln;
+	if(!IsNull(pi.showcodes)) {
+		if(fl == 0 && !IsNull(pi.showcodes)) {
+			fl = 1;
+			fc = pi.showcodes;
+		}
+		if(gridln == 0) {
+			gridln = 1;
+			gc = pi.showcodes;
+		}
+	}
+	for(int i = 0; i < frr.GetCount(); i++) {
+		PaintInfo _pi = pi;
+		pi.tablesel = 0;
+		pi.sell = pi.selh = -1;
+		int pgi = frr.GetKey(i);
+		Draw& w = pw.Page(pgi);
+		if(pgi > tab.page0 && tab.hasheader)
+			for(int i = 0; i < hy; i++) {
+				RowPaint(pw, rc.styles, tab.header, i, hy, hpg, frr, pi, pgi, false);
+				w.DrawRect(pg.left, hpg.bottom, pg.Width(), gridln, format.gridcolor);
+			}
+		Rect r = frr[i].Inflated(frameln);
+		if(!r.IsEmpty()) {
+			DrawFatFrame(w, r, fc, fl);
+			if(allsel)
+				w.DrawRect(r, InvertColor);
+		}
+	}
+}
+
+PageY RichTable::GetHeight(RichContext rc) const
+{
+	PageY pyy = Realize(rc).pyy;
+	pyy.y += format.frame;
+	pyy.y += format.after;
+	if(pyy.y > rc.page.bottom) {
+		pyy.y = rc.page.top;
+		pyy.page++;
+	}
+	return pyy;
+}
+
+PageY RichTable::GetTop(RichContext rc) const
+{
+	if(cell.GetCount() == 0)
+		return rc.py;
+	rc.py = Realize(rc)[0].py;
+	rc.py.y -= format.frame;
+	return rc.py;
+}
+
+RichCaret RichTable::GetCaret(int pos, RichContext rc) const
+{
+	ASSERT(pos >= 0);
+	int nx = format.column.GetCount();
+	int ny = cell.GetCount();
+	int ti = 0;
+	const TabLayout& tab = Realize(rc);
+	for(int i = 0; i < ny; i++) {
+		const PaintRow& pr = tab[i];
+		rc.py = pr.py;
+		PageY pyy;
+		for(int j = 0; j < nx; j++) {
+			if(ci[i][j].valid) {
+				const RichCell& cl = cell[i][j];
+				pyy = tab[min(ny - 1, i + cl.vspan)].pyy;
+				int l = cl.text.GetLength() + 1;
+				if(pos < l) {
+					rc.page = pr[j].page;
+					return cl.GetCaret(pos, rc, pyy);
+				}
+				ti += cl.text.GetTableCount();
+				pos -= l;
+			}
+		}
+	}
+	NEVER();
+	return RichCaret();
+}
+
+int  RichTable::GetPos(int x, PageY y, RichContext rc) const
+{
+	int nx = format.column.GetCount();
+	int ny = cell.GetCount();
+	const TabLayout& tab = Realize(rc);
+	int pos = 0;
+	for(int i = 0; i < ny; i++) {
+		const PaintRow& pr = tab[i];
+		rc.py = pr.py;
+		for(int j = 0; j < nx; j++)
+			if(ci[i][j].valid) {
+				const RichCell& cl = cell[i][j];
+				const PaintCell& pc = pr[j];
+				PageY pyy = tab[min(ny - 1, i + cl.vspan)].pyy;
+				if(y < pyy
+				   && (j == 0 || x >= pc.page.left - format.grid)
+				   && (j == nx - 1 || x < pc.page.right)) {
+					rc.page = pc.page;
+					return cl.GetPos(x, y, rc, pyy) + pos;
+				}
+				pos += cl.text.GetLength() + 1;
+			}
+	}
+	return pos ? pos - 1 : 0;
+}
+
+RichHotPos  RichTable::GetHotPos(int x, PageY y, int tolerance, RichContext rc) const
+{
+	RichHotPos hp;
+	hp.textleft = rc.page.left;
+	hp.textcx = rc.page.Width();
+	int nx = format.column.GetCount();
+	int ny = cell.GetCount();
+	const TabLayout& tab = Realize(rc);
+	if(abs(x - tab.page.left) <= tolerance) {
+		hp.table = 0;
+		hp.column = RICHHOT_LM;
+		hp.delta = x - tab.page.left;
+		return hp;
+	}
+	if(abs(x - tab.page.right) <= tolerance) {
+		hp.table = 0;
+		hp.column = RICHHOT_RM;
+		hp.delta = x - tab.page.right;
+		return hp;
+	}
+	int ti = 0;
+	for(int i = 0; i < ny; i++) {
+		const PaintRow& pr = tab[i];
+		rc.py = pr.py;
+		for(int j = 0; j < nx; j++) {
+			if(ci[i][j].valid) {
+				const RichCell& cl = cell[i][j];
+				const PaintCell& pc = pr[j];
+				PageY pyy = tab[min(ny - 1, i + cl.vspan)].pyy;
+				if(y < pyy) {
+					if(j < nx - 1 && abs(x - pc.page.right) <= tolerance) {
+						hp.table = 0;
+						hp.column = j + cl.hspan;
+						hp.delta = x - pc.page.right;
+						hp.left = tab.page.left;
+						hp.cx = tab.page.Width();
+						return hp;
+					}
+					if((j == 0 || x >= pc.page.left - format.grid) && (j == nx - 1 || x < pc.page.right)) {
+						rc.page = pc.page;
+						hp = cl.GetHotPos(x, y, tolerance, rc, pyy);
+						hp.table += ti;
+						return hp;
+					}
+				}
+				ti += cl.text.GetTableCount();
+			}
+		}
+	}
+	return RichHotPos();
+}
+
+int RichTable::GetVertMove(int pos, int gx, RichContext rc, int dir) const
+{
+	if(cell.GetCount() == 0)
+		return -1;
+	int nx = format.column.GetCount();
+	int ny = cell.GetCount();
+	const TabLayout& tab = Realize(rc);
+	Point cp;
+	if(pos >= 0)
+		cp = FindCell(pos);
+	else {
+		cp.y = dir > 0 ? 0 : cell.GetCount() - 1;
+		cp.x = 0;
+		const PaintRow& pr = tab[cp.y];
+		for(int j = 0; j < nx; j++)
+			if(ci[cp.y][cp.x].valid && gx < pr[j].page.right) {
+				cp.x = j;
+				break;
+			}
+		pos = -1;
+	}
+	for(;;) {
+		rc.page = tab[cp.y][cp.x].page;
+		const RichCell& c = cell[cp.y][cp.x];
+		RichContext rc1 = rc;
+		if(c.Reduce(rc1)) {
+			int q = cell[cp.y][cp.x].text.GetVertMove(pos, gx, rc1, dir);
+			if(q >= 0)
+				return q + GetCellPos(cp);
+		}
+		pos = -1;
+		cp.y += dir;
+		if(cp.y < 0 || cp.y >= ny)
+			return -1;
+	}
+}
+
+void RichTable::GatherValPos(Vector<RichValPos>& f, RichContext rc, int pos, int type) const
+{
+	ASSERT(pos >= 0);
+	int nx = format.column.GetCount();
+	int ny = cell.GetCount();
+	const TabLayout& tab = Realize(rc);
+	for(int i = 0; i < ny; i++) {
+		const PaintRow& pr = tab[i];
+		rc.py = pr.py;
+		for(int j = 0; j < nx; j++)
+			if(ci[i][j].valid) {
+				const RichCell& cl = cell[i][j];
+				rc.page = pr[j].page;
+				cl.GatherValPos(f, rc, tab[min(ny - 1, i + cl.vspan)].pyy, pos, type);
+				pos += cl.text.GetLength() + 1;
+			}
+	}
+}
+
+void RichTable::ApplyZoom(Zoom z, const RichStyles& ostyle, const RichStyles& zstyle)
+{
+	Invalidate();
+	r_row = -1;
+	int nx = format.column.GetCount();
+	int ny = cell.GetCount();
+	format.frame = LineZoom(z, format.frame);
+	format.grid = LineZoom(z, format.grid);
+	for(int i = 0; i < ny; i++)
+		for(int j = 0; j < nx; j++)
+			if(ci[i][j].valid) {
+				RichCell& c = cell[i][j];
+				c.format.border *= z;
+				c.format.margin *= z;
+				c.text.ApplyZoom(z, ostyle, zstyle);
+			}
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/RichText/Text.h b/uppsrc/RichText/Text.h
new file mode 100644
index 000000000..69db1c524
--- /dev/null
+++ b/uppsrc/RichText/Text.h
@@ -0,0 +1,135 @@
+class RichText : public RichTxt, public DeepCopyOption<RichText> {
+	RichStyles style;
+	String     footer; // ugly hack
+	bool       nolinks;
+
+	void       Init();
+
+	struct StyleChangeOp;
+	struct SetStylesOp;
+	struct RemoveStyleOp;
+	struct MergeStylesOp;
+	friend struct MergeStylesOp;
+	struct OverrideStylesOp;
+
+public:
+	void                  Clear();
+
+	int                   GetStyleCount() const                { return style.GetCount(); }
+	Uuid                  GetStyleId(int i) const              { return style.GetKey(i); }
+	Uuid                  GetStyleId(const String& name) const;
+	const RichStyle&      GetStyle(int i) const                { return style[i]; }
+	const RichStyle&      GetStyle(const Uuid& id) const       { return UPP::GetStyle(style, id); }
+	void                  SetStyle(const Uuid& id, const RichStyle& _style);
+	bool                  HasStyle(const Uuid& id)             { return style.Find(id) >= 0; }
+	void                  RemoveStyle(const Uuid& id);
+
+	const RichStyles&     GetStyles() const                    { return style; }
+	void                  SetStyles(const RichStyles& styles);
+	void                  OverrideStyles(const RichStyles& masterstyles,
+	                                     bool matchname = true, bool addmissing = true);
+	void                  MergeStyles(const RichText& text);
+
+	RichPara              Get(int i) const                     { return RichTxt::Get(i, style); }
+	void                  Cat(const RichPara& p)               { RichTxt::Cat(p, style); }
+	void                  CatPick(pick_ RichText& p);
+	using                 RichTxt::CatPick;
+
+	RichContext           Context(const Rect& page) const;
+
+	RichPos               GetRichPos(int pos, int maxlevel = INT_MAX) const;
+	int                   operator[](int pos) const            { return GetRichPos(pos).chr; }
+
+	void                  ApplyZoom(Zoom z);
+
+	PageY                 GetHeight(PageY py, const Rect& page) const;
+	PageY                 GetHeight(const Rect& page) const;
+	void                  Paint(PageDraw& w, PageY py, const Rect& page, const PaintInfo& pi) const;
+	void                  Paint(PageDraw& w, const Rect& page, const PaintInfo& pi) const;
+	RichCaret             GetCaret(int pos, const Rect& page) const;
+	int                   GetPos(int x, PageY y, const Rect& page) const;
+	RichHotPos            GetHotPos(int x, PageY y, int tolerance, const Rect& page) const;
+	int                   GetVertMove(int pos, int gx, const Rect& page, int dir) const;
+	int                   GetWidth() const;
+
+	int                   GetHeight(int cx) const;
+	int                   GetHeight(Zoom zoom, int cx) const;
+	void                  Paint(Draw& w, int x, int y, int cx, const PaintInfo& pi) const;
+	void                  Paint(Zoom zoom, Draw& w, int x, int y, int cx) const;
+	void                  Paint(Draw& w, int x, int y, int cx) const;
+
+	Vector<RichValPos>    GetValPos(const Rect& page, int type) const;
+
+	int                   AdjustCursor(int anchor, int cursor) const;
+
+	void                  Remove(int pos, int count);
+	void                  Insert(int pos, const RichText& p);
+	RichText              Copy(int pos, int count) const;
+
+	FormatInfo            GetFormatInfo(int pos, int count) const;
+	void                  ApplyFormatInfo(int pos, const RichText::FormatInfo& fi, int count);
+
+	void                  ReStyle(int pos, const Uuid& id);
+
+	Formating             SaveFormat(int pos, int count) const;
+	void                  RestoreFormat(int pos, const Formating& info);
+
+
+	RichTable::Format     GetTableFormat(int table) const;
+	void                  SetTableFormat(int table, const RichTable::Format& fmt);
+	int                   SetTable(int pos, const RichTable& table);
+	void                  DestroyTable(int table);
+	RichTable             CopyTable(int table) const;
+	void                  ReplaceTable(int table, const RichTable& tab);
+	void                  RemoveParaSpecial(int table, bool before);
+	bool                  CanRemoveParaSpecial(int table, bool before);
+	void                  InsertParaSpecial(int table, bool before, const RichPara::Format& fmt);
+	bool                  ShouldInsertParaSpecial(int table, bool before);
+	RichTable             CopyTable(int table, const Rect& sel) const;
+	void                  ClearTable(int table, const Rect& sel);
+	void                  PasteTable(int table, Point pos, const RichTable& tab);
+	void                  InsertTableRow(int table, int row);
+	void                  RemoveTableRow(int table, int row);
+	void                  InsertTableColumn(int table, int column);
+	void                  RemoveTableColumn(int table, int column);
+	Point                 GetMasterCell(int table, int row, int column);
+	Point                 GetMasterCell(int table, Point p)                 { return GetMasterCell(table, p.y, p.x); }
+	void                  SplitCell(int table, Point cell, Size sz);
+	void                  JoinCell(int table, const Rect& sel);
+	RichCell::Format      GetCellFormat(int table, const Rect& sel) const;
+	void                  SetCellFormat(int table, const Rect& sel, const RichCell::Format& fmt, bool setkeep);
+	FormatInfo            GetTableFormatInfo(int table, const Rect& sel) const;
+	void                  ApplyTableFormatInfo(int table, const Rect& sel, const RichText::FormatInfo& fi);
+	void                  AdjustTableSel(int table, Rect& sel) const        { return GetConstTable(table).AdjustSel(sel); }
+
+	bool                  Iterate(Iterator& r) const                        { return RichTxt::Iterate(r, 0, style); }
+	bool                  Iterate(UpdateIterator& r)                        { return RichTxt::Iterate(r, 0, style); }
+
+	bool                  EvaluateFields(VectorMap<String, Value>& vars)    { return RichTxt::EvaluateFields(style, vars); }
+
+	void                  InvalidateAll()                                   { r_type = ALL; }
+	void                  Validate();
+	bool                  GetInvalid(PageY& top, PageY& bottom, const Rect& page,
+	                                 int sell, int selh, int osell, int oselh) const;
+
+	struct ClipboardType {
+		ClipboardType();
+		virtual ~ClipboardType();
+
+		virtual int      Level();
+		virtual RichText ReadClipboard(const RichPara::Format& f) = 0;
+		virtual void     WriteClipboard(const RichText& text) = 0;
+	};
+
+	static void           Register(ClipboardType& type);
+
+	//Ugly hacks
+	void                  SetFooter(const String& s)                          { footer = s; }
+	String                GetFooter() const                                   { return footer; }
+	void                  PrintNoLinks(bool b = true)                         { nolinks = b; }
+	bool                  IsPrintNoLinks() const                              { return nolinks; }
+
+	RichText()            { Init(); }
+	RichText(const RichText& x, int);
+	RichText(pick_ RichTxt& x, pick_ RichStyles& st);
+};
diff --git a/uppsrc/RichText/TextData.cpp b/uppsrc/RichText/TextData.cpp
new file mode 100644
index 000000000..c34c89b4a
--- /dev/null
+++ b/uppsrc/RichText/TextData.cpp
@@ -0,0 +1,332 @@
+#include "RichText.h"
+
+NAMESPACE_UPP
+
+void  RichText::CatPick(pick_ RichText& p)
+{
+	MergeStyles(p);
+	int c = part.GetCount();
+	part.AppendPick(p.part);
+	for(int i = c; i < part.GetCount(); i++)
+		if(IsPara(i))
+			part[i].Get<Para>().cx = -1;
+	RefreshAll();
+}
+
+RichPos::RichPos()
+{
+	tabtextparti = tabtextpartcount = tabposintabtext = tabtextlen = table = tablen = posintab =
+	celllen = posincell = parai = partcount = posinpara = paralen = 0;
+	parenttab = Null;
+
+	tabsize = Size(0, 0);
+	cell = Point(0, 0);
+	chr = '?';
+}
+
+RichPos RichText::GetRichPos(int pos, int maxlevel) const
+{
+	RichPos rp;
+	rp.level = 0;
+	RichTxt::GetRichPos(pos, rp, 0, maxlevel, style);
+	if(IsNull(rp.parenttab))
+		rp.parenttab = 0;
+	return rp;
+}
+
+int  RichText::AdjustCursor(int anchor, int cursor) const
+{
+	int d = anchor;
+	const RichTxt& txt = GetConstText(anchor);
+	d -= anchor;
+	if(!(cursor == txt.GetLength() && !txt.IsTable(txt.GetPartCount() - 1)))
+		cursor = minmax(cursor - d, 0, txt.GetLength());
+	int c = cursor;
+	int pi = txt.FindPart(c);
+	if(txt.IsTable(pi)) {
+		if(cursor < anchor) {
+			while(--pi >= 0)
+				if(txt.IsPara(pi))
+					return d + txt.GetPartPos(pi) + txt.GetPartLength(pi);
+			while(++pi < txt.GetPartCount())
+				if(txt.IsPara(pi))
+					return d + txt.GetPartPos(pi);
+			return d + anchor;
+		}
+		else {
+			while(++pi < txt.GetPartCount())
+				if(txt.IsPara(pi))
+					return d + txt.GetPartPos(pi);
+			while(--pi >= 0)
+				if(txt.IsPara(pi))
+					return d + txt.GetPartPos(pi) + txt.GetPartLength(pi);
+			return d + anchor;
+		}
+	}
+	return d + cursor;
+}
+
+void RichText::Remove(int pos, int count)
+{
+	GetLength();
+	int p = pos;
+	int l = GetConstText(p).GetLength();
+	count = min(l - p, count);
+	RichTxt& txt = GetUpdateText(pos);
+	int pos2 = pos + count;
+	int pi = txt.FindPart(pos);
+	int pi2 = txt.FindPart(pos2);
+	if(pi == pi2) {
+		RichPara pa, pa1;
+		pa = txt.Get(pi, style);
+		pa1 <<= pa;
+		pa.Trim(pos);
+		pa1.Mid(pos2);
+		pa.Append(pa1);
+		txt.Put(pi, pa, style);
+	}
+	else {
+		RichPara pa2 = txt.Get(pi2, style);
+		RichPara pa = txt.Get(pi, pa2.format.styleid, style);
+		txt.part.Remove(pi, pi2 - pi);
+		pa.Trim(pos);
+		pa2.Mid(pos2);
+		pa.Append(pa2);
+		pa.format = pa2.format;
+		txt.Put(pi, pa, style);
+		txt.SetRefreshFrom(pi);
+	}
+}
+
+void RichText::Insert(int pos, const RichText& p)
+{
+	MergeStyles(p);
+	if(p.GetLength() == 0)
+		return;
+	ASSERT(pos >= 0 && pos <= GetLength());
+	RichTxt& txt = GetUpdateText(pos);
+	int pi = txt.FindPart(pos);
+	int n = p.part.GetCount() - 1;
+	if(n) {
+		txt.part.Insert(pi + 1, p.part, 1, n);
+		RichPara pa1, pa2;
+		pa1 = txt.Get(pi, style);
+		pa2 = txt.Get(pi + n, pa1.format.styleid, style);
+		pa1.Mid(pos);
+		pa2.Append(pa1);
+		pa2.format = pa1.format;
+		txt.Put(pi + n, pa2, style);
+		pa2 = p.RichTxt::Get(0, p.GetStyle(p.GetParaStyle(0)));
+		pa1 = txt.Get(pi, pa2.format.styleid, style);
+		pa1.Trim(pos);
+		pa1.Append(pa2);
+		pa1.format = pa2.format;
+		txt.Put(pi, pa1, style);
+		txt.SetRefreshFrom(pi);
+	}
+	else {
+		RichPara pa0, pa2;
+		pa0 = txt.Get(pi, style);
+		pa2 <<= pa0;
+		pa0.Trim(pos);
+		pa2.Mid(pos);
+		pa0.Append(p.RichTxt::Get(0, p.GetStyle(pa0.format.styleid)));
+		pa0.Append(pa2);
+		txt.Put(pi, pa0, style);
+	}
+}
+
+RichText RichText::Copy(int pos, int count) const
+{
+	RichText r;
+	r.SetStyles(style);
+
+	const RichTxt& txt = GetConstText(pos);
+	bool addp = false;
+	if(count > txt.GetLength() - pos) {
+		count = txt.GetLength() - pos;
+		addp = true;
+	}
+	int pos2 = pos + count;
+	int pi = txt.FindPart(pos);
+	int pi2 = txt.FindPart(pos2);
+
+	if(pi == pi2) {
+		RichPara pa = txt.Get(pi, style);
+		pa.Trim(pos2);
+		pa.Mid(pos);
+		r.Cat(pa);
+	}
+	else {
+		RichPara pa = txt.Get(pi++, style);
+		pa.Mid(pos);
+		r.Cat(pa);
+		while(pi < pi2) {
+			if(txt.IsPara(pi))
+				r.Cat(txt.Get(pi, style));
+			else {
+				RichTable tab(txt.GetTable(pi), 1);
+				r.CatPick(tab);
+			}
+			pi++;
+		}
+		pa = txt.Get(pi2, style);
+		pa.Trim(pos2);
+		r.Cat(pa);
+	}
+	if(addp)
+		r.Cat(RichPara());
+	return r;
+}
+
+RichText::FormatInfo RichText::GetFormatInfo(int pos, int count) const
+{
+	const RichTxt& txt = GetConstText(pos);
+
+	count = min(txt.GetLength() - pos, count);
+
+	int pos2 = pos + count;
+	int pi = txt.FindPart(pos);
+	int pi2 = txt.FindPart(pos2);
+
+	FormatInfo fi;
+	RichPara::Format fmt;
+	RichPara pa = txt.Get(pi, style);
+	fmt = pa.format;
+	int i = pa.FindPart(pos);
+	if(i < pa.GetCount())
+		(RichPara::CharFormat&)fmt = pa[i].format;
+	fi.Set(fmt);
+	i++;
+	if(pi == pi2) {
+		int i2 = pa.FindPart(pos2);
+		while(i < i2)
+			fi.Combine(pa[i++].format);
+		if(pos2)
+			fi.Combine(pa[i2].format);
+	}
+	else {
+		while(i < pa.GetCount())
+			fi.Combine(pa[i++].format);
+		fi.Combine(pa.format);
+		pi++;
+		bool first = false;
+		txt.CombineFormat(fi, pi, pi2, first, style);
+		pa = txt.Get(pi2, style);
+		int i2 = pa.FindPart(pos2);
+		for(i = 0; i < i2; i++)
+			fi.Combine(pa[i].format);
+		if(pos2)
+			fi.Combine(pa[i2].format);
+	}
+	return fi;
+}
+
+void RichText::ApplyFormatInfo(int pos, const RichText::FormatInfo& fi, int count)
+{
+	RichTxt& txt = GetUpdateText(pos);
+
+	int pos2 = min(txt.GetLength(), pos + count);
+	int pi = txt.FindPart(pos);
+	int pi2 = txt.FindPart(pos2);
+
+	ASSERT(txt.IsPara(pi) && txt.IsPara(pi2));
+
+	if(pi == pi2) {
+		RichPara pa, pa1, pa2;
+		if(fi.paravalid & RichText::STYLE)
+			pa = txt.Get(pi, fi.styleid, style);
+		else
+			pa = txt.Get(pi, style);
+		pa1 <<= pa;
+		pa2 <<= pa;
+		pa.Trim(pos);
+		pa2.Mid(pos2);
+		pa1.Trim(pos2);
+		pa1.Mid(pos);
+		Apply(fi, pa1);
+		pa.Append(pa1);
+		pa.Append(pa2);
+		fi.ApplyTo(pa.format);
+		txt.Put(pi, pa, style);
+	}
+	else {
+		RichPara pa, pa1;
+		if(fi.paravalid & RichText::STYLE)
+			pa = txt.Get(pi, fi.styleid, style);
+		else
+			pa = txt.Get(pi, style);
+		pa1 <<= pa;
+		pa.Trim(pos);
+		pa1.Mid(pos);
+		Apply(fi, pa1);
+		fi.ApplyTo(pa.format);
+		pa.Append(pa1);
+		txt.Put(pi, pa, style);
+		pi++;
+		txt.ApplyFormat(fi, pi, pi2, style);
+		if(fi.paravalid & RichText::STYLE)
+			pa = txt.Get(pi2, fi.styleid, style);
+		else
+			pa = txt.Get(pi2, style);
+		pa1 <<= pa;
+		pa.Trim(pos2);
+		pa1.Mid(pos2);
+		Apply(fi, pa);
+		pa.Append(pa1);
+		txt.Put(pi2, pa, style);
+	}
+}
+
+void RichText::ReStyle(int pos, const Uuid& id)
+{
+	int p = FindPart(pos);
+	RichPara pa = Get(p);
+	pa.format.styleid = id;
+	Put(p, pa, style);
+}
+
+RichText::Formating RichText::SaveFormat(int pos, int count) const
+{
+	const RichTxt& txt = GetConstText(pos);
+	count += pos;
+	Formating r;
+	txt.SaveFormat(r, txt.FindPart(pos), txt.FindPart(count), style);
+	return r;
+}
+
+void RichText::RestoreFormat(int pos, const RichText::Formating& info)
+{
+	RichTxt& txt = GetUpdateText(pos);
+	int ii = 0;
+	txt.RestoreFormat(txt.FindPart(pos), info, ii, style);
+}
+
+void RichText::Init()
+{
+	RichTxt::Init();
+	RichStyle& s = style.Add(RichStyle::GetDefaultId());
+	s.name = "Default";
+	nolinks = false;
+}
+
+void RichText::Clear()
+{
+	RichTxt::Clear();
+	style.Clear();
+	Init();
+}
+
+RichText::RichText(const RichText& x, int)
+   : RichTxt(x, 1), style(x.style, 1)
+{
+	nolinks = x.nolinks;
+}
+
+RichText::RichText(pick_ RichTxt& x, pick_ RichStyles& st)
+   : RichTxt(x), style(st)
+{
+	nolinks = false;
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/RichText/TextPaint.cpp b/uppsrc/RichText/TextPaint.cpp
new file mode 100644
index 000000000..0469c292b
--- /dev/null
+++ b/uppsrc/RichText/TextPaint.cpp
@@ -0,0 +1,183 @@
+#include "RichText.h"
+
+NAMESPACE_UPP
+
+RichContext RichText::Context(const Rect& page) const
+{
+	RichContext c(style);
+	c.page = page;
+	c.py = PageY(0, page.top);
+	return c;
+}
+
+PageY RichText::GetHeight(const Rect& page) const
+{
+	return RichTxt::GetHeight(Context(page));
+}
+
+PageY RichText::GetHeight(PageY py, const Rect& page) const
+{
+	RichContext ctx = Context(page);
+	ctx.py = py;
+	return RichTxt::GetHeight(ctx);
+}
+
+int   RichText::GetWidth() const
+{
+	return RichTxt::GetWidth(style);
+}
+
+void RichText::Paint(PageDraw& w, PageY py, const Rect& page, const PaintInfo& pi) const
+{
+	RichContext ctx = Context(page);
+	ctx.py = py;
+	RichTxt::Paint(w, ctx, pi);
+}
+
+void  RichText::Paint(PageDraw& w, const Rect& page, const PaintInfo& pi) const
+{
+	RichTxt::Paint(w, Context(page), pi);
+}
+
+RichCaret RichText::GetCaret(int pos, const Rect& page) const
+{
+	return RichTxt::GetCaret(pos, Context(page));
+}
+
+int RichText::GetPos(int x, PageY y, const Rect& page) const
+{
+	return RichTxt::GetPos(x, y, Context(page));
+}
+
+int RichText::GetVertMove(int pos, int gx, const Rect& page, int dir) const
+{
+	return RichTxt::GetVertMove(pos, gx, Context(page), dir);
+}
+
+RichHotPos  RichText::GetHotPos(int x, PageY y, int tolerance, const Rect& page) const
+{
+	RichHotPos p = RichTxt::GetHotPos(x, y, tolerance, Context(page));
+	if(p.column < -2)
+		p.table = 0;
+	return p;
+}
+
+Vector<RichValPos> RichText::GetValPos(const Rect& page, int type) const
+{
+	Vector<RichValPos> f;
+	GatherValPos(f, Context(page), 0, type);
+	return f;
+}
+
+void RichText::Validate()
+{
+	r_type = NONE;
+	for(int i = 0; i < part.GetCount(); i++)
+		if(IsTable(i))
+			part[i].Get<RichTable>().Validate();
+}
+
+bool RichText::GetInvalid(PageY& top, PageY& bottom, const Rect& page,
+                          int sell, int selh, int osell, int oselh) const
+{
+	int spi;
+	int rtype = r_type;
+	if(sell != selh || osell != oselh) {
+		if(sell != osell) {
+			if(rtype == NONE) {
+				spi = FindPart(sell);
+				rtype = spi == FindPart(osell) ? SPARA : ALL;
+			}
+			else
+				rtype = ALL;
+		}
+		if(selh != oselh) {
+			if(rtype == NONE) {
+				spi = FindPart(selh);
+				rtype = spi == FindPart(oselh) ? SPARA : ALL;
+			}
+			else
+				rtype = ALL;
+		}
+	}
+	bottom = top = PageY(0, page.top);
+	if(rtype == NONE) {
+		bottom = top;
+		return false;
+	}
+	if(rtype == ALL) {
+		bottom = GetHeight(page);
+		return true;
+	}
+	RichContext rc = Context(page);
+	if(rtype == SPARA) {
+		rc.py = top = GetPartPageY(spi, rc);
+	   	bottom = GetNextPageY(spi, rc);
+	   	return true;
+	}
+	rc.py = top = GetPartPageY(r_parti, rc);
+	if(rtype == PARA) {
+		if(IsTable(r_parti))
+			switch(GetTable(r_parti).GetInvalid(top, bottom, rc)) {
+			case -1: return false;
+			case 0: return true;
+			default:
+				bottom = GetHeight(page);
+				return true;
+			}
+		else {
+			Sync(r_parti, rc);
+			const Para& pp = part[r_parti].Get<Para>();
+			if(r_paraocx == pp.cx &&
+			   r_paraocy == Sum(pp.linecy, 0) + pp.before + pp.after &&
+	 		   r_keep == pp.keep &&
+	 		   r_keepnext == pp.keepnext &&
+			   r_newpage == pp.newpage) {
+			   	bottom = GetNextPageY(r_parti, rc);
+			   	return true;
+			}
+		}
+	}
+	bottom = GetHeight(page);
+	return true;
+}
+
+int RichText::GetHeight(Zoom zoom, int cx) const
+{
+	int lwd = cx / zoom;
+	return GetHeight(Size(lwd, 0xFFFFFFF)).y * zoom;
+}
+
+int RichText::GetHeight(int cx) const
+{
+	return GetHeight(Size(cx, 0xFFFFFFF)).y;
+}
+
+void RichText::Paint(Draw& w, int x, int y, int cx, const PaintInfo& pinit) const
+{
+	SimplePageDraw pw(w);
+	PaintInfo pi(pinit);
+	pi.top = PageY(0, 0);
+	pi.bottom = PageY(0, INT_MAX);
+	pi.usecache = true;
+	pi.sizetracking = false;
+	pi.highlight = Null;
+	w.Offset(x, y);
+	Paint(pw, Size(cx / pi.zoom, INT_MAX), pi);
+	w.End();
+}
+
+void RichText::Paint(Zoom zoom, Draw& w, int x, int y, int cx) const
+{
+	PaintInfo pi;
+	pi.highlightpara = false;
+	pi.zoom = zoom;
+	Paint(w, x, y, cx, pi);
+}
+
+void RichText::Paint(Draw& w, int x, int y, int cx) const
+{
+	Paint(Zoom(1, 1), w, x, y, cx);
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/RichText/TextStyle.cpp b/uppsrc/RichText/TextStyle.cpp
new file mode 100644
index 000000000..7da33e6d1
--- /dev/null
+++ b/uppsrc/RichText/TextStyle.cpp
@@ -0,0 +1,153 @@
+#include "RichText.h"
+
+NAMESPACE_UPP
+
+const RichStyle& RichStyle::GetDefault()
+{
+	return Single<RichStyle>();
+}
+
+Uuid  RichStyle::GetDefaultId()
+{
+	Uuid id;
+	id.a = 0;
+	id.b = 0;
+	id.c = 0;
+	id.d = 0;
+	return id;
+}
+
+const RichStyle& GetStyle(const RichStyles& s, const Uuid& id)
+{
+	return s.Get(id, RichStyle::GetDefault());
+}
+
+int FindStyleWithName(const RichStyles& style, const String& name)
+{
+	for(int j = 0; j < style.GetCount(); j++)
+		if(style[j].name == name)
+			return j;
+	return -1;
+}
+
+struct RichText::StyleChangeOp : RichTxt::ParaOp {
+	Uuid id, nid;
+
+	virtual bool operator()(RichTxt::Para& p) {
+		if(p.styleid == id) {
+			p.styleid = nid;
+			p.cx = -1;
+			return true;
+		}
+		return false;
+	}
+};
+
+void RichText::SetStyle(const Uuid& id, const RichStyle& _style)
+{
+	Invalidate();
+	RichStyle& s = style.GetAdd(id);
+	s = _style;
+	s.format.styleid = id;
+	s.format.language = 0;
+	s.format.newpage = false;
+	StyleChangeOp op;
+	op.nid = op.id = id;
+	Update(op);
+}
+
+struct RichText::SetStylesOp : RichTxt::ParaOp {
+	RichStyles *style;
+
+	virtual bool operator()(RichTxt::Para& p) {
+		p.cx = -1;
+		if(style->Find(p.styleid) < 0)
+			p.styleid = RichStyle::GetDefaultId();
+		return true;
+	}
+};
+
+void RichText::SetStyles(const RichStyles& _style)
+{
+	Invalidate();
+	style <<= _style;
+	SetStylesOp op;
+	op.style = &style;
+	Update(op);
+}
+
+Uuid RichText::GetStyleId(const String& name) const
+{
+	int i = FindStyleWithName(style, name);
+	return i >= 0 ? style.GetKey(i) : RichStyle::GetDefaultId();
+}
+
+void  RichText::RemoveStyle(const Uuid& id)
+{
+	ASSERT(id != RichStyle::GetDefaultId());
+	Invalidate();
+	StyleChangeOp op;
+	op.id = id;
+	op.nid = RichStyle::GetDefaultId();
+	Update(op);
+	style.RemoveKey(id);
+}
+
+struct RichText::MergeStylesOp : RichTxt::ParaOp {
+	RichText       *text;
+	const RichText *stxt;
+
+	virtual bool operator()(RichTxt::Para& p) {
+		if(text->style.Find(p.styleid) < 0) {
+			RichStyle& s = text->style.GetAdd(p.styleid);
+			s = stxt->GetStyle(p.styleid);
+			s.format.styleid = p.styleid;
+		}
+		return false;
+	}
+};
+
+void RichText::MergeStyles(const RichText& text)
+{
+	Invalidate();
+	MergeStylesOp op;
+	op.stxt = &text;
+	op.text = this;
+	const_cast<RichText&>(text).Update(op);
+}
+
+struct RichText::OverrideStylesOp : RichTxt::ParaOp {
+	VectorMap<Uuid, Uuid> cs;
+
+	virtual bool operator()(RichTxt::Para& p) {
+		p.styleid = cs.Get(p.styleid, RichStyle::GetDefaultId());
+		p.cx = -1;
+		return true;
+	}
+};
+
+void  RichText::OverrideStyles(const RichStyles& ms, bool matchname, bool addmissing)
+{
+	Invalidate();
+	RichStyles orig = style;
+	style <<= ms;
+	OverrideStylesOp op;
+	for(int i = 0; i < orig.GetCount(); i++) {
+		Uuid pid = orig.GetKey(i);
+		int q;
+		if(ms.Find(pid) >= 0)
+			op.cs.Add(pid, pid);
+		else
+		if(matchname && (q = FindStyleWithName(style, orig[i].name)) >= 0)
+			op.cs.Add(pid, style.GetKey(q));
+		else
+		if(addmissing) {
+			SetStyle(pid, orig[i]);
+			op.cs.Add(pid, pid);
+		}
+	}
+
+	Update(op);
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/RichText/TextTable.cpp b/uppsrc/RichText/TextTable.cpp
new file mode 100644
index 000000000..93004e5b7
--- /dev/null
+++ b/uppsrc/RichText/TextTable.cpp
@@ -0,0 +1,225 @@
+#include "RichText.h"
+
+NAMESPACE_UPP
+
+RichTable::Format RichText::GetTableFormat(int table) const
+{
+	return GetConstTable(table).GetFormat();
+}
+
+void RichText::SetTableFormat(int table, const RichTable::Format& fmt)
+{
+	RichTable& tab = GetUpdateTable(table);
+	tab.SetFormat(fmt);
+	tab.Normalize();
+}
+
+int  RichText::SetTable(int pos, const RichTable& table)
+{
+	RefreshAll();
+	RichPos p = GetRichPos(pos);
+	int bpos = pos;
+	RichTxt& txt = GetUpdateText(pos);
+	int pi = txt.FindPart(pos);
+	ASSERT(pos == 0 && txt.GetPartLength(pi) == 0 && txt.IsPara(pi));
+	RichTable pt(table, 1);
+	txt.SetPick(pi, pt);
+	return GetRichPos(bpos).table;
+}
+
+RichTable RichText::CopyTable(int table) const
+{
+	RichTable tab(GetConstTable(table), 1);
+	return tab;
+}
+
+void RichText::ReplaceTable(int table, const RichTable& tab)
+{
+	(GetUpdateTable(table) <<= tab).Normalize();
+	RefreshAll();
+}
+
+void      RichText::DestroyTable(int table)
+{
+	int pi;
+	RichTxt& txt = GetTableUpdateText(table, style, pi);
+	RichPara p;
+	txt.Set(pi, p, style);
+	RefreshAll();
+}
+
+void RichText::RemoveParaSpecial(int table, bool before)
+{
+	int pi;
+	RichTxt& txt = GetTableUpdateText(table, style, pi);
+	if(before)
+		pi--;
+	else
+		pi++;
+	ASSERT(txt.IsPara(pi) && txt.GetPartLength(pi) == 0);
+	txt.part.Remove(pi);
+	RefreshAll();
+}
+
+bool RichText::CanRemoveParaSpecial(int table, bool before)
+{
+	int pi;
+	if(!table)
+		return false;
+	RichTxt& txt = GetTableUpdateText(table, style, pi);
+	if(before)
+		pi--;
+	else
+		pi++;
+	return pi >= 0 && pi < txt.GetPartCount() && txt.IsPara(pi) && txt.GetPartLength(pi) == 0;
+}
+
+bool RichText::ShouldInsertParaSpecial(int table, bool before)
+{
+	int pi;
+	RichTxt& txt = GetTableUpdateText(table, style, pi);
+	if(!before)
+		pi++;
+	return pi == 0 || pi >= txt.GetPartCount() || txt.IsTable(pi);
+}
+
+
+void RichText::InsertParaSpecial(int table, bool before, const RichPara::Format& fmt)
+{
+	int pi;
+	RichTxt& txt = GetTableUpdateText(table, style, pi);
+	if(!before)
+		pi++;
+	txt.RefreshAll();
+	txt.part.Insert(pi);
+	RichPara p;
+	p.format = fmt;
+	txt.Set(pi, p, style);
+	RefreshAll();
+}
+
+RichTable RichText::CopyTable(int table, const Rect& sel) const
+{
+	return GetConstTable(table).Copy(sel);
+}
+
+Point RichText::GetMasterCell(int table, int row, int column)
+{
+	return GetConstTable(table).GetMasterCell(row, column);
+}
+
+void  RichText::PasteTable(int table, Point pos, const RichTable& tab)
+{
+	GetUpdateTable(table).Paste(pos, tab);
+	RefreshAll();
+}
+
+void  RichText::InsertTableRow(int table, int row)
+{
+	GetUpdateTable(table).InsertRow(row, style);
+	RefreshAll();
+}
+
+void  RichText::RemoveTableRow(int table, int row)
+{
+	GetUpdateTable(table).RemoveRow(row);
+	RefreshAll();
+}
+
+void  RichText::InsertTableColumn(int table, int column)
+{
+	GetUpdateTable(table).InsertColumn(column, style);
+	RefreshAll();
+}
+
+void  RichText::RemoveTableColumn(int table, int column)
+{
+	GetUpdateTable(table).RemoveColumn(column);
+	RefreshAll();
+}
+
+void  RichText::SplitCell(int table, Point cell, Size sz)
+{
+	GetUpdateTable(table).SplitCell(cell, sz, style);
+	RefreshAll();
+}
+
+void  RichText::JoinCell(int table, const Rect& sel)
+{
+	RichTable& tab = GetUpdateTable(table);
+	RichCell& cell = tab[sel.top][sel.left];
+	cell.vspan = sel.bottom - sel.top;
+	cell.hspan = sel.right - sel.left;
+	for(int i = sel.top; i <= sel.bottom; i++)
+		for(int j = sel.left; j <= sel.right; j++) {
+			if(tab(i, j) && (i != sel.top || j != sel.left)) {
+				RichTxt& t = tab[i][j].text;
+				for(int pi = 0; pi < t.GetPartCount(); pi++)
+					if(t.IsTable(pi))
+						cell.text.CatPick(t.part[pi].Get<RichTable>());
+					else
+					if(pi < t.GetPartCount() - 1 || t.GetPartLength(pi))
+						cell.text.Cat(t.Get(pi, style), style);
+				tab[i][j].ClearText();
+			}
+		}
+	tab.Normalize();
+	RefreshAll();
+}
+
+RichCell::Format RichText::GetCellFormat(int table, const Rect& sel) const
+{
+	return GetConstTable(table).GetCellFormat(sel);
+}
+
+void RichText::SetCellFormat(int table, const Rect& sel, const RichCell::Format& fmt, bool setkeep)
+{
+	GetUpdateTable(table).SetCellFormat(sel, fmt, setkeep);
+	RefreshAll();
+}
+
+void RichText::ClearTable(int table, const Rect& sel)
+{
+	RichTable& tab = GetUpdateTable(table);
+	for(int i = sel.top; i <= sel.bottom; i++)
+		for(int j = sel.left; j <= sel.right; j++) {
+			if(tab(i, j)) {
+				tab.InvalidateRefresh(i, j);
+				tab[i][j].ClearText(tab[i][j].text.GetFirstFormat(style), style);
+			}
+		}
+	tab.Normalize();
+	RefreshAll();
+}
+
+RichText::FormatInfo RichText::GetTableFormatInfo(int table, const Rect& sel) const
+{
+	const RichTable& tab = GetConstTable(table);
+	bool first = true;
+	FormatInfo fi;
+	for(int i = sel.top; i <= sel.bottom; i++)
+		for(int j = sel.left; j <= sel.right; j++) {
+			if(tab(i, j)) {
+				const RichTxt& txt = tab[i][j].text;
+				txt.CombineFormat(fi, 0, txt.GetPartCount(), first, style);
+			}
+		}
+	return fi;
+}
+
+void       RichText::ApplyTableFormatInfo(int table, const Rect& sel, const RichText::FormatInfo& fi)
+{
+	RichTable& tab = GetUpdateTable(table);
+	for(int i = sel.top; i <= sel.bottom; i++)
+		for(int j = sel.left; j <= sel.right; j++) {
+			if(tab(i, j)) {
+				tab.InvalidateRefresh(i, j);
+				RichTxt& txt = tab[i][j].text;
+				txt.ApplyFormat(fi, 0, txt.GetPartCount(), style);
+			}
+		}
+	tab.Normalize();
+	RefreshAll();
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/RichText/Txt.h b/uppsrc/RichText/Txt.h
new file mode 100644
index 000000000..807f77c88
--- /dev/null
+++ b/uppsrc/RichText/Txt.h
@@ -0,0 +1,239 @@
+class RichTxt : DeepCopyOption<RichTxt> {
+public:
+	enum {
+		BOLD       = 0x00000001,
+		ITALIC     = 0x00000002,
+		UNDERLINE  = 0x00000004,
+		FACE       = 0x00000008,
+		HEIGHT     = 0x00000010,
+		LANGUAGE   = 0x00000020,
+		INK        = 0x00000040,
+		PAPER      = 0x00000080,
+		LINK       = 0x00000100,
+		SSCRIPT    = 0x00000200,
+		CAPITALS   = 0x00000400,
+		STRIKEOUT  = 0x00000800,
+		LANG       = 0x00001000,
+		INDEXENTRY = 0x00002000,
+		DASHED     = 0x00004000,
+	};
+
+	enum {
+		ALIGN     = 0x80000000,
+		BEFORE    = 0x40000000,
+		LM        = 0x20000000,
+		INDENT    = 0x10000000,
+		RM        = 0x08000000,
+		AFTER     = 0x04000000,
+		TABSIZE   = 0x02000000,
+		BULLET    = 0x01000000,
+		NEWPAGE   = 0x00800000,
+		KEEP      = 0x00400000,
+		TABS      = 0x00200000,
+		STYLE     = 0x00100000,
+		LABEL     = 0x00080000,
+		KEEPNEXT  = 0x00040000,
+		ORPHAN    = 0x00020000,
+		NUMBERING = 0x00010000,
+		SPACING   = 0x00008000,
+	};
+
+	struct FormatInfo : RichPara::Format {
+		dword charvalid;
+		dword paravalid;
+
+		void  Set(const RichPara::Format& fmt);
+		void  Set(const RichPara::CharFormat& fmt);
+		void  Combine(const RichPara::CharFormat& fmt);
+		void  Combine(const RichPara::Format& fmt);
+		void  Combine(const FormatInfo& fmt);
+		void  ApplyTo(RichPara::CharFormat& fmt) const;
+		void  ApplyTo(RichPara::Format& fmt) const;
+	};
+
+	class Formating {
+		Vector<Uuid>    styleid;
+		Vector<String>  format;
+		friend class RichText;
+		friend class RichTxt;
+	};
+
+protected:
+	struct Para : DeepCopyOption<Para> {
+		Uuid                  styleid;
+		int                   length;
+		String                content;
+		Array<RichObject>     object;
+		mutable int           cx;
+		mutable int           cy;
+		mutable int           before;
+		mutable Vector<int>   linecy;
+		mutable int           after;
+		mutable bool          newpage;
+		mutable bool          keep;
+		mutable bool          keepnext;
+		mutable bool          orphan;
+		mutable int           numbering;
+		mutable Bits          spellerrors;
+		mutable bool          checked;
+		mutable bool          haspos;
+		One<RichPara::NumberFormat> number;
+
+		Para(const Para& src, int);
+		Para() { length = 0; cx = -1; numbering = -1; checked = false; haspos = false; }
+	};
+
+	struct Part : MoveableAndDeepCopyOption< Part, Any> {
+		Part(const Part& src, int);
+		Part();
+	};
+
+	Vector<Part>           part;
+	mutable int            length;
+	mutable int            tabcount;
+	mutable Rect           rect;
+	mutable Vector<PageY>  py;
+
+	enum {
+		NONE, SPARA, PARA, FROM, ALL
+	};
+
+	int  r_type;
+	int  r_parti;
+	int  r_paraocx;
+	int  r_paraocy;
+	bool r_keep;
+	bool r_keepnext;
+	bool r_newpage;
+
+	void       Init();
+
+	void       Invalidate();
+
+	void       SetRefresh(int parai);
+	void       SetRefreshFrom(int parai);
+	void       RefreshAll()                   { SetRefreshFrom(0); }
+
+	void       ParaRemove(int parai, int pos, int count);
+	void       ParaInsert(int parai, int pos, const RichPara& p);
+	RichPara   ParaCopy(int parai, int pos, int count) const;
+
+	void       Put(int i, const RichPara& p, const RichStyle& s);
+	void       Put(int i, const RichPara& p, const RichStyles& s);
+	int        GetPartLength(int pi) const;
+	int        FindPart(int& pos) const;
+	int        GetPartPos(int pi) const;
+
+	void        Sync0(const Para& pp, int parti, const RichContext& rc) const;
+	inline void Sync(int parti, const RichContext& rc) const {
+		int cx = rc.page.Width();
+		ASSERT(part[parti].Is<Para>());
+		const Para& pp = part[parti].Get<Para>();
+		if(pp.cx == cx) return;
+		Sync0(pp, parti, rc);
+	}
+	bool        BreaksPage(PageY py, const Para& pp, int i, const Rect& page) const;
+	PageY       GetNextPageY(int parti, const RichContext& rc) const;
+	PageY       GetPartPageY(int parti, RichContext rc) const;
+
+	struct ParaOp {
+		virtual bool operator()(RichTxt::Para& p) = 0;
+		virtual ~ParaOp() {}
+	};
+	bool             Update(ParaOp& op);
+	RichTxt&         GetText0(int& pos, bool update);
+	RichTxt&         GetUpdateText(int& pos);
+	const RichTxt&   GetConstText(int& pos) const;
+	RichTable&       GetTable0(int table, bool update);
+	RichTable&       GetUpdateTable(int table);
+	const RichTable& GetConstTable(int table) const;
+	RichTxt&         GetTableUpdateText(int table, const RichStyles& style, int& pi);
+
+	void        CombineFormat(FormatInfo& f, int pi, int pi2, bool& first, const RichStyles& style) const;
+	static void Apply(const FormatInfo& fi, RichPara& pa);
+	void        ApplyFormat(const FormatInfo& f, int pi, int pi2, const RichStyles& style);
+	void        SaveFormat(Formating& f, int p1, int p2, const RichStyles& style) const;
+	void        RestoreFormat(int pi, const Formating& info, int& ii, const RichStyles& style);
+
+	void        GetAllLanguages(Index<int>& all) const;
+
+	friend class RichTable;
+	friend class RichText;
+	friend class RichCell;
+
+	int                   ComputeLength() const;
+
+	void                  GetRichPos(int pos, RichPos& rp, int ti, int maxlevel, const RichStyles& st) const;
+	RichPara::Format      GetFirstFormat(const RichStyles& st) const;
+
+	PageY                 GetTop(RichContext rc) const;
+	PageY                 GetHeight(RichContext rc) const;
+	int                   GetWidth(const RichStyles& st) const;
+	void                  Paint(PageDraw& w, RichContext rc, const PaintInfo& pi) const;
+	RichCaret             GetCaret(int pos, RichContext rc) const;
+	int                   GetPos(int x, PageY y, RichContext rc) const;
+	int                   GetVertMove(int pos, int gx, RichContext rc, int dir) const;
+	RichHotPos            GetHotPos(int x, PageY y, int tolerance, RichContext rc) const;
+
+	void                  GatherValPos(Vector<RichValPos>& f, RichContext rc, int pos, int type) const;
+
+	bool                  EvaluateFields(const RichStyles& s, VectorMap<String, Value>& vars);
+
+	void                  ApplyZoom(Zoom z, const RichStyles& ostyle, const RichStyles& zstyle);
+
+public:
+	enum ValPosType { LABELS, INDEXENTRIES };
+
+	RichPara              Get(int i, const RichStyles& s) const;
+	RichPara              Get(int i, const Uuid& styleid, const RichStyles& s) const;
+	RichPara              Get(int i, const RichStyle& style) const;
+	Uuid                  GetParaStyle(int i) const            { return part[i].Get<Para>().styleid; }
+	void                  SetParaStyle(int i, const Uuid& si);
+
+	int                   GetPartCount() const                 { return part.GetCount(); }
+	bool                  IsPara(int i) const                  { return part[i].Is<Para>(); }
+	bool                  IsTable(int i) const;
+	const RichTable&      GetTable(int i) const;
+
+	int                   GetLength() const;
+	int                   GetTableCount() const;
+	bool                  IsEmpty() const;
+
+	RichCellPos           GetCellPos(int table, int row, int column) const;
+	RichCellPos           GetCellPos(int table, Point p) const;
+
+	void                  Clear();
+
+	void                  ClearSpelling();
+
+	void                  SetPick(int parti, pick_ RichTable& table);
+	void                  CatPick(pick_ RichTable& table)             { SetPick(GetPartCount(), table); }
+	void                  Set(int parai, const RichPara& p, const RichStyles& s);
+	void                  Insert(int parai, const RichPara& p, const RichStyles& s);
+	void                  Cat(const RichPara& p, const RichStyles& s) { Set(GetPartCount(), p, s); }
+
+	void                  Normalize();
+
+	Vector<int>           GetAllLanguages() const;
+	WString               GetPlainText() const;
+
+	struct UpdateIterator {
+		enum { CONTINUE = 0, STOP = 1, UPDATE = 2 };
+		virtual int operator()(int pos, RichPara& para) = 0;
+		virtual ~UpdateIterator() {}
+	};
+	bool                  Iterate(UpdateIterator& r, int gpos, const RichStyles& s);
+
+	struct Iterator {
+		virtual bool operator()(int pos, const RichPara& para) = 0;
+		virtual ~Iterator() {}
+	};
+	bool                  Iterate(Iterator& r, int gpos, const RichStyles& s) const;
+
+	RichTxt(const RichTxt& src, int);
+	RichTxt();
+
+#ifdef _DEBUG
+	void                  Dump();
+#endif
+};
diff --git a/uppsrc/RichText/TxtData.cpp b/uppsrc/RichText/TxtData.cpp
new file mode 100644
index 000000000..dcd3fbdcb
--- /dev/null
+++ b/uppsrc/RichText/TxtData.cpp
@@ -0,0 +1,466 @@
+#include "RichText.h"
+
+NAMESPACE_UPP
+
+RichTxt::Para::Para(const Para& src, int)
+: object(src.object, 1)
+{
+	length = src.length;
+	styleid = src.styleid;
+	content = src.content;
+	haspos = src.haspos;
+	if(src.number)
+		number = new RichPara::NumberFormat(*src.number);
+	cx = -1;
+	checked = false;
+}
+
+RichTxt::Part::Part(const Part& src, int) {
+	if(src.Is<Para>())
+		Create<Para>() <<= src.Get<Para>();
+	else
+		Create<RichTable>() <<= src.Get<RichTable>();
+}
+
+RichTxt::Part::Part() {}
+
+void RichTxt::Invalidate()
+{
+	length = -1;
+	tabcount = -1;
+	py.Clear();
+}
+
+int RichTxt::GetPartLength(int pi) const
+{
+	return part[pi].Is<RichTable>() ? part[pi].Get<RichTable>().GetLength() : part[pi].Get<Para>().length;
+}
+
+bool             RichTxt::IsTable(int i) const  { return part[i].Is<RichTable>(); }
+const RichTable& RichTxt::GetTable(int i) const { return part[i].Get<RichTable>(); }
+
+
+int RichTxt::FindPart(int& pos) const
+{
+	int pi = 0;
+	while(pi < part.GetCount()) {
+		int l = GetPartLength(pi) + 1;
+		if(pos < l)
+			break;
+		pos -= l;
+		pi++;
+	}
+	if(pi >= part.GetCount())
+		pos = 0;
+	return pi;
+}
+
+int  RichTxt::GetPartPos(int pi) const
+{
+	int pos = 0;
+	for(int i = 0; i < pi; i++)
+		pos += GetPartLength(i) + 1;
+	return pos;
+}
+
+void RichTxt::SetRefresh(int parti)
+{
+	switch(r_type) {
+	case NONE:
+		r_parti = parti;
+		r_type = PARA;
+		if(IsPara(parti)) {
+			Para& pp = part[parti].Get<Para>();
+			if(pp.cx >= 0) {
+				r_paraocx = pp.cx;
+				r_paraocy = Sum(pp.linecy, 0) + pp.before + pp.after;
+				r_keep = pp.keep;
+				r_keepnext = pp.keepnext;
+				r_newpage = pp.newpage;
+				break;
+			}
+			else
+				r_type = FROM;
+		}
+		break;
+	case PARA:
+		if(parti == r_parti) break;
+	case FROM:
+		r_parti = min(parti, r_parti);
+		r_type = FROM;
+		break;
+	}
+}
+
+void RichTxt::SetRefreshFrom(int parti)
+{
+	r_type = FROM;
+	if(r_type == NONE)
+		r_parti = parti;
+	else
+		r_parti = min(parti, r_parti);
+}
+
+void RichTxt::Put(int i, const RichPara& p, const RichStyle& s)
+{
+	if(i >= part.GetCount() || !IsPara(i))
+		part.At(i).Create<Para>();
+	Para& pp = part[i].Get<Para>();
+	int numbering = p.format.GetNumberLevel();
+	if(pp.numbering != numbering)
+		SetRefreshFrom(i);
+	else
+		SetRefresh(i);
+	pp.number.Clear();
+	pp.content = p.Pack(s.format, pp.object);
+	pp.cx = -1;
+	pp.checked = false;
+	pp.styleid = p.format.styleid;
+	pp.length = p.GetLength();
+	pp.numbering = numbering;
+	pp.spellerrors.Clear();
+	pp.haspos = p.HasPos();
+	if(numbering >= 0 || p.format.reset_number) {
+		pp.number = new RichPara::NumberFormat;
+		*pp.number = p.format;
+	}
+}
+
+void RichTxt::Put(int i, const RichPara& p, const RichStyles& s)
+{
+	Put(i, p, GetStyle(s, p.format.styleid));
+}
+
+void RichTxt::Set(int i, const RichPara& p, const RichStyles& s)
+{
+	Put(i, p, s);
+	Invalidate();
+}
+
+void RichTxt::Insert(int i, const RichPara& p, const RichStyles& s)
+{
+	part.Insert(i);
+	Set(i, p, s);
+}
+
+void RichTxt::SetPick(int i, pick_ RichTable& p)
+{
+	const_cast<RichTable&>(p).Normalize();
+	part.At(i).Create<RichTable>() = p;
+	Invalidate();
+	SetRefresh(i);
+}
+
+RichPara RichTxt::Get(int parai, const RichStyle& style) const
+{
+	ASSERT(part[parai].Is<Para>());
+	const Para& pp = part[parai].Get<Para>();
+	RichPara p;
+	p.Unpack(pp.content, pp.object, style.format);
+	return p;
+}
+
+RichPara RichTxt::Get(int parai, const Uuid& styleid, const RichStyles& s) const
+{
+	RichPara p = Get(parai, GetStyle(s, styleid));
+	p.format.styleid = styleid;
+	return p;
+}
+
+RichPara RichTxt::Get(int parti, const RichStyles& s) const
+{
+	return Get(parti, part[parti].Get<Para>().styleid, s);
+}
+
+bool RichTxt::IsEmpty() const
+{
+	return part.IsEmpty() || part.GetCount() == 1 && ComputeLength() == 0;
+}
+
+int RichTxt::ComputeLength() const
+{
+	int length = part.GetCount() - 1;
+	for(int i = 0; i < part.GetCount(); i++)
+		length += GetPartLength(i);
+	return length;
+}
+
+int RichTxt::GetLength() const
+{
+	if(length < 0)
+		length = ComputeLength();
+	return length;
+}
+
+int  RichTxt::GetTableCount() const
+{
+	if(tabcount < 0) {
+		tabcount = 0;
+		for(int i = 0; i < part.GetCount(); i++)
+			if(IsTable(i))
+				tabcount += GetTable(i).GetTableCount() + 1;
+	}
+	return tabcount;
+}
+
+bool RichTxt::EvaluateFields(const RichStyles& s, VectorMap<String, Value>& vars)
+{
+	bool b = false;
+	for(int i = 0; i < part.GetCount(); i++)
+		if(IsTable(i)) {
+			RichTable& tab = part[i].Get<RichTable>();
+			for(int i = 0; i < tab.GetRows(); i++)
+				for(int j = 0; j < tab.GetColumns(); j++)
+					if(tab(i, j) && tab[i][j].text.EvaluateFields(s, vars)) {
+						tab.InvalidateRefresh(i, j);
+						b = true;
+					}
+		}
+		else {
+			RichPara p = Get(i, s);
+			if(p.EvaluateFields(vars)) {
+				b = true;
+				Set(i, p, s);
+			}
+		}
+	return b;
+}
+
+void RichTxt::ClearSpelling()
+{
+	for(int i = 0; i < part.GetCount(); i++) {
+		if(IsTable(i)) {
+			RichTable& tab = part[i].Get<RichTable>();
+			for(int i = 0; i < tab.GetRows(); i++)
+				for(int j = 0; j < tab.GetColumns(); j++)
+					if(tab(i, j)) {
+						tab[i][j].text.ClearSpelling();
+						tab.InvalidateRefresh(i, j);
+					}
+		}
+		else {
+			Para& p = part[i].Get<Para>();
+			p.spellerrors.Clear();
+			p.checked = false;
+		}
+	}
+}
+
+void RichTxt::SetParaStyle(int i, const Uuid& id)
+{
+	ASSERT(IsPara(i));
+	Para& p = part[i].Get<Para>();
+	p.styleid = id;
+	p.cx = -1;
+	SetRefreshFrom(i);
+}
+
+void RichTxt::GetRichPos(int pos, RichPos& rp, int ti, int maxlevel, const RichStyles& st) const
+{
+	int p = pos;
+	int pti = ti;
+	for(int i = 0; i < part.GetCount(); i++) {
+		int l = GetPartLength(i) + 1;
+		if(pos < l) {
+			if(IsTable(i)) {
+				const RichTable& tab = GetTable(i);
+				rp.level++;
+				rp.tabtextparti = i;
+				rp.tabtextpartcount = part.GetCount();
+				rp.tabtextlen = GetLength();
+				rp.tabposintabtext = p - pos;
+				rp.posintab = pos;
+				rp.cell = tab.FindCell(pos);
+				rp.posincell = pos;
+				rp.tabsize = tab.GetSize();
+				rp.tablen = tab.GetLength();
+				const RichTxt& ct = tab[rp.cell].text;
+				rp.celllen = ct.GetLength();
+				rp.parenttab = pti;
+				rp.table = ti + 1;
+				if(rp.level < maxlevel)
+					ct.GetRichPos(pos, rp, ti + 1 + tab.GetTableCount(rp.cell), maxlevel, st);
+				return;
+			}
+			else {
+				rp.posinpara = pos;
+				rp.parai = i;
+				rp.partcount = part.GetCount();
+				rp.paralen = l - 1;
+				Get(i, st).GetRichPos(rp, pos);
+				return;
+			}
+		}
+		pos -= l;
+		if(IsTable(i))
+			ti += 1 + GetTable(i).GetTableCount();
+	}
+	rp.parai = part.GetCount();
+	rp.posinpara = 0;
+	rp.partcount = part.GetCount();
+	rp.paralen = 0;
+}
+
+RichPara::Format RichTxt::GetFirstFormat(const RichStyles& style) const
+{
+	if(IsTable(0)) {
+		const RichTable& tab = GetTable(0);
+		return tab[0][0].text.GetFirstFormat(style);
+	}
+	RichPos rp;
+	Get(0, style).GetRichPos(rp, 0);
+	return rp.format;
+}
+
+RichCellPos RichTxt::GetCellPos(int table, int row, int column) const
+{
+	int pos = 0;
+	for(int i = 0;; i++) {
+		if(IsTable(i)) {
+			table--;
+			const RichTable& tab = part[i].Get<RichTable>();
+			if(table <= tab.GetTableCount()) {
+				if(table == 0) {
+					RichCellPos p;
+					p.tabsize = tab.GetSize();
+					p.tablen = tab.GetLength();
+					p.cellpos = tab.GetCellPos(row, column);
+					p.pos = p.tabpos = pos;
+					p.pos += p.cellpos;
+					p.textlen = GetLength();
+					p.level = 1;
+					return p;
+				}
+				for(int i = 0; i < tab.GetRows(); i++)
+					for(int j = 0; j < tab.GetColumns(); j++)
+						if(tab(i, j)) {
+							const RichTxt& txt = tab[i][j].text;
+							if(table <= txt.GetTableCount()) {
+								RichCellPos p = txt.GetCellPos(table, row, column);
+								p.pos += pos + tab.GetCellPos(i, j);
+								p.level++;
+								return p;
+							}
+							table -= txt.GetTableCount();
+						}
+				NEVER();
+			}
+			else
+				table -= tab.GetTableCount();
+		}
+		pos += GetPartLength(i) + 1;
+	}
+	NEVER();
+	return RichCellPos();
+}
+
+RichCellPos RichTxt::GetCellPos(int table, Point p) const
+{
+	return GetCellPos(table, p.y, p.x);
+}
+
+bool RichTxt::Iterate(UpdateIterator& r, int gpos, const RichStyles& s)
+{
+	for(int pi = 0; pi < part.GetCount(); pi++)
+		if(IsTable(pi)) {
+			RichTable& tab = part[pi].Get<RichTable>();
+			for(int i = 0; i < tab.GetRows(); i++)
+				for(int j = 0; j < tab.GetColumns(); j++)
+					if(tab(i, j)) {
+						if(tab[i][j].text.Iterate(r, gpos, s))
+							return true;
+						gpos += tab[i][j].text.GetLength() + 1;
+					}
+		}
+		else {
+			RichPara p = Get(pi, s);
+			int q = r(gpos, p);
+			if(q & UpdateIterator::UPDATE)
+				Set(pi, p, s);
+			if(q & UpdateIterator::STOP)
+				return true;
+			gpos += GetPartLength(pi) + 1;
+		}
+	return false;
+}
+
+struct sIter__ : RichTxt::UpdateIterator {
+	RichTxt::Iterator *iter;
+	virtual int operator()(int pos, RichPara& para) {
+		return iter->operator()(pos, para) ? STOP : CONTINUE;
+	}
+};
+
+bool RichTxt::Iterate(Iterator& r, int gpos, const RichStyles& s) const
+{
+	sIter__ it;
+	it.iter = &r;
+	return const_cast<RichTxt *>(this)->Iterate(it, gpos, s);
+}
+
+void RichTxt::Init()
+{
+	r_type = ALL;
+	r_parti = 0;
+	tabcount = length = 0;
+}
+
+void RichTxt::Clear()
+{
+	part.Clear();
+	Init();
+}
+
+RichTxt::RichTxt()
+{
+	Init();
+}
+
+RichTxt::RichTxt(const RichTxt& src, int)
+{
+	Init();
+	part <<= src.part;
+	length = src.length;
+	tabcount = src.tabcount;
+	py.Clear();
+}
+
+#ifdef _DEBUG
+
+#define DMP(x)   s << #x << "=" << x << ", "
+
+String RichPos::ToString() const
+{
+	String s;
+	DMP(tabtextparti);
+	DMP(tabtextpartcount);
+	DMP(tabposintabtext);
+	DMP(tabtextlen);
+	DMP(table);
+	DMP(tabsize);
+	DMP(cell);
+	DMP(tablen);
+	DMP(posintab);
+	DMP(celllen);
+	DMP(posincell);
+	DMP(parai);
+	DMP(partcount);
+	DMP(posinpara);
+	DMP(paralen);
+	DMP(level);
+	DMP(parenttab);
+	s << "char: " << (char)chr;
+	return s;
+}
+
+String RichCellPos::ToString() const
+{
+	String s;
+	s << "pos: " << pos << ", textlen: " << textlen << ", size: " << tabsize << ", tabpos: " << tabpos
+	  << ", tablen: " << tablen << ", cellpos: " << cellpos << ", celllen: " << celllen << ", level: " << level;
+	return s;
+}
+
+#endif
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/RichText/TxtOp.cpp b/uppsrc/RichText/TxtOp.cpp
new file mode 100644
index 000000000..4f8696b71
--- /dev/null
+++ b/uppsrc/RichText/TxtOp.cpp
@@ -0,0 +1,346 @@
+#include "RichText.h"
+
+NAMESPACE_UPP
+
+void RichTxt::GetAllLanguages(Index<int>& all) const
+{
+	for(int i = 0; i < part.GetCount(); i++) {
+		if(IsTable(i)) {
+			const RichTable& tab = part[i].Get<RichTable>();
+			for(int i = 0; i < tab.GetRows(); i++)
+				for(int j = 0; j < tab.GetColumns(); j++)
+					if(tab(i, j))
+						tab[i][j].text.GetAllLanguages(all);
+		}
+		else {
+			RichPara p = Get(i, RichStyle::GetDefault());
+			all.FindAdd(p.format.language);
+			for(int i = 0; i < p.GetCount(); i++)
+				all.FindAdd(p[i].format.language);
+		}
+	}
+}
+
+Vector<int> RichTxt::GetAllLanguages() const
+{
+	Index<int> all;
+	GetAllLanguages(all);
+	return all.PickKeys();
+}
+
+bool RichTxt::Update(ParaOp& op)
+{
+	bool val = false;
+	for(int i = 0; i < part.GetCount(); i++)
+		if(IsTable(i)) {
+			RichTable& tab = part[i].Get<RichTable>();
+			for(int i = 0; i < tab.GetRows(); i++)
+				for(int j = 0; j < tab.GetColumns(); j++)
+					if(tab(i, j))
+						if(tab[i][j].text.Update(op)) {
+							tab.InvalidateRefresh(i, j);
+							val = true;
+						}
+		}
+		else
+		if(op(part[i].Get<Para>()))
+			val = true;
+	RefreshAll();
+	return val;
+}
+
+RichTxt& RichTxt::GetText0(int& pos, bool update)
+{
+	if(update)
+		Invalidate();
+	int p = pos;
+	int pi = FindPart(p);
+	if(IsTable(pi)) {
+		RichTable& tab = part[pi].Get<RichTable>();
+		Point cl = tab.FindCell(p);
+		if(update) {
+			tab.InvalidateRefresh(cl);
+			SetRefresh(pi);
+		}
+		pos = p;
+		return tab[cl].text.GetText0(pos, update);
+	}
+	return *this;
+}
+
+RichTxt& RichTxt::GetUpdateText(int& pos)
+{
+	return GetText0(pos, true);
+}
+
+const RichTxt& RichTxt::GetConstText(int& pos) const
+{
+	return const_cast<RichTxt *>(this)->GetText0(pos, false);
+}
+
+RichTable& RichTxt::GetTable0(int table, bool update)
+{
+	if(update)
+		Invalidate();
+	for(int i = 0;; i++)
+		if(IsTable(i)) {
+			table--;
+			RichTable& tab = part[i].Get<RichTable>();
+			if(table <= tab.GetTableCount()) {
+				if(update)
+					SetRefresh(i);
+				if(table == 0)
+					return tab;
+				for(int i = 0; i < tab.GetRows(); i++)
+					for(int j = 0; j < tab.GetColumns(); j++)
+						if(tab(i, j)) {
+							RichTxt& txt = tab[i][j].text;
+							if(table <= txt.GetTableCount()) {
+								if(update)
+									tab.InvalidateRefresh(i, j);
+								return txt.GetTable0(table, update);
+							}
+							table -= txt.GetTableCount();
+						}
+				NEVER();
+			}
+			else
+				table -= tab.GetTableCount();
+		}
+}
+
+RichTable& RichTxt::GetUpdateTable(int table)
+{
+	return GetTable0(table, true);
+}
+
+const RichTable& RichTxt::GetConstTable(int table) const {
+	return const_cast<RichTxt *>(this)->GetTable0(table, false);
+}
+
+void RichTxt::CombineFormat(FormatInfo& fi, int pi, int pi2, bool& first, const RichStyles& style) const
+{
+	while(pi < pi2) {
+		if(IsTable(pi)) {
+			const RichTable& tab = part[pi].Get<RichTable>();
+			for(int i = 0; i < tab.GetRows(); i++)
+				for(int j = 0; j < tab.GetColumns(); j++)
+					if(tab(i, j)) {
+						const RichTxt& txt = tab[i][j].text;
+						txt.CombineFormat(fi, 0, txt.GetPartCount(), first, style);
+					}
+		}
+		else {
+			RichPara pa = Get(pi, style);
+			if(first) {
+				fi.Set(pa.format);
+				if(pa.GetCount())
+					fi.Set(pa[0].format);
+				first = false;
+			}
+			else
+				fi.Combine(pa.format);
+			for(int i = first; i < pa.GetCount(); i++)
+				fi.Combine(pa[i].format);
+		}
+		pi++;
+	}
+}
+
+void RichTxt::Apply(const RichText::FormatInfo& fi, RichPara& pa)
+{
+	for(int i = 0; i < pa.GetCount(); i++)
+		fi.ApplyTo(pa[i].format);
+	fi.ApplyTo(pa.format);
+}
+
+void RichTxt::ApplyFormat(const FormatInfo& fi, int pi, int pi2, const RichStyles& style)
+{
+	while(pi < pi2) {
+		if(IsTable(pi)) {
+			RichTable& tab = part[pi].Get<RichTable>();
+			for(int i = 0; i < tab.GetRows(); i++)
+				for(int j = 0; j < tab.GetColumns(); j++)
+					if(tab(i, j)) {
+						RichTxt& txt = tab[i][j].text;
+						tab.InvalidateRefresh(i, j);
+						txt.ApplyFormat(fi, 0, txt.GetPartCount(), style);
+					}
+		}
+		else {
+			RichPara pa;
+			if(fi.paravalid & RichText::STYLE)
+				pa = RichTxt::Get(pi, fi.styleid, style);
+			else
+				pa = Get(pi, style);
+			Apply(fi, pa);
+			Put(pi, pa, style);
+		}
+		pi++;
+	}
+}
+
+void RichTxt::SaveFormat(Formating& r, int p1, int p2, const RichStyles& style) const
+{
+	Array<RichObject> dummy;
+	for(int i = p1; i <= p2; i++)
+		if(IsTable(i)) {
+			const RichTable& tab = part[i].Get<RichTable>();
+			for(int i = 0; i < tab.GetRows(); i++)
+				for(int j = 0; j < tab.GetColumns(); j++)
+					if(tab(i, j)) {
+						const RichTxt& txt = tab[i][j].text;
+						txt.SaveFormat(r, 0, txt.GetPartCount() - 1, style);
+					}
+		}
+		else {
+			RichPara pa = Get(i, style);
+			for(int i = 0; i < pa.GetCount(); i++) {
+				RichPara::Part& p = pa[i];
+				int q = p.GetLength();
+				p.field = Id();
+				p.object = RichObject();
+				WString h;
+				while(q) {
+					int c = min(q, 50000);
+					h.Cat(c + 32);
+					q -= c;
+				}
+				p.text = h;
+			}
+			r.styleid.Add(pa.format.styleid);
+			r.format.Add(pa.Pack(GetStyle(style, pa.format.styleid).format, dummy));
+		}
+}
+
+void RichTxt::RestoreFormat(int pi, const Formating& info, int& ii, const RichStyles& style)
+{
+	Array<RichObject> dummy;
+	while(ii < info.format.GetCount() && pi < GetPartCount()) {
+		if(IsTable(pi)) {
+			RichTable& tab = part[pi].Get<RichTable>();
+			for(int i = 0; i < tab.GetRows(); i++)
+				for(int j = 0; j < tab.GetColumns(); j++) {
+					if(tab(i, j)) {
+						if(ii >= info.format.GetCount())
+							return;
+						tab.InvalidateRefresh(i, j);
+						tab[i][j].text.RestoreFormat(0, info, ii, style);
+					}
+				}
+			pi++;
+		}
+		else {
+			RichPara pa = Get(pi, style);
+			RichPara pf;
+			pf.Unpack(info.format[ii], dummy, GetStyle(style, info.styleid[ii]).format);
+			RichPara t;
+			t.format = pf.format;
+			int si = 0;
+			int sp = 0;
+			for(int j = 0; j < pf.GetCount(); j++) {
+				const RichPara::Part& q = pf[j];
+				for(int k = 0; k < q.text.GetLength(); k++) {
+					int len = q.text[k] - 32;
+					t.part.Add().format = q.format;
+					while(len) {
+						const RichPara::Part& p = pa[si];
+						if(p.IsText()) {
+							int l = min(len, p.GetLength() - sp);
+							t.part.Top().text.Cat(p.text.Mid(sp, l));
+							sp += l;
+							len -= l;
+							ASSERT(sp <= p.GetLength());
+							if(sp >= p.GetLength()) {
+								sp = 0;
+								si++;
+							}
+						}
+						else {
+							ASSERT(sp == 0);
+							(t.part.Add() = pa[si++]).format = q.format;
+							len--;
+							sp = 0;
+						}
+					}
+				}
+			}
+			ASSERT(si == pa.GetCount() && sp == 0);
+			Put(pi, t, style);
+			ii++;
+			pi++;
+		}
+	}
+}
+
+WString RichTxt::GetPlainText() const {
+	WString clip;
+	for(int pi = 0; pi < GetPartCount(); pi++) {
+		if(pi) {
+			clip.Cat('\r');
+			clip.Cat('\n');
+		}
+		if(IsTable(pi)) {
+			const RichTable& tab = part[pi].Get<RichTable>();
+			for(int i = 0; i < tab.GetRows(); i++)
+				for(int j = 0; j < tab.GetColumns(); j++)
+					if(tab(i, j)) {
+						if(i || j) {
+							clip.Cat('\r');
+							clip.Cat('\n');
+						}
+						clip << tab[i][j].text.GetPlainText();
+					}
+		}
+		else
+			clip.Cat(Get(pi, RichStyle::GetDefault()).GetText());
+	}
+	return clip;
+}
+
+RichTxt& RichTxt::GetTableUpdateText(int table, const RichStyles& style, int& pi)
+{
+	Invalidate();
+	for(int i = 0;; i++)
+		if(IsTable(i)) {
+			table--;
+			RichTable& tab = part[i].Get<RichTable>();
+			if(table <= tab.GetTableCount()) {
+				SetRefresh(i);
+				if(table == 0) {
+					pi = i;
+					return *this;
+				}
+				for(int i = 0; i < tab.GetRows(); i++)
+					for(int j = 0; j < tab.GetColumns(); j++)
+						if(tab(i, j)) {
+							RichTxt& txt = tab[i][j].text;
+							if(table <= txt.GetTableCount()) {
+								tab.InvalidateRefresh(i, j);
+								return txt.GetTableUpdateText(table, style, pi);
+							}
+							table -= txt.GetTableCount();
+						}
+				NEVER();
+			}
+			else
+				table -= tab.GetTableCount();
+		}
+	NEVER();
+}
+
+void RichTxt::Normalize()
+{
+	RichPara pa;
+	if(GetPartCount() && IsTable(0)) {
+		part.Insert(0);
+		Put(0, pa, RichStyle::GetDefault());
+		Invalidate();
+	}
+	if(GetPartCount() == 0 || IsTable(GetPartCount() - 1)) {
+		Put(GetPartCount(), pa, RichStyle::GetDefault());
+		Invalidate();
+	}
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/RichText/TxtPaint.cpp b/uppsrc/RichText/TxtPaint.cpp
new file mode 100644
index 000000000..3cbe46f85
--- /dev/null
+++ b/uppsrc/RichText/TxtPaint.cpp
@@ -0,0 +1,376 @@
+#include "RichText.h"
+
+NAMESPACE_UPP
+
+int RichTxt::GetWidth(const RichStyles& st) const
+{
+	int cx = 0;
+	for(int i = 0; i < part.GetCount(); i++) {
+		if(IsPara(i)) {
+			RichPara p = Get(i, st);
+			RichPara::Lines pl = p.FormatLines(INT_MAX);
+			int ccx = 0;
+			Sum(ccx, ~pl.width, ~pl.width + pl.clen);
+			cx = max(cx, ccx);
+		}
+		else
+			return 10000;
+	}
+	return cx;
+}
+
+
+void RichTxt::Sync0(const Para& pp, int parti, const RichContext& rc) const
+{
+	int cx = rc.page.Width();
+	pp.cx = cx;
+	RichPara p = Get(parti, rc.styles);
+	RichPara::Lines pl = p.FormatLines(cx);
+	pp.before = p.format.before;
+	pp.linecy.Clear();
+	pp.linecy.SetCount(pl.GetCount());
+	for(int i = 0; i < pl.GetCount(); i++)
+		pp.linecy[i] = pl[i].Sum();
+	pp.cy = Sum0(pp.linecy);
+	pp.after = p.format.after;
+	pp.newpage = p.format.newpage;
+	pp.keep = p.format.keep;
+	pp.keepnext = p.format.keepnext;
+	pp.orphan = p.format.orphan;
+}
+
+inline
+bool RichTxt::BreaksPage(PageY py, const Para& pp, int i, const Rect& page) const
+{
+	int linecy = pp.linecy[i];
+	if(linecy >= page.Height()) return false;
+	if(linecy + py.y > page.bottom)
+		return true;
+	if(pp.orphan || pp.linecy.GetCount() < 2) return false;
+	if((i == 0 || i == pp.linecy.GetCount() - 2) &&
+	   py.y + linecy + pp.linecy[i + 1] > page.bottom)
+		return true;
+	return false;
+}
+
+PageY RichTxt::GetNextPageY(int parti, const RichContext& rc) const
+{
+	if(part[parti].Is<RichTable>())
+		return GetTable(parti).GetHeight(rc);
+	else {
+		Sync(parti, rc);
+		const Para& pp = part[parti].Get<Para>();
+		int cy = pp.before;
+		if(pp.keep || pp.keepnext)
+			cy += pp.cy;
+		else
+			cy += pp.linecy[0];
+		PageY py = rc.py;
+		if(rc.page.Height() < 30000) {
+			int nbefore = 0;
+			int nline = 0;
+			if(pp.keepnext && parti + 1 < part.GetCount() && part[parti + 1].Is<Para>()) {
+				Sync(parti + 1, rc);
+				const Para& p = part[parti + 1].Get<Para>();
+				nbefore = p.before;
+				nline   = p.linecy[0];
+			}
+			if(pp.newpage || py.y + cy + nbefore + nline > rc.page.bottom && cy < rc.page.Height()) {
+				py.page++;
+				py.y = rc.page.top;
+			}
+			py.y += pp.before;
+			if(py.y + pp.cy < rc.page.bottom)
+				py.y += pp.cy;
+			else
+				for(int lni = 0; lni < pp.linecy.GetCount(); lni++) {
+			 		if(BreaksPage(py, pp, lni, rc.page)) {
+						py.y = rc.page.top;
+						py.page++;
+					}
+					py.y += pp.linecy[lni];
+				}
+			py.y += pp.after;
+			if(py.y > rc.page.bottom) {
+				py.y = rc.page.top;
+				py.page++;
+			}
+		}
+		else
+			py.y += pp.before + pp.cy + pp.after;
+		return py;
+	}
+}
+
+PageY RichTxt::GetPartPageY(int parti, RichContext rc) const
+{
+	for(int i = 0; i < parti; i++)
+		rc.py = GetNextPageY(i, rc);
+	return rc.py;
+}
+
+bool IsPainting(PageDraw& pw, Zoom z, const Rect& page, PageY top, PageY bottom)
+{
+	int t = top.y;
+	for(int pi = top.page; pi < bottom.page; pi++) {
+		if(pw.Page(pi).IsPainting(Rect(z * page.left, z * top.y, z * page.right, z * page.bottom)))
+			return true;
+		t = page.top;
+	}
+	return pw.Page(bottom.page).IsPainting(Rect(z * page.left, z * t, z * page.right, z * bottom.y));
+}
+
+
+void RichTxt::Paint(PageDraw& pw, RichContext rc, const PaintInfo& _pi) const
+{
+	PaintInfo pi = _pi;
+	int parti = 0;
+	int pos = 0;
+	RichPara::Number n;
+	while(rc.py < pi.bottom && parti < part.GetCount()) {
+		if(part[parti].Is<RichTable>()) {
+			pi.tablesel--;
+			const RichTable& tab = GetTable(parti);
+			tab.Paint(pw, rc, pi);
+			rc.py = tab.GetHeight(rc);
+			pi.tablesel -= tab.GetTableCount();
+		}
+		else {
+			const Para& pp = part[parti].Get<Para>();
+			if(pp.number) {
+				n.TestReset(*pp.number);
+				n.Next(*pp.number);
+			}
+			PageY next = GetNextPageY(parti, rc);
+			if(next >= pi.top) {
+				int nbefore = 0;
+				int nline = 0;
+				if(pp.keepnext && parti + 1 < part.GetCount() && part[parti + 1].Is<Para>()) {
+					Sync(parti + 1, rc);
+					const Para& pp = part[parti + 1].Get<Para>();
+					nbefore = pp.before;
+					nline = pp.linecy[0];
+				}
+				RichPara p = Get(parti, rc.styles);
+				if(pi.spellingchecker) {
+					if(!pp.checked) {
+						pp.spellerrors = (*pi.spellingchecker)(p);
+						pp.checked = true;
+					}
+				}
+				else {
+					pp.checked = false;
+					pp.spellerrors.Clear();
+				}
+				if(IsPainting(pw, pi.zoom, rc.page, rc.py, next))
+					p.Paint(pw, rc.page, rc.py, pi, n, pp.spellerrors, nbefore, nline);
+			}
+			rc.py = next;
+		}
+		int l = GetPartLength(parti) + 1;
+		pi.highlightpara -= l;
+		pi.sell -= l;
+		pi.selh -= l;
+		pos += l;
+		++parti;
+	}
+}
+
+RichCaret RichTxt::GetCaret(int pos, RichContext rc) const
+{
+	int parti = 0;
+	if(pos > GetLength())
+		pos = GetLength();
+	while(parti < part.GetCount()) {
+		int l = GetPartLength(parti) + 1;
+		if(pos < l)
+			if(IsTable(parti))
+				return GetTable(parti).GetCaret(pos, rc);
+			else {
+				const Para& p = part[parti].Get<Para>();
+				int nbefore = 0;
+				int nline = 0;
+				if(p.keepnext && parti + 1 < part.GetCount() && part[parti + 1].Is<Para>()) {
+					Sync(parti + 1, rc);
+					const Para& pp = part[parti + 1].Get<Para>();
+					nbefore = pp.before;
+					nline = pp.linecy[0];
+				}
+				RichCaret tp = Get(parti, rc.styles).GetCaret(pos, rc.page, rc.py, nbefore, nline);
+				tp.textpage = rc.page;
+				return tp;
+			}
+		pos -= l;
+		rc.py = GetNextPageY(parti++, rc);
+	}
+	return RichCaret();
+}
+
+int   RichTxt::GetPos(int x, PageY y, RichContext rc) const
+{
+	int parti = 0;
+	int pos = 0;
+
+	if(part.GetCount()) {
+		PageY nnext = GetNextPageY(parti, rc);
+		while(parti < part.GetCount()) {
+			PageY next = nnext;
+			if(parti + 1 < part.GetCount()) {
+				RichContext nrc = rc;
+				nrc.py = next;
+				nnext = GetNextPageY(parti + 1, nrc);
+			}
+			if(y < next || y.page < next.page) {
+				if(IsTable(parti))
+					return GetTable(parti).GetPos(x, y, rc) + pos;
+				else {
+					int nbefore = 0;
+					int nline = 0;
+					if(part[parti].Get<Para>().keepnext && parti + 1 < part.GetCount() && IsPara(parti + 1)) {
+						Sync(parti + 1, rc);
+						const Para& pp = part[parti + 1].Get<Para>();
+						nbefore = pp.before;
+						nline = pp.linecy[0];
+					}
+					return Get(parti, rc.styles).GetPos(x, y, rc.page, rc.py, nbefore, nline) + pos;
+				}
+			}
+			pos += GetPartLength(parti) + 1;
+			parti++;
+			rc.py = next;
+		}
+	}
+
+	return pos - 1;
+}
+
+RichHotPos RichTxt::GetHotPos(int x, PageY y, int tolerance, RichContext rc) const
+{
+	int parti = 0;
+	int pos = 0;
+	int ti = 0;
+	if(part.GetCount()) {
+		PageY nnext = GetNextPageY(parti, rc);
+		while(parti < part.GetCount()) {
+			PageY next = nnext;
+			if(parti + 1 < part.GetCount()) {
+				RichContext nrc = rc;
+				nrc.py = next;
+				nnext = GetNextPageY(parti + 1, nrc);
+			}
+			if(y < next || y.page < next.page) {
+				if(IsTable(parti)) {
+					RichHotPos pos = GetTable(parti).GetHotPos(x, y, tolerance, rc);
+					pos.table += ti + 1;
+					return pos;
+				}
+				else
+					break;
+			}
+			if(IsTable(parti))
+				ti += 1 + GetTable(parti).GetTableCount();
+			pos += GetPartLength(parti) + 1;
+			parti++;
+			rc.py = next;
+		}
+	}
+
+	return RichHotPos();
+}
+
+int RichTxt::GetVertMove(int pos, int gx, RichContext rc, int dir) const
+{
+	ASSERT(dir == -1 || dir == 1);
+	if(GetPartCount() == 0)
+		return -1;
+	int pi;
+	int p = pos;
+	if(pos >= 0) {
+		pi = FindPart(p);
+		pos -= p;
+	}
+	else {
+		pi = dir > 0 ? 0 : GetPartCount() - 1;
+		p = -1;
+		pos = 0;
+	}
+	while(pi < GetPartCount()) {
+		int q = IsTable(pi) ? GetTable(pi).GetVertMove(p, gx, rc, dir)
+		                    : Get(pi, rc.styles).GetVertMove(p, gx, rc.page, dir);
+		if(q >= 0)
+			return q + pos;
+		if(dir > 0)
+			pos += GetPartLength(pi) + 1;
+		p = -1;
+		pi += dir;
+		if(pi < 0)
+			break;
+		if(dir < 0)
+			pos -= GetPartLength(pi) + 1;
+	}
+	return -1;
+}
+
+void RichTxt::GatherValPos(Vector<RichValPos>& f, RichContext rc, int pos, int type) const
+{
+	int parti = 0;
+	while(parti < part.GetCount()) {
+		if(part[parti].Is<RichTable>())
+			GetTable(parti).GatherValPos(f, rc, pos, type);
+		else {
+			int nbefore = 0;
+			int nline = 0;
+			const Para& p = part[parti].Get<Para>();
+			if(p.keepnext && parti + 1 < part.GetCount() && IsPara(parti + 1)) {
+				Sync(parti + 1, rc);
+				const Para& pp = part[parti + 1].Get<Para>();
+				nbefore = pp.before;
+				nline = pp.linecy[0];
+			}
+			if(p.haspos)
+				if(type == LABELS)
+					Get(parti, rc.styles).GatherLabels(f, rc.page, rc.py, pos, nbefore, nline);
+				else
+					Get(parti, rc.styles).GatherIndexes(f, rc.page, rc.py, pos, nbefore, nline);
+		}
+		pos += GetPartLength(parti) + 1;
+		rc.py = GetNextPageY(parti++, rc);
+	}
+}
+
+PageY RichTxt::GetHeight(RichContext rc) const
+{
+	for(int i = 0; i < GetPartCount(); i++)
+		rc.py = GetNextPageY(i, rc);
+	return rc.py;
+}
+
+PageY RichTxt::GetTop(RichContext rc) const
+{
+	if(part.GetCount() == 0)
+		return rc.py;
+	if(part[0].Is<RichTable>())
+		return GetTable(0).GetTop(rc);
+	else {
+		Sync(0, rc);
+		const Para& pp = part[0].Get<Para>();
+		rc.py.y += pp.before;
+		if(BreaksPage(rc.py, pp, 0, rc.page))
+			rc.Page();
+		return rc.py;
+	}
+}
+
+void RichTxt::ApplyZoom(Zoom z, const RichStyles& ostyle, const RichStyles& zstyle)
+{
+	for(int i = 0; i < GetPartCount(); i++)
+		if(IsTable(i))
+			part[i].Get<RichTable>().ApplyZoom(z, ostyle, zstyle);
+		else {
+			RichPara p = Get(i, ostyle);
+			p.ApplyZoom(z);
+			Set(i, p, zstyle);
+		}
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/RichText/Util.cpp b/uppsrc/RichText/Util.cpp
new file mode 100644
index 000000000..b8d2f079f
--- /dev/null
+++ b/uppsrc/RichText/Util.cpp
@@ -0,0 +1,123 @@
+#include "RichText.h"
+
+NAMESPACE_UPP
+
+Draw& SimplePageDraw::Info()
+{
+	return w;
+}
+
+Draw& SimplePageDraw::Page(int)
+{
+	return w;
+}
+
+void RichText::ApplyZoom(Zoom z)
+{
+	RichStyles ostyle(style, 1);
+	for(int i = 0; i < style.GetCount(); i++)
+		style[i].format *= z;
+	RichTxt::ApplyZoom(z, ostyle, style);
+	RefreshAll();
+}
+
+Zoom GetRichTextStdScreenZoom()
+{
+	return Zoom(Ctrl::HorzLayoutZoom(96), 600);
+}
+
+struct QTFDisplayCls : Display {
+	virtual void Paint(Draw& w, const Rect& r, const Value& q,
+		               Color ink, Color paper, dword style) const;
+	virtual Size GetStdSize(const Value& q) const;
+	virtual Size RatioSize(const Value& q, int cx, int cy) const;
+};
+
+Size QTFDisplayCls::GetStdSize(const Value& q) const
+{
+	Size sz;
+	RichText txt = ParseQTF((String)q);
+	txt.ApplyZoom(GetRichTextStdScreenZoom());
+	sz.cx = txt.GetWidth();
+	sz.cy = txt.GetHeight(Zoom(1, 1), sz.cx);
+	return sz;
+}
+
+Size QTFDisplayCls::RatioSize(const Value& q, int cx, int cy) const
+{
+	if(cy == 0 && cx > 0) {
+		RichText txt = ParseQTF((String)q);
+		return Size(cx, txt.GetHeight(Zoom(1, 1), cx));
+	}
+	return GetStdSize(q);
+}
+
+void QTFDisplayCls::Paint(Draw& draw, const Rect& r, const Value& v, Color ink, Color paper, dword style) const
+{
+	String s;
+	s << "[@(" << ink.GetR() << "." << ink.GetG() << "." << ink.GetB() << ") " << v;
+	RichText rtext = ParseQTF(s);
+	rtext.ApplyZoom(GetRichTextStdScreenZoom());
+	draw.DrawRect(r, paper);
+	draw.Clipoff(r);
+	rtext.Paint(Zoom(1, 1), draw, 0, 0, r.Width());
+	draw.End();
+}
+
+const Display& QTFDisplay()
+{
+	return Single<QTFDisplayCls>();
+}
+
+struct QTFDisplayCCls : QTFDisplayCls {
+	virtual void Paint(Draw& w, const Rect& r, const Value& q,
+		               Color ink, Color paper, dword style) const;
+};
+
+void QTFDisplayCCls::Paint(Draw& draw, const Rect& r, const Value& v, Color ink, Color paper, dword style) const
+{
+	String s;
+	s << "[@(" << ink.GetR() << "." << ink.GetG() << "." << ink.GetB() << ") " << v;
+	RichText rtext = ParseQTF(s);
+	rtext.ApplyZoom(GetRichTextStdScreenZoom());
+	draw.DrawRect(r, paper);
+	draw.Clipoff(r);
+	int cy = rtext.GetHeight(Zoom(1, 1), r.Width());
+	rtext.Paint(Zoom(1, 1), draw, 0, max(0, (r.Height() - cy) / 2), r.Width());
+	draw.End();
+}
+
+const Display& QTFDisplayVCenter()
+{
+	return Single<QTFDisplayCCls>();
+}
+
+RichText AsRichText(const wchar *s, const RichPara::Format& f)
+{
+	RichText clip;
+	RichPara p;
+	p.format = f;
+	p.part.Add().format = f;
+	RichStyle cs;
+	cs.format = f;
+	cs.format.sscript = 0;
+	cs.format.link.Clear();
+	cs.format.indexentry.Clear();
+	cs.format.language = LNG_ENGLISH;
+	cs.format.label.Clear();
+	clip.SetStyle(f.styleid, cs);
+	WString& part = p.part.Top().text;
+	while(*s) {
+		if(*s == '\n') {
+			clip.Cat(p);
+			part.Clear();
+		}
+		if(*s >= 32 || *s == '\t')
+			part.Cat(*s);
+		s++;
+	}
+	clip.Cat(p);
+	return clip;
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/RichText/init b/uppsrc/RichText/init
new file mode 100644
index 000000000..9870ac10e
--- /dev/null
+++ b/uppsrc/RichText/init
@@ -0,0 +1,6 @@
+#ifndef _RichText_icpp_init_stub
+#define _RichText_icpp_init_stub
+#include "CtrlCore/init"
+#include "plugin\png/init"
+#include "RichImage.icpp"
+#endif
diff --git a/uppsrc/RichText/srcdoc.tpp/QTF$en-us.tpp b/uppsrc/RichText/srcdoc.tpp/QTF$en-us.tpp
new file mode 100644
index 000000000..732016c0f
--- /dev/null
+++ b/uppsrc/RichText/srcdoc.tpp/QTF$en-us.tpp
@@ -0,0 +1,25 @@
+TITLE("QTF")
+COMPRESSED
+120,156,213,60,137,118,219,56,146,191,130,92,253,100,71,7,15,221,74,178,62,58,113,60,237,118,122,156,100,123,122,180,76,72,73,144,197,9,69,170,73,42,137,59,199,183,111,21,0,146,32,5,138,116,178,121,59,147,60,219,20,80,55,10,64,21,80,212,212,32,247,239,107,77,237,158,86,241,111,252,51,93,58,91,47,182,166,71,13,221,24,182,181,182,209,235,29,32,182,14,216,253,222,112,208,237,117,7,221,126,183,167,245,140,145,217,27,244,180,238,176,219,31,24,122,15,58,198,127,127,245,140,156,174,66,107,122,216,121,168,235,3,64,51,144,233,64,239,154,70,215,232,14,141,190,174,107,154,209,237,14,117,67,31,66,179,54,212,186,131,113,236,198,30,5,164,211,35,243,225,160,7,88,102,211,188,103,246,141,254,208,208,204,174,105,118,7,70,79,51,13,19,200,12,145,213,80,215,122,131,241,60,88,0,210,167,183,95,30,60,189,108,189,126,73,166,145,54,121,124,56,36,32,196,79,22,126,32,226,15,74,229,70,36,94,81,226,59,177,251,158,146,101,16,174,157,
+152,4,75,242,218,139,93,120,164,246,67,251,33,9,221,249,138,196,244,99,28,145,6,7,137,233,130,55,28,180,243,52,207,99,36,57,187,137,41,9,66,151,250,8,200,81,218,228,4,90,35,242,193,141,87,228,189,227,109,225,217,176,91,166,78,156,144,18,247,218,15,66,186,104,147,23,32,78,200,155,0,57,220,132,20,73,56,17,153,175,156,208,153,67,83,4,148,5,205,216,245,175,201,60,88,175,29,127,17,21,36,185,160,49,3,110,76,143,186,196,177,236,22,254,253,235,88,60,252,211,58,104,18,127,187,158,165,32,154,232,25,97,79,180,113,230,148,52,76,227,128,0,105,137,119,142,199,33,128,183,73,147,76,200,29,242,95,228,1,105,144,3,210,33,143,200,19,114,47,47,11,210,152,49,237,175,67,10,86,13,193,232,142,79,116,99,192,52,189,222,2,121,208,22,141,26,144,25,12,7,125,15,48,219,72,104,206,21,148,45,208,240,131,152,0,144,15,86,34,203,109,188,5,42,128,18,185,129,31,225,240,193,208,30,36,182,148,208,162,85,176,245,22,200,1,236,
+186,116,63,2,125,54,28,52,154,59,27,154,65,18,219,38,141,16,133,136,40,113,54,65,20,135,193,102,69,129,228,89,24,108,55,200,65,162,58,7,85,128,36,39,178,0,177,113,84,152,11,232,109,242,244,163,179,222,120,116,44,25,196,156,16,251,174,253,63,186,99,79,63,218,22,60,216,83,251,144,204,2,111,1,159,238,230,45,135,62,67,52,18,82,16,56,2,119,226,238,74,193,26,32,131,235,111,182,49,137,232,159,91,234,207,105,97,252,127,118,215,212,71,131,144,173,239,198,137,85,152,189,23,1,124,182,91,36,240,217,51,122,236,2,204,225,115,115,235,157,190,166,113,242,243,85,129,232,105,224,5,160,49,35,2,250,134,238,140,227,80,151,153,154,59,20,201,45,18,194,177,228,150,145,213,228,118,95,83,199,7,99,101,60,200,167,79,58,46,55,183,249,245,104,212,159,60,129,159,101,119,34,230,58,153,62,208,180,22,40,161,89,214,120,92,108,212,85,141,134,170,209,84,53,118,85,141,61,85,99,95,213,56,80,53,14,85,141,35,108,244,58,90,216,209,226,
+142,54,235,104,71,26,3,209,8,180,31,233,210,179,33,61,155,210,115,87,122,238,73,207,125,233,121,32,61,15,165,231,81,246,236,117,140,94,8,63,113,71,239,205,224,71,240,123,172,167,162,158,120,206,252,93,166,131,78,46,226,179,208,185,145,26,126,95,185,49,149,62,39,152,87,116,97,41,154,207,66,74,125,85,199,9,172,155,170,246,139,184,132,18,99,204,132,81,98,157,222,56,74,62,127,80,207,11,62,88,214,151,47,249,9,0,75,175,199,23,214,188,211,234,218,104,92,235,151,49,220,245,215,211,220,236,72,68,152,73,78,161,134,152,87,66,92,87,66,188,171,132,240,42,33,214,149,16,65,37,68,88,9,113,179,51,31,100,159,110,104,109,196,129,159,131,146,25,80,54,123,114,188,242,173,172,71,110,53,191,125,134,168,253,182,204,255,246,76,128,194,84,203,124,185,204,203,127,117,174,97,231,112,148,212,194,224,131,146,77,201,108,82,77,139,239,118,127,229,104,159,72,254,160,4,56,173,2,56,171,2,248,165,10,224,162,10,224,215,42,128,223,171,0,174,170,
+0,254,216,241,122,240,244,29,111,29,230,103,2,244,230,253,182,81,152,23,13,195,44,124,70,140,34,85,121,95,233,23,161,241,71,31,202,92,170,103,193,69,92,190,126,151,205,4,244,235,146,185,80,230,240,21,107,254,158,249,192,183,169,219,236,47,23,241,158,173,194,225,225,218,213,217,9,143,248,89,180,10,145,123,14,48,55,236,141,105,71,26,96,30,79,89,237,218,141,7,10,146,130,217,7,8,208,40,81,33,97,252,167,217,45,28,208,156,96,50,40,224,105,228,25,136,206,3,55,12,113,61,74,44,78,225,150,234,236,17,50,218,208,185,187,116,89,162,224,220,168,83,154,114,110,151,229,132,89,46,1,214,223,120,152,216,96,252,142,145,44,6,177,144,121,57,152,153,196,144,130,64,218,19,130,107,240,206,2,115,252,99,64,64,238,68,238,156,69,210,152,103,70,59,48,176,26,26,154,102,142,7,163,209,32,89,234,192,103,244,201,41,177,223,38,254,67,158,59,225,194,110,241,44,11,2,113,254,0,57,81,140,201,4,230,54,144,79,44,220,247,238,2,195,235,88,
+142,249,61,8,211,219,156,14,163,249,83,74,243,146,126,32,32,191,3,150,219,172,100,144,150,253,57,5,122,229,204,182,158,19,7,161,212,127,100,223,159,30,74,195,180,162,31,173,196,189,39,169,207,147,215,190,139,42,75,89,18,184,55,192,58,11,24,179,181,227,137,225,109,239,76,4,97,185,211,12,15,84,73,37,149,82,217,66,174,81,9,79,162,216,9,99,158,82,151,14,125,174,201,158,150,187,72,166,215,50,192,25,77,49,103,37,211,195,78,214,211,41,74,1,66,88,211,14,73,115,48,11,135,41,201,42,197,36,225,131,59,207,105,227,108,54,30,122,57,164,187,56,182,120,148,0,105,90,236,122,4,136,206,87,69,91,228,117,176,202,117,128,153,12,98,4,91,60,58,160,139,118,206,45,245,225,96,52,198,3,150,55,176,128,27,163,54,251,233,14,15,90,58,115,132,67,156,225,167,251,52,205,180,28,143,31,139,197,29,215,253,55,194,145,18,159,233,160,207,60,230,221,231,177,227,185,243,182,2,202,62,148,192,78,32,249,85,2,189,149,128,94,131,105,195,196,
+255,119,32,91,18,228,203,56,116,223,209,96,27,171,32,231,18,224,169,179,113,65,194,72,73,209,150,41,110,55,16,243,67,194,187,81,210,108,230,64,103,229,128,11,9,240,103,39,90,225,121,193,94,181,222,36,83,81,94,72,209,95,44,9,36,163,249,252,102,195,136,189,83,17,59,175,164,53,145,135,14,228,250,8,238,20,135,55,25,177,206,169,188,41,164,212,100,247,124,152,82,19,235,125,70,242,89,0,139,235,138,186,215,171,24,23,99,60,135,80,201,169,149,160,244,52,126,116,209,232,147,77,224,250,120,250,166,192,214,75,176,251,3,129,61,220,135,109,148,96,15,187,2,91,215,246,161,155,37,232,186,150,200,174,27,251,240,187,101,248,102,202,127,175,242,189,50,252,84,123,99,175,252,253,18,124,35,149,223,232,238,195,31,148,225,167,242,27,123,205,63,44,193,55,83,254,230,94,253,71,37,248,221,20,191,171,224,95,195,171,143,82,175,102,193,129,196,230,21,46,222,60,98,184,13,193,251,251,9,206,32,205,187,14,97,37,95,20,105,103,202,30,75,72,199,161,
+11,91,240,18,84,86,65,94,201,228,221,53,236,60,24,45,92,5,107,199,47,197,57,149,215,201,96,27,186,108,103,84,195,158,229,22,95,216,225,32,190,33,103,175,207,75,17,94,202,8,55,235,89,80,148,189,218,130,237,138,117,134,239,193,34,160,92,48,242,202,240,87,37,222,157,202,149,242,142,146,221,18,183,122,223,89,67,184,246,231,22,198,3,246,247,233,14,137,54,57,95,146,104,59,95,113,153,22,1,12,7,59,207,254,232,70,49,9,124,18,221,68,49,93,55,197,152,194,158,142,209,171,114,119,248,164,146,19,67,141,136,74,27,196,23,22,49,32,162,52,162,105,60,2,160,109,188,183,16,199,216,210,73,176,56,213,21,113,76,26,193,20,162,138,174,6,81,69,95,123,100,154,218,228,137,62,232,13,48,181,95,233,60,234,125,156,11,123,183,241,210,110,13,147,208,19,250,180,180,235,131,235,47,130,15,145,221,210,141,158,38,65,232,74,8,93,130,48,148,16,134,4,97,42,33,76,9,162,171,132,232,74,16,61,37,68,79,130,232,43,33,250,18,196,64,9,
+49,144,32,142,83,8,55,10,192,84,195,222,8,96,36,128,19,21,128,172,235,169,10,64,86,245,103,21,128,172,233,83,21,128,172,232,51,21,128,172,231,153,10,64,86,243,185,10,64,246,139,115,21,192,72,2,248,155,210,80,218,158,36,60,130,152,16,98,216,36,227,99,55,103,242,28,32,13,42,174,106,8,187,113,196,59,154,169,253,201,126,107,127,121,219,110,183,241,106,198,154,30,146,38,177,228,238,156,219,74,144,183,218,92,30,164,83,213,115,252,107,105,97,185,128,143,91,231,154,182,197,189,98,50,55,197,49,2,94,180,164,148,255,241,15,126,207,146,54,252,241,135,213,36,206,124,30,132,11,84,22,150,162,243,151,47,72,223,28,177,12,4,159,77,189,223,199,28,138,45,215,81,91,105,129,7,79,47,237,214,235,151,146,98,114,167,166,217,32,246,91,104,151,175,168,236,187,126,224,83,251,46,83,135,201,175,88,187,198,149,75,236,88,178,196,111,105,58,226,57,51,234,169,8,62,146,119,67,15,6,89,202,25,61,186,84,110,67,246,99,121,147,195,235,218,48,
+159,67,23,17,158,236,97,18,98,164,161,66,186,39,33,253,109,27,197,238,242,70,197,165,218,81,188,242,45,239,2,52,132,228,49,188,118,253,221,208,186,154,114,88,78,249,138,5,80,223,78,218,45,39,141,41,134,191,55,21,216,248,178,142,224,252,44,157,70,127,214,129,190,10,97,85,142,208,83,34,44,202,16,12,153,67,181,158,179,114,61,95,178,35,128,25,133,73,75,37,135,249,6,99,58,85,76,156,101,206,135,247,217,246,183,220,252,186,6,1,67,234,188,219,17,83,133,250,78,66,253,133,210,141,196,16,227,23,30,48,108,74,102,254,47,251,145,49,122,66,84,92,184,125,12,133,3,117,106,252,119,137,204,139,112,131,5,5,115,136,167,194,64,185,58,248,183,202,125,89,8,14,43,166,235,71,52,140,119,71,46,57,234,218,229,179,254,30,62,197,193,43,103,115,41,17,185,100,80,96,243,100,155,144,207,175,182,27,164,63,148,235,21,216,46,130,14,238,39,136,176,9,220,120,236,88,148,58,115,92,45,223,83,47,23,229,13,251,221,241,72,55,251,143,204,174,
+49,121,50,236,235,217,245,77,254,178,206,110,165,27,243,5,82,65,113,48,182,77,34,88,21,78,22,226,113,77,162,38,63,216,67,193,88,84,173,151,97,106,85,152,90,25,166,147,137,9,150,10,231,78,68,147,139,221,34,13,167,140,70,22,172,189,222,108,246,211,56,46,163,225,42,228,8,89,90,230,171,53,114,203,40,157,43,164,217,75,233,60,11,150,20,14,22,100,14,230,234,61,109,242,2,79,233,182,30,232,199,157,69,229,148,47,114,199,117,151,1,153,49,4,37,168,246,45,244,245,34,146,94,3,201,40,34,25,53,144,204,34,146,89,3,105,84,156,217,179,10,12,251,171,140,145,28,205,99,52,26,179,233,124,202,83,50,121,62,103,49,171,28,201,198,55,27,54,125,99,78,195,13,252,111,155,190,79,178,9,133,167,190,158,68,176,204,239,30,73,19,30,66,144,106,4,136,185,18,12,30,113,97,217,151,132,85,12,225,27,11,94,123,200,151,18,148,234,64,20,148,145,165,11,246,149,42,188,242,247,48,166,169,27,99,179,107,246,199,38,228,131,149,186,151,202,
+219,42,235,120,187,35,43,202,181,134,8,175,56,106,162,48,138,159,70,220,176,17,75,71,123,19,68,46,106,158,110,213,121,146,191,175,168,159,191,145,40,72,241,213,34,141,52,36,255,10,255,239,98,5,223,220,163,14,86,106,121,30,153,111,67,118,171,5,44,19,215,138,72,195,245,231,222,150,103,6,171,32,194,171,73,200,245,93,86,175,8,203,134,180,9,49,239,85,30,182,73,59,25,227,63,61,60,62,130,173,233,197,111,120,33,130,4,64,61,216,147,96,79,15,96,79,199,21,41,34,46,31,71,74,23,188,218,79,0,210,172,202,47,88,208,172,108,142,88,152,103,120,134,166,77,186,160,223,45,34,165,40,119,57,89,7,222,190,139,251,52,99,82,76,58,152,13,154,201,129,72,146,134,193,96,240,141,147,115,106,98,182,41,26,32,136,201,60,217,36,242,95,3,143,200,0,168,112,119,88,96,150,20,217,113,78,188,166,144,123,255,158,235,168,220,45,141,116,45,150,94,35,101,38,40,28,70,218,247,133,185,242,29,77,203,87,53,223,179,182,91,119,145,111,27,91,
+168,116,94,39,8,107,98,234,176,123,75,52,109,147,95,66,151,220,74,177,113,221,29,37,41,208,149,183,122,164,201,109,109,183,146,163,43,118,201,203,246,182,105,97,104,119,174,15,243,238,150,28,44,168,184,87,177,135,7,22,165,102,28,64,32,38,9,184,199,149,59,95,177,157,128,46,92,156,235,31,86,172,100,21,131,61,28,170,20,39,218,39,2,218,58,227,111,26,100,225,94,187,120,95,232,194,64,231,110,96,93,76,167,240,184,51,147,111,175,110,48,96,146,98,24,120,39,104,77,96,18,109,60,231,134,235,193,197,143,248,142,228,120,81,240,125,230,46,46,155,108,62,164,164,118,234,19,236,199,68,99,75,171,220,137,86,193,30,171,170,118,29,215,27,188,197,21,219,136,37,236,146,151,64,81,166,171,77,210,99,158,195,142,205,234,214,113,158,212,175,92,207,170,121,37,177,149,13,176,36,188,152,253,139,206,227,168,4,94,116,99,249,194,13,63,206,130,52,135,239,248,120,180,85,56,160,101,182,194,227,162,116,8,115,199,64,88,13,140,1,67,146,46,176,176,48,
+25,74,7,28,10,252,41,196,221,8,105,43,202,85,202,22,145,35,251,200,226,195,93,92,25,230,31,11,160,63,89,243,155,50,85,19,239,100,107,133,85,115,177,224,124,83,95,126,150,22,242,7,220,174,109,242,106,197,50,35,214,158,108,209,33,157,7,215,190,251,23,119,114,84,151,93,204,207,121,36,66,78,110,18,167,105,102,51,57,197,225,227,240,219,229,89,82,224,175,152,105,243,143,169,72,191,187,11,48,111,42,145,156,152,239,96,165,149,179,228,57,191,190,82,160,37,115,104,215,128,207,197,0,230,19,193,153,235,59,33,40,228,196,78,70,174,201,202,5,22,252,72,113,0,48,113,246,182,2,60,15,16,146,97,240,234,125,23,3,138,15,232,130,58,100,19,1,175,88,1,151,195,171,14,9,140,191,189,64,66,199,135,44,30,134,157,215,22,145,103,110,136,102,199,138,246,180,215,52,240,232,116,128,101,19,17,39,81,86,206,142,125,72,56,47,48,18,195,107,178,77,132,155,11,190,167,1,142,30,210,104,19,32,65,150,249,114,153,48,183,21,152,137,134,146,60,
+108,34,129,118,9,244,204,11,230,239,18,93,241,84,193,129,69,155,240,177,152,137,106,122,110,220,164,214,31,248,95,188,60,33,13,102,18,124,5,4,204,167,29,128,147,241,8,139,102,200,200,31,34,87,217,22,140,93,187,246,90,1,153,194,78,248,192,218,68,106,207,162,201,157,218,24,51,165,39,207,196,79,246,167,242,114,146,141,227,66,84,35,123,17,30,148,227,142,39,222,28,73,162,183,133,42,216,144,151,128,114,30,34,115,207,206,143,193,51,64,129,72,20,105,109,215,62,208,134,169,19,77,8,43,108,145,217,99,185,203,159,91,247,189,227,177,248,54,200,32,56,38,76,251,75,118,194,194,106,223,112,31,232,96,20,236,209,206,156,122,158,42,104,170,81,192,3,155,32,32,115,47,175,171,191,61,222,99,1,233,104,134,213,6,249,1,139,50,119,4,205,5,119,13,22,59,199,219,77,178,166,161,87,177,211,27,215,103,149,99,56,39,17,249,160,45,86,67,68,71,203,48,225,193,22,197,128,63,164,239,221,96,27,113,128,182,112,40,54,47,43,116,251,98,127,217,
+239,66,133,58,164,209,200,28,15,53,109,176,167,14,233,213,62,221,45,85,249,81,117,128,255,72,113,116,186,123,118,206,147,104,143,238,172,207,213,12,158,148,50,200,29,161,127,7,135,147,82,14,185,19,230,111,37,127,92,65,158,31,79,126,43,245,101,41,245,103,33,134,158,176,0,207,223,249,52,138,82,218,162,3,124,53,216,34,231,25,196,48,60,180,101,50,180,137,120,43,49,41,174,133,109,73,187,133,64,207,118,43,48,196,177,4,171,13,21,193,213,50,100,185,92,109,170,215,34,145,74,169,157,133,16,168,42,148,99,237,184,136,96,237,87,196,203,61,217,173,36,159,160,126,4,209,124,169,162,221,91,72,116,86,75,207,107,16,71,170,26,205,157,244,75,103,245,8,202,230,229,238,57,191,234,152,191,128,201,125,167,18,149,159,139,9,215,163,113,196,132,99,139,227,178,224,42,176,10,254,69,195,160,77,94,71,116,185,245,120,130,197,179,101,198,139,65,4,225,181,131,17,27,75,66,111,97,184,85,113,40,179,220,79,4,201,97,240,1,70,242,121,246,129,13,40,
+108,101,148,109,10,162,116,119,70,97,222,251,98,253,197,183,10,111,74,21,127,35,141,14,90,217,193,59,70,94,39,26,108,82,63,80,97,62,46,197,156,243,123,205,198,123,204,58,231,142,119,160,64,127,95,138,61,11,226,56,88,223,194,106,158,176,90,231,118,231,47,222,45,207,107,60,171,83,24,29,230,41,120,211,203,29,84,172,22,13,30,106,41,11,209,249,121,93,254,102,19,139,115,28,255,166,16,102,172,221,8,157,170,137,123,46,44,71,190,199,211,5,124,131,82,132,45,217,36,197,232,143,241,30,19,173,41,200,143,137,209,43,177,97,241,34,182,210,122,106,132,58,144,74,139,177,107,235,255,100,147,197,183,53,89,92,219,100,177,218,100,48,23,255,45,13,166,215,51,216,236,182,6,155,213,54,216,76,109,48,190,136,252,39,219,204,185,173,205,156,218,54,115,212,54,99,71,247,153,193,162,186,22,139,190,223,100,117,12,98,31,89,60,156,200,237,27,59,101,171,178,245,217,219,85,181,136,95,41,105,115,199,217,165,203,222,137,148,54,181,59,89,224,77,153,146,
+197,108,15,182,181,133,28,81,149,133,177,121,161,158,23,195,1,190,22,128,237,214,144,116,227,249,235,42,61,173,97,28,27,56,40,44,247,100,97,57,59,55,133,62,136,19,14,42,226,231,130,169,91,69,206,207,131,208,253,11,143,37,132,139,64,138,234,215,35,245,185,72,234,191,69,84,160,32,116,74,38,210,117,110,213,181,206,138,122,155,168,252,74,103,231,54,132,92,6,49,29,147,87,73,110,206,204,227,209,107,103,126,67,162,237,102,19,132,60,169,13,188,133,136,27,69,166,219,200,231,171,248,46,150,248,238,135,3,146,30,191,56,120,56,13,129,102,225,224,17,191,206,195,194,156,148,149,5,50,170,236,160,164,19,225,154,46,206,152,115,246,178,63,227,27,84,45,139,57,13,123,37,139,71,232,29,22,182,183,73,94,169,228,138,199,76,78,148,11,239,137,179,3,233,228,194,108,162,19,251,174,184,104,149,190,3,2,158,59,196,101,47,206,176,15,246,219,236,29,17,222,96,163,129,146,247,81,88,19,204,230,228,181,19,86,166,39,70,183,73,160,71,112,176,166,135,
+77,198,193,130,54,248,212,105,10,38,226,243,219,102,198,70,52,229,248,240,182,148,205,206,59,192,187,170,217,182,61,37,240,11,4,196,47,185,16,95,144,193,190,242,130,228,190,243,34,17,247,144,76,15,9,226,160,74,41,56,177,152,212,53,248,77,143,69,205,116,227,165,227,71,118,235,37,13,221,229,1,163,118,181,83,247,222,144,122,79,211,10,247,198,175,129,31,176,19,159,3,89,50,136,148,149,180,193,72,165,148,45,64,33,150,130,112,45,85,52,210,223,196,96,9,123,170,147,161,120,50,32,193,21,143,38,209,13,241,216,37,122,2,218,35,70,2,208,39,70,87,60,14,136,145,80,24,18,51,129,29,145,174,104,77,181,28,17,193,214,18,76,173,132,165,37,24,98,3,124,16,44,173,132,161,149,176,179,18,102,86,194,202,98,92,106,169,124,231,149,179,2,3,222,33,252,175,44,153,104,170,69,198,126,216,195,55,97,52,13,23,88,153,136,220,94,143,210,81,151,191,137,207,50,71,62,247,238,243,183,159,13,88,32,52,237,128,252,230,250,239,164,93,79,102,87,
+128,156,30,117,239,95,74,228,172,41,124,36,86,129,64,45,185,68,81,46,121,10,73,180,27,173,210,58,91,38,225,131,211,151,118,235,244,159,228,244,47,58,151,187,36,99,22,241,8,34,237,226,236,190,231,175,52,210,27,88,172,219,209,178,237,211,216,126,147,189,129,198,132,57,135,61,96,227,122,120,57,142,109,52,204,189,87,38,11,149,66,218,25,232,20,73,219,64,219,70,226,111,206,165,247,219,172,41,124,34,150,68,172,150,176,99,86,62,60,38,23,248,135,74,175,149,202,162,148,2,213,98,241,136,159,39,102,87,160,44,151,94,131,140,185,49,40,3,170,103,243,199,59,213,202,106,54,251,224,106,113,122,34,14,47,43,248,236,1,171,197,230,94,90,24,157,226,181,89,19,15,50,98,81,39,185,160,235,32,130,193,198,232,194,141,219,237,50,24,63,186,37,140,172,203,255,183,44,181,12,230,97,107,238,228,26,27,138,43,30,131,154,40,193,106,113,113,25,23,81,166,205,158,89,208,250,3,140,238,114,73,127,20,171,90,218,134,140,109,238,176,254,135,234,28,114,
+157,127,44,195,26,154,167,165,71,246,79,246,116,134,175,122,158,240,140,197,216,245,168,172,78,137,83,69,240,73,1,190,150,177,29,228,115,204,110,20,50,54,63,101,162,164,28,29,198,33,7,89,44,153,170,231,203,200,208,158,190,208,68,89,38,40,11,81,208,11,61,255,209,200,127,52,147,143,86,206,89,81,36,172,88,229,157,156,55,111,212,85,141,134,170,209,76,26,107,73,255,98,228,98,244,18,103,101,165,248,189,14,255,71,62,242,35,230,115,15,117,28,77,100,137,91,255,102,242,214,53,60,119,156,75,125,221,158,176,111,211,96,245,241,68,231,46,114,169,59,82,163,177,183,177,26,91,225,102,163,201,218,110,79,46,193,177,90,9,174,236,70,35,232,114,178,62,227,54,125,53,73,214,11,73,190,154,154,102,127,181,31,99,180,11,15,79,236,150,169,177,47,102,176,63,103,197,196,248,73,174,250,197,207,124,253,195,15,146,238,95,191,34,189,175,156,218,215,39,140,22,138,148,145,106,229,8,181,50,50,117,196,253,100,127,210,199,6,57,78,223,61,16,93,199,70,
+161,225,164,8,113,98,224,133,183,16,148,85,25,155,230,184,223,239,243,47,210,147,40,74,180,36,42,128,15,242,213,20,209,24,235,103,221,107,232,124,214,91,246,96,181,212,109,160,114,108,224,239,19,246,92,20,6,228,232,143,65,160,46,128,79,158,245,16,117,114,214,253,1,146,113,227,129,8,94,87,235,244,181,171,190,125,100,114,201,238,148,136,166,178,19,71,62,50,175,250,146,92,158,214,49,122,71,198,149,246,157,2,194,127,251,179,144,210,110,25,194,110,199,102,206,122,248,219,84,8,154,252,234,126,214,37,121,91,250,142,253,118,31,78,36,227,154,223,96,209,220,0,39,61,14,251,228,176,158,244,249,139,248,255,77,190,184,11,238,100,224,78,6,158,111,101,234,72,47,142,252,47,82,8,237,19,
+
diff --git a/uppsrc/RichText/srcdoc.tpp/all.i b/uppsrc/RichText/srcdoc.tpp/all.i
new file mode 100644
index 000000000..43bb5c362
--- /dev/null
+++ b/uppsrc/RichText/srcdoc.tpp/all.i
@@ -0,0 +1,4 @@
+TOPIC("QTF$en-us")
+#include "QTF$en-us.tpp"
+END_TOPIC
+
diff --git a/uppsrc/Sql/AUTHORS b/uppsrc/Sql/AUTHORS
new file mode 100644
index 000000000..f782e5b62
--- /dev/null
+++ b/uppsrc/Sql/AUTHORS
@@ -0,0 +1,2 @@
+Mirek Fidler <cxl@ntllib.org>
+Tomas Rylek  <rylek@volny.cz>
\ No newline at end of file
diff --git a/uppsrc/Sql/COPYING b/uppsrc/Sql/COPYING
new file mode 100644
index 000000000..33aa39102
--- /dev/null
+++ b/uppsrc/Sql/COPYING
@@ -0,0 +1,30 @@
+Copyright (C) 2005 Mirek Fidler, Tomas Rylek and various contributors (see AUTHORS)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to
+deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies of the Software and its Copyright notices. In addition publicly
+documented acknowledgment must be given that this software has been used if no
+source code of this software is made available publicly. This includes
+acknowledgments in either Copyright notices, Manuals, Publicity and Marketing
+documents or any documentation provided with any product containing this
+software. This License does not apply to any software that links to the
+libraries provided by this software (statically or dynamically), but only to
+the software provided.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+-----------
+
+Please see the COPYING.PLAIN for a plain-english explanation of this notice
+and it's intent.
diff --git a/uppsrc/Sql/COPYING-PLAIN b/uppsrc/Sql/COPYING-PLAIN
new file mode 100644
index 000000000..770a8132f
--- /dev/null
+++ b/uppsrc/Sql/COPYING-PLAIN
@@ -0,0 +1,33 @@
+Plain English Copyright Notice
+
+This file is not intended to be the actual License. The reason this file
+exists is that we here are programmers and engineers. We aren't lawyers. We
+provide licenses that we THINK say the right things, but we have our own
+intentions at heart. This is a plain-english explanation of what those
+intentions are, and if you follow them you will be within the "spirit" of
+the license.
+
+The intent is for us to enjoy writing software that is useful to us (the
+AUTHORS) and allow others to use it freely and also benefit from the work we
+put into making it. We don't want to restrict others using it. They should
+not *HAVE* to make the source code of the applications they write that
+simply link to these libraries (be that statically or dynamically), or for
+them to be limited as to what license they choose to use (be it open, closed
+or anything else). But we would like to know you are using these libraries.
+We simply would like to know that it has been useful to someone. This is why
+we ask for acknowledgement of some sort.
+
+You can do what you want with the source of this software - it doesn't
+matter. We still have it here for ourselves and it is open and free to use
+and download and play with. It can't be taken away. We don't really mind what
+you do with the source to your software. We would simply like to know that
+you are using it - especially if it makes it to a commerical product. If you
+simply e-mail all the AUTHORS (see COPYING and AUTHORS files) telling us, and
+then make sure you include a paragraph or page in the manual or in the "About.."
+box for the product with the copyright notice and state that you used this
+software, we will be very happy. If you want to contribute back modifications
+and fixes you may have made we will welcome those too with open arms (generally).
+If you want help with changes needed, ports needed or features to be added,
+arrangements can be easily made with some dialogue.
+
+Mirek Fidler <cxl@ntllib.org>
diff --git a/uppsrc/Sql/Sql.cpp b/uppsrc/Sql/Sql.cpp
new file mode 100644
index 000000000..ec262e659
--- /dev/null
+++ b/uppsrc/Sql/Sql.cpp
@@ -0,0 +1,614 @@
+#include "Sql.h"
+
+NAMESPACE_UPP
+
+#define LLOG(x) // DLOG(x)
+
+bool SqlToBool(const String& s) {
+	return !(IsNull(s) || *s == '0' && s[1] == '\0');
+}
+
+bool SqlToBool(const Value& v) {
+	if(IsNull(v)) return false;
+	if(IsString(v)) return SqlToBool(String(v));
+	if(IsNumber(v)) return (int) v;
+	return true;
+}
+
+const String& BoolToSql(bool b) {
+	static String T("1"), F("0");
+	return b ? T : F;
+}
+
+void FieldOperator::Field(Ref f) {}
+
+void FieldOperator::Field(const char *name, Ref f) { Field(f); }
+
+FieldOperator& FieldOperator::operator()(const char *name, bool& b) {
+	String x = BoolToSql(b);
+	Field(name, x);
+	b = SqlToBool(x);
+	return *this;
+}
+
+static char sql_error[] = "Database error";
+
+#ifndef NOAPPSQL
+SqlExc::SqlExc() : Exc(sql_error) {
+	SetSessionError(SQL.GetSession());
+}
+#endif
+
+SqlExc::SqlExc(const SqlSession& session) : Exc(sql_error) {
+	SetSessionError(session);
+}
+
+SqlExc::SqlExc(const Sql& sql) : Exc(sql_error) {
+	SetSessionError(sql.GetSession());
+}
+
+void SqlExc::SetSessionError(const SqlSession& session) {
+	if(session.WasError())
+		*this = session.GetLastError();
+	else
+		*this = String(sql_error);
+	*this << "\nSQL error: " << session.GetErrorStatement();
+}
+
+SqlConnection::SqlConnection()  { parse = true; fetchrows = 32; longsize = 16384; }
+SqlConnection::~SqlConnection() {}
+
+void SqlConnection::Cancel() {}
+
+int  SqlConnection::GetRowsProcessed() const {
+	NEVER();
+	return 0;
+}
+
+String SqlConnection::GetUser() const {
+	NEVER();
+	return Null;
+}
+
+Value SqlConnection::GetInsertedId() const
+{
+	NEVER();
+	return Null;
+}
+
+String Sql::Compile(const SqlStatement& s)
+{
+	byte dialect = GetDialect();
+	ASSERT(dialect);
+	return s.Get(dialect);
+}
+
+void Sql::Clear() {
+	if(cn) {
+		cn->Cancel();
+		cn->parse = true;
+	}
+}
+
+void Sql::SetParam(int i, const Value& val) {
+	cn->SetParam(i, val);
+}
+
+void Sql::SetStatement(const String& s) {
+	cn->statement = s;
+	cn->parse = true;
+}
+
+bool Sql::Execute() {
+	SqlSession &session = GetSession();
+	if(session.traceslow < INT_MAX)
+		cn->starttime = GetTickCount();
+	if(session.usrlog)
+		UsrLogT(9, cn->statement);
+	Stream *s = session.GetTrace();
+	if(s) {
+#ifndef NOAPPSQL
+		if(this == &AppCursor())
+			*s << "SQL* ";
+#endif
+		*s << cn->statement << '\n';
+	}
+	session.GetStatus().Statement(cn->statement);
+	session.PassStatus(ActivityStatus::EXECUTING);
+	bool b = cn->Execute();
+	session.GetStatus().Time(GetTickCount() - cn->starttime);
+	session.PassStatus(ActivityStatus::END_EXECUTING);
+	if(!b) {
+		if(s) {
+			*s << "## ERROR: " << session.GetLastError() << '\n';
+		}
+		session.GetStatus()
+			.Error(session.GetLastError())
+			.ErrorCode(session.GetErrorCode())
+			.ErrorCode(session.GetErrorCodeString());
+		session.PassStatus(ActivityStatus::EXECUTING_ERROR);
+	}
+	for(int i = 0; i < cn->info.GetCount(); i++)
+		cn->info[i].name = ToUpper(cn->info[i].name);
+	return b;
+}
+
+void Sql::ExecuteX() {
+	if(!Execute())
+		throw SqlExc(GetSession());
+}
+
+bool Sql::Execute(const String& s) {
+	SetStatement(s);
+	return Execute();
+}
+
+void Sql::ExecuteX(const String& s) {
+	SetStatement(s);
+	ExecuteX();
+}
+
+#define E__SetParam(I)    SetParam(I - 1, p##I)
+
+#define E__RunF(I) \
+bool Sql::Run(__List##I(E__Value)) { \
+	__List##I(E__SetParam); \
+	return Run(); \
+}
+__Expand(E__RunF)
+
+#define E__RunFX(I) \
+void Sql::RunX(__List##I(E__Value)) { \
+	__List##I(E__SetParam); \
+	RunX(); \
+}
+__Expand(E__RunFX)
+
+#define E__ExecuteF(I) \
+bool Sql::Execute(const String& s, __List##I(E__Value)) { \
+	SetStatement(s); \
+	__List##I(E__SetParam); \
+	return Execute(); \
+}
+__Expand(E__ExecuteF)
+
+#define E__ExecuteFX(I) \
+void Sql::ExecuteX(const String& s, __List##I(E__Value)) { \
+	SetStatement(s); \
+	__List##I(E__SetParam); \
+	ExecuteX(); \
+}
+__Expand(E__ExecuteFX)
+
+bool Sql::Fetch() {
+	SqlSession& session = GetSession();
+	session.PassStatus(ActivityStatus::FETCHING);
+	int t0 = GetTickCount();
+	bool b = cn->Fetch();
+	int t = GetTickCount();
+	if(!b) {
+		session.GetStatus().Time(t - cn->starttime);
+		session.PassStatus(ActivityStatus::END_FETCHING);
+	}
+	if(t - session.traceslow - cn->starttime > 0)
+		BugLog() << t - cn->starttime << " ms: " << cn->statement << '\n';
+	else
+	if(t - t0 - session.traceslow > 0)
+		BugLog() << t - t0 << " ms further fetch: " << cn->statement << '\n';
+	cn->starttime = INT_MAX;
+	return b;
+}
+
+#define E__GetColumn(I)    cn->GetColumn(I - 1, p##I)
+
+#define E__FetchF(I) \
+bool Sql::Fetch(__List##I(E__Ref)) { \
+	if(!Fetch()) return false; \
+	__List##I(E__GetColumn); \
+	return true; \
+}
+__Expand(E__FetchF)
+
+bool Sql::Fetch(Vector<Value>& row) {
+	if(!Fetch()) return false;
+	int n = GetColumns();
+	row.SetCount(n);
+	for(int i = 0; i < n; i++)
+		GetColumn(i, row[i]);
+	return true;
+}
+
+struct sReadFields : public FieldOperator {
+	int  pi;
+	Sql *sql;
+
+	void Field(Ref r)       { sql->GetColumn(pi++, r); }
+};
+
+void Sql::Get(Fields fo)
+{
+	sReadFields ff;
+	ff.sql = this;
+	ff.pi = 0;
+	fo(ff);
+}
+
+bool Sql::Fetch(Fields fo) {
+	if(!Fetch()) return false;
+	Get(fo);
+	return true;
+}
+
+int  Sql::GetColumns() const {
+	return cn->info.GetCount();
+}
+
+void Sql::GetColumn(int i, Ref r) const {
+	cn->GetColumn(i, r);
+}
+
+Value Sql::operator[](int i) const {
+	Value v;
+	cn->GetColumn(i, v);
+	return v;
+}
+
+Value Sql::operator[](SqlId id) const {
+	String s = ~id;
+	for(int i = 0; i < cn->info.GetCount(); i++)
+		if(cn->info[i].name == s)
+			return operator[](i);
+	return Value();
+}
+
+Vector<Value> Sql::GetRow() const {
+	Vector<Value> row;
+	int cn = GetColumns();
+	for(int i = 0; i < cn; i++)
+		row.Add((*this)[i]);
+	return row;
+}
+
+Value Sql::Select0(const String& s) {
+	SetStatement(s);
+	if(!Run())
+		return ErrorValue(GetLastError());
+	if(!Fetch())
+		return Null;
+	Value v;
+	cn->GetColumn(0, v);
+	return v;
+}
+
+Value Sql::Select(const String& s) {
+	return Select0("select " + s);
+}
+
+#define E__SelectF(I) \
+Value Sql::Select(const String& s, __List##I(E__Value)) { \
+	__List##I(E__SetParam); \
+	return Select(s); \
+}
+__Expand(E__SelectF)
+
+#define E__Inserter(I)  clist += ", ", clist += c##I, qlist += ", ?", SetParam(I, v##I)
+
+#define E__InsertF(I) \
+bool Sql::Insert(const char *table, const char *c0, const Value& v0, __List##I(E__ColVal)) { \
+	String  clist = c0; \
+	String  qlist = "?"; \
+	SetParam(0, v0); \
+	__List##I(E__Inserter); \
+	return Execute(String("insert into ") + table + '(' + clist + ") values(" + qlist + ')'); \
+}
+__Expand(E__InsertF)
+
+#define E__InserterId(I)  clist += ", ", clist += c##I.ToString(), qlist += ", ?", SetParam(I, v##I)
+
+#define E__InsertIdF(I) \
+bool Sql::Insert(SqlId table, SqlId c0, const Value& v0, __List##I(E__IdVal)) { \
+	String  clist = c0.ToString(); \
+	String  qlist = "?"; \
+	SetParam(0, v0); \
+	__List##I(E__InserterId); \
+	return Execute( \
+			String("insert into ") + table.ToString() + '(' + clist + ") values(" + qlist + ')'); \
+}
+__Expand(E__InsertIdF)
+
+
+static inline void sComma(int I, String& s) {
+	if(I > 1) s.Cat(", ");
+}
+
+#define E__Updater(I)  sComma(I, list), list.Cat(c##I), list.Cat(" = ?"), SetParam(I - 1, v##I)
+
+#define  E__UpdateF(I) \
+bool Sql::Update(const char *table, const char *key, const Value& keyval, __List##I(E__ColVal)) { \
+	String list; \
+	__List##I(E__Updater); \
+	SetParam(I, keyval); \
+	return Execute(String ("update ") + table + " set " + list + " where " + key + " = ?"); \
+}
+__Expand(E__UpdateF)
+
+#define E__UpdaterId(I)  sComma(I, list), list.Cat(c##I.ToString()), list.Cat(" = ?"), SetParam(I - 1, v##I)
+
+#define  E__UpdateIdF(I) \
+bool Sql::Update(SqlId table, SqlId key, const Value& keyval, __List##I(E__IdVal)) { \
+	String list; \
+	__List##I(E__UpdaterId); \
+	SetParam(I, keyval); \
+	return Execute(String ("update ") + table.ToString() + \
+	               " set " + list + " where " + key.ToString() + " = ?"); \
+}
+__Expand(E__UpdateIdF)
+
+bool Sql::Delete(const char *table, const char *key, const Value& keyval) {
+	return Execute("delete from " + String(table) + " where " + key + " = ?", keyval);
+}
+
+bool Sql::Delete(SqlId table, SqlId key, const Value& keyval) {
+	return Delete(~table.ToString(), ~key.ToString(), keyval);
+}
+
+int Sql::GetDialect() const {
+	return GetSession().GetDialect();
+}
+
+struct NfInsert : public FieldOperator {
+	int    i;
+	Sql   *sql;
+	String clist;
+	String qlist;
+
+	virtual void Field(const char *name, Ref f) {
+		if(i) {
+			clist += ", ";
+			qlist += ", ";
+		}
+		clist += name;
+		qlist += "? ";
+		sql->SetParam(i++, f);
+	}
+};
+
+bool Sql::Insert(Fields nf, const char *table) {
+	NfInsert w;
+	w.i = 0;
+	w.sql = this;
+	nf(w);
+	return Execute(String("insert into ") + (table ? String(table) : w.table) +
+	               '(' + w.clist + ") values(" + w.qlist + ')');
+}
+
+bool Sql::Insert(Fields nf) {
+	return Insert(nf, NULL);
+}
+
+bool Sql::Insert(Fields nf, SqlId table) {
+	return Insert(nf, (const char *)~table);
+}
+
+
+#define E__Updater(I)  sComma(I, list), list.Cat(c##I), list.Cat(" = ?"), SetParam(I - 1, v##I)
+
+struct NfUpdate : public FieldOperator {
+	int    i;
+	Sql   *sql;
+	String list;
+	String key;
+	Value  keyval;
+
+	virtual void Field(const char *name, Ref f) {
+		if(i == 0) {
+			key = name;
+			keyval = f;
+		}
+		else {
+			if(i > 1)
+				list += ", ";
+			list << name << " = ?";
+			sql->SetParam(i - 1, f);
+		}
+		i++;
+	}
+};
+
+bool Sql::Update(Fields nf, const char *table) {
+	NfUpdate w;
+	w.i = 0;
+	w.sql = this;
+	nf(w);
+	SetParam(w.i - 1, w.keyval);
+	return Execute(String ("update ") + (table ? String(table) : w.table) +
+	               " set " + w.list + " where " + w.key + " = ?");
+}
+
+bool Sql::Update(Fields nf) {
+	return Update(nf, NULL);
+}
+
+bool Sql::Update(Fields nf, SqlId table) {
+	return Update(nf, (const char *)~table);
+}
+
+void Sql::Assign(SqlSource& s) {
+	if(cn) delete cn;
+	cn = s.CreateConnection();
+}
+
+void Sql::SetError(String err, String stmt, int code, const char *scode, ERRORCLASS clss)
+{
+	GetSession().SetError(err, stmt, code, scode, clss);
+}
+
+void   Sql::ClearError()                          { GetSession().ClearError(); }
+
+String Sql::GetLastError() const                  { return GetSession().GetLastError(); }
+String Sql::GetErrorStatement() const             { return GetSession().GetErrorStatement(); }
+int    Sql::GetErrorCode() const                  { return GetSession().GetErrorCode(); }
+String Sql::GetErrorCodeString() const            { return GetSession().GetErrorCodeString(); }
+Sql::ERRORCLASS Sql::GetErrorClass() const        { return GetSession().GetErrorClass(); }
+bool   Sql::WasError() const                      { return GetSession().WasError(); }
+
+void   Sql::Begin()                               { ClearError(); GetSession().Begin(); }
+void   Sql::Commit()                              { GetSession().Commit(); }
+void   Sql::Rollback()                            { GetSession().Rollback(); }
+int    Sql::GetTransactionLevel()                 { return GetSession().GetTransactionLevel(); }
+
+String Sql::Savepoint()                           { return GetSession().Savepoint(); }
+void   Sql::RollbackTo(const String& savepoint)   { GetSession().RollbackTo(savepoint); }
+
+bool   Sql::IsOpen()                              { return cn && GetSession().IsOpen(); }
+
+#ifndef NOAPPSQL
+GLOBAL_VAR(AppSql, AppCursor)
+#endif
+
+#ifndef NOAPPSQL
+Sql::Sql() {
+	cn = NULL;
+	if(SQL.cn)
+		cn = SQL.GetSession().CreateConnection();
+}
+#endif
+
+Sql::Sql(SqlSource& s) {
+	cn = s.CreateConnection();
+}
+
+#ifndef NOAPPSQL
+Sql::Sql(const char *stmt) {
+	cn = SQL.GetSession().CreateConnection();
+	SetStatement(stmt);
+}
+#endif
+
+Sql::Sql(const char *stmt, SqlSource& s) {
+	cn = s.CreateConnection();
+	SetStatement(stmt);
+}
+
+#ifndef NOAPPSQL
+Sql::Sql(const SqlStatement& stmt) {
+	cn = SQL.GetSession().CreateConnection();
+	SetStatement(stmt);
+}
+#endif
+
+Sql::Sql(const SqlStatement& stmt, SqlSource& s) {
+	cn = s.CreateConnection();
+	SetStatement(stmt);
+}
+
+Sql::Sql(SqlConnection *connection)
+: cn(connection)
+{}
+
+void Sql::Detach()
+{
+	if(cn) delete cn;
+	cn = NULL;
+}
+
+Sql::~Sql() {
+	Detach();
+}
+
+SqlSession::SqlSession()
+{
+	trace = NULL;
+	traceslow = INT_MAX / 4;
+	logerrors = false;
+	usrlog = false;
+	tracetime = false;
+	dialect = 255;
+	errorcode_number = Null;
+	errorclass = Sql::ERROR_UNSPECIFIED;
+}
+
+SqlSession::~SqlSession()
+{
+/*
+#ifndef NOAPPSQL
+	if(SQL.IsOpen() && &SQL.GetSession() == this) {
+		LLOG("Detaching SQL");
+//		SQL.Detach();
+	}
+#endif
+*/
+}
+
+void           SqlSession::Begin()                                       { NEVER(); }
+void           SqlSession::Commit()                                      { NEVER(); }
+void           SqlSession::Rollback()                                    { NEVER(); }
+String         SqlSession::Savepoint()                                   { NEVER(); return Null; }
+void           SqlSession::RollbackTo(const String&)                     { NEVER(); }
+bool           SqlSession::IsOpen() const                                { return false; }
+int            SqlSession::GetTransactionLevel() const                   { return 0; }
+RunScript      SqlSession::GetRunScript() const                          { return NULL; }
+SqlConnection *SqlSession::CreateConnection()                            { return NULL; }
+Vector<String> SqlSession::EnumUsers()                                   { return Vector<String>(); }
+Vector<String> SqlSession::EnumDatabases()                               { return Vector<String>(); }
+Vector<String> SqlSession::EnumTables(String database)                   { return Vector<String>(); }
+Vector<String> SqlSession::EnumViews(String database)                    { return Vector<String>(); }
+Vector<String> SqlSession::EnumSequences(String database)                { return Vector<String>(); }
+Vector<String> SqlSession::EnumPrimaryKey(String database, String table) { return Vector<String>(); }
+Vector<String> SqlSession::EnumReservedWords()                           { return Vector<String>(); }
+String         SqlSession::EnumRowID(String database, String table)      { return Null; }
+
+Vector<SqlColumnInfo> SqlSession::EnumColumns(String database, String table)
+{
+	Sql cursor(*this);
+	Vector<SqlColumnInfo> info;
+	SqlBool none;
+	none.SetFalse();
+	if(cursor.Execute(Select(SqlAll()).From(SqlSet(SqlCol(database + '.' + table))).Where(none))) {
+		info.SetCount(cursor.GetColumns());
+		for(int i = 0; i < info.GetCount(); i++)
+			info[i] = cursor.GetColumnInfo(i);
+	}
+	return info;
+}
+
+void   SqlSession::SetError(String error, String stmt, int code, const char *scode, Sql::ERRORCLASS clss) {
+	lasterror = error;
+	errorstatement = stmt;
+	errorcode_number = code;
+	errorcode_string = scode;
+	errorclass = clss;
+	String err;
+	err << "ERROR " << error << "(" << code << "): " << stmt << '\n';
+	if(logerrors)
+		BugLog() << err;
+	if(GetTrace())
+		*GetTrace() << err;
+}
+
+void   SqlSession::ClearError()
+{
+	lasterror.Clear();
+	errorstatement.Clear();
+	errorcode_number = Null;
+	errorcode_string = Null;
+	errorclass = Sql::ERROR_UNSPECIFIED;
+}
+
+bool StdStatementExecutor::Execute(const String& stmt)
+{
+	cursor.Execute(stmt);
+	return true;
+}
+
+#ifndef NOAPPSQL
+struct SQLStatementExecutorClass : StatementExecutor {
+	virtual bool Execute(const String& stmt) { SQL.Execute(stmt); return true; }
+};
+
+StatementExecutor& SQLStatementExecutor() {
+	return Single<SQLStatementExecutorClass>();
+}
+#endif
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/Sql/Sql.h b/uppsrc/Sql/Sql.h
new file mode 100644
index 000000000..197123c98
--- /dev/null
+++ b/uppsrc/Sql/Sql.h
@@ -0,0 +1,23 @@
+#ifndef SQL_H
+#define SQL_H
+
+#include <Core/Core.h>
+
+NAMESPACE_UPP
+
+#ifdef flagNOAPPSQL
+	#define NOAPPSQL
+	#define APPSQLCURSOR
+	#define APPSQLSESSION
+#else
+	#define APPSQLCURSOR = SQL
+	#define APPSQLSESSION = SQL.GetSession()
+#endif
+
+#include "Sqlexp.h"
+#include "Sqls.h"
+#include "SqlSchema.h"
+
+END_UPP_NAMESPACE
+
+#endif
diff --git a/uppsrc/Sql/Sql.upp b/uppsrc/Sql/Sql.upp
new file mode 100644
index 000000000..f4ae6bd40
--- /dev/null
+++ b/uppsrc/Sql/Sql.upp
@@ -0,0 +1,31 @@
+description "Fundamental SQL classes - session, cursor, SQL language expressions, DB schemas";
+
+acceptflags
+	NOAPPSQL;
+
+uses
+	Core;
+
+file
+	Sql.h,
+	Sqlexp.h,
+	SqlCase.cpp,
+	SqlVal.cpp,
+	SqlBool.cpp,
+	SqlSet.cpp,
+	SqlStatement.cpp,
+	Sqls.h,
+	Sql.cpp,
+	Schema readonly separator,
+	SqlSchema.h,
+	SqlSchema.cpp,
+	sch_model.h,
+	sch_header.h,
+	sch_source.h,
+	sch_schema.h,
+	util_td.cpp,
+	Info readonly separator,
+	COPYING,
+	COPYING-PLAIN,
+	AUTHORS,
+	src.tpp;
diff --git a/uppsrc/Sql/SqlBool.cpp b/uppsrc/Sql/SqlBool.cpp
new file mode 100644
index 000000000..9541cee01
--- /dev/null
+++ b/uppsrc/Sql/SqlBool.cpp
@@ -0,0 +1,148 @@
+#include "Sql.h"
+
+NAMESPACE_UPP
+
+void SqlBool::SetTrue() {
+	priority = TRUEVAL;
+	text = "0=0";
+}
+
+void SqlBool::SetFalse() {
+	priority = FALSEVAL;
+	text = "0!=0";
+}
+
+void SqlBool::SetBool(bool b) {
+	if(b) SetTrue();
+	else  SetFalse();
+}
+
+SqlBool operator!(const SqlBool& a) {
+	if(a.IsBool())  return !a.AsBool();
+	return SqlBool(" not " + a(SqlS::UNARY), SqlS::UNARY);
+}
+
+SqlBool operator<(const SqlVal& a, const SqlVal& b) {
+	return SqlBool(a, " < ", b, SqlS::COMP);
+}
+
+SqlBool operator>(const SqlVal& a, const SqlVal& b) {
+	return SqlBool(a, " > ", b, SqlS::COMP);
+}
+
+SqlBool operator<=(const SqlVal& a, const SqlVal& b) {
+	return SqlBool(a, " <= ", b, SqlS::COMP);
+}
+
+SqlBool operator>=(const SqlVal& a, const SqlVal& b) {
+	return SqlBool(a, " >= ", b, SqlS::COMP);
+}
+
+SqlBool operator==(const SqlVal& a, const SqlVal& b) {
+	return a.IsNull() ? b.IsNull() ? true : SqlIsNull(b)
+		              : b.IsNull() ? SqlIsNull(a) : SqlBool(a, " = ", b, SqlS::COMP);
+}
+
+SqlBool operator!=(const SqlVal& a, const SqlVal& b) {
+	return a.IsNull() ? b.IsNull() ? false : NotNull(b)
+		              : b.IsNull() ? NotNull(a) : SqlBool(a, " != ", b, SqlS::COMP);
+
+}
+
+SqlBool operator&&(const SqlBool& a, const SqlBool& b) {
+	if(a.IsEmpty() || a.IsTrue())  return b;
+	if(b.IsEmpty() || b.IsTrue())  return a;
+	if(a.IsFalse() || b.IsFalse()) return false;
+	return SqlBool(a, " and ", b, SqlS::LAND);
+}
+
+SqlBool operator- (const SqlBool& a, const SqlBool& b) {
+	if(a.IsFalse() || b.IsTrue() || b.IsEmpty()) return SqlBool(false);
+	if(b.IsFalse()) return a;
+	return SqlBool(a, " and not ", SqlS(b(SqlS::COMP), SqlS::HIGH), SqlS::LAND);
+}
+
+SqlBool operator||(const SqlBool& a, const SqlBool& b) {
+	if(a.IsEmpty() || a.IsFalse()) return b;
+	if(b.IsEmpty() || b.IsFalse()) return a;
+	if(a.IsTrue() || b.IsTrue())   return true;
+	return SqlBool(a, " or ", b, SqlS::LOR);
+}
+
+SqlBool operator|=(SqlBool& a, const SqlBool& b) { return a = a || b; }
+
+SqlBool operator&=(SqlBool& a, const SqlBool& b) { return a = a && b; }
+
+SqlBool SqlIsNull(const SqlVal& a) {
+	return a.IsNull() ? true : SqlBool(a(SqlS::COMP) + " is NULL", SqlS::COMP);
+}
+
+SqlBool NotNull(const SqlVal& a) {
+	return a.IsNull() ? false : SqlBool(a(SqlS::COMP) + " is not NULL", SqlS::COMP);
+}
+
+SqlBool SqlFirstRow() {
+	return SqlCol("ROWNUM") == 1;
+}
+
+SqlBool Like(const SqlVal& a, const SqlVal& b) {
+	return SqlBool(a, SqlCase(MY_SQL, " like binary ")(" like "), b, SqlS::COMP);
+}
+
+SqlBool LikeUpperAscii(const SqlVal& a, const SqlVal& b) {
+	return Like(UpperAscii(a), UpperAscii(b));
+}
+
+SqlBool NotLike(const SqlVal& a, const SqlVal& b) {
+	return SqlBool(a, " not like ", b, SqlS::COMP);
+}
+
+SqlBool Between(const SqlVal& a, const SqlVal& l, const SqlVal& h) {
+	return SqlBool(a(SqlS::COMP) + " between " + l(SqlS::COMP) + " and " + h(SqlS::COMP),
+		           SqlS::COMP);
+}
+
+SqlBool NotBetween(const SqlVal& a, const SqlVal& l, const SqlVal& h) {
+	return SqlBool(a(SqlS::COMP) + " not between " + l(SqlS::COMP) + " and " + h(SqlS::COMP),
+		           SqlS::COMP);
+}
+
+SqlBool In(const SqlVal& a, const SqlSet& b) {
+	if(a.IsNull() || b.IsEmpty()) return false;
+	return SqlBool(a(SqlS::COMP) + " in " + b(), SqlS::COMP);
+}
+
+SqlBool NotIn(const SqlVal& a, const SqlSet& b) {
+	if(a.IsNull() || b.IsEmpty()) return true;
+	return SqlBool(a(SqlS::COMP) + " not in " + b(), SqlS::COMP);
+}
+
+SqlBool Exists(const SqlSet& set) {
+	return SqlBool("exists " + set(), SqlS::COMP);
+}
+
+SqlBool NotExists(const SqlSet& set) {
+	return SqlBool("not exists " + set(), SqlS::COMP);
+}
+
+SqlBool LeftJoin(SqlVal v1, SqlVal v2) {
+	return SqlCol(~v1 + "(+)") == v2;
+}
+
+SqlBool RightJoin(SqlVal v1, SqlVal v2) {
+	return v1 == SqlCol(~v2 + "(+)");
+}
+
+SqlBool Join(SqlId tab1, SqlId tab2, SqlId key) {
+	return key.Of(tab1) == key.Of(tab2);
+}
+
+SqlBool LeftJoin(SqlId tab1, SqlId tab2, SqlId key) {
+	return SqlCol(~key.Of(tab1) + "(+)") == key.Of(tab2);
+}
+
+SqlBool RightJoin(SqlId tab1, SqlId tab2, SqlId key) {
+	return key.Of(tab1) == SqlCol(~key.Of(tab2) + "(+)");
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/Sql/SqlCase.cpp b/uppsrc/Sql/SqlCase.cpp
new file mode 100644
index 000000000..c9bd6562f
--- /dev/null
+++ b/uppsrc/Sql/SqlCase.cpp
@@ -0,0 +1,255 @@
+#include "Sql.h"
+
+NAMESPACE_UPP
+
+enum {
+	SQLC_IF = 1,
+	SQLC_ELSEIF,
+	SQLC_ELSE,
+	SQLC_ENDIF,
+	SQLC_DATE,
+	SQLC_TIME,
+	SQLC_STRING,
+};
+
+template <class T>
+String MakeSqlValue(int code, T& value)
+{
+	StringBuffer b(sizeof(T) + 1);
+	b[0] = code;
+	memcpy(~b + 1, &value, sizeof(T));
+	return b;
+}
+
+template <class T>
+T ReadSqlValue(T& x, const char *&s) {
+	memcpy(&x, s, sizeof(T));
+	s += sizeof(T);
+	return x;
+}
+
+static String SqlFormat__(const char *s, int res, bool mysql) {
+	if(!s || !*s) return "NULL";
+	String result;
+	result.Reserve(res);
+	result.Cat("\'");
+	for(; *s; s++) {
+		if(*s == '\'')
+			result.Cat(mysql ? "\\\'" : "\'\'");
+		else {
+			if((*s == '\"' || *s == '\\') && mysql)
+				result.Cat('\\');
+			result.Cat(*s);
+		}
+	}
+	result.Cat('\'');
+	return result;
+}
+
+
+void SqlCompile(const char *&s, StringBuffer *r, byte dialect)
+{
+	for(;;) {
+		int c = *s++;
+		switch(c) {
+		case SQLC_IF: {
+			StringBuffer *er = r;
+			for(;;) {
+				c = *s++;
+				if(c & dialect) {
+					SqlCompile(s, er, dialect);
+					er = NULL;
+				}
+				else
+					SqlCompile(s, NULL, dialect);
+				if(*s == '\0')
+					return;
+				c = *s++;
+				if(c == SQLC_ELSE) {
+					SqlCompile(s, er, dialect);
+					ASSERT(*s == SQLC_ENDIF);
+					s++;
+					break;
+				}
+				if(c == SQLC_ENDIF)
+					break;
+				ASSERT(c == SQLC_ELSEIF);
+			}
+		}
+		break;
+		case SQLC_DATE: {
+			Date x;
+			ReadSqlValue(x, s);
+			if(!r) break;
+			if(IsNull(x)) {
+				*r << "NULL";
+				break;
+			}
+			switch(dialect) {
+			case MSSQL:
+				*r << Format("convert(datetime, '%d/%d/%d', 120)", x.year, x.month, x.day);
+				break;
+			case ORACLE:
+				*r << Format("to_date('%d/%d/%d', 'SYYYY/MM/DD')", x.year, x.month, x.day);
+				break;
+			default:
+				*r << Format("\'%04d-%02d-%02d\'", x.year, x.month, x.day);
+			}
+			break;
+		}
+		case SQLC_TIME: {
+			Time x;
+			ReadSqlValue(x, s);
+			if(!r) break;
+			if(IsNull(x)) {
+				*r << "NULL";
+				break;
+			}
+			switch(dialect) {
+			case MSSQL:
+				*r << Format(x.hour || x.minute || x.second
+				             ? "convert(datetime, '%d/%d/%d %d:%d:%d', 120)"
+				             : "convert(datetime, '%d/%d/%d', 120)",
+				             x.year, x.month, x.day, x.hour, x.minute, x.second);
+				break;
+			case ORACLE:
+				*r << Format("to_date('%d/%d/%d/%d', 'SYYYY/MM/DD/SSSSS')",
+				             x.year, x.month, x.day, x.second + 60 * (x.minute + 60 * x.hour));
+				break;
+			default:
+				*r << Format("\'%04d-%02d-%02d %02d:%02d:%02d\'",
+				             x.year, x.month, x.day, x.hour, x.minute, x.second);
+			}
+			break;
+		}
+		case SQLC_STRING: {
+			int l;
+			ReadSqlValue(l, s);
+			String x = String(s, l);
+			s += l;
+			if(!r) break;
+			if(IsNull(x)) {
+				*r << "NULL";
+				break;
+			}
+			r->Cat('\'');
+			for(const char *q = x; *q; q++) {
+				if(*q == '\'')
+					r->Cat(dialect == MY_SQL ? "\\\'" : "\'\'");
+				else {
+					if((*q == '\"' || *q == '\\') && dialect == MY_SQL)
+						r->Cat('\\');
+					r->Cat(*q);
+				}
+			}
+			r->Cat('\'');
+			break;
+		}
+		default:
+			if(c >= 0 && c < 32) {
+				s--;
+				return;
+			}
+			else
+				if(r) r->Cat(c);
+		}
+	}
+}
+
+String SqlCompile(byte dialect, const String& s)
+{
+	StringBuffer b;
+	b.Reserve(s.GetLength() + 100);
+	const char *q = s;
+	SqlCompile(q, &b, dialect);
+	return b;
+}
+
+String SqlFormat(int x)
+{
+	if(IsNull(x)) return "NULL";
+	return Format("%d", x);
+}
+
+String SqlFormat(double x)
+{
+	if(IsNull(x)) return "NULL";
+	return FormatDouble(x, 20);
+}
+
+String SqlFormat(int64 x)
+{
+	if(IsNull(x)) return "NULL";
+	return FormatInt64(x);
+}
+
+String SqlFormat(const char *s, int l)
+{
+	StringBuffer b(1 + sizeof(int) + l);
+	b[0] = SQLC_STRING;
+	memcpy(~b + 1, &l, sizeof(int));
+	memcpy(~b + 1 + sizeof(int), s, l);
+	return b;
+}
+
+String SqlFormat(const char *s)
+{
+	return SqlFormat(s, strlen(s));
+}
+
+String SqlFormat(const String& x)
+{
+	return SqlFormat(x, x.GetLength());
+}
+
+String SqlFormat(Date x)
+{
+	return MakeSqlValue(SQLC_DATE, x);
+}
+
+String SqlFormat(Time x)
+{
+	return MakeSqlValue(SQLC_TIME, x);
+}
+
+String SqlFormat(const Value& x)
+{
+	if(x.IsNull()) return "NULL";
+	switch(x.GetType()) {
+	case BOOL_V:
+	case INT_V:
+		return SqlFormat((int) x);
+	case INT64_V:
+		return SqlFormat((int64) x);
+	case DOUBLE_V:
+		return SqlFormat((double) x);
+	case STRING_V:
+	case WSTRING_V:
+		return SqlFormat(String(x));
+	case DATE_V:
+		return SqlFormat(Date(x));
+	case TIME_V:
+		return SqlFormat(Time(x));
+	}
+	NEVER();
+	return "NULL";
+}
+
+String SqlCase::operator()(const String& text) {
+	return s << (char)SQLC_ELSE << text << (char)SQLC_ENDIF;
+}
+
+String SqlCase::operator()() {
+	return s << (char)SQLC_ENDIF;
+}
+
+SqlCase SqlCase::operator()(byte cond, const String& text) {
+	s << (char)SQLC_ELSEIF << (char)cond << text;
+	return *this;
+}
+
+SqlCase::SqlCase(byte cond, const String& text) {
+	s << (char)SQLC_IF << (char)cond << text;
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/Sql/SqlSchema.cpp b/uppsrc/Sql/SqlSchema.cpp
new file mode 100644
index 000000000..5949e7db9
--- /dev/null
+++ b/uppsrc/Sql/SqlSchema.cpp
@@ -0,0 +1,209 @@
+#include "Sql.h"
+
+NAMESPACE_UPP
+
+void SqlSchema::FlushColumn() {
+	if(column.IsEmpty()) return;
+	for(int i = items ? 0 : Null; items ? i < items : IsNull(i); i++) {
+		String cn = Format("\t%-20s ", ~Expand("@c", i)) + CurrentType();
+		if(dialect == SQLITE3)
+			cn = Format(" %s ", ~Expand("@c", i)) + CurrentType();
+		String attr = Expand(attribute, i);
+		String cd = cn + attr;
+		if(firstcolumn) {
+			if (dialect == SQLITE3)
+				Upgrade() << Expand("create table @t ( ") << cd << " )" << table_suffix << ";\n";
+			else
+				Upgrade() << Expand("create table @t (\n") << cd << "\n)" << table_suffix << ";\n\n";
+		}
+		else
+		{
+			if(dialect == MSSQL) {
+				Upgrade() << Expand("alter table @t add ") << cn << ";\n";
+				Upgrade() << Expand("alter table @t alter column ") << cd << ";\n";
+			}
+			else if (dialect == SQLITE3)
+				Upgrade() << Expand("alter table @t add ") << cd << ";\n";
+			else if (dialect == PGSQL)
+				Upgrade() << Expand("alter table @t add \n") << cd << "\n;\n\n";
+			else
+				Upgrade() << Expand("alter table @t add (\n") << cd << "\n);\n\n";
+			Schema() << ",\n";
+		}
+		Schema() << cd;
+		firstcolumn = false;
+	}
+	column.Clear();
+}
+
+void SqlSchema::FlushTable() {
+	FlushColumn();
+	if(!table.IsEmpty())
+		Schema() << "\n)" << table_suffix << ";\n\n";
+	table.Clear();
+}
+
+void SqlSchema::Object(const char *text, const char *drop) {
+	FlushTable();
+	Schema() << text << '\n';
+	SchemaDrop() << drop << '\n';
+}
+
+void SqlSchema::Upgrade(const char *text) {
+	Upgrade() << text << '\n';
+}
+
+void SqlSchema::Table(const char *name) {
+	FlushTable();
+	table = name;
+	table_suffix = Null;
+	Schema() << Expand("create table @t (\n");
+	SchemaDrop() << Expand("drop table @t;\n");
+	Attributes() << '\n';
+	AttributesDrop() << '\n';
+	firstcolumn = true;
+}
+
+void SqlSchema::TableSuffix(const char *suffix)
+{
+	table_suffix << suffix;
+}
+
+void SqlSchema::Column(const char *_type, const char *name) {
+	FlushColumn();
+
+	items = 0;
+	type = _type;
+	column = prefix + name;
+	attribute.Clear();
+}
+
+void SqlSchema::ColumnArray(const char *type, const char *name, int _items) {
+	Column(type, name);
+	items = _items;
+}
+
+void SqlSchema::Attribute(const char *attr, const char *drop) {
+	for(int i = items ? 0 : Null; items ? i < items : IsNull(i); i++) {
+		Attributes() << Expand(attr, i) << '\n';
+		AttributesDrop() << Expand(drop, i) << '\n';
+	}
+}
+
+void SqlSchema::InlineAttribute(const char *attr) {
+	attribute << (*attr == ',' ? "" : " ") << Expand(attr);
+}
+
+void SqlSchema::Config(const char *config, const char *drop) {
+	Config() << config;
+	ConfigDrop() << drop;
+}
+
+String SqlSchema::CurrentTable() const
+{
+	return IsNull(schemaname) ? table : schemaname + '.' + table;
+}
+
+String SqlSchema::Expand(const char *txt, int i) const
+{
+	String n, r;
+	if(!IsNull(i))
+		n = Format("%d", i);
+	String c = CurrentColumn() + n;
+	String v = table + '$' + c;
+	v = v.Mid(max(0, min(v.GetLength(), v.GetLength() - maxidlen)));
+	while(*txt) {
+		if(*txt == '@' && txt[1]) {
+			switch(*++txt) {
+			case 'i': r.Cat(n); break;
+			case 't': r.Cat(CurrentTable()); break;
+			case 'u': r.Cat(table); break;
+			case 'c': r.Cat(c); break;
+			case 'C': r.Cat(CurrentColumn()); break;
+			case 'T': r.Cat(CurrentType()); break;
+			case 'x': r.Cat(v); break;
+			case 's': if(!IsNull(schemaname)) { r.Cat(schemaname); r.Cat('.'); } break;
+			default:  r.Cat(*txt); break;
+			}
+		}
+		else
+			r.Cat(*txt);
+		txt++;
+	}
+	return r;
+}
+
+void SqlSchema::Var(void (*type)(SqlSchema& s), const char *name) {
+	String p = prefix;
+	prefix << name << '$';
+	(*type)(*this);
+	prefix = p;
+}
+
+String& SqlSchema::Script(int si)   { return script.At(si); }
+String  SqlSchema::Script(int si) const  { return si < script.GetCount() ? script[si] : String(); }
+String& SqlSchema::Schema()         { return Script(SCHEMA); }
+String& SqlSchema::SchemaDrop()     { return Script(DROPSCHEMA); }
+String& SqlSchema::Attributes()     { return Script(ATTRIBUTES); }
+String& SqlSchema::AttributesDrop() { return Script(DROPATTRIBUTES); }
+String& SqlSchema::Upgrade()        { return Script(UPGRADE); }
+String& SqlSchema::UpgradeDrop()    { return Script(DROPUPGRADE); }
+String& SqlSchema::Config()         { return Script(CONFIG); }
+String& SqlSchema::ConfigDrop()     { return Script(DROPCONFIG); }
+
+String SqlSchema::NormalFileName(int i, const char *dir, const char *name) const {
+	ASSERT(i >= 0 && i <= DROPCONFIG);
+	String n;
+	if(name)
+		n = name;
+	else
+#ifdef PLATFORM_WIN32
+		n = ForceExt(GetFileName(GetExeFilePath()), ".sql");
+#endif
+#ifdef PLATFORM_POSIX
+		n = "script.sql";
+#endif
+	const char *pfx[] = {
+		"S_", "SD_", "A_", "AD_", "U_", "UD_", "C_", "CD_"
+	};
+	return dir ? AppendFileName(dir, pfx[i] + n) : ConfigFile(pfx[i] + n);
+}
+
+bool SqlSchema::ScriptChanged(int i, const char *dir, const char *name) const {
+	String fn = NormalFileName(i, dir, name);
+	return LoadFile(fn) != Script(i);
+}
+
+bool SqlSchema::UpdateNormalFile(int i, const char *dir, const char *name) const {
+	String fn = NormalFileName(i, dir, name);
+	if(LoadFile(fn) != Script(i)) {
+		DeleteFile(fn);
+		SaveFile(fn, Script(i));
+		return true;
+	}
+	return false;
+}
+
+void SqlSchema::SaveNormal(const char *dir, const char *name) const {
+	for(int i = SCHEMA; i <= DROPCONFIG; i++)
+		UpdateNormalFile(i, dir, name);
+}
+
+SqlSchema::SqlSchema(int dialect_)
+{
+	dialect = dialect_;
+	if(dialect == MSSQL)
+		maxidlen = 128;
+	else
+		maxidlen = 24;
+}
+
+void operator*(SqlSchema& schema, const SqlInsert& insert) {
+	schema.Config() << SqlStatement(insert).Get(schema.GetDialect()) << ";\n";
+	schema.ConfigDrop() << SqlStatement(Delete(insert.GetTable())
+		                                .Where(insert.GetKeyColumn() == insert.GetKeyValue()))
+		                   .Get(schema.GetDialect())
+	                    << ";\n";
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/Sql/SqlSchema.h b/uppsrc/Sql/SqlSchema.h
new file mode 100644
index 000000000..57d4e5c33
--- /dev/null
+++ b/uppsrc/Sql/SqlSchema.h
@@ -0,0 +1,109 @@
+// attribute macros
+//
+// @i      array index (or "" when no array)
+// @t      table name
+// @c      column name (with index)
+// @C      column name (without index)
+// @T      column type
+// @x      combined column+table up to maxidlen characters (default 24) (for constraint names)
+
+class SqlSchema {
+protected:
+	Vector<String> script;
+	String         schemaname;
+	String         prefix;
+	String         table;
+	String         table_suffix;
+	String         type;
+	String         column;
+	bool           firstcolumn;
+	String         attribute;
+	int            items;
+	int            dialect;
+
+	int            maxidlen;
+
+public:
+	virtual void FlushColumn();
+	virtual void FlushTable();
+
+	void Object(const char *text, const char *drop);
+
+	void Table(const char *name);
+	void TableSuffix(const char *suffix);
+	void Column(const char *type, const char *name);
+	void ColumnArray(const char *type, const char *name, int items);
+	void Attribute(const char *attr, const char *drop);
+	void InlineAttribute(const char *attr);
+	void EndTable()                                        { FlushTable(); }
+
+	void Config(const char *config, const char *drop);
+	void Upgrade(const char *text);
+
+	String  CurrentTable() const;
+	String  CurrentColumn() const                          { return column; }
+	String  CurrentType() const                            { return Expand(type); }
+	String  Expand(const char *txt, int i = Null) const;
+
+	enum {
+		SCHEMA, DROPSCHEMA, ATTRIBUTES, DROPATTRIBUTES, UPGRADE, DROPUPGRADE, CONFIG, DROPCONFIG
+	};
+
+	String& Script(int si);
+	String  Script(int si) const;
+
+	String& Schema();
+	String& SchemaDrop();
+	String& Attributes();
+	String& AttributesDrop();
+	String& Upgrade();
+	String& UpgradeDrop();
+	String& Config();
+	String& ConfigDrop();
+
+	String  NormalFileName(int i, const char *dir = NULL, const char *name = NULL) const;
+	bool    ScriptChanged(int i, const char *dir = NULL, const char *name = NULL) const;
+	bool    UpdateNormalFile(int i, const char *dir = NULL, const char *name = NULL) const;
+	void    SaveNormal(const char *dir = NULL, const char *name = NULL) const;
+
+	void Var(void (*type)(SqlSchema& s), const char *name);
+
+	SqlSchema& SchemaName(String sch)                          { schemaname = sch; return *this; }
+	SqlSchema& MaxIDLen(int n)                                 { maxidlen = n; return *this; }
+	
+	int        GetDialect() const                              { return dialect; }
+
+#ifndef NOAPPSQL
+	SqlSchema(int dialect = SQL.GetDialect());
+#else
+	SqlSchema(int dialect);
+#endif
+	virtual ~SqlSchema() {}
+};
+
+void operator*(SqlSchema& schema, const SqlInsert& insert);
+
+template <class T>
+inline void SqlSchemaInitClear(T& a) {}
+
+template <class T>
+inline void SqlSchemaInitClear(T *a, int n) {
+	while(n--)
+		SqlSchemaInitClear(*a++);
+}
+
+inline void SqlSchemaInitClear(int& a)    { a = Null; }
+inline void SqlSchemaInitClear(double& a) { a = Null; }
+inline void SqlSchemaInitClear(int64& a)  { a = Null; }
+inline void SqlSchemaInitClear(bool& a)   { a = false; }
+
+template <class T>
+inline void SqlSchemaClear(T& a)          { a = Null; }
+
+inline void SqlSchemaClear(bool& a)       { a = false; }
+
+template <class T>
+inline void SqlSchemaClear(T *a, int n) {
+	while(n--)
+		SqlSchemaClear(*a++);
+}
diff --git a/uppsrc/Sql/SqlSet.cpp b/uppsrc/Sql/SqlSet.cpp
new file mode 100644
index 000000000..6e72de938
--- /dev/null
+++ b/uppsrc/Sql/SqlSet.cpp
@@ -0,0 +1,95 @@
+#include "Sql.h"
+
+NAMESPACE_UPP
+
+SqlSet operator|(const SqlSet& s1, const SqlSet& s2) {
+	if(s1.IsEmpty()) return s2;
+	if(s2.IsEmpty()) return s1;
+	return SqlSet(s1() + " union " + s2(), SqlSet::SETOP);
+}
+
+SqlSet operator&(const SqlSet& s1, const SqlSet& s2) {
+	if(s1.IsEmpty()) return s2;
+	if(s2.IsEmpty()) return s1;
+	return SqlSet(s1() + " intersect " + s2(), SqlSet::SETOP);
+}
+
+SqlSet operator-(const SqlSet& s1, const SqlSet& s2) {
+	if(s1.IsEmpty() || s2.IsEmpty())
+		return s1;
+	return SqlSet(s1() + " minus " + s2(), SqlSet::SETOP);
+}
+
+String SqlSet::operator~() const {
+	if(IsEmpty()) return "null";
+	return text;
+}
+
+String SqlSet::operator()() const {
+	if(IsEmpty()) return "null";
+	return '(' + text + ')';
+}
+
+String SqlSet::operator()(int at) const {
+	if(IsEmpty()) return "null";
+	return at > priority ? '(' + text + ')' : text;
+}
+
+SqlSet& SqlSet::Cat(const SqlVal& val) {
+	if(!IsEmpty()) text.Cat(", ");
+	text.Cat(~val);
+	priority = SET;
+	return *this;
+}
+
+SqlSet& SqlSet::Cat(const SqlSet& set) {
+	if(set.IsEmpty()) return *this;
+	if(!IsEmpty()) text.Cat(", ");
+	text.Cat(set.text);
+	priority = SET;
+	return *this;
+}
+
+SqlSet::SqlSet(const SqlVal& p0) {
+	Cat(p0);
+	priority = SET;
+}
+
+static inline void sCat(SqlSet& s, SqlVal v) { s.Cat(v); }
+
+#define E__Cat(I)       sCat(*this, p##I)
+
+#define E__SqlSetF(I) \
+SqlSet::SqlSet(const SqlVal& p0, __List##I(E__SqlVal)) { \
+	Cat(p0); \
+	__List##I(E__Cat); \
+	priority = SET; \
+}
+__Expand(E__SqlSetF);
+
+FieldOperator::FieldOperator() {}
+FieldOperator::~FieldOperator() {}
+
+struct FieldSqlSet : FieldOperator {
+	SqlSet *set;
+
+	virtual void Field(const char *name, Ref) {
+		set->Cat(SqlCol(name));
+	}
+};
+
+SqlSet::SqlSet(Fields nfields) {
+	FieldSqlSet fo;
+	fo.set = this;
+	nfields(fo);
+	priority = SET;
+}
+
+void FieldDumper::Field(const char *name, Ref f)
+{
+	if(!s.IsEmpty())
+		s.Cat(", ");
+	s << name << " = " << Value(f);
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/Sql/SqlStatement.cpp b/uppsrc/Sql/SqlStatement.cpp
new file mode 100644
index 000000000..addb3751d
--- /dev/null
+++ b/uppsrc/Sql/SqlStatement.cpp
@@ -0,0 +1,296 @@
+#include "Sql.h"
+
+NAMESPACE_UPP
+
+String SqlStatement::Get(int dialect) const {
+	ASSERT(dialect == ORACLE || dialect == SQLITE3 || dialect == MY_SQL || dialect == MSSQL ||
+	       dialect == PGSQL || dialect == FIREBIRD || dialect == DB2);
+	return SqlCompile(dialect, text);
+}
+
+SqlSelect& SqlSelect::operator|=(const SqlSelect& s2) {
+	text << " union (" << s2.text << ')';
+	return *this;
+}
+
+SqlSelect& SqlSelect::operator&=(const SqlSelect& s2) {
+	text << " intersect (" << s2.text << ')';
+	return *this;
+}
+
+SqlSelect& SqlSelect::operator-=(const SqlSelect& s2) {
+	text << " minus (" << s2.text << ')';
+	return *this;
+}
+
+SqlSelect operator|(const SqlSelect& s1, const SqlSelect& s2) {
+	SqlSelect s = s1;
+	s |= s2;
+	return s;
+}
+
+SqlSelect operator&(const SqlSelect& s1, const SqlSelect& s2) {
+	SqlSelect s = s1;
+	s &= s2;
+	return s;
+}
+
+SqlSelect operator-(const SqlSelect& s1, const SqlSelect& s2) {
+	SqlSelect s = s1;
+	s -= s2;
+	return s;
+}
+
+SqlSelect& SqlSelect::Where(const SqlBool& exp) {
+	if(!exp.IsTrue() && !exp.IsEmpty())
+		text << " where " << ~exp;
+	return *this;
+}
+
+SqlSelect& SqlSelect::On(const SqlBool& exp) {
+	if(!exp.IsTrue() && !exp.IsEmpty())
+		text << " on " << ~exp;
+	return *this;
+}
+
+SqlSelect& SqlSelect::StartWith(const SqlBool& exp) {
+	text << " start with " << ~exp;
+	return *this;
+}
+
+SqlSelect& SqlSelect::ConnectBy(const SqlBool& exp) {
+	text << " connect by " << ~exp;
+	return *this;
+}
+
+SqlSelect& SqlSelect::GroupBy(const SqlSet& set) {
+	text << " group by " << ~set;
+	return *this;
+}
+
+SqlSelect& SqlSelect::Having(const SqlBool& exp) {
+	text << " having " << ~exp;
+	return *this;
+}
+
+SqlSelect& SqlSelect::OrderBy(const SqlSet& set) {
+	if(!set.IsEmpty())
+		text << " order by " << ~set;
+	return *this;
+}
+
+SqlSelect& SqlSelect::ForUpdate() {
+	text << " for update";
+	return *this;
+}
+
+SqlSelect& SqlSelect::NoWait() {
+	text << " nowait";
+	return *this;
+}
+
+SqlSelect& SqlSelect::Limit(int limit) {
+	text << " limit " << limit;
+	return *this;
+}
+
+SqlSelect& SqlSelect::Limit(int64 offset, int limit) {
+	text << " limit " << offset << ", " << limit;
+	return *this;
+}
+
+SqlSelect& SqlSelect::Offset(int64 offset) {
+	text << " offset " << offset;
+	return *this;
+}
+
+SqlSelect& SqlSelect::Hint(const char *hint)
+{
+	text = "/*+ " + String(hint) + " */ " + text;
+	return *this;
+}
+
+SqlSelect& SqlSelect::Get() {
+	text = "select " + text + SqlCase(ORACLE, "from DUAL")("");
+	return *this;
+}
+
+SqlSelect& SqlSelect::From(const SqlSet& table) {
+	text = "select " + text + " from " + table(SqlSet::SETOP + 1);
+	return *this;
+}
+
+SqlSelect& SqlSelect::From(SqlId table) {
+	text = "select " + text + " from " + ~table;
+	return *this;
+}
+
+SqlSelect& SqlSelect::From(SqlId table1, SqlId table2) {
+	text = "select " + text + " from " + ~table1 + ", " + ~table2;
+	return *this;
+}
+
+SqlSelect& SqlSelect::From(SqlId table1, SqlId table2, SqlId table3) {
+	text = "select " + text + " from " + ~table1 + ", " + ~table2 + ", " + ~table3;
+	return *this;
+}
+
+SqlSelect& SqlSelect::InnerJoin(SqlId table) {
+	text << " inner join " << ~table;
+	return *this;
+}
+
+SqlSelect& SqlSelect::LeftJoin(SqlId table) {
+	text << " left outer join " << ~table;
+	return *this;
+}
+
+SqlSelect& SqlSelect::RightJoin(SqlId table) {
+	text << " right outer join " << ~table;
+	return *this;
+}
+
+SqlSelect& SqlSelect::FullJoin(SqlId table) {
+	text << " full outer join " << ~table;
+	return *this;
+}
+
+SqlSelect::SqlSelect(Fields f) {
+	SqlSet set(f);
+	text = ~set;
+}
+
+#define E__SCat(I)       set.Cat(p##I)
+
+#define E__QSelectF(I) \
+SqlSelect Select(__List##I(E__SqlVal)) { \
+	SqlSet set; \
+	__List##I(E__SCat); \
+	return Select(set); \
+}
+__Expand(E__QSelectF);
+
+
+// -------------------------------
+
+SqlDelete::SqlDelete(SqlVal table) {
+	text = "delete from " + ~table;
+}
+
+SqlDelete& SqlDelete::Where(const SqlBool& b) {
+	text << " where " << ~b;
+	return *this;
+}
+
+void SqlInsert::Column(SqlId column, SqlVal val) {
+	set1.Cat(column);
+	set2.Cat(val);
+	if(keycolumn.IsNull()) keycolumn = column;
+	if(keyvalue.IsEmpty()) keyvalue =val;
+}
+
+SqlInsert::operator SqlStatement() const {
+	String s = "insert into " + ~table + set1();
+	if(from.IsEmpty())
+		s << " values " << set2();
+	else
+		s << ' ' + SqlStatement(Select(set2).From(from).Where(where)).GetText();
+	return SqlStatement(s);
+}
+
+SqlInsert& SqlInsert::From(SqlId from) {
+	return From(SqlSet(from));
+}
+
+struct InsertFieldOperator : public FieldOperator {
+	SqlInsert *insert;
+
+	virtual void Field(const char *name, Ref f)	{
+		insert->Column(name, (Value)f);
+	}
+};
+
+SqlInsert::SqlInsert(Fields f) {
+	InsertFieldOperator ifo;
+	ifo.insert = this;
+	f(ifo);
+	table = ifo.table;
+}
+
+SqlInsert& SqlInsert::operator()(Fields f) {
+	InsertFieldOperator ifo;
+	ifo.insert = this;
+	f(ifo);
+	return *this;
+}
+
+struct UpdateFieldOperator : public FieldOperator {
+	SqlUpdate *update;
+
+	virtual void Field(const char *name, Ref f)	{
+		update->Column(name, (Value)f);
+	}
+};
+
+SqlUpdate::SqlUpdate(Fields f) {
+	UpdateFieldOperator ufo;
+	ufo.update = this;
+	f(ufo);
+	table = ufo.table;
+}
+
+SqlUpdate& SqlUpdate::operator()(Fields f) {
+	UpdateFieldOperator ufo;
+	ufo.update = this;
+	f(ufo);
+	return *this;
+}
+
+// ------------------------------------
+
+SqlUpdate::operator SqlStatement() const {
+	return SqlStatement("update " + ~table + " set " + ~set + " where " + ~where);
+}
+
+void SqlUpdate::Column(SqlId column, SqlVal val) {
+	set.Cat(SqlVal(SqlVal(column), " = ", val, SqlS::COMP));
+}
+
+// ------------------------------------
+// deprecated
+
+bool SqlStatement::Execute(Sql& cursor) const {
+	ASSERT(text.GetCount());
+	return cursor.Execute(*this);
+}
+
+void SqlStatement::Force(Sql& cursor) const {
+	ASSERT(text.GetCount());
+	if(!cursor.Execute(*this))
+		throw SqlExc(cursor.GetSession());
+}
+
+Value SqlStatement::Fetch(Sql& cursor) const {
+	ASSERT(text.GetCount());
+	if(!Execute(cursor))
+		return ErrorValue(SqlExc(cursor.GetSession()));
+	if(!cursor.Fetch())
+		return Null;
+	return cursor[0];
+}
+
+#ifndef NOAPPSQL
+bool SqlStatement::Execute() const {
+	return Execute(SQL);
+}
+
+void SqlStatement::Force() const {
+	Force(SQL);
+}
+
+Value SqlStatement::Fetch() const {
+	return Fetch(SQL);
+}
+#endif
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/Sql/SqlVal.cpp b/uppsrc/Sql/SqlVal.cpp
new file mode 100644
index 000000000..22331a987
--- /dev/null
+++ b/uppsrc/Sql/SqlVal.cpp
@@ -0,0 +1,371 @@
+#include "Sql.h"
+
+NAMESPACE_UPP
+
+SqlCol SqlCol::As(const char *as) const
+{
+	return name + SqlCase(MSSQL | PGSQL, " as ")(" ") + as;
+}
+
+SqlCol SqlId::Of(SqlId id) const
+{
+	return id.IsNull() ? ToString() : id.ToString() + '.' + ToString();
+}
+
+SqlId SqlId::As(const char *as) const
+{
+	return id.IsNull() ? ToString() : ToString() + SqlCase(MSSQL | PGSQL, " as ")(" ") + as;
+}
+
+SqlId SqlId::operator [] (int i) const
+{
+	return SqlId(ToString() + FormatInt(i));
+}
+
+SqlId SqlId::operator&(const SqlId& s) const
+{
+	return SqlId(ToString() + "$" + s.ToString());
+}
+
+String SqlS::operator()() const
+{
+	return '(' + text + ')';
+}
+
+String SqlS::operator()(int at) const
+{
+	return at > priority ? operator()() : text;
+}
+
+SqlS::SqlS(const SqlS& a, const char *o, const SqlS& b, int pr, int prb) {
+	text = a(pr) + o + b(prb);
+	priority = pr;
+}
+
+SqlS::SqlS(const SqlS& a, const char *o, const SqlS& b, int pr) {
+	text = a(pr) + o + b(pr);
+	priority = pr;
+}
+
+SqlVal::SqlVal(const String& x) {
+	if(UPP::IsNull(x))
+		SetNull();
+	else
+		SetHigh(SqlFormat(x));
+}
+
+SqlVal::SqlVal(const char *s) {
+	if(s && *s)
+		SetHigh(SqlFormat(s));
+	else
+		SetNull();
+}
+
+SqlVal::SqlVal(int x) {
+	if(UPP::IsNull(x))
+		SetNull();
+	else
+		SetHigh(SqlFormat(x));
+}
+
+SqlVal::SqlVal(int64 x) {
+	if(UPP::IsNull(x))
+		SetNull();
+	else
+		SetHigh(SqlFormat(x));
+}
+
+SqlVal::SqlVal(double x) {
+	if(UPP::IsNull(x))
+		SetNull();
+	else
+		SetHigh(SqlFormat(x));
+}
+
+SqlVal::SqlVal(Date x) {
+	if(UPP::IsNull(x))
+		SetNull();
+	else
+		SetHigh(SqlFormat(x));
+}
+
+SqlVal::SqlVal(Time x) {
+	if(UPP::IsNull(x))
+		SetNull();
+	else
+		SetHigh(SqlFormat(x));
+}
+
+SqlVal::SqlVal(const Value& x) {
+	if(UPP::IsNull(x))
+		SetNull();
+	else
+		SetHigh(SqlFormat(x));
+}
+
+SqlVal::SqlVal(const Nuller&) {
+	SetNull();
+}
+
+SqlVal::SqlVal(SqlId id) {
+	SetHigh(id.ToString());
+}
+
+SqlVal::SqlVal(const SqlId& (*id)())
+{
+	SetHigh((*id)().ToString());
+}
+
+SqlVal::SqlVal(SqlCol id) {
+	SetHigh(id.ToString());
+}
+
+SqlVal operator-(const SqlVal& a) {
+	return SqlVal('-' + a(SqlS::UNARY), SqlS::UNARY);
+}
+
+SqlVal operator+(const SqlVal& a, const SqlVal& b) {
+	return SqlVal(a, " + ", b, SqlS::ADD);
+}
+
+SqlVal operator-(const SqlVal& a, const SqlVal& b) {
+	return SqlVal(a," - ", b, SqlS::ADD, SqlS::ADD + 1);
+}
+
+SqlVal operator*(const SqlVal& a, const SqlVal& b) {
+	return SqlVal(a, " * ", b, SqlS::MUL);
+}
+
+SqlVal operator/(const SqlVal& a, const SqlVal& b) {
+	return SqlVal(a, " / ", b, SqlS::MUL, SqlS::MUL + 1);
+}
+
+SqlVal operator%(const SqlVal& a, const SqlVal& b) {
+	return SqlFunc("mod", a, b);
+}
+
+SqlVal operator|(const SqlVal& a, const SqlVal& b) {
+	return SqlVal(a, SqlCase(ORACLE, " || ")(PGSQL, " || ")(" + "), b, SqlS::MUL);
+}
+
+SqlVal& operator+=(SqlVal& a, const SqlVal& b)     { return a = a + b; }
+SqlVal& operator-=(SqlVal& a, const SqlVal& b)     { return a = a - b; }
+SqlVal& operator*=(SqlVal& a, const SqlVal& b)     { return a = a * b; }
+SqlVal& operator/=(SqlVal& a, const SqlVal& b)     { return a = a / b; }
+SqlVal& operator%=(SqlVal& a, const SqlVal& b)     { return a = a % b; }
+SqlVal& operator|=(SqlVal& a, const SqlVal& b)     { return a = a | b; }
+
+SqlVal SqlFunc(const char *name, const SqlVal& a) {
+	return SqlVal(name + a(), SqlS::FN);
+}
+
+SqlVal SqlFunc(const char *n, const SqlVal& a, const SqlVal& b) {
+	return SqlVal(String(n) + '(' + ~a + ", " + ~b + ')', SqlS::FN);
+}
+
+SqlVal SqlFunc(const char *n, const SqlVal& a, const SqlVal& b, const SqlVal& c) {
+	return SqlVal(String(n) + '(' + ~a + ", " + ~b + ", " + ~c + ')', SqlS::FN);
+}
+
+SqlVal SqlFunc(const char *n, const SqlVal& a, const SqlVal& b, const SqlVal& c, const SqlVal& d) {
+	return SqlVal(String(n) + '(' + ~a + ", " + ~b + ", " + ~c + ", " + ~d + ')', SqlS::FN);
+}
+
+SqlVal SqlFunc(const char *name, const SqlSet& set) {
+	return SqlVal(name + set(), SqlS::FN);
+}
+
+SqlVal Decode(const SqlVal& exp, const SqlSet& variants) {
+	ASSERT(!variants.IsEmpty());
+	return SqlVal("decode("  + ~exp  + ", " + ~variants + ')', SqlS::FN);
+}
+
+SqlVal Distinct(const SqlVal& exp) {
+	return SqlVal("distinct " + exp(SqlS::ADD), SqlS::UNARY);
+}
+
+SqlSet Distinct(const SqlSet& columns) {
+	return SqlSet("distinct " + ~columns, SqlSet::SET);
+}
+
+SqlVal All(const SqlVal& exp) {
+	return SqlVal("all " + exp(SqlS::ADD), SqlS::UNARY);
+}
+
+SqlSet All(const SqlSet& columns) {
+	return SqlSet("all " + ~columns, SqlSet::SET);
+}
+
+SqlVal Count(const SqlVal& exp) {
+	return SqlFunc("count", exp);
+}
+
+SqlVal SqlAll()
+{
+	return SqlCol("*");
+}
+
+SqlVal SqlCountRows()
+{
+	return Count(SqlAll());
+}
+
+SqlVal Descending(const SqlVal& exp) {
+	return SqlVal(exp(SqlS::ADD) + " desc", SqlS::UNARY);
+}
+
+SqlVal SqlMax(const SqlVal& exp) {
+	return SqlFunc("max", exp);
+}
+
+SqlVal SqlMin(const SqlVal& exp) {
+	return SqlFunc("min", exp);
+}
+
+SqlVal SqlSum(const SqlVal& exp) {
+	return SqlFunc("sum", exp);
+}
+
+SqlVal Avg(const SqlVal& a) {
+	return SqlFunc("avg", a);
+}
+
+SqlVal Stddev(const SqlVal& a) {
+	return SqlFunc("stddev", a);
+}
+
+SqlVal Variance(const SqlVal& a) {
+	return SqlFunc("variance", a);
+}
+
+SqlVal Greatest(const SqlVal& a, const SqlVal& b) {
+	return SqlFunc("greatest", a, b);
+}
+
+SqlVal Least(const SqlVal& a, const SqlVal& b) {
+	return SqlFunc("least", a, b);
+}
+
+SqlVal ConvertCharset(const SqlVal& exp, const SqlVal& charset) { //TODO Dialect!
+	if(exp.IsEmpty()) return exp;
+	return exp.IsEmpty() ? exp : SqlFunc("convert", exp, charset);
+}
+
+SqlVal ConvertAscii(const SqlVal& exp) { //TODO Dialect!
+	return ConvertCharset(exp, "US7ASCII");
+}
+
+SqlVal Upper(const SqlVal& exp) {
+	return exp.IsEmpty() ? exp : SqlFunc("upper", exp);
+}
+
+SqlVal Lower(const SqlVal& exp) {
+	return exp.IsEmpty() ? exp : SqlFunc("lower", exp);
+}
+
+SqlVal Length(const SqlVal& exp) {
+	return exp.IsEmpty() ? exp : SqlFunc("length", exp);
+}
+
+SqlVal UpperAscii(const SqlVal& exp) {
+	return exp.IsEmpty() ? exp : Upper(ConvertAscii(exp));
+}
+
+SqlVal Substr(const SqlVal& a, const SqlVal& b) {
+	return SqlFunc("SUBSTR", a, b);
+}
+
+SqlVal Substr(const SqlVal& a, const SqlVal& b, const SqlVal& c)
+{
+	return SqlFunc("SUBSTR", a, b, c);
+}
+
+SqlVal Instr(const SqlVal& a, const SqlVal& b) {
+	return SqlFunc("INSTR", a, b);
+}
+
+SqlVal Wild(const char* s) {
+	String result;
+	for(char c; (c = *s++) != 0;)
+		if(c == '*')
+			result << '%';
+		else if(c == '?')
+			result << '_';
+		else if(c == '.' && *s == 0)
+			return result;
+		else
+			result << c;
+	result << '%';
+	return result;
+}
+
+SqlVal SqlDate(const SqlVal& year, const SqlVal& month, const SqlVal& day) {//TODO Dialect!
+	return SqlFunc("to_date", year|"."|month|"."|day, "SYYYY.MM.DD");
+}
+
+SqlVal AddMonths(const SqlVal& date, const SqlVal& months) {//TODO Dialect!
+	return SqlFunc("add_months", date, months);
+}
+
+SqlVal LastDay(const SqlVal& date) {//TODO Dialect!
+	return SqlFunc("last_day", date);
+}
+
+SqlVal MonthsBetween(const SqlVal& date1, const SqlVal& date2) {//TODO Dialect!
+	return SqlFunc("months_between", date1, date2);
+}
+
+SqlVal NextDay(const SqlVal& date) {//TODO Dialect!
+	return SqlFunc("next_day", date);
+}
+
+SqlVal Cast(const char* type, const SqlId& a) {
+	return SqlFunc(type, a);
+}
+
+SqlVal SqlNvl(const SqlVal& a, const SqlVal& b) {
+	return SqlFunc(SqlCase
+						(PGSQL, "coalesce")
+						(MY_SQL|SQLITE3, "ifnull")
+						(MSSQL, "isnull")
+						("nvl"),
+					a, b);
+}
+
+SqlVal SqlNvl(const SqlVal& a) {
+	return Nvl(a, SqlVal(0));
+}
+
+SqlVal Prior(SqlId a) {
+	return SqlVal("prior " + ~a, SqlS::UNARY);
+}
+
+SqlVal NextVal(SqlId a) {
+	return SqlVal(SqlCase
+	                 (PGSQL, "nextval('" + ~a + "')")
+	                 (~a + ".NEXTVAL")
+	              , SqlS::HIGH);
+}
+
+SqlVal CurrVal(SqlId a) {
+	return SqlVal(SqlCase
+				    (PGSQL, "currval('" + ~a + "')")
+				    (~a + ".CURRVAL")
+				  , SqlS::HIGH);
+}
+
+SqlVal SqlRowNum()
+{
+	return SqlCol("ROWNUM");
+}
+
+SqlVal SqlArg() {
+	return SqlCol("?");
+}
+
+SqlVal OuterJoin(SqlCol col)
+{
+	return SqlCol(~col + "(+)");
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/Sql/Sqlexp.h b/uppsrc/Sql/Sqlexp.h
new file mode 100644
index 000000000..ae8bc8646
--- /dev/null
+++ b/uppsrc/Sql/Sqlexp.h
@@ -0,0 +1,581 @@
+enum {
+	ORACLE    = 1,
+	SQLITE3   = 2,
+	MY_SQL    = 4,
+	MSSQL     = 8,
+	PGSQL     = 16, // not implemented yet
+	FIREBIRD  = 32, // not implemented yet
+	DB2       = 64, // not implemented yet
+};
+
+class SqlBool;
+class SqlVal;
+class SqlSet;
+
+// ----------
+
+struct FieldOperator {
+	String table;
+
+	void Table(const char *name)                           { table = name; }
+
+	virtual void Field(Ref f);
+	virtual void Field(const char *name, Ref f);
+
+	FieldOperator& operator()(const char *name, Ref f)     { Field(name, f); return *this; }
+	FieldOperator& operator()(const String& name, Ref f)   { Field(name, f); return *this; }
+	FieldOperator& operator()(Id id, Ref f)                { Field(~id, f); return *this; }
+	FieldOperator& operator()(const char *name, bool& b);
+	FieldOperator& operator()(const String& name, bool& b) { return (*this)(~name, b); }
+	FieldOperator& operator()(Id id, bool& b)              { return (*this)(~id, b); }
+
+	FieldOperator();
+	virtual ~FieldOperator();
+};
+
+typedef Callback1<FieldOperator&> Fields;
+
+struct FieldDumper : public FieldOperator {
+	String s;
+	virtual void Field(const char *name, Ref f);
+};
+
+template <class T>
+String DumpFields(T& s) {
+	FieldDumper dump;
+	s.FieldLayout(dump);
+	return dump.s;
+}
+
+void td_scalar(SqlSet& set, const String& prefix, const char *x);
+void td_array(SqlSet& set, const String& prefix, const char *x, int cnt);
+void td_var(SqlSet& set, const String& prefix, const char *x, SqlSet (*f)(const String&));
+void td_shrink(String *array, int cnt);
+
+// ----------
+
+class SqlCase {
+	String s;
+
+public:
+	SqlCase(byte cond, const String& text);
+	SqlCase operator()(byte cond, const String& text);
+
+	String operator()(const String& text);
+	String operator()();
+};
+
+String SqlCompile(byte dialect, const String& s);
+
+String SqlFormat(int x);
+String SqlFormat(double x);
+String SqlFormat(int64 x);
+String SqlFormat(const char *s, int len);
+String SqlFormat(const char *s);
+String SqlFormat(const String& x);
+String SqlFormat(Date x);
+String SqlFormat(Time x);
+String SqlFormat(const Value& x);
+
+class SqlCol : Moveable<SqlCol> {
+	String name;
+public:
+	String        ToString() const          { return name; }
+	const String& operator~() const         { return name; }
+
+	SqlCol        As(const char *as) const;
+
+	SqlCol(const String& name) : name(name) {}
+};
+
+class SqlId : Moveable<SqlId> {
+protected:
+	Id id;
+
+public:
+	bool          IsEqual(SqlId b) const     { return id == b.id; }
+	bool          IsEqual(Id b) const        { return id == b; }
+	bool          IsNull() const             { return id.IsNull(); }
+
+	operator      Id() const                 { return id; }
+	String        ToString() const           { return id.ToString(); }
+	String        operator~() const          { return ToString(); }
+
+	SqlCol        Of(SqlId id) const;
+	SqlId         As(const char *as) const;
+	SqlId         As(SqlId id) const         { return As(~~id); }
+	SqlId         operator [] (int i) const;
+	SqlId         operator&(const SqlId& s) const;
+
+	SqlId()                                  {}
+	SqlId(const char *s) : id(s)             {}
+	SqlId(const String& s) : id(s)           {}
+	SqlId(Id id) : id(id)                    {}
+};
+
+#define SQLID(x)    const UPP::SqlId x(#x);
+
+class SqlS : Moveable<SqlS> {
+protected:
+	String text;
+	byte   priority;
+
+public:
+	enum PRIORITY {
+		EMPTY    =   0,
+		LOW      =  20,
+		SETOP    =  50,
+		SET      = 100,
+		LOR      = 120,
+		LAND     = 130,
+		TRUEVAL  = 135,
+		FALSEVAL = 136,
+		COMP     = 140,
+		ADD      = 150,
+		MUL      = 160,
+		UNARY    = 170,
+		FN       = 180,
+		HIGH     = 200,
+		NULLVAL  = 250,
+	};
+
+	String        operator()() const;
+	String        operator()(int at) const;
+	const String& operator~() const         { return text; }
+	bool          IsEmpty() const           { return priority == EMPTY; }
+
+	SqlS()                                  : priority(EMPTY) {}
+	SqlS(const char *s, int pr)             : text(s), priority(pr) {}
+	SqlS(const String& s, int pr)           : text(s), priority(pr) {}
+	SqlS(const SqlS& a, const char *op, const SqlS& b, int pr, int prb);
+	SqlS(const SqlS& a, const char *op, const SqlS& b, int pr);
+};
+
+class SqlVal : public SqlS, Moveable<SqlVal> {
+public:
+	void SetNull()                          { text = "NULL"; priority = NULLVAL; }
+	void SetHigh(const String& s)           { text = s; priority = HIGH; }
+	bool IsNull() const                     { return priority == NULLVAL; }
+
+	SqlVal()                                {}
+	SqlVal(const String& s, int pr)         : SqlS(s, pr) {}
+	SqlVal(const SqlS& a, const char *o, const SqlS& b, int pa, int pb)
+		                                    : SqlS(a, o, b, pa, pb) {}
+	SqlVal(const SqlS& a, const char *o, const SqlS& b, int p)
+		                                    : SqlS(a, o, b, p) {}
+
+	SqlVal(int x);
+	SqlVal(int64 x);
+	SqlVal(double x);
+	SqlVal(const String& x);
+	SqlVal(const char *x);
+	SqlVal(Date x);
+	SqlVal(Time x);
+	SqlVal(const Value& x);
+	SqlVal(const Nuller&);
+	SqlVal(SqlId id);
+	SqlVal(const SqlId& (*id)());
+	SqlVal(SqlCol id);
+};
+
+SqlVal operator-(const SqlVal& a);
+SqlVal operator+(const SqlVal& a, const SqlVal& b);
+SqlVal operator-(const SqlVal& a, const SqlVal& b);
+SqlVal operator*(const SqlVal& a, const SqlVal& b);
+SqlVal operator/(const SqlVal& a, const SqlVal& b);
+SqlVal operator%(const SqlVal& a, const SqlVal& b);
+SqlVal operator|(const SqlVal& a, const SqlVal& b); // String concatenation
+
+SqlVal& operator+=(SqlVal& a, const SqlVal& b);
+SqlVal& operator-=(SqlVal& a, const SqlVal& b);
+SqlVal& operator*=(SqlVal& a, const SqlVal& b);
+SqlVal& operator/=(SqlVal& a, const SqlVal& b);
+SqlVal& operator%=(SqlVal& a, const SqlVal& b);
+SqlVal& operator|=(SqlVal& a, const SqlVal& b);
+
+SqlVal SqlFunc(const char* name, const SqlVal& a);
+SqlVal SqlFunc(const char* name, const SqlVal& a, const SqlVal& b);
+SqlVal SqlFunc(const char* name, const SqlVal& a, const SqlVal& b, const SqlVal& c);
+SqlVal SqlFunc(const char* nm, const SqlVal& a, const SqlVal& b, const SqlVal& c, const SqlVal& d);
+SqlVal SqlFunc(const char* name, const SqlSet& set);
+
+SqlVal Decode(const SqlVal& exp, const SqlSet& variants);
+SqlVal Distinct(const SqlVal& exp);
+SqlSet Distinct(const SqlSet& columns);
+SqlVal All(const SqlVal& exp);
+SqlSet All(const SqlSet& columns);
+SqlVal SqlAll();
+SqlVal Count(const SqlVal& exp);
+SqlVal SqlCountRows();
+SqlVal Descending(const SqlVal& exp);
+
+SqlVal SqlMax(const SqlVal& a);
+SqlVal SqlMin(const SqlVal& a);
+SqlVal SqlSum(const SqlVal& a);
+
+SqlVal Avg(const SqlVal& a);
+SqlVal Stddev(const SqlVal& a);
+SqlVal Variance(const SqlVal& a);
+
+SqlVal Greatest(const SqlVal& a, const SqlVal& b);
+SqlVal Least(const SqlVal& a, const SqlVal& b);
+
+SqlVal ConvertCharset(const SqlVal& exp, const SqlVal& charset);
+SqlVal ConvertAscii(const SqlVal& exp);
+SqlVal Upper(const SqlVal& exp);
+SqlVal Lower(const SqlVal& exp);
+SqlVal Length(const SqlVal& exp);
+SqlVal UpperAscii(const SqlVal& exp);
+SqlVal Substr(const SqlVal& a, const SqlVal& b);
+SqlVal Substr(const SqlVal& a, const SqlVal& b, const SqlVal& c);
+SqlVal Instr(const SqlVal& a, const SqlVal& b);
+SqlVal Wild(const char* s);
+
+SqlVal SqlDate(const SqlVal& year, const SqlVal& month, const SqlVal& day);
+SqlVal AddMonths(const SqlVal& date, const SqlVal& months);
+SqlVal LastDay(const SqlVal& date);
+SqlVal MonthsBetween(const SqlVal& date1, const SqlVal& date2);
+SqlVal NextDay(const SqlVal& date);
+
+SqlVal Cast(const char* type, const SqlId& a);
+
+SqlVal SqlNvl(const SqlVal& a);
+inline SqlVal Nvl(const SqlVal& a)     { return SqlNvl(SqlVal(a)); }
+inline SqlVal Nvl(const SqlCol& a)     { return SqlNvl(SqlVal(a)); }
+inline SqlVal Nvl(const SqlId& a)      { return SqlNvl(SqlVal(a)); }
+
+SqlVal SqlNvl(const SqlVal& a, const SqlVal& b);
+inline SqlVal Nvl(const SqlVal& a, const SqlVal& b) { return SqlNvl(SqlVal(a), SqlVal(b)); }
+inline SqlVal Nvl(const SqlVal& a, const SqlCol& b) { return SqlNvl(SqlVal(a), SqlVal(b)); }
+inline SqlVal Nvl(const SqlVal& a, const SqlId& b)  { return SqlNvl(SqlVal(a), SqlVal(b)); }
+inline SqlVal Nvl(const SqlCol& a, const SqlVal& b) { return SqlNvl(SqlVal(a), SqlVal(b)); }
+inline SqlVal Nvl(const SqlCol& a, const SqlCol& b) { return SqlNvl(SqlVal(a), SqlVal(b)); }
+inline SqlVal Nvl(const SqlCol& a, const SqlId& b)  { return SqlNvl(SqlVal(a), SqlVal(b)); }
+inline SqlVal Nvl(const SqlId& a, const SqlVal& b)  { return SqlNvl(SqlVal(a), SqlVal(b)); }
+inline SqlVal Nvl(const SqlId& a, const SqlCol& b)  { return SqlNvl(SqlVal(a), SqlVal(b)); }
+inline SqlVal Nvl(const SqlId& a, const SqlId& b)   { return SqlNvl(SqlVal(a), SqlVal(b)); }
+
+SqlVal Prior(SqlId a);
+
+SqlVal NextVal(SqlId a);
+SqlVal CurrVal(SqlId a);
+SqlVal OuterJoin(SqlCol col);
+
+inline SqlVal operator++(SqlId a)           { return NextVal(a); }
+
+SqlVal SqlRowNum();
+
+SqlVal SqlArg();
+
+class SqlBool : public SqlS, Moveable<SqlBool> {
+public:
+	void     SetTrue();
+	void     SetFalse();
+	void     SetBool(bool b);
+
+	bool     IsTrue()  const                { return priority == TRUEVAL; }
+	bool     IsFalse() const                { return priority == FALSEVAL; }
+	bool     IsBool()  const                { return IsTrue() || IsFalse(); }
+	bool     AsBool()  const                { ASSERT(IsBool()); return IsTrue(); }
+
+	SqlBool(const String& s, int pr)        : SqlS(s, pr) {}
+	SqlBool(const SqlS& a, const char *o, const SqlS& b, int pa, int pb)
+		                                    : SqlS(a, o, b, pa, pb) {}
+	SqlBool(const SqlS& a, const char *o, const SqlS& b, int p)
+		                                    : SqlS(a, o, b, p) {}
+
+	static SqlBool True()                   { return SqlBool(true); }
+	static SqlBool False()                  { return SqlBool(false); }
+
+	SqlBool()                               {}
+	SqlBool(bool b)                         { SetBool(b); }
+};
+
+SqlBool        operator!(const SqlBool& a);
+
+SqlBool        operator<(const SqlVal& a, const SqlVal& b);
+SqlBool        operator<=(const SqlVal& a, const SqlVal& b);
+SqlBool        operator>=(const SqlVal& a, const SqlVal& b);
+SqlBool        operator>(const SqlVal& a, const SqlVal& b);
+SqlBool        operator==(const SqlVal& a, const SqlVal& b);
+SqlBool        operator!=(const SqlVal& a, const SqlVal& b);
+
+SqlBool        operator||(const SqlBool& a, const SqlBool& b);
+SqlBool        operator&&(const SqlBool& a, const SqlBool& b);
+SqlBool        operator- (const SqlBool& a, const SqlBool& b);
+SqlBool        operator|=(SqlBool& a, const SqlBool& b);
+SqlBool        operator&=(SqlBool& a, const SqlBool& b);
+
+SqlBool        SqlIsNull(const SqlVal& a);
+SqlBool        NotNull(const SqlVal& a);
+
+inline SqlBool IsNull(const SqlId& a)  { return SqlIsNull(a); }
+inline SqlBool IsNull(const SqlVal& a) { return SqlIsNull(a); }
+inline SqlBool IsNull(const SqlCol& a) { return SqlIsNull(a); }
+
+SqlBool        Like(const SqlVal& a, const SqlVal& b);
+SqlBool        NotLike(const SqlVal& a, const SqlVal& b);
+
+SqlBool        Between(const SqlVal& a, const SqlVal& low, const SqlVal& high);
+SqlBool        NotBetween(const SqlVal&a, const SqlVal& low, const SqlVal& high);
+
+SqlBool        In(const SqlVal& a, const SqlSet& b);
+SqlBool        NotIn(const SqlVal& a, const SqlSet& b);
+SqlBool        Exists(const SqlSet& set);
+SqlBool        NotExists(const SqlSet& set);
+
+SqlBool        LikeUpperAscii(const SqlVal& a, const SqlVal& b);
+
+SqlBool        LeftJoin(SqlVal v1, SqlVal v2);
+SqlBool        RightJoin(SqlVal v1, SqlVal v2);
+
+SqlBool        Join(SqlId tab1, SqlId tab2, SqlId key);
+SqlBool        LeftJoin(SqlId tab1, SqlId tab2, SqlId key);
+SqlBool        RightJoin(SqlId tab1, SqlId tab2, SqlId key);
+
+SqlBool        SqlFirstRow();
+
+inline SqlBool operator==(const SqlVal& a, const SqlSet& b) { return In(a, b); }
+inline SqlBool operator!=(const SqlVal& a, const SqlSet& b) { return NotIn(a, b); }
+
+inline const SqlVal& operator+(const SqlVal& a) { return a; }
+
+//////////////////////////////////////////////////////////////////////
+
+class Sql;
+
+#define E__SqlVal(I)      const SqlVal& p##I
+
+SqlSet operator|(const SqlSet& s1, const SqlSet& s2); // union
+SqlSet operator&(const SqlSet& s1, const SqlSet& s2); // intersection
+SqlSet operator-(const SqlSet& s1, const SqlSet& s2); // difference
+
+class SqlSet : Moveable<SqlSet> {
+protected:
+	String text;
+	byte   priority;
+
+public:
+	enum PRIORITY {
+		SETOP    =  50,
+		SET      = 100,
+	};
+
+	String           operator~() const;
+	String           operator()() const;
+	String           operator()(int at) const;
+	bool             IsEmpty() const                { return text.IsEmpty(); }
+
+	SqlSet&          Cat(const SqlVal& val); // adding a member
+	SqlSet&          Cat(const SqlSet& set);
+	SqlSet&          operator|=(const SqlVal& val)  { return Cat(val); }
+
+	SqlSet&          operator|=(const SqlSet& set)  { return *this = *this | set; }
+	SqlSet&          operator&=(const SqlSet& set)  { return *this = *this & set; }
+	SqlSet&          operator-=(const SqlSet& set)  { return *this = *this - set; }
+
+	void             Clear()                                { text.Clear(); }
+
+	SqlSet() {}
+	explicit SqlSet(const SqlVal& p0);
+
+#define E__SqlSet(I)   SqlSet(const SqlVal& p0, __List##I(E__SqlVal));
+	__Expand(E__SqlSet);
+
+	explicit SqlSet(Fields nfields);
+
+	SqlSet(const String& s, PRIORITY p)   { text = s; priority = p; }
+};
+
+class SqlSetC : public SqlSet {
+public:
+	SqlSetC(const String& s)      { text = s; priority = SET; }
+	SqlSetC(const char* s)        { text = s; priority = SET; }
+};
+
+class SqlStatement {
+	String text;
+
+public:
+	SqlStatement() {}
+	explicit SqlStatement(const String& s) : text(s) {}
+
+	String Get(int dialect) const;
+	String GetText() const                           { return text; }
+	bool   IsEmpty() const                           { return text.IsEmpty(); }
+	operator bool() const                            { return !IsEmpty(); }
+
+//Deprecated!!!
+	bool  Execute(Sql& cursor) const;
+	void  Force(Sql& cursor) const;
+	Value Fetch(Sql& cursor) const;
+	bool  Execute() const;
+	void  Force() const;
+	Value Fetch() const;
+};
+
+class SqlSelect {
+	String  text;
+
+public:
+	operator bool() const                             { return text.GetCount(); }
+
+	SqlSelect& Hint(const char *hint);
+
+	SqlSelect& Get();
+	SqlSelect& From(const SqlSet& set);
+	SqlSelect& From(SqlId table);
+	SqlSelect& From(SqlId table1, SqlId table2);
+	SqlSelect& From(SqlId table1, SqlId table2, SqlId table3);
+	SqlSelect& From(const SqlVal& a)                  { return From(SqlSet(a)); }
+
+	SqlSelect& InnerJoin(SqlId table);
+	SqlSelect& LeftJoin(SqlId table);
+	SqlSelect& RightJoin(SqlId table);
+	SqlSelect& FullJoin(SqlId table);
+
+	SqlSelect& Where(const SqlBool& exp);
+	SqlSelect& On(const SqlBool& exp);
+	SqlSelect& StartWith(const SqlBool& exp);
+	SqlSelect& ConnectBy(const SqlBool& exp);
+	SqlSelect& GroupBy(const SqlSet& columnset);
+	SqlSelect& Having(const SqlBool& exp);
+	SqlSelect& OrderBy(const SqlSet& columnset);
+	SqlSelect& ForUpdate();
+	SqlSelect& NoWait();
+
+	SqlSelect& GroupBy(SqlVal a)                      { return GroupBy(SqlSet(a)); }
+	SqlSelect& GroupBy(SqlVal a, SqlVal b)            { return GroupBy(SqlSet(a, b)); }
+	SqlSelect& GroupBy(SqlVal a, SqlVal b, SqlVal c)  { return GroupBy(SqlSet(a, b, c)); }
+	SqlSelect& OrderBy(SqlVal a)                      { return OrderBy(SqlSet(a)); }
+	SqlSelect& OrderBy(SqlVal a, SqlVal b)            { return OrderBy(SqlSet(a, b)); }
+	SqlSelect& OrderBy(SqlVal a, SqlVal b, SqlVal c)  { return OrderBy(SqlSet(a, b, c)); }
+	SqlSelect& Limit(int limit);
+	SqlSelect& Limit(int64 offset, int limit);
+	SqlSelect& Offset(int64 offset);
+
+	operator SqlSet() const                           { return SqlSet(text, SqlSet::SETOP); }
+	operator SqlStatement() const                     { return SqlStatement(text); }
+
+	SqlSelect(Fields f);
+	SqlSelect(const SqlSet& s)                        { text = ~s; }
+	SqlSelect()                                       {}
+
+	bool IsEmpty()                                    { return text.IsEmpty(); }
+
+	SqlSelect& operator|=(const SqlSelect& s2);
+	SqlSelect& operator&=(const SqlSelect& s2);
+	SqlSelect& operator-=(const SqlSelect& s2);
+
+//Deprecated!!!
+	bool  Execute(Sql& sql) const                     { return SqlStatement(*this).Execute(sql); }
+	void  Force(Sql& sql) const                       { return SqlStatement(*this).Force(sql); }
+	Value Fetch(Sql& sql) const                       { return SqlStatement(*this).Fetch(sql); }
+	bool  Execute() const                             { return SqlStatement(*this).Execute(); }
+	void  Force() const                               { return SqlStatement(*this).Force(); }
+	Value Fetch() const                               { return SqlStatement(*this).Fetch(); }
+};
+
+SqlSelect operator|(const SqlSelect& s1, const SqlSelect& s2);
+SqlSelect operator&(const SqlSelect& s1, const SqlSelect& s2);
+SqlSelect operator-(const SqlSelect& s1, const SqlSelect& s2);
+
+inline SqlSelect Select(const SqlSet& set)  { return SqlSelect(set); }
+inline SqlSelect Select(Fields f)           { return SqlSelect(f); }
+
+#define E__QSelect(I)   SqlSelect Select(__List##I(E__SqlVal));
+__Expand(E__QSelect);
+
+class SqlDelete {
+	String text;
+
+public:
+	SqlDelete& Where(const SqlBool& b);
+
+	operator SqlStatement() const                     { return SqlStatement(text); }
+
+	SqlDelete(SqlVal table);
+
+//Deprecated!!!
+	bool  Execute(Sql& sql) const                     { return SqlStatement(*this).Execute(sql); }
+	void  Force(Sql& sql) const                       { return SqlStatement(*this).Force(sql); }
+	Value Fetch(Sql& sql) const                       { return SqlStatement(*this).Fetch(sql); }
+	bool  Execute() const                             { return SqlStatement(*this).Execute(); }
+	void  Force() const                               { return SqlStatement(*this).Force(); }
+	Value Fetch() const                               { return SqlStatement(*this).Fetch(); }
+};
+
+inline SqlDelete Delete(SqlVal table) { return SqlDelete(table); }
+
+class SqlInsert {
+	SqlId   table;
+	SqlId   keycolumn;
+	SqlVal  keyvalue;
+	SqlSet  set1;
+	SqlSet  set2;
+	SqlSet  from;
+	SqlBool where;
+
+public:
+	void Column(SqlId column, SqlVal val);
+	void Column(SqlId column)                        { Column(column, column); }
+	SqlInsert& operator()(SqlId column, SqlVal val)  { Column(column, val); return *this; }
+	SqlInsert& operator()(SqlId column)              { Column(column, column); return *this; }
+	SqlInsert& operator()(Fields f);
+	SqlInsert& From(SqlId from);
+	SqlInsert& From(SqlSet _from)                    { from = _from; return *this; }
+	SqlInsert& From(SqlVal from)                     { return From(SqlSet(from)); }
+	SqlInsert& Where(SqlBool w)                      { where = w; return *this; }
+
+	SqlId    GetTable() const                        { return table; }
+	SqlId    GetKeyColumn() const                    { return keycolumn; }
+	SqlVal   GetKeyValue() const                     { return keyvalue; }
+
+	operator SqlStatement() const;
+	operator bool() const                            { return !set1.IsEmpty(); }
+
+	SqlInsert(SqlId table) : table(table) {}
+	SqlInsert(SqlId table, SqlSet set1, SqlSet set2) : table(table), set1(set1), set2(set2) {}
+	SqlInsert(Fields f);
+
+//Deprecated!!!
+	bool  Execute(Sql& sql) const                     { return SqlStatement(*this).Execute(sql); }
+	void  Force(Sql& sql) const                       { return SqlStatement(*this).Force(sql); }
+	Value Fetch(Sql& sql) const                       { return SqlStatement(*this).Fetch(sql); }
+	bool  Execute() const                             { return SqlStatement(*this).Execute(); }
+	void  Force() const                               { return SqlStatement(*this).Force(); }
+	Value Fetch() const                               { return SqlStatement(*this).Fetch(); }
+};
+
+inline SqlInsert Insert(SqlId table)                  { return SqlInsert(table); }
+inline SqlInsert Insert(Fields f)                     { return SqlInsert(f); }
+
+class SqlUpdate {
+	SqlId   table;
+	SqlSet  set;
+	SqlBool where;
+
+public:
+	void Column(SqlId column, SqlVal val);
+	SqlUpdate& operator()(SqlId column, SqlVal val)  { Column(column, val); return *this; }
+	SqlUpdate& operator()(Fields f);
+	SqlUpdate& Where(SqlBool w)                      { where = w; return *this; }
+
+	operator SqlStatement() const;
+
+	operator bool() const                            { return !set.IsEmpty(); }
+
+	SqlUpdate(SqlId table) : table(table) {}
+	SqlUpdate(Fields f);
+
+//Deprecated!!!
+	bool  Execute(Sql& sql) const                     { return SqlStatement(*this).Execute(sql); }
+	void  Force(Sql& sql) const                       { return SqlStatement(*this).Force(sql); }
+	Value Fetch(Sql& sql) const                       { return SqlStatement(*this).Fetch(sql); }
+	bool  Execute() const                             { return SqlStatement(*this).Execute(); }
+	void  Force() const                               { return SqlStatement(*this).Force(); }
+	Value Fetch() const                               { return SqlStatement(*this).Fetch(); }
+};
+
+inline SqlUpdate Update(SqlId table)                  { return SqlUpdate(table); }
+inline SqlUpdate Update(Fields f)                     { return SqlUpdate(f); }
diff --git a/uppsrc/Sql/Sqls.h b/uppsrc/Sql/Sqls.h
new file mode 100644
index 000000000..3da972295
--- /dev/null
+++ b/uppsrc/Sql/Sqls.h
@@ -0,0 +1,378 @@
+bool SqlToBool(const String& s);
+bool SqlToBool(const Value& v);
+const String& BoolToSql(bool b);
+
+class SqlSession;
+
+/* TODO: it should be integrated more somehow with SqlSession to not duplicate error fields */
+class ActivityStatus {
+public:
+	enum {
+		NONE,
+		FETCHING,
+		END_FETCHING,
+		EXECUTING,
+		END_EXECUTING,
+		EXECUTING_ERROR
+	};
+private:
+	String error;
+	int    error_code_number;
+	String error_code_string;
+	String statement;
+	int    status;
+	int    time;
+
+public:
+	ActivityStatus& Error(const String& s)       { error = s;             return *this; }
+	ActivityStatus& ErrorCode(const String& s)   { error_code_string = s; return *this; }
+	ActivityStatus& ErrorCode(int n)             { error_code_number = n; return *this; }
+	ActivityStatus& Statement(const String& s)   { statement = s;         return *this; }
+	ActivityStatus& SetStatus(int s)             { status = s;            return *this; } // Status does not work in Linux (a type or macro?)
+	ActivityStatus& Time(int n)                  { time = n;              return *this; }
+
+	String          GetStatement() const         { return statement;         }
+	String          GetError() const             { return error;             }
+	int             GetErrorCode() const         { return error_code_number; }
+	String          GetErrorCodeString() const   { return error_code_string; }
+	int             GetStatus() const            { return status;            }
+	int             GetTime() const              { return time;              }
+
+	bool            operator == (int s) const    { return status == s;       }
+	bool            operator != (int s) const    { return status != s;       }
+};
+
+class SqlExc : public Exc {
+public:
+#ifndef NOAPPSQL
+	SqlExc();
+#endif
+	SqlExc(const SqlSession& session);
+	SqlExc(const Sql& sql);
+	SqlExc(const String& desc) : Exc(desc) {}
+	SqlExc(const char *desc) : Exc(desc) {}
+
+	void SetSessionError(const SqlSession& session);
+};
+
+class SqlRaw : public String, AssignValueTypeNo<SqlRaw, 34> {
+public:
+	operator Value() const              { return RawValue<SqlRaw>(*this); }
+	SqlRaw(const Value& q)
+		: String(IsString(q) ? String(q) : String(RawValue<SqlRaw>::Extract(q))) {}
+	SqlRaw(const String& s) : String(s) {}
+	SqlRaw() {}
+};
+
+struct SqlColumnInfo : Moveable<SqlColumnInfo> {
+	String      name;
+	int         type;
+	int         width;
+	int         precision; //number of total digits in numeric types
+	int         scale;     //number of digits after comma in numeric types
+	bool        nullable;  //true - column can hold null values
+};
+
+class SqlConnection {
+protected:
+	friend class Sql;
+	friend class SqlSession;
+
+	virtual void        SetParam(int i, const Value& r) = 0;
+	virtual bool        Execute() = 0;
+	virtual int         GetRowsProcessed() const;
+	virtual Value       GetInsertedId() const;
+	virtual bool        Fetch() = 0;
+	virtual void        GetColumn(int i, Ref r) const = 0;
+	virtual void        Cancel() = 0;
+	virtual SqlSession& GetSession() const = 0;
+	virtual String      GetUser() const;
+	virtual String      ToString() const = 0;
+
+	SqlConnection();
+	virtual            ~SqlConnection();
+
+	int                    starttime;
+	String                 statement;
+	Vector<SqlColumnInfo>  info;
+	int                    fetchrows;
+	int                    longsize;
+	bool                   parse;
+};
+
+#define E__ColVal(I)  const char *c##I, const Value& v##I
+#define E__IdVal(I)   SqlId c##I, const Value& v##I
+
+class SqlSource {
+protected:
+	virtual SqlConnection *CreateConnection() = 0;
+	virtual ~SqlSource() {}
+	friend class Sql;
+};
+
+
+class Sql {
+protected:
+	SqlConnection  *cn;
+
+	friend class SqlSession;
+
+	Value       Select0(const String& what);
+	void        Assign(SqlSource& src);
+	void        Detach();
+	enum _NULLSQL { NULLSQL };
+	Sql(_NULLSQL) { cn = NULL; }
+
+public:
+	String Compile(const SqlStatement& s);
+
+	void   Clear();
+
+	void   SetParam(int i, const Value& val);
+	void   SetStatement(const String& s);
+	void   SetStatement(const SqlStatement& s)         { SetStatement(Compile(s)); }
+
+	bool   Execute();
+	void   ExecuteX();
+	bool   Run()                                       { return Execute(); }
+	void   RunX()                                      { ExecuteX(); }
+
+	bool   Execute(const String& s);
+	void   ExecuteX(const String& s);
+
+	bool   Execute(const SqlStatement& s)              { return Execute(Compile(s)); }
+	void   ExecuteX(const SqlStatement& s)             { ExecuteX(Compile(s)); }
+//$-
+#define  E__Run(I)       bool Run(__List##I(E__Value));
+	__Expand(E__Run)
+//$ bool Run(const Value& v1 [, const Value& v2 ...]);
+
+#define  E__RunX(I)      void RunX(__List##I(E__Value));
+	__Expand(E__RunX)
+
+#define  E__Execute(I)   bool Execute(const String& s, __List##I(E__Value));
+	__Expand(E__Execute)
+
+#define  E__ExecuteX(I)  void ExecuteX(const String& s, __List##I(E__Value));
+	__Expand(E__ExecuteX)
+
+	bool   Fetch();
+
+#define  E__Fetch(I)    bool Fetch(__List##I(E__Ref));
+	__Expand(E__Fetch)
+//$+
+	bool   Fetch(Vector<Value>& row);
+
+	bool   Fetch(Fields fields);
+
+	int    GetRowsProcessed() const                    { return cn->GetRowsProcessed(); }
+
+	int    GetColumns() const;
+
+	void   GetColumn(int i, Ref r) const;
+	Value  operator[](int i) const;
+	Value  operator[](SqlId colid) const;
+	const SqlColumnInfo& GetColumnInfo(int i) const    { return cn->info[i]; }
+	Vector<Value> GetRow() const;
+	operator Vector<Value>() const                     { return GetRow(); }
+	void   Get(Fields fields);
+
+	void        SetFetchRows(int nrows)                { cn->fetchrows = nrows; }
+	void        SetLongSize(int lsz)                   { cn->longsize = lsz; }
+
+	void        Cancel()                               { cn->Cancel(); }
+
+	Value       Select(const String& what);
+
+#define  E__Select(I)   Value Select(const String& what, __List##I(E__Value));
+	__Expand(E__Select)
+
+#define  E__Insert(I)  bool Insert(const char *tb, const char *c0, const Value& v0, __List##I(E__ColVal));
+	__Expand(E__Insert)
+
+#define  E__InsertId(I)  bool Insert(SqlId tb, SqlId c0, const Value& v0, __List##I(E__IdVal));
+	__Expand(E__InsertId)
+
+#define  E__Update(I)  bool Update(const char *tb, const char *k, const Value& kv, __List##I(E__ColVal));
+	__Expand(E__Update)
+
+#define  E__UpdateId(I)  bool Update(SqlId tb, SqlId k, const Value& kv, __List##I(E__IdVal));
+	__Expand(E__UpdateId)
+
+	bool        Insert(Fields nf);
+	bool        Insert(Fields nf, const char *table);
+	bool        Insert(Fields nf, SqlId table);
+
+	bool        Update(Fields nf);
+	bool        Update(Fields nf, const char *table);
+	bool        Update(Fields nf, SqlId table);
+
+	bool        Delete(const char *table, const char *key, const Value& keyval);
+	bool        Delete(SqlId table, SqlId key, const Value& keyval);
+
+	String      ToString() const                       { return cn->ToString(); }
+
+	bool   operator*(const SqlStatement& q)            { return Execute(q); }
+	Sql&   operator&(const SqlStatement& q)            { ExecuteX(q); return *this; }
+	Value  operator%(const SqlStatement& q)            { return Select0(Compile(q)); }
+
+	SqlSession& GetSession() const                     { return cn->GetSession(); }
+	int    GetDialect() const;
+
+	Value  GetInsertedId() const                       { return cn->GetInsertedId(); }
+
+	String GetUser() const                             { return cn->GetUser(); }
+
+	enum ERRORCLASS {
+		ERROR_UNSPECIFIED,
+		CONNECTION_BROKEN,
+	};
+
+	void   SetError(String error, String stmt, int code = 0, const char *scode = NULL, ERRORCLASS clss = ERROR_UNSPECIFIED);
+	String GetLastError() const;
+	String GetErrorStatement() const;
+	int    GetErrorCode() const;
+	String GetErrorCodeString() const;
+	ERRORCLASS GetErrorClass() const;
+	void   ClearError();
+
+	void   Begin();
+	void   Commit();
+	void   Rollback();
+	int    GetTransactionLevel();
+
+	String Savepoint();
+	void   RollbackTo(const String& savepoint);
+
+	bool   IsOpen();
+
+	bool   WasError() const;
+
+	Sql(SqlSource&);
+#ifndef NOAPPSQL
+	Sql();
+	Sql(const char *stmt);
+	Sql(const SqlStatement& s);
+#endif
+	Sql(const char *stmt, SqlSource& session);
+	Sql(const SqlStatement& s, SqlSource& session);
+	Sql(SqlConnection *connection);
+	~Sql();
+};
+
+#ifndef NOAPPSQL
+struct AppSql : Sql {
+	void   operator=(SqlSource& s) { Assign(s); }
+	void   Detach()                { Sql::Detach(); }
+	AppSql() : Sql(NULLSQL) {}
+};
+AppSql& AppCursor();
+#define SQL AppCursor()
+// Assist++ cheat:
+//$ Sql& SQL;
+#endif
+
+struct StatementExecutor {
+	virtual bool Execute(const String& stmt) = 0;
+	virtual ~StatementExecutor() {}
+};
+
+typedef bool (*RunScript)(const String& text, StatementExecutor& executor, Gate2<int, int> progress_canceled);
+
+class SqlSession : public SqlSource {
+protected:
+	virtual SqlConnection        *CreateConnection();
+
+	friend class Sql;
+
+	Stream                       *trace;
+	bool                          logerrors;
+	bool                          tracetime;
+	bool                          usrlog;
+	int                           traceslow;
+	int                           dialect;
+
+	String                        lasterror;
+	String                        errorstatement;
+	int                           errorcode_number;
+	String                        errorcode_string;
+	Sql::ERRORCLASS               errorclass;
+
+	ActivityStatus                status;
+
+public:
+	virtual void                  Begin();
+	virtual void                  Commit();
+	virtual void                  Rollback();
+	virtual int                   GetTransactionLevel() const;
+
+	virtual String                Savepoint();
+	virtual void                  RollbackTo(const String& savepoint);
+
+	virtual bool                  IsOpen() const;
+
+	virtual RunScript             GetRunScript() const;
+
+	virtual Vector<String>        EnumUsers();
+	virtual Vector<String>        EnumDatabases();
+	virtual Vector<String>        EnumTables(String database);
+	virtual Vector<String>        EnumViews(String database);
+	virtual Vector<String>        EnumSequences(String database);
+	virtual Vector<SqlColumnInfo> EnumColumns(String database, String table);
+	virtual Vector<String>        EnumPrimaryKey(String database, String table);
+	virtual String                EnumRowID(String database, String table);
+	virtual Vector<String>        EnumReservedWords();
+
+	SqlSession&                   Dialect(int q)                          { dialect = q; return *this; }
+	int                           GetDialect() const                      { ASSERT(dialect != 255); return dialect; }
+
+	void                          SetTrace(Stream& s = VppLog())          { trace = &s; }
+	Stream                       *GetTrace() const                        { return trace; }
+	void                          KillTrace()                             { trace = NULL; }
+
+	void                          TraceTime(bool b = true)                { tracetime = b; }
+	bool                          IsTraceTime() const                     { return tracetime; }
+
+	SqlSession&                   LogErrors(bool b = true)                { logerrors = true; return *this; }
+	SqlSession&                   UsrLog(bool b = true)                   { usrlog = true; return *this; }
+	SqlSession&                   TraceSlow(int ms = 5000)                { traceslow = ms; return *this; }
+
+	bool                          WasError() const                        { return !GetLastError().IsEmpty(); }
+
+	void                          SetError(String error, String stmt, int code = 0, const char * scode = NULL, Sql::ERRORCLASS clss = Sql::ERROR_UNSPECIFIED);
+	String                        GetLastError() const                    { return lasterror; }
+	String                        GetErrorStatement() const               { return errorstatement; }
+	int                           GetErrorCode() const                    { return errorcode_number; }
+	String                        GetErrorCodeString() const              { return errorcode_string; }
+	Sql::ERRORCLASS               GetErrorClass() const                   { return errorclass; }
+	void                          ClearError();
+
+	String                        GetUser()                               { return Sql(*this).GetUser(); }
+
+	operator                      bool() const                            { return IsOpen(); }
+
+	SqlSession();
+	virtual ~SqlSession();
+
+	ActivityStatus&               GetStatus()                             { return status; }
+	void                          PassStatus(int s)                       { WhenDatabaseActivity(status.SetStatus(s)); }
+
+	Callback1<const ActivityStatus&> WhenDatabaseActivity;
+};
+
+class OciConnection;
+
+struct StdStatementExecutor : StatementExecutor {
+	StdStatementExecutor(SqlSession& session) : cursor(session) {}
+	virtual bool Execute(const String& stmt);
+	Sql cursor;
+};
+
+#ifndef NOAPPSQL
+StatementExecutor& SQLStatementExecutor();
+#endif
+
+#ifdef BackwardCompatibility
+	typedef Sql        QSql;
+	typedef SqlSession QSession;
+#endif
diff --git a/uppsrc/Sql/init b/uppsrc/Sql/init
new file mode 100644
index 000000000..633fe5def
--- /dev/null
+++ b/uppsrc/Sql/init
@@ -0,0 +1,4 @@
+#ifndef _Sql_icpp_init_stub
+#define _Sql_icpp_init_stub
+#include "Core/init"
+#endif
diff --git a/uppsrc/Sql/sch_header.h b/uppsrc/Sql/sch_header.h
new file mode 100644
index 000000000..2bef733e0
--- /dev/null
+++ b/uppsrc/Sql/sch_header.h
@@ -0,0 +1,45 @@
+// struct
+
+#define CODETYPE(Table, b) \
+struct S_##Table b { \
+public:\
+	void Shrink(); \
+	void Clear(); \
+	static const char         TableName[]; \
+	static const SqlSet&      ColumnSet(); \
+	static SqlSet             ColumnSet(const String& prefix); \
+	static SqlSet             Of(SqlId table); \
+	void FieldLayoutRaw(FieldOperator& f, const String& prefix = String()); \
+	void FieldLayout(FieldOperator& f); \
+	operator Fields()              { return callback(this, &S_##Table::FieldLayout); } \
+	S_##Table();
+
+#define TYPE(Table)                  CODETYPE(Table, __NIL)
+#define TYPE_I(Table, b)             CODETYPE(Table, : public S_##b)
+#define TWO_BASES(b1, b2)            : public S_##b1, public S_##b2
+#define TYPE_II(Table, b1, b2)       CODETYPE(Table, TWO_BASES(b1, b2));
+#define THREE_BASES(b1, b2, b3)      : public S_##b1, public S_##b2, public S_##b3
+#define TYPE_III(Table, b1, b2, b3)  CODETYPE(Table, THREE_BASES(b1, b2, b3));
+
+#define VAR(type, x)             S_##type x;
+
+#define COLUMN(type, ctype, name, width, prec) \
+enum { ADD_SCHEMA_PREFIX_CPP2(name,_WIDTH) = width, ADD_SCHEMA_PREFIX_CPP2(name,_PRECISION) = prec }; ctype ADD_SCHEMA_PREFIX_CPP(name);
+
+#define COLUMN_ARRAY(type, ctype, name, width, prec, items) \
+enum { ADD_SCHEMA_PREFIX_CPP2(name,_WIDTH) = width, ADD_SCHEMA_PREFIX_CPP2(name,_PRECISION) = prec }; ctype ADD_SCHEMA_PREFIX_CPP(name)[items];
+
+#define END_TYPE                 };
+
+#include SCHEMADIALECT
+
+#undef CODETYPE
+#undef TWO_BASES
+#undef THREE_BASES
+
+// SqlId
+
+#define DOID(x) extern SqlId ADD_SCHEMA_PREFIX_CPP(x);
+//#define DOID(x)                  extern SqlId x;
+
+#include SCHEMADIALECT
diff --git a/uppsrc/Sql/sch_model.h b/uppsrc/Sql/sch_model.h
new file mode 100644
index 000000000..e6d99ea22
--- /dev/null
+++ b/uppsrc/Sql/sch_model.h
@@ -0,0 +1,198 @@
+#define __NIL
+
+#ifndef TIMESTAMP
+#define TIMESTAMP(x)
+#endif
+
+#ifndef UPGRADE
+#define UPGRADE(x)
+#endif
+
+#ifndef CHECK_IN
+#define CHECK_IN(s)   INLINE_ATTRIBUTE("check (@c in (" s "))")
+#endif
+
+#ifndef CHECK_COND
+#define CHECK_COND(s) INLINE_ATTRIBUTE("check (" s ")")
+#endif
+
+
+#ifdef TEXT
+#undef TEXT
+#endif
+
+#ifndef DOC
+#define DOC(x)
+#endif
+
+#ifndef SCHEMA_PREFIX_CPP
+#define SCHEMA_PREFIX_CPP
+#endif
+
+#ifndef ADD_SCHEMA_PREFIX_CPP
+#define ADD_SCHEMA_PREFIX_CPP__(_prefix_cpp_, x) _prefix_cpp_##x
+#define ADD_SCHEMA_PREFIX_CPP_(_prefix_cpp_, x) ADD_SCHEMA_PREFIX_CPP__(_prefix_cpp_, x)
+#define ADD_SCHEMA_PREFIX_CPP(x) ADD_SCHEMA_PREFIX_CPP_(SCHEMA_PREFIX_CPP,x)
+#define ADD_SCHEMA_PREFIX_CPP2__(_prefix_cpp_, x, y) _prefix_cpp_##x##y
+#define ADD_SCHEMA_PREFIX_CPP2_(_prefix_cpp_, x, y) ADD_SCHEMA_PREFIX_CPP2__(_prefix_cpp_, x, y)
+#define ADD_SCHEMA_PREFIX_CPP2(x,y) ADD_SCHEMA_PREFIX_CPP2_(SCHEMA_PREFIX_CPP,x, y)
+#endif
+
+#ifndef DOID
+#define DOID(x)
+#endif
+
+#ifndef TYPE
+#define TYPE(x)
+#endif
+
+#ifndef TYPE_
+#define TYPE_(x)                    DOID(x) TYPE(x)
+#endif
+
+#ifndef END_TYPE
+#define                             END_TYPE
+#endif
+
+#ifndef TYPE_I
+#define TYPE_I(x, b)                TYPE(x)
+#endif
+
+#ifndef TYPE_I_
+#define TYPE_I_(x, b)               DOID(x) TYPE_I(x, b)
+#endif
+
+#ifndef TYPE_II
+#define TYPE_II(x, b1, b2)          TYPE(x)
+#endif
+
+#ifndef TYPE_II_
+#define TYPE_II_(x, b1, b2)         DOID(x) TYPE_II(x, b1, b2)
+#endif
+
+#ifndef TYPE_III
+#define TYPE_III(x, b1, b2, b3)     TYPE(x)
+#endif
+
+#ifndef TYPE_III_
+#define TYPE_III_(x, b1, b2, b3)    DOID(x) TYPE_III(x, b1, b2, b3)
+#endif
+
+#ifndef TABLE
+#define TABLE(x)                    TYPE(x)
+#endif
+
+#ifndef TABLE_
+#define TABLE_(x)                   DOID(x) TABLE(x)
+#endif
+
+#ifndef END_TABLE
+#define END_TABLE                   END_TYPE
+#endif
+
+#ifndef TABLE_I
+#define TABLE_I(x, b)               TYPE_I(x, b)
+#endif
+
+#ifndef TABLE_I_
+#define TABLE_I_(x, b)              DOID(x) TABLE_I(x, b)
+#endif
+
+#ifndef TABLE_II
+#define TABLE_II(x, b1, b2)         TYPE_II(x, b1, b2)
+#endif
+
+#ifndef TABLE_II_
+#define TABLE_II_(x, b1, b2)        DOID(x) TABLE_II(x, b1, b2)
+#endif
+
+#ifndef TABLE_III
+#define TABLE_III(x, b1, b2, b3)    TYPE_III(x, b1, b2, b3)
+#endif
+
+#ifndef TABLE_III_
+#define TABLE_III_(x, b1, b2, b3)   DOID(x) TABLE_III(x, b1, b2, b3)
+#endif
+
+#ifndef VAR
+#define VAR(type, x)
+#endif
+
+#ifndef VAR_
+#define VAR_(type, x)               DOID(x) VAR(type, x)
+#endif
+
+#ifndef COLUMN
+#define COLUMN(type, ctype, name, width, prec)
+#endif
+
+#ifndef COLUMN_
+#define COLUMN_(type, ctype, name, width, prec)   DOID(name) COLUMN(type, ctype, name, width, prec)
+#endif
+
+#ifndef COLUMN_ARRAY
+#define COLUMN_ARRAY(type, ctype, name, width, prec, items)
+#endif
+
+#ifndef COLUMN_ARRAY_
+#define COLUMN_ARRAY_(type, ctype, name, width, prec, items) \
+        DOID(name) COLUMN_ARRAY(type, ctype, name, width, prec, items)
+#endif
+
+#ifndef INLINE_ATTRIBUTE
+#define INLINE_ATTRIBUTE(x)
+#endif
+
+#ifndef ATTRIBUTE
+#define ATTRIBUTE(x, d)
+#endif
+
+#ifndef TABLE_SUFFIX
+#define TABLE_SUFFIX(s)
+#endif
+
+#ifndef SCHEMA
+#define SCHEMA(x, d)
+#endif
+
+#ifndef CONFIG
+#define CONFIG(x, d)
+#endif
+
+#include MODEL
+
+#undef __NIL
+
+#undef STAMP
+
+#undef DOID
+#undef DOC
+#undef TYPE
+#undef TYPE_
+#undef END_TYPE
+#undef TYPE_I
+#undef TYPE_I_
+#undef TYPE_II
+#undef TYPE_II_
+#undef TYPE_III
+#undef TYPE_III_
+
+#undef TABLE
+#undef TABLE_
+#undef END_TABLE
+#undef TABLE_I
+#undef TABLE_I_
+#undef TABLE_II
+#undef TABLE_II_
+#undef TABLE_III
+#undef TABLE_III_
+#undef VAR
+#undef VAR_
+#undef COLUMN
+#undef COLUMN_ARRAY
+#undef ATTRIBUTE
+#undef INLINE_ATTRIBUTE
+#undef TABLE_SUFFIX
+#undef SCHEMA
+#undef CONFIG
+#undef UPGRADE
diff --git a/uppsrc/Sql/sch_schema.h b/uppsrc/Sql/sch_schema.h
new file mode 100644
index 000000000..91960cd29
--- /dev/null
+++ b/uppsrc/Sql/sch_schema.h
@@ -0,0 +1,53 @@
+// SCHEMA
+
+#define VAR(type, x)                                        schema.Var(SCHEMA_##type, #x);
+#define COLUMN(type, ctype, name, width, prec)              schema.Column(type, #name);
+#define COLUMN_ARRAY(type, ctype, name, width, prec, items) schema.ColumnArray(type, #name, items);
+#define INLINE_ATTRIBUTE(x)                                 schema.InlineAttribute(x);
+#define ATTRIBUTE(x, d)                                     schema.Attribute(x, d);
+#define TABLE_SUFFIX(s)                                     schema.TableSuffix(s);
+
+#define TYPE(x)\
+static void SCHEMA_##x(SqlSchema& schema) {
+
+#define TYPE_I(x, b1)\
+static void SCHEMA_##x(SqlSchema& schema) { SCHEMA_##b1(schema);
+
+#define TYPE_II(x, b1, b2)\
+TYPE_I(x, b1) SCHEMA_##b2(schema);
+
+#define TYPE_III(x, b1, b2, b3)\
+TYPE_II(x, b1, b2) SCHEMA_##b3(schema);
+
+#define END_TYPE }
+
+#include SCHEMADIALECT
+
+// TABLE
+
+#define TABLE(x)\
+void TABLE_##x(SqlSchema& schema) { schema.Table(#x); SCHEMA_##x(schema); schema.EndTable(); }
+
+#define TABLE_I(x, b)             TABLE(x)
+#define TABLE_II(x, b1, b2)       TABLE(x)
+#define TABLE_III(x, b1, b2, b3)  TABLE(x)
+
+#include SCHEMADIALECT
+
+// All_Tables
+
+#define TABLE(x)                  TABLE_##x(schema);
+#define TABLE_I(x, b)             TABLE(x)
+#define TABLE_II(x, b1, b2)       TABLE(x)
+#define TABLE_III(x, b1, b2, b3)  TABLE(x)
+
+#define SCHEMA(x, d)                                        schema.Object(x, d);
+#define CONFIG(x, d)                                        schema.Config(x, d);
+#define UPGRADE(x)                                          schema.Upgrade(x);
+
+static void All_Tables(SqlSchema& schema) {
+
+#include SCHEMADIALECT
+
+
+}
diff --git a/uppsrc/Sql/sch_source.h b/uppsrc/Sql/sch_source.h
new file mode 100644
index 000000000..e89bcfea2
--- /dev/null
+++ b/uppsrc/Sql/sch_source.h
@@ -0,0 +1,127 @@
+// SqlId
+
+#define DOID(x) SqlId ADD_SCHEMA_PREFIX_CPP(x)(#x);
+//#define DOID(x)                 SqlId x(#x);
+
+#include SCHEMADIALECT
+
+// constructor
+
+#define TYPE(x)  S_##x::S_##x() {
+#define COLUMN(type, ctype, name, width, prec)               SqlSchemaInitClear(ADD_SCHEMA_PREFIX_CPP(name));
+#define COLUMN_ARRAY(type, ctype, name, width, prec, items)  SqlSchemaInitClear(ADD_SCHEMA_PREFIX_CPP(name), items);
+#define END_TYPE }
+
+#include SCHEMADIALECT
+
+// constructor, ColumnSet, TableName, SqlField
+
+#define TYPECODE(x, y) \
+const char S_##x::TableName[] = #x; \
+const SqlSet& S_##x::ColumnSet() { \
+	static SqlSet set = ColumnSet(""); \
+	return set; \
+} \
+SqlSet S_##x::Of(SqlId id) { \
+	return ColumnSet(id.ToString() + '.'); \
+} \
+SqlSet S_##x::ColumnSet(const String& prefix) { \
+	SqlSet set; \
+	y \
+
+#define TYPE(x)                 TYPECODE(x, __NIL)
+
+#define BASECODE(b) \
+set.Cat(S_##b::ColumnSet(prefix));
+#define TYPE_I(x, b)            TYPECODE(x, BASECODE(b))
+
+#define BASE2CODE(b1, b2)\
+set.Cat(S_##b1::ColumnSet(prefix)); \
+set.Cat(S_##b2::ColumnSet(prefix));
+#define TYPE_II(x, b1, b2)      TYPECODE(x, BASE2CODE(b1, b2))
+
+#define BASE3CODE(b1, b2, b3)\
+set.Cat(S_##b1::ColumnSet(prefix)); \
+set.Cat(S_##b2::ColumnSet(prefix)); \
+set.Cat(S_##b3::ColumnSet(prefix));
+#define TYPE_III(x, b1, b2, b3) TYPECODE(x, BASE3CODE(b1, b2, b3))
+
+#define VAR(type, x)             td_var(set, prefix, #x, &S_##type::ColumnSet);
+
+#define COLUMN(type, ctype, name, width, prec)               td_scalar(set, prefix, #name);
+#define COLUMN_ARRAY(type, ctype, name, width, prec, items)  td_array(set, prefix, #name, items);
+
+#define END_TYPE                 return set; }
+
+#include SCHEMADIALECT
+
+#undef  TYPECODE
+#undef  BASECODE
+#undef  BASE2CODE
+#undef  BASE3CODE
+
+// Clear
+
+#define TYPE(x)\
+void S_##x::Clear() {
+
+#define TYPE_I(x, b)\
+void S_##x::Clear() { S_##b::Clear();
+
+#define TYPE_II(x, b1, b2)\
+void S_##x::Clear() { S_##b1::Clear(); S_##b2::Clear();
+
+#define TYPE_III(x, b1, b2, b3)\
+void S_##x::Clear() { S_##b1::Clear(); S_##b2::Clear(); S_##b3::Clear();
+
+#define VAR(type, x)             x.Clear();
+
+#define COLUMN(type, ctype, name, width, prec)               SqlSchemaClear(ADD_SCHEMA_PREFIX_CPP(name));
+#define COLUMN_ARRAY(type, ctype, name, width, prec, items)  SqlSchemaClear(ADD_SCHEMA_PREFIX_CPP(name), items);
+
+#define END_TYPE    }
+
+#include SCHEMADIALECT
+
+// FieldLayout
+
+#define TYPE(x) \
+void S_##x::FieldLayout(FieldOperator& fo) {\
+	fo.Table(#x);\
+	FieldLayoutRaw(fo);\
+}
+
+#include SCHEMADIALECT
+
+// FieldLayoutRaw
+
+#define TYPE(x) \
+void S_##x::FieldLayoutRaw(FieldOperator& fo, const String& prefix) {
+
+#define TYPE_I(x, b) \
+void S_##x::FieldLayoutRaw(FieldOperator& fo, const String& prefix) {\
+	S_##b::FieldLayoutRaw(fo, prefix);
+
+#define TYPE_II(x, b1, b2) \
+void S_##x::FieldLayoutRaw(FieldOperator& fo, const String& prefix) {\
+	S_##b1::FieldLayoutRaw(fo, prefix);\
+	S_##b2::FieldLayoutRaw(fo, prefix);
+
+#define TYPE_III(x, b1, b2, b3) \
+void S_##x::FieldLayoutRaw(FieldOperator& fo, const String& prefix) {\
+	S_##b1::FieldLayoutRaw(fo, prefix);\
+	S_##b2::FieldLayoutRaw(fo, prefix);\
+	S_##b3::FieldLayoutRaw(fo, prefix);
+
+#define COLUMN(type, ctype, name, width, prec)               fo(prefix + #name, ADD_SCHEMA_PREFIX_CPP(name));
+#define COLUMN_ARRAY(type, ctype, name, width, prec, items) \
+{ \
+	for(int i = 0; i < items; i++)\
+		fo(Format("%s%s%d", ~prefix, #name, i), ADD_SCHEMA_PREFIX_CPP(name)[i]); \
+}
+
+#define VAR(type, x)             x.FieldLayoutRaw(fo, prefix + #x + "$");
+
+#define END_TYPE                 }
+
+#include SCHEMADIALECT
diff --git a/uppsrc/Sql/src.tpp/SqlExp$en-us.tpp b/uppsrc/Sql/src.tpp/SqlExp$en-us.tpp
new file mode 100644
index 000000000..6166f99aa
--- /dev/null
+++ b/uppsrc/Sql/src.tpp/SqlExp$en-us.tpp
@@ -0,0 +1,8 @@
+TITLE("SqlExp in examples")
+COMPRESSED
+120,156,229,91,251,87,219,54,20,254,87,212,12,136,19,66,176,205,186,50,54,218,19,158,205,78,8,43,105,218,31,56,89,229,198,74,226,205,177,51,63,2,28,198,255,62,201,79,41,86,30,37,114,112,55,206,225,36,216,210,119,191,251,233,234,234,201,45,216,218,146,107,242,15,242,146,159,163,51,52,208,124,211,235,221,62,126,121,218,62,111,239,117,59,224,214,149,127,1,157,191,205,243,251,9,48,44,128,238,181,241,196,68,238,78,47,120,17,125,72,119,134,55,2,14,114,113,101,23,12,108,7,252,110,187,222,208,65,157,15,45,160,27,154,137,250,94,37,173,2,30,31,127,252,89,57,60,122,45,31,170,127,4,22,170,42,184,221,150,229,61,89,142,109,157,194,93,184,219,235,29,29,205,190,79,145,211,183,167,74,90,29,17,99,210,233,117,171,123,213,174,244,66,163,116,129,250,133,99,143,165,143,141,147,214,121,133,139,224,6,8,32,68,224,0,128,1,6,0,1,64,82,63,75,160,23,253,93,141,128,234,215,131,216,104,92,50,102,247,13,228,170,49,187,4,36,
+40,91,103,200,174,207,181,225,74,13,193,60,67,100,160,185,160,33,138,38,220,105,228,193,17,110,137,99,120,123,0,123,121,112,60,16,197,80,1,219,209,55,85,44,207,177,173,71,157,80,169,197,22,56,192,207,101,13,255,201,135,118,138,79,89,88,155,53,206,105,23,190,213,151,96,73,179,30,224,151,129,5,75,177,40,53,160,10,238,105,145,9,137,194,95,219,129,51,195,245,12,139,202,171,66,25,235,17,58,16,149,198,18,186,88,248,14,242,178,129,152,175,3,169,161,245,93,105,152,102,62,162,107,166,41,76,239,83,219,183,114,138,141,62,3,45,162,39,18,69,5,147,132,85,33,204,2,25,111,236,59,87,52,191,80,68,88,125,182,128,115,245,103,184,100,223,94,59,58,114,78,30,232,174,137,220,62,178,116,195,26,114,226,133,67,128,55,27,155,67,63,51,85,171,2,96,19,2,224,235,67,102,34,162,99,30,171,182,203,149,118,159,79,112,143,41,96,17,1,116,101,88,57,17,165,128,69,16,237,248,227,124,136,186,20,240,250,185,119,202,11,82,17,185,151,2,
+94,95,78,79,215,209,52,39,57,89,236,181,185,126,210,28,67,179,250,40,31,182,211,89,244,181,249,94,58,72,243,144,203,153,65,136,101,62,156,111,103,109,31,90,72,203,223,1,115,142,145,181,217,119,39,19,228,228,19,46,62,3,189,190,206,246,93,94,76,77,6,122,253,140,225,127,117,61,39,89,32,40,130,217,118,186,39,157,143,55,52,188,104,198,106,238,164,85,49,188,155,22,77,27,150,70,200,52,109,88,18,204,189,217,166,169,195,114,104,165,44,102,168,110,79,205,188,147,71,223,214,76,50,45,124,110,254,96,192,103,124,0,109,116,239,125,210,76,169,115,254,161,146,58,86,169,39,5,46,241,2,113,69,162,22,198,154,98,44,88,198,104,68,224,149,24,156,250,142,35,138,65,31,99,113,25,44,91,244,56,67,209,139,138,119,155,88,76,48,12,234,159,71,200,65,148,176,225,84,126,31,168,224,45,80,0,220,129,59,233,6,206,49,60,198,29,174,1,75,193,94,78,198,24,94,27,132,63,81,168,133,21,206,240,40,44,169,178,252,19,238,254,51,57,70,252,
+218,228,142,120,147,89,152,196,222,104,150,78,57,131,123,117,3,150,241,114,134,226,139,159,17,170,112,79,86,130,223,114,14,11,56,86,241,42,120,21,33,133,114,109,68,32,170,251,217,30,72,237,19,235,249,59,44,49,1,165,84,0,220,139,159,169,27,20,33,187,65,121,28,197,8,17,133,138,9,101,3,154,52,221,182,159,108,75,189,140,251,134,11,218,221,86,107,3,206,182,109,175,8,222,146,102,222,144,199,45,227,47,106,40,254,108,152,186,68,18,105,21,207,91,94,196,123,19,243,33,249,111,123,123,35,41,14,55,120,209,20,32,141,191,97,21,154,233,1,2,139,76,225,40,47,161,6,57,133,150,24,96,10,102,35,67,2,61,2,46,208,230,191,42,205,194,41,25,238,60,105,228,204,159,116,21,44,164,72,255,42,74,88,189,42,92,84,21,66,157,243,123,195,245,92,169,40,129,131,2,58,47,172,9,238,108,5,147,133,132,202,198,164,225,37,34,58,55,167,89,137,1,87,88,125,192,162,197,33,91,83,165,107,210,155,32,249,41,75,37,246,30,23,88,161,149,
+93,224,136,111,25,246,108,31,86,169,186,234,146,56,121,193,246,217,249,63,180,143,97,121,200,113,73,189,239,178,141,246,178,120,43,181,209,247,208,52,99,195,242,103,243,89,206,205,146,205,250,116,163,200,220,123,141,151,142,237,79,78,30,22,93,125,124,175,77,211,131,119,101,6,140,46,24,159,219,103,79,235,197,180,23,253,146,105,45,66,136,23,74,67,226,28,57,199,103,108,48,69,70,129,115,244,6,137,204,177,150,92,8,136,12,46,185,7,48,87,204,42,219,108,137,114,45,99,108,120,146,34,203,43,11,197,198,110,42,21,117,252,67,48,1,198,204,133,104,13,35,231,65,150,224,138,36,124,61,24,184,200,147,84,145,100,237,0,19,168,41,81,222,78,254,225,107,153,226,193,238,214,103,41,224,210,34,221,126,111,144,171,59,165,17,254,32,7,71,89,228,42,216,135,85,184,11,72,9,0,171,251,73,213,111,233,150,194,71,19,80,111,90,22,114,126,179,13,43,89,186,112,10,93,199,139,197,244,126,116,152,150,162,110,156,60,86,196,143,20,100,208,197,20,193,159,
+152,35,59,10,48,133,108,139,185,100,77,18,75,88,56,122,32,106,199,149,209,165,133,6,94,177,181,51,49,67,96,251,94,65,5,188,49,134,163,130,43,232,16,138,5,150,240,194,55,205,98,43,56,192,12,69,11,72,87,59,195,236,60,180,64,34,102,110,246,43,160,134,38,186,152,30,192,112,29,88,232,30,51,51,194,232,92,240,166,229,34,199,155,207,49,57,193,194,227,177,186,168,128,202,92,80,152,95,174,150,156,146,190,137,78,73,249,94,27,1,49,178,176,177,67,23,51,199,251,241,23,174,181,169,102,250,8,79,187,21,149,186,210,80,11,207,60,223,164,103,158,124,219,140,40,140,0,201,50,100,181,127,17,226,71,61,211,236,111,195,73,116,14,18,68,157,67,81,51,197,23,199,18,183,7,48,193,20,112,230,82,238,78,116,109,81,200,211,225,116,176,52,156,238,108,199,212,249,225,52,35,226,138,65,229,7,244,230,119,25,50,155,163,86,0,202,65,34,93,120,96,30,18,42,47,23,40,19,104,189,222,211,83,88,11,244,254,5,197,138,132,205,
diff --git a/uppsrc/Sql/src.tpp/all.i b/uppsrc/Sql/src.tpp/all.i
new file mode 100644
index 000000000..b44dd5bbe
--- /dev/null
+++ b/uppsrc/Sql/src.tpp/all.i
@@ -0,0 +1,3 @@
+TOPIC("SqlExp$en-us")
+#include "SqlExp$en-us.tpp"
+END_TOPIC
diff --git a/uppsrc/Sql/util_td.cpp b/uppsrc/Sql/util_td.cpp
new file mode 100644
index 000000000..d08db21fb
--- /dev/null
+++ b/uppsrc/Sql/util_td.cpp
@@ -0,0 +1,27 @@
+#include "Sql.h"
+
+NAMESPACE_UPP
+
+void td_scalar(SqlSet& set, const String& prefix, const char *x) {
+	set.Cat(SqlCol(prefix + x));
+}
+
+void td_array(SqlSet& set, const String& prefix, const char *x, int cnt) {
+	String name = prefix + x;
+	for(int i = 0; i < cnt; i++)
+		set.Cat(SqlCol(name + Format("%d", i)));
+}
+
+void td_var(SqlSet& set, const String& prefix, const char *x, SqlSet (*f)(const String&)) {
+	set.Cat((*f)(prefix + x + '$'));
+}
+
+void td_shrink(String *array, int cnt) {
+	String *lim = array + cnt;
+	while(array < lim) {
+		array->Shrink();
+		array++;
+	}
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/SqlCommander/AUTHORS b/uppsrc/SqlCommander/AUTHORS
new file mode 100644
index 000000000..f782e5b62
--- /dev/null
+++ b/uppsrc/SqlCommander/AUTHORS
@@ -0,0 +1,2 @@
+Mirek Fidler <cxl@ntllib.org>
+Tomas Rylek  <rylek@volny.cz>
\ No newline at end of file
diff --git a/uppsrc/SqlCommander/COPYING b/uppsrc/SqlCommander/COPYING
new file mode 100644
index 000000000..33aa39102
--- /dev/null
+++ b/uppsrc/SqlCommander/COPYING
@@ -0,0 +1,30 @@
+Copyright (C) 2005 Mirek Fidler, Tomas Rylek and various contributors (see AUTHORS)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to
+deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies of the Software and its Copyright notices. In addition publicly
+documented acknowledgment must be given that this software has been used if no
+source code of this software is made available publicly. This includes
+acknowledgments in either Copyright notices, Manuals, Publicity and Marketing
+documents or any documentation provided with any product containing this
+software. This License does not apply to any software that links to the
+libraries provided by this software (statically or dynamically), but only to
+the software provided.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+-----------
+
+Please see the COPYING.PLAIN for a plain-english explanation of this notice
+and it's intent.
diff --git a/uppsrc/SqlCommander/COPYING-PLAIN b/uppsrc/SqlCommander/COPYING-PLAIN
new file mode 100644
index 000000000..770a8132f
--- /dev/null
+++ b/uppsrc/SqlCommander/COPYING-PLAIN
@@ -0,0 +1,33 @@
+Plain English Copyright Notice
+
+This file is not intended to be the actual License. The reason this file
+exists is that we here are programmers and engineers. We aren't lawyers. We
+provide licenses that we THINK say the right things, but we have our own
+intentions at heart. This is a plain-english explanation of what those
+intentions are, and if you follow them you will be within the "spirit" of
+the license.
+
+The intent is for us to enjoy writing software that is useful to us (the
+AUTHORS) and allow others to use it freely and also benefit from the work we
+put into making it. We don't want to restrict others using it. They should
+not *HAVE* to make the source code of the applications they write that
+simply link to these libraries (be that statically or dynamically), or for
+them to be limited as to what license they choose to use (be it open, closed
+or anything else). But we would like to know you are using these libraries.
+We simply would like to know that it has been useful to someone. This is why
+we ask for acknowledgement of some sort.
+
+You can do what you want with the source of this software - it doesn't
+matter. We still have it here for ourselves and it is open and free to use
+and download and play with. It can't be taken away. We don't really mind what
+you do with the source to your software. We would simply like to know that
+you are using it - especially if it makes it to a commerical product. If you
+simply e-mail all the AUTHORS (see COPYING and AUTHORS files) telling us, and
+then make sure you include a paragraph or page in the manual or in the "About.."
+box for the product with the copyright notice and state that you used this
+software, we will be very happy. If you want to contribute back modifications
+and fixes you may have made we will welcome those too with open arms (generally).
+If you want help with changes needed, ports needed or features to be added,
+arrangements can be easily made with some dialogue.
+
+Mirek Fidler <cxl@ntllib.org>
diff --git a/uppsrc/SqlCommander/SqlCommander.cpp b/uppsrc/SqlCommander/SqlCommander.cpp
new file mode 100644
index 000000000..e992bab5f
--- /dev/null
+++ b/uppsrc/SqlCommander/SqlCommander.cpp
@@ -0,0 +1,175 @@
+#include <OleDB/OleDB.h>
+#include <SqlCtrl/SqlCtrl.h>
+#pragma hdrstop
+
+#define HAVE_ORACLE
+
+#ifndef flagNOSQLLITE
+	#define HAVE_SQLLITE
+	#include <plugin/sqlite3/sqlite3.h>
+#endif
+
+#ifndef flagNOMYSQL
+	#define HAVE_MYSQL
+#endif
+
+#if defined(PLATFORM_WIN32) && defined(COMPILER_MSC)
+	#define HAVE_OLEDB
+#endif
+
+#ifdef HAVE_ORACLE
+	#include <Oracle/Oracle7.h>
+	#include <Oracle/Oracle8.h>
+#endif
+
+#ifdef HAVE_MYSQL
+	#ifndef flagMT
+		#error Must compile MySQL in multithreaded mode!
+	#endif
+	#include <MySql/MySql.h>
+#endif
+
+using namespace Upp;
+
+#define LAYOUTFILE <SqlCommander/login.lay>
+#include <CtrlCore/lay.h>
+
+class SqlCommanderApp {
+public:
+	SqlCommanderApp();
+
+	void Run();
+	void Serialize(Stream& s);
+
+private:
+	WithLoginLayout<TopWindow> login;
+	enum SERVER_TYPE
+	{
+		SERVER_ORACLE,
+#ifdef HAVE_MYSQL
+		SERVER_MYSQL
+#endif
+	};
+	One<SqlSession> session;
+};
+
+SqlCommanderApp::SqlCommanderApp() {
+	CtrlLayoutOKCancel(login, "Connect to server");
+	login.password.Password();
+	login.save_password = true;
+#ifdef HAVE_ORACLE
+	login.connection.Add("OCI7");
+	login.connection.Add("OCI8");
+#endif
+#ifdef HAVE_MYSQL
+	login.connection.Add("MYSQL");
+#endif
+#ifdef HAVE_SQLLITE
+	login.connection.Add("SQLLITE");
+#endif
+#ifdef HAVE_OLEDB
+	Array<OleDBSession::Provider> providers = OleDBSession::EnumProviders();
+	for(int i = 0; i < providers.GetCount(); i++)
+		login.connection.Add("OLEDB:" + providers[i].name);
+#endif
+}
+
+void SqlCommanderApp::Serialize(Stream& s) {
+	int version = 3;
+	s / version;
+	if(version < 3)
+	{
+		s.SetError();
+		return;
+	}
+	String pwd;
+	if(s.IsStoring() && login.save_password)
+		pwd = Garble(~login.password);
+	s % login.username % login.database % login.server % login.connection % login.save_password % pwd;
+	if(s.IsLoading() && login.save_password)
+		login.password <<= Garble(pwd);
+}
+
+void SqlCommanderApp::Run() {
+
+	LoadFromFile(*this);
+
+	do {
+		if(login.Run() != IDOK) return;
+		String un = ~login.username;
+		String pw = ~login.password;
+		String db = ~login.database;
+		String sv = ~login.server;
+		String co = ~login.connection;
+		String connect = un;
+		if(!pw.IsEmpty()) connect << '/' << pw;
+		if(!sv.IsEmpty()) connect << '@' << sv;
+#ifdef HAVE_ORACLE
+		if(co == "OCI7") {
+			One<Oracle7> oci7 = new Oracle7;
+			if(!oci7->Open(connect)) {
+				Exclamation(NFormat("OCI7 login failed: [* \1%s\1].", oci7->GetLastError()));
+				continue;
+			}
+			session = -oci7;
+		}
+		if(co == "OCI8") {
+			One<Oracle8> oci8 = new Oracle8;
+			if(!oci8->Open(connect, false)) {
+				Exclamation(NFormat("OCI8 login failed: [* \1%s\1].", oci8->GetLastError()));
+				continue;
+			}
+			session = -oci8;
+		}
+#endif
+#ifdef HAVE_MYSQL
+		if(co == "MYSQL") {
+			One<MySqlSession> mysql = new MySqlSession;
+			if(!mysql->Connect(un, pw, db, sv)) {
+				Exclamation(NFormat("MySql login failed: [* \1%s\1].", mysql->GetLastError()));
+				continue;
+			}
+			session = -mysql;
+		}
+#endif
+#ifdef HAVE_SQLLITE
+		if(co == "SQLLITE") {
+			One<Sqlite3Session> sqlite = new Sqlite3Session;
+			if(!sqlite->Open(db)) {
+				Exclamation(NFormat("SQLite3 open failed, (db file = [* \1%s\1]): [* \1%s\1].", db, sqlite->GetLastError()));
+				continue;
+			}
+			session = -sqlite;
+		}
+#endif
+#ifdef HAVE_OLEDB
+		if(!memcmp(co, "OLEDB:", 6)) {
+			String conn = co.Mid(6);
+			One<OleDBSession> oledb = new OleDBSession;
+			if(!oledb->Open(un, pw, sv, conn)) {
+				Exclamation(NFormat("OleDB login failed: [* \1%s\1].", oledb->GetLastError()));
+				continue;
+			}
+			session = -oledb;
+		}
+#endif
+		if(!session)
+			Exclamation(NFormat("Unsupported connection type: [* \1%s\1].", co));
+	}
+	while(!session);
+	login.Close();
+	SQLCommander(*session);
+	StoreToFile(*this);
+}
+
+#ifdef flagMAIN
+GUI_APP_MAIN
+{
+//	SetLanguage(LNGC_('E', 'N', 'U', 'S', CHARSET_WIN1252));
+	SetLanguage(LNGC_('C', 'S', 'C', 'Z', CHARSET_WIN1250));
+//	SetDefaultCharset(CHARSET_WIN1250);
+//	Draw::XLFDArialFont = "-*-helvetica-*-*-*-*-*-*-*-*-*-*-*-*";
+//	Draw::SetStdFont(Arial(12));
+	SqlCommanderApp().Run();
+}
+#endif//flagMAIN
diff --git a/uppsrc/SqlCommander/SqlCommander.h b/uppsrc/SqlCommander/SqlCommander.h
new file mode 100644
index 000000000..81b4235eb
--- /dev/null
+++ b/uppsrc/SqlCommander/SqlCommander.h
@@ -0,0 +1,29 @@
+// SqlCommander.h : main header file for the SQLCOMMANDER application
+//
+
+#if !defined(AFX_SQLCOMMANDER_H__CA1A67E7_56E3_11D3_A9AA_00C0DF48A075__INCLUDED_)
+#define AFX_SQLCOMMANDER_H__CA1A67E7_56E3_11D3_A9AA_00C0DF48A075__INCLUDED_
+
+#if _MSC_VER >= 1000
+#pragma once
+#endif // _MSC_VER >= 1000
+
+#ifndef __AFXWIN_H__
+	#error include 'stdafx.h' before including this file for PCH
+#endif
+
+#include "resource.h"		// main symbols
+
+/////////////////////////////////////////////////////////////////////////////
+// CSqlCommanderApp:
+// See SqlCommander.cpp for the implementation of this class
+//
+
+
+
+/////////////////////////////////////////////////////////////////////////////
+
+//{{AFX_INSERT_LOCATION}}
+// Microsoft Developer Studio will insert additional declarations immediately before the previous line.
+
+#endif // !defined(AFX_SQLCOMMANDER_H__CA1A67E7_56E3_11D3_A9AA_00C0DF48A075__INCLUDED_)
diff --git a/uppsrc/SqlCommander/SqlCommander.upp b/uppsrc/SqlCommander/SqlCommander.upp
new file mode 100644
index 000000000..a5fbf3710
--- /dev/null
+++ b/uppsrc/SqlCommander/SqlCommander.upp
@@ -0,0 +1,25 @@
+description "Simple SQL console utility";
+
+uses
+	SqlCtrl,
+	Oracle,
+	OleDB,
+	MySql,
+	plugin\sqlite3;
+
+link(WIN32 DEBUG MSC) /NODEFAULTLIB:libcmt;
+
+link(WIN32 !DEBUG MSC) /NODEFAULTLIB:libcmtd;
+
+file
+	SqlCommander.cpp,
+	login.lay,
+	Info readonly separator,
+	COPYING,
+	COPYING-PLAIN,
+	AUTHORS;
+
+mainconfig
+	"" = ".NOMYSQL GUI .NOAPPSQL",
+	"" = "GUI MT .NOAPPSQL";
+
diff --git a/uppsrc/SqlCommander/StdAfx.cpp b/uppsrc/SqlCommander/StdAfx.cpp
new file mode 100644
index 000000000..7c970244f
--- /dev/null
+++ b/uppsrc/SqlCommander/StdAfx.cpp
@@ -0,0 +1,5 @@
+// stdafx.cpp : source file that includes just the standard includes
+//	SqlCommander.pch will be the pre-compiled header
+//	stdafx.obj will contain the pre-compiled type information
+
+#include "stdafx.h"
diff --git a/uppsrc/SqlCommander/login.lay b/uppsrc/SqlCommander/login.lay
new file mode 100644
index 000000000..318762b3f
--- /dev/null
+++ b/uppsrc/SqlCommander/login.lay
@@ -0,0 +1,15 @@
+LAYOUT(LoginLayout, 398, 106)
+	ITEM(Label, dv___0, SetLabel(t_("&User name:")).LeftPosZ(4, 62).TopPosZ(4, 19))
+	ITEM(EditField, username, LeftPosZ(68, 120).TopPosZ(4, 19))
+	ITEM(Label, dv___2, SetLabel(t_("&Password:")).LeftPosZ(4, 62).TopPosZ(26, 19))
+	ITEM(EditField, password, LeftPosZ(68, 120).TopPosZ(26, 19))
+	ITEM(Label, dv___4, SetLabel(t_("&Database:")).LeftPosZ(208, 62).TopPosZ(4, 19))
+	ITEM(EditField, database, LeftPosZ(274, 120).TopPosZ(4, 19))
+	ITEM(Label, dv___6, SetLabel(t_("&Server:")).LeftPosZ(208, 62).TopPosZ(26, 19))
+	ITEM(EditField, server, LeftPosZ(274, 120).TopPosZ(26, 19))
+	ITEM(Label, dv___8, SetLabel(t_("&Connection:")).LeftPosZ(4, 62).TopPosZ(48, 19))
+	ITEM(DropList, connection, HSizePosZ(68, 4).TopPosZ(48, 19))
+	ITEM(Option, save_password, SetLabel(t_("S&ave password (unsafe!)")).LeftPosZ(8, 140).TopPosZ(82, 19))
+	ITEM(Button, ok, SetLabel(t_("OK")).RightPosZ(88, 80).BottomPosZ(5, 21))
+	ITEM(Button, cancel, SetLabel(t_("Cancel")).RightPosZ(4, 80).BottomPosZ(4, 22))
+END_LAYOUT
diff --git a/uppsrc/SqlCtrl/AUTHORS b/uppsrc/SqlCtrl/AUTHORS
new file mode 100644
index 000000000..f782e5b62
--- /dev/null
+++ b/uppsrc/SqlCtrl/AUTHORS
@@ -0,0 +1,2 @@
+Mirek Fidler <cxl@ntllib.org>
+Tomas Rylek  <rylek@volny.cz>
\ No newline at end of file
diff --git a/uppsrc/SqlCtrl/COPYING b/uppsrc/SqlCtrl/COPYING
new file mode 100644
index 000000000..33aa39102
--- /dev/null
+++ b/uppsrc/SqlCtrl/COPYING
@@ -0,0 +1,30 @@
+Copyright (C) 2005 Mirek Fidler, Tomas Rylek and various contributors (see AUTHORS)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to
+deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies of the Software and its Copyright notices. In addition publicly
+documented acknowledgment must be given that this software has been used if no
+source code of this software is made available publicly. This includes
+acknowledgments in either Copyright notices, Manuals, Publicity and Marketing
+documents or any documentation provided with any product containing this
+software. This License does not apply to any software that links to the
+libraries provided by this software (statically or dynamically), but only to
+the software provided.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+-----------
+
+Please see the COPYING.PLAIN for a plain-english explanation of this notice
+and it's intent.
diff --git a/uppsrc/SqlCtrl/COPYING-PLAIN b/uppsrc/SqlCtrl/COPYING-PLAIN
new file mode 100644
index 000000000..770a8132f
--- /dev/null
+++ b/uppsrc/SqlCtrl/COPYING-PLAIN
@@ -0,0 +1,33 @@
+Plain English Copyright Notice
+
+This file is not intended to be the actual License. The reason this file
+exists is that we here are programmers and engineers. We aren't lawyers. We
+provide licenses that we THINK say the right things, but we have our own
+intentions at heart. This is a plain-english explanation of what those
+intentions are, and if you follow them you will be within the "spirit" of
+the license.
+
+The intent is for us to enjoy writing software that is useful to us (the
+AUTHORS) and allow others to use it freely and also benefit from the work we
+put into making it. We don't want to restrict others using it. They should
+not *HAVE* to make the source code of the applications they write that
+simply link to these libraries (be that statically or dynamically), or for
+them to be limited as to what license they choose to use (be it open, closed
+or anything else). But we would like to know you are using these libraries.
+We simply would like to know that it has been useful to someone. This is why
+we ask for acknowledgement of some sort.
+
+You can do what you want with the source of this software - it doesn't
+matter. We still have it here for ourselves and it is open and free to use
+and download and play with. It can't be taken away. We don't really mind what
+you do with the source to your software. We would simply like to know that
+you are using it - especially if it makes it to a commerical product. If you
+simply e-mail all the AUTHORS (see COPYING and AUTHORS files) telling us, and
+then make sure you include a paragraph or page in the manual or in the "About.."
+box for the product with the copyright notice and state that you used this
+software, we will be very happy. If you want to contribute back modifications
+and fixes you may have made we will welcome those too with open arms (generally).
+If you want help with changes needed, ports needed or features to be added,
+arrangements can be easily made with some dialogue.
+
+Mirek Fidler <cxl@ntllib.org>
diff --git a/uppsrc/SqlCtrl/SqlArray.cpp b/uppsrc/SqlCtrl/SqlArray.cpp
new file mode 100644
index 000000000..5a2c29580
--- /dev/null
+++ b/uppsrc/SqlCtrl/SqlArray.cpp
@@ -0,0 +1,231 @@
+#include "SqlCtrl.h"
+
+NAMESPACE_UPP
+
+void SqlArray::Join(SqlId id, ArrayCtrl& master) {
+	master.AddCtrlAt(0, *this);
+	fk = id;
+}
+
+void SqlArray::Join(ArrayCtrl& master) {
+	Join(master.GetKeyId(), master);
+}
+
+void SqlArray::Clear() {
+	fkv = Null;
+	lateinsert = false;
+	ArrayCtrl::Clear();
+}
+
+void SqlArray::Reset() {
+	ArrayCtrl::Reset();
+	fk = SqlId();
+}
+
+bool SqlArray::CanInsert() const {
+	return fk.IsNull() || !IsNull(fkv);
+}
+
+bool SqlArray::PerformInsert() {
+	ASSERT(IsCursor());
+	SqlInsert insert(table);
+	for(int i = 0; i < GetIndexCount(); i++)
+		if(!GetId(i).IsNull())
+			insert(GetId(i), Get(i));
+	if(!fk.IsNull())
+		insert(fk, fkv);
+	Session().ClearError();
+	Session().Begin();
+	Sql cursor(Session());
+	cursor * insert;
+	if(OkCommit(Session(), t_("Can't insert record."))) {
+		if(IsNull(Get(0)))
+			Set(0, cursor.GetInsertedId());
+		return true;
+	}
+	return false;
+}
+
+bool SqlArray::PerformDelete() {
+	ASSERT(IsCursor());
+	Session().ClearError();
+	if(IsInsert() && lateinsert) {
+		lateinsert = false;
+		return true;
+	}
+	Session().Begin();
+	Sql cursor(Session());
+	cursor * Delete(table)
+	         .Where(fk.IsNull() ? SqlId(GetKeyId()) == GetKey()
+	                            : SqlId(GetKeyId()) == GetKey() && fk == fkv);
+
+	return OkCommit(Session(), t_("Can't delete record."));
+}
+
+bool SqlArray::UpdateRow() {
+	if(IsInsert() && lateinsert) {
+		if(!PerformInsert()) return false;
+	}
+	else {
+		SqlUpdate update(table);
+		for(int i = 0; i < GetIndexCount(); i++)
+			if(!GetId(i).IsNull() && IsModified(i))
+				update(GetId(i), Get(i));
+		if(update) {
+			Session().ClearError();
+			Session().Begin();
+			Sql cursor(Session());
+			cursor * update
+			         .Where(fk.IsNull() ? SqlId(GetKeyId()) == GetOriginalKey()
+			                            : SqlId(GetKeyId()) == GetOriginalKey() && fk == fkv);
+			if(!OkCommit(Session(), t_("Can't update record.")))
+				return false;
+		}
+	}
+	lateinsert = false;
+	return ArrayCtrl::UpdateRow();
+}
+
+void SqlArray::RejectRow() {
+	if(IsInsert())
+		PerformDelete();
+	ArrayCtrl::RejectRow();
+}
+
+void SqlArray::StartInsert() {
+	if(!CanInsert()) return;
+	DoAppend();
+	if(IsNull(GetKey()) && !autoinsertid)
+		lateinsert = true;
+	else
+		PerformInsert();
+}
+
+void SqlArray::StartDuplicate() {
+	if(!IsCursor() || !CanInsert()) return;
+	Vector<Value> v;
+	int i;
+	for(i = 0; i < GetIndexCount(); i++)
+		v.Add(Get(i));
+	if(!KillCursor()) return;
+	StartInsert();
+	for(i = 0; i < GetIndexCount(); i++)
+		if(IsNull(Get(i)) && i < v.GetCount())
+			Set(i, v[i]);
+}
+
+void SqlArray::SetData(const Value& v) {
+	fkv = v;
+	if(fk.IsNull()) {
+		CHECK(KillCursor());
+		Clear();
+	}
+	else
+		Query();
+}
+
+Value SqlArray::GetData() const {
+	return fkv;
+}
+
+bool  SqlArray::Accept() {
+	bool b = ArrayCtrl::Accept();
+	if(b) Ctrl::ClearModify();
+	return b;
+}
+
+void SqlArray::DoRemove() {
+	if(!IsCursor() || IsAskRemove() && !PromptOKCancel(RowFormat(t_("Do you really want to delete the selected %s ?")))) return;
+	if(PerformDelete()) {
+		Remove(GetCursor());
+		WhenArrayAction();
+	}
+}
+
+void SqlArray::StdBar(Bar& menu) {
+	bool c = !IsEdit();
+	bool d = c && IsCursor();
+	if(IsAppending() || IsInserting())
+		menu.Add(c && CanInsert(), RowFormat(t_("Insert %s")), THISBACK(StartInsert))
+			.Help(RowFormat(t_("Insert a new %s into the table.")))
+			.Key(K_INSERT);
+	if(IsDuplicating())
+		menu.Add(d && CanInsert(), RowFormat(t_("Copy %s")), THISBACK(StartDuplicate))
+			.Help(RowFormat(t_("Duplicate current table %s.")))
+			.Key(K_CTRL_INSERT);
+	if(IsEditing())
+		menu.Add(d, RowFormat(t_("Edit %s")), THISBACK(DoEdit))
+			.Help(RowFormat(t_("Edit active %s.")))
+			.Key(K_CTRL_ENTER);
+	if(IsRemoving())
+		menu.Add(d, RowFormat(t_("Delete %s\tDelete")), THISBACK(DoRemove))
+			.Help(RowFormat(t_("Delete active %s.")))
+			.Key(K_DELETE);
+}
+
+void SqlArray::AppendQuery(SqlBool where)
+{
+	lateinsert = false;
+	if(fk.IsNull() || !IsNull(fkv)) {
+		SqlSet cols;
+		for(int i = 0; i < GetIndexCount(); i++)
+			if(!GetId(i).IsNull())
+				cols.Cat(SqlId(GetId(i)));
+		SqlBool wh = where;
+		if(!fk.IsNull())
+			wh = wh && fk == fkv;
+		Sql sql(Session());
+		Session().ClearError();
+//		AutoWaitCursor awc(querytime); // todo: Fidler -> WaitCursor
+		if(IsNull(count))
+			sql * UPP::Select(cols).From(table).Where(wh).OrderBy(orderby);
+		else
+			sql * UPP::Select(cols).From(table).Where(wh).OrderBy(orderby).Limit(count).Offset(offset);
+		if(ShowError(sql)) {
+//			awc.Cancel(); // todo: Fidler -> WaitCursor
+			return;
+		}
+		for(;;) {
+			Vector<Value> row;
+			if(!sql.Fetch(row)) break;
+			Add(row);
+		}
+		if(GetCount())
+			if(goendpostquery)
+				GoEnd();
+			else
+				GoBegin();
+		DoColumnSort();
+		WhenPostQuery();
+	}
+}
+
+void SqlArray::Query() {
+	CHECK(KillCursor());
+	ArrayCtrl::Clear();
+	lateinsert = false;
+	AppendQuery(where);
+}
+
+void SqlArray::ReQuery()
+{
+	int sc = GetScroll();
+	Value key = GetKey();
+	Query();
+	ScrollTo(sc);
+	FindSetCursor(key);
+}
+
+SqlArray::SqlArray() {
+	querytime = 0;
+	ssn = NULL;
+	WhenBar = THISBACK(StdBar);
+	goendpostquery = false;
+	lateinsert = false;
+	autoinsertid = false;
+	RowName(t_("record"));
+	offset = 0;
+	count = Null;
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/SqlCtrl/SqlConsole.cpp b/uppsrc/SqlCtrl/SqlConsole.cpp
new file mode 100644
index 000000000..86481dd85
--- /dev/null
+++ b/uppsrc/SqlCtrl/SqlConsole.cpp
@@ -0,0 +1,610 @@
+#include "SqlCtrl.h"
+#include <Report/Report.h>
+
+#pragma hdrstop
+
+NAMESPACE_UPP
+
+#define IMAGEFILE <SqlCtrl/SqlCtrl.iml>
+#define IMAGECLASS SqlConsoleImg
+#include <Draw/iml.h>
+
+void RunDlgSqlExport(Sql& cursor, String command, String tablename);
+
+class MacroSet {
+	struct Macro {
+		int            n;
+		String         text;
+		Vector<String> param;
+
+		void           Serialize(Stream& s)         { s / n % text % param; }
+	};
+	ArrayMap<String, Macro> macro;
+
+	static bool   Spaces(const char *&s);
+	static String GetId(const char *&s);
+	static bool   IsId(int c) { return c >= 'A' && c <= 'Z' || c >= 'a' && c <= 'z' || c == '_'; }
+
+	String Expand(const char *s, Index<int>& used) const;
+
+public:
+	void   Serialize(Stream& s);
+	bool   Define(const char *s);
+	String Expand(const char *s) const;
+	int    GetCount() const                         { return macro.GetCount(); }
+	String Get(int i) const;
+};
+
+bool   MacroSet::Spaces(const char *&s) {
+	if(*s != ' ' && *s != '\t') return false;
+	while(*s == ' ' || *s == '\t')
+		s++;
+	return true;
+}
+
+String MacroSet::GetId(const char *&s) {
+	String result;
+	while(*s >= 'A' && *s <= 'Z' || *s >= 'a' && *s <= 'z' || *s >= '0' && *s <= '9' || *s == '_')
+		result.Cat(*s++);
+	return result;
+}
+
+void MacroSet::Serialize(Stream& s) {
+	int version = 0;
+	s % version;
+	int n = macro.GetCount();
+	s / n;
+	if(s.IsLoading()) {
+		macro.Clear();
+		for(int i = 0; i < n; i++) {
+			String key;
+			Macro  value;
+			s % key;
+			s % macro.Add(key);
+		}
+	}
+	else
+		for(int i = 0; i < n; i++) {
+			String key;
+			Macro  value;
+			key = macro.GetKey(i);
+			value = macro[i];
+			s % key % value;
+		}
+}
+
+bool MacroSet::Define(const char *s) {
+	if(!IsId(*s)) return false;
+	String name = GetId(s);
+	Index<String> param;
+	Spaces(s);
+	if(*s == '(') {
+		s++;
+		Spaces(s);
+		if(*s != ')')
+			for(;;) {
+				Spaces(s);
+				if(!IsId(*s)) return false;
+				if(param.GetCount() >= 16) return false;
+				param.Add(GetId(s));
+				Spaces(s);
+				if(*s == ')') break;
+				if(*s != ',') return false;
+				s++;
+			}
+		s++;
+	}
+	Spaces(s);
+	Macro& m = macro.GetAdd(name);
+	m.n = param.GetCount();
+	m.param <<= param.GetKeys();
+	m.text.Clear();
+	while(*s) {
+		if(IsId(*s)) {
+			String name = GetId(s);
+			int i = param.Find(name);
+			if(i >= 0)
+				m.text.Cat(i + 16);
+			else
+				m.text.Cat(name);
+		}
+		else {
+			if(*s >= 16 && *s < 32)
+				m.text.Cat(' ');
+			else
+				m.text.Cat(*s);
+			s++;
+		}
+	}
+	return true;
+}
+
+String MacroSet::Expand(const char *s, Index<int>& used) const {
+	bool again = false;
+	String text;
+	while(*s)
+		if(IsId(*s)) {
+			String name = GetId(s);
+			int i = macro.Find(name);
+			if(i >= 0 && used.Find(i) < 0) {
+				const Macro& m = macro[i];
+				Vector<String> param;
+				const char *t = s;
+				Spaces(s);
+				if(*s == '(') {
+					int level = 0;
+					String p;
+					for(;;) {
+						s++;
+						if((*s == ',' || *s == ')') && level == 0) {
+							p = TrimRight(TrimLeft(p));
+//							p.TrimLeft();
+//							p.TrimRight();
+							param.Add(Expand(p));
+							p.Clear();
+						}
+						else
+							p.Cat(*s);
+						if(*s == '(') level++;
+						if(*s == ')') {
+							if(level <= 0) {
+								s++;
+								break;
+							}
+							level--;
+						}
+					}
+				}
+				else
+					s = t;
+				param.SetCount(16);
+				Index<int> newused(used, 1);
+				newused.Add(i);
+				String mt = Expand(m.text, newused);
+				for(const char *q = mt; *q; q++)
+					if(*q >= 16 && *q < 32)
+						text.Cat(param[*q - 16]);
+					else
+						text.Cat(*q);
+			}
+			else
+				text.Cat(name);
+		}
+		else
+			text.Cat(*s++);
+	return text;
+}
+
+String MacroSet::Expand(const char *s) const {
+	Index<int> temp;
+	return Expand(s, temp);
+}
+
+String MacroSet::Get(int i) const {
+	const Macro& m = macro[i];
+	String s = macro.GetKey(i);
+	if(m.param.GetCount()) {
+		s.Cat('(');
+		for(i = 0; i < m.param.GetCount(); i++) {
+			if(i) s.Cat(", ");
+			s.Cat(m.param[i]);
+		}
+		s.Cat(')');
+	}
+	s.Cat("   ");
+	s.Cat(Expand(s));
+	return s;
+}
+
+class SqlConsole : public TopWindow {
+public:
+	virtual bool Key(dword key, int count);
+	virtual void Serialize(Stream& s);
+
+	void ListMenu(Bar& bar);
+	void ListPrintRow();
+	void ListPrintList();
+	void ListExport();
+
+protected:
+	Sql                        cursor;
+	String                     lastquery;
+	Splitter                   lires, vsplit;
+	ArrayCtrl                  list;
+	StaticRect                 rec_err;
+	DocEdit                    errortext;
+	ArrayCtrl                  record;
+	ArrayCtrl                  trace;
+	WithDropChoice<EditString> command;
+	Button                     schema;
+//	CallbackSet                hide;
+	Vector<int>                cw;
+	Vector<bool>               visible;
+	Vector<bool>               lob;
+	String                     LastDir;
+	MacroSet                   macroset;
+
+	enum {
+		NORMAL,
+		RERUN,
+		SCRIPT,
+		QUIET,
+	};
+
+	void    ColSize();
+	void    Hide(int i);
+	void    Record();
+	void    Execute(int type = NORMAL);
+	void    TraceToCommand();
+	void    TraceToExecute();
+	void    ListToCommand();
+	void    SaveTrace();
+	void    RunScript(bool quiet);
+	void    TraceMenu(Bar& menu);
+	void    MacroList();
+	void    ObjectTree() { SQLObjectTree(cursor.GetSession()); }
+
+	class Exec;
+	friend class Exec;
+	class Exec : public StatementExecutor {
+	public:
+		Exec(bool quiet) : quiet(quiet) {}
+		SqlConsole *me;
+		bool quiet;
+		virtual bool Execute(const String& stmt) {
+			me->command <<= stmt; me->Sync(); me->Execute(quiet ? QUIET : SCRIPT); return true;
+		}
+	};
+
+public:
+	typedef SqlConsole CLASSNAME;
+
+	void    Perform();
+
+	SqlConsole(SqlSession& session);
+};
+
+void SqlConsole::MacroList() {
+	list.Reset();
+	record.Clear();
+	list.AddColumn(t_("Defined macros"));
+	for(int i = 0; i < macroset.GetCount(); i++)
+		list.Add('#' + macroset.Get(i));
+}
+
+void SqlConsole::Execute(int type) {
+	list.Reset();
+	visible.Clear();
+	lob.Clear();
+	record.Clear();
+	String s = command.GetText().ToString();
+	if(*s == '#') {
+		if(s[1] == '\0') {
+			MacroList();
+			command.Clear();
+			return;
+		}
+		list.AddColumn(t_("Macro definition"));
+		if(macroset.Define(~s + 1)) {
+			list.Add("OK");
+			trace.Add(s, t_("Macro OK"), "");
+			if(type == NORMAL)
+				command.AddHistory();
+			command.Clear();
+		}
+		else {
+			list.Add(t_("Invalid macro"));
+			trace.Add(s, t_("Invalid"), "");
+		}
+		return;
+	}
+	s = TrimRight(macroset.Expand(s));
+//	s.TrimRight();
+	while(*s.Last() == ';')
+		s.Trim(s.GetLength() - 1);
+	int ms0 = GetTickCount();
+	cursor.ClearError();
+	lastquery = s;
+	if(!cursor.Execute(s)) {
+	error:
+		record.Hide();
+		errortext.Show();
+		list.AddColumn(t_("Error"));
+		String err = cursor.GetLastError();
+		errortext <<= err;
+		list.Add(err);
+		trace.Add(s, err, "");
+		trace.GoEnd();
+		Title((s + " - " + err).ToWString());
+		return;
+	}
+	if(type == QUIET)
+		return;
+	bool onecol = cursor.GetColumns() == 1;
+	record.Show(!onecol);
+	errortext.Show(onecol);
+	int ms1 = GetTickCount();
+	cw.SetCount(cursor.GetColumns());
+	visible.SetCount(cw.GetCount(), true);
+	for(int i = 0; i < cursor.GetColumns(); i++) {
+		const SqlColumnInfo& ci = cursor.GetColumnInfo(i);
+		list.AddColumn(ci.name);
+		list.HeaderTab(i).WhenAction = THISBACK1(Hide, i);
+		cw[i] = GetTextSize(ci.name, StdFont()).cx + 2 * list.HeaderTab(i).GetMargin();
+		record.Add(ci.name, Null);
+		lob.Add(ci.type == -1 || ci.type == -2); // !! BLOB / CLOB hack
+	}
+	Progress pi;
+	pi.SetText(t_("Fetched %d line(s)"));
+	while(cursor.Fetch()) {
+		Vector<Value> row = cursor.GetRow();
+		for(int i = 0; i < cursor.GetColumns(); i++)
+		{
+			if(lob[i])
+			{
+				String temp;
+				cursor.GetColumn(i, temp);
+				row[i] = temp;
+			}
+			cw[i] = max(cw[i], GetTextSize(StdFormat(row[i]), StdFont()).cx +
+				2 * list.HeaderTab(i).GetMargin());
+		}
+		list.Add(row);
+		if(pi.StepCanceled()) break;
+	}
+	if(cursor.GetColumns() && cursor.WasError()) {
+		list.Reset();
+		goto error;
+	}
+	visible.SetCount(cursor.GetColumns(), true);
+	ColSize();
+	if(list.GetCount() > 0)
+		list.SetCursor(0);
+	Title(NFormat(t_("%s (%d rows)"), s, pi.GetPos()));
+	String rrows = Format(t_("%d rows"), max(list.GetCount(), cursor.GetRowsProcessed()));
+	String rms = Format(t_("%d ms"), ms1 - ms0);
+	if(type == RERUN && trace.IsCursor()) {
+		trace.Set(1, rrows);
+		trace.Set(2, rms);
+	}
+	else {
+		trace.Add(s, rrows, rms);
+		trace.GoEnd();
+	}
+	if(type == NORMAL)
+		command.AddHistory();
+	command.Clear();
+}
+
+void SqlConsole::ColSize() {
+	int maxw = 18 * StdFont().Info().GetAveWidth();
+	int maxx = list.GetSize().cx;
+	int wx = 0;
+	for(int i = 0; i < cursor.GetColumns(); i++)
+		if(visible[i]) {
+			int w = min(maxw, cw[i]);
+			wx += w;
+			if(wx < maxx) {
+				list.HeaderObject().SetTabRatio(i, w);
+				list.HeaderObject().ShowTab(i);
+			}
+			else
+				list.HeaderObject().HideTab(i);
+		}
+		else
+			list.HeaderObject().HideTab(i);
+}
+
+void SqlConsole::Hide(int i) {
+	if(i < visible.GetCount())
+		visible[i] = false;
+	ColSize();
+}
+
+void SqlConsole::Record() {
+	if(list.GetIndexCount() == 1)
+		errortext <<= StdFormat(list.Get(0));
+	for(int i = 0; i < list.GetIndexCount(); i++)
+		record.Set(i, 1, list.Get(i));
+}
+
+bool SqlConsole::Key(dword key, int count) {
+	switch(key) {
+	case K_ENTER:
+		Execute();
+		return true;
+	case K_CTRL_R:
+		RunScript(false);
+		return true;
+	case K_CTRL_Q:
+		RunScript(true);
+		return true;
+	case K_CTRL_S:
+		SaveTrace();
+		return true;
+	case K_CTRL_M:
+		MacroList();
+		return true;
+	}
+	if(key >= ' ' && key < 256 || key == K_RIGHT || key == K_LEFT || key == K_ALT_DOWN) {
+		command.SetFocus();
+		command.Key(key, count);
+		return true;
+	}
+	return TopWindow::Key(key, count);
+}
+
+void SqlConsole::Serialize(Stream& s) {
+	int version = 2;
+	s / version;
+	s.Magic();
+	Rect r = GetRect();
+	s % r;
+	SetRect(r);
+	vsplit.Serialize(s);
+	record.SerializeHeader(s);
+	lires.Serialize(s);
+	command.SerializeList(s);
+	trace.SerializeHeader(s);
+	if(version >= 1)
+		s % LastDir;
+	if(version >= 2)
+		s % macroset;
+}
+
+void SqlConsole::Perform() {
+	const char cfg[] = "SqlConsole.cfg";
+	LoadFromFile(*this, cfg);
+	Title(t_("SQL Commander"));
+	Icon(SqlConsoleImg::SqlConsoleIconSmall(), SqlConsoleImg::SqlConsoleIconLarge());
+	Sizeable();
+	Zoomable();
+	ActiveFocus(command);
+	Run();
+	cursor.ClearError();
+	StoreToFile(*this, cfg);
+}
+
+void SqlConsole::TraceToCommand() {
+	if(trace.IsCursor())
+		command.SetData(trace.Get(0));
+}
+
+void SqlConsole::ListToCommand() {
+	int c = list.GetEditColumn();
+	if(list.IsCursor() && c >= 0 && c < list.GetIndexCount())
+		command.Insert(StdFormat(list.Get(c)).ToWString());
+	command.SetFocus();
+}
+
+void SqlConsole::TraceToExecute() {
+	Execute(RERUN);
+}
+
+void SqlConsole::SaveTrace() {
+	FileSelector fsel;
+	fsel.ActiveDir(LastDir);
+	fsel.DefaultExt("sql");
+	fsel.Type(t_("SQL scripts (*.sql)"), "*.sql");
+	fsel.AllFilesType();
+	if(!fsel.ExecuteSaveAs(t_("Save trace as"))) return;
+	FileOut out(~fsel);
+	if(!out) return;
+	LastDir = GetFileDirectory(~fsel);
+	for(int i = 0; i < trace.GetCount(); i++) {
+		out.Put((String)trace.Get(i, 0));
+		out.Put(";\n");
+	}
+}
+
+void SqlConsole::RunScript(bool quiet) {
+	UPP::RunScript runscript = cursor.GetSession().GetRunScript();
+	if(!runscript) {
+		Exclamation(t_("Database connection doesn't support running scripts."));
+		return;
+	}
+	FileSelector fsel;
+	fsel.ActiveDir(LastDir);
+	fsel.DefaultExt("sql");
+	fsel.Type(t_("SQL scripts (*.sql)"), "*.sql");
+	fsel.AllFilesType();
+	if(!fsel.ExecuteOpen(t_("Run script"))) return;
+	Exec exec(quiet);
+	exec.me = this;
+	LastDir = GetFileDirectory(~fsel);
+	Progress progress(t_("Executing script"));
+	(*runscript)(LoadFile(~fsel), exec, progress);
+}
+
+void SqlConsole::TraceMenu(Bar& menu) {
+	menu.Add(t_("Save as script.."), THISBACK(SaveTrace)).Key(K_CTRL_S);
+	menu.Add(t_("Run script.."), THISBACK1(RunScript, false)).Key(K_CTRL_R);
+	menu.Add(t_("Run script quietly.."), THISBACK1(RunScript, true)).Key(K_CTRL_Q);
+	menu.Add(t_("List macros.."), THISBACK(MacroList)).Key(K_CTRL_M);
+}
+
+void SqlConsole::ListMenu(Bar& bar)
+{
+	bar.Add(t_("Print record"), THISBACK(ListPrintRow));
+	bar.Add(t_("Print list"), THISBACK(ListPrintList));
+	bar.Add(t_("Export..."), THISBACK(ListExport));
+}
+
+void SqlConsole::ListPrintRow()
+{
+	String qtf;
+	qtf << "[A1 ";
+	if(!IsNull(lastquery))
+		qtf << "[4* \1" << lastquery << "\1]&&";
+	for(int i = 0; i < record.GetCount(); i++) {
+		qtf << (i ? "--" : "++") << "::10@(240.240.240) \1" << StdFormat(record.Get(i, 0)) << "\1"
+			"||::30@(255.255.255) \1" << StdFormat(record.Get(i, 1)) << "\1";
+	}
+	qtf << "++";
+	Report report;
+	report << qtf;
+	UPP::Perform(report);
+}
+
+void SqlConsole::ListPrintList()
+{
+	String qtf;
+	qtf << "[A1 ";
+	if(!IsNull(lastquery))
+		qtf << "[4* \1" << lastquery << "\1]&&";
+	for(int i = 0; i < record.GetCount(); i++)
+		qtf << (i ? "||" : "++") << "::@(240.240.240) [* \1"
+		<< StdFormat(record.Get(i, 0)) << "\1]";
+	for(int i = 0; i < list.GetCount(); i++)
+		for(int j = 0; j < list.GetIndexCount(); j++)
+			qtf << (j ? "||" : "--") << "::@(255.255.255) \1" << StdFormat(list.Get(i, j)) << '\1';
+	qtf << "++";
+	Report report;
+	report << qtf;
+	UPP::Perform(report);
+}
+
+void SqlConsole::ListExport()
+{
+	RunDlgSqlExport(cursor, lastquery, Null);
+}
+
+SqlConsole::SqlConsole(SqlSession& session)
+: cursor(session)
+{
+	int ecy = EditField::GetStdHeight();
+	lires.Horz(list, rec_err);
+	rec_err << record.SizePos() << errortext.SizePos();
+	errortext.SetReadOnly();
+	errortext.SetFont(Courier(12));
+	errortext.Hide();
+	vsplit.Vert(lires, trace);
+	record.NoCursor();
+	record.AddColumn(t_("Column"), 5);
+	record.AddColumn(t_("Value"), 10);
+	trace.AddColumn(t_("Command"), 8);
+	trace.AddColumn(t_("Result"), 1);
+	trace.AddColumn(t_("Duration"), 1);
+	trace.WhenLeftClick = THISBACK(TraceToCommand);
+	trace.WhenLeftDouble = THISBACK(TraceToExecute);
+	trace.WhenBar = THISBACK(TraceMenu);
+	list.WhenEnterRow = THISBACK(Record);
+	list.WhenLeftDouble = THISBACK(ListToCommand);
+	list.WhenBar = THISBACK(ListMenu);
+	Add(vsplit.VSizePos(0, ecy + 4).HSizePos(0, 0));
+	Add(command.BottomPos(0, ecy).HSizePos(0, 90));
+	Add(schema.BottomPos(0, ecy).RightPos(0, 80));
+	schema.SetLabel(t_("&Schema"));
+	schema <<= THISBACK(ObjectTree);
+//	hide = callback(this, &SqlConsole::Hide);
+//	Size sz = Stock.GetScreenSize();
+//	SetRect((sz.cx - 600) / 2, (sz.cy - 400) / 2, 600, 400);
+	ActiveFocus(command);
+}
+
+void SQLCommander(SqlSession& session) {
+	SqlConsole con(session);
+	con.Perform();
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/SqlCtrl/SqlCtrl.cpp b/uppsrc/SqlCtrl/SqlCtrl.cpp
new file mode 100644
index 000000000..79142d2d3
--- /dev/null
+++ b/uppsrc/SqlCtrl/SqlCtrl.cpp
@@ -0,0 +1,168 @@
+#include "SqlCtrl.h"
+
+NAMESPACE_UPP
+
+void SqlLoad(MapConvert& cv, Sql& sql) {
+	cv.Clear();
+	while(sql.Fetch())
+		cv.Add(sql[0], sql[1]);
+}
+
+void SqlLoad(MapConvert& cv, const SqlSelect& set, SqlSession& ss) {
+	Sql sql(ss);
+	ss.ClearError();
+	sql * set;
+	if(ShowError(sql)) return;
+	SqlLoad(cv, sql);
+}
+
+#ifndef NOAPPSQL
+void operator*=(MapConvert& cv, const SqlSelect& set) {
+	SqlLoad(cv, set);
+}
+#endif
+
+void SqlLoad(DropList& dl, Sql& sql) {
+	dl.ClearList();
+	while(sql.Fetch())
+		if(sql.GetColumns() == 1)
+			dl.Add(sql[0]);
+		else
+			dl.Add(sql[0], sql[1]);
+}
+
+void SqlLoad(DropList& dl, const SqlSelect& set, SqlSession& ss) {
+	Sql sql(ss);
+	ss.ClearError();
+	sql * set;
+	if(ShowError(sql)) return;
+	SqlLoad(dl, sql);
+}
+
+#ifndef NOAPPSQL
+void operator*=(DropList& dl, const SqlSelect& set) {
+	SqlLoad(dl, set);
+}
+#endif
+
+void  SqlOption::SetData(const Value& data) {
+	String s = data;
+	Set(!(IsNull(s) || s == "0"));
+}
+
+Value SqlOption::GetData() const {
+	return Get() ? "1" : "0";
+}
+
+void SqlCtrls::Add(SqlId id, Ctrl& ctrl) {
+	Item& m = item.Add();
+	m.id = id;
+	m.ctrl = &ctrl;
+}
+
+SqlSet SqlCtrls::Set() const {
+	SqlSet set;
+	for(int i = 0; i < item.GetCount(); i++)
+		set.Cat(item[i].id);
+	return set;
+}
+
+void SqlCtrls::Read(Sql& sql)
+{
+	for(int i = 0; i < item.GetCount(); i++) {
+		Item& m = item[i];
+		m.ctrl->SetData(sql[m.id]);
+	}
+}
+
+bool SqlCtrls::Fetch(Sql& sql) {
+	if(!sql.Fetch()) return false;
+	Read(sql);
+	return true;
+}
+
+void SqlCtrls::Insert(SqlInsert& insert) const {
+	for(int i = 0; i < item.GetCount(); i++)
+		insert(item[i].id, item[i].ctrl->GetData());
+}
+
+void SqlCtrls::Update(SqlUpdate& update) const {
+	for(int i = 0; i < item.GetCount(); i++)
+		update(item[i].id, item[i].ctrl->GetData());
+}
+
+void SqlCtrls::UpdateModified(SqlUpdate& update) const {
+	for(int i = 0; i < item.GetCount(); i++)
+		if(item[i].ctrl->IsModified())
+			update(item[i].id, item[i].ctrl->GetData());
+}
+
+SqlInsert SqlCtrls::Insert(SqlId table) const {
+	SqlInsert insert(table);
+	Insert(insert);
+	return insert;
+}
+
+SqlUpdate SqlCtrls::Update(SqlId table) const {
+	SqlUpdate update(table);
+	Update(update);
+	return update;
+}
+
+SqlUpdate SqlCtrls::UpdateModified(SqlId table) const {
+	SqlUpdate update(table);
+	UpdateModified(update);
+	return update;
+}
+
+bool SqlCtrls::Accept()
+{
+	for(int i = 0; i < item.GetCount(); i++)
+		if(!item[i].ctrl->Accept()) return false;
+	return true;
+}
+
+void SqlCtrls::ClearModify() {
+	for(int i = 0; i < item.GetCount(); i++)
+		item[i].ctrl->ClearModify();
+}
+
+bool SqlCtrls::IsModified() {
+	for(int i = 0; i < item.GetCount(); i++)
+		if(item[i].ctrl->IsModified()) return true;
+	return false;
+}
+
+void SqlCtrls::Enable(bool b)
+{
+	for(int i = 0; i < item.GetCount(); i++)
+		item[i].ctrl->Enable(b);
+}
+
+void SqlCtrls::SetNull()
+{
+	for(int i = 0; i < item.GetCount(); i++)
+		item[i].ctrl->SetData(Null);
+}
+
+Callback SqlCtrls::operator<<=(Callback cb)
+{
+	for(int i = 0; i < item.GetCount(); i++)
+		item[i].ctrl->WhenAction = cb;
+	return cb;
+}
+
+bool SqlCtrls::Load(Sql& sql, SqlId table, SqlBool where)
+{
+	sql * Select(*this).From(table).Where(where);
+	return Fetch(sql);
+}
+
+#ifndef NOAPPSQL
+bool SqlCtrls::Load(SqlId table, SqlBool set)
+{
+	return Load(SQL, table, set);
+}
+#endif
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/SqlCtrl/SqlCtrl.h b/uppsrc/SqlCtrl/SqlCtrl.h
new file mode 100644
index 000000000..6fdc1ae35
--- /dev/null
+++ b/uppsrc/SqlCtrl/SqlCtrl.h
@@ -0,0 +1,232 @@
+#ifndef SQLCTRL_H
+#define SQLCTRL_H
+
+#include <Sql/Sql.h>
+#include <CtrlLib/CtrlLib.h>
+
+
+NAMESPACE_UPP
+
+int  SqlError(const char *text, const char *error, const char *statement, bool retry = false);
+int  SqlError(const char *text, const SqlSession& session, bool retry = false);
+int  SqlError(const char *text, const Sql& sql APPSQLCURSOR, bool retry = false);
+
+#ifdef PLATFORM_WIN32
+int  SqlError(HWND parent, const char *text, const char *error, const char *statement, bool retry = false);
+int  SqlError(HWND parent, const char *text, const SqlSession& session, bool retry = false);
+int  SqlError(HWND parent, const char *text, const Sql& sql APPSQLCURSOR, bool retry = false);
+#endif
+
+bool   DisplayError(const SqlSession& session, const char *msg = NULL);
+bool   ShowError(SqlSession& session, const char *msg = NULL);
+bool   ErrorRollback(SqlSession& session, const char *emsg = NULL);
+bool   OkCommit(SqlSession& session, const char *emsg = NULL);
+
+bool   DisplayError(const Sql& sql, const char *msg = NULL);
+bool   ShowError(Sql& sql, const char *msg = NULL);
+bool   ErrorRollback(Sql& sql, const char *emsg = NULL);
+bool   OkCommit(Sql& sql, const char *emsg = NULL);
+
+#ifndef NOAPPSQL
+bool   DisplayError(const char *msg = NULL);
+bool   ShowError(const char *msg = NULL);
+bool   ErrorRollback(const char *emsg = NULL);
+bool   OkCommit(const char *emsg = NULL);
+#endif
+
+void SqlLoad(MapConvert& cv, Sql& sql);
+void SqlLoad(MapConvert& cv, const SqlSelect& set, SqlSession& ss APPSQLSESSION);
+#ifndef NOAPPSQL
+void operator*=(MapConvert& cv, const SqlSelect& set);
+#endif
+
+void SqlLoad(DropList& dl, Sql& sql);
+void SqlLoad(DropList& dl, const SqlSelect& set, SqlSession& ss APPSQLSESSION);
+#ifndef NOAPPSQL
+void operator*=(DropList& cv, const SqlSelect& set);
+#endif
+
+class SqlOption : public Option {
+public:
+	virtual void   SetData(const Value& data);
+	virtual Value  GetData() const;
+};
+
+class SqlArray : public ArrayCtrl {
+public:
+	virtual void  SetData(const Value& v);
+	virtual Value GetData() const;
+	virtual bool  Accept();
+
+protected:
+	virtual bool  UpdateRow();
+	virtual void  RejectRow();
+
+private:
+	SqlSession *ssn;
+	SqlId       table;
+	Value       fkv;
+	SqlId       fk;
+	SqlBool     where;
+	SqlSet      orderby;
+	int         querytime;
+	int         count;
+	int64       offset;
+	bool        lateinsert;
+	bool        goendpostquery;
+	bool        autoinsertid;
+
+	SqlBool     GetWhere();
+#ifndef NOAPPSQL
+	SqlSession& Session()                                  { return ssn ? *ssn : SQL.GetSession(); }
+#else
+	SqlSession& Session()                                  { ASSERT(ssn); return *ssn; }
+#endif
+
+	bool        PerformInsert();
+	bool        PerformDelete();
+
+	void      Inserting();
+
+public:
+	Callback  WhenPostQuery;
+
+	void      StdBar(Bar& menu);
+	bool      CanInsert() const;
+	void      StartInsert();
+	void      StartDuplicate();
+	void      DoRemove();
+
+	void      SetSession(SqlSession& _session)             { ssn = &_session; }
+
+	void      Join(SqlId fk, ArrayCtrl& master);
+	void      Join(ArrayCtrl& master);
+
+	void      Query();
+	void      AppendQuery(SqlBool where);
+	void      Query(SqlBool where)                         { SetWhere(where); Query(); }
+	void      ReQuery();
+
+	void      Limit(int _offset, int _count)               { offset = _offset; count = _count; }
+	void      Limit(int count)                             { Limit(0, count); }
+
+	SqlArray& SetTable(SqlId _table)                       { table = _table; return *this; }
+	SqlArray& SetWhere(SqlBool _where)                     { where = _where; return *this;  }
+	SqlArray& SetOrderBy(SqlSet _orderby)                  { orderby = _orderby; return *this; }
+	SqlArray& SetOrderBy(const SqlVal& a)                  { return SetOrderBy(SqlSet(a)); }
+	SqlArray& SetOrderBy(const SqlVal& a, const SqlVal& b) { return SetOrderBy(SqlSet(a, b)); }
+	SqlArray& SetOrderBy(const SqlVal& a, const SqlVal& b, const SqlVal& c)
+	                                                       { return SetOrderBy(SqlSet(a, b, c)); }
+	SqlArray& GoEndPostQuery(bool b = true)                { goendpostquery = b; return *this; }
+	SqlArray& AutoInsertId(bool b = true)                  { autoinsertid = b; return *this; }
+	SqlArray& AppendingAuto()                              { Appending(); return AutoInsertId(); }
+
+	void      Clear();
+	void      Reset();
+
+	typedef   SqlArray CLASSNAME;
+
+	SqlArray();
+};
+
+class SqlCtrls {
+	struct Item {
+		SqlId id;
+		Ctrl *ctrl;
+	};
+	Array<Item> item;
+
+public:
+	void      Add(SqlId id, Ctrl& ctrl);
+	SqlCtrls& operator()(SqlId id, Ctrl& ctrl)       { Add(id, ctrl); return *this; }
+	SqlSet    Set() const;
+	operator  SqlSet() const                         { return Set(); }
+	void      Read(Sql& sql);
+	bool      Fetch(Sql& sql);
+#ifndef NOAPPSQL
+	bool      Fetch()                                { return Fetch(SQL); }
+#endif
+	bool      Load(Sql& sql, SqlSelect set)          { sql * set; return Fetch(sql); }
+#ifndef NOAPPSQL
+	bool      Load(SqlSelect set)                    { return Load(SQL, set); }
+#endif
+	bool      Load(Sql& sql, SqlId table, SqlBool where);
+#ifndef NOAPPSQL
+	bool      Load(SqlId table, SqlBool where);
+#endif
+	void      Insert(SqlInsert& insert) const;
+	void      Update(SqlUpdate& update) const;
+	void      UpdateModified(SqlUpdate& update) const;
+	SqlInsert Insert(SqlId table) const;
+	SqlUpdate Update(SqlId table) const;
+	SqlUpdate UpdateModified(SqlId table) const;
+	bool      Accept();
+	void      ClearModify();
+	bool      IsModified();
+	void      Enable(bool b = true);
+	void      Disable()                              { Enable(false); }
+	void      SetNull();
+	Callback  operator<<=(Callback cb);
+
+	int         GetCount() const                     { return item.GetCount(); }
+	Ctrl&       operator[](int i)                    { return *item[i].ctrl; }
+	const Ctrl& operator[](int i) const              { return *item[i].ctrl; }
+	SqlId       operator()(int i) const              { return item[i].id; }
+
+	void      Reset()                                { item.Clear(); }
+};
+
+class SqlDetail : public StaticRect {
+public:
+	virtual void  SetData(const Value& v);
+	virtual Value GetData() const;
+	virtual bool  Accept();
+
+private:
+	SqlSession *ssn;
+	SqlCtrls    ctrls;
+	SqlId       table;
+	Value       fkval;
+	SqlId       fk;
+	bool        present;
+	bool        autocreate;
+
+#ifndef NOAPPSQL
+	SqlSession& Session()                          { return ssn ? *ssn : SQL.GetSession(); }
+#else
+	SqlSession& Session()                          { ASSERT(ssn); return *ssn; }
+#endif
+
+	void        Query();
+
+public:
+	Callback    WhenPostQuery;
+
+	bool        IsPresent() const                  { return present; }
+	bool        Create();
+	bool        Delete();
+
+	void        SetSession(SqlSession& _session)   { ssn = &_session; }
+
+	SqlDetail&  Add(SqlId id, Ctrl& ctrl);
+	SqlDetail&  operator()(SqlId id, Ctrl& ctrl)   { return Add(id, ctrl); }
+
+	SqlDetail&  Join(SqlId fk, ArrayCtrl& master);
+	SqlDetail&  Join(ArrayCtrl& master);
+	SqlDetail&  SetTable(SqlId _table)             { table = _table; return *this; }
+	SqlDetail&  AutoCreate(bool b = true)          { autocreate = b; return *this; }
+
+	void        Reset();
+
+	SqlDetail();
+};
+
+void        SQLCommander(SqlSession& session);
+#ifndef NOAPPSQL
+inline void SQLCommander() { SQLCommander(SQL.GetSession()); }
+#endif
+void        SQLObjectTree(SqlSession& session APPSQLSESSION);
+
+END_UPP_NAMESPACE
+
+#endif
diff --git a/uppsrc/SqlCtrl/SqlCtrl.iml b/uppsrc/SqlCtrl/SqlCtrl.iml
new file mode 100644
index 000000000..385944e5e
--- /dev/null
+++ b/uppsrc/SqlCtrl/SqlCtrl.iml
@@ -0,0 +1,52 @@
+IMAGE_BEGIN(SqlConsoleIconLarge)
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("Ć\0\0\0Ć\0\0\0„\0\0\0�")
+	IMAGE_SCAN("�\2\0\0\0�\0��\0\377\377\2�\0�\0\0\0‚\0\0\0\1�\0��\0\377\377\2�\0�\0\0\0�\1\0\0\0�\0\377\377\1\0\0\0�")
+	IMAGE_SCAN("�\2\0\0\0�\0��\0\377\377\1\0\0\0�\2\0\0\0�\0��\0\377\377�\0\0\0�\0\377\377\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\377\1�\0��\0\0\0�\1\0\0\0�\0\377\377\1�\0��\0\0\0\1�\0��\0\377\377\2�\0�\0\0\0�\0\377\377\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\377\1�\0��\0\0\0�\2\0\0\0\0���\0\377\377�\0\0\0�\1\0\0\0�\0\377\377\1\0\0\0�\0\377\377\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\377�\0\0\0�\0\377\377\2�\0�\0\0\0�\2\0\0\0�\0��\0\377\377\1\0\0\0�\0\377\377\1\0\0\0�")
+	IMAGE_SCAN("�\2\0\0\0�\0��\0\377\377\1\0\0\0�\0\377\377\1\0\0\0�\1\0\0\0�\0\377\377\1\0\0\0�\0\377\377\1\0\0\0�")
+	IMAGE_SCAN("��\0\0\0\1�\0��\0\377\377\1\0\0\0�\0\377\377\2�\0�\0\0\0��\0\0\0�\1\0\0\0�\0\377\377\1\0\0\0�\0\377\377\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\377\4�\0�\0\0\0�\0�\0���\0\377\377\1\0\0\0�\0\377\377�\0\0\0�\0\377\377\2\0\0\0�\0��\0\377\377\1\0\0\0�\0\377\377�\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\377\3�\0�\0\0\0�\0��\0\377\377\1�\0��\0\377\377\1�\0��\0\377\377\2�\0�\0\0\0�\0\377\377\1\0\0\0�")
+	IMAGE_SCAN("�\2\0\0\0�\0��\0\377\377\2�\0�\0\0\0�\2\0\0\0�\0��\0\377\377\1�\0��\0\0\0�\0\377\377\1\0\0\0�")
+	IMAGE_SCAN("��\0\0\0�\2\0\0\0�\0��\0\377\377\1�\0��\0\0\0�")
+	IMAGE_SCAN("ͅ\0\0\0\1�\0��\0\377\377\1\0\0\0�")
+	IMAGE_SCAN("҂\0\0\0�\0\377\377\1\0\0\0�")
+	IMAGE_SCAN("ԃ\0\0\0�")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\0\377\377\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\0\377\377\1\0\0\0")
+	IMAGE_SCAN("�\0\0\0")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�")
+IMAGE_PACKED(SqlConsoleIconLarge, "\2 \0\0\0 \0\0\0\0\0\0\0\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(SqlConsoleIconSmall)
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("‚�\0\0Â�\0\0���\0\0�")
+	IMAGE_SCAN("�\1�\0\0�\0\377\377\1�\0\0�\1�\0\0�\0\377\377��\0\0\2\0\377\377�\0\0�")
+	IMAGE_SCAN("\2�\0\0\0\377\377��\0\0\3\0\377\377�\0\0\0\377\377��\0\0\4\0\377\377�\0\0\0\377\377�\0\0�")
+	IMAGE_SCAN("\2�\0\0\0\377\377��\0\0\1\0\377\377��\0\0\4\0\377\377�\0\0\0\377\377�\0\0�")
+	IMAGE_SCAN("�\1�\0\0�\0\377\377��\0\0\1\0\377\377��\0\0\4\0\377\377�\0\0\0\377\377�\0\0�")
+	IMAGE_SCAN("��\0\0\3\0\377\377�\0\0\0\377\377��\0\0\4\0\377\377�\0\0\0\377\377�\0\0�")
+	IMAGE_SCAN("\2�\0\0\0\377\377��\0\0\4\0\377\377�\0\0\0\377\377�\0\0�\0\377\377\2�\0\0\0\377\377��\0\0")
+	IMAGE_SCAN("�\1�\0\0�\0\377\377��\0\0�\0\377\377\1�\0\0�\0\377\377\1�\0\0")
+	IMAGE_SCAN("‚�\0\0É�\0\0")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("��\0\0")
+	IMAGE_SCAN("\1�\0\0�\0\377\377\1�\0\0")
+	IMAGE_SCAN("��\0\0")
+IMAGE_PACKED(SqlConsoleIconSmall, "\2\20\0\0\0\20\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0")
diff --git a/uppsrc/SqlCtrl/SqlCtrl.lay b/uppsrc/SqlCtrl/SqlCtrl.lay
new file mode 100644
index 000000000..b55e0cf15
--- /dev/null
+++ b/uppsrc/SqlCtrl/SqlCtrl.lay
@@ -0,0 +1,24 @@
+LAYOUT(SqlErrorLayout, 532, 244)
+	ITEM(Label, text, SetLabel(t_("Error")).LeftPosZ(4, 520).TopPosZ(12, 36))
+	ITEM(Label, cursors, SetLabel(t_("SQL error:")).LeftPosZ(4, 300).TopPosZ(60, 13))
+	ITEM(DocEdit, error, LeftPosZ(4, 522).TopPosZ(76, 52))
+	ITEM(Label, dv___3, SetLabel(t_("Error statement:")).LeftPosZ(4, 201).TopPosZ(136, 13))
+	ITEM(DocEdit, statement, LeftPosZ(4, 522).TopPosZ(152, 52))
+	ITEM(Button, retry, SetLabel(t_("Retry")).LeftPosZ(368, 75).TopPosZ(212, 24))
+	ITEM(Button, cancel, SetLabel(t_("Cancel")).LeftPosZ(448, 75).TopPosZ(212, 24))
+END_LAYOUT
+
+LAYOUT(SqlExportLayout, 412, 332)
+	ITEM(ArrayCtrl, columns, AutoHideSb(true).HSizePosZ(4, 4).VSizePosZ(6, 68))
+	ITEM(Label, dv___1, SetLabel(t_("Format:")).LeftPosZ(6, 48).BottomPosZ(45, 19))
+	ITEM(Switch, format, SetLabel(t_("text\nSQL script")).LeftPosZ(56, 116).BottomPosZ(46, 16))
+	ITEM(Label, dv___3, SetLabel(t_("Delimiters:")).LeftPosZ(184, 50).BottomPosZ(45, 19))
+	ITEM(Switch, delimiters, SetLabel(t_("tab\nsemicolons")).LeftPosZ(238, 170).BottomPosZ(46, 16))
+	ITEM(Option, quote, SetLabel(t_("Quoted string values")).LeftPosZ(6, 186).BottomPosZ(27, 15))
+	ITEM(Option, identity_insert, SetLabel(t_("MS-SQL identity insert")).LeftPosZ(200, 190).BottomPosZ(27, 15))
+	ITEM(Label, dv___7, SetLabel(t_("Object name:")).LeftPosZ(6, 68).BottomPosZ(4, 19))
+	ITEM(EditString, object_name, NotNull(true).LeftPosZ(82, 96).BottomPosZ(4, 19))
+	ITEM(Button, ok, SetLabel(t_("OK")).RightPosZ(88, 80).BottomPosZ(3, 21))
+	ITEM(Button, cancel, SetLabel(t_("Cancel")).RightPosZ(4, 80).BottomPosZ(4, 22))
+END_LAYOUT
+
diff --git a/uppsrc/SqlCtrl/SqlCtrl.t b/uppsrc/SqlCtrl/SqlCtrl.t
new file mode 100644
index 000000000..cbf81709d
--- /dev/null
+++ b/uppsrc/SqlCtrl/SqlCtrl.t
@@ -0,0 +1,271 @@
+#ifdef _MSC_VER
+#pragma setlocale("C")
+#endif
+// SqlArray.cpp
+
+T_("Can't insert record.")
+csCZ("Nelze vložit záznam.")
+
+T_("Can't delete record.")
+csCZ("Nelze smazat záznam.")
+
+T_("Can't update record.")
+csCZ("Nelze změnit záznam.")
+
+T_("Do you really want to delete the selected %s ?")
+csCZ("Smazat aktuální %s ?")
+
+T_("Insert %s")
+csCZ("Vložit %s")
+
+T_("Insert a new %s into the table.")
+csCZ("Vložit do tabulky nový %s.")
+
+T_("Copy %s")
+csCZ("Kopírovat %s")
+
+T_("Duplicate current table %s.")
+csCZ("Vložit do tabulky duplikát aktuálního %s.")
+
+T_("Edit %s")
+csCZ("Opravit aktuální %s")
+
+T_("Edit active %s.")
+csCZ("Opravit aktuální %s.")
+
+T_("Delete %s\tDelete")
+csCZ("Odstranit %s\tDelete")
+
+T_("Delete active %s.")
+csCZ("Odstranit aktuální %s.")
+
+T_("record")
+csCZ("záznam")
+
+
+// SqlDlg.cpp
+
+T_("Database error")
+csCZ("Chyba při práci s databází")
+
+T_("The operation has failed")
+csCZ("Při provádění operace došlo k chybě")
+
+T_("The operation has failed.\nOperation was canceled")
+csCZ("Při provádění operace došlo k chybě.\nOperace je stornována.")
+
+T_("SQL error!")
+csCZ("Chyba SQL!")
+
+
+// SqlConsole.cpp
+
+T_("Defined macros")
+csCZ("Definice maker")
+
+T_("Macro definition")
+csCZ("Definovat makro")
+
+T_("Macro OK")
+csCZ("Makro OK")
+
+T_("Invalid macro")
+csCZ("Chybné makro")
+
+T_("Invalid")
+csCZ("Chyba")
+
+T_("Error")
+csCZ("Chyba")
+
+T_("Fetched %d line(s)")
+csCZ("Načteno %d řádků")
+
+T_("%s (%d rows)")
+csCZ("%s (%d řádků)")
+
+T_("%d rows")
+csCZ("%d řádků")
+
+T_("%d ms")
+csCZ("%d ms")
+
+T_("SQL Commander")
+csCZ("SQL Commander")
+
+T_("SQL scripts (*.sql)")
+csCZ("SQL předpisy (*.sql)")
+
+T_("Save trace as")
+csCZ("Uložit protokol jako")
+
+T_("Database connection doesn't support running scripts.")
+csCZ("Databázové spojení neumožňuje spouštění skriptů.")
+
+T_("Run script")
+csCZ("Provést skript")
+
+T_("Executing script")
+csCZ("Provádím skript")
+
+T_("Save as script..")
+csCZ("Uložit jako skript..")
+
+T_("Run script..")
+csCZ("Provést skript")
+
+T_("Run script quietly..")
+csCZ("")
+
+T_("List macros..")
+csCZ("Seznam maker..")
+
+T_("Print record")
+csCZ("Tisk záznamu")
+
+T_("Print list")
+csCZ("Tisk výběru")
+
+T_("Export...")
+csCZ("Export...")
+
+T_("Column")
+csCZ("Sloupec")
+
+T_("Value")
+csCZ("Hodnota")
+
+T_("Command")
+csCZ("Příkaz")
+
+T_("Result")
+csCZ("Výsledek")
+
+T_("Duration")
+csCZ("Doba")
+
+T_("&Schema")
+csCZ("&Schéma")
+
+
+// SqlObjectTree.cpp
+
+T_("Column name")
+csCZ("Název sloupce")
+
+T_("Type")
+csCZ("Typ")
+
+T_("Width")
+csCZ("Šířka")
+
+T_("SQL query")
+csCZ("SQL dotaz")
+
+T_(" export")
+csCZ(" - export")
+
+T_("Error executing [* \001%s\001]: \001%s")
+csCZ("Chyba při provádění [* \001%s\001]: \001%s")
+
+T_("integer")
+csCZ("celé číslo")
+
+T_("real number")
+csCZ("reálné číslo")
+
+T_("string")
+csCZ("řetězec")
+
+T_("date")
+csCZ("datum")
+
+T_("date/time")
+csCZ("datum/čas")
+
+T_("BLOB")
+csCZ("BLOB")
+
+T_("CLOB")
+csCZ("CLOB")
+
+T_("No columns selected!")
+csCZ("Nebyly vybrány žádné sloupce.")
+
+T_("Text files (*.txt)")
+csCZ("Textové soubory (*.txt)")
+
+T_("Save export as")
+csCZ("Uložit export do souboru")
+
+T_("Error creating file [* \001%s\001].")
+csCZ("Nelze vytvořit soubor [* \001%s\001].")
+
+T_("Exporting row %d")
+csCZ("Exportuji řádek %d")
+
+T_("Export aborted!")
+csCZ("Export byl přerušen.")
+
+T_("Error writing file %s.")
+csCZ("Chyba při zápisu do souboru %s.")
+
+T_("SQL object tree")
+csCZ("Strom SQL objektů")
+
+T_("Schemas")
+csCZ("Schémata")
+
+T_("Tables")
+csCZ("Tabulky")
+
+T_("Views")
+csCZ("Pohledy")
+
+T_("Sequences")
+csCZ("Sekvence")
+
+T_("Primary key: ")
+csCZ("Primární klíč: ")
+
+T_("Export")
+csCZ("Export")
+
+
+// SqlCtrl.lay
+
+T_("SQL error:")
+csCZ("SQL chyba:")
+
+T_("Error statement:")
+csCZ("Chybný SQL příkaz:")
+
+T_("Retry")
+csCZ("Opakovat")
+
+T_("Cancel")
+csCZ("Storno")
+
+T_("Format:")
+csCZ("Formát:")
+
+T_("text\nSQL script")
+csCZ("text\nSQL skript")
+
+T_("Delimiters:")
+csCZ("Oddělovače:")
+
+T_("tab\nsemicolons")
+csCZ("tabelátory\nstředníky")
+
+T_("Quoted string values")
+csCZ("Textové hodnoty v uvozovkách")
+
+T_("MS-SQL identity insert")
+csCZ("Identity insert pro MS-SQL")
+
+T_("Object name:")
+csCZ("Název objektu:")
+
+T_("OK")
+csCZ("OK")
diff --git a/uppsrc/SqlCtrl/SqlCtrl.upp b/uppsrc/SqlCtrl/SqlCtrl.upp
new file mode 100644
index 000000000..a9890a21b
--- /dev/null
+++ b/uppsrc/SqlCtrl/SqlCtrl.upp
@@ -0,0 +1,25 @@
+description "GUI widgets and routines for SQL";
+
+uses
+	Sql,
+	CtrlLib,
+	Report;
+
+file
+	SqlCtrl.h,
+	SqlCtrl.t charset "UTF-8",
+	SqlCtrl_init.icpp,
+	SqlCtrl.cpp,
+	SqlArray.cpp,
+	SqlDetail.cpp,
+	SqlDlg.h,
+	SqlDlg.cpp,
+	SqlConsole.cpp,
+	SqlObjectTree.cpp,
+	SqlCtrl.lay,
+	SqlCtrl.iml,
+	SqlCtrl.usc,
+	Info readonly separator,
+	COPYING,
+	COPYING-PLAIN,
+	AUTHORS;
diff --git a/uppsrc/SqlCtrl/SqlCtrl.usc b/uppsrc/SqlCtrl/SqlCtrl.usc
new file mode 100644
index 000000000..d3d82ccfa
--- /dev/null
+++ b/uppsrc/SqlCtrl/SqlCtrl.usc
@@ -0,0 +1,10 @@
+ctrl SqlArray {
+	group "Complex";
+	>ArrayCtrl;
+}
+
+ctrl SqlOption {
+	group "Push";
+	>Option;
+	GetStdSize() { sz = GetMinSize(); sz.cx *= 8; sz.cy = max(16, sz.cy); return sz; }
+}
diff --git a/uppsrc/SqlCtrl/SqlCtrl_init.icpp b/uppsrc/SqlCtrl/SqlCtrl_init.icpp
new file mode 100644
index 000000000..4fe48c456
--- /dev/null
+++ b/uppsrc/SqlCtrl/SqlCtrl_init.icpp
@@ -0,0 +1,8 @@
+#include "SqlCtrl.h"
+
+NAMESPACE_UPP
+
+#define TFILE <SqlCtrl/SqlCtrl.t>
+#include <Core/t.h>
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/SqlCtrl/SqlDetail.cpp b/uppsrc/SqlCtrl/SqlDetail.cpp
new file mode 100644
index 000000000..ac4a57e58
--- /dev/null
+++ b/uppsrc/SqlCtrl/SqlDetail.cpp
@@ -0,0 +1,98 @@
+#include "SqlCtrl.h"
+
+NAMESPACE_UPP
+
+SqlDetail::SqlDetail()
+{
+	present = false;
+	autocreate = false;
+	ssn = NULL;
+}
+
+SqlDetail& SqlDetail::Add(SqlId id, Ctrl& ctrl)
+{
+	ctrls(id, ctrl);
+	ctrl.Disable();
+	return *this;
+}
+
+
+SqlDetail& SqlDetail::Join(SqlId id, ArrayCtrl& master)
+{
+	master.AddCtrlAt(0, *this);
+	fk = id;
+	return *this;
+}
+
+SqlDetail& SqlDetail::Join(ArrayCtrl& master)
+{
+	Join(master.GetKeyId(), master);
+	return *this;
+}
+
+void SqlDetail::Query()
+{
+	present = false;
+	ctrls.Disable();
+	ctrls.SetNull();
+	if(fk.IsNull() || IsNull(fkval)) return;
+	Sql sql(Session());
+	sql.ClearError();
+	sql * Select(ctrls).From(table).Where(fk == fkval);
+	if(ShowError(sql)) return;
+	present = ctrls.Fetch(sql);
+	ctrls.Enable(present || autocreate);
+	ctrls.ClearModify();
+	WhenPostQuery();
+}
+
+bool SqlDetail::Create()
+{
+	if(IsPresent() || fk.IsNull() || IsNull(fkval)) return false;
+	ClearModify();
+	Sql sql(Session());
+	sql.ClearError();
+	sql * ctrls.Insert(table)(fk, fkval);
+	if(ShowError(sql)) return false;
+	present = true;
+	ctrls.Enable();
+	return true;
+}
+
+bool SqlDetail::Delete()
+{
+	if(!IsPresent() || fk.IsNull() || IsNull(fkval)) return false;
+	Sql sql(Session());
+	sql * UPP::Delete(table).Where(fk == fkval);
+	if(ShowError(sql)) return false;
+	present = false;
+	return true;
+}
+
+void  SqlDetail::SetData(const Value& v)
+{
+	fkval = v;
+	Query();
+}
+
+Value SqlDetail::GetData() const
+{
+	return fkval;
+}
+
+bool  SqlDetail::Accept()
+{
+	ClearModify();
+	if(fk.IsNull() || IsNull(fkval)) return true;
+	if(!ctrls.IsModified()) return true;
+	if(IsPresent()) {
+		Sql sql(Session());
+		sql.ClearError();
+		sql * ctrls.UpdateModified(table).Where(fk == fkval);
+		return !ShowError(sql);
+	}
+	return autocreate ? Create() : true;
+}
+
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/SqlCtrl/SqlDlg.cpp b/uppsrc/SqlCtrl/SqlDlg.cpp
new file mode 100644
index 000000000..5b06320cc
--- /dev/null
+++ b/uppsrc/SqlCtrl/SqlDlg.cpp
@@ -0,0 +1,117 @@
+#include "SqlCtrl.h"
+#include "SqlDlg.h"
+
+NAMESPACE_UPP
+
+int SqlError(
+#ifdef PLATFORM_WIN32
+	HWND parent,
+#endif
+	const char *text, const char *error, const char *statement, bool retry) {
+	WithSqlErrorLayout<TopWindow> r;
+	CtrlLayoutCancel(r, t_("Database error"));
+	r.text = text;
+	r.error.AutoHideSb().SetReadOnly() <<= error;
+	r.statement.AutoHideSb().SetReadOnly() <<= statement;
+	r.retry.Show(retry);
+	r.Acceptor(r.retry, IDRETRY);
+	r.ActiveFocus(r);
+#ifdef PLATFORM_WIN32
+	if(parent) r.Open(parent);
+#endif
+	return r.Run();
+}
+
+int SqlError(
+#ifdef PLATFORM_WIN32
+	HWND parent,
+#endif
+	const char *text, const SqlSession& session, bool retry) {
+	return SqlError(
+#ifdef PLATFORM_WIN32
+		parent,
+#endif
+		text, session.GetLastError(), session.GetErrorStatement(), retry);
+}
+
+int SqlError(
+#ifdef PLATFORM_WIN32
+	HWND parent,
+#endif
+	const char *text, const Sql& sql, bool retry) {
+	return SqlError(
+#ifdef PLATFORM_WIN32
+		parent,
+#endif
+		text, sql.GetSession(), retry);
+}
+
+#ifdef PLATFORM_WIN32
+int  SqlError(const char *text, const char *error, const char *statement, bool retry) {
+	return SqlError(HWND(NULL), text, error, statement, retry);
+}
+
+int  SqlError(const char *text, const SqlSession& session, bool retry) {
+	return SqlError(HWND(NULL), text, session, retry);
+}
+
+int  SqlError(const char *text, const Sql& sql, bool retry) {
+	return SqlError(HWND(NULL), text, sql, retry);
+}
+#endif
+
+bool   DisplayError(const SqlSession& session, const char *msg) {
+	if(!session.WasError()) return false;
+	SqlError(msg ? msg : t_("The operation has failed"),
+			 session.GetLastError(), session.GetErrorStatement());
+	return true;
+}
+
+bool   ShowError(SqlSession& session, const char *msg) {
+	if(DisplayError(session, msg)) {
+		session.ClearError();
+		return true;
+	}
+	return false;
+}
+
+bool ErrorRollback(SqlSession& session, const char *msg) {
+	if(!ShowError(session, msg ? msg : t_("The operation has failed.\nOperation was canceled")))
+		return false;
+	session.Rollback();
+	return true;
+}
+
+bool OkCommit(SqlSession& session, const char *msg) {
+	if(ErrorRollback(session, msg))
+		return false;
+	session.Commit();
+	if(ShowError(session, msg ? msg : t_("SQL error!")))
+		return false;
+	return true;
+}
+
+bool DisplayError(const Sql& sql, const char *msg) {
+	return DisplayError(sql.GetSession(), msg);
+}
+
+bool ShowError(Sql& sql, const char *msg) {
+	return ShowError(sql.GetSession(), msg);
+}
+
+bool ErrorRollback(Sql& sql, const char *emsg) {
+	return ErrorRollback(sql.GetSession(), emsg);
+}
+
+bool OkCommit(Sql& sql, const char *emsg) {
+	return OkCommit(sql.GetSession(), emsg);
+}
+
+#ifndef NOAPPSQL
+bool   DisplayError(const char *msg)    { return DisplayError(SQL, msg); }
+bool   ShowError(const char *msg)       { return ShowError(SQL, msg); }
+bool   ErrorRollback(const char *emsg)  { return ErrorRollback(SQL, emsg); }
+bool   OkCommit(const char *emsg)       { return OkCommit(SQL, emsg); }
+#endif
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/SqlCtrl/SqlDlg.h b/uppsrc/SqlCtrl/SqlDlg.h
new file mode 100644
index 000000000..ee9a4de44
--- /dev/null
+++ b/uppsrc/SqlCtrl/SqlDlg.h
@@ -0,0 +1,11 @@
+#ifndef _SqlCtrl_SqlDlg_h_
+#define _SqlCtrl_SqlDlg_h_
+
+NAMESPACE_UPP
+
+#define LAYOUTFILE <SqlCtrl/SqlCtrl.lay>
+#include <CtrlCore/lay.h>
+
+END_UPP_NAMESPACE
+
+#endif
diff --git a/uppsrc/SqlCtrl/SqlObjectTree.cpp b/uppsrc/SqlCtrl/SqlObjectTree.cpp
new file mode 100644
index 000000000..a367bbdca
--- /dev/null
+++ b/uppsrc/SqlCtrl/SqlObjectTree.cpp
@@ -0,0 +1,396 @@
+#include "SqlCtrl.h"
+#pragma hdrstop
+
+#include "SqlDlg.h"
+
+NAMESPACE_UPP
+
+static bool StringLessNoCase(String a, String b) { return CompareNoCase(a, b) < 0; }
+
+class DlgSqlExport : public WithSqlExportLayout<TopWindow>
+{
+public:
+	typedef DlgSqlExport CLASSNAME;
+	DlgSqlExport();
+
+	void    Run(Sql& cursor, String command, String tablename);
+	void    Serialize(Stream& stream);
+
+private:
+	void    SyncUI();
+	void    Toggle();
+
+private:
+	ArrayOption exp;
+	enum {
+		FMT_TEXT,
+		FMT_SQL,
+	};
+	enum {
+		DELIM_TAB,
+		DELIM_SEMICOLON,
+	};
+	String recent_file;
+};
+
+void RunDlgSqlExport(Sql& cursor, String command, String tablename)
+{
+	DlgSqlExport().Run(cursor, command, tablename);
+}
+
+DlgSqlExport::DlgSqlExport()
+{
+	CtrlLayoutOKCancel(*this, "");
+	columns.AddColumn(t_("Column name"));
+	columns.AddColumn(t_("Type"));
+	columns.AddColumn(t_("Width"));
+	HeaderCtrl::Column& hc = exp.AddColumn(columns, "").Margin(0).HeaderTab();
+	hc.SetMargin(0).Fixed(18).SetAlign(ALIGN_CENTER).SetImage(CtrlImg::smallcheck());
+	hc.WhenAction = THISBACK(Toggle);
+	format <<= FMT_TEXT;
+	delimiters <<= DELIM_SEMICOLON;
+	quote <<= true;
+	format <<= THISBACK(SyncUI);
+}
+
+void DlgSqlExport::SyncUI()
+{
+	int f = ~format;
+	delimiters.Enable(f == FMT_TEXT);
+	quote.Enable(f == FMT_TEXT);
+	identity_insert.Enable(f == FMT_SQL);
+	object_name.Enable(f == FMT_SQL);
+}
+
+void DlgSqlExport::Toggle()
+{
+	bool state = true;
+	if(columns.IsCursor())
+		state = !(bool)columns.Get(3);
+	for(int i = 0; i < columns.GetCount(); i++)
+		columns.Set(i, 3, state);
+}
+
+void DlgSqlExport::Run(Sql& cursor, String command, String tablename)
+{
+	Title(Nvl(tablename, t_("SQL query")) + t_(" export"));
+	object_name <<= tablename;
+	if(!cursor.Execute(command)) {
+		Exclamation(NFormat(t_("Error executing [* \1%s\1]: \1%s"), command, cursor.GetLastError()));
+		return;
+	}
+	for(int i = 0; i < cursor.GetColumns(); i++) {
+		const SqlColumnInfo& sci = cursor.GetColumnInfo(i);
+		String type;
+		switch(sci.type) {
+			case BOOL_V:
+			case INT_V: type = t_("integer"); break;
+			case DOUBLE_V: type = t_("real number"); break;
+			case STRING_V:
+			case WSTRING_V: type = t_("string"); break;
+			case DATE_V: type = t_("date"); break;
+			case TIME_V: type = t_("date/time"); break;
+			case /*ORA_BLOB_V*/-1: type = t_("BLOB"); break;
+			case /*ORA_CLOB_V*/-2: type = t_("CLOB"); break;
+			default: type = FormatInt(sci.type); break;
+		}
+		columns.Add(sci.name, sci.type, sci.width, 1);
+	}
+	static String cfg;
+	LoadFromString(*this, cfg);
+	SyncUI();
+	while(TopWindow::Run() == IDOK)
+		try {
+			String out_table = ~object_name;
+			String delim;
+			switch((int)~delimiters) {
+				case DELIM_TAB: delim = "\t"; break;
+				case DELIM_SEMICOLON: delim = ";"; break;
+			}
+			Vector<int> out;
+			String colstr;
+			String title;
+			for(int i = 0; i < columns.GetCount(); i++)
+				if(columns.Get(i, 3)) {
+					out.Add(i);
+					String cname = cursor.GetColumnInfo(i).name;
+					colstr << (i ? ", " : "") << cname;
+					if(i) title << delim;
+					title << cname;
+				}
+			if(out.IsEmpty()) {
+				throw Exc(t_("No columns selected!"));
+				continue;
+			}
+			String rowbegin, rowend;
+			int fmt = ~format;
+			FileSel fsel;
+			String ext;
+			switch(fmt) {
+				case FMT_TEXT: {
+					rowend = "";
+					ext = ".txt";
+					fsel.Type(t_("Text files (*.txt)"), "*.txt");
+					break;
+				}
+				case FMT_SQL: {
+					if(identity_insert)
+						rowbegin << "set identity_insert " << out_table << " on ";
+					rowbegin << "insert into " << out_table << "(" << colstr << ") values (";
+					rowend = ");";
+					ext = ".sql";
+					fsel.Type(t_("SQL scripts (*.sql)"), "*.sql");
+					break;
+				}
+			}
+			fsel.AllFilesType().DefaultExt(ext.Mid(1));
+			if(!IsNull(recent_file))
+				fsel <<= ForceExt(recent_file, ext);
+			if(!fsel.ExecuteSaveAs(t_("Save export as")))
+				continue;
+			recent_file = ~fsel;
+			FileOut fo;
+			if(!fo.Open(recent_file)) {
+				Exclamation(NFormat(t_("Error creating file [* \1%s\1]."), recent_file));
+				continue;
+			}
+			if(fmt == FMT_TEXT)
+				fo.PutLine(title);
+			Progress progress(t_("Exporting row %d"));
+			while(cursor.Fetch()) {
+				String script = rowbegin;
+				for(int i = 0; i < out.GetCount(); i++) {
+					Value v = cursor[out[i]];
+					switch(fmt) {
+						case FMT_TEXT: {
+							if(i)
+								script.Cat(delim);
+							if(IsString(v) && quote) {
+								String s = v;
+								script << '\"';
+								for(const char *p = s, *e = s.End(); p < e; p++)
+									if(*p == '\"')
+										script.Cat("\"\"");
+									else
+										script.Cat(*p);
+								script << '\"';
+							}
+							else
+								script << StdFormat(v);
+							break;
+						}
+						case FMT_SQL: {
+							if(i) script.Cat(", ");
+//							script << SqlCompile(SQLD_ORACLE, SqlFormat(v));
+							break;
+						}
+					}
+				}
+				script << rowend;
+				fo.PutLine(script);
+/*
+				if(autocommit && --left <= 0) {
+					fo.PutLine("commit;");
+					left = autocommit;
+				}
+*/
+				if(progress.StepCanceled()) {
+					Exclamation(t_("Export aborted!"));
+					return;
+				}
+			}
+			fo.Close();
+			if(fo.IsError())
+				throw Exc(NFormat(t_("Error writing file %s."), recent_file));
+			break;
+		}
+		catch(Exc e) {
+			ShowExc(e);
+		}
+
+	cfg = StoreAsString(*this);
+}
+
+void DlgSqlExport::Serialize(Stream& stream)
+{
+	int version = 1;
+	stream / version % format % recent_file;
+}
+
+class SqlObjectTree : public TopWindow {
+public:
+	typedef SqlObjectTree CLASSNAME;
+	SqlObjectTree(SqlSession& session);
+
+	void        Run();
+
+private:
+	enum OBJTYPE {
+		OBJ_NULL,
+		OBJ_SCHEMA,
+		OBJ_SCHEMA_OBJECTS,
+		OBJ_TABLES,
+		OBJ_VIEWS,
+		OBJ_SEQUENCES,
+		OBJ_TABLE_COLUMNS,
+		OBJ_SEQUENCE,
+		OBJ_COLUMN,
+		OBJ_PRIMARY_KEY,
+		OBJ_ROWID,
+	};
+	struct Item {
+		Item(OBJTYPE type = OBJ_NULL, String schema = Null, String object = Null)
+		: type(type), schema(schema), object(object) {}
+		Item(const Value& v) { if(IsTypeRaw<Item>(v)) *this = ValueTo<Item>(v); }
+		operator Value() const { return RawToValue(*this); }
+
+		int type;
+		String schema;
+		String object;
+	};
+
+	void        Open(int node);
+	void        OpenSchema(int node);
+	void        OpenTables(int node, const Item& item);
+	void        OpenViews(int node, const Item& item);
+	void        OpenSequences(int node, const Item& item);
+	void        OpenTableColumns(int node, const Item& item);
+
+	void        ToolLocal(Bar& bar);
+	void        TableExport(String table_name);
+
+private:
+	TreeCtrl    schema;
+	SqlSession& session;
+};
+
+void SQLObjectTree(SqlSession& session) { SqlObjectTree(session).Run(); }
+
+SqlObjectTree::SqlObjectTree(SqlSession& sess)
+: session(sess)
+{
+	Title(t_("SQL object tree"));
+	Sizeable().MaximizeBox();
+	Add(schema.SizePos());
+	schema.WhenOpen = THISBACK(Open);
+	schema.SetRoot(CtrlImg::Computer(), Item(OBJ_SCHEMA), t_("Schemas"));
+	schema.WhenBar = THISBACK(ToolLocal);
+}
+
+void SqlObjectTree::Run() {
+	TopWindow::Run();
+}
+
+void SqlObjectTree::Open(int node)
+{
+	const Item& item = ValueTo<Item>(schema[node]);
+	switch(item.type) {
+		case OBJ_SCHEMA:         OpenSchema(node); break;
+		case OBJ_TABLES:         OpenTables(node, item); break;
+		case OBJ_VIEWS:          OpenViews(node, item); break;
+		case OBJ_SEQUENCES:      OpenSequences(node, item); break;
+		case OBJ_TABLE_COLUMNS:  OpenTableColumns(node, item); break;
+	}
+}
+
+void SqlObjectTree::OpenSchema(int node) {
+	try {
+		schema.RemoveChildren(node);
+		Vector<String> schemas = session.EnumDatabases();
+		Sort(schemas);
+		for(int i = 0; i < schemas.GetCount(); i++) {
+			String sname = schemas[i];
+			int snode = schema.Add(node, CtrlImg::Dir(), Item(OBJ_SCHEMA_OBJECTS, sname), sname, true);
+			schema.Add(snode, CtrlImg::Dir(), Item(OBJ_TABLES, sname), t_("Tables"), true);
+			schema.Add(snode, CtrlImg::Dir(), Item(OBJ_VIEWS, sname), t_("Views"), true);
+			schema.Add(snode, CtrlImg::Dir(), Item(OBJ_SEQUENCES, sname), t_("Sequences"), true);
+		}
+	}
+	catch(Exc e) {
+		ShowExc(e);
+	}
+}
+
+void SqlObjectTree::OpenTables(int node, const Item& item)
+{
+	try {
+		schema.RemoveChildren(node);
+		Vector<String> tables = session.EnumTables(item.schema);
+		Sort(tables);
+		for(int i = 0; i < tables.GetCount(); i++)
+			schema.Add(node, CtrlImg::File(),
+				Item(OBJ_TABLE_COLUMNS, item.schema, tables[i]),
+				tables[i], true);
+	} catch(Exc e) { ShowExc(e); }
+}
+
+void SqlObjectTree::OpenViews(int node, const Item& item) {
+	try {
+		schema.RemoveChildren(node);
+		Vector<String> views = session.EnumViews(item.schema);
+		Sort(views);
+		for(int i = 0; i < views.GetCount(); i++)
+			schema.Add(node, CtrlImg::File(),
+				Item(OBJ_TABLE_COLUMNS, item.schema, views[i]),
+				views[i], true);
+	} catch(Exc e) { ShowExc(e); }
+}
+
+void SqlObjectTree::OpenSequences(int node, const Item& item) {
+	try {
+		schema.RemoveChildren(node);
+		Vector<String> sequences = session.EnumSequences(item.schema);
+		Sort(sequences);
+		for(int i = 0; i < sequences.GetCount(); i++)
+			schema.Add(node, CtrlImg::File(),
+				Item(OBJ_SEQUENCE, item.schema, sequences[i]),
+				sequences[i], true);
+	} catch(Exc e) { ShowExc(e); }
+}
+
+void SqlObjectTree::OpenTableColumns(int node, const Item& item)
+{
+	try {
+		schema.RemoveChildren(node);
+		Vector<SqlColumnInfo> columns = session.EnumColumns(item.schema, item.object);
+		for(int i = 0; i < columns.GetCount(); i++)
+			schema.Add(node, CtrlImg::Hd(), Item(OBJ_COLUMN, item.schema, item.object), (Value)columns[i].name);
+		Vector<String> pk = session.EnumPrimaryKey(item.schema, item.object);
+		if(!pk.IsEmpty()) {
+			String pklist;
+			for(int i = 0; i < pk.GetCount(); i++)
+				pklist << (i ? "; " : t_("Primary key: ")) << pk[i];
+			schema.Add(node, Null, Item(OBJ_PRIMARY_KEY, item.schema, item.object), (Value)pklist);
+		}
+		String rowid = session.EnumRowID(item.schema, item.object);
+		if(!IsNull(rowid))
+			schema.Add(node, Null, Item(OBJ_ROWID, item.schema, item.object), Value("RowID: " + rowid));
+	} catch(Exc e) { ShowExc(e); }
+}
+
+void SqlObjectTree::ToolLocal(Bar& bar)
+{
+	if(schema.IsCursor()) {
+		const Item& item = ValueTo<Item>(~schema);
+		switch(item.type) {
+			case OBJ_TABLE_COLUMNS: {
+				bar.Add(t_("Export"), THISBACK1(TableExport, item.schema + "." + item.object));
+			}
+		}
+	}
+}
+
+void SqlObjectTree::TableExport(String table_name)
+{
+	String schema, table = table_name;
+	int f = table.Find('.');
+	if(f >= 0) {
+		schema = table.Left(f);
+		table = table.Mid(f + 1);
+	}
+	Vector<SqlColumnInfo> info = session.EnumColumns(schema, table);
+	Sql cursor(session);
+	RunDlgSqlExport(cursor, "select * from " + schema + "." + table, table);
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/TCore/AUTHORS b/uppsrc/TCore/AUTHORS
new file mode 100644
index 000000000..f782e5b62
--- /dev/null
+++ b/uppsrc/TCore/AUTHORS
@@ -0,0 +1,2 @@
+Mirek Fidler <cxl@ntllib.org>
+Tomas Rylek  <rylek@volny.cz>
\ No newline at end of file
diff --git a/uppsrc/TCore/COPYING b/uppsrc/TCore/COPYING
new file mode 100644
index 000000000..33aa39102
--- /dev/null
+++ b/uppsrc/TCore/COPYING
@@ -0,0 +1,30 @@
+Copyright (C) 2005 Mirek Fidler, Tomas Rylek and various contributors (see AUTHORS)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to
+deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies of the Software and its Copyright notices. In addition publicly
+documented acknowledgment must be given that this software has been used if no
+source code of this software is made available publicly. This includes
+acknowledgments in either Copyright notices, Manuals, Publicity and Marketing
+documents or any documentation provided with any product containing this
+software. This License does not apply to any software that links to the
+libraries provided by this software (statically or dynamically), but only to
+the software provided.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+-----------
+
+Please see the COPYING.PLAIN for a plain-english explanation of this notice
+and it's intent.
diff --git a/uppsrc/TCore/COPYING-PLAIN b/uppsrc/TCore/COPYING-PLAIN
new file mode 100644
index 000000000..770a8132f
--- /dev/null
+++ b/uppsrc/TCore/COPYING-PLAIN
@@ -0,0 +1,33 @@
+Plain English Copyright Notice
+
+This file is not intended to be the actual License. The reason this file
+exists is that we here are programmers and engineers. We aren't lawyers. We
+provide licenses that we THINK say the right things, but we have our own
+intentions at heart. This is a plain-english explanation of what those
+intentions are, and if you follow them you will be within the "spirit" of
+the license.
+
+The intent is for us to enjoy writing software that is useful to us (the
+AUTHORS) and allow others to use it freely and also benefit from the work we
+put into making it. We don't want to restrict others using it. They should
+not *HAVE* to make the source code of the applications they write that
+simply link to these libraries (be that statically or dynamically), or for
+them to be limited as to what license they choose to use (be it open, closed
+or anything else). But we would like to know you are using these libraries.
+We simply would like to know that it has been useful to someone. This is why
+we ask for acknowledgement of some sort.
+
+You can do what you want with the source of this software - it doesn't
+matter. We still have it here for ourselves and it is open and free to use
+and download and play with. It can't be taken away. We don't really mind what
+you do with the source to your software. We would simply like to know that
+you are using it - especially if it makes it to a commerical product. If you
+simply e-mail all the AUTHORS (see COPYING and AUTHORS files) telling us, and
+then make sure you include a paragraph or page in the manual or in the "About.."
+box for the product with the copyright notice and state that you used this
+software, we will be very happy. If you want to contribute back modifications
+and fixes you may have made we will welcome those too with open arms (generally).
+If you want help with changes needed, ports needed or features to be added,
+arrangements can be easily made with some dialogue.
+
+Mirek Fidler <cxl@ntllib.org>
diff --git a/uppsrc/TCore/Calc.upp b/uppsrc/TCore/Calc.upp
new file mode 100644
index 000000000..2b07530ef
--- /dev/null
+++ b/uppsrc/TCore/Calc.upp
@@ -0,0 +1,12 @@
+acceptflags
+	NOHELP;
+
+file
+	Calc.h,
+	CalcType.h,
+	CalcType.cpp,
+	CalcNode.h,
+	CalcNode.cpp,
+	CalcNode.lng,
+	CalcBasic.cpp,
+	CalcBasic.lng;
diff --git a/uppsrc/TCore/CalcBasic.cpp b/uppsrc/TCore/CalcBasic.cpp
new file mode 100644
index 000000000..208f77716
--- /dev/null
+++ b/uppsrc/TCore/CalcBasic.cpp
@@ -0,0 +1,1295 @@
+//////////////////////////////////////////////////////////////////////
+// tadv/CalcBasic.cpp: basic calculator operations.
+
+#include "TCoreCalc.h"
+#pragma hdrstop
+#pragma BLITZ_APPROVE
+
+#include "CalcBasic.h"
+
+#ifdef PLATFORM_WIN32
+#include <float.h>
+#endif
+#ifdef PLATFORM_POSIX
+#include <math.h>
+#endif
+#ifdef PLATFORM_SOLARIS
+#include <ieeefp.h>
+#endif
+
+NAMESPACE_UPP
+
+void UseCalcBasic() {} // to bring in globally constructed objects
+
+String PluralFormat(int i, const char *b)
+{
+	if(IsNull(i))
+		return Null;
+	String out;
+	out << NlsFormat(i) << ' ';
+	i = tabs(i) % 100;
+	if(i < 10 || i > 20)
+		i %= 10;
+	const char *p = b;
+	while(*p && *p != '/')
+		p++;
+	if(p > b)
+		out.Cat(b, p - b);
+	if(*p)
+		p++;
+	b = p;
+	while(*p && *p != '/')
+		p++;
+	if(i == 1)
+	{
+		out.Cat(b, p - b);
+		return out;
+	}
+	if(*p)
+		p++;
+	b = p;
+	while(*p && *p != '/')
+		p++;
+	if(i >= 2 && i <= 4)
+	{
+		out.Cat(b, p - b);
+		return out;
+	}
+	if(*p)
+		p++;
+	out.Cat(p);
+	return out;
+}
+
+String GroupComp()   { return t_("Comparison"); }
+String GroupBitOp()  { return t_("Bit field operations"); }
+String GroupArith()  { return t_("Arithmetical operations"); }
+String GroupLog()    { return t_("Logical operations"); }
+String GroupString() { return t_("Text operations"); }
+String GroupDate()   { return t_("Date operations"); }
+String GroupArray()  { return t_("Array functions"); }
+String GroupConst()  { return t_("Constants"); }
+String GroupTrans()  { return t_("Transcendental functions"); }
+String GroupSystem() { return t_("System functions"); }
+
+//////////////////////////////////////////////////////////////////////
+// equality / inequality
+
+inline bool CeqVV(Value a, Value b) { return a == b; }
+inline bool CneVV(Value a, Value b) { return a != b; }
+
+FDECL("==", CeqVV, &GroupComp)
+FDECL("!=", CneVV, &GroupComp)
+
+inline bool CltNN(double a, double b) { return a < b; }
+inline bool CleNN(double a, double b) { return a <= b; }
+inline bool CgtNN(double a, double b) { return a > b; }
+inline bool CgeNN(double a, double b) { return a >= b; }
+
+FDECL("<",  CltNN, &GroupComp)
+FDECL("<=", CleNN, &GroupComp)
+FDECL(">",  CgtNN, &GroupComp)
+FDECL(">=", CgeNN, &GroupComp)
+
+inline bool CltTT(Time a, Time b) { return a < b; }
+inline bool CleTT(Time a, Time b) { return a <= b; }
+inline bool CgtTT(Time a, Time b) { return a > b; }
+inline bool CgeTT(Time a, Time b) { return a >= b; }
+
+FDECL("<",  CltTT, &GroupComp)
+FDECL("<=", CleTT, &GroupComp)
+FDECL(">",  CgtTT, &GroupComp)
+FDECL(">=", CgeTT, &GroupComp)
+
+inline bool CltSS(CalcPacket& packet, WString a, WString b) { return GetLanguageInfo(packet.context.language).Compare(a, b) < 0; }
+inline bool CleSS(CalcPacket& packet, WString a, WString b) { return GetLanguageInfo(packet.context.language).Compare(a, b) <= 0; }
+inline bool CgtSS(CalcPacket& packet, WString a, WString b) { return GetLanguageInfo(packet.context.language).Compare(a, b) > 0; }
+inline bool CgeSS(CalcPacket& packet, WString a, WString b) { return GetLanguageInfo(packet.context.language).Compare(a, b) >= 0; }
+
+FDECLA("<",  CltSS, &GroupString)
+FDECLA("<=", CleSS, &GroupString)
+FDECLA(">",  CgtSS, &GroupString)
+FDECLA(">=", CgeSS, &GroupString)
+
+//////////////////////////////////////////////////////////////////////
+// bit-op's
+
+inline int CbitAndNN(int a, int b) { return a & b; }
+inline int CbitOrNN(int a, int b)  { return a | b; }
+inline int CbitXorNN(int a, int b) { return a ^ b; }
+
+FDECL0("&", CbitAndNN, &GroupBitOp)
+FDECL0("|", CbitOrNN, &GroupBitOp)
+FDECL0("^", CbitXorNN, &GroupBitOp)
+
+//////////////////////////////////////////////////////////////////////
+// unaries
+
+inline double CplusN(double value)      { return +value; }
+inline double CminusN(double value)     { return -value; }
+inline int    CbitNotN(int value)       { return ~value; }
+inline bool   ClogNotN(double value)    { return value ? 0 : 1; }
+inline bool   ClogNotS(WString s)       { return s.IsEmpty(); }
+
+FDECL0("+", CplusN, &GroupArith)
+FDECL0("-", CminusN, &GroupArith)
+FDECL0("~", CbitNotN, &GroupBitOp)
+FDECL("!", ClogNotS, &GroupLog)
+FDECL("!", ClogNotN, &GroupLog)
+
+//////////////////////////////////////////////////////////////////////
+// additives
+
+inline double  CaddNN(double a, double b)               { return a + b; }
+FDECL0("+", CaddNN, &GroupArith)
+
+inline WString CaddSS(WString a, WString b)             { return a + b; }
+FDECL ("+", CaddSS, &GroupString)
+
+inline Time    CaddDN(Time a, double b)                 { return a + fround64(b * 86400.0 + 0.5); }
+FDECL0("+", CaddDN, &GroupDate)
+
+inline Time    CaddND(double a, Time b)                 { return b + fround64(a * 86400.0 + 0.5); }
+FDECL0("+", CaddND, &GroupDate)
+
+inline double CsubNN(double a, double b)               { return a - b; }
+inline Time   CsubDN(Time a, double b)                 { return a - fround64(b * 86400.0); }
+inline double CsubDD(Time a, Time b)                   { return (a - b) / 86400.0; }
+
+FDECL0("-", CsubNN, &GroupArith)
+FDECL0("-", CsubDN, &GroupDate)
+FDECL0("-", CsubDD, &GroupDate)
+
+//////////////////////////////////////////////////////////////////////
+// shifts
+
+inline int CsalNN(int a, int b) { return a << b; }
+inline int CsarNN(int a, int b) { return a >> b; }
+
+FDECL0("<<", CsalNN, &GroupBitOp)
+FDECL0(">>", CsarNN, &GroupBitOp)
+
+//////////////////////////////////////////////////////////////////////
+// multiplicatives
+
+inline double CmulNN(double a, double b)               { return a * b; }
+inline WString CmulSN(WString s, int i)
+{
+	if(i <= 0 || IsNull(s))
+		return Null;
+	if(i == 1)
+		return s;
+	int len = s.GetLength() * i;
+	WStringBuffer result(len);
+	memsetex(result, s, sizeof(wchar) * s.GetLength(), i);
+	return result;
+}
+inline WString CmulNS(int i, WString s) { return CmulSN(s, i); }
+
+FDECL0("*", CmulNN, &GroupArith)
+FDECL0("*", CmulSN, &GroupString)
+FDECL0("*", CmulNS, &GroupString)
+
+inline double CdivNN(double a, double b)
+{
+	if(!b)
+		throw Exc(t_("division by zero"));
+	return a / b;
+}
+
+FDECL0("/", CdivNN, &GroupArith)
+
+inline double CmodNN(double a, double b)
+{
+	if(!b)
+		throw Exc(t_("division by zero"));
+	return fmod(a, b);
+}
+
+FDECL0("%", CmodNN, &GroupArith)
+
+//////////////////////////////////////////////////////////////////////
+// rounding
+
+static void ChkDigits(int c)
+{
+	if(c < -20 || c >= 20)
+		throw Exc(NFormat(t_("invalid number of places (%d)"), c));
+}
+
+inline double GetTimes(int c)
+{
+	ChkDigits(c);
+	return ipow10(c);
+}
+
+inline double CroundN(double a)          { return floor(a + 0.5); }
+inline double CroundNN(double a, int c)  { double t = GetTimes(c); return floor(a * t + 0.5) / t; }
+inline double CroundrNN(double a, int c) { ChkDigits(c); return roundr(a, c); }
+
+FDECLP0(round, N, &GroupArith)
+FDECLP0(round, NN, &GroupArith)
+FDECLP0(roundr, NN, &GroupArith)
+
+inline double CfloorN(double a)          { return floor(a); }
+inline double CfloorNN(double a, int c)  { double t = GetTimes(c); return floor(a * t) / t; }
+inline double CfloorrNN(double a, int c) { ChkDigits(c); return floorr(a, c); }
+
+FDECLP0(floor, N, &GroupArith)
+FDECLP0(floor, NN, &GroupArith)
+FDECLP0(floorr, NN, &GroupArith)
+
+inline double CceilN(double a)          { return ceil(a); }
+inline double CceilNN(double a, int c)  { double t = GetTimes(c); return ceil(a * t) / t; }
+inline double CceilrNN(double a, int c) { ChkDigits(c); return ceilr(a, c); }
+
+FDECLP0(ceil, N, &GroupArith)
+FDECLP0(ceil, NN, &GroupArith)
+FDECLP0(ceilr, NN, &GroupArith)
+
+inline double CminNN(double a, double b) { return min(a, b); }
+inline double CmaxNN(double a, double b) { return max(a, b); }
+inline double CminmaxNNN(double a, double l, double h) { return minmax(a, l, h); }
+
+FDECLP(min, NN, &GroupComp)
+FDECLP(max, NN, &GroupComp)
+FDECLP(minmax, NNN, &GroupComp)
+
+inline Time CminTT(Time a, Time b) { return min(a, b); }
+inline Time CmaxTT(Time a, Time b) { return max(a, b); }
+inline Time CminmaxTTT(Time a, Time l, Time h) { return minmax(a, l, h); }
+
+FDECLP(min, TT, &GroupComp)
+FDECLP(max, TT, &GroupComp)
+FDECLP(minmax, TTT, &GroupComp)
+
+inline WString CminSS(CalcPacket& packet, WString a, WString b)
+{
+	return GetLanguageInfo(packet.context.language).Compare(a, b) <= 0 ? a : b;
+}
+
+inline WString CmaxSS(CalcPacket& packet, WString a, WString b)
+{
+	return GetLanguageInfo(packet.context.language).Compare(a, b) >= 0 ? a : b;
+}
+
+inline WString CminmaxSSS(CalcPacket& packet, WString a, WString l, WString h)
+{
+	return CminSS(packet, CmaxSS(packet, a, l), h);
+}
+
+FDECLAP(min, SS, &GroupComp)
+FDECLAP(max, SS, &GroupComp)
+FDECLAP(minmax, SSS, &GroupComp)
+
+inline double Ce0()  { return M_E; }
+inline double Cpi0() { return M_PI; }
+
+FDECLP(e, 0, &GroupConst)
+FDECLP(pi, 0, &GroupConst)
+
+inline double CabsN(double x) { return fabs(x); }
+
+FDECLP(abs, N, &GroupArith)
+
+inline int    CsgnN(double x) { return sgn(x); }
+
+FDECLP(sgn, N, &GroupArith)
+
+inline int      CascS(WString s) { return (byte)*s; }
+inline WString  CchrN(int c)     { return WString(c, 1); }
+inline int      ClenS(WString s) { return s.GetLength(); }
+
+FDECLP(asc, S, &GroupString)
+FDECLP(chr, N, &GroupString)
+FDECLP(len, S, &GroupString)
+
+inline String CcountNS(int i, WString s)
+{
+	return PluralFormat(i, s.ToString());
+}
+
+FDECLP(count, NS, &GroupString)
+
+inline String        CnlsN(double d)               { return NlsFormat(d, 3); }
+inline String        CnlsNN(double d, int places)  { return NlsFormat(d, places); }
+inline String        CnlsrN(double d)              { return NlsFormatRel(d, 3); }
+inline String        CnlsrNN(double d, int places) { return NlsFormatRel(d, places); }
+
+FDECLP0(nls, N, &GroupString)
+FDECLP0(nls, NN, &GroupString)
+FDECLP0(nlsr, N, &GroupString)
+FDECLP0(nlsr, NN, &GroupString)
+
+inline String        CtextN(double d)               { return FormatDouble(d, 10); }
+inline String        CitextN(int i)                 { return FormatInt(i); }
+inline String        CitextNN(int i, int p)         { return FormatIntDec(i, p, ' '); }
+inline String        Citext0NN(int i, int p)        { return FormatIntDec(i, p, '0'); }
+inline String        CftextN(double d)              { return AsString(d, 0); }
+inline String        CftextNI(double d, int places) { return AsString(d, places); }
+
+FDECLP(text, N, &GroupString)
+FDECLP0(itext, N, &GroupString)
+FDECLP0(itext, NN, &GroupString)
+FDECLP0(itext0, NN, &GroupString)
+FDECLP0(ftext, N, &GroupString)
+FDECLP0(ftext, NI, &GroupString)
+
+inline WString CtextS(WString s) { return s; }
+
+inline String  CtextD(CalcPacket& packet, Time d)
+{ return GetLanguageInfo(packet.context.language).FormatDate(d); }
+
+FDECLP(text, S, &GroupString)
+FDECLAP(text, D, &GroupString)
+
+inline String CtextA(CalcPacket& packet, ValueArray va)
+{
+	String out;
+	out << "[";
+	for(int i = 0; i < va.GetCount(); i++)
+		out << (i ? ", " : "") << packet.context.FormatText(va[i]);
+	out << "]";
+	return out;
+}
+
+FDECLAP(text, A, &GroupString)
+
+inline WString CleftSN(WString s, int n)  { return s.Left(minmax(n, 0, s.GetLength())); }
+inline WString CrightSN(WString s, int n) { return s.Right(minmax(n, 0, s.GetLength())); }
+inline WString CmidSNN(WString s, int m, int n)
+{
+	m = minmax(m, 0, s.GetLength());
+	n = minmax(n, 0, s.GetLength() - m);
+	return s.Mid(m, n);
+}
+
+inline WString CmidSN(WString s, int m) { return CmidSNN(s, m, max(0, s.GetLength() - m)); }
+
+FDECLP(left, SN, &GroupString)
+FDECLP(right, SN, &GroupString)
+FDECLP(mid, SN, &GroupString)
+FDECLP(mid, SNN, &GroupString)
+
+inline WString CcatSSS(WString a, WString b, WString c)
+{
+	if(IsNull(c))
+		return a;
+	if(IsNull(a))
+		return c;
+	return a + b + c;
+}
+
+FDECLP(cat, SSS, &GroupString)
+
+inline WString ClpadSNS(WString a, int len, WString b)
+{
+	int al = a.GetLength(), bl = b.GetLength(), add = len - al;
+	if(bl == 0 || add <= 0)
+		return a;
+	WString out;
+	if(bl == 1)
+		out.Cat(*b, add);
+	else
+	{
+		while(add >= bl)
+		{
+			out.Cat(b);
+			add -= bl;
+		}
+		if(add > 0)
+			out.Cat(b, add);
+	}
+	out.Cat(a);
+	return out;
+}
+
+FDECLP(lpad, SNS, &GroupString)
+
+inline WString ClpadSN(WString a, int len) { return ClpadSNS(a, len, WString(' ', 1)); }
+
+FDECLP(lpad, SN, &GroupString)
+
+WString CllpadSNS(WString a, int len, WString b)
+{
+	if(a.GetLength() > len)
+		return a.Right(len);
+	return ClpadSNS(a, len, b);
+}
+
+FDECLP(llpad, SNS, &GroupString)
+
+inline WString CllpadSN(WString a, int len) { return CllpadSNS(a, len, WString(' ', 1)); }
+
+FDECLP(llpad, SN, &GroupString)
+
+inline WString CrpadSNS(WString a, int len, WString b)
+{
+	int al = a.GetLength(), bl = b.GetLength(), add = len - al;
+	if(bl == 0 || add <= 0)
+		return a;
+	if(bl == 1)
+		a.Cat(*b, add);
+	else
+	{
+		while(add >= bl)
+		{
+			a.Cat(b);
+			add -= bl;
+		}
+		if(add > 0)
+			a.Cat(b, add);
+	}
+	return a;
+}
+
+FDECLP(rpad, SNS, &GroupString)
+
+inline WString CrpadSN(WString a, int len) { return CrpadSNS(a, len, WString(' ', 1)); }
+
+FDECLP(rpad, SN, &GroupString)
+
+inline WString CrrpadSNS(WString a, int len, WString b)
+{
+	if(a.GetLength() > len)
+	{
+		a.Trim(len);
+		return a;
+	}
+	return CrpadSNS(a, len, b);
+}
+
+FDECLP(rrpad, SNS, &GroupString)
+
+inline WString CrrpadSN(WString a, int len) { return CrrpadSNS(a, len, WString(' ', 1)); }
+
+FDECLP(rrpad, SN, &GroupString)
+
+inline double CnumberS(String s)
+{
+	const char *p = s;
+	double d = ScanDouble(p, &p);
+	if(IsNull(d) || *p)
+		throw Exc(NFormat(t_("invalid numeric format: '%s'"), s));
+	return d;
+}
+
+inline double CnumberSN(String s, double dflt)
+{
+	const char *p = s;
+	double d = ScanDouble(p, &p);
+#ifdef PLATFORM_WIN32
+	return (IsNull(d) || !_finite(d) || _isnan(d) || *p ? dflt : d);
+#elif defined(PLATFORM_POSIX)
+	return (IsNull(d) || !finite(d) || *p ? dflt : d); // PLATFORM_SOLARIS
+//	return (IsNull(d) || isinf(d) || isnan(d) || *p ? dflt : d);
+#else
+	#error
+#endif
+}
+
+FDECLP(number, S, &GroupString)
+FDECLP(number, SN, &GroupString)
+
+inline bool IsValidYear(int year) { return year >= -4000 && year <= +4000; }
+
+inline Date CdateNNN(int day, int month, int year)
+{
+	if(!IsValidYear(year))       throw Exc(NFormat(t_("invalid year number (%d)"), year));
+	if(month <= 0 || month > 12) throw Exc(NFormat(t_("invalid month number (%d)"), month));
+	Date date(year, month, 1);
+	if(day <= 0 || day > LastDayOfMonth(date).day)
+		throw Exc(NFormat(t_("invalid day number (%d)"), day));
+	date.day = day;
+	return date;
+}
+
+inline Date CdateNN(int day, int month) { return CdateNNN(day, month, GetSysDate().year); }
+inline Date CdateN(int day)
+{
+	Date date = GetSysDate();
+	return CdateNNN(day, date.month, date.year);
+}
+inline Date Cdate0() { return GetSysDate(); }
+
+FDECLP0(date, 0, &GroupDate)
+FDECLP0(date, N, &GroupDate)
+FDECLP0(date, NN, &GroupDate)
+FDECLP0(date, NNN, &GroupDate)
+
+inline Date CdateSD(CalcPacket& packet, String s, Date dflt)
+{
+	Date out;
+	const char *p = StrToDate(out, s);
+	return p ? out : dflt;
+}
+
+inline Date CdateS(CalcPacket& packet, String s)
+{
+	return CdateSD(packet, s, Null);
+}
+
+inline Date CdateT(Time t)
+{
+	return t;
+}
+
+FDECLAP(date, S, &GroupDate)
+FDECLAP(date, SD, &GroupDate)
+FDECLP(date, T, &GroupDate)
+
+inline Time Ctime0() { return GetSysTime(); }
+
+FDECLP0(time, 0, &GroupDate)
+
+bool CtimeNNNNNN(CalcPacket& packet)
+{
+	if(packet.help)
+	{
+		packet.args.SetCount(6, CalcType<int>::Describe());
+		packet.result = CalcType<Time>::Describe();
+		return true;
+	}
+	if(packet.args.GetCount() != 6)
+		return false;
+	bool isnull = false;
+	for(int i = 0; i < 6; i++)
+		if(IsNull(packet.args[i]))
+			isnull = true;
+		else if(!CalcType<int>::IsType(packet.args[i]))
+			return false;
+	if(isnull)
+	{
+		packet.result = Value();
+		return true;
+	}
+	Date d = CdateNNN(packet.args[0], packet.args[1], packet.args[2]);
+	int h = packet.args[3], m = packet.args[4], s = packet.args[5];
+	if((unsigned)h >= 24)
+		throw Exc(NFormat(t_("invalid hour number: %d"), h));
+	if((unsigned)m >= 60)
+		throw Exc(NFormat(t_("invalid minute number: %d"), m));
+	if((unsigned)s >= 60)
+		throw Exc(NFormat(t_("invalid second number: %d"), s));
+	packet.result = Time(d.year, d.month, d.day, m, h, s);
+	return true;
+}
+
+FDECLQ("CtimeNNNNNN", "time", &GroupDate, &CtimeNNNNNN)
+
+inline Time CtimeSD(CalcPacket& packet, String s, Time dflt)
+{
+	return Nvl((Time)Scan(TIME_V, s), dflt);
+}
+
+inline Time CtimeS(CalcPacket& packet, String s)
+{
+	return CtimeSD(packet, s, Null);
+}
+
+inline Time CtimeD(Date d)
+{
+	return ToTime(d);
+}
+
+FDECLAP(time, S, &GroupDate)
+FDECLAP(time, SD, &GroupDate)
+FDECLP(time, D, &GroupDate)
+
+inline int CyearD(Date date)    { return date.year; }
+inline int CmonthD(Date date)   { return date.month; }
+inline int CdayD(Date date)     { return date.day; }
+inline int ChourT(Time time)    { return time.hour; }
+inline int CminuteT(Time time)  { return time.minute; }
+inline int CsecondT(Time time)  { return time.second; }
+
+FDECLP0(year, D, &GroupDate)
+FDECLP0(month, D, &GroupDate)
+FDECLP0(day, D, &GroupDate)
+FDECLP0(hour, T, &GroupDate)
+FDECLP0(minute, T, &GroupDate)
+FDECLP0(second, T, &GroupDate)
+
+inline Date Cadd_monthsDN(Date date, int months)
+{
+	months += date.month - 1;
+	int year = idivfloor(months, 12);
+	months -= 12 * year;
+	year += date.year;
+	if(!IsValidYear(year))
+		throw Exc(t_("result date is out of range"));
+	date.year = year;
+	date.month = months + 1;
+	Date lod = LastDayOfMonth(date);
+	if(date.day > lod.day)
+		date.day = lod.day;
+	return date;
+}
+
+FDECLP(add_months, DN, &GroupDate)
+
+inline Date Cadd_yearsDN(Date date, int years)
+{
+	if(!IsValidYear(date.year + years))
+		throw Exc(t_("result date is out of range"));
+	date.year += years;
+	Date lod = LastDayOfMonth(date);
+	if(date.day > lod.day)
+		date.day = lod.day;
+	return date;
+}
+
+FDECLP(add_years, DN, &GroupDate)
+
+static int Cyears_betweenDD(Date a, Date b)
+{
+	if(IsNull(b) || IsNull(a))
+		return Null;
+	int d = b.year - a.year;
+	if(a.month > b.month || a.month == b.month && a.day > b.day)
+		d--;
+	return d;
+}
+
+FDECLP(years_between, DD, &GroupDate)
+
+inline Value Cnull0()             { return Value(); }
+inline int   Cis_errorV(Value v)  { return IsError(v); }
+inline int   Cis_nullV(Value v)   { return IsNull(v); }
+inline int   Cis_numberV(Value v) { return IsNumber(v); }
+inline int   Cis_textV(Value v)   { return IsString(v); }
+inline int   Cis_dateV(Value v)   { return IsDateTime(v); }
+inline int   Cis_arrayV(Value v)  { return IsValueArray(v); }
+
+FDECLP(null, 0, &GroupConst)
+FDECLP(is_number, V, &GroupComp)
+FDECLP(is_text, V, &GroupComp)
+FDECLP(is_date, V, &GroupComp)
+FDECLP(is_null, V, &GroupComp)
+FDECLP(is_error, V, &GroupComp)
+FDECLP(is_array, V, &GroupComp)
+
+inline Value CnvlVV(Value a, Value b) { return Nvl(a, b); }
+
+FDECLP(nvl, VV, &GroupComp)
+
+//////////////////////////////////////////////////////////////////////
+// external globals
+
+inline double CsqrN(double x) { return x * x; }
+
+FDECLP0(sqr, N, &GroupArith)
+
+inline double CsqrtN(double x) { return sqrt(x); }
+
+FDECLP0(sqrt, N, &GroupTrans)
+
+inline double ChypotNN(double x, double y) { return hypot(x, y); }
+
+FDECLP0(hypot, NN, &GroupTrans)
+
+inline double CpowNN(double x, double y) { return pow(x, y); }
+
+FDECLP0(pow, NN, &GroupTrans);
+
+inline double CexpN(double x) { return exp(x); }
+
+FDECLP0(exp, N, &GroupTrans)
+
+inline double ClogN(double x) { return log10(x); }
+
+FDECLP0(log, N, &GroupTrans)
+
+inline double ClnN(double x) { return log(x); }
+
+FDECLP0(ln, N, &GroupTrans)
+
+inline double CsinN(double x) { return sin(x); }
+
+FDECLP0(sin, N, &GroupTrans)
+
+inline double CcosN(double x) { return cos(x); }
+
+FDECLP0(cos, N, &GroupTrans)
+
+inline double CtgN(double x) { return tan(x); }
+
+FDECLP0(tg, N, &GroupTrans)
+
+inline double CarcsinN(double x) { return asin(x); }
+
+FDECLP0(arcsin, N, &GroupTrans)
+
+inline double CarccosN(double x) { return acos(x); }
+
+FDECLP0(arccos, N, &GroupTrans)
+
+inline double CarctgN(double x) { return atan(x); }
+
+FDECLP0(arctg, N, &GroupTrans)
+
+FDECLT(BTA1, std, "Cday_of_weekD", "day_of_week", &GroupDate, DayOfWeek)
+
+FDECLT(BTA1, std, "Cfirst_day_of_monthD", "first_day_of_month", &GroupDate, FirstDayOfMonth)
+
+FDECLT(BTA1, std, "Clast_day_of_monthD", "last_day_of_month", &GroupDate, LastDayOfMonth);
+
+//////////////////////////////////////////////////////////////////////
+// arrays
+
+inline bool CalcArrayCtr(CalcPacket& packet)
+{
+	if(packet.help)
+	{
+		packet.result = CalcType<ValueArray>::Describe();
+		packet.args.Add(CalcType<Value>::Describe());
+		packet.args.Add(CalcType<Value>::Describe());
+		packet.args.Add("...");
+		return true;
+	}
+	ValueArray va;
+	va.SetCount(packet.args.GetCount());
+	for(int i = 0; i < packet.args.GetCount(); i++)
+		va.Set(i, packet.args[i]);
+	packet.result = va;
+	return true;
+}
+
+FDECLQ("CarrayCtr", "[,,]", &GroupArray, &CalcArrayCtr)
+
+inline ValueArray CarrayRange(double lo, double hi)
+{
+	double lr = lo, hr = hi, df = ceil(hr - lr + 0.5);
+	if(df <= 0)
+		return ValueArray();
+	if(df >= 1000000)
+		throw Exc(NFormat(t_("array is too long (%d elements)"), df));
+	ValueArray va;
+	int nelem = fround(df);
+	va.SetCount(nelem);
+	for(int i = 0; i < nelem; i++)
+		va.Set(i, i + lr);
+	return va;
+}
+
+FDECL("[..]", CarrayRange, &GroupArray)
+
+inline Value CarrayIndex(ValueArray va, int index)
+{
+	if(index < 0 || index >= va.GetCount())
+		throw Exc(NFormat(t_("invalid index %d, array has just %d elements"), index, va.GetCount()));
+	return va[index];
+}
+
+FDECL("[]", CarrayIndex, &GroupArray)
+
+static String CstringIndex(String s, int index)
+{
+	if(index < 0 || index >= s.GetLength())
+		throw Exc(NFormat(t_("invalid index %d, string has just %d characters"), index, s.GetLength()));
+	return s.Mid(index, 1);
+}
+
+FDECL("[]", CstringIndex, &GroupString)
+
+inline ValueArray CaddAA(ValueArray a, ValueArray b)
+{
+	int ac = a.GetCount(), bc = b.GetCount();
+	ValueArray out = a;
+	out.SetCount(ac + bc);
+	for(int i = 0; i < bc; i++)
+		out.Set(i + ac, b[i]);
+	return out;
+}
+FDECL("+", CaddAA, &GroupArray)
+
+inline Value CsumA(CalcPacket& packet, ValueArray a)
+{
+	int i = 0;
+	while(i < a.GetCount() && IsNull(a[i]))
+		i++;
+	if(i >= a.GetCount())
+		return Value();
+	Value first = a[i++];
+	if(IsNumber(first))
+	{
+		double d = first;
+		for(; i < a.GetCount(); i++)
+			if(IsNull(a[i]))
+				;
+			else if(IsNumber(a[i]))
+				d += double(a[i]);
+			else
+				throw Exc(NFormat(t_("array element has invalid data type (index %d), number expected: %s"), i, CtextA(packet, a)));
+		return d;
+	}
+
+	if(IsString(first))
+	{
+		String s = first;
+		for(; i < a.GetCount(); i++)
+			if(IsNull(a[i]))
+				;
+			else if(IsString(a[i]))
+				s.Cat(String(a[i]));
+			else
+				throw Exc(NFormat(t_("array element has invalid data type (index %d), string expected: %s"), i, CtextA(packet, a)));
+		return s;
+	}
+
+	if(IsValueArray(first))
+	{
+		ValueArray va = first;
+		for(; i < a.GetCount(); i++)
+			if(IsNull(a[i]))
+				;
+			else if(IsValueArray(a[i]))
+			{
+				ValueArray ai = a[i];
+				for(int t = 0, nt = ai.GetCount(); t < nt; t++)
+					va.Add(ai[t]);
+			}
+			else
+				throw Exc(NFormat(t_("array element has invalid data type (index %d), array expected: %s"), i, CtextA(packet, a)));
+		return va;
+	}
+
+	throw Exc(NFormat(t_("array element has invalid data type (index %d), number or string expected: %s"), i, CtextA(packet, a)));
+}
+
+FDECLAP(sum, A, &GroupArray)
+
+inline Value CsumASC(CalcPacket& packet, ValueArray va, String var, const CalcNode *node)
+{
+	if(IsNull(var))
+		throw Exc(t_("control variable has empty name"));
+	ValueArray vout;
+	vout.SetCount(va.GetCount());
+	if(node)
+	{
+		CalcContext::Nesting level(packet.context);
+		for(int i = 0; i < va.GetCount(); i++)
+		{
+			packet.context.Set(var, va[i]);
+			vout.Set(i, node -> Calc(packet.context));
+		}
+	}
+	return CsumA(packet, vout);
+}
+
+FDECLAP(sum, ASC, &GroupArray)
+
+inline ValueArray CmulAC(CalcPacket& packet, ValueArray va, const CalcNode *node)
+{
+	ValueArray vout;
+	vout.SetCount(va.GetCount());
+	if(node)
+	{
+		CalcContext::Nesting level(packet.context);
+		static const String i_("I"), a_("A");
+		for(int i = 0; i < va.GetCount(); i++)
+		{
+			packet.context.Set(i_, i);
+			packet.context.Set(a_, va[i]);
+			vout.Set(i, node -> Calc(packet.context));
+		}
+	}
+	return vout;
+}
+
+FDECLA("*", CmulAC, &GroupArray)
+
+inline int CcountA(ValueArray va) { return va.GetCount(); }
+FDECLP(count, A, &GroupArray)
+
+inline Value CmaxA(CalcPacket& packet, ValueArray va)
+{
+	Value out = Null;
+	for(int i = 0; i < va.GetCount(); i++)
+		if(!IsNull(va[i]))
+			if(IsNull(out) || StdValueLess(out, va[i], packet.context.language))
+				out = va[i];
+	return out;
+}
+
+FDECLAP(max, A, &GroupArray)
+
+inline Value CminA(CalcPacket& packet, ValueArray va)
+{
+	Value out = Null;
+	for(int i = 0; i < va.GetCount(); i++)
+		if(!IsNull(va[i]))
+			if(IsNull(out) || StdValueLess(va[i], out, packet.context.language))
+				out = va[i];
+	return out;
+}
+
+FDECLAP(min, A, &GroupArray)
+
+inline double CavgA(ValueArray va)
+{
+	double sum = 0;
+	int cnt = 0;
+	for(int i = 0; i < va.GetCount(); i++)
+		if(!IsNull(va[i]))
+			if(IsNumber(va[i]))
+			{
+				sum += double(va[i]);
+				cnt++;
+			}
+			else
+				throw Exc(NFormat("[%d]: o�ek�v�no ��slo, nalezeno: %s", i, StdFormat(va[i])));
+	return cnt ? sum / cnt : double(Null);
+}
+
+FDECLP(avg, A, &GroupArray)
+
+inline ValueArray CleftAN(ValueArray va, int count)
+{
+	if(count < 0 || count > va.GetCount())
+		throw Exc(t_("invalid number of array elements"));
+	ValueArray out;
+	for(int i = 0; i < count; i++)
+		out.Add(va[i]);
+	return out;
+}
+FDECLP(left, AN, &GroupArray)
+
+inline ValueArray CrightAN(ValueArray va, int count)
+{
+	if(count < 0 || count > va.GetCount())
+		throw Exc(t_("invalid number of array elements"));
+	ValueArray out;
+	for(int i = 0, p = va.GetCount() - count; i < count; i++)
+		out.Add(va[p++]);
+	return out;
+}
+FDECLP(right, AN, &GroupArray)
+
+inline ValueArray CmidANN(ValueArray va, int first, int count)
+{
+	if(first < 0 || first > va.GetCount())
+		throw Exc(t_("invalid character index"));
+	if(count < 0 || first + count > va.GetCount())
+		throw Exc(t_("invalid number of array elements"));
+	ValueArray out;
+	while(--count >= 0)
+		out.Add(va[first++]);
+	return out;
+}
+FDECLP(mid, ANN, &GroupArray)
+
+inline ValueArray CmidAN(ValueArray va, int first)
+{
+	return CmidANN(va, first, va.GetCount() - first);
+}
+FDECLP(mid, AN, &GroupArray)
+
+inline bool CinVA(Value v, ValueArray va)
+{
+	for(int i = 0; i < va.GetCount(); i++)
+		if(v == va[i])
+			return true;
+	return false;
+}
+FDECLP(in, VA, &GroupArray)
+
+inline ValueArray CindexA(ValueArray a)
+{
+	ValueArray out;
+	int n = a.GetCount();
+	out.SetCount(n);
+	for(int i = 0; i < n; i++)
+		out.Set(i, i);
+	return out;
+}
+FDECLP(index, A, &GroupArray)
+
+struct ValueLess {
+	ValueLess(int language) : language(language) {}
+	bool operator () (Value a, Value b) const { return StdValueLess(a, b, language); }
+	int language;
+};
+
+inline ValueArray CsortA(CalcPacket& packet, ValueArray a)
+{
+	if(a.GetCount() <= 1)
+		return a;
+	Vector<Value> out;
+	out <<= a.Get();
+	Sort(out, ValueLess(packet.context.language));
+	return ValueArray(out);
+}
+FDECLAP(sort, A, &GroupArray)
+
+inline ValueArray CsortASC(CalcPacket& packet, ValueArray a, String ident, const CalcNode *lambda)
+{
+	if(a.GetCount() <= 1)
+		return a;
+	Vector<Value> out;
+	out <<= a.Get();
+	CalcContext::Nesting nesting(packet.context);
+	Vector<Value> order;
+	order.SetCount(out.GetCount());
+	for(int i = 0; i < out.GetCount(); i++) {
+		packet.context.Set(ident, out[i]);
+		order[i] = lambda->Calc(packet.context);
+	}
+	IndexSort(order, out, ValueLess(packet.context.language));
+	return ValueArray(out);
+}
+FDECLAP(sort, ASC, &GroupArray)
+
+inline ValueArray CdistinctA(ValueArray a)
+{
+	if(a.GetCount() <= 1)
+		return a;
+	Index<Value> out;
+	for(int i = 0; i < a.GetCount(); i++)
+		out.FindAdd(a[i]);
+	return ValueArray(out.PickKeys());
+}
+FDECLP(distinct, A, &GroupArray)
+
+inline ValueArray CdistinctASC(CalcPacket& packet, ValueArray a, String ident, const CalcNode *lambda)
+{
+	if(a.GetCount() <= 1)
+		return a;
+	VectorMap<Value, Value> vimap;
+	CalcContext::Nesting nesting(packet.context);
+	for(int i = 0; i < a.GetCount(); i++) {
+		packet.context.Set(ident, a[i]);
+		vimap.FindAdd(lambda->Calc(packet.context), a[i]);
+	}
+	return ValueArray(vimap.PickValues());
+}
+FDECLAP(distinct, ASC, &GroupArray)
+
+static bool CwithVSRC(CalcPacket& packet)
+{
+	if(packet.help) {
+		packet.args.Add(CalcType<Value>::Describe());
+		packet.args.Add(CalcType<String>::Describe());
+		packet.args.Add("...");
+		packet.args.Add(CalcType<const CalcNode *>::Describe());
+		return true;
+	}
+	int nargs = packet.args.GetCount();
+	if(nargs < 3 || !(nargs & 1) || !CalcType<const CalcNode *>::IsType(packet.args[nargs - 1]))
+		return false;
+	int npairs = nargs >> 1;
+	CalcContext::Nesting nesting(packet.context);
+	for(int i = 0; i < npairs; i++) {
+		if(!CalcType<Value>::IsType(packet.args[2 * i + 0])
+		|| !CalcType<String>::IsType(packet.args[2 * i + 1]))
+			return false;
+		packet.context.Set(packet.args[2 * i + 1], packet.args[2 * i]);
+	}
+	packet.result = CalcType<const CalcNode *>::ValueTo(packet.args[nargs - 1])->Calc(packet.context);
+	return true;
+}
+
+FDECLQ("CwithVSRC", "with", &GroupSystem, &CwithVSRC)
+
+static ValueArray CgroupAASCC(CalcPacket& packet, ValueArray data, ValueArray ctrl, String var,
+	const CalcNode *grp, const CalcNode *val)
+{
+	Index<Value> ix(ctrl.Get(), 0);
+	Vector<Value> out;
+	out.SetCount(ctrl.GetCount());
+	CalcContext::Nesting nesting(packet.context);
+	for(int i = 0; i < data.GetCount(); i++) {
+		Value v = data[i];
+		packet.context.Set(var, v);
+		int f = ix.Find(grp ? grp->Calc(packet.context) : v);
+		if(f >= 0) {
+			Value o = (val ? val->Calc(packet.context) : v);
+			if(IsNull(o))
+				continue;
+			if(IsNull(out[f]))
+				out[f] = o;
+			else if(IsNumber(out[f]) && IsNumber(o))
+				out[f] = (double)out[f] + (double)o;
+			else if(IsString(out[f]) && IsString(o))
+				out[f] = (String)out[f] + (String)o;
+			else if(IsValueArray(out[f]) && IsValueArray(o)) {
+				ValueArray va = out[f], ov = o;
+				for(int t = 0; t < ov.GetCount(); t++)
+					va.Add(ov[t]);
+				out[f] = va;
+			}
+			else
+				throw Exc(NFormat("chybn� kombinace v�stupn�ch hodnot: %s (%s), %s (%s)",
+					packet.context.FormatNull(out[f]), packet.context.GetTypeName(out[f]),
+					packet.context.FormatNull(o), packet.context.GetTypeName(o)));
+		}
+	}
+	return ValueArray(out);
+}
+
+FDECLAP(group, AASCC, &GroupArray)
+
+static ValueArray CgroupAASC(CalcPacket& packet, ValueArray data, ValueArray ctrl, String var, const CalcNode *grp)
+{
+	return CgroupAASCC(packet, data, ctrl, var, grp, NULL);
+}
+
+FDECLAP(group, AASC, &GroupArray)
+
+static bool CcallSV(CalcPacket& packet)
+{
+	if(packet.help) {
+		packet.result = CalcType<Value>::Describe();
+		packet.args.Add(CalcType<String>::Describe());
+		packet.args.Add(CalcType<Value>::Describe());
+		packet.args.Add("...");
+		return true;
+	}
+	if(packet.args.GetCount() < 1 || !CalcType<String>::IsType(packet.args[0]))
+		return false;
+	CalcPacket subpacket(packet.context, CalcType<String>::ValueTo(packet.args[0]));
+	if(IsNull(subpacket.name)) {
+		packet.result = Value();
+		return true;
+	}
+	subpacket.args.Append(packet.args, 1, packet.args.GetCount() - 1);
+	packet.result = packet.context.Calc(subpacket);
+	return true;
+}
+
+FDECLQ("CcallSV", "call", &GroupSystem, &CcallSV)
+
+static String CreplaceSSS(String s, String what, String with)
+{
+	int wl = what.GetLength();
+	if(wl == 0 || wl > s.GetLength())
+		return s;
+	String out;
+	char first = what[0];
+	const char *b = s.Begin();
+	const char *p = b;
+	const char *e = s.End();
+	const char *q = e - what.GetLength();
+	while(p <= q)
+		if(*p == first && (wl == 1 || !memcmp(p, what, wl)))
+		{
+			out.Cat(b, p - b);
+			out.Cat(with);
+			b = p += wl;
+		}
+		else
+			p++;
+	if(b < e)
+		out.Cat(b, e - b);
+	return out;
+}
+
+FDECLP(replace, SSS, GroupString)
+
+static inline int CfindSN(String s, int i) { return s.Find(i); }
+
+FDECLP(find, SN, GroupString)
+
+static inline int CfindSS(String s, String sub) { return StringFind(s, sub); }
+
+FDECLP(find, SS, GroupString)
+
+static inline bool ClikeSS(WString s, WString m)
+{
+	One<LanguageInfo::WildcardCompare> wc = GetLanguageInfo().GetWildcardCompare(m);
+	return wc && wc->Matches(s);
+}
+
+FDECLP(like, SS, GroupString)
+
+static String CltrimSS(String s, String trim)
+{
+	int tl = trim.GetLength(), sl = s.GetLength();
+	if(tl == 0 || sl == 0)
+		return s;
+	const char *p = s, *e = s.End();
+	if(tl == 1) {
+		char c = trim[0];
+		while(p < e && *p == c)
+			p++;
+	}
+	else if(tl == 2) {
+		char c1 = trim[0], c2 = trim[1];
+		while(p < e && (*p == c1 || *p == c2))
+			p++;
+	}
+	else {
+		while(p < e && memchr(trim, *p, tl))
+			p++;
+	}
+	return String(p, e);
+}
+
+static String CltrimS(String s) { return CltrimSS(s, " "); }
+
+FDECLP(ltrim, S, GroupString)
+FDECLP(ltrim, SS, GroupString)
+
+static String CrtrimSS(String s, String trim)
+{
+	int tl = trim.GetLength(), sl = s.GetLength();
+	if(tl == 0 || sl == 0)
+		return s;
+	const char *p = s, *e = s.End();
+	if(tl == 1) {
+		char c = trim[0];
+		while(p < e && e[-1] == c)
+			e--;
+	}
+	else if(tl == 2) {
+		char c1 = trim[0], c2 = trim[1];
+		while(p < e && (e[-1] == c1 || e[-1] == c2))
+			e--;
+	}
+	else {
+		while(p < e && memchr(trim, e[-1], tl))
+			e--;
+	}
+	return String(p, e);
+}
+
+static String CrtrimS(String s) { return CrtrimSS(s, " "); }
+
+FDECLP(rtrim, S, GroupString)
+FDECLP(rtrim, SS, GroupString)
+
+static String CtrimSS(String s, String trim)
+{
+	int tl = trim.GetLength(), sl = s.GetLength();
+	if(tl == 0 || sl == 0)
+		return s;
+	const char *p = s, *e = s.End();
+	if(tl == 1) {
+		char c = trim[0];
+		while(p < e && *p == c)
+			p++;
+		while(p < e && e[-1] == c)
+			e--;
+	}
+	else if(tl == 2) {
+		char c1 = trim[0], c2 = trim[1];
+		while(p < e && (*p == c1 || *p == c2))
+			p++;
+		while(p < e && (e[-1] == c1 || e[-1] == c2))
+			e--;
+	}
+	else {
+		while(p < e && memchr(trim, *p, tl))
+			p++;
+		while(p < e && memchr(trim, e[-1], tl))
+			e--;
+	}
+	return String(p, e);
+}
+
+static String CtrimS(String s) { return CtrimSS(s, " "); }
+
+FDECLP(trim, S, GroupString)
+FDECLP(trim, SS, GroupString)
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/TCore/CalcBasic.h b/uppsrc/TCore/CalcBasic.h
new file mode 100644
index 000000000..eb09fe08f
--- /dev/null
+++ b/uppsrc/TCore/CalcBasic.h
@@ -0,0 +1,19 @@
+#ifndef __TCore_CalcBasic__
+#define __TCore_CalcBasic__
+
+NAMESPACE_UPP
+
+String GroupComp();
+String GroupBitOp();
+String GroupArith();
+String GroupLog();
+String GroupString();
+String GroupDate();
+String GroupArray();
+String GroupConst();
+String GroupTrans();
+String GroupSystem();
+
+END_UPP_NAMESPACE
+
+#endif//__TCore_CalcBasic__
diff --git a/uppsrc/TCore/CalcBasic.hpp b/uppsrc/TCore/CalcBasic.hpp
new file mode 100644
index 000000000..368295469
--- /dev/null
+++ b/uppsrc/TCore/CalcBasic.hpp
@@ -0,0 +1,2185 @@
+HELP_TOPIC_BEGIN("Calc$CeqVV", LNG_CZECH, "oper�tor \1==\1  (\1libovoln� typ\1, \1libovoln� typ\1) [S �] \1logick� hodnota\1")
+	HELP_TOPIC_TEXT(
+	"\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CeqVV", LNG_ENGLISH, "operator \1==\1  (\1any data type\1, \1any data type\1) [S �] \1logical value\1")
+	HELP_TOPIC_TEXT(
+	"\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CneVV", LNG_CZECH, "oper�tor \1!=\1  (\1libovoln� typ\1, \1libovoln� typ\1) [S �] \1logick� hodnota\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 Rovnost `/ nerovnost. Oper�tor ][*A@0+84 `=`=][A@0+84  \r\n"
+	"(rovnost) vr�t� logickou hodnotu 1 (][*A@0+84 pravda][A@0+84 ), \r\n"
+	"pokud operandy na obou stran�ch jsou stejn�ho typu a_jsou shodn�. \r\n"
+	"Oper�tor ][*A@0+84 `!`=][A@0+84  (nerovnost) vrac� v�dy opa�nou \r\n"
+	"logickou hodnotu ne� oper�tor ][*A@0+84 `=`=][A@0+84 .]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 Upozorn�n�][A@0+84 `: z_t�to definice rovnosti vypl�v�, \r\n"
+	"�e pokud nap��klad na jedn� stran� porovn�n� stoj� text ][*A@0+84 `\"300`\"][A@0+84  \r\n"
+	"a_na druh� stran� ��slo ][*A@0+84 300][A@0+84 , oper�tor ][*A@0+84 `=`=][A@0+84  \r\n"
+	"vr�t� logickou hodnotu ][*A@0+84 nepravda][A@0+84 , p�esto�e \r\n"
+	"text na lev� stran� je shodn� s_textovou reprezentac� ��sla na \r\n"
+	"prav� stran�. Pokud chcete porovn�vat hodnoty r�zn�ch typ�, p�eve�te \r\n"
+	"je nejprve na spole�n� typ (nap��klad pomoc� funkce ][*A@0+84 text][A@0+84  \r\n"
+	"(viz str._92)][A@0+84 ).]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CneVV", LNG_ENGLISH, "operator \1!=\1  (\1any data type\1, \1any data type\1) [S �] \1logical value\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 Equality `/ inequality. The operator ][*A@0+84 `=`=][A@0+84  \r\n"
+	"(equality) will return the logical value 1 (][*A@0+84 true][A@0+84 ), \r\n"
+	"if operands on both sides are of the same type and are identical. \r\n"
+	"The operator ][*A@0+84 `!`=][A@0+84  (inequality) will always \r\n"
+	"return the opposite logical value than operator ][*A@0+84 `=`=][A@0+84 .]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 Note][A@0+84 `: This definition of equality implies \r\n"
+	"that if, for instance, on the one side of the comparison is the \r\n"
+	"text `\"300`\" and the number 300 on the other, the operator ][*A@0+84 `=`=][A@0+84  \r\n"
+	"will return the logical value ][*A@0+84 false][A@0+84 , even \r\n"
+	"though the text on the left`-hand side is identical with the \r\n"
+	"text representation of the number on the right`-hand side. If \r\n"
+	"you want to compare values of different types, convert them first \r\n"
+	"into the same type (e.g. using the ][*A@0+84 text][A@0+84  (viz \r\n"
+	"str._96)][A@0+84  function).]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CltNN", LNG_CZECH, "oper�tor \1<\1  (\1re�ln� ��slo\1, \1re�ln� ��slo\1) [S �] \1logick� hodnota\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 Oper�tor porovn� dvojici hodnot a_vr�t� hodnotu 1, pokud \r\n"
+	"nerovnost plat�, respektive 0, pokud nerovnost neplat�. Texty \r\n"
+	"se porovn�vaj� lexikograficky (][/A@0+84 slovn�kov�][A@0+84  \r\n"
+	"uspo��d�n�).]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CltNN", LNG_ENGLISH, "operator \1<\1  (\1real number\1, \1real number\1) [S �] \1logical value\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 The operator will compare its operands returning the \r\n"
+	"value 1 if the relation holds, 0 when not. String values are \r\n"
+	"compared lexicographically (][/A@0+84 dictionary][A@0+84  organization).]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CleNN", LNG_CZECH, "oper�tor \1<=\1  (\1re�ln� ��slo\1, \1re�ln� ��slo\1) [S �] \1logick� hodnota\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 Oper�tor porovn� dvojici hodnot a_vr�t� hodnotu 1, pokud \r\n"
+	"nerovnost plat�, respektive 0, pokud nerovnost neplat�. Texty \r\n"
+	"se porovn�vaj� lexikograficky (][/A@0+84 slovn�kov�][A@0+84  \r\n"
+	"uspo��d�n�).]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CleNN", LNG_ENGLISH, "operator \1<=\1  (\1real number\1, \1real number\1) [S �] \1logical value\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 The operator will compare its operands returning the \r\n"
+	"value 1 if the relation holds, 0 when not. String values are \r\n"
+	"compared lexicographically (][/A@0+84 dictionary][A@0+84  organization).]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CgtNN", LNG_CZECH, "oper�tor \1>\1  (\1re�ln� ��slo\1, \1re�ln� ��slo\1) [S �] \1logick� hodnota\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 Oper�tor porovn� dvojici hodnot a_vr�t� hodnotu 1, pokud \r\n"
+	"nerovnost plat�, respektive 0, pokud nerovnost neplat�. Texty \r\n"
+	"se porovn�vaj� lexikograficky (][/A@0+84 slovn�kov�][A@0+84  \r\n"
+	"uspo��d�n�).]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CgtNN", LNG_ENGLISH, "operator \1>\1  (\1real number\1, \1real number\1) [S �] \1logical value\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 The operator will compare its operands returning the \r\n"
+	"value 1 if the relation holds, 0 when not. String values are \r\n"
+	"compared lexicographically (][/A@0+84 dictionary][A@0+84  organization).]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CgeNN", LNG_CZECH, "oper�tor \1>=\1  (\1re�ln� ��slo\1, \1re�ln� ��slo\1) [S �] \1logick� hodnota\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 Oper�tor porovn� dvojici hodnot a_vr�t� hodnotu 1, pokud \r\n"
+	"nerovnost plat�, respektive 0, pokud nerovnost neplat�. Texty \r\n"
+	"se porovn�vaj� lexikograficky (][/A@0+84 slovn�kov�][A@0+84  \r\n"
+	"uspo��d�n�).]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CgeNN", LNG_ENGLISH, "operator \1>=\1  (\1real number\1, \1real number\1) [S �] \1logical value\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 The operator will compare its operands returning the \r\n"
+	"value 1 if the relation holds, 0 when not. String values are \r\n"
+	"compared lexicographically (][/A@0+84 dictionary][A@0+84  organization).]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CltSS", LNG_CZECH, "oper�tor \1<\1  (\1�et�zec\1, \1�et�zec\1) [S �] \1logick� hodnota\1")
+	HELP_TOPIC_TEXT(
+	"\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CltSS", LNG_ENGLISH, "operator \1<\1  (\1string\1, \1string\1) [S �] \1logical value\1")
+	HELP_TOPIC_TEXT(
+	"\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CleSS", LNG_CZECH, "oper�tor \1<=\1  (\1�et�zec\1, \1�et�zec\1) [S �] \1logick� hodnota\1")
+	HELP_TOPIC_TEXT(
+	"\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CleSS", LNG_ENGLISH, "operator \1<=\1  (\1string\1, \1string\1) [S �] \1logical value\1")
+	HELP_TOPIC_TEXT(
+	"\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CgtSS", LNG_CZECH, "oper�tor \1>\1  (\1�et�zec\1, \1�et�zec\1) [S �] \1logick� hodnota\1")
+	HELP_TOPIC_TEXT(
+	"\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CgtSS", LNG_ENGLISH, "operator \1>\1  (\1string\1, \1string\1) [S �] \1logical value\1")
+	HELP_TOPIC_TEXT(
+	"\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CgeSS", LNG_CZECH, "oper�tor \1>=\1  (\1�et�zec\1, \1�et�zec\1) [S �] \1logick� hodnota\1")
+	HELP_TOPIC_TEXT(
+	"\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CgeSS", LNG_ENGLISH, "operator \1>=\1  (\1string\1, \1string\1) [S �] \1logical value\1")
+	HELP_TOPIC_TEXT(
+	"\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CltTT", LNG_CZECH, "oper�tor \1<\1  (\1datum/�as\1, \1datum/�as\1) [S �] \1logick� hodnota\1")
+	HELP_TOPIC_TEXT(
+	"\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CltTT", LNG_ENGLISH, "operator \1<\1  (\1date/time\1, \1date/time\1) [S �] \1logical value\1")
+	HELP_TOPIC_TEXT(
+	"\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CleTT", LNG_CZECH, "oper�tor \1<=\1  (\1datum/�as\1, \1datum/�as\1) [S �] \1logick� hodnota\1")
+	HELP_TOPIC_TEXT(
+	"\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CleTT", LNG_ENGLISH, "operator \1<=\1  (\1date/time\1, \1date/time\1) [S �] \1logical value\1")
+	HELP_TOPIC_TEXT(
+	"\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CgtTT", LNG_CZECH, "oper�tor \1>\1  (\1datum/�as\1, \1datum/�as\1) [S �] \1logick� hodnota\1")
+	HELP_TOPIC_TEXT(
+	"\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CgtTT", LNG_ENGLISH, "operator \1>\1  (\1date/time\1, \1date/time\1) [S �] \1logical value\1")
+	HELP_TOPIC_TEXT(
+	"\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CgeTT", LNG_CZECH, "oper�tor \1>=\1  (\1datum/�as\1, \1datum/�as\1) [S �] \1logick� hodnota\1")
+	HELP_TOPIC_TEXT(
+	"\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CgeTT", LNG_ENGLISH, "operator \1>=\1  (\1date/time\1, \1date/time\1) [S �] \1logical value\1")
+	HELP_TOPIC_TEXT(
+	"\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CplusN", LNG_CZECH, "oper�tor \1+\1  (\1re�ln� ��slo\1) [S �] \1re�ln� ��slo\1")
+	HELP_TOPIC_TEXT(
+	"\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CplusN", LNG_ENGLISH, "operator \1+\1  (\1real number\1) [S �] \1real number\1")
+	HELP_TOPIC_TEXT(
+	"\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CminusN", LNG_CZECH, "oper�tor \1-\1  (\1re�ln� ��slo\1) [S �] \1re�ln� ��slo\1")
+	HELP_TOPIC_TEXT(
+	"\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CminusN", LNG_ENGLISH, "operator \1-\1  (\1real number\1) [S �] \1real number\1")
+	HELP_TOPIC_TEXT(
+	"\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$ClogNotS", LNG_CZECH, "oper�tor \1!\1  (\1�et�zec\1) [S �] \1logick� hodnota\1")
+	HELP_TOPIC_TEXT(
+	"\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$ClogNotS", LNG_ENGLISH, "operator \1!\1  (\1string\1) [S �] \1logical value\1")
+	HELP_TOPIC_TEXT(
+	"\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$ClogNotN", LNG_CZECH, "oper�tor \1!\1  (\1re�ln� ��slo\1) [S �] \1logick� hodnota\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 Logick� negace. V�sledkem operace je logick� hodnota \r\n"
+	"1 (][*A@0+84 pravda][A@0+84 ), pokud argument je nulov� (jedn� \r\n"
+	"se o_nulov� ��slo nebo o_logickou hodnotu ][*A@0+84 nepravda][A@0+84 ). \r\n"
+	"Pokud je argument nenulov� nebo obsahuje logickou hodnotu ][*A@0+84 pravda][A@0+84 ,\r\n"
+	" v�sledkem logick� negace je hodnota 0 (][*A@0+84 nepravda][A@0+84 ). \r\n"
+	"Pokud je parametrem oper�toru �et�zec, je v�sledkem hodnota 1 \r\n"
+	"(][*A@0+84 pravda][A@0+84 ), kdy� tento �et�zec je pr�zdn�.]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 P��klad][A@0+84 `: `!10 `= 0, `!0 `= 1, `!`\"ahoj`\" \r\n"
+	"`= 0]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$ClogNotN", LNG_ENGLISH, "operator \1!\1  (\1real number\1) [S �] \1logical value\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 Logical negation. The result is the logical value 1 \r\n"
+	"(][*A@0+84 true][A@0+84 ), if the argument is zero (zero number \r\n"
+	"or the logical value ][*A@0+84 false][A@0+84 ). If the argument \r\n"
+	"is nonzero or if it contains the logical value ][*A@0+84 true][A@0+84 , \r\n"
+	"the result of logical negation is the value 0 (][*A@0+84 false][A@0+84 ). \r\n"
+	"If the operator `! is applied to a string, the result will be \r\n"
+	"1 (][*A@0+84 true][A@0+84 ) when and only when the string is \r\n"
+	"empty.]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 Example][A@0+84 `: `!10 `= 0, `!0 `= 1, `!`\"hello`\" \r\n"
+	"`= 0]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CaddNN", LNG_CZECH, "oper�tor \1+\1  (\1re�ln� ��slo\1, \1re�ln� ��slo\1) [S �] \1re�ln� ��slo\1")
+	HELP_TOPIC_TEXT(
+	"[3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0} \r\n"
+	"[s0;2 Sou�et dvou re�ln�ch ��sel.")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CaddNN", LNG_ENGLISH, "operator \1+\1  (\1real number\1, \1real number\1) [S �] \1real number\1")
+	HELP_TOPIC_TEXT(
+	"\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CaddSS", LNG_CZECH, "oper�tor \1+\1  (\1�et�zec\1, \1�et�zec\1) [S �] \1�et�zec\1")
+	HELP_TOPIC_TEXT(
+	"[3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0} \r\n"
+	"[s0;2 Oper�tor spoj� dva �et�zce tak, �e je za�ad� za sebe.&]\r\n"
+	"[s0;2 &]\r\n"
+	"[s0;2 [* P��klad:] \"ahoj\" +\" sv�te\" = \"ahoj sv�te\"")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CaddSS", LNG_ENGLISH, "operator \1+\1  (\1string\1, \1string\1) [S �] \1string\1")
+	HELP_TOPIC_TEXT(
+	"\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CaddDN", LNG_CZECH, "oper�tor \1+\1  (\1datum/�as\1, \1re�ln� ��slo\1) [S �] \1datum/�as\1")
+	HELP_TOPIC_TEXT(
+	"[3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0} \r\n"
+	"[s0;2 Oper�tor posune zadan� datum o_dan� po�et dn� (dop�edu, pokud \r\n"
+	"je ��slo kladn�). Po�et dn� m��e b�t i necelo��seln�, v_tom p��pad� \r\n"
+	"se posune i ��slo sekundy, minuty a hodiny.&]\r\n"
+	"[s0;2 &]\r\n"
+	"[s0;2 [* P��klad]: 27.12.1999 + 7 = 3.1.2000")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CaddDN", LNG_ENGLISH, "operator \1+\1  (\1date/time\1, \1real number\1) [S �] \1date/time\1")
+	HELP_TOPIC_TEXT(
+	"\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CaddND", LNG_CZECH, "oper�tor \1+\1  (\1re�ln� ��slo\1, \1datum/�as\1) [S �] \1datum/�as\1")
+	HELP_TOPIC_TEXT(
+	"[3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0} \r\n"
+	"[s0;2 Oper�tor posune zadan� datum o_dan� po�et dn� (dop�edu, pokud \r\n"
+	"je ��slo kladn�). Po�et dn� m��e b�t i necelo��seln�, v_tom p��pad� \r\n"
+	"se posune i ��slo sekundy, minuty a hodiny.&]\r\n"
+	"[s0;2 &]\r\n"
+	"[s0;2 [* P��klad]: 27.12.1999 + 7 = 3.1.2000")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CaddND", LNG_ENGLISH, "operator \1+\1  (\1real number\1, \1date/time\1) [S �] \1date/time\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 The unary operator ][*A@0+84 `+][A@0+84  leaves its \r\n"
+	"argument unchanged. The operator serves only as a symmetric complement \r\n"
+	"of the operator ][*A@0+84 `-][A@0+84  to increase readability \r\n"
+	"of certain formulas.]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [A@0+84 Binary operator ][*A@0+84 `+][A@0+84  adds up its operands. \r\n"
+	"In case of strings, the strings will be concatenated. When a \r\n"
+	"number is added to a date value, the date will be moved forward \r\n"
+	"or back by given number of days (forward if it is positive).]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 Example][A@0+84 `: 27 `+ 35 `= 62, `\"a piece `\" `+ \r\n"
+	"`\"of text`\" `= `\"a piece of text`\", 27.12.1999 `+ 7 `= 3.1.2000]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CsubNN", LNG_CZECH, "oper�tor \1-\1  (\1re�ln� ��slo\1, \1re�ln� ��slo\1) [S �] \1re�ln� ��slo\1")
+	HELP_TOPIC_TEXT(
+	"\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CsubNN", LNG_ENGLISH, "operator \1-\1  (\1real number\1, \1real number\1) [S �] \1real number\1")
+	HELP_TOPIC_TEXT(
+	"\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CsubDN", LNG_CZECH, "oper�tor \1-\1  (\1datum/�as\1 [/ d], \1re�ln� ��slo\1 [/ po�et_dn�]) [S �] \1datum/�as\1")
+	HELP_TOPIC_TEXT(
+	"\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CsubDN", LNG_ENGLISH, "operator \1-\1  (\1date/time\1 [/ d], \1real number\1 [/ number_of_days]) [S �] \1date/time\1")
+	HELP_TOPIC_TEXT(
+	"\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CsubDD", LNG_CZECH, "oper�tor \1-\1  (\1datum/�as\1 [/ datum1], \1datum/�as\1 [/ datum2]) [S �] \1re�ln� ��slo\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 Un�rn� oper�tor ][*A@0+84 `-][A@0+84  obr�t� znam�nko \r\n"
+	"sv�ho argumentu.]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [A@0+84 Bin�rn� oper�tor ][*A@0+84 `-][A@0+84  ode�te sv� operandy. \r\n"
+	"V_p��pad� dvojice ��sel je v�sledkem b�n� ��seln� rozd�l hodnot. \r\n"
+	"V_p��pad� rozd�lu data a_cel�ho ��sla se od data ode�te zadan� \r\n"
+	"po�et dn�. V�sledkem rozd�lu dvou dat je po�et dn� mezi nimi. \r\n"
+	"Po�et je kladn�, pokud je prvn� datum pozd�j�� ne� druh�.]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 P��klad][A@0+84 `: 137 `- 95 `= 42, 27.12.1999 `- 5 \r\n"
+	"`= 22.12.1999, 4.1.2000 `- 28.12.1999 `= 7]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CsubDD", LNG_ENGLISH, "operator \1-\1  (\1date/time\1 [/ date1], \1date/time\1 [/ date2]) [S �] \1real number\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 Unary operator ][*A@0+84 `-][A@0+84  reverses the sign \r\n"
+	"of its numerical argument.]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [A@0+84 Binary operator ][*A@0+84 `-][A@0+84  subtracts its \r\n"
+	"operands. For numerical operands, the result is the ordinary \r\n"
+	"difference. When an integer is subtracted from a date, the date \r\n"
+	"is moved backward the specified number of days. When subtracting \r\n"
+	"two dates, the result is the number of days between them. The \r\n"
+	"number is positive if the left date comes after the right date.]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 Example][A@0+84 `: 137 `- 95 `= 42, 27.12.1999 `- 5 \r\n"
+	"`= 22.12.1999, 4.1.2000 `- 28.12.1999 `= 7]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CmulSN", LNG_CZECH, "oper�tor \1*\1  (\1�et�zec\1 [/ text], \1cel� ��slo\1 [/ po�et]) [S �] \1�et�zec\1")
+	HELP_TOPIC_TEXT(
+	"\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CmulSN", LNG_ENGLISH, "operator \1*\1  (\1string\1 [/ text], \1integer\1 [/ count]) [S �] \1string\1")
+	HELP_TOPIC_TEXT(
+	"\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CroundN", LNG_CZECH, "\1round\1 (\1re�ln� ��slo\1) [S �] \1re�ln� ��slo\1")
+	HELP_TOPIC_TEXT(
+	"\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CroundN", LNG_ENGLISH, "\1round\1 (\1real number\1) [S �] \1real number\1")
+	HELP_TOPIC_TEXT(
+	"\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CroundNN", LNG_CZECH, "\1round\1 (\1re�ln� ��slo\1 [/ hodnota], \1cel� ��slo\1 [/ po�et_desetinn�ch_m�st]) [S �] \1re�ln� ��slo\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 Zaokrouhlen� na zadan� po�et desetinn�ch m�st (0, pokud \r\n"
+	"nen� zad�no). Sm�r zaokrouhlen� je k_nejbli���mu re�ln�mu ��slu, \r\n"
+	"kter� je celistv�m n�sobkem hodnoty ][*A@0+84 10_`*`*_][/A@0+84 `-po�et_m�st][A@0+84 .\r\n"
+	" Pokud zadan� ��slo le�� p�esn� v_polovin� vzd�lenosti mezi nejbli���mi \r\n"
+	"takov�mi ��sly, zaokrouhl� se sm�rem nahoru.]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 P��klad][A@0+84 `: round(`-2.5) `= `-2, round(47.32, \r\n"
+	"1) `= 47.3, round(117, `-1) `= 120.]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CroundNN", LNG_ENGLISH, "\1round\1 (\1real number\1 [/ value], \1integer\1 [/ decimals]) [S �] \1real number\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 Rounding to the stated number of decimal places (0 by \r\n"
+	"default). The direction of rounding is towards the nearest integral \r\n"
+	"multiple of ][*A@0+84 10_`*`*_][/A@0+84 `-decimals][A@0+84 . \r\n"
+	"If the number lies exactly in the middle between two such numbers, \r\n"
+	"it is rounded up (towards positive infinity).]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 Example][A@0+84 `: round(`-2.5) `= `-2, round(47.32, \r\n"
+	"1) `= 47.3, round(117, `-1) `= 120.]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CfloorN", LNG_CZECH, "\1floor\1 (\1re�ln� ��slo\1) [S �] \1re�ln� ��slo\1")
+	HELP_TOPIC_TEXT(
+	"[3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0} \r\n"
+	"[s0;2 Zaokrouhlen� sm�rem dol�. Funkce nalezne nejvy��� cel� ��slo, \r\n"
+	"kter� nen� vy��� ne� p�vodn� [/ hodnota].&]\r\n"
+	"[s0;2 &]\r\n"
+	"[s0;2 [* P��klad]: floor(-2.5) = -3")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CfloorN", LNG_ENGLISH, "\1floor\1 (\1real number\1) [S �] \1real number\1")
+	HELP_TOPIC_TEXT(
+	"\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CfloorNN", LNG_CZECH, "\1floor\1 (\1re�ln� ��slo\1 [/ hodnota], \1cel� ��slo\1 [/ po�et_desetinn�ch_m�st]) [S �] \1re�ln� ��slo\1")
+	HELP_TOPIC_TEXT(
+	"[3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0} \r\n"
+	"[s0;2 Zaokrouhlen� sm�rem dol� na zadan� po�et desetinn�ch m�st. \r\n"
+	"Funkce nalezne nejvy��� re�ln� ��slo, kter� je celistv�m n�sobkem \r\n"
+	"hodnoty [* 10_**_][/ -po�et_m�st] a_nen� vy��� ne� p�vodn� [/ hodnota].&]\r\n"
+	"[s0;2 &]\r\n"
+	"[s0;2 [* P��klad]: floor(47.32, 1) = 47.3, floor(117, -1) = 110.")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CfloorNN", LNG_ENGLISH, "\1floor\1 (\1real number\1 [/ value], \1integer\1 [/ decimals]) [S �] \1real number\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 Rounding down (towards minus infinity) to the stated \r\n"
+	"number of decimal places (0 by default). The function returns \r\n"
+	"the highest integral multiple of ][*A@0+84 10_`*`*_][/A@0+84 `-decimals][A@0+84  \r\n"
+	"not greater than the original ][/A@0+84 value][A@0+84 .]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 Example][A@0+84 `: floor(`-2.5) `= `-3, floor(47.32, \r\n"
+	"1) `= 47.3, floor(117, `-1) `= 110.]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CceilN", LNG_CZECH, "\1ceil\1 (\1re�ln� ��slo\1) [S �] \1re�ln� ��slo\1")
+	HELP_TOPIC_TEXT(
+	"[3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0} \r\n"
+	"[s0;2 Zaokrouhlen� sm�rem nahoru. Funkce nalezne nejmen�� cel� ��slo, \r\n"
+	"kter� nen� men�� ne� p�vodn� [/ hodnota].&]\r\n"
+	"[s0;2 &]\r\n"
+	"[s0;2 [* P��klad]: ceil(-2.5) = -2")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CceilN", LNG_ENGLISH, "\1ceil\1 (\1real number\1) [S �] \1real number\1")
+	HELP_TOPIC_TEXT(
+	"\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CceilNN", LNG_CZECH, "\1ceil\1 (\1re�ln� ��slo\1 [/ hodnota], \1cel� ��slo\1 [/ po�et_desetinn�ch_m�st]) [S �] \1re�ln� ��slo\1")
+	HELP_TOPIC_TEXT(
+	"[3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0} \r\n"
+	"[s0;2 Zaokrouhlen� sm�rem nahoru na zadan� po�et desetinn�ch m�st. \r\n"
+	"Funkce nalezne nejmen�� re�ln� ��slo, kter� je celistv�m n�sobkem \r\n"
+	"hodnoty [* 10_**_][/ -po�et_m�st] a_nen� men�� ne� p�vodn� [/ hodnota].&]\r\n"
+	"[s0;2 &]\r\n"
+	"[s0;2 [* P��klad]: ceil(47.32, 1) = 47.4, ceil(117, -1) = 120.")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CceilNN", LNG_ENGLISH, "\1ceil\1 (\1real number\1 [/ value], \1integer\1 [/ decimals]) [S �] \1real number\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 Rounding down (towards plus infinity) to the stated \r\n"
+	"number of decimal places (0 by default). The function returns \r\n"
+	"the lowest integral multiple of ][*A@0+84 10_`*`*_][/A@0+84 `-decimals][A@0+84  \r\n"
+	"not lower than the original ][/A@0+84 value][A@0+84 .]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 Example][A@0+84 `: ceil(`-2.5) `= `-2, ceil(47.32, \r\n"
+	"1) `= 47.4, ceil(117, `-1) `= 120.]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CminNN", LNG_CZECH, "\1min\1 (\1re�ln� ��slo\1, \1re�ln� ��slo\1) [S �] \1re�ln� ��slo\1")
+	HELP_TOPIC_TEXT(
+	"\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CminNN", LNG_ENGLISH, "\1min\1 (\1real number\1, \1real number\1) [S �] \1real number\1")
+	HELP_TOPIC_TEXT(
+	"\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CminSS", LNG_CZECH, "\1min\1 (\1�et�zec\1, \1�et�zec\1) [S �] \1�et�zec\1")
+	HELP_TOPIC_TEXT(
+	"\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CminSS", LNG_ENGLISH, "\1min\1 (\1string\1, \1string\1) [S �] \1string\1")
+	HELP_TOPIC_TEXT(
+	"\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CminTT", LNG_CZECH, "\1min\1 (\1datum/�as\1, \1datum/�as\1) [S �] \1datum/�as\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 Minimum. Funkce vr�t� men�� z_dvojice zadan�ch hodnot. \r\n"
+	"V_p��pad� text� se prov�d� lexikografick� srovn�n� (funkce vr�t� \r\n"
+	"text, kter� by ve slovn�ku byl bl�e za��tku).]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CminTT", LNG_ENGLISH, "\1min\1 (\1date/time\1, \1date/time\1) [S �] \1date/time\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 Minimum. The function will return the smaller of its \r\n"
+	"arguments. Texts are compared lexicographically (the function \r\n"
+	"will return text which would be closer to the beginning in a \r\n"
+	"dictionary).]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CmaxNN", LNG_CZECH, "\1max\1 (\1re�ln� ��slo\1, \1re�ln� ��slo\1) [S �] \1re�ln� ��slo\1")
+	HELP_TOPIC_TEXT(
+	"\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CmaxNN", LNG_ENGLISH, "\1max\1 (\1real number\1, \1real number\1) [S �] \1real number\1")
+	HELP_TOPIC_TEXT(
+	"\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CmaxSS", LNG_CZECH, "\1max\1 (\1�et�zec\1, \1�et�zec\1) [S �] \1�et�zec\1")
+	HELP_TOPIC_TEXT(
+	"\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CmaxSS", LNG_ENGLISH, "\1max\1 (\1string\1, \1string\1) [S �] \1string\1")
+	HELP_TOPIC_TEXT(
+	"\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CmaxTT", LNG_CZECH, "\1max\1 (\1datum/�as\1, \1datum/�as\1) [S �] \1datum/�as\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 Maximum. Funkce vr�t� v�t�� z_dvojice zadan�ch hodnot. \r\n"
+	"V_p��pad� text� se prov�d� lexikografick� srovn�n� (funkce vr�t� \r\n"
+	"text, kter� by ve slovn�ku byl bl�e konci.]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CmaxTT", LNG_ENGLISH, "\1max\1 (\1date/time\1, \1date/time\1) [S �] \1date/time\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 Minimum. The function will return the bigger of its \r\n"
+	"arguments. Texts are compared lexicographically (the function \r\n"
+	"will return text which would be closer to the end in a dictionary).]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CminmaxNNN", LNG_CZECH, "\1minmax\1 (\1re�ln� ��slo\1, \1re�ln� ��slo\1, \1re�ln� ��slo\1) [S �] \1re�ln� ��slo\1")
+	HELP_TOPIC_TEXT(
+	"\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CminmaxNNN", LNG_ENGLISH, "\1minmax\1 (\1real number\1, \1real number\1, \1real number\1) [S �] \1real number\1")
+	HELP_TOPIC_TEXT(
+	"\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CminmaxSSS", LNG_CZECH, "\1minmax\1 (\1�et�zec\1, \1�et�zec\1, \1�et�zec\1) [S �] \1�et�zec\1")
+	HELP_TOPIC_TEXT(
+	"\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CminmaxSSS", LNG_ENGLISH, "\1minmax\1 (\1string\1, \1string\1, \1string\1) [S �] \1string\1")
+	HELP_TOPIC_TEXT(
+	"\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CminmaxTTT", LNG_CZECH, "\1minmax\1 (\1datum/�as\1, \1datum/�as\1, \1datum/�as\1) [S �] \1datum/�as\1")
+	HELP_TOPIC_TEXT(
+	"\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CminmaxTTT", LNG_ENGLISH, "\1minmax\1 (\1date/time\1, \1date/time\1, \1date/time\1) [S �] \1date/time\1")
+	HELP_TOPIC_TEXT(
+	"\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$ClenS", LNG_CZECH, "\1len\1 (\1�et�zec\1) [S �] \1cel� ��slo\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 Funkce vr�t� d�lku (po�et znak�) textu, kter� je jej�m \r\n"
+	"parametrem. Pokud je text pr�zdn�, v�sledkem funkce je hodnota \r\n"
+	"0.]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 P��klad][A@0+84 `: len(`\"pokusn� text`\") `= 12.]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$ClenS", LNG_ENGLISH, "\1len\1 (\1string\1) [S �] \1integer\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 The function will return the length (number of characters) \r\n"
+	"of its string argument. If the string is empty the function returns \r\n"
+	"0.]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 Example][A@0+84 `: len(`\"simple text`\") `= 11.]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CnlsN", LNG_CZECH, "\1nls\1 (\1re�ln� ��slo\1 [/ ��slo]) [S �] \1�et�zec\1")
+	HELP_TOPIC_TEXT(
+	"\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CnlsN", LNG_ENGLISH, "\1nls\1 (\1real number\1 [/ value]) [S �] \1string\1")
+	HELP_TOPIC_TEXT(
+	"\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CnlsNN", LNG_CZECH, "\1nls\1 (\1re�ln� ��slo\1 [/ ��slo], \1cel� ��slo\1 [/ des_m�st]) [S �] \1�et�zec\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 P�evod ��seln� hodnoty na text s vyu�it�m n�rodn�ch \r\n"
+	"zvyklost� pro form�tov�n� ��sel (odd�lova�e tis�c�, odd�lova� \r\n"
+	"desetinn� ��sti). Pokud nen� zad�n po�et desetinn�ch m�st, dosad� \r\n"
+	"se b�n� hodnota 3. Pokud je po�et desetinn�ch m�st kladn�, z \r\n"
+	"desetinn� ��sti ��sla se odstran� nev�znamn� nuly; pokud je po�et \r\n"
+	"m�st z�porn�, nev�znamn� nuly se v ��sle ponechaj�.]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 P��klad][A@0+84 `: nls(1272.3, `-2) `= `\"1 272,30`\"]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CnlsNN", LNG_ENGLISH, "\1nls\1 (\1real number\1 [/ value], \1integer\1 [/ decimals]) [S �] \1string\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 Converts its numeric value to text according to current \r\n"
+	"regional settings (delimiters of thousands, delimiter of decimal \r\n"
+	"part). If number of decimals is omitted, the default value 3 \r\n"
+	"is used. If the number of decimals is positive, non`-significant \r\n"
+	"zeroes will be deleted from the decimal part of the number. If \r\n"
+	"the number of decimal positions is negative, non`-significant \r\n"
+	"zeroes will be retained in the number. ]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 Example][A@0+84 `: nls(1272.3, `-2) `= `\"1 272,30`\"]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CtextN", LNG_CZECH, "\1text\1 (\1re�ln� ��slo\1) [S �] \1�et�zec\1")
+	HELP_TOPIC_TEXT(
+	"\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CtextN", LNG_ENGLISH, "\1text\1 (\1real number\1) [S �] \1string\1")
+	HELP_TOPIC_TEXT(
+	"\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CftextN", LNG_CZECH, "\1ftext\1 (\1re�ln� ��slo\1) [S �] \1�et�zec\1")
+	HELP_TOPIC_TEXT(
+	"\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CftextN", LNG_ENGLISH, "\1ftext\1 (\1real number\1) [S �] \1string\1")
+	HELP_TOPIC_TEXT(
+	"\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CftextNI", LNG_CZECH, "\1ftext\1 (\1re�ln� ��slo\1, \1cel� ��slo\1) [S �] \1�et�zec\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 Funkce p�evede ��slo na text se zadan�m po�tem desetinn�ch \r\n"
+	"m�st. Pokud nen� po�et m�st zad�n, desetinn� m�sta se ignoruj�.]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CftextNI", LNG_ENGLISH, "\1ftext\1 (\1real number\1, \1integer\1) [S �] \1string\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 Funkce p�evede ��slo na text se zadan�m po�tem desetinn�ch \r\n"
+	"m�st. Pokud nen� po�et m�st zad�n, desetinn� m�sta se ignoruj�.]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CtextS", LNG_CZECH, "\1text\1 (\1�et�zec\1) [S �] \1�et�zec\1")
+	HELP_TOPIC_TEXT(
+	"\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CtextS", LNG_ENGLISH, "\1text\1 (\1string\1) [S �] \1string\1")
+	HELP_TOPIC_TEXT(
+	"\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CtextD", LNG_CZECH, "\1text\1 (\1datum/�as\1) [S �] \1�et�zec\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 P�evod hodnoty na text. P�i p�evodu ��sla na text je \r\n"
+	"v�sledkem textov� reprezentace tohoto ��sla, po��zen� na 10 platn�ch \r\n"
+	"��slic. Pokud je parametrem text, funkce ponech� tento text beze \r\n"
+	"zm�ny. P�i p�evodu data na text se do �et�zce datum ulo�� v b�n�m \r\n"
+	"tvaru ][*A@0+84 den.m�s�c.rok][A@0+84 .]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 P��klad][A@0+84 `: text(1 `/ 3) `= `\"0.3333333333`\", \r\n"
+	"text(`\"ahoj`\") `= `\"ahoj`\", text(26.7.1971) `= `\"26.07.1971`\"]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CtextD", LNG_ENGLISH, "\1text\1 (\1date/time\1) [S �] \1string\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 Value`-to`-text conversion. If a number is converted \r\n"
+	"into a text, its result is the text representation of the number \r\n"
+	"with 10 significant digits. If the parameter is a text, the text \r\n"
+	"will be left unchanged by the function. In case of date`-to`-text \r\n"
+	"conversion, the date will be saved in the string in the usual \r\n"
+	"form day.month.year.]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 Example][A@0+84 `: text(1 `/ 3) `= `\"0.3333333333`\", \r\n"
+	"text(`\"hello`\") `= `\"hello`\", text(26.7.1971) `= `\"26.07.1971`\"]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CmidSN", LNG_CZECH, "\1mid\1 (\1�et�zec\1 [/ text], \1cel� ��slo\1 [/ za��tek]) [S �] \1�et�zec\1")
+	HELP_TOPIC_TEXT(
+	"\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CmidSN", LNG_ENGLISH, "\1mid\1 (\1string\1 [/ text], \1integer\1 [/ beginning]) [S �] \1string\1")
+	HELP_TOPIC_TEXT(
+	"\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CmidSNN", LNG_CZECH, "\1mid\1 (\1�et�zec\1 [/ text], \1cel� ��slo\1 [/ za��tek], \1cel� ��slo\1 [/ po�et_znak�]) [S �] \1�et�zec\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 Funkce vr�t� zadan� ][/A@0+84 po�et znak�][A@0+84  z_�et�zce \r\n"
+	"][/A@0+84 text][A@0+84  od pozice ][/A@0+84 za��tek][A@0+84 . \r\n"
+	"Prvn� znak v_�et�zci m� pozi�n� ��slo 0, druh� znak ��slo 1 atd., \r\n"
+	"posledn� znak m� pozici ][*A@0+84 len(][*/A@0+84 text][*A@0+84  \r\n"
+	"`- 1)][A@0+84 . Pokud nen� po�et znak� zad�n, funkce vr�t� v�echny \r\n"
+	"znaky �et�zce od zadan� pozice a� do konce.]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 P��klad][A@0+84 `: mid(`\"ahoj sv�te`\", 3, 3) `= `\"j_s`\"]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CmidSNN", LNG_ENGLISH, "\1mid\1 (\1string\1 [/ text], \1integer\1 [/ beginning], \1integer\1 [/ character_count]) [S �] \1string\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 The function returns ][/A@0+84 character`_count][A@0+84  \r\n"
+	"characters from the string ][/A@0+84 text][A@0+84  starting at \r\n"
+	"position ][/A@0+84 beginning][A@0+84 . The first character in \r\n"
+	"the string has the position number 0, the second character has \r\n"
+	"the number 1 etc., the last character has the position ][*A@0+84 len(][*/A@0+84 t\r\n"
+	"ext][*A@0+84  `- 1)][A@0+84 . If the character count is omitted \r\n"
+	"the function returns all characters from the position ][/A@0+84 beginning][A@0+84  \r\n"
+	"until the end of the string.]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 Example][A@0+84 `: mid(`\"hello world`\", 4, 3) `= `\"o \r\n"
+	"w`\"]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CnumberS", LNG_CZECH, "\1number\1 (\1�et�zec\1) [S �] \1re�ln� ��slo\1")
+	HELP_TOPIC_TEXT(
+	"\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CnumberS", LNG_ENGLISH, "\1number\1 (\1string\1) [S �] \1real number\1")
+	HELP_TOPIC_TEXT(
+	"\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CnumberSN", LNG_CZECH, "\1number\1 (\1�et�zec\1 [/ text], \1re�ln� ��slo\1 [/ jinak]) [S �] \1re�ln� ��slo\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 Funkce p�evede textovou reprezentaci re�ln�ho ��sla \r\n"
+	"na hodnotu tohoto ��sla. Varianta funkce s jedn�m parametrem \r\n"
+	"v p��pad� chybn�ho z�pisu ��sla ohl�s� p�i vyhodnocen� chybu; \r\n"
+	"funkce s dv�ma parametry vr�t� v p��pad� chyby nebo pr�zdn�ho \r\n"
+	"�et�zce ��selnou hodnotu ][/A@0+84 jinak][A@0+84 , zadanou jako \r\n"
+	"druh� parametr.]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 P��klad][A@0+84 `: number(`\"1.2e3`\") `= 1200]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CnumberSN", LNG_ENGLISH, "\1number\1 (\1string\1 [/ text], \1real number\1 [/ default]) [S �] \1real number\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 The function converts text representation of a real \r\n"
+	"numeric constant to the value of this number. If the text doesn`'t \r\n"
+	"contain a valid text representation of a real number, the form \r\n"
+	"with one parameter aborts the computation with the error ][/A@0+84 `'invalid \r\n"
+	"numeric format`'][A@0+84  whereas the form with two arguments \r\n"
+	"merely returns its second argument ][/A@0+84 default][A@0+84 .]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 Example][A@0+84 `: number(`\"1.2e3`\") `= 1200]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$Cdate0", LNG_CZECH, "\1date\1 [S �] \1datum\1")
+	HELP_TOPIC_TEXT(
+	"\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$Cdate0", LNG_ENGLISH, "\1date\1 [S �] \1date\1")
+	HELP_TOPIC_TEXT(
+	"\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CdateN", LNG_CZECH, "\1date\1 (\1cel� ��slo\1 [/ den]) [S �] \1datum\1")
+	HELP_TOPIC_TEXT(
+	"\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CdateN", LNG_ENGLISH, "\1date\1 (\1integer\1 [/ day]) [S �] \1date\1")
+	HELP_TOPIC_TEXT(
+	"\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CdateNN", LNG_CZECH, "\1date\1 (\1cel� ��slo\1 [/ den], \1cel� ��slo\1 [/ m�s�c]) [S �] \1datum\1")
+	HELP_TOPIC_TEXT(
+	"\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CdateNN", LNG_ENGLISH, "\1date\1 (\1integer\1 [/ day], \1integer\1 [/ month]) [S �] \1date\1")
+	HELP_TOPIC_TEXT(
+	"\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CdateNNN", LNG_CZECH, "\1date\1 (\1cel� ��slo\1 [/ den], \1cel� ��slo\1 [/ m�s�c], \1cel� ��slo\1 [/ rok]) [S �] \1datum\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 Funkce sestav� datum ze zadan�ch polo�ek. Funkce bez \r\n"
+	"parametru vr�t� dne�n� datum, zji�t�n� ze syst�mu. Funkce s_jedn�m \r\n"
+	"parametrem ][/A@0+84 den][A@0+84  vr�t� den se zadan�m ��slem \r\n"
+	"v_aktu�ln�m m�s�ci. Funkce se dv�ma parametry ][/A@0+84 den][A@0+84 , \r\n"
+	"][/A@0+84 m�s�c][A@0+84  vr�t� den se zadan�m ��slem dne a_m�s�ce \r\n"
+	"v_aktu�ln�m roce. Varianta se t�emi parametry pouze sestav� datum \r\n"
+	"ze zadan�ch sou��st�.]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 P��klad][A@0+84 `: date `= ][A@0+84 19.06.2003][A@0+84 , \r\n"
+	"date(10) `= ][A@0+84 10.06.2003][A@0+84 , date(15, 7) `= ][A@0+84 15.07.2003][A@0+84 ,\r\n"
+	" date(25, 1, 1974) `= 25.01.1974]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CdateNNN", LNG_ENGLISH, "\1date\1 (\1integer\1 [/ day], \1integer\1 [/ month], \1integer\1 [/ year]) [S �] \1date\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 The function composes a date value from its arguments. \r\n"
+	"The form without parameters returns current system date. The \r\n"
+	"form with the parameter ][/A@0+84 day][A@0+84   returns given \r\n"
+	"day in the current month. The two parameter`-form, ][/A@0+84 day][A@0+84  \r\n"
+	"and ][/A@0+84 month][A@0+84 , returns given day and month in \r\n"
+	"the current system year. The three argument form composes an \r\n"
+	"arbitrary date as specified by day, month, and year number.]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 Example][A@0+84 `: date `= ][A@0+84 20.06.2003][A@0+84 , \r\n"
+	"date(10) `= ][A@0+84 10.06.2003][A@0+84 , date(15, 7) `= ][A@0+84 15.07.2003][A@0+84 ,\r\n"
+	" date(25, 1, 1974) `= 25.01.1974]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$Cadd_monthsDN", LNG_CZECH, "\1add_months\1 (\1datum\1, \1cel� ��slo\1 [/ po�et_m�s�c�]) [S �] \1datum\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 Funkce p�i�te k datu zadan� ][/A@0+84 po�et m�s�c�][A@0+84 . \r\n"
+	"Pokud c�lov� m�s�c m� m�n� dn�, ne� je ��slo dne v m�s�ci v p�vodn�m \r\n"
+	"datu, nastav� se ��slo dne na ��slo posledn�ho dne v c�lov�m \r\n"
+	"m�s�ci.]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 P��klad][A@0+84 `: add_months(29.2.1996, 12) `= 28.2.1997]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$Cadd_monthsDN", LNG_ENGLISH, "\1add_months\1 (\1date\1, \1integer\1 [/ number_of_months]) [S �] \1date\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 The function adds given ][/A@0+84 number`_of`_months][A@0+84  \r\n"
+	"to the date. If the target month has fewer days than is the day \r\n"
+	"number in the original date, the function returns last day of \r\n"
+	"the target month.]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 Example][A@0+84 `: add`_months(29.2.1996, 12) `= 28.2.1997]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$Cadd_yearsDN", LNG_CZECH, "\1add_years\1 (\1datum\1, \1cel� ��slo\1 [/ po�et_let]) [S �] \1datum\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 Funkce p�i�te k datu zadan� ][/A@0+84 po�et let][A@0+84 . \r\n"
+	"Pokud p�vodn� datum je 29.2. v p�estupn�m roce a c�lov� rok nen� \r\n"
+	"p�estupn�, zm�n� se ��slo dne na 28.]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 P��klad][A@0+84 `: add_years(29.2.1992, 3) `= 28.2.1995]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$Cadd_yearsDN", LNG_ENGLISH, "\1add_years\1 (\1date\1, \1integer\1 [/ number_of_years]) [S �] \1date\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 The function adds given ][/A@0+84 number`_of`_years][A@0+84  \r\n"
+	"to its date argument. If the original date is Feb 29 in a leap \r\n"
+	"year and the target year is not a leap one, the day number is \r\n"
+	"adjusted to 28.]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 Example][A@0+84 `: add`_years(29.2.1992, 3) `= 28.2.1995]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$Cis_numberV", LNG_CZECH, "\1is_number\1 (\1libovoln� typ\1) [S �] \1cel� ��slo\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 Funkce otestuje, zda je zadan� parametr typu ][*A@0+84 ��slo][A@0+84  \r\n"
+	"(cel� nebo re�ln� ��slo, p��padn� v�sledek n�kter� z_logick�ch \r\n"
+	"operac�). Pokud parametr je typu ][*A@0+84 ��slo][A@0+84 , funkce \r\n"
+	"vr�t� logickou hodnotu 1 (][*A@0+84 pravda][A@0+84 ).]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 P��klad][A@0+84 `: is_number(10.5) `= 1, is_number(23.5.1997) \r\n"
+	"`= 0, is_number(`\"ahoj`\") `= 0]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$Cis_numberV", LNG_ENGLISH, "\1is_number\1 (\1any data type\1) [S �] \1integer\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 The function checks whether its argument is a number \r\n"
+	"(integer, real number, or a logical value). If the argument is \r\n"
+	"a number type, the function returns logical value 1 (true).]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 Example][A@0+84 `: is number(10.5) `= 1, is number(23.5.1997) \r\n"
+	"`= 0, is number(`\"hi`\") `= 0]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$Cis_textV", LNG_CZECH, "\1is_text\1 (\1libovoln� typ\1) [S �] \1cel� ��slo\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 Funkce vr�t� logickou hodnotu 1 (][*A@0+84 pravda][A@0+84 ), \r\n"
+	"kdy� zadan� parametr je typu ][*A@0+84 �et�zec][A@0+84 . Pokud \r\n"
+	"je parametr jin�ho typu nebo obsahuje pr�zdnou hodnotu, funkce \r\n"
+	"vr�t� hodnotu 0 (][*A@0+84 nepravda][A@0+84 ).]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 P��klad][A@0+84 `: is_text(10.5) `= 0, is_text(23.5.1997) \r\n"
+	"`= 0, is_text(`\"ahoj`\") `= 1]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$Cis_textV", LNG_ENGLISH, "\1is_text\1 (\1any data type\1) [S �] \1integer\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 The function returns logical value 1 (][*A@0+84 true][A@0+84 ) \r\n"
+	"if its argument is a string. If the parameter is of a different \r\n"
+	"type or is empty, the function returns logical value 0 (false).]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 Example][A@0+84 `: is`_text(10.5) `= 0, is`_text(23.5.1997) \r\n"
+	"`= 0, is`_text(`\"hi`\") `= 1]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$Cis_nullV", LNG_CZECH, "\1is_null\1 (\1libovoln� typ\1) [S �] \1cel� ��slo\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 Funkce vr�t� logickou hodnotu 1 (][*A@0+84 pravda][A@0+84 ), \r\n"
+	"kdy� jej� parametr je typu ][*A@0+84 null][A@0+84 jinak vr�t� \r\n"
+	"logickou hodnotu 0 (][*A@0+84 nepravda][A@0+84 ).]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 P��klad][A@0+84 `: is_null(10.5) `= 0, is_null(null) \r\n"
+	"`= 1]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$Cis_nullV", LNG_ENGLISH, "\1is_null\1 (\1any data type\1) [S �] \1integer\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 The function returns the logical value 1 (][*A@0+84 true][A@0+84 ) \r\n"
+	"if its parameter is of type][*A@0+84 null][A@0+84 ; otherwise \r\n"
+	"the logical value 0 (][*A@0+84 false][A@0+84 ) is returned.]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 Example][A@0+84 `: is_null(10.5) `= 0, is_null(null) \r\n"
+	"`= 1]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CsqrtN", LNG_CZECH, "\1sqrt\1 (\1re�ln� ��slo\1 [/ x]) [S �] \1re�ln� ��slo\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 Druh� odmocnina. Funkce vr�t� takovou hodnotu ][*/A@0+84 a][A@0+84 , \r\n"
+	"pro kterou ][*/A@0+84 x][*A@0+84  `= ][*/A@0+84 a][*A@0+84  `* \r\n"
+	"][*/A@0+84 a][A@0+84 . Pokud je parametr funkce z�porn�, v�po�et \r\n"
+	"v�razu skon�� s chybou ][A@0+84 chyba p�i v�po�tu v re�ln�ch \r\n"
+	"��slech][*_A@3;3 ERROR`: `[ UNMATCHED`: .`\n"
+	"`\n"
+	"`[`* P��klad`]`: \r\n"
+	"sqrt]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CsqrtN", LNG_ENGLISH, "\1sqrt\1 (\1real number\1 [/ x]) [S �] \1real number\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 real number operation error][*_A@3;3 ERROR`: `[ UNMATCHED`: \r\n"
+	".`\n"
+	"`\n"
+	"`[`* Example`]`: sqrt]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CexpN", LNG_CZECH, "\1exp\1 (\1re�ln� ��slo\1) [S �] \1re�ln� ��slo\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 P�irozen� exponenci�la. V�sledkem funkce je mocnina, \r\n"
+	"jej�m� z�kladem je Eulerovo ��slo ][*A@0+84 e][A@0+84  (viz str._93)][A@0+84  \r\n"
+	"a_exponentem je zadan� re�ln� ��slo.]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 P��klad][A@0+84 `: exp(3.5) `= ][A@0+84 33.11545196]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CexpN", LNG_ENGLISH, "\1exp\1 (\1real number\1) [S �] \1real number\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 Natural exponential. The result of this function is \r\n"
+	"the Euler number ][*A@0+84 e][A@0+84  (viz str._93)][A@0+84  \r\n"
+	"raised to the power given by the argument of ][*A@0+84 exp][A@0+84 .]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 Example][A@0+84 `: exp(3.5) `= ][A@0+84 33.11545196]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$ClnN", LNG_CZECH, "\1ln\1 (\1re�ln� ��slo\1 [/ x]) [S �] \1re�ln� ��slo\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 P�irozen� logaritmus. Funkce vypo�te logaritmus parametru \r\n"
+	"][/A@0+84 x][A@0+84  o_z�kladu ][*A@0+84 e][A@0+84 , tedy takov� \r\n"
+	"re�ln� ��slo ][/A@0+84 a][A@0+84 , pro kter� plat�`: ][*/A@0+84 x][*A@0+84  \r\n"
+	"`= exp(][*/A@0+84 a][*A@0+84 )][A@0+84 .]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 P��klad][A@0+84 `: ln(100) `= ][A@0+84 4.605170186]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$ClnN", LNG_ENGLISH, "\1ln\1 (\1real number\1 [/ x]) [S �] \1real number\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 Natural (hyperbolic) logarithm. The function will calculate \r\n"
+	"the logarithm of the parameter ][/A@0+84 x][A@0+84  with ][*A@0+84 e][A@0+84  \r\n"
+	"as its base, i.e. such real number ][/A@0+84 a][A@0+84  for which \r\n"
+	"][*/A@0+84 x][*A@0+84  `= exp(][*/A@0+84 a][*A@0+84 )][A@0+84 .]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 Example][A@0+84 `: ln(100) `= ][A@0+84 4.605170186]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CarcsinN", LNG_CZECH, "\1arcsin\1 (\1re�ln� ��slo\1 [/ x]) [S �] \1re�ln� ��slo\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 Arkus sinus stanov� takov� �hel ][S@0+84 a][A@0+84  \r\n"
+	"v_rozsahu ][*A@0+84 `[`-][*S@0+84 p][*A@0+84 _`/_2, ][*S@0+84 p][*A@0+84 _`/_2)][A@0+84 ,\r\n"
+	" pro kter� je ][*A@0+84 sin(][*/S@0+84 a][*A@0+84 ) `= ][*/A@0+84 x][A@0+84 . \r\n"
+	"Vypo�ten� �hel funkce vrac� v_radi�nech. Pokud parametr funkce \r\n"
+	"le�� mimo interval ][*A@0+84 `[`-1,1`]][A@0+84 , v�po�et skon�� \r\n"
+	"s chybou ][A@0+84 chyba p�i v�po�tu v re�ln�ch ��slech][A@0+84 .]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 P��klad][A@0+84 `: arcsin(0.5) `= ][A@0+84 0.5235987756]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CarcsinN", LNG_ENGLISH, "\1arcsin\1 (\1real number\1 [/ x]) [S �] \1real number\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 Arcsine returns such an angle ][S@0+84 a][A@0+84  in \r\n"
+	"the range ][*A@0+84 `[`-][*S@0+84 p][*A@0+84  `/ 2, ][*S@0+84 p][*A@0+84  \r\n"
+	"`/ 2)][A@0+84  for which ][*A@0+84 sin(][*/S@0+84 a][*A@0+84 ) \r\n"
+	"`= ][*/A@0+84 x][A@0+84 . The angle is returned in radians. If \r\n"
+	"the function argument lies outside the interval ][*A@0+84 `[`-1,1`]][A@0+84 , \r\n"
+	"the computation is aborted with the error message ][A@0+84 real \r\n"
+	"number operation error][A@0+84 .]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 Example][A@0+84 `: arcsin(0.5) `= ][A@0+84 0.5235987756]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CarccosN", LNG_CZECH, "\1arccos\1 (\1re�ln� ��slo\1 [/ x]) [S �] \1re�ln� ��slo\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 Arkus kosinus stanov� takov� �hel ][S@0+84 a][A@0+84  \r\n"
+	"v_rozsahu ][*A@0+84 `[0, ][*S@0+84 p][*A@0+84 )][A@0+84 , pro \r\n"
+	"kter� je ][*A@0+84 cos(][*/S@0+84 a][*A@0+84 ) `= ][*/A@0+84 x][A@0+84 . \r\n"
+	"Vypo�ten� �hel funkce vrac� v_radi�nech. Pokud parametr funkce \r\n"
+	"le�� mimo interval ][*A@0+84 `[`-1,1`]][A@0+84 , v�po�et skon�� \r\n"
+	"s chybou ][A@0+84 chyba p�i v�po�tu v re�ln�ch ��slech][A@0+84 .]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 P��klad][A@0+84 `: arccos(`-0.5) `= ][A@0+84 2.094395102]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CarccosN", LNG_ENGLISH, "\1arccos\1 (\1real number\1 [/ x]) [S �] \1real number\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 Arccosine returns such an angle ][S@0+84 a][A@0+84  \r\n"
+	"in the range ][*A@0+84 `[0, ][*S@0+84 p][*A@0+84 )][A@0+84  for \r\n"
+	"which ][*A@0+84 cos(][*/S@0+84 a][*A@0+84 ) `= ][*/A@0+84 x][A@0+84 . \r\n"
+	"The angle is returned in radians. If the function argument lies \r\n"
+	"outside the interval ][*A@0+84 `[`-1,1`]][A@0+84 , the computation \r\n"
+	"is aborted with the error message ][A@0+84 real number operation \r\n"
+	"error][A@0+84 .]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 Example][A@0+84 `: arccos(`-0.5) `= ][A@0+84 2.094395102]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CarctgN", LNG_CZECH, "\1arctg\1 (\1re�ln� ��slo\1 [/ x]) [S �] \1re�ln� ��slo\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 Arkus tangens stanov� takov� �hel ][S@0+84 a][A@0+84  \r\n"
+	"v_rozsahu ][*A@0+84 `[`-][*S@0+84 p][*A@0+84 _`/_2, ][*S@0+84 p][*A@0+84 _`/_2)][A@0+84 ,\r\n"
+	" pro kter� je ][*A@0+84 tg(][*/S@0+84 a][*A@0+84 ) `= ][*/A@0+84 x][A@0+84 . \r\n"
+	"Vypo�ten� �hel funkce vrac� v_radi�nech.]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 P��klad][A@0+84 `: arctg(10) `= ][A@0+84 1.471127674]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CarctgN", LNG_ENGLISH, "\1arctg\1 (\1real number\1 [/ x]) [S �] \1real number\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 Arctangent returns such an angle ][S@0+84 a][A@0+84  \r\n"
+	"in the range ][*A@0+84 `[`-][*S@0+84 p][*A@0+84  `/ 2, ][*S@0+84 p][*A@0+84  \r\n"
+	"`/ 2)][A@0+84  for which ][*A@0+84 tg(][*/A@0+84 S a][*A@0+84 ) \r\n"
+	"`= ][*/A@0+84 x][A@0+84 . The calculated angle is returned in \r\n"
+	"radians.]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 Example][A@0+84 `: arctg(10) `= ][A@0+84 1.471127674]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$Cday_of_weekD", LNG_CZECH, "\1day_of_week\1 (\1datum\1) [S �] \1cel� ��slo\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 Funkce vr�t� index dne v_t�dnu pro zadan� datum. Prvn�m \r\n"
+	"dnem v_t�dnu s_indexem 0 je pro tuto funkci ][*A@0+84 ned�le][A@0+84 , \r\n"
+	"posledn�m dnem je ][*A@0+84 sobota][A@0+84  s_indexem 6.]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 P��klad][A@0+84 `: day_of_week(][A@0+84 19.06.2003][A@0+84 ) \r\n"
+	"`= ][A@0+84 4]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$Cday_of_weekD", LNG_ENGLISH, "\1day_of_week\1 (\1date\1) [S �] \1integer\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 The function returns the index of day in week for its \r\n"
+	"date argument. The functions returns 0 for Sunday, 1 for Monday \r\n"
+	"etc. through 6 for Saturday.]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 Example][A@0+84 `: day`_of`_week(][A@0+84 20.06.2003][A@0+84 ) \r\n"
+	"`= ][A@0+84 5]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$Cfirst_day_of_monthD", LNG_CZECH, "\1first_day_of_month\1 (\1datum\1 [/ d]) [S �] \1datum\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 Funkce vr�t� datum prvn�ho dne v m�s�ci ur�en�m parametrem \r\n"
+	"][/A@0+84 d][A@0+84 .]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 P��klad][A@0+84 `: `%1First_day_of_month`%01(18.3.1994) \r\n"
+	"`= 1.3.1994]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$Cfirst_day_of_monthD", LNG_ENGLISH, "\1first_day_of_month\1 (\1date\1 [/ d]) [S �] \1date\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 The function returns first day in month defined by its \r\n"
+	"parameter d.]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 Example][A@0+84 `: first`_day`_of`_month(18.3.1994) \r\n"
+	"`= 1.3.1994]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$Clast_day_of_monthD", LNG_CZECH, "\1last_day_of_month\1 (\1datum\1 [/ d]) [S �] \1datum\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 Funkce vr�t� datum posledn�ho dne v m�s�ci ur�en�m parametrem \r\n"
+	"][/A@0+84 d][A@0+84 .]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 P��klad][A@0+84 `: `%01last_day_of_month`%01(3.2.1999) \r\n"
+	"`= 28.2.1999]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$Clast_day_of_monthD", LNG_ENGLISH, "\1last_day_of_month\1 (\1date\1 [/ d]) [S �] \1date\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 The function returns last day in month defined by its \r\n"
+	"parameter d.]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 Example][A@0+84 `: last`_day`_of`_month(3.2.1999) `= \r\n"
+	"28.2.1999]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CabsN", LNG_CZECH, "\1abs\1 (\1re�ln� ��slo\1) [S �] \1re�ln� ��slo\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 Absolutn� hodnota ��sla. Pokud je ��slo kladn�, jeho \r\n"
+	"absolutn� hodnota je mu rovna. Absolutn� hodnotou z�porn�ho ��sla \r\n"
+	"je ��slo opa�n�.]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 P��klad][A@0+84 `: abs(`-10.5) `= 10.5, abs(12) `= \r\n"
+	"12.]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CabsN", LNG_ENGLISH, "\1abs\1 (\1real number\1) [S �] \1real number\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 Absolute value. If the number is positive, its absolute \r\n"
+	"value is equal to it. The absolute value of a negative number \r\n"
+	"is its inverse.]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 Example][A@0+84 `: abs(`-10.5) `= 10.5, abs(12) `= \r\n"
+	"12.]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CbitAndNN", LNG_CZECH, "oper�tor \1&\1  (\1cel� ��slo\1, \1cel� ��slo\1) [S �] \1cel� ��slo\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 Bitov� sou�in. V�sledkem operace je cel� ��slo, jeho� \r\n"
+	"dvojkov� reprezentace obsahuje jedni�ky na t�ch pozic�ch, na \r\n"
+	"kter�ch jsou ve dvojkov� reprezentaci obou argument� jedni�ky.]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 P��klad][A@0+84 `: 11 `& 13 `= 9 (1011 `& 1101 `= 1001).]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CbitAndNN", LNG_ENGLISH, "operator \1&\1  (\1integer\1, \1integer\1) [S �] \1integer\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 Bit product. The result is the integer whose binary \r\n"
+	"representation consists of ones on those positions on which there \r\n"
+	"are ones in binary representation of both arguments.]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 Example][A@0+84 `: 11 `& 13 `= 9 (1011 `& 1101 `= 1001).]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CbitOrNN", LNG_CZECH, "oper�tor \1|\1  (\1cel� ��slo\1, \1cel� ��slo\1) [S �] \1cel� ��slo\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 Bitov� sou�et. V�sledkem operace je cel� ��slo, jeho� \r\n"
+	"dvojkov� reprezentace obsahuje jedni�ky na t�ch pozic�ch, na \r\n"
+	"kter�ch je ve dvojkov� reprezentaci alespo� jednoho z_argument� \r\n"
+	"jedni�ka.]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 P��klad][A@0+84 `: 1 `| 4 `= 5 (001 `| 100 `= 101).]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CbitOrNN", LNG_ENGLISH, "operator \1|\1  (\1integer\1, \1integer\1) [S �] \1integer\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 Bit addition. The result is the integer whose binary \r\n"
+	"representation consists of 1`'s on those positions on which there \r\n"
+	"is 1 in binary representation of any of its arguments.]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 Example][A@0+84 `: 1 `| 4 `= 5 (001 `| 100 `= 101).]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CbitXorNN", LNG_CZECH, "oper�tor \1^\1  (\1cel� ��slo\1, \1cel� ��slo\1) [S �] \1cel� ��slo\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 Bitov� symetrick� rozd�l (][*A@0+84 xor][A@0+84 ). V�sledkem \r\n"
+	"operace je cel� ��slo, jeho� dvojkov� reprezentace obsahuje jedni�ky \r\n"
+	"na t�ch pozic�ch, na kter�ch se ve dvojkov� reprezentaci obou \r\n"
+	"argument� ��slice li��.]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 P��klad][A@0+84 `: 9 `^ 15 `= 6 (1001 `^ 1111 `= 0110).]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CbitXorNN", LNG_ENGLISH, "operator \1^\1  (\1integer\1, \1integer\1) [S �] \1integer\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 Bit symmetric difference (][*A@0+84 xor][A@0+84 ). The \r\n"
+	"result of the operation is an integer whose binary representation \r\n"
+	"consists of 1`'s on those positions on which the digits in binary \r\n"
+	"representation of its arguments differ.]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 Example][A@0+84 `: 9 `^ 15 `= 6 (1001 `^ 1111 `= 0110).]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CbitNotN", LNG_CZECH, "oper�tor \1~\1  (\1cel� ��slo\1) [S �] \1cel� ��slo\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 Bitov� negace. V�sledkem operace je cel� ��slo, jeho� \r\n"
+	"dvojkov� reprezentace obsahuje jedni�ky pr�v� na t�ch pozic�ch, \r\n"
+	"kde jsou ve dvojkov� reprezentaci argumentu nuly a_naopak. Vzhledem \r\n"
+	"k_tomu, �e v�po�ty s_cel�mi ��sly prob�haj� v_dopl�kov�m k�du, \r\n"
+	"plat�`: ][*A@0+84 `%01`~x_`= `-1 `- x`%01][A@0+84 .]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 P��klad][A@0+84 `: `~14 `= `-15.]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CbitNotN", LNG_ENGLISH, "operator \1~\1  (\1integer\1) [S �] \1integer\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 Bit negation. The result is the integer whose binary \r\n"
+	"representation consists of ones on those positions on which there \r\n"
+	"are zeroes and vice versa in binary representation of the argument. \r\n"
+	"As integer calculations are performed in 0`'s complement code, \r\n"
+	"it is always true that ][*A@0+84 `%01`~x_`= `-1 `- x`%01][A@0+84 .]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 Example][A@0+84 `: `~14 `= `-15.]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CsalNN", LNG_CZECH, "oper�tor \1<<\1  (\1cel� ��slo\1, \1cel� ��slo\1 [/ po�et_bit�]) [S �] \1cel� ��slo\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 Aritmetick� posuv vlevo. V�sledkem operace je cel� ��slo, \r\n"
+	"jeho� dvojkov� reprezentace vznikne posuvem dvojkov� reprezentace \r\n"
+	"��sla na lev� stran� oper�toru vlevo (sm�rem k_vy���m bit�m) \r\n"
+	"o_po�et bit� ur�en� operandem na prav� stran�. Vzhledem k_tomu, \r\n"
+	"�e celo��seln� v�po�ty prob�haj� v_dopl�kov�m k�du, je ][*A@0+84 a_`<`< \r\n"
+	"b_`= a_`* 2 `*`* b][A@0+84 .]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 P��klad][A@0+84 `: 3 `<`< 2 `= 12 (11 `<`< 2 `= 1100).]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CsalNN", LNG_ENGLISH, "operator \1<<\1  (\1integer\1, \1integer\1 [/ bit_count]) [S �] \1integer\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 Arithmetic shift to the left. The result is the integer \r\n"
+	"whose binary representation can be obtained by shifting the binary \r\n"
+	"representation of the left operand ][/A@0+84 bit`_count][A@0+84  \r\n"
+	"times to the left (towards higher bits), adding zeroes to the \r\n"
+	"right. As integer calculations are performed in 0`'s complement \r\n"
+	"code, it is always true (except when the result overflows valid \r\n"
+	"integer range) that ][*A@0+84 a_`<`< b_`= a_`* 2 `*`* b][A@0+84 .]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 Example][A@0+84 `: 3 `<`< 2 `= 12 (11 `<`< 2 `= 1100).]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CsarNN", LNG_CZECH, "oper�tor \1>>\1  (\1cel� ��slo\1, \1cel� ��slo\1 [/ po�et_bit�]) [S �] \1cel� ��slo\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 Aritmetick� posuv vpravo. V�sledkem operace je cel� \r\n"
+	"��slo, jeho� dvojkov� reprezentace vznikne posuvem dvojkov� reprezentace \r\n"
+	"��sla na lev� stran� oper�toru vpravo (sm�rem k_ni���m bit�m) \r\n"
+	"o_po�et bit� ur�en� operandem na prav� stran�. Nejvy��� (znam�nkov�) \r\n"
+	"bit ��sla se p�i posuvu kop�ruje do ni���ch bit�, nejni��� bity \r\n"
+	"��sla se ztrat�. Vzhledem k_tomu, �e celo��seln� v�po�ty prob�haj� \r\n"
+	"v_dopl�kov�m k�du, odpov�d� aritmetick� posuv o_bit vpravo d�len� \r\n"
+	"dv�ma se zaokrouhlov�n�m sm�rem dol�.]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 P��klad][A@0+84 `: 12 `>`> 2 `= 3, `-14 `>`> 3 `= `-2.]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CsarNN", LNG_ENGLISH, "operator \1>>\1  (\1integer\1, \1integer\1 [/ bit_count]) [S �] \1integer\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 Arithmetic shift to the right. The result is the integer \r\n"
+	"whose binary representation will be made by shifting the binary \r\n"
+	"representation of its left operand to the right (towards lower \r\n"
+	"bits) ][/A@0+84 bit`_count][A@0+84  times, discarding lowest \r\n"
+	"bits as necessary and duplicating the highest bit (sign bit) \r\n"
+	"of the left operand. As integer calculations are performed in \r\n"
+	"0`'s complement code, the arithmetic shift to the right by a \r\n"
+	"bit equals division by two with rounding towards minus infinity.]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 Example][A@0+84 `: 12 `>`> 2 `= 3, `-14 `>`> 3 `= `-2.]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CmulNN", LNG_CZECH, "oper�tor \1*\1  (\1re�ln� ��slo\1, \1re�ln� ��slo\1) [S �] \1re�ln� ��slo\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 Sou�in re�ln�ch ��sel.]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 P��klad][A@0+84 `: 17 `* 15 `= 255.]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CmulNN", LNG_ENGLISH, "operator \1*\1  (\1real number\1, \1real number\1) [S �] \1real number\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 The product of two real numbers.]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 Example][A@0+84 `: 17 `* 15 `= 255.]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CmulNS", LNG_CZECH, "oper�tor \1*\1  (\1cel� ��slo\1 [/ po�et], \1�et�zec\1 [/ text]) [S �] \1�et�zec\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 Opakov�n� textu. V�sledkem sou�inu �et�zce a_cel�ho \r\n"
+	"��sla je �et�zec, kter� vznikne opakov�n�m p�vodn�ho �et�zce \r\n"
+	"][/A@0+84 text][A@0+84  tolikr�t, kolik ud�v� ][/A@0+84 po�et][A@0+84 . \r\n"
+	"Pokud je ][/A@0+84 po�et][A@0+84  `<`= 0, v�sledkem operace je \r\n"
+	"pr�zdn� �et�zec.]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 P��klad][A@0+84 `: `\"znak`\" `* 5 `= `\"znakznakznakznakznak`\".]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CmulNS", LNG_ENGLISH, "operator \1*\1  (\1integer\1 [/ count], \1string\1 [/ text]) [S �] \1string\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 Text repetition. The result of a multiplying a ][*A@0+84 text][A@0+84  \r\n"
+	"value by an integer value ][*A@0+84 count][A@0+84  is a string \r\n"
+	"containing the original ][*A@0+84 text][A@0+84  repeated ][*A@0+84 count][A@0+84  \r\n"
+	"times. When ][*A@0+84 count][A@0+84  `<`= 0, the result is the \r\n"
+	"empty string.]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 Example][A@0+84 `: `\"text`\" `* 5 `= `\"texttexttexttexttext`\".]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CdivNN", LNG_CZECH, "oper�tor \1/\1  (\1re�ln� ��slo\1, \1re�ln� ��slo\1) [S �] \1re�ln� ��slo\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 D�len�. Pokud je na prav� stran� oper�toru nula, v�po�et \r\n"
+	"v�razu ohl�s� chybu ][*A@0+84 d�len� nulou][A@0+84 .]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 P��klad][A@0+84 `: 3.7 `/ 2.5 `= 1.48.]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CdivNN", LNG_ENGLISH, "operator \1/\1  (\1real number\1, \1real number\1) [S �] \1real number\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 Real number division. If the right operand equals zero, \r\n"
+	"the computation aborts with the error ][*A@0+84 division by zero][A@0+84 .]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 Example][A@0+84 `: 3.7 `/ 2.5 `= 1.48.]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CmodNN", LNG_CZECH, "oper�tor \1%\1  (\1re�ln� ��slo\1 [/ a], \1re�ln� ��slo\1 [/ b]) [S �] \1re�ln� ��slo\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 Zbytek po d�len�. Oper�tor ur�� nejmen�� nez�porn� ��slo \r\n"
+	"ze v�ech ��sel, kter� lze z�skat p�i�ten�m nebo ode�ten�m celo��seln�ho \r\n"
+	"n�sobku hodnoty ][/A@0+84 b][A@0+84  k_hodnot� ][/A@0+84 a][A@0+84 . \r\n"
+	"Pokud je na prav� stran� oper�toru nula, v�po�et v�razu ohl�s� \r\n"
+	"chybu ][*A@0+84 d�len� nulou][A@0+84 .]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 P��klad][A@0+84 `: 10.5 `% 2.4 `= 0.9 (10.5 `= 4 `* \r\n"
+	"2.4 `+ 0.9).]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CmodNN", LNG_ENGLISH, "operator \1%\1  (\1real number\1 [/ a], \1real number\1 [/ b]) [S �] \1real number\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 Division remainder. The operator determines the least \r\n"
+	"non`-negative real number which can be obtained by adding or \r\n"
+	"subtraction any integral multiples of ][/A@0+84 b][A@0+84  to \r\n"
+	"value ][/A@0+84 a][A@0+84 . If ][/A@0+84 b][A@0+84  zero, the \r\n"
+	"computation aborts with the error ][*A@0+84 division by zero][A@0+84 .]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 Example][A@0+84 `: 10.5 `% 2.4 `= 0.9 (10.5 `= 4 `* \r\n"
+	"2.4 `+ 0.9).]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$Ce0", LNG_CZECH, "\1e\1 [S �] \1re�ln� ��slo\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 Eulerova konstanta ur�uje z�klad exponenci�ly a_p�irozen�ho \r\n"
+	"logaritmu. Je p�ibli�n� rovna 2.718281828.]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$Ce0", LNG_ENGLISH, "\1e\1 [S �] \1real number\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 Euler constant is the base of natural exponential and \r\n"
+	"the natural logarithm. It equals approximately 2.718281828.]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$Cpi0", LNG_CZECH, "\1pi\1 [S �] \1re�ln� ��slo\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 Ludolfovo ��slo ][S@0+84 p][A@0+84  ur�uje polovinu \r\n"
+	"d�lky obvodu jednotkov� kru�nice (][*A@0+84 l_`= 2][*S@0+84 p][*A@0+84 r][A@0+84 )\r\n"
+	".]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$Cpi0", LNG_ENGLISH, "\1pi\1 [S �] \1real number\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 Ludolf number ][S@0+84 p][A@0+84  represents half the \r\n"
+	"circumference of the unit circle (][*A@0+84 l_`= 2][*S@0+84 p][*A@0+84 r][A@0+84 )\r\n"
+	".]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CsgnN", LNG_CZECH, "\1sgn\1 (\1re�ln� ��slo\1 [/ x]) [S �] \1cel� ��slo\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 Znam�nko. V�po�et znam�nka prob�h� podle n�sleduj�c� \r\n"
+	"tabulky`:]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 P��klad][A@0+84 `: sgn(`-13.5) `= `-1, sgn(0) `= 0, \r\n"
+	"sgn(10) `= `+1.]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CsgnN", LNG_ENGLISH, "\1sgn\1 (\1real number\1 [/ x]) [S �] \1integer\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 Sign. The sign computation is based on the following \r\n"
+	"table`:]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 Example][A@0+84 `: sgn(`-13.5) `= `-1, sgn(0) `= 0, \r\n"
+	"sgn(10) `= `+1.]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CascS", LNG_CZECH, "\1asc\1 (\1�et�zec\1) [S �] \1cel� ��slo\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 Funkce vr�t� ASCII`-k�d prvn�ho znaku zadan�ho textu. \r\n"
+	"Pokud je text pr�zdn�, funkce vr�t� hodnotu 0.]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 P��klad][A@0+84 `: asc(`\"ahoj`\") `= 97 ][/A@0+84 (k�d \r\n"
+	"znaku `'a`')][A@0+84 .]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CascS", LNG_ENGLISH, "\1asc\1 (\1string\1) [S �] \1integer\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 The function will return ASCII`-code of the first character \r\n"
+	"of its string argument. If the argument is empty, the function \r\n"
+	"will return 0.]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 Example][A@0+84 `: asc(`\"hello`\") `= 104 ][/A@0+84 (ASCII \r\n"
+	"code of the character `'h`')][A@0+84 .]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CchrN", LNG_CZECH, "\1chr\1 (\1cel� ��slo\1 [/ ascii]) [S �] \1�et�zec\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 Funkce vr�t� jednoznakov� �et�zec, obsahuj�c� znak s_ASCII`-k�dem \r\n"
+	"][/A@0+84 ascii][A@0+84 .]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 P��klad][A@0+84 `: chr(66) `= `\"B`\".]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CchrN", LNG_ENGLISH, "\1chr\1 (\1integer\1 [/ ascii]) [S �] \1string\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 The function will return one`-character string containing \r\n"
+	"the character with the ASCII`-code ascii.]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 Example][A@0+84 `: chr(66) `= `\"B`\".]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CcountNS", LNG_CZECH, "\1count\1 (\1cel� ��slo\1, \1�et�zec\1) [S �] \1�et�zec\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 Funkce vr�t� textovou reprezentaci des�tkov�ho z�pisu \r\n"
+	"��seln� hodnoty s p�ipojen�m podstatn�m jm�nem. V �et�zci podstatn�ho \r\n"
+	"jm�na lze lom�tkem odd�lit p��pony pro singul�r, plur�l a genitiv \r\n"
+	"plur�lu, kter� se v �esk�m jazyce pou��vaj� k vyj�d�en� po�tu \r\n"
+	"1, 2`/3`/4 a 5 (podle posledn� ��slice po�tu).]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 P��klad][A@0+84 `: count(62, `\"koz`/a`/y`/`\") `= `\"62 \r\n"
+	"kozy`\", count(61, `\"koz`/a`/y`/`\") `= `\"61 koza`\".]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CcountNS", LNG_ENGLISH, "\1count\1 (\1integer\1, \1string\1) [S �] \1string\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 The function returns text representation of decimal \r\n"
+	"notation of its numeric value together with the attached noun. \r\n"
+	"In the noun string, the forward slash can separate the suffixes \r\n"
+	"of singular and plural used in English to distinguish between \r\n"
+	"a single object and multiple objects.]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 Example][A@0+84 `: count(1, `\"m`/ouse`/ice`\") `= `\"1 \r\n"
+	"mouse`\", count(2, `\"m`/ouse`/ice`\") `= `\"2 mice`\".]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CleftSN", LNG_CZECH, "\1left\1 (\1�et�zec\1 [/ text], \1cel� ��slo\1 [/ po�et_znak�]) [S �] \1�et�zec\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 Funkce vr�t� zadan� ][/A@0+84 po�et znak�][A@0+84  ze \r\n"
+	"za��tku zadan�ho �et�zce ][/A@0+84 text][A@0+84 . Pokud je po�et \r\n"
+	"znak� men�� nebo roven 0, v�sledkem funkce je pr�zdn� �et�zec. \r\n"
+	"Pokud je po�et znak� v�t�� ne� d�lka �et�zce, funkce vr�t� zadan� \r\n"
+	"�et�zec beze zm�ny.]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 P��klad][A@0+84 `: left(`\"ahoj sv�te`\", 6) `= `\"ahoj \r\n"
+	"s`\"]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CleftSN", LNG_ENGLISH, "\1left\1 (\1string\1 [/ text], \1integer\1 [/ character_count]) [S �] \1string\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 The function returns first ][/A@0+84 character`_count][A@0+84  \r\n"
+	"characters of its argument ][/A@0+84 text][A@0+84 . If the number \r\n"
+	"of characters is less or equal to 0, the function returns an \r\n"
+	"empty string. If the character count is greater than the string \r\n"
+	"length, the function will return the original argument unchanged.]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 Example][A@0+84 `: left(`\"hello world`\", 7) `= `\"hello \r\n"
+	"w`\"]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CrightSN", LNG_CZECH, "\1right\1 (\1�et�zec\1 [/ text], \1cel� ��slo\1 [/ po�et_znak�]) [S �] \1�et�zec\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 Funkce vr�t� zadan� ][/A@0+84 po�et znak�][A@0+84  z_konce \r\n"
+	"�et�zce ][/A@0+84 text][A@0+84 . Pokud je po�et znak� men�� nebo \r\n"
+	"roven 0, v�sledkem funkce je pr�zdn� �et�zec. Pokud je po�et \r\n"
+	"znak� v�t�� ne� d�lka �et�zce, funkce vr�t� zadan� �et�zec beze \r\n"
+	"zm�ny.]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 P��klad][A@0+84 `: right(`\"ahoj sv�te`\", 7) `= `\"j_sv�te`\"]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CrightSN", LNG_ENGLISH, "\1right\1 (\1string\1 [/ text], \1integer\1 [/ character_count]) [S �] \1string\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 The function returns last ][/A@0+84 character`_count][A@0+84  \r\n"
+	"characters of its string argument ][/A@0+84 text][A@0+84 . If \r\n"
+	"the number of characters is less or equal to 0, the function \r\n"
+	"returns an empty string. If the character count is greater than \r\n"
+	"the string length, the function returns its ][/A@0+84 text][A@0+84  \r\n"
+	"argument unchanged.]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 Example][A@0+84 `: right(`\"hello world`\", 7) `= `\"o \r\n"
+	"world`\"]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CcatSSS", LNG_CZECH, "\1cat\1 (\1�et�zec\1 [/ text_1], \1�et�zec\1 [/ mezi], \1�et�zec\1 [/ text_2]) [S �] \1�et�zec\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 Funkce spoj� zadan� �et�zce ][/A@0+84 text`_1][A@0+84  \r\n"
+	"a ][/A@0+84 text`_2][A@0+84 . Pokud jsou oba �et�zce nepr�zdn�, \r\n"
+	"vlo�� se mezi n� �et�zec ][/A@0+84 mezi][A@0+84 .]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 P��klad][A@0+84 `: cat(`\"ahoj`\", `\" `\", `\"sv�te`\") \r\n"
+	"`= `\"ahoj sv�te`\", cat(`\"`\", `\" `\", `\"sv�te`\") `= `\"sv�te`\"]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CcatSSS", LNG_ENGLISH, "\1cat\1 (\1string\1 [/ text_1], \1string\1 [/ join], \1string\1 [/ text_2]) [S �] \1string\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 The function concatenates its arguments ][/A@0+84 text`_1][A@0+84  \r\n"
+	"and ][/A@0+84 text`_2][A@0+84 . If neither string is empty, the \r\n"
+	"string ][/A@0+84 join][A@0+84  is inserted between them.]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 Example][A@0+84 `: cat(`\"hello`\", `\" `\", `\"world`\") \r\n"
+	"`= `\"hello world`\", cat(`\"`\", `\" `\", `\"world`\") `= `\"world`\"]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$Cyears_betweenDD", LNG_CZECH, "\1years_between\1 (\1datum\1 [/ d1], \1datum\1 [/ d2]) [S �] \1cel� ��slo\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 Funkce ur�� po�et let, kter� le�� mezi zadan�mi dv�ma \r\n"
+	"daty (v�k osoby, narozen� dne ][/A@0+84 d1][A@0+84 , ke dni ][/A@0+84 d2][A@0+84 )\r\n"
+	".]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 P��klad][A@0+84 `: years_between(25.1.1974, 27.12.1999) \r\n"
+	"`= 25]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$Cyears_betweenDD", LNG_ENGLISH, "\1years_between\1 (\1date\1 [/ d1], \1date\1 [/ d2]) [S �] \1integer\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 The function returns number of years between its date \r\n"
+	"arguments (the age of a person born on ][/A@0+84 d1][A@0+84  \r\n"
+	"at the date of ][/A@0+84 d2][A@0+84 ).]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 Example][A@0+84 `: years_between(25.1.1974, 27.12.1999) \r\n"
+	"`= 25]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$Cnull0", LNG_CZECH, "\1null\1 [S �] \1pr�zdn� hodnota\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 Pr�zdn� hodnota. P�i v�po�tech operac� a_vol�n� funkc� \r\n"
+	"se pr�zdn� hodnota ][/A@0+84 propaguje][A@0+84  z_podv�razu`: \r\n"
+	"pokud libovoln� z_operand� nebo libovoln� z_parametr� funkce \r\n"
+	"obsahuje pr�zdnou hodnotu, v�sledkem operace nebo funkce je op�t \r\n"
+	"pr�zdn� hodnota. V�jimkou z_tohoto pravidla jsou speci�ln� oper�tory \r\n"
+	"][*A@0+84 ?`:][A@0+84 , ][*A@0+84 `|`|][A@0+84 , ][*A@0+84 `&`&][A@0+84 , \r\n"
+	"][*A@0+84 `=`=][A@0+84 , ][*A@0+84 `!`=][A@0+84  a_d�le funkce \r\n"
+	"][*A@0+84 is_number][A@0+84 , ][*A@0+84 is_text][A@0+84 , ][*A@0+84 is_date][A@0+84  \r\n"
+	"a_][*A@0+84 is_null][A@0+84 , kter� pr�zdn� hodnoty zpracov�vaj� \r\n"
+	"speci�ln�m zp�sobem.]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 P��klad][A@0+84 `: 10 `+ null `= null]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$Cnull0", LNG_ENGLISH, "\1null\1 [S �] \1empty value\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 Null value. During calculation the null value usually \r\n"
+	"propagates from the subexpression`: if any of the operands or \r\n"
+	"function parameters contains the null value, the result of the \r\n"
+	"operation or of the function is null as well. A few exceptions \r\n"
+	"to this rule include special operators ][*A@0+84 ?`:][A@0+84 , \r\n"
+	"][*A@0+84 `|`|][A@0+84 , ][*A@0+84 `&`&][A@0+84 , ][*A@0+84 `=`=][A@0+84 , \r\n"
+	"][*A@0+84 `!`=][A@0+84  and also the functions ][*A@0+84 is_number][A@0+84 , \r\n"
+	"][*A@0+84 is_text][A@0+84 , ][*A@0+84 is_date][A@0+84 , and_][*A@0+84 is_null][A@0+84 ,\r\n"
+	" which process null values differently.]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 Example][A@0+84 `: 10 `+ null `= null]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$Cis_dateV", LNG_CZECH, "\1is_date\1 (\1libovoln� typ\1) [S �] \1cel� ��slo\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 Funkce vr�t� logickou hodnotu 1 (][*A@0+84 pravda][A@0+84 ), \r\n"
+	"kdy� zadan� parametr je typu ][*A@0+84 datum][A@0+84 . Pokud \r\n"
+	"je parametr jin�ho typu nebo obsahuje pr�zdnou hodnotu, funkce \r\n"
+	"vr�t� hodnotu 0 (][*A@0+84 nepravda][A@0+84 ).]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 P��klad][A@0+84 `: is_date(10.5) `= 0, is_date(23.5.1997) \r\n"
+	"`= 1, is_date(`\"ahoj`\") `= 0]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$Cis_dateV", LNG_ENGLISH, "\1is_date\1 (\1any data type\1) [S �] \1integer\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 The function returns the logical value 1 (][*A@0+84 true][A@0+84 ) \r\n"
+	"if its argument is a date. If the argument is of a different \r\n"
+	"type or if it contains the null value, the function returns 0 \r\n"
+	"(][*A@0+84 false][A@0+84 ).]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 Example][A@0+84 `: is`_date(10.5) `= 0, is`_date(23.5.1997) \r\n"
+	"`= 1, is`_date(`\"hi`\") `= 0]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CnvlVV", LNG_CZECH, "\1nvl\1 (\1libovoln� typ\1, \1libovoln� typ\1) [S �] \1libovoln� typ\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 Funkce vr�t� hodnotu sv�ho prvn�ho parametru, tato hodnota \r\n"
+	"nen� pr�zdn� (][*A@0+84 null][A@0+84 ). Pokud prvn� parametr \r\n"
+	"obsahuje pr�zdnou hodnotu, funkce vr�t� hodnotu druh�ho parametru.]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 P��klad][A@0+84 `: nvl(`\"prvni`\", `\"druhy`\") `= `\"prvni`\", \r\n"
+	"nvl(`\"`\", `\"druhy`\") `= `\"druhy`\"]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CnvlVV", LNG_ENGLISH, "\1nvl\1 (\1any data type\1, \1any data type\1) [S �] \1any data type\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 This function returns its first parameter if it is not \r\n"
+	"][*A@0+84 null][A@0+84 . If the first parameter is ][*A@0+84 null][A@0+84  \r\n"
+	"the function returns its second parameter.]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 Example][A@0+84 `: nvl(`\"first`\", `\"second`\") `= `\"first`\", \r\n"
+	"nvl(`\"`\", `\"second`\") `= `\"second`\"]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CsqrN", LNG_CZECH, "\1sqr\1 (\1re�ln� ��slo\1 [/ x]) [S �] \1re�ln� ��slo\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 Druh� mocnina. Funkce vr�t� hodnotu ][*A@0+84 sqr(][*/A@0+84 x][*A@0+84 )\r\n"
+	" `= ][*/A@0+84 x][*A@0+84  `* ][*/A@0+84 x][A@0+84 .]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 P��klad][A@0+84 `: sqr(12) `= 144]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CsqrN", LNG_ENGLISH, "\1sqr\1 (\1real number\1 [/ x]) [S �] \1real number\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 Square. The function returns the value ][*A@0+84 sqr(][*/A@0+84 x][*A@0+84 )\r\n"
+	" `= ][*/A@0+84 x][*A@0+84  `* ][*/A@0+84 x][A@0+84 .]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 Example][A@0+84 `: sqr(12) `= 144]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$ChypotNN", LNG_CZECH, "\1hypot\1 (\1re�ln� ��slo\1 [/ x], \1re�ln� ��slo\1 [/ y]) [S �] \1re�ln� ��slo\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 D�lka p�epony pravo�hl�ho troj�heln�ka. V�po�et p�epony \r\n"
+	"se prov�d� podle Pythagorovy v�ty`: ][*A@0+84 hypot(][*/A@0+84 x][*A@0+84 , \r\n"
+	"][*/A@0+84 y][*A@0+84 ) `= sqrt(][*/A@0+84 x][*A@0+84  `* ][*/A@0+84 x][*A@0+84  \r\n"
+	"`+ ][*/A@0+84 y][*A@0+84  `* ][*/A@0+84 y][*A@0+84 )][A@0+84 .]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 P��klad][A@0+84 `: hypot(3, 4) `= 5]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$ChypotNN", LNG_ENGLISH, "\1hypot\1 (\1real number\1 [/ x], \1real number\1 [/ y]) [S �] \1real number\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 The length of the hypotenuse of the right`-angled triangle. \r\n"
+	"The hypotenuse is calculated using the Pythagoras theorem, ][*A@0+84 hypot(][*/A@0+84 x\r\n"
+	"][*A@0+84 , ][*/A@0+84 y][*A@0+84 ) `= sqrt(][*/A@0+84 x][*A@0+84  \r\n"
+	"`* ][*/A@0+84 x][*A@0+84  `+ ][*/A@0+84 y][*A@0+84  `* ][*/A@0+84 y][*A@0+84 )][A@0+84 .\r\n"
+	"]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 Example][A@0+84 `: hypot(3, 4) `= 5]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CpowNN", LNG_CZECH, "\1pow\1 (\1re�ln� ��slo\1 [/ z�klad], \1re�ln� ��slo\1 [/ exponent]) [S �] \1re�ln� ��slo\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 Re�ln� mocnina. Pokud je ][/A@0+84 exponent][A@0+84  \r\n"
+	"celo��seln�, sm� b�t ][/A@0+84 z�klad][A@0+84  mocniny i_z�porn�. \r\n"
+	"]]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 P��klad][A@0+84 `: pow(3, 4) `= 81]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CpowNN", LNG_ENGLISH, "\1pow\1 (\1real number\1 [/ base], \1real number\1 [/ exponent]) [S �] \1real number\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 Real power function. If the exponent is an integer, \r\n"
+	"the base of the power may be negative. Calling ][*A@0+84 pow][A@0+84  \r\n"
+	"with a negative or zero base and a non`-integal exponent aborts \r\n"
+	"the computation with the error message ][*A@0+84 real number \r\n"
+	"computation error][A@0+84 .]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 Example][A@0+84 `: pow(3, 4) `= 81]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$ClogN", LNG_CZECH, "\1log\1 (\1re�ln� ��slo\1 [/ x]) [S �] \1re�ln� ��slo\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 Dekadick� logaritmus. Funkce vypo�te logaritmus parametru \r\n"
+	"][/A@0+84 x][A@0+84  o_z�kladu 10, tedy takov� re�ln� ��slo ][/A@0+84 a][A@0+84 ,\r\n"
+	" pro kter� plat�`: ][*/A@0+84 x][*A@0+84  `= pow(10, ][*/A@0+84 a][*A@0+84 )][A@0+84 .\r\n"
+	"]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 P��klad][A@0+84 `: log(1000) `= 3]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$ClogN", LNG_ENGLISH, "\1log\1 (\1real number\1 [/ x]) [S �] \1real number\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 Decadic logarithm. The function calculates the logarithm \r\n"
+	"of the parameter ][/A@0+84 x][A@0+84  with 10 as its base, i.e. \r\n"
+	"such ][/A@0+84 a][A@0+84  for which ][*/A@0+84 x][*A@0+84  `= \r\n"
+	"pow(10, ][*/A@0+84 a][*A@0+84 )][A@0+84 .]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 Example][A@0+84 `: log(1000) `= 3]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CsinN", LNG_CZECH, "\1sin\1 (\1re�ln� ��slo\1 [/ [S a]]) [S �] \1re�ln� ��slo\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 Funkce stanov� sinus �hlu, tedy pod�l d�lky protilehl� \r\n"
+	"odv�sny a_p�epony v_pravo�hl�m troj�heln�ku s_odv�snov�m �hlem \r\n"
+	"][S@0+84 a][A@0+84 . �hel se zad�v� v_radi�nech, tak�e pln� �hel \r\n"
+	"m� velikost 2][S@0+84 p][A@0+84 .]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 P��klad][A@0+84 `: sin(3 `* pi `/ 2) `= `-1]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CsinN", LNG_ENGLISH, "\1sin\1 (\1real number\1 [/ [S a]]) [S �] \1real number\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 The function calculates the sine of the angle ][S@0+84 a][A@0+84 , \r\n"
+	"i.e. the ratio of the length of the opposite leg and the length \r\n"
+	"of the hypotenuse in a right`-angled triangle with the leg angle \r\n"
+	"][S@0+84 a][A@0+84 . The input angle is assumed to be in radians, \r\n"
+	"therefore the perigon equals 2][S@0+84 p][A@0+84 .]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 Example][A@0+84 `: sin(3 `* pi `/ 2) `= `-1]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CcosN", LNG_CZECH, "\1cos\1 (\1re�ln� ��slo\1 [/ [S a]]) [S �] \1re�ln� ��slo\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 Funkce stanov� kosinus �hlu, tedy pod�l d�lky p�ilehl� \r\n"
+	"odv�sny a_p�epony v_pravo�hl�m troj�heln�ku s_odv�snov�m �hlem \r\n"
+	"][S@0+84 a][A@0+84 . �hel se zad�v� v_radi�nech, tak�e pln� �hel \r\n"
+	"m� velikost 2][S@0+84 p][A@0+84 .]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 P��klad][A@0+84 `: cos(pi) `= `-1]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CcosN", LNG_ENGLISH, "\1cos\1 (\1real number\1 [/ [S a]]) [S �] \1real number\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 The function calculates the cosine of the angle ][S@0+84 a][A@0+84 , \r\n"
+	"i.e. the ratio of the length of the adjacent leg and the length \r\n"
+	"of the hypotenuse in a right`-angled triangle with the leg angle \r\n"
+	"][S@0+84 a][A@0+84 . The input angle is assumed to be in radians, \r\n"
+	"therefore the perigon equals 2][S@0+84 p][A@0+84 .]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 Example][A@0+84 `: cos(pi) `= `-1]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CtgN", LNG_CZECH, "\1tg\1 (\1re�ln� ��slo\1 [/ [S a]]) [S �] \1re�ln� ��slo\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 Tangens �hlu je pod�l d�lky protilehl� a_p�ilehl� odv�sny \r\n"
+	"v_pravo�hl�m troj�heln�ku s_odv�snov�m �hlem ][S@0+84 a][A@0+84 . \r\n"
+	"�hel se zad�v� v_radi�nech, tak�e pln� �hel m� velikost 2][S@0+84 p][A@0+84 .]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 P��klad][A@0+84 `: tg(pi `/ 4) `= 1]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CtgN", LNG_ENGLISH, "\1tg\1 (\1real number\1 [/ [S a]]) [S �] \1real number\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 Tangent of an angle is the ratio of the length of the \r\n"
+	"opposite leg and the length of the adjacent leg right`-angled \r\n"
+	"triangle with the leg angle ][S@0+84 a][A@0+84 . The input angle \r\n"
+	"is assumed to be in radians (the perigon equals 2][S@0+84 p][A@0+84 ).]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 Example][A@0+84 `: tg(pi `/ 4) `= 1]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CtextA", LNG_CZECH, "")
+	HELP_TOPIC_TEXT(
+	"Funkce p�evede zadan� pole na standardn� textovou reprezentaci ve tvaru\r\n"
+	"&\r\n"
+	"&`[[/ prvn� prvek, druh� prvek, t�et� prvek...]`]\r\n"
+	"&\r\n"
+	"&[* P��klad:[*  `[0.0, 1.0, 2.5`].text = \"`[0, 1, 2.5`]\"]]")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CtextA", LNG_ENGLISH, "")
+	HELP_TOPIC_TEXT(
+	"Function converts an array to its standard textual representation in the format\r\n"
+	"&\r\n"
+	"&`[[/ first element, second element, third element...]`]\r\n"
+	"&\r\n"
+	"&[* Example:[*   `[0.0, 1.0, 2.5`].text = \"`[0, 1, 2.5`]\"]]")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CdayD", LNG_CZECH, "")
+	HELP_TOPIC_TEXT(
+	"[{0} \r\n"
+	"[s0; [Idatum`, funkce;2 Funkce][2  vr�t� ��slo dne v m�s�ci pro zadan� \r\n"
+	"datum.]]\r\n"
+	"&\r\n"
+	"[s0;2 ]\r\n"
+	"&\r\n"
+	"[s0; [*2 P��klad`: den(27.5.1984) `= 27]]\r\n"
+	"]")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CdayD", LNG_ENGLISH, "")
+	HELP_TOPIC_TEXT(
+	"[{2}\r\n"
+	"[s0; [2 The function returns the day number of its argument.]]\r\n"
+	"&\r\n"
+	"[s0;2 ]\r\n"
+	"&\r\n"
+	"[s0; [*2 Example`: day(27.5.1984) `= 27]]\r\n"
+	"]")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CmonthD", LNG_CZECH, "")
+	HELP_TOPIC_TEXT(
+	"[{0}\r\n"
+	"[s0; [2 Funkce vr�t� ��slo m�s�ce v roce pro zadan� datum.]]\r\n"
+	"&\r\n"
+	"[s0;2 ]\r\n"
+	"&\r\n"
+	"[s0; [*2 P��klad`: month(27.5.1984) `= 5]]\r\n"
+	"]")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CmonthD", LNG_ENGLISH, "")
+	HELP_TOPIC_TEXT(
+	"The function returns the month number of its argument.\r\n"
+	"&\r\n"
+	"&[* Example[* : mesic(27.5.1984) = 5]]")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CyearD", LNG_CZECH, "")
+	HELP_TOPIC_TEXT(
+	"Funkce vr�t� ��slo roku pro zadan� datum.\r\n"
+	"&\r\n"
+	"&[* P��klad[* : rok(27.5.1984) = 1984]]")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CyearD", LNG_ENGLISH, "")
+	HELP_TOPIC_TEXT(
+	"The function returns the year number of its argument.\r\n"
+	"&\r\n"
+	"&[* Example[* : rok(27.5.1984) = 1984]]")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CaddAA", LNG_CZECH, "oper�tor \1+\1  (\1pole hodnot\1, \1pole hodnot\1) [S �] \1pole hodnot\1")
+	HELP_TOPIC_TEXT(
+	"[3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0} \r\n"
+	"[s0;2 Oper�tor spoj� dv� pole (za�ad� jejich jednotliv� prvky za \r\n"
+	"sebe).")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CaddAA", LNG_ENGLISH, "operator \1+\1  (\1pole hodnot\1, \1pole hodnot\1) [S �] \1pole hodnot\1")
+	HELP_TOPIC_TEXT(
+	"\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CsumA", LNG_CZECH, "\1sum\1 (\1pole hodnot\1) [S �] \1libovoln� typ\1")
+	HELP_TOPIC_TEXT(
+	"\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CsumA", LNG_ENGLISH, "\1sum\1 (\1pole hodnot\1) [S �] \1any data type\1")
+	HELP_TOPIC_TEXT(
+	"\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CmulAC", LNG_CZECH, "")
+	HELP_TOPIC_TEXT(
+	"[{0}\r\n"
+	"[s0; [2 Oper�tor pro ka�d� prvek zadan�ho pole vyhodnot� ][/2 lambda`-v�raz][2  \r\n"
+	"a vr�t� pole obsahuj�c� v�sledky t�chto v�po�t�. V�sledn� pole \r\n"
+	"m� v�dy stejn� po�et prvk� jako vstupn� pole. P�i vyhodnocov�n� \r\n"
+	"][/2 lambda`-v�razu][2  je pro ka�d� prvek p�vodn�ho pole prom�nn� \r\n"
+	"kalkul�toru ][*2 I][2  nastaven� na index tohoto prvku v poli \r\n"
+	"(prvn� prvek pole m� index 0), prom�nn� ][*2 A][2  obsahuje hodnotu \r\n"
+	"zpracov�van�ho prvku.]]\r\n"
+	"&\r\n"
+	"[s0;2 ]\r\n"
+	"&\r\n"
+	"[s0; [*2 P��klad`: `[1, 2, 3, 4`] `* `#(A `* A) `= `[1, 4, 9, 16`]]]\r\n"
+	"]")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CmulAC", LNG_ENGLISH, "")
+	HELP_TOPIC_TEXT(
+	"The binary operator [* *] evaluates the [/ lambda-expression] for each element of the original array"
+	" and returns an array composed of the results. The output array has always the same number of elemen"
+	"ts as the input array. During evaluation of the lambda-expression for each input array element the c"
+	"alculator variable [* I] is set to the index of the current array element (first array element has i"
+	"ndex 0) and the variable [* A] contains the value of the array element being processed.")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CcountA", LNG_CZECH, "\1count\1 (\1pole hodnot\1) [S �] \1cel� ��slo\1")
+	HELP_TOPIC_TEXT(
+	"\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CcountA", LNG_ENGLISH, "\1count\1 (\1pole hodnot\1) [S �] \1integer\1")
+	HELP_TOPIC_TEXT(
+	"\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CleftAN", LNG_CZECH, "\1left\1 (\1pole hodnot\1, \1cel� ��slo\1) [S �] \1pole hodnot\1")
+	HELP_TOPIC_TEXT(
+	"\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CleftAN", LNG_ENGLISH, "\1left\1 (\1pole hodnot\1, \1integer\1) [S �] \1pole hodnot\1")
+	HELP_TOPIC_TEXT(
+	"\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CrightAN", LNG_CZECH, "\1right\1 (\1pole hodnot\1, \1cel� ��slo\1 [/ po�et]) [S �] \1pole hodnot\1")
+	HELP_TOPIC_TEXT(
+	"[3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0} \r\n"
+	"[s0;2 Funkce vr�t� posledn�ch [/ po�et] hodnot z_konce zadan�ho pole.")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CrightAN", LNG_ENGLISH, "\1right\1 (\1pole hodnot\1, \1integer\1) [S �] \1pole hodnot\1")
+	HELP_TOPIC_TEXT(
+	"\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CmidANN", LNG_CZECH, "\1mid\1 (\1pole hodnot\1, \1cel� ��slo\1, \1cel� ��slo\1) [S �] \1pole hodnot\1")
+	HELP_TOPIC_TEXT(
+	"\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CmidANN", LNG_ENGLISH, "\1mid\1 (\1pole hodnot\1, \1integer\1, \1integer\1) [S �] \1pole hodnot\1")
+	HELP_TOPIC_TEXT(
+	"\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CmidAN", LNG_CZECH, "\1mid\1 (\1pole hodnot\1, \1cel� ��slo\1) [S �] \1pole hodnot\1")
+	HELP_TOPIC_TEXT(
+	"\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CmidAN", LNG_ENGLISH, "\1mid\1 (\1pole hodnot\1, \1integer\1) [S �] \1pole hodnot\1")
+	HELP_TOPIC_TEXT(
+	"\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CarrayCtr", LNG_CZECH, "")
+	HELP_TOPIC_TEXT(
+	"[{0} \r\n"
+	"[s0; [Ipole`, konstruktor;2 Konstruktor pole][2  vytvo�� pole obsahuj�c� \r\n"
+	"zadanou posloupnost prvk�.]]\r\n"
+	"&\r\n"
+	"[s0;2 ]\r\n"
+	"&\r\n"
+	"[s0; [*2 P��klad`: `[1`+2, 1`+3, `\"a`\" `+ `\"b`\"`] `= `[3, 4, `\"ab`\"`]]]\r\n"
+	"]")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CarrayCtr", LNG_ENGLISH, "")
+	HELP_TOPIC_TEXT(
+	"The array constructor creates an array containing the given sequence of elements.\r\n"
+	"&\r\n"
+	"&[* Example:[*  `[1+2, 1+3, \"a\" + \"b\"`] = `[3, 4, \"ab\"`]]]")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CarrayIndex", LNG_CZECH, "oper�tor \1[]\1  (\1pole hodnot\1, \1cel� ��slo\1) [S �] \1libovoln� typ\1")
+	HELP_TOPIC_TEXT(
+	"[3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0} \r\n"
+	"[s0;2 Oper�tor vr�t� prvek pole na dan� pozici. Prvky pole jsou indexov�ny \r\n"
+	"od 0, posledn� prvek m� index [/ pole.count]-1.&]\r\n"
+	"[s0;2 &]\r\n"
+	"[s0;2 [* P��klad:] `[\"index0\", \"index1\", \"index2\"`]`[1`] = \"index1\"")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CarrayIndex", LNG_ENGLISH, "operator \1[]\1  (\1pole hodnot\1, \1integer\1) [S �] \1any data type\1")
+	HELP_TOPIC_TEXT(
+	"\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CsumASC", LNG_CZECH, "\1sum\1(\1pole hodnot\1, \1�et�zec\1 [/ identifik�tor], \1lambda-v�raz\1) [S �] \1libovoln� typ\1")
+	HELP_TOPIC_TEXT(
+	"Funkce se�te / spoj� hodnoty vypo�ten� zadan�m [/ lambda-v�razem] z[/  ]prvk� zadan�ho pole. [/ Lamb"
+	"da-v�raz] sm� pou��vat zadan� [/ identifik�tor] pro p��stup k aktu�ln�mu prvku pole. V�sledky v�razu"
+	" mus� b�t jednoho z podporovan�ch datov�ch typ�:\r\n"
+	"&\r\n"
+	"&[i150o*+-83 ��slo[*  - funkce vr�t� sou�et v�ech t�chto ��sel; prvky obsahuj�c� hodnotu ]null[*  se"
+	" ignoruj�]]\r\n"
+	"&[i150o*+-83 �et�zec[*  - funkce vr�t� spojen� v�ech t�chto �et�zc�]]\r\n"
+	"&[i150o*+-83 pole[*  - funkce vr�t� spojen� v�ech t�chto pol�]]\r\n"
+	"&[i200+-83 ]\r\n"
+	"&[*+-83 P��klad:[*  `[1, 4, 7`].sum(\"X\", #(X*X)) = 66, `[1, 4, 7`].sum(\"T\", #(T.text)) = \"147\"]]")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CsumASC", LNG_ENGLISH, "\1sum\1(\1pole hodnot\1, \1string\1 [/ identifier], \1lambda-v�raz\1) [S �] \1any data type\1")
+	HELP_TOPIC_TEXT(
+	"Function adds / concatenates values calculated from the members of its input array using a given [/ "
+	"lambda-expression]. [/ Lambda-expressions] may use the given [/ identifier] to access the current ar"
+	"ray element. The calculated values must be of one of the supported types:\r\n"
+	"&\r\n"
+	"&[i150o*+-83 numbers[*  - function returns the arithmetic sum of all such numbers; elements containi"
+	"ng the ]null[*  value are ignored]]\r\n"
+	"&[i150o*+-83 strings[*  - function returns the string concatenation of all string values]]\r\n"
+	"&[i150o*+-83 arrays[*  - function returns the array concatenation of all arrays]]\r\n"
+	"&[*+-83 ]\r\n"
+	"&[* Example:[*  ][*+-83 `[1, 4, 7`].sum(\"X\", #(X*X)) = 66, `[1, 4, 7`].sum(\"T\", #(T.text)) = \"147\"]]")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CroundrNN", LNG_CZECH, "\1roundr\1(\1re�ln� ��slo\1 [/ hodnota], \1cel� ��slo\1 [/ platn�ch_��slic]) [S �] \1re�ln� ��slo\1")
+	HELP_TOPIC_TEXT(
+	"[{0}\r\n"
+	"[s0; [2 Zaokrouhlen� na zadan� po�et platn�ch ��slic. Sm�r zaokrouhlen� \r\n"
+	"je k�nejbli���mu re�ln�mu ��slu, kter� je celistv�m n�sobkem \r\n"
+	"hodnoty ][*2 10�`*`*�][/2 (ceil(log(hodnota))`-platn�ch`_��slic)][2 . \r\n"
+	"Pokud zadan� ��slo le�� p�esn� v�polovin� vzd�lenosti mezi nejbli���mi \r\n"
+	"takov�mi ��sly, zaokrouhl� se sm�rem nahoru.]]\r\n"
+	"&\r\n"
+	"[s0;2 ]\r\n"
+	"&\r\n"
+	"[s0; [*2 P��klad`: roundr(47.32, 2) `= 47, roundr(117, 1) `= 100.]]\r\n"
+	"]")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CroundrNN", LNG_ENGLISH, "\1roundr\1(\1real number\1 [/ value], \1integer\1 [/ significant_digits]) [S �] \1real number\1")
+	HELP_TOPIC_TEXT(
+	"[{2}\r\n"
+	"[s0; [2 Rounding to the stated number of significant digits. The \r\n"
+	"direction of rounding is towards the nearest integral multiple \r\n"
+	"of ][*2 10�`*`*�][/2 (ceil(log(value)`-significant`_digits)][2 . \r\n"
+	"If the number lies exactly in the middle between two such nearest \r\n"
+	"numbers, it is rounded up (towards positive infinity).]]\r\n"
+	"&\r\n"
+	"[s0;2 ]\r\n"
+	"&\r\n"
+	"[s0; [*2 Example`: roundr(47.32, 3) `= 47.3, roundr(117, 1) `= 100.]]\r\n"
+	"]")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CfloorrNN", LNG_CZECH, "\1floorr\1(\1re�ln� ��slo\1 [/ hodnota], \1cel� ��slo\1 [/ platn�ch_��slic]) [S �] \1re�ln� ��slo\1")
+	HELP_TOPIC_TEXT(
+	"[{0}\r\n"
+	"[s0; [2 Zaokrouhlen� sm�rem dol� na zadan� po�et platn�ch ��slic. \r\n"
+	"Funkce nalezne nejvy��� re�ln� ��slo, kter� je celistv�m n�sobkem \r\n"
+	"hodnoty ][*2 10�`*`*�][/2 (ceil(log(hodnota))`-platn�ch`_��slic)][2  \r\n"
+	"a�nen� vy��� ne� p�vodn� ][/2 hodnota][2 .]]\r\n"
+	"&\r\n"
+	"[s0;2 ]\r\n"
+	"&\r\n"
+	"[s0; [*2 P��klad`: floorr(47.32, 3) `= 47.3, floorr(117, 1) `= 100.]]\r\n"
+	"]")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CfloorrNN", LNG_ENGLISH, "\1floorr\1(\1real number\1 [/ value], \1integer\1 [/ significant_digits]) [S �] \1real number\1")
+	HELP_TOPIC_TEXT(
+	"[{2}\r\n"
+	"[s0; [2 Rounding down (towards minus infinity) to the stated number \r\n"
+	"of significant digits. The function returns the highest integral \r\n"
+	"multiple of ][*2 10�`*`*�][/2 (ceil(log(value))`-significant`_digits) \r\n"
+	"][2 not greater than the original ][/2 value][2 .]]\r\n"
+	"&\r\n"
+	"[s0;2 ]\r\n"
+	"&\r\n"
+	"[s0; [*2 Example`: floorr(47.32, 3) `= 47.3, floorr(117, 1) `= 100.]]\r\n"
+	"]")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CceilrNN", LNG_CZECH, "\1ceilr\1(\1re�ln� ��slo\1 [/ hodnota], \1cel� ��slo\1 [/ platn�ch_��slic]) [S �] \1re�ln� ��slo\1")
+	HELP_TOPIC_TEXT(
+	"[{0} \r\n"
+	"[s0; [Izaokrouhlování`; číslo`, zaokrouhlení;2 Zaokrouhlen�][2  \r\n"
+	"sm�rem nahoru na zadan� po�et platn�ch ��slic. Funkce nalezne \r\n"
+	"nejmen�� re�ln� ��slo, kter� je celistv�m n�sobkem hodnoty ][*2 10�`*`*�][/2 (cei\r\n"
+	"l(log(hodnota))`-platn�ch`_��slic)][2  a�nen� men�� ne� p�vodn� \r\n"
+	"][/2 hodnota][2 .]]\r\n"
+	"&\r\n"
+	"[s0;2 ]\r\n"
+	"&\r\n"
+	"[s0; [*2 P��klad`: ceilr(47.32, 3) `= 47.4, ceilr(117, 1) `= 200.]]\r\n"
+	"]")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CceilrNN", LNG_ENGLISH, "\1ceilr\1(\1real number\1 [/ value], \1integer\1 [/ significant_digits]) [S �] \1real number\1")
+	HELP_TOPIC_TEXT(
+	"[{2}\r\n"
+	"[s0; [2 Rounding up (towards plus infinity) to the stated number \r\n"
+	"of significant digits. The function returns the lowest integral \r\n"
+	"multiple of ][*2 10�`*`*�][/2 (ceil(log(value))`-significant`_digits)][2  \r\n"
+	"not lower than the original ][/2 value][2 .]]\r\n"
+	"&\r\n"
+	"[s0;2 ]\r\n"
+	"&\r\n"
+	"[s0; [*2 Example`: ceilr(47.32, 3) `= 47.4, ceilr(117, 1) `= 200.]]\r\n"
+	"]")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CnlsrN", LNG_CZECH, "\1nlsr\1(\1re�ln� ��slo\1 [/ ��slo]) [S �] \1�et�zec\1")
+	HELP_TOPIC_TEXT(
+	"[{0}\r\n"
+	"[s0; [2 P�evod ��seln� hodnoty na text s vyu�it�m n�rodn�ch zvyklost� \r\n"
+	"pro form�tov�n� ��sel (odd�lova�e tis�c�, odd�lova� desetinn� \r\n"
+	"��sti). ��slo se zaokrouhl� na t�i platn� ��slice a nev�znamn� \r\n"
+	"nuly se ignoruj�.]]\r\n"
+	"&\r\n"
+	"[s0;2 ]\r\n"
+	"&\r\n"
+	"[s0; [*2 P��klad`: nlsr(1272.3) `= `\"1 272`\"]]\r\n"
+	"]")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CnlsrN", LNG_ENGLISH, "")
+	HELP_TOPIC_TEXT(
+	"[{2}\r\n"
+	"[s0; [2 Converts its numeric value to text according to current regional \r\n"
+	"settings (delimiters of thousands, delimiter of decimal part). \r\n"
+	"The number is rounded to 3 significant digits and insignificant \r\n"
+	"zeroes are ignored.]]\r\n"
+	"&\r\n"
+	"[s0;2 ]\r\n"
+	"&\r\n"
+	"[s0; [*2 Example`: nlsr(1272.3) `= `\"1 272.3`\"]]\r\n"
+	"]")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CnlsrNN", LNG_CZECH, "\1nlsr\1(\1re�ln� ��slo\1 [/ ��slo], \1cel� ��slo\1 [/ platn�ch_��slic]) [S �] \1�et�zec\1")
+	HELP_TOPIC_TEXT(
+	"[{0}\r\n"
+	"[s0; [2 P�evod ��seln� hodnoty na text s vyu�it�m n�rodn�ch zvyklost� \r\n"
+	"pro form�tov�n� ��sel (odd�lova�e tis�c�, odd�lova� desetinn� \r\n"
+	"��sti) na zadan� po�et ][/2 platn�ch ��slic][2 . Pokud je po�et \r\n"
+	"platn�ch ��slic kladn�, z�desetinn� ��sti ��sla se odstran� nev�znamn� \r\n"
+	"nuly; pokud je po�et m�st z�porn�, nev�znamn� nuly se v���sle \r\n"
+	"ponechaj�.]]\r\n"
+	"&\r\n"
+	"[s0;2 ]\r\n"
+	"&\r\n"
+	"[s0; [*2 P��klad`: nlsr(1272.3, `-3) `= `\"1 270`\", nlsr(1.2023, `-3) \r\n"
+	"`= `\"1,20`\"]]\r\n"
+	"]")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CnlsrNN", LNG_ENGLISH, "")
+	HELP_TOPIC_TEXT(
+	"[{2}\r\n"
+	"[s0; [2 Converts its numeric value to text according to current regional \r\n"
+	"settings (delimiters of thousands, delimiter of decimal part) \r\n"
+	"with given number of ][/2 significant digits][2 . If the number \r\n"
+	"of digits is positive, non`-significant zeroes will be deleted \r\n"
+	"from the decimal part of the number. If the number of digits \r\n"
+	"is negative, non`-significant zeroes will be retained in the \r\n"
+	"number. ]]\r\n"
+	"&\r\n"
+	"[s0;2 ]\r\n"
+	"&\r\n"
+	"[s0; [*2 Example`: nlsr(1272.3, `-2) `= `\"1 300`\", nlsr(1.999, `-2) \r\n"
+	"`= `\"2.00`\"]]\r\n"
+	"]")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$ChourT", LNG_ENGLISH, "")
+	HELP_TOPIC_TEXT(
+	"[{2}\r\n"
+	"[s0; [2 Function returns the number of hours of its date`/time argument.]]\r\n"
+	"&\r\n"
+	"[s0; ]\r\n"
+	"]")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$ChourT", LNG_CZECH, "")
+	HELP_TOPIC_TEXT(
+	"[{0}\r\n"
+	"[s0; [2 Funkce vr�t� po�et hodin sv�ho argumentu typu datum`/�as.]]\r\n"
+	"]")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CminuteT", LNG_CZECH, "")
+	HELP_TOPIC_TEXT(
+	"[{0}\r\n"
+	"[s0; [2 Funkce vr�t� po�et minut ze zadan�ho parametru typu datum \r\n"
+	"`/ �as.]]\r\n"
+	"]")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CminuteT", LNG_ENGLISH, "")
+	HELP_TOPIC_TEXT(
+	"[{2}\r\n"
+	"[s0; [2 Function returns number of minutes of its date`/time argument.]]\r\n"
+	"]")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CsecondT", LNG_CZECH, "")
+	HELP_TOPIC_TEXT(
+	"[{0}\r\n"
+	"[s0; [2 Funkce vr�t� po�et sekund ze zadan�ho �daje typu datum`/�as.]]\r\n"
+	"&\r\n"
+	"[s0; ]\r\n"
+	"]")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CsecondT", LNG_ENGLISH, "")
+	HELP_TOPIC_TEXT(
+	"[{2}\r\n"
+	"[s0; [2 Function returns number of seconds of its date`/time argument.]]\r\n"
+	"]")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CstringIndex", LNG_CZECH, "oper�tor \1[]\1  (\1�et�zec\1, \1cel� ��slo\1) [S �] \1�et�zec\1")
+	HELP_TOPIC_TEXT(
+	"\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CstringIndex", LNG_ENGLISH, "operator \1[]\1  (\1string\1, \1integer\1) [S �] \1string\1")
+	HELP_TOPIC_TEXT(
+	"\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CarrayRange", LNG_CZECH, "")
+	HELP_TOPIC_TEXT(
+	"[3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0} \r\n"
+	"[s0;*2 [* Pomoc� konstruktu ]`[a .. b`][*  lze vytvo�it pole hodnot z_dan�ho \r\n"
+	"intervalu. V�sledn� pole bude obsahovat hodnoty ]`[a,a+1,a+2,...,[* round(]b[* )]`].")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CcallSV", LNG_CZECH, "")
+	HELP_TOPIC_TEXT(
+	"[3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0} \r\n"
+	"[s0;2 Funkce na�te prom�nnou v�razov�ho syst�mu nebo zavol� funkci \r\n"
+	"zadanou textov�m identifik�torem. V_p��pad� funkce je mo�no jako \r\n"
+	"dal�� parametry zadat parametry funkce.&]\r\n"
+	"[s0;2 &]\r\n"
+	"[s0;*2 P��klad: call(\"mid\", \"ahoj\", 2, 2) = \"oj\"&]\r\n"
+	"[s0;*2 ")
+HELP_TOPIC_END()
diff --git a/uppsrc/TCore/CalcNode.cpp b/uppsrc/TCore/CalcNode.cpp
new file mode 100644
index 000000000..fd6114674
--- /dev/null
+++ b/uppsrc/TCore/CalcNode.cpp
@@ -0,0 +1,1564 @@
+#pragma warning(disable: 4786)
+
+#include "TCoreCalc.h"
+#pragma hdrstop
+
+NAMESPACE_UPP
+
+#define LLOG(x) // LOG(x)
+
+String CalcType<const CalcNode *>::Describe() { return "lambda-v�raz"; }
+RegisterStdCalcTypeName(const CalcNode *)
+
+int CharFilterCalcIdent(int c)      { return IsIdent(c) ? c : 0; }
+int CharFilterCalcUpperIdent(int c) { return IsIdent(c) ? ToUpper(c) : 0; }
+
+RegisterHelpTopicTitle("CalcNode", t_("Expression evaluator"))
+
+enum
+{
+	MAX_NESTING_DEPTH = 1000,
+};
+
+HelpCalc::HelpCalc(CalcGate proc, const char *ident_, const char *topic_, String (*groupfn_)())
+//: generator(gen)
+{
+	Init(proc, ident_, topic_, groupfn_);
+	AddHelpCalc(*this);
+//	ord = HelpCalcIndex::Get().Add(*this);
+}
+
+void HelpCalc::Init(CalcGate proc_, const char *ident_, const char *topic_, String (*groupfn_)())
+{
+	proc = proc_;
+	ident = ident_;
+	topic = topic_;
+	groupfn = groupfn_;
+/*
+	sortname = id = _id;
+
+	const char *p = (head ? head : "");
+	const char *b = p;
+
+	if(*p == '|')
+	{ // sort name
+		b = ++p;
+		sortname.Clear();
+		while(*p && *p != '|' && *p != '\n')
+		{
+			if((*p == '\\' || *p == '`') && p[1])
+				p++;
+			sortname << *p++;
+		}
+		if(*p == '|')
+			p++;
+		while(*p && *p != '\n' && *p != '\t' && (byte)*p <= ' ')
+			p++;
+		b = p;
+	}
+
+	while(*p && *p != '\n' && *p != '\t' && *p != '(')
+		p++;
+	const char *e = p;
+	while(e > b && e[-1] == ' ')
+		e--;
+	if(e > b)
+		result = String(b, e);
+
+	if(*p == '(')
+	{ // arguments given
+		p++;
+		do
+		{
+			while(*p && (byte)*p <= ' ')
+				p++;
+			if(*p == ')')
+			{
+				p++;
+				break;
+			}
+			if(*p == ':')
+			{ // everything is type
+				b = ++p;
+				while(*p && *p != '\n' && *p != ',' && *p != ')')
+					p++;
+				arg_types.Add(String(b, p));
+				arg_names.Add("");
+			}
+			else
+			{ // name or type + name
+				const char *s = b = p;
+				while(*p && *p != '\n' && *p != ',' && *p != ')')
+					if(*p == '\1')
+					{ // skip inline part
+						while(*p && *p++ != '\1')
+							;
+					}
+					else if((*p == '`' || *p == '\\') && p[1])
+						p += 2;
+					else if(*p == '[')
+					{ // skip QTF leader
+						p++;
+						while(*p && *p++ != ' ')
+							;
+					}
+					else if(*p++ == ' ')
+						s = p;
+
+				for(e = p; e > b && (byte)e[-1] <= ' '; e--)
+					;
+
+				if(s == b)
+				{ // name only
+					arg_types.Add("");
+					arg_names.Add(String(b, e));
+				}
+				else
+				{ // type name
+					arg_names.Add(String(s, e));
+					while(s > b && (byte)*s <= ' ')
+						s--;
+					arg_types.Add(String(b, s));
+				}
+			}
+		}
+		while(*p++ == ',');
+		if(p[-1] != ')')
+		{
+			p--;
+			NEVER(); // missing right parenthesis in function declaration (found p)
+		}
+	}
+	while(*p && *p != '\t' && *p != '\n' && (byte)*p <= ' ')
+		p++;
+	if(*p == '\t')
+	{ // group / subgroup given
+		while(*++p && (byte)*p <= ' ')
+			p++;
+		b = p;
+		while(*p && *p != '/' && *p != '\n')
+			if((*p == '\\' || *p == '`') && *++p)
+				p++; // explicit char
+			else if(*p == '[')
+			{ // skip qtf tags
+				while(*p && *p++ != ' ')
+					;
+			}
+			else
+				p++;
+
+		for(e = p; e > b && (byte)e[-1] <= ' '; e--)
+			;
+		group = String(b, e);
+		stripped_group = StripQtf(group);
+
+		if(*p == '/')
+			p++;
+
+		while(*p && *p != '\n' && (byte)*p <= ' ')
+			p++;
+		b = p;
+		while(*p && *p != '\n')
+			p++;
+		for(e = p; e > b && (byte)e[-1] <= ' '; e--)
+			;
+		subgroup = String(b, e);
+		stripped_subgroup = StripQtf(subgroup);
+	}
+	if(*p && *p != '\n')
+		NEVER(); // end of line expected after arguments & group spec (found p)
+	if(*p == '\n')
+		p++;
+	index_entries = p;
+
+	CalcPacket packet(*(CalcContext *)0, id);
+	packet.help = true;
+	VERIFY(proc(packet));
+	if(packet.args.GetCount() > arg_types.GetCount())
+		arg_types.SetCount(packet.args.GetCount());
+	if(arg_types.GetCount() > arg_names.GetCount())
+		arg_names.SetCount(arg_types.GetCount());
+	else
+		arg_types.SetCount(arg_names.GetCount());
+
+	for(int i = 0; i < packet.args.GetCount(); i++)
+		if(IsNull(arg_types[i]))
+			arg_types[i] = packet.args[i].Format();
+	if(IsNull(result))
+		result = packet.result.Format();
+*/
+}
+
+String HelpCalc::GetTitle() const
+{
+	CalcPacket packet(*(CalcContext *)0, ident);
+	packet.help = true;
+	VERIFY(proc(packet));
+	Vector<String> arg_types;
+	arg_types.SetCount(packet.args.GetCount());
+	for(int i = 0; i < packet.args.GetCount(); i++)
+		arg_types[i] = StdFormat(packet.args[i]);
+	String result = StdFormat(packet.result);
+	String out;
+	if(!IsAlpha(*ident))
+		out << "oper�tor \1" << ident << "\1 ";
+	else
+		out << "\1" << ident << "\1";
+	if(!arg_types.IsEmpty())
+	{
+		for(int i = 0; i < arg_types.GetCount(); i++)
+			out << (i ? "\1, \1" : "(\1") << arg_types[i];
+		out << "\1)";
+	}
+	out << " [S \xAE] \1" << result << "\1";
+	return out;
+}
+
+HelpCalcMap& GetHelpCalcMap()
+{
+	static HelpCalcMap map;
+	return map;
+}
+
+void AddHelpCalc(const HelpCalc& calc)
+{
+	GetHelpCalcMap().Add(&calc);
+}
+
+Vector<String> GetHelpCalcGroups()
+{
+	Index<String> group;
+	const HelpCalcMap& map = GetHelpCalcMap();
+	for(int i = 0; i < map.GetCount(); i++)
+		if(map[i]->groupfn)
+			group.FindAdd(map[i]->groupfn());
+	Vector<String> gnames = group.PickKeys();
+	Sort(gnames, GetLanguageInfo());
+	if(gnames.GetCount() >= 2 && gnames[0].IsEmpty())
+	{
+		gnames.Remove(0);
+		gnames.Add(Null);
+	}
+	return gnames;
+}
+
+static void HelpCalcAutoIndex(Index<WString>& entries, Vector<String>& drls)
+{
+	const HelpCalcMap& map = GetHelpCalcMap();
+	for(int i = 0; i < map.GetCount(); i++)
+	{
+		const HelpCalc& hc = *map[i];
+		WString entry;
+		entry << WString("[/ \1") << hc.ident.ToWString()
+			<< WString(IsAlpha(*hc.ident) ? "\1], funkce" : "\1], oper�tor");
+		int f = entries.Find(entry);
+		String drl = HelpAppDPP(hc.topic);
+		if(f >= 0)
+			drls[f] << ";!" << drl;
+		else
+		{
+			entries.Add(entry);
+			drls.Add('!' + drl);
+		}
+	}
+}
+
+HELPINITBLOCK { RegisterHelpAutoIndex(&HelpCalcAutoIndex); }
+
+//////////////////////////////////////////////////////////////////////
+// CalcFunctionNode::
+
+Value CalcFunctionNode::Calc(CalcContext& context) const
+{
+	One<CalcPacket> packet = new CalcPacket(context, name);
+	ScanArgs(*packet);
+	return context.Calc(*packet);
+}
+
+String CalcFunctionNode::Format() const
+{
+	String out;
+	bool is_oper = !IsAlpha(*name);
+	if(is_oper)
+		out << "operator ";
+	out << name;
+	if(!args.IsEmpty())
+	{
+		for(int i = 0; i < args.GetCount(); i++)
+		{
+			String s = args[i]->Format();
+			if(IsNull(s))
+				return Null;
+			out << (i ? ", " : "(") << s;
+		}
+		out << ")";
+	}
+	else if(is_oper)
+		out << "()";
+	return out;
+}
+
+String CalcConstNode::Format() const
+{
+	if(IsNull(value))
+		return "null";
+	if(IsNumber(value))
+		return FormatDouble(value, 15);
+	if(IsString(value))
+		return AsCString(String(value));
+	if(IsDateTime(value))
+	{
+		Time tm(value);
+		if(tm.hour == 0 && tm.minute == 0 && tm.second == 0)
+			return NFormat("date(%d, %d, %d)", tm.year, tm.month, tm.day);
+		else
+			return NFormat("time(%d, %d, %d, %d, %d, %d)", tm.year, tm.month, tm.day, tm.hour, tm.minute, tm.second);
+	}
+	return Null;
+}
+
+Value CalcConstNode::Calc(CalcContext& context) const
+{
+	return value;
+}
+
+Value CalcLambdaNode::Calc(CalcContext& context) const
+{
+	return CalcType<const CalcNode *>::ToValue(~args[0]);
+}
+
+String CalcLambdaNode::Format() const
+{
+	String e = args[0]->Format();
+	if(IsNull(e))
+		return Null;
+	return NFormat("#(%s)", e);
+}
+
+String CalcLogOrNode::Format() const
+{
+	String l = args[0]->Format(), r = args[1]->Format();
+	if(IsNull(l) || IsNull(r))
+		return Null;
+	return NFormat("(%s) || (%s)", l, r);
+}
+
+CalcNodePtr CalcLogOrNode::Optimize(CalcContext& context)
+{
+	if(!args[0]->IsConst())
+		return this;
+	if(CalcType<bool>::ValueTo(args[0]->Calc(context)))
+		return new CalcConstNode(1);
+	return args[1];
+}
+
+Value CalcLogOrNode::Calc(CalcContext& context) const
+{
+	Value var = args[0]->Calc(context);
+	if(!CalcType<bool>::IsType(var))
+		Expect(t_("boolean value"), context.FormatNull(var));
+	if(CalcType<bool>::ValueTo(var))
+		return CalcType<bool>::ToValue(true);
+	var = args[1]->Calc(context);
+	if(!CalcType<bool>::IsType(var))
+		Expect(t_("boolean value"), context.FormatNull(var));
+	return CalcType<bool>::ToValue(CalcType<bool>::ValueTo(var));
+}
+
+String CalcLogAndNode::Format() const
+{
+	String l = args[0]->Format(), r = args[1]->Format();
+	if(IsNull(l) || IsNull(r))
+		return Null;
+	return NFormat("(%s) && (%s)", l, r);
+}
+
+Value CalcLogAndNode::Calc(CalcContext& context) const
+{
+	Value var = args[0]->Calc(context);
+	if(!CalcType<bool>::IsType(var))
+		Expect(t_("boolean value"), context.FormatNull(var));
+	if(!CalcType<bool>::ValueTo(var))
+		return CalcType<bool>::ToValue(false);
+	var = args[1]->Calc(context);
+	if(!CalcType<bool>::IsType(var))
+		Expect(t_("boolean value"), context.FormatNull(var));
+	return CalcType<bool>::ToValue(CalcType<bool>::ValueTo(var));
+}
+
+CalcNodePtr CalcLogAndNode::Optimize(CalcContext& context)
+{
+	if(!args[0]->IsConst())
+		return this;
+	if(!CalcType<bool>::ValueTo(args[0]->Calc(context)))
+		return new CalcConstNode(0);
+	return args[1];
+}
+
+String CalcSelectNode::Format() const
+{
+	String c = args[COND]->Format(), t = args[IFTRUE]->Format(), f = args[IFFALSE]->Format();
+	if(IsNull(c) || IsNull(t) || IsNull(f))
+		return Null;
+	return NFormat("(%s) ? (%s) : (%s)", c, t, f);
+}
+
+Value CalcSelectNode::Calc(CalcContext& context) const
+{
+	Value var = args[COND]->Calc(context);
+	if(!CalcType<bool>::IsType(var))
+		Expect(t_("boolean value"), context.FormatNull(var));
+	return CalcType<bool>::ValueTo(var) ? args[IFTRUE]->Calc(context) : args[IFFALSE]->Calc(context);
+}
+
+CalcNodePtr CalcSelectNode::Optimize(CalcContext& context)
+{
+	if(!args[0]->IsConst())
+		return this;
+	return args[CalcType<bool>::ValueTo(args[0]->Calc(context)) ? 1 : 2];
+}
+
+String CalcSwitchNode::Format() const
+{
+	String out;
+	String c = args[0]->Format();
+	if(IsNull(c))
+		return Null;
+	out = NFormat("(%s){", c);
+	for(int i = 1; i < args.GetCount(); i++)
+	{
+		String s = args[i]->Format();
+		if(IsNull(s))
+			return Null;
+		out << (i == 1 ? "(" : ", (") << s << ')';
+	}
+	out << '}';
+	return out;
+}
+
+Value CalcSwitchNode::Calc(CalcContext& context) const
+{
+	Value value = args[0]->Calc(context);
+	if(args.GetCount() == 2)
+	{ // special case - 1-arg switch works as Nvl
+		if(!IsNull(value))
+			return value;
+		return args[1]->Calc(context);
+	}
+	int i = 0, t = (args.GetCount() - 1) & ~1;
+	for(; i < t; i += 2)
+		if(value == args[i + 1]->Calc(context))
+			return args[i + 2]->Calc(context);
+	if(i + 1 < args.GetCount())
+		return args[i + 1]->Calc(context);
+	else
+		return value;
+}
+
+CalcNodePtr CalcSwitchNode::Optimize(CalcContext& context)
+{
+	if(!args[0]->IsConst())
+		return this;
+	Value value = args[0]->Calc(context);
+	if(args.GetCount() == 2)
+	{ // special case - 1-arg switch works as Nvl
+		if(!IsNull(value))
+			return new CalcConstNode(value);
+		return args[1];
+	}
+	int i = 0, t = (args.GetCount() - 1) & ~1;
+	for(; i < t; i += 2)
+	{
+		if(!args[i + 1]->IsConst())
+			return this;
+		if(value == args[i + 1]->Calc(context))
+			return args[i + 2];
+	}
+	if(i + 1 < args.GetCount())
+		return args[i + 1];
+	else
+		return new CalcConstNode(value);
+}
+
+void CalcSymbols::Clear()
+{
+	var_index.Clear();
+	var_value.Clear();
+	var_const.Clear();
+	functions.Clear();
+}
+
+void CalcSymbols::Remove(String name)
+{
+	int i = var_index.Find(name);
+	if(i >= 0)
+	{
+		var_index.Remove(i);
+		var_value.Remove(i);
+		var_const.Remove(i);
+	}
+}
+
+CalcContext::CalcContext()
+: nesting(0)
+, opt_const(false)
+{
+	language = GetCurrentLanguage();
+	UseCalcBasic();
+	stack.Add();
+}
+
+CalcContext::CalcContext(const CalcContext& context, int) : nesting(context.nesting), stack(context.stack, 0) {}
+CalcContext::~CalcContext() {}
+
+Value CalcContext::Get(String name) const
+{
+	for(int l = stack.GetCount(); --l >= 0;)
+	{
+		const CalcSymbols& level = stack[l];
+		int f = level.var_index.Find(name);
+		if(f >= 0)
+			return level.var_value[f];
+	}
+	return Value();
+}
+
+Value CalcContext::Evaluate(String expr)
+{
+	CalcParser parser;
+	try
+	{
+		CalcNodePtr cn = parser.ScanVoid(expr);
+		if(!cn)
+			return Value();
+		return cn->Calc(*this);
+	}
+	catch(Exc e)
+	{
+		return ErrorValue(e);
+	}
+}
+
+double CalcContext::EvaluateDouble(String expr)
+{
+	CalcNodePtr node = CalcParser().ScanVoid(expr);
+	return !!node ? node->CalcDouble(*this) : double(Null);
+}
+
+String CalcContext::EvaluateString(String expr)
+{
+	CalcNodePtr node = CalcParser().ScanVoid(expr);
+	return !!node ? node->CalcString(*this) : String(Null);
+}
+
+int CalcContext::EvaluateInt(String expr)
+{
+	CalcNodePtr node = CalcParser().ScanVoid(expr);
+	return !!node ? node->CalcInt(*this) : int(Null);
+}
+
+Date CalcContext::EvaluateDate(String expr)
+{
+	CalcNodePtr node = CalcParser().ScanVoid(expr);
+	return !!node ? node->CalcDate(*this) : Date(Null);
+}
+
+Time CalcContext::EvaluateTime(String expr)
+{
+	CalcNodePtr node = CalcParser().ScanVoid(expr);
+	return !!node ? node->CalcTime(*this) : Time(Null);
+}
+
+bool CalcContext::EvaluateBool(String expr)
+{
+	CalcNodePtr node = CalcParser().ScanVoid(expr);
+	return !!node && node->CalcBool(*this);
+}
+
+String CalcContext::OptimizeConstant(String expr)
+{
+	CalcNodePtr in_expr = CalcParser().ScanVoid(expr);
+	if(!in_expr)
+		return expr;
+	CalcNodePtr out_expr = OptimizeConstant(in_expr);
+	if(out_expr == in_expr)
+		return expr;
+	return Nvl(out_expr->Format(), expr);
+}
+
+static CalcNodePtr OptimizeConstantRaw(CalcNodePtr src, CalcContext& context)
+{
+	CalcNodePtr clone = src->Clone();
+	if(!clone)
+		return src;
+	bool modf = false;
+	for(int i = 0; i < clone->args.GetCount(); i++)
+	{
+		CalcNodePtr opt = OptimizeConstantRaw(src->args[i], context);
+		if(!!opt && opt != src->args[i])
+		{
+			modf = true;
+			clone->args[i] = opt;
+		}
+	}
+	if(modf)
+		src = clone;
+	src = src->Optimize(context);
+	if(src->IsConst())
+		return src;
+
+	try
+	{
+		Value v = src->Calc(context);
+		if(!v.IsError())
+			return new CalcConstNode(v);
+	}
+	catch(Exc e)
+	{
+	}
+
+	return src;
+}
+
+CalcNodePtr CalcContext::OptimizeConstant(CalcNodePtr src)
+{
+	if(!src)
+		return src;
+	try
+	{
+		opt_const = true;
+		CalcNodePtr out = OptimizeConstantRaw(src, *this);
+		opt_const = false;
+		return out;
+	}
+	catch(Exc e)
+	{
+		opt_const = false;
+		return src;
+	}
+}
+
+String CalcContext::Convert(String s, bool throw_errors, const UPP::Convert& convert)
+{
+	if(s.IsEmpty())
+		return Null;
+	Vector<String> sparts;
+	Vector<CalcNodePtr> cparts;
+	ParseConvert(s, sparts, cparts, throw_errors);
+	return CalcConvert(sparts, cparts, throw_errors, convert);
+}
+
+void CalcContext::ParseConvert(String s, Vector<String>& sparts, Vector<CalcNodePtr>& cparts, bool throw_errors)
+{
+	const char *p = s;
+	sparts.Add();
+	while(*p)
+	{
+		const char *b = p;
+		while(*p && (*p != '<' || p[1] != ':'))
+			p++;
+		sparts.Top().Cat(b, p - b);
+		if(*p)
+		{
+			p += 2;
+			b = p;
+			while(*p && (*p != ':' || p[1] != '>'))
+				if(*p++ == '\"')
+				{
+					while(*p && *p != '\"')
+						if(*p++ == '\\' && *p)
+							p++;
+					if(*p)
+						p++;
+				}
+			try
+			{
+				CalcNodePtr cn = CalcParser().ScanVoid(String(b, p));
+				if(!!cn)
+				{
+					cparts.Add() = cn;
+					sparts.Add();
+				}
+			}
+			catch(Exc e)
+			{
+				if(throw_errors)
+					throw;
+				sparts.Top().Cat(e);
+			}
+			if(*p)
+				p += 2;
+		}
+	}
+}
+
+String CalcContext::CalcConvert(const Vector<String>& sparts, const Vector<CalcNodePtr>& cparts, bool throw_errors, const UPP::Convert& convert)
+{
+	String out;
+	for(int i = 0; i < sparts.GetCount(); i++)
+	{
+		out.Cat(sparts[i]);
+		if(i < cparts.GetCount())
+			try
+			{
+				out.Cat(FormatText(cparts[i]->Calc(*this), convert));
+			}
+			catch(Exc e)
+			{
+				if(throw_errors)
+					throw;
+				out.Cat(e);
+			}
+	}
+	return out;
+}
+
+Value CalcContext::Calc(CalcPacket& packet)
+{
+	try {
+#ifdef _DEBUG
+		int level = nesting;
+		Value out = TryCalc(packet);
+		ASSERT(nesting == level);
+		return out;
+#else
+		return TryCalc(packet);
+#endif
+	}
+	catch(Exc e) {
+		LOG(e);
+		throw Exc(packet.name + ": " + e);
+	}
+}
+
+Value CalcContext::TryCalc(CalcPacket& packet)
+{
+	LLOG("TryCalc <- " << packet.name << " + " << packet.args.GetCount() << " args" << BeginIndent);
+
+	// calculate locals & globals
+	if(++nesting > MAX_NESTING_DEPTH) {
+		nesting--;
+		throw Exc(NFormat(t_("function nesting too deep (%d levels)"), MAX_NESTING_DEPTH));
+	}
+
+	bool none = true;
+
+	for(int l = stack.GetCount(); --l >= 0;) {
+		const CalcSymbols& level = stack[l];
+		int i = level.functions.Find(packet.name);
+		if(i >= 0) { // try functions
+			none = false;
+			for(; i >= 0; i = level.functions.FindNext(i))
+				try {
+					if(level.functions[i](packet)) {
+						LLOG(EndIndent << "//TryCalc->" << StdFormat(packet.result));
+						nesting--;
+						return packet.result;
+					}
+				}
+				catch(...) {
+					nesting--;
+					throw;
+				}
+		}
+		if(packet.args.IsEmpty() && (i = level.var_index.Find(packet.name)) >= 0) {
+			if(opt_const && !level.var_const[i]) {
+				nesting--;
+				throw Exc(NFormat(t_("%s is not a constant"), packet.name));
+			}
+			LLOG(EndIndent << "//TryCalc->" << StdFormat(level.var_value[i]));
+			nesting--;
+			return level.var_value[i];
+		}
+	}
+
+	for(int e = externals.GetCount(); --e >= 0;) {
+		const CalcSymbols& level = *externals[e];
+		int i = level.functions.Find(packet.name);
+		if(i >= 0) { // try functions
+			none = false;
+			for(; i >= 0; i = level.functions.FindNext(i))
+				try {
+					if(level.functions[i](packet)) {
+						LLOG(EndIndent << "//TryCalc->" << StdFormat(packet.result));
+						nesting--;
+						return packet.result;
+					}
+				}
+				catch(...) {
+					nesting--;
+					throw;
+				}
+		}
+		if(packet.args.IsEmpty() && (i = level.var_index.Find(packet.name)) >= 0) {
+			if(opt_const && !level.var_const[i]) {
+				nesting--;
+				throw Exc(NFormat(t_("%s is not a constant"), packet.name));
+			}
+			LLOG(EndIndent << "//TryCalc->" << StdFormat(level.var_value[i]));
+			nesting--;
+			return level.var_value[i];
+		}
+	}
+
+	{ // try globals
+		const CalcProcMap& globals = GetGlobals();
+		int i = globals.Find(packet.name);
+		if(i >= 0) {
+			none = false;
+			for(; i >= 0; i = globals.FindNext(i))
+				try {
+					if(globals[i](packet)) {
+						LLOG(EndIndent << "//TryCalc->" << StdFormat(packet.result));
+						nesting--;
+						return packet.result;
+					}
+				}
+				catch(...) {
+					nesting--;
+					throw;
+				}
+		}
+	}
+
+	nesting--;
+
+	if(none)
+		throw Exc((packet.args.IsEmpty() ? t_("variable/constant '") : t_("function '")) + packet.name + t_("' not found"));
+
+	String s = packet.name;
+	if(!packet.args.IsEmpty()) {
+		bool no_text = (s == "text");
+		s << '(' << FormatNull(packet.args[0], no_text);
+		for(const Value *p = packet.args.Begin() + 1, *e = packet.args.End(); p < e; p++)
+			s << ", " << FormatNull(*p, no_text);
+		s << ')';
+	}
+	s << ": ";
+	switch(packet.args.GetCount()) {
+		case 0:  s << t_("missing arguments"); break;
+		case 1:  s << t_("illegal type ") << packet.GetTypeNames() << t_(" or number of parameters"); break;
+		default: s << t_("illegal type combination ") << packet.GetTypeNames(); break;
+	}
+
+	throw Exc(s);
+}
+
+CalcProcMap& CalcContext::GetGlobals()
+{
+	static CalcProcMap list;
+	return list;
+}
+
+String CalcContext::GetTypeName(Value value) const
+{
+	if(IsNull(value))
+		return "Null";
+/*
+	switch(value.GetType())
+	{
+	case INT_V:    return CalcType<int>::Describe();
+	case DOUBLE_V: return CalcType<double>::Describe();
+	case STRING_V: return CalcType<String>::Describe();
+	case TIME_V:   return CalcType<Time>::Describe();
+	case DATE_V:   return CalcType<Date>::Describe();
+	}
+*/	return CalcTypeNameConvert::Format(typeid(*value.GetVoidPtr()).name());
+}
+
+String CalcContext::FormatNull(Value value, bool no_text)
+{
+	if(value.IsError())
+		return GetErrorText(value);
+	if(IsNull(value))
+		return "Null";
+	if(IsString(value))
+		return '\"' + (String)value + '\"';
+	if(no_text)
+	{
+		if(IsDateTime(value) || IsNumber(value))
+			return StdFormat(value);
+		return GetTypeName(value) + "(?)";
+	}
+
+	try
+	{
+		return FormatText(value);
+	}
+	catch(Exc e)
+	{
+		return e;
+	}
+}
+
+String CalcContext::FormatText(Value value, const UPP::Convert& convert)
+{
+	if(value.IsError())
+		throw Exc(GetErrorText(value));
+	Value v = convert.Format(value);
+	if(IsNull(v) || IsString(v))
+		return v;
+	CalcPacket packet(*this, "text");
+	packet.args.SetCount(1);
+	packet.args[0] = v;
+	return StdFormat(Calc(packet));
+}
+
+void CalcContext::PushLevel()
+{
+	if(stack.GetCount() >= MAX_STACK_DEPTH)
+		throw Exc(t_("Maximum nesting depth (") + IntStr(MAX_STACK_DEPTH) + t_(") exceeded (infinite recursion?)"));
+	stack.Add();
+}
+
+void CalcContext::PopLevel()
+{
+	if(stack.GetCount() <= 1)
+		throw Exc(t_("Expression stack underflow"));
+	stack.Drop();
+}
+
+void CalcContext::RemoveExternal(CalcSymbols& e)
+{
+	int i = FindIndex(externals, &e);
+	if(i >= 0)
+		externals.Remove(i);
+}
+
+//////////////////////////////////////////////////////////////////////
+// CalcPacket::
+
+String CalcPacket::GetTypeNames() const
+{
+	String result;
+	result << '(';
+	for(int i = 0; i < args.GetCount(); i++)
+	{
+		if(i)
+			result << ", ";
+		result << context.GetTypeName(args[i]);
+	}
+	result << ')';
+	return result;
+}
+
+//////////////////////////////////////////////////////////////////////
+// CalcNode::
+
+CalcNode::~CalcNode()
+{
+}
+
+Value CalcNode::TryCalc(CalcContext& context) const
+{
+	try
+	{
+		return Calc(context);
+	}
+	catch(Exc e)
+	{
+		return ErrorValue(e);
+	}
+}
+
+double CalcNode::CalcDouble(CalcContext& context) const
+{
+	if(this == 0)
+		return Null;
+	Value v = Calc(context);
+	if(!IsNull(v) && !IsNumber(v))
+		throw Exc(t_("Number expected, found: ") + context.FormatNull(v));
+	return v;
+}
+
+String CalcNode::CalcString(CalcContext& context) const
+{
+	if(this == 0)
+		return Null;
+	Value v = Calc(context);
+	if(!IsNull(v) && !IsString(v))
+		throw Exc(t_("String expected, found: ") + context.FormatNull(v));
+	return v;
+}
+
+int CalcNode::CalcInt(CalcContext& context) const
+{
+	if(this == 0)
+		return Null;
+	Value v = Calc(context);
+	if(!IsNull(v) && !IsNumber(v))
+		throw Exc(t_("Number expected, found: ") + context.FormatNull(v));
+	return v;
+}
+
+Date CalcNode::CalcDate(CalcContext& context) const
+{
+	if(this == 0)
+		return Null;
+	Value v = Calc(context);
+	if(!IsNull(v) && !IsDateTime(v))
+		throw Exc(t_("Date expected, found: ") + context.FormatNull(v));
+	return v;
+}
+
+Time CalcNode::CalcTime(CalcContext& context) const
+{
+	if(this == 0)
+		return Null;
+	Value v = Calc(context);
+	if(!IsNull(v) && !IsDateTime(v))
+		throw Exc(t_("Date/time expected, found: ") + context.FormatNull(v));
+	return v;
+}
+
+bool CalcNode::CalcBool(CalcContext& context) const
+{
+	if(this == 0)
+		return false;
+	Value v = Calc(context);
+	if(IsNull(v))
+		return false;
+	if(IsString(v))
+		return !String(v).IsEmpty();
+	if(IsNumber(v))
+		return double(v) != 0;
+	throw Exc(t_("Date/time expected, found: ") + context.FormatNull(v));
+}
+
+void CalcNode::Expect(const char *s, String found) const
+{
+	String e;
+	e << name << t_(": expected: ") << s << t_(", found: ") << found;
+	throw Exc(e);
+}
+
+CalcNodePtr GetVariableNode(String varname)
+{
+	return new CalcFunctionNode(varname);
+}
+
+CalcNodePtr GetFunctionNode(String fnname, pick_ Vector<CalcNodePtr>& args)
+{
+	return new CalcFunctionNode(fnname, args);
+}
+
+//////////////////////////////////////////////////////////////////////
+// CalcFunctionNode::
+
+void CalcFunctionNode::ScanArgs(CalcPacket& packet) const
+{
+	packet.args.SetCount(args.GetCount());
+	Value *a = packet.args.Begin();
+	for(const CalcNodePtr *p = args.Begin(), *e = args.End(); p < e; p++, a++)
+		if((*a = (*p)->Calc(packet.context)).IsError())
+			throw Exc(GetErrorText(*a));
+}
+
+//////////////////////////////////////////////////////////////////////
+// CalcParser::
+
+CalcParser::CalcParser()
+: start(0), pos(0)
+, op_begin(0), op_end(0), op_last(OP_NONE)
+{
+}
+
+int CalcParser::Skip()
+{
+REPEAT:
+	while(*pos && *pos <= ' ')
+		pos++;
+	if(*pos == '/')
+		if(pos[1] == '/')
+		{ // line comment
+			while(*pos && *pos != '\n')
+				pos++;
+			goto REPEAT;
+		}
+		else if(pos[1] == '*')
+		{
+			const char *comment = pos++;
+			while(*++pos && !(*pos == '*' && pos[1] == '/'))
+				;
+			if(*pos)
+			{
+				pos += 2;
+				goto REPEAT;
+			}
+			else
+				throw Exc(t_("/* without matching */"));
+		}
+	return *pos;
+}
+
+bool CalcParser::Expect(const String& s)
+{
+	String err = t_("expected ");
+	err << (s.GetLength() > 1 ? t_("symbol") : t_("character")) << t_(" '") << s << t_("', found: ");
+	int l = strlen(pos);
+	if(l > 15)
+		err.Cat(pos, 15);
+	else if(l)
+		err.Cat(pos);
+	else
+		err.Cat(t_("end of line"));
+	throw Exc(err);
+}
+
+String CalcParser::GetIdent()
+{
+	Skip();
+	const char *begin = pos;
+	while(IsIdent(*pos))
+		pos++;
+	const char *end = pos;
+	while(end > begin && end[-1] == ' ')
+		end--;
+	if(end - begin == 8 && !memcmp(begin, "operator", 8))
+	{
+		while(*pos && (byte)*pos <= ' ')
+			pos++;
+		begin = pos;
+		while(*pos && (byte)*pos > ' ' && *pos != '(')
+			pos++;
+		end = pos;
+	}
+	return String(begin, end);
+}
+
+Value CalcParser::GetNumberOrDate()
+{
+	Skip();
+	ASSERT(IsDigit(*pos));
+	const char *begin = pos;
+	bool comma = false;
+	while(IsDigit(*pos))
+		pos++;
+	if(*pos == '.' && pos[1] != '.')
+	{ // try date
+		if(!IsDigit(*++pos) && *pos != 'E' && *pos != 'e')
+		{ // day
+			Date date = GetSysDate();
+			int day = atoi(begin);
+			if(day < 1 || day > LastDayOfMonth(date).day)
+				throw Exc(NFormat(t_("invalid day number ("), day));
+			else
+				date.day = day;
+			return date;
+		}
+		// might be a decimal
+		const char *begin2 = pos;
+		while(IsDigit(*++pos))
+			;
+		if(*pos == '.')
+		{ // no, it's a date
+			Date date = GetSysDate();
+			int day = atoi(begin);
+			int month = atoi(begin2);
+			int year = date.year;
+			if(*++pos == '-' || *pos == '+' || IsDigit(*pos))
+			{ // year number given
+				const char *begin3 = pos;
+				while(IsDigit(*++pos))
+					;
+				year = atoi(begin3);
+				if(pos - begin3 <= 2)
+					date.year = year + (year < 80 ? 2000 : 1900);
+				else if(date.year >= -4000 && date.year <= 4000)
+					date.year = year;
+				else
+					throw Exc(NFormat("neplatn� ��slo roku (%d)", year));
+			}
+			if(month >= 1 && month <= 12)
+				date.month = month;
+			else
+				throw Exc(NFormat("neplatn� ��slo m�s�ce (%d)", month));
+			if(day >= 1 && day <= LastDayOfMonth(date).day)
+				date.day = day;
+			else
+				throw Exc(NFormat("neplatn� ��slo dne (%d)", day));
+			return date;
+		}
+	}
+/*	else if(*pos == ',' && IsDigit(pos[1]))
+	{ // alternative decimal separator
+		comma = true;
+		while(IsDigit(*++pos))
+			;
+	}
+*/
+	if(*pos == 'E' || *pos == 'e')
+	{ // exponent
+		if(*++pos == '+' || *pos == '-')
+			pos++;
+		while(IsDigit(*pos))
+			pos++;
+	}
+
+	const char *temp = NULL;
+	errno = 0;
+	double value;
+	String copy(begin, pos);
+	value = ScanDouble(copy, &temp);
+	if(IsNull(value) || temp != copy.End())
+		throw Exc(NFormat("neplatn� ��seln� konstanta '%s\'", copy));
+	return value;
+}
+
+String CalcParser::GetString()
+{
+	CParser parser(pos);
+	try
+	{
+		String result = parser.ReadOneString();
+		pos = parser.GetPtr();
+		return result;
+	}
+	catch(CParser::Error e)
+	{
+		throw Exc(e);
+	}
+}
+
+CalcNodePtr CalcParser::Scan(const char *t)
+{
+	Clear(t);
+	CalcNodePtr result = ScanAny();
+	if(Skip())
+		throw Exc(NFormat(t_("illegal characters after expression: %s (expression: %s)"), StringSample(pos, 10), StringSample(t, 10)));
+	return result;
+}
+
+CalcNodePtr CalcParser::ScanVoid(const char *t)
+{
+	Clear(t);
+	if(!Skip())
+		return CalcNodePtr();
+	CalcNodePtr result = ScanAny();
+	if(Skip())
+		throw Exc(NFormat(t_("illegal characters after expression: %s (expression: %s)"), StringSample(pos, 10), StringSample(t, 10)));
+	return result;
+}
+
+void CalcParser::Clear(const char *t)
+{
+	start = pos = t;
+}
+
+CalcNodePtr CalcParser::ScanAny()
+{
+	return ScanSelect();
+}
+
+/*
+CalcNodePtr CalcParser::ScanLambda()
+{
+	return Check(OP_LAMBDA) ? new CalcLambdaNode(ScanAny()) : ScanSelect();
+}
+*/
+
+CalcNodePtr CalcParser::ScanSelect()
+{
+	CalcNodePtr node = ScanLogOr();
+	if(Check(OP_QUESTION))
+	{ // ?:
+		CalcNodePtr when1 = ScanAny();
+		Force(OP_COLON, ":");
+		CalcNodePtr when0 = ScanAny();
+		node = new CalcSelectNode(node, when1, when0);
+	}
+	return node;
+}
+
+CalcNodePtr CalcParser::ScanLogOr()
+{
+	CalcNodePtr node = ScanLogAnd();
+	while(Check(OP_LOG_OR))
+		node = new CalcLogOrNode(node, ScanLogAnd());
+	return node;
+}
+
+CalcNodePtr CalcParser::ScanLogAnd()
+{
+	CalcNodePtr node = ScanEq();
+	while(Check(OP_LOG_AND))
+		node = new CalcLogAndNode(node, ScanEq());
+	return node;
+}
+
+CalcNodePtr CalcParser::ScanEq()
+{
+	CalcNodePtr node = ScanCompare();
+	for(;;)
+		if(Check(OP_EQ))
+			node = new CalcFunctionNode("==", node, ScanCompare());
+		else if(Check(OP_NE))
+			node = new CalcFunctionNode("!=", node, ScanCompare());
+		else
+			return node;
+}
+
+CalcNodePtr CalcParser::ScanCompare()
+{
+	CalcNodePtr node = ScanBitOr();
+	for(;;)
+		if(Check(OP_LE))
+			node = new CalcFunctionNode("<=", node, ScanBitOr());
+		else if(Check(OP_GE))
+			node = new CalcFunctionNode(">=", node, ScanBitOr());
+		else if(Check(OP_LT))
+			node = new CalcFunctionNode("<", node, ScanBitOr());
+		else if(Check(OP_GT))
+			node = new CalcFunctionNode(">", node, ScanBitOr());
+		else
+			return node;
+}
+
+CalcNodePtr CalcParser::ScanBitOr()
+{
+	CalcNodePtr node = ScanBitXor();
+	while(Check(OP_BIT_OR))
+		node = new CalcFunctionNode("|", node, ScanBitXor());
+	return node;
+}
+
+CalcNodePtr CalcParser::ScanBitXor()
+{
+	CalcNodePtr node = ScanBitAnd();
+	while(Check(OP_BIT_XOR))
+		node = new CalcFunctionNode("^", node, ScanBitAnd());
+	return node;
+}
+
+CalcNodePtr CalcParser::ScanBitAnd()
+{
+	CalcNodePtr node = ScanAdditive();
+	while(Check(OP_BIT_AND))
+		node = new CalcFunctionNode("&", node, ScanAdditive());
+	return node;
+}
+
+CalcNodePtr CalcParser::ScanAdditive()
+{
+	CalcNodePtr node = ScanShift();
+	for(;;)
+		if(Check(OP_ADD))
+			node = new CalcFunctionNode("+", node, ScanShift());
+		else if(Check(OP_SUB))
+			node = new CalcFunctionNode("-", node, ScanShift());
+		else
+			return node;
+}
+
+CalcNodePtr CalcParser::ScanShift()
+{
+	CalcNodePtr node = ScanMultiplicative();
+	for(;;)
+		if(Check(OP_LSHIFT))
+			node = new CalcFunctionNode("<<", node, ScanMultiplicative());
+		else if(Check(OP_RSHIFT))
+			node = new CalcFunctionNode(">>", node, ScanMultiplicative());
+		else
+			return node;
+}
+
+CalcNodePtr CalcParser::ScanMultiplicative()
+{
+	CalcNodePtr node = ScanPow();
+	for(;;)
+		if(Check(OP_MUL))
+			node = new CalcFunctionNode("*", node, ScanPow());
+		else if(Check(OP_DIV))
+			node = new CalcFunctionNode("/", node, ScanPow());
+		else if(Check(OP_MOD))
+			node = new CalcFunctionNode("%", node, ScanPow());
+		else
+			return node;
+}
+
+CalcNodePtr CalcParser::ScanPow()
+{
+	CalcNodePtr node = ScanPrefix();
+	while(Check(OP_POW))
+		node = new CalcFunctionNode("pow", node, ScanPow());
+	return node;
+}
+
+CalcNodePtr CalcParser::ScanPrefix()
+{
+	Skip();
+	const char *start = pos;
+	switch(GetOperator())
+	{
+	case OP_LAMBDA: SkipOperator(); return new CalcLambdaNode(ScanPrefix());
+	case OP_ADD: SkipOperator(); return new CalcFunctionNode("+", ScanPrefix());
+	case OP_SUB: SkipOperator(); return new CalcFunctionNode("-", ScanPrefix());
+	case OP_BIT_NOT: SkipOperator(); return new CalcFunctionNode("~", ScanPrefix());
+	case OP_LOG_NOT: SkipOperator(); return new CalcFunctionNode("!", ScanPrefix());
+	case OP_LPAR:
+		{ // parenthesised subexpression
+			const char *begin = pos;
+			SkipOperator();
+			CalcNodePtr exp = ScanAny();
+			if(!Force(OP_RPAR, ")"))
+				throw Exc(NFormat(t_("left parenthesis not matched; subexpression starts at %s"), StringSample(begin, 20)));
+			return ScanPostfix(exp);
+		}
+	case OP_LBRACKET:
+		SkipOperator();
+		{ // array constructor
+			CalcNodePtr ctr;
+			if(Check(OP_RBRACKET))
+				ctr = new CalcFunctionNode("[,,]");
+			else
+			{
+				CalcNodePtr arg = ScanAny();
+				if(Check(OP_DOTS))
+				{
+					CalcNodePtr maxrng = ScanAny();
+					ctr = new CalcFunctionNode("[..]", arg, maxrng);
+				}
+				else
+				{
+					Vector<CalcNodePtr> arglist;
+					arglist.Add() = arg;
+					while(Check(OP_COMMA))
+						arglist.Add() = ScanAny();
+					ctr = new CalcFunctionNode("[,,]", arglist);
+				}
+				if(!Force(OP_RBRACKET, "]"))
+					throw Exc("chyb� prav� hranat� z�vorka ']'");
+			}
+			return ScanPostfix(ctr);
+		}
+	}
+	if(*pos == '\"')
+	{
+		return ScanPostfix(new CalcConstNode(GetString()));
+	}
+	if(IsDigit(*pos)) // numeric or date constant
+		return ScanPostfix(new CalcConstNode(GetNumberOrDate()));
+	if(IsIdent(*pos))
+	{
+		String ident = GetIdent();
+		Vector<CalcNodePtr> arguments;
+		ScanArgs(arguments);
+		return ScanPostfix(new CalcFunctionNode(ident, arguments));
+	}
+	const char *p = pos;
+	if(*p == 0)
+		p = t_("end of line");
+	throw Exc(t_("constant or function expected, found: ") + StringSample(p, 15));
+	return 0;
+}
+
+CalcNodePtr CalcParser::ScanPostfix(CalcNodePtr node)
+{
+	for(;;)
+		if(Check(OP_DOT))
+		{ // member access
+			byte c = Skip();
+			String id = GetIdent();
+			Vector<CalcNodePtr> nodes;
+			nodes | node;
+			ScanArgs(nodes);
+			node = new CalcFunctionNode(id, nodes);
+		}
+		else if(Check(OP_LBRACE))
+		{
+			Vector<CalcNodePtr> list;
+			do
+			{
+				list.Add() = ScanAny();
+				if(!Check(OP_COMMA)) // default value
+					break;
+				list.Add() = ScanAny();
+			}
+			while(Check(OP_COMMA));
+			Force(OP_RBRACE, "}");
+			node = new CalcSwitchNode(node, list);
+		}
+		else if(Check(OP_LBRACKET))
+		{
+			CalcNodePtr index = ScanAny();
+			Force(OP_RBRACKET, "]");
+			node = new CalcFunctionNode("[]", node, index);
+		}
+		else
+			return node;
+}
+
+void CalcParser::ScanArgs(Vector<CalcNodePtr>& dest)
+{
+	if(Check(OP_LPAR) && !Check(OP_RPAR))
+	{
+		const char *begin = pos;
+		do
+			dest | ScanAny();
+		while(Check(OP_COMMA));
+		if(!Check(OP_RPAR))
+			Expect(NFormat("')' (za��tek podv�razu: %s)", StringSample(begin - 1, 20)));
+	}
+}
+
+int CalcParser::GetOperator()
+{
+	if(op_begin == pos)
+		return op_last;
+	Skip();
+	op_begin = op_end = pos;
+	switch(*op_end++)
+	{
+	case '?': op_last = OP_QUESTION; break;
+	case ':': op_last = OP_COLON; break;
+	case '&': op_last = (*op_end == '&' ? op_end++, OP_LOG_AND : OP_BIT_AND); break;
+	case '|': op_last = (*op_end == '|' ? op_end++, OP_LOG_OR  : OP_BIT_OR); break;
+	case '^': op_last = OP_BIT_XOR; break;
+	case '<': op_last = (*op_end == '=' ? op_end++, OP_LE : *op_end == '<' ? op_end++, OP_LSHIFT : OP_LT); break;
+	case '>': op_last = (*op_end == '=' ? op_end++, OP_GE : *op_end == '>' ? op_end++, OP_RSHIFT : OP_GT); break;
+	case '!': op_last = (*op_end == '=' ? op_end++, OP_NE : OP_LOG_NOT); break;
+	case '=': op_last = (*op_end == '=' ? op_end++, OP_EQ : (op_end--, OP_NONE)); break;
+	case '+': op_last = OP_ADD; break;
+	case '-': op_last = OP_SUB; break;
+	case '*': op_last = (*op_end == '*' ? op_end++, OP_POW : OP_MUL); break;
+	case '/': op_last = OP_DIV; break;
+	case '%': op_last = OP_MOD; break;
+	case '~': op_last = OP_BIT_NOT; break;
+	case '#': op_last = OP_LAMBDA; break;
+	case '(': op_last = OP_LPAR; break;
+	case ')': op_last = OP_RPAR; break;
+	case '[': op_last = OP_LBRACKET; break;
+	case ']': op_last = OP_RBRACKET; break;
+	case '{': op_last = OP_LBRACE; break;
+	case '}': op_last = OP_RBRACE; break;
+	case ',': op_last = OP_COMMA; break;
+	case '.': op_last = (*op_end == '.' ? op_end++, OP_DOTS : OP_DOT); break;
+	default: op_end--; op_last = OP_NONE; break;
+	}
+	return op_last;
+}
+
+int CalcParser::SkipOperator()
+{
+	int op = GetOperator();
+	pos = op_end;
+	return op;
+}
+
+bool CalcParser::Check(int op)
+{
+	if(op != GetOperator())
+		return false;
+	SkipOperator();
+	return true;
+}
+
+bool CalcParser::Force(int op, const char *expect)
+{
+	if(Check(op))
+		return true;
+	Expect(expect);
+	return false;
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/TCore/CalcNode.h b/uppsrc/TCore/CalcNode.h
new file mode 100644
index 000000000..e1eb80d66
--- /dev/null
+++ b/uppsrc/TCore/CalcNode.h
@@ -0,0 +1,662 @@
+NAMESPACE_UPP
+
+struct CalcPacket;
+class  CalcNode;
+class  CalcContext;
+
+typedef RefPtr<CalcNode> CalcNodePtr;
+
+class CalcNode : public RefBase
+{
+public:
+	CalcNode(String name = Null, pick_ Vector<CalcNodePtr> args = Vector<CalcNodePtr>()) : name(name), args(args) {}
+	CalcNode(String name, const Vector<CalcNodePtr>& args, int deep) : name(name), args(args, 0) {}
+	CalcNode(String name, CalcNodePtr arg) : name(name) { args.SetCount(1); args[0] = arg; }
+	CalcNode(String name, CalcNodePtr arg1, CalcNodePtr arg2) : name(name) { args.SetCount(2); args[0] = arg1; args[1] = arg2; }
+	CalcNode(const CalcNode& node) : name(node.name), args(node.args, 0) {}
+	virtual ~CalcNode();
+
+	virtual Value       Calc(CalcContext& context) const = 0;
+	virtual CalcNodePtr Clone() const                  { return CalcNodePtr(); }
+	virtual String      Format() const                 { return Null; }
+	virtual bool        IsConst() const                { return false; }
+	virtual CalcNodePtr Optimize(CalcContext& context) { return this; }
+
+	Value               TryCalc(CalcContext& context) const; // catches Exc to return ErrorValue
+
+	double              CalcDouble(CalcContext& context) const;
+	String              CalcString(CalcContext& context) const;
+	int                 CalcInt(CalcContext& context) const;
+	Date                CalcDate(CalcContext& context) const;
+	Time                CalcTime(CalcContext& context) const;
+	bool                CalcBool(CalcContext& context) const;
+
+	String              GetName() const { return name; }
+
+public:
+	String              name;
+	Vector<CalcNodePtr> args;
+
+protected:
+	void                Expect(const char *s, String found) const; // throws Exc
+
+};
+
+class CalcConstNode : public CalcNode
+{
+public:
+	CalcConstNode(Value value) : CalcNode("(const)"), value(value) {}
+
+	virtual CalcNodePtr Clone() const { return new CalcConstNode(*this); }
+	virtual Value       Calc(CalcContext& context) const;
+	virtual String      Format() const;
+	virtual bool        IsConst() const                { return true; }
+
+public:
+	Value               value;
+};
+
+class CalcLambdaNode : public CalcNode
+{
+public:
+	CalcLambdaNode(CalcNodePtr arg) : CalcNode("#", arg) {}
+
+	virtual CalcNodePtr Clone() const { return new CalcLambdaNode(*this); }
+	virtual Value       Calc(CalcContext& context) const;
+	virtual String      Format() const;
+};
+
+class CalcLogOrNode : public CalcNode
+{
+public:
+	CalcLogOrNode(CalcNodePtr left, CalcNodePtr right) : CalcNode("||", left, right) {}
+
+	virtual CalcNodePtr Clone() const { return new CalcLogOrNode(*this); }
+	virtual Value       Calc(CalcContext& context) const;
+	virtual String      Format() const;
+	virtual CalcNodePtr Optimize(CalcContext& context);
+};
+
+class CalcLogAndNode : public CalcNode
+{
+public:
+	CalcLogAndNode(CalcNodePtr left, CalcNodePtr right) : CalcNode("&&", left, right) {}
+
+	virtual CalcNodePtr Clone() const { return new CalcLogAndNode(*this); }
+	virtual Value       Calc(CalcContext& context) const;
+	virtual String      Format() const;
+	virtual CalcNodePtr Optimize(CalcContext& context);
+};
+
+class CalcSelectNode : public CalcNode
+{
+public:
+	CalcSelectNode(CalcNodePtr cond, CalcNodePtr left, CalcNodePtr right)
+		: CalcNode("?:") { args.SetCount(3); args[0] = cond; args[1] = left; args[2] = right; }
+
+	virtual CalcNodePtr Clone() const { return new CalcSelectNode(*this); }
+	virtual Value       Calc(CalcContext& context) const;
+	virtual String      Format() const;
+	virtual CalcNodePtr Optimize(CalcContext& context);
+	enum { COND, IFTRUE, IFFALSE };
+};
+
+class CalcSwitchNode : public CalcNode
+{
+public:
+	CalcSwitchNode(CalcNodePtr cond, pick_ Vector<CalcNodePtr>& list) : CalcNode("{}")
+	{ args.Reserve(list.GetCount() + 1); args.Add(cond); args.AppendPick(list); }
+
+	virtual CalcNodePtr Clone() const { return new CalcSwitchNode(*this); }
+	virtual Value       Calc(CalcContext& context) const;
+	virtual String      Format() const;
+	virtual CalcNodePtr Optimize(CalcContext& context);
+};
+
+class CalcFunctionNode : public CalcNode
+{
+public:
+	CalcFunctionNode(String name)                                            : CalcNode(name) {}
+	CalcFunctionNode(String name, CalcNodePtr arg)                           : CalcNode(name, arg) {}
+	CalcFunctionNode(String name, CalcNodePtr arg1, CalcNodePtr arg2)        : CalcNode(name, arg1, arg2) {}
+	CalcFunctionNode(String name, pick_ Vector<CalcNodePtr>& args)           : CalcNode(name, args) {}
+	CalcFunctionNode(String name, const Vector<CalcNodePtr>& args, int deep) : CalcNode(name, args, 0) {}
+
+	void                ScanArgs(CalcPacket& packet) const;
+
+	virtual CalcNodePtr Clone() const  { return new CalcFunctionNode(*this); }
+	virtual Value       Calc(CalcContext& context) const;
+	virtual String      Format() const;
+};
+
+void        RunDlgCalc(CalcContext& context);
+
+CalcNodePtr GetVariableNode(String varname);
+CalcNodePtr GetFunctionNode(String fnname, pick_ Vector<CalcNodePtr>& args);
+
+inline bool IsIdent(byte c)
+{
+	return IsAlNum(c) || c == '_' || c == '$' || c == '@';
+}
+
+int CharFilterCalcIdent(int c);
+int CharFilterCalcUpperIdent(int c);
+
+struct CalcPacket
+{
+	CalcPacket(CalcContext& context, const String& name) : context(context), name(name)
+		, help(false)
+		{}
+
+	String         GetTypeNames() const;
+
+	CalcContext&   context;
+	String         name;
+	Vector<Value>  args;
+	Value          result;
+	bool           help;
+};
+
+typedef bool (*CalcProc)(CalcPacket& packet);
+typedef VectorMap<String, CalcProc> CalcProcMap;
+
+typedef Gate1<CalcPacket&> CalcGate;
+typedef VectorMap<String, CalcGate> CalcGateMap;
+
+class HelpCalc
+{
+public:
+	HelpCalc(CalcGate proc, const char *ident, const char *topic, String (*groupfn)());
+
+	class Compare
+	{
+	public:
+		enum MODE { ALPHABETIC, GROUPS };
+		Compare(MODE mode = ALPHABETIC) : mode(mode), lang(GetLanguageInfo()) {}
+
+		bool operator () (const HelpCalc *a, const HelpCalc *b) const;
+
+	private:
+		MODE mode;
+		const LanguageInfo& lang;
+	};
+
+	String         GetTitle() const;
+
+public:
+//	int            ord;
+	CalcGate       proc;
+	String       (*groupfn)();
+	String         ident;
+	String         topic;
+
+private:
+	void Init(CalcGate proc, const char *ident, const char *topic, String (*groupfn)());
+};
+
+typedef Vector<const HelpCalc *> HelpCalcMap;
+
+HelpCalcMap&   GetHelpCalcMap();
+void           AddHelpCalc(const HelpCalc& calc);
+Vector<String> GetHelpCalcGroups();
+
+/*
+class HelpCalcIndex
+{
+public:
+	typedef VectorMap<String, const HelpCalc *> IdMap;
+
+	static HelpCalcIndex& Get();
+
+	int                   Add(const HelpCalc& calc) { index.Add(calc.ident, &calc); return index.GetCount(); }
+
+	void                  PutSummary() const;
+	void                  PutGroups() const;
+	void                  AddIndexEntries() const; // adds entries to dynamic index
+
+	const IdMap&          GetIndex() const { return index; }
+
+private:
+	IdMap                 index;
+
+private:
+	HelpCalcIndex();
+};
+*/
+
+String HelpCalcLink(const char *id, const char *ref = " (viz str._#)", bool bold = true);
+
+class CalcSymbols : Moveable<CalcSymbols>, DeepCopyOption<CalcSymbols>
+{
+public:
+	CalcSymbols() {}
+	CalcSymbols(const CalcSymbols& l, int deep)
+	: var_index(l.var_index, 0)
+	, var_value(l.var_value, 0)
+	, var_const(l.var_const, 0)
+	, functions(l.functions, 0) {}
+
+	void                     Clear();
+	void                     Add(String name, CalcGate proc)   { functions.Add(name, proc); }
+	void                     Set(String name, Value v, bool c) { int i = var_index.FindAdd(name); var_value.DoIndex(i) = v; var_const.DoIndex(i) = c; }
+	void                     Remove(String name);
+
+	Index<String>            var_index;
+	Vector<Value>            var_value;
+	Vector<bool>             var_const;
+	CalcGateMap              functions;
+};
+
+class CalcSymbolsLevel : public CalcSymbols
+{
+public:
+	CalcSymbolsLevel(Vector<CalcSymbols *>& owner) : owner(owner) { owner.Add(this); }
+	~CalcSymbolsLevel()                                           { owner.Drop(); }
+
+private:
+	Vector<CalcSymbols *>& owner;
+};
+
+template <class T>
+class CalcLocalItem;
+
+template <class T>
+class CalcLocalMap
+{
+public:
+	CalcLocalMap() : head(0), tail(0) {}
+
+	void Add(CalcLocalItem<T> *item);
+	void Set(T *this_ptr, CalcSymbols& map);
+	void Set(T *this_ptr) { Set(this_ptr, this_ptr -> stack.Top()); }
+
+private:
+	CalcLocalItem<T> *head, *tail;
+};
+
+template <class T>
+class CalcLocalItem
+{
+public:
+	CalcLocalItem(CalcLocalMap<T>& map, const String& name, bool (T::*method)(CalcPacket&));
+
+	String             name;
+	bool          (T::*method)(CalcPacket&);
+	CalcLocalItem<T>  *next;
+};
+
+template <class T>
+CalcLocalItem<T>::CalcLocalItem(CalcLocalMap<T>& map, const String& name, bool (T::*method)(CalcPacket&))
+: next(0)
+, name(name)
+, method(method)
+{
+	map.Add(this);
+}
+
+template <class T>
+void CalcLocalMap<T>::Add(CalcLocalItem<T> *item)
+{
+	if(head == 0)
+		head = tail = item;
+	else
+		tail = tail -> next = item;
+}
+
+template <class T>
+void CalcLocalMap<T>::Set(T *this_ptr, CalcSymbols& map)
+{
+	for(CalcLocalItem<T> *p = head; p; p = p -> next)
+		map.functions.Add(p -> name, callback(this_ptr, p -> method));
+}
+
+#define DECLARE_LOCAL_MAP() static CalcLocalMap<CLASSNAME>& GetLocalMap();
+#define IMPLEMENT_LOCAL_MAP() GLOBAL_VAR(CalcLocalMap<BASECLASS>, BASECLASS::GetLocalMap)
+
+class CalcContext : Moveable<CalcContext>, DeepCopyOption<CalcContext>
+{
+public:
+	typedef CalcContext CLASSNAME;
+
+		class Nesting
+	{
+	public:
+		Nesting(CalcContext& context) : context(context) { context.PushLevel(); }
+		~Nesting()                                       { context.PopLevel(); }
+
+	private:
+		CalcContext& context;
+	};
+
+		class Global
+	{
+	public:
+		Global(const String& name, CalcProc proc) { GetGlobals().Add(name, proc); }
+	};
+
+	CalcContext();
+	CalcContext(const CalcContext& context, int);
+	virtual ~CalcContext();
+
+	Value               Evaluate(String expr);
+	double              EvaluateDouble(String expr);
+	String              EvaluateString(String expr);
+	int                 EvaluateInt(String expr);
+	Date                EvaluateDate(String expr);
+	Time                EvaluateTime(String expr);
+	bool                EvaluateBool(String expr);
+
+	String              OptimizeConstant(String expr);
+	CalcNodePtr         OptimizeConstant(CalcNodePtr src);
+
+	String              Convert(String s, bool throw_errors, const class Convert& convert = NoConvert());
+	static void         ParseConvert(String s, Vector<String>& sparts, Vector<CalcNodePtr>& cparts, bool throw_errors);
+	String              CalcConvert(const Vector<String>& sparts, const Vector<CalcNodePtr>& cparts, bool throw_errors, const UPP::Convert& convert = NoConvert());
+
+	virtual Value       Calc(CalcPacket& packet);
+	virtual Value       TryCalc(CalcPacket& packet);
+	virtual String      GetTypeName(Value value) const;
+	virtual String      FormatNull(Value value, bool no_text = false);
+	virtual String      FormatText(Value value, const UPP::Convert& convert = NoConvert());
+
+	virtual void        PushLevel();
+	virtual void        PopLevel();
+
+	CalcContext&        Add(String name, CalcGate proc)           { stack.Top().Add(name, proc); return *this; }
+	CalcContext&        Set(String name, Value v, bool c = false) { stack.Top().Set(name, v, c); return *this; }
+	CalcContext&        Remove(String name)                       { stack.Top().Remove(name); return *this; }
+	Value               Get(String name) const;
+
+	void                AddExternal(CalcSymbols& e)                    { externals.Add(&e); }
+	void                AddExternal(const Vector<CalcSymbols *>& ext)  { externals.Append(ext); }
+	void                RemoveExternal(CalcSymbols& e);
+
+	static CalcProcMap& GetGlobals();
+
+public:
+	enum { MAX_STACK_DEPTH = 1000 };
+
+	int                 language;
+	int                 nesting;
+	bool                opt_const;
+	Array<CalcSymbols>  stack;
+	Vector<CalcSymbols *> externals;
+};
+
+template <>
+struct CalcType<const CalcNode *> : public CalcRawType<const CalcNode *>
+{
+	static Value           ToValue(const CalcNode *cn) { return cn ? RawValue<const CalcNode *>(cn) : Value(); }
+	static const CalcNode *ValueTo(Value v)            { return IsType(v) ? RawValue<const CalcNode *>::Extract(v) : 0; }
+	static String          Describe();
+};
+
+class CalcParser
+{
+public:
+	CalcParser();
+
+	virtual CalcNodePtr   Scan(const char *text);
+	virtual CalcNodePtr   ScanVoid(const char *text);
+
+protected:
+	virtual CalcNodePtr   ScanAny();
+//	virtual CalcNodePtr   ScanLambda();
+	virtual CalcNodePtr   ScanSelect();
+	virtual CalcNodePtr   ScanLogOr();
+	virtual CalcNodePtr   ScanLogAnd();
+	virtual CalcNodePtr   ScanEq();
+	virtual CalcNodePtr   ScanCompare();
+	virtual CalcNodePtr   ScanBitXor();
+	virtual CalcNodePtr   ScanBitAnd();
+	virtual CalcNodePtr   ScanBitOr();
+	virtual CalcNodePtr   ScanAdditive();
+	virtual CalcNodePtr   ScanShift();
+	virtual CalcNodePtr   ScanMultiplicative();
+	virtual CalcNodePtr   ScanPow();
+	virtual CalcNodePtr   ScanPrefix();
+	virtual CalcNodePtr   ScanPostfix(CalcNodePtr node);
+	virtual void          ScanArgs(Vector<CalcNodePtr>& dest);
+
+	void                  Clear(const char *t);
+
+	int                   Skip();
+	bool                  Expect(const String& s);
+
+	String                GetIdent();
+	Value                 GetNumberOrDate();
+	String                GetString();
+
+	enum OPERATOR
+	{
+		OP_NONE,
+		OP_QUESTION, OP_COLON,
+		OP_LOG_AND, OP_LOG_OR,
+		OP_LT, OP_LE, OP_GE, OP_GT,
+		OP_EQ, OP_NE,
+		OP_BIT_AND, OP_BIT_OR, OP_BIT_XOR,
+		OP_LSHIFT, OP_RSHIFT,
+		OP_ADD, OP_SUB,
+		OP_MUL, OP_DIV, OP_MOD,
+		OP_POW,
+		OP_LOG_NOT, OP_BIT_NOT,
+		OP_LAMBDA,
+		OP_LPAR, OP_RPAR,
+		OP_LBRACKET, OP_RBRACKET,
+		OP_LBRACE, OP_RBRACE,
+		OP_COMMA,
+		OP_DOT, OP_DOTS,
+
+		OP_LAST,
+	};
+
+	virtual int           GetOperator();
+	int                   SkipOperator();
+	bool                  Check(int op);
+	bool                  Force(int op, const char *expect);
+
+protected:
+	const char           *start;
+	const char           *pos;
+
+	int                   op_last;
+	const char           *op_begin;
+	const char           *op_end;
+};
+
+template <class BTA, class R>
+inline bool CalcCast(CalcPacket& packet, R (*fn)(), BTA * = 0)
+{
+	if(packet.help)
+	{ // generate help info
+		packet.result = CalcType<R>::Describe();
+		return true;
+	}
+	if(packet.args.GetCount() != 0)
+		return false;
+	packet.result = CalcType<R>::ToValue(fn());
+	return true;
+}
+
+template <class BTA, class R>
+inline bool CalcCastPacket(CalcPacket& packet, R (*fn)(CalcPacket& packet), BTA * = 0)
+{
+	if(packet.help)
+	{ // generate help info
+		packet.result = CalcType<R>::Describe();
+		return true;
+	}
+	if(packet.args.GetCount() != 0)
+		return false;
+	packet.result = CalcType<R>::ToValue(fn(packet));
+	return true;
+}
+
+template <class BTA, class O, class M, class R>
+inline bool CalcCastMember(CalcPacket& packet, O *clss, R (M::*fn)(), BTA * = 0)
+{
+	if(packet.help)
+	{ // generate help info
+		packet.result = CalcType<R>::Describe();
+		return true;
+	}
+	if(packet.args.GetCount() != 0)
+		return false;
+	packet.result = CalcType<R>::ToValue((clss ->* fn)());
+	return true;
+}
+
+struct BTA0 { enum { NIL = 0 }; };
+struct BTA1 { enum { NIL = 1 }; };
+
+#define E__Class(I)   class C##I
+#define E__Arg(I)     C##I
+#define E__Descr(I)   packet.args.Add(CalcType<C##I>::Describe())
+#define E__ChkArg(I) \
+	if(BTA::NIL && IsNull(packet.args[I - 1])) \
+		null = true; \
+	else if(!CalcType<C##I>::IsType(packet.args[I - 1])) \
+		return false;
+#define E__CvArg(I) CalcType<C##I>::ValueTo(packet.args[I - 1])
+
+#define CalcCastTemplate(NM, I) \
+template <class BTA, class R, __List##I(E__Class)> \
+inline bool NM(CalcPacket& packet, R (*fn)(CP_ARG_PREFIX __List##I(E__Arg)), BTA * = 0) \
+{ \
+	if(packet.help) \
+	{ \
+		packet.result = CalcType<R>::Describe(); \
+		__List##I(E__Descr); \
+		return true; \
+	} \
+	if(packet.args.GetCount() != I) \
+		return false; \
+	bool null = false; \
+	__Expand##I(E__ChkArg) \
+	if(BTA::NIL && null) \
+	{ \
+		packet.result = Value(); \
+		return true; \
+	} \
+	packet.result = CalcType<R>::ToValue(fn(CP_PREFIX \
+		__List##I(E__CvArg))); \
+	return true; \
+}
+
+#define CalcCastMemberTemplate(I) \
+template <class BTA, class O, class M, class R, __List##I(E__Class)> \
+inline bool CalcCastMember(CalcPacket& packet, O *clss, R (M::*fn)(__List##I(E__Arg)), BTA * = 0) \
+{ \
+	if(packet.help) \
+	{ \
+		packet.result = CalcType<R>::Describe();  \
+		__List##I(E__Descr); \
+		return true; \
+	} \
+	if(packet.args.GetCount() != I) \
+		return false; \
+	bool null = false; \
+	__Expand##I(E__ChkArg) \
+	if(BTA::NIL && null) \
+	{ \
+		packet.result = Value(); \
+		return true; \
+	} \
+	packet.result = CalcType<R>::ToValue((clss ->* fn)( \
+		__List##I(E__CvArg))); \
+	return true; \
+} \
+
+#define CP_ARG_PREFIX
+#define CP_PREFIX
+CalcCastTemplate(CalcCast, 1)
+CalcCastTemplate(CalcCast, 2)
+CalcCastTemplate(CalcCast, 3)
+CalcCastTemplate(CalcCast, 4)
+CalcCastTemplate(CalcCast, 5)
+CalcCastTemplate(CalcCast, 6)
+#undef  CP_ARG_PREFIX
+#undef  CP_PREFIX
+
+#define CP_ARG_PREFIX CalcPacket& packet,
+#define CP_PREFIX packet,
+CalcCastTemplate(CalcCastPacket, 1)
+CalcCastTemplate(CalcCastPacket, 2)
+CalcCastTemplate(CalcCastPacket, 3)
+CalcCastTemplate(CalcCastPacket, 4)
+CalcCastTemplate(CalcCastPacket, 5)
+CalcCastTemplate(CalcCastPacket, 6)
+#undef  CP_ARG_PREFIX
+#undef  CP_PREFIX
+
+CalcCastMemberTemplate(1)
+CalcCastMemberTemplate(2)
+CalcCastMemberTemplate(3)
+CalcCastMemberTemplate(4)
+CalcCastMemberTemplate(5)
+CalcCastMemberTemplate(6)
+
+#define FGENID2(tag, lnum) __##tag##lnum##__
+#define FGENID1(tag, lnum) FGENID2(tag, lnum)
+#define FGENID(a, b) COMBINE(COMBINE(a, b), __LINE__)
+
+#ifndef NOHELP
+#define FDECLTH(tag, topic, id, group, proc) \
+static GLOBAL_VARP(HelpCalc, FGENID(chlp, tag), (callback(proc), id, "Calc$" topic, group)); \
+INITBLOCK_(FGENID(hblk, tag)) { FGENID(chlp, tag)(); } \
+static void FGENID(chlt, tag)(String& out) { out.Cat(FGENID(chlp, tag)().GetTitle()); } \
+RegisterHelpTopicInfoTag(COMBINE(tag, __LINE__), "Calc$" topic, __FILE__, callback(&FGENID(chlt, tag)), CNULL)
+#else//NOHELP
+#define FDECLTH(tag, topic, id, group, proc)
+#endif//NOHELP
+
+#define FDECLT(null, tag, topic, id, group, call) \
+static bool FGENID(proc, tag)(CalcPacket& packet) { return CalcCast<null>(packet, call); } \
+INITBLOCK_(FGENID(gblk, tag)) { static CalcContext::Global FGENID(init, tag)(id, &FGENID(proc, tag)); } \
+FDECLTH(tag, topic, id, group, &FGENID(proc, tag))
+
+#define FDECLTA(null, tag, topic, id, group, call) \
+static bool FGENID(proc, tag)(CalcPacket& packet) { return CalcCastPacket<null>(packet, call); } \
+INITBLOCK_(FGENID(gblk, tag)) { static CalcContext::Global FGENID(init, tag)(id, &FGENID(proc, tag)); } \
+FDECLTH(tag, topic, id, group, &FGENID(proc, tag))
+
+#define FDECLQ(topic, id, group, gate) \
+INITBLOCK_(FGENID(gblk, tag)) { static CalcContext::Global FGENID(init, dflt)(id, gate); } \
+FDECLTH(dflt, topic, id, group, gate)
+
+#define FDECL(id, call, group)        FDECLT(BTA0, dflt, ASSTRING(call),               id,           group, call)
+#define FDECLX(id, group)             FDECLT(BTA0, id,  ASSTRING(id),                 ASSTRING(id), group, id)
+#define FDECLP(id, x, group)          FDECLT(BTA0, id,  "C" ASSTRING(id) ASSTRING(x), ASSTRING(id), group, COMBINE3(C, id, x))
+
+#define FDECL0(id, call, group)       FDECLT(BTA1, dflt, ASSTRING(call),               id,           group, call)
+#define FDECLX0(id, group)            FDECLT(BTA1, id,  ASSTRING(id),                 ASSTRING(id), group, id)
+#define FDECLP0(id, x, group)         FDECLT(BTA1, id,  "C" ASSTRING(id) ASSTRING(x), ASSTRING(id), group, COMBINE3(C, id, x))
+
+#define FDECLA(id, call, group)       FDECLTA(BTA0, dflt, ASSTRING(call),               id,           group, call)
+#define FDECLAX(id, group)            FDECLTA(BTA0, id,  ASSTRING(id),                 ASSTRING(id), group, id)
+#define FDECLAP(id, x, group)         FDECLTA(BTA0, id,  "C" ASSTRING(id) ASSTRING(x), ASSTRING(id), group, COMBINE3(C, id, x))
+
+#define FDECLA0(id, call, group)      FDECLTA(BTA1, dflt, ASSTRING(call),               id,           group, call)
+#define FDECLAX0(id, group)           FDECLTA(BTA1, id,  ASSTRING(id),                 ASSTRING(id), group, id)
+#define FDECLAP0(id, x, group)        FDECLTA(BTA1, id,  "C" ASSTRING(id) ASSTRING(x), ASSTRING(id), group, COMBINE3(C, id, x))
+
+#define MDECLT(null, topic, id, group, call) \
+struct FGENID(clcp, dflt) : public BASECLASS \
+{ FGENID(clcp, dflt)(); bool CalcIt(CalcPacket& packet) { return CalcCastMember<null>(packet, this, &BASECLASS::call); } }; \
+static GLOBAL_VARP(HelpCalc, FGENID(chlp, dflt), (callback(static_cast<BASECLASS *>(0), \
+		brutal_cast<bool (BASECLASS::*)(CalcPacket&)>(&FGENID(clcp, dflt)::CalcIt)), \
+		id, "Calc$" topic, group)); \
+INITBLOCK_(FGENID(mblk, tag)) { \
+	FGENID(chlp, dflt)(); \
+	static CalcLocalItem<BASECLASS> FGENID(clci, dflt)(BASECLASS::GetLocalMap(), id, \
+			brutal_cast<bool (BASECLASS::*)(CalcPacket&)>(&FGENID(clcp, dflt)::CalcIt)); \
+} \
+static void FGENID(chlt, dflt)(String& out) { out.Cat(FGENID(chlp, dflt)().GetTitle()); } \
+RegisterHelpTopicInfo("Calc$" topic, __FILE__, callback(&FGENID(chlt, dflt)), CNULL)
+
+#define MDECL(id, x, group)   MDECLT(BTA0, ASSTRING(call),               id,           group, call)
+#define MDECL0(id, x, group)  MDECLT(BTA1, ASSTRING(id),                 id,           group, COMBINE3(C, id, x))
+#define MDECLP(id, x, group)  MDECLT(BTA0, "C" ASSTRING(id) ASSTRING(x), ASSTRING(id), group, COMBINE3(C, id, x))
+#define MDECLP0(id, x, group) MDECLT(BTA1, "C" ASSTRING(id) ASSTRING(x), ASSTRING(id), group, COMBINE3(C, id, x))
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/TCore/CalcType.cpp b/uppsrc/TCore/CalcType.cpp
new file mode 100644
index 000000000..68312cd34
--- /dev/null
+++ b/uppsrc/TCore/CalcType.cpp
@@ -0,0 +1,88 @@
+#include "TCoreCalc.h"
+#pragma hdrstop
+
+NAMESPACE_UPP
+
+String CalcTypeDescribeInt()            { return t_("integer"); }
+
+String CalcType<double>::Describe()     { return t_("real number"); }
+String CalcType<String>::Describe()     { return t_("string"); }
+String CalcType<Date>::Describe()       { return t_("date"); }
+String CalcType<Time>::Describe()       { return t_("date/time"); }
+String CalcType<bool>::Describe()       { return t_("logical value"); }
+String CalcType<Value>::Describe()      { return t_("any data type"); }
+String CalcType<ValueArray>::Describe() { return t_("array"); }
+String CalcType<Nuller>::Describe()     { return t_("null value"); }
+
+RegisterStdCalcTypeName(double)
+RegisterStdCalcTypeName(String)
+RegisterStdCalcTypeName(WString)
+RegisterStdCalcTypeName(Date)
+RegisterStdCalcTypeName(Time)
+RegisterStdCalcTypeName(bool)
+RegisterStdCalcTypeName(Value)
+RegisterStdCalcTypeName(ValueArray)
+RegisterStdCalcTypeName(CalcNodePtr)
+
+const char *CalcNanError()
+{
+	return t_("real number operation error");
+}
+
+const char *CalcInfError()
+{
+	return t_("real number overflow");
+}
+
+VectorMap<String, String (*)()>& CalcTypeNameConvert::Get()
+{
+	static VectorMap<String, String (*)()> list;
+	return list;
+}
+
+String CalcTypeNameConvert::Format(const char *raw_name)
+{
+	static const char rvr[] = "RawValueRep<";
+	static const char cvr[] = "RichValueRep<";
+	const char *s = raw_name;
+	if(!memcmp(s, "struct ", 7))
+		s += 7;
+	else if(!memcmp(s, "class ", 6))
+		s += 6;
+	if(!memcmp(s, rvr, sizeof(rvr) - 1))
+		s += sizeof(rvr) - 2;
+	else if(!memcmp(s, cvr, sizeof(cvr) - 1))
+		s += sizeof(cvr) - 2;
+	String temp;
+	if(*s == '<')
+	{
+		const char *p = ++s;
+		p += strlen(p);
+		if(p > s && p[-1] == '>')
+			p--;
+		temp = String(s, p);
+		raw_name = temp;
+	}
+	int i = Get().Find(raw_name);
+	if(i >= 0)
+		return Get()[i]();
+	return GetTypeName(raw_name);
+}
+
+Value CalcType<double>::ToValue(double t)
+{
+	if(IsNan(t))
+		throw Exc(CalcNanError());
+	if(IsInf(t))
+		throw Exc(CalcInfError());
+	return t;
+}
+
+bool CalcType<bool>::ValueTo(Value v)
+{
+	if(IsNull(v))
+		return false;
+	return !IsNumber(v) || (double)v != 0;
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/TCore/CalcType.h b/uppsrc/TCore/CalcType.h
new file mode 100644
index 000000000..a0f523250
--- /dev/null
+++ b/uppsrc/TCore/CalcType.h
@@ -0,0 +1,142 @@
+NAMESPACE_UPP
+
+class CalcTypeNameConvert
+{
+public:
+	CalcTypeNameConvert(const type_info& tinfo, String (*outfn)()) { Get().Add(tinfo.name(), outfn); }
+
+	static VectorMap<String, String (*)()>& Get();
+	static String                           Format(const char *raw_name);
+};
+
+#define RegisterCalcTypeName(type, name) \
+static String COMBINE(ctn, MK__s)() { return name; } \
+static CalcTypeNameConvert COMBINE(tn, MK__s)(typeid(type), &COMBINE(ctn, MK__s));
+
+#define RegisterStdCalcTypeName(type) \
+static CalcTypeNameConvert COMBINE(tn, MK__s)(typeid(type), &CalcType<type>::Describe);
+
+template <class T>
+struct CalcRawType
+{
+	static Value    ToValue(const T& t) { return RawToValue(t); }
+	static const T& ValueTo(Value v)    { return RawValue<T>::Extract(v); }
+	static bool     IsType(Value v)     { return IsTypeRaw<T>(v); }
+	static String   Describe()          { return CalcTypeNameConvert::Format(typeid(T).name()); }
+};
+
+template <class T>
+struct CalcRawNullType : public CalcRawType<T>
+{
+	static bool     IsType(Value v)     { return v.IsVoid() || CalcRawType<T>::IsType(v); }
+	static const T& ValueTo(Value v)    { if(v.IsVoid()) { static T t; return t; } return CalcRawType<T>::ValueTo(v); }
+};
+
+template <class T>
+struct CalcCastType : public CalcRawType<T>
+{
+	static Value    ToValue(const T& t)     { return t; }
+	static T        ValueTo(Value v)        { return v; }
+};
+
+template <class T> struct CalcType : public CalcRawType<T> {};
+
+template <class T>
+inline Value CalcTypeToValue(const T& value) { return CalcType<T>::ToValue(value); }
+
+String CalcTypeDescribeInt();
+
+template <class T>
+struct CalcIntType
+{
+	static Value    ToValue(T t)            { return int(t); }
+	static T        ValueTo(Value v)        { return (T)(int)v; }
+	static bool     IsType(Value v)         { return IsNumber(v); }
+	static String   Describe()              { return CalcTypeDescribeInt(); }
+};
+
+template <> struct CalcType<unsigned char>  : public CalcIntType<unsigned char>  {};
+template <> struct CalcType<signed   char>  : public CalcIntType<signed   char>  {};
+template <> struct CalcType<unsigned short> : public CalcIntType<unsigned short> {};
+template <> struct CalcType<signed   short> : public CalcIntType<signed   short> {};
+template <> struct CalcType<unsigned int>   : public CalcIntType<unsigned int>   {};
+template <> struct CalcType<signed   int>   : public CalcIntType<signed   int>   {};
+template <> struct CalcType<unsigned long>  : public CalcIntType<unsigned long>  {};
+template <> struct CalcType<signed   long>  : public CalcIntType<signed   long>  {};
+
+const char *CalcNanError();
+const char *CalcInfError();
+
+template <>
+struct CalcType<double> : public CalcCastType<double>
+{
+	static bool   IsType(Value v) { return IsNumber(v); }
+	static String Describe();
+	static Value  ToValue(double t);
+};
+
+template <>
+struct CalcType<String> : public CalcCastType<String>
+{
+	static bool   IsType(Value v) { return IsNull(v) || IsString(v); }
+	static String Describe();
+};
+
+template <>
+struct CalcType<WString> : public CalcCastType<WString>
+{
+	static bool   IsType(Value v) { return IsNull(v) || IsString(v); }
+	static String Describe()             { return CalcType<String>::Describe(); }
+};
+
+template <>
+struct CalcType<Date> : public CalcCastType<Date>
+{
+	static bool   IsType(Value v) { return IsDateTime(v); }
+	static String Describe();
+};
+
+template <>
+struct CalcType<Time> : public CalcCastType<Time>
+{
+	static bool   IsType(Value v) { return IsDateTime(v); }
+	static String Describe();
+};
+
+template <>
+struct CalcType<bool>
+{
+	static Value  ToValue(bool b)         { return b ? 1 : 0; }
+	static bool   ValueTo(Value v);
+	static bool   IsType(Value v)         { return IsNull(v) || IsNumber(v) || IsString(v); }
+	static String Describe();
+};
+
+template <>
+struct CalcType<Value>
+{
+	static Value    ToValue(Value v) { return v; }
+	static Value    ValueTo(Value v) { return v; }
+	static bool     IsType(Value v)  { return true; }
+	static String   Describe();
+};
+
+template <>
+struct CalcType<ValueArray>
+{
+	static Value       ToValue(const ValueArray& t)     { return t; }
+	static ValueArray  ValueTo(Value v)                 { return IsValueArray(v) ? ValueArray(v) : ValueArray(); }
+	static bool        IsType(Value v)                  { return IsNull(v) || IsValueArray(v); }
+	static String      Describe();
+};
+
+template <>
+struct CalcType<Nuller>
+{
+	static Value       ToValue(const Nuller&)            { return Value(); }
+	static Nuller      ValueTo(Value v)                  { return Null; }
+	static bool        IsType(Value v)                   { return IsNull(v); }
+	static String      Describe();
+};
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/TCore/TCore.h b/uppsrc/TCore/TCore.h
new file mode 100644
index 000000000..6f0a88eca
--- /dev/null
+++ b/uppsrc/TCore/TCore.h
@@ -0,0 +1,17 @@
+#ifndef __TCore__
+#define __TCore__
+
+#include <Web/Web.h>
+
+#ifdef flagNOHELP
+#define NOHELP
+#endif//flagNOHELP
+#include "template.h"
+#include "util.h"
+#include "setop.h"
+//#include "nls.h"
+#include "globcfg.h"
+#include "xmlparse.h"
+#include "help.h"
+
+#endif//__TCore__
diff --git a/uppsrc/TCore/TCore.t b/uppsrc/TCore/TCore.t
new file mode 100644
index 000000000..f2542095c
--- /dev/null
+++ b/uppsrc/TCore/TCore.t
@@ -0,0 +1,260 @@
+#ifdef _MSC_VER
+#pragma setlocale("C")
+#endif
+// util.cpp
+
+T_("Null value not allowed.")
+csCZ("Hodnota nesmí být prázdná.")
+
+T_("Real number expected.")
+csCZ("Očekáváno reálné číslo.")
+
+T_("Fraction denominator is too small.")
+csCZ("Jmenovatel zlomku je příliš malý.")
+
+T_("Illegal trailing character '%c' (0x%1:02x)")
+csCZ("Za číslem byl nalezen neplatný znak '%c' (0x%1:02x)")
+
+T_("Lower bound exceeded.")
+csCZ("Zadané číslo je menší než povolená dolní mez.")
+
+T_("Upper bound exceeded.")
+csCZ("Zadané číslo je větší než povolená horní mez.")
+
+T_("'instsrv.exe' not found.")
+csCZ("Nebyl nalezen program 'instsrv.exe'.")
+
+T_("'svrany.exe' not found.")
+csCZ("Nebyl nalezen program 'srvany.exe'.")
+
+T_("Error running '%s'.")
+csCZ("Nelze spustit program '%s'.")
+
+
+// CalcType.cpp
+
+T_("integer")
+csCZ("celé číslo")
+
+T_("real number")
+csCZ("reálné číslo")
+
+T_("string")
+csCZ("řetězec")
+
+T_("date")
+csCZ("datum")
+
+T_("date/time")
+csCZ("datum/čas")
+
+T_("logical value")
+csCZ("logická hodnota")
+
+T_("any data type")
+csCZ("libovolný typ")
+
+T_("array")
+csCZ("pole hodnot")
+
+T_("null value")
+csCZ("prázdná hodnota")
+
+T_("real number operation error")
+csCZ("chyba při výpočtu v reálných číslech")
+
+T_("real number overflow")
+csCZ("přetečení při výpočtu v reálných číslech")
+
+
+// CalcNode.cpp
+
+T_("Expression evaluator")
+csCZ("Výrazový kalkulátor")
+
+T_("boolean value")
+csCZ("logická hodnota")
+
+T_("function nesting too deep (%d levels)")
+csCZ("příliš hluboké vnoření funkcí (%d úrovní)")
+
+T_("%s is not a constant")
+csCZ("%s není konstanta")
+
+T_("variable/constant '")
+csCZ("proměnná/konstanta '")
+
+T_("function '")
+csCZ("funkce '")
+
+T_("' not found")
+csCZ("' nebyla nalezena")
+
+T_("missing arguments")
+csCZ("chybí parametry")
+
+T_("illegal type ")
+csCZ("chybný typ ")
+
+T_(" or number of parameters")
+csCZ(" nebo počet parametrů")
+
+T_("illegal type combination ")
+csCZ("chybná kombinace typů ")
+
+T_("Maximum nesting depth (")
+csCZ("Byla překročena povolená hloubka vnoření (")
+
+T_(") exceeded (infinite recursion?)")
+csCZ(")")
+
+T_("Expression stack underflow")
+csCZ("Podtečení výrazového zásobníku")
+
+T_("Number expected, found: ")
+csCZ("Očekáváno číslo, nalezeno: ")
+
+T_("String expected, found: ")
+csCZ("Očekáván řetězec, nalezeno: ")
+
+T_("Date expected, found: ")
+csCZ("Očekáváno datum, nalezeno: ")
+
+T_("Date/time expected, found: ")
+csCZ("Očekáváno datum/čas, nalezeno: ")
+
+T_(": expected: ")
+csCZ(": očekáváno: ")
+
+T_(", found: ")
+csCZ(", nalezeno: ")
+
+T_("/* without matching */")
+csCZ("/* bez odpovídající */")
+
+T_("expected ")
+csCZ("očekáván ")
+
+T_("symbol")
+csCZ("symbol")
+
+T_("character")
+csCZ("znak")
+
+T_(" '")
+csCZ(" '")
+
+T_("', found: ")
+csCZ("', nalezeno: ")
+
+T_("end of line")
+csCZ("konec řádky")
+
+T_("invalid day number (")
+csCZ("neplatné číslo dne (%d)")
+
+T_("illegal characters after expression: %s (expression: %s)")
+csCZ("neplatné znaky za výrazem: %s (začátek výrazu: %s)")
+
+T_("left parenthesis not matched; subexpression starts at %s")
+csCZ("nepárová levá závorka; začátek podvýrazu: %s")
+
+T_("constant or function expected, found: ")
+csCZ("očekávána konstanta nebo funkce, nalezeno: ")
+
+
+// CalcBasic.cpp
+
+T_("Comparison")
+csCZ("Porovnávání")
+
+T_("Bit field operations")
+csCZ("Bitové operace")
+
+T_("Arithmetical operations")
+csCZ("Aritmetické operace")
+
+T_("Logical operations")
+csCZ("Logické operace")
+
+T_("Text operations")
+csCZ("Operace s texty")
+
+T_("Date operations")
+csCZ("Operace s daty")
+
+T_("Array functions")
+csCZ("Zpracování polí hodnot")
+
+T_("Constants")
+csCZ("Konstanty")
+
+T_("Transcendental functions")
+csCZ("Transcendentní funkce")
+
+T_("System functions")
+csCZ("Speciální funkce")
+
+T_("division by zero")
+csCZ("dělení nulou")
+
+T_("invalid number of places (%d)")
+csCZ("chybný počet míst (%d)")
+
+T_("invalid numeric format: '%s'")
+csCZ("neplatný formát čísla: '%s'")
+
+T_("invalid year number (%d)")
+csCZ("chybné číslo roku (%d)")
+
+T_("invalid month number (%d)")
+csCZ("chybné číslo měsíce (%d)")
+
+T_("invalid day number (%d)")
+csCZ("chybné číslo dne (%d)")
+
+T_("invalid hour number: %d")
+csCZ("chybné číslo hodiny: %d")
+
+T_("invalid minute number: %d")
+csCZ("chybné číslo minuty: %d")
+
+T_("invalid second number: %d")
+csCZ("chybné číslo sekundy: %d")
+
+T_("result date is out of range")
+csCZ("výsledné datum je mimo povolený rozsah")
+
+T_("array is too long (%d elements)")
+csCZ("pole je příliš dlouhé (%d prvků)")
+
+T_("invalid index %d, array has just %d elements")
+csCZ("neplatný index %d, pole má jen %d prvků")
+
+T_("invalid index %d, string has just %d characters")
+csCZ("neplatný index %d, řetězec má jen %d znaků")
+
+T_("array element has invalid data type (index %d), number expected: %s")
+csCZ("prvek pole má neplatný datový typ (index %d), očekáváno číslo: "
+     "%s")
+
+T_("array element has invalid data type (index %d), string expected: %s")
+csCZ("prvek pole má neplatný datový typ (index %d), očekáván řetězec: "
+     "%s")
+
+T_("array element has invalid data type (index %d), array expected: %s")
+csCZ("prvek pole má neplatný datový typ (index %d), očekáváno pole: %s")
+
+T_("array element has invalid data type (index %d), number or string expected: "
+     "%s")
+csCZ("prvek pole má neplatný datový typ (index %d), očekáváno číslo "
+     "nebo řetězec: %s")
+
+T_("control variable has empty name")
+csCZ("prázdný název řídicí proměnné")
+
+T_("invalid number of array elements")
+csCZ("chybný počet prvků pole")
+
+T_("invalid character index")
+csCZ("chybný počáteční index")
diff --git a/uppsrc/TCore/TCore.upp b/uppsrc/TCore/TCore.upp
new file mode 100644
index 000000000..cc5fe30d1
--- /dev/null
+++ b/uppsrc/TCore/TCore.upp
@@ -0,0 +1,48 @@
+description "Experimental (sometimes obsolete) non-GUI code";
+
+charset "windows-1250";
+
+uses
+	Core,
+	Web,
+	plugin\dbf;
+
+file
+	TCore.h,
+	TCore.t charset "UTF-8",
+	tcore.usc,
+	TCore_init.icpp,
+	template.h,
+	util.h,
+	util.cpp,
+	setop.h,
+	nls_bw.h,
+	nls_bw.hpp,
+	globcfg.h,
+	globcfg.cpp,
+	xmlparse.h,
+	xmlparse.cpp,
+	"Basic help support" readonly separator,
+	help.h,
+	help.cpp,
+	"Expression Calculator" readonly separator,
+	TCoreCalc.h,
+	CalcType.h,
+	CalcType.cpp,
+	CalcNode.h,
+	CalcNode.cpp,
+	CalcBasic.h,
+	CalcBasic.cpp,
+	"File-based Database" readonly separator,
+	TCoreDb.h,
+	datafile.h,
+	datafile.cpp,
+	database.h,
+	database.cpp,
+	datatest.cpp,
+	dd_h.h,
+	dd_cpp.h,
+	Info readonly separator,
+	COPYING,
+	COPYING-PLAIN,
+	AUTHORS;
diff --git a/uppsrc/TCore/TCoreCalc.h b/uppsrc/TCore/TCoreCalc.h
new file mode 100644
index 000000000..9f02cce5d
--- /dev/null
+++ b/uppsrc/TCore/TCoreCalc.h
@@ -0,0 +1,24 @@
+#ifndef __TCoreCalc__
+#define __TCoreCalc__
+
+#include <TCore/TCore.h>
+#include "CalcType.h"
+#include "CalcNode.h"
+
+NAMESPACE_UPP
+
+extern void UseCalcBasic();
+
+String GroupComp();
+String GroupBitOp();
+String GroupArith();
+String GroupLog();
+String GroupString();
+String GroupDate();
+String GroupArray();
+String GroupConst();
+String GroupTrans();
+
+END_UPP_NAMESPACE
+
+#endif//__TCoreCalc__
diff --git a/uppsrc/TCore/TCoreDb.h b/uppsrc/TCore/TCoreDb.h
new file mode 100644
index 000000000..cf9cafe1a
--- /dev/null
+++ b/uppsrc/TCore/TCoreDb.h
@@ -0,0 +1,8 @@
+#ifndef __TCoreDb__
+#define __TCoreDb__
+
+#include <TCore/TCoreCalc.h>
+#include "datafile.h"
+#include "database.h"
+
+#endif//__TCore__
diff --git a/uppsrc/TCore/TCore_init.icpp b/uppsrc/TCore/TCore_init.icpp
new file mode 100644
index 000000000..140d73ed8
--- /dev/null
+++ b/uppsrc/TCore/TCore_init.icpp
@@ -0,0 +1,8 @@
+#include "TCore.h"
+
+NAMESPACE_UPP
+
+#define TFILE <TCore/TCore.t>
+#include <Core/t.h>
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/TCore/appdoc.tpp/CalcArith$cs-cz.tpp b/uppsrc/TCore/appdoc.tpp/CalcArith$cs-cz.tpp
new file mode 100644
index 000000000..4e560d84b
--- /dev/null
+++ b/uppsrc/TCore/appdoc.tpp/CalcArith$cs-cz.tpp
@@ -0,0 +1,180 @@
+TITLE("Aritmetické operace")
+REF("Calc$CaddNN")
+REF("Calc$CceilN")
+REF("Calc$CceilNN")
+REF("Calc$CceilrNN")
+REF("Calc$CdivNN")
+REF("Calc$CfloorN")
+REF("Calc$CfloorNN")
+REF("Calc$CfloorrNN")
+REF("Calc$CgeNN")
+REF("Calc$CgtNN")
+REF("Calc$ChypotNN")
+REF("Calc$CleNN")
+REF("Calc$CltNN")
+REF("Calc$CmaxNN")
+REF("Calc$CminNN")
+REF("Calc$CminmaxNNN")
+REF("Calc$CminusN")
+REF("Calc$CmodNN")
+REF("Calc$CmulNN")
+REF("Calc$CplusN")
+REF("Calc$CroundN")
+REF("Calc$CroundNN")
+REF("Calc$CroundrNN")
+REF("Calc$CsgnN")
+REF("Calc$CsqrN")
+REF("Calc$CsqrtN")
+REF("Calc$CsubNN")
+TOPIC_TEXT(
+"[2 $$0,0#00000000000000000000000000000000:Default][b100;a50;K* $$1,0#23046025415494101427921008701515:Paragraph][i167;b50;a25;kKN1;~~~>.3917;* "
+"$$2,0#52185223490867151055420261384346:Toc1`.Heading1][i333;kN11;~~~>.3917;* $$3,0#36545033421193513457240054113541:Toc2`.Heading2][i500;kN111;~~~>.3917; "
+"$$4,0#65092512416424580164828413186219:Toc3`.Heading3][i167;b50;a25;kKNA;~~~>.3917;* "
+"$$5,5#92291332474308709450111162202673:AppToc1`.AppHeading1][i333;kNA1;~~~>.3917;* "
+"$$6,15#61887903412252554674480251236992:AppToc2`.AppHeading2][i500;kNA11;~~~>.3917; "
+"$$7,7#03533551421653050355120437860335:AppToc3`.AppHeading3][i500;b100;a100;KN1;*4 "
+"$$8,0#94145093439740438411010082165944:Heading1][i500;b100;a50;kKN11;*+117 $$9,0#10901425421210535753260366156531:Heading2][i500;b100;a25;kKN111;* "
+"$$10,0#53209141402041366431858192225431:Heading3][i500;b100;a100;KNA;*4 $$11,8#32912651424211307887950041245434:AppHeading1][i500;b100;a50;kKNA1;*+117 "
+"$$12,8#51232055453458524230328032001901:AppHeading2][i500;b100;a25;kKNA11;* $$13,8#34108020439428305453439845463579:AppHeading3][b100;a50;k*4 "
+"$$14,0#49239115434362547028389207250014:Heading][b50;a25;k~~~>.3917;* $$15,15#40743698422276745552070108434023:Toc`.Heading][b100;a50;K~~~>.3917;*+117 "
+"$$16,16#15422850471211852294098111138263:Topics1][l167;b50;a50;K~~~>.3917;* $$17,17#35241722455500657380289596243808:Topics2][l333;~~~>.3917; "
+"$$18,18#31041344429742018840308064013200:Topics3][b83;a42;K* $$19,0#46440151113795363000000595230845:Paragraph][{_}%EN-US "
+"[s14; abs (reálné číslo) [S ®] reálné číslo&][s0; &][s0; Absolutní hodnota "
+"čísla. Pokud je číslo kladné, jeho absolutní hodnota je mu rovna. Absolutní "
+"hodnotou záporného čísla je číslo opačné.&][s0; &][s0; [* Příklad: ]abs(`-10.5) "
+"`= 10.5, abs(12) `= 12.&][s14;:Calc`$CaddNN: [%00-00 operátor `+  (reálné číslo, "
+"reálné číslo) ][%00-00S ®][%00-00  reálné číslo]&][s0; Operátor sečte "
+"zadanou dvojici reálných čísel. Pokud je některý z parametrů [* null], je "
+"výsled")
+TOPIC_TEXT(
+"kem součtu opět [* null]. &][s0; &][s0; [* Příklad: ]5`+7`=12&][s14;:Calc`$CceilN: "
+"[%00-00 ceil (reálné číslo) ][%00-00S ®][%00-00  reálné číslo]&][s0; Zaokrouhlení "
+"směrem nahoru. Funkce nalezne nejmenší celé číslo, které není menší než "
+"původní [/ hodnota].&][s0; &][s0; [* Příklad: ]ceil(`-2.5) `= `-2&][s14;:Calc`$CceilNN: "
+"[%00-00 ceil (reálné číslo ][%00-00/ hodnota][%00-00 , celé číslo ][%00-00/ "
+"počet`_desetinných`_míst][%00-00 ) ][%00-00S ®][%00-00  reálné číslo]&][s0; "
+"Zaokrouhlení směrem nahoru na zadaný počet desetinných míst. Funkce nalezne "
+"nejmenší reálné číslo, které je celistvým násobkem hodnoty [* 10_`*`*_][/ "
+"`-počet_míst] a_není menší než původní [/ hodnota].&][s0; &][s0; [* Příklad: "
+"]ceil(47.32, 1) `= 47.4, ceil(117, `-1) `= 120.&][s14;:Calc`$CceilrNN: [%00-00 ceilr(reálné "
+"číslo ][%00-00/ hodnota][%00-00 , celé číslo ][%00-00/ platných`_číslic][%00-00 "
+") ][%00-00S ®][%00-00  reálné číslo]&][s0; [Izaokrouhlování`; číslo`, zaokrouhlení; "
+"Zaokrouhlení] směrem nahoru na zadaný počet platných číslic. Funkce nalezne "
+"nejmenší reálné číslo, které je celistvým násobkem hodnoty [* 10_`*`*_][/ "
+"(ceil(log(hodnota))`-platných`_číslic)] a_není menší než původní [/ hodnota].&][s0; "
+"&][s0; [* Příklad: ]ceilr(47.32, 3) `= 47.4, ceilr(117, 1) `= 200.&][s14;:Calc`$CdivNN: "
+"[%00-00 operátor /  (reálné číslo, reálné číslo) ][%00-00S ®][%00-00  reálné "
+"číslo]&][s0; Dělení. Pokud je na pravé straně operátoru nula, výpočet výrazu "
+"ohlásí chybu [* dělení nulou].&][s0; &][s0; [* Příklad: ]3.7 / 2.5 `= 1.48.&][s14;:Calc`$CfloorN: "
+"[%00-00 floor (reálné číslo) ][%00-00S ®][%00-00  reálné číslo]&][s0; Zaokrouhlení "
+"směrem dolů. Funkce nalezne nejvyšší celé číslo, které není vyšší než "
+"původní [/ hodnota].&][s0; &][s0; [* Příklad: ]floor(`-2.5) `= `-3&][s14;:Calc`$CfloorNN: "
+"[%00-00 floor (reálné číslo ][%00-00/ hodnota][")
+TOPIC_TEXT(
+"%00-00 , celé číslo ][%00-00/ počet`_desetinných`_míst][%00-00 ) ][%00-00S "
+"®][%00-00  reálné číslo]&][s0; Zaokrouhlení směrem dolů na zadaný počet "
+"desetinných míst. Funkce nalezne nejvyšší reálné číslo, které je celistvým "
+"násobkem hodnoty [* 10_`*`*_][/ `-počet_míst] a_není vyšší než původní "
+"[/ hodnota].&][s0; &][s0; [* Příklad: ]floor(47.32, 1) `= 47.3, floor(117, `-1) "
+"`= 110.&][s14;:Calc`$CfloorrNN: [%00-00 floorr(reálné číslo ][%00-00/ hodnota][%00-00 "
+", celé číslo ][%00-00/ platných`_číslic][%00-00 ) ][%00-00S ®][%00-00  reálné "
+"číslo]&][s0; Zaokrouhlení směrem dolů na zadaný počet platných číslic. "
+"Funkce nalezne nejvyšší reálné číslo, které je celistvým násobkem hodnoty "
+"[* 10_`*`*_][/ (ceil(log(hodnota))`-platných`_číslic)] a_není vyšší než původní "
+"[/ hodnota].&][s0; &][s0; [* Příklad: ]floorr(47.32, 3) `= 47.3, floorr(117, 1) "
+"`= 100.&][s14;:Calc`$CgeNN: operátor >`=  (reálné číslo, reálné číslo) [S "
+"®] logická hodnota&][s0; Operátor porovná dvojici hodnot a_vrátí hodnotu 1, "
+"pokud nerovnost platí, respektive 0, pokud nerovnost neplatí. Texty se porovnávají "
+"lexikograficky ([/ slovníkové] uspořádání).&][s14;:Calc`$CgtNN: operátor > "
+" (reálné číslo [/ n1], reálné číslo [/ n2]) [S ®] logická hodnota&][s0; "
+"Operátor porovná dvojici hodnot a_vrátí hodnotu 1, pokud nerovnost platí, respektive "
+"0, pokud nerovnost neplatí. Texty se porovnávají lexikograficky ([/ slovníkové] "
+"uspořádání).&][s14;:Calc`$ChypotNN: [%00-00 hypot (reálné číslo ][%00-00/ "
+"x][%00-00 , reálné číslo ][%00-00/ y][%00-00 ) ][%00-00S ®][%00-00  reálné "
+"číslo]&][s0; Délka přepony pravoúhlého trojúhelníka. Výpočet přepony se "
+"provádí podle Pythagorovy věty: [* hypot(][*/ x][* , ][*/ y][* ) `= sqrt(][*/ "
+"x][*  `* ][*/ x][*  `+ ][*/ y][*  `* ][*/ y][* )].&][s0; &][s0; [* Příklad]: hypot(3, "
+"4) `= 5&][s14;:Calc`$CleNN: [%00-00 operátor <`=  (reálné čísl")
+TOPIC_TEXT(
+"o ][%00-00/ x][%00-00 , reálné číslo ][%00-00/ y][%00-00 ) ][%00-00S ®][%00-00 "
+" logická hodnota]&][s0; Operátor porovná dvojici čísel a_vrátí hodnotu 1 ([/ "
+"pravda]), pokud [* x <`= y].&][s0; &][s0; [* Příklad: ](10 <`= 20) `= 1&][s14;:Calc`$CltNN: "
+"[%00-00 operátor <  (reálné číslo, reálné číslo) ][%00-00S ®][%00-00  logická "
+"hodnota]&][s0; Operátor porovná dvojici čísel a_vrátí hodnotu 1 ([/ pravda]), "
+"pokud [* x < y].&][s0; &][s0; [* Příklad: ](10 < 20) `= 1&][s14;:Calc`$CmaxNN: "
+"max (reálné číslo, reálné číslo) [S ®] reálné číslo&][s0; Funkce vrátí "
+"maximum ze dvou reálných čísel. Pokud je některé z čísel rovno [* null], "
+"je výsledkem funkce také [* null].&][s14;:Calc`$CminNN: [%00-00 min (reálné číslo, "
+"reálné číslo) ][%00-00S ®][%00-00  reálné číslo]&][s0; Funkce vrátí minimum "
+"ze dvou reálných čísel. Pokud je některé z čísel rovno [* null], je výsledkem "
+"funkce také [* null].&][s0; &][s0; [* Příklad: ]min(`-15, `-16) `= `-16&][s14;:Calc`$CminmaxNNN: "
+"[%00-00 minmax (reálné číslo ][%00-00/ x][%00-00 , reálné číslo ][%00-00/ "
+"xmin][%00-00 , reálné číslo ][%00-00/ xmax][%00-00 ) ][%00-00S ®][%00-00  reálné "
+"číslo]&][s0; Funkce vrátí hodnotu [* min(max(x, xmin), xmax)]. Pokud je některý "
+"z parametrů roven [* null], je výsledek také [* null].&][s0; &][s0; [* Příklad: "
+"]minmax(3, 5, 10) `= 5, minmax(7, 5, 10) `= 7, minmax(20, 5, 10) `= 10&][s14;:Calc`$CminusN: "
+"[%00-00 operátor `-  (reálné číslo) ][%00-00S ®][%00-00  reálné číslo]&][s0; "
+"Výsledkem aplikace unárního operátoru `-  je číslo opačné k zadanému reálnému "
+"číslu.&][s0; &][s0; [* Příklad: ]`-(2 `* 2) `= `-4&][s0; Funkce vrátí počet "
+"minut ze zadaného parametru typu datum / čas.&][s14;:Calc`$CmodNN: [%00-00 operátor "
+"%  (reálné číslo ][%00-00/ a][%00-00 , reálné číslo ][%00-00/ b][%00-00 ) "
+"][%00-00S ®][%00-00  reálné číslo]&][s0; Zbytek po dělení. Operátor určí "
+"nejmenš�")
+TOPIC_TEXT(
+"� nezáporné číslo ze všech čísel, která lze získat přičtením nebo odečtením "
+"celočíselného násobku hodnoty [/ b] k_hodnotě [/ a]. Pokud je na pravé straně "
+"operátoru nula, výpočet výrazu ohlásí chybu [* dělení nulou].&][s0; &][s0; "
+"[* Příklad]: 10.5 % 2.4 `= 0.9 (10.5 `= 4 `* 2.4 `+ 0.9).&][s0; Funkce vrátí "
+"číslo měsíce v roce pro zadané datum.&][s0; &][s0; [* Příklad: ]month(27.5.1984) "
+"`= 5&][s0; Operátor pro každý prvek zadaného pole vyhodnotí [/ lambda`-výraz] "
+"a vrátí pole obsahující výsledky těchto výpočtů. Výsledné pole má vždy "
+"stejný počet prvků jako vstupní pole. Při vyhodnocování [/ lambda`-výrazu] "
+"je pro každý prvek původního pole proměnná kalkulátoru [* I] nastavená na "
+"index tohoto prvku v poli (první prvek pole má index 0), proměnná [* A] obsahuje "
+"hodnotu zpracovávaného prvku.&][s0; &][s0; [* Příklad: ]`[1, 2, 3, 4`] `* #(A "
+"`* A) `= `[1, 4, 9, 16`]&][s14;:Calc`$CmulNN: [%00-00 operátor `*  (reálné číslo, "
+"reálné číslo) ][%00-00S ®][%00-00  reálné číslo]&][s0; Součin reálných "
+"čísel.&][s0;* &][s0; [* Příklad: ]17 `* 15 `= 255.&][s14;:Calc`$CplusN: [%00-00 "
+"operátor `+  (reálné číslo) ][%00-00S ®][%00-00  reálné číslo]&][s0; Operátor "
+"ponechá reálné číslo beze změny. Slouží jako symetrický protějšek k unárnímu "
+"operátoru `- (minus).&][s0; &][s0; [* Příklad: ]`+(4`+5) `= 9&][s14;:Calc`$CroundN: "
+"[%00-00 round (reálné číslo) ][%00-00S ®][%00-00  reálné číslo]&][s0; Zaokrouhlení "
+"na nejbližší celé číslo. Pokud zadané číslo leží přesně v_polovině "
+"vzdálenosti mezi nejbližšími celými čísly, zaokrouhlí se směrem nahoru.&][s0; "
+"&][s0; [* Příklad: ]round(`-2.5) `= `-2, round(47.32) `= 47&][s14;:Calc`$CroundNN: "
+"[%00-00 round (reálné číslo ][%00-00/ hodnota][%00-00 , celé číslo ][%00-00/ "
+"počet`_desetinných`_míst][%00-00 ) ][%00-00S ®][%00-00  reálné číslo]&][s0; "
+"Zaokrouhlení na zadaný počet desetin")
+TOPIC_TEXT(
+"ných míst (0, pokud není zadáno). Směr zaokrouhlení je k_nejbližšímu reálnému "
+"číslu, které je celistvým násobkem hodnoty [* 10_`*`*_][/ `-počet_míst]. Pokud "
+"zadané číslo leží přesně v_polovině vzdálenosti mezi nejbližšími takovými "
+"čísly, zaokrouhlí se směrem nahoru.&][s0; &][s0; [* Příklad]: round(`-2.5) "
+"`= `-2, round(47.32, 1) `= 47.3, round(117, `-1) `= 120.&][s14;:Calc`$CroundrNN: "
+"[%00-00 roundr(reálné číslo ][%00-00/ hodnota][%00-00 , celé číslo ][%00-00/ "
+"platných`_číslic][%00-00 ) ][%00-00S ®][%00-00  reálné číslo]&][s0; Zaokrouhlení "
+"na zadaný počet platných číslic. Směr zaokrouhlení je k_nejbližšímu reálnému "
+"číslu, které je celistvým násobkem hodnoty [* 10_`*`*_][/ (ceil(log(hodnota))`-platných`_číslic)]. "
+"Pokud zadané číslo leží přesně v_polovině vzdálenosti mezi nejbližšími "
+"takovými čísly, zaokrouhlí se směrem nahoru.&][s0; &][s0; [* Příklad: ]roundr(47.32, "
+"2) `= 47, roundr(117, 1) `= 100.&][s0; Funkce doplní řetězec [* text] mezerami "
+"zprava na počet znaků [* délka]. Pokud je [* délka] menší nebo rovna délce "
+"původního řetězce [* text], funkce vrátí vstupní text beze změny.&][s0; &][s0;/ "
+"[*/ Příklad: ][/ rpad(`\"ahoj`\", 8) `= `\"ahoj    `\" ](text [* ahoj] následovaný "
+"čtyřmi mezerami)&][s14;:Calc`$CsgnN: [%00-00 sgn (reálné číslo ][%00-00/ x][%00-00 "
+") ][%00-00S ®][%00-00  celé číslo]&][s0; Znaménko. Výpočet znaménka probíhá "
+"podle následující tabulky:&][s0; &][s0; &][s0; &][s0; [* Příklad]: sgn(`-13.5) "
+"`= `-1, sgn(0) `= 0, sgn(10) `= `+1.&][s14;:Calc`$CsqrN: [%00-00 sqr (reálné číslo "
+"][%00-00/ x][%00-00 ) ][%00-00S ®][%00-00  reálné číslo]&][s0; Druhá mocnina. "
+"Funkce vrátí hodnotu [* sqr(][*/ x][* ) `= ][*/ x][*  `* ][*/ x].&][s0; &][s0; "
+"[* Příklad]: sqr(12) `= 144&][s14;:Calc`$CsqrtN: [%00-00 sqrt (reálné číslo "
+"][%00-00/ x][%00-00 ) ][%00-00S ®][%00-00  reálné číslo]&][s0; Druhá odmocnina. "
+"Funkce vrátí ta")
+TOPIC_TEXT(
+"kovou hodnotu [*/ a], pro kterou [*/ x][*  `= ][*/ a][*  `* ][*/ a]. Pokud je parametr "
+"funkce záporný, výpočet výrazu skončí s chybou chyba při výpočtu v reálných "
+"číslech.&][s0; &][s0; [* Příklad: ]sqrt(81) `= 9&][s14;:Calc`$CsubNN: [%00-00 "
+"operátor `-  (reálné číslo, reálné číslo) ][%00-00S ®][%00-00  reálné "
+"číslo]&][s0; Operátor odečte dvě reálná čísla. Pokud je libovolné z čísel "
+"rovno [* null], výsledkem operátoru je opět [* null].&][s0; &][s0; [* Příklad: "
+"]7 `- (`-13) `= 20&][s0; &][s0; &][s0; &][s0; &][s0; &][s0; ]")
diff --git a/uppsrc/TCore/appdoc.tpp/CalcArith$en-us.tpp b/uppsrc/TCore/appdoc.tpp/CalcArith$en-us.tpp
new file mode 100644
index 000000000..3de8351bc
--- /dev/null
+++ b/uppsrc/TCore/appdoc.tpp/CalcArith$en-us.tpp
@@ -0,0 +1,141 @@
+TITLE("Arithmetical operations")
+REF("Calc$CabsN")
+REF("Calc$CaddNN")
+REF("Calc$CceilN")
+REF("Calc$CceilNN")
+REF("Calc$CceilrNN")
+REF("Calc$CdivNN")
+REF("Calc$CfloorN")
+REF("Calc$CfloorNN")
+REF("Calc$CfloorrNN")
+REF("Calc$CgeNN")
+REF("Calc$ChypotNN")
+REF("Calc$CleNN")
+REF("Calc$ClogNotN")
+REF("Calc$CltNN")
+REF("Calc$CmaxNN")
+REF("Calc$CminNN")
+REF("Calc$CminmaxNNN")
+REF("Calc$CminusN")
+REF("Calc$CmodNN")
+REF("Calc$CmulNN")
+REF("Calc$CplusN")
+REF("Calc$CroundN")
+REF("Calc$CroundNN")
+REF("Calc$CroundrNN")
+REF("Calc$CsgnN")
+REF("Calc$CsqrN")
+REF("Calc$CsqrtN")
+REF("Calc$CsubNN")
+REF("Calc$CgtNN")
+TOPIC_TEXT(
+"[2 $$0,0#00000000000000000000000000000000:Default][b100;a50;K* $$1,0#23046025415494101427921008701515:Paragraph][i167;b50;a25;kKN1;~~~>.3917;* "
+"$$2,0#52185223490867151055420261384346:Toc1`.Heading1][i333;kN11;~~~>.3917;* $$3,0#36545033421193513457240054113541:Toc2`.Heading2][i500;kN111;~~~>.3917; "
+"$$4,0#65092512416424580164828413186219:Toc3`.Heading3][i167;b50;a25;kKNA;~~~>.3917;* "
+"$$5,5#92291332474308709450111162202673:AppToc1`.AppHeading1][i333;kNA1;~~~>.3917;* "
+"$$6,15#61887903412252554674480251236992:AppToc2`.AppHeading2][i500;kNA11;~~~>.3917; "
+"$$7,7#03533551421653050355120437860335:AppToc3`.AppHeading3][i500;b100;a100;KN1;*4 "
+"$$8,0#94145093439740438411010082165944:Heading1][i500;b100;a50;kKN11;*+117 $$9,0#10901425421210535753260366156531:Heading2][i500;b100;a25;kKN111;* "
+"$$10,0#53209141402041366431858192225431:Heading3][i500;b100;a100;KNA;*4 $$11,8#32912651424211307887950041245434:AppHeading1][i500;b100;a50;kKNA1;*+117 "
+"$$12,8#51232055453458524230328032001901:AppHeading2][i500;b100;a25;kKNA11;* $$13,8#34108020439428305453439845463579:AppHeading3][b100;a50;k*4 "
+"$$14,0#49239115434362547028389207250014:Heading][b50;a25;k~~~>.3917;* $$15,15#40743698422276745552070108434023:Toc`.Heading][b100;a50;K~~~>.3917;*+117 "
+"$$16,16#15422850471211852294098111138263:Topics1][l167;b50;a50;K~~~>.3917;* $$17,17#35241722455500657380289596243808:Topics2][l333;~~~>.3917; "
+"$$18,18#31041344429742018840308064013200:Topics3][b83;a42;K* $$19,0#46440151113795363000000595230845:Paragraph][{_}%EN-US "
+"[s14;:Calc`$CabsN: [%00-00 abs (real number) ][%00-00S ®][%00-00  real number]&][s0; "
+"Absolute value. If the number is positive, its absolute value is equal to it. The "
+"absolute value of a negative number is its inverse.&][s0; &][s0; [* Example]: abs(`-10.5) "
+"`= 10.5, abs(12) `= 12.&][s14;:Calc`$CaddNN: operator `+  (real number, real number) "
+"[S ®] real number&][s0; &][s0; &][s14;:Calc`$CceilN: [%00-00 ceil (real number) "
+"][%00-00S ®][%00-00  real number]&][s0; &][s14;:Calc`$CceilNN: [%00-00 ceil (real "
+"number")
+TOPIC_TEXT(
+" ][%00-00/ value][%00-00 , integer ][%00-00/ decimals][%00-00 ) ][%00-00S ®][%00-00 "
+" real number]&][s0; Rounding down (towards plus infinity) to the stated number of "
+"decimal places (0 by default). The function returns the lowest integral multiple "
+"of [* 10_`*`*_][/ `-decimals] not lower than the original [/ value].&][s0; &][s0; "
+"[* Example]: ceil(`-2.5) `= `-2, ceil(47.32, 1) `= 47.4, ceil(117, `-1) `= 120.&][s14;:Calc`$CceilrNN: "
+"[%00-00 ceilr(real number ][%00-00/ value][%00-00 , integer ][%00-00/ significant`_digits][%00-00 "
+") ][%00-00S ®][%00-00  real number]&][s0; Rounding up (towards plus infinity) to "
+"the stated number of significant digits. The function returns the lowest integral "
+"multiple of [* 10_`*`*_][/ (ceil(log(value))`-significant`_digits)] not lower than "
+"the original [/ value].&][s0; &][s0;* Example: ceilr(47.32, 3) `= 47.4, ceilr(117, "
+"1) `= 200.&][s14;:Calc`$CdivNN: [%00-00 operator /  (real number, real number) ][%00-00S "
+"®][%00-00  real number]&][s0; Real number division. If the right operand equals "
+"zero, the computation aborts with the error [* division by zero].&][s0; &][s0; [* "
+"Example]: 3.7 / 2.5 `= 1.48.&][s14;:Calc`$CfloorN: [%00-00 floor (real number) ][%00-00S "
+"®][%00-00  real number]&][s0; &][s14;:Calc`$CfloorNN: [%00-00 floor (real number "
+"][%00-00/ value][%00-00 , integer ][%00-00/ decimals][%00-00 ) ][%00-00S ®][%00-00 "
+" real number]&][s0; Rounding down (towards minus infinity) to the stated number of "
+"decimal places (0 by default). The function returns the highest integral multiple "
+"of [* 10_`*`*_][/ `-decimals] not greater than the original [/ value].&][s0; &][s0; "
+"[* Example]: floor(`-2.5) `= `-3, floor(47.32, 1) `= 47.3, floor(117, `-1) `= 110.&][s14;:Calc`$CfloorrNN: "
+"[%00-00 floorr(real number ][%00-00/ value][%00-00 , integer ][%00-00/ significant`_digits][%00-00 "
+") ][%00-00S ®][%00-00  real number]&][s0; Rounding down (towards minus infinity) "
+"to the stated number of significant digits. The function returns the highest integral "
+"multiple ")
+TOPIC_TEXT(
+"of [* 10_`*`*_][/ (ceil(log(value))`-significant`_digits) ]not greater than the "
+"original [/ value].&][s0; &][s0;* Example: floorr(47.32, 3) `= 47.3, floorr(117, "
+"1) `= 100.&][s14;:Calc`$CgeNN: [%00-00 operator >`=  (real number, real number) ][%00-00S "
+"®][%00-00  logical value]&][s0; The operator will compare its operands returning "
+"the value 1 if the relation holds, 0 when not. String values are compared lexicographically "
+"([/ dictionary] organization).&][s14;:Calc`$ChypotNN: [%00-00 hypot (real number "
+"][%00-00/ x][%00-00 , real number ][%00-00/ y][%00-00 ) ][%00-00S ®][%00-00  real "
+"number]&][s0; The length of the hypotenuse of the right`-angled triangle. The hypotenuse "
+"is calculated using the Pythagoras theorem, [* hypot(][*/ x][* , ][*/ y][* ) `= sqrt(][*/ "
+"x][*  `* ][*/ x][*  `+ ][*/ y][*  `* ][*/ y][* )].&][s0; &][s0; [* Example]: hypot(3, "
+"4) `= 5&][s14;:Calc`$CleNN: operator <`=  (real number, real number) [S ®] logical "
+"value&][s0; The operator will compare its operands returning the value 1 if the relation "
+"holds, 0 when not. String values are compared lexicographically ([/ dictionary] organization).&][s14;:Calc`$ClogNotN: "
+"[%00-00 operator !  (real number) ][%00-00S ®][%00-00  logical value]&][s0; Logical "
+"negation. The result is the logical value 1 ([* true]), if the argument is zero (zero "
+"number or the logical value [* false]). If the argument is nonzero or if it contains "
+"the logical value [* true], the result of logical negation is the value 0 ([* false]). "
+"If the operator ! is applied to a string, the result will be 1 ([* true]) when and "
+"only when the string is empty.&][s0; &][s0; [* Example]: !10 `= 0, !0 `= 1, !`\"hello`\" "
+"`= 0&][s14;:Calc`$CltNN: operator <  (real number, real number) [S ®] logical value&][s0; "
+"The operator will compare its operands returning the value 1 if the relation holds, "
+"0 when not. String values are compared lexicographically ([/ dictionary] organization).&][s14;:Calc`$CmaxNN: "
+"max (real number, real number) [S ®] real number&][s0; &]")
+TOPIC_TEXT(
+"[s14;:Calc`$CminNN: min (real number, real number) [S ®] real number&][s0; &][s14;:Calc`$CminmaxNNN: "
+"minmax (real number, real number, real number) [S ®] real number&][s0; &][s14;:Calc`$CminusN: "
+"[%00-00 operator `-  (real number) ][%00-00S ®][%00-00  real number]&][s0; &][s0; "
+"Function returns number of minutes of its date/time argument.&][s14;:Calc`$CmodNN: "
+"[%00-00 operator %  (real number ][%00-00/ a][%00-00 , real number ][%00-00/ b][%00-00 "
+") ][%00-00S ®][%00-00  real number]&][s0; Division remainder. The operator determines "
+"the least non`-negative real number which can be obtained by adding or subtraction "
+"any integral multiples of [/ b] to value [/ a]. If [/ b] zero, the computation aborts "
+"with the error [* division by zero].&][s0; &][s0; [* Example]: 10.5 % 2.4 `= 0.9 "
+"(10.5 `= 4 `* 2.4 `+ 0.9).&][s0; The function returns the month number of its argument.&][s0; "
+"&][s14;:Calc`$CmulNN: [%00-00 operator `*  (real number, real number) ][%00-00S ®][%00-00 "
+" real number]&][s0; The product of two real numbers.&][s0; &][s0; [* Example]: 17 "
+"`* 15 `= 255.&][s14;:Calc`$CplusN: operator `+  (real number) [S ®] real number&][s0; "
+"&][s0; &][s14;:Calc`$CroundN: [%00-00 round (real number) ][%00-00S ®][%00-00  real "
+"number]&][s0; &][s14;:Calc`$CroundNN: [%00-00 round (real number ][%00-00/ value][%00-00 "
+", integer ][%00-00/ decimals][%00-00 ) ][%00-00S ®][%00-00  real number]&][s0; Rounding "
+"to the stated number of decimal places (0 by default). The direction of rounding "
+"is towards the nearest integral multiple of [* 10_`*`*_][/ `-decimals]. If the number "
+"lies exactly in the middle between two such numbers, it is rounded up (towards positive "
+"infinity).&][s0; &][s0; [* Example]: round(`-2.5) `= `-2, round(47.32, 1) `= 47.3, "
+"round(117, `-1) `= 120.&][s14;:Calc`$CroundrNN: [%00-00 roundr(real number ][%00-00/ "
+"value][%00-00 , integer ][%00-00/ significant`_digits][%00-00 ) ][%00-00S ®][%00-00 "
+" real number]&][s0; Rounding to the stated number of significant digits. The direction "
+"o")
+TOPIC_TEXT(
+"f rounding is towards the nearest integral multiple of [* 10_`*`*_][/ (ceil(log(value)`-significant`_digits)]. "
+"If the number lies exactly in the middle between two such nearest numbers, it is "
+"rounded up (towards positive infinity).&][s0; &][s0;* Example: roundr(47.32, 3) `= "
+"47.3, roundr(117, 1) `= 100.&][s0; &][s14;:Calc`$CsgnN: [%00-00 sgn (real number "
+"][%00-00/ x][%00-00 ) ][%00-00S ®][%00-00  integer]&][s0; Sign. The sign computation "
+"is based on the following table:&][s0; &][s0; &][s0; &][s0; [* Example]: sgn(`-13.5) "
+"`= `-1, sgn(0) `= 0, sgn(10) `= `+1.&][s14;:Calc`$CsqrN: [%00-00 sqr (real number "
+"][%00-00/ x][%00-00 ) ][%00-00S ®][%00-00  real number]&][s0; Square. The function "
+"returns the value [* sqr(][*/ x][* ) `= ][*/ x][*  `* ][*/ x].&][s0; &][s0; [* Example]: "
+"sqr(12) `= 144&][s14;:Calc`$CsqrtN: [%00-00 sqrt (real number ][%00-00/ x][%00-00 "
+") ][%00-00S ®][%00-00  real number]&][s0; [%00-00 Squared root.]&][s0; &][s14;:Calc`$CsubNN: "
+"operator `-  (real number, real number) [S ®] real number&][s0; &][s14;:Calc`$CgtNN: "
+"operator >  (real number, real number) [S ®] logical value&][s0; The operator will "
+"compare its operands returning the value 1 if the relation holds, 0 when not. String "
+"values are compared lexicographically ([/ dictionary] organization).&][s0; &][s0; "
+"]")
diff --git a/uppsrc/TCore/appdoc.tpp/CalcArray$cs-cz.tpp b/uppsrc/TCore/appdoc.tpp/CalcArray$cs-cz.tpp
new file mode 100644
index 000000000..06aef05f5
--- /dev/null
+++ b/uppsrc/TCore/appdoc.tpp/CalcArray$cs-cz.tpp
@@ -0,0 +1,145 @@
+TITLE("Zpracování polí hodnot")
+REF("Calc$CarrayIndex")
+REF("Calc$CcountA")
+REF("Calc$CleftAN")
+REF("Calc$CmidAN")
+REF("Calc$CmidANN")
+REF("Calc$CrightAN")
+REF("Calc$CsumA")
+REF("Calc$CsumASC")
+TOPIC_TEXT(
+"[2 $$0,0#00000000000000000000000000000000:Default][b100;a50;K* $$1,0#23046025415494101427921008701515:Paragraph][i167;b50;a25;kKN1;~~~>.3917;* "
+"$$2,0#52185223490867151055420261384346:Toc1`.Heading1][i333;kN11;~~~>.3917;* $$3,0#36545033421193513457240054113541:Toc2`.Heading2][i500;kN111;~~~>.3917; "
+"$$4,0#65092512416424580164828413186219:Toc3`.Heading3][i167;b50;a25;kKNA;~~~>.3917;* "
+"$$5,5#922913324743")
+TOPIC_TEXT(
+"08709450111162202673:AppToc1`.AppHeading1][i333;kNA1;~~~>.3917;* $$6,15#61887903412252554674480251236992:AppToc2`.AppHeading2][i500;kNA11;~~~>.3917; "
+"$$7,7#03533551421653050355120437860335:AppToc3`.AppHeading3][i500;b100;a100;KN1;*4 "
+"$$8,0#94145093439740438411010082165944:Heading1][i500;b100;a50;kKN11;*+117 $$9,0#10901425421210535753260366156531:Heading2][i500;b100;a25;kKN111;* "
+"$$10,0#53209141402041")
+TOPIC_TEXT(
+"366431858192225431:Heading3][i500;b100;a100;KNA;*4 $$11,8#32912651424211307887950041245434:AppHeading1][i500;b100;a50;kKNA1;*+117 "
+"$$12,8#51232055453458524230328032001901:AppHeading2][i500;b100;a25;kKNA11;* $$13,8#34108020439428305453439845463579:AppHeading3][b100;a50;k*4 "
+"$$14,0#49239115434362547028389207250014:Heading][b50;a25;k~~~>.3917;* $$15,15#40743698422276745552070108434023:Toc`.Heading][b10")
+TOPIC_TEXT(
+"0;a50;K~~~>.3917;*+117 $$16,16#15422850471211852294098111138263:Topics1][l167;b50;a50;K~~~>.3917;* "
+"$$17,17#35241722455500657380289596243808:Topics2][l333;~~~>.3917; $$18,18#31041344429742018840308064013200:Topics3][b83;a42;K* "
+"$$19,0#46440151113795363000000595230845:Paragraph][{_}%EN-US [s14; oper\303\241tor "
+"`+  (pole hodnot, pole hodnot) [S \302\256] pole hodnot&][s0; Oper\303\241tor spoj\303\255 "
+"dv\304\233 pole (za\305\231ad\303\255 jeji")
+TOPIC_TEXT(
+"ch jednotliv\303\251 prvky za sebe).&][s14;:Calc`$CarrayIndex: [%00-00 oper\303\241tor "
+"`[`]  (pole hodnot, cel\303\251 \304\215\303\255slo) ][%00-00S \302\256][%00-00  "
+"libovoln\303\275 typ]&][s0; Oper\303\241tor vr\303\241t\303\255 prvek pole na dan\303\251 "
+"pozici. Prvky pole jsou indexov\303\241ny od 0, posledn\303\255 prvek m\303\241 index "
+"[/ pole.count]`-1.&][s0; &][s0; [* P\305\231\303\255klad: ]`[`\"index0`\", `\"index1`\", "
+"`\"index2`\"`]`[1`] `= `\"index1`\"&][s0;* [* Pomoc\303\255 konstruktu ]`[a .")
+TOPIC_TEXT(
+". b`][*  lze vytvo\305\231it pole hodnot z_dan\303\251ho intervalu. V\303\275sledn\303\251 "
+"pole bude obsahovat hodnoty ]`[a,a`+1,a`+2,...,[* round(]b[* )]`].&][s14;:Calc`$CcountA: "
+"[%00-00 count (pole hodnot) ][%00-00S \302\256][%00-00  cel\303\251 \304\215\303\255slo]&][s0; "
+"Funkce vr\303\241t\303\255 po\304\215et prvk\305\257 zadan\303\251ho pole.&][s0; "
+"&][s0; [* P\305\231\303\255klad: ]count(`[3..6`]) `= 4&][s14;:Calc`$CleftAN: [%00-00 "
+"group(pole hodnot ][%00-00/ data][%00-00 , pole h")
+TOPIC_TEXT(
+"odnot ][%00-00/ skupiny][%00-00 , \305\231et\304\233zec ][%00-00/ prom\304\233nn\303\241][%00-00 "
+", lambda`-v\303\275raz ][%00-00/ seskupit][%00-00 , lambda`-v\303\275raz ][%00-00/ "
+"v\303\275stup][%00-00 )] [S \302\256] pole hodnot&][s14;:Calc`$CleftAN: [%00-00 group(pole "
+"hodnot ][%00-00/ data][%00-00 , pole hodnot ][%00-00/ skupiny][%00-00 , \305\231et\304\233zec "
+"][%00-00/ prom\304\233nn\303\241][%00-00 , lambda`-v\303\275raz ][%00-00/ seskupit][%00-00 "
+")] [S \302\256] pole hodnot&")
+TOPIC_TEXT(
+"][s0; Funkce p\305\231eskup\303\255 hodnoty v zadan\303\251m poli [/ data] v z\303\241vislosti "
+"na obsahu \305\231\303\255dic\303\255ho pole [/ skupiny]. V\303\275sledkem funkce "
+"je pole se stejn\303\275m po\304\215tem prvk\305\257, jako m\303\241 pole [/ skupiny]. "
+"Pro ka\305\276d\303\275 prvek pole [/ data] (p\305\231i\305\231azen\303\275 do prom\304\233nn\303\251 "
+"[/ prom\304\233nn\303\241]) se nejprve vypo\304\215te lambda`-v\303\275raz [/ seskupit] "
+"a jeho v\303\275sledek se vyhled\303\241 v poli [/ skupiny]. Pokud hodnota v poli "
+"nen\303\255 nalezena")
+TOPIC_TEXT(
+", prvek se ignoruje. Pokud hodnota nalezena je, vypo\304\215\303\255t\303\241 se "
+"lambda`-v\303\275raz [/ v\303\275stup] a jeho v\303\275sledek se p\305\231i\304\215te "
+"k stejnolehl\303\251mu prvku v\303\275stupn\303\255mu pole hodnot, tedy k prvku se "
+"stejn\303\275m indexem, jako pod kter\303\275m byla v poli [/ skupiny] nalezena hodnota "
+"vypo\304\215ten\303\241 v\303\275razem [/ seskupit]. S\304\215\303\255t\303\241n\303\255 "
+"v\303\275stupn\303\255ch hodnot pracuje stejn\304\233 jako v p\305\231\303\255pad\304\233 "
+"funkce [/ sum], tedy pokud funkce [/ v\303")
+TOPIC_TEXT(
+"\275stup] vytv\303\241\305\231\303\255 hodnoty typu [/ \304\215\303\255slo], v\303\275sledn\303\251 "
+"prvky pole budou obsahovat sou\304\215ty t\304\233chto hodnot; pokud funkce vytv\303\241\305\231\303\255 "
+"\305\231et\304\233zce, v\303\275sledn\303\251 prvky pole budou obsahovat spojen\303\255 "
+"t\304\233chto \305\231et\304\233zc\305\257 za sebe, a v p\305\231\303\255pad\304\233 "
+"pol\303\255 budou ve v\303\275stupn\303\255m poli prvky vytvo\305\231en\303\251 spojen\303\255m "
+"d\303\255l\304\215\303\255ch pol\303\255.&][s0; &][s0; Posledn\303\255 parametr [/ "
+"v\303\275stup] je nepovinn\303\275; pokud nen\303\255 zad\303\241n, pou\305\276ije "
+"se ")
+TOPIC_TEXT(
+"jako v\303\275stupn\303\255 hodnota pr\303\241v\304\233 zpracov\303\241van\303\275 "
+"prvek vstupn\303\255ho pole [/ data].&][s0; &][s0;* P\305\231\303\255klad:&][s0; "
+"group(`[`[4, `\"D`\"`], `[2, `\"B`\"`], `[4, `\"C`\"`], `[1, `\"A`\"`]`], `[1, 2, "
+"3, 4`], `\"x`\", #(x`[0`]), #(`[x`[1`]`])) [S \302\256] `[`[`\"A`\"`], `[`\"B`\"`], "
+"null, `[`\"D`\", `\"C`\"`]`]&][s0; group(`[`[4, `\"D`\"`], `[2, `\"B`\"`], `[4, `\"C`\"`], "
+"`[1, `\"A`\"`]`], `[1, 2, 3, 4`], `\"x`\", #(x`[0`])) [S \302\256 ]`[`[1,")
+TOPIC_TEXT(
+" `\"A`\"`], `[2, `\"B`\"`], null, `[4, `\"D`\", 4, `\"C`\"`]`]&][s14; [%00-00 left "
+"(pole hodnot, cel\303\251 \304\215\303\255slo ][%00-00/ po\304\215et][%00-00 ) ][%00-00S "
+"\302\256][%00-00  pole hodnot]&][s0; Funkce vr\303\241t\303\255 pole obsahuj\303\255c\303\255 "
+"prvn\303\255ch [* po\304\215et] hodnot zadan\303\251ho pole hodnot. Pokud je hodnota "
+"[* po\304\215et] men\305\241\303\255 nebo rovna nule, funkce vr\303\241t\303\255 "
+"pr\303\241zdn\303\251 pole. Pokud je hodnota [* po\304\215et] v\304\233t\305\241\303\255 "
+"ne\305\276 po\304\215et prvk\305\257 pole, ")
+TOPIC_TEXT(
+"funkce vr\303\241t\303\255 p\305\257vodn\303\255 pole beze zm\304\233ny.&][s0; &][s0; "
+"[* P\305\231\303\255klad: ]left(`{1, 2, 3, 5, 8, 13`}, 4) `= `{1, 2, 3, 5`}&][s14;:Calc`$CmidAN: "
+"[%00-00 mid (pole hodnot, cel\303\251 \304\215\303\255slo ][%00-00/ i][%00-00 ) ][%00-00S "
+"\302\256][%00-00  pole hodnot]&][s0; Funkce vr\303\241t\303\255 ze zadan\303\251ho "
+"pole [* i]`-t\303\275 a\305\276 posledn\303\255 prvek. Prvn\303\255 prvek pole m\303\241 "
+"index 0.&][s0; &][s0; [* P\305\231\303\255klad: ]mid(`[`\"A`\", `\"B`\", `\"C`\", "
+"`\"D`\"")
+TOPIC_TEXT(
+", `\"E`\"`], 2) `= `[`\"C`\", `\"D`\", `\"E`\"`]&][s0;* &][s14;:Calc`$CmidANN: [%00-00 "
+"mid (pole hodnot, cel\303\251 \304\215\303\255slo ][%00-00/ i][%00-00 , cel\303\251 "
+"\304\215\303\255slo ][%00-00/ po\304\215et][%00-00 ) ][%00-00S \302\256][%00-00  "
+"pole hodnot]&][s0; Funkce vr\303\241t\303\255 ze zadan\303\251ho pole [* po\304\215et] "
+"prvk\305\257 po\304\215\303\255naje [* i]`-t\303\275m prvkem. Prvn\303\255 prvek "
+"pole m\303\241 index 0.&][s0; &][s0; [* P\305\231\303\255klad: ]mid(`[`\"A`\", `\"B`\", "
+"`\"C`\", `\"D`\", `\"E`\"`], 2")
+TOPIC_TEXT(
+", 2) `= `[`\"C`\", `\"D`\"`]&][s14;:Calc`$CrightAN: [%00-00 right (pole hodnot, "
+"cel\303\251 \304\215\303\255slo ][%00-00/ po\304\215et][%00-00 ) ][%00-00S \302\256][%00-00 "
+" pole hodnot]&][s0; Funkce vr\303\241t\303\255 posledn\303\255ch [* po\304\215et] "
+"hodnot z_konce zadan\303\251ho pole. Pokud je [* po\304\215et <`= 0], funkce vr\303\241t\303\255 "
+"pr\303\241zdn\303\251 pole. Je`-li [* po\304\215et ]v\304\233t\305\241\303\255 nebo "
+"roven po\304\215tu prvk\305\257 vstupn\303\255ho pole, funkce vr\303\241t\303\255 "
+"toto pole beze zm\304\233ny.&][s0; &]")
+TOPIC_TEXT(
+"[s0; [* P\305\231\303\255klad:] right(`[1..5`], 3) `= `[3, 4, 5`]&][s14;:Calc`$CsumA: "
+"[%00-00 sum (pole hodnot) ][%00-00S \302\256][%00-00  libovoln\303\275 typ]&][s0; "
+"Funkce vr\303\241t\303\255 sou\304\215et hodnot zadan\303\251ho pole. Pokud pole "
+"obsahuje jako prvky \304\215\303\255seln\303\251 hodnoty, funkce vr\303\241t\303\255 "
+"\304\215\303\255seln\303\275 sou\304\215et t\304\233chto hodnot. Pokud pole obsahuje "
+"\305\231et\304\233zce, funkce vr\303\241t\303\255 spojen\303\255 t\304\233chto \305\231et\304\233zc\305\257. "
+"P\305\231\303\255padn\303\251 hodnoty [* null] v_pol")
+TOPIC_TEXT(
+"i se ignoruj\303\255.&][s0; &][s0; [* P\305\231\303\255klad: ]sum(`{1..5`}) `= 15&][s14;:Calc`$CsumASC: "
+"[%00-00 sum(pole hodnot, \305\231et\304\233zec ][%00-00/ identifik\303\241tor][%00-00 "
+", lambda`-v\303\275raz) ][%00-00S \302\256][%00-00  libovoln\303\275 typ]&][s0; Funkce "
+"se\304\215te / spoj\303\255 hodnoty vypo\304\215ten\303\251 zadan\303\275m [* lambda`-v\303\275razem] "
+"z[/  ]prvk\305\257 zadan\303\251ho pole. [/ Lambda`-v\303\275raz] sm\303\255 pou\305\276\303\255vat "
+"zadan\303\275 [* identifik\303\241tor] pro p\305\231\303\255stup k aktu")
+TOPIC_TEXT(
+"\303\241ln\303\255mu prvku pole. V\303\275sledky v\303\275razu mus\303\255 b\303\275t "
+"jednoho z_podporovan\303\275ch datov\303\275ch typ\305\257:&][s0; &][s0;i150;O0;+-83 "
+"[* \304\215\303\255slo] `- funkce vr\303\241t\303\255 sou\304\215et v\305\241ech "
+"t\304\233chto \304\215\303\255sel; prvky obsahuj\303\255c\303\255 hodnotu [* null] "
+"se ignoruj\303\255&][s0;i150;O0;+-83 [* \305\231et\304\233zec] `- funkce vr\303\241t\303\255 "
+"spojen\303\255 v\305\241ech t\304\233chto \305\231et\304\233zc\305\257&][s0;i150;O0;+-83 "
+"[* pole] `- funkce vr\303\241t\303\255 spojen\303\255 v\305\241ech t\304\233chto "
+"pol\303\255&][s0;i200;+-")
+TOPIC_TEXT(
+"83 &][s0;+-83 [* P\305\231\303\255klad:] `[1, 4, 7`].sum(`\"X`\", #(X`*X)) `= 66, "
+"`[1, 4, 7`].sum(`\"T`\", #(T.text)) `= `\"147`\"&][s0; Funkce p\305\231evede zadan\303\251 "
+"pole na standardn\303\255 textovou reprezentaci ve tvaru&][s0; &][s0; `[[/ prvn\303\255 "
+"prvek, druh\303\275 prvek, t\305\231et\303\255 prvek...]`]&][s0; &][s0; [* P\305\231\303\255klad:] "
+"`[0.0, 1.0, 2.5`].text `= `\"`[0, 1, 2.5`]`\"&][s0; &][s0;* &][s0; &][s0; &][s0; "
+"&][s0; &][s0;3 ]")
diff --git a/uppsrc/TCore/appdoc.tpp/CalcArray$en-us.tpp b/uppsrc/TCore/appdoc.tpp/CalcArray$en-us.tpp
new file mode 100644
index 000000000..080f1be01
--- /dev/null
+++ b/uppsrc/TCore/appdoc.tpp/CalcArray$en-us.tpp
@@ -0,0 +1,53 @@
+TITLE("Array processing functions")
+REF("Calc$CaddAA")
+REF("Calc$CarrayIndex")
+REF("Calc$CcountA")
+REF("Calc$CleftAN")
+REF("Calc$CmidAN")
+REF("Calc$CmidANN")
+REF("Calc$CrightAN")
+REF("Calc$CsumA")
+REF("Calc$CsumASC")
+TOPIC_TEXT(
+"[2 $$0,0#00000000000000000000000000000000:Default][b100;a50;K* $$1,0#23046025415494101427921008701515:Paragraph][i167;b50;a25;kKN1;~~~>.3917;* "
+"$$2,0#52185223490867151055420261384346:Toc1`.Heading1][i333;kN11;~~~>.3917;* $$3,0#36545033421193513457240054113541:Toc2`.Heading2][i500;kN111;~~~>.3917; "
+"$$4,0#65092512416424580164828413186219:Toc3`.Heading3][i167;b50;a25;kKNA;~~~>.3917;* "
+"$$5,5#92291332474308709450111162202673:AppToc1`.AppHeading1][i333;kNA1;~~~>.3917;* "
+"$$6,15#61887903412252554674480251236992:AppToc2`.AppHeading2][i500;kNA11;~~~>.3917; "
+"$$7,7#03533551421653050355120437860335:AppToc3`.AppHeading3][i500;b100;a100;KN1;*4 "
+"$$8,0#94145093439740438411010082165944:Heading1][i500;b100;a50;kKN11;*+117 $$9,0#10901425421210535753260366156531:Heading2][i500;b100;a25;kKN111;* "
+"$$10,0#53209141402041366431858192225431:Heading3][i500;b100;a100;KNA;*4 $$11,8#32912651424211307887950041245434:AppHeading1][i500;b100;a50;kKNA1;*+117 "
+"$$12,8#51232055453458524230328032001901:AppHeading2][i500;b100;a25;kKNA11;* $$13,8#34108020439428305453439845463579:AppHeading3][b100;a50;k*4 "
+"$$14,0#49239115434362547028389207250014:Heading][b50;a25;k~~~>.3917;* $$15,15#40743698422276745552070108434023:Toc`.Heading][b100;a50;K~~~>.3917;*+117 "
+"$$16,16#15422850471211852294098111138263:Topics1][l167;b50;a50;K~~~>.3917;* $$17,17#35241722455500657380289596243808:Topics2][l333;~~~>.3917; "
+"$$18,18#31041344429742018840308064013200:Topics3][b83;a42;K* $$19,0#46440151113795363000000595230845:Paragraph][{_}%EN-US "
+"[s14;:Calc`$CaddAA: operator `+  (pole hodnot, pole hodnot) [S ®] pole hodnot&][s0; "
+"&][s14;:Calc`$CarrayIndex: operator `[`]  (pole hodnot, integer) [S ®] any data "
+"type&][s0; &][s0; [* Example]: mesic(27.5.1984) `= 5&][s0; The binary operator [* "
+"`*] evaluates the [/ lambda`-expression] for each element of the original array and "
+"returns an array composed of the results. The output array has always the same number "
+"of elements as the input array. During evaluation of the lambda`-expression for each "
+"input arra")
+TOPIC_TEXT(
+"y element the calculator variable [* I] is set to the index of the current array "
+"element (first array element has index 0) and the variable [* A] contains the value "
+"of the array element being processed.&][s14;:Calc`$CcountA: count (pole hodnot) [S "
+"®] integer&][s14;:Calc`$CleftAN: [%00-00 left (pole hodnot, integer) ][%00-00S ®][%00-00 "
+" pole hodnot]&][s0; &][s14;:Calc`$CmidAN: [%00-00 mid (pole hodnot, integer) ][%00-00S "
+"®][%00-00  pole hodnot]&][s0; &][s14;:Calc`$CmidANN: [%00-00 mid (pole hodnot, integer, "
+"integer) ][%00-00S ®][%00-00  pole hodnot]&][s0; &][s14;:Calc`$CrightAN: [%00-00 "
+"right (pole hodnot, integer) ][%00-00S ®][%00-00  pole hodnot]&][s0; &][s14;:Calc`$CsumA: "
+"sum (pole hodnot) [S ®] any data type&][s0; &][s14;:Calc`$CsumASC: [%00-00 sum(pole "
+"hodnot, string ][%00-00/ identifier][%00-00 , lambda`-výraz) ][%00-00S ®][%00-00 "
+" any data type]&][s0; Function adds / concatenates values calculated from the members "
+"of its input array using a given [/ lambda`-expression]. [/ Lambda`-expressions] "
+"may use the given [/ identifier] to access the current array element. The calculated "
+"values must be of one of the supported types:&][s0; &][s0;i150;O0;+-83 [* numbers] "
+"`- function returns the arithmetic sum of all such numbers; elements containing the "
+"[* null] value are ignored&][s0;i150;O0;+-83 [* strings] `- function returns the "
+"string concatenation of all string values&][s0;i150;O0;+-83 [* arrays] `- function "
+"returns the array concatenation of all arrays&][s0;*+-83 &][s0;+-83 [*2 Example:][2 "
+" ]`[1, 4, 7`].sum(`\"X`\", #(X`*X)) `= 66, `[1, 4, 7`].sum(`\"T`\", #(T.text)) `= "
+"`\"147`\"&][s0; Function converts an array to its standard textual representation "
+"in the format&][s0; &][s0; `[[/ first element, second element, third element...]`]&][s0; "
+"&][s0; [* Example:]  `[0.0, 1.0, 2.5`].text `= `\"`[0, 1, 2.5`]`\"&][s0; &][s0; ]")
diff --git a/uppsrc/TCore/appdoc.tpp/CalcDate$cs-cz.tpp b/uppsrc/TCore/appdoc.tpp/CalcDate$cs-cz.tpp
new file mode 100644
index 000000000..101802211
--- /dev/null
+++ b/uppsrc/TCore/appdoc.tpp/CalcDate$cs-cz.tpp
@@ -0,0 +1,144 @@
+TITLE("Funkce pro práci s datem / časem")
+REF("Calc$CaddDN")
+REF("Calc$CaddND")
+REF("Calc$Cadd_monthsDN")
+REF("Calc$Cadd_yearsDN")
+REF("Calc$CdateN")
+REF("Calc$CdateNN")
+REF("Calc$CdateNNN")
+REF("Calc$Cday_of_weekD")
+REF("Calc$Cfirst_day_of_monthD")
+REF("Calc$CgeTT")
+REF("Calc$CgtTT")
+REF("Calc$Clast_day_of_monthD")
+REF("Calc$CleTT")
+REF("Calc$CltTT")
+REF("Calc$CmaxTT")
+REF("Calc$CminTT")
+REF("Calc$CminmaxTTT")
+REF("Calc$CsubDD")
+REF("Calc$CsubDN")
+REF("Calc$CtimeNNNNNN")
+REF("Calc$Cyears_betweenDD")
+TOPIC_TEXT(
+"[2 $$0,0#00000000000000000000000000000000:Default][b100;a50;K* $$1,0#23046025415494101427921008701515:Paragraph][i167;b50;a25;kKN1;~~~>.3917;* "
+"$$2,0#52185223490867151055420261384346:Toc1`.Heading1][i333;kN11;~~~>.3917;* $$3,0#36545033421193513457240054113541:Toc2`.Heading2][i500;kN111;~~~>.3917; "
+"$$4,0#65092512416424580164828413186219:Toc3`.Heading3][i167;b50;a25;kKNA;~~~>.3917;* "
+"$$5,5#92291332474308709450111162202673:AppToc1`.AppHeading1][i333;kNA1;~~~>.3917;* "
+"$$6,15#61887903412252554674480251236992:AppToc2`.AppHeading2][i500;kNA11;~~~>.3917; "
+"$$7,7#03533551421653050355120437860335:AppToc3`.AppHeading3][i500;b100;a100;KN1;*4 "
+"$$8,0#94145093439740438411010082165944:Heading1][i500;b100;a50;kKN11;*+117 $$9,0#10901425421210535753260366156531:Heading2][i500;b100;a25;kKN111;* "
+"$$10,0#53209141402041366431858192225431:Heading3][i500;b100;a100;KNA;*4 $$11,8#32912651424211307887950041245434:AppHeading1][i500;b100;a50;kKNA1;*+117 "
+"$$12,8#51232055453458524230328032001901:AppHeading2][i500;b100;a25;kKNA11;* $$13,8#34108020439428305453439845463579:AppHeading3][b100;a50;k*4 "
+"$$14,0#49239115434362547028389207250014:Heading][b50;a25;k~~~>.3917;* $$15,15#40743698422276745552070108434023:Toc`.Heading][b100;a50;K~~~>.3917;*+117 "
+"$$16,16#15422850471211852294098111138263:Topics1][l167;b50;a50;K~~~>.3917;* $$17,17#35241722455500657380289596243808:Topics2][l333;~~~>.3917; "
+"$$18,18#31041344429742018840308064013200:Topics3][b83;a42;K* $$19,0#46440151113795363000000595230845:Paragraph][{_}%EN-US "
+"[s14;:Calc`$CaddDN: [%00-00 operátor `+  (datum/čas, reálné číslo) ][%00-00S "
+"®][%00-00  datum/čas]&][s0; Operátor posune zadané datum o_daný počet dní "
+"(dopředu, pokud je číslo kladné). Počet dní může být i neceločíselný, "
+"v_tom případě se posune i číslo sekundy, minuty a hodiny.&][s0; &][s0; [* Příklad: "
+"]27.12.1999 `+ 7 `= 3.1.2000&][s14;:Calc`$CaddND: [%00-00 operátor `+  (reálné "
+"číslo, datum/čas) ][%00-00S ®][%00-00  datum/čas]&][s0; Operátor posune zadané "
+"datum o_d")
+TOPIC_TEXT(
+"aný počet dní (dopředu, pokud je číslo kladné). Počet dní může být i "
+"neceločíselný, v_tom případě se posune i číslo sekundy, minuty a hodiny.&][s0; "
+"&][s0; [* Příklad: ]27.12.1999 `+ 7 `= 3.1.2000&][s14;:Calc`$Cadd`_monthsDN: [%00-00 "
+"add`_months (datum, celé číslo ][%00-00/ počet`_měsíců][%00-00 ) ][%00-00S "
+"®][%00-00  datum]&][s0; Funkce přičte k datu zadaný [/ počet měsíců]. Pokud "
+"cílový měsíc má méně dní, než je číslo dne v měsíci v původním datu, "
+"nastaví se číslo dne na číslo posledního dne v cílovém měsíci.&][s0; &][s0; "
+"[* Příklad: ]add`_months(29.2.1996, 12) `= 28.2.1997&][s14;:Calc`$Cadd`_yearsDN: "
+"[%00-00 add`_years (datum, celé číslo ][%00-00/ počet`_let][%00-00 ) ][%00-00S "
+"®][%00-00  datum]&][s0; Funkce přičte k datu zadaný [/ počet let]. Pokud původní "
+"datum je 29.2. v přestupném roce a cílový rok není přestupný, změní se číslo "
+"dne na 28.&][s0; &][s0; [* Příklad: ]add`_years(29.2.1992, 3) `= 28.2.1995&][s14;:Calc`$CdateN: "
+"[%00-00 date (celé číslo ][%00-00/ den][%00-00 ) ][%00-00S ®][%00-00  datum]&][s0; "
+"Funkce vrátí aktuální systémové datum, ve kterém zamění číslo dne hodnotou "
+"zadaného parametru [* den].&][s0; &][s0; Viz také:&][s0;i150;O0;*^dpp`:`/`/AppDoc`/`/`:`:`/`/Calc`$CdateNN^ "
+"date (celé číslo [/ den], celé číslo [/ měsíc]) [S ®] datum&][s0;i150;O0;*^dpp`:`/`/AppDoc`/`/`:`:`/`/Calc`$CdateNNN^ "
+"date (celé číslo [/ den], celé číslo [/ měsíc], celé číslo [/ rok]) [S "
+"®] datum&][s14;:Calc`$CdateNN: [%00-00 date (celé číslo ][%00-00/ den][%00-00 "
+", celé číslo ][%00-00/ měsíc][%00-00 ) ][%00-00S ®][%00-00  datum]&][s0; Funkce "
+"vrátí aktuální systémové datum, ve kterém zamění číslo dne hodnotou zadaného "
+"parametru [/ den] a číslo měsíce hodnotou parametru [/ měsíc].&][s14;:Calc`$CdateNNN: "
+"[%00-00 date (celé číslo ][%00-00/ den][%00-00 , celé číslo ][%00-00/ měsíc][%00-00 "
+", celé číslo ][%00-00/ rok][%00-0")
+TOPIC_TEXT(
+"0 ) ][%00-00S ®][%00-00  datum]&][s0; Funkce sestaví datum ze zadaných položek. "
+"Funkce bez parametru vrátí dnešní datum, zjištěné ze systému. Funkce s_jedním "
+"parametrem [/ den] vrátí den se zadaným číslem v_aktuálním měsíci. Funkce "
+"se dvěma parametry [/ den], [/ měsíc] vrátí den se zadaným číslem dne a_měsíce "
+"v_aktuálním roce. Varianta se třemi parametry pouze sestaví datum ze zadaných "
+"součástí.&][s0;* &][s0; [* Příklad: ]date `= 19.06.2003, date(10) `= 10.06.2003, "
+"date(15, 7) `= 15.07.2003, date(25, 1, 1974) `= 25.01.1974&][s0; [Idatum`, funkce; "
+"Funkce] vrátí číslo dne v měsíci pro zadané datum.&][s0; &][s0; [* Příklad: "
+"]den(27.5.1984) `= 27&][s14;:Calc`$Cday`_of`_weekD: [%00-00 day`_of`_week (datum) "
+"][%00-00S ®][%00-00  celé číslo]&][s0; Funkce vrátí index dne v_týdnu pro "
+"zadané datum. Prvním dnem v_týdnu s_indexem 0 je pro tuto funkci [* neděle], "
+"posledním dnem je [* sobota] s_indexem 6.&][s0; &][s0; [* Příklad: ]day`_of`_week(19.06.2003) "
+"`= 4&][s14;:Calc`$Cfirst`_day`_of`_monthD: [%00-00 first`_day`_of`_month (datum ][%00-00/ "
+"d][%00-00 ) ][%00-00S ®][%00-00  datum]&][s0; Funkce vrátí datum prvního dne "
+"v měsíci určeném parametrem [/ d].&][s0; &][s0; [* Příklad: ]first`_day`_of`_month(18.3.1994) "
+"`= 1.3.1994&][s14;:Calc`$CgeTT: [%00-00 operátor >`=  (datum/čas ][%00-00/ dt1][%00-00 "
+", datum/čas ][%00-00/ dt2][%00-00 ) ][%00-00S ®][%00-00  logická hodnota]&][s0; "
+"Funkce porovná zadaná data / časy a vrátí hodnotu [/ pravda], pokud je [/ datum/čas1] "
+"pozdější nebo roven času [/ datum/čas2].&][s0; &][s0; [* Příklad: ](15.1.2004 "
+">`= 13.3.2003) `= 1&][s14;:Calc`$CgtTT: [%00-00 operátor >  (datum/čas ][%00-00/ "
+"dt1][%00-00 , datum/čas ][%00-00/ dt2][%00-00 ) ][%00-00S ®][%00-00  logická hodnota]&][s0; "
+"Funkce porovná zadaná data / časy a vrátí hodnotu [/ pravda], pokud je [/ dt1] "
+"pozdější než [/ dt2].&][s0; &][s0; [* Příklad: ](15.1.2004 > 13.3.2003) `= "
+"1, (15.1.2004 > ")
+TOPIC_TEXT(
+"15.1.2004) `= 0&][s0; Funkce vrátí počet hodin svého argumentu typu datum/čas.&][s14;:Calc`$Clast`_day`_of`_monthD: "
+"[%00-00 last`_day`_of`_month (datum ][%00-00/ d][%00-00 ) ][%00-00S ®][%00-00  datum]&][s0; "
+"Funkce vrátí datum posledního dne v měsíci určeném parametrem [/ d].&][s0; "
+"&][s0; [* Příklad]: last`_day`_of`_month(3.2.1999) `= 28.2.1999&][s14;:Calc`$CleTT: "
+"[%00-00 operátor <`=  (datum/čas, datum/čas) ][%00-00S ®][%00-00  logická hodnota]&][s0; "
+"Funkce porovná zadaná data / časy a vrátí hodnotu [/ pravda], pokud je [* datum/čas1] "
+"dřívější nebo roven času [* datum/čas2].&][s0; &][s0; [* Příklad: ](15.1.2003 "
+"< 13.3.2003) `= 1&][s14;:Calc`$CltTT: [%00-00 operátor <  (datum/čas ][%00-00/ "
+"dt1][%00-00 , datum/čas ][%00-00/ dt2][%00-00 ) ][%00-00S ®][%00-00  logická hodnota]&][s0; "
+"Funkce porovná zadaná data / časy a vrátí hodnotu [/ pravda], pokud je čas "
+"[* dt1] dřívější než [* dt2].&][s0; &][s0; [* Příklad: ](15.1.2003 < 13.3.2003) "
+"`= 1&][s0; Funkce vrátí maximum z hodnot v daném poli. Pokud pole obsahuje řetězce, "
+"provede se jejich lexikografické srovnání.&][s0; &][s0; [* Příklad: ]max(`[8, "
+"5, 13, 2, 9`]) `= 13&][s14;:Calc`$CmaxTT: [%00-00 max (datum/čas, datum/čas) ][%00-00S "
+"®][%00-00  datum/čas]&][s0; Funkce vrátí větší z_dvojice zadaných dat/časů "
+"(pozdější čas/datum). Pokud je některý z parametrů roven [* null], je výsledkem "
+"funkce také [* null].&][s0; &][s0; [* Příklad: ]max(3.5.1994, 7.8.1998) `= 7.8.1998&][s14;:Calc`$CminTT: "
+"[%00-00 min (datum/čas, datum/čas) ][%00-00S ®][%00-00  datum/čas]&][s0; Funkce "
+"vrátí minimum ze dvou časů (dřívější z obou časů). Pokud je některý "
+"z parametrů roven [* null], je výsledkem funkce také [* null].&][s0;* &][s0; [* "
+"Příklad: ]min(1.8.1995, 3.6.1997) `= 1.8.1995&][s14;:Calc`$CminmaxTTT: [%00-00 "
+"minmax (datum/čas, datum/čas, datum/čas) ][%00-00S ®][%00-00  datum/čas]&][s0; "
+"Funkce vrátí hodnotu [* min(max(x, xmin), x")
+TOPIC_TEXT(
+"max)]. Pokud je některý z parametrů roven [* null], je výsledek také [* null].&][s0; "
+"&][s0; [* Příklad: ]minmax(3.1.1990, 8.8.1994, 2.5.1997) `= 8.8.1994, minmax(7.6.1995, "
+"8.8.1994, 2.5.1997) `= 7.6.1995, minmax(20.12.2003, 8.8.1994, 2.5.1997) `= 2.5.1997&][s14;:Calc`$CsubDD: "
+"[%00-00 operátor `-  (datum/čas ][%00-00/ datum1][%00-00 , datum/čas ][%00-00/ "
+"datum2][%00-00 ) ][%00-00S ®][%00-00  reálné číslo]&][s0; Unární operátor "
+"[* `-] obrátí znaménko svého argumentu.&][s0; &][s0; Binární operátor [* `-] "
+"odečte své operandy. V_případě dvojice čísel je výsledkem běžný číselný "
+"rozdíl hodnot. V_případě rozdílu data a_celého čísla se od data odečte zadaný "
+"počet dní. Výsledkem rozdílu dvou dat je počet dní mezi nimi. Počet je kladný, "
+"pokud je první datum pozdější než druhé.&][s0; &][s0; [* Příklad]: 137 `- "
+"95 `= 42, 27.12.1999 `- 5 `= 22.12.1999, 4.1.2000 `- 28.12.1999 `= 7&][s14;:Calc`$CsubDN: "
+"[%00-00 operátor `-  (datum/čas ][%00-00/ d][%00-00 , reálné číslo ][%00-00/ "
+"počet`_dní][%00-00 ) ][%00-00S ®][%00-00  datum/čas]&][s0; Operátor odečte "
+"od zadaného data/času [* d] zadaný [* počet dní]. Pokud je počet dní neceločíselný, "
+"posune se i číslo hodiny, minuty a sekundy. &][s0; &][s0; [* Příklad: ]11.6.2000 "
+"`+ 11.25 `= 22.6.2000 06:00:00&][s14;:Calc`$CtimeNNNNNN: [%00-00 time(celé číslo "
+"][%00-00/ den][%00-00 , celé číslo ][%00-00/ měsíc][%00-00 , celé číslo ][%00-00/ "
+"rok][%00-00 , celé číslo ][%00-00/ hodina][%00-00 , celé číslo ][%00-00/ minuta][%00-00 "
+", celé číslo ][%00-00/ sekunda][%00-00 ) ][%00-00S ®][%00-00  datum/čas]&][s0; "
+"Funkce vrátí hodnotu typu [* datum/čas] se zadaným číslem dne, hodiny, minuty "
+"a sekundy.&][s0; &][s0; [* Příklad: ]time(3, 7, 2003, 11, 15, 37).text `= `\"3.7.2003 "
+"11:15:37`\"&][s0; Funkce vrátí číslo roku pro zadané datum.&][s0; &][s0; [* "
+"Příklad]: rok(27.5.1984) `= 1984&][s14;:Calc`$Cyears`_betweenDD: [%00-00 years`_between")
+TOPIC_TEXT(
+" (datum ][%00-00/ d1][%00-00 , datum ][%00-00/ d2][%00-00 ) ][%00-00S ®][%00-00 "
+" celé číslo]&][s0; Funkce určí počet let, která leží mezi zadanými dvěma "
+"daty (věk osoby, narozené dne [/ d1], ke dni [/ d2]).&][s0; &][s0; [* Příklad]: "
+"years_between(25.1.1974, 27.12.1999) `= 25&][s0; &][s0; &][s0; &][s0; ]")
diff --git a/uppsrc/TCore/appdoc.tpp/CalcDate$en-us.tpp b/uppsrc/TCore/appdoc.tpp/CalcDate$en-us.tpp
new file mode 100644
index 000000000..541966b34
--- /dev/null
+++ b/uppsrc/TCore/appdoc.tpp/CalcDate$en-us.tpp
@@ -0,0 +1,106 @@
+TITLE("Date/time operations")
+REF("Calc$CaddDN")
+REF("Calc$CaddND")
+REF("Calc$Cadd_monthsDN")
+REF("Calc$Cadd_yearsDN")
+REF("Calc$Cdate0")
+REF("Calc$CdateN")
+REF("Calc$CdateNN")
+REF("Calc$CdateNNN")
+REF("Calc$Cday_of_weekD")
+REF("Calc$Cfirst_day_of_monthD")
+REF("Calc$CgeTT")
+REF("Calc$Clast_day_of_monthD")
+REF("Calc$CleTT")
+REF("Calc$CltTT")
+REF("Calc$CmaxTT")
+REF("Calc$CminTT")
+REF("Calc$CminmaxTTT")
+REF("Calc$CsubDN")
+REF("Calc$Cyears_betweenDD")
+REF("Calc$CgtTT")
+REF("Calc$CsubDD")
+TOPIC_TEXT(
+"[2 $$0,0#00000000000000000000000000000000:Default][b100;a50;K* $$1,0#23046025415494101427921008701515:Paragraph][i167;b50;a25;kKN1;~~~>.3917;* "
+"$$2,0#52185223490867151055420261384346:Toc1`.Heading1][i333;kN11;~~~>.3917;* $$3,0#36545033421193513457240054113541:Toc2`.Heading2][i500;kN111;~~~>.3917; "
+"$$4,0#65092512416424580164828413186219:Toc3`.Heading3][i167;b50;a25;kKNA;~~~>.3917;* "
+"$$5,5#92291332474308709450111162202673:AppToc1`.AppHeading1][i333;kNA1;~~~>.3917;* "
+"$$6,15#61887903412252554674480251236992:AppToc2`.AppHeading2][i500;kNA11;~~~>.3917; "
+"$$7,7#03533551421653050355120437860335:AppToc3`.AppHeading3][i500;b100;a100;KN1;*4 "
+"$$8,0#94145093439740438411010082165944:Heading1][i500;b100;a50;kKN11;*+117 $$9,0#10901425421210535753260366156531:Heading2][i500;b100;a25;kKN111;* "
+"$$10,0#53209141402041366431858192225431:Heading3][i500;b100;a100;KNA;*4 $$11,8#32912651424211307887950041245434:AppHeading1][i500;b100;a50;kKNA1;*+117 "
+"$$12,8#51232055453458524230328032001901:AppHeading2][i500;b100;a25;kKNA11;* $$13,8#34108020439428305453439845463579:AppHeading3][b100;a50;k*4 "
+"$$14,0#49239115434362547028389207250014:Heading][b50;a25;k~~~>.3917;* $$15,15#40743698422276745552070108434023:Toc`.Heading][b100;a50;K~~~>.3917;*+117 "
+"$$16,16#15422850471211852294098111138263:Topics1][l167;b50;a50;K~~~>.3917;* $$17,17#35241722455500657380289596243808:Topics2][l333;~~~>.3917; "
+"$$18,18#31041344429742018840308064013200:Topics3][b83;a42;K* $$19,0#46440151113795363000000595230845:Paragraph][{_}%EN-US "
+"[s14;:Calc`$CaddDN: operator `+  (date/time, real number) [S ®] date/time&][s0; "
+"&][s14;:Calc`$CaddND: [%00-00 operator `+  (real number, date/time) ][%00-00S ®][%00-00 "
+" date/time]&][s0; The unary operator [* `+] leaves its argument unchanged. The operator "
+"serves only as a symmetric complement of the operator [* `-] to increase readability "
+"of certain formulas.&][s0; &][s0; Binary operator [* `+] adds up its operands. In "
+"case of strings, the strings will be concatenated. When a number is added to a date "
+"valu")
+TOPIC_TEXT(
+"e, the date will be moved forward or back by given number of days (forward if it "
+"is positive).&][s0; &][s0; [* Example]: 27 `+ 35 `= 62, `\"a piece `\" `+ `\"of text`\" "
+"`= `\"a piece of text`\", 27.12.1999 `+ 7 `= 3.1.2000&][s14;:Calc`$Cadd`_monthsDN: "
+"[%00-00 add`_months (date, integer ][%00-00/ number`_of`_months][%00-00 ) ][%00-00S "
+"®][%00-00  date]&][s0; The function adds given [/ number`_of`_months] to the date. "
+"If the target month has fewer days than is the day number in the original date, the "
+"function returns last day of the target month.&][s0; &][s0; [* Example]: add`_months(29.2.1996, "
+"12) `= 28.2.1997&][s14;:Calc`$Cadd`_yearsDN: [%00-00 add`_years (date, integer ][%00-00/ "
+"number`_of`_years][%00-00 ) ][%00-00S ®][%00-00  date]&][s0; The function adds given "
+"[/ number`_of`_years] to its date argument. If the original date is Feb 29 in a leap "
+"year and the target year is not a leap one, the day number is adjusted to 28.&][s0; "
+"&][s0; [* Example]: add`_years(29.2.1992, 3) `= 28.2.1995&][s14;:Calc`$Cdate0: [%00-00 "
+"date ][%00-00S ®][%00-00  date]&][s0; &][s14;:Calc`$CdateN: [%00-00 date (integer "
+"][%00-00/ day][%00-00 ) ][%00-00S ®][%00-00  date]&][s0; &][s14;:Calc`$CdateNN: "
+"[%00-00 date (integer ][%00-00/ day][%00-00 , integer ][%00-00/ month][%00-00 ) ][%00-00S "
+"®][%00-00  date]&][s0; &][s14;:Calc`$CdateNNN: [%00-00 date (integer ][%00-00/ day][%00-00 "
+", integer ][%00-00/ month][%00-00 , integer ][%00-00/ year][%00-00 ) ][%00-00S ®][%00-00 "
+" date]&][s0; The function composes a date value from its arguments. The form without "
+"parameters returns current system date. The form with the parameter [/ day]  returns "
+"given day in the current month. The two parameter`-form, [/ day] and [/ month], returns "
+"given day and month in the current system year. The three argument form composes "
+"an arbitrary date as specified by day, month, and year number.&][s0; &][s0; [* Example]: "
+"date `= 20.06.2003, date(10) `= 10.06.2003, date(15, 7) `= 15.07.2003, date(25, 1, "
+"1974) `= 25.01.1974&][s0; Th")
+TOPIC_TEXT(
+"e function returns the day number of its argument.&][s0; &][s0;* Example: day(27.5.1984) "
+"`= 27&][s14;:Calc`$Cday`_of`_weekD: [%00-00 day`_of`_week (date) ][%00-00S ®][%00-00 "
+" integer]&][s0; The function returns the index of day in week for its date argument. "
+"The functions returns 0 for Sunday, 1 for Monday etc. through 6 for Saturday.&][s0; "
+"&][s0; [* Example]: day`_of`_week(20.06.2003) `= 5&][s14;:Calc`$Cfirst`_day`_of`_monthD: "
+"[%00-00 first`_day`_of`_month (date ][%00-00/ d][%00-00 ) ][%00-00S ®][%00-00  date]&][s0; "
+"The function returns first day in month defined by its parameter d.&][s0; &][s0; "
+"[* Example]: first`_day`_of`_month(18.3.1994) `= 1.3.1994&][s14;:Calc`$CgeTT: [%00-00 "
+"operator >`=  (date/time, date/time) ][%00-00S ®][%00-00  logical value]&][s0; &][s14;:Calc`$Clast`_day`_of`_monthD: "
+"[%00-00 last`_day`_of`_month (date ][%00-00/ d][%00-00 ) ][%00-00S ®][%00-00  date]&][s0; "
+"The function returns last day in month defined by its parameter d.&][s0; &][s0; [* "
+"Example]: last`_day`_of`_month(3.2.1999) `= 28.2.1999&][s14;:Calc`$CleTT: [%00-00 "
+"operator <`=  (date/time, date/time) ][%00-00S ®][%00-00  logical value]&][s14;:Calc`$CltTT: "
+"operator <  (date/time, date/time) [S ®] logical value&][s0; &][s0; &][s14;:Calc`$CmaxTT: "
+"max (date/time, date/time) [S ®] date/time&][s0; Minimum. The function will return "
+"the bigger of its arguments. Texts are compared lexicographically (the function will "
+"return text which would be closer to the end in a dictionary).&][s14;:Calc`$CminTT: "
+"min (date/time, date/time) [S ®] date/time&][s0; Minimum. The function will return "
+"the smaller of its arguments. Texts are compared lexicographically (the function "
+"will return text which would be closer to the beginning in a dictionary).&][s14;:Calc`$CminmaxTTT: "
+"minmax (date/time, date/time, date/time) [S ®] date/time&][s0; &][s14;:Calc`$CsubDN: "
+"operator `-  (date/time [/ d], real number [/ number`_of`_days]) [S ®] date/time&][s14;:Calc`$Cyears`_betweenDD: "
+"[%00-00 years`_between (date ][%")
+TOPIC_TEXT(
+"00-00/ d1][%00-00 , date ][%00-00/ d2][%00-00 ) ][%00-00S ®][%00-00  integer]&][s0; "
+"The function returns number of years between its date arguments (the age of a person "
+"born on [/ d1] at the date of [/ d2]).&][s0; &][s0; [* Example]: years_between(25.1.1974, "
+"27.12.1999) `= 25&][s0; &][s14;:Calc`$CgtTT: [%00-00 operator >  (date/time, date/time) "
+"][%00-00S ®][%00-00  logical value]&][s0; &][s0; Function returns the number of "
+"hours of its date/time argument.&][s14;:Calc`$CsubDD: [%00-00 operator `-  (date/time "
+"][%00-00/ date1][%00-00 , date/time ][%00-00/ date2][%00-00 ) ][%00-00S ®][%00-00 "
+" real number]&][s0; Unary operator [* `-] reverses the sign of its numerical argument.&][s0; "
+"&][s0; Binary operator [* `-] subtracts its operands. For numerical operands, the "
+"result is the ordinary difference. When an integer is subtracted from a date, the "
+"date is moved backward the specified number of days. When subtracting two dates, "
+"the result is the number of days between them. The number is positive if the left "
+"date comes after the right date.&][s0; &][s0; [* Example]: 137 `- 95 `= 42, 27.12.1999 "
+"`- 5 `= 22.12.1999, 4.1.2000 `- 28.12.1999 `= 7&][s0; ]")
diff --git a/uppsrc/TCore/appdoc.tpp/CalcLog$cs-cz.tpp b/uppsrc/TCore/appdoc.tpp/CalcLog$cs-cz.tpp
new file mode 100644
index 000000000..40fc423fe
--- /dev/null
+++ b/uppsrc/TCore/appdoc.tpp/CalcLog$cs-cz.tpp
@@ -0,0 +1,96 @@
+TITLE("Logické operace")
+REF("Calc$CbitAndNN")
+REF("Calc$CbitNotN")
+REF("Calc$CbitOrNN")
+REF("Calc$CbitXorNN")
+REF("Calc$CeqVV")
+REF("Calc$ClogNotN")
+REF("Calc$ClogNotS")
+REF("Calc$CneVV")
+REF("Calc$CsalNN")
+REF("Calc$CsarNN")
+TOPIC_TEXT(
+"[2 $$0,0#00000000000000000000000000000000:Default][b100;a50;K* $$1,0#23046025415494101427921008701515:Paragraph][i167;b50;a25;kKN1;~~~>.3917;* "
+"$$2,0#52185223490867151055420261384346:Toc1`.Heading1][i333;kN11;~~~>.3917;* $$3,0#36545033421193513457240054113541:Toc2`.Heading2][i500;kN111;~~~>.3917; "
+"$$4,0#65092512416424580164828413186219:Toc3`.Heading3][i167;b50;a25;kKNA;~~~>.3917;* "
+"$$5,5#92291332474308709450111162202673:AppToc1`.AppHeading1][i333;kNA1;~~~>.3917;* "
+"$$6,15#61887903412252554674480251236992:AppToc2`.AppHeading2][i500;kNA11;~~~>.3917; "
+"$$7,7#03533551421653050355120437860335:AppToc3`.AppHeading3][i500;b100;a100;KN1;*4 "
+"$$8,0#94145093439740438411010082165944:Heading1][i500;b100;a50;kKN11;*+117 $$9,0#10901425421210535753260366156531:Heading2][i500;b100;a25;kKN111;* "
+"$$10,0#53209141402041366431858192225431:Heading3][i500;b100;a100;KNA;*4 $$11,8#32912651424211307887950041245434:AppHeading1][i500;b100;a50;kKNA1;*+117 "
+"$$12,8#51232055453458524230328032001901:AppHeading2][i500;b100;a25;kKNA11;* $$13,8#34108020439428305453439845463579:AppHeading3][b100;a50;k*4 "
+"$$14,0#49239115434362547028389207250014:Heading][b50;a25;k~~~>.3917;* $$15,15#40743698422276745552070108434023:Toc`.Heading][b100;a50;K~~~>.3917;*+117 "
+"$$16,16#15422850471211852294098111138263:Topics1][l167;b50;a50;K~~~>.3917;* $$17,17#35241722455500657380289596243808:Topics2][l333;~~~>.3917; "
+"$$18,18#31041344429742018840308064013200:Topics3][b83;a42;K* $$19,0#46440151113795363000000595230845:Paragraph][{_}%EN-US "
+"[s14;:Calc`$CbitAndNN: [%00-00 operátor `&  (celé číslo, celé číslo) ][%00-00S "
+"®][%00-00  celé číslo]&][s0; Bitový součin. Výsledkem operace je celé číslo, "
+"jehož dvojková reprezentace obsahuje jedničky na těch pozicích, na kterých "
+"jsou ve dvojkové reprezentaci obou argumentů jedničky.&][s0; &][s0; [* Příklad: "
+"]11 `& 13 `= 9 (1011 `& 1101 `= 1001).&][s14;:Calc`$CbitNotN: [%00-00 operátor `~ "
+" (celé číslo) ][%00-00S ®][%00-00  celé číslo]&][s0; Bitová negace. Výsledkem "
+"oper")
+TOPIC_TEXT(
+"ace je celé číslo, jehož dvojková reprezentace obsahuje jedničky právě na "
+"těch pozicích, kde jsou ve dvojkové reprezentaci argumentu nuly a_naopak. Vzhledem "
+"k_tomu, že výpočty s_celými čísly probíhají v_doplňkovém kódu, platí: "
+"[* %01`~x_`= `-1 `- x%01].&][s0; &][s0; [* Příklad: ]`~14 `= `-15.&][s14;:Calc`$CbitOrNN: "
+"[%00-00 operátor `|  (celé číslo, celé číslo) ][%00-00S ®][%00-00  celé "
+"číslo]&][s0; Bitový součet. Výsledkem operace je celé číslo, jehož dvojková "
+"reprezentace obsahuje jedničky na těch pozicích, na kterých je ve dvojkové reprezentaci "
+"alespoň jednoho z_argumentů jednička.&][s0; &][s0; [* Příklad: ]1 `| 4 `= 5 "
+"(001 `| 100 `= 101).&][s14;:Calc`$CbitXorNN: [%00-00 operátor `^  (celé číslo, "
+"celé číslo) ][%00-00S ®][%00-00  celé číslo]&][s0; Bitový symetrický rozdíl "
+"([* xor]). Výsledkem operace je celé číslo, jehož dvojková reprezentace obsahuje "
+"jedničky na těch pozicích, na kterých se ve dvojkové reprezentaci obou argumentů "
+"číslice liší.&][s0; &][s0; [* Příklad: ]9 `^ 15 `= 6 (1001 `^ 1111 `= 0110).&][s0; "
+"Funkce načte proměnnou výrazového systému nebo zavolá funkci zadanou textovým "
+"identifikátorem. V_případě funkce je možno jako další parametry zadat parametry "
+"funkce.&][s0; &][s0; [* Příklad: ]call(`\"mid`\", `\"ahoj`\", 2, 2) `= `\"oj`\"&][s14;:Calc`$CeqVV: "
+"[%00-00 operátor `=`=  (libovolný typ, libovolný typ) ][%00-00S ®][%00-00  logická "
+"hodnota]&][s0; Operátor porovná dvě libovolné hodnoty. Výsledkem je [/ pravda] "
+"(1), pokud se hodnoty rovnají, jinak [/ nepravda].&][s0; &][s0; [* Upozornění:] "
+"při porovnávání se nejprve testují datové typy porovnávaných objektů. Pokud "
+"se tyto typy neshodují, funkce vrátí hodnotu [/ nepravda]. Například test `\"10`\" "
+"`=`= 10 vrátí logickou hodnotu nepravda z_důvodu neshody typů, přestože řetězec "
+"na levé straně obsahuje desítkový zápis čísla na pravé straně operátoru.&][s14;:Calc`$ClogNot")
+TOPIC_TEXT(
+"N: [%00-00 operátor !  (reálné číslo) ][%00-00S ®][%00-00  logická hodnota]&][s0; "
+"Logická negace. Výsledkem operace je logická hodnota 1 ([* pravda]), pokud argument "
+"je nulový (jedná se o_nulové číslo nebo o_logickou hodnotu [* nepravda]). Pokud "
+"je argument nenulový nebo obsahuje logickou hodnotu [* pravda], výsledkem logické "
+"negace je hodnota 0 ([* nepravda]). Pokud je parametrem operátoru řetězec, je "
+"výsledkem hodnota 1 ([* pravda]), když tento řetězec je prázdný.&][s0; &][s0; "
+"[* Příklad: ]!10 `= 0, !0 `= 1, !`\"ahoj`\" `= 0&][s14;:Calc`$ClogNotS: [%00-00 "
+"operátor !  (řetězec) ][%00-00S ®][%00-00  logická hodnota]&][s0; Logická negace. "
+"Výsledkem operace je logická hodnota 1 ([* pravda]), pokud argumentem je prázdný "
+"řetězec nebo hodnota [* null]. V opačném případě je výsledkem operátoru "
+"[/ nepravda].&][s0; &][s0; [* Příklad: ]!`\"ahoj`\" `= 0, !`\"`\" `= 1&][s14;:Calc`$CneVV: "
+"[%00-00 operátor !`=  (libovolný typ, libovolný typ) ][%00-00S ®][%00-00  logická "
+"hodnota]&][s0; Rovnost / nerovnost. Operátor [* `=`=] (rovnost) vrátí logickou "
+"hodnotu 1 ([* pravda]), pokud operandy na obou stranách jsou stejného typu a_jsou "
+"shodné. Operátor [* !`=] (nerovnost) vrací vždy opačnou logickou hodnotu než "
+"operátor [* `=`=].&][s0; &][s0; [* Upozornění]: z_této definice rovnosti vyplývá, "
+"že pokud například na jedné straně porovnání stojí text [* `\"300`\"] a_na "
+"druhé straně číslo [* 300], operátor [* `=`=] vrátí logickou hodnotu [* nepravda], "
+"přestože text na levé straně je shodný s_textovou reprezentací čísla na pravé "
+"straně. Pokud chcete porovnávat hodnoty různých typů, převeďte je nejprve "
+"na společný typ, například pomocí funkce [*^dpp`:`/`/AppDoc`/`/`:`:`/`/Calc`$CtextN^ "
+"text].&][s14;:Calc`$CsalNN: [%00-00 operátor <<  (celé číslo, celé číslo ][%00-00/ "
+"počet`_bitů][%00-00 ) ][%00-00S ®][%00-00  celé číslo]&][s0; Aritmetický posuv "
+"vlevo. Výsledkem operace je celé č")
+TOPIC_TEXT(
+"íslo, jehož dvojková reprezentace vznikne posuvem dvojkové reprezentace čísla "
+"na levé straně operátoru vlevo (směrem k_vyšším bitům) o_počet bitů určený "
+"operandem na pravé straně. Vzhledem k_tomu, že celočíselné výpočty probíhají "
+"v_doplňkovém kódu, je [* a_<< b_`= a_`* 2 `*`* b].&][s0; &][s0; [* Příklad]: "
+"3 << 2 `= 12 (11 << 2 `= 1100).&][s14;:Calc`$CsarNN: [%00-00 operátor >>  (celé "
+"číslo, celé číslo ][%00-00/ počet`_bitů][%00-00 ) ][%00-00S ®][%00-00  celé "
+"číslo]&][s0; Aritmetický posuv vpravo. Výsledkem operace je celé číslo, jehož "
+"dvojková reprezentace vznikne posuvem dvojkové reprezentace čísla na levé straně "
+"operátoru vpravo (směrem k_nižším bitům) o_počet bitů určený operandem "
+"na pravé straně. Nejvyšší (znaménkový) bit čísla se při posuvu kopíruje "
+"do nižších bitů, nejnižší bity čísla se ztratí. Vzhledem k_tomu, že celočíselné "
+"výpočty probíhají v_doplňkovém kódu, odpovídá aritmetický posuv o_bit vpravo "
+"dělení dvěma se zaokrouhlováním směrem dolů.&][s0; &][s0; [* Příklad]: 13 "
+">> 2 `= 3, `-14 >> 3 `= `-2.&][s0; Funkce vrátí počet sekund ze zadaného údaje "
+"typu datum/čas.&][s0; &][s0; &][s0; &][s0; &][s0; ]")
diff --git a/uppsrc/TCore/appdoc.tpp/CalcLog$en-us.tpp b/uppsrc/TCore/appdoc.tpp/CalcLog$en-us.tpp
new file mode 100644
index 000000000..bcccbedc4
--- /dev/null
+++ b/uppsrc/TCore/appdoc.tpp/CalcLog$en-us.tpp
@@ -0,0 +1,92 @@
+TITLE("Logical operations")
+REF("Calc$CbitAndNN")
+REF("Calc$CbitNotN")
+REF("Calc$CbitOrNN")
+REF("Calc$CbitXorNN")
+REF("Calc$CeqVV")
+REF("Calc$Cis_dateV")
+REF("Calc$Cis_nullV")
+REF("Calc$Cis_numberV")
+REF("Calc$Cis_textV")
+REF("Calc$CneVV")
+REF("Calc$CsalNN")
+REF("Calc$CsarNN")
+TOPIC_TEXT(
+"[2 $$0,0#00000000000000000000000000000000:Default][b100;a50;K* $$1,0#23046025415494101427921008701515:Paragraph][i167;b50;a25;kKN1;~~~>.3917;* "
+"$$2,0#52185223490867151055420261384346:Toc1`.Heading1][i333;kN11;~~~>.3917;* $$3,0#36545033421193513457240054113541:Toc2`.Heading2][i500;kN111;~~~>.3917; "
+"$$4,0#65092512416424580164828413186219:Toc3`.Heading3][i167;b50;a25;kKNA;~~~>.3917;* "
+"$$5,5#92291332474308709450111162202673:AppToc1`.AppHeading1][i333;kNA1;~~~>.3917;* "
+"$$6,15#61887903412252554674480251236992:AppToc2`.AppHeading2][i500;kNA11;~~~>.3917; "
+"$$7,7#03533551421653050355120437860335:AppToc3`.AppHeading3][i500;b100;a100;KN1;*4 "
+"$$8,0#94145093439740438411010082165944:Heading1][i500;b100;a50;kKN11;*+117 $$9,0#10901425421210535753260366156531:Heading2][i500;b100;a25;kKN111;* "
+"$$10,0#53209141402041366431858192225431:Heading3][i500;b100;a100;KNA;*4 $$11,8#32912651424211307887950041245434:AppHeading1][i500;b100;a50;kKNA1;*+117 "
+"$$12,8#51232055453458524230328032001901:AppHeading2][i500;b100;a25;kKNA11;* $$13,8#34108020439428305453439845463579:AppHeading3][b100;a50;k*4 "
+"$$14,0#49239115434362547028389207250014:Heading][b50;a25;k~~~>.3917;* $$15,15#40743698422276745552070108434023:Toc`.Heading][b100;a50;K~~~>.3917;*+117 "
+"$$16,16#15422850471211852294098111138263:Topics1][l167;b50;a50;K~~~>.3917;* $$17,17#35241722455500657380289596243808:Topics2][l333;~~~>.3917; "
+"$$18,18#31041344429742018840308064013200:Topics3][b83;a42;K* $$19,0#46440151113795363000000595230845:Paragraph][{_}%EN-US "
+"[s0; &][s14;:Calc`$CbitAndNN: [%00-00 operator `&  (integer, integer) ][%00-00S ®][%00-00 "
+" integer]&][s0; Bit product. The result is the integer whose binary representation "
+"consists of ones on those positions on which there are ones in binary representation "
+"of both arguments.&][s0; &][s0; [* Example]: 11 `& 13 `= 9 (1011 `& 1101 `= 1001).&][s14;:Calc`$CbitNotN: "
+"[%00-00 operator `~  (integer) ][%00-00S ®][%00-00  integer]&][s0; Bit negation. "
+"The result is the integer whose binary representation consists of ")
+TOPIC_TEXT(
+"ones on those positions on which there are zeroes and vice versa in binary representation "
+"of the argument. As integer calculations are performed in 0`'s complement code, it "
+"is always true that [* %01`~x_`= `-1 `- x%01].&][s0; &][s0; [* Example]: `~14 `= "
+"`-15.&][s14;:Calc`$CbitOrNN: [%00-00 operator `|  (integer, integer) ][%00-00S ®][%00-00 "
+" integer]&][s0; Bit addition. The result is the integer whose binary representation "
+"consists of 1`'s on those positions on which there is 1 in binary representation "
+"of any of its arguments.&][s0; &][s0; [* Example]: 1 `| 4 `= 5 (001 `| 100 `= 101).&][s14;:Calc`$CbitXorNN: "
+"[%00-00 operator `^  (integer, integer) ][%00-00S ®][%00-00  integer]&][s0; Bit "
+"symmetric difference ([* xor]). The result of the operation is an integer whose binary "
+"representation consists of 1`'s on those positions on which the digits in binary "
+"representation of its arguments differ.&][s0; &][s0; [* Example]: 9 `^ 15 `= 6 (1001 "
+"`^ 1111 `= 0110).&][s14;:Calc`$CeqVV: operator `=`=  (any data type, any data type) "
+"[S ®] logical value&][s0; &][s14;:Calc`$Cis`_dateV: [%00-00 is`_date (any data type) "
+"][%00-00S ®][%00-00  integer]&][s0; The function returns the logical value 1 ([* "
+"true]) if its argument is a date. If the argument is of a different type or if it "
+"contains the null value, the function returns 0 ([* false]).&][s0; &][s0; [* Example]: "
+"is`_date(10.5) `= 0, is`_date(23.5.1997) `= 1, is`_date(`\"hi`\") `= 0&][s14;:Calc`$Cis`_nullV: "
+"[%00-00 is`_null (any data type) ][%00-00S ®][%00-00  integer]&][s0; The function "
+"returns the logical value 1 ([* true]) if its parameter is of type[* null]; otherwise "
+"the logical value 0 ([* false]) is returned.&][s0; &][s0; [* Example]: is_null(10.5) "
+"`= 0, is_null(null) `= 1&][s14;:Calc`$Cis`_numberV: [%00-00 is`_number (any data "
+"type) ][%00-00S ®][%00-00  integer]&][s0; The function checks whether its argument "
+"is a number (integer, real number, or a logical value). If the argument is a number "
+"type, the function returns logi")
+TOPIC_TEXT(
+"cal value 1 (true).&][s0; &][s0; [* Example]: is number(10.5) `= 1, is number(23.5.1997) "
+"`= 0, is number(`\"hi`\") `= 0&][s14;:Calc`$Cis`_textV: [%00-00 is`_text (any data "
+"type) ][%00-00S ®][%00-00  integer]&][s0; The function returns logical value 1 ([* "
+"true]) if its argument is a string. If the parameter is of a different type or is "
+"empty, the function returns logical value 0 (false).&][s0; &][s0; [* Example]: is`_text(10.5) "
+"`= 0, is`_text(23.5.1997) `= 0, is`_text(`\"hi`\") `= 1&][s0; &][s14;:Calc`$CneVV: "
+"[%00-00 operator !`=  (any data type, any data type) ][%00-00S ®][%00-00  logical "
+"value]&][s0; Equality / inequality. The operator [* `=`=] (equality) will return "
+"the logical value 1 ([* true]), if operands on both sides are of the same type and "
+"are identical. The operator [* !`=] (inequality) will always return the opposite "
+"logical value than operator [* `=`=].&][s0; &][s0; [* Note]: This definition of equality "
+"implies that if, for instance, on the one side of the comparison is the text `\"300`\" "
+"and the number 300 on the other, the operator [* `=`=] will return the logical value "
+"[* false], even though the text on the left`-hand side is identical with the text "
+"representation of the number on the right`-hand side. If you want to compare values "
+"of different types, convert them first into the same type (e.g. using the [* text] "
+"(viz str._96) function).&][s14;:Calc`$CsalNN: [%00-00 operator <<  (integer, integer "
+"][%00-00/ bit`_count][%00-00 ) ][%00-00S ®][%00-00  integer]&][s0; Arithmetic shift "
+"to the left. The result is the integer whose binary representation can be obtained "
+"by shifting the binary representation of the left operand [/ bit`_count] times to "
+"the left (towards higher bits), adding zeroes to the right. As integer calculations "
+"are performed in 0`'s complement code, it is always true (except when the result "
+"overflows valid integer range) that [* a_<< b_`= a_`* 2 `*`* b].&][s0; &][s0; [* "
+"Example]: 3 << 2 `= 12 (11 << 2 `= 1100).&][s14;:Calc`$CsarNN: [%00-00 o")
+TOPIC_TEXT(
+"perator >>  (integer, integer ][%00-00/ bit`_count][%00-00 ) ][%00-00S ®][%00-00 "
+" integer]&][s0; Arithmetic shift to the right. The result is the integer whose binary "
+"representation will be made by shifting the binary representation of its left operand "
+"to the right (towards lower bits) [/ bit`_count] times, discarding lowest bits as "
+"necessary and duplicating the highest bit (sign bit) of the left operand. As integer "
+"calculations are performed in 0`'s complement code, the arithmetic shift to the right "
+"by a bit equals division by two with rounding towards minus infinity.&][s0; &][s0; "
+"[* Example]: 12 >> 2 `= 3, `-14 >> 3 `= `-2.&][s0; Function returns number of seconds "
+"of its date/time argument.&][s0; ]")
diff --git a/uppsrc/TCore/appdoc.tpp/CalcNode$cs-cz.tpp b/uppsrc/TCore/appdoc.tpp/CalcNode$cs-cz.tpp
new file mode 100644
index 000000000..6612f9c0d
--- /dev/null
+++ b/uppsrc/TCore/appdoc.tpp/CalcNode$cs-cz.tpp
@@ -0,0 +1,109 @@
+TITLE("Výrazový kalkulátor")
+TOPIC_TEXT(
+"[2 $$0,0#00000000000000000000000000000000:Default][b100;a50;K* $$1,0#23046025415494101427921008701515:Paragraph][i167;b50;a25;kKN1;~~~>.3917;* "
+"$$2,0#52185223490867151055420261384346:Toc1`.Heading1][i333;kN11;~~~>.3917;* $$3,0#36545033421193513457240054113541:Toc2`.Heading2][i500;kN111;~~~>.3917; "
+"$$4,0#65092512416424580164828413186219:Toc3`.Heading3][i167;b50;a25;kKNA;~~~>.3917;* "
+"$$5,5#92291332474308709450111162202673:AppToc1`.AppHeading1][i333;kNA1;~~~>.3917;* "
+"$$6,15#61887903412252554674480251236992:AppToc2`.AppHeading2][i500;kNA11;~~~>.3917; "
+"$$7,7#03533551421653050355120437860335:AppToc3`.AppHeading3][i500;b100;a100;KN1;*4 "
+"$$8,0#94145093439740438411010082165944:Heading1][i500;b100;a50;kKN11;*+117 $$9,0#10901425421210535753260366156531:Heading2][i500;b100;a25;kKN111;* "
+"$$10,0#53209141402041366431858192225431:Heading3][i500;b100;a100;KNA;*4 $$11,8#32912651424211307887950041245434:AppHeading1][i500;b100;a50;kKNA1;*+117 "
+"$$12,8#51232055453458524230328032001901:AppHeading2][i500;b100;a25;kKNA11;* $$13,8#34108020439428305453439845463579:AppHeading3][b100;a50;k*4 "
+"$$14,0#49239115434362547028389207250014:Heading][b50;a25;k~~~>.3917;* $$15,15#40743698422276745552070108434023:Toc`.Heading][b100;a50;K~~~>.3917;*+117 "
+"$$16,16#15422850471211852294098111138263:Topics1][l167;b50;a50;K~~~>.3917;* $$17,17#35241722455500657380289596243808:Topics2][l333;~~~>.3917; "
+"$$18,18#31041344429742018840308064013200:Topics3][b83;a42;K* $$19,0#46440151113795363000000595230845:Paragraph][{_}%EN-US "
+"[s0; Výrazový kalkulátor je výpočetní systém, který umožňuje počítat "
+"hodnoty uživatelsky zadaných výrazů. Vstupem pro výpočet je [/ zdrojový text "
+"výrazu], což je textový řetězec obsahující výraz utvořený podle níže "
+"popsaných pravidel, a [/ kontext výpočtu], což je vazba mezi výrazem a hostitelskou "
+"aplikací, ve které je výrazový systém použit. Kontext výpočtu může podle "
+"charakteru aplikace definovat například přídavné funkce a konstanty v_závislosti "
+"na aktu�")
+TOPIC_TEXT(
+"�lním nastavení a_hodnotách zpracovávaných v_hostitelské aplikaci.&][s0; &][s0; "
+"Syntaxe výrazů rámcově vychází z_konvencí pro výrazy v_[/ programovacím "
+"jazyce C], obdobně jako Java nebo JavaScript. Základem výrazu jsou [/ literály] "
+"(čísla, textové řetězce uvedené přímo ve zdrojovém textu výrazu), [/ proměnné "
+"](identifikátory odkazující se na konstanty nebo funkce podle kontextu výpočtu "
+"výrazu) a [/ operátory], pomocí nichž lze hodnoty různě kombinovat a_zpracovávat.&][s0; "
+"&][s0; Základní výrazový systém podporuje práci s_hodnotami následujících "
+"datových typů:&][s0; &][s0;i150;O0; [* číslo] (v_plovoucí řádové čárce)&][s0;i150;O0; "
+"[* řetězec] (textová hodnota)&][s0;i150;O0;* datum/čas&][s0;i150;O0; [* pole "
+"hodnot] (jednotlivé prvky pole mohou být i různých typů)&][s0;i150;O0; [* lambda`-výraz] "
+"(část výpočetního výrazu, kterou lze předávat do funkcí jako parametr)&][s0; "
+"&][s0; Kontext výrazu (hostitelská aplikace používající výrazový systém) "
+"může podle svých potřeb rozšiřovat tento základní repertoár o další datové "
+"typy a_funkce.&][s1; Operátory&][s0; Operátory slouží podobně jako funkce k_výpočtu "
+"hodnot z_jiných zdrojových hodnot. Narozdíl od funkce, kterou lze vyvolat zápisem "
+"[/ identifikátor`_funkce(parametr1, parametr2...)], se operátory obvykle používají "
+"způsobem [/ výraz1 <operátor> výraz2] (tzv. [/ binární operátor]), případně "
+"[/ <operátor> výraz] ([/ prefixový unární operátor]).&][s0; &][s0; Kromě toho "
+"výrazový systém podporuje několik speciálních operátorů s_jiným způsobem "
+"zápisu. Jedná se o_následující operátory:&][s1; `[<p1>, <p2>, <p3>, ...`]: "
+"konstruktor pole&][s0; Vložením posloupnosti hodnot nebo výrazů oddělených "
+"čárkami do hranatých závorek vznikne pole obsahující zadané hodnoty jako své "
+"prvky.&][s0; &][s0;* Příklad: `[1, 2, 3 `+ 4`]&][s1; `[<p1> .. <p2>`]: konstruktor "
+"posloupnosti&][s0; ")
+TOPIC_TEXT(
+"Pokud do hranatých závorek napíšete dvě číselné hodnoty nebo výrazy oddělené "
+"dvěma tečkami (dvě tečky musí následovat ihned po sobě bez mezery), výsledkem "
+"takto vytvořeného výrazu je pole obsahující posloupnost hodnot [/ p1, p1 `+ "
+"1, p1 `+ 2, p1 `+ 3] atd. až po hodnotu [/ p2]. Pokud rozdíl hodnot [/ p1] a [/ "
+"p2 ]není přesně celočíselný, poslední prvek pole bude mít hodnotu v_rozsahu "
+"[/ `[p2`-0.5, p2`+0.5)]. Pokud je [/ p2 <`= p1 `- 0.5], je výsledkem prázdné pole "
+"(pole neobsahující žádný prvek).&][s0; &][s0;* Příklad: `[1..7`] `= `[1,2,3,4,5,6,7`]&][s1; "
+"<p1> ? <p2> : <p3>: podmíněný výraz&][s0; Podmíněný výraz lze použít v_situaci, "
+"kdy potřebujete rozhodnout pro jednu ze dvou variant na základě platnosti logické "
+"podmínky. Při výpočtu výrazu se nejprve vyhodnotí [/ p1]; pokud je jeho logická "
+"hodnota pravdivá (je to nenulové číslo nebo neprázdný textový řetězec), "
+"vyhodnotí se dále výraz [/ p2] a jeho hodnota je výsledkem celého výrazu ?:. "
+"Pokud podmínka neplatí, vyhodnotí se obdobně výraz [/ p3] a výsledkem výrazu "
+"je jeho hodnota.&][s0; &][s0;/ [*/ Příklad][/ : ][*/ 5 % 2 `=`= 0 ? `\"sudé`\" "
+": `\"liché`\"] `= `\"liché`\"&][s1; <p1>`{<m1>, <v1>, <m2>, <v2>, ... `}: podmíněný "
+"výraz s výběrem&][s0; Pomocí funkce lze vybrat jednu ze zadaných hodnot (výrazů) "
+"podle hodnoty řídicího výrazu [/ p1]. Při výpočtu se nejprve vyhodnotí tento "
+"výraz; další postup závisí na počtu parametrů v_složených závorkách.&][s0; "
+"&][s0;i150;O0;/ [*/ 1 parametr][/ : pokud je v_závorkách jen jeden výraz (]m1[/ "
+"), otestuje se, zda je hodnota výrazu ]p1 [/ prázdná (][/^dpp`:`/`/AppDoc`/`/`:`:`/`/Calc`$Cis`_nullV^ "
+"is`_null][/ ). Pokud prázdná není, ponechá se výraz ]p1[/  beze změny a vrátí "
+"se jako výsledek celého zápisu. Pokud je hodnota prázdná, vyhodnotí se výraz "
+"]m1[/  a výsledkem celého výrazu `{`} je pak hodnota ]m1.&][s0;i150;O0; [* sudý "
+"počet parametrů")
+TOPIC_TEXT(
+"]: pokud je počet parametrů sudý (a nenulový), program po vyhodnocení [/ p1] "
+"postupně prochází výrazy v_závorkách na [/ lichých pozicích] ([/ m1, m2, "
+"m3...]). Každý tento výraz vyhodnotí a porovná s hodnotou výrazu [/ p1]; pokud "
+"se hodnoty shodují, program vyhodnotí a vrátí odpovídající výraz na následující "
+"sudé pozici ([/ v1, v2, v3...]). Pokud ani jedna z hodnot [/ m1, m2, m3]... není "
+"rovna [/ p1], je výsledkem výrazu přímo původní [/ p1] beze změny.&][s0;i150;O0; "
+"[* lichý počet parametrů]: pokud je počet parametrů lichý (a větší než "
+"jeden), program po vyhodnocení obdobně jako v_případě sudého počtu parametrů "
+"testuje rovnost s_parametry na lichých pozicích [/ m1, m2, m3...]. a_v_případě "
+"rovnosti vrátí parametr na následující nulové pozici. Pokud není nalezena "
+"ani v_jednom z případů shodná hodnota, program vyhodnotí a_vrátí poslední "
+"(nepárovou) hodnotu v_závorkách.&][s1; #<výraz>: lambda`-výraz&][s0; Lambda "
+"výraz se používá v_situacích, kdy je třeba samotný výpočetní výraz poslat "
+"jako parametr do jiné funkce nebo operátoru (v_opačných případech do operátoru "
+"nebo funkce přichází jako parametr až [/ vypočtená hodnota] tohoto výrazu). "
+"Způsob nakládání s_matematickým výrazem v_této funkci závisí na charakteru "
+"konkrétní funkce. Obvykle jde o_to, že v_rámci jiné funkce je potřeba takto "
+"předaný výpočetní výraz několikrát postupně vyhodnotit (vypočítat), případně "
+"v_různém kontextu, a_získat tak několik výsledků, které se pak dále zpracují.&][s1;*/ "
+"[*/ Příklad: ][*/^dpp`:`/`/AppDoc`/`/`:`:`/`/Calc`$CsumASC^ sum][*/ (`[1..4`], "
+"`\"x`\", #(x `* x))] `= 1 `* 1 `+ 2 `* 2 `+ 3 `* 3 `+ 4 `* 4 `= 1`+4`+9`+16 `= 30&][s1; "
+"<výraz>.<identifikátor>: objektové volání funkce&][s0; Operátor [/ tečka] "
+"umožňuje zápis některých výrazů způsobem připomínajícím objektové programovací "
+"jazyky. Jedná se čistě o nástroj přehledněj")
+TOPIC_TEXT(
+"šího zápisu, vnitřně se všechny takovéto zápisy chápou jako volání funkcí. "
+"Zápis [/ a.id] má stejný význam jako [/ id(a)], zápis [/ a.id(b, c, d)] je totéž "
+"co [/ id(a, b, c, d)].&][s0; &][s0;/ [*/ Příklad: sin(pi)] `= pi.sin `= 0, [*/ "
+"(1/3).nls(`-2)] `= nls(1/3, `-2) `= 0,33&][s14;3 Skupiny funkcí výrazového kalkulátoru&][s0; "
+"Obecné funkce a operátory výrazového kalkulátoru patří do následujících "
+"skupin:&][s0;i150;O0;^topic`:`/`/TCore`/appdoc`/CalcArith`$cs`-cz^ Aritmetické funkce "
+"a operace&][s0;i150;O0;^topic`:`/`/TCore`/appdoc`/CalcTrans`$cs`-cz^ Transcendentní "
+"matematické funkce&][s0;i150;O0;^topic`:`/`/TCore`/appdoc`/CalcText`$cs`-cz^ Práce "
+"s texty&][s0;i150;O0;^topic`:`/`/TCore`/appdoc`/CalcDate`$cs`-cz^ Práce s datem/časem&][s0;i150;O0;^topic`:`/`/TCore`/appdoc`/CalcArray`$cs`-cz^ "
+"Práce s poli hodnot&][s0;i150;O0;^topic`:`/`/TCore`/appdoc`/CalcLog`$cs`-cz^ Logické "
+"operace&][s0;i150;O0;^topic`:`/`/TCore`/appdoc`/CalcSys`$cs`-cz^ Systémové operace&][s0; "
+"]")
diff --git a/uppsrc/TCore/appdoc.tpp/CalcNode$en-us.tpp b/uppsrc/TCore/appdoc.tpp/CalcNode$en-us.tpp
new file mode 100644
index 000000000..e919b3159
--- /dev/null
+++ b/uppsrc/TCore/appdoc.tpp/CalcNode$en-us.tpp
@@ -0,0 +1,15 @@
+TITLE("")
+TOPIC_TEXT(
+"[2 $$0,0#00000000000000000000000000000000:Default][b100;a50;K* $$1,0#23046025415494101427921008701515:Paragraph][i167;b50;a25;kKN1;~~~>.3917;* "
+"$$2,0#52185223490867151055420261384346:Toc1`.Heading1][i333;kN11;~~~>.3917;* $$3,0#36545033421193513457240054113541:Toc2`.Heading2][i500;kN111;~~~>.3917; "
+"$$4,0#65092512416424580164828413186219:Toc3`.Heading3][i167;b50;a25;kKNA;~~~>.3917;* "
+"$$5,5#92291332474308709450111162202673:AppToc1`.AppHeading1][i333;kNA1;~~~>.3917;* "
+"$$6,15#61887903412252554674480251236992:AppToc2`.AppHeading2][i500;kNA11;~~~>.3917; "
+"$$7,7#03533551421653050355120437860335:AppToc3`.AppHeading3][i500;b100;a100;KN1;*4 "
+"$$8,0#94145093439740438411010082165944:Heading1][i500;b100;a50;kKN11;*+117 $$9,0#10901425421210535753260366156531:Heading2][i500;b100;a25;kKN111;* "
+"$$10,0#53209141402041366431858192225431:Heading3][i500;b100;a100;KNA;*4 $$11,8#32912651424211307887950041245434:AppHeading1][i500;b100;a50;kKNA1;*+117 "
+"$$12,8#51232055453458524230328032001901:AppHeading2][i500;b100;a25;kKNA11;* $$13,8#34108020439428305453439845463579:AppHeading3][b100;a50;k*4 "
+"$$14,0#49239115434362547028389207250014:Heading][b50;a25;k~~~>.3917;* $$15,15#40743698422276745552070108434023:Toc`.Heading][b100;a50;K~~~>.3917;*+117 "
+"$$16,16#15422850471211852294098111138263:Topics1][l167;b50;a50;K~~~>.3917;* $$17,17#35241722455500657380289596243808:Topics2][l333;~~~>.3917; "
+"$$18,18#31041344429742018840308064013200:Topics3][b83;a42;K* $$19,0#46440151113795363000000595230845:Paragraph][{_}%EN-US "
+"[s0;3 ]")
diff --git a/uppsrc/TCore/appdoc.tpp/CalcSys$cs-cz.tpp b/uppsrc/TCore/appdoc.tpp/CalcSys$cs-cz.tpp
new file mode 100644
index 000000000..b6313b956
--- /dev/null
+++ b/uppsrc/TCore/appdoc.tpp/CalcSys$cs-cz.tpp
@@ -0,0 +1,62 @@
+TITLE("Systémové operace")
+REF("Calc$Cis_nullV")
+REF("Calc$Cis_numberV")
+REF("Calc$Cis_textV")
+REF("Calc$Cnull0")
+REF("Calc$CnvlVV")
+TOPIC_TEXT(
+"[2 $$0,0#00000000000000000000000000000000:Default][b100;a50;K* $$1,0#23046025415494101427921008701515:Paragraph][i167;b50;a25;kKN1;~~~>.3917;* "
+"$$2,0#52185223490867151055420261384346:Toc1`.Heading1][i333;kN11;~~~>.3917;* $$3,0#36545033421193513457240054113541:Toc2`.Heading2][i500;kN111;~~~>.3917; "
+"$$4,0#65092512416424580164828413186219:Toc3`.Heading3][i167;b50;a25;kKNA;~~~>.3917;* "
+"$$5,5#92291332474308709450111162202673:AppToc1`.AppHeading1][i333;kNA1;~~~>.3917;* "
+"$$6,15#61887903412252554674480251236992:AppToc2`.AppHeading2][i500;kNA11;~~~>.3917; "
+"$$7,7#03533551421653050355120437860335:AppToc3`.AppHeading3][i500;b100;a100;KN1;*4 "
+"$$8,0#94145093439740438411010082165944:Heading1][i500;b100;a50;kKN11;*+117 $$9,0#10901425421210535753260366156531:Heading2][i500;b100;a25;kKN111;* "
+"$$10,0#53209141402041366431858192225431:Heading3][i500;b100;a100;KNA;*4 $$11,8#32912651424211307887950041245434:AppHeading1][i500;b100;a50;kKNA1;*+117 "
+"$$12,8#51232055453458524230328032001901:AppHeading2][i500;b100;a25;kKNA11;* $$13,8#34108020439428305453439845463579:AppHeading3][b100;a50;k*4 "
+"$$14,0#49239115434362547028389207250014:Heading][b50;a25;k~~~>.3917;* $$15,15#40743698422276745552070108434023:Toc`.Heading][b100;a50;K~~~>.3917;*+117 "
+"$$16,16#15422850471211852294098111138263:Topics1][l167;b50;a50;K~~~>.3917;* $$17,17#35241722455500657380289596243808:Topics2][l333;~~~>.3917; "
+"$$18,18#31041344429742018840308064013200:Topics3][b83;a42;K* $$19,0#46440151113795363000000595230845:Paragraph][{_}%EN-US "
+"[s14; [%00-00 is`_date (libovolný typ) ][%00-00S ®][%00-00  celé číslo]&][s0; "
+"Funkce vrátí logickou hodnotu 1 ([* pravda]), když zadaný parametr je typu [* "
+"datum]. Pokud je parametr jiného typu nebo obsahuje prázdnou hodnotu, funkce vrátí "
+"hodnotu 0 ([* nepravda]).&][s0; &][s0; [* Příklad: ]is`_date(10.5) `= 0, is`_date(23.5.1997) "
+"`= 1, is`_date(`\"ahoj`\") `= 0&][s14;:Calc`$Cis`_nullV: [%00-00 is`_null (libovolný "
+"typ) ][%00-00S ®][%00-00  celé číslo]&][s0; Funkce vrátí logickou hodnotu 1 ")
+TOPIC_TEXT(
+"([* pravda]), když její parametr je typu [* null]jinak vrátí logickou hodnotu "
+"0 ([* nepravda]).&][s0; &][s0; [* Příklad: ]is`_null(10.5) `= 0, is`_null(null) "
+"`= 1&][s14;:Calc`$Cis`_numberV: [%00-00 is`_number (libovolný typ) ][%00-00S ®][%00-00 "
+" celé číslo]&][s0; Funkce otestuje, zda je zadaný parametr typu [* číslo] (celé "
+"nebo reálné číslo, případně výsledek některé z_logických operací). Pokud "
+"parametr je typu [* číslo], funkce vrátí logickou hodnotu 1 ([* pravda]).&][s0; "
+"&][s0; [* Příklad: ]is`_number(10.5) `= 1, is`_number(23.5.1997) `= 0, is`_number(`\"ahoj`\") "
+"`= 0&][s14;:Calc`$Cis`_textV: [%00-00 is`_text (libovolný typ) ][%00-00S ®][%00-00 "
+" celé číslo]&][s0; Funkce vrátí logickou hodnotu 1 ([* pravda]), když zadaný "
+"parametr je typu [* řetězec]. Pokud je parametr jiného typu nebo obsahuje prázdnou "
+"hodnotu, funkce vrátí hodnotu 0 ([* nepravda]).&][s0; &][s0; [* Příklad: ]is`_text(10.5) "
+"`= 0, is`_text(23.5.1997) `= 0, is`_text(`\"ahoj`\") `= 1&][s0; Funkce vrátí řetězec "
+"obsahující desítkový zápis zadaného celého čísla [* hodnota]. Pokud počet "
+"znaků tohoto zápisu je menší než hodnota parametru [* šířka], doplní se "
+"zápis čísla zleva číslicemi 0 (nula) na šířku [* šířka].&][s0; &][s0; "
+"[* Poznámka: ]pokud je textový zápis čísla delší než [* šířka], funkce "
+"vrátí celý řetězec (oříznutí na zadanou šířku se neprovede). &][s0; &][s0; "
+"[* Příklad: ]itext0(138, 5) `= `\"00138`\"&][s0; Funkce vrátí řetězec obsahující "
+"desítkový zápis zadaného celého čísla. Pokud je parametr [* null], funkce "
+"vrátí prázdný řetězec.&][s0; &][s0; [* Příklad: ]itext(138) `= `\"138`\"&][s14;:Calc`$Cnull0: "
+"[%00-00 null ][%00-00S ®][%00-00  prázdná hodnota]&][s0; Prázdná hodnota. Při "
+"výpočtech operací a_volání funkcí se prázdná hodnota [/ propaguje] z_podvýrazu: "
+"pokud libovolný z_operandů nebo libovolný z_parametrů funkce obsahuje prázdnou "
+"hodnotu, výsledkem op")
+TOPIC_TEXT(
+"erace nebo funkce je opět prázdná hodnota. Výjimkou z_tohoto pravidla jsou speciální "
+"operátory [* ?:], [* `|`|], [* `&`&], [* `=`=], [* !`=] a_dále funkce [* is_number], "
+"[* is_text], [* is_date] a_[* is_null], které prázdné hodnoty zpracovávají speciálním "
+"způsobem.&][s0; &][s0; [* Příklad]: 10 `+ null `= null&][s14;:Calc`$CnvlVV: [%00-00 "
+"nvl (libovolný typ, libovolný typ) ][%00-00S ®][%00-00  libovolný typ]&][s0; "
+"Funkce vrátí hodnotu svého prvního parametru, tato hodnota není prázdná ([* "
+"null]). Pokud první parametr obsahuje prázdnou hodnotu, funkce vrátí hodnotu "
+"druhého parametru.&][s0; &][s0; [* Příklad]: nvl(`\"prvni`\", `\"druhy`\") `= "
+"`\"prvni`\", nvl(`\"`\", `\"druhy`\") `= `\"druhy`\"&][s0; Ludolfovo číslo [S p] "
+"určuje polovinu délky obvodu jednotkové kružnice ([* l_`= 2][*S p][* r]).&][s0; "
+"&][s0; [* Příklad: ]cos(60 `* (pi / 180)) `= 0.5&][s0; &][s0; ]")
diff --git a/uppsrc/TCore/appdoc.tpp/CalcSys$en-us.tpp b/uppsrc/TCore/appdoc.tpp/CalcSys$en-us.tpp
new file mode 100644
index 000000000..2a54157d4
--- /dev/null
+++ b/uppsrc/TCore/appdoc.tpp/CalcSys$en-us.tpp
@@ -0,0 +1,30 @@
+TITLE("System functions")
+REF("Calc$Cnull0")
+REF("Calc$CnvlVV")
+TOPIC_TEXT(
+"[2 $$0,0#00000000000000000000000000000000:Default][b100;a50;K* $$1,0#23046025415494101427921008701515:Paragraph][i167;b50;a25;kKN1;~~~>.3917;* "
+"$$2,0#52185223490867151055420261384346:Toc1`.Heading1][i333;kN11;~~~>.3917;* $$3,0#36545033421193513457240054113541:Toc2`.Heading2][i500;kN111;~~~>.3917; "
+"$$4,0#65092512416424580164828413186219:Toc3`.Heading3][i167;b50;a25;kKNA;~~~>.3917;* "
+"$$5,5#92291332474308709450111162202673:AppToc1`.AppHeading1][i333;kNA1;~~~>.3917;* "
+"$$6,15#61887903412252554674480251236992:AppToc2`.AppHeading2][i500;kNA11;~~~>.3917; "
+"$$7,7#03533551421653050355120437860335:AppToc3`.AppHeading3][i500;b100;a100;KN1;*4 "
+"$$8,0#94145093439740438411010082165944:Heading1][i500;b100;a50;kKN11;*+117 $$9,0#10901425421210535753260366156531:Heading2][i500;b100;a25;kKN111;* "
+"$$10,0#53209141402041366431858192225431:Heading3][i500;b100;a100;KNA;*4 $$11,8#32912651424211307887950041245434:AppHeading1][i500;b100;a50;kKNA1;*+117 "
+"$$12,8#51232055453458524230328032001901:AppHeading2][i500;b100;a25;kKNA11;* $$13,8#34108020439428305453439845463579:AppHeading3][b100;a50;k*4 "
+"$$14,0#49239115434362547028389207250014:Heading][b50;a25;k~~~>.3917;* $$15,15#40743698422276745552070108434023:Toc`.Heading][b100;a50;K~~~>.3917;*+117 "
+"$$16,16#15422850471211852294098111138263:Topics1][l167;b50;a50;K~~~>.3917;* $$17,17#35241722455500657380289596243808:Topics2][l333;~~~>.3917; "
+"$$18,18#31041344429742018840308064013200:Topics3][b83;a42;K* $$19,0#46440151113795363000000595230845:Paragraph][{_}%EN-US "
+"[s14;:Calc`$Cnull0: [%00-00 null ][%00-00S ®][%00-00  empty value]&][s0; Null value. "
+"During calculation the null value usually propagates from the subexpression: if any "
+"of the operands or function parameters contains the null value, the result of the "
+"operation or of the function is null as well. A few exceptions to this rule include "
+"special operators [* ?:], [* `|`|], [* `&`&], [* `=`=], [* !`=] and also the functions "
+"[* is_number], [* is_text], [* is_date], and_[* is_null], which process null values "
+"differ")
+TOPIC_TEXT(
+"ently.&][s0; &][s0; [* Example]: 10 `+ null `= null&][s14;:Calc`$CnvlVV: [%00-00 "
+"nvl (any data type, any data type) ][%00-00S ®][%00-00  any data type]&][s0; This "
+"function returns its first parameter if it is not [* null]. If the first parameter "
+"is [* null] the function returns its second parameter.&][s0; &][s0; [* Example]: "
+"nvl(`\"first`\", `\"second`\") `= `\"first`\", nvl(`\"`\", `\"second`\") `= `\"second`\"&][s0; "
+"&][s0; ]")
diff --git a/uppsrc/TCore/appdoc.tpp/CalcText$cs-cz.tpp b/uppsrc/TCore/appdoc.tpp/CalcText$cs-cz.tpp
new file mode 100644
index 000000000..b9d4a991a
--- /dev/null
+++ b/uppsrc/TCore/appdoc.tpp/CalcText$cs-cz.tpp
@@ -0,0 +1,266 @@
+TITLE("Textové operace")
+REF("Calc$CaddSS")
+REF("Calc$CascS")
+REF("Calc$CcatSSS")
+REF("Calc$CchrN")
+REF("Calc$CcountNS")
+REF("Calc$CftextN")
+REF("Calc$CftextNI")
+REF("Calc$CgeSS")
+REF("Calc$CgtSS")
+REF("Calc$CitextNN")
+REF("Calc$CleSS")
+REF("Calc$CleftSN")
+REF("Calc$ClenS")
+REF("Calc$CllpadSN")
+REF("Calc$ClpadSN")
+REF("Calc$ClpadSNS")
+REF("Calc$CltSS")
+REF("Calc$CmaxSS")
+REF("Calc$CmidSN")
+REF("Calc$CmidSNN")
+REF("Calc$CminSS")
+REF("Calc$CminmaxSSS")
+REF("Calc$CmulNS")
+REF("Calc$CmulSN")
+REF("Calc$CnlsN")
+REF("Calc$CnlsNN")
+REF("Calc$CnlsrN")
+REF("Calc$CnlsrNN")
+REF("Calc$CnumberS")
+REF("Calc$CnumberSN")
+REF("Calc$CreplaceSSS")
+REF("Calc$CrightSN")
+REF("Calc$CrpadSNS")
+REF("Calc$CrrpadSN")
+REF("Calc$CrrpadSNS")
+REF("Calc$CstringIndex")
+REF("Calc$CtextD")
+REF("Calc$CtextN")
+REF("Calc$CtextS")
+TOPIC_TEXT(
+"[2 $$0,0#00000000000000000000000000000000:Default][b100;a50;K* $$1,0#23046025415494101427921008701515:Paragraph][i167;b50;a25;kKN1;~~~>.3917;* "
+"$$2,0#52185223490867151055420261384346:Toc1`.Heading1][i333;kN11;~~~>.3917;* $$3,0#36545033421193513457240054113541:Toc2`.Heading2][i500;kN111;~~~>.3917; "
+"$$4,0#65092512416424580164828413186219:Toc3`.Heading3][i167;b50;a25;kKNA;~~~>.3917;* "
+"$$5,5#92291332474308709450111162202673:AppToc1`.AppHeading1][i333;kNA1;~~~>.3917;* "
+"$$6,15#61887903412252554674480251236992:AppToc2`.AppHeading2][i500;kNA11;~~~>.3917; "
+"$$7,7#03533551421653050355120437860335:AppToc3`.AppHeading3][i500;b100;a100;KN1;*4 "
+"$$8,0#94145093439740438411010082165944:Heading1][i500;b100;a50;kKN11;*+117 $$9,0#10901425421210535753260366156531:Heading2][i500;b100;a25;kKN111;* "
+"$$10,0#53209141402041366431858192225431:Heading3][i500;b100;a100;KNA;*4 $$11,8#32912651424211307887950041245434:AppHeading1][i500;b100;a50;kKNA1;*+117 "
+"$$12,8#51232055453458524230328032001901:AppHeading2][i500;b100;a25;kKNA11;* $$13,8#34108020439428305453439845463579:AppHeading3][b100;a50;k*4 "
+"$$14,0#49239115434362547028389207250014:Heading][b50;a25;k~~~>.3917;* $$15,15#40743698422276745552070108434023:Toc`.Heading][b100;a50;K~~~>.3917;*+117 "
+"$$16,16#15422850471211852294098111138263:Topics1][l167;b50;a50;K~~~>.3917;* $$17,17#35241722455500657380289596243808:Topics2][l333;~~~>.3917; "
+"$$18,18#31041344429742018840308064013200:Topics3][b83;a42;K* $$19,0#46440151113795363000000595230845:Paragraph][{_}%EN-US "
+"[s14;:Calc`$CaddSS: [%00-00 operátor `+  (řetězec, řetězec) ][%00-00S ®][%00-00 "
+" řetězec]&][s0; Operátor spojí dva řetězce tak, že je zařadí za sebe.&][s0; "
+"&][s0; [* Příklad: ]`\"ahoj`\" `+`\" světe`\" `= `\"ahoj světe`\"&][s14;:Calc`$CascS: "
+"[%00-00 asc (řetězec) ][%00-00S ®][%00-00  celé číslo]&][s0; Funkce vrátí "
+"ASCII`-kód prvního znaku zadaného textu. Pokud je text prázdný, funkce vrátí "
+"hodnotu 0.&][s0; &][s0; [* Příklad: ]asc(`\"ahoj`\") `= 97 [/ (kód znaku `'a`')].&][s0; "
+"Fun")
+TOPIC_TEXT(
+"kce spočítá průměr hodnot ze zadaného pole. Vstupní pole musí obsahovat "
+"číselné hodnoty, případně hodnoty [* null], které se ovšem při výpočtu "
+"průměru ignorují.&][s0; &][s0; [* Příklad: ]avg(`[10, 20, 24`]) `= 17&][s14;:Calc`$CcatSSS: "
+"[%00-00 cat (řetězec ][%00-00/ text`_1][%00-00 , řetězec ][%00-00/ mezi][%00-00 "
+", řetězec ][%00-00/ text`_2][%00-00 ) ][%00-00S ®][%00-00  řetězec]&][s0; Funkce "
+"spojí zadané řetězce [/ text`_1] a [/ text`_2]. Pokud jsou oba řetězce neprázdné, "
+"vloží se mezi ně řetězec [/ mezi].&][s0; &][s0; [* Příklad: ]cat(`\"ahoj`\", "
+"`\" `\", `\"světe`\") `= `\"ahoj světe`\", cat(`\"`\", `\" `\", `\"světe`\") `= "
+"`\"světe`\"&][s14;:Calc`$CchrN: [%00-00 chr (celé číslo ][%00-00/ ascii][%00-00 "
+") ][%00-00S ®][%00-00  řetězec]&][s0; Funkce vrátí jednoznakový řetězec, "
+"obsahující znak s_ASCII`-kódem [/ ascii].&][s0; &][s0; [* Příklad: ]chr(66) "
+"`= `\"B`\".&][s14;:Calc`$CcountNS: [%00-00 count (celé číslo, řetězec) ][%00-00S "
+"®][%00-00  řetězec]&][s0; Funkce vrátí textovou reprezentaci desítkového zápisu "
+"číselné hodnoty s připojeným podstatným jménem. V řetězci podstatného jména "
+"lze lomítkem oddělit přípony pro singulár, plurál a genitiv plurálu, které "
+"se v českém jazyce používají k vyjádření počtu 1, 2/3/4 a 5 (podle poslední "
+"číslice počtu).&][s0; &][s0; [* Příklad: ]count(62, `\"koz/a/y/`\") `= `\"62 "
+"kozy`\", count(61, `\"koz/a/y/`\") `= `\"61 koza`\".&][s0; Funkce vrátí aktuální "
+"systémové datum v_místním čase.&][s14;:Calc`$CftextN: [%00-00 ftext (reálné "
+"číslo) ][%00-00S ®][%00-00  řetězec]&][s0; Funkce vrátí zadané [/ reálné "
+"číslo] zaokrouhlené na nejbližší celé číslo a převedené na text.&][s0; "
+"&][s0; [* Příklad: ]ftext(133.59) `= `\"134`\"&][s14;:Calc`$CftextNI: [%00-00 ftext "
+"(reálné číslo, celé číslo) ][%00-00S ®][%00-00  řetězec]&][s0; Funkce převede "
+"číslo na text se zadaným počtem desetinných míst. Pokud není počet m")
+TOPIC_TEXT(
+"íst zadán, desetinná místa se ignorují.&][s14;:Calc`$CgeSS: [%00-00 operátor "
+">`=  (řetězec ][%00-00/ text1][%00-00 , řetězec ][%00-00/ text2][%00-00 ) ][%00-00S "
+"®][%00-00  logická hodnota]&][s0; Funkce porovná zadané řetězce a vrátí logickou "
+"hodnotu [/ pravda], pokud v lexikografickém uspořádání (ve slovníku) text [* "
+"řetězec1] následuje po řetězci [* řetězci2,] nebo pokud jsou oba řetězce "
+"shodné.&][s0; &][s0; [* Příklad: ]`\"ovoce`\" >`= `\"banán`\" `= 1&][s14;:Calc`$CgtSS: "
+"[%00-00 operátor >  (řetězec ][%00-00/ text1][%00-00 , řetězec ][%00-00/ text2][%00-00 "
+") ][%00-00S ®][%00-00  logická hodnota]&][s0; Funkce porovná zadané řetězce "
+"a vrátí logickou hodnotu [/ pravda], pokud v lexikografickém uspořádání (ve "
+"slovníku) text [* text1] následuje po řetězci [* text2].&][s0; &][s0; [* Příklad: "
+"](`\"ovoce`\" > `\"banán`\") `= 1, (`\"ovoce`\" > `\"ovoce`\") `= 0&][s14;:Calc`$CitextNN: "
+"[%00-00 itext(celé číslo ][%00-00/ hodnota][%00-00 , celé číslo ][%00-00/ šířka][%00-00 "
+") ][%00-00S ®][%00-00  řetězec]&][s0; Funkce vrátí řetězec obsahující desítkový "
+"zápis zadaného celého čísla [* hodnota]. Pokud počet znaků tohoto zápisu "
+"je menší než hodnota parametru [* šířka], doplní se zápis čísla zleva mezerami "
+"na šířku [* šířka].&][s0; &][s0; [* Poznámka: ]pokud je textový zápis čísla "
+"delší než [* šířka], funkce vrátí celý řetězec (oříznutí na zadanou "
+"šířku se neprovede). &][s0; &][s0; [* Příklad: ]itext(138, 5) `= `\"  138`\"&][s14;:Calc`$CleSS: "
+"[%00-00 operátor <`=  (řetězec, řetězec) ][%00-00S ®][%00-00  logická hodnota]&][s0; "
+"Funkce porovná zadané řetězce a vrátí logickou hodnotu [/ pravda], pokud v "
+"lexikografickém uspořádání (ve slovníku) text [* řetězec1] předchází před "
+"řetězcem [* řetězci2] nebo pokud jsou oba řetězce shodné.&][s0; &][s0; [* "
+"Příklad: ]`\"banán`\" < `\"ovoce`\" `= 1&][s14;:Calc`$CleftSN: [%00-00 left (řetězec "
+"][%00-")
+TOPIC_TEXT(
+"00/ text][%00-00 , celé číslo ][%00-00/ počet`_znaků][%00-00 ) ][%00-00S ®][%00-00 "
+" řetězec]&][s0; Funkce vrátí zadaný [/ počet znaků] ze začátku zadaného "
+"řetězce [/ text]. Pokud je počet znaků menší nebo roven 0, výsledkem funkce "
+"je prázdný řetězec. Pokud je počet znaků větší než délka řetězce, funkce "
+"vrátí zadaný řetězec beze změny.&][s0; &][s0; [* Příklad: ]left(`\"ahoj světe`\", "
+"6) `= `\"ahoj s`\"&][s14;:Calc`$ClenS: [%00-00 len (řetězec) ][%00-00S ®][%00-00 "
+" celé číslo]&][s0; Funkce vrátí délku (počet znaků) textu, který je jejím "
+"parametrem. Pokud je text prázdný, výsledkem funkce je hodnota 0.&][s0; &][s0; "
+"[* Příklad: ]len(`\"pokusný text`\") `= 12.&][s14;:Calc`$CllpadSN: [%00-00 llpad(řetězec "
+"][%00-00/ text][%00-00 , celé číslo ][%00-00/ délka][%00-00 ) ][%00-00S ®][%00-00 "
+" řetězec]&][s0; Funkce doplní řetězec [* text] zleva na počet znaků [* délka] "
+"opakovaným předřazováním řetězce [* výplň]. Pokud je [* délka] menší "
+"než délka původního řetězce [* text], funkce vrátí [* délka] znaků z konce "
+"řetězce [* text].&][s0; &][s0; [* Příklad: ]lpad(`\"ahoj`\", 15, `\"svete`\") "
+"`= `\"esvetesveteahoj`\"&][s0; &][s0; Funkce doplní řetězec [* text] zleva na "
+"počet znaků [* délka] mezerami. Pokud je [* délka] menší než délka původního "
+"řetězce [* text], funkce vrátí [* délka] znaků z konce řetězce [* text]..&][s0; "
+"&][s0; [* Příklad: ]llpad(`\"ahoj svete`\", 8) `= `\"oj svete`\"&][s14;:Calc`$ClpadSN: "
+"[%00-00 lpad(řetězec ][%00-00/ text][%00-00 , celé číslo ][%00-00/ délka][%00-00 "
+") ][%00-00S ®][%00-00  řetězec]&][s0; Funkce doplní řetězec [* text] zleva "
+"na počet znaků [* délka] mezerami. Pokud je [* délka] menší nebo rovna délce "
+"původního řetězce [* text], funkce vrátí vstupní text beze změny.&][s0; &][s0; "
+"[* Příklad: ]lpad(`\"ahoj`\", 8) `= `\"    ahoj`\"&][s0; &][s14;:Calc`$ClpadSNS: "
+"[%00-00 lpad(řetězec ][%00-00/ text][%00-00 , celé č�")
+TOPIC_TEXT(
+"�slo ][%00-00/ délka][%00-00 , řetězec ][%00-00/ výplň][%00-00 ) ][%00-00S "
+"®][%00-00  řetězec]&][s0; Funkce doplní řetězec [* text] zleva na počet znaků "
+"[* délka] opakovaným předřazováním řetězce [* výplň]. Pokud je [* délka] "
+"menší nebo rovna délce původního řetězce [* text] nebo pokud je řetězec "
+"[* výplň] prázdný, funkce vrátí vstupní text beze změny.&][s0; &][s0; [* "
+"Příklad: ]lpad(`\"ahoj`\", 15, `\"svete`\") `= `\"esvetesveteahoj`\"&][s14;:Calc`$CltSS: "
+"[%00-00 operátor <  (řetězec, řetězec) ][%00-00S ®][%00-00  logická hodnota]&][s0; "
+"Funkce porovná zadané řetězce a vrátí logickou hodnotu [/ pravda], pokud v "
+"lexikografickém uspořádání (ve slovníku) text [* řetězec1] předchází před "
+"řetězcem [* řetězci2].&][s0; &][s0; [* Příklad: ]`\"banán`\" < `\"ovoce`\" "
+"`= 1&][s14;:Calc`$CmaxSS: [%00-00 max (řetězec, řetězec) ][%00-00S ®][%00-00 "
+" řetězec]&][s0; Funkce vrátí lexikografické maximum ze dvou řetězců, tedy "
+"ten z nich, který by byl ve slovníku blíže konci.&][s0; &][s0; [* Příklad: "
+"]max(`\"rok`\", `\"rám`\") `= `\"rok`\".&][s14;:Calc`$CmidSN: [%00-00 mid (řetězec "
+"][%00-00/ text][%00-00 , celé číslo ][%00-00/ začátek][%00-00 ) ][%00-00S ®][%00-00 "
+" řetězec]&][s0; Funkce vrátí všechny znaky z řetězce [* text] počínaje indexem "
+"[* začátek]. První znak řetězce má index 0.&][s0; &][s0; [* Příklad: ]mid(`\"Ahoj "
+"světe!`\", 5) `= `\"světě!`\"&][s14;:Calc`$CmidSNN: [%00-00 mid (řetězec ][%00-00/ "
+"text][%00-00 , celé číslo ][%00-00/ začátek][%00-00 , celé číslo ][%00-00/ "
+"počet`_znaků][%00-00 ) ][%00-00S ®][%00-00  řetězec]&][s0; Funkce vrátí zadaný "
+"[/ počet znaků] z_řetězce [/ text] od pozice [/ začátek]. První znak v_řetězci "
+"má poziční číslo 0, druhý znak číslo 1 atd., poslední znak má pozici [* "
+"len(][*/ text][*  `- 1)].&][s0; &][s0; [* Příklad: ]mid(`\"ahoj světe`\", 3, 3) "
+"`= `\"j_s`\"&][s0; Funkce vrátí minimum z hodnot v daném poli. Pokud ")
+TOPIC_TEXT(
+"pole obsahuje řetězce, provede se jejich lexikografické srovnání.&][s0; &][s0; "
+"[* Příklad: ]min(`[8, 5, 13, 2, 9`]) `= 2&][s14;:Calc`$CminSS: [%00-00 min (řetězec, "
+"řetězec) ][%00-00S ®][%00-00  řetězec]&][s0; Funkce vrátí minimum z_dvou řetězců "
+"v lexikografickém uspořádání, tedy ten z obou řetězců, který by ve slovníku "
+"byl blíže začátku.&][s0; &][s0; [* Příklad: ]min(`\"pole`\", `\"Rudolf`\") "
+"`= `\"pole`\"&][s14;:Calc`$CminmaxSSS: [%00-00 minmax (řetězec, řetězec, řetězec) "
+"][%00-00S ®][%00-00  řetězec]&][s0; Funkce vrátí hodnotu [* min(max(x, xmin), "
+"xmax)]. Porovnávání se ve všech případech provádí lexikograficky, tedy jako "
+"ve slovníku. Pokud je některý z parametrů roven [* null], je výsledek také "
+"[* null].&][s14;:Calc`$CmulNS: [%00-00 operátor `*  (celé číslo ][%00-00/ počet][%00-00 "
+", řetězec ][%00-00/ text][%00-00 ) ][%00-00S ®][%00-00  řetězec]&][s0; Opakování "
+"textu. Výsledkem součinu řetězce a_celého čísla je řetězec, který vznikne "
+"opakováním původního řetězce [/ text] tolikrát, kolik udává [/ počet]. "
+"Pokud je [/ počet] <`= 0, výsledkem operace je prázdný řetězec.&][s0; &][s0; "
+"[* Příklad: ]4 `* `\"znak`\" `= `\"znakznakznakznak`\".&][s14;:Calc`$CmulSN: [%00-00 "
+"operátor `*  (řetězec ][%00-00/ text][%00-00 , celé číslo ][%00-00/ počet][%00-00 "
+") ][%00-00S ®][%00-00  řetězec]&][s0; Opakování textu. Výsledkem součinu řetězce "
+"a_celého čísla je řetězec, který vznikne opakováním původního řetězce "
+"[* text] tolikrát, kolik udává [* počet]. Pokud je [* počet <`= 0], výsledkem "
+"operace je prázdný řetězec.&][s0; &][s0; [* Příklad: ]`\"znak`\" `* 5 `= `\"znakznakznakznakznak`\".&][s14;:Calc`$CnlsN: "
+"[%00-00 nls (reálné číslo ][%00-00/ číslo][%00-00 ) ][%00-00S ®][%00-00  řetězec]&][s0; "
+"Funkce vrátí řetězec s_desítkovým zápisem zadaného celého čísla s_dodržením "
+"národních zvyklostí&][s14;:Calc`$CnlsNN: [%00-00 nls (reálné číslo")
+TOPIC_TEXT(
+" ][%00-00/ číslo][%00-00 , celé číslo ][%00-00/ des`_míst][%00-00 ) ][%00-00S "
+"®][%00-00  řetězec]&][s0; Převod číselné hodnoty na text s využitím národních "
+"zvyklostí pro formátování čísel (oddělovače tisíců, oddělovač desetinné "
+"části). Pokud není zadán počet desetinných míst, dosadí se běžná hodnota "
+"3. Pokud je počet desetinných míst kladný, z desetinné části čísla se odstraní "
+"nevýznamné nuly; pokud je počet míst záporný, nevýznamné nuly se v čísle "
+"ponechají.&][s0; &][s0; [* Příklad: ]nls(1272.3, `-2) `= `\"1 272,30`\"&][s14;:Calc`$CnlsrN: "
+"[%00-00 nlsr(reálné číslo ][%00-00/ číslo][%00-00 ) ][%00-00S ®][%00-00  řetězec]&][s0; "
+"Převod číselné hodnoty na text s využitím národních zvyklostí pro formátování "
+"čísel (oddělovače tisíců, oddělovač desetinné části). Číslo se zaokrouhlí "
+"na tři platné číslice a nevýznamné nuly se ignorují.&][s0; &][s0; [* Příklad: "
+"]nlsr(1272.3) `= `\"1 272`\"&][s14;:Calc`$CnlsrNN: [%00-00 nlsr(reálné číslo "
+"][%00-00/ číslo][%00-00 , celé číslo ][%00-00/ platných`_číslic][%00-00 ) "
+"][%00-00S ®][%00-00  řetězec]&][s0; Převod číselné hodnoty na text s využitím "
+"národních zvyklostí pro formátování čísel (oddělovače tisíců, oddělovač "
+"desetinné části) na zadaný počet [/ platných číslic]. Pokud je počet platných "
+"číslic kladný, z_desetinné části čísla se odstraní nevýznamné nuly; pokud "
+"je počet míst záporný, nevýznamné nuly se v_čísle ponechají.&][s0; &][s0; "
+"[* Příklad: ]nlsr(1272.3, `-3) `= `\"1 270`\", nlsr(1.2023, `-3) `= `\"1,20`\"&][s14;:Calc`$CnumberS: "
+"[%00-00 number (řetězec) ][%00-00S ®][%00-00  reálné číslo]&][s0; Funkce načte "
+"ze zadaného řetězce desítkový zápis reálného čísla a toto číslo vrátí "
+"jako svůj výsledek. Pokud řetězec neobsahuje zápis čísla, funkce ohlásí "
+"chybu při výpočtu.&][s0; &][s0; [* Příklad: ]number(`\"10.8`\") `= 10.8&][s0;* "
+"&][s14")
+TOPIC_TEXT(
+";:Calc`$CnumberSN: [%00-00 number (řetězec ][%00-00/ text][%00-00 , reálné číslo "
+"][%00-00/ jinak][%00-00 ) ][%00-00S ®][%00-00  reálné číslo]&][s0; Funkce převede "
+"textovou reprezentaci reálného čísla na hodnotu tohoto čísla. Varianta funkce "
+"s jedním parametrem v případě chybného zápisu čísla ohlásí při vyhodnocení "
+"chybu; funkce s dvěma parametry vrátí v případě chyby nebo prázdného řetězce "
+"číselnou hodnotu [/ jinak], zadanou jako druhý parametr.&][s0; &][s0; [* Příklad]: "
+"number(`\"1.2e3`\") `= 1200&][s14;:Calc`$CreplaceSSS: [%00-00 replace(řetězec ][%00-00/ "
+"text][%00-00 , řetězec ][%00-00/ vyhledat][%00-00 , řetězec ][%00-00/ nahradit][%00-00 "
+") ][%00-00S ®][%00-00  řetězec]&][s0; Funkce vyhledá v_řetězci [/ text] výskyty "
+"textu [/ vyhledat] a_nahradí je textem [/ nahradit]. Pokud je řetězec [/ nahradit] "
+"prázdný, funkce z_řetězce [/ text] odstraní výskyty textu [/ vyhledat].&][s0; "
+"&][s0;~~~3200; [* Příklad:] replace(`\"člověk člověku vlkem`\", `\"člověk`\", "
+"`\"vlk`\") `= `\"vlk vlku vlkem`\"&][s14;:Calc`$CrightSN: [%00-00 right (řetězec "
+"][%00-00/ text][%00-00 , celé číslo ][%00-00/ počet`_znaků][%00-00 ) ][%00-00S "
+"®][%00-00  řetězec]&][s0; Funkce vrátí zadaný [/ počet znaků] z_konce řetězce "
+"[/ text]. Pokud je počet znaků menší nebo roven 0, výsledkem funkce je prázdný "
+"řetězec. Pokud je počet znaků větší než délka řetězce, funkce vrátí "
+"zadaný řetězec beze změny.&][s0; &][s0; [* Příklad]: right(`\"ahoj světe`\", "
+"7) `= `\"j_světe`\"&][s14;:Calc`$CrpadSNS: [%00-00 rpad(řetězec ][%00-00/ text][%00-00 "
+", celé číslo ][%00-00/ délka][%00-00 , řetězec ][%00-00/ výplň][%00-00 ) "
+"][%00-00S ®][%00-00  řetězec]&][s0; Funkce doplní řetězec [* text] zprava na "
+"počet znaků [* délka] opakovaným přidáváním řetězce [* výplň]. Pokud "
+"je [* délka] menší nebo rovna délce původního řetězce [* text] nebo pokud "
+"je řetězec [* výplň] prázdný, funkce vr�")
+TOPIC_TEXT(
+"�tí vstupní text beze změny.&][s0; &][s0; [* Příklad: ]rpad(`\"ahoj`\", 15, "
+"`\"svete`\") `= `\"ahojsvetesvetes`\"&][s0;* &][s14;:Calc`$CrrpadSN: [%00-00 rrpad(řetězec "
+"][%00-00/ text][%00-00 , celé číslo ][%00-00/ délka][%00-00 ) ][%00-00S ®][%00-00 "
+" řetězec]&][s0; Funkce doplní řetězec [* text] mezerami zprava na počet znaků "
+"[* délka]. Pokud je [* délka] menší než délka původního řetězce [* text], "
+"funkce vrátí pouze [* délka] prvních znaků řetězce [* text].&][s0; &][s0; "
+"[* Příklad: ]rpad(`\"ahoj světe`\", 6) `= `\"ahoj s`\"&][s0; &][s14;:Calc`$CrrpadSNS: "
+"[%00-00 rrpad(řetězec ][%00-00/ text][%00-00 , celé číslo ][%00-00/ délka][%00-00 "
+", řetězec ][%00-00/ výplň][%00-00 ) ][%00-00S ®][%00-00  řetězec]&][s0; Funkce "
+"doplní řetězec [* text] zprava na počet znaků [* délka] opakovaným přidáváním "
+"řetězce [* výplň]. Pokud je [* délka] menší nebo rovna délce původního "
+"řetězce [* text], funkce vrátí pouze [* délka] prvních znaků řetězce [* "
+"text].&][s0; &][s0; [* Příklad:] rpad(`\"ahoj`\", 15, `\"svete`\") `= `\"ahojsvetesvetes`\"&][s14;:Calc`$CstringIndex: "
+"[%00-00 operátor `[`]  (řetězec, celé číslo) ][%00-00S ®][%00-00  řetězec]&][s0; "
+"Operátor vrátí řetězec obsahující znak v_řetězci na dané pozici. Znaky "
+"v řetězci jsou číslovány od 0, takže první znak má index 0 a poslední (délka "
+"řetězce `- 1).&][s0; &][s0; [* Příklad: ]`\"ahoj`\"`[2`] `= `\"o`\"&][s14;:Calc`$CtextD: "
+"[%00-00 text (datum/čas) ][%00-00S ®][%00-00  řetězec]&][s0; Převod hodnoty "
+"na text. Při převodu čísla na text je výsledkem textová reprezentace tohoto "
+"čísla, pořízená na 10 platných číslic. Pokud je parametrem text, funkce ponechá "
+"tento text beze změny. Při převodu data na text se do řetězce datum uloží "
+"v běžném tvaru [* den.měsíc.rok].&][s0; &][s0; [* Příklad]: text(1 / 3) `= "
+"`\"0.3333333333`\", text(`\"ahoj`\") `= `\"ahoj`\", text(26.7.1971) `= `\"26.07.1971`\"&][s14;:Calc`$CtextN: "
+"[%00-00")
+TOPIC_TEXT(
+" text (reálné číslo) ][%00-00S ®][%00-00  řetězec]&][s0; Funkce vrátí řetězec "
+"obsahující textový zápis zadaného reálného čísla.&][s0; &][s0; [* Příklad: "
+"]text(`-370.05) `= `\"`-370.05`\"&][s14;:Calc`$CtextS: [%00-00 text (řetězec) ][%00-00S "
+"®][%00-00  řetězec]&][s0; Funkce vrátí jako výsledek svůj parametr beze změny.&][s0; "
+"&][s0; [* Příklad: ]text(`\"Ahoj světe!`\") `= `\"Ahoj světe!`\"&][s0; &][s0; "
+"&][s0; &][s0; &][s0; ]")
diff --git a/uppsrc/TCore/appdoc.tpp/CalcText$en-us.tpp b/uppsrc/TCore/appdoc.tpp/CalcText$en-us.tpp
new file mode 100644
index 000000000..176ca791a
--- /dev/null
+++ b/uppsrc/TCore/appdoc.tpp/CalcText$en-us.tpp
@@ -0,0 +1,144 @@
+TITLE("Text processing functions")
+REF("Calc$CaddSS")
+REF("Calc$CascS")
+REF("Calc$CcatSSS")
+REF("Calc$CchrN")
+REF("Calc$CcountNS")
+REF("Calc$CftextN")
+REF("Calc$CftextNI")
+REF("Calc$CgeSS")
+REF("Calc$CgtSS")
+REF("Calc$CleSS")
+REF("Calc$CleftSN")
+REF("Calc$ClenS")
+REF("Calc$ClogNotS")
+REF("Calc$CltSS")
+REF("Calc$CmaxSS")
+REF("Calc$CmidSN")
+REF("Calc$CmidSNN")
+REF("Calc$CminSS")
+REF("Calc$CminmaxSSS")
+REF("Calc$CmulNS")
+REF("Calc$CmulSN")
+REF("Calc$CnlsN")
+REF("Calc$CnlsNN")
+REF("Calc$CnumberS")
+REF("Calc$CnumberSN")
+REF("Calc$CrightSN")
+REF("Calc$CstringIndex")
+REF("Calc$CtextS")
+REF("Calc$CtextN")
+REF("Calc$CtextD")
+TOPIC_TEXT(
+"[2 $$0,0#00000000000000000000000000000000:Default][b100;a50;K* $$1,0#23046025415494101427921008701515:Paragraph][i167;b50;a25;kKN1;~~~>.3917;* "
+"$$2,0#52185223490867151055420261384346:Toc1`.Heading1][i333;kN11;~~~>.3917;* $$3,0#36545033421193513457240054113541:Toc2`.Heading2][i500;kN111;~~~>.3917; "
+"$$4,0#65092512416424580164828413186219:Toc3`.Heading3][i167;b50;a25;kKNA;~~~>.3917;* "
+"$$5,5#92291332474308709450111162202673:AppToc1`.AppHeading1][i333;kNA1;~~~>.3917;* "
+"$$6,15#61887903412252554674480251236992:AppToc2`.AppHeading2][i500;kNA11;~~~>.3917; "
+"$$7,7#03533551421653050355120437860335:AppToc3`.AppHeading3][i500;b100;a100;KN1;*4 "
+"$$8,0#94145093439740438411010082165944:Heading1][i500;b100;a50;kKN11;*+117 $$9,0#10901425421210535753260366156531:Heading2][i500;b100;a25;kKN111;* "
+"$$10,0#53209141402041366431858192225431:Heading3][i500;b100;a100;KNA;*4 $$11,8#32912651424211307887950041245434:AppHeading1][i500;b100;a50;kKNA1;*+117 "
+"$$12,8#51232055453458524230328032001901:AppHeading2][i500;b100;a25;kKNA11;* $$13,8#34108020439428305453439845463579:AppHeading3][b100;a50;k*4 "
+"$$14,0#49239115434362547028389207250014:Heading][b50;a25;k~~~>.3917;* $$15,15#40743698422276745552070108434023:Toc`.Heading][b100;a50;K~~~>.3917;*+117 "
+"$$16,16#15422850471211852294098111138263:Topics1][l167;b50;a50;K~~~>.3917;* $$17,17#35241722455500657380289596243808:Topics2][l333;~~~>.3917; "
+"$$18,18#31041344429742018840308064013200:Topics3][b83;a42;K* $$19,0#46440151113795363000000595230845:Paragraph][{_}%EN-US "
+"[s14;:Calc`$CaddSS: operator `+  (string, string) [S ®] string&][s0; &][s14;:Calc`$CascS: "
+"[%00-00 asc (string) ][%00-00S ®][%00-00  integer]&][s0; The function will return "
+"ASCII`-code of the first character of its string argument. If the argument is empty, "
+"the function will return 0.&][s0; &][s0; [* Example]: asc(`\"hello`\") `= 104 [/ "
+"(ASCII code of the character `'h`')].&][s14;:Calc`$CcatSSS: [%00-00 cat (string ][%00-00/ "
+"text`_1][%00-00 , string ][%00-00/ join][%00-00 , string ][%00-00/ text`_2][%00-00 "
+") ")
+TOPIC_TEXT(
+"][%00-00S ®][%00-00  string]&][s0; The function concatenates its arguments [/ text`_1] "
+"and [/ text`_2]. If neither string is empty, the string [/ join] is inserted between "
+"them.&][s0; &][s0; [* Example]: cat(`\"hello`\", `\" `\", `\"world`\") `= `\"hello "
+"world`\", cat(`\"`\", `\" `\", `\"world`\") `= `\"world`\"&][s14;:Calc`$CchrN: [%00-00 "
+"chr (integer ][%00-00/ ascii][%00-00 ) ][%00-00S ®][%00-00  string]&][s0; The function "
+"will return one`-character string containing the character with the ASCII`-code ascii.&][s0; "
+"&][s0; [* Example]: chr(66) `= `\"B`\".&][s14;:Calc`$CcountNS: [%00-00 count (integer, "
+"string) ][%00-00S ®][%00-00  string]&][s0; The function returns text representation "
+"of decimal notation of its numeric value together with the attached noun. In the "
+"noun string, the forward slash can separate the suffixes of singular and plural used "
+"in English to distinguish between a single object and multiple objects.&][s0; &][s0; "
+"[* Example]: count(1, `\"m/ouse/ice`\") `= `\"1 mouse`\", count(2, `\"m/ouse/ice`\") "
+"`= `\"2 mice`\".&][s14;:Calc`$CftextN: ftext (real number) [S ®] string&][s0; &][s14;:Calc`$CftextNI: "
+"ftext (real number, integer) [S ®] string&][s0; Funkce převede číslo na text "
+"se zadaným počtem desetinných míst. Pokud není počet míst zadán, desetinná "
+"místa se ignorují.&][s14;:Calc`$CgeSS: operator >`=  (string, string) [S ®] logical "
+"value&][s0; &][s14;:Calc`$CgtSS: operator >  (string, string) [S ®] logical value&][s0; "
+"&][s14;:Calc`$CleSS: operator <`=  (string, string) [S ®] logical value&][s0; &][s14;:Calc`$CleftSN: "
+"[%00-00 left (string ][%00-00/ text][%00-00 , integer ][%00-00/ character`_count][%00-00 "
+") ][%00-00S ®][%00-00  string]&][s0; The function returns first [/ character`_count] "
+"characters of its argument [/ text]. If the number of characters is less or equal "
+"to 0, the function returns an empty string. If the character count is greater than "
+"the string length, the function will return the original argument unchanged.&][s0; "
+"&][s0; [* Example]: left(")
+TOPIC_TEXT(
+"`\"hello world`\", 7) `= `\"hello w`\"&][s14;:Calc`$ClenS: [%00-00 len (string) "
+"][%00-00S ®][%00-00  integer]&][s0; The function will return the length (number "
+"of characters) of its string argument. If the string is empty the function returns "
+"0.&][s0; &][s0; [* Example]: len(`\"simple text`\") `= 11.&][s14;:Calc`$ClogNotS: "
+"operator !  (string) [S ®] logical value&][s14;:Calc`$CltSS: operator <  (string, "
+"string) [S ®] logical value&][s0; &][s14;:Calc`$CmaxSS: max (string, string) [S "
+"®] string&][s0; &][s14;:Calc`$CmidSN: [%00-00 mid (string ][%00-00/ text][%00-00 "
+", integer ][%00-00/ beginning][%00-00 ) ][%00-00S ®][%00-00  string]&][s0; &][s14;:Calc`$CmidSNN: "
+"[%00-00 mid (string ][%00-00/ text][%00-00 , integer ][%00-00/ beginning][%00-00 "
+", integer ][%00-00/ character`_count][%00-00 ) ][%00-00S ®][%00-00  string]&][s0; "
+"The function returns [/ character`_count] characters from the string [/ text] starting "
+"at position [/ beginning]. The first character in the string has the position number "
+"0, the second character has the number 1 etc., the last character has the position "
+"[* len(][*/ text][*  `- 1)]. If the character count is omitted the function returns "
+"all characters from the position [/ beginning] until the end of the string.&][s0; "
+"&][s0; [* Example]: mid(`\"hello world`\", 4, 3) `= `\"o w`\"&][s14;:Calc`$CminSS: "
+"min (string, string) [S ®] string&][s0; &][s14;:Calc`$CminmaxSSS: minmax (string, "
+"string, string) [S ®] string&][s0; &][s14;:Calc`$CmulNS: [%00-00 operator `*  (integer "
+"][%00-00/ count][%00-00 , string ][%00-00/ text][%00-00 ) ][%00-00S ®][%00-00  string]&][s0; "
+"Text repetition. The result of a multiplying a [* text] value by an integer value "
+"[* count] is a string containing the original [* text] repeated [* count] times. "
+"When [* count] <`= 0, the result is the empty string.&][s0; &][s0; [* Example]: `\"text`\" "
+"`* 5 `= `\"texttexttexttexttext`\".&][s14;:Calc`$CmulSN: [%00-00 operator `*  (string "
+"][%00-00/ text][%00-00 , integer ][%00-00/ count][%00-00 ) ][%00-00S �")
+TOPIC_TEXT(
+"�][%00-00  string]&][s0; &][s14;:Calc`$CnlsN: [%00-00 nls (real number ][%00-00/ "
+"value][%00-00 ) ][%00-00S ®][%00-00  string]&][s0; &][s14;:Calc`$CnlsNN: [%00-00 "
+"nls (real number ][%00-00/ value][%00-00 , integer ][%00-00/ decimals][%00-00 ) ][%00-00S "
+"®][%00-00  string]&][s0; Converts its numeric value to text according to current "
+"regional settings (delimiters of thousands, delimiter of decimal part). If number "
+"of decimals is omitted, the default value 3 is used. If the number of decimals is "
+"positive, non`-significant zeroes will be deleted from the decimal part of the number. "
+"If the number of decimal positions is negative, non`-significant zeroes will be retained "
+"in the number. &][s0; &][s0; [* Example]: nls(1272.3, `-2) `= `\"1 272,30`\"&][s0; "
+"Converts its numeric value to text according to current regional settings (delimiters "
+"of thousands, delimiter of decimal part). The number is rounded to 3 significant "
+"digits and insignificant zeroes are ignored.&][s0; &][s0;* Example: nlsr(1272.3) "
+"`= `\"1 272.3`\"&][s0; Converts its numeric value to text according to current regional "
+"settings (delimiters of thousands, delimiter of decimal part) with given number of "
+"[/ significant digits]. If the number of digits is positive, non`-significant zeroes "
+"will be deleted from the decimal part of the number. If the number of digits is negative, "
+"non`-significant zeroes will be retained in the number. &][s0; &][s0;* Example: nlsr(1272.3, "
+"`-2) `= `\"1 300`\", nlsr(1.999, `-2) `= `\"2.00`\"&][s14;:Calc`$CnumberS: [%00-00 "
+"number (string) ][%00-00S ®][%00-00  real number]&][s0; &][s14;:Calc`$CnumberSN: "
+"[%00-00 number (string ][%00-00/ text][%00-00 , real number ][%00-00/ default][%00-00 "
+") ][%00-00S ®][%00-00  real number]&][s0; The function converts text representation "
+"of a real numeric constant to the value of this number. If the text doesn`'t contain "
+"a valid text representation of a real number, the form with one parameter aborts "
+"the computation with the error [/ `'invalid numeric format`']")
+TOPIC_TEXT(
+" whereas the form with two arguments merely returns its second argument [/ default].&][s0; "
+"&][s0; [* Example]: number(`\"1.2e3`\") `= 1200&][s14;:Calc`$CrightSN: [%00-00 right "
+"(string ][%00-00/ text][%00-00 , integer ][%00-00/ character`_count][%00-00 ) ][%00-00S "
+"®][%00-00  string]&][s0; The function returns last [/ character`_count] characters "
+"of its string argument [/ text]. If the number of characters is less or equal to "
+"0, the function returns an empty string. If the character count is greater than the "
+"string length, the function returns its [/ text] argument unchanged.&][s0; &][s0; "
+"[* Example]: right(`\"hello world`\", 7) `= `\"o world`\"&][s14;:Calc`$CstringIndex: "
+"operator `[`]  (string, integer) [S ®] string&][s0; &][s14;:Calc`$CtextS: text (string) "
+"[S ®] string&][s0; &][s0; &][s14;:Calc`$CtextN: text (real number) [S ®] string&][s0; "
+"&][s0; &][s14;:Calc`$CtextD: [%00-00 text (date/time) ][%00-00S ®][%00-00  string]&][s0; "
+"Value`-to`-text conversion. If a number is converted into a text, its result is the "
+"text representation of the number with 10 significant digits. If the parameter is "
+"a text, the text will be left unchanged by the function. In case of date`-to`-text "
+"conversion, the date will be saved in the string in the usual form day.month.year.&][s0; "
+"&][s0; [* Example]: text(1 / 3) `= `\"0.3333333333`\", text(`\"hello`\") `= `\"hello`\", "
+"text(26.7.1971) `= `\"26.07.1971`\"&][s0; &][s0; ]")
diff --git a/uppsrc/TCore/appdoc.tpp/CalcTrans$cs-cz.tpp b/uppsrc/TCore/appdoc.tpp/CalcTrans$cs-cz.tpp
new file mode 100644
index 000000000..820d8fe57
--- /dev/null
+++ b/uppsrc/TCore/appdoc.tpp/CalcTrans$cs-cz.tpp
@@ -0,0 +1,76 @@
+TITLE("Transcendentní funkce")
+REF("Calc$CarccosN")
+REF("Calc$CarcsinN")
+REF("Calc$CarctgN")
+REF("Calc$CcosN")
+REF("Calc$Ce0")
+REF("Calc$CexpN")
+REF("Calc$ClnN")
+REF("Calc$ClogN")
+REF("Calc$CpowNN")
+REF("Calc$CsinN")
+REF("Calc$CtgN")
+TOPIC_TEXT(
+"[2 $$0,0#00000000000000000000000000000000:Default][b100;a50;K* $$1,0#23046025415494101427921008701515:Paragraph][i167;b50;a25;kKN1;~~~>.3917;* "
+"$$2,0#52185223490867151055420261384346:Toc1`.Heading1][i333;kN11;~~~>.3917;* $$3,0#36545033421193513457240054113541:Toc2`.Heading2][i500;kN111;~~~>.3917; "
+"$$4,0#65092512416424580164828413186219:Toc3`.Heading3][i167;b50;a25;kKNA;~~~>.3917;* "
+"$$5,5#92291332474308709450111162202673:AppToc1`.AppHeading1][i333;kNA1;~~~>.3917;* "
+"$$6,15#61887903412252554674480251236992:AppToc2`.AppHeading2][i500;kNA11;~~~>.3917; "
+"$$7,7#03533551421653050355120437860335:AppToc3`.AppHeading3][i500;b100;a100;KN1;*4 "
+"$$8,0#94145093439740438411010082165944:Heading1][i500;b100;a50;kKN11;*+117 $$9,0#10901425421210535753260366156531:Heading2][i500;b100;a25;kKN111;* "
+"$$10,0#53209141402041366431858192225431:Heading3][i500;b100;a100;KNA;*4 $$11,8#32912651424211307887950041245434:AppHeading1][i500;b100;a50;kKNA1;*+117 "
+"$$12,8#51232055453458524230328032001901:AppHeading2][i500;b100;a25;kKNA11;* $$13,8#34108020439428305453439845463579:AppHeading3][b100;a50;k*4 "
+"$$14,0#49239115434362547028389207250014:Heading][b50;a25;k~~~>.3917;* $$15,15#40743698422276745552070108434023:Toc`.Heading][b100;a50;K~~~>.3917;*+117 "
+"$$16,16#15422850471211852294098111138263:Topics1][l167;b50;a50;K~~~>.3917;* $$17,17#35241722455500657380289596243808:Topics2][l333;~~~>.3917; "
+"$$18,18#31041344429742018840308064013200:Topics3][b83;a42;K* $$19,0#46440151113795363000000595230845:Paragraph][{_}%EN-US "
+"[s14;:Calc`$CarccosN: [%00-00 arccos (reálné číslo ][%00-00/ x][%00-00 ) ][%00-00S "
+"®][%00-00  reálné číslo]&][s0; Arkus kosinus stanoví takový úhel [S a] v_rozsahu "
+"[* `[0, ][*S p][* )], pro který je [* cos(][*/S a][* ) `= ][*/ x]. Vypočtený úhel "
+"funkce vrací v_radiánech. Pokud parametr funkce leží mimo interval [* `[`-1,1`]], "
+"výpočet skončí s chybou chyba při výpočtu v reálných číslech.&][s0; &][s0; "
+"[* Příklad: ]arccos(`-0.5) `= 2.094395102&][s14;:Calc`$CarcsinN: [%00-00 arcs")
+TOPIC_TEXT(
+"in (reálné číslo ][%00-00/ x][%00-00 ) ][%00-00S ®][%00-00  reálné číslo]&][s0; "
+"Arkus sinus stanoví takový úhel [S a] v_rozsahu [* `[`-][*S p][* _/_2, ][*S p][* "
+"_/_2)], pro který je [* sin(][*/S a][* ) `= ][*/ x]. Vypočtený úhel funkce vrací "
+"v_radiánech. Pokud parametr funkce leží mimo interval [* `[`-1,1`]], výpočet "
+"skončí s chybou chyba při výpočtu v reálných číslech.&][s0; &][s0; [* Příklad: "
+"]arcsin(0.5) `= 0.5235987756&][s14;:Calc`$CarctgN: [%00-00 arctg (reálné číslo "
+"][%00-00/ x][%00-00 ) ][%00-00S ®][%00-00  reálné číslo]&][s0; Arkus tangens "
+"stanoví takový úhel [S a] v_rozsahu [* `[`-][*S p][* _/_2, ][*S p][* _/_2)], pro "
+"který je [* tg(][*/S a][* ) `= ][*/ x]. Vypočtený úhel funkce vrací v_radiánech.&][s0; "
+"&][s0; [* Příklad: ]arctg(10) `= 1.471127674&][s0; [Ipole`, konstruktor; Konstruktor "
+"pole] vytvoří pole obsahující zadanou posloupnost prvků.&][s0; &][s0; [* Příklad: "
+"]`[1`+2, 1`+3, `\"a`\" `+ `\"b`\"`] `= `[3, 4, `\"ab`\"`]&][s14;:Calc`$CcosN: [%00-00 "
+"cos (reálné číslo ][%00-00/S a][%00-00 ) ][%00-00S ®][%00-00  reálné číslo]&][s0; "
+"Funkce stanoví kosinus úhlu, tedy podíl délky přilehlé odvěsny a_přepony "
+"v_pravoúhlém trojúhelníku s_odvěsnovým úhlem [S a]. Úhel se zadává v_radiánech, "
+"takže plný úhel má velikost 2[S p].&][s0; &][s0; [* Příklad: ]cos(pi) `= `-1&][s14;:Calc`$Ce0: "
+"e [S ®] reálné číslo&][s0; Eulerova konstanta určuje základ exponenciály "
+"a_přirozeného logaritmu. Je přibližně rovna 2.718281828.&][s14;:Calc`$CexpN: "
+"[%00-00 exp (reálné číslo) ][%00-00S ®][%00-00  reálné číslo]&][s0; Přirozená "
+"exponenciála. Výsledkem funkce je mocnina, jejímž základem je Eulerovo číslo "
+"[* e] (viz str._93) a_exponentem je zadané reálné číslo.&][s0; &][s0; [* Příklad: "
+"]exp(3.5) `= 33.11545196&][s14;:Calc`$ClnN: [%00-00 ln (reálné číslo ][%00-00/ "
+"x][%00-00 ) ][%00-00S ®][%00-00  reálné číslo]&][s0; Přirozený logaritmus. "
+"Funkce vypočte l")
+TOPIC_TEXT(
+"ogaritmus parametru [/ x] o_základu [* e], tedy takové reálné číslo [/ a], "
+"pro které platí: [*/ x][*  `= exp(][*/ a][* )].&][s0; &][s0; [* Příklad: ]ln(100) "
+"`= 4.605170186&][s14;:Calc`$ClogN: [%00-00 log (reálné číslo ][%00-00/ x][%00-00 "
+") ][%00-00S ®][%00-00  reálné číslo]&][s0; Dekadický logaritmus. Funkce vypočte "
+"logaritmus parametru [/ x] o_základu 10, tedy takové reálné číslo [/ a], pro "
+"které platí: [*/ x][*  `= pow(10, ][*/ a][* )].&][s0; &][s0; [* Příklad: ]log(1000) "
+"`= 3&][s14;:Calc`$CpowNN: [%00-00 pow (reálné číslo ][%00-00/ základ][%00-00 "
+", reálné číslo ][%00-00/ exponent][%00-00 ) ][%00-00S ®][%00-00  reálné číslo]&][s0; "
+"Reálná mocnina. Pokud je [/ exponent] celočíselný, smí být [/ základ] mocniny "
+"i_záporný. &][s0;* &][s0; [* Příklad: ]pow(3, 4) `= 81&][s14;:Calc`$CsinN: [%00-00 "
+"sin (reálné číslo ][%00-00/S a][%00-00 ) ][%00-00S ®][%00-00  reálné číslo]&][s0; "
+"Funkce stanoví sinus úhlu, tedy podíl délky protilehlé odvěsny a_přepony v_pravoúhlém "
+"trojúhelníku s_odvěsnovým úhlem [S a]. Úhel se zadává v_radiánech, takže "
+"plný úhel má velikost 2[S p].&][s0; &][s0; [* Příklad]: sin(3 `* pi / 2) `= "
+"`-1&][s14;:Calc`$CtgN: [%00-00 tg (reálné číslo ][%00-00/S a][%00-00 ) ][%00-00S "
+"®][%00-00  reálné číslo]&][s0; Tangens úhlu je podíl délky protilehlé a_přilehlé "
+"odvěsny v_pravoúhlém trojúhelníku s_odvěsnovým úhlem [S a]. Úhel se zadává "
+"v_radiánech, takže plný úhel má velikost 2[S p].&][s0; &][s0; [* Příklad]: "
+"tg(pi / 4) `= 1&][s0; &][s0; &][s0; &][s0; &][s0; ]")
diff --git a/uppsrc/TCore/appdoc.tpp/CalcTrans$en-us.tpp b/uppsrc/TCore/appdoc.tpp/CalcTrans$en-us.tpp
new file mode 100644
index 000000000..76fc293c6
--- /dev/null
+++ b/uppsrc/TCore/appdoc.tpp/CalcTrans$en-us.tpp
@@ -0,0 +1,83 @@
+TITLE("Transcendental functions")
+REF("Calc$CarccosN")
+REF("Calc$CarcsinN")
+REF("Calc$CarctgN")
+REF("Calc$CcosN")
+REF("Calc$Ce0")
+REF("Calc$CexpN")
+REF("Calc$ClnN")
+REF("Calc$ClogN")
+REF("Calc$Cpi0")
+REF("Calc$CpowNN")
+REF("Calc$CsinN")
+REF("Calc$CtgN")
+TOPIC_TEXT(
+"[2 $$0,0#00000000000000000000000000000000:Default][b100;a50;K* $$1,0#23046025415494101427921008701515:Paragraph][i167;b50;a25;kKN1;~~~>.3917;* "
+"$$2,0#52185223490867151055420261384346:Toc1`.Heading1][i333;kN11;~~~>.3917;* $$3,0#36545033421193513457240054113541:Toc2`.Heading2][i500;kN111;~~~>.3917; "
+"$$4,0#65092512416424580164828413186219:Toc3`.Heading3][i167;b50;a25;kKNA;~~~>.3917;* "
+"$$5,5#92291332474308709450111162202673:AppToc1`.AppHeading1][i333;kNA1;~~~>.3917;* "
+"$$6,15#61887903412252554674480251236992:AppToc2`.AppHeading2][i500;kNA11;~~~>.3917; "
+"$$7,7#03533551421653050355120437860335:AppToc3`.AppHeading3][i500;b100;a100;KN1;*4 "
+"$$8,0#94145093439740438411010082165944:Heading1][i500;b100;a50;kKN11;*+117 $$9,0#10901425421210535753260366156531:Heading2][i500;b100;a25;kKN111;* "
+"$$10,0#53209141402041366431858192225431:Heading3][i500;b100;a100;KNA;*4 $$11,8#32912651424211307887950041245434:AppHeading1][i500;b100;a50;kKNA1;*+117 "
+"$$12,8#51232055453458524230328032001901:AppHeading2][i500;b100;a25;kKNA11;* $$13,8#34108020439428305453439845463579:AppHeading3][b100;a50;k*4 "
+"$$14,0#49239115434362547028389207250014:Heading][b50;a25;k~~~>.3917;* $$15,15#40743698422276745552070108434023:Toc`.Heading][b100;a50;K~~~>.3917;*+117 "
+"$$16,16#15422850471211852294098111138263:Topics1][l167;b50;a50;K~~~>.3917;* $$17,17#35241722455500657380289596243808:Topics2][l333;~~~>.3917; "
+"$$18,18#31041344429742018840308064013200:Topics3][b83;a42;K* $$19,0#46440151113795363000000595230845:Paragraph][{_}%EN-US "
+"[s14;:Calc`$CarccosN: [%00-00 arccos (real number ][%00-00/ x][%00-00 ) ][%00-00S "
+"®][%00-00  real number]&][s0; Arccosine returns such an angle [S a] in the range "
+"[* `[0, ][*S p][* )] for which [* cos(][*/S a][* ) `= ][*/ x]. The angle is returned "
+"in radians. If the function argument lies outside the interval [* `[`-1,1`]], the "
+"computation is aborted with the error message real number operation error.&][s0; "
+"&][s0; [* Example]: arccos(`-0.5) `= 2.094395102&][s14;:Calc`$CarcsinN: [%00-00 arcsin "
+"(real number ]")
+TOPIC_TEXT(
+"[%00-00/ x][%00-00 ) ][%00-00S ®][%00-00  real number]&][s0; Arcsine returns such "
+"an angle [S a] in the range [* `[`-][*S p][*  / 2, ][*S p][*  / 2)] for which [* "
+"sin(][*/S a][* ) `= ][*/ x]. The angle is returned in radians. If the function argument "
+"lies outside the interval [* `[`-1,1`]], the computation is aborted with the error "
+"message real number operation error.&][s0; &][s0; [* Example]: arcsin(0.5) `= 0.5235987756&][s14;:Calc`$CarctgN: "
+"[%00-00 arctg (real number ][%00-00/ x][%00-00 ) ][%00-00S ®][%00-00  real number]&][s0; "
+"Arctangent returns such an angle [S a] in the range [* `[`-][*S p][*  / 2, ][*S p][* "
+" / 2)] for which [* tg(][*/ S a][* ) `= ][*/ x]. The calculated angle is returned "
+"in radians.&][s0; &][s0; [* Example]: arctg(10) `= 1.471127674&][s0; The array constructor "
+"creates an array containing the given sequence of elements.&][s0; &][s0; [* Example:] "
+"`[1`+2, 1`+3, `\"a`\" `+ `\"b`\"`] `= `[3, 4, `\"ab`\"`]&][s14;:Calc`$CcosN: [%00-00 "
+"cos (real number ][%00-00/S a][%00-00 ) ][%00-00S ®][%00-00  real number]&][s0; "
+"The function calculates the cosine of the angle [S a], i.e. the ratio of the length "
+"of the adjacent leg and the length of the hypotenuse in a right`-angled triangle "
+"with the leg angle [S a]. The input angle is assumed to be in radians, therefore "
+"the perigon equals 2[S p].&][s0; &][s0; [* Example]: cos(pi) `= `-1&][s14;:Calc`$Ce0: "
+"e [S ®] real number&][s0; Euler constant is the base of natural exponential and "
+"the natural logarithm. It equals approximately 2.718281828.&][s14;:Calc`$CexpN: [%00-00 "
+"exp (real number) ][%00-00S ®][%00-00  real number]&][s0; Natural exponential. The "
+"result of this function is the Euler number [* e] (viz str._93) raised to the power "
+"given by the argument of [* exp].&][s0; &][s0; [* Example]: exp(3.5) `= 33.11545196&][s14;:Calc`$ClnN: "
+"[%00-00 ln (real number ][%00-00/ x][%00-00 ) ][%00-00S ®][%00-00  real number]&][s0; "
+"Natural (hyperbolic) logarithm. The function will calculate the logarithm of the "
+"parameter [/ x] wi")
+TOPIC_TEXT(
+"th [* e] as its base, i.e. such real number [/ a] for which [*/ x][*  `= exp(][*/ "
+"a][* )].&][s0; &][s0; [* Example]: ln(100) `= 4.605170186&][s14;:Calc`$ClogN: [%00-00 "
+"log (real number ][%00-00/ x][%00-00 ) ][%00-00S ®][%00-00  real number]&][s0; Decadic "
+"logarithm. The function calculates the logarithm of the parameter [/ x] with 10 as "
+"its base, i.e. such [/ a] for which [*/ x][*  `= pow(10, ][*/ a][* )].&][s0; &][s0; "
+"[* Example]: log(1000) `= 3&][s14;:Calc`$Cpi0: pi [S ®] real number&][s0; Ludolf "
+"number [S p] represents half the circumference of the unit circle ([* l_`= 2][*S "
+"p][* r]).&][s14;:Calc`$CpowNN: [%00-00 pow (real number ][%00-00/ base][%00-00 , "
+"real number ][%00-00/ exponent][%00-00 ) ][%00-00S ®][%00-00  real number]&][s0; "
+"Real power function. If the exponent is an integer, the base of the power may be "
+"negative. Calling [* pow] with a negative or zero base and a non`-integal exponent "
+"aborts the computation with the error message [* real number computation error].&][s0; "
+"&][s0; [* Example]: pow(3, 4) `= 81&][s14;:Calc`$CsinN: [%00-00 sin (real number "
+"][%00-00/S a][%00-00 ) ][%00-00S ®][%00-00  real number]&][s0; The function calculates "
+"the sine of the angle [S a], i.e. the ratio of the length of the opposite leg and "
+"the length of the hypotenuse in a right`-angled triangle with the leg angle [S a]. "
+"The input angle is assumed to be in radians, therefore the perigon equals 2[S p].&][s0; "
+"&][s0; [* Example]: sin(3 `* pi / 2) `= `-1&][s14;:Calc`$CtgN: [%00-00 tg (real number "
+"][%00-00/S a][%00-00 ) ][%00-00S ®][%00-00  real number]&][s0; Tangent of an angle "
+"is the ratio of the length of the opposite leg and the length of the adjacent leg "
+"right`-angled triangle with the leg angle [S a]. The input angle is assumed to be "
+"in radians (the perigon equals 2[S p]).&][s0; &][s0; [* Example]: tg(pi / 4) `= 1&][s0; "
+"&][s0; The function returns the year number of its argument.&][s0; &][s0; [* Example]: "
+"rok(27.5.1984) `= 1984&][s0; &][s0; ]")
diff --git a/uppsrc/TCore/appdoc.tpp/all.i b/uppsrc/TCore/appdoc.tpp/all.i
new file mode 100644
index 000000000..e44f64fb3
--- /dev/null
+++ b/uppsrc/TCore/appdoc.tpp/all.i
@@ -0,0 +1,63 @@
+TOPIC("CalcNode$cs-cz")
+#include "CalcNode$cs-cz.tpp"
+END_TOPIC
+
+TOPIC("CalcNode$en-us")
+#include "CalcNode$en-us.tpp"
+END_TOPIC
+
+TOPIC("CalcArith$cs-cz")
+#include "CalcArith$cs-cz.tpp"
+END_TOPIC
+
+TOPIC("CalcArray$cs-cz")
+#include "CalcArray$cs-cz.tpp"
+END_TOPIC
+
+TOPIC("CalcTrans$cs-cz")
+#include "CalcTrans$cs-cz.tpp"
+END_TOPIC
+
+TOPIC("CalcText$cs-cz")
+#include "CalcText$cs-cz.tpp"
+END_TOPIC
+
+TOPIC("CalcDate$cs-cz")
+#include "CalcDate$cs-cz.tpp"
+END_TOPIC
+
+TOPIC("CalcLog$cs-cz")
+#include "CalcLog$cs-cz.tpp"
+END_TOPIC
+
+TOPIC("CalcSys$cs-cz")
+#include "CalcSys$cs-cz.tpp"
+END_TOPIC
+
+TOPIC("CalcArith$en-us")
+#include "CalcArith$en-us.tpp"
+END_TOPIC
+
+TOPIC("CalcArray$en-us")
+#include "CalcArray$en-us.tpp"
+END_TOPIC
+
+TOPIC("CalcDate$en-us")
+#include "CalcDate$en-us.tpp"
+END_TOPIC
+
+TOPIC("CalcLog$en-us")
+#include "CalcLog$en-us.tpp"
+END_TOPIC
+
+TOPIC("CalcSys$en-us")
+#include "CalcSys$en-us.tpp"
+END_TOPIC
+
+TOPIC("CalcText$en-us")
+#include "CalcText$en-us.tpp"
+END_TOPIC
+
+TOPIC("CalcTrans$en-us")
+#include "CalcTrans$en-us.tpp"
+END_TOPIC
diff --git a/uppsrc/TCore/atexit.cpp b/uppsrc/TCore/atexit.cpp
new file mode 100644
index 000000000..e13bdf66b
--- /dev/null
+++ b/uppsrc/TCore/atexit.cpp
@@ -0,0 +1,82 @@
+#include "TCore.h"
+
+#ifdef PLATFORM_WIN32
+#if defined(COMPILER_MSC6) && !defined(flagSO)
+
+typedef void (__cdecl *_PVFV)(void);
+//typedef int  (__cdecl * _onexit_t)(void);
+
+extern "C" _PVFV *__onexitbegin;
+extern "C" _PVFV *__onexitend;
+
+enum { BLOCKSIZE = 1022 };
+
+struct OnExitBlock
+{
+	int          count;
+	OnExitBlock *prev_block;
+	_PVFV        pointers[BLOCKSIZE];
+};
+
+static OnExitBlock *onexitlist = NULL;
+static bool         lockexit = false;
+
+inline static OnExitBlock *AtExitAlloc()
+{
+	return (OnExitBlock *)GlobalAlloc(GMEM_FIXED, sizeof(OnExitBlock));
+}
+
+inline static void AtExitFree(OnExitBlock *block)
+{
+	GlobalFree((HGLOBAL)block);
+}
+
+static void __cdecl AtExitDestroy()
+{
+//	ASSERT(lockexit);
+#ifdef _DEBUG
+	int total = 0;
+	for(OnExitBlock *p = onexitlist; p; p = p -> prev_block)
+		total += p -> count;
+	LOG("AtExitDestroy: " << total << " atexit functions");
+#endif//_DEBUG
+	while(onexitlist)
+	{
+		while(onexitlist -> count > 0)
+			onexitlist -> pointers[--onexitlist -> count]();
+		OnExitBlock *prev = onexitlist -> prev_block;
+		AtExitFree(onexitlist);
+		onexitlist = prev;
+	}
+}
+
+void lockatexit()
+{
+	lockexit = true;
+}
+
+extern "C" int __cdecl atexit(_PVFV func)
+{
+	if(!func)
+		return 0; // silently ignore NULL pointers
+	ASSERT(!lockexit);
+	if(!onexitlist || onexitlist -> count >= BLOCKSIZE)
+	{
+		if(!onexitlist)
+		{
+			ASSERT(__onexitbegin == NULL);
+			static _PVFV exitlist[1] = { &AtExitDestroy };
+			__onexitend = (__onexitbegin = exitlist) + 1;
+		}
+		OnExitBlock *new_block = AtExitAlloc();
+		ASSERT(new_block);
+		new_block -> count = 0;
+		new_block -> prev_block = onexitlist;
+		onexitlist = new_block;
+	}
+	onexitlist -> pointers[onexitlist -> count++] = func;
+	return 0;
+}
+
+#endif
+#endif
diff --git a/uppsrc/TCore/database.cpp b/uppsrc/TCore/database.cpp
new file mode 100644
index 000000000..fb7a8a232
--- /dev/null
+++ b/uppsrc/TCore/database.cpp
@@ -0,0 +1,2895 @@
+#include "TCoreDb.h"
+#pragma hdrstop
+
+NAMESPACE_UPP
+
+static String Format(const Vector<Value>& values)
+{
+	String s;
+	if(!values.IsEmpty()) {
+		s << StdFormat(values[0]);
+		for(int i = 1; i < values.GetCount(); i++)
+			s << ", " << StdFormat(values[i]);
+	}
+	return s;
+}
+
+DataClient::DataClient()
+: datafile(0)
+, master_index(-1)
+, cache_size(DEFAULT_CACHE_SIZE)
+{
+}
+
+DataClient::~DataClient()
+{
+}
+
+void DataClient::Serialize(Stream& stream)
+{
+	NEVER();
+}
+
+void DataClient::FlushMaster()
+{
+	datafile->Set(master_index, SerializeOut(*this), id);
+	master_dirty = false;
+}
+
+void DataClient::StreamMaster(Stream& stream, DataFile& df, dfid_t _id)
+{
+	if(!IsOpen() && stream.IsStoring())
+		Create(df, _id);
+	int master = master_index;
+	stream % master;
+	if(stream.IsLoading())
+		Open(df, master, _id);
+}
+
+void DataClient::Open(DataFile& _datafile, int _index, dfid_t _id)
+{
+	Close();
+	datafile = &_datafile;
+	id = _id;
+	commit_index = master_index = _index;
+	master_dirty = false;
+	DoOpen();
+}
+
+int DataClient::Create(DataFile& _datafile, dfid_t _id)
+{
+	Close();
+	datafile = &_datafile;
+	id = _id;
+	master_index = datafile->Add(id);
+	commit_index = -1;
+	master_dirty = true;
+	DoCreate();
+	return master_index;
+}
+
+void DataClient::Close()
+{
+	DoClose();
+	datafile = 0;
+	master_index = -1;
+}
+
+void DataClient::Unlink()
+{
+	LOG("DataClient::Unlink(" << master_index << ")");
+	datafile->Remove(master_index, id);
+	commit_index = -1;
+	Close();
+}
+
+void DataClient::DoOpen()
+{
+	SerializeIn(*this, datafile->Get(master_index));
+}
+
+void DataClient::DoCreate()
+{
+	FlushMaster();
+}
+
+void DataClient::DoClose()
+{
+}
+
+int DataClient::GetUsedCacheSize() const
+{
+	return 0;
+}
+
+void DataClient::ShrinkCache()
+{
+}
+
+void DataClient::Rollback()
+{
+	DataFile *df = datafile;
+	CDB_ASSERT(df);
+	Close();
+	if(commit_index >= 0)
+		Open(*df, commit_index, id);
+	else
+		Create(*df, id);
+}
+
+void DataClient::SetCacheSize(int size)
+{
+	cache_size = size;
+}
+
+void DataClient::GetIndex(int *dest, int count, Stream& src)
+{
+#ifdef CPU_LITTLE_ENDIAN
+	if(sizeof(int) == INDEX_BYTES)
+		src.Get(dest, count * INDEX_BYTES);
+	else
+#endif
+		for(int i = 0; i < count; i++)
+			*dest++ = src.GetIL();
+}
+
+void DataClient::SetIndex(Stream& dest, const int *src, int count)
+{
+#ifdef CPU_LITTLE_ENDIAN
+	if(sizeof(int) == INDEX_BYTES)
+		dest.Put(src, count * INDEX_BYTES);
+	else
+#endif
+		for(int i = 0; i < count; i++)
+			dest.PutIL(*src++);
+}
+
+DataColumn::DataColumn()
+: row_count(0)
+{
+}
+
+DataColumn::~DataColumn()
+{
+}
+
+DataColumnFix::DataColumnFix(int item_width)
+: item_width(item_width)
+, per_block(DataFile::BLOCK_BYTES / item_width)
+{
+	CDB_ASSERT(per_block > 0);
+	DoClose(); // tidy up
+}
+
+DataColumnFix::~DataColumnFix()
+{
+	Close();
+}
+
+void DataColumnFix::Unlink()
+{
+	for(int i = 0; i < block_index.GetCount(); i++)
+		datafile->Remove(block_index[i], id);
+	DataColumn::Unlink();
+}
+
+void DataColumnFix::Serialize(Stream& stream)
+{
+	if(stream.IsLoading()) {
+		if(stream.GetLeft() < INDEX_BYTES)
+			throw ObjectExc(NFormat("Poru�en� konzistence datab�ze (DataColumnFix#%d)", master_index));
+		row_count = stream.GetIL();
+		block_index.SetCount((int)stream.GetLeft() >> LOG2_INDEX_BYTES);
+		GetIndex(block_index, stream);
+	}
+	else {
+		stream.PutIL(row_count);
+		SetIndex(stream, block_index);
+	}
+}
+
+void DataColumnFix::DoClose()
+{
+	block_index.Clear();
+	cache.Clear();
+	last_block = last_block1 = last_block2 = last_block3 = 0;
+	last_index = last_index1 = last_index2 = last_index3 = -1;
+}
+
+void DataColumnFix::Commit()
+{
+	FlushCache();
+	if(master_dirty)
+		FlushMaster();
+}
+
+int DataColumnFix::GetUsedCacheSize() const
+{
+	return cache.GetCount() * sizeof(Block);
+}
+
+void DataColumnFix::ShrinkCache()
+{
+	ClearCache();
+}
+
+void DataColumnFix::ClearCache()
+{
+	FlushCache();
+	cache.Clear();
+	last_block = last_block1 = last_block2 = last_block3 = 0;
+	last_index = last_index1 = last_index2 = last_index3 = -1;
+}
+
+void DataColumnFix::FlushCache()
+{
+	RHITCOUNT("DataColumnFix::FlushCache");
+
+	if(row_count == 0)
+		return;
+	int top = block_index.GetCount() - 1, last = (row_count - top * per_block) * item_width;
+	int norm = per_block * item_width;
+	for(int i = 0; i < cache.GetCount(); i++)
+		if(cache.GetKey(i) <= top && cache[i].dirty) {
+			datafile->Set(cache[i].index, String(cache[i].buffer,
+				cache.GetKey(i) < top ? norm : last), id);
+			cache[i].dirty = false;
+		}
+}
+
+void DataColumnFix::FetchCache(int block)
+{
+	RHITCOUNT("DataColumnFix::FetchCache");
+
+	if(block == last_index) return;
+	if(block == last_index1) { last_index = last_index1; last_block = last_block1; return; }
+	if(block == last_index2) { last_index = last_index2; last_block = last_block2; return; }
+	if(block == last_index3) { last_index = last_index3; last_block = last_block3; return; }
+	RHITCOUNT("DataColumnFix::FetchCache / seek");
+	if((last_index = cache.Find(block)) >= 0) {
+		last_block = &cache[last_index];
+		last_index = block;
+	}
+	else {
+		RHITCOUNT("DataColumnFix::FetchCache / load");
+		if((cache.GetCount() + 1) * sizeof(Block) >= (unsigned)cache_size)
+			ClearCache();
+		last_index = block;
+		last_block = &cache.Add(block);
+		last_block->dirty = false;
+		String object = datafile->Get(last_block->index = block_index[block]);
+		memcpy(last_block->buffer, object, object.GetLength());
+	}
+	last_index3 = last_index2;
+	last_block3 = last_block2;
+	last_index2 = last_index1;
+	last_block2 = last_block1;
+	last_index1 = last_index;
+	last_block1 = last_block;
+
+/*
+	if(last_index < 0 || block != cache.GetKey(last_index))
+		RHITCOUNT("DataColumnFix::FetchCache / seek");
+		if((last_index = cache.Find(block)) >= 0)
+			last_block = &cache[last_index];
+		else { // spoiled everything
+			RHITCOUNT("DataColumnFix::FetchCache / load");
+			if((cache.GetCount() + 1) * sizeof(Block) >= (unsigned)cache_size)
+				FlushCache();
+			last_index = cache.GetCount();
+			last_block = &cache.Add(block);
+			last_block->dirty = false;
+			String object = datafile->Get(last_block->index = block_index[block]);
+			memcpy(last_block->buffer, object, object.GetLength());
+		}
+*/
+}
+
+const byte *DataColumnFix::GetRaw(int index)
+{
+//	RTIMING("DataColumnFix::GetRaw");
+	RHITCOUNT("DataColumnFix::GetRaw");
+
+	CDB_ASSERT(index >= 0 && index < row_count);
+	FetchCache(index / per_block);
+	return last_block->buffer + item_width * (index % per_block);
+}
+
+void DataColumnFix::SetRaw(int index, const void *value)
+{
+	CDB_ASSERT(index >= 0);
+	CDB_ASSERT(!datafile->IsReadOnly());
+	if(index >= row_count)
+		SetCount(index + ADD_STEP);
+	FetchCache(index / per_block);
+	memcpy(last_block->buffer + item_width * (index % per_block), value, item_width);
+	master_dirty = last_block->dirty = true;
+}
+
+void DataColumnFix::SetCount(int count)
+{
+	CDB_ASSERT(count >= 0);
+	CDB_ASSERT(!datafile->IsReadOnly());
+	if(count == row_count)
+		return;
+	master_dirty = true;
+	int blocks = count > 0 ? (count - 1) / per_block + 1 : 0;
+	if(blocks < block_index.GetCount()) { // clean up cache
+		while(block_index.GetCount() > blocks) {
+			int n = block_index.Pop();
+			datafile->Remove(n, id);
+		}
+		for(int i = cache.GetCount(); --i >= 0;)
+			if(cache.GetKey(i) >= blocks)
+				cache.Remove(i);
+	}
+	else if(blocks > block_index.GetCount()) { // allocate more blocks
+		while(block_index.GetCount() < blocks) {
+			int n = datafile->Add(id);
+			block_index.Add(n);
+			datafile->Set(n, Null, id);
+		}
+	}
+	row_count = count;
+}
+
+DataColumnVar::DataColumnVar()
+{
+	DoClose();
+}
+
+DataColumnVar::~DataColumnVar()
+{
+}
+
+void DataColumnVar::Unlink()
+{
+	for(int i = 0; i < block_index.GetCount(); i++)
+		datafile->Remove(block_index[i], id);
+	DataColumn::Unlink();
+}
+
+void DataColumnVar::Commit()
+{
+	FlushCache();
+	if(master_dirty)
+		FlushMaster();
+}
+
+int DataColumnVar::GetUsedCacheSize() const
+{
+	return current_size;
+}
+
+void DataColumnVar::ShrinkCache()
+{
+	ClearCache();
+}
+
+void DataColumnVar::SetCount(int count)
+{
+	CHECK_CACHE();
+
+	CDB_ASSERT(count >= 0);
+	CDB_ASSERT(!datafile->IsReadOnly());
+
+	if(count == row_count)
+		return;
+	last_index = -1;
+	master_dirty = true;
+	if(count == 0) { // clear all
+		row_count = 0;
+		while(!block_index.IsEmpty())
+			datafile->Remove(block_index.Pop(), id);
+		index_index.SetCount(1);
+		index_index[0] = 0;
+		cache.Clear();
+		cache_index.Clear();
+		return;
+	}
+	if(count < row_count) { // trim existing blocks
+		int pos = FindBlock(count - 1);
+		for(int i = cache.GetCount(); --i >= 0;)
+			if(cache_index[i] > pos) {
+				current_size -= cache[i].total;
+				cache_index.Remove(i);
+				cache.Remove(i);
+			}
+
+		block_index.SetCount(pos + 1);
+		index_index.SetCount(pos + 2);
+		row_count = index_index.Top();
+		if(count < row_count) { // trim last block
+			int cp = FetchCache(pos);
+			int start = index_index[pos];
+			int span = index_index[pos + 1] - start;
+			FlushCache(cp, count - start);
+		}
+	}
+	else { // expand index
+		int c = block_index.GetCount();
+		int span;
+		if(c && GetDataLength(c - 1) + SHORT_BYTES
+			* (span = index_index[c] - index_index[c - 1]) < INIT_BYTES - SHORT_BYTES) { // add some to last entry
+			if(span == 1) { // convert singleton to multiblock
+				String data = GetRaw(row_count - 1);
+				int to_add = (INIT_BYTES - data.GetLength() - 2 * SHORT_BYTES) / SHORT_BYTES;
+				to_add = minmax(to_add, 1, count - row_count);
+				Block& block = cache.Add();
+				cache_index.Add(c - 1);
+				block.total = 3 * SHORT_BYTES + SHORT_BYTES * to_add + data.GetLength();
+				CDB_ASSERT(block.total >= 4 * SHORT_BYTES && block.total <= MAX_BYTES);
+				StringBuffer blockbuf(block.total);
+				memcpy(blockbuf, block.buffer, min(block.buffer.GetLength(), block.total));
+				char *p = blockbuf;
+				Poke16le(p, data.GetLength() + SHORT_BYTES);
+				memcpy(p += SHORT_BYTES, data, data.GetLength());
+				Poke16le(p += data.GetLength(), SHORT_BYTES);
+				block.offsets = SHORT_BYTES + data.GetLength();
+				for(int i = 0; i <= to_add; i++)
+					Poke16le(p += SHORT_BYTES, block.offsets);
+				block.buffer = blockbuf;
+				current_size += block.total;
+				row_count += to_add;
+				block.raw_dirty = true;
+			}
+			else { // add to normal block
+				Block& block = cache[FetchCache(c - 1)];
+				current_size -= block.total;
+				int to_add = (INIT_BYTES - block.total) / SHORT_BYTES;
+				to_add = minmax(to_add, 1, count - row_count);
+				block.total += to_add * SHORT_BYTES;
+				int old_total = block.offsets + (span + to_add + 1) * SHORT_BYTES;
+				CDB_ASSERT(old_total >= 3 * SHORT_BYTES && old_total <= MAX_BYTES);
+				StringBuffer blockbuf(old_total);
+				memcpy(blockbuf, block.buffer, min(block.buffer.GetLength(), old_total));
+				char *p = ~blockbuf + block.offsets + SHORT_BYTES * span;
+				for(int i = 0; i < to_add; i++)
+					Poke16le(p += SHORT_BYTES, block.offsets);
+				block.buffer = blockbuf;
+				block.raw_dirty = true;
+				current_size += block.total;
+				row_count += to_add;
+			}
+			index_index.Top() = row_count;
+			CHECK_BLOCK(cache[FetchCache(c - 1)], c - 1);
+		}
+		while(row_count < count) {
+			int batch = min(count - row_count, INIT_BYTES / SHORT_BYTES);
+			block_index.Add(datafile->Add(id));
+			if(batch > 1) {
+				Block& block = cache.Add();
+				cache_index.Add(block_index.GetCount() - 1);
+				block.total = SHORT_BYTES * (batch + 2);
+				CDB_ASSERT(block.total >= 3 * SHORT_BYTES && block.total <= MAX_BYTES);
+				StringBuffer blockbuf(block.total);
+				memcpy(blockbuf, block.buffer, min(block.buffer.GetLength(), block.total));
+				char *p = blockbuf;
+				Poke16le(p, block.offsets = SHORT_BYTES);
+				for(int i = 0; i <= batch; i++)
+					Poke16le(p += SHORT_BYTES, SHORT_BYTES);
+				block.buffer = blockbuf;
+				block.raw_dirty = true;
+				current_size += block.total;
+			}
+			else
+				datafile->Set(block_index.Top(), Null, id);
+			row_count += batch;
+			index_index.Add(row_count);
+			if(current_size >= cache_size)
+				ClearCache();
+			int c = block_index.GetCount() - 1;
+#ifdef CDB_DEBUG
+			if(index_index[c + 1] - index_index[c] > 1)
+				CheckBlock(cache[FetchCache(c)], c);
+#endif
+		}
+	}
+
+	CHECK_CACHE();
+}
+
+void DataColumnVar::Serialize(Stream& stream)
+{
+	if(stream.IsLoading()) {
+		if(stream.GetLeft() < INDEX_BYTES)
+			throw ObjectExc(NFormat("Poru�en� konzistence datab�ze (DataColumnVar#%d)", master_index));
+		row_count = stream.GetIL();
+		int block_count = (int)stream.GetLeft() / (2 * INDEX_BYTES);
+		block_index.SetCount(block_count);
+		index_index.SetCount(block_count + 1);
+		GetIndex(block_index, stream);
+		GetIndex(index_index.Begin(), block_count, stream);
+		index_index.Top() = row_count;
+	}
+	else {
+		if(index_index.IsEmpty())
+			index_index.Add(0);
+		stream.PutIL(row_count);
+		SetIndex(stream, block_index);
+		SetIndex(stream, index_index.Begin(), block_index.GetCount());
+	}
+}
+
+void DataColumnVar::DoClose()
+{
+	index_index.Clear();
+	block_index.Clear();
+	cache.Clear();
+	cache_index.Clear();
+	last_index = -1;
+	current_size = 0;
+}
+
+int DataColumnVar::FindBlock(int index) const
+{
+	CDB_ASSERT(index >= 0 && index < row_count);
+	return BinFindIndex(index_index.Begin() + 1, index_index.End(), index + 1, StdLess<int>());
+}
+
+String DataColumnVar::GetRaw(int index)
+{
+//	RTIMING("DataColumnVar::GetRaw");
+
+	if(current_size >= cache_size)
+		ClearCache();
+	CDB_ASSERT(index >= 0 && index < row_count);
+	AdjustLastIndex(index);
+	if(index_index[last_index + 1] - index_index[last_index] == 1) // singleton
+		return datafile->Get(block_index[last_index]);
+	int pos = cache_index.Find(last_index);
+	if(pos < 0)
+		pos = FetchCache(last_index);
+	const Block& block = cache[pos];
+	pos = block.dirty.Find(index);
+	if(pos >= 0)
+		return block.dirty[pos];
+	index -= index_index[last_index];
+	const char *p = block.buffer.Begin() + block.offsets + SHORT_BYTES * index;
+	int offset = Peek16le(p);
+	return String(block.buffer.Begin() + offset, Peek16le(p + SHORT_BYTES) - offset);
+}
+
+void DataColumnVar::SetRaw(int index, String value)
+{
+	CDB_ASSERT(index >= 0);
+	CDB_ASSERT(!datafile->IsReadOnly());
+
+	if(index >= row_count)
+		SetCount(index + ADD_STEP);
+	if(current_size >= cache_size)
+		ClearCache();
+	AdjustLastIndex(index);
+	CDB_ASSERT(index >= index_index[last_index] && index < index_index[last_index + 1]);
+	const int *px = &index_index[last_index];
+	if(px[1] - px[0] == 1) { // singleton
+		if(value.GetLength() < JOIN_BYTES && CanJoin(last_index, value.GetLength())) {
+			char buffer[DataFile::BLOCK_BYTES];
+			int offset = SHORT_BYTES;
+			memcpy(buffer + offset, value, value.GetLength());
+			offset += value.GetLength() + GetDataLength(last_index + 1);
+			Poke16le(buffer + offset, SHORT_BYTES);
+			Poke16le(buffer + offset + SHORT_BYTES, SHORT_BYTES + value.GetLength());
+			JoinBlock(last_index, buffer, offset, 1);
+			if(current_size >= cache_size)
+				ClearCache();
+			return;
+		}
+		else
+			datafile->Set(block_index[last_index], value, id);
+		return;
+	}
+
+	int pos = cache_index.Find(last_index);
+	if(pos < 0)
+		pos = FetchCache(last_index);
+
+	Block& block = cache[pos];
+	CHECK_BLOCK(block, last_index);
+	pos = block.dirty.Find(index);
+	if(pos >= 0) {
+		int delta = value.GetLength() - block.dirty[pos].GetLength();
+		current_size += delta;
+		block.total += delta;
+		CDB_ASSERT(block.total >= 3 * SHORT_BYTES);
+		block.dirty[pos] = value;
+	}
+	else {
+		int dx = (index - index_index[last_index]) * SHORT_BYTES + block.offsets;
+		int delta = value.GetLength() - (Peek16le(block.buffer.Begin() + dx + SHORT_BYTES)
+			- Peek16le(block.buffer.Begin() + dx));
+		current_size += delta;
+		block.total += delta;
+		CDB_ASSERT(block.total >= 3 * SHORT_BYTES);
+		block.dirty.Add(index, value);
+	}
+	if(current_size >= cache_size)
+		ClearCache();
+}
+
+void DataColumnVar::FlushCache()
+{
+	for(int i = cache.GetCount(); --i >= 0;)
+		if(i < cache.GetCount() && (cache[i].raw_dirty || !cache[i].dirty.IsEmpty()))
+			FlushCache(i);
+}
+
+void DataColumnVar::FlushCache(int i, int set_span)
+{
+	CHECK_CACHE();
+
+	int index = cache_index[i];
+	Block& block = cache[i];
+	CHECK_BLOCK(block, index);
+	char buffer[MAX_BYTES];
+	int range = index_index[index];
+	int span = index_index[index + 1] - index_index[index];
+	if(set_span < 0)
+		set_span = span;
+	CDB_ASSERT(set_span <= span);
+	current_size -= block.total;
+
+	if(block.total <= MAX_BYTES && set_span == span) { // keep block together
+		int offset = SHORT_BYTES + GetDataLength(index);
+		CDB_ASSERT(offset >= SHORT_BYTES && offset <= MAX_BYTES);
+		if(CanJoin(index, block.total)) {
+			offset += GetDataLength(index + 1);
+			Poke16le(buffer + offset, SHORT_BYTES);
+			int count = AddBlock(index, buffer, offset, 0);
+			JoinBlock(index, buffer, offset, count);
+		}
+		else {
+			Poke16le(buffer, offset);
+			Poke16le(buffer + offset, SHORT_BYTES);
+			int count = AddBlock(index, buffer, offset, 0);
+			CDB_ASSERT(offset + (count + 1) * SHORT_BYTES <= MAX_BYTES);
+			datafile->Set(block_index[index], String(buffer, offset + (count + 1) * SHORT_BYTES), id);
+			CDB_ASSERT(datafile->GetLength(block_index[index]) >= SHORT_BYTES * (count + 2));
+		}
+	}
+	else { // split block
+		Vector<int> order = GetSortOrder(block.dirty.GetKeys(), StdLess<int>());
+		Buffer<const char *> data(span);
+		Buffer<int>          length(span);
+		Buffer<String>       string(span);
+ { // generate data offsets & lengths
+			int ox = 0, nx = (ox < order.GetCount() ? block.dirty.GetKey(order[ox]) - range : span);
+			for(int i = 0; i < set_span; i++)
+				if(i == nx) { // dirty block
+					String s = block.dirty[order[ox]];
+					string[i] = s;
+					data[i] = string[i];
+					length[i] = s.GetLength();
+					nx = (++ox < order.GetCount() ? block.dirty.GetKey(order[ox]) - range : span);
+				}
+				else { // normal block
+					const char *p = block.buffer.Begin() + block.offsets + i * SHORT_BYTES;
+					int off = Peek16le(p);
+					CDB_ASSERT(off >= SHORT_BYTES && off < block.buffer.GetLength());
+					length[i] = Peek16le(p + SHORT_BYTES) - off;
+					data[i] = block.buffer.Begin() + off;
+				}
+		}
+
+		Vector<int> block_insert, index_insert;
+
+		{ // split data into blocks
+			int next_block = block_index[index];
+			int i = 0;
+			while(i < set_span) {
+				if(next_block < 0)
+					index_insert.Add(i + range);
+				int old = i;
+				int dtotal = SHORT_BYTES, avail = INIT_BYTES - SHORT_BYTES;
+				do {
+					avail -= length[i] + SHORT_BYTES;
+					dtotal += length[i];
+				}
+				while((i++ != old || dtotal < SINGLE_BYTES)
+					&& i < set_span && avail - length[i] >= SHORT_BYTES);
+				int subspan = i - old;
+				String s;
+				CDB_ASSERT(span > 0);
+				if(subspan == 1) { // singleton
+					s = string[old];
+					if(s.IsEmpty())
+						s = String(data[old], length[old]);
+				}
+				else { // create compound block
+					char *p = buffer + dtotal;
+					int sum = SHORT_BYTES * (subspan + 1) + dtotal;
+					int offset = SHORT_BYTES;
+					Poke16le(buffer, dtotal);
+					Poke16le(p, SHORT_BYTES);
+					while(old < i) {
+						int len = length[old];
+						memcpy(buffer + offset, data[old], len);
+						offset += len;
+						Poke16le(p += 2, offset);
+						old++;
+					}
+					s = String(buffer, sum);
+				}
+				if(next_block < 0) {
+					next_block = datafile->Add(id);
+					block_insert.Add(next_block);
+				}
+				datafile->Set(next_block, s, id);
+				CDB_ASSERT(subspan == 1 || datafile->GetLength(next_block) >= SHORT_BYTES * subspan);
+				next_block = -1;
+			}
+		}
+
+		int delta = block_insert.GetCount();
+
+		{ // relocate index entries
+			for(int i = 0; i < cache.GetCount(); i++)
+				if(cache_index[i] > index)
+					cache_index.Set(i, cache_index[i] + delta);
+		}
+
+		// insert items into master index
+		block_index.Insert(index + 1, block_insert);
+		index_index.Insert(index + 1, index_insert);
+		master_dirty = true;
+		last_index = -1;
+	}
+
+	if((i = cache_index.Find(index)) >= 0) {
+		cache_index.Remove(i);
+		cache.Remove(i);
+	}
+
+	CHECK_CACHE();
+}
+
+void DataColumnVar::ClearCache()
+{
+	FlushCache();
+	cache.Clear();
+	cache_index.Clear();
+	current_size = 0;
+}
+
+int DataColumnVar::FetchCache(int block)
+{
+	int i = cache_index.Find(block);
+	if(i >= 0)
+		return i;
+	cache_index.Add(block);
+	Block& new_block = cache.Add();
+//	datafile->CheckIntegrity();
+	new_block.buffer = datafile->Get(block_index[block]);
+	new_block.offsets = Peek16le(new_block.buffer);
+	CDB_ASSERT(new_block.offsets >= SHORT_BYTES && new_block.offsets < new_block.buffer.GetLength());
+	new_block.total = new_block.buffer.GetLength();
+	new_block.raw_dirty = false;
+	CHECK_BLOCK(new_block, block);
+	current_size += new_block.total;
+	CHECK_CACHE();
+	return cache.GetCount() - 1;
+}
+
+bool DataColumnVar::CanJoin(int index, int length) const
+{
+	CDB_ASSERT(index >= 0);
+	if(length > JOIN_BYTES || ++index >= block_index.GetCount())
+		return false;
+	int pos = cache_index.Find(index);
+	int len2 = (pos >= 0 ? cache[pos].total : datafile->GetLength(block_index[index]));
+	if(len2 + length >= INIT_BYTES)
+		return false;
+	if(index_index[index + 1] - index_index[index] == 1 && len2 >= SINGLE_BYTES)
+		return false;
+	return true;
+}
+
+int DataColumnVar::GetDataLength(int index) const
+{
+	CDB_ASSERT(index >= 0 && index < block_index.GetCount());
+	int count = index_index[index + 1] - index_index[index];
+	int pos = cache_index.Find(index);
+	int len = (pos >= 0 ? cache[pos].total : datafile->GetLength(block_index[index]));
+	len -= (count > 1 ? SHORT_BYTES * (count + 2) : 0);
+	CDB_ASSERT(len >= 0);
+	return len;
+}
+
+void DataColumnVar::JoinBlock(int index, char *buffer, int offset, int count)
+{
+	CDB_ASSERT(index >= 0 && index + 1 < block_index.GetCount());
+	Poke16le(buffer, offset);
+	count = AddBlock(index + 1, buffer, offset, count);
+	datafile->Set(block_index[index], String(buffer, offset + (count + 1) * SHORT_BYTES), id);
+	CDB_ASSERT(datafile->GetLength(block_index[index]) >= SHORT_BYTES * (count + 2));
+
+	CHECK_CACHE();
+
+	// update indexes
+	block_index.Remove(++index);
+	index_index.Remove(index);
+	master_dirty = true;
+	last_index = -1;
+	for(int i = cache_index.GetCount(); --i >= 0;)
+		if(cache_index[i] > index)
+			cache_index.Set(i, cache_index[i] - 1);
+		else if((unsigned)(index - cache_index[i]) <= 1u) { // remove both original block & join block
+			cache_index.Remove(i);
+			cache.Remove(i);
+		}
+
+	CHECK_CACHE();
+}
+
+int DataColumnVar::AddBlock(int index, char *buffer, int offset, int count)
+{
+	CDB_ASSERT(index >= 0 && index < block_index.GetCount());
+	CDB_ASSERT(offset >= SHORT_BYTES && offset <= MAX_BYTES);
+	CDB_ASSERT(count >= 0 && count < MAX_BYTES);
+
+	int pos_pos = offset + count * SHORT_BYTES;
+	int data_offset = Peek16le(buffer + pos_pos);
+	int start = index_index[index];
+	int span = index_index[index + 1] - start;
+	int cpos;
+	if(span == 1) { // singleton
+		String singleton = datafile->Get(block_index[index]);
+		memcpy(buffer + data_offset, singleton, singleton.GetLength());
+		CDB_ASSERT(data_offset + singleton.GetLength() == offset);
+		Poke16le(buffer + pos_pos + SHORT_BYTES, offset);
+	}
+	else if((cpos = cache_index.Find(index)) < 0) { // non-cached item
+		String item = datafile->Get(block_index[index]);
+		int poff = Peek16le(item);
+		memcpy(buffer + data_offset, item.Begin() + SHORT_BYTES, poff - SHORT_BYTES);
+		const char *src = item.Begin() + poff;
+		char *dest = buffer + pos_pos;
+		int delta = data_offset - SHORT_BYTES;
+		for(int i = 0; i < span; i++)
+			Poke16le(dest += SHORT_BYTES, delta + Peek16le(src += SHORT_BYTES));
+	}
+	else { // cached item
+		const Block& block = cache[cpos];
+		Vector<int> order = GetSortOrder(block.dirty.GetKeys(), StdLess<int>());
+		char *dest = buffer + pos_pos;
+		for(int op = 0, x = 0; x < span;) {
+			int n = (op >= order.GetCount() ? span : block.dirty.GetKey(order[op]) - start);
+			int c = n - x;
+			if(c > 0) { // unchanged part
+				const char *src = block.buffer.Begin() + block.offsets + SHORT_BYTES * x;
+				int start = Peek16le(src);
+				CDB_ASSERT(start >= SHORT_BYTES && start < block.buffer.GetLength());
+				int part = Peek16le(src + SHORT_BYTES * c) - start;
+				int delta = data_offset - start;
+				memcpy(buffer + data_offset, block.buffer.Begin() + start, part);
+				for(int i = x; i < n; i++)
+					Poke16le(dest += SHORT_BYTES, delta + Peek16le(src += SHORT_BYTES));
+				data_offset += part;
+				x = n;
+			}
+			while(x < span && op < order.GetCount() && block.dirty.GetKey(order[op]) == x + start) { // add dirty string
+				const String& s = block.dirty[order[op++]];
+				memcpy(buffer + data_offset, s, s.GetLength());
+				Poke16le(dest += SHORT_BYTES, data_offset += s.GetLength());
+				x++;
+			}
+		}
+	}
+	return count + span;
+}
+
+void DataColumnVar::CheckBlock(const Block& blk, int index) const
+{
+	int blk_span = (blk.buffer.GetLength() - Peek16le(blk.buffer.Begin())) / SHORT_BYTES - 1;
+	int ind_span = index_index[index + 1] - index_index[index];
+	CDB_ASSERT(blk_span == ind_span);
+}
+
+void DataColumnVar::CheckCache() const
+{
+	for(int i = 0; i < cache.GetCount(); i++)
+		CheckBlock(cache[i], cache_index[i]);
+}
+
+int DataRowIndex::Block::FindIndex(int offset) const
+{
+	return BinFindIndex(data, offset, StdLess<int>()) & ~1;
+}
+
+DataRowIndex::DataRowIndex()
+{
+	DoClose();
+}
+
+void DataRowIndex::Unlink()
+{
+	for(int i = 0; i < block_index.GetCount(); i++)
+		datafile->Remove(block_index[i], id);
+	DataClient::Unlink();
+}
+
+void DataRowIndex::Commit()
+{
+	FlushCache();
+	if(master_dirty)
+		FlushMaster();
+}
+
+int DataRowIndex::GetUsedCacheSize() const
+{
+	return current_size;
+}
+
+void DataRowIndex::ShrinkCache()
+{
+	ClearCache();
+}
+
+int DataRowIndex::Add()
+{
+	return Add(1)[0];
+}
+
+Vector<int> DataRowIndex::Add(int count)
+{
+	Vector<int> items;
+	if(collapsed) {
+		items.SetCount(count);
+		for(int i = 0; i < count; i++)
+			items[i] = exact_count++;
+		first_empty = end_index = exact_count;
+		master_dirty = true;
+		return items;
+	}
+
+	for(int bx = first_empty >> LOG2_BLOCK_ITEMS; count > 0 && bx < block_index.GetCount(); bx++) {
+		int c = cache.Find(bx);
+		if(c < 0 && datafile->IsEmpty(block_index[bx]))
+			continue;
+		Block& block = cache[c >= 0 ? c : FetchCache(bx)];
+		if(block.data.IsEmpty())
+			continue;
+		block.dirty = true;
+		int pos = 0;
+		do {
+			int first = (pos == 0 ? 0 : block.data[pos - 1]);
+			int avail = (pos < block.data.GetCount() ? block.data[pos] : BLOCK_ITEMS) - first;
+			int part = min(avail, count);
+			if(part == 0)
+				continue;
+			exact_count += part;
+			count -= part;
+			if(pos == 0) { // 1st item is a special case
+				if(part < avail) {
+					block.data.InsertN(0, 2);
+					block.data[0] = 0;
+					block.data[1] = part;
+				}
+				else
+					block.data[0] = 0;
+			}
+			else if(part < avail || pos == block.data.GetCount())
+				block.data[pos - 1] += part;
+			else
+				block.data.Remove(pos - 1, 2);
+			int at = items.GetCount();
+			items.SetCountR(at + part);
+			first += bx * BLOCK_ITEMS;
+			int *p = &items[at], *e = p + part;
+			while(p < e)
+				*p++ = first++;
+			first_empty = (part < avail ? first : -1);
+			if(end_index < first)
+				end_index = first;
+		}
+		while(count > 0 && (pos += 2) <= block.data.GetCount());
+		if(block.data.GetCount() == 2 && block.data[0] == 0 && block.data[1] == BLOCK_ITEMS)
+			block.data.Clear();
+		if(current_size >= cache_size)
+			ClearCache();
+	}
+	while(count >= BLOCK_ITEMS) { // add full blocks
+		first_empty = end_index = (block_index.GetCount() + 1) * BLOCK_ITEMS;
+		exact_count += BLOCK_ITEMS;
+		master_dirty = true;
+		int x = datafile->Add(id);
+		block_index.Add(x);
+		datafile->Set(x, Null, id);
+		int pos = items.GetCount();
+		items.SetCountR(pos + BLOCK_ITEMS);
+		int *p = &items[pos], *e = p + BLOCK_ITEMS;
+		int start = (block_index.GetCount() - 1) * BLOCK_ITEMS;
+		while(p < e)
+			*p++ = start++;
+		count -= BLOCK_ITEMS;
+	}
+	if(count > 0) {
+		first_empty = end_index = block_index.GetCount() * BLOCK_ITEMS + count;
+		exact_count += count;
+		master_dirty = true;
+		int x = datafile->Add(id);
+		block_index.Add(x);
+		StringBuffer content(2 * INDEX_BYTES);
+		char *bp = content;
+		Poke32le(bp, 0);
+		Poke32le(bp + INDEX_BYTES, count);
+		datafile->Set(x, content, id);
+		int pos = items.GetCount();
+		items.SetCountR(pos + count);
+		int *p = &items[pos], *e = p + count;
+		int start = (block_index.GetCount() - 1) * BLOCK_ITEMS;
+		while(p < e)
+			*p++ = start++;
+	}
+	if(first_empty < 0)
+		CalcFirstEmpty();
+	return items;
+}
+
+void DataRowIndex::AddAt(int index)
+{
+	ASSERT(index >= 0);
+	if(!IsEmpty(index))
+		return;
+	if(collapsed && index == exact_count) {
+		first_empty = end_index = ++exact_count;
+		master_dirty = true;
+		return;
+	}
+	UnCollapse();
+	int bx = index >> LOG2_BLOCK_ITEMS;
+	while(block_index.GetCount() < bx) {
+		int x = datafile->Add(id);
+		block_index.Add(x);
+		StringBuffer content(2 * INDEX_BYTES);
+		char *bp = content;
+		Poke32le(bp, 0);
+		Poke32le(bp + INDEX_BYTES, 0);
+		datafile->Set(x, content, id);
+		master_dirty = true;
+	}
+	Block& block = cache[FetchCache(bx)];
+	current_size -= block.data.GetCount() * sizeof(int);
+	int rem = index & (BLOCK_ITEMS - 1);
+	int pos = block.FindIndex(rem);
+	if(pos < block.data.GetCount() && block.data[pos] < rem)
+		pos += 2;
+	if(pos > 0 && block.data[pos - 1] == rem) // extend left block
+		block.data[pos - 1]++;
+	else if(pos < block.data.GetCount() && block.data[pos] == rem) // extend right block
+		block.data[pos]--;
+	else { // insert new sub-block
+		block.data.InsertN(pos, 2);
+		block.data[pos] = rem;
+		block.data[pos + 1] = rem + 1;
+	}
+	if(pos > 0 && pos < block.data.GetCount() && block.data[pos - 1] == block.data[pos])
+		block.data.Remove(pos, 2); // join neighbouring blocks
+	if(block.data.GetCount() == 2 && block.data[0] == 0 && block.data[1] == BLOCK_ITEMS)
+		block.data.Clear();
+	current_size += block.data.GetCount() * sizeof(int);
+	block.dirty = true;
+	if(end_index <= index)
+		end_index = index + 1;
+	if(first_empty == index)
+		CalcFirstEmpty();
+}
+
+void DataRowIndex::Remove(int index)
+{
+	Vector<int> x;
+	x.SetCount(1);
+	x[0] = index;
+	Remove(x);
+}
+
+void DataRowIndex::Remove(const Vector<int>& index)
+{
+	if(index.IsEmpty())
+		return;
+	Vector<int> sorted;
+	sorted <<= index;
+	Sort(sorted);
+	if(collapsed) {
+		while(!sorted.IsEmpty() && sorted.Top() == exact_count - 1) {
+			sorted.Drop();
+			exact_count--;
+		}
+		first_empty = end_index = exact_count;
+		master_dirty = true;
+		if(sorted.IsEmpty())
+			return;
+		UnCollapse();
+	}
+	for(int i = 0; i < sorted.GetCount();) {
+		int f = sorted[i];
+		int bx = f >> LOG2_BLOCK_ITEMS;
+		int end = (bx + 1) * BLOCK_ITEMS;
+		Block& block = cache[FetchCache(bx)];
+		CDB_ASSERT((block.data.GetCount() & 1) == 0);
+		block.dirty = true;
+		current_size -= block.data.GetCount() * sizeof(int);
+		if(block.data.IsEmpty())
+			block.data << 0 << BLOCK_ITEMS;
+		int pos = block.FindIndex(f & (BLOCK_ITEMS - 1));
+		do {
+			int l = f = sorted[i++];
+			while(++l < end && i < sorted.GetCount() && sorted[i] == l)
+				i++;
+			f &= BLOCK_ITEMS - 1;
+			l = ((l - 1) & (BLOCK_ITEMS - 1)) + 1;
+			while(pos < block.data.GetCount() && f > block.data[pos + 1])
+				pos += 2;
+			if(pos == block.data.GetCount()) { // end of block
+				if(pos == 0)
+					block.data << 0 << 0;
+				break;
+			}
+			while(pos < block.data.GetCount() && l > block.data[pos]) { // process block
+				int *p = &block.data[pos];
+				bool lm = (f <= p[0]);
+				bool rm = (l >= p[1]);
+				if(!lm && !rm) { // insert inner block
+					exact_count -= l - f;
+					block.data.InsertN(pos + 1, 2);
+					block.data[pos + 1] = f;
+					block.data[pos + 2] = l;
+					pos += 2;
+				}
+				else if(!lm) {
+					exact_count -= p[1] - f;
+					p[1] = f;
+					pos += 2;
+				}
+				else if(!rm) {
+					exact_count -= l - p[0];
+					p[0] = l;
+				}
+				else {
+					exact_count -= p[1] - p[0];
+					block.data.Remove(pos, 2);
+				}
+			}
+			CDB_ASSERT((block.data.GetCount() & 1) == 0);
+		}
+		while(i < sorted.GetCount() && sorted[i] < end);
+		if(block.data.IsEmpty())
+			block.data << 0 << 0;
+		current_size += block.data.GetCount() * sizeof(int);
+		if(current_size >= cache_size)
+			ClearCache();
+	}
+	if(sorted[0] < first_empty)
+		CalcFirstEmpty();
+	if(sorted.Top() >= end_index - 1)
+		CalcEndIndex();
+}
+
+Vector<int> DataRowIndex::GetIndex()
+{
+	Vector<int> items;
+	if(collapsed) {
+		items.SetCount(exact_count);
+		for(int i = 0; i < exact_count; i++)
+			items[i] = i;
+		return items;
+	}
+	int end = (end_index + BLOCK_ITEMS - 1) >> LOG2_BLOCK_ITEMS;
+	CDB_ASSERT(block_index.GetCount() >= end);
+	for(int i = 0; i < end; i++) {
+		int pos = items.GetCount();
+		int c = cache.Find(i);
+		if(c >= 0 && cache[c].data.IsEmpty() || c < 0 && datafile->IsEmpty(block_index[i])) { // full length block
+			items.SetCountR(pos + BLOCK_ITEMS);
+			int *p = &items[pos], *e = p + BLOCK_ITEMS;
+			int v = i * BLOCK_ITEMS;
+			while(p < e)
+				*p++ = v++;
+		}
+		else { // partial block
+			const Block& block = cache[FetchCache(i)];
+			for(int t = 0; t < block.data.GetCount(); t += 2) {
+				int start = block.data[t] + i * BLOCK_ITEMS;
+				int count = block.data[t + 1] - block.data[t];
+				if(count > 0) {
+					items.SetCountR(pos + count);
+					int *p = &items[pos], *e = p + count;
+					while(p < e)
+						*p++ = start++;
+					pos += count;
+				}
+			}
+		}
+	}
+	return items;
+}
+
+bool DataRowIndex::IsEmpty(int index)
+{
+	if(index < 0 || index >= end_index)
+		return true;
+	if(collapsed)
+		return false;
+	int bx = index >> LOG2_BLOCK_ITEMS, c = cache.Find(bx);
+	if(c < 0 && datafile->IsEmpty(block_index[bx]))
+		return false; // full block
+	const Block& block = cache[c >= 0 ? c : FetchCache(bx)];
+	if(block.data.IsEmpty())
+		return false; // full block
+	index &= BLOCK_ITEMS - 1;
+	int pos = block.FindIndex(index);
+	return (pos >= block.data.GetCount() || index < block.data[pos] || index >= block.data[pos + 1]);
+}
+
+void DataRowIndex::Serialize(Stream& stream)
+{
+	int version = 1;
+	stream / version;
+	if(version < 1 || version > 1) {
+		stream.SetError();
+		return;
+	}
+	int c = (collapsed ? exact_count : -1);
+	stream % c;
+	if(stream.IsLoading()) {
+		if(collapsed = (c >= 0)) {
+			exact_count = end_index = first_empty = c;
+			current_size = 0;
+		}
+		else {
+			block_index.SetCount((int)stream.GetLeft() / INDEX_BYTES);
+			DataClient::GetIndex(block_index, stream);
+			CalcExactCount();
+			CalcEndIndex();
+			CalcFirstEmpty();
+		}
+	}
+	else
+		SetIndex(stream, block_index);
+}
+
+void DataRowIndex::DoClose()
+{
+	block_index.Clear();
+	cache.Clear();
+	exact_count = 0;
+	end_index = 0;
+	first_empty = 0;
+	current_size = 0;
+	collapsed = true;
+}
+
+void DataRowIndex::CalcFirstEmpty()
+{
+	if(collapsed) {
+		first_empty = exact_count;
+		return;
+	}
+	for(int i = 0; i < block_index.GetCount(); i++) {
+		int p = cache.Find(i);
+		bool emp = (p >= 0 ? cache[p].data.IsEmpty() : datafile->IsEmpty(block_index[i]));
+		if(!emp) {
+			const Block& block = cache[p >= 0 ? p : FetchCache(i)];
+			first_empty = i * BLOCK_ITEMS;
+			if(block.data[0] == 0)
+				first_empty += block.data[1];
+			return;
+		}
+	}
+	first_empty = block_index.GetCount() * BLOCK_ITEMS;
+}
+
+void DataRowIndex::CalcExactCount()
+{
+	if(collapsed)
+		return;
+	exact_count = 0;
+	for(int i = 0; i < block_index.GetCount(); i++) {
+		int p = cache.Find(i);
+		bool emp = (p >= 0 ? cache[p].data.IsEmpty() : datafile->IsEmpty(block_index[i]));
+		if(emp)
+			exact_count += BLOCK_ITEMS;
+		else {
+			const Block& block = cache[p >= 0 ? p : FetchCache(i)];
+			for(int t = 0; t < block.data.GetCount(); t += 2)
+				exact_count += block.data[t + 1] - block.data[t];
+		}
+	}
+}
+
+void DataRowIndex::CalcEndIndex()
+{
+	if(collapsed) {
+		end_index = exact_count;
+		return;
+	}
+	for(int i = block_index.GetCount(); --i >= 0;) {
+		int p = cache.Find(i);
+		bool emp = (p >= 0 ? cache[p].data.IsEmpty() : datafile->IsEmpty(block_index[i]));
+		if(emp) {
+			end_index = (i + 1) * BLOCK_ITEMS;
+			return;
+		}
+		const Block& block = cache[p >= 0 ? p : FetchCache(i)];
+		if(block.data[1] != 0) {
+			end_index = i * BLOCK_ITEMS + block.data.Top();
+			return;
+		}
+	}
+	end_index = 0;
+}
+
+void DataRowIndex::FlushCache()
+{
+	for(int i = 0; i < cache.GetCount(); i++)
+		if(cache[i].dirty) {
+			Block& block = cache[i];
+			CDB_CALL(CheckBlock(block));
+			StringStream ss;
+			SetIndex(ss, block.data);
+			datafile->Set(block_index[cache.GetKey(i)], ss, id);
+			block.dirty = false;
+		}
+}
+
+void DataRowIndex::ClearCache()
+{
+	FlushCache();
+	cache.Clear();
+	current_size = 0;
+}
+
+int DataRowIndex::FetchCache(int bx)
+{
+	int p = cache.Find(bx);
+	if(p >= 0)
+		return p;
+	Block& block = cache.Add(bx);
+	StringStream ss(datafile->Get(block_index[bx]));
+	block.data.SetCount((int)ss.GetSize() >> LOG2_INDEX_BYTES);
+	CDB_ASSERT((block.data.GetCount() & 1) == 0);
+	DataClient::GetIndex(block.data, ss);
+	CDB_CALL(CheckBlock(block));
+	current_size += block.data.GetCount() * sizeof(int);
+	return cache.GetCount() - 1;
+}
+
+void DataRowIndex::UnCollapse()
+{
+	if(!collapsed)
+		return;
+	master_dirty = true;
+	collapsed = false;
+	if(exact_count <= 0)
+		return;
+	int i = 0;
+	while(i < exact_count) {
+		int bi = block_index.GetCount();
+		int x = datafile->Add(id);
+		block_index.Add(x);
+		Block& new_block = cache.Add(bi);
+		new_block.dirty = true;
+		new_block.data.SetCount(2);
+		new_block.data[0] = 0;
+		new_block.data[1] = min<int>(BLOCK_ITEMS, exact_count - i);
+		i += BLOCK_ITEMS;
+	}
+	master_dirty = true;
+}
+
+void DataRowIndex::CheckBlock(const Block& block)
+{
+	if(block.data.GetCount() != 2 || block.data[0] != 0 || block.data[1] != 0) {
+		int last = -1;
+		for(int i = 0; i < block.data.GetCount(); i++) {
+			if(block.data[i] <= last) {
+				NEVER();
+			}
+			if((last = block.data[i]) > BLOCK_ITEMS) {
+				NEVER();
+			}
+		}
+	}
+}
+
+Value DataConvertFilter::Get(int index)
+{
+	return convert->Format(source->Get(index));
+}
+
+void DataConvertFilter::Set(int index, Value value)
+{
+	source->Set(index, convert->Scan(value));
+}
+
+void DataConvertFilter::CheckSet(int index, Value value)
+{
+	Value v = convert->Scan(value);
+	if(v.IsError())
+		throw ObjectExc(GetErrorText(v));
+}
+
+void DataMapFilter::CheckSet(int index, Value value)
+{
+	if(map.Find(value) < 0)
+		throw ObjectExc(NFormat("<%vt>: hodnota nebyla nalezena v mno�in� p��pustn�ch hodnot", value));
+	source->CheckSet(index, value);
+}
+
+void DataMinMaxFilter::CheckSet(int index, Value value)
+{
+	if(IsNull(value)) {
+		if(not_null)
+			throw ObjectExc("hodnota nesm� b�t pr�zdn�");
+	}
+	else {
+		if(!IsNumber(value))
+			throw ObjectExc(NFormat("<%vt>: o�ek�v�na ��seln� hodnota", value));
+		double d = value;
+		if(!IsNull(min) && d < min)
+			throw ObjectExc(NFormat("<%vt>: hodnota je men�� ne� povolen� doln� mez (%n)", value, min));
+		if(!IsNull(max) && d > max)
+			throw ObjectExc(NFormat("<%vt>: hodnota je v�t�� ne� povolen� horn� mez (%n)", value, max));
+	}
+	source->CheckSet(index, value);
+}
+
+DataOrderedIndexBase::DataOrderedIndexBase(bool lazy)
+: lazy(lazy)
+{
+	DoClose();
+}
+
+void DataOrderedIndexBase::Add(int index, Value value)
+{
+#ifdef CHECK_INDEX
+	CheckIndex();
+#endif
+	if(!lazy)
+		master_dirty = true;
+	if(!disabled && !dirty)
+		ordered_index.Insert(FindIndex(index, value), index);
+	source->Add(index, value);
+#ifdef CHECK_INDEX
+	CheckIndex();
+#endif
+}
+
+void DataOrderedIndexBase::Set(int index, Value value)
+{
+#ifdef CHECK_INDEX
+	CheckIndex();
+#endif
+	if(!lazy)
+		master_dirty = true;
+	if(!disabled && !dirty) { // locate & move existing item
+		int i = FindIndex(index, Get(index));
+		ASSERT(i < ordered_index.GetCount() && ordered_index[i] == index);
+		int *pi = ordered_index.Begin() + i;
+		int *pj = ordered_index.Begin() + FindIndex(index, value);
+		if(pi > pj) {
+			CopyBackward(pi + 1, pi, pj);
+			pj[0] = index;
+		}
+		else if(pi < pj) {
+			Copy(pi, pi + 1, pj);
+			pj[-1] = index;
+		}
+	}
+	source->Set(index, value);
+#ifdef CHECK_INDEX
+	CheckIndex();
+#endif
+}
+
+void DataOrderedIndexBase::Remove(int index)
+{
+#ifdef CHECK_INDEX
+	CheckIndex();
+#endif
+	if(!lazy)
+		master_dirty = true;
+	if(!disabled && !dirty) {
+		int i = FindIndex(index, Get(index));
+		if(i < ordered_index.GetCount() && ordered_index[i] == index)
+			ordered_index.Remove(i);
+	}
+	source->Remove(index);
+#ifdef CHECK_INDEX
+	CheckIndex();
+#endif
+}
+
+void DataOrderedIndexBase::Disable()
+{
+	if(!datafile->IsReadOnly() && !lazy)
+		master_dirty = true;
+	ordered_index.Clear();
+	disabled = true;
+	dirty = true;
+}
+
+void DataOrderedIndexBase::Enable()
+{
+	if(disabled) {
+		disabled = false;
+		ordered_index.Clear();
+		dirty = true;
+		RefreshIndex();
+	}
+}
+
+Vector<int> DataOrderedIndexBase::GetEqual(const Index<Value>& values)
+{
+	Vector<int> out;
+	if(values.GetCount() < 10 * row_index->GetCount()) { // binary search for index values
+		RefreshIndex();
+		for(int i = 0; i < values.GetCount(); i++) {
+			Value v = values[i];
+			int l = FindIndex(0, v);
+			while(l < ordered_index.GetCount() && source->Get(ordered_index[l]) == v)
+				out.Add(ordered_index[l++]);
+		}
+	}
+	else { // full scan & index
+		for(int i = 0; i < ordered_index.GetCount(); i++)
+			if(values.Find(source->Get(ordered_index[i])) >= 0)
+				out.Add(ordered_index[i]);
+	}
+	return out;
+}
+
+Vector<int> DataOrderedIndexBase::GetRange(Value min, Value max)
+{
+	RefreshIndex();
+	int l = IsNull(min) ? 0 : FindIndex(0, min);
+	int r = IsNull(max) ? ordered_index.GetCount() : FindIndex(0, max);
+	if(r < ordered_index.GetCount() && Get(r) == max)
+		r++;
+	Vector<int> result;
+	if(r > l)
+		result.Append(ordered_index, l, r - l);
+	return result;
+}
+
+void DataOrderedIndexBase::GetMinMax(Ref min, Ref max)
+{
+	RefreshIndex();
+	if(ordered_index.IsEmpty()) {
+		min.SetNull();
+		max.SetNull();
+		return;
+	}
+	Value v = source->Get(ordered_index[0]);
+	if(!IsNull(v))
+		min.SetValue(v);
+	else { // bisect to find 1st non-null value
+		int lo = 1, hi = ordered_index.GetCount() - 1;
+		while(lo < hi) {
+			int mid = (lo + hi) >> 1;
+			v = source->Get(ordered_index[mid]);
+			if(IsNull(v))
+				lo = mid + 1;
+			else
+				hi = mid;
+		}
+		min.SetValue(source->Get(ordered_index[hi]));
+	}
+	v = source->Get(ordered_index.Top());
+	if(!IsNull(v))
+		max.SetValue(v);
+	else { // bisect
+		int lo = 0, hi = ordered_index.GetCount() - 2;
+		while(lo < hi) {
+			int mid = (lo + hi + 1) >> 1;
+			v = source->Get(ordered_index[mid]);
+			if(IsNull(v))
+				hi = mid - 1;
+			else
+				lo = mid;
+		}
+		max.SetValue(source->Get(ordered_index[lo]));
+	}
+}
+
+int DataOrderedIndexBase::GetFirstEqual(Value value, int exclude_row)
+{
+	if(disabled)
+		return Null;
+	RefreshIndex();
+	int i = FindIndex(0, value);
+	if(i < ordered_index.GetCount() && ordered_index[i] == exclude_row)
+		i++;
+	return i < ordered_index.GetCount() && Get(ordered_index[i]) == value ? ordered_index[i] : (int)Null;
+}
+
+void DataOrderedIndexBase::Serialize(Stream& stream)
+{
+	if(stream.IsLoading()) {
+		disabled = stream.GetIL();
+		dirty = true;
+		if(!lazy) {
+			ordered_index.SetCount((int)stream.GetLeft() >> LOG2_INDEX_BYTES);
+			GetIndex(ordered_index, stream);
+			dirty = false;
+		}
+	}
+	else {
+		stream.PutIL(disabled ? 1 : 0);
+		if(!lazy)
+			SetIndex(stream, ordered_index);
+	}
+}
+
+void DataOrderedIndexBase::Commit()
+{
+#ifdef CHECK_INDEX
+	CheckIndex();
+#endif
+	source->Commit();
+	if(master_dirty) {
+		FlushMaster();
+		LOG(source->Describe() << ".Commit, size = " << datafile->GetLength(GetMasterIndex()));
+	}
+}
+
+void DataOrderedIndexBase::Rollback()
+{
+	DataClient::Rollback();
+	if(lazy) {
+		ordered_index.Clear();
+		dirty = true;
+	}
+}
+
+int DataOrderedIndexBase::GetUsedCacheSize() const
+{
+	return ordered_index.GetCount() * sizeof(int);
+}
+
+void DataOrderedIndexBase::ShrinkCache()
+{
+	if(lazy) {
+		ordered_index.Clear();
+		dirty = true;
+	}
+}
+
+void DataOrderedIndexBase::DoClose()
+{
+	ordered_index.Clear();
+	disabled = false;
+	dirty = true;
+#ifdef CHECK_INDEX
+	row_index = 0;
+#endif
+}
+
+String DataOrderedIndexBase::Describe() const
+{
+	return "ordered index->" + source->Describe();
+}
+
+Value DataColumnOf<bool>::Get(int index)
+{
+	int bx = index >> LOG2_BOOL_BLOCK_BITS;
+//	if(GetCount() <= bx)
+//		return 0;
+	return (*(const int *)GetRaw(bx) >> (index & (BOOL_BLOCK_BITS - 1))) & 1;
+}
+
+void DataColumnOf<bool>::Set(int index, Value value)
+{
+	int bx = index >> LOG2_BOOL_BLOCK_BITS;
+	if(GetCount() <= bx)
+		SetCount(index + 256);
+	int i = *(const int *)GetRaw(bx);
+	int m = 1 << (index & (BOOL_BLOCK_BITS - 1));
+	i = (CalcType<bool>::ValueTo(value) ? i | m : i & ~m);
+	SetRaw(bx, &i);
+}
+
+void DataColumnOf<bool>::SetCount(int count)
+{
+	DataColumnFix::SetCount((count + BOOL_BLOCK_BITS - 1) >> LOG2_BOOL_BLOCK_BITS);
+}
+
+Value DataColumnOf<Date>::Get(int index)
+{
+	const byte *p = GetRaw(index);
+	if(p[0] == 0 && p[1] == 0)
+		return Value();
+	Date d;
+	d.year = p[0] + (p[1] & 127) * 256 - 16384;
+	d.month = (p[1] >> 7) + ((p[2] & 7) << 1) + 1;
+	d.day = (p[2] >> 3) + 1;
+	return d;
+}
+
+void DataColumnOf<Date>::Set(int index, Value value)
+{
+	byte buffer[3];
+	if(IsNull(value))
+		buffer[0] = buffer[1] = buffer[2] = 0;
+	else {
+		Date d = value;
+		int y = d.year + 16384;
+		buffer[0] = y & 0xFF;
+		buffer[1] = ((y >> 8) & 0x7F) | ((d.month - 1) << 7);
+		buffer[2] = ((d.month - 1) >> 1) | ((d.day - 1) << 3);
+	}
+	SetRaw(index, buffer);
+}
+
+Value DataColumnOf<Time>::Get(int index)
+{
+	const byte *p = GetRaw(index);
+	if(p[0] == 0 && p[1] == 0)
+		return Value();
+	Time t;
+	t.year = p[0] + (p[1] & 0x3F) * 256 - 8192;
+	unsigned r = (p[1] >> 6) | (p[2] << 2) | (p[3] << 10) | (p[4] << 18);
+	t.month = r % 12 + 1;
+	r /= 12;
+	t.day = (r & 0x1F) + 1;
+	r >>= 5;
+	t.hour = r % 24;
+	r /= 24;
+	t.minute = r % 60;
+	t.second = r / 60;
+	return t;
+}
+
+void DataColumnOf<Time>::Set(int index, Value value)
+{
+	byte buffer[5];
+	if(IsNull(value))
+		buffer[0] = buffer[1] = buffer[2] = buffer[3] = buffer[4] = 0;
+	else {
+		Time t = value;
+		unsigned temp = t.year + 8192;
+		buffer[0] = (temp >> 0) & 0xFF;
+		buffer[1] = (temp >> 8) & 0x3F;
+		temp = ((((t.second * 60 + t.minute) * 24 + t.hour) << 5) + t.day - 1) * 12 + t.month - 1;
+		buffer[1] |= (temp << 6) & 0xC0;
+		buffer[2] = (temp >> 2) & 0xFF;
+		buffer[3] = (temp >> 10) & 0xFF;
+		buffer[4] = (temp >> 18) & 0xFF;
+	}
+	SetRaw(index, buffer);
+}
+
+Value DataColumnOf<Value>::Get(int index)
+{
+	Value v;
+	SerializeIn(v, GetRaw(index));
+	return v;
+}
+
+void DataColumnOf<Value>::Set(int index, Value value)
+{
+	SetRaw(index, SerializeOut(value));
+}
+
+template <class T>
+DataSource *DataTableColumnTypeHelper(One<DataClient>& client, T * = 0)
+{
+	T *s = new T;
+	client = s;
+	return s;
+}
+
+DataSet& DataSet::Sort()
+{
+	for(const int *p = set.Begin(), *e = set.End(); ++p < e;)
+		if(p[-1] > p[0]) {
+			UPP::Sort(set);
+			break;
+		}
+	return *this;
+}
+
+DataSet& DataSet::operator &= (const DataSet& s)
+{
+	ASSERT(table == s.table);
+	IntersectSorted(set, s.set);
+	return *this;
+}
+
+DataSet& DataSet::operator |= (const DataSet& s)
+{
+	ASSERT(table == s.table);
+	UnionSorted(set, s.set);
+	return *this;
+}
+
+DataSet& DataSet::operator -= (const DataSet& s)
+{
+	ASSERT(table == s.table);
+	RemoveSorted(set, s.set);
+	return *this;
+}
+
+DataSet operator && (const DataSet& a, const DataSet& b)
+{
+	if(a.GetCount() < b.GetCount())
+		return DataSet(a, 0) &= b;
+	else
+		return DataSet(b, 0) &= a;
+}
+
+DataSet operator || (const DataSet& a, const DataSet& b)
+{
+	if(a.GetCount() < b.GetCount())
+		return DataSet(a, 0) |= b;
+	else
+		return DataSet(b, 0) |= a;
+}
+
+DataSet operator - (const DataSet& a, const DataSet& b)
+{
+	return DataSet(a, 0) -= b;
+}
+
+DataTableColumn::DataTableColumn()
+: vtype(VALUE_V)
+{
+	owner = 0;
+	row_index = 0;
+	DoClose();
+}
+
+String DataTableColumn::GetTableName() const
+{
+	return owner->GetName();
+}
+
+void DataTableColumn::SetStyle(int _vtype, int _flags)
+{
+	ASSERT(!source);
+	vtype = _vtype;
+	flags = _flags;
+}
+
+void DataTableColumn::ModifyFlags(int _flags)
+{
+	if(flags != _flags) {
+		LOG("DataTableColumn(" << GetName() << ").ModifyFlags");
+		int old_flags = flags;
+		flags = _flags;
+		if((flags ^ old_flags) & INTEGER_INDEX)
+			IndexHelper(flags & INTEGER_INDEX, iindex);
+		if((flags ^ old_flags) & NUMBER_INDEX)
+			IndexHelper(flags & NUMBER_INDEX, nindex);
+		if((flags ^ old_flags) & DATETIME_INDEX)
+			IndexHelper(flags & DATETIME_INDEX, tindex);
+		if((flags ^ old_flags) & STRING_INDEX)
+			IndexHelper(flags & STRING_INDEX, sindex);
+		RefreshSource();
+		LOG("//DataTableColumn(" << GetName() << ").ModifyFlags");
+	}
+}
+
+DataSet DataTableColumn::GetIndex() const
+{
+	return owner->GetIndex();
+}
+
+void DataTableColumn::Link(DataTable& table)
+{
+	link = new DataLinkFilter(*this, table);
+	RefreshSource();
+}
+
+void DataTableColumn::Unlink()
+{
+	if(iindex) iindex->Unlink();
+	if(nindex) nindex->Unlink();
+	if(tindex) tindex->Unlink();
+	if(sindex) sindex->Unlink();
+	client->Unlink();
+	DataClient::Unlink();
+}
+
+void DataTableColumn::Commit()
+{
+	ASSERT(source);
+//	LOG("DataTableColumn(" << GetName() << ").Commit" << BeginIndent);
+	source->Commit();
+	if(master_dirty)
+		FlushMaster();
+//	LOG(EndIndent << "//DataTableColumn(" << GetName() << ").Commit");
+}
+
+int DataTableColumn::GetUsedCacheSize() const
+{
+	int total = source->GetUsedCacheSize();
+	if(iindex) total += iindex->GetUsedCacheSize();
+	if(nindex) total += nindex->GetUsedCacheSize();
+	if(sindex) total += sindex->GetUsedCacheSize();
+	if(tindex) total += tindex->GetUsedCacheSize();
+	return total;
+}
+
+void DataTableColumn::ShrinkCache()
+{
+	client_source->ShrinkCache();
+	if(iindex) iindex->ShrinkCache();
+	if(nindex) nindex->ShrinkCache();
+	if(sindex) sindex->ShrinkCache();
+	if(tindex) tindex->ShrinkCache();
+}
+
+void DataTableColumn::Serialize(Stream& stream)
+{
+	int start_msecs = msecs();
+	int version = StreamHeading(stream, 1, 1, 1, "DataTableColumn");
+	if(version >= 1) {
+		stream % vtype % flags;
+		bool new_column = false;
+		if(!client) { // create column
+			new_column = stream.IsStoring();
+			switch(vtype) {
+			case BOOL_V:   client_source = DataTableColumnTypeHelper< DataColumnOf<bool>   >(client); break;
+			case INT_V:    client_source = DataTableColumnTypeHelper< DataColumnOf<int>    >(client); break;
+			case BYTE_V:   client_source = DataTableColumnTypeHelper< DataColumnOf<byte>   >(client); break;
+			case SHORT_V:  client_source = DataTableColumnTypeHelper< DataColumnOf<short>  >(client); break;
+			case DOUBLE_V: client_source = DataTableColumnTypeHelper< DataColumnOf<double> >(client); break;
+			case STRING_V: client_source = DataTableColumnTypeHelper< DataColumnOf<String> >(client); break;
+			case DATE_V:   client_source = DataTableColumnTypeHelper< DataColumnOf<Date>   >(client); break;
+			case TIME_V:   client_source = DataTableColumnTypeHelper< DataColumnOf<Time>   >(client); break;
+			case VALUE_V:  client_source = DataTableColumnTypeHelper< DataColumnOf<Value>  >(client); break;
+			default: throw ObjectExc(NFormat("<%d>: chybn� datov� typ sloupce", vtype));
+			}
+		}
+		client->StreamMaster(stream, *datafile, id);
+		ASSERT(client_source);
+		LOG("DataTableColumn(" << owner->GetName() << "." << column_name << ").Serialize(" << (stream.IsLoading() ? "in" : "out")
+			<< "), master = " << GetMasterIndex() << ", base = t + " << msecs(start_msecs));
+		int cflags = 0;
+		if(flags & INTEGER_INDEX) {
+			if(!iindex) {
+				cflags |= INTEGER_INDEX;
+				indexes.Add(iindex = new DataOrderedIndex<int>(true));
+			}
+			iindex->StreamMaster(stream, *datafile, id);
+			LOG("DataTableColumn(" << column_name << ").Serialize / integer index = t + " << msecs(start_msecs)
+				<< ", master = " << iindex->GetMasterIndex() << ", master size = " << datafile->GetLength(iindex->GetMasterIndex()));
+		}
+		if(flags & NUMBER_INDEX) {
+			if(!nindex) {
+				cflags |= NUMBER_INDEX;
+				indexes.Add(nindex = new DataOrderedIndex<double>(true));
+			}
+			nindex->StreamMaster(stream, *datafile, id);
+			LOG("DataTableColumn(" << column_name << ").Serialize / number index = t + " << msecs(start_msecs)
+				<< ", master = " << nindex->GetMasterIndex() << ", master size = " << datafile->GetLength(nindex->GetMasterIndex()));
+		}
+		if(flags & DATETIME_INDEX) {
+			if(!tindex) {
+				cflags |= DATETIME_INDEX;
+				indexes.Add(tindex = new DataOrderedIndex<Time>(true));
+			}
+			tindex->StreamMaster(stream, *datafile, id);
+			LOG("DataTableColumn(" << column_name << ").Serialize / datetime index = t + " << msecs(start_msecs)
+				<< ", master = " << tindex->GetMasterIndex() << ", master size = " << datafile->GetLength(tindex->GetMasterIndex()));
+		}
+		if(flags & STRING_INDEX) {
+			if(!sindex) {
+				cflags |= STRING_INDEX;
+				indexes.Add(sindex = new DataOrderedIndex<String>(true));
+			}
+			sindex->StreamMaster(stream, *datafile, id);
+			LOG("DataTableColumn(" << column_name << ").Serialize / string index = t + " << msecs(start_msecs)
+				<< ", master = " << sindex->GetMasterIndex() << ", master size = " << datafile->GetLength(sindex->GetMasterIndex()));
+		}
+		RefreshSource();
+		if(new_column) { // initialize new column
+			Vector<int> index = row_index->GetIndex();
+			for(int i = 0; i < index.GetCount(); i++)
+				source->Add(index[i], Value());
+		}
+		if(cflags) {
+			if(cflags & INTEGER_INDEX)  iindex->SetRowIndex(row_index);
+			if(cflags & NUMBER_INDEX)   nindex->SetRowIndex(row_index);
+			if(cflags & DATETIME_INDEX) tindex->SetRowIndex(row_index);
+			if(cflags & STRING_INDEX)   sindex->SetRowIndex(row_index);
+		}
+	}
+	ASSERT(source);
+	LOG("//DataTableColumn(" << column_name << ").Serialize = t + " << msecs(start_msecs));
+}
+
+void DataTableColumn::RefreshSource()
+{
+	source = 0;
+	DataFilter *last = 0;
+	int i;
+	for(i = 0; i < filters.GetCount(); i++)
+		if(last) {
+			last->SetSource(&filters[i]);
+			last = &filters[i];
+		}
+		else
+			source = last = &filters[i];
+	for(i = 0; i < indexes.GetCount(); i++)
+		if(last) {
+			last->SetSource(&indexes[i]);
+			last = &indexes[i];
+		}
+		else
+			source = last = &indexes[i];
+	if(link)
+		if(last) {
+			last->SetSource(~link);
+			last = ~link;
+		}
+		else
+			source = last = ~link;
+	if(client_source)
+		if(last)
+			last->SetSource(client_source);
+		else
+			source = client_source;
+	if(source)
+		source->SetRowIndex(row_index);
+	ASSERT(source);
+}
+
+template <class T>
+static Vector<int> DataGetRange(DataSource& source, const T& min, const T& max, const Vector<int>& index)
+{
+	Vector<int> done;
+	if(IsNull(min) && IsNull(max))
+		return Vector<int>(index, 0);
+	if(IsNull(min)) { // upper bound
+		for(int i = 0; i < index.GetCount(); i++) {
+			int x = index[i];
+			T t = source.Get(x);
+			if(!IsNull(t) && t <= max)
+				done.Add(x);
+		}
+	}
+	else if(IsNull(max)) { // lower bound
+		for(int i = 0; i < index.GetCount(); i++) {
+			int x = index[i];
+			T t = source.Get(x);
+			if(!IsNull(t) && t >= min)
+				done.Add(x);
+		}
+	}
+	else { // range
+		for(int i = 0; i < index.GetCount(); i++) {
+			int x = index[i];
+			T t = source.Get(x);
+			if(!IsNull(t) && t >= min && t <= max)
+				done.Add(x);
+		}
+	}
+	return done;
+}
+
+DataSet DataTableColumn::GetRange(Value min, Value max)
+{
+	bool nnmin = IsNull(min), nnmax = IsNull(max);
+	if(nnmin && nnmax)
+		return DataSet(owner->GetName());
+	if(iindex)
+		return DataSet(owner->GetName(), iindex->GetRange(min, max));
+	if(nindex)
+		return DataSet(owner->GetName(), nindex->GetRange(min, max));
+	if(tindex)
+		return DataSet(owner->GetName(), tindex->GetRange(min, max));
+	if((!nnmin && IsNumber(min)) || (!nnmax && IsNumber(max)))
+		return DataSet(owner->GetName(), DataGetRange<double>(*source, min, max, row_index->GetIndex()));
+	if((!nnmin && IsDateTime(min)) || (!nnmax && IsDateTime(max)))
+		return DataSet(owner->GetName(), DataGetRange<Time>(*source, min, max, row_index->GetIndex()));
+	throw Exc(NFormat("%s: nelze vyhledat rozsah %vt .. %vt", GetDotName(), min, max));
+}
+
+DataSet DataTableColumn::GetLike(WString mask)
+{
+	Vector<int> done = row_index->GetIndex();
+	One<LanguageInfo::WildcardCompare> wcc = GetLanguageInfo().GetWildcardCompare(mask);
+	int *d = done.Begin();
+	for(const int *s = done.Begin(), *e = done.End(); s < e; s++) {
+		WString value = Get(*s);
+		if(wcc->Matches(value))
+			*d++ = *s;
+	}
+	done.SetCount(d - done.Begin());
+	return DataSet(owner->GetName(), done);
+}
+
+DataSet DataTableColumn::GetEqual(Value value)
+{
+	Index<Value> values;
+	values.Reserve(1);
+	values.Add(value);
+	return GetEqual(values);
+}
+
+DataSet DataTableColumn::GetEqual(const Vector<int>& set)
+{
+	Index<Value> values;
+	values.Reserve(set.GetCount());
+	Append(values, set);
+	return GetEqual(values);
+}
+
+DataSet DataTableColumn::GetEqual(const Index<Value>& set)
+{
+	if(iindex) return DataSet(owner->GetName(), iindex->GetEqual(set));
+	if(nindex) return DataSet(owner->GetName(), nindex->GetEqual(set));
+	if(sindex) return DataSet(owner->GetName(), sindex->GetEqual(set));
+	if(tindex) return DataSet(owner->GetName(), tindex->GetEqual(set));
+	Vector<int> done;
+	Vector<int> index = row_index->GetIndex();
+	for(int i = 0; i < index.GetCount(); i++)
+		if(set.Find(source->Get(index[i])) >= 0)
+			done.Add(index[i]);
+	return DataSet(owner->GetName(), done);
+}
+
+int DataTableColumn::GetFirstEqual(Value value, int exclude_row)
+{
+	if(iindex && iindex->IsEnabled())
+		return iindex->GetFirstEqual(value, exclude_row);
+	if(nindex && nindex->IsEnabled())
+		return nindex->GetFirstEqual(value, exclude_row);
+	Vector<int> index = row_index->GetIndex();
+	for(int i = 0; i < index.GetCount(); i++)
+		if(source->Get(index[i]) == value && index[i] != exclude_row)
+			return index[i];
+	return Null;
+}
+
+void DataTableColumn::GetMinMax(double& min, double& max)
+{
+	if(iindex)
+		iindex->GetMinMax(min, max);
+	else if(nindex)
+		nindex->GetMinMax(min, max);
+	else {
+		Vector<int> set = row_index->GetIndex();
+		min = max = Null;
+		for(int i = 0; i < set.GetCount(); i++) {
+			double d = source->Get(set[i]);
+			if(!IsNull(d)) {
+				if(IsNull(min))
+					min = max = d;
+				else {
+					if(d < min) min = d;
+					if(d > max) max = d;
+				}
+			}
+		}
+	}
+}
+
+void DataTableColumn::GetMinMax(Time& min, Time& max)
+{
+	if(tindex)
+		tindex->GetMinMax(min, max);
+	else {
+		Vector<int> set = row_index->GetIndex();
+		min = max = Null;
+		for(int i = 0; i < set.GetCount(); i++) {
+			Time t = source->Get(set[i]);
+			if(!IsNull(t)) {
+				if(IsNull(min))
+					min = max = t;
+				else {
+					if(t < min) min = t;
+					if(t > max) max = t;
+				}
+			}
+		}
+	}
+}
+
+DataSet DataTableColumn::operator != (Value v)
+{
+	DataSet full = GetIndex();
+	full -= GetEqual(v);
+	return full;
+}
+
+DataSet DataTableColumn::operator != (const Index<Value>& v)
+{
+	DataSet full = GetIndex();
+	full -= GetEqual(v);
+	return full;
+}
+
+DataSet DataTableColumn::operator != (const Vector<int>& v)
+{
+	DataSet full = GetIndex();
+	full -= GetEqual(v);
+	return full;
+}
+
+void DataTableColumn::Set(int index, Value value)
+{
+	ASSERT(source);
+	try {
+		source->CheckSet(index, value);
+		source->Set(index, value);
+	}
+	catch(ObjectExc e) {
+		throw ObjectExc(NFormat("<%s#%d>: %s", owner->GetName(), index, e));
+	}
+}
+
+Value DataTableColumn::Get(int index)
+{
+//	RTIMING("DataTableColumn::Get");
+
+	ASSERT(source);
+	return source -> Get(index);
+}
+
+Value DataTableColumn::operator [] (int index)
+{
+//	RTIMING("DataTableColumn::operator []");
+
+	return Get(index);
+}
+
+Vector<Value> DataTableColumn::Get(const Vector<int>& rowset)
+{
+	Vector<Value> out;
+	out.SetCount(rowset.GetCount());
+	for(int i = 0; i < rowset.GetCount(); i++)
+		out[i] = Get(rowset[i]);
+	return out;
+}
+
+Vector<int> DataTableColumn::GetInt(const Vector<int>& rowset)
+{
+	Vector<int> out;
+	out.SetCount(rowset.GetCount());
+	for(int i = 0; i < rowset.GetCount(); i++)
+		out[i] = Get(rowset[i]);
+	return out;
+}
+
+void DataTableColumn::DoClose()
+{
+	source = 0;
+	client = 0;
+	iindex = 0;
+	nindex = 0;
+	tindex = 0;
+	sindex = 0;
+//	hindex = 0;
+//	pindex = 0;
+	client_source = 0;
+	filters.Clear();
+	indexes.Clear();
+	client.Clear();
+}
+
+void DataTableColumn::Describe(Stream& stream, int flags)
+{
+	stream << column_name << ": " << source->Describe() << "\n";
+}
+
+String DataTableColumn::GetDotName() const
+{
+	String s;
+	if(owner)
+		s << owner->GetName() << '.';
+	s << GetName();
+	return s;
+}
+
+DataTable::DataTable()
+{
+}
+
+DataTable::~DataTable()
+{
+	while(!links.IsEmpty())
+		links.Pop()->Kill();
+}
+
+DataTableColumn& DataTable::Column(String name)
+{
+	int f = columns.Find(name);
+	if(f >= 0)
+		return columns[f];
+	throw Exc(NFormat("<%s>: sloupec %s nebyl nalezen.", table_name, name));
+}
+
+Vector<Value> DataTable::EmptyRow() const
+{
+	Vector<Value> values;
+	values.SetCount(columns.GetCount());
+	return values;
+}
+
+void DataTable::Serialize(Stream& stream)
+{
+	int version = StreamHeading(stream, 2, 1, 2, "DataTable");
+	if(version >= 1) {
+		row_index.StreamMaster(stream, *datafile, id);
+		int count = columns.GetCount();
+		stream / count;
+		for(int i = 0; i < count; i++) {
+			String name;
+			if(stream.IsStoring())
+				name = columns.GetKey(i);
+			stream % name;
+			if(stream.IsLoading())
+				columns.Add(name).SetTable(this).SetName(name).SetRowIndex(&row_index);
+			columns[i].StreamMaster(stream, *datafile, id);
+			ASSERT(columns[i].source);
+		}
+		if(version >= 2)
+			stream % user_info;
+		else if(stream.IsLoading())
+			user_info = Null;
+	}
+}
+
+void DataTable::Unlink()
+{
+	for(int i = 0; i < columns.GetCount(); i++)
+		columns[i].Unlink();
+	DataClient::Unlink();
+}
+
+void DataTable::Commit()
+{
+	for(int i = 0; i < columns.GetCount(); i++)
+		columns[i].Commit();
+	row_index.Commit();
+	if(master_dirty)
+		FlushMaster();
+	datafile->Commit(id);
+}
+
+void DataTable::Rollback()
+{
+	datafile->Rollback(id);
+	DataClient::Rollback();
+	row_index.Rollback();
+	for(int i = 0; i < columns.GetCount(); i++)
+		columns[i].Rollback();
+}
+
+int DataTable::GetUsedCacheSize() const
+{
+	int total = row_index.GetUsedCacheSize();
+	for(int i = 0; i < columns.GetCount(); i++)
+		total += columns[i].GetUsedCacheSize();
+	return total;
+}
+
+void DataTable::ShrinkCache()
+{
+	row_index.ShrinkCache();
+	for(int i = 0; i < columns.GetCount(); i++)
+		columns[i].ShrinkCache();
+}
+
+int DataTable::AddColumn(String name, int vtype, int flags)
+{
+	if(FindColumn(name) >= 0)
+		throw ObjectExc(NFormat("<%s>: duplik�tn� n�zev sloupce v tabulce <%s>", name, table_name));
+	master_dirty = true;
+	DataTableColumn& col = columns.Add(name);
+	col.SetTable(this);
+	col.SetName(name);
+	col.SetStyle(vtype, flags);
+	col.row_index = &row_index;
+	col.Create(*datafile, id);
+	return columns.GetCount() - 1;
+}
+
+void DataTable::RemoveColumn(String name)
+{
+	int i = FindColumn(name);
+	if(i < 0)
+		throw ObjectExc(NFormat("<%s>: sloupec nebyl nalezen v tabulce <%s>", name, table_name));
+	master_dirty = true;
+	columns[i].Unlink();
+	columns.Remove(i);
+}
+
+void DataTable::AddLink(DataLinkFilter& link)
+{
+	if(FindIndex(links, &link) < 0)
+		links.Add(&link);
+}
+
+void DataTable::RemoveLink(DataLinkFilter& link)
+{
+	int p = FindIndex(links, &link);
+	if(p >= 0)
+		links.Remove(p);
+}
+
+void DataTable::DoClose()
+{
+	row_index.Close();
+	columns.Clear();
+}
+
+void DataTable::Describe(Stream& stream, int flags)
+{
+	if(flags & EXPORT_FORMAT) {
+		Export(stream);
+		return;
+	}
+
+	stream << "tabulka '" << table_name << "' (" << row_index.GetCount() << " ��dk�)\n"
+		"{\n";
+//	stream.Begin();
+	int i;
+	for(i = 0; i < columns.GetCount(); i++)
+		columns[i].Describe(stream, flags);
+	if(flags & DUMP_ROWS) {
+		stream << "\nRow dump:\n";
+		DataSet index = GetIndex();
+		for(i = 0; i < index.GetCount(); i++)
+			stream << Format(Get(index[i])) << "\n";
+	}
+//	stream.End();
+	stream << "}\n";
+}
+
+void DataTable::Export(Stream& stream)
+{
+	DataSet index = GetIndex();
+	for(int i = 0; i < index.GetCount(); i++) {
+		int x = index[i];
+		stream << '=' << x << "\n";
+		for(int c = 0; c < GetColumns(); c++) {
+			String row;
+			row << GetName(c) << ": ";
+			Value value = (*this)(c, x);
+			if(IsNull(value))
+				row << "NULL";
+			else if(IsNumber(value))
+				row << DblStr(value);
+			else if(IsDateTime(value))
+				row << '@' << StdFormat(value);
+			else {
+				if(!IsString(value))
+					value = SerializeOut(value);
+				String s = value;
+				row << '\"';
+				for(const char *p = s, *e = s.End(); p < e; p++) {
+					if(row.GetLength() > 70) {
+						row.Cat("\"&");
+						stream.PutLine(row);
+						row = "    &\"";
+					}
+					if((byte)*p >= ' ' && *p != '\x7F' && *p != '\xFF' && *p != '\\' && *p != '\"')
+						row.Cat(*p);
+					else {
+						row.Cat('\\');
+						switch(*p) {
+						case '\\': row << '\\'; break;
+						case '\"': row << '\"'; break;
+						case '\a': row << 'a'; break;
+						case '\b': row << 'b'; break;
+						case '\f': row << 'f'; break;
+						case '\t': row << 't'; break;
+						case '\v': row << 'v'; break;
+						case '\r': row << 'r'; break;
+						case '\n': row << 'n'; break;
+						default:
+							row.Cat('x');
+							static char hex[] = "0123456789abcdef";
+							row.Cat(hex[(*p >> 4) & 15]);
+							row.Cat(hex[(*p >> 0) & 15]);
+							break;
+						}
+					}
+				}
+				row << '\"';
+			}
+			stream.PutLine(row);
+		}
+	}
+}
+
+String DataTable::Import(Stream& stream, bool row_indices)
+{
+	int rx = -1;
+	int line = 0;
+	try {
+		while(!stream.IsEof()) {
+			String s = stream.GetLine();
+			line++;
+			const char *p = s;
+			while(*p && (byte)*p <= ' ')
+				p++;
+			if(*p == '=') // new row index
+				rx = stou(p + 1);
+			else if(IsAlpha(*p) || *p == '_') {
+				const char *b = p;
+				while(*p && *p != ':')
+					p++;
+				if(*p != ':')
+					throw Exc("o�ek�v�n znak ':'");
+				const char *e = p++;
+				while(e > b && (byte)e[-1] <= ' ')
+					e--;
+				String col(b, e);
+				int i = FindColumn(col);
+				if(i < 0)
+					throw Exc(NFormat("tabulka neobsahuje sloupec '%s'", col));
+				while(*p && (byte)*p <= ' ')
+					p++;
+				Value value;
+				if(p[0] == 'N' && p[1] == 'U' && p[2] == 'L' && p[3] == 'L')
+					;
+				else if(IsDigit(*p) || *p == '+' || *p == '-') { // number
+					double d = ScanDouble(p, &p);
+					if(IsNull(d))
+						throw Exc(NFormat("o�ek�v�no re�ln� ��slo, nalezeno: %s", StringSample(p, 20)));
+					value = d;
+				}
+				else if(*p == '@') {
+					value = StdConvertTime().Scan(++p);
+					if(value.IsError())
+						throw Exc(NFormat("o�ek�v�no datum, nalezeno: %s", StringSample(p, 20)));
+				}
+				else if(*p == '\"') {
+					String text;
+					for(;;) {
+						while(*++p != '\"')
+							if(*p == '\\')
+								switch(*++p) {
+								case 0: throw Exc("uvozuj�c� znak escape-sekvence (\\) na konci ��dku");
+								case '\\':
+								case '\"': text.Cat(*p); break;
+								case 'a':  text.Cat('\a'); break;
+								case 'b':  text.Cat('\b'); break;
+								case 'f':  text.Cat('\f'); break;
+								case 't':  text.Cat('\t'); break;
+								case 'v':  text.Cat('\v'); break;
+								case 'r':  text.Cat('\r'); break;
+								case 'n':  text.Cat('\n'); break;
+								case 'x':
+									if(IsXDigit(p[1])) {
+										int code = ctoi(*++p);
+										if(IsXDigit(p[1]))
+											code = code * 16 + ctoi(*++p);
+										text.Cat(code);
+									}
+									else
+										throw Exc(NFormat("chybn� escape-sekvence %s", StringSample(p, 20)));
+									break;
+								}
+							else if(*p)
+								text.Cat(*p);
+							else
+								throw Exc("neukon�en� �et�zcov� konstanta");
+						if(p[1] != '&')
+							break;
+						s = stream.GetLine();
+						line++;
+						p = s;
+						while(*p && (byte)*p <= ' ')
+							p++;
+						if(*p++ != '&' || *p != '\"')
+							throw Exc(NFormat("o�ek�v�no napojen� �et�zce (&\"), nalezeno: %s", StringSample(p, 20)));
+					}
+					if(columns[i].vtype == STRING_V)
+						value = text;
+					else if(!SerializeIn(value, text))
+						throw Exc("chybn� bin�rn� hodnota");
+				}
+				else
+					throw Exc(NFormat("chybn� typ hodnoty: %s", StringSample(p, 20)));
+				if(rx < 0 || IsEmpty(rx)) {
+					rx = Add(rx);
+					columns[i].source->CheckAdd(rx, value);
+					columns[i].source->Add(rx, value);
+				}
+				else {
+					columns[i].source->CheckSet(rx, value);
+					columns[i].source->Set(rx, value);
+				}
+			}
+			else if(*p && *p != '#')
+				throw Exc(NFormat("chybn� ��dek: %s", StringSample(p, 20)));
+		}
+		Commit();
+		return Null;
+	}
+	catch(Exc e) {
+		Rollback();
+		return NFormat("��dek %d: %s", line, e);
+	}
+}
+
+int DataTable::Add(int index)
+{
+	Vector<Value> row;
+	row.SetCount(columns.GetCount());
+	return Add(row, index);
+}
+
+int DataTable::Add(const Vector<Value>& row, int index)
+{
+	ASSERT(row_index.GetEndIndex() >= 0);
+	if(index >= 0 && !IsEmpty(index)) {
+		Set(index, row);
+		return index;
+	}
+	if(index < 0)
+		index = row_index.Add();
+	else
+		row_index.AddAt(index);
+	ASSERT(row_index.GetEndIndex() > index);
+	int i;
+	for(i = 0; i < columns.GetCount(); i++)
+		try {
+			columns[i].source->CheckAdd(index, row[i]);
+		}
+		catch(ObjectExc e) {
+			row_index.Remove(index);
+			throw ObjectExc(NFormat("<%s#%d.%s>: %s", table_name, index, columns.GetKey(i), e));
+		}
+
+	for(i = 0; i < columns.GetCount(); i++)
+		try {
+			columns[i].source->Add(index, row[i]);
+		}
+		catch(ObjectExc e) {
+			while(--i >= 0)
+				columns[i].source->Remove(index);
+			row_index.Remove(index);
+			throw ObjectExc(NFormat("<%s#%d.%s>: %s", table_name, index, columns.GetKey(i), e));
+		}
+
+	return index;
+}
+
+void DataTable::Set(int index, const Vector<Value>& row)
+{
+	if(row.GetCount() != columns.GetCount())
+		throw ObjectExc(NFormat("<%s#%d>: chybn� po�et sloupc�", table_name, index));
+	int i;
+	for(i = 0; i < columns.GetCount(); i++)
+		try {
+			columns[i].source->CheckSet(index, row[i]);
+		}
+		catch(ObjectExc e) {
+			throw ObjectExc(NFormat("<%s#%d.%s>: %s", table_name, index, columns.GetKey(i), e));
+		}
+
+	for(i = 0; i < columns.GetCount(); i++)
+		try {
+			columns[i].source->Set(index, row[i]);
+		}
+		catch(ObjectExc e) {
+			throw ObjectExc(NFormat("<%s#%d.%s>: %s", table_name, index, columns.GetKey(i), e));
+		}
+}
+
+void DataTable::Remove(int index)
+{
+	Remove(DataSet(GetName(), index));
+}
+
+void DataTable::Remove(const DataSet& index)
+{
+	int i;
+	for(i = 0; i < index.GetCount(); i++)
+		if(row_index.IsEmpty(index[i]))
+			throw ObjectExc(NFormat("<%s#%d>: ��dek je ji� smaz�n", table_name, index[i]));
+
+	for(i = 0; i < links.GetCount(); i++) {
+		DataLinkFilter *link = links[i];
+		for(int r = 0; r < index.GetCount(); r++)
+			if(link->Exists(index[r]))
+				throw ObjectExc(NFormat("<%s#%d>: na ��dek existuje odkaz z <%s>", table_name, index[r], link->GetColumnName()));
+	}
+
+	row_index.Remove(index.set);
+
+	for(i = 0; i < columns.GetCount(); i++) {
+		DataSource& source = ~columns[i];
+		for(int r = 0; r < index.GetCount(); r++)
+			try {
+				source.Remove(index[r]);
+			}
+			catch(ObjectExc e) {
+				throw ObjectExc(NFormat("<%s#%d.%s>: %s", table_name, index[r], columns.GetKey(i), e));
+			}
+	}
+}
+
+Vector<Value> DataTable::Get(int index)
+{
+	Vector<Value> values;
+	values.SetCount(columns.GetCount());
+	for(int i = 0; i < columns.GetCount(); i++)
+		try {
+			values[i] = columns[i].source->Get(index);
+		}
+		catch(ObjectExc e) {
+			throw ObjectExc(NFormat("<%s#%d.%s>: %s", table_name, index, columns.GetKey(i), e));
+		}
+	return values;
+}
+
+Vector<Value> DataTable::GetAlways(int index)
+{
+	if(IsEmpty(index))
+		return EmptyRow();
+	return Get(index);
+}
+
+DataLinkFilter::DataLinkFilter(DataTableColumn& column, DataTable& table)
+: column(&column)
+, table(&table)
+{
+	table.AddLink(*this);
+}
+
+DataLinkFilter::~DataLinkFilter()
+{
+	if(table && column)
+		table->RemoveLink(*this);
+}
+
+void DataLinkFilter::CheckSet(int index, Value value)
+{
+	if(IsNull(value))
+		return;
+	if(!CalcType<int>::IsType(value))
+		throw ObjectExc(NFormat("<%vt>: o�ek�v�no cel� ��slo (odkaz do tabulky %s)", value, table->GetName()));
+	if(!IsNull(value) && table->IsEmpty(value))
+		throw ObjectExc(NFormat("<%vt>: neplatn� odkaz do tabulky %s", value, table->GetName()));
+}
+
+String DataLinkFilter::Describe() const
+{
+	String s;
+	s << "link(";
+	if(table)
+		s << table->GetName();
+	s << ")->" << source->Describe();
+	return s;
+}
+
+DataBase::DataBase()
+{
+	block_level = 0;
+}
+
+void DataBase::Commit()
+{
+	datafile->BeginBlock();
+	for(int i = 0; i < tables.GetCount(); i++)
+		tables[i].Commit();
+	if(master_dirty)
+		FlushMaster();
+	datafile->Commit(0);
+	datafile->EndBlock();
+}
+
+void DataBase::Rollback()
+{
+	datafile->Rollback(0);
+	for(int i = 0; i < tables.GetCount(); i++)
+		tables[i].Rollback();
+	DataClient::Rollback();
+}
+
+int DataBase::GetUsedCacheSize() const
+{
+	int total = 0;
+	for(int i = 0; i < tables.GetCount(); i++)
+		total += tables[i].GetUsedCacheSize();
+	return total;
+}
+
+void DataBase::ShrinkCache()
+{
+	for(int i = 0; i < tables.GetCount(); i++)
+		tables[i].ShrinkCache();
+}
+
+void DataBase::DoClose()
+{
+	tables.Clear();
+}
+
+void DataBase::Serialize(Stream& stream)
+{
+	ASSERT(datafile);
+	int version = StreamHeading(stream, 1, 1, 1, "DataBase");
+	if(version >= 1) {
+		int count = tables.GetCount();
+		stream / count;
+		for(int i = 0; i < count; i++) {
+			String name;
+			int master;
+			if(stream.IsStoring()) {
+				name = tables.GetKey(i);
+				master = tables[i].GetMasterIndex();
+			}
+			stream % name % master;
+			if(stream.IsLoading()) {
+				DataTable& table = tables.Add(name);
+				table.SetName(name);
+				table.Open(*datafile, master, (dfid_t)&table);
+			}
+		}
+	}
+}
+
+DataTable& DataBase::Get(String name)
+{
+	int f = tables.Find(name);
+	if(f >= 0)
+		return tables[f];
+	throw Exc(NFormat("<%s>: tabulka nebyla nalezena.", name));
+}
+
+DataTable& DataBase::Add(String name)
+{
+	ASSERT(datafile);
+	if(tables.Find(name) >= 0)
+		throw ObjectExc(NFormat("<%s>: tabulka ji� v datab�zi je", name));
+	master_dirty = true;
+	DataTable& table = tables.Add(name);
+	table.SetName(name);
+	table.Create(*datafile, (dfid_t)&table);
+	return table;
+}
+
+DataTable& DataBase::GetAdd(String name)
+{
+	int i = tables.Find(name);
+	if(i >= 0)
+		return tables[i];
+	return Add(name);
+}
+
+void DataBase::Remove(int i)
+{
+	master_dirty = true;
+	ASSERT(i >= 0 && i < tables.GetCount());
+	tables[i].Unlink();
+	tables.Remove(i);
+}
+
+void DataBase::Remove(String name)
+{
+	int i = tables.Find(name);
+	if(i < 0)
+		throw ObjectExc(NFormat("<%s>: tabulka nebyla nalezena", name));
+	Remove(i);
+}
+
+void DataBase::Describe(Stream& stream, int flags)
+{
+	stream << "Ultimate DataBase\n"
+		"{\n";
+//	stream.Begin();
+	for(int i = 0; i < tables.GetCount(); i++)
+		tables[i].Describe(stream, flags);
+//	stream.End();
+	stream << "}\n";
+}
+
+bool DataBase::TryRemove(String n)
+{
+	int i = Find(n);
+	if(i < 0)
+		return false;
+	Remove(i);
+	return true;
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/TCore/database.h b/uppsrc/TCore/database.h
new file mode 100644
index 000000000..4b1be1660
--- /dev/null
+++ b/uppsrc/TCore/database.h
@@ -0,0 +1,970 @@
+NAMESPACE_UPP
+
+#define CHECK_CACHE() // CheckCache()
+#define CHECK_BLOCK(block, index) // CheckBlock(block, index)
+#ifdef _DEBUG
+//#define CHECK_INDEX // comment this line to turn index checking off
+#endif
+
+class DataClient
+{
+public:
+	enum { DEFAULT_CACHE_SIZE = 100000 };
+
+	DataClient();
+	virtual ~DataClient();
+
+	virtual void          Serialize(Stream& stream);
+
+	void                  StreamMaster(Stream& stream, DataFile& df, dfid_t id);
+	void                  Open(DataFile& datafile, int index, dfid_t id);
+	int                   Create(DataFile& datafile, dfid_t id);
+	void                  Close();
+	virtual void          Unlink();
+
+	bool                  IsOpen() const                               { return datafile; }
+	DataFile&             GetDataFile() const                          { return *datafile; }
+	int                   GetMasterIndex() const                       { return master_index; }
+	bool                  IsReadOnly() const                           { return datafile -> IsReadOnly(); }
+	dfid_t                GetID() const                                { return id; }
+
+	virtual void          SetCacheSize(int size);
+	int                   GetCacheSize() const                         { return cache_size; }
+	virtual int           GetUsedCacheSize() const;
+	virtual void          ShrinkCache();
+
+	virtual void          Commit() = 0;
+	virtual void          Rollback();
+
+	static void           GetIndex(int *dest, int count, Stream& src);
+	static void           SetIndex(Stream& dest, const int *src, int count);
+	static void           GetIndex(Vector<int>& dest, Stream& src)       { GetIndex(dest.Begin(), dest.GetCount(), src); }
+	static void           SetIndex(Stream& dest, const Vector<int>& src) { SetIndex(dest, src.Begin(), src.GetCount()); }
+
+protected:
+	enum
+	{
+		LOG2_INDEX_BYTES = 2,
+		INDEX_BYTES      = 1 << LOG2_INDEX_BYTES,
+	};
+
+	void                  FlushMaster();
+
+	virtual void          DoOpen();
+	virtual void          DoCreate();
+	virtual void          DoClose(); // NO-OP by default
+
+protected:
+	DataFile             *datafile;
+	dfid_t                id;
+	int                   master_index;
+	int                   cache_size;
+	int                   commit_index;
+	mutable bool          master_dirty;
+};
+
+class DataColumn : public DataClient
+{
+public:
+	DataColumn();
+	virtual ~DataColumn();
+
+	int                   GetCount() const                             { return row_count; }
+	virtual void          SetCount(int count) = 0;
+
+protected:
+	int                   row_count;
+};
+
+class DataColumnFix : public DataColumn
+{
+public:
+	DataColumnFix(int item_width);
+	virtual ~DataColumnFix();
+
+	virtual void          Unlink();
+	virtual void          Serialize(Stream& stream);
+	virtual void          Commit();
+	virtual void          SetCount(int count);
+	virtual int           GetUsedCacheSize() const;
+	virtual void          ShrinkCache();
+
+protected:
+	const byte           *GetRaw(int index);
+	void                  SetRaw(int index, const void *value);
+
+private:
+	virtual void          DoClose();
+
+	void                  FlushCache();
+	void                  ClearCache();
+	void                  FetchCache(int block);
+
+private:
+	enum
+	{
+		ADD_STEP = 10,
+	};
+
+	struct Block
+	{
+		Block() : dirty(false), index(-1) {}
+
+		int    index;
+		bool   dirty;
+		byte   buffer[DataFile::BLOCK_BYTES];
+	};
+
+	int                   item_width;
+	unsigned              per_block;
+	Vector<int>           block_index;
+	ArrayMap<int, Block>  cache;
+	int                   last_index;
+	int                   last_index1;
+	int                   last_index2;
+	int                   last_index3;
+	Block                *last_block;
+	Block                *last_block1;
+	Block                *last_block2;
+	Block                *last_block3;
+};
+
+class DataColumnVar : public DataColumn
+{
+public:
+	DataColumnVar();
+	virtual ~DataColumnVar();
+
+	virtual void          Unlink();
+	virtual void          Serialize(Stream& stream);
+	virtual void          Commit();
+	virtual void          SetCount(int count);
+	virtual int           GetUsedCacheSize() const;
+	virtual void          ShrinkCache();
+
+public:
+	enum
+	{
+		SHORT_BYTES  = 2,
+		MAX_BYTES    = DataFile::BLOCK_BYTES,
+		INIT_BYTES   = MAX_BYTES / 2,
+		JOIN_BYTES   = MAX_BYTES / 4,
+		SINGLE_BYTES = MAX_BYTES / 4,
+
+		ADD_STEP     = 100,
+	};
+
+protected:
+	String                GetRaw(int index);
+	void                  SetRaw(int index, String value);
+
+private:
+	struct Block
+	{
+		Block() : raw_dirty(false), total(SHORT_BYTES), offsets(SHORT_BYTES) {}
+
+		int                    offsets;
+		int                    total;
+		bool                   raw_dirty;
+		VectorMap<int, String> dirty;
+		String                 buffer;
+	};
+
+	virtual void          DoClose();
+
+	int                   FindBlock(int index) const;
+
+	void                  FlushCache();
+	void                  FlushCache(int index, int set_span = -1);
+	void                  ClearCache();
+	int                   FetchCache(int block);
+
+	int                   GetDataLength(int index) const;
+	bool                  CanJoin(int index, int length) const;
+	void                  JoinBlock(int index, char *buffer, int offset, int count);
+	int                   AddBlock(int index, char *buffer, int offset, int count);
+
+	void                  AdjustLastIndex(int i)
+	{
+		if(last_index < 0 || i < index_index[last_index] || i >= index_index[last_index + 1])
+			last_index = FindBlock(i);
+	}
+
+	void                  CheckCache() const;
+	void                  CheckBlock(const Block& b, int index) const;
+
+private:
+	Vector<int>           index_index;
+	Vector<int>           block_index;
+	Index<int>            cache_index;
+	Array<Block>          cache;
+	int                   last_index;
+	int                   current_size; // size of all cached objects
+};
+
+class DataRowIndex : public DataClient
+{
+public:
+	DataRowIndex();
+
+	virtual void          Unlink();
+	virtual void          Serialize(Stream& stream);
+	virtual void          Commit();
+	virtual int           GetUsedCacheSize() const;
+	virtual void          ShrinkCache();
+
+	int                   GetCount() const                             { return exact_count; }
+	int                   GetFirstEmpty() const                        { return first_empty; }
+	int                   GetEndIndex() const                          { return end_index; }
+
+	int                   Add();
+	Vector<int>           Add(int count);
+	void                  AddAt(int index);
+	void                  Remove(int index);
+	void                  Remove(const Vector<int>& index);
+
+	Vector<int>           GetIndex();
+	bool                  IsEmpty(int index);
+
+private:
+	struct Block
+	{
+		Block() : dirty(false) {}
+		bool        dirty;
+		Vector<int> data;
+
+		int         FindIndex(int offset) const;
+	};
+
+	virtual void          DoClose();
+
+	void                  FlushCache();
+	void                  ClearCache();
+	int                   FetchCache(int block);
+
+	void                  CalcFirstEmpty();
+	void                  CalcEndIndex();
+	void                  CalcExactCount();
+
+	void                  CheckBlock(const Block& block);
+	void                  UnCollapse();
+
+private:
+	enum
+	{
+		LOG2_BLOCK_ITEMS = DataFile::LOG2_BLOCK_BYTES - LOG2_INDEX_BYTES - 1,
+		BLOCK_ITEMS      = 1 << LOG2_BLOCK_ITEMS,
+	};
+
+	Vector<int>           block_index;
+	ArrayMap<int, Block>  cache;
+	int                   exact_count;
+	int                   end_index;
+	int                   first_empty;
+	int                   current_size;
+	bool                  collapsed;
+};
+
+class DataSource
+{
+public:
+	DataSource()                                              {}
+	virtual ~DataSource()                                     {}
+
+	virtual void   SetRowIndex(DataRowIndex *index)           {}
+
+	virtual Value  Get(int index) = 0;
+	Value          operator [] (int index)                    { return Get(index); }
+
+	virtual void   Add(int index, Value value)                { Set(index, value); }
+	virtual void   Set(int index, Value value) = 0;
+	virtual void   Remove(int index)                          { Set(index, Value()); }
+
+	virtual void   CheckAdd(int index, Value value)           { CheckSet(index, value); }
+	virtual void   CheckSet(int index, Value value)           {}
+
+	virtual void   Commit()                                   {}
+	virtual void   Rollback()                                 {}
+	virtual int    GetUsedCacheSize() const                   { return 0; }
+	virtual void   ShrinkCache()                              {}
+
+	virtual String Describe() const = 0;
+};
+
+template <class C>
+C& DataFetch(C& container, DataSource& source, const Vector<int>& index)
+{
+	typedef typename C::ValueType CVT;
+	for(const int *p = index.Begin(), *e = index.End(); p != e; ++p)
+		container.Add(CalcType<CVT>::ValueTo(source.Get(*p)));
+	return container;
+}
+
+template <class C>
+C DataFetch(DataSource& source, const Vector<int>& index, C * = 0)
+{
+	C container;
+	return DataFetch(container, source, index);
+}
+
+template <class C, class L>
+C& DataFetchSorted(C& container, DataSource& source, const Vector<int>& index, const L& sort, C * = 0)
+{
+	DataFetch(container, source, index);
+	Sort(container, sort);
+	return container;
+}
+
+template <class C, class L>
+C DataFetchSorted(DataSource& source, const Vector<int>& index, const L& sort, C * = 0)
+{
+	C container;
+	return DataFetchSorted(container, source, index);
+}
+
+class DataFilter : public DataSource
+{
+public:
+	DataFilter() : source(0) {}
+
+	void           SetSource(DataSource *_source)          { source = _source; }
+	DataSource    *GetSource() const                       { return source; }
+
+	virtual void   SetRowIndex(DataRowIndex *index)        { source -> SetRowIndex(index); }
+
+	virtual Value  Get(int index)                          { ASSERT(source); return source -> Get(index); }
+	virtual void   Add(int index, Value value)             { ASSERT(source); source -> Add(index, value); }
+	virtual void   Set(int index, Value value)             { ASSERT(source); source -> Set(index, value); }
+	virtual void   Remove(int index)                       { ASSERT(source); source -> Remove(index); }
+
+	virtual void   CheckAdd(int index, Value value)        { ASSERT(source); source -> CheckAdd(index, value); }
+	virtual void   CheckSet(int index, Value value)        { ASSERT(source); source -> CheckSet(index, value); }
+
+	virtual void   Commit()                                { ASSERT(source); source -> Commit(); }
+	virtual void   Rollback()                              { ASSERT(source); source -> Rollback(); }
+	virtual int    GetUsedCacheSize() const                { ASSERT(source); return source->GetUsedCacheSize(); }
+	virtual void   ShrinkCache()                           { ASSERT(source); source->ShrinkCache(); }
+
+protected:
+	DataSource    *source;
+};
+
+class DataConvertFilter : public DataFilter
+{
+public:
+	DataConvertFilter(const Convert& convert = NoConvert()) : convert(&convert) {}
+
+	void           SetConvert(const Convert& _convert)    { convert = &_convert; }
+	const Convert& operator <<= (const Convert& _convert) { convert = &_convert; return _convert; }
+
+	virtual Value  Get(int index);
+	virtual void   Set(int index, Value value);
+
+	virtual void   CheckSet(int index, Value value);
+
+protected:
+	const Convert *convert;
+};
+
+class DataMapFilter : public DataFilter
+{
+public:
+	DataMapFilter()                                             {}
+
+	void                SetMap(const Index<Value>& _map)        { map <<= _map; }
+	const Index<Value>& operator <<= (const Index<Value>& _map) { return map <<= _map; }
+
+	void                PickMap(Index<Value>& _map)             { map = _map; }
+	void                operator |= (Index<Value>& _map)        { map = _map; }
+
+	virtual void        CheckSet(int index, Value value);
+
+protected:
+	Index<Value>        map;
+};
+
+class DataMinMaxFilter : public DataFilter
+{
+public:
+	DataMinMaxFilter(double min = Null, double max = Null, bool not_null = false)
+		: min(min), max(max), not_null(not_null) {}
+
+	void                MinMax(double _min, double _max) { min = _min; max = _max; }
+	double              GetMin() const                   { return min; }
+	double              GetMax() const                   { return max; }
+
+	void                NotNull(bool _nn = true)         { not_null = true; }
+	void                NoNotNull()                      { not_null = false; }
+	bool                IsNotNull() const                { return not_null; }
+
+	virtual void        CheckSet(int index, Value value);
+
+protected:
+	double              min, max;
+	bool                not_null;
+};
+
+class DataOrderedIndexBase : public DataFilter, public DataClient
+{
+public:
+	DataOrderedIndexBase(bool lazy);
+
+	virtual void   Serialize(Stream& stream);
+	virtual void   Add(int index, Value value);
+	virtual void   Set(int index, Value value);
+	virtual void   Remove(int index);
+	virtual int    GetUsedCacheSize() const;
+	virtual void   ShrinkCache();
+
+#ifdef CHECK_INDEX
+	virtual void   CheckIndex() = 0;
+#endif
+	virtual void   SetRowIndex(DataRowIndex *ri)      { dirty = true; row_index = ri; DataFilter::SetRowIndex(ri); }
+
+	virtual void   Commit();
+	virtual void   Rollback();
+
+	Vector<int>    GetRange(Value min, Value max);
+	Vector<int>    GetEqual(const Index<Value>& values);
+	void           GetMinMax(Ref min, Ref max);
+	int            GetFirstEqual(Value value, int exclude_row = -1);
+
+	bool           IsEnabled() const                 { return !disabled; }
+	void           Disable();
+	void           Enable();
+
+	virtual String Describe() const;
+
+protected:
+	virtual void   DoClose();
+
+	virtual void   RefreshIndex() = 0;
+	virtual int    FindIndex(int index, Value value) = 0;
+
+protected:
+	DataRowIndex  *row_index;
+	bool           disabled;
+	bool           lazy;
+	bool           dirty;
+	Vector<int>    ordered_index;
+};
+
+template <class T>
+class DataOrderedIndex : public DataOrderedIndexBase
+{
+public:
+	DataOrderedIndex(bool lazy) : DataOrderedIndexBase(lazy) {}
+
+#ifdef CHECK_INDEX
+	virtual void   CheckIndex();
+#endif
+
+private:
+	virtual void   RefreshIndex();
+	virtual int    FindIndex(int index, Value value);
+
+private:
+	struct LessSort
+	{
+		LessSort(const Vector<T>& values) : values(values) {}
+		bool operator () (int i, int j) const
+		{
+			return values[i] < values[j] || values[i] == values[j] && i < j;
+		}
+		const Vector<T>& values;
+	};
+
+	struct LessFind
+	{
+		LessFind(DataSource *source, int rindex) : source(source), rindex(rindex) {}
+
+		bool operator () (int index, const T& value) const
+		{
+			T t = CalcType<T>::ValueTo(source -> Get(index));
+			return t < value || t == value && index < rindex;
+		}
+
+		DataSource *source;
+		int         rindex;
+	};
+};
+
+template <class T>
+void DataOrderedIndex<T>::RefreshIndex()
+{
+	if(!disabled && dirty) {
+		CDB_TIMING("DataOrderedIndex::RefreshIndex");
+		int start = msecs();
+		ASSERT(row_index);
+		if(!lazy)
+			master_dirty = !datafile -> IsReadOnly();
+		Vector<int> all = row_index->GetIndex();
+		Vector<T> values;
+		ordered_index.SetCount(all.GetCount());
+		values.SetCount(all.GetCount());
+		for(int i = 0; i < ordered_index.GetCount(); i++) {
+			ordered_index[i] = i;
+			values[i] = CalcType<T>::ValueTo(source->Get(all[i]));
+		}
+		Sort(ordered_index, LessSort(values));
+		for(int i = 0; i < ordered_index.GetCount(); i++)
+			ordered_index[i] = all[ordered_index[i]];
+		dirty = false;
+		RLOG(msecs(start) << " msec / DataOrderedIndex<" << typeid(T).name() << ">::RefreshIndex(" << source->Describe() << ")");
+	}
+}
+
+#ifdef CHECK_INDEX
+template <class T>
+void DataOrderedIndex<T>::CheckIndex()
+{
+	if(disabled)
+		return;
+	for(int i = 1; i < ordered_index.GetCount(); i++)
+		if(LessFind(source, ordered_index[i - 1])(ordered_index[i], CalcType<T>::ValueTo(source->Get(ordered_index[i - 1]))))
+		{
+			String s;
+			s << "CheckIndex error at " << i << "\n"
+				"[" << (i - 1) << "] = " << StdFormat(Get(ordered_index[i - 1]))
+				<< " (" << ordered_index[i - 1] << "), [" << i << "] = "
+				<< StdFormat(Get(ordered_index[i])) << " (" << ordered_index[i] << ")\n";
+			RLOG(s);
+			NEVER();
+		}
+}
+#endif
+
+template <class T>
+int DataOrderedIndex<T>::FindIndex(int index, Value value)
+{
+	return BinFindIndex(ordered_index, CalcType<T>::ValueTo(value), LessFind(source, index));
+}
+
+template <class T, int item_size, class C = T>
+class DataColumnFixSimple : public DataColumnFix, public DataSource
+{
+public:
+	typedef T ValueType;
+
+	DataColumnFixSimple() : DataColumnFix(item_size) {}
+
+	virtual void   Commit()                            { DataColumnFix::Commit(); }
+	virtual void   Rollback()                          { DataColumnFix::Rollback(); }
+	virtual int    GetUsedCacheSize() const            { return DataColumnFix::GetUsedCacheSize(); }
+	virtual void   ShrinkCache()                       { DataColumnFix::ShrinkCache(); }
+
+	virtual void   CheckSet(int index, Value v);
+
+	virtual String Describe() const                    { return GetTypeName(typeid(T).name()); }
+};
+
+template <class T, int item_size, class C>
+void DataColumnFixSimple<T, item_size, C>::CheckSet(int index, Value v)
+{
+	if(!IsNull(v) && !CalcType<C>::IsType(v))
+		throw ObjectExc('<' + StdFormat(v) + ">: o�ek�v�na hodnota typu '" + CalcType<C>::Describe() + '\'');
+}
+
+template <class T, class C = T>
+class DataColumnVarSimple : public DataColumnVar, public DataSource
+{
+public:
+	typedef T ValueType;
+
+	virtual void   Commit()                            { DataColumnVar::Commit(); }
+	virtual void   Rollback()                          { DataColumnVar::Rollback(); }
+	virtual int    GetUsedCacheSize() const            { return DataColumnVar::GetUsedCacheSize(); }
+	virtual void   ShrinkCache()                       { DataColumnVar::ShrinkCache(); }
+
+	virtual void   CheckSet(int index, Value v);
+
+	virtual String Describe() const                    { return GetTypeName(typeid(T).name()); }
+};
+
+template <class T, class C>
+void DataColumnVarSimple<T, C>::CheckSet(int index, Value v)
+{
+	if(!IsNull(v) && !CalcType<C>::IsType(v))
+		throw ObjectExc('<' + StdFormat(v) + ">: o�ek�v�na hodnota typu '" + CalcType<C>::Describe() + '\'');
+}
+
+template <class T, class C = T>
+class DataColumnFixOf : public DataColumnFixSimple<T, sizeof(T)>
+{
+public:
+	virtual Value Get(int index)                     { return (C)*(const T *)this->GetRaw(index); }
+	virtual void  Set(int index, Value value)        { T t = (C)value; this->SetRaw(index, &t); }
+};
+
+template <class T>
+class DataColumnOf;
+
+enum
+{
+	LOG2_BOOL_BLOCK_BITS = 5,
+	BOOL_BLOCK_BITS = 1 << LOG2_BOOL_BLOCK_BITS,
+	BOOL_BLOCK_BYTES = sizeof(int)
+};
+
+template <>
+class DataColumnOf<bool> : public DataColumnFixSimple<bool, BOOL_BLOCK_BYTES>
+{
+public:
+	virtual Value Get(int index);
+	virtual void  Set(int index, Value value);
+
+	virtual void  SetCount(int count);
+};
+
+template <> class DataColumnOf<byte>   : public DataColumnFixOf<byte, int> {};
+template <> class DataColumnOf<short>  : public DataColumnFixOf<short, int> {};
+template <> class DataColumnOf<int>    : public DataColumnFixOf<int> {};
+template <> class DataColumnOf<double> : public DataColumnFixOf<double> {};
+
+template <>
+class DataColumnOf<String> : public DataColumnVarSimple<String>
+{
+public:
+	virtual Value Get(int index)                     { return GetRaw(index); }
+	virtual void  Set(int index, Value value)        { SetRaw(index, value); }
+};
+
+template <> class DataColumnOf<Date> : public DataColumnFixSimple<Date, 3>
+{
+public:
+	virtual Value Get(int index);
+	virtual void  Set(int index, Value value);
+};
+
+template <>
+class DataColumnOf<Time> : public DataColumnFixSimple<Time, 5>
+{
+public:
+	virtual Value Get(int index);
+	virtual void  Set(int index, Value value);
+};
+
+template <>
+class DataColumnOf<Value> : public DataColumnVarSimple<Value>
+{
+public:
+	virtual Value Get(int index);
+	virtual void  Set(int index, Value value);
+};
+
+class DataTable;
+class DataLinkFilter;
+
+struct DataSet : DeepCopyOption<DataSet>
+{
+	DataSet(String table = Null) : table(table) {}
+	DataSet(String table, int i) : table(table) { set.SetCount(1, i); }
+	DataSet(const DataSet& d, int deep) : table(d.table), set(d.set, deep) {}
+	DataSet(String table, pick_ Vector<int>& set) : table(table), set(set) { Sort(); }
+	DataSet(String table, pick_ Vector<int>& set, int deep) : table(table), set(set, deep) { Sort(); }
+
+	DataSet& Sort();
+	DataSet  Copy() const                  { return DataSet(*this, 0); }
+
+	DataSet& operator &= (const DataSet& s);
+	DataSet& operator |= (const DataSet& s);
+	DataSet& operator -= (const DataSet& s);
+
+	bool     IsEmpty() const               { return set.IsEmpty(); }
+	int      GetCount() const              { return set.GetCount(); }
+	int      operator [] (int index) const { return set[index]; }
+
+	String table;
+	Vector<int> set;
+};
+
+DataSet operator && (const DataSet& a, const DataSet& b);
+DataSet operator || (const DataSet& a, const DataSet& b);
+DataSet operator - (const DataSet& a, const DataSet& b);
+
+class DataTableColumn : public DataClient
+{
+public:
+	DataTableColumn();
+
+	enum // special valuetypes
+	{
+		FIRST = -100,
+		SHORT_V,
+		BYTE_V,
+		BOOL_V,
+	};
+
+	enum // flags
+	{
+		NUMBER_INDEX   = 0x0001,
+		DATETIME_INDEX = 0x0002,
+		STRING_INDEX   = 0x0004,
+		INTEGER_INDEX  = 0x0008,
+//		HASH_INDEX     = 0x0008,
+//		ATOM_INDEX     = 0x0010,
+	};
+
+	DataTableColumn&  SetTable(DataTable *_owner)           { owner = _owner; return *this; }
+	DataTable        *GetTable() const                      { return owner; }
+	String            GetTableName() const;
+
+	void              SetStyle(int vtype, int flags);
+	int               GetType() const                       { return vtype; }
+	int               GetFlags() const                      { return flags; }
+
+	void              ModifyFlags(int flags);
+	void              Link(DataTable& table);
+	void              NoLink();
+
+	DataTableColumn&  SetRowIndex(DataRowIndex *_rx)        { row_index = _rx; return *this; }
+	DataRowIndex     *GetRowIndex() const                   { return row_index; }
+	DataSet           GetIndex() const;
+
+	DataTableColumn&  SetName(String _name)                 { column_name = _name; return *this; }
+	String            GetName() const                       { return column_name; }
+
+	String            GetDotName() const;
+
+	virtual void      Unlink();
+	virtual void      Commit();
+	void              Serialize(Stream& stream);
+	virtual int       GetUsedCacheSize() const;
+	virtual void      ShrinkCache();
+
+	DataSource&       GetSource()                           { ASSERT(source); return *source; }
+	DataSource&       operator ~()                          { return GetSource(); }
+
+	void              Set(int index, Value value);
+	Value             Get(int index);
+	Value             operator [] (int index);
+	Vector<Value>     Get(const Vector<int>& rowset);
+	Vector<int>       GetInt(const Vector<int>& rowset);
+
+	DataSet           GetRange(Value min, Value max);
+	DataSet           GetLike(WString mask);
+	DataSet           GetEqual(Value value);
+	DataSet           GetEqual(const Index<Value>& set);
+	DataSet           GetEqual(const Vector<int>& set);
+	int               GetFirstEqual(Value value, int exlude_row = -1);
+	bool              Exists(Value value)            { return GetFirstEqual(value) >= 0; }
+	void              GetMinMax(double& min, double& max);
+	void              GetMinMax(Time& min, Time& max);
+
+	DataSet           operator == (Value v)               { return GetEqual(v); }
+	DataSet           operator == (const Index<Value>& v) { return GetEqual(v); }
+	DataSet           operator == (const Vector<int>& v)  { return GetEqual(v); }
+	DataSet           operator != (Value v);
+	DataSet           operator != (const Index<Value>& v);
+	DataSet           operator != (const Vector<int>& v);
+	DataSet           operator >= (Value v)               { return GetRange(v, Null); }
+	DataSet           operator <= (Value v)               { return GetRange(Null, v); }
+
+	void              Describe(Stream& stream, int flags = 0);
+
+public:
+	DataTable        *owner;
+
+	String            column_name;
+	int               vtype;
+	int               flags;
+
+	DataRowIndex     *row_index;
+
+	DataSource       *source;
+	DataOrderedIndex<int>    *iindex;
+	DataOrderedIndex<double> *nindex;
+	DataOrderedIndex<Time>   *tindex;
+	DataOrderedIndex<String> *sindex;
+//	DataHashIndex    *hindex;
+//	DataAtomIndex    *aindex;
+
+	Array<DataFilter> filters;
+	Array<DataFilter> indexes;
+	One<DataLinkFilter> link;
+	One<DataClient>   client;
+	DataSource       *client_source;
+
+protected:
+	void              RefreshSource();
+	virtual void      DoClose();
+
+private:
+	template <class T>
+	void              IndexHelper(bool create, T *& index)
+	{
+		if(create) {
+			if(!index) {
+				filters.Add(index = new T(true));
+				index->Create(*datafile, id);
+				index->SetSource(&GetSource());
+				index->SetRowIndex(row_index);
+			}
+		}
+		else {
+			if(index) {
+				index->Unlink();
+				int i = indexes.GetIndex(*index);
+				if(i >= 0)
+					indexes.Remove(i);
+				index = 0;
+			}
+		}
+		master_dirty = true;
+	}
+};
+
+inline dword ValueTypeNo(const byte&)     { return DataTableColumn::BYTE_V; }
+inline dword ValueTypeNo(const short&)    { return DataTableColumn::SHORT_V; }
+//inline dword ValueTypeNo(const bool&)     { return DataTableColumn::BOOL_V; }
+
+class DataTable : public DataClient
+{
+public:
+	DataTable();
+	virtual ~DataTable();
+
+	void             Serialize(Stream& stream);
+	virtual void     Unlink();
+	virtual void     Commit();
+	virtual void     Rollback();
+	virtual int      GetUsedCacheSize() const;
+	virtual void     ShrinkCache();
+
+	int              Add(int index = -1);
+	int              Add(const Vector<Value>& row, int index = -1);
+	void             Set(int index, const Vector<Value>& row);
+	void             Remove(int index);
+	void             Remove(const DataSet& index);
+	Vector<Value>    Get(int index);
+	Vector<Value>    operator [] (int index)              { return Get(index); }
+	Vector<Value>    GetAlways(int index); // returns empty row when index is invalid
+
+	String           GetUserInfo() const                  { return user_info; }
+	void             SetUserInfo(String u)                { user_info = u; master_dirty = true; }
+
+	Vector<Value>    EmptyRow() const;
+
+	bool             IsEmpty(int index)                   { return row_index.IsEmpty(index); }
+	DataRowIndex&    GetRowIndex()                        { return row_index; }
+
+	DataSet          GetIndex()                           { return DataSet(table_name, row_index.GetIndex()); }
+	DataSet          operator ~ ()                        { return DataSet(table_name, row_index.GetIndex()); }
+
+	int              GetCount() const                     { return row_index.GetCount(); }
+	bool             IsEmpty() const                      { return row_index.GetCount() == 0; }
+
+	DataTableColumn& Column(int index)                    { return columns[index]; }
+	DataTableColumn& Column(String name);
+
+	DataTableColumn& operator () (int index)              { return Column(index); }
+	DataTableColumn& operator () (String name)            { return Column(name); }
+
+	Value            operator () (int index, int row)     { return Column(index)[row]; }
+	Value            operator () (String name, int row)   { return Column(name)[row]; }
+
+	int              GetColumns() const                   { return columns.GetCount(); }
+	String           GetName(int i) const                 { return columns.GetKey(i); }
+
+	int              FindColumn(String name) const        { return columns.Find(name); }
+	int              operator / (String name) const       { return columns.Find(name); }
+
+	int              AddColumn(String name, int vtype, int flags = 0);
+	void             RemoveColumn(String name);
+
+	void             AddLink(DataLinkFilter& link);
+	void             RemoveLink(DataLinkFilter& link);
+
+	void             SetName(String _name)                { table_name = _name; }
+	String           GetName() const                      { return table_name; }
+
+	enum
+	{
+		DUMP_ROWS     = 0x00000001,
+		EXPORT_FORMAT = 0x00000002,
+	};
+
+	void             Describe(Stream& stream, int flags = 0);
+	void             Export(Stream& stream);
+	String           Import(Stream& stream, bool import_id);
+
+protected:
+	String           table_name;
+	DataRowIndex     row_index;
+	ArrayMap<String, DataTableColumn> columns;
+	Vector<DataLinkFilter *> links;
+	String           user_info;
+
+private:
+	virtual void     DoClose();
+};
+
+class DataLinkFilter : public DataFilter
+{
+public:
+	DataLinkFilter(DataTableColumn& column, DataTable& table);
+	virtual ~DataLinkFilter();
+
+	void                Kill() { table = 0; column = 0; }
+
+	bool                Exists(int index)     { ASSERT(column); return column -> Exists(index); }
+	String              GetColumnName() const { ASSERT(column); return column -> GetDotName(); }
+
+	virtual void        CheckSet(int index, Value value);
+	virtual String      Describe() const;
+
+protected:
+	DataTable          *table;
+	DataTableColumn    *column;
+};
+
+class DataBase : public DataClient
+{
+public:
+	DataBase();
+
+	virtual void  Commit();
+	virtual void  Rollback();
+	virtual int   GetUsedCacheSize() const;
+	virtual void  ShrinkCache();
+
+	void          Serialize(Stream& stream);
+
+	int           GetCount() const                 { return tables.GetCount(); }
+	String        GetName(int i) const             { return tables.GetKey(i); }
+	int           Find(String name) const          { return tables.Find(name); }
+	DataTable&    Get(int i)                       { return tables[i]; }
+	DataTable&    Get(String name);
+
+	DataTable&    operator [] (int i)              { return tables[i]; }
+	DataTable&    operator [] (String name)        { return Get(name); }
+
+	bool          Exists(String tbl) const         { return Find(tbl) >= 0; }
+
+	DataTable&    GetAdd(String name);
+	DataTable&    Add(String name);
+	void          Remove(int i);
+	void          Remove(String name);
+	bool          TryRemove(String name);
+
+	void          Describe(Stream& stream, int flags = 0);
+
+	void          BeginBlock()                     { block_level++; }
+	void          EndBlock()                       { ASSERT(block_level > 0); block_level--; }
+	bool          InBlock() const                  { return block_level > 0; }
+
+	static void   AllocTest();
+	static void   ColumnTest();
+	static void   StructuredTest();
+
+	static void   FullTest();
+
+protected:
+	virtual void  DoClose();
+
+protected:
+	ArrayMap<String, DataTable> tables;
+	int           block_level;
+};
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/TCore/datafile.cpp b/uppsrc/TCore/datafile.cpp
new file mode 100644
index 000000000..9893b246d
--- /dev/null
+++ b/uppsrc/TCore/datafile.cpp
@@ -0,0 +1,1224 @@
+#include "TCoreDb.h"
+
+NAMESPACE_UPP
+
+static const char tag[] =
+"CDF: Cybex Data File version 1.0.\r\n"
+"Copyright �2000 Cybex Development, spol. s r.o.\r\n"
+"\x1A";
+
+DataFile::Header::Header()
+: version(VERSION)
+, object_count(0)
+, index_offset(0)
+{
+}
+
+bool DataFile::Header::Serialize(Stream& stream, bool write)
+{
+	if(write) {
+		stream.SetStoring();
+		memset(tag, 0, sizeof(tag));
+		CDB_ASSERT(sizeof(UPP::tag) < sizeof(tag));
+		strcpy(tag, UPP::tag);
+		version = VERSION;
+	}
+	else
+		stream.SetLoading();
+	stream.Seek(0);
+	stream.SerializeRaw((byte *)tag, sizeof(UPP::tag));
+	if(!write && strcmp(tag, UPP::tag))
+		return false;
+	StreamIL(stream, version);
+	if(version < MIN_VERSION || version > MAX_VERSION)
+		return false;
+	StreamIL(stream, object_count);
+	StreamIL(stream, index_offset);
+	if(write)
+		stream.Put(int(0), int(TOTAL - stream.GetPos()));
+	return true;
+}
+
+DataFile::Cache::Cache(int size)
+: size(size)
+, total(0)
+{
+}
+
+void DataFile::Cache::Clear()
+{
+	total = 0;
+	data.Clear();
+	dirty.Clear();
+}
+
+void DataFile::Cache::Put(int object, const String& value, bool write)
+{
+	CDB_ASSERT(dirty.GetCount() <= data.GetCount());
+	int i = Find(object);
+	total += value.GetLength() - (i >= 0 ? data[i].GetLength() : 0);
+	if(total > size) {
+		Remove(object);
+		WhenFlush();
+		Clear();
+		total = value.GetLength();
+		data.Add(object, value);
+	}
+	else if(i >= 0)
+		data[i] = value;
+	else
+		data.Add(object, value);
+	if(write)
+		dirty.FindAdd(object);
+	CDB_ASSERT(dirty.GetCount() <= data.GetCount());
+}
+
+void DataFile::Cache::Remove(int object)
+{
+	CDB_ASSERT(dirty.GetCount() <= data.GetCount());
+	int i;
+	if((i = data.Find(object)) >= 0) {
+		total -= data[i].GetLength();
+		data.Remove(i);
+	}
+	if((i = dirty.Find(object)) >= 0)
+		dirty.Remove(i);
+	CDB_ASSERT(dirty.GetCount() <= data.GetCount());
+}
+
+void DataFile::Cache::RemoveAbove(int object)
+{
+	CDB_ASSERT(dirty.GetCount() <= data.GetCount());
+	int i;
+	for(i = data.GetCount(); --i >= 0;)
+		if(data.GetKey(i) >= object) {
+			total -= data[i].GetLength();
+			data.Remove(i);
+		}
+	for(i = dirty.GetCount(); --i >= 0;)
+		if(dirty[i] >= object)
+			dirty.Remove(i);
+	CDB_ASSERT(dirty.GetCount() <= data.GetCount());
+}
+
+DataFile::DataFile()
+: large_block_size(LARGE_BLOCK_SIZE)
+, large_cache(LARGE_CACHE_SIZE)
+, small_cache(SMALL_CACHE_SIZE)
+, free_offset(Header::TOTAL)
+{
+	large_cache.WhenFlush = THISBACK(FlushLargeCache);
+	small_cache.WhenFlush = THISBACK(FlushSmallCache);
+}
+
+DataFile::~DataFile()
+{
+	Close();
+}
+
+bool DataFile::Open(const char *_filename, bool _read_only)
+{
+	Close();
+	filename = GetFullPath(_filename);
+	read_only = _read_only;
+	if(!stream.Open(filename, read_only ? FileStream::READ : FileStream::READWRITE | FileStream::NOWRITESHARE))
+		return false;
+	block_level = 0;
+	if(!ReadIndex()) {
+		Close();
+		return false;
+	}
+
+//	CHECK_INTEGRITY();
+
+	return true;
+}
+
+bool DataFile::Create(const char *_filename)
+{
+	Close();
+	filename = GetFullPath(_filename);
+	read_only = false;
+	block_level = 0;
+	if(!stream.Open(filename, FileStream::CREATE))
+		return false;
+	header = Header();
+	StreamHeader(true);
+	return true;
+}
+
+bool DataFile::Close()
+{
+	if(!IsOpen())
+		return true;
+	bool error = false;
+	Clear();
+	stream.Close();
+	return !error && !stream.IsError();
+}
+
+void DataFile::Clear()
+{
+	small_cache.Clear();
+	large_cache.Clear();
+	index.Clear();
+	write_id.Clear();
+	write_index.Clear();
+	write_objects.Clear();
+	free_objects.Clear();
+	free_list.Clear();
+	free_list_index.Clear();
+}
+
+Time DataFile::GetLastWriteTime() const
+{
+	ASSERT(IsOpen());
+#ifdef PLATFORM_WIN32
+	FileTime ft;
+	if(!GetFileTime(stream.GetHandle(), 0, 0, &ft))
+		return Null;
+	return ft;
+#endif
+#ifdef PLATFORM_POSIX
+	struct stat sb;
+	if(fstat(stream.GetHandle(), &sb))
+		return Null;
+	return FileTime(sb.st_mtime);
+#endif//PLATFORM_POSIX
+}
+
+int DataFile::GetOverhead() const
+{
+	foff_t size = Header::TOTAL + GetBlockSize(index.GetCount() * OBJECT_BYTES);
+	for(int i = 0; i < index.GetCount(); i++)
+		if(index[i].length > 0)
+			size += GetBlockSize(index[i].length);
+	return iscale(max<foff_t>(0, (int)stream.GetSize() - size), 100, max(size, 1));
+}
+
+bool DataFile::SaveAs(const char *new_file_name)
+{
+	Commit(0);
+	DataFile nf;
+	if(!nf.Create(new_file_name))
+		return false;
+	nf.SetCount(index.GetCount());
+	for(int i = 0; i < index.GetCount(); i++)
+		nf.Set(i, Get(i), 0);
+	nf.Commit(0);
+	if(!nf.Close()) {
+		DeleteFile(new_file_name);
+		return false;
+	}
+	Close();
+	return Open(new_file_name);
+}
+
+bool DataFile::Compact(const char *backup_file_name)
+{
+	if(read_only) {
+		NEVER();
+		return false;
+	}
+	String temp = ForceExt(filename, ".$$$");
+	DataFile aux;
+	if(!aux.Create(temp))
+		return false;
+	aux.SetCount(index.GetCount());
+	for(int i = 0; i < index.GetCount(); i++)
+		aux.Set(i, Get(i), 0);
+	aux.Commit(0);
+	if(!aux.Close()) {
+		DeleteFile(temp);
+		return false;
+	}
+	if(backup_file_name && !FileCopy(temp, backup_file_name))
+		return false;
+	Close();
+	FileDelete(filename);
+	return FileMove(temp, filename) && Open(filename);
+}
+
+void DataFile::BeginBlock()
+{
+	block_level++;
+}
+
+void DataFile::EndBlock()
+{
+	ASSERT(block_level > 0);
+	if(--block_level <= 0)
+		CommitFile();
+}
+
+void DataFile::CommitFile()
+{
+	ASSERT(block_level <= 0);
+	int start_msecs = msecs();
+	LOG("DataFile::CommitFile");
+
+	if(header.index_offset && header.object_count)
+		free_upon_commit.Add(Object(header.index_offset, header.object_count * OBJECT_BYTES));
+
+	LOG("DataFile::CommitFile / FlushIndex: t + " << msecs(start_msecs));
+	FlushIndex();
+	LOG("DataFile::CommitFile / FileFlush: t + " << msecs(start_msecs));
+	FileFlush(stream);
+	LOG("DataFile::CommitFile / StreamHeader: t + " << msecs(start_msecs));
+	StreamHeader(true);
+	LOG("DataFile::CommitFile / FileFlush: t + " << msecs(start_msecs));
+	FileFlush(stream);
+
+//	CHECK_INTEGRITY();
+
+	LOG("DataFile::CommitFile / FreeBlock: t + " << msecs(start_msecs));
+	while(!free_upon_commit.IsEmpty())
+		FreeBlock(free_upon_commit.Pop());
+
+	LOG("//DataFile::CommitFile: t + " << msecs(start_msecs));
+
+//	CHECK_INTEGRITY();
+}
+
+void DataFile::Commit(dfid_t id)
+{
+	CDB_TIMING("DataFile::Commit");
+	LOG("DataFile::Commit");
+	int start_msecs = msecs();
+
+	CDB_ASSERT(IsOpen());
+	if(read_only || id && write_id.Find(id) < 0)
+		return;
+
+	LOG("DataFile::Commit / FlushSmallCache: t + " << msecs(start_msecs));
+	FlushSmallCacheFor(id);
+	LOG("DataFile::Commit / FlushLargeCache: t + " << msecs(start_msecs));
+	FlushLargeCacheFor(id);
+
+	LOG("DataFile::Commit / live objects: t + " << msecs(start_msecs));
+	if(id == 0) { // commit everything
+		for(int i = 0; i < write_index.GetCount(); i++) {
+			int x = write_index[i];
+			CDB_ASSERT(x >= 0 && x < index.GetCount());
+			Object& o = index[x];
+			if(o.IsAlive())
+				free_upon_commit.Add(o);
+			o = write_objects[x];
+			CDB_ASSERT(o.length <= 0 || o.offset >= Header::TOTAL);
+		}
+		write_id.Clear();
+		write_index.Clear();
+	}
+	else {
+		Vector<int> to_remove;
+		bool to_sort = false;
+		for(int i = write_id.Find(id); i >= 0; i = write_id.FindNext(i)) {
+			int x = write_index[i];
+			CDB_ASSERT(x >= 0 && x < index.GetCount());
+			Object& o = index[x];
+			if(o.IsAlive())
+				free_upon_commit.Add(o);
+			o = write_objects[x];
+			to_sort = to_sort || (!to_remove.IsEmpty() && i < to_remove.Top());
+			to_remove.Add(i);
+		}
+		if(to_sort)
+			Sort(to_remove);
+		while(!to_remove.IsEmpty()) {
+			int i = to_remove.Pop();
+			write_id.Remove(i);
+			write_index.Remove(i);
+		}
+	}
+
+	LOG("DataFile::Commit / CommitFile: t + " << msecs(start_msecs));
+	if(block_level <= 0)
+		CommitFile();
+	LOG("//DataFile::Commit: t + " << msecs(start_msecs));
+}
+
+void DataFile::Rollback(dfid_t id)
+{
+	CHECK_INTEGRITY();
+
+	if(id == 0) { // full rollback
+		for(int i = 0; i < write_index.GetCount(); i++) {
+			int x = write_index[i];
+			FreeBlock(write_objects[x]);
+			write_objects[x] = index[x];
+		}
+		write_id.Clear();
+		write_index.Clear();
+		small_cache.Clear();
+		large_cache.Clear();
+	}
+	else {
+		Vector<int> to_remove;
+		bool to_sort = false;
+		for(int i = write_id.Find(id); i >= 0; i = write_id.FindNext(i)) {
+			int x = write_index[i];
+			small_cache.Remove(x);
+			large_cache.Remove(x);
+			CDB_ASSERT(x >= 0 && x < index.GetCount());
+			FreeBlock(write_objects[x]);
+			write_objects[x] = index[x];
+			to_sort = to_sort || (!to_remove.IsEmpty() && i < to_remove.Top());
+			to_remove.Add(i);
+		}
+		if(to_sort)
+			Sort(to_remove);
+		while(!to_remove.IsEmpty()) {
+			int i = to_remove.Pop();
+			write_id.Remove(i);
+			write_index.Remove(i);
+		}
+	}
+
+	CHECK_INTEGRITY();
+}
+
+bool DataFile::Import(Stream& stream)
+{
+	String line;
+	for(;;) {
+		const char *p = line;
+		while(*p && *p != '#' && *p++ != '[')
+			;
+		if(*p == ']')
+			return true; // end of import
+		if(*p == '=') { // item count
+			int count = stou(p + 1);
+			if(count < 0)
+				return false;
+			SetCount(count);
+		}
+		else if(*p == '-') { // delete item
+			int item = stou(p + 1);
+			if(IsValidIndex(item))
+				Remove(item, 0);
+		}
+		else if(IsDigit(*p)) { // item value
+			int index = stou(p, &p);
+			if(!IsValidIndex(index) || *p++ != ']')
+				continue;
+			String data;
+			while(*p != '[') {
+				while(*p && (byte)*p <= ' ')
+					p++;
+				byte c1, c2;
+				while((c1 = ctoi(p[0])) < 16 && (c2 = ctoi(p[1])) < 16) {
+					data.Cat(c1 * 16 + c2);
+					p += 2;
+				}
+				if(stream.IsEof())
+					break;
+				line = stream.GetLine();
+				p = line;
+			}
+			Set(index, data, 0);
+			continue;
+		}
+		if(stream.IsEof())
+			return true;
+		line = stream.GetLine();
+	}
+}
+
+void DataFile::Export(Stream& stream)
+{
+	stream.PutLine("# Cybex DataFile export version 1.0");
+	stream.Put("# Export time: ");
+	stream.Put(Format(GetSysTime()));
+	stream.PutCrLf();
+	int c = GetCount();
+	stream.Put(Format("[=%d]", c));
+	stream.PutCrLf();
+	for(int i = 0; i < c; i++)
+		if(!IsVoid(i)) {
+			String item = Get(i);
+			stream.Put(Format("[%d]", i));
+			const char *p = item.Begin(), *e = item.End();
+			if(p == e)
+				stream.PutCrLf();
+			else
+				do {
+					const char *b = p + min<ptrdiff_t>(e - p, 32);
+					stream.Put('\t');
+					static const char hex[] = "0123456789abcdef";
+					while(p < b) {
+						stream.Put(hex[(*p >> 4) & 15]);
+						stream.Put(hex[*p & 15]);
+						p++;
+					}
+					stream.PutCrLf();
+				}
+				while(p < e);
+		}
+	stream.PutLine("[] # end of export");
+}
+
+void DataFile::SetCache(int lbs, int scs, int lcs)
+{
+	FlushLargeCache();
+	FlushSmallCache();
+	large_block_size = lbs;
+	small_cache.size = scs;
+	large_cache.size = lcs;
+}
+
+void DataFile::SetCount(int count)
+{
+	int old = GetCount();
+	if(count < old) {
+		int i, x;
+		for(i = count; i < old; i++)
+			FreeBlock(index[i]);
+
+		for(i = write_index.GetCount(); --i >= 0;)
+			if((x = write_index[i]) >= count) { // remove item
+				FreeBlock(write_objects[x]);
+				write_id.Remove(i);
+				write_index.Remove(i);
+			}
+
+	}
+	write_objects.SetCountR(count);
+	index.SetCountR(count);
+}
+
+String DataFile::Get(int object)
+{
+//	if(object == 313 || object == 80)
+//		__asm int 3
+
+	CDB_TIMING("DataFile::Get");
+
+//	CHECK_INTEGRITY();
+	int i;
+	if((i = small_cache.Find(object)) >= 0)
+		return small_cache[i];
+	if((i = large_cache.Find(object)) >= 0)
+		return large_cache[i];
+	if(!IsValidIndex(object)) {
+		NEVER();
+		return String::GetVoid();
+	}
+	Object& o = write_objects[object];
+	i = o.length;
+	if(i < 0)
+		return String::GetVoid();
+	if(i == 0)
+		return Null;
+	CDB_ASSERT(o.offset >= Header::TOTAL);
+	String s = ReadBlock(o.offset, i);
+	Cache& cache = (i >= large_block_size ? large_cache : small_cache);
+	if(i <= cache.size)
+		cache.Put(object, s, false);
+	return s;
+}
+
+void DataFile::Set(int object, const String& data, dfid_t id)
+{
+	CDB_TIMING("DataFile::Set");
+	ASSERT(!IsReadOnly());
+
+//	CHECK_INTEGRITY();
+	LOG("Put(" << object << ", " << data.GetLength() << "); stream size = " << stream.GetSize());
+	if(object < 0) {
+		NEVER();
+		return;
+	}
+	if(object >= GetCount())
+		SetCount(object + 1);
+	int w = write_index.Find(object);
+	if(w >= 0) { // object has been already written to - check id equality
+		if(write_id[w] != id) {
+			String s;
+			s << "<DataFile::Set(" << object << "), ID = " << id << " / " << write_id[w]
+				<< ">: nesouhlas ID p�i z�pisu do datov�ho souboru";
+			throw ObjectExc(s);
+		}
+		Object& o = write_objects[object];
+		foff_t offset = o.offset;
+		o.offset = 0;
+		if(offset && o.length > 0)
+			FreeBlock(offset, o.length);
+	}
+	else { // add new update entry to write table
+		w = write_index.GetCount();
+		write_id.Add(id);
+		write_index.Add(object);
+		ASSERT(write_id.GetCount() == write_index.GetCount());
+	}
+	Object& o = write_objects[object];
+	o.offset = 0;
+	int l = data.GetLength();
+	if(l == 0) { // clear item
+		small_cache.Remove(object);
+		large_cache.Remove(object);
+	}
+	else if(l >= large_block_size) {
+		small_cache.Remove(object);
+		if(l <= large_cache.size)
+			large_cache.Put(object, data, true);
+		else
+			o.offset = WriteBlock(data);
+	}
+	else {
+		large_cache.Remove(object);
+		if(l <= small_cache.size)
+			small_cache.Put(object, data, true);
+		else
+			o.offset = WriteBlock(data);
+	}
+	o.length = l;
+//	CHECK_INTEGRITY();
+}
+
+int DataFile::Add(dfid_t id)
+{
+	CDB_TIMING("DataFile::Add");
+
+	if(!free_objects.IsEmpty())
+		return free_objects.Pop();
+	int c = GetCount();
+	SetCount(c + 1);
+	int w = write_index.Find(c);
+	if(w >= 0)
+		write_id.Set(w, id);
+	return c;
+}
+
+void DataFile::Remove(int object, dfid_t id)
+{
+	CDB_TIMING("DataFile::Remove");
+
+//	CHECK_INTEGRITY();
+
+	if(!IsValidIndex(object)) {
+		NEVER();
+		return;
+	}
+	large_cache.Remove(object);
+	small_cache.Remove(object);
+	int w = write_index.Find(object);
+	if(w >= 0) {
+		if(write_id[w] != id) {
+			String s;
+			s << "<DataFile::Remove(" << object << "), ID = " << write_id[w] << " -> " << id
+				<< ">: nesouhlas ID p�i maz�n� objektu";
+			throw ObjectExc(s);
+		}
+		Object& o = write_objects[object];
+		FreeBlock(o);
+		o.length = -1;
+	}
+	else {
+		w = write_index.GetCount();
+		write_id.Add(id);
+		write_index.Add(object);
+		write_objects[object].length = -1;
+	}
+
+//	CHECK_INTEGRITY();
+}
+
+bool DataFile::StreamHeader(bool write)
+{
+	CDB_ASSERT(IsOpen());
+	CDB_ASSERT(!write || !read_only);
+	return header.Serialize(stream, write);
+}
+
+bool DataFile::ReadIndex()
+{
+	if(!StreamHeader(false))
+		return false;
+	int index_block_length = header.object_count * OBJECT_BYTES;
+	String raw_index = ReadBlock(header.index_offset, index_block_length);
+	if(raw_index.GetLength() != index_block_length)
+		return false;
+	index.SetCount(header.object_count);
+	foff_t sum_length = Header::TOTAL + GetBlockSize(index_block_length) - GRANULARITY + 1;
+	foff_t file_length = (int)stream.GetSize();
+	for(int i = 0; i < index.GetCount(); i++) {
+		const char *p = raw_index.Begin() + OBJECT_BYTES * i;
+		Object& obj = index[i];
+		if((obj.length = Peek32le(p + OFFSET_BYTES)) > 0) {
+			obj.offset = Peek32le(p);
+			if(obj.offset < Header::TOTAL || obj.offset >= file_length)
+				return false; // block damaged
+			sum_length += GetBlockSize(obj.length);
+		}
+	}
+	write_objects <<= index;
+	if(sum_length > (foff_t)stream.GetSize())
+		return false; // file consistence violated
+	CreateFreeList();
+	return true;
+}
+
+String DataFile::ReadBlock(foff_t offset, int length)
+{
+	CDB_TIMING("DataFile::ReadBlock");
+
+	if(length <= 0)
+		return Null;
+	int total = length;
+	int reserve = length + OFFSET_BYTES - 1;
+	if(length <= BLOCK_BYTES) { // simple storage
+		StringBuffer result(length);
+		Read(result, offset, length);
+		return result;
+	}
+	int buffer[10];
+	buffer[0] = length;
+	buffer[1] = (length = ((length - 1) >> LOG2_BLOCK_BYTES) + 1) << LOG2_OFFSET_BYTES;
+	int depth = 1;
+	while(length > BLOCK_OFFSETS) {
+		length = ((length - 1) >> LOG2_BLOCK_OFFSETS) + 1;
+		buffer[++depth] = length << LOG2_OFFSET_BYTES;
+	}
+	if(buffer[depth] > reserve)
+		ThrowRead();
+	StringBuffer result(reserve);
+	char *ptr = result;
+	char *off = ptr + reserve - buffer[depth];
+	Read(off, offset, buffer[depth]);
+	do { // indirection step
+		int dl = buffer[--depth];
+		const char *os = off;
+		if(dl > reserve)
+			ThrowRead();
+		char *od = off = (depth ? ptr + reserve - dl : ptr);
+		while(dl > 0) {
+			foff_t foff = Peek32le(os);
+			os += OFFSET_BYTES;
+			int part = min<int>(dl, BLOCK_BYTES);
+			Read(od, foff, part);
+			od += part;
+			dl -= part;
+		}
+	}
+	while(depth);
+
+	result.SetCount(total);
+	return result;
+}
+
+void DataFile::EnumBlock(Array<Object>& dest, foff_t offset, int length)
+{
+	CDB_TIMING("DataFile::EnumBlock");
+
+	if(length <= 0)
+		return;
+
+	if(length <= BLOCK_BYTES) {
+		dest.Add(Object(offset, (length + GRANULARITY - 1) & -GRANULARITY));
+		return;
+	}
+
+	struct Layer : public Vector<byte> {
+		int          avail;
+		int          count;
+		int          index;
+	};
+
+	Layer layers[10];
+	layers[0].count = length;
+	layers[1].count = length = ((length - 1) >> LOG2_BLOCK_BYTES) + 1;
+	layers[1].index = 0;
+	layers[1].SetCount(BLOCK_BYTES);
+	int layer = 1;
+	while(length > BLOCK_OFFSETS) {
+		layer++;
+		layers[layer].count = length = ((length - 1) >> LOG2_BLOCK_OFFSETS) + 1;
+		layers[layer].index = 0;
+		layers[layer].SetCount(BLOCK_BYTES);
+	}
+
+	int len = ((layers[layer].avail = layers[layer].count) << LOG2_OFFSET_BYTES);
+	Read(layers[layer].Begin(), offset, len);
+	dest.Add(Object(offset, (len + GRANULARITY - 1) & -GRANULARITY));
+	int current = layer;
+	for(;;) {
+		while(layers[current].index >= layers[current].avail) // finished layer - step up one layer
+			if(++current > layer)
+				return; // done
+		offset = Peek32le(layers[current].Begin() + OFFSET_BYTES * layers[current].index++);
+		if(current == 1) { // final block - add to block list
+			length = min<int>(layers[0].count, BLOCK_BYTES);
+			layers[0].count -= length;
+			dest.Add(Object(offset, (length + GRANULARITY - 1) & -GRANULARITY));
+		}
+		else { // pointer block - step down one block
+			Layer& l = layers[--current];
+			l.index = 0;
+			l.avail = min<int>(l.count, BLOCK_OFFSETS);
+			l.count -= l.avail;
+			len = l.avail << LOG2_OFFSET_BYTES;
+			Read(l.Begin(), offset, len);
+			dest.Add(Object(offset, (len + GRANULARITY - 1) & -GRANULARITY));
+		}
+	}
+}
+
+void DataFile::CheckIntegrity()
+{
+	CDB_TIMING("DataFile::CheckIntegrity");
+
+	int i;
+//*
+	int f;
+	foff_t start = Header::TOTAL;
+	Array<Object> raw;
+	EnumBlock(raw, header.index_offset, header.object_count * OBJECT_BYTES);
+
+	ASSERT(index.GetCount() == write_objects.GetCount());
+	for(i = 0; i < index.GetCount(); i++) {
+		Object& o = index[i];
+		Object& w = write_objects[i];
+		if(o.IsAlive())
+			EnumBlock(raw, o.offset, o.length);
+		if(w.IsAlive() && (!o.IsAlive() || o.offset != w.offset || o.length != w.length))
+			EnumBlock(raw, w.offset, w.length);
+	}
+
+	Sort(raw, &Object::OffsetLess);
+
+	for(i = f = 0; i < raw.GetCount() || f < free_list.GetCount();) {
+		if(i >= raw.GetCount() || f < free_list.GetCount() && free_list[f].offset < raw[i].offset) { // free item
+			const Object& free = free_list[f++];
+			if(free.offset < start) {
+				String dump;
+				dump << "CheckIntegrity error\n"
+					"\n"
+					"free_list[" << (f - 1) << "].offset = " << free.offset
+					<< ", end of previous = " << start << " (length = " << free.length << ")\n";
+				fputs(dump, stderr);
+				NEVER();
+			}
+			start = free.offset + free.length;
+		}
+		else {
+			const Object& o = raw[i++];
+			if(o.offset == 0 || o.length <= 0)
+				continue;
+			if(o.offset < start) { // object crash - find object index
+				int i = index.GetCount();
+				while(--i >= 0 && index[i].offset != o.offset)
+					;
+				String dump;
+				dump << "CheckIntegrity error\n"
+					"\n"
+					"object[" << i << "].offset = " << o.offset
+					<< ", end of previous = " << start << " (length = " << o.length << ")\n";
+				fputs(dump, stderr);
+				NEVER();
+			}
+			start = o.offset + o.length;
+		}
+	}
+//*/
+	for(i = 1; i < free_list_index.GetCount(); i++)
+		if(!Object::PtrLess(free_list_index[i - 1], free_list_index[i])) {
+			String dump;
+			dump << "CheckIntegrity error\n"
+				"\n"
+				"free_list_index[" << (i - 1) << "] > free_list_index[" << i << "]\n";
+			fputs(dump, stderr);
+			NEVER();
+		}
+}
+
+void DataFile::CheckAvailability(foff_t start, int length)
+{
+	CDB_TIMING("DataFile::CheckAvailability");
+
+	if(length <= 0)
+		return;
+	for(int i = 0; i < index.GetCount(); i++) {
+		const Object& o = index[i];
+		if(o.length > 0 && o.offset) {
+			Array<Object> aobj;
+			EnumBlock(aobj, o.offset, o.length);
+			for(int t = 0; t < aobj.GetCount(); t++)
+				VERIFY(aobj[t].offset + aobj[t].length <= start || start + length <= aobj[t].offset);
+		}
+	}
+}
+
+foff_t DataFile::AllocatePart(int block_size)
+{
+	CDB_TIMING("AllocatePart");
+//	CHECK_INTEGRITY();
+
+	block_size = (block_size + GRANULARITY - 1) & -GRANULARITY;
+	int pos = BinFindIndex(free_list_index, block_size, &Object::PtrLessLength);
+	if(pos < free_list_index.GetCount()) { // found in free list - allocate block
+		Object *p = free_list_index[pos];
+		foff_t result = p -> offset;
+		if(p -> length < block_size + GRANULARITY) { // allocate the whole block
+			int ind = BinFindIndex(free_list, free_list_index[pos] -> offset, &Object::LessOffset);
+			CDB_ASSERT(ind < free_list.GetCount());
+			free_list_index.Remove(pos);
+			free_list.Remove(ind);
+		}
+		else { // modify block & move pointer around in free index
+			p -> offset += block_size;
+			p -> length -= block_size;
+			ReorderFreeItem(pos);
+		}
+//		LOG("AllocatePart(" << block_size << ") -> free " << result);
+		return result;
+	}
+
+//	CHECK_INTEGRITY();
+
+	foff_t foff = free_offset;
+	free_offset += block_size;
+
+//	LOG("AllocatePart(" << block_size << ") -> more " << foff);
+	return foff;
+}
+
+void DataFile::FreePart(foff_t offset, int length)
+{
+	CDB_TIMING("DataFile::FreePart");
+
+	if(length <= 0)
+		return;
+
+//	CHECK_INTEGRITY();
+	length = (length + GRANULARITY - 1) & -GRANULARITY;
+
+//	LOG("FreePart(" << offset << ", " << length << ")");
+	int pos = BinFindIndex(free_list, offset, &Object::LessOffset);
+	if(pos > 0) {
+		Object& prev = free_list[pos - 1];
+		if(prev.offset + prev.length == offset) { // connect to previous block
+			int ind = BinFindIndex(free_list_index, &prev, &Object::PtrLess);
+			CDB_ASSERT(ind < free_list_index.GetCount());
+			int new_length = prev.length + length;
+			if(pos < free_list.GetCount() && free_list[pos].offset == prev.offset + new_length) { // connect with the following block as well
+				int ind2 = BinFindIndex(free_list_index, &free_list[pos], &Object::PtrLess);
+				CDB_ASSERT(ind2 < free_list_index.GetCount() && ind2 != ind);
+				prev.length += free_list[pos].length;
+				free_list.Remove(pos);
+				free_list_index.Remove(ind2);
+				if(ind2 < ind)
+					ind--;
+			}
+			else
+				prev.length = new_length;
+			ReorderFreeItem(ind);
+			return;
+		}
+	}
+	if(pos < free_list.GetCount() && free_list[pos].offset == offset + length) { // join with next
+		Object& next = free_list[pos];
+		int ind = BinFindIndex(free_list_index, &next, &Object::PtrLess);
+		CDB_ASSERT(ind < free_list_index.GetCount());
+		next.offset = offset;
+		next.length += length;
+		ReorderFreeItem(ind);
+		return;
+	}
+//	CHECK_INTEGRITY();
+
+	// insert new entry
+	Object *p = new Object(offset, length);
+	free_list.Insert(pos, p);
+	int ind = BinFindIndex(free_list_index, p, &Object::PtrLess);
+	free_list_index.Insert(ind, p);
+
+//	CHECK_INTEGRITY();
+}
+
+int DataFile::WriteBlock(const String& data)
+{
+	CDB_TIMING("DataFile::WriteBlock");
+
+	int length = data.GetLength();
+	if(length == 0)
+		return 0;
+	if(length <= BLOCK_BYTES) { // direct write
+//		CHECK_INTEGRITY();
+		foff_t offset = AllocatePart(length);
+		CHECK_AVAILABILITY(offset, length);
+		Write(data, offset, length);
+		return offset;
+	}
+	Vector< Vector<byte> > offset_map;
+	const char *p = data;
+	while(length > 0) {
+		int part = min<int>(length, BLOCK_BYTES);
+		foff_t poff = AllocatePart(part);
+		CHECK_AVAILABILITY(poff, part);
+		Write(p, poff, part);
+		p += part;
+		length -= part;
+		int pix = 0;
+		for(;;) {
+			if(pix >= offset_map.GetCount())
+				offset_map.Add().Reserve(BLOCK_BYTES);
+			Vector<byte>& v = offset_map[pix];
+			int q = v.GetCount();
+			v.InsertN(q, OFFSET_BYTES);
+			Poke32le(&v[q], poff);
+			if(v.GetCount() < BLOCK_BYTES)
+				break;
+			poff = AllocatePart(BLOCK_BYTES);
+			CHECK_AVAILABILITY(poff, BLOCK_BYTES);
+			Write(v.Begin(), poff, BLOCK_BYTES);
+			v.Clear();
+			pix++;
+		}
+	}
+	int t = 0;
+	while(t < offset_map.GetCount() && offset_map[t].IsEmpty())
+		t++;
+	if(t >= offset_map.GetCount())
+		ThrowWrite(); // internal error
+	int poff;
+	for(;;) {
+		Vector<byte>& v = offset_map[t];
+		poff = AllocatePart(v.GetCount());
+		CHECK_AVAILABILITY(poff, v.GetCount());
+		Write(v.Begin(), poff, v.GetCount());
+		if(++t >= offset_map.GetCount())
+			return poff;
+		int q = offset_map[t].GetCount();
+		offset_map[t].InsertN(q, OFFSET_BYTES);
+		Poke32le(&offset_map[t][q], poff);
+	}
+}
+
+void DataFile::FlushSmallCacheFor(dfid_t id)
+{
+	CDB_TIMING("DataFile::FlushSmallCache");
+
+//	CHECK_INTEGRITY();
+	CDB_ASSERT(small_cache.dirty.GetCount() <= small_cache.data.GetCount());
+	dfid_t mask = dfid_t(id ? -1 : 0);
+	for(int i = small_cache.dirty.GetCount(); --i >= 0;) {
+		int b = small_cache.dirty[i], t, w;
+		if(IsValidIndex(b) && (t = small_cache.Find(b)) >= 0
+			&& (w = write_index.Find(b)) >= 0) {
+			if((write_id[w] & mask) == id) {
+				CDB_ASSERT(write_objects[b].length == small_cache[t].GetLength());
+				write_objects[b].offset = WriteBlock(small_cache[t]);
+				small_cache.dirty.Remove(i);
+			}
+		}
+		else
+			NEVER();
+	}
+//	CHECK_INTEGRITY();
+}
+
+void DataFile::FlushLargeCacheFor(dfid_t id)
+{
+	CDB_TIMING("DataFile::FlushLargeCache");
+
+//	CHECK_INTEGRITY();
+	CDB_ASSERT(large_cache.dirty.GetCount() <= large_cache.data.GetCount());
+	dfid_t mask = dfid_t(id ? -1 : 0);
+	for(int i = large_cache.dirty.GetCount(); --i >= 0;) {
+		int b = large_cache.dirty[i], t, w;
+		if(IsValidIndex(b) && (t = large_cache.Find(b)) >= 0
+			&& (w = write_index.Find(b)) >= 0) {
+			if((write_id[w] & mask) == id) {
+				CDB_ASSERT(write_objects[b].length == large_cache[t].GetLength());
+				write_objects[b].offset = WriteBlock(large_cache[t]);
+				large_cache.dirty.Remove(i);
+			}
+		}
+		else
+			NEVER();
+	}
+	CHECK_INTEGRITY();
+}
+
+int DataFile::GetBlockSize(int length)
+{
+	int sum = (length + GRANULARITY - 1) & -GRANULARITY;
+	if(length > BLOCK_BYTES) {
+		length = ((length - 1) >> LOG2_BLOCK_BYTES) + 1;
+		sum += length << LOG2_OFFSET_BYTES;
+		while(length > BLOCK_OFFSETS) {
+			length = ((length - 1) >> LOG2_BLOCK_OFFSETS) + 1;
+			sum += length << LOG2_OFFSET_BYTES;
+		}
+	}
+	return sum;
+}
+
+void DataFile::Read(void *dest, int offset, int length)
+{
+	CDB_TIMING("DataFile::Read");
+
+	int fs = (int)stream.GetSize();
+	if(offset < 0 || length < 0 || length > fs || offset + length > fs)
+		ThrowRead();
+	if(length <= 0)
+		return;
+	stream.Seek(offset);
+	if(!stream.GetAll(dest, length) || stream.IsError())
+		ThrowRead();
+}
+
+void DataFile::Write(const void *src, int offset, int length)
+{
+	CDB_TIMING("DataFile::Write");
+
+	int fs = (int)stream.GetSize();
+	if(offset < 0 || length < 0)
+		ThrowWrite();
+	if(length == 0)
+		return;
+	if(offset > fs) {
+		stream.Seek(fs);
+		stream.Put(0, offset - fs);
+	}
+	else
+		stream.Seek(offset);
+	stream.Put(src, length);
+	if(stream.IsError())
+		ThrowWrite();
+}
+
+void DataFile::ThrowRead() const
+{
+	throw ObjectExc("Chyba p�i �ten� souboru '" + filename + "'.");
+}
+
+void DataFile::ThrowWrite() const
+{
+	throw ObjectExc("Chyba p�i z�pisu do souboru '" + filename + "'.");
+}
+
+void DataFile::CreateFreeList()
+{
+	free_list.Clear();
+	free_list_index.Clear();
+	free_offset = Header::TOTAL;
+	Array<Object> data_blocks;
+	EnumBlock(data_blocks, header.index_offset, header.object_count << LOG2_OBJECT_BYTES);
+	int i;
+	for(i = 0; i < index.GetCount(); i++)
+		if(write_index.Find(i) < 0 && index[i].IsAlive())
+			EnumBlock(data_blocks, index[i].offset, index[i].length);
+
+	for(i = 0; i < write_objects.GetCount(); i++)
+		if(write_objects[i].IsAlive())
+			EnumBlock(data_blocks, write_objects[i].offset, write_objects[i].length);
+
+	Sort(data_blocks, &Object::OffsetLess);
+	if(data_blocks.IsEmpty())
+		return; // no data
+	for(i = 0; i < data_blocks.GetCount(); i++) {
+		const Object& o = data_blocks[i];
+		if(o.offset >= free_offset + GRANULARITY)
+			free_list.Add(new Object(free_offset, (o.offset - free_offset) & -GRANULARITY));
+		free_offset = o.offset + ((o.length + GRANULARITY - 1) & -GRANULARITY);
+	}
+	free_list_index.SetCount(free_list.GetCount());
+	for(i = 0; i < free_list.GetCount(); i++)
+		free_list_index[i] = &free_list[i];
+	Sort(free_list_index, &Object::PtrLess);
+//	CHECK_INTEGRITY();
+}
+
+void DataFile::FreeBlock(foff_t offset, int length)
+{
+	CDB_TIMING("DataFile::FreeBlock");
+
+	if(offset == 0 || length <= 0)
+		return;
+//	CHECK_INTEGRITY();
+	Array<Object> parts;
+	EnumBlock(parts, offset, length);
+	for(int i = 0; i < parts.GetCount(); i++)
+		FreePart(parts[i].offset, parts[i].length);
+//	CHECK_INTEGRITY();
+}
+
+void DataFile::ReorderFreeItem(int pos)
+{
+	CDB_TIMING("DataFile::ReorderFreeItem");
+
+	CDB_ASSERT(pos >= 0 && pos < free_list_index.GetCount());
+	Object *p = free_list_index[pos];
+	bool lok = (pos == 0 || Object::PtrLess(free_list_index[pos - 1], p));
+	bool rok = (pos == free_list_index.GetCount() - 1 || Object::PtrLess(p, free_list_index[pos + 1]));
+	if(!rok) { // move item up
+		Object **op = free_list_index.Begin() + pos + 1, **oe = free_list_index.End();
+		int n = BinFindIndex(op, oe, p, &Object::PtrLess);
+		Copy(op - 1, op, op + n);
+		op[n - 1] = p;
+	}
+	else if(!lok) { // move item down
+		Object **op = free_list_index.Begin() + pos, **ob = free_list_index.Begin();
+		int n = BinFindIndex(ob, op, p, &Object::PtrLess);
+		CopyBackward(op + 1, op, ob + n);
+		ob[n] = p;
+	}
+//	CHECK_INTEGRITY();
+}
+
+void DataFile::FlushIndex()
+{
+	CDB_TIMING("DataFile::FlushIndex");
+//	CHECK_INTEGRITY();
+
+	StringStream out;
+	for(int i = 0; i < index.GetCount(); i++) {
+		const Object& o = index[i];
+		CDB_ASSERT(o.length <= 0 || o.offset >= Header::TOTAL);
+		out.PutIL(o.offset);
+		out.PutIL(o.length);
+	}
+	header.index_offset = WriteBlock(out.GetResult());
+	header.object_count = index.GetCount();
+
+//	CHECK_INTEGRITY();
+}
+
+Vector<int> DataFile::FindObjects(foff_t start, int length)
+{
+	Vector<int> list;
+	for(int i = 0; i < index.GetCount(); i++) {
+		const Object& o = index[i];
+		if(!o.IsAlive())
+			continue;
+		Array<Object> blocks;
+		EnumBlock(blocks, o.offset, o.length);
+		for(int t = 0; t < blocks.GetCount(); t++)
+			if(blocks[t].offset + blocks[t].length > start
+				&& blocks[t].offset < start + length) {
+				list.Add(i);
+				break;
+			}
+	}
+	return list;
+}
+
+void DataFile::DumpObjects(const Vector<int>& list, bool dump_data)
+{
+	for(int i = 0; i < list.GetCount(); i++) {
+		int o = list[i];
+		if(!IsValidIndex(o))
+			RLOG("#" << o << " - invalid");
+		else {
+			const Object& obj = index[o];
+			RLOG("#" << o << " - " << Format("[0x%08x +0x%08x)", obj.offset, obj.length));
+			if(dump_data && obj.IsAlive()) {
+				String data = Get(o);
+				RLOGHEXDUMP(data, data.GetLength());
+			}
+		}
+	}
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/TCore/datafile.h b/uppsrc/TCore/datafile.h
new file mode 100644
index 000000000..5b9549f80
--- /dev/null
+++ b/uppsrc/TCore/datafile.h
@@ -0,0 +1,226 @@
+// #define CDB_DEBUG // comment this macro to turn various error checking options off
+
+NAMESPACE_UPP
+
+#ifdef CDB_DEBUG
+#define CHECK_INTEGRITY()        CheckIntegrity()
+#define CHECK_AVAILABILITY(a, b) CheckAvailability(a, b)
+#define CDB_ASSERT(x)            ASSERT(x)
+#define CDB_CALL(x)              x
+#else
+#define CHECK_INTEGRITY()
+#define CHECK_AVAILABILITY(a, b)
+#define CDB_ASSERT(x)
+#define CDB_CALL(x)
+#endif
+
+#define CRASH()                  __asm int 3
+#define CDB_TIMING(n)            RTIMING(n)
+
+typedef int foff_t;
+typedef int dfid_t;
+
+class DataFile : Moveable<DataFile>
+{
+public:
+	typedef DataFile CLASSNAME;
+	DataFile();
+	~DataFile();
+
+	bool                   Open(const char *filename, bool read_only = false);
+	bool                   Create(const char *filename);
+	bool                   Close();
+	bool                   SaveAs(const char *new_file_name);
+
+	bool                   IsReadOnly() const             { return read_only; }
+	bool                   IsOpen() const                 { return stream.IsOpen(); }
+	const String&          GetFileName() const            { return filename; }
+	Time                   GetLastWriteTime() const;
+
+	int64                  GetFileSize() const            { return stream.GetSize(); }
+	int                    GetOverhead() const;
+	bool                   Compact(const char *backup_file_name = 0);
+
+	void                   Commit(dfid_t id);
+	void                   Rollback(dfid_t id);
+
+	void                   BeginBlock();
+	void                   EndBlock();
+
+	bool                   Import(Stream& stream);
+	void                   Export(Stream& stream);
+
+	void                   SetCache(int large_block_size, int small_cache_size, int large_cache_size);
+	int                    GetLargeBlockSize() const      { return large_block_size; }
+	int                    GetLargeCacheSize() const      { return large_cache.size; }
+	int                    GetSmallCacheSize() const      { return small_cache.size; }
+
+	int                    GetCount() const               { return index.GetCount(); }
+	void                   SetCount(int count);
+	bool                   IsValidIndex(int object) const { return object >= 0 && object < GetCount(); }
+
+	int                    GetLength(int object) const    { return write_objects[object].length; }
+	bool                   IsEmpty(int object) const      { return GetLength(object) == 0; }
+
+	String                 Get(int object);
+	String                 operator [] (int object)       { return Get(object); }
+
+	void                   Set(int object, const String& data, dfid_t id);
+
+	int                    Add(dfid_t id);
+	void                   Remove(int object, dfid_t id);
+	bool                   IsVoid(int object) const       { return write_objects[object].length < 0; }
+
+	void                   CheckIntegrity();
+	void                   CheckAvailability(foff_t start, int length);
+	Vector<int>            FindObjects(foff_t start, int length);
+	void                   DumpObjects(const Vector<int>& index, bool dump_data = false);
+
+	static void            FileTest();
+
+public:
+	enum
+	{
+		LOG2_OFFSET_BYTES  = 2,
+		OFFSET_BYTES       = 1 << (int)LOG2_OFFSET_BYTES,
+		LOG2_BLOCK_BYTES   = 12,
+		BLOCK_BYTES        = 1 << (int)LOG2_BLOCK_BYTES,
+		LOG2_BLOCK_OFFSETS = LOG2_BLOCK_BYTES - LOG2_OFFSET_BYTES,
+		BLOCK_OFFSETS      = 1 << (int)LOG2_BLOCK_OFFSETS,
+		LOG2_OBJECT_BYTES  = LOG2_OFFSET_BYTES + 1,
+		OBJECT_BYTES       = 1 << (int)LOG2_OBJECT_BYTES,
+		LOG2_BLOCK_OBJECTS = LOG2_BLOCK_BYTES - LOG2_OBJECT_BYTES,
+		BLOCK_OBJECTS      = 1 << (int)LOG2_BLOCK_OBJECTS,
+
+		MIN_VERSION        = 1,
+		VERSION            = 1,
+		MAX_VERSION        = 1,
+
+		LOG2_GRANULARITY   = 2,
+		GRANULARITY        = 1 << (int)LOG2_GRANULARITY,
+
+		// defaults
+		LARGE_BLOCK_SIZE   = 4 * BLOCK_BYTES,
+		SMALL_CACHE_SIZE   = 1 << 20,
+		LARGE_CACHE_SIZE   = 1 << 20,
+	};
+
+private:
+	struct Object
+	{
+		Object(foff_t offset = 0, int length = -1) : offset(offset), length(length) {}
+
+		bool        IsAlive() const { return offset && length > 0; }
+
+		static int  PtrLessLength(const Object *object, int length) { return object -> length < length; }
+		static int  LessOffset(const Object& object, foff_t offset) { return object.offset < offset; }
+		static bool PtrLess(const Object *a, const Object *b)
+		{ return (a -> length != b -> length ? a -> length < b -> length : a -> offset < b -> offset); }
+		static bool OffsetLess(const Object& a, const Object& b)    { return a.offset < b.offset; }
+
+		foff_t      offset;
+		int         length;
+	};
+
+private:
+	bool                   StreamHeader(bool write);
+	bool                   ReadIndex();
+	String                 ReadBlock(foff_t offset, int length);
+	foff_t                 AllocatePart(int block_size);
+	void                   FreePart(foff_t offset, int length);
+	foff_t                 WriteBlock(const String& data);
+	void                   EnumBlock(Array<Object>& dest, foff_t offset, int length);
+	void                   FreeBlock(foff_t offset, int length);
+	void                   FreeBlock(const Object& o)             { if(o.IsAlive()) FreeBlock(o.offset, o.length); }
+	void                   FlushSmallCacheFor(dfid_t id);
+	void                   FlushSmallCache()                      { FlushSmallCacheFor(0); }
+	void                   FlushLargeCacheFor(dfid_t id);
+	void                   FlushLargeCache()                      { FlushLargeCacheFor(0); }
+	void                   FlushIndex();
+	static int             GetBlockSize(int length);
+	void                   Read(void *dest, foff_t offset, int length);
+	void                   Write(const void *src, foff_t offset, int length);
+	void                   ThrowRead() const;
+	void                   ThrowWrite() const;
+	void                   CreateFreeList();
+	void                   ReorderFreeItem(int pos);
+	void                   Clear();
+	void                   CommitFile();
+
+private:
+	struct Header
+	{
+		Header();
+
+		bool Serialize(Stream& stream, bool write);
+
+		enum { TOTAL = 256 };
+
+		char   tag[128];
+		int    version;
+		int    object_count;
+		foff_t index_offset;
+	};
+
+	friend struct Header;
+
+	class Cache
+	{
+	public:
+		Cache(int size);
+
+		void                   Clear();
+
+		int                    Find(int object) const    { return data.Find(object); }
+		const String&          operator [] (int i) const { return data[i]; }
+
+		void                   Put(int object, const String& value, bool write);
+		void                   Remove(int object);
+		void                   RemoveAbove(int object);
+
+	public:
+		Callback               WhenFlush;
+
+		VectorMap<int, String> data;
+		Index<int>             dirty;
+		int                    size;
+		int                    total;
+	};
+
+	FileStream             stream;
+	String                 filename;
+	bool                   read_only;
+	Header                 header;
+
+	int                    large_block_size;
+
+	Array<Object>          index;
+	Index<dfid_t>          write_id;
+	Index<int>             write_index;
+	Array<Object>          write_objects;
+
+	int                    block_level;
+	Segtor<Object, 512>    free_upon_commit;
+
+	Index<int>             free_objects;
+	Array<Object>          free_list;
+	Vector<Object *>       free_list_index;
+	foff_t                 free_offset;
+
+	mutable Cache          large_cache;
+	mutable Cache          small_cache;
+};
+
+class ObjectExc : public Exc
+{
+public:
+	ObjectExc(const String& s) { String::operator = (s); }
+};
+
+template <class T>
+inline void CopyBackward(T *dst, const T *src, const T *lim) {
+	while(src > lim)
+		*--dst = *--src;
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/TCore/datatest.cpp b/uppsrc/TCore/datatest.cpp
new file mode 100644
index 000000000..389fcb9a9
--- /dev/null
+++ b/uppsrc/TCore/datatest.cpp
@@ -0,0 +1,664 @@
+#include "TCoreDb.h"
+
+NAMESPACE_UPP
+
+static String GetRandomString(int maxlength = 50000, int minlength = 0)
+{
+	int len = minlength;
+	unsigned span = maxlength - minlength;
+	if(span > 0)
+	{
+		unsigned v = rand();
+		if(span >= RAND_MAX)
+			v += rand() * RAND_MAX;
+		len += rand() % (span + 1);
+	}
+	StringBuffer s(len);
+	for(int i = 0; i < len; i++)
+		s[i] = rand();
+	return s;
+}
+
+void DataFile::FileTest()
+{
+	String name = ForceExt(GetTempFileName(), ".cdb");
+	DataFile file;
+	if(!file.Create(name))
+	{
+		RLOG("Cannot create file '" << name << "'.");
+		NEVER();
+		return;
+	}
+	enum
+	{
+		COUNT   = 100,
+		OBJECTS = 1000,
+		LENGTH  = 50000,
+	};
+	Vector<String> values;
+
+	srand(1);
+	int i;
+	for(i = 0; i < COUNT; i++)
+	{
+		int x = rand() % (int)OBJECTS;
+		String s = GetRandomString(LENGTH);
+		values.DoIndex(x) = s;
+		file.Set(x, s, 0);
+	}
+	file.Commit(0);
+	file.Compact();
+	for(i = 0; i < values.GetCount(); i++)
+	{
+		String from = file.Get(i);
+		if(from != values[i])
+		{
+			RLOG("DataFile::Set/Get mismatch at #" << i
+				<< " (" << from.GetLength() << " / " << values[i].GetLength() << ")");
+			NEVER();
+		}
+	}
+	file.Close();
+	DeleteFile(name);
+}
+
+void DataBase::AllocTest()
+{
+	RLOG("DataBase::AllocTest");
+
+	String name = ForceExt(GetTempFileName(), ".cdb");
+	DataFile df;
+	if(!df.Create(name))
+	{
+		RLOG("Cannot create file '" << name << "'.");
+		NEVER();
+		return;
+	}
+	DataBase db;
+	int master = db.Create(df, 0);
+
+	Vector< Vector<Value> > rows;
+
+	{ // fill in table
+		DataTable& table = db.Add("POKUS");
+		table.AddColumn("A", STRING_V);
+		table.AddColumn("B", INT_V);
+		db.Commit();
+		df.Commit(0);
+
+		enum
+		{
+			COUNT = 1000,
+			OBJECTS = 1000,
+		};
+
+		srand(1);
+
+		for(int i = 0; i < COUNT; i++)
+		{
+			if(i % 10 == 0)
+				RDUMP(i);
+			int x = rand() % (int)OBJECTS;
+			if(rows.GetCount() > x && !rows[x].IsEmpty())
+			{ // empty / modify row
+				if(rand() & 1)
+				{
+					table.Remove(x);
+					rows[x].Clear();
+				}
+				else
+				{
+					Vector<Value>& row = rows[x];
+					row[0] = GetRandomString();
+					row[1] = rand();
+					table.Set(x, row);
+				}
+			}
+			else
+			{ // add row
+				Vector<Value> row;
+				row.Add(GetRandomString());
+				row.Add(rand());
+				x = table.Add(row);
+				rows.DoIndex(x) = row;
+			}
+			if((i & 15) == 0)
+				table.Commit();
+		}
+	}
+
+	db.Commit();
+	db.Close();
+	df.Compact();
+	db.Open(df, master, 0);
+
+	{ // check table
+		DataTable& table = db["POKUS"];
+		int i = rows.GetCount();
+		while(i && rows[i - 1].IsEmpty())
+			i--;
+		ASSERT(table.GetRowIndex().GetEndIndex() == i);
+		while(--i >= 0)
+		{
+			if(i % 10 == 0)
+				RDUMP(i);
+			VERIFY(rows[i].IsEmpty() == table.IsEmpty(i));
+			if(!rows[i].IsEmpty())
+			{
+				Vector<Value> row = table.Get(i);
+				VERIFY(row[0] == rows[i][0] && row[1] == rows[i][1]);
+			}
+		}
+	}
+
+	db.Close();
+	df.Close();
+
+	DeleteFile(name);
+}
+
+static Date anchor_date(2000, 1, 1);
+enum { ROW_COUNT = 100000 };
+
+static void CreateDataBase(const String& fn, int& aobj, int& bobj, int& cobj, int& dobj, int& eobj, int& fobj, int& iobj)
+{
+	DataFile df;
+#ifdef NO_CACHE
+	df.SetCache(16384, 50000, 50000);
+#endif//NO_CACHE
+	if(!df.Create(fn))
+	{
+		RLOG("error creating file '" << fn << "'");
+		NEVER();
+		return;
+	}
+
+	DataColumnOf<int> a, b;
+	DataColumnOf<String> c;
+	DataColumnOf<Date>   d;
+	DataColumnOf<Time>   e;
+	DataColumnOf<bool>   f;
+	DataRowIndex index;
+
+#ifdef NO_CACHE
+	a.SetCacheSize(0);
+	b.SetCacheSize(0);
+	c.SetCacheSize(0);
+	d.SetCacheSize(0);
+	e.SetCacheSize(0);
+	f.SetCacheSize(0);
+#endif//NO_CACHE
+
+	aobj = a.Create(df, 1);
+	bobj = b.Create(df, 2);
+	cobj = c.Create(df, 3);
+	dobj = d.Create(df, 4);
+	eobj = e.Create(df, 5);
+	fobj = f.Create(df, 6);
+	iobj = index.Create(df, 7);
+
+/*
+	a.SetCount(COUNT);
+	b.SetCount(COUNT);
+	c.SetCount(COUNT);
+	d.SetCount(COUNT);
+	e.SetCount(COUNT);
+*/
+
+	for(int i = 0; i < ROW_COUNT; i++)
+	{
+		if(i % 1000 == 0)
+			RLOG("Writing " << i);
+//		LOG("#" << i);
+//		if(i == 49001)
+//			__asm int 3
+		int x = index.Add();
+		a.Set(x, i);
+		b.Set(x, -i);
+		String vc = "ab" + IntStr(i) + "cd";
+//		if(i % 1000 == 0)
+//			vc.Cat('*', 10 * i);
+		c.Set(x, vc);
+		d.Set(x, anchor_date + i);
+		e.Set(x, ToTime(anchor_date) + i);
+		f.Set(x, i & 1);
+	}
+
+	a.Commit(); a.Close();
+	b.Commit(); b.Close();
+	c.Commit(); c.Close();
+	d.Commit(); d.Close();
+	e.Commit(); e.Close();
+	f.Commit(); f.Close();
+	index.Commit(); index.Close();
+
+	df.Commit(0);
+	df.Close();
+}
+
+static void CheckColumnA(DataFile& df, int aobj)
+{
+	DataColumnOf<int> a;
+	a.Open(df, aobj, 1);
+	for(int i = 0; i < a.GetCount(); i++)
+	{
+		if((int)a[i] != i)
+		{
+			String s;
+			s << "Mismatch: a[" << i << "] = " << StdFormat(a[i]) << ", " << 3 * i << " expected";
+			RLOG(s);
+			NEVER();
+		}
+		a.Set(i, 3 * i);
+	}
+	a.Commit();
+}
+
+static void CheckColumnA2(DataFile& df, int aobj)
+{
+	DataColumnOf<int> a;
+	a.Open(df, aobj, 1);
+	for(int i = 0; i < ROW_COUNT; i++)
+		if((int)a[i] != 3 * i)
+		{
+			String s;
+			s << "Mismatch: a[" << i << "] = " << StdFormat(a[i]) << ", " << 3 * i << " expected";
+			RLOG(s);
+			NEVER();
+		}
+}
+
+static void CheckColumnB(DataFile& df, int bobj)
+{
+	DataColumnOf<int> b;
+	b.Open(df, bobj, 2);
+	for(int i = 0; i < ROW_COUNT; i++)
+	{
+		if((int)b[i] != -i)
+		{
+			String s;
+			s << "Mismatch: b[" << i << "] = " << StdFormat(b[i]) << ", " << -i << " expected";
+			RLOG(s);
+			NEVER();
+		}
+		b.Set(i, -i * i);
+	}
+	b.Commit();
+}
+
+static void CheckColumnB2(DataFile& df, int bobj)
+{
+	DataColumnOf<int> b;
+	b.Open(df, bobj, 2);
+	for(int i = 0; i < ROW_COUNT; i++)
+		if((int)b[i] != -i * i)
+		{
+			String s;
+			s << "Mismatch: b[" << i << "] = " << StdFormat(b[i]) << ", " << -i * i << " expected";
+			RLOG(s);
+			NEVER();
+		}
+}
+
+static void CheckColumnC(DataFile& df, int cobj)
+{
+	DataColumnOf<String> c;
+	c.Open(df, cobj, 3);
+	for(int i = 0; i < ROW_COUNT; i++)
+	{
+//		if(i == 179540)
+//			__asm int 3
+		String t = c[i], e = "ab" + IntStr(i) + "cd";
+//		if(i % 1000 == 0)
+//			e.Cat('*', 10 * i);
+		if(t != e)
+		{
+			String s;
+			s << "Mismatch: c[" << i << "] = " << StdFormat(c[i]) << ", " << e << " expected";
+			RLOG(s);
+			NEVER();
+		}
+		c.Set(i, "ab" + IntStr(i) + "cd_ef" + IntStr(-i));
+	}
+	c.Commit();
+}
+
+static void CheckColumnC2(DataFile& df, int cobj)
+{
+	DataColumnOf<String> c;
+	c.Open(df, cobj, 3);
+	for(int i = 0; i < ROW_COUNT; i++)
+	{
+		String t = c[i], e = "ab" + IntStr(i) + "cd_ef" + IntStr(-i);
+		if(t != e)
+		{
+			String s;
+			s << "Mismatch: c[" << i << "] = " << StdFormat(c[i]) << ", " << e << " expected";
+			RLOG(s);
+			NEVER();
+		}
+	}
+}
+
+static void CheckColumnD(DataFile& df, int dobj)
+{
+	DataColumnOf<Date> d;
+	d.Open(df, dobj, 4);
+	for(int i = 0; i < ROW_COUNT; i++)
+	{
+		if(Date(d[i]) != anchor_date + i)
+		{
+			String s;
+			s << "Mismatch: d[" << i << "] = " << StdFormat(d[i]) << ", " << Format(anchor_date + i) << " expected";
+			RLOG(s);
+			NEVER();
+		}
+		d.Set(i, anchor_date - 2 * i);
+	}
+	d.Commit();
+}
+
+static void CheckColumnD2(DataFile& df, int dobj)
+{
+	DataColumnOf<Date> d;
+	d.Open(df, dobj, 4);
+	for(int i = 0; i < ROW_COUNT; i++)
+		if(Date(d[i]) != anchor_date - 2 * i)
+		{
+			String s;
+			s << "Mismatch: d[" << i << "] = " << StdFormat(d[i])
+			<< ", " << Format(anchor_date - 2 * i) << " expected";
+			RLOG(s);
+			NEVER();
+		}
+}
+
+static void CheckColumnE(DataFile& df, int eobj)
+{
+	DataColumnOf<Time> e;
+	e.Open(df, eobj, 5);
+	for(int i = 0; i < ROW_COUNT; i++)
+	{
+		Time dest = ToTime(anchor_date) + i;
+		if(Time(e[i]) != dest)
+		{
+			String s;
+			s << "Mismatch: e[" << i << "] = " << StdFormat(e[i])
+			<< ", " << Format(dest) << " expected";
+			RLOG(s);
+			NEVER();
+		}
+		e.Set(i, ToTime(anchor_date) - 2 * i);
+	}
+	e.Commit();
+}
+
+static void CheckColumnE2(DataFile& df, int eobj)
+{
+	DataColumnOf<Time> e;
+	e.Open(df, eobj, 5);
+	for(int i = 0; i < ROW_COUNT; i++)
+	{
+		Time dest = ToTime(anchor_date) - 2 * i;
+		if(Time(e[i]) != dest)
+		{
+			String s;
+			s << "Mismatch: e[" << i << "] = " << StdFormat(e[i]) << ", "
+			<< Format(dest) << " expected";
+			RLOG(s);
+			NEVER();
+		}
+	}
+}
+
+static void CheckColumnF(DataFile& df, int fobj)
+{
+	DataColumnOf<bool> f;
+	f.Open(df, fobj, 6);
+	for(int i = 0; i < ROW_COUNT; i++)
+	{
+		if(CalcType<bool>::ValueTo(f[i]) != bool(i & 1))
+		{
+			String s;
+			s << "Mismatch: f[" << i << "] = " << StdFormat(f[i]) << ", " << (i & 1) << " expected";
+			RLOG(s);
+			NEVER();
+		}
+		f.Set(i, CalcType<bool>::ToValue(i & 2));
+	}
+	f.Commit();
+}
+
+static void CheckColumnF2(DataFile& df, int fobj)
+{
+	DataColumnOf<bool> f;
+	f.Open(df, fobj, 6);
+	for(int i = 0; i < ROW_COUNT; i++)
+	{
+		bool b = i & 2;
+		if(CalcType<bool>::ValueTo(f[i]) != b)
+		{
+			String s;
+			s << "Mismatch: f[" << i << "] = " << StdFormat(f[i]) << ", " << b << " expected";
+			RLOG(s);
+			NEVER();
+		}
+	}
+}
+
+static void CheckIndex(DataFile& df, int iobj)
+{
+	DataRowIndex index;
+	index.Open(df, iobj, 6);
+	RLOG("Index count = " << index.GetCount() << ", first empty = "
+		<< index.GetFirstEmpty() << ", end index = " << index.GetEndIndex());
+	Index<int> to_remove;
+	srand(1);
+	int top = index.GetEndIndex();
+	int rem = top / 4;
+	to_remove.Reserve(rem);
+	while(to_remove.GetCount() < rem)
+	{
+		int r = rand() + rand() * RAND_MAX;
+		to_remove.FindAdd(r % top);
+	}
+	RLOG("Removing " << rem << " entries...");
+	index.Remove(to_remove.GetKeys());
+	int i;
+	for(i = 0; i < top; i++)
+		if(index.IsEmpty(i) != (to_remove.Find(i) >= 0))
+		{
+			NEVER();
+		}
+	RLOG("Index count = " << index.GetCount() << ", first empty = "
+		<< index.GetFirstEmpty() << ", end index = " << index.GetEndIndex());
+	RLOG("Reallocating items...");
+	Vector<int> sorted;
+	sorted <<= to_remove.GetKeys();
+	Sort(sorted);
+	for(i = 0; i < rem; i++)
+	{
+		int alloc = index.Add();
+		ASSERT(alloc == sorted[i]);
+	}
+	RLOG("Index count = " << index.GetCount() << ", first empty = "
+		<< index.GetFirstEmpty() << ", end index = " << index.GetEndIndex());
+}
+
+static void CheckDataBase(const String& fn, int aobj, int bobj, int cobj, int dobj, int eobj, int fobj, int iobj)
+{
+	DataFile df;
+	df.SetCache(16384, 100000, 100000);
+
+	if(!df.Open(fn))
+	{
+		RLOG("error opening file '" << fn << "'");
+		NEVER();
+		return;
+	}
+
+	/*
+	{
+		String ex = AppendFileName(GetTempPath(), "pokus.cdi");
+		FileOut fo(ex);
+		if(!fo.IsOpen())
+			CmdError("error creating file '" + ex + "'");
+
+		df.Export(fo);
+	}
+	*/
+
+	RLOG("Checking RowIndex...");
+	CheckIndex(df, iobj);
+	RLOG("Checking A...");
+	CheckColumnA(df, aobj);
+	RLOG("Checking B...");
+	CheckColumnB(df, bobj);
+	RLOG("Checking C...");
+	CheckColumnC(df, cobj);
+	RLOG("Checking D...");
+	CheckColumnD(df, dobj);
+	RLOG("Checking E...");
+	CheckColumnE(df, eobj);
+	RLOG("Checking F...");
+	CheckColumnF(df, fobj);
+	df.Commit(0);
+	df.Close();
+}
+
+static void CheckDataBase2(const String& fn, int aobj, int bobj, int cobj, int dobj, int eobj, int fobj, int iobj)
+{
+	DataFile df;
+	df.SetCache(16384, 100000, 100000);
+
+	if(!df.Open(fn))
+	{
+		RLOG("error opening file '" << fn << "'");
+		NEVER();
+		return;
+	}
+
+//	df.Commit(0);
+	RLOG("Database file size = " << df.GetFileSize() << ", overhead = " << df.GetOverhead() << "%");
+	RLOG("Compacting...\n");
+//	df.Compact();
+	RLOG("Database file size = " << df.GetFileSize() << ", overhead = " << df.GetOverhead() << "%");
+
+	RLOG("Checking A/2...");
+	CheckColumnA2(df, aobj);
+	RLOG("Checking B/2...");
+	CheckColumnB2(df, bobj);
+	RLOG("Checking C/2...");
+	CheckColumnC2(df, cobj);
+	RLOG("Checking D/2...");
+	CheckColumnD2(df, dobj);
+	RLOG("Checking E/2...");
+	CheckColumnE2(df, eobj);
+	RLOG("Checking F/2...");
+	CheckColumnF2(df, fobj);
+	df.Commit(0);
+	df.Close();
+}
+
+static void RawDataFileTest()
+{
+	String fn = ForceExt(GetTempFileName(), ".cdb");
+	int aobj, bobj, cobj, dobj, eobj, fobj, iobj;
+	CreateDataBase(fn, aobj, bobj, cobj, dobj, eobj, fobj, iobj);
+
+	CheckDataBase(fn, aobj, bobj, cobj, dobj, eobj, fobj, iobj);
+	CheckDataBase2(fn, aobj, bobj, cobj, dobj, eobj, fobj, iobj);
+	DeleteFile(fn);
+}
+
+static void StructuredDataBaseTest(const String& fn)
+{
+	DataFile df;
+	if(!df.Create(fn))
+		throw ObjectExc("cannot create file '" + fn + "'");
+	DataBase db;
+	int i = db.Create(df, 0);
+	if(i)
+		throw ObjectExc("database creation error");
+	DataTable& table = db.Add("TestTable");
+	table.AddColumn("ColumnInt",    INT_V, DataTableColumn::NUMBER_INDEX);
+	table.AddColumn("ColumnDouble", DOUBLE_V);
+	table.AddColumn("ColumnString", STRING_V);
+
+	{
+		StringStream ss;
+		db.Describe(ss);
+		RLOG(ss.GetResult());
+	}
+
+	for(i = 0; i < 100000; i++)
+	{
+		if(i % 1000 == 0)
+			RLOG(i);
+		Vector<Value> v;
+		v << i << sin((double)i) << ("hello world " + IntStr(i));
+		table.Add(v);
+	}
+
+	{
+		StringStream ss;
+		db.Describe(ss);
+		RLOG(ss.GetResult());
+	}
+
+	{
+		DataSet items = table.Column(0).GetRange(50, 60);
+		VppLog() << "Range <50, 60>: ";
+		for(int i = 0; i < items.GetCount(); i++)
+			VppLog() << items[i] << ' ';
+		RLOG("");
+	}
+
+	{
+		double min, max;
+		table.Column(0).GetMinMax(min, max);
+		RLOG("MinMax(0) = <" << min << ", " << max << ">");
+		table.Column(1).GetMinMax(min, max);
+		RLOG("MinMax(1) = <" << min << ", " << max << ">");
+	}
+
+	db.Commit();
+	df.Commit(0);
+}
+
+static void DataBaseTest2(const String& fn)
+{
+	DataFile df;
+	if(!df.Open(fn))
+		throw ObjectExc("cannot open file '" + fn + "'");
+	DataBase db;
+	db.Open(df, 0, 0);
+	StringStream ss;
+	db.Describe(ss);
+	RLOG(ss.GetResult());
+}
+
+void DataBase::ColumnTest()
+{
+	RLOG("DataBase::ColumnTest");
+
+	RawDataFileTest();
+}
+
+void DataBase::StructuredTest()
+{
+	String name = ForceExt(GetTempFileName(), ".cdb");
+	StructuredDataBaseTest(name);
+	DataBaseTest2(name);
+	DeleteFile(name);
+}
+
+void DataBase::FullTest()
+{
+	DataFile::FileTest();
+	AllocTest();
+	ColumnTest();
+	StructuredTest();
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/TCore/dbf.h b/uppsrc/TCore/dbf.h
new file mode 100644
index 000000000..f5d71cde9
--- /dev/null
+++ b/uppsrc/TCore/dbf.h
@@ -0,0 +1 @@
+#include <plugin/dbf/dbf.h>
diff --git a/uppsrc/TCore/dd_cpp.h b/uppsrc/TCore/dd_cpp.h
new file mode 100644
index 000000000..399d2e2d1
--- /dev/null
+++ b/uppsrc/TCore/dd_cpp.h
@@ -0,0 +1,105 @@
+#pragma BLITZ_APPROVE
+
+#define __EMP __EMP2
+#define __EMP2 __EMP3
+#define __EMP3 __EMP4
+#define __EMP4
+
+#define TABLE(n)
+#define TABLE_(n) const String& n()        { static String s = #n; return s; }
+#define COLUMN(t, n, f)
+#define COLUMN_(t, n, f) const String& n() { static String s = #n; return s; }
+#define SCOLUMN(t, n)
+#define SCOLUMN_(tn, n)  const String& n() { static String s = #n; return s; }
+#define NINDEX()
+#define TINDEX()
+#define SINDEX()
+#define LINK(rt)
+#define END_TABLE()
+
+#include TABLEFILE
+
+#undef TABLE
+#undef TABLE_
+#undef COLUMN
+#undef COLUMN_
+#undef SCOLUMN
+#undef SCOLUMN_
+#undef NINDEX
+#undef TINDEX
+#undef SINDEX
+#undef END_TABLE
+
+#define TABLE(n) void Build##n(DataTable& table) {
+#define TABLE_(n) TABLE(n)
+#define COLUMN(t, n, f)  if(table.FindColumn(n()) < 0) table.AddColumn(n(), ValueTypeNo(*(const t*)0), 0 f);
+#define COLUMN_(t, n, f) if(table.FindColumn(n()) < 0) table.AddColumn(n(), ValueTypeNo(*(const t*)0), 0 f);
+#define SCOLUMN(t, n) COLUMN(t, n, __EMP)
+#define SCOLUMN_(t, n) COLUMN(t, n, __EMP)
+#define NINDEX | DataTableColumn::NUMBER_INDEX
+#define TINDEX | DataTableColumn::DATETIME_INDEX
+#define SINDEX | DataTableColumn::STRING_INDEX
+#define END_TABLE() }
+
+#include TABLEFILE
+
+#undef TABLE
+#undef COLUMN
+#undef COLUMN_
+#undef NINDEX
+#undef TINDEX
+#undef SINDEX
+#undef END_TABLE
+
+#ifdef BUILDPROC
+void BUILDPROC(DataBase& db)
+#else
+void BuildAllTables(DataBase& db)
+#endif
+{
+
+#define TABLE(n) Build##n(db.GetAdd(n()));
+#define COLUMN(t, n, f)
+#define COLUMN_(t, n, f)
+#define NINDEX __EMP
+#define TINDEX __EMP
+#define SINDEX __EMP
+#define END_TABLE()
+
+#include TABLEFILE
+
+#undef TABLE
+#undef COLUMN
+#undef COLUMN_
+#undef LINK
+#undef END_TABLE
+
+#define TABLE(n) { DataTable& table = db[n()]; {
+#define COLUMN(t, n, f) } { const String& c = n(); f
+#define COLUMN_(t, n, f) } { const String& c = n(); f
+#define LINK(rt) table.Column(c).Link(db[rt()]);
+#define END_TABLE() } }
+
+#include TABLEFILE
+
+}
+
+#undef TABLE
+#undef TABLE_
+#undef COLUMN
+#undef COLUMN_
+#undef SCOLUMN
+#undef SCOLUMN_
+#undef LINK
+#undef NINDEX
+#undef TINDEX
+#undef SINDEX
+#undef END_TABLE
+#undef TABLEFILE
+#undef __EMP
+#undef __EMP2
+#undef __EMP3
+#undef __EMP4
+#ifdef BUILDPROC
+#undef BUILDPROC
+#endif
diff --git a/uppsrc/TCore/dd_h.h b/uppsrc/TCore/dd_h.h
new file mode 100644
index 000000000..2fb2b4877
--- /dev/null
+++ b/uppsrc/TCore/dd_h.h
@@ -0,0 +1,40 @@
+#pragma BLITZ_APPROVE
+
+#define TABLE(n)         void Build##n(DataTable& table);
+#define TABLE_(n)        const String& n(); TABLE(n)
+#define COLUMN(t, n, f)
+#define COLUMN_(t, n, f) const String& n();
+#define SCOLUMN(t, n)
+#define SCOLUMN_(t, n)   const String& n();
+#define NINDEX()
+#define TINDEX()
+#define SINDEX()
+#define LINK(rt)
+#define END_TABLE()
+
+#ifdef BUILDPROC
+void BUILDPROC(DataBase& db);
+#else
+void BuildAllTables(DataBase& db);
+#endif
+
+#include TABLEFILE
+
+#undef TABLE
+#undef TABLE_
+#undef COLUMN
+#undef COLUMN_
+#undef SCOLUMN
+#undef SCOLUMN_
+#undef NINDEX
+#undef TINDEX
+#undef SINDEX
+#undef LINK
+#undef END_TABLE
+
+#ifndef KEEP
+#undef TABLEFILE
+#ifdef BUILDPROC
+#undef BUILDPROC
+#endif
+#endif
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CabsN_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CabsN_CS-CZ15.dpx
new file mode 100644
index 000000000..da8860701
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CabsN_CS-CZ15.dpx
@@ -0,0 +1,10 @@
+HELP_TOPIC("AppDoc", "", "Calc$CabsN", "CS-CZ windows-1250", "\1abs\1 (\1re�ln� ��slo\1) [S �] \1re�ln� ��slo\1")
+	HELP_TEXT(
+	"[%EN-US3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0}%EN-US \r\n"
+	"[s0;2 Absolutn� hodnota ��sla. Pokud je ��slo kladn�, jeho absolutn� \r\n"
+	"hodnota je mu rovna. Absolutn� hodnotou z�porn�ho ��sla je ��slo \r\n"
+	"opa�n�.&]\r\n"
+	"[s0;2 &]\r\n"
+	"[s0;2 [* P��klad: ]abs(-10.5) = 10.5, abs(12) = 12.")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CabsN_EN-US.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CabsN_EN-US.dpx
new file mode 100644
index 000000000..5f99b25ff
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CabsN_EN-US.dpx
@@ -0,0 +1,11 @@
+HELP_TOPIC("AppDoc", "", "Calc$CabsN", "EN-US", "\1abs\1 (\1real number\1) [S �] \1real number\1")
+	HELP_TEXT(
+	"[ [A@0+84 Absolute value. If the number is positive, its absolute \r\n"
+	"value is equal to it. The absolute value of a negative number \r\n"
+	"is its inverse.]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 Example][A@0+84 `: abs(`-10.5) `= 10.5, abs(12) `= \r\n"
+	"12.]]\r\n")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CaddAA_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CaddAA_CS-CZ15.dpx
new file mode 100644
index 000000000..46135e707
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CaddAA_CS-CZ15.dpx
@@ -0,0 +1,7 @@
+HELP_TOPIC("AppDoc", "", "Calc$CaddAA", "CS-CZ windows-1250", "oper�tor \1+\1  (\1pole hodnot\1, \1pole hodnot\1) [S �] \1pole hodnot\1")
+	HELP_TEXT(
+	"[3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0} \r\n"
+	"[s0;2 Oper�tor spoj� dv� pole (za�ad� jejich jednotliv� prvky za \r\n"
+	"sebe).")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CaddAA_EN-US.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CaddAA_EN-US.dpx
new file mode 100644
index 000000000..72225cf9b
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CaddAA_EN-US.dpx
@@ -0,0 +1,4 @@
+HELP_TOPIC("AppDoc", "", "Calc$CaddAA", "EN-US", "operator \1+\1  (\1pole hodnot\1, \1pole hodnot\1) [S �] \1pole hodnot\1")
+	HELP_TEXT(
+	"\r\n")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CaddDN_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CaddDN_CS-CZ15.dpx
new file mode 100644
index 000000000..0e4555497
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CaddDN_CS-CZ15.dpx
@@ -0,0 +1,10 @@
+HELP_TOPIC("AppDoc", "", "Calc$CaddDN", "CS-CZ windows-1250", "oper�tor \1+\1  (\1datum/�as\1, \1re�ln� ��slo\1) [S �] \1datum/�as\1")
+	HELP_TEXT(
+	"[%EN-US3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0}%EN-US \r\n"
+	"[s0;2 Oper�tor posune zadan� datum o_dan� po�et dn� (dop�edu, pokud \r\n"
+	"je ��slo kladn�). Po�et dn� m��e b�t i necelo��seln�, v_tom p��pad� \r\n"
+	"se posune i ��slo sekundy, minuty a hodiny.&]\r\n"
+	"[s0;2 &]\r\n"
+	"[s0;2 [* P��klad: ]27.12.1999 + 7 = 3.1.2000")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CaddDN_EN-US.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CaddDN_EN-US.dpx
new file mode 100644
index 000000000..da152eb94
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CaddDN_EN-US.dpx
@@ -0,0 +1,4 @@
+HELP_TOPIC("AppDoc", "", "Calc$CaddDN", "EN-US", "operator \1+\1  (\1date/time\1, \1real number\1) [S �] \1date/time\1")
+	HELP_TEXT(
+	"\r\n")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CaddND_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CaddND_CS-CZ15.dpx
new file mode 100644
index 000000000..91b154736
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CaddND_CS-CZ15.dpx
@@ -0,0 +1,10 @@
+HELP_TOPIC("AppDoc", "", "Calc$CaddND", "CS-CZ windows-1250", "oper�tor \1+\1  (\1re�ln� ��slo\1, \1datum/�as\1) [S �] \1datum/�as\1")
+	HELP_TEXT(
+	"[%EN-US3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0}%EN-US \r\n"
+	"[s0;2 Oper�tor posune zadan� datum o_dan� po�et dn� (dop�edu, pokud \r\n"
+	"je ��slo kladn�). Po�et dn� m��e b�t i necelo��seln�, v_tom p��pad� \r\n"
+	"se posune i ��slo sekundy, minuty a hodiny.&]\r\n"
+	"[s0;2 &]\r\n"
+	"[s0;2 [* P��klad: ]27.12.1999 + 7 = 3.1.2000")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CaddND_EN-US.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CaddND_EN-US.dpx
new file mode 100644
index 000000000..1b2828b66
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CaddND_EN-US.dpx
@@ -0,0 +1,19 @@
+HELP_TOPIC("AppDoc", "", "Calc$CaddND", "EN-US", "operator \1+\1  (\1real number\1, \1date/time\1) [S �] \1date/time\1")
+	HELP_TEXT(
+	"[ [A@0+84 The unary operator ][*A@0+84 `+][A@0+84  leaves its \r\n"
+	"argument unchanged. The operator serves only as a symmetric complement \r\n"
+	"of the operator ][*A@0+84 `-][A@0+84  to increase readability \r\n"
+	"of certain formulas.]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [A@0+84 Binary operator ][*A@0+84 `+][A@0+84  adds up its operands. \r\n"
+	"In case of strings, the strings will be concatenated. When a \r\n"
+	"number is added to a date value, the date will be moved forward \r\n"
+	"or back by given number of days (forward if it is positive).]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 Example][A@0+84 `: 27 `+ 35 `= 62, `\"a piece `\" `+ \r\n"
+	"`\"of text`\" `= `\"a piece of text`\", 27.12.1999 `+ 7 `= 3.1.2000]]\r\n")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CaddNN_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CaddNN_CS-CZ15.dpx
new file mode 100644
index 000000000..242f1e6ea
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CaddNN_CS-CZ15.dpx
@@ -0,0 +1,9 @@
+HELP_TOPIC("AppDoc", "", "Calc$CaddNN", "CS-CZ windows-1250", "oper�tor \1+\1  (\1re�ln� ��slo\1, \1re�ln� ��slo\1) [S �] \1re�ln� ��slo\1")
+	HELP_TEXT(
+	"[%EN-US3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0}%EN-US \r\n"
+	"[s0;2 Oper�tor se�te zadanou dvojici re�ln�ch ��sel. Pokud je n�kter� \r\n"
+	"z parametr� [* null], je v�sledkem sou�tu op�t [* null]. &]\r\n"
+	"[s0;2 &]\r\n"
+	"[s0;2 [* P��klad: ]5+7=12")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CaddNN_EN-US.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CaddNN_EN-US.dpx
new file mode 100644
index 000000000..ddb847030
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CaddNN_EN-US.dpx
@@ -0,0 +1,4 @@
+HELP_TOPIC("AppDoc", "", "Calc$CaddNN", "EN-US", "operator \1+\1  (\1real number\1, \1real number\1) [S �] \1real number\1")
+	HELP_TEXT(
+	"\r\n")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CaddSS_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CaddSS_CS-CZ15.dpx
new file mode 100644
index 000000000..12895fc08
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CaddSS_CS-CZ15.dpx
@@ -0,0 +1,8 @@
+HELP_TOPIC("AppDoc", "", "Calc$CaddSS", "CS-CZ windows-1250", "oper�tor \1+\1  (\1�et�zec\1, \1�et�zec\1) [S �] \1�et�zec\1")
+	HELP_TEXT(
+	"[%EN-US3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0}%EN-US \r\n"
+	"[s0;2 Oper�tor spoj� dva �et�zce tak, �e je za�ad� za sebe.&]\r\n"
+	"[s0;2 &]\r\n"
+	"[s0;2 [* P��klad: ]\"ahoj\" +\" sv�te\" = \"ahoj sv�te\"")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CaddSS_EN-US.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CaddSS_EN-US.dpx
new file mode 100644
index 000000000..52461a154
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CaddSS_EN-US.dpx
@@ -0,0 +1,4 @@
+HELP_TOPIC("AppDoc", "", "Calc$CaddSS", "EN-US", "operator \1+\1  (\1string\1, \1string\1) [S �] \1string\1")
+	HELP_TEXT(
+	"\r\n")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$Cadd_monthsDN_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$Cadd_monthsDN_CS-CZ15.dpx
new file mode 100644
index 000000000..40e2b31c0
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$Cadd_monthsDN_CS-CZ15.dpx
@@ -0,0 +1,10 @@
+HELP_TOPIC("AppDoc", "", "Calc$Cadd_monthsDN", "CS-CZ windows-1250", "\1add_months\1 (\1datum\1, \1cel� ��slo\1 [/ po�et_m�s�c�]) [S �] \1datum\1")
+	HELP_TEXT(
+	"[%EN-US3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0}%EN-US \r\n"
+	"[s0;2 Funkce p�i�te k datu zadan� [/ po�et m�s�c�]. Pokud c�lov� m�s�c \r\n"
+	"m� m�n� dn�, ne� je ��slo dne v m�s�ci v p�vodn�m datu, nastav� \r\n"
+	"se ��slo dne na ��slo posledn�ho dne v c�lov�m m�s�ci.&]\r\n"
+	"[s0;2 &]\r\n"
+	"[s0;2 [* P��klad: ]add`_months(29.2.1996, 12) = 28.2.1997")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$Cadd_monthsDN_EN-US.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$Cadd_monthsDN_EN-US.dpx
new file mode 100644
index 000000000..616dd13e7
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$Cadd_monthsDN_EN-US.dpx
@@ -0,0 +1,11 @@
+HELP_TOPIC("AppDoc", "", "Calc$Cadd_monthsDN", "EN-US", "\1add_months\1 (\1date\1, \1integer\1 [/ number_of_months]) [S �] \1date\1")
+	HELP_TEXT(
+	"[ [A@0+84 The function adds given ][/A@0+84 number`_of`_months][A@0+84  \r\n"
+	"to the date. If the target month has fewer days than is the day \r\n"
+	"number in the original date, the function returns last day of \r\n"
+	"the target month.]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 Example][A@0+84 `: add`_months(29.2.1996, 12) `= 28.2.1997]]\r\n")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$Cadd_yearsDN_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$Cadd_yearsDN_CS-CZ15.dpx
new file mode 100644
index 000000000..d1442ec82
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$Cadd_yearsDN_CS-CZ15.dpx
@@ -0,0 +1,10 @@
+HELP_TOPIC("AppDoc", "", "Calc$Cadd_yearsDN", "CS-CZ windows-1250", "\1add_years\1 (\1datum\1, \1cel� ��slo\1 [/ po�et_let]) [S �] \1datum\1")
+	HELP_TEXT(
+	"[%EN-US3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0}%EN-US \r\n"
+	"[s0;2 Funkce p�i�te k datu zadan� [/ po�et let]. Pokud p�vodn� datum \r\n"
+	"je 29.2. v p�estupn�m roce a c�lov� rok nen� p�estupn�, zm�n� \r\n"
+	"se ��slo dne na 28.&]\r\n"
+	"[s0;2 &]\r\n"
+	"[s0;2 [* P��klad: ]add`_years(29.2.1992, 3) = 28.2.1995")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$Cadd_yearsDN_EN-US.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$Cadd_yearsDN_EN-US.dpx
new file mode 100644
index 000000000..08f94c970
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$Cadd_yearsDN_EN-US.dpx
@@ -0,0 +1,11 @@
+HELP_TOPIC("AppDoc", "", "Calc$Cadd_yearsDN", "EN-US", "\1add_years\1 (\1date\1, \1integer\1 [/ number_of_years]) [S �] \1date\1")
+	HELP_TEXT(
+	"[ [A@0+84 The function adds given ][/A@0+84 number`_of`_years][A@0+84  \r\n"
+	"to its date argument. If the original date is Feb 29 in a leap \r\n"
+	"year and the target year is not a leap one, the day number is \r\n"
+	"adjusted to 28.]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 Example][A@0+84 `: add`_years(29.2.1992, 3) `= 28.2.1995]]\r\n")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CarccosN_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CarccosN_CS-CZ15.dpx
new file mode 100644
index 000000000..49fba59b9
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CarccosN_CS-CZ15.dpx
@@ -0,0 +1,11 @@
+HELP_TOPIC("AppDoc", "", "Calc$CarccosN", "CS-CZ windows-1250", "\1arccos\1 (\1re�ln� ��slo\1 [/ x]) [S �] \1re�ln� ��slo\1")
+	HELP_TEXT(
+	"[%EN-US3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0}%EN-US \r\n"
+	"[s0;2 Arkus kosinus stanov� takov� �hel [S a] v_rozsahu [* `[0, ][*S p][* )], \r\n"
+	"pro kter� je [* cos(][*/S a][* ) = ][*/ x]. Vypo�ten� �hel funkce vrac� \r\n"
+	"v_radi�nech. Pokud parametr funkce le�� mimo interval [* `[-1,1`]], \r\n"
+	"v�po�et skon�� s chybou chyba p�i v�po�tu v re�ln�ch ��slech.&]\r\n"
+	"[s0;2 &]\r\n"
+	"[s0;2 [* P��klad: ]arccos(-0.5) = 2.094395102")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CarccosN_EN-US.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CarccosN_EN-US.dpx
new file mode 100644
index 000000000..893253653
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CarccosN_EN-US.dpx
@@ -0,0 +1,14 @@
+HELP_TOPIC("AppDoc", "", "Calc$CarccosN", "EN-US", "\1arccos\1 (\1real number\1 [/ x]) [S �] \1real number\1")
+	HELP_TEXT(
+	"[ [A@0+84 Arccosine returns such an angle ][S@0+84 a][A@0+84  \r\n"
+	"in the range ][*A@0+84 `[0, ][*S@0+84 p][*A@0+84 )][A@0+84  for \r\n"
+	"which ][*A@0+84 cos(][*/S@0+84 a][*A@0+84 ) `= ][*/A@0+84 x][A@0+84 . \r\n"
+	"The angle is returned in radians. If the function argument lies \r\n"
+	"outside the interval ][*A@0+84 `[`-1,1`]][A@0+84 , the computation \r\n"
+	"is aborted with the error message ][A@0+84 real number operation \r\n"
+	"error][A@0+84 .]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 Example][A@0+84 `: arccos(`-0.5) `= ][A@0+84 2.094395102]]\r\n")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CarcsinN_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CarcsinN_CS-CZ15.dpx
new file mode 100644
index 000000000..cf1b17f52
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CarcsinN_CS-CZ15.dpx
@@ -0,0 +1,12 @@
+HELP_TOPIC("AppDoc", "", "Calc$CarcsinN", "CS-CZ windows-1250", "\1arcsin\1 (\1re�ln� ��slo\1 [/ x]) [S �] \1re�ln� ��slo\1")
+	HELP_TEXT(
+	"[%EN-US3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0}%EN-US \r\n"
+	"[s0;2 Arkus sinus stanov� takov� �hel [S a] v_rozsahu [* `[-][*S p][* _/_2, \r\n"
+	"][*S p][* _/_2)], pro kter� je [* sin(][*/S a][* ) = ][*/ x]. Vypo�ten� �hel \r\n"
+	"funkce vrac� v_radi�nech. Pokud parametr funkce le�� mimo interval \r\n"
+	"[* `[-1,1`]], v�po�et skon�� s chybou chyba p�i v�po�tu v re�ln�ch \r\n"
+	"��slech.&]\r\n"
+	"[s0;2 &]\r\n"
+	"[s0;2 [* P��klad: ]arcsin(0.5) = 0.5235987756")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CarcsinN_EN-US.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CarcsinN_EN-US.dpx
new file mode 100644
index 000000000..d84f1d695
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CarcsinN_EN-US.dpx
@@ -0,0 +1,14 @@
+HELP_TOPIC("AppDoc", "", "Calc$CarcsinN", "EN-US", "\1arcsin\1 (\1real number\1 [/ x]) [S �] \1real number\1")
+	HELP_TEXT(
+	"[ [A@0+84 Arcsine returns such an angle ][S@0+84 a][A@0+84  in \r\n"
+	"the range ][*A@0+84 `[`-][*S@0+84 p][*A@0+84  `/ 2, ][*S@0+84 p][*A@0+84  \r\n"
+	"`/ 2)][A@0+84  for which ][*A@0+84 sin(][*/S@0+84 a][*A@0+84 ) \r\n"
+	"`= ][*/A@0+84 x][A@0+84 . The angle is returned in radians. If \r\n"
+	"the function argument lies outside the interval ][*A@0+84 `[`-1,1`]][A@0+84 , \r\n"
+	"the computation is aborted with the error message ][A@0+84 real \r\n"
+	"number operation error][A@0+84 .]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 Example][A@0+84 `: arcsin(0.5) `= ][A@0+84 0.5235987756]]\r\n")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CarctgN_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CarctgN_CS-CZ15.dpx
new file mode 100644
index 000000000..959f9781e
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CarctgN_CS-CZ15.dpx
@@ -0,0 +1,10 @@
+HELP_TOPIC("AppDoc", "", "Calc$CarctgN", "CS-CZ windows-1250", "\1arctg\1 (\1re�ln� ��slo\1 [/ x]) [S �] \1re�ln� ��slo\1")
+	HELP_TEXT(
+	"[%EN-US3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0}%EN-US \r\n"
+	"[s0;2 Arkus tangens stanov� takov� �hel [S a] v_rozsahu [* `[-][*S p][* _/_2, \r\n"
+	"][*S p][* _/_2)], pro kter� je [* tg(][*/S a][* ) = ][*/ x]. Vypo�ten� �hel \r\n"
+	"funkce vrac� v_radi�nech.&]\r\n"
+	"[s0;2 &]\r\n"
+	"[s0;2 [* P��klad: ]arctg(10) = 1.471127674")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CarctgN_EN-US.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CarctgN_EN-US.dpx
new file mode 100644
index 000000000..bf5d8057c
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CarctgN_EN-US.dpx
@@ -0,0 +1,12 @@
+HELP_TOPIC("AppDoc", "", "Calc$CarctgN", "EN-US", "\1arctg\1 (\1real number\1 [/ x]) [S �] \1real number\1")
+	HELP_TEXT(
+	"[ [A@0+84 Arctangent returns such an angle ][S@0+84 a][A@0+84  \r\n"
+	"in the range ][*A@0+84 `[`-][*S@0+84 p][*A@0+84  `/ 2, ][*S@0+84 p][*A@0+84  \r\n"
+	"`/ 2)][A@0+84  for which ][*A@0+84 tg(][*/A@0+84 S a][*A@0+84 ) \r\n"
+	"`= ][*/A@0+84 x][A@0+84 . The calculated angle is returned in \r\n"
+	"radians.]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 Example][A@0+84 `: arctg(10) `= ][A@0+84 1.471127674]]\r\n")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CarrayCtr_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CarrayCtr_CS-CZ15.dpx
new file mode 100644
index 000000000..dae6a5c8d
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CarrayCtr_CS-CZ15.dpx
@@ -0,0 +1,9 @@
+HELP_TOPIC("AppDoc", "", "Calc$CarrayCtr", "CS-CZ windows-1250", "")
+	HELP_TEXT(
+	"[%EN-US3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0}%EN-US \r\n"
+	"[s0;2 [Ipole`, konstruktor; Konstruktor pole] vytvo�� pole obsahuj�c� \r\n"
+	"zadanou posloupnost prvk�.&]\r\n"
+	"[s0;2 &]\r\n"
+	"[s0;2 [* P��klad: ]`[1+2, 1+3, \"a\" + \"b\"`] = `[3, 4, \"ab\"`]")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CarrayCtr_EN-US.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CarrayCtr_EN-US.dpx
new file mode 100644
index 000000000..bb570d1cf
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CarrayCtr_EN-US.dpx
@@ -0,0 +1,6 @@
+HELP_TOPIC("AppDoc", "", "Calc$CarrayCtr", "EN-US", "")
+	HELP_TEXT(
+	"The array constructor creates an array containing the given sequence of elements.\r\n"
+	"&\r\n"
+	"&[* Example:[*  `[1+2, 1+3, \"a\" + \"b\"`] = `[3, 4, \"ab\"`]]]")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CarrayIndex_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CarrayIndex_CS-CZ15.dpx
new file mode 100644
index 000000000..95f23784e
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CarrayIndex_CS-CZ15.dpx
@@ -0,0 +1,9 @@
+HELP_TOPIC("AppDoc", "", "Calc$CarrayIndex", "CS-CZ windows-1250", "oper�tor \1[]\1  (\1pole hodnot\1, \1cel� ��slo\1) [S �] \1libovoln� typ\1")
+	HELP_TEXT(
+	"[%EN-US3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0}%EN-US \r\n"
+	"[s0;2 Oper�tor vr�t� prvek pole na dan� pozici. Prvky pole jsou indexov�ny \r\n"
+	"od 0, posledn� prvek m� index [/ pole.count]-1.&]\r\n"
+	"[s0;2 &]\r\n"
+	"[s0;2 [* P��klad: ]`[\"index0\", \"index1\", \"index2\"`]`[1`] = \"index1\"")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CarrayIndex_EN-US.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CarrayIndex_EN-US.dpx
new file mode 100644
index 000000000..0dbc7b069
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CarrayIndex_EN-US.dpx
@@ -0,0 +1,4 @@
+HELP_TOPIC("AppDoc", "", "Calc$CarrayIndex", "EN-US", "operator \1[]\1  (\1pole hodnot\1, \1integer\1) [S �] \1any data type\1")
+	HELP_TEXT(
+	"\r\n")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CarrayRange_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CarrayRange_CS-CZ15.dpx
new file mode 100644
index 000000000..e053dafe2
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CarrayRange_CS-CZ15.dpx
@@ -0,0 +1,7 @@
+HELP_TOPIC("AppDoc", "", "Calc$CarrayRange", "CS-CZ windows-1250", "")
+	HELP_TEXT(
+	"[3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0} \r\n"
+	"[s0;*2 [* Pomoc� konstruktu ]`[a .. b`][*  lze vytvo�it pole hodnot z_dan�ho \r\n"
+	"intervalu. V�sledn� pole bude obsahovat hodnoty ]`[a,a+1,a+2,...,[* round(]b[* )]`].")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CascS_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CascS_CS-CZ15.dpx
new file mode 100644
index 000000000..139612aad
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CascS_CS-CZ15.dpx
@@ -0,0 +1,9 @@
+HELP_TOPIC("AppDoc", "", "Calc$CascS", "CS-CZ windows-1250", "\1asc\1 (\1�et�zec\1) [S �] \1cel� ��slo\1")
+	HELP_TEXT(
+	"[%EN-US3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0}%EN-US \r\n"
+	"[s0;2 Funkce vr�t� ASCII-k�d prvn�ho znaku zadan�ho textu. Pokud \r\n"
+	"je text pr�zdn�, funkce vr�t� hodnotu 0.&]\r\n"
+	"[s0;2 &]\r\n"
+	"[s0;2 [* P��klad: ]asc(\"ahoj\") = 97 [/ (k�d znaku 'a')].")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CascS_EN-US.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CascS_EN-US.dpx
new file mode 100644
index 000000000..0f25834db
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CascS_EN-US.dpx
@@ -0,0 +1,11 @@
+HELP_TOPIC("AppDoc", "", "Calc$CascS", "EN-US", "\1asc\1 (\1string\1) [S �] \1integer\1")
+	HELP_TEXT(
+	"[ [A@0+84 The function will return ASCII`-code of the first character \r\n"
+	"of its string argument. If the argument is empty, the function \r\n"
+	"will return 0.]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 Example][A@0+84 `: asc(`\"hello`\") `= 104 ][/A@0+84 (ASCII \r\n"
+	"code of the character `'h`')][A@0+84 .]]\r\n")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CavgA_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CavgA_CS-CZ15.dpx
new file mode 100644
index 000000000..2af6ef9c5
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CavgA_CS-CZ15.dpx
@@ -0,0 +1,10 @@
+HELP_TOPIC("AppDoc", "", "Calc$CavgA", "CS-CZ windows-1250", "")
+	HELP_TEXT(
+	"[%EN-US3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0}%EN-US \r\n"
+	"[s0;2 Funkce spo��t� pr�m�r hodnot ze zadan�ho pole. Vstupn� pole \r\n"
+	"mus� obsahovat ��seln� hodnoty, p��padn� hodnoty [* null], kter� \r\n"
+	"se ov�em p�i v�po�tu pr�m�ru ignoruj�.&]\r\n"
+	"[s0;2 &]\r\n"
+	"[s0;2 [* P��klad: ]avg(`[10, 20, 24`]) = 17")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CbitAndNN_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CbitAndNN_CS-CZ15.dpx
new file mode 100644
index 000000000..6631a0cf3
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CbitAndNN_CS-CZ15.dpx
@@ -0,0 +1,10 @@
+HELP_TOPIC("AppDoc", "", "Calc$CbitAndNN", "CS-CZ windows-1250", "oper�tor \1&\1  (\1cel� ��slo\1, \1cel� ��slo\1) [S �] \1cel� ��slo\1")
+	HELP_TEXT(
+	"[%EN-US3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0}%EN-US \r\n"
+	"[s0;2 Bitov� sou�in. V�sledkem operace je cel� ��slo, jeho� dvojkov� \r\n"
+	"reprezentace obsahuje jedni�ky na t�ch pozic�ch, na kter�ch jsou \r\n"
+	"ve dvojkov� reprezentaci obou argument� jedni�ky.&]\r\n"
+	"[s0;2 &]\r\n"
+	"[s0;2 [* P��klad: ]11 `& 13 = 9 (1011 `& 1101 = 1001).")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CbitAndNN_EN-US.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CbitAndNN_EN-US.dpx
new file mode 100644
index 000000000..3ca2e5833
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CbitAndNN_EN-US.dpx
@@ -0,0 +1,10 @@
+HELP_TOPIC("AppDoc", "", "Calc$CbitAndNN", "EN-US", "operator \1&\1  (\1integer\1, \1integer\1) [S �] \1integer\1")
+	HELP_TEXT(
+	"[ [A@0+84 Bit product. The result is the integer whose binary \r\n"
+	"representation consists of ones on those positions on which there \r\n"
+	"are ones in binary representation of both arguments.]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 Example][A@0+84 `: 11 `& 13 `= 9 (1011 `& 1101 `= 1001).]]\r\n")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CbitNotN_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CbitNotN_CS-CZ15.dpx
new file mode 100644
index 000000000..cb698dac6
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CbitNotN_CS-CZ15.dpx
@@ -0,0 +1,12 @@
+HELP_TOPIC("AppDoc", "", "Calc$CbitNotN", "CS-CZ windows-1250", "oper�tor \1~\1  (\1cel� ��slo\1) [S �] \1cel� ��slo\1")
+	HELP_TEXT(
+	"[%EN-US3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0}%EN-US \r\n"
+	"[s0;2 Bitov� negace. V�sledkem operace je cel� ��slo, jeho� dvojkov� \r\n"
+	"reprezentace obsahuje jedni�ky pr�v� na t�ch pozic�ch, kde jsou \r\n"
+	"ve dvojkov� reprezentaci argumentu nuly a_naopak. Vzhledem k_tomu, \r\n"
+	"�e v�po�ty s_cel�mi ��sly prob�haj� v_dopl�kov�m k�du, plat�: \r\n"
+	"[* %01~x_= -1 - x%01].&]\r\n"
+	"[s0;2 &]\r\n"
+	"[s0;2 [* P��klad: ]~14 = -15.")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CbitNotN_EN-US.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CbitNotN_EN-US.dpx
new file mode 100644
index 000000000..b25739422
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CbitNotN_EN-US.dpx
@@ -0,0 +1,12 @@
+HELP_TOPIC("AppDoc", "", "Calc$CbitNotN", "EN-US", "operator \1~\1  (\1integer\1) [S �] \1integer\1")
+	HELP_TEXT(
+	"[ [A@0+84 Bit negation. The result is the integer whose binary \r\n"
+	"representation consists of ones on those positions on which there \r\n"
+	"are zeroes and vice versa in binary representation of the argument. \r\n"
+	"As integer calculations are performed in 0`'s complement code, \r\n"
+	"it is always true that ][*A@0+84 `%01`~x_`= `-1 `- x`%01][A@0+84 .]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 Example][A@0+84 `: `~14 `= `-15.]]\r\n")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CbitOrNN_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CbitOrNN_CS-CZ15.dpx
new file mode 100644
index 000000000..9402bfb5f
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CbitOrNN_CS-CZ15.dpx
@@ -0,0 +1,10 @@
+HELP_TOPIC("AppDoc", "", "Calc$CbitOrNN", "CS-CZ windows-1250", "oper�tor \1|\1  (\1cel� ��slo\1, \1cel� ��slo\1) [S �] \1cel� ��slo\1")
+	HELP_TEXT(
+	"[%EN-US3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0}%EN-US \r\n"
+	"[s0;2 Bitov� sou�et. V�sledkem operace je cel� ��slo, jeho� dvojkov� \r\n"
+	"reprezentace obsahuje jedni�ky na t�ch pozic�ch, na kter�ch je \r\n"
+	"ve dvojkov� reprezentaci alespo� jednoho z_argument� jedni�ka.&]\r\n"
+	"[s0;2 &]\r\n"
+	"[s0;2 [* P��klad: ]1 | 4 = 5 (001 | 100 = 101).")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CbitOrNN_EN-US.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CbitOrNN_EN-US.dpx
new file mode 100644
index 000000000..da75e1f47
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CbitOrNN_EN-US.dpx
@@ -0,0 +1,10 @@
+HELP_TOPIC("AppDoc", "", "Calc$CbitOrNN", "EN-US", "operator \1|\1  (\1integer\1, \1integer\1) [S �] \1integer\1")
+	HELP_TEXT(
+	"[ [A@0+84 Bit addition. The result is the integer whose binary \r\n"
+	"representation consists of 1`'s on those positions on which there \r\n"
+	"is 1 in binary representation of any of its arguments.]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 Example][A@0+84 `: 1 `| 4 `= 5 (001 `| 100 `= 101).]]\r\n")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CbitXorNN_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CbitXorNN_CS-CZ15.dpx
new file mode 100644
index 000000000..c9cb695b4
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CbitXorNN_CS-CZ15.dpx
@@ -0,0 +1,11 @@
+HELP_TOPIC("AppDoc", "", "Calc$CbitXorNN", "CS-CZ windows-1250", "oper�tor \1^\1  (\1cel� ��slo\1, \1cel� ��slo\1) [S �] \1cel� ��slo\1")
+	HELP_TEXT(
+	"[%EN-US3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0}%EN-US \r\n"
+	"[s0;2 Bitov� symetrick� rozd�l ([* xor]). V�sledkem operace je cel� \r\n"
+	"��slo, jeho� dvojkov� reprezentace obsahuje jedni�ky na t�ch \r\n"
+	"pozic�ch, na kter�ch se ve dvojkov� reprezentaci obou argument� \r\n"
+	"��slice li��.&]\r\n"
+	"[s0;2 &]\r\n"
+	"[s0;2 [* P��klad: ]9 ^ 15 = 6 (1001 ^ 1111 = 0110).")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CbitXorNN_EN-US.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CbitXorNN_EN-US.dpx
new file mode 100644
index 000000000..dd6d43a47
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CbitXorNN_EN-US.dpx
@@ -0,0 +1,11 @@
+HELP_TOPIC("AppDoc", "", "Calc$CbitXorNN", "EN-US", "operator \1^\1  (\1integer\1, \1integer\1) [S �] \1integer\1")
+	HELP_TEXT(
+	"[ [A@0+84 Bit symmetric difference (][*A@0+84 xor][A@0+84 ). The \r\n"
+	"result of the operation is an integer whose binary representation \r\n"
+	"consists of 1`'s on those positions on which the digits in binary \r\n"
+	"representation of its arguments differ.]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 Example][A@0+84 `: 9 `^ 15 `= 6 (1001 `^ 1111 `= 0110).]]\r\n")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CcallSV_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CcallSV_CS-CZ15.dpx
new file mode 100644
index 000000000..c445d9df9
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CcallSV_CS-CZ15.dpx
@@ -0,0 +1,11 @@
+HELP_TOPIC("AppDoc", "", "Calc$CcallSV", "CS-CZ windows-1250", "")
+	HELP_TEXT(
+	"[%EN-US3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0}%EN-US \r\n"
+	"[s0;2 Funkce na�te prom�nnou v�razov�ho syst�mu nebo zavol� funkci \r\n"
+	"zadanou textov�m identifik�torem. V_p��pad� funkce je mo�no jako \r\n"
+	"dal�� parametry zadat parametry funkce.&]\r\n"
+	"[s0;2 &]\r\n"
+	"[s0;2 [* P��klad: ]call(\"mid\", \"ahoj\", 2, 2) = \"oj\"&]\r\n"
+	"[s0;*2 ")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CcatSSS_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CcatSSS_CS-CZ15.dpx
new file mode 100644
index 000000000..ed06fca94
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CcatSSS_CS-CZ15.dpx
@@ -0,0 +1,10 @@
+HELP_TOPIC("AppDoc", "", "Calc$CcatSSS", "CS-CZ windows-1250", "\1cat\1 (\1�et�zec\1 [/ text_1], \1�et�zec\1 [/ mezi], \1�et�zec\1 [/ text_2]) [S �] \1�et�zec\1")
+	HELP_TEXT(
+	"[%EN-US3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0}%EN-US \r\n"
+	"[s0;2 Funkce spoj� zadan� �et�zce [/ text`_1] a [/ text`_2]. Pokud jsou \r\n"
+	"oba �et�zce nepr�zdn�, vlo�� se mezi n� �et�zec [/ mezi].&]\r\n"
+	"[s0;2 &]\r\n"
+	"[s0;2 [* P��klad: ]cat(\"ahoj\", \" \", \"sv�te\") = \"ahoj sv�te\", cat(\"\", \r\n"
+	"\" \", \"sv�te\") = \"sv�te\"")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CcatSSS_EN-US.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CcatSSS_EN-US.dpx
new file mode 100644
index 000000000..5390975c6
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CcatSSS_EN-US.dpx
@@ -0,0 +1,11 @@
+HELP_TOPIC("AppDoc", "", "Calc$CcatSSS", "EN-US", "\1cat\1 (\1string\1 [/ text_1], \1string\1 [/ join], \1string\1 [/ text_2]) [S �] \1string\1")
+	HELP_TEXT(
+	"[ [A@0+84 The function concatenates its arguments ][/A@0+84 text`_1][A@0+84  \r\n"
+	"and ][/A@0+84 text`_2][A@0+84 . If neither string is empty, the \r\n"
+	"string ][/A@0+84 join][A@0+84  is inserted between them.]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 Example][A@0+84 `: cat(`\"hello`\", `\" `\", `\"world`\") \r\n"
+	"`= `\"hello world`\", cat(`\"`\", `\" `\", `\"world`\") `= `\"world`\"]]\r\n")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CceilNN_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CceilNN_CS-CZ15.dpx
new file mode 100644
index 000000000..a4511c6bc
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CceilNN_CS-CZ15.dpx
@@ -0,0 +1,10 @@
+HELP_TOPIC("AppDoc", "", "Calc$CceilNN", "CS-CZ windows-1250", "\1ceil\1 (\1re�ln� ��slo\1 [/ hodnota], \1cel� ��slo\1 [/ po�et_desetinn�ch_m�st]) [S �] \1re�ln� ��slo\1")
+	HELP_TEXT(
+	"[%EN-US3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0}%EN-US \r\n"
+	"[s0;2 Zaokrouhlen� sm�rem nahoru na zadan� po�et desetinn�ch m�st. \r\n"
+	"Funkce nalezne nejmen�� re�ln� ��slo, kter� je celistv�m n�sobkem \r\n"
+	"hodnoty [* 10_**_][/ -po�et_m�st] a_nen� men�� ne� p�vodn� [/ hodnota].&]\r\n"
+	"[s0;2 &]\r\n"
+	"[s0;2 [* P��klad: ]ceil(47.32, 1) = 47.4, ceil(117, -1) = 120.")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CceilNN_EN-US.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CceilNN_EN-US.dpx
new file mode 100644
index 000000000..d05038f54
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CceilNN_EN-US.dpx
@@ -0,0 +1,12 @@
+HELP_TOPIC("AppDoc", "", "Calc$CceilNN", "EN-US", "\1ceil\1 (\1real number\1 [/ value], \1integer\1 [/ decimals]) [S �] \1real number\1")
+	HELP_TEXT(
+	"[ [A@0+84 Rounding down (towards plus infinity) to the stated \r\n"
+	"number of decimal places (0 by default). The function returns \r\n"
+	"the lowest integral multiple of ][*A@0+84 10_`*`*_][/A@0+84 `-decimals][A@0+84  \r\n"
+	"not lower than the original ][/A@0+84 value][A@0+84 .]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 Example][A@0+84 `: ceil(`-2.5) `= `-2, ceil(47.32, \r\n"
+	"1) `= 47.4, ceil(117, `-1) `= 120.]]\r\n")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CceilN_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CceilN_CS-CZ15.dpx
new file mode 100644
index 000000000..fcc32acbd
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CceilN_CS-CZ15.dpx
@@ -0,0 +1,9 @@
+HELP_TOPIC("AppDoc", "", "Calc$CceilN", "CS-CZ windows-1250", "\1ceil\1 (\1re�ln� ��slo\1) [S �] \1re�ln� ��slo\1")
+	HELP_TEXT(
+	"[%EN-US3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0}%EN-US \r\n"
+	"[s0;2 Zaokrouhlen� sm�rem nahoru. Funkce nalezne nejmen�� cel� ��slo, \r\n"
+	"kter� nen� men�� ne� p�vodn� [/ hodnota].&]\r\n"
+	"[s0;2 &]\r\n"
+	"[s0;2 [* P��klad: ]ceil(-2.5) = -2")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CceilN_EN-US.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CceilN_EN-US.dpx
new file mode 100644
index 000000000..f5b672c54
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CceilN_EN-US.dpx
@@ -0,0 +1,4 @@
+HELP_TOPIC("AppDoc", "", "Calc$CceilN", "EN-US", "\1ceil\1 (\1real number\1) [S �] \1real number\1")
+	HELP_TEXT(
+	"\r\n")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CceilrNN_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CceilrNN_CS-CZ15.dpx
new file mode 100644
index 000000000..d9fedf4de
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CceilrNN_CS-CZ15.dpx
@@ -0,0 +1,11 @@
+HELP_TOPIC("AppDoc", "", "Calc$CceilrNN", "CS-CZ windows-1250", "\1ceilr\1(\1re�ln� ��slo\1 [/ hodnota], \1cel� ��slo\1 [/ platn�ch_��slic]) [S �] \1re�ln� ��slo\1")
+	HELP_TEXT(
+	"[%EN-US3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0}%EN-US \r\n"
+	"[s0;2 [Izaokrouhlování`; číslo`, zaokrouhlení; Zaokrouhlen�] sm�rem \r\n"
+	"nahoru na zadan� po�et platn�ch ��slic. Funkce nalezne nejmen�� \r\n"
+	"re�ln� ��slo, kter� je celistv�m n�sobkem hodnoty [* 10_**_][/ (ceil(log(hodnota))-pl\r\n"
+	"atn�ch`_��slic)] a_nen� men�� ne� p�vodn� [/ hodnota].&]\r\n"
+	"[s0;2 &]\r\n"
+	"[s0;2 [* P��klad: ]ceilr(47.32, 3) = 47.4, ceilr(117, 1) = 200.")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CceilrNN_EN-US.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CceilrNN_EN-US.dpx
new file mode 100644
index 000000000..7b364e8a0
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CceilrNN_EN-US.dpx
@@ -0,0 +1,13 @@
+HELP_TOPIC("AppDoc", "", "Calc$CceilrNN", "EN-US", "\1ceilr\1(\1real number\1 [/ value], \1integer\1 [/ significant_digits]) [S �] \1real number\1")
+	HELP_TEXT(
+	"[{2}\r\n"
+	"[s0; [2 Rounding up (towards plus infinity) to the stated number \r\n"
+	"of significant digits. The function returns the lowest integral \r\n"
+	"multiple of ][*2 10�`*`*�][/2 (ceil(log(value))`-significant`_digits)][2  \r\n"
+	"not lower than the original ][/2 value][2 .]]\r\n"
+	"&\r\n"
+	"[s0;2 ]\r\n"
+	"&\r\n"
+	"[s0; [*2 Example`: ceilr(47.32, 3) `= 47.4, ceilr(117, 1) `= 200.]]\r\n"
+	"]")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CchrN_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CchrN_CS-CZ15.dpx
new file mode 100644
index 000000000..984624353
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CchrN_CS-CZ15.dpx
@@ -0,0 +1,9 @@
+HELP_TOPIC("AppDoc", "", "Calc$CchrN", "CS-CZ windows-1250", "\1chr\1 (\1cel� ��slo\1 [/ ascii]) [S �] \1�et�zec\1")
+	HELP_TEXT(
+	"[%EN-US3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0}%EN-US \r\n"
+	"[s0;2 Funkce vr�t� jednoznakov� �et�zec, obsahuj�c� znak s_ASCII-k�dem \r\n"
+	"[/ ascii].&]\r\n"
+	"[s0;2 &]\r\n"
+	"[s0;2 [* P��klad: ]chr(66) = \"B\".")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CchrN_EN-US.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CchrN_EN-US.dpx
new file mode 100644
index 000000000..8df6ea08e
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CchrN_EN-US.dpx
@@ -0,0 +1,9 @@
+HELP_TOPIC("AppDoc", "", "Calc$CchrN", "EN-US", "\1chr\1 (\1integer\1 [/ ascii]) [S �] \1string\1")
+	HELP_TEXT(
+	"[ [A@0+84 The function will return one`-character string containing \r\n"
+	"the character with the ASCII`-code ascii.]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 Example][A@0+84 `: chr(66) `= `\"B`\".]]\r\n")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CcosN_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CcosN_CS-CZ15.dpx
new file mode 100644
index 000000000..fe2cec2b4
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CcosN_CS-CZ15.dpx
@@ -0,0 +1,10 @@
+HELP_TOPIC("AppDoc", "", "Calc$CcosN", "CS-CZ windows-1250", "\1cos\1 (\1re�ln� ��slo\1 [/ [S a]]) [S �] \1re�ln� ��slo\1")
+	HELP_TEXT(
+	"[%EN-US3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0}%EN-US \r\n"
+	"[s0;2 Funkce stanov� kosinus �hlu, tedy pod�l d�lky p�ilehl� odv�sny \r\n"
+	"a_p�epony v_pravo�hl�m troj�heln�ku s_odv�snov�m �hlem [S a]. �hel \r\n"
+	"se zad�v� v_radi�nech, tak�e pln� �hel m� velikost 2[S p].&]\r\n"
+	"[s0;2 &]\r\n"
+	"[s0;2 [* P��klad: ]cos(pi) = -1")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CcosN_EN-US.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CcosN_EN-US.dpx
new file mode 100644
index 000000000..a34c608fb
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CcosN_EN-US.dpx
@@ -0,0 +1,12 @@
+HELP_TOPIC("AppDoc", "", "Calc$CcosN", "EN-US", "\1cos\1 (\1real number\1 [/ [S a]]) [S �] \1real number\1")
+	HELP_TEXT(
+	"[ [A@0+84 The function calculates the cosine of the angle ][S@0+84 a][A@0+84 , \r\n"
+	"i.e. the ratio of the length of the adjacent leg and the length \r\n"
+	"of the hypotenuse in a right`-angled triangle with the leg angle \r\n"
+	"][S@0+84 a][A@0+84 . The input angle is assumed to be in radians, \r\n"
+	"therefore the perigon equals 2][S@0+84 p][A@0+84 .]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 Example][A@0+84 `: cos(pi) `= `-1]]\r\n")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CcountA_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CcountA_CS-CZ15.dpx
new file mode 100644
index 000000000..286e6ba83
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CcountA_CS-CZ15.dpx
@@ -0,0 +1,8 @@
+HELP_TOPIC("AppDoc", "", "Calc$CcountA", "CS-CZ windows-1250", "\1count\1 (\1pole hodnot\1) [S �] \1cel� ��slo\1")
+	HELP_TEXT(
+	"[%EN-US3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0}%EN-US \r\n"
+	"[s0;2 Funkce vr�t� po�et prvk� zadan�ho pole.&]\r\n"
+	"[s0;2 &]\r\n"
+	"[s0;2 [* P��klad: ]count(`[3..6`]) = 4")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CcountA_EN-US.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CcountA_EN-US.dpx
new file mode 100644
index 000000000..a6f93c591
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CcountA_EN-US.dpx
@@ -0,0 +1,4 @@
+HELP_TOPIC("AppDoc", "", "Calc$CcountA", "EN-US", "\1count\1 (\1pole hodnot\1) [S �] \1integer\1")
+	HELP_TEXT(
+	"\r\n")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CcountNS_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CcountNS_CS-CZ15.dpx
new file mode 100644
index 000000000..7030a5ac9
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CcountNS_CS-CZ15.dpx
@@ -0,0 +1,13 @@
+HELP_TOPIC("AppDoc", "", "Calc$CcountNS", "CS-CZ windows-1250", "\1count\1 (\1cel� ��slo\1, \1�et�zec\1) [S �] \1�et�zec\1")
+	HELP_TEXT(
+	"[%EN-US3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0}%EN-US \r\n"
+	"[s0;2 Funkce vr�t� textovou reprezentaci des�tkov�ho z�pisu ��seln� \r\n"
+	"hodnoty s p�ipojen�m podstatn�m jm�nem. V �et�zci podstatn�ho \r\n"
+	"jm�na lze lom�tkem odd�lit p��pony pro singul�r, plur�l a genitiv \r\n"
+	"plur�lu, kter� se v �esk�m jazyce pou��vaj� k vyj�d�en� po�tu \r\n"
+	"1, 2/3/4 a 5 (podle posledn� ��slice po�tu).&]\r\n"
+	"[s0;2 &]\r\n"
+	"[s0;2 [* P��klad: ]count(62, \"koz/a/y/\") = \"62 kozy\", count(61, \"koz/a/y/\") \r\n"
+	"= \"61 koza\".")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CcountNS_EN-US.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CcountNS_EN-US.dpx
new file mode 100644
index 000000000..6051786cb
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CcountNS_EN-US.dpx
@@ -0,0 +1,13 @@
+HELP_TOPIC("AppDoc", "", "Calc$CcountNS", "EN-US", "\1count\1 (\1integer\1, \1string\1) [S �] \1string\1")
+	HELP_TEXT(
+	"[ [A@0+84 The function returns text representation of decimal \r\n"
+	"notation of its numeric value together with the attached noun. \r\n"
+	"In the noun string, the forward slash can separate the suffixes \r\n"
+	"of singular and plural used in English to distinguish between \r\n"
+	"a single object and multiple objects.]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 Example][A@0+84 `: count(1, `\"m`/ouse`/ice`\") `= `\"1 \r\n"
+	"mouse`\", count(2, `\"m`/ouse`/ice`\") `= `\"2 mice`\".]]\r\n")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$Cdate0_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$Cdate0_CS-CZ15.dpx
new file mode 100644
index 000000000..b2a40a376
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$Cdate0_CS-CZ15.dpx
@@ -0,0 +1,6 @@
+HELP_TOPIC("AppDoc", "", "Calc$Cdate0", "CS-CZ windows-1250", "")
+	HELP_TEXT(
+	"[3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0} \r\n"
+	"[s0;2 Funkce vr�t� aktu�ln� syst�mov� datum v_m�stn�m �ase.")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$Cdate0_EN-US.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$Cdate0_EN-US.dpx
new file mode 100644
index 000000000..6d76d423e
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$Cdate0_EN-US.dpx
@@ -0,0 +1,4 @@
+HELP_TOPIC("AppDoc", "", "Calc$Cdate0", "EN-US", "\1date\1 [S �] \1date\1")
+	HELP_TEXT(
+	"\r\n")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CdateNNN_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CdateNNN_CS-CZ15.dpx
new file mode 100644
index 000000000..541e042d3
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CdateNNN_CS-CZ15.dpx
@@ -0,0 +1,14 @@
+HELP_TOPIC("AppDoc", "", "Calc$CdateNNN", "CS-CZ windows-1250", "\1date\1 (\1cel� ��slo\1 [/ den], \1cel� ��slo\1 [/ m�s�c], \1cel� ��slo\1 [/ rok]) [S �] \1datum\1")
+	HELP_TEXT(
+	"[%EN-US3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0}%EN-US \r\n"
+	"[s0;2 Funkce sestav� datum ze zadan�ch polo�ek. Funkce bez parametru \r\n"
+	"vr�t� dne�n� datum, zji�t�n� ze syst�mu. Funkce s_jedn�m parametrem \r\n"
+	"[/ den] vr�t� den se zadan�m ��slem v_aktu�ln�m m�s�ci. Funkce \r\n"
+	"se dv�ma parametry [/ den], [/ m�s�c] vr�t� den se zadan�m ��slem \r\n"
+	"dne a_m�s�ce v_aktu�ln�m roce. Varianta se t�emi parametry pouze \r\n"
+	"sestav� datum ze zadan�ch sou��st�.&]\r\n"
+	"[s0;*2 &]\r\n"
+	"[s0;2 [* P��klad: ]date = 19.06.2003, date(10) = 10.06.2003, date(15, \r\n"
+	"7) = 15.07.2003, date(25, 1, 1974) = 25.01.1974")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CdateNNN_EN-US.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CdateNNN_EN-US.dpx
new file mode 100644
index 000000000..7b85d7529
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CdateNNN_EN-US.dpx
@@ -0,0 +1,16 @@
+HELP_TOPIC("AppDoc", "", "Calc$CdateNNN", "EN-US", "\1date\1 (\1integer\1 [/ day], \1integer\1 [/ month], \1integer\1 [/ year]) [S �] \1date\1")
+	HELP_TEXT(
+	"[ [A@0+84 The function composes a date value from its arguments. \r\n"
+	"The form without parameters returns current system date. The \r\n"
+	"form with the parameter ][/A@0+84 day][A@0+84   returns given \r\n"
+	"day in the current month. The two parameter`-form, ][/A@0+84 day][A@0+84  \r\n"
+	"and ][/A@0+84 month][A@0+84 , returns given day and month in \r\n"
+	"the current system year. The three argument form composes an \r\n"
+	"arbitrary date as specified by day, month, and year number.]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 Example][A@0+84 `: date `= ][A@0+84 20.06.2003][A@0+84 , \r\n"
+	"date(10) `= ][A@0+84 10.06.2003][A@0+84 , date(15, 7) `= ][A@0+84 15.07.2003][A@0+84 ,\r\n"
+	" date(25, 1, 1974) `= 25.01.1974]]\r\n")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CdateNN_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CdateNN_CS-CZ15.dpx
new file mode 100644
index 000000000..3dbe518eb
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CdateNN_CS-CZ15.dpx
@@ -0,0 +1,8 @@
+HELP_TOPIC("AppDoc", "", "Calc$CdateNN", "CS-CZ windows-1250", "\1date\1 (\1cel� ��slo\1 [/ den], \1cel� ��slo\1 [/ m�s�c]) [S �] \1datum\1")
+	HELP_TEXT(
+	"[3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0} \r\n"
+	"[s0;2 Funkce vr�t� aktu�ln� syst�mov� datum, ve kter�m zam�n� ��slo \r\n"
+	"dne hodnotou zadan�ho parametru [/ den] a ��slo m�s�ce hodnotou \r\n"
+	"parametru [/ m�s�c].")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CdateNN_EN-US.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CdateNN_EN-US.dpx
new file mode 100644
index 000000000..d009d2c06
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CdateNN_EN-US.dpx
@@ -0,0 +1,4 @@
+HELP_TOPIC("AppDoc", "", "Calc$CdateNN", "EN-US", "\1date\1 (\1integer\1 [/ day], \1integer\1 [/ month]) [S �] \1date\1")
+	HELP_TEXT(
+	"\r\n")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CdateN_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CdateN_CS-CZ15.dpx
new file mode 100644
index 000000000..50554d9d1
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CdateN_CS-CZ15.dpx
@@ -0,0 +1,15 @@
+HELP_TOPIC("AppDoc", "", "Calc$CdateN", "CS-CZ windows-1250", "\1date\1 (\1cel� ��slo\1 [/ den]) [S �] \1datum\1")
+	HELP_TEXT(
+	"[3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0} \r\n"
+	"[s0;2 Funkce vr�t� aktu�ln� syst�mov� datum, ve kter�m zam�n� ��slo \r\n"
+	"dne hodnotou zadan�ho parametru [* den].&]\r\n"
+	"[s0;2 &]\r\n"
+	"[s0;2 Viz tak�:&]\r\n"
+	"[s0;i150;O0;*^dpp`:`/`/AppDoc`/`/`:`:`/`/Calc`$CdateNN^2 [^^ \r\n"
+	"{:LINK:dpp`:`/`/AppDoc`/`/`:`:`/`/Calc`$CdateNN\t\t:}\r\n"
+	"]&]\r\n"
+	"[s0;i150;O0;*^dpp`:`/`/AppDoc`/`/`:`:`/`/Calc`$CdateNNN^2 [^^ \r\n"
+	"{:LINK:dpp`:`/`/AppDoc`/`/`:`:`/`/Calc`$CdateNNN\t\t:}\r\n"
+	"]")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CdateN_EN-US.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CdateN_EN-US.dpx
new file mode 100644
index 000000000..ae347bf4b
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CdateN_EN-US.dpx
@@ -0,0 +1,4 @@
+HELP_TOPIC("AppDoc", "", "Calc$CdateN", "EN-US", "\1date\1 (\1integer\1 [/ day]) [S �] \1date\1")
+	HELP_TEXT(
+	"\r\n")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CdayD_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CdayD_CS-CZ15.dpx
new file mode 100644
index 000000000..93b15e73c
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CdayD_CS-CZ15.dpx
@@ -0,0 +1,9 @@
+HELP_TOPIC("AppDoc", "", "Calc$CdayD", "CS-CZ windows-1250", "")
+	HELP_TEXT(
+	"[%EN-US3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0}%EN-US \r\n"
+	"[s0;2 [Idatum`, funkce; Funkce] vr�t� ��slo dne v m�s�ci pro zadan� \r\n"
+	"datum.&]\r\n"
+	"[s0;2 &]\r\n"
+	"[s0;2 [* P��klad: ]den(27.5.1984) = 27")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CdayD_EN-US.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CdayD_EN-US.dpx
new file mode 100644
index 000000000..07f0d041e
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CdayD_EN-US.dpx
@@ -0,0 +1,10 @@
+HELP_TOPIC("AppDoc", "", "Calc$CdayD", "EN-US", "")
+	HELP_TEXT(
+	"[{2}\r\n"
+	"[s0; [2 The function returns the day number of its argument.]]\r\n"
+	"&\r\n"
+	"[s0;2 ]\r\n"
+	"&\r\n"
+	"[s0; [*2 Example`: day(27.5.1984) `= 27]]\r\n"
+	"]")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$Cday_of_weekD_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$Cday_of_weekD_CS-CZ15.dpx
new file mode 100644
index 000000000..99d3ebb2a
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$Cday_of_weekD_CS-CZ15.dpx
@@ -0,0 +1,10 @@
+HELP_TOPIC("AppDoc", "", "Calc$Cday_of_weekD", "CS-CZ windows-1250", "\1day_of_week\1 (\1datum\1) [S �] \1cel� ��slo\1")
+	HELP_TEXT(
+	"[%EN-US3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0}%EN-US \r\n"
+	"[s0;2 Funkce vr�t� index dne v_t�dnu pro zadan� datum. Prvn�m dnem \r\n"
+	"v_t�dnu s_indexem 0 je pro tuto funkci [* ned�le], posledn�m dnem \r\n"
+	"je [* sobota] s_indexem 6.&]\r\n"
+	"[s0;2 &]\r\n"
+	"[s0;2 [* P��klad: ]day`_of`_week(19.06.2003) = 4")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$Cday_of_weekD_EN-US.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$Cday_of_weekD_EN-US.dpx
new file mode 100644
index 000000000..c36875cb8
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$Cday_of_weekD_EN-US.dpx
@@ -0,0 +1,11 @@
+HELP_TOPIC("AppDoc", "", "Calc$Cday_of_weekD", "EN-US", "\1day_of_week\1 (\1date\1) [S �] \1integer\1")
+	HELP_TEXT(
+	"[ [A@0+84 The function returns the index of day in week for its \r\n"
+	"date argument. The functions returns 0 for Sunday, 1 for Monday \r\n"
+	"etc. through 6 for Saturday.]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 Example][A@0+84 `: day`_of`_week(][A@0+84 20.06.2003][A@0+84 ) \r\n"
+	"`= ][A@0+84 5]]\r\n")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CdivNN_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CdivNN_CS-CZ15.dpx
new file mode 100644
index 000000000..04e364940
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CdivNN_CS-CZ15.dpx
@@ -0,0 +1,9 @@
+HELP_TOPIC("AppDoc", "", "Calc$CdivNN", "CS-CZ windows-1250", "oper�tor \1/\1  (\1re�ln� ��slo\1, \1re�ln� ��slo\1) [S �] \1re�ln� ��slo\1")
+	HELP_TEXT(
+	"[%EN-US3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0}%EN-US \r\n"
+	"[s0;2 D�len�. Pokud je na prav� stran� oper�toru nula, v�po�et v�razu \r\n"
+	"ohl�s� chybu [* d�len� nulou].&]\r\n"
+	"[s0;2 &]\r\n"
+	"[s0;2 [* P��klad: ]3.7 / 2.5 = 1.48.")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CdivNN_EN-US.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CdivNN_EN-US.dpx
new file mode 100644
index 000000000..ad157288a
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CdivNN_EN-US.dpx
@@ -0,0 +1,9 @@
+HELP_TOPIC("AppDoc", "", "Calc$CdivNN", "EN-US", "operator \1/\1  (\1real number\1, \1real number\1) [S �] \1real number\1")
+	HELP_TEXT(
+	"[ [A@0+84 Real number division. If the right operand equals zero, \r\n"
+	"the computation aborts with the error ][*A@0+84 division by zero][A@0+84 .]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 Example][A@0+84 `: 3.7 `/ 2.5 `= 1.48.]]\r\n")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$Ce0_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$Ce0_CS-CZ15.dpx
new file mode 100644
index 000000000..59a01c5e9
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$Ce0_CS-CZ15.dpx
@@ -0,0 +1,5 @@
+HELP_TOPIC("AppDoc", "", "Calc$Ce0", "CS-CZ windows-1250", "\1e\1 [S �] \1re�ln� ��slo\1")
+	HELP_TEXT(
+	"[ [A@0+84 Eulerova konstanta ur�uje z�klad exponenci�ly a_p�irozen�ho \r\n"
+	"logaritmu. Je p�ibli�n� rovna 2.718281828.]]\r\n")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$Ce0_EN-US.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$Ce0_EN-US.dpx
new file mode 100644
index 000000000..0590af664
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$Ce0_EN-US.dpx
@@ -0,0 +1,5 @@
+HELP_TOPIC("AppDoc", "", "Calc$Ce0", "EN-US", "\1e\1 [S �] \1real number\1")
+	HELP_TEXT(
+	"[ [A@0+84 Euler constant is the base of natural exponential and \r\n"
+	"the natural logarithm. It equals approximately 2.718281828.]]\r\n")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CeqVV_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CeqVV_CS-CZ15.dpx
new file mode 100644
index 000000000..57b48bc7e
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CeqVV_CS-CZ15.dpx
@@ -0,0 +1,13 @@
+HELP_TOPIC("AppDoc", "", "Calc$CeqVV", "CS-CZ windows-1250", "oper�tor \1==\1  (\1libovoln� typ\1, \1libovoln� typ\1) [S �] \1logick� hodnota\1")
+	HELP_TEXT(
+	"[3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0} \r\n"
+	"[s0;2 Oper�tor porovn� dv� libovoln� hodnoty. V�sledkem je [/ pravda] \r\n"
+	"(1), pokud se hodnoty rovnaj�, jinak [/ nepravda].&]\r\n"
+	"[s0;2 &]\r\n"
+	"[s0;2 [* Upozorn�n�:] p�i porovn�v�n� se nejprve testuj� datov� typy \r\n"
+	"porovn�van�ch objekt�. Pokud se tyto typy neshoduj�, funkce vr�t� \r\n"
+	"hodnotu [/ nepravda]. Nap��klad test \"10\" == 10 vr�t� logickou \r\n"
+	"hodnotu nepravda z_d�vodu neshody typ�, p�esto�e �et�zec na lev� \r\n"
+	"stran� obsahuje des�tkov� z�pis ��sla na prav� stran� oper�toru.")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CeqVV_EN-US.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CeqVV_EN-US.dpx
new file mode 100644
index 000000000..42b78708b
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CeqVV_EN-US.dpx
@@ -0,0 +1,4 @@
+HELP_TOPIC("AppDoc", "", "Calc$CeqVV", "EN-US", "operator \1==\1  (\1any data type\1, \1any data type\1) [S �] \1logical value\1")
+	HELP_TEXT(
+	"\r\n")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CexpN_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CexpN_CS-CZ15.dpx
new file mode 100644
index 000000000..470decea9
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CexpN_CS-CZ15.dpx
@@ -0,0 +1,10 @@
+HELP_TOPIC("AppDoc", "", "Calc$CexpN", "CS-CZ windows-1250", "\1exp\1 (\1re�ln� ��slo\1) [S �] \1re�ln� ��slo\1")
+	HELP_TEXT(
+	"[%EN-US3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0}%EN-US \r\n"
+	"[s0;2 P�irozen� exponenci�la. V�sledkem funkce je mocnina, jej�m� \r\n"
+	"z�kladem je Eulerovo ��slo [* e] (viz str._93) a_exponentem je \r\n"
+	"zadan� re�ln� ��slo.&]\r\n"
+	"[s0;2 &]\r\n"
+	"[s0;2 [* P��klad: ]exp(3.5) = 33.11545196")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CexpN_EN-US.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CexpN_EN-US.dpx
new file mode 100644
index 000000000..bf6c7a711
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CexpN_EN-US.dpx
@@ -0,0 +1,10 @@
+HELP_TOPIC("AppDoc", "", "Calc$CexpN", "EN-US", "\1exp\1 (\1real number\1) [S �] \1real number\1")
+	HELP_TEXT(
+	"[ [A@0+84 Natural exponential. The result of this function is \r\n"
+	"the Euler number ][*A@0+84 e][A@0+84  (viz str._93)][A@0+84  \r\n"
+	"raised to the power given by the argument of ][*A@0+84 exp][A@0+84 .]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 Example][A@0+84 `: exp(3.5) `= ][A@0+84 33.11545196]]\r\n")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$Cfirst_day_of_monthD_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$Cfirst_day_of_monthD_CS-CZ15.dpx
new file mode 100644
index 000000000..a8eb88a28
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$Cfirst_day_of_monthD_CS-CZ15.dpx
@@ -0,0 +1,9 @@
+HELP_TOPIC("AppDoc", "", "Calc$Cfirst_day_of_monthD", "CS-CZ windows-1250", "\1first_day_of_month\1 (\1datum\1 [/ d]) [S �] \1datum\1")
+	HELP_TEXT(
+	"[%EN-US3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0}%EN-US \r\n"
+	"[s0;2 Funkce vr�t� datum prvn�ho dne v m�s�ci ur�en�m parametrem \r\n"
+	"[/ d].&]\r\n"
+	"[s0;2 &]\r\n"
+	"[s0;2 [* P��klad: ]first`_day`_of`_month(18.3.1994) = 1.3.1994")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$Cfirst_day_of_monthD_EN-US.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$Cfirst_day_of_monthD_EN-US.dpx
new file mode 100644
index 000000000..0c79509da
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$Cfirst_day_of_monthD_EN-US.dpx
@@ -0,0 +1,10 @@
+HELP_TOPIC("AppDoc", "", "Calc$Cfirst_day_of_monthD", "EN-US", "\1first_day_of_month\1 (\1date\1 [/ d]) [S �] \1date\1")
+	HELP_TEXT(
+	"[ [A@0+84 The function returns first day in month defined by its \r\n"
+	"parameter d.]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 Example][A@0+84 `: first`_day`_of`_month(18.3.1994) \r\n"
+	"`= 1.3.1994]]\r\n")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CfloorNN_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CfloorNN_CS-CZ15.dpx
new file mode 100644
index 000000000..b19499c85
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CfloorNN_CS-CZ15.dpx
@@ -0,0 +1,10 @@
+HELP_TOPIC("AppDoc", "", "Calc$CfloorNN", "CS-CZ windows-1250", "\1floor\1 (\1re�ln� ��slo\1 [/ hodnota], \1cel� ��slo\1 [/ po�et_desetinn�ch_m�st]) [S �] \1re�ln� ��slo\1")
+	HELP_TEXT(
+	"[%EN-US3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0}%EN-US \r\n"
+	"[s0;2 Zaokrouhlen� sm�rem dol� na zadan� po�et desetinn�ch m�st. \r\n"
+	"Funkce nalezne nejvy��� re�ln� ��slo, kter� je celistv�m n�sobkem \r\n"
+	"hodnoty [* 10_**_][/ -po�et_m�st] a_nen� vy��� ne� p�vodn� [/ hodnota].&]\r\n"
+	"[s0;2 &]\r\n"
+	"[s0;2 [* P��klad: ]floor(47.32, 1) = 47.3, floor(117, -1) = 110.")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CfloorNN_EN-US.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CfloorNN_EN-US.dpx
new file mode 100644
index 000000000..9b8428767
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CfloorNN_EN-US.dpx
@@ -0,0 +1,12 @@
+HELP_TOPIC("AppDoc", "", "Calc$CfloorNN", "EN-US", "\1floor\1 (\1real number\1 [/ value], \1integer\1 [/ decimals]) [S �] \1real number\1")
+	HELP_TEXT(
+	"[ [A@0+84 Rounding down (towards minus infinity) to the stated \r\n"
+	"number of decimal places (0 by default). The function returns \r\n"
+	"the highest integral multiple of ][*A@0+84 10_`*`*_][/A@0+84 `-decimals][A@0+84  \r\n"
+	"not greater than the original ][/A@0+84 value][A@0+84 .]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 Example][A@0+84 `: floor(`-2.5) `= `-3, floor(47.32, \r\n"
+	"1) `= 47.3, floor(117, `-1) `= 110.]]\r\n")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CfloorN_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CfloorN_CS-CZ15.dpx
new file mode 100644
index 000000000..ffebf6daf
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CfloorN_CS-CZ15.dpx
@@ -0,0 +1,9 @@
+HELP_TOPIC("AppDoc", "", "Calc$CfloorN", "CS-CZ windows-1250", "\1floor\1 (\1re�ln� ��slo\1) [S �] \1re�ln� ��slo\1")
+	HELP_TEXT(
+	"[%EN-US3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0}%EN-US \r\n"
+	"[s0;2 Zaokrouhlen� sm�rem dol�. Funkce nalezne nejvy��� cel� ��slo, \r\n"
+	"kter� nen� vy��� ne� p�vodn� [/ hodnota].&]\r\n"
+	"[s0;2 &]\r\n"
+	"[s0;2 [* P��klad: ]floor(-2.5) = -3")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CfloorN_EN-US.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CfloorN_EN-US.dpx
new file mode 100644
index 000000000..2416e13ce
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CfloorN_EN-US.dpx
@@ -0,0 +1,4 @@
+HELP_TOPIC("AppDoc", "", "Calc$CfloorN", "EN-US", "\1floor\1 (\1real number\1) [S �] \1real number\1")
+	HELP_TEXT(
+	"\r\n")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CfloorrNN_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CfloorrNN_CS-CZ15.dpx
new file mode 100644
index 000000000..f81465648
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CfloorrNN_CS-CZ15.dpx
@@ -0,0 +1,11 @@
+HELP_TOPIC("AppDoc", "", "Calc$CfloorrNN", "CS-CZ windows-1250", "\1floorr\1(\1re�ln� ��slo\1 [/ hodnota], \1cel� ��slo\1 [/ platn�ch_��slic]) [S �] \1re�ln� ��slo\1")
+	HELP_TEXT(
+	"[%EN-US3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0}%EN-US \r\n"
+	"[s0;2 Zaokrouhlen� sm�rem dol� na zadan� po�et platn�ch ��slic. Funkce \r\n"
+	"nalezne nejvy��� re�ln� ��slo, kter� je celistv�m n�sobkem hodnoty \r\n"
+	"[* 10_**_][/ (ceil(log(hodnota))-platn�ch`_��slic)] a_nen� vy��� \r\n"
+	"ne� p�vodn� [/ hodnota].&]\r\n"
+	"[s0;2 &]\r\n"
+	"[s0;2 [* P��klad: ]floorr(47.32, 3) = 47.3, floorr(117, 1) = 100.")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CfloorrNN_EN-US.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CfloorrNN_EN-US.dpx
new file mode 100644
index 000000000..fb15e3946
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CfloorrNN_EN-US.dpx
@@ -0,0 +1,13 @@
+HELP_TOPIC("AppDoc", "", "Calc$CfloorrNN", "EN-US", "\1floorr\1(\1real number\1 [/ value], \1integer\1 [/ significant_digits]) [S �] \1real number\1")
+	HELP_TEXT(
+	"[{2}\r\n"
+	"[s0; [2 Rounding down (towards minus infinity) to the stated number \r\n"
+	"of significant digits. The function returns the highest integral \r\n"
+	"multiple of ][*2 10�`*`*�][/2 (ceil(log(value))`-significant`_digits) \r\n"
+	"][2 not greater than the original ][/2 value][2 .]]\r\n"
+	"&\r\n"
+	"[s0;2 ]\r\n"
+	"&\r\n"
+	"[s0; [*2 Example`: floorr(47.32, 3) `= 47.3, floorr(117, 1) `= 100.]]\r\n"
+	"]")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CftextNI_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CftextNI_CS-CZ15.dpx
new file mode 100644
index 000000000..ea9cc7c0e
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CftextNI_CS-CZ15.dpx
@@ -0,0 +1,5 @@
+HELP_TOPIC("AppDoc", "", "Calc$CftextNI", "CS-CZ windows-1250", "\1ftext\1 (\1re�ln� ��slo\1, \1cel� ��slo\1) [S �] \1�et�zec\1")
+	HELP_TEXT(
+	"[ [A@0+84 Funkce p�evede ��slo na text se zadan�m po�tem desetinn�ch \r\n"
+	"m�st. Pokud nen� po�et m�st zad�n, desetinn� m�sta se ignoruj�.]]\r\n")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CftextNI_EN-US.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CftextNI_EN-US.dpx
new file mode 100644
index 000000000..e2a277843
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CftextNI_EN-US.dpx
@@ -0,0 +1,5 @@
+HELP_TOPIC("AppDoc", "", "Calc$CftextNI", "EN-US", "\1ftext\1 (\1real number\1, \1integer\1) [S �] \1string\1")
+	HELP_TEXT(
+	"[ [A@0+84 Funkce p�evede ��slo na text se zadan�m po�tem desetinn�ch \r\n"
+	"m�st. Pokud nen� po�et m�st zad�n, desetinn� m�sta se ignoruj�.]]\r\n")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CftextN_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CftextN_CS-CZ15.dpx
new file mode 100644
index 000000000..74194f27e
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CftextN_CS-CZ15.dpx
@@ -0,0 +1,9 @@
+HELP_TOPIC("AppDoc", "", "Calc$CftextN", "CS-CZ windows-1250", "\1ftext\1 (\1re�ln� ��slo\1) [S �] \1�et�zec\1")
+	HELP_TEXT(
+	"[%EN-US3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0}%EN-US \r\n"
+	"[s0;2 Funkce vr�t� zadan� [/ re�ln� ��slo] zaokrouhlen� na nejbli��� \r\n"
+	"cel� ��slo a p�eveden� na text.&]\r\n"
+	"[s0;2 &]\r\n"
+	"[s0;2 [* P��klad: ]ftext(133.59) = \"134\"")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CftextN_EN-US.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CftextN_EN-US.dpx
new file mode 100644
index 000000000..77489f138
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CftextN_EN-US.dpx
@@ -0,0 +1,4 @@
+HELP_TOPIC("AppDoc", "", "Calc$CftextN", "EN-US", "\1ftext\1 (\1real number\1) [S �] \1string\1")
+	HELP_TEXT(
+	"\r\n")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CgeNN_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CgeNN_CS-CZ15.dpx
new file mode 100644
index 000000000..2c848875b
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CgeNN_CS-CZ15.dpx
@@ -0,0 +1,7 @@
+HELP_TOPIC("AppDoc", "", "Calc$CgeNN", "CS-CZ windows-1250", "oper�tor \1>=\1  (\1re�ln� ��slo\1, \1re�ln� ��slo\1) [S �] \1logick� hodnota\1")
+	HELP_TEXT(
+	"[ [A@0+84 Oper�tor porovn� dvojici hodnot a_vr�t� hodnotu 1, pokud \r\n"
+	"nerovnost plat�, respektive 0, pokud nerovnost neplat�. Texty \r\n"
+	"se porovn�vaj� lexikograficky (][/A@0+84 slovn�kov�][A@0+84  \r\n"
+	"uspo��d�n�).]]\r\n")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CgeNN_EN-US.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CgeNN_EN-US.dpx
new file mode 100644
index 000000000..2bf1c4b6c
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CgeNN_EN-US.dpx
@@ -0,0 +1,6 @@
+HELP_TOPIC("AppDoc", "", "Calc$CgeNN", "EN-US", "operator \1>=\1  (\1real number\1, \1real number\1) [S �] \1logical value\1")
+	HELP_TEXT(
+	"[ [A@0+84 The operator will compare its operands returning the \r\n"
+	"value 1 if the relation holds, 0 when not. String values are \r\n"
+	"compared lexicographically (][/A@0+84 dictionary][A@0+84  organization).]]\r\n")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CgeSS_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CgeSS_CS-CZ15.dpx
new file mode 100644
index 000000000..916f1f92d
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CgeSS_CS-CZ15.dpx
@@ -0,0 +1,11 @@
+HELP_TOPIC("AppDoc", "", "Calc$CgeSS", "CS-CZ windows-1250", "oper�tor \1>=\1  (\1�et�zec\1 [/ text1], \1�et�zec\1 [/ text2]) [S �] \1logick� hodnota\1")
+	HELP_TEXT(
+	"[%EN-US3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0}%EN-US \r\n"
+	"[s0;2 Funkce porovn� zadan� �et�zce a vr�t� logickou hodnotu [/ pravda], \r\n"
+	"pokud v lexikografick�m uspo��d�n� (ve slovn�ku) text [* �et�zec1] \r\n"
+	"n�sleduje po �et�zci [* �et�zci2,] nebo pokud jsou oba �et�zce \r\n"
+	"shodn�.&]\r\n"
+	"[s0;2 &]\r\n"
+	"[s0;2 [* P��klad: ]\"ovoce\" >= \"ban�n\" = 1")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CgeSS_EN-US.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CgeSS_EN-US.dpx
new file mode 100644
index 000000000..d5cee2658
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CgeSS_EN-US.dpx
@@ -0,0 +1,4 @@
+HELP_TOPIC("AppDoc", "", "Calc$CgeSS", "EN-US", "operator \1>=\1  (\1string\1, \1string\1) [S �] \1logical value\1")
+	HELP_TEXT(
+	"\r\n")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CgeTT_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CgeTT_CS-CZ15.dpx
new file mode 100644
index 000000000..6f6d9ff63
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CgeTT_CS-CZ15.dpx
@@ -0,0 +1,9 @@
+HELP_TOPIC("AppDoc", "", "Calc$CgeTT", "CS-CZ windows-1250", "oper�tor \1>=\1  (\1datum/�as\1 [/ dt1], \1datum/�as\1 [/ dt2]) [S �] \1logick� hodnota\1")
+	HELP_TEXT(
+	"[%EN-US3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0}%EN-US \r\n"
+	"[s0;2 Funkce porovn� zadan� data / �asy a vr�t� hodnotu [/ pravda], \r\n"
+	"pokud je [/ datum/�as1] pozd�j�� nebo roven �asu [/ datum/�as2].&]\r\n"
+	"[s0;2 &]\r\n"
+	"[s0;2 [* P��klad: ](15.1.2004 >= 13.3.2003) = 1")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CgeTT_EN-US.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CgeTT_EN-US.dpx
new file mode 100644
index 000000000..9fa4d5a58
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CgeTT_EN-US.dpx
@@ -0,0 +1,4 @@
+HELP_TOPIC("AppDoc", "", "Calc$CgeTT", "EN-US", "operator \1>=\1  (\1date/time\1, \1date/time\1) [S �] \1logical value\1")
+	HELP_TEXT(
+	"\r\n")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CgtNN_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CgtNN_CS-CZ15.dpx
new file mode 100644
index 000000000..2845ee9c3
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CgtNN_CS-CZ15.dpx
@@ -0,0 +1,8 @@
+HELP_TOPIC("AppDoc", "", "Calc$CgtNN", "CS-CZ windows-1250", "oper�tor \1>\1  (\1re�ln� ��slo\1 [/ n1], \1re�ln� ��slo\1 [/ n2]) [S �] \1logick� hodnota\1")
+	HELP_TEXT(
+	"[3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0} \r\n"
+	"[s0;2 Oper�tor porovn� dvojici hodnot a_vr�t� hodnotu 1, pokud nerovnost \r\n"
+	"plat�, respektive 0, pokud nerovnost neplat�. Texty se porovn�vaj� \r\n"
+	"lexikograficky ([/ slovn�kov�] uspo��d�n�).")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CgtNN_EN-US.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CgtNN_EN-US.dpx
new file mode 100644
index 000000000..659f1cdab
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CgtNN_EN-US.dpx
@@ -0,0 +1,6 @@
+HELP_TOPIC("AppDoc", "", "Calc$CgtNN", "EN-US", "operator \1>\1  (\1real number\1, \1real number\1) [S �] \1logical value\1")
+	HELP_TEXT(
+	"[ [A@0+84 The operator will compare its operands returning the \r\n"
+	"value 1 if the relation holds, 0 when not. String values are \r\n"
+	"compared lexicographically (][/A@0+84 dictionary][A@0+84  organization).]]\r\n")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CgtSS_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CgtSS_CS-CZ15.dpx
new file mode 100644
index 000000000..6cf16ed23
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CgtSS_CS-CZ15.dpx
@@ -0,0 +1,10 @@
+HELP_TOPIC("AppDoc", "", "Calc$CgtSS", "CS-CZ windows-1250", "oper�tor \1>\1  (\1�et�zec\1 [/ text1], \1�et�zec\1 [/ text2]) [S �] \1logick� hodnota\1")
+	HELP_TEXT(
+	"[%EN-US3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0}%EN-US \r\n"
+	"[s0;2 Funkce porovn� zadan� �et�zce a vr�t� logickou hodnotu [/ pravda], \r\n"
+	"pokud v lexikografick�m uspo��d�n� (ve slovn�ku) text [* text1] \r\n"
+	"n�sleduje po �et�zci [* text2].&]\r\n"
+	"[s0;2 &]\r\n"
+	"[s0;2 [* P��klad: ](\"ovoce\" > \"ban�n\") = 1, (\"ovoce\" > \"ovoce\") = 0")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CgtSS_EN-US.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CgtSS_EN-US.dpx
new file mode 100644
index 000000000..81c618b58
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CgtSS_EN-US.dpx
@@ -0,0 +1,4 @@
+HELP_TOPIC("AppDoc", "", "Calc$CgtSS", "EN-US", "operator \1>\1  (\1string\1, \1string\1) [S �] \1logical value\1")
+	HELP_TEXT(
+	"\r\n")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CgtTT_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CgtTT_CS-CZ15.dpx
new file mode 100644
index 000000000..b81f9cdd1
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CgtTT_CS-CZ15.dpx
@@ -0,0 +1,10 @@
+HELP_TOPIC("AppDoc", "", "Calc$CgtTT", "CS-CZ windows-1250", "oper�tor \1>\1  (\1datum/�as\1 [/ dt1], \1datum/�as\1 [/ dt2]) [S �] \1logick� hodnota\1")
+	HELP_TEXT(
+	"[%EN-US3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0}%EN-US \r\n"
+	"[s0;2 Funkce porovn� zadan� data / �asy a vr�t� hodnotu [/ pravda], \r\n"
+	"pokud je [/ dt1] pozd�j�� ne� [/ dt2].&]\r\n"
+	"[s0;2 &]\r\n"
+	"[s0;2 [* P��klad: ](15.1.2004 > 13.3.2003) = 1, (15.1.2004 > 15.1.2004) \r\n"
+	"= 0")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CgtTT_EN-US.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CgtTT_EN-US.dpx
new file mode 100644
index 000000000..d38ddf8b9
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CgtTT_EN-US.dpx
@@ -0,0 +1,4 @@
+HELP_TOPIC("AppDoc", "", "Calc$CgtTT", "EN-US", "operator \1>\1  (\1date/time\1, \1date/time\1) [S �] \1logical value\1")
+	HELP_TEXT(
+	"\r\n")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$ChourT_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$ChourT_CS-CZ15.dpx
new file mode 100644
index 000000000..9c6b14d7b
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$ChourT_CS-CZ15.dpx
@@ -0,0 +1,6 @@
+HELP_TOPIC("AppDoc", "", "Calc$ChourT", "CS-CZ windows-1250", "")
+	HELP_TEXT(
+	"[{0}\r\n"
+	"[s0; [2 Funkce vr�t� po�et hodin sv�ho argumentu typu datum`/�as.]]\r\n"
+	"]")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$ChourT_EN-US.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$ChourT_EN-US.dpx
new file mode 100644
index 000000000..37d4e8fd8
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$ChourT_EN-US.dpx
@@ -0,0 +1,8 @@
+HELP_TOPIC("AppDoc", "", "Calc$ChourT", "EN-US", "")
+	HELP_TEXT(
+	"[{2}\r\n"
+	"[s0; [2 Function returns the number of hours of its date`/time argument.]]\r\n"
+	"&\r\n"
+	"[s0; ]\r\n"
+	"]")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$ChypotNN_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$ChypotNN_CS-CZ15.dpx
new file mode 100644
index 000000000..839a4db33
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$ChypotNN_CS-CZ15.dpx
@@ -0,0 +1,11 @@
+HELP_TOPIC("AppDoc", "", "Calc$ChypotNN", "CS-CZ windows-1250", "\1hypot\1 (\1re�ln� ��slo\1 [/ x], \1re�ln� ��slo\1 [/ y]) [S �] \1re�ln� ��slo\1")
+	HELP_TEXT(
+	"[ [A@0+84 D�lka p�epony pravo�hl�ho troj�heln�ka. V�po�et p�epony \r\n"
+	"se prov�d� podle Pythagorovy v�ty`: ][*A@0+84 hypot(][*/A@0+84 x][*A@0+84 , \r\n"
+	"][*/A@0+84 y][*A@0+84 ) `= sqrt(][*/A@0+84 x][*A@0+84  `* ][*/A@0+84 x][*A@0+84  \r\n"
+	"`+ ][*/A@0+84 y][*A@0+84  `* ][*/A@0+84 y][*A@0+84 )][A@0+84 .]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 P��klad][A@0+84 `: hypot(3, 4) `= 5]]\r\n")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$ChypotNN_EN-US.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$ChypotNN_EN-US.dpx
new file mode 100644
index 000000000..0d9f8ca12
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$ChypotNN_EN-US.dpx
@@ -0,0 +1,12 @@
+HELP_TOPIC("AppDoc", "", "Calc$ChypotNN", "EN-US", "\1hypot\1 (\1real number\1 [/ x], \1real number\1 [/ y]) [S �] \1real number\1")
+	HELP_TEXT(
+	"[ [A@0+84 The length of the hypotenuse of the right`-angled triangle. \r\n"
+	"The hypotenuse is calculated using the Pythagoras theorem, ][*A@0+84 hypot(][*/A@0+84 x\r\n"
+	"][*A@0+84 , ][*/A@0+84 y][*A@0+84 ) `= sqrt(][*/A@0+84 x][*A@0+84  \r\n"
+	"`* ][*/A@0+84 x][*A@0+84  `+ ][*/A@0+84 y][*A@0+84  `* ][*/A@0+84 y][*A@0+84 )][A@0+84 .\r\n"
+	"]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 Example][A@0+84 `: hypot(3, 4) `= 5]]\r\n")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$Cis_dateV_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$Cis_dateV_CS-CZ15.dpx
new file mode 100644
index 000000000..33298f508
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$Cis_dateV_CS-CZ15.dpx
@@ -0,0 +1,11 @@
+HELP_TOPIC("AppDoc", "", "Calc$Cis_dateV", "CS-CZ windows-1250", "\1is_date\1 (\1libovoln� typ\1) [S �] \1cel� ��slo\1")
+	HELP_TEXT(
+	"[%EN-US3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0}%EN-US \r\n"
+	"[s0;2 Funkce vr�t� logickou hodnotu 1 ([* pravda]), kdy� zadan� parametr \r\n"
+	"je typu [* datum]. Pokud je parametr jin�ho typu nebo obsahuje \r\n"
+	"pr�zdnou hodnotu, funkce vr�t� hodnotu 0 ([* nepravda]).&]\r\n"
+	"[s0;2 &]\r\n"
+	"[s0;2 [* P��klad: ]is`_date(10.5) = 0, is`_date(23.5.1997) = 1, is`_date(\"ahoj\") \r\n"
+	"= 0")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$Cis_dateV_EN-US.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$Cis_dateV_EN-US.dpx
new file mode 100644
index 000000000..49debb04c
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$Cis_dateV_EN-US.dpx
@@ -0,0 +1,12 @@
+HELP_TOPIC("AppDoc", "", "Calc$Cis_dateV", "EN-US", "\1is_date\1 (\1any data type\1) [S �] \1integer\1")
+	HELP_TEXT(
+	"[ [A@0+84 The function returns the logical value 1 (][*A@0+84 true][A@0+84 ) \r\n"
+	"if its argument is a date. If the argument is of a different \r\n"
+	"type or if it contains the null value, the function returns 0 \r\n"
+	"(][*A@0+84 false][A@0+84 ).]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 Example][A@0+84 `: is`_date(10.5) `= 0, is`_date(23.5.1997) \r\n"
+	"`= 1, is`_date(`\"hi`\") `= 0]]\r\n")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$Cis_nullV_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$Cis_nullV_CS-CZ15.dpx
new file mode 100644
index 000000000..fee5c70c8
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$Cis_nullV_CS-CZ15.dpx
@@ -0,0 +1,9 @@
+HELP_TOPIC("AppDoc", "", "Calc$Cis_nullV", "CS-CZ windows-1250", "\1is_null\1 (\1libovoln� typ\1) [S �] \1cel� ��slo\1")
+	HELP_TEXT(
+	"[%EN-US3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0}%EN-US \r\n"
+	"[s0;2 Funkce vr�t� logickou hodnotu 1 ([* pravda]), kdy� jej� parametr \r\n"
+	"je typu [* null]jinak vr�t� logickou hodnotu 0 ([* nepravda]).&]\r\n"
+	"[s0;2 &]\r\n"
+	"[s0;2 [* P��klad: ]is`_null(10.5) = 0, is`_null(null) = 1")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$Cis_nullV_EN-US.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$Cis_nullV_EN-US.dpx
new file mode 100644
index 000000000..aa421fc97
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$Cis_nullV_EN-US.dpx
@@ -0,0 +1,11 @@
+HELP_TOPIC("AppDoc", "", "Calc$Cis_nullV", "EN-US", "\1is_null\1 (\1any data type\1) [S �] \1integer\1")
+	HELP_TEXT(
+	"[ [A@0+84 The function returns the logical value 1 (][*A@0+84 true][A@0+84 ) \r\n"
+	"if its parameter is of type][*A@0+84 null][A@0+84 ; otherwise \r\n"
+	"the logical value 0 (][*A@0+84 false][A@0+84 ) is returned.]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 Example][A@0+84 `: is_null(10.5) `= 0, is_null(null) \r\n"
+	"`= 1]]\r\n")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$Cis_numberV_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$Cis_numberV_CS-CZ15.dpx
new file mode 100644
index 000000000..eeea53a73
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$Cis_numberV_CS-CZ15.dpx
@@ -0,0 +1,12 @@
+HELP_TOPIC("AppDoc", "", "Calc$Cis_numberV", "CS-CZ windows-1250", "\1is_number\1 (\1libovoln� typ\1) [S �] \1cel� ��slo\1")
+	HELP_TEXT(
+	"[%EN-US3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0}%EN-US \r\n"
+	"[s0;2 Funkce otestuje, zda je zadan� parametr typu [* ��slo] (cel� \r\n"
+	"nebo re�ln� ��slo, p��padn� v�sledek n�kter� z_logick�ch operac�). \r\n"
+	"Pokud parametr je typu [* ��slo], funkce vr�t� logickou hodnotu \r\n"
+	"1 ([* pravda]).&]\r\n"
+	"[s0;2 &]\r\n"
+	"[s0;2 [* P��klad: ]is`_number(10.5) = 1, is`_number(23.5.1997) = 0, \r\n"
+	"is`_number(\"ahoj\") = 0")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$Cis_numberV_EN-US.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$Cis_numberV_EN-US.dpx
new file mode 100644
index 000000000..1b11f6c8b
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$Cis_numberV_EN-US.dpx
@@ -0,0 +1,11 @@
+HELP_TOPIC("AppDoc", "", "Calc$Cis_numberV", "EN-US", "\1is_number\1 (\1any data type\1) [S �] \1integer\1")
+	HELP_TEXT(
+	"[ [A@0+84 The function checks whether its argument is a number \r\n"
+	"(integer, real number, or a logical value). If the argument is \r\n"
+	"a number type, the function returns logical value 1 (true).]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 Example][A@0+84 `: is number(10.5) `= 1, is number(23.5.1997) \r\n"
+	"`= 0, is number(`\"hi`\") `= 0]]\r\n")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$Cis_textV_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$Cis_textV_CS-CZ15.dpx
new file mode 100644
index 000000000..273e127f3
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$Cis_textV_CS-CZ15.dpx
@@ -0,0 +1,11 @@
+HELP_TOPIC("AppDoc", "", "Calc$Cis_textV", "CS-CZ windows-1250", "\1is_text\1 (\1libovoln� typ\1) [S �] \1cel� ��slo\1")
+	HELP_TEXT(
+	"[%EN-US3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0}%EN-US \r\n"
+	"[s0;2 Funkce vr�t� logickou hodnotu 1 ([* pravda]), kdy� zadan� parametr \r\n"
+	"je typu [* �et�zec]. Pokud je parametr jin�ho typu nebo obsahuje \r\n"
+	"pr�zdnou hodnotu, funkce vr�t� hodnotu 0 ([* nepravda]).&]\r\n"
+	"[s0;2 &]\r\n"
+	"[s0;2 [* P��klad: ]is`_text(10.5) = 0, is`_text(23.5.1997) = 0, is`_text(\"ahoj\") \r\n"
+	"= 1")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$Cis_textV_EN-US.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$Cis_textV_EN-US.dpx
new file mode 100644
index 000000000..5e3061038
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$Cis_textV_EN-US.dpx
@@ -0,0 +1,11 @@
+HELP_TOPIC("AppDoc", "", "Calc$Cis_textV", "EN-US", "\1is_text\1 (\1any data type\1) [S �] \1integer\1")
+	HELP_TEXT(
+	"[ [A@0+84 The function returns logical value 1 (][*A@0+84 true][A@0+84 ) \r\n"
+	"if its argument is a string. If the parameter is of a different \r\n"
+	"type or is empty, the function returns logical value 0 (false).]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 Example][A@0+84 `: is`_text(10.5) `= 0, is`_text(23.5.1997) \r\n"
+	"`= 0, is`_text(`\"hi`\") `= 1]]\r\n")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$Citext0NN_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$Citext0NN_CS-CZ15.dpx
new file mode 100644
index 000000000..e016dcbf6
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$Citext0NN_CS-CZ15.dpx
@@ -0,0 +1,15 @@
+HELP_TOPIC("AppDoc", "", "Calc$Citext0NN", "CS-CZ windows-1250", "")
+	HELP_TEXT(
+	"[%EN-US3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0}%EN-US \r\n"
+	"[s0;2 Funkce vr�t� �et�zec obsahuj�c� des�tkov� z�pis zadan�ho cel�ho \r\n"
+	"��sla [* hodnota]. Pokud po�et znak� tohoto z�pisu je men�� ne� \r\n"
+	"hodnota parametru [* ���ka], dopln� se z�pis ��sla zleva ��slicemi \r\n"
+	"0 (nula) na ���ku [* ���ka].&]\r\n"
+	"[s0;2 &]\r\n"
+	"[s0;2 [* Pozn�mka: ]pokud je textov� z�pis ��sla del�� ne� [* ���ka], \r\n"
+	"funkce vr�t� cel� �et�zec (o��znut� na zadanou ���ku se neprovede). \r\n"
+	"&]\r\n"
+	"[s0;2 &]\r\n"
+	"[s0;2 [* P��klad: ]itext0(138, 5) = \"00138\"")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CitextNN_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CitextNN_CS-CZ15.dpx
new file mode 100644
index 000000000..33cb94bc9
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CitextNN_CS-CZ15.dpx
@@ -0,0 +1,15 @@
+HELP_TOPIC("AppDoc", "", "Calc$CitextNN", "CS-CZ windows-1250", "\1itext\1(\1cel� ��slo\1 [/ hodnota], \1cel� ��slo\1 [/ ���ka]) [S �] \1�et�zec\1")
+	HELP_TEXT(
+	"[%EN-US3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0}%EN-US \r\n"
+	"[s0;2 Funkce vr�t� �et�zec obsahuj�c� des�tkov� z�pis zadan�ho cel�ho \r\n"
+	"��sla [* hodnota]. Pokud po�et znak� tohoto z�pisu je men�� ne� \r\n"
+	"hodnota parametru [* ���ka], dopln� se z�pis ��sla zleva mezerami \r\n"
+	"na ���ku [* ���ka].&]\r\n"
+	"[s0;2 &]\r\n"
+	"[s0;2 [* Pozn�mka: ]pokud je textov� z�pis ��sla del�� ne� [* ���ka], \r\n"
+	"funkce vr�t� cel� �et�zec (o��znut� na zadanou ���ku se neprovede). \r\n"
+	"&]\r\n"
+	"[s0;2 &]\r\n"
+	"[s0;2 [* P��klad: ]itext(138, 5) = \"  138\"")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CitextN_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CitextN_CS-CZ15.dpx
new file mode 100644
index 000000000..b136c32ff
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CitextN_CS-CZ15.dpx
@@ -0,0 +1,9 @@
+HELP_TOPIC("AppDoc", "", "Calc$CitextN", "CS-CZ windows-1250", "")
+	HELP_TEXT(
+	"[%EN-US3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0}%EN-US \r\n"
+	"[s0;2 Funkce vr�t� �et�zec obsahuj�c� des�tkov� z�pis zadan�ho cel�ho \r\n"
+	"��sla. Pokud je parametr [* null], funkce vr�t� pr�zdn� �et�zec.&]\r\n"
+	"[s0;2 &]\r\n"
+	"[s0;2 [* P��klad: ]itext(138) = \"138\"")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$Clast_day_of_monthD_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$Clast_day_of_monthD_CS-CZ15.dpx
new file mode 100644
index 000000000..6a57dfb2f
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$Clast_day_of_monthD_CS-CZ15.dpx
@@ -0,0 +1,9 @@
+HELP_TOPIC("AppDoc", "", "Calc$Clast_day_of_monthD", "CS-CZ windows-1250", "\1last_day_of_month\1 (\1datum\1 [/ d]) [S �] \1datum\1")
+	HELP_TEXT(
+	"[%EN-US3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0}%EN-US \r\n"
+	"[s0;2 Funkce vr�t� datum posledn�ho dne v m�s�ci ur�en�m parametrem \r\n"
+	"[/ d].&]\r\n"
+	"[s0;2 &]\r\n"
+	"[s0;2 [* P��klad]: last`_day`_of`_month(3.2.1999) = 28.2.1999")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$Clast_day_of_monthD_EN-US.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$Clast_day_of_monthD_EN-US.dpx
new file mode 100644
index 000000000..55d73edd2
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$Clast_day_of_monthD_EN-US.dpx
@@ -0,0 +1,10 @@
+HELP_TOPIC("AppDoc", "", "Calc$Clast_day_of_monthD", "EN-US", "\1last_day_of_month\1 (\1date\1 [/ d]) [S �] \1date\1")
+	HELP_TEXT(
+	"[ [A@0+84 The function returns last day in month defined by its \r\n"
+	"parameter d.]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 Example][A@0+84 `: last`_day`_of`_month(3.2.1999) `= \r\n"
+	"28.2.1999]]\r\n")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CleNN_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CleNN_CS-CZ15.dpx
new file mode 100644
index 000000000..f0afbf46c
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CleNN_CS-CZ15.dpx
@@ -0,0 +1,9 @@
+HELP_TOPIC("AppDoc", "", "Calc$CleNN", "CS-CZ windows-1250", "oper�tor \1<=\1  (\1re�ln� ��slo\1 [/ x], \1re�ln� ��slo\1 [/ y]) [S �] \1logick� hodnota\1")
+	HELP_TEXT(
+	"[%EN-US3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0}%EN-US \r\n"
+	"[s0;2 Oper�tor porovn� dvojici ��sel a_vr�t� hodnotu 1 ([/ pravda]), \r\n"
+	"pokud [* x <= y].&]\r\n"
+	"[s0;2 &]\r\n"
+	"[s0;2 [* P��klad: ](10 <= 20) = 1")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CleNN_EN-US.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CleNN_EN-US.dpx
new file mode 100644
index 000000000..acbb64d2e
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CleNN_EN-US.dpx
@@ -0,0 +1,6 @@
+HELP_TOPIC("AppDoc", "", "Calc$CleNN", "EN-US", "operator \1<=\1  (\1real number\1, \1real number\1) [S �] \1logical value\1")
+	HELP_TEXT(
+	"[ [A@0+84 The operator will compare its operands returning the \r\n"
+	"value 1 if the relation holds, 0 when not. String values are \r\n"
+	"compared lexicographically (][/A@0+84 dictionary][A@0+84  organization).]]\r\n")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CleSS_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CleSS_CS-CZ15.dpx
new file mode 100644
index 000000000..e93fd3b19
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CleSS_CS-CZ15.dpx
@@ -0,0 +1,11 @@
+HELP_TOPIC("AppDoc", "", "Calc$CleSS", "CS-CZ windows-1250", "oper�tor \1<=\1  (\1�et�zec\1, \1�et�zec\1) [S �] \1logick� hodnota\1")
+	HELP_TEXT(
+	"[%EN-US3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0}%EN-US \r\n"
+	"[s0;2 Funkce porovn� zadan� �et�zce a vr�t� logickou hodnotu [/ pravda], \r\n"
+	"pokud v lexikografick�m uspo��d�n� (ve slovn�ku) text [* �et�zec1] \r\n"
+	"p�edch�z� p�ed �et�zcem [* �et�zci2] nebo pokud jsou oba �et�zce \r\n"
+	"shodn�.&]\r\n"
+	"[s0;2 &]\r\n"
+	"[s0;2 [* P��klad: ]\"ban�n\" < \"ovoce\" = 1")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CleSS_EN-US.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CleSS_EN-US.dpx
new file mode 100644
index 000000000..91ed273e1
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CleSS_EN-US.dpx
@@ -0,0 +1,4 @@
+HELP_TOPIC("AppDoc", "", "Calc$CleSS", "EN-US", "operator \1<=\1  (\1string\1, \1string\1) [S �] \1logical value\1")
+	HELP_TEXT(
+	"\r\n")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CleTT_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CleTT_CS-CZ15.dpx
new file mode 100644
index 000000000..d13c3a3cc
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CleTT_CS-CZ15.dpx
@@ -0,0 +1,9 @@
+HELP_TOPIC("AppDoc", "", "Calc$CleTT", "CS-CZ windows-1250", "oper�tor \1<=\1  (\1datum/�as\1, \1datum/�as\1) [S �] \1logick� hodnota\1")
+	HELP_TEXT(
+	"[%EN-US3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0}%EN-US \r\n"
+	"[s0;2 Funkce porovn� zadan� data / �asy a vr�t� hodnotu [/ pravda], \r\n"
+	"pokud je [* datum/�as1] d��v�j�� nebo roven �asu [* datum/�as2].&]\r\n"
+	"[s0;2 &]\r\n"
+	"[s0;2 [* P��klad: ](15.1.2003 < 13.3.2003) = 1")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CleTT_EN-US.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CleTT_EN-US.dpx
new file mode 100644
index 000000000..93ca986ab
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CleTT_EN-US.dpx
@@ -0,0 +1,4 @@
+HELP_TOPIC("AppDoc", "", "Calc$CleTT", "EN-US", "operator \1<=\1  (\1date/time\1, \1date/time\1) [S �] \1logical value\1")
+	HELP_TEXT(
+	"\r\n")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CleftAN_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CleftAN_CS-CZ15.dpx
new file mode 100644
index 000000000..277b3581f
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CleftAN_CS-CZ15.dpx
@@ -0,0 +1,12 @@
+HELP_TOPIC("AppDoc", "", "Calc$CleftAN", "CS-CZ windows-1250", "\1left\1 (\1pole hodnot\1, \1cel� ��slo\1 [/ po�et]) [S �] \1pole hodnot\1")
+	HELP_TEXT(
+	"[%EN-US3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0}%EN-US \r\n"
+	"[s0;2 Funkce vr�t� pole obsahuj�c� prvn�ch [* po�et] hodnot zadan�ho \r\n"
+	"pole hodnot. Pokud je hodnota [* po�et] men�� nebo rovna nule, \r\n"
+	"funkce vr�t� pr�zdn� pole. Pokud je hodnota [* po�et] v�t�� ne� \r\n"
+	"po�et prvk� pole, funkce vr�t� p�vodn� pole beze zm�ny.&]\r\n"
+	"[s0;2 &]\r\n"
+	"[s0;2 [* P��klad: ]left({1, 2, 3, 5, 8, 13}, 4) = {1, 2, 3, 5}&]\r\n"
+	"[s0;*2 ")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CleftAN_EN-US.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CleftAN_EN-US.dpx
new file mode 100644
index 000000000..2bc1550db
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CleftAN_EN-US.dpx
@@ -0,0 +1,4 @@
+HELP_TOPIC("AppDoc", "", "Calc$CleftAN", "EN-US", "\1left\1 (\1pole hodnot\1, \1integer\1) [S �] \1pole hodnot\1")
+	HELP_TEXT(
+	"\r\n")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CleftSN_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CleftSN_CS-CZ15.dpx
new file mode 100644
index 000000000..420ea2cc7
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CleftSN_CS-CZ15.dpx
@@ -0,0 +1,11 @@
+HELP_TOPIC("AppDoc", "", "Calc$CleftSN", "CS-CZ windows-1250", "\1left\1 (\1�et�zec\1 [/ text], \1cel� ��slo\1 [/ po�et_znak�]) [S �] \1�et�zec\1")
+	HELP_TEXT(
+	"[%EN-US3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0}%EN-US \r\n"
+	"[s0;2 Funkce vr�t� zadan� [/ po�et znak�] ze za��tku zadan�ho �et�zce \r\n"
+	"[/ text]. Pokud je po�et znak� men�� nebo roven 0, v�sledkem funkce \r\n"
+	"je pr�zdn� �et�zec. Pokud je po�et znak� v�t�� ne� d�lka �et�zce, \r\n"
+	"funkce vr�t� zadan� �et�zec beze zm�ny.&]\r\n"
+	"[s0;2 &]\r\n"
+	"[s0;2 [* P��klad: ]left(\"ahoj sv�te\", 6) = \"ahoj s\"")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CleftSN_EN-US.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CleftSN_EN-US.dpx
new file mode 100644
index 000000000..050a2e52f
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CleftSN_EN-US.dpx
@@ -0,0 +1,13 @@
+HELP_TOPIC("AppDoc", "", "Calc$CleftSN", "EN-US", "\1left\1 (\1string\1 [/ text], \1integer\1 [/ character_count]) [S �] \1string\1")
+	HELP_TEXT(
+	"[ [A@0+84 The function returns first ][/A@0+84 character`_count][A@0+84  \r\n"
+	"characters of its argument ][/A@0+84 text][A@0+84 . If the number \r\n"
+	"of characters is less or equal to 0, the function returns an \r\n"
+	"empty string. If the character count is greater than the string \r\n"
+	"length, the function will return the original argument unchanged.]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 Example][A@0+84 `: left(`\"hello world`\", 7) `= `\"hello \r\n"
+	"w`\"]]\r\n")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$ClenS_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$ClenS_CS-CZ15.dpx
new file mode 100644
index 000000000..51bf06cd2
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$ClenS_CS-CZ15.dpx
@@ -0,0 +1,9 @@
+HELP_TOPIC("AppDoc", "", "Calc$ClenS", "CS-CZ windows-1250", "\1len\1 (\1�et�zec\1) [S �] \1cel� ��slo\1")
+	HELP_TEXT(
+	"[%EN-US3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0}%EN-US \r\n"
+	"[s0;2 Funkce vr�t� d�lku (po�et znak�) textu, kter� je jej�m parametrem. \r\n"
+	"Pokud je text pr�zdn�, v�sledkem funkce je hodnota 0.&]\r\n"
+	"[s0;2 &]\r\n"
+	"[s0;2 [* P��klad: ]len(\"pokusn� text\") = 12.")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$ClenS_EN-US.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$ClenS_EN-US.dpx
new file mode 100644
index 000000000..54a0834a9
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$ClenS_EN-US.dpx
@@ -0,0 +1,10 @@
+HELP_TOPIC("AppDoc", "", "Calc$ClenS", "EN-US", "\1len\1 (\1string\1) [S �] \1integer\1")
+	HELP_TEXT(
+	"[ [A@0+84 The function will return the length (number of characters) \r\n"
+	"of its string argument. If the string is empty the function returns \r\n"
+	"0.]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 Example][A@0+84 `: len(`\"simple text`\") `= 11.]]\r\n")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CllpadSNS_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CllpadSNS_CS-CZ15.dpx
new file mode 100644
index 000000000..e815c213a
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CllpadSNS_CS-CZ15.dpx
@@ -0,0 +1,11 @@
+HELP_TOPIC("AppDoc", "", "Calc$CllpadSNS", "CS-CZ windows-1250", "")
+	HELP_TEXT(
+	"[%EN-US3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0}%EN-US \r\n"
+	"[s0;2 Funkce dopln� �et�zec [* text] zleva na po�et znak� [* d�lka] mezerami. \r\n"
+	"Pokud je [* d�lka] men�� ne� d�lka p�vodn�ho �et�zce [* text], funkce \r\n"
+	"vr�t� [* d�lka] znak� z konce �et�zce [* text]..&]\r\n"
+	"[s0;2 &]\r\n"
+	"[s0;2 [* P��klad: ]llpad(\"ahoj svete\", 8) = \"oj svete\"&]\r\n"
+	"[s0;2 ")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CllpadSN_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CllpadSN_CS-CZ15.dpx
new file mode 100644
index 000000000..c032920e9
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CllpadSN_CS-CZ15.dpx
@@ -0,0 +1,12 @@
+HELP_TOPIC("AppDoc", "", "Calc$CllpadSN", "CS-CZ windows-1250", "\1llpad\1(\1�et�zec\1 [/ text], \1cel� ��slo\1 [/ d�lka]) [S �] \1�et�zec\1")
+	HELP_TEXT(
+	"[%EN-US3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0}%EN-US \r\n"
+	"[s0;2 Funkce dopln� �et�zec [* text] zleva na po�et znak� [* d�lka] opakovan�m \r\n"
+	"p�ed�azov�n�m �et�zce [* v�pl�]. Pokud je [* d�lka] men�� ne� d�lka \r\n"
+	"p�vodn�ho �et�zce [* text], funkce vr�t� [* d�lka] znak� z konce \r\n"
+	"�et�zce [* text].&]\r\n"
+	"[s0;2 &]\r\n"
+	"[s0;2 [* P��klad: ]lpad(\"ahoj\", 15, \"svete\") = \"esvetesveteahoj\"&]\r\n"
+	"[s0;2 ")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$ClnN_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$ClnN_CS-CZ15.dpx
new file mode 100644
index 000000000..421ef9b56
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$ClnN_CS-CZ15.dpx
@@ -0,0 +1,10 @@
+HELP_TOPIC("AppDoc", "", "Calc$ClnN", "CS-CZ windows-1250", "\1ln\1 (\1re�ln� ��slo\1 [/ x]) [S �] \1re�ln� ��slo\1")
+	HELP_TEXT(
+	"[%EN-US3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0}%EN-US \r\n"
+	"[s0;2 P�irozen� logaritmus. Funkce vypo�te logaritmus parametru [/ x] \r\n"
+	"o_z�kladu [* e], tedy takov� re�ln� ��slo [/ a], pro kter� plat�: \r\n"
+	"[*/ x][*  = exp(][*/ a][* )].&]\r\n"
+	"[s0;2 &]\r\n"
+	"[s0;2 [* P��klad: ]ln(100) = 4.605170186")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$ClnN_EN-US.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$ClnN_EN-US.dpx
new file mode 100644
index 000000000..5fedc2d96
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$ClnN_EN-US.dpx
@@ -0,0 +1,11 @@
+HELP_TOPIC("AppDoc", "", "Calc$ClnN", "EN-US", "\1ln\1 (\1real number\1 [/ x]) [S �] \1real number\1")
+	HELP_TEXT(
+	"[ [A@0+84 Natural (hyperbolic) logarithm. The function will calculate \r\n"
+	"the logarithm of the parameter ][/A@0+84 x][A@0+84  with ][*A@0+84 e][A@0+84  \r\n"
+	"as its base, i.e. such real number ][/A@0+84 a][A@0+84  for which \r\n"
+	"][*/A@0+84 x][*A@0+84  `= exp(][*/A@0+84 a][*A@0+84 )][A@0+84 .]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 Example][A@0+84 `: ln(100) `= ][A@0+84 4.605170186]]\r\n")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$ClogN_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$ClogN_CS-CZ15.dpx
new file mode 100644
index 000000000..c1b7a1982
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$ClogN_CS-CZ15.dpx
@@ -0,0 +1,10 @@
+HELP_TOPIC("AppDoc", "", "Calc$ClogN", "CS-CZ windows-1250", "\1log\1 (\1re�ln� ��slo\1 [/ x]) [S �] \1re�ln� ��slo\1")
+	HELP_TEXT(
+	"[%EN-US3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0}%EN-US \r\n"
+	"[s0;2 Dekadick� logaritmus. Funkce vypo�te logaritmus parametru [/ x] \r\n"
+	"o_z�kladu 10, tedy takov� re�ln� ��slo [/ a], pro kter� plat�: \r\n"
+	"[*/ x][*  = pow(10, ][*/ a][* )].&]\r\n"
+	"[s0;2 &]\r\n"
+	"[s0;2 [* P��klad: ]log(1000) = 3")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$ClogN_EN-US.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$ClogN_EN-US.dpx
new file mode 100644
index 000000000..36057e213
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$ClogN_EN-US.dpx
@@ -0,0 +1,11 @@
+HELP_TOPIC("AppDoc", "", "Calc$ClogN", "EN-US", "\1log\1 (\1real number\1 [/ x]) [S �] \1real number\1")
+	HELP_TEXT(
+	"[ [A@0+84 Decadic logarithm. The function calculates the logarithm \r\n"
+	"of the parameter ][/A@0+84 x][A@0+84  with 10 as its base, i.e. \r\n"
+	"such ][/A@0+84 a][A@0+84  for which ][*/A@0+84 x][*A@0+84  `= \r\n"
+	"pow(10, ][*/A@0+84 a][*A@0+84 )][A@0+84 .]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 Example][A@0+84 `: log(1000) `= 3]]\r\n")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$ClogNotN_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$ClogNotN_CS-CZ15.dpx
new file mode 100644
index 000000000..ff626c818
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$ClogNotN_CS-CZ15.dpx
@@ -0,0 +1,13 @@
+HELP_TOPIC("AppDoc", "", "Calc$ClogNotN", "CS-CZ windows-1250", "oper�tor \1!\1  (\1re�ln� ��slo\1) [S �] \1logick� hodnota\1")
+	HELP_TEXT(
+	"[%EN-US3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0}%EN-US \r\n"
+	"[s0;2 Logick� negace. V�sledkem operace je logick� hodnota 1 ([* pravda]), \r\n"
+	"pokud argument je nulov� (jedn� se o_nulov� ��slo nebo o_logickou \r\n"
+	"hodnotu [* nepravda]). Pokud je argument nenulov� nebo obsahuje \r\n"
+	"logickou hodnotu [* pravda], v�sledkem logick� negace je hodnota \r\n"
+	"0 ([* nepravda]). Pokud je parametrem oper�toru �et�zec, je v�sledkem \r\n"
+	"hodnota 1 ([* pravda]), kdy� tento �et�zec je pr�zdn�.&]\r\n"
+	"[s0;2 &]\r\n"
+	"[s0;2 [* P��klad: ]!10 = 0, !0 = 1, !\"ahoj\" = 0")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$ClogNotN_EN-US.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$ClogNotN_EN-US.dpx
new file mode 100644
index 000000000..a0f1b3f9a
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$ClogNotN_EN-US.dpx
@@ -0,0 +1,16 @@
+HELP_TOPIC("AppDoc", "", "Calc$ClogNotN", "EN-US", "operator \1!\1  (\1real number\1) [S �] \1logical value\1")
+	HELP_TEXT(
+	"[ [A@0+84 Logical negation. The result is the logical value 1 \r\n"
+	"(][*A@0+84 true][A@0+84 ), if the argument is zero (zero number \r\n"
+	"or the logical value ][*A@0+84 false][A@0+84 ). If the argument \r\n"
+	"is nonzero or if it contains the logical value ][*A@0+84 true][A@0+84 , \r\n"
+	"the result of logical negation is the value 0 (][*A@0+84 false][A@0+84 ). \r\n"
+	"If the operator `! is applied to a string, the result will be \r\n"
+	"1 (][*A@0+84 true][A@0+84 ) when and only when the string is \r\n"
+	"empty.]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 Example][A@0+84 `: `!10 `= 0, `!0 `= 1, `!`\"hello`\" \r\n"
+	"`= 0]]\r\n")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$ClogNotS_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$ClogNotS_CS-CZ15.dpx
new file mode 100644
index 000000000..553ba5f18
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$ClogNotS_CS-CZ15.dpx
@@ -0,0 +1,10 @@
+HELP_TOPIC("AppDoc", "", "Calc$ClogNotS", "CS-CZ windows-1250", "oper�tor \1!\1  (\1�et�zec\1) [S �] \1logick� hodnota\1")
+	HELP_TEXT(
+	"[%EN-US3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0}%EN-US \r\n"
+	"[s0;2 Logick� negace. V�sledkem operace je logick� hodnota 1 ([* pravda]), \r\n"
+	"pokud argumentem je pr�zdn� �et�zec nebo hodnota [* null]. V opa�n�m \r\n"
+	"p��pad� je v�sledkem oper�toru [/ nepravda].&]\r\n"
+	"[s0;2 &]\r\n"
+	"[s0;2 [* P��klad: ]!\"ahoj\" = 0, !\"\" = 1")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$ClogNotS_EN-US.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$ClogNotS_EN-US.dpx
new file mode 100644
index 000000000..fe38fded2
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$ClogNotS_EN-US.dpx
@@ -0,0 +1,4 @@
+HELP_TOPIC("AppDoc", "", "Calc$ClogNotS", "EN-US", "operator \1!\1  (\1string\1) [S �] \1logical value\1")
+	HELP_TEXT(
+	"\r\n")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$ClpadSNS_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$ClpadSNS_CS-CZ15.dpx
new file mode 100644
index 000000000..84341652f
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$ClpadSNS_CS-CZ15.dpx
@@ -0,0 +1,12 @@
+HELP_TOPIC("AppDoc", "", "Calc$ClpadSNS", "CS-CZ windows-1250", "\1lpad\1(\1�et�zec\1 [/ text], \1cel� ��slo\1 [/ d�lka], \1�et�zec\1 [/ v�pl�]) [S �] \1�et�zec\1")
+	HELP_TEXT(
+	"[%EN-US3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0}%EN-US \r\n"
+	"[s0;2 Funkce dopln� �et�zec [* text] zleva na po�et znak� [* d�lka] opakovan�m \r\n"
+	"p�ed�azov�n�m �et�zce [* v�pl�]. Pokud je [* d�lka] men�� nebo rovna \r\n"
+	"d�lce p�vodn�ho �et�zce [* text] nebo pokud je �et�zec [* v�pl�] \r\n"
+	"pr�zdn�, funkce vr�t� vstupn� text beze zm�ny.&]\r\n"
+	"[s0;2 &]\r\n"
+	"[s0;2 [* P��klad: ]lpad(\"ahoj\", 15, \"svete\") = \"esvetesveteahoj\"&]\r\n"
+	"[s0;2 ")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$ClpadSN_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$ClpadSN_CS-CZ15.dpx
new file mode 100644
index 000000000..bec11f8f8
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$ClpadSN_CS-CZ15.dpx
@@ -0,0 +1,11 @@
+HELP_TOPIC("AppDoc", "", "Calc$ClpadSN", "CS-CZ windows-1250", "\1lpad\1(\1�et�zec\1 [/ text], \1cel� ��slo\1 [/ d�lka]) [S �] \1�et�zec\1")
+	HELP_TEXT(
+	"[%EN-US3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0}%EN-US \r\n"
+	"[s0;2 Funkce dopln� �et�zec [* text] zleva na po�et znak� [* d�lka] mezerami. \r\n"
+	"Pokud je [* d�lka] men�� nebo rovna d�lce p�vodn�ho �et�zce [* text], \r\n"
+	"funkce vr�t� vstupn� text beze zm�ny.&]\r\n"
+	"[s0;2 &]\r\n"
+	"[s0;2 [* P��klad: ]lpad(\"ahoj\", 8) = \"    ahoj\"&]\r\n"
+	"[s0;2 ")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CltNN_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CltNN_CS-CZ15.dpx
new file mode 100644
index 000000000..9a2fb5acc
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CltNN_CS-CZ15.dpx
@@ -0,0 +1,9 @@
+HELP_TOPIC("AppDoc", "", "Calc$CltNN", "CS-CZ windows-1250", "oper�tor \1<\1  (\1re�ln� ��slo\1, \1re�ln� ��slo\1) [S �] \1logick� hodnota\1")
+	HELP_TEXT(
+	"[%EN-US3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0}%EN-US \r\n"
+	"[s0;2 Oper�tor porovn� dvojici ��sel a_vr�t� hodnotu 1 ([/ pravda]), \r\n"
+	"pokud [* x < y].&]\r\n"
+	"[s0;2 &]\r\n"
+	"[s0;2 [* P��klad: ](10 < 20) = 1")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CltNN_EN-US.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CltNN_EN-US.dpx
new file mode 100644
index 000000000..c2b53823b
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CltNN_EN-US.dpx
@@ -0,0 +1,6 @@
+HELP_TOPIC("AppDoc", "", "Calc$CltNN", "EN-US", "operator \1<\1  (\1real number\1, \1real number\1) [S �] \1logical value\1")
+	HELP_TEXT(
+	"[ [A@0+84 The operator will compare its operands returning the \r\n"
+	"value 1 if the relation holds, 0 when not. String values are \r\n"
+	"compared lexicographically (][/A@0+84 dictionary][A@0+84  organization).]]\r\n")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CltSS_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CltSS_CS-CZ15.dpx
new file mode 100644
index 000000000..bb22f343c
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CltSS_CS-CZ15.dpx
@@ -0,0 +1,10 @@
+HELP_TOPIC("AppDoc", "", "Calc$CltSS", "CS-CZ windows-1250", "oper�tor \1<\1  (\1�et�zec\1, \1�et�zec\1) [S �] \1logick� hodnota\1")
+	HELP_TEXT(
+	"[%EN-US $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0}%EN-US \r\n"
+	"[s0; Funkce porovn� zadan� �et�zce a vr�t� logickou hodnotu [/ pravda], \r\n"
+	"pokud v lexikografick�m uspo��d�n� (ve slovn�ku) text [* �et�zec1] \r\n"
+	"p�edch�z� p�ed �et�zcem [* �et�zci2].&]\r\n"
+	"[s0; &]\r\n"
+	"[s0; [* P��klad: ]\"ban�n\" < \"ovoce\" = 1")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CltSS_EN-US.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CltSS_EN-US.dpx
new file mode 100644
index 000000000..22933340a
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CltSS_EN-US.dpx
@@ -0,0 +1,4 @@
+HELP_TOPIC("AppDoc", "", "Calc$CltSS", "EN-US", "operator \1<\1  (\1string\1, \1string\1) [S �] \1logical value\1")
+	HELP_TEXT(
+	"\r\n")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CltTT_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CltTT_CS-CZ15.dpx
new file mode 100644
index 000000000..f7d3b1263
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CltTT_CS-CZ15.dpx
@@ -0,0 +1,9 @@
+HELP_TOPIC("AppDoc", "", "Calc$CltTT", "CS-CZ windows-1250", "oper�tor \1<\1  (\1datum/�as\1 [/ dt1], \1datum/�as\1 [/ dt2]) [S �] \1logick� hodnota\1")
+	HELP_TEXT(
+	"[%EN-US3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0}%EN-US \r\n"
+	"[s0;2 Funkce porovn� zadan� data / �asy a vr�t� hodnotu [/ pravda], \r\n"
+	"pokud je �as [* dt1] d��v�j�� ne� [* dt2].&]\r\n"
+	"[s0;2 &]\r\n"
+	"[s0;2 [* P��klad: ](15.1.2003 < 13.3.2003) = 1")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CltTT_EN-US.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CltTT_EN-US.dpx
new file mode 100644
index 000000000..b85818c27
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CltTT_EN-US.dpx
@@ -0,0 +1,4 @@
+HELP_TOPIC("AppDoc", "", "Calc$CltTT", "EN-US", "operator \1<\1  (\1date/time\1, \1date/time\1) [S �] \1logical value\1")
+	HELP_TEXT(
+	"\r\n")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CmaxA_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CmaxA_CS-CZ15.dpx
new file mode 100644
index 000000000..e537f5ea2
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CmaxA_CS-CZ15.dpx
@@ -0,0 +1,10 @@
+HELP_TOPIC("AppDoc", "", "Calc$CmaxA", "CS-CZ windows-1250", "")
+	HELP_TEXT(
+	"[%EN-US3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0}%EN-US \r\n"
+	"[s0;2 Funkce vr�t� maximum z hodnot v dan�m poli. Pokud pole obsahuje \r\n"
+	"�et�zce, provede se jejich lexikografick� srovn�n�.&]\r\n"
+	"[s0;2 &]\r\n"
+	"[s0;2 [* P��klad: ]max(`[8, 5, 13, 2, 9`]) = 13&]\r\n"
+	"[s0;2 ")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CmaxNN_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CmaxNN_CS-CZ15.dpx
new file mode 100644
index 000000000..7cfbc07e3
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CmaxNN_CS-CZ15.dpx
@@ -0,0 +1,7 @@
+HELP_TOPIC("AppDoc", "", "Calc$CmaxNN", "CS-CZ windows-1250", "\1max\1 (\1re�ln� ��slo\1, \1re�ln� ��slo\1) [S �] \1re�ln� ��slo\1")
+	HELP_TEXT(
+	"[3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0} \r\n"
+	"[s0;2 Funkce vr�t� maximum ze dvou re�ln�ch ��sel. Pokud je n�kter� \r\n"
+	"z ��sel rovno [* null], je v�sledkem funkce tak� [* null].")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CmaxNN_EN-US.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CmaxNN_EN-US.dpx
new file mode 100644
index 000000000..bfa915b4c
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CmaxNN_EN-US.dpx
@@ -0,0 +1,4 @@
+HELP_TOPIC("AppDoc", "", "Calc$CmaxNN", "EN-US", "\1max\1 (\1real number\1, \1real number\1) [S �] \1real number\1")
+	HELP_TEXT(
+	"\r\n")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CmaxSS_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CmaxSS_CS-CZ15.dpx
new file mode 100644
index 000000000..f2bbd9c36
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CmaxSS_CS-CZ15.dpx
@@ -0,0 +1,9 @@
+HELP_TOPIC("AppDoc", "", "Calc$CmaxSS", "CS-CZ windows-1250", "\1max\1 (\1�et�zec\1, \1�et�zec\1) [S �] \1�et�zec\1")
+	HELP_TEXT(
+	"[%EN-US3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0}%EN-US \r\n"
+	"[s0;2 Funkce vr�t� lexikografick� maximum ze dvou �et�zc�, tedy ten \r\n"
+	"z nich, kter� by byl ve slovn�ku bl�e konci.&]\r\n"
+	"[s0;2 &]\r\n"
+	"[s0;2 [* P��klad: ]max(\"rok\", \"r�m\") = \"rok\".")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CmaxSS_EN-US.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CmaxSS_EN-US.dpx
new file mode 100644
index 000000000..146d67e3e
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CmaxSS_EN-US.dpx
@@ -0,0 +1,4 @@
+HELP_TOPIC("AppDoc", "", "Calc$CmaxSS", "EN-US", "\1max\1 (\1string\1, \1string\1) [S �] \1string\1")
+	HELP_TEXT(
+	"\r\n")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CmaxTT_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CmaxTT_CS-CZ15.dpx
new file mode 100644
index 000000000..87c445af4
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CmaxTT_CS-CZ15.dpx
@@ -0,0 +1,10 @@
+HELP_TOPIC("AppDoc", "", "Calc$CmaxTT", "CS-CZ windows-1250", "\1max\1 (\1datum/�as\1, \1datum/�as\1) [S �] \1datum/�as\1")
+	HELP_TEXT(
+	"[%EN-US3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0}%EN-US \r\n"
+	"[s0;2 Funkce vr�t� v�t�� z_dvojice zadan�ch dat/�as� (pozd�j�� �as/datum). \r\n"
+	"Pokud je n�kter� z parametr� roven [* null], je v�sledkem funkce \r\n"
+	"tak� [* null].&]\r\n"
+	"[s0;2 &]\r\n"
+	"[s0;2 [* P��klad: ]max(3.5.1994, 7.8.1998) = 7.8.1998")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CmaxTT_EN-US.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CmaxTT_EN-US.dpx
new file mode 100644
index 000000000..eae4aef90
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CmaxTT_EN-US.dpx
@@ -0,0 +1,6 @@
+HELP_TOPIC("AppDoc", "", "Calc$CmaxTT", "EN-US", "\1max\1 (\1date/time\1, \1date/time\1) [S �] \1date/time\1")
+	HELP_TEXT(
+	"[ [A@0+84 Minimum. The function will return the bigger of its \r\n"
+	"arguments. Texts are compared lexicographically (the function \r\n"
+	"will return text which would be closer to the end in a dictionary).]]\r\n")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CmidANN_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CmidANN_CS-CZ15.dpx
new file mode 100644
index 000000000..f3aab56a1
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CmidANN_CS-CZ15.dpx
@@ -0,0 +1,11 @@
+HELP_TOPIC("AppDoc", "", "Calc$CmidANN", "CS-CZ windows-1250", "\1mid\1 (\1pole hodnot\1, \1cel� ��slo\1 [/ i], \1cel� ��slo\1 [/ po�et]) [S �] \1pole hodnot\1")
+	HELP_TEXT(
+	"[%EN-US3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0}%EN-US \r\n"
+	"[s0;2 Funkce vr�t� ze zadan�ho pole [* po�et] prvk� po��naje [* i]-t�m \r\n"
+	"prvkem. Prvn� prvek pole m� index 0.&]\r\n"
+	"[s0;2 &]\r\n"
+	"[s0;2 [* P��klad: ]mid(`[\"A\", \"B\", \"C\", \"D\", \"E\"`], 2, 2) = `[\"C\", \r\n"
+	"\"D\"`]&]\r\n"
+	"[s0;2 ")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CmidANN_EN-US.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CmidANN_EN-US.dpx
new file mode 100644
index 000000000..0225f4e71
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CmidANN_EN-US.dpx
@@ -0,0 +1,4 @@
+HELP_TOPIC("AppDoc", "", "Calc$CmidANN", "EN-US", "\1mid\1 (\1pole hodnot\1, \1integer\1, \1integer\1) [S �] \1pole hodnot\1")
+	HELP_TEXT(
+	"\r\n")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CmidAN_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CmidAN_CS-CZ15.dpx
new file mode 100644
index 000000000..b5303fd44
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CmidAN_CS-CZ15.dpx
@@ -0,0 +1,11 @@
+HELP_TOPIC("AppDoc", "", "Calc$CmidAN", "CS-CZ windows-1250", "\1mid\1 (\1pole hodnot\1, \1cel� ��slo\1 [/ i]) [S �] \1pole hodnot\1")
+	HELP_TEXT(
+	"[%EN-US3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0}%EN-US \r\n"
+	"[s0;2 Funkce vr�t� ze zadan�ho pole [* i]-t� a� posledn� prvek. Prvn� \r\n"
+	"prvek pole m� index 0.&]\r\n"
+	"[s0;2 &]\r\n"
+	"[s0;2 [* P��klad: ]mid(`[\"A\", \"B\", \"C\", \"D\", \"E\"`], 2) = `[\"C\", \"D\", \r\n"
+	"\"E\"`]&]\r\n"
+	"[s0;*2 ")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CmidAN_EN-US.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CmidAN_EN-US.dpx
new file mode 100644
index 000000000..58ba4772a
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CmidAN_EN-US.dpx
@@ -0,0 +1,4 @@
+HELP_TOPIC("AppDoc", "", "Calc$CmidAN", "EN-US", "\1mid\1 (\1pole hodnot\1, \1integer\1) [S �] \1pole hodnot\1")
+	HELP_TEXT(
+	"\r\n")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CmidSNN_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CmidSNN_CS-CZ15.dpx
new file mode 100644
index 000000000..830806b0d
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CmidSNN_CS-CZ15.dpx
@@ -0,0 +1,10 @@
+HELP_TOPIC("AppDoc", "", "Calc$CmidSNN", "CS-CZ windows-1250", "\1mid\1 (\1�et�zec\1 [/ text], \1cel� ��slo\1 [/ za��tek], \1cel� ��slo\1 [/ po�et_znak�]) [S �] \1�et�zec\1")
+	HELP_TEXT(
+	"[%EN-US3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0}%EN-US \r\n"
+	"[s0;2 Funkce vr�t� zadan� [/ po�et znak�] z_�et�zce [/ text] od pozice \r\n"
+	"[/ za��tek]. Prvn� znak v_�et�zci m� pozi�n� ��slo 0, druh� znak \r\n"
+	"��slo 1 atd., posledn� znak m� pozici [* len(][*/ text][*  - 1)].&]\r\n"
+	"[s0;2 &]\r\n"
+	"[s0;2 [* P��klad: ]mid(\"ahoj sv�te\", 3, 3) = \"j_s\"")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CmidSNN_EN-US.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CmidSNN_EN-US.dpx
new file mode 100644
index 000000000..41cc755cd
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CmidSNN_EN-US.dpx
@@ -0,0 +1,16 @@
+HELP_TOPIC("AppDoc", "", "Calc$CmidSNN", "EN-US", "\1mid\1 (\1string\1 [/ text], \1integer\1 [/ beginning], \1integer\1 [/ character_count]) [S �] \1string\1")
+	HELP_TEXT(
+	"[ [A@0+84 The function returns ][/A@0+84 character`_count][A@0+84  \r\n"
+	"characters from the string ][/A@0+84 text][A@0+84  starting at \r\n"
+	"position ][/A@0+84 beginning][A@0+84 . The first character in \r\n"
+	"the string has the position number 0, the second character has \r\n"
+	"the number 1 etc., the last character has the position ][*A@0+84 len(][*/A@0+84 t\r\n"
+	"ext][*A@0+84  `- 1)][A@0+84 . If the character count is omitted \r\n"
+	"the function returns all characters from the position ][/A@0+84 beginning][A@0+84  \r\n"
+	"until the end of the string.]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 Example][A@0+84 `: mid(`\"hello world`\", 4, 3) `= `\"o \r\n"
+	"w`\"]]\r\n")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CmidSN_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CmidSN_CS-CZ15.dpx
new file mode 100644
index 000000000..9edd89406
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CmidSN_CS-CZ15.dpx
@@ -0,0 +1,10 @@
+HELP_TOPIC("AppDoc", "", "Calc$CmidSN", "CS-CZ windows-1250", "\1mid\1 (\1�et�zec\1 [/ text], \1cel� ��slo\1 [/ za��tek]) [S �] \1�et�zec\1")
+	HELP_TEXT(
+	"[%EN-US3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0}%EN-US \r\n"
+	"[s0;2 Funkce vr�t� v�echny znaky z �et�zce [* text] po��naje indexem \r\n"
+	"[* za��tek]. Prvn� znak �et�zce m� index 0.&]\r\n"
+	"[s0;2 &]\r\n"
+	"[s0;2 [* P��klad: ]mid(\"Ahoj sv�te!\", 5) = \"sv�t�!\"&]\r\n"
+	"[s0;*2 ")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CmidSN_EN-US.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CmidSN_EN-US.dpx
new file mode 100644
index 000000000..ffba8bb34
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CmidSN_EN-US.dpx
@@ -0,0 +1,4 @@
+HELP_TOPIC("AppDoc", "", "Calc$CmidSN", "EN-US", "\1mid\1 (\1string\1 [/ text], \1integer\1 [/ beginning]) [S �] \1string\1")
+	HELP_TEXT(
+	"\r\n")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CminA_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CminA_CS-CZ15.dpx
new file mode 100644
index 000000000..5ffe486e5
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CminA_CS-CZ15.dpx
@@ -0,0 +1,10 @@
+HELP_TOPIC("AppDoc", "", "Calc$CminA", "CS-CZ windows-1250", "")
+	HELP_TEXT(
+	"[%EN-US3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0}%EN-US \r\n"
+	"[s0;2 Funkce vr�t� minimum z hodnot v dan�m poli. Pokud pole obsahuje \r\n"
+	"�et�zce, provede se jejich lexikografick� srovn�n�.&]\r\n"
+	"[s0;2 &]\r\n"
+	"[s0;2 [* P��klad: ]min(`[8, 5, 13, 2, 9`]) = 2&]\r\n"
+	"[s0;*2 ")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CminNN_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CminNN_CS-CZ15.dpx
new file mode 100644
index 000000000..247234cef
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CminNN_CS-CZ15.dpx
@@ -0,0 +1,9 @@
+HELP_TOPIC("AppDoc", "", "Calc$CminNN", "CS-CZ windows-1250", "\1min\1 (\1re�ln� ��slo\1, \1re�ln� ��slo\1) [S �] \1re�ln� ��slo\1")
+	HELP_TEXT(
+	"[%EN-US3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0}%EN-US \r\n"
+	"[s0;2 Funkce vr�t� minimum ze dvou re�ln�ch ��sel. Pokud je n�kter� \r\n"
+	"z ��sel rovno [* null], je v�sledkem funkce tak� [* null].&]\r\n"
+	"[s0;2 &]\r\n"
+	"[s0;2 [* P��klad: ]min(-15, -16) = -16")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CminNN_EN-US.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CminNN_EN-US.dpx
new file mode 100644
index 000000000..8e9c3cd5b
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CminNN_EN-US.dpx
@@ -0,0 +1,4 @@
+HELP_TOPIC("AppDoc", "", "Calc$CminNN", "EN-US", "\1min\1 (\1real number\1, \1real number\1) [S �] \1real number\1")
+	HELP_TEXT(
+	"\r\n")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CminSS_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CminSS_CS-CZ15.dpx
new file mode 100644
index 000000000..d6da5510a
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CminSS_CS-CZ15.dpx
@@ -0,0 +1,10 @@
+HELP_TOPIC("AppDoc", "", "Calc$CminSS", "CS-CZ windows-1250", "\1min\1 (\1�et�zec\1, \1�et�zec\1) [S �] \1�et�zec\1")
+	HELP_TEXT(
+	"[%EN-US3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0}%EN-US \r\n"
+	"[s0;2 Funkce vr�t� minimum z_dvou �et�zc� v lexikografick�m uspo��d�n�, \r\n"
+	"tedy ten z obou �et�zc�, kter� by ve slovn�ku byl bl�e za��tku.&]\r\n"
+	"[s0;2 &]\r\n"
+	"[s0;2 [* P��klad: ]min(\"pole\", \"Rudolf\") = \"pole\"&]\r\n"
+	"[s0;*2 ")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CminSS_EN-US.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CminSS_EN-US.dpx
new file mode 100644
index 000000000..bb1e20510
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CminSS_EN-US.dpx
@@ -0,0 +1,4 @@
+HELP_TOPIC("AppDoc", "", "Calc$CminSS", "EN-US", "\1min\1 (\1string\1, \1string\1) [S �] \1string\1")
+	HELP_TEXT(
+	"\r\n")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CminTT_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CminTT_CS-CZ15.dpx
new file mode 100644
index 000000000..4ab451496
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CminTT_CS-CZ15.dpx
@@ -0,0 +1,11 @@
+HELP_TOPIC("AppDoc", "", "Calc$CminTT", "CS-CZ windows-1250", "\1min\1 (\1datum/�as\1, \1datum/�as\1) [S �] \1datum/�as\1")
+	HELP_TEXT(
+	"[%EN-US3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0}%EN-US \r\n"
+	"[s0;2 Funkce vr�t� minimum ze dvou �as� (d��v�j�� z obou �as�). Pokud \r\n"
+	"je n�kter� z parametr� roven [* null], je v�sledkem funkce tak� \r\n"
+	"[* null].&]\r\n"
+	"[s0;*2 &]\r\n"
+	"[s0;2 [* P��klad: ]min(1.8.1995, 3.6.1997) = 1.8.1995&]\r\n"
+	"[s0;*2 ")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CminTT_EN-US.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CminTT_EN-US.dpx
new file mode 100644
index 000000000..7d0c1f982
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CminTT_EN-US.dpx
@@ -0,0 +1,7 @@
+HELP_TOPIC("AppDoc", "", "Calc$CminTT", "EN-US", "\1min\1 (\1date/time\1, \1date/time\1) [S �] \1date/time\1")
+	HELP_TEXT(
+	"[ [A@0+84 Minimum. The function will return the smaller of its \r\n"
+	"arguments. Texts are compared lexicographically (the function \r\n"
+	"will return text which would be closer to the beginning in a \r\n"
+	"dictionary).]]\r\n")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CminmaxNNN_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CminmaxNNN_CS-CZ15.dpx
new file mode 100644
index 000000000..dae68bb68
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CminmaxNNN_CS-CZ15.dpx
@@ -0,0 +1,10 @@
+HELP_TOPIC("AppDoc", "", "Calc$CminmaxNNN", "CS-CZ windows-1250", "\1minmax\1 (\1re�ln� ��slo\1 [/ x], \1re�ln� ��slo\1 [/ xmin], \1re�ln� ��slo\1 [/ xmax]) [S �] \1re�ln� ��slo\1")
+	HELP_TEXT(
+	"[%EN-US3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0}%EN-US \r\n"
+	"[s0;2 Funkce vr�t� hodnotu [* min(max(x, xmin), xmax)]. Pokud je n�kter� \r\n"
+	"z parametr� roven [* null], je v�sledek tak� [* null].&]\r\n"
+	"[s0;2 &]\r\n"
+	"[s0;2 [* P��klad: ]minmax(3, 5, 10) = 5, minmax(7, 5, 10) = 7, minmax(20, \r\n"
+	"5, 10) = 10")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CminmaxNNN_EN-US.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CminmaxNNN_EN-US.dpx
new file mode 100644
index 000000000..6452ddc08
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CminmaxNNN_EN-US.dpx
@@ -0,0 +1,4 @@
+HELP_TOPIC("AppDoc", "", "Calc$CminmaxNNN", "EN-US", "\1minmax\1 (\1real number\1, \1real number\1, \1real number\1) [S �] \1real number\1")
+	HELP_TEXT(
+	"\r\n")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CminmaxSSS_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CminmaxSSS_CS-CZ15.dpx
new file mode 100644
index 000000000..cf3b1b05a
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CminmaxSSS_CS-CZ15.dpx
@@ -0,0 +1,9 @@
+HELP_TOPIC("AppDoc", "", "Calc$CminmaxSSS", "CS-CZ windows-1250", "\1minmax\1 (\1�et�zec\1, \1�et�zec\1, \1�et�zec\1) [S �] \1�et�zec\1")
+	HELP_TEXT(
+	"[3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0} \r\n"
+	"[s0;2 Funkce vr�t� hodnotu [* min(max(x, xmin), xmax)]. Porovn�v�n� \r\n"
+	"se ve v�ech p��padech prov�d� lexikograficky, tedy jako ve slovn�ku. \r\n"
+	"Pokud je n�kter� z parametr� roven [* null], je v�sledek tak� [* null].&]\r\n"
+	"[s0;2 ")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CminmaxSSS_EN-US.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CminmaxSSS_EN-US.dpx
new file mode 100644
index 000000000..ab724ba8b
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CminmaxSSS_EN-US.dpx
@@ -0,0 +1,4 @@
+HELP_TOPIC("AppDoc", "", "Calc$CminmaxSSS", "EN-US", "\1minmax\1 (\1string\1, \1string\1, \1string\1) [S �] \1string\1")
+	HELP_TEXT(
+	"\r\n")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CminmaxTTT_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CminmaxTTT_CS-CZ15.dpx
new file mode 100644
index 000000000..86dce5d24
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CminmaxTTT_CS-CZ15.dpx
@@ -0,0 +1,11 @@
+HELP_TOPIC("AppDoc", "", "Calc$CminmaxTTT", "CS-CZ windows-1250", "\1minmax\1 (\1datum/�as\1, \1datum/�as\1, \1datum/�as\1) [S �] \1datum/�as\1")
+	HELP_TEXT(
+	"[%EN-US3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0}%EN-US \r\n"
+	"[s0;2 Funkce vr�t� hodnotu [* min(max(x, xmin), xmax)]. Pokud je n�kter� \r\n"
+	"z parametr� roven [* null], je v�sledek tak� [* null].&]\r\n"
+	"[s0;2 &]\r\n"
+	"[s0;2 [* P��klad: ]minmax(3.1.1990, 8.8.1994, 2.5.1997) = 8.8.1994, \r\n"
+	"minmax(7.6.1995, 8.8.1994, 2.5.1997) = 7.6.1995, minmax(20.12.2003, \r\n"
+	"8.8.1994, 2.5.1997) = 2.5.1997")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CminmaxTTT_EN-US.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CminmaxTTT_EN-US.dpx
new file mode 100644
index 000000000..cc0d34d2b
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CminmaxTTT_EN-US.dpx
@@ -0,0 +1,4 @@
+HELP_TOPIC("AppDoc", "", "Calc$CminmaxTTT", "EN-US", "\1minmax\1 (\1date/time\1, \1date/time\1, \1date/time\1) [S �] \1date/time\1")
+	HELP_TEXT(
+	"\r\n")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CminusN_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CminusN_CS-CZ15.dpx
new file mode 100644
index 000000000..96f580ecb
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CminusN_CS-CZ15.dpx
@@ -0,0 +1,9 @@
+HELP_TOPIC("AppDoc", "", "Calc$CminusN", "CS-CZ windows-1250", "oper�tor \1-\1  (\1re�ln� ��slo\1) [S �] \1re�ln� ��slo\1")
+	HELP_TEXT(
+	"[%EN-US3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0}%EN-US \r\n"
+	"[s0;2 V�sledkem aplikace un�rn�ho oper�toru -  je ��slo opa�n� k \r\n"
+	"zadan�mu re�ln�mu ��slu.&]\r\n"
+	"[s0;2 &]\r\n"
+	"[s0;2 [* P��klad: ]-(2 * 2) = -4")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CminusN_EN-US.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CminusN_EN-US.dpx
new file mode 100644
index 000000000..b031cdba3
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CminusN_EN-US.dpx
@@ -0,0 +1,4 @@
+HELP_TOPIC("AppDoc", "", "Calc$CminusN", "EN-US", "operator \1-\1  (\1real number\1) [S �] \1real number\1")
+	HELP_TEXT(
+	"\r\n")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CminuteT_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CminuteT_CS-CZ15.dpx
new file mode 100644
index 000000000..f865820ff
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CminuteT_CS-CZ15.dpx
@@ -0,0 +1,7 @@
+HELP_TOPIC("AppDoc", "", "Calc$CminuteT", "CS-CZ windows-1250", "")
+	HELP_TEXT(
+	"[{0}\r\n"
+	"[s0; [2 Funkce vr�t� po�et minut ze zadan�ho parametru typu datum \r\n"
+	"`/ �as.]]\r\n"
+	"]")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CminuteT_EN-US.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CminuteT_EN-US.dpx
new file mode 100644
index 000000000..6d5d82b5e
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CminuteT_EN-US.dpx
@@ -0,0 +1,6 @@
+HELP_TOPIC("AppDoc", "", "Calc$CminuteT", "EN-US", "")
+	HELP_TEXT(
+	"[{2}\r\n"
+	"[s0; [2 Function returns number of minutes of its date`/time argument.]]\r\n"
+	"]")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CmodNN_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CmodNN_CS-CZ15.dpx
new file mode 100644
index 000000000..bcfee231d
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CmodNN_CS-CZ15.dpx
@@ -0,0 +1,13 @@
+HELP_TOPIC("AppDoc", "", "Calc$CmodNN", "CS-CZ windows-1250", "oper�tor \1%\1  (\1re�ln� ��slo\1 [/ a], \1re�ln� ��slo\1 [/ b]) [S �] \1re�ln� ��slo\1")
+	HELP_TEXT(
+	"[ [A@0+84 Zbytek po d�len�. Oper�tor ur�� nejmen�� nez�porn� ��slo \r\n"
+	"ze v�ech ��sel, kter� lze z�skat p�i�ten�m nebo ode�ten�m celo��seln�ho \r\n"
+	"n�sobku hodnoty ][/A@0+84 b][A@0+84  k_hodnot� ][/A@0+84 a][A@0+84 . \r\n"
+	"Pokud je na prav� stran� oper�toru nula, v�po�et v�razu ohl�s� \r\n"
+	"chybu ][*A@0+84 d�len� nulou][A@0+84 .]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 P��klad][A@0+84 `: 10.5 `% 2.4 `= 0.9 (10.5 `= 4 `* \r\n"
+	"2.4 `+ 0.9).]]\r\n")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CmodNN_EN-US.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CmodNN_EN-US.dpx
new file mode 100644
index 000000000..7f3b3f5cc
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CmodNN_EN-US.dpx
@@ -0,0 +1,13 @@
+HELP_TOPIC("AppDoc", "", "Calc$CmodNN", "EN-US", "operator \1%\1  (\1real number\1 [/ a], \1real number\1 [/ b]) [S �] \1real number\1")
+	HELP_TEXT(
+	"[ [A@0+84 Division remainder. The operator determines the least \r\n"
+	"non`-negative real number which can be obtained by adding or \r\n"
+	"subtraction any integral multiples of ][/A@0+84 b][A@0+84  to \r\n"
+	"value ][/A@0+84 a][A@0+84 . If ][/A@0+84 b][A@0+84  zero, the \r\n"
+	"computation aborts with the error ][*A@0+84 division by zero][A@0+84 .]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 Example][A@0+84 `: 10.5 `% 2.4 `= 0.9 (10.5 `= 4 `* \r\n"
+	"2.4 `+ 0.9).]]\r\n")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CmonthD_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CmonthD_CS-CZ15.dpx
new file mode 100644
index 000000000..412700667
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CmonthD_CS-CZ15.dpx
@@ -0,0 +1,8 @@
+HELP_TOPIC("AppDoc", "", "Calc$CmonthD", "CS-CZ windows-1250", "")
+	HELP_TEXT(
+	"[%EN-US3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0}%EN-US \r\n"
+	"[s0;2 Funkce vr�t� ��slo m�s�ce v roce pro zadan� datum.&]\r\n"
+	"[s0;2 &]\r\n"
+	"[s0;2 [* P��klad: ]month(27.5.1984) = 5")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CmonthD_EN-US.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CmonthD_EN-US.dpx
new file mode 100644
index 000000000..3fd19784c
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CmonthD_EN-US.dpx
@@ -0,0 +1,6 @@
+HELP_TOPIC("AppDoc", "", "Calc$CmonthD", "EN-US", "")
+	HELP_TEXT(
+	"The function returns the month number of its argument.\r\n"
+	"&\r\n"
+	"&[* Example[* : mesic(27.5.1984) = 5]]")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CmulAC_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CmulAC_CS-CZ15.dpx
new file mode 100644
index 000000000..cf23dc25b
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CmulAC_CS-CZ15.dpx
@@ -0,0 +1,13 @@
+HELP_TOPIC("AppDoc", "", "Calc$CmulAC", "CS-CZ windows-1250", "")
+	HELP_TEXT(
+	"[%EN-US3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0}%EN-US \r\n"
+	"[s0;2 Oper�tor pro ka�d� prvek zadan�ho pole vyhodnot� [/ lambda-v�raz] \r\n"
+	"a vr�t� pole obsahuj�c� v�sledky t�chto v�po�t�. V�sledn� pole \r\n"
+	"m� v�dy stejn� po�et prvk� jako vstupn� pole. P�i vyhodnocov�n� \r\n"
+	"[/ lambda-v�razu] je pro ka�d� prvek p�vodn�ho pole prom�nn� kalkul�toru \r\n"
+	"[* I] nastaven� na index tohoto prvku v poli (prvn� prvek pole \r\n"
+	"m� index 0), prom�nn� [* A] obsahuje hodnotu zpracov�van�ho prvku.&]\r\n"
+	"[s0;2 &]\r\n"
+	"[s0;2 [* P��klad: ]`[1, 2, 3, 4`] * #(A * A) = `[1, 4, 9, 16`]")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CmulAC_EN-US.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CmulAC_EN-US.dpx
new file mode 100644
index 000000000..583cb279a
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CmulAC_EN-US.dpx
@@ -0,0 +1,8 @@
+HELP_TOPIC("AppDoc", "", "Calc$CmulAC", "EN-US", "")
+	HELP_TEXT(
+	"The binary operator [* *] evaluates the [/ lambda-expression] for each element of the original array"
+	" and returns an array composed of the results. The output array has always the same number of elemen"
+	"ts as the input array. During evaluation of the lambda-expression for each input array element the c"
+	"alculator variable [* I] is set to the index of the current array element (first array element has i"
+	"ndex 0) and the variable [* A] contains the value of the array element being processed.")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CmulNN_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CmulNN_CS-CZ15.dpx
new file mode 100644
index 000000000..425652314
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CmulNN_CS-CZ15.dpx
@@ -0,0 +1,8 @@
+HELP_TOPIC("AppDoc", "", "Calc$CmulNN", "CS-CZ windows-1250", "oper�tor \1*\1  (\1re�ln� ��slo\1, \1re�ln� ��slo\1) [S �] \1re�ln� ��slo\1")
+	HELP_TEXT(
+	"[%EN-US3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0}%EN-US \r\n"
+	"[s0;2 Sou�in re�ln�ch ��sel.&]\r\n"
+	"[s0;*2 &]\r\n"
+	"[s0;2 [* P��klad: ]17 * 15 = 255.")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CmulNN_EN-US.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CmulNN_EN-US.dpx
new file mode 100644
index 000000000..2420cdeab
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CmulNN_EN-US.dpx
@@ -0,0 +1,8 @@
+HELP_TOPIC("AppDoc", "", "Calc$CmulNN", "EN-US", "operator \1*\1  (\1real number\1, \1real number\1) [S �] \1real number\1")
+	HELP_TEXT(
+	"[ [A@0+84 The product of two real numbers.]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 Example][A@0+84 `: 17 `* 15 `= 255.]]\r\n")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CmulNS_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CmulNS_CS-CZ15.dpx
new file mode 100644
index 000000000..fcfe43748
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CmulNS_CS-CZ15.dpx
@@ -0,0 +1,11 @@
+HELP_TOPIC("AppDoc", "", "Calc$CmulNS", "CS-CZ windows-1250", "oper�tor \1*\1  (\1cel� ��slo\1 [/ po�et], \1�et�zec\1 [/ text]) [S �] \1�et�zec\1")
+	HELP_TEXT(
+	"[%EN-US3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0}%EN-US \r\n"
+	"[s0;2 Opakov�n� textu. V�sledkem sou�inu �et�zce a_cel�ho ��sla je \r\n"
+	"�et�zec, kter� vznikne opakov�n�m p�vodn�ho �et�zce [/ text] tolikr�t, \r\n"
+	"kolik ud�v� [/ po�et]. Pokud je [/ po�et] <= 0, v�sledkem operace \r\n"
+	"je pr�zdn� �et�zec.&]\r\n"
+	"[s0;2 &]\r\n"
+	"[s0;2 [* P��klad: ]4 * \"znak\" = \"znakznakznakznak\".")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CmulNS_EN-US.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CmulNS_EN-US.dpx
new file mode 100644
index 000000000..232e6260b
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CmulNS_EN-US.dpx
@@ -0,0 +1,12 @@
+HELP_TOPIC("AppDoc", "", "Calc$CmulNS", "EN-US", "operator \1*\1  (\1integer\1 [/ count], \1string\1 [/ text]) [S �] \1string\1")
+	HELP_TEXT(
+	"[ [A@0+84 Text repetition. The result of a multiplying a ][*A@0+84 text][A@0+84  \r\n"
+	"value by an integer value ][*A@0+84 count][A@0+84  is a string \r\n"
+	"containing the original ][*A@0+84 text][A@0+84  repeated ][*A@0+84 count][A@0+84  \r\n"
+	"times. When ][*A@0+84 count][A@0+84  `<`= 0, the result is the \r\n"
+	"empty string.]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 Example][A@0+84 `: `\"text`\" `* 5 `= `\"texttexttexttexttext`\".]]\r\n")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CmulSN_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CmulSN_CS-CZ15.dpx
new file mode 100644
index 000000000..5729b92a6
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CmulSN_CS-CZ15.dpx
@@ -0,0 +1,11 @@
+HELP_TOPIC("AppDoc", "", "Calc$CmulSN", "CS-CZ windows-1250", "oper�tor \1*\1  (\1�et�zec\1 [/ text], \1cel� ��slo\1 [/ po�et]) [S �] \1�et�zec\1")
+	HELP_TEXT(
+	"[%EN-US3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0}%EN-US \r\n"
+	"[s0;2 Opakov�n� textu. V�sledkem sou�inu �et�zce a_cel�ho ��sla je \r\n"
+	"�et�zec, kter� vznikne opakov�n�m p�vodn�ho �et�zce [* text] tolikr�t, \r\n"
+	"kolik ud�v� [* po�et]. Pokud je [* po�et <= 0], v�sledkem operace \r\n"
+	"je pr�zdn� �et�zec.&]\r\n"
+	"[s0;2 &]\r\n"
+	"[s0;2 [* P��klad: ]\"znak\" * 5 = \"znakznakznakznakznak\".")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CmulSN_EN-US.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CmulSN_EN-US.dpx
new file mode 100644
index 000000000..e19705e9c
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CmulSN_EN-US.dpx
@@ -0,0 +1,4 @@
+HELP_TOPIC("AppDoc", "", "Calc$CmulSN", "EN-US", "operator \1*\1  (\1string\1 [/ text], \1integer\1 [/ count]) [S �] \1string\1")
+	HELP_TEXT(
+	"\r\n")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CneVV_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CneVV_CS-CZ15.dpx
new file mode 100644
index 000000000..11434dad5
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CneVV_CS-CZ15.dpx
@@ -0,0 +1,19 @@
+HELP_TOPIC("AppDoc", "", "Calc$CneVV", "CS-CZ windows-1250", "oper�tor \1!=\1  (\1libovoln� typ\1, \1libovoln� typ\1) [S �] \1logick� hodnota\1")
+	HELP_TEXT(
+	"[%EN-US3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0}%EN-US \r\n"
+	"[s0;2 Rovnost / nerovnost. Oper�tor [* ==] (rovnost) vr�t� logickou \r\n"
+	"hodnotu 1 ([* pravda]), pokud operandy na obou stran�ch jsou stejn�ho \r\n"
+	"typu a_jsou shodn�. Oper�tor [* !=] (nerovnost) vrac� v�dy opa�nou \r\n"
+	"logickou hodnotu ne� oper�tor [* ==].&]\r\n"
+	"[s0;2 &]\r\n"
+	"[s0;2 [* Upozorn�n�]: z_t�to definice rovnosti vypl�v�, �e pokud nap��klad \r\n"
+	"na jedn� stran� porovn�n� stoj� text [* \"300\"] a_na druh� stran� \r\n"
+	"��slo [* 300], oper�tor [* ==] vr�t� logickou hodnotu [* nepravda], \r\n"
+	"p�esto�e text na lev� stran� je shodn� s_textovou reprezentac� \r\n"
+	"��sla na prav� stran�. Pokud chcete porovn�vat hodnoty r�zn�ch \r\n"
+	"typ�, p�eve�te je nejprve na spole�n� typ, nap��klad pomoc� funkce \r\n"
+	"[* \r\n"
+	"{:LINK:dpp`:`/`/AppDoc`/`/`:`:`/`/Calc`$CtextN\ttext\t:}\r\n"
+	"].")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CneVV_EN-US.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CneVV_EN-US.dpx
new file mode 100644
index 000000000..6a844c938
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CneVV_EN-US.dpx
@@ -0,0 +1,20 @@
+HELP_TOPIC("AppDoc", "", "Calc$CneVV", "EN-US", "operator \1!=\1  (\1any data type\1, \1any data type\1) [S �] \1logical value\1")
+	HELP_TEXT(
+	"[ [A@0+84 Equality `/ inequality. The operator ][*A@0+84 `=`=][A@0+84  \r\n"
+	"(equality) will return the logical value 1 (][*A@0+84 true][A@0+84 ), \r\n"
+	"if operands on both sides are of the same type and are identical. \r\n"
+	"The operator ][*A@0+84 `!`=][A@0+84  (inequality) will always \r\n"
+	"return the opposite logical value than operator ][*A@0+84 `=`=][A@0+84 .]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 Note][A@0+84 `: This definition of equality implies \r\n"
+	"that if, for instance, on the one side of the comparison is the \r\n"
+	"text `\"300`\" and the number 300 on the other, the operator ][*A@0+84 `=`=][A@0+84  \r\n"
+	"will return the logical value ][*A@0+84 false][A@0+84 , even \r\n"
+	"though the text on the left`-hand side is identical with the \r\n"
+	"text representation of the number on the right`-hand side. If \r\n"
+	"you want to compare values of different types, convert them first \r\n"
+	"into the same type (e.g. using the ][*A@0+84 text][A@0+84  (viz \r\n"
+	"str._96)][A@0+84  function).]]\r\n")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CnlsNN_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CnlsNN_CS-CZ15.dpx
new file mode 100644
index 000000000..7e3d39f8a
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CnlsNN_CS-CZ15.dpx
@@ -0,0 +1,13 @@
+HELP_TOPIC("AppDoc", "", "Calc$CnlsNN", "CS-CZ windows-1250", "\1nls\1 (\1re�ln� ��slo\1 [/ ��slo], \1cel� ��slo\1 [/ des_m�st]) [S �] \1�et�zec\1")
+	HELP_TEXT(
+	"[%EN-US3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0}%EN-US \r\n"
+	"[s0;2 P�evod ��seln� hodnoty na text s vyu�it�m n�rodn�ch zvyklost� \r\n"
+	"pro form�tov�n� ��sel (odd�lova�e tis�c�, odd�lova� desetinn� \r\n"
+	"��sti). Pokud nen� zad�n po�et desetinn�ch m�st, dosad� se b�n� \r\n"
+	"hodnota 3. Pokud je po�et desetinn�ch m�st kladn�, z desetinn� \r\n"
+	"��sti ��sla se odstran� nev�znamn� nuly; pokud je po�et m�st \r\n"
+	"z�porn�, nev�znamn� nuly se v ��sle ponechaj�.&]\r\n"
+	"[s0;2 &]\r\n"
+	"[s0;2 [* P��klad: ]nls(1272.3, -2) = \"1 272,30\"")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CnlsNN_EN-US.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CnlsNN_EN-US.dpx
new file mode 100644
index 000000000..1109a2b91
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CnlsNN_EN-US.dpx
@@ -0,0 +1,14 @@
+HELP_TOPIC("AppDoc", "", "Calc$CnlsNN", "EN-US", "\1nls\1 (\1real number\1 [/ value], \1integer\1 [/ decimals]) [S �] \1string\1")
+	HELP_TEXT(
+	"[ [A@0+84 Converts its numeric value to text according to current \r\n"
+	"regional settings (delimiters of thousands, delimiter of decimal \r\n"
+	"part). If number of decimals is omitted, the default value 3 \r\n"
+	"is used. If the number of decimals is positive, non`-significant \r\n"
+	"zeroes will be deleted from the decimal part of the number. If \r\n"
+	"the number of decimal positions is negative, non`-significant \r\n"
+	"zeroes will be retained in the number. ]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 Example][A@0+84 `: nls(1272.3, `-2) `= `\"1 272,30`\"]]\r\n")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CnlsN_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CnlsN_CS-CZ15.dpx
new file mode 100644
index 000000000..a1bcdd651
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CnlsN_CS-CZ15.dpx
@@ -0,0 +1,7 @@
+HELP_TOPIC("AppDoc", "", "Calc$CnlsN", "CS-CZ windows-1250", "\1nls\1 (\1re�ln� ��slo\1 [/ ��slo]) [S �] \1�et�zec\1")
+	HELP_TEXT(
+	"[3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0} \r\n"
+	"[s0;2 Funkce vr�t� �et�zec s_des�tkov�m z�pisem zadan�ho cel�ho ��sla \r\n"
+	"s_dodr�en�m n�rodn�ch zvyklost�")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CnlsN_EN-US.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CnlsN_EN-US.dpx
new file mode 100644
index 000000000..7b249fa71
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CnlsN_EN-US.dpx
@@ -0,0 +1,4 @@
+HELP_TOPIC("AppDoc", "", "Calc$CnlsN", "EN-US", "\1nls\1 (\1real number\1 [/ value]) [S �] \1string\1")
+	HELP_TEXT(
+	"\r\n")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CnlsrNN_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CnlsrNN_CS-CZ15.dpx
new file mode 100644
index 000000000..c04ccc974
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CnlsrNN_CS-CZ15.dpx
@@ -0,0 +1,13 @@
+HELP_TOPIC("AppDoc", "", "Calc$CnlsrNN", "CS-CZ windows-1250", "\1nlsr\1(\1re�ln� ��slo\1 [/ ��slo], \1cel� ��slo\1 [/ platn�ch_��slic]) [S �] \1�et�zec\1")
+	HELP_TEXT(
+	"[%EN-US3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0}%EN-US \r\n"
+	"[s0;2 P�evod ��seln� hodnoty na text s vyu�it�m n�rodn�ch zvyklost� \r\n"
+	"pro form�tov�n� ��sel (odd�lova�e tis�c�, odd�lova� desetinn� \r\n"
+	"��sti) na zadan� po�et [/ platn�ch ��slic]. Pokud je po�et platn�ch \r\n"
+	"��slic kladn�, z_desetinn� ��sti ��sla se odstran� nev�znamn� \r\n"
+	"nuly; pokud je po�et m�st z�porn�, nev�znamn� nuly se v_��sle \r\n"
+	"ponechaj�.&]\r\n"
+	"[s0;2 &]\r\n"
+	"[s0;2 [* P��klad: ]nlsr(1272.3, -3) = \"1 270\", nlsr(1.2023, -3) = \"1,20\"")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CnlsrNN_EN-US.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CnlsrNN_EN-US.dpx
new file mode 100644
index 000000000..916497f05
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CnlsrNN_EN-US.dpx
@@ -0,0 +1,17 @@
+HELP_TOPIC("AppDoc", "", "Calc$CnlsrNN", "EN-US", "")
+	HELP_TEXT(
+	"[{2}\r\n"
+	"[s0; [2 Converts its numeric value to text according to current regional \r\n"
+	"settings (delimiters of thousands, delimiter of decimal part) \r\n"
+	"with given number of ][/2 significant digits][2 . If the number \r\n"
+	"of digits is positive, non`-significant zeroes will be deleted \r\n"
+	"from the decimal part of the number. If the number of digits \r\n"
+	"is negative, non`-significant zeroes will be retained in the \r\n"
+	"number. ]]\r\n"
+	"&\r\n"
+	"[s0;2 ]\r\n"
+	"&\r\n"
+	"[s0; [*2 Example`: nlsr(1272.3, `-2) `= `\"1 300`\", nlsr(1.999, `-2) \r\n"
+	"`= `\"2.00`\"]]\r\n"
+	"]")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CnlsrN_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CnlsrN_CS-CZ15.dpx
new file mode 100644
index 000000000..f61e3cc97
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CnlsrN_CS-CZ15.dpx
@@ -0,0 +1,11 @@
+HELP_TOPIC("AppDoc", "", "Calc$CnlsrN", "CS-CZ windows-1250", "\1nlsr\1(\1re�ln� ��slo\1 [/ ��slo]) [S �] \1�et�zec\1")
+	HELP_TEXT(
+	"[%EN-US3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0}%EN-US \r\n"
+	"[s0;2 P�evod ��seln� hodnoty na text s vyu�it�m n�rodn�ch zvyklost� \r\n"
+	"pro form�tov�n� ��sel (odd�lova�e tis�c�, odd�lova� desetinn� \r\n"
+	"��sti). ��slo se zaokrouhl� na t�i platn� ��slice a nev�znamn� \r\n"
+	"nuly se ignoruj�.&]\r\n"
+	"[s0;2 &]\r\n"
+	"[s0;2 [* P��klad: ]nlsr(1272.3) = \"1 272\"")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CnlsrN_EN-US.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CnlsrN_EN-US.dpx
new file mode 100644
index 000000000..7c4243f90
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CnlsrN_EN-US.dpx
@@ -0,0 +1,13 @@
+HELP_TOPIC("AppDoc", "", "Calc$CnlsrN", "EN-US", "")
+	HELP_TEXT(
+	"[{2}\r\n"
+	"[s0; [2 Converts its numeric value to text according to current regional \r\n"
+	"settings (delimiters of thousands, delimiter of decimal part). \r\n"
+	"The number is rounded to 3 significant digits and insignificant \r\n"
+	"zeroes are ignored.]]\r\n"
+	"&\r\n"
+	"[s0;2 ]\r\n"
+	"&\r\n"
+	"[s0; [*2 Example`: nlsr(1272.3) `= `\"1 272.3`\"]]\r\n"
+	"]")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$Cnull0_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$Cnull0_CS-CZ15.dpx
new file mode 100644
index 000000000..148009368
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$Cnull0_CS-CZ15.dpx
@@ -0,0 +1,17 @@
+HELP_TOPIC("AppDoc", "", "Calc$Cnull0", "CS-CZ windows-1250", "\1null\1 [S �] \1pr�zdn� hodnota\1")
+	HELP_TEXT(
+	"[ [A@0+84 Pr�zdn� hodnota. P�i v�po�tech operac� a_vol�n� funkc� \r\n"
+	"se pr�zdn� hodnota ][/A@0+84 propaguje][A@0+84  z_podv�razu`: \r\n"
+	"pokud libovoln� z_operand� nebo libovoln� z_parametr� funkce \r\n"
+	"obsahuje pr�zdnou hodnotu, v�sledkem operace nebo funkce je op�t \r\n"
+	"pr�zdn� hodnota. V�jimkou z_tohoto pravidla jsou speci�ln� oper�tory \r\n"
+	"][*A@0+84 ?`:][A@0+84 , ][*A@0+84 `|`|][A@0+84 , ][*A@0+84 `&`&][A@0+84 , \r\n"
+	"][*A@0+84 `=`=][A@0+84 , ][*A@0+84 `!`=][A@0+84  a_d�le funkce \r\n"
+	"][*A@0+84 is_number][A@0+84 , ][*A@0+84 is_text][A@0+84 , ][*A@0+84 is_date][A@0+84  \r\n"
+	"a_][*A@0+84 is_null][A@0+84 , kter� pr�zdn� hodnoty zpracov�vaj� \r\n"
+	"speci�ln�m zp�sobem.]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 P��klad][A@0+84 `: 10 `+ null `= null]]\r\n")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$Cnull0_EN-US.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$Cnull0_EN-US.dpx
new file mode 100644
index 000000000..d06dcb04f
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$Cnull0_EN-US.dpx
@@ -0,0 +1,16 @@
+HELP_TOPIC("AppDoc", "", "Calc$Cnull0", "EN-US", "\1null\1 [S �] \1empty value\1")
+	HELP_TEXT(
+	"[ [A@0+84 Null value. During calculation the null value usually \r\n"
+	"propagates from the subexpression`: if any of the operands or \r\n"
+	"function parameters contains the null value, the result of the \r\n"
+	"operation or of the function is null as well. A few exceptions \r\n"
+	"to this rule include special operators ][*A@0+84 ?`:][A@0+84 , \r\n"
+	"][*A@0+84 `|`|][A@0+84 , ][*A@0+84 `&`&][A@0+84 , ][*A@0+84 `=`=][A@0+84 , \r\n"
+	"][*A@0+84 `!`=][A@0+84  and also the functions ][*A@0+84 is_number][A@0+84 , \r\n"
+	"][*A@0+84 is_text][A@0+84 , ][*A@0+84 is_date][A@0+84 , and_][*A@0+84 is_null][A@0+84 ,\r\n"
+	" which process null values differently.]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 Example][A@0+84 `: 10 `+ null `= null]]\r\n")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CnumberSN_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CnumberSN_CS-CZ15.dpx
new file mode 100644
index 000000000..dc016eb15
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CnumberSN_CS-CZ15.dpx
@@ -0,0 +1,13 @@
+HELP_TOPIC("AppDoc", "", "Calc$CnumberSN", "CS-CZ windows-1250", "\1number\1 (\1�et�zec\1 [/ text], \1re�ln� ��slo\1 [/ jinak]) [S �] \1re�ln� ��slo\1")
+	HELP_TEXT(
+	"[ [A@0+84 Funkce p�evede textovou reprezentaci re�ln�ho ��sla \r\n"
+	"na hodnotu tohoto ��sla. Varianta funkce s jedn�m parametrem \r\n"
+	"v p��pad� chybn�ho z�pisu ��sla ohl�s� p�i vyhodnocen� chybu; \r\n"
+	"funkce s dv�ma parametry vr�t� v p��pad� chyby nebo pr�zdn�ho \r\n"
+	"�et�zce ��selnou hodnotu ][/A@0+84 jinak][A@0+84 , zadanou jako \r\n"
+	"druh� parametr.]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 P��klad][A@0+84 `: number(`\"1.2e3`\") `= 1200]]\r\n")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CnumberSN_EN-US.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CnumberSN_EN-US.dpx
new file mode 100644
index 000000000..65f69f4ca
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CnumberSN_EN-US.dpx
@@ -0,0 +1,13 @@
+HELP_TOPIC("AppDoc", "", "Calc$CnumberSN", "EN-US", "\1number\1 (\1string\1 [/ text], \1real number\1 [/ default]) [S �] \1real number\1")
+	HELP_TEXT(
+	"[ [A@0+84 The function converts text representation of a real \r\n"
+	"numeric constant to the value of this number. If the text doesn`'t \r\n"
+	"contain a valid text representation of a real number, the form \r\n"
+	"with one parameter aborts the computation with the error ][/A@0+84 `'invalid \r\n"
+	"numeric format`'][A@0+84  whereas the form with two arguments \r\n"
+	"merely returns its second argument ][/A@0+84 default][A@0+84 .]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 Example][A@0+84 `: number(`\"1.2e3`\") `= 1200]]\r\n")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CnumberS_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CnumberS_CS-CZ15.dpx
new file mode 100644
index 000000000..953940644
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CnumberS_CS-CZ15.dpx
@@ -0,0 +1,11 @@
+HELP_TOPIC("AppDoc", "", "Calc$CnumberS", "CS-CZ windows-1250", "\1number\1 (\1�et�zec\1) [S �] \1re�ln� ��slo\1")
+	HELP_TEXT(
+	"[%EN-US3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0}%EN-US \r\n"
+	"[s0;2 Funkce na�te ze zadan�ho �et�zce des�tkov� z�pis re�ln�ho ��sla \r\n"
+	"a toto ��slo vr�t� jako sv�j v�sledek. Pokud �et�zec neobsahuje \r\n"
+	"z�pis ��sla, funkce ohl�s� chybu p�i v�po�tu.&]\r\n"
+	"[s0;2 &]\r\n"
+	"[s0;2 [* P��klad: ]number(\"10.8\") = 10.8&]\r\n"
+	"[s0;*2 ")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CnumberS_EN-US.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CnumberS_EN-US.dpx
new file mode 100644
index 000000000..024da62cb
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CnumberS_EN-US.dpx
@@ -0,0 +1,4 @@
+HELP_TOPIC("AppDoc", "", "Calc$CnumberS", "EN-US", "\1number\1 (\1string\1) [S �] \1real number\1")
+	HELP_TEXT(
+	"\r\n")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CnvlVV_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CnvlVV_CS-CZ15.dpx
new file mode 100644
index 000000000..bb72dad76
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CnvlVV_CS-CZ15.dpx
@@ -0,0 +1,11 @@
+HELP_TOPIC("AppDoc", "", "Calc$CnvlVV", "CS-CZ windows-1250", "\1nvl\1 (\1libovoln� typ\1, \1libovoln� typ\1) [S �] \1libovoln� typ\1")
+	HELP_TEXT(
+	"[ [A@0+84 Funkce vr�t� hodnotu sv�ho prvn�ho parametru, tato hodnota \r\n"
+	"nen� pr�zdn� (][*A@0+84 null][A@0+84 ). Pokud prvn� parametr \r\n"
+	"obsahuje pr�zdnou hodnotu, funkce vr�t� hodnotu druh�ho parametru.]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 P��klad][A@0+84 `: nvl(`\"prvni`\", `\"druhy`\") `= `\"prvni`\", \r\n"
+	"nvl(`\"`\", `\"druhy`\") `= `\"druhy`\"]]\r\n")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CnvlVV_EN-US.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CnvlVV_EN-US.dpx
new file mode 100644
index 000000000..419f3d33d
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CnvlVV_EN-US.dpx
@@ -0,0 +1,11 @@
+HELP_TOPIC("AppDoc", "", "Calc$CnvlVV", "EN-US", "\1nvl\1 (\1any data type\1, \1any data type\1) [S �] \1any data type\1")
+	HELP_TEXT(
+	"[ [A@0+84 This function returns its first parameter if it is not \r\n"
+	"][*A@0+84 null][A@0+84 . If the first parameter is ][*A@0+84 null][A@0+84  \r\n"
+	"the function returns its second parameter.]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 Example][A@0+84 `: nvl(`\"first`\", `\"second`\") `= `\"first`\", \r\n"
+	"nvl(`\"`\", `\"second`\") `= `\"second`\"]]\r\n")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$Cpi0_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$Cpi0_CS-CZ15.dpx
new file mode 100644
index 000000000..089992a6a
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$Cpi0_CS-CZ15.dpx
@@ -0,0 +1,9 @@
+HELP_TOPIC("AppDoc", "", "Calc$Cpi0", "CS-CZ windows-1250", "")
+	HELP_TEXT(
+	"[%EN-US3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0}%EN-US \r\n"
+	"[s0;2 Ludolfovo ��slo [S p] ur�uje polovinu d�lky obvodu jednotkov� \r\n"
+	"kru�nice ([* l_= 2][*S p][* r]).&]\r\n"
+	"[s0;2 &]\r\n"
+	"[s0;2 [* P��klad: ]cos(60 * (pi / 180)) = 0.5")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$Cpi0_EN-US.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$Cpi0_EN-US.dpx
new file mode 100644
index 000000000..d8470394c
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$Cpi0_EN-US.dpx
@@ -0,0 +1,6 @@
+HELP_TOPIC("AppDoc", "", "Calc$Cpi0", "EN-US", "\1pi\1 [S �] \1real number\1")
+	HELP_TEXT(
+	"[ [A@0+84 Ludolf number ][S@0+84 p][A@0+84  represents half the \r\n"
+	"circumference of the unit circle (][*A@0+84 l_`= 2][*S@0+84 p][*A@0+84 r][A@0+84 )\r\n"
+	".]]\r\n")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CplusN_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CplusN_CS-CZ15.dpx
new file mode 100644
index 000000000..128c36202
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CplusN_CS-CZ15.dpx
@@ -0,0 +1,9 @@
+HELP_TOPIC("AppDoc", "", "Calc$CplusN", "CS-CZ windows-1250", "oper�tor \1+\1  (\1re�ln� ��slo\1) [S �] \1re�ln� ��slo\1")
+	HELP_TEXT(
+	"[%EN-US3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0}%EN-US \r\n"
+	"[s0;2 Oper�tor ponech� re�ln� ��slo beze zm�ny. Slou�� jako symetrick� \r\n"
+	"prot�j�ek k un�rn�mu oper�toru - (minus).&]\r\n"
+	"[s0;2 &]\r\n"
+	"[s0;2 [* P��klad: ]+(4+5) = 9")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CplusN_EN-US.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CplusN_EN-US.dpx
new file mode 100644
index 000000000..81d48051a
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CplusN_EN-US.dpx
@@ -0,0 +1,4 @@
+HELP_TOPIC("AppDoc", "", "Calc$CplusN", "EN-US", "operator \1+\1  (\1real number\1) [S �] \1real number\1")
+	HELP_TEXT(
+	"\r\n")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CpowNN_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CpowNN_CS-CZ15.dpx
new file mode 100644
index 000000000..b2f180f1a
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CpowNN_CS-CZ15.dpx
@@ -0,0 +1,9 @@
+HELP_TOPIC("AppDoc", "", "Calc$CpowNN", "CS-CZ windows-1250", "\1pow\1 (\1re�ln� ��slo\1 [/ z�klad], \1re�ln� ��slo\1 [/ exponent]) [S �] \1re�ln� ��slo\1")
+	HELP_TEXT(
+	"[%EN-US3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0}%EN-US \r\n"
+	"[s0;2 Re�ln� mocnina. Pokud je [/ exponent] celo��seln�, sm� b�t [/ z�klad] \r\n"
+	"mocniny i_z�porn�. &]\r\n"
+	"[s0;*2 &]\r\n"
+	"[s0;2 [* P��klad: ]pow(3, 4) = 81")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CpowNN_EN-US.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CpowNN_EN-US.dpx
new file mode 100644
index 000000000..f4b794636
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CpowNN_EN-US.dpx
@@ -0,0 +1,12 @@
+HELP_TOPIC("AppDoc", "", "Calc$CpowNN", "EN-US", "\1pow\1 (\1real number\1 [/ base], \1real number\1 [/ exponent]) [S �] \1real number\1")
+	HELP_TEXT(
+	"[ [A@0+84 Real power function. If the exponent is an integer, \r\n"
+	"the base of the power may be negative. Calling ][*A@0+84 pow][A@0+84  \r\n"
+	"with a negative or zero base and a non`-integal exponent aborts \r\n"
+	"the computation with the error message ][*A@0+84 real number \r\n"
+	"computation error][A@0+84 .]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 Example][A@0+84 `: pow(3, 4) `= 81]]\r\n")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CreplaceSSS_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CreplaceSSS_CS-CZ15.dpx
new file mode 100644
index 000000000..5e2e6bcfc
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CreplaceSSS_CS-CZ15.dpx
@@ -0,0 +1,11 @@
+HELP_TOPIC("AppDoc", "", "Calc$CreplaceSSS", "CS-CZ windows-1250", "\1replace\1(\1�et�zec\1 [/ text], \1�et�zec\1 [/ vyhledat], \1�et�zec\1 [/ nahradit]) [S �] \1�et�zec\1")
+	HELP_TEXT(
+	"[%EN-US3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0}%EN-US \r\n"
+	"[s0;2 Funkce vyhled� v_�et�zci [/ text] v�skyty textu [/ vyhledat] a_nahrad� \r\n"
+	"je textem [/ nahradit]. Pokud je �et�zec [/ nahradit] pr�zdn�, funkce \r\n"
+	"z_�et�zce [/ text] odstran� v�skyty textu [/ vyhledat].&]\r\n"
+	"[s0;2 &]\r\n"
+	"[s0;~~~3200;2 [* P��klad:] replace(\"�lov�k �lov�ku vlkem\", \"�lov�k\", \r\n"
+	"\"vlk\") = \"vlk vlku vlkem\"")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CrightAN_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CrightAN_CS-CZ15.dpx
new file mode 100644
index 000000000..965a7089e
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CrightAN_CS-CZ15.dpx
@@ -0,0 +1,12 @@
+HELP_TOPIC("AppDoc", "", "Calc$CrightAN", "CS-CZ windows-1250", "\1right\1 (\1pole hodnot\1, \1cel� ��slo\1 [/ po�et]) [S �] \1pole hodnot\1")
+	HELP_TEXT(
+	"[%EN-US3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0}%EN-US \r\n"
+	"[s0;2 Funkce vr�t� posledn�ch [* po�et] hodnot z_konce zadan�ho pole. \r\n"
+	"Pokud je [* po�et <= 0], funkce vr�t� pr�zdn� pole. Je-li [* po�et \r\n"
+	"]v�t�� nebo roven po�tu prvk� vstupn�ho pole, funkce vr�t� toto \r\n"
+	"pole beze zm�ny.&]\r\n"
+	"[s0;2 &]\r\n"
+	"[s0;2 [* P��klad:] right(`[1..5`], 3) = `[3, 4, 5`]&]\r\n"
+	"[s0;*2 ")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CrightAN_EN-US.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CrightAN_EN-US.dpx
new file mode 100644
index 000000000..bb0f39ecc
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CrightAN_EN-US.dpx
@@ -0,0 +1,4 @@
+HELP_TOPIC("AppDoc", "", "Calc$CrightAN", "EN-US", "\1right\1 (\1pole hodnot\1, \1integer\1) [S �] \1pole hodnot\1")
+	HELP_TEXT(
+	"\r\n")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CrightSN_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CrightSN_CS-CZ15.dpx
new file mode 100644
index 000000000..732d9d26d
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CrightSN_CS-CZ15.dpx
@@ -0,0 +1,12 @@
+HELP_TOPIC("AppDoc", "", "Calc$CrightSN", "CS-CZ windows-1250", "\1right\1 (\1�et�zec\1 [/ text], \1cel� ��slo\1 [/ po�et_znak�]) [S �] \1�et�zec\1")
+	HELP_TEXT(
+	"[ [A@0+84 Funkce vr�t� zadan� ][/A@0+84 po�et znak�][A@0+84  z_konce \r\n"
+	"�et�zce ][/A@0+84 text][A@0+84 . Pokud je po�et znak� men�� nebo \r\n"
+	"roven 0, v�sledkem funkce je pr�zdn� �et�zec. Pokud je po�et \r\n"
+	"znak� v�t�� ne� d�lka �et�zce, funkce vr�t� zadan� �et�zec beze \r\n"
+	"zm�ny.]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 P��klad][A@0+84 `: right(`\"ahoj sv�te`\", 7) `= `\"j_sv�te`\"]]\r\n")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CrightSN_EN-US.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CrightSN_EN-US.dpx
new file mode 100644
index 000000000..d0e294dc8
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CrightSN_EN-US.dpx
@@ -0,0 +1,14 @@
+HELP_TOPIC("AppDoc", "", "Calc$CrightSN", "EN-US", "\1right\1 (\1string\1 [/ text], \1integer\1 [/ character_count]) [S �] \1string\1")
+	HELP_TEXT(
+	"[ [A@0+84 The function returns last ][/A@0+84 character`_count][A@0+84  \r\n"
+	"characters of its string argument ][/A@0+84 text][A@0+84 . If \r\n"
+	"the number of characters is less or equal to 0, the function \r\n"
+	"returns an empty string. If the character count is greater than \r\n"
+	"the string length, the function returns its ][/A@0+84 text][A@0+84  \r\n"
+	"argument unchanged.]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 Example][A@0+84 `: right(`\"hello world`\", 7) `= `\"o \r\n"
+	"world`\"]]\r\n")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CroundNN_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CroundNN_CS-CZ15.dpx
new file mode 100644
index 000000000..bf75d64ad
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CroundNN_CS-CZ15.dpx
@@ -0,0 +1,13 @@
+HELP_TOPIC("AppDoc", "", "Calc$CroundNN", "CS-CZ windows-1250", "\1round\1 (\1re�ln� ��slo\1 [/ hodnota], \1cel� ��slo\1 [/ po�et_desetinn�ch_m�st]) [S �] \1re�ln� ��slo\1")
+	HELP_TEXT(
+	"[ [A@0+84 Zaokrouhlen� na zadan� po�et desetinn�ch m�st (0, pokud \r\n"
+	"nen� zad�no). Sm�r zaokrouhlen� je k_nejbli���mu re�ln�mu ��slu, \r\n"
+	"kter� je celistv�m n�sobkem hodnoty ][*A@0+84 10_`*`*_][/A@0+84 `-po�et_m�st][A@0+84 .\r\n"
+	" Pokud zadan� ��slo le�� p�esn� v_polovin� vzd�lenosti mezi nejbli���mi \r\n"
+	"takov�mi ��sly, zaokrouhl� se sm�rem nahoru.]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 P��klad][A@0+84 `: round(`-2.5) `= `-2, round(47.32, \r\n"
+	"1) `= 47.3, round(117, `-1) `= 120.]]\r\n")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CroundNN_EN-US.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CroundNN_EN-US.dpx
new file mode 100644
index 000000000..af993efd0
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CroundNN_EN-US.dpx
@@ -0,0 +1,13 @@
+HELP_TOPIC("AppDoc", "", "Calc$CroundNN", "EN-US", "\1round\1 (\1real number\1 [/ value], \1integer\1 [/ decimals]) [S �] \1real number\1")
+	HELP_TEXT(
+	"[ [A@0+84 Rounding to the stated number of decimal places (0 by \r\n"
+	"default). The direction of rounding is towards the nearest integral \r\n"
+	"multiple of ][*A@0+84 10_`*`*_][/A@0+84 `-decimals][A@0+84 . \r\n"
+	"If the number lies exactly in the middle between two such numbers, \r\n"
+	"it is rounded up (towards positive infinity).]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 Example][A@0+84 `: round(`-2.5) `= `-2, round(47.32, \r\n"
+	"1) `= 47.3, round(117, `-1) `= 120.]]\r\n")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CroundN_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CroundN_CS-CZ15.dpx
new file mode 100644
index 000000000..ba898f174
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CroundN_CS-CZ15.dpx
@@ -0,0 +1,10 @@
+HELP_TOPIC("AppDoc", "", "Calc$CroundN", "CS-CZ windows-1250", "\1round\1 (\1re�ln� ��slo\1) [S �] \1re�ln� ��slo\1")
+	HELP_TEXT(
+	"[%EN-US3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0}%EN-US \r\n"
+	"[s0;2 Zaokrouhlen� na nejbli��� cel� ��slo. Pokud zadan� ��slo le�� \r\n"
+	"p�esn� v_polovin� vzd�lenosti mezi nejbli���mi cel�mi ��sly, \r\n"
+	"zaokrouhl� se sm�rem nahoru.&]\r\n"
+	"[s0;2 &]\r\n"
+	"[s0;2 [* P��klad: ]round(-2.5) = -2, round(47.32) = 47")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CroundN_EN-US.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CroundN_EN-US.dpx
new file mode 100644
index 000000000..2829fd23d
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CroundN_EN-US.dpx
@@ -0,0 +1,4 @@
+HELP_TOPIC("AppDoc", "", "Calc$CroundN", "EN-US", "\1round\1 (\1real number\1) [S �] \1real number\1")
+	HELP_TEXT(
+	"\r\n")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CroundrNN_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CroundrNN_CS-CZ15.dpx
new file mode 100644
index 000000000..e1077727b
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CroundrNN_CS-CZ15.dpx
@@ -0,0 +1,12 @@
+HELP_TOPIC("AppDoc", "", "Calc$CroundrNN", "CS-CZ windows-1250", "\1roundr\1(\1re�ln� ��slo\1 [/ hodnota], \1cel� ��slo\1 [/ platn�ch_��slic]) [S �] \1re�ln� ��slo\1")
+	HELP_TEXT(
+	"[%EN-US3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0}%EN-US \r\n"
+	"[s0;2 Zaokrouhlen� na zadan� po�et platn�ch ��slic. Sm�r zaokrouhlen� \r\n"
+	"je k_nejbli���mu re�ln�mu ��slu, kter� je celistv�m n�sobkem \r\n"
+	"hodnoty [* 10_**_][/ (ceil(log(hodnota))-platn�ch`_��slic)]. Pokud \r\n"
+	"zadan� ��slo le�� p�esn� v_polovin� vzd�lenosti mezi nejbli���mi \r\n"
+	"takov�mi ��sly, zaokrouhl� se sm�rem nahoru.&]\r\n"
+	"[s0;2 &]\r\n"
+	"[s0;2 [* P��klad: ]roundr(47.32, 2) = 47, roundr(117, 1) = 100.")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CroundrNN_EN-US.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CroundrNN_EN-US.dpx
new file mode 100644
index 000000000..f39c1ab48
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CroundrNN_EN-US.dpx
@@ -0,0 +1,14 @@
+HELP_TOPIC("AppDoc", "", "Calc$CroundrNN", "EN-US", "\1roundr\1(\1real number\1 [/ value], \1integer\1 [/ significant_digits]) [S �] \1real number\1")
+	HELP_TEXT(
+	"[{2}\r\n"
+	"[s0; [2 Rounding to the stated number of significant digits. The \r\n"
+	"direction of rounding is towards the nearest integral multiple \r\n"
+	"of ][*2 10�`*`*�][/2 (ceil(log(value)`-significant`_digits)][2 . \r\n"
+	"If the number lies exactly in the middle between two such nearest \r\n"
+	"numbers, it is rounded up (towards positive infinity).]]\r\n"
+	"&\r\n"
+	"[s0;2 ]\r\n"
+	"&\r\n"
+	"[s0; [*2 Example`: roundr(47.32, 3) `= 47.3, roundr(117, 1) `= 100.]]\r\n"
+	"]")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CrpadSNS_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CrpadSNS_CS-CZ15.dpx
new file mode 100644
index 000000000..fcb78cbd7
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CrpadSNS_CS-CZ15.dpx
@@ -0,0 +1,12 @@
+HELP_TOPIC("AppDoc", "", "Calc$CrpadSNS", "CS-CZ windows-1250", "\1rpad\1(\1�et�zec\1 [/ text], \1cel� ��slo\1 [/ d�lka], \1�et�zec\1 [/ v�pl�]) [S �] \1�et�zec\1")
+	HELP_TEXT(
+	"[%EN-US3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0}%EN-US \r\n"
+	"[s0;2 Funkce dopln� �et�zec [* text] zprava na po�et znak� [* d�lka] \r\n"
+	"opakovan�m p�id�v�n�m �et�zce [* v�pl�]. Pokud je [* d�lka] men�� \r\n"
+	"nebo rovna d�lce p�vodn�ho �et�zce [* text] nebo pokud je �et�zec \r\n"
+	"[* v�pl�] pr�zdn�, funkce vr�t� vstupn� text beze zm�ny.&]\r\n"
+	"[s0;2 &]\r\n"
+	"[s0;2 [* P��klad: ]rpad(\"ahoj\", 15, \"svete\") = \"ahojsvetesvetes\"&]\r\n"
+	"[s0;*2 ")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CrpadSN_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CrpadSN_CS-CZ15.dpx
new file mode 100644
index 000000000..27c2b9695
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CrpadSN_CS-CZ15.dpx
@@ -0,0 +1,12 @@
+HELP_TOPIC("AppDoc", "", "Calc$CrpadSN", "CS-CZ windows-1250", "")
+	HELP_TEXT(
+	"[%EN-US3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0}%EN-US \r\n"
+	"[s0;2 Funkce dopln� �et�zec [* text] mezerami zprava na po�et znak� \r\n"
+	"[* d�lka]. Pokud je [* d�lka] men�� nebo rovna d�lce p�vodn�ho �et�zce \r\n"
+	"[* text], funkce vr�t� vstupn� text beze zm�ny.&]\r\n"
+	"[s0;2 &]\r\n"
+	"[s0;/2 [*/ P��klad: ][/ rpad(\"ahoj\", 8) = \"ahoj    \" ](text [* ahoj] n�sledovan� \r\n"
+	"�ty�mi mezerami)&]\r\n"
+	"[s0;2 ")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CrrpadSNS_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CrrpadSNS_CS-CZ15.dpx
new file mode 100644
index 000000000..10b6a927d
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CrrpadSNS_CS-CZ15.dpx
@@ -0,0 +1,12 @@
+HELP_TOPIC("AppDoc", "", "Calc$CrrpadSNS", "CS-CZ windows-1250", "\1rrpad\1(\1�et�zec\1 [/ text], \1cel� ��slo\1 [/ d�lka], \1�et�zec\1 [/ v�pl�]) [S �] \1�et�zec\1")
+	HELP_TEXT(
+	"[%EN-US3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0}%EN-US \r\n"
+	"[s0;2 Funkce dopln� �et�zec [* text] zprava na po�et znak� [* d�lka] \r\n"
+	"opakovan�m p�id�v�n�m �et�zce [* v�pl�]. Pokud je [* d�lka] men�� \r\n"
+	"nebo rovna d�lce p�vodn�ho �et�zce [* text], funkce vr�t� pouze \r\n"
+	"[* d�lka] prvn�ch znak� �et�zce [* text].&]\r\n"
+	"[s0;2 &]\r\n"
+	"[s0;2 [* P��klad:] rpad(\"ahoj\", 15, \"svete\") = \"ahojsvetesvetes\"&]\r\n"
+	"[s0;2 ")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CrrpadSN_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CrrpadSN_CS-CZ15.dpx
new file mode 100644
index 000000000..019363c6f
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CrrpadSN_CS-CZ15.dpx
@@ -0,0 +1,11 @@
+HELP_TOPIC("AppDoc", "", "Calc$CrrpadSN", "CS-CZ windows-1250", "\1rrpad\1(\1�et�zec\1 [/ text], \1cel� ��slo\1 [/ d�lka]) [S �] \1�et�zec\1")
+	HELP_TEXT(
+	"[%EN-US3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0}%EN-US \r\n"
+	"[s0;2 Funkce dopln� �et�zec [* text] mezerami zprava na po�et znak� \r\n"
+	"[* d�lka]. Pokud je [* d�lka] men�� ne� d�lka p�vodn�ho �et�zce [* text], \r\n"
+	"funkce vr�t� pouze [* d�lka] prvn�ch znak� �et�zce [* text].&]\r\n"
+	"[s0;2 &]\r\n"
+	"[s0;2 [* P��klad: ]rpad(\"ahoj sv�te\", 6) = \"ahoj s\"&]\r\n"
+	"[s0;2 ")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CsalNN_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CsalNN_CS-CZ15.dpx
new file mode 100644
index 000000000..5e994625f
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CsalNN_CS-CZ15.dpx
@@ -0,0 +1,13 @@
+HELP_TOPIC("AppDoc", "", "Calc$CsalNN", "CS-CZ windows-1250", "oper�tor \1<<\1  (\1cel� ��slo\1, \1cel� ��slo\1 [/ po�et_bit�]) [S �] \1cel� ��slo\1")
+	HELP_TEXT(
+	"[ [A@0+84 Aritmetick� posuv vlevo. V�sledkem operace je cel� ��slo, \r\n"
+	"jeho� dvojkov� reprezentace vznikne posuvem dvojkov� reprezentace \r\n"
+	"��sla na lev� stran� oper�toru vlevo (sm�rem k_vy���m bit�m) \r\n"
+	"o_po�et bit� ur�en� operandem na prav� stran�. Vzhledem k_tomu, \r\n"
+	"�e celo��seln� v�po�ty prob�haj� v_dopl�kov�m k�du, je ][*A@0+84 a_`<`< \r\n"
+	"b_`= a_`* 2 `*`* b][A@0+84 .]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 P��klad][A@0+84 `: 3 `<`< 2 `= 12 (11 `<`< 2 `= 1100).]]\r\n")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CsalNN_EN-US.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CsalNN_EN-US.dpx
new file mode 100644
index 000000000..cd4c666ad
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CsalNN_EN-US.dpx
@@ -0,0 +1,14 @@
+HELP_TOPIC("AppDoc", "", "Calc$CsalNN", "EN-US", "operator \1<<\1  (\1integer\1, \1integer\1 [/ bit_count]) [S �] \1integer\1")
+	HELP_TEXT(
+	"[ [A@0+84 Arithmetic shift to the left. The result is the integer \r\n"
+	"whose binary representation can be obtained by shifting the binary \r\n"
+	"representation of the left operand ][/A@0+84 bit`_count][A@0+84  \r\n"
+	"times to the left (towards higher bits), adding zeroes to the \r\n"
+	"right. As integer calculations are performed in 0`'s complement \r\n"
+	"code, it is always true (except when the result overflows valid \r\n"
+	"integer range) that ][*A@0+84 a_`<`< b_`= a_`* 2 `*`* b][A@0+84 .]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 Example][A@0+84 `: 3 `<`< 2 `= 12 (11 `<`< 2 `= 1100).]]\r\n")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CsarNN_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CsarNN_CS-CZ15.dpx
new file mode 100644
index 000000000..9a3935268
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CsarNN_CS-CZ15.dpx
@@ -0,0 +1,15 @@
+HELP_TOPIC("AppDoc", "", "Calc$CsarNN", "CS-CZ windows-1250", "oper�tor \1>>\1  (\1cel� ��slo\1, \1cel� ��slo\1 [/ po�et_bit�]) [S �] \1cel� ��slo\1")
+	HELP_TEXT(
+	"[3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0} \r\n"
+	"[s0;2 Aritmetick� posuv vpravo. V�sledkem operace je cel� ��slo, \r\n"
+	"jeho� dvojkov� reprezentace vznikne posuvem dvojkov� reprezentace \r\n"
+	"��sla na lev� stran� oper�toru vpravo (sm�rem k_ni���m bit�m) \r\n"
+	"o_po�et bit� ur�en� operandem na prav� stran�. Nejvy��� (znam�nkov�) \r\n"
+	"bit ��sla se p�i posuvu kop�ruje do ni���ch bit�, nejni��� bity \r\n"
+	"��sla se ztrat�. Vzhledem k_tomu, �e celo��seln� v�po�ty prob�haj� \r\n"
+	"v_dopl�kov�m k�du, odpov�d� aritmetick� posuv o_bit vpravo d�len� \r\n"
+	"dv�ma se zaokrouhlov�n�m sm�rem dol�.&]\r\n"
+	"[s0;2 &]\r\n"
+	"[s0;2 [* P��klad]: 13 >> 2 = 3, -14 >> 3 = -2.")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CsarNN_EN-US.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CsarNN_EN-US.dpx
new file mode 100644
index 000000000..cd6e1c6b1
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CsarNN_EN-US.dpx
@@ -0,0 +1,15 @@
+HELP_TOPIC("AppDoc", "", "Calc$CsarNN", "EN-US", "operator \1>>\1  (\1integer\1, \1integer\1 [/ bit_count]) [S �] \1integer\1")
+	HELP_TEXT(
+	"[ [A@0+84 Arithmetic shift to the right. The result is the integer \r\n"
+	"whose binary representation will be made by shifting the binary \r\n"
+	"representation of its left operand to the right (towards lower \r\n"
+	"bits) ][/A@0+84 bit`_count][A@0+84  times, discarding lowest \r\n"
+	"bits as necessary and duplicating the highest bit (sign bit) \r\n"
+	"of the left operand. As integer calculations are performed in \r\n"
+	"0`'s complement code, the arithmetic shift to the right by a \r\n"
+	"bit equals division by two with rounding towards minus infinity.]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 Example][A@0+84 `: 12 `>`> 2 `= 3, `-14 `>`> 3 `= `-2.]]\r\n")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CsecondT_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CsecondT_CS-CZ15.dpx
new file mode 100644
index 000000000..a67540df3
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CsecondT_CS-CZ15.dpx
@@ -0,0 +1,8 @@
+HELP_TOPIC("AppDoc", "", "Calc$CsecondT", "CS-CZ windows-1250", "")
+	HELP_TEXT(
+	"[{0}\r\n"
+	"[s0; [2 Funkce vr�t� po�et sekund ze zadan�ho �daje typu datum`/�as.]]\r\n"
+	"&\r\n"
+	"[s0; ]\r\n"
+	"]")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CsecondT_EN-US.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CsecondT_EN-US.dpx
new file mode 100644
index 000000000..b8452ea26
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CsecondT_EN-US.dpx
@@ -0,0 +1,6 @@
+HELP_TOPIC("AppDoc", "", "Calc$CsecondT", "EN-US", "")
+	HELP_TEXT(
+	"[{2}\r\n"
+	"[s0; [2 Function returns number of seconds of its date`/time argument.]]\r\n"
+	"]")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CsgnN_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CsgnN_CS-CZ15.dpx
new file mode 100644
index 000000000..859902f63
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CsgnN_CS-CZ15.dpx
@@ -0,0 +1,14 @@
+HELP_TOPIC("AppDoc", "", "Calc$CsgnN", "CS-CZ windows-1250", "\1sgn\1 (\1re�ln� ��slo\1 [/ x]) [S �] \1cel� ��slo\1")
+	HELP_TEXT(
+	"[ [A@0+84 Znam�nko. V�po�et znam�nka prob�h� podle n�sleduj�c� \r\n"
+	"tabulky`:]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 P��klad][A@0+84 `: sgn(`-13.5) `= `-1, sgn(0) `= 0, \r\n"
+	"sgn(10) `= `+1.]]\r\n")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CsgnN_EN-US.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CsgnN_EN-US.dpx
new file mode 100644
index 000000000..99d24c645
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CsgnN_EN-US.dpx
@@ -0,0 +1,14 @@
+HELP_TOPIC("AppDoc", "", "Calc$CsgnN", "EN-US", "\1sgn\1 (\1real number\1 [/ x]) [S �] \1integer\1")
+	HELP_TEXT(
+	"[ [A@0+84 Sign. The sign computation is based on the following \r\n"
+	"table`:]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 Example][A@0+84 `: sgn(`-13.5) `= `-1, sgn(0) `= 0, \r\n"
+	"sgn(10) `= `+1.]]\r\n")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CsinN_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CsinN_CS-CZ15.dpx
new file mode 100644
index 000000000..a4e5df372
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CsinN_CS-CZ15.dpx
@@ -0,0 +1,11 @@
+HELP_TOPIC("AppDoc", "", "Calc$CsinN", "CS-CZ windows-1250", "\1sin\1 (\1re�ln� ��slo\1 [/ [S a]]) [S �] \1re�ln� ��slo\1")
+	HELP_TEXT(
+	"[ [A@0+84 Funkce stanov� sinus �hlu, tedy pod�l d�lky protilehl� \r\n"
+	"odv�sny a_p�epony v_pravo�hl�m troj�heln�ku s_odv�snov�m �hlem \r\n"
+	"][S@0+84 a][A@0+84 . �hel se zad�v� v_radi�nech, tak�e pln� �hel \r\n"
+	"m� velikost 2][S@0+84 p][A@0+84 .]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 P��klad][A@0+84 `: sin(3 `* pi `/ 2) `= `-1]]\r\n")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CsinN_EN-US.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CsinN_EN-US.dpx
new file mode 100644
index 000000000..feeec6294
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CsinN_EN-US.dpx
@@ -0,0 +1,12 @@
+HELP_TOPIC("AppDoc", "", "Calc$CsinN", "EN-US", "\1sin\1 (\1real number\1 [/ [S a]]) [S �] \1real number\1")
+	HELP_TEXT(
+	"[ [A@0+84 The function calculates the sine of the angle ][S@0+84 a][A@0+84 , \r\n"
+	"i.e. the ratio of the length of the opposite leg and the length \r\n"
+	"of the hypotenuse in a right`-angled triangle with the leg angle \r\n"
+	"][S@0+84 a][A@0+84 . The input angle is assumed to be in radians, \r\n"
+	"therefore the perigon equals 2][S@0+84 p][A@0+84 .]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 Example][A@0+84 `: sin(3 `* pi `/ 2) `= `-1]]\r\n")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CsqrN_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CsqrN_CS-CZ15.dpx
new file mode 100644
index 000000000..78a9228b0
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CsqrN_CS-CZ15.dpx
@@ -0,0 +1,9 @@
+HELP_TOPIC("AppDoc", "", "Calc$CsqrN", "CS-CZ windows-1250", "\1sqr\1 (\1re�ln� ��slo\1 [/ x]) [S �] \1re�ln� ��slo\1")
+	HELP_TEXT(
+	"[ [A@0+84 Druh� mocnina. Funkce vr�t� hodnotu ][*A@0+84 sqr(][*/A@0+84 x][*A@0+84 )\r\n"
+	" `= ][*/A@0+84 x][*A@0+84  `* ][*/A@0+84 x][A@0+84 .]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 P��klad][A@0+84 `: sqr(12) `= 144]]\r\n")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CsqrN_EN-US.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CsqrN_EN-US.dpx
new file mode 100644
index 000000000..0351aab37
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CsqrN_EN-US.dpx
@@ -0,0 +1,9 @@
+HELP_TOPIC("AppDoc", "", "Calc$CsqrN", "EN-US", "\1sqr\1 (\1real number\1 [/ x]) [S �] \1real number\1")
+	HELP_TEXT(
+	"[ [A@0+84 Square. The function returns the value ][*A@0+84 sqr(][*/A@0+84 x][*A@0+84 )\r\n"
+	" `= ][*/A@0+84 x][*A@0+84  `* ][*/A@0+84 x][A@0+84 .]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 Example][A@0+84 `: sqr(12) `= 144]]\r\n")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CsqrtN_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CsqrtN_CS-CZ15.dpx
new file mode 100644
index 000000000..4cf789181
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CsqrtN_CS-CZ15.dpx
@@ -0,0 +1,11 @@
+HELP_TOPIC("AppDoc", "", "Calc$CsqrtN", "CS-CZ windows-1250", "\1sqrt\1 (\1re�ln� ��slo\1 [/ x]) [S �] \1re�ln� ��slo\1")
+	HELP_TEXT(
+	"[%EN-US3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0}%EN-US \r\n"
+	"[s0;2 Druh� odmocnina. Funkce vr�t� takovou hodnotu [*/ a], pro kterou \r\n"
+	"[*/ x][*  = ][*/ a][*  * ][*/ a]. Pokud je parametr funkce z�porn�, v�po�et \r\n"
+	"v�razu skon�� s chybou chyba p�i v�po�tu v re�ln�ch ��slech.&]\r\n"
+	"[s0;2 &]\r\n"
+	"[s0;2 [* P��klad: ]sqrt(81) = 9&]\r\n"
+	"[s0;*_@3 ")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CsqrtN_EN-US.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CsqrtN_EN-US.dpx
new file mode 100644
index 000000000..353e49689
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CsqrtN_EN-US.dpx
@@ -0,0 +1,7 @@
+HELP_TOPIC("AppDoc", "", "Calc$CsqrtN", "EN-US", "\1sqrt\1 (\1real number\1 [/ x]) [S �] \1real number\1")
+	HELP_TEXT(
+	"[ [A@0+84 real number operation error][*_A@3;3 ERROR`: `[ UNMATCHED`: \r\n"
+	".`\n"
+	"`\n"
+	"`[`* Example`]`: sqrt]]\r\n")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CstringIndex_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CstringIndex_CS-CZ15.dpx
new file mode 100644
index 000000000..bd58849a4
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CstringIndex_CS-CZ15.dpx
@@ -0,0 +1,11 @@
+HELP_TOPIC("AppDoc", "", "Calc$CstringIndex", "CS-CZ windows-1250", "oper�tor \1[]\1  (\1�et�zec\1, \1cel� ��slo\1) [S �] \1�et�zec\1")
+	HELP_TEXT(
+	"[%EN-US3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0}%EN-US \r\n"
+	"[s0;2 Oper�tor vr�t� �et�zec obsahuj�c� znak v_�et�zci na dan� pozici. \r\n"
+	"Znaky v �et�zci jsou ��slov�ny od 0, tak�e prvn� znak m� index \r\n"
+	"0 a posledn� (d�lka �et�zce - 1).&]\r\n"
+	"[s0;2 &]\r\n"
+	"[s0;2 [* P��klad: ]\"ahoj\"`[2`] = \"o\"&]\r\n"
+	"[s0;*2 ")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CstringIndex_EN-US.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CstringIndex_EN-US.dpx
new file mode 100644
index 000000000..681c1297a
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CstringIndex_EN-US.dpx
@@ -0,0 +1,4 @@
+HELP_TOPIC("AppDoc", "", "Calc$CstringIndex", "EN-US", "operator \1[]\1  (\1string\1, \1integer\1) [S �] \1string\1")
+	HELP_TEXT(
+	"\r\n")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CsubDD_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CsubDD_CS-CZ15.dpx
new file mode 100644
index 000000000..bba02728a
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CsubDD_CS-CZ15.dpx
@@ -0,0 +1,18 @@
+HELP_TOPIC("AppDoc", "", "Calc$CsubDD", "CS-CZ windows-1250", "oper�tor \1-\1  (\1datum/�as\1 [/ datum1], \1datum/�as\1 [/ datum2]) [S �] \1re�ln� ��slo\1")
+	HELP_TEXT(
+	"[ [A@0+84 Un�rn� oper�tor ][*A@0+84 `-][A@0+84  obr�t� znam�nko \r\n"
+	"sv�ho argumentu.]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [A@0+84 Bin�rn� oper�tor ][*A@0+84 `-][A@0+84  ode�te sv� operandy. \r\n"
+	"V_p��pad� dvojice ��sel je v�sledkem b�n� ��seln� rozd�l hodnot. \r\n"
+	"V_p��pad� rozd�lu data a_cel�ho ��sla se od data ode�te zadan� \r\n"
+	"po�et dn�. V�sledkem rozd�lu dvou dat je po�et dn� mezi nimi. \r\n"
+	"Po�et je kladn�, pokud je prvn� datum pozd�j�� ne� druh�.]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 P��klad][A@0+84 `: 137 `- 95 `= 42, 27.12.1999 `- 5 \r\n"
+	"`= 22.12.1999, 4.1.2000 `- 28.12.1999 `= 7]]\r\n")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CsubDD_EN-US.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CsubDD_EN-US.dpx
new file mode 100644
index 000000000..656f1f0ed
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CsubDD_EN-US.dpx
@@ -0,0 +1,19 @@
+HELP_TOPIC("AppDoc", "", "Calc$CsubDD", "EN-US", "operator \1-\1  (\1date/time\1 [/ date1], \1date/time\1 [/ date2]) [S �] \1real number\1")
+	HELP_TEXT(
+	"[ [A@0+84 Unary operator ][*A@0+84 `-][A@0+84  reverses the sign \r\n"
+	"of its numerical argument.]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [A@0+84 Binary operator ][*A@0+84 `-][A@0+84  subtracts its \r\n"
+	"operands. For numerical operands, the result is the ordinary \r\n"
+	"difference. When an integer is subtracted from a date, the date \r\n"
+	"is moved backward the specified number of days. When subtracting \r\n"
+	"two dates, the result is the number of days between them. The \r\n"
+	"number is positive if the left date comes after the right date.]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 Example][A@0+84 `: 137 `- 95 `= 42, 27.12.1999 `- 5 \r\n"
+	"`= 22.12.1999, 4.1.2000 `- 28.12.1999 `= 7]]\r\n")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CsubDN_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CsubDN_CS-CZ15.dpx
new file mode 100644
index 000000000..526e7ac10
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CsubDN_CS-CZ15.dpx
@@ -0,0 +1,10 @@
+HELP_TOPIC("AppDoc", "", "Calc$CsubDN", "CS-CZ windows-1250", "oper�tor \1-\1  (\1datum/�as\1 [/ d], \1re�ln� ��slo\1 [/ po�et_dn�]) [S �] \1datum/�as\1")
+	HELP_TEXT(
+	"[%EN-US3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0}%EN-US \r\n"
+	"[s0;2 Oper�tor ode�te od zadan�ho data/�asu [* d] zadan� [* po�et dn�]. \r\n"
+	"Pokud je po�et dn� necelo��seln�, posune se i ��slo hodiny, minuty \r\n"
+	"a sekundy. &]\r\n"
+	"[s0;2 &]\r\n"
+	"[s0;2 [* P��klad: ]11.6.2000 + 11.25 = 22.6.2000 06:00:00")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CsubDN_EN-US.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CsubDN_EN-US.dpx
new file mode 100644
index 000000000..d90c29351
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CsubDN_EN-US.dpx
@@ -0,0 +1,4 @@
+HELP_TOPIC("AppDoc", "", "Calc$CsubDN", "EN-US", "operator \1-\1  (\1date/time\1 [/ d], \1real number\1 [/ number_of_days]) [S �] \1date/time\1")
+	HELP_TEXT(
+	"\r\n")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CsubNN_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CsubNN_CS-CZ15.dpx
new file mode 100644
index 000000000..c87a582a7
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CsubNN_CS-CZ15.dpx
@@ -0,0 +1,10 @@
+HELP_TOPIC("AppDoc", "", "Calc$CsubNN", "CS-CZ windows-1250", "oper�tor \1-\1  (\1re�ln� ��slo\1, \1re�ln� ��slo\1) [S �] \1re�ln� ��slo\1")
+	HELP_TEXT(
+	"[%EN-US3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0}%EN-US \r\n"
+	"[s0;2 Oper�tor ode�te dv� re�ln� ��sla. Pokud je libovoln� z ��sel \r\n"
+	"rovno [* null], v�sledkem oper�toru je op�t [* null].&]\r\n"
+	"[s0;2 &]\r\n"
+	"[s0;2 [* P��klad: ]7 - (-13) = 20&]\r\n"
+	"[s0;*2 ")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CsubNN_EN-US.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CsubNN_EN-US.dpx
new file mode 100644
index 000000000..275e89e1e
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CsubNN_EN-US.dpx
@@ -0,0 +1,4 @@
+HELP_TOPIC("AppDoc", "", "Calc$CsubNN", "EN-US", "operator \1-\1  (\1real number\1, \1real number\1) [S �] \1real number\1")
+	HELP_TEXT(
+	"\r\n")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CsumASC_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CsumASC_CS-CZ15.dpx
new file mode 100644
index 000000000..cf3b9c8e9
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CsumASC_CS-CZ15.dpx
@@ -0,0 +1,17 @@
+HELP_TOPIC("AppDoc", "", "Calc$CsumASC", "CS-CZ windows-1250", "\1sum\1(\1pole hodnot\1, \1�et�zec\1 [/ identifik�tor], \1lambda-v�raz\1) [S �] \1libovoln� typ\1")
+	HELP_TEXT(
+	"[3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0} \r\n"
+	"[s0;2 Funkce se�te / spoj� hodnoty vypo�ten� zadan�m [* lambda-v�razem] \r\n"
+	"z[/  ]prvk� zadan�ho pole. [/ Lambda-v�raz] sm� pou��vat zadan� [* identifik�tor] \r\n"
+	"pro p��stup k aktu�ln�mu prvku pole. V�sledky v�razu mus� b�t \r\n"
+	"jednoho z_podporovan�ch datov�ch typ�:&]\r\n"
+	"[s0;2 &]\r\n"
+	"[s0;i150;O0;+-83 [* ��slo] - funkce vr�t� sou�et v�ech t�chto ��sel; \r\n"
+	"prvky obsahuj�c� hodnotu [* null] se ignoruj�&]\r\n"
+	"[s0;i150;O0;+-83 [* �et�zec] - funkce vr�t� spojen� v�ech t�chto �et�zc�&]\r\n"
+	"[s0;i150;O0;+-83 [* pole] - funkce vr�t� spojen� v�ech t�chto pol�&]\r\n"
+	"[s0;i200;+-83 &]\r\n"
+	"[s0;+-83 [* P��klad:] `[1, 4, 7`].sum(\"X\", #(X*X)) = 66, `[1, 4, 7`].sum(\"T\", \r\n"
+	"#(T.text)) = \"147\"")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CsumASC_EN-US.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CsumASC_EN-US.dpx
new file mode 100644
index 000000000..0333cd923
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CsumASC_EN-US.dpx
@@ -0,0 +1,13 @@
+HELP_TOPIC("AppDoc", "", "Calc$CsumASC", "EN-US", "\1sum\1(\1pole hodnot\1, \1string\1 [/ identifier], \1lambda-v�raz\1) [S �] \1any data type\1")
+	HELP_TEXT(
+	"Function adds / concatenates values calculated from the members of its input array using a given [/ "
+	"lambda-expression]. [/ Lambda-expressions] may use the given [/ identifier] to access the current ar"
+	"ray element. The calculated values must be of one of the supported types:\r\n"
+	"&\r\n"
+	"&[i150o*+-83 numbers[*  - function returns the arithmetic sum of all such numbers; elements containi"
+	"ng the ]null[*  value are ignored]]\r\n"
+	"&[i150o*+-83 strings[*  - function returns the string concatenation of all string values]]\r\n"
+	"&[i150o*+-83 arrays[*  - function returns the array concatenation of all arrays]]\r\n"
+	"&[*+-83 ]\r\n"
+	"&[* Example:[*  ][*+-83 `[1, 4, 7`].sum(\"X\", #(X*X)) = 66, `[1, 4, 7`].sum(\"T\", #(T.text)) = \"147\"]]")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CsumA_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CsumA_CS-CZ15.dpx
new file mode 100644
index 000000000..eae446190
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CsumA_CS-CZ15.dpx
@@ -0,0 +1,11 @@
+HELP_TOPIC("AppDoc", "", "Calc$CsumA", "CS-CZ windows-1250", "\1sum\1 (\1pole hodnot\1) [S �] \1libovoln� typ\1")
+	HELP_TEXT(
+	"[%EN-US3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0}%EN-US \r\n"
+	"[s0;2 Funkce vr�t� sou�et hodnot zadan�ho pole. Pokud pole obsahuje \r\n"
+	"jako prvky ��seln� hodnoty, funkce vr�t� ��seln� sou�et t�chto \r\n"
+	"hodnot. Pokud pole obsahuje �et�zce, funkce vr�t� spojen� t�chto \r\n"
+	"�et�zc�. P��padn� hodnoty [* null] v_poli se ignoruj�.&]\r\n"
+	"[s0;2 &]\r\n"
+	"[s0;2 [* P��klad: ]sum({1..5}) = 15")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CsumA_EN-US.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CsumA_EN-US.dpx
new file mode 100644
index 000000000..50dfafdf1
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CsumA_EN-US.dpx
@@ -0,0 +1,4 @@
+HELP_TOPIC("AppDoc", "", "Calc$CsumA", "EN-US", "\1sum\1 (\1pole hodnot\1) [S �] \1any data type\1")
+	HELP_TEXT(
+	"\r\n")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CtextA_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CtextA_CS-CZ15.dpx
new file mode 100644
index 000000000..f6bd702f7
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CtextA_CS-CZ15.dpx
@@ -0,0 +1,8 @@
+HELP_TOPIC("AppDoc", "", "Calc$CtextA", "CS-CZ windows-1250", "")
+	HELP_TEXT(
+	"Funkce p�evede zadan� pole na standardn� textovou reprezentaci ve tvaru\r\n"
+	"&\r\n"
+	"&`[[/ prvn� prvek, druh� prvek, t�et� prvek...]`]\r\n"
+	"&\r\n"
+	"&[* P��klad:[*  `[0.0, 1.0, 2.5`].text = \"`[0, 1, 2.5`]\"]]")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CtextA_EN-US.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CtextA_EN-US.dpx
new file mode 100644
index 000000000..68ace069b
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CtextA_EN-US.dpx
@@ -0,0 +1,8 @@
+HELP_TOPIC("AppDoc", "", "Calc$CtextA", "EN-US", "")
+	HELP_TEXT(
+	"Function converts an array to its standard textual representation in the format\r\n"
+	"&\r\n"
+	"&`[[/ first element, second element, third element...]`]\r\n"
+	"&\r\n"
+	"&[* Example:[*   `[0.0, 1.0, 2.5`].text = \"`[0, 1, 2.5`]\"]]")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CtextD_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CtextD_CS-CZ15.dpx
new file mode 100644
index 000000000..aaa8e2aed
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CtextD_CS-CZ15.dpx
@@ -0,0 +1,13 @@
+HELP_TOPIC("AppDoc", "", "Calc$CtextD", "CS-CZ windows-1250", "\1text\1 (\1datum/�as\1) [S �] \1�et�zec\1")
+	HELP_TEXT(
+	"[ [A@0+84 P�evod hodnoty na text. P�i p�evodu ��sla na text je \r\n"
+	"v�sledkem textov� reprezentace tohoto ��sla, po��zen� na 10 platn�ch \r\n"
+	"��slic. Pokud je parametrem text, funkce ponech� tento text beze \r\n"
+	"zm�ny. P�i p�evodu data na text se do �et�zce datum ulo�� v b�n�m \r\n"
+	"tvaru ][*A@0+84 den.m�s�c.rok][A@0+84 .]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 P��klad][A@0+84 `: text(1 `/ 3) `= `\"0.3333333333`\", \r\n"
+	"text(`\"ahoj`\") `= `\"ahoj`\", text(26.7.1971) `= `\"26.07.1971`\"]]\r\n")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CtextD_EN-US.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CtextD_EN-US.dpx
new file mode 100644
index 000000000..791290ae6
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CtextD_EN-US.dpx
@@ -0,0 +1,14 @@
+HELP_TOPIC("AppDoc", "", "Calc$CtextD", "EN-US", "\1text\1 (\1date/time\1) [S �] \1string\1")
+	HELP_TEXT(
+	"[ [A@0+84 Value`-to`-text conversion. If a number is converted \r\n"
+	"into a text, its result is the text representation of the number \r\n"
+	"with 10 significant digits. If the parameter is a text, the text \r\n"
+	"will be left unchanged by the function. In case of date`-to`-text \r\n"
+	"conversion, the date will be saved in the string in the usual \r\n"
+	"form day.month.year.]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 Example][A@0+84 `: text(1 `/ 3) `= `\"0.3333333333`\", \r\n"
+	"text(`\"hello`\") `= `\"hello`\", text(26.7.1971) `= `\"26.07.1971`\"]]\r\n")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CtextN_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CtextN_CS-CZ15.dpx
new file mode 100644
index 000000000..a5856d9ca
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CtextN_CS-CZ15.dpx
@@ -0,0 +1,9 @@
+HELP_TOPIC("AppDoc", "", "Calc$CtextN", "CS-CZ windows-1250", "\1text\1 (\1re�ln� ��slo\1) [S �] \1�et�zec\1")
+	HELP_TEXT(
+	"[%EN-US3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0}%EN-US \r\n"
+	"[s0;2 Funkce vr�t� �et�zec obsahuj�c� textov� z�pis zadan�ho re�ln�ho \r\n"
+	"��sla.&]\r\n"
+	"[s0;2 &]\r\n"
+	"[s0;2 [* P��klad: ]text(-370.05) = \"-370.05\"")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CtextN_EN-US.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CtextN_EN-US.dpx
new file mode 100644
index 000000000..d9d741203
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CtextN_EN-US.dpx
@@ -0,0 +1,4 @@
+HELP_TOPIC("AppDoc", "", "Calc$CtextN", "EN-US", "\1text\1 (\1real number\1) [S �] \1string\1")
+	HELP_TEXT(
+	"\r\n")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CtextS_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CtextS_CS-CZ15.dpx
new file mode 100644
index 000000000..3e01215d3
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CtextS_CS-CZ15.dpx
@@ -0,0 +1,9 @@
+HELP_TOPIC("AppDoc", "", "Calc$CtextS", "CS-CZ windows-1250", "\1text\1 (\1�et�zec\1) [S �] \1�et�zec\1")
+	HELP_TEXT(
+	"[%EN-US3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0}%EN-US \r\n"
+	"[s0;2 Funkce vr�t� jako v�sledek sv�j parametr beze zm�ny.&]\r\n"
+	"[s0;2 &]\r\n"
+	"[s0;2 [* P��klad: ]text(\"Ahoj sv�te!\") = \"Ahoj sv�te!\"&]\r\n"
+	"[s0;*2 ")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CtextS_EN-US.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CtextS_EN-US.dpx
new file mode 100644
index 000000000..84a8365d9
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CtextS_EN-US.dpx
@@ -0,0 +1,4 @@
+HELP_TOPIC("AppDoc", "", "Calc$CtextS", "EN-US", "\1text\1 (\1string\1) [S �] \1string\1")
+	HELP_TEXT(
+	"\r\n")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CtgN_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CtgN_CS-CZ15.dpx
new file mode 100644
index 000000000..2b1768c48
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CtgN_CS-CZ15.dpx
@@ -0,0 +1,10 @@
+HELP_TOPIC("AppDoc", "", "Calc$CtgN", "CS-CZ windows-1250", "\1tg\1 (\1re�ln� ��slo\1 [/ [S a]]) [S �] \1re�ln� ��slo\1")
+	HELP_TEXT(
+	"[ [A@0+84 Tangens �hlu je pod�l d�lky protilehl� a_p�ilehl� odv�sny \r\n"
+	"v_pravo�hl�m troj�heln�ku s_odv�snov�m �hlem ][S@0+84 a][A@0+84 . \r\n"
+	"�hel se zad�v� v_radi�nech, tak�e pln� �hel m� velikost 2][S@0+84 p][A@0+84 .]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 P��klad][A@0+84 `: tg(pi `/ 4) `= 1]]\r\n")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CtgN_EN-US.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CtgN_EN-US.dpx
new file mode 100644
index 000000000..9d10a776f
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CtgN_EN-US.dpx
@@ -0,0 +1,11 @@
+HELP_TOPIC("AppDoc", "", "Calc$CtgN", "EN-US", "\1tg\1 (\1real number\1 [/ [S a]]) [S �] \1real number\1")
+	HELP_TEXT(
+	"[ [A@0+84 Tangent of an angle is the ratio of the length of the \r\n"
+	"opposite leg and the length of the adjacent leg right`-angled \r\n"
+	"triangle with the leg angle ][S@0+84 a][A@0+84 . The input angle \r\n"
+	"is assumed to be in radians (the perigon equals 2][S@0+84 p][A@0+84 ).]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 Example][A@0+84 `: tg(pi `/ 4) `= 1]]\r\n")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CtimeNNNNNN_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CtimeNNNNNN_CS-CZ15.dpx
new file mode 100644
index 000000000..0f2eb1c83
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CtimeNNNNNN_CS-CZ15.dpx
@@ -0,0 +1,9 @@
+HELP_TOPIC("AppDoc", "", "Calc$CtimeNNNNNN", "CS-CZ windows-1250", "\1time\1(\1cel� ��slo\1 [/ den], \1cel� ��slo\1 [/ m�s�c], \1cel� ��slo\1 [/ rok], \1cel� ��slo\1 [/ hodina], \1cel� ��slo\1 [/ minuta], \1cel� ��slo\1 [/ sekunda]) [S �] \1datum/�as\1")
+	HELP_TEXT(
+	"[%EN-US3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0}%EN-US \r\n"
+	"[s0;2 Funkce vr�t� hodnotu typu [* datum/�as] se zadan�m ��slem dne, \r\n"
+	"hodiny, minuty a sekundy.&]\r\n"
+	"[s0;2 &]\r\n"
+	"[s0;2 [* P��klad: ]time(3, 7, 2003, 11, 15, 37).text = \"3.7.2003 11:15:37\"")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CyearD_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CyearD_CS-CZ15.dpx
new file mode 100644
index 000000000..64d57f9d3
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CyearD_CS-CZ15.dpx
@@ -0,0 +1,6 @@
+HELP_TOPIC("AppDoc", "", "Calc$CyearD", "CS-CZ windows-1250", "")
+	HELP_TEXT(
+	"Funkce vr�t� ��slo roku pro zadan� datum.\r\n"
+	"&\r\n"
+	"&[* P��klad[* : rok(27.5.1984) = 1984]]")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$CyearD_EN-US.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CyearD_EN-US.dpx
new file mode 100644
index 000000000..4e2accc3a
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$CyearD_EN-US.dpx
@@ -0,0 +1,6 @@
+HELP_TOPIC("AppDoc", "", "Calc$CyearD", "EN-US", "")
+	HELP_TEXT(
+	"The function returns the year number of its argument.\r\n"
+	"&\r\n"
+	"&[* Example[* : rok(27.5.1984) = 1984]]")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$Cyears_betweenDD_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$Cyears_betweenDD_CS-CZ15.dpx
new file mode 100644
index 000000000..8d174a5d0
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$Cyears_betweenDD_CS-CZ15.dpx
@@ -0,0 +1,11 @@
+HELP_TOPIC("AppDoc", "", "Calc$Cyears_betweenDD", "CS-CZ windows-1250", "\1years_between\1 (\1datum\1 [/ d1], \1datum\1 [/ d2]) [S �] \1cel� ��slo\1")
+	HELP_TEXT(
+	"[ [A@0+84 Funkce ur�� po�et let, kter� le�� mezi zadan�mi dv�ma \r\n"
+	"daty (v�k osoby, narozen� dne ][/A@0+84 d1][A@0+84 , ke dni ][/A@0+84 d2][A@0+84 )\r\n"
+	".]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 P��klad][A@0+84 `: years_between(25.1.1974, 27.12.1999) \r\n"
+	"`= 25]]\r\n")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_Calc$Cyears_betweenDD_EN-US.dpx b/uppsrc/TCore/doc.dpp/AppDoc_Calc$Cyears_betweenDD_EN-US.dpx
new file mode 100644
index 000000000..37e23753e
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_Calc$Cyears_betweenDD_EN-US.dpx
@@ -0,0 +1,11 @@
+HELP_TOPIC("AppDoc", "", "Calc$Cyears_betweenDD", "EN-US", "\1years_between\1 (\1date\1 [/ d1], \1date\1 [/ d2]) [S �] \1integer\1")
+	HELP_TEXT(
+	"[ [A@0+84 The function returns number of years between its date \r\n"
+	"arguments (the age of a person born on ][/A@0+84 d1][A@0+84  \r\n"
+	"at the date of ][/A@0+84 d2][A@0+84 ).]]\r\n"
+	"&\r\n"
+	"[A+84 ]\r\n"
+	"&\r\n"
+	"[ [*A@0+84 Example][A@0+84 `: years_between(25.1.1974, 27.12.1999) \r\n"
+	"`= 25]]\r\n")
+HELP_END
diff --git a/uppsrc/TCore/doc.dpp/AppDoc_CalcNode_CS-CZ15.dpx b/uppsrc/TCore/doc.dpp/AppDoc_CalcNode_CS-CZ15.dpx
new file mode 100644
index 000000000..daa5d1702
--- /dev/null
+++ b/uppsrc/TCore/doc.dpp/AppDoc_CalcNode_CS-CZ15.dpx
@@ -0,0 +1,128 @@
+HELP_TOPIC("AppDoc", "", "CalcNode", "CS-CZ windows-1250", "")
+HELP_TEXT(
+	"[3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[b100;a50;*3 $$1,0#23046025415494101427921008701515:Paragraph]\r\n"
+	"[{0}%EN-US \r\n"
+	"[s0; V�razov� kalkul�tor je v�po�etn� syst�m, kter� umo��uje po��tat \r\n"
+	"hodnoty u�ivatelsky zadan�ch v�raz�. Vstupem pro v�po�et je [/ zdrojov� \r\n"
+	"text v�razu], co� je textov� �et�zec obsahuj�c� v�raz utvo�en� \r\n"
+	"podle n�e popsan�ch pravidel, a [/ kontext v�po�tu], co� je vazba \r\n"
+	"mezi v�razem a hostitelskou aplikac�, ve kter� je v�razov� syst�m \r\n"
+	"pou�it. Kontext v�po�tu m��e podle charakteru aplikace definovat \r\n"
+	"nap��klad p��davn� funkce a konstanty v_z�vislosti na aktu�ln�m \r\n"
+	"nastaven� a_hodnot�ch zpracov�van�ch v_hostitelsk� aplikaci.&]\r\n"
+	"[s0; &]\r\n"
+	"[s0; Syntaxe v�raz� r�mcov� vych�z� z_konvenc� pro v�razy v_[/ programovac�m \r\n"
+	"jazyce C], obdobn� jako Java nebo JavaScript. Z�kladem v�razu \r\n"
+	"jsou [/ liter�ly] (��sla, textov� �et�zce uveden� p��mo ve zdrojov�m \r\n"
+	"textu v�razu), [/ prom�nn� ](identifik�tory odkazuj�c� se na konstanty \r\n"
+	"nebo funkce podle kontextu v�po�tu v�razu) a [/ oper�tory], pomoc� \r\n"
+	"nich� lze hodnoty r�zn� kombinovat a_zpracov�vat.&]\r\n"
+	"[s0; &]\r\n"
+	"[s0; Z�kladn� v�razov� syst�m podporuje pr�ci s_hodnotami n�sleduj�c�ch \r\n"
+	"datov�ch typ�:&]\r\n"
+	"[s0; &]\r\n"
+	"[s0;i150;O0; [* ��slo] (v_plovouc� ��dov� ��rce)&]\r\n"
+	"[s0;i150;O0; [* �et�zec] (textov� hodnota)&]\r\n"
+	"[s0;i150;O0;* datum/�as&]\r\n"
+	"[s0;i150;O0; [* pole hodnot] (jednotliv� prvky pole mohou b�t i r�zn�ch \r\n"
+	"typ�)&]\r\n"
+	"[s0;i150;O0; [* lambda-v�raz] (��st v�po�etn�ho v�razu, kterou lze \r\n"
+	"p�ed�vat do funkc� jako parametr)&]\r\n"
+	"[s0; &]\r\n"
+	"[s0; Kontext v�razu (hostitelsk� aplikace pou��vaj�c� v�razov� syst�m) \r\n"
+	"m��e podle sv�ch pot�eb roz�i�ovat tento z�kladn� reperto�r o \r\n"
+	"dal�� datov� typy a_funkce.&]\r\n"
+	"[s1; Oper�tory&]\r\n"
+	"[s0; Oper�tory slou�� podobn� jako funkce k_v�po�tu hodnot z_jin�ch \r\n"
+	"zdrojov�ch hodnot. Narozd�l od funkce, kterou lze vyvolat z�pisem \r\n"
+	"[/ identifik�tor`_funkce(parametr1, parametr2...)], se oper�tory \r\n"
+	"obvykle pou��vaj� zp�sobem [/ v�raz1 <oper�tor> v�raz2] (tzv. [/ bin�rn� \r\n"
+	"oper�tor]), p��padn� [/ <oper�tor> v�raz] ([/ prefixov� un�rn� oper�tor]). \r\n"
+	"Podrobn� popis oper�tory a_funkc� s_povolen�mi typy parametr� \r\n"
+	"naleznete v_��sti \r\n"
+	"{:LINK:dpp`:`/`/AppDoc`/`/host`/`/calc`_summary\t\t:}\r\n"
+	".&]\r\n"
+	"[s0; &]\r\n"
+	"[s0; Krom� toho v�razov� syst�m podporuje n�kolik speci�ln�ch oper�tor� \r\n"
+	"s_jin�m zp�sobem z�pisu. Jedn� se o_n�sleduj�c� oper�tory:&]\r\n"
+	"[s1; `[<p1>, <p2>, <p3>, ...`]: konstruktor pole&]\r\n"
+	"[s0; Vlo�en�m posloupnosti hodnot nebo v�raz� odd�len�ch ��rkami \r\n"
+	"do hranat�ch z�vorek vznikne pole obsahuj�c� zadan� hodnoty jako \r\n"
+	"sv� prvky.&]\r\n"
+	"[s0; &]\r\n"
+	"[s0;* P��klad: `[1, 2, 3 + 4`]&]\r\n"
+	"[s1; `[<p1> .. <p2>`]: konstruktor posloupnosti&]\r\n"
+	"[s0; Pokud do hranat�ch z�vorek nap�ete dv� ��seln� hodnoty nebo \r\n"
+	"v�razy odd�len� dv�ma te�kami (dv� te�ky mus� n�sledovat ihned \r\n"
+	"po sob� bez mezery), v�sledkem takto vytvo�en�ho v�razu je pole \r\n"
+	"obsahuj�c� posloupnost hodnot [/ p1, p1 + 1, p1 + 2, p1 + 3] atd. \r\n"
+	"a� po hodnotu [/ p2]. Pokud rozd�l hodnot [/ p1] a [/ p2 ]nen� p�esn� \r\n"
+	"celo��seln�, posledn� prvek pole bude m�t hodnotu v_rozsahu [/ `[p2-0.5, \r\n"
+	"p2+0.5)]. Pokud je [/ p2 <= p1 - 0.5], je v�sledkem pr�zdn� pole \r\n"
+	"(pole neobsahuj�c� ��dn� prvek).&]\r\n"
+	"[s0; &]\r\n"
+	"[s0;* P��klad: `[1..7`] = `[1,2,3,4,5,6,7`]&]\r\n"
+	"[s1; <p1> ? <p2> : <p3>: podm�n�n� v�raz&]\r\n"
+	"[s0; Podm�n�n� v�raz lze pou��t v_situaci, kdy pot�ebujete rozhodnout \r\n"
+	"pro jednu ze dvou variant na z�klad� platnosti logick� podm�nky. \r\n"
+	"P�i v�po�tu v�razu se nejprve vyhodnot� [/ p1]; pokud je jeho logick� \r\n"
+	"hodnota pravdiv� (je to nenulov� ��slo nebo nepr�zdn� textov� \r\n"
+	"�et�zec), vyhodnot� se d�le v�raz [/ p2] a jeho hodnota je v�sledkem \r\n"
+	"cel�ho v�razu ?:. Pokud podm�nka neplat�, vyhodnot� se obdobn� \r\n"
+	"v�raz [/ p3] a v�sledkem v�razu je jeho hodnota.&]\r\n"
+	"[s0; &]\r\n"
+	"[s0;/ [*/ P��klad][/ : ][*/ 5 % 2 == 0 ? \"sud�\" : \"lich�\"] = \"lich�\"&]\r\n"
+	"[s1; <p1>{<m1>, <v1>, <m2>, <v2>, ... }: podm�n�n� v�raz s v�b�rem&]\r\n"
+	"[s0; Pomoc� funkce lze vybrat jednu ze zadan�ch hodnot (v�raz�) podle \r\n"
+	"hodnoty ��dic�ho v�razu [/ p1]. P�i v�po�tu se nejprve vyhodnot� \r\n"
+	"tento v�raz; dal�� postup z�vis� na po�tu parametr� v_slo�en�ch \r\n"
+	"z�vork�ch.&]\r\n"
+	"[s0; &]\r\n"
+	"[s0;i150;O0;/ [*/ 1 parametr][/ : pokud je v_z�vork�ch jen jeden v�raz \r\n"
+	"(]m1[/ ), otestuje se, zda je hodnota v�razu ]p1 [/ pr�zdn� (][/ \r\n"
+	"{:LINK:dpp`:`/`/AppDoc`/`/`:`:`/`/Calc`$Cis`_nullV\tis`_null\t:}\r\n"
+	"][/ ). Pokud pr�zdn� nen�, ponech� se v�raz ]p1[/  beze zm�ny a vr�t� \r\n"
+	"se jako v�sledek cel�ho z�pisu. Pokud je hodnota pr�zdn�, vyhodnot� \r\n"
+	"se v�raz ]m1[/  a v�sledkem cel�ho v�razu {} je pak hodnota ]m1.&]\r\n")
+	HELP_TEXT(
+	"[s0;i150;O0; [* sud� po�et parametr�]: pokud je po�et parametr� sud� \r\n"
+	"(a nenulov�), program po vyhodnocen� [/ p1] postupn� proch�z� v�razy \r\n"
+	"v_z�vork�ch na [/ lich�ch pozic�ch] ([/ m1, m2, m3...]). Ka�d� tento \r\n"
+	"v�raz vyhodnot� a porovn� s hodnotou v�razu [/ p1]; pokud se hodnoty \r\n"
+	"shoduj�, program vyhodnot� a vr�t� odpov�daj�c� v�raz na n�sleduj�c� \r\n"
+	"sud� pozici ([/ v1, v2, v3...]). Pokud ani jedna z hodnot [/ m1, \r\n"
+	"m2, m3]... nen� rovna [/ p1], je v�sledkem v�razu p��mo p�vodn� \r\n"
+	"[/ p1] beze zm�ny.&]\r\n"
+	"[s0;i150;O0; [* lich� po�et parametr�]: pokud je po�et parametr� lich� \r\n"
+	"(a v�t�� ne� jeden), program po vyhodnocen� obdobn� jako v_p��pad� \r\n"
+	"sud�ho po�tu parametr� testuje rovnost s_parametry na lich�ch \r\n"
+	"pozic�ch [/ m1, m2, m3...]. a_v_p��pad� rovnosti vr�t� parametr \r\n"
+	"na n�sleduj�c� nulov� pozici. Pokud nen� nalezena ani v_jednom \r\n"
+	"z p��pad� shodn� hodnota, program vyhodnot� a_vr�t� posledn� \r\n"
+	"(nep�rovou) hodnotu v_z�vork�ch.&]\r\n"
+	"[s1; #<v�raz>: lambda-v�raz&]\r\n"
+	"[s0; Lambda v�raz se pou��v� v_situac�ch, kdy je t�eba samotn� v�po�etn� \r\n"
+	"v�raz poslat jako parametr do jin� funkce nebo oper�toru (v_opa�n�ch \r\n"
+	"p��padech do oper�toru nebo funkce p�ich�z� jako parametr a� \r\n"
+	"[/ vypo�ten� hodnota] tohoto v�razu). Zp�sob nakl�d�n� s_matematick�m \r\n"
+	"v�razem v_t�to funkci z�vis� na charakteru konkr�tn� funkce. \r\n"
+	"Obvykle jde o_to, �e v_r�mci jin� funkce je pot�eba takto p�edan� \r\n"
+	"v�po�etn� v�raz n�kolikr�t postupn� vyhodnotit (vypo��tat), p��padn� \r\n"
+	"v_r�zn�m kontextu, a_z�skat tak n�kolik v�sledk�, kter� se pak \r\n"
+	"d�le zpracuj�.&]\r\n"
+	"[s1;*/ [*/ P��klad: ][*/ \r\n"
+	"{:LINK:dpp`:`/`/AppDoc`/`/`:`:`/`/Calc`$CsumASC\tsum\t:}\r\n"
+	"][*/ (`[1..4`], \"x\", #(x * x))] = 1 * 1 + 2 * 2 + 3 * 3 + 4 * 4 \r\n"
+	"= 1+4+9+16 = 30&]\r\n"
+	"[s1; <v�raz>.<identifik�tor>: objektov� vol�n� funkce&]\r\n"
+	"[s0; Oper�tor [/ te�ka] umo��uje z�pis n�kter�ch v�raz� zp�sobem p�ipom�naj�c�m \r\n"
+	"objektov� programovac� jazyky. Jedn� se �ist� o n�stroj p�ehledn�j��ho \r\n"
+	"z�pisu, vnit�n� se v�echny takov�to z�pisy ch�pou jako vol�n� \r\n"
+	"funkc�. Z�pis [/ a.id] m� stejn� v�znam jako [/ id(a)], z�pis a.id(b, \r\n"
+	"c, d) je tot� co id(a, b, c, d).&]\r\n"
+	"[s0; &]\r\n"
+	"[s0;/ [*/ P��klad: sin(pi)] = pi.sin = 0, [*/ (1/3).nls(-2)] = nls(1/3, \r\n"
+	"-2) = 0,33&]\r\n"
+	"[s0; ")
+HELP_END
diff --git a/uppsrc/TCore/globcfg.cpp b/uppsrc/TCore/globcfg.cpp
new file mode 100644
index 000000000..aa042bfca
--- /dev/null
+++ b/uppsrc/TCore/globcfg.cpp
@@ -0,0 +1,139 @@
+#include "TCore.h"
+
+NAMESPACE_UPP
+
+ConfigHeading::ConfigHeading()
+{
+	version = 0;
+	minor   = 0;
+	major   = -1;
+}
+
+ConfigHeading::ConfigHeading(const char *key, int version, int minor, int major)
+{
+	this->key     = key;
+	this->version = version;
+	this->minor   = minor;
+	this->major   = major;
+}
+
+void ConfigHeading::Serialize(Stream& stream)
+{
+	if(!stream.IsLoading() || !stream.IsEof())
+		stream % key / version;
+}
+
+bool ConfigHeading::Matches(const ConfigHeading& heading) const
+{
+	return key == heading.key && version >= heading.minor && version <= heading.major;
+}
+
+ConfigItem::ConfigItem()
+: current_version(0)
+, save_version(0)
+{
+}
+
+ConfigItem::ConfigItem(const char *key, int version, int minor, int major,
+					   Configuration* configuration)
+: ConfigHeading(key, 0, minor, major)
+, current_version(0)
+, save_version(version)
+{
+	(configuration ? configuration : &Configuration::Main())->Add(*this);
+}
+
+void ConfigItem::Serialize(Stream& stream)
+{
+	ConfigHeading::Serialize(stream);
+	stream % data;
+}
+
+void ConfigItem::Prepare(bool storing)
+{
+	current_version = (storing ? save_version : version);
+}
+
+void ConfigItem::Clear()
+{
+	version = 0;
+	data.Clear();
+}
+
+bool ConfigItem::operator = (const ConfigItem& item)
+{
+	if(!item.Matches(*this))
+		return false;
+	data = item.data;
+	version = item.version;
+	return true;
+}
+
+ConfigStream::ConfigStream(ConfigItem& item, bool storing)
+: item(item)
+{
+	item.Prepare(storing);
+	if(!storing)
+		Open(item.data);
+}
+
+ConfigStream::~ConfigStream()
+{
+	if(IsStoring())
+	{
+		item.version = item.save_version;
+		item.data = GetResult();
+	}
+}
+
+Configuration::Configuration(const char *key, int version, int minor, int major)
+: ConfigHeading(key, version, minor, major)
+{
+}
+
+void Configuration::Add(ConfigItem& item)
+{
+	ASSERT(items.Find(item.key) < 0); // duplicate configuration items
+	items.Add(item.key, &item);
+}
+
+void Configuration::Serialize(Stream& stream)
+{
+	item_error = false;
+
+	if(stream.IsLoading()) { // clear configuration items
+		for(ConfigItem **p = items.Begin(), **e = items.End(); p < e; p++)
+			(*p)->Clear();
+		if(stream.IsEof())
+			return; // empty configuration file
+	}
+
+	ConfigHeading temp = *this;
+	stream % temp;
+	if(!temp.Matches(*this)) { // whole configuration is invalid
+		stream.SetError();
+		return;
+	}
+
+	int item_count = items.GetCount();
+	stream % item_count;
+
+	for(int i = 0; i < item_count; i++)
+		if(stream.IsLoading()) {
+			ConfigItem item;
+			stream % item;
+			int index = items.Find(item.key);
+			if(index >= 0 && !(*items[index] = item))
+				item_error = true;
+		}
+		else
+			stream % *items[i];
+}
+
+Configuration& Configuration::Main()
+{
+	static Configuration main_configuration("Application configuration", 1, 1, 1);
+	return main_configuration;
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/TCore/globcfg.h b/uppsrc/TCore/globcfg.h
new file mode 100644
index 000000000..0de1d5a9e
--- /dev/null
+++ b/uppsrc/TCore/globcfg.h
@@ -0,0 +1,106 @@
+NAMESPACE_UPP
+
+class Configuration;
+class ConfigItem;
+
+class ConfigHeading
+{
+public:
+	ConfigHeading();
+	ConfigHeading(const char *key, int version, int minor, int major);
+
+	void   Serialize(Stream& stream);
+	bool   Matches(const ConfigHeading& heading) const;
+
+public:
+	String key;
+	int    version;
+	int    minor;
+	int    major;
+};
+
+class ConfigItem : protected ConfigHeading
+{
+	friend class Configuration;
+	friend class ConfigStream;
+
+public:
+	ConfigItem();
+	ConfigItem(const char *key, int version, int minor, int major,
+		Configuration* cfg = NULL); // NULL = AppCfg()
+
+	bool   operator = (const ConfigItem& item);
+
+	void   Prepare(bool storing);
+	void   Clear();
+
+	void   Serialize(Stream& stream);
+
+	int    GetVersion() const { return current_version; }
+
+	bool   operator <  (int version) const { return current_version <  version; }
+	bool   operator <= (int version) const { return current_version <= version; }
+	bool   operator == (int version) const { return current_version == version; }
+	bool   operator != (int version) const { return current_version != version; }
+	bool   operator >= (int version) const { return current_version >= version; }
+	bool   operator >  (int version) const { return current_version >  version; }
+
+protected:
+	int    save_version;
+	int    current_version;
+	String data;
+};
+
+#define CONFIG_ITEM(var, key, version, minor, major) \
+	GLOBAL_VARP(ConfigItem, var, (key, version, minor, major)) \
+	INITBLOCK { var(); }
+
+class ConfigStream : public StringStream
+{
+public:
+	ConfigStream(ConfigItem& item, bool storing);
+	~ConfigStream();
+
+protected:
+	ConfigItem& item;
+};
+
+template <class T>
+bool ConfigureItem(T& object, ConfigItem& item, bool storing)
+{
+	ConfigStream stream(item, storing);
+	if(stream.IsLoading() && stream.IsEof())
+	 	return true; // empty configuration is OK
+	stream % object;
+	return !stream.IsError();
+}
+
+template <class T>
+inline bool ReadConfigItem(T& object, ConfigItem& item)
+{ return ConfigureItem(object, item, false); }
+
+template <class T>
+inline bool WriteConfigItem(const T& object, ConfigItem& item)
+{ return ConfigureItem(const_cast<T&>(object), item, true); }
+
+#define ReadConfigSelf()  ReadConfigItem(*this, config())
+#define WriteConfigSelf() WriteConfigItem(*this, config())
+
+class Configuration : protected ConfigHeading
+{
+public:
+	Configuration(const char *key, int version, int minor, int major);
+
+	void                  Add(ConfigItem& item);
+	void                  Serialize(Stream& stream);
+
+	static Configuration& Main();
+
+	bool                  IsItemError() const { return item_error; }
+
+protected:
+	VectorMap<String, ConfigItem*> items;
+	bool                  item_error;
+};
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/TCore/help.cpp b/uppsrc/TCore/help.cpp
new file mode 100644
index 000000000..e2ff1dbf0
--- /dev/null
+++ b/uppsrc/TCore/help.cpp
@@ -0,0 +1,638 @@
+#include "TCore.h"
+
+NAMESPACE_UPP
+
+#define LLOG(x) // RLOG(x)
+#define LDUMP(x) // RDUMP(x)
+
+#define LNGLIST() \
+	LNGITEM(LNG_CZECH,   CHARSET_WIN1250) \
+	LNGITEM(LNG_ENGLISH, CHARSET_WIN1252) \
+//	LNGITEM(LNG_GERMAN,  CHARSET_WIN1252) \
+
+#define LNGITEM(lcode, charset)
+
+static String LNGAsTextShort(int language)
+{
+	int charset = GetLNGCharset(language);
+	String lcode = LNGAsText(language & ~(-1 << 20));
+	if(charset != CHARSET_UNICODE)
+		lcode << charset;
+	return lcode;
+}
+
+bool operator == (const HelpTopicInfo& a, const HelpTopicInfo& b)
+{
+	if(a.textfunc != b.textfunc || a.titlefunc != b.titlefunc)
+		return false;
+	if(a.language.GetCount() != b.language.GetCount())
+		return false;
+	for(int l = 0; l < a.language.GetCount(); l++)
+	{
+		int f = b.language.Find(a.language[l]);
+		if(f < 0 || a.title[l] != b.title[f] || a.text[l] != b.text[f])
+			return false;
+	}
+	return true;
+}
+
+String GetLangIdent(int language)
+{
+	switch(language)
+	{
+#undef LNGITEM
+#define LNGITEM(lcode, charset) case lcode: return #lcode;
+	LNGLIST()
+	default: return "0x" + FormatIntHex(language, 8);
+	}
+}
+
+byte GetLangStdCharset(int language)
+{
+	if(IsNull(language) || language == 0)
+		return GetDefaultCharset();
+	int cs = (language >> 20) & 0xFF;
+	if(cs)
+		return cs;
+	switch(language)
+	{
+#undef LNGITEM
+#define LNGITEM(lcode, charset) case lcode: return charset;
+	LNGLIST()
+	default: NEVER(); return CHARSET_DEFAULT;
+	}
+}
+
+static int help_topic_seq = 0;
+
+int  HelpTopicGetSeq()   { return help_topic_seq; }
+void HelpTopicTouchSeq() { help_topic_seq++; }
+
+void HelpTopicInfo::Set(int lang, String tit_, String txt_, String tmo_)
+{
+	String tmo = tmo_, tit = tit_, txt = txt_;
+	int cs = GetLangCharset(lang);
+//	tit.SetCharset(cs);
+//	txt.SetCharset(cs);
+	int f = language.Find(lang);
+	if(IsNull(tit) && IsNull(txt))
+	{
+		if(f < 0)
+			return;
+		language.Remove(f);
+		module.Remove(f);
+		title.Remove(f);
+		text.Remove(f);
+	}
+	else
+	{
+		if(f >= 0)
+		{
+			if(title[f] == tit && text[f] == txt)
+				return;
+			title[f] = tit;
+			text[f] = txt;
+			module[f] = tmo;
+		}
+		else
+		{
+			language.Add(lang);
+			title.Add(tit);
+			text.Add(txt);
+			module.Add(tmo);
+		}
+		if(!IsNull(tmo))
+			text_folder = GetFileFolder(tmo);
+	}
+	HelpTopicTouchSeq();
+}
+
+String HelpTopicInfo::GetTitle(int lang) const
+{
+	int f = language.Find(lang);
+	if(f >= 0)
+		return title[f];
+	return Null;
+}
+
+String HelpTopicInfo::GetText(int lang) const
+{
+	int f = language.Find(lang);
+	if(f >= 0)
+		return text[f];
+	return Null;
+}
+
+String HelpTopicInfo::GetTitle() const
+{
+	String t = GetTitle(GetCurrentLanguage());
+	if(IsNull(t))
+		t = GetDefaultTitle();
+	return t;
+}
+
+String HelpTopicInfo::GetText() const
+{
+	String t = GetText(GetCurrentLanguage());
+	if(IsNull(t))
+		t = GetDefaultText();
+	return t;
+}
+
+String HelpTopicInfo::GetDefaultTitle() const
+{
+	String out;
+	if(recursed)
+		return "(rekurze v t�matu)";
+	recursed = true;
+	if(titlefunc)
+		try
+		{
+			titlefunc(out);
+		}
+		catch(Exc e)
+		{
+			out = NFormat("Chyba: [* \1%s\1]", e);
+		}
+	recursed = false;
+	return out;
+}
+
+String HelpTopicInfo::GetDefaultText() const
+{
+	String out;
+	if(recursed)
+		return "(rekurze v t�matu)";
+	recursed = true;
+	if(textfunc)
+		try
+		{
+			textfunc(out);
+		}
+		catch(Exc e)
+		{
+			out = NFormat("Chyba: [* \1%s\1]\n\nVytvo�en� ��st textu:\n%s", e, out);
+		}
+	recursed = false;
+	return out;
+}
+
+String HelpFormatDPP(const char *space, const char *nesting, const char *topic)
+{
+	return NFormat("dpp://%[::]~s//%[::]~s//%s", space, nesting, topic);
+}
+
+bool HelpParseDPP(const char *path, String& space, String& nesting, String& topic)
+{
+	if(path[0] == 'd' && path[1] == 'p' && path[2] == 'p' && path[3] == ':')
+		path += 4;
+	if(path[0] == '/' && path[1] == '/')
+		path += 2;
+	const char *b = path;
+	while(*path && !(path[0] == '/' && path[1] == '/'))
+		path++;
+	space = String(b, path - b == 2 && b[0] == ':' && b[1] == ':' ? b : path);
+	if(path[0] == '/' && path[1] == '/')
+		path += 2;
+	b = path;
+	while(*path && !(path[0] == '/' && path[1] == '/'))
+		path++;
+	nesting = String(b, path - b == 2 && b[0] == ':' && b[1] == ':' ? b : path);
+	if(path[0] == '/' && path[1] == '/')
+		path += 2;
+	topic = path;
+	return !IsNull(space) || !IsNull(nesting) || !IsNull(topic);
+}
+
+GLOBAL_VAR(HelpTopicInfoMap, HelpTopicMap)
+
+void HelpTopicAdd(const char *drl, const char *decl_module, Callback1<String&> titlefunc, Callback1<String&> textfunc)
+{
+	ASSERT(decl_module && *decl_module);
+//	String module = GetFileTitle(raw_module);
+	HelpTopicInfoMap& map = HelpTopicMap();
+	HelpTopicInfo& info = map.GetAdd(drl);
+	info.added = true;
+/*	if(info.titlefunc && titlefunc && info.titlefunc != titlefunc)
+		RLOG("[" << drl << "]: titlefunc mismatch, decl_module = " << decl_module);
+	if(info.textfunc && textfunc && info.textfunc != textfunc)
+		RLOG("[" << drl << "]: textfunc mismatch, decl_module = " << decl_module);
+	if(decl_module && *decl_module && !IsNull(info.decl_module) && info.decl_module != decl_module)
+		RLOG("[" << drl << "]: declaration module mismatch - '" << decl_module << "' and '" << info.decl_module << "'");
+*/	if(titlefunc)
+		info.titlefunc = titlefunc;
+	if(textfunc)
+		info.textfunc = textfunc;
+	info.decl_module = Nvl(decl_module, info.decl_module);
+	HelpTopicTouchSeq();
+}
+
+void HelpTopicSet(const char *drl, const char *text_module, int language, const char *title, String text)
+{
+	HelpTopicInfoMap& map = HelpTopicMap();
+	int f = map.Find(drl);
+	if(f >= 0)
+	{
+		if(text_module && *text_module && !IsNull(map[f].text_folder))
+		{
+			String tfo = GetFileFolder(text_module);
+			if(tfo != map[f].text_folder)
+				RLOG("[" << drl << "] text folder mismatch: " << tfo << " / " << map[f].text_folder);
+		}
+	}
+	else
+	{
+		f = map.GetCount();
+		HelpTopicInfo& info = map.Add(drl);
+		HelpTopicTouchSeq();
+	}
+	map[f].Set(language, title, text, text_module);
+}
+
+void HelpTopicSet(const char *space, const char *nesting, const char *topic, const char *text_module, int language, const char *title, String text)
+{
+	HelpTopicSet(HelpFormatDPP(space, nesting, topic), text_module, language, title, text);
+}
+
+void HelpTopicSet(const char *space, const char *nesting, const char *topic, const char *text_module, const char *language, const char *title, String text)
+{
+	HelpTopicSet(space, nesting, topic, text_module, LNGFromText(language), title, text);
+}
+
+const HelpTopicInfo& HelpTopicGet(String topic)
+{
+	HelpTopicInfoMap& map = HelpTopicMap();
+	int f = map.Find(topic);
+	if(f >= 0)
+		return map[f];
+	static HelpTopicInfo empty;
+	return empty;
+}
+
+Vector<String> HelpTopicEnumSpace()
+{
+	const HelpTopicInfoMap& map = HelpTopicMap();
+	Index<String> spaces;
+	for(int i = 0; i < map.GetCount(); i++)
+	{
+		String space, nesting, topic;
+		HelpParseDPP(map.GetKey(i), space, nesting, topic);
+		spaces.FindAdd(space);
+	}
+	Vector<String> splist = spaces.PickKeys();
+	Sort(splist, StdLess<String>());
+	return splist;
+}
+
+Vector<String> HelpTopicEnumNesting(String sp)
+{
+	const HelpTopicInfoMap& map = HelpTopicMap();
+	Index<String> nest;
+	for(int i = 0; i < map.GetCount(); i++)
+	{
+		String space, nesting, topic;
+		HelpParseDPP(map.GetKey(i), space, nesting, topic);
+		if(IsNull(sp) || sp == space)
+			nest.FindAdd(nesting);
+	}
+	Vector<String> nelist = nest.PickKeys();
+	Sort(nelist, StdLess<String>());
+	return nelist;
+}
+
+Vector<String> HelpTopicEnumDeclModules()
+{
+	Index<String> modmap;
+	const HelpTopicInfoMap& map = HelpTopicMap();
+	for(int i = 0; i < map.GetCount(); i++)
+		modmap.FindAdd(map[i].decl_module);
+	Vector<String> mm = modmap.PickKeys();
+	Sort(mm, StdLess<String>());
+	return mm;
+}
+
+static void CatUnder(String& out)
+{
+	if(!out.IsEmpty() && *out.Last() != '_')
+		out.Cat('_');
+}
+
+static void AdjustCat(String& out, const char *in, int maxlen)
+{
+	for(; *in && out.GetLength() < maxlen; in++)
+		if(IsAlNum(*in) || *in == '_' || *in == '-' || *in == '$')
+			out.Cat(*in);
+		else
+			CatUnder(out);
+}
+
+String HelpTopicTextModuleTitle(String space, String nesting, String topic, Index<String>& used_names)
+{
+	String title;
+	AdjustCat(title, space, 8);
+	CatUnder(title);
+	if(!IsNull(nesting))
+	{
+		AdjustCat(title, nesting, 16);
+		CatUnder(title);
+	}
+	AdjustCat(title, topic, 32);
+	String base = title;
+	int i = 0;
+	while(used_names.Find(title) >= 0)
+		title = base + FormatInt(++i);
+	return title;
+}
+
+static String NormalizePathCase(String s)
+{
+#ifdef PLATFORM_WIN32
+	return ToLower(s);
+#else
+	return s;
+#endif
+}
+
+static GLOBAL_VAR(String, HelpHostDir__)
+
+String HelpTopicHostDir() { return HelpHostDir__(); }
+
+void HelpTopicSetHostDir(const char *dir) { HelpHostDir__() = dir; }
+
+static String GetTextFolder(String nesting, String decl_module, String text_folder)
+{
+	if(nesting == "host")
+		return HelpTopicHostDir();
+	if(!IsNull(decl_module))
+		return NormalizePathCase(GetFileFolder(decl_module));
+	String tmod = text_folder;
+	if(!stricmp(GetFileNamePos(tmod), "doc.dpp"))
+		tmod = GetFileFolder(tmod);
+	return NormalizePathCase(tmod);
+}
+
+Vector<String> HelpTopicEnumTextFolders()
+{
+	Index<String> out;
+	const HelpTopicInfoMap& map = HelpTopicMap();
+	for(int i = 0; i < map.GetCount(); i++)
+	{
+		String drl = map.GetKey(i);
+		String space, nesting, topic;
+		HelpParseDPP(drl, space, nesting, topic);
+		const HelpTopicInfo& info = map[i];
+		String folder = GetTextFolder(nesting, info.decl_module, info.text_folder);
+		if(out.Find(folder) < 0)
+		{
+			out.Add(folder);
+			LLOG("HelpTopicSave: folder = " << folder);
+		}
+	}
+	Vector<String> list = out.PickKeys();
+	Sort(list, StdLess<String>());
+	return list;
+}
+
+int HelpTopicGetFolderDirty(String text_folder, const HelpTopicInfoMap& diff)
+{
+	const HelpTopicInfoMap& map = HelpTopicMap();
+	static HelpTopicInfo empty;
+	int dirty = 0;
+	for(int i = 0; i < map.GetCount(); i++)
+	{
+		String drl = map.GetKey(i);
+		const HelpTopicInfo& topicinfo = map[i];
+		int old = diff.Find(drl);
+		const HelpTopicInfo& oldinfo = (old >= 0 ? diff[old] : empty);
+		if(topicinfo == oldinfo)
+			continue;
+		String space, nesting, topic;
+		HelpParseDPP(drl, space, nesting, topic);
+		if(nesting == "sys")
+			continue;
+		String folder = GetTextFolder(nesting, topicinfo.decl_module, topicinfo.text_folder);
+		if(folder == text_folder)
+			dirty++;
+	}
+	return dirty;
+}
+
+Vector<int> HelpTopicEnumLang()
+{
+	Index<int> lngmap;
+	const HelpTopicInfoMap& map = HelpTopicMap();
+	for(int i = 0; i < map.GetCount(); i++)
+	{
+		const HelpTopicInfo& topic = map[i];
+		for(int l = 0; l < topic.language.GetCount(); l++)
+			lngmap.FindAdd(topic.language[l]);
+	}
+	Vector<int> lng = lngmap.PickKeys();
+	Sort(lng);
+	return lng;
+}
+
+Vector<String> HelpTopicList(String chksp, String chkne)
+{
+	Vector<String> out;
+	const HelpTopicInfoMap& map = HelpTopicMap();
+	if(IsNull(chksp) && IsNull(chkne))
+		out <<= map.GetKeys();
+	else
+	{
+		for(int i = 0; i < map.GetCount(); i++)
+		{
+			String space, nesting, topic;
+			HelpParseDPP(map.GetKey(i), space, nesting, topic);
+			if((IsNull(chksp) || chksp == Nvl(space, "::")) && (IsNull(chkne) || chkne == Nvl(nesting, "::")))
+				out.Add(map.GetKey(i));
+		}
+	}
+	Sort(out, GetLanguageInfo());
+	return out;
+}
+
+Vector<String> HelpTopicListTextFolder(String text_folder)
+{
+	Vector<String> drls;
+	const HelpTopicInfoMap& map = HelpTopicMap();
+	for(int t = 0; t < map.GetCount(); t++)
+	{
+		const HelpTopicInfo& topicinfo = map[t];
+		String drl = map.GetKey(t);
+		String space, nesting, topic;
+		HelpParseDPP(drl, space, nesting, topic);
+		String outdir = GetTextFolder(nesting, topicinfo.decl_module, topicinfo.text_folder);
+		if(text_folder.IsVoid() || !ComparePath(outdir, text_folder))
+			drls.Add(drl);
+	}
+	return drls;
+}
+
+String HelpTopicSave(Vector<String>& saved_files, String text_folder, HelpTopicInfoMap& diff, String out_folder, bool skip_file_write)
+{
+	Vector<String> drls = HelpTopicListTextFolder(IsNull(out_folder) ? text_folder : String::GetVoid());
+	Index<String> used_names;
+	HelpTopicInfoMap& map = HelpTopicMap();
+	String out;
+	bool first = true;
+	String dir_dph;
+	for(int t = 0; t < drls.GetCount(); t++) {
+		String drl = drls[t];
+		const HelpTopicInfo& topicinfo = HelpTopicGet(drl);
+		String space, nesting, topic;
+		HelpParseDPP(drl, space, nesting, topic);
+		String outdir = AppendFileName(Nvl(out_folder, text_folder), "doc.dpp");
+		String title = HelpTopicTextModuleTitle(space, nesting, topic, used_names);
+		for(int l = 0; l < topicinfo.language.GetCount(); l++)
+			if(!IsNull(topicinfo.title[l]) || !IsNull(topicinfo.text[l])) {
+				String file;
+				file << title << '_' << LNGAsTextShort(topicinfo.language[l]) << ".dpx";
+				String path = AppendFileName(outdir, file);
+				dir_dph << "#include \"" << path << "\"\n";
+				if(!skip_file_write) {
+					String lng = LNGAsText(topicinfo.language[l]);
+					String out;
+					out << "HELP_TOPIC(" << AsCString(space)
+						<< ", " << AsCString(nesting)
+						<< ", " << AsCString(topic)
+						<< ", " << AsCString(lng)
+						<< ", " << AsCString(topicinfo.title[l]) << ")\n";
+					String text = topicinfo.text[l];
+					String ctext;
+					const char *p = text;
+					while(*p) {
+						const char *b = p;
+						enum { CHUNK = 100 };
+						while(*p && *p++ != '\n' && p - b < CHUNK)
+							;
+						if(!IsNull(ctext))
+							ctext << "\n\t";
+						ctext << AsCString(String(b, p));
+						if(ctext.GetLength() >= 5000)
+						{
+							out << "HELP_TEXT(\n\t" << ctext << ")\n";
+							ctext = Null;
+						}
+					}
+					if(!IsNull(ctext))
+						out << "\tHELP_TEXT(\n\t" << ctext << ")\n";
+					out << "HELP_END\n";
+					if(first) {
+						first = false;
+						RealizePath(path);
+					}
+					if(!IsSameTextFile(LoadFile(path), out)) {
+						if(!SaveFileBackup(path, out))
+							throw Exc(NFormat("Nelze ulo�it soubor '%s'.", path));
+						saved_files.Add(path);
+					}
+				}
+				diff.GetAdd(drl) <<= topicinfo;
+			}
+	}
+	return dir_dph;
+}
+
+void HelpTopicLoad(String text_module, String data, Index<String> *topics_loaded)
+{
+	const int *x = GetAllLanguages();
+	Vector<int> llist;
+	while(*x)
+		llist.Add(*x++);
+	Index<String> lnames;
+	while(lnames.GetCount() < llist.GetCount())
+		lnames.Add(GetLangIdent(llist[lnames.GetCount()]));
+	int language = 0;
+	CParser parser(data);
+	while(!parser.IsEof()) {
+		parser.Spaces();
+		if(parser.IsId()) {
+			String id = parser.ReadId();
+			enum { DECL_NONE, DECL_HTB, DECL_HT, DECL_I } decl = DECL_NONE;
+			if(id == "HELP_TOPIC_BEGIN")
+				decl = DECL_HTB;
+			else if(id == "HELP_TOPIC")
+				decl = DECL_HT;
+			else if(id == "ITEM")
+				decl = DECL_I;
+			if(decl != DECL_NONE) {
+				parser.PassChar('(');
+				String space = "AppDoc", nesting, topic;
+				if(decl != DECL_HTB) {
+					space = parser.ReadOneString();
+					parser.PassChar(',');
+					nesting = parser.ReadOneString();
+					parser.PassChar(',');
+				}
+				topic = parser.ReadOneString();
+				parser.PassChar(',');
+				if(decl == DECL_HTB) {
+					String langid = parser.ReadId();
+					int lx = lnames.Find(langid);
+					if(lx < 0)
+						parser.ThrowError(NFormat("invalid language code: %d", language));
+					language = llist[lx];
+				}
+				else {
+					String lang = parser.ReadOneString();
+					language = LNGFromText(lang);
+				}
+				String title;
+				if(decl != DECL_I) {
+					parser.PassChar(',');
+					title = parser.ReadOneString();
+				}
+				parser.PassChar(')');
+				parser.Id("EXTERNAL");
+				String text;
+				while(parser.IsId() && ((id = parser.ReadId()) == "HELP_TOPIC_TEXT" || id == "HELP_TEXT" || id == "TEXT")) {
+					parser.PassChar('(');
+					text.Cat(parser.ReadString());
+					parser.PassChar(')');
+				}
+				if(id == "HELP_TOPIC_END") {
+					parser.PassChar('(');
+					parser.PassChar(')');
+				}
+				else if(id == "END_ITEM" || id == "HELP_END")
+					;
+				else
+					parser.ThrowError(NFormat("HELP_TOPIC_END/END_ITEM expected, found: %s", StringSample(parser.GetPtr(), 10)));
+				String drl = HelpFormatDPP(space, nesting, topic);
+				HelpTopicSet(drl, text_module, language, title, text);
+				if(topics_loaded)
+					topics_loaded->FindAdd(drl);
+			}
+			else
+				parser.ThrowError(NFormat("HELP_TOPIC_BEGIN/HELP_TOPIC/ITEM expected, found: %s", id));
+		}
+		else
+			parser.ThrowError(NFormat("identifier expected, found: %s", StringSample(parser.GetPtr(), 20)));
+	}
+}
+
+GLOBAL_VAR(Vector<HelpAutoIndexProc>, HelpAutoIndexMap)
+
+void RegisterHelpAutoIndex(HelpAutoIndexProc haip)
+{
+	HelpAutoIndexMap().Add(haip);
+}
+
+typedef Segtor<void (*)(), 256> HelpInitList;
+GLOBAL_VAR(HelpInitList, GetHelpInitList)
+
+HelpInit::HelpInit(void (*fn)())
+{
+	GetHelpInitList().Add(fn);
+}
+
+void HelpInit::Run()
+{
+	HelpInitList& m = GetHelpInitList();
+	for(int i = 0; i < m.GetCount(); i++)
+		m[i]();
+	m.Clear();
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/TCore/help.h b/uppsrc/TCore/help.h
new file mode 100644
index 000000000..688d86664
--- /dev/null
+++ b/uppsrc/TCore/help.h
@@ -0,0 +1,139 @@
+NAMESPACE_UPP
+
+class HelpInit
+{
+public:
+	HelpInit(void (*fn)());
+	static void Run();
+};
+
+#define HELPINITBLOCK \
+static void MK__s(); \
+static HelpInit COMBINE(MK__s, _init)(&MK__s); \
+static void MK__s()
+
+String               GetLangIdent(int language);
+byte                 GetLangStdCharset(int language);
+
+class HelpTopicInfoDeep
+{
+public:
+	HelpTopicInfoDeep() : added(false), recursed(false) {}
+
+	String             decl_module;
+	String             text_folder;
+
+	Callback1<String&> titlefunc;
+	Callback1<String&> textfunc;
+
+	bool               added;
+	mutable bool       recursed;
+};
+
+class HelpTopicInfo : public HelpTopicInfoDeep, MoveableAndDeepCopyOption<HelpTopicInfo>
+{
+public:
+	HelpTopicInfo() {}
+	HelpTopicInfo(const HelpTopicInfo& h, int deep)
+		: HelpTopicInfoDeep(h), language(h.language, deep)
+		, title(h.title, deep), text(h.text, deep), module(h.module, deep) {}
+
+	void               Set(int language, String title, String text, String text_module = Null);
+	String             GetTitle(int language) const;
+	String             GetText(int language) const;
+	String             GetTitle() const;
+	String             GetText() const;
+	String             GetDefaultTitle() const;
+	String             GetDefaultText() const;
+
+	Index<int>         language;
+	Vector<String>     title;
+	Vector<String>     text;
+	Vector<String>     module;
+};
+
+bool        operator == (const HelpTopicInfo& a, const HelpTopicInfo& b);
+inline bool operator != (const HelpTopicInfo& a, const HelpTopicInfo& b) { return !(a == b); }
+
+typedef ArrayMap<String, HelpTopicInfo> HelpTopicInfoMap;
+
+HelpTopicInfoMap&    HelpTopicMap();
+void                 HelpTopicAdd(const char *drl, const char *decl_module, Callback1<String&> titlefunc, Callback1<String&> textfunc);
+Vector<String>       HelpTopicEnumSpace();
+Vector<String>       HelpTopicEnumNesting(String space = Null);
+Vector<String>       HelpTopicEnumDeclModules();
+String               HelpTopicTextModule(String decl_module, String drl, int language);
+Vector<String>       HelpTopicEnumTextFolders();
+int                  HelpTopicGetFolderDirty(String text_folder, const HelpTopicInfoMap& diff);
+Vector<int>          HelpTopicEnumLang();
+Vector<String>       HelpTopicList(String space = Null, String nesting = Null);
+Vector<String>       HelpTopicListTextFolder(String text_folder);
+String               HelpTopicSave(Vector<String>& saved_files, String text_folder, HelpTopicInfoMap& diff, String out_folder, bool skip_file_write = false);
+void                 HelpTopicLoad(String text_module, String data, Index<String> *topics_loaded = NULL);
+void                 HelpTopicSet(const char *drl, const char *text_module, int language, const char *title, String text);
+void                 HelpTopicSet(const char *space, const char *nesting, const char *topic, const char *text_module, int language, const char *title, String text);
+void                 HelpTopicSet(const char *space, const char *nesting, const char *topic, const char *text_module, const char *language, const char *title, String text);
+const HelpTopicInfo& HelpTopicGet(String drl);
+int                  HelpTopicGetSeq();
+void                 HelpTopicTouchSeq();
+String               HelpTopicHostDir();
+void                 HelpTopicSetHostDir(const char *dir);
+
+String               HelpFormatDPP(const char *space, const char *nesting, const char *topic);
+bool                 HelpParseDPP(const char *path, String& space, String& nesting, String& topic);
+
+inline String        HelpAppDPP(const char *topic)    { return HelpFormatDPP("AppDoc", "", topic); }
+inline String        HelpHostDPP(const char *topic)   { return HelpFormatDPP("AppDoc", "host", topic); }
+
+typedef void (*HelpAutoIndexProc)(Index<WString>& entries, Vector<String>& drls);
+
+Vector<HelpAutoIndexProc>&       HelpAutoIndexMap();
+void                             RegisterHelpAutoIndex(HelpAutoIndexProc haip);
+
+#define RegisterHelpTopicRawInfoTag(tag, drl, dclmod, tfn, xfn) \
+	static void COMBINE(HelpTopicInfo, tag)() { HelpTopicAdd(drl, dclmod, tfn, xfn); } \
+	static HelpInit COMBINE(HelpTopicInfoCallinit, tag)(&COMBINE(HelpTopicInfo, tag));
+
+#define RegisterHelpTopicInfoTag(tag, top, dclmod, tfn, xfn) \
+	RegisterHelpTopicRawInfoTag(tag, "dpp://AppDoc//:://" top, dclmod, tfn, xfn)
+
+#define RegisterHelpTopicInfo(top, dclmod, tfn, xfn) \
+	RegisterHelpTopicInfoTag(MK__s, top, dclmod, tfn, xfn)
+
+#define RegisterHelpTopicInfoTitleTag(tag, top, dclmod, tit, xfn) \
+	static void COMBINE(HelpTopicInfoTitle, tag)(String& out) { out.Cat(tit); } \
+	RegisterHelpTopicInfoTag(tag, top, dclmod, callback(&COMBINE(HelpTopicInfoTitle, tag)), xfn)
+
+#define RegisterHelpTopicInfoTitle(top, dclmod, tit, xfn) \
+	RegisterHelpTopicInfoTitleTag(MK__s, top, dclmod, tit, xfn)
+
+#define RegisterHelpTopic(top) RegisterHelpTopicInfo(top, __FILE__, CNULL, CNULL)
+
+#define RegisterHelpTopicTitle(top, tit) RegisterHelpTopicInfoTitle(top, __FILE__, tit, CNULL)
+
+#define RegisterHelpTopicObjectTitle(cls, title) \
+static void COMBINE(cls, HelpTitleProc)(String& out) { out.Cat(title); } \
+inline String COMBINE(cls, HelpTitle)() { String temp; COMBINE(cls, HelpTitleProc)(temp); return temp; } \
+RegisterHelpTopicInfo(ASSTRING(cls), __FILE__, callback(&COMBINE(cls, HelpTitleProc)), CNULL)
+
+#define RegisterHelpTopicHost(top, tit, gen) \
+	static void COMBINE(HelpTopicInfoTitle, MK__s)(String& out) { out.Cat(tit); } \
+	RegisterHelpTopicRawInfoTag(MK__s, "dpp://AppDoc//host//" top, __FILE__, callback(&COMBINE(HelpTopicInfoTitle, MK__s)), gen)
+
+#define RegisterHelpTopicSys(top, tit, gen) \
+	static void COMBINE(HelpTopicInfoTitle, MK__s)(String& out) { out.Cat(tit); } \
+	RegisterHelpTopicRawInfoTag(MK__s, "dpp://AppDoc//sys//" top, __FILE__, callback(&COMBINE(HelpTopicInfoTitle, MK__s)), gen)
+
+#define HELP_TOPIC_BEGIN(topic_id, language, title) \
+	HelpTopicSet("dpp://AppDoc//:://" topic_id, __FILE__, language, title, String().Cat()
+
+#define HELP_TOPIC(namespace_id, nesting_id, topic_id, language, title) \
+	HelpTopicSet(namespace_id, nesting_id, topic_id, __FILE__, language, title, String().Cat()
+
+#define HELP_TOPIC_TEXT(text) << text
+#define HELP_TOPIC_END() );
+
+#define HELP_TEXT(text) << text
+#define HELP_END );
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/TCore/hxx.h b/uppsrc/TCore/hxx.h
new file mode 100644
index 000000000..14e6232ba
--- /dev/null
+++ b/uppsrc/TCore/hxx.h
@@ -0,0 +1,6 @@
+
+#include HLPFILE
+
+#undef HELP_TOPIC_BEGIN
+#undef HELP_TOPIC_TEXT
+#undef HELP_TOPIC_END
\ No newline at end of file
diff --git a/uppsrc/TCore/iw.ico b/uppsrc/TCore/iw.ico
new file mode 100644
index 000000000..32cb407ef
Binary files /dev/null and b/uppsrc/TCore/iw.ico differ
diff --git a/uppsrc/TCore/new_fmt.hpp b/uppsrc/TCore/new_fmt.hpp
new file mode 100644
index 000000000..39ffff576
--- /dev/null
+++ b/uppsrc/TCore/new_fmt.hpp
@@ -0,0 +1,280 @@
+/*
+template class Moveable<void (*)(FormatInfo&)>;
+typedef VectorMap<String, void (*)(FormatInfo&)> FormatProcMap;
+GLOBAL_VAR(FormatProcMap, GetFormatProcMap)
+
+void FormatInfo::Register(const char *ident, void (*proc)(FormatInfo&))
+{
+	GetFormatProcMap().Add(ident, proc);
+}
+
+//////////////////////////////////////////////////////////////////////
+
+void FormatInfo::Format(String id)
+{
+	const FormatProcMap& map = GetFormatProcMap();
+	const char *fmt = format;
+	for(int i = map.FindLast(ident = id); i >= 0; i = map.FindPrev(i))
+	{
+		map[i](*this);
+		if(format)
+			return;
+		format = fmt;
+	}
+	output << "Unknown format {" << ident << "}";
+}
+
+//////////////////////////////////////////////////////////////////////
+
+#define E__SetArg(I) args.Add(COMBINE(p, I))
+
+#define E__NewFormatBody(I) \
+String NewFormat(const char *fmt, __List##I(E__Value)) \
+{ \
+	Vector<Value> args; \
+	args.Reserve(I); \
+	__List##I(E__SetArg); \
+	return NewFormat(fmt, args); \
+}
+
+__Expand(E__NewFormatBody)
+
+//////////////////////////////////////////////////////////////////////
+
+String NewFormat(const char *fmt, const Vector<Value>& args)
+{
+	String output;
+	FormatInfo info(args);
+	for(;;)
+	{
+		const char *b = fmt;
+		while(*fmt && *fmt != '{')
+			fmt++;
+		output.Cat(b, fmt - b);
+		if(*fmt == 0)
+			return output;
+		if(fmt[1] == '{')
+		{
+			output.Cat('{');
+			fmt += 2;
+			continue;
+		}
+		b = ++fmt;
+		while(IsDigit(*fmt))
+			fmt++;
+		if(fmt != b && *fmt == ',')
+		{
+			info.argpos = stou(b) - 1;
+			fmt++;
+		}
+		else
+			fmt = b;
+		b = fmt;
+		while(IsAlNum(*fmt) || *fmt == '_')
+			fmt++;
+		String ident(b, fmt);
+		int lpad = 0;
+		bool cpad = false;
+		int rpad = 0;
+		if(*fmt == '<')
+		{
+			lpad = stou(fmt + 1, &fmt);
+			if(*fmt == '>')
+			{
+				cpad = true;
+				fmt++;
+			}
+		}
+		else if(*fmt == '>')
+			rpad = stou(fmt + 1, &fmt);
+		String nvl;
+		if(*fmt == '!')
+			while(*++fmt && *fmt != ':')
+				nvl.Cat(*fmt == '`' && fmt[1] ? *++fmt : *fmt);
+		if(*fmt == ':')
+			fmt++;
+		info.format = b = fmt;
+		if(info.argpos < 0 || info.argpos >= args.GetCount())
+			output << "Invalid argument position {" << (info.argpos + 1) << ",}: "
+				<< args.GetCount() << " arguments available";
+		else
+		{
+			info.Format(ident);
+			if(IsNull(info.output))
+				info.output = nvl;
+			int pad;
+			if((pad = lpad -info.output.GetLength()) > 0)
+			{
+				output.Cat(' ', cpad ? pad >> 1 : pad);
+				output.Cat(info.output);
+				output.Cat(' ', cpad ? (pad + 1) >> 1 : 0);
+			}
+			else if((pad = rpad > info.output.GetLength()) > 0)
+			{
+				output.Cat(info.output);
+				output.Cat(' ', pad);
+			}
+			else
+				output.Cat(info.output);
+		}
+		b = fmt = info.format;
+		while(*fmt && *fmt != '}')
+			fmt++;
+		if(*fmt == '}')
+			fmt++;
+		else
+		{
+			output.Cat("'}' expected, found: ");
+			output.Cat(b, min<int>(fmt - b, 20));
+			fmt = b;
+		}
+	}
+}
+
+//////////////////////////////////////////////////////////////////////
+
+static void FormatProcInt(FormatInfo& fi)
+{
+	Value v = fi.args[fi.argpos++];
+	if(!IsNull(v) && !IsNumber(v))
+	{
+		fi.output << "{i} expects a numeric argument, found: " << StdFormat(v);
+		return;
+	}
+	bool always_sign = false;
+	if(*fi.format == '+')
+	{
+		fi.format++;
+		always_sign = true;
+	}
+	int pad = 0;
+	if(IsDigit(*fi.format))
+		pad = stou(fi.format, &fi.format);
+	char f = *fi.ident;
+	String text;
+	if(f == 'x' || f == 'X')
+	{
+		text = FormatIntHex(v, pad, '0');
+		if(f == 'X')
+			text = ToUpper(text);
+	}
+	else if(f == 'o')
+		text = FormatIntOct(v, pad, '0');
+	else
+		text = FormatIntDec(v, pad, '0', always_sign);
+	fi.output.Cat(text);
+}
+
+//////////////////////////////////////////////////////////////////////
+
+static void FormatProcDouble(FormatInfo& fi)
+{
+	Value v = fi.args[fi.argpos++];
+	if(!IsNull(v) && !IsNumber(v))
+	{
+		fi.output << "{f} expects a numeric argument, found: " << StdFormat(v);
+		return;
+	}
+	char fmt = *fi.ident;
+	int flags = (fmt == 'r' ? FD_REL : 0);
+	if(*fi.format == '+')
+	{
+		fi.format++;
+		flags |= FD_SIGN;
+	}
+	bool all_digits = (*++fi.format == '0' && IsDigit(fi.format[1]));
+	if(all_digits)
+		fi.format++;
+	int digits = 0;
+	if(IsDigit(*fi.format))
+		digits = stou(fi.format, &fi.format);
+	if(all_digits)
+		digits = -digits;
+	if(*fi.format == 'r')
+	{
+		fi.format++;
+		flags |= FD_REL;
+	}
+	int pad_exp = 0;
+	if(*fi.format == 'e' || *fi.format == 'E')
+	{
+		if(*fi.format++ == 'E')
+			flags |= FD_CAP_E;
+		if(*++fi.format == '+')
+		{
+			fi.format++;
+			flags |= FD_SIGN_EXP;
+		}
+		if(IsDigit(*fi.format))
+			pad_exp = stou(fi.format, &fi.format);
+	}
+	String val;
+	if(fmt == 'e')
+		fi.output = FormatDoubleExp(v, digits, flags, pad_exp);
+	else if(fmt == 'f')
+		fi.output = FormatDoubleFix(v, digits, flags);
+	else
+		fi.output = FormatDouble(v, digits, flags, pad_exp);
+}
+
+//////////////////////////////////////////////////////////////////////
+
+static void FormatProcTime(FormatInfo& fi)
+{
+	Value v = fi.args[fi.argpos++];
+	if(!IsNull(v) && !IsDateTime(v))
+	{
+		fi.output << "{f} expects a date/time argument, found: " << StdFormat(v);
+		return;
+	}
+	fi.output = FormatTime(v, fi.format);
+}
+
+//////////////////////////////////////////////////////////////////////
+
+static void FormatProcString(FormatInfo& fi)
+{
+	Value v = fi.args[fi.argpos++];
+	fi.output = StdFormat(v);
+}
+
+//////////////////////////////////////////////////////////////////////
+
+static void FormatProcStd(FormatInfo& fi)
+{
+	Value v = fi.args[fi.argpos];
+	if(IsNull(v))
+	{
+		fi.argpos++;
+		return;
+	}
+	if(IsNumber(v))
+		FormatProcDouble(fi);
+	else if(IsDateTime(v))
+		FormatProcTime(fi);
+	else
+		FormatProcString(fi);
+}
+
+//////////////////////////////////////////////////////////////////////
+
+// General syntax:
+// '{' [<index> ','][<command>]['<' <lpad> | '<' <cpad> '>' | '>' <rpad>]['!'<nvl>][':'<spec.args>]'}'
+
+INITBLOCK
+{
+	FormatInfo::Register(NULL, &FormatProcStd);   // {}
+	FormatInfo::Register("i", &FormatProcInt);    // {i:+<width>}
+	FormatInfo::Register("x", &FormatProcInt);    // {x:+<width>}
+	FormatInfo::Register("X", &FormatProcInt);    // {X:+<width>}
+	FormatInfo::Register("o", &FormatProcInt);    // {o:+<width>}
+	FormatInfo::Register("e", &FormatProcDouble); // {e:+0<dig>reE+<epad>}
+	FormatInfo::Register("f", &FormatProcDouble); // {f:+0<dig>reE+<epad>}
+	FormatInfo::Register("g", &FormatProcDouble); // {g:+0<dig>reE+<epad>}
+	FormatInfo::Register("r", &FormatProcDouble); // {r:+0<dig>reE+<epad>}
+	FormatInfo::Register("s", &FormatProcString); // {s:<nvl>}
+	FormatInfo::Register("t", &FormatProcTime);
+}
+*/
+
+//////////////////////////////////////////////////////////////////////
diff --git a/uppsrc/TCore/new_lang.hpp b/uppsrc/TCore/new_lang.hpp
new file mode 100644
index 000000000..7faa628e3
--- /dev/null
+++ b/uppsrc/TCore/new_lang.hpp
@@ -0,0 +1,206 @@
+/*
+String FormatTime(Time time, const char *f, int language)
+{
+	if(IsNull(time))
+		return Null;
+	String out;
+	const LanguageInfo& lang = GetLanguageInfo(language);
+	for(char c; c = *f++;)
+		switch(c)
+		{
+		case '`':
+			if(*f)
+				out.Cat(*f++);
+			break;
+
+		case 'H':
+			if(*f == 'H')
+				f++;
+			if(*f == '2' && f[1] == '4')
+				f += 2, out << (int)time.hour;
+			else
+			{
+				if(*f == '1' && f[1] == '2')
+					f += 2;
+				out << ((time.hour + 11) % 12 + 1);
+			}
+			break;
+
+		case 'D':
+			if(*f == 'D')
+			{
+				if(*++f == 'D')
+					f++, out << (int)(Date(time) - Date(time.year, 1, 1) + 1);
+				else
+					out << (int)time.day;
+			}
+			else if(*f == 'A' && f[1] == 'Y')
+				f += 2, out << lang.day_names[DayOfWeek(time)];
+			else if(*f == 'Y')
+				f++, out << lang.short_day_names[DayOfWeek(time)];
+			else
+				out << (DayOfWeek(time) + 1);
+			break;
+
+		case 'M':
+			if(*f == 'I')
+				f++, out << (int)time.minute;
+			else if(*f == 'O' && f[1] == 'N')
+			{
+				f += 3;
+				if(*f == 'T' && f[1] == 'H')
+					f += 2, out << lang.month_names[time.month - 1];
+				else
+					out << lang.short_month_names[time.month - 1];
+			}
+			else if(*f == 'M')
+				f++, out << FormatIntDec(time.month, 2, '0');
+			else
+				out << (int)time.month;
+			break;
+
+		case 'Y':
+			out << tabs<int>(time.year);
+			break;
+
+		case 'S':
+			if(*f == 'S')
+			{
+				f++;
+				if(*f == 'S' && f[1] == 'S' && f[2] == 'S')
+					f += 3, out << (int)(time.second + 60 * time.minute + 3600 * time.hour);
+				else
+					out << (int)time.second;
+			}
+			else if(time.year < 0)
+				out << '-';
+			break;
+
+		default:
+			out.Cat(c);
+		}
+	return out;
+}
+*/
+
+//////////////////////////////////////////////////////////////////////
+
+/*
+String FormatDate(Date date, const char *format, int language)
+{
+	return FormatTime(ToTime(date), format, language);
+}
+*/
+
+//////////////////////////////////////////////////////////////////////
+
+/*
+Time ScanTime(const char *text, const char **endptr, const char *f, int language, Time out)
+{
+	return Null;
+	if(!f)
+	{
+		if(endptr)
+			*endptr = text;
+		return out;
+	}
+	const LanguageInfo& lang = GetLanguageInfo(language);
+	for(char c; c = *f++;)
+		switch(c)
+		{
+		case '`':
+			if(*f && *text != *f++)
+			{
+				if(endptr)
+					*endptr = text;
+				return Null;
+			}
+			break;
+
+		case 'H':
+			if(*f == 'H')
+				f++;
+			if(*f == '2' && f[1] == '4' || *f == '1' && f[1] == '2')
+				f += 2;
+			if(!IsDigit(*text))
+			{
+				if(endptr)
+					*endptr = text;
+				return Null;
+			}
+			out.hour = stou(text, &text);
+			if(out.hour > 23)
+			{
+				if(endptr)
+					*endptr = text;
+				return Null;
+			}
+			break;
+
+		case 'D':
+			if(*f == 'D')
+			{
+				if(*++f == 'D')
+					f++, out << (int)(Date(time) - Date(time.year, 1, 1) + 1);
+				else
+					out << (int)time.day;
+			}
+			else if(*f == 'A' && f[1] == 'Y')
+				f += 2, out << lang.day_names[DayOfWeek(time)];
+			else if(*f == 'Y')
+				f++, out << lang.short_day_names[DayOfWeek(time)];
+			else
+				out << (DayOfWeek(time) + 1);
+			break;
+
+		case 'M':
+			if(*f == 'I')
+				f++, out << (int)time.minute;
+			else if(*f == 'O' && f[1] == 'N')
+			{
+				f += 3;
+				if(*f == 'T' && f[1] == 'H')
+					f += 2, out << lang.month_names[time.month - 1];
+				else
+					out << lang.short_month_names[time.month - 1];
+			}
+			else if(*f == 'M')
+				f++, out << FormatIntDec(time.month, 2, '0');
+			else
+				out << (int)time.month;
+			break;
+
+		case 'Y':
+			out << tabs<int>(time.year);
+			break;
+
+		case 'S':
+			if(*f == 'S')
+			{
+				f++;
+				if(*f == 'S' && f[1] == 'S' && f[2] == 'S')
+					f += 3, out << (int)(time.second + 60 * time.minute + 3600 * time.hour);
+				else
+					out << (int)time.second;
+			}
+			else if(time.year < 0)
+				out << '-';
+			break;
+
+		default:
+			out.Cat(c);
+		}
+	if(endptr)
+		*endptr = text;
+	return out;
+}
+*/
+
+//////////////////////////////////////////////////////////////////////
+
+/*
+Date ScanDate(const char *text, const char **endptr, const char *format, int language, Date base_date)
+{
+	return ScanTime(text, endptr, format, language, ToTime(base_date));
+}
+*/
diff --git a/uppsrc/TCore/nls_bw.h b/uppsrc/TCore/nls_bw.h
new file mode 100644
index 000000000..76840750e
--- /dev/null
+++ b/uppsrc/TCore/nls_bw.h
@@ -0,0 +1,93 @@
+NAMESPACE_UPP
+
+extern int         NlsDefaultCodePage;
+
+enum { CP_1250 = 100, CP_LATIN2 = 101 };
+
+const String&      NlsLatin2To1250();
+const String&      NlsMJKTo1250();
+const String&      NlsMacTo1250();
+
+extern const byte *NlsUpper     (byte charset = 0);
+extern const byte *NlsLower     (byte charset = 0);
+extern const byte *NlsAscii     (byte charset = 0);
+extern const byte *NlsUpperAscii(byte charset = 0);
+extern const byte *NlsLowerAscii(byte charset = 0);
+extern const bool *NlsLetter    (byte charset = 0);
+
+inline byte        NlsToUpper     (byte c, byte charset = 0) { return NlsUpper(charset)[c]; }
+inline byte        NlsToLower     (byte c, byte charset = 0) { return NlsLower(charset)[c]; }
+inline byte        NlsToAscii     (byte c, byte charset = 0) { return NlsAscii(charset)[c]; }
+inline byte        NlsToUpperAscii(byte c, byte charset = 0) { return NlsUpperAscii(charset)[c]; }
+inline byte        NlsToLowerAscii(byte c, byte charset = 0) { return NlsLowerAscii(charset)[c]; }
+
+inline bool        NlsIsUpper     (byte c, byte charset = 0) { return NlsUpper(charset)[c] == c; }
+inline bool        NlsIsLower     (byte c, byte charset = 0) { return NlsLower(charset)[c] == c; }
+inline bool        NlsIsLetter    (byte c, byte charset = 0) { return NlsLetter(charset)[c]; }
+
+int                NlsCompare(const char *s1, const char *s2, int language = 0, byte charset = 0);
+int                NlsNumCompare(const char *s1, const char *s2, int language = 0, byte charset = 0);
+int                NlsCompare(const wchar *s1, const wchar *s2, int language = 0);
+int                NlsNumCompare(const wchar *s1, const wchar *s2, int language = 0);
+
+String             NlsMakeAscii(const char *s, byte charset = 0, int count = -1);
+inline String      NlsMakeAscii(const String& s, byte charset = 0)        { return NlsMakeAscii(s, charset, s.GetLength()); }
+String             NlsMakeUpper(const char *s, byte charset = 0, int count = -1);
+inline String      NlsMakeUpper(const String& s, byte charset = 0)        { return NlsMakeUpper(s, charset, s.GetLength()); }
+String             NlsMakeLower(const char *s, byte charset = 0, int count = -1);
+inline String      NlsMakeLower(const String& s, byte charset = 0)        { return NlsMakeLower(s, charset, s.GetLength()); }
+String             NlsMakeUpperAscii(const char *s, byte charset = 0, int count = -1);
+inline String      NlsMakeUpperAscii(const String& s, byte charset = 0)   { return NlsMakeUpperAscii(s, charset, s.GetLength()); }
+String             NlsMakeLowerAscii(const char *s, byte charset = 0, int count = -1);
+inline String      NlsMakeLowerAscii(const String& s, byte charset = 0)   { return NlsMakeLowerAscii(s, charset, s.GetLength()); }
+bool               NlsContainsNational(const char *s, byte charset = 0, int count = -1);
+inline bool        NlsContainsNational(const String& s, byte charset = 0) { return NlsContainsNational(s, charset, s.GetLength()); }
+
+String             NlsGetIndexLetter(const char *s, int language = 0, byte charset = 0);
+WString            NlsGetIndexLetter(const wchar *s, int language = 0);
+
+//////////////////////////////////////////////////////////////////////
+
+struct NlsStringLess
+{
+	NlsStringLess(int language = 0, byte charset = 0) : language(language), charset(charset) {}
+	bool operator () (const char *a, const char *b) const { return NlsCompare(a, b, language, charset) < 0; }
+	bool operator () (const wchar *a, const wchar *b) const { return NlsCompare(a, b, language) < 0; }
+	int  language;
+	byte charset;
+};
+
+struct NlsNumStringLess
+{
+	NlsNumStringLess(int language = 0, byte charset = 0) : language(language), charset(charset) {}
+	bool operator () (const char *a, const char *b) const { return NlsNumCompare(a, b, language, charset) < 0; }
+	int  language;
+	byte charset;
+};
+
+//////////////////////////////////////////////////////////////////////
+
+class NlsLike
+{
+public:
+	NlsLike() {}
+	NlsLike(const char *templ, byte charset = 0) { Set(templ, charset); }
+
+	bool        Set(const char *templ, byte charset = 0); // returns always_true
+
+	operator    bool () const { return always_true; }
+
+	bool        Matches(const char *s) const;
+
+private:
+	bool        RawMatches(const char *s, const char *templ) const;
+
+private:
+	byte        charset;
+	bool        always_true;
+	bool        exclude_ch; // czech-specific (?)
+	const char *raw_templ;
+	const byte *cvt;
+};
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/TCore/nls_bw.hpp b/uppsrc/TCore/nls_bw.hpp
new file mode 100644
index 000000000..19a87315e
--- /dev/null
+++ b/uppsrc/TCore/nls_bw.hpp
@@ -0,0 +1,857 @@
+//////////////////////////////////////////////////////////////////////
+// nls: NLS routines.
+
+#if 0
+
+#include "TCore.h"
+
+//////////////////////////////////////////////////////////////////////
+// 1250 code page tables
+
+static const byte CsLatin2_1250[256] =
+{
+	0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F,
+	0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F,
+	0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F,
+	0x30,0x31,0x32,0x33,0x34,0x35,0x36,0x37,0x38,0x39,0x3A,0x3B,0x3C,0x3D,0x3E,0x3F,
+
+	0x40,0x41,0x42,0x43,0x44,0x45,0x46,0x47,0x48,0x49,0x4A,0x4B,0x4C,0x4D,0x4E,0x4F,
+	0x50,0x51,0x52,0x53,0x54,0x55,0x56,0x57,0x58,0x59,0x5A,0x5B,0x5C,0x5D,0x5E,0x5F,
+	0x60,0x61,0x62,0x63,0x64,0x65,0x66,0x67,0x68,0x69,0x6A,0x6B,0x6C,0x6D,0x6E,0x6F,
+	0x70,0x71,0x72,0x73,0x74,0x75,0x76,0x77,0x78,0x79,0x7A,0x7B,0x7C,0x7D,0x7E,0x7F,
+
+	0xC8,0xFC,0xE9,0x61,0xE4,0xF9,0x63,0x63,0x41,0x65,0x4F,0x6F,0x69,0x5A,0xC4,0x43,
+	0xC9,0xC5,0xC2,0xF4,0xF6,0xBC,0xBE,0x53,0x73,0xD6,0xDC,0x8D,0x9D,0x4C,0x78,0xE8,
+	0xE1,0xED,0xF3,0xFA,0x41,0x61,0x8E,0x9E,0x45,0x65,0x20,0x7A,0xC8,0x73,0xAB,0xBB,
+	0x5F,0x5F,0x5F,0xA6,0xA6,0xC1,0x41,0xCC,0x53,0xA6,0xA6,0x2B,0x2B,0x5A,0x7A,0x2B,
+
+	0x2B,0x2D,0x2D,0x2B,0x2D,0x2B,0x41,0x61,0x2B,0x2B,0x2D,0x2D,0xA6,0x2D,0x2B,0x2A,
+	0x64,0x44,0xCF,0x45,0xEF,0xD2,0xE5,0x49,0xEC,0x2B,0x2B,0x5F,0x5F,0xDE,0xD9,0x5F,
+	0xD3,0xDF,0xD4,0x4E,0x6E,0xF2,0x8A,0x9A,0xC0,0xDA,0xE0,0x55,0xFD,0xDD,0x74,0x60,
+	0x2D,0x22,0x2E,0x5E,0x7E,0xBA,0xF7,0xB8,0xB0,0xA8,0xB7,0x75,0xD8,0xF8,0x5F,0x20,
+
+/*
+	0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,
+	0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0x9A,0x9B,0x9C,0x9D,0x9E,0x9F,
+	0xA0,0xA5,0xA2,0xA3,0xA4,0xBC,0x8C,0xA7,0xA8,0x8A,0xAA,0x8D,0x8F,0xAD,0x8E,0xAF,
+	0xB0,0xB9,0xB2,0xB3,0xB4,0xBE,0x9C,0xA1,0xB8,0x9A,0xBA,0x9D,0x9F,0xBD,0x9E,0xBF,
+
+	0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,
+	0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF,
+	0xE0,0xE1,0xE2,0xE3,0xE4,0xE5,0xE6,0xE7,0xE8,0xE9,0xEA,0xEB,0xEC,0xED,0xEE,0xEF,
+	0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xB7,
+*/
+};
+
+const String& NlsLatin2To1250()
+{
+	static String cp(CsLatin2_1250 + 128, 128);
+	return cp;
+}
+
+//////////////////////////////////////////////////////////////////////
+
+static const byte CsMJK_1250[256] =
+{
+	0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F,
+	0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F,
+	0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F,
+	0x30,0x31,0x32,0x33,0x34,0x35,0x36,0x37,0x38,0x39,0x3A,0x3B,0x3C,0x3D,0x3E,0x3F,
+
+	0x40,0x41,0x42,0x43,0x44,0x45,0x46,0x47,0x48,0x49,0x4A,0x4B,0x4C,0x4D,0x4E,0x4F,
+	0x50,0x51,0x52,0x53,0x54,0x55,0x56,0x57,0x58,0x59,0x5A,0x5B,0x5C,0x5D,0x5E,0x5F,
+	0x60,0x61,0x62,0x63,0x64,0x65,0x66,0x67,0x68,0x69,0x6A,0x6B,0x6C,0x6D,0x6E,0x6F,
+	0x70,0x71,0x72,0x73,0x74,0x75,0x76,0x77,0x78,0x79,0x7A,0x7B,0x7C,0x7D,0x7E,0x7F,
+
+	0xC8,0xFC,0xE9,0xEF,0xE4,0xCF,0x8D,0xE8,0xEC,0xCC,0xC5,0xCD,0xBE,0xE5,0xC4,0xC1,
+	0xC9,0x9E,0x8E,0xF4,0xF6,0xD3,0xF9,0xDA,0xFD,0xD6,0xDC,0x8A,0xBC,0xDD,0xD8,0x9D,
+	0xE1,0xED,0xF3,0xFA,0xF2,0xD2,0xD9,0xD4,0x9A,0xF8,0xE0,0xC0,0xAC,0xA7,0xBB,0xAB,
+	0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF,
+
+	0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,
+	0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF,
+	0xE0,0xE1,0xE2,0xE3,0xE4,0xE5,0xB5,0xE7,0xE8,0xE9,0xEA,0xEB,0xEC,0xED,0xEE,0xEF,
+	0xF0,0xB1,0xF2,0xF3,0xF4,0xF5,0xF7,0xF7,0xB0,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF,
+};
+
+const String& NlsMJKTo1250()
+{
+	static String cp(CsMJK_1250 + 128, 128);
+	return cp;
+}
+
+//////////////////////////////////////////////////////////////////////
+
+static const byte CsMac1250[256] =
+{
+	0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f,
+	0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1a,0x1b,0x1c,0x1d,0x1e,0x1f,
+	0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2a,0x2b,0x2c,0x2d,0x2e,0x2f,
+	0x30,0x31,0x32,0x33,0x34,0x35,0x36,0x37,0x38,0x39,0x3a,0x3b,0x3c,0x3d,0x3e,0x3f,
+
+	0x40,0x41,0x42,0x43,0x44,0x45,0x46,0x47,0x48,0x49,0x4a,0x4b,0x4c,0x4d,0x4e,0x4f,
+	0x50,0x51,0x52,0x53,0x54,0x55,0x56,0x57,0x58,0x59,0x5a,0x5b,0x5c,0x5d,0x5e,0x5f,
+	0x60,0x61,0x62,0x63,0x64,0x65,0x66,0x67,0x68,0x69,0x6a,0x6b,0x6c,0x6d,0x6e,0x6f,
+	0x70,0x71,0x72,0x73,0x74,0x75,0x76,0x77,0x78,0x79,0x7a,0x7b,0x7c,0x7d,0x7e,0x7f,
+
+	0xc4,0x81,0x82,0xc9,0x84,0xd6,0xdc,0xe1,0x88,0xc8,0xe4,0xe8,0x8c,0x8d,0xe9,0x8f,
+	0x90,0xcf,0xed,0xef,0x94,0x95,0x96,0xf3,0x98,0x99,0xf6,0x9b,0xfa,0xcc,0xec,0xfc,
+	0xa0,0xa1,0xa2,0xa3,0xa4,0xa5,0xa6,0xa7,0xa8,0xa9,0xaa,0xab,0xac,0xad,0xae,0xaf,
+	0xb0,0xb1,0xb2,0xb3,0xb4,0xb5,0xb6,0xb7,0xb8,0xb9,0xba,0xbc,0xbe,0xbd,0xbe,0xbf,
+
+	0xc0,0xc1,0xc2,0xc3,0xc4,0xd2,0xc6,0xc7,0xc8,0xc9,0xca,0xf2,0xcc,0xcd,0xce,0xcf,
+	0xd0,0xd1,0xd2,0xd3,0xd4,0xd5,0xd6,0xd7,0xd8,0xd9,0xda,0xd8,0xdc,0xdd,0xf8,0xdf,
+	0xe0,0x8a,0xe2,0xe3,0x9a,0xe5,0xe6,0xc1,0x8d,0x9d,0xcd,0x8e,0x9e,0xed,0xd3,0xef,
+	0xf0,0xd9,0xda,0xf9,0xf4,0xf5,0xf6,0xf7,0xdd,0xfd,0xfa,0xfb,0xfc,0xfd,0xfe,0xff,
+};
+
+const String& NlsMacTo1250()
+{
+	static String cp(CsMac1250 + 128, 128);
+	return cp;
+}
+
+//////////////////////////////////////////////////////////////////////
+
+static const byte CsUpper1250[256] =
+{
+	0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f,
+	0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1a,0x1b,0x1c,0x1d,0x1e,0x1f,
+	0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2a,0x2b,0x2c,0x2d,0x2e,0x2f,
+	0x30,0x31,0x32,0x33,0x34,0x35,0x36,0x37,0x38,0x39,0x3a,0x3b,0x3c,0x3d,0x3e,0x3f,
+
+	0x40,0x41,0x42,0x43,0x44,0x45,0x46,0x47,0x48,0x49,0x4a,0x4b,0x4c,0x4d,0x4e,0x4f,
+	0x50,0x51,0x52,0x53,0x54,0x55,0x56,0x57,0x58,0x59,0x5a,0x5b,0x5c,0x5d,0x5e,0x5f,
+	0x60,0x41,0x42,0x43,0x44,0x45,0x46,0x47,0x48,0x49,0x4a,0x4b,0x4c,0x4d,0x4e,0x4f,
+	0x50,0x51,0x52,0x53,0x54,0x55,0x56,0x57,0x58,0x59,0x5a,0x7b,0x7c,0x7d,0x7e,0x7f,
+
+	0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8a,0x8b,0x8c,0x8d,0x8e,0x8f,
+	0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0x8a,0x9b,0x8c,0x8d,0x8e,0x8f,
+	0xa0,0xa1,0xa2,0xa3,0xa4,0xa5,0xa6,0xa7,0xa8,0xa9,0xaa,0xab,0xac,0xad,0xae,0xaf,
+	0xb0,0xb1,0xb2,0xa3,0xb4,0xb5,0xb6,0xb7,0xb8,0xa5,0xaa,0xbb,0xbc,0xbd,0xbc,0xaf,
+
+	0xc0,0xc1,0xc2,0xc3,0xc4,0xc5,0xc6,0xc7,0xc8,0xc9,0xca,0xcb,0xcc,0xcd,0xce,0xcf,
+	0xd0,0xd1,0xd2,0xd3,0xd4,0xd5,0xd6,0xd7,0xd8,0xd9,0xda,0xdb,0xdc,0xdd,0xde,0xdf,
+	0xc0,0xc1,0xc2,0xc3,0xc4,0xc5,0xc6,0xc7,0xc8,0xc9,0xca,0xcb,0xcc,0xcd,0xce,0xcf,
+	0xd0,0xd1,0xd2,0xd3,0xd4,0xd5,0xd6,0xf7,0xd8,0xd9,0xda,0xdb,0xdc,0xdd,0xde,0xff,
+};
+
+//////////////////////////////////////////////////////////////////////
+
+static const byte CsLower1250[256] =
+{
+	0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f,
+	0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1a,0x1b,0x1c,0x1d,0x1e,0x1f,
+	0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2a,0x2b,0x2c,0x2d,0x2e,0x2f,
+	0x30,0x31,0x32,0x33,0x34,0x35,0x36,0x37,0x38,0x39,0x3a,0x3b,0x3c,0x3d,0x3e,0x3f,
+
+	0x40,0x61,0x62,0x63,0x64,0x65,0x66,0x67,0x68,0x69,0x6a,0x6b,0x6c,0x6d,0x6e,0x6f,
+	0x70,0x71,0x72,0x73,0x74,0x75,0x76,0x77,0x78,0x79,0x7a,0x5b,0x5c,0x5d,0x5e,0x5f,
+	0x60,0x61,0x62,0x63,0x64,0x65,0x66,0x67,0x68,0x69,0x6a,0x6b,0x6c,0x6d,0x6e,0x6f,
+	0x70,0x71,0x72,0x73,0x74,0x75,0x76,0x77,0x78,0x79,0x7a,0x7b,0x7c,0x7d,0x7e,0x7f,
+
+	0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x9a,0x8b,0x9c,0x9d,0x9e,0x9f,
+	0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0x9a,0x9b,0x9c,0x9d,0x9e,0x9f,
+	0xa0,0xa1,0xa2,0xb3,0xa4,0xb9,0xa6,0xa7,0xa8,0xa9,0xba,0xab,0xac,0xad,0xae,0xbf,
+	0xb0,0xb1,0xb2,0xb3,0xb4,0xb5,0xb6,0xb7,0xb8,0xb9,0xba,0xbb,0xbe,0xbd,0xbe,0xbf,
+
+	0xe0,0xe1,0xe2,0xe3,0xe4,0xe5,0xe6,0xe7,0xe8,0xe9,0xea,0xeb,0xec,0xed,0xee,0xef,
+	0xf0,0xf1,0xf2,0xf3,0xf4,0xf5,0xf6,0xd7,0xf8,0xf9,0xfa,0xfb,0xfc,0xfd,0xfe,0xff,
+	0xe0,0xe1,0xe2,0xe3,0xe4,0xe5,0xe6,0xe7,0xe8,0xe9,0xea,0xeb,0xec,0xed,0xee,0xef,
+	0xf0,0xf1,0xf2,0xf3,0xf4,0xf5,0xf6,0xf7,0xf8,0xf9,0xfa,0xfb,0xfc,0xfd,0xfe,0xff,
+};
+
+//////////////////////////////////////////////////////////////////////
+
+static const byte CsAscii1250[256] =
+{
+	0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f,
+	0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1a,0x1b,0x1c,0x1d,0x1e,0x1f,
+	0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2a,0x2b,0x2c,0x2d,0x2e,0x2f,
+	0x30,0x31,0x32,0x33,0x34,0x35,0x36,0x37,0x38,0x39,0x3a,0x3b,0x3c,0x3d,0x3e,0x3f,
+
+	0x40,0x41,0x42,0x43,0x44,0x45,0x46,0x47,0x48,0x49,0x4a,0x4b,0x4c,0x4d,0x4e,0x4f,
+	0x50,0x51,0x52,0x53,0x54,0x55,0x56,0x57,0x58,0x59,0x5a,0x5b,0x5c,0x5d,0x5e,0x5f,
+	0x60,0x61,0x62,0x63,0x64,0x65,0x66,0x67,0x68,0x69,0x6a,0x6b,0x6c,0x6d,0x6e,0x6f,
+	0x70,0x71,0x72,0x73,0x74,0x75,0x76,0x77,0x78,0x79,0x7a,0x7b,0x7c,0x7d,0x7e,0x7f,
+
+	0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,'S' ,0x8b,'S' ,'T' ,'Z' ,'Z' ,
+	0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,'s' ,0x9b,'s' ,'t' ,'z' ,'z' ,
+	0xa0,0xa1,0xa2,'L' ,0xa4,'A' ,0xa6,0xa7,0xa8,0xa9,'S' ,0xab,0xac,0xad,0xae,'Z' ,
+	0xb0,0xb1,0xb2,'l' ,0xb4,0xb5,0xb6,0xb7,0xb8,'a' ,'s' ,0xbb,'L' ,0xbd,'l' ,'z' ,
+
+	'R' ,'A' ,'A' ,'A' ,'A' ,'L' ,'C' ,'C' ,'C' ,'E' ,'E' ,'E' ,'E' ,'I' ,'I' ,'D' ,
+	'D' ,'N' ,'N' ,'O' ,'O' ,'O' ,'O' ,0xd7,'R' ,'U' ,'U' ,'U' ,'U' ,'Y' ,'T' ,0xdf,
+	'r' ,'a' ,'a' ,'a' ,'a' ,'l' ,'c' ,'c' ,'c' ,'e' ,'e' ,'e' ,'e' ,'i' ,'i' ,'d' ,
+	'd' ,'n' ,'n' ,'o' ,'o' ,'o' ,'o' ,0xf7,'r' ,'u' ,'u' ,'u' ,'u' ,'y' ,'t' ,0xff,
+};
+
+//////////////////////////////////////////////////////////////////////
+
+static const byte CsUpperAscii1250[256] =
+{
+	0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f,
+	0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1a,0x1b,0x1c,0x1d,0x1e,0x1f,
+	0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2a,0x2b,0x2c,0x2d,0x2e,0x2f,
+	0x30,0x31,0x32,0x33,0x34,0x35,0x36,0x37,0x38,0x39,0x3a,0x3b,0x3c,0x3d,0x3e,0x3f,
+
+	0x40,0x41,0x42,0x43,0x44,0x45,0x46,0x47,0x48,0x49,0x4a,0x4b,0x4c,0x4d,0x4e,0x4f,
+	0x50,0x51,0x52,0x53,0x54,0x55,0x56,0x57,0x58,0x59,0x5a,0x5b,0x5c,0x5d,0x5e,0x5f,
+	0x60,0x41,0x42,0x43,0x44,0x45,0x46,0x47,0x48,0x49,0x4a,0x4b,0x4c,0x4d,0x4e,0x4f,
+	0x50,0x51,0x52,0x53,0x54,0x55,0x56,0x57,0x58,0x59,0x5a,0x7b,0x7c,0x7d,0x7e,0x7f,
+
+	0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,'S' ,0x8b,'S' ,'T' ,'Z' ,'Z' ,
+	0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,'S' ,0x9b,'S' ,'T' ,'Z' ,'Z' ,
+	0xa0,0xa1,0xa2,'L' ,0xa4,'A' ,0xa6,0xa7,0xa8,0xa9,'S' ,0xab,0xac,0xad,0xae,'Z' ,
+	0xb0,0xb1,0xb2,'L' ,0xb4,0xb5,0xb6,0xb7,0xb8,'A' ,'S' ,0xbb,'L' ,0xbd,'L' ,'Z' ,
+
+	'R' ,'A' ,'A' ,'A' ,'A' ,'L' ,'C' ,'C' ,'C' ,'E' ,'E' ,'E' ,'E' ,'I' ,'I' ,'D' ,
+	'D' ,'N' ,'N' ,'O' ,'O' ,'O' ,'O' ,0xd7,'R' ,'U' ,'U' ,'U' ,'U' ,'Y' ,'T' ,0xdf,
+	'R' ,'A' ,'A' ,'A' ,'A' ,'L' ,'C' ,'C' ,'C' ,'E' ,'E' ,'E' ,'E' ,'I' ,'I' ,'D' ,
+	'D' ,'N' ,'N' ,'O' ,'O' ,'O' ,'O' ,0xf7,'R' ,'U' ,'U' ,'U' ,'U' ,'Y' ,'T' ,0xff,
+};
+
+//////////////////////////////////////////////////////////////////////
+
+static const byte CsLowerAscii1250[256] =
+{
+	0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f,
+	0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1a,0x1b,0x1c,0x1d,0x1e,0x1f,
+	0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2a,0x2b,0x2c,0x2d,0x2e,0x2f,
+	0x30,0x31,0x32,0x33,0x34,0x35,0x36,0x37,0x38,0x39,0x3a,0x3b,0x3c,0x3d,0x3e,0x3f,
+
+	0x40,0x61,0x62,0x63,0x64,0x65,0x66,0x67,0x68,0x69,0x6a,0x6b,0x6c,0x6d,0x6e,0x6f,
+	0x70,0x71,0x72,0x73,0x74,0x75,0x76,0x77,0x78,0x79,0x7a,0x5b,0x5c,0x5d,0x5e,0x5f,
+	0x60,0x61,0x62,0x63,0x64,0x65,0x66,0x67,0x68,0x69,0x6a,0x6b,0x6c,0x6d,0x6e,0x6f,
+	0x70,0x71,0x72,0x73,0x74,0x75,0x76,0x77,0x78,0x79,0x7a,0x7b,0x7c,0x7d,0x7e,0x7f,
+
+	0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,'s' ,0x8b,'s' ,'t' ,'z' ,'z' ,
+	0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,'s' ,0x9b,'s' ,'t' ,'z' ,'z' ,
+	0xa0,0xa1,0xa2,'l' ,0xa4,'a' ,0xa6,0xa7,0xa8,0xa9,'s' ,0xab,0xac,0xad,0xae,'z' ,
+	0xb0,0xb1,0xb2,'l' ,0xb4,0xb5,0xb6,0xb7,0xb8,'a' ,'s' ,0xbb,'l' ,0xbd,'l' ,'z' ,
+
+	'r' ,'a' ,'a' ,'a' ,'a' ,'l' ,'c' ,'c' ,'c' ,'e' ,'e' ,'e' ,'e' ,'i' ,'i' ,'d' ,
+	'd' ,'n' ,'n' ,'o' ,'o' ,'o' ,'o' ,0xd7,'r' ,'u' ,'u' ,'u' ,'u' ,'y' ,'t' ,0xdf,
+	'r' ,'a' ,'a' ,'a' ,'a' ,'l' ,'c' ,'c' ,'c' ,'e' ,'e' ,'e' ,'e' ,'i' ,'i' ,'d' ,
+	'd' ,'n' ,'n' ,'o' ,'o' ,'o' ,'o' ,0xf7,'r' ,'u' ,'u' ,'u' ,'u' ,'y' ,'t' ,0xff,
+};
+
+//////////////////////////////////////////////////////////////////////
+
+static const bool CsIsLetter1250[256] =
+{
+	false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,
+	false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,
+	false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,
+	false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,
+
+	false,true ,true ,true ,true ,true ,true ,true ,true ,true ,true ,true ,true ,true ,true ,true ,
+	true ,true ,true ,true ,true ,true ,true ,true ,true ,true ,true ,false,false,false,false,false,
+	false,true ,true ,true ,true ,true ,true ,true ,true ,true ,true ,true ,true ,true ,true ,true ,
+	true ,true ,true ,true ,true ,true ,true ,true ,true ,true ,true ,false,false,false,false,false,
+
+	false,false,false,false,false,false,false,false,false,false,true ,false,true ,true ,true ,true ,
+	false,false,false,false,false,false,false,false,false,false,true ,false,true ,true ,true ,true ,
+	false,false,false,true ,false,true ,false,false,false,false,true ,false,false,false,false,true ,
+	false,false,false,true ,false,false,false,false,false,true ,true ,false,true ,false,true ,true ,
+
+	true ,true ,true ,true ,true ,true ,true ,true ,true ,true ,true ,true ,true ,true ,true ,true ,
+	true ,true ,true ,true ,true ,true ,true ,false,true ,true ,true ,true ,true ,true ,true ,true ,
+	true ,true ,true ,true ,true ,true ,true ,true ,true ,true ,true ,true ,true ,true ,true ,true ,
+	true ,true ,true ,true ,true ,true ,true ,false,true ,true ,true ,true ,true ,true ,true ,true ,
+};
+
+//////////////////////////////////////////////////////////////////////
+// Latin2 code page tables
+
+static const byte CsUpperLatin2[256] =
+{
+	0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F,
+	0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F,
+	0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F,
+	0x30,0x31,0x32,0x33,0x34,0x35,0x36,0x37,0x38,0x39,0x3A,0x3B,0x3C,0x3D,0x3E,0x3F,
+
+	0x40,0x41,0x42,0x43,0x44,0x45,0x46,0x47,0x48,0x49,0x4A,0x4B,0x4C,0x4D,0x4E,0x4F,
+	0x50,0x51,0x52,0x53,0x54,0x55,0x56,0x57,0x58,0x59,0x5A,0x5B,0x5C,0x5D,0x5E,0x5F,
+	0x60,0x41,0x42,0x43,0x44,0x45,0x46,0x47,0x48,0x49,0x4A,0x4B,0x4C,0x4D,0x4E,0x4F,
+	0x50,0x51,0x52,0x53,0x54,0x55,0x56,0x57,0x58,0x59,0x5A,0x7B,0x7C,0x7D,0x7E,0x7F,
+
+	0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,
+	0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0x9A,0x9B,0x9C,0x9D,0x9E,0x9F,
+	0xA0,0xA1,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,
+	0xB0,0xA1,0xB2,0xA3,0xB4,0xA5,0xA6,0xB7,0xB8,0xA9,0xAA,0xAB,0xAC,0xBD,0xAE,0xAF,
+
+	0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,
+	0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF,
+	0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,
+	0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xF7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xFF,
+};
+
+static const byte CsLowerLatin2[256] =
+{
+	0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F,
+	0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F,
+	0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F,
+	0x30,0x31,0x32,0x33,0x34,0x35,0x36,0x37,0x38,0x39,0x3A,0x3B,0x3C,0x3D,0x3E,0x3F,
+
+	0x40,0x61,0x62,0x63,0x64,0x65,0x66,0x67,0x68,0x69,0x6A,0x6B,0x6C,0x6D,0x6E,0x6F,
+	0x70,0x71,0x72,0x73,0x74,0x75,0x76,0x77,0x78,0x79,0x7A,0x5B,0x5C,0x5D,0x5E,0x5F,
+	0x60,0x61,0x62,0x63,0x64,0x65,0x66,0x67,0x68,0x69,0x6A,0x6B,0x6C,0x6D,0x6E,0x6F,
+	0x70,0x71,0x72,0x73,0x74,0x75,0x76,0x77,0x78,0x79,0x7A,0x7B,0x7C,0x7D,0x7E,0x7F,
+
+	0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,
+	0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0x9A,0x9B,0x9C,0x9D,0x9E,0x9F,
+	0xA0,0xB1,0xA2,0xB3,0xA4,0xB5,0xB6,0xA7,0xA8,0xB9,0xBA,0xBB,0xBC,0xAD,0xBE,0xBF,
+	0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF,
+
+	0xE0,0xE1,0xE2,0xE3,0xE4,0xE5,0xE6,0xE7,0xE8,0xE9,0xEA,0xEB,0xEC,0xED,0xEE,0xEF,
+	0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xD7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF,
+	0xE0,0xE1,0xE2,0xE3,0xE4,0xE5,0xE6,0xE7,0xE8,0xE9,0xEA,0xEB,0xEC,0xED,0xEE,0xEF,
+	0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF,
+};
+
+static const byte CsAsciiLatin2[256] =
+{
+	0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F,
+	0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F,
+	0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F,
+	0x30,0x31,0x32,0x33,0x34,0x35,0x36,0x37,0x38,0x39,0x3A,0x3B,0x3C,0x3D,0x3E,0x3F,
+
+	0x40,0x41,0x42,0x43,0x44,0x45,0x46,0x47,0x48,0x49,0x4A,0x4B,0x4C,0x4D,0x4E,0x4F,
+	0x50,0x51,0x52,0x53,0x54,0x55,0x56,0x57,0x58,0x59,0x5A,0x5B,0x5C,0x5D,0x5E,0x5F,
+	0x60,0x61,0x62,0x63,0x64,0x65,0x66,0x67,0x68,0x69,0x6A,0x6B,0x6C,0x6D,0x6E,0x6F,
+	0x70,0x71,0x72,0x73,0x74,0x75,0x76,0x77,0x78,0x79,0x7A,0x7B,0x7C,0x7D,0x7E,0x7F,
+
+	0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,
+	0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0x9A,0x9B,0x9C,0x9D,0x9E,0x9F,
+	0xA0,0x41,0xA2,0x4C,0xA4,0x4C,0x53,0xA7,0xA8,0x53,0x53,0x54,0x5A,0xAD,0x5A,0x5A,
+	0xB0,0x61,0xB2,0x6C,0xB4,0x6C,0x73,0xB7,0xB8,0x73,0x73,0x74,0x7A,0xBD,0x7A,0x7A,
+
+	0x52,0x41,0x41,0x41,0x41,0x4C,0x43,0x43,0x43,0x45,0x45,0x45,0x45,0x49,0x49,0x44,
+	0x44,0x4E,0x4E,0x4F,0x4F,0x4F,0x4F,0xD7,0x52,0x55,0x55,0x55,0x55,0x59,0x54,0xDF,
+	0x72,0x61,0x61,0x61,0x61,0x6C,0x63,0x63,0x63,0x65,0x65,0x65,0x65,0x69,0x69,0x64,
+	0x64,0x6E,0x6E,0x6F,0x6F,0x6F,0x6F,0xF7,0x72,0x75,0x75,0x75,0x75,0x79,0x74,0xFF,
+};
+
+static const byte CsUpperAsciiLatin2[256] =
+{
+	0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F,
+	0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F,
+	0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F,
+	0x30,0x31,0x32,0x33,0x34,0x35,0x36,0x37,0x38,0x39,0x3A,0x3B,0x3C,0x3D,0x3E,0x3F,
+
+	0x40,0x41,0x42,0x43,0x44,0x45,0x46,0x47,0x48,0x49,0x4A,0x4B,0x4C,0x4D,0x4E,0x4F,
+	0x50,0x51,0x52,0x53,0x54,0x55,0x56,0x57,0x58,0x59,0x5A,0x5B,0x5C,0x5D,0x5E,0x5F,
+	0x60,0x41,0x42,0x43,0x44,0x45,0x46,0x47,0x48,0x49,0x4A,0x4B,0x4C,0x4D,0x4E,0x4F,
+	0x50,0x51,0x52,0x53,0x54,0x55,0x56,0x57,0x58,0x59,0x5A,0x7B,0x7C,0x7D,0x7E,0x7F,
+
+	0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,
+	0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0x9A,0x9B,0x9C,0x9D,0x9E,0x9F,
+
+	0xA0,0x41,0xA2,0x4C,0xA4,0x4C,0x53,0xA7,0xA8,0x53,0x53,0x54,0x5A,0xAD,0x5A,0x5A,
+	0xB0,0x41,0xB2,0x4C,0xB4,0x4C,0x53,0xB7,0xB8,0x53,0x53,0x54,0x5A,0xBD,0x5A,0x5A,
+
+	0x52,0x41,0x41,0x41,0x41,0x4C,0x43,0x43,0x43,0x45,0x45,0x45,0x45,0x49,0x49,0x44,
+	0x44,0x4E,0x4E,0x4F,0x4F,0x4F,0x4F,0xD7,0x52,0x55,0x55,0x55,0x55,0x59,0x54,0xDF,
+	0x52,0x41,0x41,0x41,0x41,0x4C,0x43,0x43,0x43,0x45,0x45,0x45,0x45,0x49,0x49,0x44,
+	0x44,0x4E,0x4E,0x4F,0x4F,0x4F,0x4F,0xF7,0x52,0x55,0x55,0x55,0x55,0x59,0x54,0xFF,
+};
+
+static const byte CsLowerAsciiLatin2[256] =
+{
+	0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F,
+	0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F,
+	0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F,
+	0x30,0x31,0x32,0x33,0x34,0x35,0x36,0x37,0x38,0x39,0x3A,0x3B,0x3C,0x3D,0x3E,0x3F,
+
+	0x40,0x61,0x62,0x63,0x64,0x65,0x66,0x67,0x68,0x69,0x6A,0x6B,0x6C,0x6D,0x6E,0x6F,
+	0x70,0x71,0x72,0x73,0x74,0x75,0x76,0x77,0x78,0x79,0x7A,0x5B,0x5C,0x5D,0x5E,0x5F,
+	0x60,0x61,0x62,0x63,0x64,0x65,0x66,0x67,0x68,0x69,0x6A,0x6B,0x6C,0x6D,0x6E,0x6F,
+	0x70,0x71,0x72,0x73,0x74,0x75,0x76,0x77,0x78,0x79,0x7A,0x7B,0x7C,0x7D,0x7E,0x7F,
+
+	0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,
+	0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0x9A,0x9B,0x9C,0x9D,0x9E,0x9F,
+	0xA0,0x61,0xA2,0x6C,0xA4,0x6C,0x73,0xA7,0xA8,0x73,0x73,0x74,0x7A,0xAD,0x7A,0x7A,
+	0xB0,0x61,0xB2,0x6C,0xB4,0x6C,0x73,0xB7,0xB8,0x73,0x73,0x74,0x7A,0xBD,0x7A,0x7A,
+
+	0x72,0x61,0x61,0x61,0x61,0x6C,0x63,0x63,0x63,0x65,0x65,0x65,0x65,0x69,0x69,0x64,
+	0x64,0x6E,0x6E,0x6F,0x6F,0x6F,0x6F,0xD7,0x72,0x75,0x75,0x75,0x75,0x79,0x74,0xDF,
+	0x72,0x61,0x61,0x61,0x61,0x6C,0x63,0x63,0x63,0x65,0x65,0x65,0x65,0x69,0x69,0x64,
+	0x64,0x6E,0x6E,0x6F,0x6F,0x6F,0x6F,0xF7,0x72,0x75,0x75,0x75,0x75,0x79,0x74,0xFF,
+};
+
+static const bool CsIsLetterLatin2[256] =
+{
+	false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,
+	false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,
+	false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,
+	false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,
+
+	false,true, true, true, true, true, true, true, true, true, true, true, true, true, true, true,
+	true, true, true, true, true, true, true, true, true, true, true, false,false,false,false,false,
+	false,true, true, true, true, true, true, true, true, true, true, true, true, true, true, true,
+	true, true, true, true, true, true, true, true, true, true, true, false,false,false,false,false,
+
+	false,false,false,false,false,false,false,false,false,false,true, false,true, true, true, true,
+	false,false,false,false,false,false,false,false,false,false,true, false,true, true, true, true,
+	false,true, false,true, false,true, true, false,false,true, true, true, true, false,true, true,
+	false,true, false,true, false,true, true, false,false,true, true, true, true, false,true, true,
+
+	true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true,
+	true, true, true, true, true, true, true, false,true, true, true, true, true, true, true, true,
+	true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true,
+	true, true, true, true, true, true, true, false,true, true, true, true, true, true, true, false,
+};
+
+//////////////////////////////////////////////////////////////////////
+// platform-default code page tables
+
+#if defined(PLATFORM_WIN32)
+int NlsDefaultCodePage = CP_1250;
+#elif defined(PLATFORM_POSIX)
+int NlsDefaultCodePage = CP_LATIN2;
+#endif
+
+//////////////////////////////////////////////////////////////////////
+
+const byte *NlsUpper(byte charset)
+{
+	switch(charset ? charset : NlsDefaultCodePage)
+	{
+	case CP_1250:   return CsUpper1250;
+	case CP_LATIN2: return CsUpperLatin2;
+	}
+	return NULL;
+}
+
+//////////////////////////////////////////////////////////////////////
+
+const byte *NlsLower(byte charset)
+{
+	switch(charset ? charset : NlsDefaultCodePage)
+	{
+	case CP_1250:   return CsLower1250;
+	case CP_LATIN2: return CsLowerLatin2;
+	}
+	return NULL;
+}
+
+//////////////////////////////////////////////////////////////////////
+
+const byte *NlsAscii(byte charset)
+{
+	switch(charset ? charset : NlsDefaultCodePage)
+	{
+	case CP_1250:   return CsAscii1250;
+	case CP_LATIN2: return CsAsciiLatin2;
+	}
+	return NULL;
+}
+
+//////////////////////////////////////////////////////////////////////
+
+const byte *NlsUpperAscii(byte charset)
+{
+	switch(charset ? charset : NlsDefaultCodePage)
+	{
+	case CP_1250:   return CsUpperAscii1250;
+	case CP_LATIN2: return CsUpperAsciiLatin2;
+	}
+	return NULL;
+}
+
+//////////////////////////////////////////////////////////////////////
+
+const byte *NlsLowerAscii(byte charset)
+{
+	switch(charset ? charset : NlsDefaultCodePage)
+	{
+	case CP_1250:   return CsLowerAscii1250;
+	case CP_LATIN2: return CsLowerAsciiLatin2;
+	}
+	return NULL;
+}
+
+//////////////////////////////////////////////////////////////////////
+
+const bool *NlsLetter(byte charset)
+{
+	switch(charset ? charset : NlsDefaultCodePage)
+	{
+	case CP_1250:   return CsIsLetter1250;
+	case CP_LATIN2: return CsIsLetterLatin2;
+	}
+	return NULL;
+}
+
+//////////////////////////////////////////////////////////////////////
+// todo: true international index letter (this is Czech-specific)
+
+String NlsGetIndexLetter(const char *s, int language, byte charset)
+{
+	char temp[3];
+	temp[0] = temp[1] = temp[2] = 0;
+	if(NlsIsLetter(*s, charset))
+	{
+		temp[0] = NlsToUpper(*s, charset);
+		if(NlsIsLetter(s[1], charset))
+			temp[1] = NlsToLower(s[1], charset);
+		if(temp[0] != 'C' || temp[1] != 'h')
+			temp[1] = 0;
+		switch(NlsToUpperAscii(*s, charset))
+		{
+		case 'A': case 'E': case 'I': case 'N':
+		case 'O': case 'T': case 'U': case 'Y':
+			temp[0] = NlsToAscii(temp[0], charset);
+			break;
+		}
+	}
+	return temp;
+}
+
+//////////////////////////////////////////////////////////////////////
+// todo: true international comparison (this is Czech-specific)
+
+int NlsCompare(const char *s1, const char *s2, int language, byte charset)
+{
+	const byte *csa = NlsAscii(charset);
+	const byte *csu = NlsUpper(charset);
+
+	byte c1, c2;
+	int  little = 0, middle = 0;
+
+	do
+	{
+		int u1, u2, i1, i2;
+
+		c1 = *s1++;
+		c2 = *s2++;
+		if((c1 == 'C' || c1 == 'c') && (*s1 == 'H' || *s1 == 'h'))
+		{ // CH
+			i1 = 'H';
+			u1 = 256;
+			s1++;
+		}
+		else
+			i1 = csa[u1 = csu[c1]];
+		if((c2 == 'C' || c2 == 'c') && (*s2 == 'H' || *s2 == 'h'))
+		{ // CH
+			i2 = 'H';
+			u2 = 256;
+			s2++;
+		}
+		else
+			i2 = csa[u2 = csu[c2]];
+
+		if(i1 != i2)
+			return i1 >= i2 ? 1 : -1; // large difference
+		if(u1 != u2) // different diacritics
+			switch(i1)
+			{
+			case 'A': case 'E': case 'I': case 'N':
+			case 'O': case 'T': case 'U': case 'Y':
+				if(middle == 0)
+					middle = u1 - u2;
+				continue;
+			default:
+				return u1 >= u2 ? 1 : -1;
+			}
+		if(c1 != c2) // different case
+		{
+			if(little == 0)
+				little = (u1 != c1) - (u2 != c2);
+		}
+	}
+	while(c1 != 0 && c2 != 0);
+	little += 4 * middle;
+	return little > 0 ? 1 : little < 0 ? -1 : 0;
+}
+
+//////////////////////////////////////////////////////////////////////
+// todo: true international comparison (this is Czech-specific)
+
+int NlsCompare(const wchar *s1, const wchar *s2, int language)
+{
+	byte cs = GetLangCharset(language);
+	return NlsCompare(FromUnicode(s1, cs), FromUnicode(s2, cs), language, cs);
+}
+/*
+	const wchar *csa = NlsAscii(charset);
+	const wchar *csu = NlsUpper(charset);
+
+	byte c1, c2;
+	int  little = 0, middle = 0;
+
+	do
+	{
+		int u1, u2, i1, i2;
+
+		c1 = *s1++;
+		c2 = *s2++;
+		if((c1 == 'C' || c1 == 'c') && (*s1 == 'H' || *s1 == 'h'))
+		{ // CH
+			i1 = 'H';
+			u1 = 256;
+			s1++;
+		}
+		else
+			i1 = csa[u1 = csu[c1]];
+		if((c2 == 'C' || c2 == 'c') && (*s2 == 'H' || *s2 == 'h'))
+		{ // CH
+			i2 = 'H';
+			u2 = 256;
+			s2++;
+		}
+		else
+			i2 = csa[u2 = csu[c2]];
+
+		if(i1 != i2)
+			return i1 >= i2 ? 1 : -1; // large difference
+		if(u1 != u2) // different diacritics
+			switch(i1)
+			{
+			case 'A': case 'E': case 'I': case 'N':
+			case 'O': case 'T': case 'U': case 'Y':
+				if(middle == 0)
+					middle = u1 - u2;
+				continue;
+			default:
+				return u1 >= u2 ? 1 : -1;
+			}
+		if(c1 != c2) // different case
+		{
+			if(little == 0)
+				little = (u1 != c1) - (u2 != c2);
+		}
+	}
+	while(c1 != 0 && c2 != 0);
+	little += 4 * middle;
+	return little > 0 ? 1 : little < 0 ? -1 : 0;
+}
+*/
+
+//////////////////////////////////////////////////////////////////////
+// todo: true international comparison (this is Czech-specific)
+
+int NlsNumCompare(const char *s1, const char *s2, int language, byte charset)
+{
+	const byte *csa = NlsAscii(charset);
+	const byte *csu = NlsUpper(charset);
+
+	byte c1, c2;
+	int  little = 0, middle = 0;
+	const char *p1 = s1, *p2 = s2;
+
+	do
+	{
+		int u1, u2, i1, i2;
+
+		c1 = *s1++;
+		c2 = *s2++;
+		if((c1 == 'C' || c1 == 'c') && (*s1 == 'H' || *s1 == 'h'))
+		{ // CH
+			i1 = 'H';
+			u1 = 256;
+			s1++;
+		}
+		else
+			i1 = csa[u1 = csu[c1]];
+		if((c2 == 'C' || c2 == 'c') && (*s2 == 'H' || *s2 == 'h'))
+		{ // CH
+			i2 = 'H';
+			u2 = 256;
+			s2++;
+		}
+		else
+			i2 = csa[u2 = csu[c2]];
+
+		if(i1 != i2)
+		{ // large difference; test numerical difference
+			if((IsDigit(i1) || IsDigit(i2))
+				&& s1 > p1 && s2 > p2 && IsDigit(s1[-1]) && IsDigit(s2[-1]))
+			{
+				while(s1 > p1 && IsDigit(s1[-1]))
+					s1--;
+				while(s2 > p2 && IsDigit(s2[-1]))
+					s2--;
+				int d = atoi(s1) - atoi(s2);
+				return d >= 0 ? 1 : -1;
+			}
+			return i1 >= i2 ? 1 : -1; // large difference
+		}
+		if(u1 != u2) // different diacritics
+			switch(i1)
+			{
+			case 'A': case 'E': case 'I': case 'N':
+			case 'O': case 'T': case 'U': case 'Y':
+				if(middle == 0)
+					middle = u1 - u2;
+				continue;
+			default:
+				return u1 >= u2 ? 1 : -1;
+			}
+		if(c1 != c2) // different case
+		{
+			if(little == 0)
+
+				little = (u1 != c1) - (u2 != c2);
+		}
+	}
+	while(c1 != 0 && c2 != 0);
+	little += 4 * middle;
+	return little > 0 ? 1 : little < 0 ? -1 : 0;
+}
+
+//////////////////////////////////////////////////////////////////////
+
+int NlsNumCompare(const wchar *s1, const wchar *s2, int language)
+{
+	byte cs = GetLangCharset(language);
+	return NlsNumCompare(FromUnicode(s1, cs), FromUnicode(s2, cs), language, cs);
+}
+
+//////////////////////////////////////////////////////////////////////
+
+String NlsMakeAscii(const char *s, byte charset, int count)
+{
+	if(count < 0)
+		count = strlen(s);
+	const byte *asc = NlsAscii(charset);
+	String temp;
+	for(char *p = temp.GetBuffer(count), *e = p + count; p < e;)
+		*p++ = asc[(byte)*s++];
+	temp.ReleaseBuffer(count);
+	return temp;
+}
+
+//////////////////////////////////////////////////////////////////////
+
+String NlsMakeUpper(const char *s, byte charset, int count)
+{
+	if(count < 0)
+		count = strlen(s);
+	const byte *upp = NlsUpper(charset);
+	String temp;
+	for(char *p = temp.GetBuffer(count), *e = p + count; p < e;)
+		*p++ = upp[(byte)*s++];
+	temp.ReleaseBuffer(count);
+	return temp;
+}
+
+//////////////////////////////////////////////////////////////////////
+
+String NlsMakeLower(const char *s, byte charset, int count)
+{
+	if(count < 0)
+		count = strlen(s);
+	const byte *low = NlsLower(charset);
+	String temp;
+	for(char *p = temp.GetBuffer(count), *e = p + count; p < e;)
+		*p++ = low[(byte)*s++];
+	temp.ReleaseBuffer(count);
+	return temp;
+}
+
+//////////////////////////////////////////////////////////////////////
+
+String NlsToUpperAscii(const char *s, byte charset, int count)
+{
+	if(count < 0)
+		count = strlen(s);
+	const byte *upa = NlsUpperAscii(charset);
+	String temp;
+	for(char *p = temp.GetBuffer(count), *e = p + count; p < e;)
+		*p++ = upa[(byte)*s++];
+	temp.ReleaseBuffer(count);
+	return temp;
+}
+
+//////////////////////////////////////////////////////////////////////
+
+String NlsToLowerAscii(const char *s, byte charset, int count)
+{
+	if(count < 0)
+		count = strlen(s);
+	const byte *lwa = NlsLowerAscii(charset);
+	String temp;
+	for(char *p = temp.GetBuffer(count), *e = p + count; p < e;)
+		*p++ = lwa[(byte)*s++];
+	temp.ReleaseBuffer(count);
+	return temp;
+}
+
+//////////////////////////////////////////////////////////////////////
+
+bool NlsContainsNational(const char *s, byte charset, int count)
+{
+	if(count < 0)
+		count = strlen(s);
+	const byte *csa = NlsAscii(charset);
+	for(const char *e = s + count; s < e; s++)
+		if((byte)*s != csa[(byte)*s])
+			return true;
+	return false;
+}
+
+//////////////////////////////////////////////////////////////////////
+// NlsLike::
+
+bool NlsLike::Set(const char *templ, byte cs)
+{
+	charset = cs;
+	raw_templ = 0;
+	cvt = 0;
+	exclude_ch = false;
+	always_true = (*templ == 0);
+	if(always_true)
+		return true;
+	if((*templ == '.' && templ[1] != 0 && *++templ != '.') || NlsContainsNational(templ, charset))
+	{
+		if(charset == LNG_CZECH)
+			exclude_ch = (ToUpper(*templ) == 'C' && templ[1] == 0);
+		cvt = NlsUpper(charset);
+	}
+	else
+		cvt = NlsUpperAscii(charset);
+	raw_templ = templ;
+	return false;
+}
+
+//////////////////////////////////////////////////////////////////////
+
+bool NlsLike::Matches(const char *s) const
+{
+	if(always_true)
+		return true;
+	if(exclude_ch && *s && (s[1] == 'h' || s[1] == 'H'))
+		return false;
+	return RawMatches(s, raw_templ);
+}
+
+//////////////////////////////////////////////////////////////////////
+
+bool NlsLike::RawMatches(const char *s, const char *templ) const
+{
+	for(;;)
+		switch(*templ++)
+		{
+		case 0: return true;
+		case '.': if(*templ == 0) return *s == 0; // force end of string
+		case '?': if(*s++ == 0) return false; break;
+		case '*':
+			do
+				if(RawMatches(s, templ))
+					return true;
+			while(*s++);
+			return false;
+
+		default:
+			if(cvt[(byte)templ[-1]] != cvt[(byte)*s++])
+				return false;
+			break;
+		}
+}
+
+//////////////////////////////////////////////////////////////////////
+
+#endif
diff --git a/uppsrc/TCore/setop.h b/uppsrc/TCore/setop.h
new file mode 100644
index 000000000..dc2eac5e1
--- /dev/null
+++ b/uppsrc/TCore/setop.h
@@ -0,0 +1,186 @@
+NAMESPACE_UPP
+
+enum SetOpCode
+{
+	SET_OP2_NOP,   // empty set
+	SET_OP2_LEFT,  // left set
+	SET_OP2_RIGHT, // right set
+	SET_OP2_LADD,  // left addition - duplicates are kept in left set
+	SET_OP2_RADD,  // right additions - duplicates are kept in right set
+	SET_OP2_AND,   // intersection (left set order)
+	SET_OP2_LSUB,  // left subtraction (left - right)
+	SET_OP2_RSUB,  // right subtraction (right - left)
+	SET_OP2_XOR,   // symmetrical difference
+};
+
+template <> inline unsigned Upp::GetHashValue(const SetOpCode& c) { return c; }
+
+NTL_MOVEABLE(SetOpCode);
+
+template<class V, class I>
+Index<V> SetGetIndex(I begin, I end)
+{
+	Index<V> result;
+	while(begin != end)
+		result.FindAdd(*begin++);
+	return result;
+}
+
+template <class C, class I>
+C SetLAdd(I begin1, I end1, I begin2, I end2)
+{
+	typedef typename C::ValueType V;
+	C result;
+	if(begin1 == end1) // left set is empty
+		Append(result, begin2, end2);
+	else
+	{
+		Append(result, begin1, end1);
+		if(begin2 != end2)
+		{
+			Index<V> hash = SetGetIndex<V>(begin1, end1);
+			for(; begin2 != end2; begin2++)
+				if(hash.Find(*begin2) < 0)
+					result.Add(*begin2);
+		}
+	}
+	return result;
+}
+
+template <class C, class I>
+C SetRAdd(I begin1, I end1, I begin2, I end2)
+{
+	typedef typename C::ValueType V;
+	C result;
+	if(begin2 == end2)
+		Append(result, begin1, end1);
+	else
+	{
+		if(begin1 != end1)
+		{
+			Index<V> hash = SetGetIndex<V>(begin2, end2);
+			while(begin1 != end1)
+			{
+				if(hash.Find(*begin1) < 0)
+					result.Add(*begin1);
+				begin1++;
+			}
+		}
+		Append(result, begin2, end2);
+	}
+	return result;
+}
+
+template <class C, class I>
+C SetAnd(I begin1, I end1, I begin2, I end2)
+{
+	typedef typename C::ValueType V;
+	C result;
+	int count1 = end1 - begin1;
+	int count2 = end2 - begin2;
+	if(count1 == 0 || count2 == 0)
+		return result; // empty intersection
+	if(count1 > count2)
+	{ // 1st is longer, generate hash on 2nd
+		Index<V> hash = SetGetIndex<V>(begin2, end2);
+		while(begin1 != end1)
+		{
+			if(hash.Find(*begin1) >= 0)
+				result.Add(*begin1);
+			begin1++;
+		}
+	}
+	else
+	{ // 1st is shorter, generate hash on 1st
+		Index<V> hash = SetGetIndex<V>(begin1, end1);
+		while(begin2 != end2)
+		{
+			if(hash.Find(*begin2) >= 0)
+				result.Add(*begin2);
+			begin2++;
+		}
+	}
+	return result;
+}
+
+template <class C, class I>
+C SetSub(I begin1, I end1, I begin2, I end2)
+{
+	typedef typename C::ValueType V;
+	C result;
+	if(begin1 == end1)
+		; // no-op - empty set
+	else if(begin2 == end2)
+		Append(result, begin1, end1);
+	else
+	{
+		Index<V> hash = SetGetIndex<V>(begin2, end2);
+		while(begin1 != end1)
+		{
+			if(hash.Find(*begin1) < 0)
+				result.Add(*begin1);
+			begin1++;
+		}
+	}
+	return result;
+}
+
+template <class C, class I>
+C SetXor(I begin1, I end1, I begin2, I end2)
+{
+	typedef typename C::ValueType V;
+	C result;
+	if(begin1 == end1)
+		Append(result, begin2, end2);
+	else if(begin2 == end2)
+		Append(result, begin1, end1);
+	else
+	{
+		Index<V> hash = SetGetIndex<V>(begin2, end2);
+		for(I temp = begin1; temp != end1; temp++)
+			if(hash.Find(*temp) < 0)
+				result.Add(*temp);
+		hash = SetGetIndex<V>(begin1, end1);
+		while(begin2 != end2)
+		{
+			if(hash.Find(*begin2) < 0)
+				result.Add(*begin2);
+			begin2++;
+		}
+	}
+	return result;
+}
+
+template <class C, class I>
+C SetOperation(I begin1, I end1, I begin2, I end2, SetOpCode op)
+{
+	C result;
+	switch(op)
+	{
+	default: NEVER();
+	case SET_OP2_NOP:    break;
+	case SET_OP2_LEFT:   Append(result, begin1, end1); break;
+	case SET_OP2_RIGHT:  Append(result, begin2, end2); break;
+	case SET_OP2_LADD:   return SetLAdd<C>(begin1, end1, begin2, end2);
+	case SET_OP2_RADD:   return SetRAdd<C>(begin1, end1, begin2, end2);
+	case SET_OP2_AND:    return SetAnd<C>(begin1, end1, begin2, end2);
+	case SET_OP2_LSUB:   return SetSub<C>(begin1, end1, begin2, end2);
+	case SET_OP2_RSUB:   return SetSub<C>(begin2, end2, begin1, end1);
+	case SET_OP2_XOR:    return SetXor<C>(begin1, end1, begin2, end2);
+	}
+	return result;
+}
+
+template <class T>
+T SetOperation(const T& set1, const T& set2, SetOpCode op)
+{
+	return SetOperation<T>(set1.Begin(), set1.End(), set2.Begin(), set2.End(), op);
+}
+
+template <class T> T SetLAdd(const T& set1, const T& set2) { return SetLAdd<T>(set1.Begin(), set1.End(), set2.Begin(), set2.End()); }
+template <class T> T SetRAdd(const T& set1, const T& set2) { return SetRAdd<T>(set1.Begin(), set1.End(), set2.Begin(), set2.End()); }
+template <class T> T SetAnd (const T& set1, const T& set2) { return SetAnd<T>(set1.Begin(), set1.End(), set2.Begin(), set2.End());  }
+template <class T> T SetSub (const T& set1, const T& set2) { return SetSub<T>(set1.Begin(), set1.End(), set2.Begin(), set2.End()); }
+template <class T> T SetXor (const T& set1, const T& set2) { return SetXor<T>(set1.Begin(), set1.End(), set2.Begin(), set2.End());  }
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/TCore/tcore.usc b/uppsrc/TCore/tcore.usc
new file mode 100644
index 000000000..c9217afeb
--- /dev/null
+++ b/uppsrc/TCore/tcore.usc
@@ -0,0 +1,123 @@
+macro "Ctr -> assignments" {
+	begin = .GetSelBegin();
+	end = begin + .GetSelCount();
+	while(end > begin) {
+		d = c = .Get(--end);
+		if(c == ",")
+			d = ";\n";
+		else if(c == ")")
+			d = "";
+		else if(c == "(")
+			d = " = ";
+		if(d != c) {
+			.Remove(end, 1);
+			.Insert(end, d);
+		}
+	}
+}
+
+macro "Kill RegisterHelpTopic" {
+	for(;;) {
+		if(!.Find("RegisterHelpTopicObjectTitle("))
+			return;
+		line = .GetLine(.GetCursor());
+		if(!(.Get(.GetLinePos(line), 2) == "//"))
+			break;
+	}
+	ident = .GetSelBegin() + .GetSelCount();
+	.MoveWordRight();
+	endid = .GetCursor();
+	id = .Get(ident, endid - ident);
+	if(.Get(endid) == ",") {
+		len = .GetLength();
+		while(++endid < len && .Get(endid) == " ")
+			;
+		ist = .Get(endid, 4) == "t_(\"";
+		if(ist || .Get(endid) == "\"") {
+			bstr = endid + (ist ? 3 : 0);
+			estr = bstr + 1;
+			while(estr < len && !(.Get(estr) == "\""))
+				if(.Get(estr++) == "\\" && estr < len)
+					estr++;
+			if(estr < len && .Get(estr) == "\"")
+				estr++;
+			if(ist)
+				nstr = "t_(" + .Get(bstr, estr - bstr) + ")";
+			else
+				nstr = .Get(bstr, estr - bstr);
+			.SetSelection(0, len);
+			cout(id);
+			.Replace(id + "HelpTitle()", nstr);
+			.SetCursor(.GetLinePos(line));
+			.Insert("//");
+		}
+	}
+
+}
+
+macro "Dialog class" Shift+Ctrl+D {
+	ntr = Input("Name", "Title", "Return type");
+	n = ntr[0];
+	t = ntr[1];
+	if(t == "") t = "(dialog title)";
+	r = ntr[2];
+	if(r == "") r = "void";
+	isvoid = (r == "void");
+	dlgn = "Dlg" + n;
+	if(n != "") {
+		.Insert(
+			"#define LAYOUTFILE \"" + dlgn + ".lay\"\n"
+			"#include <CtrlCore/lay.h>\n"
+			"\n"
+			"class " + dlgn + " : public With" + n + "Layout<TopWindow> {\n"
+			"public:\n"
+			"\ttypedef " + dlgn + " CLASSNAME;\n"
+			"\t" + dlgn + "();\n"
+			"\n"
+			"\t" + r + " Run();\n"
+			"\n"
+			"private:\n"
+			"};\n"
+			"\n"
+			+ r + " Run" + dlgn + "() { " + (isvoid ? "" : "return ") + dlgn + "().Run(); }\n"
+			"\n"
+			+ dlgn + "::" + dlgn + "()\n"
+			"{\n"
+			"\t" + (isvoid ? "CtrlLayout" : "CtrlLayoutOKCancel") + "(*this, t_(\"" + t + "\"));\n"
+			"\n"
+			"}\n"
+			"\n"
+			+ r + " " + dlgn + "::Run()\n"
+			"{\n"
+			+ (isvoid
+				? "\tTopWindow::Run();\n"
+				: "\tif(TopWindow::Run() != IDOK)\n"
+				"\t\treturn false;\n"
+				"\treturn true;\n"
+			) +
+			"}\n"
+		);
+	}
+}
+
+macro "Tool + On-menu fn" Shift+Ctrl+T {
+	cn = Input("CLASSNAME", "Name", "Text", "Help");
+	cls = cn[0];
+	name = cn[1];
+	text = cn[2];
+	help = cn[3];
+	if(text == "") text = name;
+	.Insert(
+	"void " + cls + "::Tool" + name + "(Bar& bar)\n"
+	"{\n"
+	"\tbar.Add(t_(\"" + text + "\"), THISBACK(On" + name + "))"
+	+ (help == "" ? "" : "\n\t\t.Help(t_(\"" + help + "\"))") + ";\n"
+	"}\n"
+	"\n"
+	"void " + cls + "::On" + name + "()\n"
+	"{\n"
+	"\t// action\n"
+	"}\n"
+	"\n"
+	);
+}
diff --git a/uppsrc/TCore/template.h b/uppsrc/TCore/template.h
new file mode 100644
index 000000000..f44b2cca5
--- /dev/null
+++ b/uppsrc/TCore/template.h
@@ -0,0 +1,587 @@
+NAMESPACE_UPP
+
+/* TRC 2/12/2003: obsoleted by Fidler's callback1
+template <class OBJECT_, class METHOD_, class A, class T>
+struct Callback1MethodActionArg : public Callback1Action<A> {
+	OBJECT_  *object;
+	METHOD_   method;
+	T         arg;
+	void    Execute(A a) { (object->*method)(a, arg); }
+	bool    IsEqual(const Callback1Action<A> *other) const {
+		const Callback1MethodActionArg<OBJECT_, METHOD_, A, T> *q
+		       = dynamic_cast<const Callback1MethodActionArg<OBJECT_, METHOD_, A, T> *>(other);
+		return q && q->object == object && q->method == method && q->arg == arg;
+	}
+	unsigned GetHashValue() const {
+		return (unsigned)object ^ brutal_cast<unsigned>(method) ^ ::GetHashValue(arg);
+	}
+	Callback1MethodActionArg(OBJECT_ *object, METHOD_ method, T arg)
+	: object(object), method(method), arg(arg) {}
+};
+
+template <class Object, class R, class O, class A, class B, class T>
+Callback1<A> callback2(Object *object, R (O::*method)(A, B), T arg) {
+	return Callback1<A>(new Callback1MethodActionArg<Object, R (O::*)(A, B), A, T>
+	                    (object, method, arg));
+}
+
+template <class Object, class R, class O, class A, class B, class T>
+Callback1<A> callback2(const Object *object, R (O::*method)(A, B) const, T arg) {
+	return Callback1<A>(new Callback1MethodActionArg<Object, R (O::*)(A, B) const, A, T>
+	                    (object, method, arg));
+}
+*/
+
+/*
+template <class X, class A, class T>
+struct Callback1ActionCallArg : public Callback1Action<A> {
+	X         x;
+	T         arg;
+	void    Execute(A a) { x(a, arg); }
+	bool    IsEqual(const Callback1Action<A> *other) const {
+		const Callback1ActionCallArg<X, A, T> *q = dynamic_cast<const Callback1ActionCallArg<X, A, T> *>(other);
+		return q && q->x == x && q->arg == arg;
+	}
+	unsigned GetHashValue() const {
+		return ::GetHashValue(x) ^ ::GetHashValue(arg);
+	}
+	Callback1ActionCallArg(X x, T arg) : x(x), arg(arg) {}
+};
+
+template <class R, class A, class B, class T>
+Callback1<A> callback2(R (*fn)(A, B), T arg) {
+	return Callback1<A>(new Callback1ActionCallArg<R (*)(A, B), A, T>(fn, arg));
+}
+*/
+
+//#define THISBACK2(m, a) callback2(this, &CLASSNAME::m, a)
+
+
+template <class T>
+void SerializeRaw(Stream& stream, T& object)
+{
+	stream.SerializeRaw((byte *)&object, sizeof(object));
+}
+
+template <class T>
+void SerializeEnum(Stream& stream, T& object)
+{
+	int o = object;
+	stream / o;
+	object = T(o);
+}
+
+template <class T>
+static bool SerializeIn(T& object, String data)
+{
+	StringStream stream(data);
+	stream % object;
+	return !stream.IsError();
+}
+
+template <class T>
+static String SerializeOut(const T& object)
+{
+	StringStream stream;
+	stream % const_cast<T&>(object);
+	return stream;
+}
+
+template <class T>
+class PtrValueRep : public RawValueRep<T *>
+{
+public:
+	PtrValueRep(T *v) : RawValueRep<T *>(v)          {}
+
+	virtual bool       IsNull() const                { return this->v == 0; }
+	virtual unsigned   GetHashValue() const          { return (unsigned)this->v; }
+	virtual bool       IsEqual(const Value::Void *p);
+	virtual String     AsString()                    { return FormatIntHex((int)this->v); }
+
+	static const RawValueRep<T *> *Cast(const Value::Void *p)
+	{ ASSERT(dynamic_cast<const RawValueRep<T *> *>(p)); return (const RawValueRep<T *> *)p; }
+};
+
+template <class T>
+bool PtrValueRep<T>::IsEqual(const Value::Void *p)
+{
+	const RawValueRep<T *> *cast = dynamic_cast<const RawValueRep<T *> *>(p);
+	return cast && cast->Get() == this->v;
+}
+
+template <class T>
+class PtrValue : public Value
+{
+protected:
+	typedef PtrValueRep<T> Rep;
+
+public:
+	PtrValue(T *x) : Value(new Rep(x)) {}
+	T        *Get(const Value& v)       { return ::IsNull(v) ? 0 : Rep::Cast(v.GetVoidPtr())->Get(); }
+	static T *Extract(const Value& v)   { return ::IsNull(v) ? 0 : Rep::Cast(v.GetVoidPtr())->Get(); }
+};
+
+template <class T>
+inline Value PtrToValue(T *p)           { return PtrValue<T>(p); }
+
+#ifdef COMPILER_GCC
+typedef std::type_info type_info;
+#endif
+
+template <class T, class I = int>
+class TypeMap : Moveable< TypeMap<T, I> > {
+public:
+	One<T>                    CreateObject(I id) const;
+	I                         QueryObject(const T *object) const;
+
+	One<T>                    Copy(const One<T>& object) const;
+	void                      Serialize(Stream& stream, One<T>& object) const;
+	void                      Serialize(Stream& stream, Array<T>& array) const;
+//	template<> friend Stream&        operator % (Stream& stream, One<T>& object) { TypeMap<T, I>::Serialize(stream, object); return stream; }
+
+	One<T>                    SerializeIn(const String& string) const;
+	String                    SerializeOut(const One<T>& object) const;
+
+	typedef One<T>            (*NewFunc)();
+
+	void                      Register(NewFunc fn, const type_info *ti, I id);
+
+	template <class ST>
+	struct NewType {
+		static One<T> New() { return new ST; }
+	};
+
+	template <class ST>
+	void                      RegisterType(I id) { Register(&NewType<ST>::New, &typeid(ST), id); }
+
+public:
+	Index<I>                  id_index;
+	Vector< One<T> (*)()>     factories;
+	Index<const type_info *, PtrHash> type_index;
+//	static Index<I>&                 GetIDIndex()   { static Index<I> index; return index; }
+//	static Vector<One<T> (*)()>&     GetFactories() { static Vector<One<T> (*)()> factories; return factories; }
+//	static Index<const type_info *, PtrHash>& GetTypeIndex() { static Index<const type_info *, PtrHash> index; return index; }
+};
+
+template <class T, class I>
+One<T> TypeMap<T, I>::CreateObject(I id) const
+{
+	if(IsNull(id))
+		return 0;
+	int f = id_index.Find(id);
+	if(f < 0)
+		return 0;
+	return factories[f]();
+}
+
+template <class T, class I>
+I TypeMap<T, I>::QueryObject(const T *object) const
+{
+	if(!object)
+		return Null;
+	int i = type_index.Find(&typeid(*object));
+	return i >= 0 ? id_index[i] : I(Null);
+}
+
+template <class T, class I>
+One<T> TypeMap<T, I>::Copy(const One<T>& object) const
+{
+	if(!object)
+		return NULL;
+	return this->SerializeIn(SerializeOut(object));
+}
+
+template <class T, class I>
+One<T> TypeMap<T, I>::SerializeIn(const String& string) const
+{
+	One<T> object;
+	StringStream strm(string);
+	Serialize(strm, object);
+	return object;
+}
+
+template <class T, class I>
+String TypeMap<T, I>::SerializeOut(const One<T>& object) const
+{
+	StringStream ss;
+	Serialize(ss, const_cast<One<T>&>(object));
+	return ss;
+}
+
+template <class T, class I>
+void TypeMap<T, I>::Serialize(Stream& stream, One<T>& object) const
+{
+	I ID;
+	if(stream.IsStoring())
+		ID = QueryObject(~object);
+	stream / ID;
+	if(stream.IsLoading()) {
+		object = CreateObject(ID);
+		if(object)
+			stream % *object;
+		else if(!IsNull(ID))
+			stream.SetError();
+	}
+	else if(object)
+		stream % *object;
+}
+
+template <class T, class I>
+void TypeMap<T, I>::Serialize(Stream& stream, Array<T>& array) const
+{
+	int c = array.GetCount();
+	stream % c;
+	if(stream.IsStoring()) {
+		for(int i = 0; i < c; i++) {
+			I ID = QueryObject(&array[i]);
+			stream / ID;
+			stream % array[i];
+		}
+	}
+	else {
+		array.SetCount(c);
+		for(int i = 0; i < c; i++) {
+			I ID;
+			stream / ID;
+			One<T> object = CreateObject(ID);
+			if(object) {
+				array.Add(-object);
+				stream % array.Top();
+			}
+			else {
+				stream.SetError();
+				return;
+			}
+		}
+	}
+}
+
+template <class T, class I>
+void TypeMap<T, I>::Register(NewFunc fn, const type_info *ti, I id)
+{
+	int tx = type_index.Find(ti);
+	if(tx >= 0)
+		ASSERT((id_index[tx] == id));
+	else {
+		ASSERT((id_index.Find(id) < 0));
+		type_index.Add(ti);
+		id_index.Add(id);
+		factories.Add() = fn;
+	}
+}
+
+template <class T>
+void StreamOne(Stream& stream, One<T>& one)
+{
+	bool full = one;
+	stream % full;
+	if(stream.IsLoading())
+		if(full)
+			one = new T;
+		else
+			one = NULL;
+	if(one)
+		stream % *one;
+}
+
+template <class T>
+One<T> StreamCopyOne(const One<T>& one)
+{
+	if(!one)
+		return NULL;
+	String aux = SerializeOut(*one);
+	One<T> out = new T;
+	SerializeIn(*out, aux);
+	return out;
+}
+
+template <class B>
+struct NewableType {
+	typedef B *(*Factory)();
+
+	typedef VectorMap<const type_info *, Factory, PtrHash> FactoryMap;
+
+	static FactoryMap& Factories();
+
+	static B          *New(const type_info& t); // throws on failure
+	static B          *NewNull(const type_info& t); // may return 0
+	static Factory     GetFactory(const type_info& t);
+};
+
+template <class B>
+typename NewableType<B>::FactoryMap& NewableType<B>::Factories()
+{
+	static FactoryMap *pmap = 0;
+	if(!pmap) // a nasty trick patching multiple construction compiler error
+	{
+		static FactoryMap map;
+		pmap = &map;
+	}
+	return *pmap;
+}
+
+template <class B>
+B *NewableType<B>::New(const type_info& t)
+{
+	B *ptr = NewNull(t);
+	if(ptr == NULL)
+		throw Exc(NFormat("Objekt '%s' nen� registrov�n.", t.name()));
+	return ptr;
+}
+
+template <class B>
+B *NewableType<B>::NewNull(const type_info& t)
+{
+	Factory factory = GetFactory(t);
+	return factory ? factory() : 0;
+}
+
+template <class B>
+typename NewableType<B>::Factory NewableType<B>::GetFactory(const type_info& t)
+{
+	return Factories().Get(&t, 0);
+}
+
+template <class B, class C>
+struct RegisterNewableType : NewableType<B>
+{
+	RegisterNewableType() { typename NewableType<B>::Factory f = CreateObject; this->Factories().FindAdd(&typeid(C), f); }
+
+private:
+	static B *CreateObject() { return new C; }
+};
+
+//////////////////////////////////////////////////////////////////////
+// RefMemStat: refcounted object memory statistics.
+
+#ifdef flagREFDEBUG
+#define REF_DEBUG
+#endif//flagREFDEBUG
+
+class RefMemStat
+{
+public:
+	RefMemStat() {}
+	RefMemStat(const RefMemStat& rms, int deep) : alloc_map(rms.alloc_map, 0) {}
+
+	static RefMemStat&             App();
+
+	void                           Add(const String& name, int allocindex);
+	void                           Remove(const String& name, int allocindex);
+
+	String                         Format(bool index = false) const;
+	String                         FormatDelta(const RefMemStat& old, bool index = false) const;
+
+private:
+	VectorMap<String, Index<int> > alloc_map;
+};
+template class DeepCopyOption<RefMemStat>;
+
+//////////////////////////////////////////////////////////////////////
+// RefBase: base for refcounted objects.
+
+/* TRC 2/12/2003: moved to Web/util
+template <class T>
+inline Value RefConToValue(RefCon<T> p)        { return StrongValue< RefCon<T> >(p); }
+
+template <class T>
+inline Value RefPtrToValue(RefPtr<T> p)        { return StrongValue< RefPtr<T> >(p); }
+*/
+
+class WeakBase : public Link<WeakBase>
+{
+public:
+	virtual ~WeakBase() { DbgChk(); }
+	virtual void Clear() = 0;
+
+#ifdef _DEBUG
+	void         DbgChk() const { Chk(); }
+#else
+	void         DbgChk() const {}
+#endif
+
+	void         Chk() const;
+};
+
+template <class T>
+class UPP::RefCon;
+
+template <class T>
+class UPP::RefPtr;
+
+class WeakRef;
+
+template <class T>
+class WeakCon : public WeakBase
+{
+	friend class WeakRef;
+	friend class UPP::RefCon<T>;
+
+public:
+	WeakCon() : ptr(0) {}
+	WeakCon(const WeakCon<T>& p)                         { p.Chk(); if(ptr = p.ptr) LinkAfter(ptr); Chk(); }
+	WeakCon(const T *p)                                  { if(ptr = const_cast<T *>(p)) LinkAfter(ptr); Chk(); }
+	WeakCon(const RefCon<T>& p)                          { if(ptr = const_cast<T *>(~p)) LinkAfter(ptr); Chk(); }
+	~WeakCon()                                           { Chk(); }
+
+	operator       RefCon<T> () const                    { return RefCon<T>(ptr); }
+
+	WeakCon<T>&    operator = (const T *p)               { Chk(); Unlink(); if(ptr = const_cast<T *>(p)) LinkAfter(ptr); Chk(); return *this; }
+	WeakCon<T>&    operator = (const WeakCon<T>& p)      { Chk(); Unlink(); if(ptr = p.ptr) LinkAfter(ptr); Chk(); return *this; }
+	WeakCon<T>&    operator = (const RefCon<T>& p)       { Chk(); Unlink(); if(ptr = p.ptr) LinkAfter(ptr); Chk(); return *this; }
+
+	virtual void   Clear()                               { Chk(); Unlink(); ptr = 0; }
+	bool           IsEmpty() const                       { return ptr == NULL; }
+	bool           operator ! () const                   { return IsEmpty(); }
+
+	const T       *operator ~ () const                   { return ptr; }
+	const T&       operator * () const                   { ASSERT(ptr); return *ptr; }
+	const T       *operator -> () const                  { ASSERT(ptr); return ptr; }
+
+	friend bool     operator == (const WeakCon<T>& a, const WeakCon<T>& b) { return a.ptr == b.ptr; }
+	friend bool     operator != (const WeakCon<T>& a, const WeakCon<T>& b) { return a.ptr != b.ptr; }
+	friend unsigned GetHashValue(const WeakCon<T>& a)                      { return UPP::GetHashValue(a.ptr); }
+
+protected:
+	T              *ptr;
+};
+
+template <class T>
+class WeakPtr : public WeakCon<T>
+{
+public:
+	WeakPtr() {}
+	WeakPtr(const WeakPtr<T>& p) : WeakCon<T>(p)         {}
+	WeakPtr(T *p) : WeakCon<T>(p)                        {}
+	WeakPtr(const RefPtr<T>& p) : WeakCon<T>(p)          {}
+
+	operator       RefPtr<T> () const                    { return RefPtr<T>(const_cast<T *>(this->ptr)); }
+
+	WeakPtr<T>&    operator = (T *p)                     { this->Chk(); this->Unlink(); if(this->ptr = p) LinkAfter(this->ptr); this->Chk(); return *this; }
+	WeakPtr<T>&    operator = (const WeakPtr<T>& p)      { this->Chk(); this->Unlink(); if(this->ptr = p.ptr) LinkAfter(this->ptr); this->Chk(); return *this; }
+	WeakPtr<T>&    operator = (const RefPtr<T>& p)       { this->Chk(); this->Unlink(); if(this->ptr = ~p) LinkAfter(this->ptr); this->Chk(); return *this; }
+
+	T             *operator ~ () const                   { return const_cast<T *>(this->ptr); }
+	T&             operator * () const                   { ASSERT(this->ptr); return *const_cast<T *>(this->ptr); }
+	T             *operator -> () const                  { ASSERT(this->ptr); return const_cast<T *>(this->ptr); }
+};
+
+class WeakRef : public Link<WeakBase>
+{
+public:
+	WeakRef() : refcount(0) {}
+	virtual ~WeakRef()                  { ASSERT(refcount == 0); while(GetNext() != GetPtr()) GetNext()->Clear(); }
+
+	int             GetRefCount() const { return AtomicXAdd(refcount, 0); }
+	void            AddRef() const      { if(this) AtomicInc(refcount); }
+	void            Release() const     { if(this && !AtomicDec(refcount)) delete this; }
+
+private:
+	mutable Atomic  refcount;
+};
+
+template <class T>
+class VirtualArrayData : public RefBase
+{
+public:
+	virtual ~VirtualArrayData() {}
+
+	virtual void     SetCount(int count) = 0;
+	virtual void     SetCountR(int count) = 0;
+	virtual int      GetCount() const = 0;
+	virtual void     Set(int i, T t) = 0;
+	virtual T        Get(int i) const = 0;
+};
+
+template <class T>
+class VirtualArray : Moveable< VirtualArray<T> >
+{
+public:
+	VirtualArray() {}
+	VirtualArray(VirtualArrayData<T> *data) : data(data) {}
+
+	bool             IsNullInstance() const    { return !data; }
+	void             SetCount(int count)       { data->SetCount(count); }
+	void             SetCountR(int count)      { data->SetCountR(count); }
+	int              GetCount() const          { return data->GetCount(); }
+	void             Set(int i, T t)           { data->Set(i, t); }
+	T                Get(int i) const          { return data->Get(i); }
+
+	T                operator [] (int i) const { ASSERT(i >= 0 && i < GetCount()); return Get(i); }
+	void             Add(T t)                  { int c = GetCount(); SetCountR(c + 1); Set(c, t); }
+
+	void             Clear()                   { data->SetCount(0); }
+	bool             IsEmpty() const           { return data->GetCount() == 0; }
+
+	typedef T        ValueType;
+
+	class ConstIterator
+	{
+	protected:
+		const VirtualArray<T> *cont;
+		int                    ii;
+
+	public:
+		T              operator*() const       { return (*cont)[ii]; }
+		T              operator[](int i) const { return (*cont)[ii + i]; }
+
+		ConstIterator& operator++()           { ++ii; return *this; }
+		ConstIterator& operator--()           { --ii; return *this; }
+		ConstIterator  operator++(int)        { ConstIterator t = *this; ++ii; return t; }
+		ConstIterator  operator--(int)        { ConstIterator t = *this; --ii; return t; }
+
+		ConstIterator& operator+=(int d)      { ii += d; return *this; }
+		ConstIterator& operator-=(int d)      { ii -= d; return *this; }
+
+		ConstIterator  operator+(int d) const { return ConstIterator(cont, ii + d); }
+		ConstIterator  operator-(int d) const { return ConstIterator(cont, ii - d); }
+
+		int  operator-(const ConstIterator& b) const   { return ii - b.ii; }
+
+		bool operator==(const ConstIterator& b) const  { return ii == b.ii; }
+		bool operator!=(const ConstIterator& b) const  { return ii != b.ii; }
+		bool operator<(const ConstIterator& b) const   { return ii < b.ii; }
+		bool operator>(const ConstIterator& b) const   { return ii > b.ii; }
+		bool operator<=(const ConstIterator& b) const  { return ii <= b.ii; }
+		bool operator>=(const ConstIterator& b) const  { return ii >= b.ii; }
+
+//		operator bool() const                          { return ii < 0; }
+
+		ConstIterator()                                { cont = NULL; ii = -1; }
+		ConstIterator(const VirtualArray<T> *_cont, int ii) : cont(_cont), ii(ii) {}
+	};
+
+	ConstIterator    Begin() const             { return ConstIterator(this, 0); }
+	ConstIterator    End() const               { return ConstIterator(this, GetCount()); }
+	ConstIterator    GetIter(int i) const      { ASSERT(i >= 0 && i <= GetCount()); return ConstIterator(this, i); }
+
+private:
+	RefPtr< VirtualArrayData<T> > data;
+};
+
+template <class VT, class ST, int SN = 1024>
+class VirtualSegtorArray : public VirtualArrayData<VT>
+{
+public:
+	virtual void   SetCount(int count)  { container.SetCount(count); }
+	virtual void   SetCountR(int count) { container.SetCount(count); } //!! Fidler: co takhle Segtor::SetCountR?
+	virtual int    GetCount() const     { return container.GetCount(); }
+
+protected:
+	Segtor<ST, SN> container;
+};
+
+template <class VT, class ST, int SN = 1024>
+class VirtualStdSegtorArray : public VirtualSegtorArray<VT, ST, SN>
+{
+public:
+	virtual void     Set(int i, VT t)   { this->container[i] = t; }
+	virtual VT       Get(int i) const   { return this->container[i]; }
+};
+
+template <class T>
+class VirtualValueArray : public VirtualStdSegtorArray<Value, T>
+{
+};
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/TCore/util.cpp b/uppsrc/TCore/util.cpp
new file mode 100644
index 000000000..80155693a
--- /dev/null
+++ b/uppsrc/TCore/util.cpp
@@ -0,0 +1,1240 @@
+#include "TCore.h"
+#pragma hdrstop
+
+#ifdef PLATFORM_WIN32
+#include <float.h>
+#endif
+#ifdef PLATFORM_POSIX
+#include <math.h>
+#endif
+#ifdef PLATFORM_SOLARIS
+#include <ieeefp.h>
+#endif
+
+NAMESPACE_UPP
+
+bool IsNan(double t)
+{
+#ifdef PLATFORM_WIN32
+	return _isnan(t);
+#elif defined(PLATFORM_POSIX)
+	return isnan(t);
+#else
+	#error
+	return false;
+#endif
+}
+
+bool IsInf(double t)
+{
+#ifdef PLATFORM_WIN32
+	return !_finite(t);
+#elif defined(PLATFORM_POSIX)
+	return !finite(t);
+#else
+	#error
+	return false;
+#endif
+}
+
+void WeakBase::Chk() const
+{
+	if(!this)
+		return;
+	const WeakBase *ptr = GetPtr(), *p;
+	int cl = 0, cr = 0;
+	for(p = GetNext(); p != ptr; p = p -> GetNext(), cr++)
+		if(p -> GetNext() -> GetPrev() != p)
+		{ NEVER(); }
+	for(p = GetPrev(); p != ptr; p = p -> GetPrev(), cl++)
+		if(p -> GetPrev() -> GetNext() != p)
+		{ NEVER(); }
+	ASSERT(cl == cr);
+}
+
+Point Transform(Point pt, const Rect& from_rc, const Rect& to_rc)
+{
+	return IsNull(pt) ? Point(Null)
+	: to_rc.TopLeft() + iscale(pt - from_rc.TopLeft(), to_rc.Size(), from_rc.Size());
+}
+
+Rect Transform(const Rect& rc, const Rect& from_rc, const Rect& to_rc, bool normalize)
+{
+	if(IsNull(rc))
+		return Null;
+	Size fs = from_rc.Size(), ts = to_rc.Size();
+	Point fp = from_rc.TopLeft(), tp = to_rc.TopLeft();
+	Point tl = tp + iscale(rc.TopLeft() - fp, ts, fs);
+	Point br = tp + iscale((normalize ? rc.BottomRight() - 1 : rc.BottomRight()) - fp, ts, fs);
+	return normalize ? RectSort(tl, br) : Rect(tl, br);
+}
+
+static void SplitCommandLineRaw(Vector<String>& out, const char* cmdline, int response_nesting)
+{
+	for(;;)
+	{
+		while((byte)*cmdline <= ' ')
+			if(*cmdline++ == 0)
+				return;
+
+		// beginning of an argument
+		String s;
+		if(*cmdline == '\"')
+		{ // quoted argument
+			while(*++cmdline != 0 && (*cmdline != '\"' || *++cmdline == '\"'))
+				s += *cmdline;
+		}
+		else if(*cmdline == '#')
+		{ // comment until end of line
+			while(*cmdline && *cmdline != '\n')
+				cmdline++;
+		}
+		else
+		{ // normal argument - skip to next blank
+			while((byte)*cmdline > ' ')
+				s += *cmdline++;
+		}
+		if(!IsNull(s))
+			if(response_nesting > 0 && *s == '@')
+				SplitCommandLineRaw(out, LoadFile(s.Begin() + 1), response_nesting - 1);
+			else
+				out.Add(s);
+	}
+}
+
+Vector<String> SplitCommandLine(const char *cmdline, bool response_files)
+{
+	Vector<String> result;
+	SplitCommandLineRaw(result, cmdline, response_files ? 10 : 1);
+	result.Shrink();
+	return result;
+}
+
+/* TRC 2/12/2003: moved to Web
+static void GetLineIndex(String file, HashBase& hash, Vector<String>& lines)
+{
+	const char *p = file;
+	while(*p)
+	{
+		while(*p && *p != '\n' && (byte)*p <= ' ')
+			p++;
+		const char *b = p;
+		while(*p && *p++ != '\n')
+			;
+		const char *e = p;
+		while(e > b && (byte)e[-1] <= ' ')
+			e--;
+		String s(b, e);
+		hash.Add(GetHashValue(s));
+		lines.Add(s);
+	}
+}
+
+int LocateLine(String old_file, int old_line, String new_file)
+{
+	HashBase old_hash, new_hash;
+	Vector<String> old_lines, new_lines;
+	GetLineIndex(old_file, old_hash, old_lines);
+	GetLineIndex(new_file, new_hash, new_lines);
+	if(old_line <= 0)
+		return 0;
+	if(old_line >= old_lines.GetCount())
+		return new_lines.GetCount();
+	String line = old_lines[old_line];
+	int hash = old_hash[old_line];
+	int best_match = 0, best_value = 0;
+	int fore_count = old_lines.GetCount() - old_line - 1;
+	for(int r = 0; r < 10 && !best_value; r++)
+	{
+		int src = (r & 1 ? old_line + (r >> 1) + 1 : old_line - (r >> 1));
+		if(src < 0 || src >= old_lines.GetCount())
+			continue;
+		dword hash = old_hash[src];
+		for(int i = new_hash.Find(hash); i >= 0; i = new_hash.FindNext(i))
+			if(new_lines[i] == old_lines[src])
+			{
+				int max_back = min(i, src);
+				int max_fore = min(new_lines.GetCount() - i, old_lines.GetCount() - src) - 1;
+				if(max_back + max_fore <= best_value)
+					continue;
+				int back = 1;
+				while(back <= max_back && new_hash[i - back] == old_hash[src - back]
+					&& new_lines[i - back] == old_lines[src - back])
+					back++;
+				int fore = 1;
+				while(fore < max_fore && new_hash[i + fore] == old_hash[src + fore]
+					&& new_lines[i + fore] == old_lines[src + fore])
+					fore++;
+				if(back + fore > best_value)
+				{
+					best_value = back + fore;
+					best_match = minmax(i, 0, new_lines.GetCount());
+				}
+			}
+	}
+	return best_match;
+}
+*/
+
+longlong_t GetHotKey(byte c, bool ascii_only)
+{
+	if(IsDigit(c))
+		return LL_(1) << (c - '0');
+	if(!ascii_only)
+		c = ToAscii(c);
+	c = ToUpper(c);
+	if(IsUpper(c))
+		return (LL_(1) << 10) << (c - 'A');
+	return 0;
+}
+
+longlong_t GetHotKey(const char* text, bool ascii_only)
+{
+	for(; *text && *text != '\t'; text++)
+		if(*text == '&' && text[1] && *++text != '&')
+		{
+			longlong_t key = GetHotKey(*text, ascii_only);
+			if(key)
+				return key;
+		}
+
+	return 0;
+}
+
+char GetHotKeyText(longlong_t hotkey)
+{
+	int i = -1;
+	if(hotkey)
+		for(i = 0; !(hotkey & 1); hotkey >>= 1, i++)
+			;
+	if(i >= 0 && i < 10)
+		return '0' + i;
+	if(i >= 10 && i < 36)
+		return 'A' + i - 10;
+	return 0;
+}
+
+String StripHotText(const char* s)
+{
+	String result;
+	for(; *s; result += *s++)
+		if(*s == '&' && *++s == 0)
+			break;
+	return result;
+}
+
+String HotTextToSmartText(const char *s)
+{
+	String result;
+	while(*s)
+	{
+		const char *p = s;
+		while(*s && *s != '&')
+			s++;
+		result.Cat(p, s - p);
+		if(*s == '&' && *++s && *s != '&')
+			result << '\a' << *s++ << '\a';
+	}
+	return result;
+}
+
+int PutGetMW(Stream& stream, int value)
+{
+	if(stream.IsLoading())
+		return stream.Get16be();
+	stream.Put16be(value);
+	return value;
+}
+
+int PutGetIW(Stream& stream, int value)
+{
+	if(stream.IsLoading())
+		return stream.Get16le();
+	stream.Put16le(value);
+	return value;
+}
+
+int PutGetML(Stream& stream, int value)
+{
+	if(stream.IsLoading())
+		return stream.Get32be();
+	stream.Put32be(value);
+	return value;
+}
+
+int PutGetIL(Stream& stream, int value)
+{
+	if(stream.IsLoading())
+		return stream.Get32le();
+	stream.Put32le(value);
+	return value;
+}
+
+int64 PutGetM64(Stream& stream, int64 value)
+{
+	if(stream.IsLoading())
+		return stream.Get64be();
+	stream.Put64be(value);
+	return value;
+}
+
+int64 PutGetI64(Stream& stream, int64 value)
+{
+	if(stream.IsLoading())
+		return stream.Get64le();
+	stream.Put64le(value);
+	return value;
+}
+
+static void Swap8(byte *data)
+{
+	byte temp[8];
+	temp[0] = data[7];
+	temp[1] = data[6];
+	temp[2] = data[5];
+	temp[3] = data[4];
+	temp[4] = data[3];
+	temp[5] = data[2];
+	temp[6] = data[1];
+	temp[7] = data[0];
+	memcpy(data, temp, 8);
+}
+
+void StreamID(Stream& stream, double& value)
+{
+	ASSERT(sizeof(value) == 8);
+#ifndef CPU_LITTLE_ENDIAN
+	if(stream.IsStoring())
+		Swap8((byte *)&value);
+#endif
+	stream.SerializeRaw((byte *)&value, 8);
+#ifndef CPU_LITTLE_ENDIAN
+	if(stream.IsLoading())
+		Swap8((byte *)&value);
+#endif
+	if(stream.IsLoading() && value < -1e300)
+		value = Null;
+}
+
+void StreamMD(Stream& stream, double& value)
+{
+	ASSERT(sizeof(value) == 8);
+#ifdef CPU_LITTLE_ENDIAN
+	if(stream.IsStoring())
+		Swap8((byte *)&value);
+#endif
+	stream.SerializeRaw((byte *)&value, 8);
+#ifdef CPU_LITTLE_ENDIAN
+	if(stream.IsLoading())
+		Swap8((byte *)&value);
+#endif
+	if(stream.IsLoading() && value < -1e300)
+		value = Null;
+}
+
+void StreamIFP(Stream& stream, Pointf& pt)
+{
+#ifdef CPU_LITTLE_ENDIAN
+	ASSERT(sizeof(double) == 8);
+	stream.SerializeRaw((byte *)&pt, sizeof(pt));
+#else
+	StreamID(stream, pt.x);
+	StreamID(stream, pt.y);
+#endif
+}
+
+void StreamIFR(Stream& stream, Rectf& rect)
+{
+#ifdef CPU_LITTLE_ENDIAN
+	ASSERT(sizeof(double) == 8);
+	stream.SerializeRaw((byte *)&rect, sizeof(rect));
+#else
+	StreamID(stream, rect.left);
+	StreamID(stream, rect.top);
+	StreamID(stream, rect.right);
+	StreamID(stream, rect.bottom);
+#endif
+}
+
+/*
+String StringSample(const char *p, int limit)
+{
+	const char *e = (const char *)memchr(p, 0, limit + 1);
+	if(e)
+		return String(p, e);
+	return String(p, limit) + "...";
+}
+*/
+
+String StringReplace(const String& str, const String& find, const String& replace)
+{
+	int flen = find.GetLength();
+	int count = str.GetLength() - flen;
+	if(count < 0)
+		return str;
+	const char *s = str, *e = s + count, *f = find, *p = s;
+	String result;
+	while(s <= e)
+		if(*s == *f && !memcmp(s, f, flen))
+		{
+			result.Cat(p, s - p);
+			result += replace;
+			p = (s += flen);
+		}
+		else
+			s++;
+	result.Cat(p, str.End() - p);
+	return result;
+}
+
+const char *StringFind(const char *sbegin, const char *send, const char *subbegin, const char *subend)
+{
+	if(!send) send = sbegin + strlen(sbegin);
+	if(!subend) subend = subbegin + strlen(subbegin);
+	int len = send - sbegin;
+	int sublen = subend - subbegin;
+	ASSERT(sublen);
+	if(sublen == 0)
+		return sbegin;
+	if(len < sublen)
+		return 0;
+	if(sublen == 1)
+		return reinterpret_cast<const char *>(memchr(sbegin, *subbegin, len - 1));
+	for(send -= sublen - 1; sbegin < send; sbegin++)
+		if(*sbegin == *subbegin && !memcmp(sbegin, subbegin, sublen))
+			return sbegin;
+	return 0;
+}
+
+int StringFind(const String& string, const String& substring, int start_pos)
+{
+	ASSERT(start_pos >= 0 && start_pos <= string.GetLength());
+	const char *p = StringFind(string.Begin() + start_pos, string.End(), substring.Begin(), substring.End());
+	return p ? p - ~string : -1;
+}
+
+String FromCString(const char *cstring)
+{
+	try
+	{
+		CParser parser(cstring);
+		return parser.ReadOneString();
+	}
+	catch(CParser::Error e)
+	{
+		return Null;
+	}
+}
+
+bool HasNlsLetters(WString s)
+{
+	for(const wchar *p = s.Begin(), *e = s.End(); p < e; p++)
+		if(IsLetter(*p) && *p != ToAscii(*p))
+			return true;
+	return false;
+}
+
+/*
+#ifdef PLATFORM_WIN32
+String GetLocaleInfo(LCTYPE type, LCID locale)
+{
+	int count = GetLocaleInfo(locale, type, NULL, 0);
+	if(--count <= 0)
+		return Null;
+	String temp;
+	GetLocaleInfo(locale, type, temp.GetBuffer(count), count + 1);
+	temp.ReleaseBuffer(count);
+	return temp;
+}
+#endif
+*/
+
+/*
+static const char *NlsFindDigits(const char *src, String& dest)
+{
+	if(*src && !IsDigit(*src))
+	{
+		const char *start = src;
+		while(*++src && !IsDigit(*src))
+			;
+		dest.Cat(start, src - start);
+	}
+	return src;
+}
+*/
+
+/*
+static const char *NlsCopyDigits(const char *src, String& dest)
+{
+	if(IsDigit(*(src = NlsFindDigits(src, dest))))
+	{
+		const char *p = src;
+		while(IsDigit(*++src))
+			;
+		int first = (src - p + 2) % 3 + 1;
+		while(p < src)
+		{
+			dest.Cat(p, first);
+			if((p += first) < src)
+			{
+#ifdef PLATFORM_WIN32
+				static String thousands = GetLocaleInfo(LOCALE_STHOUSAND);
+#else
+				static String thousands = " ";
+#endif
+				dest.Cat(thousands);
+				first = 3;
+			}
+		}
+	}
+	return src;
+}
+*/
+
+/*
+static String NlsFormatRaw(const char *n)
+{
+	if(*n == 0)
+		return Null;
+	String result;
+	n = NlsCopyDigits(n, result);
+	if(*n == '.')
+	{ // decimal separator
+#ifdef PLATFORM_WIN32
+		static String decimals = GetLocaleInfo(LOCALE_SDECIMAL);
+#else
+		static String decimals = ",";
+#endif
+		n++;
+		result.Cat(decimals);
+		const char *s = n;
+		while(IsDigit(*n))
+			n++;
+		result.Cat(s, n - s);
+	}
+	if(*(n = NlsCopyDigits(n, result)))
+		result.Cat(n);
+	return result;
+}
+*/
+
+String NlsFormat(int value) { return GetLanguageInfo().FormatInt(value); }
+/*
+{
+	if(IsNull(value))
+		return Null;
+	String dest;
+	String is = IntStr(value);
+	const char *p = NlsCopyDigits(is, dest);
+	if(*p)
+		dest.Cat(p);
+	return dest;
+}
+*/
+
+String NlsFormat(double value, int decimal_places)
+{ return GetLanguageInfo().FormatDouble(value, tabs(decimal_places), decimal_places >= 0 ? 0 : FD_ZERO); }
+/*
+String NlsFormat(double value, int decimal_places)
+{
+	return NlsFormatRaw(FormatDouble(value, tabs(decimal_places), decimal_places >= 0 ? 0 : FD_ZERO));
+}
+*/
+
+String NlsFormatRel(double value, int relative_places)
+{ return GetLanguageInfo().FormatDouble(value, tabs(relative_places), FD_REL | (relative_places >= 0 ? 0 : FD_ZERO)); }
+
+/*
+String NlsFormatRel(double value, int relative_places)
+{
+	return NlsFormatRaw(FormatDouble(value, tabs(relative_places), FD_REL | (relative_places >= 0 ? 0 : FD_ZERO)));
+}
+*/
+
+static String CvDbl(double d, int places, bool nls)
+{
+	if(nls)
+		return NlsFormatRel(d, places);
+	else
+		return FormatDouble(d, places, FD_REL);
+}
+
+String FormatFraction(double factor, const char *pattern)
+{
+	if(IsNull(factor))
+		return Null;
+	if(factor >= 1)
+		return NFormat(pattern, factor) + " : 1";
+	else if(factor > 0)
+		return "1 : " + NFormat(pattern, 1 / factor);
+	else
+		return NFormat(pattern, factor);
+}
+
+Value ConvertFraction::Format(const Value& value) const
+{
+//	RLOG("ConvertFraction(" << StdFormat(value) << ")");
+	if(IsNull(value) || IsString(value))
+		return value;
+	return FormatFraction(value, pattern);
+}
+
+GLOBAL_VARP(const ConvertFraction, StdConvertFraction, (Null, Null, false))
+
+Value ConvertFraction::Scan(const Value& value) const
+{
+	String s = value;
+	const char *p = s;
+	while(*p == ' ')
+		p++;
+	if(*p == 0)
+		return notnull ? ErrorValue(t_("Null value not allowed.")) : Null;
+
+	double d = ScanDouble(p, &p);
+	if(IsNull(d))
+		return ErrorValue(t_("Real number expected."));
+	while(*p == ' ')
+		p++;
+	if(*p == ':')
+	{
+		while(*++p == ' ')
+			;
+		double n = ScanDouble(p, &p);
+		if(IsNull(n))
+			return ErrorValue(t_("Real number expected."));
+		if(fabs(n) <= 1e-100)
+			return ErrorValue(t_("Fraction denominator is too small."));
+		d /= n;
+		while(*p == ' ')
+			p++;
+	}
+	if(*p)
+		return ErrorValue(NFormat(t_("Illegal trailing character '%c' (0x%1:02x)"), (int)(byte)*p));
+	if(!IsNull(minval) && d < minval)
+		return ErrorValue(t_("Lower bound exceeded."));
+	if(!IsNull(maxval) && d > maxval)
+		return ErrorValue(t_("Upper bound exceeded."));
+
+	return d;
+}
+
+int ConvertFraction::Filter(int c) const
+{
+	return c == ':' ? c : ConvertDouble::Filter(c);
+}
+
+class CFormatConvertCls : public Convert
+{
+public:
+	virtual Value Format(const Value& v) const;
+	virtual Value Scan(const Value& v) const;
+};
+
+Value CFormatConvertCls::Format(const Value& v) const
+{
+	String vs = StdFormat(v);
+	String out;
+//	out.SetCharset(vs.GetCharset());
+	for(const char *p = vs, *e = vs.End(); p < e; p++)
+		if((byte)*p >= ' ' && *p != '\x7F' && *p != '\xFF' && *p != '\\')
+			out.Cat(*p);
+		else
+			switch(*p)
+			{
+			case '\\': out << "\\\\"; break;
+			case '\v': out << "\\v"; break;
+			case '\f': out << "\\f"; break;
+			case '\t': out << "\\t"; break;
+			case '\n': out << "\\n"; break;
+			case '\r': out << "\\r"; break;
+			case '\a': out << "\\a"; break;
+			case '\b': out << "\\b"; break;
+			default:
+				if(*p >= 0 && *p <= 7 && (p + 1 >= e || !IsDigit(p[1])))
+				{
+					out.Cat('\\');
+					out.Cat('0' + *p);
+				}
+				else
+				{
+					out.Cat("\\x");
+					out.Cat(FormatIntHex((byte)*p, 2));
+				}
+				break;
+			}
+	return out;
+}
+
+Value CFormatConvertCls::Scan(const Value& v) const
+{
+	String vs = StdFormat(v);
+	String out;
+//	out.SetCharset(vs.GetCharset());
+	for(const char *p = vs; *p; p++)
+		if(*p != '\\')
+			out.Cat(*p);
+		else
+			switch(*++p)
+			{
+			case 0: return out;
+			case 'v':  out.Cat('\v'); break;
+			case 'f':  out.Cat('\f'); break;
+			case 't':  out.Cat('\t'); break;
+			case 'n':  out.Cat('\n'); break;
+			case 'r':  out.Cat('\r'); break;
+			case 'a':  out.Cat('\a'); break;
+			case 'b':  out.Cat('\b'); break;
+			case '\\': out.Cat('\\'); break;
+			case 'x':
+				if(IsXDigit(p[1]))
+				{
+					char hex = ctoi(*++p);
+					if(IsXDigit(p[1]))
+						hex = hex * 16 + ctoi(*++p);
+					out.Cat(hex);
+				}
+				else
+					out.Cat(*p);
+				break;
+
+			default:
+				if(*p >= '0' && *p <= '7')
+				{
+					char oct = *p - '0';
+					if(p[1] >= '0' && p[1] <= '7')
+					{
+						oct = 8 * oct + *++p - '0';
+						if(p[1] >= '0' && p[1] <= '7')
+							oct = 8 * oct + *++p - '0';
+					}
+					out.Cat(oct);
+				}
+				else
+					out.Cat(*p);
+				break;
+			}
+	return out;
+}
+
+const Convert& CFormatConvert()
+{
+	static CFormatConvertCls cls;
+	return cls;
+}
+
+String FormatIntCsPlural(int i, const char *b)
+{
+	if(IsNull(i))
+		return Null;
+	String out;
+	out << NlsFormat(i) << ' ';
+	i = tabs(i) % 100;
+	if(i < 10 || i > 20)
+		i %= 10;
+	const char *p = b;
+	while(*p && *p != '/')
+		p++;
+	if(p > b)
+		out.Cat(b, p - b);
+	if(*p)
+		p++;
+	b = p;
+	while(*p && *p != '/')
+		p++;
+	if(i == 1)
+	{
+		out.Cat(b, p - b);
+		return out;
+	}
+	if(*p)
+		p++;
+	b = p;
+	while(*p && *p != '/')
+		p++;
+	if(i >= 2 && i <= 4)
+	{
+		out.Cat(b, p - b);
+		return out;
+	}
+	if(*p)
+		p++;
+	out.Cat(p);
+	return out;
+}
+
+/* TRC 7/12/2003: moved to Core/Convert.cpp
+int ScanInt(const char *ptr, const char **endptr, int base)
+{
+	const char *s = ptr;
+	bool minus = false;
+	while(*s && (byte)*s <= ' ')
+		s++;
+	if(*s == '+' || *s == '-')
+		minus = (*s++ == '-');
+	unsigned u = stou(s, endptr, base);
+	if(~u)
+		return (minus ? -(int)u : (int)u);
+	else
+		return Null;
+}
+*/
+
+/*
+unsigned ctoi(char c)
+{
+	if(c >= '0' && c <= '9')
+		return c - '0';
+	if(c >= 'A' && c <= 'Z')
+		return c - 'A' + 10;
+	if(c >= 'a' && c <= 'z')
+		return c - 'a' + 10;
+	return (unsigned)-1;
+}
+*/
+
+/*
+unsigned stou(const void *ptr, void *endptr, unsigned base)
+{
+	ASSERT(base >= 2 && base <= 36);
+	const char *s = (const char *)ptr;
+	unsigned digit = ctoi(*s);
+	if(digit >= base)
+	{ // error
+		if(endptr)
+			*(const char **)endptr = s;
+		return ~0;
+	}
+	unsigned value = digit;
+	while((digit = ctoi(*++s)) < base)
+		value = value * base + digit;
+	if(endptr)
+		*(const char **)endptr = s;
+	return value;
+}
+*/
+
+/* TRC 7/12/2003: moved to Core/Convert.cpp
+double ScanDouble(const char *ptr, const char **endptr)
+{
+	static const char *dummy;
+	const char *s = ptr;
+	const char **end = (endptr ? endptr : &dummy);
+	String temp;
+	while(*s && (byte)*s <= ' ')
+		s++;
+	if(*s == '+' || *s == '-')
+		temp << *s++;
+	const char *last = s;
+	if(IsDigit(*s))
+	{
+		while(IsDigit(*++s))
+			;
+		temp.Cat(last, s - last);
+		last = s;
+		if(*s == '.')
+		{
+			last++;
+			if(IsDigit(*++s))
+			{
+				temp << '.';
+				while(IsDigit(*++s))
+					;
+			}
+		}
+	}
+	else if(*s == '.')
+	{
+		if(!IsDigit(*++s))
+		{ // error
+			*end = s;
+			return Null;
+		}
+		temp << "0.";
+		last = s;
+		while(IsDigit(*s))
+			temp.Cat((char)*s++);
+	}
+	else
+	{
+		*end = ptr;
+		return Null;
+	}
+	temp.Cat(last, s - last);
+	if(*s == 'e' || *s == 'E')
+	{
+		s++;
+		temp << 'e';
+		if(*s == '+' || *s == '-')
+			temp << *s++;
+		if(!IsDigit(*s))
+		{ // error in exponent
+			*end = s;
+			return Null;
+		}
+		last = s;
+		while(IsDigit(*++s))
+			;
+		temp.Cat(last, s - last);
+	}
+	last = NULL;
+	errno = 0;
+	double result = strtod(temp, (char **)&last);
+	*end = s;
+	if(errno || last != (const char *)temp + temp.GetLength())
+		result = Null;
+	return result;
+}
+*/
+
+/* TRC 7/12/2003: moved to Core/Convert.cpp
+double ScanDouble(const wchar *ptr, const wchar **endptr)
+{
+	static const wchar *dummy;
+	const wchar *s = ptr;
+	const wchar **end = (endptr ? endptr : &dummy);
+	String temp;
+	if(*s == '+' || *s == '-')
+		temp << (char)*s++;
+	if(*s <= 2047 && IsDigit(*s))
+	{
+		while(*s <= 2047 && IsDigit(*s))
+			temp.Cat((char)*s++);
+		if(*s == '.')
+		{
+			if(*s <= 2047 && IsDigit(*++s))
+			{
+				temp.Cat('.');
+				while(*s <= 2047 && IsDigit(*s))
+					temp.Cat((char)*s++);
+			}
+		}
+	}
+	else if(*s == '.')
+	{
+		if(*s > 2047 || !IsDigit(*++s))
+		{ // error
+			*end = s;
+			return Null;
+		}
+		temp.Cat("0.");
+		while(*s <= 2047 && IsDigit(*s))
+			temp.Cat((char)*s++);
+	}
+	else
+	{
+		*end = ptr;
+		return Null;
+	}
+	if(*s == 'e' || *s == 'E')
+	{
+		s++;
+		temp << 'e';
+		if(*s == '+' || *s == '-')
+			temp << *s++;
+		if(!IsDigit(*s))
+		{ // error in exponent
+			*end = s;
+			return Null;
+		}
+		while(IsDigit(*s))
+			temp.Cat((char)*s++);
+	}
+	errno = 0;
+	char *endp;
+	double result = strtod(temp, &endp);
+	*end = s;
+	if(errno || endp != temp.End())
+		result = Null;
+	return result;
+}
+*/
+
+/*
+double stod(const void *ptr, void *endptr, bool comma)
+{
+	static const char *dummy;
+	const char *s = (const char *)ptr;
+	const char **end = (endptr ? (const char **)endptr : &dummy);
+	String temp;
+	if(*s == '+' || *s == '-')
+		temp << *s++;
+	const char *last = s;
+	if(IsDigit(*s))
+	{
+		while(IsDigit(*++s))
+			;
+		temp.Cat(last, s - last);
+		last = s;
+		if(*s == '.' || comma && *s == ',')
+		{
+			last++;
+			if(IsDigit(*++s))
+			{
+				temp << '.';
+				while(IsDigit(*++s))
+					;
+			}
+		}
+	}
+	else if(*s == '.' || comma && *s == ',')
+	{
+		if(!IsDigit(*++s))
+		{ // error
+			*end = s;
+			return Null;
+		}
+		temp << "0.";
+		last = s;
+		while(IsDigit(*++s))
+			;
+	}
+	else
+	{
+		*end = (const char *)ptr;
+		return Null;
+	}
+	temp.Cat(last, s - last);
+	if(*s == 'e' || *s == 'E')
+	{
+		s++;
+		temp << 'e';
+		if(*s == '+' || *s == '-')
+			temp << *s++;
+		if(!IsDigit(*s))
+		{ // error in exponent
+			*end = s;
+			return Null;
+		}
+		last = s;
+		while(IsDigit(*++s))
+			;
+		temp.Cat(last, s - last);
+	}
+	last = NULL;
+	errno = 0;
+	double result = strtod(temp, (char **)&last);
+	*end = s;
+	if(errno || last != (const char *)temp + temp.GetLength())
+		result = Null;
+	return result;
+}
+*/
+
+bool SaveFileChanges(String fn, String data)
+{
+	return LoadFile(fn) == data || SaveFile(fn, data);
+}
+
+bool SaveFileBackup(String fn, String data, bool keep_backup)
+{
+	if(LoadFile(fn) == data)
+		return true;
+	String tfn = fn + ".$old";
+	FileDelete(tfn);
+	FileMove(fn, tfn);
+	bool res = SaveFile(fn, data);
+	if(!res)
+		FileDelete(fn);
+	else if(!keep_backup)
+		FileDelete(tfn);
+	return res;
+}
+
+bool FileFlush(FileStream& stream)
+{
+	ASSERT(stream.IsOpen());
+#ifdef PLATFORM_WIN32
+	return !!FlushFileBuffers(stream.GetHandle());
+#endif
+#ifdef PLATFORM_POSIX
+	return !fsync(stream.GetHandle());
+#endif
+}
+bool EqualsPath(const char *a, const char *b, int length)
+{
+	if(!length)
+		return true;
+#ifdef PLATFORM_WIN32
+	return !MemICmp(a, b, length);
+#else
+	return !memcmp(a, b, length);
+#endif
+}
+
+bool EqualsPath(String fa, String fb)
+{
+	return fa.GetLength() == fb.GetLength() && EqualsPath(fa, fb, fa.GetLength());
+}
+
+String MakePathLower(String path)
+{
+#ifdef PLATFORM_WIN32
+	return ToLower(path);
+#endif
+#ifdef PLATFORM_POSIX
+	return path;
+#endif
+}
+
+VectorMap<String, String> LoadKeyMap(const char *p)
+{
+	VectorMap<String, String> map;
+	while(*p)
+	{
+		while(*p && (byte)*p <= ' ')
+			p++;
+		if(*p != '#')
+		{
+			const char *b = p;
+			while(*p && *p != '\n' && *p != '=')
+				p++;
+			if(*p == '=')
+			{
+				const char *e = p++;
+				while(e > b && (byte)e[-1] <= ' ')
+					e--;
+				String key(b, e);
+				b = p;
+				while(*p && *p != '\n')
+					p++;
+				e = p;
+				while(e > b && (byte)e[-1] <= ' ')
+					e--;
+				map.Add(key, String(b, e));
+			}
+		}
+		while(*p && *p++ != '\n')
+			;
+	}
+	return map;
+}
+
+VectorMap<String, String> LoadKeyMapFile(const char *filename)
+{
+	return LoadKeyMap(LoadFile(filename));
+}
+
+String GetFileOnSystemPath(const char *file)
+{
+#ifdef PLATFORM_WIN32
+	char temp[MAX_PATH], *dummy;
+	*temp = 0;
+	SearchPath(NULL, file, NULL, sizeof(temp), temp, &dummy);
+	return temp;
+#endif
+#ifdef PLATFORM_POSIX
+//	puts(STR "SearchPath(" << filename << ", " << path << ")");
+	if(strchr(file, '/'))
+	{
+//		puts("-> full path");
+		return file; // full path
+	}
+
+	if(const char *path = getenv("PATH"))
+	{
+//		puts(STR "-> on path: " << path);
+		String ulist = String::GetVoid();
+		for(const char *s = path; *s;)
+			if(*s != ':' && *s != ';')
+			{
+				const char *b = s;
+				while(*s && *s != ':' && *s != ';')
+					s++;
+				String trypath = AppendFileName(String(b, s), file);
+//				puts(STR "-> trypath = " << trypath);
+				if(FileExists(trypath))
+					return trypath;
+			}
+			else
+				s++;
+	}
+//	puts("-> not found");
+	return file;
+#endif
+}
+
+const char *FetchCmdArg(const char *arg, int& i)
+{
+	if(!*arg) {
+		const Vector<String>& cmd = CommandLine();
+		if(++i >= cmd.GetCount())
+			throw Exc(NFormat("option '%s' missing argument", cmd[i - 1]));
+		arg = cmd[i];
+	}
+	return arg;
+}
+
+#ifdef PLATFORM_WIN32
+String SearchPath(String file)
+{
+	return GetFileOnPath(file, Environment().Get("PATH", Null));
+}
+
+String InstallServiceCmd(String service_name, String app_name, String arguments)
+{
+	String spath = "SYSTEM\\CurrentControlSet\\Services\\" + service_name;
+	String s = GetWinRegString("ImagePath", spath, HKEY_LOCAL_MACHINE);
+	if(IsNull(s))
+	{
+		String instsrv = SearchPath("instsrv.exe");
+		if(IsNull(instsrv))
+			return t_("'instsrv.exe' not found.");
+		String srvany = SearchPath("srvany.exe");
+		if(IsNull(srvany))
+			return t_("'svrany.exe' not found.");
+		String cmdline = instsrv + " \"" + service_name + "\" " + srvany;
+		if(WinExec(cmdline, SW_SHOW) <= 31)
+			return NFormat(t_("Error running '%s'."), instsrv);
+		while(IsNull(s = GetWinRegString("ImagePath", spath, HKEY_LOCAL_MACHINE)))
+			Sleep(1000);
+	}
+
+	spath << "\\Parameters";
+	SetWinRegString(app_name, "Application", spath, HKEY_LOCAL_MACHINE);
+	SetWinRegString(arguments, "AppParameters", spath, HKEY_LOCAL_MACHINE);
+	return Null;
+}
+#endif
+
+String AppendPath(String s, String new_path)
+{
+	String np = new_path;
+	if(np.IsEmpty())
+		return s;
+	if(*np.Last() == DIR_SEP)
+		np.Trim(np.GetLength() - 1);
+	const char *p = s;
+	while(*p) {
+		const char *b = p;
+		while(*p && *p != ';')
+			p++;
+		int dl = p - b - np.GetLength();
+		if((unsigned)dl <= 1u && !ComparePath(b, np, np.GetLength()))
+			return s; // path found
+		if(*p)
+			p++;
+	}
+	String ns = s;
+	if(!IsNull(ns) && *ns.Last() != ';')
+		ns.Cat(';');
+	ns.Cat(np);
+	return ns;
+}
+
+String AppendPathList(String s, String path_list)
+{
+	String result = s;
+	const char *p = path_list;
+	while(*p) {
+		const char *s = p;
+		while(*p && *p != ';')
+			p++;
+		if(p != s)
+			result = AppendPath(result, String(s, p));
+		if(*p)
+			p++;
+	}
+	return result;
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/TCore/util.h b/uppsrc/TCore/util.h
new file mode 100644
index 000000000..354bb26f3
--- /dev/null
+++ b/uppsrc/TCore/util.h
@@ -0,0 +1,269 @@
+NAMESPACE_UPP
+
+#ifdef COMPILER_MSC
+typedef __int64 longlong_t;
+#define LL_(x) COMBINE(x, i64)
+#else
+typedef long long longlong_t;
+#define LL_(x) COMBINE(x, LL)
+#endif//COMPILER
+
+Vector<String> SplitCommandLine(const char *cmdline, bool response_files = false);
+//int            LocateLine(String old_file, int old_line, String new_file); // TRC 2/12/2003: moved to Web
+
+//String       GetCondText(const char* s, bool state); // \t,\f,\b-selector
+// moved to Bar to break dependence of CtrlLib on TCtrlLib
+longlong_t     GetHotKey(byte c, bool ascii_only = false);
+longlong_t     GetHotKey(const char *s, bool ascii_only = false); // gets hotkey mask (0 = none)
+char           GetHotKeyText(longlong_t hotkey); // returns symbolic name of hotkey
+String         StripHotText(const char* s);
+String         HotTextToSmartText(const char *s);
+
+bool           IsNan(double d);
+bool           IsInf(double d);
+
+inline int     abs2         (Size p)             { return p.cx * p.cx + p.cy * p.cy; }
+inline int     abs          (Size p)             { return (int)hypot(p.cx, p.cy); }
+inline int     MulVector    (Size a, Size b)     { return a.cx * b.cy - a.cy * b.cx; }
+inline int     MulScalar    (Size a, Size b)     { return a.cx * b.cx + a.cy * b.cy; }
+Point          Transform    (Point pt, const Rect& from_rc, const Rect& to_rc);
+Rect           Transform    (const Rect& rc, const Rect& from_rc, const Rect& to_rc, bool normalize = true);
+
+int            PutGetMW(Stream& stream, int value);
+int            PutGetIW(Stream& stream, int value);
+int            PutGetML(Stream& stream, int value);
+int            PutGetIL(Stream& stream, int value);
+int64          PutGetM64(Stream& stream, int64 value);
+int64          PutGetI64(Stream& stream, int64 value);
+
+inline void    StreamMW(Stream& stream, int& value)  { value = PutGetMW(stream, value); }
+inline void    StreamIW(Stream& stream, int& value)  { value = PutGetIW(stream, value); }
+inline void    StreamML(Stream& stream, int& value)  { value = PutGetML(stream, value); }
+inline void    StreamIL(Stream& stream, int& value)  { value = PutGetIL(stream, value); }
+inline void    StreamM64(Stream& stream, int64& value) { value = PutGetM64(stream, value); }
+inline void    StreamI64(Stream& stream, int64& value) { value = PutGetI64(stream, value); }
+void           StreamID(Stream& stream, double& value);
+void           StreamMD(Stream& stream, double& value);
+void           StreamIFP(Stream& stream, Pointf& pt);
+void           StreamIFR(Stream& stream, Rectf& rect);
+
+//String         StringSample(const char *p, int limit);
+String         StringReplace(const String& str, const String& find, const String& replace);
+int            StringFind(const String& string, const String& substring, int start_pos = 0);
+const char    *StringFind(const char *sbegin, const char *send, const char *subbegin, const char *subend);
+String         FromCString(const char *cstring);
+bool           HasNlsLetters(WString s);
+
+const Convert& CFormatConvert();
+
+#ifdef PLATFORM_WIN32
+String         GetLocaleInfo(LCTYPE type, LCID locale = LOCALE_USER_DEFAULT);
+#endif
+
+String         NlsFormat(int value);
+String         NlsFormat(double value, int decimal_places);
+String         NlsFormatRel(double value, int relative_places);
+String         FormatFraction(double fraction, const char *pattern = "%0nl");
+
+class ConvertNvl : public Convert
+{
+public:
+	ConvertNvl(Value nvl = Value()) : nvl(nvl)     {}
+
+	ConvertNvl&   NullValue(const Value& val)      { nvl = val; return *this; }
+	const Value&  GetNullValue() const             { return nvl; }
+
+	virtual Value Format(const Value& value) const { return Nvl(value, nvl); }
+
+protected:
+	Value         nvl;
+};
+
+class ConvertFraction : public ConvertDouble
+{
+public:
+	ConvertFraction(double minval = DOUBLE_NULL_LIM, double maxval = -DOUBLE_NULL_LIM,
+		bool notnull = false, const char *pattern = "%0n")
+	: ConvertDouble(minval, maxval, notnull) { Pattern(pattern); }
+
+	virtual Value Format(const Value& value) const;
+	virtual Value Scan(const Value& value) const;
+	virtual int   Filter(int c) const;
+};
+
+const ConvertFraction& StdConvertFraction();
+
+String         FormatIntCsPlural(int i, const char *noun);
+
+inline bool    StdValueLess(Value a, Value b, int language)   { return StdValueCompare(a, b, language) < 0; }
+inline bool    StdValueLess0(Value a, Value b)                { return StdValueLess(a, b, 0); }
+
+class NvlConvert : public Convert
+{
+public:
+	NvlConvert(const Value& dflt = Value()) : dflt(dflt) {}
+	virtual ~NvlConvert() {}
+
+	NvlConvert&  SetValue(const Value& v)         { dflt = v; return *this;}
+	const Value& GetValue() const                 { return dflt; }
+
+	NvlConvert&  operator = (const Value& v)      { dflt = v; return *this; }
+	operator const Value& () const                { return dflt; }
+
+	Value        Format(const Value& value) const { return IsNull(value) ? dflt : value; }
+
+private:
+	Value        dflt;
+};
+
+//////////////////////////////////////////////////////////////////////
+// strtol / strtod have a big disadvantage: they check the strlen
+// of the string, which in case of scanning a long file fetched into a string
+// can be grossly inefficient.
+
+bool           SaveFileChanges(String fn, String data);
+bool           SaveFileBackup(String fn, String data, bool keep_backup = false);
+bool           FileFlush(FileStream& fstream);
+
+struct BoolRef : public RefManager
+{
+	virtual int        GetType()                         { return UNKNOWN_V; }
+	virtual Value      GetValue(const void *x)           { return *(const bool *)x ? 1 : 0; }
+	virtual void       SetValue(void *x, const Value& v) { *(bool *)x = !UPP::IsNull(v) && (double)v; }
+	virtual void       SetNull(void *x)                  { *(bool *)x = false; }
+
+	static RefManager *Manager()                         { static BoolRef m; return &m; }
+};
+
+inline Ref BoolAsRef(bool& b) { return Ref(&b, BoolRef::Manager()); }
+
+String     MakePathLower(String path);
+String     GetFileOnSystemPath(const char *file);
+
+#ifdef PLATFORM_WIN32
+String     InstallServiceCmd(String service_name, String app_name, String arguments);
+#endif
+
+class CallbackValueGen : public ValueGen
+{
+public:
+	CallbackValueGen() {}
+	CallbackValueGen(Callback1<Value&> cb) : cb(cb) {}
+
+	CallbackValueGen& operator = (Callback1<Value&> _cb) { cb = _cb; return *this; }
+
+	virtual Value Get() { Value v; cb(v); return v; }
+
+	Callback1<Value&> cb;
+};
+
+VectorMap<String, String> LoadKeyMap(const char *p);
+VectorMap<String, String> LoadKeyMapFile(const char *filename);
+
+const char               *FetchCmdArg(const char *arg, int& i);
+
+inline void GetIL(int *ip, int count, const byte *data)
+{
+#ifdef CPU_LITTLE_ENDIAN
+	if(sizeof(int) == 4) {
+		memcpy(ip, data, count * 4);
+		return;
+	}
+#endif
+	for(; --count >= 0; data += 4)
+		*ip++ = Peek32le(data);
+}
+
+inline void PutIL(Stream& strm, const int *ip, int count)
+{
+#ifdef CPU_LITTLE_ENDIAN
+	if(sizeof(int) == 4) {
+		strm.Put(ip, count * 4);
+		return;
+	}
+#endif
+	while(--count)
+		strm.PutIL(*ip++);
+}
+
+inline void PutIL(Stream& strm, const Vector<int>& i)
+{
+	PutIL(strm, i.Begin(), i.GetCount());
+}
+
+inline void PutIF(Stream& strm, float f)
+{
+	strm.Put(&f, 4);
+}
+
+inline void PutIFP(Stream& stream, const Pointf& pt)
+{
+	PutIF(stream, (float)pt.x);
+	PutIF(stream, (float)pt.y);
+}
+
+inline void PutIFR(Stream& stream, const Rectf& rc)
+{
+	PutIF(stream, (float)rc.left);
+	PutIF(stream, (float)rc.top);
+	PutIF(stream, (float)rc.right);
+	PutIF(stream, (float)rc.bottom);
+}
+
+inline void PutID(Stream& strm, double d)
+{
+	strm.Put(&d, 8);
+}
+
+inline void PutIDP(Stream& stream, const Pointf& pt)
+{
+	PutID(stream, pt.x);
+	PutID(stream, pt.y);
+}
+
+inline void PutIDR(Stream& stream, const Rectf& rc)
+{
+	PutID(stream, rc.left);
+	PutID(stream, rc.top);
+	PutID(stream, rc.right);
+	PutID(stream, rc.bottom);
+}
+
+inline float PeekIF(const byte *p)
+{
+	return *(const float *)p;
+}
+
+inline Pointf PeekIFP(const byte *p)
+{
+	return Pointf(PeekIF(p), PeekIF(p + 4));
+}
+
+inline Rectf PeekIFR(const byte *p)
+{
+	return Rectf(PeekIF(p), PeekIF(p + 4), PeekIF(p + 8), PeekIF(p + 12));
+}
+
+inline double PeekID(const byte *p)
+{
+	return *(const double *)p;
+}
+
+inline Pointf PeekIDP(const byte *p)
+{
+	return Pointf(PeekID(p), PeekID(p + 8));
+}
+
+inline Rectf PeekIDR(const byte *p)
+{
+	return Rectf(PeekID(p), PeekID(p + 8), PeekID(p + 16), PeekID(p + 24));
+}
+
+String AppendPath(String s, String new_path);
+String AppendPathList(String s, String path_list);
+
+inline unsigned CalcGray(byte r, byte g, byte b) { return b * 26 + g * 153 + r * 77; }
+inline unsigned CalcGray(const byte *p)          { return p[0] * 26 + p[1] * 153 + p[2] * 77; }
+inline unsigned CalcGray(Color c)                { return c.GetB() * 26 + c.GetG() * 153 + c.GetR() * 77; }
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/TCore/xml.cpp b/uppsrc/TCore/xml.cpp
new file mode 100644
index 000000000..4d2a42208
--- /dev/null
+++ b/uppsrc/TCore/xml.cpp
@@ -0,0 +1,99 @@
+#include          <webmap_i/webmap.h>
+#pragma hdrstop
+
+#include "xml.h"
+
+String ToXml(const char *s)
+{
+	String result;
+	for(; *s; s++)
+		/**/ if(*s == '<')  result.Cat("&lt;");
+		else if(*s == '>')  result.Cat("&gt;");
+		else if(*s == '&')  result.Cat("&amp;");
+		else if(*s == '\'') result.Cat("&apos;");
+		else if(*s == '\"') result.Cat("&quot;");
+		else if(!(*s & 0x80)) result.Cat(*s);
+		else result.Cat(ToUtf8(ToUnicode(*s, CHARSET_DEFAULT)));
+//		else result.Cat(NFormat("&#x%04x;", ToUnicode(*s, CHARSET_DEFAULT)));
+	return result;
+}
+
+Xmls& Xmls::Attr(const char *a)                  { Cat(' '); Cat(a); return *this; }
+Xmls& Xmls::Attr(const char *a, const char *s)   { Attr(a); Cat('='); return Quote(s); }
+Xmls& Xmls::Attr(const char *a, String s)        { return Attr(a, ~s); }
+Xmls& Xmls::Attr(const char *a, int i)           { return Attr(a, ::FormatInt(i)); }
+Xmls& Xmls::Attr(const char *a, double d)        { return Attr(a, ::FormatDouble(d)); }
+Xmls& Xmls::Attr(const char *a, Date d)          { return Attr(a, ::Format(d)); }
+Xmls& Xmls::Attr(const char *a, Value v)         { return Attr(a, StdFormat(v)); }
+
+Xmls& Xmls::Cat(const XmlTag& tag)               { return Cat(Xmls(tag)); }
+
+XmlTag::XmlTag(const char *t)
+{
+	tag = "<";
+	tag.Cat(t);
+	end = "</";
+	end.Cat(t);
+	end.Cat('>');
+}
+
+void  XmlTag::Combine(const XmlTag& tag2, bool linebreak)
+{
+	if(tag2.IsEmpty())
+		return;
+	if(!tag.IsEmpty()) {
+		String e = end;
+		end = tag2.end;
+		tag.Cat('>');
+		if(linebreak) {
+			tag.Cat('\n');
+			end.Cat('\n');
+		}
+		tag.Cat(tag2.tag);
+		end.Cat(e);
+	}
+	else {
+		tag = tag2.tag;
+		end = tag2.end;
+	}
+}
+
+Xmls XmlTag::ApplyTo(const char *s, bool lf) const
+{
+	Xmls h;
+	h.Cat(tag);
+	if(!s || !*s) {
+		const char *e = end;
+		while(*e && *e != '>')
+			e++;
+		h.Cat('/');
+		h.Cat(e, end.End() - e);
+	}
+	else {
+		h.Cat('>');
+		if(lf)
+			h.Cat('\n');
+		h.Cat(s);
+		h.Cat(end);
+		if(lf)
+			h.Cat('\n');
+	}
+	return h;
+}
+
+Xmls Xml10(const char *encoding)
+{
+	Xmls out = "<?xml";
+	out.Attr("version", "1.0");
+	out.Attr("encoding", encoding);
+	out.Cat("?>\n");
+	return out;
+}
+
+Xmls XmlComment(const char *text)
+{
+	Xmls out = "<!-- ";
+	out.Cat(text);
+	out.Cat(" -->\n");
+	return out;
+}
diff --git a/uppsrc/TCore/xml.h b/uppsrc/TCore/xml.h
new file mode 100644
index 000000000..01c839629
--- /dev/null
+++ b/uppsrc/TCore/xml.h
@@ -0,0 +1,102 @@
+#ifndef _webmap_i_xml_h_
+#define _webmap_i_xml_h_
+
+String        ToXml(const char *s);
+
+class XmlTag;
+
+class Xmls : public String, Moveable<Xmls> {
+public:
+	Xmls(const char *s) : String(s) {}
+	Xmls(const String& s) : String(s) {}
+	Xmls(const Nuller& = Null) {}
+
+	bool  IsNullInstance() const     { return IsEmpty(); }
+
+	Xmls& Cat()                      { return *this; }
+
+	Xmls& Text(const char *s)        { String::Cat(ToXml(s)); return *this; }
+	Xmls& Quote(const char *text)    { Cat('\"'); Cat(ToXml(text)); Cat('\"'); return *this; }
+
+	Xmls& Attr(const char *attr);
+	Xmls& Attr(const char *attr, const char *s);
+	Xmls& Attr(const char *attr, String s);
+	Xmls& Attr(const char *attr, int i);
+	Xmls& Attr(const char *attr, double d);
+	Xmls& Attr(const char *attr, Date date);
+	Xmls& Attr(const char *attr, Value v);
+
+	Xmls& Cat(const XmlTag& tag);
+	Xmls& Cat(String s)              { String::Cat(s); return *this; }
+	Xmls& Cat(const char *s)         { String::Cat(s); return *this; }
+	Xmls& Cat(char c)                { String::Cat(c); return *this; }
+	Xmls& Cat(const char *s, int n)  { String::Cat(s, n); return *this; }
+};
+
+class XmlTag : Moveable<XmlTag> {
+public:
+	XmlTag(const char *s);
+	XmlTag() {}
+
+	XmlTag&       Text(const char *s)                        { tag.Text(s); return *this; }
+	XmlTag&       Quote(const char *s)                       { tag.Quote(s); return *this; }
+
+	XmlTag&       Attr(const char *attr)                     { tag.Attr(attr); return *this; }
+	XmlTag&       Attr(const char *attr, const char *v)      { tag.Attr(attr, v); return *this; }
+	XmlTag&       Attr(const char *attr, String v)           { tag.Attr(attr, v); return *this; }
+	XmlTag&       Attr(const char *attr, int v)              { tag.Attr(attr, v); return *this; }
+	XmlTag&       Attr(const char *attr, double v)           { tag.Attr(attr, v); return *this; }
+	XmlTag&       Attr(const char *attr, Date v)             { tag.Attr(attr, v); return *this; }
+	XmlTag&       Attr(const char *attr, Value v)            { tag.Attr(attr, v); return *this; }
+
+	void          Combine(const XmlTag& tag, bool linebreak);
+
+	Xmls          ApplyTo(const char *s, bool lf = false) const;
+	Xmls          ApplyTo(String s, bool lf = false) const   { return ApplyTo(~s, lf); }
+
+	XmlTag        operator()() const                         { return *this; }
+	Xmls          operator~() const                          { return ApplyTo(""); }
+	operator      Xmls() const                               { return ApplyTo(""); }
+	String        ToString() const                           { return ApplyTo(""); }
+
+	const Xmls&   Tag() const                                { return tag; }
+	Xmls&         Tag()                                      { return tag; }
+
+	const String& End() const                                { return end; }
+	String&       End()                                      { return end; }
+
+	bool          IsEmpty() const                            { return tag.IsEmpty(); }
+
+protected:
+	Xmls          tag;
+	String        end;
+};
+
+Xmls           Xml10(const char *encoding);
+inline Xmls    Xml10(byte charset = CHARSET_DEFAULT)               { return Xml10(MIMECharsetName(charset)); }
+Xmls           XmlComment(const char *text);
+
+inline Xmls&   operator << (Xmls& s, const XmlTag& tag)            { return s.Cat(tag); }
+inline Xmls&   operator << (Xmls& s, const Xmls& v)                { return s.Cat(v); }
+inline Xmls&   operator << (Xmls& s, String v)                     { return s.Cat(v); }
+inline Xmls&   operator << (Xmls& s, const char *v)                { return s.Cat(v); }
+
+inline Xmls    operator + (const XmlTag& tag1, const XmlTag& tag2) { Xmls r(tag1); r << tag2; return r; }
+inline Xmls    operator + (const String& s, const XmlTag& tag)     { Xmls r(s); r << tag; return r; }
+inline Xmls    operator + (const XmlTag& tag, const String& s)     { Xmls r(tag); r << s; return r; }
+inline Xmls    operator + (const char *s, const XmlTag& tag)       { Xmls r(s); r << tag; return r; }
+inline Xmls    operator + (const XmlTag& tag, const char *s)       { Xmls r(tag); r << s; return r; }
+
+inline XmlTag  operator /  (const XmlTag& t1, const XmlTag& t2)    { XmlTag r(t1); r.Combine(t2, false); return r; }
+inline XmlTag& operator /= (XmlTag& tag, const XmlTag& s)          { tag.Combine(s, false); return tag; }
+
+inline Xmls    operator / (const XmlTag& tag, String s)            { return tag.ApplyTo(s, false); }
+inline Xmls    operator / (const XmlTag& tag, const char *s)       { return tag.ApplyTo(s, false); }
+
+inline XmlTag  operator %  (const XmlTag& t1, const XmlTag& t2)    { XmlTag r(t1); r.Combine(t2, true); return r; }
+inline XmlTag& operator %= (XmlTag& tag, const XmlTag& s)          { tag.Combine(s, true); return tag; }
+
+inline Xmls    operator % (const XmlTag& tag, String s)            { return tag.ApplyTo(s, true); }
+inline Xmls    operator % (const XmlTag& tag, const char *s)       { return tag.ApplyTo(s, true); }
+
+#endif
diff --git a/uppsrc/TCore/xmlparse.cpp b/uppsrc/TCore/xmlparse.cpp
new file mode 100644
index 000000000..0defb201f
--- /dev/null
+++ b/uppsrc/TCore/xmlparse.cpp
@@ -0,0 +1,484 @@
+#include "TCore.h"
+#pragma hdrstop
+
+NAMESPACE_UPP
+
+String XMLTag::ToString() const
+{
+	String out;
+	out << '<' << name;
+	for(int i = 0; i < attrib.GetCount(); i++)
+		out << ' ' << attrib.GetKey(i) << '=' << attrib[i];
+	out << '>';
+	return out;
+}
+
+String XMLTagTree::ToString() const
+{
+	String out;
+	Format(out, 0);
+	return out;
+}
+
+void XMLTagTree::Format(String& out, int indent) const
+{
+	out.Cat('\t', indent);
+	out << XMLTag::ToString() << '\n';
+	if(!text.IsEmpty()) {
+		out.Cat('\t', indent);
+		out << text << '\n';
+	}
+	for(int i = 0; i < subtags.GetCount(); i++)
+		subtags[i].Format(out, indent + 1);
+	out.Cat('\t', indent);
+	out << "</" << name << ">\n";
+}
+
+const XMLTagTree& XMLTagTree::Tag(String name) const
+{
+	static XMLTagTree empty;
+	return subtags.Get(name, empty);
+}
+
+static VectorMap<String, String>& StdCharRefMap()
+{
+	static VectorMap<String, String> crm;
+	if(!crm.IsEmpty())
+		return crm;
+	static const char *crm_map[][2] = {
+		{ "lt",   "<"  },
+		{ "gt",   ">"  },
+		{ "amp",  "&"  },
+		{ "apos", "\'" },
+		{ "quot", "\"" },
+	};
+	for(int i = 0; i < __countof(crm_map); i++)
+		crm.Add(crm_map[i][0], crm_map[i][1]);
+	return crm;
+}
+
+static int NameCharFilter(int c)
+{
+	return IsAlNum(c) || c == '.' || c == '-' || c == '_' || c == ':' ? c : 0;
+}
+
+void XMLParser::Open(Stream& stream, int line_)
+{
+	Close();
+	InitOpen(stream, line_);
+}
+
+void XMLParser::Open(String string, int line_)
+{
+	Close();
+	stringinput = new StringStream(string);
+	InitOpen(*stringinput, line_);
+}
+
+void XMLParser::InitOpen(Stream& strm, int line)
+{
+	input = &strm;
+	line_number = line - 1;
+	current_entity = FIRST;
+	charset = CHARSET_UTF8;
+	honor_spaces = false;
+	FetchLine();
+	Next();
+}
+
+void XMLParser::Close()
+{
+	input = NULL;
+	stringinput.Clear();
+	tag_stack.Clear();
+	space_stack.Clear();
+}
+
+XMLTagTree XMLParser::Read()
+{
+	XMLTagTree output;
+	Read(output);
+	return output;
+}
+
+void XMLParser::Read(XMLTagTree& tree)
+{
+	RTIMING("XMLParser::Read");
+	for(;; Next())
+		switch(Entity()) {
+			case TEXT: {
+				tree.text.Cat(Text());
+				break;
+			}
+			case TAG: {
+				const XMLTag& tag = Tag();
+				XMLTagTree& subtree = tree.subtags.Add(tag.name);
+				*(XMLTag*)&subtree <<= tag;
+				Next();
+				Read(subtree);
+				break;
+			}
+			default:
+				return;
+		}
+}
+
+bool XMLParser::FetchLine()
+{
+	RTIMING("XMLParser::FetchLine");
+	line_data = input->GetLine();
+	line_ptr = line_data;
+	line_number++;
+	return !line_data.IsEmpty() || !input->IsEof();
+}
+
+bool XMLParser::SkipWhite()
+{
+	RTIMING("XMLParser::SkipWhite");
+	while((byte)*line_ptr <= ' ') {
+		if(*line_ptr == '\0') {
+			if(!FetchLine())
+				return false;
+		}
+		else if(honor_spaces)
+			return true;
+		else
+			line_ptr++;
+	}
+	return true;
+}
+
+bool XMLParser::InLevel(int count)
+{
+	if(current_entity == ISEOF || GetCount() < count || current_entity == ENDTAG && GetCount() == count)
+		return false;
+	return true;
+}
+
+bool XMLParser::NextLevel(int count)
+{
+	RTIMING("XMLParser::NextLevel");
+	return Next() != ISEOF && InLevel(count);
+}
+
+void XMLParser::SkipLevel(int count)
+{
+	RTIMING("XMLParser::SkipLevel");
+	while(NextLevel(count))
+		;
+}
+
+XMLParser::ENTITY XMLParser::Next()
+{
+	RTIMING("XMLParser::Next");
+	if(current_entity == TAG && loner_tag)
+		return current_entity = ENDTAG;
+	if(current_entity == ENDTAG && !tag_stack.IsEmpty()) {
+		tag_stack.Drop();
+		space_stack.Drop();
+		honor_spaces = (!space_stack.IsEmpty() && space_stack.Top());
+	}
+	current_text = Null;
+	while(SkipWhite()) {
+		if(*line_ptr == '<') {
+			RTIMING("XMLParser::Next / '<'");
+			char loner = '/';
+			loner_tag = false;
+			bool endtag = false;
+			bool excl = false;
+			XMLTag tag;
+			const char *tagname = ++line_ptr;
+			if(*line_ptr == '!') {
+				excl = true;
+				loner_tag = true;
+				loner = '!';
+				if(*++line_ptr == '-' && line_ptr[1] == '-') { // comment
+					line_ptr += 2;
+					while(line_ptr[0] != '-' || line_ptr[1] != '-' || line_ptr[2] != '>')
+						if(*line_ptr++ == 0 && !FetchLine())
+							return current_entity = ISEOF;
+					line_ptr += 3;
+					continue;
+				}
+			}
+			else if(*line_ptr == '?') {
+				loner_tag = true;
+				loner = '?';
+				line_ptr++;
+			}
+			else if(*line_ptr == '/') {
+				endtag = true;
+				tagname = line_ptr++;
+			}
+			while(NameCharFilter(*line_ptr))
+				line_ptr++;
+			tag.name = String(tagname, line_ptr);
+			while(SkipWhite() && *line_ptr != '>' && !(excl && *line_ptr == '[') && !(*line_ptr == loner && line_ptr[1] == '>')) {
+				const char *attrname = line_ptr;
+				while((byte)*++line_ptr > ' ' && *line_ptr != '='
+				&& *line_ptr != '>' && !(excl && *line_ptr == '[') && !(*line_ptr == loner && line_ptr[1] == '>'))
+					;
+				String attr(attrname, line_ptr);
+				WString value;
+				SkipWhite();
+				if(*line_ptr == '=') {
+					line_ptr++;
+					SkipWhite();
+					StringBuffer attrval;
+					if(*line_ptr == '\"') {
+						line_ptr++;
+						while(*line_ptr && *line_ptr != '\"')
+							if(*line_ptr == '&')
+								attrval.Cat(GetCharRef());
+							else
+								attrval.Cat(*line_ptr++);
+						if(*line_ptr == '\"')
+							line_ptr++;
+					}
+					else {
+						while((byte)*line_ptr > ' ' && *line_ptr != '>'
+						&& !(excl && *line_ptr == '[') && !(*line_ptr == loner && line_ptr[1] == '>'))
+							if(*line_ptr == '&')
+								attrval.Cat(GetCharRef());
+							else
+								attrval.Cat(*line_ptr++);
+					}
+					value = FromUtf8(~attrval, attrval.GetLength());
+				}
+				tag.attrib.Add(attr, value);
+			}
+			if(!endtag) {
+				space_stack.Add() = honor_spaces;
+				static const WString preserve = "preserve";
+				if(tag.Attrib("xml:space") == preserve)
+					honor_spaces = true;
+				tag_stack.Add() = tag;
+			}
+			if(excl && *line_ptr == '[') {
+				loner_tag = false;
+				line_ptr++;
+			}
+			else {
+				if(*line_ptr && *line_ptr != '>') {
+					loner_tag = true;
+					line_ptr++;
+				}
+				if(*line_ptr == '>')
+					line_ptr++;
+			}
+			if(tag_stack.GetCount() == 1 && tag.name == "?xml") {
+				String encoding = ToLower(tag_stack.Top().Attrib("encoding").ToString());
+				/**/ if(encoding == "iso-8859-1")   charset = CHARSET_ISO8859_1;
+				else if(encoding == "iso-8859-2")   charset = CHARSET_ISO8859_2;
+				else if(encoding == "windows-1250") charset = CHARSET_WIN1250;
+				else if(encoding == "windows-1251") charset = CHARSET_WIN1251;
+				else if(encoding == "windows-1252") charset = CHARSET_WIN1252;
+				else if(encoding == "utf-8")        charset = CHARSET_UTF8;
+			}
+			return current_entity = (endtag ? ENDTAG : TAG);
+		}
+		else { // text
+			RTIMING("XMLParser::Next / text");
+			char closer = 0;
+			if(!tag_stack.IsEmpty() && *tag_stack.Top().name == '!')
+				closer = ']';
+			StringBuffer raw_text;
+			while(*line_ptr != '<' && *line_ptr != closer) {
+				if(*line_ptr == '&')
+					raw_text.Cat(GetCharRef());
+				else if(*line_ptr)
+					raw_text.Cat(*line_ptr++);
+				else if(!FetchLine())
+					break;
+			}
+			if(!honor_spaces) {
+				const char *p = raw_text.Begin(), *e = raw_text.End();
+				while(e > p && (byte)e[-1] <= ' ')
+					e--;
+				raw_text.SetLength(e - p);
+			}
+			if(raw_text.GetLength() > 0) {
+				current_text = FromUtf8(~raw_text, raw_text.GetLength());
+				return current_entity = TEXT;
+			}
+			if(closer && *line_ptr == closer) {
+				line_ptr++;
+				if(*line_ptr == '>')
+					line_ptr++;
+				return current_entity = ENDTAG;
+			}
+		}
+	}
+	return current_entity = ISEOF;
+}
+
+String XMLParser::GetCharRef()
+{
+	RTIMING("XMLParser::GetCharRef");
+	String out;
+	int outconst = 0;
+	if(*++line_ptr == '#') {
+		if(*++line_ptr == 'X' || *line_ptr == 'x') {
+			for(byte c; (c = ctoi(*++line_ptr)) < 16; outconst = 16 * outconst + c)
+				;
+		}
+		else {
+			while(IsDigit(*line_ptr))
+				outconst = 10 * outconst + *line_ptr++ - '0';
+		}
+		out = ToUtf8(outconst);
+	}
+	else {
+		const char *begin = line_ptr;
+		while(*++line_ptr && *line_ptr != ';')
+			;
+		out = StdCharRefMap().Get(String(begin, line_ptr), Null);
+	}
+	if(*line_ptr == ';')
+		line_ptr++;
+	return out;
+}
+
+void XMLParser::SelfTest()
+{
+	for(; !IsEof(); Next())
+		switch(Entity()) {
+			case TAG: {
+				const XMLTag& tag = Tag();
+				String path;
+				for(int i = 0; i < GetCount(); i++)
+					path << (i ? "/" : "") << tag_stack[i].name;
+				RLOG("TAG[" << GetCount() << "]: " << path);
+				for(int i = 0; i < tag.attrib.GetCount(); i++)
+					RLOG("\tATTRIB[" << tag.attrib.GetKey(i) << "]=" << tag.attrib[i]);
+				break;
+			}
+			case ENDTAG: {
+				String path;
+				for(int i = 0; i < GetCount(); i++)
+					path << (i ? "/" : "") << tag_stack[i].name;
+				RLOG("END[" << GetCount() << "]: " << path);
+				break;
+			}
+			case TEXT: {
+				RLOG("TXT: " << Text());
+				break;
+			}
+			default: {
+				RLOG("invalid entity type: " << (int)Entity());
+				break;
+			}
+		}
+	RLOG("[EOF]");
+}
+
+XMLTagTree XMLReadTagTree(Stream& stream, int line)
+{
+	XMLParser parser(stream, line);
+	return parser.Read();
+}
+
+XMLTagTree XMLReadTagTree(String string, int line)
+{
+	XMLParser parser(string, line);
+	return parser.Read();
+}
+
+String ToXml(const char *s, byte charset)
+{
+	if(charset == CHARSET_DEFAULT)
+		charset = GetDefaultCharset();
+	String result;
+	for(; *s; s++)
+		/**/ if(*s == '<')  result.Cat("&lt;");
+		else if(*s == '>')  result.Cat("&gt;");
+		else if(*s == '&')  result.Cat("&amp;");
+		else if(*s == '\'') result.Cat("&apos;");
+		else if(*s == '\"') result.Cat("&quot;");
+		else if((byte)*s < ' ' && *s != '\n') result.Cat(NFormat("&#x%02x;", (byte)*s));
+		else if(!(*s & 0x80) || charset == CHARSET_UTF8) result.Cat(*s);
+		else result.Cat(ToUtf8(ToUnicode(*s, charset)));
+	return result;
+}
+
+Xmls& Xmls::Attr(const char *a)                  { Cat(' '); Cat(a); return *this; }
+Xmls& Xmls::Attr(const char *a, const char *s)   { Attr(a); Cat('='); return Quote(s); }
+Xmls& Xmls::Attr(const char *a, String s)        { return Attr(a, ~s); }
+Xmls& Xmls::Attr(const char *a, int i)           { return Attr(a, UPP::FormatInt(i)); }
+Xmls& Xmls::Attr(const char *a, double d)        { return Attr(a, UPP::FormatDouble(d)); }
+Xmls& Xmls::Attr(const char *a, Date d)          { return Attr(a, UPP::Format(d)); }
+Xmls& Xmls::Attr(const char *a, Value v)         { return Attr(a, StdFormat(v)); }
+
+Xmls& Xmls::Cat(const XmlsTag& tag)               { return Cat(Xmls(tag)); }
+
+XmlsTag::XmlsTag(const char *t)
+{
+	tag = "<";
+	tag.Cat(t);
+	end = "</";
+	end.Cat(t);
+	end.Cat('>');
+}
+
+void  XmlsTag::Combine(const XmlsTag& tag2, bool linebreak)
+{
+	if(tag2.IsEmpty())
+		return;
+	if(!tag.IsEmpty()) {
+		String e = end;
+		end = tag2.end;
+		tag.Cat('>');
+		if(linebreak) {
+			tag.Cat('\n');
+			end.Cat('\n');
+		}
+		tag.Cat(tag2.tag);
+		end.Cat(e);
+	}
+	else {
+		tag = tag2.tag;
+		end = tag2.end;
+	}
+}
+
+Xmls XmlsTag::ApplyTo(const char *s, bool lf) const
+{
+	Xmls h;
+	h.Cat(tag);
+	if(!s || !*s) {
+		const char *e = end;
+		while(*e && *e != '>')
+			e++;
+		h.Cat('/');
+		h.Cat(e, end.End() - e);
+	}
+	else {
+		h.Cat('>');
+		if(lf)
+			h.Cat('\n');
+		h.Cat(s);
+		if(lf)
+			h.Cat('\n');
+		h.Cat(end);
+	}
+	return h;
+}
+
+Xmls Xml10(const char *encoding)
+{
+	Xmls out = "<?xml";
+	out.Attr("version", "1.0");
+	out.Attr("encoding", encoding);
+	out.Cat("?>\n");
+	return out;
+}
+
+Xmls XmlsComment(const char *text)
+{
+	Xmls out = "<!-- ";
+	out.Cat(text);
+	out.Cat(" -->\n");
+	return out;
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/TCore/xmlparse.h b/uppsrc/TCore/xmlparse.h
new file mode 100644
index 000000000..925ff5d6d
--- /dev/null
+++ b/uppsrc/TCore/xmlparse.h
@@ -0,0 +1,201 @@
+#ifndef _TCore_xmlparse_h_
+#define _TCore_xmlparse_h_
+
+NAMESPACE_UPP
+
+inline bool CheckXml(const char *s) { return *s == '<' && s[1] == '?' && s[2] == 'x' && s[3] == 'm' && s[4] == 'l'; }
+
+struct XMLTag : DeepCopyOption<XMLTag> {
+	XMLTag() {}
+	XMLTag(const XMLTag& tag, int deep)
+	: name(tag.name), attrib(tag.attrib, deep) {}
+
+	String ToString() const;
+
+	int     Find(String name) const         { return attrib.Find(name); }
+	WString operator [] (int i) const       { return attrib[i]; }
+
+	WString Attrib(String name) const       { return attrib.Get(name, Null); }
+	int     AttribInt(String name) const    { return ScanInt(attrib.Get(name, Null)); }
+	double  AttribDouble(String name) const { return ScanDouble(attrib.Get(name, Null)); }
+
+	String name;
+	VectorMap<String, WString> attrib;
+};
+
+struct XMLTagTree : XMLTag, DeepCopyOption<XMLTagTree> {
+	XMLTagTree() {}
+	XMLTagTree(const XMLTagTree& tree, int deep)
+	: XMLTag(tree, deep), text(tree.text), subtags(tree.subtags, deep) {}
+
+	String             ToString() const;
+	const XMLTagTree&  Tag(String name) const;
+	int                Find(String name) const      { return subtags.Find(name); }
+	int                FindNext(int i) const        { return subtags.FindNext(i); }
+	const XMLTagTree&  operator [] (int i) const    { return subtags[i]; }
+
+	WString text;
+	ArrayMap<String, XMLTagTree> subtags;
+
+private:
+	void Format(String& output, int indent) const;
+};
+
+class XMLParser {
+public:
+	XMLParser() {}
+	XMLParser(Stream& stream, int line = 1) { Open(stream, line); }
+	XMLParser(String string, int line = 1)  { Open(string, line); }
+
+	void          Open(Stream& stream, int line = 1);
+	void          Open(String string, int line = 1);
+	void          Close();
+
+	XMLTagTree    Read();
+
+	enum ENTITY { FIRST = -1, ISEOF, TAG, ENDTAG, TEXT };
+	ENTITY        Entity() const            { return current_entity; }
+	bool          IsEof() const             { return current_entity == ISEOF; }
+	bool          IsTag() const             { return current_entity == TAG; }
+	bool          IsEndTag() const          { return current_entity == ENDTAG; }
+	bool          IsText() const            { return current_entity == TEXT; }
+	ENTITY        Next();
+	bool          InLevel(int count);
+	bool          NextLevel(int count);
+	void          SkipLevel(int count);
+
+	const XMLTag& Tag() const               { return tag_stack.Top(); }
+	int           GetCount() const          { return tag_stack.GetCount(); }
+	const XMLTag& operator [] (int i) const { return tag_stack[i]; }
+
+	WString       Text() const              { return current_text; }
+	int           GetLine() const           { return line_number; }
+
+	void          SelfTest();
+
+private:
+	String        GetCharRef();
+	bool          FetchLine();
+	bool          SkipWhite();
+	void          InitOpen(Stream& strm, int line);
+	void          Read(XMLTagTree& tree);
+
+private:
+	Stream       *input;
+	One<Stream>   stringinput;
+	String        line_data;
+	const char   *line_ptr;
+	int           line_number;
+	Array<XMLTag> tag_stack;
+	Vector<bool>  space_stack;
+	ENTITY        current_entity;
+	WString       current_text;
+	byte          charset;
+	bool          loner_tag;
+	bool          honor_spaces;
+};
+
+XMLTagTree XMLReadTagTree(Stream& stream, int line = 1);
+XMLTagTree XMLReadTagTree(String string, int line = 1);
+
+String        ToXml(const char *s, byte charset = CHARSET_DEFAULT);
+
+class XmlsTag;
+
+class Xmls : public String, Moveable<Xmls> {
+public:
+	Xmls(const char *s) : String(s) {}
+	Xmls(const String& s) : String(s) {}
+	Xmls(const Nuller& = Null) {}
+
+	bool  IsNullInstance() const     { return IsEmpty(); }
+
+	Xmls& Cat()                      { return *this; }
+
+	Xmls& Text(const char *s)        { String::Cat(ToXml(s)); return *this; }
+	Xmls& Quote(const char *text)    { Cat('\"'); Cat(ToXml(text)); Cat('\"'); return *this; }
+
+	Xmls& Attr(const char *attr);
+	Xmls& Attr(const char *attr, const char *s);
+	Xmls& Attr(const char *attr, String s);
+	Xmls& Attr(const char *attr, int i);
+	Xmls& Attr(const char *attr, double d);
+	Xmls& Attr(const char *attr, Date date);
+	Xmls& Attr(const char *attr, Value v);
+
+	Xmls& Cat(const XmlsTag& tag);
+	Xmls& Cat(String s)              { String::Cat(s); return *this; }
+	Xmls& Cat(const char *s)         { String::Cat(s); return *this; }
+	Xmls& Cat(char c)                { String::Cat(c); return *this; }
+	Xmls& Cat(const char *s, int n)  { String::Cat(s, n); return *this; }
+};
+
+class XmlsTag : Moveable<XmlsTag> {
+public:
+	XmlsTag(const char *s);
+	XmlsTag() {}
+
+	XmlsTag&       Text(const char *s)                        { tag.Text(s); return *this; }
+	XmlsTag&       Quote(const char *s)                       { tag.Quote(s); return *this; }
+
+	XmlsTag&       Attr(const char *attr)                     { tag.Attr(attr); return *this; }
+	XmlsTag&       Attr(const char *attr, const char *v)      { tag.Attr(attr, v); return *this; }
+	XmlsTag&       Attr(const char *attr, String v)           { tag.Attr(attr, v); return *this; }
+	XmlsTag&       Attr(const char *attr, int v)              { tag.Attr(attr, v); return *this; }
+	XmlsTag&       Attr(const char *attr, double v)           { tag.Attr(attr, v); return *this; }
+	XmlsTag&       Attr(const char *attr, Date v)             { tag.Attr(attr, v); return *this; }
+	XmlsTag&       Attr(const char *attr, Value v)            { tag.Attr(attr, v); return *this; }
+
+	void          Combine(const XmlsTag& tag, bool linebreak);
+
+	Xmls          ApplyTo(const char *s, bool lf = false) const;
+	Xmls          ApplyTo(String s, bool lf = false) const   { return ApplyTo(~s, lf); }
+
+	XmlsTag        operator()() const                         { return *this; }
+	Xmls          operator~() const                          { return ApplyTo(""); }
+	operator      Xmls() const                               { return ApplyTo(""); }
+	String        ToString() const                           { return ApplyTo(""); }
+
+	const Xmls&   Tag() const                                { return tag; }
+	Xmls&         Tag()                                      { return tag; }
+
+	const String& End() const                                { return end; }
+	String&       End()                                      { return end; }
+
+	bool          IsEmpty() const                            { return tag.IsEmpty(); }
+
+protected:
+	Xmls          tag;
+	String        end;
+};
+
+Xmls           Xml10(const char *encoding);
+inline Xmls    Xml10(byte charset = CHARSET_DEFAULT)                 { return Xml10(MIMECharsetName(charset)); }
+Xmls           XmlsComment(const char *text);
+
+inline Xmls&   operator << (Xmls& s, const XmlsTag& tag)             { return s.Cat(tag); }
+inline Xmls&   operator << (Xmls& s, const Xmls& v)                  { return s.Cat(v); }
+inline Xmls&   operator << (Xmls& s, String v)                       { return s.Cat(v); }
+inline Xmls&   operator << (Xmls& s, const char *v)                  { return s.Cat(v); }
+
+inline Xmls    operator + (const XmlsTag& tag1, const XmlsTag& tag2) { Xmls r(tag1); r << tag2; return r; }
+inline Xmls    operator + (const String& s, const XmlsTag& tag)      { Xmls r(s); r << tag; return r; }
+inline Xmls    operator + (const XmlsTag& tag, const String& s)      { Xmls r(tag); r << s; return r; }
+inline Xmls    operator + (const char *s, const XmlsTag& tag)        { Xmls r(s); r << tag; return r; }
+inline Xmls    operator + (const XmlsTag& tag, const char *s)        { Xmls r(tag); r << s; return r; }
+
+inline XmlsTag  operator /  (const XmlsTag& t1, const XmlsTag& t2)   { XmlsTag r(t1); r.Combine(t2, false); return r; }
+inline XmlsTag& operator /= (XmlsTag& tag, const XmlsTag& s)         { tag.Combine(s, false); return tag; }
+
+inline Xmls    operator / (const XmlsTag& tag, String s)             { return tag.ApplyTo(s, false); }
+inline Xmls    operator / (const XmlsTag& tag, const char *s)        { return tag.ApplyTo(s, false); }
+
+inline XmlsTag  operator %  (const XmlsTag& t1, const XmlsTag& t2)   { XmlsTag r(t1); r.Combine(t2, true); return r; }
+inline XmlsTag& operator %= (XmlsTag& tag, const XmlsTag& s)         { tag.Combine(s, true); return tag; }
+
+inline Xmls    operator % (const XmlsTag& tag, String s)             { return tag.ApplyTo(s, true); }
+inline Xmls    operator % (const XmlsTag& tag, const char *s)        { return tag.ApplyTo(s, true); }
+
+END_UPP_NAMESPACE
+
+#endif
diff --git a/uppsrc/TCtrlLib/AUTHORS b/uppsrc/TCtrlLib/AUTHORS
new file mode 100644
index 000000000..f782e5b62
--- /dev/null
+++ b/uppsrc/TCtrlLib/AUTHORS
@@ -0,0 +1,2 @@
+Mirek Fidler <cxl@ntllib.org>
+Tomas Rylek  <rylek@volny.cz>
\ No newline at end of file
diff --git a/uppsrc/TCtrlLib/COPYING b/uppsrc/TCtrlLib/COPYING
new file mode 100644
index 000000000..33aa39102
--- /dev/null
+++ b/uppsrc/TCtrlLib/COPYING
@@ -0,0 +1,30 @@
+Copyright (C) 2005 Mirek Fidler, Tomas Rylek and various contributors (see AUTHORS)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to
+deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies of the Software and its Copyright notices. In addition publicly
+documented acknowledgment must be given that this software has been used if no
+source code of this software is made available publicly. This includes
+acknowledgments in either Copyright notices, Manuals, Publicity and Marketing
+documents or any documentation provided with any product containing this
+software. This License does not apply to any software that links to the
+libraries provided by this software (statically or dynamically), but only to
+the software provided.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+-----------
+
+Please see the COPYING.PLAIN for a plain-english explanation of this notice
+and it's intent.
diff --git a/uppsrc/TCtrlLib/COPYING-PLAIN b/uppsrc/TCtrlLib/COPYING-PLAIN
new file mode 100644
index 000000000..770a8132f
--- /dev/null
+++ b/uppsrc/TCtrlLib/COPYING-PLAIN
@@ -0,0 +1,33 @@
+Plain English Copyright Notice
+
+This file is not intended to be the actual License. The reason this file
+exists is that we here are programmers and engineers. We aren't lawyers. We
+provide licenses that we THINK say the right things, but we have our own
+intentions at heart. This is a plain-english explanation of what those
+intentions are, and if you follow them you will be within the "spirit" of
+the license.
+
+The intent is for us to enjoy writing software that is useful to us (the
+AUTHORS) and allow others to use it freely and also benefit from the work we
+put into making it. We don't want to restrict others using it. They should
+not *HAVE* to make the source code of the applications they write that
+simply link to these libraries (be that statically or dynamically), or for
+them to be limited as to what license they choose to use (be it open, closed
+or anything else). But we would like to know you are using these libraries.
+We simply would like to know that it has been useful to someone. This is why
+we ask for acknowledgement of some sort.
+
+You can do what you want with the source of this software - it doesn't
+matter. We still have it here for ourselves and it is open and free to use
+and download and play with. It can't be taken away. We don't really mind what
+you do with the source to your software. We would simply like to know that
+you are using it - especially if it makes it to a commerical product. If you
+simply e-mail all the AUTHORS (see COPYING and AUTHORS files) telling us, and
+then make sure you include a paragraph or page in the manual or in the "About.."
+box for the product with the copyright notice and state that you used this
+software, we will be very happy. If you want to contribute back modifications
+and fixes you may have made we will welcome those too with open arms (generally).
+If you want help with changes needed, ports needed or features to be added,
+arrangements can be easily made with some dialogue.
+
+Mirek Fidler <cxl@ntllib.org>
diff --git a/uppsrc/TCtrlLib/Calc/Calc.upp b/uppsrc/TCtrlLib/Calc/Calc.upp
new file mode 100644
index 000000000..281e3b0a4
--- /dev/null
+++ b/uppsrc/TCtrlLib/Calc/Calc.upp
@@ -0,0 +1,12 @@
+uses
+	TCtrlLib;
+
+file
+	TCtrlLibCalc.h,
+	TCtrlLibCalc.t charset "UTF-8",
+	TCtrlLibCalc_init.icpp,
+	CalcGuiType.h,
+	CalcGuiType.cpp,
+	DlgCalc.cpp,
+	DlgCalc.lay,
+	CalcHelp.cpp;
diff --git a/uppsrc/TCtrlLib/Calc/CalcGuiType.cpp b/uppsrc/TCtrlLib/Calc/CalcGuiType.cpp
new file mode 100644
index 000000000..b2a52948c
--- /dev/null
+++ b/uppsrc/TCtrlLib/Calc/CalcGuiType.cpp
@@ -0,0 +1,77 @@
+#include "TCtrlLibCalc.h"
+#pragma hdrstop
+#pragma BLITZ_APPROVE
+
+NAMESPACE_UPP
+
+void UseCalcGuiType() {}
+
+RegisterCalcTypeName(Pointf,             t_("point"))
+RegisterCalcTypeName(Rectf,              t_("rectangle"))
+RegisterCalcTypeName(Color,              t_("color"))
+
+static String GroupGeom()   { return "Geometrick� objekty"; }
+
+static double CxP(Pointf pt)               { return pt.x; }
+static double CyP(Pointf pt)               { return pt.y; }
+static Pointf CpointNN(double x, double y) { return Pointf(x, y); }
+static String CtextP(Pointf pt)            { return AsString(pt); }
+
+FDECLP0(x, P, &GroupGeom)
+FDECLP0(y, P, &GroupGeom)
+FDECLP0(point, NN, &GroupGeom)
+FDECLP0(text, P, &GroupString)
+
+static double CleftR(const Rectf& rc)         { return rc.left; }
+static double CxminR(const Rectf& rc)         { return rc.left; }
+static double CtopR(const Rectf& rc)          { return rc.top; }
+static double CyminR(const Rectf& rc)         { return rc.top; }
+static double CrightR(const Rectf& rc)        { return rc.right; }
+static double CxmaxR(const Rectf& rc)         { return rc.right; }
+static double CbottomR(const Rectf& rc)       { return rc.bottom; }
+static double CymaxR(const Rectf& rc)         { return rc.bottom; }
+static double CxcenterR(const Rectf& rc)      { return (rc.left + rc.right) / 2; }
+static double CycenterR(const Rectf& rc)      { return (rc.top + rc.bottom) / 2; }
+static Pointf CtopleftR(const Rectf& rc)      { return rc.TopLeft(); }
+static Pointf CtopcenterR(const Rectf& rc)    { return rc.TopCenter(); }
+static Pointf CtoprightR(const Rectf& rc)     { return rc.TopRight(); }
+static Pointf CcenterleftR(const Rectf& rc)   { return rc.CenterLeft(); }
+static Pointf CcenterR(const Rectf& rc)       { return rc.CenterPoint(); }
+static Pointf CcenterrightR(const Rectf& rc)  { return rc.CenterRight(); }
+static Pointf CbottomleftR(const Rectf& rc)   { return rc.BottomLeft(); }
+static Pointf CbottomcenterR(const Rectf& rc) { return rc.BottomCenter(); }
+static Pointf CbottomrightR(const Rectf& rc)  { return rc.BottomRight(); }
+static Rectf  CrectNNNN(double l, double t, double r, double b) { return Rectf(l, t, r, b); }
+static Rectf  CrectP(Pointf pt)               { return PointfRectf(pt); }
+static Rectf  CrectPP(Pointf p, Pointf q)     { return SortRectf(p, q); }
+static double CwidthR(const Rectf& rc)        { return rc.Width(); }
+static double CheightR(const Rectf& rc)       { return rc.Height(); }
+static String CtextR(const Rectf& rc)         { return AsString(rc); }
+
+FDECLP0(left,         R,     &GroupGeom)
+FDECLP0(top,          R,     &GroupGeom)
+FDECLP0(right,        R,     &GroupGeom)
+FDECLP0(bottom,       R,     &GroupGeom)
+FDECLP0(xmin,         R,     &GroupGeom)
+FDECLP0(ymin,         R,     &GroupGeom)
+FDECLP0(xmax,         R,     &GroupGeom)
+FDECLP0(ymax,         R,     &GroupGeom)
+FDECLP0(xcenter,      R,     &GroupGeom)
+FDECLP0(ycenter,      R,     &GroupGeom)
+FDECLP0(topleft,      R,     &GroupGeom)
+FDECLP0(topcenter,    R,     &GroupGeom)
+FDECLP0(topright,     R,     &GroupGeom)
+FDECLP0(centerleft,   R,     &GroupGeom)
+FDECLP0(center,       R,     &GroupGeom)
+FDECLP0(centerright,  R,     &GroupGeom)
+FDECLP0(bottomleft,   R,     &GroupGeom)
+FDECLP0(bottomcenter, R,     &GroupGeom)
+FDECLP0(bottomright,  R,     &GroupGeom)
+FDECLP0(width,        R,     &GroupGeom)
+FDECLP0(height,       R,     &GroupGeom)
+FDECLP0(rect,         NNNN,  &GroupGeom)
+FDECLP0(rect,         P,     &GroupGeom)
+FDECLP0(rect,         PP,    &GroupGeom)
+FDECLP0(text,         R,     &GroupString)
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/TCtrlLib/Calc/CalcGuiType.h b/uppsrc/TCtrlLib/Calc/CalcGuiType.h
new file mode 100644
index 000000000..fac311276
--- /dev/null
+++ b/uppsrc/TCtrlLib/Calc/CalcGuiType.h
@@ -0,0 +1,15 @@
+//////////////////////////////////////////////////////////////////////
+// CalcGuiType: gui-oriented calc types.
+
+NAMESPACE_UPP
+
+void UseCalcGuiType();
+
+template <> struct CalcType<Pointf>        : public CalcRawNullType<Pointf> {};
+template <> struct CalcType<const Pointf&> : public CalcRawNullType<Pointf> {};
+template <> struct CalcType<Rectf>         : public CalcRawNullType<Rectf>  {};
+template <> struct CalcType<const Rectf&>  : public CalcRawNullType<Rectf>  {};
+template <> struct CalcType<Color>         : public CalcRawNullType<Color>  {};
+template <> struct CalcType<const Color&>  : public CalcRawNullType<Color>  {};
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/TCtrlLib/Calc/CalcGuiType.hpp b/uppsrc/TCtrlLib/Calc/CalcGuiType.hpp
new file mode 100644
index 000000000..bddafbc5b
--- /dev/null
+++ b/uppsrc/TCtrlLib/Calc/CalcGuiType.hpp
@@ -0,0 +1,232 @@
+HELP_TOPIC_BEGIN("Calc$CxP", LNG_CZECH, "\1x\1 (\1bod\1 [/ p]) [S �] \1re�ln� ��slo\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 x`-sou�adnice bodu ][/A@0+84 p][A@0+84 .]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CxP", LNG_ENGLISH, "\1x\1 (\1bod\1 [/ p]) [S �] \1real number\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 x`-sou�adnice bodu ][/A@0+84 p][A@0+84 .]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CyP", LNG_CZECH, "\1y\1 (\1bod\1 [/ p]) [S �] \1re�ln� ��slo\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 y`-sou�adnice bodu ][/A@0+84 p][A@0+84 .]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CyP", LNG_ENGLISH, "\1y\1 (\1bod\1 [/ p]) [S �] \1real number\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 y`-sou�adnice bodu ][/A@0+84 p][A@0+84 .]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CpointNN", LNG_CZECH, "\1point\1 (\1re�ln� ��slo\1 [/ x], \1re�ln� ��slo\1 [/ y]) [S �] \1bod\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 Funkce vr�t� bod o zadan�ch sou�adnic�ch.]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CpointNN", LNG_ENGLISH, "\1point\1 (\1real number\1 [/ x], \1real number\1 [/ y]) [S �] \1bod\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 Funkce vr�t� bod o zadan�ch sou�adnic�ch.]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CtextP", LNG_CZECH, "\1text\1 (\1bod\1) [S �] \1�et�zec\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 Vr�t� textov� �et�zec se sou�adnicemi bodu.]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CtextP", LNG_ENGLISH, "\1text\1 (\1bod\1) [S �] \1string\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 Vr�t� textov� �et�zec se sou�adnicemi bodu.]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CleftR", LNG_CZECH, "\1left\1 (\1obd�ln�k\1) [S �] \1re�ln� ��slo\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 Doln� mez x sou�adnice obd�ln�ku.]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CleftR", LNG_ENGLISH, "\1left\1 (\1obd�ln�k\1) [S �] \1real number\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 Doln� mez x sou�adnice obd�ln�ku.]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CtopR", LNG_CZECH, "\1top\1 (\1obd�ln�k\1) [S �] \1re�ln� ��slo\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 Doln� mez y sou�adnice obd�ln�ku.]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CtopR", LNG_ENGLISH, "\1top\1 (\1obd�ln�k\1) [S �] \1real number\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 Doln� mez y sou�adnice obd�ln�ku.]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CrightR", LNG_CZECH, "\1right\1 (\1obd�ln�k\1) [S �] \1re�ln� ��slo\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 Horn� mez x sou�adnice obd�ln�ku.]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CrightR", LNG_ENGLISH, "\1right\1 (\1obd�ln�k\1) [S �] \1real number\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 Horn� mez x sou�adnice obd�ln�ku.]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CbottomR", LNG_CZECH, "\1bottom\1 (\1obd�ln�k\1) [S �] \1re�ln� ��slo\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 Horn� mez y sou�adnice obd�ln�ku.]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CbottomR", LNG_ENGLISH, "\1bottom\1 (\1obd�ln�k\1) [S �] \1real number\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 Horn� mez y sou�adnice obd�ln�ku.]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CxminR", LNG_CZECH, "\1xmin\1 (\1obd�ln�k\1) [S �] \1re�ln� ��slo\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 Doln� mez x sou�adnice obd�ln�ku.]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CxminR", LNG_ENGLISH, "\1xmin\1 (\1obd�ln�k\1) [S �] \1real number\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 Doln� mez x sou�adnice obd�ln�ku.]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CyminR", LNG_CZECH, "\1ymin\1 (\1obd�ln�k\1) [S �] \1re�ln� ��slo\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 Doln� mez y sou�adnice obd�ln�ku.]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CyminR", LNG_ENGLISH, "\1ymin\1 (\1obd�ln�k\1) [S �] \1real number\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 Doln� mez y sou�adnice obd�ln�ku.]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CxmaxR", LNG_CZECH, "\1xmax\1 (\1obd�ln�k\1) [S �] \1re�ln� ��slo\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 Horn� mez x sou�adnice obd�ln�ku.]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CxmaxR", LNG_ENGLISH, "\1xmax\1 (\1obd�ln�k\1) [S �] \1real number\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 Horn� mez x sou�adnice obd�ln�ku.]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CymaxR", LNG_CZECH, "\1ymax\1 (\1obd�ln�k\1) [S �] \1re�ln� ��slo\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 Horn� mez y sou�adnice obd�ln�ku.]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CymaxR", LNG_ENGLISH, "\1ymax\1 (\1obd�ln�k\1) [S �] \1real number\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 Horn� mez y sou�adnice obd�ln�ku.]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CxcenterR", LNG_CZECH, "\1xcenter\1 (\1obd�ln�k\1) [S �] \1re�ln� ��slo\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 X`-sou�adnice st�edu obd�ln�ku.]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CxcenterR", LNG_ENGLISH, "\1xcenter\1 (\1obd�ln�k\1) [S �] \1real number\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 X`-sou�adnice st�edu obd�ln�ku.]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CycenterR", LNG_CZECH, "\1ycenter\1 (\1obd�ln�k\1) [S �] \1re�ln� ��slo\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 Y`-sou�adnice st�edu obd�ln�ku.]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CycenterR", LNG_ENGLISH, "\1ycenter\1 (\1obd�ln�k\1) [S �] \1real number\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 Y`-sou�adnice st�edu obd�ln�ku.]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CtopleftR", LNG_CZECH, "\1topleft\1 (\1obd�ln�k\1) [S �] \1bod\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 Lev� horn� roh obd�ln�ku.]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CtopleftR", LNG_ENGLISH, "\1topleft\1 (\1obd�ln�k\1) [S �] \1bod\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 Lev� horn� roh obd�ln�ku.]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CtopcenterR", LNG_CZECH, "\1topcenter\1 (\1obd�ln�k\1) [S �] \1bod\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 St�ed horn� strany obd�ln�ku.]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CtopcenterR", LNG_ENGLISH, "\1topcenter\1 (\1obd�ln�k\1) [S �] \1bod\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 St�ed horn� strany obd�ln�ku.]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CtoprightR", LNG_CZECH, "\1topright\1 (\1obd�ln�k\1) [S �] \1bod\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 Prav� horn� roh obd�ln�ku.]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CtoprightR", LNG_ENGLISH, "\1topright\1 (\1obd�ln�k\1) [S �] \1bod\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 Prav� horn� roh obd�ln�ku.]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CcenterleftR", LNG_CZECH, "\1centerleft\1 (\1obd�ln�k\1) [S �] \1bod\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 St�ed lev� strany obd�ln�ku.]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CcenterleftR", LNG_ENGLISH, "\1centerleft\1 (\1obd�ln�k\1) [S �] \1bod\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 St�ed lev� strany obd�ln�ku.]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CcenterR", LNG_CZECH, "\1center\1 (\1obd�ln�k\1) [S �] \1bod\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 St�ed obd�ln�ku.]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CcenterR", LNG_ENGLISH, "\1center\1 (\1obd�ln�k\1) [S �] \1bod\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 St�ed obd�ln�ku.]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CcenterrightR", LNG_CZECH, "\1centerright\1 (\1obd�ln�k\1) [S �] \1bod\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 St�ed prav� strany obd�ln�ku.]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CcenterrightR", LNG_ENGLISH, "\1centerright\1 (\1obd�ln�k\1) [S �] \1bod\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 St�ed prav� strany obd�ln�ku.]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CbottomleftR", LNG_CZECH, "\1bottomleft\1 (\1obd�ln�k\1) [S �] \1bod\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 Lev� doln� roh obd�ln�ku.]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CbottomleftR", LNG_ENGLISH, "\1bottomleft\1 (\1obd�ln�k\1) [S �] \1bod\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 Lev� doln� roh obd�ln�ku.]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CbottomcenterR", LNG_CZECH, "\1bottomcenter\1 (\1obd�ln�k\1) [S �] \1bod\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 St�ed doln� strany obd�ln�ku.]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CbottomcenterR", LNG_ENGLISH, "\1bottomcenter\1 (\1obd�ln�k\1) [S �] \1bod\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 St�ed doln� strany obd�ln�ku.]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CbottomrightR", LNG_CZECH, "\1bottomright\1 (\1obd�ln�k\1) [S �] \1bod\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 Prav� doln� roh obd�ln�ku.]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CbottomrightR", LNG_ENGLISH, "\1bottomright\1 (\1obd�ln�k\1) [S �] \1bod\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 Prav� doln� roh obd�ln�ku.]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CwidthR", LNG_CZECH, "\1width\1 (\1obd�ln�k\1) [S �] \1re�ln� ��slo\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 ���ka obd�ln�ku (xmax `- xmin).]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CwidthR", LNG_ENGLISH, "\1width\1 (\1obd�ln�k\1) [S �] \1real number\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 ���ka obd�ln�ku (xmax `- xmin).]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CheightR", LNG_CZECH, "\1height\1 (\1obd�ln�k\1) [S �] \1re�ln� ��slo\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 V��ka obd�ln�ku (ymax `- ymin).]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CheightR", LNG_ENGLISH, "\1height\1 (\1obd�ln�k\1) [S �] \1real number\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 V��ka obd�ln�ku (ymax `- ymin).]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CrectNNNN", LNG_CZECH, "\1rect\1 (\1re�ln� ��slo\1 [/ xmin], \1re�ln� ��slo\1 [/ ymin], \1re�ln� ��slo\1 [/ xmax], \1re�ln� ��slo\1 [/ ymax]) [S �] \1obd�ln�k\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 Vr�t� obd�ln�k se zadan�mi sou�adnicemi.]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CrectNNNN", LNG_ENGLISH, "\1rect\1 (\1real number\1 [/ xmin], \1real number\1 [/ ymin], \1real number\1 [/ xmax], \1real number\1 [/ ymax]) [S �] \1obd�ln�k\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 Vr�t� obd�ln�k se zadan�mi sou�adnicemi.]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CrectP", LNG_CZECH, "\1rect\1 (\1bod\1 [/ P]) [S �] \1obd�ln�k\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 Vr�t� obd�ln�k obsahuj�c� zadan� bod.]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CrectP", LNG_ENGLISH, "\1rect\1 (\1bod\1 [/ P]) [S �] \1obd�ln�k\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 Vr�t� obd�ln�k obsahuj�c� zadan� bod.]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CrectPP", LNG_CZECH, "\1rect\1 (\1bod\1 [/ P], \1bod\1 [/ Q]) [S �] \1obd�ln�k\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 Vr�t� omezuj�c� obd�ln�k dvojice bod�.]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CrectPP", LNG_ENGLISH, "\1rect\1 (\1bod\1 [/ P], \1bod\1 [/ Q]) [S �] \1obd�ln�k\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 Vr�t� omezuj�c� obd�ln�k dvojice bod�.]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CtextR", LNG_CZECH, "\1text\1 (\1obd�ln�k\1) [S �] \1�et�zec\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 Vr�t� textov� �et�zec s mezemi obd�ln�ku.]]\r\n")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("Calc$CtextR", LNG_ENGLISH, "\1text\1 (\1obd�ln�k\1) [S �] \1string\1")
+	HELP_TOPIC_TEXT(
+	"[ [A@0+84 Vr�t� textov� �et�zec s mezemi obd�ln�ku.]]\r\n")
+HELP_TOPIC_END()
diff --git a/uppsrc/TCtrlLib/Calc/CalcHelp.cpp b/uppsrc/TCtrlLib/Calc/CalcHelp.cpp
new file mode 100644
index 000000000..cedab3b61
--- /dev/null
+++ b/uppsrc/TCtrlLib/Calc/CalcHelp.cpp
@@ -0,0 +1,325 @@
+#include "TCtrlLibCalc.h"
+#pragma hdrstop
+
+NAMESPACE_UPP
+
+void UseHelpCalc() {}
+
+HelpCalcMap GetHelpCalcGroup(const String& groupname)
+{
+	HelpCalcMap out_map;
+	const HelpCalcMap& map = GetHelpCalcMap();
+	for(int i = 0; i < map.GetCount(); i++)
+		if(map[i]->groupfn && map[i]->groupfn() == groupname)
+			out_map.Add(map[i]);
+	Sort(out_map, HelpCalc::Compare(HelpCalc::Compare::ALPHABETIC));
+	return out_map;
+}
+
+//////////////////////////////////////////////////////////////////////
+// HelpCalcIndex::
+
+/*
+HelpCalcIndex& HelpCalcIndex::Get()
+{
+	static HelpCalcIndex index;
+	return index;
+}
+*/
+
+static void HelpCalcPutSummary(String& out)
+{
+	HelpCalcMap ix;
+	ix <<= GetHelpCalcMap();
+	Sort(ix, HelpCalc::Compare(HelpCalc::Compare::ALPHABETIC));
+
+	Table table;
+	table.Before(100).FrameWidth(0);
+
+	const Color PAPER(255, 255, 224);
+	table(0, 0).Ratio(10).Paper(PAPER).FrameWidth(0).Top().Qtf(t_("[*3 Function"));
+	table(0, 1).Ratio(4).Paper(PAPER).FrameWidth(0).Top().Qtf(t_("[*3 Group"));
+
+	RichPara::CharFormat groupstyle;
+	groupstyle.Height(84);
+
+	RichPara::CharFormat titlestyle;
+	titlestyle.Height(100);
+	titlestyle.Bold();
+	titlestyle.paper = WhiteGray;
+
+	RichPara::CharFormat indexstyle = titlestyle;
+
+	String styles = HelpTopicGet(HelpHostDPP("style")).GetText() + "\r\n";
+
+	RichText text;
+
+	int row = 0;
+	for(int i = 0; i < ix.GetCount(); i++)
+	{
+		String p0grp = ix[i]->groupfn();
+		String top = ix[i]->topic, tit = ix[i]->GetTitle();
+//		int begin = text.GetParaCount();
+		{
+			RichPara title;
+			title.format.before = 200;
+			indexstyle.indexentry = ("@@" + HelpAppDPP(top)).ToWString();
+			title.Cat(RichObject(RichObjectTypeEmpty(), Null), indexstyle);
+			MQTFCat(title, tit, titlestyle);
+			text.Cat(title);
+		}
+		{
+			RichPara group;
+			group.format.after = 100;
+			groupstyle.NoBold();
+			group.Cat(WString("Skupina: "), groupstyle);
+			groupstyle.Bold();
+			MQTFCat(group, p0grp, groupstyle);
+			text.Cat(group);
+		}
+		AppendQTF(text, styles + HelpTopicGet(HelpAppDPP(top)).GetText());
+	}
+
+	out = BodyAsQTF(text);
+//	HelpBody() << table;
+}
+
+RegisterHelpTopicHost("calc_summary", "Seznam funkc� v�razov�ho kalkul�toru", callback(&HelpCalcPutSummary))
+
+static void HelpCalcPutGroups(String& out, bool book)
+{
+	HelpCalcMap ix;
+	ix <<= GetHelpCalcMap();
+	Sort(ix, HelpCalc::Compare(HelpCalc::Compare::GROUPS));
+//	int cycle = 0;
+	for(const HelpCalc *const *b = ix.Begin(), *const *p = b, *const *e = ix.End(); p < e;)
+	{
+		bool start = false;
+		String p0grp = p[0]->groupfn();
+		if(p == b || p0grp != p[-1]->groupfn())
+		{
+			String s;
+			if(!IsNull(p0grp))
+				s = p0grp;
+			else if(p > b)
+				s << t_("Miscellaneous");
+			if(!IsNull(s))
+				out << "[3* &" << s << "]&&\n";
+			start = true;
+		}
+
+		const HelpCalc *const *o = p;
+		while(++p < e && p[0]->ident == o[0]->ident
+			&& p[0]->groupfn() == o[0]->groupfn())
+			;
+
+		for(const HelpCalc *const *t = o; t < p; t++)
+		{
+			String top = (**t).topic, tit = (**t).GetTitle();
+			out
+//			<< "[" << "123456789"[++cycle % 9] << " [^=shit^ SHIT][_ SHIT]&]\n";
+			<< "[2i150";
+			if(!book)
+				out << '^' << top << '^';
+			out << ' ' << tit;
+			if(book)
+				out << ", \n\n{:INDEX:" << DeQtf(top) << ":}\n";
+			out << "&]\n";
+		}
+	}
+}
+
+RegisterHelpTopicHost("calc_groups", "Skupiny funkc� v�razov�ho kalkul�toru", callback1(&HelpCalcPutGroups, false))
+RegisterHelpTopicHost("calc_groups_book", "Skupiny funkc� v�razov�ho kalkul�toru", callback1(&HelpCalcPutGroups, true))
+
+#if 0
+void HelpCalcIndex::AddIndexEntries() const
+{
+	for(int i = 0; i < index.GetCount(); i++)
+	{
+		const HelpCalc& calc = *index[i];
+		String entry;
+		entry << "[/ \1" << calc.id << "\1]";
+		if(IsAlNum(*calc.id) || *calc.id == '_')
+			entry << t_(", function");
+		else
+			entry << t_(", operator");
+		HelpIndex::Get().AddIndex(entry, "Calc#" + IntStr(calc.ord));
+	}
+}
+#endif
+
+/*
+HelpCalcIndex::HelpCalcIndex()
+{
+}
+*/
+
+#if 0
+String HelpCalcLink(const char *id, const char *ref, bool bold)
+{
+	Vector<const HelpCalc *> candidates;
+	const HelpCalcIndex::IdMap& map = HelpCalcIndex::Get().GetIndex();
+	for(int i = map.Find(id); i >= 0; i = map.FindNext(i))
+		candidates.Add(map[i]);
+	if(candidates.IsEmpty())
+		return id;
+	SortX(candidates, XDeref(XRef<const HelpCalc>()), HelpCalc::Compare(HelpCalc::Compare::GROUPS));
+	String anchor = "Calc#";
+	anchor << candidates[0]->ord;
+	return HelpTagLink(bold ? "*" : 0, anchor, id, ref);
+}
+#endif
+
+/*
+Index<Callback>& HelpCalcInit::Get()
+{
+	static bool guard;
+	MtDblChkGuard __(guard);
+	static Index<Callback> list;
+	return list;
+}
+
+void HelpCalcInit::Run()
+{
+	Index<Callback>& fns = Get();
+	for(int i = 0; i < fns.GetCount(); i++)
+		fns[i]();
+	fns.Clear();
+}
+*/
+
+bool HelpCalc::Compare::operator () (const HelpCalc *a, const HelpCalc *b) const
+{
+	String agrp = MQTFStrip(a->groupfn()), bgrp = MQTFStrip(b->groupfn());
+	int gcmp;
+	if(IsNull(agrp) != IsNull(bgrp))
+		gcmp = IsNull(bgrp) ? -1 : 1;
+	else
+		gcmp = lang.Compare(agrp, bgrp);
+
+	int acmp;
+	bool aoper = !CharFilterCalcIdent(*a->ident);
+	bool boper = !CharFilterCalcIdent(*b->ident);
+	if(aoper != boper)
+		acmp = aoper ? -1 : 1;
+	else
+		acmp = lang.Compare(a->ident, b->ident);
+	if(acmp == 0)
+		acmp = lang.Compare(MQTFStrip(a->GetTitle()), MQTFStrip(b->GetTitle()));
+	if(mode == GROUPS)
+		return gcmp ? gcmp < 0 : acmp < 0;
+	else if(mode == ALPHABETIC)
+		return acmp ? acmp < 0 : gcmp < 0;
+	else
+	{
+		NEVER();
+		return false;
+	}
+}
+
+void AddHelpCalcGroups(DropList& droplist, const String& prefix)
+{
+	Vector<String> groups = GetHelpCalcGroups();
+	for(int i = 0; i < groups.GetCount(); i++)
+		droplist.Add(prefix + groups[i], "Kalkul�tor: " + Nvl(groups[i], "Ostatn�"));
+}
+
+void AddHelpCalcGroup(DropList& dest, const String& group)
+{
+	HelpCalcMap map = GetHelpCalcGroup(group);
+	for(int i = 0; i < map.GetCount(); i++)
+		dest.Add(map[i]->ident, MQTFStrip(map[i]->GetTitle()));
+}
+
+/*
+String HelpCalc::FormatArg(int i) const
+{
+	ASSERT(i >= 0 && i < arg_types.GetCount() && i < arg_names.GetCount());
+	if(IsNull(arg_types[i]) && IsNull(arg_names[i]))
+		return s_(HelpCalcArgTypeAny);
+	String s;
+	if(!IsNull(arg_types[i]))
+		s << "\1" << arg_types[i] << "\1";
+	if(!IsNull(arg_names[i]))
+	{
+		if(*s)
+			s << ' ';
+		s << "[/ " << arg_names[i] << "]";
+	}
+	return s;
+}
+*/
+
+/*
+String HelpCalc::FormatArgs() const
+{
+	String s;
+	for(int i = 0; i < arg_types.GetCount(); i++)
+	{
+		if(i)
+			s << ", ";
+		s << FormatArg(i);
+	}
+	return s;
+}
+*/
+
+/*
+String HelpCalc::FormatResult() const
+{
+	if(IsNull(result))
+		return Null;
+	return "\1" + result + "\1";
+}
+*/
+
+/*
+String HelpCalc::FormatFunction() const
+{
+	String s;
+	bool oper = !IsAlNum(*id) && *id != '_';
+	if(oper)
+		s << s_(HelpCalcFormatFunctionOperator);
+	s << "[* \1" << id << "\1]";
+	if(!arg_types.IsEmpty())
+		s << " (" << FormatArgs() << ')';
+	if(!IsNull(result))
+		s << " [S \xAE] " << FormatResult();
+	return s;
+}
+*/
+
+/*
+static void CalcInit()
+{
+	HelpCalcInit::Run();
+	HelpCalcIndex::Get().AddIndexEntries();
+}
+
+static HelpInit MK__s = callback(CalcInit);
+*/
+
+/*
+static void CalcPutHelp()
+{
+	HelpCalcIndex::Get().PutGroups();
+}
+
+STATIC_HELP(Calc, s_(CalcHelpTopic),
+	s_(CalcHelpIndex)
+)
+*/
+
+/*
+static void CalcIndexPutHelp()
+{
+	HelpCalcIndex::Get().PutSummary();
+}
+
+STATIC_HELP(CalcIndex, s_(CalcIndexHelpTopic),
+	s_(CalcIndexHelpIndex)
+)
+*/
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/TCtrlLib/Calc/DlgCalc.cpp b/uppsrc/TCtrlLib/Calc/DlgCalc.cpp
new file mode 100644
index 000000000..f0b85ef8f
--- /dev/null
+++ b/uppsrc/TCtrlLib/Calc/DlgCalc.cpp
@@ -0,0 +1,89 @@
+#include "TCtrlLibCalc.h"
+#pragma hdrstop
+
+NAMESPACE_UPP
+
+#define LAYOUTFILE <TCtrlLib/Calc/DlgCalc.lay>
+#include           <CtrlCore/lay.h>
+
+class DlgCalc : public WithCalcLayout<TopWindow>
+{
+public:
+	typedef DlgCalc CLASSNAME;
+	DlgCalc();
+
+	static ConfigItem& config();
+	void        Serialize(Stream& stream);
+	void        Run(CalcContext& context);
+
+private:
+	void        CmdStore();
+
+private:
+	CalcContext      *calc_context;
+	Value             result_val;
+};
+
+CONFIG_ITEM(DlgCalc::config, "DlgCalc", 1, 1, 1)
+
+void RunDlgCalc(CalcContext& context) { DlgCalc().Run(context); }
+
+RegisterHelpTopicObjectTitle(DlgCalc, t_("Calculator"))
+
+DlgCalc::DlgCalc()
+{
+	calc_context = NULL;
+	CtrlLayoutOKCancel(*this, DlgCalcHelpTitle());
+	HelpTopic("DlgCalc");
+	result.SetReadOnly();
+	result.SetConvert(CFormatConvert());
+	store <<= THISBACK(CmdStore);
+}
+
+void DlgCalc::Serialize(Stream& stream)
+{
+	exp.SerializeList(stream);
+}
+
+void DlgCalc::Run(CalcContext& context)
+{
+	calc_context = &context;
+	ReadConfigSelf();
+	CalcContext::Nesting level(context);
+	while(TopWindow::Run() == IDOK) {
+		try {
+			WaitCursor wait;
+			CalcNodePtr node = CalcParser().Scan((String)~exp);
+			result_val = node -> Calc(context);
+			result <<= context.FormatNull(result_val);
+			exp.AddHistory();
+		}
+		catch(Exc e) {
+			result <<= e;
+			BeepExclamation();
+		}
+		exp.SetFocus();
+		exp.SetSelection();
+	}
+	WriteConfigSelf();
+	calc_context = NULL;
+}
+
+void DlgCalc::CmdStore()
+{
+	WithCalcStoreLayout<TopWindow> stdlg;
+	CtrlLayoutOKCancel(stdlg, NFormat("Store %vt", result_val));
+	stdlg.var.SetFilter(CharFilterCalcIdent);
+	stdlg.list.AddColumn("Variable");
+	stdlg.list.AddColumn("Value");
+	const CalcSymbols& tos = calc_context->stack.Top();
+	Vector<int> order = GetSortOrder(tos.var_index);
+	for(int i = 0; i < order.GetCount(); i++) {
+		int o = order[i];
+		stdlg.list.Add(tos.var_index[o], tos.var_value[o]);
+	}
+	if(stdlg.Run() == IDOK)
+		calc_context->Set(~stdlg.var, result_val, true);
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/TCtrlLib/Calc/DlgCalc.lay b/uppsrc/TCtrlLib/Calc/DlgCalc.lay
new file mode 100644
index 000000000..07a3fa7ae
--- /dev/null
+++ b/uppsrc/TCtrlLib/Calc/DlgCalc.lay
@@ -0,0 +1,17 @@
+LAYOUT(CalcLayout, 462, 84)
+	ITEM(Label, dv___0, SetLabel(t_("&Expression:")).LeftPosZ(4, 62).TopPosZ(4, 19))
+	ITEM(WithDropChoice<EditField>, exp, HSizePosZ(68, 4).TopPosZ(4, 19))
+	ITEM(Label, dv___2, SetLabel(t_("&Value:")).LeftPosZ(3, 62).TopPosZ(26, 19))
+	ITEM(EditField, result, HSizePosZ(68, 4).TopPosZ(26, 19))
+	ITEM(Button, store, SetLabel(t_("&Store")).LeftPosZ(68, 80).BottomPosZ(4, 22))
+	ITEM(Button, ok, SetLabel(t_("OK")).RightPosZ(88, 80).BottomPosZ(4, 22))
+	ITEM(Button, cancel, SetLabel(t_("Cancel")).RightPosZ(4, 80).BottomPosZ(4, 22))
+END_LAYOUT
+
+LAYOUT(CalcStoreLayout, 246, 192)
+	ITEM(Label, dv___0, SetLabel(t_("&Variable name:")).LeftPosZ(4, 74).TopPosZ(4, 19))
+	ITEM(EditString, var, NotNull(true).HSizePosZ(78, 4).TopPosZ(4, 19))
+	ITEM(ArrayCtrl, list, HSizePosZ(4, 4).VSizePosZ(26, 34))
+	ITEM(Button, ok, SetLabel(t_("OK")).RightPosZ(88, 80).BottomPosZ(4, 22))
+	ITEM(Button, cancel, SetLabel(t_("Cancel")).RightPosZ(4, 80).BottomPosZ(4, 22))
+END_LAYOUT
diff --git a/uppsrc/TCtrlLib/Calc/TCtrlLibCalc.h b/uppsrc/TCtrlLib/Calc/TCtrlLibCalc.h
new file mode 100644
index 000000000..0e8e75a3f
--- /dev/null
+++ b/uppsrc/TCtrlLib/Calc/TCtrlLibCalc.h
@@ -0,0 +1,23 @@
+#ifndef __TCtrlLibCalc__
+#define __TCtrlLibCalc__
+
+#include <TCore/TCoreCalc.h>
+#include <TCtrlLib/Help/TCtrlLibHelp.h>
+#include "CalcGuiType.h"
+
+NAMESPACE_UPP
+
+void RunDlgCalc(CalcContext& context);
+
+void UseHelpCalc();
+void HelpCalcPutIndex();
+//void HelpCalcPutGroups();
+
+HelpCalcMap GetHelpCalcGroup(const String& groupname);
+
+void AddHelpCalcGroups(DropList& dest, const String& prefix = "@");
+void AddHelpCalcGroup(DropList& dest, const String& group);
+
+END_UPP_NAMESPACE
+
+#endif//__TCtrlLibCalc__
diff --git a/uppsrc/TCtrlLib/Calc/TCtrlLibCalc.t b/uppsrc/TCtrlLib/Calc/TCtrlLibCalc.t
new file mode 100644
index 000000000..c2814fe70
--- /dev/null
+++ b/uppsrc/TCtrlLib/Calc/TCtrlLibCalc.t
@@ -0,0 +1,58 @@
+#ifdef _MSC_VER
+#pragma setlocale("C")
+#endif
+// CalcGuiType.cpp
+
+T_("point")
+csCZ("bod")
+
+T_("rectangle")
+csCZ("obdélník")
+
+T_("color")
+csCZ("barva")
+
+
+// DlgCalc.cpp
+
+T_("Calculator")
+csCZ("Kalkulátor")
+
+
+// DlgCalc.lay
+
+T_("&Expression:")
+csCZ("&Výraz:")
+
+T_("&Value:")
+csCZ("&Hodnota:")
+
+T_("&Store")
+csCZ("&Uložit")
+
+T_("OK")
+csCZ("OK")
+
+T_("Cancel")
+csCZ("Storno")
+
+T_("&Variable name:")
+csCZ("&Do proměnné:")
+
+
+// CalcHelp.cpp
+
+T_("[*3 Function")
+csCZ("[*3 Funkce")
+
+T_("[*3 Group")
+csCZ("[*3 Skupina")
+
+T_("Miscellaneous")
+csCZ("Ostatní")
+
+T_(", function")
+csCZ(", funkce")
+
+T_(", operator")
+csCZ(", operátor")
diff --git a/uppsrc/TCtrlLib/Calc/TCtrlLibCalc_init.icpp b/uppsrc/TCtrlLib/Calc/TCtrlLibCalc_init.icpp
new file mode 100644
index 000000000..1b4ba69f3
--- /dev/null
+++ b/uppsrc/TCtrlLib/Calc/TCtrlLibCalc_init.icpp
@@ -0,0 +1,8 @@
+#include "TCtrlLibCalc.h"
+
+NAMESPACE_UPP
+
+#define TFILE <TCtrlLib/Calc/TCtrlLibCalc.t>
+#include <Core/t.h>
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CbottomR_CS-CZ15.dpx b/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CbottomR_CS-CZ15.dpx
new file mode 100644
index 000000000..34bebfe52
--- /dev/null
+++ b/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CbottomR_CS-CZ15.dpx
@@ -0,0 +1,4 @@
+HELP_TOPIC("AppDoc", "", "Calc$CbottomR", "CS-CZ windows-1250", "\1bottom\1 (\1obd�ln�k\1) [S �] \1re�ln� ��slo\1")
+	HELP_TEXT(
+	"[ [A@0+84 Horn� mez y sou�adnice obd�ln�ku.]]\r\n")
+HELP_END
diff --git a/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CbottomR_EN-US.dpx b/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CbottomR_EN-US.dpx
new file mode 100644
index 000000000..d22541c96
--- /dev/null
+++ b/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CbottomR_EN-US.dpx
@@ -0,0 +1,4 @@
+HELP_TOPIC("AppDoc", "", "Calc$CbottomR", "EN-US", "\1bottom\1 (\1obd�ln�k\1) [S �] \1real number\1")
+	HELP_TEXT(
+	"[ [A@0+84 Horn� mez y sou�adnice obd�ln�ku.]]\r\n")
+HELP_END
diff --git a/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CbottomcenterR_CS-CZ15.dpx b/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CbottomcenterR_CS-CZ15.dpx
new file mode 100644
index 000000000..6cb7ccd71
--- /dev/null
+++ b/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CbottomcenterR_CS-CZ15.dpx
@@ -0,0 +1,4 @@
+HELP_TOPIC("AppDoc", "", "Calc$CbottomcenterR", "CS-CZ windows-1250", "\1bottomcenter\1 (\1obd�ln�k\1) [S �] \1bod\1")
+	HELP_TEXT(
+	"[ [A@0+84 St�ed doln� strany obd�ln�ku.]]\r\n")
+HELP_END
diff --git a/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CbottomcenterR_EN-US.dpx b/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CbottomcenterR_EN-US.dpx
new file mode 100644
index 000000000..92ed9d30c
--- /dev/null
+++ b/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CbottomcenterR_EN-US.dpx
@@ -0,0 +1,4 @@
+HELP_TOPIC("AppDoc", "", "Calc$CbottomcenterR", "EN-US", "\1bottomcenter\1 (\1obd�ln�k\1) [S �] \1bod\1")
+	HELP_TEXT(
+	"[ [A@0+84 St�ed doln� strany obd�ln�ku.]]\r\n")
+HELP_END
diff --git a/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CbottomleftR_CS-CZ15.dpx b/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CbottomleftR_CS-CZ15.dpx
new file mode 100644
index 000000000..9d7ab607f
--- /dev/null
+++ b/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CbottomleftR_CS-CZ15.dpx
@@ -0,0 +1,4 @@
+HELP_TOPIC("AppDoc", "", "Calc$CbottomleftR", "CS-CZ windows-1250", "\1bottomleft\1 (\1obd�ln�k\1) [S �] \1bod\1")
+	HELP_TEXT(
+	"[ [A@0+84 Lev� doln� roh obd�ln�ku.]]\r\n")
+HELP_END
diff --git a/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CbottomleftR_EN-US.dpx b/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CbottomleftR_EN-US.dpx
new file mode 100644
index 000000000..e34e23e7c
--- /dev/null
+++ b/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CbottomleftR_EN-US.dpx
@@ -0,0 +1,4 @@
+HELP_TOPIC("AppDoc", "", "Calc$CbottomleftR", "EN-US", "\1bottomleft\1 (\1obd�ln�k\1) [S �] \1bod\1")
+	HELP_TEXT(
+	"[ [A@0+84 Lev� doln� roh obd�ln�ku.]]\r\n")
+HELP_END
diff --git a/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CbottomrightR_CS-CZ15.dpx b/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CbottomrightR_CS-CZ15.dpx
new file mode 100644
index 000000000..573d48212
--- /dev/null
+++ b/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CbottomrightR_CS-CZ15.dpx
@@ -0,0 +1,4 @@
+HELP_TOPIC("AppDoc", "", "Calc$CbottomrightR", "CS-CZ windows-1250", "\1bottomright\1 (\1obd�ln�k\1) [S �] \1bod\1")
+	HELP_TEXT(
+	"[ [A@0+84 Prav� doln� roh obd�ln�ku.]]\r\n")
+HELP_END
diff --git a/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CbottomrightR_EN-US.dpx b/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CbottomrightR_EN-US.dpx
new file mode 100644
index 000000000..ca2b3cf1f
--- /dev/null
+++ b/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CbottomrightR_EN-US.dpx
@@ -0,0 +1,4 @@
+HELP_TOPIC("AppDoc", "", "Calc$CbottomrightR", "EN-US", "\1bottomright\1 (\1obd�ln�k\1) [S �] \1bod\1")
+	HELP_TEXT(
+	"[ [A@0+84 Prav� doln� roh obd�ln�ku.]]\r\n")
+HELP_END
diff --git a/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CcenterR_CS-CZ15.dpx b/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CcenterR_CS-CZ15.dpx
new file mode 100644
index 000000000..6a835eda6
--- /dev/null
+++ b/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CcenterR_CS-CZ15.dpx
@@ -0,0 +1,4 @@
+HELP_TOPIC("AppDoc", "", "Calc$CcenterR", "CS-CZ windows-1250", "\1center\1 (\1obd�ln�k\1) [S �] \1bod\1")
+	HELP_TEXT(
+	"[ [A@0+84 St�ed obd�ln�ku.]]\r\n")
+HELP_END
diff --git a/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CcenterR_EN-US.dpx b/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CcenterR_EN-US.dpx
new file mode 100644
index 000000000..4a0843f18
--- /dev/null
+++ b/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CcenterR_EN-US.dpx
@@ -0,0 +1,4 @@
+HELP_TOPIC("AppDoc", "", "Calc$CcenterR", "EN-US", "\1center\1 (\1obd�ln�k\1) [S �] \1bod\1")
+	HELP_TEXT(
+	"[ [A@0+84 St�ed obd�ln�ku.]]\r\n")
+HELP_END
diff --git a/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CcenterleftR_CS-CZ15.dpx b/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CcenterleftR_CS-CZ15.dpx
new file mode 100644
index 000000000..f95cfc473
--- /dev/null
+++ b/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CcenterleftR_CS-CZ15.dpx
@@ -0,0 +1,4 @@
+HELP_TOPIC("AppDoc", "", "Calc$CcenterleftR", "CS-CZ windows-1250", "\1centerleft\1 (\1obd�ln�k\1) [S �] \1bod\1")
+	HELP_TEXT(
+	"[ [A@0+84 St�ed lev� strany obd�ln�ku.]]\r\n")
+HELP_END
diff --git a/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CcenterleftR_EN-US.dpx b/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CcenterleftR_EN-US.dpx
new file mode 100644
index 000000000..12afd65c1
--- /dev/null
+++ b/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CcenterleftR_EN-US.dpx
@@ -0,0 +1,4 @@
+HELP_TOPIC("AppDoc", "", "Calc$CcenterleftR", "EN-US", "\1centerleft\1 (\1obd�ln�k\1) [S �] \1bod\1")
+	HELP_TEXT(
+	"[ [A@0+84 St�ed lev� strany obd�ln�ku.]]\r\n")
+HELP_END
diff --git a/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CcenterrightR_CS-CZ15.dpx b/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CcenterrightR_CS-CZ15.dpx
new file mode 100644
index 000000000..c14f69234
--- /dev/null
+++ b/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CcenterrightR_CS-CZ15.dpx
@@ -0,0 +1,4 @@
+HELP_TOPIC("AppDoc", "", "Calc$CcenterrightR", "CS-CZ windows-1250", "\1centerright\1 (\1obd�ln�k\1) [S �] \1bod\1")
+	HELP_TEXT(
+	"[ [A@0+84 St�ed prav� strany obd�ln�ku.]]\r\n")
+HELP_END
diff --git a/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CcenterrightR_EN-US.dpx b/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CcenterrightR_EN-US.dpx
new file mode 100644
index 000000000..ef178d57e
--- /dev/null
+++ b/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CcenterrightR_EN-US.dpx
@@ -0,0 +1,4 @@
+HELP_TOPIC("AppDoc", "", "Calc$CcenterrightR", "EN-US", "\1centerright\1 (\1obd�ln�k\1) [S �] \1bod\1")
+	HELP_TEXT(
+	"[ [A@0+84 St�ed prav� strany obd�ln�ku.]]\r\n")
+HELP_END
diff --git a/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CheightR_CS-CZ15.dpx b/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CheightR_CS-CZ15.dpx
new file mode 100644
index 000000000..f5c3121c3
--- /dev/null
+++ b/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CheightR_CS-CZ15.dpx
@@ -0,0 +1,4 @@
+HELP_TOPIC("AppDoc", "", "Calc$CheightR", "CS-CZ windows-1250", "\1height\1 (\1obd�ln�k\1) [S �] \1re�ln� ��slo\1")
+	HELP_TEXT(
+	"[ [A@0+84 V��ka obd�ln�ku (ymax `- ymin).]]\r\n")
+HELP_END
diff --git a/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CheightR_EN-US.dpx b/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CheightR_EN-US.dpx
new file mode 100644
index 000000000..ba26c8888
--- /dev/null
+++ b/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CheightR_EN-US.dpx
@@ -0,0 +1,4 @@
+HELP_TOPIC("AppDoc", "", "Calc$CheightR", "EN-US", "\1height\1 (\1obd�ln�k\1) [S �] \1real number\1")
+	HELP_TEXT(
+	"[ [A@0+84 V��ka obd�ln�ku (ymax `- ymin).]]\r\n")
+HELP_END
diff --git a/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CleftR_CS-CZ15.dpx b/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CleftR_CS-CZ15.dpx
new file mode 100644
index 000000000..4d2d291c8
--- /dev/null
+++ b/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CleftR_CS-CZ15.dpx
@@ -0,0 +1,4 @@
+HELP_TOPIC("AppDoc", "", "Calc$CleftR", "CS-CZ windows-1250", "\1left\1 (\1obd�ln�k\1) [S �] \1re�ln� ��slo\1")
+	HELP_TEXT(
+	"[ [A@0+84 Doln� mez x sou�adnice obd�ln�ku.]]\r\n")
+HELP_END
diff --git a/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CleftR_EN-US.dpx b/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CleftR_EN-US.dpx
new file mode 100644
index 000000000..1900f1ceb
--- /dev/null
+++ b/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CleftR_EN-US.dpx
@@ -0,0 +1,4 @@
+HELP_TOPIC("AppDoc", "", "Calc$CleftR", "EN-US", "\1left\1 (\1obd�ln�k\1) [S �] \1real number\1")
+	HELP_TEXT(
+	"[ [A@0+84 Doln� mez x sou�adnice obd�ln�ku.]]\r\n")
+HELP_END
diff --git a/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CpointNN_CS-CZ15.dpx b/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CpointNN_CS-CZ15.dpx
new file mode 100644
index 000000000..3b6dcc0b6
--- /dev/null
+++ b/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CpointNN_CS-CZ15.dpx
@@ -0,0 +1,4 @@
+HELP_TOPIC("AppDoc", "", "Calc$CpointNN", "CS-CZ windows-1250", "\1point\1 (\1re�ln� ��slo\1 [/ x], \1re�ln� ��slo\1 [/ y]) [S �] \1bod\1")
+	HELP_TEXT(
+	"[ [A@0+84 Funkce vr�t� bod o zadan�ch sou�adnic�ch.]]\r\n")
+HELP_END
diff --git a/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CpointNN_EN-US.dpx b/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CpointNN_EN-US.dpx
new file mode 100644
index 000000000..7858389d9
--- /dev/null
+++ b/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CpointNN_EN-US.dpx
@@ -0,0 +1,4 @@
+HELP_TOPIC("AppDoc", "", "Calc$CpointNN", "EN-US", "\1point\1 (\1real number\1 [/ x], \1real number\1 [/ y]) [S �] \1bod\1")
+	HELP_TEXT(
+	"[ [A@0+84 Funkce vr�t� bod o zadan�ch sou�adnic�ch.]]\r\n")
+HELP_END
diff --git a/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CrectNNNN_CS-CZ15.dpx b/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CrectNNNN_CS-CZ15.dpx
new file mode 100644
index 000000000..904c688c5
--- /dev/null
+++ b/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CrectNNNN_CS-CZ15.dpx
@@ -0,0 +1,4 @@
+HELP_TOPIC("AppDoc", "", "Calc$CrectNNNN", "CS-CZ windows-1250", "\1rect\1 (\1re�ln� ��slo\1 [/ xmin], \1re�ln� ��slo\1 [/ ymin], \1re�ln� ��slo\1 [/ xmax], \1re�ln� ��slo\1 [/ ymax]) [S �] \1obd�ln�k\1")
+	HELP_TEXT(
+	"[ [A@0+84 Vr�t� obd�ln�k se zadan�mi sou�adnicemi.]]\r\n")
+HELP_END
diff --git a/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CrectNNNN_EN-US.dpx b/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CrectNNNN_EN-US.dpx
new file mode 100644
index 000000000..989ed71eb
--- /dev/null
+++ b/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CrectNNNN_EN-US.dpx
@@ -0,0 +1,4 @@
+HELP_TOPIC("AppDoc", "", "Calc$CrectNNNN", "EN-US", "\1rect\1 (\1real number\1 [/ xmin], \1real number\1 [/ ymin], \1real number\1 [/ xmax], \1real number\1 [/ ymax]) [S �] \1obd�ln�k\1")
+	HELP_TEXT(
+	"[ [A@0+84 Vr�t� obd�ln�k se zadan�mi sou�adnicemi.]]\r\n")
+HELP_END
diff --git a/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CrectPP_CS-CZ15.dpx b/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CrectPP_CS-CZ15.dpx
new file mode 100644
index 000000000..2bd7519a8
--- /dev/null
+++ b/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CrectPP_CS-CZ15.dpx
@@ -0,0 +1,4 @@
+HELP_TOPIC("AppDoc", "", "Calc$CrectPP", "CS-CZ windows-1250", "\1rect\1 (\1bod\1 [/ P], \1bod\1 [/ Q]) [S �] \1obd�ln�k\1")
+	HELP_TEXT(
+	"[ [A@0+84 Vr�t� omezuj�c� obd�ln�k dvojice bod�.]]\r\n")
+HELP_END
diff --git a/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CrectPP_EN-US.dpx b/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CrectPP_EN-US.dpx
new file mode 100644
index 000000000..e47c566e4
--- /dev/null
+++ b/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CrectPP_EN-US.dpx
@@ -0,0 +1,4 @@
+HELP_TOPIC("AppDoc", "", "Calc$CrectPP", "EN-US", "\1rect\1 (\1bod\1 [/ P], \1bod\1 [/ Q]) [S �] \1obd�ln�k\1")
+	HELP_TEXT(
+	"[ [A@0+84 Vr�t� omezuj�c� obd�ln�k dvojice bod�.]]\r\n")
+HELP_END
diff --git a/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CrectP_CS-CZ15.dpx b/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CrectP_CS-CZ15.dpx
new file mode 100644
index 000000000..40aa461dc
--- /dev/null
+++ b/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CrectP_CS-CZ15.dpx
@@ -0,0 +1,4 @@
+HELP_TOPIC("AppDoc", "", "Calc$CrectP", "CS-CZ windows-1250", "\1rect\1 (\1bod\1 [/ P]) [S �] \1obd�ln�k\1")
+	HELP_TEXT(
+	"[ [A@0+84 Vr�t� obd�ln�k obsahuj�c� zadan� bod.]]\r\n")
+HELP_END
diff --git a/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CrectP_EN-US.dpx b/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CrectP_EN-US.dpx
new file mode 100644
index 000000000..00d006a33
--- /dev/null
+++ b/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CrectP_EN-US.dpx
@@ -0,0 +1,4 @@
+HELP_TOPIC("AppDoc", "", "Calc$CrectP", "EN-US", "\1rect\1 (\1bod\1 [/ P]) [S �] \1obd�ln�k\1")
+	HELP_TEXT(
+	"[ [A@0+84 Vr�t� obd�ln�k obsahuj�c� zadan� bod.]]\r\n")
+HELP_END
diff --git a/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CrightR_CS-CZ15.dpx b/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CrightR_CS-CZ15.dpx
new file mode 100644
index 000000000..f63964485
--- /dev/null
+++ b/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CrightR_CS-CZ15.dpx
@@ -0,0 +1,4 @@
+HELP_TOPIC("AppDoc", "", "Calc$CrightR", "CS-CZ windows-1250", "\1right\1 (\1obd�ln�k\1) [S �] \1re�ln� ��slo\1")
+	HELP_TEXT(
+	"[ [A@0+84 Horn� mez x sou�adnice obd�ln�ku.]]\r\n")
+HELP_END
diff --git a/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CrightR_EN-US.dpx b/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CrightR_EN-US.dpx
new file mode 100644
index 000000000..e00263bbe
--- /dev/null
+++ b/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CrightR_EN-US.dpx
@@ -0,0 +1,4 @@
+HELP_TOPIC("AppDoc", "", "Calc$CrightR", "EN-US", "\1right\1 (\1obd�ln�k\1) [S �] \1real number\1")
+	HELP_TEXT(
+	"[ [A@0+84 Horn� mez x sou�adnice obd�ln�ku.]]\r\n")
+HELP_END
diff --git a/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CtextP_CS-CZ15.dpx b/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CtextP_CS-CZ15.dpx
new file mode 100644
index 000000000..a2ef1db80
--- /dev/null
+++ b/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CtextP_CS-CZ15.dpx
@@ -0,0 +1,4 @@
+HELP_TOPIC("AppDoc", "", "Calc$CtextP", "CS-CZ windows-1250", "\1text\1 (\1bod\1) [S �] \1�et�zec\1")
+	HELP_TEXT(
+	"[ [A@0+84 Vr�t� textov� �et�zec se sou�adnicemi bodu.]]\r\n")
+HELP_END
diff --git a/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CtextP_EN-US.dpx b/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CtextP_EN-US.dpx
new file mode 100644
index 000000000..7ec2cce1f
--- /dev/null
+++ b/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CtextP_EN-US.dpx
@@ -0,0 +1,4 @@
+HELP_TOPIC("AppDoc", "", "Calc$CtextP", "EN-US", "\1text\1 (\1bod\1) [S �] \1string\1")
+	HELP_TEXT(
+	"[ [A@0+84 Vr�t� textov� �et�zec se sou�adnicemi bodu.]]\r\n")
+HELP_END
diff --git a/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CtextR_CS-CZ15.dpx b/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CtextR_CS-CZ15.dpx
new file mode 100644
index 000000000..c01693504
--- /dev/null
+++ b/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CtextR_CS-CZ15.dpx
@@ -0,0 +1,4 @@
+HELP_TOPIC("AppDoc", "", "Calc$CtextR", "CS-CZ windows-1250", "\1text\1 (\1obd�ln�k\1) [S �] \1�et�zec\1")
+	HELP_TEXT(
+	"[ [A@0+84 Vr�t� textov� �et�zec s mezemi obd�ln�ku.]]\r\n")
+HELP_END
diff --git a/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CtextR_EN-US.dpx b/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CtextR_EN-US.dpx
new file mode 100644
index 000000000..6633891e2
--- /dev/null
+++ b/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CtextR_EN-US.dpx
@@ -0,0 +1,4 @@
+HELP_TOPIC("AppDoc", "", "Calc$CtextR", "EN-US", "\1text\1 (\1obd�ln�k\1) [S �] \1string\1")
+	HELP_TEXT(
+	"[ [A@0+84 Vr�t� textov� �et�zec s mezemi obd�ln�ku.]]\r\n")
+HELP_END
diff --git a/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CtopR_CS-CZ15.dpx b/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CtopR_CS-CZ15.dpx
new file mode 100644
index 000000000..0aa08bb27
--- /dev/null
+++ b/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CtopR_CS-CZ15.dpx
@@ -0,0 +1,4 @@
+HELP_TOPIC("AppDoc", "", "Calc$CtopR", "CS-CZ windows-1250", "\1top\1 (\1obd�ln�k\1) [S �] \1re�ln� ��slo\1")
+	HELP_TEXT(
+	"[ [A@0+84 Doln� mez y sou�adnice obd�ln�ku.]]\r\n")
+HELP_END
diff --git a/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CtopR_EN-US.dpx b/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CtopR_EN-US.dpx
new file mode 100644
index 000000000..1d2db7d0e
--- /dev/null
+++ b/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CtopR_EN-US.dpx
@@ -0,0 +1,4 @@
+HELP_TOPIC("AppDoc", "", "Calc$CtopR", "EN-US", "\1top\1 (\1obd�ln�k\1) [S �] \1real number\1")
+	HELP_TEXT(
+	"[ [A@0+84 Doln� mez y sou�adnice obd�ln�ku.]]\r\n")
+HELP_END
diff --git a/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CtopcenterR_CS-CZ15.dpx b/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CtopcenterR_CS-CZ15.dpx
new file mode 100644
index 000000000..cf93865e9
--- /dev/null
+++ b/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CtopcenterR_CS-CZ15.dpx
@@ -0,0 +1,4 @@
+HELP_TOPIC("AppDoc", "", "Calc$CtopcenterR", "CS-CZ windows-1250", "\1topcenter\1 (\1obd�ln�k\1) [S �] \1bod\1")
+	HELP_TEXT(
+	"[ [A@0+84 St�ed horn� strany obd�ln�ku.]]\r\n")
+HELP_END
diff --git a/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CtopcenterR_EN-US.dpx b/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CtopcenterR_EN-US.dpx
new file mode 100644
index 000000000..3385958ba
--- /dev/null
+++ b/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CtopcenterR_EN-US.dpx
@@ -0,0 +1,4 @@
+HELP_TOPIC("AppDoc", "", "Calc$CtopcenterR", "EN-US", "\1topcenter\1 (\1obd�ln�k\1) [S �] \1bod\1")
+	HELP_TEXT(
+	"[ [A@0+84 St�ed horn� strany obd�ln�ku.]]\r\n")
+HELP_END
diff --git a/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CtopleftR_CS-CZ15.dpx b/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CtopleftR_CS-CZ15.dpx
new file mode 100644
index 000000000..f74e1c613
--- /dev/null
+++ b/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CtopleftR_CS-CZ15.dpx
@@ -0,0 +1,4 @@
+HELP_TOPIC("AppDoc", "", "Calc$CtopleftR", "CS-CZ windows-1250", "\1topleft\1 (\1obd�ln�k\1) [S �] \1bod\1")
+	HELP_TEXT(
+	"[ [A@0+84 Lev� horn� roh obd�ln�ku.]]\r\n")
+HELP_END
diff --git a/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CtopleftR_EN-US.dpx b/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CtopleftR_EN-US.dpx
new file mode 100644
index 000000000..32d15e98f
--- /dev/null
+++ b/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CtopleftR_EN-US.dpx
@@ -0,0 +1,4 @@
+HELP_TOPIC("AppDoc", "", "Calc$CtopleftR", "EN-US", "\1topleft\1 (\1obd�ln�k\1) [S �] \1bod\1")
+	HELP_TEXT(
+	"[ [A@0+84 Lev� horn� roh obd�ln�ku.]]\r\n")
+HELP_END
diff --git a/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CtoprightR_CS-CZ15.dpx b/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CtoprightR_CS-CZ15.dpx
new file mode 100644
index 000000000..15668188f
--- /dev/null
+++ b/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CtoprightR_CS-CZ15.dpx
@@ -0,0 +1,4 @@
+HELP_TOPIC("AppDoc", "", "Calc$CtoprightR", "CS-CZ windows-1250", "\1topright\1 (\1obd�ln�k\1) [S �] \1bod\1")
+	HELP_TEXT(
+	"[ [A@0+84 Prav� horn� roh obd�ln�ku.]]\r\n")
+HELP_END
diff --git a/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CtoprightR_EN-US.dpx b/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CtoprightR_EN-US.dpx
new file mode 100644
index 000000000..8865746b6
--- /dev/null
+++ b/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CtoprightR_EN-US.dpx
@@ -0,0 +1,4 @@
+HELP_TOPIC("AppDoc", "", "Calc$CtoprightR", "EN-US", "\1topright\1 (\1obd�ln�k\1) [S �] \1bod\1")
+	HELP_TEXT(
+	"[ [A@0+84 Prav� horn� roh obd�ln�ku.]]\r\n")
+HELP_END
diff --git a/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CwidthR_CS-CZ15.dpx b/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CwidthR_CS-CZ15.dpx
new file mode 100644
index 000000000..370940724
--- /dev/null
+++ b/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CwidthR_CS-CZ15.dpx
@@ -0,0 +1,4 @@
+HELP_TOPIC("AppDoc", "", "Calc$CwidthR", "CS-CZ windows-1250", "\1width\1 (\1obd�ln�k\1) [S �] \1re�ln� ��slo\1")
+	HELP_TEXT(
+	"[ [A@0+84 ���ka obd�ln�ku (xmax `- xmin).]]\r\n")
+HELP_END
diff --git a/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CwidthR_EN-US.dpx b/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CwidthR_EN-US.dpx
new file mode 100644
index 000000000..fcad6e841
--- /dev/null
+++ b/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CwidthR_EN-US.dpx
@@ -0,0 +1,4 @@
+HELP_TOPIC("AppDoc", "", "Calc$CwidthR", "EN-US", "\1width\1 (\1obd�ln�k\1) [S �] \1real number\1")
+	HELP_TEXT(
+	"[ [A@0+84 ���ka obd�ln�ku (xmax `- xmin).]]\r\n")
+HELP_END
diff --git a/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CxP_CS-CZ15.dpx b/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CxP_CS-CZ15.dpx
new file mode 100644
index 000000000..536fe5a62
--- /dev/null
+++ b/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CxP_CS-CZ15.dpx
@@ -0,0 +1,4 @@
+HELP_TOPIC("AppDoc", "", "Calc$CxP", "CS-CZ windows-1250", "\1x\1 (\1bod\1 [/ p]) [S �] \1re�ln� ��slo\1")
+	HELP_TEXT(
+	"[ [A@0+84 x`-sou�adnice bodu ][/A@0+84 p][A@0+84 .]]\r\n")
+HELP_END
diff --git a/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CxP_EN-US.dpx b/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CxP_EN-US.dpx
new file mode 100644
index 000000000..3ccbc73ca
--- /dev/null
+++ b/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CxP_EN-US.dpx
@@ -0,0 +1,4 @@
+HELP_TOPIC("AppDoc", "", "Calc$CxP", "EN-US", "\1x\1 (\1bod\1 [/ p]) [S �] \1real number\1")
+	HELP_TEXT(
+	"[ [A@0+84 x`-sou�adnice bodu ][/A@0+84 p][A@0+84 .]]\r\n")
+HELP_END
diff --git a/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CxcenterR_CS-CZ15.dpx b/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CxcenterR_CS-CZ15.dpx
new file mode 100644
index 000000000..43bb50206
--- /dev/null
+++ b/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CxcenterR_CS-CZ15.dpx
@@ -0,0 +1,4 @@
+HELP_TOPIC("AppDoc", "", "Calc$CxcenterR", "CS-CZ windows-1250", "\1xcenter\1 (\1obd�ln�k\1) [S �] \1re�ln� ��slo\1")
+	HELP_TEXT(
+	"[ [A@0+84 X`-sou�adnice st�edu obd�ln�ku.]]\r\n")
+HELP_END
diff --git a/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CxcenterR_EN-US.dpx b/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CxcenterR_EN-US.dpx
new file mode 100644
index 000000000..ef0aaf73a
--- /dev/null
+++ b/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CxcenterR_EN-US.dpx
@@ -0,0 +1,4 @@
+HELP_TOPIC("AppDoc", "", "Calc$CxcenterR", "EN-US", "\1xcenter\1 (\1obd�ln�k\1) [S �] \1real number\1")
+	HELP_TEXT(
+	"[ [A@0+84 X`-sou�adnice st�edu obd�ln�ku.]]\r\n")
+HELP_END
diff --git a/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CxmaxR_CS-CZ15.dpx b/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CxmaxR_CS-CZ15.dpx
new file mode 100644
index 000000000..7a67c5881
--- /dev/null
+++ b/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CxmaxR_CS-CZ15.dpx
@@ -0,0 +1,4 @@
+HELP_TOPIC("AppDoc", "", "Calc$CxmaxR", "CS-CZ windows-1250", "\1xmax\1 (\1obd�ln�k\1) [S �] \1re�ln� ��slo\1")
+	HELP_TEXT(
+	"[ [A@0+84 Horn� mez x sou�adnice obd�ln�ku.]]\r\n")
+HELP_END
diff --git a/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CxmaxR_EN-US.dpx b/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CxmaxR_EN-US.dpx
new file mode 100644
index 000000000..b67e49bf1
--- /dev/null
+++ b/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CxmaxR_EN-US.dpx
@@ -0,0 +1,4 @@
+HELP_TOPIC("AppDoc", "", "Calc$CxmaxR", "EN-US", "\1xmax\1 (\1obd�ln�k\1) [S �] \1real number\1")
+	HELP_TEXT(
+	"[ [A@0+84 Horn� mez x sou�adnice obd�ln�ku.]]\r\n")
+HELP_END
diff --git a/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CxminR_CS-CZ15.dpx b/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CxminR_CS-CZ15.dpx
new file mode 100644
index 000000000..0632ebb70
--- /dev/null
+++ b/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CxminR_CS-CZ15.dpx
@@ -0,0 +1,4 @@
+HELP_TOPIC("AppDoc", "", "Calc$CxminR", "CS-CZ windows-1250", "\1xmin\1 (\1obd�ln�k\1) [S �] \1re�ln� ��slo\1")
+	HELP_TEXT(
+	"[ [A@0+84 Doln� mez x sou�adnice obd�ln�ku.]]\r\n")
+HELP_END
diff --git a/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CxminR_EN-US.dpx b/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CxminR_EN-US.dpx
new file mode 100644
index 000000000..603854aca
--- /dev/null
+++ b/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CxminR_EN-US.dpx
@@ -0,0 +1,4 @@
+HELP_TOPIC("AppDoc", "", "Calc$CxminR", "EN-US", "\1xmin\1 (\1obd�ln�k\1) [S �] \1real number\1")
+	HELP_TEXT(
+	"[ [A@0+84 Doln� mez x sou�adnice obd�ln�ku.]]\r\n")
+HELP_END
diff --git a/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CyP_CS-CZ15.dpx b/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CyP_CS-CZ15.dpx
new file mode 100644
index 000000000..a25299cd2
--- /dev/null
+++ b/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CyP_CS-CZ15.dpx
@@ -0,0 +1,4 @@
+HELP_TOPIC("AppDoc", "", "Calc$CyP", "CS-CZ windows-1250", "\1y\1 (\1bod\1 [/ p]) [S �] \1re�ln� ��slo\1")
+	HELP_TEXT(
+	"[ [A@0+84 y`-sou�adnice bodu ][/A@0+84 p][A@0+84 .]]\r\n")
+HELP_END
diff --git a/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CyP_EN-US.dpx b/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CyP_EN-US.dpx
new file mode 100644
index 000000000..c9c7eecb3
--- /dev/null
+++ b/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CyP_EN-US.dpx
@@ -0,0 +1,4 @@
+HELP_TOPIC("AppDoc", "", "Calc$CyP", "EN-US", "\1y\1 (\1bod\1 [/ p]) [S �] \1real number\1")
+	HELP_TEXT(
+	"[ [A@0+84 y`-sou�adnice bodu ][/A@0+84 p][A@0+84 .]]\r\n")
+HELP_END
diff --git a/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CycenterR_CS-CZ15.dpx b/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CycenterR_CS-CZ15.dpx
new file mode 100644
index 000000000..bdcdea224
--- /dev/null
+++ b/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CycenterR_CS-CZ15.dpx
@@ -0,0 +1,4 @@
+HELP_TOPIC("AppDoc", "", "Calc$CycenterR", "CS-CZ windows-1250", "\1ycenter\1 (\1obd�ln�k\1) [S �] \1re�ln� ��slo\1")
+	HELP_TEXT(
+	"[ [A@0+84 Y`-sou�adnice st�edu obd�ln�ku.]]\r\n")
+HELP_END
diff --git a/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CycenterR_EN-US.dpx b/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CycenterR_EN-US.dpx
new file mode 100644
index 000000000..d81b6cc9e
--- /dev/null
+++ b/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CycenterR_EN-US.dpx
@@ -0,0 +1,4 @@
+HELP_TOPIC("AppDoc", "", "Calc$CycenterR", "EN-US", "\1ycenter\1 (\1obd�ln�k\1) [S �] \1real number\1")
+	HELP_TEXT(
+	"[ [A@0+84 Y`-sou�adnice st�edu obd�ln�ku.]]\r\n")
+HELP_END
diff --git a/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CymaxR_CS-CZ15.dpx b/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CymaxR_CS-CZ15.dpx
new file mode 100644
index 000000000..7178d4ed6
--- /dev/null
+++ b/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CymaxR_CS-CZ15.dpx
@@ -0,0 +1,4 @@
+HELP_TOPIC("AppDoc", "", "Calc$CymaxR", "CS-CZ windows-1250", "\1ymax\1 (\1obd�ln�k\1) [S �] \1re�ln� ��slo\1")
+	HELP_TEXT(
+	"[ [A@0+84 Horn� mez y sou�adnice obd�ln�ku.]]\r\n")
+HELP_END
diff --git a/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CymaxR_EN-US.dpx b/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CymaxR_EN-US.dpx
new file mode 100644
index 000000000..bc5a20b93
--- /dev/null
+++ b/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CymaxR_EN-US.dpx
@@ -0,0 +1,4 @@
+HELP_TOPIC("AppDoc", "", "Calc$CymaxR", "EN-US", "\1ymax\1 (\1obd�ln�k\1) [S �] \1real number\1")
+	HELP_TEXT(
+	"[ [A@0+84 Horn� mez y sou�adnice obd�ln�ku.]]\r\n")
+HELP_END
diff --git a/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CyminR_CS-CZ15.dpx b/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CyminR_CS-CZ15.dpx
new file mode 100644
index 000000000..cc97b29e6
--- /dev/null
+++ b/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CyminR_CS-CZ15.dpx
@@ -0,0 +1,4 @@
+HELP_TOPIC("AppDoc", "", "Calc$CyminR", "CS-CZ windows-1250", "\1ymin\1 (\1obd�ln�k\1) [S �] \1re�ln� ��slo\1")
+	HELP_TEXT(
+	"[ [A@0+84 Doln� mez y sou�adnice obd�ln�ku.]]\r\n")
+HELP_END
diff --git a/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CyminR_EN-US.dpx b/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CyminR_EN-US.dpx
new file mode 100644
index 000000000..57d6b1587
--- /dev/null
+++ b/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_Calc$CyminR_EN-US.dpx
@@ -0,0 +1,4 @@
+HELP_TOPIC("AppDoc", "", "Calc$CyminR", "EN-US", "\1ymin\1 (\1obd�ln�k\1) [S �] \1real number\1")
+	HELP_TEXT(
+	"[ [A@0+84 Doln� mez y sou�adnice obd�ln�ku.]]\r\n")
+HELP_END
diff --git a/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_DlgCalc_CS-CZ15.dpx b/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_DlgCalc_CS-CZ15.dpx
new file mode 100644
index 000000000..fb07fa156
--- /dev/null
+++ b/uppsrc/TCtrlLib/Calc/doc.dpp/AppDoc_DlgCalc_CS-CZ15.dpx
@@ -0,0 +1,118 @@
+HELP_TOPIC("AppDoc", "", "DlgCalc", "CS-CZ windows-1250", "")
+HELP_TEXT(
+	"[3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0} \r\n"
+	"[s0;%EN-US2 [%EN-US V�razov� kalkul�tor lze pou��t k_jednoduch�m v�po�t�m. \r\n"
+	"Hlavn� jeho rozd�l proti b�n�mu kalkul�toru ve Windows je ten, \r\n"
+	"�e v�po�et se neprov�d� postupn� jako u_b�n� kalkula�ky (nap�i \r\n"
+	"��slo, stisknu kl�vesu ][%EN-US* `[+`]][%EN-US , nap�i druh� ��slo, \r\n"
+	"stisknu kl�vesu ][%EN-US* `[=`]][%EN-US  a_rovnou se objev� v�sledek). \r\n"
+	"M�sto toho je t�eba do edita�n�ho pole kalkul�toru vlo�it cel� \r\n"
+	"matematick� v�raz, obsahuj�c� operace, funkce, konstanty a_z�vork. \r\n"
+	"V�raz se vypo�te a� po potvrzen� kl�vesou ][%EN-US* Enter][%EN-US .]&]\r\n"
+	"[s0;%EN-US2 &]\r\n"
+	"[s0;= \r\n"
+	"@@PNG:2925&725\r\n"
+	"����Ǎ���������Ƞ�Ҁ��Ԁ���􈂀������က�����������팤����\377����������������ɝ�\r\n"
+	"�����²�����������ű̄�������Ⱦ���������ھٸ—������������ۂ򐠄�쳊������򯻻�\r\n"
+	"���Ͼ�����������������������ճ��\377��������䠷���ȃฆ�����չ��͑��؇������롔��\r\n"
+	"�ۦ�����ᤛ���Ѥ�۠��ٳŬ�������������������������������Ԁ���͕����֒�⫱�������\r\n"
+	"��ص���漀����ü��������н���������竓�����������›�����ĝ������ፗ���臿ĥ�\r\n"
+	"����æ�����������������Ղ���־���������͒����Ȑ����۞��м�ꛭ�̹��Ӗ�ʹכ��ۛ\r\n"
+	"뭊�ּ�������\377�ݎ������Ѝ���ƀܒ�ձ��⪦ɬ�ف���̵Т���䀨⑱��ۈ�̥���Ϻ\r\n"
+	"��§�ʾ⛮������›�⦝�й���أ�������٥���콌������ୡ�������ğ���׵����������\r\n"
+	"Ų�����Օ�����ʀ���ž�����ٳ���𛣤�����ʙ��¡���������Ϟ������ᙀ�֙�ǀ��\r\n"
+	"���������ᕚЌ�񥁟���������\377�����ݓԮ�Հ�\377�����������Û�ǭǨ���ֹ���������\r\n"
+	"�޳����������ߣɫ֓�\377�������젘��އ������售��Ŵε����ꊣ�Ȏ�牉���þ�诗ӂ\r\n"
+	"����Ҡ������چ��������˗��������������Ǯ������󐀸ꀀ����ƕ�������𷼃�Բ���\r\n"
+	"�����Гؼ���梾��Ёя���Ѷ������ъàڥ��ķ���ܑ������̪�������������������\r\n"
+	"���˗�ꢳ�����΁Č���죎���ط뗯�ܼ�Թ�座���߅�ŸЀ���Կ������Ԫ���Ϳ�İ�ĉ�\r\n"
+	"�ۆ�ꩯ�ʌ�ͽݫ������䜃���Ȯ���������ޚڐ����������̿���������Ԯ�����ԃ��\r\n"
+	"���ȅ׵��������������ē�����Ɣ�������������ċ����ך����Ș�٬��͎�����㶱\r\n"
+	"����Ǒ��̶�研�Қ���Ď��ڨ��ė����肫��Ҩ������̺��������������ׂ������ˈ���ă\r\n"
+	"Ӝ������׍��߹��������߱�������ሣ��웈����\377��������ο������䪂������Ԯ�����Պ\r\n"
+	"Ь��͡����������ހ杘畈����銁������������Ǝ��ު����凵������Ʃ���������\r\n"
+	"��נ������ގ�\377Ǟ�������ޑۈ��\377�𝀻�������������²А�Ө̃逹����������ؼ���\r\n"
+	"�ǻ���ꗟ\377�Ǔķ����ȳ�򰮬����Ԋ��”�䶩�җ�����������ސ�\377�����٠��������\r\n"
+	"�؃�ܒ෼����櫞����䟿����ⱀ񛕏����ф���ڌ��������뷥��͜�ͅ���Ƥۂ��������\r\n"
+	"��������ȼ��ט�����������܌���ı�ޯ׻��Ӣ�ō��������ƣ���丩���������ڦ����\r\n"
+	"Ӻ����������Μ������������푩�������������������\377���σ���\377�Ե�����̮������\r\n"
+	"��ܣ��Ђր�����������������������얖������������‡���������������ͭ����\r\n"
+	"��ؘ줶���ң���������ԛ�����������젎��؃�������鵥��\377�����ޡ�����‰����\r\n"
+	"�ٳٽքÇ�޷�۾������ǹ���ӭ����������͝���߻�����槯��ڞ\377ڣ�Ϻ�鎲�����γ‹�\r\n"
+	"�Ԅ��η������򾸎���֠Ц�ء����Ӫ��\377��������������ԃ�����Ā���Ԍ�����ۑ��\r\n"
+	"���������ԎĀ�ǫ����؀��̋�������߾ܙ�ͮ������������ㄡ��񹢩�������Փ��\r\n"
+	"����֚��ᐳ����������\377�ط�������ȱ��Ǟ�ʽ߭���‚�榀���ف����ȸ��������ο�\r\n"
+	"�׳���ߘ\377�����\377���»׺�ө�򽊗�ɋ��̙��������䅐�ۈ������ȭ������ʃ�ą���\377��\r\n"
+	"�ǟ�������\377��ч����α�������Ã䬄•��߅�������������۾������ꅗᓣ����ħ�����\r\n"
+	"��ͧ������ް�ޅ��͋�ԇ���������ʍ뚅���͜�������䮿�Č��������\377�\377����˥�����\r\n"
+	"�֣����������؆�š怐��ś������������۞�����ՠ���������ײ���ޕ���򉑪�הҝ�\r\n"
+	"�Ӳ��Nj���Ӻ��������ʵ�����ˌ��������������찱��ֿ����ݿ���ׁ��ْ������������\r\n"
+	"���쭎��፷ԁ����ꀌ���Ҹ���히���Ȁ�Ě������ȃ󭕇���ʶՕ���꽼����ԭ�\r\n"
+	"�����������қت��ؽ����Ɲ��ҫ��ސ����������Ĝ�λ��‡�����ٵ�\377񏞦\377�����\r\n"
+	"���ǰ�ܖ������ۗ�β����؀���ˡ���򣮳ۅ��Ք���͚�ɛ��ք���ܶ����痳�əߝ��\r\n"
+	"���������ثͧ��ݿ�޽�����՚�Ê��������ᢲ����������\377�����Ӏ�����ƽ����ߝ�\r\n"
+	"���ه���������Ǣ������İ\377��\377�Ƚ��ҡ���М�ա��֨����\377�����������򦴁�쉘�ؓ�����\r\n"
+	"���Ⲗ��Աߌ�����܁��ߎ�ݲ��『����Ҕް�������ۑ��߹Ʌ��������������ȧ���޷�ܾ\r\n"
+	"�խ���������촻��α��û�;������ן�ܻ���Ա�����������〰����ߤË��������陳�\r\n"
+	"��É�����ۑ�¤��ۚ�����\377�����˜����ҹ����맾ʈ୸������ǭ�㺅�����檏���������\r\n"
+	"��Ξ��ߵ�đ��쁰�����������導���ރ�¥�������ٳ��뀑�����������������կ�\r\n"
+	"�������LjŽ��ᤦ�멲ֆ�Σ����ǐ�����º񚢾壂������ͼ��Ӎ䡔��Ʒ�����䡸�Є\r\n"
+	"�����չ�뙧�󍷪���憁��²�к��Ǭ���ȑ�ؓ©�ȑ����쩣������������ǁ����ݭ���\r\n"
+	"���ճ����������������ń�����Ӹ�Ϋ����Ȟ�ȗ������Ⴀ�����Š�����������ݯ����\r\n"
+	"��������������������͟������݄���杳���چ�������򉂰���С��߀����ɷ�����㯚���\r\n")
+	HELP_TEXT(
+	"������Ϗ���ݧ�Կ��ᾃ�������ڏ��ԋ�����������ǖ��\377���օ�����ܩ�ܿ�Ц뺛��ȇ�\r\n"
+	"��􈍛͂���������������ψ����������Ǿƕ����\377��娭�����ß������ے���������Ղ��\r\n"
+	"Շ����������̇������ޔ�͊������ر�����կ·Ć���ҙ�\377�����Ù��������丹Ϸ�䐸�\r\n"
+	"���ٜ�մ��лڞ����豇������������֐��⒐׏������楫�Ž�׻ڡۣ��������ų���ŭ�\r\n"
+	"����捌����啽�ܮ܃����З��ۮ���������������ň��\377������˘����\377�����˘ّ�����\r\n"
+	"��ھ��җ����Ӵ���������盕��䡦�ʻ�䇨�܍�ّ�������킠�܍ٷ�������˧ۇ������\r\n"
+	"�ۛވ������������Ԍ��������ܡ������Г�����\377���Ɍģ���ݪڱ����攏��������\r\n"
+	"����������������ӆ��\377������Ԝ��ކ�������旹��俒����؈�������������������֒���\r\n"
+	"���������샕�К�������Ì����΢����ϭ���Ӥ�������������֜�����������䬈���\r\n"
+	"���ӹ��۝��\377����ςЃ�ǻ�����������������������������È����������Ŵ������ł��\r\n"
+	"�������λ�盐ً��������ˁ�א�Ⴈ���Ӛ����������꒠�Ε���̮������˭�ݿ�������\r\n"
+	"����ν�灖����Š�¨����Ʉ��٦��었�ɒ��ꢹ����������ت��������Ԫ����ޘ�\r\n"
+	"�Դ����灎����������翏�����ڮ�������������ю��פ�䤫����֊鎈������ٰ�؈�밁\r\n"
+	"Ӂ��”���ź������޳����𲡽��㭈�������Ţ�����좸������섊������Ӑ�ߙ��盕�\r\n"
+	"��ôÉ趱�\377��ޱ�������ݖ��������Ҿ��є���������ǰ���ˣ������ୁ���������\r\n"
+	"��㆞��͚��ܿ���������ю�ŕ�ȭ�혵���������ہ��ٯڡ›����֕������Ɇ��ǽ����Ȗ�\r\n"
+	"���˅����§�в��̱���볌��������ۼǽ������؉����ڸ������͌����������ɑ�ޞ\r\n"
+	"���ƀ���ၭ������ƥ��͎���ܑ�Ŝ��������������ًЅ���ө��������為��������Ό��\r\n"
+	"�������������א��ႈ�����짔毖�ȕ����������ۈ��ω������Ą������ʞ����������\r\n"
+	"������������א�᤻�ޯ����ֹ��ͺ��ۇ��٫���ힷ�����������������Ϻ�������Ҥ����\r\n"
+	"��ƛ��ֈ��ç�������݄������п���ٳ����ə��ؑ�����Ќ��Ӧ�����Ӊ����������������\r\n"
+	"��\377�������������Ȟ���܎��������������”Ѱ���ӉӢ�����Ϭ�������Ǻ��������������\r\n"
+	"��䧬������˯����������\377�����߲ӫ�����˭����������ٳ����太��⻸��������˯�׻�\r\n"
+	"전�����\377����������ݏ�о��͵��������Ԇ����Ȭ�ȸ�֗Ͻ��ݍ�����������������߫Ӗ\r\n"
+	"������ӳ��ݍ����˷����������櫿������ͮ��μNj���ҡ�Ȝ�ݗ��ˌ̜��̘��Ϸ�����\r\n"
+	"��́���ⳁ�ቫ顧�䬴����Ȣ��ڇ����������\377�֕�������������ğλ����\377�����ӭ��\377���\r\n"
+	"ܝ���̤��������ؕ�����ż�߭��݋°��ٺ�������Ռ�����ɉ��շ��������̷����\377�����\r\n"
+	"������ۭ����������ҿ���̽�ώ���\377��֗��������������¯�Ҍ���֗󾏲�����ܺ��̳���\r\n"
+	"�\377�ۧ������������ޤ������������������������̬��쨻���������蕄Ἐ�◨������\r\n"
+	"���ǝу����\377����ػ���̲����ڨ�����̈򆚕����������̟��������圶ߡ���ӝ��ϑ��\r\n"
+	"��������������������„����\377�\377�������ݗΜ��蚁��ͅڶ�̐����ػ���������������ܥƹ�\r\n"
+	"�����Ñ������̌������򁢫�������£�Ơ�����Ӹ���㺦������ٹ���Ձǃ����𱀃\377��\r\n"
+	"ŗ�ݦ������\377������������������Į����\r\n"
+	"&]\r\n"
+	"[s0;%EN-US2 &]\r\n"
+	"[s0;%EN-US2 [%EN-US Po potvrzen� se provede v�po�et v�razu a_v�sledek \r\n"
+	"se zobraz� ve spodn�m ��dku dialogu. Pokud p�i v�po�tu dojde \r\n"
+	"k_chyb�, zobraz� se m�sto v�sledku chybov� hl�en�.]&]\r\n"
+	"[s0;%EN-US2 &]\r\n"
+	"[s0; \r\n"
+	"@@PNG:500&137\r\n"
+	"����Ǎ���������Ȁ�Ҁ��Ѐ�����������򌋀������������͒����������\377������������Ȑ�\r\n"
+	"��������Ӿ������ݝ�������尌����ʈѴ�Җ����؋�����缨������岲��Íƪ�������\r\n"
+	"���ř��������Ӣ���͑ȓ�����򉫗��֦����ț�؛��������������ɉ��������ƽ������\r\n"
+	"�Ү����ΆƼĶ�������㡸�����߬�雕��ي�Ҟ�\377��⽁镍ޝ����ޘ���Ю�������𭿰�\r\n"
+	"͜������ۋ�������ޕ����͓�����������͡��ņ�槜�ݚ�Ç\377������\377���Ǘ�䮂������\r\n"
+	"�����������Į���\r\n"
+	"&]\r\n"
+	"[s0;%EN-US2 [%EN-US Kl�vesa ][%EN-US* Esc][%EN-US  ukon�� pr�ci s_kalkul�torem.]&]\r\n"
+	"[s0;%EN-US*2 &]\r\n"
+	"[s0;b100;%EN-US*2 [%EN-US Viz tak�:]&]\r\n"
+	"[s0;%EN-US!Arial! &]\r\n"
+	"[s0;i150;O0;%EN-US_^Calc^@(0.0.255)2 [%EN-US Funkce v�razov�ho kalkul�toru]")
+HELP_END
diff --git a/uppsrc/TCtrlLib/Calc/doc.dpp/links b/uppsrc/TCtrlLib/Calc/doc.dpp/links
new file mode 100644
index 000000000..e69de29bb
diff --git a/uppsrc/TCtrlLib/CtrlArray.cpp b/uppsrc/TCtrlLib/CtrlArray.cpp
new file mode 100644
index 000000000..c6263301a
--- /dev/null
+++ b/uppsrc/TCtrlLib/CtrlArray.cpp
@@ -0,0 +1,339 @@
+#include "TCtrlLib.h"
+#pragma hdrstop
+
+#include "CtrlArray.h"
+
+NAMESPACE_UPP
+
+CtrlArray::Item::Item()
+{
+	SetFrame(OutsetFrame());
+	array = NULL;
+	NoWantFocus();
+//	IgnoreMouse();
+}
+
+CtrlArray::Item::~Item()
+{
+	array = NULL;
+}
+
+void CtrlArray::Item::Paint(Draw& draw)
+{
+	draw.DrawRect(draw.GetClip(), IsCursor() ? SWhiteGray : SColorFace());
+}
+
+void CtrlArray::Item::LeftDown(Point pt, dword keyflags)
+{
+	SetCursor();
+}
+
+void CtrlArray::Item::RightDown(Point pt, dword keyflags)
+{
+	ASSERT(array);
+	SetCursor();
+	array->RightDown(Null, keyflags);
+}
+
+bool CtrlArray::Key(dword key, int repcnt)
+{
+	return Bar::Scan(THISBACK(ToolLocal), key);
+}
+
+CtrlArray::CtrlArray()
+{
+	inserting = removing = duplicating = moving = false;
+
+	is_closing = false;
+	cursor = -1;
+	height = 0;
+
+	SetFrame(InsetFrame());
+	AddFrame(vscroll);
+	vscroll.AutoHide();
+	vscroll.WhenScroll = THISBACK(OnScroll);
+	vscroll.SetLine(20);
+	Ctrl::Add(scrollview.HSizePos(0, 0));
+
+	WhenBar = THISBACK(ToolLocal);
+}
+
+CtrlArray::~CtrlArray()
+{
+	is_closing = true;
+	items.Clear();
+}
+
+void CtrlArray::Clear()
+{
+	items.Clear();
+	cursor = -1;
+	Layout();
+}
+
+bool CtrlArray::Accept()
+{
+	for(int i = 0; i < items.GetCount(); i++)
+		if(!items[i].Accept()) {
+			SetCursor(i);
+			return false;
+		}
+	return true;
+}
+
+int CtrlArray::GetIndex(const Item *item) const
+{
+	if(item)
+		for(int i = 0; i < items.GetCount(); i++)
+			if(item == &items[i])
+				return i;
+	return -1;
+}
+
+bool CtrlArray::IsCursor(const Item *item) const
+{
+	return item && IsCursor() && GetIndex(item) == GetCursor();
+}
+
+void CtrlArray::SetCursor(const Item *item)
+{
+	int i = GetIndex(item);
+	if(i >= 0)
+		SetCursor(i);
+}
+
+int CtrlArray::GetYPos(int i) const
+{
+	int y = 0;
+	while(--i >= 0)
+		y += items[i].GetRect().Height();
+	return y;
+}
+
+void CtrlArray::OnScroll()
+{
+	scrollview.TopPos(-vscroll, height);
+}
+
+CtrlArray::Item& CtrlArray::Add()
+{
+	One<Item> item;
+	WhenCreate(item);
+	ASSERT(!!item);
+	Item& new_item = items.Add(-item);
+	Layout();
+	return new_item;
+}
+
+void CtrlArray::SetCount(int c)
+{
+	if(cursor >= c)
+		SetCursor(c - 1);
+	while(c > GetCount()) {
+		One<Item> item;
+		WhenCreate(item);
+		if(!item)
+			return;
+		items.Add(-item);
+	}
+	if(c < GetCount())
+		items.Trim(c);
+	Layout();
+}
+
+void CtrlArray::SetCursor(int at)
+{
+	if(at >= 0)
+		at = min(at, GetCount() - 1);
+	RefreshCursor();
+	cursor = minmax(at, -1, GetCount() - 1);
+	if(at >= 0 && at < GetCount()) {
+		Ctrl& item = items[at];
+		if(!item.HasFocusDeep())
+			IterateFocusForward(&item, &item);
+		ScrollInto(at);
+	}
+	RefreshCursor();
+}
+
+void CtrlArray::ScrollInto(int item)
+{
+	if(item >= 0 && item < items.GetCount())
+		vscroll.ScrollInto(GetYPos(item), items[item].GetRect().Height());
+}
+
+void CtrlArray::Layout()
+{
+	height = 0;
+	while(scrollview.GetFirstChild())
+		scrollview.GetFirstChild()->Remove();
+	for(int i = 0; i < items.GetCount(); i++) {
+		items[i].array = this;
+		int iht = items[i].GetRect().Height();
+		scrollview << items[i].TopPos(height, iht).HSizePos(0, 0);
+		height += iht;
+	}
+	vscroll.Set(vscroll, GetSize().cy, height);
+	OnScroll();
+}
+
+void CtrlArray::Paint(Draw& draw)
+{
+	draw.DrawRect(draw.GetClip(), SGray);
+}
+
+void CtrlArray::RightDown(Point pt, dword keyflags)
+{
+	MenuBar::Execute(WhenBar);
+}
+
+void CtrlArray::MouseWheel(Point pt, int zdelta, dword keyflags)
+{
+	vscroll.Wheel(zdelta, 3);
+}
+
+void CtrlArray::GotFocus()
+{
+	RefreshCursor();
+}
+
+void CtrlArray::LostFocus()
+{
+	RefreshCursor();
+}
+
+void CtrlArray::ChildGotFocus()
+{
+	if(is_closing)
+		return;
+	for(int i = 0; i < items.GetCount(); i++)
+		if(items[i].HasFocusDeep()) {
+			if(i != GetCursor())
+				SetCursor(i);
+			ScrollInto(i);
+			break;
+		}
+}
+
+void CtrlArray::RefreshCursor()
+{
+	if(!is_closing && IsCursor())
+		GetCtrl(GetCursor()).Refresh();
+}
+
+void CtrlArray::ToolLocal(Bar& bar)
+{
+	bool hlp = bar.IsScanHelp();
+	bool ed = IsEditable();
+	if(hlp || !IsEmpty())
+		ToolInsertAbove(bar);
+	ToolInsertBelow(bar);
+	ToolUp(bar);
+	ToolDown(bar);
+	bar.MenuSeparator();
+	ToolDuplicate(bar);
+	ToolRemove(bar);
+}
+
+void CtrlArray::ToolInsertAbove(Bar& bar)
+{
+	bar.Add(IsEditable() && inserting && (bar.IsScanHelp() || !IsEmpty()), "Vlo�it nad", THISBACK1(OnInsert, cursor))
+		.Key(K_CTRL_INSERT)
+		.Help("Vlo�it nov� ��dek nad aktu�ln� ��dek");
+}
+
+void CtrlArray::ToolInsertBelow(Bar& bar)
+{
+	bar.Add(IsEditable() && inserting, bar.IsScanHelp() || !IsEmpty() ? "Vlo�it pod" : "Vlo�it", THISBACK1(OnInsert, cursor + 1))
+		.Key(K_INSERT)
+		.Help("Vlo�it nov� ��dek pod aktu�ln� ��dek");
+}
+
+void CtrlArray::ToolDuplicate(Bar& bar)
+{
+	bar.Add(IsEditable() && duplicating && (bar.IsScanHelp() || cursor >= 0), "Duplikovat", THISBACK1(OnDuplicate, cursor))
+		.Help("Zkop�rovat aktu�ln� ��dek tabulky na dal�� ��dek");
+}
+
+void CtrlArray::ToolRemove(Bar& bar)
+{
+	bar.Add(IsEditable() && removing && (bar.IsScanHelp() || cursor >= 0), "Smazat", THISBACK1(OnRemove, cursor))
+		.Key(K_CTRL_DELETE)
+		.Help("Odstranit aktu�ln� ��dek tabulky");
+}
+
+void CtrlArray::ToolUp(Bar& bar)
+{
+	bar.Add(IsEditable() && moving && cursor > 0, "Posunout nahoru", THISBACK1(OnUp, cursor))
+		.Key(K_CTRL_UP)
+		.Help("Posunout aktu�ln� ��dek nahoru");
+}
+
+void CtrlArray::ToolDown(Bar& bar)
+{
+	bar.Add(IsEditable() && moving && cursor + 1 < items.GetCount(), "Posunout dol�", THISBACK1(OnDown, cursor))
+		.Key(K_CTRL_DOWN)
+		.Help("Posunout aktu�ln� ��dek dol�");
+}
+
+void CtrlArray::OnInsert(int at)
+{
+	at = minmax(at, 0, items.GetCount());
+	One<Item> item;
+	WhenCreate(item);
+	if(item) {
+		items.Insert(at, -item);
+		Layout();
+		SetCursor(at);
+		UpdateAction();
+	}
+}
+
+void CtrlArray::OnDuplicate(int i)
+{
+	if(i >= 0 && i < items.GetCount()) {
+		Value v = Get(i);
+		One<Item> item;
+		WhenCreate(item);
+		if(item) {
+			items.Insert(i + 1, -item);
+			items[i + 1] <<= v;
+			Layout();
+			SetCursor(i + 1);
+			UpdateAction();
+		}
+	}
+}
+
+void CtrlArray::OnRemove(int i)
+{
+	if(i >= 0 && i < items.GetCount()) {
+		items.Remove(i);
+		cursor = -1;
+		Layout();
+		SetCursor(min(i, GetCount() - 1));
+		UpdateAction();
+	}
+}
+
+void CtrlArray::OnUp(int index)
+{
+	if(index > 0 && index < items.GetCount()) {
+		items.Swap(index, index - 1);
+		Layout();
+		SetCursor(index - 1);
+		UpdateAction();
+	}
+}
+
+void CtrlArray::OnDown(int index)
+{
+	if(index >= 0 && index + 1 < items.GetCount()) {
+		items.Swap(index, index + 1);
+		Layout();
+		SetCursor(index + 1);
+		UpdateAction();
+	}
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/TCtrlLib/CtrlArray.h b/uppsrc/TCtrlLib/CtrlArray.h
new file mode 100644
index 000000000..b8870abbd
--- /dev/null
+++ b/uppsrc/TCtrlLib/CtrlArray.h
@@ -0,0 +1,122 @@
+#ifndef __TCtrlLib_CtrlArray__
+#define __TCtrlLib_CtrlArray__
+
+NAMESPACE_UPP
+
+class CtrlArray : public Ctrl
+{
+public:
+	class Item : public Ctrl
+	{
+		friend class CtrlArray;
+
+	public:
+		Item();
+		virtual ~Item();
+
+		bool           IsCursor() const { return array->IsCursor(this); }
+		void           SetCursor()      { array->SetCursor(this); }
+		int            GetIndex() const { return array->GetIndex(this); }
+
+		virtual void   Paint(Draw& draw);
+
+		virtual void   LeftDown(Point pt, dword keyflags);
+		virtual void   RightDown(Point pt, dword keyflags);
+
+	protected:
+		CtrlArray     *array;
+	};
+
+	typedef CtrlArray CLASSNAME;
+	CtrlArray();
+	virtual ~CtrlArray();
+
+//	virtual Value     GetData() const;
+//	virtual void      SetData(const Value& v);
+
+	void              Clear();
+	bool              IsEmpty() const           { return items.IsEmpty(); }
+	int               GetCount() const          { return items.GetCount(); }
+	Item&             GetCtrl(int i)            { return items[i]; }
+	const Item&       GetCtrl(int i) const      { return items[i]; }
+	Value             Get(int i) const          { return ~items[i]; }
+	Value             operator [] (int i) const { return ~items[i]; }
+	void              Set(int i, Value v)       { items[i] <<= v; }
+	Item&             Add();
+	void              SetCount(int c);
+
+	CtrlArray&        Inserting(bool i = true)  { inserting = i; return *this; }
+	bool              IsInserting() const       { return inserting; }
+
+	CtrlArray&        Removing(bool r = true)   { removing = r; return *this; }
+	bool              IsRemoving() const        { return removing; }
+
+	CtrlArray&        Duplicating(bool d = true) { duplicating = d; return *this; }
+	bool              IsDuplicating() const     { return duplicating; }
+
+	CtrlArray&        Moving(bool d = true)     { moving = d; return *this; }
+	bool              IsMoving() const          { return moving; }
+
+	int               GetIndex(const Item *item) const;
+	bool              IsCursor(const Item *item) const;
+	void              SetCursor(const Item *item);
+
+	bool              IsCursor() const          { return cursor >= 0; }
+	int               GetCursor() const         { return cursor; }
+	void              SetCursor(int at);
+	void              KillCursor()              { SetCursor(-1); }
+
+	void              ScrollInto(int item);
+
+	virtual bool      Accept();
+
+	virtual void      Layout();
+	virtual void      Paint(Draw& draw);
+	virtual void      RightDown(Point pt, dword keyflags);
+	virtual void      ChildGotFocus();
+	virtual bool      Key(dword key, int repcnt);
+	virtual void      MouseWheel(Point pt, int zdelta, dword keyflags);
+
+	virtual void      GotFocus();
+	virtual void      LostFocus();
+
+	void              ToolLocal(Bar& bar);
+	void              ToolInsertAbove(Bar& bar);
+	void              ToolInsertBelow(Bar& bar);
+	void              ToolDuplicate(Bar& bar);
+	void              ToolRemove(Bar& bar);
+	void              ToolUp(Bar& bar);
+	void              ToolDown(Bar& bar);
+
+	void              OnInsert(int index);
+	void              OnDuplicate(int index);
+	void              OnRemove(int index);
+	void              OnUp(int index);
+	void              OnDown(int index);
+
+public:
+	Callback1< One<Item>& > WhenCreate;
+	Callback1<Bar&>   WhenBar;
+
+private:
+	int               GetYPos(int i) const;
+
+	void              OnScroll();
+	void              RefreshCursor();
+
+private:
+	Array<Item>       items;
+	StaticRect        scrollview;
+	VScrollBar        vscroll;
+	int               cursor;
+	int               height;
+	bool              is_closing;
+	bool              inserting;
+	bool              removing;
+	bool              duplicating;
+	bool              moving;
+};
+
+END_UPP_NAMESPACE
+
+#endif//__TCtrlLib_CtrlArray__
diff --git a/uppsrc/TCtrlLib/DocMgr.cpp b/uppsrc/TCtrlLib/DocMgr.cpp
new file mode 100644
index 000000000..007ccbd39
--- /dev/null
+++ b/uppsrc/TCtrlLib/DocMgr.cpp
@@ -0,0 +1,1443 @@
+#include <TCtrlLib/Help/TCtrlLibHelp.h>
+#pragma hdrstop
+
+NAMESPACE_UPP
+
+#define LLOG(x) // LOG(x)
+
+enum
+{
+	MAX_LRU = 9,
+};
+
+static bool FindTemplate(const char *tmpl, const char *s)
+{
+	char c;
+	while((c = *tmpl++) && c != ';')
+		switch(c) {
+		case '*':
+			do
+				if(FindTemplate(tmpl, s))
+					return true;
+			while(*s++);
+			return false;
+
+		case '?':
+			if(!*s++)
+				return false;
+			break;
+
+		default:
+			if(ToLower(c) != ToLower(*s++))
+				return false;
+			break;
+		}
+	return !*s;
+}
+
+static bool FindMultiTemplate(const char *tmpl, const char *s)
+{
+	while(*tmpl) {
+		if(FindTemplate(tmpl, s))
+			return true;
+		while(*tmpl && *tmpl++ != ';')
+			;
+	}
+	return false;
+}
+
+static String GetDefaultExt(const char *s)
+{
+	while(*s) {
+		while(*s && *s != '.')
+			s++;
+		if(*s) {
+			const char *b = ++s;
+			bool wild = false;
+			for(; *s && *s != ';' && *s != '.'; s++)
+				if(*s == '*' || *s == '?')
+					wild = true;
+			if(!wild && s > b)
+				return String(b, s);
+			if(*s)
+				s++;
+		}
+	}
+	return Null;
+}
+
+//////////////////////////////////////////////////////////////////////
+// DocList::DocInfo::
+
+void DocList::DocInfo::Serialize(Stream& stream)
+{
+	stream % name % type;
+}
+
+//////////////////////////////////////////////////////////////////////
+// DocList::
+
+RegisterHelpTopicObjectTitle(DocList, t_("Open windows"))
+
+DocList::DocList()
+//: Dialog(IDTLIB_WINDOWS)
+: doc_counter(0)
+, lock(false)
+, maximize(false)
+{
+	app_name = GetExeTitle();
+//	app_name = typeid(*AfxGetApp()).name();
+	window_list.AutoHideSb().NoHeader().NoGrid();
+	window_list.AddIndex();
+	window_list.AddColumn(t_("Window name"));
+	window_list.WhenBar = THISBACK(StdBar);
+	window_list.WhenLeftDouble = THISBACK(OnActivate);
+
+	CtrlLayoutOKCancel(*this, DocListHelpTitle());
+	HelpTopic("DlgDocList");
+
+	ok     <<= THISBACK(OnActivate);
+	close  <<= THISBACK(OnRemove);
+	cancel <<= THISBACK(OnClose);
+
+	WhenClose        = THISBACK(OnClose);
+//	WhenHelpContents = THISBACK(OnHelpContents);
+//	WhenHelpSearch   = THISBACK(OnHelpSearch);
+
+//	recent_path      = GetExeDirFile("");
+}
+
+void DocList::Activate()
+{
+	LLOG("DocList::Activate");
+//	AfxGetApp() -> m_pMainWnd = GetCWnd();
+	window_list.SetFocus();
+	TopWindow::Activate();
+}
+
+void DocList::Serialize(Stream& stream)
+{
+	int version = StreamHeading(stream, 3, 1, 3, "DocList");
+	if(version >= 1) {
+		StreamContainer(stream, lru);
+		stream % store_docs;
+		if(!store_docs)
+			old_docs.Clear();
+		StreamContainer(stream, old_docs);
+		if(!store_docs)
+			old_docs.Clear();
+	}
+	if(version >= 2)
+		stream % maximize;
+	if(version >= 3)
+		stream % recent_path;
+}
+
+DocList& DocList::AppName(const char *_app_name)
+{
+	app_name = _app_name;
+	for(int i = 0; i < doc_list.GetCount(); i++)
+		doc_list[i].Change(DocCtrl::APPNAME);
+//	ForEachX(doc_list, XCall(&DocCtrl::Change, DocCtrl::APPNAME));
+	return *this;
+}
+
+void DocList::Insert(DocCtrl *document)
+{
+	ASSERT(GetIndex(document) < 0);
+	int index = doc_list.GetCount();
+	doc_list.Add(document);
+	UpdateTable(index);
+}
+
+void DocList::Remove(DocCtrl *document)
+{
+	int ix = GetIndex(document);
+	if(ix >= 0) {
+		document -> doc_list = NULL;
+		doc_list.Remove(ix);
+		RefreshTable();
+	}
+}
+
+void DocList::Detach(DocCtrl *document)
+{
+	int ix = GetIndex(document);
+	if(ix >= 0) {
+		document -> doc_list = NULL;
+		doc_list.Detach(ix);
+		RefreshTable();
+	}
+}
+
+void DocList::Raise(DocCtrl *document)
+{
+	int ix = GetIndex(document);
+	ASSERT(ix >= 0);
+	if(ix > 0)
+		doc_list.Move(ix, 0);
+	UpdateTable(0);
+}
+
+Vector<DocCtrl *> DocList::FindDoc(const DocType& type) const
+{
+	Vector<DocCtrl *> result;
+	for(DocVector::ConstIterator p = doc_list.Begin(), e = doc_list.End(); p < e; p++)
+		if(p -> GetDocType() == &type)
+			result.Add(const_cast<DocCtrl *>(&*p));
+	return result;
+}
+
+bool DocList::IsDocAvail(const DocType& type) const
+{
+	for(int i = 0; i < doc_list.GetCount(); i++)
+		if(doc_list[i].GetDocType() == &type)
+			return true;
+	return false;
+}
+
+void DocList::SetActive(int index, bool kill_init)
+{
+	doc_list[index].SetActive(kill_init);
+}
+
+DocCtrl *DocList::GetActive()
+{
+	int index = GetActiveIndex();
+	return index >= 0 ? &doc_list[index] : NULL;
+}
+
+const DocCtrl *DocList::GetActive() const
+{
+	int index = GetActiveIndex();
+	return index >= 0 ? &doc_list[index] : NULL;
+}
+
+int DocList::GetActiveIndex() const
+{
+	return doc_list.IsEmpty() ? -1 : 0;
+}
+
+int DocList::FindDoc(const char *filename) const
+{
+	for(DocVector::ConstIterator p = doc_list.Begin(), e = doc_list.End(); p < e; p++)
+		if(!p -> IsUnnamed() && !ComparePath(p -> GetName(), filename))
+			return p - doc_list.Begin();
+	return -1;
+}
+
+DocCtrl *DocList::OpenDoc(const char *filename, int type_index)
+{
+	RemoveLRU(filename);
+	if(OpenExistingDoc(filename))
+		return GetActive();
+	const DocType *type = NULL;
+	if(type_index >= 0 && type_index < DocType::doc_types.GetCount())
+		type = DocType::doc_types[type_index];
+	else
+		type = DocType::GetDocType(filename);
+	if(!type) {
+		Exclamation(NFormat(t_("Document [* \1%s\1] has an unknown type."), filename));
+		return NULL;
+	}
+
+	DocCtrl *document = type -> CreateDocument(*this);
+	if(document) {
+		if(document -> Open(filename)) { // managed to open the file
+			String fn = document -> GetName();
+			if(document -> IsUnnamed())
+				fn = filename;
+			AddLRU(fn, type);
+			document -> SetActive(true);
+			SetRecentPath(GetFileDirectory(filename));
+		}
+		else {
+			Remove(document);
+			Exclamation(NFormat(t_("Error opening document [* \1%s\1]."), filename));
+			document = NULL;
+		}
+	}
+
+	return document;
+}
+
+bool DocList::OpenExistingDoc(const char *filename)
+{
+	int existing = FindDoc(filename);
+	if(existing >= 0) {
+		DocCtrl& doc = doc_list[existing];
+		doc.SetActive();
+		AddLRU(&doc);
+		return true;
+	}
+	return false;
+}
+
+void DocList::RefreshTable()
+{
+	if(IsOpen())
+		UpdateTable();
+}
+
+void DocList::UpdateTable(int new_ix)
+{
+	if(!IsOpen())
+		return;
+
+//	SyncTable sync(window_list);
+//	sync.SetValue(new_ix);
+	Vector<String> names;
+	names.SetCount(doc_list.GetCount());
+	int i;
+	for(i = 0; i < doc_list.GetCount(); i++)
+		names[i] = doc_list[i].GetName();
+	Vector<int> order = GetSortOrder(names, GetLanguageInfo());
+	window_list.Clear();
+	for(i = 0; i < order.GetCount(); i++)
+		window_list.Add(order[i], doc_list[order[i]].GetFullName());
+	ok.Enable(!doc_list.IsEmpty());
+	close.Enable(!doc_list.IsEmpty());
+//	ForSortOrderX(doc_list, XMethod(&DocCtrl::GetName), CsStringComp(),
+//		XApply(static_cast<void (TableArray::*)(Value, Value)>(&TableArray::Add),
+//		window_list, XVal<int>(), XAt(doc_list, XMethod(&DocCtrl::GetFullName))));
+//	XCall(&Ctrl::Enable, !doc_list.IsEmpty()) >> ok >> close;
+
+	Update();
+}
+
+void DocList::Destroy()
+{
+	SetActiveTop();
+//	DestroyWindow();
+}
+
+void DocList::SetActiveTop(DocCtrl *ignore)
+{
+	LLOG("DocList::SetActiveTop, ignore " << ::Name(ignore));
+	if(lock && IsOpen()) {
+		OnWindowList();
+		lock = false;
+		return;
+	}
+
+	for(DocVector::Iterator p = doc_list.Begin(), e = doc_list.End(); p < e; p++)
+		if(&*p != &*ignore) {
+			p -> SetActive();
+			return;
+		}
+
+	LLOG("//DocList::SetActiveTop");
+
+//	if(IsOpen())
+//		DestroyWindow();
+//	AfxGetApp() -> m_pMainWnd = 0;
+//	PostQuitMessage(0);
+}
+
+void DocList::Change(DocCtrl& doc, int change)
+{
+	LLOG("DocList::Change(" << change << ")");
+	if(change != DocCtrl::ACTIVATE)
+		RefreshTable();
+}
+
+bool DocList::Close(int index)
+{
+	ASSERT(index >= 0 && index < doc_list.GetCount());
+	return doc_list[index].CloseDoc();
+}
+
+void DocList::ToolFileNew(Bar& bar)
+{
+	bar.Add(t_("New"), CtrlImg::new_doc(), THISBACK(OnFileNew))
+		.Key(K_CTRL_N)
+		.Help(t_("Create a new document"))
+		.Topic("DocListFileNew");
+}
+
+void DocList::OnFileNew()
+{
+	DocCtrl *doc = DocType::CreateAnyDocument(*this);
+	if(doc)
+		doc -> SetActive();
+}
+
+void DocList::ToolFileNewDefault(Bar& bar)
+{
+	bar.Add(t_("New"), CtrlImg::new_doc(), THISBACK(OnFileNewDefault))
+		.Key(K_CTRL_N)
+		.Help(t_("Create a new document"))
+		.Topic("DocListFileNewDefault");
+}
+
+void DocList::OnFileNewDefault()
+{
+	DocCtrl *doc = DocType::CreateDefaultDocument(*this);
+	if(doc)
+		doc -> SetActive();
+}
+
+void DocList::ToolFileOpen(Bar& bar)
+{
+	bar.Add(t_("Open"), CtrlImg::open(), THISBACK(OnFileOpen))
+		.Key(K_CTRL_O)
+		.Help(t_("Open an existing document"))
+		.Topic("DocListFileOpen");
+}
+
+void DocList::OnFileOpen()
+{
+	FileSelector fsel;
+	DocType::SetOpenFileDlg(fsel);
+	fsel <<= recent_path;
+	fsel.AllFilesType();
+	fsel.Multi();
+	if(fsel.ExecuteOpen(t_("Open file")))
+		for(int i = 0; i < fsel.GetCount(); i++)
+			OpenDoc(fsel[i]);
+}
+
+void DocList::ToolFileSaveAll(Bar& bar)
+{
+	bar.Add(!this || !doc_list.IsEmpty(),
+		t_("Save al&l"), THISBACK(OnFileSaveAll))
+		.Help(t_("Save all open documents to the disk"))
+		.Topic("DocListFileSaveAll");
+}
+
+void DocList::OnFileSaveAll()
+{
+	SaveAll();
+}
+
+bool DocList::ToolFileLru(Bar& bar)
+{
+	if(this && bar.IsMenuBar() && !bar.IsScanKeys() && !lru.IsEmpty()) {
+		if(lru.GetCount() > MAX_LRU)
+			lru.SetCount(MAX_LRU);
+		bar.Separator();
+		for(int i = 0; i < lru.GetCount(); i++)
+			bar.Add('&' + FormatInt(i + 1) + ' ' + GetFileName(lru[i].name), THISBACK1(OnFileLru, i))
+			.Help(NFormat(t_("Open file '%s'"), lru[i].name));
+		return true;
+	}
+	return false;
+}
+
+void DocList::OnFileLru(int i)
+{
+	if(i >= 0 && i < lru.GetCount()) {
+		DocInfo doc = lru[i];
+		int d;
+		for(d = 0; d < DocType::doc_types.GetCount(); d++)
+			if(DocType::doc_types[d]->GetStreamName() == doc.type
+			|| DocType::doc_types[d]->doc_name == doc.type) {
+				OpenDoc(doc.name, d);
+				break;
+			}
+//		OpenDoc(doc.name, FindXIndex(DocType::doc_types,
+//			XDeref(XMethod(&DocType::GetStreamName)), doc.type));
+	}
+}
+
+void DocList::ToolFileQuit(Bar& bar)
+{
+	bar.Add(t_("Quit"), THISBACK(OnFileQuit))
+		.Help(t_("Quit application"))
+		.Topic("DocListFileQuit")
+		.Topic( "DocListFileQuit");
+}
+
+void DocList::OnFileQuit()
+{
+	if(CloseAll()) {
+//		PostQuitMessage(0);
+	}
+}
+
+void DocList::ToolFileIo(Bar& bar, DocCtrl *doc)
+{
+	ToolFileNew(bar);
+	ToolFileOpen(bar);
+	if(doc) {
+		doc -> ToolFileSave(bar);
+		doc -> ToolFileSaveAs(bar);
+	}
+	if(!this || !doc_list.IsEmpty())
+		ToolFileSaveAll(bar);
+	if(doc)
+		doc -> ToolFileClose(bar);
+}
+
+void DocList::ToolFileMisc(Bar& bar)
+{
+	ToolFileLru(bar);
+	bar.MenuSeparator();
+	ToolFileQuit(bar);
+}
+
+void DocList::ToolWindowActivate(Bar& bar)
+{
+	if(this && !bar.IsScanKeys() && !doc_list.IsEmpty()) { // activations don't have any hotkeys so we won't bother expanding in scan mode
+		Vector<DocCtrl *> docs;
+		Vector<String> names;
+		docs.SetCount(doc_list.GetCount());
+		names.SetCount(doc_list.GetCount());
+		int i;
+		for(i = 0; i < doc_list.GetCount(); i++) {
+			docs[i] = &doc_list[i];
+			names[i] = doc_list[i].GetName();
+		}
+		IndexSort(names, docs, GetLanguageInfo());
+//		SortX(docs, XDeref(XMethod(&DocCtrl::GetName)), CsStringComp());
+		int active = FindIndex(docs, &doc_list[0]);
+		if(docs.GetCount() > 9) { // remove extra documents
+			int rem = max(active - 4 - min(docs.GetCount() - active, 4), 0);
+			docs.Remove(0, rem);
+			active -= rem;
+			rem = max(docs.GetCount() - active - min(active, 4), 0) ;
+			docs.SetCount(docs.GetCount() - rem);
+		}
+
+		for(i = 0; i < docs.GetCount(); i++) {
+			DocCtrl *doc = docs[i];
+			bar.Add(FormatInt(i + 1) + ' ' + doc -> GetShortName(), callback(doc, &DocCtrl::OnWindowActivate))
+				.Check(i == active)
+				.Help(NFormat(t_("Activate document '%s'?"), doc -> GetFullName()));
+		}
+		if(!docs.IsEmpty())
+			ToolWindowList(bar);
+	}
+}
+
+void DocList::ToolWindowList(Bar& bar)
+{
+	bar.Add(t_("Windows..."), THISBACK(OnWindowList))
+		.Help(t_("Show open documents"))
+		.Topic("DocListWindowList");
+}
+
+void DocList::OnWindowList()
+{
+	if(!IsOpen()) {
+		Zoomable().Sizeable().Icon(CtrlImg::menu_window());
+		TopWindow::OpenMain();
+		UpdateTable(0);
+	}
+//	ActivateTopmostOwnedPopup(GetHWND());
+}
+
+void DocList::ToolHelpContents(Bar& bar)
+{
+	bar.Add(t_("Contents"), THISBACK(OnHelpContents))
+		.Help(t_("Display alphabetic help contents"))
+		.Topic("DocListHelpContents");
+}
+
+void DocList::OnHelpContents()
+{
+	OpenHelpTopicIndex(Null, false);
+}
+
+void DocList::ToolHelpSearch(Bar& bar)
+{
+	bar.Add(t_("Search"), THISBACK(OnHelpSearch))
+		.Help(t_("Display help index for keyword searching"))
+		.Topic("DocListHelpSearch");
+}
+
+void DocList::OnHelpSearch()
+{
+	OpenHelpTopicIndex(Null, true);
+}
+
+void DocList::ToolHelpBook(Bar& bar)
+{
+	bar.Add(t_("User manual"), THISBACK(OnHelpBook))
+		.Help(t_("Typeset complete user documentation"))
+		.Topic("DocListHelpBook");
+}
+
+void DocList::OnHelpBook()
+{
+	CreateHelpBook();
+}
+
+void DocList::OnWindowPrev()
+{
+	if(doc_list.GetCount() < 2) {
+		DocCtrl *doc = GetActive();
+		if(doc)
+			doc -> info_bar.Temporary(t_("This is the only open window."));
+		BeepExclamation();
+	}
+	else {
+		doc_list.Move(0, doc_list.GetCount() - 1); // beware of Fidler's bug!!!
+		SetActiveTop();
+	}
+}
+
+void DocList::OnWindowNext()
+{
+	if(doc_list.GetCount() < 2) {
+		DocCtrl *doc = GetActive();
+		if(doc)
+			doc -> info_bar.Temporary(t_("This is the only open window."));
+		BeepExclamation();
+	}
+	else
+		SetActive(GetDocCount() - 1);
+}
+
+void DocList::OnRemove()
+{
+	if(window_list.IsCursor()) {
+		lock = true;
+		if(Close(window_list.Get(0)))
+			window_list.SetFocus();
+		else
+			lock = false;
+	}
+}
+
+void DocList::OnActivate()
+{
+	if(window_list.IsCursor()) {
+		SetActive(window_list.Get(0));
+		window_list.SetFocus();
+	}
+}
+
+void DocList::OnClose()
+{
+	TopWindow::Close();
+}
+
+void DocList::StdBar(Bar& bar)
+{
+	DocCtrl *doc = (window_list.IsCursor() ? &doc_list[window_list.Get(0)] : NULL);
+	if(doc) {
+		bar.Add(t_("Activate document '%s'?"), THISBACK(OnActivate));
+		bar.Separator();
+	}
+	ToolFileIo(bar, doc);
+	ToolFileMisc(bar);
+}
+
+int DocList::SaveAll()
+{
+	for(int i = 0; i < doc_list.GetCount(); i++)
+		if(!doc_list[i].FlushDirty())
+			return i;
+	return -1;
+}
+
+RegisterHelpTopicObjectTitle(DlgDocListSave, t_("Close all documents"))
+
+bool DocList::CloseAll(bool save)
+{
+	if(save) {
+		WithDocListSaveLayout<TopWindow> dialog;
+		CtrlLayoutOKCancel(dialog, DlgDocListSaveHelpTitle());
+		dialog.HelpTopic("DlgDocListSave");
+		ArrayOption save;
+//		TableCheck save(0, 1);
+		dialog.list.AddIndex();
+		dialog.list.AddColumn(t_("Document"), 25);
+		save.AddColumn(dialog.list, t_("Save"), 5);
+		for(int i = 0; i < doc_list.GetCount(); i++)
+			if(doc_list[i].IsDirty())
+				dialog.list.Add(i, doc_list[i].GetShortName(), 1);
+
+		if(dialog.list.GetCount() == 1) {
+			if(SaveAll() >= 0)
+				return false;
+		}
+		else if(dialog.list.GetCount() > 1) {
+			switch(dialog.Run()) {
+			case IDOK: {
+					for(int i = 0; i < dialog.list.GetCount(); i++)
+						if((int)dialog.list.Get(i, 2)) {
+							int j = dialog.list.Get(i, 0);
+							if(!doc_list[j].SaveAs())
+								return false;
+						}
+				}
+				break;
+
+			case IDNO:
+				break;
+
+			case IDCANCEL:
+				return false;
+			}
+		}
+	}
+
+	bool all = true;
+	for(int i = 0; i < doc_list.GetCount(); i++) {
+		DocCtrl& doc = doc_list[i];
+		doc.Untouch();
+		all &= doc.CloseDoc();
+	}
+	return all;
+}
+
+void DocList::AddLRU(const DocCtrl *doc)
+{
+	ASSERT(doc);
+	if(!doc -> IsUnnamed() && !IsNull(doc -> GetName()))
+		AddLRU(doc -> GetName(), doc -> GetDocType());
+}
+
+void DocList::AddLRU(const char *doc_name, const DocType *type)
+{
+	ASSERT(type);
+	String type_name = type -> GetStreamName();
+	if(!IsNull(type_name)) {
+		RemoveLRU(doc_name);
+		lru.Insert(0, DocInfo().Name(doc_name).Type(type_name));
+		if(lru.GetCount() > MAX_LRU)
+			lru.SetCount(MAX_LRU);
+	}
+}
+
+void DocList::RemoveLRU(const char *doc_name)
+{
+	for(int i = lru.GetCount(); --i >= 0;)
+		if(!CompareNoCase(lru[i].name, doc_name))
+			lru.Remove(i);
+}
+
+void DocList::Run()
+{
+	if(doc_list.IsEmpty())
+		Open();
+	Ctrl::EventLoop();
+/*
+	while(IsOpen() && IsVisible() || !doc_list.IsEmpty()) {
+		Ctrl::GuiSleep(1000);
+		Ctrl::ProcessEvents();
+	}
+*/
+}
+
+//////////////////////////////////////////////////////////////////////
+// DocType::
+
+Vector<const DocType *> DocType::doc_types;
+
+DocType::DocType(DocCtrl *(*create_doc)())
+: create_doc(create_doc)
+, detect_doc(NULL)
+, doc_name(t_("Document"))
+, default_name(t_("new"))
+, paper(SGray)
+, new_list(true)
+{
+}
+
+int DocType::GetIndex() const
+{
+	return FindIndex(doc_types, this);
+}
+
+static String EncodeFilter(const String& filter, const String& ext)
+{
+	String f = filter;
+	bool first = true;
+	const char *s = ext;
+	while(*s) {
+		const char *p = s;
+		while(*s && *s != ';')
+			s++;
+		if(s != p) {
+			f << (first ? " (" : ", ");
+			f.Cat(p, s - p);
+			first = false;
+		}
+		if(*s)
+			s++;
+	}
+	if(!first)
+		f << ')';
+	return f;
+}
+
+void DocType::SetOpenFileDlg(FileSelector& fsel)
+{
+	Index<String> exts;
+	int i;
+	for(i = 0; i < doc_types.GetCount(); i++) {
+		const char *s = doc_types[i] -> extensions;
+		while(*s) {
+			const char *p = s;
+			while(*s && *s != ';')
+				s++;
+			if(s != p)
+				exts.FindAdd(String(p, s));
+			if(*s)
+				s++;
+		}
+	}
+	if(exts.GetCount() > 1) {
+		String list;
+		for(const String *p = exts.Begin(), *e = exts.End(); p < e; p++)
+			list << *p << ';';
+		if(!list.IsEmpty())
+			list.Trim(list.GetLength() - 1);
+		fsel.Type(EncodeFilter(t_("Supported types"), list), list);
+	}
+
+	for(i = 0; i < doc_types.GetCount(); i++) {
+		const DocType& dt = *doc_types[i];
+		if(!IsNull(dt.filter))
+			fsel.Type(EncodeFilter(dt.filter, dt.extensions), dt.extensions);
+	}
+}
+
+void DocType::SetSaveFileDlg(FileSelector& fsel) const
+{
+	String ext = extensions;
+	int f = ext.Find(';');
+	if(f >= 0)
+		ext.Trim(f);
+	fsel.Type(EncodeFilter(filter, ext), ext);
+	f = ext.Find('.');
+	if(f >= 0)
+		ext.Remove(0, f + 1);
+	fsel.DefaultExt(ext);
+}
+
+DocType& DocType::DocName(const char *_ndn)
+{
+	doc_name = _ndn;
+	return *this;
+}
+
+DocType& DocType::Filter(const char *_filter, const char *_defext)
+{
+	filter = _filter;
+	extensions = _defext;
+	return *this;
+}
+
+DocType& DocType::HelpTopic(const char *_ht)
+{
+	help_topic = _ht;
+	return *this;
+}
+
+DocCtrl *DocType::CreateDocument(DocList& list) const
+{
+	ASSERT(create_doc);
+	DocCtrl *doc = create_doc();
+	if(!doc)
+		return doc;
+	doc -> SetDocType(this);
+	doc -> SetDocList(&list);
+	doc -> HelpTopic(help_topic);
+	if(!doc -> New()) {
+		delete doc;
+		doc = NULL;
+	}
+	return doc;
+}
+
+DocType& DocType::StreamName(const char *sn)
+{
+	stream_name = sn;
+	return *this;
+}
+
+String DocType::GetStreamName() const
+{
+	return !IsNull(stream_name)  ? stream_name
+		:  !IsNull(help_topic)   ? help_topic
+		:  doc_name;
+}
+
+const DocType *DocType::FindStreamName(String sn)
+{
+	int index = doc_types.GetCount();
+	while(--index >= 0 && doc_types[index] -> GetStreamName() != sn)
+		;
+	return index >= 0 ? doc_types[index] : NULL;
+}
+
+const DocType *DocType::GetDocType(const char *filename)
+{
+	if(!filename || !*filename)
+		return NULL;
+	String fn = UPP::GetFileName(filename);
+	for(const DocType *const *p = doc_types.Begin(), *const *e = doc_types.End(); p < e; p++)
+		if(FindMultiTemplate((*p) -> GetExt(), fn))
+			return *p;
+	return NULL;
+}
+
+DocCtrl *DocType::CreateDefaultDocument(DocList& list)
+{
+	ASSERT(!doc_types.IsEmpty());
+	return doc_types[0] -> CreateDocument(list);
+}
+
+RegisterHelpTopicObjectTitle(DlgDocListNew, t_("New..."))
+
+DocCtrl *DocType::CreateAnyDocument(DocList& list)
+{
+	const DocType *type = NULL;
+	static String recent_type;
+ {
+		Vector<const DocType*> avail_types;
+		Vector<String> avail_names;
+		int i;
+		for(i = 0; i < doc_types.GetCount(); i++) {
+			const DocType& doc = *doc_types[i];
+			if(!IsNull(doc.GetDocName()) && doc.IsNewListEnabled() && doc.GetCreateDoc()) {
+				avail_types.Add(&doc);
+				avail_names.Add(doc.GetDocName());
+			}
+		}
+		switch(avail_types.GetCount()) {
+		case 0:  NEVER(); return NULL; // no document types available
+		case 1:  return avail_types[0] -> CreateDocument(list);
+		}
+
+		IndexSort(avail_names, avail_types, GetLanguageInfo());
+		WithDocListNewLayout<TopWindow> dialog;
+		CtrlLayoutOKCancel(dialog, DlgDocListNewHelpTitle());
+		dialog.HelpTopic("DlgDocListNew");
+		dialog.types.NoHeader().AutoHideSb();
+		dialog.types.WhenLeftDouble = dialog.Acceptor(IDOK);
+		dialog.types.AddIndex();
+		dialog.types.AddColumn(t_("Document type"));
+		int x = -1;
+		for(i = 0; i < avail_types.GetCount(); i++) {
+			dialog.types.Add(i, avail_types[i] -> GetDocName());
+			if(avail_types[i] -> GetStreamName() == recent_type)
+				x = i;
+		}
+		dialog.types.SetCursor(max(0, x));
+		if(dialog.Run() != IDOK || dialog.types.GetCursor() < 0)
+			return NULL;
+		type = avail_types[dialog.types.GetCursor()];
+		recent_type = type -> GetStreamName();
+	}
+
+	return type -> CreateDocument(list);
+}
+
+int DocType::Add(const DocType& doctype)
+{
+	int index = doc_types.GetCount();
+	doc_types.Add(&doctype);
+	return index;
+}
+
+//////////////////////////////////////////////////////////////////////
+// DocCtrl::
+
+DocCtrl::DocCtrl()
+: doc_type(NULL)
+, doc_list(NULL)
+, is_dirty(false)
+, is_unnamed(true)
+, is_read_only(false)
+, is_closing(false)
+{
+	WhenClose = THISBACK(OnWindowClose);
+	AddFrame(menu_bar);
+	AddFrame(info_bar);
+	AddFrame(tool_bar);
+	Rescan();
+//	AddIdleCallback(callback(&(Bar&)tool_bar, &Bar::Rescan));
+}
+
+DocCtrl::~DocCtrl()
+{
+	if(doc_list)
+		doc_list -> Detach(this);
+//	KillIdleCallback(callback(&(Bar&)tool_bar, &Bar::Rescan));
+}
+
+DocCtrl& DocCtrl::SetDocList(DocList *list)
+{
+	if(doc_list != list) {
+		ASSERT(!doc_list);
+		// currently we don't support document grafting
+		// because it's complicated and it seems absolutely useless
+		if(doc_list)
+			doc_list -> Remove(this);
+		if(doc_list = list)
+			list -> Insert(this);
+	}
+	return *this;
+}
+
+void DocCtrl::Activate()
+{
+	LLOG("DocCtrl::Activate for " << ::Name(this));
+	ASSERT(doc_list);
+//	AfxGetApp() -> m_pMainWnd = GetCWnd();
+	TopWindow::Activate();
+//	info_bar.HelpDefault();
+	doc_list -> Raise(this);
+}
+
+void DocCtrl::Serialize(Stream& stream)
+{
+}
+
+bool DocCtrl::New()
+{
+	ASSERT(doc_list);
+	is_unnamed = true;
+
+	int i = doc_list -> GetNextDocIndex();
+	filename = FormatInt(i);
+
+	is_dirty = false;
+	Change(NEW);
+	return true;
+}
+
+bool DocCtrl::Open(const char *doc, bool readonly)
+{
+	FileIn file(doc);
+	if(!file.IsOpen())
+		return false;
+	Serialize(file);
+	Untouch();
+	if(file.IsError())
+		return false;
+	SetName(doc, true);
+	SetReadOnly(readonly);
+	Change(OPEN);
+	return true;
+}
+
+bool DocCtrl::SaveAs(const char *as)
+{
+	String fn;
+	bool known;
+	if(as)
+		known = !IsNull(fn = as);
+	else { // if(!IsUnnamed())
+		fn = GetName();
+		known = !IsUnnamed();
+	}
+	if(!known && IsNull(fn = QueryFileName()))
+		return false;
+	try {
+		if(!Save(fn)) {
+			Exclamation(t_("Error saving document. Check free disk space."));
+			return false;
+		}
+	}
+	catch(Exc e) {
+		ShowExc(e);
+		return false;
+	}
+	SetName(fn, true);
+	Untouch();
+	return true;
+}
+
+String DocCtrl::QueryFileName()
+{
+	FileSelector fsel;
+	doc_type -> SetSaveFileDlg(fsel);
+	fsel <<= Nvl(GetName(), doc_list -> GetRecentPath());
+	if(!fsel.ExecuteSaveAs(t_("Save as")))
+		return Null;
+	return ~fsel;
+}
+
+bool DocCtrl::Save(const char *fn)
+{
+	FileOut file(fn);
+	if(!file.IsOpen())
+		return false;
+	Serialize(file);
+	if(file.IsError())
+		return false;
+	doc_list -> SetRecentPath(GetFileDirectory(fn));
+	return true;
+}
+
+bool DocCtrl::IsTopWindow() const
+{
+	return IsEnabled(); // && GetHWND() && IsWindowEnabled(GetHWND());
+}
+
+bool DocCtrl::CloseDoc()
+{
+	if(is_closing)
+		return true;
+	if(!IsTopWindow() || !IsVisible() || !IsEnabled()) { // don't close disabled window, a dialog might be over it
+		Exclamation(NFormat(t_("Error closing document [* \1%s\1]."), GetName()));
+		return false;
+	}
+	is_closing = true;
+	if(FlushDirty()) {
+		DoClose();
+		return true;
+	}
+	else {
+		is_closing = false;
+		return false;
+	}
+}
+
+void DocCtrl::DoClose()
+{
+	Disable();
+	is_closing = true;
+	Change(CLOSE);
+	Close();
+	if(doc_list)
+		doc_list -> Remove(this);
+//	KillTimeCallback();
+//	PostCallback(THISBACK(PostClose));
+}
+
+//void DocCtrl::PostClose()
+//{
+//	if(doc_list)
+//		doc_list -> SetActiveTop(this);
+//	DestroyWindow();
+//	if(doc_list)
+//		doc_list -> Remove(this);
+//}
+
+/*
+bool DocCtrl::BeginApplModal()
+{
+	ASSERT(doc_list);
+	return doc_list -> BeginApplModal();
+}
+*/
+
+/*
+void DocCtrl::EndApplModal()
+{
+	ASSERT(doc_list);
+	doc_list -> EndApplModal();
+}
+*/
+
+/*
+bool DocCtrl::RunApplModal(Callback cb)
+{
+	ASSERT(doc_list);
+	return doc_list -> RunApplModal(cb);
+}
+*/
+
+void DocCtrl::State(int reason)
+{
+/*
+	if(reason == SHOW || reason == ACTIVATE) {
+		WINDOWPLACEMENT wp;
+		wp.length = sizeof(wp);
+		VERIFY(GetWindowPlacement(GetHWND(), &wp));
+		doc_list -> Maximize(wp.showCmd == SW_SHOWMAXIMIZED);
+		RefreshFrame();
+	}
+	else if(reason == DEACTIVATE)
+		RefreshFrame();
+*/
+	Ctrl::State(reason);
+//	Rescan();
+}
+
+void DocCtrl::Change(int reason)
+{
+	if(!doc_list)
+		return;
+	if(IsOpen()) {
+		String name;
+		if(IsOpenDoc())
+			name = GetDirtyName();
+		name << " - " << doc_list -> GetAppName();
+		Title(name.ToWString());
+	}
+	doc_list -> Change(*this, reason);
+	Rescan();
+}
+
+DocCtrl& DocCtrl::SetReadOnly(bool _readonly)
+{
+	if(is_read_only != _readonly)
+		Change((is_read_only = _readonly) ? READ_ONLY : WRITEABLE);
+	return *this;
+}
+
+void DocCtrl::Touch(bool _touch)
+{
+	if(is_dirty != _touch) {
+		Change((is_dirty = _touch) ? TOUCH : UNTOUCH);
+		Rescan();
+	}
+}
+
+bool DocCtrl::FlushDirty()
+{
+	if(!IsDirty())
+		return true;
+	switch(PromptYesNoCancel(NFormat(t_("%s [* \1%s\1] has been edited. Save changes to the disk?"),
+		Nvl(doc_type -> GetDocName(), t_("Document")), filename))) {
+	case 1:  return SaveAs();
+	case 0:  return true;
+	default: return false;
+	}
+}
+
+void DocCtrl::Paint(Draw& draw)
+{
+	draw.DrawRect(draw.GetClip(), doc_type -> paper);
+}
+
+void DocCtrl::ToolFileSave(Bar& bar)
+{
+	bar.Add(/*IsOpen() && IsTopWindow(),*/ t_("Save"), CtrlImg::save(), THISBACK(OnFileSave))
+		.Key(K_CTRL_S)
+		.Help(t_("Save document to the disk\f; you should close all dialog windows first"))
+		.Topic("DocCtrlFileSave");
+}
+
+void DocCtrl::OnFileSave()
+{
+	SaveAs();
+}
+
+void DocCtrl::ToolFileSaveAs(Bar& bar)
+{
+	bar.Add(/*IsOpen() && IsTopWindow(),*/ t_("Save &as"), CtrlImg::save_as(), THISBACK(OnFileSaveAs))
+		.Help(t_("Save document to another disc file\f; you should close all dialog windows first"))
+		.Topic("DocCtrlFileSaveAs");
+}
+
+void DocCtrl::OnFileSaveAs()
+{
+	SaveAs("");
+}
+
+void DocCtrl::ToolFileClose(Bar& bar)
+{
+	bar.Add(IsTopWindow(), t_("Close"), THISBACK(OnFileClose))
+		.Help(t_("Close active document\f; you should close all dialog windows first"))
+		.Topic("DocCtrlFileClose");
+}
+
+void DocCtrl::OnFileClose()
+{
+	CloseDoc();
+}
+
+void DocCtrl::ToolFile(Bar& bar)
+{
+	doc_list -> ToolFileIo(bar, this);
+	doc_list -> ToolFileMisc(bar);
+}
+
+void DocCtrl::ToolWindowToolBar(Bar& bar)
+{
+	bar.Add(t_("Toolbar"), THISBACK(OnWindowToolBar))
+		.Check(tool_bar.IsVisible())
+		.Help(t_("Show / hide window toolbar"))
+		.Topic("DocCtrlWindowToolBar");
+}
+
+void DocCtrl::OnWindowToolBar()
+{
+	tool_bar.Show(!tool_bar.IsVisible());
+}
+
+void DocCtrl::ToolWindowInfoBar(Bar& bar)
+{
+	bar.Add(t_("Info bar"), THISBACK(OnWindowInfoBar))
+		.Check(info_bar.IsVisible())
+		.Help(t_("Show / hide window information bar"))
+		.Topic("DocCtrlWindowInfoBar");
+}
+
+void DocCtrl::OnWindowInfoBar()
+{
+	info_bar.Show(!info_bar.IsVisible());
+	info_bar.Layout();
+}
+
+void DocCtrl::AddToolWindow(Bar& bar)
+{
+	if(bar.IsMenuBar())
+		bar.Add(t_("Window"), THISBACK(ToolWindow));
+}
+
+void DocCtrl::ToolWindow(Bar& bar)
+{
+	ToolWindowToolBar(bar);
+	ToolWindowInfoBar(bar);
+	bar.Separator();
+	doc_list -> ToolWindowActivate(bar);
+}
+
+void DocCtrl::ToolHelp(Bar& bar)
+{
+//	ToolHelpDoc(bar);
+	doc_list -> ToolHelpContents(bar);
+	doc_list -> ToolHelpSearch(bar);
+}
+
+void DocCtrl::BarView(Bar& bar)
+{
+}
+
+void DocCtrl::BarTool(Bar& bar)
+{
+	bar.Add(t_("File"), THISBACK(ToolFile));
+	BarView(bar);
+	AddToolWindow(bar);
+	if(bar.IsMenuBar())
+		bar.Add(t_("Help"), THISBACK(ToolHelp));
+}
+
+void DocCtrl::Rescan()
+{
+	menu_bar.Set(THISBACK(BarTool));
+	tool_bar.Set(THISBACK(BarTool));
+}
+
+void DocCtrl::OnWindowActivate()
+{
+	SetActive();
+}
+
+void DocCtrl::OnWindowClose()
+{
+	CloseDoc();
+}
+
+void DocCtrl::SetActive(bool kill_init)
+{
+	LOG("DocCtrl::SetActive in " << UPP::Name(this));
+
+	if(!IsEnabled())
+		return;
+
+	ASSERT(doc_list);
+
+	bool max = doc_list -> IsMaximize();
+
+	DocCtrl *active = doc_list -> GetActive();
+	if(kill_init && active && active != this && active -> IsUnnamed() && !active -> IsDirty()) { // kill empty document
+		LOGBLOCK("-> KillInit");
+		Rect rc = active -> GetRect();
+		SetRect(rc);
+		max = active -> IsMaximized();
+		active -> CloseDoc();
+	}
+
+	if(!IsOpen()) {
+		LOGBLOCK("-> open window");
+		LOG("Sizeable, Zoomable, Icon");
+		Sizeable().Zoomable().Icon(doc_type -> GetSmallIcon(), doc_type -> GetLargeIcon());
+		LOG("Layout");
+		Layout();
+		LOG("OpenMain");
+		TopWindow::OpenMain();
+		if(max)
+			Maximize();
+		LOG("OPENWINDOW");
+		Change(OPENWINDOW);
+	}
+
+	menu_bar.WhenHelp = info_bar;
+	LOG("Activate");
+	Activate();
+//	SetWantFocus();
+//	ActivateTopmostOwnedPopup(GetHWND());
+}
+
+void DocCtrl::SetName(String name, bool clear_unnamed)
+{
+	if(!IsNull(name) && name != filename) {
+		filename = name;
+		if(clear_unnamed) {
+			is_unnamed = false;
+			doc_list -> AddLRU(this);
+		}
+		Change(RENAME);
+	}
+}
+
+String DocCtrl::GetDirtyName() const
+{
+	String name = doc_type -> GetDocName();
+	bool doc = !IsNull(name);
+	if(doc)
+		name << " (";
+	name << GetFileName(GetName());
+	if(IsDirty())
+		name << " *";
+	if(doc)
+		name << ')';
+	return name;
+}
+
+String DocCtrl::GetShortName() const
+{
+	String name = GetName();
+	if(!IsUnnamed())
+		name = GetFileName(name);
+	return doc_type -> GetDocName() + " (" + name + ')';
+}
+
+String DocCtrl::GetFullName() const
+{
+	return doc_type -> GetDocName() + " (" + GetName() + ')';
+}
+
+bool DocCtrl::HotKey(dword key)
+{
+	if(Ctrl::HotKey(key))
+		return true;
+	switch(key) {
+	case K_TAB: case K_SHIFT_TAB: return true; // do nothing on tab
+	case K_CTRL_TAB:       doc_list -> OnWindowNext(); return true;
+	case K_SHIFT_CTRL_TAB: doc_list -> OnWindowPrev(); return true;
+	}
+	return false;
+}
+
+#if 0
+DocPokus::DocPokus()
+{
+}
+
+DocPokus::~DocPokus()
+{
+}
+
+void DocPokus::RegisterType()
+{
+	static DocType pokus = DocType(CreateDoc)
+		.DocName("Pokusn� dokument")
+		.Filter("Pokusy", "*.pok");
+
+	static DocType other = DocType(CreateDoc)
+		.DocName("Ten samy dokument")
+		.Filter("Prdy", "*.prd");
+
+	DocType::Add(pokus);
+	DocType::Add(other);
+}
+
+DocCtrl *DocPokus::CreateDoc()
+{
+	return new DocPokus;
+}
+#endif
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/TCtrlLib/DocMgr.h b/uppsrc/TCtrlLib/DocMgr.h
new file mode 100644
index 000000000..958b8e5d9
--- /dev/null
+++ b/uppsrc/TCtrlLib/DocMgr.h
@@ -0,0 +1,397 @@
+NAMESPACE_UPP
+
+#define LAYOUTFILE <TCtrlLib/DocMgr.lay>
+#include <CtrlCore/lay.h>
+
+class DlgFile;
+
+class DocType;
+class DocCtrl;
+class DocList;
+
+class DocType : Moveable<DocType>
+{
+public:
+	DocType(DocCtrl *(*create_doc)() = 0);
+
+	int              GetIndex() const;
+
+	DocType&         Icon(Image l, Image s)         { large_icon = l; small_icon = s; return *this; }
+	DocType&         SmallIcon(Image s)             { small_icon = s; return *this; }
+	DocType&         LargeIcon(Image l)             { large_icon = l; return *this; }
+	Image            GetSmallIcon() const           { return small_icon; }
+	Image            GetLargeIcon() const           { return large_icon; }
+	Image            GetIcon(bool s) const          { return s ? small_icon : large_icon; }
+
+	DocType&         Paper(Color _paper)            { paper = _paper; return *this; }
+	Color            GetPaper() const               { return paper; }
+
+	DocType&         DocName(const char *_ndn);
+	String           GetDocName() const             { return doc_name; }
+
+	DocType&         EnableNewList(bool en = true)  { new_list = en; return *this; }
+	DocType&         DisableNewList()               { return EnableNewList(false); }
+	bool             IsNewListEnabled() const       { return new_list; }
+
+	DocType&         Filter(const char *_filter, const char *_defext);
+	String           GetFilter() const              { return filter; }
+	String           GetExt() const                 { return extensions; }
+
+	DocType&         DefaultName(String dn)         { default_name = dn; return *this; }
+	String           GetDefaultName() const         { return default_name; }
+
+	DocType&         StreamName(const char *sn);
+	String           GetStreamName() const;
+	static const DocType *FindStreamName(String sn);
+
+	DocType&         HelpTopic(const char *_ht);
+	String           GetHelpTopic() const           { return help_topic; }
+
+	DocType&         CreateDoc(DocCtrl *(*c)())     { create_doc = c; return *this; }
+	DocCtrl       *(*GetCreateDoc() const)()        { return create_doc; }
+
+	DocType&         DetectDoc(bool (*d)(Stream&))  { detect_doc = d; return *this; }
+	bool           (*GetDetectDoc() const)(Stream&) { return detect_doc; }
+
+	DocCtrl         *CreateDocument(DocList& list) const;
+
+	static const DocType *GetDocType(const char *filename);
+
+	static DocCtrl  *CreateDefaultDocument(DocList& list);
+	static DocCtrl  *CreateAnyDocument(DocList& list);
+
+	static void      SetOpenFileDlg(FileSelector& fsel);
+	void             SetSaveFileDlg(FileSelector& fsel) const;
+
+public:
+	DocCtrl       *(*create_doc)();
+	bool           (*detect_doc)(Stream& stream);
+
+	String           stream_name;
+	String           doc_name;
+	String           filter;
+	String           extensions;
+	String           default_name;
+	String           help_topic;
+	Image            small_icon;
+	Image            large_icon;
+	bool             new_list;
+
+	Color            paper;
+
+	static Vector<const DocType*> doc_types;
+
+	static int      Add(const DocType& doctype);
+};
+
+class DocCtrl : public TopWindow
+{
+	friend class DocList;
+
+public:
+	typedef DocCtrl CLASSNAME;
+
+	DocCtrl();
+	DocCtrl(const DocCtrl& another)                       { NEVER(); }
+	virtual ~DocCtrl();
+
+	DocCtrl&         SetDocType(const DocType *type)      { doc_type = type; return *this; }
+	const DocType   *GetDocType() const                   { return doc_type; }
+
+	DocCtrl&         SetDocList(DocList *list);
+	DocList         *GetDocList() const                   { return doc_list; }
+
+	void             SetActive(bool kill_init = false);
+	virtual void     Activate();
+
+	virtual void     Serialize(Stream& stream);   // default does nothing
+
+	virtual bool     New();
+	virtual bool     Open(const char *doc, bool rdonly = false); // default uses Serialize to load the file
+	virtual bool     Save(const char *as); // default uses Serialize to save the file
+	virtual bool     CloseDoc();
+
+	bool             IsOpenDoc() const { return !IsNull(filename); }
+
+	virtual bool     IsTopWindow() const; // tests presence of overlaid modal windows
+
+//	bool             BeginApplModal();
+//	void             EndApplModal();
+//	bool             RunApplModal(Callback cb);
+
+	bool             SaveAs(const char *fn = NULL);
+
+	enum // change reasons
+	{
+		NONE,
+
+		OPENWINDOW,
+
+		UNTOUCH,
+		TOUCH,
+
+		READ_ONLY,
+		WRITEABLE,
+
+		RENAME,
+		APPNAME,
+
+		NEW,
+		OPEN,
+		CLOSE,
+
+		OTHER_REASON,
+	};
+
+	virtual void     Change(int reason);
+	virtual void     State(int reason);
+
+	DocCtrl&         SetReadOnly(bool _ro = true);
+	DocCtrl&         SetWriteable()               { return SetReadOnly(false); }
+	bool             IsReadOnly() const           { return is_read_only; }
+
+	void             Touch(bool _touch = true);
+	void             DoTouch()                    { Touch(true); } // for use in Callbacks
+	void             Untouch()                    { Touch(false); }
+	bool             IsDirty() const              { return is_dirty; }
+
+	bool             IsUnnamed() const            { return is_unnamed; }
+	bool             IsClosing() const            { return is_closing; }
+
+	virtual bool     FlushDirty();                // prompts to save/discard/cancel
+
+	void             DoClose();
+
+	virtual bool     HotKey(dword key); // checks Ctrl+Tab / Ctrl+Shift+Tab
+	virtual void     Paint(Draw& draw);
+
+	virtual void     ClipboardChanged()           { Rescan(); }
+
+	TOOL(FileSave)
+	TOOL(FileSaveAs)
+	TOOL(FileClose)
+
+	void             ToolFile(Bar& bar);
+
+	TOOL(WindowToolBar)
+	TOOL(WindowInfoBar)
+
+	void             ToolWindow(Bar& bar);
+	void             AddToolWindow(Bar& bar); // handles anchor prefix
+
+	TOOL(HelpContents)
+	TOOL(HelpSearch)
+	TOOL(HelpBook)
+
+	void             ToolHelp(Bar& bar);
+
+	virtual void     BarView(Bar& bar); // generates view-specific tools
+	virtual void     BarTool(Bar& bar);
+
+	virtual void     Rescan(); // refresh menu & toolbar
+
+	void             OnWindowActivate();
+	void             OnWindowClose();
+
+	void             SetName(String name, bool clear_unnamed = true);
+	String           GetName() const { return filename; }
+
+	virtual String   GetDirtyName() const;
+	virtual String   GetShortName() const;
+	virtual String   GetFullName() const;
+
+	virtual String   QueryFileName();
+
+public:
+	MenuBar          menu_bar;
+	ToolBar          tool_bar;
+	StatusBar        info_bar;
+
+/*
+	class Modal
+	{
+	public:
+		Modal(DocCtrl *c)     { ctrl = (c -> BeginApplModal() ? c : 0); }
+		~Modal()              { if(ctrl) ctrl -> EndApplModal(); }
+
+		operator bool() const { return ctrl; }
+
+	private:
+		DocCtrl *ctrl;
+	};
+*/
+
+protected:
+	void             PostClose();
+
+protected:
+	const DocType   *doc_type;
+	DocList         *doc_list;
+	String           filename;
+	bool             is_dirty;
+	bool             is_unnamed;
+	bool             is_read_only;
+	bool             is_closing;
+};
+
+class DocList : public WithDocListWindowsLayout<TopWindow>
+{
+	friend class DocCtrl;
+
+public:
+	typedef DocList        CLASSNAME;
+	typedef Array<DocCtrl> DocVector;
+
+	DocList();
+
+	virtual void       Serialize(Stream& stream); // serializes LRU
+
+	DocCtrl           *OpenDoc(const char *filename, int type_index = -1);
+	bool               OpenExistingDoc(const char *filename);
+
+	virtual DocList&   AppName(const char *app_name);
+	String             GetAppName() const                 { return app_name; }
+
+	DocList&           StoreDocs(bool _sd = true)         { store_docs = _sd; return *this; }
+	DocList&           NoStoreDocs()                      { return StoreDocs(false); }
+	bool               IsStoreDocs() const                { return store_docs; }
+
+	int                GetIndex(const DocCtrl *doc) const { return doc_list.GetIndex(*doc); }
+	int                GetDocCount() const                { return doc_list.GetCount(); }
+	DocCtrl&           GetDoc(int i)                      { return doc_list[i]; }
+	const DocCtrl&     GetDoc(int i) const                { return doc_list[i]; }
+	const DocVector&   GetDocVector() const               { return doc_list; }
+
+	Vector<DocCtrl *>  FindDoc(const DocType& type) const;
+	bool               IsDocAvail(const DocType& type) const;
+
+	int                GetNextDocIndex()                  { return ++doc_counter; }
+
+	void               SetActive(int index, bool kill_init = false);
+	DocCtrl           *GetActive();
+	const DocCtrl     *GetActive() const;
+	int                GetActiveIndex() const;
+
+	int                FindDoc(const char *filename) const;
+
+	bool               Close(int index);
+
+	void               AddLRU(const DocCtrl *doc);
+	void               AddLRU(const char *doc_name, const DocType *type);
+	void               RemoveLRU(const char *doc_name);
+
+	DocList&           SetRecentPath(String path)         { recent_path = path; return *this; }
+	String             GetRecentPath() const              { return recent_path; }
+
+	virtual void       Activate();
+	virtual void       Change(DocCtrl& doc, int change);
+
+	void               Maximize(bool _maximize)           { maximize = _maximize; }
+	bool               IsMaximize() const                 { return maximize; }
+
+	TOOL(FileNew)
+	TOOL(FileNewDefault)
+	TOOL(FileOpen)
+	TOOL(FileSaveAll)
+	bool               ToolFileLru(Bar& bar);
+	void               OnFileLru(int index);
+	TOOL(FileQuit)
+
+	void               ToolFileIo(Bar& bar, DocCtrl *doc);
+
+	TOOL(FileMisc)
+
+	TOOL(WindowActivate)
+	TOOL(WindowList)
+	TOOL(WindowPrev)
+	TOOL(WindowNext)
+
+	TOOL(HelpContents)
+	TOOL(HelpSearch)
+	TOOL(HelpBook)
+
+	void               OnRemove();
+	void               OnActivate();
+	void               OnClose();
+
+	void               StdBar(Bar& bar);
+
+	virtual int        SaveAll();
+	virtual bool       CloseAll(bool save = true);
+
+	void               Run();
+
+protected:
+	virtual void       Insert(DocCtrl *document);
+	virtual void       Remove(DocCtrl *document);
+	virtual void       Detach(DocCtrl *document);
+	virtual void       Raise(DocCtrl *document);
+
+	void               RefreshTable(); // refreshes if open
+	void               UpdateTable(int new_ix = Null);
+
+	void               Destroy();
+	void               SetActiveTop(DocCtrl *ignore = NULL);
+
+protected:
+	struct DocInfo
+	{
+		DocInfo() {}
+
+		DocInfo& Name(String _name) { name = _name; return *this; }
+		DocInfo& Type(String _type) { type = _type; return *this; }
+
+		String name;
+		String type;
+
+		void Serialize(Stream& stream);
+	};
+
+	bool            store_docs;
+	bool            lock;
+	bool            maximize;
+	String          app_name;
+	int             doc_counter;
+	DocVector       doc_list;
+	Array<DocInfo>  lru;
+	Array<DocInfo>  old_docs;
+	String          recent_path;
+};
+
+template <class T>
+T *CreateDocument(DocList& doclist, T * = 0)
+{
+	DocCtrl *doc = T::GetType().CreateDocument(doclist);
+	T *t = NULL;
+	if(doc && !(t = dynamic_cast<T *>(doc)))
+		doc -> DoClose();
+	return t;
+}
+
+template <class T>
+Vector<T *> FindAllDocuments(DocList& doclist, T * = 0)
+{
+	Vector<T *> sum;
+	for(int i = 0; i < doclist.GetDocCount(); i++)
+	{
+		T *doc = dynamic_cast<T *>(&doclist.GetDoc(i));
+		if(doc && !doc -> IsClosing())
+			sum.Add(doc);
+	}
+	return sum;
+}
+
+#if 0
+class DocPokus : public DocCtrl
+{
+public:
+	DocPokus();
+	virtual ~DocPokus();
+
+public:
+	static void     RegisterType();
+	static DocCtrl *CreateDoc();
+};
+#endif
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/TCtrlLib/DocMgr.iml b/uppsrc/TCtrlLib/DocMgr.iml
new file mode 100644
index 000000000..43611850a
--- /dev/null
+++ b/uppsrc/TCtrlLib/DocMgr.iml
@@ -0,0 +1,196 @@
+IMAGE_BEGIN(open)
+	IMAGE_SCAN("")
+	IMAGE_SCAN("Ƀ\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\1\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("͂\0\0\0")
+	IMAGE_SCAN("��\0\0\0ȃ\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\0���\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\0��\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\0��\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\0���\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\0��\1\0\0\0�\0��\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\0��\1\0\0\0�\0��\1\0\0\0")
+	IMAGE_SCAN("\3\0\0\0\0��\0\0\0�\0���\0\0\0�\0��\1\0\0\0")
+	IMAGE_SCAN("�\0\0\0�\0��\1\0\0\0")
+	IMAGE_SCAN("�\0\0\0")
+IMAGE_PACKED(open, "\2\20\0\0\0\20\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(save)
+	IMAGE_SCAN("")
+	IMAGE_SCAN("��\0\0\0")
+	IMAGE_SCAN("�\3\0\0\0�\0\0\0\0\0����\1\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("�\3\0\0\0�\0\0\0\0\0�����\0\0\0")
+	IMAGE_SCAN("�\3\0\0\0�\0\0\0\0\0����\3\0\0\0�\0\0\0\0\0")
+	IMAGE_SCAN("�\3\0\0\0�\0\0\0\0\0����\3\0\0\0�\0\0\0\0\0")
+	IMAGE_SCAN("�\3\0\0\0�\0\0\0\0\0����\3\0\0\0�\0\0\0\0\0")
+	IMAGE_SCAN("�\3\0\0\0�\0\0\0\0\0����\3\0\0\0�\0\0\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0��\0\0�\0\0\0��\0\0\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0��\0\0\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0��\0\0�\0\0\0\2�\0\0\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0��\0\0�\0\0\0�\3\0\0\0�\0\0\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0��\0\0�\0\0\0�\3\0\0\0�\0\0\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0��\0\0�\0\0\0�\3\0\0\0�\0\0\0\0\0")
+	IMAGE_SCAN("\0\0\0")
+IMAGE_PACKED(save, "\2\20\0\0\0\20\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(save_as)
+	IMAGE_SCAN("")
+	IMAGE_SCAN("��\0\0\0")
+	IMAGE_SCAN("�\3\0\0\0�\0\0\0\0\0����\1\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("�\3\0\0\0�\0\0\0\0\0����\1\0\0\0����\2\0\0\0����\0\0\0")
+	IMAGE_SCAN("�\12\0\0\0�\0\0\0\0\0���\0\0\0���\0\0\0���\0\0\0����\0\0\0\2\0\0�\0\0\0")
+	IMAGE_SCAN("�\4\0\0\0�\0\0\0\0\0����\0\0\0����\1\0\0\0�\3\0\0\0\0\0�\0\0\0")
+	IMAGE_SCAN("�\11\0\0\0�\0\0\0\0\0���\0\0\0���\0\0\0���\0\0\0�\3\0\0\0\0\0�\0\0\0")
+	IMAGE_SCAN("�\3\0\0\0�\0\0\0\0\0����\1\0\0\0�\3\0\0\0\0\0�\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0��\0\0�\0\0\0�\0\0�\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0��\0\0\1\0\0\0�\0\0�\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0��\0\0�\0\0\0\2\0\0�\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0��\0\0�\0\0\0�\3\0\0\0\0\0�\0\0\0")
+	IMAGE_SCAN("�\2\0\0\0�\0\0�\0\0\0�\3\0\0\0\0\0�\0\0\0")
+	IMAGE_SCAN("��\0\0\0\1\0\0��\0\0\0�\3\0\0\0\0\0�\0\0\0")
+	IMAGE_SCAN("��\0\0\0")
+IMAGE_PACKED(save_as, "\2\20\0\0\0\20\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(print)
+	IMAGE_SCAN("")
+	IMAGE_SCAN("ʼn\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0����\1\0\0\0")
+	IMAGE_SCAN("�\2\0\0\0����\0\0\0\2���\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0����\1\0\0\0")
+	IMAGE_SCAN("�\2\0\0\0����\0\0\0\1����\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0����\1\0\0\0�\1\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("��\0\0\0�\1\0\0\0��\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\1\0\0\0�\1\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("�\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0ƃ����\1\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0ƃ\0��ƒ\0\0\0")
+	IMAGE_SCAN("�\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\1\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("‹\0\0\0")
+IMAGE_PACKED(print, "\2\20\0\0\0\20\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(new_doc)
+	IMAGE_SCAN("")
+	IMAGE_SCAN("ˆ\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�����\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0����\3\0\0\0���\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�����\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0����\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0����\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0����\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0����\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0����\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0����\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0����\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0����\1\0\0\0")
+	IMAGE_SCAN("‹\0\0\0")
+IMAGE_PACKED(new_doc, "\2\20\0\0\0\20\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(menu_window)
+	IMAGE_SCAN("�\0\0\0")
+	IMAGE_SCAN("\1\0\0\0��\0\0\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0��\0\0\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0\0\0\0")
+	IMAGE_SCAN("\1\0\0\0����\1\0\0\0��\0\0\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0����\1\0\0\0��\0\0\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0����\1\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0����\1\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0����\1\0\0\0����\1�\0\0����\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0����\1\0\0\0����\5�\0\0����\0\0����\0\0����\1\0\0\0")
+	IMAGE_SCAN("�\0\0\0������\0\0����\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0����\5�\0\0����\0\0����\0\0����\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0����\1�\0\0����\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0����\1\0\0\0")
+	IMAGE_SCAN("Í\0\0\0")
+IMAGE_PACKED(menu_window, "\2\20\0\0\0\20\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(undo)
+	IMAGE_SCAN("")
+	IMAGE_SCAN("")
+	IMAGE_SCAN("")
+	IMAGE_SCAN("")
+	IMAGE_SCAN("")
+	IMAGE_SCAN("Ȅ�\0\0\1���")
+	IMAGE_SCAN("�\1�\0\0�\0\0�\2�\0\0���")
+	IMAGE_SCAN("‚�\0\0�\1�\0\0�\1�\0\0")
+	IMAGE_SCAN("ƒ�\0\0�\1�\0\0")
+	IMAGE_SCAN("„�\0\0�\1�\0\0")
+	IMAGE_SCAN("…�\0\0�\2�\0\0���")
+	IMAGE_SCAN("�\2����\0\0")
+IMAGE_PACKED(undo, "\2\20\0\0\0\20\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(redo)
+	IMAGE_SCAN("")
+	IMAGE_SCAN("")
+	IMAGE_SCAN("")
+	IMAGE_SCAN("")
+	IMAGE_SCAN("")
+	IMAGE_SCAN("�\1�����\0\0")
+	IMAGE_SCAN("�\2����\0\0�\0\0�\1�\0\0")
+	IMAGE_SCAN("�\1�\0\0�\1�\0\0���\0\0")
+	IMAGE_SCAN("�\1�\0\0ȃ�\0\0")
+	IMAGE_SCAN("�\1�\0\0DŽ�\0\0")
+	IMAGE_SCAN("�\2����\0\0Ņ�\0\0")
+	IMAGE_SCAN("�\2�\0\0���")
+IMAGE_PACKED(redo, "\2\20\0\0\0\20\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(cut)
+	IMAGE_SCAN("")
+	IMAGE_SCAN("�\1\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("ł\0\0\0��\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("ƃ\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0")
+	IMAGE_SCAN("�\3�\0\0\0\0\0�\0\0")
+	IMAGE_SCAN("�\1�\0\0���\0\0")
+	IMAGE_SCAN("ă�\0\0�\1�\0\0�\1�\0\0")
+	IMAGE_SCAN("�\1�\0\0�\1�\0\0�\1�\0\0�\1�\0\0")
+	IMAGE_SCAN("�\1�\0\0�\1�\0\0�\1�\0\0�\1�\0\0")
+	IMAGE_SCAN("�\1�\0\0�\1�\0\0‚�\0\0")
+	IMAGE_SCAN("�\0\0")
+IMAGE_PACKED(cut, "\2\20\0\0\0\20\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(copy)
+	IMAGE_SCAN("")
+	IMAGE_SCAN("�\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�����\0\0\0")
+	IMAGE_SCAN("\1\0\0\0����\3\0\0\0���\0\0\0")
+	IMAGE_SCAN("\2\0\0\0����\0\0\0\2���\0\0\0��\0\0")
+	IMAGE_SCAN("\1\0\0\0����\1�\0\0������\0\0")
+	IMAGE_SCAN("\2\0\0\0����\0\0\0\1�\0\0����\3�\0\0����\0\0")
+	IMAGE_SCAN("\1\0\0\0����\2�\0\0����\0\0\0\1�����\0\0")
+	IMAGE_SCAN("\2\0\0\0����\0\0\0\1�\0\0����\1�\0\0")
+	IMAGE_SCAN("\1\0\0\0����\2�\0\0����\0\0\0\2����\0\0")
+	IMAGE_SCAN("�\0\0\0\1�\0\0����\1�\0\0")
+	IMAGE_SCAN("�\2�\0\0����\0\0\0\2����\0\0")
+	IMAGE_SCAN("�\1�\0\0����\1�\0\0")
+	IMAGE_SCAN("Ɖ�\0\0")
+IMAGE_PACKED(copy, "\2\20\0\0\0\20\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(paste)
+	IMAGE_SCAN("")
+	IMAGE_SCAN("ń\0\0\0")
+	IMAGE_SCAN("��\0\0\0�\0���\0\0\0")
+	IMAGE_SCAN("\6\0\0\0���\0�����\0\0\0\0���\0\0\0\6\0��\0\0\0\0�����\0��\0\0\0")
+	IMAGE_SCAN("\4\0\0\0\0�����\0\0\0�\4\0\0\0\0�����\0\0\0")
+	IMAGE_SCAN("\3\0\0\0���\0���\0\0\0\3���\0��\0\0\0")
+	IMAGE_SCAN("\16\0\0\0\0�����\0�����\0�����\0�����\0�����\0�����\0\0\0")
+	IMAGE_SCAN("\6\0\0\0���\0�����\0�������\0\0\1\0\0\0")
+	IMAGE_SCAN("\7\0\0\0\0�����\0�����\0���\0\0������\0\0")
+	IMAGE_SCAN("\7\0\0\0���\0�����\0������\0\0����\3�\0\0����\0\0")
+	IMAGE_SCAN("\10\0\0\0\0�����\0�����\0���\0\0�����\0\0\1�����\0\0")
+	IMAGE_SCAN("\7\0\0\0���\0�����\0������\0\0����\1�\0\0")
+	IMAGE_SCAN("\10\0\0\0\0�����\0�����\0���\0\0�����\0\0\2����\0\0")
+	IMAGE_SCAN("��\0\0\0\1�\0\0����\1�\0\0")
+	IMAGE_SCAN("Ɖ�\0\0")
+IMAGE_PACKED(paste, "\2\20\0\0\0\20\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(remove)
+	IMAGE_SCAN("")
+	IMAGE_SCAN("")
+	IMAGE_SCAN("��\0\0�\1���Ȃ\0\0�\1���")
+	IMAGE_SCAN("��\0\0�\1���ł\0\0�\1���")
+	IMAGE_SCAN("„\0\0�\1���Â\0\0�\1���")
+	IMAGE_SCAN("ă\0\0�\1����\2\0\0����")
+	IMAGE_SCAN("Ņ\0\0�\1���")
+	IMAGE_SCAN("ƃ\0\0�\1���")
+	IMAGE_SCAN("Ņ\0\0�\1���")
+	IMAGE_SCAN("ă\0\0�\1�����\0\0�\1���")
+	IMAGE_SCAN("Ã\0\0�\1���Â\0\0�\1���")
+	IMAGE_SCAN("ƒ\0\0�\1����\2\0\0����")
+	IMAGE_SCAN("ƒ\0\0�\1����\2\0\0����")
+	IMAGE_SCAN("�\2\0\0����")
+	IMAGE_SCAN("�\2\0\0����")
+IMAGE_PACKED(remove, "\2\20\0\0\0\20\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0")
diff --git a/uppsrc/TCtrlLib/DocMgr.lay b/uppsrc/TCtrlLib/DocMgr.lay
new file mode 100644
index 000000000..10b81a5ad
--- /dev/null
+++ b/uppsrc/TCtrlLib/DocMgr.lay
@@ -0,0 +1,20 @@
+LAYOUT(DocListWindowsLayout, 400, 200)
+	ITEM(ArrayCtrl, window_list, AutoHideSb(true).HSizePosZ(4, 4).VSizePosZ(4, 32))
+	ITEM(Button, ok, SetLabel(t_("&Activate")).LeftPosZ(4, 80).BottomPosZ(4, 22))
+	ITEM(Button, close, SetLabel(t_("&Close window")).LeftPosZ(89, 80).BottomPosZ(4, 22))
+	ITEM(Button, cancel, SetLabel(t_("Close &list")).RightPosZ(4, 80).BottomPosZ(4, 22))
+END_LAYOUT
+
+LAYOUT(DocListSaveLayout, 276, 296)
+	ITEM(Label, dv___0, SetLabel(t_("Some files have been changed since last save.\nSelect files you want to save to the disk.")).HSizePosZ(4, 4).TopPosZ(2, 30))
+	ITEM(ArrayCtrl, list, AutoHideSb(true).HSizePosZ(4, 4).VSizePosZ(36, 32))
+	ITEM(Button, ok, SetLabel(t_("OK")).LeftPosZ(4, 80).BottomPosZ(4, 22))
+	ITEM(Button, no, SetLabel(t_("&Don't save")).LeftPosZ(88, 80).BottomPosZ(4, 22))
+	ITEM(Button, cancel, SetLabel(t_("Cancel")).RightPosZ(4, 80).BottomPosZ(4, 22))
+END_LAYOUT
+
+LAYOUT(DocListNewLayout, 234, 110)
+	ITEM(ArrayCtrl, types, AutoHideSb(true).HSizePosZ(4, 92).VSizePosZ(4, 4))
+	ITEM(Button, ok, SetLabel(t_("OK")).RightPosZ(4, 80).TopPosZ(4, 22))
+	ITEM(Button, cancel, SetLabel(t_("Cancel")).RightPosZ(4, 80).TopPosZ(30, 22))
+END_LAYOUT
diff --git a/uppsrc/TCtrlLib/DocMgr.lng b/uppsrc/TCtrlLib/DocMgr.lng
new file mode 100644
index 000000000..2e67f713d
--- /dev/null
+++ b/uppsrc/TCtrlLib/DocMgr.lng
@@ -0,0 +1,125 @@
+#if LANGUAGE == LNGC_('C', 'S', 'C', 'Z', 15)
+
+// DocMgr.cpp
+
+txt(DocListWindowListTitle, "Seznam oken")
+txt(DocListWindowName, "N�zev okna")
+txt(DocListBadDocType, "Dokument [* \1%s\1] m� nezn�m� typ.")
+txt(DocListOpenError, "Nelze otev��t dokument [* \1%s\1].")
+txt(DocListFileNew, "Nov�")
+txt(DocListFileNewHelp, "Zalo�it nov� dokument")
+txt(DocListFileNewDefault, "Nov�")
+txt(DocListFileNewDefaultHelp, "Zalo�it nov� dokument")
+txt(DocListFileOpen, "Otev��t")
+txt(DocListFileOpenHelp, "Otev��t dokument na disku")
+txt(DocListFileOpenDlgTitle, "Otev��t soubor")
+txt(DocListFileSaveAll, "Ulo�it v�&echno")
+txt(DocListFileSaveAllHelp, "Ulo�it v�echny dokumenty na disk")
+txt(DocListFileLruHelp, "Otev��t soubor \'%s\'")
+txt(DocListFileQuit, "Konec programu")
+txt(DocListFileQuitHelp, "Ukon�it pr�ci s_aplikac�")
+txt(DocListWindowActivate, "Aktivovat dokument \'%s\'?")
+txt(DocListWindowList, "Okna...")
+txt(DocListWindowListHelp, "Zobrazit seznam dokument�")
+txt(DocListHelpContents, "Obsah")
+txt(DocListHelpContentsHelp, "Zobrazit hlavn� obsah n�pov�dy")
+txt(DocListHelpIndex, "Rejst��k")
+txt(DocListHelpIndexHelp, "Zobrazit rejst��k pro vyhled�v�n� "
+	"kl��ov�ch slov v n�pov�d�")
+txt(DocListHelpBook, "P��ru�ka")
+txt(DocListHelpBookTip, "Vys�zet u�ivatelskou p��ru�ku pro tisk")
+txt(DocListInfoSingle, "Toto je jedin� otev�en� okno.")
+txt(DocListCloseAllDlgTitle, "Konec aplikace")
+txt(DocListCloseAllDocColumn, "Dokument")
+txt(DocListCloseAllSaveColumn, "Ulo�it")
+txt(DocTypeDefaultDocName, "Dokument")
+txt(DocTypeDefaultName, "novy")
+txt(DocListFileOpenDlgAllTypes, "R�zn� typy")
+txt(DocTypeSelectTypeDlgTitle, "Nov�...")
+txt(DocTypeSelectTypeColumnName, "Typ dokumentu")
+txt(DocCtrlSaveError, "Dokument nelze ulo�it. Zkontrolujte, zda je na "
+	"disku dost voln�ho m�sta.")
+txt(DocListSaveAsDlgTitle, "Ulo�it jako")
+txt(DocCtrlCloseError, "Dokument [* \1%s\1] nen� mo�no zav��t.")
+txt(DocCtrlFlushDirty, "%s [* \1%s\1] byl zm�n�n. Chcete ulo�it zm�ny "
+	"na disk?")
+txt(DocCtrlFlushDirtyDoc, "Dokument")
+txt(DocCtrlFileSave, "Ulo�it")
+txt(DocCtrlFileSaveHelp, "Ulo�it soubor na disk\f; nejprve je t�eba "
+	"zav��t v�echna dialogov� okna")
+txt(DocCtrlFileSaveAs, "Ulo�it j&ako")
+txt(DocCtrlFileSaveAsHelp, "Ulo�it soubor na disk pod jin�m jm�nem\f; "
+	"nejprve je t�eba zav��t v�echna dialogov� okna")
+txt(DocCtrlFileClose, "Zav��t")
+txt(DocCtrlFileCloseHelp, "Ukon�it pr�ci s dokumentem\f; nejprve je "
+	"t�eba zav��t v�echna dialogov� okna")
+txt(DocCtrlWindowToolBar, "N�strojov� li�ta")
+txt(DocCtrlWindowToolBarHelp, "Zobrazit / schovat n�strojovou li�tu")
+txt(DocCtrlWindowInfoBar, "Informa�n� li�ta")
+txt(DocCtrlWindowInfoBarHelp, "Zobrazit / schovat informa�n� li�tu")
+txt(DocCtrlWindow, "Okno")
+txt(DocCtrlFile, "Soubor")
+txt(DocCtrlHelp, "N�pov�da")
+
+#elif LANGUAGE == LNG_('E', 'N', 'U', 'S')
+
+// DocMgr.cpp
+
+txt(DocListWindowListTitle, "Open windows")
+txt(DocListWindowName, "Window name")
+txt(DocListBadDocType, "Document [* \1%s\1] has an unknown type.")
+txt(DocListOpenError, "Error opening document [* \1%s\1].")
+txt(DocListFileNew, "New")
+txt(DocListFileNewHelp, "Create a new document")
+txt(DocListFileNewDefault, "New")
+txt(DocListFileNewDefaultHelp, "Create a new document")
+txt(DocListFileOpen, "Open")
+txt(DocListFileOpenHelp, "Open an existing document")
+txt(DocListFileOpenDlgTitle, "Open file")
+txt(DocListFileSaveAll, "Save al&l")
+txt(DocListFileSaveAllHelp, "Save all open documents to the disk")
+txt(DocListFileLruHelp, "Open file \'%s\'")
+txt(DocListFileQuit, "Quit")
+txt(DocListFileQuitHelp, "Quit application")
+txt(DocListWindowActivate, "Activate document \'%s\'?")
+txt(DocListWindowList, "Windows...")
+txt(DocListWindowListHelp, "Show open documents")
+txt(DocListHelpContents, "Contents")
+txt(DocListHelpContentsHelp, "Display alphabetic help contents")
+txt(DocListHelpIndex, "Search")
+txt(DocListHelpIndexHelp, "Display help index for keyword searching")
+txt(DocListHelpBook, "User manual")
+txt(DocListHelpBookTip, "Typeset complete user documentation")
+txt(DocListInfoSingle, "This is the only open window.")
+txt(DocListCloseAllDlgTitle, "Close all documents")
+txt(DocListCloseAllDocColumn, "Document")
+txt(DocListCloseAllSaveColumn, "Save")
+txt(DocTypeDefaultDocName, "Document")
+txt(DocTypeDefaultName, "new")
+txt(DocListFileOpenDlgAllTypes, "Supported types")
+txt(DocTypeSelectTypeDlgTitle, "New...")
+txt(DocTypeSelectTypeColumnName, "Document type")
+txt(DocCtrlSaveError, "Error saving document. Check free disk space.")
+txt(DocListSaveAsDlgTitle, "Save as")
+txt(DocCtrlCloseError, "Error closing document [* \1%s\1].")
+txt(DocCtrlFlushDirty, "%s [* \1%s\1] has been edited. Save changes "
+	"to the disk?")
+txt(DocCtrlFlushDirtyDoc, "Document")
+txt(DocCtrlFileSave, "Save")
+txt(DocCtrlFileSaveHelp, "Save document to the disk\f; you should "
+	"close all dialog windows first")
+txt(DocCtrlFileSaveAs, "Save &as")
+txt(DocCtrlFileSaveAsHelp, "Save document to another disc file\f; you "
+	"should close all dialog windows first")
+txt(DocCtrlFileClose, "Close")
+txt(DocCtrlFileCloseHelp, "Close active document\f; you should close "
+	"all dialog windows first")
+txt(DocCtrlWindowToolBar, "Toolbar")
+txt(DocCtrlWindowToolBarHelp, "Show / hide window toolbar")
+txt(DocCtrlWindowInfoBar, "Info bar")
+txt(DocCtrlWindowInfoBarHelp, "Show / hide window information bar")
+txt(DocCtrlWindow, "Window")
+txt(DocCtrlFile, "File")
+txt(DocCtrlHelp, "Help")
+
+#endif
diff --git a/uppsrc/TCtrlLib/Help/DlgFormula.cpp b/uppsrc/TCtrlLib/Help/DlgFormula.cpp
new file mode 100644
index 000000000..5692c6ef4
--- /dev/null
+++ b/uppsrc/TCtrlLib/Help/DlgFormula.cpp
@@ -0,0 +1,214 @@
+#include <TCtrlLib/Help/TCtrlLibHelp.h>
+#pragma hdrstop
+#pragma BLITZ_APPROVE
+
+#include <TDraw/formula.h>
+
+NAMESPACE_UPP
+
+#define LAYOUTFILE <TCtrlLib/Help/DlgFormula.lay>
+#include <CtrlCore/lay.h>
+
+/*
+class FontTextDisplay : public Display
+{
+public:
+	FontTextDisplay(Font font = StdFont()) : font(font) {}
+
+	void         SetFont(Font f) { font = f; }
+	Font         GetFont() const { return font; }
+
+	virtual void Paint(Draw& draw, const Rect& rc, const Value& v, Color i, Color p, dword style) const;
+
+private:
+	Font         font;
+};
+
+void FontTextDisplay::Paint(Draw& draw, const Rect& rc, const Value& v, Color i, Color p, dword style) const
+{
+	draw.DrawRect(rc, p);
+	draw.DrawText(rc.left, rc.top, StdFormat(v), font, i);
+}
+*/
+
+class FormulaCtrl : public Ctrl
+{
+public:
+	FormulaCtrl();
+
+	void         Set(const String& s, Font f, Color c) { text = s; font = f; color = c; Refresh(); }
+	virtual void Paint(Draw& draw);
+
+private:
+	String       text;
+	Font         font;
+	Color        color;
+};
+
+FormulaCtrl::FormulaCtrl()
+{
+	NoWantFocus();
+	SetFrame(InsetFrame());
+}
+
+void FormulaCtrl::Paint(Draw& draw)
+{
+	RefCon<Formula> form = ParseFormula(text, font, color);
+	draw.DrawRect(draw.GetClip(), SWhite);
+	if(!!form) {
+		form = new FormulaBox(form, LtBlue, FormulaBox::THICK);
+		Size client = GetSize();
+		Size size = form -> GetSize();
+		form -> Paint(draw, (client.cx - size.cx) >> 1,
+			((client.cy - size.cy) >> 1) + form -> GetAscent());
+	}
+}
+
+class DlgFormula : public WithFormulaLayout<TopWindow>
+{
+public:
+	typedef DlgFormula CLASSNAME;
+	DlgFormula();
+
+	bool         Run(String& text, Font& font, Color& color);
+
+	virtual bool HotKey(dword key);
+
+private:
+	void         OnPreview();
+
+	TOOL(Size)
+	void OnSizePoints(int points);
+
+	TOOL(Symbol)
+	void OnSymbolCharacter(char c);
+
+	TOOL(Paren)
+	void OnParenPair(FORMSYMBOL l, FORMSYMBOL r);
+
+	TOOL(Oper)
+	void OnOperChar(char c);
+
+
+private:
+	FormulaCtrl formula;
+	DocEdit     editor;
+	String      last_text;
+	Font        last_font;
+	Color       last_color;
+};
+
+bool RunDlgFormula(String& text, Font& font, Color& color)
+{
+	return DlgFormula().Run(text, font, color);
+}
+
+RegisterHelpTopicObjectTitle(DlgFormula, "Editor vzorc�")
+
+DlgFormula::DlgFormula()
+{
+	CtrlLayoutOKCancel(*this, DlgFormulaHelpTitle());
+	HelpTopic("DlgFormula");
+	Sizeable().Zoomable();
+	splitter.Vert(formula, editor);
+	editor.SetFont(Courier(14));
+	ActiveFocus(editor);
+	Index<String> faces;
+	Vector<int> index;
+	int i;
+	for(i = Font::GetFaceCount(); --i >= 0;)
+		index.DoIndex(faces.FindAdd(Font::GetFaceName(i))) = i;
+	Vector<String> fnames = faces.PickKeys();
+	IndexSort(fnames, index, GetLanguageInfo());
+	for(i = 0; i < fnames.GetCount(); i++)
+		face.Add(index[i], fnames[i]);
+	height.MinMax(1, 100).NotNull();
+	face <<= Font::ROMAN;
+	height <<= 10;
+	color <<= Black();
+	editor <<= face <<= height <<= color <<= THISBACK(OnPreview);
+	size_menu.WhenBar = THISBACK(ToolSize);
+	symbol_menu.WhenBar = THISBACK(ToolSymbol);
+	paren_menu.WhenBar = THISBACK(ToolParen);
+	oper_menu.WhenBar = THISBACK(ToolOper);
+}
+
+bool DlgFormula::Run(String& text_, Font& font_, Color& color_)
+{
+	editor <<= text_;
+	face <<= font_.GetFace();
+	height <<= (font_.GetHeight() * 72 + 300) / 600;
+	color <<= color_;
+	OnPreview();
+	if(TopWindow::Run() != IDOK)
+		return false;
+	text_ = last_text;
+	font_ = last_font;
+	color_ = last_color;
+	return true;
+}
+
+bool DlgFormula::HotKey(dword key)
+{
+	if(key == K_CTRL_ENTER) {
+		AcceptBreak(IDOK);
+		return true;
+	}
+	return WithFormulaLayout<TopWindow>::HotKey(key);
+}
+
+void DlgFormula::OnPreview()
+{
+	last_text = ~editor;
+	int f = Nvl((int)~face, Font::ROMAN);
+	int h = (Nvl((int)~height, 12) * 600 + 36) / 72;
+	last_color = Nvl(Color(~color), SBlack);
+	last_font = Font().Face(f).Height(h);
+	Font scr_font = Font(last_font).Height(VertDotsToPixels(ScreenDraw(), last_font.GetHeight()));
+	formula.Set(last_text, scr_font, last_color);
+}
+
+void DlgFormula::ToolSize(Bar& bar)
+{
+	bar.Add("10 pt", THISBACK1(OnSizePoints, 10)).Key(K_F2);
+	bar.Add("12 pt", THISBACK1(OnSizePoints, 12)).Key(K_F3);
+	bar.Add("14 pt", THISBACK1(OnSizePoints, 14)).Key(K_F4);
+}
+
+void DlgFormula::OnSizePoints(int pt)
+{
+	height <<= pt;
+	OnPreview();
+}
+
+void DlgFormula::ToolSymbol(Bar& bar)
+{
+/*
+	for(char i = 'a'; i <= 'z'; i++) {
+		String t(i, 1);
+		Size size = ScreenInfo().GetTextSize(t, symfont);
+	}
+*/
+}
+
+void DlgFormula::OnSymbolCharacter(char c)
+{
+}
+
+void DlgFormula::ToolParen(Bar& bar)
+{
+}
+
+void DlgFormula::OnParenPair(FORMSYMBOL l, FORMSYMBOL r)
+{
+}
+
+void DlgFormula::ToolOper(Bar& bar)
+{
+}
+
+void DlgFormula::OnOperChar(char c)
+{
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/TCtrlLib/Help/DlgFormula.hpp b/uppsrc/TCtrlLib/Help/DlgFormula.hpp
new file mode 100644
index 000000000..90dba8e16
--- /dev/null
+++ b/uppsrc/TCtrlLib/Help/DlgFormula.hpp
@@ -0,0 +1,25 @@
+HELP_TOPIC_BEGIN("DlgFormula", LNG_CZECH, "")
+	HELP_TOPIC_TEXT(
+	"[3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0} \r\n"
+	"[s0; Pomoc� v�razov�ho editoru je mo�no vkl�dat do n�pov�dy matematick� \r\n"
+	"rovnice a v�razy, nap��klad&]\r\n"
+	"[s0;= \r\n"
+	"@@Formula:3536&523/223\r\n"
+	"������樀������߀��뽰�ހ������ހ�멨�߰�������߀�����������������߰�������߰�\r\n"
+	"��槨�߰�����������߰�޲��槧��߀�����������߰�ހ��槧����߰�����������Ԁ������\r\n"
+	"��������䀀������\r\n"
+	"&]\r\n"
+	"[s0;= &]\r\n"
+	"[s0;= \r\n"
+	"@@Formula:2416&140/41\r\n"
+	"������᠀��⻠ဠ�⻀����������⻀����������※���������⻠�������\r\n"
+	"����⁏Ԁ�������������Ӏ�������\r\n"
+	"&]\r\n"
+	"[s0;= &]\r\n"
+	"[s0;= \r\n"
+	"@@Formula:950&380/25\r\n"
+	"�������������⩁�������������������������\r\n"
+	"&]\r\n"
+	"[s0;= ")
+HELP_TOPIC_END()
diff --git a/uppsrc/TCtrlLib/Help/DlgFormula.lay b/uppsrc/TCtrlLib/Help/DlgFormula.lay
new file mode 100644
index 000000000..630fc4d90
--- /dev/null
+++ b/uppsrc/TCtrlLib/Help/DlgFormula.lay
@@ -0,0 +1,14 @@
+LAYOUT(FormulaLayout, 600, 480)
+	ITEM(Splitter, splitter, HSizePosZ(4, 4).VSizePosZ(4, 54))
+	ITEM(Label, dv___1, SetLabel(t_("&Font:")).LeftPosZ(4, 40).BottomPosZ(30, 19))
+	ITEM(DropList, face, LeftPosZ(46, 172).BottomPosZ(30, 19))
+	ITEM(EditIntSpin, height, LeftPosZ(224, 40).BottomPosZ(30, 19))
+	ITEM(Label, dv___4, SetLabel(t_("&Color:")).LeftPosZ(272, 40).BottomPosZ(30, 19))
+	ITEM(ColorCtrl, color, LeftPosZ(314, 80).BottomPosZ(30, 19))
+	ITEM(MenuButton, size_menu, SetLabel(t_("&Size:")).LeftPosZ(4, 80).BottomPosZ(4, 22))
+	ITEM(MenuButton, symbol_menu, SetLabel(t_("&Symbols")).LeftPosZ(142, 80).BottomPosZ(4, 22))
+	ITEM(MenuButton, paren_menu, SetLabel(t_("&Brackets")).LeftPosZ(228, 80).BottomPosZ(4, 22))
+	ITEM(MenuButton, oper_menu, SetLabel(t_("&Operations")).LeftPosZ(314, 80).BottomPosZ(4, 22))
+	ITEM(Button, ok, SetLabel(t_("OK")).RightPosZ(88, 80).BottomPosZ(4, 22))
+	ITEM(Button, cancel, SetLabel(t_("Cancel")).RightPosZ(4, 80).BottomPosZ(4, 22))
+END_LAYOUT
diff --git a/uppsrc/TCtrlLib/Help/DlgHelp.cpp b/uppsrc/TCtrlLib/Help/DlgHelp.cpp
new file mode 100644
index 000000000..9009a3d3a
--- /dev/null
+++ b/uppsrc/TCtrlLib/Help/DlgHelp.cpp
@@ -0,0 +1,1765 @@
+#if 0
+
+#include "TCtrlLibHelp.h"
+#pragma hdrstop
+#pragma BLITZ_APPROVE
+
+#include <Draw/PixelUtil.h>
+
+#define LAYOUTFILE <TCtrlLib/Help/DlgHelp.lay>
+#include <CtrlCore/lay.h>
+
+class DisplayTopicName : public Display {
+public:
+	DisplayTopicName() {}
+
+	virtual void Paint(Draw& draw, const Rect& rc, const Value& v, Color i, Color p, dword style) const {
+		if(!HelpTopicGet(v).added)
+			i = LtRed;
+		RichTextDisplay().Paint(draw, rc, HelpTopicGet(v).GetTitle(), i, p, style);
+	}
+};
+
+static bool RawTopicMatch(const char *pattern, const char *file, const char *& endptr)
+{
+	for(char c; c = *pattern++;)
+		if(c == '*') {
+			do
+				if(RawTopicMatch(pattern, file, endptr))
+					return true;
+			while(*file++);
+			endptr = pattern;
+			return false;
+		}
+		else if(c == '?') {
+			if(*file++ == 0) {
+				endptr = pattern - 1;
+				return false;
+			}
+		}
+		else if(ToLower(c) != ToLower(*file++)) {
+			endptr = pattern - 1;
+			return false;
+		}
+	endptr = file;
+	return true;
+}
+
+static const char *FindTopicMatch(const char *pattern, const char *file, String& cont)
+{
+	const char *endptr;
+	while(!RawTopicMatch(pattern, file, endptr)) {
+		while(!(file[0] == '/' && file[1] == '/'))
+			if(*file++ == 0)
+				return endptr;
+		file += 2;
+	}
+	if(cont.IsVoid()) {
+		cont = endptr;
+		return NULL;
+	}
+	const char *p = cont;
+	while(*p && ToLower(*p) == ToLower(*endptr++))
+		p++;
+	cont.Trim(p - cont.Begin());
+	return NULL;
+}
+
+struct RichObjectExchangeNew : public RichObjectExchange
+{
+	RichObjectExchangeNew(RichObjectType *type) : object(type, Null) {}
+
+	virtual RichObject GetRichObject() const                 { return object; }
+	virtual void       SetRichObject(const RichObject& data) { object = data; }
+
+	RichObject         object;
+};
+
+class DlgHelpEditorLink : public WithHelpEditorLinkLayout<TopWindow>
+{
+public:
+	typedef DlgHelpEditorLink CLASSNAME;
+	DlgHelpEditorLink();
+
+	bool Run(String& target, String& text, String& style);
+
+private:
+	void OnMask();
+	void OnPreview();
+	void SyncList();
+
+private:
+	Vector<String> map;
+	int prev;
+	DisplayTopicName tn;
+};
+
+RegisterHelpTopicObjectTitle(DlgHelpEditorLink, t_("Link to topic"))
+
+DlgHelpEditorLink::DlgHelpEditorLink()
+{
+	prev = 0;
+
+	CtrlLayoutOKCancel(*this, DlgHelpEditorLinkHelpTitle());
+	Sizeable().MaximizeBox();
+	HelpTopic("DlgHelpEditorLink");
+
+	list.AddColumn(t_("Code"), 10);
+	list.AddColumnAt(0, t_("Topic name"), 10).SetDisplay(tn);
+
+	dyna_preview.SetZoom(Zoom(DOC_SCREEN_ZOOM, 1024));
+	dyna_preview.NoSb();
+	book_preview.SetZoom(Zoom(DOC_SCREEN_ZOOM, 1024));
+	book_preview.NoSb();
+
+	style.AddList(" (viz str. #)");
+	style.AddList(", str. #");
+	style.AddList(" (str. #)");
+	style.AddList("-|#");
+
+	mask <<= THISBACK(OnMask);
+	list.WhenCursor = text <<= style <<= THISBACK(OnPreview);
+}
+
+bool DlgHelpEditorLink::Run(String& tg, String& tx, String& st)
+{
+	map <<= HelpTopicMap().GetKeys();
+	Sort(map, GetLanguageInfo());
+
+	CtrlRetriever rtvr;
+	rtvr(text,   tx)
+		(style,  st);
+	mask <<= tg;
+	SyncList();
+	OnPreview();
+	while(TopWindow::Run() == IDOK) {
+		if(!list.IsCursor()) {
+			BeepExclamation();
+			continue;
+		}
+		tg = list.Get(0);
+		rtvr.Retrieve();
+		return true;
+	}
+	return false;
+}
+
+void DlgHelpEditorLink::SyncList()
+{
+	list.Clear();
+	String m = mask.GetText().ToString();
+	String rem = String::GetVoid();
+	const char *best_err = NULL;
+
+	for(int p = 0; p < map.GetCount(); p++) {
+		String fn = map[p];
+		String rr = rem;
+		const char *errptr = FindTopicMatch(m, fn, rr);
+		if(!errptr) {
+			rem = rr;
+			list.Add(fn);
+		}
+		else if(!best_err || errptr > best_err)
+			best_err = errptr;
+	}
+	if(list.GetCount() == 0) {
+		int px = best_err - m.Begin();
+		mask.SetSelection(px, mask.GetLength());
+		BeepExclamation();
+	}
+	else if(!rem.IsEmpty() && prev < mask.GetLength()) {
+		int l, h;
+		mask.GetSelection(l, h);
+		if(l == m.GetLength()) {
+			mask.SetText((mask + rem).ToWString());
+			mask.SetSelection(l, l + rem.GetLength());
+		}
+	}
+	prev = m.GetLength();
+	if(list.GetCount() > 0)
+		list.SetCursor(0);
+}
+
+void DlgHelpEditorLink::OnMask()
+{
+	SyncList();
+}
+
+void DlgHelpEditorLink::OnPreview()
+{
+	RichPara::CharFormat cfmt;
+	RichPara para;
+	String target;
+	if(list.IsCursor())
+		target = list.Get(0);
+	para.Cat(FieldTypeLinkID(), EncodeLink(~target, ~text, ~style), cfmt);
+	RichText text;
+	text.Cat(para); {
+		VectorMap<String, Value> vars;
+		vars.Add("$link", 1);
+		text.EvaluateFields(vars);
+	}
+	RichText copy;
+	copy.Cat(para); {
+		VectorMap<String, Value> vars;
+		vars.Add("$book", 1);
+		vars.Add(~target, 1234);
+		copy.EvaluateFields(vars);
+	}
+	dyna_preview.Pick(text);
+	book_preview.Pick(copy);
+}
+
+class DlgHelpEditorNewTopic : public WithHelpEditorNewTopicLayout<TopWindow>
+{
+public:
+	typedef DlgHelpEditorNewTopic CLASSNAME;
+	DlgHelpEditorNewTopic();
+
+	bool Run(String& space, String& nesting, String& topic, String& folder);
+
+private:
+	void OnSpace();
+	void OnNesting();
+	void OnFolderBrowse();
+
+private:
+	ExtendedButton folder_browse;
+};
+
+RegisterHelpTopicObjectTitle(DlgHelpEditorNewTopic, t_("New help topic"))
+
+DlgHelpEditorNewTopic::DlgHelpEditorNewTopic()
+{
+	CtrlLayoutOKCancel(*this, DlgHelpEditorNewTopicHelpTitle());
+	HelpTopic("DlgHelpEditorNewTopic");
+
+	Vector<String> hsp = HelpTopicEnumSpace();
+	int i;
+	for(i = 0; i < hsp.GetCount(); i++)
+		dpp_space.Add(Nvl(hsp[i], "::"));
+	if(hsp.GetCount() == 1)
+		dpp_space.SetIndex(0);
+	dpp_space <<= THISBACK(OnSpace);
+	dpp_nesting <<= THISBACK(OnNesting);
+	folder.AddFrame(folder_browse);
+	folder_browse <<= THISBACK(OnFolderBrowse);
+}
+
+bool DlgHelpEditorNewTopic::Run(String& spc, String& nest, String& top, String& fold)
+{
+	dpp_space <<= spc;
+	OnSpace();
+	dpp_nesting <<= nest;
+	OnNesting();
+	dpp_topic <<= top;
+	folder <<= fold;
+	if(TopWindow::Run() != IDOK)
+		return false;
+	spc = ~dpp_space;
+	nest = ~dpp_nesting;
+	top = ~dpp_topic;
+	fold = ~folder;
+	return true;
+}
+
+void DlgHelpEditorNewTopic::OnSpace()
+{
+	Vector<String> nest = HelpTopicEnumNesting(~dpp_space);
+	dpp_nesting.Clear();
+	for(int i = 0; i < nest.GetCount(); i++)
+		dpp_nesting.Add(Nvl(nest[i], "::"));
+	if(nest.GetCount() == 1)
+		dpp_nesting.SetIndex(0);
+	OnNesting();
+}
+
+void DlgHelpEditorNewTopic::OnNesting()
+{
+	String sp = ~dpp_space, ne = ~dpp_nesting;
+	Vector<String> names = HelpTopicList(sp, ne);
+	dpp_topic.ClearList();
+	for(int i = 0; i < names.GetCount(); i++) {
+		String drl = names[i];
+		String s, n, t;
+		HelpParseDPP(drl, s, n, t);
+		dpp_topic.AddList(t);
+	}
+}
+
+void DlgHelpEditorNewTopic::OnFolderBrowse()
+{
+	FileSel fsel;
+	fsel <<= ~folder;
+	if(fsel.ExecuteSelectDir("Slo�ka t�matu"))
+		folder <<= ~fsel;
+}
+
+class DlgHelpEditorSection : public WithHelpEditorSectionLayout<TopWindow>
+{
+public:
+	typedef DlgHelpEditorSection CLASSNAME;
+	DlgHelpEditorSection();
+
+	bool Run(RichTextSection& section);
+
+public:
+	Option header_opt[3], footer_opt[3];
+	EditField header[3], footer[3];
+
+private:
+	void Pump(RichTextSection& section, bool write);
+	void UpdateUI();
+};
+
+RegisterHelpTopicObjectTitle(DlgHelpEditorSection, "Textov� odd�l (tisk)");
+
+DlgHelpEditorSection::DlgHelpEditorSection()
+{
+	CtrlLayoutOKCancel(*this, DlgHelpEditorSectionHelpTitle());
+	HelpTopic("DlgHelpEditorSection");
+	static String lcr[] = { t_("Left:"), t_("Center:"), t_("Right:") };
+	for(int i = 0; i < 3; i++) {
+		header_opt[i].SetLabel(lcr[i]);
+		footer_opt[i].SetLabel(lcr[i]);
+		header_opt[i] <<= footer_opt[i] <<= THISBACK(UpdateUI);
+	}
+	columns_opt <<= column_space_opt <<= firstpage_opt <<=
+	margin_left_opt <<= margin_top_opt <<= margin_right_opt <<= margin_bottom_opt <<=
+	header_space_opt <<= footer_space_opt <<= THISBACK(UpdateUI);
+}
+
+static void PumpOpt(int& value, Option& opt, Ctrl& editor, bool write)
+{
+	if(!write) {
+		opt = !IsNull(value);
+		editor <<= value;
+	}
+	else
+		value = opt ? (int)~editor : int(Null);
+}
+
+void DlgHelpEditorSection::Pump(RichTextSection& section, bool write)
+{
+	if(!write) {
+		columns_opt = !IsNull(section.columns);
+		columns <<= !IsNull(section.columns) ? section.columns - 1 : int(Null);
+		nested <<= section.nested;
+	}
+	else {
+		section.columns = columns_opt ? Nvl((int)~columns) + 1 : int(Null);
+		section.nested = nested;
+	}
+	PumpOpt(section.column_space, column_space_opt, column_space, write);
+	PumpOpt(section.firstpage, firstpage_opt, firstpage, write);
+	PumpOpt(section.margin.left, margin_left_opt, margin_left, write);
+	PumpOpt(section.margin.top, margin_top_opt, margin_top, write);
+	PumpOpt(section.margin.right, margin_right_opt, margin_right, write);
+	PumpOpt(section.margin.bottom, margin_bottom_opt, margin_bottom, write);
+	PumpOpt(section.header_space, header_space_opt, header_space, write);
+	PumpOpt(section.footer_space, footer_space_opt, footer_space, write);
+	for(int i = 0; i < 3; i++) {
+		if(!write) {
+			header_opt[i] = !section.header[i].IsVoid();
+			footer_opt[i] = !section.footer[i].IsVoid();
+			header[i] <<= section.header[i];
+			footer[i] <<= section.footer[i];
+		}
+		else {
+			section.header[i] = (header_opt[i] ? (String)~header[i] : String::GetVoid());
+			section.footer[i] = (footer_opt[i] ? (String)~footer[i] : String::GetVoid());
+		}
+	}
+}
+
+bool DlgHelpEditorSection::Run(RichTextSection& section)
+{
+	Pump(section, false);
+	UpdateUI();
+	if(TopWindow::Run() != IDOK)
+		return false;
+	Pump(section, true);
+	return true;
+}
+
+void DlgHelpEditorSection::UpdateUI()
+{
+	columns.Enable(columns_opt);
+	column_space.Enable(column_space_opt);
+	firstpage.Enable(firstpage_opt);
+	margin_left.Enable(margin_left_opt);
+	margin_top.Enable(margin_top_opt);
+	margin_right.Enable(margin_right_opt);
+	margin_bottom.Enable(margin_bottom_opt);
+	header_space.Enable(header_space_opt);
+	footer_space.Enable(footer_space_opt);
+	for(int i = 0; i < 3; i++) {
+		header[i].Enable(header_opt[i]);
+		footer[i].Enable(footer_opt[i]);
+	}
+}
+
+static HelpTopicInfoMap& StoredHelpTopicMap()
+{
+	static HelpTopicInfoMap map;
+	return map;
+}
+
+void StoreHelpInfo()
+{
+	StoredHelpTopicMap() <<= HelpTopicMap();
+}
+
+void LoadAppHelpFile()
+{
+	HelpInit::Run();
+	StoreHelpInfo();
+	String dir = AppendFileName(GetFileDirectory(ConfigFile()), "doc.dpp");
+	FindFile ff;
+	if(ff.Search(AppendFileName(dir, "*.dpp")))
+		do
+			if(ff.IsFile()) {
+				String path = AppendFileName(dir, ff.GetName());
+				try {
+					HelpTopicLoad(path, LoadFile(path));
+				}
+				catch(Exc e) {
+					if(!PromptOKCancel(NFormat("[* \1%s\1]: %s\nPokra�ovat?", path, e)))
+						break;
+				}
+			}
+		while(ff.Next());
+}
+
+class ConvertParaCount : public Convert
+{
+public:
+	ConvertParaCount() : language(Null) {}
+
+	void          Language(int lang) { language = lang; }
+
+	virtual Value Format(const Value& value) const;
+
+private:
+	int           language;
+};
+
+Value ConvertParaCount::Format(const Value& value) const
+{
+//	return Null;
+	String topic = value;
+	if(IsNull(topic) || IsNull(language))
+		return Null;
+	RichText rt = ParseQTF(HelpTopicGet(HelpDPPStyle()).GetText(language)
+		+ "\r\n" + HelpTopicGet(topic).GetText(language));
+	return rt.IsEmpty() ? int(Null) : rt.GetPartCount();
+}
+
+class ConvertIndexCount : public Convert
+{
+public:
+	ConvertIndexCount() : language(Null) {}
+
+	void          Language(int lang) { language = lang; }
+
+	virtual Value Format(const Value& value) const;
+
+private:
+	int           language;
+};
+
+Value ConvertIndexCount::Format(const Value& value) const
+{
+//	return Null;
+	String topic = value;
+	if(IsNull(topic) || IsNull(language))
+		return Null;
+	RichText rt = ParseQTF(HelpTopicGet(HelpDPPStyle()).GetText(language)
+		+ "\r\n" + HelpTopicGet(topic).GetText(language));
+	Vector<RichValPos> vp = rt.GetValPos(Size(10000, INT_MAX), RichText::INDEXENTRIES);
+	Index<WString> ie;
+	for(int i = 0; i < vp.GetCount(); i++)
+		ie.FindAdd(vp[i].data);
+	if(ie.IsEmpty())
+		return Null;
+	return ie.GetCount();
+}
+
+typedef VectorMap< String, VectorMap<int, int> > EditPosMap;
+GLOBAL_VAR(EditPosMap, _sPosMap)
+
+class DlgHelpEditor : public TopWindow
+{
+public:
+	typedef WithHelpEditorEditLayout<TopWindow> EditorCtrl;
+
+	typedef DlgHelpEditor CLASSNAME;
+	DlgHelpEditor();
+
+	virtual void                        Serialize(Stream& stream);
+	static ConfigItem&                  config();
+
+	void                                Run(Ctrl *ctrl, const Image& still);
+
+	virtual void                        ChildGotFocus();
+	virtual bool                        HotKey(dword key);
+
+	TOOL(Main)
+
+	TOOL(File)
+		TOOL(FileOpen)
+		TOOL(FileSave)
+//		TOOL(FileSaveAs)
+		TOOL(FileTopicIndex)
+		TOOL(FileTopicView)
+		TOOL(FileClose)
+
+	TOOL(Edit)
+		TOOL(EditUp)
+		TOOL(EditDown)
+		TOOL(EditGoto)
+		TOOL(EditFormula)
+		TOOL(EditLink)
+		TOOL(EditSection)
+		TOOL(EditNewTopic)
+		TOOL(EditPaste)
+
+	TOOL(System)
+//		TOOL(SystemExport)
+		TOOL(SystemExportProject)
+
+	void                                Rescan() { menubar.Set(THISBACK(ToolMain)); toolbar.Set(THISBACK(ToolMain)); }
+
+private:
+	static bool                         SaveTopic(String topic, int lang, const EditorCtrl& editor);
+	static String                       LoadTopic(String topic, int lang, EditorCtrl& editor);
+
+	void                                OnTopicListCursor();
+	void                                OnTopicListAction();
+	void                                OnTopicLanguage();
+	void                                OnAuxLanguage();
+
+	void                                OnDPPSpace();
+	void                                OnDPPNesting();
+
+	void                                OnScreenshot();
+	void                                OnPasteIcon();
+
+	void                                UpdateTopicList() { OnDPPSpace(); }
+	void                                UpdateAvail();
+	void                                UpdateIconModules();
+	void                                UpdateIconGallery();
+
+	bool                                SaveFile();
+	bool                                PromptSave();
+
+private:
+	Splitter                            hsplitter;
+	ArrayCtrl                           topic_list;
+	enum { C_DRL, C_NAME, C_COUNT };
+	Splitter                            vsplitter;
+	EditorCtrl                          edit, aux_edit;
+	TabCtrl                             aux_tab;
+	Ctrl                                aux_pane;
+	WithHelpEditorIconLayout<TopWindow> aux_icons;
+	EditorCtrl                         *last_edit;
+	ConvertParaCount                    cv_para;
+	ConvertIndexCount                   cv_index;
+	bool                                is_dirty;
+	Label                               dpp_space_tag;
+	DropList                            dpp_space;
+	Label                               dpp_nesting_tag;
+	DropList                            dpp_nesting;
+
+	Ctrl                               *master;
+	One<Ctrl>                           screenshot;
+
+	MenuBar                             menubar;
+	ToolBar                             toolbar;
+	StatusBar                           statusbar;
+
+	String                              old_topic;
+	int                                 old_lang1, old_lang2;
+	String                              recent_dlg;
+	String                              recent_exp_dir;
+	String                              init_topic;
+
+	enum { IFRM_NONE, IFRM_BUTTON, IFRM_INSET };
+};
+
+void RunDlgHelpEditor(Ctrl *ctrl, const Image& still) { DlgHelpEditor().Run(ctrl, still); }
+
+RegisterHelpTopicObjectTitle(DlgHelpEditor, t_("Application documentation editor"))
+
+DlgHelpEditor::DlgHelpEditor()
+{
+	master = NULL;
+	is_dirty = false;
+//	topic_text.SpellCheck();
+//	topic_aux.SpellCheck();
+
+	//CtrlLayout(*this, "Editor aplika�n� dokumentace");
+	Title(DlgHelpEditorHelpTitle().ToWString());
+	HelpTopic("DlgHelpEditor");
+	WhenClose = THISBACK(OnFileClose);
+	Sizeable().Zoomable();
+//	CalcWindowRect(*this, (Stock.GetScreenSize() * 3) >> 2);
+	AddFrame(menubar);
+	AddFrame(toolbar);
+	AddFrame(statusbar);
+	Add(hsplitter.SizePos());
+	hsplitter.Horz(topic_list, vsplitter);
+	hsplitter.SetPos(3000);
+	topic_list.AutoHideSb();
+	topic_list.NoVertGrid();
+	ASSERT(topic_list.GetIndexCount() == C_DRL);
+	topic_list.AddIndex();
+	ASSERT(topic_list.GetIndexCount() == C_NAME);
+	topic_list.AddColumn(t_("Topic"), 20);
+	topic_list.AddColumnAt(C_DRL, t_("Para"), 4).SetConvert(cv_para).Cache();
+	topic_list.AddColumnAt(C_DRL, t_("Index"), 4).SetConvert(cv_index).Cache();
+	topic_list.WhenCursor = THISBACK(OnTopicListCursor);
+	topic_list <<= THISBACK(OnTopicListAction);
+	vsplitter.Vert(edit, aux_tab);
+	CtrlLayout(edit);
+	aux_tab.Add(aux_pane.SizePos(), t_("Screenshot"));
+	aux_pane.NoWantFocus().Transparent();
+	CtrlLayout(aux_edit);
+	int wd = 4000; //edit.text.GetPage().cx;
+	edit.text.SetPage(Size(wd, 0x10000000));
+	aux_edit.text.SetPage(Size(wd, 0x10000000));
+	aux_tab.Add(aux_edit.SizePos(), t_("Text"));
+	CtrlLayout(aux_icons);
+	aux_tab.Add(aux_icons.SizePos(), t_("Icons"));
+	aux_icons.module.AddIndex();
+	aux_icons.module.AddColumn();
+	aux_icons.module.WhenCursor = THISBACK(UpdateIconGallery);
+	aux_icons.gallery.Columns(3);
+	aux_icons.frame <<= IFRM_BUTTON;
+	aux_icons.size <<= 80;
+	aux_icons.raise <<= -3;
+	aux_icons.gallery.WhenLeftDouble = THISBACK(OnPasteIcon);
+	last_edit = &edit;
+	edit.text.WhenRefreshBar = aux_edit.text.WhenRefreshBar = THISBACK(Rescan);
+//	edit.topic_module.SetReadOnly();
+	edit.title.SetFont(StdFont().Bold());
+	aux_edit.title.SetFont(StdFont().Bold());
+	edit.title.SetConvert(CFormatConvert());
+	aux_edit.title.SetConvert(CFormatConvert());
+//	menubar <<= THISBACK(ToolMain);
+
+	dpp_space_tag.SetLabel(t_("Namespace: "));
+	dpp_space <<= THISBACK(OnDPPSpace);
+	dpp_nesting_tag.SetLabel(t_("Nesting: "));
+	dpp_nesting <<= THISBACK(OnDPPNesting);
+
+	Vector<String> hsp = HelpTopicEnumSpace();
+	dpp_space.Add(String::GetVoid(), t_("(all)"));
+	int i;
+	for(i = 0; i < hsp.GetCount(); i++)
+		dpp_space.Add(Nvl(hsp[i], "::"));
+	if(hsp.GetCount() == 1)
+		dpp_space.SetIndex(1);
+
+	Vector<int> lcodes = HelpTopicEnumLang();
+	if(FindIndex(lcodes, LNG_CZECH) < 0) lcodes.Add(LNG_CZECH);
+	if(FindIndex(lcodes, LNG_ENGLISH) < 0) lcodes.Add(LNG_ENGLISH);
+	aux_edit.language.Add(Null, "---");
+	old_lang1 = old_lang2 = Null;
+	for(i = 0; i < lcodes.GetCount(); i++) {
+		int l = lcodes[i];
+		String n = LNGAsText(l);
+		edit.language.Add(l, n);
+		aux_edit.language.Add(l, n);
+		if(l == GetCurrentLanguage())
+			old_lang1 = l;
+		else if(IsNull(old_lang2))
+			old_lang2 = l;
+	}
+	edit.language <<= old_lang1;
+	edit.language <<= THISBACK(OnTopicLanguage);
+	aux_edit.language <<= old_lang2;
+	aux_edit.language <<= THISBACK(OnAuxLanguage);
+
+	ActiveFocus(topic_list);
+	UpdateAvail();
+	UpdateIconModules();
+}
+
+CONFIG_ITEM(DlgHelpEditor::config, "DlgHelpEditor", 6, 3, 6)
+
+void DlgHelpEditor::Serialize(Stream& stream)
+{
+	SerializePlacement(stream);
+	stream % hsplitter % vsplitter;
+	stream % recent_exp_dir;
+	if(config() >= 4) {
+		String module;
+		if(aux_icons.module.IsCursor())
+			module = aux_icons.module.Get(0);
+		stream % CtrlData<int>(aux_icons.frame)
+			% CtrlData<int>(aux_icons.size)
+			% CtrlData<double>(aux_icons.raise)
+			% module;
+		if(stream.IsLoading())
+			aux_icons.module.FindSetCursor(module);
+	}
+	if(config() >= 5)
+		stream % aux_icons.gallery;
+	if(config() >= 6)
+		stream % CtrlData<int>(aux_icons.grayed)
+			% CtrlData<int>(aux_icons.etched);
+}
+
+void DlgHelpEditor::Run(Ctrl *master_, const Image& still_)
+{
+	master = master_;
+	if(master) {
+		screenshot = GetDlgShot(master_, still_);
+		*screenshot <<= THISBACK(OnScreenshot);
+		aux_pane.Add(screenshot->SizePos());
+		Ctrl *m = master;
+		while(IsNull(init_topic = m->GetHelpTopic()))
+			if(m->GetParent())
+				m = m->GetParent();
+			else if(m->GetOwner())
+				m = m->GetOwner();
+			else
+				break;
+	}
+
+	ReadConfigSelf();
+	Open();
+	Rescan();
+	OnDPPSpace();
+	OnTopicLanguage();
+	OnTopicListCursor();
+	ActiveFocus(edit.text);
+	TopWindow::Run();
+	OnTopicListCursor();
+//	topic_list.KillCursor();
+	WriteConfigSelf();
+//	text = editor.Get();
+//	String text = ~editor;
+//	PromptOK(String() << "Output text:\n\n" << text);
+}
+
+void DlgHelpEditor::ToolMain(Bar& bar)
+{
+	bar.Add(t_("File"), THISBACK(ToolFile))
+		.Help(t_("Help files maintenance"));
+	bar.Add(t_("Edit"), THISBACK(ToolEdit))
+		.Help(t_("Edit theme topics"));
+	if(bar.IsToolBar()) {
+		bar.Separator();
+		bar.Add(dpp_space_tag);
+		bar.Add(dpp_space, 120);
+		bar.Separator();
+		bar.Add(dpp_nesting_tag);
+		bar.Add(dpp_nesting, 120);
+	}
+	bar.Add(t_("System"), THISBACK(ToolSystem))
+		.Help(t_("System tools"));
+	if(bar.IsToolBar()) {
+		last_edit->text.DefaultBar(bar);
+	}
+/*
+	if(bar.IsToolBar()) {
+
+		bar_edit->StyleTool(bar);
+		bar.Gap();
+		bar_edit->FontTools(bar);
+		bar.Gap();
+		bar_edit->InkTool(bar);
+		bar_edit->PaperTool(bar);
+		bar.Gap();
+		bar_edit->LanguageTool(bar);
+		bar_edit->SpellCheckTool(bar);
+		bar.Break();
+		bar_edit->IndexEntryTool(bar);
+		bar.Break();
+		bar_edit->HyperlinkTool(bar);
+		bar.Gap();
+		bar_edit->ParaTools(bar);
+		bar.Gap();
+		bar_edit->PrintTool(bar);
+	}
+*/
+}
+
+void DlgHelpEditor::ToolFile(Bar& bar)
+{
+	ToolFileOpen(bar);
+	ToolFileSave(bar);
+//	ToolFileSaveAs(bar);
+	bar.MenuSeparator();
+	ToolFileTopicIndex(bar);
+	ToolFileTopicView(bar);
+	bar.MenuSeparator();
+	ToolFileClose(bar);
+}
+
+void DlgHelpEditor::ToolFileOpen(Bar& bar)
+{
+	bar.Add(t_("Open"), CtrlImg::open(), THISBACK(OnFileOpen))
+		.Key(K_CTRL_O)
+		.Help(t_("Read help files from a given disk file"));
+}
+
+//RegisterHelpTopicObjectTitle(DlgHelpEditorMissingTopics, s_(DlgHelpEditorMissingTopicsHelpTitle))
+
+void DlgHelpEditor::OnFileOpen()
+{
+	FileSelector fsel;
+	fsel.Type("Dokumentace (*.dpp, *.dpx)", "*.dpp;*.dpx");
+	fsel.AllFilesType();
+	fsel.DefaultExt("dpp");
+	fsel.Multi();
+	if(fsel.ExecuteOpen(t_("Open"))) {
+		int cs = topic_list.GetCursor();
+		int sc = topic_list.GetCursorSc();
+		topic_list.KillCursor();
+		Progress progress("Na��t�m soubory", fsel.GetCount());
+		Index<String> loaded;
+		for(int i = 0; i < fsel.GetCount(); i++)
+			try {
+				if(progress.StepCanceled())
+					break;
+				String data = LoadFile(fsel[i]);
+				if(IsNull(data))
+					throw Exc(t_("error loading file"));
+				HelpTopicLoad(fsel[i], data, &loaded);
+			}
+			catch(Exc e) {
+				if(!PromptOKCancel(NFormat("Chyba v souboru [* \1%s\1]:\n[* \1%s\1]\nPokra�ovat?", fsel[i], e)))
+					break;
+			}
+		UpdateTopicList();
+		if(!topic_list.FindSetCursor(loaded[0], C_DRL))
+			topic_list.SetCursor(cs);
+		topic_list.ScCursor(sc);
+	}
+	UpdateAvail();
+}
+
+void DlgHelpEditor::ToolFileSave(Bar& bar)
+{
+	bar.Add(t_("Save"), CtrlImg::save(), THISBACK(OnFileSave))
+		.Key(K_CTRL_S)
+		.Help(t_("Save help topics into a common application file"));
+}
+
+void DlgHelpEditor::OnFileSave()
+{
+	SaveFile();
+}
+
+bool DlgHelpEditor::SaveFile()
+{
+	OnTopicListCursor();
+	String outpath = GetFileFolder(ConfigFile());
+	try {
+		Vector<String> folders = HelpTopicEnumTextFolders();
+		Progress progress("Ukl�d�m n�pov�du", folders.GetCount());
+		for(int i = 0; i < folders.GetCount(); i++) {
+			if(progress.StepCanceled())
+				throw AbortExc();
+			Vector<String> files;
+			HelpTopicSave(files, folders[i], StoredHelpTopicMap(), outpath);
+		}
+	}
+	catch(Exc e) {
+		Exclamation(NFormat(t_("Error writing help into folder [* \1%s\1]."), outpath));
+		return false;
+	}
+	is_dirty = false;
+	return true;
+}
+
+/*
+void DlgHelpEditor::ToolFileSaveAs(Bar& bar)
+{
+	bar.Add(s_(DlgHelpEditorToolFileSaveAs), CtrlImg::save_as(), THISBACK(OnFileSaveAs))
+		.Help(s_(DlgHelpEditorToolFileSaveAsHelp));
+}
+*/
+
+/*
+void DlgHelpEditor::OnFileSaveAs()
+{
+	SaveFile(Null);
+}
+*/
+
+void DlgHelpEditor::ToolFileTopicIndex(Bar& bar)
+{
+	bar.Add(t_("Contents, index"), THISBACK(OnFileTopicIndex))
+		.Help(t_("Show help contents and search index"));
+}
+
+void DlgHelpEditor::OnFileTopicIndex()
+{
+	OnTopicListCursor();
+	OpenHelpTopicIndex(old_topic);
+}
+
+void DlgHelpEditor::ToolFileTopicView(Bar& bar)
+{
+	bar.Add(topic_list.IsCursor(), "Prohl�e� t�matu", THISBACK(OnFileTopicView))
+		.Help("Zobrazit aktivn� t�ma v prohl�e�i dokumentace");
+}
+
+void DlgHelpEditor::OnFileTopicView()
+{
+	if(!topic_list.IsCursor()) {
+		BeepExclamation();
+		return;
+	}
+	String drl = topic_list.Get(C_DRL);
+	RunDlgHelpTopic(drl);
+}
+
+void DlgHelpEditor::ToolFileClose(Bar& bar)
+{
+	bar.Add(t_("Close"), THISBACK(OnFileClose))
+		.Help(t_("Close documentation editor"));
+}
+
+void DlgHelpEditor::OnFileClose()
+{
+//	if(PromptSave())
+	AcceptBreak(IDOK);
+}
+
+bool DlgHelpEditor::PromptSave()
+{
+	OnTopicListCursor();
+	if(!is_dirty)
+		return true;
+	switch(PromptYesNoCancel(t_("Do you want to save changes to the documentation?"))) {
+	case 1:  return SaveFile();
+	case 0:  return true;
+	default: return false;
+	}
+}
+
+void DlgHelpEditor::ToolEdit(Bar& bar)
+{
+/*	bar_edit->UndoTool(bar);
+	bar_edit->RedoTool(bar);
+	bar.Gap();
+	bar_edit->CutTool(bar);
+	bar_edit->CopyTool(bar);
+	ToolEditPaste(bar);
+	bar.Gap();
+*/	last_edit->text.FindReplaceTool(bar);
+	bar.Separator();
+	ToolEditUp(bar);
+	ToolEditDown(bar);
+	ToolEditGoto(bar);
+	bar.Separator();
+	ToolEditFormula(bar);
+	ToolEditLink(bar);
+	ToolEditSection(bar);
+	ToolEditNewTopic(bar);
+}
+
+/*
+void DlgHelpEditor::ToolEditPaste(Bar& bar)
+{
+	bar.Add("Paste", CtrlImg::paste(), THISBACK(OnEditPaste))
+	   .Key(K_CTRL_V);
+}
+*/
+
+/*
+void DlgHelpEditor::OnEditPaste()
+{
+	int rtf = GetClipboardFormatCode("Rich Text Format");
+	if(!IsClipboardFormatAvailable(GetClipboardFormatCode("QTF"))
+	&& IsClipboardFormatAvailable(rtf)) {
+		String rtfdata = ReadClipboard(rtf);
+		RichText rt = ParseRTF(rtfdata);
+		if(!rt.IsEmpty()) {
+			bar_edit->PasteText(rt);
+			return;
+		}
+	}
+	bar_edit->Paste();
+}
+*/
+
+void DlgHelpEditor::ToolEditUp(Bar& bar)
+{
+	bar.Add(t_("Previous theme"), THISBACK(OnEditUp))
+		.Key(K_ALT_UP)
+		.Help(t_("Go up one theme in the list"));
+}
+
+void DlgHelpEditor::OnEditUp()
+{
+	if(topic_list.GetCursor() > 0)
+		topic_list.SetCursor(topic_list.GetCursor() - 1);
+	ActiveFocus(last_edit->text);
+}
+
+void DlgHelpEditor::ToolEditDown(Bar& bar)
+{
+	bar.Add(t_("Next topic"), THISBACK(OnEditDown))
+		.Key(K_ALT_DOWN)
+		.Help(t_("Go down one topic in the list"));
+}
+
+void DlgHelpEditor::OnEditDown()
+{
+	if(topic_list.GetCursor() + 1 < topic_list.GetCount())
+		topic_list.SetCursor(topic_list.GetCursor() + 1);
+	ActiveFocus(last_edit->text);
+}
+
+void DlgHelpEditor::ToolEditGoto(Bar& bar)
+{
+	bar.Add(t_("Go to..."), THISBACK(OnEditGoto))
+		.Key(K_CTRL_D)
+		.Help(t_("Locate help topic using initial letters or wildcard mask (*, ?)"));
+}
+
+RegisterHelpTopicObjectTitle(DlgHelpEditorGoto, t_("Go to topic"));
+
+void DlgHelpEditor::OnEditGoto()
+{
+	WithHelpEditorGotoLayout<TopWindow> ffdlg;
+	CtrlLayoutOKCancel(ffdlg, DlgHelpEditorGotoHelpTitle());
+	ffdlg.HelpTopic("DlgHelpEditorGoto");
+	ffdlg.list.AddColumn(t_("Code"), 10);
+	DisplayTopicName tn;
+	ffdlg.list.AddColumnAt(0, t_("Topic name"), 10).SetDisplay(tn);
+	ffdlg.mask <<= ffdlg.Breaker(IDYES);
+	int prev = 0;
+	Vector<String> map;
+	map <<= HelpTopicMap().GetKeys();
+	Sort(map, GetLanguageInfo());
+
+	for(;;) {
+		ffdlg.list.Clear();
+		String mask = ffdlg.mask.GetText().ToString();
+		String rem = String::GetVoid();
+		const char *best_err = NULL;
+
+		for(int p = 0; p < map.GetCount(); p++) {
+			String fn = map[p];
+			String rr = rem;
+			const char *errptr = FindTopicMatch(mask, fn, rr);
+			if(!errptr) {
+				rem = rr;
+				ffdlg.list.Add(fn);
+			}
+			else if(!best_err || errptr > best_err)
+				best_err = errptr;
+		}
+		if(ffdlg.list.GetCount() == 0) {
+			int px = best_err - mask.Begin();
+			ffdlg.mask.SetSelection(px, ffdlg.mask.GetLength());
+			BeepExclamation();
+		}
+		else if(!rem.IsEmpty() && prev < mask.GetLength()) {
+			int l, h;
+			ffdlg.mask.GetSelection(l, h);
+			if(l == mask.GetLength()) {
+				ffdlg.mask.SetText((mask + rem).ToWString());
+				ffdlg.mask.SetSelection(l, l + rem.GetLength());
+			}
+		}
+		prev = mask.GetLength();
+		if(ffdlg.list.GetCount() > 0)
+			ffdlg.list.SetCursor(0);
+
+		switch(ffdlg.Run()) {
+		case IDCANCEL:
+			return;
+
+		case IDOK:
+			if(ffdlg.list.IsCursor()) {
+				if(topic_list.FindSetCursor(ffdlg.list.Get(0))) {
+					ActiveFocus(last_edit->text);
+					return;
+				}
+				BeepExclamation();
+			}
+			break;
+
+		case IDYES:
+			break;
+		}
+	}
+}
+
+void DlgHelpEditor::ToolEditFormula(Bar& bar)
+{
+	bar.Add(!!master, t_("Formula"), THISBACK(OnEditFormula))
+		.Key(K_CTRL_W)
+		.Help(t_("Open formula editor"));
+}
+
+void DlgHelpEditor::OnEditFormula()
+{
+	RichObjectExchangeNew ren(RichObjectTypeFormula());
+	RichObjectTypeFormula()->DefaultAction(ren);
+	if(!IsNull(ren.object.GetData())) {
+		if(last_edit->text.IsSelection())
+			last_edit->text.RemoveSelection();
+		RichPara rpara;
+		rpara.Cat(ren.object, RichPara::CharFormat());
+		RichText rtext;
+		rtext.Cat(rpara);
+		last_edit->text.PasteText(rtext);
+	//	BeepInformation();
+		ActiveFocus(last_edit->text);
+	}
+}
+
+void DlgHelpEditor::ToolSystem(Bar& bar)
+{
+//	ToolSystemExport(bar);
+	ToolSystemExportProject(bar);
+}
+
+/*
+void DlgHelpEditor::ToolSystemExport(Bar& bar)
+{
+	bar.Add(s_(DlgHelpEditorToolSystemExport), THISBACK(OnSystemExport))
+		.Key(K_CTRL_E)
+		.Help(s_(DlgHelpEditorToolSystemExportHelp));
+}
+*/
+
+/*
+void DlgHelpEditor::OnSystemExport()
+{
+	OnTopicListCursor();
+	FileSel fsel;
+	fsel.ActiveDir(recent_exp_dir);
+	if(!fsel.ExecuteSelectDir(s_(DlgHelpEditorSystemExportDirSelTitle)))
+		return;
+	recent_exp_dir = ~fsel;
+	Vector<String> mmap = HelpTopicEnumTextFolders(&StoredHelpTopicMap());
+	Progress progress(s_(DlgHelpEditorSystemExportProgress), mmap.GetCount());
+	int count_done = 0;
+	for(int i = 0; i < mmap.GetCount(); i++) {
+		String mod = mmap[i];
+		String outfile = AppendFileName(~fsel, GetFileTitle(mod) + ".hpp");
+		String diffile = HelpTopicSave(mod, StoredHelpTopicMap());
+		if(IsNull(diffile))
+			DeleteFile(outfile);
+		else if(!::SaveFile(outfile, diffile)) {
+			if(!PromptOKCancel(NFormat(s_(DlgHelpEditorSystemExportSaveError), outfile)))
+				break;
+		}
+		else
+			count_done++;
+		if(progress.StepCanceled()) {
+			PromptOK(s_(DlgHelpEditorSystemExportAbort));
+			return;
+		}
+	}
+	PromptOK(NFormat(s_(DlgHelpEditorSystemExportCountInfo),
+		count_done, ~fsel));
+}
+*/
+
+void DlgHelpEditor::ToolSystemExportProject(Bar& bar)
+{
+	bar.Add(t_("Export into project"), THISBACK(OnSystemExportProject))
+		.Key(K_CTRL_E)
+		.Help(t_("Export help topics into the application source code"));
+}
+
+RegisterHelpTopicObjectTitle(DlgHelpEditorProjectExport, t_("Export help into project"));
+
+void DlgHelpEditor::OnSystemExportProject()
+{
+	OnTopicListCursor();
+	Vector<String> mmap = HelpTopicEnumTextFolders();
+	if(mmap.IsEmpty()) {
+		Exclamation(t_("No help files found."));
+		return;
+	}
+
+	int count_done = 0;
+	WithHelpEditorExportProjectLayout<TopWindow> dlgexp;
+	CtrlLayoutOKCancel(dlgexp, DlgHelpEditorProjectExportHelpTitle());
+	dlgexp.list.AddColumn(t_("Folder"), 50);
+	dlgexp.list.AddColumn("Po�et", 20);
+//	dlgexp.list.AddColumn(s_(DlgHelpEditorSystemExportProjectLengthColumn), 20);
+//	dlgexp.list.AddColumn(s_(DlgHelpEditorSystemExportProjectNewColumn), 20);
+	ArrayOption todo;
+	todo.AddColumn(dlgexp.list, t_("Overwrite"), 10);
+	dlgexp.list.AddIndex(); // data
+	Progress progress("Proch�z�m seznam t�mat...", mmap.GetCount());
+	String host_dph_fn = AppendFileName(HelpTopicHostDir(), "host.dph");
+	String host_dph;
+	for(int i = 0; i < mmap.GetCount(); i++) {
+		if(progress.StepCanceled()) {
+			Exclamation(t_("Export aborted by user."));
+			return;
+		}
+		int fdir = HelpTopicGetFolderDirty(mmap[i], StoredHelpTopicMap());
+		dlgexp.list.Add(mmap[i], fdir, fdir > 0);
+	}
+
+	dlgexp.list.SetCursor(0);
+	if(dlgexp.Run() != IDOK)
+		return;
+
+	Vector<String> files; {
+		Progress progress(t_("Exporting changed files"), dlgexp.list.GetCount());
+		for(int i = 0; i < dlgexp.list.GetCount(); i++) {
+			if(progress.StepCanceled()) {
+				Exclamation(t_("Export aborted by user."));
+				return;
+			}
+			dlgexp.list.SetCursor(i);
+			bool do_save = (int)dlgexp.list.Get(2);
+
+			String fold = dlgexp.list.Get(0);
+//				String data = dlgexp.list.Get(4);
+			try {
+				host_dph << HelpTopicSave(files, fold, StoredHelpTopicMap(), Null, !do_save);
+			}
+			catch(Exc e) {
+				if(!PromptOKCancel(NFormat(t_("Error exporting folder [* \1%s\1]: [* \1%s\1]. Continue?"), fold, e)))
+					return;
+			}
+		}
+	}
+	if(!IsSameTextFile(LoadFile(host_dph_fn), host_dph)) {
+		RealizePath(host_dph_fn);
+		if(!::SaveFileBackup(host_dph_fn, host_dph))
+			Exclamation(NFormat("Nelze ulo�it soubor [* \1%s\1].", host_dph_fn));
+		else
+			files.Add(host_dph_fn);
+	}
+
+	if(files.IsEmpty())
+		Exclamation(t_("No help files were saved."));
+	else {
+		dlgexp.Close();
+		WithHelpEditorSavedFilesLayout<TopWindow> sfdlg;
+		sfdlg.Sizeable().MaximizeBox();
+		CtrlLayoutExit(sfdlg, "Export byl �sp�n� dokon�en");
+		sfdlg.list.AddColumn();
+		Append(sfdlg.list, files);
+		sfdlg.count.SetLabel(FormatInt(files.GetCount()));
+		sfdlg.Run();
+	}
+}
+
+/*
+void DlgHelpEditor::OnEditDialog()
+{
+	DlgHelpEditorDialogObject dlg;
+	if(dlg.Run(recent_dlg)) {
+		RichPara para;
+		para.Cat(RichObject(RichObjectTypeDialogHelp(), recent_dlg));
+		RichText text;
+		text.Cat(para);
+		String s = AsQTF(text);
+		LOG("RichText: " << s);
+		LOGHEXDUMP(s, s.GetLength());
+#ifdef PLATFORM_WIN32
+		WriteClipboard(RegisterClipboardFormat("Ultimate Development QTF format"), s);
+#else
+		WriteClipboardText(s);
+#endif
+//		editor.Paste();
+	}
+}
+*/
+
+void DlgHelpEditor::ToolEditLink(Bar& bar)
+{
+	bar.Add(topic_list.IsCursor(), "Odkaz", THISBACK(OnEditLink))
+		.Key(K_CTRL_L)
+		.Help("Vlo�it do textu odkaz na zvolen� t�ma n�pov�dy");
+}
+
+static int LocateField(const RichText& rt, int cursor, Id fieldid, String& param)
+{
+	RichPos rpos;
+	if(cursor < rt.GetLength() && (rpos = rt.GetRichPos(cursor)).field == fieldid) {
+		param = rpos.fieldparam;
+		return cursor;
+	}
+	if(cursor > 0 && (rpos = rt.GetRichPos(cursor - 1)).field == fieldid) {
+		param = rpos.fieldparam;
+		return cursor - 1;
+	}
+	return -1;
+}
+
+void DlgHelpEditor::OnEditLink()
+{
+	if(!topic_list.IsCursor()) {
+		BeepExclamation();
+		return;
+	}
+	DlgHelpEditorLink linkdlg;
+//	String s, n, t;
+//	HelpParseDPP((String)topic_list.Get(C_DRL), s, n, t);
+	String drl, text, style;
+	String param;
+	int cur = last_edit->text.GetCursor();
+	const RichText& rt = last_edit->text.Get();
+	int old_pos = LocateField(rt, cur, FieldTypeLinkID(), param);
+	int old_len = 0;
+	RichPara::CharFormat fmt = last_edit->text.GetFormatInfo();
+	if(old_pos >= 0) {
+		old_len = 1;
+		DecodeLink(param, drl, text, style);
+		fmt = rt.GetFormatInfo(old_pos, 1);
+	}
+	else {
+		old_pos = cur;
+		int l, h;
+		if(cur < rt.GetLength()) {
+			RichText::FormatInfo fi = rt.GetFormatInfo(cur, 1);
+			if(!IsNull(fi.link)) {
+				while(old_pos > 0 && rt.GetFormatInfo(old_pos - 1, 1).link == fi.link)
+					--old_pos;
+				while(cur < rt.GetLength() && rt.GetFormatInfo(cur, 1).link == fi.link)
+					cur++;
+				old_len = cur - old_pos;
+				drl = fi.link;
+				WString wtext;
+				for(int i = 0; i < old_len; i++)
+					wtext.Cat(last_edit->text[old_pos + i]);
+				text = wtext.ToString();
+			}
+			else if(last_edit->text.GetSelection(l, h)) {
+				old_pos = l;
+				old_len = h - l;
+				WString rtt;
+				while(l < h)
+					rtt.Cat(rt[l++]);
+				text = rtt.ToString();
+			}
+			fmt = rt.GetFormatInfo(old_pos, old_len);
+			fmt.link = Null;
+		}
+	}
+	if(linkdlg.Run(/*Nvl(s, "::"), Nvl(n, "::"),*/ drl, text, style)) {
+		if(old_len > 0) {
+			last_edit->text.Move(old_pos, false);
+			last_edit->text.RemoveText(old_len);
+		}
+		RichPara para;
+		para.Cat(FieldTypeLinkID(), EncodeLink(drl, text, style), fmt);
+		RichText text;
+		text.Cat(para);
+		last_edit->text.Move(old_pos, false);
+		last_edit->text.PasteText(text);
+	}
+}
+
+void DlgHelpEditor::ToolEditSection(Bar& bar)
+{
+	bar.Add(topic_list.IsCursor(), "Tiskov� odd�l", THISBACK(OnEditSection))
+		.Help("Vlo�it do textu zna�ku za��tku nov�ho tiskov�ho odd�lu");
+}
+
+void DlgHelpEditor::OnEditSection()
+{
+	if(!topic_list.IsCursor()) {
+		BeepExclamation();
+		return;
+	}
+	DlgHelpEditorSection secdlg;
+	RichTextSection sect;
+	int cur = last_edit->text.GetCursor();
+	String param;
+	int pos = LocateField(last_edit->text.Get(), cur, FieldTypeSectionID(), param);
+	if(pos >= 0)
+		sect = DecodeSection(param);
+	if(secdlg.Run(sect)) {
+		RichPara::CharFormat fmt = last_edit->text.GetFormatInfo();
+		if(pos >= 0) {
+			last_edit->text.Move(pos, false);
+			last_edit->text.RemoveText(1);
+		}
+		RichPara para;
+		para.Cat(FieldTypeSectionID(), EncodeSection(sect), fmt);
+		RichText text;
+		text.Cat(para);
+		last_edit->text.Move(cur, false);
+		last_edit->text.PasteText(text);
+	}
+}
+
+void DlgHelpEditor::ToolEditNewTopic(Bar& bar)
+{
+	bar.Add("Nov� t�ma", THISBACK(OnEditNewTopic))
+		.Help("Vytvo�it nov� t�ma n�pov�dy");
+}
+
+void DlgHelpEditor::OnEditNewTopic()
+{
+	String drl;
+	if(topic_list.IsCursor())
+		drl = topic_list.Get(C_DRL);
+	String space, nesting, topic, folder;
+	HelpParseDPP(drl, space, nesting, topic);
+	DlgHelpEditorNewTopic newdlg;
+	while(newdlg.Run(space, nesting, topic, folder)) {
+		drl = HelpFormatDPP(space, nesting, topic);
+		if(HelpTopicMap().Find(drl) >= 0) {
+			Exclamation(NFormat("Objekt [* \1%s\1] ji� v syst�mu dokumentace existuje.", drl));
+			continue;
+		}
+		HelpTopicSet(drl, AppendFileName(folder, ""), ~edit.language, "", "");
+		dpp_space <<= space;
+		OnDPPSpace();
+		dpp_nesting <<= nesting;
+		OnDPPNesting();
+		topic_list.FindSetCursor(drl);
+		return;
+	}
+}
+
+bool DlgHelpEditor::SaveTopic(String topic_name, int lang, const WithHelpEditorEditLayout<TopWindow>& editor)
+{
+	_sPosMap().GetAdd(topic_name).GetAdd(lang) = editor.text.GetCursor();
+	if(IsNull(topic_name) || IsNull(lang) || !editor.title.IsModified() && !editor.text.IsModified())
+		return false;
+	if(lang != GetCurrentLanguage())
+		SetLanguage(lang);
+	int s = HelpTopicMap().Find(HelpDPPStyle());
+	int f = HelpTopicMap().Find(topic_name);
+	if(f < 0)
+		return false;
+	byte cs = GetLangStdCharset(lang);
+	HelpTopicInfo& topic = HelpTopicMap()[f];
+	String old_tit = ~editor.title;
+	String old_styles = StylesAsQTF(editor.text.Get(), cs);
+	String old_txt;
+	if(!editor.text.Get().IsEmpty())
+	 	old_txt = BodyAsQTF(editor.text.Get(), cs);
+	if(old_tit == topic.GetDefaultTitle())
+		old_tit = Null;
+	String tqtf;
+	if(s >= 0)
+		tqtf = HelpTopicMap()[s].GetText(lang) + "\r\n";
+	if(old_txt == BodyAsQTF(ParseQTF(tqtf + topic.GetDefaultText()), cs)) //topic.GetText(old_language))
+		old_txt = Null;
+	bool is_dirty = (old_tit != topic.GetTitle(lang)
+	|| old_txt != BodyAsQTF(ParseQTF(tqtf + topic.GetText(lang)), cs));
+	topic.Set(lang, old_tit, old_txt);
+	if(s >= 0)
+		HelpTopicMap()[s].Set(lang, Null, old_styles);
+	return is_dirty;
+}
+
+String DlgHelpEditor::LoadTopic(String topic_name, int lang, WithHelpEditorEditLayout<TopWindow>& editor)
+{
+	int s = HelpTopicMap().Find(HelpDPPStyle());
+	int f = HelpTopicMap().Find(topic_name);
+	bool is_topic = (f >= 0 && !IsNull(lang));
+	editor.title.Enable(is_topic);
+	editor.text.Enable(is_topic);
+	String app_title, title;
+	RichText text;
+	if(is_topic) {
+		if(lang != GetCurrentLanguage() && lang != 0 && !IsNull(lang))
+			SetLanguage(lang);
+		RichText styles;
+		if(s >= 0)
+			styles = ParseQTF(HelpTopicMap()[s].GetText(lang));
+		HelpTopicInfo& topic = HelpTopicMap()[f];
+		title = topic.GetTitle();
+		text = ParseQTF(topic.GetText());
+		text.OverrideStyles(styles.GetStyles(), true);
+		app_title = NFormat(t_("%s: %s - documentation editor"), topic_name, title);
+	}
+	editor.title <<= title;
+	editor.text.Pick(text);
+	editor.title.ClearModify();
+	editor.text.ClearModify();
+	int pos = _sPosMap().GetAdd(topic_name).Get(lang, 0);
+	if(pos >= 0 && pos <= editor.text.GetLength())
+		editor.text.Move(pos);
+	return app_title;
+}
+
+void DlgHelpEditor::OnTopicListCursor()
+{
+	int lang = GetCurrentLanguage();
+	if(!IsNull(old_topic)) {
+		String space, nesting, item;
+		HelpParseDPP(old_topic, space, nesting, item);
+		if(nesting != "sys") {
+			if(SaveTopic(old_topic, old_lang1, edit))
+				is_dirty = true;
+			if(SaveTopic(old_topic, old_lang2, aux_edit))
+				is_dirty = true;
+			int ff = topic_list.Find(old_topic);
+			if(ff >= 0)
+				topic_list.InvalidateCache(ff);
+	//			topic_list.Set(ff, 1, !IsNull(old_txt) ? 1 : 0);
+		}
+	}
+	old_topic = Null;
+	if(topic_list.IsCursor())
+		old_topic = topic_list.Get(0);
+	old_lang1 = ~edit.language;
+	old_lang2 = ~aux_edit.language;
+
+	String app_title = Nvl(LoadTopic(old_topic, old_lang1, edit), LoadTopic(old_topic, old_lang2, aux_edit));
+	if(GetCurrentLanguage() != lang)
+		SetLanguage(lang);
+	if(IsNull(app_title))
+		app_title = t_("Documentation editor"),
+	Title(MQTFStrip(app_title).ToWString());
+}
+
+void DlgHelpEditor::UpdateAvail()
+{
+//	int cs = topic_list.GetCursor();
+//	topic_list.KillCursor();
+	int lng = ~edit.language;
+	topic_list.ClearCache();
+//	const HelpTopicInfoMap& hmap = HelpTopicMap();
+//	for(int i = 0; i < topic_list.GetCount(); i++)
+//	{
+//		String topic = topic_list.Get(i, 0);
+//		int f = hmap.Find(topic);
+//		topic_list.Set(i, C_, f >= 0 && !IsNull(hmap[f].GetText(lng)) ? 1 : 0);
+//	}
+//	if(cs >= 0)
+//		topic_list.SetCursor(cs);
+}
+
+void DlgHelpEditor::OnTopicLanguage()
+{
+	int c = topic_list.GetCursor();
+	topic_list.KillCursor();
+	int lang = ~edit.language;
+	byte cs = GetLangStdCharset(lang);
+	cv_para.Language(lang);
+	cv_index.Language(lang);
+	topic_list.ClearCache();
+//	edit.topic_title.Charset(cs);
+//	topic_text.Charset(cs);
+	UpdateAvail();
+	if(c >= 0)
+		topic_list.SetCursor(c);
+}
+
+void DlgHelpEditor::OnAuxLanguage()
+{
+	OnTopicListCursor();
+}
+
+void DlgHelpEditor::OnTopicListAction()
+{
+//	topic_list.Sync();
+}
+
+void DlgHelpEditor::ChildGotFocus()
+{
+	if(edit.HasFocusDeep() && last_edit != &edit) {
+		last_edit = &edit;
+		Rescan();
+	}
+	else if(aux_edit.HasFocusDeep() && last_edit != &aux_edit) {
+		last_edit = &aux_edit;
+		Rescan();
+	}
+}
+
+bool DlgHelpEditor::HotKey(dword key)
+{
+	if(key == K_ESCAPE) {
+		vsplitter.Zoom(vsplitter.GetZoom() == -1 ? 0 : -1);
+		ActiveFocus(edit.text);
+		return true;
+	}
+	return Ctrl::HotKey(key);
+}
+
+void DlgHelpEditor::OnScreenshot()
+{
+	if(!screenshot)
+		return;
+	Value v = ~*screenshot;
+	if(IsNull(v))
+		return;
+	if(IsTypeRaw<Image>(v)) {
+		Image dwg = v;
+		Size dot_size = PixelsToDots(ScreenInfo(), dwg.GetSize());
+		RichObject object("PNG", PngEncoder().SaveImage(dwg), dot_size);
+		//CreateDrawingObject(dwg, dot_size);
+		if(last_edit->text.IsSelection())
+			last_edit->text.RemoveSelection();
+		RichPara rpara;
+		rpara.Cat(object, last_edit->text.GetFormatInfo());
+		RichText rtext;
+		rtext.Cat(rpara);
+		last_edit->text.PasteText(rtext);
+	//	BeepInformation();
+		ActiveFocus(last_edit->text);
+	}
+}
+
+void DlgHelpEditor::OnDPPSpace()
+{
+	Vector<String> nest = HelpTopicEnumNesting(~dpp_space);
+	dpp_nesting.Clear();
+	dpp_nesting.Add(Null, t_("(all)"));
+	for(int i = 0; i < nest.GetCount(); i++)
+		dpp_nesting.Add(Nvl(nest[i], "::"));
+	dpp_nesting <<= Null;
+	if(nest.GetCount() == 1)
+		dpp_nesting.SetIndex(1);
+	OnDPPNesting();
+}
+
+void DlgHelpEditor::OnDPPNesting()
+{
+	String sp = ~dpp_space, ne = ~dpp_nesting;
+	Vector<String> names = HelpTopicList(sp, ne);
+	topic_list.Clear();
+	topic_list.SetCount(names.GetCount());
+	int i;
+	for(i = 0; i < names.GetCount(); i++) {
+		String drl = names[i], name;
+		if(!IsNull(sp) || !IsNull(ne)) {
+			String space, nesting, topic;
+			HelpParseDPP(drl, space, nesting, topic);
+			if(IsNull(space))
+				space = "::";
+			if(IsNull(nesting))
+				nesting = "::";
+			if(IsNull(sp))
+				if(IsNull(ne))
+					name << space << "//" << nesting << "//";
+				else
+					name << space << "//";
+			else if(IsNull(ne))
+				name << nesting << "//";
+			name << topic;
+		}
+		topic_list.Set(i, C_DRL, drl);
+		topic_list.Set(i, C_NAME, Nvl(name, drl));
+	}
+
+	if(!IsNull(init_topic)) {
+		if(!topic_list.FindSetCursor(init_topic, C_DRL)
+		&& !topic_list.FindSetCursor(HelpAppDPP(init_topic), C_DRL))
+			topic_list.SetCursor(0);
+		init_topic = Null;
+	}
+}
+
+void DlgHelpEditor::UpdateIconModules()
+{
+	Index<String> mods;
+	const Vector<String>& names = ImageCache::Get().GetNameMap().GetKeys();
+	for(int i = 0; i < names.GetCount(); i++) {
+		const char *p = names[i], *e = p;
+		while(*e && !(e[0] == ':' && e[1] == ':'))
+			e++;
+		if(*e && e > p)
+			mods.FindAdd(String(p, e));
+	}
+	Vector<String> mlist = mods.PickKeys();
+	Sort(mlist, GetLanguageInfo());
+	aux_icons.module.Clear();
+	aux_icons.module.Add(Null, "(v�echny)");
+	for(int i = 0; i < mlist.GetCount(); i++)
+		aux_icons.module.Add(mlist[i], mlist[i]);
+}
+
+void DlgHelpEditor::UpdateIconGallery()
+{
+	aux_icons.gallery.Clear();
+	aux_icons.gallery.Enable(aux_icons.module.IsCursor());
+	Size limit_size(aux_icons.gallery.GetIconWidth(), aux_icons.gallery.GetItemHeight());
+	if(aux_icons.module.IsCursor()) {
+		String module = aux_icons.module.Get(0);
+		int ml = module.GetLength();
+		const VectorMap<String, Image>& icons = ImageCache::Get().GetNameMap();
+		Vector<String> out;
+		Vector<Image> outicon;
+		for(int i = 0; i < icons.GetCount(); i++) {
+			String n = icons.GetKey(i);
+			if(ml) {
+				if(memcmp(n, module, ml) || n[ml] != ':' || n[ml + 1] != ':')
+					continue;
+				n.Remove(0, ml + 2);
+			}
+			out.Add(n);
+			Image out_image = icons[i];
+
+			if(out_image.GetHeight() > limit_size.cx || out_image.GetWidth() > limit_size.cy) {
+				Size outsize = GetFitSize(out_image.GetSize(), limit_size);
+				AlphaArray array = ImageToAlphaArray(out_image);
+				AlphaArray out(outsize, -3);
+				PixelCopyAntiAliasMaskOut(out, outsize, array, array.GetSize(), false);
+				out_image = AlphaArrayToImage(out);
+			}
+			outicon.Add(out_image);
+		}
+		IndexSort(out, outicon, GetLanguageInfo());
+		for(int i = 0; i < out.GetCount(); i++) {
+			aux_icons.gallery.Add(out[i], outicon[i]);
+		}
+	}
+}
+
+void DlgHelpEditor::OnPasteIcon()
+{
+	if(!aux_icons.Accept())
+		return;
+	if(!aux_icons.module.IsCursor() || !aux_icons.gallery.IsCursor()) {
+		BeepExclamation();
+		return;
+	}
+	String module = aux_icons.module.Get(0);
+	if(!IsNull(module))
+		module.Cat("::");
+	module.Cat(aux_icons.gallery.GetCurrentName());
+	Image img = ImageCache::Get().GetNameMap().Get(module, Null);
+	if(IsNull(img)) {
+		BeepExclamation();
+		return;
+	}
+	const ColorF *border = NULL;
+	switch((int)~aux_icons.frame) {
+		case IFRM_BUTTON: border = ButtonBorder(); break;
+		case IFRM_INSET:  border = InsetBorder(); break;
+	}
+	int width = (border ? (int)*border + 2 : 0);
+	Size outsize = img.GetSize() + 2 * width;
+	Image outimg(outsize);
+	ImageDraw idraw(outimg);
+	idraw.DrawRect(outsize, width ? SLtGray() : White());
+	DrawBorder(idraw, outsize, border);
+	idraw.DrawImage(width, width, img, aux_icons.etched ? Image::ETCHED : aux_icons.grayed ? Image::GRAYED : 0);
+	idraw.Close();
+	Size dot_size = PixelsToDots(ScreenInfo(), outimg.GetSize());
+	RichObject object("PNG", PngEncoder().DotSize(dot_size).SaveImage(outimg));
+	object.SetSize(object.GetPhysicalSize() * (int)~aux_icons.size / 100);
+	object.KeepRatio(true);
+	object.SetYDelta(fround((double)~aux_icons.raise * (-600.0 / 72.0)));
+	//CreateDrawingObject(dwg, dot_size);
+	if(last_edit->text.IsSelection())
+		last_edit->text.RemoveSelection();
+	RichPara rpara;
+	rpara.Cat(object, last_edit->text.GetFormatInfo());
+	RichText rtext;
+	rtext.Cat(rpara);
+	last_edit->text.PasteText(rtext);
+//	BeepInformation();
+	ActiveFocus(last_edit->text);
+}
+
+#endif
diff --git a/uppsrc/TCtrlLib/Help/DlgHelp.hpp b/uppsrc/TCtrlLib/Help/DlgHelp.hpp
new file mode 100644
index 000000000..e69de29bb
diff --git a/uppsrc/TCtrlLib/Help/DlgHelp.lay b/uppsrc/TCtrlLib/Help/DlgHelp.lay
new file mode 100644
index 000000000..86c5a9911
--- /dev/null
+++ b/uppsrc/TCtrlLib/Help/DlgHelp.lay
@@ -0,0 +1,111 @@
+#ifdef LAYOUTFILE
+
+LAYOUT(HelpEditorEditLayout, 418, 380)
+	ITEM(DropList, language, LeftPosZ(0, 140).TopPosZ(0, 19))
+	ITEM(EditField, title, HSizePosZ(142, 0).TopPosZ(0, 19))
+	ITEM(RichEdit, text, HSizePosZ(0, 0).VSizePosZ(22, 0))
+END_LAYOUT
+
+LAYOUT(HelpEditorLinkLayout, 450, 430)
+	ITEM(Label, dv___0, SetLabel(t_("Topic:")).LeftPosZ(4, 36).TopPosZ(4, 19))
+	ITEM(EditField, mask, HSizePosZ(46, 4).TopPosZ(4, 19))
+	ITEM(ArrayCtrl, list, Header(false).AutoHideSb(true).HSizePosZ(4, 4).VSizePosZ(28, 214))
+	ITEM(Label, dv___3, SetLabel(t_("&Link text:")).LeftPosZ(4, 68).BottomPosZ(191, 19))
+	ITEM(EditField, text, HSizePosZ(76, 4).BottomPosZ(191, 19))
+	ITEM(Label, dv___5, SetLabel(t_("Link style:")).LeftPosZ(4, 68).BottomPosZ(169, 19))
+	ITEM(WithDropChoice<EditField>, style, HSizePosZ(76, 4).BottomPosZ(169, 19))
+	ITEM(LabelBox, dv___7, SetLabel(t_("Preview (hypertext)")).HSizePosZ(4, 4).BottomPosZ(100, 66))
+	ITEM(RichTextView, dyna_preview, HSizePosZ(10, 10).BottomPosZ(106, 46))
+	ITEM(LabelBox, dv___9, SetLabel(t_("Preview (printable text)")).HSizePosZ(4, 4).BottomPosZ(35, 66))
+	ITEM(RichTextView, book_preview, HSizePosZ(10, 10).BottomPosZ(41, 46))
+	ITEM(Button, ok, SetLabel(t_("OK")).RightPosZ(88, 80).BottomPosZ(4, 22))
+	ITEM(Button, cancel, SetLabel(t_("Cancel")).RightPosZ(4, 80).BottomPosZ(4, 22))
+END_LAYOUT
+
+LAYOUT(HelpEditorSectionLayout, 584, 206)
+	ITEM(Option, columns_opt, SetLabel(t_("&Columns:")).LeftPosZ(4, 106).TopPosZ(6, 19))
+	ITEM(Switch, columns, SetLabel(t_("&1\n&2\n&3\n&4\n&5")).LeftPosZ(112, 172).TopPosZ(8, 16))
+	ITEM(Option, column_space_opt, SetLabel(t_("Column spacing:")).LeftPosZ(4, 106).TopPosZ(26, 19))
+	ITEM(EditIntSpin, column_space, NotNull(true).LeftPosZ(112, 60).TopPosZ(26, 19))
+	ITEM(Option, firstpage_opt, SetLabel(t_("&First page:")).LeftPosZ(4, 106).TopPosZ(46, 19))
+	ITEM(EditIntSpin, firstpage, NotNull(true).LeftPosZ(112, 60).TopPosZ(46, 19))
+	ITEM(LabelBox, dv___6, SetLabel(t_("Margins")).LeftPosZ(298, 282).TopPosZ(1, 62))
+	ITEM(Option, margin_left_opt, SetLabel(t_("Left:")).LeftPosZ(304, 66).TopPosZ(16, 19))
+	ITEM(EditIntSpin, margin_left, NotNull(true).LeftPosZ(372, 60).TopPosZ(16, 19))
+	ITEM(Option, margin_top_opt, SetLabel(t_("Top:")).LeftPosZ(304, 66).TopPosZ(37, 19))
+	ITEM(EditIntSpin, margin_top, NotNull(true).LeftPosZ(372, 60).TopPosZ(37, 19))
+	ITEM(Option, margin_right_opt, SetLabel(t_("Right:")).LeftPosZ(446, 66).TopPosZ(16, 19))
+	ITEM(EditIntSpin, margin_right, NotNull(true).LeftPosZ(514, 60).TopPosZ(16, 19))
+	ITEM(Option, margin_bottom_opt, SetLabel(t_("Bottom:")).LeftPosZ(446, 66).TopPosZ(37, 19))
+	ITEM(EditIntSpin, margin_bottom, NotNull(true).LeftPosZ(514, 60).TopPosZ(37, 19))
+	ITEM(LabelBox, dv___15, SetLabel(t_("Header")).LeftPosZ(4, 282).TopPosZ(72, 100))
+	ITEM(Option, header_space_opt, SetLabel(t_("Spacing:")).LeftPosZ(10, 66).TopPosZ(86, 19))
+	ITEM(EditIntSpin, header_space, NotNull(true).LeftPosZ(78, 60).TopPosZ(86, 19))
+	UNTYPED(header_opt[0], LeftPosZ(10, 66).TopPosZ(106, 19))
+	UNTYPED(header[0], LeftPosZ(78, 202).TopPosZ(106, 19))
+	UNTYPED(header_opt[1], LeftPosZ(10, 66).TopPosZ(126, 19))
+	UNTYPED(header[1], LeftPosZ(78, 202).TopPosZ(126, 19))
+	UNTYPED(header_opt[2], LeftPosZ(10, 66).TopPosZ(146, 19))
+	UNTYPED(header[2], LeftPosZ(78, 202).TopPosZ(146, 19))
+	ITEM(LabelBox, dv___24, SetLabel(t_("Footer")).LeftPosZ(298, 282).TopPosZ(72, 100))
+	ITEM(Option, footer_space_opt, SetLabel(t_("Spacing:")).LeftPosZ(304, 66).TopPosZ(86, 19))
+	ITEM(EditIntSpin, footer_space, NotNull(true).LeftPosZ(372, 60).TopPosZ(86, 19))
+	UNTYPED(footer_opt[0], LeftPosZ(304, 66).TopPosZ(106, 19))
+	UNTYPED(footer[0], LeftPosZ(372, 202).TopPosZ(106, 19))
+	UNTYPED(footer_opt[1], LeftPosZ(304, 66).TopPosZ(126, 19))
+	UNTYPED(footer[1], LeftPosZ(372, 202).TopPosZ(126, 19))
+	UNTYPED(footer_opt[2], LeftPosZ(304, 66).TopPosZ(146, 19))
+	UNTYPED(footer[2], LeftPosZ(372, 202).TopPosZ(146, 19))
+	ITEM(Option, nested, SetLabel(t_("&Nested section")).LeftPosZ(5, 133).BottomPosZ(8, 15))
+	ITEM(Button, ok, SetLabel(t_("OK")).RightPosZ(88, 80).BottomPosZ(4, 22))
+	ITEM(Button, cancel, SetLabel(t_("Cancel")).RightPosZ(4, 80).BottomPosZ(4, 22))
+END_LAYOUT
+
+LAYOUT(HelpEditorGotoLayout, 500, 330)
+	ITEM(Label, dv___0, SetLabel(t_("Topic:")).LeftPosZ(4, 40).TopPosZ(4, 19))
+	ITEM(EditField, mask, HSizePosZ(46, 4).TopPosZ(4, 19))
+	ITEM(ArrayCtrl, list, Header(false).AutoHideSb(true).HSizePosZ(4, 4).VSizePosZ(28, 36))
+	ITEM(Button, ok, SetLabel(t_("OK")).RightPosZ(88, 80).BottomPosZ(4, 22))
+	ITEM(Button, cancel, SetLabel(t_("Cancel")).RightPosZ(4, 80).BottomPosZ(4, 22))
+END_LAYOUT
+
+LAYOUT(HelpEditorExportProjectLayout, 600, 270)
+	ITEM(ArrayCtrl, list, AutoHideSb(true).HSizePosZ(4, 4).VSizePosZ(4, 32))
+	ITEM(Button, ok, SetLabel(t_("OK")).RightPosZ(88, 80).BottomPosZ(4, 22))
+	ITEM(Button, cancel, SetLabel(t_("Cancel")).RightPosZ(4, 80).BottomPosZ(4, 22))
+END_LAYOUT
+
+LAYOUT(HelpEditorIconLayout, 600, 200)
+	ITEM(ArrayCtrl, module, HorzGrid(false).VertGrid(false).Header(false).AutoHideSb(true).LeftPosZ(4, 164).VSizePosZ(4, 24))
+	ITEM(FileList, gallery, HSizePosZ(170, 4).VSizePosZ(4, 26))
+	ITEM(Label, dv___2, SetLabel(t_("Frame:")).LeftPosZ(4, 38).BottomPosZ(8, 14))
+	ITEM(Switch, frame, SetLabel(t_("None\nButton\nInset")).LeftPosZ(46, 158).BottomPosZ(8, 14))
+	ITEM(Option, grayed, SetLabel(t_("Grayed")).LeftPosZ(206, 60).BottomPosZ(7, 15))
+	ITEM(Option, etched, SetLabel(t_("Etched")).LeftPosZ(272, 62).BottomPosZ(7, 15))
+	ITEM(Label, dv___6, SetLabel(t_("Size (%):")).LeftPosZ(378, 44).BottomPosZ(5, 19))
+	ITEM(EditIntSpin, size, Min(10).Max(400).NotNull(true).LeftPosZ(426, 60).BottomPosZ(5, 19))
+	ITEM(Label, dv___8, SetLabel(t_("Raise (pt):")).LeftPosZ(492, 52).BottomPosZ(5, 19))
+	ITEM(EditDoubleSpin, raise, SetInc(0.5).Min(-20).Max(20).NotNull(true).LeftPosZ(546, 50).BottomPosZ(5, 19))
+END_LAYOUT
+
+LAYOUT(HelpEditorSavedFilesLayout, 300, 300)
+	ITEM(Label, dv___0, SetLabel(t_("&Updated files:")).LeftPosZ(4, 112).TopPosZ(4, 19))
+	ITEM(Label, count, LeftPosZ(118, 76).TopPosZ(4, 19))
+	ITEM(ArrayCtrl, list, HorzGrid(false).VertGrid(false).Header(false).AutoHideSb(true).HSizePosZ(4, 4).VSizePosZ(24, 32))
+	ITEM(Button, exit, SetLabel(t_("Close")).RightPosZ(4, 80).BottomPosZ(4, 22))
+END_LAYOUT
+
+LAYOUT(HelpEditorNewTopicLayout, 376, 126)
+	ITEM(Label, dv___0, SetLabel(t_("&Category:")).LeftPosZ(4, 64).TopPosZ(4, 19))
+	ITEM(DropList, dpp_space, HSizePosZ(72, 4).TopPosZ(4, 19))
+	ITEM(Label, dv___2, SetLabel(t_("C&ontext:")).LeftPosZ(5, 63).TopPosZ(26, 19))
+	ITEM(DropList, dpp_nesting, HSizePosZ(72, 4).TopPosZ(26, 19))
+	ITEM(Label, dv___4, SetLabel(t_("&Topic:")).LeftPosZ(4, 64).TopPosZ(48, 19))
+	ITEM(WithDropChoice<EditString>, dpp_topic, NotNull(true).HSizePosZ(72, 4).TopPosZ(48, 19))
+	ITEM(Label, dv___6, SetLabel(t_("&Folder:")).LeftPosZ(4, 64).TopPosZ(70, 19))
+	ITEM(WithDropChoice<EditField>, folder, HSizePosZ(72, 4).TopPosZ(70, 19))
+	ITEM(Button, ok, SetLabel(t_("OK")).RightPosZ(88, 80).BottomPosZ(4, 22))
+	ITEM(Button, cancel, SetLabel(t_("Cancel")).RightPosZ(4, 80).BottomPosZ(4, 22))
+END_LAYOUT
+
+#endif
diff --git a/uppsrc/TCtrlLib/Help/DlgHelp.lng b/uppsrc/TCtrlLib/Help/DlgHelp.lng
new file mode 100644
index 000000000..440c1875a
--- /dev/null
+++ b/uppsrc/TCtrlLib/Help/DlgHelp.lng
@@ -0,0 +1,216 @@
+#if LANGUAGE == LNGC_('C', 'S', 'C', 'Z', 15)
+
+// (unused)
+
+txt(DlgHelpEditorFileOpenHxxFilter, "Soubory n�pov�dy (*.hxx)")
+txt(DlgHelpEditorSystemExportProjectCountFilesInfo, "%d "
+	"zm�n�n%1:[100%1:�;2,3,4:�;�ch]s soubor%1:[100%1:;2,3,4:y;�]s n�pov�dy "
+	"byl%1:[100%1:;2,3,4:y;o]s korektn� exportov�n%1:[100%1:;2,3,4:y;o]s do "
+	"projektu.")
+txt(DlgHelpEditorSystemExportProjectOldFileNotFoundError, "Soubor [* "
+	"\1%s\1] nebyl nalezen.")
+txt(DlgHelpEditorSystemExportProjectProgress, "P�ipravuji export")
+txt(DlgHelpEditorToolEditShowMaster, "Sn�mky")
+txt(DlgHelpEditorFileOpenError, "[* \1%s\1]: \1%s")
+txt(DlgHelpEditorFileSaveFileSelTitle, "Ulo�it jako")
+txt(LoadAppHelpFileError, "Chyba p�i na��t�n� souboru n�pov�dy [* "
+	"\1%s\1]: \1%s")
+txt(HelpStyleHelpTitle, "Seznam pou�it�ch styl� odstavc�")
+txt(DlgHelpEditorFileOpenHxxMask, "*.hxx")
+txt(DlgHelpEditorFileOpenCreateColumn, "Vytvo�it")
+txt(DlgHelpEditorFileOpenTopicColumn, "T�ma")
+txt(DlgHelpEditorToolEditShowMasterHelp, "Zobrazit /skr�t sn�mky "
+	"aktivn�ho dialogu pod editorem t�matu")
+
+// DlgHelp.cpp
+
+txt(DlgHelpEditorLinkHelpTitle, "Odkaz na t�ma")
+txt(DlgHelpEditorEditGotoCode, "K�d")
+txt(DlgHelpEditorEditGotoTopic, "N�zev t�matu")
+txt(DlgHelpEditorNewTopicHelpTitle, "Nov� t�ma n�pov�dy")
+txt(DlgHelpEditorHelpTitle, "Editor aplika�n� dokumentace")
+txt(DlgHelpEditorTopicListTopicColumn, "T�ma")
+txt(DlgHelpEditorTopicListParaColumn, "Odst")
+txt(DlgHelpEditorTopicListIndexColumn, "Index")
+txt(DlgHelpEditorTabScreenshot, "Sn�mek")
+txt(DlgHelpEditorTabText, "Text")
+txt(DlgHelpEditorTabIcons, "Ikony")
+txt(DlgHelpEditorDPPNamespaceTag, "Kategorie: ")
+txt(DlgHelpEditorDPPNestingTag, "Kontext: ")
+txt(DlgHelpEditorDPPNamespaceAll, "(v�echno)")
+txt(DlgHelpEditorToolFile, "Soubor")
+txt(DlgHelpEditorToolFileHelp, "Pr�ce se zdrojov�mi soubory n�pov�dy")
+txt(DlgHelpEditorToolEdit, "Edit")
+txt(DlgHelpEditorToolEditHelp, "Editace t�mat n�pov�dy")
+txt(DlgHelpEditorToolSystem, "Syst�m")
+txt(DlgHelpEditorToolSystemHelp, "Syst�mov� n�stroje")
+txt(DlgHelpEditorToolFileOpen, "Otev��t")
+txt(DlgHelpEditorToolFileOpenHelp, "Na��st n�pov�du ze zadan�ho "
+	"souboru")
+txt(DlgHelpEditorMissingTopicsHelpTitle, "Soubor obsahuje nezn�m� "
+	"t�mata")
+txt(DlgHelpEditorFileOpenFileSelTitle, "Otev��t")
+txt(DlgHelpEditorFileOpenLoadError, "chyba p�i na��t�n� souboru")
+txt(DlgHelpEditorToolFileSave, "Ulo�it")
+txt(DlgHelpEditorToolFileSaveHelp, "Ulo�it t�mata n�pov�dy do "
+	"spole�n�ho aplika�n�ho souboru")
+txt(DlgHelpEditorFileSaveWriteError, "Chyba p�i z�pisu n�pov�dy do "
+	"slo�ky [* \1%s\1].")
+txt(DlgHelpEditorToolFileSaveAs, "Ulo�it jako")
+txt(DlgHelpEditorToolFileSaveAsHelp, "Ulo�it t�mata n�pov�dy do "
+	"spole�n�ho souboru se zadan�m n�zvem")
+txt(DlgHelpEditorToolFileTopicIndex, "Obsah, rejst��k")
+txt(DlgHelpEditorToolFileTopicIndexHelp, "Zobrazit obsah a rejst��k "
+	"n�pov�dy")
+txt(DlgHelpEditorToolFileClose, "Zav��t")
+txt(DlgHelpEditorToolFileCloseHelp, "Zav��t okno editoru dokumentace")
+txt(DlgHelpEditorPromptSave, "Chcete ulo�it proveden� zm�ny v "
+	"dokumentaci?")
+txt(DlgHelpEditorToolEditUp, "P�edchoz� t�ma")
+txt(DlgHelpEditorToolEditUpHelp, "P�ej�t na p�edchoz� t�ma n�pov�dy v "
+	"seznamu")
+txt(DlgHelpEditorToolEditDown, "Dal�� t�ma")
+txt(DlgHelpEditorToolEditDownHelp, "P�ej�t na dal�� t�ma n�pov�dy v "
+	"seznamu")
+txt(DlgHelpEditorToolEditGoto, "P�ej�t na...")
+txt(DlgHelpEditorToolEditGotoHelp, "Vyhledat t�ma n�pov�dy podle "
+	"po��te�n�ch p�smen nebo masky (*, ?)")
+txt(DlgHelpEditorGotoHelpTitle, "P�ej�t na t�ma")
+txt(DlgHelpEditorToolEditFormula, "V�raz")
+txt(DlgHelpEditorToolEditFormulaHelp, "Otev��t editor matematick�ch "
+	"v�raz�")
+txt(DlgHelpEditorToolSystemExport, "Export")
+txt(DlgHelpEditorToolSystemExportHelp, "Exportovat t�mata n�pov�dy do "
+	"soubor� po jednotliv�ch modulech")
+txt(DlgHelpEditorSystemExportDirSelTitle, "C�lov� slo�ka")
+txt(DlgHelpEditorSystemExportProgress, "Exportuji zm�n�n� soubory...")
+txt(DlgHelpEditorSystemExportSaveError, "Chyba p�i exportu slo�ky [* "
+	"\1%s\1]: [* \1%s\1]. Pokra�ovat?")
+txt(DlgHelpEditorSystemExportAbort, "Export byl stornov�n.")
+txt(DlgHelpEditorSystemExportCountInfo, "%d zm�n�n�ch soubor� "
+	"n�pov�dy bylo korektn� exportov�no do slo�ky [* \1%s\1].")
+txt(DlgHelpEditorSystemExportProject, "Export do projektu")
+txt(DlgHelpEditorSystemExportProjectHelp, "Exportovat t�mata n�pov�dy "
+	"do zdrojov�ch modul� aplikace")
+txt(DlgHelpEditorProjectExportHelpTitle, "Export n�pov�dy do projektu")
+txt(DlgHelpEditorSystemExportNoFilesError, "Nebyly nalezeny ��dn� "
+	"soubory n�pov�dy.")
+txt(DlgHelpEditorSystemExportProjectFileColumn, "Slo�ka")
+txt(DlgHelpEditorSystemExportProjectLengthColumn, "D�lka")
+txt(DlgHelpEditorSystemExportProjectNewColumn, "Nov�")
+txt(DlgHelpEditorSystemExportProjectOverwriteColumn, "P�epsat")
+txt(DlgHelpEditorSystemExportProjectAbort, "Export dat byl p�eru�en "
+	"u�ivatelem.")
+txt(DlgHelpEditorSystemExportProjectProgressExport, "Exportuji "
+	"zm�n�n� soubory")
+txt(DlgHelpEditorSystemExportProjectNoFilesInfo, "Nebyly ulo�eny "
+	"��dn� soubory n�pov�dy.")
+txt(DlgHelpEditorTopicAppTitle, "%s: %s - editor dokumentace")
+txt(DlgHelpEditorDefaultAppTitle, "Editor dokumentace")
+txt(DlgHelpEditorDPPNestingAll, "(v�echno)")
+
+#elif LANGUAGE == LNG_('E', 'N', 'U', 'S')
+
+// (unused)
+
+txt(DlgHelpEditorFileOpenHxxFilter, "Help files (*.hxx)")
+txt(DlgHelpEditorSystemExportProjectCountFilesInfo, "%d changed "
+	"file%1:[1:;s]s w%1:[1:as;ere]s exported into project source file "
+	"folders.")
+txt(DlgHelpEditorSystemExportProjectOldFileNotFoundError, "File [* "
+	"\1%s\1] not found.")
+txt(DlgHelpEditorSystemExportProjectProgress, "Preparing export")
+txt(DlgHelpEditorToolEditShowMaster, "Screenshot")
+txt(DlgHelpEditorFileOpenError, "[* \1%s\1]: \1%s")
+txt(DlgHelpEditorFileSaveFileSelTitle, "Save as")
+txt(LoadAppHelpFileError, "Error reading help file [* \1%s\1]: \1%s")
+txt(HelpStyleHelpTitle, "Paragraph styles for the documentation")
+txt(DlgHelpEditorFileOpenHxxMask, "*.hxx")
+txt(DlgHelpEditorFileOpenCreateColumn, "Create")
+txt(DlgHelpEditorFileOpenTopicColumn, "Topic")
+txt(DlgHelpEditorToolEditShowMasterHelp, "Show / hide active dialog "
+	"screenshot below theme editor")
+
+// DlgHelp.cpp
+
+txt(DlgHelpEditorLinkHelpTitle, "Link to topic")
+txt(DlgHelpEditorEditGotoCode, "Code")
+txt(DlgHelpEditorEditGotoTopic, "Topic name")
+txt(DlgHelpEditorNewTopicHelpTitle, "New help topic")
+txt(DlgHelpEditorHelpTitle, "Application documentation editor")
+txt(DlgHelpEditorTopicListTopicColumn, "Topic")
+txt(DlgHelpEditorTopicListParaColumn, "Para")
+txt(DlgHelpEditorTopicListIndexColumn, "Index")
+txt(DlgHelpEditorTabScreenshot, "Screenshot")
+txt(DlgHelpEditorTabText, "Text")
+txt(DlgHelpEditorTabIcons, "Icons")
+txt(DlgHelpEditorDPPNamespaceTag, "Namespace: ")
+txt(DlgHelpEditorDPPNestingTag, "Nesting: ")
+txt(DlgHelpEditorDPPNamespaceAll, "(all)")
+txt(DlgHelpEditorToolFile, "File")
+txt(DlgHelpEditorToolFileHelp, "Help files maintenance")
+txt(DlgHelpEditorToolEdit, "Edit")
+txt(DlgHelpEditorToolEditHelp, "Edit theme topics")
+txt(DlgHelpEditorToolSystem, "System")
+txt(DlgHelpEditorToolSystemHelp, "System tools")
+txt(DlgHelpEditorToolFileOpen, "Open")
+txt(DlgHelpEditorToolFileOpenHelp, "Read help files from a given disk "
+	"file")
+txt(DlgHelpEditorMissingTopicsHelpTitle, "File contains unknown "
+	"topics")
+txt(DlgHelpEditorFileOpenFileSelTitle, "Open")
+txt(DlgHelpEditorFileOpenLoadError, "error loading file")
+txt(DlgHelpEditorToolFileSave, "Save")
+txt(DlgHelpEditorToolFileSaveHelp, "Save help topics into a common "
+	"application file")
+txt(DlgHelpEditorFileSaveWriteError, "Error writing help into folder "
+	"[* \1%s\1].")
+txt(DlgHelpEditorToolFileSaveAs, "Save as ")
+txt(DlgHelpEditorToolFileSaveAsHelp, "Save all changed help topics "
+	"into given file")
+txt(DlgHelpEditorToolFileTopicIndex, "Contents, index")
+txt(DlgHelpEditorToolFileTopicIndexHelp, "Show help contents and "
+	"search index")
+txt(DlgHelpEditorToolFileClose, "Close")
+txt(DlgHelpEditorToolFileCloseHelp, "Close documentation editor")
+txt(DlgHelpEditorPromptSave, "Do you want to save changes to the "
+	"documentation?")
+txt(DlgHelpEditorToolEditUp, "Previous theme")
+txt(DlgHelpEditorToolEditUpHelp, "Go up one theme in the list")
+txt(DlgHelpEditorToolEditDown, "Next topic")
+txt(DlgHelpEditorToolEditDownHelp, "Go down one topic in the list")
+txt(DlgHelpEditorToolEditGoto, "Go to...")
+txt(DlgHelpEditorToolEditGotoHelp, "Locate help topic using initial "
+	"letters or wildcard mask (*, ?)")
+txt(DlgHelpEditorGotoHelpTitle, "Go to topic")
+txt(DlgHelpEditorToolEditFormula, "Formula")
+txt(DlgHelpEditorToolEditFormulaHelp, "Open formula editor")
+txt(DlgHelpEditorToolSystemExport, "Export")
+txt(DlgHelpEditorToolSystemExportHelp, "Export changed help files by "
+	"application modules")
+txt(DlgHelpEditorSystemExportDirSelTitle, "Destination folder")
+txt(DlgHelpEditorSystemExportProgress, "Exporting changed files...")
+txt(DlgHelpEditorSystemExportSaveError, "Error exporting folder [* "
+	"\1%s\1]: [* \1%s\1]. Continue?")
+txt(DlgHelpEditorSystemExportAbort, "Export aborted.")
+txt(DlgHelpEditorSystemExportCountInfo, "%s changed help files were "
+	"saved into the [* \1%s\1] folder.")
+txt(DlgHelpEditorSystemExportProject, "Export into project")
+txt(DlgHelpEditorSystemExportProjectHelp, "Export help topics into "
+	"the application source code")
+txt(DlgHelpEditorProjectExportHelpTitle, "Export help into project")
+txt(DlgHelpEditorSystemExportNoFilesError, "No help files found.")
+txt(DlgHelpEditorSystemExportProjectFileColumn, "Folder")
+txt(DlgHelpEditorSystemExportProjectLengthColumn, "Length")
+txt(DlgHelpEditorSystemExportProjectNewColumn, "New")
+txt(DlgHelpEditorSystemExportProjectOverwriteColumn, "Overwrite")
+txt(DlgHelpEditorSystemExportProjectAbort, "Export aborted by user.")
+txt(DlgHelpEditorSystemExportProjectProgressExport, "Exporting "
+	"changed files")
+txt(DlgHelpEditorSystemExportProjectNoFilesInfo, "No help files were "
+	"saved.")
+txt(DlgHelpEditorTopicAppTitle, "%s: %s - documentation editor")
+txt(DlgHelpEditorDefaultAppTitle, "Documentation editor")
+txt(DlgHelpEditorDPPNestingAll, "(all)")
+
+#endif
diff --git a/uppsrc/TCtrlLib/Help/DlgHelpEdit.cpp b/uppsrc/TCtrlLib/Help/DlgHelpEdit.cpp
new file mode 100644
index 000000000..babbd0d0f
--- /dev/null
+++ b/uppsrc/TCtrlLib/Help/DlgHelpEdit.cpp
@@ -0,0 +1,1245 @@
+#if 0
+
+#include          "TCtrlLibHelp.h"
+#pragma hdrstop
+
+#define LAYOUTFILE <TCtrlLib/Help/DlgHelpEdit.lay>
+#include <CtrlCore/lay.h>
+
+class DlgHelpRename : public WithHelpRenameLayout<TopWindow>
+{
+public:
+	typedef DlgHelpRename CLASSNAME;
+	DlgHelpRename(const VectorMap<String, String>& mod_map);
+
+	bool Run(VectorMap<String, String>& key_map);
+
+private:
+	void Find(int start, bool rev);
+
+	TOOL(Existing)
+		TOOL(ExistingFind)
+		TOOL(ExistingFindPrev)
+		TOOL(ExistingFindNext)
+		TOOL(ExistingAssign)
+
+	TOOL(Aliased)
+		TOOL(AliasedRemove)
+
+private:
+	String                           find_text;
+	const VectorMap<String, String>& mod_map;
+};
+
+RegisterHelpTopicObjectTitle(DlgHelpRename, t_("Map changed identifiers"))
+
+DlgHelpRename::DlgHelpRename(const VectorMap<String, String>& mod_map)
+: mod_map(mod_map)
+{
+	CtrlLayoutOKCancel(*this, DlgHelpRenameHelpTitle());
+	HelpTopic("DlgHelpRename");
+	unmatched.AutoHideSb();
+	unmatched.AddColumn(t_("Loaded file"));
+	existing.AutoHideSb();
+	existing.AddColumn(t_("Identifier map"));
+	existing.WhenBar = THISBACK(ToolExisting);
+	aliased.AutoHideSb();
+	aliased.AddColumn(t_("Old"));
+	aliased.AddColumn(t_("Mapped"));
+	aliased.AddColumn(t_("Module"));
+	aliased.WhenBar = THISBACK(ToolAliased);
+}
+
+bool DlgHelpRename::Run(VectorMap<String, String>& key_map)
+{
+	Vector<String> lmap = key_map.PickKeys();
+	Sort(lmap, GetLanguageInfo());
+	Append(unmatched, lmap);
+	lmap <<= mod_map.GetKeys();
+	Sort(lmap, GetLanguageInfo());
+	Append(existing, lmap);
+	if(TopWindow::Run() != IDOK)
+		return false;
+	key_map.Clear();
+	for(int i = 0; i < aliased.GetCount(); i++)
+		key_map.Add(aliased.Get(i, 0), aliased.Get(i, 1));
+	return true;
+}
+
+void DlgHelpRename::ToolExisting(Bar& bar)
+{
+	bar.Add(unmatched.IsCursor() && existing.IsCursor(), t_("Map"), THISBACK(OnExistingAssign))
+		.Key(K_INSERT);
+	bar.Add(t_("Find"), THISBACK(OnExistingFind))
+		.Key(K_CTRL_F);
+	bar.Add(t_("Find next"), THISBACK(OnExistingFindNext))
+		.Key(K_F3);
+	bar.Add(t_("Find previous"), THISBACK(OnExistingFindPrev))
+		.Key(K_SHIFT_F3);
+}
+
+static bool IdentMatch(const char *mask, const char *name)
+{
+	for(;;)
+		switch(*mask++) {
+		case 0: return *name == 0;
+		case '*':
+			do
+				if(IdentMatch(mask, name))
+					return true;
+			while(*name++);
+			return false;
+		case '?':
+			if(*name++ == 0)
+				return false;
+			break;
+		default:
+			if(ToLower(mask[-1]) != ToLower(*name++))
+				return false;
+			break;
+		}
+}
+
+RegisterHelpTopicObjectTitle(DlgHelpRenameFind, t_("Find"))
+
+void DlgHelpRename::OnExistingFind()
+{
+	WithHelpRenameFindLayout<TopWindow> finddlg;
+	finddlg.find <<= find_text;
+	CtrlLayoutOKCancel(finddlg, DlgHelpRenameFindHelpTitle());
+	finddlg.HelpTopic("DlgHelpRenameFind");
+	if(finddlg.Run() == IDOK) {
+		find_text = ~finddlg.find;
+		Find(0, false);
+	}
+}
+
+void DlgHelpRename::OnExistingFindNext()
+{
+	Find(existing.GetCursor() + 1, false);
+}
+
+void DlgHelpRename::OnExistingFindPrev()
+{
+	Find(existing.GetCursor() - 1, true);
+}
+
+void DlgHelpRename::Find(int start, bool rev)
+{
+	String ft = "*" + find_text + "*";
+	for(int i = start; i >= 0 && i < existing.GetCount(); i += (rev ? -1 : 1))
+		if(IdentMatch(ft, String(existing.Get(i, 0)))) {
+			existing.SetCursor(i);
+			return;
+		}
+	BeepExclamation();
+}
+
+void DlgHelpRename::OnExistingAssign()
+{
+	int u = unmatched.GetCursor(), e = existing.GetCursor();
+	if(u >= 0 && e >= 0) {
+		int a = aliased.GetCount();
+		String ex = existing.Get(0);
+		aliased.Add(unmatched.Get(0), ex, mod_map.Get(ex, Null));
+		aliased.SetCursor(a);
+		unmatched.Remove(u);
+		existing.Remove(e);
+		if(u > 1)
+			unmatched.SetCursor(u < unmatched.GetCount() ? u : u - 1);
+		if(e > 1)
+			existing.SetCursor(e < existing.GetCount() ? e : e - 1);
+
+	}
+}
+
+void DlgHelpRename::ToolAliased(Bar& bar)
+{
+	bar.Add(t_("Remove alias"), THISBACK(OnAliasedRemove))
+		.Key(K_DELETE);
+}
+
+void DlgHelpRename::OnAliasedRemove()
+{
+	int a = aliased.GetCursor();
+	if(a >= 0) {
+		unmatched.Add(aliased.Get(0));
+		existing.Add(aliased.Get(1));
+		aliased.Remove(a);
+		if(a > 1)
+			aliased.SetCursor(a < aliased.GetCount() ? a : a - 1);
+		unmatched.SetCursor(unmatched.GetCount() - 1);
+		existing.SetCursor(existing.GetCount() - 1);
+	}
+}
+
+//////////////////////////////////////////////////////////////////////
+// DlgHelpLang::
+
+class DlgHelpLang : public WithHelpLangLayout<TopWindow>
+{
+public:
+	typedef DlgHelpLang CLASSNAME;
+	DlgHelpLang();
+
+	bool Run(VectorMap<int, String>& ext_lang, int& init_lang);
+
+private:
+	void OnExtLangEdit();
+	void OnLangFileBrowse();
+
+private:
+	DropList lang_edit;
+	EditField lang_file;
+	ExtendedButton lang_file_browse;
+};
+
+bool RunDlgHelpLang(VectorMap<int, String>& ext_lang, int& init_lang) { return DlgHelpLang().Run(ext_lang, init_lang); }
+
+RegisterHelpTopicObjectTitle(DlgHelpLang, t_("Application languages"))
+
+DlgHelpLang::DlgHelpLang()
+{
+	CtrlLayoutOKCancel(*this, DlgHelpLangHelpTitle());
+	HelpTopic("DlgHelpLang");
+
+	ext_lang.AutoHideSb();
+	ext_lang.AddColumn(t_("Language code"), 10).SetConvert(lang_edit).Edit(lang_edit);
+	ext_lang.AddColumn(t_("Language file"), 30).Edit(lang_file);
+	ext_lang.Inserting().Removing().NoAskRemove();
+	ext_lang.WhenArrayAction = THISBACK(OnExtLangEdit);
+
+	lang_file.AddFrame(lang_file_browse);
+	lang_file_browse <<= THISBACK(OnLangFileBrowse);
+
+	for(const int *p = GetAllLanguages(); *p; p++)
+		lang_edit.Add(*p, LNGAsText(*p));
+}
+
+bool DlgHelpLang::Run(VectorMap<int, String>& el, int& il)
+{
+	int i;
+	for(i = 0; i < el.GetCount(); i++)
+		ext_lang.Add(el.GetKey(i), el[i]);
+	OnExtLangEdit();
+	init_lang <<= il;
+	if(TopWindow::Run() != IDOK)
+		return false;
+	el.Clear();
+	for(i = 0; i < ext_lang.GetCount(); i++)
+		el.Add(ext_lang.Get(i, 0), ext_lang.Get(i, 1));
+	il = ~init_lang;
+	return true;
+}
+
+void DlgHelpLang::OnExtLangEdit()
+{
+	int oi = ~init_lang;
+	init_lang.Clear();
+	Index<int> app_lang = GetLanguages();
+	for(int i = 0; i < ext_lang.GetCount(); i++)
+		app_lang.FindAdd(ext_lang.Get(i, 0));
+	Index<int> lmask;
+	for(int i = 0; i < app_lang.GetCount(); i++) {
+		int l = app_lang[i], l0 = SetLNGCharset(l, CHARSET_DEFAULT);
+		if(lmask.Find(l0) < 0) {
+			lmask.Add(l0);
+			init_lang.Add(l, LNGAsText(l0));
+		}
+	}
+	init_lang <<= (init_lang.FindKey(oi) < 0 ? app_lang[0] : oi);
+}
+
+void DlgHelpLang::OnLangFileBrowse()
+{
+	FileSelector fsel;
+	fsel.Type(t_("Language files (*.lng)"), t_("*.lng"));
+	fsel.DefaultExt("lng");
+	fsel.AllFilesType();
+	fsel <<= String(~lang_file_browse);
+	if(fsel.ExecuteOpen(t_("Language file"))) {
+		lang_file_browse <<= ~fsel;
+		lang_file_browse.Action();
+	}
+}
+
+class DlgHelpDirty : public WithHelpDirtyLayout<TopWindow>
+{
+public:
+	typedef DlgHelpDirty CLASSNAME;
+	DlgHelpDirty();
+
+	bool                   Run(VectorMap<int, String>& files);
+
+private:
+	void                   OnAdd();
+	void                   OnAddAll();
+	void                   OnRemove();
+	void                   OnRemoveAll();
+	void                   OnBrowse();
+	void                   UpdateGUI();
+
+	bool                   DoAdd();
+	bool                   DoRemove();
+
+	bool                   BrowseFile(String& fn, int lang);
+
+private:
+	VectorMap<int, String> files;
+};
+
+bool RunDlgHelpDirty(VectorMap<int, String>& files) { return DlgHelpDirty().Run(files); }
+
+RegisterHelpTopicObjectTitle(DlgHelpDirty, t_("Save changes..."))
+
+DlgHelpDirty::DlgHelpDirty()
+{
+	CtrlLayoutOKCancel(*this, DlgHelpDirtyHelpTitle());
+	HelpTopic("DlgHelpDirty");
+
+	dirty_files.AutoHideSb();
+	dirty_files.AddIndex();
+	dirty_files.AddColumn("Jazyk");
+
+	dirty_files.AddKey(K_RIGHT, add <<= THISBACK(OnAdd));
+	dirty_files.AddKey(K_CTRL_RIGHT, add_all <<= THISBACK(OnAddAll));
+
+	save_files.AutoHideSb();
+	save_files.AddIndex();
+	save_files.AddColumn("Jazyk", 10);
+	save_files.AddColumn("Cesta", 40);
+	save_files.WhenLeftDouble = THISBACK(OnBrowse);
+
+	save_files.AddKey(K_LEFT, remove <<= THISBACK(OnRemove));
+	save_files.AddKey(K_CTRL_LEFT, remove_all <<= THISBACK(OnRemoveAll));
+}
+
+bool DlgHelpDirty::Run(VectorMap<int, String>& f)
+{
+	files = f;
+	int t;
+	for(t = 0; t < files.GetCount(); t++) {
+		int l = files.GetKey(t);
+		String ln = LNGAsText(l);
+		if(files[t].IsEmpty())
+			dirty_files.Add(l, ln);
+		else
+			save_files.Add(l, ln, files[t]);
+	}
+	dirty_files.SetCursor(0);
+	save_files.SetCursor(0);
+	ActiveFocus(dirty_files);
+
+	if(TopWindow::Run() != IDOK)
+		return false;
+	f.Clear();
+	for(t = 0; t < save_files.GetCount(); t++)
+		f.Add(save_files.Get(t, 0), save_files.Get(t, 2));
+	return true;
+}
+
+void DlgHelpDirty::UpdateGUI()
+{
+	add.Enable(dirty_files.IsCursor());
+	add_all.Enable(dirty_files.GetCount() > 0);
+	remove.Enable(save_files.IsCursor());
+	remove_all.Enable(save_files.GetCount() > 0);
+}
+
+void DlgHelpDirty::OnBrowse()
+{
+	if(!save_files.IsCursor())
+		return;
+	String fn = save_files.Get(2);
+	if(BrowseFile(fn, save_files.Get(0)))
+		save_files.Set(2, fn);
+}
+
+bool DlgHelpDirty::BrowseFile(String& fn, int lang)
+{
+	FileSelector fsel;
+	fsel.DefaultExt("lng");
+	fsel.Type("Jazykov� soubory (*.lng)", "*.lng");
+	fsel <<= fn;
+	if(!fsel.ExecuteSaveAs(NFormat("%s - ulo�it jako...", LNGAsText(lang))))
+		return false;
+	fn = ~fsel;
+	return true;
+}
+
+bool DlgHelpDirty::DoAdd()
+{
+	int dc = dirty_files.GetCursor();
+	if(dc < 0)
+		return false;
+	int l = dirty_files.Get(0);
+	String ln = LNGAsText(l);
+	String fn = files.Get(l);
+	if(fn.IsEmpty())
+		if(!BrowseFile(fn, l))
+			return false;
+	files.Get(l) = fn;
+	dirty_files.Remove(dc);
+	dirty_files.SetCursor(dc < dirty_files.GetCount() ? dc : dc - 1);
+	save_files.Add(l, ln, fn);
+	save_files.SetCursor(save_files.GetCount() - 1);
+	UpdateGUI();
+	return true;
+}
+
+bool DlgHelpDirty::DoRemove()
+{
+	int sc = save_files.GetCursor();
+	if(sc < 0)
+		return false;
+	int l = save_files.Get(0);
+	String ln = LNGAsText(l);
+	save_files.Remove(sc);
+	save_files.SetCursor(sc < save_files.GetCount() ? sc : sc - 1);
+	dirty_files.Add(l, ln);
+	dirty_files.SetCursor(dirty_files.GetCount() - 1);
+	UpdateGUI();
+	return true;
+}
+
+void DlgHelpDirty::OnAdd()
+{
+	DoAdd();
+}
+
+void DlgHelpDirty::OnAddAll()
+{
+	while(DoAdd())
+		;
+}
+
+void DlgHelpDirty::OnRemove()
+{
+	DoRemove();
+}
+
+void DlgHelpDirty::OnRemoveAll()
+{
+	while(DoRemove())
+		;
+}
+
+static String FromEdit(const String& s)
+{
+	String out;
+	for(const char *b = s, *p = b; *p; p++)
+		if(*p == '\r')
+			;
+		else if(*p != '\\')
+			out.Cat(*p);
+		else
+			switch(*++p) {
+			case 'a':  out << '\a'; break;
+			case 'b':  out << '\b'; break;
+			case 't':  out << '\t'; break;
+			case 'v':  out << '\v'; break;
+			case 'f':  out << '\f'; break;
+			case 'r':  out << '\r'; break;
+			case 'n':  out << '\n'; break;
+			case '\\': out << '\\'; break;
+			case '\"': out << '\"'; break;
+			case 'x': {
+					int c = ctoi(*++p);
+					if(c < 16) {
+						int c2 = ctoi(*++p);
+						if(c2 < 16) {
+							p++;
+							c = c * 16 + c2;
+						}
+						out.Cat((char)c);
+					}
+					p--;
+				}
+				break;
+
+			default:
+				if(*p >= '0' && *p <= '7') { // octal sequence
+					int c = *p - '0';
+					int c2 = *++p - '0';
+					if(c2 >= 0 && c2 < 8) {
+						c = c * 8 + c2;
+						c2 = *++p - '0';
+						if(c2 >= 0 && c2 < 8) {
+							c = c * 8 + c2;
+							p++;
+						}
+					}
+					out.Cat((char)c);
+					p--;
+				}
+				break;
+			}
+
+	return out;
+}
+
+static String ToEdit(const String& s)
+{
+	String out;
+	for(const char *p = s.Begin(), *e = s.End(); p < e;) {
+		const char *b = p;
+		while(p < e && (*p == '\n' || (byte)*p >= ' ' && *p != '\\' && *p != (char)127 && *p != (char)255))
+			p++;
+		out.Cat(b, p - b);
+		if(p < e)
+			switch(*p++) {
+			case '\a': out << "\\a"; break;
+			case '\b': out << "\\b"; break;
+			case '\t': out << "\\t"; break;
+//			case '\n':
+			case '\v': out << "\\v"; break;
+			case '\f': out << "\\f"; break;
+			case '\r': out << "\\r"; break;
+			case '\\': out << "\\\\"; break;
+			default:   out << "\\" << FormatIntOct((byte)p[-1], 3); break;
+			}
+	}
+	return out;
+}
+
+class DlgHelpEdit : public WithHelpEditLayout<TopWindow>
+{
+public:
+	typedef DlgHelpEdit CLASSNAME;
+	DlgHelpEdit();
+
+	void           Run();
+	virtual bool   HotKey(dword key);
+
+private:
+	void           UpdateLang();
+	void           UpdateModules(const String& mod);
+	void           UpdateTexts(const String& key);
+	void           UpdateStrings();
+	void           UpdateSrcText();
+	void           UpdateDestText();
+	void           UpdateTitle();
+
+	void           OnModules();
+	void           OnTexts();
+	void           OnSrcLang();
+	void           OnDestLang();
+	void           OnDestText();
+
+	void           OnNew();
+	void           OnSave();
+	void           OnLoad();
+	void           OnExit();
+	void           OnExport();
+
+	void           OnPrevDoubtfulText();
+	void           OnNextDoubtfulText();
+
+	String         GetModule() const;
+	String         GetText() const;
+	bool           IsValidLang(int sl, int dl) const { return !IsNull(sl) && !IsNull(dl) && sl != dl; }
+	int            GetTextState(const String& key, int sl, int dl) const;
+
+	void           WriteText(const String& key, int lang, const String& text);
+	String         ReadText(const String& key, int lang) const;
+	String         ReadLoadedText(const String& key, int lang) const;
+
+	bool           CheckDirty();
+
+private:
+	enum {
+		M_KEY,
+		M_NAME,
+		M_COUNT,
+		M_TRAN,
+		M_DIRTY,
+	};
+
+	enum {
+		T_KEY,
+		T_TRAN,
+		T_STATE,
+	};
+
+	class LangInfo {
+	public:
+		LangInfo() {}
+
+	public:
+		String                    filename;
+		VectorMap<String, String> loaded;
+		VectorMap<String, String> edited;
+	};
+
+	VectorMap<String, String> all_lang_keys;
+	VectorMap<String, Vector<String> > module_map;
+	Vector<String> file_map;
+	ArrayMap<int, LangInfo> languages;
+	String last_key;
+	int last_lang;
+	bool lock_dest;
+	FrameLeft<Button> new_lang;
+};
+
+void RunDlgHelpEdit() { DlgHelpEdit().Run(); }
+
+RegisterHelpTopicObjectTitle(DlgHelpEdit, "Editor jazyk�")
+
+DlgHelpEdit::DlgHelpEdit()
+{
+	last_lang = Null;
+	lock_dest = false;
+
+	CtrlLayoutCancel(*this, "");
+	Sizeable().MaximizeBox();
+
+	modules.AutoHideSb();
+	modules.AddIndex();
+	modules.AddColumn("Modul", 30);
+	modules.AddColumn("Po�et", 10);
+	modules.AddColumn("P�eklad", 10);
+	modules.WhenEnterRow = modules.WhenKillCursor = THISBACK(OnModules);
+
+	texts.AutoHideSb();
+	texts.AddColumn("K�d textu", 40);
+	texts.AddColumn("P�eklad", 10);
+	texts.AddIndex();
+	texts.WhenEnterRow = texts.WhenKillCursor = THISBACK(OnTexts);
+
+	src_text.SetReadOnly();
+
+	src_lang <<= THISBACK(OnSrcLang);
+	dest_lang <<= THISBACK(OnDestLang);
+	dest_lang.AddFrame(new_lang);
+	new_lang.SetImage(CtrlImg::plus());
+	new_lang <<= THISBACK(OnNew);
+
+	dest_text <<= THISBACK(OnDestText);
+
+	save <<= THISBACK(OnSave);
+	load <<= THISBACK(OnLoad);
+	cancel <<= WhenClose = THISBACK(OnExit);
+
+	Append(languages, GetLanguages());
+
+	Vector<String> lmod = GetLanguageModules();
+	Index<String> file_index;
+	Sort(lmod, GetLanguageInfo());
+	int i;
+	for(i = 0; i < lmod.GetCount(); i++) {
+		String mod = lmod[i];
+		String l = GetLanguageFile(mod);
+		const char *b = l.Begin(), *e = l.End();
+		if(*b == '\"' || *b == '<')
+			b++;
+		if(e > b && (e[-1] == '\"' || e[-1] == '>'))
+			e--;
+		String fn(b, e);
+		String ext = GetFileExt(fn);
+		if(!CompareNoCase(ext, ".lng")) {
+			file_index.Add(mod);
+			module_map.Add(GetFileTitle(fn));
+		}
+	}
+
+	VectorMap<String, String> rmap = GetLanguageMap();
+	all_lang_keys <<= rmap;
+	for(i = 0; i < rmap.GetCount(); i++) {
+		int p = file_index.Find(rmap[i]);
+		if(p >= 0)
+			module_map[p].Add(rmap.GetKey(i));
+	}
+	file_map = file_index.PickKeys();
+
+	UpdateLang();
+	if(languages.GetCount() >= 2)
+		dest_lang <<= languages.GetKey(1);
+}
+
+void DlgHelpEdit::Run()
+{
+	UpdateModules(Null);
+	TopWindow::Run();
+}
+
+void DlgHelpEdit::UpdateStrings()
+{
+	String mod = GetModule(), key = GetText();
+	UpdateModules(mod);
+	UpdateTexts(key);
+	UpdateSrcText();
+	UpdateDestText();
+}
+
+void DlgHelpEdit::UpdateModules(const String& mod)
+{
+	String mod_key = mod;
+	if(mod_key.IsEmpty() && modules.IsCursor())
+		mod_key = modules.Get(M_KEY);
+	int sc = modules.GetCursorSc();
+	modules.Clear();
+	modules.Add();
+	int total = 0, ttran = 0;
+	int sl = ~src_lang, dl = ~dest_lang;
+	bool vl = IsValidLang(sl, dl);
+	bool is_dirty = false;
+	const LangInfo *lmap = NULL;
+	if(vl)
+		lmap = &languages.Get(dl);
+	for(int i = 0; i < module_map.GetCount(); i++) {
+		String modkey = module_map.GetKey(i);
+		const Vector<String>& modkeys = module_map[i];
+		int ntran = 0;
+		bool mod_dirty = false;
+		for(int t = 0; t < modkeys.GetCount(); t++) {
+			String key = modkeys[t];
+			if(GetTextState(key, sl, dl) == 1)
+				ntran++;
+			if(lmap && lmap -> edited.Find(key) >= 0)
+				mod_dirty = true;
+		}
+		String sntran;
+		if(!modkeys.IsEmpty() && vl)
+			sntran << iscale(ntran, 100, modkeys.GetCount()) << '%';
+		String modname = modkey;
+		if(mod_dirty)
+			modname << " (*)";
+		modules.Add(modkey, modname, modkeys.GetCount(), sntran, mod_dirty);
+		total += modkeys.GetCount();
+		ttran += ntran;
+		if(mod_dirty)
+			is_dirty = true;
+	}
+	modules.Set(0, M_NAME, is_dirty ? "(v�echny) (*)" : "(v�echny)");
+	modules.Set(0, M_COUNT, total);
+	modules.Set(0, M_DIRTY, is_dirty);
+	if(total > 0 && vl)
+		modules.Set(0, M_TRAN, NFormat("%d%%", iscale(ttran, 100, total)));
+	modules.HeaderTab(0).SetText(NFormat("Moduly (%d)", module_map.GetCount()));
+	if(!modules.FindSetCursor(mod_key))
+		modules.SetCursor(0);
+	modules.ScCursor(sc);
+}
+
+int DlgHelpEdit::GetTextState(const String& key, int sl, int dl) const
+{
+	if(!IsValidLang(sl, dl) || key.IsEmpty())
+		return -1;
+	String stxt = ReadText(key, sl);
+	String dtxt = ReadText(key, dl);
+	if(dtxt.IsEmpty())
+		return 0;
+	else if(dtxt == stxt) {
+		for(const char *s = stxt; *s; s++)
+			if(IsLetter(*s))
+				return 2;
+		return 1;
+	}
+	else if(dtxt.GetLength() * 3 < stxt.GetLength())
+		return 2;
+	else
+		return 1;
+}
+
+void DlgHelpEdit::UpdateTexts(const String& key)
+{
+	String sel_key = key;
+	if(sel_key.IsEmpty() && texts.IsCursor())
+		sel_key = texts.Get(T_KEY);
+	int sc = texts.GetCursorSc();
+	texts.Clear();
+	if(modules.IsCursor()) {
+		Vector<String> list;
+		String mod = modules.Get(M_KEY);
+		int b = 0, e = module_map.GetCount();
+		if(!mod.IsEmpty())
+			e = 1 + (b = module_map.Find(mod));
+		ASSERT(b >= 0);
+		int i;
+		for(i = b; i < e; i++)
+			list.Append(module_map[i]);
+		int sl = ~src_lang, dl = ~dest_lang;
+		for(i = 0; i < list.GetCount(); i++) {
+			String key = list[i];
+			String tran;
+			Color c = Black;
+			int state = GetTextState(key, sl, dl);
+			switch(state) {
+			case 0: tran = "ne"; break;
+			case 1: tran = "ano"; break;
+			case 2: tran = "???"; break;
+			}
+			texts.Add(key, tran, state);
+		}
+	}
+	String ttit = "Texty";
+	if(texts.GetCount() > 0)
+		ttit << " (" << texts.GetCount() << ")";
+	texts.HeaderTab(0).SetText(ttit);
+	if(!texts.FindSetCursor(sel_key))
+		texts.SetCursor(0);
+	texts.ScCursor(sc);
+}
+
+void DlgHelpEdit::UpdateTitle()
+{
+	String title;
+	if(modules.IsCursor() && texts.IsCursor())
+		title << (String)texts.Get(T_KEY) << " - editor jazyk�";
+	else
+		title = DlgHelpEditHelpTitle();
+	Title(title.ToWString());
+}
+
+void DlgHelpEdit::UpdateLang()
+{
+	int os = ~src_lang, od = ~dest_lang;
+	src_lang.Clear();
+	dest_lang.Clear();
+	for(int i = 0; i < languages.GetCount(); i++) {
+		int l = languages.GetKey(i);
+		String ln = LNGAsText(l);
+		if(IsNull(os)) os = l;
+		if(IsNull(od)) od = l;
+		src_lang.Add(l, ln);
+		dest_lang.Add(l, ln);
+	}
+	src_lang <<= os;
+	dest_lang <<= od;
+}
+
+void DlgHelpEdit::UpdateSrcText()
+{
+	int sl = ~src_lang;
+	bool en = modules.IsCursor() && texts.IsCursor() && !IsNull(sl);
+	String s;
+	if(en) {
+		src_text.SetFont(Courier(14));
+//		src_text.Charset(GetLangStdCharset(sl));
+		String key = texts.Get(T_KEY);
+		s = ReadText(key, sl);
+	}
+	src_text.Enable(en);
+	src_text <<= ToEdit(s);
+}
+
+void DlgHelpEdit::OnDestText()
+{
+	if(!IsNull(last_lang) && !last_key.IsEmpty()) {
+		lock_dest = true;
+		WriteText(last_key, last_lang, FromEdit(~dest_text));
+		lock_dest = false;
+	}
+}
+
+void DlgHelpEdit::UpdateDestText()
+{
+	if(lock_dest)
+		return;
+	int dl = ~dest_lang;
+	bool en = modules.IsCursor() && texts.IsCursor()
+	&& !IsNull(dl) && dl != (int)~src_lang;
+	String s;
+	if(en) {
+		dest_text.SetFont(Courier(14));
+//		dest_text.Charset(GetLangStdCharset(dl));
+		String key = texts.Get(0);
+		s = ReadText(key, dl);
+		last_key = key;
+		last_lang = dl;
+	}
+	dest_text.Enable(en);
+	dest_text <<= ToEdit(s);
+	dest_text.SetCursor(dest_text.GetLength());
+}
+
+void DlgHelpEdit::OnModules()
+{
+	UpdateTexts(Null);
+}
+
+void DlgHelpEdit::OnTexts()
+{
+	UpdateTitle();
+	UpdateSrcText();
+	UpdateDestText();
+}
+
+void DlgHelpEdit::OnSrcLang()
+{
+	UpdateStrings();
+}
+
+void DlgHelpEdit::OnDestLang()
+{
+	UpdateStrings();
+}
+
+bool DlgHelpEdit::HotKey(dword key)
+{
+	int mod = modules.GetCursor();
+	int txt = texts.GetCursor();
+	switch(key) {
+	case K_ALT_LEFT:
+		if(mod > 0)
+			modules.SetCursor(mod - 1);
+		break;
+
+	case K_ALT_RIGHT:
+		if(mod + 1 < modules.GetCount())
+			modules.SetCursor(mod + 1);
+		break;
+
+	case K_ALT_UP:
+		if(txt > 0)
+			texts.SetCursor(txt - 1);
+		break;
+
+	case K_ALT_DOWN:
+		if(txt + 1 < texts.GetCount())
+			texts.SetCursor(txt + 1);
+		break;
+
+	case K_F4:
+		OnNextDoubtfulText();
+		break;
+
+	case K_SHIFT_F4:
+		OnPrevDoubtfulText();
+		break;
+
+	case K_CTRL_N:
+		OnNew();
+		break;
+
+	case K_CTRL_O:
+		OnLoad();
+		break;
+
+	case K_CTRL_S:
+		OnSave();
+		break;
+
+	case K_CTRL_R:
+		OnExport();
+		break;
+
+	default:
+		return TopWindow::HotKey(key);
+	}
+
+	dest_text.SetWantFocus();
+	return true;
+}
+
+String DlgHelpEdit::GetModule() const
+{
+	if(modules.IsCursor())
+		return modules.Get(M_KEY);
+	return String::GetVoid();
+}
+
+String DlgHelpEdit::GetText() const
+{
+	if(texts.IsCursor())
+		return texts.Get(T_KEY);
+	return String::GetVoid();
+}
+
+void DlgHelpEdit::OnPrevDoubtfulText()
+{
+	for(int row = texts.GetCursor() - 1; row >= 0; row--) {
+		int state = texts.Get(row, T_STATE);
+		if(state == 0 || state == 2) {
+			texts.SetCursor(row);
+			return;
+		}
+	}
+	BeepQuestion();
+}
+
+void DlgHelpEdit::OnNextDoubtfulText()
+{
+	for(int row = texts.GetCursor() + 1, n = texts.GetCount(); row < n; row++) {
+		int state = texts.Get(row, T_STATE);
+		if(state == 0 || state == 2) {
+			texts.SetCursor(row);
+			return;
+		}
+	}
+	BeepQuestion();
+}
+
+void DlgHelpEdit::WriteText(const String& key, int lang, const String& text)
+{
+	ASSERT(!IsNull(lang) && !key.IsEmpty());
+	if(text == ReadText(key, lang))
+		return;
+	LangInfo& llist = languages.Get(lang);
+	bool ddirty = false;
+	int f = llist.edited.Find(key);
+	if(text == ReadLoadedText(key, lang)) {
+		if(f >= 0) {
+			llist.edited.Remove(f);
+			ddirty = true;
+		}
+	}
+	else {
+		if(f < 0) {
+			llist.edited.Add(key, text);
+			ddirty = true;
+		}
+		else
+			llist.edited[f] = text;
+	}
+	int new_state = GetTextState(key, ~src_lang, lang);
+	if(new_state != (int)texts.Get(T_STATE) || ddirty) {
+		UpdateStrings();
+	}
+}
+
+String DlgHelpEdit::ReadText(const String& key, int lang) const
+{
+	if(IsNull(lang) || key.IsEmpty())
+		return String::GetVoid();
+	const LangInfo& llist = languages.Get(lang);
+	int f;
+	if((f = llist.edited.Find(key)) >= 0)
+		return llist.edited[f];
+	if((f = llist.loaded.Find(key)) >= 0)
+		return llist.loaded[f];
+	return txtGet(key, lang);
+}
+
+String DlgHelpEdit::ReadLoadedText(const String& key, int lang) const
+{
+	if(IsNull(lang) || key.IsEmpty())
+		return String::GetVoid();
+	const LangInfo& llist = languages.Get(lang);
+	int f;
+	if((f = llist.loaded.Find(key)) >= 0)
+		return llist.loaded[f];
+	return txtGet(key, lang);
+}
+
+void DlgHelpEdit::OnSave()
+{
+	CheckDirty();
+}
+
+RegisterHelpTopicObjectTitle(DlgHelpOpen, "Nov� jazyk")
+
+void DlgHelpEdit::OnNew()
+{
+	WithHelpOpenLayout<TopWindow> dlg;
+	CtrlLayoutOKCancel(dlg, DlgHelpOpenHelpTitle());
+	dlg.HelpTopic("DlgHelpOpen");
+	const int *pl = GetAllLanguages();
+	for(; *pl; pl++)
+		if(languages.Find(*pl) < 0) {
+			String ln = LNGAsText(*pl);
+			if(!ln.IsEmpty())
+				dlg.lang.Add(*pl, LNGAsText(*pl));
+		}
+	if(dlg.lang.GetCount() == 0) {
+		Exclamation("��dn� dal�� jazyky nejsou k dispozici.");
+		return;
+	}
+	dlg.lang.SetIndex(0);
+	if(dlg.Run() == IDOK) {
+		int l = ~dlg.lang;
+		ASSERT(!IsNull(l));
+		languages.Add(l);
+		UpdateLang();
+		dest_lang <<= l;
+		UpdateStrings();
+	}
+}
+
+void DlgHelpEdit::OnLoad()
+{
+	int dl = ~dest_lang;
+	WithHelpOpenLayout<TopWindow> dlg;
+	CtrlLayoutOKCancel(dlg, "Na��st soubor");
+	dlg.HelpTopic("DlgHelpOpen");
+	const int *pl = GetAllLanguages();
+	for(; *pl; pl++) {
+		String ln = LNGAsText(*pl);
+		if(!ln.IsEmpty()) {
+			if(IsNull(dl))
+				dl = *pl;
+			dlg.lang.Add(*pl, ln);
+		}
+	}
+	dlg.lang <<= dl;
+	if(dlg.Run() != IDOK)
+		return;
+
+	dl = ~dlg.lang;
+	String lang = LNGAsText(dl);
+	int lf = languages.Find(dl);
+	if(lf >= 0 && !languages[lf].edited.IsEmpty())
+		switch(PromptYesNoCancel(NFormat("Chcete stornovat proveden� zm�ny v mutaci [* \1%s\1]?", lang))) {
+		case 1: {
+				languages[lf].edited.Clear();
+				UpdateStrings();
+			}
+			break;
+
+		case 0:
+			break;
+
+		default:
+			return;
+		}
+
+	FileSelector fsel;
+	fsel.DefaultExt("lng");
+	fsel.Type("Jazykov� soubory (*.lng)", "*.lng");
+	if(lf >= 0)
+		fsel <<= languages[lf].filename;
+	if(!fsel.ExecuteOpen(lang + " - na��st soubor..."))
+		return;
+	String data = LoadFile(~fsel);
+	if(data.IsVoid()) {
+		Exclamation(NFormat("Nelze na��st soubor [* \1%s\1].", ~fsel));
+		return;
+	}
+	try {
+		VectorMap<String, String> lmap = FileToLanguage(data);
+		VectorMap<String, String> alias_map;
+		Index<String> alias_all;
+		int i;
+		for(i = 0; i < lmap.GetCount(); i++)
+			if(all_lang_keys.Find(lmap.GetKey(i)) < 0)
+				alias_map.Add(lmap.GetKey(i));
+		alias_all <<= alias_map.GetIndex();
+		if(!alias_map.IsEmpty()) {
+			if(!DlgHelpRename(all_lang_keys).Run(alias_map))
+				return;
+		}
+		LangInfo& linfo = languages.GetAdd(dl);
+		linfo.filename = ~fsel;
+		for(i = 0; i < lmap.GetCount(); i++) {
+			String k = lmap.GetKey(i);
+			if(alias_all.Find(k) < 0)
+				linfo.loaded.GetAdd(k, lmap[i]);
+			else if(!(k = alias_map.Get(k, Null)).IsEmpty())
+				linfo.loaded.GetAdd(k, lmap[i]);
+		}
+		UpdateLang();
+		dest_lang <<= dl;
+	}
+	catch(CParser::Error e) {
+		Exclamation(NFormat("Chyba v souboru [* \1%s\1]: %s", ~fsel, e));
+	}
+
+	UpdateStrings();
+}
+
+void DlgHelpEdit::OnExit()
+{
+	if(CheckDirty())
+		Break(IDOK);
+}
+
+bool DlgHelpEdit::CheckDirty()
+{
+	VectorMap<int, String> dirty_lang;
+	int l;
+	for(l = 0; l < languages.GetCount(); l++)
+		if(!languages[l].edited.IsEmpty())
+			dirty_lang.Add(languages.GetKey(l), languages[l].filename);
+	if(dirty_lang.IsEmpty())
+		return true;
+	if(!RunDlgHelpDirty(dirty_lang))
+		return false;
+	for(l = 0; l < dirty_lang.GetCount(); l++) {
+		String fn = dirty_lang[l];
+		int lang = dirty_lang.GetKey(l);
+		LangInfo& linfo = languages.Get(lang);
+		VectorMap<String, String> langmap;
+		langmap <<= linfo.loaded;
+		for(int e = 0; e < linfo.edited.GetCount(); e++)
+			langmap.GetAdd(linfo.edited.GetKey(e)) = linfo.edited[e];
+
+		if(!SaveFile(fn, LanguageToFile(langmap))) {
+			Exclamation(NFormat("Nelze ulo�it verzi [* \1%s\1] do souboru [* \1%s\1].", LNGAsText(lang), fn));
+			return false;
+		}
+
+		linfo.loaded = langmap;
+		linfo.edited.Clear();
+		linfo.filename = fn;
+	}
+	return true;
+}
+
+void DlgHelpEdit::OnExport()
+{
+	Index<String> dirty_keys;
+	int i;
+	for(i = 0; i < languages.GetCount(); i++) {
+		const LangInfo& li = languages[i];
+		FindAppend(dirty_keys, li.loaded);
+		FindAppend(dirty_keys, li.edited);
+	}
+	for(i = dirty_keys.GetCount(); --i >= 0;) {
+		bool equ = true;
+		for(int l = 0; l < languages.GetCount(); l++) {
+			int lc = languages.GetKey(l);
+			if(ReadText(dirty_keys[i], lc) != String(txtGet(dirty_keys[i], lc))) {
+				equ = false;
+				break;
+			}
+		}
+		if(equ)
+			dirty_keys.Remove(i);
+	}
+	Vector<int> dirty_modules;
+	for(i = 0; i < module_map.GetCount(); i++) {
+		const Vector<String>& mod_keys = module_map[i];
+		for(int j = 0; j < mod_keys.GetCount(); j++)
+			if(dirty_keys.Find(mod_keys[j]) >= 0) {
+				dirty_modules.Add(i);
+				break;
+			}
+	}
+	if(dirty_modules.IsEmpty()) {
+		PromptOK("V�echny jazykov� soubory obsahuj� platn� data; export nem� v�znam.");
+		return;
+	}
+
+	FileSel fsel;
+	if(!fsel.ExecuteSelectDir("Export jazykov�ch soubor�..."))
+		return;
+
+	String path = ~fsel;
+	for(i = 0; i < dirty_modules.GetCount(); i++) {
+		int mod = dirty_modules[i];
+		String modfile = AppendFileName(path, ForceExt(file_map[mod], ".lng"));
+		const Vector<String>& keys = module_map[mod];
+		StringStream output;
+
+		for(int l = 0; l < languages.GetCount(); l++) {
+			int lc = languages.GetKey(l);
+			output << (l ? "#elif" : "#if") << " LANGUAGE == " << GetLangIdent(lc) << "\n\n";
+			for(int k = 0; k < keys.GetCount(); k++) {
+				String key = keys[k];
+				String val = ReadText(key, lc);
+				output << "txt(" << key << ", " << AsCStringWrap(val, 60, "\t") << ")\n";
+			}
+			output << "\n";
+		}
+
+		output << "#endif\n";
+		if(!SaveFile(modfile, output.GetResult())) {
+			Exclamation(NFormat("Nelze ulo�it soubor [* \1%s\1].", modfile));
+			return;
+		}
+	}
+
+	PromptOK(NFormat("Export zm�n�n�ch soubor� byl proveden do slo�ky [* \1%s\1].", path));
+}
+
+#endif
diff --git a/uppsrc/TCtrlLib/Help/DlgHelpEdit.lay b/uppsrc/TCtrlLib/Help/DlgHelpEdit.lay
new file mode 100644
index 000000000..2396d7a1c
--- /dev/null
+++ b/uppsrc/TCtrlLib/Help/DlgHelpEdit.lay
@@ -0,0 +1,59 @@
+#ifdef LAYOUTFILE
+
+LAYOUT(HelpEditLayout, 700, 480)
+	ITEM(ArrayCtrl, modules, LeftPosZ(4, 300).TopPosZ(4, 200))
+	ITEM(ArrayCtrl, texts, LeftPosZ(4, 300).VSizePosZ(208, 32))
+	ITEM(DocEdit, src_text, HSizePosZ(308, 4).TopPosZ(4, 200))
+	ITEM(DocEdit, dest_text, HSizePosZ(308, 4).VSizePosZ(208, 32))
+	ITEM(Label, dv___4, SetLabel(t_("&From language:")).LeftPosZ(4, 80).BottomPosZ(6, 19))
+	ITEM(DropList, src_lang, LeftPosZ(86, 118).BottomPosZ(6, 19))
+	ITEM(Label, dv___6, SetLabel(t_("&To language:")).LeftPosZ(208, 80).BottomPosZ(6, 19))
+	ITEM(DropList, dest_lang, LeftPosZ(290, 118).BottomPosZ(6, 19))
+	ITEM(Button, load, SetLabel(t_("&Load")).RightPosZ(178, 80).BottomPosZ(4, 22))
+	ITEM(Button, save, SetLabel(t_("&Save")).RightPosZ(94, 80).BottomPosZ(4, 22))
+	ITEM(Button, cancel, SetLabel(t_("Cancel")).RightPosZ(4, 80).BottomPosZ(4, 22))
+END_LAYOUT
+
+LAYOUT(HelpDirtyLayout, 446, 212)
+	ITEM(WithKeyMap<ArrayCtrl>, dirty_files, LeftPosZ(4, 100).VSizePosZ(4, 32))
+	ITEM(Button, add, SetLabel(t_(">")).LeftPosZ(108, 24).TopPosZ(40, 22))
+	ITEM(Button, add_all, SetLabel(t_(">>")).LeftPosZ(108, 24).TopPosZ(66, 22))
+	ITEM(Button, remove, SetLabel(t_("<")).LeftPosZ(108, 24).TopPosZ(100, 22))
+	ITEM(Button, remove_all, SetLabel(t_("<<")).LeftPosZ(108, 24).TopPosZ(126, 22))
+	ITEM(WithKeyMap<ArrayCtrl>, save_files, HSizePosZ(136, 4).VSizePosZ(4, 32))
+	ITEM(Button, ok, SetLabel(t_("OK")).RightPosZ(88, 80).BottomPosZ(4, 22))
+	ITEM(Button, cancel, SetLabel(t_("Cancel")).RightPosZ(4, 80).BottomPosZ(4, 22))
+END_LAYOUT
+
+LAYOUT(HelpOpenLayout, 236, 56)
+	ITEM(Label, dv___0, SetLabel(t_("&Destination language:")).LeftPosZ(4, 106).TopPosZ(4, 19))
+	ITEM(DropList, lang, LeftPosZ(112, 120).TopPosZ(4, 19))
+	ITEM(Button, ok, SetLabel(t_("OK")).RightPosZ(88, 80).BottomPosZ(4, 22))
+	ITEM(Button, cancel, SetLabel(t_("Cancel")).RightPosZ(4, 80).BottomPosZ(4, 22))
+END_LAYOUT
+
+LAYOUT(HelpLangLayout, 400, 200)
+	ITEM(ArrayCtrl, ext_lang, AutoHideSb(true).HSizePosZ(4, 4).VSizePosZ(4, 32))
+	ITEM(Label, dv___1, SetLabel(t_("&App language:")).LeftPosZ(4, 80).BottomPosZ(6, 19))
+	ITEM(DropList, init_lang, LeftPosZ(88, 100).BottomPosZ(6, 19))
+	ITEM(Button, ok, SetLabel(t_("OK")).RightPosZ(88, 80).BottomPosZ(4, 22))
+	ITEM(Button, cancel, SetLabel(t_("Cancel")).RightPosZ(4, 80).BottomPosZ(4, 22))
+END_LAYOUT
+
+LAYOUT(HelpRenameLayout, 524, 448)
+	ITEM(ArrayCtrl, unmatched, LeftPosZ(4, 240).TopPosZ(4, 200))
+	ITEM(Button, assign, SetLabel(t_("<")).LeftPosZ(250, 24).TopPosZ(90, 22))
+	ITEM(ArrayCtrl, existing, RightPosZ(4, 240).TopPosZ(4, 200))
+	ITEM(ArrayCtrl, aliased, HSizePosZ(4, 4).TopPosZ(210, 200))
+	ITEM(Button, ok, SetLabel(t_("OK")).RightPosZ(88, 80).BottomPosZ(4, 22))
+	ITEM(Button, cancel, SetLabel(t_("Cancel")).RightPosZ(4, 80).BottomPosZ(4, 22))
+END_LAYOUT
+
+LAYOUT(HelpRenameFindLayout, 214, 58)
+	ITEM(Label, dv___0, SetLabel(t_("&Find:")).LeftPosZ(4, 42).TopPosZ(4, 19))
+	ITEM(EditField, find, HSizePosZ(46, 4).TopPosZ(4, 19))
+	ITEM(Button, ok, SetLabel(t_("OK")).RightPosZ(88, 80).BottomPosZ(4, 22))
+	ITEM(Button, cancel, SetLabel(t_("Cancel")).RightPosZ(4, 80).BottomPosZ(4, 22))
+END_LAYOUT
+
+#endif
diff --git a/uppsrc/TCtrlLib/Help/DlgHelpEdit.lng b/uppsrc/TCtrlLib/Help/DlgHelpEdit.lng
new file mode 100644
index 000000000..8cb225c98
--- /dev/null
+++ b/uppsrc/TCtrlLib/Help/DlgHelpEdit.lng
@@ -0,0 +1,49 @@
+#if LANGUAGE == LNGC_('C', 'S', 'C', 'Z', 15)
+
+// DlgHelpEdit.cpp
+
+txt(DlgHelpRenameHelpTitle, "Mapovat zm�n�n� identifik�tory")
+txt(DlgHelpRenameUnmatchedColumn, "Na�ten� soubor")
+txt(DlgHelpRenameExistingColumn, "Mapa identifik�tor�")
+txt(DlgHelpRenameAliasedOldColumn, "P�vodn�")
+txt(DlgHelpRenameAliasedMapColumn, "Mapov�no")
+txt(DlgHelpRenameAliasedModuleColumn, "Modul")
+txt(DlgHelpRenameToolExistingAssign, "Mapovat")
+txt(DlgHelpRenameToolExistingFind, "Hledat")
+txt(DlgHelpRenameToolExistingFindNext, "Hledat dal��")
+txt(DlgHelpRenameToolExistingFindPrev, "Hledat p�edchoz�")
+txt(DlgHelpRenameFindHelpTitle, "Hledat")
+txt(DlgHelpRenameToolAliased, "Zru�it")
+txt(DlgHelpLangHelpTitle, "Jazyky aplikace")
+txt(DlgHelpLangLangColumn, "K�d jazyka")
+txt(DlgHelpLangFileColumn, "Jazykov� soubor")
+txt(DlgHelpLangLangFileBrowseFilter, "Jazykov� soubory (*.lng)")
+txt(DlgHelpLangLangFileBrowseMask, "*.lng")
+txt(DlgHelpLangLangFileBrowseFileSelTitle, "Jazykov� soubor")
+txt(DlgHelpDirtyHelpTitle, "Ulo�it zm�ny...")
+
+#elif LANGUAGE == LNG_('E', 'N', 'U', 'S')
+
+// DlgHelpEdit.cpp
+
+txt(DlgHelpRenameHelpTitle, "Map changed identifiers")
+txt(DlgHelpRenameUnmatchedColumn, "Loaded file")
+txt(DlgHelpRenameExistingColumn, "Identifier map")
+txt(DlgHelpRenameAliasedOldColumn, "Old")
+txt(DlgHelpRenameAliasedMapColumn, "Mapped")
+txt(DlgHelpRenameAliasedModuleColumn, "Module")
+txt(DlgHelpRenameToolExistingAssign, "Map")
+txt(DlgHelpRenameToolExistingFind, "Find")
+txt(DlgHelpRenameToolExistingFindNext, "Find next")
+txt(DlgHelpRenameToolExistingFindPrev, "Find previous")
+txt(DlgHelpRenameFindHelpTitle, "Find")
+txt(DlgHelpRenameToolAliased, "Remove alias")
+txt(DlgHelpLangHelpTitle, "Application languages")
+txt(DlgHelpLangLangColumn, "Language code")
+txt(DlgHelpLangFileColumn, "Language file")
+txt(DlgHelpLangLangFileBrowseFilter, "Language files (*.lng)")
+txt(DlgHelpLangLangFileBrowseMask, "*.lng")
+txt(DlgHelpLangLangFileBrowseFileSelTitle, "Language file")
+txt(DlgHelpDirtyHelpTitle, "Save changes...")
+
+#endif
diff --git a/uppsrc/TCtrlLib/Help/DlgHelpView.cpp b/uppsrc/TCtrlLib/Help/DlgHelpView.cpp
new file mode 100644
index 000000000..8c0806088
--- /dev/null
+++ b/uppsrc/TCtrlLib/Help/DlgHelpView.cpp
@@ -0,0 +1,811 @@
+#include "TCtrlLibHelp.h"
+#pragma hdrstop
+#pragma BLITZ_APPROVE
+
+#include <DocTypes/DocTypes.h>
+
+NAMESPACE_UPP
+
+#define LAYOUTFILE <TCtrlLib/Help/DlgHelpView.lay>
+#include <CtrlCore/lay.h>
+
+#define IMAGEFILE  <TCtrlLib/Help/DlgHelpView.iml>
+#define IMAGECLASS DlgHelpViewImg
+#include           <Draw/iml.h>
+
+class ReportPageDraw : public PageDraw
+{
+public:
+	ReportPageDraw(Size page_size);
+
+	void          Write(DocReport& output);
+
+	virtual Draw& Info() { return Page(0); }
+	virtual Draw& Page(int i);
+
+private:
+	Array<DrawingDraw> pages;
+	Size               page_size;
+};
+
+ReportPageDraw::ReportPageDraw(Size page_size)
+: page_size(page_size)
+{
+	Page(0);
+}
+
+Draw& ReportPageDraw::Page(int i)
+{
+	while(pages.GetCount() <= i)
+		pages.Add().Create(page_size);
+	return pages[i];
+}
+
+void ReportPageDraw::Write(DocReport& report)
+{
+	for(int i = 0; i < pages.GetCount(); i++) {
+		if(i)
+			report.NextPage();
+		report.DrawDrawing(Rect(page_size), pages[i]);
+	}
+}
+
+/*
+const Color *ThickWhiteBorder[] = {
+	(Color *)4,
+	&SWhite,  &SWhite,  &SWhite,  &SWhite,
+	&SWhite,  &SWhite,  &SWhite,  &SWhite,
+	&SWhite,  &SWhite,  &SWhite,  &SWhite,
+	&SWhite,  &SWhite,  &SWhite,  &SWhite,
+};
+
+GLOBAL_VARP(BorderFrame, ThickWhiteFrame, (ThickWhiteBorder));
+*/
+
+INITBLOCK { RegisterHelpStdItems(); }
+
+class DlgHelpTopicTab : public WithHelpTopicTabLayout<TopWindow>
+{
+public:
+	typedef DlgHelpTopicTab CLASSNAME;
+	DlgHelpTopicTab();
+
+	String                              Run(String init, bool index);
+	virtual bool                        HotKey(dword key);
+
+private:
+	void                                OnLink(const String& link);
+	void                                OnOK();
+	void                                OnTab();
+	void                                OnSearch();
+
+private:
+	enum { TOC_TAB, INDEX_TAB, TOPICS_TAB };
+	WithHelpTopicIndexLayout<TopWindow> index_page;
+	RichTextView                        toc_page;
+	RichTextView                        topics_page;
+	String                              selection;
+	Array<HelpIndexFormattedEntry>      entries;
+	bool                                toc_inited;
+	bool                                topics_inited;
+};
+
+String RunDlgHelpTopicIndex(String init, bool index) { return DlgHelpTopicTab().Run(init, index); }
+
+void OpenHelpTopicIndex(String topic, bool index)
+{
+	String s = RunDlgHelpTopicIndex(topic, index);
+	if(!IsNull(s))
+		RunDlgHelpTopic(s);
+}
+
+//RegisterHelpTopicObjectTitle(DlgHelpTopicTab, t_("N�pov�da"))
+
+DlgHelpTopicTab::DlgHelpTopicTab()
+{
+	toc_inited = topics_inited = false;
+
+	CtrlLayoutOKCancel(*this, t_("Help system"));
+	HelpTopic("topic://TCtrlLib/DlgHelpTopicTab");
+
+	Sizeable().Zoomable();
+
+	CtrlLayout(index_page);
+	ASSERT(tab.GetCount() == TOC_TAB);
+	tab.Add(toc_page.HSizePos(4, 4).VSizePos(4, 4), t_("Contents"));
+	ASSERT(tab.GetCount() == INDEX_TAB);
+	tab.Add(index_page.HSizePos(4, 4).VSizePos(4, 4), t_("Index"));
+	ASSERT(tab.GetCount() == TOPICS_TAB);
+	tab.Add(topics_page.HSizePos(4, 4).VSizePos(4, 4), t_("All topics"));
+	tab <<= THISBACK(OnTab);
+
+	toc_page.Margins(4);
+	toc_page.SetZoom(Zoom(180, 1024));
+	toc_page.WhenLink = THISBACK(OnLink);
+
+	topics_page.Margins(4);
+	topics_page.SetZoom(Zoom(180, 1024));
+	topics_page.WhenLink = THISBACK(OnLink);
+
+	index_page.search <<= THISBACK(OnSearch);
+//	index_page.list.AutoHideSb().NoHeader().NoGrid();
+	index_page.list.AddIndex();
+	index_page.list.AddColumn().SetDisplay(RichTextDisplay());
+	ok <<= index_page.list.WhenLeftDouble = THISBACK(OnOK);
+}
+
+String DlgHelpTopicTab::Run(String init, bool index)
+{
+	tab <<= (index ? INDEX_TAB : TOC_TAB);
+	OnTab();
+	if(TopWindow::Run() != IDOK)
+		return Null;
+	return selection;
+}
+
+void DlgHelpTopicTab::OnLink(const String& link)
+{
+	selection = link;
+	AcceptBreak(IDOK);
+}
+
+//RegisterHelpTopicObjectTitle(DlgHelpTopicSelect, t_("V�b�r t�matu n�pov�dy"))
+
+void DlgHelpTopicTab::OnOK()
+{
+	if(tab.Get() == INDEX_TAB && index_page.list.IsCursor()) {
+		selection = index_page.list.Get(0);
+		if(*selection == '!')
+			selection.Remove(0);
+		if(selection.Find(';') >= 0) { // select topic
+			WithHelpTopicSelectLayout<TopWindow> dlg;
+			CtrlLayoutOKCancel(dlg, t_("Help topic selection"));
+			dlg.list.AddIndex();
+			dlg.list.AddColumn().SetDisplay(RichTextDisplay());
+			dlg.list.WhenLeftDouble = dlg.Acceptor(IDOK);
+			const char *p = selection;
+			while(*p) {
+				while(*p == '!' || *p == ' ')
+					p++;
+				const char *b = p;
+				while(*p && *p != ';')
+					p++;
+				if(p > b) {
+					String key(b, p);
+					dlg.list.Add(key, HelpTopicGet(key).GetTitle());
+				}
+				if(*p)
+					p++;
+			}
+			if(dlg.list.GetCount() == 0) {
+				Exclamation(NFormat(t_("Invalid help topic [* \1%s\1]."), selection));
+				return;
+			}
+			dlg.list.SetCursor(0);
+			if(dlg.list.GetCount() > 1 && dlg.Run() != IDOK)
+				return;
+			selection = dlg.list.Get(0);
+		}
+		AcceptBreak(IDOK);
+	}
+}
+
+void DlgHelpTopicTab::OnTab()
+{
+	switch(tab.Get()) {
+		case TOC_TAB: {
+			if(!toc_inited) {
+				toc_inited = true;
+				RichText toc;
+				HelpTopicOnlineToc()(toc);
+				toc_page.Pick(toc);
+			}
+			break;
+		}
+
+		case TOPICS_TAB: {
+			if(!topics_inited) {
+				topics_inited = true;
+				RichText topics;
+				String lang = LNGAsText(GetCurrentLanguage());
+				if(lang.GetLength() > 5)
+					lang.Trim(5);
+				String fend;
+				fend << '$' << ToLower(lang);
+				VectorMap<String, Topic> dummy;
+				Vector<int> order = GetSortOrder(TopicBase().GetKeys(), GetLanguageInfo());
+				for(int po = 0; po < order.GetCount(); po++) {
+					int p = order[po];
+					String package = TopicBase().GetKey(p);
+					if(TopicBase()[p].Find("appdoc") >= 0) {
+						bool first = true;
+						const Vector<String>& group = TopicBase()[p].Get("appdoc");
+						Vector<int> gorder = GetSortOrder(group, GetLanguageInfo());
+						for(int io = 0; io < gorder.GetCount(); io++) {
+							int i = gorder[io];
+							String t = group[i];
+							String topic;
+							topic << "topic://" << package << "/appdoc/" << t;
+							int l = t.Find('$');
+							if(l >= 0 && t.Mid(l) == fend) {
+								if(first) {
+									RichPara head;
+									head.format.before = 100;
+									head.Cat(package, head.format);
+									topics.Cat(head);
+									first = false;
+								}
+								RichPara para;
+								para.format.lm = 150;
+								para.format.link = topic;
+								para.Cat(t.Left(l), para.format);
+								topics.Cat(para);
+							}
+						}
+					}
+				}
+				topics_page.Pick(topics);
+			}
+			break;
+		}
+		case INDEX_TAB: {
+			if(entries.IsEmpty()) {
+				index_page.list.Clear();
+				entries = HelpTopicFormatIndex();
+				for(int i = 0; i < entries.GetCount(); i++)
+					if(entries[i].nesting >= 0) {
+						WString s;
+						s.Cat('_', entries[i].nesting * 3);
+						s.Cat(entries[i].text);
+						index_page.list.Add(entries[i].topics, s);
+					}
+
+					else
+						entries.Remove(i--);
+			}
+			break;
+		}
+	}
+}
+
+static bool LessEntry(const HelpIndexFormattedEntry& entry, const WString& s)
+{
+	return GetLanguageInfo().Compare(FromUnicode(MQTFStrip(entry.full_text)), FromUnicode(s)) < 0;
+}
+
+void DlgHelpTopicTab::OnSearch()
+{
+	WString text = ~index_page.search;
+	int n = BinFindIndex(entries, index_page.search.GetText(), &LessEntry);
+	if(n < index_page.list.GetCount())
+		index_page.list.SetCursor(n);
+}
+
+bool DlgHelpTopicTab::HotKey(dword key)
+{
+	if(key >= ' ' && key <= 255 || key == K_BACKSPACE
+		|| key == K_LEFT || key == K_RIGHT || key == K_HOME || key == K_END) {
+		int l = index_page.search.GetLength(), h = l;
+		index_page.search.GetSelection(l, h);
+		index_page.search.SetFocus();
+		index_page.search.SetSelection(l, h);
+		return index_page.search.Key(key, 1);
+	}
+	return TopWindow::HotKey(key);
+}
+
+GLOBAL_VAR(Callback1<Bar&>, HelpTopicBookMenu)
+GLOBAL_VAR(Callback1<RichText&>, HelpTopicOnlineToc)
+
+class DlgHelpTopic : public TopWindow
+{
+public:
+	typedef DlgHelpTopic CLASSNAME;
+	DlgHelpTopic();
+
+	static ConfigItem&    config();
+	virtual void          Serialize(Stream& stream);
+	void                  Run(String topic);
+
+	virtual void          Activate();
+
+private:
+	void                  OnLink(const String& link);
+	bool                  OpenPage(String page, int y = 0);
+
+	void                  Rescan() { toolbar.Set(THISBACK(ToolMain)); }
+
+	TOOL(Main)
+		TOOL(Zoom)
+		TOOL(Back)
+		TOOL(Forward)
+		TOOL(Index)
+		TOOL(Print)
+//		TOOL(BookMenu)
+//		TOOL(Book)
+//		TOOL(BookPDF)
+//		TOOL(BookRTF)
+
+	void                  AddRecent(String page, int y);
+	void                  SeekAnchor(const char *anchor);
+	void                  SyncPage(WString title, String text /*, String style*/);
+
+private:
+	ToolBar               toolbar;
+	RichTextView          viewer;
+//	QtfCtrl               qtf;
+	StatusBar             statusbar;
+//	SliderCtrl            zoom;
+//	Point                 book_menu_pos;
+//	int                   help_topic_seq;
+
+//	const HelpPage       *current_page;
+	String                current_topic;
+	WString               title;
+	String                topic_qtf;
+//	String                style_qtf;
+
+	static Vector<String> recent_pages;
+	static Vector<int>    recent_y;
+	static int            recent_pos;
+	static int            recent_zoom;
+	enum { MAX_RECENT = 100 };
+};
+
+Vector<String> DlgHelpTopic::recent_pages;
+Vector<int>    DlgHelpTopic::recent_y;
+int            DlgHelpTopic::recent_pos = 0;
+int            DlgHelpTopic::recent_zoom = DOC_SCREEN_ZOOM;
+
+void RunDlgHelpTopic(String topic) { DlgHelpTopic().Run(topic); }
+
+DlgHelpTopic::DlgHelpTopic()
+//: current_page(0)
+{
+//	help_topic_seq = 0;
+
+	Title(t_("Help viewer"));
+	MaximizeBox().Sizeable();
+
+//	zoom.SetRect(0, 0, 60, 16);
+//	zoom.MinMax(100, 300).Step(10);
+//	zoom <<= THISBACK(OnZoom);
+//	zoom <<= recent_zoom;
+
+//	dialog.WhenClose = dialog.Breaker(IDCANCEL); // TopWindow WhenClose bug; remove when corrected
+	AddFrame(toolbar);
+	AddFrame(statusbar);
+
+	Add(viewer.SizePos());
+	viewer.Margins(4);
+//	viewer.SetZoom(Zoom(180, 1024));
+	viewer.WhenLink = THISBACK(OnLink);
+//	viewer.SetReadOnly();
+//	Add(qtf.SizePos());
+//	qtf.WhenLink = THISBACK(OnLink);
+//	qtf.BackPaint();
+//	qtf.WantFocus();
+//	qtf.SetFrame(InsetFrame());
+//	qtf.Background(White).Margins(10);
+//	qtf.Zoom(160);
+}
+
+CONFIG_ITEM(DlgHelpTopic::config, "DlgHelpTopic", 1, 1, 1)
+
+void DlgHelpTopic::Serialize(Stream& stream)
+{
+	SerializePlacement(stream);
+}
+
+void DlgHelpTopic::Run(String topic)
+{
+	ReadConfigSelf();
+	OnZoom(); // update zoom
+	if(OpenPage(topic)) {
+		Open();
+		AddRecent(topic, viewer.GetSb());
+		TopWindow::Run();
+		WriteConfigSelf();
+	}
+}
+
+void DlgHelpTopic::Activate()
+{
+/*
+	if(!IsNull(current_topic) && HelpTopicGetSeq() != help_topic_seq) {
+		help_topic_seq = HelpTopicGetSeq();
+		const HelpTopicInfo& info = HelpTopicGet(current_topic);
+		String title = info.GetTitle();
+		String text = info.GetText();
+		String style = HelpTopicGet(HelpDPPStyle()).GetText();
+		if(title != title_qtf || text != topic_qtf / * || style != style_qtf* /)
+			SyncPage(title, text / *, style* /);
+	}
+*/
+}
+
+bool DlgHelpTopic::OpenPage(String topic, int y)
+{
+	Topic topicdata = GetTopic(topic);
+	if(IsNull(topicdata.text)) {
+		String langcode = LNGAsText(GetCurrentLanguage() & ~(-1 << 20));
+		String ltopic = topic;
+		ltopic << '$' << ToLower(langcode);
+		topicdata = GetTopic(ltopic);
+	}
+/*
+	const ArrayMap<String, HelpTopicInfo>& map = HelpTopicMap();
+	int t = map.Find(topic);
+	if(t < 0) {
+		String appdoc = HelpAppDPP(topic);
+		t = map.Find(appdoc);
+		if(t < 0) {
+			Exclamation(NFormat("T�ma n�pov�dy [* \1%s\1] nebylo v syst�mu nalezeno.", topic));
+			return false;
+		}
+		topic = appdoc;
+	}
+	//HelpIndex::Get().AddVisited(page.GetID()); // mark page as visited
+
+	//int lang = GetCurrentLanguage();
+	const HelpTopicInfo& info = map[t];
+	String title = info.GetTitle();
+	String text = info.GetText();
+*/
+	String title = topicdata.title;
+	String text = topicdata.text;
+	if(IsNull(text)) {
+		Exclamation(NFormat(t_("Help topic [* \1%s\1] not found."), topic));
+		return false;
+	}
+//	String style = HelpTopicGet(HelpDPPStyle()).GetText();
+	current_topic = topic;
+	HelpTopic(current_topic);
+	SyncPage(FromUtf8(title), text /*, style*/);
+	ActiveFocus(viewer);
+	viewer.SetSb(y);
+
+	return true;
+}
+
+void DlgHelpTopic::SyncPage(WString title, String text /*, String style*/)
+{
+	title = title;
+	topic_qtf = text;
+//	style_qtf = style;
+
+	WString dlgt = title;
+	if(IsNull(dlgt))
+		dlgt = t_("Help viewer");
+	else
+		dlgt << t_(" - help viewer");
+	Title(dlgt);
+
+/*
+	RichText out;
+
+	RichPara title_para;
+	title_para.format.after = 150;
+	title_para.format.tab.Add().pos = 10000;
+	RichPara::CharFormat format;
+//	format.paper = Color(224, 224, 224);
+	format.Face(Font::ARIAL).Height(150).Bold();
+	MQTFCat(title_para, title_qtf, format);
+
+	out.Cat(title_para);
+	AppendQTF(out, style_qtf + "\r\n" + topic_qtf);
+*/
+//	int progress_pos;
+//	Progress progress("P�ipravuji t�ma (%d)");
+	RichText txt = ParseQTF(topic_qtf);
+	RichText out;
+	out.SetStyles(txt.GetStyles());
+	RichPara title_para;
+	title_para.format = out.GetStyle(out.GetStyleId("Heading")).format;
+	title_para.Cat(title, title_para.format);
+	out.Cat(title_para);
+	out.CatPick(txt);
+
+//	RichText out = HelpTopicExpand(/* style_qtf */ Null, title_qtf, topic_qtf, "Heading", false, 0, NoFormat(), Null, progress, progress_pos);
+//	VectorMap<String, Value> eval;
+//	eval.Add("$book", 1);
+//	out.EvaluateFields(eval);
+
+	int sb = viewer.GetSb();
+	viewer.Pick(out);
+	viewer.SetSb(sb);
+
+//	help_style = 0;
+}
+
+void DlgHelpTopic::AddRecent(String topic, int y)
+{
+	recent_pages.SetCount(recent_pos);
+	recent_y.SetCount(recent_pos);
+	if(recent_pos == 0 || topic != recent_pages[recent_pos - 1] || y != recent_y[recent_pos - 1]) {
+		recent_pages.Add(topic);
+		recent_y.Add(y);
+	}
+	if((recent_pos = recent_pages.GetCount()) >= MAX_RECENT) {
+		int over = recent_pos - MAX_RECENT;
+		recent_pages.Remove(0, over);
+		recent_y.Remove(0, over);
+		recent_pos -= over;
+	}
+	Rescan();
+}
+
+void DlgHelpTopic::OnLink(const String& link)
+{
+	String new_topic = link;
+	String old_topic = current_topic;
+	int old_sb = viewer.GetSb();
+	if(OpenPage(new_topic)) {
+		AddRecent(old_topic, old_sb);
+//		SeekAnchor(s);
+		AddRecent(new_topic, viewer.GetSb());
+	}
+}
+
+/*
+void DlgHelpTopic::SeekAnchor(const char *a)
+{
+	if(!a)
+		return;
+	while(*a && *a != '#')
+		a++;
+	if(*a != '#')
+		return;
+
+	const Vector<ValueRect>& vrc = qtf.GetValueRects();
+	int y = 0;
+	for(int i = 0; i < vrc.GetCount(); i++) {
+		String s = vrc[i].value;
+		const char *p = s;
+		if(*p != '=' || *++p != '#')
+			continue;
+		if(!strcmp(p, a)) {
+			int t = vrc[i].rect.top;
+			if(y == 0 || t < y)
+				y = t;
+		}
+	}
+	qtf.SetSb(y + qtf.GetTm());
+}
+*/
+
+void DlgHelpTopic::OnBack()
+{
+	if(recent_pos >= 2) {
+		int t = --recent_pos - 1;
+		OpenPage(recent_pages[t], recent_y[t]);
+	}
+}
+
+void DlgHelpTopic::OnForward()
+{
+	if(recent_pos < recent_pages.GetCount()) {
+		int t = recent_pos++;
+		OpenPage(recent_pages[t], recent_y[t]);
+	}
+}
+
+void DlgHelpTopic::OnIndex()
+{
+	String page = RunDlgHelpTopicIndex();
+	if(!IsNull(page))
+		OpenPage(page);
+/*
+	String page = HelpIndex::Get().Run(HelpIndex::INDEX_TAB);
+	const HelpPage *pp = HelpIndex::Get().Find(page);
+	if(pp) {
+		AddRecent(*current_page, dialog.qtf.GetSb());
+		OpenPage(*pp);
+		SeekAnchor(page);
+		AddRecent(*pp, dialog.qtf.GetSb());
+	}
+*/
+}
+
+void DlgHelpTopic::OnPrint()
+{
+	DocReport report;
+	Size page = report.GetPageSize();
+	ReportPageDraw rpd(page);
+	PaintInfo info;
+	info.sell = info.selh = 0;
+	info.zoom = Zoom(1024, 1024);
+	int doty = page.cy / info.zoom;
+//	info.bottom = PageY(0, page.cy);
+	viewer.Get().Paint(rpd, Rect(page), info);
+	rpd.Write(report);
+	report.Perform();
+/*
+	RichText rtext;
+	AppendQtf(rtext, "[=A4* " + title_qtf);
+	RichText::Format format;
+	(RichText::CharFormat&)format = Arial(100);
+	rtext.AppendPara(format);
+	rtext.AppendPara(format);
+	AppendQtf(rtext, topic_qtf);
+	Report report;
+	report.Qtf(AsQtf(rtext));
+	report.Perform();
+*/
+}
+
+/*
+void DlgHelpTopic::ToolBookMenu(Bar& bar)
+{
+	bar.Add("P��ru�ka", DlgHelpViewImg::book(), THISBACK(OnBook))
+		.Key(K_SHIFT_CTRL_P)
+		.Help("Vys�zet u�ivatelskou p��ru�ku p��mo pro tisk");
+#ifdef _DEBUG
+#ifdef PLATFORM_WIN32
+	bar.Add("Ulo�it PDF", DlgHelpViewImg::book_pdf(), THISBACK(OnBookPDF))
+		.Help("Ulo�it u�ivatelskou p��ru�ku ve form�tu PDF pro Adobe Acrobat Reader");
+#endif
+	bar.Add("Ulo�it RTF", DlgHelpViewImg::book_rtf(), THISBACK(OnBookRTF))
+		.Help("Ulo�it p��ru�ku ve form�tu RTF (p�enositeln� form�tovan� text)");
+#endif
+}
+*/
+
+/*
+void DlgHelpTopic::OnBookRTF()
+{
+	FileSel fsel;
+	fsel.Type("RTF soubory (*.rtf)", "*.rtf")
+	.AllFilesType()
+	.DefaultExt("rtf");
+	static String recent;
+	fsel <<= Nvl(recent, ConfigFile(GetExeTitle() + ".rtf"));
+	if(fsel.ExecuteSaveAs("Ulo�it p��ru�ku (RTF)")) {
+		recent = ~fsel;
+		String manual = CreateHelpRTF();
+		if(!IsNull(manual)) {
+			if(!SaveFile(recent, manual))
+				Exclamation(NFormat("Nelze ulo�it soubor [* \1%s\1] ([* %d] B).", recent, manual.GetLength()));
+		}
+	}
+}
+*/
+
+/*
+#ifdef PLATFORM_WIN32
+void DlgHelpTopic::OnBookPDF()
+{
+	FileSel fsel;
+	fsel.Type("PDF soubory (*.pdf)", "*.pdf")
+	.AllFilesType()
+	.DefaultExt("pdf");
+	static String recent;
+	fsel <<= Nvl(recent, ConfigFile(GetExeTitle() + ".pdf"));
+	if(fsel.ExecuteSaveAs("Ulo�it p��ru�ku (PDF)")) {
+		recent = ~fsel;
+		String manual = CreateHelpPDF();
+		if(!IsNull(manual)) {
+			if(!SaveFile(recent, manual))
+				Exclamation(NFormat("Nelze ulo�it soubor [* \1%s\1] ([* %d] B).", recent, manual.GetLength()));
+		}
+	}
+}
+#endif
+*/
+
+void DlgHelpTopic::OnZoom()
+{
+//	dialog.qtf.Zoom(~zoom);
+//	dialog.qtf.RefreshLayout(); // todo: Fidler's bug, remove as soon as possible
+}
+
+void DlgHelpTopic::ToolMain(Bar& bar)
+{
+	bar.Add(recent_pos >= 2, t_("Previous"), DlgHelpViewImg::back(), THISBACK(OnBack))
+		.Key(K_ALT_LEFT)
+		.Help(t_("Return to previous help topic"));
+	bar.Add(recent_pos < recent_pages.GetCount(), t_("Next"), DlgHelpViewImg::forward(), THISBACK(OnForward))
+		.Key(K_ALT_RIGHT)
+		.Help(t_("Move forward in order of viewing help topics"));
+	bar.Separator();
+	bar.Add(t_("Search index"), DlgHelpViewImg::index(), THISBACK(OnIndex))
+		.Key(K_CTRL_F)
+		.Help(t_("Show / select theme from the alphabetic index"));
+	bar.Separator();
+	bar.Add(t_("Print"), DlgHelpViewImg::print(), THISBACK(OnPrint))
+		.Key(K_CTRL_P)
+		.Help(t_("Print current topic on the printer"));
+	HelpTopicBookMenu()(bar);
+}
+
+class DlgHelpLang : public WithHelpLangLayout<TopWindow>
+{
+public:
+	typedef DlgHelpLang CLASSNAME;
+	DlgHelpLang();
+
+	bool Run(VectorMap<int, String>& ext_lang, int& init_lang);
+
+private:
+	void OnExtLangEdit();
+	void OnLangFileBrowse();
+
+private:
+	DropList lang_edit;
+	EditField lang_file;
+	ExtendedButton lang_file_browse;
+};
+
+bool RunDlgHelpLang(VectorMap<int, String>& ext_lang, int& init_lang) { return DlgHelpLang().Run(ext_lang, init_lang); }
+
+//RegisterHelpTopicObjectTitle(DlgHelpLang, t_("Application languages"))
+
+DlgHelpLang::DlgHelpLang()
+{
+	CtrlLayoutOKCancel(*this, t_("Application languages"));
+	HelpTopic("DlgHelpLang");
+
+	ext_lang.AutoHideSb();
+	ext_lang.AddColumn(t_("Language code"), 10).SetConvert(lang_edit).Edit(lang_edit);
+	ext_lang.AddColumn(t_("Language file"), 30).Edit(lang_file);
+	ext_lang.Inserting().Removing().NoAskRemove();
+	ext_lang.WhenArrayAction = THISBACK(OnExtLangEdit);
+
+	lang_file.AddFrame(lang_file_browse);
+	lang_file_browse <<= THISBACK(OnLangFileBrowse);
+
+	for(const int *p = GetAllLanguages(); *p; p++)
+		lang_edit.Add(*p, LNGAsText(*p));
+}
+
+bool DlgHelpLang::Run(VectorMap<int, String>& el, int& il)
+{
+	int i;
+	for(i = 0; i < el.GetCount(); i++)
+		ext_lang.Add(el.GetKey(i), el[i]);
+	OnExtLangEdit();
+	init_lang <<= il;
+	if(TopWindow::Run() != IDOK)
+		return false;
+	el.Clear();
+	for(i = 0; i < ext_lang.GetCount(); i++)
+		el.Add(ext_lang.Get(i, 0), ext_lang.Get(i, 1));
+	il = ~init_lang;
+	return true;
+}
+
+void DlgHelpLang::OnExtLangEdit()
+{
+	int oi = ~init_lang;
+	init_lang.Clear();
+	const int *x = GetAllLanguages();
+	Index<int> app_lang;
+	while(*x)
+		app_lang.Add(*x++);
+	for(int i = 0; i < ext_lang.GetCount(); i++)
+		app_lang.FindAdd(ext_lang.Get(i, 0));
+	Index<int> lmask;
+	for(int i = 0; i < app_lang.GetCount(); i++) {
+		int l = app_lang[i], l0 = SetLNGCharset(l, CHARSET_DEFAULT);
+		if(lmask.Find(l0) < 0) {
+			lmask.Add(l0);
+			init_lang.Add(l, LNGAsText(l0));
+		}
+	}
+	init_lang <<= (init_lang.FindKey(oi) < 0 ? app_lang[0] : oi);
+}
+
+void DlgHelpLang::OnLangFileBrowse()
+{
+	FileSelector fsel;
+	fsel.Type(t_("Language files (*.lng)"), t_("*.lng"));
+	fsel.DefaultExt("lng");
+	fsel.AllFilesType();
+	fsel <<= String(~lang_file_browse);
+	if(fsel.ExecuteOpen(t_("Language file"))) {
+		lang_file_browse <<= ~fsel;
+		lang_file_browse.Action();
+	}
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/TCtrlLib/Help/DlgHelpView.hpp b/uppsrc/TCtrlLib/Help/DlgHelpView.hpp
new file mode 100644
index 000000000..e69de29bb
diff --git a/uppsrc/TCtrlLib/Help/DlgHelpView.iml b/uppsrc/TCtrlLib/Help/DlgHelpView.iml
new file mode 100644
index 000000000..666ec10ba
--- /dev/null
+++ b/uppsrc/TCtrlLib/Help/DlgHelpView.iml
@@ -0,0 +1,162 @@
+IMAGE_BEGIN(box_bullet)
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�\0\0\0")
+	IMAGE_SCAN("�\0\0\0")
+	IMAGE_SCAN("�\0\0\0")
+	IMAGE_SCAN("�\0\0\0")
+	IMAGE_SCAN("�\0\0\0")
+	IMAGE_SCAN("�\0\0\0")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�")
+IMAGE_PACKED(box_bullet, "\2\6\0\0\0\20\0\0\0\0\0\0\0\5\0\0\0\0\0\0\0")
+IMAGE_BEGIN(circle_bullet)
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("‚\0\0\0�")
+	IMAGE_SCAN("��\0\0\0�")
+	IMAGE_SCAN("�\0\0\0")
+	IMAGE_SCAN("�\0\0\0")
+	IMAGE_SCAN("��\0\0\0�")
+	IMAGE_SCAN("‚\0\0\0�")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�")
+IMAGE_PACKED(circle_bullet, "\2\6\0\0\0\20\0\0\0\0\0\0\0\5\0\0\0\0\0\0\0")
+IMAGE_BEGIN(back)
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�\1\0\0\0�\1\0\0\0�")
+	IMAGE_SCAN("ł\0\0\0ł\0\0\0�")
+	IMAGE_SCAN("ă\0\0\0ă\0\0\0�")
+	IMAGE_SCAN("Ä\0\0\0Ä\0\0\0�")
+	IMAGE_SCAN("…\0\0\0…\0\0\0�")
+	IMAGE_SCAN("…\0\0\0…\0\0\0�")
+	IMAGE_SCAN("Ä\0\0\0Ä\0\0\0�")
+	IMAGE_SCAN("ă\0\0\0ă\0\0\0�")
+	IMAGE_SCAN("ł\0\0\0ł\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\1\0\0\0�")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�")
+IMAGE_PACKED(back, "\2\20\0\0\0\20\0\0\0\0\0\0\0\5\0\0\0\0\0\0\0")
+IMAGE_BEGIN(forward)
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�\1\0\0\0�\1\0\0\0�")
+	IMAGE_SCAN("‚\0\0\0ł\0\0\0�")
+	IMAGE_SCAN("ƒ\0\0\0ă\0\0\0�")
+	IMAGE_SCAN("„\0\0\0Ä\0\0\0�")
+	IMAGE_SCAN("…\0\0\0…\0\0\0�")
+	IMAGE_SCAN("…\0\0\0…\0\0\0�")
+	IMAGE_SCAN("„\0\0\0Ä\0\0\0�")
+	IMAGE_SCAN("ƒ\0\0\0ă\0\0\0�")
+	IMAGE_SCAN("‚\0\0\0ł\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\1\0\0\0�")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�")
+IMAGE_PACKED(forward, "\2\20\0\0\0\20\0\0\0\0\0\0\0\5\0\0\0\0\0\0\0")
+IMAGE_BEGIN(print)
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("ʼn\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\377\377\377\1\0\0\0�")
+	IMAGE_SCAN("�\2\0\0\0\377\377\377�\0\0\0\2\377\377\377\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\377\377\377\1\0\0\0�")
+	IMAGE_SCAN("�\2\0\0\0\377\377\377�\0\0\0\1\377\377\377�\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\377\377\377\1\0\0\0�\1\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("��\0\0\0�\1\0\0\0��\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\1\0\0\0�\1\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("�\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0ƃ����\1\0\0\0�\1\0\0\0�")
+	IMAGE_SCAN("\1\0\0\0ƃ\0\377\377ƒ\0\0\0�")
+	IMAGE_SCAN("�\0\0\0�\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\1\0\0\0�\1\0\0\0�")
+	IMAGE_SCAN("‹\0\0\0�")
+	IMAGE_SCAN("�")
+IMAGE_PACKED(print, "\2\20\0\0\0\20\0\0\0\0\0\0\0\5\0\0\0\0\0\0\0")
+IMAGE_BEGIN(index)
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("Ã\0\0\0Ã\0\0\0�")
+	IMAGE_SCAN("�\3\0\0\0\377\377\377\0\0\0�\3\0\0\0\377\377\377\0\0\0�")
+	IMAGE_SCAN("Ã\0\0\0Ã\0\0\0�")
+	IMAGE_SCAN("…\0\0\0��\0\0\0�")
+	IMAGE_SCAN("�\2\0\0\0\377\377\377�\0\0\0�\2\0\0\0\377\377\377�\0\0\0�")
+	IMAGE_SCAN("��\0\0\0�")
+	IMAGE_SCAN("�\0\0\0\1\377\377\377�\0\0\0��\0\0\0\1\377\377\377�\0\0\0�")
+	IMAGE_SCAN("�\0\0\0\1\377\377\377�\0\0\0��\0\0\0\1\377\377\377�\0\0\0�")
+	IMAGE_SCAN("�\0\0\0\1\377\377\377�\0\0\0\1\377\377\377�\0\0\0�")
+	IMAGE_SCAN("�\0\0\0��\0\0\0�")
+	IMAGE_SCAN("\2\0\0\0\377\377\377�\0\0\0�\2\0\0\0\377\377\377�\0\0\0�")
+	IMAGE_SCAN("\2\0\0\0\377\377\377�\0\0\0�\2\0\0\0\377\377\377�\0\0\0�")
+	IMAGE_SCAN("�\0\0\0Ņ\0\0\0�")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�")
+IMAGE_PACKED(index, "\2\20\0\0\0\20\0\0\0\377\377\377\377\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(book)
+	IMAGE_SCAN("�x��DŽx���")
+	IMAGE_SCAN("\4x��\377\377\377\0\0\0\377\377\377�x��Âx��\4\377\377\377\0\0\0\377\377\377x���")
+	IMAGE_SCAN("\3x��\377\377\377\0\0\0�\377\377\377�x��\377\377\377\3\0\0\0\377\377\377x���")
+	IMAGE_SCAN("\5x��\377\377\377\0\0\0\377\377\377\0\0\0�\377\377\377\1\0\0\0�\377\377\377\5\0\0\0\377\377\377\0\0\0\377\377\377x���")
+	IMAGE_SCAN("\3x��\377\377\377\0\0\0�\377\377\377\1\0\0\0�\377\377\377\1\0\0\0�\377\377\377\3\0\0\0\377\377\377x���")
+	IMAGE_SCAN("\5x��\377\377\377\0\0\0\377\377\377\0\0\0�\377\377\377\1\0\0\0�\377\377\377\5\0\0\0\377\377\377\0\0\0\377\377\377x���")
+	IMAGE_SCAN("\3x��\377\377\377\0\0\0�\377\377\377\1\0\0\0�\377\377\377\1\0\0\0�\377\377\377\3\0\0\0\377\377\377x���")
+	IMAGE_SCAN("\5x��\377\377\377\0\0\0\377\377\377\0\0\0�\377\377\377\1\0\0\0�\377\377\377\5\0\0\0\377\377\377\0\0\0\377\377\377x���")
+	IMAGE_SCAN("\3x��\377\377\377\0\0\0�\377\377\377\1\0\0\0�\377\377\377\1\0\0\0�\377\377\377\3\0\0\0\377\377\377x���")
+	IMAGE_SCAN("\5x��\377\377\377\0\0\0\377\377\377\0\0\0�\377\377\377\1\0\0\0�\377\377\377\5\0\0\0\377\377\377\0\0\0\377\377\377x���")
+	IMAGE_SCAN("\3x��\377\377\377\0\0\0�\377\377\377\1\0\0\0�\377\377\377\1\0\0\0�\377\377\377\3\0\0\0\377\377\377x���")
+	IMAGE_SCAN("\2x��\377\377\377�\0\0\0�\377\377\377\1\0\0\0�\377\377\377�\0\0\0\2\377\377\377x���")
+	IMAGE_SCAN("�x��\377\377\377�\0\0\0�\377\377\377�\0\0\0�\377\377\377�x���")
+	IMAGE_SCAN("‚x��\377\377\377�\0\0\0�\377\377\377�x���")
+	IMAGE_SCAN("Ăx��\377\377\377�x���")
+	IMAGE_SCAN("ƃx���")
+IMAGE_PACKED(book, "\2\20\0\0\0\20\0\0\0\377\377\377\377\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(book_pdf)
+	IMAGE_SCAN("�x��DŽx���")
+	IMAGE_SCAN("\4x��\377\377\377\0\0\0\377\377\377�x��Âx��\4\377\377\377\0\0\0\377\377\377x���")
+	IMAGE_SCAN("\3x��\377\377\377\0\0\0�\377\377\377�x��\377\377\377\3\0\0\0\377\377\377x���")
+	IMAGE_SCAN("\5x��\377\377\377\0\0\0\377\377\377\0\0\0�\377\377\377\1\0\0\0�\377\377\377\5\0\0\0\377\377\377\0\0\0\377\377\377x���")
+	IMAGE_SCAN("\1x��\377\377\377\1\0\0\0�\377\377\377\1x���")
+	IMAGE_SCAN("�\0\0\0�\377\377\377�\0\0\0�\377\377\377�\0\0\0\1x���")
+	IMAGE_SCAN("�\0\0\0\1\377\377\377�\0\0\0\1\377\377\377�\0\0\0\1x���")
+	IMAGE_SCAN("�\0\0\0\3\377\377\377\0\0\0\377\377\377�\0\0\0\3\377\377\377\0\0\0\377\377\377�\0\0\0�\377\377\377\1x���")
+	IMAGE_SCAN("�\0\0\0\3\377\377\377\0\0\0\377\377\377�\0\0\0\3\377\377\377\0\0\0\377\377\377�\0\0\0�\377\377\377\1x���")
+	IMAGE_SCAN("�\0\0\0\1\377\377\377�\0\0\0\3\377\377\377\0\0\0\377\377\377�\0\0\0\1x���")
+	IMAGE_SCAN("�\0\0\0�\377\377\377�\0\0\0\3\377\377\377\0\0\0\377\377\377�\0\0\0\1x���")
+	IMAGE_SCAN("�\0\0\0�\377\377\377�\0\0\0\3\377\377\377\0\0\0\377\377\377�\0\0\0�\377\377\377\1x���")
+	IMAGE_SCAN("�\0\0\0�\377\377\377�\0\0\0\1\377\377\377�\0\0\0\1\377\377\377�x���")
+	IMAGE_SCAN("�\0\0\0�x��\1\377\377\377�\0\0\0�\377\377\377�\0\0\0\1x���")
+	IMAGE_SCAN("Ăx��\377\377\377�x���")
+	IMAGE_SCAN("ƃx���")
+IMAGE_PACKED(book_pdf, "\2\20\0\0\0\20\0\0\0\377\377\377\377\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(book_rtf)
+	IMAGE_SCAN("�x��DŽx���")
+	IMAGE_SCAN("\4x��\377\377\377\0\0\0\377\377\377�x��Âx��\4\377\377\377\0\0\0\377\377\377x���")
+	IMAGE_SCAN("\3x��\377\377\377\0\0\0�\377\377\377�x��\377\377\377\3\0\0\0\377\377\377x���")
+	IMAGE_SCAN("\5x��\377\377\377\0\0\0\377\377\377\0\0\0�\377\377\377\1\0\0\0�\377\377\377\5\0\0\0\377\377\377\0\0\0\377\377\377x���")
+	IMAGE_SCAN("\1x��\377\377\377\1\0\0\0�\377\377\377\1x���")
+	IMAGE_SCAN("�\0\0\0�\377\377\377�\0\0\0\1\377\377\377�\0\0\0\1x���")
+	IMAGE_SCAN("�\0\0\0\1\377\377\377�\0\0\0\1\377\377\377�\0\0\0\1x���")
+	IMAGE_SCAN("�\0\0\0\2\377\377\377\0\0\0�\377\377\377�\0\0\0�\377\377\377�\0\0\0�\377\377\377\1x���")
+	IMAGE_SCAN("�\0\0\0\2\377\377\377\0\0\0�\377\377\377�\0\0\0�\377\377\377�\0\0\0�\377\377\377\1x���")
+	IMAGE_SCAN("�\0\0\0�\377\377\377�\0\0\0�\377\377\377�\0\0\0\1x���")
+	IMAGE_SCAN("�\0\0\0�\377\377\377�\0\0\0�\377\377\377�\0\0\0\1x���")
+	IMAGE_SCAN("�\0\0\0�\377\377\377�\0\0\0�\377\377\377�\0\0\0�\377\377\377\1x���")
+	IMAGE_SCAN("�\0\0\0\2\377\377\377\0\0\0�\377\377\377�\0\0\0�\377\377\377�\0\0\0\1\377\377\377�x���")
+	IMAGE_SCAN("�\0\0\0\2x��\0\0\0�\377\377\377�\0\0\0�\377\377\377�\0\0\0\1x���")
+	IMAGE_SCAN("Ăx��\377\377\377�x���")
+	IMAGE_SCAN("ƃx���")
+IMAGE_PACKED(book_rtf, "\2\20\0\0\0\20\0\0\0\377\377\377\377\0\0\0\0\0\0\0\0")
diff --git a/uppsrc/TCtrlLib/Help/DlgHelpView.lay b/uppsrc/TCtrlLib/Help/DlgHelpView.lay
new file mode 100644
index 000000000..0043435af
--- /dev/null
+++ b/uppsrc/TCtrlLib/Help/DlgHelpView.lay
@@ -0,0 +1,24 @@
+LAYOUT(HelpTopicTabLayout, 388, 452)
+	ITEM(TabCtrl, tab, HSizePosZ(4, 4).VSizePosZ(4, 34))
+	ITEM(Button, ok, SetLabel(t_("OK")).RightPosZ(88, 80).BottomPosZ(4, 22))
+	ITEM(Button, cancel, SetLabel(t_("Cancel")).RightPosZ(4, 80).BottomPosZ(4, 22))
+END_LAYOUT
+
+LAYOUT(HelpTopicIndexLayout, 400, 200)
+	ITEM(EditField, search, HSizePosZ(0, 0).TopPosZ(0, 19))
+	ITEM(ArrayCtrl, list, HorzGrid(false).VertGrid(false).Header(false).AutoHideSb(true).HSizePosZ(0, 0).VSizePosZ(22, 0))
+END_LAYOUT
+
+LAYOUT(HelpTopicSelectLayout, 400, 200)
+	ITEM(ArrayCtrl, list, HorzGrid(false).VertGrid(false).Header(false).AutoHideSb(true).HSizePosZ(4, 4).VSizePosZ(4, 34))
+	ITEM(Button, ok, SetLabel(t_("OK")).RightPosZ(88, 80).BottomPosZ(4, 22))
+	ITEM(Button, cancel, SetLabel(t_("Cancel")).RightPosZ(4, 80).BottomPosZ(4, 22))
+END_LAYOUT
+
+LAYOUT(HelpLangLayout, 400, 200)
+	ITEM(ArrayCtrl, ext_lang, AutoHideSb(true).HSizePosZ(4, 4).VSizePosZ(4, 32))
+	ITEM(Label, dv___1, SetLabel(t_("&App language:")).LeftPosZ(4, 80).BottomPosZ(6, 19))
+	ITEM(DropList, init_lang, LeftPosZ(88, 100).BottomPosZ(6, 19))
+	ITEM(Button, ok, SetLabel(t_("OK")).RightPosZ(88, 80).BottomPosZ(4, 22))
+	ITEM(Button, cancel, SetLabel(t_("Cancel")).RightPosZ(4, 80).BottomPosZ(4, 22))
+END_LAYOUT
diff --git a/uppsrc/TCtrlLib/Help/DlgHelpView.lng b/uppsrc/TCtrlLib/Help/DlgHelpView.lng
new file mode 100644
index 000000000..af0589c5d
--- /dev/null
+++ b/uppsrc/TCtrlLib/Help/DlgHelpView.lng
@@ -0,0 +1,37 @@
+#if LANGUAGE == LNGC_('C', 'S', 'C', 'Z', 15)
+
+// DlgHelpView.cpp
+
+txt(DlgHelpTopicToolBack, "P�edchoz�")
+txt(DlgHelpTopicToolBackHelp, "N�vrat na p�edchoz� t�ma n�pov�dy")
+txt(DlgHelpTopicToolForward, "Dal��")
+txt(DlgHelpTopicToolForwardHelp, "Posuv na dal�� t�ma n�pov�dy v "
+	"po�ad� prohl�en�")
+txt(DlgHelpTopicToolIndex, "Rejst��k")
+txt(DlgHelpTopicToolIndexHelp, "Zobrazit / vyhledat t�ma podle "
+	"rejst��kov�ho odkazu")
+txt(DlgHelpTopicToolPrint, "Tisk")
+txt(DlgHelpTopicToolPrintHelp, "Tisk t�matu n�pov�dy na tisk�rnu")
+txt(DlgHelpTopicToolBook, "P��ru�ka")
+txt(DlgHelpTopicToolBookHelp, "Zalomit p��ru�ku pro tisk nebo export "
+	"ve standardn�m form�tu")
+
+#elif LANGUAGE == LNG_('E', 'N', 'U', 'S')
+
+// DlgHelpView.cpp
+
+txt(DlgHelpTopicToolBack, "Previous")
+txt(DlgHelpTopicToolBackHelp, "Return to previous help topic")
+txt(DlgHelpTopicToolForward, "Next")
+txt(DlgHelpTopicToolForwardHelp, "Move forward in order of viewing "
+	"help topics")
+txt(DlgHelpTopicToolIndex, "Search index")
+txt(DlgHelpTopicToolIndexHelp, "Show / select theme from the "
+	"alphabetic index")
+txt(DlgHelpTopicToolPrint, "Print")
+txt(DlgHelpTopicToolPrintHelp, "Print current topic on the printer")
+txt(DlgHelpTopicToolBook, "Manual")
+txt(DlgHelpTopicToolBookHelp, "Prepare printable manual in the "
+	"standard format")
+
+#endif
diff --git a/uppsrc/TCtrlLib/Help/DlgShot.cpp b/uppsrc/TCtrlLib/Help/DlgShot.cpp
new file mode 100644
index 000000000..80e98505f
--- /dev/null
+++ b/uppsrc/TCtrlLib/Help/DlgShot.cpp
@@ -0,0 +1,451 @@
+#include <TCtrlLib/Help/TCtrlLibHelp.h>
+#pragma hdrstop
+
+#include <TCtrlLib/OldTreeCtrl.h>
+
+NAMESPACE_UPP
+
+#define LAYOUTFILE <TCtrlLib/Help/DlgShot.lay>
+#include <CtrlCore/lay.h>
+
+// Smart Text Formatting
+// '\n' - left aligned line
+// '\t' - left align, dont leave line
+// '\r' - right aligned line
+// '\2' - right align, dont leave line
+// '\v' - centered line
+// '\1' - center align, dont leave line
+// '\a' - underline switch
+// '\b' - bold switch
+// '\f' - italic switch
+
+String StripSmartText(const char *smart)
+{
+	String out;
+	for(; *smart; smart++)
+		if(*smart != '\n' && *smart != '\t' && *smart != '\r' && *smart != '\2'
+		&& *smart != '\v' && *smart != '\1' && *smart != '\a' && *smart != '\b' && *smart != '\f')
+			out.Cat(*smart);
+	return out;
+}
+
+class ImageBrowseCtrl : public DragDropCtrl
+{
+public:
+	typedef ImageBrowseCtrl CLASSNAME;
+	ImageBrowseCtrl();
+
+	void         Set(Image dwg);
+
+	virtual void Layout();
+	virtual void Paint(Draw& draw);
+
+	virtual void DropRect(const Rect& rc, dword keyflags);
+	virtual void Click(Point pt);
+
+	bool         IsSelection() const          { return !IsNull(selection); }
+	Rect         GetSelection() const         { return selection; }
+	void         ClearSelection()             { selection = Null; Refresh(); }
+	void         SetSelection(const Rect& rc) { selection = rc; Refresh(); }
+
+	TOOL_LOCAL(View)
+		TOOL_LOCAL(ViewZoomIn)
+		TOOL_LOCAL(ViewZoomOut)
+		TOOL_LOCAL(View1to1)
+
+private:
+	void         OnScroll() { Refresh(); }
+	Size         GetZoomSize() const;
+
+private:
+	int          zoom;
+	Image        image;
+	ScrollBars   scrollbars;
+	Rect         selection;
+
+	enum {
+		GAP = 10,
+	};
+};
+
+ImageBrowseCtrl::ImageBrowseCtrl()
+{
+	BackPaint();
+	SetFrame(InsetFrame());
+	AddFrame(scrollbars);
+	scrollbars.WhenScroll = THISBACK(OnScroll);
+	scrollbars.AutoHide();
+	zoom = 1024;
+}
+
+void ImageBrowseCtrl::Set(Image im)
+{
+	image = im;
+	Layout();
+}
+
+Size ImageBrowseCtrl::GetZoomSize() const
+{
+	return (image.GetSize() * zoom) >> 10;
+}
+
+void ImageBrowseCtrl::Layout()
+{
+	scrollbars.Set(scrollbars, scrollbars.GetReducedViewSize(), GetZoomSize() + 2 * GAP);
+	Refresh();
+}
+
+void ImageBrowseCtrl::Paint(Draw& draw)
+{
+	draw.DrawRect(draw.GetClip(), Color(224, 255, 255));
+	Size org_size = image.GetSize();
+	Size out_size = GetZoomSize();
+	if(org_size.cx <= 0 || org_size.cy <= 0
+	|| out_size.cx <= 0 || out_size.cy <= 0)
+		return;
+	Rect out_rc = Rect(out_size).Offseted(-scrollbars.Get() + GAP);
+	if(!IsNull(image))
+		draw.DrawImage(out_rc, image);
+	if(!IsNull(selection)) {
+		Rect area = Transform(selection, Rect(org_size), out_rc);
+
+	}
+}
+
+void ImageBrowseCtrl::DropRect(const Rect& rc, dword keyflags)
+{
+
+}
+
+void ImageBrowseCtrl::Click(Point pt)
+{
+}
+
+void ImageBrowseCtrl::ToolView(Bar& bar, bool local)
+{
+}
+
+void ImageBrowseCtrl::ToolViewZoomIn(Bar& bar, bool local)
+{
+}
+
+void ImageBrowseCtrl::OnViewZoomIn()
+{
+}
+
+void ImageBrowseCtrl::ToolViewZoomOut(Bar& bar, bool local)
+{
+}
+
+void ImageBrowseCtrl::OnViewZoomOut()
+{
+}
+
+void ImageBrowseCtrl::ToolView1to1(Bar& bar, bool local)
+{
+}
+
+void ImageBrowseCtrl::OnView1to1()
+{
+}
+
+class DlgCtrlAttr : public WithDlgShotCtrlAttrLayout<TopWindow>
+{
+public:
+	typedef DlgCtrlAttr CLASSNAME;
+	DlgCtrlAttr(Ctrl& ctrl, Ctrl *focus);
+
+	void Run();
+};
+
+DlgCtrlAttr::DlgCtrlAttr(Ctrl& ctrl, Ctrl *focus)
+{
+	CtrlLayout(*this, "Control properties");
+	object_type <<= typeid(ctrl).name();
+	Rect pos = ctrl.GetRect();
+	Rect scr = ctrl.GetScreenRect();
+	Rect top = scr.Offseted(-ctrl.GetTopCtrl() -> GetScreenView().TopLeft());
+	Rect view = ctrl.GetView();
+	Rect frm(view.left, view.top, pos.Width() - view.right, pos.Height() - view.bottom);
+	pos_cx <<= pos.Width();
+	pos_cy <<= pos.Height();
+	pos_l <<= pos.left; pos_t <<= pos.top; pos_r <<= pos.right; pos_b <<= pos.bottom;
+	scr_l <<= scr.left; scr_t <<= scr.top; scr_r <<= scr.right; scr_b <<= scr.bottom;
+	top_l <<= top.left; top_t <<= top.top; top_r <<= top.right; top_b <<= top.bottom;
+	frm_l <<= frm.left; frm_t <<= frm.top; frm_r <<= frm.right; frm_b <<= frm.bottom;
+	LogPos logpos = ctrl.GetPos();
+	switch(logpos.x.GetAlign()) {
+	case Ctrl::CENTER:
+		logpos_x <<= NFormat("HCenterPos(%d, %d)", logpos.x.GetA(), logpos.x.GetB());
+		break;
+	case Ctrl::LEFT:
+		logpos_x <<= NFormat("LeftPos(%d, %d)", logpos.x.GetA(), logpos.x.GetB());
+		break;
+	case Ctrl::RIGHT:
+		logpos_x <<= NFormat("RightPos(%d, %d)", logpos.x.GetA(), logpos.x.GetB());
+		break;
+	case Ctrl::SIZE:
+		logpos_x <<= NFormat("HSizePos(%d, %d)", logpos.x.GetA(), logpos.x.GetB());
+		break;
+	default:
+		logpos_x <<= NFormat("Logc(%d, %d, %d)", logpos.x.GetAlign(), logpos.x.GetA(), logpos.x.GetB());
+		break;
+	}
+	switch(logpos.y.GetAlign()) {
+	case Ctrl::CENTER:
+		logpos_y <<= NFormat("VCenterPos(%d, %d)", logpos.y.GetA(), logpos.y.GetB());
+		break;
+	case Ctrl::TOP:
+		logpos_y <<= NFormat("TopPos(%d, %d)", logpos.y.GetA(), logpos.y.GetB());
+		break;
+	case Ctrl::BOTTOM:
+		logpos_y <<= NFormat("BottomPos(%d, %d)", logpos.y.GetA(), logpos.y.GetB());
+		break;
+	case Ctrl::SIZE:
+		logpos_y <<= NFormat("VSizePos(%d, %d)", logpos.y.GetA(), logpos.y.GetB());
+		break;
+	default:
+		logpos_y <<= NFormat("Logc(%d, %d, %d)", logpos.y.GetAlign(), logpos.y.GetA(), logpos.y.GetB());
+		break;
+	}
+	view_cx <<= view.Width();
+	view_cy <<= view.Height();
+	is_enabled = ctrl.IsEnabled();
+	is_visible = ctrl.IsVisible();
+	is_shown = ctrl.IsShown();
+	has_focus = (focus == &ctrl);
+	while(focus && focus != &ctrl)
+		focus = focus -> GetParent();
+	has_focus_deep = (focus == &ctrl);
+	is_transparent = ctrl.IsTransparent();
+	switch(ctrl.GetBackPaint()) {
+	case Ctrl::NOBACKPAINT:          get_backpaint.SetLabel("NOBACKPAINT"); break;
+	case Ctrl::TRANSPARENTBACKPAINT: get_backpaint.SetLabel("TRANSPARENTBACKPAINT"); break;
+	case Ctrl::FULLBACKPAINT:        get_backpaint.SetLabel("FULLBACKPAINT"); break;
+	default:                         get_backpaint.SetLabel(NFormat("BackPaint(%d)", (int)ctrl.GetBackPaint())); break;
+	}
+	is_in_frame = ctrl.InFrame();
+	is_editable = ctrl.IsEditable();
+	is_modified = ctrl.IsModified();
+	is_modify_set = ctrl.IsModifySet();
+	object_label = "label"; //AsCString(ctrl.GetLabelText()).ToWString();
+	object_value = StdFormat(ctrl.GetData()).ToWString();
+
+	for(Ctrl *c = GetFirstChild(); c; c = c -> GetNext())
+		c -> SetReadOnly();
+}
+
+void DlgCtrlAttr::Run()
+{
+	TopWindow::Run();
+}
+
+class DlgShot : public TopWindow
+{
+public:
+	typedef DlgShot CLASSNAME;
+	DlgShot(Ctrl *ctrl, const Image& still);
+
+	void        Run();
+
+	Value       GetData() const;
+
+private:
+	Image       GetTreeImage() const;
+	void        OnTree();
+	void        SyncTree();
+	void        SyncTreeDeep(OldTreeItem& dest, Ctrl *src, bool visible);
+
+	void        Rescan() { menubar.Set(THISBACK(ToolMain)); toolbar.Set(THISBACK(ToolMain)); }
+
+	TOOL(Main)
+	TOOL(Edit)
+		TOOL(EditCopy)
+		TOOL(EditCtrlAttr)
+
+	TOOL(Local)
+
+private:
+	Ctrl       *ctrl;
+	Ctrl       *top_ctrl;
+	Image       still;
+	Rect        top_frame;
+	Ptr<Ctrl>   focus_ctrl;
+
+	MenuBar     menubar;
+	ToolBar     toolbar;
+
+	Splitter    splitter;
+	OldTreeCtrl    tree;
+	ImageBrowseCtrl view;
+};
+
+//One<Ctrl> GetDlgShot(Ctrl *master, const Image& still) { return new DlgShot(master, still); }
+void      RunDlgShot(Ctrl *master, const Image& still) { DlgShot(master, still).Run(); }
+
+DlgShot::DlgShot(Ctrl *ctrl, const Image& still)
+: ctrl(ctrl), still(still)
+{
+	top_frame = Rect(0, 0, 0, 0);
+#ifdef PLATFORM_WIN32
+	HWND hwnd = 0;
+	for(top_ctrl = ctrl; top_ctrl && !(hwnd = top_ctrl -> GetHWND()); top_ctrl = top_ctrl -> GetParent())
+		;
+	if(hwnd) {
+		Size sz = top_ctrl -> GetSize();
+		top_frame = Rect(sz);
+		::AdjustWindowRectEx(top_frame, GetWindowLong(hwnd, GWL_STYLE),
+			FALSE, GetWindowLong(hwnd, GWL_EXSTYLE));
+		top_frame = Rect(-top_frame.left, -top_frame.top, top_frame.right - sz.cx, top_frame.bottom - sz.cy);
+	}
+#endif
+	focus_ctrl = GetFocusCtrl();
+	Title("Sn�mek dialogu / okna");
+	Sizeable().Zoomable();
+	AddFrame(menubar);
+	AddFrame(toolbar);
+	Add(splitter.SizePos());
+	splitter.Horz(tree, view);
+	splitter.SetPos(3000);
+	tree <<= THISBACK(OnTree);
+	tree.WhenLeftDouble = THISBACK(OnEditCopy);
+	tree.WhenBar = THISBACK(ToolLocal);
+	view.SetFrame(InsetFrame());
+	SyncTree();
+	Rescan();
+}
+
+void DlgShot::Run()
+{
+	TopWindow::Run();
+}
+
+void DlgShot::SyncTree()
+{
+	tree.Clear();
+	if(ctrl)
+		SyncTreeDeep(tree, ctrl, true);
+	tree.OldTreeItem::Open();
+	tree.SetCursor(&tree);
+	OnTree();
+}
+
+void DlgShot::SyncTreeDeep(OldTreeItem& dest, Ctrl *src, bool visible)
+{
+	if(!src -> IsVisible())
+		visible = false;
+	String qtf = "\xFF";
+	if(!visible)
+		qtf << "[@1";
+	qtf << " \1" << GetTypeName(typeid(*src)) << "\1";
+	String lbl = "lbl"; // StripSmartText(src -> GetLabelText());
+	if(!IsNull(lbl))
+		qtf << ": [* \1" << lbl;
+	dest.Text(qtf);
+	dest <<= PtrToValue(src);
+	dest.SetImage(src == focus_ctrl ? CtrlImg::Home() : visible
+		? src -> GetFirstChild() ? CtrlImg::Dir() : CtrlImg::File() : CtrlImg::remove());
+
+	for(Ctrl *child = src -> GetFirstChild(); child; child = child -> GetNext())
+		SyncTreeDeep(dest.Add(), child, visible);
+}
+
+Value DlgShot::GetData() const
+{
+	return GetTreeImage();
+}
+
+static Image ImageCrop(Image src, Rect rc)
+{
+	rc &= Rect(src.GetSize());
+	if(rc.IsEmpty())
+		return Null;
+	if(rc.Size() == src.GetSize())
+		return src;
+	Size sz = rc.Size();
+	ImageBuffer buffer(sz);
+	for(int y = 0; y < sz.cy; y++)
+		memcpy(buffer[y], &src[y + rc.top][rc.left], sz.cx * sizeof(RGBA));
+	return Image(buffer);
+}
+
+Image DlgShot::GetTreeImage() const
+{
+	Image img;
+	if(!IsNull(~tree)) {
+		Ctrl *sel_ctrl = ValueTo<Ctrl *>(~tree);
+		Rect rc;
+		if(sel_ctrl == ctrl)
+			rc = Rect(still.GetSize());
+		else
+			rc = sel_ctrl -> GetScreenRect() - ctrl -> GetScreenRect().TopLeft() + top_frame.TopLeft();
+		img = ImageCrop(still, rc);
+//		DrawingDraw ddraw(rc.Size());
+//		ddraw.DrawImage(0, 0, ImageCrop(still, rc));
+//		img = ddraw;
+	}
+	return img;
+}
+
+void DlgShot::OnTree()
+{
+	view.Set(GetTreeImage());
+}
+
+void DlgShot::ToolMain(Bar& bar)
+{
+	bar.Add("Edit", THISBACK(ToolEdit));
+}
+
+void DlgShot::ToolEdit(Bar& bar)
+{
+	ToolEditCopy(bar);
+	ToolEditCtrlAttr(bar);
+}
+
+void DlgShot::ToolEditCopy(Bar& bar)
+{
+	bar.Add("Kop�rovat", CtrlImg::copy(), THISBACK(OnEditCopy))
+		.Key(K_CTRL_C)
+		.Help("Kop�rovat vybran� obr�zek do schr�nky");
+}
+
+void DlgShot::OnEditCopy()
+{
+	if(!IsNull(~tree)) {
+		Image img = GetTreeImage();
+		Size dot_size = iscale(img.GetSize(), 1024, 170);
+/*
+		RichObject object = CreateImageObject(img, dot_size, iscale(dot_size, 80, 100));
+		RichPara para;
+		para.Cat(object, RichPara::CharFormat());
+		RichText text;
+		text.Cat(para);
+		WriteClipboard(GetClipboardFormatCode("QTF"), BodyAsQTF(text));
+*/
+		WriteClipboardImage(img); //TODO, White(), true);
+		BeepInformation();
+	}
+}
+
+void DlgShot::ToolLocal(Bar& bar)
+{
+	tree.StdBar(bar);
+	bar.Separator();
+	ToolEdit(bar);
+}
+
+void DlgShot::ToolEditCtrlAttr(Bar& bar)
+{
+	bar.Add("Properties", THISBACK(OnEditCtrlAttr));
+}
+
+void DlgShot::OnEditCtrlAttr()
+{
+	if(!IsNull(~tree)) {
+		Ctrl *sel_ctrl = ValueTo<Ctrl *>(~tree);
+		DlgCtrlAttr(*sel_ctrl, focus_ctrl).Run();
+	}
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/TCtrlLib/Help/DlgShot.lay b/uppsrc/TCtrlLib/Help/DlgShot.lay
new file mode 100644
index 000000000..bea8255ba
--- /dev/null
+++ b/uppsrc/TCtrlLib/Help/DlgShot.lay
@@ -0,0 +1,67 @@
+LAYOUT(DlgShotCtrlAttrLayout, 440, 270)
+	ITEM(Label, dv___0, SetLabel(t_("Object type:")).LeftPosZ(4, 68).TopPosZ(4, 19))
+	ITEM(EditField, object_type, HSizePosZ(76, 4).TopPosZ(4, 19))
+	ITEM(Label, dv___2, SetLabel(t_("Rect - W:")).LeftPosZ(4, 68).TopPosZ(26, 19))
+	ITEM(EditInt, pos_cx, LeftPosZ(76, 40).TopPosZ(26, 19))
+	ITEM(Label, dv___4, SetLabel(t_("H:")).LeftPosZ(120, 18).TopPosZ(26, 19))
+	ITEM(EditInt, pos_cy, LeftPosZ(140, 40).TopPosZ(26, 19))
+	ITEM(Label, dv___6, SetLabel(t_("L:")).LeftPosZ(184, 18).TopPosZ(26, 19))
+	ITEM(EditInt, pos_l, LeftPosZ(204, 40).TopPosZ(26, 19))
+	ITEM(Label, dv___8, SetLabel(t_("T:")).LeftPosZ(248, 18).TopPosZ(26, 19))
+	ITEM(EditInt, pos_t, LeftPosZ(268, 40).TopPosZ(26, 19))
+	ITEM(Label, dv___10, SetLabel(t_("R:")).LeftPosZ(312, 18).TopPosZ(26, 19))
+	ITEM(EditInt, pos_r, LeftPosZ(332, 40).TopPosZ(26, 19))
+	ITEM(Label, dv___12, SetLabel(t_("B:")).LeftPosZ(376, 18).TopPosZ(26, 19))
+	ITEM(EditInt, pos_b, LeftPosZ(396, 40).TopPosZ(26, 19))
+	ITEM(Label, dv___14, SetLabel(t_("TopWindow-relative:")).LeftPosZ(4, 112).TopPosZ(48, 19))
+	ITEM(Label, dv___15, SetLabel(t_("L:")).LeftPosZ(184, 18).TopPosZ(48, 19))
+	ITEM(EditInt, top_l, LeftPosZ(204, 40).TopPosZ(48, 19))
+	ITEM(Label, dv___17, SetLabel(t_("T:")).LeftPosZ(248, 18).TopPosZ(48, 19))
+	ITEM(EditInt, top_t, LeftPosZ(268, 40).TopPosZ(48, 19))
+	ITEM(Label, dv___19, SetLabel(t_("R:")).LeftPosZ(312, 18).TopPosZ(48, 19))
+	ITEM(EditInt, top_r, LeftPosZ(332, 40).TopPosZ(48, 19))
+	ITEM(Label, dv___21, SetLabel(t_("B:")).LeftPosZ(376, 18).TopPosZ(48, 19))
+	ITEM(EditInt, top_b, LeftPosZ(396, 40).TopPosZ(48, 19))
+	ITEM(Label, dv___23, SetLabel(t_("Screen-relative:")).LeftPosZ(4, 112).TopPosZ(70, 19))
+	ITEM(Label, dv___24, SetLabel(t_("L:")).LeftPosZ(184, 18).TopPosZ(70, 19))
+	ITEM(EditInt, scr_l, LeftPosZ(204, 40).TopPosZ(70, 19))
+	ITEM(Label, dv___26, SetLabel(t_("T:")).LeftPosZ(248, 18).TopPosZ(70, 19))
+	ITEM(EditInt, scr_t, LeftPosZ(268, 40).TopPosZ(70, 19))
+	ITEM(Label, dv___28, SetLabel(t_("R:")).LeftPosZ(312, 18).TopPosZ(70, 19))
+	ITEM(EditInt, scr_r, LeftPosZ(332, 40).TopPosZ(70, 19))
+	ITEM(Label, dv___30, SetLabel(t_("B:")).LeftPosZ(376, 18).TopPosZ(70, 19))
+	ITEM(EditInt, scr_b, LeftPosZ(396, 40).TopPosZ(70, 19))
+	ITEM(Label, dv___32, SetLabel(t_("Frame width:")).LeftPosZ(4, 112).TopPosZ(92, 19))
+	ITEM(Label, dv___33, SetLabel(t_("L:")).LeftPosZ(184, 18).TopPosZ(92, 19))
+	ITEM(EditInt, frm_l, LeftPosZ(204, 40).TopPosZ(92, 19))
+	ITEM(Label, dv___35, SetLabel(t_("T:")).LeftPosZ(248, 18).TopPosZ(92, 19))
+	ITEM(EditInt, frm_t, LeftPosZ(268, 40).TopPosZ(92, 19))
+	ITEM(Label, dv___37, SetLabel(t_("R:")).LeftPosZ(312, 18).TopPosZ(92, 19))
+	ITEM(EditInt, frm_r, LeftPosZ(332, 40).TopPosZ(92, 19))
+	ITEM(Label, dv___39, SetLabel(t_("B:")).LeftPosZ(376, 18).TopPosZ(92, 19))
+	ITEM(EditInt, frm_b, LeftPosZ(396, 40).TopPosZ(92, 19))
+	ITEM(Label, dv___41, SetLabel(t_("LogPos - X:")).LeftPosZ(4, 68).TopPosZ(114, 19))
+	ITEM(EditField, logpos_x, HSizePosZ(76, 132).TopPosZ(114, 19))
+	ITEM(Label, dv___43, SetLabel(t_("LogPos - Y:")).LeftPosZ(4, 68).TopPosZ(136, 19))
+	ITEM(EditField, logpos_y, HSizePosZ(76, 132).TopPosZ(136, 19))
+	ITEM(Label, dv___45, SetLabel(t_("View width:")).LeftPosZ(332, 62).TopPosZ(114, 19))
+	ITEM(EditInt, view_cx, LeftPosZ(396, 40).TopPosZ(114, 19))
+	ITEM(Label, dv___47, SetLabel(t_("View height:")).LeftPosZ(332, 62).TopPosZ(136, 19))
+	ITEM(EditInt, view_cy, LeftPosZ(396, 40).TopPosZ(136, 19))
+	ITEM(Option, is_enabled, SetLabel(t_("Enabled")).LeftPosZ(4, 68).TopPosZ(158, 19))
+	ITEM(Option, is_visible, SetLabel(t_("Visible")).LeftPosZ(76, 56).TopPosZ(158, 19))
+	ITEM(Option, is_shown, SetLabel(t_("Shown")).LeftPosZ(140, 56).TopPosZ(158, 19))
+	ITEM(Option, has_focus, SetLabel(t_("Has focus")).LeftPosZ(204, 72).TopPosZ(158, 19))
+	ITEM(Option, has_focus_deep, SetLabel(t_("Has focus deep")).LeftPosZ(284, 98).TopPosZ(158, 19))
+	ITEM(Option, is_transparent, SetLabel(t_("Transparent")).LeftPosZ(76, 84).TopPosZ(180, 19))
+	ITEM(Label, dv___55, SetLabel(t_("Backpaint:")).LeftPosZ(168, 55).TopPosZ(180, 19))
+	ITEM(Label, get_backpaint, LeftPosZ(224, 158).TopPosZ(180, 19))
+	ITEM(Option, is_in_frame, SetLabel(t_("InFrame")).LeftPosZ(4, 62).TopPosZ(180, 19))
+	ITEM(Option, is_editable, SetLabel(t_("Editable")).LeftPosZ(4, 66).TopPosZ(202, 19))
+	ITEM(Option, is_modified, SetLabel(t_("IsModified")).LeftPosZ(76, 74).TopPosZ(202, 19))
+	ITEM(Option, is_modify_set, SetLabel(t_("IsModifySet")).LeftPosZ(158, 86).TopPosZ(202, 19))
+	ITEM(Label, dv___61, SetLabel(t_("Label:")).LeftPosZ(4, 68).TopPosZ(224, 19))
+	ITEM(EditField, object_label, HSizePosZ(76, 4).TopPosZ(224, 19))
+	ITEM(Label, dv___63, SetLabel(t_("Value:")).LeftPosZ(4, 68).TopPosZ(246, 19))
+	ITEM(EditField, object_value, HSizePosZ(76, 4).TopPosZ(246, 19))
+END_LAYOUT
diff --git a/uppsrc/TCtrlLib/Help/Help.upp b/uppsrc/TCtrlLib/Help/Help.upp
new file mode 100644
index 000000000..bf1f7041e
--- /dev/null
+++ b/uppsrc/TCtrlLib/Help/Help.upp
@@ -0,0 +1,33 @@
+uses
+	TCtrlLib,
+	RichText;
+
+file
+	Aux readonly separator,
+	TCtrlLibHelp.h,
+	layh.h,
+	lls.h,
+	lls_header.h,
+	lls_source.h,
+	lly.h,
+	lly_header.h,
+	lly_source.h,
+	llyh.h,
+	llyh_header.h,
+	llyh_source.h,
+	Base readonly separator,
+	dynahelp.h,
+	dynahelp.cpp,
+	dynaattr.h,
+	dynaattr.cpp,
+	DlgHelp readonly separator,
+	DlgHelp.cpp,
+	DlgHelp.lay,
+	DlgHelp.lng,
+	DlgHelp_lng.cpp,
+	DlgHelpEdit readonly separator,
+	DlgHelpEdit.cpp,
+	DlgHelpEdit.lay,
+	DlgHelpEdit.lng,
+	DlgHelpEdit_lng.cpp,
+	End readonly separator;
diff --git a/uppsrc/TCtrlLib/Help/TCtrlLibHelp.h b/uppsrc/TCtrlLib/Help/TCtrlLibHelp.h
new file mode 100644
index 000000000..c31387ab2
--- /dev/null
+++ b/uppsrc/TCtrlLib/Help/TCtrlLibHelp.h
@@ -0,0 +1,42 @@
+#ifndef __TCtrlLibHelp__
+#define __TCtrlLibHelp__
+
+#include <TCore/TCore.h>
+#include <TCtrlLib/TCtrlLib.h>
+#include <RichEdit/RichEdit.h>
+#include "helputil.h"
+
+NAMESPACE_UPP
+
+//RichObjectType *RichObjectTypeDialogHelp();
+RichObjectType *RichObjectTypeDrawing();
+String          GetRichObjectTypeDrawingData(const Drawing& drawing);
+
+void            StoreHelpInfo();
+void            LoadAppHelpFile();
+
+Drawing         CtrlToDrawing(Ctrl *ctrl, Point arrow = Null, Image arrow_image = Null);
+Image           CtrlToStillImage(Ctrl *ctrl, Point arrow = Null, Image arrow_image = Null);
+RichObject      CreateDrawingObject(const Drawing& dwg, Size dot_size, Size out_size = Null);
+RichObject      CreateImageObject(Image img, Size dot_size, Size out_size = Null);
+
+One<Ctrl>       GetDlgShot(Ctrl *master, const Image& still);
+void            RunDlgShot(Ctrl *master, const Image& still);
+
+void            InstallHelpViewerKeyHook();
+void            InstallHelpEditorKeyHook();
+
+//void            RunDlgHelpEditor(Ctrl *ctrl = NULL, const Image& still = Null);
+//bool            RunDlgHelpLang(VectorMap<int, String>& ext_lang, int& init_lang);
+//void            RunDlgHelpEdit();
+void            RunDlgShot(Ctrl *ctrl, const Image& still);
+void            RunDlgHelpTopic(String topic);
+String          RunDlgHelpTopicIndex(String topic = Null, bool index = false);
+void            OpenHelpTopicIndex(String topic = Null, bool index = false);
+
+Callback1<Bar&>& HelpTopicBookMenu();
+Callback1<RichText&>& HelpTopicOnlineToc();
+
+END_UPP_NAMESPACE
+
+#endif//__TCtrlLibHelp__
diff --git a/uppsrc/TCtrlLib/Help/doc.dpp/AppDoc_DlgFormula_CS-CZ15.dpx b/uppsrc/TCtrlLib/Help/doc.dpp/AppDoc_DlgFormula_CS-CZ15.dpx
new file mode 100644
index 000000000..e3dea6287
--- /dev/null
+++ b/uppsrc/TCtrlLib/Help/doc.dpp/AppDoc_DlgFormula_CS-CZ15.dpx
@@ -0,0 +1,13 @@
+HELP_TOPIC("AppDoc", "", "DlgFormula", "CS-CZ windows-1250", "")
+	HELP_TEXT(
+	"[ $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0} \r\n"
+	"[s0; Pomoc� v�razov�ho editoru je mo�no vkl�dat do n�pov�dy matematick� \r\n"
+	"rovnice a v�razy, nap��klad&]\r\n"
+	"[s0;= \r\n"
+	"@@Formula:847&291/107\r\n"
+	"�������ǀ�������������������������������������������������������䀀����\r\n"
+	"��\r\n"
+	"&]\r\n"
+	"[s0;= ")
+HELP_END
diff --git a/uppsrc/TCtrlLib/Help/doc.dpp/AppDoc_sys_book_expand_CS-CZ15.dpx b/uppsrc/TCtrlLib/Help/doc.dpp/AppDoc_sys_book_expand_CS-CZ15.dpx
new file mode 100644
index 000000000..c0e32c109
--- /dev/null
+++ b/uppsrc/TCtrlLib/Help/doc.dpp/AppDoc_sys_book_expand_CS-CZ15.dpx
@@ -0,0 +1,2 @@
+HELP_TOPIC("AppDoc", "sys", "book_expand", "CS-CZ windows-1250", "")
+HELP_END
diff --git a/uppsrc/TCtrlLib/Help/helpgen.cpp b/uppsrc/TCtrlLib/Help/helpgen.cpp
new file mode 100644
index 000000000..3679cfd95
--- /dev/null
+++ b/uppsrc/TCtrlLib/Help/helpgen.cpp
@@ -0,0 +1,235 @@
+#include "TCtrlLibHelp.h"
+#pragma hdrstop
+
+NAMESPACE_UPP
+
+void RegisterHelpStdItems() {}
+
+RegisterHelpTopicHost("style", "", CNULL)
+RegisterHelpTopicHost("toc", "", CNULL)
+RegisterHelpTopicHost("book", "", CNULL)
+
+
+struct sScanObjects : RichText::Iterator
+{
+	virtual bool operator()(int pos, const RichPara& para);
+	void Add(const Array<RichPara::Part>& parts);
+	String topic;
+	VectorMap< String, VectorMap<String, int> > map;
+};
+
+void sScanObjects::Add(const Array<RichPara::Part>& parts)
+{
+	for(int i = 0; i < parts.GetCount(); i++)
+		if(parts[i].object)
+			map.GetAdd(parts[i].object.GetTypeName()).GetAdd(topic, 0)++;
+		else if(!parts[i].fieldpart.IsEmpty())
+			Add(parts[i].fieldpart);
+}
+
+bool sScanObjects::operator () (int pos, const RichPara& para)
+{
+	Add(para.part);
+	return true;
+}
+
+static void sEnumObjects(String& qtf)
+{
+	static VectorMap<int, String> out;
+	static int out_seq;
+	if(out_seq < HelpTopicGetSeq())
+		out.Clear();
+	int lang = GetCurrentLanguage();
+	int f = out.Find(lang);
+	if(f >= 0) {
+		qtf = out[f];
+		return;
+	}
+	out_seq = HelpTopicGetSeq();
+	const HelpTopicInfoMap& map = HelpTopicMap();
+	Progress progress(t_("Preparing object list"), map.GetCount());
+	sScanObjects scanner;
+	String styles = HelpTopicGet(HelpDPPStyle()).GetText();
+	int i;
+	for(i = 0; i < map.GetCount(); i++) {
+		String drl = map.GetKey(i);
+		String space, nesting, topic;
+		HelpParseDPP(drl, space, nesting, topic);
+		if(nesting == "sys")
+			continue;
+		RichText rt = ParseQTF(styles + map[i].GetText());
+		scanner.topic = drl;
+		rt.Iterate(scanner);
+		if(progress.StepCanceled())
+			break;
+	}
+	qtf << NFormat("[A [a100 %d typ(y) objekt�:&\n]", scanner.map.GetCount());
+	for(i = 0; i < scanner.map.GetCount(); i++) {
+		int total = Sum0(scanner.map[i]);
+		qtf << NFormat("[* \1%s\1] - [/ %d v�skyt�]&\n", scanner.map.GetKey(i), Sum0(scanner.map[i]));
+	}
+	for(i = 0; i < scanner.map.GetCount(); i++) {
+		qtf << NFormat("[3*_b200a100 \1%s\1]&\n", scanner.map.GetKey(i));
+		Vector<String> topics = scanner.map[i].PickKeys();
+		Vector<int> counts = scanner.map[i].PickValues();
+		IndexSort(counts, topics, StdGreater<int>());
+		for(int t = 0; t < topics.GetCount(); t++)
+			qtf << NFormat("[o \1%s\1: [/ %d x]&\n", topics[t], counts[t]);
+	}
+	out.Add(lang, qtf);
+}
+
+RegisterHelpTopicSys("objects", t_("Graphic object types used by documentation"), callback(&sEnumObjects));
+
+static void sEnumStyles(String& qtf)
+{
+	static VectorMap<int, String> out;
+	static int out_seq;
+	if(out_seq < HelpTopicGetSeq())
+		out.Clear();
+	int lang = GetCurrentLanguage();
+	int f = out.Find(lang);
+	if(f >= 0) {
+		qtf = out[f];
+		return;
+	}
+	out_seq = HelpTopicGetSeq();
+	const HelpTopicInfoMap& map = HelpTopicMap();
+	Progress progress(t_("Building style list"), map.GetCount());
+	VectorMap< String, VectorMap<String, int> > style_map;
+	String styles = HelpTopicGet(HelpDPPStyle()).GetText();
+	int i;
+	for(i = 0; i < map.GetCount(); i++) {
+		String drl = map.GetKey(i);
+		String space, nesting, topic;
+		HelpParseDPP(drl, space, nesting, topic);
+		if(nesting == "sys")
+			continue;
+		RichText rt = ParseQTF(styles + map[i].GetText());
+		for(int p = 0; p < rt.GetPartCount(); p++)
+			if(rt.IsPara(p))
+				style_map.GetAdd(rt.GetStyle(rt.GetParaStyle(p)).name).GetAdd(topic, 0)++;
+		if(progress.StepCanceled())
+			break;
+	}
+	qtf << NFormat(t_("[A [a100 %d used styles:&\n]"), style_map.GetCount());
+	for(i = 0; i < style_map.GetCount(); i++) {
+		int total = Sum0(style_map[i]);
+		qtf << NFormat(t_("[* \1%s\1] - [/ %d occurrences]&\n"), style_map.GetKey(i), Sum0(style_map[i]));
+	}
+	for(i = 0; i < style_map.GetCount(); i++) {
+		qtf << NFormat(t_("[3*_b200a100 \1%s\1]&\n"), style_map.GetKey(i));
+		Vector<String> topics = style_map[i].PickKeys();
+		Vector<int> counts = style_map[i].PickValues();
+		IndexSort(counts, topics, StdGreater<int>());
+		for(int t = 0; t < topics.GetCount(); t++)
+			qtf << NFormat(t_("[o \1%s\1: [/ %d x]&\n"), topics[t], counts[t]);
+	}
+	out.Add(lang, qtf);
+}
+
+RegisterHelpTopicSys("parastyles", t_("Used styles"), callback(&sEnumStyles));
+
+static void sMakeIndex(String& qtf, bool book)
+{
+	qtf << "[{0} ";
+	Array<HelpIndexFormattedEntry> index = HelpTopicFormatIndex();
+	for(int i = 0; i < index.GetCount(); i++) {
+		const HelpIndexFormattedEntry& entry = index[i];
+		if(entry.nesting < 0)
+			qtf << NFormat("[a100b200*5 %s&]", entry.text);
+		else {
+			qtf << "[l" << (100 * entry.nesting);
+			if(book)
+				qtf << ' ' << entry.text << " \r\n{:INDEX:" << DeQtf(entry.topics) << ":}\r\n";
+			else {
+				Vector<String> split = Split(entry.topics, ';');
+				if(split.GetCount() == 1) {
+					const char *sp = split[0];
+					if(*sp == '!')
+						sp++;
+					qtf << '^' << sp << '^';
+				}
+				qtf << ' ' << entry.text;
+				if(split.GetCount() > 1)
+					for(int t = 0; t < split.GetCount(); t++) {
+						qtf << (t ? ", " : " ") << '[';
+						const char *sp = split[t];
+						if(*sp == '!') {
+							qtf << '*';
+							sp++;
+						}
+						qtf << '^' << sp << "^ " << (t + 1) << ']';
+					}
+			}
+			qtf << "&]\n";
+		}
+	}
+}
+
+static void sMakeIndexDyna(String& qtf) { sMakeIndex(qtf, false); }
+static void sMakeIndexBook(String& qtf) { sMakeIndex(qtf, true); }
+
+RegisterHelpTopicSys("index", t_("Index"), callback(&sMakeIndexDyna));
+RegisterHelpTopicSys("index_book", "Rejst��k", callback(&sMakeIndexBook));
+
+static void HelpTopicListDefault(String& out)
+{
+	Vector<String> ids;
+	Vector<String> names;
+	Vector<String> strip;
+	const ArrayMap<String, HelpTopicInfo>& map = HelpTopicMap();
+	int lang = GetCurrentLanguage();
+	int i;
+	for(i = 0; i < map.GetCount(); i++) {
+		String topic = map.GetKey(i);
+		if(*topic == '[')
+			continue;
+		const HelpTopicInfo& info = map[i];
+//		if(map.GetKey(i) == "HelpTopicList" || !IsNull(info.GetText()))
+		{
+			String title = Nvl(info.GetTitle(), map.GetKey(i));
+			names.Add(title);
+			ids.Add(map.GetKey(i));
+			strip.Add(MQTFStrip(title));
+		}
+	}
+	Vector<int> order = GetSortOrder(strip, GetLanguageInfo());
+	for(i = 1; i < order.GetCount(); i++)
+		if(GetLanguageInfo().Compare(strip[order[i]], strip[order[i - 1]]) < 0) {
+			RLOG("sort order error: " << strip[order[i - 1]] << " > " << strip[order[i]]);
+		}
+
+	RichText text;
+	RichPara::CharFormat cformat;
+	cformat.Face(Font::ARIAL).Height(180).Bold(); {
+		RichPara para;
+		para.Cat(WString("Automatick� obsah"), cformat);
+		para.format.after = 100;
+		text.Cat(para);
+	}
+
+	cformat.Height(84).NoBold();
+	for(i = 0; i < order.GetCount(); i++) {
+		RichPara para;
+		MQTFCat(para, names[order[i]], cformat);
+		for(int p = 0; p < para.part.GetCount(); p++)
+			para.part[p].format.link = ids[order[i]];
+		text.Cat(para);
+	}
+	out.Cat(BodyAsQTF(text));
+}
+
+RegisterHelpTopicHost("topics_auto", CNULL, callback(&HelpTopicListDefault))
+
+static void sBookExpand(String& qtf)
+{
+	RichText::FormatInfo empty;
+	empty.charvalid = empty.paravalid = 0;
+	RichText text = HelpTopicExpand(HelpHostDPP("book"), Null, empty);
+	qtf = BodyAsQTF(text);
+}
+
+RegisterHelpTopicSys("book_expand", "", callback(&sBookExpand));
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/TCtrlLib/Help/helputil.cpp b/uppsrc/TCtrlLib/Help/helputil.cpp
new file mode 100644
index 000000000..c9f7fa1bf
--- /dev/null
+++ b/uppsrc/TCtrlLib/Help/helputil.cpp
@@ -0,0 +1,1910 @@
+#include "TCtrlLibHelp.h"
+#pragma hdrstop
+
+#include <plugin/gif/gif.h>
+#include <DocTypes/DocTypes.h>
+#include <PdfDraw/PdfDraw.h>
+
+NAMESPACE_UPP
+
+#define LLOG(x) // RLOG(x)
+
+String MQTFStrip(const char *p)
+{
+	return FromUnicode(MQTFStrip(WString(String(p))));
+}
+
+WString MQTFStrip(const wchar *p)
+{
+	WString out;
+	Vector<bool> symbol_stack;
+	bool is_symbol = false;
+	for(; *p; p++)
+		if(*p == '[') {
+			symbol_stack.Add(is_symbol);
+			while(*++p != ' ')
+				if(!*p)
+					return out;
+				else if(*p == 'S')
+					is_symbol = true;
+		}
+		else if(*p == ']') {
+			if(!symbol_stack.IsEmpty())
+				is_symbol = symbol_stack.Pop();
+		}
+		else if(*p == '-' && p[1] == '|') {
+			out.Cat('\t');
+			p++;
+		}
+		else {
+			WString part;
+			if(*p == '\1') {
+				const wchar *b = ++p;
+				while(*p && *p != '\1')
+					p++;
+				part = WString(b, p);
+				if(!*p)
+					p--;
+			}
+			else if((*p == '`' || *p == '\\') && p[1])
+				part.Cat(*++p);
+			else
+				part.Cat(*p);
+			if(!is_symbol)
+				out.Cat(part);
+			else
+				for(const wchar *s = part; *s; s++)
+					switch(*s) {
+					case 163: out << '<' << '='; break;
+					case 171: out << '<' << '-' << '>'; break;
+					case 172: out << '<' << '-'; break;
+					case 173: out << '^'; break;
+					case 174: out << '-' << '>'; break;
+					case 177: out << '+' << '-'; break;
+					case 178: out << '\"'; break;
+					case 179: out << '>' << '='; break;
+					default:  out.Cat(*s);
+					}
+		}
+	return out;
+}
+
+void MQTFCat(RichPara& para, const char *p, const RichPara::CharFormat& basefmt)
+{
+	Array<RichPara::CharFormat> stack;
+	stack.Add(basefmt);
+	const char *b = p;
+	while(*p)
+		if(*p == '[') {
+			if(p > b)
+				para.Cat(WString(b, p), stack.Top());
+			RichPara::CharFormat fmt = stack.Top();
+			for(p++; *p && *p != ']' && *p != ' '; p++)
+				if(*p == '/')
+					fmt.Italic(!fmt.IsItalic());
+				else if(*p == '*')
+					fmt.Bold(!fmt.IsBold());
+				else if(*p == '_')
+					fmt.Underline(!fmt.IsUnderline());
+				else if(*p == '-')
+					fmt.Strikeout(!fmt.IsStrikeout());
+				else if(*p == 'S' || *p == 'C' || *p == 'R' || *p == 'A')
+					fmt.Face(*p == 'S' ? Font::SYMBOL : *p == 'C' ? Font::COURIER
+						: *p == 'R' ? Font::ROMAN : Font::ARIAL);
+				else if(*p == ';')
+					;
+				else {
+					String str;
+					para.Cat((str << "??[" << *p << "??").ToWString(), fmt);
+				}
+			stack.Add(fmt);
+			b = ++p;
+		}
+		else if(*p == ']') {
+			if(p > b)
+				para.Cat(WString(b, p), stack.Top());
+			if(stack.GetCount() > 1)
+				stack.Drop();
+			else
+				para.Cat(WString("??UNDER??"), stack.Top());
+			b = ++p;
+		}
+		else if(*p == '`' || *p == '\\') {
+			if(p > b)
+				para.Cat(WString(b, p), stack.Top());
+			if(*(b = ++p))
+				p++;
+		}
+		else if(*p == '-' && p[1] == '|') {
+			if(p > b)
+				para.Cat(WString(b, p), stack.Top());
+			para.Cat(WString(wchar('\t'), 1), stack.Top());
+			b = (p += 2);
+		}
+		else if(*p == '\1') {
+			if(p > b)
+				para.Cat(WString(b, p), stack.Top());
+			b = p + 1;
+			while(*++p && *p != '\1')
+				;
+			if(p > b)
+				para.Cat(WString(b, p), stack.Top());
+			if(*p)
+				p++;
+			b = p;
+		}
+		else
+			p++;
+	if(p > b)
+		para.Cat(WString(b, p), stack.Top());
+}
+
+/*
+class HelpDialogFrame : public CtrlFrame
+{
+public:
+	HelpDialogFrame();
+
+	void         Title(const String& t) { title = t; }
+
+	virtual void FrameLayout(Rect& r);
+	virtual void FrameAddSize(Size& sz);
+	virtual void FramePaint(Draw& w, const Rect& r);
+	virtual void FrameAdd(Ctrl& parent);
+	virtual void FrameRemove();
+
+public:
+	Button       minimize, maximize, close;
+	String       title;
+};
+
+HelpDialogFrame::HelpDialogFrame()
+{
+	minimize.SetImage(CtrlImg::FrameMinimizeBox());
+	maximize.SetImage(CtrlImg::FrameMaximizeBox());
+	close.SetImage(CtrlImg::FrameCloseBox());
+}
+
+void HelpDialogFrame::FrameLayout(Rect& r)
+{
+	r.Deflate(4);
+	close   .SetFrameRect(r.right - 1 * 16 - 2, r.top + 2, 16, 14);
+	maximize.SetFrameRect(r.right - 2 * 16 - 2, r.top + 2, 16, 14);
+	minimize.SetFrameRect(r.right - 3 * 16 - 2, r.top + 2, 16, 14);
+	r.top += 2 * 2 + 14;
+}
+
+void HelpDialogFrame::FrameAddSize(Size& sz)
+{
+	sz.cy += 2 * 2 + 14 + 2 * 4;
+	sz.cx += 2 * 4;
+}
+
+void HelpDialogFrame::FramePaint(Draw& w, const Rect& r)
+{
+	DrawFrame(w, r, SWhiteGray, SBlack);
+	DrawFrame(w, r.Deflated(1), SWhite, SGray);
+	DrawFrame(w, r.Deflated(2), SLtGray, SLtGray);
+	DrawFrame(w, r.Deflated(3), SLtGray, SLtGray);
+	w.DrawRect(r.left + 4, r.top + 4, r.Width() - 8, 14 + 2 * 2, SBlue);
+	w.DrawText(r.left + 6, r.top + 6, title, StdFont().Bold(), SWhite);
+}
+
+void HelpDialogFrame::FrameAdd(Ctrl& parent)
+{
+	parent << minimize << maximize << close;
+}
+
+void HelpDialogFrame::FrameRemove()
+{
+	minimize.Remove();
+	maximize.Remove();
+	close.Remove();
+}
+*/
+
+/*
+Drawing CtrlToDrawing(Ctrl *ctrl, Point arrow, Image arrow_image)
+{
+	Size size = ctrl->GetRect().Size();
+	Drawing dwg;
+
+	{
+		DrawingDraw dd(size);
+		dd.SetPixels();
+		ctrl->DrawCtrl(dd);
+		dwg = dd;
+	}
+
+	if(!ctrl->IsChild())
+		if(TopWindow *top = dynamic_cast<TopWindow *>(ctrl)) {
+			HelpDialogFrame frame;
+			frame.Title(top->GetTitle().ToString());
+			TopWindow temp;
+			temp.SetFrame(frame);
+			Size total = temp.AddFrameSize(size);
+			temp.SetRect(total);
+			temp.Background(PaintRect(DrawingDisplay(), dwg));
+			DrawingDraw dd(total);
+			dd.SetPixels();
+			temp.DrawCtrl(dd);
+			dwg = dd;
+		}
+
+	return dwg;
+}
+*/
+
+Image CtrlToStillImage(Ctrl *ctrl, Point arrow, Image arrow_image)
+{
+	Image img;
+#ifdef PLATFORM_WIN32
+	HWND hwnd;
+	Ctrl *wnd_ctrl = ctrl;
+	while(wnd_ctrl && !(hwnd = wnd_ctrl->GetHWND()))
+		wnd_ctrl = wnd_ctrl->GetParent();
+	if(!hwnd)
+		return Null;
+	Rect wrc;
+	::GetWindowRect(hwnd, wrc);
+	Rect rc = wrc;
+	if(ctrl != wnd_ctrl) {
+		rc = ctrl->GetScreenRect() - wnd_ctrl->GetScreenRect().TopLeft();
+		Point lt = rc.TopLeft(), rb = rc.BottomRight();
+		::ClientToScreen(hwnd, lt);
+		::ClientToScreen(hwnd, rb);
+		rc = Rect(lt, rb);
+	}
+	HDC sdc = GetWindowDC(0);
+	ImageDraw idraw(rc.Size());
+	BitBlt(idraw, 0, 0, rc.Width(), rc.Height(), sdc, rc.left, rc.top, SRCCOPY);
+	ReleaseDC(0, sdc);
+	if(!IsNull(arrow)) {
+		Point p(0, 0);
+		::ClientToScreen(hwnd, p);
+		arrow += p - wrc.TopLeft();
+		Image im = Nvl(arrow_image, Image::Arrow());
+		arrow -= im.GetHotSpot();
+		idraw.DrawImage(arrow.x, arrow.y, im);
+	}
+	img = idraw;
+#endif
+	return img;
+}
+
+struct BarHelpItemDeep
+{
+	String         drl;
+	String         text;
+	Image          image;
+	String         help;
+	String         description;
+};
+
+struct BarHelpItem : BarHelpItemDeep, DeepCopyOption<BarHelpItem>
+{
+	BarHelpItem() {}
+	BarHelpItem(const BarHelpItem& i, int deep)
+		: BarHelpItemDeep(i), deep_drl(i.deep_drl, deep), deep_text(i.deep_text, deep), keys(i.keys, deep) {}
+
+	Vector<String> deep_drl;
+	Vector<String> deep_text;
+	Vector<dword>  keys;
+
+	void           HelpList(String& out) const;
+	void           HelpTitle(String& out) const;
+	void           HelpText(String& out) const;
+};
+
+void BarHelpItem::HelpTitle(String& out) const
+{
+	for(int i = 0; i < deep_text.GetCount(); i++)
+		out << '\1' << deep_text[i] << "\1 `| ";
+	out << '\1' << text << '\1';
+}
+
+void BarHelpItem::HelpList(String& out) const
+{
+	RichPara link;
+	RichPara::CharFormat format;
+	format.Face(Font::ARIAL).Height(84);
+	link.Cat(FieldTypeLinkID(), EncodeLink(drl, Null, Null), format);
+	RichText text;
+	text.Cat(link);
+	out << BodyAsQTF(text);
+/*	out <<
+	out << "[^" << drl << "^ ";
+	for(int i = 0; i < deep_text.GetCount(); i++)
+		out << '\1' << deep_text[i] << "\1 `| ";
+	out << '\1' << text << "\1]";
+*/
+}
+
+void BarHelpItem::HelpText(String& out) const
+{
+#ifndef NEWIMAGE
+	RichPara::CharFormat cformat;
+	cformat.Face(Font::ARIAL).Height(84);
+	RichPara para;
+	if(!IsNull(image)) {
+		Image opaque = image;
+		ImageKillMask(opaque, White());
+		para.Cat(RichObject("PNG",
+			PngEncoder().SaveImage(opaque), PixelsToDots(ScreenInfo(), opaque.GetSize())), cformat);
+		para.Cat(WString(" "), cformat);
+	}
+//	para.Cat(text, cformat);
+	if(!keys.IsEmpty()) {
+		String out_keys;
+		for(int i = 0; i < keys.GetCount(); i++) {
+			para.Cat(WString(i ? ", " : "("), cformat);
+			cformat.Bold();
+			para.Cat(GetKeyDesc(keys[i]).ToWString(), cformat);
+			cformat.NoBold();
+		}
+		para.Cat(WString(")"), cformat);
+	}
+	RichText rtext;
+	rtext.Cat(para);
+	para.part.Clear();
+	if(!IsNull(help)) {
+		para.Cat(help.ToWString(), cformat);
+		rtext.Cat(para);
+		para.part.Clear();
+	}
+	if(!IsNull(description)) {
+		para.Cat(description.ToWString(), cformat);
+		rtext.Cat(para);
+		para.part.Clear();
+	}
+	out.Cat(BodyAsQTF(rtext));
+#endif
+}
+
+class BarHelpMap
+{
+public:
+	BarHelpMap(const String& ident, const String& module);
+
+	void               HelpText(String& out);
+
+	void               Add(const BarHelpItem& item);
+
+private:
+	String             module;
+	Array<BarHelpItem> items;
+};
+
+BarHelpMap::BarHelpMap(const String& ident, const String& module)
+: module(module)
+{
+	HelpTopicAdd(HelpAppDPP(ident + "$"), module, CNULL, callback(this, &BarHelpMap::HelpText));
+}
+
+void BarHelpMap::HelpText(String& out)
+{
+	for(int i = 0; i < items.GetCount(); i++) {
+		if(i) out << "&\r\n";
+		items[i].HelpList(out);
+	}
+}
+
+void BarHelpMap::Add(const BarHelpItem& item)
+{
+	BarHelpItem& i = items.Add();
+	i <<= item;
+	HelpTopicAdd(i.drl, module,
+		callback(&i, &BarHelpItem::HelpTitle),
+		callback(&i, &BarHelpItem::HelpText));
+}
+
+class BarScanHelp : public Bar
+{
+private:
+	struct HelpItem : public Bar::Item {
+		virtual Item& Text(const char *s)            { info.text = s; return *this; }
+		virtual Item& Key(dword _key)                { info.keys.Add(_key); return *this; }
+		virtual Item& Image(const UPP::Image& img)   { info.image = img; return *this;  }
+		virtual Item& Help(const char *hlp)          { info.help = hlp; return *this; }
+		virtual Item& Topic(const char *help)        { info.drl = HelpAppDPP(help); return *this; }
+		virtual Item& Description(const char *help)  { info.description = help; return *this; }
+
+		BarHelpItem   info;
+	};
+
+	HelpItem        item;
+	Callback1<Bar&> submenu;
+	String          ident;
+	BarHelpMap&     map;
+
+protected:
+	virtual Item&   AddItem(Callback cb)              { Flush(); return item; }
+	virtual Item&   AddSubMenu(Callback1<Bar&> proc)  { Flush(); submenu = proc; return item; }
+	virtual void    AddCtrl(Ctrl *ctrl, int gapsize)  {}
+	virtual void    AddCtrl(Ctrl *ctrl, Size sz)      {}
+
+public:
+	void            Flush();
+
+	virtual bool    IsMenuBar() const                 { return true; }
+	virtual bool    IsToolBar() const                 { return true; }
+	virtual bool    IsScanHelp() const                { return true; }
+
+	virtual bool    IsEmpty() const                   { return false; }
+	virtual void    Separator()                       {}
+
+	BarScanHelp(BarHelpMap& map, const String& ident) : map(map), ident(ident) {}
+};
+
+void BarScanHelp::Flush()
+{
+	String t = item.info.text = StripHotText(item.info.text);
+	if(!IsNull(item.info.drl))
+		map.Add(item.info);
+	BarHelpItem old_item = item.info;
+	item.info = BarHelpItem();
+	item.info.deep_drl <<= old_item.deep_drl;
+	item.info.deep_text <<= old_item.deep_text;
+	Callback1<Bar&> proc = submenu;
+	submenu = CNULL;
+	if(proc) {
+		item.info.deep_drl.Add(old_item.drl);
+		item.info.deep_text.Add(old_item.text);
+		proc(*this);
+		item.info = old_item;
+	}
+}
+
+void RegisterHelpMenuItems(Callback1<Bar&> barproc, String ident, String module)
+{
+	static Array<BarHelpMap> maps;
+	BarHelpMap& map = maps.Add(new BarHelpMap(ident, module));
+	BarScanHelp bsh(map, ident);
+	barproc(bsh);
+	bsh.Flush();
+}
+
+void RegisterHelpFieldTypes()
+{
+	RichPara::Register(FieldTypeLinkID(), FieldTypeLink());
+	RichPara::Register(FieldTypeIndexID(), FieldTypeIndex());
+	RichPara::Register(FieldTypeSectionID(), FieldTypeSection());
+}
+
+struct FieldTypeLinkCls : public RichPara::FieldType
+{
+	virtual Array<RichPara::Part> Evaluate(const String& param, VectorMap<String, Value>& vars,
+		const RichPara::CharFormat& fmt);
+};
+
+Array<RichPara::Part> FieldTypeLinkCls::Evaluate(const String& param,
+	VectorMap<String, Value>& vars, const RichPara::CharFormat& linkfmt)
+{
+	String drl, text, style;
+	DecodeLink(param, drl, text, style);
+	RichPara para;
+	RichPara::CharFormat fmt = linkfmt;
+	bool book = ((int)vars.Get("$book", 0) > 0);
+	RichPara::CharFormat myfmt = fmt;
+	if(IsNull(drl)) {
+		myfmt.ink = LtRed;
+		myfmt.paper = WhiteGray;
+		para.Cat(WString("C�l odkazu nen� zad�n."), myfmt);
+	}
+	else if(HelpTopicMap().Find(drl) < 0) {
+		myfmt.ink = LtRed;
+		myfmt.paper = WhiteGray;
+		para.Cat(WString("Nedefinov�no: "), myfmt);
+		myfmt.Bold();
+		para.Cat(drl.ToWString(), myfmt);
+	}
+	else if(text == "." || text == ".." || text == "=") {
+		RichPara::CharFormat bfmt = myfmt;
+		bfmt.ink = Green;
+		bfmt.paper = myfmt.paper = WhiteGray;
+		bfmt.Bold();
+		para.Cat(WString(text[0] == '=' ? "inline expand(" : text[1] ? "nested expand(" : "expand("), bfmt);
+		para.Cat(drl.ToWString(), myfmt);
+		String title = HelpTopicGet(drl).GetTitle();
+		if(!IsNull(title)) {
+			para.Cat(WString(": "), bfmt);
+			MQTFCat(para, title, myfmt);
+		}
+		para.Cat(WString(")"), bfmt);
+	}
+	else {
+		if(IsNull(text))
+			text = HelpTopicGet(drl).GetTitle();
+		if(IsNull(text)) {
+			myfmt.ink = LtBlue;
+			para.Cat(WString("Bez nadpisu: "), myfmt);
+			myfmt.Bold();
+			para.Cat(drl.ToWString(), myfmt);
+		}
+		else {
+			if(!book)
+				myfmt.link = drl;
+			MQTFCat(para, text, myfmt);
+			if(book && !IsNull(style)) {
+				String out;
+				for(const char *p = style; *p; p++)
+					if(*p == '#')
+						out << StdFormat(vars.Get(drl, Null));
+					else
+						out.Cat(*p);
+				myfmt.NoBold();
+				MQTFCat(para, out, myfmt);
+			}
+		}
+	}
+	return para.part;
+}
+
+RichPara::FieldType& FieldTypeLink()
+{
+	static FieldTypeLinkCls ftl;
+	return ftl;
+}
+
+Id FieldTypeLinkID() { static Id ftl("LINK"); return ftl; }
+
+struct FieldTypeSectionCls : public RichPara::FieldType
+{
+	virtual Array<RichPara::Part> Evaluate(const String& param, VectorMap<String, Value>& vars,
+		const RichPara::CharFormat& fmt);
+};
+
+Array<RichPara::Part> FieldTypeSectionCls::Evaluate(const String& param,
+	VectorMap<String, Value>& vars, const RichPara::CharFormat& basefmt)
+{
+	RichTextSection section = DecodeSection(param);
+	RichPara para;
+	RichPara::CharFormat fmt = basefmt;
+	fmt.paper = WhiteGray;
+	RichPara::CharFormat ctlfmt = fmt, datafmt = fmt;
+	ctlfmt.ink = Green;
+	ctlfmt.Bold();
+	datafmt.Bold();
+	para.Cat(WString(section.nested ? "nested section(" : "section("), ctlfmt);
+	bool first = true;
+//	if(!IsNull(section.pagesize))
+//	{
+//		para.Cat(String("pagesize "), fmt);
+//		para.Cat(NFormat("%d x %d", section.pagesize.cx, section.pagesize.cy), datafmt);
+//		first = false;
+//	}
+	if(!IsNull(section.columns) || !IsNull(section.column_space)) {
+		if(!first) para.Cat(WString("; "), ctlfmt);
+		para.Cat(WString("columns<"), fmt);
+		bool done = false;
+		if(!IsNull(section.columns)) {
+			para.Cat(FormatInt(section.columns).ToWString(), datafmt);
+			done = true;
+		}
+		if(!IsNull(section.column_space)) {
+			if(done) para.Cat(WString(", "), ctlfmt);
+			para.Cat(WString("spacing "), fmt);
+			para.Cat(FormatInt(section.column_space).ToWString(), datafmt);
+		}
+		para.Cat(WString(">"), fmt);
+		first = false;
+	}
+	if(!IsNull(section.firstpage)) {
+		if(!first) para.Cat(WString("; "), ctlfmt);
+		para.Cat(WString("firstpage "), fmt);
+		para.Cat(FormatInt(section.firstpage).ToWString(), datafmt);
+		first = false;
+	}
+	if(!IsNull(section.margin.left) || !IsNull(section.margin.top)
+	|| !IsNull(section.margin.right) || !IsNull(section.margin.bottom)) {
+		if(!first) para.Cat(WString("; "), ctlfmt);
+		para.Cat(WString("margin<"), fmt);
+		bool done = false;
+		if(!IsNull(section.margin.left)) {
+			para.Cat(WString("left "), fmt);
+			para.Cat(FormatInt(section.margin.left).ToWString(), datafmt);
+			done = true;
+		}
+		if(!IsNull(section.margin.top)) {
+			if(done) para.Cat(WString(", "), ctlfmt);
+			para.Cat(WString("top "), fmt);
+			para.Cat(FormatInt(section.margin.top).ToWString(), datafmt);
+			done = true;
+		}
+		if(!IsNull(section.margin.right)) {
+			if(done) para.Cat(WString(", "), ctlfmt);
+			para.Cat(WString("right "), fmt);
+			para.Cat(FormatInt(section.margin.right).ToWString(), datafmt);
+			done = true;
+		}
+		if(!IsNull(section.margin.bottom)) {
+			if(done) para.Cat(WString(", "), ctlfmt);
+			para.Cat(WString("bottom "), fmt);
+			para.Cat(FormatInt(section.margin.bottom).ToWString(), datafmt);
+			done = true;
+		}
+		para.Cat(WString(">"), fmt);
+		first = false;
+	}
+	static const char *hftypes[] = { "left", "center", "right" };
+	if(!IsNull(section.header_space) || !section.header[0].IsVoid()
+	|| !section.header[1].IsVoid() || !section.header[2].IsVoid()) {
+		if(!first) para.Cat(WString("; "), ctlfmt);
+		para.Cat(WString("header<"), fmt);
+		bool done = false;
+		if(!IsNull(section.header_space)) {
+			para.Cat(FormatInt(section.header_space).ToWString(), datafmt);
+			done = true;
+		}
+		for(int i = 0; i < 3; i++)
+			if(!section.header[i].IsVoid()) {
+				if(done) para.Cat(WString(", "), ctlfmt);
+				para.Cat((String().Cat() << hftypes[i] << ' ').ToWString(), fmt);
+				para.Cat(section.header[i].ToWString(), datafmt);
+				done = true;
+			}
+		para.Cat(WString(">"), fmt);
+	}
+	if(!IsNull(section.footer_space) || !section.footer[0].IsVoid()
+	|| !section.footer[1].IsVoid() || !section.footer[2].IsVoid()) {
+		if(!first) para.Cat(WString("; "), ctlfmt);
+		para.Cat(WString("footer<"), fmt);
+		bool done = false;
+		if(!IsNull(section.footer_space)) {
+			para.Cat(FormatInt(section.footer_space).ToWString(), datafmt);
+			done = true;
+		}
+		for(int i = 0; i < 3; i++)
+			if(!section.footer[i].IsVoid()) {
+				if(done) para.Cat(WString(", "), ctlfmt);
+				para.Cat((String().Cat() << hftypes[i] << ' ').ToWString(), fmt);
+				para.Cat(section.footer[i].ToWString(), datafmt);
+				done = true;
+			}
+		para.Cat(WString(">"), fmt);
+	}
+	para.Cat(WString(")"), ctlfmt);
+	return para.part;
+}
+
+RichPara::FieldType& FieldTypeSection()
+{
+	static FieldTypeSectionCls ftl;
+	return ftl;
+}
+
+Id FieldTypeSectionID() { static Id ftl("SECTION"); return ftl; }
+
+RichTextSection::RichTextSection()
+//: pagesize(Null)
+{
+	nested = false;
+	columns = Null;
+	firstpage = Null;
+	margin.left = margin.top = margin.right = margin.bottom = Null;
+	header_space = footer_space = column_space = Null;
+	header[0] = header[1] = header[2] =
+	footer[0] = footer[1] = footer[2] = String::GetVoid();
+}
+
+Rect RichTextSection::GetPageRect(Size pagesize) const
+{
+	return Rect(pagesize).Deflated(margin);
+}
+
+Rect RichTextSection::GetTextRect(Size pagesize, int colindex) const
+{
+	Rect textarea = GetPageRect(pagesize).Deflated(0, header_space, 0, footer_space);
+	if(columns <= 1)
+		return textarea;
+	int colwd = (textarea.Width() - column_space * (columns - 1)) / columns;
+	int offset = iscale(textarea.Width() - colwd, colindex, columns - 1);
+	textarea.left += offset;
+	textarea.right = textarea.left + colwd;
+	return textarea;
+}
+
+Size RichTextSection::GetTextSize(Size pagesize) const
+{
+	return GetTextRect(pagesize, 0).Size();
+}
+
+void RichTextSection::MakeDefault()
+{
+//	pagesize = pg;
+	columns = 1;
+	firstpage = 1;
+	margin = Rect(0, 0, 0, 0);
+	header_space = 200;
+	footer_space = 200;
+	column_space = 200;
+//	footer[1] = "- # -";
+}
+
+void RichTextSection::Override(RichTextSection& old) const
+{
+//	old.pagesize      = Nvl(pagesize, old.pagesize);
+	old.columns       = Nvl(columns, old.columns);
+	old.firstpage     = firstpage;
+	old.charformat    = charformat;
+	old.header_space  = Nvl(header_space, old.header_space);
+	old.footer_space  = Nvl(footer_space, old.footer_space);
+	old.column_space  = Nvl(column_space, old.column_space);
+	old.margin.left   = Nvl(margin.left, old.margin.left);
+	old.margin.top    = Nvl(margin.top, old.margin.top);
+	old.margin.right  = Nvl(margin.right, old.margin.right);
+	old.margin.bottom = Nvl(margin.bottom, old.margin.bottom);
+	for(int i = 0; i < 3; i++) {
+		if(!header[i].IsVoid()) old.header[i] = header[i];
+		if(!footer[i].IsVoid()) old.footer[i] = footer[i];
+	}
+}
+
+static inline void EncodeInt(String& out, const char *tag, int value)
+{
+	if(!IsNull(value))
+		out << tag << ' ' << value << "; ";
+}
+
+String EncodeSection(const RichTextSection& sec)
+{
+	String out;
+//	if(!IsNull(sec.pagesize))
+//		out << "pagesize " << sec.pagesize.cx << " " << sec.pagesize.cy << "; ";
+	if(sec.nested) out << "nested; ";
+	EncodeInt(out, "columns",       sec.columns);
+	EncodeInt(out, "column_space",  sec.column_space);
+	EncodeInt(out, "firstpage",     sec.firstpage);
+	EncodeInt(out, "margin_left",   sec.margin.left);
+	EncodeInt(out, "margin_top",    sec.margin.top);
+	EncodeInt(out, "margin_right",  sec.margin.right);
+	EncodeInt(out, "margin_bottom", sec.margin.bottom);
+	EncodeInt(out, "header_space",  sec.header_space);
+	EncodeInt(out, "footer_space",  sec.footer_space);
+	for(int i = 0; i < 3; i++) {
+		if(!sec.header[i].IsVoid())
+			out << "header[" << i << "] " << AsCString(sec.header[i]) << "; ";
+		if(!sec.footer[i].IsVoid())
+			out << "footer[" << i << "] " << AsCString(sec.footer[i]) << "; ";
+	}
+	return out;
+}
+
+RichTextSection DecodeSection(String sect)
+{
+	RichTextSection out;
+	CParser parser(sect, "", 1);
+	try {
+		for(; !parser.IsEof(); parser.PassChar(';'))
+//			if(parser.Id("pagesize"))
+//			{
+//				out.pagesize.cx = parser.ReadInt();
+//				out.pagesize.cy = parser.ReadInt();
+//			}
+//			else
+			/**/ if(parser.Id("nested"))        out.nested        = true;
+			else if(parser.Id("columns"))       out.columns       = parser.ReadInt();
+			else if(parser.Id("firstpage"))     out.firstpage     = parser.ReadInt();
+			else if(parser.Id("header_space"))  out.header_space  = parser.ReadInt();
+			else if(parser.Id("footer_space"))  out.footer_space  = parser.ReadInt();
+			else if(parser.Id("column_space"))  out.column_space  = parser.ReadInt();
+			else if(parser.Id("margin_left"))   out.margin.left   = parser.ReadInt();
+			else if(parser.Id("margin_top"))    out.margin.top    = parser.ReadInt();
+			else if(parser.Id("margin_right"))  out.margin.right  = parser.ReadInt();
+			else if(parser.Id("margin_bottom")) out.margin.bottom = parser.ReadInt();
+			else if(parser.Id("header")) {
+				parser.PassChar('[');
+				int index = parser.ReadInt();
+				if(index < 0 || index >= 3)
+					parser.ThrowError(NFormat("invalid header index: %d", index));
+				parser.PassChar(']');
+				out.header[index] = parser.ReadString();
+			}
+			else if(parser.Id("footer")) {
+				parser.PassChar('[');
+				int index = parser.ReadInt();
+				if(index < 0 || index >= 3)
+					parser.ThrowError(NFormat("invalid footer index: %d", index));
+				parser.PassChar(']');
+				out.footer[index] = parser.ReadString();
+			}
+			else
+				parser.ThrowError("invalid text section parameter");
+	}
+	catch(Exc e) {
+		RLOG("DecodeSection: " << e);
+	}
+	return out;
+}
+
+struct FieldTypeIndexCls : public RichPara::FieldType
+{
+	virtual Array<RichPara::Part> Evaluate(const String& param, VectorMap<String, Value>& vars,
+		const RichPara::CharFormat& fmt);
+};
+
+Array<RichPara::Part> FieldTypeIndexCls::Evaluate(const String& param,
+	VectorMap<String, Value>& vars, const RichPara::CharFormat& linkfmt)
+{
+	RichTextIndex idx = DecodeIndex(param);
+	RichPara para;
+	RichPara::CharFormat ctlfmt = linkfmt, fmt = linkfmt;
+	ctlfmt.ink = Green;
+	ctlfmt.Bold();
+	if((int)vars.Get("$book", 0) <= 0) { // hypertext
+		ctlfmt.paper = fmt.paper = WhiteGray;
+		para.Cat(WString("index("), ctlfmt);
+		for(int i = 0; i < idx.reflist.GetCount(); i++) {
+			if(i)
+				para.Cat(WString("; "), ctlfmt);
+			String space, nesting, topic;
+			const char *drl = idx.reflist[i];
+			if(*drl == '!')
+				drl++;
+			HelpParseDPP(drl, space, nesting, topic);
+			para.Cat(topic.ToWString(), fmt);
+		}
+		para.Cat(WString(")"), ctlfmt);
+	}
+	else {
+		Index<String> pageref;
+		int i;
+		for(i = 0; i < idx.reflist.GetCount(); i++) {
+			String ref = idx.reflist[i];
+			if(*ref == '!')
+				ref.Remove(0);
+			int f = vars.Find(ref);
+			if(f < 0)
+				f = vars.Find(HelpAppDPP(ref));
+			String s = StdFormat(f >= 0 ? vars[f] : Value());
+			if(!IsNull(s))
+				pageref.FindAdd(s);
+		}
+		Vector<String> pagelist = pageref.PickKeys();
+		Sort(pagelist, GetLanguageInfo());
+		for(i = 0; i < pagelist.GetCount(); i++)
+			if(!i || pagelist[i] != pagelist[i - 1]) {
+				if(i)
+					para.Cat(WString(", "), fmt);
+				para.Cat(pagelist[i].ToWString(), fmt);
+			}
+	}
+	return para.part;
+}
+
+RichPara::FieldType& FieldTypeIndex()
+{
+	static FieldTypeIndexCls ftl;
+	return ftl;
+}
+
+Id FieldTypeIndexID() { static Id ftl("INDEX"); return ftl; }
+
+String EncodeIndex(const RichTextIndex& idx)
+{
+	return Join(idx.reflist, ";");
+}
+
+RichTextIndex DecodeIndex(String packed)
+{
+	RichTextIndex out;
+	out.reflist = Split(packed, ';');
+	return out;
+}
+
+String EncodeLink(String target, String text, String style)
+{
+	return target + "\t" + text + "\t" + style;
+}
+
+void DecodeLink(String link, String& target, String& text, String& style)
+{
+	const char *p = link, *b = p;
+	while(*p && *p != '\t')
+		p++;
+	target = String(b, p);
+	text = style = Null;
+	if(*p == '\t') {
+		b = ++p;
+		while(*p && *p != '\t')
+			p++;
+		text = String(b, p);
+		if(*p == '\t')
+			style = p + 1;
+	}
+}
+
+String AsCStringWrap(const char *s, int linemax, const char *prefix)
+{
+	if(!s || !*s)
+		return "\"\"";
+	String out, best, next;
+	for(; *s; s++)
+		if((byte)*s >= ' ') {
+			if(*s == '\"' || *s == '\\' || *s == '\'')
+				next.Cat('\\');
+			next.Cat(*s);
+			if(*s == ' ') {
+				if(!best.IsEmpty() && best.GetLength() + next.GetLength() > linemax) {
+					if(!out.IsEmpty())
+						out << '\n' << prefix;
+					out << '\"' << best << '\"';
+					best = Null;
+				}
+				best.Cat(next);
+				next = Null;
+			}
+		}
+		else if(*s == '\n') {
+			next.Cat("\\n");
+			if(!out.IsEmpty())
+				out << '\n' << prefix;
+			out << '\"' << best << next << '\"';
+			best = next = Null;
+		}
+		else
+			switch(*s) {
+			case '\a': next << "\\a"; break;
+			case '\b': next << "\\b"; break;
+			case '\t': next << "\\t"; break;
+			case '\v': next << "\\v"; break;
+			case '\f': next << "\\f"; break;
+			case '\r': next << "\\r"; break;
+			default:   next << '\\' << FormatIntOct((byte)*s, 3); break;
+			}
+	if(!best.IsEmpty() || !next.IsEmpty()) {
+		if(!out.IsEmpty())
+			out << '\n' << prefix;
+		out << '\"' << best << next << '\"';
+	}
+	return out;
+}
+
+
+RichObject CreateImageObject(Image image, Size dot_size, Size out_size)
+{
+#ifndef NEWIMAGE
+	RichObject out("PNG", PngEncoder().DotSize(dot_size).SaveImage(image));
+	out.SetSize(out_size);
+#else
+	RichObject out("PNG", Null);
+#endif
+	return out;
+}
+
+struct RichObjectTypeEmptyCls : public RichObjectType
+{
+	RichObjectTypeEmptyCls() {}
+
+	virtual String GetTypeName(const Value&) const { return "EMPTY"; }
+	virtual Size   GetPhysicalSize(const Value& data) const { return Size(0, 0); }
+	virtual Size   GetPixelSize(const Value& data) const { return Size(1, 1); }
+	virtual void   Paint(const Value& data, Draw& w, Size sz) const {}
+};
+
+RichObjectType *RichObjectTypeEmpty() { return &Single<RichObjectTypeEmptyCls>(); }
+
+#if 0
+struct RichObjectTypeGIFCls : public RichObjectType
+{
+	RichObjectTypeGIFCls() {}
+
+	virtual String GetTypeName(const Value&) const;
+	virtual Size   GetPhysicalSize(const Value& data) const;
+	virtual Size   GetPixelSize(const Value& data) const;
+	virtual void   Paint(const Value& data, Draw& w, Size sz) const;
+//	virtual Value  Read(const String& s) const;
+//	virtual String Write(const Value& v) const;
+//	virtual Value  ReadClipboard() const;
+//	virtual void   Menu(Bar& bar, RichObjectExchange& ex) const;
+//	virtual void   DefaultAction(RichObjectExchange& ex) const;
+};
+
+RichObjectType *RichObjectTypeGIF() { return &Single<RichObjectTypeGIFCls>(); }
+
+String RichObjectTypeGIFCls::GetTypeName(const Value&) const
+{
+	return "GIF";
+}
+
+Size RichObjectTypeGIFCls::GetPhysicalSize(const Value& data) const
+{
+	ImageInfo ii = GifEncoder().InfoImage(data);
+	if(ii.dots.cx > 0 && ii.dots.cy > 0)
+		return ii.dots;
+	return 6 * ii.size;
+}
+
+Size RichObjectTypeGIFCls::GetPixelSize(const Value& data) const
+{
+	return GifEncoder().InfoImage(data).size;
+}
+
+/*
+Value RichObjectTypeGIFCls::Read(const String& s) const
+{
+}
+
+String RichObjectTypeGIFCls::Write(const Value& v) const
+{
+}
+*/
+
+void RichObjectTypeGIFCls::Paint(const Value& data, Draw& w, Size sz) const
+{
+	if(IsNull(data)) {
+		w.DrawRect(Rect(sz), SGray);
+		return;
+	}
+	PixelArray array = GifEncoder().LoadArray(data).pixel;
+	Size aasize(min(sz.cx, array.GetWidth() * 4), min(sz.cy, array.GetHeight() * 4));
+	PixelArray aa(aasize, -3);
+	PixelCopyAntiAlias(aa, aa.GetRect(), array, array.GetRect());
+	if(w.IsDrawing())
+		w.DrawImage(Rect(sz), PixelArrayToImage(aa));
+	else
+		aa.Paint(w, Rect(sz));
+}
+#endif
+
+/*
+void CatRichText(RichText& text, const RichText& text2)
+{
+	text.OverrideStyles(text2.GetStyles(), false);
+	for(int i = 0; i < text2.GetParaCount(); i++)
+		text.Cat(text2.Get(i));
+//	int sn = text.GetStyleCount();
+//	for(i = 0; i < text2.GetStyleCount(); i++)
+//		text.SetParaStyle(sn + i, text2.GetParaStyle(i));
+//	for(i = 0; i < text2.GetParaCount(); i++)
+//		text.Cat(text2.Get(i), text2.GetParaStyle(i) + sn);
+}
+*/
+
+void AppendQTF(RichText& text, String qtf)
+{
+	text.CatPick(ParseQTF(qtf));
+//	CatRichText(text, ParseQTF(qtf));
+}
+
+class RichTextDisplayCls : public Display
+{
+public:
+	virtual void Paint(Draw& draw, const Rect& rc, const Value& v, Color ink, Color paper, dword style) const;
+
+	struct RTDPageDraw : public PageDraw {
+		virtual Draw& Page(int _page)          { return _page ? ScreenInfo() : w; }
+		virtual Draw& Info()                   { return w; }
+
+		Draw&              w;
+
+		RTDPageDraw(Draw& w) : w(w) {}
+	};
+};
+
+void RichTextDisplayCls::Paint(Draw& draw, const Rect& rc, const Value& v, Color ink, Color paper, dword style) const
+{
+	String s;
+	s << "[@(" << ink.GetR() << "." << ink.GetG() << "." << ink.GetB() << ") " << StdFormat(v);
+	RichText rtext = ParseQTF(s);
+	rtext.ApplyZoom(Zoom(140, 1024));
+	draw.DrawRect(rc, paper);
+	draw.Clipoff(rc);
+	rtext.Paint(Zoom(1, 1), draw, 0, 0, rc.Width());
+	draw.End();
+/*
+//	Size page = text.GetPage();
+	Size sz = rc.Size();
+	PaintInfo paintinfo;
+	paintinfo.sell = paintinfo.selh = 0;
+	paintinfo.zoom = Zoom(DOC_SCREEN_ZOOM, 1024);
+	int doty = sz.cy / paintinfo.zoom;
+	paintinfo.bottom = PageY(0, doty);
+	RTDPageDraw pd(draw);
+	draw.Clipoff(rc);
+	draw.DrawRect(sz, paper);
+	rtext.Paint(pd, Rect(0, 0, 1000000, doty), PageY(0, 0), paintinfo);
+	draw.End();
+*/
+}
+
+const Display& RichTextDisplay()
+{
+	static RichTextDisplayCls rtd;
+	return rtd;
+}
+
+void RichObjectDisplay::Paint(Draw& draw, const Rect& rc, const Value& v, Color ink, Color paper, dword style) const
+{
+	Size outsize = rc.Size();
+	if(outsize.cx <= 0 || outsize.cy <= 0)
+		return;
+	draw.DrawRect(rc, paper);
+	if(type) {
+		Size rawsize = type->GetPhysicalSize(v);
+		if(MulVector(rawsize, outsize) >= 0)
+			outsize.cy = iscale(outsize.cx, rawsize.cy, rawsize.cx);
+		else
+			outsize.cx = iscale(outsize.cy, rawsize.cx, rawsize.cy);
+		Rect rrc(Point((rc.TopLeft() + rc.BottomRight() - outsize) >> 1), outsize);
+		draw.Clipoff(rrc);
+		type->Paint(v, draw, outsize);
+		draw.End();
+	}
+	else {
+		Point pos = (rc.CenterPoint() - CtrlImg::question().GetSize()) >> 1;
+		draw.DrawImage(pos.x, pos.y, CtrlImg::question());
+	}
+}
+
+Size RichObjectDisplay::GetStdSize(const Value& v) const
+{
+	return type ? type->GetPhysicalSize(v) : CtrlImg::question().GetSize();
+}
+
+/*
+struct RichObjectTypeCalcHelpCls : public RichObjectType
+{
+	RichObjectTypeCalcHelpCls() { RichObject::Register(this); }
+
+	virtual String GetTypeName() const;
+	virtual Size   GetPhysicalSize(const Value& data) const;
+	virtual void   Paint(const Value& data, Draw& w, Size sz) const;
+//	virtual Value  Read(const String& s) const;
+//	virtual String Write(const Value& v) const;
+//	virtual Value  ReadClipboard() const;
+//	virtual void   Menu(Bar& bar, RichObjectExchange& ex) const;
+//	virtual void   DefaultAction(RichObjectExchange& ex) const;
+
+private:
+	static Document  GetDoc(const String& data);
+};
+
+RichObjectType *RichObjectTypeCalcHelp()
+{
+	static RichObjectTypeCalcHelpCls __rotch;
+	return &__rotch;
+}
+
+//	RichObject::Register(RichObjectTypeDialogHelp());
+//	RichObject::Register(RichObjectTypeCalcHelp());
+)
+
+String RichObjectTypeCalcHelpCls::GetTypeName() const
+{
+	return "RichObjectTypeCalcHelp";
+}
+
+Document RichObjectTypeCalcHelpCls::GetDoc(const String& data)
+{
+	VectorMap<String, String> attr = DecodeAttr(data);
+	String qtf;
+	for(int i = 0; i < attr.GetCount(); i++)
+		qtf << "\1" << attr.GetKey(i) << "\1 = [* \1" << attr[i] << "\1\n";
+	return Document(qtf);
+}
+
+Size RichObjectTypeCalcHelpCls::GetPhysicalSize(const Value& data) const
+{
+	Document doc = GetDoc(data);
+	int wd = doc.GetWidth(DOC_SCREEN_ZOOM, ScreenInfo());
+	int ht = doc.GetHeight(DOC_SCREEN_ZOOM, ScreenInfo(), wd);
+	return Size(wd, ht);
+}
+
+void RichObjectTypeCalcHelpCls::Paint(const Value& data, Draw& w, Size sz) const
+{
+	Document doc = GetDoc(data);
+	int wd = doc.GetWidth(DOC_SCREEN_ZOOM, ScreenInfo());
+	int ht = doc.GetHeight(DOC_SCREEN_ZOOM, ScreenInfo(), wd);
+	DrawingDraw ddraw(wd, ht);
+	ddraw.SetPixels(true);
+	doc.Paint(DOC_SCREEN_ZOOM, ddraw, 0, 0, wd);
+	w.DrawDrawing(Rect(sz), ddraw.GetResult());
+}
+*/
+
+static Vector<WString> SplitIndexEntry(const wchar *p, char brk)
+{
+	Vector<WString> out;
+	const wchar *b = p;
+	while(*p)
+		if((*p == '`' || *p == '\\')) {
+			if(*++p)
+				p++;
+		}
+		else if(*p == '[') {
+			while(*++p && *p != ' ' && *p != ']')
+				;
+		}
+		else if(*p == '\1') {
+			while(*p && *p++ != '\1')
+				;
+		}
+		else if(*p == brk) {
+			if(p > b)
+				out.Add(WString(b, p));
+			while(*p == brk || *p && *p <= L' ')
+				p++;
+			b = p;
+		}
+		else
+			p++;
+	if(p > b)
+		out.Add(WString(b, p));
+	return out;
+}
+
+struct sIndexEntryIterator : public RichText::Iterator
+{
+};
+
+void HelpTopicGetIndex(Index<WString>& entries, Vector<String>& drls, Gate2<int, int> progress)
+{
+	Index<WString> lent;
+	Vector<String> ltop;
+	int i;
+	for(i = 0; i < HelpAutoIndexMap().GetCount(); i++) {
+		HelpAutoIndexMap()[i](lent, ltop);
+		ASSERT(lent.GetCount() == ltop.GetCount());
+	}
+
+	const ArrayMap<String, HelpTopicInfo>& map = HelpTopicMap();
+	String styles = HelpTopicGet(HelpDPPStyle()).GetText() + "\r\n";
+	for(i = 0; i < map.GetCount(); i++) {
+		String drl = map.GetKey(i);
+		String space, nesting, topic;
+		HelpParseDPP(drl, space, nesting, topic);
+		if(nesting == "sys")
+			continue;
+		const HelpTopicInfo& info = map[i];
+		RichText text = ParseQTF(styles + info.GetText());
+		Vector<RichValPos> valpov = text.GetValPos(Size(10000, INT_MAX), RichText::INDEXENTRIES);
+		Index<WString> tent;
+		for(int p = 0; p < valpov.GetCount(); p++) {
+			WString ixe = valpov[p].data;
+			if(!IsNull(ixe) && !(ixe[0] == '@' && ixe[1] == '@')) {
+				Vector<WString> ient = SplitIndexEntry(ixe, ';');
+				for(int e = 0; e < ient.GetCount(); e++) {
+					const wchar *p = ient[e];
+					String top;
+					if(*p == '!') {
+						p++;
+						top.Cat('!');
+					}
+					top.Cat(topic);
+					WString nent(p);
+					if(tent.Find(nent) < 0) {
+						tent.Add(nent);
+						int f = lent.Find(nent);
+						if(f < 0) {
+							tent.Add(nent);
+							lent.Add(nent);
+							ltop.Add(top);
+						}
+						else
+							ltop[f] << "; " << top;
+					}
+				}
+			}
+		}
+/*
+		for(int p = 0; p < text.GetParaCount(); p++) {
+			const RichPara& rp = text.GetCached(p);
+			for(int pp = 0; pp < rp.part.GetCount(); pp++) {
+				WString ixe = rp.part[pp].format.indexentry;
+				if(!IsNull(ixe) && !(ixe[0] == '@' && ixe[1] == '@')) {
+					Vector<WString> ient = SplitIndexEntry(ixe, ';');
+					for(int e = 0; e < ient.GetCount(); e++) {
+						const wchar *p = ient[e];
+						String top;
+						if(*p == '!') {
+							p++;
+							top.Cat('!');
+						}
+						top.Cat(topic);
+						WString nent(p);
+						if(tent.Find(nent) < 0) {
+							tent.Add(nent);
+							int f = lent.Find(nent);
+							if(f < 0) {
+								tent.Add(nent);
+								lent.Add(nent);
+								ltop.Add(top);
+							}
+							else
+								ltop[f] << "; " << top;
+						}
+					}
+				}
+			}
+		}
+*/
+	}
+	Vector<WString> lstrip;
+	lstrip.SetCount(lent.GetCount());
+	for(i = 0; i < lent.GetCount(); i++)
+		lstrip[i] = MQTFStrip(lent[i]);
+	Vector<int> order = GetSortOrder(lstrip, GetLanguageInfo());
+	for(i = 0; i < order.GetCount(); i++) {
+		entries.Add(lent[order[i]]);
+		drls.Add(ltop[order[i]]);
+	}
+}
+
+Array<HelpIndexFormattedEntry> HelpTopicFormatIndex()
+{
+	Index<WString> index;
+	Vector<String> topics;
+
+	HelpTopicGetIndex(index, topics, Progress("P�ipravuji rejst��k"));
+
+	// format index entries
+	Array<HelpIndexFormattedEntry> entries;
+	Vector<WString> prefix;
+	WString last_first;
+
+	for(int i = 0; i < index.GetCount(); i++) {
+		Vector<WString> parts = SplitIndexEntry(index[i], ',');
+		if(parts.IsEmpty())
+			continue;
+
+		// generate letter breaker
+		WString next = GetLanguageInfo().GetIndexLetter(MQTFStrip(parts[0]));
+		if(next != last_first) { // add letter entry
+			HelpIndexFormattedEntry& entry = entries.Add();
+			entry.nesting = -1;
+			entry.text = next;
+		}
+		last_first = next;
+
+		HelpIndexFormattedEntry& entry = entries.Add();
+		entry.nesting = 0;
+		for(int px = 0; px < parts.GetCount(); px++) {
+			if(IsNull(entry.text) && prefix.GetCount() > px && prefix[px] == parts[px])
+				entry.nesting++;
+			else {
+				prefix.DoIndex(px) = parts[px];
+				if(!IsNull(entry.text))
+					entry.text << ',' << ' ';
+				entry.text.Cat(parts[px]);
+			}
+		}
+		prefix.SetCount(parts.GetCount());
+		entry.full_text = index[i];
+		entry.topics = topics[i];
+	}
+
+	return entries;
+}
+
+bool CtrlShowHelp(Ctrl *ctrl)
+{
+	String topic;
+	for(; IsNull(topic) && ctrl; ctrl = ctrl->GetParent())
+		topic = ctrl->GetHelpTopic();
+	if(IsNull(topic))
+		return false;
+	RunDlgHelpTopic(topic);
+	return true;
+}
+
+static bool sViewerKeyHook(Ctrl *ctrl, dword key, int repcnt)
+{
+	if(key == K_F1 && CtrlShowHelp(ctrl))
+		return true;
+	return false;
+}
+
+void InstallHelpViewerKeyHook()
+{
+	Ctrl::InstallKeyHook(&sViewerKeyHook);
+}
+
+static bool sEditorKeyHook(Ctrl *ctrl, dword key, int repcnt)
+{
+	if(sViewerKeyHook(ctrl, key, repcnt))
+		return true;
+	if(key == K_SHIFT_F12 || key == K_CTRL_F12 || key == K_F12) {
+		if(ctrl == NULL) {
+/*
+			Ctrl *f = Ctrl::GetFocusCtrl();
+			String fd = "NULL";
+			if(f) {
+				StringStream out;
+				f->Dump(out);
+				fd = out;
+			}
+			Exclamation("Current control = NULL, focus = " + fd);
+*/
+			BeepExclamation();
+			return true;
+		}
+		Ctrl *wctrl = ctrl->GetTopCtrl();
+		LLOG("sEditorKeyHook, key = " << GetKeyDesc(key) << " for " << Name(wctrl));
+		if(key == K_SHIFT_F12) {
+			Point mouse = UPP::GetMousePos();
+			Point wmouse = mouse - wctrl->GetScreenView().TopLeft();
+			Ctrl *cpt = wctrl->ChildFromPoint(wmouse);
+			if(!cpt)
+				cpt = wctrl;
+			Point delta = mouse - cpt->GetScreenView().TopLeft();
+			Image img = cpt->MouseEvent(Ctrl::CURSORIMAGE, delta, 0, GetMouseFlags());
+			Point imgmouse = mouse - wctrl->GetScreenRect().TopLeft();
+//			RunDlgHelpEditor(wctrl, CtrlToStillImage(wctrl, imgmouse, img));
+			RunDlgShot(wctrl, CtrlToStillImage(wctrl, imgmouse, img));
+		}
+		else // if(key == K_CTRL_F12)
+			RunDlgShot(wctrl, CtrlToStillImage(wctrl));
+//			RunDlgHelpEditor(wctrl, CtrlToStillImage(wctrl));
+//		else
+//			RunDlgHelpEditor(wctrl);
+		return true;
+	}
+	return false;
+}
+
+void InstallHelpEditorKeyHook()
+{
+	Ctrl::InstallKeyHook(&sEditorKeyHook);
+}
+
+RichText HelpTopicExpand(String style_qtf, String title_qtf, String topic_qtf,
+	String title_style_name, bool nested, int depth, const RichText::FormatInfo& formatinfo,
+	String inline_link_style, Gate2<int, int> progress, int& progress_pos)
+{
+	RichText out_text, in_text, styles = ParseQTF(style_qtf);
+	in_text.SetStyles(styles.GetStyles());
+
+	AppendQTF(in_text, style_qtf + "\r\n" + topic_qtf);
+	in_text.OverrideStyles(styles.GetStyles());
+	out_text.SetStyles(in_text.GetStyles());
+	RichPara empty_para;
+
+	if(!IsNull(title_qtf) && !IsNull(title_style_name)) {
+		Uuid styleid = styles.GetStyleId(title_style_name);
+		const RichStyle& style = styles.GetStyle(styleid);
+		RichPara title_para;
+		title_para.format = style.format;
+		formatinfo.ApplyTo(title_para.format);
+		RichPara::CharFormat charformat = style.format;
+	//	format.paper = Color(224, 224, 224);
+		MQTFCat(title_para, title_qtf, charformat);
+		out_text.Cat(title_para);
+//		out_text.Cat(empty_para);
+	}
+
+	Id linkfld = FieldTypeLinkID();
+	Id secfld = FieldTypeSectionID();
+	for(int i = 0; i < in_text.GetPartCount(); i++) {
+		if(progress(++progress_pos, 0))
+			throw AbortExc();
+		if(in_text.IsTable(i)) {
+			out_text.CatPick(RichTable(in_text.GetTable(i), 0));
+//			out_text.Cat(empty_para);
+			continue;
+		}
+		RichPara para = in_text.Get(i);
+		for(int p = 0; p < para.GetCount(); p++)
+			if(para[p].field == linkfld) {
+				String drl, linktext, linkstyle;
+				DecodeLink(para[p].fieldparam, drl, linktext, linkstyle);
+				int linkexpand = (linktext == "." ? 1 : linktext == ".." ? 2 : linktext == "=" ? 3 : 0);
+				if(linkexpand || nested) {
+					RichPara next;
+					next <<= para;
+					next.Mid(p + 1);
+					if(p) {
+						para.Trim(p);
+						out_text.Cat(para);
+					}
+					RichText subtext;
+					if(depth >= 10) {
+						RichPara error;
+						RichPara::CharFormat fmt = para.format;
+						fmt.ink = LtRed;
+						error.Cat(WString("Byla p�ekro�ena maxim�ln� hloubka vno�en� 'expand'!"), fmt);
+						subtext.Set(0, error, subtext.GetStyles());
+					}
+					else {
+						Uuid titleid = para.format.styleid;
+						const RichStyle& style = in_text.GetStyle(titleid);
+						String titlestyle = style.name;
+						RichText::FormatInfo finfo;
+						finfo.Set(para.format);
+						finfo.Combine(style.format);
+						finfo.charvalid ^= -1;
+						finfo.paravalid ^= -1;
+						if(titleid == RichStyle::GetDefaultId())
+							titlestyle = title_style_name;
+						else {
+							int dot = titlestyle.Find('.');
+							if(dot >= 0)
+								titlestyle.Remove(0, dot + 1);
+						}
+						subtext = HelpTopicExpand(style_qtf,
+							HelpTopicGet(drl).GetTitle(), HelpTopicGet(drl).GetText(),
+							titlestyle, linkexpand == 2 || linkexpand == 3 && nested, depth + 1, finfo,
+							linkexpand == 3 ? linkstyle : String(Null), progress, progress_pos);
+						if(!subtext.IsEmpty() && linkexpand != 2) {
+							subtext.SetStyle(titleid, style);
+							RichPara para0 = subtext.Get(0);
+							RichPara parab;
+							parab.format = para0.format;
+							parab.Cat(RichObject(RichObjectTypeEmpty(), Null), parab.format);
+							parab[0].format.indexentry = ("@@" + drl).ToWString();
+							parab.Append(para0);
+							subtext.Set(0, parab, subtext.GetStyles());
+							if(!nested)
+								for(int p = 0; p < subtext.GetPartCount(); p++)
+									if(subtext.GetParaStyle(p) == RichStyle::GetDefaultId())
+										subtext.SetParaStyle(p, titleid);
+						}
+					}
+					out_text.CatPick(subtext);
+					para = next;
+					p = -1;
+				}
+				else if(IsNull(linkstyle) && !IsNull(inline_link_style)) {
+					para[p].fieldparam = EncodeLink(drl, linktext, inline_link_style);
+				}
+			}
+			else if(p == 0 && para[p].field == secfld && !nested) {
+				RichTextSection sect = DecodeSection(para[p].fieldparam);
+				if(sect.nested)
+					para = RichPara();
+				break;
+			}
+		if(!para.IsEmpty()) {
+			out_text.Cat(para);
+		}
+	}
+
+	return out_text;
+}
+
+RichText HelpTopicExpand(String drl, String title_style_name, const RichText::FormatInfo& formatinfo, Gate2<int, int> progress)
+{
+	String style_qtf = HelpTopicGet(HelpDPPStyle()).GetText();
+	String title_qtf = HelpTopicGet(drl).GetTitle();
+	String topic_qtf = HelpTopicGet(drl).GetText();
+	int progress_pos = 0;
+	return HelpTopicExpand(style_qtf, title_qtf, topic_qtf, title_style_name, false, 0, formatinfo, Null, progress, progress_pos);
+}
+
+GLOBAL_VAR(const RichText::FormatInfo, NoFormat)
+
+/*
+struct SectionPageDraw : PageDraw {
+	int         page;
+	DrawingDraw w;
+	Vector<Drawing> pagemap;
+	NilDraw     nw;
+
+	Draw& Page(int _page)     { return page == _page ? w : (Draw&)nw; }
+	Draw& Info()              { return w; }
+	void  SetPage(int _page)  { page = _page; }
+
+	PrintPageDraw(Draw& w) : w(w) {}
+};
+
+void Print(PrintDraw& w, const RichText& text,
+           int firstpage, int lastpage, int copies, bool collate)
+{
+	firstpage = max(0, firstpage);
+	lastpage = min(lastpage, text.GetHeight(text.GetPage()).page);
+	PrintPageDraw pw(w);
+	Rect page = text.GetPage();
+	Size sz = w.GetPageMMs();
+	Size pgsz = page.Size();
+	int x = (6000 * sz.cx / 254 - pgsz.cx) / 2;
+	int y = (6000 * sz.cy / 254 - pgsz.cy) / 2;
+	for(int c = 0; c < (collate ? copies : 1); c++)
+		for(int i = firstpage; i <= lastpage; i++)
+			for(int c = 0; c < (collate ? 1 : copies); c++) {
+				w.StartPage();
+				w.Offset(x, y);
+				pw.SetPage(i);
+				PaintInfo paintinfo;
+				paintinfo.top = PageY(i, 0);
+				paintinfo.bottom = PageY(i + 1, 0);
+				text.Paint(pw, page, PageY(), paintinfo);
+				w.End();
+				w.EndPage();
+			}
+}
+*/
+
+class SectionPageDraw : public PageDraw
+{
+public:
+	SectionPageDraw(Size drawingsize, Gate2<int, int> progress, int& progress_pos);
+
+	virtual Draw&   Page(int page);
+	virtual Draw&   Info();
+
+	Vector<Drawing> Close();
+
+private:
+	Gate2<int, int> progress;
+	int&            progress_pos;
+	Size            drawingsize;
+	Vector<Drawing> pages;
+	DrawingDraw     ddraw;
+	DrawingDraw     info;
+	int             currentpage;
+};
+
+SectionPageDraw::SectionPageDraw(Size dsz, Gate2<int, int> progress, int& progress_pos)
+: progress(progress)
+, progress_pos(progress_pos)
+{
+	currentpage = -1;
+	info.Create(drawingsize = dsz);
+}
+
+Draw& SectionPageDraw::Page(int page)
+{
+	if(page != currentpage) {
+		ASSERT(ddraw.GetCloffLevel() == 0);
+		progress(progress_pos + page, -1);
+		if(currentpage >= 0)
+			pages.At(currentpage) = ddraw;
+		ddraw.Create(drawingsize);
+		ddraw.DrawDrawing(drawingsize, pages.At(currentpage = page));
+	}
+	return ddraw;
+}
+
+Draw& SectionPageDraw::Info()
+{
+	return Page(0);
+}
+
+Vector<Drawing> SectionPageDraw::Close()
+{
+	if(currentpage >= 0) {
+		ASSERT(ddraw.GetCloffLevel() == 0);
+		pages.At(currentpage) = ddraw;
+	}
+	return pages;
+}
+
+static String ExpandHFText(const char *text, int pageno)
+{
+	String out;
+	for(char c; c = *text++;)
+		if(c == '#')
+			switch(*text++) {
+			case 'r': out.Cat(FormatIntRoman(pageno, false)); break;
+			case 'R': out.Cat(FormatIntRoman(pageno, true)); break;
+			case 'a': out.Cat(FormatIntAlpha(pageno, false)); break;
+			case 'A': out.Cat(FormatIntAlpha(pageno, true)); break;
+			default:  text--; out.Cat(FormatInt(pageno)); break;
+			}
+		else
+			out.Cat(c);
+	return out;
+}
+
+Vector<Drawing> RichTextPrintSection(const PrintSection& section, Size pagesize, Gate2<int, int> progress, int& progress_pos)
+{
+	ASSERT(section.columns > 0);
+	Size drawingsize = section.GetTextSize(pagesize);
+	SectionPageDraw spdraw(drawingsize, progress, progress_pos);
+	PaintInfo paintinfo;
+	paintinfo.top = PageY(0, 0);
+	paintinfo.bottom = PageY(32767, 0);
+	paintinfo.indexentry = Null;
+	section.text.Paint(spdraw, drawingsize, paintinfo);
+	Vector<Drawing> in = spdraw.Close();
+	Vector<Drawing> out;
+	for(int i = 0; i < in.GetCount(); i += section.columns) {
+		int pageno = section.firstpage + out.GetCount();
+		DrawingDraw ddraw(pagesize);
+		Rect pagerect = section.GetPageRect(pagesize);
+		for(int c = 0; c < section.columns && c + i < in.GetCount(); c++)
+			ddraw.DrawDrawing(section.GetTextRect(pagesize, c), in[i + c]);
+		for(int hf = 0; hf < 3; hf++) {
+			if(!IsNull(section.header[hf])) {
+				String s = ExpandHFText(section.header[hf], pageno);
+				Size sz = GetTextSize(s, section.charformat);
+				int x;
+				switch(hf) {
+				case 0: x = pagerect.left; break;
+				case 1: x = (pagerect.left + pagerect.right - sz.cx) >> 1; break;
+				case 2: x = pagerect.right - sz.cx; break;
+				}
+				ddraw.DrawText(x, pagerect.top, s, section.charformat);
+			}
+			if(!IsNull(section.footer[hf])) {
+				String s = ExpandHFText(section.footer[hf], pageno);
+				Size sz = GetTextSize(s, section.charformat);
+				int x;
+				switch(hf) {
+				case 0: x = pagerect.left; break;
+				case 1: x = (pagerect.left + pagerect.right - sz.cx) >> 1; break;
+				case 2: x = pagerect.right - sz.cx; break;
+				}
+				ddraw.DrawText(x, pagerect.bottom - sz.cy, s, section.charformat);
+			}
+		}
+		out.Add() = ddraw;
+	}
+	return out;
+}
+
+Array<PrintSection> RichTextSplitSections(const RichText& text, Gate2<int, int> progress)
+{
+	Array<PrintSection> out;
+	PrintSection psec;
+	psec.MakeDefault();
+	psec.text.SetStyles(text.GetStyles());
+	Id secfld = FieldTypeSectionID();
+	for(int i = 0; i < text.GetPartCount(); i++) {
+		if(progress(i, text.GetPartCount()))
+			throw AbortExc();
+		if(text.IsTable(i))
+			psec.text.CatPick(RichTable(text.GetTable(i), 0));
+		else {
+			RichPara para = text.Get(i);
+			if(para.GetCount() > 0 && para[0].field == secfld) {
+				if(!psec.text.IsEmpty())
+					out.Add() = psec;
+				psec.text.Clear();
+				psec.text.SetStyles(text.GetStyles());
+				DecodeSection(para[0].fieldparam).Override(psec);
+			}
+			else {
+				if(psec.text.GetPartCount() == 0)
+					para.format.newpage = false;
+				psec.text.Cat(para);
+			}
+		}
+	}
+	if(!psec.text.IsEmpty())
+		out.Add() = psec;
+	return out;
+}
+
+Vector<Drawing> SectionPrintBook(Array<PrintSection>& sections, Size pagesize, VectorMap<String, Value>& vars, Gate2<int, int> progress)
+{
+	vars.GetAdd("$book") = 1;
+	bool stable = false;
+	enum { MAX_PASSES = 10 };
+	int pass;
+	for(pass = 1; !stable && pass <= MAX_PASSES; pass++) {
+		if(progress(pass, 0))
+			throw AbortExc();
+		stable = true;
+		int pageno = 1;
+		Index<String> chkdup;
+		for(int s = 0; s < sections.GetCount(); s++) {
+			PrintSection& psec = sections[s];
+			Size textsize = psec.GetTextSize(pagesize);
+			PageY begin;
+			pageno = Nvl(psec.firstpage, pageno);
+			psec.text.EvaluateFields(vars);
+			int numpages = psec.text.GetHeight(textsize).page / psec.columns + 1;
+			Vector<RichValPos> posinfo = psec.text.GetValPos(textsize, RichText::INDEXENTRIES);
+			for(int i = 0; i < posinfo.GetCount(); i++) {
+				String key = posinfo[i].data.ToString();
+				if(key[0] != '@' || key[1] != '@')
+					continue;
+				key.Remove(0, 2);
+				if(chkdup.Find(key) >= 0) {
+					if(pass == 1)
+						RLOG("Duplicate: " << key);
+					continue;
+				}
+				chkdup.Add(key);
+				int oldpage = vars.Get(key, Value());
+				int newpage = pageno + posinfo[i].py.page;
+				if(newpage != oldpage) {
+					if(pass > 2)
+						RLOG("Unstable: " << key << ": " << oldpage << " -> " << newpage);
+					vars.GetAdd(key) = newpage;
+					stable = false;
+				}
+			}
+			pageno += numpages;
+		}
+	}
+
+	Vector<Drawing> out;
+	int pageno = 1;
+	int progress_pos = pass;
+	for(int s = 0; s < sections.GetCount(); s++) {
+		PrintSection& psec = sections[s];
+		psec.firstpage = Nvl(psec.firstpage, pageno);
+		Vector<Drawing> part = RichTextPrintSection(psec, pagesize, progress, progress_pos);
+		pageno = psec.firstpage + part.GetCount();
+		out.AppendPick(part);
+	}
+	return out;
+}
+
+void CreateHelpBook()
+{
+	try {
+		VectorMap<String, Value> vars;
+		DocReport report;
+		Progress progress;
+		progress.SetText("Sestavuji p��ru�ku (odstavec %d)");
+		RichText text = HelpTopicExpand(HelpHostDPP("book"), Null, NoFormat(), progress);
+		progress.SetText("P�ipravuji tiskov� odd�ly (odstavec %d)");
+		Array<PrintSection> sections = RichTextSplitSections(text, progress);
+		progress.SetText("Form�tuji p��ru�ku (strana %d)");
+		Vector<Drawing> pages = SectionPrintBook(sections, report.GetPageSize(), vars, progress);
+		progress.SetText("Tisknu p��ru�ku (strana %d)");
+		for(int i = 0; i < pages.GetCount(); i++) {
+			if(progress.SetCanceled(i, pages.GetCount()))
+				throw AbortExc();
+			if(i)
+				report.NextPage();
+			report.DrawDrawing(pages[i].GetSize(), pages[i]);
+		}
+		report.Perform();
+	}
+	catch(Exc e) {
+		ShowExc(e);
+	}
+/*
+	One<BookHelpStyle> book_style = CreateBookHelpStyle();
+	help_style = ~book_style;
+	book_style -> RunBook();
+	help_style = 0;
+*/
+}
+
+#ifdef PLATFORM_WIN32
+String CreateHelpPDF()
+{
+	try {
+		VectorMap<String, Value> vars;
+		PdfDraw pdf(210 * 6000 / 254, 297 * 6000 / 254);
+		Rect margin = Rect(pdf.GetPagePixels()).Deflated(236);
+		Progress progress;
+		progress.SetText("Sestavuji p��ru�ku (odstavec %d)");
+		RichText text = HelpTopicExpand(HelpHostDPP("book"), Null, NoFormat(), progress);
+		progress.SetText("P�ipravuji tiskov� odd�ly (odstavec %d)");
+		Array<PrintSection> sections = RichTextSplitSections(text, progress);
+		progress.SetText("Form�tuji p��ru�ku (strana %d)");
+		Vector<Drawing> pages = SectionPrintBook(sections, margin.Size(), vars, progress);
+		progress.SetText("Tisknu p��ru�ku (strana %d)");
+//		progress.Set(0, pages.GetCount());
+		for(int i = 0; i < pages.GetCount(); i++) {
+//			LOG("CreateHelpPDF: GDI space = " << GdiGetFreeSpace());
+			if(progress.SetCanceled(i, pages.GetCount()))
+				throw AbortExc();
+			pdf.StartPage();
+//			ScreenInfo().DrawDrawing(margin, pages[i]);
+			pdf.DrawDrawing(margin, pages[i]);
+			pdf.EndPage();
+		}
+		return pdf.Finish();
+	}
+	catch(Exc e) {
+		ShowExc(e);
+		return Null;
+	}
+}
+#endif
+
+String CreateHelpRTF()
+{
+	try {
+		VectorMap<String, Value> vars;
+		Progress progress;
+		progress.SetText("Sestavuji p��ru�ku (odstavec %d)");
+		RichText text = HelpTopicExpand(HelpHostDPP("book"), Null, NoFormat(), progress);
+		return EncodeRTF(text, CHARSET_WIN1250);
+	}
+	catch(Exc e) {
+		ShowExc(e);
+		return Null;
+	}
+}
+
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/TCtrlLib/Help/helputil.h b/uppsrc/TCtrlLib/Help/helputil.h
new file mode 100644
index 000000000..6ce03a21a
--- /dev/null
+++ b/uppsrc/TCtrlLib/Help/helputil.h
@@ -0,0 +1,125 @@
+NAMESPACE_UPP
+
+inline String        HelpDPPStyle()                   { return HelpHostDPP("style"); }
+inline String        HelpDPPTopics()                  { return HelpHostDPP("topics"); }
+inline String        HelpDPPTopicsAuto()              { return HelpHostDPP("topics_auto"); }
+inline String        HelpDPPIndex()                   { return HelpHostDPP("index"); }
+inline String        HelpDPPObjects()                 { return HelpHostDPP("objects"); }
+
+String               MQTFStrip(const char *text);
+WString              MQTFStrip(const wchar *text);
+void                 MQTFCat(RichPara& para, const char *mqtf_text, const RichPara::CharFormat& basefmt);
+
+RichObjectType      *RichObjectTypeEmpty();
+RichObjectType      *RichObjectTypeDrawing();
+RichObjectType      *RichObjectTypeGIF();
+RichObjectType      *RichObjectTypeFormula();
+
+String               GetRichObjectTypeDrawingData(const Drawing& drawing);
+String               GetRichObjectTypeGIFData(const Image& image);
+
+void                 CatRichText(RichText& text, const RichText& text2);
+void                 AppendQTF(RichText& text, String qtf);
+const Display&       RichTextDisplay();
+
+void                 RegisterHelpFieldTypes();
+
+RichPara::FieldType& FieldTypeLink();
+Id                   FieldTypeLinkID();
+String               EncodeLink(String target, String text, String style);
+void                 DecodeLink(String link, String& target, String& text, String& style);
+
+class RichTextSection
+{
+public:
+	RichTextSection();
+
+	void                 MakeDefault();
+	void                 Override(RichTextSection& old) const;
+
+	Rect                 GetPageRect(Size pagesize) const;
+	Rect                 GetTextRect(Size pagesize, int columnindex) const;
+	Size                 GetTextSize(Size pagesize) const;
+
+public:
+	bool                 nested;
+	int                  columns;
+	int                  firstpage;
+	Rect                 margin;
+	int                  header_space;
+	int                  footer_space;
+	int                  column_space;
+	String               header[3], footer[3];
+	RichPara::CharFormat charformat;
+};
+
+RichPara::FieldType& FieldTypeSection();
+Id                   FieldTypeSectionID();
+String               EncodeSection(const RichTextSection& sec);
+RichTextSection      DecodeSection(String sect);
+
+class RichTextIndex
+{
+public:
+	RichTextIndex() {}
+
+public:
+	Vector<String> reflist;
+};
+
+RichPara::FieldType& FieldTypeIndex();
+Id                   FieldTypeIndexID();
+String               EncodeIndex(const RichTextIndex& idx);
+RichTextIndex        DecodeIndex(String packed);
+
+struct PrintSection : RichTextSection
+{
+	RichText text;
+};
+
+Array<PrintSection>  RichTextSplitSections(const RichText& text, Gate2<int, int> progress);
+Vector<Drawing>      SectionPrintBook(Array<PrintSection>& sections, Size pagesize, VectorMap<String, Value>& vars, Gate2<int, int> progress);
+
+void                 CreateHelpBook();
+String               CreateHelpPDF();
+String               CreateHelpRTF();
+
+String               AsCStringWrap(const char *s, int linemax, const char *prefix);
+
+void                 RegisterHelpStdItems();
+void                 RegisterHelpMenuItems(Callback1<Bar&> barproc, String ident, String module);
+
+const RichText::FormatInfo& NoFormat();
+RichText             HelpTopicExpand(String style_qtf, String title_qtf, String topic_qtf,
+	String title_style_name, bool nested, int depth, const RichText::FormatInfo& formatinfo,
+	String inline_link_style, Gate2<int, int> progress, int& progress_step);
+RichText             HelpTopicExpand(String drl, String title_style_name,
+	const RichText::FormatInfo& formatinfo = NoFormat(), Gate2<int, int> progress = false);
+
+struct HelpIndexFormattedEntry
+{
+	int            nesting; // -1 = new letter, 0, 1 ... = normal nesting
+	WString        full_text;
+	WString        text;
+	String         topics; // topic;topic;topic;!important_topic;!important_topic
+};
+
+void                           HelpTopicGetIndex(Index<WString>& entries, Vector<String>& drls, Gate2<int, int> progress = CNULL);
+Array<HelpIndexFormattedEntry> HelpTopicFormatIndex();
+
+class RichObjectDisplay : public Display
+{
+public:
+	RichObjectDisplay(const RichObjectType *type = NULL) : type(type) {}
+
+	void                  SetType(const RichObjectType *t) { type = t; }
+	const RichObjectType *GetType() const                  { return type; }
+
+	virtual void          Paint(Draw& draw, const Rect& rc, const Value& v, Color ink, Color paper, dword style) const;
+	virtual Size          GetStdSize(const Value& v) const;
+
+private:
+	const RichObjectType *type;
+};
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/TCtrlLib/Help/notes.txt b/uppsrc/TCtrlLib/Help/notes.txt
new file mode 100644
index 000000000..6944dafab
--- /dev/null
+++ b/uppsrc/TCtrlLib/Help/notes.txt
@@ -0,0 +1,29 @@
+    Co treba (Font &)x = ? O vyse uvedenem jsem premyslel, ale vzhledem k
+tomuto to asi nestoji za to... si myslim.
+
+-- Tak to ti dekuju, pres typecast to umim taky.
+
+Bylo by docela pekne, kdyby RichText umel Cat(pick_ RichText& text).
+--
+
+Bylo by docela pekne, kdyby RichText mel nejakou jednoduchou variantu Paintu
+bez strankovani a onanii kolem PageDraw a PaintInfo ve stylu stareho Documentu.
+-- vyrizeno
+
+Da se v RichTextView nejak nastavit zoom pro ten text?
+--
+
+Jak v RichTextView udelam skok na hyperlink, kdyz na nej uzivatel klikne?
+-- vyrizeno
+
+Chyba v EncodeQTF - cislo stylu
+-- vyrizeno
+
+//////////////////////////////////////////////////////////////////////
+
+default charset a language pro ParseQTF, pokud neni v QTF
+- [{0}%CS-CZ
+
+bullety (version.hpp)
+
+escapovani parametru funktoru
diff --git a/uppsrc/TCtrlLib/Help/richform.cpp b/uppsrc/TCtrlLib/Help/richform.cpp
new file mode 100644
index 000000000..0c41e1f84
--- /dev/null
+++ b/uppsrc/TCtrlLib/Help/richform.cpp
@@ -0,0 +1,122 @@
+#include "TCtrlLibHelp.h"
+#pragma hdrstop
+
+#include <TDraw/formula.h>
+
+NAMESPACE_UPP
+
+struct RichObjectTypeFormulaCls : public RichObjectType
+{
+	virtual String GetTypeName(const Value&) const;
+	virtual Size   GetPhysicalSize(const Value& data) const;
+	virtual Size   GetPixelSize(const Value& data) const { return Size(0, 0); }
+	virtual void   Paint(const Value& data, Draw& w, Size sz) const;
+	virtual Value  Read(const String& s) const;
+	virtual String Write(const Value& v) const;
+//	virtual Value  ReadClipboard() const;
+//	virtual void   Menu(Bar& bar, RichObjectExchange& ex) const;
+	virtual void   DefaultAction(RichObject& ex) const;
+
+	struct Data {
+		Data() : font(Roman(100)), color(SBlack) {}
+		Data(const Value& v) { *this = ValueTo<Data>(v); }
+
+		operator           Value() const { return RawToValue(*this); }
+
+		void               Serialize(Stream& stream);
+		RefCon<Formula>    Parse() const;
+
+		String             text;
+		Font               font;
+		Color              color;
+	};
+};
+
+RichObjectType *RichObjectTypeFormula() { return &Single<RichObjectTypeFormulaCls>(); }
+
+void RichObjectTypeFormulaCls::Data::Serialize(Stream& stream)
+{
+	int version = 1;
+	stream % version % text % font % color;
+}
+
+RefCon<Formula> RichObjectTypeFormulaCls::Data::Parse() const
+{
+	return ParseFormula(text, font, color);
+}
+
+String RichObjectTypeFormulaCls::GetTypeName(const Value&) const
+{
+	return "Formula";
+}
+
+/*
+RichObject CreateFormulaObject(String text, Font font, Color color)
+{
+	RichObjectTypeFormulaCls::Data data;
+	data.text = text;
+	data.font = font;
+	data.color = color;
+	RichObject obj(RichObjectTypeFormula(), data);
+	obj.SetYDelta(data.Parse() -> GetDescent());
+	return obj;
+}
+*/
+
+Size RichObjectTypeFormulaCls::GetPhysicalSize(const Value& data) const
+{
+	if(IsTypeRaw<Data>(data))
+		return Data(data).Parse() -> GetSize();
+	return Size(0, 0);
+}
+
+Value RichObjectTypeFormulaCls::Read(const String& s) const
+{
+	Data data;
+	StringStream ss(s);
+	ss % data;
+	if(ss.IsError())
+		return Value();
+	return RawToValue(data);
+}
+
+String RichObjectTypeFormulaCls::Write(const Value& v) const
+{
+	if(IsTypeRaw<Data>(v)) {
+		StringStream ss;
+		Data d(v);
+		ss % d;
+		return ss;
+	}
+	return Null;
+}
+
+void RichObjectTypeFormulaCls::Paint(const Value& data, Draw& w, Size sz) const
+{
+	w.DrawRect(sz, White);
+	if(IsTypeRaw<Data>(data)) {
+		RefCon<Formula> form = Data(data).Parse();
+		DrawingDraw dd(form -> GetSize());
+		form -> Paint(dd, 0, form -> GetAscent());
+		w.DrawDrawing(Rect(sz), dd);
+	}
+}
+
+bool RunDlgFormula(String& text, Font& font, Color& color);
+
+void RichObjectTypeFormulaCls::DefaultAction(RichObject& ex) const
+{
+	static Data data;
+	data.text = Null;
+	RichObject obj = ex;
+	if(IsTypeRaw<Data>(obj.GetData()))
+		data = Data(obj.GetData());
+	if(RunDlgFormula(data.text, data.font, data.color)) {
+		RichObject ro(RichObjectTypeFormula(), data);
+		RefCon<Formula> form = data.Parse();
+		ro.SetYDelta(form -> GetDescent() + Formula::GetTextDeltaY(data.font) + 15);
+		ex = ro;
+	}
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/TCtrlLib/OldTreeCtrl.cpp b/uppsrc/TCtrlLib/OldTreeCtrl.cpp
new file mode 100644
index 000000000..660cce11e
--- /dev/null
+++ b/uppsrc/TCtrlLib/OldTreeCtrl.cpp
@@ -0,0 +1,1469 @@
+//////////////////////////////////////////////////////////////////////
+// OldTreeCtrl: tree control.
+
+#include "TCtrlLib.h"
+#pragma hdrstop
+
+#include "OldTreeCtrl.h"
+
+NAMESPACE_UPP
+
+#define IMAGECLASS OldTreeCtrlImg
+#define IMAGEFILE  <TCtrlLib/OldTreeCtrl.iml>
+#include <Draw/iml_header.h>
+
+enum { SCREEN_ZOOM = 140 };
+
+#ifdef _DEBUG
+//#define DBG_PAINT(co, dbgco) dbgco // debug version
+#define DBG_PAINT(co, dbgco) co    // release version
+#else
+#define DBG_PAINT(co, dbgco) co    // release version
+#endif
+
+#define IMAGECLASS OldTreeCtrlImg
+#define IMAGEFILE  <TCtrlLib/OldTreeCtrl.iml>
+#include <Draw/iml_source.h>
+
+enum
+{
+	ICONGAP     = 6,
+	TEXTGAP     = 5,
+	TSGAP       = 3,
+	BUTTON_SIZE = 9,
+	BUTTON_HALF = BUTTON_SIZE >> 1,
+};
+
+//////////////////////////////////////////////////////////////////////
+// OldTreeCursor::
+
+OldTreeCursor::OldTreeCursor()
+: root(0)
+{
+}
+
+OldTreeCursor::OldTreeCursor(const OldTreeItem& item)
+: root(0)
+{
+	Find(item);
+}
+
+OldTreeCursor::OldTreeCursor(const OldTreeCursor& another, int)
+: root(another.root)
+, cursor(another.cursor, 0)
+{
+}
+
+OldTreeCursor& OldTreeCursor::Adjust()
+{
+	if(cursor.IsEmpty() || !root)
+		return *this;
+	const OldTreeItem *ptr = root;
+	int *b = cursor.Begin(), *e = cursor.End(), *p;
+	for(p = b; p < e; p++)
+		if(ptr->IsEmpty())
+			break;
+		else {
+			*p = minmax(*p, 0, ptr->GetCount() - 1);
+			ptr = &ptr->children[*p];
+		}
+	cursor.SetCount(p - b);
+	return *this;
+}
+
+OldTreeCursor& OldTreeCursor::WeakAdjust()
+{
+	if(cursor.IsEmpty() || !root)
+		return *this;
+	const OldTreeItem *ptr = root;
+	int *b = cursor.Begin(), *e = cursor.End(), *p;
+	for(p = b; p < e; p++) {
+		*p = minmax(*p, 0, ptr->GetCount());
+		if(*p == ptr->GetCount()) {
+			p++;
+			break;
+		}
+		ptr = &ptr->children[*p];
+	}
+	cursor.SetCount(p - b);
+	return *this;
+}
+
+OldTreeCursor& OldTreeCursor::AddAfter(const OldTreeCursor& c, int count)
+{
+	int top = c.cursor.GetCount() - 1;
+	if(!root || root != c.root || top < 0 || cursor.GetCount() <= top
+		|| memcmp(cursor.Begin(), c.cursor.Begin(), sizeof(int) * top))
+		return *this;
+	int d = cursor[top] - c.cursor[top];
+	if(d >= 0)
+		cursor[top] += max(count, -d);
+	return *this;
+}
+
+OldTreeCursor& OldTreeCursor::AdjustAfter(const OldTreeCursor& c, int count)
+{
+	return AddAfter(c, count).Adjust();
+}
+
+OldTreeCursor& OldTreeCursor::WeakAdjustAfter(const OldTreeCursor& c, int count)
+{
+	return AddAfter(c, count).WeakAdjust();
+}
+
+OldTreeItem *OldTreeCursor::Get() const
+{
+	OldTreeItem *ptr = root;
+	for(const int *p = cursor.Begin(), *e = cursor.End(); ptr && p < e; p++)
+		ptr = (*p >= 0 && *p < ptr->children.GetCount() ? &ptr->children[*p] : NULL);
+	return ptr;
+}
+
+OldTreeItem *OldTreeCursor::GetParent() const
+{
+	if(!root || cursor.IsEmpty())
+		return NULL;
+	OldTreeItem *ptr = root;
+	for(const int *p = cursor.Begin(), *e = cursor.End() - 1; ptr && p < e; p++)
+		ptr = (*p >= 0 && *p < ptr->children.GetCount() ? &ptr->children[*p] : NULL);
+	return ptr;
+}
+
+const OldTreeCursor& OldTreeCursor::Open() const
+{
+	if(!root)
+		return *this;
+	OldTreeItem *i = root;
+	for(const int *p = cursor.Begin(), *e = cursor.End(); p < e; p++) {
+		if(!i->IsOpenItem())
+			i->Open().TouchLayout();
+		if(*p < 0 || *p >= i->GetCount())
+			break;
+		i = &(*i)[*p];
+	}
+	return *this;
+}
+
+OldTreeCursor& OldTreeCursor::BeginAll()
+{
+	cursor.Clear();
+	return *this;
+}
+
+OldTreeCursor& OldTreeCursor::EndAll()
+{
+	cursor.Clear();
+	ASSERT(root);
+	cursor.Add(root->GetCount());
+	return *this;
+}
+
+bool OldTreeCursor::IsBeginAll() const
+{
+	return cursor.IsEmpty();
+}
+
+bool OldTreeCursor::IsEndAll() const
+{
+	ASSERT(root);
+	return !cursor.IsEmpty() && cursor[0] >= root->GetCount();
+}
+
+bool OldTreeCursor::IsBegin() const
+{
+	return cursor.IsEmpty() || cursor.Top() == 0;
+}
+
+const OldTreeCursor& OldTreeCursor::Select(bool select, bool subtree) const
+{
+	OldTreeItem *ptr = Get();
+	if(ptr)
+		if(subtree)
+			ptr->SelectTree(select);
+		else
+			ptr->Select(select);
+	return *this;
+}
+
+OldTreeCursor& OldTreeCursor::Find(const OldTreeItem& item)
+{
+	cursor.Clear();
+	if(root = item.owner) {
+		for(OldTreeItem *i = const_cast<OldTreeItem *>(&item); i->parent; i = i->parent) {
+			int pos = i->parent->children.GetIndex(*i);
+			ASSERT(pos >= 0);
+			cursor.Insert(0, pos);
+		}
+	}
+	return *this;
+}
+
+OldTreeItem *OldTreeCursor::Find(int clss, int flags)
+{
+	for(OldTreeItem *i; i = Get(); Down(flags))
+		if(i->GetClass() == clss)
+			return i;
+	return NULL;
+}
+
+bool OldTreeCursor::Up(int flags)
+{
+	OldTreeItem *parent = GetParent();
+	if(!parent)
+		return false;
+	int pos = min(cursor.Top(), parent->GetCount());
+	if(pos <= 0) { // drop out of child into parent
+		if(flags & LEFT)
+			cursor.Drop();
+		return true;
+	}
+	cursor.Top() = (pos -= 1);
+	if(flags & (RIGHT | RIGHT_CLOSED))
+		for(OldTreeItem *temp; temp = &parent->children[pos],
+			!temp->IsEmpty() && (temp->IsOpenItem() || flags & RIGHT_CLOSED);
+			cursor.Add(pos = temp->GetCount() - 1), parent = temp)
+			;
+	return true;
+}
+
+bool OldTreeCursor::Down(int flags)
+{
+	if(cursor.IsEmpty()) { // step into 1st item
+		if(flags & (RIGHT | RIGHT_CLOSED) && root && !root->IsEmpty()
+			&& (root->IsOpenItem() || flags & RIGHT_CLOSED)) {
+			cursor.Add(0);
+			return true;
+		}
+		return false;
+	}
+
+	OldTreeItem *parent = GetParent();
+	if(!parent)
+		return false;
+	int pos = cursor.Top();
+	if(pos < parent->GetCount() && flags & (RIGHT | RIGHT_CLOSED)) {
+		OldTreeItem *ptr = &parent->children[pos];
+		if(!ptr->IsEmpty() && (ptr->IsOpenItem() || flags & RIGHT_CLOSED)) { // descend into child
+			cursor.Add(0);
+			return true;
+		}
+	}
+	do {
+		if(++cursor.Top() < parent->GetCount()) // move to next item in current row
+			return true;
+		if(!(flags & LEFT) || cursor.GetCount() <= 1) { // not moving out or global last item encountered - move to end item
+			cursor.Top() = parent->GetCount();
+			return true;
+		}
+		cursor.Drop();
+	}
+	while(parent = parent->parent);
+	return true;
+}
+
+OldTreeCursor& OldTreeCursor::Right()
+{
+	if(!IsEnd())
+		cursor.Add(0);
+	return *this;
+}
+
+OldTreeCursor& OldTreeCursor::Left()
+{
+	if(!cursor.IsEmpty())
+		cursor.Drop();
+	return *this;
+}
+
+OldTreeCursor& OldTreeCursor::Begin()
+{
+	cursor.Top() = 0;
+	return *this;
+}
+
+OldTreeCursor& OldTreeCursor::End()
+{
+	OldTreeItem *parent = GetParent();
+	if(parent)
+		cursor.Top() = parent->GetCount();
+	return *this;
+}
+
+int TreeCursor_Compare(const OldTreeCursor& a, const OldTreeCursor& b)
+{
+	return OldTreeCursor::Compare(a, b);
+}
+
+int OldTreeCursor::Compare(const OldTreeCursor& a, const OldTreeCursor& b)
+{
+	if(a.root != b.root)
+		return cmp(a.root, b.root);
+	const int *pa = a.cursor.Begin(), *ea = pa + min(a.cursor.GetCount(), b.cursor.GetCount());
+	const int *pb = b.cursor.Begin();
+	for(; pa < ea; pa++, pb++)
+		if(*pa != *pb)
+			return cmp(*pa, *pb);
+	return cmp(a.cursor.GetCount(), b.cursor.GetCount());
+}
+
+String OldTreeCursor::ToString() const
+{
+	String out;
+	out << '[';
+	for(int i = 0; i < cursor.GetCount(); i++) {
+		if(i)
+			out << ", ";
+		out << cursor[i];
+	}
+	out << ']';
+	return out;
+}
+
+bool OldTreeCursor::IsSubtreeOf(const OldTreeCursor& top) const
+{
+	return top.root == root
+		&& top.cursor.GetCount() <= cursor.GetCount()
+		&& !memcmp(top.cursor.Begin(), cursor.Begin(), top.cursor.GetCount() * sizeof(int));
+}
+
+//////////////////////////////////////////////////////////////////////
+// SimpleTreeItem::
+
+SimpleTreeItem::SimpleTreeItem()
+{
+	Zero(*this);
+	indent = 0;
+	type = TEXT;
+	layout = false;
+	enabled = true;
+	branch = true;
+	leaf = true;
+	auto_size = true;
+	auto_indent = true;
+}
+
+//////////////////////////////////////////////////////////////////////
+// OldTreeItem::
+
+OldTreeItem::OldTreeItem()
+: text(String::GetVoid())
+{
+}
+
+OldTreeItem::OldTreeItem(const OldTreeItem& item, int)
+: SimpleTreeItem(item)
+, text(item.text)
+, value(item.value)
+, subtree(item.subtree)
+, children(item.children, 0)
+{
+}
+
+OldTreeItem& OldTreeItem::Open(bool _open)
+{
+	if((open = _open) && !up_to_date && subtree) { // expand subtree as necessary
+		subtree(*this);
+		if(is_static)
+			up_to_date = true;
+		TouchLayout();
+	}
+	return *this;
+}
+
+void OldTreeItem::SetCursor()
+{
+	if(this) {
+		ASSERT(owner);
+		owner->SetCursor(this);
+	}
+}
+
+bool OldTreeItem::IsSubtree() const
+{
+	return !IsEmpty() || (subtree && !up_to_date);
+}
+
+bool OldTreeItem::IsOpenFull() const
+{
+	return IsOpenItem() && !IsEmpty();
+}
+
+String OldTreeItem::GetTextOrValue() const
+{
+	if(!text.IsVoid())
+		return text;
+	return StdFormat(value);
+}
+
+OldTreeItem& OldTreeItem::Select(bool _sel)
+{
+	if(this && selected != _sel) {
+		selected = _sel;
+		Touch();
+	}
+	return *this;
+}
+
+OldTreeItem& OldTreeItem::SelectTree(bool _sel)
+{
+	if(this) {
+		Select(_sel);
+		for(int i = 0; i < GetCount(); i++)
+			children[i].SelectTree(_sel);
+	}
+	return *this;
+}
+
+int OldTreeItem::GetCount(int clss) const
+{
+	int count = (item_class == clss ? 1 : 0);
+	for(int i = 0; i < children.GetCount(); i++)
+		count += children[i].GetCount(clss);
+	return count;
+}
+
+int OldTreeItem::GetCountDeep() const
+{
+	if(this == 0)
+		return 0;
+	int count = 1;
+	for(int i = 0; i < children.GetCount(); i++)
+		count += children[i].GetCountDeep();
+	return count;
+}
+
+const OldTreeItem *OldTreeItem::FindValue(Value _value) const
+{
+	if(value == _value)
+		return this;
+	for(int i = 0; i < children.GetCount(); i++) {
+		const OldTreeItem *p = children[i].FindValue(_value);
+		if(p)
+			return p;
+	}
+	return 0;
+}
+
+OldTreeItem *OldTreeItem::FindValue(Value _value)
+{
+	if(value == _value)
+		return this;
+	for(int i = 0; i < children.GetCount(); i++) {
+		OldTreeItem *p = children[i].FindValue(_value);
+		if(p)
+			return p;
+	}
+	return 0;
+}
+
+void OldTreeItem::Touch()
+{
+	if(this && !owner->updating && !owner->IsFullRefresh())
+		owner->Refresh(GetClientRect());
+}
+
+void OldTreeItem::TouchLayout()
+{
+	if(this && !layout) {
+		OldTreeItem *p = this;
+		while(p && !p->layout) {
+			p->layout = true;
+			p = p->parent;
+		}
+		if(!p && owner)
+			owner->Refresh();
+	}
+}
+
+Rect OldTreeItem::GetRect(int hittest) const
+{
+	Rect sum = Null;
+	if(item_size.cy <= 0)
+		return sum;
+
+	if((hittest & HBUTTON) && IsLeaf() && IsSubtree())
+		sum = RectC(-BUTTON_HALF, (item_size.cy >> 1) - BUTTON_HALF, BUTTON_SIZE, BUTTON_SIZE);
+
+	Size iconsize(0, 0);
+	if(type == TEXT && image)
+		iconsize = image.GetSize();
+	int left = 0;
+	if(leaf)
+		left += BUTTON_HALF + 1 + ICONGAP;
+	if(type == TEXT && image) {
+		if(hittest & HICON)
+			sum |= RectC(left, 0, iconsize.cx, item_size.cy);
+		left += iconsize.cx + TEXTGAP;
+	}
+	if(hittest & (HTEXT | HPICT | HCTRL))
+		sum |= Rect(left, 0, item_size.cx ? item_size.cx : tree_size.cx, item_size.cy);
+
+	return sum;
+}
+
+OldTreeItem& OldTreeItem::Clear()
+{
+	children.Clear();
+	TouchLayout();
+	return *this;
+}
+
+OldTreeItem& OldTreeItem::SetCount(int n)
+{
+	if(children.GetCount() == n)
+		return *this;
+
+	while(children.GetCount() < n)
+		Add();
+	children.SetCount(n);
+	TouchLayout();
+	return *this;
+}
+
+OldTreeItem *OldTreeItem::Detach(int pos)
+{
+	children[pos].TouchLayout();
+	return children.Detach(pos);
+}
+
+OldTreeItem& OldTreeItem::Add()
+{
+	return Insert(GetCount(), new OldTreeItem);
+}
+
+OldTreeItem& OldTreeItem::Insert(int pos)
+{
+	return Insert(pos, new OldTreeItem);
+}
+
+OldTreeItem& OldTreeItem::Add(OldTreeItem *item)
+{
+	return Insert(GetCount(), item);
+}
+
+static void SetOwner(OldTreeItem& item)
+{
+	for(int i = 0; i < item.GetCount(); i++)
+		SetOwner(item[i].SetOwner(item.GetOwner()));
+}
+
+OldTreeItem& OldTreeItem::Insert(int pos, OldTreeItem *item)
+{
+	ASSERT(owner && item);
+	children.Insert(pos, item);
+	item->parent = this;
+	item->owner  = owner;
+	UPP::SetOwner(*item);
+	item->TouchLayout();
+	return *item;
+}
+
+void OldTreeItem::Remove(int pos, int count)
+{
+	ASSERT(owner);
+	ASSERT(pos >= 0 && pos < GetCount());
+	if(pos >= 0 && pos < GetCount()) {
+		children.Remove(pos, count);
+		TouchLayout();
+	}
+}
+
+void OldTreeItem::LayoutItem()
+{
+	ASSERT(owner);
+	if(!layout)
+		return;
+	Size iconsize = image.GetSize();
+	int leafgap = (leaf ? BUTTON_HALF + 1 + ICONGAP : 0);
+	if(auto_indent)
+		indent = leafgap + (iconsize.cx >> 1);
+	if(auto_size) {
+		Size textsize(0, 0);
+		item_size = Size(0, 0);
+
+		switch(type) {
+		case TEXT: {
+				String display = GetTextOrValue();
+				if(!IsNull(display)) {
+/*					if(*display == '\xFF') {
+						Document doc(display.Begin() + 1);
+						Size size;
+						textsize.cx = doc.GetWidth(DOC_SCREEN_ZOOM, ScreenInfo());
+						textsize.cy = doc.GetHeight(DOC_SCREEN_ZOOM, ScreenInfo(), textsize.cx);
+					}
+					else*/
+						textsize = GetSmartTextSize(display, owner->font);
+				}
+			}
+			break;
+
+		case PICT:
+			textsize = picture->GetStdSize(value);
+			break;
+
+		case CTRL:
+			textsize = ctrl->GetRect().Size();
+			break;
+		}
+		item_size.cx = iconsize.cx + textsize.cx + leafgap + TSGAP;
+		item_size.cy = max(iconsize.cy, textsize.cy);
+		if(iconsize.cx && textsize.cx)
+			item_size.cx += TEXTGAP;
+	}
+
+	tree_size = item_size;
+
+/*	if(subtree && open) { // expand subtree as necessary
+		if(!up_to_date) {
+			subtree(*this);
+			if(is_static)
+				up_to_date = true;
+		}
+	}
+*/
+	if(open) { // include children in raw size
+		for(int i = 0; i < children.GetCount(); i++) {
+			OldTreeItem& child = children[i];
+			child.LayoutItem();
+			tree_size.cx = max(tree_size.cx, child.tree_size.cx + indent);
+			tree_size.cy += child.tree_size.cy;
+		}
+	}
+
+	layout = false;
+}
+
+void OldTreeItem::PaintItem(Draw& draw, Point pos) const
+{
+	Rect clip = draw.GetClip();
+	Rect rc = Rect(pos.x - BUTTON_HALF, pos.y, clip.right, pos.y + tree_size.cy) & clip;
+	if(rc.IsEmpty())
+		return;
+	int daddy = pos.x;
+
+	Color bg = (owner->IsShowEnabled() ? SWhite : SLtGray);
+ { // clear branch area
+		int lb = pos.x + (leaf ? BUTTON_HALF + 1 : 0);
+		int rb = pos.x + indent + BUTTON_HALF + 1;
+		draw.DrawRect(lb, pos.y, clip.right - lb, item_size.cy, DBG_PAINT(bg, LtRed));
+		draw.DrawRect(lb, pos.y, rb - lb, tree_size.cy, DBG_PAINT(bg, LtMagenta));
+/*
+		int left = parent ? prev + 1 : clip.left;
+		int right = pos.x + branch_indent + 1;
+		if(right - left)
+			draw.DrawRect(left, rc.top, right - left, rc.Height(), bg);
+*/
+	}
+
+	if(IsBranch() && IsOpenFull()) { // generate branch
+		int top = pos.y + item_size.cy;
+		int bot = Null, bbot = Null;
+		int tmp = top;
+		for(int i = 0; i < children.GetCount(); i++) {
+			const OldTreeItem& child = children[i];
+			if(child.item_size.cy > 0 && child.leaf) {
+				bot = tmp + (child.item_size.cy >> 1) + 1;
+				bbot = tmp + child.item_size.cy;
+			}
+			tmp += child.tree_size.cy;
+		}
+		if(!IsNull(bot) && item_size.cy > 0) { // vertical joint
+			int x = pos.x + indent;
+			DrawRect(draw, Rect(x, top, x + 1, bot), OldTreeCtrlImg::dither());
+		}
+	}
+
+	if(item_size.cy > 0) {
+		Rect item(pos, GetItemSize());
+//		if(prev + 1 < clip.right)
+//			draw.DrawRect(prev + 1, item.top, clip.right - prev - 1, item.Height(), bg);
+		if(item.Width() == 0)
+			item.right = item.left + tree_size.cx;
+		if(item.bottom > rc.top && item.top < rc.bottom) {
+			if(leaf) { // draw leaf
+				int mid = (item.top + item.bottom) >> 1;
+				DrawRect(draw, pos.x, mid, BUTTON_SIZE + ICONGAP, 1, OldTreeCtrlImg::dither());
+				if(IsSubtree()) { // draw expand/collapse button
+					draw.DrawImage(pos.x - BUTTON_HALF, mid - BUTTON_HALF, IsOpenItem() ? OldTreeCtrlImg::minus() : OldTreeCtrlImg::plus());
+				}
+				item.left += BUTTON_HALF + 1 + ICONGAP;
+			}
+
+			Color ink = SBlack;
+			Color bgnd = bg;
+			if(IsSelected())
+				if(owner->HasFocus()) {
+					bgnd = SBlue;
+					ink = SWhite;
+				}
+				else {
+					bgnd = SLtGray;
+					ink = SBlack;
+				}
+
+			if(image) {
+				Size iconsize = image.GetSize();
+				Point iconpos(item.left, (item.top + item.bottom - iconsize.cy) >> 1);
+			#ifdef NEWIMAGE
+				draw.DrawImage(iconpos.x, iconpos.y, enabled ? image : MakeImage(image, Etched));
+			#else
+				draw.DrawImage(iconpos.x, iconpos.y, image, enabled ? 0 : image.ETCHED);
+			#endif
+				item.left += iconsize.cx + TEXTGAP;
+			}
+
+			switch(type) {
+			case TEXT: {
+					String display = GetTextOrValue();
+					WString wdisplay;
+					if(!IsNull(display)) {
+						Size size;
+						if(*display == '\xFF') {
+							Document doc;
+							doc.Qtf(display.Begin() + 1);
+							size.cx = doc.GetWidth(SCREEN_ZOOM);
+							size.cy = doc.GetHeight(SCREEN_ZOOM, size.cx);
+						}
+						else
+							size = GetTLTextSize(wdisplay = display.ToWString(), owner->font);
+
+						Rect trc = item;
+						trc.left -= TSGAP;
+//						trc.top = (item.top + item.bottom - size.cy) >> 1;
+//						trc.bottom = trc.top + size.cy;
+						draw.DrawRect(trc, bgnd);
+						trc.left += TSGAP;
+						trc.top = (item.top + item.bottom - size.cy) >> 1;
+						if(*display == '\xFF') {
+							Document doc;
+							String s;
+							s << "[@(" << ink.GetR() << "." << ink.GetG() << "." << ink.GetB() << ") "
+								<< display.Begin() + 1;
+							doc.Qtf(s);
+							doc.Paint(SCREEN_ZOOM, draw, trc.left, trc.top, trc.Width());
+						}
+						else
+							DrawTLText(draw, trc.left, trc.top, trc.Width(), wdisplay, owner->font, ink);
+					}
+				}
+				break;
+
+			case PICT:
+				picture->Paint(draw, item, value, ink, bgnd, 0);
+				break;
+
+			case CTRL:
+				if(item != ctrl->GetRect())
+					ctrl->SetRect(item);
+				break;
+			}
+		}
+		pos.y += item_size.cy;
+	}
+	if(IsOpenFull()) {
+		pos.x += indent;
+		int i = 0;
+		for(; i < children.GetCount() && pos.y + children[i].tree_size.cy <= rc.top; i++)
+			pos.y += children[i].tree_size.cy;
+		for(; i < children.GetCount() && pos.y < rc.bottom; i++) {
+			children[i].PaintItem(draw, pos);
+			pos.y += children[i].tree_size.cy;
+		}
+	}
+}
+
+OldTreeItem::HITTEST OldTreeItem::FindItem(Point pt, OldTreeItem *& item) const
+{
+	if(pt.y < 0 || pt.y >= tree_size.cy) {
+		item = NULL;
+		return HNIL;
+	}
+	if(item_size.cy > 0 && pt.y < item_size.cy) { // check this item
+		item = (OldTreeItem*)this;
+		if(GetRect(HBUTTON).Contains(pt))
+			return HBUTTON;
+
+		switch(type) {
+		case TEXT:
+			if(GetRect(HICON).Contains(pt))
+				return HICON;
+			if(GetRect(HTEXT).Contains(pt))
+				return HTEXT;
+			break;
+
+		case PICT:
+			if(GetRect(HPICT).Contains(pt))
+				return HPICT;
+			break;
+
+		case CTRL:
+			if(GetRect(HCTRL).Contains(pt))
+				return HCTRL;
+			break;
+		}
+		return HOTHER;
+	}
+
+
+	if(IsOpenFull() && (pt.y -= item_size.cy) >= 0) {
+		pt.x -= indent;
+		for(int i = 0; i < children.GetCount() && pt.y >= 0; pt.y -= children[i++].tree_size.cy) {
+			HITTEST result;
+			if((result = children[i].FindItem(pt, item)) != HNIL)
+				return result;
+		}
+	}
+
+	item = NULL;
+	return HNIL;
+}
+
+int OldTreeItem::GetOpenCount() const
+{
+	int count = 0;
+	if(item_size.cy > 0)
+		count++;
+	if(IsOpenFull())
+		for(List::ConstIterator p = children.Begin(), e = children.End(); p < e; p++)
+			count += p->GetOpenCount();
+	return count;
+}
+
+Rect OldTreeItem::GetItemRect(int hittest) const
+{
+	Rect rc = GetRect(hittest);
+	for(const OldTreeItem *c = this, *p; p = c->parent; c = p) {
+		int i;
+		if(!p->IsOpenFull() || (i = p->children.GetIndex(*c)) < 0)
+			return Null; // error
+		int y = p->item_size.cy;
+		for(int t = 0; t < i; t++)
+			y += p->children[t].tree_size.cy;
+		rc.Offset(p->indent, y);
+	}
+	return rc;
+}
+
+Rect OldTreeItem::GetClientRect(int hittest) const
+{
+	return GetItemRect(hittest) + (owner->offset - owner->old_scroll);
+}
+
+Rect OldTreeItem::GetTreeRect() const
+{
+	Rect rc(0, 0, tree_size.cx, tree_size.cy);
+	for(const OldTreeItem *c = this, *p; p = c->parent; c = p) {
+		int i;
+		if(!p->IsOpenFull() || (i = p->children.GetIndex(*c)) < 0)
+			return Null; // error
+		int y = p->item_size.cy;
+		for(int t = 0; t < i; t++)
+			y += p->children[t].tree_size.cy;
+		rc.Offset(p->indent, y);
+	}
+	return rc;
+
+}
+
+Rect OldTreeItem::GetClientTreeRect() const
+{
+	return GetTreeRect() + (owner->offset - owner->old_scroll);
+}
+
+OldTreeItem& OldTreeItem::Set(Proc proc)
+{
+	subtree.Clear();
+	proc(*this);
+	return *this;
+}
+
+Bar::Item& OldTreeItem::BarOpenClose(Bar& bar)
+{
+	return bar.Add(enabled && IsSubtree(),
+		IsOpenItem() ? t_("Close") : t_("Open"), callback(this, &OldTreeItem::OnOpenClose))
+		.Help(IsOpenItem() ? t_("Close child items") : t_("Open child items"));
+}
+
+Bar::Item& OldTreeItem::BarOpenSubtree(Bar& bar)
+{
+	return bar.Add(enabled && IsSubtree(),
+		t_("Open all"), callback(this, &OldTreeItem::OnOpenSubtree))
+		.Help(t_("Open the whole subtree"));
+}
+
+Bar::Item& OldTreeItem::BarCloseSubtree(Bar& bar)
+{
+	return bar.Add(enabled && IsSubtree(),
+		t_("Close all"), callback(this, &OldTreeItem::OnCloseSubtree))
+		.Help(t_("Close the whole subtree"));
+}
+
+void OldTreeItem::OnOpenClose()
+{
+	if(enabled && IsSubtree()) {
+		Open(!IsOpenItem());
+		TouchLayout();
+		LayoutItem();
+		ScrollInto();
+	}
+}
+
+void OldTreeItem::OnOpenSubtreeRaw()
+{
+	if(enabled) {
+		Open();
+		TouchLayout();
+		for(int i = 0; i < GetCount(); i++)
+			children[i].OnOpenSubtree();
+	}
+}
+
+void OldTreeItem::OnOpenSubtree()
+{
+	OnOpenSubtreeRaw();
+	ScrollInto();
+}
+
+void OldTreeItem::OnCloseSubtree()
+{
+	for(int i = 0; i < GetCount(); i++)
+		children[i].OnCloseSubtree();
+	Close();
+	TouchLayout();
+}
+
+void OldTreeItem::ScrollInto()
+{
+	if(this && owner/* && owner->IsOpen()*/) {
+		owner->Layout();
+		Rect rc = owner->GetOffset() + GetItemRect();
+		rc.Inflate(4);
+		owner->ScrollInto(rc);
+	}
+}
+
+//////////////////////////////////////////////////////////////////////
+// OldTreeEdit::
+
+OldTreeEdit& OldTreeEdit::Perform()
+{
+	if(!cursor)
+		return *this;
+	item.TouchLayout();
+	OldTreeItem *pos;
+	switch(op & ~DEEP) {
+	case INS:
+		if(pos = cursor.GetParent()) {
+			int index = minmax(cursor.cursor.Top(), 0, pos->GetCount());
+			if(op & DEEP)
+				pos->Insert(index) <<= item;
+			else
+				pos->Insert(index) = item;
+			pos->TouchLayout();
+		}
+		else
+			NEVER();
+		break;
+	case INS | KIDS:
+		if(pos = cursor.Get()) {
+			if(!item.IsEmpty()) {
+				if(!pos->IsEmpty()) {
+					int count = pos->GetCount();
+					pos->children.SetCount(count + item.GetCount());
+					OldTreeItem::List::Iterator d = pos->children.GetIter(count);
+					for(OldTreeItem::List::Iterator p = item.children.Begin(), e = item.children.End(); p != e;)
+						if(op & DEEP)
+							*d++ <<= *p++;
+						else
+							*d++ = *p++;
+				}
+				else {
+					if(op & DEEP)
+						pos->children <<= item.children;
+					else
+						pos->children = item.children;
+				}
+				pos->TouchLayout();
+			}
+		}
+		else
+			NEVER();
+		break;
+	case UPD:
+		if(pos = cursor.Get()) {
+			if(op & DEEP)
+				*pos <<= item;
+			else
+				*pos = item;
+			pos->TouchLayout();
+		}
+		else
+			NEVER();
+		break;
+	case UPD | KIDS:
+		if(pos = cursor.Get()) {
+			if(op & DEEP)
+				pos->children <<= item.children;
+			else
+				pos->children = item.children;
+			pos->TouchLayout();
+		}
+		else
+			NEVER();
+		break;
+	case DEL:
+		if(pos = cursor.GetParent()) {
+			int index = cursor.cursor.Top();
+			if(index >= 0 && index < pos->GetCount()) {
+				pos->children.Remove(index);
+				pos->TouchLayout();
+				cursor.Adjust();
+			}
+			else
+				NEVER();
+		}
+		else
+			NEVER();
+		break;
+	case DEL | KIDS:
+		if(pos = cursor.Get()) {
+			pos->Clear();
+			pos->TouchLayout();
+		}
+		else
+			NEVER();
+		break;
+	}
+	return *this;
+}
+
+OldTreeEdit& OldTreeEdit::Adjust(OldTreeCursor& pos)
+{
+	switch(op & ~DEEP) {
+	case INS:        pos.AdjustAfter(cursor, 1); break;
+	case INS | KIDS: break;
+	case UPD:        break;
+	case UPD | KIDS: pos.Adjust(); break;
+	case DEL:
+		if(pos.IsSubtreeOf(cursor))
+			pos <<= cursor;
+		pos.AdjustAfter(cursor, -1);
+		break;
+
+	case DEL | KIDS:
+		if(pos.IsSubtreeOf(cursor))
+			pos <<= cursor;
+		pos.Adjust();
+		break;
+	}
+	return *this;
+}
+
+OldTreeEdit& OldTreeEdit::Adjust(const Vector<OldTreeCursor *>& list)
+{
+	for(OldTreeCursor *const *p = list.Begin(), *const *e = list.End(); p < e; p++)
+		Adjust(**p);
+	return *this;
+}
+
+//////////////////////////////////////////////////////////////////////
+// OldTreeCtrl::
+
+OldTreeCtrl::OldTreeCtrl()
+: updating(false)
+, font(StdFont())
+, offset(3 + BUTTON_HALF, 3)
+, old_scroll(Null)
+, open_menu(true)
+, hide_top(false)
+, hittest(0)
+, multiselect(false)
+{
+//	WheelScroll(scroll);
+	drag_state = 0;
+
+	owner = this;
+	AddFrame(scroll);
+	scroll.AutoHide();
+//	scroll/*.AutoHide()*/.AddTo(*this);
+	scroll.WhenScroll = THISBACK(OnScroll);
+
+	WhenOpenClose  = THISBACK(OnOpenClose);
+	WhenPush       = THISBACK(OnPush);
+	WhenRight      = THISBACK(OnRight);
+	WhenKey        = THISBACK(OnKey);
+	WhenBar        = THISBACK(StdBar);
+	WhenLeftDouble = THISBACK(OnOpenClose);
+
+	SetFrame(InsetFrame());
+}
+
+OldTreeCtrl::~OldTreeCtrl()
+{
+}
+
+Value OldTreeCtrl::GetData() const
+{
+	const OldTreeItem *item = GetCursorItem();
+	if(item)
+		return item->GetData();
+	return Value();
+}
+
+void OldTreeCtrl::SetData(const Value& value)
+{
+	SetCursor(FindValue(value));
+}
+
+OldTreeItem::HITTEST OldTreeCtrl::Find(Point pt, const OldTreeItem *& item) const
+{
+	return FindItem(pt - offset + old_scroll, (OldTreeItem*&)item);
+}
+
+OldTreeItem::HITTEST OldTreeCtrl::Find(Point pt, OldTreeItem *& item)
+{
+	return FindItem(pt - offset + old_scroll, item);
+}
+
+OldTreeCursor OldTreeCtrl::Find(int y) const
+{
+	OldTreeItem *item;
+	y += old_scroll.y - offset.cy;
+	HITTEST ht = FindItem(Point(0, y), item);
+	if(ht != HNIL && item)
+		return OldTreeCursor(*item);
+	OldTreeCursor c(*this);
+	if(y >= tree_size.cy)
+		c.EndAll();
+	return c;
+}
+
+OldTreeCtrl& OldTreeCtrl::HideTop()
+{
+	hide_top = true;
+	Indent(4);
+	Open();
+	EnableItem();
+	return *this;
+}
+
+void OldTreeCtrl::Layout()
+{
+//	if(!IsOpen())
+//		return;
+/*
+	if(IsDesignMode() && IsEmpty()) {
+		Text("OldTreeCtrl", CtrlImg::new_doc()).Open();
+		Add().Text("Child1", CtrlImg::save());
+		OldTreeItem& item = Add().Text("Child2", CtrlImg::save_as()).Open();
+		item.Add().Text("Child3", CtrlImg::open());
+	}
+*/
+	LayoutItem();
+	old_scroll = scroll;
+	rowht = tree_size.cy / max(GetOpenCount(), 1);
+	Size total = GetTreeSize() + 2 * offset;
+	scroll.Set(old_scroll, scroll.GetReducedViewSize(), total);
+	scroll.SetLine((scroll.GetReducedViewSize().cx >> 3) + 1, rowht);
+}
+
+void OldTreeCtrl::Paint(Draw& draw)
+{
+	if(layout) {
+		Layout();
+		Refresh();
+	}
+	Size size = GetSize();
+	Rect rc = GetClientTreeRect();
+	Rect rc_butt = rc;
+	rc_butt.left += BUTTON_HALF + 1 + ICONGAP;
+	Color bg = (IsShowEnabled() ? SWhite : SLtGray);
+	DrawRectMinusRect(draw, draw.GetClip(), rc_butt, DBG_PAINT(bg, LtGreen));
+	PaintItem(draw, rc.TopLeft());
+}
+
+void OldTreeCtrl::OnScroll()
+{
+	if((Point)scroll != old_scroll) {
+		Size delta = old_scroll - (Point)scroll;
+		Size view = GetSize();
+		old_scroll = scroll;
+		if(IsNull(old_scroll.x) || 2 * tabs(delta.cx) >= view.cx || 2 * tabs(delta.cy) >= view.cy || IsFullRefresh())
+			Refresh();
+		else
+			ScrollView(delta);
+	}
+}
+
+void OldTreeCtrl::LeftDown(Point pt, dword keyflags)
+{
+	SetFocus();
+	SetCapture();
+	OldTreeItem *item;
+	hittest = Find(pt, item);
+
+	if(multiselect && hittest == HNIL && !(keyflags & (K_CTRL | K_SHIFT)))
+		UnselectTree();
+	else if(item && item->IsEnabledItem()) {
+		OldTreeCursor new_cursor(*item);
+
+		switch(hittest) {
+		case HBUTTON:
+			item->Open(!item->IsOpenItem());
+			item->TouchLayout();
+			break;
+
+		case HNIL:
+			break;
+
+		default:
+			if(multiselect && (keyflags & K_CTRL))
+				PickCursor(new_cursor, XOR_SEL);
+			else if(multiselect && (keyflags & K_SHIFT) && anchor) // anchor selection
+				PickCursor(new_cursor, DRAG_SEL);
+			else if(!item->IsSelected())
+				PickCursor(new_cursor, SET_SEL);
+			else
+				PickCursor(new_cursor, KEEP_SEL);
+			break;
+		}
+	}
+
+	drag_start = pt;
+	drag_state = 2;
+
+	WhenPush();
+}
+
+void OldTreeCtrl::LeftUp(Point pt, dword keyflags)
+{
+	ReleaseCapture();
+	if(drag_state == 1)
+		WhenDrag(pt + GetScreenView().TopLeft(), keyflags, 3);
+	else {
+	}
+//	OldTreeItem *item;
+//	hittest = Find(pt, item);
+//	SetCursor(item);
+	Action();
+	drag_state = 0;
+}
+
+void OldTreeCtrl::LeftDouble(Point pt, dword keyflags)
+{
+	IgnoreMouseUp();
+	OldTreeItem *item;
+	int hit = Find(pt, item);
+	if(item == GetCursor().Get() && hit == hittest)
+		WhenLeftDouble();
+}
+
+void OldTreeCtrl::RightDown(Point pt, dword keyflags)
+{
+	if(drag_state == 1) {
+		WhenDrag(pt + GetScreenView().TopLeft(), keyflags, 2);
+		drag_state = 0;
+	}
+	SetFocus();
+	OldTreeItem *item;
+	hittest = Find(pt, item);
+	SetCursor(item);
+	Action();
+	WhenRight();
+}
+
+void OldTreeCtrl::MouseMove(Point pt, dword keyflags)
+{
+	Point scrn = pt + GetScreenView().TopLeft();
+	if(drag_state == 2 && abs2(pt - drag_start) >= 50) { // start d&d
+		WhenDrag(scrn, keyflags, 0);
+		drag_state = 1;
+	}
+	if(drag_state == 1)
+		WhenDrag(scrn, keyflags, 1);
+}
+
+void OldTreeCtrl::MouseWheel(Point p, int zdelta, dword keyflags)
+{
+	scroll.WheelY(zdelta);
+}
+
+Image OldTreeCtrl::CursorImage(Point pt, dword keyflags)
+{
+	Image image = Image::Arrow();
+	if(drag_state == 1)
+		WhenDragImage(image);
+	return image;
+}
+
+//////////////////////////////////////////////////////////////////////
+// default handlers
+
+void OldTreeCtrl::OnOpenClose()
+{
+	const OldTreeCursor& cursor = GetCursor();
+	if(cursor) {
+		cursor->Open(!cursor->IsOpenItem());
+		cursor.TouchLayout();
+	}
+}
+
+void OldTreeCtrl::OnPush()
+{
+}
+
+void OldTreeCtrl::OnRight()
+{
+	MenuBar menu;
+	WhenBar(menu);
+	menu.Execute();
+}
+
+void OldTreeCtrl::StdBar(Bar& bar)
+{
+	const OldTreeCursor& cursor = GetCursor();
+	if(cursor && cursor->IsSubtree()) {
+		cursor->BarOpenClose(bar);
+		cursor->BarOpenSubtree(bar);
+		cursor->BarCloseSubtree(bar);
+	}
+}
+
+bool OldTreeCtrl::Key(dword key, int repcnt)
+{
+	if(WhenKey(key))
+		return true;
+	if(key == K_INSERT)
+		if(OldTreeItem *item = GetCursorItem()) {
+			item->OnOpenClose();
+			return true;
+		}
+
+	return false;
+}
+
+bool OldTreeCtrl::OnKey(dword key)
+{
+	OldTreeCursor move = cursor.Copy();
+	Rect rc(0, 0, 0, 0);
+	const OldTreeItem *item = move.Get();
+	if(item)
+		rc = item->GetClientRect();
+
+	int ops = SET_SEL;
+	if(key & K_CTRL)
+		ops = XOR_SEL;
+	else if(key & K_SHIFT)
+		ops = DRAG_SEL;
+
+	switch(key & ~(K_SHIFT | K_CTRL)) {
+	default:
+		return Bar::Scan(WhenBar, key);
+
+	case K_UP:
+		if(move)
+			move.Up(OldTreeCursor::HIERARCHY);
+		else
+			move = OldTreeCursor(*this);
+		break;
+
+	case K_DOWN:
+		if(move)
+			move.Down(OldTreeCursor::HIERARCHY);
+		else
+			move = OldTreeCursor(*this);
+		break;
+
+	case K_PAGEUP:
+		move = Find(rc.bottom - GetSize().cy);
+		break;
+
+	case K_PAGEDOWN:
+		move = Find(rc.top + GetSize().cy);
+		break;
+
+	case K_CTRL_PAGEUP:
+	case K_HOME:
+		move = OldTreeCursor(*this);
+		break;
+
+	case K_CTRL_PAGEDOWN:
+	case K_END:
+		move = OldTreeCursor(*this).EndAll();
+		break;
+	}
+
+	if(move.IsEnd())
+		move.Up(OldTreeCursor::HIERARCHY);
+	if(move.IsBegin() && move && hide_top)
+		move.Down(OldTreeCursor::HIERARCHY);
+	if(move != cursor) {
+		PickCursor(move, ops);
+		Action();
+	}
+	return true;
+}
+
+OldTreeCtrl& OldTreeCtrl::PickCursor(pick_ OldTreeCursor& nc, int selection_op)
+{
+	OldTreeCursor new_cursor = nc;
+	new_cursor.Adjust();
+	cursor.Touch();
+	if(selection_op == DRAG_SEL && anchor) {
+		UnselectTree();
+		bool anchorup = anchor >= new_cursor;
+		const OldTreeCursor& b = (anchorup ? new_cursor : anchor);
+		const OldTreeCursor& l = (anchorup ? anchor : new_cursor);
+		for(OldTreeCursor p(b, 0); p <= l; p.Down(p.HIERARCHY))
+			if(p->IsEnabledItem())
+				p->Select();
+	}
+	else if(selection_op != KEEP_SEL) {
+		anchor <<= new_cursor;
+		if(selection_op == SET_SEL)
+			UnselectTree();
+		if(new_cursor)
+			new_cursor->Select(selection_op == SET_SEL ? true : !new_cursor->IsSelected());
+	}
+	cursor = new_cursor;
+	cursor.Touch().Open().ScrollInto();
+	WhenSetCursor();
+	return *this;
+}
+
+OldTreeCtrl& OldTreeCtrl::SetCursor(const OldTreeItem *item)
+{
+	if(!item)
+		return PickCursor(OldTreeCursor());
+	ASSERT(item->owner == this);
+	return PickCursor(OldTreeCursor(*item));
+}
+
+void OldTreeCtrl::GotFocus()
+{
+	Refresh();
+}
+
+void OldTreeCtrl::LostFocus()
+{
+	Refresh();
+}
+
+Point OldTreeCtrl::GetCursorSc() const
+{
+	Point pt = scroll;
+	OldTreeItem *i = GetCursorItem();
+	if(i)
+		pt -= i->GetTreeRect().TopLeft();
+	return pt;
+}
+
+void OldTreeCtrl::ScCursor(Point pt)
+{
+	OldTreeItem *i = GetCursorItem();
+	if(i)
+		pt += i->GetTreeRect().TopLeft();
+	scroll = pt;
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/TCtrlLib/OldTreeCtrl.h b/uppsrc/TCtrlLib/OldTreeCtrl.h
new file mode 100644
index 000000000..e91e59ccb
--- /dev/null
+++ b/uppsrc/TCtrlLib/OldTreeCtrl.h
@@ -0,0 +1,467 @@
+#ifndef __INCLUDE_CTRL_TREECTRL_H__
+#define __INCLUDE_CTRL_TREECTRL_H__
+
+NAMESPACE_UPP
+
+class OldTreeEdit;
+class OldTreeCursor;
+class OldTreeItem;
+class OldTreeCtrl;
+
+struct SimpleTreeItem
+{
+	friend class OldTreeItem;
+	friend class OldTreeCtrl;
+
+	SimpleTreeItem();
+
+	enum TYPE { TEXT, PICT, CTRL };
+	enum HITTEST
+	{
+		HNIL    = 0x00,
+		HBUTTON = 0x01,
+		HLEAF   = 0x02,
+		HICON   = 0x04,
+		HTEXT   = 0x08,
+		HPICT   = 0x10,
+		HCTRL   = 0x20,
+		HOTHER  = 0x40,
+		HALL    = HBUTTON | HLEAF | HICON | HTEXT | HPICT | HCTRL | HOTHER,
+	};
+
+protected:
+	OldTreeCtrl *owner;
+	OldTreeItem *parent;
+	int       indent;
+	Size      item_size;
+	Size      tree_size; // size including children - set by tree control
+	int       item_class; // user set item class
+	unsigned  type        : 4; // TYPE
+	bool      up_to_date  : 1;
+	bool      is_static   : 1;
+	bool      open        : 1;
+	bool      enabled     : 1;
+	bool      layout      : 1;
+	bool      branch      : 1;
+	bool      leaf        : 1;
+	bool      selected    : 1;
+	bool      auto_size   : 1;
+	bool      auto_indent : 1;
+	union
+	{
+		const Display *picture; // PICT
+		Ctrl          *ctrl;    // CTRL
+	};
+};
+
+class OldTreeItem : public SimpleTreeItem, Moveable<OldTreeItem>, DeepCopyOption<OldTreeItem>
+{
+	friend class OldTreeCtrl;
+	friend class OldTreeCursor;
+	friend class OldTreeEdit;
+
+public:
+	typedef Callback1<OldTreeItem&> Proc;
+	typedef Array<OldTreeItem>      List;
+
+	OldTreeItem();
+	OldTreeItem(const OldTreeItem&, int); // deep copy
+
+	TYPE          GetType() const              { return (TYPE)type; }
+
+	void          SetCursor();
+
+	OldTreeItem&     Open(bool _open = true);
+	OldTreeItem&     Close()                      { return Open(false); }
+	bool          IsOpenItem() const           { return open; }
+
+	OldTreeItem&     Static(bool _static = true)  { is_static = _static; return *this; }
+	OldTreeItem&     Dynamic()                    { return Static(false); }
+	bool          IsStatic() const             { return is_static; }
+
+	OldTreeItem&     UpToDate(bool _utd = true)   { up_to_date = _utd; return *this; }
+	OldTreeItem&     Reopen()                     { return UpToDate(false); }
+	bool          IsUpToDate() const           { return up_to_date; }
+	bool          IsDirty() const              { return !up_to_date; }
+
+	OldTreeItem&     Branch(bool _branch = true)  { branch = _branch; return *this; }
+	OldTreeItem&     NoBranch()                   { return Branch(false); }
+	bool          IsBranch() const             { return branch; }
+
+	OldTreeItem&     Leaf(bool _leaf = true)      { leaf = _leaf; return *this; }
+	OldTreeItem&     NoLeaf()                     { return Leaf(false); }
+	bool          IsLeaf() const               { return leaf; }
+
+	OldTreeItem&     Select(bool _sel = true); // accepts NULL this
+	OldTreeItem&     Unselect()                   { return Select(false); }
+	bool          IsSelected() const           { return selected; }
+
+	OldTreeItem&     SelectTree(bool _sel = true); // accepts NULL this
+	OldTreeItem&     UnselectTree()               { return SelectTree(false); }
+
+	void          Touch(); // accepts NULL this
+	void          TouchLayout(); // accepts NULL this
+	void          ScrollInto(); // accepts NULL this
+
+	OldTreeItem&     SetSize(Size sz)             { item_size = sz; auto_size = false; return *this; }
+	OldTreeItem&     AutoSize()                   { if(this && !auto_size) { auto_size = true; TouchLayout(); } return *this; }
+	int           GetWidth() const             { return item_size.cx; }
+	int           GetHeight() const            { return item_size.cy; }
+	Size          GetItemSize() const          { return item_size; }
+	Size          GetTreeSize() const          { return tree_size; }
+	Rect          GetRect(int hittest = HALL) const;
+
+	OldTreeItem&     Indent(int _indent)          { indent = _indent; auto_indent = false; return *this; }
+	OldTreeItem&     AutoIndent()                 { if(!auto_indent) { auto_indent = true; TouchLayout(); } return *this; }
+	int           GetIndent() const            { return indent; }
+
+	OldTreeItem&     EnableItem(bool _en = true)  { enabled = _en; return *this; }
+	OldTreeItem&     DisableItem()                { return EnableItem(false); }
+	bool          IsEnabledItem() const        { return enabled; }
+
+	OldTreeItem&     SetImage(Image _image)       { image = _image; return *this; }
+	OldTreeItem&     Text(String _text)           { text = _text; return *this; }
+	OldTreeItem&     Class(int _class)            { item_class = _class; return *this; }
+
+	Image         GetImage() const             { ASSERT(type == TEXT); return image; }
+	String        GetText() const              { return text; }
+	int           GetClass() const             { return this ? item_class : int(Null); }
+
+	OldTreeItem&     Text(String t, Image i)      { return Text(t).SetImage(i); }
+
+	void          SetData(Value val)           { value = val; }
+	Value         GetData() const              { return value; }
+
+	Value         operator ~ () const          { return value; }
+	Value         operator <<= (Value v)       { return value = v; }
+
+	String        GetTextOrValue() const;
+
+	OldTreeItem&     SetDisplay(const Display& d) { type = PICT; picture = &d; return *this; }
+	const Display& GetDisplay() const          { ASSERT(type == PICT); return *picture; }
+
+	OldTreeItem&     SetControl(Ctrl& _ctrl)      { type = CTRL; ctrl = &_ctrl; return *this; }
+	Ctrl&         GetControl() const           { ASSERT(type == CTRL); return *ctrl; }
+
+	OldTreeItem&     Subtree(Proc _subtree)       { subtree = _subtree; up_to_date = false; return *this; }
+	bool          IsSubtree() const;
+
+	OldTreeItem&     SetParent(OldTreeItem *_parent) { parent = _parent; return *this; }
+	OldTreeItem     *GetParent() const            { return parent; }
+
+	OldTreeItem&     SetOwner(OldTreeCtrl *_owner)   { owner = _owner; return *this; }
+	OldTreeCtrl     *GetOwner() const             { return owner; }
+
+	bool          IsEmpty() const              { return children.IsEmpty(); }
+	int           GetCount() const             { return children.GetCount(); }
+	bool          IsOpenFull() const;
+
+	int           GetCount(int clss) const;
+	int           GetCountDeep() const;
+
+	const OldTreeItem *FindValue(Value value) const;
+	OldTreeItem     *FindValue(Value value);
+
+	OldTreeItem&     Clear();
+	OldTreeItem&     SetCount(int n);
+
+	OldTreeItem&     Add();
+	OldTreeItem&     Insert(int pos);
+	void          Remove(int pos, int count = 1);
+	OldTreeItem&     Top()                        { return children.Top(); }
+
+	OldTreeItem&     Add(OldTreeItem *item);
+	OldTreeItem&     Insert(int pos, OldTreeItem *item);
+	OldTreeItem     *Detach(int pos);
+
+	const OldTreeItem& operator [] (int i) const  { return children[i]; }
+	OldTreeItem&     operator [] (int i)          { return children[i]; }
+
+	const List&   GetChildren() const          { return children; }
+	List&         GetChildren()                { return children; }
+
+	int           GetIndex(const OldTreeItem *i) const { return i ? children.GetIndex(*i) : -1; }
+
+	OldTreeItem&     Set(Proc proc);
+
+	void          LayoutItem();
+	void          PaintItem(Draw& draw, Point pos) const;
+	HITTEST       FindItem(Point pt, OldTreeItem *& item) const;
+	int           GetOpenCount() const;
+	Rect          GetItemRect(int hittest = HALL) const;
+	Rect          GetClientRect(int hittest = HALL) const;
+	Rect          GetTreeRect() const;
+	Rect          GetClientTreeRect() const;
+
+	Bar::Item&    BarOpenClose(Bar& bar);
+	Bar::Item&    BarOpenSubtree(Bar& bar);
+	Bar::Item&    BarCloseSubtree(Bar& bar);
+
+	void          OnOpenClose();
+	void          OnOpenSubtree();
+	void          OnCloseSubtree();
+
+protected:
+	void          OnOpenSubtreeRaw();
+
+protected:
+	String        text;
+	Value         value;
+	Image         image; // TEXT
+	Proc          subtree;
+	List          children;
+};
+
+class OldTreeCursor;
+
+int   TreeCursor_Compare(const OldTreeCursor& a, const OldTreeCursor& b);
+
+class OldTreeCursor : CompareRelOps<const OldTreeCursor&, TreeCursor_Compare,
+                   MoveableAndDeepCopyOption<OldTreeCursor> >
+{
+	friend class OldTreeEdit;
+
+public:
+	enum FLAGS
+	{
+		RIGHT        = 0x01, // step into open items (Down, Up)
+		RIGHT_CLOSED = 0x02, // step into closed items (Down, Up)
+		LEFT         = 0x04, // step out of items
+		HIERARCHY    = LEFT | RIGHT,
+		ALL          = HIERARCHY | RIGHT_CLOSED,
+	};
+
+	OldTreeCursor();
+	OldTreeCursor(const OldTreeItem& item);
+	OldTreeCursor(const OldTreeCursor& another, int);
+
+	OldTreeCursor         Copy() const         { return OldTreeCursor(*this, 0); }
+
+	void               Clear()              { root = NULL; cursor.Clear(); }
+
+	OldTreeCursor&        Adjust(); // ensures validity of cursor after removing items from table
+	OldTreeCursor&        AdjustAfter(const OldTreeCursor& c, int delta);
+
+	OldTreeCursor&        WeakAdjust();
+	OldTreeCursor&        WeakAdjustAfter(const OldTreeCursor& c, int delta);
+
+	bool               IsSubtreeOf(const OldTreeCursor& top) const;
+
+	OldTreeItem          *Get() const;
+	OldTreeItem          *GetParent() const;
+	OldTreeCtrl          *GetRoot() const      { return root; }
+	int                Top() const          { return cursor.Top(); }
+
+	bool               IsRoot() const       { return root; }
+
+	const OldTreeCursor&  Select(bool select = true, bool subtree = false) const;
+
+	const OldTreeCursor&  Open() const;
+	const OldTreeCursor&  Touch() const        { Get() -> Touch(); return *this; }
+	const OldTreeCursor&  TouchLayout() const  { Get() -> TouchLayout(); return *this; }
+	const OldTreeCursor&  AutoSize() const     { Get() -> AutoSize(); return *this; }
+	const OldTreeCursor&  ScrollInto() const   { Get() -> ScrollInto(); return *this; }
+
+	operator OldTreeItem *() const             { return Get(); }
+
+	OldTreeItem          *operator ~ () const  { return Get(); }
+	OldTreeItem&          operator * () const  { OldTreeItem *p = Get(); ASSERT(p); return *p; }
+	OldTreeItem          *operator -> () const { OldTreeItem *p = Get(); ASSERT(p); return p; }
+
+	OldTreeCursor&        BeginAll();
+	OldTreeCursor&        EndAll();
+
+	bool               IsBeginAll() const;
+	bool               IsEndAll() const;
+
+	bool               IsBegin() const;
+	bool               IsEnd() const        { return Get() == NULL; }
+
+	OldTreeCursor&        Find(const OldTreeItem& item);
+	OldTreeItem          *Find(int clss, int flags = HIERARCHY);
+
+	bool               Up(int flags = 0);   // go to previous item
+	bool               Down(int flags = 0); // go to next item
+	OldTreeCursor&        Right();             // go to 1st child
+	OldTreeCursor&        Left();              // go to parent
+	OldTreeCursor&        Begin();             // 1st item in current child array
+	OldTreeCursor&        End();               // past last item in current child array
+
+	const Vector<int>& GetIndex() const { return cursor; }
+	Vector<int>&       GetIndex()       { return cursor; }
+
+	static int         Compare(const OldTreeCursor& a, const OldTreeCursor& b);
+
+	String             ToString() const;
+
+protected:
+	OldTreeCursor&        AddAfter(const OldTreeCursor& c, int delta);
+
+protected:
+	OldTreeCtrl          *root;
+	Vector<int>        cursor;
+};
+
+class OldTreeEdit
+{
+public:
+	enum OP
+	{
+		INS, UPD, DEL,
+		OP_MASK = 0x3,
+		KIDS = 0x4,
+		DEEP = 0x8, // doesn't pick out the item
+	};
+	OldTreeEdit(int op) : op(op) {}
+	OldTreeEdit(const OldTreeEdit& e, int) : op(e.op), item(e.item, 0), cursor(e.cursor, 0) {}
+
+	static OldTreeEdit   Insert()                    { return OldTreeEdit(INS); }
+	static OldTreeEdit   InsertChildren()            { return OldTreeEdit(INS | KIDS); }
+
+	static OldTreeEdit   Update()                    { return OldTreeEdit(UPD); }
+	static OldTreeEdit   UpdateChildren()            { return OldTreeEdit(UPD | KIDS); }
+
+	static OldTreeEdit   Delete()                    { return OldTreeEdit(DEL); }
+	static OldTreeEdit   DeleteChildren()            { return OldTreeEdit(DEL | KIDS); }
+
+	OldTreeEdit&         PickItem(OldTreeItem& _item)   { item = _item; return *this; }
+	OldTreeEdit&         Item(const OldTreeItem& _item) { item <<= _item; return *this; }
+	const OldTreeItem&   GetItem() const             { return item; }
+	OldTreeItem&         GetItem()                   { return item; }
+
+	OldTreeEdit&         PickCursor(pick_ OldTreeCursor& _c)  { cursor = _c; return *this; }
+	OldTreeEdit&         Cursor(const OldTreeCursor& _c){ cursor <<= _c; return *this; }
+	const OldTreeCursor& GetCursor() const           { return cursor; }
+	OldTreeCursor&       GetCursor()                 { return cursor; }
+
+	int               GetOpCode() const           { return op; }
+	OP                GetOp() const               { return (OP)(op & OP_MASK); }
+	bool              IsInsert() const            { return (op & OP_MASK) == INS; }
+	bool              IsUpdate() const            { return (op & OP_MASK) == UPD; }
+	bool              IsDelete() const            { return (op & OP_MASK) == DEL; }
+	bool              IsChildren() const          { return op & KIDS; }
+
+	OldTreeEdit&         Perform(); // performs only
+	OldTreeEdit&         Adjust(OldTreeCursor& pos);
+	OldTreeEdit&         Adjust(const Vector<OldTreeCursor *>& list);
+
+protected:
+	int               op;
+	OldTreeItem          item; // item for insert/update; received from delete
+	OldTreeCursor        cursor;
+};
+
+class OldTreeCtrl : public Ctrl/* WithWheelScroll<Ctrl> */, public OldTreeItem
+{
+	friend class OldTreeItem;
+
+public:
+	typedef OldTreeCtrl CLASSNAME;
+
+	OldTreeCtrl();
+	virtual ~OldTreeCtrl();
+
+	enum SELECTION_OP
+	{
+		KEEP_SEL, SET_SEL, XOR_SEL, DRAG_SEL,
+	};
+
+	virtual Value     GetData() const;
+	virtual void      SetData(const Value& value);
+
+	Value             operator ~ () const                 { return GetData(); }
+	Value             operator <<= (Value v)              { SetData(v); return v; }
+	Callback          operator <<= (Callback c)           { return WhenAction = c; }
+
+	const OldTreeCursor& GetCursor() const                   { return cursor; }
+	bool              IsCursor() const                    { return cursor; }
+	OldTreeItem         *GetCursorItem() const               { return cursor.Get(); }
+	OldTreeCtrl&         PickCursor(pick_ OldTreeCursor& cursor, int selection_op = SET_SEL);
+	OldTreeCtrl&         SetCursor(const OldTreeCursor& cursor) { return PickCursor(cursor.Copy()); }
+	OldTreeCtrl&         SetCursor(const OldTreeItem *item);
+
+	int               GetHitTest() const                  { return hittest; }
+
+	OldTreeCtrl&         Font(class Font _font)           { font = _font; TouchLayout(); return *this; }
+	UPP::Font            GetFont() const                     { return font; }
+
+	OldTreeItem&         Add()                               { return OldTreeItem::Add(); }
+
+	OldTreeCtrl&         Offset(Size _offset)                { offset = _offset; Layout(); return *this; }
+	Size              GetOffset() const                   { return offset; }
+
+	OldTreeCtrl&         OpenMenu(bool _o)                   { open_menu = _o; return *this; }
+	bool              IsOpenMenu() const                  { return open_menu; }
+
+	OldTreeCtrl&         MultiSelect(bool _ms = true)        { multiselect = _ms; return *this; }
+	OldTreeCtrl&         NoMultiSelect()                     { return MultiSelect(false); }
+	bool              IsMultiSelect() const               { return multiselect; }
+
+	bool              IsDragAction() const                { return drag_state == 1; }
+
+	OldTreeCtrl&         HideTop();
+
+	HITTEST           Find(Point pt, const OldTreeItem *& item) const;
+	HITTEST           Find(Point pt, OldTreeItem *& item);
+	OldTreeCursor        Find(int y) const;
+
+	void              ScrollInto(Rect rc)                 { scroll.ScrollInto(rc); }
+	Point             GetCursorSc() const;
+	void              ScCursor(Point pt);
+
+	virtual void      Layout();
+	virtual void      Paint(Draw& draw);
+
+	virtual void      LeftDown(Point pt, dword keyflags);
+	virtual void      LeftUp(Point pt, dword keyflags);
+	virtual void      LeftDouble(Point pt, dword keyflags);
+	virtual void      RightDown(Point pt, dword keyflags);
+	virtual void      MouseMove(Point pt, dword keyflags);
+	virtual void      MouseWheel(Point p, int zdelta, dword keyflags);
+	virtual Image     CursorImage(Point pt, dword keyflags);
+	virtual bool      Key(dword key, int repcnt);
+
+	virtual void      GotFocus();
+	virtual void      LostFocus();
+
+	void              OnOpenClose();
+	void              OnPush();
+	void              OnRight();
+	void              StdBar(Bar& bar);
+	bool              OnKey(dword key);
+
+public:
+	Callback          WhenOpenClose;
+	Callback          WhenPush;   // item, hittest, keyflags
+	Callback          WhenLeftDouble;
+	Callback          WhenRight;
+	Callback1<Bar&>   WhenBar;
+	Gate1<dword>      WhenKey;
+	Callback          WhenSetCursor;
+
+	Callback3<Point, dword, char> WhenDrag; // 0 = begin, 1 = animate, 2 = cancel, 3 = commit
+	Callback1<Image&> WhenDragImage;
+
+protected:
+	void              OnScroll();
+
+protected:
+	bool              updating;       // currently updating
+	bool              open_menu;      // open/close menuitem
+	bool              hide_top;       // ignore top level item
+	bool              multiselect;    // allow concurrent selection of multiple tree items
+	UPP::Font            font;
+	Size              offset;
+	Point             old_scroll;
+	int               rowht;          // average row height
+	ScrollBars        scroll;
+	OldTreeCursor        cursor;
+	OldTreeCursor        anchor;
+	int               hittest;
+	Point             drag_start;
+	char              drag_state; // 0 = off, 1 = on, 2 = possible
+};
+
+END_UPP_NAMESPACE
+
+#endif//__INCLUDE_CTRL_TREECTRL_H__
diff --git a/uppsrc/TCtrlLib/OldTreeCtrl.iml b/uppsrc/TCtrlLib/OldTreeCtrl.iml
new file mode 100644
index 000000000..68531abfc
--- /dev/null
+++ b/uppsrc/TCtrlLib/OldTreeCtrl.iml
@@ -0,0 +1,34 @@
+IMAGE_BEGIN(minus)
+	IMAGE_SCAN("����\1\377\377\377")
+	IMAGE_SCAN("\1����\377\377\377\1���")
+	IMAGE_SCAN("\1����\377\377\377\1���")
+	IMAGE_SCAN("\1����\377\377\377\1���")
+	IMAGE_SCAN("\2���\377\377\377�\0\0\0\1\377\377\377\1���")
+	IMAGE_SCAN("\1����\377\377\377\1���")
+	IMAGE_SCAN("\1����\377\377\377\1���")
+	IMAGE_SCAN("\1����\377\377\377\1���")
+	IMAGE_SCAN("����")
+IMAGE_PACKED(minus, "\2\11\0\0\0\11\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(plus)
+	IMAGE_SCAN("����")
+	IMAGE_SCAN("\1����\377\377\377\1���")
+	IMAGE_SCAN("\1����\377\377\377\1\0\0\0�\377\377\377\1���")
+	IMAGE_SCAN("\1����\377\377\377\1\0\0\0�\377\377\377\1���")
+	IMAGE_SCAN("\2���\377\377\377�\0\0\0\1\377\377\377\1���")
+	IMAGE_SCAN("\1����\377\377\377\1\0\0\0�\377\377\377\1���")
+	IMAGE_SCAN("\1����\377\377\377\1\0\0\0�\377\377\377\1���")
+	IMAGE_SCAN("\1����\377\377\377\1���")
+	IMAGE_SCAN("����")
+IMAGE_PACKED(plus, "\2\11\0\0\0\11\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(dither)
+	IMAGE_SCAN("\11\377\377\377���\377\377\377���\377\377\377���\377\377\377���\377\377\377\1���")
+	IMAGE_SCAN("\11���\377\377\377���\377\377\377���\377\377\377���\377\377\377���\1\377\377\377")
+	IMAGE_SCAN("\11\377\377\377���\377\377\377���\377\377\377���\377\377\377���\377\377\377\1���")
+	IMAGE_SCAN("\11���\377\377\377���\377\377\377���\377\377\377���\377\377\377���\1\377\377\377")
+	IMAGE_SCAN("\11\377\377\377���\377\377\377���\377\377\377���\377\377\377���\377\377\377\1���")
+	IMAGE_SCAN("\11���\377\377\377���\377\377\377���\377\377\377���\377\377\377���\1\377\377\377")
+	IMAGE_SCAN("\11\377\377\377���\377\377\377���\377\377\377���\377\377\377���\377\377\377\1���")
+	IMAGE_SCAN("\11���\377\377\377���\377\377\377���\377\377\377���\377\377\377���\1\377\377\377")
+	IMAGE_SCAN("\11\377\377\377���\377\377\377���\377\377\377���\377\377\377���\377\377\377\1���")
+	IMAGE_SCAN("\11���\377\377\377���\377\377\377���\377\377\377���\377\377\377���\1\377\377\377")
+IMAGE_PACKED(dither, "\2\12\0\0\0\12\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0")
diff --git a/uppsrc/TCtrlLib/OldTreeCtrl.lng b/uppsrc/TCtrlLib/OldTreeCtrl.lng
new file mode 100644
index 000000000..aece665a8
--- /dev/null
+++ b/uppsrc/TCtrlLib/OldTreeCtrl.lng
@@ -0,0 +1,23 @@
+#if LANGUAGE == LNGC_('C', 'S', 'C', 'Z', 15)
+
+txt(TreeCtrlClose, "Zav��t")
+txt(TreeCtrlOpen, "Otev��t")
+txt(TreeCtrlCloseHelp, "Schovat pod��zen� polo�ky")
+txt(TreeCtrlOpenHelp, "Rozbalit pod��zen� polo�ky")
+txt(TreeCtrlOpenAll, "Otev��t v�echno")
+txt(TreeCtrlOpenAllHelp, "Rozbalit cel� podstrom polo�ky")
+txt(TreeCtrlCloseAll, "Zav��t v�echno")
+txt(TreeCtrlCloseAllHelp, "Zav��t a schovat v�echny pod��zen� polo�ky")
+
+#elif LANGUAGE == LNG_('E', 'N', 'U', 'S')
+
+txt(TreeCtrlClose, "Close")
+txt(TreeCtrlOpen, "Open")
+txt(TreeCtrlCloseHelp, "Close child items")
+txt(TreeCtrlOpenHelp, "Open child items")
+txt(TreeCtrlOpenAll, "Open all")
+txt(TreeCtrlOpenAllHelp, "Open the whole subtree")
+txt(TreeCtrlCloseAll, "Close all")
+txt(TreeCtrlCloseAllHelp, "Close the whole subtree")
+
+#endif
diff --git a/uppsrc/TCtrlLib/Ruler.cpp b/uppsrc/TCtrlLib/Ruler.cpp
new file mode 100644
index 000000000..ed3a8f204
--- /dev/null
+++ b/uppsrc/TCtrlLib/Ruler.cpp
@@ -0,0 +1,368 @@
+#include "TCtrlLib.h"
+
+NAMESPACE_UPP
+
+RulerCtrl::RulerCtrl()
+{
+	width = GetStdWidth();
+	scale = 1;
+	delta = 0;
+	cursor = Null;
+	raw_delta = Null;
+	min_range = Null;
+	max_range = Null;
+	small_repeat = Null;
+	text_repeat = Null;
+	text_convert = NULL;
+	font = Arial(11);
+	is_vert = false;
+	is_right = false;
+	background = Yellow;
+	outer_color = SGray();
+	autoselect = false;
+}
+
+RulerCtrl::~RulerCtrl() {}
+
+void RulerCtrl::SetZoom(double sc, double dl)
+{
+	scale = sc;
+	delta = dl;
+	Layout();
+}
+
+void RulerCtrl::MinMax(double min, double max)
+{
+	min_range = min;
+	max_range = max;
+	Refresh();
+}
+
+void RulerCtrl::PickSmallStep(pick_ Vector<double>& pos, double repeat)
+{
+	small_step = pos;
+	small_repeat = repeat;
+	Refresh();
+}
+
+void RulerCtrl::SetSmallStep(double delta)
+{
+	small_step.Clear();
+	small_step.Add(0);
+	small_repeat = delta;
+	Refresh();
+}
+
+void RulerCtrl::PickTextStep(pick_ Vector<double>& pos, pick_ Vector<String>& texts, double repeat, const Convert& convert)
+{
+	text_step = pos;
+	text_value = texts;
+	text_repeat = repeat;
+	text_convert = &convert;
+}
+
+void RulerCtrl::SetTextStep(double repeat, const Convert& convert)
+{
+	text_step.SetCount(1);
+	text_step[0] = 0;
+	text_value.Clear();
+	text_repeat = repeat;
+	text_convert = &convert;
+}
+
+double RulerCtrl::Snap(double v) const
+{
+	if(small_step.IsEmpty() || IsNull(small_repeat))
+		return v;
+	double base = 0;
+	if(!IsNull(small_repeat)) {
+		base = small_repeat * floor(v / small_repeat);
+		v -= base;
+	}
+	double best_v = small_step[0] + Nvl(small_repeat, 0.0);
+	double best = fabs(best_v - v);
+	for(int i = 0; i < small_step.GetCount(); i++) {
+		double d = fabs(v - small_step[i]);
+		if(d < best) {
+			best = d;
+			best_v = small_step[i];
+		}
+	}
+	return best_v + base;
+}
+
+void RulerCtrl::Layout()
+{
+	raw_delta = Null;
+	Refresh();
+}
+
+double RulerCtrl::GetRawDelta() const
+{
+	if(IsNull(raw_delta)) {
+		raw_delta = delta;
+		if(InFrame()) {
+			Point pt = GetScreenView().TopLeft(), par = GetParent() ? GetParent() -> GetScreenView().TopLeft() : pt;
+			raw_delta -= (is_vert ? pt.y - par.y : pt.x - par.x);
+		}
+	}
+	return raw_delta;
+}
+
+void RulerCtrl::FrameLayout(Rect& rc)
+{
+	Rect pos = rc;
+	int wd = (IsVisible() ? width : 0);
+	if(IsVert()) {
+		if(IsBottomRight())
+			rc.right = max(rc.left, pos.left = rc.right - wd);
+		else
+			rc.left = min(rc.right, pos.right = pos.left + wd);
+	}
+	else {
+		if(IsBottomRight())
+			rc.bottom = max(rc.top, pos.top = pos.bottom - wd);
+		else
+			rc.top = min(rc.bottom, pos.bottom = pos.top + wd);
+	}
+	SetFrameRect(pos);
+}
+
+void RulerCtrl::FrameAddSize(Size& sz)
+{
+	if(IsVisible()) {
+		if(IsVert())
+			sz.cx += width;
+		else
+			sz.cy += width;
+	}
+}
+
+void RulerCtrl::RefreshCursor(double cursor)
+{
+	if(!IsNull(cursor)) {
+		double cl = ToClientf(cursor);
+		Size size = GetSize();
+		int lim = (is_vert ? size.cy : size.cx);
+		if(cl >= -ARROW_RAD && cl <= lim + ARROW_RAD) {
+			int icl = fround(cl);
+			if(is_vert)
+				Refresh(0, icl - ARROW_RAD, size.cx, ARROW_DIAM);
+			else
+				Refresh(icl - ARROW_RAD, 0, ARROW_DIAM, size.cy);
+		}
+	}
+}
+
+void RulerCtrl::SetCursor(double c)
+{
+	if(c != cursor) {
+		RefreshCursor(cursor);
+		RefreshCursor(cursor = c);
+	}
+}
+
+void RulerCtrl::SetData(const Value& v)
+{
+	SetCursor(v);
+}
+
+Value RulerCtrl::GetData() const
+{
+	return cursor;
+}
+
+void RulerCtrl::Paint(Draw& draw)
+{
+	Size client = GetSize();
+	int csize = is_vert ? client.cy : client.cx;
+	int cheight = is_vert ? client.cx : client.cy;
+	Rect clip = draw.GetClip();
+	int cy = font.Info().GetHeight();
+	double pos1 = FromClient(0);
+	double pos2 = FromClient(csize);
+	if(pos1 > pos2)
+		Swap(pos1, pos2);
+	double lrange = min_range, rrange = max_range;
+	if(!IsNull(min_range) && pos1 < min_range) pos1 = min_range;
+	if(!IsNull(max_range) && pos2 > max_range) pos2 = max_range;
+	int cli1 = 0, cli2 = csize;
+	if(scale < 0)
+		Swap(lrange, rrange);
+	if(!IsNull(lrange))
+		cli1 = max<int>(cli1, ToClient(lrange));
+	if(!IsNull(rrange))
+		cli2 = min<int>(cli2, ToClient(rrange));
+	Rect nclip;
+	if(is_vert) {
+		draw.DrawRect(0, 0, client.cx, cli1, outer_color);
+		if(!IsNull(lrange))
+			draw.DrawRect(0, cli1++, client.cx, 1, SBlack);
+		draw.DrawRect(0, cli2, client.cx, client.cy - cli2, outer_color);
+		if(!IsNull(rrange))
+			draw.DrawRect(0, --cli2, client.cx, 1, SBlack);
+		draw.DrawRect(0, cli1, 1, cli2 - cli1, SGray);
+//		draw.DrawRect(0, cli1, 1, cli2 - cli1, SBlack);
+		draw.DrawRect(client.cx - 1, cli1, 1, cli2 - cli1, SBlack);
+		nclip = RectC(1, cli1, client.cx - 2, cli2 - cli1);
+	}
+	else {
+		draw.DrawRect(0, 0, cli1, client.cy, outer_color);
+		if(!IsNull(lrange))
+			draw.DrawRect(cli1++, 0, 1, client.cy, SBlack);
+		draw.DrawRect(cli2, 0, client.cx - cli2, client.cy, outer_color);
+		if(!IsNull(rrange))
+			draw.DrawRect(--cli2, 0, 1, client.cy, SBlack);
+		draw.DrawRect(cli1, 0, cli2 - cli1, 1, SGray);
+		draw.DrawRect(cli1, client.cy - 1, cli2 - cli1, 1, SBlack);
+		nclip = RectC(cli1, 1, cli2 - cli1, client.cy - 2);
+	}
+	draw.DrawRect(nclip, background);
+	draw.Clip(nclip);
+
+	enum {
+		SMALL_LIMIT = 100,
+		TEXT_LIMIT = 50,
+		TGAP = 3,
+		HGAP = 2,
+		VGAP = 0,
+		HXGAP = 3,
+		VXGAP = 2,
+		SMALL_SIZE = 5,
+	};
+
+	double rep_count = 1;
+	double rep_delta = 0;
+	if(!IsNull(small_repeat)) {
+		rep_delta = small_repeat * floor(pos1 / small_repeat);
+		rep_count = ceil(pos2 / small_repeat) - floor(pos1 / small_repeat);
+	}
+	if(!small_step.IsEmpty() && rep_count > 0
+	&& rep_count * small_step.GetCount() * 3 <= cli2 - cli1) {
+		int ix = BinFindIndex(small_step, pos1 - rep_delta);
+		int ppos = (is_right ? 0 : cheight - SMALL_SIZE);
+		for(int c = fround(rep_count); --c >= 0; ix = 0, rep_delta += small_repeat) {
+			int lim = small_step.GetCount();
+			if(small_step.Top() > pos2 - rep_delta)
+				lim = BinFindIndex(small_step, pos2 - rep_delta);
+			for(; ix < lim; ix++) {
+				int cli = ToClient(small_step[ix] + rep_delta);
+				if(is_vert)
+					draw.DrawRect(ppos, cli, SMALL_SIZE, 1, Gray());
+				else
+					draw.DrawRect(cli, ppos, 1, SMALL_SIZE, Gray());
+			}
+		}
+	}
+	rep_count = 1;
+	double rep_index = 0;
+	if(!IsNull(text_repeat)) {
+		rep_index = floor(pos1 / text_repeat);
+		rep_count = ceil(pos2 / text_repeat) - floor(pos1 / text_repeat) + 1;
+	}
+	if(!text_step.IsEmpty() && (!text_value.IsEmpty() || text_convert)
+	&& rep_count > 0 && rep_count * text_step.GetCount() <= TEXT_LIMIT) {
+		int ix = BinFindIndex(text_step, pos1 - rep_index * text_repeat);
+		int ppos = (is_right ? SMALL_SIZE : cheight - cy - SMALL_SIZE);
+		for(int c = fround(rep_count); --c >= 0; ix = 0, rep_index++) {
+			int lim = text_step.GetCount();
+			double dp2 = pos2 - rep_index * text_repeat;
+			if(text_step.Top() > dp2) {
+				lim = BinFindIndex(text_step, dp2);
+				if(lim + 1 < text_step.GetCount() && text_step[lim + 1] - dp2 < dp2 - text_step[lim])
+					lim++;
+			}
+			for(; ix < lim; ix++) {
+				double value = text_step[ix] + rep_index * text_repeat;
+				int cli = ToClient(value);
+				String text;
+				if(ix < text_value.GetCount())
+					text = text_value[ix];
+				else if(text_convert)
+					text = StdFormat(text_convert -> Format(value));
+				else
+					text = StdFormat(value);
+				Size tsize = GetTextSize(text, font);
+				int half = tsize.cx >> 1;
+				if(is_vert) {
+					draw.DrawRect(0, cli, ppos, 1, Gray());
+//					draw.DrawRect(ppos - VGAP, cli - half - HGAP, tsize.cy + 2 * VGAP, tsize.cx + 2 * HGAP, background);
+					draw.DrawText(ppos, cli + half, 900, text, font, Gray());
+				}
+				else {
+					draw.DrawRect(cli, 0, 1, ppos, Gray());
+//					draw.DrawRect(cli - half - HGAP, ppos - VGAP, tsize.cx + 2 * HGAP, tsize.cy + 2 * VGAP, background);
+					draw.DrawText(cli - half, ppos, text, font, Gray());
+				}
+			}
+		}
+	}
+
+	Font labelfont = font().Bold();
+	double cl = IsNull(cursor) ? double(Null) : ToClientf(cursor);
+	Size lsize = GetTextSize(label_text, labelfont);
+	if(is_vert) {
+		int tx = (IsBottomRight() ? client.cx - cy : 0);
+//		draw.DrawRect(tx - VXGAP, cli2 - lsize.cx - TGAP - HXGAP, lsize.cy + 2 * VXGAP, lsize.cx + 2 * HXGAP, background);
+		draw.DrawText(tx, cli2 - TGAP, 900, label_text, labelfont, Black());
+		if(cl >= -ARROW_RAD && cl <= client.cy + ARROW_RAD) {
+			int icl = fround(cl);
+			Image icon = is_right ? CtrlImg::smallleft() : CtrlImg::smallright();
+			draw.DrawImage(is_right ? 1 : client.cx - icon.GetWidth() - 1, icl - ARROW_RAD, icon);
+		}
+	}
+	else {
+		int tx = (IsBottomRight() ? client.cy - cy : 0);
+//		draw.DrawRect(cli1 + TGAP - HXGAP, tx - VXGAP, lsize.cx + 2 * HXGAP, lsize.cy + 2 * VXGAP, background);
+		draw.DrawText(cli1 + TGAP, tx, label_text, labelfont, Black());
+		if(cl >= -ARROW_RAD && cl <= client.cx + ARROW_RAD) {
+			int icl = fround(cl);
+			Image icon = is_right ? CtrlImg::smallup() : CtrlImg::smalldown();
+			draw.DrawImage(icl - ARROW_RAD, is_right ? 1 : client.cy - icon.GetHeight() - 1, icon);
+		}
+	}
+
+	draw.End();
+}
+
+void RulerCtrl::LeftDown(Point pt, dword keyflags)
+{
+	double d = FromClient(is_vert ? pt.y : pt.x);
+	if(autoselect)
+		SetCursor(d);
+	WhenSelect(d);
+	if(autoselect) {
+		WhenAction();
+		SetCapture();
+	}
+	WhenLeftClick();
+}
+
+void RulerCtrl::LeftUp(Point pt, dword keyflags)
+{
+	ReleaseCapture();
+}
+
+void RulerCtrl::MouseMove(Point pt, dword keyflags)
+{
+	if(keyflags & K_MOUSELEFT) {
+		double d = FromClient(is_vert ? pt.y : pt.x);
+		if(autoselect)
+			SetCursor(d);
+		WhenSelect(d);
+		if(autoselect)
+			WhenAction();
+	}
+}
+
+void RulerCtrl::RightDown(Point pt, dword keyflags)
+{
+	MenuBar::Execute(WhenBar);
+}
+
+int RulerCtrl::GetStdWidth()
+{
+	return 22;
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/TCtrlLib/Ruler.h b/uppsrc/TCtrlLib/Ruler.h
new file mode 100644
index 000000000..a67130f64
--- /dev/null
+++ b/uppsrc/TCtrlLib/Ruler.h
@@ -0,0 +1,115 @@
+NAMESPACE_UPP
+
+class RulerCtrl : public FrameCtrl<Ctrl>
+{
+public:
+	RulerCtrl();
+	virtual ~RulerCtrl();
+
+	void            Horz(bool bottom = false)         { is_vert = false; is_right = bottom; Refresh(); }
+	void            Vert(bool right = false)          { is_vert = true; is_right = right; Refresh(); }
+	bool            IsVert() const                    { return is_vert; }
+	bool            IsBottomRight() const             { return is_right; }
+	int             GetLength() const                 { return is_vert ? GetSize().cy : GetSize().cx; }
+
+	void            SetWidth(int w)                   { width = w; RefreshParentLayout(); }
+	int             GetWidth() const                  { return width; }
+
+	void            SetZoom(double scale, double delta);
+
+	void            SetScale(double scale)            { SetZoom(scale, GetDelta()); }
+	double          GetScale() const                  { return scale; }
+
+	void            SetDelta(double delta)            { SetZoom(GetScale(), delta); }
+	double          GetDelta() const                  { return delta; }
+
+	void            MinMax(double min, double max);
+	double          GetMin() const                    { return min_range; }
+	double          GetMax() const                    { return max_range; }
+
+	void            SetCursor(double pos);
+	void            KillCursor()                      { SetCursor(Null); }
+	double          GetCursor() const                 { return cursor; }
+
+	void            AutoSelect()                      { autoselect = true; }
+	void            NoAutoSelect()                    { autoselect = false; }
+
+	void            PickSmallStep(pick_ Vector<double>& pos, double repeat = Null);
+	void            SetSmallStep(double delta);
+
+	void            PickTextStep(pick_ Vector<double>& pos, pick_ Vector<String>& texts, double repeat, const Convert& convert = NoConvert());
+	void            SetTextStep(double repeat, const Convert& convert = NoConvert());
+
+	void            SetFont(Font f)                   { font = f; Refresh(); }
+	Font            GetFont() const                   { return font; }
+
+	void            SetBackground(Color bg)           { background = bg; Refresh(); }
+	Color           GetBackground() const             { return background; }
+
+	void            SetOuterColor(Color bg)           { outer_color = bg; Refresh(); }
+	Color           GetOuterColor() const             { return outer_color; }
+
+	double          FromClient(double client) const   { return (client - GetRawDelta()) / scale; }
+	double          ToClientf(double pos) const       { return pos * scale + GetRawDelta(); }
+	int             ToClient(double pos) const        { return fround(ToClientf(pos)); }
+
+	double          Snap(double v) const;
+
+	virtual void    Layout();
+	virtual void    FrameLayout(Rect& rc);
+	virtual void    FrameAddSize(Size& sz);
+	virtual void    Paint(Draw& draw);
+
+	void            SetLabel(const char *s)           { label_text = s; Refresh(); }
+
+	virtual void    LeftDown(Point pt, dword keyflags);
+	virtual void    LeftUp(Point pt, dword keyflags);
+	virtual void    RightDown(Point pt, dword keyflags);
+	virtual void    MouseMove(Point pt, dword keyflags);
+
+	static int      GetStdWidth();
+	void            RefreshCursor(double cursor);
+
+	virtual void    SetData(const Value& v);
+	virtual Value   GetData() const;
+
+public:
+	Callback1<Bar&> WhenBar;
+	Callback1<double> WhenSelect;
+	Callback        WhenLeftClick;
+
+private:
+	double          GetRawDelta() const;
+
+private:
+	int             width;
+	double          scale, delta;
+	mutable double  raw_delta;
+	double          min_range, max_range;
+	Vector<double>  small_step;
+	double          small_repeat;
+	Vector<double>  text_step;
+	Vector<String>  text_value;
+	const Convert  *text_convert;
+	double          text_repeat;
+	double          cursor;
+	Font            font;
+	bool            is_vert;
+	bool            is_right;
+	bool            autoselect;
+	String          label_text;
+	Color           background;
+	Color           outer_color;
+
+	enum
+	{
+		ARROW_DIAM  = 7,
+		ARROW_RAD   = (ARROW_DIAM + 1) >> 1,
+		ARROW_WIDTH = 5,
+	};
+};
+
+class HRulerCtrl : public RulerCtrl { public: HRulerCtrl() { Horz(); } };
+class VRulerCtrl : public RulerCtrl { public: VRulerCtrl() { Vert(); } };
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/TCtrlLib/TCtrlImg.cpp b/uppsrc/TCtrlLib/TCtrlImg.cpp
new file mode 100644
index 000000000..05985e51d
--- /dev/null
+++ b/uppsrc/TCtrlLib/TCtrlImg.cpp
@@ -0,0 +1,11 @@
+#include "TCtrlLib.h"
+#ifdef COMPILER_MSC
+#pragma hdrstop
+#endif//COMPILER_MSC
+#include "TCtrlImg.h"
+
+NAMESPACE_UPP
+#define IMAGECLASS TCtrlImg
+#define IMAGEFILE <TCtrlLib/tctrllib.iml>
+#include <Draw/iml_source.h>
+END_UPP_NAMESPACE
diff --git a/uppsrc/TCtrlLib/TCtrlImg.h b/uppsrc/TCtrlLib/TCtrlImg.h
new file mode 100644
index 000000000..0e70cd7c7
--- /dev/null
+++ b/uppsrc/TCtrlLib/TCtrlImg.h
@@ -0,0 +1,12 @@
+#ifndef __TCtrlLib_TCtrlImg__
+#define __TCtrlLib_TCtrlImg__
+
+NAMESPACE_UPP
+
+#define IMAGECLASS TCtrlImg
+#define IMAGEFILE <TCtrlLib/tctrllib.iml>
+#include <Draw/iml_header.h>
+
+END_UPP_NAMESPACE
+
+#endif//__TCtrlLib_TCtrlImg__
diff --git a/uppsrc/TCtrlLib/TCtrlLib.h b/uppsrc/TCtrlLib/TCtrlLib.h
new file mode 100644
index 000000000..76684e930
--- /dev/null
+++ b/uppsrc/TCtrlLib/TCtrlLib.h
@@ -0,0 +1,14 @@
+#ifndef __TCtrlLib__
+#define __TCtrlLib__
+
+#include <CtrlLib/CtrlLib.h>
+#include <DocTypes/DocTypes.h>
+#include <TDraw/TDraw.h>
+#include <TCore/TCore.h>
+#include "util.h"
+#include "template.h"
+//#include "OldTreeCtrl.h"
+#include "Ruler.h"
+#include "DocMgr.h"
+
+#endif//__TCtrlLib__
diff --git a/uppsrc/TCtrlLib/TCtrlLib.t b/uppsrc/TCtrlLib/TCtrlLib.t
new file mode 100644
index 000000000..4948c9873
--- /dev/null
+++ b/uppsrc/TCtrlLib/TCtrlLib.t
@@ -0,0 +1,400 @@
+#ifdef _MSC_VER
+#pragma setlocale("C")
+#endif
+// OldTreeCtrl.cpp
+
+T_("Close")
+csCZ("Zavřít")
+
+T_("Open")
+csCZ("Otevřít")
+
+T_("Close child items")
+csCZ("Schovat podřízené položky")
+
+T_("Open child items")
+csCZ("Rozbalit podřízené položky")
+
+T_("Open all")
+csCZ("Otevřít všechno")
+
+T_("Open the whole subtree")
+csCZ("Rozbalit celý podstrom položky")
+
+T_("Close all")
+csCZ("Zavřít všechno")
+
+T_("Close the whole subtree")
+csCZ("Zavřít a schovat všechny podřízené položky")
+
+
+// DocMgr.cpp
+
+T_("Open windows")
+csCZ("Seznam oken")
+
+T_("Window name")
+csCZ("Název okna")
+
+T_("Document [* \001%s\001] has an unknown type.")
+csCZ("Dokument [* \001%s\001] má neznámý typ.")
+
+T_("Error opening document [* \001%s\001].")
+csCZ("Nelze otevřít dokument [* \001%s\001].")
+
+T_("New")
+csCZ("Nový")
+
+T_("Create a new document")
+csCZ("Založit nový dokument")
+
+T_("Open an existing document")
+csCZ("Otevřít dokument na disku")
+
+T_("Open file")
+csCZ("Otevřít soubor")
+
+T_("Save al&l")
+csCZ("Uložit vš&echno")
+
+T_("Save all open documents to the disk")
+csCZ("Uložit všechny dokumenty na disk")
+
+T_("Open file '%s'")
+csCZ("Otevřít soubor '%s'")
+
+T_("Quit")
+csCZ("Konec programu")
+
+T_("Quit application")
+csCZ("Ukončit práci s_aplikací")
+
+T_("Activate document '%s'?")
+csCZ("Aktivovat dokument '%s'?")
+
+T_("Windows...")
+csCZ("Okna...")
+
+T_("Show open documents")
+csCZ("Zobrazit seznam dokumentů")
+
+T_("Contents")
+csCZ("Obsah")
+
+T_("Display alphabetic help contents")
+csCZ("Zobrazit hlavní obsah nápovědy")
+
+T_("Search")
+csCZ("Rejstřík")
+
+T_("Display help index for keyword searching")
+csCZ("Zobrazit rejstřík pro vyhledávání klíčových slov v nápovědě")
+
+T_("User manual")
+csCZ("Příručka")
+
+T_("Typeset complete user documentation")
+csCZ("Vysázet uživatelskou příručku pro tisk")
+
+T_("This is the only open window.")
+csCZ("Toto je jediné otevřené okno.")
+
+T_("Close all documents")
+csCZ("Konec aplikace")
+
+T_("Document")
+csCZ("Dokument")
+
+T_("Save")
+csCZ("Uložit")
+
+T_("new")
+csCZ("novy")
+
+T_("Supported types")
+csCZ("Různé typy")
+
+T_("New...")
+csCZ("Nový...")
+
+T_("Document type")
+csCZ("Typ dokumentu")
+
+T_("Error saving document. Check free disk space.")
+csCZ("Dokument nelze uložit. Zkontrolujte, zda je na disku dost volného místa.")
+
+T_("Save as")
+csCZ("Uložit jako")
+
+T_("Error closing document [* \001%s\001].")
+csCZ("Dokument [* \001%s\001] není možno zavřít.")
+
+T_("%s [* \001%s\001] has been edited. Save changes to the disk?")
+csCZ("%s [* \001%s\001] byl změněn. Chcete uložit změny na disk?")
+
+T_("Save document to the disk\f; you should close all dialog windows first")
+csCZ("Uložit soubor na disk\f; nejprve je třeba zavřít všechna dialogová "
+     "okna")
+
+T_("Save &as")
+csCZ("Uložit j&ako")
+
+T_("Save document to another disc file\f; you should close all dialog windows "
+     "first")
+csCZ("Uložit soubor na disk pod jiným jménem\f; nejprve je třeba zavřít "
+     "všechna dialogová okna")
+
+T_("Close active document\f; you should close all dialog windows first")
+csCZ("Ukončit práci s dokumentem\f; nejprve je třeba zavřít všechna dialogová "
+     "okna")
+
+T_("Toolbar")
+csCZ("Nástrojová lišta")
+
+T_("Show / hide window toolbar")
+csCZ("Zobrazit / schovat nástrojovou lištu")
+
+T_("Info bar")
+csCZ("Informační lišta")
+
+T_("Show / hide window information bar")
+csCZ("Zobrazit / schovat informační lištu")
+
+T_("Window")
+csCZ("Okno")
+
+T_("File")
+csCZ("Soubor")
+
+T_("Help")
+csCZ("Nápověda")
+
+
+// DocMgr.lay
+
+T_("&Activate")
+csCZ("Aktivovat")
+
+T_("&Close window")
+csCZ("&Zavřít okno")
+
+T_("Close &list")
+csCZ("Zavřít &seznam")
+
+T_("Some files have been changed since last save.\nSelect files you want to "
+     "save to the disk.")
+csCZ("Některé soubory byly změněny od posledního uložení.\nVyberte soubory, "
+     "které chcete uložit na disk.")
+
+T_("OK")
+csCZ("OK")
+
+T_("&Don't save")
+csCZ("&Neukládat")
+
+T_("Cancel")
+csCZ("Storno")
+
+
+// helpgen.cpp
+
+T_("Preparing object list")
+csCZ("Sestavuji seznam objektů")
+
+T_("Graphic object types used by documentation")
+csCZ("Seznam použitých grafických objektů")
+
+T_("Building style list")
+csCZ("Sestavuji seznam stylů")
+
+T_("[A [a100 %d used styles:&\n]")
+csCZ("[A [a100 %d použité styly:&\n]")
+
+T_("[* \001%s\001] - [/ %d occurrences]&\n")
+csCZ("[* \001%s\001] - [/ %d výskytů]&\n")
+
+T_("[3*_b200a100 \001%s\001]&\n")
+csCZ("[3*_b200a100 \001%s\001]&\n")
+
+T_("[o \001%s\001: [/ %d x]&\n")
+csCZ("[o \001%s\001: [/ %d x]&\n")
+
+T_("Used styles")
+csCZ("Seznam použitých textových stylů")
+
+T_("Index")
+csCZ("Rejstřík")
+
+
+// DlgFormula.lay
+
+T_("&Font:")
+csCZ("&Písmo:")
+
+T_("&Color:")
+csCZ("&Barva:")
+
+T_("&Size:")
+csCZ("&Velikost:")
+
+T_("&Symbols")
+csCZ("&Symboly")
+
+T_("&Brackets")
+csCZ("&Závorky")
+
+T_("&Operations")
+csCZ("&Operace")
+
+
+// DlgShot.lay
+
+T_("Object type:")
+csCZ("Typ objektu:")
+
+T_("Rect - W:")
+csCZ("Rect - W:")
+
+T_("H:")
+csCZ("&H:")
+
+T_("L:")
+csCZ("L:")
+
+T_("T:")
+csCZ("T:")
+
+T_("R:")
+csCZ("&R:")
+
+T_("B:")
+csCZ("&B:")
+
+T_("TopWindow-relative:")
+csCZ("Vzhledem k TopWindow:")
+
+T_("Screen-relative:")
+csCZ("Vzhledem k displeji:")
+
+T_("Frame width:")
+csCZ("Šířka okraje:")
+
+T_("LogPos - X:")
+csCZ("LogPos - X:")
+
+T_("LogPos - Y:")
+csCZ("LogPos - Y:")
+
+T_("View width:")
+csCZ("Šířka view:")
+
+T_("View height:")
+csCZ("Výška view:")
+
+T_("Enabled")
+csCZ("Enabled")
+
+T_("Visible")
+csCZ("Visible")
+
+T_("Shown")
+csCZ("Shown")
+
+T_("Has focus")
+csCZ("Has focus")
+
+T_("Has focus deep")
+csCZ("Has focus deep")
+
+T_("Transparent")
+csCZ("Transparent")
+
+T_("Backpaint:")
+csCZ("Backpaint:")
+
+T_("InFrame")
+csCZ("InFrame")
+
+T_("Editable")
+csCZ("Editable")
+
+T_("IsModified")
+csCZ("IsModified")
+
+T_("IsModifySet")
+csCZ("IsModifySet")
+
+T_("Label:")
+csCZ("Popisky:")
+
+T_("Value:")
+csCZ("Hodnota:")
+
+
+// DlgHelpView.cpp
+
+T_("Help system")
+csCZ("Nápověda")
+
+T_("All topics")
+csCZ("Seznam témat")
+
+T_("Help topic selection")
+csCZ("Výběr tématu nápovědy")
+
+T_("Invalid help topic [* \001%s\001].")
+csCZ("Neplatné téma nápovědy [* \001%s\001].")
+
+T_("Help viewer")
+csCZ("Nápověda")
+
+T_("Help topic [* \001%s\001] not found.")
+csCZ("Téma nápovědy [* \001%s\001] nebylo nalezeno.")
+
+T_(" - help viewer")
+csCZ(" - nápověda")
+
+T_("Previous")
+csCZ("Předchozí")
+
+T_("Return to previous help topic")
+csCZ("Návrat na předchozí téma nápovědy")
+
+T_("Next")
+csCZ("Další")
+
+T_("Move forward in order of viewing help topics")
+csCZ("Posuv na další téma nápovědy v pořadí prohlížení")
+
+T_("Search index")
+csCZ("Rejstřík")
+
+T_("Show / select theme from the alphabetic index")
+csCZ("Zobrazit / vyhledat téma podle rejstříkového odkazu")
+
+T_("Print")
+csCZ("Tisk")
+
+T_("Print current topic on the printer")
+csCZ("Tisk tématu nápovědy na tiskárnu")
+
+T_("Application languages")
+csCZ("Jazyky aplikace")
+
+T_("Language code")
+csCZ("Kód jazyka")
+
+T_("Language file")
+csCZ("Jazykový soubor")
+
+T_("Language files (*.lng)")
+csCZ("Jazykové soubory (*.lng)")
+
+T_("*.lng")
+csCZ("*.lng")
+
+
+// DlgHelpView.lay
+
+T_("&App language:")
+csCZ("&Jazyk aplikace:")
diff --git a/uppsrc/TCtrlLib/TCtrlLib.upp b/uppsrc/TCtrlLib/TCtrlLib.upp
new file mode 100644
index 000000000..9150f200d
--- /dev/null
+++ b/uppsrc/TCtrlLib/TCtrlLib.upp
@@ -0,0 +1,61 @@
+description "Experimental (sometimes obsolete) GUI code";
+
+charset "windows-1250";
+
+uses
+	TDraw,
+	CtrlLib,
+	RichEdit,
+	plugin\gif,
+	PdfDraw,
+	DocTypes;
+
+library(WIN32) shell32;
+
+file
+	TCtrlLib.h,
+	TCtrlLib.t charset "UTF-8",
+	TCtrlLib_init.icpp,
+	Miscellaneous readonly separator,
+	tctrllib.iml,
+	TCtrlImg.h,
+	TCtrlImg.cpp,
+	util.h,
+	util.cpp,
+	template.h,
+	TCtrlLib.usc font 2,
+	TreeCtrl readonly separator,
+	OldTreeCtrl.h,
+	OldTreeCtrl.cpp,
+	OldTreeCtrl.iml,
+	CtrlArray readonly separator,
+	CtrlArray.h,
+	CtrlArray.cpp,
+	Ruler readonly separator,
+	Ruler.h,
+	Ruler.cpp,
+	DocMgr readonly separator,
+	DocMgr.h,
+	DocMgr.cpp,
+	DocMgr.lay,
+	"Help support" readonly separator,
+	Help\notes.txt,
+	Help\TCtrlLibHelp.h,
+	Help\helputil.h,
+	Help\helputil.cpp,
+	Help\helpgen.cpp,
+	DlgFormula readonly separator,
+	Help\richform.cpp,
+	Help\DlgFormula.cpp,
+	Help\DlgFormula.lay,
+	DlgShot readonly separator,
+	Help\DlgShot.cpp,
+	Help\DlgShot.lay,
+	DlgHelpView readonly separator,
+	Help\DlgHelpView.cpp,
+	Help\DlgHelpView.lay,
+	Help\DlgHelpView.iml,
+	Info readonly separator,
+	COPYING,
+	COPYING-PLAIN,
+	AUTHORS;
diff --git a/uppsrc/TCtrlLib/TCtrlLib.usc b/uppsrc/TCtrlLib/TCtrlLib.usc
new file mode 100644
index 000000000..3764aa493
--- /dev/null
+++ b/uppsrc/TCtrlLib/TCtrlLib.usc
@@ -0,0 +1,28 @@
+ctrl ArrayPair {
+	> ArrayCtrl;
+	bool Vert = false;
+	group "Complex";
+
+	Paint(w) {
+		r = GetRect();
+		mx = (r.left + r.right) / 2;
+		my = (r.top + r.bottom) / 2;
+		HGAP = 4;
+		VGAP = 4;
+		BGAP = 2 * VGAP;
+		BUTTON = 24;
+		if(.Vert) {
+			PaintArray(w, Rect(r.left, r.top, r.right, my - (BUTTON >> 1) - VGAP));
+			PaintArray(w, Rect(r.left, my + (BUTTON >> 1) + VGAP, r.right, r.bottom));
+		}
+		else {
+			PaintArray(w, Rect(r.left, r.top, mx - (BUTTON >> 1) - HGAP, r.bottom));
+			PaintArray(w, Rect(mx + (BUTTON >> 1) + HGAP, r.top, r.right, r.bottom));
+		}
+	}
+}
+
+ctrl ValueArrayCtrl {
+	> ArrayCtrl;
+	group "Complex";
+}
diff --git a/uppsrc/TCtrlLib/TCtrlLib_init.icpp b/uppsrc/TCtrlLib/TCtrlLib_init.icpp
new file mode 100644
index 000000000..7b6a55b75
--- /dev/null
+++ b/uppsrc/TCtrlLib/TCtrlLib_init.icpp
@@ -0,0 +1,8 @@
+#include "TCtrlLib.h"
+
+NAMESPACE_UPP
+
+#define TFILE <TCtrlLib/TCtrlLib.t>
+#include <Core/t.h>
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/TCtrlLib/TreeCtrlImg.h b/uppsrc/TCtrlLib/TreeCtrlImg.h
new file mode 100644
index 000000000..ec57551b7
--- /dev/null
+++ b/uppsrc/TCtrlLib/TreeCtrlImg.h
@@ -0,0 +1,8 @@
+#ifndef __CTRL_TREEIMG__
+#define __CTRL_TREEIMG__
+
+#define IMAGECLASS TreeCtrlImg
+#define IMAGEFILE  <TCtrlLib/OldTreeCtrl.iml>
+#include <Draw/iml_header.h>
+
+#endif//__CTRL_TREEIMG__
diff --git a/uppsrc/TCtrlLib/appdoc.tpp/CalcGuiType$cs-cz.tpp b/uppsrc/TCtrlLib/appdoc.tpp/CalcGuiType$cs-cz.tpp
new file mode 100644
index 000000000..0273e6344
--- /dev/null
+++ b/uppsrc/TCtrlLib/appdoc.tpp/CalcGuiType$cs-cz.tpp
@@ -0,0 +1,79 @@
+TITLE("Geometrické operace")
+REF("Calc$CbottomR")
+REF("Calc$CbottomcenterR")
+REF("Calc$CbottomleftR")
+REF("Calc$CbottomrightR")
+REF("Calc$CcenterR")
+REF("Calc$CcenterleftR")
+REF("Calc$CcenterrightR")
+REF("Calc$CheightR")
+REF("Calc$CleftR")
+REF("Calc$CpointNN")
+REF("Calc$CrectNNNN")
+REF("Calc$CrectP")
+REF("Calc$CrectPP")
+REF("Calc$CrightR")
+REF("Calc$CtextP")
+REF("Calc$CtextR")
+REF("Calc$CtopR")
+REF("Calc$CtopcenterR")
+REF("Calc$CtopleftR")
+REF("Calc$CtoprightR")
+REF("Calc$CwidthR")
+REF("Calc$CxP")
+REF("Calc$CxcenterR")
+REF("Calc$CxmaxR")
+REF("Calc$CxminR")
+REF("Calc$CyP")
+REF("Calc$CycenterR")
+REF("Calc$CymaxR")
+REF("Calc$CyminR")
+TOPIC_TEXT(
+"[2 $$0,0#00000000000000000000000000000000:Default][b100;a50;K* $$1,0#23046025415494101427921008701515:Paragraph][i167;b50;a25;kKN1;~~~>.3917;* "
+"$$2,0#52185223490867151055420261384346:Toc1`.Heading1][i333;kN11;~~~>.3917;* $$3,0#36545033421193513457240054113541:Toc2`.Heading2][i500;kN111;~~~>.3917; "
+"$$4,0#65092512416424580164828413186219:Toc3`.Heading3][i167;b50;a25;kKNA;~~~>.3917;* "
+"$$5,5#92291332474308709450111162202673:AppToc1`.AppHeading1][i333;kNA1;~~~>.3917;* "
+"$$6,15#61887903412252554674480251236992:AppToc2`.AppHeading2][i500;kNA11;~~~>.3917; "
+"$$7,7#03533551421653050355120437860335:AppToc3`.AppHeading3][i500;b100;a100;KN1;*4 "
+"$$8,0#94145093439740438411010082165944:Heading1][i500;b100;a50;kKN11;*+117 $$9,0#10901425421210535753260366156531:Heading2][i500;b100;a25;kKN111;* "
+"$$10,0#53209141402041366431858192225431:Heading3][i500;b100;a100;KNA;*4 $$11,8#32912651424211307887950041245434:AppHeading1][i500;b100;a50;kKNA1;*+117 "
+"$$12,8#51232055453458524230328032001901:AppHeading2][i500;b100;a25;kKNA11;* $$13,8#34108020439428305453439845463579:AppHeading3][b100;a50;k*4 "
+"$$14,0#49239115434362547028389207250014:Heading][b50;a25;k~~~>.3917;* $$15,15#40743698422276745552070108434023:Toc`.Heading][b100;a50;K~~~>.3917;*+117 "
+"$$16,16#15422850471211852294098111138263:Topics1][l167;b50;a50;K~~~>.3917;* $$17,17#35241722455500657380289596243808:Topics2][l333;~~~>.3917; "
+"$$18,18#31041344429742018840308064013200:Topics3][b83;a42;K* $$19,0#46440151113795363000000595230845:Paragraph][{_}%EN-US "
+"[s14;:Calc`$CbottomR: bottom (obdélník) [S ®] reálné číslo&][s0; Horní mez "
+"y souřadnice obdélníku.&][s14;:Calc`$CbottomcenterR: bottomcenter (obdélník) "
+"[S ®] bod&][s0; Střed dolní strany obdélníku.&][s14;:Calc`$CbottomleftR: bottomleft "
+"(obdélník) [S ®] bod&][s0; Levý dolní roh obdélníku.&][s14;:Calc`$CbottomrightR: "
+"bottomright (obdélník) [S ®] bod&][s0; Pravý dolní roh obdélníku.&][s14;:Calc`$CcenterR: "
+"center (obdélník) [S ®] bod&][s0; Střed obdélníku.&][s14;:Calc`$Ccent")
+TOPIC_TEXT(
+"erleftR: centerleft (obdélník) [S ®] bod&][s0; Střed levé strany obdélníku.&][s14;:Calc`$CcenterrightR: "
+"centerright (obdélník) [S ®] bod&][s0; Střed pravé strany obdélníku.&][s14;:Calc`$CheightR: "
+"height (obdélník) [S ®] reálné číslo&][s0; Výška obdélníku (ymax `- ymin).&][s14;:Calc`$CleftR: "
+"left (obdélník) [S ®] reálné číslo&][s0; Dolní mez x souřadnice obdélníku.&][s14;:Calc`$CpointNN: "
+"point (reálné číslo [/ x], reálné číslo [/ y]) [S ®] bod&][s0; Funkce vrátí "
+"bod o zadaných souřadnicích.&][s14;:Calc`$CrectNNNN: rect (reálné číslo [/ "
+"xmin], reálné číslo [/ ymin], reálné číslo [/ xmax], reálné číslo [/ "
+"ymax]) [S ®] obdélník&][s0; Vrátí obdélník se zadanými souřadnicemi.&][s14;:Calc`$CrectP: "
+"rect (bod [/ P]) [S ®] obdélník&][s0; Vrátí obdélník obsahující zadaný "
+"bod.&][s14;:Calc`$CrectPP: rect (bod [/ P], bod [/ Q]) [S ®] obdélník&][s0; Vrátí "
+"omezující obdélník dvojice bodů.&][s14;:Calc`$CrightR: right (obdélník) [S "
+"®] reálné číslo&][s0; Horní mez x souřadnice obdélníku.&][s14;:Calc`$CtextP: "
+"text (bod) [S ®] řetězec&][s0; Vrátí textový řetězec se souřadnicemi bodu.&][s14;:Calc`$CtextR: "
+"text (obdélník) [S ®] řetězec&][s0; Vrátí textový řetězec s mezemi obdélníku.&][s14;:Calc`$CtopR: "
+"top (obdélník) [S ®] reálné číslo&][s0; Dolní mez y souřadnice obdélníku.&][s14;:Calc`$CtopcenterR: "
+"topcenter (obdélník) [S ®] bod&][s0; Střed horní strany obdélníku.&][s14;:Calc`$CtopleftR: "
+"topleft (obdélník) [S ®] bod&][s0; Levý horní roh obdélníku.&][s14;:Calc`$CtoprightR: "
+"topright (obdélník) [S ®] bod&][s0; Pravý horní roh obdélníku.&][s14;:Calc`$CwidthR: "
+"width (obdélník) [S ®] reálné číslo&][s0; Šířka obdélníku (xmax `- xmin).&][s14;:Calc`$CxP: "
+"x (bod [/ p]) [S ®] reálné číslo&][s0; x`-souřadnice bodu [/ p].&][s14;:Calc`$CxcenterR: "
+"xcenter (obdélník) [S ®] reálné číslo&][s0; X`-souřadnice středu obdéln")
+TOPIC_TEXT(
+"íku.&][s14;:Calc`$CxmaxR: xmax (obdélník) [S ®] reálné číslo&][s0; Horní "
+"mez x souřadnice obdélníku.&][s14;:Calc`$CxminR: xmin (obdélník) [S ®] reálné "
+"číslo&][s0; Dolní mez x souřadnice obdélníku.&][s14;:Calc`$CyP: y (bod [/ p]) "
+"[S ®] reálné číslo&][s0; y`-souřadnice bodu [/ p].&][s14;:Calc`$CycenterR: "
+"ycenter (obdélník) [S ®] reálné číslo&][s0; Y`-souřadnice středu obdélníku.&][s14;:Calc`$CymaxR: "
+"ymax (obdélník) [S ®] reálné číslo&][s0; Horní mez y souřadnice obdélníku.&][s14;:Calc`$CyminR: "
+"ymin (obdélník) [S ®] reálné číslo&][s0; Dolní mez y souřadnice obdélníku.]")
diff --git a/uppsrc/TCtrlLib/appdoc.tpp/CalcGuiType$en-us.tpp b/uppsrc/TCtrlLib/appdoc.tpp/CalcGuiType$en-us.tpp
new file mode 100644
index 000000000..e36cd24c2
--- /dev/null
+++ b/uppsrc/TCtrlLib/appdoc.tpp/CalcGuiType$en-us.tpp
@@ -0,0 +1,79 @@
+TITLE("bottom (obdélník) ® real number")
+REF("Calc$CbottomR")
+REF("Calc$CbottomcenterR")
+REF("Calc$CbottomleftR")
+REF("Calc$CbottomrightR")
+REF("Calc$CcenterR")
+REF("Calc$CcenterleftR")
+REF("Calc$CcenterrightR")
+REF("Calc$CheightR")
+REF("Calc$CleftR")
+REF("Calc$CpointNN")
+REF("Calc$CrectNNNN")
+REF("Calc$CrectP")
+REF("Calc$CrectPP")
+REF("Calc$CrightR")
+REF("Calc$CtextP")
+REF("Calc$CtextR")
+REF("Calc$CtopR")
+REF("Calc$CtopcenterR")
+REF("Calc$CtopleftR")
+REF("Calc$CtoprightR")
+REF("Calc$CwidthR")
+REF("Calc$CxP")
+REF("Calc$CxcenterR")
+REF("Calc$CxmaxR")
+REF("Calc$CxminR")
+REF("Calc$CyP")
+REF("Calc$CycenterR")
+REF("Calc$CymaxR")
+REF("Calc$CyminR")
+TOPIC_TEXT(
+"[2 $$0,0#00000000000000000000000000000000:Default][b100;a50;K* $$1,0#23046025415494101427921008701515:Paragraph][i167;b50;a25;kKN1;~~~>.3917;* "
+"$$2,0#52185223490867151055420261384346:Toc1`.Heading1][i333;kN11;~~~>.3917;* $$3,0#36545033421193513457240054113541:Toc2`.Heading2][i500;kN111;~~~>.3917; "
+"$$4,0#65092512416424580164828413186219:Toc3`.Heading3][i167;b50;a25;kKNA;~~~>.3917;* "
+"$$5,5#92291332474308709450111162202673:AppToc1`.AppHeading1][i333;kNA1;~~~>.3917;* "
+"$$6,15#61887903412252554674480251236992:AppToc2`.AppHeading2][i500;kNA11;~~~>.3917; "
+"$$7,7#03533551421653050355120437860335:AppToc3`.AppHeading3][i500;b100;a100;KN1;*4 "
+"$$8,0#94145093439740438411010082165944:Heading1][i500;b100;a50;kKN11;*+117 $$9,0#10901425421210535753260366156531:Heading2][i500;b100;a25;kKN111;* "
+"$$10,0#53209141402041366431858192225431:Heading3][i500;b100;a100;KNA;*4 $$11,8#32912651424211307887950041245434:AppHeading1][i500;b100;a50;kKNA1;*+117 "
+"$$12,8#51232055453458524230328032001901:AppHeading2][i500;b100;a25;kKNA11;* $$13,8#34108020439428305453439845463579:AppHeading3][b100;a50;k*4 "
+"$$14,0#49239115434362547028389207250014:Heading][b50;a25;k~~~>.3917;* $$15,15#40743698422276745552070108434023:Toc`.Heading][b100;a50;K~~~>.3917;*+117 "
+"$$16,16#15422850471211852294098111138263:Topics1][l167;b50;a50;K~~~>.3917;* $$17,17#35241722455500657380289596243808:Topics2][l333;~~~>.3917; "
+"$$18,18#31041344429742018840308064013200:Topics3][b83;a42;K* $$19,0#46440151113795363000000595230845:Paragraph][{_}%EN-US "
+"[s14;:Calc`$CbottomR: bottom (obdélník) [S ®] real number&][s0; Horní mez y souřadnice "
+"obdélníku.&][s14;:Calc`$CbottomcenterR: bottomcenter (obdélník) [S ®] bod&][s0; "
+"Střed dolní strany obdélníku.&][s14;:Calc`$CbottomleftR: bottomleft (obdélník) "
+"[S ®] bod&][s0; Levý dolní roh obdélníku.&][s14;:Calc`$CbottomrightR: bottomright "
+"(obdélník) [S ®] bod&][s0; Pravý dolní roh obdélníku.&][s14;:Calc`$CcenterR: "
+"center (obdélník) [S ®] bod&][s0; Střed obdélníku.&][s14;:Calc`$Ccenterlef")
+TOPIC_TEXT(
+"tR: centerleft (obdélník) [S ®] bod&][s0; Střed levé strany obdélníku.&][s14;:Calc`$CcenterrightR: "
+"centerright (obdélník) [S ®] bod&][s0; Střed pravé strany obdélníku.&][s14;:Calc`$CheightR: "
+"height (obdélník) [S ®] real number&][s0; Výška obdélníku (ymax `- ymin).&][s14;:Calc`$CleftR: "
+"left (obdélník) [S ®] real number&][s0; Dolní mez x souřadnice obdélníku.&][s14;:Calc`$CpointNN: "
+"point (real number [/ x], real number [/ y]) [S ®] bod&][s0; Funkce vrátí bod "
+"o zadaných souřadnicích.&][s14;:Calc`$CrectNNNN: rect (real number [/ xmin], real "
+"number [/ ymin], real number [/ xmax], real number [/ ymax]) [S ®] obdélník&][s0; "
+"Vrátí obdélník se zadanými souřadnicemi.&][s14;:Calc`$CrectP: rect (bod [/ "
+"P]) [S ®] obdélník&][s0; Vrátí obdélník obsahující zadaný bod.&][s14;:Calc`$CrectPP: "
+"rect (bod [/ P], bod [/ Q]) [S ®] obdélník&][s0; Vrátí omezující obdélník "
+"dvojice bodů.&][s14;:Calc`$CrightR: right (obdélník) [S ®] real number&][s0; "
+"Horní mez x souřadnice obdélníku.&][s14;:Calc`$CtextP: text (bod) [S ®] string&][s0; "
+"Vrátí textový řetězec se souřadnicemi bodu.&][s14;:Calc`$CtextR: text (obdélník) "
+"[S ®] string&][s0; Vrátí textový řetězec s mezemi obdélníku.&][s14;:Calc`$CtopR: "
+"top (obdélník) [S ®] real number&][s0; Dolní mez y souřadnice obdélníku.&][s14;:Calc`$CtopcenterR: "
+"topcenter (obdélník) [S ®] bod&][s0; Střed horní strany obdélníku.&][s14;:Calc`$CtopleftR: "
+"topleft (obdélník) [S ®] bod&][s0; Levý horní roh obdélníku.&][s14;:Calc`$CtoprightR: "
+"topright (obdélník) [S ®] bod&][s0; Pravý horní roh obdélníku.&][s14;:Calc`$CwidthR: "
+"width (obdélník) [S ®] real number&][s0; Šířka obdélníku (xmax `- xmin).&][s14;:Calc`$CxP: "
+"x (bod [/ p]) [S ®] real number&][s0; x`-souřadnice bodu [/ p].&][s14;:Calc`$CxcenterR: "
+"xcenter (obdélník) [S ®] real number&][s0; X`-souřadnice středu obdélníku.&][s14;:Calc`$CxmaxR: "
+"xmax (obdélník) [S ®] real number&][s0; Horní")
+TOPIC_TEXT(
+" mez x souřadnice obdélníku.&][s14;:Calc`$CxminR: xmin (obdélník) [S ®] real "
+"number&][s0; Dolní mez x souřadnice obdélníku.&][s14;:Calc`$CyP: y (bod [/ p]) "
+"[S ®] real number&][s0; y`-souřadnice bodu [/ p].&][s14;:Calc`$CycenterR: ycenter "
+"(obdélník) [S ®] real number&][s0; Y`-souřadnice středu obdélníku.&][s14;:Calc`$CymaxR: "
+"ymax (obdélník) [S ®] real number&][s0; Horní mez y souřadnice obdélníku.&][s14;:Calc`$CyminR: "
+"ymin (obdélník) [S ®] real number&][s0; Dolní mez y souřadnice obdélníku.]")
diff --git a/uppsrc/TCtrlLib/appdoc.tpp/DlgCalc$cs-cz.tpp b/uppsrc/TCtrlLib/appdoc.tpp/DlgCalc$cs-cz.tpp
new file mode 100644
index 000000000..7ff56db9b
--- /dev/null
+++ b/uppsrc/TCtrlLib/appdoc.tpp/DlgCalc$cs-cz.tpp
@@ -0,0 +1,35 @@
+TITLE("Kalkulátor")
+TOPIC_TEXT(
+"[2 $$0,0#00000000000000000000000000000000:Default][b100;a50;K* $$1,0#23046025415494101427921008701515:Paragraph][i167;b50;a25;kKN1;~~~>.3917;* "
+"$$2,0#52185223490867151055420261384346:Toc1`.Heading1][i333;kN11;~~~>.3917;* $$3,0#36545033421193513457240054113541:Toc2`.Heading2][i500;kN111;~~~>.3917; "
+"$$4,0#65092512416424580164828413186219:Toc3`.Heading3][i167;b50;a25;kKNA;~~~>.3917;* "
+"$$5,5#92291332474308709450111162202673:AppToc1`.AppHeading1][i333;kNA1;~~~>.3917;* "
+"$$6,15#61887903412252554674480251236992:AppToc2`.AppHeading2][i500;kNA11;~~~>.3917; "
+"$$7,7#03533551421653050355120437860335:AppToc3`.AppHeading3][i500;b100;a100;KN1;*4 "
+"$$8,0#94145093439740438411010082165944:Heading1][i500;b100;a50;kKN11;*+117 $$9,0#10901425421210535753260366156531:Heading2][i500;b100;a25;kKN111;* "
+"$$10,0#53209141402041366431858192225431:Heading3][i500;b100;a100;KNA;*4 $$11,8#32912651424211307887950041245434:AppHeading1][i500;b100;a50;kKNA1;*+117 "
+"$$12,8#51232055453458524230328032001901:AppHeading2][i500;b100;a25;kKNA11;* $$13,8#34108020439428305453439845463579:AppHeading3][b100;a50;k*4 "
+"$$14,0#49239115434362547028389207250014:Heading][b50;a25;k~~~>.3917;* $$15,15#40743698422276745552070108434023:Toc`.Heading][b100;a50;K~~~>.3917;*+117 "
+"$$16,16#15422850471211852294098111138263:Topics1][l167;b50;a50;K~~~>.3917;* $$17,17#35241722455500657380289596243808:Topics2][l333;~~~>.3917; "
+"$$18,18#31041344429742018840308064013200:Topics3][b83;a42;K* $$19,0#46440151113795363000000595230845:Paragraph][{_}%EN-US "
+"[s0; Výrazový kalkulátor lze použít k_jednoduchým výpočtům. Hlavní jeho "
+"rozdíl proti běžnému kalkulátoru ve Windows je ten, že výpočet se neprovádí "
+"postupně jako u_běžné kalkulačky (napíši číslo, stisknu klávesu [* `[`+`]], "
+"napíši druhé číslo, stisknu klávesu [* `[`=`]] a_rovnou se objeví výsledek). "
+"Místo toho je třeba do editačního pole kalkulátoru vložit celý matematický "
+"výraz, obsahující operace, funkce, konstanty a_závork. Výraz se vypočte až "
+"po potvrz")
+TOPIC_TEXT(
+"ení klávesou [* Enter].&][s0; &][s0;= @@PNG:2925&725����Ǎ���������Ƞ�Ҁ��Ԁ���􈂀������က�����������팤����\377����������������ɝ񗁄���²�����������ű̄�������Ⱦ���������ھٸ—������������ۂ򐠄�쳊������򯻻Ӏ��Ͼ�����������������������ճ��\377��������䠷���ȃฆ�����չ��͑��؇������롔���ۦ�����ᤛ���Ѥ�۠��ٳŬ�������������������������������Ԁ���͕����֒�⫱���������ص���漀����ü��������н���������竓�����������›�����ĝ������ፗ���臿ĥ�����æ�����������������Ղ���־���������͒����Ȑ����۞��м�ꛭ�̹��Ӗ�ʹכ��ۛ뭊�ּ�������\377�ݎ������Ѝ���ƀܒ�ձ��⪦ɬ�ف���̵Т���䀨⑱��ۈ�̥���Ϻ��§�ʾ⛮������›�⦝�й���أ�������٥���콌������ୡ�������ğ���׵����������Ų�����Օ�����ʀ���ž�����ٳ���𛣤�����ʙ��¡���������Ϟ������ᙀ�֙�ǀ�����������ᕚЌ�񥁟���������\377�����ݓԮ�Հ�\377�����������Û�ǭǨ���ֹ����������޳����������ߣɫ֓�\377�������젘��އ������售��Ŵε����ꊣ�Ȏ�牉���þ�诗ӂ����Ҡ������چ��������˗��������������Ǯ������󐀸ꀀ����ƕ�������𷼃�Բ��������Гؼ���梾��Ёя���Ѷ������ъàڥ��ķ���ܑ������̪������������������׆��˗�ꢳ�����΁Č���죎���ط뗯�ܼ�Թ�座���߅�ŸЀ���Կ������Ԫ���Ϳ�İ�ĉ��ۆ�ꩯ�ʌ�ͽݫ������䜃���Ȯ���������ޚڐ����������̿���������Ԯ�����ԃ�����ȅ׵��������������ē�����Ɣ�������������ċ����ך����Ș�٬��͎�����㶱����Ǒ��̶�研�Қ���Ď��ڨ��ė����肫��Ҩ������̺��������������ׂ������ˈ���ăӜ������׍��߹��������߱�������ሣ��웈����\377��������ο������䪂������Ԯ�����ՊЬ��͡����������ހ杘畈����銁������������Ǝ��ު����凵������Ʃ�����������נ������ގ�\377Ǟ�������ޑۈ��\377�𝀻�������������²А�Ө̃逹����������ؼ����ǻ���ꗟ\377�Ǔķ����ȳ�򰮬����Ԋ��”�䶩�җ�����������ސ�\377�����٠���������؃�ܒ෼����櫞����䟿����ⱀ񛕏����ф���ڌ��������뷥��͜�ͅ���Ƥۂ�������惔�������ȼ��ט�����������܌���ı�ޯ׻��Ӣ�ō��������ƣ���丩���������ڦ����Ӻ����������Μ������������푩�������������������\377���σ���\377�Ե�����̮�����Ѭ�ܣ��Ђր�����������")
+TOPIC_TEXT(
+"������������얖������������‡���������������ͭ������ؘ줶���ң���������ԛ�����������젎��؃�������鵥��\377�����ޡ�����‰���ПٳٽքÇ�޷�۾������ǹ���ӭ����������͝���߻�����槯��ڞ\377ڣ�Ϻ�鎲�����γ‹��Ԅ��η������򾸎���֠Ц�ء����Ӫ��\377��������������ԃ�����Ā���Ԍ�����ۑ�����������ԎĀ�ǫ����؀��̋�������߾ܙ�ͮ������������ㄡ��񹢩�������Փ������֚��ᐳ����������\377�ط�������ȱ��Ǟ�ʽ߭���‚�榀���ف����ȸ��������οʖ׳���ߘ\377�����\377���»׺�ө�򽊗�ɋ��̙��������䅐�ۈ������ȭ������ʃ�ą���\377���ǟ�������\377��ч����α�������Ã䬄•��߅�������������۾������ꅗᓣ����ħ�������ͧ������ް�ޅ��͋�ԇ���������ʍ뚅���͜�������䮿�Č��������\377�\377����˥������֣����������؆�š怐��ś������������۞�����ՠ���������ײ���ޕ���򉑪�הҝ��Ӳ��Nj���Ӻ��������ʵ�����ˌ��������������찱��ֿ����ݿ���ׁ��ْ���������������쭎��፷ԁ����ꀌ���Ҹ���히���Ȁ�Ě������ȃ󭕇���ʶՕ���꽼����ԭ������������қت��ؽ����Ɲ��ҫ��ސ����������Ĝ�λ��‡�����ٵ�\377񏞦\377����᝔��ǰ�ܖ������ۗ�β����؀���ˡ���򣮳ۅ��Ք���͚�ɛ��ք���ܶ����痳�əߝ�����������ثͧ��ݿ�޽�����՚�Ê��������ᢲ����������\377�����Ӏ�����ƽ����ߝ����ه���������Ǣ������İ\377��\377�Ƚ��ҡ���М�ա��֨����\377�����������򦴁�쉘�ؓ��������Ⲗ��Աߌ�����܁��ߎ�ݲ��『����Ҕް�������ۑ��߹Ʌ��������������ȧ���޷�ܾ�խ���������촻��α��û�;������ן�ܻ���Ա�����������〰����ߤË��������陳���É�����ۑ�¤��ۚ�����\377�����˜����ҹ����맾ʈ୸������ǭ�㺅�����檏��������鯬Ξ��ߵ�đ��쁰�����������導���ރ�¥�������ٳ��뀑�����������������կ��������LjŽ��ᤦ�멲ֆ�Σ����ǐ�����º񚢾壂������ͼ��Ӎ䡔��Ʒ�����䡸�Є�����չ�뙧�󍷪���憁��²�к��Ǭ���ȑ�ؓ©�ȑ����쩣������������ǁ����ݭ������ճ����������������ń�����Ӹ�Ϋ����Ȟ�ȗ������Ⴀ�����Š�����������ݯ����������������������͟������݄���杳���چ�������򉂰���С��߀����ɷ�����㯚���������Ϗ���ݧ�Կ��ᾃ�������ڏ��ԋ�����������ǖ��\377���օ�����ܩ�ܿ�Ц뺛��ȇ���􈍛͂����������������")
+TOPIC_TEXT(
+"�����������Ǿƕ����\377��娭�����ß������ے���������Ղ��Շ����������̇������ޔ�͊������ر�����կ·Ć���ҙ�\377�����Ù��������丹Ϸ�䐸����ٜ�մ��лڞ����豇������������֐��⒐׏������楫�Ž�׻ڡۣ��������ų���ŭݖ���捌����啽�ܮ܃����З��ۮ���������������ň��\377������˘����\377�����˘ّ�������ھ��җ����Ӵ���������盕��䡦�ʻ�䇨�܍�ّ�������킠�܍ٷ�������˧ۇ�������ۛވ������������Ԍ��������ܡ������Г�����\377���Ɍģ���ݪڱ����攏������������������������ӆ��\377������Ԝ��ކ�������旹��俒����؈�������������������֒������������샕�К�������Ì����΢����ϭ���Ӥ�������������֜�����������䬈��ˠ��ӹ��۝��\377����ςЃ�ǻ�����������������������������È����������Ŵ������ł�̷������λ�盐ً��������ˁ�א�Ⴈ���Ӛ����������꒠�Ε���̮������˭�ݿ�����������ν�灖����Š�¨����Ʉ��٦��었�ɒ��ꢹ����������ت��������Ԫ����ޘ��Դ����灎����������翏�����ڮ�������������ю��פ�䤫����֊鎈������ٰ�؈�밁Ӂ��”���ź������޳����𲡽��㭈�������Ţ�����좸������섊������Ӑ�ߙ��盕���ôÉ趱�\377��ޱ�������ݖ��������Ҿ��є���������ǰ���ˣ������ୁ�����������㆞��͚��ܿ���������ю�ŕ�ȭ�혵���������ہ��ٯڡ›����֕������Ɇ��ǽ����Ȗ����˅����§�в��̱���볌��������ۼǽ������؉����ڸ������͌����������ɑ�ޞ���ƀ���ၭ������ƥ��͎���ܑ�Ŝ��������������ًЅ���ө��������為��������Ό�󕄰������������א��ႈ�����짔毖�ȕ����������ۈ��ω������Ą������ʞ����������������������א�᤻�ޯ����ֹ��ͺ��ۇ��٫���ힷ�����������������Ϻ�������Ҥ������ƛ��ֈ��ç�������݄������п���ٳ����ə��ؑ�����Ќ��Ӧ�����Ӊ������������������\377�������������Ȟ���܎��������������”Ѱ���ӉӢ�����Ϭ�������Ǻ����������������䧬������˯����������\377�����߲ӫ�����˭����������ٳ����太��⻸��������˯�׻�전�����\377����������ݏ�о��͵��������Ԇ����Ȭ�ȸ�֗Ͻ��ݍ�����������������߫Ӗ������ӳ��ݍ����˷����������櫿������ͮ��μNj���ҡ�Ȝ�ݗ��ˌ̜��̘��Ϸ�������́���ⳁ�ቫ顧�䬴����Ȣ��ڇ����������\377�֕�������������ğλ����\377�����ӭ��\377���ܝ���̤��������ؕ�����ż��")
+TOPIC_TEXT(
+"���݋°��ٺ�������Ռ�����ɉ��շ��������̷����\377����������ۭ����������ҿ���̽�ώ���\377��֗��������������¯�Ҍ���֗󾏲�����ܺ��̳����\377�ۧ������������ޤ������������������������̬��쨻���������蕄Ἐ�◨�����͙��ǝу����\377����ػ���̲����ڨ�����̈򆚕����������̟��������圶ߡ���ӝ��ϑ�܈�������������������„����\377�\377�������ݗΜ��蚁��ͅڶ�̐����ػ���������������ܥƹ������Ñ������̌������򁢫�������£�Ơ�����Ӹ���㺦������ٹ���Ձǃ����𱀃\377��ŗ�ݦ������\377������������������Į����&][s0; "
+"&][s0; Po potvrzení se provede výpočet výrazu a_výsledek se zobrazí ve spodním "
+"řádku dialogu. Pokud při výpočtu dojde k_chybě, zobrazí se místo výsledku "
+"chybové hlášení.&][s0; &][s0; @@PNG:500&137����Ǎ���������Ȁ�Ҁ��Ѐ�����������򌋀������������͒����������\377������������Ȑ˯�������Ӿ������ݝ�������尌����ʈѴ�Җ����؋�����缨������岲��Íƪ����������ř��������Ӣ���͑ȓ�����򉫗��֦����ț�؛��������������ɉ��������ƽ�������Ү����ΆƼĶ�������㡸�����߬�雕��ي�Ҟ�\377��⽁镍ޝ����ޘ���Ю�������𭿰�͜������ۋ�������ޕ����͓�����������͡��ņ�槜�ݚ�Ç\377������\377���Ǘ�䮂�����ׁ����������Į���&][s0; "
+"Klávesa [* Esc] ukončí práci s_kalkulátorem.&][s0;* &][s0;b100;* Viz také:&][s0; "
+"&][s0;i150;O0;_^topic`:`/`/TCore`/appdoc`/CalcNode`$cs`-cz^@(0.0.255) Funkce výrazového "
+"kalkulátoru]")
diff --git a/uppsrc/TCtrlLib/appdoc.tpp/all.i b/uppsrc/TCtrlLib/appdoc.tpp/all.i
new file mode 100644
index 000000000..634a523e6
--- /dev/null
+++ b/uppsrc/TCtrlLib/appdoc.tpp/all.i
@@ -0,0 +1,11 @@
+TOPIC("DlgCalc$cs-cz")
+#include "DlgCalc$cs-cz.tpp"
+END_TOPIC
+
+TOPIC("CalcGuiType$en-us")
+#include "CalcGuiType$en-us.tpp"
+END_TOPIC
+
+TOPIC("CalcGuiType$cs-cz")
+#include "CalcGuiType$cs-cz.tpp"
+END_TOPIC
diff --git a/uppsrc/TCtrlLib/tctrllib.iml b/uppsrc/TCtrlLib/tctrllib.iml
new file mode 100644
index 000000000..b3f96b616
--- /dev/null
+++ b/uppsrc/TCtrlLib/tctrllib.iml
@@ -0,0 +1,136 @@
+IMAGE_BEGIN(menu_check)
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�\1\0\0\0�")
+	IMAGE_SCAN("˂\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0Ń\0\0\0�")
+	IMAGE_SCAN("Ă\0\0\0Ã\0\0\0�")
+	IMAGE_SCAN("ă\0\0\0��\0\0\0�")
+	IMAGE_SCAN("Ņ\0\0\0�")
+	IMAGE_SCAN("ƃ\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�")
+IMAGE_PACKED(menu_check, "\2\20\0\0\0\20\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(menu_radio)
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("Ƅ\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\377\377\377�\0\0\0�")
+	IMAGE_SCAN("�\2\0\0\0\377\377\377�\0\0\0�")
+	IMAGE_SCAN("ņ\0\0\0�")
+	IMAGE_SCAN("ņ\0\0\0�")
+	IMAGE_SCAN("Ƅ\0\0\0�")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�")
+IMAGE_PACKED(menu_radio, "\2\20\0\0\0\20\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(plus)
+	IMAGE_SCAN("�\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�")
+	IMAGE_SCAN("�\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�")
+IMAGE_PACKED(plus, "\2\7\0\0\0\7\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(minus)
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�\0\0\0")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�")
+IMAGE_PACKED(minus, "\2\7\0\0\0\7\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(pair_right_arrow)
+	IMAGE_SCAN("\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�")
+	IMAGE_SCAN("\1\0\0\0�")
+IMAGE_PACKED(pair_right_arrow, "\2\4\0\0\0\7\0\0\0\2\0\0\0\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(pair_right_arrows)
+	IMAGE_SCAN("\1\0\0\0�\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\1\0\0\0�")
+	IMAGE_SCAN("\1\0\0\0�\1\0\0\0�")
+IMAGE_PACKED(pair_right_arrows, "\2\11\0\0\0\7\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(pair_left_arrow)
+	IMAGE_SCAN("�\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�")
+	IMAGE_SCAN("\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0")
+IMAGE_PACKED(pair_left_arrow, "\2\4\0\0\0\7\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(pair_left_arrows)
+	IMAGE_SCAN("�\1\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\1\0\0\0�")
+	IMAGE_SCAN("\1\0\0\0�\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\1\0\0\0")
+IMAGE_PACKED(pair_left_arrows, "\2\11\0\0\0\7\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(pair_down_arrow)
+	IMAGE_SCAN("\1\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�")
+IMAGE_PACKED(pair_down_arrow, "\2\7\0\0\0\4\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(pair_down_arrows)
+	IMAGE_SCAN("\1\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("\1\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�")
+IMAGE_PACKED(pair_down_arrows, "\2\7\0\0\0\12\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(pair_up_arrow)
+	IMAGE_SCAN("�\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\1\0\0\0�")
+	IMAGE_SCAN("\1\0\0\0�\1\0\0\0")
+IMAGE_PACKED(pair_up_arrow, "\2\7\0\0\0\4\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(pair_up_arrows)
+	IMAGE_SCAN("�\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\1\0\0\0�")
+	IMAGE_SCAN("\1\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\1\0\0\0�")
+	IMAGE_SCAN("\1\0\0\0�\1\0\0\0")
+IMAGE_PACKED(pair_up_arrows, "\2\7\0\0\0\12\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(open_small)
+	IMAGE_SCAN("��\0\0\0ł\0\0\0�")
+	IMAGE_SCAN("\1\0\0\0�\0\377\377�\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\0\377\377\1\0\0\0�")
+	IMAGE_SCAN("\1\0\0\0�\0\377\377�\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\0\377\377\1\0\0\0�\0��\1\0\0\0")
+	IMAGE_SCAN("\3\0\0\0\0\377\377\0\0\0�\0���\0\0\0�\0��\1\0\0\0�")
+	IMAGE_SCAN("�\0\0\0�\0��\1\0\0\0�")
+	IMAGE_SCAN("�\0\0\0�")
+IMAGE_PACKED(open_small, "\2\13\0\0\0\10\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0")
diff --git a/uppsrc/TCtrlLib/template.h b/uppsrc/TCtrlLib/template.h
new file mode 100644
index 000000000..608b10d1d
--- /dev/null
+++ b/uppsrc/TCtrlLib/template.h
@@ -0,0 +1,287 @@
+NAMESPACE_UPP
+
+/* obsoleted by Fidler's StoreAsString
+template <class T>
+String SerializeOut(const T& object)
+{
+	StringStream stream;
+	stream % const_cast<T&>(object);
+	return stream;
+}
+*/
+
+/* obsoleted by Fidler's ReadFromString
+template <class T>
+bool SerializeIn(T& object, const String& data)
+{
+	if(data.IsEmpty())
+		return true; // no data - do not serialize but report no errors
+	StringStream load(data);
+	load % object;
+	return !load.IsError();
+}
+*/
+
+/* obsoleted by Fidler's ReadFromString (more or less)
+template <class T>
+T SerializeIn(const String& data, T * = 0)
+{
+	T temp;
+	if(SerializeIn(temp, data, false))
+		return temp;
+	return T();
+}
+*/
+
+/* obsoleted by Fidler's LoadFromFile
+template <class T>
+bool SerializeLoad(T& object, const char *filename)
+{
+	FileIn file(filename);
+	if(!file.IsOpen())
+		return true; // no file - no error
+	file % object;
+	return !file.IsError();
+}
+*/
+
+/* obsoleted by Fidler's LoadFromFile (more or less)
+template <class T>
+T SerializeLoad(const char *filename, T * = 0)
+{
+	T temp;
+	if(SerializeLoad(temp, filename, false))
+		return temp;
+	return T();
+}
+*/
+
+/* obsoleted by Fidler's StoreToFile
+template <class T>
+bool SerializeSave(T& object, const char *filename)
+{
+	if(!filename || !*filename)
+		return false;
+	FileOut file(filename);
+	if(!file.IsOpen())
+		return false;
+	file % object;
+	file.Close();
+	if(!file.IsError())
+		return true;
+	DeleteFile(filename);
+	return false;
+}
+*/
+
+template <class T>
+class WithChoiceList : public T
+{
+public:
+	WithChoiceList();
+
+	virtual bool Key(dword key, int repcnt);
+
+public:
+	ChoiceList choices;
+};
+
+template <class T>
+WithChoiceList<T>::WithChoiceList()
+{
+	choices.Attach(*this);
+}
+
+template <class T>
+bool WithChoiceList<T>::Key(dword key, int repcnt)
+{
+	return choices.OnKey(key) || T::Key(key, repcnt);
+}
+
+template <class T>
+class WithKeyMap : public T
+{
+public:
+	WithKeyMap() {}
+
+	void         AddKey(dword key, Callback callback) { map.Add(key, callback); }
+	void         ClearKey(dword key);
+	void         ClearKey()                           { map.Clear(); }
+
+	virtual bool Key(dword key, int count);
+
+public:
+	VectorMap<dword, Callback> map;
+};
+
+template <class T>
+void WithKeyMap<T>::ClearKey(dword key)
+{
+	Vector<int> found;
+	for(int i = map.Find(key); i >= 0; i = map.FindNext(i))
+		found.Add(i);
+	while(!found.IsEmpty())
+		map.Remove(found.Pop());
+}
+
+template <class T>
+bool WithKeyMap<T>::Key(dword key, int count)
+{
+	int i = map.Find(key);
+	if(i < 0)
+		return T::Key(key, count);
+	for(; i >= 0; i = map.FindNext(i))
+		map[i]();
+	return true;
+}
+
+template <class T>
+class WithKeyCallback : public T
+{
+public:
+	WithKeyCallback() : WhenKey(false) {}
+	virtual bool Key(dword key, int count);
+
+	Gate1<dword> WhenKey;
+};
+
+template <class T>
+bool WithKeyCallback<T>::Key(dword key, int count)
+{
+	return WhenKey(key) || T::Key(key, count);
+}
+
+template <class T>
+class CtrlDataHelper
+{
+public:
+	CtrlDataHelper(Ctrl& ctrl, T dflt) : ctrl(ctrl), value(dflt) {}
+
+	void Serialize(Stream& stream)
+	{
+		if(stream.IsStoring())
+			value = ~ctrl;
+		stream % value;
+		if(stream.IsLoading())
+			ctrl <<= value;
+	}
+
+	friend Stream& operator % (Stream& stream, CtrlDataHelper<T> hlp) { hlp.Serialize(stream); return stream; }
+
+private:
+	Ctrl& ctrl;
+	T     value;
+};
+
+template <class T>
+inline CtrlDataHelper<T>
+CtrlData(Ctrl& ctrl, T dflt = Null)
+{ return CtrlDataHelper<T>(ctrl, dflt); }
+
+template <class T>
+class WithDisplay : public T
+{
+public:
+	WithDisplay();
+	WithDisplay(const PaintRect& prc) : prc(prc) {}
+	WithDisplay(const Display& picture, const Value& value) : prc(picture, value) {}
+
+	virtual void     Paint(Draw& draw);
+
+	WithDisplay&     Background(const PaintRect& _prc)  { prc = _prc; this->Refresh(); return *this; }
+	WithDisplay&     Background(const Value& _value)    { prc.SetValue(_value); this->Refresh(); return *this; }
+
+	const Display&   GetDisplay() const                 { return prc.GetDisplay(); }
+	const Value&     GetValue() const                   { return prc.GetValue(); }
+	const PaintRect& GetPaintRect() const               { return prc; }
+
+protected:
+	PaintRect        prc;
+};
+
+template <class T>
+WithDisplay<T>::WithDisplay()
+: prc(StdDisplay())
+{
+}
+
+template <class T>
+void WithDisplay<T>::Paint(Draw& draw)
+{
+	prc.Paint(draw, Rect(this->GetSize()), SBlack, SLtGray, 0);
+}
+
+template <class T>
+class NotNullCtrl : public T
+{
+public:
+	virtual Value  GetData() const;
+};
+
+template <class T>
+Value NotNullCtrl<T>::GetData() const
+{
+	Value value = T::GetData();
+	if(value.IsError() || !value.IsNull())
+		return value;
+	return ErrorValue("Hodnota nesm� b�t pr�zdn�.");
+}
+
+template <class T>
+class WithDropFiles : public T
+{
+public:
+	WithDropFiles() : registered(false) {}
+
+#ifdef PLATFORM_WIN32
+	virtual LRESULT WindowProc(UINT message, WPARAM wParam, LPARAM lParam);
+#endif
+	virtual void    DropFiles(Point pt, const Vector<String>& file_list) = 0;
+
+private:
+	bool            registered;
+};
+
+#ifdef PLATFORM_WIN32
+template <class T>
+LRESULT WithDropFiles<T>::WindowProc(UINT message, WPARAM wParam, LPARAM lParam)
+{
+	if(!registered && this->GetHWND())
+	{
+		registered = true;
+		DropFilesRegister(this->GetHWND());
+	}
+	if(registered && message == WM_DROPFILES)
+	{
+		Point pt = DropFilesGetPos(wParam);
+		DropFiles(pt, DropFilesGetList(wParam));
+		return 0;
+	}
+	return T::WindowProc(message, wParam, lParam);
+}
+#endif
+
+template <class T>
+class WithBar : public T
+{
+public:
+	virtual void RightDown(Point pt, dword keyflags);
+	virtual bool Key(dword key, int repcnt);
+
+public:
+	Callback1<Bar&> WhenBar;
+};
+
+template <class T>
+void WithBar<T>::RightDown(Point pt, dword keyflags)
+{
+	MenuBar::Execute(WhenBar);
+}
+
+template <class T>
+bool WithBar<T>::Key(dword key, int repcnt)
+{
+	return MenuBar::Scan(WhenBar, key) || T::Key(key, repcnt);
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/TCtrlLib/util.cpp b/uppsrc/TCtrlLib/util.cpp
new file mode 100644
index 000000000..5783a3ac7
--- /dev/null
+++ b/uppsrc/TCtrlLib/util.cpp
@@ -0,0 +1,826 @@
+#include "TCtrlLib.h"
+#ifdef COMPILER_MSC
+#pragma hdrstop
+#endif//COMPILER_MSC
+#include "TCtrlImg.h"
+
+#define LLOG(x) // RLOG(x)
+
+#ifdef PLATFORM_WIN32
+#include <shellapi.h>
+
+NAMESPACE_UPP
+
+void DropFilesRegister(HWND hwnd)
+{
+	DragAcceptFiles(hwnd, true);
+}
+
+Point DropFilesGetPos(WPARAM hdrop)
+{
+	POINT pt;
+	if(DragQueryPoint((HDROP)hdrop, &pt))
+		return Point(pt.x, pt.y);
+	return Null;
+}
+
+Vector<String> DropFilesGetList(WPARAM hdrop)
+{
+	int count = DragQueryFile((HDROP)hdrop, (DWORD)-1, 0, 0);
+	Vector<String> list;
+	for(int i = 0; i < count; i++) {
+		int length = DragQueryFile((HDROP)hdrop, i, 0, 0);
+		StringBuffer s(length + 1);
+		DragQueryFile((HDROP)hdrop, i, s, length + 1);
+		list.Add(s);
+	}
+	DragFinish((HDROP)hdrop);
+	return list;
+}
+#endif
+
+bool IsUnique(const ArrayCtrl& table, int item)
+{
+	if(table.GetCount() <= 1 || !table.IsCursor())
+		return true;
+	Value value = table.Get(item);
+	for(int t = 0; t < table.GetCount(); t++)
+		if(t != table.GetCursor() && value == table.Get(t, item))
+			return false;
+	return true;
+}
+
+bool IsUnique(const ArrayCtrl& table, Id id)
+{
+	return IsUnique(table, table.GetPos(id));
+}
+
+int SwapRows(ArrayCtrl& table, int row1, int row2)
+{
+	if(row1 == row2)
+		return row1;
+//	bool s1 = table.IsSelected(row1);
+//	bool s2 = table.IsSelected(row2);
+	int next = row2;
+	int o = table.GetCursor();
+	table.KillCursor();
+	Vector<Value> row;
+	row <<= table.ReadRow(row2);
+	table.Set(row2, table.ReadRow(row1));
+	table.Set(row1, row);
+	if(o >= 0)
+		table.SetCursor(o == row1 ? row2 : o == row2 ? row1 : o);
+//	table.Select(row1, s2);
+//	table.Select(row2, s1);
+	return next;
+}
+
+void SetColumn(ArrayCtrl& table, int index, const Value& value)
+{
+	int c = table.GetCursor(), sc = table.GetCursorSc();
+	table.KillCursor();
+	for(int i = 0; i < table.GetCount(); i++)
+		table.Set(i, index, value);
+	table.SetCursor(c);
+	table.ScCursor(sc);
+}
+
+void SetColumn(ArrayCtrl& table, Id column, const Value& value)
+{
+	SetColumn(table, table.GetPos(column), value);
+}
+
+BorderFrame& TopJoinFrame()
+{
+	static const ColorF b[] = { (ColorF)1, &SLtGray, &SLtGray, &SLtGray, &SGray };
+	static BorderFrame frm(b);
+	return frm;
+}
+
+BorderFrame& BottomJoinFrame()
+{
+	static const ColorF b[] = { (ColorF)1, &SLtGray, &SWhite, &SLtGray, &SLtGray };
+	static BorderFrame frm(b);
+	return frm;
+}
+
+//////////////////////////////////////////////////////////////////////
+// DropButton::
+
+DropButton::DropButton()
+{
+	SetImage(CtrlImg::down_arrow());
+}
+
+bool DropButton::HotKey(dword key)
+{
+	return WhenHotKey(key);
+}
+
+//////////////////////////////////////////////////////////////////////
+// ChoiceList::
+
+ChoiceList::ChoiceList()
+: owner(0), item(0)
+{
+	AutoHideSb().NoHeader().NoGrid().MouseMoveCursor();
+	WhenSelect = THISBACK(OnSelect);
+	WhenCancel = THISBACK(OnCancel);
+	dropbutton.WhenPush = THISBACK(OnDrop);
+	AddColumn();
+}
+
+ChoiceList& ChoiceList::Attach(Ctrl& _owner)
+{
+	Detach();
+	owner = &_owner;
+	_owner.AddFrame(dropbutton);
+	dropbutton.WhenHotKey = THISBACK(OnKey);
+	return *this;
+}
+
+void ChoiceList::Detach()
+{
+	if(owner)
+		owner -> RemoveChild(&dropbutton);
+	owner = NULL;
+}
+
+bool ChoiceList::OnKey(dword key)
+{
+	switch(key) {
+	case K_ALT_DOWN:
+		OnToggle();
+		return true;
+	}
+	return false;
+}
+
+void ChoiceList::OnToggle()
+{
+	if(IsOpen())
+		OnSelect();
+	else
+		OnDrop();
+}
+
+void ChoiceList::OnDrop()
+{
+	ASSERT(owner && item >= 0 && item < GetIndexCount());
+	WhenDrop();
+	PopUpTable::PopUp(owner);
+	FindSetCursor(owner -> GetData(), item);
+}
+
+void ChoiceList::OnSelect()
+{
+	if(owner && IsCursor() && Get(item) != owner -> GetData()) {
+		owner -> SetData(Get(item));
+		owner -> UpdateActionRefresh();
+	}
+}
+
+void ChoiceList::OnCancel()
+{
+	owner -> SetWantFocus();
+}
+
+ExtendedButton::ExtendedButton()
+{
+	Width(16);
+	SetImage(CtrlImg::right_arrow());
+}
+
+bool ExtendedButton::HotKey(dword key)
+{
+	if(key == K_ALT_ENTER) {
+		for(Ctrl *p = this; p; p = p->GetParent())
+			if(p->HasFocus()) {
+				Action();
+				return true;
+			}
+	}
+	return Button::HotKey(key);
+}
+
+ExtendedFileButton::ExtendedFileButton()
+{
+	Width(16);
+	SetImage(TCtrlImg::open_small());
+//	Tip("Otev��t v�b�r souboru / slo�ky");
+//	SetLabelText("...");
+}
+
+bool ExtendedFileButton::HotKey(dword key)
+{
+	if(key == K_ALT_ENTER) {
+		for(Ctrl *p = this; p; p = p->GetParent())
+			if(p->HasFocus()) {
+				Action();
+				return true;
+			}
+	}
+	return Button::HotKey(key);
+}
+
+MenuButton::MenuButton()
+{
+	WhenPush = callback(this, &MenuButton::OnMenu);
+}
+
+void MenuButton::OnMenu()
+{
+	MenuBar::Execute(WhenBar, GetScreenRect().TopRight());
+}
+
+/*
+void ColorDisplayNull::Paint(Draw& w, const Rect& r, const Value& q, Color i, Color p, dword s) const
+{
+	Color c = q;
+	w.DrawRect(r, p);
+	if(IsNull(c)) {
+		int size = w.GetTextSize(null_text, StdFont()).cy;
+		w.DrawText(r.left + 2, (r.top + r.bottom - size) >> 1, null_text, StdFont(), i);
+	}
+	else {
+		Color lite = SWhite, dark = SLtGray;
+		if((c.GetR() | c.GetG() | c.GetB()) & 0x80)
+			lite = SLtGray, dark = SBlack;
+		Rect rc = r;
+		rc.Deflate(2);
+		DrawFrame(w, rc, lite, dark);
+		rc.Deflate(1);
+		w.DrawRect(rc, c);
+	}
+}
+*/
+
+bool IsDragDistance(Point pt1, Point pt2)
+{
+#ifdef PLATFORM_WIN32
+	return tabs(pt1.x - pt2.x) >= GetSystemMetrics(SM_CXDRAG)
+		|| tabs(pt1.y - pt2.y) >= GetSystemMetrics(SM_CYDRAG);
+#endif
+#ifdef PLATFORM_POSIX
+	enum { CXDRAG = 20, CYDRAG = 20 };
+	// todo? are there any CXDRAG / CYDRAG system metrics in LINUX?
+	return tabs(pt1.x - pt2.x) >= CXDRAG || tabs(pt1.y - pt2.y) >= CYDRAG;
+#endif
+}
+
+DragDropCtrl::DragDropCtrl()
+: state(0)
+{
+}
+
+DragDropCtrl::~DragDropCtrl() {}
+bool DragDropCtrl::Push(Point pt, dword keyflags)
+{
+	return true;
+}
+
+void DragDropCtrl::Drag(Point pt, Point last, Point next, dword keyflags)
+{
+	Rect rc_last = Null, rc_next = Null;
+	if(!IsNull(last))
+		rc_last = RectSort(pt, last);
+	if(!IsNull(next))
+		rc_next = RectSort(pt, next);
+	if(rc_last != rc_next)
+		DragRect(rc_last, rc_next, keyflags);
+}
+
+void DragDropCtrl::Drop(Point pt, Point end, dword keyflags)
+{
+	DropRect(RectSort(pt, end), keyflags);
+}
+
+void DragDropCtrl::Click(Point pt, dword keyflags)
+{
+	// no-op, should be implemented in derived class
+}
+
+void DragDropCtrl::DragRect(const Rect& last, const Rect& next, dword keyflags)
+{
+	ViewDraw draw(this);
+	DrawDragDropRect(draw,
+		IsNull(last) ? Rect(Null) : last.Inflated(1),
+		IsNull(next) ? Rect(Null) : next.Inflated(1), 3);
+}
+
+void DragDropCtrl::DropRect(const Rect& rc, dword keyflags)
+{
+	// no-op, should be implemented in derived class
+}
+
+void DragDropCtrl::Cancel()
+{
+}
+
+void DragDropCtrl::DragShow(bool _show)
+{
+	if(_show && state == HIDDEN) {
+		Drag(start, Null, last, last_key);
+		state = ON;
+	}
+	if(!_show && state == ON) {
+		Drag(start, last, Null, last_key);
+		state = HIDDEN;
+	}
+}
+
+void DragDropCtrl::LeftDown(Point pt, dword keyflags)
+{
+	SetWantFocus();
+	LLOG("DragDropCtrl::LeftDown -> " << pt << ", keyflags " << FormatIntHex(keyflags));
+	if(Push(pt, last_key = keyflags)) { // begin drag & drop
+		state = POSSIBLE;
+		start = last = pt;
+		SetCapture();
+	}
+}
+
+void DragDropCtrl::LeftDouble(Point pt, dword keyflags)
+{
+	SetWantFocus();
+	Click(pt, keyflags | K_MOUSEDOUBLE);
+}
+
+void DragDropCtrl::DragStop(bool accept, dword keyflags)
+{
+	ReleaseCapture();
+	DragHide();
+	if(state == HIDDEN && accept)
+		Drop(start, last, last_key = keyflags);
+	else if(state == POSSIBLE && accept)
+		Click(start, last_key = keyflags);
+	else
+		Cancel();
+	state = OFF;
+}
+
+void DragDropCtrl::LeftUp(Point pt, dword keyflags)
+{
+	LLOG("DragDropCtrl::LeftUp -> " << pt);
+	DragStop(true, last_key);
+}
+
+void DragDropCtrl::RightDown(Point pt, dword keyflags)
+{
+	DragStop(false, last_key);
+	SetWantFocus();
+	LLOG("DragDropCtrl::RightDown -> " << pt << ", keyflags " << FormatIntHex(keyflags));
+	if(Push(pt, last_key = keyflags)) { // begin drag & drop
+		state = POSSIBLE;
+		start = last = pt;
+		SetCapture();
+	}
+}
+
+void DragDropCtrl::RightDouble(Point pt, dword keyflags)
+{
+	SetWantFocus();
+	Click(pt, keyflags | K_MOUSEDOUBLE);
+}
+
+void DragDropCtrl::RightUp(Point pt, dword keyflags)
+{
+	LLOG("DragDropCtrl::RightUp -> " << pt);
+	DragStop(true, last_key);
+}
+
+void DragDropCtrl::MouseMove(Point pt, dword keyflags)
+{
+	LLOG("DragDropCtrl::MouseMove -> " << pt);
+	if(keyflags != last_key)
+		DragHide();
+	if(state == POSSIBLE && IsDragDistance(pt, start)) {
+		state = ON;
+		Drag(start, Null, last = pt, last_key = keyflags);
+	}
+	else if(state == ON || state == HIDDEN) {
+		Point plast = (state == ON ? last : Point(Null));
+		last = pt;
+		last_key = keyflags;
+		state = ON;
+		Drag(start, plast, pt, last_key);
+	}
+}
+
+bool DragDropCtrl::Key(dword key, int repcnt)
+{
+	if(key == K_ESCAPE) {
+		DragStop(false);
+		return true;
+	}
+	return Ctrl::Key(key, repcnt);
+}
+
+//////////////////////////////////////////////////////////////////////
+// StdArrayOrder::
+
+bool StdArrayOrder::operator () (const Vector<Value>& row1, const Vector<Value>& row2) const
+{
+	for(int t = 0; t < index.GetCount(); t++)
+		if(int c = StdValueCompare(row1[index[t]], row2[index[t]], lang[t]))
+			return (desc[t] ? c > 0 : c < 0);
+	return false;
+}
+
+//////////////////////////////////////////////////////////////////////
+// ArrayPair::
+
+ArrayPair::ArrayPair()
+{
+	key_index = 0;
+	sort_index = -1;
+	pane_pos = 5000;
+	order = &std_order;
+	NoWantFocus();
+	Transparent();
+	*this << left << add << add_all << remove << remove_all << right;
+	left.WhenKillCursor = left.WhenEnterRow = THISBACK(UpdateGUI);
+	right.WhenKillCursor = right.WhenEnterRow = THISBACK(OnRightCursor);
+	left.WhenBar = THISBACK(ToolLeft);
+	right.WhenBar = THISBACK(ToolRight);
+	add <<= THISBACK(OnAdd);
+	add_all <<= THISBACK(OnAddAll);
+	remove <<= THISBACK(OnRemove);
+	remove_all <<= THISBACK(OnRemoveAll);
+	Vert(false);
+}
+
+ArrayPair& ArrayPair::Vert(bool vert)
+{
+	is_vert = vert;
+	if(is_vert) {
+		add.SetImage(TCtrlImg::pair_down_arrow());
+		add_all.SetImage(TCtrlImg::pair_down_arrows());
+		remove.SetImage(TCtrlImg::pair_up_arrow());
+		remove_all.SetImage(TCtrlImg::pair_up_arrows());
+	}
+	else {
+		add.SetImage(TCtrlImg::pair_right_arrow());
+		add_all.SetImage(TCtrlImg::pair_right_arrows());
+		remove.SetImage(TCtrlImg::pair_left_arrow());
+		remove_all.SetImage(TCtrlImg::pair_left_arrows());
+	}
+
+	Layout();
+	return *this;
+}
+
+void ArrayPair::SetPos(int pos)
+{
+	pane_pos = pos;
+	Layout();
+}
+
+void ArrayPair::Layout()
+{
+	Size size = GetSize();
+	Size button = Ctrl::LayoutZoom(24, 24);
+	enum {
+		HGAP = 4,
+		VGAP = 4,
+		BGAP = 2 * VGAP,
+	};
+	if(is_vert) {
+		int tpart = iscale(size.cy, pane_pos, 10000);
+		left.SetRect(0, 0, size.cx, tpart - (button.cy >> 1) - HGAP);
+		right.SetRect(Rect(0, tpart + (button.cy >> 1) + HGAP, size.cx, size.cy));
+		int total_wd = 4 * button.cx + 2 * VGAP + BGAP;
+		Rect brc = RectC((size.cx - total_wd) >> 1, tpart - (button.cy >> 1), button.cx, button.cy);
+		add.SetRect(brc);
+		brc.OffsetHorz(button.cx + VGAP);
+		add_all.SetRect(brc);
+		brc.OffsetHorz(button.cx + BGAP);
+		remove.SetRect(brc);
+		brc.OffsetHorz(button.cx + VGAP);
+		remove_all.SetRect(brc);
+	}
+	else {
+		int tpart = iscale(size.cx, pane_pos, 10000);
+		left.SetRect(0, 0, tpart - (button.cx >> 1) - HGAP, size.cy);
+		int rl = tpart + (button.cx >> 1) + HGAP;
+		right.SetRect(rl, 0, size.cx - rl, size.cy);
+		int total_ht = 4 * button.cy + 2 * VGAP + BGAP;
+		Rect brc = RectC(tpart - (button.cx >> 1), (size.cy - total_ht) >> 1, button.cx, button.cy);
+		add.SetRect(brc);
+		brc.OffsetVert(button.cy + VGAP);
+		add_all.SetRect(brc);
+		brc.OffsetVert(button.cy + BGAP);
+		remove.SetRect(brc);
+		brc.OffsetVert(button.cy + VGAP);
+		remove_all.SetRect(brc);
+	}
+}
+
+void ArrayPair::SetData(const Value& value)
+{
+	ASSERT(key_index >= 0 && key_index < right.GetIndexCount());
+	if(!right.FindSetCursor(value, key_index))
+		right.KillCursor();
+}
+
+Value ArrayPair::GetData() const
+{
+	ASSERT(key_index >= 0 && key_index < right.GetIndexCount());
+	if(right.IsCursor())
+		return right.Get(key_index);
+	else
+		return Value();
+}
+
+void ArrayPair::SetKey(int i)
+{
+	key_index = i;
+}
+
+void ArrayPair::SetKey(Id id)
+{
+	key_index = left.GetPos(id);
+}
+
+void ArrayPair::SetSort(int i, const ArrayCtrl::Order& o)
+{
+	sort_index = i;
+	order = &o;
+}
+
+void ArrayPair::SetSort(int i)
+{
+	sort_index = i;
+	order = &std_order;
+	std_order.Set(i);
+}
+
+void ArrayPair::ToolLeft(Bar& bar)
+{
+	ToolAdd(bar);
+	ToolAddAll(bar);
+	left.StdBar(bar);
+}
+
+void ArrayPair::ToolAdd(Bar& bar)
+{
+	bar.Add(left.IsCursor(), "P�idat", THISBACK(OnAdd))
+		.Key(K_RIGHT)
+		.Help("P�idat aktu�ln� ��dek tabulky k vybran�m hodnot�m");
+}
+
+void ArrayPair::OnAdd()
+{
+	int lc = left.GetCursor();
+	if(lc < 0)
+		return;
+	Vector<Value> row = left.ReadRow(lc);
+	left.Remove(lc);
+	int rc = right.GetCursor() + 1;
+	Value key = row[key_index];
+	right.Insert(rc, row);
+	if(sort_index >= 0)
+		SortRight();
+	right.FindSetCursor(key, key_index);
+	if(left.GetCount() > 0)
+		left.SetCursor(lc < left.GetCount() ? lc : lc - 1);
+	else
+		right.SetWantFocus();
+	UpdateGUI();
+	UpdateAction();
+	WhenAdd();
+}
+
+void ArrayPair::ToolAddAll(Bar& bar)
+{
+	bar.Add(left.GetCount() > 0, "P�idat v�e", THISBACK(OnAddAll))
+		.Key(K_CTRL_RIGHT)
+		.Help("Vybrat v�echny ��dky tabulky");
+}
+
+void ArrayPair::OnAddAll()
+{
+	if(left.GetCount() == 0)
+		return;
+	int rc = right.GetCursor() + 1;
+	for(int i = 0; i < left.GetCount(); i++) {
+		right.Insert(rc + i, left.ReadRow(i));
+		right.SetCursor(rc + i);
+		WhenAdd();
+	}
+	if(sort_index >= 0)
+		SortRight();
+	left.Clear();
+	right.SetCursor(0);
+	right.SetWantFocus();
+	UpdateGUI();
+	UpdateAction();
+}
+
+void ArrayPair::ToolRight(Bar& bar)
+{
+	ToolRemove(bar);
+	ToolRemoveAll(bar);
+	right.StdBar(bar);
+}
+
+void ArrayPair::ToolRemove(Bar& bar)
+{
+	bar.Add(right.IsCursor(), "Odebrat", THISBACK(OnRemove))
+		.Key(K_LEFT)
+		.Help("Odebrat aktu�ln� ��dek tabulky z v�b�ru");
+}
+
+void ArrayPair::OnRemove()
+{
+	int rc = right.GetCursor();
+	if(rc < 0)
+		return;
+	Vector<Value> row = right.ReadRow(rc);
+	right.Remove(rc);
+	int lc = left.GetCursor() + 1;
+	Value key = row[key_index];
+	left.Insert(lc, row);
+	if(sort_index >= 0)
+		SortLeft();
+	left.FindSetCursor(key, key_index);
+	if(right.GetCount() > 0)
+		right.SetCursor(rc < right.GetCount() ? rc : rc - 1);
+	else
+		left.SetWantFocus();
+	UpdateGUI();
+	UpdateAction();
+}
+
+void ArrayPair::ToolRemoveAll(Bar& bar)
+{
+	bar.Add(right.GetCount() > 0, "Odebrat v�e", THISBACK(OnRemoveAll))
+		.Key(K_CTRL_LEFT)
+		.Help("Vypr�zdnit tabulku vybran�ch hodnot");
+}
+
+void ArrayPair::OnRemoveAll()
+{
+	if(right.GetCount() == 0)
+		return;
+	int lc = left.GetCursor() + 1;
+	for(int i = 0; i < right.GetCount(); i++)
+		left.Insert(lc + i, right.ReadRow(i));
+	if(sort_index >= 0)
+		SortLeft();
+	left.SetCursor(0);
+	right.Clear();
+	left.SetWantFocus();
+	UpdateGUI();
+	UpdateAction();
+}
+
+void ArrayPair::OnRightCursor()
+{
+	UpdateGUI();
+	Action();
+}
+
+void ArrayPair::SortLeft()
+{
+	left.Sort(*order);
+}
+
+void ArrayPair::SortRight()
+{
+	right.Sort(*order);
+}
+
+void ArrayPair::UpdateGUI()
+{
+	add.Enable(left.IsCursor());
+	add_all.Enable(left.GetCount() > 0);
+	remove.Enable(right.IsCursor());
+	remove_all.Enable(right.GetCount() > 0);
+}
+
+ValueArrayCtrl::ValueArrayCtrl()
+{
+	WhenArrayAction = THISBACK(OnArrayAction);
+	WhenAccept = true;
+}
+
+void ValueArrayCtrl::SetData(const Value& data)
+{
+	ValueArray rows = data;
+	SetCount(rows.GetCount());
+	for(int r = 0; r < GetCount(); r++) {
+		ValueArray cols = rows[r];
+		ASSERT(cols.GetCount() == GetIndexCount());
+		for(int c = 0; c < cols.GetCount(); c++)
+			Set(r, c, cols[c]);
+	}
+	WhenSetData();
+}
+
+Value ValueArrayCtrl::GetData() const
+{
+	ValueArray rows;
+	for(int r = 0; r < GetCount(); r++) {
+		ValueArray cols;
+		for(int c = 0; c < GetIndexCount(); c++)
+			cols.Add(Get(r, c));
+		rows.Add(cols);
+	}
+	return rows;
+}
+
+bool ValueArrayCtrl::Accept()
+{
+	return WhenAccept() && ArrayCtrl::Accept();
+}
+
+void ValueArrayCtrl::OnArrayAction()
+{
+	SetModify();
+}
+
+//////////////////////////////////////////////////////////////////////
+// Option3::
+
+/*
+Option3::Option3()
+: not_null(false), state(0)
+{
+}
+
+void Option3::Paint(Draw& w)
+{
+	Size sz = GetSize();
+	if(!IsTransparent())
+		w.DrawRect(0, 0, sz.cx, sz.cy, SLtGray);
+	static const Image indf[] = {
+		CtrlImg::option0(),  CtrlImg::option1(),
+		CtrlImg::option0d(), CtrlImg::option1d(),
+		CtrlImg::option0f(), CtrlImg::option1f(),
+	};
+	Image image;
+	if(!IsShowEnabled())
+		image = indf[state == 1 ? 3 : 2];
+	else if(push)
+		image = indf[state == 1 ? 5 : 4];
+	else
+		image = indf[state];
+
+
+	bool ds = !IsShowEnabled() || state == 2;
+	bool switchimage = false;
+	DrawLabel(w, false, HasFocus(), image, false, 1, ALIGN_LEFT);
+}
+
+Size Option3::GetMinSize() const
+{
+	return AddFrameSize(16,
+		max(CtrlImg::option0().GetSize().cy, ScreenInfo().GetFontInfo().GetHeight()) + 2);
+}
+
+void Option3::SetData(const Value& data)
+{
+	if(IsNull(data))
+		state = not_null ? 0 : 2;
+	else if(IsNumber(data))
+		state = (double)data ? 1 : 0;
+	else
+		NEVER();
+	Update();
+	RefreshPush();
+}
+
+Value Option3::GetData() const
+{
+	return state <= 1 ? state : int(Null);
+}
+
+void Option3::RefreshPush()
+{
+	Refresh(0, 0, CtrlImg::option0().GetSize().cx, GetSize().cy);
+}
+
+void Option3::RefreshFocus()
+{
+	Refresh();
+}
+
+void Option3::PerformAction()
+{
+	state = (state == 2 || state == 1 && not_null ? 0 : state + 1);
+	UpdateAction();
+	RefreshPush();
+}
+*/
+
+bool ShowErrorFocus(bool cond, const char *text, Ctrl& focus)
+{
+	if(!cond)
+		return false;
+	Exclamation(text);
+	focus.SetFocus();
+	return true;
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/TCtrlLib/util.h b/uppsrc/TCtrlLib/util.h
new file mode 100644
index 000000000..47c8155ac
--- /dev/null
+++ b/uppsrc/TCtrlLib/util.h
@@ -0,0 +1,539 @@
+NAMESPACE_UPP
+
+#define TOOL(x) \
+	void        COMBINE(Tool, x)(Bar& bar); \
+	void        COMBINE(On, x)(); \
+	static void COMBINE(Help, x)();
+
+#define TOOL_LOCAL(x) \
+	void        COMBINE(Tool, x)(Bar& bar, bool local); \
+	void        COMBINE(On, x)(); \
+	static void COMBINE(Help, x)();
+
+class Pump
+{
+public:
+	struct Item
+	{
+		virtual ~Item() {}
+		virtual void Run(bool write) = 0;
+	};
+
+	Pump()                                          {}
+
+	void         Run(bool write)                    { for(int i = 0; i < items.GetCount(); i++) items[i].Run(write); }
+
+	void         Read()                             { Run(false); }
+	void         Write()                            { Run(true); }
+
+	bool         IsEmpty() const                    { return items.IsEmpty(); }
+
+	Pump&        Add(Item *item)                    { items.Add(item); return *this; }
+
+	Pump&        operator << (One<Item> item)       { Add(-item); return *this; }
+	Pump&        operator << (Item *item)           { Add(item); return *this; }
+	void         operator << (bool write)           { Run(write); }
+
+	void         Clear()                            { items.Clear(); }
+
+public:
+	Array<Item> items;
+};
+
+inline Pump WithPump() { return Pump(); }
+
+template <class A, class B>
+struct PumpItemSet : public Pump::Item
+{
+	PumpItemSet(A& a, B& b) : a(a), b(b) {}
+	virtual void Run(bool write) { if(write) a = b; else b = a; }
+	A& a; B& b;
+};
+
+template <class A, class B>
+inline One<Pump::Item> PumpSet(A& a, B& b) { return new PumpItemSet<A, B>(a, b); }
+
+template <class A, class B>
+struct PumpItemData : public Pump::Item
+{
+	PumpItemData(A& a, B& b) : a(a), b(b) {}
+	virtual void Run(bool write) { if(write) a = ~b; else b <<= a; }
+	A& a; B& b;
+};
+
+template <class A, class B>
+inline One<Pump::Item> PumpData(A& a, B& b) { return new PumpItemData<A, B>(a, b); }
+
+template <class B>
+struct PumpItemDataRef : public Pump::Item
+{
+	PumpItemDataRef(Ref ref, B& b) : ref(ref), b(b) {}
+	virtual void Run(bool write) { if(write) ref.SetValue(~b); else b <<= Value(ref); }
+	Ref ref; B& b;
+};
+
+template <class B>
+inline One<Pump::Item> PumpDataRef(Ref ref, B& b) { return new PumpItemDataRef<B>(ref, b); }
+
+template <class A, class B>
+struct PumpItemEnumData : public Pump::Item
+{
+	PumpItemEnumData(A& a, B& b) : a(a), b(b) {}
+	virtual void Run(bool write) { if(write) a = A(int(~b)); else b <<= (int)a; }
+	A& a; B& b;
+};
+
+template <class A, class B>
+inline One<Pump::Item> PumpEnumData(A& a, B& b) { return new PumpItemEnumData<A, B>(a, b); }
+
+template <class A>
+struct PumpItemArray : public Pump::Item
+{
+	PumpItemArray(A& a, ArrayCtrl& array, int row, int column) : a(a), array(array), row(row), column(column) {}
+	virtual void Run(bool write)
+	{
+		if(write) { a = array.Get(row, column); }
+		else      { array.Set(row, column, a); }
+	}
+
+	A&         a;
+	ArrayCtrl& array;
+	int        row;
+	int        column;
+};
+
+template <class A, class B>
+struct PumpItemScaledData : public Pump::Item
+{
+	PumpItemScaledData(A& a, B& b, double scale) : a(a), b(b), scale(scale) {}
+	virtual void Run(bool write)
+	{
+		if(write) { double d = ~b; a   = (IsNull(d) ? d : d * scale); }
+		else      { b <<= (IsNull(a) ? double(Null) : (double)a / scale); }
+	}
+
+	A& a;
+	B& b;
+	double scale;
+};
+
+template <class A, class B>
+struct PumpItemIntScaledData : public Pump::Item
+{
+	PumpItemIntScaledData(A& a, B& b, double scale) : a(a), b(b), scale(scale) {}
+	virtual void Run(bool write)
+	{
+		if(write) { double d = ~b; a   = (IsNull(d) ? (int)Null : fround(d * scale)); }
+		else      { b <<= (IsNull(a) ? double(Null) : (double)a / scale); }
+	}
+
+	A& a;
+	B& b;
+	double scale;
+};
+
+template <class A, class B>
+One<Pump::Item> PumpScaledData(A& a, B& b, double scale) { return new PumpItemScaledData<A, B>(a, b, scale); }
+
+template <class A, class B>
+One<Pump::Item> PumpAngleData(A& a, B& b) { return PumpScaledData<A, B>(a, b, M_PI / 180.0); }
+
+template <class A, class B>
+One<Pump::Item> PumpIntScaledData(A& a, B& b, double scale) { return new PumpItemIntScaledData<A, B>(a, b, scale); }
+
+template <class A, class B>
+One<Pump::Item> PumpIntAngleData(A& a, B& b) { return PumpIntScaledData<A, B>(a, b, M_PI / 180.0); }
+
+template <class A>
+inline One<Pump::Item> PumpArray(A& a, ArrayCtrl& array, int row, int column)
+{ return new PumpItemArray<A>(a, array, row, column); }
+
+template <class A>
+inline One<Pump::Item> PumpArray(A& a, ArrayCtrl& array, int row, Id column)
+{ return new PumpItemArray<A>(a, array, row, array.GetPos(column)); }
+
+template <class A, class C>
+struct PumpItemArrayCast : public Pump::Item
+{
+	PumpItemArrayCast(A& a, ArrayCtrl& array, int row, int column) : a(a), array(array), row(row), column(column) {}
+
+	virtual void Run(bool write)
+	{
+		if(write) { a = A(C(array.Get(row, column))); }
+		else      { array.Set(row, column, (C)a); }
+	}
+
+	A&         a;
+	ArrayCtrl& array;
+	int        row;
+	int        column;
+};
+
+template <class C, class A>
+inline One<Pump::Item> PumpArrayCast(A& a, ArrayCtrl& array, int row, int column)
+{ return new PumpItemArrayCast<A, C>(a, array, row, column); }
+
+template <class C, class A>
+inline One<Pump::Item> PumpArrayCast(A& a, ArrayCtrl& array, int row, Id column)
+{ return new PumpItemArrayCast<A, C>(a, array, row, array.GetPos(column)); }
+
+struct PumpItemArrayRef : public Pump::Item
+{
+	PumpItemArrayRef(Ref ref, ArrayCtrl& array, int row, int column)
+		: ref(ref), array(array), row(row), column(column) {}
+
+	virtual void Run(bool write)
+	{
+		if(write) { ref.SetValue(array.Get(row, column)); }
+		else      { array.Set(row, column, Value(ref)); }
+	}
+
+	Ref        ref;
+	ArrayCtrl& array;
+	int        row;
+	int        column;
+};
+
+inline One<Pump::Item> PumpArrayRef(Ref ref, ArrayCtrl& array, int row, int column)
+{ return new PumpItemArrayRef(ref, array, row, column); }
+
+inline One<Pump::Item> PumpArrayRef(Ref ref, ArrayCtrl& array, int row, Id column)
+{ return new PumpItemArrayRef(ref, array, row, array.GetPos(column)); }
+
+bool   IsUnique(const ArrayCtrl& table, int column);
+bool   IsUnique(const ArrayCtrl& table, Id column);
+int    SwapRows(ArrayCtrl& table, int row1, int row2);
+void   SetColumn(ArrayCtrl& table, int index, const Value& value);
+void   SetColumn(ArrayCtrl& table, Id column, const Value& value);
+
+BorderFrame& TopJoinFrame();
+BorderFrame& BottomJoinFrame();
+
+class TabPageCtrl : public StaticRect {
+public:
+	TabPageCtrl() { Transparent(); Color(Null); /*Blend(SColorFace(), SColorPaper()));*/ }
+};
+
+class DropListAll : public DropList
+{
+public:
+	DropListAll() { DisplayAll(); }
+};
+
+class DropButton : public FrameRight<Button>
+{
+public:
+	DropButton();
+	virtual bool HotKey(dword key);
+
+public:
+	Gate1<dword> WhenHotKey;
+};
+
+class ChoiceList : public PopUpTable
+{
+public:
+	typedef ChoiceList CLASSNAME;
+
+	ChoiceList();
+
+	ChoiceList& Attach(Ctrl& owner);
+	void        Detach();
+
+	ChoiceList& operator >> (Ctrl& owner) { return Attach(owner); }
+
+	void        OnDrop();
+	void        OnToggle();
+	void        OnSelect();
+	void        OnCancel();
+
+	ChoiceList& DropWidth(int _wd)    { dropbutton.Width(_wd); return *this; }
+	ChoiceList& DropShow(bool ds)     { dropbutton.Show(ds); return *this; }
+	ChoiceList& DataItem(int _item)   { item = _item; return *this; }
+	ChoiceList& DataItem(Id _col_id)  { item = GetPos(_col_id); return *this; }
+	int         GetDataItem() const   { return item; }
+
+	bool        OnKey(dword key);
+
+public:
+	Callback    WhenDrop;
+
+protected:
+	void        Initialize();
+
+protected:
+	DropButton  dropbutton;
+	Ctrl       *owner;
+	int         item;
+};
+
+class ExtendedButton : public FrameRight<Button>
+{
+public:
+	ExtendedButton();
+	virtual bool HotKey(dword key);
+};
+
+class ExtendedFileButton : public FrameRight<Button>
+{
+public:
+	ExtendedFileButton();
+	virtual bool HotKey(dword key);
+};
+
+class MenuButton : public ExtendedButton
+{
+public:
+	MenuButton();
+
+	Callback1<Bar&> WhenBar;
+
+private:
+	void            OnMenu();
+};
+
+//////////////////////////////////////////////////////////////////////
+// DragDropCtrl::
+
+class DragDropCtrl : public Ctrl
+{
+public:
+	DragDropCtrl();
+	virtual ~DragDropCtrl();
+
+	// drag & drop interface
+	virtual bool Push(Point pt, dword keyflags);
+	virtual void Drag(Point pt, Point last, Point next, dword keyflags);
+	virtual void Drop(Point pt, Point end, dword keyflags);
+	virtual void Click(Point pt, dword keyflags);
+	virtual void Cancel();
+
+	virtual void DragRect(const Rect& last, const Rect& next, dword keyflags);
+	virtual void DropRect(const Rect& rc, dword keyflags);
+
+	void         DragShow(bool _show = true);
+	void         DragHide()                    { DragShow(false); }
+	void         DragStop(bool accept, dword keyflags);
+	void         DragStop(bool accept = false) { DragStop(accept, last_key); }
+
+	bool         IsDragging() const            { return state == ON || state == HIDDEN; }
+	bool         IsPushed() const              { return state != OFF; }
+
+	// control overrides
+	virtual void LeftDown(Point pt, dword keyflags);
+	virtual void LeftDouble(Point pt, dword keyflags);
+	virtual void LeftUp(Point pt, dword keyflags);
+	virtual void RightDown(Point pt, dword keyflags);
+	virtual void RightDouble(Point pt, dword keyflags);
+	virtual void RightUp(Point pt, dword keyflags);
+	virtual void MouseMove(Point pt, dword keyflags);
+	virtual bool Key(dword key, int repcnt);
+
+private:
+	Point        start, last;
+	dword        last_key;
+	char         state;
+	enum { OFF, ON, POSSIBLE, HIDDEN };
+};
+
+class StdArrayOrder : public ArrayCtrl::Order
+{
+public:
+	StdArrayOrder() {}
+	StdArrayOrder(int i, bool d = false, dword l = 0)    { Add(i, d, l); }
+
+	void         Clear()                                 { index.Clear(); desc.Clear(); lang.Clear(); }
+	void         Add(int i, bool d = false, dword l = 0) { index.Add(i); desc.Add(d); lang.Add(l); }
+	void         Set(int i, bool d = false, dword l = 0) { Clear(); Add(i, d, l); }
+
+	virtual bool operator () (const Vector<Value>& row1, const Vector<Value>& row2) const;
+
+private:
+	Vector<int>   index;
+	Vector<bool>  desc;
+	Vector<dword> lang;
+};
+
+class ArrayPair : public Ctrl
+{
+public:
+	typedef ArrayPair CLASSNAME;
+	ArrayPair();
+
+	ArrayPair&              RowName(const char *s)                  { left.RowName(s); right.RowName(s); return *this; }
+	ArrayPair&              AppendLine(bool b = true)               { left.AppendLine(b); right.AppendLine(b); return *this; }
+	ArrayPair&              NoAppendLine()                          { return AppendLine(false); }
+	ArrayPair&              Inserting(bool b = true)                { left.Inserting(b); right.Inserting(b); return AppendLine(b); }
+	ArrayPair&              NoInserting()                           { return Inserting(false); }
+	ArrayPair&              Removing(bool b = true)                 { left.Removing(b); right.Removing(b); return *this; }
+	ArrayPair&              NoRemoving()                            { return Removing(false); }
+	ArrayPair&              Appending(bool b = true)                { left.Appending(b); right.Appending(b); return *this; }
+	ArrayPair&              BeforeAfterInserting(int q = 1)         { left.BeforeAfterInserting(q); right.BeforeAfterInserting(q); return *this; }
+	ArrayPair&              AfterBeforeInserting(int q = 2)         { left.AfterBeforeInserting(q); right.AfterBeforeInserting(q); return *this; }
+	ArrayPair&              Duplicating(bool b = true)              { left.Duplicating(b); right.Duplicating(b); return *this; }
+	ArrayPair&              NoInsertAppend(bool b = true)           { left.NoInsertAppend(b); right.NoInsertAppend(b); return *this; }
+	ArrayPair&              Moving(bool b = true)                   { left.Moving(b); right.Moving(b); return *this; }
+	ArrayPair&              NoDuplicating()                         { return Duplicating(false); }
+	ArrayPair&              AskRemove(bool b = true)                { left.AskRemove(b); right.AskRemove(b); return *this; }
+	ArrayPair&              NoAskRemove()                           { return AskRemove(false); }
+
+	ArrayPair&              Header(bool b = true)                   { left.Header(b); right.Header(b); return *this; }
+	ArrayPair&              NoHeader()                              { return Header(false); }
+	ArrayPair&              Track(bool b = true)                    { left.Track(b); right.Track(b); return *this; }
+	ArrayPair&              NoTrack()                               { return Track(false); }
+	ArrayPair&              VertGrid(bool b = true)                 { left.VertGrid(b); right.VertGrid(b); return *this; }
+	ArrayPair&              NoVertGrid()                            { return VertGrid(false); }
+	ArrayPair&              HorzGrid(bool b = true)                 { left.HorzGrid(b); right.HorzGrid(b); return *this; }
+	ArrayPair&              NoHorzGrid()                            { return HorzGrid(false); }
+	ArrayPair&              Grid(bool b = true)                     { return VertGrid(b).HorzGrid(b); }
+	ArrayPair&              NoGrid()                                { return Grid(false); }
+	ArrayPair&              GridColor(Color c)                      { left.GridColor(c); right.GridColor(c); return *this; }
+	ArrayPair&              NoCursor(bool b = true)                 { left.NoCursor(b); right.NoCursor(b); return *this; }
+	ArrayPair&              MouseMoveCursor(bool b = true)          { left.MouseMoveCursor(b); right.MouseMoveCursor(b); return *this; }
+	ArrayPair&              NoMouseMoveCursor()                     { return MouseMoveCursor(false); }
+	ArrayPair&              AutoHideSb(bool b = true)               { left.AutoHideSb(b); right.AutoHideSb(); return *this; }
+	ArrayPair&              NoAutoHideSb()                          { return AutoHideSb(false); }
+	ArrayPair&              MultiSelect(bool b = true)              { left.MultiSelect(b); right.MultiSelect(b); return *this; }
+
+	ArrayPair&              Vert(bool vert = true);
+	ArrayPair&              Horz()                                  { return Vert(false); }
+	bool                    IsVert() const                          { return is_vert; }
+
+	void                    SetPos(int pos);
+	void                    HalfPos()                               { SetPos(5000); }
+	int                     GetPos() const                          { return pane_pos; }
+
+	virtual void            Layout();
+
+	virtual void            SetData(const Value& value);
+	virtual Value           GetData() const;
+
+	void                    SetKey(int i);
+	void                    SetKey(Id id);
+	int                     GetKey() const { return key_index; }
+
+	void                    SetSort(int i, const ArrayCtrl::Order& order);
+	void                    SetSort(Id id, const ArrayCtrl::Order& order) { SetSort(left.GetPos(id), order); }
+	void                    SetSort(int i);
+	void                    SetSort(Id id)                                { SetSort(left.GetPos(id)); }
+	void                    NoSort()                                      { SetSort(-1, std_order); }
+
+	void                    UpdateGUI();
+
+	TOOL(Left)
+		TOOL(Add)
+		TOOL(AddAll)
+
+	TOOL(Right)
+		TOOL(Remove)
+		TOOL(RemoveAll)
+
+public:
+	Callback                WhenAdd;
+	ArrayCtrl               left, right;
+
+private:
+	void                    OnRightCursor();
+	void                    SortLeft();
+	void                    SortRight();
+
+private:
+	Button                  add, add_all, remove, remove_all;
+	int                     key_index;
+	int                     sort_index;
+	int                     pane_pos;
+	bool                    is_vert;
+	const ArrayCtrl::Order *order;
+	StdArrayOrder           std_order;
+};
+
+template <class T>
+Vector<T> GetArrayColumn(const ArrayCtrl& array, int column)
+{
+	Vector<T> out;
+	out.SetCount(array.GetCount());
+	for(int i = 0; i < out.GetCount(); i++)
+		out[i] = array.Get(i, column);
+	return out;
+}
+
+template <class T>
+Vector<T> GetKeyVector(const ArrayPair& pair)
+{
+	ASSERT(pair.GetKey() >= 0);
+	return GetArrayColumn<T>(pair.right, pair.GetKey());
+}
+
+template <class C>
+void SetKeyContainer(ArrayPair& pair, const C& container)
+{
+	typedef typename C::ConstIterator CI;
+	int k = pair.GetKey();
+	ASSERT(k >= 0);
+	for(CI b = container.Begin(), e = container.End(); b != e; ++b)
+		if(pair.left.FindSetCursor(*b, k))
+			pair.OnAdd();
+	if(pair.left.GetCount() > 0)
+		pair.left.SetCursor(0);
+	if(pair.right.GetCount() > 0)
+		pair.right.SetCursor(0);
+}
+
+class ValueArrayCtrl : public ArrayCtrl
+{
+public:
+	typedef ValueArrayCtrl CLASSNAME;
+	ValueArrayCtrl();
+
+	virtual void    SetData(const Value& data);
+	virtual Value   GetData() const;
+	virtual bool    Accept();
+
+public:
+	Callback        WhenSetData;
+	Gate            WhenAccept;
+
+private:
+	void            OnArrayAction();
+};
+
+//////////////////////////////////////////////////////////////////////
+// Option3::
+
+/*
+class Option3 : public Pusher
+{
+public:
+	Option3();
+
+	operator       bool() const           { return state == 1; }
+	void           operator = (bool b)    { state = b ? 1 : 0; }
+
+	Option3&       NotNull(bool nn)       { not_null = nn; return *this; }
+	Option3&       NoNotNull()            { return NotNull(false); }
+
+	virtual void   Paint(Draw& draw);
+	virtual Size   GetMinSize() const;
+	virtual void   SetData(const Value& data);
+	virtual Value  GetData() const; // Null = indeterminate
+
+protected:
+	virtual void   RefreshPush();
+	virtual void   RefreshFocus();
+	virtual void   PerformAction();
+
+protected:
+	char           state; // 2 = indeterminate
+	bool           not_null;
+};
+*/
+
+#ifdef PLATFORM_WIN32
+void           DropFilesRegister(HWND hwnd);
+Point          DropFilesGetPos(WPARAM hdrop);
+Vector<String> DropFilesGetList(WPARAM hdrop);
+#endif
+
+bool ShowErrorFocus(bool cond, const char *text, Ctrl& focus);
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/TDraw/AUTHORS b/uppsrc/TDraw/AUTHORS
new file mode 100644
index 000000000..f782e5b62
--- /dev/null
+++ b/uppsrc/TDraw/AUTHORS
@@ -0,0 +1,2 @@
+Mirek Fidler <cxl@ntllib.org>
+Tomas Rylek  <rylek@volny.cz>
\ No newline at end of file
diff --git a/uppsrc/TDraw/COPYING b/uppsrc/TDraw/COPYING
new file mode 100644
index 000000000..33aa39102
--- /dev/null
+++ b/uppsrc/TDraw/COPYING
@@ -0,0 +1,30 @@
+Copyright (C) 2005 Mirek Fidler, Tomas Rylek and various contributors (see AUTHORS)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to
+deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies of the Software and its Copyright notices. In addition publicly
+documented acknowledgment must be given that this software has been used if no
+source code of this software is made available publicly. This includes
+acknowledgments in either Copyright notices, Manuals, Publicity and Marketing
+documents or any documentation provided with any product containing this
+software. This License does not apply to any software that links to the
+libraries provided by this software (statically or dynamically), but only to
+the software provided.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+-----------
+
+Please see the COPYING.PLAIN for a plain-english explanation of this notice
+and it's intent.
diff --git a/uppsrc/TDraw/COPYING-PLAIN b/uppsrc/TDraw/COPYING-PLAIN
new file mode 100644
index 000000000..770a8132f
--- /dev/null
+++ b/uppsrc/TDraw/COPYING-PLAIN
@@ -0,0 +1,33 @@
+Plain English Copyright Notice
+
+This file is not intended to be the actual License. The reason this file
+exists is that we here are programmers and engineers. We aren't lawyers. We
+provide licenses that we THINK say the right things, but we have our own
+intentions at heart. This is a plain-english explanation of what those
+intentions are, and if you follow them you will be within the "spirit" of
+the license.
+
+The intent is for us to enjoy writing software that is useful to us (the
+AUTHORS) and allow others to use it freely and also benefit from the work we
+put into making it. We don't want to restrict others using it. They should
+not *HAVE* to make the source code of the applications they write that
+simply link to these libraries (be that statically or dynamically), or for
+them to be limited as to what license they choose to use (be it open, closed
+or anything else). But we would like to know you are using these libraries.
+We simply would like to know that it has been useful to someone. This is why
+we ask for acknowledgement of some sort.
+
+You can do what you want with the source of this software - it doesn't
+matter. We still have it here for ourselves and it is open and free to use
+and download and play with. It can't be taken away. We don't really mind what
+you do with the source to your software. We would simply like to know that
+you are using it - especially if it makes it to a commerical product. If you
+simply e-mail all the AUTHORS (see COPYING and AUTHORS files) telling us, and
+then make sure you include a paragraph or page in the manual or in the "About.."
+box for the product with the copyright notice and state that you used this
+software, we will be very happy. If you want to contribute back modifications
+and fixes you may have made we will welcome those too with open arms (generally).
+If you want help with changes needed, ports needed or features to be added,
+arrangements can be easily made with some dialogue.
+
+Mirek Fidler <cxl@ntllib.org>
diff --git a/uppsrc/TDraw/TDraw.h b/uppsrc/TDraw/TDraw.h
new file mode 100644
index 000000000..f30e24e5f
--- /dev/null
+++ b/uppsrc/TDraw/TDraw.h
@@ -0,0 +1,10 @@
+#ifndef __TDraw__
+#define __TDraw__
+
+#include <Draw/Draw.h>
+#include <Geom/Geom.h>
+#include <Web/Web.h>
+
+#include "util.h"
+
+#endif//__TDraw__
diff --git a/uppsrc/TDraw/TDraw.upp b/uppsrc/TDraw/TDraw.upp
new file mode 100644
index 000000000..1467ced3f
--- /dev/null
+++ b/uppsrc/TDraw/TDraw.upp
@@ -0,0 +1,20 @@
+description "Experimental (sometimes obsolete) painting code";
+
+uses
+	Draw,
+	Geom,
+	TCore,
+	PdfDraw;
+
+library(WIN32) comdlg32;
+
+file
+	TDraw.h,
+	util.h,
+	util.cpp,
+	formula.h,
+	formula.cpp,
+	Info readonly separator,
+	COPYING,
+	COPYING-PLAIN,
+	AUTHORS;
diff --git a/uppsrc/TDraw/formula.cpp b/uppsrc/TDraw/formula.cpp
new file mode 100644
index 000000000..05d77d686
--- /dev/null
+++ b/uppsrc/TDraw/formula.cpp
@@ -0,0 +1,1409 @@
+#include <TDraw/TDraw.h>
+#pragma hdrstop
+
+#include "formula.h"
+
+NAMESPACE_UPP
+
+#define LLOG(x)  // RLOG(x)
+#define LDUMP(x) // RDUMP(x)
+
+#ifdef _DEBUG
+	#define SHOW_BOXES 0 // 1 = on, 0 = off
+#else
+	#define SHOW_BOXES 0
+#endif
+
+static Point Bezier(Point A, Point B, Point C, double t)
+{
+	double s = 1 - t;
+	return Point(
+		fround(A.x * s * s + B.x * 2 * t * s + C.x * t * t),
+		fround(A.y * s * s + B.y * 2 * t * s + C.y * t * t));
+}
+
+static void Bezier(Vector<Point>& out, Point A, Point B, Point C, int n)
+{
+	if(out.IsEmpty() || out.Top() != A)
+		out.Add(A);
+	for(int i = 0; i <= n; i++)
+		out.Add(Bezier(A, B, C, i / double(n)));
+	if(out.Top() != C)
+		out.Add(C);
+}
+
+static void Bezier(Vector<Point>& out, const Vector<Point>& in, int n)
+{
+	for(int i = 2; i < in.GetCount(); i += 2)
+		Bezier(out, in[i - 2], in[i - 1], in[i - 0], n);
+}
+
+static void Rectangle(Vector<Point>& out, Rect rc)
+{
+	out << rc.TopLeft() << rc.TopRight() << rc.BottomRight() << rc.BottomLeft();
+}
+
+static void BezierEllipse(Vector<Point>& out, Point C, Size radius, int n)
+{
+	Vector<Point> temp;
+	temp
+		<< Point(C.x + radius.cx, C.y)
+			<< Point(C.x + radius.cx, C.y + radius.cy)
+		<< Point(C.x, C.y + radius.cy)
+			<< Point(C.x - radius.cx, C.y + radius.cy)
+		<< Point(C.x - radius.cx, C.y)
+			<< Point(C.x - radius.cx, C.y - radius.cy)
+		<< Point(C.x, C.y - radius.cy)
+			<< Point(C.x + radius.cx, C.y - radius.cy)
+		<< Point(C.x + radius.cx, C.y);
+	Bezier(out, temp, n);
+}
+
+int SymbolWidth(FORMSYMBOL symbol, int height, int textheight)
+{
+	int wd = max(Percent(20, textheight), 4);
+	int lw = Formula::GetLineWidth(textheight);
+	switch(symbol)
+	{
+	default:        NEVER();
+	case FS_EMPTY:        return 0;
+	case FS_LBRACE:
+	case FS_RBRACE:
+	case FS_LSHARP:
+	case FS_RSHARP:       wd = textheight / 4; break;
+	case FS_LPAREN:
+	case FS_RPAREN:
+	case FS_LBRACKET:
+	case FS_RBRACKET:
+	case FS_LTBRACKET:
+	case FS_RTBRACKET:
+	case FS_LBBRACKET:
+	case FS_RBBRACKET:    break;
+	case FS_VBAR:         wd = textheight / 6; break;
+	case FS_SUM:
+	case FS_PRODUCT:
+	case FS_UNION:
+	case FS_INTERSECTION: wd = (height * 10) >> 4; break;
+	case FS_INT:          wd = lw + height / 8 + 1 * (textheight / 4); break;
+	case FS_IINT:         wd = lw + height / 8 + 2 * (textheight / 4); break;
+	case FS_IIINT:        wd = lw + height / 8 + 3 * (textheight / 4); break;
+	case FS_OINT:         wd = lw + height / 8 + 2 * (textheight / 4); break;
+	case FS_OIINT:        wd = lw + height / 8 + 3 * (textheight / 4); break;
+	case FS_LOG_NOT:      wd = Percent(40, textheight); break;
+	case FS_LOG_OR:       wd = Percent(60, textheight); break;
+	case FS_MEMBER: case FS_NOT_MEMBER:
+	case FS_SUBSET: case FS_NOT_SUBSET:
+	case FS_PROPER_SUBSET: case FS_NOT_PROPER_SUBSET:
+		wd = Percent(60, textheight);
+		break;
+	}
+	return wd;
+}
+
+void PaintSymbol(Draw& draw, FORMSYMBOL symbol, const Rect& rc, int textheight, Color color)
+{
+//	draw.DrawRect(rc, LtMagenta);
+	int wd = rc.Width(), ht = rc.Height();
+	int thick = Formula::GetLineWidth(textheight);
+	int half = thick >> 1;
+	Vector<Point> polygon;
+	Vector<int> counts;
+
+	bool xmirror = false;
+
+	if(symbol > FS_BRACKET_BEGIN && symbol < FS_BRACKET_END) {
+		xmirror = (symbol == FS_RBRACKET || symbol == FS_RTBRACKET || symbol == FS_RBBRACKET);
+		bool top = (symbol != FS_LBBRACKET && symbol != FS_RBBRACKET);
+		bool bot = (symbol != FS_LTBRACKET && symbol != FS_RTBRACKET);
+		polygon
+			<< Point(0, 0)
+			<< Point(0, ht);
+		if(bot)
+			polygon
+				<< Point(wd, ht)
+				<< Point(wd, ht - half)
+				<< Point(thick, ht - half);
+		else
+			polygon
+				<< Point(thick, ht);
+		if(top)
+			polygon
+				<< Point(thick, half)
+				<< Point(wd, half)
+				<< Point(wd, 0);
+		else
+			polygon
+				<< Point(thick, 0);
+	}
+	else if(symbol == FS_LPAREN || symbol == FS_RPAREN || symbol == FS_LBRACE || symbol == FS_RBRACE) {
+		bool bra = (symbol == FS_LBRACE || symbol == FS_RBRACE);
+		xmirror = (symbol == FS_RPAREN || symbol == FS_RBRACE);
+		int xo, xv, xs;
+		int yo, yv, yw, yi, yj, ys;
+		xo = wd;
+		xs = xv = thick;
+		yo = 0;
+		yi = yj = ys = ht >> 1;
+		if(bra) {
+			xv = (xv + xo) >> 1;
+			yi = max(ht >> 2, ys - textheight / 5);
+			yj = (yi + ys) >> 1;
+		}
+		yw = min(textheight / 3, yi);
+		yv = yw >> 1;
+		enum { PREC = 6 };
+		Bezier(polygon, Point(xo, yo), Point(xv, yv), Point(xv, yw), PREC);
+		if(bra) {
+			Bezier(polygon, Point(xv, yi), Point(xv, yj), Point(xs, ys), PREC);
+			Bezier(polygon, Point(xs, ht - ys), Point(xv, ht - yj), Point(xv, ht - yi), PREC);
+		}
+		Bezier(polygon, Point(xv, ht - yw), Point(xv, ht - yv), Point(xo, ht - yo), PREC);
+		xo -= half;
+		xv -= thick;
+		xs -= thick;
+		Bezier(polygon, Point(xo, ht - yo), Point(xv, ht - yv), Point(xv, ht - yw), PREC);
+		if(bra) {
+			Bezier(polygon, Point(xv, ht - yi), Point(xv, ht - yj), Point(xs, ht - ys), PREC);
+			Bezier(polygon, Point(xs, ys), Point(xv, yj), Point(xv, yi), PREC);
+		}
+		Bezier(polygon, Point(xv, yw), Point(xv, yv), Point(xo, yo), PREC);
+	}
+	else if(symbol == FS_LSHARP || symbol == FS_RSHARP) {
+	}
+	else if(symbol == FS_VBAR) {
+		int lw = Formula::GetLineWidth(textheight);
+		draw.DrawRect((rc.left + rc.right - lw) >> 1, rc.top, lw, rc.Height(), color);
+		return;
+	}
+	else if(symbol == FS_SUM) {
+		int tt = (thick * 20) >> 4;
+		int cx = (wd * 8) >> 4;
+		int hh = ht >> 1;
+		int dx = tt + iscale(thick, cx, hh);
+		polygon
+			<< Point(wd, 0) << Point(0, 0)
+				<< Point(cx, hh)
+			<< Point(0, ht) << Point(wd, ht)
+			<< Point(wd, ht - thick) << Point(dx, ht - thick)
+				<< Point(cx + tt, hh)
+			<< Point(dx, thick) << Point(wd, thick);
+	}
+	else if(symbol == FS_PRODUCT) {
+	}
+	else if(symbol == FS_UNION) {
+	}
+	else if(symbol == FS_INTERSECTION) {
+	}
+	else if(symbol > FS_INT_BEGIN && symbol < FS_INT_END) {
+		int count = (symbol == FS_IIINT ? 3 : symbol == FS_IINT || symbol == FS_OIINT ? 2 : 1);
+		int lw = thick;
+		int rcap = min(textheight / 12, (wd - lw) / (2 * count)), dcap = 2 * rcap, vcap = rcap;
+		int capdist = (dcap * 25) >> 4;
+		int dcl = dcap - lw, rcl = dcl >> 1;
+		int slant = wd - capdist * (count - 1);
+		int comp = dcap - iscale(rcap, slant - 2 * dcap + lw, ht - 2 * rcap);
+		for(int i = 0; i < count; i++) {
+			int x = i * capdist;
+			int n = polygon.GetCount();
+			BezierEllipse(polygon, Point(x + rcap, ht - rcap), Size(rcap, vcap), 4);
+			counts.Add(polygon.GetCount() - n);
+			n = polygon.GetCount();
+			BezierEllipse(polygon, Point(x + slant - rcap, rcap), Size(rcap, vcap), 4);
+			counts.Add(polygon.GetCount() - n);
+			n = polygon.GetCount();
+			polygon << Point(x + slant - dcap, rcap) << Point(x + slant - dcl, rcap)
+				<< Point(x + dcap, ht - rcap) << Point(x + dcl, ht - rcap);
+			counts.Add(polygon.GetCount() - n);
+		}
+		if(symbol == FS_OINT || symbol == FS_OIINT) {
+			int n = polygon.GetCount();
+			int rad = min(wd >> 1, count * textheight / 4);
+			BezierEllipse(polygon, Point(wd >> 1, ht >> 1), Size(rad, rad), 8);
+			BezierEllipse(polygon, Point(wd >> 1, ht >> 1), Size(rad - lw, -rad + lw), 8);
+			counts.Add(polygon.GetCount() - n);
+		}
+	}
+	else if(symbol == FS_LOG_NOT) {
+		polygon << Point(0, 0) << Point(wd, 0) << Point(wd, ht)
+		<< Point(wd - thick, ht) << Point(wd - thick, thick) << Point(0, thick);
+	}
+	else if(symbol == FS_LOG_OR) {
+		int top = Percent(30, ht);
+		int bot = Percent(80, ht);
+		int wd2 = wd >> 1;
+		polygon << Point(0, top) << Point(wd2, bot) << Point(wd, top)
+		<< Point(wd - thick, top) << Point(wd2, bot - thick - iscale(thick, bot - top, wd2)) << Point(thick, top);
+	}
+	else if(symbol > FS_SETOP_BEGIN && symbol < FS_SETOP_END) {
+		int ht2 = ht >> 1, ht4 = Percent(30, ht), wd2 = wd >> 1;
+		polygon << Point(wd, ht2 - ht4);
+		Bezier(polygon, Point(wd2, ht2 - ht4), Point(0, ht2 - ht4), Point(0, ht2), 8);
+		Bezier(polygon, Point(0, ht2), Point(0, ht2 + ht4), Point(wd2, ht2 + ht4), 8);
+		polygon << Point(wd, ht2 + ht4) << Point(wd, ht2 + ht4 - thick);
+		Bezier(polygon, Point(wd2 + half, ht2 + ht4 - thick), Point(thick, ht2 + ht4 - thick), Point(thick, ht2), 8);
+		Bezier(polygon, Point(thick, ht2), Point(thick, ht2 - ht4 + thick), Point(wd2 + half, ht2 - ht4 + thick), 8);
+		polygon << Point(wd, ht2 - ht4 + thick);
+		counts.Add(polygon.GetCount());
+		if(symbol == FS_MEMBER || symbol == FS_NOT_MEMBER) {
+			Rectangle(polygon, Rect(thick, ht2 - half, wd2, ht2 + half));
+			counts.Add(4);
+		}
+		if(symbol == FS_SUBSET || symbol == FS_NOT_SUBSET) {
+			int y = ht2 + ht4 + 2 * thick;
+			Rectangle(polygon, RectC(0, y, wd, thick));
+			counts.Add(4);
+		}
+
+		if(symbol == FS_NOT_MEMBER || symbol == FS_NOT_SUBSET || symbol == FS_NOT_PROPER_SUBSET) {
+			polygon << Point(wd, 0) << Point(thick, ht) << Point(0, ht) << Point(wd - thick, 0);
+			counts.Add(4);
+		}
+	}
+	else {
+		ASSERT(symbol == FS_EMPTY);
+		return;
+	}
+
+	if(xmirror)
+		for(int i = 0; i < polygon.GetCount(); i++)
+			polygon[i].x = wd - polygon[i].x;
+
+	draw.Offset(rc.TopLeft());
+	if(counts.IsEmpty())
+		counts.Add(polygon.GetCount());
+	DrawPolygons(draw, polygon, counts, color, 0, color);
+	draw.End();
+}
+
+void Formula::PaintRect0(RefCon<Formula> f, Draw& draw, int x_left, int y_baseline)
+{
+	if(!!f)
+		f->PaintRect(draw, x_left, y_baseline);
+}
+
+void Formula::PaintRect(Draw& draw, int x_left, int y_baseline) const
+{
+#if SHOW_BOXES
+	int wd = DotsToPixels(draw, 20);
+	draw.DrawRect(x_left, y_baseline - ascent, width, wd, Yellow);
+	draw.DrawRect(x_left, y_baseline + descent - wd, width, wd, Yellow);
+	draw.DrawRect(x_left + width - wd, y_baseline - ascent, wd, ascent + descent, Yellow);
+	draw.DrawRect(x_left, y_baseline - (wd >> 1), width, wd, LtMagenta);
+	draw.DrawRect(x_left, y_baseline, width, 1, LtBlue);
+	draw.DrawRect(x_left, y_baseline, wd, descent, Color(0, 192, 0));
+	draw.DrawRect(x_left, y_baseline - ascent, wd, ascent, LtCyan);
+#endif
+	Paint(draw, x_left, y_baseline);
+}
+
+int Formula::GetTextDeltaY(Font font)
+{
+	FontInfo fi = font.Info();
+	return Percent(fi.GetHeight(), 32) - fi.GetAscent();
+}
+
+Size GetScaledSize(Size from, Size to)
+{
+	if(to.cx == 0 || to.cy == 0)
+		return to;
+	if(from.cx == 0 || from.cy == 0)
+		return Size(0, 0);
+	if(from.cx * to.cy < to.cx * from.cy)
+		return Size(iscale(to.cy, from.cx, from.cy), to.cy);
+	else
+		return Size(to.cx, iscale(to.cx, from.cy, from.cx));
+}
+
+FormulaBox::FormulaBox(RefCon<Formula> in_, Color color, int flags)
+: in(in_), color(color), flags(flags)
+{
+	textheight = in->GetTextHeight();
+	boxwidth = GetLineWidth(textheight);
+	offset = (flags & INNER ? -boxwidth : flags & TIGHT ? 0 : GetLineOffset(textheight));
+	if(flags & THICK)
+		boxwidth *= 2;
+	ascent = in->GetAscent() + offset + boxwidth;
+	descent = in->GetDescent() + offset + boxwidth;
+	width = in->GetWidth() + 2 * (offset + boxwidth);
+}
+
+void FormulaBox::Paint(Draw& draw, int x_left, int y_baseline) const
+{
+	DrawFatFrame(draw, x_left, y_baseline - ascent, width, ascent + descent, color, boxwidth);
+	in->PaintRect(draw, x_left + boxwidth + offset, y_baseline);
+}
+
+FormulaSymbol::FormulaSymbol(FORMSYMBOL symbol_, int height_, int textheight_, Color color_)
+: symbol(symbol_), height(height_), color(color_)
+{
+	textheight = textheight_;
+	leading = GetLeading(textheight);
+	ascent = height >> 1;
+	descent = height - ascent;
+	width = SymbolWidth(symbol, height - 2 * leading.cy, textheight) + 2 * leading.cx;
+}
+
+void FormulaSymbol::Paint(Draw& draw, int x_left, int y_baseline) const
+{
+	PaintSymbol(draw, symbol,
+		Rect(x_left, y_baseline - ascent, x_left + width, y_baseline + descent).Deflated(leading),
+		textheight, color);
+}
+
+FormulaText::FormulaText(WString text, Font font, Color color, int dy)
+: text(text), font(font), color(color)
+{
+	width = GetTextSize(text, font).cx;
+	FontInfo fi = font.Info();
+	int fht = fi.GetHeight();
+	const wchar *p = text;
+	while(*p && IsLower(*p))
+		p++;
+	textheight = font.GetHeight();
+	if(font.IsItalic())
+		width += GetItalicDelta(fht);
+	ascent = fht >> 1;
+	descent = fht - ascent;
+	dy = Percent(dy, textheight);
+	deltay = GetTextDeltaY(font) + dy;
+	if(*p == 0)
+		ascent -= textheight / 9;
+	ascent -= max(dy, 0);
+	descent += min(dy, 0);
+	LLOG("FormulaText::FormulaText");
+	LDUMP(text);
+	LDUMP(width);
+	LDUMP(ascent);
+	LDUMP(descent);
+	LDUMP(textheight);
+	LDUMP(deltay);
+	LDUMP(fi.GetAscent());
+	LDUMP(fi.GetDescent());
+	LDUMP(fi.GetHeight());
+}
+
+void FormulaText::Paint(Draw& draw, int x_left, int y_baseline) const
+{
+	LLOG("FormulaText::Paint");
+	LDUMP(text);
+	LDUMP(x_left);
+	LDUMP(y_baseline);
+	draw.DrawText(x_left, y_baseline + deltay, text, font, color);
+}
+
+FormulaRatio::FormulaRatio(RefCon<Formula> top_, RefCon<Formula> bottom_, Color color)
+: top(top_), bottom(bottom_), color(color)
+{
+	textheight = GetTextHeight0(top, bottom);
+	linewidth = GetLineWidth(textheight);
+	width = max(top->GetWidth(), bottom->GetWidth());
+	ascent = top->GetHeight() + (linewidth >> 1);
+	descent = bottom->GetHeight() + ((linewidth + 1) >> 1);
+}
+
+void FormulaRatio::Paint(Draw& draw, int x_left, int y_baseline) const
+{
+	int half = linewidth >> 1;
+	top->PaintRect(draw, x_left + ((width - top->GetWidth()) >> 1),
+		y_baseline - half - top->GetDescent());
+	draw.DrawLine(x_left + half, y_baseline, x_left + width - half, y_baseline, linewidth, color);
+	draw.DrawRect(x_left, y_baseline - half, width, linewidth, color);
+	bottom->PaintRect(draw, x_left + ((width - bottom->GetWidth()) >> 1),
+		y_baseline + ((linewidth + 1) >> 1) + bottom->GetAscent());
+}
+
+FormulaSqrt::FormulaSqrt(RefCon<Formula> in_, RefCon<Formula> power_, Color color)
+: in(in_), power(power_), color(color)
+{
+	int ht = in->GetHeight(), tht = in->GetTextHeight();
+	leading = GetLeading(tht);
+	linewidth = GetLineWidth(tht);
+	half = linewidth >> 1;
+	descent = in->GetDescent() + leading.cy;
+	ascent = in->GetAscent() + linewidth + leading.cy;
+	width = in->GetWidth();
+	leftpos = -half; //(ht * 6) >> 4;
+	roofpos = -ascent + leading.cy;
+	slashwd = bslashwd = ht / 10;
+	leftwidth = ht / 10;
+	if(!!power)
+	{
+		ascent = max(ascent, -leftpos + power->GetHeight());
+		leftwidth = max(leftwidth >> 1, power->GetWidth()) - half;
+	}
+	width += slashwd + bslashwd + leftwidth + half + 2 * leading.cx;
+	textheight = in->GetTextHeight();
+}
+
+void FormulaSqrt::Paint(Draw& draw, int x_left, int y_baseline) const
+{
+	int ly = y_baseline + leftpos;
+	int by = y_baseline + descent - leading.cy - half;
+	int ty = y_baseline + roofpos;
+	if(!!power)
+		power->PaintRect(draw, x_left + leading.cx, ly - power->GetDescent());
+	x_left += leading.cx;
+	in->PaintRect(draw, x_left + leftwidth + slashwd + bslashwd + half, y_baseline);
+	draw.DrawRect(x_left, ly, leftwidth, linewidth, color);
+	x_left += leftwidth;
+	draw.DrawLine(x_left, ly + half, x_left + bslashwd, by, linewidth, color);
+	x_left += bslashwd;
+	draw.DrawLine(x_left, by, x_left + slashwd, ty + half, linewidth, color);
+	x_left += slashwd;
+	draw.DrawRect(x_left, ty, in->GetWidth() + half, linewidth, color);
+}
+
+FormulaIndex::FormulaIndex(RefCon<Formula> in_,
+RefCon<Formula> topright_, RefCon<Formula> bottomright_,
+RefCon<Formula> top_,      RefCon<Formula> bottom_,
+RefCon<Formula> topleft_,  RefCon<Formula> bottomleft_)
+: in(in_)
+, topright(topright_), bottomright(bottomright_)
+, top(top_), bottom(bottom_)
+, topleft(topleft_), bottomleft(bottomleft_)
+{
+	int trw = 0, tra = 0, trd = 0, brw = 0, bra = 0, brd = 0;
+	int tw = 0, ta = 0, td = 0, bw = 0, ba = 0, bd = 0;
+	int tlw = 0, tla = 0, tld = 0, blw = 0, bla = 0, bld = 0;
+	tlead = blead = 0;
+	if(!!topright)    { trw = topright   ->GetWidth(); tra = topright   ->GetAscent(); trd = topright   ->GetDescent(); }
+	if(!!bottomright) { brw = bottomright->GetWidth(); bra = bottomright->GetAscent(); brd = bottomright->GetDescent(); }
+	if(!!top)         { tw  = top        ->GetWidth(); ta  = top        ->GetAscent(); td  = top        ->GetDescent(); tlead = GetVertLeading(in->GetTextHeight()); }
+	if(!!bottom)      { bw  = bottom     ->GetWidth(); ba  = bottom     ->GetAscent(); bd  = bottom     ->GetDescent(); blead = GetVertLeading(in->GetTextHeight()); }
+	if(!!topleft)     { tlw = topleft    ->GetWidth(); tla = topleft    ->GetAscent(); tld = topleft    ->GetDescent(); }
+	if(!!bottomleft)  { blw = bottomleft ->GetWidth(); bla = bottomleft ->GetAscent(); bld = bottomleft ->GetDescent(); }
+	rwidth = max(trw, brw);
+	lwidth = max(tlw, blw);
+	bwidth = max(in->GetWidth(), max(tw, bw));
+	ltdy = rtdy = -max(in->GetAscent() - max(tla, tra), max(tld, trd));
+	lbdy = rbdy = +max(in->GetDescent() - max(bld, brd), max(bla, bra));
+	int over = trd + brd - (rbdy - rtdy);
+	if(over > 0)
+	{
+		rtdy -= over >> 1;
+		rbdy += over >> 1;
+	}
+	over = tld + bld - (lbdy - ltdy);
+	if(over > 0)
+	{
+		ltdy -= over >> 1;
+		lbdy += over >> 1;
+	}
+	width = lwidth + bwidth + rwidth;
+	ascent = max(in->GetAscent() + ta + td - tlead, max(!!topleft ? -ltdy + tla : 0, !!topright ? -rtdy + tra : 0));
+	descent = max(in->GetDescent() + ba + bd - blead, max(!!bottomleft ? lbdy + bld : 0, !!bottomright ? rbdy + brd : 0));
+	textheight = in->GetTextHeight();
+}
+
+void FormulaIndex::Paint(Draw& draw, int x_left, int y_baseline) const
+{
+	in->PaintRect(draw, x_left + lwidth + ((bwidth - in->GetWidth()) >> 1), y_baseline);
+	if(!!topleft)     topleft    ->PaintRect(draw, x_left + lwidth - topleft    ->GetWidth(), y_baseline + ltdy);
+	if(!!bottomleft)  bottomleft ->PaintRect(draw, x_left + lwidth - bottomleft ->GetWidth(), y_baseline + lbdy);
+	x_left += lwidth;
+	if(!!top)         top        ->PaintRect(draw, x_left + ((bwidth - top   ->GetWidth()) >> 1), y_baseline - in->GetAscent() - top->GetDescent() + tlead);
+	if(!!bottom)      bottom     ->PaintRect(draw, x_left + ((bwidth - bottom->GetWidth()) >> 1), y_baseline + in->GetDescent() + bottom->GetAscent() - blead);
+	x_left += bwidth;
+	if(!!topright)    topright   ->PaintRect(draw, x_left, y_baseline + rtdy);
+	if(!!bottomright) bottomright->PaintRect(draw, x_left, y_baseline + rbdy);
+}
+
+FormulaParen::FormulaParen(RefCon<Formula> in_, FORMSYMBOL lsym, FORMSYMBOL rsym, Color color)
+: in(in_), lsymbol(lsym), rsymbol(rsym), color(color)
+{
+	textheight = in->GetTextHeight();
+	int rad = max(in->GetAscent(), in->GetDescent());
+	leading = GetLeading(textheight);
+	Size sz = in->GetSize();
+	sz.cy -= 2 * leading.cy;
+	if(rad <= textheight)
+		height = textheight + 2 * leading.cy;
+	else
+		height = sz.cy;
+	ascent = max(height >> 1, in->GetAscent());
+	descent = max(height >> 1, in->GetDescent());
+	lwidth = SymbolWidth(lsymbol, sz.cy, textheight) + 2 * leading.cx;
+	rwidth = SymbolWidth(rsymbol, sz.cy, textheight) + 2 * leading.cx;
+	width = lwidth + rwidth + sz.cx;
+}
+
+void FormulaParen::Paint(Draw& draw, int x_left, int y_baseline) const
+{
+	in->PaintRect(draw, x_left + lwidth, y_baseline);
+	int x_right = x_left + lwidth + in->GetWidth();
+	int hh = height >> 1;
+	PaintSymbol(draw, lsymbol, RectC(x_left, y_baseline - hh, lwidth, height).Deflated(leading), textheight, color);
+	PaintSymbol(draw, rsymbol, RectC(x_right, y_baseline - hh, rwidth, height).Deflated(leading), textheight, color);
+}
+
+FormulaMatrix::FormulaMatrix(pick_ Vector< Vector< RefCon<Formula> > >& array, pick_ RefCon<Formula> sep)
+{
+	Vector<Point> points;
+	Vector< RefCon<Formula> > formulas;
+	for(int i = 0; i < array.GetCount(); i++)
+		for(int j = 0; j < array[i].GetCount(); j++)
+		{
+			points.Add(Point(j, i));
+			formulas.Add() = array[i][j];
+		}
+	Init(points, formulas, sep);
+}
+
+FormulaMatrix::FormulaMatrix(pick_ Vector< RefCon<Formula> >& formulas, RefCon<Formula> sep)
+{
+	Vector<Point> points;
+	for(int i = 0; i < formulas.GetCount(); i++)
+		points.Add(Point(i, 0));
+	Init(points, formulas, sep);
+}
+
+void FormulaMatrix::Init(pick_ Vector<Point>& pos_, pick_ Vector< RefCon<Formula> >& formulas_, RefCon<Formula> sep_)
+{
+	pos = pos_;
+	formulas = formulas_;
+	sep = sep_;
+	int sw = 0, sa = 0, sd = 0;
+	if(!!sep) { sw = sep->GetWidth(); sa = sep->GetAscent(); sd = sep->GetDescent(); }
+	int i;
+	for(i = 0; i < pos.GetCount(); i++)
+	{
+		const Formula *f = ~formulas[i];
+		int& wd = widths.DoIndex(pos[i].x, 0);
+		wd = max(wd, f->GetWidth());
+		int& as = ascents.DoIndex(pos[i].y, sa);
+		as = max(as, f->GetAscent());
+		int& ds = descents.DoIndex(pos[i].y, sd);
+		ds = max(ds, f->GetDescent());
+		textheight = max(textheight, f->GetTextHeight());
+	}
+	Size size(0, 0);
+	xpos.SetCount(widths.GetCount());
+	for(i = 0; i < widths.GetCount(); i++)
+	{
+		xpos[i] = size.cx;
+		size.cx += widths[i] + sw;
+	}
+	size.cx -= sw;
+	ypos.SetCount(ascents.GetCount());
+	for(i = 0; i < ascents.GetCount(); i++)
+	{
+		ypos[i] = size.cy;
+		size.cy += ascents[i] + descents[i];
+	}
+	width = size.cx;
+	if(ascents.GetCount() == 1)
+	{
+		ascent = ascents[0];
+		descent = descents[0];
+	}
+	else
+	{
+		ascent = size.cy >> 1;
+		descent = size.cy - ascent;
+	}
+}
+
+void FormulaMatrix::Paint(Draw& draw, int x_left, int y_baseline) const
+{
+	y_baseline -= ascent;
+//	int max_x = widths.GetCount() - 1;
+	for(int i = 0; i < pos.GetCount(); i++)
+	{
+		const Formula *f = ~formulas[i];
+		Point xy = pos[i];
+		int y = y_baseline + ypos[xy.y] + ascents[xy.y];
+		f->PaintRect(draw, x_left + xpos[xy.x] + ((widths[xy.x] - f->GetWidth()) >> 1), y);
+		int iitem = xy.y * widths.GetCount() + xy.x;
+		if(!!sep && pos.Find(xy + Size(1, 0)) >= 0)
+			sep->PaintRect(draw, x_left + xpos[xy.x] + widths[xy.x], y);
+	}
+}
+
+FormulaIntegral::FormulaIntegral(RefCon<Formula> integrand, RefCon<Formula> bottom, RefCon<Formula> top, bool right_limits)
+{
+}
+
+void FormulaIntegral::Paint(Draw& draw, int x_left, int y_baseline) const
+{
+}
+
+inline int GetOperSpace(RefCon<Formula> a, RefCon<Formula> b)
+{
+	return Formula::GetOperSpace(max(a->GetHeight(), b->GetHeight()));
+}
+
+class FormulaParser
+{
+public:
+	FormulaParser(const char *ptr, Font font = Arial(100), Color color = Color());
+
+	RefCon<Formula>  Run();
+
+private:
+	RefCon<Formula>  RunLow();
+	RefCon<Formula>  RunSemicolon();
+	RefCon<Formula>  RunComma();
+	RefCon<Formula>  RunTextBin();
+	RefCon<Formula>  RunComp();
+	RefCon<Formula>  RunMul();
+	RefCon<Formula>  RunDiv();
+	RefCon<Formula>  RunPostfix();
+	RefCon<Formula>  RunTerm();
+
+	RefCon<Formula>  RunParen();
+	bool                RunIndex(RefCon<Formula>& topright, RefCon<Formula>& bottomright,
+		RefCon<Formula>& top, RefCon<Formula>& bottom, RefCon<Formula>& topleft, RefCon<Formula>& bottomleft);
+
+	RefCon<Formula>  GetError(String text, Font font) const;
+	RefCon<Formula>  GetError(String text) const { return GetError(text, state.font); }
+	void                AddError(RefCon<Formula>& item, String text) const;
+
+	byte                Skip();
+	bool                Check(char c);
+	bool                Check(char c1, char c2);
+	bool                Check(char c1, char c2, char c3);
+	void                Force(char c, RefCon<Formula>& errout);
+	void                Force(char c1, char c2, RefCon<Formula>& errout);
+	String              ScanIdent();
+
+	Font                GetFont(int ht) { return Font(state.font).Height(ht); }
+
+	void                Push(bool makeindex);
+	bool                Pop();
+
+	RefCon<Formula>  MakeBinary(RefCon<Formula> left, WString text,
+		RefCon<Formula> right, int gap = Null, int perc_shift = 0) const;
+	RefCon<Formula>  MakeUnary(String text, RefCon<Formula> form,
+		int gap = Null, bool symbol = false, int perc_shift = 0) const;
+
+private:
+	struct State
+	{
+		Font  font;
+		Color color;
+	};
+
+	const char          *ptr;
+	Array<State>         stack;
+	State                state;
+};
+
+RefCon<Formula> ParseFormula(const char *formula, Font font, Color color)
+{
+	return FormulaParser(formula, font, color).Run();
+}
+
+FormulaParser::FormulaParser(const char *ptr, Font font, Color color)
+: ptr(ptr)
+{
+	if(font.GetHeight() == 0)
+		font.Height(font.Info().GetHeight());
+	state.font = font;
+	state.color = color;
+}
+
+RefCon<Formula> FormulaParser::Run()
+{
+	if(!Skip())
+		return NULL;
+	RefCon<Formula> item = RunLow();
+	if(Skip())
+		AddError(item, "ignored: " + StringSample(ptr, 20));
+	return item;
+}
+
+RefCon<Formula> FormulaParser::RunLow()
+{
+	return RunSemicolon();
+}
+
+RefCon<Formula> FormulaParser::RunSemicolon()
+{
+	RefCon<Formula> item = RunComma();
+	while(Check(';'))
+	{
+		RefCon<Formula> right = RunComma();
+		item = MakeBinary(item, ";", right, Formula::GetTextHeight0(item, right) >> 1);
+	}
+	return item;
+}
+
+RefCon<Formula> FormulaParser::RunComma()
+{
+	RefCon<Formula> item = RunTextBin();
+	if(Check('&', '&'))
+	{ // must run before '&', aargh!
+		RefCon<Formula> right = RunComma();
+		int ht = Formula::GetTextHeight0(item, right);
+		return MakeBinary(item, "&", right, Percent(50, ht), ht);
+	}
+	bool row = false;
+	if(Check('&'))
+		row = true;
+	else if(!Check(','))
+		return item;
+	Vector< Vector< RefCon<Formula> > > formulas;
+	formulas.Add().Add() = item;
+	int tht = 0;
+	do
+	{
+		tht = max(tht, formulas.Top().Top()->GetTextHeight());
+		if(row)
+			formulas.Add();
+		formulas.Top().Add() = RunTextBin();
+	}
+	while((row = Check('&')) != 0 || Check(','));
+	return new FormulaMatrix(formulas,
+		new FormulaText(", ", Font(state.font)(tht), state.color));
+}
+
+RefCon<Formula> FormulaParser::RunTextBin()
+{
+	RefCon<Formula> form = RunComp();
+	for(String op; !IsNull(op = ScanIdent());)
+	{
+		FORMSYMBOL sym = FS_EMPTY;
+		if     (op == "in")           sym = (Check('!') ? FS_NOT_MEMBER : FS_MEMBER);
+		else if(op == "subseteq")     sym = (Check('!') ? FS_NOT_SUBSET : FS_SUBSET);
+		else if(op == "subset")       sym = (Check('!') ? FS_NOT_PROPER_SUBSET : FS_PROPER_SUBSET);
+		else
+		{
+			AddError(form, "??" + op + "??");
+			continue;
+		}
+		RefCon<Formula> right = RunComp();
+		int ht = Percent(150, Formula::GetTextHeight0(form, right));
+		RefCon<Formula> body = new FormulaSymbol(sym, ht, ht, state.color);
+		Vector< RefCon<Formula> > list;
+		list << form << body << right;
+		return new FormulaMatrix(list, new FormulaSpace(Percent(50, ht)));
+	}
+	return form;
+}
+
+RefCon<Formula> FormulaParser::RunComp()
+{
+	int tht = state.font.GetHeight();
+	int gap = 3 * Formula::GetOperSpace(tht);
+	RefCon<Formula> item = RunMul();
+	for(;;)
+		if(Check('=', '~'))
+			item = MakeBinary(item, WString(0x2248, 1), RunComp(), gap);
+		else if(Check('='))
+			item = MakeBinary(item, "=", RunComp(), gap);
+		else if(Check('<', '>'))
+			item = MakeBinary(item, WString(0x2260, 1), RunComp(), gap, -11);
+		else if(Check('<', '='))
+			item = MakeBinary(item, WString(0x2264, 1), RunComp(), gap, -9);
+		else if(Check('>', '='))
+			item = MakeBinary(item, WString(0x2265, 1), RunComp(), gap, -9);
+		else if(Check('<', '-', '>'))
+			item = MakeBinary(item, WString(0x2194, 1), RunComp(), Null, -13);
+		else if(Check('<', '-'))
+			item = MakeBinary(item, WString(0x2190, 1), RunComp(), Null, -13);
+		else if(Check('-', '>'))
+			item = MakeBinary(item, WString(0x2192, 1), RunComp(), Null, -13);
+		else if(Check('=', '>'))
+			item = MakeBinary(item, "\xDE", RunComp(), Null, -13);
+		else if(Check('=', '<'))
+			item = MakeBinary(item, "\xDC", RunComp(), Null, -13);
+		else if(Check('<'))
+			item = MakeBinary(item, "<", RunComp(), gap);
+		else if(Check('>'))
+			item = MakeBinary(item, ">", RunComp(), gap);
+		else if(Check('+'))
+			item = MakeBinary(item, "+", RunComp());
+		else if(Check('-'))
+			item = MakeBinary(item, "-", RunComp(), Null, -11);
+		else if(Check('|', '|'))
+		{
+			RefCon<Formula> right = RunComp();
+			Vector< RefCon<Formula> > list;
+			list << item;
+			int ht = Formula::GetTextHeight0(item, right);
+			list << new FormulaSymbol(FS_LOG_OR, ht, ht, state.color);
+			list << right;
+			return new FormulaMatrix(list, new FormulaSpace(Percent(50, ht)));
+		}
+		else if(Check('|'))
+			item = MakeBinary(item, Null, RunComp(), 0, false);
+		else
+			return item;
+}
+
+RefCon<Formula> FormulaParser::RunMul()
+{
+	RefCon<Formula> item = RunDiv();
+	for(;;)
+		if(Check('*'))
+			item = MakeBinary(item, "*", RunDiv());
+		else if(Check('.'))
+			item = MakeBinary(item, ".", RunDiv(), Null, -20);
+		else if(Check('~'))
+			item = MakeBinary(item, Null, RunDiv());
+		else
+			return item;
+}
+
+RefCon<Formula> FormulaParser::RunDiv()
+{
+	RefCon<Formula> item = RunPostfix();
+	for(;;)
+		if(Check('/', '_'))
+			item = MakeBinary(item, "/", RunPostfix());
+		else if(Check('/'))
+			item = new FormulaRatio(item, RunPostfix());
+		else
+			return item;
+}
+
+RefCon<Formula> FormulaParser::RunPostfix()
+{
+	RefCon<Formula> item = RunTerm();
+	for(;;)
+	{
+		RefCon<Formula> topright, bottomright, top, bottom, topleft, bottomleft, in;
+		if(RunIndex(topright, bottomright, top, bottom, topleft, bottomleft))
+		{
+			if(!!topright || !!bottomright || !!top || !!bottom || !!topleft || !!bottomleft)
+				item = new FormulaIndex(item, topright, bottomright, top, bottom, topleft, bottomleft);
+		}
+		else if(!!(in = RunParen()))
+		{
+			int tht = Formula::GetTextHeight0(item, in);
+			item = MakeBinary(item, Null, in, Formula::GetFuncSpace(tht));
+		}
+		else if(Check('!'))
+			item = MakeBinary(item, Null, new FormulaText("!", state.font), state.color);
+		else if(Check(':'))
+			item = MakeBinary(item, Null, RunTerm(), 0);
+		else
+			return item;
+	}
+}
+
+bool FormulaParser::RunIndex(RefCon<Formula>& topright, RefCon<Formula>& bottomright,
+	RefCon<Formula>& top, RefCon<Formula>& bottom, RefCon<Formula>& topleft, RefCon<Formula>& bottomleft)
+{
+	bool done = false;
+	for(;;)
+	{
+		enum KIND { NONE, TR, BR, T, B, TL, BL };
+		KIND kind = NONE;
+		if(Check('_', '<'))      kind = BL;
+		else if(Check('^', '<')) kind = TL;
+		else if(Check('_', '|')) kind = B;
+		else if(Check('^', '|')) kind = T;
+		else if(Check('_'))      kind = BR;
+		else if(Check('^'))      kind = TR;
+		else if(Check('\''))
+		{
+			RefPtr<Formula> form = new FormulaText("\'", Font(state.font).Italic(), state.color, 40);
+			if(!topright)
+				topright = form;
+			else
+				topright = MakeBinary(topright, Null, form, 0);
+			done = true;
+			continue;
+		}
+		if(kind == NONE)
+			return done;
+		Push(true);
+		RefCon<Formula> ix = RunTerm();
+		Pop();
+		switch(kind)
+		{
+		case TR: topright = ix; break;
+		case BR: bottomright = ix; break;
+		case T:  top = ix; break;
+		case B:  bottom = ix; break;
+		case TL: topleft = ix; break;
+		case BL: bottomleft = ix; break;
+		default: NEVER();
+		}
+		done = true;
+	}
+}
+
+RefCon<Formula> FormulaParser::RunParen()
+{
+	FORMSYMBOL lsym = FS_EMPTY, rsym = FS_EMPTY;
+	char finish = 0;
+	if(Check('('))                { lsym = FS_LPAREN; rsym = FS_RPAREN; finish = ')'; }
+	else if(Check('{', '<'))      { lsym = FS_LSHARP; rsym = FS_RSHARP; finish = '}'; }
+	else if(Check('[', '_'))      { lsym = FS_LTBRACKET; rsym = FS_RTBRACKET; finish = ']'; }
+	else if(Check('[', '^'))      { lsym = FS_LBBRACKET, rsym = FS_RBBRACKET; finish = ']'; }
+	else if(Check('['))           { lsym = FS_LBRACKET; rsym = FS_RBRACKET; finish = ']'; }
+	else if(Check('{', '[', '_')) { lsym = FS_LTBRACKET; rsym = FS_RTBRACKET; finish = '}'; }
+	else if(Check('{', '[', '^')) { lsym = FS_LBBRACKET, rsym = FS_RBBRACKET; finish = '}'; }
+	else if(Check('{', '['))      { lsym = FS_LBRACKET; rsym = FS_RBRACKET; finish = '}'; }
+	else if(Check('{', '|'))      { lsym = FS_VBAR; rsym = FS_VBAR; finish = '}'; }
+	else if(Check('{', '('))      { lsym = FS_LPAREN; rsym = FS_RPAREN; finish = '}'; }
+	else if(Check('{', '_'))      { lsym = FS_LBRACE; rsym = FS_RBRACE; finish = '}'; }
+	else if(Check('{', '~'))      { lsym = FS_EMPTY; rsym = FS_RBRACE; finish = '}'; }
+	else if(Check('{'))           { finish = '}'; }
+	else
+		return NULL;
+	RefCon<Formula> item = RunLow();
+	if(finish == '}')
+	{
+		if(Check('}', ']', '_')) rsym = FS_RBBRACKET;
+		else if(Check('}', ']', '^')) rsym = FS_RTBRACKET;
+		else if(Check('}', ']')) rsym = FS_RBRACKET;
+		else if(Check('}', ')')) rsym = FS_RPAREN;
+		else if(Check('}', '>')) rsym = FS_RSHARP;
+		else if(Check('}', '|')) rsym = FS_VBAR;
+		else if(Check(finish, '~')) rsym = FS_EMPTY;
+		else Force(finish, item);
+	}
+	else
+		Force(finish, item);
+	if(lsym != FS_EMPTY || rsym != FS_EMPTY)
+		return new FormulaParen(item, lsym, rsym, state.color);
+	return item;
+}
+
+RefCon<Formula> FormulaParser::RunTerm()
+{
+	RefCon<Formula> paren = RunParen();
+	if(!!paren)
+		return paren;
+	if(Check('@'))
+		return MakeUnary("\xB6", RunTerm(), 0, true);
+	if(Check('-'))
+		return MakeUnary("-", RunTerm(), 0, true);
+	if(Check('+'))
+		return MakeUnary("+", RunTerm(), 0, true);
+	if(Check('.', '.', '.'))
+		return new FormulaText("...", state.font, state.color);
+	if(Check('.', '.'))
+		return new FormulaText("..", state.font, state.color);
+	if(Check('~', '~'))
+	{
+		int blanks = 1;
+		for(; *ptr == '~'; ptr++)
+			blanks++;
+		RefCon<Formula> item = RunTerm();
+		return MakeUnary(Null, item, (blanks * Formula::GetTextHeight0(item)) >> 1);
+	}
+
+	Font font = state.font;
+	bool noitalic = false;
+	for(;;)
+		if(Check('*'))
+			font.Bold();
+		else if(Check('/'))
+			font.Italic();
+		else if(Check('\\'))
+			noitalic = true;
+		else
+			break;
+
+	if(Check(':')) {
+		static const wchar Alpha[26] = {
+			0x391, // A -> Alpha
+			0x392, // B -> Beta
+			0x3A7, // C -> Chi
+			0x394, // D -> Delta
+			0x395, // E -> Epsilon
+			0x3A6, // F -> Phi
+			0x393, // G -> Gamma
+			0x397, // H -> Eta
+			0x399, // I -> Iota
+			0x300, // J
+			0x39A, // K -> Kappa
+			0x39B, // L -> Lambda
+			0x39C, // M -> Mu
+			0x39D, // N -> Nu
+			0x39F, // O -> Omikron
+			0x3A0, // P -> Pi
+			0x398, // Q -> Theta
+			0x3A1, // R -> Rho
+			0x3A3, // S -> Sigma
+			0x3A4, // T -> Tau
+			0x300, // U
+			0x3A9, // V -> Omega
+			0x3A8, // W -> Psi
+			0x39E, // X -> Xi
+			0x3A5, // Y -> Ypsilon
+			0x396, // Z -> Zeta
+		};
+		static const wchar alpha[26] = {
+			0x3B1, // a -> alpha
+			0x3B2, // b -> beta
+			0x3C7, // c -> chi
+			0x3B4, // d -> delta
+			0x3B5, // e -> epsilon
+			0x3C6, // f -> phi
+			0x3B3, // g -> gamma
+			0x3B7, // h -> eta
+			0x3B9, // i -> iota
+			0x300, // j
+			0x3BA, // k -> kappa
+			0x3BB, // l -> lambda
+			0x3BC, // m -> mu
+			0x3BD, // n -> nu
+			0x3BF, // o -> omikron
+			0x3C0, // p -> pi
+			0x3B8, // q -> theta
+			0x3C1, // r -> rho
+			0x3C3, // s -> sigma
+			0x3C4, // t -> tau
+			0x3C2, // u -> final sigma
+			0x3C9, // v -> omega
+			0x3C8, // w -> psi
+			0x3BE, // x -> xi
+			0x3C5, // y -> ypsilon
+			0x3B6, // z -> zeta
+		};
+		wchar wc = 0;
+		if(IsUpper(*ptr))
+			wc = Alpha[*ptr++ - 'A'];
+		else if(IsLower(*ptr))
+			wc = alpha[*ptr++ - 'a'];
+		else
+			return GetError("invalid greek character");
+		return new FormulaText(WString(wc, 1), font, state.color);
+	}
+	char c = Skip();
+	if(IsAlpha(c))
+	{
+		const char *b = ptr;
+		while(IsAlNum(*++ptr))
+			;
+		String ident(b, ptr);
+		FORMSYMBOL group_sym = FS_EMPTY;
+		if(ident == "sqrt")
+		{
+			RefCon<Formula> exp;
+			if(Check('_'))
+			{
+				Push(true);
+				exp = RunTerm();
+				Pop();
+			}
+			RefCon<Formula> arg = RunTerm();
+			return new FormulaSqrt(arg, exp);
+		}
+		else if(ident == "not")          group_sym = FS_LOG_NOT;
+		else if(ident == "sum")          group_sym = FS_SUM;
+		else if(ident == "product")      group_sym = FS_PRODUCT;
+		else if(ident == "union")        group_sym = FS_UNION;
+		else if(ident == "intersection") group_sym = FS_INTERSECTION;
+		else if(ident == "int")          group_sym = FS_INT;
+		else if(ident == "iint")         group_sym = FS_IINT;
+		else if(ident == "iiint")        group_sym = FS_IIINT;
+		else if(ident == "oint")         group_sym = FS_OINT;
+		else if(ident == "oiint")        group_sym = FS_OIINT;
+
+		if(group_sym != FS_EMPTY) {
+			RefCon<Formula> topright, bottomright, top, bottom, topleft, bottomleft;
+			RunIndex(topright, bottomright, top, bottom, topleft, bottomleft);
+			RefCon<Formula> arg = RunTerm();
+			int ht = arg->GetTextHeight();
+			if(group_sym != FS_LOG_NOT)
+				ht = max(ht, Percent(150, max(arg->GetAscent(), arg->GetDescent())));
+			RefCon<Formula> body = new FormulaSymbol(group_sym, ht, arg->GetTextHeight(), state.color);
+			if(!!topright || !!bottomright || !!top || !!bottom || !!topleft || !!bottomleft)
+				body = new FormulaIndex(body, topright, bottomright, top, bottom, topleft, bottomleft);
+			return MakeBinary(body, Null, arg);
+		}
+		else if(ident == "oo")
+			return new FormulaText(WString(0x221E, 1), font, state.color, -11);
+
+		if(!font.IsItalic() && !noitalic && ptr - b == 2 && *b == 'd'
+		&& (b[1] < 'd' || b[1] > 'h'))
+			return MakeBinary(
+				new FormulaText("d", font, state.color),
+				Null,
+				new FormulaText(String(b + 1, ptr).ToWString(), Font(font).Italic(), state.color),
+				0);
+		if(ptr - b == 1 && (*b < 'd' || *b > 'h'))
+			font.Italic();
+		if(noitalic)
+			font.NoItalic();
+		return new FormulaText(String(b, ptr).ToWString(), font, state.color);
+	}
+	if(IsDigit(c))
+	{
+		const char *b = ptr;
+		while(IsDigit(*++ptr))
+			;
+		if(*ptr == '.' && IsDigit(ptr[1])) {
+			while(IsDigit(*++ptr))
+				;
+		}
+		RefCon<Formula> number = new FormulaText(String(b, ptr).ToWString(), state.font, state.color);
+		if(*ptr == 'e' || *ptr == 'E') {
+			b = ++ptr;
+			if(*ptr == '+' || *ptr == '-')
+				ptr++;
+			RefCon<Formula> exp;
+			Font fx = Font(font).Height(Formula::GetIndexSize(font.GetHeight()));
+			if(IsDigit(*ptr))
+			{
+				while(IsDigit(*++ptr))
+					;
+				exp = new FormulaText(String(b, ptr).ToWString(), fx, state.color);
+			}
+			else
+				exp = GetError("missing exponent", fx);
+			number = MakeBinary(number, ".",
+					new FormulaIndex(new FormulaText("10", font, state.color), exp), Null, -20);
+		}
+		return number;
+	}
+	if(c == '\"')
+	{
+		String out;
+		while(*++ptr && *ptr != '\"')
+			if(*ptr == '\\' && ptr[1])
+				out.Cat(*++ptr);
+			else
+				out.Cat(*ptr);
+		RefPtr<Formula> item = new FormulaText(out.ToWString(), font, state.color);
+		Force('\"', item);
+		return item;
+	}
+	if(c == '~')
+	{
+		ptr++;
+		return new FormulaSpace(0, 0, 0, state.font.GetHeight());
+	}
+	String err;
+	if(*ptr)
+		err << (char)c << " (0x" << Format("%02x", c) << ")?";
+	else
+		err = "EOF";
+	return GetError(err, state.font);
+}
+
+void FormulaParser::Push(bool makeindex)
+{
+	stack.Add(state);
+	if(makeindex)
+		state.font.Height(Formula::GetIndexSize(state.font.GetHeight()));
+}
+
+bool FormulaParser::Pop()
+{
+	if(stack.IsEmpty())
+		return false;
+	state = stack.Top();
+	stack.Drop();
+	return true;
+}
+
+byte FormulaParser::Skip()
+{
+	for(;;)
+		if(*ptr && (byte)*ptr <= ' ')
+			ptr++;
+		else if(*ptr == '/' && ptr[1] == '*')
+		{
+			ptr += 2;
+			while(*ptr && !(ptr[0] == '*' && ptr[1] == '/'))
+				ptr++;
+			if(*ptr)
+				ptr += 2;
+		}
+		else if(ptr[0] == '/' && ptr[1] == '/')
+		{
+			ptr += 2;
+			while(*ptr && *ptr != '\n')
+				ptr++;
+		}
+		else
+			return *ptr;
+}
+
+String FormulaParser::ScanIdent()
+{
+	byte c = Skip();
+	if(!IsAlpha(c))
+		return Null;
+	const char *b = ptr;
+	while(IsAlNum(*ptr))
+		ptr++;
+	return String(b, ptr);
+}
+
+bool FormulaParser::Check(char c)
+{
+	if(Skip() != c)
+		return false;
+	ptr++;
+	return true;
+}
+
+bool FormulaParser::Check(char c1, char c2)
+{
+	if(Skip() != c1 || ptr[1] != c2)
+		return false;
+	ptr += 2;
+	return true;
+}
+
+bool FormulaParser::Check(char c1, char c2, char c3)
+{
+	if(Skip() != c1 || ptr[1] != c2 || ptr[2] != c3)
+		return false;
+	ptr += 3;
+	return true;
+}
+
+RefCon<Formula> FormulaParser::MakeBinary(RefCon<Formula> left,
+	WString text, RefCon<Formula> right, int gap, int perc_shift) const
+{
+	int ht = Formula::GetTextHeight0(left, right);
+	if(IsNull(gap))
+		gap = Formula::GetOperSpace(ht);
+	Vector< RefCon<Formula> > formula;
+	formula.Add() = left;
+	if(!IsNull(text)) {
+		Font f = state.font;
+		f.Height(ht);
+		formula.Add() = new FormulaText(text, f, state.color, perc_shift);
+	}
+	formula.Add() = right;
+	RefPtr<Formula> form = new FormulaMatrix(formula, new FormulaSpace(gap));
+	//form = new FormulaBox(form, LtRed);
+	return form;
+}
+
+RefCon<Formula> FormulaParser::MakeUnary(String text, RefCon<Formula> form,
+	int gap, bool symbol, int perc_shift) const
+{
+	int ht = form->GetTextHeight();
+	Vector< RefCon<Formula> > formula;
+	if(!IsNull(text))
+	{
+		Font f = state.font;
+		if(symbol)
+			f.Face(Font::SYMBOL);
+		f.Height(ht);
+		formula.Add() = new FormulaText(text.ToWString(), f, state.color, perc_shift);
+	}
+	formula.Add() = form;
+	return new FormulaMatrix(formula, new FormulaSpace(gap));
+}
+
+RefCon<Formula> FormulaParser::GetError(String text, Font font) const
+{
+	return new FormulaText(text.ToWString(), font.Bold(), LtRed);
+}
+
+void FormulaParser::AddError(RefCon<Formula>& item, String text) const
+{
+	int ht = item->GetTextHeight();
+	item = MakeBinary(item, Null, GetError(text, Font(state.font).Height(ht)));
+}
+
+void FormulaParser::Force(char c, RefCon<Formula>& errout)
+{
+	if(!Check(c))
+	{
+		char temp[] = { c, 0 };
+		Vector< RefCon<Formula> > list;
+		list.Add() = errout;
+		Font fb = Font(state.font).Bold();
+		list.Add() = new FormulaText(temp, fb, LtBlue);
+		list.Add() = new FormulaText(*ptr ? ~StringSample(ptr, 1) : "EOF", fb, LtRed);
+		errout = new FormulaMatrix(list);
+	}
+}
+
+void FormulaParser::Force(char c1, char c2, RefCon<Formula>& errout)
+{
+	if(!Check(c1, c2))
+	{
+		char temp[] = { c1, c2, 0 };
+		Vector< RefCon<Formula> > list;
+		list.Add() = errout;
+		Font fb = Font(state.font).Bold();
+		list.Add() = new FormulaText(temp, fb, LtBlue);
+		list.Add() = new FormulaText(*ptr ? ~StringSample(ptr, 2) : "EOF", fb, LtRed);
+		errout = new FormulaMatrix(list);
+	}
+}
+
+FormulaDisplay::FormulaDisplay(int sh)
+: std_height(sh)
+{
+}
+
+void FormulaDisplay::Paint(Draw& draw, const Rect& rc, const Value& value, Color ink, Color paper, dword style) const
+{
+	draw.DrawRect(rc, paper);
+	RefCon<Formula> form = Get(value, std_height ? std_height : 300, ink);
+	if(!!form) {
+		if(std_height)
+			form->PaintRect(draw, (rc.left + rc.right - form->GetWidth()) >> 1,
+				(rc.top + rc.bottom - form->GetHeight() + 2 * form->GetAscent()) >> 1);
+		else {
+			DrawingDraw ddraw(form->GetSize());
+			form->PaintRect(ddraw, 0, form->GetAscent());
+			Drawing dwg = ddraw;
+			Size outsize = GetScaledSize(dwg.GetSize(), rc.Size());
+			draw.DrawDrawing(rc.CenterRect(outsize), dwg);
+		}
+	}
+}
+
+Size FormulaDisplay::GetStdSize(const Value& value) const
+{
+	int ht = std_height;
+	if(!ht) {
+		FontInfo fi = StdFont().Info();
+		ht = fi.GetHeight() - fi.GetExternal();
+	}
+	RefCon<Formula> form = Get(value, ht, SBlack);
+	if(!!form)
+		return form->GetSize();
+	return Size(0, 0);
+}
+
+RefCon<Formula> FormulaDisplay::Get(const Value& value, int ht, Color ink) const
+{
+	if(IsNull(value))
+		return NULL;
+	return ParseFormula(StdFormat(value), Roman(ht), ink);
+//	return new FormulaBox(ParseFormula(StdFormat(value), Roman(ht)), LtRed, FormulaBox::INNER);
+}
+
+const Display& GLOBAL_V(FormulaDisplay, StdFormulaDisplay);
+
+#ifdef flagMAIN
+#include <CtrlLib/CtrlLib.h>
+
+void AppMain()
+{
+	FormulaDisplay fd(0);
+	TopWindow tw;
+	tw.Sizeable().Zoomable();
+	const char *t;
+//	t = "[_9 & 8 & 7]+[^9 & 8 & 7]+{_6 & 7 & 8}";
+//	t = "(1,2 & 3 + 2 ,4 & 3,5 & 4) + ( x & y & z & w)=(0 & 0 & 0 & 0)";
+//	t = "t^3=sqrt(3^2+2^2)";
+//	t = "t^3=1/sqrt{{3^2+2^2}/a_A^sqrt_5(t^3+1)}";
+//	t = "t^3=1/sqrt_{4 & 5 & 6 & 7 & 8 & 9}{{3^2+2^2}/a_A^sqrt_5(t^3+1)}";
+//	t = "B(:a, :b, :c, t) = :a*(1-t)^2+:b*2*t*(1-t)+:c*t^2";
+//	t = "sin{:a+:b}=sin{:a}*cos{:b}+sin{:a}*cos{:b}";
+//	t = "a^n+b^n=c^n";
+//	t = "a^2+b^2 <= 2*a*b";
+//	t = "/cosh{x}=sqrt{1+sinh_|2^|2^2{x}}";
+//	t = "sum_|{i=0}^|10{i^2}";
+//	t = "iint_|{x=0}^|10{i~x^2~dx} & int{x^2~dx} & iiint{x^2~d/x}";
+//	t = "n!=int_|{x=0}^|oo{x^{n-1}~e^x~dx}";
+//	t = "n!<>0=iint_|{x,y=0}^|oo{x^{n-1}~e^x~@x~@y}";
+//	t = "0=0+0-0<>0<-0 & x->oo<->0 & 0<=0>=0<0>0";
+//	t = "e=lim_|{x->oo}(1^x+1/x)^x";
+//	t = ":x(x)=sum_|{k=0}^|oo{{(x-a)^k~:x^(k)(a)}/k!} & \"\"=:x(a)+(x-a)~d::x(a)/dx"
+//	"+(x-a)^2/2!~d^2::x(a)/dx^2+(x-a)^3/3!~d^3::x(a)/dx^3+...";
+	t = "oiint_|{:j}{r~dA}={:p~r^2}/4";
+	tw.Background(PaintRect(fd, t));
+	tw.Run();
+}
+#endif
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/TDraw/formula.h b/uppsrc/TDraw/formula.h
new file mode 100644
index 000000000..6e152193a
--- /dev/null
+++ b/uppsrc/TDraw/formula.h
@@ -0,0 +1,267 @@
+#ifndef __TDraw_formula__
+#define __TDraw_formula__
+
+NAMESPACE_UPP
+inline int Percent(int p, int q) { return p * q / 100; }
+
+enum FORMSYMBOL
+{
+	FS_EMPTY,
+
+	FS_LPAREN,    FS_RPAREN,
+	FS_LBRACE,    FS_RBRACE,
+	FS_LSHARP,    FS_RSHARP,
+
+	FS_BRACKET_BEGIN,
+	FS_LBRACKET,  FS_RBRACKET,
+	FS_LTBRACKET, FS_RTBRACKET,
+	FS_LBBRACKET, FS_RBBRACKET,
+	FS_BRACKET_END,
+
+	FS_VBAR,
+	FS_SUM,
+	FS_PRODUCT,
+	FS_UNION,
+	FS_INTERSECTION,
+
+	FS_INT_BEGIN,
+	FS_INT, FS_IINT, FS_IIINT,
+	FS_OINT, FS_OIINT,
+	FS_INT_END,
+
+	FS_LOG_NOT,
+	FS_LOG_OR,
+
+	FS_SETOP_BEGIN,
+	FS_MEMBER, FS_NOT_MEMBER,
+	FS_SUBSET, FS_NOT_SUBSET,
+	FS_PROPER_SUBSET, FS_NOT_PROPER_SUBSET,
+	FS_SETOP_END,
+
+	FS_SYMBOL_COUNT,
+};
+
+static int   SymbolWidth(FORMSYMBOL symbol, int height, int textheight);
+static void  PaintSymbol(Draw& draw, FORMSYMBOL symbol, const Rect& rc, int textheight, Color color);
+
+class Formula : public RefBase
+{
+public:
+	Formula() : width(0), ascent(0), descent(0), textheight(0) {}
+	virtual ~Formula() {}
+
+	static int   GetWidth0(RefCon<Formula> f)      { return !!f ? f -> GetWidth() : 0; }
+	static int   GetAscent0(RefCon<Formula> f)     { return !!f ? f -> GetAscent() : 0; }
+	static int   GetDescent0(RefCon<Formula> f)    { return !!f ? f -> GetDescent() : 0; }
+	static int   GetHeight0(RefCon<Formula> f)     { return !!f ? f -> GetHeight() : 0; }
+	static Size  GetSize0(RefCon<Formula> f)       { return Size(GetWidth0(f), GetHeight0(f)); }
+
+	static int   GetTextHeight0(RefCon<Formula> f)
+	{ return !!f ? f -> GetTextHeight() : 0; }
+	static int   GetTextHeight0(RefCon<Formula> f, RefCon<Formula> g)
+	{ return max(GetTextHeight0(f), GetTextHeight0(g)); }
+	static int   GetTextHeight0(RefCon<Formula> f, RefCon<Formula> g, RefCon<Formula> h)
+	{ return max(GetTextHeight0(f), max(GetTextHeight0(g), GetTextHeight0(h))); }
+
+	static void  PaintRect0(RefCon<Formula> f, Draw& draw, int x_left, int y_baseline);
+
+	int          GetWidth() const           { return width; }
+	int          GetAscent() const          { return ascent; }
+	int          GetDescent() const         { return descent; }
+	int          GetHeight() const          { return ascent + descent; }
+	int          GetTextHeight() const      { return textheight; }
+	Size         GetSize() const            { return Size(GetWidth(), GetHeight()); }
+
+	void         PaintRect(Draw& draw, int x_left, int y_baseline) const;
+	virtual void Paint(Draw& draw, int x_left, int y_baseline) const = 0;
+
+	static int   GetHorzLeading(int height) { return height / 15; }
+	static int   GetVertLeading(int height) { return height / 5; }
+	static Size  GetLeading(int height)     { return Size(GetHorzLeading(height), GetVertLeading(height)); }
+	static int   GetLineOffset(int height)  { return Percent(10, height + 6); }
+	static int   GetLineWidth(int height)   { return Percent(4, height + 30); }
+	static int   GetIndexSize(int height)   { return (height * 13) >> 4; }
+	static int   GetOperSpace(int height)   { return (height * 2) >> 4; }
+	static int   GetFuncSpace(int height)   { return (height * 2) >> 4; }
+	static int   GetItalicDelta(int height) { return (height * 1) >> 6; }
+	static int   GetTextDeltaY(Font font);
+
+protected:
+	int          width;
+	int          ascent;
+	int          descent;
+	int          textheight;
+};
+
+class FormulaSpace : public Formula
+{
+public:
+	FormulaSpace(int width_, int ascent_ = 0, int descent_ = 0, int textheight_ = 0)
+	{ width = width_; ascent = ascent_; descent = descent_; textheight = textheight_; }
+
+	virtual void Paint(Draw& draw, int x_left, int y_baseline) const {}
+};
+
+class FormulaBox : public Formula
+{
+public:
+	enum FLAGS
+	{
+		TIGHT = 0x01,
+		THICK = 0x02,
+		INNER = 0x04,
+	};
+
+	FormulaBox(RefCon<Formula> in, Color color = SBlack, int flags = 0);
+	virtual void Paint(Draw& draw, int x_left, int y_baseline) const;
+
+private:
+	RefCon<Formula> in;
+	Color        color;
+	int          flags;
+	int          offset, boxwidth;
+};
+
+class FormulaSymbol : public Formula
+{
+public:
+
+public:
+	FormulaSymbol(FORMSYMBOL symbol, int height, int textheight, Color color = SBlack);
+	virtual void Paint(Draw& draw, int x_left, int y_baseline) const;
+
+private:
+	FORMSYMBOL  symbol;
+	Size        leading;
+	int         height;
+	Color       color;
+};
+
+class FormulaText : public Formula
+{
+public:
+	FormulaText(WString text, Font font = StdFont(), Color color = SBlack, int perc_dy = 0);
+	virtual void Paint(Draw& draw, int x_left, int y_baseline) const;
+
+private:
+	WString      text;
+	Font         font;
+	Color        color;
+	int          deltay;
+};
+
+class FormulaRatio : public Formula
+{
+public:
+	FormulaRatio(RefCon<Formula> top, RefCon<Formula> bottom, Color color = SBlack);
+	virtual void Paint(Draw& draw, int x_left, int y_baseline) const;
+
+private:
+	RefCon<Formula> top, bottom;
+	Color        color;
+	int          linewidth;
+};
+
+class FormulaSqrt : public Formula
+{
+public:
+	FormulaSqrt(RefCon<Formula> in, RefCon<Formula> power, Color color = SBlack);
+	virtual void Paint(Draw& draw, int x_left, int y_baseline) const;
+
+private:
+	RefCon<Formula> in, power;
+	int          linewidth, half;
+	int          leftpos;
+	int          slashwd, bslashwd;
+	int          leftwidth;
+	int          roofpos;
+	Size         leading;
+	Color        color;
+};
+
+class FormulaIndex : public Formula
+{
+public:
+	FormulaIndex(RefCon<Formula> in,
+		RefCon<Formula> topright = NULL, RefCon<Formula> bottomright = NULL,
+		RefCon<Formula> top = NULL,      RefCon<Formula> bottom = NULL,
+		RefCon<Formula> topleft = NULL,  RefCon<Formula> bottomleft = NULL);
+	virtual void Paint(Draw& draw, int x_left, int y_baseline) const;
+
+private:
+	RefCon<Formula> in;
+	RefCon<Formula> topright, bottomright;
+	RefCon<Formula> top, bottom;
+	RefCon<Formula> topleft, bottomleft;
+	int          rwidth, rtdy, rbdy;
+	int          offset, bwidth;
+	int          lwidth, ltdy, lbdy;
+	int          tlead, blead;
+};
+
+class FormulaParen : public Formula
+{
+public:
+	FormulaParen(RefCon<Formula> in, FORMSYMBOL lsym, FORMSYMBOL rsym, Color color = SBlack);
+	virtual void Paint(Draw& draw, int x_left, int y_baseline) const;
+
+private:
+	RefCon<Formula> in;
+	FORMSYMBOL   lsymbol, rsymbol;
+	Size         leading;
+	int          height;
+	int          lwidth, rwidth;
+	bool         txtparen;
+	Color        color;
+};
+
+class FormulaMatrix : public Formula
+{
+public:
+	FormulaMatrix(pick_ Vector< Vector< RefCon<Formula> > >& formulas, RefCon<Formula> sep = NULL);
+	FormulaMatrix(pick_ Vector< RefCon<Formula> >& formulas, RefCon<Formula> sep = NULL);
+	FormulaMatrix(pick_ Vector<Point>& pos, pick_ Vector< RefCon<Formula> >& formulas, RefCon<Formula> sep = NULL) { Init(pos, formulas, sep); }
+	virtual void Paint(Draw& draw, int x_left, int y_baseline) const;
+
+private:
+	void                         Init(pick_ Vector<Point>& pos, pick_ Vector< RefCon<Formula> >& formulas, RefCon<Formula> sep);
+
+private:
+	Index<Point>                 pos;
+	Vector< RefCon<Formula> > formulas;
+	RefCon<Formula>           sep;
+	Vector<int>                  xpos, ypos, widths, ascents, descents;
+};
+
+class FormulaIntegral : public Formula
+{
+public:
+	FormulaIntegral(RefCon<Formula> integrand, RefCon<Formula> bottom, RefCon<Formula> top, bool right_limits = false);
+	virtual void Paint(Draw& draw, int x_left, int y_baseline) const;
+
+private:
+	RefCon<Formula> bottom, top, addend;
+	int          right_limits;
+};
+
+RefCon<Formula> ParseFormula(const char *formula, Font font = Arial(100), Color color = SBlack);
+
+class FormulaDisplay : public Display {
+public:
+	FormulaDisplay(int std_height = 0);
+
+	void Paint(Draw& draw, const Rect& rc, const Value& value, Color ink, Color paper, dword style) const;
+	Size GetStdSize(const Value& value) const;
+
+private:
+	RefCon<Formula> Get(const Value& value, int ht, Color ink) const;
+
+private:
+	int std_height;
+};
+
+const Display& StdFormulaDisplay();
+
+END_UPP_NAMESPACE
+
+#endif//__TDraw_formula__
diff --git a/uppsrc/TDraw/util.cpp b/uppsrc/TDraw/util.cpp
new file mode 100644
index 000000000..0fbaab95b
--- /dev/null
+++ b/uppsrc/TDraw/util.cpp
@@ -0,0 +1,1301 @@
+#include "TDraw.h"
+#pragma hdrstop
+
+#ifdef PLATFORM_WIN32
+#include <PdfDraw/PdfDraw.h>
+
+#include <commdlg.h>
+#else
+enum { DOC_SCREEN_ZOOM = 140 };
+#endif
+
+NAMESPACE_UPP
+
+Size GetPixelsPerMeter(const Draw& draw)
+{
+	if(draw.Dots())
+		return Size(DOTS_PER_METER_INT, DOTS_PER_METER_INT);
+	else
+		return iscale(draw.GetPagePixels(), Size(1000, 1000), max(draw.GetPageMMs(), Size(1, 1)));
+}
+
+int GetHorzPixelsPerMeter(const Draw& draw)
+{
+	return draw.Dots() ? DOTS_PER_METER_INT
+		: iscale(draw.GetPagePixels().cx, 1000, max(draw.GetPageMMs().cx, 1));
+}
+
+int GetVertPixelsPerMeter(const Draw& draw)
+{
+	return draw.Dots() ? DOTS_PER_METER_INT
+		: iscale(draw.GetPagePixels().cy, 1000, max(draw.GetPageMMs().cy, 1));
+}
+
+int GetAvgPixelsPerMeter(const Draw& draw)
+{
+	Size mp = GetPixelsPerMeter(draw);
+	return (mp.cx + mp.cy) >> 1;
+}
+
+double GetHorzPixelsPerDot(const Draw& draw)
+{
+	return draw.Dots() ? 1 : GetHorzPixelsPerMeter(draw) / DOTS_PER_METER_DBL;
+}
+
+double GetVertPixelsPerDot(const Draw& draw)
+{
+	return draw.Dots() ? 1 : GetVertPixelsPerMeter(draw) / DOTS_PER_METER_DBL;
+}
+
+double GetAvgPixelsPerDot(const Draw& draw)
+{
+	if(draw.Dots())
+		return 1;
+	return GetAvgPixelsPerMeter(draw) / DOTS_PER_METER_DBL;
+}
+
+Font GetPixelFont(Font dot_font, const Draw& draw)
+{
+	if(draw.Pixels())
+		dot_font.Height(dot_font.GetHeight() * 140 / 1024);
+	return dot_font;
+}
+
+int DotsToPixels(const Draw& draw, int dots)
+{
+	return draw.Dots() ? dots : fround(dots * GetAvgPixelsPerDot(draw));
+}
+
+Size DotsToPixels(const Draw& draw, Size size)
+{
+	return draw.Dots()
+		? size
+		: iscale(size, GetPixelsPerMeter(draw), Size(DOTS_PER_METER_INT, DOTS_PER_METER_INT));
+}
+
+int HorzDotsToPixels(const Draw& draw, int dots)
+{
+	return draw.Dots() ? dots : fround(dots * GetHorzPixelsPerDot(draw));
+}
+
+int VertDotsToPixels(const Draw& draw, int dots)
+{
+	return draw.Dots() ? dots : fround(dots * GetVertPixelsPerDot(draw));
+}
+
+int PixelsToDots(const Draw& draw, int pixels)
+{
+	return draw.Dots() ? pixels : fround(pixels / GetAvgPixelsPerDot(draw));
+}
+
+Size PixelsToDots(const Draw& draw, Size size)
+{
+	return draw.Dots() ? size
+		: iscale(size, Size(DOTS_PER_METER_INT, DOTS_PER_METER_INT), GetPixelsPerMeter(draw));
+}
+
+int HorzPixelsToDots(const Draw& draw, int dots)
+{
+	return draw.Dots() ? dots : fround(dots / GetHorzPixelsPerDot(draw));
+}
+
+int VertPixelsToDots(const Draw& draw, int dots)
+{
+	return draw.Dots() ? dots : fround(dots / GetVertPixelsPerDot(draw));
+}
+
+int PixelsToPoints(const Draw& draw, int pixels)
+{
+	if(draw.Dots())
+		return pixels * 72 / 600;
+	return iscale(pixels, 72, draw.GetPixelsPerInch().cx);
+}
+
+Size PixelsToPoints(const Draw& draw, Size pixels)
+{
+	if(draw.Dots())
+		return pixels * 72 / 600;
+	return iscale(pixels, Size(72, 72), draw.GetPixelsPerInch());
+}
+
+int PointsToPixels(const Draw& draw, int points)
+{
+	if(draw.Dots())
+		return points * 600 / 72;
+	return iscale(points, draw.GetPixelsPerInch().cx, 72);
+}
+
+Size PointsToPixels(const Draw& draw, Size points)
+{
+	if(draw.Dots())
+		return points * 600 / 72;
+	return iscale(points, draw.GetPixelsPerInch(), Size(72, 72));
+}
+
+void RGBtoHSV(Color c, double& h, double& s, double& v)
+{
+	RGBtoHSV(c.GetR() / 255.0, c.GetG() / 255.0, c.GetB() / 255.0, h, s, v);
+}
+
+Color HSVtoRGB(double h, double s, double v)
+{
+	double r, g, b;
+	HSVtoRGB(h, s, v, r, g, b);
+	return Color(fround(r * 255.0), fround(g * 255.0), fround(b * 255.0));
+}
+
+Color GetColorGradient(Color c1, Color c2, int ratio1, int ratio2, double gamma)
+{
+	double h1, s1, v1;
+	double h2, s2, v2;
+	RGBtoHSV(pow(c1.GetR() / 255.0, gamma), pow(c1.GetG() / 255.0, gamma), pow(c1.GetB() / 255.0, gamma), h1, s1, v1);
+	RGBtoHSV(pow(c2.GetR() / 255.0, gamma), pow(c2.GetG() / 255.0, gamma), pow(c2.GetB() / 255.0, gamma), h2, s2, v2);
+	if(s1 == 0)
+		h1 = h2;
+	else if(s2 == 0)
+		h2 = h1;
+	double r = ratio1 / (double)ratio2;
+	gamma = 1 / gamma;
+	if(h2 > h1 + 0.5)
+		h1 = ((h1 += (h2 - 1 - h1) * r) < 0 ? h1 + 1 : h1);
+	else if(h1 > h2 + 0.5)
+		h1 = ((h1 += (h2 + 1 - h1) * r) > 1 ? h1 - 1 : h1);
+	else
+		h1 += (h2 - h1) * r;
+	HSVtoRGB(h1, s1 + (s2 - s1) * r, v1 + (v2 - v1) * r, h1, s1, v1);
+	return Color(fround(pow(h1, gamma) * 255.0), fround(pow(s1, gamma) * 255.0), fround(pow(v1, gamma) * 255.0));
+}
+
+#ifdef PLATFORM_WIN32
+static void DrawDragDropRectRaw(Draw& draw, const Rect& rc, HBRUSH brush, int width)
+{
+	UnrealizeObject(brush);
+	HGDIOBJ old_brush = SelectObject(draw, brush);
+	SetBrushOrgEx(draw, ~rc.left, ~rc.top, NULL);
+	Size size = rc.Size();
+	enum { NOTPATINVERT = 0x00A50065 };
+	if(2 * width >= min(size.cx, size.cy))
+		::PatBlt(draw, rc.left, rc.top, size.cx, size.cy, NOTPATINVERT);
+	else
+	{
+		::PatBlt(draw, rc.left, rc.top, size.cx, width, NOTPATINVERT);
+		::PatBlt(draw, rc.left, rc.bottom - width, size.cx, width, NOTPATINVERT);
+		::PatBlt(draw, rc.left, rc.top + width, width, size.cy - 2 * width, NOTPATINVERT);
+		::PatBlt(draw, rc.right - width, rc.top + width, width, size.cy - 2 * width, NOTPATINVERT);
+	}
+	SelectObject(draw, old_brush);
+}
+#endif
+
+#ifdef PLATFORM_X11
+static void DrawDragDropRectRaw(Draw& draw, const Rect& rc, int width)
+{
+	Size size = rc.Size();
+	if(2 * width <= min(size.cx, size.cy))
+		XFillRectangle(Xdisplay, draw.GetDrawable(), draw.GetGC(), rc.left, rc.top, size.cx, size.cy);
+	else
+	{
+		XFillRectangle(Xdisplay, draw.GetDrawable(), draw.GetGC(), rc.left, rc.top, size.cx, width);
+		XFillRectangle(Xdisplay, draw.GetDrawable(), draw.GetGC(), rc.left, rc.bottom - width, size.cx, width);
+		XFillRectangle(Xdisplay, draw.GetDrawable(), draw.GetGC(), rc.left, rc.top + width, width, size.cy - 2 * width);
+		XFillRectangle(Xdisplay, draw.GetDrawable(), draw.GetGC(), rc.right - width, rc.top + width, width, size.cy - 2 * width);
+	}
+}
+#endif
+
+void DrawDragDropRect(Draw& draw, const Rect& rc_old, const Rect& rc_new, int width, Color c1, Color c2)
+{
+#ifdef PLATFORM_WIN32
+	static const word halftone[] = { 0x5555, 0xaaaa, 0x5555, 0xaaaa, 0x5555, 0xaaaa, 0x5555, 0xaaaa };
+	HBITMAP bitmap = CreateBitmap(8, 8, 1, 1, halftone);
+	HBRUSH brush = CreatePatternBrush(bitmap);
+	DeleteObject(bitmap);
+	draw.BeginGdi();
+	SetTextColor(draw, c1);
+	SetBkColor(draw, c2);
+	if(!IsNull(rc_old))
+		DrawDragDropRectRaw(draw, rc_old, brush, width);
+	if(!IsNull(rc_new))
+		DrawDragDropRectRaw(draw, rc_new, brush, width);
+	DeleteObject(brush);
+	draw.EndGdi();
+#endif
+#ifdef PLATFORM_X11
+	XGCValues gcv_old, gcv_new;
+	XGetGCValues(Xdisplay, draw.GetGC(), GCForeground | GCFunction, &gcv_old);
+	gcv_new.function = X11_ROP2_XOR;
+	gcv_new.foreground = GetXPixel(c1);
+	XChangeGC(Xdisplay, draw.GetGC(), GCForeground | GCFunction, &gcv_new);
+	if(!IsNull(rc_old))
+		DrawDragDropRectRaw(draw, rc_old, width);
+	if(!IsNull(rc_new))
+		DrawDragDropRectRaw(draw, rc_new, width);
+	XChangeGC(Xdisplay, draw.GetGC(), GCForeground | GCFunction, &gcv_old);
+#endif
+}
+
+void DrawDragDropRect(Draw& draw, const Rect& rc_old, const Rect& rc_new, Color c1, Color c2)
+{
+	DrawDragDropRect(draw, rc_old, rc_new, max(rc_old.Width(), rc_new.Width()), c1, c2);
+}
+
+enum
+{
+	wPolyPolyline    = 100,
+	wPolyPolyPolygon = 101,
+	wEllipse         = 102,
+	wArc             = 103,
+};
+
+static void StreamUnpackPoints(Stream& stream, Point *out, int count)
+{
+	ASSERT(sizeof(Point) >= 8);
+	if(count == 0)
+		return;
+#ifdef CPU_LITTLE_ENDIAN
+	if(sizeof(Point) == 8) {
+		stream.Get(out, count * 8);
+		return;
+	}
+#endif
+	Point *end = out + count;
+	byte *top = reinterpret_cast<byte *>(end) - count * 8;
+	stream.Get(top, count * 8);
+	for(; out < end; out++, top += 8)
+	{
+		out -> x = Peek32le(top + 0);
+		out -> y = Peek32le(top + 4);
+	}
+}
+
+static void StreamPackPoints(Stream& stream, const Point *in, int count)
+{
+#ifdef CPU_LITTLE_ENDIAN
+	if(sizeof(Point) == 8) {
+		stream.Put(in, count * 8);
+		return;
+	}
+#endif
+	enum { PART = 1024 };
+	byte part[PART * 8];
+	while(count > 0) {
+		int part_count = min<int>(count, PART);
+		for(byte *pp = part, *pe = pp + 8 * part_count; pp < pe; pp += 8, in++) {
+			Poke32le(pp + 0, in -> x);
+			Poke32le(pp + 4, in -> y);
+		}
+		stream.Put(part, part_count * 8);
+		count -= part_count;
+	}
+}
+
+static void StreamUnpackInts(Stream& stream, int *out, int count)
+{
+	ASSERT(sizeof(int) >= 4);
+	int *end = out + count;
+	byte *top = reinterpret_cast<byte *>(end) - count * 4;
+	stream.Get(top, count * 4);
+	if(sizeof(int) > 4)
+	{
+		for(; out < end; out++, top += 4)
+			*out = Peek32le(top);
+	}
+	else
+	{
+#ifndef CPU_LITTLE_ENDIAN
+		BltSwapEndian4(out, out, count);
+#endif
+	}
+}
+
+static void StreamPackInts(Stream& stream, const int *in, int count)
+{
+	if(sizeof(int) == 4)
+	{
+#ifdef CPU_LITTLE_ENDIAN
+		stream.Put(in, count * 4);
+		return;
+#endif
+	}
+	enum { PART = 1024 };
+	byte part[PART * 4];
+	while(count > 0)
+	{
+		int part_count = min<int>(count, PART);
+		for(byte *pp = part, *pe = pp + 4 * part_count; pp < pe; pp += 4)
+			Poke32le(pp, *in++);
+		stream.Put(part, part_count * 4);
+		count -= part_count;
+	}
+}
+
+/*
+static void StreamPolyPolyline(Stream& stream,
+	Vector<Point>& out_vertices, const Point *in_vertices, int vertex_count,
+	Vector<int>& out_counts, const int *in_counts, int count_count,
+	int& width, Color& color, Color& doxor)
+{
+	int version = 2;
+	stream / version;
+	stream % width % color % doxor;
+	stream % vertex_count % count_count;
+	if(stream.IsLoading())
+	{
+		out_vertices.SetCount(vertex_count);
+		out_counts.SetCount(count_count);
+		StreamUnpackPoints(stream, out_vertices.Begin(), vertex_count);
+		StreamUnpackInts(stream, out_counts.Begin(), count_count);
+	}
+	else
+	{
+		StreamPackPoints(stream, in_vertices, vertex_count);
+		StreamPackInts(stream, in_counts, count_count);
+	}
+}
+*/
+
+#if STAT_LINES
+static int vertex_count = 0;
+static int segment_count = 0;
+int GetVertexCount()
+{
+	return vertex_count;
+}
+
+int GetSegmentCount()
+{
+#if STAT_LINES >= 2
+	static int prev = 0;
+	RLOG("GetSegmentCount() -> " << segment_count << ", delta = " << (segment_count - prev));
+	prev = segment_count;
+#endif
+	return segment_count;
+}
+#endif
+
+/*
+void DrawPolyPolyline(Draw& draw, const Point *vertices, int vertex_count,
+	const int *counts, int count_count, int width, Color color, Color doxor)
+{
+	//RTIMING("DrawPolyPolyline");
+
+	ASSERT(count_count > 0 && vertex_count > 0);
+	if(vertex_count < 2 || IsNull(color))
+		return;
+#if STAT_LINES
+	::vertex_count += vertex_count;
+	::segment_count += count_count;
+#if STAT_LINES >= 2
+	{ // log vertices
+		RLOG("Polyline (" << count_count << " segments, " << vertex_count << " vertices)");
+		const Point *p = vertices;
+		for(int s = 0; s < count_count; s++)
+		{
+			for(const Point *e = p + counts[s]; p < e; p++)
+				RLOG(*p);
+			RLOG("-------- (end of segment #" << s << ")");
+		}
+	}
+#endif
+#endif
+	if(draw.IsDrawing())
+	{
+//		TIMING("DrawPolyPolyline/stream")
+		Vector<Point> out_vertices;
+		Vector<int> out_counts;
+		StreamPolyPolyline(draw.DrawingOp(wPolyPolyline),
+			out_vertices, vertices, vertex_count, out_counts, counts, count_count, width, color, doxor);
+		return;
+	}
+//	TIMING("DrawPolyPolyline/hdc")
+	bool is_xor = !IsNull(doxor);
+	if(is_xor)
+		color = Color(color.GetR() ^ doxor.GetR(), color.GetG() ^ doxor.GetG(), color.GetB() ^ doxor.GetB());
+#if defined(PLATFORM_WIN32)
+	if(is_xor)
+		SetROP2(draw, R2_XORPEN);
+	draw.SetDrawPen(width, color);
+	enum { MAX_COUNT = 8000 };
+	if(count_count == 1)
+		Polyline(draw, (const POINT *)vertices, vertex_count);
+	else if(vertex_count <= MAX_COUNT)
+		PolyPolyline(draw, (const POINT *)vertices, (const dword *)counts, count_count);
+	else
+	{ // too many vertices / parts
+		const int *ce = counts + count_count;
+		while(counts < ce)
+		{
+			const int *cs = counts;
+			int total = 0;
+			while(counts < ce && total + *counts <= MAX_COUNT)
+				total += *counts++;
+			if(total)
+			{
+				PolyPolyline(draw, (const POINT *)vertices, (const dword *)cs, counts - cs);
+				vertices += total;
+			}
+			else
+			{
+				const Point *pts = vertices;
+				vertices += (total = *counts++);
+				for(; total > MAX_COUNT; pts += MAX_COUNT, total -= MAX_COUNT)
+					Polyline(draw, (const POINT *)pts, MAX_COUNT + 1);
+				if(total >= 2)
+					Polyline(draw, (const POINT *)pts, total);
+			}
+		}
+	}
+	if(is_xor)
+		SetROP2(draw, R2_COPYPEN);
+#elif defined(PLATFORM_X11)
+	XGCValues gcv_old, gcv_new;
+	XGetGCValues(Xdisplay, draw.GetGC(), GCForeground | GCLineWidth | GCFunction, &gcv_old);
+	gcv_new.function = is_xor ? X11_ROP2_COPY : X11_ROP2_XOR;
+	gcv_new.foreground = GetXPixel(color);
+	gcv_new.line_width = width;
+	XChangeGC(Xdisplay, draw.GetGC(), GCForeground | GCLineWidth | GCFunction, &gcv_new);
+	enum { REQUEST_LENGTH = 256 }; // X server XDrawLines request length (heuristic)
+	Point offset = draw.GetOffset();
+	if(vertex_count == 2)
+		XDrawLine(Xdisplay, draw.GetDrawable(), draw.GetGC(),
+			vertices[0].x + offset.x, vertices[0].y + offset.y,
+			vertices[1].x + offset.x, vertices[1].y + offset.y);
+	else if(count_count == 1 || vertex_count > count_count * (REQUEST_LENGTH + 2))
+	{
+		for(; --count_count >= 0; counts++)
+		{
+			Buffer<XPoint> part(*counts);
+			for(XPoint *vo = part, *ve = vo + *counts; vo < ve; vo++, vertices++)
+			{
+				vo -> x = (short)(vertices -> x + offset.x);
+				vo -> y = (short)(vertices -> y + offset.y);
+			}
+			XDrawLines(Xdisplay, draw.GetDrawable(), draw.GetGC(), part, *counts, CoordModeOrigin);
+		}
+	}
+	else
+	{
+		int segment_count = vertex_count - count_count;
+		Buffer<XSegment> segments(segment_count);
+		XSegment *so = segments;
+		while(--count_count >= 0)
+		{
+			const Point *end = vertices + *counts++;
+			so -> x1 = (short)(vertices -> x + offset.x);
+			so -> y1 = (short)(vertices -> y + offset.y);
+			vertices++;
+			so -> x2 = (short)(vertices -> x + offset.x);
+			so -> y2 = (short)(vertices -> y + offset.y);
+			so++;
+			while(++vertices < end) {
+				so -> x1 = so[-1].x2;
+				so -> y1 = so[-1].y2;
+				so -> x2 = (short)(vertices -> x + offset.x);
+				so -> y2 = (short)(vertices -> y + offset.y);
+				so++;
+			}
+		}
+		ASSERT(so == segments + segment_count);
+		XDrawSegments(Xdisplay, draw.GetDrawable(), draw.GetGC(), segments, segment_count);
+	}
+	XChangeGC(Xdisplay, draw.GetGC(), GCForeground | GCLineWidth | GCFunction, &gcv_old);
+#else
+	#error
+#endif
+}
+*/
+
+/*
+static void wsPolyPolyline(Draw& draw, Stream& stream, const DrawingPos& dp)
+{
+//	TIMING("wsPolyPolyline")
+	int width;
+	Color color, doxor;
+	Vector<Point> vertices;
+	Vector<int> counts;
+	StreamPolyPolyline(stream, vertices, 0, 0, counts, 0, 0, width, color, doxor);
+	if(!dp.Identity())
+	{
+		for(int i = 0; i < vertices.GetCount(); i++)
+			dp.Transform(vertices[i]);
+		if(width > 0)
+			dp.TransformW(width);
+	}
+	DrawPolyPolyline(draw, vertices, counts, width, color, doxor);
+}
+*/
+
+//static DrawerRegistrator MK__s(wPolyPolyline, wsPolyPolyline);
+
+/*
+void DrawPolyPolyline(Draw& draw, const Vector<Point>& vertices, const Vector<int>& counts, int width, Color color, Color doxor)
+{
+	DrawPolyPolyline(draw, vertices.Begin(), vertices.GetCount(),
+		counts.Begin(), counts.GetCount(), width, color, doxor);
+}
+*/
+
+/*
+void DrawPolyline(Draw& draw, const Point *vertices, int count, int width, Color color, Color doxor)
+{
+	DrawPolyPolyline(draw, vertices, count, &count, 1, width, color, doxor);
+}
+*/
+
+/*
+void DrawPolyline(Draw& draw, const Vector<Point>& vertices, int width, Color color, Color doxor)
+{
+	DrawPolyline(draw, vertices.Begin(), vertices.GetCount(), width, color, doxor);
+}
+*/
+
+static void StreamPolyPolyPolygon(Stream& stream,
+	Vector<Point>& out_vertices, const Point *in_vertices, int vertex_count,
+	Vector<int>& out_subpolygon_counts, const int *in_subpolygon_counts, int subpolygon_count_count,
+	Vector<int>& out_polygon_counts, const int *in_polygon_counts, int polygon_count_count,
+	Color& color, int& width, Color& outline, uint64& pattern, Color& doxor)
+{
+//	static TimingInspector ti("StreamPolyPolygon");
+//	ti.Start();
+	int version = 2;
+	stream / version;
+	stream % color % width % outline % pattern % doxor;
+//	ti.End();
+	stream % vertex_count % subpolygon_count_count % polygon_count_count;
+	if(polygon_count_count <= 0 || polygon_count_count > subpolygon_count_count
+	|| subpolygon_count_count <= 0 || subpolygon_count_count > vertex_count)
+	{
+		stream.SetError();
+		return;
+	}
+	if(stream.IsLoading())
+	{
+		out_vertices.SetCount(vertex_count);
+		out_subpolygon_counts.SetCount(subpolygon_count_count);
+		out_polygon_counts.SetCount(polygon_count_count);
+		StreamUnpackPoints(stream, out_vertices, vertex_count);
+		StreamUnpackInts(stream, out_subpolygon_counts, subpolygon_count_count);
+		StreamUnpackInts(stream, out_polygon_counts, polygon_count_count);
+	}
+	else
+	{
+		StreamPackPoints(stream, in_vertices, vertex_count);
+		StreamPackInts(stream, in_subpolygon_counts, subpolygon_count_count);
+		StreamPackInts(stream, in_polygon_counts, polygon_count_count);
+	}
+}
+
+#ifdef PLATFORM_WIN32
+static void DrawPolyPolygonRaw(Draw& draw, const Point *vertices, int vertex_count,
+	const int *subpolygon_counts, int subpolygon_count_count,
+	bool is_inside, int outline_width, Color outline_color
+)
+{
+	draw.SetDrawPen(outline_width, outline_color);
+	ASSERT(sizeof(POINT) == sizeof(Point)); // modify algorithm when not
+	enum { MAX_POLY = 8000 };
+	if(subpolygon_count_count == 1 && vertex_count < MAX_POLY)
+		Polygon(draw, (const POINT *)vertices, vertex_count);
+	else if(vertex_count < MAX_POLY)
+		PolyPolygon(draw, (const POINT *)vertices, subpolygon_counts, subpolygon_count_count);
+	else {
+		if(is_inside) {
+			draw.SetDrawPen(PEN_NULL, Black);
+			Vector<Point> split_vertices;
+			Vector<int> split_counts;
+			SplitPolygon(vertices, vertex_count, subpolygon_counts, subpolygon_count_count,
+				split_vertices, split_counts, draw.GetClip());
+			//!! todo: maxcount for splitpolygon
+			const Point *sv = split_vertices.Begin();
+			for(const int *sc = split_counts.Begin(), *se = split_counts.End(); sc < se; sc++) {
+				Polygon(draw, (const POINT *)sv, *sc);
+				sv += *sc;
+			}
+		}
+		if(outline_width != PEN_NULL) {
+			draw.DrawPolyPolyline(vertices, vertex_count, subpolygon_counts, subpolygon_count_count,
+				outline_width, outline_color, Null);
+			Buffer<Point> finish(2 * subpolygon_count_count);
+			Buffer<int> counts(subpolygon_count_count);
+			Fill(&counts[0], &counts[subpolygon_count_count], 2);
+			Point *d = finish;
+			const Point *p = vertices;
+			const int *c = subpolygon_counts, *e = c + subpolygon_count_count;
+			while(c < e)
+			{
+				*d++ = *p;
+				*d++ = (p += *c++)[-1];
+			}
+			draw.DrawPolyPolyline(finish, 2 * subpolygon_count_count,
+				counts, subpolygon_count_count, outline_width, outline_color, Null);
+		}
+		draw.SetDrawPen(outline_width, outline_color);
+	}
+}
+#elif defined(PLATFORM_X11)
+static void FillPolyPolygonRaw(GC gc, Drawable drawable, Rect clip, Point offset,
+	const Point *vertices, int vertex_count,
+	const int *subpolygon_counts, int subpolygon_count_count)
+{
+	enum { MAX_VERTEX_COUNT = 10000 };
+
+	if(subpolygon_count_count == 1 && vertex_count <= MAX_VERTEX_COUNT) {
+		Buffer<XPoint> out_points(vertex_count);
+		const Point *in = vertices;
+		for(XPoint *out = out_points, *end = out + vertex_count; out < end; out++, in++)
+		{
+			out -> x = (short)(in -> x + offset.x);
+			out -> y = (short)(in -> y + offset.y);
+		}
+		XFillPolygon(Xdisplay, drawable, gc,
+			out_points, vertex_count, Nonconvex, CoordModeOrigin);
+	}
+	else {
+		Vector<Point> split_vertices;
+		ASSERT(sizeof(XPoint) <= sizeof(Point)); // modify algorithm when not
+		Vector<int> split_counts;
+		SplitPolygon(vertices, vertex_count, subpolygon_counts, subpolygon_count_count,
+			split_vertices, split_counts, clip);
+		const Point *sv = split_vertices.Begin();
+		XPoint *dv = reinterpret_cast<XPoint *>(split_vertices.Begin());
+		for(const int *sc = split_counts.Begin(), *se = split_counts.End(); sc < se; sc++) {
+			for(XPoint *db = dv, *de = dv + *sc; db < de; db++, sv++) {
+				db -> x = (short)(sv -> x + offset.x);
+				db -> y = (short)(sv -> y + offset.y);
+			}
+			XFillPolygon(Xdisplay, drawable, gc, dv, *sc, Nonconvex, CoordModeOrigin);
+		}
+	}
+}
+
+static void DrawPolyPolygonRaw(GC gc, Drawable drawable, Point offset,
+	const Point *vertices, int vertex_count,
+	const int *subpolygon_counts, int subpolygon_count_count)
+{
+	for(const int *sp = subpolygon_counts, *se = sp + subpolygon_count_count; sp < se; sp++) {
+		Buffer<XPoint> segment(*sp + 1);
+		XPoint *out = segment;
+		for(const Point *end = vertices + *sp; vertices < end; vertices++, out++)
+		{
+			out -> x = (short)(vertices -> x + offset.x);
+			out -> y = (short)(vertices -> y + offset.y);
+		}
+		*out = segment[0];
+		XDrawLines(Xdisplay, drawable, gc, segment, *sp + 1, CoordModeOrigin);
+	}
+}
+#endif
+
+/*
+#ifdef PLATFORM_X11
+Pixmap GetPatternPixmap(int64 pattern)
+{
+	static VectorMap<int64, Image> cache;
+	int f = cache.Find(pattern);
+	if(f >= 0)
+		return cache[f];
+	if(cache.GetCount() >= 1000)
+		cache.Clear();
+	ImageBuffer new_image(Size(8, 8));
+	for(int p = 0; p < 64; p++) {
+		RGBA rgba = { 0, 0, 0, pattern & (1 << p) ? 255 : 0 };
+		new_
+		new_image[p] = (pattern & (1 << p) ? RGBAZero() :
+	new_image.(8, 8);
+	PixelArray px;
+	px.CreateMono(8, 8, 1);
+	for(int p = 0; p < 8; p++)
+		*px.GetUpScan(p) = (byte)(~pattern >> (8 * p));
+	ImageMaskDraw im(new_image);
+	px.Paint(im);
+	im.Close();
+	cache.Add(pattern, new_image);
+	return new_image;
+}
+#endif
+*/
+
+void DrawPolyPolyPolygon(Draw& draw, const Point *vertices, int vertex_count,
+	const int *subpolygon_counts, int subpolygon_count_count,
+	const int *disjunct_polygon_counts, int disjunct_polygon_count_count,
+	Color color, int width, Color outline, uint64 pattern, Color doxor)
+{
+	if(vertex_count == 0)
+		return;
+
+#ifdef PLATFORM_WIN32
+	if(PdfDraw *pdf = dynamic_cast<PdfDraw *>(&draw)) {
+		pdf->DrawPolyPolyPolygon(vertices, vertex_count, subpolygon_counts, subpolygon_count_count,
+			disjunct_polygon_counts, disjunct_polygon_count_count, color, width, outline, pattern, doxor);
+		return;
+	}
+#endif
+
+//	LOG("DrawPolyPolyPolygon: drawing = " << (draw.IsDrawing() ? "yes" : "no")
+//		<< ", backdraw = " << (draw.IsBack() ? "yes" : "no")
+//		<< ", " << (draw.Dots() ? "dots" : "pixels")
+//		<< ", printer = " << (draw.IsPrinter() ? "yes" : "no"));
+//	LOG("#vertices = " << vertex_count << ", #subpolygons = " << subpolygon_count_count
+//	<< ", #disjunct polygons = " << disjunct_polygon_count_count);
+//	LOG("color = " << Dump(color) << ", width = " << width << ", outline = " << Dump(outline)
+//	<< ", pattern = " << Dump(pattern) << ", doxor = " << doxor);
+
+#ifdef _DEBUG
+//	for(int v = 0; v < vertex_count; v++)
+//		if(abs2(vertices[v] - vertices[(v ? v : vertex_count) - 1]) >= 500 * 500)
+//			NEVER();
+#endif
+
+	if(draw.IsDrawing())
+	{
+//		TIMING("DrawPolyPolygon/stream");
+		Vector<Point> out_vertices;
+		Vector<int> out_subpolygon_counts, out_polygon_counts;
+		StreamPolyPolyPolygon(draw.DrawingOp(wPolyPolyPolygon),
+			out_vertices, vertices, vertex_count,
+			out_subpolygon_counts, subpolygon_counts, subpolygon_count_count,
+			out_polygon_counts, disjunct_polygon_counts, disjunct_polygon_count_count,
+			color, width, outline, pattern, doxor);
+		return;
+	}
+//	TIMING("DrawPolyPolygon/hdc");
+	bool is_xor = !IsNull(doxor);
+
+#ifdef PLATFORM_X11
+	unsigned xor_pixel = (is_xor ? GetXPixel(doxor) : 0);
+	XGCValues gcv;
+	gcv.function = is_xor ? X11_ROP2_XOR : X11_ROP2_COPY;
+	GC fill_gc = NULL;
+	Image pattern_image;
+	if(!IsNull(color)) {
+		gcv.foreground = GetXPixel(color) ^ xor_pixel;
+		int fmask = GCForeground | GCFunction;
+		if(pattern) {
+			pattern_image = GetPatternImage(pattern);
+			gcv.stipple = pattern_image.GetMaskPixmap();
+			gcv.fill_style = FillStippled;
+			fmask |= GCStipple | GCFillStyle;
+		}
+		fill_gc = XCreateGC(Xdisplay, draw.GetDrawable(), fmask, &gcv);
+	}
+	GC line_gc = NULL;
+	if(!IsNull(outline)) {
+		gcv.foreground = GetXPixel(outline) ^ xor_pixel;
+		gcv.line_width = width;
+		line_gc = XCreateGC(Xdisplay, draw.GetDrawable(), GCForeground | GCFunction | GCLineWidth, &gcv);
+		Point offset = draw.GetOffset();
+	}
+#endif
+
+	for(int i = 0; i < disjunct_polygon_count_count; i++, disjunct_polygon_counts++) {
+		int poly = *disjunct_polygon_counts;
+		int sub = 1;
+		if(*subpolygon_counts < poly)
+			if(disjunct_polygon_count_count > 1) {
+				const int *se = subpolygon_counts;
+				int total = 0;
+				while(total < poly)
+					total += *se++;
+				sub = se - subpolygon_counts;
+			}
+			else
+				sub = subpolygon_count_count;
+
+		if(sub > poly) {
+			vertices += poly;
+			subpolygon_counts += sub;
+			continue;
+		}
+
+
+#if defined(PLATFORM_WIN32)
+		if(pattern) {
+			int old_rop = GetROP2(draw);
+			HGDIOBJ old_brush = GetCurrentObject(draw, OBJ_BRUSH);
+			word wpat[8] = {
+				(byte)(pattern >> 56), (byte)(pattern >> 48), (byte)(pattern >> 40), (byte)(pattern >> 32),
+				(byte)(pattern >> 24), (byte)(pattern >> 16), (byte)(pattern >> 8), (byte)(pattern >> 0),
+			};
+			HBITMAP bitmap = CreateBitmap(8, 8, 1, 1, wpat);
+			HBRUSH brush = ::CreatePatternBrush(bitmap);
+			COLORREF old_bk = GetBkColor(draw);
+			COLORREF old_fg = GetTextColor(draw);
+			if(!is_xor) {
+				SetROP2(draw, R2_MASKPEN);
+				SelectObject(draw, brush);
+				SetTextColor(draw, Black());
+				SetBkColor(draw, White());
+				DrawPolyPolygonRaw(draw, vertices, poly,
+					subpolygon_counts, sub, true, PEN_NULL, Null);
+				SetROP2(draw, R2_MERGEPEN);
+				SetTextColor(draw, color);
+				SetBkColor(draw, Black());
+			}
+			else { // xor fill with pattern data
+				SetROP2(draw, R2_XORPEN);
+				SelectObject(draw, brush);
+			}
+			DrawPolyPolygonRaw(draw, vertices, poly,
+				subpolygon_counts, sub, true, PEN_NULL, Null);
+			SelectObject(draw, old_brush);
+			SetTextColor(draw, old_fg);
+			SetBkColor(draw, old_bk);
+			SetROP2(draw, old_rop);
+			DeleteObject(brush);
+			DeleteObject(bitmap);
+			if(!IsNull(outline))
+			{
+				draw.SetColor(Null);
+				draw.SetDrawPen(width, outline);
+				ASSERT(sizeof(POINT) == sizeof(Point));
+				PolyPolygon(draw, (const POINT *)vertices, subpolygon_counts, sub);
+			}
+		}
+		else
+		{ // simple fill
+	//		RTIMING("AreaTool::Fill(solid color)");
+			int out_wd = (IsNull(width) || IsNull(outline) ? PEN_NULL : width);
+			Color out_co = Nvl(outline, Black);
+			draw.SetDrawPen(out_wd, out_co);
+			if(is_xor)
+			{
+				color = Color(color.GetR() ^ doxor.GetR(), color.GetG() ^ doxor.GetG(), color.GetB() ^ doxor.GetB());
+				SetROP2(draw, R2_XORPEN);
+			}
+			HGDIOBJ old_brush = 0;
+			if(IsNull(color))
+			{
+				static HGDIOBJ null_brush = GetStockObject(NULL_BRUSH);
+				old_brush = SelectObject(draw, null_brush);
+			}
+			else
+				draw.SetColor(color);
+			DrawPolyPolygonRaw(draw, vertices, poly, subpolygon_counts, sub,
+				!IsNull(color), out_wd, out_co);
+			if(old_brush)
+				SelectObject(draw, old_brush);
+			if(is_xor)
+				SetROP2(draw, R2_COPYPEN);
+		}
+#elif defined(PLATFORM_X11)
+		if(fill_gc)
+			FillPolyPolygonRaw(fill_gc, draw.GetDrawable(), draw.GetClip(), draw.GetOffset(),
+				vertices, poly, subpolygon_counts, sub);
+		if(line_gc)
+			DrawPolyPolygonRaw(line_gc, draw.GetDrawable(), draw.GetOffset(),
+				vertices, poly, subpolygon_counts, sub);
+#else
+	#error
+#endif
+		vertices += poly;
+		subpolygon_counts += sub;
+	}
+
+#ifdef PLATFORM_X11
+	if(fill_gc)
+		XFreeGC(Xdisplay, fill_gc);
+	if(line_gc)
+		XFreeGC(Xdisplay, line_gc);
+#endif
+}
+
+static void wsPolyPolyPolygon(Draw& draw, Stream& stream, const DrawingPos& dp)
+{
+//	TIMING("wsPolyPolygon")
+	Color color, outline, doxor;
+	int width;
+	uint64 pattern;
+	Vector<Point> vertices;
+	Vector<int> subpolygon_counts, polygon_counts;
+	StreamPolyPolyPolygon(stream, vertices, 0, 0,
+		subpolygon_counts, 0, 0, polygon_counts, 0, 0, color, width, outline, pattern, doxor);
+	if(!dp.Identity()) {
+		for(int i = 0; i < vertices.GetCount(); i++)
+			dp.Transform(vertices[i]);
+		if(width > 0)
+			dp.TransformW(width);
+	}
+	DrawPolyPolyPolygon(draw, vertices, subpolygon_counts, polygon_counts,
+		color, width, outline, pattern, doxor);
+}
+
+static DrawerRegistrator MK__s(wPolyPolyPolygon, wsPolyPolyPolygon);
+
+void DrawPolyPolyPolygon(Draw& draw, const Vector<Point>& vertices,
+	const Vector<int>& subpolygon_counts, const Vector<int>& disjunct_polygon_counts,
+	Color color, int width, Color outline, uint64 pattern, Color doxor)
+{
+	DrawPolyPolyPolygon(draw, vertices.Begin(), vertices.GetCount(),
+		subpolygon_counts.Begin(), subpolygon_counts.GetCount(),
+		disjunct_polygon_counts.Begin(), disjunct_polygon_counts.GetCount(),
+		color, width, outline, pattern, doxor);
+}
+
+void DrawPolyPolygon(Draw& draw, const Point *vertices, int vertex_count,
+	const int *subpolygon_counts, int subpolygon_count_count,
+	Color color, int width, Color outline, uint64 pattern, Color doxor)
+{
+	DrawPolyPolyPolygon(draw, vertices, vertex_count,
+		subpolygon_counts, subpolygon_count_count, &vertex_count, 1,
+		color, width, outline, pattern, doxor);
+}
+
+void DrawPolyPolygon(Draw& draw, const Vector<Point>& vertices, const Vector<int>& subpolygon_counts,
+	Color color, int width, Color outline, uint64 pattern, Color doxor)
+{
+	DrawPolyPolygon(draw, vertices.Begin(), vertices.GetCount(),
+		subpolygon_counts.Begin(), subpolygon_counts.GetCount(),
+		color, width, outline, pattern, doxor);
+}
+
+void DrawPolygons(Draw& draw, const Point *vertices, int vertex_count, const int *polygon_counts, int polygon_count_count,
+	Color color, int width, Color outline, uint64 pattern, Color doxor)
+{
+	DrawPolyPolyPolygon(draw, vertices, vertex_count,
+		polygon_counts, polygon_count_count, polygon_counts, polygon_count_count,
+		color, width, outline, pattern, doxor);
+}
+
+void DrawPolygons(Draw& draw, const Vector<Point>& vertices, const Vector<int>& polygon_counts,
+	Color color, int width, Color outline, uint64 pattern, Color doxor)
+{
+	DrawPolygons(draw, vertices.Begin(), vertices.GetCount(),
+		polygon_counts.Begin(), polygon_counts.GetCount(),
+		color, width, outline, pattern, doxor);
+}
+
+void DrawPolygon(Draw& draw, const Point *vertices, int vertex_count,
+	Color color, int width, Color outline, uint64 pattern, Color doxor)
+{
+	DrawPolyPolyPolygon(draw, vertices, vertex_count,
+		&vertex_count, 1, &vertex_count, 1, color, width, outline, pattern, doxor);
+}
+
+void DrawPolygon(Draw& draw, const Vector<Point>& vertices,
+	Color color, int width, Color outline, uint64 pattern, Color doxor)
+{
+	DrawPolygon(draw, vertices.Begin(), vertices.GetCount(), color, width, outline, pattern, doxor);
+}
+
+/*
+static void StreamEllipse(Stream& stream, Rect& rc, Color& color, Color& outline, int& outline_width)
+{
+	int version = 1;
+	stream / version % rc % color % outline / outline_width;
+}
+
+static void wsEllipse(Draw& draw, Stream& stream, const DrawingPos& dp)
+{
+//	TIMING("wsEllipse")
+	Rect rc;
+	Color color, outline;
+	int outline_width;
+	StreamEllipse(stream, rc, color, outline, outline_width);
+	dp.Transform(rc);
+	dp.TransformW(outline_width);
+	DrawEllipse(draw, rc, color, outline, outline_width);
+}
+
+static DrawerRegistrator MK__s(wEllipse, wsEllipse);
+
+void DrawEllipse(Draw& draw, const Rect& rc, Color color, Color outline, int outline_width)
+{
+	if(draw.IsDrawing())
+	{
+		Rect rtmp = rc;
+		StreamEllipse(draw.DrawingOp(wEllipse), rtmp, color, outline, outline_width);
+		return;
+	}
+
+#if defined(PLATFORM_WIN32)
+	draw.SetDrawPen(outline_width, outline);
+	draw.SetColor(color);
+	DrawEllipse(draw, rc);
+#elif defined(PLATFORM_X11)
+	XGCValues gcv, gcv_old;
+	enum { GC_BACKUP = GCForeground | GCArcMode | GCLineWidth };
+	XGetGCValues(Xdisplay, draw.GetGC(), GC_BACKUP, &gcv_old);
+	Point offset = draw.GetOffset();
+	if(!IsNull(color))
+	{
+		gcv.foreground = GetXPixel(color);
+		gcv.arc_mode = ArcChord;
+		XChangeGC(Xdisplay, draw.GetGC(), GCForeground | GCArcMode, &gcv);
+		XFillArc(Xdisplay, draw.GetDrawable(), draw.GetGC(),
+			rc.left + offset.x, rc.top + offset.y, rc.Width(), rc.Height(), 0, 360 * 64);
+	}
+	if(!IsNull(outline))
+	{
+		gcv.foreground = GetXPixel(outline);
+		gcv.line_width = outline_width;
+		XChangeGC(Xdisplay, draw.GetGC(), GCForeground | GCLineWidth, &gcv);
+		XDrawArc(Xdisplay, draw.GetDrawable(), draw.GetGC(),
+			rc.left + offset.x, rc.top + offset.y, rc.Width() - 1, rc.Height() - 1, 0, 360 * 64);
+	}
+	XChangeGC(Xdisplay, draw.GetGC(), GC_BACKUP, &gcv_old);
+#else
+	#error
+#endif//PLATFORM
+}
+*/
+
+/*
+static void StreamArc(Stream& stream, Rect& rc, Point& start, Point& end, Color& color, int& width)
+{
+	int version = 1;
+	stream / version % rc % start % end % color / width;
+}
+
+static void wsArc(Draw& draw, Stream& stream, const DrawingPos& dp)
+{
+//	TIMING("wsEllipse")
+	Rect rc;
+	Point start, end;
+	Color color;
+	int width;
+	StreamArc(stream, rc, start, end, color, width);
+	dp.Transform(start);
+	dp.Transform(end);
+	dp.TransformW(width);
+	DrawArc(draw, rc, start, end, color, width);
+}
+
+static DrawerRegistrator MK__s(wArc, wsArc);
+
+void DrawArc(Draw& draw, const Rect& rc, Point start, Point end, Color color, int width)
+{
+	if(draw.IsDrawing())
+	{
+		Rect rtmp = rc;
+		StreamArc(draw.DrawingOp(wArc), rtmp, start, end, color, width);
+		return;
+	}
+
+#if defined(PLATFORM_WIN32)
+	draw.SetDrawPen(width, color);
+	DrawArc(draw.GetHandle(), rc, start, end);
+#elif defined(PLATFORM_X11)
+	XGCValues gcv, gcv_old;
+	XGetGCValues(Xdisplay, draw.GetGC(), GCForeground, &gcv_old);
+	Point offset = draw.GetOffset();
+	gcv.foreground = GetXPixel(color);
+	XChangeGC(Xdisplay, draw.GetGC(), GCForeground, &gcv);
+	Point centre = rc.CenterPoint();
+	int angle1 = fround(360 * 64 / TWOPI * atan2(start.x - centre.x, centre.y - start.y));
+	int angle2 = fround(360 * 64 / TWOPI * atan2(end.x - centre.x, centre.y - end.y));
+	if(angle2 <= angle1)
+		angle2 += 360 * 64;
+	XDrawArc(Xdisplay, draw.GetDrawable(), draw.GetGC(), rc.left + offset.x, rc.top + offset.y,
+		rc.Width(), rc.Height(), angle1, angle2);
+	XChangeGC(Xdisplay, draw.GetGC(), GCForeground, &gcv_old);
+#else
+	#error
+#endif
+}
+*/
+
+/*
+Size ImageDisplay::GetStdSize(const Value& q) const
+{
+	return Image(q).GetSize();
+}
+*/
+
+/*
+void ImageDisplay::Paint(Draw& draw, const Rect& rc, const Value& q, Color ink, Color paper, dword style) const
+{
+	draw.DrawRect(rc, paper);
+	Image image(q);
+
+	if(!image)
+		return;
+
+	Size size = image.GetSize();
+
+	Point pos;
+	switch(halign)
+	{
+	case ALIGN_LEFT:   pos.x = rc.left; break;
+	case ALIGN_RIGHT:  pos.x = rc.right - size.cx; break;
+	default:           pos.x = (rc.left + rc.right - size.cx) >> 1; break;
+	}
+	switch(valign)
+	{
+	case ALIGN_TOP:    pos.y = rc.top; break;
+	case ALIGN_BOTTOM: pos.y = rc.bottom - size.cy; break;
+	default:           pos.y = (rc.top + rc.bottom - size.cy) >> 1; break;
+	}
+
+	switch(layout)
+	{
+	default:
+		NEVER();
+		break;
+
+	case SINGLE:
+		draw.DrawImage(pos.x, pos.y, image);
+		break;
+
+	case STRETCH:
+		draw.DrawImage(rc, image);
+		break;
+
+	case TILE:
+		pos -= size * idivceil(pos - rc.TopLeft(), size);
+		for(Point at = pos; at.y < rc.bottom; at.y += size.cy)
+			for(at.x = pos.x; at.x < rc.right; at.x += size.cx)
+				draw.DrawImage(at.x, at.y, image);
+		break;
+	}
+}
+*/
+
+/*
+const ImageDisplay& CenterImageDisplay()
+{
+	static ImageDisplay display(ImageDisplay::SINGLE);
+	return display;
+}
+*/
+
+/*
+const ImageDisplay& StretchImageDisplay()
+{
+	static ImageDisplay display(ImageDisplay::STRETCH);
+	return display;
+}
+*/
+
+/*
+const ImageDisplay& TileImageDisplay()
+{
+	static ImageDisplay display(ImageDisplay::TILE);
+	return display;
+}
+*/
+
+GradientDisplay::GradientDisplay(Point a, Color ca, Point b, Color cb, double gamma)
+: a(a), ca(ca), b(b), cb(cb), gamma(gamma)
+{
+}
+
+static void DrawGradient(Draw& draw, const Rect& rc, Point A, Color cA, Point B, Color cB, double gamma = 2.5, int step = 16)
+{
+#ifdef PLATFORM_WIN32
+	Point N = B - A;
+	if(!(N.x | N.y))
+		N = Size(1, 1);
+	int shift = ScalarProduct(A, N);
+	int scale = ScalarProduct(B, N) - shift;
+
+	if(draw.IsDrawing())
+	{
+		int block = 16;
+		for(int x = rc.left; x < rc.right; x += block)
+			for(int y = rc.top; y < rc.bottom; y += block)
+				draw.DrawRect(x, y, block, block,
+					GetColorGradient(cA, cB, ScalarProduct(Point(x, y), N) - shift, scale, gamma));
+		return;
+	}
+
+	draw.BeginGdi();
+	SelectObject(draw, GetStockObject(NULL_PEN));
+	SelectObject(draw, GetStockObject(NULL_BRUSH));
+
+	Point pt = draw.LPtoDP(Point(0, 0));
+	SetBrushOrgEx(draw, pt.x, pt.y, NULL);
+
+	Point poly[4];
+	int l, h, d;
+	bool horz = (abs(N.x) >= abs(N.y));
+	if(horz)
+	{ // major x: track x axis
+		d = iscale(-N.y, rc.Height(), N.x);
+		l = rc.left;
+		h = rc.right;
+		poly[0].y = poly[1].y = rc.top;
+		poly[2].y = poly[3].y = rc.bottom;
+	}
+	else
+	{
+		d = iscale(-N.x, rc.Width(), N.y);
+		l = rc.top;
+		h = rc.bottom;
+		poly[0].x = poly[1].x = rc.left;
+		poly[2].x = poly[3].x = rc.right;
+	}
+	l -= max(d, 0);
+	h -= min(d, 0);
+
+	for(; l < h; l += step)
+	{
+		if(horz)
+			poly[3].x = (poly[2].x = (poly[1].x = (poly[0].x = l) + step) + d) - step;
+		else
+			poly[3].y = (poly[2].y = (poly[1].y = (poly[0].y = l) + step) + d) - step;
+		HGDIOBJ old_brush = SelectObject(draw, CreateSolidBrush(
+			GetColorGradient(cA, cB, ScalarProduct(poly[0], N) - shift, scale, gamma)));
+		Polygon(draw, *poly, 4);
+		DeleteObject(SelectObject(draw, old_brush));
+	}
+
+	draw.EndGdi();
+#endif
+}
+
+Point GradientDisplay::GetRectPoint(Point P, const Rect& rc)
+{
+	P.x += (P.x >= 0 ? rc.left : rc.right);
+	P.y += (P.y >= 0 ? rc.top : rc.bottom);
+	return P;
+}
+
+void GradientDisplay::Paint(Draw& draw, const Rect& rc, const Value& q, Color ink, Color paper, dword style) const
+{
+	if(!IsNull(ca))
+		ink = ca;
+	if(!IsNull(cb))
+		paper = cb;
+	DrawGradient(draw, rc, GetRectPoint(a, rc), ink, GetRectPoint(b, rc), paper, gamma);
+}
+
+PrinterInfo::PrinterInfo()
+: page_size(0, 0)
+{
+#if defined(PLATFORM_WIN32) && defined(flagGUI)
+	devmode = NULL;
+	PAGESETUPDLG psd;
+	Zero(psd);
+	psd.lStructSize = sizeof(psd);
+	psd.Flags = PSD_RETURNDEFAULT | PSD_INHUNDREDTHSOFMILLIMETERS;
+	if(!PageSetupDlg(&psd))
+		return;
+	if(psd.hDevMode)
+	{
+		const DEVMODE *dm = (const DEVMODE *)GlobalLock(psd.hDevMode);
+		devmode_data = String((const char *)dm, dm -> dmSize + dm -> dmDriverExtra);
+		devmode = (const DEVMODE *)devmode_data.Begin();
+		GlobalUnlock(psd.hDevMode);
+		GlobalFree(psd.hDevMode);
+	}
+	if(psd.hDevNames)
+	{
+		const DEVNAMES *dn = (const DEVNAMES *)GlobalLock(psd.hDevNames);
+		const char *p = (const char *)dn;
+		driver = String(p + dn -> wDriverOffset);
+		device = String(p + dn -> wDeviceOffset);
+		output = String(p + dn -> wOutputOffset);
+		GlobalUnlock(psd.hDevNames);
+		GlobalFree(psd.hDevNames);
+	}
+	HDC hdc = CreateIC(driver, device, output, devmode);
+	if(hdc)
+	{
+		Size mm_size(GetDeviceCaps(hdc, HORZSIZE), GetDeviceCaps(hdc, VERTSIZE));
+		page_size = iscale(mm_size, 6000, 254);
+		DeleteDC(hdc);
+	}
+#endif
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/TDraw/util.h b/uppsrc/TDraw/util.h
new file mode 100644
index 000000000..946f37343
--- /dev/null
+++ b/uppsrc/TDraw/util.h
@@ -0,0 +1,197 @@
+NAMESPACE_UPP
+
+static const int    DOTS_PER_METER_INT = 23622;
+static const double DOTS_PER_METER_DBL = 600e3 / 25.4;
+
+Draw&  ScreenInfo();
+
+Size   GetPixelsPerMeter(const Draw& draw);
+int    GetHorzPixelsPerMeter(const Draw& draw);
+int    GetVertPixelsPerMeter(const Draw& draw);
+int    GetAvgPixelsPerMeter(const Draw& draw);
+
+double GetHorzPixelsPerDot(const Draw& draw);
+double GetVertPixelsPerDot(const Draw& draw);
+double GetAvgPixelsPerDot(const Draw& draw);
+
+Font   GetPixelFont(Font font, const Draw& draw); // converts dot height to pixel height
+
+int    DotsToPixels(const Draw& draw, int dots);
+Size   DotsToPixels(const Draw& draw, Size size);
+int    HorzDotsToPixels(const Draw& draw, int dots);
+int    VertDotsToPixels(const Draw& draw, int dots);
+
+int    PixelsToDots(const Draw& draw, int pixels);
+Size   PixelsToDots(const Draw& draw, Size size);
+int    HorzPixelsToDots(const Draw& draw, int dots);
+int    VertPixelsToDots(const Draw& draw, int dots);
+
+int    PixelsToPoints(const Draw& draw, int pixels);
+Size   PixelsToPoints(const Draw& draw, Size pixels);
+int    PointsToPixels(const Draw& draw, int points);
+Size   PointsToPixels(const Draw& draw, Size points);
+
+void   RGBtoHSV(Color c, double& h, double& s, double& v);
+Color  HSVtoRGB(double h, double s, double v);
+
+Color  GetColorGradient(Color c1, Color c2, int ratio1, int ratio2, double gamma = 2.5);
+
+void   DrawDragDropRect(Draw& draw, const Rect& rc_old, const Rect& rc_new, int width, Color c1 = White, Color c2 = Black);
+void   DrawDragDropRect(Draw& draw, const Rect& rc_old, const Rect& rc_new, Color c1 = White, Color c2 = Black);
+
+void   PaintDragHorzLine(Draw& draw, const Rect& rc, Color c1, Color c2, Color bgnd, int mingap = 3);
+void   PaintDragVertLine(Draw& draw, const Rect& rc, Color c1, Color c2, Color bgnd, int mingap = 3);
+void   PaintDragRect(Draw& draw, const Rect& rc, Color c1, Color c2, Color bgnd, int width);
+
+//void   DrawEllipse(Draw& draw, const Rect& rc, Color color, Color outline = Null, int outline_width = 0);
+//void   DrawArc(Draw& draw, const Rect& rc, Point start, Point end, Color color, int width);
+
+/*
+void   DrawPolyPolyline(Draw& draw,
+	const Point *vertices, int vertex_count, const int *counts, int count_count,
+	int width = 0, Color color = Black, Color doxor = Null);
+void   DrawPolyPolyline(Draw& draw,
+	const Vector<Point>& vertices, const Vector<int>& counts,
+	int width = 0, Color color = Black, Color doxor = Null);
+void   DrawPolyline(Draw& draw, const Point *vertices, int count,
+	int width = 0, Color color = Black, Color doxor = Null);
+void   DrawPolyline(Draw& draw, const Vector<Point>& vertices,
+	int width = 0, Color color = Black, Color doxor = Null);
+*/
+
+void   DrawPolyPolyPolygon(Draw& draw,
+	const Point *vertices, int vertex_count,
+	const int *subpolygon_counts, int subpolygon_count_count,
+	const int *disjunct_polygon_counts, int disjunct_polygon_count_count,
+	Color color = Black, int width = 0, Color outline = Null, uint64 pattern = 0, Color doxor = Null);
+void   DrawPolyPolyPolygon(Draw& draw,
+	const Vector<Point>& vertices, const Vector<int>& subpolygon_counts, const Vector<int>& disjunct_polygon_counts,
+	Color color = Black, int width = 0, Color outline = Null, uint64 pattern = 0, Color doxor = Null);
+void   DrawPolyPolygon(Draw& draw,
+	const Point *vertices, int vertex_count, const int *subpolygon_counts, int subpolygon_count_count,
+	Color color = Black, int width = 0, Color outline = Null, uint64 pattern = 0, Color doxor = Null);
+void   DrawPolyPolygon(Draw& draw, const Vector<Point>& vertices, const Vector<int>& subpolygon_counts,
+	Color color = Black, int width = 0, Color outline = Null, uint64 pattern = 0, Color doxor = Null);
+void   DrawPolygons(Draw& draw,
+	const Point *vertices, int vertex_count, const int *polygon_counts, int polygon_count_count,
+	Color color = Black, int width = 0, Color outline = Null, uint64 pattern = 0, Color doxor = Null);
+void   DrawPolygons(Draw& draw, const Vector<Point>& vertices, const Vector<int>& polygon_counts,
+	Color color = Black, int width = 0, Color outline = Null, uint64 pattern = 0, Color doxor = Null);
+void   DrawPolygon(Draw& draw, const Point *vertices, int vertex_count,
+	Color color = Black, int width = 0, Color outline = Null, uint64 pattern = 0, Color doxor = Null);
+void   DrawPolygon(Draw& draw, const Vector<Point>& vertices,
+	Color color = Black, int width = 0, Color outline = Null, uint64 pattern = 0, Color doxor = Null);
+
+//////////////////////////////////////////////////////////////////////
+
+inline PaintRect WhiteDisplay()   { return PaintRect(ColorDisplay(), White()); }
+inline PaintRect BlackDisplay()   { return PaintRect(ColorDisplay(), Black()); }
+inline PaintRect SWhiteDisplay()  { return PaintRect(ColorDisplay(), SWhite()); }
+inline PaintRect SLtGrayDisplay() { return PaintRect(ColorDisplay(), SLtGray()); }
+inline PaintRect SBlackDisplay()  { return PaintRect(ColorDisplay(), SBlack()); }
+
+//////////////////////////////////////////////////////////////////////
+
+/*
+class ImageDisplay : public Display
+{
+public:
+	enum LAYOUT { SINGLE, STRETCH, TILE };
+
+	ImageDisplay(LAYOUT layout = SINGLE,
+		Alignment halign = ALIGN_CENTER,
+		Alignment valign = ALIGN_CENTER)
+		: layout(layout), halign(halign), valign(valign) {}
+
+	ImageDisplay&  Layout(LAYOUT _layout)    { layout = _layout; return *this; }
+	ImageDisplay&  Single()                  { return Layout(SINGLE); }
+	ImageDisplay&  Stretch()                 { return Layout(STRETCH); }
+	ImageDisplay&  Tile()                    { return Layout(TILE); }
+	LAYOUT         GetLayout() const         { return layout; }
+
+	ImageDisplay&  HorzAlign(Alignment _a)   { halign = _a; return *this; }
+	ImageDisplay&  Left()                    { return HorzAlign(ALIGN_LEFT); }
+	ImageDisplay&  HCenter()                 { return HorzAlign(ALIGN_CENTER); }
+	ImageDisplay&  Right()                   { return HorzAlign(ALIGN_RIGHT); }
+	Alignment      GetHorzAlign() const      { return halign; }
+
+	ImageDisplay&  VertAlign(Alignment _a)   { valign = _a; return *this; }
+	ImageDisplay&  Top()                     { return VertAlign(ALIGN_TOP); }
+	ImageDisplay&  VCenter()                 { return VertAlign(ALIGN_CENTER); }
+	ImageDisplay&  Bottom()                  { return VertAlign(ALIGN_BOTTOM); }
+	Alignment      GetVertAlign() const      { return valign; }
+
+	ImageDisplay&  Center()                  { return HCenter().VCenter(); }
+
+	virtual Size   GetStdSize(const Value& q) const;
+	virtual void   Paint(Draw& w, const Rect& r, const Value& q, Color i, Color p, dword s) const;
+
+protected:
+	LAYOUT         layout;
+	Alignment      halign, valign;
+};
+*/
+
+//////////////////////////////////////////////////////////////////////
+
+//const ImageDisplay& CenterImageDisplay();
+//const ImageDisplay& StretchImageDisplay();
+//const ImageDisplay& TileImageDisplay();
+
+//////////////////////////////////////////////////////////////////////
+
+class GradientDisplay : public Display
+{
+public:
+	GradientDisplay() : a(0, 0), ca(White), b(-1, -1), cb(LtGray), gamma(2.5) {}
+	GradientDisplay(Point a, Color ca, Point b, Color cb, double gamma = 2.5);
+
+	void             Set(Point a_, Color ca_, Point b_, Color cb_) { a = a_; ca = ca_; b = b_; cb = cb_; }
+	Point            GetPos1() const                               { return a; }
+	Color            GetColor1() const                             { return ca; }
+	Point            GetPos2() const                               { return b; }
+	Color            GetColor2() const                             { return cb; }
+
+	void             Gamma(double g)                               { gamma = g; }
+	double           GetGamma() const                              { return gamma; }
+
+	virtual void     Paint(Draw& w, const Rect& r, const Value& q, Color i, Color p, dword s) const;
+
+protected:
+	Point            a, b;
+	Color            ca, cb;
+	double           gamma;
+
+	static Point     GetRectPoint(Point P, const Rect& rc);
+};
+
+//////////////////////////////////////////////////////////////////////
+
+class PrinterInfo
+{
+public:
+	PrinterInfo();
+
+	operator bool () const { return page_size.cx > 0 && page_size.cy > 0; }
+
+public:
+#ifdef PLATFORM_WIN32
+	const DEVMODE *devmode;
+#endif
+	String         driver;
+	String         device;
+	String         output;
+	Size           page_size;   // dots
+
+private:
+	String         devmode_data;
+};
+
+
+//////////////////////////////////////////////////////////////////////
+
+#ifdef PLATFORM_WIN32
+int GdiGetFreeSpace();
+#endif
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/TSql/AUTHORS b/uppsrc/TSql/AUTHORS
new file mode 100644
index 000000000..f782e5b62
--- /dev/null
+++ b/uppsrc/TSql/AUTHORS
@@ -0,0 +1,2 @@
+Mirek Fidler <cxl@ntllib.org>
+Tomas Rylek  <rylek@volny.cz>
\ No newline at end of file
diff --git a/uppsrc/TSql/COPYING b/uppsrc/TSql/COPYING
new file mode 100644
index 000000000..33aa39102
--- /dev/null
+++ b/uppsrc/TSql/COPYING
@@ -0,0 +1,30 @@
+Copyright (C) 2005 Mirek Fidler, Tomas Rylek and various contributors (see AUTHORS)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to
+deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies of the Software and its Copyright notices. In addition publicly
+documented acknowledgment must be given that this software has been used if no
+source code of this software is made available publicly. This includes
+acknowledgments in either Copyright notices, Manuals, Publicity and Marketing
+documents or any documentation provided with any product containing this
+software. This License does not apply to any software that links to the
+libraries provided by this software (statically or dynamically), but only to
+the software provided.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+-----------
+
+Please see the COPYING.PLAIN for a plain-english explanation of this notice
+and it's intent.
diff --git a/uppsrc/TSql/COPYING-PLAIN b/uppsrc/TSql/COPYING-PLAIN
new file mode 100644
index 000000000..770a8132f
--- /dev/null
+++ b/uppsrc/TSql/COPYING-PLAIN
@@ -0,0 +1,33 @@
+Plain English Copyright Notice
+
+This file is not intended to be the actual License. The reason this file
+exists is that we here are programmers and engineers. We aren't lawyers. We
+provide licenses that we THINK say the right things, but we have our own
+intentions at heart. This is a plain-english explanation of what those
+intentions are, and if you follow them you will be within the "spirit" of
+the license.
+
+The intent is for us to enjoy writing software that is useful to us (the
+AUTHORS) and allow others to use it freely and also benefit from the work we
+put into making it. We don't want to restrict others using it. They should
+not *HAVE* to make the source code of the applications they write that
+simply link to these libraries (be that statically or dynamically), or for
+them to be limited as to what license they choose to use (be it open, closed
+or anything else). But we would like to know you are using these libraries.
+We simply would like to know that it has been useful to someone. This is why
+we ask for acknowledgement of some sort.
+
+You can do what you want with the source of this software - it doesn't
+matter. We still have it here for ourselves and it is open and free to use
+and download and play with. It can't be taken away. We don't really mind what
+you do with the source to your software. We would simply like to know that
+you are using it - especially if it makes it to a commerical product. If you
+simply e-mail all the AUTHORS (see COPYING and AUTHORS files) telling us, and
+then make sure you include a paragraph or page in the manual or in the "About.."
+box for the product with the copyright notice and state that you used this
+software, we will be very happy. If you want to contribute back modifications
+and fixes you may have made we will welcome those too with open arms (generally).
+If you want help with changes needed, ports needed or features to be added,
+arrangements can be easily made with some dialogue.
+
+Mirek Fidler <cxl@ntllib.org>
diff --git a/uppsrc/TSql/Ctrl/Ctrl.upp b/uppsrc/TSql/Ctrl/Ctrl.upp
new file mode 100644
index 000000000..70d93e202
--- /dev/null
+++ b/uppsrc/TSql/Ctrl/Ctrl.upp
@@ -0,0 +1,15 @@
+acceptflags
+	NOHELP;
+
+uses
+	TCtrlLib,
+	SqlCtrl,
+	TSql;
+
+file
+	TSqlCtrl.h,
+	TSqlCtrl.icpp,
+	TSqlCtrl.t charset "UTF-8",
+	DlgLogin.h,
+	DlgLogin.cpp,
+	DlgLogin.lay;
diff --git a/uppsrc/TSql/Ctrl/DlgLogin.cpp b/uppsrc/TSql/Ctrl/DlgLogin.cpp
new file mode 100644
index 000000000..584af9d33
--- /dev/null
+++ b/uppsrc/TSql/Ctrl/DlgLogin.cpp
@@ -0,0 +1,269 @@
+//////////////////////////////////////////////////////////////////////
+// DlgLogin: login dialog.
+
+#include "TSqlCtrl.h"
+#pragma hdrstop
+
+NAMESPACE_UPP
+
+String Garble(const char *s)
+{
+	int c = 0xAA;
+	String result;
+	while(*s) {
+		result.Cat(*s++ ^ (char)c);
+		if((c <<= 1) & 0x100)
+			c ^= 0x137;
+	}
+	return result;
+}
+
+//////////////////////////////////////////////////////////////////////
+// DlgLoginSetPass::
+
+static int CharFilterToUpper(int i) { return ToUpper(i); }
+
+class DlgLoginSetPass : public WithSetPasswordLayout<TopWindow>
+{
+public:
+	DlgLoginSetPass();
+
+	String      Run(SqlSession& session, Gate2<SqlSession&, String> setpwd);
+};
+
+RegisterHelpTopicObjectTitle(DlgLoginSetPass, t_("Change password"))
+
+DlgLoginSetPass::DlgLoginSetPass()
+{
+	user.SetReadOnly();
+	password.Password();
+	password.SetFilter(&CharFilterToUpper);
+	password2.Password();
+	password2.SetFilter(&CharFilterToUpper);
+	CtrlLayoutOKCancel(*this, DlgLoginSetPassHelpTitle());
+	HelpTopic("DlgLoginSetPass");
+}
+
+String DlgLoginSetPass::Run(SqlSession& session, Gate2<SqlSession&, String> setpwd)
+{
+	user = session.GetUser().ToWString();
+	ActiveFocus(password);
+	while(TopWindow::Run() == IDOK) {
+		if(~password != ~password2)
+			Exclamation(t_("The entered passwords differ. Please check typing errors."));
+		else if(setpwd(session, ~password))
+			return ~password;
+		else
+			Exclamation(NFormat(t_("Error changing user password.\n[* \1%s\1]"), session.GetLastError()));
+	}
+	return String::GetVoid();
+}
+
+//////////////////////////////////////////////////////////////////////
+// DlgLogin::
+
+RegisterHelpTopicObjectTitle(DlgLogin, t_("System login"))
+
+static const Display& StdGradientDisplay()
+{
+	static GradientDisplay gd(Point(0, 0), White, Point(-1, -1), Yellow);
+	return gd;
+}
+
+DlgLogin::DlgLogin()
+{
+	CtrlLayoutOKCancel(*this, DlgLoginHelpTitle());
+	HelpTopic("DlgLogin");
+	Background(StdGradientDisplay());
+	Zoom screen(1, 1);
+	app.SetZoom(screen);
+	version.SetZoom(screen);
+	date.SetZoom(screen);
+	copyright.SetZoom(screen);
+//	app.Font(Roman(1).Bold().Italic());
+//	version.Font(GuiFont().Bold());
+	user.SetFilter(&CharFilterToUpper);
+	password.Password();
+	password.SetFilter(&CharFilterToUpper);
+	database.SetFilter(&CharFilterToUpper);
+	server.SetFilter(&CharFilterToUpper);
+	SetStyle(PROGRESS_STYLE);
+	abort <<= THISBACK(OnAbort);
+	ClearCanceled();
+	WhenSetPassword = THISBACK(StdSetPassword);
+}
+
+One<SqlSession> DlgLogin::Login(LoginProc loginproc, String& connect_string)
+{
+	SetStyle(EDIT_STYLE);
+	ClearCanceled();
+
+	session_type_tag.Show(session_type.GetCount());
+	session_type.Show(session_type.GetCount());
+//	session_type.SetEditable(session_type.GetCount() > 1);
+
+	if(!connect_string.IsEmpty()) {
+		const char *p = connect_string, *b = p;
+		while(*p && *p != ':' && *p != '/' && *p != '@')
+			p++;
+		if(*p == ':') {
+			session_type <<= String(b, p);
+			b = ++p;
+		}
+		while(*p && *p != '/' && *p != '@')
+			p++;
+		user <<= String(b, p);
+		if(*p == '/') {
+			b = ++p;
+			while(*p && *p != '@')
+				p++;
+			password <<= String(b, p);
+		}
+		if(*p == '@') {
+			b = ++p;
+			while(*p && *p != '/')
+				p++;
+			if(*p == '/') {
+				database <<= String(b, p);
+				b = ++p;
+			}
+			server <<= b;
+		}
+	}
+
+	if(password.GetText().IsEmpty() && !user.GetText().IsEmpty())
+		ActiveFocus(password);
+	else
+		ActiveFocus(user);
+
+	set_password <<= Acceptor(IDRETRY);
+
+	for(;;) {
+		int code = TopWindow::Run();
+		if(code == IDCANCEL)
+			return NULL;
+		String t = ~session_type, u = ~user, p = ~password, d = ~database, s = ~server;
+		String connect;
+		if(!IsNull(t))
+			connect << t << ':';
+		connect << u;
+		if(!IsNull(p))
+			connect << '/' << p;
+		if(!IsNull(s) || !IsNull(d)) {
+			connect << '@';
+			if(!IsNull(d))
+				connect << d << '/';
+			connect << s;
+		}
+
+		One<SqlSession> session;
+
+		{
+			WaitCursor wait;
+			loginproc(connect, session);
+		}
+
+		if(!session || !session -> IsOpen()) {
+			Exclamation(NFormat(t_("Error creating database connection.&[* \1%s\1]&User name: [* \1%s\1]&Database: [* \1%s\1]&Server: [* \1%[(default)]~s\1]&Connection type: [* \1%[(default)]~s\1]"), session->GetLastError(), u, d, s, t));
+			continue;
+		}
+
+		if(code == IDRETRY) { // set password
+			String pwd = DlgLoginSetPass().Run(*session, WhenSetPassword);
+			if(IsNull(pwd))
+				continue;
+			else
+				password = pwd.ToWString();
+		}
+
+		connect_string = connect;
+		return session;
+	}
+	return 0;
+}
+
+void DlgLogin::Serialize(Stream& stream)
+{
+	int version = 2;
+	String pwd;
+	if(save_password && stream.IsStoring())
+		pwd = Garble(password.GetText().ToString());
+	stream / version % user % pwd;
+	if(version >= 2)
+		stream % database;
+	stream % server % save_password % session_type;
+	if(save_password && stream.IsLoading())
+		password = Garble(pwd).ToWString();
+}
+
+void DlgLogin::SetStyle(STYLE s)
+{
+	style = s;
+	bool ed = (s == EDIT_STYLE);
+	bool pg = (s == PROGRESS_STYLE);
+	user.Enable(ed);
+	password.Enable(ed);
+	database.Enable(ed);
+	server.Enable(ed);
+	session_type.Enable(ed);
+	save_password.Enable(ed);
+	ok.Show(ed);
+	cancel.Show(ed);
+	set_password.Show(ed);
+	progress.Show(pg);
+	abort.Show(pg);
+	if(ed)
+		ActiveFocus(user);
+	else
+		ActiveFocus(abort);
+	next_ticks = 0;
+}
+
+void DlgLogin::Progress(String text)
+{
+	if(style != PROGRESS_STYLE)
+		SetStyle(PROGRESS_STYLE);
+
+	progress.SetLabel(NFormat(action_format = text, 0));
+	ProcessEvents();
+}
+
+bool DlgLogin::OnProgress(int done, int total)
+{
+	if((int)(GetTickCount() - next_ticks) >= 0)
+	{
+		progress.SetLabel(NFormat(action_format, done));
+		ProcessEvents();
+		next_ticks = GetTickCount() + 200;
+	}
+	return canceled;
+}
+
+void DlgLogin::OnAbort()
+{
+	canceled = true;
+}
+
+bool DlgLogin::StdSetPassword(SqlSession& session, String new_pwd)
+{
+	String cmd;
+	switch(session.GetDialect())
+	{
+	case ORACLE:
+		cmd = NFormat("alter user %s identified by %s", session.GetUser(), new_pwd);
+		break;
+
+	case MY_SQL:
+	case SQLITE3:
+		cmd = NFormat("set password for %s=PASSWORD('%s')", session.GetUser(), new_pwd);
+		break;
+
+	default:
+		session.SetError(t_("Password setting not supported by active database connection."), "DlgLogin/SetPassword");
+		return false;
+	}
+	Sql cursor(session);
+	return cursor.Execute(cmd);
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/TSql/Ctrl/DlgLogin.h b/uppsrc/TSql/Ctrl/DlgLogin.h
new file mode 100644
index 000000000..eba23d423
--- /dev/null
+++ b/uppsrc/TSql/Ctrl/DlgLogin.h
@@ -0,0 +1,48 @@
+#ifndef __TSql_Ctrl_DlgLogin_h__
+#define __TSql_Ctrl_DlgLogin_h__
+
+NAMESPACE_UPP
+
+#define LAYOUTFILE <TSql/Ctrl/DlgLogin.lay>
+#include <CtrlCore/lay.h>
+
+class DlgLogin : public WithLoginLayout<TopWindow>
+{
+public:
+	typedef DlgLogin CLASSNAME;
+
+	DlgLogin();
+
+	typedef Callback2<String /* session_type:user/pwd@server */, One<SqlSession>&> LoginProc;
+	typedef Gate2<SqlSession&, String> PasswordProc;
+
+	One<SqlSession>   Login(LoginProc login_proc, String& connect);
+	void              Progress(String text);
+
+	enum STYLE { EDIT_STYLE, PROGRESS_STYLE };
+	void              SetStyle(STYLE style);
+	void              ClearCanceled() { canceled = false; }
+
+	bool              OnProgress(int done, int total);
+	bool              IsCanceled() const { return canceled; }
+	operator          Gate2<int, int> () { return THISBACK(OnProgress); }
+
+	void              Serialize(Stream& stream);
+
+public:
+	PasswordProc      WhenSetPassword;
+
+protected:
+	void              OnAbort();
+	bool              StdSetPassword(SqlSession& session, String new_pwd);
+
+protected:
+	String            action_format;
+	int               next_ticks;
+	bool              canceled;
+	STYLE             style;
+};
+
+END_UPP_NAMESPACE
+
+#endif
diff --git a/uppsrc/TSql/Ctrl/DlgLogin.hpp b/uppsrc/TSql/Ctrl/DlgLogin.hpp
new file mode 100644
index 000000000..92c9c7946
--- /dev/null
+++ b/uppsrc/TSql/Ctrl/DlgLogin.hpp
@@ -0,0 +1,293 @@
+HELP_TOPIC_BEGIN("DlgLoginSetPass", LNG_CZECH, "")
+	HELP_TOPIC_TEXT(
+	"[3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0} \r\n"
+	"[s0;= \r\n"
+	"@@Drawing:1322&764\r\n"
+	"�������������������\377폀�������������������߀�����������������������߀���€������\r\n"
+	"���������������������݀�����������������������ހ��������Ā��������ހ������������\r\n"
+	"�ۀ�������������€��������݀�����������������܀�������������ـ������������������\r\n"
+	"�����܀������������������ڀ���������������������������������Ӡ��������怀����\r\n"
+	"������\377ڀ�퀛�ဠ��倀���Ā����������������������������������݀����������\r\n"
+	"���܀������������܀������������ۀ������������ۀ�������������ۀ�������������ڀ�\r\n"
+	"������������ڀ�������������ـ������������ـ���������������\377�\377\377\377�������̿�����́\r\n"
+	"„��������������������������������������„��������������������������������������\r\n"
+	"„�����������������������������̿�����̃�����\377\377\377����������������ɐ��������������\r\n"
+	"҂������Ҁ��������������ɐ���������������\377\377�������������������������������������\r\n"
+	"��������������������������������������������������������������������������������\r\n"
+	"�������������������������ʀ��������������������������݀�������������܀����������\r\n"
+	"���܀������������ۀ������������ۀ������������ۀ�������������ڀ�������������ڀ�\r\n"
+	"������������ـ�������������ـ���������������\377�\377\377�\377������\377������̄���������������\r\n"
+	"��������„��������������������������������������„������������������������������\r\n"
+	"����������������\377�������������\377\377�\377������������������������������ā������ā������\r\n"
+	"ȁ������������������������������������������������������������������������������\r\n"
+	"�����\377\377�������������������������������������������������������������������������\r\n"
+	"�����������������������������������������������������������������ʀ��ڀ���������\r\n"
+	"�����������������݀������������܀������������܀�������������ۀ�������������ۀ�\r\n"
+	"������������ۀ�������������ڀ������������ڀ������������ـ������������ـ�������\r\n"
+	"���������\377�\377\377\377��\377�����������́����������������������������������„��������������\r\n"
+	"������������������������„������������������������������\377������̏���̃�����\377\377\377��\r\n"
+	"ɐ��������������������������������������ԁ��������������������������������������\r\n"
+	"Œ��������������ɐ���������������������\377�\377��������������������������������������\r\n"
+	"��������������������������������������������������������������������������������\r\n"
+	"�����������������������܂����������\377������؀��������������؀�����܀��Ԁ����܀���\r\n"
+	"�����܀���Ԁɀ����ր��쀢���րӀ�쀉�����؀��������������ڀ��������ր���������ր\r\n"
+	"��������������Ӡ���������怠�����������\377Հ�����������̀Ӡ��������怀��������\r\n"
+	"���\377��退����倀쀺��������܀���Ԁ��������������������������������������������\r\n"
+	"��������������������������������������������������������������������������������\r\n"
+	"�������������������������󀀀���������������󀏀������􀠁�����������􀁐�������\r\n"
+	"�����󀎀���������������������������Ӡ��������怀����������\377Հ�Հ�������』��\r\n"
+	"��������������ڀ���������ր���������ր��������������Ӡ��������怠����������\377�\r\n"
+	"��������������Ӡ���������怀�����������\377���退��������������܈���Ԁ��\r\n"
+	"��������������������������������������������������������������������������������\r\n"
+	"�������������������������������������������������������������������󀀀���������\r\n"
+	"������󀀏�������􀁀��������������������������󀀎���������������������������Ӡ\r\n"
+	"���������怀�����������\377���������������������������������ڀɀ������ր���������\r\n"
+	"�ր������������̀Ӡ��������怠�����������\377Ѐ�������������Ӡ��������怀������\r\n"
+	"�����\377��������������������܀��Ԁɀ�������������������������������\r\n"
+	"��������������������������������������������������������������������������������\r\n"
+	"������������������������������������󀀀���������������󀀏�������􀁀����������\r\n"
+	"�􀁀������������󀎀��������������������������Ӏ�����Ӏ���怀�����������\377�����\r\n"
+	"���������瀏��������������ր��쀀�����Ѐ����������̀����݀������̀����݀�������\r\n"
+	"������܀������̀�����܀������̀�����܀������̀�����܀������̀����ۀ������̀����\r\n"
+	"�ۀ������̀����ۀ������̸�����ۀ������̀�����ڀ������̀�����ڀ������̀�����ڀ���\r\n"
+	"���̀����ڀ������̀����ـ������̀����ـ������̸�����ـ������̀�����ـ���������\r\n"
+	"���Ӡ��������怀�����������\377π�ˀ�������π�����������������������π�����������\r\n"
+	"������Ѐ�������������̀�����������������������΀������������������΀������������\r\n"
+	"�ˀ�����������������������̀�����������������̀���������Ĉ���րӀ�쀅�����Ѐ����\r\n"
+	"�����̀�����݀������̀�����݀������̀����܀������̀����܀������̀����܀�������\r\n"
+	"������܀������̀�����ۀ������̀�����ۀ������̀�����ۀ������̀����ۀ������̀����\r\n"
+	"�ڀ������̀����ڀ������̸�����ڀ������̀�����ڀ������̀�����ـ������̀�����ـ���\r\n"
+	"���̀����ـ������̀����ـ�����������Ӡ���������怀�����������\377Ӏ���\r\n")
+	HELP_TOPIC_TEXT(
+	"������π�����������������������π������������������Ѐ�������������̀������������\r\n"
+	"�����������΀�����������������΀������������������؀������\r\n"
+	"&]\r\n"
+	"[s0;Q+101 Formul�� pro zm�nu hesla u�ivatele se vyvol� stisknut�m \r\n"
+	"tla��tka [* `[Zm�na hesla`]] v_p�ihla�ovac�m dialogu. Heslo lze \r\n"
+	"zm�nit pouze tehdy, pokud u�ivatel p�edt�m vyplnil spr�vn� u�ivatelsk� \r\n"
+	"jm�no, datab�zi, server a p�vodn� heslo. Heslo je skryt�, proto \r\n"
+	"je t�eba zadat pro kontrolu identick� heslo dvakr�t, aby se sn�ilo \r\n"
+	"riziko p�eklepu. Po �sp�n�m proveden� zm�ny hesla se otev�e \r\n"
+	"z�kladn� okno aplikace.")
+HELP_TOPIC_END()
+HELP_TOPIC_BEGIN("DlgLogin", LNG_CZECH, "")
+	HELP_TOPIC_TEXT(
+	"[3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0} \r\n"
+	"[s0;Q Dialog slou�� k_zad�n� informac� pro nav�z�n� spojen� s_datab�zov�m \r\n"
+	"serverem.&]\r\n"
+	"[s0; &]\r\n"
+	"[s0;= \r\n"
+	"@@Drawing:2125&1362\r\n"
+	"�����͈���҅�������\377Ԫ�������������������灁����������������������灀��€������\r\n"
+	"������聠������������偁��������������󀈄����恐�����Ā������恁�����������\r\n"
+	"�ぁ������������€񀂀����偂����򀂀�������䁁������������၁��������������\r\n"
+	"�����䁃���������������⁁��������������������������������Ӡ��������怀����\r\n"
+	"������\377Ѐ�ف�耄���刀�퀠������������������������������������\r\n"
+	"�����������݀������������܀������������܀������������ۀ�������������ۀ��������\r\n"
+	"�����ۀ�������������ڀ�������������ڀ������������ـ������������ـ�������������\r\n"
+	"��\377�\377\377\377�\377������̟����́�����������������„��������������������������������������\r\n"
+	"„����������������������������������������������\377������̟����̃�����\377\377\377���������\r\n"
+	"ɐ��������������������������������������Ɇ���������������������\377�\377��������������\r\n"
+	"��������������������������������������������������������������������������������\r\n"
+	"���������������������������������������������Ҁ���������������������������݀��\r\n"
+	"�����������܀������������܀������������ۀ������������ۀ�������������ۀ��������\r\n"
+	"�����ڀ�������������ڀ�������������ـ������������ـ���������������\377�\377\377\377��������\r\n"
+	"������́„��������������������������������������„������������������������������\r\n"
+	"��������„�����������������������������̿�����̃�����\377\377\377��������҂������Ҁ������\r\n"
+	"��������������������������������ā������ā������ȁ������������������������������\r\n"
+	"��������ɐ������������������\377\377��������������������������������������������������\r\n"
+	"��������������������������������������������������������������������������������\r\n"
+	"�������Ҁ���⁔�������������������������݀������������܀�������������܀��������\r\n"
+	"�����ۀ�������������ۀ�������������ۀ������������ڀ������������ڀ�������������\r\n"
+	"��������������ـ���������������\377��\377\377\377���\377������̧��́�����������„��������������\r\n"
+	"������������������������„������������������������������������������������������\r\n"
+	"\377������̇��̃���΀\377\377\377���������������������������������������������������‡������\r\n"
+	"ԁ������������������������������Ȃ����������������������������\377\377����������������\r\n"
+	"��������������������������������������������������������������������������������\r\n"
+	"����������������������������������������������䁁򀂌�����\377��������܀�����������\r\n"
+	"���܀��̨���������̀��������̀��������ꀐ��΁����ꀌ�΁�Ѐ�܀€�Ҁ؀���ˆ���؀��\r\n"
+	"��€܁؀�����������\377\377\377������������\377\377�������������\377\377������������\377�\377������������\377\377\r\n"
+	"������Ѐ𐀐�\377\377􀀉���������\377\377򀀉���������\377\377�������������\377\377퀉����������\377\377뀉��\r\n"
+	"�������\377�\377选���������\377\377�怉����𐀐�\377\377䐀���Ѐ�����\377\377က����������\377\377�����������\r\n"
+	"��\377\377�������������\377\377������������\377�\377������������\377\377�󀉐�Ѐ𐀐�\377\377񀀉���������\377\377�\r\n"
+	"�����������\377\377쀉����������\377\377ꀉ����������\377\377瀉���������\377�\377倉���������\377\377� ����\r\n"
+	"𐀐�\377\377������Ѐ�����\377\377݀�����������\377\377�������������\377\377�������������\377\377􀉠��������\377\r\n"
+	"�\377򀉠��������\377\377���Ѐ𐀐�\377\377퀀����������\377\377뀀����������\377\377耉����������\377\377怉�\r\n"
+	"���������\377\377〉���������\377�\377ဉ���������\377\377�ހ�����𐀐�\377\377ܐ����Ѐ�����\377\377ـ��������\r\n"
+	"���\377\377�������������\377\377򀉰���������\377\377������������\377�\377���������\377\377�쀉��Ѐ𐀐�\377\377�\r\n"
+	"������������\377\377瀀����������\377\377䀉����������\377\377 ����������\377\377߀����������\377�\377݀����\r\n"
+	"������\377\377�ڀ�����𐀐�\377\377א����Ѐ�����\377\377Հ�����������\377\377񀉀���������\377\377���������\r\n"
+	"�\377\377쀉���������\377�\377ꀉ���������\377\377�耉��Ѐ𐀐�\377\377倀����������\377\377　����������\377\377���\r\n"
+	"����������\377\377ހ�����������\377\377ۀ����������\377�\377؀����������\377\377�ր�����𐀐�\377\377Ӑ����Ѐ�\r\n"
+	"����\377\377Ѐ��Ѐ�������\377\377퀉�Ѐ�������\377\377뀉Ѐ��������\377\377选Ѐ�������\377�\377怉Ѐ�������\377\377\r\n"
+	"�䀉ЀЀ𐀐�\377\377က�Ѐ�������\377\377߀��Ѐ�������\377\377܀��Ѐ�������\377\377ڀ�Ђ��������\377\377׀�Ѐ\r\n"
+	"�������\377�\377Ԁ�Ѐ�������\377\377�р�Ѐ��𐀐�\377\377ϐ��ЀЀ�����\377\377̀�����������\377\377ꀉ��������\r\n"
+	"��\377\377瀉����������\377\377倉���������\377�\377 ���������\377\377������Ѐ𐀐�\377\377݀�����������\377\377ۀ\r\n"
+	"�����������\377\377؀�����������\377\377Հ�����������\377\377Ҁ����������\377�\377Ѐ����������\377\377�̀�����\r\n"
+	"𐀐�\377\377ʐ����Ѐ�����\377\377ǀ�����������\377\377怉����������\377\377〉����������\377\377ဉ���������\377\r\n")
+	HELP_TOPIC_TEXT(
+	"�\377ހ����������\377\377�܀���Ѐ𐀐�\377\377ـ�����������\377\377ր�����������\377\377Ԁ�����������\377\377р��\r\n"
+	"���������\377\377΀����������\377�\377ˀ����������\377\377�Ȁ�����𐀐�\377\377Ő����Ѐ�����\377\377€��������\r\n"
+	"���\377\377 ��������΀\377\377߀�����������\377\377݀����������\377�\377ڀ����������\377\377�׀���Ѐ𐀐�\377\377�\r\n"
+	"������������\377\377Ҁ�����������\377\377π���������΀\377\377̀�����������\377\377ɀ����������\377�\377ƀ����\r\n"
+	"������\377\377�À�����𐀐�\377\377������Ѐ�����\377\377�������������\377\377ހ���������΀\377\377ۀ����������\r\n"
+	"�\377\377؀����������\377�\377ր����������\377\377�Ӏ���Ѐ𐀐�\377\377Є�����������\377\377̀�����������\377\377ʀ�\r\n"
+	"��������΀\377\377ǀ�����������\377\377Ā����������\377�\377������������\377\377��������𐀐�\377\377������Ѐ�\r\n"
+	"����\377\377�������������\377\377ڀ���������΀\377\377׀�����������\377\377Ԁ����������\377�\377р����������\377\377\r\n"
+	"�΀���Ѐ𐀐�\377\377̄�����������\377\377ɀ�����������\377\377ƀ���������΀\377\377À�����������\377\377�����\r\n"
+	"�������\377�\377������������\377\377��������𐀐�\377\377������Ѐ�����\377\377�������������\377\377Հ���������\r\n"
+	"΀\377\377Ҁ�����������\377\377Ѐ����������\377�\377̀����������\377\377�ʀ���Ѐ𐀐�\377\377DŽ�����������\377\377Ā\r\n"
+	"�����������\377\377�����������΀\377\377�������������\377\377������������\377�\377������������\377\377��������\r\n"
+	"𐀐�\377\377������Ѐ�����\377\377�������������\377\377р���������΀\377\377΀�����������\377\377ˀ����������\377\r\n"
+	"�\377Ȁ����������\377\377�ŀ���Ѐ𐀐�\377\377„�����������\377\377�������������\377\377�����������΀\377\377����\r\n"
+	"���������\377\377������������\377�\377������������\377\377��������𐀐�\377\377������Ѐ�����\377\377����Ѐ����\r\n"
+	"���\377\377̀��Ѐ�����΀\377\377ɀ�Ѐ��������\377\377ƀ�Ѐ�������\377�\377À�Ѐ�������\377\377����ЀЀ𐀐�\377\377�\r\n"
+	"���Ѐ�������\377\377����Ѐ�������\377\377����Ѐ�����΀\377\377���Ђ��������\377\377���Ѐ�������\377�\377���Ѐ�\r\n"
+	"������\377\377����Ѐ��𐀐�\377\377����ЀЀ�����\377\377�������������\377\377ǀ���������΀\377\377Ā����������\r\n"
+	"�\377\377������������\377�\377������������\377\377������Ѐ𐀐�\377\377�������������\377\377�������������\377\377���\r\n"
+	"��������΀\377\377�������������\377\377������������\377�\377������������\377\377��������𐀐�\377\377������Ѐ�\r\n"
+	"����\377\377�������������\377\377€���������΀\377\377�������������\377\377������������\377�\377������������\377\377\r\n"
+	"������Ѐ𐀐�\377\377�������������\377\377�������������\377\377�����������΀\377\377�������������\377\377�����\r\n"
+	"�������\377�\377������������\377\377��������𐀐�\377\377������Ѐ�����\377\377�������������\377\377�����������\r\n"
+	"��\377\377�������������\377\377������������\377�\377������������\377\377������Ѐ𐀐�\377\377�������������\377\377��\r\n"
+	"�����������\377\377�������������\377\377�������������\377\377������������\377�\377������������\377\377��������\r\n"
+	"𐀐�\377\377������Ѐ�����\377\377�������������\377\377�������������\377\377�������������\377\377������������\377\r\n"
+	"�\377������������\377\377������Ѐ𐀐�\377\377�������������\377\377�������������\377\377�������������\377\377����\r\n"
+	"���������\377\377������������\377�\377������������\377\377��������𐀐�\377\377������Ѐ�����\377\377\377���������\r\n"
+	"���\377\377�������������\377\377�������������\377\377������������\377�\377������������\377\377������Ѐ𐀐�\377\377�\r\n"
+	"������������\377\377�������������\377\377�������������\377\377�������������\377\377������������\377�\377������\r\n"
+	"������\377\377�������������\377\377������Ѐ�����\377\377�������������\377\377�������������\377\377������������\r\n"
+	"�\377\377������������\377�\377������������\377\377������Ѐ𐀐�\377\377�������������\377\377�������������\377\377���\r\n"
+	"����������\377\377�������������\377\377������������\377�\377������������\377\377�������������\377\377񐀉��Ѐ�\r\n"
+	"����\377\377ꀀ����������\377\377�������������\377\377�������������\377\377������������\377�\377������������\377\377\r\n"
+	"������Ѐ𐀐�\377\377�������������\377\377�������������\377\377�������������\377\377�������������\377\377�����\r\n"
+	"�������\377�\377����������\377\377�퀉���������\377\377吀���Ѐ�����\377\377܀��Ё�������\377\377����Ё�����\r\n"
+	"��\377\377���Ѐ��������\377\377���Ё�������\377�\377���Ё�������\377\377����ЁЀ𐀐�\377\377����Ё�������\377\377��\r\n"
+	"��Ё�������\377\377����Ё�������\377\377���Ђ��������\377\377���Ё�������\377�\377耉Ё�������\377\377�߀�Ё��\r\n"
+	"�����\377\377֐��ЁЀ�����\377\377ʀ�������܀���������؁���������؁���\377\377\377\377������؁����������\r\n"
+	"��������������������������\377Հ���ӀȀπ�Ѐ�����������܁���������؁���������؁��\r\n"
+	"�\377\377\377\377������؁��������������Ӡ��������怀�����������\377ր�����倀��������������\r\n"
+	"���Ӡ��������悀�����������\377���������򀀱����������€܀�π������؁���������؁�\r\n"
+	"��\377\377\377\377������؁��������������Ӡ��������怀����������\377Ā������퀠���������\r\n")
+	HELP_TOPIC_TEXT(
+	"����������ǀ��������Ӡ��������怀����������\377���������������������������������\r\n"
+	"��܁퀅�����؁��������������\377\377\377\377������؁��������������Ӡ���������怀����������\r\n"
+	"�\377À��������瀀�􀠀���〩���������������Հ쀀��퀀��倠��Ā��������\r\n"
+	"����􀬀������쀀����󀠀�򀮀�������������ʀ������������������������\r\n"
+	"������������Ӡ��������怠����������\377Հ�������������Ӡ���������怀����������\r\n"
+	"�\377���������쀀���������̀�������������、����������������������　����������\r\n"
+	"������䀠������������ခ���������������������� ����������������� �����������\r\n"
+	"�‑������������������߀������������������߀������������������������������������\r\n"
+	"���߀�����������������������������Ӡ��������怀�����������\377ՀՀ��������π�����\r\n"
+	"������������ʀ������������������������������������Ӡ��������怀�����������\377Ȁ�\r\n"
+	"������������Ӡ��������怠����������\377倀������������Ӡ���������怀����������\r\n"
+	"�\377�����������̀�������������、����������������������　����������������䀁\r\n"
+	"������������ခ���������������������� ����������������� ����������� ������\r\n"
+	"�������������߀������������������߀���������������������������������������߀����\r\n"
+	"�����������������������̀Ӡ��������怀�����������\377���������ۀ�����������������\r\n"
+	"�ʀ�����������������������������������Ӡ���������怠�����������\377Ā������������\r\n"
+	"�Ӡ��������怀�����������\377��������债��������̀�������������、���������\r\n"
+	"�������������　�����������������䀁������������������������������������� ����\r\n"
+	"������������ ������������‑�������������������߀�����������������߀����������\r\n"
+	"�����������������������������߀�����������������������������Ӡ��������怀����\r\n"
+	"������\377Հ�ӀȀπ�Ѐ���������������������Ѻ���怉��������������������������������\r\n"
+	"���Ӡ��������怀�����������\377Ӏ�������������ӠӀ�������怀���Ѐ�����\377������\r\n"
+	"��򀺀�����������΁��������、����������������������　�����������������䀁����\r\n"
+	"��������������������������������� ���������������� ������������‑����������\r\n"
+	"���������߀�����������������߀���������������������������������������߀���������\r\n"
+	"��������������������Ӡ��������怀����������\377�������߀��������Ј��������怟���\r\n"
+	"�������������������������������Ӏ�����Ӏ���怠�����������\377Ԁ�������������Ӡ����\r\n"
+	"������怀�����������\377��������������ꀌ�΂���������、����������������������　��\r\n"
+	"��������������䀠������������ခ���������������������� ����������������� ���\r\n"
+	"����Ӏ���‑�������������������������݀�������������܀�������������܀�����������\r\n"
+	"��܀������������ۀ������������ۀ�������������ڀ�������������ڀ�������������ڀ��\r\n"
+	"�����������ـ������������ـ���������������\377�\377\377\377�������̿�����́„��������������\r\n"
+	"������������������������������������������������\377��������̃����\377�\377\377�������������\r\n"
+	"��������������������������������������������������������������������������������\r\n"
+	"��������������������������������������������������������������������������������\r\n"
+	"������������������������������Ӏ����������р�����������������������Ѐ�����������\r\n"
+	"������р�������������π�������������ˀ���\377\377\377\377����������̀Ӡ��������怀��������\r\n"
+	"���\377̀���Ӏр̀�Ј���ꀢ��΁��������䀒������������������\377�\377\377\377��\377�����������́��\r\n"
+	"��������ހ�����\377�\377\377�������������ኄ�������\377\377\377�����������　����\377�\377\377����\377�\377\377�����\r\n"
+	"�������������\377\377\377�����\377\377\377\377���\377\377\377�������������������\377\377\377������\377\377\377����\377\377\377�����������\r\n"
+	"　���\377\377�\377����\377\377�\377�����\377\377\377\377���\377\377�\377�����������������\377\377\377������\377\377\377������\377\377\377�����\377\377\377\r\n"
+	"������������������\377\377\377���ބ�\377\377\377�����\377\377\377����������ǀ�������\377\377\377�����\377\377\377�����\377\377\377���\r\n"
+	"��������　����\377�\377\377������\377\377\377�����\377\377\377������������񀄄��\377\377�\377����\377\377�\377��������������\r\n"
+	"�����\377\377\377������������\377\377\377���������������������������������\377������̃�̃�����\377\377\377����\r\n"
+	"��������������������������������������������������������������������������������\r\n"
+	"��������������������������������������������������������������������������������\r\n"
+	"�Ӡ��������怀�����������\377Հ쀀������������ӠӀ�������怠���Ѐ�����\377�����\r\n"
+	"�������Ӏ�����Ӏ���怀�����������\377���􀀠��倀�������܀Š���؀������Ѐ��\r\n"
+	"�������̸�����݀������̀�����݀������̀�����܀������̀�����܀������̀����܀����\r\n"
+	"��̀����܀������̀����ۀ������̸�����ۀ������̀�����ۀ������̀�����ۀ������̀��\r\n"
+	"���ڀ������̀����ڀ������̀����ڀ������̀����ڀ������̸�����ـ������̀�����ـ�\r\n"
+	"�����̀�����ـ������̀�����ـ����������̀Ӡ��������怀�����������\377πˀ��������\r\n")
+	HELP_TOPIC_TEXT(
+	"�������������������������π�����������������Ѐ�������������̀�������������������\r\n"
+	"����΀��������������������������������ˀ�����������������������̀���������������\r\n"
+	"���̀�����������Ű�€��؀������Ѐ����������̀����݀������̀����݀������̀�����\r\n"
+	"�������̸�����܀������̀�����܀������̀�����܀������̀�����ۀ������̀����ۀ����\r\n"
+	"��̀����ۀ������̀����ۀ������̸�����ڀ������̀�����ڀ������̀�����ڀ������̀��\r\n"
+	"���ڀ������̀����ـ������̀����ـ������̀����ـ������̸�����ـ������������Ӡ��\r\n"
+	"�������怀����������\377Ӏ�����������π�����������������������π���������\r\n"
+	"���������Ѐ��������������������������������������΀�����������������΀����������\r\n"
+	"����€܁�؀������Ѐ���������̀�����݀������̀����݀������̀����܀������̀�����\r\n"
+	"�������̸�����܀������̀�����܀������̀�����ۀ������̀�����ۀ������̀����ۀ����\r\n"
+	"��̀����ۀ������̀����ڀ������̸�����ڀ������̀�����ڀ������̀�����ڀ������̀��\r\n"
+	"���ـ������̀����ـ������̀����ـ������̀����ـ������������ӠӀ�������怠���\r\n"
+	"Ѐ�����\377�ڀ������������Ӏ�����Ӏ���怀�����������\377퀛�ဠ�耀���က������\r\n"
+	"�π�����������������������π�����������������Ѐ�������������̀������������������\r\n"
+	"�����΀������������������΀��������������ƀ��Ӏ�����Ā܁�؀����������܀����\r\n"
+	"\r\n"
+	"&]\r\n"
+	"[s0; &]\r\n"
+	"[s0; Do odpov�daj�c�ch pol� p�ihla�ovac�ho formul��e je t�eba vyplnit \r\n"
+	"u�ivatelsk� jm�no, heslo, n�zev datab�ze a_datab�zov�ho serveru; \r\n"
+	"tyto informace vypl�vaj� z_instalace a_nastaven� aplikace a_opr�vn�n�mu \r\n"
+	"u�ivateli je poskytne spr�vce syst�mu. Po vypln�n� p��slu�n�ch \r\n"
+	"hodnot stiskneme tla��tko \r\n"
+	"@@Drawing:472&121/25\r\n"
+	"�����؁������������\377ā����Ѐ��������������Ѐ���������̀�����݀������̀�����݀���\r\n"
+	"���̀����܀������̀����܀������̀����܀������̸�����܀������̀�����ۀ������̀�\r\n"
+	"����ۀ������̀�����ۀ������̀����ۀ������̀����ڀ������̀����ڀ������̸�����ڀ\r\n"
+	"������̀�����ڀ������̀�����ـ������̀�����ـ������̀����ـ������̀����ـ�����\r\n"
+	"������Ӡ���������怀�����������\377πˀ�������π�����������������������π��������\r\n"
+	"����������Ѐ�������������̀�����������������������΀�����������������΀���������\r\n"
+	"����ˀ�����������������������̀������������������̀����������\r\n"
+	". Vypln�n� �daje budou n�sledn� ov��eny datab�zov�m serverem.&]\r\n"
+	"[s0; &]\r\n"
+	"[s0;Q Po �sp�n�m p�ihl�en� do syst�mu se spust� samotn� aplikace. \r\n"
+	"Pokud se p�ihl�en� nezda�� (neplatn� u�ivatelsk� jm�no nebo \r\n"
+	"heslo, nespr�vn� n�zev serveru, pot�e s_instalac� datab�zov�ho \r\n"
+	"klienta nebo s_dostupnost� serveru) , syst�m zobraz� hl�en� \r\n"
+	"s_popisem vznikl� situace a_vyzve u�ivatele k_op�tovn�mu p�ihl�en�.&]\r\n"
+	"[s0;Q &]\r\n"
+	"[s0;Q [* Upozorn�n�:] pokud va�e heslo pro vstup do datab�ze obsahuje \r\n"
+	"��slice, zkontrolujte si zvolen� jazyk a_p�ep�na� numerick� kl�vesnice. \r\n"
+	"Velk� a_mal� p�smena se zde [/ nerozli�uj�].&]\r\n"
+	"[s0;Q &]\r\n"
+	"[s0;Q Pro zrychlen� �ast�ho p�ihla�ov�n� lze vyu��t za�krt�vac�ho \r\n"
+	"pol��ka [/ Ulo�it heslo]. Heslo se ukl�d� v_za�ifrovan�m tvaru \r\n"
+	"do konfigura�n�ho souboru ve_slo�ce aplikace. Tuto volbu je vhodn� \r\n"
+	"vyu��t tehdy, pokud pracujete s_po��ta�em samostatn� ve vlastn� \r\n"
+	"kancel��i, kde nehroz� zneu�it� va�eho hesla neopr�vn�nou osobou.&]\r\n"
+	"[s0;Q Zm�na hesla&]\r\n"
+	"[s0;Q Pokud chcete zm�nit heslo, je nejprve t�eba stejn� jako p�i \r\n"
+	"b�n�m vstupu do syst�mu zadat p�ihla�ovac� informace (aby syst�m \r\n"
+	"mohl ov��it v� p��stup k_datab�zi a_povolit v�m zm�nu hesla). \r\n"
+	"Po vypln�n� pot�ebn�ch �daj� stiskn�te tla��tko \r\n"
+	"@@Drawing:472&121/25\r\n"
+	"�����؁������������\377Ł����Ѐ��������������Ѐ���������̀�����݀������̀�����݀���\r\n"
+	"���̀����܀������̀����܀������̀����܀������̸�����܀������̀�����ۀ������̀�\r\n"
+	"����ۀ������̀�����ۀ������̀����ۀ������̀����ڀ������̀����ڀ������̸�����ڀ\r\n"
+	"������̀�����ڀ������̀�����ـ������̀�����ـ������̀����ـ������̀����ـ�����\r\n"
+	"������Ӡ���������怠�����������\377ڀ�����������̀Ӡ��������怀�����������\377퀛�\r\n"
+	"��ဠ�耀��쀀က������π�����������������������π�����������������Ѐ��������\r\n"
+	"�����̀�����������������������΀������������������΀����������\r\n"
+	"; pot� se provede p�ihl�en� k_datab�zi a_vyvol� se [^DlgLoginSetPass^ dialog \r\n"
+	"pro zm�nu hesla]. Po zm�n� hesla a_ukon�en� tohoto dialogu se \r\n"
+	"spust� z�kladn� panel aplikace.&]\r\n"
+	"[s0;2 ")
+HELP_TOPIC_END()
diff --git a/uppsrc/TSql/Ctrl/DlgLogin.lay b/uppsrc/TSql/Ctrl/DlgLogin.lay
new file mode 100644
index 000000000..1d006200b
--- /dev/null
+++ b/uppsrc/TSql/Ctrl/DlgLogin.lay
@@ -0,0 +1,33 @@
+LAYOUT(LoginLayout, 384, 220)
+	ITEM(RichTextView, app, Background(Null).NoSb(true).SetFrame(NullFrame()).HSizePosZ(4, 4).TopPosZ(4, 42))
+	ITEM(RichTextView, version, Background(Null).NoSb(true).SetFrame(NullFrame()).HSizePosZ(4, 4).TopPosZ(52, 13))
+	ITEM(RichTextView, date, Background(Null).NoSb(true).SetFrame(NullFrame()).HSizePosZ(4, 4).TopPosZ(66, 13))
+	ITEM(RichTextView, copyright, Background(Null).NoSb(true).SetFrame(NullFrame()).HSizePosZ(4, 4).TopPosZ(80, 29))
+	ITEM(Label, dv___4, SetLabel(t_("&Username:")).LeftPosZ(4, 54).TopPosZ(118, 19))
+	ITEM(EditStringNotNull, user, LeftPosZ(60, 130).TopPosZ(118, 19))
+	ITEM(Label, dv___6, SetLabel(t_("&Password:")).LeftPosZ(4, 54).TopPosZ(140, 19))
+	ITEM(EditString, password, LeftPosZ(60, 130).TopPosZ(140, 19))
+	ITEM(Label, dv___8, SetLabel(t_("&Database:")).LeftPosZ(4, 54).TopPosZ(162, 19))
+	ITEM(EditField, database, LeftPosZ(60, 130).TopPosZ(162, 19))
+	ITEM(Label, dv___10, SetLabel(t_("&Server:")).LeftPosZ(208, 40).TopPosZ(118, 19))
+	ITEM(EditString, server, LeftPosZ(250, 130).TopPosZ(118, 19))
+	ITEM(Label, session_type_tag, SetLabel(t_("&Type:")).LeftPosZ(208, 40).TopPosZ(140, 19))
+	ITEM(DropList, session_type, DisplayAll(true).LeftPosZ(250, 130).TopPosZ(140, 19))
+	ITEM(Option, save_password, SetLabel(t_("St&ore password")).LeftPosZ(250, 100).TopPosZ(162, 18))
+	ITEM(Button, ok, SetLabel(t_("OK")).RightPosZ(180, 80).BottomPosZ(4, 22))
+	ITEM(Button, cancel, SetLabel(t_("Cancel")).RightPosZ(96, 80).BottomPosZ(4, 22))
+	ITEM(Button, set_password, SetLabel(t_("S&et password")).RightPosZ(4, 80).BottomPosZ(4, 22))
+	ITEM(Label, progress, HSizePosZ(8, 84).BottomPosZ(9, 13))
+	ITEM(Button, abort, SetLabel(t_("&Abort")).RightPosZ(4, 50).BottomPosZ(4, 20))
+END_LAYOUT
+
+LAYOUT(SetPasswordLayout, 216, 112)
+	ITEM(Label, dv___0, SetLabel(t_("&Username:")).LeftPosZ(4, 86).TopPosZ(4, 19))
+	ITEM(EditString, user, HSizePosZ(92, 4).TopPosZ(4, 19))
+	ITEM(Label, dv___2, SetLabel(t_("&New password:")).LeftPosZ(4, 86).TopPosZ(31, 19))
+	ITEM(EditStringNotNull, password, HSizePosZ(92, 4).TopPosZ(31, 19))
+	ITEM(Label, dv___4, SetLabel(t_("&Confirm pasword:")).LeftPosZ(4, 86).TopPosZ(54, 19))
+	ITEM(EditStringNotNull, password2, HSizePosZ(92, 4).TopPosZ(54, 19))
+	ITEM(Button, ok, SetLabel(t_("OK")).RightPosZ(88, 80).BottomPosZ(4, 22))
+	ITEM(Button, cancel, SetLabel(t_("Cancel")).RightPosZ(5, 80).BottomPosZ(4, 22))
+END_LAYOUT
diff --git a/uppsrc/TSql/Ctrl/DlgLogin.lng b/uppsrc/TSql/Ctrl/DlgLogin.lng
new file mode 100644
index 000000000..57d550ce9
--- /dev/null
+++ b/uppsrc/TSql/Ctrl/DlgLogin.lng
@@ -0,0 +1,39 @@
+#if LANGUAGE == LNGC_('C', 'S', 'C', 'Z', 15)
+
+// DlgLogin.cpp
+
+txt(DlgLoginSetPassHelpTitle, )
+txt(DlgLoginSetPassMismatch, "Zadan� hesla se li��. Z�ejm� do�lo k "
+	"p�eklepu.")
+txt(DlgLoginSetPassError, "Zm�nu hesla nelze prov�st.\n"
+	"[* \1%s\1]")
+txt(DlgLoginHelpTitle, "P�ihl�en� do syst�mu")
+txt(DlgLoginConnectError, "Nelze vytvo�it datab�zov� spojen�.\n"
+	"[* \1%s\1]\n"
+	"U�ivatel: [* \1%s\1]\n"
+	"Datab�ze: [* \1%s\1]\n"
+	"Server: [* \1%[(v�choz�)]~s\1]\n"
+	"Typ spojen�: [* \1%[(v�choz�)]~s\1]")
+txt(DlgLoginStdSetPasswordTypeError, "Zvolen� typ datab�zov�ho "
+	"spojen� nepodporuje zm�nu hesla.")
+
+#elif LANGUAGE == LNGC_('E', 'N', 'U', 'S', 15)
+
+// DlgLogin.cpp
+
+txt(DlgLoginSetPassHelpTitle, "Change password")
+txt(DlgLoginSetPassMismatch, "The entered passwords differ. Please "
+	"check typing errors.")
+txt(DlgLoginSetPassError, "Error changing user password.\n"
+	"[* \1%s\1]")
+txt(DlgLoginHelpTitle, "System login")
+txt(DlgLoginConnectError, "Error creating database connection.\n"
+	"[* \1%s\1]\n"
+	"User name: [* \1%s\1]\n"
+	"Database: [* \1%s\1]\n"
+	"Server: [* \1%[(default)]~s\1]\n"
+	"Connection type: [* \1%[(default)]~s\1]")
+txt(DlgLoginStdSetPasswordTypeError, "Password setting not supported "
+	"by active database connection.")
+
+#endif
diff --git a/uppsrc/TSql/Ctrl/TSqlCtrl.h b/uppsrc/TSql/Ctrl/TSqlCtrl.h
new file mode 100644
index 000000000..5631c3d88
--- /dev/null
+++ b/uppsrc/TSql/Ctrl/TSqlCtrl.h
@@ -0,0 +1,9 @@
+#ifndef __TSqlCtrl__
+#define __TSqlCtrl__
+
+#include <TSql/TSql.h>
+#include <CtrlLib/CtrlLib.h>
+#include <TDraw/TDraw.h>
+#include "DlgLogin.h"
+
+#endif//__TSqlCtrl__
diff --git a/uppsrc/TSql/Ctrl/TSqlCtrl.icpp b/uppsrc/TSql/Ctrl/TSqlCtrl.icpp
new file mode 100644
index 000000000..94d299011
--- /dev/null
+++ b/uppsrc/TSql/Ctrl/TSqlCtrl.icpp
@@ -0,0 +1,9 @@
+#include "TSqlCtrl.h"
+#pragma hdrstop
+
+NAMESPACE_UPP
+
+#define TFILE <TSql/Ctrl/TSqlCtrl.t>
+#include <Core/t.h>
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/TSql/Ctrl/TSqlCtrl.t b/uppsrc/TSql/Ctrl/TSqlCtrl.t
new file mode 100644
index 000000000..067261e31
--- /dev/null
+++ b/uppsrc/TSql/Ctrl/TSqlCtrl.t
@@ -0,0 +1,60 @@
+
+// DlgLogin.cpp
+
+T_("Change password")
+csCZ("Změna hesla")
+
+T_("The entered passwords differ. Please check typing errors.")
+csCZ("Zadaná hesla se liší. Zřejmě došlo k překlepu.")
+
+T_("Error changing user password.\n[* \1%s\1]")
+csCZ("Změnu hesla nelze provést.\n[* \1%s\1]")
+
+T_("System login")
+csCZ("Přihlášení do systému")
+
+T_("Error creating database connection.&[* \1%s\1]&User name: [* \1%s\1]&Database: [* \1%s\1]&Server: [* \1%[(default)]~s\1]&Connection type: [* \1%[(default)]~s\1]")
+csCZ("Nelze vytvořit databázové spojení.&[* \1%s\1]&Uživatel: [* \1%s\1]&Databáze: "
+     "[* \1%s\1]&Server: [* \1%[(výchozí)]~s\1]&Typ spojení: [* \1%[(výchozí)]~s\1]")
+
+T_("Password setting not supported by active database connection.")
+csCZ("Zvolený typ databázového spojení nepodporuje změnu hesla.")
+
+
+// DlgLogin.lay
+
+T_("&Username:")
+csCZ("&Uživatel:")
+
+T_("&Password:")
+csCZ("&Heslo:")
+
+T_("&Database:")
+csCZ("&Databáze:")
+
+T_("&Server:")
+csCZ("&Server:")
+
+T_("&Type:")
+csCZ("&Typ:")
+
+T_("St&ore password")
+csCZ("Uložit hesl&o")
+
+T_("OK")
+csCZ("OK")
+
+T_("Cancel")
+csCZ("Storno")
+
+T_("S&et password")
+csCZ("Změnit heslo")
+
+T_("&Abort")
+csCZ("&Přerušit")
+
+T_("&New password:")
+csCZ("&Nové heslo:")
+
+T_("&Confirm pasword:")
+csCZ("&Potvrdit heslo:")
diff --git a/uppsrc/TSql/Ctrl/doc.dpp/AppDoc_DlgLoginSetPass_CS-CZ15.dpx b/uppsrc/TSql/Ctrl/doc.dpp/AppDoc_DlgLoginSetPass_CS-CZ15.dpx
new file mode 100644
index 000000000..6a03b5be7
--- /dev/null
+++ b/uppsrc/TSql/Ctrl/doc.dpp/AppDoc_DlgLoginSetPass_CS-CZ15.dpx
@@ -0,0 +1,73 @@
+HELP_TOPIC("AppDoc", "", "DlgLoginSetPass", "CS-CZ windows-1250", "")
+HELP_TEXT(
+	"[3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0} \r\n"
+	"[s0;= \r\n"
+	"@@Drawing:1322&764\r\n"
+	"�������������������\377폀�������������������߀�����������������������߀���€������\r\n"
+	"���������������������݀�����������������������ހ��������Ā��������ހ������������\r\n"
+	"�ۀ�������������€��������݀�����������������܀�������������ـ������������������\r\n"
+	"�����܀������������������ڀ���������������������������������Ӡ��������怀����\r\n"
+	"������\377ڀ�퀛�ဠ��倀���Ā����������������������������������݀����������\r\n"
+	"���܀������������܀������������ۀ������������ۀ�������������ۀ�������������ڀ�\r\n"
+	"������������ڀ�������������ـ������������ـ���������������\377�\377\377\377�������̿�����́\r\n"
+	"„��������������������������������������„��������������������������������������\r\n"
+	"„�����������������������������̿�����̃�����\377\377\377����������������ɐ��������������\r\n"
+	"҂������Ҁ��������������ɐ���������������\377\377�������������������������������������\r\n"
+	"��������������������������������������������������������������������������������\r\n"
+	"�������������������������ʀ��������������������������݀�������������܀����������\r\n"
+	"���܀������������ۀ������������ۀ������������ۀ�������������ڀ�������������ڀ�\r\n"
+	"������������ـ�������������ـ���������������\377�\377\377�\377������\377������̄���������������\r\n"
+	"��������„��������������������������������������„������������������������������\r\n"
+	"����������������\377�������������\377\377�\377������������������������������ā������ā������\r\n"
+	"ȁ������������������������������������������������������������������������������\r\n"
+	"�����\377\377�������������������������������������������������������������������������\r\n"
+	"�����������������������������������������������������������������ʀ��ڀ���������\r\n"
+	"�����������������݀������������܀������������܀�������������ۀ�������������ۀ�\r\n"
+	"������������ۀ�������������ڀ������������ڀ������������ـ������������ـ�������\r\n"
+	"���������\377�\377\377\377��\377�����������́����������������������������������„��������������\r\n"
+	"������������������������„������������������������������\377������̏���̃�����\377\377\377��\r\n"
+	"ɐ��������������������������������������ԁ��������������������������������������\r\n"
+	"Œ��������������ɐ���������������������\377�\377��������������������������������������\r\n"
+	"��������������������������������������������������������������������������������\r\n"
+	"�����������������������܂����������\377������؀��������������؀�����܀��Ԁ����܀���\r\n"
+	"�����܀���Ԁɀ����ր��쀢���րӀ�쀉�����؀��������������ڀ��������ր���������ր\r\n"
+	"��������������Ӡ���������怠�����������\377Հ�����������̀Ӡ��������怀��������\r\n"
+	"���\377��退����倀쀺��������܀���Ԁ��������������������������������������������\r\n"
+	"��������������������������������������������������������������������������������\r\n"
+	"�������������������������󀀀���������������󀏀������􀠁�����������􀁐�������\r\n"
+	"�����󀎀���������������������������Ӡ��������怀����������\377Հ�Հ�������』��\r\n"
+	"��������������ڀ���������ր���������ր��������������Ӡ��������怠����������\377�\r\n"
+	"��������������Ӡ���������怀�����������\377���退��������������܈���Ԁ��\r\n"
+	"��������������������������������������������������������������������������������\r\n"
+	"�������������������������������������������������������������������󀀀���������\r\n"
+	"������󀀏�������􀁀��������������������������󀀎���������������������������Ӡ\r\n"
+	"���������怀�����������\377���������������������������������ڀɀ������ր���������\r\n"
+	"�ր������������̀Ӡ��������怠�����������\377Ѐ�������������Ӡ��������怀������\r\n"
+	"�����\377��������������������܀��Ԁɀ�������������������������������\r\n"
+	"��������������������������������������������������������������������������������\r\n"
+	"������������������������������������󀀀���������������󀀏�������􀁀����������\r\n"
+	"�􀁀������������󀎀��������������������������Ӏ�����Ӏ���怀�����������\377�����\r\n"
+	"���������瀏��������������ր��쀀�����Ѐ����������̀����݀������̀����݀�������\r\n"
+	"������܀������̀�����܀������̀�����܀������̀�����܀������̀����ۀ������̀����\r\n"
+	"�ۀ������̀����ۀ������̸�����ۀ������̀�����ڀ������̀�����ڀ������̀�����ڀ���\r\n"
+	"���̀����ڀ������̀����ـ������̀����ـ������̸�����ـ������̀�����ـ���������\r\n"
+	"���Ӡ��������怀�����������\377π�ˀ�������π�����������������������π�����������\r\n"
+	"������Ѐ�������������̀�����������������������΀������������������΀������������\r\n"
+	"�ˀ�����������������������̀�����������������̀���������Ĉ���րӀ�쀅�����Ѐ����\r\n"
+	"�����̀�����݀������̀�����݀������̀����܀������̀����܀������̀����܀�������\r\n"
+	"������܀������̀�����ۀ������̀�����ۀ������̀�����ۀ������̀����ۀ������̀����\r\n"
+	"�ڀ������̀����ڀ������̸�����ڀ������̀�����ڀ������̀�����ـ������̀�����ـ���\r\n"
+	"���̀����ـ������̀����ـ�����������Ӡ���������怀�����������\377Ӏ���\r\n")
+	HELP_TEXT(
+	"������π�����������������������π������������������Ѐ�������������̀������������\r\n"
+	"�����������΀�����������������΀������������������؀������\r\n"
+	"&]\r\n"
+	"[s0;Q+101 Formul�� pro zm�nu hesla u�ivatele se vyvol� stisknut�m \r\n"
+	"tla��tka [* `[Zm�na hesla`]] v_p�ihla�ovac�m dialogu. Heslo lze \r\n"
+	"zm�nit pouze tehdy, pokud u�ivatel p�edt�m vyplnil spr�vn� u�ivatelsk� \r\n"
+	"jm�no, datab�zi, server a p�vodn� heslo. Heslo je skryt�, proto \r\n"
+	"je t�eba zadat pro kontrolu identick� heslo dvakr�t, aby se sn�ilo \r\n"
+	"riziko p�eklepu. Po �sp�n�m proveden� zm�ny hesla se otev�e \r\n"
+	"z�kladn� okno aplikace.")
+HELP_END
diff --git a/uppsrc/TSql/Ctrl/doc.dpp/AppDoc_DlgLogin_CS-CZ15.dpx b/uppsrc/TSql/Ctrl/doc.dpp/AppDoc_DlgLogin_CS-CZ15.dpx
new file mode 100644
index 000000000..bd3349a19
--- /dev/null
+++ b/uppsrc/TSql/Ctrl/doc.dpp/AppDoc_DlgLogin_CS-CZ15.dpx
@@ -0,0 +1,53 @@
+HELP_TOPIC("AppDoc", "", "DlgLogin", "CS-CZ windows-1250", "")
+	HELP_TEXT(
+	"[3 $$0,0#00000000000000000000000000000000:Default]\r\n"
+	"[{0}%EN-US \r\n"
+	"[s0;2 Dialog slou�� k_zad�n� informac� pro nav�z�n� spojen� s_datab�zov�m \r\n"
+	"serverem.&]\r\n"
+	"[s0;2 &]\r\n"
+	"[s0;2 Do odpov�daj�c�ch pol� p�ihla�ovac�ho formul��e je t�eba vyplnit \r\n"
+	"u�ivatelsk� jm�no, heslo, n�zev datab�ze a_datab�zov�ho serveru; \r\n"
+	"tyto informace vypl�vaj� z_instalace a_nastaven� aplikace a_opr�vn�n�mu \r\n"
+	"u�ivateli je poskytne spr�vce syst�mu. Po vypln�n� p��slu�n�ch \r\n"
+	"hodnot stiskneme tla��tko [%00-00;3 \r\n"
+	"@@PNG:400&109/25\r\n"
+	"����Ǎ���������Ȁ�Ҁ��Ѐ�����������򌋀�����������헱� ތ����ॏ��������߀�����\r\n"
+	"��񨇱�椂���Ɏ�������ֆ���ˆ���Ā��������ً��˰����彤ӱ����Ű߂�㕌���Ӫ���\r\n"
+	"������ҦDž��ʷ������������×���ܣ߲��Ї�����������В����Ù��������؛Ό���������\r\n"
+	"����ʙ�ه�옢���ɶҧ�ܜ�������\377����������DŽ��ް���������ę����ю�������缀\r\n"
+	"���͏����Հ����Ť�Į���\r\n"
+	"]. Vypln�n� �daje budou n�sledn� ov��eny datab�zov�m serverem.&]\r\n"
+	"[s0;2 &]\r\n"
+	"[s0;2 Po �sp�n�m p�ihl�en� do syst�mu se spust� samotn� aplikace. \r\n"
+	"Pokud se p�ihl�en� nezda�� (neplatn� u�ivatelsk� jm�no nebo \r\n"
+	"heslo, nespr�vn� n�zev serveru, pot�e s_instalac� datab�zov�ho \r\n"
+	"klienta nebo s_dostupnost� serveru) , syst�m zobraz� hl�en� \r\n"
+	"s_popisem vznikl� situace a_vyzve u�ivatele k_op�tovn�mu p�ihl�en�.&]\r\n"
+	"[s0;2 &]\r\n"
+	"[s0;2 Upozorn�n�: pokud va�e heslo pro vstup do datab�ze obsahuje \r\n"
+	"��slice, zkontrolujte si zvolen� jazyk a_p�ep�na� numerick� kl�vesnice. \r\n"
+	"Velk� a_mal� p�smena se zde nerozli�uj�.&]\r\n"
+	"[s0;2 &]\r\n"
+	"[s0;2 Pro zrychlen� �ast�ho p�ihla�ov�n� lze vyu��t za�krt�vac�ho \r\n"
+	"pol��ka Ulo�it heslo. Heslo se ukl�d� v_za�ifrovan�m tvaru do \r\n"
+	"konfigura�n�ho souboru ve_slo�ce aplikace. Tuto volbu je vhodn� \r\n"
+	"vyu��t tehdy, pokud pracujete s_po��ta�em samostatn� ve vlastn� \r\n"
+	"kancel��i, kde nehroz� zneu�it� va�eho hesla neopr�vn�nou osobou.&]\r\n"
+	"[s0;2 Zm�na hesla&]\r\n"
+	"[s0;2 Pokud chcete zm�nit heslo, je nejprve t�eba stejn� jako p�i \r\n"
+	"b�n�m vstupu do syst�mu zadat p�ihla�ovac� informace (aby syst�m \r\n"
+	"mohl ov��it v� p��stup k_datab�zi a_povolit v�m zm�nu hesla). \r\n"
+	"Po vypln�n� pot�ebn�ch �daj� stiskn�te tla��tko [%00-00;3 \r\n"
+	"@@PNG:400&109/25\r\n"
+	"����Ǎ���������Ȁ�Ҁ��Ѐ�����������򌋀��������������΄�ܐ핃�ȭ��������\377�ŘϞ\r\n"
+	"����Ï���߰�����Ν“���������̰������������ˆᜅ��ɒ�\377�ʢ�����������԰��떱���\r\n"
+	"���뉯��łГ������������ѵ��Π��•�������ˋ����������Α�������ᖗ���̦��ߑ���\r\n"
+	"��ʟ���ꓫ��ꕰ�α�������������������ݘݖ�㧔�؆��������ᆃ̖�������̧��ᛚ\r\n"
+	"�ء�������㠪�ό�߉��٬���Ӫ������������������χ��Ƚ��Һ����꺵��ڿ�Ń��������\r\n"
+	"�����dz������󑲨���۟��������뫶��������߿��������Ꭶ��Ǐ���������͋�������͢�\r\n"
+	"����\377쓿�Ֆ�¸���̀����Ť�Į���\r\n"
+	"]; pot� se provede p�ihl�en� k_datab�zi a_vyvol� se dialog pro \r\n"
+	"zm�nu hesla. Po zm�n� hesla a_ukon�en� tohoto dialogu se spust� \r\n"
+	"z�kladn� panel aplikace.&]\r\n"
+	"[s0;2 ")
+HELP_END
diff --git a/uppsrc/TSql/Ctrl/doc.dpp/links b/uppsrc/TSql/Ctrl/doc.dpp/links
new file mode 100644
index 000000000..e69de29bb
diff --git a/uppsrc/TSql/TSql.h b/uppsrc/TSql/TSql.h
new file mode 100644
index 000000000..ae5ad0b44
--- /dev/null
+++ b/uppsrc/TSql/TSql.h
@@ -0,0 +1,18 @@
+#ifndef __TSql__
+#define __TSql__
+
+#include <Sql/Sql.h>
+#include <TCore/TCore.h>
+
+#define FromSchema(tbl) From(SchemaAlias((tbl)))
+#define FromSchema2(t1, t2) From(SqlSet(SchemaAlias((t1)), SchemaAlias((t2))))
+#define FromSchema3(t1, t2, t3) From(SqlSet(SchemaAlias((t1)), SchemaAlias((t2)), SchemaAlias((t3))))
+#define FromSet(set)    From((set))
+#define LeftJoinSchema(tbl) LeftJoin(SqlId(~SchemaAlias(tbl)))
+#define InnerJoinSchema(tbl) InnerJoin(SqlId(~SchemaAlias(tbl)))
+
+#include "util.h"
+#include "template.h"
+#include "dict.h"
+
+#endif//__TSql__
diff --git a/uppsrc/TSql/TSql.t b/uppsrc/TSql/TSql.t
new file mode 100644
index 000000000..208d6a129
--- /dev/null
+++ b/uppsrc/TSql/TSql.t
@@ -0,0 +1,19 @@
+#ifdef _MSC_VER
+#pragma setlocale("C")
+#endif
+// util.cpp
+
+T_("Table '%s', column '%s': NULL value requested.")
+csCZ("Tabulka '%s', sloupec '%s': hledaná hodnota je NULL.")
+
+T_("Row '%s' not found (table '%s', column '%s').")
+csCZ("Řádek '%s' nebyl nalezen (tabulka '%s', sloupec '%s').")
+
+T_("FETCH internal error (ForceInsertRowid)")
+csCZ("Interní chyba FETCH (ForceInsertRowid)")
+
+
+// dict.cpp
+
+T_("User is not connected to the database.")
+csCZ("Uživatel není připojen k databázi.")
diff --git a/uppsrc/TSql/TSql.upp b/uppsrc/TSql/TSql.upp
new file mode 100644
index 000000000..ce4f59670
--- /dev/null
+++ b/uppsrc/TSql/TSql.upp
@@ -0,0 +1,20 @@
+description "Experimental (sometimes obsolete) SQL code";
+
+uses
+	Sql,
+	TCore;
+
+file
+	TSql.h,
+	TSql.t charset "UTF-8",
+	TSql_init.icpp,
+	template.h,
+	util.h,
+	util.cpp,
+	id.h,
+	dict.h,
+	dict.cpp,
+	Info readonly separator,
+	COPYING,
+	COPYING-PLAIN,
+	AUTHORS;
diff --git a/uppsrc/TSql/TSql_init.icpp b/uppsrc/TSql/TSql_init.icpp
new file mode 100644
index 000000000..15f297eee
--- /dev/null
+++ b/uppsrc/TSql/TSql_init.icpp
@@ -0,0 +1,8 @@
+#include "TSql.h"
+
+NAMESPACE_UPP
+
+#define TFILE <TSql/TSql.h>
+#include <Core/t.h>
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/TSql/dict.cpp b/uppsrc/TSql/dict.cpp
new file mode 100644
index 000000000..a101dd4d1
--- /dev/null
+++ b/uppsrc/TSql/dict.cpp
@@ -0,0 +1,531 @@
+//////////////////////////////////////////////////////////////////////
+// dict: user privileges, relocation, index removal.
+
+#include "TSql.h"
+#pragma hdrstop
+
+NAMESPACE_UPP
+
+#ifndef NOAPPSQL
+int SqlUserGetRightsTo(const char* table)
+{
+	return SqlUser().GetRightsTo(table);
+}
+#endif
+
+#ifndef NOAPPSQL
+bool SqlUserCanWrite(const char* table)
+{
+	return SqlUser().CanWrite(table);
+}
+#endif
+
+#ifndef NOAPPSQL
+bool SqlUserCanRead(const char* table)
+{
+	return SqlUser().CanRead(table);
+}
+#endif
+
+SqlAnyTable::SqlAnyTable()
+{
+}
+
+SqlAnyTable::SqlAnyTable(const char *table_name, SqlSession& session)
+{
+	const char *n = strchr(table_name, '.');
+	if(n)
+	{ // full specification
+		owner = ToUpper(String(table, n - table_name));
+		table = ToUpper(n + 1);
+	}
+	else
+	{ // check table existence
+		static VectorMap<String, SqlAnyTable> table_map;
+		static String user;
+
+		if(session.GetUser() != user)
+		{ // another user - clear cache
+			user = session.GetUser();
+			table_map.Clear();
+		}
+
+		int ix = table_map.Find(table_name);
+		if(ix >= 0)
+		{
+			*this = table_map[ix];
+			return;
+		}
+
+		table = ToUpper(table_name);
+		Sql cursor(session);
+		owner = cursor.Select("OWNER from ALL_TABLES "
+			"where OWNER = USER and TABLE_NAME = ?", table);
+		if(IsNull(owner))
+		{ // table not found - look up synonym table
+			if(!cursor.Execute("select TABLE_OWNER, TABLE_NAME from ALL_SYNONYMS "
+				"where SYNONYM_NAME = ? "
+				"order by DECODE(OWNER, USER, 0, 'PUBLIC', 1, 2)", table))
+				throw SqlExc(session);
+			if(!cursor.Fetch(owner, table))
+				owner = table = String();
+		}
+		if(!IsNull(owner) && !IsNull(table))
+			table_map.FindAdd(table_name, *this);
+	}
+}
+
+SqlAnyTable::SqlAnyTable(const char* owner, const char* table)
+	: owner(owner), table(table)
+{
+}
+
+String SqlAnyTable::Dot() const
+{
+	String result;
+	if(!IsNull(owner))
+		result << owner << '.';
+	result += table;
+	return result;
+}
+
+bool SqlAnyTable::operator == (const SqlAnyTable& t) const
+{
+	return owner == t.owner && table == t.table;
+}
+
+SqlAnyColumn::SqlAnyColumn()
+{
+}
+
+SqlAnyColumn::SqlAnyColumn(const char* column, const char* table_name, SqlSession& session)
+: SqlAnyTable(table_name, session)
+, column(ToUpper(column))
+{
+}
+
+SqlAnyColumn::SqlAnyColumn(const char* column, const char* owner, const char* table)
+: SqlAnyTable(owner, table)
+, column(ToUpper(column))
+{
+}
+
+SqlAnyColumn::SqlAnyColumn(const char* column, const SqlAnyTable& table)
+: SqlAnyTable(table)
+, column(ToUpper(column))
+{
+}
+
+String SqlAnyColumn::DotColumn() const
+{
+	return Dot() + '.' + column;
+}
+
+bool SqlAnyColumn::operator == (const SqlAnyColumn& c) const
+{
+	return owner == c.owner && table == c.table && column == c.column;
+}
+
+#ifndef NOAPPSQL
+GLOBAL_VAR(SqlUserRights, SqlUser)
+#endif
+
+void SqlUserRights::Clear()
+{
+	user = Null;
+	roles.Clear();
+	rights.Clear();
+	error = Null;
+}
+
+void SqlUserRights::Sync()
+{
+	try
+	{
+		SqlSession& ss = GetSession();
+		if(!ss)
+			throw SqlExc(t_("User is not connected to the database."));
+
+		String new_user = ss.GetUser();
+		if(user == new_user) // user has not changed, rights are up to date
+			return;
+
+		Clear();
+
+		user = new_user;
+		Sql cursor(ss);
+		(Select(SqlId("GRANTED_ROLE")).From(SqlId("USER_ROLE_PRIVS"))
+			| Select(SqlId("GRANTED_ROLE")).From(SqlId("ROLE_ROLE_PRIVS"))).Force(cursor);
+
+		String temp;
+		while(cursor.Fetch(temp))
+			roles.FindAdd(temp);
+
+		// fetch rights
+		SqlId OWNER("OWNER");
+		SqlId TABLE_NAME("TABLE_NAME");
+		SqlId PRIVILEGE("PRIVILEGE");
+		Select(SqlCol("OWNER, TABLE_NAME, "
+			"SUM(distinct DECODE(PRIVILEGE, 'SELECT', 1, 'UPDATE', 2, "
+			"'INSERT', 4, 'DELETE', 8, 0))"))
+			.From(Select(OWNER, TABLE_NAME, PRIVILEGE).From(SqlId("USER_TAB_PRIVS")) |
+			      Select(OWNER, TABLE_NAME, PRIVILEGE).From(SqlId("ROLE_TAB_PRIVS")))
+//			"(select * from USER_TAB_PRIVS union select * from ROLE_TAB_PRIVS)")
+			.GroupBy(SqlSet(SqlId("OWNER"), SqlId("TABLE_NAME")))
+			.Force(cursor);
+
+		SqlAnyTable t;
+		int privs;
+		while(cursor.Fetch(t.owner, t.table, privs))
+			rights.Add(t.Dot(), privs);
+	}
+	catch(Exc e)
+	{
+		error = e;
+	}
+}
+
+int SqlUserRights::GetRightsTo(const char* table)
+{
+	try
+	{
+		SqlSession& session = GetSession();
+		SqlAnyTable tbl(table, session);
+		if(tbl.owner == session.GetUser())
+			return 15; // user has always full access to his/her own schema
+		Sync();
+		int ix = rights.Find(tbl.Dot());
+		return (ix >= 0 ? rights[ix] : 0);
+	}
+	catch(Exc e)
+	{
+		error = e;
+		return 0;
+	}
+}
+
+bool SqlUserRights::HasRole(const char* role)
+{
+	Sync();
+	return roles.Find(role) >= 0;
+}
+
+SqlIndex::SqlIndex()
+{
+	session = NULL;
+}
+
+void SqlIndex::Open(String ind, String own, SqlSession& session)
+{
+	SqlBool exp = SqlId("INDEX_NAME") == ind;
+	if(!IsNull(own))
+		exp &= SqlCol("OWNER") == own;
+	Sql cursor(session);
+	Select(SqlId("OWNER"), SqlId("INDEX_NAME"), SqlId("TABLE_OWNER"), SqlId("TABLE_NAME"))
+		.From(SqlId("ALL_INDEXES"))
+		.Where(exp).Force(cursor);
+	if(cursor.Fetch(owner, index, table.owner, table.table))
+		FetchContainerExc(columns, Select(SqlId("COLUMN_NAME"))
+		.From(SqlId("ALL_IND_COLUMNS"))
+		.Where(SqlId("INDEX_OWNER") == owner && SqlId("INDEX_NAME") == index),
+		session);
+	dropped = false;
+}
+
+SqlIndex::SqlIndex(const SqlIndex& another, int)
+{
+	table     = another.table;
+	index     = another.index;
+	columns <<= another.columns;
+	dropped   = another.dropped;
+	session   = another.session;
+}
+
+SqlIndex::~SqlIndex()
+{
+}
+
+String SqlIndex::Dot() const
+{
+	if(!owner.IsEmpty())
+		return owner + '.' + index;
+	else
+		return index;
+}
+
+void SqlIndex::Drop()
+{
+	ASSERT(session);
+	Sql cursor(*session);
+	if(!index.IsEmpty() && cursor.Execute("drop index " + Dot()))
+		dropped = true;
+}
+
+void SqlIndex::Create()
+{
+	if(index.IsEmpty() || columns.IsEmpty() || !dropped)
+		return;
+
+	String s;
+	s << "create index " << Dot() << " on " << table.Dot()
+		<< '(' << columns[0];
+	for(int i = 1; i < columns.GetCount(); i++)
+		s << ", " << columns[i];
+	s << ')';
+	ASSERT(session);
+	Sql cursor(*session);
+	if(cursor.Execute(s))
+		dropped = false;
+}
+
+SqlIndexMap::SqlIndexMap()
+{
+}
+
+SqlIndexMap::~SqlIndexMap()
+{
+}
+
+void SqlIndexMap::Add(const char* _table, SqlSession& session)
+{
+	SqlAnyTable table(_table, session);
+
+	Sql cursor(session);
+	if(!cursor.Execute("select OWNER, INDEX_NAME from ALL_INDEXES "
+		"where UNIQUENESS = 'NONUNIQUE' "
+		"and TABLE_OWNER = ? and TABLE_NAME = ?", table.owner, table.table))
+		throw SqlExc(session);
+
+	String owner, index;
+	while(cursor.Fetch(owner, index))
+		AddPick(SqlIndex(index, owner, session));
+}
+
+void SqlIndexMap::Drop(Gate2<int, int> progress)
+{
+	for(int i = 0; i < map.GetCount(); i++)
+	{
+		map[i].Drop();
+		if(progress(i, map.GetCount()))
+			throw AbortExc();
+	}
+}
+
+void SqlIndexMap::Create(Gate2<int, int> progress)
+{
+	for(int i = 0; i < map.GetCount(); i++)
+	{
+		map[i].Create();
+		if(progress(i, map.GetCount()))
+			throw AbortExc();
+	}
+}
+
+SqlRelocate::SqlRelocate()
+{
+	session = NULL;
+}
+
+SqlRelocate::~SqlRelocate()
+{
+}
+
+void SqlRelocate::Find(SqlId table, SqlId column, SqlSession& session)
+{
+	Find(~table.ToString(), ~column.ToString(), session);
+}
+
+void SqlRelocate::Find(const char* table, const char* column, SqlSession& sess)
+{
+	session = &sess;
+
+// todo: CWaitCursor without GUI / MFC?
+//	CWaitCursor wait;
+
+	error = Null;
+	reference.Clear();
+	canceled = false;
+
+	try
+	{
+		SqlAnyColumn col(column, table, *session);
+		static VectorMap<SqlAnyColumn, Vector<SqlAnyColumn> > reference_map;
+		int i = reference_map.Find(col);
+		if(i >= 0)
+		{
+			reference <<= reference_map[i];
+			return;
+		}
+
+		Vector<int> positions;
+
+		Sql cursor(*session);
+		if(!cursor.Execute("select distinct POSITION from ALL_CONS_COLUMNS "
+			"where OWNER = ? and TABLE_NAME = ? "
+			"and COLUMN_NAME = ? and POSITION is not NULL",
+			col.owner, col.table, col.column))
+			throw SqlExc(*session);
+
+		int temp;
+		if(cursor.Fetch(temp))
+		{ // positions exist
+			do
+				positions.Add(temp);
+			while(cursor.Fetch(temp));
+			for(int pos = 0; pos < positions.GetCount(); pos++)
+			{
+				if(!cursor.Execute(
+					"select OWNER, TABLE_NAME, COLUMN_NAME from ALL_CONS_COLUMNS "
+					"where (OWNER, CONSTRAINT_NAME, POSITION) in "
+					"(select OWNER, CONSTRAINT_NAME, ? from ALL_CONSTRAINTS "
+					"where CONSTRAINT_TYPE = 'R' and (OWNER, R_CONSTRAINT_NAME) in "
+					"(select OWNER, CONSTRAINT_NAME from ALL_CONS_COLUMNS "
+					"where OWNER = ? and TABLE_NAME = ? "
+					"and COLUMN_NAME = ? and POSITION = ?))",
+					positions[pos], col.owner, col.table, col.column, positions[pos]))
+					throw SqlExc(*session);
+
+				SqlAnyColumn rcol;
+				while(cursor.Fetch(rcol.owner, rcol.table, rcol.column))
+					reference.Add(rcol);
+			}
+		}
+		reference_map.Add(col, reference);
+	}
+	catch(Exc e)
+	{
+		error = e;
+	}
+	ClearResult();
+}
+
+void SqlRelocate::Move(const Vector<int>& old_seq, const Vector<int>& new_seq, int options, Gate2<int, int> progress)
+{
+	ASSERT(session);
+
+	if(!error.IsEmpty()) // don't do anything when Find() failed
+		return;
+
+	ASSERT(old_seq.GetCount() == new_seq.GetCount());
+	Vector<SqlSet> old_sub, new_sub, dec_sub;
+	int c = 0;
+	for(int i = 0; i < old_seq.GetCount(); i++)
+		if(!IsNull(old_seq[i]) && new_seq[i] != old_seq[i])
+		{
+			if(c >= 50 || old_sub.IsEmpty())
+			{
+				old_sub.Add();
+				new_sub.Add();
+				dec_sub.Add();
+				c = 0;
+			}
+			c++;
+			old_sub.Top().Cat(old_seq[i]);
+			new_sub.Top().Cat(new_seq[i]);
+			dec_sub.Top().Cat(old_seq[i]).Cat(new_seq[i]);
+		}
+
+	if(old_sub.IsEmpty())
+		return;
+
+	canceled = false;
+	ClearResult();
+// todo: CWaitCursor without GUI / MFC?
+//	CWaitCursor wait;
+
+	try
+	{
+		SqlBlock block(*session);
+		Sql cursor(*session);
+		if(progress(0, GetCount()) && !(options & NO_CANCEL))
+		{
+			canceled = true;
+			throw AbortExc();
+		}
+		for(int i = 0; i < GetCount(); i++)
+		{
+			const SqlAnyColumn& column = reference[i];
+			SqlId tbl(column.Dot());
+			SqlId col(column.column);
+			for(int s = 0; s < old_sub.GetCount(); s++)
+			{
+				if(!IsNull(cursor % Select(1).From(tbl).Where(col == old_sub[s] && SqlId("ROWNUM") == 1)))
+				{
+					SqlSet dec_set = dec_sub[s];
+					dec_set.Cat(col);
+					if(!Update(tbl)(col, Decode(col, dec_set))
+						.Where(col == old_sub[s]).Execute(cursor))
+					{ // update failed
+						if(!(options & TRY_ALL))
+							throw SqlExc(*session);
+						else if(error.IsEmpty())
+							error = SqlExc(*session); // just store error & continue trying other tables
+					}
+					else
+						result[i] = true;
+				}
+				else
+					result[i] = true;
+			}
+//				progress.SetText(
+//					Format("Upravuji %s", column.column), false);
+			if(progress(i, GetCount()) && !(options & NO_CANCEL))
+			{ // set 'canceled' flag & exit
+				canceled = true;
+				throw AbortExc();
+			}
+		}
+		block.Commit();
+	}
+	catch(Exc e)
+	{
+		error = e;
+	}
+}
+
+void SqlRelocate::Move(int old_seq, int new_seq, int options, Gate2<int, int> progress)
+{
+	Vector<int> src, dest;
+	src << old_seq;
+	dest << new_seq;
+	Move(src, dest, options, progress);
+}
+
+void SqlRelocate::ClearResult()
+{
+	result.SetCount(reference.GetCount());
+	Fill(result.Begin(), result.End(), false);
+}
+
+Vector<SqlAnyColumn> SqlRelocate::GetReferences(int seq) const
+{
+	ASSERT(session);
+
+	Vector<SqlAnyColumn> result;
+	if(IsNull(seq))
+		return result;
+
+	Sql cursor(*session);
+
+	for(int i = 0; i < GetCount(); i++)
+	{
+		const SqlAnyColumn& column = reference[i];
+		if(seq == (int)cursor.Select(column.column + " from " + column.Dot()
+			+ " where " + column.column + " = ? and ROWNUM = 1", seq))
+			result.Add(column);
+	}
+
+	return result;
+}
+
+unsigned GetHashValue(const SqlAnyTable& t)
+{
+	return GetHashValue(t.owner) ^ GetHashValue(t.table);
+}
+
+unsigned GetHashValue(const SqlAnyColumn& t)
+{
+	return GetHashValue(static_cast<const SqlAnyTable&>(t)) ^ GetHashValue(t.column);
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/TSql/dict.h b/uppsrc/TSql/dict.h
new file mode 100644
index 000000000..d23a016f8
--- /dev/null
+++ b/uppsrc/TSql/dict.h
@@ -0,0 +1,230 @@
+//////////////////////////////////////////////////////////////////////
+// SqlDict: DICTIONARY - based functions.
+// Utilities:            AnyTable, AnyColumn
+// User rights:          UserGetRightsTo, UserCanRead, UserCanWrite
+//                       UserRights
+// Key relocation:       Relocate
+// Index autodrop:       Index, IndexMap
+// usage:
+// if(UserCanRead[Write]("ADRESA"[ADRESA]))
+//    ...
+
+NAMESPACE_UPP
+
+enum // rights
+{
+	SEL = 0x01,
+	UPD = 0x02,
+	INS = 0x04,
+	DEL = 0x08,
+};
+
+#ifndef NOAPPSQL
+int         SqlUserGetRightsTo(const char* table);
+bool        SqlUserCanWrite(const char* table);
+bool        SqlUserCanRead(const char* table);
+
+inline int  SqlUserGetRightsTo(const String& s) { return SqlUserGetRightsTo(~s); }
+inline bool SqlUserCanWrite(const String& s)    { return SqlUserCanWrite(~s); }
+inline bool SqlUserCanRead(const String& s)     { return SqlUserCanRead(~s); }
+
+inline int  SqlUserGetRightsTo(Id id)           { return SqlUserGetRightsTo(~id); }
+inline bool SqlUserCanWrite(Id id)              { return SqlUserCanWrite(~id); }
+inline bool SqlUserCanRead(Id id)               { return SqlUserCanRead(~id); }
+#endif
+
+//////////////////////////////////////////////////////////////////////
+
+struct SqlAnyTable : Moveable<SqlAnyTable>
+{
+	String       owner;
+	String       table;
+
+	SqlAnyTable();
+	SqlAnyTable(const char* owner, const char* table);
+#ifndef NOAPPSQL
+	SqlAnyTable(const char* table, SqlSession& session = SQL.GetSession());
+#else
+	SqlAnyTable(const char* table, SqlSession& session);
+#endif
+
+	bool operator == (const SqlAnyTable& t) const;
+	bool operator != (const SqlAnyTable& t) const { return !(*this == t); }
+
+	String       Dot() const;
+};
+
+//////////////////////////////////////////////////////////////////////
+
+struct SqlAnyColumn : public SqlAnyTable, Moveable<SqlAnyColumn>
+{
+	String column;
+
+	SqlAnyColumn();
+#ifndef NOAPPSQL
+	SqlAnyColumn(const char* column, const char* table_name, SqlSession& session = SQL.GetSession());
+#else
+	SqlAnyColumn(const char* column, const char* table_name, SqlSession& session);
+#endif
+	SqlAnyColumn(const char* column, const char* owner, const char* table);
+	SqlAnyColumn(const char* column, const SqlAnyTable& table);
+
+	bool operator == (const SqlAnyColumn& c) const;
+	bool operator != (const SqlAnyColumn& c) const { return !(*this == c); }
+
+	String DotColumn() const;
+
+};
+
+//////////////////////////////////////////////////////////////////////
+
+class SqlUserRights
+{
+public:
+	SqlUserRights(SqlSession& session) : session(&session) {}
+#ifndef NOAPPSQL
+	SqlUserRights() : session(NULL) {}
+#endif
+
+	// it is valid to call members even when SQL is not connected,
+	// in which case there are no rights
+
+#ifndef NOAPPSQL
+	SqlSession&             GetSession() const { return session ? *session : SQL.GetSession(); }
+#else
+	SqlSession&             GetSession() const { ASSERT(session); return *session; }
+#endif
+
+	void                    Clear(); // clear everything (forces Sync() on next call)
+
+	void                    Sync();
+
+	bool                    HasRole(const char* role);
+
+	int                     GetRightsTo(const char* table);
+	bool                    CanRead(const char* table)  { return GetRightsTo(table) & SEL; }
+	bool                    CanWrite(const char* table) { return (~GetRightsTo(table) & (SEL | UPD | INS | DEL)) == 0; }
+
+public:
+	SqlSession             *session;
+	String                  user;
+	Index<String>           roles;
+	VectorMap<String, char> rights; // table names
+	String                  error; // last error message
+};
+
+//////////////////////////////////////////////////////////////////////
+
+#ifndef NOAPPSQL
+extern SqlUserRights& SqlUser();
+#endif
+
+//////////////////////////////////////////////////////////////////////
+// Relocate::
+
+class SqlRelocate
+{
+public:
+	enum OPTIONS
+	{
+		TRY_ALL   = 0x01, // try all tables even on errors
+		NO_CANCEL = 0x02, // don't allow cancelling the operation (only with PROGRESS)
+	};
+
+	SqlRelocate();
+#ifndef NOAPPSQL
+	SqlRelocate(const char *table, const char *column)                      { Find(table, column, SQL.GetSession()); }
+	SqlRelocate(SqlId table, SqlId column)                                  { Find(table, column, SQL.GetSession()); }
+#endif
+	SqlRelocate(const char *table, const char *column, SqlSession& session) { Find(table, column, session); }
+	SqlRelocate(SqlId table, SqlId column, SqlSession& session)             { Find(table, column, session); }
+	~SqlRelocate();
+
+	void                 Find(const char *table, const char *column, SqlSession& session);
+	void                 Find(SqlId table, SqlId column, SqlSession& session);
+
+	void                 Move(int old_seq, int new_seq, int options = 0, Gate2<int, int> progress = false);
+	void                 Move(const Vector<int>& old_seq, const Vector<int>& new_seq, int options = 0, Gate2<int, int> progress = false);
+
+	Vector<SqlAnyColumn> GetReferences(int seq) const; // columns referencing this seq
+
+	bool                 IsEmpty() const     { return reference.IsEmpty(); }
+	int                  GetCount() const    { return reference.GetCount(); }
+
+	bool                 IsCanceled() const { return canceled; }
+	bool                 IsError() const     { return !IsNull(error); }
+
+	const String&        GetError() const    { return error; }
+
+public:
+	Vector<SqlAnyColumn> reference;
+	Vector<bool>         result; // true = update succeeded
+	String               error; // last error message; Null when Find() / Go() succeeded
+	bool                 canceled;
+	SqlSession          *session;
+
+protected:
+	void                 ClearResult();
+};
+
+//////////////////////////////////////////////////////////////////////
+// SqlIndex::
+
+struct SqlIndex : DeepCopyOption<SqlIndex>
+{
+	String         owner;
+	String         index;
+	SqlAnyTable    table;
+	Vector<String> columns;
+	bool           dropped;
+	SqlSession    *session;
+
+	SqlIndex();
+	SqlIndex(String index, String owner, SqlSession& session) { Open(index, owner, session); }
+#ifndef NOAPPSQL
+	SqlIndex(String index, String owner)                      { Open(index, owner, SQL.GetSession()); }
+#endif
+	SqlIndex(const SqlIndex& another, int);
+	~SqlIndex();
+
+	void   Open(String index, String owner, SqlSession& session);
+
+	String Dot() const;
+
+	void   Drop();
+	void   Create();
+};
+
+//////////////////////////////////////////////////////////////////////
+// SqlIndexMap::
+
+class SqlIndexMap
+{
+public:
+	SqlIndexMap();
+	~SqlIndexMap();
+
+	void AddPick(pick_ SqlIndex& index) { map.Add() = index; }
+	void Add(const SqlIndex& index) { map.Add(index); }
+	void Add(const char* table, SqlSession& session);
+#ifndef NOAPPSQL
+	void Add(const char* table) { Add(table, SQL.GetSession()); }
+#endif
+
+	void Drop(Gate2<int, int> progress = false);
+	void Create(Gate2<int, int> progress = false);
+
+public:
+	Array<SqlIndex> map;
+};
+
+#ifndef NOAPPSQL
+inline SqlIndexMap& operator << (SqlIndexMap& map, const char* table) { map.Add(table); return map; }
+#endif
+
+//////////////////////////////////////////////////////////////////////
+
+unsigned GetHashValue(const SqlAnyTable& table);
+unsigned GetHashValue(const SqlAnyColumn& column);
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/TSql/id.h b/uppsrc/TSql/id.h
new file mode 100644
index 000000000..ccc48dfba
--- /dev/null
+++ b/uppsrc/TSql/id.h
@@ -0,0 +1,31 @@
+//////////////////////////////////////////////////////////////////////
+// id.h: some common SQL identifiers.
+
+#pragma BLITZ_APPROVE
+
+SQLID(DUAL)
+SQLID(ROWID)
+SQLID(ROWNUM)
+SQLID(USERNAME)
+SQLID(ALL_USERS)
+SQLID(TABLE_NAME)
+SQLID(USER_TABLES)
+SQLID(VIEW_NAME)
+SQLID(USER_VIEWS)
+SQLID(SEQUENCE_NAME)
+SQLID(USER_SEQUENCES)
+SQLID(SESSION_ROLES)
+SQLID(TABLE_SCHEMA)
+SQLID(GRANTEE)
+SQLID(GRANTOR)
+SQLID(GRANTED_ROLE)
+SQLID(PRIVILEGE)
+SQLID(ALL_TAB_PRIVS)
+SQLID(SYNONYM_NAME)
+SQLID(ALL_SYNONYMS)
+SQLID(USER)
+SQLID(USER_ROLE_PRIVS)
+SQLID(DBA_ROLE_PRIVS)
+SQLID(ALL_TAB_COLUMNS)
+SQLID(DATA_TYPE)
+SQLID(COLUMN_ID)
diff --git a/uppsrc/TSql/template.h b/uppsrc/TSql/template.h
new file mode 100644
index 000000000..4070411c5
--- /dev/null
+++ b/uppsrc/TSql/template.h
@@ -0,0 +1,164 @@
+//////////////////////////////////////////////////////////////////////
+// sql/template: SQL templates.
+
+NAMESPACE_UPP
+
+void __sqltempl__instantiation__(Gate2<int, int>); // a weird compiler bug
+
+template <class C>
+C& FetchContainer(C& container, Sql& cursor, Gate2<int, int> progress = false)
+{
+	int done = 0;
+	typedef typename C::ValueType VT;
+	VT T;
+	while(cursor.Fetch(T))
+	{
+		container.Add(T);
+		if(progress(++done, 0))
+			throw AbortExc();
+	}
+	return container;
+}
+
+template <class C>
+C& FetchContainerExc(C& container, const SqlSelect& set, SqlSession& session APPSQLSESSION, Gate2<int, int> progress = false)
+{
+	Sql cursor(session);
+	set.Force(cursor);
+	return FetchContainer(container, cursor, progress);
+}
+
+template <class C>
+C& FetchContainer(C& container, const SqlSelect& set, SqlSession& session, Gate2<int, int> progress = false)
+{
+	try
+	{
+		FetchContainerExc(container, set, session, progress);
+	}
+	catch(Exc e)
+	{
+//		ShowExc(e);
+	}
+	return container;
+}
+
+#ifndef NOAPPSQL
+template <class C>
+C& FetchContainer(C& container, const SqlSelect& set, Gate2<int, int> progress = false)
+{
+	return FetchContainer(container, set, SQL.GetSession(), progress);
+}
+#endif//NOAPPSQL
+
+template <class I>
+SqlSet SetOf(I begin, I end)
+{
+	SqlSet set;
+	while(begin != end)
+	{
+		set |= SqlVal(*begin);
+		++begin;
+	}
+	return set;
+}
+
+template <class I>
+SqlSet ColumnSetOf(I begin, I end)
+{
+	SqlSet set;
+	while(begin != end)
+	{
+		set |= SqlCol(*begin);
+		++begin;
+	}
+	return set;
+}
+
+template <class C>
+inline SqlSet SetOf(const C& container)
+{
+	return SetOf(container.Begin(), container.End());
+}
+
+template <class C>
+inline SqlSet ColumnSetOf(const C& container)
+{
+	return ColumnSetOf(container.Begin(), container.End());
+}
+
+extern const char *txtFnTSqlTemplateFetchSeqKeyNull();
+extern const char *txtFnTSqlTemplateFetchSeqNotFound();
+
+template <class T>
+T& FetchSeq(T& data, SqlId key, Value value, SqlId table, Sql& cursor APPSQLCURSOR)
+{
+	if(IsNull(value))
+		throw SqlExc(NFormat(s_(FnTSqlTemplateFetchSeqKeyNull()), ~table, ~key));
+	Select(data).From(table).Where(key == value).Force(cursor);
+	if(!cursor.Fetch(data))
+		throw SqlExc(NFormat(s_(FnTSqlTemplateFetchSeqNotFound()), StdFormat(value), ~table, ~key));
+	return data;
+}
+
+template <class T>
+inline T& FetchSeq(T& data, SqlId key, Value value, Sql& cursor APPSQLCURSOR)
+{
+	return FetchSeq<T>(data, key, value, SqlId(T::TableName), cursor);
+}
+
+template <class T>
+inline T FetchSeq(SqlId key, Value value, SqlId table, Sql& cursor APPSQLCURSOR, T * = 0)
+{
+	T temp;
+	return FetchSeq(temp, key, value, table, cursor);
+}
+
+template <class T>
+inline T FetchSeq(SqlId key, Value value, Sql& cursor APPSQLCURSOR, T * = 0)
+{
+	return FetchSeq<T>(key, value, SqlId(T::TableName), cursor);
+}
+
+template <class T>
+T& FetchSchemaSeq(T& data, SqlId key, Value value, SqlId table, Sql& cursor APPSQLCURSOR)
+{
+	if(IsNull(value))
+		throw SqlExc(NFormat(s_(FnTSqlTemplateFetchSeqKeyNull()), ~table, ~key));
+	Select(data).FromSchema(table).Where(key == value).Force(cursor);
+	if(!cursor.Fetch(data))
+		throw SqlExc(NFormat(s_(FnTSqlTemplateFetchSeqNotFound()), StdFormat(value), ~table));
+	return data;
+}
+
+template <class T>
+inline T& FetchSchemaSeq(T& data, SqlId key, Value value, Sql& cursor APPSQLCURSOR)
+{
+	return FetchSchemaSeq<T>(data, key, value, SqlId(T::TableName), cursor);
+}
+
+template <class T>
+inline T FetchSchemaSeq(SqlId key, Value value, SqlId table, Sql& cursor APPSQLCURSOR, T * = 0)
+{
+	T temp;
+	return FetchSchemaSeq(temp, key, value, table, cursor);
+}
+
+template <class T>
+inline T FetchSchemaSeq(SqlId key, Value value, Sql& cursor APPSQLCURSOR, T * = 0)
+{
+	return FetchSeq<T>(key, value, SqlId(T::TableName), cursor);
+}
+
+template <class T>
+SqlSelect SelectWhere(SqlBool cond = true, T * = 0)
+{
+	return Select(T::ColumnSet()).From(SqlCol(T::TableName)).Where(cond);
+}
+
+template <class T>
+SqlSelect SelectSchemaWhere(SqlBool cond = true, T * = 0)
+{
+	return Select(T::ColumnSet()).FromSchema(SqlCol(T::TableName)).Where(cond);
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/TSql/util.cpp b/uppsrc/TSql/util.cpp
new file mode 100644
index 000000000..bded3ebf9
--- /dev/null
+++ b/uppsrc/TSql/util.cpp
@@ -0,0 +1,765 @@
+//////////////////////////////////////////////////////////////////////
+// sql/util: utilities.
+
+#include "TSql.h"
+#pragma hdrstop
+
+#undef GENID
+#define GENID CPPID
+#include <TSql/id.h>
+
+NAMESPACE_UPP
+
+extern const char *txtFnTSqlTemplateFetchSeqKeyNull()  { return t_("Table '%s', column '%s': NULL value requested."); }
+extern const char *txtFnTSqlTemplateFetchSeqNotFound() { return t_("Row '%s' not found (table '%s', column '%s')."); }
+
+GLOBAL_VARP(const SqlId, ALL, ("*"))
+GLOBAL_VARP(const SqlId, QUE, ("?"))
+
+namespace SqlUtil
+{ // internal objects
+
+class InsertScript : public FieldOperator
+{
+public:
+	virtual void Field(const char *name, Ref f)
+	{
+		Value v(f);
+		if(!optimize || !v.IsNull())
+		{
+			if(!IsNull(names))
+			{
+				names.Cat(", ");
+				values.Cat(", ");
+			}
+			names.Cat(name);
+			values.Cat(SqlFormat(v));
+		}
+	}
+
+public:
+	bool optimize;
+	String names;
+	String values;
+};
+
+class SelectColumns : public FieldOperator
+{
+public:
+	virtual void Field(const char *name, Ref f)
+	{
+		columns.Cat(SqlCol(name));
+	}
+
+public:
+	SqlSet columns;
+};
+
+class InsertColumns : public FieldOperator
+{
+public:
+	InsertColumns() {}
+
+	virtual void Field(const char *name, Ref f)
+	{
+		columns.Add(SqlId(name));
+		values.Add(Value(f));
+	}
+
+	SqlInsert    Get(const SqlVal& from_table) const       { return GetRaw(Nvl(~from_table, table)); }
+	SqlInsert    GetSchema(const SqlVal& from_table) const { return GetRaw(SchemaTableName(Nvl(~from_table, table))); }
+
+private:
+	SqlInsert    GetRaw(const String& dest) const
+	{
+		SqlId d = SqlId(dest);
+		SqlInsert ins(d);
+		for(int i = 0; i < columns.GetCount(); i++)
+			ins(columns[i], values[i]);
+		return ins;
+	}
+
+private:
+	Vector<SqlId>  columns;
+	Vector<SqlVal>  values;
+};
+
+class UpdateColumns : public FieldOperator
+{
+public:
+	UpdateColumns() {}
+
+	virtual void Field(const char *name, Ref f)
+	{
+		columns.Add(SqlId(name));
+		values.Add(Value(f));
+	}
+
+	operator     bool () const                             { return columns.GetCount(); }
+	SqlUpdate    Get(const SqlVal& from_table) const       { return GetRaw(Nvl(~from_table, table)); }
+	SqlUpdate    GetSchema(const SqlVal& from_table) const { return GetRaw(SchemaTableName(Nvl(~from_table, table))); }
+
+private:
+	SqlUpdate    GetRaw(const String& dest) const
+	{
+		SqlId d = SqlId(dest);
+		SqlUpdate u(d);
+		for(int i = 0; i < columns.GetCount(); i++)
+			u(columns[i], values[i]);
+		return u;
+	}
+
+private:
+	Vector<SqlId>   columns;
+	Vector<SqlVal>  values;
+};
+
+class GetValue : public FieldOperator
+{
+public:
+	GetValue(SqlId column) : column(column) {}
+
+	virtual void Field(const char *name, Ref f)
+	{
+		if(Id::Find(name) == column)
+			value = f;
+	}
+
+	Id column;
+	Value value;
+};
+
+class GetRef : public FieldOperator
+{
+public:
+	GetRef(SqlId column): column(column) {}
+
+	virtual void Field(const char *name, Ref f)
+	{
+		if(Id::Find(name) == column)
+			ref = f;
+	}
+
+	Id column;
+	Ref ref;
+};
+
+struct GetRefMap : FieldOperator {
+	virtual void Field(const char *name, Ref f) {
+		map.Add(Id(name), f);
+	}
+	VectorMap<Id, Ref> map;
+};
+
+struct GetValueMap : FieldOperator {
+	virtual void Field(const char *name, Ref f) {
+		map.Add(Id(name), f);
+	}
+	VectorMap<Id, Value> map;
+};
+
+class GetTableName : public FieldOperator {
+	virtual void Field(const char *name, Ref f) {}
+};
+
+/*
+class NthValue : public FieldOperator
+{
+public:
+	NthValue(int i = 0) : n(n) {}
+	virtual void Field(const char *_name, Ref f)
+	{
+		if(n-- == 0)
+		{
+			column = _name;
+			value = f.GetValue();
+		}
+	}
+
+	SqlSet set;
+	Value  value;
+	String column;
+	int    n;
+};
+*/
+
+} // namespace SqlUtil
+
+static String& AccessSchema()                  { static String s; return s; }
+void           SetSchema(const String& schema) { AccessSchema() = schema; }
+String         GetSchema()                     { return AccessSchema(); }
+
+String SchemaTableName(const String& table)
+{
+	String s = GetSchema();
+	if(s.IsEmpty())
+		return table;
+	return s + '.' + table;
+}
+
+SqlVal SchemaTable(const SqlVal& table)
+{
+	return SqlCol(SchemaTableName(~table));
+}
+
+String GetInsertString(Fields nf, bool optimize)
+{
+	SqlUtil::InsertScript isfo;
+	isfo.optimize = optimize;
+	nf(isfo);
+	String result;
+	if(!IsNull(isfo.names))
+		result << "insert into " << isfo.table
+			<< " (" << isfo.names << ") values (" << isfo.values << ")";
+	return result;
+}
+
+String GetSchemaInsertString(Fields nf, bool optimize)
+{
+	SqlUtil::InsertScript isfo;
+	isfo.optimize = optimize;
+	nf(isfo);
+	String result;
+	if(!IsNull(isfo.names))
+		result << "insert into " << SchemaTableName(isfo.table)
+			<< " (" << isfo.names << ") values (" << isfo.values << ")";
+	return result;
+}
+
+#ifdef PLATFORM_WIN32
+void InsertScript(SqlSchema& schema, Fields nf, bool optimize)
+{
+	schema.Config(GetInsertString(nf, optimize) + ";\n", NULL);
+}
+
+void InsertSchemaScript(SqlSchema& schema, Fields nf, bool optimize)
+{
+	schema.Config(GetSchemaInsertString(nf, optimize) + ";\n", NULL);
+}
+#endif
+
+SqlSelect SelectColumns(Fields nf)
+{
+	SqlUtil::SelectColumns helper;
+	nf(helper);
+	return Select(helper.columns);
+}
+
+SqlSelect SelectTable(Fields nf)
+{
+	SqlUtil::SelectColumns helper;
+	nf(helper);
+	ASSERT(*helper.table != '$'); // cannot select from TYPE tables
+	return Select(helper.columns).From(SqlId(helper.table));
+}
+
+SqlSelect SelectSchemaTable(Fields nf)
+{
+	SqlUtil::SelectColumns helper;
+	nf(helper);
+	ASSERT(*helper.table != '$'); // cannot select from TYPE tables
+	return Select(helper.columns).FromSchema(helper.table);
+}
+
+Value GetValue(Fields nf, SqlId field)
+{
+	SqlUtil::GetValue helper(field);
+	nf(helper);
+	return helper.value;
+}
+
+Ref GetRef(Fields nf, SqlId field)
+{
+	SqlUtil::GetRef helper(field);
+	nf(helper);
+	return helper.ref;
+}
+
+String GetTableName(Fields nf)
+{
+	SqlUtil::GetTableName helper;
+	nf(helper);
+	return helper.table;
+}
+
+VectorMap<Id, Ref> GetRefMap(Fields nf, String *tablename)
+{
+	SqlUtil::GetRefMap helper;
+	nf(helper);
+	if(tablename)
+		*tablename = helper.table;
+	return helper.map;
+}
+
+VectorMap<Id, Value> GetValueMap(Fields nf, String *tablename)
+{
+	SqlUtil::GetValueMap helper;
+	nf(helper);
+	if(tablename)
+		*tablename = helper.table;
+	return helper.map;
+}
+
+/*
+void FetchSeq(Fields fields, Sql& cursor)
+{
+	SqlUtil::NthValue key;
+	fields(key);
+	ASSERT(!IsNull(key.column));
+	if(!cursor.Execute(Select(fields).From(fields.table).Where(Col(fields.column) == fields.value)))
+		throw SqlExc(cursor);
+	if(!cursor.Fetch(fields))
+		throw SqlExc("��dek nebyl nalezen (tabulka %s, sloupec %s, hodnota %s)",
+			key.table, key.column, SqlFormat(key.value));
+}
+*/
+
+String ForceInsertRowid(const String& insert, Sql& cursor)
+{
+	if(!cursor.Execute(insert + " returning ROWID into ?%s"))
+		throw SqlExc(cursor.GetSession());
+	if(!cursor.Fetch())
+		throw Exc(t_("FETCH internal error (ForceInsertRowid)"));
+	ASSERT(!IsNull(cursor[0]));
+	return cursor[0];
+}
+
+String ForceInsertRowid(const SqlInsert& insert, Sql& cursor)
+{
+	return ForceInsertRowid(SqlStatement(insert).Get(cursor.GetDialect()), cursor);
+}
+
+String ForceInsertRowid(Fields nf, Sql& cursor)
+{
+	return ForceInsertRowid(SqlId(), nf, cursor);
+}
+
+String ForceInsertRowid(SqlId table, Fields nf, Sql& cursor)
+{
+	SqlUtil::InsertColumns helper;
+	nf(helper);
+	return ForceInsertRowid(helper.Get(table), cursor);
+}
+
+String ForceSchemaInsertRowid(Fields nf, Sql& cursor)
+{
+	return ForceSchemaInsertRowid(SqlId(), nf, cursor);
+}
+
+String ForceSchemaInsertRowid(SqlId table, Fields nf, Sql& cursor)
+{
+	SqlUtil::InsertColumns helper;
+	nf(helper);
+	return ForceInsertRowid(helper.GetSchema(table), cursor);
+}
+
+void ForceInsert(Fields nf, Sql& cursor)
+{
+	ForceInsert(SqlId(), nf, cursor);
+}
+
+void ForceInsert(SqlId table, Fields nf, Sql& cursor)
+{
+	SqlUtil::InsertColumns helper;
+	nf(helper);
+	cursor & SqlStatement(helper.Get(table));
+}
+
+void ForceUpdate(Fields nf, SqlId key, const Value& keyval, Sql& cursor)
+{
+	ForceUpdate(SqlId(), nf, key, keyval, cursor);
+}
+
+void ForceUpdate(SqlId table, Fields nf, SqlId key, const Value& keyval, Sql& cursor)
+{
+	SqlUtil::UpdateColumns helper;
+	nf(helper);
+	cursor & helper.Get(table).Where(key == keyval);
+}
+
+void ForceDelete(SqlId table, SqlId key, const Value& keyval, Sql& cursor)
+{
+	if(!cursor.Delete(table, key, keyval))
+		throw SqlExc(cursor);
+}
+
+void ForceExecute(const String& s, Sql& cursor)
+{
+	if(!cursor.Execute(s))
+		throw SqlExc(cursor);
+}
+
+void ForceSchemaInsert(Fields nf, Sql& cursor)
+{
+	ForceSchemaInsert(SqlId(), nf, cursor);
+}
+
+void ForceSchemaInsert(SqlId table, Fields nf, Sql& cursor)
+{
+	SqlUtil::InsertColumns helper;
+	nf(helper);
+	helper.GetSchema(table).Force(cursor);
+}
+
+void ForceSchemaUpdate(Fields nf, SqlId key, const Value& keyval, Sql& cursor)
+{
+	ForceSchemaUpdate(SqlId(), nf, key, keyval, cursor);
+}
+
+void ForceSchemaUpdate(SqlId table, Fields nf, SqlId key, const Value& keyval, Sql& cursor)
+{
+	SqlUtil::UpdateColumns helper;
+	nf(helper);
+	helper.GetSchema(table).Where(key == keyval).Force(cursor);
+}
+
+void ForceSchemaDelete(SqlId table, SqlId key, const Value& keyval, Sql& cursor)
+{
+	Delete(SchemaTable(table)).Where(key == keyval).Force(cursor);
+}
+
+Vector<String> LoadStrColumn(SqlId column, const SqlVal& table, SqlSession& session, bool order)
+{
+	Vector<String> result;
+	FetchContainer(result, Select(column).From(table), session);
+	if(order)
+		Sort(result, GetLanguageInfo());
+	return result;
+}
+
+Vector<String>& SyncStrColumn(Vector<String>& dest, SqlId col, const SqlVal& table, SqlSession& session, bool order)
+{
+	if(dest.IsEmpty())
+		dest = LoadStrColumn(col, table, session, order);
+	return dest;
+}
+
+Vector<String> LoadSchemaStrColumn(SqlId column, const SqlVal& table, SqlSession& session, bool order)
+{
+	Vector<String> result;
+	FetchContainer(result, Select(column).FromSchema(table), session);
+	if(order)
+		Sort(result, GetLanguageInfo());
+	return result;
+}
+
+Vector<String>& SyncSchemaStrColumn(Vector<String>& dest, SqlId col, const SqlVal& table, SqlSession& session)
+{
+	if(dest.IsEmpty())
+		dest = LoadSchemaStrColumn(col, table, session);
+	return dest;
+}
+
+bool IsNotEmpty(const SqlSelect& select, Sql& cursor)
+{
+	return cursor * select && cursor.Fetch();
+}
+
+bool IsNotEmpty(const SqlVal& table, const SqlBool& cond, Sql& cursor)
+{
+	return IsNotEmpty(Select(ROWNUM).From(table).Where(cond), cursor);
+}
+
+bool IsNotEmpty(const SqlVal& table, SqlId column, const Value& value, Sql& cursor)
+{
+	return IsNotEmpty(table, column == value, cursor);
+}
+
+bool IsNotSchemaEmpty(const SqlVal& table, const SqlBool& cond, Sql& cursor)
+{
+	return IsNotEmpty(Select(ROWNUM).FromSchema(table).Where(cond), cursor);
+}
+
+bool IsNotSchemaEmpty(const SqlVal& table, SqlId column, const Value& value, Sql& cursor)
+{
+	return IsNotSchemaEmpty(table, column == value, cursor);
+}
+
+/*
+#ifdef PLATFORM_WIN32
+bool LockSql(Sql& cursor)
+{
+	if(cursor.Run())
+		return true;
+
+	enum
+	{
+		TIMEOUT = 10000, // milliseconds
+	};
+
+	Progress progress("Zamyk�m tabulky", TIMEOUT);
+	dword start = GetTickCount();
+	while(!cursor.Run())
+	{
+		dword elapsed = GetTickCount() - start;
+		if(elapsed % 100 == 0)
+		{
+			progress.SetPos(elapsed);
+			if(progress.Canceled())
+				return false;
+		}
+		if(elapsed >= TIMEOUT)
+		{
+			MsgOK("P�ed proveden�m �prav je nutno tabulky zamknout proti p�eps�n� "
+				"ostatn�mi u�ivateli. To se zat�m neda�� - n�kdo jin� z�ejm� pr�v� "
+				"prov�d� opravu. Zkuste prov�st po�adovanou operaci pozd�ji.");
+			return false;
+		}
+	}
+	return true;
+}
+
+bool LockSql(const SqlVal& table, SqlBool where, Sql& cursor)
+{
+	cursor.SetStatement(Select(ALL).From(table).Where(where).ForUpdate().NoWait());
+	return LockSql(cursor);
+}
+
+bool LockSql(const SqlVal& table, SqlId column, const Value& value, Sql& cursor)
+{
+	return LockSql(table, column == value, cursor);
+}
+
+bool LockSchemaSql(const SqlVal& table, SqlBool where, Sql& cursor)
+{
+	cursor.SetStatement(Select(ALL).FromSchema(table).Where(where).ForUpdate().NoWait());
+	return LockSql(cursor);
+}
+
+bool LockSchemaSql(const SqlVal& table, SqlId column, const Value& value, Sql& cursor)
+{
+	return LockSchemaSql(table, column == value, cursor);
+}
+#endif
+*/
+
+//SqlSelect SelectHint(const char *hint, SqlSet set)
+//{
+//	return hint && *hint ? SqlSelect(SqlSet(String().Cat() << "/*+ " << hint << " */ " << ~set), SqlSet::SET)
+//	                     : SqlSelect(set);
+//}
+
+static inline void sCat(SqlSet& s, SqlVal v) { s.Cat(v); }
+
+/*
+#define E__SCat(I)       sCat(set, p##I)
+
+#define E__QSelectF(I) \
+SqlSelect SelectHint(const char *hint, __List##I(E__SqlVal)) { \
+	SqlSet set; \
+	__List##I(E__SCat); \
+	return SelectHint(hint, set); \
+}
+__Expand(E__QSelectF);
+*/
+SqlSet DeleteHint(const char *hint, const SqlVal& table)
+{
+	return SqlSet(String().Cat() << "delete /*+ " << hint << " */ from " << ~table, SqlSet::SETOP);
+}
+
+SqlSet DeleteSchemaHint(const char *hint, const SqlVal& table)
+{
+	return DeleteHint(hint, SchemaTable(table));
+}
+
+SqlVal Alias(const SqlVal& value, const SqlVal& alias)
+{
+	return SqlCol(~value + SqlCase(MSSQL, " as ")(" ") + ~alias);
+}
+
+SqlVal SchemaAlias(const SqlVal& table, const SqlVal& alias)
+{
+	return SqlCol(~SchemaTable(table) + SqlCase(MSSQL, " as ")(" ") + ~alias);
+}
+
+SqlVal SchemaAlias(const SqlVal& table)
+{
+	return SqlCol(~SchemaTable(table) + SqlCase(MSSQL, " as ")(" ") + ~table);
+}
+
+VectorMap<String, SqlColumnInfo> Describe(const SqlVal& table, Sql& cursor)
+{
+	VectorMap<String, SqlColumnInfo> map;
+	if(cursor * Select(ALL()).From(table).Where(ROWNUM == 0))
+		for(int i = 0, n = cursor.GetColumns(); i < n; i++)
+		{
+			const SqlColumnInfo& sci = cursor.GetColumnInfo(i);
+			map.Add(sci.name, sci);
+		}
+	return map;
+}
+
+VectorMap<String, SqlColumnInfo> DescribeSchema(const SqlVal& table, Sql& cursor)
+{
+	return Describe(SchemaTable(table), cursor);
+}
+
+int64 SelectCount(const SqlVal& table, const SqlBool& cond, Sql& cursor)
+{
+	return Select(SqlCountRows()).From(table).Where(cond).Fetch(cursor);
+}
+
+int64 SelectSchemaCount(const SqlVal& table, const SqlBool& cond, Sql& cursor)
+{
+	return Select(SqlCountRows()).FromSchema(table).Where(cond).Fetch(cursor);
+}
+
+SqlVal GetUpper(const SqlVal& val)
+{
+	return SqlFunc("UPPER", val);
+}
+
+SqlVal GetCsVal(const SqlVal& val)
+{
+	return SqlFunc("REPLACE", SqlFunc("UPPER", val), "CH", "H��");
+}
+
+SqlVal GetCs(const char* col)
+{
+	return GetCsVal(SqlCol(col));
+}
+
+SqlVal GetCsAsciiVal(const SqlVal& val)
+{
+	return ConvertAscii(GetCsVal(val));
+}
+
+SqlVal GetCsAscii(const char* col)
+{
+	return GetCsAsciiVal(SqlCol(col));
+}
+
+SqlBool LikeSmartWild(const SqlVal& exp, const String& text)
+{
+	const char *s = text;
+	if(*s == 0)
+		return SqlBool::True();
+	if((*s == '.' && s[1] != 0 && *++s != '.') || HasNlsLetters(WString(s)))
+	{
+		SqlBool e = Like(Upper(exp), Wild(ToUpper(s)));
+		if(ToUpper((byte)*s) == 'C' && s[1] == 0)
+			e &= NotLike(Upper(exp), "CH%"); // CH patch
+		return e;
+	}
+	else
+		return LikeUpperAscii(exp, Wild(s));
+}
+
+SqlBool GetTextRange(const String& s1, const String& s2, const SqlVal& exp)
+{
+	if(IsNull(s1) && IsNull(s2))
+		return SqlBool();
+	if(IsNull(s1) || IsNull(s2)) // just one - use as template
+		return LikeSmartWild(exp, s1 + s2);
+//	return Between(GetCsAsciiVal(exp), GetCsAsciiVal(s1), GetCsAsciiVal(s2 + "��"));
+	return Between(Upper(exp), Upper(s1), Upper(s2 + "��"));
+}
+
+static const double above = 1 + 1e-9, below = 1 - 1e-9;
+
+SqlBool GetNumRange(double min, double max, const SqlVal& exp)
+{
+	bool nl = IsNull(min), nh = IsNull(max);
+	if(nl && nh)
+		return SqlBool();
+	if(nl || nh)
+	{ // just 1 defined
+		min = Nvl(min, max);
+		if(min == floor(min + 0.5)) // integer - use exact match
+			return exp == min;
+		else if(min >= 0)
+			return Between(exp, min * below, min * above);
+		else
+			return Between(exp, min * above, min * below);
+	}
+
+	// TODO (idea): here could be an ordering check, something like:
+	// if(max < min)
+	//     throw SqlExc("Maxim�ln� hodnota je men�� ne� minim�ln� hodnota.");
+	// Is it a good idea?
+
+	return Between(exp,
+		min * (min <= 0 ? above : below),
+		max * (max >= 0 ? above : below));
+}
+
+SqlBool GetDateRange(Date min, Date max, const SqlVal& exp, bool force_range)
+{
+	bool nl = IsNull(min), nh = IsNull(max);
+	if(nl && nh)
+		return SqlBool();
+	if(nh) // 1st defined - equality
+		return (force_range ? exp >= min : exp == min);
+	if(nl)
+		return exp <= max;
+
+	// TODO (idea): here could be an ordering check, something like:
+	// if(max < min)
+	//     throw SqlExc("Koncov� datum p�edch�z� po��te�n� datum.");
+	// Is it a good idea?
+
+	return Between(exp, min, max);
+}
+
+SqlBool GetTimeRange(Time min, Time max, const SqlVal& exp, bool force_range)
+{
+	bool nl = IsNull(min), nh = IsNull(max);
+	if(nl && nh)
+		return SqlBool();
+	if(nh) // 1st defined - equality
+		return (force_range ? exp >= min : exp == min);
+	if(nl)
+		return exp <= max;
+
+	// TODO (idea): here could be an ordering check, something like:
+	// if(max < min)
+	//     throw SqlExc("Koncov� datum p�edch�z� po��te�n� datum.");
+	// Is it a good idea?
+
+	return Between(exp, min, max);
+}
+
+SqlVal GetYearDayIndex(const SqlVal& date)
+{
+	return SqlFunc("to_char", date, "MM/DD");
+}
+
+String GetYearDayIndex(Date date)
+{
+	return NFormat("%02d/%02d", date.month, date.day);
+}
+
+SqlBool GetYearDayRange(const SqlVal& date, Date min, Date max)
+{
+	SqlVal index = GetYearDayIndex(date);
+	bool nl = IsNull(min), nh = IsNull(max);
+	if(nl && nh)
+		return SqlBool();
+	if(nl || nh)
+		return index == GetYearDayIndex(Nvl(min, max));
+	if(min.month == 1 && min.day == 1)
+		nl = true;
+	if(max.month == 12 && max.day == 31)
+		nh = true;
+
+	if(nl && nh)
+		return SqlBool();
+	if(!nh && !nl && min > max)
+	{
+		min.day--;
+		max.day++;
+		return NotBetween(index, GetYearDayIndex(max), GetYearDayIndex(min));
+	}
+
+	SqlBool result;
+	if(!nl)
+		result &= index >= GetYearDayIndex(min);
+	if(!nh)
+	{
+		max.day++;
+		result &= index < GetYearDayIndex(max);
+	}
+	return result;
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/TSql/util.h b/uppsrc/TSql/util.h
new file mode 100644
index 000000000..2cddcf0f0
--- /dev/null
+++ b/uppsrc/TSql/util.h
@@ -0,0 +1,137 @@
+NAMESPACE_UPP
+
+void __sqltempl__instantiation__(Gate2<int, int>); // a weird compiler bug
+
+#define DEFID(x)    const Id x(#x);
+#define _DEFID(x)   const Id _##x(#x);
+#define _SQLID(x)   const SqlId _##x(#x);
+
+const SqlId& ALL(); // <*>
+const SqlId& QUE(); // <?>
+
+class SqlBlock
+{
+public:
+#ifndef NOAPPSQL
+	SqlBlock(SqlSession& session = SQL.GetSession())
+		: session(session), done(false) { session.Begin(); }
+#else
+	SqlBlock(SqlSession& session)
+		: session(session), done(false) { session.Begin(); }
+#endif
+	~SqlBlock()                              { if(!done) session.Rollback(); }
+
+	void        Commit()                     { ASSERT(!done); done = true; session.Commit(); }
+	void        Rollback()                   { ASSERT(!done); done = true; session.Rollback(); }
+	void        Flush()                      { ASSERT(!done); session.Commit(); session.Begin(); }
+
+private:
+	SqlSession& session;
+	bool        done;
+};
+
+void                  SetSchema(const String& schema);
+String                GetSchema();
+String                SchemaTableName(const String& table);
+SqlVal                SchemaTable(const SqlVal& table);
+
+String                GetInsertString(Fields nf, bool optimize = true);
+String                GetSchemaInsertString(Fields nf, bool optimize = true);
+void                  InsertScript(SqlSchema& schema, Fields nf, bool optimize = true);
+void                  InsertSchemaScript(SqlSchema& schema, Fields nf, bool optimize = true);
+
+SqlSelect             SelectTable(Fields nf);
+SqlSelect             SelectSchemaTable(Fields nf);
+SqlSelect             SelectColumns(Fields nf);
+
+Value                 GetValue(Fields nf, SqlId field);
+Ref                   GetRef(Fields nf, SqlId field);
+String                GetTableName(Fields nf);
+
+VectorMap<Id, Ref>    GetRefMap(Fields nf, String *tablename = NULL);
+VectorMap<Id, Value>  GetValueMap(Fields nf, String *tablename = NULL);
+
+String                ForceInsertRowid(const SqlInsert& insert, Sql& cursor APPSQLCURSOR);
+String                ForceInsertRowid(Fields nf, Sql& cursor APPSQLCURSOR);
+String                ForceInsertRowid(SqlId table, Fields nf, Sql& cursor APPSQLCURSOR);
+String                ForceSchemaInsertRowid(Fields nf, Sql& cursor APPSQLCURSOR);
+String                ForceSchemaInsertRowid(SqlId table, Fields nf, Sql& cursor APPSQLCURSOR);
+
+void                  ForceInsert(Fields nf, Sql& cursor APPSQLCURSOR);
+void                  ForceInsert(SqlId table, Fields nf, Sql& cursor APPSQLCURSOR);
+void                  ForceUpdate(Fields nf, SqlId key, const Value& keyval, Sql& cursor APPSQLCURSOR);
+void                  ForceUpdate(SqlId table, Fields nf, SqlId key, const Value& keyval, Sql& cursor APPSQLCURSOR);
+void                  ForceDelete(SqlId table, SqlId key, const Value& keyval, Sql& cursor APPSQLCURSOR);
+void                  ForceExecute(const String& s, Sql& cursor APPSQLCURSOR);
+void                  ForceSchemaInsert(Fields nf, Sql& cursor APPSQLCURSOR);
+void                  ForceSchemaInsert(SqlId table, Fields nf, Sql& cursor APPSQLCURSOR);
+void                  ForceSchemaUpdate(Fields nf, SqlId key, const Value& keyval, Sql& cursor APPSQLCURSOR);
+void                  ForceSchemaUpdate(SqlId table, Fields nf, SqlId key, const Value& keyval, Sql& cursor APPSQLCURSOR);
+void                  ForceSchemaDelete(SqlId table, SqlId key, const Value& keyval, Sql& cursor APPSQLCURSOR);
+
+bool                  IsNotEmpty(const SqlSelect& select, Sql& cursor APPSQLCURSOR);
+bool                  IsNotEmpty(const SqlVal& table, const SqlBool& cond, Sql& cursor APPSQLCURSOR);
+bool                  IsNotEmpty(const SqlVal& table, SqlId column, const Value& value, Sql& cursor APPSQLCURSOR);
+bool                  IsNotSchemaEmpty(const SqlVal& table, const SqlBool& cond, Sql& cursor APPSQLCURSOR);
+bool                  IsNotSchemaEmpty(const SqlVal& table, SqlId column, const Value& value, Sql& cursor APPSQLCURSOR);
+
+#ifdef PLATFORM_WIN32 // bw, move to tsql/ctrl
+//bool                  LockSql(Sql& cursor APPSQLCURSOR);
+//bool                  LockSql(const SqlVal& table, SqlBool where, Sql& cursor APPSQLCURSOR);
+//bool                  LockSql(const SqlVal& table, SqlId column, const Value& value, Sql& cursor APPSQLCURSOR);
+//bool                  LockSchemaSql(const SqlVal& table, SqlBool where, Sql& cursor APPSQLCURSOR);
+//bool                  LockSchemaSql(const SqlVal& table, SqlId column, const Value& value, Sql& cursor APPSQLCURSOR);
+
+//Mirek 06/12/22 - not defined anywhere in uppsrc, clashes with idis
+
+#endif
+
+SqlVal                Alias(const SqlVal& value, const SqlVal& alias);
+SqlVal                SchemaAlias(const SqlVal& table, const SqlVal& alias);
+SqlVal                SchemaAlias(const SqlVal& table);
+
+inline SqlInsert      InsertSchema(SqlId table) { return SqlInsert(SqlId(SchemaTableName(~table))); }
+inline SqlUpdate      UpdateSchema(SqlId table) { return SqlUpdate(SqlId(SchemaTableName(~table))); }
+inline SqlDelete      DeleteSchema(SqlId table) { return Delete(SqlId(SchemaTableName(~table))); }
+/* use .Hint instead...
+SqlSelect             SelectHint(const char *hint, SqlSet set);
+
+#define E__SelectHint(I)\
+SqlSelect             SelectHint(const char *hint, __List##I(E__SqlVal));
+__Expand(E__SelectHint);
+*/
+SqlSet                DeleteHint(const char *hint, const SqlVal& table);
+SqlSet                DeleteSchemaHint(const char *hint, const SqlVal& table);
+
+VectorMap<String, SqlColumnInfo> Describe(const SqlVal& table, Sql& cursor APPSQLCURSOR);
+VectorMap<String, SqlColumnInfo> DescribeSchema(const SqlVal& table, Sql& cursor APPSQLCURSOR);
+
+int64                 SelectCount(const SqlVal& table, const SqlBool& cond, Sql& cursor);
+int64                 SelectSchemaCount(const SqlVal& table, const SqlBool& cond, Sql& cursor);
+
+#ifndef NOAPPSQL
+inline int64          SelectCount(const SqlVal& table, const SqlBool& cond = SqlBool::True())       { return SelectCount(table, cond, SQL); }
+inline int64          SelectSchemaCount(const SqlVal& table, const SqlBool& cond = SqlBool::True()) { return SelectSchemaCount(table, cond, SQL); }
+#endif
+
+Vector<String>        LoadStrColumn(SqlId column, const SqlVal& table, SqlSession& session APPSQLSESSION, bool order = false);
+Vector<String>&       SyncStrColumn(Vector<String>& dest, SqlId col, const SqlVal& table, SqlSession& session APPSQLSESSION, bool order = false);
+Vector<String>        LoadSchemaStrColumn(SqlId column, const SqlVal& table, SqlSession& session APPSQLSESSION, bool order = false);
+Vector<String>&       SyncSchemaStrColumn(Vector<String>& dest, SqlId col, const SqlVal& table, SqlSession& session APPSQLSESSION);
+
+SqlVal                GetCsVal(const SqlVal& val); // replaces CH for sorts
+SqlVal                GetCs(const char *col);
+SqlVal                GetCsAsciiVal(const SqlVal& val); // replaces CH and removes accents
+SqlVal                GetCsAscii(const char *col);
+SqlBool               LikeSmartWild(const SqlVal& exp, const String& s);
+
+SqlBool               GetTextRange(const String& s1, const String& s2, const SqlVal& exp);
+SqlBool               GetNumRange(double min, double max, const SqlVal& exp);
+SqlBool               GetDateRange(Date d1, Date d2, const SqlVal& exp, bool force_range = false);
+SqlBool               GetTimeRange(Time d1, Time d2, const SqlVal& exp, bool force_range = false);
+
+String                GetYearDayIndex(Date date);
+SqlVal                GetYearDayIndex(const SqlVal& date);
+SqlBool               GetYearDayRange(const SqlVal& date, Date min, Date max);
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/ToDo.txt b/uppsrc/ToDo.txt
new file mode 100644
index 000000000..d0a260b52
--- /dev/null
+++ b/uppsrc/ToDo.txt
@@ -0,0 +1,652 @@
+mutable and ONCELOCK!
+
+Shell_NotifyIconA and NOTIFYICONDATAA.
+
+[21:31] micio: open theide, open help from toolbar
+[21:32] micio: open "used packages", than click cycling on src and srcdoc (not open them, just click cycling on them....)
+[21:32] micio: after some clicks, you should see part of help tree disappear
+[21:33] micio: (i meand used packages - core, than cycling on src and srcdoc)
+
+ImageBuffer pick
+
+ArrayCtrl changes: http://www.ultimatepp.org/forum/index.php?t=msg&goto=14155&#msg_14155
+
+String functions
+
+===================
+// RasterEncoder by mel umoznit nastavit fyzickou velikost obrazku pro ulozeni do souboru
+// v Raster::Info bych zmenil flag alpha na ImageKind
+// dotaz: resi se nejak zrychleni toho generatoru palety, kdyz je ten obrazek mrnavy
+//        (typicky ikony 16 x 16 nebo 32 x 32 pixelu) ?
+
+Vista:
+	Vista64 debugging
+
+Windows:
+
+Linux:
+
+Core:
+	Date format: http://www.ultimatepp.org/forum/index.php?t=pmsg_view&&id=1494
+	Merssene twister for GUID
+
+CtrlLib/CtrlCore:
+	Dialog icon only if really needed (?)
+
+CtrlLib:
+	Add IdCtrls reference example
+	Add Timer reference example
+	GetMinSize implemented for widgets to make layout systems work, GetStdSize
+	Zoom &Out issue -> not Z&oom Out
+	FileSel network access
+	BUttonOption better
+	Up/Down arrows in scrollbar (no "NoArrows")
+
+Draw
+
+RichEdit:
+
+Sql:
+	Tutorial
+	GetTransactionLevel for Oracle, MSSQL...
+
+TheIDE:
+	Add manifest / icon .rc to template.
+	Separate find / log
+	Rename / remove package
+	Syntax Highlighting : Big numbers could have somehow highlighted thousands
+    if you click on toolbar button and mouse is still over this button the button should be highlighted
+        - now you must move slightly mouse to restore highlighting.. - if I found time I'll try to fix it myself
+	Rectangular blocks
+
+
+FAQ: Label::SetData/GetData
+
+// -------
+
+//=============================================================================================
+$uvs: END YOUR DELETE
+
+MENU OSCILACE!!!! (Drug to caption)
+
+$uvs: PENDING CONFLICT
+$uvs: REPOSITORY INSERT
+Debugger Registers
+$uvs: END REPOSITORY INSERT
+============
+     Counter ... FAILED
+     gui_tutorial ... FAILED
+     OpenGL ... FAILED (i guess due to missing libs here ...)
+     RegExp ... FAILED
+     SQL_Oracle ... FAILED
+     SQL_Sqlite3 ... FAILED
+     XmlDlg ... FAILED
+     CtrlLib ... FAILED
+building tutorial:
+     Concrete01 ... FAILED
+============
+* RTF - CJK export
+
+* PDF - CJK export
+
+* Scaled down Icon preview
+
+* Topic++ - "keywords"
+
+* ArrayCtrl -> ValueMap misto ValueArray, operator[] a operator(a, b)
+
+* Hele, jenom pro tvoje info: mam pocit, ze se do IDE vratila ta stara chyba, ze v class browseru (jak se strida s consoli) pri zobrazeni tridy jsou v seznamu na zacatku nadrizene tridy, takze ta zobrazena trida je uplne na konci.
+
+* LeftEdge in Win32
+
+* Editor Tabs IDE - scroll problem
+
+* LeftEdge in linux
+
+* SqlVal.As
+
+* LineEdit current line highlight
+
+* const Callbacks
+
+* when working with non local copy of files (/usr/share/upp/uppsrc etc) and have no write access to these files (because installed as root - as normal) i get the error "Error creating temporary file /usr/share/upp/examples/UWord/UWord.iml" when closing or changing from UWord.iml to another file.
+  Got that with non .iml files, too but can't reproduce atm.
+  I guess the solution is creating temp files somewhere in ~ every time.
+
+* mThread = new boost::thread(boost::bind(&ChainBox::startChain,this));
+
+g00fy {
+
+	DE: 2 tabs, switch tab1 -> go down a bit with the cursor, move scrollbar back to top, switch tab2, switch back to 1
+	=> expected: same position as before
+	=> result: back at cursor position
+
+	IDE: improve the dialogs for code completion as they feel unnatural to anyone using DevCPP, Visual Studio or even Eclipse (sorry to sound harsh, but if you want to be widely accepted, you just got to follow the rest - ... - and do it better).
+
+	IDE: improve it with features of Visual Assist [http://www.wholetomato.com/]. I think if you/me/someone can integrate this, then no need for Visual Studio anymore Smile. And I can FINALLY leave my windows-machine alone Very Happy
+
+	IDE: provide more options for setting include directories and stuff, setting preprocessor definitions, ... [Maybe it's possible, but I'm just dumping my brain on first impression].
+
+	Ctrl: Make it possible to have an Office XP/2000 look (that would be nasty!). Maybe it's possible with the ThemeEngine I spotted, but I didn't look in it in depth.
+
+	Core: Add 'sizers'. This is some concept wxWidgets has and simply rocks... I don't know exactly how you do it, but in wx you just have a sizer and start adding stuff to it (other sizers, controls, ...). Then all the layout is done automagically. And on each platform it simply looks and feels the same (for example some people have big fonts in windows, and others small -> with sizers: no problem).
+
+	Website: Provide speed comparisons between QT/Java/wx/U++. For example insert into string, string copying, string manipulations, ...
+}
+
+* RTF import chyba - zaporne souradnice
+
+http://www.arilect.com/upp/forum/index.php?t=msg&th=1673&start=0&
+
+2006-11-08 22:40 - 200000!
+
+Icon paste:
+
+http://www.arilect.com/upp/forum/index.php?t=msg&th=1596&start=0&
+
+callback2 for Callback1
+
+http://www.arilect.com/upp/forum/index.php?t=msg&goto=5808&#msg_5808
+
+TRC {
+	* TIFF !
+
+}
+
+* Bug in
+
+* SqlCtrl in linux: http://www.arilect.com/upp/forum/index.php?t=msg&goto=5409&#msg_5409
+
+* TreeCtrl Add problem in GCC - void SqlObjectTree::OpenTableColumns(int node, const Item& item)
+  need Value casts
+
+* SO builds
+
+* Alt+C
+
+* Output mode in Linux should have better settings!
+
+* ImageView in Linuxu does not work
+
+* uppsrc/TCtrlLib/appdoc.tpp/DlgCalc$cs-cz.tpp
+
+* DrawingObject storage
+
+* BinFindIndex!!!
+
+* Chinesse font names
+
+* uvs2 - save version
+
+* Class browser - ArrayCtrl at the end, starts with Ctrl
+
+* PLPL?
+
+* ' ' in compiler options:
+	gcc -P -w -O0 -g3 -Wall -fmessage-length=0 -c eggtrayicon.c -o bin/eggtrayicon.o `pkg-config gtk+-2.0 --cflags`
+	http://www.arilect.com/upp/forum/index.php?t=msg&goto=4963&#msg_4963
+
+* if ( AsString(~editCountry) == Null) editCountry <<= "---";
+
+* Current lang in GetTopic
+
+* BTW being there... There is one incorrect thing in tabctrl theming. When mouse leaves sheet header (in up direction) and tabctrl is "SizePos()ed" in other (parent) ctrl - highlighting does not disappear - but it should.
+
+* Syntax highlight '�'
+
+* ArrayCtrl::SetDisplay vs Ctrls!
+
+* Speed problem in Linux!
+
+* Sql dialekty predelat!
+
+* Exclude unused TheIDE topics...
+
+* Fix Sql package english!!!!
+
+* Fix MySql connect
+
+* Image without GUI
+
+* Paint bug - only black masks in assist images
+
+* Alt+J on HelpWindow opens code-browser. Why?
+
+* EO -> pri vyvolani "vyzva" blbe button...
+
+* Sql - fields (and remove Fields)
+
+* ArrayCtrl::ColumnWidths -> FontZoom
+
+Tiget TabCtrl
+
+U++ {
+1. Collapsing like Visual Studio.
+2. #pragma region like in Visual Studio.
+3. A shortcut menu in the project window to add new c,h,hpp,cpp etc file.
+4. When ref a dll, the ability to debug it in the calling application.
+5. A Solution style where you can create more then one project in one solution.
+6. Close a Project and open a new or existing project from the current open IDE.
+7. U++ DLL template for WIN32 and a U++ SO template for Linux
+8. Warnings for Code Porting from WIN32 to Linux and visa versa. In other words, if you write a piece of code it can warn you that the code will not compile in Linux.
+}
+
+
+nDraw {
+	- Velky U a Z v IDE s Bitstream Vera (Glyph composing)
+	- IconDes - ikony
+
+	- Otazka Font::GetHeight()... ?
+}
+
+Chameleon {
+	- disabled buttons text should be gray, not black...
+	- left margin in themized EditField..
+	- EditField - moc nahore, selection
+}
+
+CtrlCore {
+	- small font zoom problem
+	- artifacts in IconDes! (when scrolling the list of images)
+}
+
+
+* Ide - fixed flags in output mode, ulocked only in "expert" mode
+
+* Fix RTF (Image)
+
+* Fix Expand (no return ""; )
+
+* .lay po skonceni debugu
+
+* This problem might not be a high priority - in the reference splitter example, buttons B,C,Toggle are arranged vertically. If you drag the top of button "Toggle" up until button C disappears, you can't drag it back down again. You can drag upwards at that point though, and button C reappears, consuming some of button B space. If you drag upwards to make the "Toggle" button take all the right hand vertical space so that B and C disappear, you can't drag down again and buttons B and C have disappeared forever.
+
+* DrawPolygon -> GetBrush!
+
+* PDF fix Image!
+
+* When I open a file with a filename containing white space, UWord complains
+file doesn't exist when I double click it, but loads it anyway when I discard
+the error dialog.
+Something borked with unix filename escaping?
+
+* Blikani v matrice - v umrtnim listu pridat duplikat a zase ho zrusit....
+
+* Macro menu duplication when *.usc in package
+
+* If I set a bookmark I get no visible indication on the line (e.g. in the gutter) that a bookmark is set there. Am I supposed to see something, if so this is a bug report, if not, it's a feature suggestion.
+
+* If I run "find in files" and doubleclick then in "Edit" menu an item "Edit using designer" Ctrl_T appears. If I try to use it, it does nothing and dissapears. I think, it's a bug.
+
+* TheIDE {
+    - In Topic++ "Print" doesn't work - just a blank sheet.
+	- That empty lines forced me to making "ugly" upt files. I had to merge lines into one to avoid producing empty lines. Can you add it to todo list (to not forget)?[
+}
+
+* X11 {
+	- Guido's Kbd patches
+	- Stuck Alt/Ctrl keys
+	- OO.org BMP pasta, images in richtext paste
+	- Available clipboard formats
+	- Paste Firefox -> Ide
+	- Problem with IconDes handles
+}
+
+* RichEdit {
+	- It would be also nice if one could set distance between lines (like in ms word 1, 1.5, 2..) (I know that I can set before and after values - but it is hard to find values to get the exactely the same distances like in ms word document)
+}
+
+* CtrlLib {
+	- Menu u EditField (Copy, Cut, Paste, Undo....)
+	- Secondary, there seems to be a bug with horizontal scrollbar. It turns on before my tabs are even close to the right-side edge. Almost like it is adding up all tabs, including those Hidden, to work out when to enable the horizontal scrollbar.
+}
+
+* Core {
+	- !!!!!!! STREAM PROBLEM !!!!!!!
+	- TLS
+	- bring Socket to the Core
+}
+
+* Debugger {
+	- Switch problem
+	- Pointer substration in Watch
+	- Linux troubles...
+}
+
+* Assist++  {
+	- Alt+V (virtual methods) in TopicWindow does not show HelpWindow
+	- RichEdit ink. (line 623), Alt+J for NotNull
+	- zz.GetAdd Prest/Doc.cpp 41 (nejde vnoreny...)
+	- http://www.arilect.com/upp/forum/index.php?t=msg&goto=3499&#msg_3499
+	- http://www.arilect.com/upp/forum/index.php?t=msg&th=1052&start=0&
+	- operator Draw&();
+    - IconDes, problem s definici lokalnich statickych dat
+	- TDoc.cpp: Alt+V, para.
+		struct IsWatermark : RichText::Iterator
+		{
+			bool operator()(int pos, const RichPara& para) {
+
+			if(para.format.
+
+	- Alt+C over multiple classes
+	- jump to operator definition
+	- ftp/Publi/ParseError.png
+	- Navigate is unable to find the "Alignment" enum in beta4.
+	- Alt+C - inline conversion
+	- public/private, filter by class
+}
+
+* TheIDE {
+	- Insert Color Assist function
+	- Display error when there are two conflicting lang strings
+	- Then dissable the saving on exit. With optional choice.
+	- CppBase Purify speedup (no need for String...Cat)
+	- New Layout -> |Layout dat do editoru
+	- The fact that there is key assignments for it should also be shown in the context menu (Assist++)
+}
+
+* Valgrind
+
+* BTW There is a strange bug in Splitter. It doesn't produce equal results if I change the order of these two lines: splitter.SetPos(9000, 1);	splitter.SetPos(6500, 0);
+
+* Make a new GUI application and use the layout editor. Place any widget (e.g. a button) to your layout. Then change the widget to another using the scroll down menu in the left window (see attached picture). index.php?t=getfile&id=90&private=0
+  Now try to change the widget again and TheIde crashes.
+  U++602/Fedora4/Gnome
+
+* I love to use Virtual Desktop Managers for increased productivity. As of now, the free Microsoft Virtual Desktop Manager is having problems with theIDE. If I switch to a different desktop while running theIDE, the main window does not repaint itself when I return to the Desktop with theIDE in it. I have to close out of the program and reopen it for everything to work properly.
+
+* CommandLine() function returns a Vector with command line arguments in system enconing. Other parts of U++ uses UTF-8.
+
+* Cursor blinks in TheIde code editor window even when the window is inactive. It should rather be hidden then.
+
+* I have found that if some source file is in location which contains a link, then ide considers two different files.
+
+* If I wish to link against some external libraries, outside of the normal library search path, in a project with multiple developers, it would be nice to be able to use EnvVars. Like, -I$SSL/ to point to where openssl is on your OS. However, it does not appear to expand $SSL. Is this definitely the case?
+
+* Je-li app EP Zoomable a je autohide Win panel, tak se neobjevuje (panel)
+
+* Problem IDE helpfile a CrossPlafrom development tema
+
+
+* GetDataFile / SDL / Linux
+
+* Check Colors (scope highlighting) - seems to change in different versions
+
+* Have found such an issue. When I start Build 602beta4, on FreeBSD 6.0 under xwm menus in ide disappear very quickly when I click them by mouse so I can't click menu items. When I access menu by pressing F10, everithing works fine with keyboard.
+In KDE works fine.
+
+
+
+* Single click breakpoints
+
+* LIneNumbers: However now that you mention it, it would be nice to be able to toggle that on/off in the context menu.
+
+* autocomplete pada nekde kolem invalidate v Linuxu (511)
+
+* Button, Enter, Shift - tlacitko zustane vtlacene
+
+
+* The assembly name editline in the New/Edit assembly dialog should restrict the chars usable in assembly names. Since the name is used as a filename, it should not contain the /;*?"|\ chars.
+
+* Cerna barva v Browseru
+
+* Assist++ Soci::NewDoc Alt+J skace do .h
+
+* some "add library" support in project templates would be helpful
+
+* Assist++ - templated inheritance - String missing AString as base...
+
+* Ctrl+Up / Down - prelozit! (Ctrl+Nahoru)
+
+* VisGen: non-class dialogs
+
+* However, I think that it is worth considering adding "CheckOnFocus" or something like that in EditField - it is not that hard to do.
+
+http://www.arilect.com/upp/forum/index.php?t=msg&th=289&start=0&S=86cb1ba64d5b6577f8e378aea8746282
+
+* Assist++ String::Find nechodi (neprojde dedicnosti?)
+
+* MenuBarItem::SetFont
+
+* ScrollArea (ScrollPane)
+
+* Rename/Delete/Duplicate package.
+
+* Esc - problem s porovnavanim Escapu
+
+* static DllFn attach_console("AttachConsole", "kernel32.dll");
+
+
+* String::Find(String)
+
+* LAYDES
+  When the LineEdit has the focus inside the SetLabel panel in the layout editor, and I press enter the enter is processed by a different control: the other textedit control above it.
+  index.php?t=getfile&id=49&private=0
+  And Alt-Backspace hotkey is missing for undo in the layout editor.
+
+
+* Esc: Padlo <:_DATUM. v Matrice na ASSERT...
+
+* first bug: Open a file from the current project. Rename the file by right-clicking on the project navigation tree. A new tab opens with the new name but the old tab remains open - it should have been removed.
+* another bug: Run a Query (Ctrl-Q), and from the list which displays on the bottom select multiple methods in the same class, so that the same files gets opened multiple times. Try to close the tab before the last one by clicking on the X icon. The tab is not closed just swich places with the other tabs, so all tabs remain open. This can only be reproduces in about 75% of the attempts.
+
+* Find a way how to avoid Bar bug (BrowseMenu(toolbar) instead of (bar))
+
+************
+
+* I found a minor bug in scope highlight. See attached screenshot of a scope highlight where the colored region is shifted with one character.
+
+* Assist++: FrameRight<ButtonOption>
+
+* Submit MSC bug....
+
+* By the way, now that I understand the actual processes between this, I think there's a bug in ConvertTime. The global Format produces a String of Time with forward slashes "/" dividing days, months and years but ConvertTime::Scan and ConvertTime::Filter expect full stops instead ".". This causes EditTime to refuse to close once any time has been entered.
+
+* Also, in edit controls (new assembly dialog, for example) clipboard cut/paste doesn't work. I am using ubuntu 5.10 and latest upp/linux. OK, this is something to check/fix.
+
+* Zrusit TopWindow z base IdeDesigneru
+
+**************
+These missing features would be essential for a documentation browser:
+- scrolling the text panel by keyboard
+- copying selected text regions from the text panel
+- search on current page
+- search on all pages
+- search by topic name
+**************
+
+* TopWindow::Run(this)
+
+Feature suggestions
+-------------------
+
+In select-main-package dialog
+1. allow display of packages to be those from one particular nest instead of
+all nests in the assembly
+2. allow checkbox option for hiding of "uppsrc" packages so "end users" see
+only their own packages
+3. when the list of packages is showing packages from more than one nest,
+somehow indicate which nest a particular package is from.
+4. "New" button could be labelled "new package"
+5. Add buttons for "edit assembly" etc. because right click is not so
+obvious
+**************
+
+* TreeTypes.txt odstranit! (presunout do cfg)
+
+* Opravit uvs2 - filediff
+
+* Presypaci hodiny na zacatku prace...
+
+* .lay - zobrazovat EdisString *spis*
+
+* BM: Create .map file
+
+* ScrollBar - trochu divne obarveni v rozich...
+
+* QTF: Co to je "~~~" ? (Soci)
+
+* Podivnosti Soci - Rozho - Text - problem s TopWindow a retezcem owneru a disabled....
+
+* Bar Gap(INT_MAX) ok Gap() cancel
+
+* Nvl(ROCNIK, SqlVal(999999)) (matrika)
+
+* brc/ship
+
+* RichEdit - zabavny problem us StatusBar _cy mizi underscore
+
+* Resolve problem with base class.... (search for type in base class too when qualifying) RichText::RestoreFormat
+
+* UPGRADE instead of uninstall
+
+* Blbne v debugger/Report pagei member v Report::Put(const RichText NECHODI THIS! - problem s vicenasobnou dedicnost ve virtualni funkci asi
+
+* void + v Esc !!!!
+
+* Nechodi assist++ u vicenasobnych templatu (viz. Matrika)
+
+* Improved Ctrl+W (goto real position)
+
+* Shift-Backspace to get back to the place of last modification.... (and maybe also <- -> buttons?)
+
+* TheIDE - readonly toolbar button vypada trosku osklive
+
+* Add printing
+
+* Check QTF in LayDes (changed)
+
+TCtrlLib -> CtrlLib
+1) DragDropCtrl
+2) ArrayPair
+
+* RichEdit repainting
+
+* <LRU> pseudopackage
+
+* And after right clicking on #include "some_h_file.h" add "Open file: some_h_file.h" into context menu.
+
+***********
+   1.  Assist++
+          * Show function prototype above function during autocompletion. See http://www.wholetomato.com/products/features/parameter.html
+          * Display the prototype definition line of the current symbol under the cursor at the top of the editing window. Or, as in visual slickedit, display the snippet of code around the definition of the current symbol under the cursor. See http://www.wholetomato.com/products/features/definition.html and similarly http://www.slickedit.com/images/stories/screenshots/vs10_jav a1.jpg
+          * Insert closing } ) ] " when the corresponding opening character is typed. See http://www.wholetomato.com/products/features/insert.html
+          * Show possible header files during #include. See http://www.wholetomato.com/products/features/include.html
+   2. Other
+          * Improve "Enclose selected text". Allow using '/' to comment lines with // and '*' to comment lines with /* ... */. Also, if the lines are already commented, then un-comment them instead. See http://www.wholetomato.com/products/features/surround.html
+-----------
+
+
+
+***********
+When I'm on it:
+1)
+in the Setup/Keys you can specify "Insert" key, but you can't specify "Delete" key, as it does just delete the defined key.
+Probably more user-friendly, than consistent behaviour, so no fix needed.
+
+If you try to specify "Esc" key, the Cancel button is pressed, but the window will remain anyway, and the Esc will be not mapped anyway. (so "nothing" happens)
+
+Maybe you should rethink what keys are "reserved" and let the user know about them in some way, so they will not try to map them. (but try to use as small number of "reserved" keys, as possible)
+
+2)
+There is no save/load functionality for keys setting, only "Default" button.
+Usually it's nice from IDE to allow save/load, and to install several saved configurations emulating common IDEs keyboard mapping, so people migrating from different IDE can choose their "common" hotkeys without redefining it by hand in setup menu.
+----------
+* Opravit FileSel - Enter pri vybranych discich...
+
+* externi hyperlinky v Topic++ nejdou reeditovat (zmrsi se to na tema)
+
+* I would like to be able to disable to the blue shortcut key texts in
+menus and filelist.
+Although the style of these texts vary in different microsoft apps.
+the consensus seems to be that they are gray of dark gray :)
+
+* 2005-11-15: Nevim, jestli se ti to taky stava, ale kdyz si nahraju novou verzi IDE, pri ktere mi spadne konfiguracni soubor, tak kdyz priste otevru Format | Environment a jenom ho zavru (nic do nej nepisu), tak se vysky vsech tech 5 fontu zmeni na 3 (ale pri otevreni toho dialogu to ukazuje spravne, nejakych 12/14). Kdyz to pak rucne prehazim, tak uz to vydrzi az do dalsiho spadnuti konfiguracniho souboru.
+
+* odstranit "falesne" main package
+
+* Compiler name
+
+* A taky by to chtelo konecne opravit, ze tam je nejaka posrana funkce, ktera uklada upp soubory bez SaveFileChanges,
+  takze pri nejake operaci v Package organizeru mi to vzdycky touchne vsechny package v uppsrc.
+
+* umake
+
+* Topic++ nestrankuje pri tisku
+
+*? proc pada debugging v Assist.cpp?
+
+* Vsechno O je cyan
+
+* SysTray http://groups.google.nl/group/comp.os.ms-windows.programmer.win32/browse_thread/thread/dd27924db57ec27a/05ed1407a817ee03?lnk=st&q=win32+minimize+tray+icon&rnum=1&hl=nl#05ed1407a817ee03
+
+* Network browsing v fileselectoru
+
+* BTW: There is an old bug in ArrayCtrl (I have written about it). When it has 3 columns in proportional
+  mode I can get the funny effect. Moving one column to the right the rest move to the left.
+  I'm writing about this, because I just did it in ctrl-j window
+
+* Assist++
+	- Filter je blbe pro '0' ->
+	- virtual function override
+	- THISBACK( by klidne mohl davat na vyber....
+	- Udelat definici promennych pri deklaraci structu/classsu
+	- Dodelat using
+	- Dodelat ::
+	- Generate class diagram
+	- FileLock v Browser++
+	- .sch
+	- 0 v prehledu
+
+
+* Topic++
+	- hledat chybny reference
+	- reference pres UUID
+
+******
+	SQL.ClearError();
+	SQL.Begin();
+-------
+
+* Zoom problem v layoutech
+
+
+RichEdit
+* Cut casti tabulky v textu necha prazdne bunky, jen odstrani texty
+* Remove row nefunguje na multiselect radku tabulky
+* hodilo by se split table na 2 tabulky s normalnim textem mezi nimi
+* Kdyz jses na zacatku radku, smazes slovo (Ctrl+Delete) a posunes kurzor
+nahoru / dolu, skoci na pozici kus odleva (jakoby za konec toho slova,
+* ktere jsi smazal na tom puvodnim radku)
+* hodila by se funkce na smazani radku
+* pri redo kurzor skoci vzdycky na konec textu
+* jak se da v 'Paragraph format' udelat hanging indent, kdyz Indent nejde
+nastavit na zapornou hodnotu?
+* kdyz v Topic++ vyvolas dialog pro zadani hyperlinku (Ctrl+H), tak pri prvnim
+kliknuti do seznamu metod na prave strane scrollbar vzdycky 'uskoci' na zacatek
+(kdyz jsi ho predtim posunul dolu).
+* pekna heuristika pri mazani znaku (nastaveni aktualnich atributu podle
+smazaneho znaku) nefunguje pri Ctrl+Backspace.
+* Odstraneni sloupce pomoci hspan (alespon postupne) zblbne sirku
+* dodelat "Header" do parametru
+* Blbne justify
+
+* callback2
+
+* Udelat autodetekci cr/lf
+
+* Problemy s clipboardem v X11 (nejak se pry opakuje atd...)
+
+* RichEdit by mel zacit s CurrentLang
+
+* Scrollovani Ctrlu
+
+* Ctrly v ArrayCtrl vylepsit
+
+* Bylo by potreba promyslet mutable v mutlithreading, zvlaste v souvislosti s Indexem....
+
+* Drag&Drop
+
+MB:
+C:\oracle\product\10.1.0\db_1\BIN>imp mb/idismain@cxl file=g:\hp.dmp fromuser=id
+is_main touser=mb tables=prest_sablona,prest_skupina,prest_makro
diff --git a/uppsrc/Updater/AUTHORS b/uppsrc/Updater/AUTHORS
new file mode 100644
index 000000000..f782e5b62
--- /dev/null
+++ b/uppsrc/Updater/AUTHORS
@@ -0,0 +1,2 @@
+Mirek Fidler <cxl@ntllib.org>
+Tomas Rylek  <rylek@volny.cz>
\ No newline at end of file
diff --git a/uppsrc/Updater/COPYING b/uppsrc/Updater/COPYING
new file mode 100644
index 000000000..33aa39102
--- /dev/null
+++ b/uppsrc/Updater/COPYING
@@ -0,0 +1,30 @@
+Copyright (C) 2005 Mirek Fidler, Tomas Rylek and various contributors (see AUTHORS)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to
+deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies of the Software and its Copyright notices. In addition publicly
+documented acknowledgment must be given that this software has been used if no
+source code of this software is made available publicly. This includes
+acknowledgments in either Copyright notices, Manuals, Publicity and Marketing
+documents or any documentation provided with any product containing this
+software. This License does not apply to any software that links to the
+libraries provided by this software (statically or dynamically), but only to
+the software provided.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+-----------
+
+Please see the COPYING.PLAIN for a plain-english explanation of this notice
+and it's intent.
diff --git a/uppsrc/Updater/COPYING-PLAIN b/uppsrc/Updater/COPYING-PLAIN
new file mode 100644
index 000000000..770a8132f
--- /dev/null
+++ b/uppsrc/Updater/COPYING-PLAIN
@@ -0,0 +1,33 @@
+Plain English Copyright Notice
+
+This file is not intended to be the actual License. The reason this file
+exists is that we here are programmers and engineers. We aren't lawyers. We
+provide licenses that we THINK say the right things, but we have our own
+intentions at heart. This is a plain-english explanation of what those
+intentions are, and if you follow them you will be within the "spirit" of
+the license.
+
+The intent is for us to enjoy writing software that is useful to us (the
+AUTHORS) and allow others to use it freely and also benefit from the work we
+put into making it. We don't want to restrict others using it. They should
+not *HAVE* to make the source code of the applications they write that
+simply link to these libraries (be that statically or dynamically), or for
+them to be limited as to what license they choose to use (be it open, closed
+or anything else). But we would like to know you are using these libraries.
+We simply would like to know that it has been useful to someone. This is why
+we ask for acknowledgement of some sort.
+
+You can do what you want with the source of this software - it doesn't
+matter. We still have it here for ourselves and it is open and free to use
+and download and play with. It can't be taken away. We don't really mind what
+you do with the source to your software. We would simply like to know that
+you are using it - especially if it makes it to a commerical product. If you
+simply e-mail all the AUTHORS (see COPYING and AUTHORS files) telling us, and
+then make sure you include a paragraph or page in the manual or in the "About.."
+box for the product with the copyright notice and state that you used this
+software, we will be very happy. If you want to contribute back modifications
+and fixes you may have made we will welcome those too with open arms (generally).
+If you want help with changes needed, ports needed or features to be added,
+arrangements can be easily made with some dialogue.
+
+Mirek Fidler <cxl@ntllib.org>
diff --git a/uppsrc/Updater/Resource.h b/uppsrc/Updater/Resource.h
new file mode 100644
index 000000000..2c6c289e3
--- /dev/null
+++ b/uppsrc/Updater/Resource.h
@@ -0,0 +1,18 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by UPDATER.RC
+//
+#define IDR_MAINFRAME					128
+#define IDD_UPDATER_DIALOG				102
+
+// Next default values for new objects
+//
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+
+#define _APS_NEXT_RESOURCE_VALUE        129
+#define _APS_NEXT_COMMAND_VALUE         32771
+#define _APS_NEXT_CONTROL_VALUE         1000
+#define _APS_NEXT_SYMED_VALUE           101
+#endif
+#endif
diff --git a/uppsrc/Updater/Updater.cpp b/uppsrc/Updater/Updater.cpp
new file mode 100644
index 000000000..3f0513389
--- /dev/null
+++ b/uppsrc/Updater/Updater.cpp
@@ -0,0 +1,23 @@
+#include <CtrlLib/CtrlLib.h>
+
+using namespace Upp;
+
+GUI_APP_MAIN
+{
+	const Vector<String>& cmdline = CommandLine();
+	SetDefaultCharset(CHARSET_WIN1250);
+	if(cmdline.IsEmpty())
+	{
+		Exclamation("[* UPDATER] should be run from another applications");
+		return;
+	}
+	String name = cmdline[0];
+	UpdateFile(name);
+	String exec = GetExeDirFile(name);
+	for(i = 1; i < cmdline.GetCount(); i++)
+		if(cmdline[i].Find(' ') >= 0)
+			exec << " \"" << cmdline[i] << "\"";
+		else
+			exec << " " << cmdline[i];
+	WinExec(exec, SW_SHOWNORMAL);
+}
diff --git a/uppsrc/Updater/Updater.h b/uppsrc/Updater/Updater.h
new file mode 100644
index 000000000..39e94f595
--- /dev/null
+++ b/uppsrc/Updater/Updater.h
@@ -0,0 +1,22 @@
+#if !defined(AFX_UPDATER_H__DA682885_AD16_11D1_AE92_444553540000__INCLUDED_)
+#define AFX_UPDATER_H__DA682885_AD16_11D1_AE92_444553540000__INCLUDED_
+
+#if _MSC_VER >= 1000
+#pragma once
+#endif // _MSC_VER >= 1000
+
+#ifndef __AFXWIN_H__
+	#error include 'stdafx.h' before including this file for PCH
+#endif
+
+#include "resource.h"		// main symbols
+
+class CUpdaterApp : public CWinApp
+{
+public:
+	CUpdaterApp();
+	virtual BOOL InitInstance();
+	DECLARE_MESSAGE_MAP()
+};
+
+#endif // !defined(AFX_UPDATER_H__DA682885_AD16_11D1_AE92_444553540000__INCLUDED_)
diff --git a/uppsrc/Updater/Updater.ico b/uppsrc/Updater/Updater.ico
new file mode 100644
index 000000000..7eef0bcbe
Binary files /dev/null and b/uppsrc/Updater/Updater.ico differ
diff --git a/uppsrc/Updater/Updater.rc b/uppsrc/Updater/Updater.rc
new file mode 100644
index 000000000..bd0faa4e7
--- /dev/null
+++ b/uppsrc/Updater/Updater.rc
@@ -0,0 +1 @@
+100 ICON DISCARDABLE "Updater.ico"
diff --git a/uppsrc/Updater/Updater.upp b/uppsrc/Updater/Updater.upp
new file mode 100644
index 000000000..0c553c4fb
--- /dev/null
+++ b/uppsrc/Updater/Updater.upp
@@ -0,0 +1,16 @@
+description "Utility for U++ enterprise application update system";
+
+uses
+	CtrlLib;
+
+file
+	Updater.rc,
+	Updater.cpp,
+	Info readonly separator,
+	COPYING,
+	COPYING-PLAIN,
+	AUTHORS;
+
+mainconfig
+	"" = "GUI";
+
diff --git a/uppsrc/VectorDes/AUTHORS b/uppsrc/VectorDes/AUTHORS
new file mode 100644
index 000000000..f782e5b62
--- /dev/null
+++ b/uppsrc/VectorDes/AUTHORS
@@ -0,0 +1,2 @@
+Mirek Fidler <cxl@ntllib.org>
+Tomas Rylek  <rylek@volny.cz>
\ No newline at end of file
diff --git a/uppsrc/VectorDes/COPYING b/uppsrc/VectorDes/COPYING
new file mode 100644
index 000000000..33aa39102
--- /dev/null
+++ b/uppsrc/VectorDes/COPYING
@@ -0,0 +1,30 @@
+Copyright (C) 2005 Mirek Fidler, Tomas Rylek and various contributors (see AUTHORS)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to
+deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies of the Software and its Copyright notices. In addition publicly
+documented acknowledgment must be given that this software has been used if no
+source code of this software is made available publicly. This includes
+acknowledgments in either Copyright notices, Manuals, Publicity and Marketing
+documents or any documentation provided with any product containing this
+software. This License does not apply to any software that links to the
+libraries provided by this software (statically or dynamically), but only to
+the software provided.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+-----------
+
+Please see the COPYING.PLAIN for a plain-english explanation of this notice
+and it's intent.
diff --git a/uppsrc/VectorDes/COPYING-PLAIN b/uppsrc/VectorDes/COPYING-PLAIN
new file mode 100644
index 000000000..770a8132f
--- /dev/null
+++ b/uppsrc/VectorDes/COPYING-PLAIN
@@ -0,0 +1,33 @@
+Plain English Copyright Notice
+
+This file is not intended to be the actual License. The reason this file
+exists is that we here are programmers and engineers. We aren't lawyers. We
+provide licenses that we THINK say the right things, but we have our own
+intentions at heart. This is a plain-english explanation of what those
+intentions are, and if you follow them you will be within the "spirit" of
+the license.
+
+The intent is for us to enjoy writing software that is useful to us (the
+AUTHORS) and allow others to use it freely and also benefit from the work we
+put into making it. We don't want to restrict others using it. They should
+not *HAVE* to make the source code of the applications they write that
+simply link to these libraries (be that statically or dynamically), or for
+them to be limited as to what license they choose to use (be it open, closed
+or anything else). But we would like to know you are using these libraries.
+We simply would like to know that it has been useful to someone. This is why
+we ask for acknowledgement of some sort.
+
+You can do what you want with the source of this software - it doesn't
+matter. We still have it here for ourselves and it is open and free to use
+and download and play with. It can't be taken away. We don't really mind what
+you do with the source to your software. We would simply like to know that
+you are using it - especially if it makes it to a commerical product. If you
+simply e-mail all the AUTHORS (see COPYING and AUTHORS files) telling us, and
+then make sure you include a paragraph or page in the manual or in the "About.."
+box for the product with the copyright notice and state that you used this
+software, we will be very happy. If you want to contribute back modifications
+and fixes you may have made we will welcome those too with open arms (generally).
+If you want help with changes needed, ports needed or features to be added,
+arrangements can be easily made with some dialogue.
+
+Mirek Fidler <cxl@ntllib.org>
diff --git a/uppsrc/VectorDes/VectorDes.cpp b/uppsrc/VectorDes/VectorDes.cpp
new file mode 100644
index 000000000..2a4b439ba
--- /dev/null
+++ b/uppsrc/VectorDes/VectorDes.cpp
@@ -0,0 +1,1751 @@
+#include "VectorDes.h"
+#pragma hdrstop
+
+#define LLOG(x) // RLOG(x)
+
+#define IMAGEFILE <VectorDes/VectorDes.iml>
+#define IMAGECLASS VecImg
+#include <Draw/iml_source.h>
+
+#define LAYOUTFILE <VectorDes/VectorDes.lay>
+#include <CtrlCore/lay.h>
+
+static const char setup_key[] = "vectordes-setup";
+
+INITBLOCK {
+	RegisterGlobalConfig(setup_key);
+};
+
+class VectorFontCtrl : public WithVectorDesFontLayout<StaticRect> {
+public:
+	typedef VectorFontCtrl CLASSNAME;
+	VectorFontCtrl();
+
+	virtual Value GetData() const;
+	virtual void  SetData(const Value& v);
+};
+
+VectorFontCtrl::VectorFontCtrl()
+{
+	CtrlLayout(*this);
+	VectorMap<String, int> face_map;
+	for(int i = 0; i < Font::GetFaceCount(); i++)
+		face_map.FindAdd(Font::GetFaceName(i), i);
+	Vector<String> fname = face_map.PickKeys();
+	Vector<int> find = face_map.PickValues();
+	IndexSort(fname, find, GetLanguageInfo());
+	for(int i = 0; i < fname.GetCount(); i++)
+		font.Add(find[i], fname[i]);
+	font <<= height <<= bold <<= italic <<= underline <<= strikeout
+	<<= THISBACK(Action);
+}
+
+Value VectorFontCtrl::GetData() const
+{
+	Font out;
+	out.Face(~font).Height(Nvl((int)~height, 0))
+	.Bold(bold).Italic(italic).Underline(underline).Strikeout(strikeout);
+	return out;
+}
+
+void VectorFontCtrl::SetData(const Value& v)
+{
+	Font f = v;
+	font <<= f.GetFace();
+	height <<= f.GetHeight();
+	bold = f.IsBold();
+	italic = f.IsItalic();
+	underline = f.IsUnderline();
+	strikeout = f.IsStrikeout();
+}
+
+One<Ctrl> CreateVectorFontCtrl()
+{
+	return new VectorFontCtrl;
+}
+
+class DlgVectorDesSetup : public WithVectorDesSetupLayout<TopWindow> {
+public:
+	typedef DlgVectorDesSetup CLASSNAME;
+	DlgVectorDesSetup();
+
+	bool Run(VectorCtrl::Setup& setup);
+
+private:
+	void OnSnap();
+	void OnGrid();
+};
+
+DlgVectorDesSetup::DlgVectorDesSetup()
+{
+	CtrlLayoutOKCancel(*this, "Preferences");
+	snap <<= THISBACK(OnSnap);
+	grid <<= THISBACK(OnGrid);
+}
+
+bool DlgVectorDesSetup::Run(VectorCtrl::Setup& setup)
+{
+	CtrlRetriever rtvr;
+	rtvr
+		(grid, setup.grid)
+		(grid_cx, setup.grid_size.cx)
+		(grid_cy, setup.grid_size.cy)
+		(grid_style, setup.grid_style)
+		(grid_above_objects, setup.grid_above_objects)
+		(snap, setup.snap)
+		(snap_cx, setup.snap_size.cx)
+		(snap_cy, setup.snap_size.cy)
+		(snap_to_objects, setup.snap_to_objects)
+	;
+	snap_to_objects.Hide(); // temporary
+	OnGrid();
+	OnSnap();
+	if(TopWindow::Run() != IDOK)
+		return false;
+	rtvr.Retrieve();
+	return true;
+}
+
+void DlgVectorDesSetup::OnSnap()
+{
+	snap_cx.Enable(snap);
+	snap_cy.Enable(snap);
+}
+
+void DlgVectorDesSetup::OnGrid()
+{
+	grid_cx.Enable(grid);
+	grid_cy.Enable(grid);
+	grid_style.Enable(grid);
+}
+
+inline Rect SortRect(Point p1, Point p2)
+{
+	return Rect(min(p1.x, p2.x), min(p1.y, p2.y), max(p1.x, p2.x) + 1, max(p1.y, p2.y) + 1);
+}
+
+bool IsDragDistance(Point pt1, Point pt2)
+{
+#ifdef PLATFORM_WIN32
+	return tabs(pt1.x - pt2.x) >= GetSystemMetrics(SM_CXDRAG)
+		|| tabs(pt1.y - pt2.y) >= GetSystemMetrics(SM_CYDRAG);
+#endif
+#ifdef PLATFORM_POSIX
+	enum { CXDRAG = 4, CYDRAG = 4 };
+	// todo? are there any CXDRAG / CYDRAG system metrics in LINUX?
+	return tabs(pt1.x - pt2.x) >= CXDRAG || tabs(pt1.y - pt2.y) >= CYDRAG;
+#endif
+}
+
+int GetRectDragMask(Rect rc, Point pt, int tolerance)
+{
+	Point center = rc.CenterPoint();
+	int m = (tabs(rc.left   - pt.x) <= tolerance ?  1 : 0)
+		|   (tabs(rc.top    - pt.y) <= tolerance ?  2 : 0)
+		|   (tabs(rc.right  - pt.x) <= tolerance ?  4 : 0)
+		|   (tabs(rc.bottom - pt.y) <= tolerance ?  8 : 0);
+	if(m & 5)
+		if((m & 10) || tabs(center.y - pt.y) <= tolerance)
+			return m;
+	if(m & 10)
+		if((m & 5) || tabs(center.x - pt.x) <= tolerance)
+			return m;
+	return 0;
+}
+
+DragDropCtrl::DragDropCtrl()
+: state(0)
+{
+}
+
+bool DragDropCtrl::Push(Point pt, dword keyflags)
+{
+	return true;
+}
+
+void DragDropCtrl::Drag(Point pt, Point last, Point next, dword keyflags)
+{
+	Rect rc_last = Null, rc_next = Null;
+	if(!IsNull(last))
+		rc_last = RectSort(pt, last);
+	if(!IsNull(next))
+		rc_next = RectSort(pt, next);
+	if(rc_last != rc_next)
+		DragRect(rc_last, rc_next, keyflags);
+}
+
+void DragDropCtrl::Drop(Point pt, Point end, dword keyflags)
+{
+	DropRect(RectSort(pt, end), keyflags);
+}
+
+void DragDropCtrl::Click(Point pt, dword keyflags)
+{
+	// no-op, should be implemented in derived class
+}
+
+void DragDropCtrl::DragRect(const Rect& last, const Rect& next, dword keyflags)
+{
+	ViewDraw draw(this);
+	DrawDragRect(draw, last, next, draw.GetClip(), 1, Yellow(), NULL);
+}
+
+void DragDropCtrl::DropRect(const Rect& rc, dword keyflags)
+{
+	// no-op, should be implemented in derived class
+}
+
+void DragDropCtrl::DragShow(bool _show)
+{
+	if(_show && state == HIDDEN) {
+		Drag(start, Null, last, last_key);
+		state = ON;
+	}
+	if(!_show && state == ON) {
+		Drag(start, last, Null, last_key);
+		state = HIDDEN;
+	}
+}
+
+void DragDropCtrl::LeftDown(Point pt, dword keyflags)
+{
+	SetWantFocus();
+	LLOG("DragDropCtrl::LeftDown -> " << pt << ", keyflags " << FormatIntHex(keyflags));
+	if(Push(pt, last_key = keyflags))
+	{ // begin drag & drop
+		state = POSSIBLE;
+		start = last = pt;
+		SetCapture();
+	}
+}
+
+void DragDropCtrl::LeftDouble(Point pt, dword keyflags)
+{
+	SetWantFocus();
+	Click(pt, keyflags | DBLCLK);
+}
+
+void DragDropCtrl::DragStop(bool accept, dword keyflags)
+{
+	ReleaseCapture();
+	DragHide();
+	if(state == HIDDEN && accept)
+		Drop(start, last, last_key = keyflags);
+	else if(state == POSSIBLE && accept)
+		Click(start, last_key = keyflags);
+	state = OFF;
+}
+
+void DragDropCtrl::LeftUp(Point pt, dword keyflags)
+{
+	LLOG("DragDropCtrl::LeftUp -> " << pt);
+	DragStop(true, keyflags);
+}
+
+void DragDropCtrl::MouseMove(Point pt, dword keyflags)
+{
+	LLOG("DragDropCtrl::MouseMove -> " << pt);
+	if(keyflags != last_key)
+		DragHide();
+	if(state == POSSIBLE && IsDragDistance(pt, start))
+	{
+		state = ON;
+		Drag(start, Null, last = pt, last_key = keyflags);
+	}
+	else if(state == ON || state == HIDDEN)
+	{
+		Point plast = (state == ON ? last : Point(Null));
+		last = pt;
+		last_key = keyflags;
+		state = ON;
+		Drag(start, plast, pt, last_key);
+	}
+}
+
+bool DragDropCtrl::Key(dword key, int repcnt)
+{
+	if(key == K_ESCAPE)
+	{
+		DragStop(false);
+		return true;
+	}
+	return Ctrl::Key(key, repcnt);
+}
+
+VectorCtrl::Setup::Setup()
+{
+	snap = grid = snap_to_objects = grid_above_objects = false;
+	grid_style = GRID_POINTS;
+	grid_size = Size(8, 8);
+	snap_size = Size(4, 4);
+}
+
+void VectorCtrl::Setup::Serialize(Stream& stream)
+{
+	int version = 2;
+	stream / version;
+	stream.Pack(grid, snap, snap_to_objects, grid_above_objects);
+	stream % grid_size % snap_size;
+	if(version >= 2)
+		stream / grid_style;
+}
+
+void VectorCtrl::Setup::LoadGlobal()
+{
+	LoadFromGlobal(*this, setup_key);
+}
+
+void VectorCtrl::Setup::SaveGlobal()
+{
+	StoreToGlobal(*this, setup_key);
+}
+
+VectorCtrl::VectorCtrl()
+{
+	BackPaint();
+
+	editmode = EDIT_TRACK;
+
+	tool_coords.SetReadOnly().NoWantFocus();
+
+	SetFrame(InsetFrame());
+	AddFrame(scrollbars);
+	scrollbars.NoAutoHide().NoAutoDisable();
+	scrollbars.WhenScroll = THISBACK(OnScroll);
+	SetZoom(Zoom(1, 1));
+	trackmode = Point(-1, -1);
+	setup.LoadGlobal();
+}
+
+void VectorCtrl::SetData(const Value& value)
+{
+	SetImage(value);
+}
+
+Value VectorCtrl::GetData() const
+{
+	return image;
+}
+
+void VectorCtrl::SetZoom(::Zoom z)
+{
+	zoom = z;
+	Layout();
+}
+
+void VectorCtrl::Layout()
+{
+	pixel_size = zoom * image.GetSize();
+	scrollbars.Set(scrollbars, scrollbars.GetReducedViewSize(), pixel_size + 2 * GAP);
+	Refresh();
+}
+
+Scaling VectorCtrl::GetImageScaling() const
+{
+	return Scaling(image.GetSize(), pixel_size);
+}
+
+void VectorCtrl::Paint(Draw& draw)
+{
+	DragHide();
+	draw.DrawRect(draw.GetClip(), IsEnabled() ? SColorPaper() : SColorShadow());
+	Rect rc(pixel_size);
+	rc.Offset(Point(GAP, GAP) - scrollbars);
+	draw.DrawRect(rc, SColorFace());
+	draw.Offset(rc.TopLeft());
+	ScalingDraw scaled(&draw, GetImageScaling());
+	if(!setup.grid_above_objects)
+		PaintGrid(scaled);
+	image.DesignPaint(scaled);
+	Size sz = image.GetSize() * scaled;
+	if(IsEditable() && IsEnabled()) {
+		DrawHotRect(draw, sz.cx, (sz.cy >> 1) - 2, 5, 5, true, LtBlue());
+		DrawHotRect(draw, (sz.cx >> 1) - 2, sz.cy, 5, 5, true, LtBlue());
+		DrawHotRect(draw, sz.cx, sz.cy, 5, 5, true, LtBlue());
+	}
+	for(int i = 0; i < selection.GetCount(); i++)
+		image[selection.GetKey(i)].SelPaint(scaled, selection[i], i == selection.GetCount() - 1);
+	if(setup.grid_above_objects)
+		PaintGrid(scaled);
+	draw.End();
+}
+
+void VectorCtrl::PaintGrid(ScalingDraw& scaled)
+{
+	if(!setup.grid)
+		return;
+	if(scaled.X(setup.grid_size.cx) <= 2 || scaled.Y(setup.grid_size.cy) <= 2)
+		return;
+	Rect clip = scaled.draw->GetClip() & Rect(scaled.pixel_size);
+	switch(setup.grid_style) {
+		case Setup::GRID_LINES: {
+			Size sz = image.GetSize();
+			for(int i = 0; i < sz.cx; i += setup.grid_size.cx)
+				scaled.draw->DrawRect(scaled.X(i), clip.top, 1, clip.Height(), SColorShadow());
+			for(int i = 0; i < sz.cy; i += setup.grid_size.cy)
+				scaled.draw->DrawRect(clip.left, scaled.Y(i), clip.Width(), 1, SColorShadow());
+			break;
+		}
+
+		case Setup::GRID_POINTS: {
+			Size count = image.GetSize() / setup.grid_size + 1;
+			Buffer<int> xpos(count.cx), ypos(count.cy);
+			for(int i = 0; i < count.cx; i++)
+				xpos[i] = scaled.X(i * setup.grid_size.cx);
+			for(int i = 0; i < count.cy; i++)
+				ypos[i] = scaled.Y(i * setup.grid_size.cy);
+			for(int y = 0; y < count.cy; y++)
+				for(int x = 0; x < count.cx; x++)
+					scaled.draw->DrawRect(xpos[x], ypos[y], 1, 1, SColorShadow());
+			break;
+		}
+	}
+}
+
+void VectorCtrl::MouseMove(Point pt, dword keyflags)
+{
+	SyncCoords(ClientToSnap(pt));
+	DragDropCtrl::MouseMove(pt, keyflags);
+}
+
+Image VectorCtrl::CursorImage(Point pt, dword keyflags)
+{
+	Point mode = trackmode, nearest;
+	if(!IsDragging())
+		mode = GetTrackMode(pt, nearest);
+	return Nvl(image.Cursor(mode, keyflags), Image::Arrow());
+/*
+	switch(mode) {
+		case DM_NEW:
+			return !IsNull(new_icon) ? new_icon : Image::Arrow();
+
+		case DM_SELECT:
+			return CtrlImg::HandCursor();
+
+		case DM_POINT:
+			return CtrlImg::SizeVeHo0();
+
+		case DM_RECT: {
+			switch(rm) {
+				case 1: case 4: return CtrlImg::SizeHorz0();
+				case 2: case 8: return CtrlImg::SizeVert0();
+				case 1 | 2: case 4 | 8: return CtrlImg::SizeHoVe0();
+				case 1 | 8: case 4 | 2: return CtrlImg::SizeVeHo0();
+			}
+			break;
+		}
+
+		case DM_MOVE: {
+			return Image::SizeAll();
+		}
+
+		case DM_IMG_SIZE: {
+			switch(rm) {
+				case 1: return CtrlImg::SizeHorz0();
+				case 2: return CtrlImg::SizeVert0();
+				case 3: return CtrlImg::SizeHoVe0();
+			}
+			return Image::Arrow();
+		}
+	}
+
+	return DragDropCtrl::CursorImage(pt, keyflags);
+*/
+}
+
+void VectorCtrl::RightDown(Point pt, dword keyflags)
+{
+	if(IsEditable())
+		MenuBar::Execute(this, THISBACK(LocalMenu), GetScreenView().TopLeft() + pt);
+}
+
+void VectorCtrl::LocalMenu(Bar& bar)
+{
+	InsertMenu(bar);
+	bar.MenuSeparator();
+	EditMenu(bar);
+}
+
+void VectorCtrl::EditMenu(Bar& bar)
+{
+	bar.Add("Edit", VecImg::edit(), THISBACK(DoEditEdit))
+		.Check(!new_object && editmode == EDIT_TRACK);
+	bar.MenuSeparator();
+	bar.Add(IsSelection(), "Copy", CtrlImg::copy(), THISBACK(DoEditCopy))
+		.Key(K_CTRL_C)
+		.Help("Copy selected objects to the clipboard");
+	bar.Add(IsSelection(), "Cut", CtrlImg::cut(), THISBACK(DoEditCut))
+		.Key(K_CTRL_X)
+		.Help("Remove selected object from the image and place them on the clipboard");
+	bar.Add("Paste", CtrlImg::paste(), THISBACK(DoEditPaste))
+		.Key(K_CTRL_V)
+		.Help("Insert objects from the clipboard");
+	bar.Add("Duplicate", THISBACK(DoEditDuplicate))
+		.Key(K_CTRL_D)
+		.Help("Create a copy of the selected objects");
+	bar.Add(!selection.IsEmpty(), "Delete", THISBACK(DoEditDelete))
+		.Key(K_DELETE)
+		.Help("Delete selected object(s)");
+	bar.MenuSeparator();
+	bar.Add("Align horz", THISBACK(AlignHorzMenu));
+	bar.Add("Align vert", THISBACK(AlignVertMenu));
+	bar.Add("Equal size", THISBACK(SizeMenu));
+	bar.Separator();
+	bar.Add("Preferences", VecImg::edit_setup(), THISBACK(DoEditSetup))
+		.Help("View / edit vector designer preferences");
+}
+
+void VectorCtrl::DoEditEdit()
+{
+	new_object = NULL;
+	editmode = EDIT_TRACK;
+	WhenRescan();
+}
+
+bool VectorCtrl::Copy()
+{
+	if(!IsSelection()) {
+		BeepExclamation();
+		return false;
+	}
+	VectorImage clipimg;
+	clipimg.SetName("clip");
+	for(int i = 0; i < selection.GetCount(); i++)
+		clipimg.Add(image[selection.GetKey(i)].Copy());
+	WriteClipboardText(clipimg.SaveVec(0));
+/*	{	Exclamation("Error writing system clipboard.");
+		return false;
+	}*/
+	BeepInformation();
+	return true;
+}
+
+void VectorCtrl::DoEditCopy()
+{
+	Copy();
+}
+
+void VectorCtrl::DoEditCut()
+{
+	if(Copy())
+		DoEditDelete();
+}
+
+void VectorCtrl::PickPaste(VectorImage img)
+{
+	int insertpos = image.GetCount();
+	if(!selection.IsEmpty()) {
+		insertpos = selection.GetKey(0);
+		for(int i = 1; i < selection.GetCount(); i++)
+			insertpos = max(insertpos, selection.GetKey(i));
+		insertpos++;
+	}
+	ClearSelection();
+	for(int i = 0; !img.IsEmpty(); i++) {
+		image.Insert(insertpos + i, img.Detach(0));
+		AddSelection(insertpos + i);
+	}
+	UpdateActionRefresh();
+}
+
+void VectorCtrl::DoEditPaste()
+{
+	try {
+		String s = ReadClipboardText();
+		if(IsNull(s)) {
+			BeepExclamation();
+			return;
+		}
+		CParser parser(s);
+		VectorImage clipimg;
+		clipimg.LoadVec(parser);
+		PickPaste(clipimg);
+	}
+	catch(Exc e) {
+		ShowExc(e);
+	}
+}
+
+void VectorCtrl::DoEditDuplicate()
+{
+	if(!IsSelection()) {
+		BeepExclamation();
+		return;
+	}
+	Point move(10, 10);
+	if(setup.grid)
+		move = setup.grid_size;
+	VectorImage help;
+	for(int i = 0; i < selection.GetCount(); i++) {
+		One<VectorObject> obj = image[selection.GetKey(i)].Copy();
+		obj->Track(VectorObject::TRACK_MOVE, Point(0, 0), move, 0);
+		help.Add(obj);
+	}
+	PickPaste(help);
+}
+
+void VectorCtrl::DoEditDelete()
+{
+	if(selection.IsEmpty()) {
+		BeepExclamation();
+		return;
+	}
+	Vector<int> objix;
+	objix <<= selection.GetKeys();
+	ClearSelection();
+	Sort(objix);
+	for(int i = objix.GetCount(); --i >= 0;)
+		image.Remove(objix[i]);
+	UpdateActionRefresh();
+	WhenUserSelect();
+}
+
+void VectorCtrl::AlignHorzMenu(Bar& bar)
+{
+	bool msel = (selection.GetCount() >= 2);
+	bar.Add(msel, "Left", VecImg::AlignLeft(), THISBACK2(DoAlign, ALIGN_LEFT, ALIGN_NULL))
+		.Key(K_SHIFT|K_ALT|K_LEFT);
+	bar.Add(msel, "Center", VecImg::AlignHCenter(), THISBACK2(DoAlign, ALIGN_CENTER, ALIGN_NULL))
+		.Key(K_SHIFT_F9);
+	bar.Add(msel, "Right", VecImg::AlignRight(), THISBACK2(DoAlign, ALIGN_RIGHT, ALIGN_NULL))
+		.Key(K_ALT|K_SHIFT|K_RIGHT);
+}
+
+void VectorCtrl::AlignVertMenu(Bar& bar)
+{
+	bool msel = (selection.GetCount() >= 2);
+	bar.Add(msel, "Top", VecImg::AlignTop(), THISBACK2(DoAlign, ALIGN_NULL, ALIGN_TOP))
+		.Key(K_ALT|K_SHIFT|K_UP);
+	bar.Add(msel, "Center", VecImg::AlignVCenter(), THISBACK2(DoAlign, ALIGN_NULL, ALIGN_CENTER))
+		.Key(K_F9);
+	bar.Add(msel, "Bottom", VecImg::AlignBottom(), THISBACK2(DoAlign, ALIGN_NULL, ALIGN_BOTTOM))
+		.Key(K_ALT|K_SHIFT|K_DOWN);
+}
+
+void VectorCtrl::DoAlign(Alignment halign, Alignment valign)
+{
+	if(selection.GetCount() < 2) {
+		BeepExclamation();
+		return;
+	}
+	int lkey = selection.TopKey();
+	const Index<int>& leader = selection.Top();
+	Point align = Null;
+	for(int i = 0; i < leader.GetCount(); i++)
+		if(leader[i] & VectorObject::ARG_MASK) {
+			const VectorObject& obj = image[lkey];
+			if(leader[i] & VectorObject::RECT_MASK) {
+				Rect rc = obj.Info().RectArgs()->Get(&obj, leader[i] >> VectorObject::INDEX_SHIFT);
+				switch(halign) {
+					case ALIGN_LEFT:   align.x = rc.left; break;
+					case ALIGN_CENTER: align.x = (rc.left + rc.right) >> 1; break;
+					case ALIGN_RIGHT:  align.x = rc.right; break;
+				}
+				switch(valign) {
+					case ALIGN_TOP:    align.y = rc.top; break;
+					case ALIGN_CENTER: align.y = (rc.top + rc.bottom) >> 1; break;
+					case ALIGN_BOTTOM: align.y = rc.bottom; break;
+				}
+			}
+			else
+				align = obj.Info().PointArgs()->Get(&obj, leader[i] >> VectorObject::INDEX_SHIFT);
+			break;
+		}
+	if(IsNull(align.x) && halign != ALIGN_NULL || IsNull(align.y) && valign != ALIGN_NULL) {
+		BeepExclamation();
+		return;
+	}
+	for(int i = selection.GetCount() - 2; i >= 0; i--)
+		image[selection.GetKey(i)].Align(halign, valign, align);
+	UpdateActionRefresh();
+}
+
+void VectorCtrl::SizeMenu(Bar& bar)
+{
+	bool msel = (selection.GetCount() >= 2);
+	bar.Add(msel, "Equal width", VecImg::SameWidth(), THISBACK2(DoSameSize, true, false))
+		.Key(K_SHIFT_F8);
+	bar.Add(msel, "Equal height", VecImg::SameHeight(), THISBACK2(DoSameSize, false, true))
+		.Key(K_CTRL_F8);
+	bar.Add(msel, "Equal size", VecImg::SameSize(), THISBACK2(DoSameSize, true, true))
+		.Key(K_F8);
+}
+
+void VectorCtrl::DoSameSize(bool cx, bool cy)
+{
+	if(selection.GetCount() < 2) {
+		BeepExclamation();
+		return;
+	}
+	Rect box = image[selection.TopKey()].GetBox();
+	if(IsNull(box)) {
+		BeepExclamation();
+		return;
+	}
+	Size sz(cx ? box.Width() : (int)Null, cy ? box.Height() : (int)Null);
+	for(int i = selection.GetCount() - 2; i >= 0; i--)
+		image[selection.GetKey(i)].EqualSize(sz);
+	UpdateActionRefresh();
+}
+
+void VectorCtrl::InsertMenu(Bar& bar)
+{
+	int lng = GetCurrentLanguage();
+	String current_type;
+	if(new_object)
+		current_type = new_object->Info().type;
+	for(int i = 0; i < VectorObject::RegisteredObjects().GetCount(); i++) {
+		const VectorInfo *e = VectorObject::RegisteredObjects()[i];
+		bar.Add(e->GetName(lng), e->icon, THISBACK1(OnNewObject, e))
+			.Check(e->type == current_type);
+	}
+}
+
+/*
+Rect VectorCtrl::ApplyRect(Point pt, Point end, Rect rc) const
+{
+	if(rectmask & 1) rc.left = end.x;
+	if(rectmask & 2) rc.top = end.y;
+	if(rectmask & 4) rc.right = end.x;
+	if(rectmask & 8) rc.bottom = end.y;
+	rc.Normalize();
+	return rc;
+}
+*/
+
+void VectorCtrl::ViewMenu(Bar& bar)
+{
+	bar.Add("Zoom in", VecImg::view_zoom_in(), THISBACK(DoViewZoomIn))
+		.Key(K_CTRL_ADD);
+	bar.Add("Zoom out", VecImg::view_zoom_out(), THISBACK(DoViewZoomOut))
+		.Key(K_CTRL_SUBTRACT);
+	bar.Add("Zoom full", VecImg::view_zoom_full(), THISBACK(DoViewZoomFull))
+		.Key(K_CTRL_MULTIPLY);
+	bar.Add("Zoom area", VecImg::view_zoom_area(), THISBACK(DoViewZoomArea))
+		.Check(editmode == EDIT_ZOOM);
+	bar.MenuSeparator();
+	bar.Add("Pan", VecImg::view_pan(), THISBACK(DoViewPan))
+		.Check(editmode == EDIT_PAN);
+	if(bar.IsToolBar())
+		bar.Add(tool_coords.SizePos(), 200);
+}
+
+void VectorCtrl::DoViewZoomIn()
+{
+	Point center = GetImageSize() >> 1;
+	Point pos = scrollbars.Get(), page = scrollbars.GetPage(), total = scrollbars.GetTotal();
+	if(page.x < total.x)
+		center.x = (pos.x + (page.x >> 1)) / zoom;
+	if(page.y < total.y)
+		center.y = (pos.y + (page.y >> 1)) / zoom;
+	SetZoom(Zoom(zoom.m * 2, zoom.d));
+	scrollbars.Set(ImageToClient(center) - Point(GetSize() >> 1));
+}
+
+void VectorCtrl::DoViewZoomOut()
+{
+	Point center = GetImageSize() >> 1;
+	Point pos = scrollbars.Get(), page = scrollbars.GetPage(), total = scrollbars.GetTotal();
+	if(page.x < total.x)
+		center.x = (pos.x + (page.x >> 1)) / zoom;
+	if(page.y < total.y)
+		center.y = (pos.y + (page.y >> 1)) / zoom;
+	if(zoom.m >= 10)
+		SetZoom(Zoom(zoom.m >> 1, zoom.d));
+	scrollbars.Set(ImageToClient(center) - Point(GetSize() >> 1));
+}
+
+void VectorCtrl::DoViewZoomFull()
+{
+	Size image_size = GetImageSize();
+	Size pixel_size = GetFitSize(image_size, scrollbars.GetReducedViewSize() - 2 * GAP);
+	SetZoom(Zoom(pixel_size.cx, image_size.cx));
+}
+
+void VectorCtrl::DoViewZoomArea()
+{
+	DragStop();
+	editmode = EDIT_ZOOM;
+	WhenRescan();
+}
+
+void VectorCtrl::DoViewPan()
+{
+	DragStop();
+	editmode = EDIT_PAN;
+	WhenRescan();
+}
+
+Point VectorCtrl::GetTrackMode(Point pt, Point& nearest) const
+{
+	nearest = Point(-1, -1);
+	static const int TOLERANCE = 5;
+	Size imgsize = ImageToClient(Point(image.GetSize()));
+	int szcx = tabs(pt.x - (imgsize.cx >> 1)) <= TOLERANCE ? 0 : tabs(pt.x - imgsize.cx) <= TOLERANCE ? 1 : -1;
+	int szcy = tabs(pt.y - (imgsize.cy >> 1)) <= TOLERANCE ? 0 : tabs(pt.y - imgsize.cy) <= TOLERANCE ? 1 : -1;
+	Point mode;
+	if((szcx | szcy) > 0)
+		mode = Point(-1, ((szcx | (szcy << 1)) << VectorObject::INDEX_SHIFT) | VectorObject::TRACK_IMAGE_SIZE);
+	else {
+		mode = image.Nearest(GetImageScaling(), pt + ClientOffset(), MAXDIST2, selection.GetKeys());
+		if(mode.x < 0)
+			mode = image.Nearest(GetImageScaling(), pt + ClientOffset(), MAXDIST2);
+	}
+
+	bool sel = (mode.x >= 0 && selection.Find(mode.x) >= 0);
+	if(new_object)
+		mode = Point(-1, VectorObject::TRACK_NEW);
+	else if(sel && (mode.y & VectorObject::TRACK_MASK) == VectorObject::TRACK_RECT && mode.y & VectorObject::ARG_MASK) {
+		const VectorObject& obj = image[mode.x];
+		const VectorInfo& ii = obj.Info();
+		if(const VectorGeomArg<Rect> *ra = ii.RectArgs()) {
+			Rect rc = ra->Get(&obj, mode.y >> VectorObject::INDEX_SHIFT);
+			int rm = GetRectDragMask(rc.Inflated(0) * GetImageScaling(), pt + ClientOffset(), TOLERANCE);
+			if(rm)
+				mode.y = rm | (mode.y & ~VectorObject::TRACK_MASK);
+			else
+				mode.y = VectorObject::TRACK_MOVE;
+		}
+	}
+	nearest = mode;
+
+	if(mode.x >= 0 && !sel)
+		mode.y = (mode.y & ~VectorObject::TRACK_MASK) | VectorObject::TRACK_SELECT;
+
+	return mode;
+}
+
+bool VectorCtrl::Push(Point pt, dword keyflags)
+{
+	switch(editmode) {
+		case EDIT_ZOOM: {
+			return true;
+		}
+		case EDIT_PAN: {
+			pan_start = scrollbars.Get();
+			return true;
+		}
+		case EDIT_TRACK: {
+			break;
+		}
+	}
+
+	if(!IsEditable())
+		return false;
+	Point nearest;
+	trackmode = GetTrackMode(pt, nearest);
+	track_start = image.TrackPoint(trackmode);
+	bool is_sel = IsSelected(trackmode.x);
+	int tm = trackmode.y & VectorObject::TRACK_MASK;
+	if(tm == VectorObject::TRACK_SELECT
+	|| !is_sel || keyflags & (K_SHIFT | K_CTRL)) {
+		if(nearest.x >= 0) {
+			if(tm == VectorObject::TRACK_SELECT)
+				trackmode = nearest;
+			VectorMap< int, Index<int> > sel;
+			sel.Add(trackmode.x).Add(trackmode.y);
+			if(keyflags & K_CTRL)
+				XorSelection(sel);
+			else if((keyflags & K_SHIFT) || is_sel)
+				AddSelection(sel);
+			else if(!is_sel)
+				PickSelection(sel);
+			WhenUserSelect();
+		}
+	}
+	return true;
+}
+
+const Index<int>& VectorCtrl::FindSelTrack(int i) const
+{
+	static Index<int> dummy;
+	return selection.Get(i, dummy);
+}
+
+void VectorCtrl::Click(Point pt, dword keyflags)
+{
+	if(IsEditable() && (trackmode.y & VectorObject::TRACK_MASK) == VectorObject::TRACK_NEW && !!new_object) {
+		ClearSelection();
+		new_object->Create(pt, pt, keyflags);
+		int nobj = AddObject(-new_object);
+		new_object = empty_object->Copy();
+		UpdateActionRefresh();
+		AddSelection(nobj);
+		WhenUserSelect();
+	}
+	else if(!(keyflags & (K_SHIFT | K_CTRL)) && trackmode.y < 0) {
+		ClearSelection();
+		WhenUserSelect();
+	}
+}
+
+void VectorCtrl::Drag(Point pt, Point last, Point next, dword keyflags)
+{
+	switch(editmode) {
+		case EDIT_ZOOM: {
+			DragDropCtrl::Drag(pt, last, next, keyflags);
+			return;
+		}
+		case EDIT_PAN: {
+			if(!IsNull(next)) {
+				scrollbars.Set(pan_start - (next - pt));
+			}
+			return;
+		}
+		case EDIT_TRACK: {
+			if(trackmode.y < 0) {
+				DragDropCtrl::Drag(pt, last, next, keyflags);
+				return;
+			}
+			break;
+		}
+	}
+
+	if(!IsEditable())
+		return;
+	ViewDraw draw(this);
+#ifdef PLATFORM_WIN32
+	SetROP2(draw, R2_NOTXORPEN);
+#endif
+	draw.Offset(Point(GAP, GAP) - scrollbars);
+	ScalingDraw scaled(&draw, GetImageScaling());
+	Point pi = (!IsNull(track_start) ? track_start : ClientToSnap(pt));
+	bool l = !IsNull(last), n = !IsNull(next);
+	Point li = l ? ClientToSnap(last) : pi;
+	Point ni = n ? ClientToSnap(next) : pi;
+
+	if(!((trackmode.y & VectorObject::TRACK_MASK) & ~VectorObject::TRACK_RECT_SIDES)) {
+		for(int i = 0; i < selection.GetCount(); i++) {
+			const VectorObject& o = image[selection.GetKey(i)];
+			One<VectorObject> c1 = o.Copy(), c2 = o.Copy();
+			if(l) c1->Track(trackmode.y, pi, li, keyflags);
+			if(n) c2->Track(trackmode.y, pi, ni, keyflags);
+			if(l) c1->DragPaint(scaled);
+			if(n) { c2->DragPaint(scaled); tool_coords <<= c2->FormatCoords(); }
+		}
+		return;
+	}
+
+	switch(trackmode.y & VectorObject::TRACK_MASK) {
+		case VectorObject::TRACK_NEW: {
+			if(!!new_object) {
+				One<VectorObject> c1 = new_object->Copy(), c2 = new_object->Copy();
+				if(l) c1->Create(pi, li, keyflags);
+				if(n) c2->Create(pi, ni, keyflags);
+				if(l) c1->DragPaint(scaled);
+				if(n) { c2->DragPaint(scaled); tool_coords <<= c2->FormatCoords(); }
+			}
+			break;
+		}
+
+		case VectorObject::TRACK_IMAGE_SIZE: {
+			if(n) {
+				Size sz = image.GetSize();
+				if(trackmode.y & (1 << VectorObject::INDEX_SHIFT)) sz.cx = minmax(ni.x, 10, 1000000);
+				if(trackmode.y & (2 << VectorObject::INDEX_SHIFT)) sz.cy = minmax(ni.y, 10, 1000000);
+				if(sz != image.GetSize()) {
+					RLOG("SetImageSize: " << image.GetSize() << " -> " << sz << ", next = " << next);
+					SetImageSize(sz);
+					WhenImageSize();
+					tool_coords <<= NFormat("%d x %d", sz.cx, sz.cy);
+				}
+			}
+			break;
+		}
+
+		case VectorObject::TRACK_MOVE: {
+			for(int i = 0; i < selection.GetCount(); i++) {
+				const VectorObject& obj = image[selection.GetKey(i)];
+				One<VectorObject> c1 = obj.Copy(), c2 = obj.Copy();
+				if(l) c1->Track(trackmode.y, pi, li, keyflags);
+				if(n) c2->Track(trackmode.y, pi, ni, keyflags);
+				if(l) c1->DragPaint(scaled);
+				if(n) { c2->DragPaint(scaled); tool_coords <<= c2->FormatCoords(); }
+			}
+			break;
+		}
+
+		case VectorObject::TRACK_SELECT: {
+			DragDropCtrl::Drag(pt, last, next, keyflags);
+			tool_coords <<= AsString(RectSort(last, next));
+			break;
+		}
+
+		default: {
+			if(trackmode.x >= 0) {
+				const VectorObject& obj = image[trackmode.x];
+				One<VectorObject> c1 = obj.Copy(), c2 = obj.Copy();
+				if(l) c1->Track(trackmode.y, pi, li, keyflags);
+				if(n) c2->Track(trackmode.y, pi, ni, keyflags);
+				if(l) c1->DragPaint(scaled);
+				if(n) { c2->DragPaint(scaled); tool_coords <<= c2->FormatCoords(); }
+				break;
+			}
+		}
+	}
+}
+
+void VectorCtrl::Drop(Point pt, Point end, dword keyflags)
+{
+	switch(editmode) {
+		case EDIT_ZOOM: {
+			Rect rc = ClientToImage(RectSort(pt, end));
+			Size out = scrollbars.GetReducedViewSize(), in = rc.Size();
+			int m = out.cx, d = in.cx;
+			if(out.cx * in.cy > out.cy * in.cx)
+				m = out.cy, d = in.cy;
+			SetZoom(Zoom(m, d));
+			scrollbars.Set(ImageToClient(rc.CenterPoint()) - (GetSize() >> 1) + scrollbars.Get());
+			return;
+		}
+		case EDIT_PAN: {
+			return;
+		}
+		default: {
+			break;
+		}
+	}
+
+	if(!IsEditable())
+		return;
+
+	Point pi = (!IsNull(track_start) ? track_start : ClientToSnap(pt));
+	Point ei = ClientToSnap(end);
+
+	if(trackmode.y < 0) {
+		Rect rc = RectSort(pt, end);
+		VectorMap< int, Index<int> > cont = image.Contains(GetImageScaling(), rc + ClientOffset());
+		if(keyflags & K_CTRL)
+			XorSelection(cont);
+		else if(keyflags & K_SHIFT)
+			AddSelection(cont);
+		else
+			PickSelection(cont);
+		WhenUserSelect();
+		return;
+	}
+
+	if(!((trackmode.y & VectorObject::TRACK_MASK) & ~VectorObject::TRACK_RECT_SIDES)) {
+		for(int i = 0; i < selection.GetCount(); i++)
+			image[selection.GetKey(i)].Track(trackmode.y, pi, ei, keyflags);
+		UpdateActionRefresh();
+		return;
+	}
+
+	switch(trackmode.y & VectorObject::TRACK_MASK) {
+		case VectorObject::TRACK_NEW: {
+			if(!!new_object) {
+				ClearSelection();
+				new_object->Create(pi, ei, keyflags);
+				int nobj = AddObject(-new_object);
+				new_object = empty_object->Copy();
+				UpdateActionRefresh();
+				AddSelection(nobj);
+				WhenUserSelect();
+			}
+			break;
+		}
+
+		case VectorObject::TRACK_IMAGE_SIZE:
+			break;
+
+		case VectorObject::TRACK_MOVE: {
+			for(int i = 0; i < selection.GetCount(); i++)
+				image[selection.GetKey(i)].Track(trackmode.y, pi, ei, keyflags);
+			UpdateActionRefresh();
+			break;
+		}
+
+		case VectorObject::TRACK_SELECT: {
+			PickSelection(image.Contains(GetImageScaling(), SortRect(pt + ClientOffset(), end + ClientOffset())));
+			WhenUserSelect();
+			break;
+		}
+
+		default: {
+			if(trackmode.x >= 0) {
+				image[trackmode.x].Track(trackmode.y, pi, ei, keyflags);
+				UpdateActionRefresh();
+				break;
+			}
+		}
+	}
+}
+
+bool VectorCtrl::Key(dword key, int repcnt)
+{
+	if(IsEditable() && IsSelection() && (key & K_SHIFT)) {
+		bool size = (key & K_CTRL);
+		switch(key & ~K_SHIFT & ~K_CTRL) {
+			case K_UP:    KeyMove(0, -1, size); return true;
+			case K_DOWN:  KeyMove(0, +1, size); return true;
+			case K_LEFT:  KeyMove(-1, 0, size); return true;
+			case K_RIGHT: KeyMove(+1, 0, size); return true;
+		}
+	}
+	return DragDropCtrl::Key(key, repcnt);
+}
+
+void VectorCtrl::KeyMove(int dx, int dy, bool resize)
+{
+	if(IsSelection()) {
+		if(setup.snap) {
+			int topi = selection.TopKey();
+			const Index<int>& topsel = selection.Top();
+			const VectorObject& obj = image[topi];
+			const VectorInfo& info = obj.Info();
+			dx *= setup.snap_size.cx;
+			dy *= setup.snap_size.cy;
+			for(int i = 0; i < topsel.GetCount(); i++)
+				if((topsel[i] & VectorObject::ARG_MASK)) {
+					Point pt;
+					int t = topsel[i] >> VectorObject::INDEX_SHIFT;
+					if(topsel[i] & VectorObject::RECT_MASK) {
+						Rect rc = info.RectArgs()->Get(&obj, t);
+						pt = (resize ? rc.BottomRight() : rc.TopLeft());
+					}
+					else
+						pt = info.PointArgs()->Get(&obj, t);
+					if(dx && setup.snap_size.cx > 1)
+						dx = idivfloor(dx + pt.x + (dx > 0 ? 0 : setup.snap_size.cx - 1), setup.snap_size.cx) * setup.snap_size.cx - pt.x;
+					if(dy && setup.snap_size.cy > 1)
+						dy = idivfloor(dy + pt.y + (dy > 0 ? 0 : setup.snap_size.cy - 1), setup.snap_size.cy) * setup.snap_size.cy - pt.y;
+					break;
+				}
+		}
+		for(int i = 0; i < selection.GetCount(); i++) {
+			VectorObject& obj = image[selection.GetKey(i)];
+			obj.Track(resize ? (int)VectorObject::TRACK_SIZE : (int)VectorObject::TRACK_MOVE,
+			          Point(0, 0), Point(dx, dy), 0);
+		}
+		UpdateActionRefresh();
+		SyncCoords(Null);
+	}
+}
+
+void VectorCtrl::SetImage(VectorImage img)
+{
+	image = img;
+	Layout();
+}
+
+void VectorCtrl::SetImageSize(Size sz)
+{
+	image.SetSize(sz);
+	Layout();
+}
+
+void VectorCtrl::ClearSelection()
+{
+	selection.Clear();
+	PostSyncArgEditors();
+}
+
+void VectorCtrl::AddSelection(int sel, int track)
+{
+	Index<int> mask;
+	int f = selection.Find(sel);
+	if(f >= 0) {
+		mask = selection[f];
+		selection.Remove(f);
+	}
+	if(track >= 0)
+		mask.FindAdd(track);
+	selection.Add(sel) = mask;
+	PostSyncArgEditors();
+}
+
+void VectorCtrl::AddSelection(const VectorMap< int, Index<int> >& sel)
+{
+	for(int i = 0; i < sel.GetCount(); i++) {
+		int key = sel.GetKey(i);
+		Index<int> mask;
+		mask <<= sel[i];
+		int f = selection.Find(key);
+		if(f >= 0) {
+			FindAppend(mask, selection[f]);
+			selection.Remove(f);
+		}
+		selection.Add(key) = mask;
+	}
+	PostSyncArgEditors();
+}
+
+void VectorCtrl::XorSelection(const VectorMap< int, Index<int> >& sel)
+{
+	for(int i = 0; i < sel.GetCount(); i++) {
+		int key = sel.GetKey(i);
+		Index<int> selmask;
+		selmask <<= sel[i];
+		int f = selection.Find(key);
+		if(f >= 0) {
+			Index<int> oldmask = selection[f];
+			selection.Remove(f);
+			for(int o = 0; o < oldmask.GetCount(); o++) {
+				int s = selmask.Find(oldmask[o]);
+				if(s >= 0)
+					selmask.Remove(s);
+				else
+					selmask.Add(oldmask[o]);
+			}
+		}
+		if(!selmask.IsEmpty())
+			selection.Add(key) = selmask;
+	}
+	PostSyncArgEditors();
+}
+
+void VectorCtrl::PickSelection(pick_ VectorMap< int, Index<int> >& sel)
+{
+	selection = sel;
+	PostSyncArgEditors();
+}
+
+void VectorCtrl::RemoveSelection(const Vector<int>& rm_index)
+{
+	Index<int> found;
+	for(int i = 0; i < rm_index.GetCount(); i++) {
+		int f = selection.Find(rm_index[i]);
+		if(f >= 0)
+			found.FindAdd(f);
+	}
+	Vector<int> flist = found.PickKeys();
+	Sort(flist);
+	while(!flist.IsEmpty())
+		selection.Remove(flist.Pop());
+	PostSyncArgEditors();
+}
+
+void VectorCtrl::PostSyncArgEditors()
+{
+	sel_args.Clear();
+	tc_sync_editors.KillSet(200, THISBACK(SyncArgEditors));
+}
+
+void VectorCtrl::SyncArgEditors()
+{
+	tc_sync_editors.Kill();
+	sel_args.Clear();
+	sel_editors.Clear();
+	int name_len = 0;
+	for(int i = 0; i < selection.GetCount(); i++) {
+		int isel = selection.GetKey(i);
+		const VectorObject& obj = image[isel];
+		const VectorInfo& info = obj.Info();
+		for(int a = 0; a < info.GetCount(); a++) {
+			const VectorArg& varg = info[a];
+			Value v = obj.GetArg(a);
+			int f;
+			for(f = sel_args.Find(varg.name); f >= 0; f = sel_args.FindNext(f))
+				if(sel_args[f].vtype == varg.vtype && sel_args[f].editor == varg.editor) {
+					sel_args[f].obj_args.Add(Point(a, isel));
+					if(sel_args[f].value != v)
+						sel_args[f].multi = true;
+					break;
+				}
+			if(f < 0) {
+				ArgEditor& ed = sel_args.Add(varg.name);
+				ed.name = varg.name;
+				ed.vtype = varg.vtype;
+				ed.editor = varg.editor;
+				ed.value = v;
+				ed.multi = false;
+				ed.obj_args.Add(Point(a, isel));
+				name_len = max(name_len, GetSmartTextSize(ScreenInfo(), ed.name + ":  ", StdFont()).cx);
+			}
+		}
+	}
+	Sort(sel_args, FieldRelation(&ArgEditor::name, GetLanguageInfo()));
+	int ypos = 4, yend = ypos;
+	for(int i = 0; i < sel_args.GetCount(); i++) {
+		const ArgEditor& sa = sel_args[i];
+		One<Ctrl> editctrl = VectorArg::CreateEditor(sa.vtype, sa.editor);
+		if(!!editctrl) {
+			One<Label> label = new Label;
+ 			label->SetLabel(sa.name + ':');
+			arg_parent << label->LeftPos(4, name_len).TopPos(ypos, 19);
+			int ht = editctrl->GetRect().Height();
+			arg_parent << editctrl->HSizePos(4 + name_len, 4).TopPos(ypos, ht);
+			if(sa.multi) {
+				One<Button> multi = new Button;
+				multi->SetLabel("(various)");
+				*multi <<= THISBACK2(OnArgMulti, ~multi, ~editctrl);
+				arg_parent << multi->SetPos(editctrl->GetPos());
+				sel_editors.Add(-multi);
+				editctrl->Hide();
+			}
+			else
+				editctrl->SetData(sa.value);
+			*editctrl <<= THISBACK2(OnArgEdit, i, ~editctrl);
+			editctrl->ClearModify();
+			sel_editors.Add(-label);
+			sel_editors.Add(-editctrl);
+			yend = ypos + max(19, ht);
+			ypos = yend + 2;
+		}
+	}
+	arg_parent.HSizePos(0, 0).TopPos(arg_parent.GetRect().top, yend + 4);
+	WhenArgLayout();
+	Refresh();
+}
+
+void VectorCtrl::SyncCoords(Point mouse)
+{
+	String out;
+	if(!IsNull(mouse))
+		out = NFormat("[%d, %d]", mouse.x, mouse.y);
+	if(!selection.IsEmpty()) {
+		out << (out.IsEmpty() ? "" : "; ") << image[selection.TopKey()].FormatCoords();
+	}
+	tool_coords <<= out;
+}
+
+void VectorCtrl::OnNewObject(const VectorInfo *i)
+{
+	ClearSelection();
+	empty_object = i->New();
+	for(int a = 0; a < i->GetCount(); a++)
+		(*i)[a].Set(~empty_object, (*i)[a].dflt);
+	new_object = empty_object->Copy();
+	new_icon = i->icon;
+	Refresh();
+	WhenRescan();
+}
+
+void VectorCtrl::OnArgEdit(int i, Ctrl *ctrl)
+{
+	if(i >= 0 && i < sel_args.GetCount()) {
+		const ArgEditor& sa = sel_args[i];
+		Value v = ctrl->GetData();
+		for(int o = 0; o < sa.obj_args.GetCount(); o++)
+			image[sa.obj_args[o].y].SetArg(sa.obj_args[o].x, v);
+	}
+	Refresh();
+}
+
+void VectorCtrl::OnArgMulti(Button *button, Ctrl *editor)
+{
+	button->Hide();
+	editor->Show();
+	if(!editor->SetWantFocus())
+		IterateFocusForward(editor, editor);
+}
+
+void VectorCtrl::OnScroll()
+{
+	Refresh();
+}
+
+Point VectorCtrl::ClientToImage(Point pt) const
+{
+	return (pt - GAP + scrollbars) / zoom;
+}
+
+Point VectorCtrl::ClientToSnap(Point pt) const
+{
+	Point pi = ClientToImage(pt);
+	if(setup.snap)
+		pi = Size(pi + (setup.snap_size >> 1)) / setup.snap_size * setup.snap_size;
+	return pi;
+}
+
+Point VectorCtrl::ImageToClient(Point pt) const
+{
+	return zoom * pt + GAP - Point(scrollbars);
+}
+
+Rect VectorCtrl::ClientToImage(Rect rc) const
+{
+	return Rect(ClientToImage(rc.TopLeft()), ClientToImage(rc.BottomRight()));
+}
+
+Rect VectorCtrl::ImageToClient(Rect rc) const
+{
+	return Rect(ImageToClient(rc.TopLeft()), ImageToClient(rc.BottomRight()));
+}
+
+int VectorCtrl::AddObject(One<VectorObject> object)
+{
+	image.Add(object);
+	UpdateActionRefresh();
+	return image.GetCount() - 1;
+}
+
+void VectorCtrl::RemoveObject(int i)
+{
+	image.Remove(i);
+	UpdateActionRefresh();
+}
+
+void VectorCtrl::MoveObject(int i, int j)
+{
+	image.Move(i, j);
+	int ipos = selection.Find(i);
+	int jpos = selection.Find(j);
+	if(ipos >= 0) selection.SetKey(ipos, j);
+	if(jpos >= 0) selection.SetKey(jpos, i);
+	UpdateActionRefresh();
+}
+
+void VectorCtrl::DoEditSetup()
+{
+	DlgVectorDesSetup setupdlg;
+	if(setupdlg.Run(setup)) {
+		setup.SaveGlobal();
+		Refresh();
+	}
+}
+
+VectorDes::VectorDes(VectorDesHost& host)
+: host(host)
+, cv_obj_list(editor)
+{
+	single = false;
+
+	AddFrame(toolbar);
+	image_list.AutoHideSb();
+	ASSERT(image_list.GetIndexCount() == IC_IDENT);
+	image_list.AddColumn("Identifier", 20).Edit(list_ident);
+	ASSERT(image_list.GetIndexCount() == IC_WIDTH);
+	image_list.AddColumn("Width", 7).Edit(list_width).InsertValue(500);
+	list_width.MinMax(1, 100000).NotNull();
+	list_width <<= THISBACK(OnImageSize);
+	ASSERT(image_list.GetIndexCount() == IC_HEIGHT);
+	image_list.AddColumn("Height", 7).Edit(list_height).InsertValue(500);
+	list_height.MinMax(1, 100000).NotNull();
+	list_height <<= THISBACK(OnImageSize);
+	ASSERT(image_list.GetIndexCount() == IC_IMAGE);
+	image_list.AddCtrl(editor).InsertValue(VectorImage());
+	ASSERT(image_list.GetIndexCount() == IC_COUNT);
+	image_list.AfterBeforeInserting().Removing();
+	image_list.WhenCursor = THISBACK(OnImageListCursor);
+	object_list.AutoHideSb().NoHeader().NoGrid().MultiSelect();
+	object_list.AddRowNumColumn("").SetConvert(cv_obj_list);
+	object_list.WhenBar = THISBACK(ObjectMenu);
+	object_list.WhenCursor = THISBACK(PostObjectCursor);
+	arg_pane.AddFrame(arg_scroll);
+	arg_scroll.AutoHide();
+	editor.WhenArgLayout = THISBACK(OnArgLayout);
+	editor.WhenUserSelect = THISBACK(OnUserSelect);
+	arg_scroll.WhenScroll = THISBACK(OnArgScroll);
+	arg_pane.Add(editor.GetArgParent());
+	asplitter.Vert(object_list, arg_pane);
+	vsplitter.Vert(image_list, asplitter);
+	splitter.SetPos(3000);
+	splitter.Horz(vsplitter, editor);
+	Add(splitter.SizePos());
+	editor <<= THISBACK(OnObject);
+	editor.WhenRescan = THISBACK(Rescan);
+	editor.WhenImageSize = THISBACK(OnUserImageSize);
+	Rescan();
+}
+
+VectorDes::~VectorDes()
+{
+	Shutdown();
+}
+
+void VectorDes::LoadVecFile(CParser& parser)
+{
+	single = false;
+	vsplitter.NoZoom();
+	image_list.Clear();
+	while(!parser.IsEof()) {
+		VectorImage image;
+		image.LoadVec(parser);
+		if(!memcmp(image.GetName(), "vi__", 4))
+			image.SetName(Null);
+		int r = image_list.GetCount();
+		image_list.Add();
+		image_list.Set(r, IC_IDENT, image.GetName());
+		image_list.Set(r, IC_WIDTH, image.GetSize().cx);
+		image_list.Set(r, IC_HEIGHT, image.GetSize().cy);
+		image_list.Set(r, IC_IMAGE, Value(image));
+	}
+	image_list.SetCursor(0);
+	OnImageListCursor();
+}
+
+String VectorDes::SaveVecFile()
+{
+	String out;
+	for(int i = 0; i < image_list.GetCount(); i++) {
+		VectorImage im = image_list.Get(i, IC_IMAGE);
+		im.SetName(image_list.Get(i, IC_IDENT));
+		im.SetSize(Size(image_list.Get(i, IC_WIDTH), image_list.Get(i, IC_HEIGHT)));
+		out << im.SaveVec(i) << '\n';
+	}
+	return out;
+}
+
+void VectorDes::LoadSingle(VectorImage img)
+{
+	single = true;
+	image_list.NoInserting().NoRemoving();
+	image_list.SetCount(1);
+	image_list.SetCursor(0);
+	image_list.Set(IC_IDENT, img.GetName());
+	image_list.Set(IC_WIDTH, img.GetSize().cx);
+	image_list.Set(IC_HEIGHT, img.GetSize().cy);
+	image_list.Set(IC_IMAGE, Value(img));
+	OnImageListCursor();
+	vsplitter.Zoom(1);
+}
+
+VectorImage VectorDes::SaveSingle() const
+{
+	VectorImage im;
+	if(image_list.GetCount() > 0) {
+		im = image_list.Get(0, IC_IMAGE);
+		im.SetName(image_list.Get(0, IC_IDENT));
+		im.SetSize(Size(image_list.Get(0, IC_WIDTH), image_list.Get(0, IC_HEIGHT)));
+	}
+	return im;
+}
+
+void VectorDes::CloseDesigner()
+{
+}
+
+void VectorDes::FrameFocus()
+{
+}
+
+void VectorDes::EditMenu(Bar& bar)
+{
+	bar.Add("Object", THISBACK(ObjectMenu));
+	bar.Add("Insert", callback(&editor, &VectorCtrl::InsertMenu));
+	bar.Add("Edit", callback(&editor, &VectorCtrl::EditMenu));
+	bar.Add("View", callback(&editor, &VectorCtrl::ViewMenu));
+}
+
+bool VectorDes::Key(dword key, int repcnt)
+{
+	return false;
+}
+
+void VectorDes::OnImageListCursor()
+{
+	editor.ClearSelection();
+	editor.Enable(image_list.IsCursor());
+	OnImageSize();
+	OnObject();
+}
+
+void VectorDes::OnImageSize()
+{
+	if(image_list.IsCursor()) {
+		int cx = image_list.Get(IC_WIDTH);
+		int cy = image_list.Get(IC_HEIGHT);
+		editor.SetImageSize(Size(Nvl(cx, 100), Nvl(cy, 100)));
+		image_list.Set(IC_IMAGE, ~editor);
+		WhenSyncTitle();
+	}
+}
+
+void VectorDes::OnUserImageSize()
+{
+	if(image_list.IsCursor()) {
+		image_list.Set(IC_WIDTH, editor.GetImageSize().cx);
+		image_list.Set(IC_HEIGHT, editor.GetImageSize().cy);
+		WhenSyncTitle();
+	}
+}
+
+void VectorDes::OnObject()
+{
+	object_list.SetCount(editor.GetImage().GetCount()); // SetVirtualCount!!!
+	object_list.Refresh();
+	Rescan();
+}
+
+void VectorDes::ObjectMenu(Bar& bar)
+{
+	bar.Add(editor.IsSelection() && !editor.IsSelected(0),
+		"Move to back", VecImg::move_to_back(), THISBACK(ObjectMoveBack))
+		.Key(K_CTRL_UP);
+	bar.Add(editor.IsSelection() && !editor.IsSelected(object_list.GetCount() - 1),
+		"Move to front", VecImg::move_to_front(), THISBACK(ObjectMoveFront))
+		.Key(K_CTRL_DOWN);
+	bar.Separator();
+	bar.Add(editor.IsSelection(), "Delete", CtrlImg::remove(), THISBACK(ObjectDelete));
+}
+
+void VectorDes::ObjectDelete()
+{
+	int c = object_list.GetCursor();
+	editor.DoEditDelete();
+}
+
+void VectorDes::ObjectMoveBack()
+{
+	Vector<int> sorted;
+	sorted <<= editor.GetSelected();
+	Sort(sorted);
+	if(sorted.IsEmpty() || sorted[0] == 0) {
+		BeepExclamation();
+		return;
+	}
+	for(int i = 0; i < sorted.GetCount(); i++)
+		editor.MoveObject(sorted[i], sorted[i] - 1);
+	int c = object_list.GetCursor();
+	if(c > 0)
+		object_list.SetCursor(c - 1);
+	OnUserSelect();
+}
+
+void VectorDes::ObjectMoveFront()
+{
+	Vector<int> sorted;
+	sorted <<= editor.GetSelected();
+	Sort(sorted);
+	if(sorted.IsEmpty() || sorted.Top() >= object_list.GetCount() - 1) {
+		BeepExclamation();
+		return;
+	}
+	for(int i = sorted.GetCount(); --i >= 0;)
+		editor.MoveObject(sorted[i], sorted[i] + 1);
+	int c = object_list.GetCursor();
+	if(c >= 0 && c + 1 < object_list.GetCount())
+		object_list.SetCursor(c + 1);
+	OnUserSelect();
+}
+
+/*
+void VectorDes::ObjectProperties()
+{
+	int c = object_list.GetCount();
+	if(c < 0) {
+		BeepExclamation();
+		return;
+	}
+	// properties
+}
+*/
+
+void VectorDes::OnArgLayout()
+{
+	arg_scroll.Set(arg_scroll, GetSize().cy, editor.GetArgParent().GetRect().Height());
+	OnArgScroll();
+}
+
+void VectorDes::OnArgScroll()
+{
+	Ctrl& parent = editor.GetArgParent();
+	parent.HSizePos(0, 0).TopPos(-arg_scroll.Get(), parent.GetRect().Height());
+}
+
+void VectorDes::OnUserSelect()
+{
+	if(!editor.IsSelection())
+		object_list.KillCursor();
+	int isel = -1;
+	for(int i = 0; i < object_list.GetCount(); i++) {
+		bool issel = editor.IsSelected(i);
+		object_list.Select(i, issel);
+		if(issel)
+			isel = i;
+	}
+	if(isel >= 0) {
+		int dsel = object_list.GetCursor();
+		if(dsel < 0 || !editor.IsSelected(dsel))
+			object_list.SetCursor(isel);
+	}
+	Rescan();
+}
+
+void VectorDes::ChildGotFocus()
+{
+	if(!IsShutdown() && IsOpen() && IsVisible())
+		if(Ctrl *ctrl = GetFocusCtrl()) {
+			Rect rc = ctrl->GetScreenRect();
+			rc.Offset(-GetScreenRect().TopLeft());
+			bool up = rc.top < 0, down = rc.bottom > GetSize().cy;
+			if(up && !down)
+				arg_scroll.Set(arg_scroll.Get() + rc.top);
+			if(down && !up)
+				arg_scroll.Set(arg_scroll.Get() + rc.bottom - GetSize().cy);
+		}
+}
+
+void VectorDes::PostObjectCursor()
+{
+	tc_object_cursor.KillSet(200, THISBACK(OnObjectCursor));
+}
+
+void VectorDes::OnObjectCursor()
+{
+	Vector<int> remove;
+	int cursor = object_list.GetCursor();
+	for(int i = editor.GetSelCount(); --i >= 0;)
+		if(!object_list.IsSelected(editor.GetSelObject(i)) && editor.GetSelObject(i) != cursor)
+			remove.Add(editor.GetSelObject(i));
+	if(!remove.IsEmpty())
+		editor.RemoveSelection(remove);
+	Vector<int> add;
+	for(int i = 0; i < object_list.GetCount(); i++)
+		if((i == cursor || object_list.IsSelected(i)) && !editor.IsSelected(i))
+			editor.AddSelection(i);
+	editor.SyncArgEditors();
+	Rescan();
+}
+
+class VectorImageEditor : public TopWindow, public VectorDesHost
+{
+public:
+	typedef VectorImageEditor CLASSNAME;
+	VectorImageEditor();
+
+	bool         Run(VectorImage& image);
+
+	void         SyncTitle();
+
+private:
+	void         Rescan() { menubar.Set(THISBACK(MainMenu)); }
+
+	void         MainMenu(Bar& bar);
+
+private:
+	MenuBar      menubar;
+	One<VectorDes> designer;
+};
+
+VectorImageEditor::VectorImageEditor()
+{
+	designer = new VectorDes(*this);
+	designer->WhenSyncTitle = THISBACK(SyncTitle);
+	designer->WhenRescan = THISBACK(Rescan);
+	AddFrame(menubar);
+	AddFrame(TopSeparatorFrame());
+	Add(designer->SizePos());
+	Sizeable().MaximizeBox();
+	Icon(VecImg::ide_icon());
+}
+
+bool VectorImageEditor::Run(VectorImage& image)
+{
+	designer->LoadSingle(image);
+	SyncTitle();
+	Rescan();
+	if(TopWindow::Run() == IDCANCEL)
+		return false;
+	image = designer->SaveSingle();
+	return true;
+}
+
+void VectorImageEditor::SyncTitle()
+{
+	Title(NFormat("Vektorov� obr�zek [ %d x %d ]",
+		designer->GetImageSize().cx, designer->GetImageSize().cy));
+}
+
+void VectorImageEditor::MainMenu(Bar& bar)
+{
+	designer->EditMenu(bar);
+}
+
+bool RunVectorImageEditor(VectorImage& image)
+{
+	VectorImageEditor editor;
+	return editor.Run(image);
+}
diff --git a/uppsrc/VectorDes/VectorDes.h b/uppsrc/VectorDes/VectorDes.h
new file mode 100644
index 000000000..f6bf0bf85
--- /dev/null
+++ b/uppsrc/VectorDes/VectorDes.h
@@ -0,0 +1,330 @@
+#ifndef _VectorDes_VectorDes_h_
+#define _VectorDes_VectorDes_h_
+
+#include <CtrlLib/CtrlLib.h>
+#include <Web/Web.h>
+#include <RichText/RichText.h>
+#include "VectorObj.h"
+
+One<Ctrl> CreateVectorFontCtrl();
+
+class DragDropCtrl : public Ctrl
+{
+public:
+	DragDropCtrl();
+
+	// drag & drop interface
+	virtual bool Push(Point pt, dword keyflags);
+	virtual void Drag(Point pt, Point last, Point next, dword keyflags);
+	virtual void Drop(Point pt, Point end, dword keyflags);
+	virtual void Click(Point pt, dword keyflags);
+	static const int DBLCLK = 0x40000000;
+
+	virtual void DragRect(const Rect& last, const Rect& next, dword keyflags);
+	virtual void DropRect(const Rect& rc, dword keyflags);
+
+	void         DragShow(bool _show = true);
+	void         DragHide()                    { DragShow(false); }
+	void         DragStop(bool accept, dword keyflags);
+	void         DragStop(bool accept = false) { DragStop(accept, last_key); }
+
+	bool         IsDragging() const            { return state == ON || state == HIDDEN; }
+	bool         IsPushed() const              { return state != OFF; }
+
+	// control overrides
+	virtual void LeftDown(Point pt, dword keyflags);
+	virtual void LeftDouble(Point pt, dword keyflags);
+	virtual void LeftUp(Point pt, dword keyflags);
+	virtual void MouseMove(Point pt, dword keyflags);
+	virtual bool Key(dword key, int repcnt);
+
+private:
+	Point        start, last;
+	dword        last_key;
+	char         state;
+	enum { OFF, ON, POSSIBLE, HIDDEN };
+};
+
+class VectorCtrl : public DragDropCtrl
+{
+public:
+	typedef VectorCtrl CLASSNAME;
+	VectorCtrl();
+
+	virtual void Layout();
+	virtual void Paint(Draw& draw);
+
+	virtual void SetData(const Value& value);
+	virtual Value GetData() const;
+
+	virtual Image CursorImage(Point pt, dword keyflags);
+	virtual void MouseMove(Point pt, dword keyflags);
+	virtual void RightDown(Point pt, dword keyflags);
+
+	virtual bool Key(dword key, int repcount);
+
+	virtual bool Push(Point pt, dword keyflags);
+	virtual void Drag(Point pt, Point last, Point next, dword keyflags);
+	virtual void Drop(Point pt, Point end, dword keyflags);
+	virtual void Click(Point pt, dword keyflags);
+
+	Ctrl&        GetArgParent()                   { return arg_parent; }
+
+	void         SetZoom(Zoom zoom);
+	Zoom         GetZoom() const                  { return zoom; }
+
+	void         SetImageSize(Size sz);
+	Size         GetImageSize() const             { return image.GetSize(); }
+
+	void         SetImage(VectorImage img);
+	VectorImage  GetImage() const                 { return image; }
+
+	void         ClearSelection();
+	void         AddSelection(int sel)            { AddSelection(sel, -1); }
+	void         AddSelection(int sel, int track);
+	void         AddSelection(const VectorMap< int, Index<int> >& sel);
+	void         XorSelection(const VectorMap< int, Index<int> >& sel);
+	void         PickSelection(pick_ VectorMap< int, Index<int> >& sel);
+	void         RemoveSelection(const Vector<int>& rm_index);
+	const Vector<int>& GetSelected() const { return selection.GetKeys(); }
+
+	bool         IsSelection() const       { return !selection.IsEmpty(); }
+	int          GetSelCount() const       { return selection.GetCount(); }
+	int          GetSelObject(int i) const { return selection.GetKey(i); }
+	const Index<int>& GetSelTrack(int i) const { return selection[i]; }
+	bool         IsSelected(int i) const   { return selection.Find(i) >= 0; }
+	const Index<int> &FindSelTrack(int i) const;
+
+	void         PostSyncArgEditors();
+	void         SyncArgEditors();
+
+	void         SyncCoords(Point coords);
+
+	Point        ClientToImage(Point pt) const;
+	Point        ImageToClient(Point pt) const;
+
+	Rect         ClientToImage(Rect rc) const;
+	Rect         ImageToClient(Rect rc) const;
+
+	Point        ClientToSnap(Point pt) const;
+
+	int          AddObject(One<VectorObject> object);
+	void         RemoveObject(int i);
+	void         MoveObject(int i, int j);
+
+	void         InsertMenu(Bar& bar);
+	void         LocalMenu(Bar& bar);
+	void         EditMenu(Bar& bar);
+	void         AlignHorzMenu(Bar& bar);
+	void         AlignVertMenu(Bar& bar);
+	void         SizeMenu(Bar& bar);
+	void         ViewMenu(Bar& bar);
+
+	void         DoEditSetup();
+
+	void         DoEditCopy();
+	void         DoEditCut();
+	void         DoEditPaste();
+	void         DoEditDuplicate();
+	void         DoEditEdit();
+	void         DoEditDelete();
+
+	bool         Copy();
+	void         PickPaste(VectorImage img);
+
+	void         DoAlign(Alignment halign, Alignment valign);
+	void         DoSameSize(bool cx, bool cy);
+
+	void         DoViewZoomIn();
+	void         DoViewZoomOut();
+	void         DoViewZoomFull();
+	void         DoViewZoomArea();
+	void         DoViewPan();
+
+public:
+	Callback     WhenArgLayout;
+	Callback     WhenUserSelect;
+	Callback     WhenRescan;
+	Callback     WhenImageSize;
+
+	struct Setup {
+		Setup();
+
+		bool   grid;
+		bool   snap;
+		bool   snap_to_objects;
+		bool   grid_above_objects;
+		Size   grid_size;
+		Size   snap_size;
+		int    grid_style;
+		enum { GRID_LINES, GRID_POINTS };
+
+		void   Serialize(Stream& stream);
+
+		void   LoadGlobal();
+		void   SaveGlobal();
+	};
+
+	Setup        setup;
+
+private:
+	void         KeyMove(int dx, int dy, bool resize);
+
+	void         OnScroll();
+	void         OnNewObject(const VectorInfo *i);
+	void         OnArgEdit(int i, Ctrl *ctrl);
+	void         OnArgMulti(Button *button, Ctrl *editor);
+	void         PaintGrid(ScalingDraw& scaled);
+
+//	bool         GetNewStyle(int& i1, int& i2);
+//	Rect         ApplyRect(Point pt, Point end, Rect rc) const;
+
+	Point        GetTrackMode(Point pt, Point& nearest) const;
+	Scaling      GetImageScaling() const;
+	Size         ClientOffset() const { return scrollbars.Get() - GAP; }
+
+private:
+	VectorImage  image;
+	VectorMap< int, Index<int> > selection;
+	One<VectorObject> new_object;
+	One<VectorObject> empty_object;
+	enum { IC_IDENT, IC_WIDTH, IC_HEIGHT, IC_IMAGE, IC_COUNT };
+
+	int          editmode;
+	enum { EDIT_TRACK, EDIT_ZOOM, EDIT_PAN };
+	enum { MAXDIST2 = 20 * 20 };
+	Point        trackmode;
+	Point        pan_start;
+	Point        track_start;
+	Image        new_icon;
+
+	Zoom         zoom;
+	Size         pixel_size;
+	ScrollBars   scrollbars;
+	enum { GAP = 5 };
+
+	StaticRect   arg_parent;
+	EditField    tool_coords;
+
+	struct ArgEditor {
+		String        name;
+		int           vtype;
+		int           editor;
+		Value         value;
+		bool          multi;
+		Vector<Point> obj_args;
+	};
+	struct ArgEditCtrl {
+		Label         label;
+		One<Ctrl>     editor;
+	};
+
+	ArrayMap<String, ArgEditor> sel_args;
+	Array<Ctrl>      sel_editors;
+	TimeCallback     tc_sync_editors;
+	TimeCallback     tc_refresh;
+};
+
+class VectorDesHost
+{
+};
+
+class VectorDes : public StaticRect
+{
+	friend class VectorDesigner;
+
+public:
+	typedef VectorDes CLASSNAME;
+	VectorDes(VectorDesHost& host);
+	virtual ~VectorDes();
+
+	virtual bool   Key(dword key, int repcnt);
+	virtual void   ChildGotFocus();
+
+	void           CloseDesigner();
+	void           FrameFocus();
+
+	void           LoadVecFile(CParser& parser);
+	String         SaveVecFile();
+
+	void           LoadSingle(VectorImage img);
+	VectorImage    SaveSingle() const;
+
+	Size           GetImageSize() const { return editor.GetImageSize(); }
+
+	void           EditMenu(Bar& bar);
+
+public:
+	Callback       WhenSyncTitle;
+	Callback       WhenRescan;
+
+private:
+	void           Rescan() { toolbar.Set(THISBACK(EditMenu)); WhenRescan(); }
+	void           KeyScan(int dx, int dy, bool resize);
+
+	void           OnImageListCursor();
+	void           OnImageSize();
+	void           OnUserImageSize();
+
+	void           OnArgLayout();
+	void           OnArgScroll();
+	void           OnUserSelect();
+
+	void           PostObjectCursor();
+	void           OnObjectCursor();
+
+	void           ObjectMenu(Bar& bar);
+	void           ObjectDelete();
+	void           ObjectMoveBack();
+	void           ObjectMoveFront();
+//	void           ObjectProperties();
+
+	void           OnObject();
+
+	struct ConvertObject : Convert
+	{
+		ConvertObject(VectorCtrl& owner) : owner(owner) {}
+		virtual Value Format(const Value& value) const
+		{
+			if(!IsNull(value) && IsNumber(value)) {
+				int i = value;
+				if(i >= 0 && i < owner.GetImage().GetCount())
+					return AsString(owner.GetImage()[i]);
+			}
+			return Null;
+		}
+		VectorCtrl& owner;
+	};
+
+private:
+	VectorDesHost& host;
+//	String         cfgname;
+//	String         filename;
+	bool           single;
+
+	Splitter       splitter;
+	ArrayCtrl      image_list;
+	enum { IC_IDENT, IC_WIDTH, IC_HEIGHT, IC_IMAGE, IC_COUNT };
+	Splitter       vsplitter;
+	ArrayCtrl      object_list;
+	Splitter       asplitter;
+	StaticRect     arg_pane;
+	VScrollBar     arg_scroll;
+	VectorCtrl     editor;
+	ConvertObject  cv_obj_list;
+
+	Array<VectorImage> images;
+
+	EditField      list_ident;
+	EditIntSpin    list_width;
+	EditIntSpin    list_height;
+
+	ToolBar        toolbar;
+
+	TimeCallback   tc_object_cursor;
+};
+
+RichObjectType *RichObjectTypeVectorImage();
+bool            RunVectorImageEditor(VectorImage& image);
+
+#endif
diff --git a/uppsrc/VectorDes/VectorDes.iml b/uppsrc/VectorDes/VectorDes.iml
new file mode 100644
index 000000000..565b2c598
--- /dev/null
+++ b/uppsrc/VectorDes/VectorDes.iml
@@ -0,0 +1,604 @@
+IMAGE_BEGIN(ide_icon)
+	IMAGE_SCAN("�\1\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0Â\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\1\0\0\0�\0\377\0\1\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\1\0\0\0�\0\377\0\1\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\1\0\0\0�\0\377\0\1\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\0\1\0\0\0�\0\377\0\1\0\0\0�\0\377\0\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\0�\0\0\0�\0\377\0�\0\0\0�\0\377\0\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\0�\0\0\0�\0\377\0�\0\0\0�\0\377\0\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\0\377\0\1\0\0\0")
+	IMAGE_SCAN("�\0\0\0")
+	IMAGE_SCAN("")
+	IMAGE_SCAN("")
+	IMAGE_SCAN("�\0\0\0")
+IMAGE_PACKED(ide_icon, "\2\20\0\0\0\20\0\0\0\377\377\377\377\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(line_object)
+	IMAGE_SCAN("�\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0")
+IMAGE_PACKED(line_object, "\2\20\0\0\0\20\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(rect_object)
+	IMAGE_SCAN("")
+	IMAGE_SCAN("�\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("�\0\0\0")
+IMAGE_PACKED(rect_object, "\2\20\0\0\0\20\0\0\0\0\0\0\0\1\0\0\0\0\0\0\0")
+IMAGE_BEGIN(rounded_rect_object)
+	IMAGE_SCAN("")
+	IMAGE_SCAN("Ê\0\0\0")
+	IMAGE_SCAN("��\0\0\0ʂ\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("��\0\0\0ʂ\0\0\0")
+	IMAGE_SCAN("Ê\0\0\0")
+IMAGE_PACKED(rounded_rect_object, "\2\20\0\0\0\20\0\0\0\0\0\0\0\1\0\0\0\0\0\0\0")
+IMAGE_BEGIN(ellipse_object)
+	IMAGE_SCAN("")
+	IMAGE_SCAN("ņ\0\0\0")
+	IMAGE_SCAN("Â\0\0\0Ƃ\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("Â\0\0\0Ƃ\0\0\0")
+	IMAGE_SCAN("ņ\0\0\0")
+IMAGE_PACKED(ellipse_object, "\2\20\0\0\0\20\0\0\0\0\0\0\0\1\0\0\0\0\0\0\0")
+IMAGE_BEGIN(arc_object)
+	IMAGE_SCAN("")
+	IMAGE_SCAN("ņ\0\0\0")
+	IMAGE_SCAN("Â\0\0\0Ƃ\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\1\0\0\0�\1\0\0\0�\1\0\0\0�\1\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("Â\0\0\0")
+	IMAGE_SCAN("Ń\0\0\0")
+IMAGE_PACKED(arc_object, "\2\20\0\0\0\20\0\0\0\0\0\0\0\1\0\0\0\0\0\0\0")
+IMAGE_BEGIN(text_object)
+	IMAGE_SCAN("")
+	IMAGE_SCAN("�\0\0\0��\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0È\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0È\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0Ƃ\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0Ƃ\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0Ƃ\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0Ƃ\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0Ƃ\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0ł\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0ł\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0ł\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0ł\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0ł\0\0\0")
+	IMAGE_SCAN("�\0\0\0��\0\0\0")
+IMAGE_PACKED(text_object, "\2\20\0\0\0\20\0\0\0\1\0\0\0\377\377\377\377\0\0\0\0")
+IMAGE_BEGIN(text_rect_object)
+	IMAGE_SCAN("")
+	IMAGE_SCAN("�\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0Ć\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0Ć\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0Ƃ\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0Ƃ\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0ł\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0ł\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0ł\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0Ă\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0Ă\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0Ă\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("�\0\0\0")
+IMAGE_PACKED(text_rect_object, "\2\20\0\0\0\20\0\0\0\1\0\0\0\377\377\377\377\0\0\0\0")
+IMAGE_BEGIN(edit)
+	IMAGE_SCAN("")
+	IMAGE_SCAN("�\1\0\0\0")
+	IMAGE_SCAN("ł\0\0\0")
+	IMAGE_SCAN("�\3\0\0\0\377\377\377\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377\377\377\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377\377\377\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377\377\377\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377\377\377\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377\377\377�\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377\377\377�\0\0\0")
+	IMAGE_SCAN("�\2\0\0\0\377\377\377�\0\0\0")
+	IMAGE_SCAN("ł\0\0\0‚\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0Â\0\0\0")
+	IMAGE_SCAN("ʂ\0\0\0")
+	IMAGE_SCAN("ʂ\0\0\0")
+IMAGE_PACKED(edit, "\2\20\0\0\0\20\0\0\0\1\0\0\0\377\377\377\377\0\0\0\0")
+IMAGE_BEGIN(move_to_back)
+	IMAGE_SCAN("")
+	IMAGE_SCAN("Ȃ\0\0\0‚\0\0\0")
+	IMAGE_SCAN("Ȃ\0\0\0‚\0\0\0")
+	IMAGE_SCAN("̂\0\0\0")
+	IMAGE_SCAN("�\1\377\0\0‚\0\0\0‚\0\0\0")
+	IMAGE_SCAN("Ă\377\0\0‚\0\0\0‚\0\0\0")
+	IMAGE_SCAN("Ã\377\0\0Ƃ\0\0\0")
+	IMAGE_SCAN("Š\377\0\0�\0\0\0")
+	IMAGE_SCAN("Š\377\0\0�\0\0\0")
+	IMAGE_SCAN("Ã\377\0\0Ƃ\0\0\0")
+	IMAGE_SCAN("Ă\377\0\0‚\0\0\0‚\0\0\0")
+	IMAGE_SCAN("�\1\377\0\0‚\0\0\0‚\0\0\0")
+	IMAGE_SCAN("̂\0\0\0")
+	IMAGE_SCAN("Ȃ\0\0\0‚\0\0\0")
+	IMAGE_SCAN("Ȃ\0\0\0‚\0\0\0")
+IMAGE_PACKED(move_to_back, "\2\20\0\0\0\20\0\0\0\1\0\0\0\377\377\377\377\0\0\0\0")
+IMAGE_BEGIN(move_to_front)
+	IMAGE_SCAN("")
+	IMAGE_SCAN("‚\0\0\0‚\0\0\0")
+	IMAGE_SCAN("‚\0\0\0‚\0\0\0")
+	IMAGE_SCAN("‚\0\0\0")
+	IMAGE_SCAN("‚\0\0\0‚\0\0\0�\1\377\0\0")
+	IMAGE_SCAN("‚\0\0\0‚\0\0\0‚\377\0\0")
+	IMAGE_SCAN("‚\0\0\0ƃ\377\0\0")
+	IMAGE_SCAN("‚\0\0\0�\377\0\0")
+	IMAGE_SCAN("‚\0\0\0�\377\0\0")
+	IMAGE_SCAN("‚\0\0\0ƃ\377\0\0")
+	IMAGE_SCAN("‚\0\0\0‚\0\0\0‚\377\0\0")
+	IMAGE_SCAN("‚\0\0\0‚\0\0\0�\1\377\0\0")
+	IMAGE_SCAN("‚\0\0\0")
+	IMAGE_SCAN("‚\0\0\0‚\0\0\0")
+	IMAGE_SCAN("‚\0\0\0‚\0\0\0")
+IMAGE_PACKED(move_to_front, "\2\20\0\0\0\20\0\0\0\1\0\0\0\377\377\377\377\0\0\0\0")
+IMAGE_BEGIN(edit_setup)
+	IMAGE_SCAN("��\377\377\377")
+	IMAGE_SCAN("\1\377\377\377�\0\0\377\1\0\0\0�\1\0\0\0�\1\0\0\0‚\0\0\0")
+	IMAGE_SCAN("\1\377\377\377�\0\0\377\1\0\0\0ƒ\0\0\0�\1\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("\1\377\377\377�\0\0\377\1\0\0\0�\1\0\0\0�\1\0\0\0�\1\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("��\0\0\0")
+	IMAGE_SCAN("��\377\377\377")
+	IMAGE_SCAN("\1\377\377\377�\377\0\0\1\0\0\0�\1\0\0\0�\1\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("\1\377\377\377�\377\0\0\1\0\0\0�\1\0\0\0�\1\0\0\0�\1\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("\1\377\377\377�\377\0\0\1\0\0\0ƒ\0\0\0��\0\0\0")
+	IMAGE_SCAN("��\0\0\0")
+	IMAGE_SCAN("��\377\377\377")
+	IMAGE_SCAN("\1\377\377\377�\0�\0\1\0\0\0�\1\0\0\0��\0\0\0��\0\0\0")
+	IMAGE_SCAN("\1\377\377\377�\0�\0\1\0\0\0�\1\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("\1\377\377\377�\0�\0\1\0\0\0ƒ\0\0\0��\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("��\0\0\0")
+IMAGE_PACKED(edit_setup, "\2\20\0\0\0\20\0\0\0\1\0\0\0\377\377\377\377\0\0\0\0")
+IMAGE_BEGIN(AlignLeft)
+	IMAGE_SCAN("\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0��\0\0\0�\1\377\0\0")
+	IMAGE_SCAN("\1\0\0\0�\7\0\0\0\377\377\377���\377\377\377���\377\377\377\0\0\0‚\377\0\0")
+	IMAGE_SCAN("\1\0\0\0�\7\0\0\0���\377\377\377���\377\377\377���\0\0\0��\377\0\0")
+	IMAGE_SCAN("\1\0\0\0�\7\0\0\0\377\377\377���\377\377\377���\377\377\377\0\0\0‚\377\0\0")
+	IMAGE_SCAN("\1\0\0\0��\0\0\0�\1\377\0\0")
+	IMAGE_SCAN("\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0ƒ\0\0\0�\1\377\0\0")
+	IMAGE_SCAN("\1\0\0\0�\5\0\0\0\377\377\377���\377\377\377\0\0\0‚\377\0\0")
+	IMAGE_SCAN("\1\0\0\0�\5\0\0\0���\377\377\377���\0\0\0��\377\0\0")
+	IMAGE_SCAN("\1\0\0\0�\5\0\0\0\377\377\377���\377\377\377\0\0\0‚\377\0\0")
+	IMAGE_SCAN("\1\0\0\0ƒ\0\0\0�\1\377\0\0")
+	IMAGE_SCAN("\1\0\0\0")
+IMAGE_PACKED(AlignLeft, "\2\20\0\0\0\20\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(AlignRight)
+	IMAGE_SCAN("�\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0")
+	IMAGE_SCAN("�\1\377\0\0Ç\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("‚\377\0\0�\7\0\0\0\377\377\377���\377\377\377���\377\377\377\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("�\377\0\0�\7\0\0\0���\377\377\377���\377\377\377���\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("‚\377\0\0�\7\0\0\0\377\377\377���\377\377\377���\377\377\377\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("�\1\377\0\0Ç\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0")
+	IMAGE_SCAN("�\1\377\0\0ă\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("Ă\377\0\0�\5\0\0\0\377\377\377���\377\377\377\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("�\377\0\0�\5\0\0\0���\377\377\377���\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("Ă\377\0\0�\5\0\0\0\377\377\377���\377\377\377\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("�\1\377\0\0ă\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0")
+IMAGE_PACKED(AlignRight, "\2\20\0\0\0\20\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(AlignTop)
+	IMAGE_SCAN("�\0\0\0")
+	IMAGE_SCAN("")
+	IMAGE_SCAN("ƒ\0\0\0‡\0\0\0")
+	IMAGE_SCAN("�\5\0\0\0\377\377\377���\377\377\377\0\0\0�\7\0\0\0\377\377\377���\377\377\377���\377\377\377\0\0\0")
+	IMAGE_SCAN("�\5\0\0\0���\377\377\377���\0\0\0�\7\0\0\0���\377\377\377���\377\377\377���\0\0\0")
+	IMAGE_SCAN("�\5\0\0\0\377\377\377���\377\377\377\0\0\0�\7\0\0\0\377\377\377���\377\377\377���\377\377\377\0\0\0")
+	IMAGE_SCAN("ƒ\0\0\0‡\0\0\0")
+	IMAGE_SCAN("")
+	IMAGE_SCAN("�\1\377\0\0�\1\377\0\0")
+	IMAGE_SCAN("ƒ\377\0\0ă\377\0\0")
+	IMAGE_SCAN("��\377\0\0…\377\0\0")
+	IMAGE_SCAN("�\1\377\0\0�\1\377\0\0")
+	IMAGE_SCAN("�\1\377\0\0�\1\377\0\0")
+	IMAGE_SCAN("�\1\377\0\0�\1\377\0\0")
+	IMAGE_SCAN("�\1\377\0\0�\1\377\0\0")
+IMAGE_PACKED(AlignTop, "\2\20\0\0\0\20\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(AlignBottom)
+	IMAGE_SCAN("�\1\377\0\0�\1\377\0\0")
+	IMAGE_SCAN("�\1\377\0\0�\1\377\0\0")
+	IMAGE_SCAN("�\1\377\0\0�\1\377\0\0")
+	IMAGE_SCAN("�\1\377\0\0�\1\377\0\0")
+	IMAGE_SCAN("��\377\0\0Å\377\0\0")
+	IMAGE_SCAN("ƒ\377\0\0Ń\377\0\0")
+	IMAGE_SCAN("�\1\377\0\0�\1\377\0\0")
+	IMAGE_SCAN("")
+	IMAGE_SCAN("ƒ\0\0\0Ç\0\0\0")
+	IMAGE_SCAN("�\5\0\0\0\377\377\377���\377\377\377\0\0\0�\7\0\0\0\377\377\377���\377\377\377���\377\377\377\0\0\0")
+	IMAGE_SCAN("�\5\0\0\0���\377\377\377���\0\0\0�\7\0\0\0���\377\377\377���\377\377\377���\0\0\0")
+	IMAGE_SCAN("�\5\0\0\0\377\377\377���\377\377\377\0\0\0�\7\0\0\0\377\377\377���\377\377\377���\377\377\377\0\0\0")
+	IMAGE_SCAN("ƒ\0\0\0Ç\0\0\0")
+	IMAGE_SCAN("")
+	IMAGE_SCAN("�\0\0\0")
+IMAGE_PACKED(AlignBottom, "\2\20\0\0\0\20\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(VertCenter)
+	IMAGE_SCAN("�\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\1\377\0\0�\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0Ņ\377\0\0�\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0ƃ\377\0\0�\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\1\377\0\0�\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0Š\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\12\0\0\0\377\377\377���\377\377\377���\377\377\377���\377\377\377���\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\12\0\0\0���\377\377\377���\377\377\377���\377\377\377���\377\377\377\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0Š\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\1\377\0\0�\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0ƃ\377\0\0�\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0Ņ\377\0\0�\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\1\377\0\0�\1\0\0\0")
+	IMAGE_SCAN("�\0\0\0")
+IMAGE_PACKED(VertCenter, "\2\20\0\0\0\20\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(HorzCenter)
+	IMAGE_SCAN("�\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0ń\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\4\0\0\0\377\377\377���\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\4\0\0\0���\377\377\377\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\1\377\0\0�\4\0\0\0\377\377\377���\0\0\0�\1\377\0\0�\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0‚\377\0\0�\4\0\0\0���\377\377\377\0\0\0��\377\0\0�\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\377\0\0\4\0\0\0\377\377\377���\0\0\0�\377\0\0\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0‚\377\0\0�\4\0\0\0���\377\377\377\0\0\0��\377\0\0�\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\1\377\0\0�\4\0\0\0\377\377\377���\0\0\0�\1\377\0\0�\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\4\0\0\0���\377\377\377\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0ń\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("�\0\0\0")
+IMAGE_PACKED(HorzCenter, "\2\20\0\0\0\20\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(SameWidth)
+	IMAGE_SCAN("")
+	IMAGE_SCAN("")
+	IMAGE_SCAN("")
+	IMAGE_SCAN("�\0\0\0")
+	IMAGE_SCAN("\17\0\0\0\377\377\377���\377\377\377���\377\377\377���\377\377\377���\377\377\377���\377\377\377���\377\377\377\0\0\0")
+	IMAGE_SCAN("\17\0\0\0���\377\377\377\377\0\0\377\377\377���\377\377\377���\377\377\377���\377\377\377\377\0\0\377\377\377���\0\0\0")
+	IMAGE_SCAN("\2\0\0\0\377\377\377�\377\0\0\7���\377\377\377���\377\377\377���\377\377\377����\377\0\0\2\377\377\377\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\377\0\0\1\0\0\0")
+	IMAGE_SCAN("\2\0\0\0\377\377\377�\377\0\0\7���\377\377\377���\377\377\377���\377\377\377����\377\0\0\2\377\377\377\0\0\0")
+	IMAGE_SCAN("\17\0\0\0���\377\377\377\377\0\0\377\377\377���\377\377\377���\377\377\377���\377\377\377\377\0\0\377\377\377���\0\0\0")
+	IMAGE_SCAN("\17\0\0\0\377\377\377���\377\377\377���\377\377\377���\377\377\377���\377\377\377���\377\377\377���\377\377\377\0\0\0")
+	IMAGE_SCAN("�\0\0\0")
+IMAGE_PACKED(SameWidth, "\2\20\0\0\0\20\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(SameHeight)
+	IMAGE_SCAN("")
+	IMAGE_SCAN("É\0\0\0")
+	IMAGE_SCAN("�\11\0\0\0\377\377\377���\377\377\377\377\0\0\377\377\377���\377\377\377\0\0\0")
+	IMAGE_SCAN("�\3\0\0\0���\377\377\377�\377\0\0\3\377\377\377���\0\0\0")
+	IMAGE_SCAN("�\2\0\0\0\377\377\377�\377\0\0\2\377\377\377\0\0\0")
+	IMAGE_SCAN("�\11\0\0\0���\377\377\377���\377\0\0���\377\377\377���\0\0\0")
+	IMAGE_SCAN("�\11\0\0\0\377\377\377���\377\377\377\377\0\0\377\377\377���\377\377\377\0\0\0")
+	IMAGE_SCAN("�\11\0\0\0���\377\377\377���\377\0\0���\377\377\377���\0\0\0")
+	IMAGE_SCAN("�\11\0\0\0\377\377\377���\377\377\377\377\0\0\377\377\377���\377\377\377\0\0\0")
+	IMAGE_SCAN("�\11\0\0\0���\377\377\377���\377\0\0���\377\377\377���\0\0\0")
+	IMAGE_SCAN("�\2\0\0\0\377\377\377�\377\0\0\2\377\377\377\0\0\0")
+	IMAGE_SCAN("�\3\0\0\0���\377\377\377�\377\0\0\3\377\377\377���\0\0\0")
+	IMAGE_SCAN("�\11\0\0\0\377\377\377���\377\377\377\377\0\0\377\377\377���\377\377\377\0\0\0")
+	IMAGE_SCAN("É\0\0\0")
+IMAGE_PACKED(SameHeight, "\2\20\0\0\0\20\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(SameSize)
+	IMAGE_SCAN("")
+	IMAGE_SCAN("�\0\0\0")
+	IMAGE_SCAN("\17\0\0\0\377\377\377���\377\377\377���\377\377\377���\377\0\0���\377\377\377���\377\377\377���\377\377\377\0\0\0")
+	IMAGE_SCAN("\6\0\0\0���\377\377\377���\377\377\377����\377\0\0\6���\377\377\377���\377\377\377���\0\0\0")
+	IMAGE_SCAN("\5\0\0\0\377\377\377���\377\377\377����\377\0\0\5���\377\377\377���\377\377\377\0\0\0")
+	IMAGE_SCAN("\17\0\0\0���\377\377\377\377\0\0\377\377\377���\377\377\377\377\0\0\377\377\377���\377\377\377\377\0\0\377\377\377���\0\0\0")
+	IMAGE_SCAN("\2\0\0\0\377\377\377�\377\0\0\7���\377\377\377���\377\0\0���\377\377\377����\377\0\0\2\377\377\377\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\377\0\0\1\0\0\0")
+	IMAGE_SCAN("\2\0\0\0\377\377\377�\377\0\0\7���\377\377\377���\377\0\0���\377\377\377����\377\0\0\2\377\377\377\0\0\0")
+	IMAGE_SCAN("\17\0\0\0���\377\377\377\377\0\0\377\377\377���\377\377\377\377\0\0\377\377\377���\377\377\377\377\0\0\377\377\377���\0\0\0")
+	IMAGE_SCAN("\5\0\0\0\377\377\377���\377\377\377����\377\0\0\5���\377\377\377���\377\377\377\0\0\0")
+	IMAGE_SCAN("\6\0\0\0���\377\377\377���\377\377\377����\377\0\0\6���\377\377\377���\377\377\377���\0\0\0")
+	IMAGE_SCAN("\17\0\0\0\377\377\377���\377\377\377���\377\377\377���\377\0\0���\377\377\377���\377\377\377���\377\377\377\0\0\0")
+	IMAGE_SCAN("�\0\0\0")
+IMAGE_PACKED(SameSize, "\2\20\0\0\0\20\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(Grid)
+	IMAGE_SCAN("")
+	IMAGE_SCAN("\1\0\0\0�\1\0\0\0�\1\0\0\0�\1\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("")
+	IMAGE_SCAN("")
+	IMAGE_SCAN("\1\0\0\0�\1\0\0\0�\1\0\0\0�\1\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("")
+	IMAGE_SCAN("")
+	IMAGE_SCAN("\1\0\0\0�\1\0\0\0�\1\0\0\0�\1\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("")
+	IMAGE_SCAN("")
+	IMAGE_SCAN("\1\0\0\0�\1\0\0\0�\1\0\0\0�\1\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("")
+	IMAGE_SCAN("")
+	IMAGE_SCAN("\1\0\0\0�\1\0\0\0�\1\0\0\0�\1\0\0\0�\1\0\0\0")
+IMAGE_PACKED(Grid, "\2\20\0\0\0\20\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(AlignHCenter)
+	IMAGE_SCAN("�\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0")
+	IMAGE_SCAN("�\1\377\0\0‡\0\0\0�\1\377\0\0")
+	IMAGE_SCAN("��\377\0\0�\7\0\0\0\377\377\377���\0\0\0���\377\377\377\0\0\0��\377\0\0")
+	IMAGE_SCAN("�\377\0\0\7\0\0\0���\377\377\377\0\0\0\377\377\377���\0\0\0�\377\0\0")
+	IMAGE_SCAN("��\377\0\0�\7\0\0\0\377\377\377���\0\0\0���\377\377\377\0\0\0��\377\0\0")
+	IMAGE_SCAN("�\1\377\0\0‡\0\0\0�\1\377\0\0")
+	IMAGE_SCAN("�\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0")
+	IMAGE_SCAN("�\1\377\0\0Ã\0\0\0�\1\377\0\0")
+	IMAGE_SCAN("‚\377\0\0�\5\0\0\0\377\377\377\0\0\0\377\377\377\0\0\0��\377\0\0")
+	IMAGE_SCAN("�\377\0\0\5\0\0\0���\0\0\0���\0\0\0�\377\0\0")
+	IMAGE_SCAN("‚\377\0\0�\5\0\0\0\377\377\377\0\0\0\377\377\377\0\0\0��\377\0\0")
+	IMAGE_SCAN("�\1\377\0\0Ã\0\0\0�\1\377\0\0")
+	IMAGE_SCAN("�\1\0\0\0")
+IMAGE_PACKED(AlignHCenter, "\2\20\0\0\0\20\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(AlignVCenter)
+	IMAGE_SCAN("�\1\377\0\0�\1\377\0\0")
+	IMAGE_SCAN("�\1\377\0\0ą\377\0\0")
+	IMAGE_SCAN("…\377\0\0Ã\377\0\0")
+	IMAGE_SCAN("Ã\377\0\0�\1\377\0\0")
+	IMAGE_SCAN("�\1\377\0\0ą\0\0\0")
+	IMAGE_SCAN("Ã\0\0\0�\5\0\0\0\377\377\377���\377\377\377\0\0\0")
+	IMAGE_SCAN("�\5\0\0\0\377\377\377���\377\377\377\0\0\0�\5\0\0\0���\377\377\377���\0\0\0")
+	IMAGE_SCAN("��\0\0\0")
+	IMAGE_SCAN("�\5\0\0\0\377\377\377���\377\377\377\0\0\0�\5\0\0\0���\377\377\377���\0\0\0")
+	IMAGE_SCAN("Ã\0\0\0�\5\0\0\0\377\377\377���\377\377\377\0\0\0")
+	IMAGE_SCAN("�\1\377\0\0ą\0\0\0")
+	IMAGE_SCAN("Ã\377\0\0�\1\377\0\0")
+	IMAGE_SCAN("…\377\0\0Ã\377\0\0")
+	IMAGE_SCAN("�\1\377\0\0ą\377\0\0")
+	IMAGE_SCAN("�\1\377\0\0�\1\377\0\0")
+IMAGE_PACKED(AlignVCenter, "\2\20\0\0\0\20\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(SizeAll)
+	IMAGE_SCAN("�\377\377\377Æ\377\377\377")
+	IMAGE_SCAN("\1\377\377\377�\0\0\0\1\377\377\377�\1\377\377\377�\0\0\0\1\377\377\377")
+	IMAGE_SCAN("\1\377\377\377�\0\0\0\1\377\377\377�\1\377\377\377�\0\0\0\1\377\377\377")
+	IMAGE_SCAN("\5\377\377\377\0\0\0\377\377\377\0\0\0\377\377\377�\5\377\377\377\0\0\0\377\377\377\0\0\0\377\377\377")
+	IMAGE_SCAN("�\377\377\377�\3\377\377\377\0\0\0\377\377\377�\3\377\377\377\0\0\0\377\377\377��\377\377\377")
+	IMAGE_SCAN("\1\377\377\377�\3\377\377\377\0\0\0\377\377\377�\3\377\377\377\0\0\0\377\377\377�\1\377\377\377")
+	IMAGE_SCAN("�\5\377\377\377\0\0\0\377\377\377\0\0\0\377\377\377")
+	IMAGE_SCAN("�\3\377\377\377\0\0\0\377\377\377")
+	IMAGE_SCAN("�\5\377\377\377\0\0\0\377\377\377\0\0\0\377\377\377")
+	IMAGE_SCAN("\1\377\377\377�\3\377\377\377\0\0\0\377\377\377�\3\377\377\377\0\0\0\377\377\377�\1\377\377\377")
+	IMAGE_SCAN("�\377\377\377�\3\377\377\377\0\0\0\377\377\377�\3\377\377\377\0\0\0\377\377\377��\377\377\377")
+	IMAGE_SCAN("\5\377\377\377\0\0\0\377\377\377\0\0\0\377\377\377�\5\377\377\377\0\0\0\377\377\377\0\0\0\377\377\377")
+	IMAGE_SCAN("\1\377\377\377�\0\0\0\1\377\377\377�\1\377\377\377�\0\0\0\1\377\377\377")
+	IMAGE_SCAN("\1\377\377\377�\0\0\0\1\377\377\377�\1\377\377\377�\0\0\0\1\377\377\377")
+	IMAGE_SCAN("�\377\377\377Æ\377\377\377")
+IMAGE_PACKED(SizeAll, "\2\20\0\0\0\20\0\0\0\7\0\0\0\7\0\0\0\0\0\0\0")
+IMAGE_BEGIN(track_point_tmp)
+	IMAGE_SCAN("�\377\377\377Æ\377\377\377")
+	IMAGE_SCAN("\1\377\377\377�\0\0\0\1\377\377\377�\1\377\377\377�\0\0\0\1\377\377\377")
+	IMAGE_SCAN("\1\377\377\377�\0\0\0\1\377\377\377�\1\377\377\377�\1\377\377\377�\1\377\377\377�\0\0\0\1\377\377\377")
+	IMAGE_SCAN("\4\377\377\377\0\0\0\377\377\377\0\0\0�\377\377\377\3\0\0\0\377\377\377\0\0\0�\377\377\377\4\0\0\0\377\377\377\0\0\0\377\377\377")
+	IMAGE_SCAN("�\377\377\377�\3\377\377\377\0\0\0\377\377\377�\3\377\377\377\0\0\0\377\377\377��\377\377\377")
+	IMAGE_SCAN("\1\377\377\377‚\377\377\377\2\0\0\0\377\377\377�\2\377\377\377\0\0\0�\377\377\377�\1\377\377\377")
+	IMAGE_SCAN("�\2\377\377\377\0\0\0�\5\377\377\377\0\0\0\377\377\377\0\0\0\377\377\377�\2\0\0\0\377\377\377")
+	IMAGE_SCAN("�\1\377\377\377�\3\377\377\377\0\0\0\377\377\377�\1\377\377\377")
+	IMAGE_SCAN("�\2\377\377\377\0\0\0�\5\377\377\377\0\0\0\377\377\377\0\0\0\377\377\377�\2\0\0\0\377\377\377")
+	IMAGE_SCAN("\1\377\377\377‚\377\377\377\2\0\0\0\377\377\377�\2\377\377\377\0\0\0�\377\377\377�\1\377\377\377")
+	IMAGE_SCAN("�\377\377\377�\3\377\377\377\0\0\0\377\377\377�\3\377\377\377\0\0\0\377\377\377��\377\377\377")
+	IMAGE_SCAN("\4\377\377\377\0\0\0\377\377\377\0\0\0�\377\377\377\3\0\0\0\377\377\377\0\0\0�\377\377\377\4\0\0\0\377\377\377\0\0\0\377\377\377")
+	IMAGE_SCAN("\1\377\377\377�\0\0\0\1\377\377\377�\1\377\377\377�\1\377\377\377�\1\377\377\377�\0\0\0\1\377\377\377")
+	IMAGE_SCAN("\1\377\377\377�\0\0\0\1\377\377\377�\1\377\377\377�\0\0\0\1\377\377\377")
+	IMAGE_SCAN("�\377\377\377Æ\377\377\377")
+IMAGE_PACKED(track_point_tmp, "\2\20\0\0\0\20\0\0\0\7\0\0\0\7\0\0\0\0\0\0\0")
+IMAGE_BEGIN(track_rect)
+	IMAGE_SCAN("�\1\377\377\377")
+	IMAGE_SCAN("�\3\377\377\377\0\0\0\377\377\377")
+	IMAGE_SCAN("�\1\377\377\377�\0\0\0\1\377\377\377")
+	IMAGE_SCAN("�\1\377\377\377�\0\0\0\1\377\377\377")
+	IMAGE_SCAN("ǂ\377\377\377\1\0\0\0�\377\377\377")
+	IMAGE_SCAN("�\1\377\377\377")
+	IMAGE_SCAN("�\1\377\377\377�\3\377\377\377\0\0\0\377\377\377�\1\377\377\377")
+	IMAGE_SCAN("�\3\377\377\377\0\0\0\377\377\377�\1\377\377\377�\3\377\377\377\0\0\0\377\377\377")
+	IMAGE_SCAN("�\1\377\377\377�\0\0\0\1\377\377\377�\1\377\377\377�\3\377\377\377\0\0\0\377\377\377�\1\377\377\377�\1\377\377\377�\0\0\0\1\377\377\377")
+	IMAGE_SCAN("\1\377\377\377�\0\0\0\11\377\377\377\0\0\0\377\377\377\0\0\0\377\377\377\0\0\0\377\377\377\0\0\0\377\377\377�\0\0\0\1\377\377\377")
+	IMAGE_SCAN("�\1\377\377\377�\0\0\0\1\377\377\377�\1\377\377\377�\3\377\377\377\0\0\0\377\377\377�\1\377\377\377�\1\377\377\377�\0\0\0\1\377\377\377")
+	IMAGE_SCAN("�\3\377\377\377\0\0\0\377\377\377�\1\377\377\377�\3\377\377\377\0\0\0\377\377\377")
+	IMAGE_SCAN("�\1\377\377\377�\3\377\377\377\0\0\0\377\377\377�\1\377\377\377")
+	IMAGE_SCAN("�\1\377\377\377")
+	IMAGE_SCAN("ǂ\377\377\377\1\0\0\0�\377\377\377")
+	IMAGE_SCAN("�\1\377\377\377�\0\0\0\1\377\377\377")
+	IMAGE_SCAN("�\1\377\377\377�\0\0\0\1\377\377\377")
+	IMAGE_SCAN("�\3\377\377\377\0\0\0\377\377\377")
+	IMAGE_SCAN("�\1\377\377\377")
+IMAGE_PACKED(track_rect, "\2\23\0\0\0\23\0\0\0\10\0\0\0\10\0\0\0\0\0\0\0")
+IMAGE_BEGIN(track_point)
+	IMAGE_SCAN("�\1\377\377\377")
+	IMAGE_SCAN("�\3\377\377\377\0\0\0\377\377\377")
+	IMAGE_SCAN("�\1\377\377\377�\0\0\0\1\377\377\377")
+	IMAGE_SCAN("�\1\377\377\377�\0\0\0\1\377\377\377")
+	IMAGE_SCAN("ǂ\377\377\377\1\0\0\0�\377\377\377")
+	IMAGE_SCAN("�\1\377\377\377�\1\377\377\377�\1\377\377\377")
+	IMAGE_SCAN("�\1\377\377\377�\7\377\377\377\0\0\0\377\377\377\0\0\0\377\377\377\0\0\0\377\377\377�\1\377\377\377")
+	IMAGE_SCAN("�\2\377\377\377\0\0\0�\377\377\377\1\0\0\0�\1\377\377\377�\1\0\0\0�\377\377\377\2\0\0\0\377\377\377")
+	IMAGE_SCAN("�\1\377\377\377�\0\0\0\1\377\377\377�\1\377\377\377�\1\0\0\0�\1\377\377\377�\1\377\377\377�\0\0\0\1\377\377\377")
+	IMAGE_SCAN("\1\377\377\377�\0\0\0\11\377\377\377\0\0\0\377\377\377\0\0\0\377\377\377\0\0\0\377\377\377\0\0\0\377\377\377�\0\0\0\1\377\377\377")
+	IMAGE_SCAN("�\1\377\377\377�\0\0\0\1\377\377\377�\1\377\377\377�\1\0\0\0�\1\377\377\377�\1\377\377\377�\0\0\0\1\377\377\377")
+	IMAGE_SCAN("�\2\377\377\377\0\0\0�\377\377\377\1\0\0\0�\1\377\377\377�\1\0\0\0�\377\377\377\2\0\0\0\377\377\377")
+	IMAGE_SCAN("�\1\377\377\377�\7\377\377\377\0\0\0\377\377\377\0\0\0\377\377\377\0\0\0\377\377\377�\1\377\377\377")
+	IMAGE_SCAN("�\1\377\377\377�\1\377\377\377�\1\377\377\377")
+	IMAGE_SCAN("ǂ\377\377\377\1\0\0\0�\377\377\377")
+	IMAGE_SCAN("�\1\377\377\377�\0\0\0\1\377\377\377")
+	IMAGE_SCAN("�\1\377\377\377�\0\0\0\1\377\377\377")
+	IMAGE_SCAN("�\3\377\377\377\0\0\0\377\377\377")
+	IMAGE_SCAN("�\1\377\377\377")
+IMAGE_PACKED(track_point, "\2\23\0\0\0\23\0\0\0\7\0\0\0\7\0\0\0\0\0\0\0")
+IMAGE_BEGIN(view_zoom_in)
+	IMAGE_SCAN("")
+	IMAGE_SCAN("Ń\377\377\377")
+	IMAGE_SCAN("Â\377\377\377�\0\0\0�\377\377\377")
+	IMAGE_SCAN("�\1\377\377\377�\0\0\0�\3\0\0\0\377\377\377\0\0\0")
+	IMAGE_SCAN("�\2\377\377\377\0\0\0�\1\0\0\0�\2\377\377\377\0\0\0")
+	IMAGE_SCAN("�\2\377\377\377\0\0\0�\1\0\0\0�\2\377\377\377\0\0\0")
+	IMAGE_SCAN("�\2\377\377\377\0\0\0��\0\0\0�\2\377\377\377\0\0\0")
+	IMAGE_SCAN("�\2\377\377\377\0\0\0�\1\0\0\0�\2\377\377\377\0\0\0")
+	IMAGE_SCAN("�\2\377\377\377\0\0\0�\1\0\0\0�\2\377\377\377\0\0\0")
+	IMAGE_SCAN("ƒ\377\377\377Â\377\377\377\1\0\0\0")
+	IMAGE_SCAN("Â\0\0\0�\377\377\377�\0\0\0")
+	IMAGE_SCAN("Ń\0\0\0ƒ\0\0\0")
+	IMAGE_SCAN("˂\0\0\0")
+IMAGE_PACKED(view_zoom_in, "\2\16\0\0\0\16\0\0\0\6\0\0\0\6\0\0\0\0\0\0\0")
+IMAGE_BEGIN(view_zoom_out)
+	IMAGE_SCAN("")
+	IMAGE_SCAN("Ń\377\377\377")
+	IMAGE_SCAN("Â\377\377\377�\0\0\0�\377\377\377")
+	IMAGE_SCAN("�\1\377\377\377�\0\0\0�\3\0\0\0\377\377\377\0\0\0")
+	IMAGE_SCAN("�\2\377\377\377\0\0\0�\2\377\377\377\0\0\0")
+	IMAGE_SCAN("�\2\377\377\377\0\0\0�\2\377\377\377\0\0\0")
+	IMAGE_SCAN("�\2\377\377\377\0\0\0��\0\0\0�\2\377\377\377\0\0\0")
+	IMAGE_SCAN("�\2\377\377\377\0\0\0�\2\377\377\377\0\0\0")
+	IMAGE_SCAN("�\2\377\377\377\0\0\0�\2\377\377\377\0\0\0")
+	IMAGE_SCAN("ƒ\377\377\377Â\377\377\377\1\0\0\0")
+	IMAGE_SCAN("Â\0\0\0�\377\377\377�\0\0\0")
+	IMAGE_SCAN("Ń\0\0\0ƒ\0\0\0")
+	IMAGE_SCAN("˂\0\0\0")
+IMAGE_PACKED(view_zoom_out, "\2\16\0\0\0\16\0\0\0\6\0\0\0\6\0\0\0\0\0\0\0")
+IMAGE_BEGIN(view_zoom_area)
+	IMAGE_SCAN("�\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0ǃ\0\0\0")
+	IMAGE_SCAN("\1\0\0\0ł\0\0\0Â\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\1\0\0\0�\1\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\1\0\0\0�\1\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("�\0\0\0�\1\0\0\0��\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\1\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\1\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("Ƃ\0\0\0Ã\0\0\0")
+	IMAGE_SCAN("ȃ\0\0\0��\0\0\0")
+IMAGE_PACKED(view_zoom_area, "\2\16\0\0\0\16\0\0\0\10\0\0\0\10\0\0\0\0\0\0\0")
+IMAGE_BEGIN(view_zoom_full)
+	IMAGE_SCAN("�\1\377\0\0")
+	IMAGE_SCAN("Ń\377\0\0")
+	IMAGE_SCAN("ą\377\0\0")
+	IMAGE_SCAN("�\1\377\0\0")
+	IMAGE_SCAN("�\1\377\0\0�\1\377\0\0�\1\377\0\0")
+	IMAGE_SCAN("��\377\0\0ǂ\377\0\0")
+	IMAGE_SCAN("�\377\0\0Å\377\0\0")
+	IMAGE_SCAN("��\377\0\0ǂ\377\0\0")
+	IMAGE_SCAN("�\1\377\0\0�\1\377\0\0�\1\377\0\0")
+	IMAGE_SCAN("�\1\377\0\0")
+	IMAGE_SCAN("ą\377\0\0")
+	IMAGE_SCAN("Ń\377\0\0")
+	IMAGE_SCAN("�\1\377\0\0")
+IMAGE_PACKED(view_zoom_full, "\2\15\0\0\0\15\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(view_pan)
+	IMAGE_SCAN("Ȃ\377\377\377")
+	IMAGE_SCAN("Ń\377\377\377�\0\0\0\1\377\377\377")
+	IMAGE_SCAN("�\1\377\377\377�\0\0\0�\377\377\377\1\0\0\0�\377\377\377")
+	IMAGE_SCAN("�\2\377\377\377\0\0\0�\377\377\377\1\0\0\0�\377\377\377�\0\0\0\1\377\377\377")
+	IMAGE_SCAN("�\2\377\377\377\0\0\0�\377\377\377\1\0\0\0�\377\377\377\1\0\0\0�\377\377\377\2\0\0\0\377\377\377")
+	IMAGE_SCAN("‚\377\377\377\1\0\0\0�\377\377\377\1\0\0\0�\377\377\377\1\0\0\0�\377\377\377\2\0\0\0\377\377\377")
+	IMAGE_SCAN("�\1\377\377\377�\0\0\0�\377\377\377\1\0\0\0�\377\377\377\1\0\0\0�\377\377\377\2\0\0\0\377\377\377")
+	IMAGE_SCAN("\2\377\377\377\0\0\0�\377\377\377\1\0\0\0�\377\377\377\1\0\0\0�\377\377\377\1\0\0\0�\377\377\377\2\0\0\0\377\377\377")
+	IMAGE_SCAN("\2\377\377\377\0\0\0�\377\377\377\1\0\0\0�\377\377\377\1\0\0\0�\377\377\377\1\0\0\0�\377\377\377\2\0\0\0\377\377\377")
+	IMAGE_SCAN("\2\377\377\377\0\0\0�\377\377\377\2\0\0\0\377\377\377�\1\377\377\377�\1\377\377\377�\3\377\377\377\0\0\0\377\377\377")
+	IMAGE_SCAN("\3\377\377\377\0\0\0\377\377\377�\1\377\377\377�\3\377\377\377\0\0\0\377\377\377")
+	IMAGE_SCAN("\3\377\377\377\0\0\0\377\377\377�\3\377\377\377\0\0\0\377\377\377")
+	IMAGE_SCAN("\3\377\377\377\0\0\0\377\377\377�\3\377\377\377\0\0\0\377\377\377")
+	IMAGE_SCAN("\3\377\377\377\0\0\0\377\377\377�\3\377\377\377\0\0\0\377\377\377")
+	IMAGE_SCAN("�\3\377\377\377\0\0\0\377\377\377�\3\377\377\377\0\0\0\377\377\377")
+	IMAGE_SCAN("�\3\377\377\377\0\0\0\377\377\377�\3\377\377\377\0\0\0\377\377\377")
+IMAGE_PACKED(view_pan, "\2\20\0\0\0\20\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(line_insert_cursor)
+	IMAGE_SCAN("Å\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\1\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\1\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\1\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0��\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0Ă\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\3\0\0\0\377\377\377\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\1\0\0\0�\377\377\377�\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\1\0\0\0�\377\377\377\1\0\0\0")
+	IMAGE_SCAN("Ã\0\0\0�\377\377\377\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377\377\377\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377\377\377\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377\377\377\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377\377\377\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377\377\377�\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377\377\377�\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377\377\377\1\0\0\0�\377\377\377\1\0\0\0")
+	IMAGE_SCAN("�\2\0\0\0\377\377\377�\0\0\0�\377\377\377\1\0\0\0")
+	IMAGE_SCAN("ł\0\0\0�\1\0\0\0�\377\377\377\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377\377\377\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377\377\377\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377\377\377\1\0\0\0")
+	IMAGE_SCAN("˃\0\0\0")
+IMAGE_PACKED(line_insert_cursor, "\2\20\0\0\0\30\0\0\0\5\0\0\0\5\0\0\0\0\0\0\0")
+IMAGE_BEGIN(line_remove_cursor)
+	IMAGE_SCAN("")
+	IMAGE_SCAN("")
+	IMAGE_SCAN("��\0\0\377ł\0\0\377")
+	IMAGE_SCAN("‚\0\0\377Â\0\0\377")
+	IMAGE_SCAN("Â\0\0\377��\0\0\377")
+	IMAGE_SCAN("�\3\0\0\377\0\0\0\0\0\377")
+	IMAGE_SCAN("Â\0\0\377�\0\0\0\1\0\0\377")
+	IMAGE_SCAN("‚\0\0\377�\4\0\0\0\377\377\377\0\0\0\0\0\377")
+	IMAGE_SCAN("��\0\0\377�\1\0\0\0�\377\377\377\2\0\0\0\0\0\377")
+	IMAGE_SCAN("�\1\0\0\0�\377\377\377\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377\377\377\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377\377\377\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377\377\377\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377\377\377\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377\377\377\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377\377\377�\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377\377\377�\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377\377\377\1\0\0\0�\377\377\377\1\0\0\0")
+	IMAGE_SCAN("�\2\0\0\0\377\377\377�\0\0\0�\377\377\377\1\0\0\0")
+	IMAGE_SCAN("ł\0\0\0�\1\0\0\0�\377\377\377\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377\377\377\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377\377\377\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377\377\377\1\0\0\0")
+	IMAGE_SCAN("˃\0\0\0")
+IMAGE_PACKED(line_remove_cursor, "\2\20\0\0\0\30\0\0\0\5\0\0\0\5\0\0\0\0\0\0\0")
diff --git a/uppsrc/VectorDes/VectorDes.lay b/uppsrc/VectorDes/VectorDes.lay
new file mode 100644
index 000000000..422719a43
--- /dev/null
+++ b/uppsrc/VectorDes/VectorDes.lay
@@ -0,0 +1,28 @@
+#ifdef LAYOUTFILE
+
+LAYOUT(VectorDesSetupLayout, 180, 144)
+	ITEM(Option, grid, SetLabel(t_("Grid:")).LeftPosZ(4, 48).TopPosZ(4, 19))
+	ITEM(EditIntSpin, grid_cx, Min(1).Max(100).NotNull(true).LeftPosZ(54, 50).TopPosZ(4, 19))
+	ITEM(Label, dv___2, SetLabel(t_("x")).LeftPosZ(110, 12).TopPosZ(2, 19))
+	ITEM(EditIntSpin, grid_cy, Min(1).Max(100).NotNull(true).LeftPosZ(126, 50).TopPosZ(4, 19))
+	ITEM(Switch, grid_style, SetLabel(t_("lines\npoints")).LeftPosZ(54, 96).TopPosZ(26, 16))
+	ITEM(Option, grid_above_objects, SetLabel(t_("Grid above objects")).LeftPosZ(54, 122).TopPosZ(44, 15))
+	ITEM(Option, snap, SetLabel(t_("&Snap:")).LeftPosZ(4, 48).TopPosZ(68, 19))
+	ITEM(EditIntSpin, snap_cx, Min(1).Max(100).NotNull(true).LeftPosZ(56, 50).TopPosZ(68, 19))
+	ITEM(Label, dv___8, SetLabel(t_("x")).LeftPosZ(110, 12).TopPosZ(66, 19))
+	ITEM(EditIntSpin, snap_cy, Min(1).Max(100).NotNull(true).LeftPosZ(126, 50).TopPosZ(68, 19))
+	ITEM(Option, snap_to_objects, SetLabel(t_("Snap to &objects")).LeftPosZ(54, 96).TopPosZ(90, 19))
+	ITEM(Button, ok, SetLabel(t_("OK")).RightPosZ(72, 64).BottomPosZ(4, 22))
+	ITEM(Button, cancel, SetLabel(t_("Cancel")).RightPosZ(4, 64).BottomPosZ(4, 22))
+END_LAYOUT
+
+LAYOUT(VectorDesFontLayout, 400, 40)
+	ITEM(DropList, font, HSizePosZ(0, 58).TopPosZ(0, 19))
+	ITEM(EditIntSpin, height, RightPosZ(0, 56).TopPosZ(0, 19))
+	ITEM(Option, bold, SetLabel(t_("&Bold")).LeftPosZ(-2, 49).TopPosZ(24, 15))
+	ITEM(Option, italic, SetLabel(t_("&Italic")).LeftPosZ(54, 49).TopPosZ(24, 15))
+	ITEM(Option, underline, SetLabel(t_("&Underline")).LeftPosZ(110, 70).TopPosZ(24, 15))
+	ITEM(Option, strikeout, SetLabel(t_("&Strikeout")).LeftPosZ(184, 74).TopPosZ(24, 15))
+END_LAYOUT
+
+#endif
diff --git a/uppsrc/VectorDes/VectorDes.upp b/uppsrc/VectorDes/VectorDes.upp
new file mode 100644
index 000000000..52a1702d5
--- /dev/null
+++ b/uppsrc/VectorDes/VectorDes.upp
@@ -0,0 +1,22 @@
+uses
+	CtrlLib,
+	Web,
+	RichText;
+
+file
+	VectorDes.h,
+	VectorDes_init.icpp,
+	VectorObj.h,
+	VectorObj.cpp,
+	VectorDes.cpp,
+	VectorDes.lay,
+	VectorRich.cpp,
+	VectorDes.iml,
+	test.vec highlight cpp,
+	Info readonly separator,
+	COPYING,
+	COPYING-PLAIN,
+	AUTHORS;
+
+mainconfig
+	"" = "GUI";
diff --git a/uppsrc/VectorDes/VectorDes_init.icpp b/uppsrc/VectorDes/VectorDes_init.icpp
new file mode 100644
index 000000000..282289620
--- /dev/null
+++ b/uppsrc/VectorDes/VectorDes_init.icpp
@@ -0,0 +1,6 @@
+#include "VectorDes.h"
+
+INITBLOCK {
+	RegisterStdVectorObjects();
+	RichObject::Register("VectorImage", RichObjectTypeVectorImage());
+}
diff --git a/uppsrc/VectorDes/VectorObj.cpp b/uppsrc/VectorDes/VectorObj.cpp
new file mode 100644
index 000000000..f422d103f
--- /dev/null
+++ b/uppsrc/VectorDes/VectorObj.cpp
@@ -0,0 +1,1913 @@
+#include "VectorDes.h"
+#pragma hdrstop
+
+void DrawHotRect(Draw& draw, int x, int y, int cx, int cy, bool hot, Color color)
+{
+	if(hot)
+		draw.DrawRect(x, y, cx, cy, color);
+	else
+		DrawFrame(draw, x, y, cx, cy, color);
+}
+
+Size ScaleSize(Size sz, int size)
+{
+	if(sz.cx == 0 && sz.cy == 0)
+		sz.cx = 1;
+	return iscale(sz, size, max((int)Length(sz), 1));
+}
+
+static void VectorSerializePacked(Stream& stream, int& i)
+{
+	if(stream.IsStoring()) {
+		if(IsNull(i))
+			stream.Put(0xFF);
+		else if(i >= -0x40 && i < 0x40)
+			stream.Put(i + 0x40);
+		else if(i >= -0x3EFF && i <= 0x3EFF) {
+			stream.Put((byte)(i >> 8) + 0xBE);
+			stream.Put((byte)i);
+		}
+		else {
+			stream.Put(0xFE);
+			stream.Put32le(i);
+		}
+	}
+	else {
+		int x = stream.Get();
+		if(x < 0)
+			return;
+		if(x == 0xFF)
+			i = Null;
+		else if(x == 0xFE) {
+			if(stream.IsEof()) {
+				stream.SetError();
+				return;
+			}
+			i = stream.Get32le();
+		}
+		else if(x >= 0x80) {
+			int y = stream.Get();
+			if(y < 0) {
+				stream.SetError();
+				return;
+			}
+			i = (x - 0xBE) * 256 + y;
+		}
+		else
+			i = x - 0x40;
+	}
+}
+
+static void VectorSerializeFixed(Stream& stream, double& d, double maxval)
+{
+	if(stream.IsStoring()) {
+		int i = Null;
+		if(!IsNull(d))
+			i = fround(minmax(d, -maxval, maxval) * 0x7FFFFFFF / maxval);
+		stream.Put32le(i);
+	}
+	else if(!stream.IsEof()) {
+		int i = stream.Get32le();
+		if(IsNull(i))
+			d = Null;
+		else
+			d = i * maxval / 0x7FFFFFFF;
+	}
+}
+
+static void VectorSerialize(Stream& stream, String& str)
+{
+	if(stream.IsStoring()) {
+		int len = str.GetLength();
+		if(str.IsVoid())
+			len = -1;
+		VectorSerializePacked(stream, len);
+		stream.Put(str.Begin(), str.GetLength());
+	}
+	else {
+		int len;
+		enum { MAX_STRING_LENGTH = 100000000 };
+		VectorSerializePacked(stream, len);
+		if(len < 0)
+			str = String::GetVoid();
+		else if(len == 0)
+			str = Null;
+		else if(len < MAX_STRING_LENGTH) {
+			Buffer<byte> data(len);
+			if(!stream.GetAll(data, len)) {
+				stream.SetError();
+				return;
+			}
+			str = String(data, len);
+		}
+		else {
+			stream.SetError();
+			return;
+		}
+	}
+}
+
+static void VectorSerialize(Stream& stream, Point& pt)
+{
+	VectorSerializePacked(stream, pt.x);
+	VectorSerializePacked(stream, pt.y);
+}
+
+static void VectorSerialize(Stream& stream, Size& sz)
+{
+	VectorSerializePacked(stream, sz.cx);
+	VectorSerializePacked(stream, sz.cy);
+}
+
+static void VectorSerialize(Stream& stream, Rect& rc)
+{
+	VectorSerializePacked(stream, rc.left);
+	VectorSerializePacked(stream, rc.top);
+	VectorSerializePacked(stream, rc.right);
+	VectorSerializePacked(stream, rc.bottom);
+}
+
+static void VectorSerialize(Stream& stream, Time& t)
+{
+	if(stream.IsStoring()) {
+		if(IsNull(t))
+			stream.Put(0xFF);
+		else {
+			bool dt = (t.hour == 0 && t.minute == 0 && t.second == 0);
+			stream.Put(dt ? t.day : t.day + 0x80);
+			stream.Put(t.month);
+			stream.Put16le(t.year);
+			if(!dt) {
+				stream.Put(t.hour);
+				stream.Put(t.minute);
+				stream.Put(t.second);
+			}
+		}
+	}
+	else {
+		int i = stream.Get();
+		if(i < 0)
+			return;
+		if(i == 0xFF)
+			t = Null;
+		else {
+			int day = i;
+			int month = stream.Get();
+			int year = stream.Get16le();
+			if(year < 0) {
+				stream.SetError();
+				return;
+			}
+			year = (short)year;
+			int hour = 0, minute = 0, second = 0;
+			if(day >= 0x80) {
+				day -= 0x80;
+				hour = stream.Get();
+				minute = stream.Get();
+				second = stream.Get();
+				if(second < 0) {
+					stream.SetError();
+					return;
+				}
+			}
+			t = Time(year, month, day, hour, minute, second);
+		}
+	}
+}
+
+static void VectorSerialize(Stream& stream, Color& c)
+{
+	if(stream.IsStoring()) {
+		if(IsNull(c))
+			stream.Put(0xFF);
+		else {
+			int rgb[3] = { c.GetR(), c.GetG(), c.GetB() };
+			int rgb4[3];
+			for(int i = 0; i < 3; i++)
+				rgb4[i] = (rgb[i] == 0x00 ? 0 : rgb[i] == 0x80 ? 1 : rgb[i] == 0xC0 ? 2 : rgb[i] == 0xFF ? 3 : -1);
+			if(rgb4[0] >= 0 && rgb4[1] >= 0 && rgb4[2] >= 0)
+				stream.Put(rgb4[0] + 4 * rgb4[1] + 16 * rgb4[2]);
+			else {
+				stream.Put(0xFE);
+				stream.Put(rgb[0]);
+				stream.Put(rgb[1]);
+				stream.Put(rgb[1]);
+			}
+		}
+	}
+	else {
+		int v = stream.Get();
+		if(v == 0xFF)
+			c = Null;
+		else if(v == 0xFE) {
+			int r = stream.Get(), g = stream.Get(), b = stream.Get();
+			if(b < 0) {
+				stream.SetError();
+				return;
+			}
+			c = Color(r, g, b);
+		}
+		else if(v < 0x40) {
+			static const byte table[] = { 0x00, 0x80, 0xC0, 0xFF };
+			c = Color(table[v & 3], table[(v >> 2) & 3], table[(v >> 4) & 3]);
+		}
+		else
+			stream.SetError();
+	}
+}
+
+static void VectorSerialize(Stream& stream, Font& font)
+{
+	if(stream.IsStoring()) {
+		if(IsNull(font)) {
+			stream.Put(0xFF);
+			return;
+		}
+		if(font.GetFace() < Font::OTHER && font.GetFace() < 0x40)
+			stream.Put(font.GetFace());
+		else {
+			stream.Put(0xFE);
+			String s = font.GetFaceName();
+			VectorSerialize(stream, s);
+		}
+		int ht = font.GetHeight();
+		VectorSerializePacked(stream, ht);
+		int wd = font.GetWidth();
+		VectorSerializePacked(stream, wd);
+		byte bitmask = 0;
+		if(font.IsBold()) bitmask |= 1;
+		if(font.IsItalic()) bitmask |= 2;
+		if(font.IsUnderline()) bitmask |= 4;
+		if(font.IsStrikeout()) bitmask |= 8;
+		if(font.IsNonAntiAliased()) bitmask |= 0x10;
+		if(font.IsTrueTypeOnly()) bitmask |= 0x20;
+		stream.Put(bitmask);
+	}
+	else {
+		int x = stream.Get();
+		if(x < 0)
+			return;
+		if(x == 0xFF) {
+			font = Null;
+			return;
+		}
+		font = StdFont();
+		if(x == 0xFE) {
+			String name;
+			VectorSerialize(stream, name);
+			if(stream.IsError())
+				return;
+			font.FaceName(name);
+		}
+		else if(x < 0x40)
+			font.Face(x);
+		else {
+			stream.SetError();
+			return;
+		}
+		int ht, wd;
+		VectorSerializePacked(stream, ht);
+		VectorSerializePacked(stream, wd);
+		if(stream.IsError())
+			return;
+		font.Height(ht).Width(wd);
+		int bits = stream.Get();
+		if(bits < 0) {
+			stream.SetError();
+			return;
+		}
+		if(bits & 0x01) font.Bold();
+		if(bits & 0x02) font.Italic();
+		if(bits & 0x04) font.Underline();
+		if(bits & 0x08) font.Strikeout();
+		if(bits & 0x10) font.NonAntiAliased();
+		if(bits & 0x20) font.TrueTypeOnly();
+	}
+}
+
+static void VectorSerialize(Stream& stream, Value& value, int vtype)
+{
+	switch(vtype) {
+		case INT_V: {
+			int t;
+			if(stream.IsStoring()) t = value;
+			VectorSerializePacked(stream, t);
+			if(stream.IsLoading()) value = t;
+			break;
+		}
+		case DOUBLE_V: {
+			double t;
+			if(stream.IsStoring()) t = value;
+			VectorSerializeFixed(stream, t, 1e6);
+			if(stream.IsLoading()) value = t;
+			break;
+		}
+		case STRING_V: {
+			String t;
+			if(stream.IsStoring()) t = value;
+			VectorSerialize(stream, t);
+			if(stream.IsLoading()) value = t;
+			break;
+		}
+		case WSTRING_V: {
+			String t;
+			if(stream.IsStoring()) t = ToUtf8(WString(value));
+			VectorSerialize(stream, t);
+			if(stream.IsLoading()) value = FromUtf8(t);
+			break;
+		}
+		case DATE_V: case TIME_V: {
+			Time t;
+			if(stream.IsStoring()) t = value;
+			VectorSerialize(stream, t);
+			if(stream.IsLoading()) value = t;
+			break;
+		}
+		case COLOR_V: {
+			Color t;
+			if(stream.IsStoring()) t = value;
+			VectorSerialize(stream, t);
+			if(stream.IsLoading()) value = t;
+			break;
+		}
+		case POINT_V: {
+			Point t;
+			if(stream.IsStoring()) t = value;
+			VectorSerialize(stream, t);
+			if(stream.IsLoading()) value = t;
+			break;
+		}
+		case SIZE_V: {
+			Size t;
+			if(stream.IsStoring()) t = value;
+			VectorSerialize(stream, t);
+			if(stream.IsLoading()) value = t;
+			break;
+		}
+		case RECT_V: {
+			Rect t;
+			if(stream.IsStoring()) t = value;
+			VectorSerialize(stream, t);
+			if(stream.IsLoading()) value = t;
+			break;
+		}
+		case FONT_V: {
+			Font t;
+			if(stream.IsStoring()) t = value;
+			VectorSerialize(stream, t);
+			if(stream.IsLoading()) value = t;
+			break;
+		}
+		default: NEVER();
+	}
+}
+
+
+static int GetEllipseDistanceSquared(const Rect& rc, Point pt)
+{
+	pt -= rc.CenterPoint();
+	double a = max(1, rc.Width()) / 2.0;
+	double b = max(1, rc.Height()) / 2.0;
+	double nx = pt.x / a;
+	double ny = pt.y / b;
+	if(!nx && !ny)
+		nx = 1;
+	double hyp = hypot(nx, ny);
+	if(hyp < 1)
+		return -fround(sqr((1 - hyp) * a * b));
+	nx *= a / hyp;
+	ny *= b / hyp;
+	return fround(sqr(pt.x - nx) + sqr(pt.y - ny));
+}
+
+static int GetLineDistanceSquared(Point from, Point to, Point pt)
+{
+	Size ft = to - from, fp = pt - from;
+	if(int tp = Squared(ft)) {
+		int scalar = ScalarProduct(fp, ft);
+		from += iscale(ft, minmax(scalar, 0, tp), tp);
+	}
+	Size diff = pt - from;
+	return Squared(diff);
+}
+
+String FormatVectorFont(Font f)
+{
+	String out;
+	switch(f.GetFace()) {
+		case Font::STDFONT:      out << NFormat("StdFont(%d)", f.GetHeight()); break;
+		case Font::SCREEN_SANS:  out << NFormat("ScreenSans(%d)", f.GetHeight()); break;
+		case Font::SCREEN_SERIF: out << NFormat("ScreenSerif(%d)", f.GetHeight()); break;
+		case Font::SCREEN_FIXED: out << NFormat("ScreenFixed(%d)", f.GetHeight()); break;
+		case Font::ROMAN:        out << NFormat("Roman(%d)", f.GetHeight()); break;
+		case Font::ARIAL:        out << NFormat("Arial(%d)", f.GetHeight()); break;
+		case Font::COURIER:      out << NFormat("Courier(%d)", f.GetHeight()); break;
+		case Font::SYMBOL:       out << NFormat("Symbol(%d)", f.GetHeight()); break;
+	#ifdef PLATFORM_WIN32
+		case Font::WINGDINGS:    out << NFormat("Wingdings(%d)", f.GetHeight()); break;
+		case Font::TAHOMA:       out << NFormat("Tahoma(%d)", f.GetHeight()); break;
+	#endif
+		default:                 out << NFormat("Font(0, %d).FaceName(%s)", f.GetHeight(), AsCString(f.GetFaceName())); break;
+	}
+//	out << ".Height(" << f.GetHeight() << ")";
+	if(f.IsBold()) out << ".Bold()";
+	if(f.IsItalic()) out << ".Italic()";
+	if(f.IsUnderline()) out << ".Underline()";
+	if(f.IsStrikeout()) out << ".Strikeout()";
+	return out;
+}
+
+Font ParseVectorFont(CParser& parser)
+{
+	Font f = StdFont();
+	bool font = false;
+	if(parser.Id("StdFont")) ;
+	else if(parser.Id("ScreenSans")) f = ScreenSans();
+	else if(parser.Id("ScreenSerif")) f = ScreenSerif();
+	else if(parser.Id("ScreenFixed")) f = ScreenFixed();
+	else if(parser.Id("Roman")) f = Roman(0);
+	else if(parser.Id("Arial")) f = Arial(0);
+	else if(parser.Id("Courier")) f = Courier(0);
+	else if(parser.Id("Symbol")) f = Symbol(0);
+#ifdef PLATFORM_WIN32
+	else if(parser.Id("Wingdings")) f = WingDings(0);
+	else if(parser.Id("Tahoma"))    f = Tahoma(0);
+#endif
+	else if(parser.Id("Font")) { f = Font(); font = true; }
+	else parser.ThrowError("font spec expected");
+	parser.PassChar('(');
+	if(!parser.Char(')')) {
+		if(font) {
+			f.Face(parser.ReadInt());
+			parser.PassChar(',');
+		}
+		f.Height(parser.ReadInt());
+		parser.PassChar(')');
+	}
+	while(parser.Char('.')) {
+		/**/ if(parser.Id("Height"))      { parser.PassChar('('); f.Height(parser.ReadInt()); parser.PassChar(')'); }
+		else if(parser.Id("Bold"))        { f.Bold(); parser.PassChar('('); parser.PassChar(')'); }
+		else if(parser.Id("Italic"))      { f.Italic(); parser.PassChar('('); parser.PassChar(')'); }
+		else if(parser.Id("Underline"))   { f.Underline(); parser.PassChar('('); parser.PassChar(')'); }
+		else if(parser.Id("Strikeout"))   { f.Strikeout(); parser.PassChar('('); parser.PassChar(')'); }
+		else if(parser.Id("SetFaceName")) { f.FaceName(parser.ReadOneString()); }
+		else parser.ThrowError("unknown font attribute");
+	}
+	return f;
+}
+
+void DrawLineRect(Draw& draw, const Rect& rc, int width, Color color)
+{
+	Point vertices[] = { rc.TopLeft(), rc.TopRight(), rc.BottomRight(), rc.BottomLeft(), rc.TopLeft() };
+	draw.DrawPolyline(vertices, 5, width, color);
+}
+
+Rect operator * (Rect rc, const Scaling& sc)
+{
+	return Rect(rc.TopLeft() * sc, rc.BottomRight() * sc);
+}
+
+Rect operator / (Rect rc, const Scaling& sc)
+{
+	return Rect(rc.TopLeft() / sc, rc.BottomRight() / sc);
+}
+
+One<Ctrl> VectorArg::CreateEditor(int vtype, int editor)
+{
+	switch(editor) {
+		case EDIT_VALUE: {
+			switch(vtype) {
+				case INT_V:     return &(*new EditIntSpin).LeftPos(0, 80).TopPosZ(0, 19);
+				case DOUBLE_V:  return &(*new EditDouble).LeftPos(0, 100).TopPosZ(0, 19);
+				case STRING_V:  return &(*new EditString).LeftPos(0, 100).TopPosZ(0, 19);
+				case WSTRING_V: return &(*new EditString).LeftPos(0, 100).TopPosZ(0, 19);
+				case DATE_V:    return &(*new EditDate).LeftPos(0, 80).TopPos(0, 19);
+				case TIME_V:    return &(*new EditTime).LeftPos(0, 150).TopPos(0, 19);
+				case COLOR_V:   return &(*new ColorPusher)/*.NoNotNull()*/.LeftPos(0, 100).TopPosZ(0, 19);
+				case FONT_V:    return &(*-CreateVectorFontCtrl()).LeftPos(0, 150).TopPosZ(0, 40);
+				default:        return NULL;
+			}
+		}
+
+		case EDIT_DOC: {
+			return &(*new DocEdit).LeftPosZ(0, 100).TopPosZ(0, 80);
+		}
+
+		case EDIT_ALIGN_HORZ: {
+			One<DropList> droplist = new DropList;
+			droplist->Add(ALIGN_LEFT, "left");
+			droplist->Add(ALIGN_CENTER, "center");
+			droplist->Add(ALIGN_RIGHT, "right");
+			return &(*-droplist).LeftPosZ(0, 100).TopPosZ(0, 19);
+		}
+
+		case EDIT_ALIGN_VERT: {
+			One<DropList> droplist = new DropList;
+			droplist->Add(ALIGN_TOP, "top");
+			droplist->Add(ALIGN_CENTER, "center");
+			droplist->Add(ALIGN_BOTTOM, "bottom");
+			return &(*-droplist).LeftPosZ(0, 100).TopPosZ(0, 19);
+		}
+
+		case EDIT_RECT_STYLE: {
+			One<DropList> droplist = new DropList;
+			droplist->Add(VectorRectData::STYLE_RECT,         "rectangle");
+			droplist->Add(VectorRectData::STYLE_ROUNDED_RECT, "rounded rectangle");
+			droplist->Add(VectorRectData::STYLE_ELLIPSE,      "ellipse");
+			return &(*-droplist).LeftPosZ(0, 150).TopPosZ(0, 19);
+		}
+
+		case EDIT_LINE_CAP: {
+			One<DropList> droplist = new DropList;
+			droplist->SetDisplay(VectorLineCapDisplay());
+			for(int i = 0; i < VectorLineData::CAP_COUNT; i++)
+				droplist->Add(i);
+			return &(*-droplist).LeftPosZ(150).TopPosZ(0, 19);
+		}
+
+		default: NEVER(); return NULL;
+	}
+}
+
+VectorInfo::VectorInfo(String type, String vm_type, One<VectorObject> (*newfunc)(),
+	One< VectorGeomArg<Rect> > rect_args_, One< VectorGeomArg<Point> > point_args_, Array<VectorArg> args_)
+: type(type), vm_type(vm_type), newfunc(newfunc), rects(rect_args_), points(point_args_), args(args_)
+{
+	vm_index.Reserve(args.GetCount());
+	GetFieldContainer(vm_index, args, &VectorArg::vm_name);
+}
+
+int VectorInfo::FindArg(String name) const
+{
+	return FindFieldIndex(args, &VectorArg::name, name);
+}
+
+String VectorInfo::GetName(int lang) const
+{
+	int f = name.Find(lang);
+	return (f >= 0 ? name[f] : Nvl(default_name, type));
+}
+
+String VectorObject::FormatCoords() const
+{
+	String out;
+	const VectorInfo& info = Info();
+	if(const VectorGeomArg<Rect> *ra = info.RectArgs()) {
+		for(int i = 0, n = ra->GetCount(this); i < n; i++)
+			out << (out.IsEmpty() ? "" : "; ") << ra->Get(this, i);
+	}
+	if(const VectorGeomArg<Point> *pa = info.PointArgs()) {
+		for(int i = 0, n = pa->GetCount(this); i < n; i++)
+			out << (out.IsEmpty() ? "" : "; ") << pa->Get(this, i);
+	}
+	return out;
+}
+
+void VectorObject::DesignPaint(ScalingDraw& draw) const
+{
+	Paint(draw);
+}
+
+void VectorObject::DragPaint(ScalingDraw& draw) const
+{
+	Paint(draw);
+}
+
+void VectorObject::SelPaint(ScalingDraw& draw, const Index<int>& sel, bool is_hot) const
+{
+	const VectorInfo& vi = Info();
+	Color c = (is_hot ? LtMagenta() : LtBlue());
+	Vector<bool> mrc, mpt;
+	for(int i = 0; i < sel.GetCount(); i++)
+		if(sel[i] & ARG_MASK)
+			if(sel[i] & RECT_MASK)
+				mrc.At(sel[i] >> INDEX_SHIFT, false) = true;
+			else
+				mpt.At(sel[i] >> INDEX_SHIFT, false) = true;
+	if(const VectorGeomArg<Rect> *ra = vi.RectArgs()) {
+		for(int i = 0, n = ra->GetCount(this); i < n; i++) {
+			Rect rc = ra->Get(this, i) * draw;
+			Point mid = rc.CenterPoint();
+			bool hot = (i < mrc.GetCount() && mrc[i]);
+			DrawHotRect(*draw.draw, rc.left - 5, rc.top - 5, 5, 5, hot, c);
+			DrawHotRect(*draw.draw, mid.x - 2, rc.top - 5, 5, 5, hot, c);
+			DrawHotRect(*draw.draw, rc.right, rc.top - 5, 5, 5, hot, c);
+			DrawHotRect(*draw.draw, rc.left - 5, mid.y - 2, 5, 5, hot, c);
+			DrawHotRect(*draw.draw, rc.right, mid.y - 2, 5, 5, hot, c);
+			DrawHotRect(*draw.draw, rc.left - 5, rc.bottom, 5, 5, hot, c);
+			DrawHotRect(*draw.draw, mid.x - 2, rc.bottom, 5, 5, hot, c);
+			DrawHotRect(*draw.draw, rc.right, rc.bottom, 5, 5, hot, c);
+		}
+	}
+	if(const VectorGeomArg<Point> *pa = vi.PointArgs()) {
+		for(int i = 0, n = pa->GetCount(this); i < n; i++) {
+			Point pt = pa->Get(this, i) * draw;
+			bool hot = (i < mpt.GetCount() && mpt[i]);
+			DrawHotRect(*draw.draw, pt.x - 2, pt.y - 2, 5, 5, hot, c);
+		}
+	}
+}
+
+Rect VectorObject::GetBox() const
+{
+	const VectorInfo& vi = Info();
+	Rect box = Null;
+	if(const VectorGeomArg<Rect> *ra = vi.RectArgs())
+		for(int i = 0; i < ra->GetCount(this); i++)
+			box |= ra->Get(this, i);
+	if(const VectorGeomArg<Point> *pa = vi.PointArgs())
+		for(int i = 0; i < pa->GetCount(this); i++)
+			box |= pa->Get(this, i);
+	return box;
+}
+
+One<VectorObject> VectorObject::Copy() const
+{
+	const VectorInfo& vi = Info();
+	One<VectorObject> newobj = vi.New();
+	if(const VectorGeomArg<Rect> *ra = vi.RectArgs()) {
+		int count = ra->GetCount(this);
+		if(ra->CanSetCount())
+			ra->SetCount(~newobj, count);
+		for(int i = 0; i < count; i++)
+			ra->Set(~newobj, i, ra->Get(this, i));
+	}
+	if(const VectorGeomArg<Point> *pa = vi.PointArgs()) {
+		int count = pa->GetCount(this);
+		if(pa->CanSetCount())
+			pa->SetCount(~newobj, count);
+		for(int i = 0; i < count; i++)
+			pa->Set(~newobj, i, pa->Get(this, i));
+	}
+	for(int i = 0; i < vi.GetCount(); i++)
+		vi[i].Set(~newobj, vi[i].Get(this));
+	return newobj;
+}
+
+Index<int> VectorObject::Contains(const Scaling& scaling, Rect rc) const
+{
+	const VectorInfo& vi = Info();
+	Index<int> out;
+	if(const VectorGeomArg<Rect> *ra = vi.RectArgs())
+		for(int i = 0, n = ra->GetCount(this); i < n; i++)
+			if(rc.Contains(ra->Get(this, i) * scaling))
+				out.Add((i << INDEX_SHIFT) | RECT_MASK | ARG_MASK | TRACK_RECT);
+	if(const VectorGeomArg<Point> *pa = vi.PointArgs())
+		for(int i = 0, n = pa->GetCount(this); i < n; i++)
+			if(rc.Contains(pa->Get(this, i) * scaling))
+				out.Add((i << INDEX_SHIFT) | ARG_MASK | TRACK_POINT);
+	return out;
+}
+
+int VectorObject::Nearest(const Scaling& scaling, Point pt, int& maxdistsquared) const
+{
+	const VectorInfo& vi = Info();
+	int nearest = -1;
+	if(const VectorGeomArg<Rect> *ra = vi.RectArgs())
+		for(int i = 0, n = ra->GetCount(this); i < n; i++) {
+			Rect u = ra->Get(this, i) * scaling;
+			if(IsNull(u))
+				continue;
+			int s2 = min(min(pt.x - u.left, u.right - pt.x), min(pt.y - u.top, u.bottom - pt.y));
+			if(s2 >= 0)
+				s2 = -s2 * s2;
+			else {
+				Size d = u.Bind(pt) - pt;
+				s2 = d.cx * d.cx + d.cy * d.cy;
+			}
+			if(tabs(s2) < tabs(maxdistsquared)) {
+				nearest = (i << INDEX_SHIFT) | ARG_MASK | RECT_MASK | TRACK_RECT;
+				maxdistsquared = s2;
+			}
+		}
+
+	if(const VectorGeomArg<Point> *pa = vi.PointArgs())
+		for(int i = 0, n = pa->GetCount(this); i < n; i++) {
+			Point u = pa->Get(this, i) * scaling;
+			Size d = u - pt;
+			int s2 = d.cx * d.cx + d.cy * d.cy;
+			if(s2 < tabs(maxdistsquared)) {
+				nearest = (i << INDEX_SHIFT) | ARG_MASK | TRACK_POINT;
+				maxdistsquared = s2;
+			}
+		}
+
+	return nearest;
+}
+
+Point VectorObject::TrackPoint(int track) const
+{
+	const VectorInfo& vi = Info();
+	if(track & ARG_MASK)
+		if(track & RECT_MASK) {
+			Rect rc = vi.RectArgs()->Get(this, track >> INDEX_SHIFT);
+			Point pt = rc.TopLeft();
+			if(~(track & (TRACK_MASK & ~TRACK_RECT_SIDES))) {
+				if((track & (TRACK_RECT_LEFT | TRACK_RECT_RIGHT)) == TRACK_RECT_RIGHT)
+					pt.x = rc.right;
+				if((track & (TRACK_RECT_TOP | TRACK_RECT_BOTTOM)) == TRACK_RECT_BOTTOM)
+					pt.y = rc.bottom;
+			}
+			return pt;
+		}
+		else
+			return vi.PointArgs()->Get(this, track >> INDEX_SHIFT);
+	return Null;
+}
+
+void VectorObject::Create(Point from, Point to, dword keyflags)
+{
+	const VectorInfo& vi = Info();
+	Point rest = (from + to) >> 1;
+	Rect rc(from, to);
+	rc.Normalize();
+	bool is_rc = false;
+	if(const VectorGeomArg<Rect> *ra = vi.RectArgs()) {
+		is_rc = ra->GetCount(this) > 0;
+		for(int i = 0, n = ra->GetCount(this); i < n; i++)
+			ra->Set(this, i, rc);
+	}
+	if(const VectorGeomArg<Point> *pa = vi.PointArgs()) {
+		for(int i = 0, n = pa->GetCount(this); i < n; i++)
+			pa->Set(this, i, is_rc ? rest : n == 1 ? to : i == 0 ? from : i == 1 ? to : rest);
+	}
+}
+
+void VectorObject::Track(int track, Point from, Point to, dword keyflags)
+{
+	Size delta = to - from;
+	const VectorInfo& vi = Info();
+	int tm = track & TRACK_MASK;
+	if(const VectorGeomArg<Rect> *ra = vi.RectArgs()) {
+		if((tm & ~TRACK_RECT_SIDES) == 0) { // sides
+			for(int i = 0, n = ra->GetCount(this); i < n; i++) {
+				Rect rc = ra->Get(this, i);
+				if(track & TRACK_RECT_LEFT)   rc.left   += delta.cx;
+				if(track & TRACK_RECT_TOP)    rc.top    += delta.cy;
+				if(track & TRACK_RECT_RIGHT)  rc.right  += delta.cx;
+				if(track & TRACK_RECT_BOTTOM) rc.bottom += delta.cy;
+				rc.Normalize();
+				ra->Set(this, i, rc);
+			}
+		}
+		else if(tm == TRACK_MOVE) {
+			for(int i = 0, n = ra->GetCount(this); i < n; i++)
+				ra->Set(this, i, ra->Get(this, i) + delta);
+		}
+		else if(tm == TRACK_SIZE) {
+			for(int i = 0, n = ra->GetCount(this); i < n; i++)
+				ra->Set(this, i, ra->Get(this, i).Inflated(Rect(delta)).Normalized());
+		}
+	}
+
+	if(const VectorGeomArg<Point> *pa = vi.PointArgs()) {
+		if(tm == TRACK_POINT && track & ARG_MASK) {
+			int i = track >> INDEX_SHIFT;
+			pa->Set(this, i, pa->Get(this, i) + delta);
+		}
+		else if(tm == TRACK_MOVE)
+			for(int i = 0, n = pa->GetCount(this); i < n; i++)
+				pa->Set(this, i, pa->Get(this, i) + delta);
+
+	}
+}
+
+Size GetAlignOffset(const Rect& rc, Alignment halign, Alignment valign, Point pt)
+{
+	Point a = pt;
+	switch(halign) {
+		case ALIGN_LEFT:   a.x = rc.left; break;
+		case ALIGN_CENTER: a.x = (rc.left + rc.right) >> 1; break;
+		case ALIGN_RIGHT:  a.x = rc.right; break;
+	}
+	switch(valign) {
+		case ALIGN_TOP:    a.y = rc.top; break;
+		case ALIGN_CENTER: a.y = (rc.top + rc.bottom) >> 1; break;
+		case ALIGN_BOTTOM: a.y = rc.bottom; break;
+	}
+	return pt - a;
+}
+
+void VectorObject::Align(Alignment halign, Alignment valign, Point anchor)
+{
+	const VectorInfo& vi = Info();
+	if(const VectorGeomArg<Rect> *ra = vi.RectArgs())
+		for(int i = 0; i < ra->GetCount(this); i++) {
+			Rect rc = ra->Get(this, i);
+			rc.Offset(GetAlignOffset(rc, halign, valign, anchor));
+			ra->Set(this, i, rc);
+		}
+	if(const VectorGeomArg<Point> *pa = vi.PointArgs()) {
+		Rect rc = Null;
+		for(int i = 0; i < pa->GetCount(this); i++)
+			rc |= pa->Get(this, i);
+		Size delta = GetAlignOffset(rc, halign, valign, anchor);
+		for(int i = 0; i < pa->GetCount(this); i++)
+			pa->Set(this, i, pa->Get(this, i) + delta);
+	}
+}
+
+void VectorObject::EqualSize(Size sz)
+{
+	const VectorInfo& vi = Info();
+	if(const VectorGeomArg<Rect> * ra = vi.RectArgs())
+		for(int i = 0; i < ra->GetCount(this); i++) {
+			Rect rc = ra->Get(this, i);
+			if(!IsNull(sz.cx))
+				rc.right = rc.left + sz.cx;
+			if(!IsNull(sz.cy))
+				rc.bottom = rc.top + sz.cy;
+			ra->Set(this, i, rc);
+		}
+}
+
+Image VectorObject::Cursor(int track, dword keyflags) const
+{
+	if(!((track & TRACK_MASK) & ~TRACK_RECT_SIDES)) {
+		switch(track & TRACK_RECT_SIDES) {
+			case TRACK_RECT_LEFT:
+			case TRACK_RECT_RIGHT:
+				return Image::SizeHorz();
+			case TRACK_RECT_TOP:
+			case TRACK_RECT_BOTTOM:
+				return Image::SizeVert();
+			case TRACK_RECT_LEFT | TRACK_RECT_TOP:
+				return Image::SizeTopLeft();
+			case TRACK_RECT_RIGHT | TRACK_RECT_BOTTOM:
+				return Image::SizeBottomRight();
+			case TRACK_RECT_LEFT | TRACK_RECT_BOTTOM:
+				return Image::SizeBottomLeft();
+			case TRACK_RECT_RIGHT | TRACK_RECT_TOP:
+				return Image::SizeTopRight();
+		}
+	}
+
+	switch(track & TRACK_MASK) {
+		case TRACK_SELECT: return CtrlImg::HandCursor();
+		case TRACK_MOVE:   return VecImg::SizeAll();
+		case TRACK_POINT:  return VecImg::track_point();
+	}
+
+	return Null;
+}
+
+Value VectorObject::GetLink(Point pt, Size sz) const
+{
+	const VectorInfo& vi = Info();
+	int l = vi.FindArg("link");
+	if(l >= 0)
+		return vi[l].Get(this);
+	return Null;
+}
+
+String VectorObject::ToString() const
+{
+	String out;
+	const VectorInfo& vi = Info();
+	out << vi.GetType() << ", ";
+	if(const VectorGeomArg<Rect> *ra = vi.RectArgs()) {
+		int n = ra->GetCount(this);
+		if(n) {
+			out << ".SetRect(";
+			bool sc = ra->CanSetCount();
+			if(sc)
+				out << "Vector<Rect>()";
+			for(int i = 0; i < n; i++) {
+				Rect rc = ra->Get(this, i);
+				out << NFormat("%s`Rect(%d, %d, %d, %d)",
+					sc ? " << " : i ? ", " : "", rc.left, rc.top, rc.right, rc.bottom);
+			}
+			out << ')';
+		}
+	}
+	if(const VectorGeomArg<Point> *pa = vi.PointArgs()) {
+		int n = pa->GetCount(this);
+		if(n) {
+			out << ".SetPoint(";
+			bool sc = pa->CanSetCount();
+			if(sc)
+				out << "Vector<Point>()";
+			for(int i = 0; i < n; i++) {
+				Point pt = pa->Get(this, i);
+				out << NFormat("%s`Point(%d, %d)",
+					sc ? " << " : i ? ", " : "", pt.x, pt.y);
+			}
+			out << ")";
+		}
+	}
+	int npr = 0;
+	for(int i = vi.GetCount(); --i >= 0;) {
+		const VectorArg& viarg = vi[i];
+		Value v = viarg.Get(this);
+		bool usearg = false;
+		if(viarg.dflt != v) {
+			String fmtarg;
+			if(IsNull(v))
+				fmtarg = "Null";
+			else if(v.GetType() == COLOR_V) {
+				Color c(v);
+				fmtarg = NFormat("Color(%d, %d, %d)", c.GetR(), c.GetG(), c.GetB());
+			}
+			else if(v.GetType() == STRING_V || v.GetType() == WSTRING_V)
+				fmtarg = AsCString(String(v));
+			else if(v.GetType() == FONT_V)
+				fmtarg = FormatVectorFont(v);
+			else
+				fmtarg = StdFormat(v);
+			out << '.' << viarg.name << '(' << fmtarg << ')';
+		}
+	}
+	return out;
+}
+
+One<VectorObject> VectorObject::Load(CParser& parser)
+{
+	String type = parser.ReadId();
+	parser.PassChar(',');
+	const VectorInfo *vi = RegisteredObjects().Get(type, NULL);
+	if(!vi)
+		return NULL;
+	One<VectorObject> obj = vi->New();
+	for(int i = 0; i < vi->GetCount(); i++)
+		(*vi)[i].Set(~obj, (*vi)[i].dflt);
+	while(parser.Char('.')) {
+		String id = parser.ReadId();
+		if(id == "SetPoint") {
+			if(const VectorGeomArg<Point> *pa = vi->PointArgs()) {
+				Vector<Point> pts;
+				parser.PassChar('(');
+				bool lsh = false;
+				bool first = true;
+				if(parser.Id("Vector")) {
+					parser.PassChar('<');
+					parser.PassId("Point");
+					parser.PassChar('>');
+					parser.PassChar('(');
+					parser.PassChar(')');
+					lsh = true;
+				}
+				while(!parser.Char(')')) {
+					if(lsh)
+						parser.PassChar2('<', '<');
+					else if(!first)
+						parser.PassChar(',');
+					first = false;
+					Point pt;
+					parser.PassId("Point");
+					parser.PassChar('(');
+					pt.x = parser.ReadInt();
+					parser.PassChar(',');
+					pt.y = parser.ReadInt();
+					parser.PassChar(')');
+					pts.Add(pt);
+				}
+				if(pts.GetCount() < pa->GetCount(~obj))
+					pts.SetCountR(pa->GetCount(~obj), Point(0, 0));
+				if(pa->CanSetCount())
+					pa->SetCount(~obj, pts.GetCount());
+				for(int i = 0, n = pa->GetCount(~obj); i < n; i++)
+					pa->Set(~obj, i, pts[i]);
+			}
+		}
+		else if(id == "SetRect") {
+			if(const VectorGeomArg<Rect> *ra = vi->RectArgs()) {
+				Vector<Rect> rcs;
+				parser.PassChar('(');
+				bool lsh = false;
+				bool first = true;
+				if(parser.Id("Vector")) {
+					parser.PassChar('<');
+					parser.PassId("Rect");
+					parser.PassChar('>');
+					parser.PassChar('(');
+					parser.PassChar(')');
+					lsh = true;
+				}
+				while(!parser.Char(')')) {
+					if(lsh)
+						parser.PassChar2('<', '<');
+					else if(!first)
+						parser.PassChar(',');
+					first = false;
+					Rect rc;
+					parser.PassId("Rect");
+					parser.PassChar('(');
+					rc.left = parser.ReadInt();
+					parser.PassChar(',');
+					rc.top = parser.ReadInt();
+					parser.PassChar(',');
+					rc.right = parser.ReadInt();
+					parser.PassChar(',');
+					rc.bottom = parser.ReadInt();
+					parser.PassChar(')');
+					rcs.Add(rc);
+				}
+				if(rcs.GetCount() < ra->GetCount(~obj))
+					rcs.SetCountR(ra->GetCount(~obj), Rect(0, 0, 0, 0));
+				if(ra->CanSetCount())
+					ra->SetCount(~obj, rcs.GetCount());
+				for(int i = 0, n = ra->GetCount(~obj); i < n; i++)
+					ra->Set(~obj, i, rcs[i]);
+			}
+		}
+		else {
+			int t = vi->FindArg(id);
+			parser.PassChar('(');
+			if(t >= 0) {
+				const VectorArg& viarg = (*vi)[t];
+				Value value;
+				if(!parser.Id("Null"))
+					switch(viarg.vtype) {
+						case INT_V: {
+							value = parser.ReadInt();
+							break;
+						}
+						case DOUBLE_V: {
+							value = parser.ReadDouble();
+							break;
+						}
+						case STRING_V:
+						case WSTRING_V: {
+							value = parser.ReadString();
+							break;
+						}
+						case COLOR_V: {
+							Color c = Null;
+							parser.PassId("Color");
+							parser.PassChar('(');
+							if(!parser.IsChar(')')) {
+								int r = parser.ReadInt();
+								parser.PassChar(',');
+								int g = parser.ReadInt();
+								parser.PassChar(',');
+								int b = parser.ReadInt();
+								c = Color(r, g, b);
+							}
+							parser.PassChar(')');
+							value = c;
+							break;
+						}
+
+						case FONT_V: {
+							value = ParseVectorFont(parser);
+							break;
+						}
+
+						default: NEVER();
+					}
+				viarg.Set(~obj, value);
+			}
+			parser.PassChar(')');
+		}
+	}
+	return obj;
+}
+
+typedef VectorMap<String, const VectorInfo *> VectorEntryMap;
+
+GLOBAL_VAR(VectorEntryMap, VectorObject::RegisteredObjects)
+GLOBAL_VAR(VectorEntryMap, VectorObject::RegisteredVMIndex)
+
+void VectorObject::RegisterInfo(const VectorInfo& vi)
+{
+	RegisteredObjects().GetAdd(vi.GetType()) = &vi;
+	RegisteredVMIndex().GetAdd(vi.GetVMType()) = &vi;
+}
+
+VectorImage::VectorImage()
+: data(new Data)
+{
+}
+
+void VectorImage::Clone()
+{
+	VectorImage old_image = *this;
+	data = new Data;
+	data->size = old_image.data->size;
+	data->name = old_image.data->name;
+	Reserve(old_image.GetCount());
+	for(int i = 0; i < old_image.GetCount(); i++)
+		Add(old_image[i].Copy());
+}
+
+VectorImage::VectorImage(const Value& value)
+{
+	if(IsTypeRaw<VectorImage>(value))
+		*this = ValueTo<VectorImage>(value);
+	else if(IsNull(value))
+		data = new Data;
+	else {
+		NEVER();
+	}
+}
+
+void VectorImage::Paint(ScalingDraw& draw) const
+{
+	for(int i = 0; i < data->objects.GetCount(); i++)
+		data->objects[i].Paint(draw);
+}
+
+void VectorImage::DesignPaint(ScalingDraw& draw) const
+{
+	for(int i = 0; i < data->objects.GetCount(); i++)
+		data->objects[i].DesignPaint(draw);
+}
+
+void VectorImage::DragPaint(ScalingDraw& draw) const
+{
+	for(int i = 0; i < data->objects.GetCount(); i++)
+		data->objects[i].DragPaint(draw);
+}
+
+VectorMap< int, Index<int> > VectorImage::Contains(const Scaling& scaling, Rect rc) const
+{
+	VectorMap< int, Index<int> > list;
+	for(int pass = 0; list.IsEmpty() && pass <= 1; pass++)
+		for(int i = 0; i < data->objects.GetCount(); i++)
+			if(pass || rc.Contains(data->objects[i].GetBox() * scaling)) {
+				Index<int> sel = data->objects[i].Contains(scaling, rc);
+				if(!sel.IsEmpty())
+					list.Add(i) = sel;
+			}
+	return list;
+}
+
+Point VectorImage::Nearest(const Scaling& scaling, Point pt, int maxdistsquared) const
+{
+	int nobj = -1, ntrack = -1;
+	int mx = 1000000000;
+	for(int i = 0; i < data->objects.GetCount(); i++) {
+		int sel = data->objects[i].Nearest(scaling, pt, mx);
+		if(sel >= 0) {
+			nobj = i;
+			ntrack = sel;
+		}
+	}
+	if(mx > maxdistsquared)
+		nobj = ntrack = -1;
+	return Point(nobj, ntrack);
+}
+
+Point VectorImage::Nearest(const Scaling& scaling, Point pt, int maxdistsquared, const Vector<int>& selection) const
+{
+	int nobj = -1, ntrack = -1;
+	int mx = 1000000000;
+	for(int i = 0; i < selection.GetCount(); i++) {
+		int sel = data->objects[selection[i]].Nearest(scaling, pt, mx);
+		if(sel >= 0) {
+			nobj = selection[i];
+			ntrack = sel;
+		}
+	}
+	if(mx > maxdistsquared)
+		nobj = ntrack = -1;
+	return Point(nobj, ntrack);
+}
+
+Point VectorImage::TrackPoint(Point track) const
+{
+	if(track.x < 0 || track.x >= data->objects.GetCount())
+		return Null;
+	return data->objects[track.x].TrackPoint(track.y);
+}
+
+Image VectorImage::Cursor(Point track, dword keyflags) const
+{
+	if(track.y < 0)
+		return Null;
+	if(track.x >= 0)
+		return data->objects[track.x].Cursor(track.y, keyflags);
+	switch((track.y & VectorObject::TRACK_MASK)) {
+		case VectorObject::TRACK_IMAGE_SIZE: {
+			switch(track.y >> VectorObject::INDEX_SHIFT) {
+				case 1: return Image::SizeHorz();
+				case 2: return Image::SizeVert();
+				case 3: return Image::SizeBottomRight();
+			}
+			break;
+		}
+	}
+	return Null;
+}
+
+/*
+Point VectorImage::FindNearest(Point pt, int maxdistsquared, const VectorMap<int, int>& selection) const
+{
+	int best = -1, sel = 0, dist = 1000000000;
+	for(int i = 0; i < selection.GetCount(); i++) {
+		int x = selection.GetKey(i);
+		int temp = dist;
+		int osel = data->objects[x].NearestMask(pt, temp) & selection[i];
+		if(osel && temp <= dist) {
+			best = x;
+			sel = osel;
+			dist = temp;
+		}
+	}
+	if(dist > maxdistsquared)
+		return Point(-1, 0);
+	return Point(best, sel);
+}
+*/
+
+String VectorImage::SaveVec(int index) const
+{
+	String out;
+	String fn = data->name;
+	if(IsNull(fn))
+		fn = NFormat("vi__%d", index);
+	out << NFormat("VECTOR_BEGIN(%s, %d, %d)\n", fn, data->size.cx, data->size.cy);
+	for(int i = 0; i < data->objects.GetCount(); i++)
+		out << "\tVECTOR_OBJ(" << data->objects[i] << ")\n";
+	out << "VECTOR_END\n";
+	return out;
+}
+
+void VectorImage::LoadVec(CParser& parser)
+{
+	Clear();
+	parser.PassId("VECTOR_BEGIN");
+	parser.PassChar('(');
+	data->name = parser.ReadId();
+	parser.PassChar(',');
+	data->size.cx = parser.ReadInt();
+	parser.PassChar(',');
+	data->size.cy = parser.ReadInt();
+	parser.PassChar(')');
+	while(parser.Id("VECTOR_OBJ")) {
+		parser.PassChar('(');
+		One<VectorObject> object = VectorObject::Load(parser);
+		parser.PassChar(')');
+		if(object)
+			Add(object);
+	}
+	parser.PassId("VECTOR_END");
+}
+
+void VectorImage::SaveVM(Stream& out) const
+{
+	out.Put("VIMa");
+	out.Put("n");
+	String n = data->name;
+	VectorSerialize(out, n);
+	out.Put("s");
+	Size s = data->size;
+	VectorSerialize(out, s);
+	out.Put("o");
+	int count = data->objects.GetCount();
+	VectorSerializePacked(out, count);
+	for(int i = 0; i < data->objects.GetCount(); i++) {
+		const VectorObject& obj = data->objects[i];
+		const VectorInfo& info = obj.Info();
+		StringStream data;
+		data.Put(info.vm_type);
+		if(const VectorGeomArg<Rect> *ra = info.RectArgs()) {
+			int count = ra->GetCount(&obj);
+			if(ra->CanSetCount())
+				VectorSerializePacked(data, count);
+			for(int i = 0; i < count; i++) {
+				Rect rc = ra->Get(&obj, i);
+				VectorSerialize(data, rc);
+			}
+		}
+		if(const VectorGeomArg<Point> *pa = info.PointArgs()) {
+			int count = pa->GetCount(&obj);
+			if(pa->CanSetCount())
+				VectorSerializePacked(data, count);
+			for(int i = 0; i < count; i++) {
+				Point pt = pa->Get(&obj, i);
+				VectorSerialize(data, pt);
+			}
+		}
+		for(int a = 0; a < info.GetCount(); a++) {
+			const VectorArg& arg = info[a];
+			Value v = arg.Get(&obj);
+			if(v != arg.dflt) {
+				data.Put(arg.vm_name);
+				VectorSerialize(data, v, arg.vtype);
+			}
+		}
+		String res = data.GetResult();
+		VectorSerialize(out, res);
+	}
+	out.Put(".");
+}
+
+static String VMLoadTag(Stream& in)
+{
+	String out;
+	for(;;) {
+		int i = in.Get();
+		if(i < 0)
+			break;
+		out.Cat(i);
+		if(i < 'A' || i > 'Z')
+			break;
+	}
+	return out;
+}
+
+void VectorImage::LoadVM(Stream& in)
+{
+	Clear();
+	char tag[4];
+	if(!in.GetAll(tag, 4) || memcmp(tag, "VIMa", 4)) {
+		in.SetError();
+		return;
+	}
+	for(;;) {
+		int i = in.Get();
+		if(i < 0 || i == '.')
+			return;
+		if(i == 'n')
+			VectorSerialize(in, data->name);
+		else if(i == 's')
+			VectorSerialize(in, data->size);
+		else if(i == 'o') {
+			int c;
+			VectorSerializePacked(in, c);
+			Reserve(c);
+			for(int i = 0; i < c; i++) {
+				String odata;
+				VectorSerialize(in, odata);
+				StringStream indata(odata);
+				String argtag = VMLoadTag(indata);
+				if(const VectorInfo *info = VectorObject::RegisteredVMIndex().Get(argtag, NULL)) {
+					One<VectorObject> object = info->New();
+					if(const VectorGeomArg<Rect> *ra = info->RectArgs()) {
+						int count = ra->GetCount(~object);
+						if(ra->CanSetCount()) {
+							VectorSerializePacked(indata, count);
+							if(count >= 0 && count <= 100000)
+								ra->SetCount(~object, count);
+							else
+								indata.SetError();
+						}
+						int i = 0;
+						while(i < count) {
+							Rect rc;
+							VectorSerialize(indata, rc);
+							if(indata.IsError())
+								break;
+							ra->Set(~object, i++, rc);
+						}
+						while(i < count)
+							ra->Set(~object, i++, Rect(0, 0, 0, 0));
+					}
+					if(const VectorGeomArg<Point> *pa = info->PointArgs()) {
+						int count = pa->GetCount(~object);
+						if(pa->CanSetCount()) {
+							VectorSerializePacked(indata, count);
+							if(count >= 0 && count <= 100000)
+								pa->SetCount(~object, count);
+							else
+								indata.SetError();
+						}
+						int i = 0;
+						while(i < count) {
+							Point pt;
+							VectorSerialize(indata, pt);
+							if(indata.IsError())
+								break;
+							pa->Set(~object, i++, pt);
+						}
+						while(i < count)
+							pa->Set(~object, i++, Point(0, 0));
+					}
+					for(int a = 0; a < info->GetCount(); a++) {
+						const VectorArg& arg = (*info)[a];
+						arg.Set(~object, arg.dflt);
+					}
+					while(!indata.IsEof() && !indata.IsError()) {
+						argtag = VMLoadTag(indata);
+						int f = info->FindVMArg(argtag);
+						if(f >= 0) {
+							Value v;
+							VectorSerialize(indata, v, (*info)[f].vtype);
+							(*info)[f].Set(~object, v);
+						}
+						else
+							indata.SetError();
+					}
+					if(!indata.IsError())
+						Add(object);
+				}
+			}
+		}
+	}
+}
+
+void VectorImage::SerializeVM(Stream& stream)
+{
+	if(stream.IsStoring())
+		SaveVM(stream);
+	else
+		LoadVM(stream);
+}
+
+Value VectorImage::GetLink(Point pt, Size sz) const
+{
+	if(sz.cx > 1 && sz.cy > 1) {
+		VectorMap< int, Index<int> > cont = Contains(Scaling(), Rect(pt, sz));
+		for(int i = 0; i < cont.GetCount(); i++) {
+			Value v = data->objects[cont.GetKey(i)].GetLink(pt, sz);
+			if(!IsNull(v))
+				return v;
+		}
+	}
+	return Value();
+}
+
+void VectorLineData::PaintCap(ScalingDraw& draw, int cap, int size, Color c, Point from, Point to) const
+{
+	Size dir = to - from;
+	double len = Length(dir);
+	if(!len)
+		return;
+	switch(cap) {
+		case CAP_ARROW: case CAP_THIN_ARROW: {
+			Point shift = from + iscale(dir, size, fceil(len));
+			Size dif = iscale(Size(dir.cy, -dir.cx), size >> (cap == CAP_ARROW ? 1 : 2), fceil(len));
+			Point poly[3] = { from, shift + dif, shift - dif };
+			draw.draw->DrawPolygon(poly, 3, c, Null, Null);
+			break;
+		}
+		case CAP_CIRCLE: {
+			int r = size >> 1;
+			Rect rc(from + iscale(dir, r, fround(Length(dir))), Size(1, 1));
+			rc.Inflate(r);
+			draw.draw->DrawEllipse(rc, c, Null, Null);
+			break;
+		}
+		case CAP_END_CIRCLE: {
+			Rect rc(from, Size(1, 1));
+			rc.Inflate(size >> 1, size >> 1);
+			draw.draw->DrawEllipse(rc, c, Null, Null);
+			break;
+		}
+	}
+}
+
+Point VectorLineData::ShrinkCap(ScalingDraw& draw, int cap, int size, Point from, Point to) const
+{
+	double len = Length(from - to);
+	if(!len)
+		return from;
+	switch(cap) {
+		case CAP_CIRCLE: {
+			return from + iscale(to - from, size, fceil(2 * len));
+		}
+
+		case CAP_ARROW: case CAP_THIN_ARROW: {
+			return from + iscale(to - from, size, fceil(len));
+		}
+	}
+	return from;
+}
+
+void VectorLineData::Paint(ScalingDraw& draw) const
+{
+	if(points.GetCount() < 2)
+		return;
+	Vector<Point> out;
+	out.SetCount(points.GetCount());
+	for(int i = 0; i < points.GetCount(); i++)
+		out[i] = points[i] * draw;
+	Point from = out[0], to = out.Top();
+	int cfrom = draw.X(begin_size), cto = draw.X(end_size);
+	out[0] = ShrinkCap(draw, begin_cap, cfrom, from, out[1]);
+	out.Top() = ShrinkCap(draw, end_cap, cto, to, out[out.GetCount() - 2]);
+	if(out.GetCount() == 2)
+		draw.draw->DrawLine(out[0], out[1], line_width, line_color);
+	else
+		draw.draw->DrawPolyline(out, line_width, line_color);
+	if(begin_cap)
+		PaintCap(draw, begin_cap, cfrom, begin_color, from, out[1]);
+	if(end_cap)
+		PaintCap(draw, end_cap, cto, end_color, to, out[out.GetCount() - 2]);
+}
+
+
+class VectorLineCapDisplayCls : public Display {
+public:
+	virtual void Paint(Draw& draw, const Rect& rc, const Value& v, Color ink, Color paper, dword style) const;
+};
+
+void VectorLineCapDisplayCls::Paint(Draw& draw, const Rect& rc, const Value& v, Color ink, Color paper, dword style) const
+{
+	draw.DrawRect(rc, paper);
+	Size size = rc.Size();
+	int sz = min(size.cx, size.cy);
+	Point p1(size.cy >> 1, size.cy >> 1);
+	Point p2(size.cx - (size.cy >> 1), size.cy >> 1);
+	draw.Clipoff(rc);
+	ScalingDraw sdraw(&draw);
+	VectorLineData data;
+	data.SetPoint(Vector<Point>() << p1 << p2).LineWidth(2).LineColor(ink)
+		.BeginCap(v).BeginSize(sz).BeginColor(ink).Paint(sdraw);
+	draw.End();
+}
+
+const Display& VectorLineCapDisplay()
+{
+	static VectorLineCapDisplayCls d;
+	return d;
+}
+
+const VectorInfo& VectorLine::ClassInfo()
+{
+	static VectorInfo i = VectorInfoFor<VectorLine>(
+		"VectorLine", "l",
+		NULL,
+		VectorGeomArgDef(&VectorLine::points),
+		Array<VectorArg>()
+		<< VectorArgDef(&VectorLine::line_color,  "LineColor",    "l",  Black())
+		<< VectorArgDef(&VectorLine::line_width,  "LineWidth",    "w",  0)
+		<< VectorArgDef(&VectorLine::begin_cap,   "BeginCap",     "b",  CAP_NONE, VectorArg::EDIT_LINE_CAP)
+		<< VectorArgDef(&VectorLine::begin_size,  "BeginSize",    "s",  10)
+		<< VectorArgDef(&VectorLine::begin_color, "BeginColor",   "m",  Black())
+		<< VectorArgDef(&VectorLine::end_cap,     "EndCap",       "e",  CAP_NONE, VectorArg::EDIT_LINE_CAP)
+		<< VectorArgDef(&VectorLine::end_size,    "EndSize",      "t",  10)
+		<< VectorArgDef(&VectorLine::end_color,   "EndColor",     "n",  Black())
+		<< VectorArgDef(&VectorLine::link,        "Link",         "z",  Null)
+	).DefaultName("Line")
+	.Icon(VecImg::line_object);
+	return i;
+}
+
+void VectorLine::Track(int track, Point start, Point end, dword keyflags)
+{
+	switch(track & TRACK_MASK) {
+		case TRACK_LINE_INSERT: {
+			int i = minmax(track >> INDEX_SHIFT, 0, points.GetCount());
+			points.Insert(i, end);
+			break;
+		}
+		case TRACK_LINE_REMOVE: {
+			int i = minmax(track >> INDEX_SHIFT, 0, points.GetCount() - 1);
+			if(points.GetCount() > 2 && i >= 0)
+				points.Remove(i);
+			break;
+		}
+		default: VectorObject::Track(track, start, end, keyflags);
+	}
+}
+
+void VectorLine::DragPaint(ScalingDraw& draw) const
+{
+	if(points.GetCount() < 2)
+		return;
+	Vector<Point> out;
+	out.SetCount(points.GetCount());
+	for(int i = 0; i < points.GetCount(); i++)
+		out[i] = points[i] * draw;
+	if(out.GetCount() == 2)
+		draw.draw->DrawLine(out[0], out[1], 0, Black());
+	else
+		draw.draw->DrawPolyline(out, 0, Black());
+}
+
+int VectorLine::Nearest(const Scaling& scaling, Point pt, int& maxdistsquared) const
+{
+	int s2, track = -1, md = 10000;
+	for(int i = 0; i < points.GetCount(); i++)
+		if((s2 = Squared(pt - points[i] * scaling)) < tabs(maxdistsquared)) {
+			maxdistsquared = s2;
+			md = s2;
+			track = (i << INDEX_SHIFT) | TRACK_POINT | ARG_MASK;
+		}
+	if(md <= 100)
+		return track;
+	for(int i = 1; i < points.GetCount(); i++)
+		if((s2 = GetLineDistanceSquared(points[i - 1] * scaling, points[i] * scaling, pt) + 10) < tabs(maxdistsquared)) {
+			maxdistsquared = s2;
+			track = TRACK_MOVE;
+		}
+	for(int i = 0; i <= points.GetCount(); i++) {
+		Point addpt, rmpt;
+		GetAddRmPoint(scaling, i, addpt, rmpt);
+		int s2;
+		if(!IsNull(addpt) && (s2 = Squared(addpt - pt)) < tabs(maxdistsquared)) {
+			maxdistsquared = s2;
+			track = (i << INDEX_SHIFT) | TRACK_LINE_INSERT;
+		}
+		if(!IsNull(rmpt) && (s2 = Squared(rmpt - pt)) < tabs(maxdistsquared)) {
+			maxdistsquared = s2;
+			track = (i << INDEX_SHIFT) | TRACK_LINE_REMOVE;
+		}
+	}
+	return track;
+}
+
+Image VectorLine::Cursor(int track, dword keyflags) const
+{
+	switch(track & TRACK_MASK) {
+		case TRACK_LINE_INSERT: return VecImg::line_insert_cursor();
+		case TRACK_LINE_REMOVE: return VecImg::line_remove_cursor();
+		default: return VectorObject::Cursor(track, keyflags);
+	}
+}
+
+void VectorLine::Create(Point from, Point to, dword keyflags)
+{
+	points.SetCount(2);
+	points[0] = from;
+	points[1] = to;
+}
+
+static void PaintAddBox(Draw& draw, Point pt, bool is_hot)
+{
+	Color c = (is_hot ? Color(0, 192, 0) : Green());
+	draw.DrawRect(pt.x - 4, pt.y - 4, 9, 1, c);
+	draw.DrawRect(pt.x - 4, pt.y - 4, 1, 9, c);
+	draw.DrawRect(pt.x - 4, pt.y + 4, 9, 1, c);
+	draw.DrawRect(pt.x + 4, pt.y - 4, 1, 9, c);
+	draw.DrawRect(pt.x - 2, pt.y, 5, 1, c);
+	draw.DrawRect(pt.x, pt.y - 2, 1, 5, c);
+}
+
+static void PaintRemoveBox(Draw& draw, Point pt, bool is_hot)
+{
+	Color c = (is_hot ? Color(192, 0, 0) : Red());
+	draw.DrawRect(pt.x - 4, pt.y - 4, 9, 1, c);
+	draw.DrawRect(pt.x - 4, pt.y - 4, 1, 9, c);
+	draw.DrawRect(pt.x - 4, pt.y + 4, 9, 1, c);
+	draw.DrawRect(pt.x + 4, pt.y - 4, 1, 9, c);
+	draw.DrawRect(pt.x - 2, pt.y, 5, 1, c);
+}
+
+Size VectorLine::GetOutVector(const Scaling& scaling, int i, int factor) const
+{
+	if(points.GetCount() <= 1)
+		return Size(factor, 0);
+	Size invec;
+	if(i == 0)
+		invec = points[i + 1] - points[i];
+	else if(i >= points.GetCount() - 1)
+		invec = points[points.GetCount() - 2] - points.Top();
+	else
+		invec = ScaleSize(points[i + 1] - points[i], 1000) + ScaleSize(points[i - 1] - points[i], 1000);
+	return ScaleSize(-invec * scaling, factor);
+}
+
+void VectorLine::SelPaint(ScalingDraw& draw, const Index<int>& sel, bool is_hot) const
+{
+	VectorObject::SelPaint(draw, sel, is_hot);
+	for(int i = 0; i <= points.GetCount(); i++) {
+		Point addpt, rmpt;
+		GetAddRmPoint(draw, i, addpt, rmpt);
+		PaintAddBox(*draw.draw, addpt, is_hot);
+		if(!IsNull(rmpt))
+			PaintRemoveBox(*draw.draw, rmpt, is_hot);
+	}
+}
+
+void VectorLine::GetAddRmPoint(const Scaling& scaling, int i, Point& addpt, Point& rmpt) const
+{
+	int fac = 12 + (scaling.X(line_width) >> 1);
+	addpt = rmpt = Null;
+	switch(points.GetCount()) {
+		case 0: return;
+		case 1: addpt = points[0] * scaling + Size(fac, 0); return;
+	}
+	Size outvec = GetOutVector(scaling, i, fac);
+	Size side = (points.GetCount() <= 2 ? Size(0, 0) : ScaleSize(Size(outvec.cy, -outvec.cx), 8));
+	Point pt = points[min(i, points.GetCount() - 1)] * scaling;
+	if(i == 0) {
+		addpt = pt + outvec + side;
+		if(points.GetCount() > 2)
+			rmpt = pt + outvec - side;
+	}
+	else if(i < points.GetCount()) {
+		Size dir = pt - points[i - 1] * scaling;
+		addpt = ((points[i - 1] * scaling + pt) >> 1) + ScaleSize(Size(dir.cy, -dir.cx), fac);
+		if(points.GetCount() > 2) {
+			rmpt = pt + outvec;
+			if(i + 1 >= points.GetCount())
+				rmpt -= side;
+		}
+	}
+	else
+		addpt = pt + outvec + side;
+}
+
+Vector<Point> VectorRectData::GetPoly(ScalingDraw& draw, int lw) const
+{
+	Size rdelta(draw.X(rounding), draw.Y(rounding));
+	int newside = minmax<int>(max(rdelta.cx, rdelta.cy) >> 1, 0, 50);
+	Vector<Point> out;
+	Rect rc = rect * draw;
+	int w1 = lw >> 1, w2 = (lw + 1) >> 1;
+	rc.Deflate(w1, w1, w2, w2);
+	if(newside <= 0) {
+		out.SetCount(4);
+		out[0] = rc.TopRight();
+		out[1] = rc.TopLeft();
+		out[2] = rc.BottomLeft();
+		out[3] = rc.BottomRight();
+	}
+	else {
+		out.SetCount(4 * (newside + 1));
+		Point *d0 = out.Begin(), *d1 = d0 + 2 * (newside + 1), *d2 = d1, *d3 = out.End();
+		Rect inner = rc.Deflated(rdelta);
+		*d0++ = Point(rc.right, inner.top);
+		*--d1 = Point(rc.left, inner.top);
+		*d2++ = Point(rc.left, inner.bottom);
+		*--d3 = Point(rc.right, inner.bottom);
+		for(int i = 1; i < newside; i++) {
+			double a = i * (M_PI / 2) / newside;
+			int c = fround(rdelta.cx * cos(a)), s = fround(rdelta.cy * sin(a));
+			*d0++ = Point(inner.right + c, inner.top - s);
+			*--d1 = Point(inner.left - c, inner.top - s);
+			*d2++ = Point(inner.left - c, inner.bottom + s);
+			*--d3 = Point(inner.right + c, inner.bottom + s);
+		}
+		*d0++ = Point(inner.right, rc.top);
+		*--d1 = Point(inner.left, rc.top);
+		*d2++ = Point(inner.left, rc.bottom);
+		*--d3 = Point(inner.right, rc.bottom);
+		ASSERT(d0 == d1 && d2 == d3);
+	}
+	return out;
+}
+
+void VectorRectData::Paint(ScalingDraw& draw) const
+{
+	Rect drc = rect * draw, irc = drc;
+	switch(style) {
+		case STYLE_RECT: {
+			if(!IsNull(outline_color)) {
+				Size frmsize(max(draw.X(outline_width), 1), max(draw.Y(outline_width), 1));
+				irc.Deflate(frmsize);
+				DrawRectMinusRect(*draw.draw, drc, irc, outline_color);
+			}
+			draw.draw->DrawRect(irc, fill_color);
+			break;
+		}
+
+		case STYLE_ROUNDED_RECT: {
+			draw.draw->DrawPolygon(GetPoly(draw, outline_width), fill_color, outline_width, outline_color);
+			break;
+		}
+
+		case STYLE_ELLIPSE: {
+			int w2 = outline_width >> 1, w1 = (outline_width - 1) >> 1;
+			draw.draw->DrawEllipse(drc.Deflated(w1), fill_color, outline_width, outline_color);
+			break;
+		}
+	}
+
+	int ow = IsNull(outline_color) ? 0 : outline_width;
+	drc.Deflate(draw.X(ow + hmargin), draw.Y(ow + vmargin));
+	Font font = GetScaledFont(draw);
+	Size sz = GetTextSize(text, font);
+	int x, y;
+	switch(halign) {
+		case ALIGN_LEFT:  x = drc.left; break;
+		default:          x = (drc.left + drc.right - sz.cx) >> 1; break;
+		case ALIGN_RIGHT: x = drc.right - sz.cx; break;
+	}
+	switch(valign) {
+		case ALIGN_TOP:    y = drc.top; break;
+		default:           y = (drc.top + drc.bottom - sz.cy) >> 1; break;
+		case ALIGN_BOTTOM: y = drc.bottom - sz.cy; break;
+	}
+	draw.draw->DrawText(x, y, text, font, text_color);
+}
+
+Font VectorRectData::GetScaledFont(const ScalingDraw& draw) const
+{
+	int newht = draw.Y(font.GetHeight());
+	int newwd = draw.X(font.Info().GetAveWidth());
+	return font().Height(newht ? newht : 1).Width(newwd);
+}
+
+void VectorRect::DragPaint(ScalingDraw& draw) const
+{
+	switch(style) {
+		case STYLE_RECT: {
+			DrawLineRect(*draw.draw, rect * draw);
+			break;
+		}
+
+		case STYLE_ROUNDED_RECT: {
+			draw.draw->DrawPolygon(GetPoly(draw, 0), Null, 0, Black());
+			break;
+		}
+
+		case STYLE_ELLIPSE: {
+			Rect rc = rect * draw;
+			draw.draw->DrawEllipse(rc, Null, 0, Black());
+			DrawLineRect(*draw.draw, rc, PEN_DOT);
+			break;
+		}
+	}
+}
+
+/*
+int VectorRect::Nearest(Point pt, int& maxdistsquared) const
+{
+	if(style != STYLE_ELLIPSE)
+		return VectorObject::Nearest(pt, maxdistsquared);
+	int s2 = GetEllipseDistanceSquared(rect, pt);
+	if(tabs(s2) <= tabs(maxdistsquared)) {
+		maxdistsquared = s2;
+		return (0 << INDEX_SHIFT) | TRACK_RECT | RECT_MASK | ARG_MASK;
+	}
+	return -1;
+}
+*/
+
+const VectorInfo& VectorRect::ClassInfo()
+{
+	static VectorInfo i = VectorInfoFor<VectorRect>(
+		"VectorRect", "r",
+			VectorGeomArgDef(&VectorRect::rect),
+			NULL,
+			Array<VectorArg>()
+			<< VectorArgDef(&VectorRect::text_color,    "TextColor",    "x",  Black())
+			<< VectorArgDef(&VectorRect::fill_color,    "FillColor",    "c",  White())
+			<< VectorArgDef(&VectorRect::outline_color, "OutlineColor", "o",  Black())
+			<< VectorArgDef(&VectorRect::outline_width, "OutlineWidth", "u",  0)
+			<< VectorArgDef(&VectorRect::rounding,      "Rounding",     "r",  10)
+			<< VectorArgDef(&VectorRect::style,         "Style",        "s",  STYLE_RECT, VectorArg::EDIT_RECT_STYLE)
+			<< VectorArgDef(&VectorRect::font,          "SetFont",      "f",  Arial(20))
+			<< VectorArgDef(&VectorRect::text,          "Text",         "t",  Null)
+			<< VectorArgDef(&VectorRect::halign,        "AlignHorz",    "h",  ALIGN_CENTER, VectorArg::EDIT_ALIGN_HORZ)
+			<< VectorArgDef(&VectorRect::valign,        "AlignVert",    "v",  ALIGN_CENTER, VectorArg::EDIT_ALIGN_VERT)
+			<< VectorArgDef(&VectorRect::hmargin,       "MarginHorz",   "m",  0)
+			<< VectorArgDef(&VectorRect::vmargin,       "MarginVert",   "n",  0)
+			<< VectorArgDef(&VectorRect::link,          "Link",         "z",  Null)
+	).DefaultName("Rectangular")
+	.Icon(VecImg::rect_object);
+	return i;
+}
+
+void VectorArcData::Paint(ScalingDraw& draw) const
+{
+	Rect rlim = rect * draw;
+	rlim.Deflate(line_width >> 1);
+	draw.draw->DrawArc(rlim, from * draw, to * draw, line_width, line_color);
+}
+
+void VectorArc::DesignPaint(ScalingDraw& draw) const
+{
+	VectorArcData::Paint(draw);
+	Point center = (rect * draw).CenterPoint();
+	draw.draw->DrawLine(center, from * draw, PEN_DOT);
+	draw.draw->DrawLine(center, to * draw, PEN_DOT);
+}
+
+void VectorArc::DragPaint(ScalingDraw& draw) const
+{
+	Rect rlim = rect * draw;
+	draw.draw->DrawArc(rlim, from * draw, to * draw, 0, Black());
+	Point center = rlim.CenterPoint();
+	draw.draw->DrawLine(center, from * draw, PEN_DOT);
+	draw.draw->DrawLine(center, to * draw, PEN_DOT);
+	DrawLineRect(*draw.draw, rlim, PEN_DOT);
+}
+
+int VectorArc::Nearest(const Scaling& scaling, Point pt, int& maxdistsquared) const
+{
+	int s2, track = -1;
+	if((s2 = GetEllipseDistanceSquared(rect * scaling, pt)) < tabs(maxdistsquared)) {
+		maxdistsquared = s2;
+		track = (0 << INDEX_SHIFT) | TRACK_RECT | ARG_MASK | RECT_MASK;
+	}
+	if((s2 = Squared(pt - from * scaling)) < tabs(maxdistsquared)) {
+		maxdistsquared = s2;
+		track = (0 << INDEX_SHIFT) | TRACK_POINT | ARG_MASK;
+	}
+	if((s2 = Squared(pt - to * scaling)) < tabs(maxdistsquared)) {
+		maxdistsquared = s2;
+		track = (1 << INDEX_SHIFT) | TRACK_POINT | ARG_MASK;
+	}
+	if(track >= 0)
+		return track;
+	Point c = rect.CenterPoint();
+	if((s2 = GetLineDistanceSquared(c, from * scaling, pt)) < tabs(maxdistsquared)) {
+		maxdistsquared = s2;
+		track = (0 << INDEX_SHIFT) | TRACK_POINT | ARG_MASK;
+	}
+	if((s2 = GetLineDistanceSquared(c, to * scaling, pt)) < tabs(maxdistsquared)) {
+		maxdistsquared = s2;
+		track = (1 << INDEX_SHIFT) | TRACK_POINT | ARG_MASK;
+	}
+	return track;
+}
+
+const VectorInfo& VectorArc::ClassInfo()
+{
+	static VectorInfo i = VectorInfoFor<VectorArc>(
+		"VectorArc", "a",
+			VectorGeomArgDef(&VectorArc::rect),
+			VectorGeomArgDef(&VectorArc::from, &VectorArc::to),
+			Array<VectorArg>()
+			<< VectorArgDef(&VectorArc::line_color, "LineColor", "l",  Black())
+			<< VectorArgDef(&VectorArc::line_width, "LineWidth", "w",  0)
+			<< VectorArgDef(&VectorArc::link,       "Link",      "z",  Null)
+	).DefaultName("Arc")
+	.Icon(VecImg::arc_object);
+	return i;
+}
diff --git a/uppsrc/VectorDes/VectorObj.h b/uppsrc/VectorDes/VectorObj.h
new file mode 100644
index 000000000..951d780dc
--- /dev/null
+++ b/uppsrc/VectorDes/VectorObj.h
@@ -0,0 +1,493 @@
+#ifndef _VectorDes_VectorObj_h_
+#define _VectorDes_VectorObj_h_
+
+#define IMAGEFILE  <VectorDes/VectorDes.iml>
+#define IMAGECLASS VecImg
+#include <Draw/iml_header.h>
+
+template <class B, class T> struct Newer { static One<B> New() { return new T; } };
+
+template <class T> struct VType          { enum { VTYPE = ERROR_V }; };
+template <>        struct VType<int>     { enum { VTYPE = INT_V }; };
+template <>        struct VType<int64>   { enum { VTYPE = INT64_V }; };
+template <>        struct VType<double>  { enum { VTYPE = DOUBLE_V }; };
+template <>        struct VType<String>  { enum { VTYPE = STRING_V }; };
+template <>        struct VType<WString> { enum { VTYPE = WSTRING_V }; };
+template <>        struct VType<Date>    { enum { VTYPE = DATE_V }; };
+template <>        struct VType<Time>    { enum { VTYPE = TIME_V }; };
+//template <>        struct VType<Point>   { enum { VTYPE = POINT_V }; };
+//template <>        struct VType<Rect>    { enum { VTYPE = RECT_V }; };
+template <>        struct VType<Color>   { enum { VTYPE = COLOR_V }; };
+template <>        struct VType<Font>    { enum { VTYPE = FONT_V }; };
+
+void DrawHotRect(Draw& draw, int x, int y, int cx, int cy, bool hot, Color color);
+
+inline int AlignCoord(int pos, int size, Alignment align)
+{
+	return align == ALIGN_RIGHT ? pos - size : align == ALIGN_CENTER ? pos - (size >> 1) : pos;
+}
+
+inline Point AlignPoint(Point pos, Size size, Alignment halign, Alignment valign)
+{
+	return Point(AlignCoord(pos.x, size.cx, halign), AlignCoord(pos.y, size.cy, valign));
+}
+
+String FormatVectorFont(Font f);
+Font   ParseVectorFont(CParser& parser);
+
+struct Scaling
+{
+	Scaling(Size image_size = Size(1, 1), Size pixel_size = Size(1, 1)) : image_size(image_size), pixel_size(pixel_size) {}
+
+	Size image_size;
+	Size pixel_size;
+
+	int X(int x) const { return iscale(x, pixel_size.cx, image_size.cx); }
+	int Y(int y) const { return iscale(y, pixel_size.cy, image_size.cy); }
+};
+
+inline Point operator * (Point pt, const Scaling& sc) { return iscale(pt, sc.pixel_size, sc.image_size); }
+inline Size  operator * (Size sz, const Scaling& sc)  { return iscale(sz, sc.pixel_size, sc.image_size); }
+extern Rect  operator * (Rect rc, const Scaling& sc);
+
+inline Point operator / (Point pt, const Scaling& sc) { return iscale(pt, sc.image_size, sc.pixel_size); }
+inline Size  operator / (Size sz, const Scaling& sc)  { return iscale(sz, sc.image_size, sc.pixel_size); }
+extern Rect  operator / (Rect rc, const Scaling& sc);
+
+struct ScalingDraw : public Scaling
+{
+	ScalingDraw(Draw *draw = NULL, Scaling scaling = Scaling())
+		: Scaling(scaling), draw(draw) {}
+
+	Draw *draw;
+};
+
+void DrawLineRect(Draw& draw, const Rect& rc, int width = 0, Color color = Black());
+
+class VectorObject;
+
+class VectorArg
+{
+public:
+	enum {
+		EDIT_VALUE,
+		EDIT_DOC,
+		EDIT_LINE_WIDTH,
+		EDIT_LINE_STYLE,
+		EDIT_ALIGN_HORZ,
+		EDIT_ALIGN_VERT,
+		EDIT_RECT_STYLE,
+		EDIT_LINE_CAP,
+	};
+
+	VectorArg(String name, String vm_name, int vtype, Value dflt, int editor = EDIT_VALUE)
+		: name(name), vm_name(vm_name), vtype(vtype), dflt(dflt), editor(editor) {}
+	virtual ~VectorArg() {}
+
+	virtual Value    Get(const VectorObject *obj) const = 0;
+	virtual void     Set(VectorObject *obj, Value v) const = 0;
+
+	static One<Ctrl> CreateEditor(int vtype, int editor);
+
+public:
+	String           name;
+	String           vm_name;
+	int              vtype;
+	Value            dflt;
+	int              editor;
+};
+
+template <class O, class A>
+class VectorArgFor : public VectorArg
+{
+public:
+	VectorArgFor(A O::*ref, String name, String vm_name, Value dflt, int editor = EDIT_VALUE)
+	: VectorArg(name, vm_name, VType<A>::VTYPE, dflt, editor), ref(ref) {}
+
+	virtual Value Get(const VectorObject *obj) const    { return dynamic_cast<const O *>(obj)->*ref; }
+	virtual void  Set(VectorObject *obj, Value v) const { dynamic_cast<O *>(obj)->*ref = v; }
+
+private:
+	A             O::*ref;
+};
+
+template <class O, class A>
+VectorArgFor<O, A> *VectorArgDef(A O::*ref, String name, String vm_name, Value dflt = Null, int editor = VectorArg::EDIT_VALUE)
+{ return new VectorArgFor<O, A>(ref, name, vm_name, dflt, editor); }
+
+template <class A>
+class VectorGeomArg {
+public:
+	VectorGeomArg() {}
+	virtual ~VectorGeomArg() {}
+
+	virtual A    Get(const VectorObject *obj, int index) const = 0;
+	virtual void Set(VectorObject *obj, int index, const A& a) const = 0;
+
+	virtual int  GetCount(const VectorObject *obj) const = 0;
+	virtual bool CanSetCount() const { return false; }
+	virtual void SetCount(VectorObject *obj, int c) const { NEVER(); }
+};
+
+template <class O, class A, int N>
+class VectorGeomArgFixed : public VectorGeomArg<A>
+{
+public:
+	VectorGeomArgFixed(A O::**ref_) { for(int i = 0; i < N; i++) ref[i] = ref_[i]; }
+
+	virtual A    Get(const VectorObject *obj, int i) const       { ASSERT(i >= 0 && i < N); return dynamic_cast<const O *>(obj)->*(ref[i]); }
+	virtual void Set(VectorObject *obj, int i, const A& a) const { ASSERT(i >= 0 && i < N); dynamic_cast<O *>(obj)->*(ref[i]) = a; }
+
+	virtual int  GetCount(const VectorObject *obj) const         { return N; }
+
+private:
+	A            O::*ref[N];
+};
+
+template <class O, class A>
+inline VectorGeomArgFixed<O, A, 1> *VectorGeomArgDef(A O::*ref)
+{ A O::*args[] = { ref }; return new VectorGeomArgFixed<O, A, 1>(args); }
+
+template <class O, class A>
+inline VectorGeomArgFixed<O, A, 2> *VectorGeomArgDef(A O::*ra, A O::*rb)
+{ A O::*args[] = { ra, rb }; return new VectorGeomArgFixed<O, A, 2>(args); }
+
+template <class O, class A>
+inline VectorGeomArgFixed<O, A, 3> *VectorGeomArgDef(A O::*ra, A O::*rb, A O::*rc)
+{ A O::*args[] = { ra, rb, rc }; return new VectorGeomArgFixed<O, A, 3>(args); }
+
+template <class O, class A>
+class VectorGeomArgFloat : public VectorGeomArg<A>
+{
+public:
+	VectorGeomArgFloat(Vector<A> O::*ref) : ref(ref) {}
+
+	virtual A    Get(const VectorObject *obj, int i) const       { return (dynamic_cast<const O *>(obj)->*ref)[i]; }
+	virtual void Set(VectorObject *obj, int i, const A& a) const { (dynamic_cast<O *>(obj)->*ref)[i] = a; }
+
+	virtual int  GetCount(const VectorObject *obj) const         { return (dynamic_cast<const O *>(obj)->*ref).GetCount(); }
+	virtual bool CanSetCount() const                             { return true; }
+	virtual void SetCount(VectorObject *obj, int c) const        { (dynamic_cast<O *>(obj)->*ref).SetCount(c); }
+
+private:
+	Vector<A>    O::*ref;
+};
+
+template <class O, class A>
+inline VectorGeomArgFloat<O, A> *VectorGeomArgDef(Vector<A> O::*ref)
+{ return new VectorGeomArgFloat<O, A>(ref); }
+
+class VectorInfo
+{
+public:
+	VectorInfo(String type, String vm_type, One<VectorObject> (*newfunc)(),
+		One< VectorGeomArg<Rect> > rect_args, One< VectorGeomArg<Point> > point_args, Array<VectorArg> args);
+
+	VectorInfo&       Name(int lng, String n)         { name.GetAdd(lng) = n; return *this; }
+	VectorInfo&       DefaultName(String n)           { default_name = n; return *this; }
+	VectorInfo&       Icon(Image i)                   { icon = i; return *this; }
+
+	One<VectorObject> New() const                     { return (*newfunc)(); }
+
+	int               FindArg(String name) const;
+	int               FindVMArg(String vm_name) const { return vm_index.Find(vm_name); }
+	String            GetType() const                 { return type; }
+	String            GetVMType() const               { return vm_type; }
+	String            GetName(int lang) const;
+	int               GetCount() const                { return args.GetCount(); }
+	const VectorArg&  operator [] (int i) const       { return args[i]; }
+	const VectorGeomArg<Rect> *RectArgs() const       { return ~rects; }
+	const VectorGeomArg<Point> *PointArgs() const     { return ~points; }
+
+public:
+	String            type;
+	String            vm_type;
+	VectorMap<int, String> name;
+	String            default_name;
+	One<VectorObject> (*newfunc)();
+	Image             icon;
+	Index<String>     vm_index;
+	Array<VectorArg>  args;
+	One< VectorGeomArg<Rect> > rects;
+	One< VectorGeomArg<Point> > points;
+};
+
+template <class T>
+VectorInfo VectorInfoFor(String type, String vm_type,
+	One< VectorGeomArg<Rect> > rects, One< VectorGeomArg<Point> > points, Array<VectorArg> args)
+{ return VectorInfo(type, vm_type, &Newer<VectorObject, T>::New, rects, points, args); }
+
+class VectorObject
+{
+public:
+	VectorObject() {}
+	virtual ~VectorObject() {}
+
+	virtual One<VectorObject>       Copy() const;
+	virtual void                    Paint(ScalingDraw& draw) const = 0;
+	virtual void                    DesignPaint(ScalingDraw& draw) const;
+	virtual void                    DragPaint(ScalingDraw& draw) const;
+	virtual void                    SelPaint(ScalingDraw& draw, const Index<int>& sel, bool is_hot) const;
+	virtual Value                   GetLink(Point pt, Size sz) const;
+	virtual const VectorInfo&       Info() const = 0;
+
+	int                             GetArgCount() const     { return Info().GetCount(); }
+	int                             GetArgType(int i) const { return Info()[i].vtype; }
+	Value                           GetArg(int i) const     { return Info()[i].Get(this); }
+	void                            SetArg(int i, Value v)  { Info()[i].Set(this, v); }
+	virtual Rect                    GetBox() const;
+
+	enum Consts {
+		TRACK_MASK          = 0x03F,
+		RECT_MASK           = 0x040,
+		ARG_MASK            = 0x080,
+		INDEX_SHIFT         = 8,
+
+		TRACK_RECT_LEFT     = 0x01,
+		TRACK_RECT_TOP      = 0x02,
+		TRACK_RECT_RIGHT    = 0x04,
+		TRACK_RECT_BOTTOM   = 0x08,
+		TRACK_RECT_SIDES    = 0x0F,
+		TRACK_RECT          = 0x10,
+		TRACK_POINT         = 0x11,
+		TRACK_MOVE          = 0x12,
+		TRACK_IMAGE_SIZE    = 0x13,
+		TRACK_NEW           = 0x14,
+		TRACK_SELECT        = 0x15,
+		TRACK_SIZE          = 0x16,
+	};
+
+	virtual Index<int>              Contains(const Scaling& scaling, Rect rc) const;
+	virtual int                     Nearest(const Scaling& scaling, Point pt, int& maxdistsquared) const;
+	virtual Point                   TrackPoint(int track) const;
+
+	virtual void                    Create(Point from, Point to, dword keyflags);
+	virtual void                    Track(int track, Point start, Point end, dword keyflags);
+	virtual void                    Align(Alignment halign, Alignment valign, Point anchor);
+	virtual void                    EqualSize(Size sz);
+	virtual Image                   Cursor(int track, dword keyflags) const;
+
+	String                          ToString() const;
+	static One<VectorObject>        Load(CParser& parser);
+
+	virtual String                  FormatCoords() const;
+
+	static VectorMap<String, const VectorInfo *>& RegisteredObjects();
+	static VectorMap<String, const VectorInfo *>& RegisteredVMIndex();
+	static void                     RegisterInfo(const VectorInfo& vi);
+};
+
+class VectorImage : Moveable<VectorImage>
+{
+public:
+	struct Data : public RefBase {
+		Data() : size(100, 100) {}
+
+		String              name;
+		Size                size;
+		Array<VectorObject> objects;
+	};
+
+public:
+	VectorImage();
+	VectorImage(RefPtr<Data> data) : data(data)   {}
+	VectorImage(const Value& value);
+
+	operator            Value () const            { return RawToValue(*this); }
+
+	void                Clone();
+
+	void                Clear()                   { data = new Data; }
+	bool                IsEmpty() const           { return data->objects.IsEmpty(); }
+	int                 GetCount() const          { return data->objects.GetCount(); }
+	const VectorObject& operator [] (int i) const { return data->objects[i]; }
+	VectorObject&       operator [] (int i)       { return data->objects[i]; }
+
+	void                Add(One<VectorObject> o)  { data->objects.Add(-o); }
+	void                Insert(int pos, One<VectorObject> o) { data->objects.Insert(pos, -o); }
+	void                Remove(int i)             { data->objects.Remove(i); }
+	One<VectorObject>   Detach(int i)             { return data->objects.Detach(i); }
+	void                Move(int i, int j)        { data->objects.Move(i, j); }
+	void                Reserve(int i)            { data->objects.Reserve(i); }
+
+	void                Paint(ScalingDraw& draw) const;
+	void                DesignPaint(ScalingDraw& draw) const;
+	void                DragPaint(ScalingDraw& draw) const;
+
+	Size                GetSize() const           { return data->size; }
+	void                SetSize(Size sz)          { data->size = sz; }
+
+	String              GetName() const           { return data->name; }
+	void                SetName(String n)         { data->name = n; }
+
+	String              SaveVec(int index) const;
+	void                LoadVec(CParser& parser);
+
+	void                SaveVM(Stream& data) const;
+	void                LoadVM(Stream& data);
+	void                SerializeVM(Stream& stream);
+
+	VectorMap< int, Index<int> > Contains(const Scaling& scaling, Rect rc) const;
+	Point               Nearest(const Scaling& scaling, Point pt, int maxdistsquared) const;
+	Point               Nearest(const Scaling& scaling, Point pt, int maxdistsquared, const Vector<int>& selection) const;
+	Point               TrackPoint(Point track) const;
+//	Point               FindNearest(Point pt, int maxdistsquared, const VectorMap<int, int>& selection) const;
+	Value               GetLink(Point pt, Size sz) const;
+
+	Image               Cursor(Point track, dword keyflags) const;
+
+public:
+	RefPtr<Data>        data;
+};
+
+struct VectorLineData
+{
+	VectorLineData&         SetPoint(Vector<Point> pt)   { points = pt; return *this; }
+	VectorLineData&         LineColor(Color c)           { line_color = c; return *this; }
+	VectorLineData&         LineWidth(int w)             { line_width = w; return *this; }
+	VectorLineData&         BeginCap(int c)              { begin_cap = c; return *this; }
+	VectorLineData&         BeginSize(int s)             { begin_size = s; return *this; }
+	VectorLineData&         BeginColor(Color c)          { begin_color = c; return *this; }
+	VectorLineData&         EndCap(int c)                { end_cap = c; return *this; }
+	VectorLineData&         EndSize(int s)               { end_size = s; return *this; }
+	VectorLineData&         EndColor(Color c)            { end_color = c; return *this; }
+	VectorLineData&         Link(String l)               { link = l; return *this; }
+
+	void                    Paint(ScalingDraw& draw) const;
+	void                    PaintCap(ScalingDraw& draw, int cap, int size, Color color, Point from, Point to) const;
+	Point                   ShrinkCap(ScalingDraw& draw, int cap, int size, Point from, Point to) const;
+
+	Vector<Point>           points;
+	Color                   line_color;
+	int                     line_width;
+	enum { CAP_NONE, CAP_ARROW, CAP_CIRCLE, CAP_END_CIRCLE, CAP_SQUARE, CAP_THIN_ARROW, CAP_COUNT };
+	int                     begin_cap;
+	int                     begin_size;
+	Color                   begin_color;
+	int                     end_cap;
+	int                     end_size;
+	Color                   end_color;
+	String                  link;
+};
+
+const Display& VectorLineCapDisplay();
+
+class VectorLine : public VectorObject, public VectorLineData
+{
+public:
+	virtual void                    Paint(ScalingDraw& draw) const       { VectorLineData::Paint(draw); }
+	virtual void                    DragPaint(ScalingDraw& draw) const;
+	virtual const VectorInfo&       Info() const                         { return ClassInfo(); }
+	virtual int                     Nearest(const Scaling& scaling, Point pt, int& maxdistsquared) const;
+	virtual void                    Create(Point from, Point to, dword keyflags);
+	virtual void                    SelPaint(ScalingDraw& draw, const Index<int>& sel, bool is_hot) const;
+	virtual Image                   Cursor(int track, dword keyflags) const;
+	virtual void                    Track(int track, Point start, Point end, dword keyflags);
+
+	static const VectorInfo&        ClassInfo();
+	static void                     Register()                           { RegisterInfo(ClassInfo()); }
+
+	enum {
+		TRACK_LINE_INSERT = 0x20,
+		TRACK_LINE_REMOVE = 0x21,
+	};
+
+private:
+	Size                            GetOutVector(const Scaling& scaling, int i, int factor) const;
+	void                            GetAddRmPoint(const Scaling& scaling, int i, Point& addpt, Point& rmpt) const;
+};
+
+struct VectorRectData
+{
+	VectorRectData&                 SetRect(Rect r)        { rect = r; return *this; }
+	VectorRectData&                 FillColor(Color c)     { fill_color = c; return *this; }
+	VectorRectData&                 OutlineColor(Color o)  { outline_color = o; return *this; }
+	VectorRectData&                 OutlineWidth(int w)    { outline_width = w; return *this; }
+	VectorRectData&                 Rounding(int r)        { rounding = r; return *this; }
+	VectorRectData&                 Style(int s)           { style = s; return *this; }
+	VectorRectData&                 TextColor(Color c)     { text_color = c; return *this; }
+	VectorRectData&                 SetFont(Font f)        { font = f; return *this; }
+	VectorRectData&                 Text(WString s)        { text = s; return *this; }
+	VectorRectData&                 AlignVert(Alignment v) { valign = v; return *this; }
+	VectorRectData&                 AlignHorz(Alignment h) { halign = h; return *this; }
+	VectorRectData&                 MarginHorz(int m)      { hmargin = m; return *this; }
+	VectorRectData&                 MarginVert(int m)      { vmargin = m; return *this; }
+	VectorRectData&                 Link(String l)         { link = l; return *this; }
+
+	void                            Paint(ScalingDraw& draw) const;
+	Vector<Point>                   GetPoly(ScalingDraw& draw, int line_width) const;
+	Font                            GetScaledFont(const ScalingDraw& draw) const;
+
+	Rect                            rect;
+	Color                           text_color;
+	Color                           fill_color;
+	Color                           outline_color;
+	int                             outline_width;
+	int                             rounding;
+	enum { STYLE_RECT, STYLE_ROUNDED_RECT, STYLE_ELLIPSE };
+	int                             style;
+	Font                            font;
+	WString                         text;
+	int                             halign, valign;
+	int                             hmargin, vmargin;
+	String                          link;
+};
+
+class VectorRect : public VectorObject, public VectorRectData
+{
+public:
+	virtual void                    Paint(ScalingDraw& draw) const       { VectorRectData::Paint(draw); }
+	virtual void                    DragPaint(ScalingDraw& draw) const;
+	virtual const VectorInfo&       Info() const                         { return ClassInfo(); }
+//	virtual int                     Nearest(Point pt, int& maxdistsquared) const;
+
+	static const VectorInfo&        ClassInfo();
+	static void                     Register()                           { RegisterInfo(ClassInfo()); }
+};
+
+struct VectorArcData
+{
+	VectorArcData&                  SetRect(Rect r)              { rect = r; return *this; }
+//	VectorArcData&                  SetColor(Color c)            { color = c; return *this; }
+	VectorArcData&                  SetPoint(Point p1, Point p2) { from = p1; to = p2; return *this; }
+	VectorArcData&                  LineColor(Color o)           { line_color = o; return *this; }
+	VectorArcData&                  LineWidth(int w)             { line_width = w; return *this; }
+	VectorArcData&                  Link(String l)               { link = l; return *this; }
+
+	void                            Paint(ScalingDraw& draw) const;
+
+	Rect                            rect;
+	Point                           from;
+	Point                           to;
+//	Color                           color;
+	Color                           line_color;
+	int                             line_width;
+	String                          link;
+};
+
+class VectorArc : public VectorObject, public VectorArcData
+{
+public:
+	virtual void                    Paint(ScalingDraw& draw) const       { VectorArcData::Paint(draw); }
+	virtual void                    DesignPaint(ScalingDraw& draw) const;
+	virtual void                    DragPaint(ScalingDraw& draw) const;
+	virtual int                     Nearest(const Scaling& scaling, Point pt, int& maxdistsquared) const;
+	virtual const VectorInfo&       Info() const                         { return ClassInfo(); }
+
+	static const VectorInfo&        ClassInfo();
+	static void                     Register()                           { RegisterInfo(ClassInfo()); }
+};
+
+inline void RegisterStdVectorObjects()
+{
+	VectorLine::Register();
+	VectorRect::Register();
+//	VectorRectRounded::Register();
+//	VectorEllipse::Register();
+	VectorArc::Register();
+//	VectorText::Register();
+//	VectorTextRect::Register();
+//	VectorTextRectJoin::Register();
+}
+
+#endif
diff --git a/uppsrc/VectorDes/VectorObj.icpp b/uppsrc/VectorDes/VectorObj.icpp
new file mode 100644
index 000000000..b4a102ea0
--- /dev/null
+++ b/uppsrc/VectorDes/VectorObj.icpp
@@ -0,0 +1 @@
+#include "VectorDes.h"
diff --git a/uppsrc/VectorDes/VectorRich.cpp b/uppsrc/VectorDes/VectorRich.cpp
new file mode 100644
index 000000000..5ff792259
--- /dev/null
+++ b/uppsrc/VectorDes/VectorRich.cpp
@@ -0,0 +1,120 @@
+#include "VectorDes.h"
+#pragma hdrstop
+
+struct RichObjectTypeVectorImageCls : public RichObjectType
+{
+	virtual String GetTypeName(const Value&) const;
+	virtual String GetCreateName() const;
+	virtual Size   GetPhysicalSize(const Value& data) const;
+	virtual Size   GetPixelSize(const Value& data) const { return Size(0, 0); }
+	virtual void   Paint(const Value& data, Draw& w, Size sz) const;
+	virtual Value  Read(const String& s) const;
+	virtual String Write(const Value& v) const;
+//	virtual Value  ReadClipboard() const;
+//	virtual void   Menu(Bar& bar, RichObjectExchange& ex) const;
+	virtual void   DefaultAction(RichObject& ex) const;
+	virtual String GetLink(const Value& data, Point pt, Size sz) const;
+
+	struct Data : DeepCopyOption<Data> {
+		Data() {}
+		Data(const Value& v) { *this = ValueTo<Data>(v); }
+
+		operator           Value() const { return RawToValue(*this); }
+
+		void               Serialize(Stream& stream);
+
+		Color              background;
+		VectorImage        image;
+	};
+};
+
+RichObjectType *RichObjectTypeVectorImage() { return &Single<RichObjectTypeVectorImageCls>(); }
+
+void RichObjectTypeVectorImageCls::Data::Serialize(Stream& stream)
+{
+	int version = 1;
+	stream / version % background;
+	image.SerializeVM(stream);
+}
+
+String RichObjectTypeVectorImageCls::GetTypeName(const Value&) const
+{
+	return "VectorImage";
+}
+
+String RichObjectTypeVectorImageCls::GetCreateName() const
+{
+	return "Vector drawing";
+}
+
+/*
+RichObject CreateVectorImageObject(String text, Font font, Color color)
+{
+	RichObjectTypeVectorImageCls::Data data;
+	data.text = text;
+	data.font = font;
+	data.color = color;
+	RichObject obj(RichObjectTypeVectorImage(), data);
+	obj.SetYDelta(data.Parse() -> GetDescent());
+	return obj;
+}
+*/
+
+String RichObjectTypeVectorImageCls::GetLink(const Value& data, Point pt, Size sz) const
+{
+	if(IsTypeRaw<Data>(data))
+		return Data(data).image.GetLink(pt, sz);
+	return Value();
+}
+
+Size RichObjectTypeVectorImageCls::GetPhysicalSize(const Value& data) const
+{
+	if(IsTypeRaw<Data>(data))
+		return Data(data).image.GetSize() * 6;
+	return Size(0, 0);
+}
+
+Value RichObjectTypeVectorImageCls::Read(const String& s) const
+{
+	Data data;
+	StringStream ss(s);
+	ss % data;
+	if(ss.IsError())
+		return Value();
+	return RawToValue(data);
+}
+
+String RichObjectTypeVectorImageCls::Write(const Value& v) const
+{
+	if(IsTypeRaw<Data>(v)) {
+		StringStream ss;
+		Data d(v);
+		ss % d;
+		return ss;
+	}
+	return Null;
+}
+
+void RichObjectTypeVectorImageCls::Paint(const Value& data, Draw& w, Size sz) const
+{
+	w.DrawRect(sz, White);
+	if(IsTypeRaw<Data>(data)) {
+		VectorImage form = Data(data).image;
+		ScalingDraw sdraw(&w, Scaling(form.GetSize(), sz));
+		form.Paint(sdraw);
+	}
+}
+
+void RichObjectTypeVectorImageCls::DefaultAction(RichObject& ex) const
+{
+	bool RunDlgVectorImage(String& text, Font& font, Color& color);
+	static Data data;
+	RichObject obj = ex;
+	if(IsTypeRaw<Data>(obj.GetData()))
+		data = Data(obj.GetData());
+	data.image.Clone();
+	if(RunVectorImageEditor(data.image)) {
+		RichObject ro(RichObjectTypeVectorImage(), data);
+		ex = ro;
+	}
+}
diff --git a/uppsrc/VectorDes/src.tpp/VectorDes$en-us.tpp b/uppsrc/VectorDes/src.tpp/VectorDes$en-us.tpp
new file mode 100644
index 000000000..a852113ac
--- /dev/null
+++ b/uppsrc/VectorDes/src.tpp/VectorDes$en-us.tpp
@@ -0,0 +1,36 @@
+TITLE("class VectorDes")
+COMPRESSED
+120,156,133,142,205,107,19,65,24,198,255,149,129,126,160,177,
+141,243,181,217,233,238,37,104,60,120,241,96,209,203,178,212,
+109,178,41,129,196,64,118,227,69,132,105,165,94,235,49,32,
+104,206,57,20,252,0,61,237,36,37,9,173,160,20,12,122,
+170,77,2,45,61,212,90,179,137,45,30,178,78,54,165,182,
+39,103,96,94,222,119,126,207,243,188,6,152,156,132,51,112,
+2,254,231,104,9,59,109,21,179,174,105,184,20,197,84,253,
+230,53,132,84,169,69,82,75,84,68,152,66,16,197,49,249,
+32,130,176,130,8,69,12,207,81,70,8,131,90,50,107,57,
+142,105,100,49,99,186,133,84,93,234,240,12,158,192,170,130,
+145,74,25,101,136,168,12,75,57,134,16,67,85,202,41,97,
+88,209,82,182,147,52,13,73,19,153,194,8,37,132,198,230,
+40,130,68,145,59,32,72,177,42,43,100,136,33,5,51,109,
+209,114,108,211,120,188,240,100,234,214,157,217,123,243,192,112,
+144,174,61,144,247,190,157,116,243,133,132,237,140,154,112,23,
+112,62,210,34,192,152,130,112,22,194,8,8,191,22,204,179,
+254,31,99,78,155,134,131,117,48,42,68,143,196,175,192,40,
+140,98,69,185,10,140,235,113,8,18,118,33,243,200,78,129,
+116,33,159,51,141,136,156,128,115,143,121,215,114,51,201,187,
+210,41,52,129,99,19,89,110,200,101,199,129,32,157,47,128,
+197,98,38,155,202,60,92,2,201,162,227,230,115,192,136,156,
+197,223,206,89,75,182,9,236,84,70,54,78,244,178,73,60,
+126,1,210,8,133,108,26,83,8,95,174,4,242,124,221,42,
+127,234,28,85,253,234,135,167,226,249,207,230,110,175,254,253,
+216,235,123,252,116,184,220,229,124,208,232,181,184,95,219,95,
+109,85,151,121,191,217,218,243,251,229,205,215,237,158,88,59,
+22,239,131,17,37,33,62,248,216,107,249,53,30,82,253,38,
+15,169,183,157,63,146,242,74,34,120,225,29,92,196,246,249,
+24,107,241,17,246,174,221,27,214,189,146,76,60,120,22,82,
+131,207,220,223,184,148,87,126,243,187,246,165,35,214,118,189,
+83,17,136,77,81,249,38,214,197,43,177,82,62,169,119,15,
+55,4,223,18,219,199,98,251,112,200,127,5,193,73,163,219,
+40,249,59,63,134,205,74,165,189,215,232,239,28,73,207,32,
+88,55,255,2,129,225,56,251,
\ No newline at end of file
diff --git a/uppsrc/VectorDes/src.tpp/all.i b/uppsrc/VectorDes/src.tpp/all.i
new file mode 100644
index 000000000..dcd680e36
--- /dev/null
+++ b/uppsrc/VectorDes/src.tpp/all.i
@@ -0,0 +1,3 @@
+TOPIC("VectorDes$en-us")
+#include "VectorDes$en-us.tpp"
+END_TOPIC
diff --git a/uppsrc/VectorDes/test.vec b/uppsrc/VectorDes/test.vec
new file mode 100644
index 000000000..b5211fe75
--- /dev/null
+++ b/uppsrc/VectorDes/test.vec
@@ -0,0 +1,9 @@
+VECTOR_BEGIN(test1, 610, 600)
+	VECTOR_OBJ(VectorRect, .SetRect(Rect(445, 47, 594, 501)).OutlineWidth(2).FillColor(Color(255, 205, 192)))
+	VECTOR_OBJ(VectorLine, .SetPoint(Vector<Point>() << Point(0, 436) << Point(424, 436) << Point(424, 212) << Point(245, 152) << Point(56, 212) << Point(56, 84) << Point(444, 84)).EndSize(20).EndCap(5).BeginSize(20).BeginCap(5).LineWidth(3))
+VECTOR_END
+
+VECTOR_BEGIN(test2, 200, 200)
+	VECTOR_OBJ(VectorRect, .SetRect(Rect(11, 17, 151, 128)))
+	VECTOR_OBJ(VectorRect, .SetRect(Rect(17, 141, 183, 173)).Text("Hello world!").Style(1))
+VECTOR_END
diff --git a/uppsrc/Web/AUTHORS b/uppsrc/Web/AUTHORS
new file mode 100644
index 000000000..f782e5b62
--- /dev/null
+++ b/uppsrc/Web/AUTHORS
@@ -0,0 +1,2 @@
+Mirek Fidler <cxl@ntllib.org>
+Tomas Rylek  <rylek@volny.cz>
\ No newline at end of file
diff --git a/uppsrc/Web/COPYING b/uppsrc/Web/COPYING
new file mode 100644
index 000000000..33aa39102
--- /dev/null
+++ b/uppsrc/Web/COPYING
@@ -0,0 +1,30 @@
+Copyright (C) 2005 Mirek Fidler, Tomas Rylek and various contributors (see AUTHORS)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to
+deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies of the Software and its Copyright notices. In addition publicly
+documented acknowledgment must be given that this software has been used if no
+source code of this software is made available publicly. This includes
+acknowledgments in either Copyright notices, Manuals, Publicity and Marketing
+documents or any documentation provided with any product containing this
+software. This License does not apply to any software that links to the
+libraries provided by this software (statically or dynamically), but only to
+the software provided.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+-----------
+
+Please see the COPYING.PLAIN for a plain-english explanation of this notice
+and it's intent.
diff --git a/uppsrc/Web/COPYING-PLAIN b/uppsrc/Web/COPYING-PLAIN
new file mode 100644
index 000000000..770a8132f
--- /dev/null
+++ b/uppsrc/Web/COPYING-PLAIN
@@ -0,0 +1,33 @@
+Plain English Copyright Notice
+
+This file is not intended to be the actual License. The reason this file
+exists is that we here are programmers and engineers. We aren't lawyers. We
+provide licenses that we THINK say the right things, but we have our own
+intentions at heart. This is a plain-english explanation of what those
+intentions are, and if you follow them you will be within the "spirit" of
+the license.
+
+The intent is for us to enjoy writing software that is useful to us (the
+AUTHORS) and allow others to use it freely and also benefit from the work we
+put into making it. We don't want to restrict others using it. They should
+not *HAVE* to make the source code of the applications they write that
+simply link to these libraries (be that statically or dynamically), or for
+them to be limited as to what license they choose to use (be it open, closed
+or anything else). But we would like to know you are using these libraries.
+We simply would like to know that it has been useful to someone. This is why
+we ask for acknowledgement of some sort.
+
+You can do what you want with the source of this software - it doesn't
+matter. We still have it here for ourselves and it is open and free to use
+and download and play with. It can't be taken away. We don't really mind what
+you do with the source to your software. We would simply like to know that
+you are using it - especially if it makes it to a commerical product. If you
+simply e-mail all the AUTHORS (see COPYING and AUTHORS files) telling us, and
+then make sure you include a paragraph or page in the manual or in the "About.."
+box for the product with the copyright notice and state that you used this
+software, we will be very happy. If you want to contribute back modifications
+and fixes you may have made we will welcome those too with open arms (generally).
+If you want help with changes needed, ports needed or features to be added,
+arrangements can be easily made with some dialogue.
+
+Mirek Fidler <cxl@ntllib.org>
diff --git a/uppsrc/Web/SSL/AUTHORS b/uppsrc/Web/SSL/AUTHORS
new file mode 100644
index 000000000..f782e5b62
--- /dev/null
+++ b/uppsrc/Web/SSL/AUTHORS
@@ -0,0 +1,2 @@
+Mirek Fidler <cxl@ntllib.org>
+Tomas Rylek  <rylek@volny.cz>
\ No newline at end of file
diff --git a/uppsrc/Web/SSL/COPYING b/uppsrc/Web/SSL/COPYING
new file mode 100644
index 000000000..33aa39102
--- /dev/null
+++ b/uppsrc/Web/SSL/COPYING
@@ -0,0 +1,30 @@
+Copyright (C) 2005 Mirek Fidler, Tomas Rylek and various contributors (see AUTHORS)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to
+deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies of the Software and its Copyright notices. In addition publicly
+documented acknowledgment must be given that this software has been used if no
+source code of this software is made available publicly. This includes
+acknowledgments in either Copyright notices, Manuals, Publicity and Marketing
+documents or any documentation provided with any product containing this
+software. This License does not apply to any software that links to the
+libraries provided by this software (statically or dynamically), but only to
+the software provided.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+-----------
+
+Please see the COPYING.PLAIN for a plain-english explanation of this notice
+and it's intent.
diff --git a/uppsrc/Web/SSL/COPYING-PLAIN b/uppsrc/Web/SSL/COPYING-PLAIN
new file mode 100644
index 000000000..770a8132f
--- /dev/null
+++ b/uppsrc/Web/SSL/COPYING-PLAIN
@@ -0,0 +1,33 @@
+Plain English Copyright Notice
+
+This file is not intended to be the actual License. The reason this file
+exists is that we here are programmers and engineers. We aren't lawyers. We
+provide licenses that we THINK say the right things, but we have our own
+intentions at heart. This is a plain-english explanation of what those
+intentions are, and if you follow them you will be within the "spirit" of
+the license.
+
+The intent is for us to enjoy writing software that is useful to us (the
+AUTHORS) and allow others to use it freely and also benefit from the work we
+put into making it. We don't want to restrict others using it. They should
+not *HAVE* to make the source code of the applications they write that
+simply link to these libraries (be that statically or dynamically), or for
+them to be limited as to what license they choose to use (be it open, closed
+or anything else). But we would like to know you are using these libraries.
+We simply would like to know that it has been useful to someone. This is why
+we ask for acknowledgement of some sort.
+
+You can do what you want with the source of this software - it doesn't
+matter. We still have it here for ourselves and it is open and free to use
+and download and play with. It can't be taken away. We don't really mind what
+you do with the source to your software. We would simply like to know that
+you are using it - especially if it makes it to a commerical product. If you
+simply e-mail all the AUTHORS (see COPYING and AUTHORS files) telling us, and
+then make sure you include a paragraph or page in the manual or in the "About.."
+box for the product with the copyright notice and state that you used this
+software, we will be very happy. If you want to contribute back modifications
+and fixes you may have made we will welcome those too with open arms (generally).
+If you want help with changes needed, ports needed or features to be added,
+arrangements can be easily made with some dialogue.
+
+Mirek Fidler <cxl@ntllib.org>
diff --git a/uppsrc/Web/SSL/SSL.upp b/uppsrc/Web/SSL/SSL.upp
new file mode 100644
index 000000000..0ba37953f
--- /dev/null
+++ b/uppsrc/Web/SSL/SSL.upp
@@ -0,0 +1,37 @@
+uses
+	Web;
+
+acceptflags
+	NOSSL;
+
+library(WIN32 !NOSSL !SHARED) "out32\\ssleay32 out32\\libeay32";
+
+library(WIN32) "gdi32";
+
+library(LINUX !NOSSL) "crypto ssl";
+
+library(WIN32 !NOSSL SHARED) "out32dll\\ssleay32.lib out32dll\\libeay32.lib ";
+
+link(WIN32 DEBUG MSC SO) "/nodefaultlib:libc";
+
+link(WIN32 MT MSC SO) "/nodefaultlib:libc";
+
+link(WIN32 DEBUG MSC71 SO) "/nodefaultlib:libc";
+
+link(WIN32 MT MSC71 SO) "/nodefaultib:libc";
+
+link(WIN32 DEBUG MSC) "/nodefaultlib:libc";
+
+link(WIN32 MT MSC) "/nodefaultlib:libc";
+
+link(WIN32 DEBUG MSC71) "/nodefaultlib:libc";
+
+link(WIN32 MT MSC71) "/nodefaultlib:libc";
+
+file
+	WebSSL.h,
+	util.cpp,
+	Info readonly separator,
+	COPYING,
+	COPYING-PLAIN,
+	AUTHORS;
diff --git a/uppsrc/Web/SSL/WebSSL.h b/uppsrc/Web/SSL/WebSSL.h
new file mode 100644
index 000000000..db80a18db
--- /dev/null
+++ b/uppsrc/Web/SSL/WebSSL.h
@@ -0,0 +1,166 @@
+#ifndef __Web_SSL__
+#define __Web_SSL__
+
+#ifndef flagNOSSL
+
+#include <Web/Web.h>
+
+#include <openssl/ssl.h>
+#include <openssl/err.h>
+
+NAMESPACE_UPP
+
+void  *SSLAlloc(size_t size);
+void   SSLFree(void *ptr);
+void  *SSLRealloc(void *ptr, size_t size);
+
+String SSLGetLastError();
+String SSLToString(X509_NAME *name);
+String ASN1ToString(ASN1_STRING *time);
+Date   ASN1ToDate(ASN1_STRING *time);
+
+void   SSLInit();
+
+class SSLBuffer
+{
+public:
+	SSLBuffer(BUF_MEM *m = NULL) : buf_mem(m) {}
+	~SSLBuffer()                              { Clear(); }
+
+	bool     IsEmpty() const                  { return !buf_mem; }
+
+	bool     Set(BUF_MEM *b)                  { Clear(); return !!(buf_mem = b); }
+	bool     Create()                         { return Set(BUF_MEM_new()); }
+	void     Clear()                          { if(buf_mem) { BUF_MEM_free(buf_mem); buf_mem = NULL; } }
+	BUF_MEM *Detach()                         { BUF_MEM *b = buf_mem; buf_mem = NULL; return b; }
+
+	bool     Grow(int length);
+
+	String   Get() const;
+	bool     Set(String d);
+
+	operator BUF_MEM * () const { return buf_mem; }
+
+private:
+	BUF_MEM *buf_mem;
+};
+
+class SSLStream
+{
+public:
+	SSLStream(BIO *b = NULL) : bio(b) {}
+	~SSLStream()                       { Clear(); }
+
+	bool     IsEmpty() const           { return !bio; }
+
+	bool     Set(BIO *b)               { Clear(); return !!(bio = b); }
+	bool     Create(BIO_METHOD *meth)  { return Set(BIO_new(meth)); }
+	void     Clear()                   { if(bio) { BIO_free(bio); bio = NULL; } }
+
+	bool     OpenBuffer(const char *data, int length);
+	bool     CreateBuffer();
+	String   GetResult() const;
+
+	operator BIO * () const            { return bio; }
+
+private:
+	BIO     *bio;
+};
+
+class SSLKey
+{
+public:
+	SSLKey(EVP_PKEY *k = NULL) : key(k) {}
+	~SSLKey()                           { Clear(); }
+
+	bool      IsEmpty() const            { return !key; }
+
+	bool      Set(EVP_PKEY *k)           { Clear(); return !!(key = k); }
+	void      Clear()                    { if(key) { EVP_PKEY_free(key); key = NULL; } }
+	EVP_PKEY *Detach()                   { EVP_PKEY *k = key; key = NULL; return k; }
+
+	operator  EVP_PKEY * () const        { return key; }
+
+	bool      Load(String data);
+
+private:
+	EVP_PKEY *key;
+};
+
+class SSLCertificate
+{
+public:
+	SSLCertificate(X509 *c = NULL) : cert(c) {}
+	~SSLCertificate()                        { Clear(); }
+
+	bool     IsEmpty() const                 { return !cert; }
+
+	bool     Set(X509 *c)                    { Clear(); return !!(cert = c); }
+	bool     Create()                        { return Set(X509_new()); }
+	void     Clear()                         { if(cert) { X509_free(cert); cert = NULL; } }
+	X509    *Detach()                        { X509 *c = cert; cert = NULL; return c; }
+
+	bool     Load(String data, bool asn1 = false);
+	String   Save(bool asn1 = false) const;
+
+	String   GetSubjectName() const;
+	String   GetIssuerName() const;
+	Date     GetNotBefore() const;
+	Date     GetNotAfter() const;
+	int      GetVersion() const;
+	String   GetSerialNumber() const;
+//	String   GetSignatureType() const;
+//	String   GetPublicKey() const;
+//	String   GetAuthority() const;
+//	String   GetHashType() const;
+//	String   GetHash() const;
+
+	operator X509 * () const                 { return cert; }
+
+private:
+	X509    *cert;
+};
+
+class SSLContext
+{
+public:
+	SSLContext(SSL_CTX *c = NULL) : ssl_ctx(c) { SSLInit(); }
+	~SSLContext()                              { Clear(); }
+
+	bool     IsEmpty() const                   { return !ssl_ctx; }
+
+	bool     Set(SSL_CTX *c)                   { Clear(); return !!(ssl_ctx = c); }
+	bool     Create(SSL_METHOD *meth)          { return Set(SSL_CTX_new(meth)); }
+	void     Clear()                           { if(ssl_ctx) { SSL_CTX_free(ssl_ctx); ssl_ctx = NULL; } }
+	SSL_CTX *Detach()                          { SSL_CTX *c = ssl_ctx; ssl_ctx = NULL; return c; }
+
+	operator SSL_CTX * () const                { return ssl_ctx; }
+
+	bool     CipherList(const char *list);
+	bool     UseCertificate(String certificate, String private_key, bool cert_asn1 = false);
+	void     VerifyPeer(bool verify = true, int depth = 2);
+
+private:
+	SSL_CTX *ssl_ctx;
+};
+
+bool SSLServerSocket(Socket& socket, SSLContext& ssl_context, int port, bool nodelay = true, int listen_count = 5, bool is_blocking = true);
+bool SSLClientSocket(Socket& socket, SSLContext& ssl_context, const char *host, int port, bool nodelay = true, dword *my_addr = NULL, int timeout = DEFAULT_CONNECT_TIMEOUT, bool is_blocking = true);
+
+static const int SOCKKIND_SSL = 1; // GetKind() for SSL socket
+
+inline String SSLInfoCipher()           { return "SSL_CIPHER"; }             // String
+inline String SSLInfoCertAvail()        { return "SSL_CERT_AVAIL"; }         // bool
+inline String SSLInfoCertVerified()     { return "SSL_CERT_VERIFIED"; }      // bool
+inline String SSLInfoCertSubjectName()  { return "SSL_CERT_SUBJECT_NAME"; }  // String
+inline String SSLInfoCertIssuerName()   { return "SSL_CERT_ISSUER_NAME"; }   // String
+inline String SSLInfoCertNotBefore()    { return "SSL_CERT_NOT_BEFORE"; }    // Date
+inline String SSLInfoCertNotAfter()     { return "SSL_CERT_NOT_AFTER"; }     // Date
+inline String SSLInfoCertVersion()      { return "SSL_CERT_VERSION"; }       // int
+inline String SSLInfoCertSerialNumber() { return "SSL_CERT_SERIAL_NUMBER"; } // String
+
+END_UPP_NAMESPACE
+
+#endif//flagNOSSL
+
+#endif//__Web_SSL__
diff --git a/uppsrc/Web/SSL/util.cpp b/uppsrc/Web/SSL/util.cpp
new file mode 100644
index 000000000..f10bb0d38
--- /dev/null
+++ b/uppsrc/Web/SSL/util.cpp
@@ -0,0 +1,525 @@
+#include "WebSSL.h"
+#pragma hdrstop
+
+#ifndef flagNOSSL
+
+NAMESPACE_UPP
+
+#define LOG_UPP_SSL_MALLOC 0
+
+#if LOG_UPP_SSL_MALLOC
+static int UPP_SSL_alloc = 0;
+#endif
+
+void *SSLAlloc(size_t size)
+{
+	size_t alloc = size + sizeof(int);
+	int *aptr = (int *)MemoryAllocSz(alloc);
+	if(!aptr)
+	{
+#if LOG_UPP_SSL_MALLOC
+		RLOG("UPP_SSL_MALLOC(" << (int)size << ", alloc " << alloc << ") -> failed, total = " << UPP_SSL_alloc);
+#endif
+		return NULL;
+	}
+	*aptr++ = alloc;
+#if LOG_UPP_SSL_MALLOC
+	UPP_SSL_alloc += alloc;
+	RLOG("UPP_SSL_MALLOC(" << (int)size << ", alloc " << alloc << ") -> " << aptr << ", total = " << UPP_SSL_alloc);
+#endif
+	return aptr;
+}
+
+void SSLFree(void *ptr)
+{
+	if(!ptr)
+		return;
+	int *aptr = (int *)ptr - 1;
+#if LOG_UPP_SSL_MALLOC
+	UPP_SSL_alloc -= *aptr;
+	RLOG("UPP_SSL_FREE(" << ptr << ", alloc " << *aptr << "), total = " << UPP_SSL_alloc);
+#endif
+	MemoryFree(aptr);
+}
+
+void *SSLRealloc(void *ptr, size_t size)
+{
+	if(!ptr)
+		return NULL;
+	int *aptr = (int *)ptr - 1;
+	if((int)(size + sizeof(int)) <= *aptr)
+	{
+#if LOG_UPP_SSL_MALLOC
+		RLOG("UPP_SSL_REALLOC(" << ptr << ", " << (int)size << ", alloc " << *aptr << ") -> keep same block");
+#endif
+		return ptr;
+	}
+	size_t newalloc = size + sizeof(int);
+	int *newaptr = (int *)MemoryAllocSz(newalloc);
+	if(!newaptr)
+	{
+#if LOG_UPP_SSL_MALLOC
+		RLOG("UPP_SSL_REALLOC(" << ptr << ", " << (int)size << ", alloc " << newalloc << ") -> fail");
+#endif
+		return NULL;
+	}
+	*newaptr++ = newalloc;
+	memcpy(newaptr, ptr, min<int>(*aptr - sizeof(int), size));
+#if LOG_UPP_SSL_MALLOC
+	UPP_SSL_alloc += newalloc - *aptr;
+	RLOG("UPP_SSL_REALLOC(" << ptr << ", " << (int)size << ", alloc " << newalloc << ") -> " << newaptr
+		<< ", total = " << UPP_SSL_alloc);
+#endif
+	MemoryFree(aptr);
+	return newaptr;
+}
+
+void SSLInit()
+{
+	static bool inited = false;
+	if(!inited)
+	{
+		inited = true;
+		Socket::Init();
+		CRYPTO_set_mem_functions(SSLAlloc, SSLRealloc, SSLFree);
+		SSL_load_error_strings();
+		SSL_library_init();
+	}
+}
+
+String SSLGetLastError()
+{
+	char errbuf[150];
+	ERR_error_string(ERR_get_error(), errbuf);
+	return errbuf;
+}
+
+String SSLToString(X509_NAME *name)
+{
+	char buffer[500];
+	return X509_NAME_oneline(name, buffer, sizeof(buffer));
+}
+
+Date ASN1ToDate(ASN1_STRING *time)
+{
+	if(!time) return Null;
+	int digit = 0;
+	while(digit < time->length && IsDigit(time->data[digit]))
+		digit++;
+	if(digit < 6)
+		return Null;
+	int year2 = time->data[0] * 10 + time->data[1] - 11 * '0';
+	int month = time->data[2] * 10 + time->data[3] - 11 * '0';
+	int day   = time->data[4] * 10 + time->data[5] - 11 * '0';
+	return Date(year2 + (year2 < 90 ? 2000 : 1900), month, day);
+}
+
+String ASN1ToString(ASN1_STRING *s)
+{
+	return String(s->data, s->length);
+}
+
+String SSLBuffer::Get() const
+{
+	if(IsEmpty())
+		return String::GetVoid();
+	return String(buf_mem->data, buf_mem->length);
+}
+
+bool SSLBuffer::Grow(int length)
+{
+	return !IsEmpty() && BUF_MEM_grow(buf_mem, length);
+}
+
+bool SSLBuffer::Set(String d)
+{
+	if(!buf_mem && !Create())
+		return false;
+	int len = d.GetLength();
+	if(buf_mem->max < len && !Grow(len))
+		return false;
+	ASSERT(buf_mem->max >= len);
+	buf_mem->length = len;
+	memcpy(buf_mem, d, len);
+	return true;
+}
+
+bool SSLStream::OpenBuffer(const char *data, int length)
+{
+	return Set(BIO_new_mem_buf(const_cast<char *>(data), length));
+}
+
+bool SSLStream::CreateBuffer()
+{
+	Clear();
+	SSLBuffer buf;
+	if(!buf.Create() || !Create(BIO_s_mem()))
+		return false;
+	BIO_set_mem_buf(bio, buf.Detach(), BIO_CLOSE);
+	return true;
+}
+
+String SSLStream::GetResult() const
+{
+	if(IsEmpty())
+		return String::GetVoid();
+	BUF_MEM *bm = NULL;
+	BIO_get_mem_ptr(bio, &bm);
+	if(!bm)
+		return String::GetVoid();
+	return String(bm->data, bm->length);
+}
+
+bool SSLKey::Load(String data)
+{
+	Clear();
+	SSLStream strm;
+	if(!strm.OpenBuffer(data.Begin(), data.GetLength()))
+		return false;
+	return Set(PEM_read_bio_PrivateKey(strm, NULL, NULL, NULL));
+}
+
+bool SSLCertificate::Load(String data, bool asn1)
+{
+	Clear();
+	SSLStream in, pem, *sio = &in;
+	if(!in.OpenBuffer(data, data.GetLength()))
+		return false;
+	if(!asn1)
+	{
+		if(!pem.Create(BIO_f_base64()))
+			return false;
+		BIO_push(pem, in);
+		sio = &pem;
+	}
+	return Set(d2i_X509_bio(*sio, NULL));
+}
+
+String SSLCertificate::Save(bool asn1) const
+{
+	if(IsEmpty())
+		return String::GetVoid();
+	SSLStream out, pem, *sio = &out;
+	if(!out.CreateBuffer())
+		return String::GetVoid();
+	if(!asn1)
+	{
+		if(!pem.Create(BIO_f_base64()))
+			return String::GetVoid();
+		BIO_push(pem, out);
+		sio = &pem;
+	}
+	i2d_X509_bio(*sio, cert);
+	return out.GetResult();
+}
+
+String SSLCertificate::GetSubjectName() const
+{
+	ASSERT(!IsEmpty());
+	return SSLToString(X509_get_subject_name(cert));
+}
+
+String SSLCertificate::GetIssuerName() const
+{
+	ASSERT(!IsEmpty());
+	return SSLToString(X509_get_issuer_name(cert));
+}
+
+Date SSLCertificate::GetNotBefore() const
+{
+	ASSERT(!IsEmpty());
+	return ASN1ToDate(X509_get_notBefore(cert));
+}
+
+Date SSLCertificate::GetNotAfter() const
+{
+	ASSERT(!IsEmpty());
+	return ASN1ToDate(X509_get_notAfter(cert));
+}
+
+int SSLCertificate::GetVersion() const
+{
+	ASSERT(!IsEmpty());
+	return X509_get_version(cert);
+}
+
+String SSLCertificate::GetSerialNumber() const
+{
+	ASSERT(!IsEmpty());
+	return ASN1ToString(X509_get_serialNumber(cert));
+}
+
+/*
+String SSLCertificate::GetSignatureType() const
+{
+	ASSERT(!IsEmpty());
+	return ASN1ToString(X509_get
+}
+
+String SSLCertificate::GetPublicKey() const
+{
+	ASSERT(!IsEmpty());
+}
+
+String SSLCertificate::GetAuthority() const
+{
+	ASSERT(!IsEmpty());
+}
+
+String SSLCertificate::GetHashType() const
+{
+	ASSERT(!IsEmpty());
+}
+
+String SSLCertificate::GetHash() const
+{
+	ASSERT(!IsEmpty());
+}
+*/
+
+bool SSLContext::CipherList(const char *list)
+{
+	ASSERT(ssl_ctx);
+	return SSL_CTX_set_cipher_list(ssl_ctx, list);
+}
+
+bool SSLContext::UseCertificate(String certdata, String pkeydata, bool cert_asn1)
+{
+	ASSERT(ssl_ctx);
+	if(IsNull(certdata) || IsNull(pkeydata))
+		return false;
+	SSLCertificate cert;
+	SSLKey pkey;
+	if(!cert.Load(certdata, cert_asn1) || !pkey.Load(pkeydata))
+		return false;
+	if(!SSL_CTX_use_certificate(ssl_ctx, cert) || !SSL_CTX_use_PrivateKey(ssl_ctx, pkey))
+		return false;
+	if(!SSL_CTX_check_private_key(ssl_ctx))
+		return false;
+	return true;
+}
+
+void SSLContext::VerifyPeer(bool verify, int depth)
+{
+	ASSERT(ssl_ctx);
+	SSL_CTX_set_verify(ssl_ctx, verify ? SSL_VERIFY_PEER : SSL_VERIFY_NONE, NULL);
+	SSL_CTX_set_verify_depth(ssl_ctx, depth);
+}
+
+class SSLSocketData : public Socket::Data
+{
+public:
+	SSLSocketData(SSLContext& context);
+	virtual ~SSLSocketData();
+
+	bool                            OpenClient(const char *host, int port, bool nodelay, dword *my_addr, int timeout, bool is_blocking);
+	bool                            OpenAccept(SOCKET connection, bool nodelay, bool blocking);
+
+	virtual int                     GetKind() const { return SOCKKIND_SSL; }
+	virtual bool                    Peek(int timeout_msec, bool write);
+	virtual int                     Read(void *buf, int amount);
+	virtual int                     Write(const void *buf, int amount);
+	virtual bool                    Accept(Socket& socket, dword *ipaddr, bool nodelay, int timeout_msec);
+	virtual bool                    Close(int timeout_msec);
+	virtual Value                   GetInfo(String info) const;
+
+	void                            SetSSLError(const char *context);
+	void                            SetSSLResError(const char *context, int res);
+
+public:
+	SSLContext&                     ssl_context;
+	SSL                            *ssl;
+	SSLCertificate                  cert;
+};
+
+SSLSocketData::SSLSocketData(SSLContext& ssl_context)
+: ssl_context(ssl_context)
+{
+	ssl = NULL;
+}
+
+SSLSocketData::~SSLSocketData()
+{
+	Close(0);
+}
+
+void SSLSocketData::SetSSLError(const char *context)
+{
+	SetError();
+	Socket::SetSockError(socket, context, SSLGetLastError());
+}
+
+void SSLSocketData::SetSSLResError(const char *context, int res)
+{
+	SetError();
+	int code = SSL_get_error(ssl, res);
+	String out;
+	switch(code)
+	{
+#define SSLERR(c) case c: out = #c; break;
+	SSLERR(SSL_ERROR_NONE)
+	SSLERR(SSL_ERROR_SSL)
+	SSLERR(SSL_ERROR_WANT_READ)
+	SSLERR(SSL_ERROR_WANT_WRITE)
+	SSLERR(SSL_ERROR_WANT_X509_LOOKUP)
+	SSLERR(SSL_ERROR_SYSCALL)
+	SSLERR(SSL_ERROR_ZERO_RETURN)
+	SSLERR(SSL_ERROR_WANT_CONNECT)
+#ifdef PLATFORM_WIN32
+	SSLERR(SSL_ERROR_WANT_ACCEPT)
+#endif
+	default: out = "unknown code"; break;
+	}
+	out << " (" << code << ")";
+	Socket::SetSockError(socket, context, out);
+}
+
+bool SSLSocketData::Peek(int timeout_msec, bool write)
+{
+	if(ssl && !write && SSL_pending(ssl) > 0)
+		return true;
+	return Data::Peek(timeout_msec, write);
+}
+
+int SSLSocketData::Read(void *buf, int amount)
+{
+	ASSERT(ssl);
+	int res = SSL_read(ssl, (char *)buf, amount);
+	if(res <= 0)
+		SetSSLResError("SSL_read", res);
+#ifndef NOFAKEERROR
+	if(fake_error && res > 0)
+	{
+		if((fake_error -= res) <= 0)
+		{
+			fake_error = 0;
+			SetError();
+			Socket::SetSockError(socket, "SSL_read", "fake error");
+			return -1;
+		}
+		else
+			RLOG("SSLSocketData::Read: fake error after " << fake_error);
+	}
+#endif
+	return res;
+}
+
+int SSLSocketData::Write(const void *buf, int amount)
+{
+	ASSERT(ssl);
+	int res = SSL_write(ssl, (const char *)buf, amount);
+	if(res <= 0)
+		SetSSLResError("SSL_write", res);
+	return res;
+}
+
+bool SSLSocketData::OpenClient(const char *host, int port, bool nodelay, dword *my_addr, int timeout, bool blocking)
+{
+	if(!Data::OpenClient(host, port, nodelay, my_addr, timeout, blocking))
+		return false;
+	if(!(ssl = SSL_new(ssl_context)))
+	{
+		SetSSLError("OpenClient / SSL_new");
+		return false;
+	}
+	if(!SSL_set_fd(ssl, socket))
+	{
+		SetSSLError("OpenClient / SSL_set_fd");
+		return false;
+	}
+	SSL_set_connect_state(ssl);
+	int res = SSL_connect(ssl);
+	if(res <= 0)
+	{
+		SetSSLResError(NFormat("OpenClient(host=%s, port=%d) / SSL_connect", host, port), res);
+		return false;
+	}
+	cert.Set(SSL_get_peer_certificate(ssl));
+	return true;
+}
+
+bool SSLSocketData::OpenAccept(SOCKET conn, bool nodelay, bool blocking)
+{
+	Attach(conn, nodelay, blocking);
+	if(!(ssl = SSL_new(ssl_context)))
+	{
+		SetSSLError("Accept / SSL_new");
+		return false;
+	}
+	if(!SSL_set_fd(ssl, socket))
+	{
+		SetSSLError("Accept / SSL_set_fd");
+		return false;
+	}
+	SSL_set_accept_state(ssl);
+	int res = SSL_accept(ssl);
+	if(res <= 0)
+	{
+		SetSSLResError("Accept / SSL_accept", res);
+		return false;
+	}
+	cert.Set(SSL_get_peer_certificate(ssl));
+	return true;
+}
+
+bool SSLSocketData::Accept(Socket& socket, dword *ipaddr, bool nodelay, int timeout_msec)
+{
+	SOCKET connection = AcceptRaw(ipaddr, timeout_msec);
+	if(connection == INVALID_SOCKET)
+		return false;
+	One<SSLSocketData> data = new SSLSocketData(ssl_context);
+	if(!data->OpenAccept(connection, nodelay, is_blocking))
+		return false;
+	socket.Attach(-data);
+	return true;
+}
+
+bool SSLSocketData::Close(int timeout_msec)
+{
+	if(ssl)
+		SSL_shutdown(ssl);
+	bool res = Data::Close(timeout_msec);
+	if(ssl)
+	{
+		SSL_free(ssl);
+		ssl = NULL;
+	}
+	return res;
+}
+
+Value SSLSocketData::GetInfo(String info) const
+{
+	if(info == SSLInfoCipher())           return SSL_get_cipher(ssl);
+	if(info == SSLInfoCertAvail())        return cert.IsEmpty() ? 0 : 1;
+	if(info == SSLInfoCertVerified())     return SSL_get_verify_result(ssl) == X509_V_OK ? 1 : 0;
+	if(info == SSLInfoCertSubjectName())  return cert.IsEmpty() ? String::GetVoid() : cert.GetSubjectName();
+	if(info == SSLInfoCertIssuerName())   return cert.IsEmpty() ? String::GetVoid() : cert.GetIssuerName();
+	if(info == SSLInfoCertNotBefore())    return cert.IsEmpty() ? Date(Null)        : cert.GetNotBefore();
+	if(info == SSLInfoCertNotAfter())     return cert.IsEmpty() ? Date(Null)        : cert.GetNotAfter();
+	if(info == SSLInfoCertVersion())      return cert.IsEmpty() ? int(Null)         : cert.GetVersion();
+	if(info == SSLInfoCertSerialNumber()) return cert.IsEmpty() ? String::GetVoid() : cert.GetSerialNumber();
+
+	return Data::GetInfo(info);
+}
+
+bool SSLServerSocket(Socket& socket, SSLContext& ssl_context, int port, bool nodelay, int listen_count, bool blocking)
+{
+	One<SSLSocketData> data = new SSLSocketData(ssl_context);
+	if(!data->OpenServer(port, nodelay, listen_count, blocking))
+		return false;
+	socket.Attach(-data);
+	return true;
+}
+
+bool SSLClientSocket(Socket& socket, SSLContext& ssl_context, const char *host, int port, bool nodelay, dword *my_addr, int timeout, bool blocking)
+{
+	One<SSLSocketData> data = new SSLSocketData(ssl_context);
+	if(!data->OpenClient(host, port, nodelay, my_addr, timeout, blocking))
+		return false;
+	socket.Attach(-data);
+	return true;
+}
+
+END_UPP_NAMESPACE
+
+#endif//flagNOSSL
diff --git a/uppsrc/Web/TServ/AUTHORS b/uppsrc/Web/TServ/AUTHORS
new file mode 100644
index 000000000..f782e5b62
--- /dev/null
+++ b/uppsrc/Web/TServ/AUTHORS
@@ -0,0 +1,2 @@
+Mirek Fidler <cxl@ntllib.org>
+Tomas Rylek  <rylek@volny.cz>
\ No newline at end of file
diff --git a/uppsrc/Web/TServ/COPYING b/uppsrc/Web/TServ/COPYING
new file mode 100644
index 000000000..33aa39102
--- /dev/null
+++ b/uppsrc/Web/TServ/COPYING
@@ -0,0 +1,30 @@
+Copyright (C) 2005 Mirek Fidler, Tomas Rylek and various contributors (see AUTHORS)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to
+deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies of the Software and its Copyright notices. In addition publicly
+documented acknowledgment must be given that this software has been used if no
+source code of this software is made available publicly. This includes
+acknowledgments in either Copyright notices, Manuals, Publicity and Marketing
+documents or any documentation provided with any product containing this
+software. This License does not apply to any software that links to the
+libraries provided by this software (statically or dynamically), but only to
+the software provided.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+-----------
+
+Please see the COPYING.PLAIN for a plain-english explanation of this notice
+and it's intent.
diff --git a/uppsrc/Web/TServ/COPYING-PLAIN b/uppsrc/Web/TServ/COPYING-PLAIN
new file mode 100644
index 000000000..770a8132f
--- /dev/null
+++ b/uppsrc/Web/TServ/COPYING-PLAIN
@@ -0,0 +1,33 @@
+Plain English Copyright Notice
+
+This file is not intended to be the actual License. The reason this file
+exists is that we here are programmers and engineers. We aren't lawyers. We
+provide licenses that we THINK say the right things, but we have our own
+intentions at heart. This is a plain-english explanation of what those
+intentions are, and if you follow them you will be within the "spirit" of
+the license.
+
+The intent is for us to enjoy writing software that is useful to us (the
+AUTHORS) and allow others to use it freely and also benefit from the work we
+put into making it. We don't want to restrict others using it. They should
+not *HAVE* to make the source code of the applications they write that
+simply link to these libraries (be that statically or dynamically), or for
+them to be limited as to what license they choose to use (be it open, closed
+or anything else). But we would like to know you are using these libraries.
+We simply would like to know that it has been useful to someone. This is why
+we ask for acknowledgement of some sort.
+
+You can do what you want with the source of this software - it doesn't
+matter. We still have it here for ourselves and it is open and free to use
+and download and play with. It can't be taken away. We don't really mind what
+you do with the source to your software. We would simply like to know that
+you are using it - especially if it makes it to a commerical product. If you
+simply e-mail all the AUTHORS (see COPYING and AUTHORS files) telling us, and
+then make sure you include a paragraph or page in the manual or in the "About.."
+box for the product with the copyright notice and state that you used this
+software, we will be very happy. If you want to contribute back modifications
+and fixes you may have made we will welcome those too with open arms (generally).
+If you want help with changes needed, ports needed or features to be added,
+arrangements can be easily made with some dialogue.
+
+Mirek Fidler <cxl@ntllib.org>
diff --git a/uppsrc/Web/TServ/Makefile b/uppsrc/Web/TServ/Makefile
new file mode 100644
index 000000000..1044673e9
--- /dev/null
+++ b/uppsrc/Web/TServ/Makefile
@@ -0,0 +1,2616 @@
+UPPDIR1 = /upp/uppsrc/
+
+UPPOUT = /uppout/
+CINC =  -I$(UPPDIR1) -I/usr/include/freetype2
+Macro =  -DflagGCC32 -DflagLINUX
+CC = c++ -c -O1 -ffunction-sections
+CFLAGS = $(CC) -x c
+CPPFLAGS = $(CC) -x c++
+LIBPATH =  -L"/usr/X11R6/lib" -L"/usr/local/src/arptables-v0.0.3-2/"
+AR = ar -sr
+OutDir_Web_TServ = $(UPPOUT)Web/TServ/GCC32-Gcc32-Linux-Main/
+Macro_Web_TServ = $(Macro) -DflagMAIN
+OutDir_Web = $(UPPOUT)Web/GCC32-Gcc32-Linux/
+Macro_Web = $(Macro)
+OutDir_plugin_bz2 = $(UPPOUT)plugin/bz2/GCC32-Gcc32-Linux/
+Macro_plugin_bz2 = $(Macro)
+OutDir_Core = $(UPPOUT)Core/GCC32-Gcc32-Linux/
+Macro_Core = $(Macro)
+OutDir_plugin_z = $(UPPOUT)plugin/z/GCC32-Gcc32-Linux/
+Macro_plugin_z = $(Macro)
+
+OutDir = $(OutDir_Web_TServ)
+OutFile = $(OutDir)TServ
+
+.PHONY: all
+all: install $(OutFile)
+
+.PHONY: install
+install:
+	-mkdir -p $(OutDir)
+	-mkdir -p $(OutDir_Web_TServ)
+	-mkdir -p $(OutDir_Web)
+	-mkdir -p $(OutDir_plugin_bz2)
+	-mkdir -p $(OutDir_Core)
+	-mkdir -p $(OutDir_plugin_z)
+
+$(OutFile):  \
+	$(OutDir_Web_TServ)tserv.o \
+	$(OutDir_Web)Web_init.o \
+	$(OutDir_Web)Web.a \
+	$(OutDir_plugin_bz2)bz2.a \
+	$(OutDir_Core)Core.a \
+	$(OutDir_plugin_z)z.a
+	c++ -static -o $(OutFile) -Wl,-s $(LIBPATH) -Wl,-O,2 $(LINKOPTIONS) \
+		$(OutDir_Web_TServ)tserv.o \
+		-Wl,--start-group  \
+		$(OutDir_Web)Web_init.o \
+			$(OutDir_Web)Web.a \
+			$(OutDir_plugin_bz2)bz2.a \
+			$(OutDir_Core)Core.a \
+			$(OutDir_plugin_z)z.a \
+			-lpthread \
+			-ldl \
+			-lz \
+		-Wl,--end-group
+
+
+$(OutDir_Web_TServ)tserv.o: $(UPPDIR1)Web/TServ/tserv.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Profile.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h \
+	$(UPPDIR1)Core/XML.h \
+	$(UPPDIR1)Core/Xmlize.h \
+	$(UPPDIR1)Core/z.h \
+	$(UPPDIR1)plugin/bz2/bz2.h \
+	$(UPPDIR1)Web/auth.h \
+	$(UPPDIR1)Web/html.h \
+	$(UPPDIR1)Web/httpcli.h \
+	$(UPPDIR1)Web/httpsrv.h \
+	$(UPPDIR1)Web/smtp.h \
+	$(UPPDIR1)Web/socket.h \
+	$(UPPDIR1)Web/sproc.h \
+	$(UPPDIR1)Web/TServ/version.h \
+	$(UPPDIR1)Web/util.h \
+	$(UPPDIR1)Web/Web.h
+	$(CPPFLAGS) $(CINC) $(Macro_Web_TServ)  $(UPPDIR1)Web/TServ/tserv.cpp -o $(OutDir_Web_TServ)tserv.o
+
+$(OutDir_Web)Web_init.o: $(UPPDIR1)Web/Web_init.icpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Profile.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t.h \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h \
+	$(UPPDIR1)Core/XML.h \
+	$(UPPDIR1)Core/Xmlize.h \
+	$(UPPDIR1)Core/z.h \
+	$(UPPDIR1)Web/auth.h \
+	$(UPPDIR1)Web/html.h \
+	$(UPPDIR1)Web/httpcli.h \
+	$(UPPDIR1)Web/httpsrv.h \
+	$(UPPDIR1)Web/smtp.h \
+	$(UPPDIR1)Web/socket.h \
+	$(UPPDIR1)Web/sproc.h \
+	$(UPPDIR1)Web/util.h \
+	$(UPPDIR1)Web/Web.h \
+	$(UPPDIR1)Web/Web.t
+	$(CPPFLAGS) $(CINC) $(Macro_Web)  $(UPPDIR1)Web/Web_init.icpp -o $(OutDir_Web)Web_init.o
+
+$(OutDir_Web)util.o: $(UPPDIR1)Web/util.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Profile.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h \
+	$(UPPDIR1)Core/XML.h \
+	$(UPPDIR1)Core/Xmlize.h \
+	$(UPPDIR1)Core/z.h \
+	$(UPPDIR1)Web/auth.h \
+	$(UPPDIR1)Web/html.h \
+	$(UPPDIR1)Web/httpcli.h \
+	$(UPPDIR1)Web/httpsrv.h \
+	$(UPPDIR1)Web/smtp.h \
+	$(UPPDIR1)Web/socket.h \
+	$(UPPDIR1)Web/sproc.h \
+	$(UPPDIR1)Web/util.h \
+	$(UPPDIR1)Web/Web.h
+	$(CPPFLAGS) $(CINC) $(Macro_Web)  $(UPPDIR1)Web/util.cpp -o $(OutDir_Web)util.o
+
+$(OutDir_Web)md5.o: $(UPPDIR1)Web/md5.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Profile.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h \
+	$(UPPDIR1)Core/XML.h \
+	$(UPPDIR1)Core/Xmlize.h \
+	$(UPPDIR1)Core/z.h \
+	$(UPPDIR1)Web/auth.h \
+	$(UPPDIR1)Web/html.h \
+	$(UPPDIR1)Web/httpcli.h \
+	$(UPPDIR1)Web/httpsrv.h \
+	$(UPPDIR1)Web/smtp.h \
+	$(UPPDIR1)Web/socket.h \
+	$(UPPDIR1)Web/sproc.h \
+	$(UPPDIR1)Web/util.h \
+	$(UPPDIR1)Web/Web.h
+	$(CPPFLAGS) $(CINC) $(Macro_Web)  $(UPPDIR1)Web/md5.cpp -o $(OutDir_Web)md5.o
+
+$(OutDir_Web)html.o: $(UPPDIR1)Web/html.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Profile.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h \
+	$(UPPDIR1)Core/XML.h \
+	$(UPPDIR1)Core/Xmlize.h \
+	$(UPPDIR1)Core/z.h \
+	$(UPPDIR1)Web/auth.h \
+	$(UPPDIR1)Web/html.h \
+	$(UPPDIR1)Web/httpcli.h \
+	$(UPPDIR1)Web/httpsrv.h \
+	$(UPPDIR1)Web/smtp.h \
+	$(UPPDIR1)Web/socket.h \
+	$(UPPDIR1)Web/sproc.h \
+	$(UPPDIR1)Web/util.h \
+	$(UPPDIR1)Web/Web.h
+	$(CPPFLAGS) $(CINC) $(Macro_Web)  $(UPPDIR1)Web/html.cpp -o $(OutDir_Web)html.o
+
+$(OutDir_Web)socket.o: $(UPPDIR1)Web/socket.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Profile.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h \
+	$(UPPDIR1)Core/XML.h \
+	$(UPPDIR1)Core/Xmlize.h \
+	$(UPPDIR1)Core/z.h \
+	$(UPPDIR1)Web/auth.h \
+	$(UPPDIR1)Web/html.h \
+	$(UPPDIR1)Web/httpcli.h \
+	$(UPPDIR1)Web/httpsrv.h \
+	$(UPPDIR1)Web/smtp.h \
+	$(UPPDIR1)Web/socket.h \
+	$(UPPDIR1)Web/sproc.h \
+	$(UPPDIR1)Web/util.h \
+	$(UPPDIR1)Web/Web.h
+	$(CPPFLAGS) $(CINC) $(Macro_Web)  $(UPPDIR1)Web/socket.cpp -o $(OutDir_Web)socket.o
+
+$(OutDir_Web)httpsrv.o: $(UPPDIR1)Web/httpsrv.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Profile.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h \
+	$(UPPDIR1)Core/XML.h \
+	$(UPPDIR1)Core/Xmlize.h \
+	$(UPPDIR1)Core/z.h \
+	$(UPPDIR1)Web/auth.h \
+	$(UPPDIR1)Web/html.h \
+	$(UPPDIR1)Web/httpcli.h \
+	$(UPPDIR1)Web/httpsrv.h \
+	$(UPPDIR1)Web/smtp.h \
+	$(UPPDIR1)Web/socket.h \
+	$(UPPDIR1)Web/sproc.h \
+	$(UPPDIR1)Web/util.h \
+	$(UPPDIR1)Web/Web.h
+	$(CPPFLAGS) $(CINC) $(Macro_Web)  $(UPPDIR1)Web/httpsrv.cpp -o $(OutDir_Web)httpsrv.o
+
+$(OutDir_Web)httpcli.o: $(UPPDIR1)Web/httpcli.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Profile.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h \
+	$(UPPDIR1)Core/XML.h \
+	$(UPPDIR1)Core/Xmlize.h \
+	$(UPPDIR1)Core/z.h \
+	$(UPPDIR1)Web/auth.h \
+	$(UPPDIR1)Web/html.h \
+	$(UPPDIR1)Web/httpcli.h \
+	$(UPPDIR1)Web/httpsrv.h \
+	$(UPPDIR1)Web/smtp.h \
+	$(UPPDIR1)Web/socket.h \
+	$(UPPDIR1)Web/sproc.h \
+	$(UPPDIR1)Web/util.h \
+	$(UPPDIR1)Web/Web.h
+	$(CPPFLAGS) $(CINC) $(Macro_Web)  $(UPPDIR1)Web/httpcli.cpp -o $(OutDir_Web)httpcli.o
+
+$(OutDir_Web)auth.o: $(UPPDIR1)Web/auth.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Profile.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h \
+	$(UPPDIR1)Core/XML.h \
+	$(UPPDIR1)Core/Xmlize.h \
+	$(UPPDIR1)Core/z.h \
+	$(UPPDIR1)Web/auth.h \
+	$(UPPDIR1)Web/html.h \
+	$(UPPDIR1)Web/httpcli.h \
+	$(UPPDIR1)Web/httpsrv.h \
+	$(UPPDIR1)Web/smtp.h \
+	$(UPPDIR1)Web/socket.h \
+	$(UPPDIR1)Web/sproc.h \
+	$(UPPDIR1)Web/util.h \
+	$(UPPDIR1)Web/Web.h
+	$(CPPFLAGS) $(CINC) $(Macro_Web)  $(UPPDIR1)Web/auth.cpp -o $(OutDir_Web)auth.o
+
+$(OutDir_Web)smtp.o: $(UPPDIR1)Web/smtp.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Profile.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h \
+	$(UPPDIR1)Core/XML.h \
+	$(UPPDIR1)Core/Xmlize.h \
+	$(UPPDIR1)Core/z.h \
+	$(UPPDIR1)Web/auth.h \
+	$(UPPDIR1)Web/html.h \
+	$(UPPDIR1)Web/httpcli.h \
+	$(UPPDIR1)Web/httpsrv.h \
+	$(UPPDIR1)Web/smtp.h \
+	$(UPPDIR1)Web/socket.h \
+	$(UPPDIR1)Web/sproc.h \
+	$(UPPDIR1)Web/util.h \
+	$(UPPDIR1)Web/Web.h
+	$(CPPFLAGS) $(CINC) $(Macro_Web)  $(UPPDIR1)Web/smtp.cpp -o $(OutDir_Web)smtp.o
+
+$(OutDir_Web)sproc.o: $(UPPDIR1)Web/sproc.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Profile.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h \
+	$(UPPDIR1)Core/XML.h \
+	$(UPPDIR1)Core/Xmlize.h \
+	$(UPPDIR1)Core/z.h \
+	$(UPPDIR1)Web/auth.h \
+	$(UPPDIR1)Web/html.h \
+	$(UPPDIR1)Web/httpcli.h \
+	$(UPPDIR1)Web/httpsrv.h \
+	$(UPPDIR1)Web/smtp.h \
+	$(UPPDIR1)Web/socket.h \
+	$(UPPDIR1)Web/sproc.h \
+	$(UPPDIR1)Web/util.h \
+	$(UPPDIR1)Web/Web.h
+	$(CPPFLAGS) $(CINC) $(Macro_Web)  $(UPPDIR1)Web/sproc.cpp -o $(OutDir_Web)sproc.o
+
+$(OutDir_Web)Web.a: \
+	$(OutDir_Web)util.o \
+	$(OutDir_Web)md5.o \
+	$(OutDir_Web)html.o \
+	$(OutDir_Web)socket.o \
+	$(OutDir_Web)httpsrv.o \
+	$(OutDir_Web)httpcli.o \
+	$(OutDir_Web)auth.o \
+	$(OutDir_Web)smtp.o \
+	$(OutDir_Web)sproc.o
+	$(AR) $(OutDir_Web)Web.a \
+		$(OutDir_Web)util.o \
+		$(OutDir_Web)md5.o \
+		$(OutDir_Web)html.o \
+		$(OutDir_Web)socket.o \
+		$(OutDir_Web)httpsrv.o \
+		$(OutDir_Web)httpcli.o \
+		$(OutDir_Web)auth.o \
+		$(OutDir_Web)smtp.o \
+		$(OutDir_Web)sproc.o
+
+$(OutDir_plugin_bz2)bz2upp.o: $(UPPDIR1)plugin/bz2/bz2upp.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Profile.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h \
+	$(UPPDIR1)Core/XML.h \
+	$(UPPDIR1)Core/Xmlize.h \
+	$(UPPDIR1)Core/z.h \
+	$(UPPDIR1)plugin/bz2/bz2.h \
+	$(UPPDIR1)plugin/bz2/lib/bzlib.h
+	$(CPPFLAGS) $(CINC) $(Macro_plugin_bz2)  $(UPPDIR1)plugin/bz2/bz2upp.cpp -o $(OutDir_plugin_bz2)bz2upp.o
+
+$(OutDir_plugin_bz2)blocksort.o: $(UPPDIR1)plugin/bz2/lib/blocksort.c \
+	$(UPPDIR1)plugin/bz2/lib/bzlib.h \
+	$(UPPDIR1)plugin/bz2/lib/bzlib_private.h
+	$(CFLAGS) $(CINC) $(Macro_plugin_bz2)  $(UPPDIR1)plugin/bz2/lib/blocksort.c -o $(OutDir_plugin_bz2)blocksort.o
+
+$(OutDir_plugin_bz2)bzlib.o: $(UPPDIR1)plugin/bz2/lib/bzlib.c \
+	$(UPPDIR1)plugin/bz2/lib/bzlib.h \
+	$(UPPDIR1)plugin/bz2/lib/bzlib_private.h
+	$(CFLAGS) $(CINC) $(Macro_plugin_bz2)  $(UPPDIR1)plugin/bz2/lib/bzlib.c -o $(OutDir_plugin_bz2)bzlib.o
+
+$(OutDir_plugin_bz2)compress.o: $(UPPDIR1)plugin/bz2/lib/compress.c \
+	$(UPPDIR1)plugin/bz2/lib/bzlib.h \
+	$(UPPDIR1)plugin/bz2/lib/bzlib_private.h
+	$(CFLAGS) $(CINC) $(Macro_plugin_bz2)  $(UPPDIR1)plugin/bz2/lib/compress.c -o $(OutDir_plugin_bz2)compress.o
+
+$(OutDir_plugin_bz2)crctable.o: $(UPPDIR1)plugin/bz2/lib/crctable.c \
+	$(UPPDIR1)plugin/bz2/lib/bzlib.h \
+	$(UPPDIR1)plugin/bz2/lib/bzlib_private.h
+	$(CFLAGS) $(CINC) $(Macro_plugin_bz2)  $(UPPDIR1)plugin/bz2/lib/crctable.c -o $(OutDir_plugin_bz2)crctable.o
+
+$(OutDir_plugin_bz2)decompress.o: $(UPPDIR1)plugin/bz2/lib/decompress.c \
+	$(UPPDIR1)plugin/bz2/lib/bzlib.h \
+	$(UPPDIR1)plugin/bz2/lib/bzlib_private.h
+	$(CFLAGS) $(CINC) $(Macro_plugin_bz2)  $(UPPDIR1)plugin/bz2/lib/decompress.c -o $(OutDir_plugin_bz2)decompress.o
+
+$(OutDir_plugin_bz2)huffman.o: $(UPPDIR1)plugin/bz2/lib/huffman.c \
+	$(UPPDIR1)plugin/bz2/lib/bzlib.h \
+	$(UPPDIR1)plugin/bz2/lib/bzlib_private.h
+	$(CFLAGS) $(CINC) $(Macro_plugin_bz2)  $(UPPDIR1)plugin/bz2/lib/huffman.c -o $(OutDir_plugin_bz2)huffman.o
+
+$(OutDir_plugin_bz2)randtable.o: $(UPPDIR1)plugin/bz2/lib/randtable.c \
+	$(UPPDIR1)plugin/bz2/lib/bzlib.h \
+	$(UPPDIR1)plugin/bz2/lib/bzlib_private.h
+	$(CFLAGS) $(CINC) $(Macro_plugin_bz2)  $(UPPDIR1)plugin/bz2/lib/randtable.c -o $(OutDir_plugin_bz2)randtable.o
+
+$(OutDir_plugin_bz2)bz2.a: \
+	$(OutDir_plugin_bz2)bz2upp.o \
+	$(OutDir_plugin_bz2)blocksort.o \
+	$(OutDir_plugin_bz2)bzlib.o \
+	$(OutDir_plugin_bz2)compress.o \
+	$(OutDir_plugin_bz2)crctable.o \
+	$(OutDir_plugin_bz2)decompress.o \
+	$(OutDir_plugin_bz2)huffman.o \
+	$(OutDir_plugin_bz2)randtable.o
+	$(AR) $(OutDir_plugin_bz2)bz2.a \
+		$(OutDir_plugin_bz2)bz2upp.o \
+		$(OutDir_plugin_bz2)blocksort.o \
+		$(OutDir_plugin_bz2)bzlib.o \
+		$(OutDir_plugin_bz2)compress.o \
+		$(OutDir_plugin_bz2)crctable.o \
+		$(OutDir_plugin_bz2)decompress.o \
+		$(OutDir_plugin_bz2)huffman.o \
+		$(OutDir_plugin_bz2)randtable.o
+
+$(OutDir_Core)Mt.o: $(UPPDIR1)Core/Mt.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Profile.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h \
+	$(UPPDIR1)Core/XML.h \
+	$(UPPDIR1)Core/Xmlize.h \
+	$(UPPDIR1)Core/z.h
+	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/Mt.cpp -o $(OutDir_Core)Mt.o
+
+$(OutDir_Core)Thread.o: $(UPPDIR1)Core/Thread.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Profile.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h \
+	$(UPPDIR1)Core/XML.h \
+	$(UPPDIR1)Core/Xmlize.h \
+	$(UPPDIR1)Core/z.h
+	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/Thread.cpp -o $(OutDir_Core)Thread.o
+
+$(OutDir_Core)OL_Set.o: $(UPPDIR1)Core/OL_Set.cpp
+	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/OL_Set.cpp -o $(OutDir_Core)OL_Set.o
+
+$(OutDir_Core)heap.o: $(UPPDIR1)Core/heap.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Profile.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h \
+	$(UPPDIR1)Core/XML.h \
+	$(UPPDIR1)Core/Xmlize.h \
+	$(UPPDIR1)Core/z.h
+	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/heap.cpp -o $(OutDir_Core)heap.o
+
+$(OutDir_Core)heapdbg.o: $(UPPDIR1)Core/heapdbg.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Profile.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h \
+	$(UPPDIR1)Core/XML.h \
+	$(UPPDIR1)Core/Xmlize.h \
+	$(UPPDIR1)Core/z.h
+	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/heapdbg.cpp -o $(OutDir_Core)heapdbg.o
+
+$(OutDir_Core)String.o: $(UPPDIR1)Core/String.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Profile.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h \
+	$(UPPDIR1)Core/XML.h \
+	$(UPPDIR1)Core/Xmlize.h \
+	$(UPPDIR1)Core/z.h
+	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/String.cpp -o $(OutDir_Core)String.o
+
+$(OutDir_Core)StrUtil.o: $(UPPDIR1)Core/StrUtil.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Profile.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h \
+	$(UPPDIR1)Core/XML.h \
+	$(UPPDIR1)Core/Xmlize.h \
+	$(UPPDIR1)Core/z.h
+	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/StrUtil.cpp -o $(OutDir_Core)StrUtil.o
+
+$(OutDir_Core)CharSet.o: $(UPPDIR1)Core/CharSet.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Profile.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h \
+	$(UPPDIR1)Core/XML.h \
+	$(UPPDIR1)Core/Xmlize.h \
+	$(UPPDIR1)Core/z.h
+	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/CharSet.cpp -o $(OutDir_Core)CharSet.o
+
+$(OutDir_Core)Path.o: $(UPPDIR1)Core/Path.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Profile.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h \
+	$(UPPDIR1)Core/XML.h \
+	$(UPPDIR1)Core/Xmlize.h \
+	$(UPPDIR1)Core/z.h
+	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/Path.cpp -o $(OutDir_Core)Path.o
+
+$(OutDir_Core)App.o: $(UPPDIR1)Core/App.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Profile.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h \
+	$(UPPDIR1)Core/XML.h \
+	$(UPPDIR1)Core/Xmlize.h \
+	$(UPPDIR1)Core/z.h
+	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/App.cpp -o $(OutDir_Core)App.o
+
+$(OutDir_Core)Stream.o: $(UPPDIR1)Core/Stream.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Profile.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h \
+	$(UPPDIR1)Core/XML.h \
+	$(UPPDIR1)Core/Xmlize.h \
+	$(UPPDIR1)Core/z.h
+	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/Stream.cpp -o $(OutDir_Core)Stream.o
+
+$(OutDir_Core)BlockStream.o: $(UPPDIR1)Core/BlockStream.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Profile.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h \
+	$(UPPDIR1)Core/XML.h \
+	$(UPPDIR1)Core/Xmlize.h \
+	$(UPPDIR1)Core/z.h
+	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/BlockStream.cpp -o $(OutDir_Core)BlockStream.o
+
+$(OutDir_Core)Log.o: $(UPPDIR1)Core/Log.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Profile.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h \
+	$(UPPDIR1)Core/XML.h \
+	$(UPPDIR1)Core/Xmlize.h \
+	$(UPPDIR1)Core/z.h
+	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/Log.cpp -o $(OutDir_Core)Log.o
+
+$(OutDir_Core)Debug.o: $(UPPDIR1)Core/Debug.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Profile.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h \
+	$(UPPDIR1)Core/XML.h \
+	$(UPPDIR1)Core/Xmlize.h \
+	$(UPPDIR1)Core/z.h
+	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/Debug.cpp -o $(OutDir_Core)Debug.o
+
+$(OutDir_Core)Util.o: $(UPPDIR1)Core/Util.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Profile.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h \
+	$(UPPDIR1)Core/XML.h \
+	$(UPPDIR1)Core/Xmlize.h \
+	$(UPPDIR1)Core/z.h
+	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/Util.cpp -o $(OutDir_Core)Util.o
+
+$(OutDir_Core)mathutil.o: $(UPPDIR1)Core/mathutil.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Profile.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h \
+	$(UPPDIR1)Core/XML.h \
+	$(UPPDIR1)Core/Xmlize.h \
+	$(UPPDIR1)Core/z.h
+	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/mathutil.cpp -o $(OutDir_Core)mathutil.o
+
+$(OutDir_Core)Vcont.o: $(UPPDIR1)Core/Vcont.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Profile.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h \
+	$(UPPDIR1)Core/XML.h \
+	$(UPPDIR1)Core/Xmlize.h \
+	$(UPPDIR1)Core/z.h
+	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/Vcont.cpp -o $(OutDir_Core)Vcont.o
+
+$(OutDir_Core)Hash.o: $(UPPDIR1)Core/Hash.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Profile.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h \
+	$(UPPDIR1)Core/XML.h \
+	$(UPPDIR1)Core/Xmlize.h \
+	$(UPPDIR1)Core/z.h
+	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/Hash.cpp -o $(OutDir_Core)Hash.o
+
+$(OutDir_Core)Callback.o: $(UPPDIR1)Core/Callback.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Profile.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h \
+	$(UPPDIR1)Core/XML.h \
+	$(UPPDIR1)Core/Xmlize.h \
+	$(UPPDIR1)Core/z.h
+	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/Callback.cpp -o $(OutDir_Core)Callback.o
+
+$(OutDir_Core)Color.o: $(UPPDIR1)Core/Color.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Profile.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h \
+	$(UPPDIR1)Core/XML.h \
+	$(UPPDIR1)Core/Xmlize.h \
+	$(UPPDIR1)Core/z.h
+	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/Color.cpp -o $(OutDir_Core)Color.o
+
+$(OutDir_Core)Gtypes.o: $(UPPDIR1)Core/Gtypes.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Profile.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h \
+	$(UPPDIR1)Core/XML.h \
+	$(UPPDIR1)Core/Xmlize.h \
+	$(UPPDIR1)Core/z.h
+	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/Gtypes.cpp -o $(OutDir_Core)Gtypes.o
+
+$(OutDir_Core)TimeDate.o: $(UPPDIR1)Core/TimeDate.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Profile.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h \
+	$(UPPDIR1)Core/XML.h \
+	$(UPPDIR1)Core/Xmlize.h \
+	$(UPPDIR1)Core/z.h
+	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/TimeDate.cpp -o $(OutDir_Core)TimeDate.o
+
+$(OutDir_Core)Value.o: $(UPPDIR1)Core/Value.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Profile.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h \
+	$(UPPDIR1)Core/XML.h \
+	$(UPPDIR1)Core/Xmlize.h \
+	$(UPPDIR1)Core/z.h
+	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/Value.cpp -o $(OutDir_Core)Value.o
+
+$(OutDir_Core)Convert.o: $(UPPDIR1)Core/Convert.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Profile.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h \
+	$(UPPDIR1)Core/XML.h \
+	$(UPPDIR1)Core/Xmlize.h \
+	$(UPPDIR1)Core/z.h
+	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/Convert.cpp -o $(OutDir_Core)Convert.o
+
+$(OutDir_Core)Format.o: $(UPPDIR1)Core/Format.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Profile.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h \
+	$(UPPDIR1)Core/XML.h \
+	$(UPPDIR1)Core/Xmlize.h \
+	$(UPPDIR1)Core/z.h
+	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/Format.cpp -o $(OutDir_Core)Format.o
+
+$(OutDir_Core)t.o: $(UPPDIR1)Core/t.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Core.t \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Profile.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t.h \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h \
+	$(UPPDIR1)Core/XML.h \
+	$(UPPDIR1)Core/Xmlize.h \
+	$(UPPDIR1)Core/z.h
+	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/t.cpp -o $(OutDir_Core)t.o
+
+$(OutDir_Core)Lang.o: $(UPPDIR1)Core/Lang.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Profile.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h \
+	$(UPPDIR1)Core/XML.h \
+	$(UPPDIR1)Core/Xmlize.h \
+	$(UPPDIR1)Core/z.h
+	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/Lang.cpp -o $(OutDir_Core)Lang.o
+
+$(OutDir_Core)parser.o: $(UPPDIR1)Core/parser.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Profile.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h \
+	$(UPPDIR1)Core/XML.h \
+	$(UPPDIR1)Core/Xmlize.h \
+	$(UPPDIR1)Core/z.h
+	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/parser.cpp -o $(OutDir_Core)parser.o
+
+$(OutDir_Core)XML.o: $(UPPDIR1)Core/XML.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Profile.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h \
+	$(UPPDIR1)Core/XML.h \
+	$(UPPDIR1)Core/Xmlize.h \
+	$(UPPDIR1)Core/z.h
+	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/XML.cpp -o $(OutDir_Core)XML.o
+
+$(OutDir_Core)Xmlize.o: $(UPPDIR1)Core/Xmlize.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Profile.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h \
+	$(UPPDIR1)Core/XML.h \
+	$(UPPDIR1)Core/Xmlize.h \
+	$(UPPDIR1)Core/z.h
+	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/Xmlize.cpp -o $(OutDir_Core)Xmlize.o
+
+$(OutDir_Core)Uuid.o: $(UPPDIR1)Core/Uuid.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Profile.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h \
+	$(UPPDIR1)Core/XML.h \
+	$(UPPDIR1)Core/Xmlize.h \
+	$(UPPDIR1)Core/z.h
+	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/Uuid.cpp -o $(OutDir_Core)Uuid.o
+
+$(OutDir_Core)Ptr.o: $(UPPDIR1)Core/Ptr.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Profile.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h \
+	$(UPPDIR1)Core/XML.h \
+	$(UPPDIR1)Core/Xmlize.h \
+	$(UPPDIR1)Core/z.h
+	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/Ptr.cpp -o $(OutDir_Core)Ptr.o
+
+$(OutDir_Core)z.o: $(UPPDIR1)Core/z.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Profile.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h \
+	$(UPPDIR1)Core/XML.h \
+	$(UPPDIR1)Core/Xmlize.h \
+	$(UPPDIR1)Core/z.h \
+	$(UPPDIR1)plugin/z/lib/zconf.h \
+	$(UPPDIR1)plugin/z/lib/zlib.h \
+	$(UPPDIR1)plugin/z/lib/zutil.h
+	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/z.cpp -o $(OutDir_Core)z.o
+
+$(OutDir_Core)Topic.o: $(UPPDIR1)Core/Topic.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Profile.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h \
+	$(UPPDIR1)Core/XML.h \
+	$(UPPDIR1)Core/Xmlize.h \
+	$(UPPDIR1)Core/z.h
+	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/Topic.cpp -o $(OutDir_Core)Topic.o
+
+$(OutDir_Core)Dli.o: $(UPPDIR1)Core/Dli.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Profile.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h \
+	$(UPPDIR1)Core/XML.h \
+	$(UPPDIR1)Core/Xmlize.h \
+	$(UPPDIR1)Core/z.h
+	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/Dli.cpp -o $(OutDir_Core)Dli.o
+
+$(OutDir_Core)Win32Com.o: $(UPPDIR1)Core/Win32Com.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Profile.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h \
+	$(UPPDIR1)Core/XML.h \
+	$(UPPDIR1)Core/Xmlize.h \
+	$(UPPDIR1)Core/z.h
+	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/Win32Com.cpp -o $(OutDir_Core)Win32Com.o
+
+$(OutDir_Core)Core.a: \
+	$(OutDir_Core)Mt.o \
+	$(OutDir_Core)Thread.o \
+	$(OutDir_Core)OL_Set.o \
+	$(OutDir_Core)heap.o \
+	$(OutDir_Core)heapdbg.o \
+	$(OutDir_Core)String.o \
+	$(OutDir_Core)StrUtil.o \
+	$(OutDir_Core)CharSet.o \
+	$(OutDir_Core)Path.o \
+	$(OutDir_Core)App.o \
+	$(OutDir_Core)Stream.o \
+	$(OutDir_Core)BlockStream.o \
+	$(OutDir_Core)Log.o \
+	$(OutDir_Core)Debug.o \
+	$(OutDir_Core)Util.o \
+	$(OutDir_Core)mathutil.o \
+	$(OutDir_Core)Vcont.o \
+	$(OutDir_Core)Hash.o \
+	$(OutDir_Core)Callback.o \
+	$(OutDir_Core)Color.o \
+	$(OutDir_Core)Gtypes.o \
+	$(OutDir_Core)TimeDate.o \
+	$(OutDir_Core)Value.o \
+	$(OutDir_Core)Convert.o \
+	$(OutDir_Core)Format.o \
+	$(OutDir_Core)t.o \
+	$(OutDir_Core)Lang.o \
+	$(OutDir_Core)parser.o \
+	$(OutDir_Core)XML.o \
+	$(OutDir_Core)Xmlize.o \
+	$(OutDir_Core)Uuid.o \
+	$(OutDir_Core)Ptr.o \
+	$(OutDir_Core)z.o \
+	$(OutDir_Core)Topic.o \
+	$(OutDir_Core)Dli.o \
+	$(OutDir_Core)Win32Com.o
+	$(AR) $(OutDir_Core)Core.a \
+		$(OutDir_Core)Mt.o \
+		$(OutDir_Core)Thread.o \
+		$(OutDir_Core)OL_Set.o \
+		$(OutDir_Core)heap.o \
+		$(OutDir_Core)heapdbg.o \
+		$(OutDir_Core)String.o \
+		$(OutDir_Core)StrUtil.o \
+		$(OutDir_Core)CharSet.o \
+		$(OutDir_Core)Path.o \
+		$(OutDir_Core)App.o \
+		$(OutDir_Core)Stream.o \
+		$(OutDir_Core)BlockStream.o \
+		$(OutDir_Core)Log.o \
+		$(OutDir_Core)Debug.o \
+		$(OutDir_Core)Util.o \
+		$(OutDir_Core)mathutil.o \
+		$(OutDir_Core)Vcont.o \
+		$(OutDir_Core)Hash.o \
+		$(OutDir_Core)Callback.o \
+		$(OutDir_Core)Color.o \
+		$(OutDir_Core)Gtypes.o \
+		$(OutDir_Core)TimeDate.o \
+		$(OutDir_Core)Value.o \
+		$(OutDir_Core)Convert.o \
+		$(OutDir_Core)Format.o \
+		$(OutDir_Core)t.o \
+		$(OutDir_Core)Lang.o \
+		$(OutDir_Core)parser.o \
+		$(OutDir_Core)XML.o \
+		$(OutDir_Core)Xmlize.o \
+		$(OutDir_Core)Uuid.o \
+		$(OutDir_Core)Ptr.o \
+		$(OutDir_Core)z.o \
+		$(OutDir_Core)Topic.o \
+		$(OutDir_Core)Dli.o \
+		$(OutDir_Core)Win32Com.o
+
+$(OutDir_plugin_z)adler32.o: $(UPPDIR1)plugin/z/lib/adler32.c \
+	$(UPPDIR1)plugin/z/lib/zconf.h \
+	$(UPPDIR1)plugin/z/lib/zlib.h
+	$(CFLAGS) $(CINC) $(Macro_plugin_z)  $(UPPDIR1)plugin/z/lib/adler32.c -o $(OutDir_plugin_z)adler32.o
+
+$(OutDir_plugin_z)compress.o: $(UPPDIR1)plugin/z/lib/compress.c \
+	$(UPPDIR1)plugin/z/lib/zconf.h \
+	$(UPPDIR1)plugin/z/lib/zlib.h
+	$(CFLAGS) $(CINC) $(Macro_plugin_z)  $(UPPDIR1)plugin/z/lib/compress.c -o $(OutDir_plugin_z)compress.o
+
+$(OutDir_plugin_z)crc32.o: $(UPPDIR1)plugin/z/lib/crc32.c \
+	$(UPPDIR1)plugin/z/lib/zconf.h \
+	$(UPPDIR1)plugin/z/lib/zlib.h
+	$(CFLAGS) $(CINC) $(Macro_plugin_z)  $(UPPDIR1)plugin/z/lib/crc32.c -o $(OutDir_plugin_z)crc32.o
+
+$(OutDir_plugin_z)deflate.o: $(UPPDIR1)plugin/z/lib/deflate.c \
+	$(UPPDIR1)plugin/z/lib/deflate.h \
+	$(UPPDIR1)plugin/z/lib/zconf.h \
+	$(UPPDIR1)plugin/z/lib/zlib.h \
+	$(UPPDIR1)plugin/z/lib/zutil.h
+	$(CFLAGS) $(CINC) $(Macro_plugin_z)  $(UPPDIR1)plugin/z/lib/deflate.c -o $(OutDir_plugin_z)deflate.o
+
+$(OutDir_plugin_z)gzio.o: $(UPPDIR1)plugin/z/lib/gzio.c \
+	$(UPPDIR1)plugin/z/lib/zconf.h \
+	$(UPPDIR1)plugin/z/lib/zlib.h \
+	$(UPPDIR1)plugin/z/lib/zutil.h
+	$(CFLAGS) $(CINC) $(Macro_plugin_z)  $(UPPDIR1)plugin/z/lib/gzio.c -o $(OutDir_plugin_z)gzio.o
+
+$(OutDir_plugin_z)infblock.o: $(UPPDIR1)plugin/z/lib/infblock.c \
+	$(UPPDIR1)plugin/z/lib/infblock.h \
+	$(UPPDIR1)plugin/z/lib/infcodes.h \
+	$(UPPDIR1)plugin/z/lib/inftrees.h \
+	$(UPPDIR1)plugin/z/lib/infutil.h \
+	$(UPPDIR1)plugin/z/lib/zconf.h \
+	$(UPPDIR1)plugin/z/lib/zlib.h \
+	$(UPPDIR1)plugin/z/lib/zutil.h
+	$(CFLAGS) $(CINC) $(Macro_plugin_z)  $(UPPDIR1)plugin/z/lib/infblock.c -o $(OutDir_plugin_z)infblock.o
+
+$(OutDir_plugin_z)infcodes.o: $(UPPDIR1)plugin/z/lib/infcodes.c \
+	$(UPPDIR1)plugin/z/lib/infblock.h \
+	$(UPPDIR1)plugin/z/lib/infcodes.h \
+	$(UPPDIR1)plugin/z/lib/inffast.h \
+	$(UPPDIR1)plugin/z/lib/inftrees.h \
+	$(UPPDIR1)plugin/z/lib/infutil.h \
+	$(UPPDIR1)plugin/z/lib/zconf.h \
+	$(UPPDIR1)plugin/z/lib/zlib.h \
+	$(UPPDIR1)plugin/z/lib/zutil.h
+	$(CFLAGS) $(CINC) $(Macro_plugin_z)  $(UPPDIR1)plugin/z/lib/infcodes.c -o $(OutDir_plugin_z)infcodes.o
+
+$(OutDir_plugin_z)inffast.o: $(UPPDIR1)plugin/z/lib/inffast.c \
+	$(UPPDIR1)plugin/z/lib/infblock.h \
+	$(UPPDIR1)plugin/z/lib/infcodes.h \
+	$(UPPDIR1)plugin/z/lib/inffast.h \
+	$(UPPDIR1)plugin/z/lib/inftrees.h \
+	$(UPPDIR1)plugin/z/lib/infutil.h \
+	$(UPPDIR1)plugin/z/lib/zconf.h \
+	$(UPPDIR1)plugin/z/lib/zlib.h \
+	$(UPPDIR1)plugin/z/lib/zutil.h
+	$(CFLAGS) $(CINC) $(Macro_plugin_z)  $(UPPDIR1)plugin/z/lib/inffast.c -o $(OutDir_plugin_z)inffast.o
+
+$(OutDir_plugin_z)inflate.o: $(UPPDIR1)plugin/z/lib/inflate.c \
+	$(UPPDIR1)plugin/z/lib/infblock.h \
+	$(UPPDIR1)plugin/z/lib/zconf.h \
+	$(UPPDIR1)plugin/z/lib/zlib.h \
+	$(UPPDIR1)plugin/z/lib/zutil.h
+	$(CFLAGS) $(CINC) $(Macro_plugin_z)  $(UPPDIR1)plugin/z/lib/inflate.c -o $(OutDir_plugin_z)inflate.o
+
+$(OutDir_plugin_z)inftrees.o: $(UPPDIR1)plugin/z/lib/inftrees.c \
+	$(UPPDIR1)plugin/z/lib/inffixed.h \
+	$(UPPDIR1)plugin/z/lib/inftrees.h \
+	$(UPPDIR1)plugin/z/lib/zconf.h \
+	$(UPPDIR1)plugin/z/lib/zlib.h \
+	$(UPPDIR1)plugin/z/lib/zutil.h
+	$(CFLAGS) $(CINC) $(Macro_plugin_z)  $(UPPDIR1)plugin/z/lib/inftrees.c -o $(OutDir_plugin_z)inftrees.o
+
+$(OutDir_plugin_z)infutil.o: $(UPPDIR1)plugin/z/lib/infutil.c \
+	$(UPPDIR1)plugin/z/lib/infblock.h \
+	$(UPPDIR1)plugin/z/lib/infcodes.h \
+	$(UPPDIR1)plugin/z/lib/inftrees.h \
+	$(UPPDIR1)plugin/z/lib/infutil.h \
+	$(UPPDIR1)plugin/z/lib/zconf.h \
+	$(UPPDIR1)plugin/z/lib/zlib.h \
+	$(UPPDIR1)plugin/z/lib/zutil.h
+	$(CFLAGS) $(CINC) $(Macro_plugin_z)  $(UPPDIR1)plugin/z/lib/infutil.c -o $(OutDir_plugin_z)infutil.o
+
+$(OutDir_plugin_z)trees.o: $(UPPDIR1)plugin/z/lib/trees.c \
+	$(UPPDIR1)plugin/z/lib/deflate.h \
+	$(UPPDIR1)plugin/z/lib/trees.h \
+	$(UPPDIR1)plugin/z/lib/zconf.h \
+	$(UPPDIR1)plugin/z/lib/zlib.h \
+	$(UPPDIR1)plugin/z/lib/zutil.h
+	$(CFLAGS) $(CINC) $(Macro_plugin_z)  $(UPPDIR1)plugin/z/lib/trees.c -o $(OutDir_plugin_z)trees.o
+
+$(OutDir_plugin_z)uncompr.o: $(UPPDIR1)plugin/z/lib/uncompr.c \
+	$(UPPDIR1)plugin/z/lib/zconf.h \
+	$(UPPDIR1)plugin/z/lib/zlib.h
+	$(CFLAGS) $(CINC) $(Macro_plugin_z)  $(UPPDIR1)plugin/z/lib/uncompr.c -o $(OutDir_plugin_z)uncompr.o
+
+$(OutDir_plugin_z)zutil.o: $(UPPDIR1)plugin/z/lib/zutil.c \
+	$(UPPDIR1)plugin/z/lib/zconf.h \
+	$(UPPDIR1)plugin/z/lib/zlib.h \
+	$(UPPDIR1)plugin/z/lib/zutil.h
+	$(CFLAGS) $(CINC) $(Macro_plugin_z)  $(UPPDIR1)plugin/z/lib/zutil.c -o $(OutDir_plugin_z)zutil.o
+
+$(OutDir_plugin_z)z.a: \
+	$(OutDir_plugin_z)adler32.o \
+	$(OutDir_plugin_z)compress.o \
+	$(OutDir_plugin_z)crc32.o \
+	$(OutDir_plugin_z)deflate.o \
+	$(OutDir_plugin_z)gzio.o \
+	$(OutDir_plugin_z)infblock.o \
+	$(OutDir_plugin_z)infcodes.o \
+	$(OutDir_plugin_z)inffast.o \
+	$(OutDir_plugin_z)inflate.o \
+	$(OutDir_plugin_z)inftrees.o \
+	$(OutDir_plugin_z)infutil.o \
+	$(OutDir_plugin_z)trees.o \
+	$(OutDir_plugin_z)uncompr.o \
+	$(OutDir_plugin_z)zutil.o
+	$(AR) $(OutDir_plugin_z)z.a \
+		$(OutDir_plugin_z)adler32.o \
+		$(OutDir_plugin_z)compress.o \
+		$(OutDir_plugin_z)crc32.o \
+		$(OutDir_plugin_z)deflate.o \
+		$(OutDir_plugin_z)gzio.o \
+		$(OutDir_plugin_z)infblock.o \
+		$(OutDir_plugin_z)infcodes.o \
+		$(OutDir_plugin_z)inffast.o \
+		$(OutDir_plugin_z)inflate.o \
+		$(OutDir_plugin_z)inftrees.o \
+		$(OutDir_plugin_z)infutil.o \
+		$(OutDir_plugin_z)trees.o \
+		$(OutDir_plugin_z)uncompr.o \
+		$(OutDir_plugin_z)zutil.o
diff --git a/uppsrc/Web/TServ/Makefile.solaris b/uppsrc/Web/TServ/Makefile.solaris
new file mode 100644
index 000000000..f2ea4fcbd
--- /dev/null
+++ b/uppsrc/Web/TServ/Makefile.solaris
@@ -0,0 +1,2046 @@
+UPPDIR1 = /upp/solar/
+
+UPPOUT = /uppout/
+CINC =  -I$(UPPDIR1)
+Macro =  -DflagGCC -DflagDEBUG -DflagSHARED -DflagDEBUG_FULL -DflagSOLARIS
+CC = c++ -c -D_DEBUG -O0 -ggdb -g2
+CFLAGS = $(CC) -x c
+CPPFLAGS = $(CC) -x c++
+LIBPATH =
+AR = ar -sr
+OutDir_Web_TServ = $(UPPOUT)Web/TServ/SOLARIS-Debug-Debug_full-Gcc-Main-Shared-Solaris/
+Macro_Web_TServ = $(Macro) -DflagMAIN
+OutDir_Web = $(UPPOUT)Web/SOLARIS-Debug-Debug_full-Gcc-Shared-Solaris/
+Macro_Web = $(Macro)
+OutDir_plugin_bz2 = $(UPPOUT)plugin/bz2/SOLARIS-Debug-Debug_full-Gcc-Shared-Solaris/
+Macro_plugin_bz2 = $(Macro)
+OutDir_Core = $(UPPOUT)Core/SOLARIS-Debug-Debug_full-Gcc-Shared-Solaris/
+Macro_Core = $(Macro)
+
+OutDir = $(OutDir_Web_TServ)
+OutFile = /uppout/tserv
+
+.PHONY: all
+all: install $(OutFile)
+
+.PHONY: install
+install:
+	-mkdir -p $(OutDir)
+	-mkdir -p $(OutDir_Web_TServ)
+	-mkdir -p $(OutDir_Web)
+	-mkdir -p $(OutDir_plugin_bz2)
+	-mkdir -p $(OutDir_Core)
+
+$(OutFile):  \
+	$(OutDir_Web_TServ)tserv.o \
+	$(OutDir_Web)Web.a \
+	$(OutDir_plugin_bz2)bz2.a \
+	$(OutDir_Core)Core.a
+	c++ -o $(OutFile) -ggdb $(LIBPATH) -Wl,--gc-sections,-O,2 $(LINKOPTIONS) \
+		$(OutDir_Web_TServ)tserv.o \
+			$(OutDir_Web)Web.a \
+			$(OutDir_plugin_bz2)bz2.a \
+			$(OutDir_Core)Core.a \
+			-lnsl \
+			-lsocket \
+			-lposix4 \
+			-ldl
+$(OutDir_Web_TServ)tserv.o: $(UPPDIR1)Web/TServ/tserv.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h \
+	$(UPPDIR1)plugin/bz2/bz2.h \
+	$(UPPDIR1)Web/auth.h \
+	$(UPPDIR1)Web/html.h \
+	$(UPPDIR1)Web/httpcli.h \
+	$(UPPDIR1)Web/httpsrv.h \
+	$(UPPDIR1)Web/smtp.h \
+	$(UPPDIR1)Web/socket.h \
+	$(UPPDIR1)Web/sproc.h \
+	$(UPPDIR1)Web/TServ/version.h \
+	$(UPPDIR1)Web/util.h \
+	$(UPPDIR1)Web/Web.h
+	$(CPPFLAGS) $(CINC) $(Macro_Web_TServ)  $(UPPDIR1)Web/TServ/tserv.cpp -o $(OutDir_Web_TServ)tserv.o
+
+$(OutDir_Web)util.o: $(UPPDIR1)Web/util.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h \
+	$(UPPDIR1)Web/auth.h \
+	$(UPPDIR1)Web/html.h \
+	$(UPPDIR1)Web/httpcli.h \
+	$(UPPDIR1)Web/httpsrv.h \
+	$(UPPDIR1)Web/smtp.h \
+	$(UPPDIR1)Web/socket.h \
+	$(UPPDIR1)Web/sproc.h \
+	$(UPPDIR1)Web/util.h \
+	$(UPPDIR1)Web/Web.h
+	$(CPPFLAGS) $(CINC) $(Macro_Web)  $(UPPDIR1)Web/util.cpp -o $(OutDir_Web)util.o
+
+$(OutDir_Web)md5.o: $(UPPDIR1)Web/md5.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h \
+	$(UPPDIR1)Web/auth.h \
+	$(UPPDIR1)Web/html.h \
+	$(UPPDIR1)Web/httpcli.h \
+	$(UPPDIR1)Web/httpsrv.h \
+	$(UPPDIR1)Web/smtp.h \
+	$(UPPDIR1)Web/socket.h \
+	$(UPPDIR1)Web/sproc.h \
+	$(UPPDIR1)Web/util.h \
+	$(UPPDIR1)Web/Web.h
+	$(CPPFLAGS) $(CINC) $(Macro_Web)  $(UPPDIR1)Web/md5.cpp -o $(OutDir_Web)md5.o
+
+$(OutDir_Web)html.o: $(UPPDIR1)Web/html.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h \
+	$(UPPDIR1)Web/auth.h \
+	$(UPPDIR1)Web/html.h \
+	$(UPPDIR1)Web/httpcli.h \
+	$(UPPDIR1)Web/httpsrv.h \
+	$(UPPDIR1)Web/smtp.h \
+	$(UPPDIR1)Web/socket.h \
+	$(UPPDIR1)Web/sproc.h \
+	$(UPPDIR1)Web/util.h \
+	$(UPPDIR1)Web/Web.h
+	$(CPPFLAGS) $(CINC) $(Macro_Web)  $(UPPDIR1)Web/html.cpp -o $(OutDir_Web)html.o
+
+$(OutDir_Web)socket.o: $(UPPDIR1)Web/socket.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h \
+	$(UPPDIR1)Web/auth.h \
+	$(UPPDIR1)Web/html.h \
+	$(UPPDIR1)Web/httpcli.h \
+	$(UPPDIR1)Web/httpsrv.h \
+	$(UPPDIR1)Web/smtp.h \
+	$(UPPDIR1)Web/socket.h \
+	$(UPPDIR1)Web/sproc.h \
+	$(UPPDIR1)Web/util.h \
+	$(UPPDIR1)Web/Web.h
+	$(CPPFLAGS) $(CINC) $(Macro_Web)  $(UPPDIR1)Web/socket.cpp -o $(OutDir_Web)socket.o
+
+$(OutDir_Web)httpsrv.o: $(UPPDIR1)Web/httpsrv.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h \
+	$(UPPDIR1)Web/auth.h \
+	$(UPPDIR1)Web/html.h \
+	$(UPPDIR1)Web/httpcli.h \
+	$(UPPDIR1)Web/httpsrv.h \
+	$(UPPDIR1)Web/smtp.h \
+	$(UPPDIR1)Web/socket.h \
+	$(UPPDIR1)Web/sproc.h \
+	$(UPPDIR1)Web/util.h \
+	$(UPPDIR1)Web/Web.h
+	$(CPPFLAGS) $(CINC) $(Macro_Web)  $(UPPDIR1)Web/httpsrv.cpp -o $(OutDir_Web)httpsrv.o
+
+$(OutDir_Web)httpcli.o: $(UPPDIR1)Web/httpcli.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h \
+	$(UPPDIR1)Web/auth.h \
+	$(UPPDIR1)Web/html.h \
+	$(UPPDIR1)Web/httpcli.h \
+	$(UPPDIR1)Web/httpsrv.h \
+	$(UPPDIR1)Web/smtp.h \
+	$(UPPDIR1)Web/socket.h \
+	$(UPPDIR1)Web/sproc.h \
+	$(UPPDIR1)Web/util.h \
+	$(UPPDIR1)Web/Web.h
+	$(CPPFLAGS) $(CINC) $(Macro_Web)  $(UPPDIR1)Web/httpcli.cpp -o $(OutDir_Web)httpcli.o
+
+$(OutDir_Web)auth.o: $(UPPDIR1)Web/auth.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h \
+	$(UPPDIR1)Web/auth.h \
+	$(UPPDIR1)Web/html.h \
+	$(UPPDIR1)Web/httpcli.h \
+	$(UPPDIR1)Web/httpsrv.h \
+	$(UPPDIR1)Web/smtp.h \
+	$(UPPDIR1)Web/socket.h \
+	$(UPPDIR1)Web/sproc.h \
+	$(UPPDIR1)Web/util.h \
+	$(UPPDIR1)Web/Web.h
+	$(CPPFLAGS) $(CINC) $(Macro_Web)  $(UPPDIR1)Web/auth.cpp -o $(OutDir_Web)auth.o
+
+$(OutDir_Web)smtp.o: $(UPPDIR1)Web/smtp.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h \
+	$(UPPDIR1)Web/auth.h \
+	$(UPPDIR1)Web/html.h \
+	$(UPPDIR1)Web/httpcli.h \
+	$(UPPDIR1)Web/httpsrv.h \
+	$(UPPDIR1)Web/smtp.h \
+	$(UPPDIR1)Web/socket.h \
+	$(UPPDIR1)Web/sproc.h \
+	$(UPPDIR1)Web/util.h \
+	$(UPPDIR1)Web/Web.h
+	$(CPPFLAGS) $(CINC) $(Macro_Web)  $(UPPDIR1)Web/smtp.cpp -o $(OutDir_Web)smtp.o
+
+$(OutDir_Web)sproc.o: $(UPPDIR1)Web/sproc.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h \
+	$(UPPDIR1)Web/auth.h \
+	$(UPPDIR1)Web/html.h \
+	$(UPPDIR1)Web/httpcli.h \
+	$(UPPDIR1)Web/httpsrv.h \
+	$(UPPDIR1)Web/smtp.h \
+	$(UPPDIR1)Web/socket.h \
+	$(UPPDIR1)Web/sproc.h \
+	$(UPPDIR1)Web/util.h \
+	$(UPPDIR1)Web/Web.h
+	$(CPPFLAGS) $(CINC) $(Macro_Web)  $(UPPDIR1)Web/sproc.cpp -o $(OutDir_Web)sproc.o
+
+$(OutDir_Web)Web.a: \
+	$(OutDir_Web)util.o \
+	$(OutDir_Web)md5.o \
+	$(OutDir_Web)html.o \
+	$(OutDir_Web)socket.o \
+	$(OutDir_Web)httpsrv.o \
+	$(OutDir_Web)httpcli.o \
+	$(OutDir_Web)auth.o \
+	$(OutDir_Web)smtp.o \
+	$(OutDir_Web)sproc.o
+	$(AR) $(OutDir_Web)Web.a \
+		$(OutDir_Web)util.o \
+		$(OutDir_Web)md5.o \
+		$(OutDir_Web)html.o \
+		$(OutDir_Web)socket.o \
+		$(OutDir_Web)httpsrv.o \
+		$(OutDir_Web)httpcli.o \
+		$(OutDir_Web)auth.o \
+		$(OutDir_Web)smtp.o \
+		$(OutDir_Web)sproc.o
+
+$(OutDir_plugin_bz2)bz2upp.o: $(UPPDIR1)plugin/bz2/bz2upp.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h \
+	$(UPPDIR1)plugin/bz2/bz2.h \
+	$(UPPDIR1)plugin/bz2/lib/bzlib.h
+	$(CPPFLAGS) $(CINC) $(Macro_plugin_bz2)  $(UPPDIR1)plugin/bz2/bz2upp.cpp -o $(OutDir_plugin_bz2)bz2upp.o
+
+$(OutDir_plugin_bz2)blocksort.o: $(UPPDIR1)plugin/bz2/lib/blocksort.c \
+	$(UPPDIR1)plugin/bz2/lib/bzlib.h \
+	$(UPPDIR1)plugin/bz2/lib/bzlib_private.h
+	$(CFLAGS) $(CINC) $(Macro_plugin_bz2)  $(UPPDIR1)plugin/bz2/lib/blocksort.c -o $(OutDir_plugin_bz2)blocksort.o
+
+$(OutDir_plugin_bz2)bzlib.o: $(UPPDIR1)plugin/bz2/lib/bzlib.c \
+	$(UPPDIR1)plugin/bz2/lib/bzlib.h \
+	$(UPPDIR1)plugin/bz2/lib/bzlib_private.h
+	$(CFLAGS) $(CINC) $(Macro_plugin_bz2)  $(UPPDIR1)plugin/bz2/lib/bzlib.c -o $(OutDir_plugin_bz2)bzlib.o
+
+$(OutDir_plugin_bz2)compress.o: $(UPPDIR1)plugin/bz2/lib/compress.c \
+	$(UPPDIR1)plugin/bz2/lib/bzlib.h \
+	$(UPPDIR1)plugin/bz2/lib/bzlib_private.h
+	$(CFLAGS) $(CINC) $(Macro_plugin_bz2)  $(UPPDIR1)plugin/bz2/lib/compress.c -o $(OutDir_plugin_bz2)compress.o
+
+$(OutDir_plugin_bz2)crctable.o: $(UPPDIR1)plugin/bz2/lib/crctable.c \
+	$(UPPDIR1)plugin/bz2/lib/bzlib.h \
+	$(UPPDIR1)plugin/bz2/lib/bzlib_private.h
+	$(CFLAGS) $(CINC) $(Macro_plugin_bz2)  $(UPPDIR1)plugin/bz2/lib/crctable.c -o $(OutDir_plugin_bz2)crctable.o
+
+$(OutDir_plugin_bz2)decompress.o: $(UPPDIR1)plugin/bz2/lib/decompress.c \
+	$(UPPDIR1)plugin/bz2/lib/bzlib.h \
+	$(UPPDIR1)plugin/bz2/lib/bzlib_private.h
+	$(CFLAGS) $(CINC) $(Macro_plugin_bz2)  $(UPPDIR1)plugin/bz2/lib/decompress.c -o $(OutDir_plugin_bz2)decompress.o
+
+$(OutDir_plugin_bz2)huffman.o: $(UPPDIR1)plugin/bz2/lib/huffman.c \
+	$(UPPDIR1)plugin/bz2/lib/bzlib.h \
+	$(UPPDIR1)plugin/bz2/lib/bzlib_private.h
+	$(CFLAGS) $(CINC) $(Macro_plugin_bz2)  $(UPPDIR1)plugin/bz2/lib/huffman.c -o $(OutDir_plugin_bz2)huffman.o
+
+$(OutDir_plugin_bz2)randtable.o: $(UPPDIR1)plugin/bz2/lib/randtable.c \
+	$(UPPDIR1)plugin/bz2/lib/bzlib.h \
+	$(UPPDIR1)plugin/bz2/lib/bzlib_private.h
+	$(CFLAGS) $(CINC) $(Macro_plugin_bz2)  $(UPPDIR1)plugin/bz2/lib/randtable.c -o $(OutDir_plugin_bz2)randtable.o
+
+$(OutDir_plugin_bz2)bz2.a: \
+	$(OutDir_plugin_bz2)bz2upp.o \
+	$(OutDir_plugin_bz2)blocksort.o \
+	$(OutDir_plugin_bz2)bzlib.o \
+	$(OutDir_plugin_bz2)compress.o \
+	$(OutDir_plugin_bz2)crctable.o \
+	$(OutDir_plugin_bz2)decompress.o \
+	$(OutDir_plugin_bz2)huffman.o \
+	$(OutDir_plugin_bz2)randtable.o
+	$(AR) $(OutDir_plugin_bz2)bz2.a \
+		$(OutDir_plugin_bz2)bz2upp.o \
+		$(OutDir_plugin_bz2)blocksort.o \
+		$(OutDir_plugin_bz2)bzlib.o \
+		$(OutDir_plugin_bz2)compress.o \
+		$(OutDir_plugin_bz2)crctable.o \
+		$(OutDir_plugin_bz2)decompress.o \
+		$(OutDir_plugin_bz2)huffman.o \
+		$(OutDir_plugin_bz2)randtable.o
+
+$(OutDir_Core)Mt.o: $(UPPDIR1)Core/Mt.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h
+	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/Mt.cpp -o $(OutDir_Core)Mt.o
+
+$(OutDir_Core)Thread.o: $(UPPDIR1)Core/Thread.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h
+	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/Thread.cpp -o $(OutDir_Core)Thread.o
+
+$(OutDir_Core)heap.o: $(UPPDIR1)Core/heap.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h
+	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/heap.cpp -o $(OutDir_Core)heap.o
+
+$(OutDir_Core)heapdbg.o: $(UPPDIR1)Core/heapdbg.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h
+	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/heapdbg.cpp -o $(OutDir_Core)heapdbg.o
+
+$(OutDir_Core)String.o: $(UPPDIR1)Core/String.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h
+	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/String.cpp -o $(OutDir_Core)String.o
+
+$(OutDir_Core)StrUtil.o: $(UPPDIR1)Core/StrUtil.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h
+	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/StrUtil.cpp -o $(OutDir_Core)StrUtil.o
+
+$(OutDir_Core)CharSet.o: $(UPPDIR1)Core/CharSet.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h
+	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/CharSet.cpp -o $(OutDir_Core)CharSet.o
+
+$(OutDir_Core)Path.o: $(UPPDIR1)Core/Path.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h
+	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/Path.cpp -o $(OutDir_Core)Path.o
+
+$(OutDir_Core)App.o: $(UPPDIR1)Core/App.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h
+	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/App.cpp -o $(OutDir_Core)App.o
+
+$(OutDir_Core)Stream.o: $(UPPDIR1)Core/Stream.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h
+	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/Stream.cpp -o $(OutDir_Core)Stream.o
+
+$(OutDir_Core)Log.o: $(UPPDIR1)Core/Log.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h
+	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/Log.cpp -o $(OutDir_Core)Log.o
+
+$(OutDir_Core)Debug.o: $(UPPDIR1)Core/Debug.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h
+	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/Debug.cpp -o $(OutDir_Core)Debug.o
+
+$(OutDir_Core)Util.o: $(UPPDIR1)Core/Util.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h
+	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/Util.cpp -o $(OutDir_Core)Util.o
+
+$(OutDir_Core)mathutil.o: $(UPPDIR1)Core/mathutil.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h
+	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/mathutil.cpp -o $(OutDir_Core)mathutil.o
+
+$(OutDir_Core)Cont.o: $(UPPDIR1)Core/Cont.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h
+	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/Cont.cpp -o $(OutDir_Core)Cont.o
+
+$(OutDir_Core)Callback.o: $(UPPDIR1)Core/Callback.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h
+	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/Callback.cpp -o $(OutDir_Core)Callback.o
+
+$(OutDir_Core)Color.o: $(UPPDIR1)Core/Color.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h
+	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/Color.cpp -o $(OutDir_Core)Color.o
+
+$(OutDir_Core)Gtypes.o: $(UPPDIR1)Core/Gtypes.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h
+	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/Gtypes.cpp -o $(OutDir_Core)Gtypes.o
+
+$(OutDir_Core)TimeDate.o: $(UPPDIR1)Core/TimeDate.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h
+	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/TimeDate.cpp -o $(OutDir_Core)TimeDate.o
+
+$(OutDir_Core)Value.o: $(UPPDIR1)Core/Value.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h
+	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/Value.cpp -o $(OutDir_Core)Value.o
+
+$(OutDir_Core)Convert.o: $(UPPDIR1)Core/Convert.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h
+	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/Convert.cpp -o $(OutDir_Core)Convert.o
+
+$(OutDir_Core)Format.o: $(UPPDIR1)Core/Format.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h
+	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/Format.cpp -o $(OutDir_Core)Format.o
+
+$(OutDir_Core)t.o: $(UPPDIR1)Core/t.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Core.t \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t.h \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h
+	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/t.cpp -o $(OutDir_Core)t.o
+
+$(OutDir_Core)Lang.o: $(UPPDIR1)Core/Lang.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h
+	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/Lang.cpp -o $(OutDir_Core)Lang.o
+
+$(OutDir_Core)parser.o: $(UPPDIR1)Core/parser.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h
+	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/parser.cpp -o $(OutDir_Core)parser.o
+
+$(OutDir_Core)Uuid.o: $(UPPDIR1)Core/Uuid.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h
+	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/Uuid.cpp -o $(OutDir_Core)Uuid.o
+
+$(OutDir_Core)Ptr.o: $(UPPDIR1)Core/Ptr.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h
+	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/Ptr.cpp -o $(OutDir_Core)Ptr.o
+
+$(OutDir_Core)Topic.o: $(UPPDIR1)Core/Topic.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h
+	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/Topic.cpp -o $(OutDir_Core)Topic.o
+
+$(OutDir_Core)Win32Com.o: $(UPPDIR1)Core/Win32Com.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h
+	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/Win32Com.cpp -o $(OutDir_Core)Win32Com.o
+
+$(OutDir_Core)Dli.o: $(UPPDIR1)Core/Dli.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h
+	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/Dli.cpp -o $(OutDir_Core)Dli.o
+
+$(OutDir_Core)Test.o: $(UPPDIR1)Core/Test.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h
+	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/Test.cpp -o $(OutDir_Core)Test.o
+
+$(OutDir_Core)Core.a: \
+	$(OutDir_Core)Mt.o \
+	$(OutDir_Core)Thread.o \
+	$(OutDir_Core)heap.o \
+	$(OutDir_Core)heapdbg.o \
+	$(OutDir_Core)String.o \
+	$(OutDir_Core)StrUtil.o \
+	$(OutDir_Core)CharSet.o \
+	$(OutDir_Core)Path.o \
+	$(OutDir_Core)App.o \
+	$(OutDir_Core)Stream.o \
+	$(OutDir_Core)Log.o \
+	$(OutDir_Core)Debug.o \
+	$(OutDir_Core)Util.o \
+	$(OutDir_Core)mathutil.o \
+	$(OutDir_Core)Cont.o \
+	$(OutDir_Core)Callback.o \
+	$(OutDir_Core)Color.o \
+	$(OutDir_Core)Gtypes.o \
+	$(OutDir_Core)TimeDate.o \
+	$(OutDir_Core)Value.o \
+	$(OutDir_Core)Convert.o \
+	$(OutDir_Core)Format.o \
+	$(OutDir_Core)t.o \
+	$(OutDir_Core)Lang.o \
+	$(OutDir_Core)parser.o \
+	$(OutDir_Core)Uuid.o \
+	$(OutDir_Core)Ptr.o \
+	$(OutDir_Core)Topic.o \
+	$(OutDir_Core)Win32Com.o \
+	$(OutDir_Core)Dli.o \
+	$(OutDir_Core)Test.o
+	$(AR) $(OutDir_Core)Core.a \
+		$(OutDir_Core)Mt.o \
+		$(OutDir_Core)Thread.o \
+		$(OutDir_Core)heap.o \
+		$(OutDir_Core)heapdbg.o \
+		$(OutDir_Core)String.o \
+		$(OutDir_Core)StrUtil.o \
+		$(OutDir_Core)CharSet.o \
+		$(OutDir_Core)Path.o \
+		$(OutDir_Core)App.o \
+		$(OutDir_Core)Stream.o \
+		$(OutDir_Core)Log.o \
+		$(OutDir_Core)Debug.o \
+		$(OutDir_Core)Util.o \
+		$(OutDir_Core)mathutil.o \
+		$(OutDir_Core)Cont.o \
+		$(OutDir_Core)Callback.o \
+		$(OutDir_Core)Color.o \
+		$(OutDir_Core)Gtypes.o \
+		$(OutDir_Core)TimeDate.o \
+		$(OutDir_Core)Value.o \
+		$(OutDir_Core)Convert.o \
+		$(OutDir_Core)Format.o \
+		$(OutDir_Core)t.o \
+		$(OutDir_Core)Lang.o \
+		$(OutDir_Core)parser.o \
+		$(OutDir_Core)Uuid.o \
+		$(OutDir_Core)Ptr.o \
+		$(OutDir_Core)Topic.o \
+		$(OutDir_Core)Win32Com.o \
+		$(OutDir_Core)Dli.o \
+		$(OutDir_Core)Test.o
diff --git a/uppsrc/Web/TServ/TServ.sh b/uppsrc/Web/TServ/TServ.sh
new file mode 100644
index 000000000..1754dd1c8
--- /dev/null
+++ b/uppsrc/Web/TServ/TServ.sh
@@ -0,0 +1,130 @@
+# Project modules: Web\TServ Web TCore Core plugin\bz2 plugin
+# Configurations:
+mkdir -p /uppout/uppnew/Web/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST
+echo /src/uppsrc/Web/util.cpp
+/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/Web/util.cpp -o /uppout/uppnew/Web/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/util.o
+echo /src/uppsrc/Web/html.cpp
+/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/Web/html.cpp -o /uppout/uppnew/Web/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/html.o
+echo /src/uppsrc/Web/socket.cpp
+/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/Web/socket.cpp -o /uppout/uppnew/Web/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/socket.o
+echo /src/uppsrc/Web/http.cpp
+/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/Web/http.cpp -o /uppout/uppnew/Web/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/http.o
+echo /src/uppsrc/Web/auth.cpp
+/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/Web/auth.cpp -o /uppout/uppnew/Web/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/auth.o
+echo /src/uppsrc/Web/smtp.cpp
+/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/Web/smtp.cpp -o /uppout/uppnew/Web/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/smtp.o
+echo /src/uppsrc/Web/sproc.cpp
+/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/Web/sproc.cpp -o /uppout/uppnew/Web/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/sproc.o
+/usr/local/bin/ar -sr /uppout/uppnew/Web/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/Web.a /uppout/uppnew/Web/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/util.o /uppout/uppnew/Web/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/html.o /uppout/uppnew/Web/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/socket.o /uppout/uppnew/Web/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/http.o /uppout/uppnew/Web/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/auth.o /uppout/uppnew/Web/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/smtp.o /uppout/uppnew/Web/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/sproc.o
+mkdir -p /uppout/uppnew/TCore/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST
+echo /src/uppsrc/TCore/util.cpp
+/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/TCore/util.cpp -o /uppout/uppnew/TCore/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/util.o
+echo /src/uppsrc/TCore/dbf.cpp
+/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/TCore/dbf.cpp -o /uppout/uppnew/TCore/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/dbf.o
+echo /src/uppsrc/TCore/globcfg.cpp
+/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/TCore/globcfg.cpp -o /uppout/uppnew/TCore/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/globcfg.o
+echo /src/uppsrc/TCore/atexit.cpp
+/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/TCore/atexit.cpp -o /uppout/uppnew/TCore/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/atexit.o
+echo /src/uppsrc/TCore/help.cpp
+/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/TCore/help.cpp -o /uppout/uppnew/TCore/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/help.o
+echo /src/uppsrc/TCore/CalcType.cpp
+/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/TCore/CalcType.cpp -o /uppout/uppnew/TCore/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/CalcType.o
+echo /src/uppsrc/TCore/CalcNode.cpp
+/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/TCore/CalcNode.cpp -o /uppout/uppnew/TCore/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/CalcNode.o
+echo /src/uppsrc/TCore/CalcBasic.cpp
+/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/TCore/CalcBasic.cpp -o /uppout/uppnew/TCore/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/CalcBasic.o
+echo /src/uppsrc/TCore/datafile.cpp
+/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/TCore/datafile.cpp -o /uppout/uppnew/TCore/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/datafile.o
+echo /src/uppsrc/TCore/database.cpp
+/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/TCore/database.cpp -o /uppout/uppnew/TCore/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/database.o
+echo /src/uppsrc/TCore/datatest.cpp
+/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/TCore/datatest.cpp -o /uppout/uppnew/TCore/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/datatest.o
+/usr/local/bin/ar -sr /uppout/uppnew/TCore/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/TCore.a /uppout/uppnew/TCore/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/util.o /uppout/uppnew/TCore/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/dbf.o /uppout/uppnew/TCore/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/globcfg.o /uppout/uppnew/TCore/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/atexit.o /uppout/uppnew/TCore/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/help.o /uppout/uppnew/TCore/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/CalcType.o /uppout/uppnew/TCore/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/CalcNode.o /uppout/uppnew/TCore/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/CalcBasic.o /uppout/uppnew/TCore/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/datafile.o /uppout/uppnew/TCore/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/database.o /uppout/uppnew/TCore/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/datatest.o
+mkdir -p /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST
+echo /src/uppsrc/Core/Mt.cpp
+/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/Core/Mt.cpp -o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/Mt.o
+echo /src/uppsrc/Core/Thread.cpp
+/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/Core/Thread.cpp -o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/Thread.o
+echo /src/uppsrc/Core/heap.cpp
+/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/Core/heap.cpp -o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/heap.o
+echo /src/uppsrc/Core/nheap.cpp
+/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/Core/nheap.cpp -o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/nheap.o
+echo /src/uppsrc/Core/OString.cpp
+/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/Core/OString.cpp -o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/OString.o
+echo /src/uppsrc/Core/OWString.cpp
+/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/Core/OWString.cpp -o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/OWString.o
+echo /src/uppsrc/Core/String.cpp
+/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/Core/String.cpp -o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/String.o
+echo /src/uppsrc/Core/StrUtil.cpp
+/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/Core/StrUtil.cpp -o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/StrUtil.o
+echo /src/uppsrc/Core/CharSet.cpp
+/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/Core/CharSet.cpp -o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/CharSet.o
+echo /src/uppsrc/Core/Path.cpp
+/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/Core/Path.cpp -o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/Path.o
+echo /src/uppsrc/Core/App.cpp
+/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/Core/App.cpp -o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/App.o
+echo /src/uppsrc/Core/Stream.cpp
+/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/Core/Stream.cpp -o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/Stream.o
+echo /src/uppsrc/Core/Debug.cpp
+/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/Core/Debug.cpp -o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/Debug.o
+echo /src/uppsrc/Core/Util.cpp
+/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/Core/Util.cpp -o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/Util.o
+echo /src/uppsrc/Core/mathutil.cpp
+/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/Core/mathutil.cpp -o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/mathutil.o
+echo /src/uppsrc/Core/Cont.cpp
+/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/Core/Cont.cpp -o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/Cont.o
+echo /src/uppsrc/Core/Callback.cpp
+/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/Core/Callback.cpp -o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/Callback.o
+echo /src/uppsrc/Core/Color.cpp
+/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/Core/Color.cpp -o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/Color.o
+echo /src/uppsrc/Core/Gtypes.cpp
+/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/Core/Gtypes.cpp -o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/Gtypes.o
+echo /src/uppsrc/Core/TimeDate.cpp
+/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/Core/TimeDate.cpp -o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/TimeDate.o
+echo /src/uppsrc/Core/Value.cpp
+/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/Core/Value.cpp -o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/Value.o
+echo /src/uppsrc/Core/Convert.cpp
+/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/Core/Convert.cpp -o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/Convert.o
+echo /src/uppsrc/Core/Format.cpp
+/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/Core/Format.cpp -o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/Format.o
+echo /src/uppsrc/Core/Lang.cpp
+/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/Core/Lang.cpp -o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/Lang.o
+echo /src/uppsrc/Core/parser.cpp
+/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/Core/parser.cpp -o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/parser.o
+echo /src/uppsrc/Core/Uuid.cpp
+/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/Core/Uuid.cpp -o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/Uuid.o
+echo /src/uppsrc/Core/Ptr.cpp
+/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/Core/Ptr.cpp -o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/Ptr.o
+echo /src/uppsrc/Core/Win32Com.cpp
+/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/Core/Win32Com.cpp -o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/Win32Com.o
+echo /src/uppsrc/Core/Dli.cpp
+/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/Core/Dli.cpp -o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/Dli.o
+echo /src/uppsrc/Core/Test.cpp
+/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/Core/Test.cpp -o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/Test.o
+/usr/local/bin/ar -sr /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/Core.a /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/Mt.o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/Thread.o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/heap.o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/nheap.o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/OString.o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/OWString.o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/String.o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/StrUtil.o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/CharSet.o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/Path.o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/App.o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/Stream.o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/Debug.o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/Util.o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/mathutil.o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/Cont.o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/Callback.o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/Color.o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/Gtypes.o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/TimeDate.o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/Value.o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/Convert.o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/Format.o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/Lang.o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/parser.o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/Uuid.o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/Ptr.o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/Win32Com.o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/Dli.o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/Test.o
+mkdir -p /uppout/uppnew/plugin/bz2/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST
+echo /src/uppsrc/plugin/bz2/bz2upp.cpp
+/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/plugin/bz2/bz2upp.cpp -o /uppout/uppnew/plugin/bz2/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/bz2upp.o
+echo /src/uppsrc/plugin/bz2/blocksort.c
+/usr/local/bin/g++ -c -O2 -ffunction-sections -x c -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/plugin/bz2/blocksort.c -o /uppout/uppnew/plugin/bz2/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/blocksort.o
+echo /src/uppsrc/plugin/bz2/bzlib.c
+/usr/local/bin/g++ -c -O2 -ffunction-sections -x c -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/plugin/bz2/bzlib.c -o /uppout/uppnew/plugin/bz2/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/bzlib.o
+echo /src/uppsrc/plugin/bz2/compress.c
+/usr/local/bin/g++ -c -O2 -ffunction-sections -x c -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/plugin/bz2/compress.c -o /uppout/uppnew/plugin/bz2/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/compress.o
+echo /src/uppsrc/plugin/bz2/crctable.c
+/usr/local/bin/g++ -c -O2 -ffunction-sections -x c -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/plugin/bz2/crctable.c -o /uppout/uppnew/plugin/bz2/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/crctable.o
+echo /src/uppsrc/plugin/bz2/decompress.c
+/usr/local/bin/g++ -c -O2 -ffunction-sections -x c -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/plugin/bz2/decompress.c -o /uppout/uppnew/plugin/bz2/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/decompress.o
+echo /src/uppsrc/plugin/bz2/huffman.c
+/usr/local/bin/g++ -c -O2 -ffunction-sections -x c -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/plugin/bz2/huffman.c -o /uppout/uppnew/plugin/bz2/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/huffman.o
+echo /src/uppsrc/plugin/bz2/randtable.c
+/usr/local/bin/g++ -c -O2 -ffunction-sections -x c -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/plugin/bz2/randtable.c -o /uppout/uppnew/plugin/bz2/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/randtable.o
+/usr/local/bin/ar -sr /uppout/uppnew/plugin/bz2/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/bz2.a /uppout/uppnew/plugin/bz2/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/bz2upp.o /uppout/uppnew/plugin/bz2/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/blocksort.o /uppout/uppnew/plugin/bz2/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/bzlib.o /uppout/uppnew/plugin/bz2/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/compress.o /uppout/uppnew/plugin/bz2/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/crctable.o /uppout/uppnew/plugin/bz2/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/decompress.o /uppout/uppnew/plugin/bz2/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/huffman.o /uppout/uppnew/plugin/bz2/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/randtable.o
+mkdir -p /uppout/uppnew/plugin/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST
+echo /src/uppsrc/plugin/dummy.cpp
+/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/plugin/dummy.cpp -o /uppout/uppnew/plugin/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/dummy.o
+/usr/local/bin/ar -sr /uppout/uppnew/plugin/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/plugin.a /uppout/uppnew/plugin/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/dummy.o
+mkdir -p /uppout/uppnew/Web/TServ/CONSOLE-GNU3-IA32-LINUX-MAIN-RELEASE-ST
+echo /src/uppsrc/Web/TServ/tserv.cpp
+/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagMAIN -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/Web/TServ/tserv.cpp -o /uppout/uppnew/Web/TServ/CONSOLE-GNU3-IA32-LINUX-MAIN-RELEASE-ST/tserv.o
+/usr/local/bin/g++ -Wl,-s -static  -o /uppout/tserv -Wl,--start-group   /uppout/uppnew/Web/TServ/CONSOLE-GNU3-IA32-LINUX-MAIN-RELEASE-ST/tserv.o /uppout/uppnew/Web/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/Web.a /uppout/uppnew/TCore/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/TCore.a /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/Core.a -lpthread -ldl -luuid /uppout/uppnew/plugin/bz2/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/bz2.a /uppout/uppnew/plugin/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/plugin.a -Wl,--end-group
diff --git a/uppsrc/Web/TServ/TServ.upp b/uppsrc/Web/TServ/TServ.upp
new file mode 100644
index 000000000..70c1cf5e2
--- /dev/null
+++ b/uppsrc/Web/TServ/TServ.upp
@@ -0,0 +1,23 @@
+uses
+	Web,
+	plugin\bz2;
+
+target(WIN32) "tserv.exe";
+
+target(!WIN32) "tserv";
+
+link(GNU3) "-Wl,-R -Wl,/usr/local/lib";
+
+file
+	Makefile,
+	TServ.sh,
+	version.h,
+	tserv.cpp,
+	Info readonly separator,
+	COPYING,
+	COPYING-PLAIN,
+	AUTHORS;
+
+mainconfig
+	"" = "",
+	"" = "SHARED";
diff --git a/uppsrc/Web/TServ/err b/uppsrc/Web/TServ/err
new file mode 100644
index 000000000..392307ff5
--- /dev/null
+++ b/uppsrc/Web/TServ/err
@@ -0,0 +1,869 @@
+make: Warning: File `/upp/uppsrc/Web/TServ/tserv.cpp' has modification time 2.9e+03 s in the future
+In file included from /upp/uppsrc/Core/Core.h:206,
+                 from /upp/uppsrc/Web/Web.h:4,
+                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
+/usr/include/stdlib.h:140: error: syntax error before `(' token
+In file included from /usr/include/sys/types.h:133,
+                 from /usr/include/stdlib.h:433,
+                 from /upp/uppsrc/Core/Core.h:206,
+                 from /upp/uppsrc/Web/Web.h:4,
+                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
+/usr/include/linux/time.h:10: error: 'time_t' is used as a type, but is not
+   defined as a type.
+/usr/include/linux/time.h:16: error: 'time_t' is used as a type, but is not
+   defined as a type.
+/usr/include/linux/time.h:17: error: 'suseconds_t' is used as a type, but is
+   not defined as a type.
+In file included from /usr/include/sys/select.h:46,
+                 from /usr/include/sys/types.h:216,
+                 from /usr/include/stdlib.h:433,
+                 from /upp/uppsrc/Core/Core.h:206,
+                 from /upp/uppsrc/Web/Web.h:4,
+                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
+/usr/include/bits/time.h:70: error: redefinition of `struct timeval'
+/usr/include/linux/time.h:15: error: previous definition of `struct timeval'
+In file included from /usr/include/sys/types.h:266,
+                 from /usr/include/stdlib.h:433,
+                 from /upp/uppsrc/Core/Core.h:206,
+                 from /upp/uppsrc/Web/Web.h:4,
+                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
+/usr/include/bits/pthreadtypes.h:48: error: 'size_t' is used as a type, but is
+   not defined as a type.
+/usr/include/bits/pthreadtypes.h:51: error: 'size_t' is used as a type, but is
+   not defined as a type.
+In file included from /upp/uppsrc/Core/Core.h:206,
+                 from /upp/uppsrc/Web/Web.h:4,
+                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
+/usr/include/stdlib.h:450: error: type specifier omitted for parameter `size_t'
+/usr/include/stdlib.h:450: error: syntax error before `)' token
+/usr/include/stdlib.h:480: error: type specifier omitted for parameter `size_t'
+/usr/include/stdlib.h:480: error: syntax error before `,' token
+/usr/include/stdlib.h:584: error: `size_t' was not declared in this scope
+/usr/include/stdlib.h:584: error: syntax error before `)' token
+/usr/include/stdlib.h:586: error: `size_t' was not declared in this scope
+/usr/include/stdlib.h:586: error: syntax error before `,' token
+/usr/include/stdlib.h:595: error: type specifier omitted for parameter `size_t'
+/usr/include/stdlib.h:595: error: syntax error before `)' token
+In file included from /usr/include/stdlib.h:606,
+                 from /upp/uppsrc/Core/Core.h:206,
+                 from /upp/uppsrc/Web/Web.h:4,
+                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
+/usr/include/alloca.h:33: error: `size_t' was not declared in this scope
+/usr/include/alloca.h:33: error: syntax error before `)' token
+In file included from /upp/uppsrc/Core/Core.h:206,
+                 from /upp/uppsrc/Web/Web.h:4,
+                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
+/usr/include/stdlib.h:611: error: `size_t' was not declared in this scope
+/usr/include/stdlib.h:611: error: syntax error before `)' token
+/usr/include/stdlib.h:616: error: type specifier omitted for parameter `size_t'
+/usr/include/stdlib.h:616: error: syntax error before `,' token
+/usr/include/stdlib.h:768: error: type specifier omitted for parameter `size_t'
+/usr/include/stdlib.h:768: error: syntax error before `,' token
+/usr/include/stdlib.h:773: error: type specifier omitted for parameter `size_t'
+/usr/include/stdlib.h:773: error: syntax error before `,' token
+/usr/include/stdlib.h:846: error: type specifier omitted for parameter `size_t'
+/usr/include/stdlib.h:846: error: syntax error before `)' token
+/usr/include/stdlib.h:849: error: type specifier omitted for parameter `size_t'
+/usr/include/stdlib.h:849: error: syntax error before `)' token
+/usr/include/stdlib.h:853: error: type specifier omitted for parameter `size_t'
+/usr/include/stdlib.h:853: error: syntax error before `)' token
+/usr/include/stdlib.h:857: error: type specifier omitted for parameter `size_t'
+/usr/include/stdlib.h:857: error: syntax error before `)' token
+/usr/include/stdlib.h:866: error: type specifier omitted for parameter `size_t'
+/usr/include/stdlib.h:866: error: syntax error before `)' token
+/usr/include/stdlib.h:870: error: type specifier omitted for parameter `size_t'
+/usr/include/stdlib.h:870: error: syntax error before `)' token
+/usr/include/stdlib.h:877: error: syntax error before `(' token
+/usr/include/stdlib.h:880: error: syntax error before `(' token
+/usr/include/stdlib.h:943: error: type specifier omitted for parameter `size_t'
+/usr/include/stdlib.h:943: error: syntax error before `)' token
+In file included from /usr/include/_G_config.h:44,
+                 from /usr/include/libio.h:32,
+                 from /usr/include/stdio.h:72,
+                 from /upp/uppsrc/Core/Core.h:207,
+                 from /upp/uppsrc/Web/Web.h:4,
+                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
+/usr/include/gconv.h:72: error: type specifier omitted for parameter `size_t'
+/usr/include/gconv.h:72: error: syntax error before `*' token
+/usr/include/gconv.h:88: error: type specifier omitted for parameter `size_t'
+/usr/include/gconv.h:88: error: syntax error before `*' token
+/usr/include/gconv.h:97: error: type specifier omitted for parameter `size_t'
+/usr/include/gconv.h:97: error: syntax error before `*' token
+/usr/include/gconv.h:174: error: 'size_t' is used as a type, but is not defined
+   as a type.
+In file included from /usr/include/stdio.h:72,
+                 from /upp/uppsrc/Core/Core.h:207,
+                 from /upp/uppsrc/Web/Web.h:4,
+                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
+/usr/include/libio.h:53:21: stdarg.h: No such file or directory
+In file included from /usr/include/stdio.h:72,
+                 from /upp/uppsrc/Core/Core.h:207,
+                 from /upp/uppsrc/Web/Web.h:4,
+                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
+/usr/include/libio.h:354: error: type specifier omitted for parameter `size_t'
+/usr/include/libio.h:354: error: syntax error before `)' token
+/usr/include/libio.h:363: error: type specifier omitted for parameter `size_t'
+/usr/include/libio.h:363: error: syntax error before `)' token
+/usr/include/libio.h:475: error: type specifier omitted for parameter `
+   __gnuc_va_list'
+/usr/include/libio.h:477: error: type specifier omitted for parameter `
+   __gnuc_va_list'
+/usr/include/libio.h:479: error: syntax error before `(' token
+In file included from /upp/uppsrc/Core/Core.h:207,
+                 from /upp/uppsrc/Web/Web.h:4,
+                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
+/usr/include/stdio.h:77: error: syntax error before `;' token
+In file included from /upp/uppsrc/Core/Core.h:207,
+                 from /upp/uppsrc/Web/Web.h:4,
+                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
+/usr/include/stdio.h:286: error: type specifier omitted for parameter `size_t'
+/usr/include/stdio.h:286: error: syntax error before `,' token
+/usr/include/stdio.h:292: error: type specifier omitted for parameter `size_t'
+/usr/include/stdio.h:292: error: syntax error before `*' token
+/usr/include/stdio.h:304: error: type specifier omitted for parameter `size_t'
+/usr/include/stdio.h:304: error: syntax error before `)' token
+/usr/include/stdio.h:311: error: type specifier omitted for parameter `size_t'
+/usr/include/stdio.h:311: error: syntax error before `)' token
+/usr/include/stdio.h:339: error: type specifier omitted for parameter `
+   __gnuc_va_list'
+/usr/include/stdio.h:339: error: syntax error before `)' token
+/usr/include/stdio.h:344: error: type specifier omitted for parameter `
+   __gnuc_va_list'
+/usr/include/stdio.h:344: error: syntax error before `)' token
+/usr/include/stdio.h:347: error: type specifier omitted for parameter `
+   __gnuc_va_list'
+/usr/include/stdio.h:347: error: syntax error before `)' token
+/usr/include/stdio.h:353: error: type specifier omitted for parameter `size_t'
+/usr/include/stdio.h:353: error: syntax error before `,' token
+/usr/include/stdio.h:357: error: type specifier omitted for parameter `size_t'
+/usr/include/stdio.h:357: error: syntax error before `,' token
+/usr/include/stdio.h:367: error: type specifier omitted for parameter `
+   __gnuc_va_list'
+/usr/include/stdio.h:367: error: syntax error before `)' token
+/usr/include/stdio.h:383: error: type specifier omitted for parameter `
+   __gnuc_va_list'
+/usr/include/stdio.h:383: error: syntax error before `)' token
+/usr/include/stdio.h:414: error: type specifier omitted for parameter `
+   __gnuc_va_list'
+/usr/include/stdio.h:414: error: syntax error before `)' token
+/usr/include/stdio.h:421: error: type specifier omitted for parameter `
+   __gnuc_va_list'
+/usr/include/stdio.h:421: error: syntax error before `)' token
+/usr/include/stdio.h:426: error: type specifier omitted for parameter `
+   __gnuc_va_list'
+/usr/include/stdio.h:426: error: syntax error before `)' token
+/usr/include/stdio.h:562: error: type specifier omitted for parameter `size_t'
+/usr/include/stdio.h:562: error: syntax error before `*' token
+/usr/include/stdio.h:565: error: type specifier omitted for parameter `size_t'
+/usr/include/stdio.h:565: error: syntax error before `*' token
+/usr/include/stdio.h:575: error: type specifier omitted for parameter `size_t'
+/usr/include/stdio.h:575: error: syntax error before `*' token
+/usr/include/stdio.h:605: error: syntax error before `(' token
+/usr/include/stdio.h:611: error: syntax error before `(' token
+/usr/include/stdio.h:633: error: syntax error before `(' token
+/usr/include/stdio.h:635: error: syntax error before `(' token
+In file included from /upp/uppsrc/Core/Core.h:207,
+                 from /upp/uppsrc/Web/Web.h:4,
+                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
+/usr/include/stdio.h:800: error: type specifier omitted for parameter `
+   __gnuc_va_list'
+/usr/include/stdio.h:800: error: syntax error before `)' token
+In file included from /usr/include/stdio.h:830,
+                 from /upp/uppsrc/Core/Core.h:207,
+                 from /upp/uppsrc/Web/Web.h:4,
+                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
+/usr/include/bits/stdio.h:34: error: type specifier omitted for parameter `
+   __gnuc_va_list'
+/usr/include/bits/stdio.h:34: error: syntax error before `)' token
+/usr/include/bits/stdio.h: In function `int vprintf(...)':
+/usr/include/bits/stdio.h:36: error: `__fmt' undeclared (first use this
+   function)
+/usr/include/bits/stdio.h:36: error: (Each undeclared identifier is reported
+   only once for each function it appears in.)
+/usr/include/bits/stdio.h:36: error: `__arg' undeclared (first use this
+   function)
+/usr/include/bits/stdio.h: At global scope:
+/usr/include/bits/stdio.h:102: error: type specifier omitted for parameter `
+   size_t'
+/usr/include/bits/stdio.h:102: error: syntax error before `*' token
+/usr/include/bits/stdio.h: In function `__ssize_t getline(...)':
+/usr/include/bits/stdio.h:104: error: `__lineptr' undeclared (first use this
+   function)
+/usr/include/bits/stdio.h:104: error: `__n' undeclared (first use this
+   function)
+/usr/include/bits/stdio.h:104: error: `__stream' undeclared (first use this
+   function)
+In file included from /upp/uppsrc/Web/Web.h:4,
+                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
+/upp/uppsrc/Core/Core.h:209:20: stdarg.h: No such file or directory
+In file included from /upp/uppsrc/Core/Core.h:221,
+                 from /upp/uppsrc/Web/Web.h:4,
+                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
+/usr/include/sys/time.h: At global scope:
+/usr/include/sys/time.h:57: error: redefinition of `struct timezone'
+/usr/include/linux/time.h:20: error: previous definition of `struct timezone'
+/usr/include/sys/time.h:94: error: syntax error before numeric constant
+/usr/include/sys/time.h:108: error: redefinition of `struct itimerval'
+/usr/include/linux/time.h:402: error: previous definition of `struct itimerval'
+In file included from /usr/include/asm-x86_64/vsyscall.h:4,
+                 from /usr/include/asm/vsyscall.h:4,
+                 from /usr/include/asm-x86_64/timex.h:12,
+                 from /usr/include/asm/timex.h:4,
+                 from /usr/include/linux/timex.h:157,
+                 from /usr/include/linux/sched.h:11,
+                 from /usr/include/pthread.h:20,
+                 from /upp/uppsrc/Core/Core.h:225,
+                 from /upp/uppsrc/Web/Web.h:4,
+                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
+/usr/include/linux/seqlock.h: In function `void write_seqlock(seqlock_t*)':
+/usr/include/linux/seqlock.h:52: error: `spin_lock' undeclared (first use this
+   function)
+/usr/include/linux/seqlock.h:54: error: `smp_wmb' undeclared (first use this
+   function)
+/usr/include/linux/seqlock.h: In function `void write_sequnlock(seqlock_t*)':
+/usr/include/linux/seqlock.h:61: error: `spin_unlock' undeclared (first use
+   this function)
+/usr/include/linux/seqlock.h: In function `int write_tryseqlock(seqlock_t*)':
+/usr/include/linux/seqlock.h:66: error: `spin_trylock' undeclared (first use
+   this function)
+/usr/include/linux/seqlock.h: In function `unsigned int read_seqbegin(const
+   seqlock_t*)':
+/usr/include/linux/seqlock.h:79: error: `smp_rmb' undeclared (first use this
+   function)
+In file included from /usr/include/asm/system.h:4,
+                 from /usr/include/linux/jiffies.h:8,
+                 from /usr/include/linux/sched.h:12,
+                 from /usr/include/pthread.h:20,
+                 from /upp/uppsrc/Core/Core.h:225,
+                 from /upp/uppsrc/Web/Web.h:4,
+                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
+/usr/include/asm-x86_64/system.h: At global scope:
+/usr/include/asm-x86_64/system.h:243: error: syntax error before `new'
+/usr/include/asm-x86_64/system.h: In function `long unsigned int __cmpxchg(...)
+   ':
+/usr/include/asm-x86_64/system.h:246: error: `size' undeclared (first use this
+   function)
+/usr/include/asm-x86_64/system.h:248: error: syntax error before string
+   constant
+/usr/include/asm-x86_64/system.h:254: error: syntax error before string
+   constant
+/usr/include/asm-x86_64/system.h:260: error: syntax error before string
+   constant
+/usr/include/asm-x86_64/system.h:266: error: syntax error before string
+   constant
+/usr/include/asm-x86_64/system.h:272: error: `old' undeclared (first use this
+   function)
+In file included from /usr/include/linux/sched.h:12,
+                 from /usr/include/pthread.h:20,
+                 from /upp/uppsrc/Core/Core.h:225,
+                 from /upp/uppsrc/Web/Web.h:4,
+                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
+/usr/include/linux/jiffies.h: At global scope:
+/usr/include/linux/jiffies.h:16: error: syntax error before `;' token
+/usr/include/linux/jiffies.h:20: error: syntax error before `)' token
+In file included from /usr/include/linux/sched.h:13,
+                 from /usr/include/pthread.h:20,
+                 from /upp/uppsrc/Core/Core.h:225,
+                 from /upp/uppsrc/Web/Web.h:4,
+                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
+/usr/include/linux/rbtree.h:129: error: syntax error before `new'
+In file included from /usr/include/linux/thread_info.h:20,
+                 from /usr/include/linux/sched.h:14,
+                 from /usr/include/pthread.h:20,
+                 from /upp/uppsrc/Core/Core.h:225,
+                 from /upp/uppsrc/Web/Web.h:4,
+                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
+/usr/include/linux/bitops.h: In function `int get_bitmask_order(unsigned int)':
+/usr/include/linux/bitops.h:78: error: `fls' undeclared (first use this
+   function)
+In file included from /usr/include/linux/cpumask.h:78,
+                 from /usr/include/linux/sched.h:15,
+                 from /usr/include/pthread.h:20,
+                 from /upp/uppsrc/Core/Core.h:225,
+                 from /upp/uppsrc/Web/Web.h:4,
+                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
+/usr/include/linux/bitmap.h: In function `void bitmap_zero(long unsigned int*,
+   int)':
+/usr/include/linux/bitmap.h:113: error: `BITS_PER_LONG' undeclared (first use
+   this function)
+/usr/include/linux/bitmap.h:116: error: `BITS_TO_LONGS' undeclared (first use
+   this function)
+/usr/include/linux/bitmap.h:117: error: `memset' undeclared (first use this
+   function)
+/usr/include/linux/bitmap.h: In function `void bitmap_fill(long unsigned int*,
+   int)':
+/usr/include/linux/bitmap.h:123: error: `size_t' undeclared (first use this
+   function)
+/usr/include/linux/bitmap.h:123: error: syntax error before `=' token
+/usr/include/linux/bitmap.h:124: error: `nlongs' undeclared (first use this
+   function)
+/usr/include/linux/bitmap.h:126: error: `memset' undeclared (first use this
+   function)
+/usr/include/linux/bitmap.h: In function `void bitmap_copy(long unsigned int*,
+   const long unsigned int*, int)':
+/usr/include/linux/bitmap.h:137: error: `BITS_TO_LONGS' undeclared (first use
+   this function)
+/usr/include/linux/bitmap.h:138: error: `memcpy' undeclared (first use this
+   function)
+In file included from /usr/include/linux/sched.h:15,
+                 from /usr/include/pthread.h:20,
+                 from /upp/uppsrc/Core/Core.h:225,
+                 from /upp/uppsrc/Web/Web.h:4,
+                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
+/usr/include/linux/cpumask.h: At global scope:
+/usr/include/linux/cpumask.h:81: error: `bits' was not declared in this scope
+/usr/include/linux/cpumask.h:81: error: invalid data member initialization
+/usr/include/linux/cpumask.h:81: error: (use `=' to initialize static data
+   members)
+/usr/include/linux/cpumask.h: In function `void __cpu_set(int, volatile
+   cpumask_t*)':
+/usr/include/linux/cpumask.h:87: error: 'volatile struct cpumask_t' has no
+   member named 'bits'
+/usr/include/linux/cpumask.h: In function `void __cpu_clear(int, volatile
+   cpumask_t*)':
+/usr/include/linux/cpumask.h:93: error: 'volatile struct cpumask_t' has no
+   member named 'bits'
+/usr/include/linux/cpumask.h: In function `void __cpus_setall(cpumask_t*, int)
+   ':
+/usr/include/linux/cpumask.h:99: error: 'struct cpumask_t' has no member named
+   'bits'
+/usr/include/linux/cpumask.h: In function `void __cpus_clear(cpumask_t*, int)':
+/usr/include/linux/cpumask.h:105: error: 'struct cpumask_t' has no member named
+   'bits'
+/usr/include/linux/cpumask.h: In function `int __cpu_test_and_set(int,
+   cpumask_t*)':
+/usr/include/linux/cpumask.h:114: error: 'struct cpumask_t' has no member named
+   'bits'
+/usr/include/linux/cpumask.h: In function `void __cpus_and(cpumask_t*, const
+   cpumask_t*, const cpumask_t*, int)':
+/usr/include/linux/cpumask.h:121: error: 'struct cpumask_t' has no member named
+   'bits'
+/usr/include/linux/cpumask.h:121: error: 'const struct cpumask_t' has no member
+   named 'bits'
+/usr/include/linux/cpumask.h:121: error: 'const struct cpumask_t' has no member
+   named 'bits'
+/usr/include/linux/cpumask.h: In function `void __cpus_or(cpumask_t*, const
+   cpumask_t*, const cpumask_t*, int)':
+/usr/include/linux/cpumask.h:128: error: 'struct cpumask_t' has no member named
+   'bits'
+/usr/include/linux/cpumask.h:128: error: 'const struct cpumask_t' has no member
+   named 'bits'
+/usr/include/linux/cpumask.h:128: error: 'const struct cpumask_t' has no member
+   named 'bits'
+/usr/include/linux/cpumask.h: In function `void __cpus_xor(cpumask_t*, const
+   cpumask_t*, const cpumask_t*, int)':
+/usr/include/linux/cpumask.h:135: error: 'struct cpumask_t' has no member named
+   'bits'
+/usr/include/linux/cpumask.h:135: error: 'const struct cpumask_t' has no member
+   named 'bits'
+/usr/include/linux/cpumask.h:135: error: 'const struct cpumask_t' has no member
+   named 'bits'
+/usr/include/linux/cpumask.h: In function `void __cpus_andnot(cpumask_t*, const
+   cpumask_t*, const cpumask_t*, int)':
+/usr/include/linux/cpumask.h:143: error: 'struct cpumask_t' has no member named
+   'bits'
+/usr/include/linux/cpumask.h:143: error: 'const struct cpumask_t' has no member
+   named 'bits'
+/usr/include/linux/cpumask.h:143: error: 'const struct cpumask_t' has no member
+   named 'bits'
+/usr/include/linux/cpumask.h: In function `void __cpus_complement(cpumask_t*,
+   const cpumask_t*, int)':
+/usr/include/linux/cpumask.h:150: error: 'struct cpumask_t' has no member named
+   'bits'
+/usr/include/linux/cpumask.h:150: error: 'const struct cpumask_t' has no member
+   named 'bits'
+/usr/include/linux/cpumask.h: In function `int __cpus_equal(const cpumask_t*,
+   const cpumask_t*, int)':
+/usr/include/linux/cpumask.h:157: error: 'const struct cpumask_t' has no member
+   named 'bits'
+/usr/include/linux/cpumask.h:157: error: 'const struct cpumask_t' has no member
+   named 'bits'
+/usr/include/linux/cpumask.h: In function `int __cpus_intersects(const
+   cpumask_t*, const cpumask_t*, int)':
+/usr/include/linux/cpumask.h:164: error: 'const struct cpumask_t' has no member
+   named 'bits'
+/usr/include/linux/cpumask.h:164: error: 'const struct cpumask_t' has no member
+   named 'bits'
+/usr/include/linux/cpumask.h: In function `int __cpus_subset(const cpumask_t*,
+   const cpumask_t*, int)':
+/usr/include/linux/cpumask.h:171: error: 'const struct cpumask_t' has no member
+   named 'bits'
+/usr/include/linux/cpumask.h:171: error: 'const struct cpumask_t' has no member
+   named 'bits'
+/usr/include/linux/cpumask.h: In function `int __cpus_empty(const cpumask_t*,
+   int)':
+/usr/include/linux/cpumask.h:177: error: 'const struct cpumask_t' has no member
+   named 'bits'
+/usr/include/linux/cpumask.h: In function `int __cpus_full(const cpumask_t*,
+   int)':
+/usr/include/linux/cpumask.h:183: error: 'const struct cpumask_t' has no member
+   named 'bits'
+/usr/include/linux/cpumask.h: In function `int __cpus_weight(const cpumask_t*,
+   int)':
+/usr/include/linux/cpumask.h:189: error: 'const struct cpumask_t' has no member
+   named 'bits'
+/usr/include/linux/cpumask.h: In function `void __cpus_shift_right(cpumask_t*,
+   const cpumask_t*, int, int)':
+/usr/include/linux/cpumask.h:197: error: 'struct cpumask_t' has no member named
+   'bits'
+/usr/include/linux/cpumask.h:197: error: 'const struct cpumask_t' has no member
+   named 'bits'
+/usr/include/linux/cpumask.h: In function `void __cpus_shift_left(cpumask_t*,
+   const cpumask_t*, int, int)':
+/usr/include/linux/cpumask.h:205: error: 'struct cpumask_t' has no member named
+   'bits'
+/usr/include/linux/cpumask.h:205: error: 'const struct cpumask_t' has no member
+   named 'bits'
+/usr/include/linux/cpumask.h: In function `int __first_cpu(const cpumask_t*,
+   int)':
+/usr/include/linux/cpumask.h:211: error: syntax error before `,' token
+/usr/include/linux/cpumask.h: In function `int __next_cpu(int, const
+   cpumask_t*, int)':
+/usr/include/linux/cpumask.h:217: error: syntax error before `,' token
+/usr/include/linux/cpumask.h: In function `int __cpumask_scnprintf(char*, int,
+   const cpumask_t*, int)':
+/usr/include/linux/cpumask.h:268: error: 'const struct cpumask_t' has no member
+   named 'bits'
+/usr/include/linux/cpumask.h: In function `int __cpumask_parse(const char*,
+   int, cpumask_t*, int)':
+/usr/include/linux/cpumask.h:276: error: 'struct cpumask_t' has no member named
+   'bits'
+In file included from /usr/include/asm/mmu.h:4,
+                 from /usr/include/linux/sched.h:21,
+                 from /usr/include/pthread.h:20,
+                 from /upp/uppsrc/Core/Core.h:225,
+                 from /upp/uppsrc/Web/Web.h:4,
+                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
+/usr/include/asm-x86_64/mmu.h: At global scope:
+/usr/include/asm-x86_64/mmu.h:15: error: 'rwlock_t' is used as a type, but is
+   not defined as a type.
+/usr/include/asm-x86_64/mmu.h:17: error: field `sem' has incomplete type
+In file included from /usr/include/linux/signal.h:4,
+                 from /usr/include/linux/sched.h:25,
+                 from /usr/include/pthread.h:20,
+                 from /upp/uppsrc/Core/Core.h:225,
+                 from /upp/uppsrc/Web/Web.h:4,
+                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
+/usr/include/linux/list.h:715:2: warning: #warning "don't include kernel headers in userspace"
+In file included from /usr/include/asm/signal.h:4,
+                 from /usr/include/linux/signal.h:6,
+                 from /usr/include/linux/sched.h:25,
+                 from /usr/include/pthread.h:20,
+                 from /upp/uppsrc/Core/Core.h:225,
+                 from /upp/uppsrc/Web/Web.h:4,
+                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
+/usr/include/asm-x86_64/signal.h:35: error: conflicting types for `typedef long
+   unsigned int sigset_t'
+/usr/include/sys/select.h:38: error: previous declaration as `typedef struct
+   __sigset_t sigset_t'
+/usr/include/asm-x86_64/signal.h:163: error: 'size_t' is used as a type, but is
+   not defined as a type.
+In file included from /usr/include/asm-x86_64/siginfo.h:8,
+                 from /usr/include/asm/siginfo.h:4,
+                 from /usr/include/linux/signal.h:7,
+                 from /usr/include/linux/sched.h:25,
+                 from /usr/include/pthread.h:20,
+                 from /upp/uppsrc/Core/Core.h:225,
+                 from /upp/uppsrc/Web/Web.h:4,
+                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
+/usr/include/asm-generic/siginfo.h:57: error: 'timer_t' is used as a type, but
+   is not defined as a type.
+/usr/include/asm-generic/siginfo.h:76: error: 'clock_t' is used as a type, but
+   is not defined as a type.
+/usr/include/asm-generic/siginfo.h:77: error: 'clock_t' is used as a type, but
+   is not defined as a type.
+In file included from /usr/include/linux/sched.h:27,
+                 from /usr/include/pthread.h:20,
+                 from /upp/uppsrc/Core/Core.h:225,
+                 from /upp/uppsrc/Web/Web.h:4,
+                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
+/usr/include/linux/fs_struct.h:9: error: 'rwlock_t' is used as a type, but is
+   not defined as a type.
+In file included from /usr/include/linux/sched.h:29,
+                 from /usr/include/pthread.h:20,
+                 from /upp/uppsrc/Core/Core.h:225,
+                 from /upp/uppsrc/Web/Web.h:4,
+                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
+/usr/include/linux/completion.h:15: error: syntax error before `;' token
+/usr/include/linux/completion.h: In function `void init_completion(completion*)
+   ':
+/usr/include/linux/completion.h:27: error: invalid use of `union wait'
+/usr/include/linux/completion.h:27: error: `init_waitqueue_head' undeclared
+   (first use this function)
+In file included from /usr/include/linux/sched.h:30,
+                 from /usr/include/pthread.h:20,
+                 from /upp/uppsrc/Core/Core.h:225,
+                 from /upp/uppsrc/Web/Web.h:4,
+                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
+/usr/include/linux/pid.h: At global scope:
+/usr/include/linux/pid.h:17: error: field `pid_chain' has incomplete type
+/usr/include/linux/pid.h:19: error: field `pid_list' has incomplete type
+In file included from /usr/include/pthread.h:20,
+                 from /upp/uppsrc/Core/Core.h:225,
+                 from /upp/uppsrc/Web/Web.h:4,
+                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
+/usr/include/linux/sched.h:92: error: type specifier omitted for parameter `
+   process_counts'
+In file included from /usr/include/linux/sched.h:101,
+                 from /usr/include/pthread.h:20,
+                 from /upp/uppsrc/Core/Core.h:225,
+                 from /upp/uppsrc/Web/Web.h:4,
+                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
+/usr/include/linux/timer.h:11: error: field `entry' has incomplete type
+/usr/include/linux/timer.h: In function `void init_timer(timer_list*)':
+/usr/include/linux/timer.h:45: error: `spin_lock_init' undeclared (first use
+   this function)
+In file included from /usr/include/asm/pda.h:4,
+                 from /usr/include/asm-x86_64/current.h:7,
+                 from /usr/include/asm/current.h:4,
+                 from /usr/include/asm-x86_64/processor.h:18,
+                 from /usr/include/asm/processor.h:4,
+                 from /usr/include/linux/sched.h:103,
+                 from /usr/include/pthread.h:20,
+                 from /upp/uppsrc/Core/Core.h:225,
+                 from /upp/uppsrc/Web/Web.h:4,
+                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
+/usr/include/asm-x86_64/pda.h: At global scope:
+/usr/include/asm-x86_64/pda.h:26: error: `CONFIG_X86_L1_CACHE_SHIFT' was not
+   declared in this scope
+/usr/include/asm-x86_64/pda.h:26: error: requested alignment is not a constant
+In file included from /usr/include/asm/processor.h:4,
+                 from /usr/include/linux/sched.h:103,
+                 from /usr/include/pthread.h:20,
+                 from /upp/uppsrc/Core/Core.h:225,
+                 from /upp/uppsrc/Web/Web.h:4,
+                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
+/usr/include/asm-x86_64/processor.h:190: error: 'u16' is used as a type, but is
+   not defined as a type.
+/usr/include/asm-x86_64/processor.h:191: error: 'u16' is used as a type, but is
+   not defined as a type.
+/usr/include/asm-x86_64/processor.h:192: error: 'u16' is used as a type, but is
+   not defined as a type.
+/usr/include/asm-x86_64/processor.h:193: error: 'u16' is used as a type, but is
+   not defined as a type.
+/usr/include/asm-x86_64/processor.h:194: error: 'u64' is used as a type, but is
+   not defined as a type.
+/usr/include/asm-x86_64/processor.h:195: error: 'u64' is used as a type, but is
+   not defined as a type.
+/usr/include/asm-x86_64/processor.h:196: error: 'u32' is used as a type, but is
+   not defined as a type.
+/usr/include/asm-x86_64/processor.h:197: error: 'u32' is used as a type, but is
+   not defined as a type.
+/usr/include/asm-x86_64/processor.h:198: error: syntax error before `[' token
+/usr/include/asm-x86_64/processor.h:199: error: syntax error before `[' token
+/usr/include/asm-x86_64/processor.h:200: error: syntax error before `[' token
+/usr/include/asm-x86_64/processor.h:208: error: 'u32' is used as a type, but is
+   not defined as a type.
+/usr/include/asm-x86_64/processor.h:209: error: 'u64' is used as a type, but is
+   not defined as a type.
+/usr/include/asm-x86_64/processor.h:210: error: 'u64' is used as a type, but is
+   not defined as a type.
+/usr/include/asm-x86_64/processor.h:211: error: 'u64' is used as a type, but is
+   not defined as a type.
+/usr/include/asm-x86_64/processor.h:212: error: 'u64' is used as a type, but is
+   not defined as a type.
+/usr/include/asm-x86_64/processor.h:213: error: syntax error before `[' token
+/usr/include/asm-x86_64/processor.h:214: error: 'u32' is used as a type, but is
+   not defined as a type.
+/usr/include/asm-x86_64/processor.h:215: error: 'u32' is used as a type, but is
+   not defined as a type.
+/usr/include/asm-x86_64/processor.h:216: error: 'u16' is used as a type, but is
+   not defined as a type.
+/usr/include/asm-x86_64/processor.h:217: error: 'u16' is used as a type, but is
+   not defined as a type.
+/usr/include/asm-x86_64/processor.h:228: error: `CONFIG_X86_L1_CACHE_SHIFT' was
+   not declared in this scope
+/usr/include/asm-x86_64/processor.h:228: error: requested alignment is not a
+   constant
+/usr/include/asm-x86_64/processor.h:259: error: syntax error before `[' token
+/usr/include/asm-x86_64/processor.h: In function `void prefetchw(void*)':
+/usr/include/asm-x86_64/processor.h:401: error: `"r"' cannot be used as a
+   function
+/usr/include/asm-x86_64/processor.h:401: error: `alternative_input' undeclared
+   (first use this function)
+In file included from /upp/uppsrc/Core/Core.h:225,
+                 from /upp/uppsrc/Web/Web.h:4,
+                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
+/usr/include/pthread.h: At global scope:
+/usr/include/pthread.h:247: error: type specifier omitted for parameter `size_t
+   '
+/usr/include/pthread.h:247: error: syntax error before `)' token
+/usr/include/pthread.h:251: error: type specifier omitted for parameter `size_t
+   '
+/usr/include/pthread.h:251: error: syntax error before `*' token
+/usr/include/pthread.h:272: error: type specifier omitted for parameter `size_t
+   '
+/usr/include/pthread.h:272: error: syntax error before `)' token
+/usr/include/pthread.h:277: error: type specifier omitted for parameter `size_t
+   '
+/usr/include/pthread.h:277: error: syntax error before `*' token
+/usr/include/pthread.h:284: error: type specifier omitted for parameter `size_t
+   '
+/usr/include/pthread.h:284: error: syntax error before `)' token
+/usr/include/pthread.h:288: error: type specifier omitted for parameter `size_t
+   '
+/usr/include/pthread.h:288: error: syntax error before `*' token
+In file included from /usr/include/c++/3.3.5/cstring:49,
+                 from /usr/include/c++/3.3.5/bits/stl_algobase.h:65,
+                 from /usr/include/c++/3.3.5/algorithm:66,
+                 from /upp/uppsrc/Core/Core.h:299,
+                 from /upp/uppsrc/Web/Web.h:4,
+                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
+/usr/include/c++/3.3.5/cstddef:52: error: `ptrdiff_t' not declared
+In file included from /usr/include/c++/3.3.5/bits/stl_algobase.h:65,
+                 from /usr/include/c++/3.3.5/algorithm:66,
+                 from /upp/uppsrc/Core/Core.h:299,
+                 from /upp/uppsrc/Web/Web.h:4,
+                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
+/usr/include/c++/3.3.5/cstring:80: error: `memmove' not declared
+/usr/include/c++/3.3.5/cstring:81: error: `strcpy' not declared
+/usr/include/c++/3.3.5/cstring:82: error: `strncpy' not declared
+/usr/include/c++/3.3.5/cstring:83: error: `strcat' not declared
+/usr/include/c++/3.3.5/cstring:84: error: `strncat' not declared
+/usr/include/c++/3.3.5/cstring:85: error: `memcmp' not declared
+/usr/include/c++/3.3.5/cstring:86: error: `strcmp' not declared
+/usr/include/c++/3.3.5/cstring:87: error: `strcoll' not declared
+/usr/include/c++/3.3.5/cstring:88: error: `strncmp' not declared
+/usr/include/c++/3.3.5/cstring:89: error: `strxfrm' not declared
+/usr/include/c++/3.3.5/cstring:90: error: `strcspn' not declared
+/usr/include/c++/3.3.5/cstring:91: error: `strspn' not declared
+/usr/include/c++/3.3.5/cstring:92: error: `strtok' not declared
+/usr/include/c++/3.3.5/cstring:94: error: `strerror' not declared
+/usr/include/c++/3.3.5/cstring:95: error: `strlen' not declared
+/usr/include/c++/3.3.5/cstring:97: error: `memchr' not declared
+/usr/include/c++/3.3.5/cstring:100: error: type specifier omitted for parameter
+   `size_t'
+/usr/include/c++/3.3.5/cstring:100: error: syntax error before `)' token
+/usr/include/c++/3.3.5/cstring: In function `void* std::memchr(...)':
+/usr/include/c++/3.3.5/cstring:101: error: `__p' undeclared (first use this
+   function)
+/usr/include/c++/3.3.5/cstring:101: error: `__c' undeclared (first use this
+   function)
+/usr/include/c++/3.3.5/cstring: At global scope:
+/usr/include/c++/3.3.5/cstring:103: error: `strchr' not declared
+/usr/include/c++/3.3.5/cstring:109: error: `strpbrk' not declared
+/usr/include/c++/3.3.5/cstring:115: error: `strrchr' not declared
+/usr/include/c++/3.3.5/cstring:121: error: `strstr' not declared
+In file included from /usr/include/c++/3.3.5/bits/stl_algobase.h:67,
+                 from /usr/include/c++/3.3.5/algorithm:66,
+                 from /upp/uppsrc/Core/Core.h:299,
+                 from /upp/uppsrc/Web/Web.h:4,
+                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
+/usr/include/c++/3.3.5/cstdlib:105: error: `mbstowcs' not declared
+/usr/include/c++/3.3.5/cstdlib:115: error: `wcstombs' not declared
+In file included from /usr/include/c++/3.3.5/bits/stl_algobase.h:69,
+                 from /usr/include/c++/3.3.5/algorithm:66,
+                 from /upp/uppsrc/Core/Core.h:299,
+                 from /upp/uppsrc/Web/Web.h:4,
+                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
+/usr/include/c++/3.3.5/new:82: error: `size_t' undeclared in namespace `std'
+/usr/include/c++/3.3.5/new:82: error: declaration of `operator new' as
+   non-function
+/usr/include/c++/3.3.5/new:82: error: invalid declarator
+/usr/include/c++/3.3.5/new:83: error: `size_t' undeclared in namespace `std'
+/usr/include/c++/3.3.5/new:83: error: declaration of `operator new []' as
+   non-function
+/usr/include/c++/3.3.5/new:83: error: invalid declarator
+/usr/include/c++/3.3.5/new:86: error: `size_t' undeclared in namespace `std'
+/usr/include/c++/3.3.5/new:86: error: syntax error before `::' token
+/usr/include/c++/3.3.5/new:86: error: `operator new' takes type `size_t' (`long
+   unsigned int') as first parameter
+/usr/include/c++/3.3.5/new:87: error: `size_t' undeclared in namespace `std'
+/usr/include/c++/3.3.5/new:87: error: syntax error before `::' token
+/usr/include/c++/3.3.5/new:87: error: `operator new' takes type `size_t' (`long
+   unsigned int') as first parameter
+/usr/include/c++/3.3.5/new:92: error: `size_t' undeclared in namespace `std'
+/usr/include/c++/3.3.5/new:92: error: syntax error before `*' token
+/usr/include/c++/3.3.5/new:92: error: `operator new' takes type `size_t' (`long
+   unsigned int') as first parameter
+/usr/include/c++/3.3.5/new: In function `void* operator new(long unsigned int,
+   ...)':
+/usr/include/c++/3.3.5/new:92: error: `__p' undeclared (first use this
+   function)
+/usr/include/c++/3.3.5/new: At global scope:
+/usr/include/c++/3.3.5/new:93: error: `size_t' undeclared in namespace `std'
+/usr/include/c++/3.3.5/new:93: error: syntax error before `*' token
+/usr/include/c++/3.3.5/new:93: error: `operator new' takes type `size_t' (`long
+   unsigned int') as first parameter
+In file included from /usr/include/c++/3.3.5/x86_64-suse-linux/bits/c++locale.h:43,
+                 from /usr/include/c++/3.3.5/iosfwd:46,
+                 from /usr/include/c++/3.3.5/bits/stl_algobase.h:70,
+                 from /usr/include/c++/3.3.5/algorithm:66,
+                 from /upp/uppsrc/Core/Core.h:299,
+                 from /upp/uppsrc/Web/Web.h:4,
+                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
+/usr/include/iconv.h:43: error: syntax error before `(' token
+In file included from /usr/include/c++/3.3.5/iosfwd:47,
+                 from /usr/include/c++/3.3.5/bits/stl_algobase.h:70,
+                 from /usr/include/c++/3.3.5/algorithm:66,
+                 from /upp/uppsrc/Core/Core.h:299,
+                 from /upp/uppsrc/Web/Web.h:4,
+                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
+/usr/include/c++/3.3.5/cctype:68: error: `isalnum' not declared
+/usr/include/c++/3.3.5/cctype:69: error: `isalpha' not declared
+/usr/include/c++/3.3.5/cctype:70: error: `iscntrl' not declared
+/usr/include/c++/3.3.5/cctype:71: error: `isdigit' not declared
+/usr/include/c++/3.3.5/cctype:72: error: `isgraph' not declared
+/usr/include/c++/3.3.5/cctype:73: error: `islower' not declared
+/usr/include/c++/3.3.5/cctype:74: error: `isprint' not declared
+/usr/include/c++/3.3.5/cctype:75: error: `ispunct' not declared
+/usr/include/c++/3.3.5/cctype:76: error: `isspace' not declared
+/usr/include/c++/3.3.5/cctype:77: error: `isupper' not declared
+/usr/include/c++/3.3.5/cctype:78: error: `isxdigit' not declared
+/usr/include/c++/3.3.5/cctype:79: error: `tolower' not declared
+/usr/include/c++/3.3.5/cctype:80: error: `toupper' not declared
+In file included from /usr/include/c++/3.3.5/x86_64-suse-linux/bits/c++io.h:35,
+                 from /usr/include/c++/3.3.5/bits/fpos.h:44,
+                 from /usr/include/c++/3.3.5/iosfwd:49,
+                 from /usr/include/c++/3.3.5/bits/stl_algobase.h:70,
+                 from /usr/include/c++/3.3.5/algorithm:66,
+                 from /upp/uppsrc/Core/Core.h:299,
+                 from /upp/uppsrc/Web/Web.h:4,
+                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
+/usr/include/c++/3.3.5/cstdio:114: error: `fread' not declared
+/usr/include/c++/3.3.5/cstdio:120: error: `fwrite' not declared
+In file included from /usr/include/c++/3.3.5/bits/fpos.h:44,
+                 from /usr/include/c++/3.3.5/iosfwd:49,
+                 from /usr/include/c++/3.3.5/bits/stl_algobase.h:70,
+                 from /usr/include/c++/3.3.5/algorithm:66,
+                 from /upp/uppsrc/Core/Core.h:299,
+                 from /upp/uppsrc/Web/Web.h:4,
+                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
+/usr/include/c++/3.3.5/x86_64-suse-linux/bits/c++io.h:43: error: syntax error
+   before `;' token
+/usr/include/c++/3.3.5/x86_64-suse-linux/bits/c++io.h:45: error: syntax error
+   before `;' token
+In file included from /usr/include/c++/3.3.5/cwchar:51,
+                 from /usr/include/c++/3.3.5/bits/fpos.h:45,
+                 from /usr/include/c++/3.3.5/iosfwd:49,
+                 from /usr/include/c++/3.3.5/bits/stl_algobase.h:70,
+                 from /usr/include/c++/3.3.5/algorithm:66,
+                 from /upp/uppsrc/Core/Core.h:299,
+                 from /upp/uppsrc/Web/Web.h:4,
+                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
+/usr/include/c++/3.3.5/ctime:66: error: `clock_t' not declared
+/usr/include/c++/3.3.5/ctime:67: error: `time_t' not declared
+/usr/include/c++/3.3.5/ctime:68: error: `tm' not declared
+/usr/include/c++/3.3.5/ctime:70: error: `clock' not declared
+/usr/include/c++/3.3.5/ctime:71: error: `difftime' not declared
+/usr/include/c++/3.3.5/ctime:72: error: `mktime' not declared
+/usr/include/c++/3.3.5/ctime:73: error: `time' not declared
+/usr/include/c++/3.3.5/ctime:74: error: `asctime' not declared
+/usr/include/c++/3.3.5/ctime:75: error: `ctime' not declared
+/usr/include/c++/3.3.5/ctime:76: error: `gmtime' not declared
+/usr/include/c++/3.3.5/ctime:77: error: `localtime' not declared
+/usr/include/c++/3.3.5/ctime:78: error: `strftime' not declared
+In file included from /usr/include/c++/3.3.5/cwchar:54,
+                 from /usr/include/c++/3.3.5/bits/fpos.h:45,
+                 from /usr/include/c++/3.3.5/iosfwd:49,
+                 from /usr/include/c++/3.3.5/bits/stl_algobase.h:70,
+                 from /usr/include/c++/3.3.5/algorithm:66,
+                 from /upp/uppsrc/Core/Core.h:299,
+                 from /upp/uppsrc/Web/Web.h:4,
+                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
+/usr/include/wchar.h:40:21: stdarg.h: No such file or directory
+In file included from /usr/include/c++/3.3.5/cwchar:54,
+                 from /usr/include/c++/3.3.5/bits/fpos.h:45,
+                 from /usr/include/c++/3.3.5/iosfwd:49,
+                 from /usr/include/c++/3.3.5/bits/stl_algobase.h:70,
+                 from /usr/include/c++/3.3.5/algorithm:66,
+                 from /upp/uppsrc/Core/Core.h:299,
+                 from /upp/uppsrc/Web/Web.h:4,
+                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
+/usr/include/wchar.h:137: error: type specifier omitted for parameter `size_t'
+/usr/include/wchar.h:137: error: syntax error before `)' token
+/usr/include/wchar.h:145: error: type specifier omitted for parameter `size_t'
+/usr/include/wchar.h:145: error: syntax error before `)' token
+/usr/include/wchar.h:152: error: type specifier omitted for parameter `size_t'
+/usr/include/wchar.h:152: error: syntax error before `)' token
+/usr/include/wchar.h:162: error: type specifier omitted for parameter `size_t'
+/usr/include/wchar.h:162: error: syntax error before `)' token
+/usr/include/wchar.h:172: error: type specifier omitted for parameter `size_t'
+/usr/include/wchar.h:172: error: syntax error before `,' token
+/usr/include/wchar.h:182: error: syntax error before `(' token
+/usr/include/wchar.h:198: error: syntax error before `(' token
+/usr/include/wchar.h:224: error: syntax error before `(' token
+/usr/include/wchar.h:228: error: syntax error before `(' token
+/usr/include/wchar.h:243: error: syntax error before `(' token
+/usr/include/wchar.h:254: error: syntax error before `(' token
+/usr/include/wchar.h:261: error: type specifier omitted for parameter `size_t'
+/usr/include/wchar.h:261: error: syntax error before `)' token
+/usr/include/wchar.h:266: error: type specifier omitted for parameter `size_t'
+/usr/include/wchar.h:266: error: syntax error before `)' token
+/usr/include/wchar.h:271: error: type specifier omitted for parameter `size_t'
+/usr/include/wchar.h:271: error: syntax error before `)' token
+/usr/include/wchar.h:275: error: type specifier omitted for parameter `size_t'
+/usr/include/wchar.h:275: error: syntax error before `)' token
+/usr/include/wchar.h:279: error: type specifier omitted for parameter `size_t'
+/usr/include/wchar.h:279: error: syntax error before `)' token
+/usr/include/wchar.h:286: error: type specifier omitted for parameter `size_t'
+/usr/include/wchar.h:286: error: syntax error before `)' token
+/usr/include/wchar.h:306: error: syntax error before `(' token
+/usr/include/wchar.h:311: error: syntax error before `(' token
+/usr/include/wchar.h:315: error: syntax error before `(' token
+/usr/include/wchar.h:317: error: syntax error before `(' token
+/usr/include/wchar.h:324: error: syntax error before `(' token
+/usr/include/wchar.h:333: error: syntax error before `(' token
+/usr/include/wchar.h:339: error: syntax error before `(' token
+/usr/include/wchar.h:348: error: syntax error before `(' token
+/usr/include/wchar.h:354: error: syntax error before `(' token
+/usr/include/wchar.h:368: error: type specifier omitted for parameter `size_t'
+/usr/include/wchar.h:368: error: syntax error before `)' token
+/usr/include/wchar.h:575: error: type specifier omitted for parameter `size_t'
+/usr/include/wchar.h:575: error: syntax error before `)' token
+/usr/include/wchar.h:602: error: type specifier omitted for parameter `size_t'
+/usr/include/wchar.h:602: error: syntax error before `,' token
+/usr/include/wchar.h:612: error: type specifier omitted for parameter `
+   __gnuc_va_list'
+/usr/include/wchar.h:612: error: syntax error before `)' token
+/usr/include/wchar.h:619: error: type specifier omitted for parameter `
+   __gnuc_va_list'
+/usr/include/wchar.h:619: error: syntax error before `)' token
+/usr/include/wchar.h:623: error: type specifier omitted for parameter `size_t'
+/usr/include/wchar.h:623: error: syntax error before `,' token
+/usr/include/wchar.h:659: error: type specifier omitted for parameter `
+   __gnuc_va_list'
+/usr/include/wchar.h:659: error: syntax error before `)' token
+/usr/include/wchar.h:666: error: type specifier omitted for parameter `
+   __gnuc_va_list'
+/usr/include/wchar.h:666: error: syntax error before `)' token
+/usr/include/wchar.h:671: error: type specifier omitted for parameter `
+   __gnuc_va_list'
+/usr/include/wchar.h:671: error: syntax error before `)' token
+/usr/include/wchar.h:793: error: syntax error before `(' token
+/usr/include/wchar.h:803: error: syntax error before `(' token
+In file included from /usr/include/c++/3.3.5/bits/fpos.h:45,
+                 from /usr/include/c++/3.3.5/iosfwd:49,
+                 from /usr/include/c++/3.3.5/bits/stl_algobase.h:70,
+                 from /usr/include/c++/3.3.5/algorithm:66,
+                 from /upp/uppsrc/Core/Core.h:299,
+                 from /upp/uppsrc/Web/Web.h:4,
+                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
+/usr/include/c++/3.3.5/cwchar:147: error: `mbrlen' not declared
+/usr/include/c++/3.3.5/cwchar:148: error: `mbrtowc' not declared
+/usr/include/c++/3.3.5/cwchar:150: error: `mbsrtowcs' not declared
+/usr/include/c++/3.3.5/cwchar:162: error: `wcrtomb' not declared
+/usr/include/c++/3.3.5/cwchar:167: error: `wcscspn' not declared
+/usr/include/c++/3.3.5/cwchar:168: error: `wcsftime' not declared
+/usr/include/c++/3.3.5/cwchar:169: error: `wcslen' not declared
+/usr/include/c++/3.3.5/cwchar:173: error: `wcsrtombs' not declared
+/usr/include/c++/3.3.5/cwchar:174: error: `wcsspn' not declared
+/usr/include/c++/3.3.5/cwchar:180: error: `wcsxfrm' not declared
+/usr/include/c++/3.3.5/cwchar:216: error: type specifier omitted for parameter
+   `size_t'
+/usr/include/c++/3.3.5/cwchar:216: error: syntax error before `)' token
+/usr/include/c++/3.3.5/cwchar: In function `wchar_t* std::wmemchr(...)':
+/usr/include/c++/3.3.5/cwchar:217: error: `wchar_t* std::wmemchr(...)'
+   conflicts with previous using declaration `wchar_t* wmemchr(...)'
+In file included from /usr/include/c++/3.3.5/bits/stl_algobase.h:73,
+                 from /usr/include/c++/3.3.5/algorithm:66,
+                 from /upp/uppsrc/Core/Core.h:299,
+                 from /upp/uppsrc/Web/Web.h:4,
+                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
+/usr/include/c++/3.3.5/bits/stl_iterator_base_types.h: At global scope:
+/usr/include/c++/3.3.5/bits/stl_iterator_base_types.h:102: error: syntax error
+   before `,' token
+/usr/include/c++/3.3.5/bits/stl_iterator_base_types.h:109: error: template
+   declaration of `typedef _Tp std::value_type'
+/usr/include/c++/3.3.5/bits/stl_iterator_base_types.h:109: confused by earlier errors, bailing out
+make: *** [/uppout/Web/TServ/GCC33-Gcc-Linux-Main/tserv.o] Error 1
diff --git a/uppsrc/Web/TServ/tserv.cpp b/uppsrc/Web/TServ/tserv.cpp
new file mode 100644
index 000000000..29f632fd6
--- /dev/null
+++ b/uppsrc/Web/TServ/tserv.cpp
@@ -0,0 +1,834 @@
+#include <Web/Web.h>
+#include "version.h"
+#include <plugin/bz2/bz2.h>
+#ifdef PLATFORM_POSIX
+#include <signal.h>
+#endif//PLATFORM_POSIX
+
+using namespace Upp;
+
+enum { DEFAULT_PORT = 2346 };
+
+#ifdef _DEBUG
+#define DO_SVRLOG 1
+#else
+#define DO_SVRLOG 0
+#endif
+
+#if DO_SVRLOG
+#define SVRLOG(x) { StringStream ss; ss << x << '\n'; RLOG(ss.GetResult()); fputs(ss.GetResult(), stderr); fflush(stderr); }
+#else
+#define SVRLOG(x)
+#endif
+
+/*
+void DeleteFolderDeep(const char *dir)
+{
+	FindFile ff(String(dir) + "/*.*");
+	while(ff) {
+		String name = ff.GetName();
+		String p = AppendFileName(dir, name);
+		if(ff.IsFile())
+			DeleteFile(p);
+		else
+		if(ff.IsFolder())
+			DeleteFolderDeep(p);
+		ff.Next();
+	}
+	DirectoryDelete(dir);
+}
+*/
+
+static bool quit_signal = false;
+
+static void QuitSignal(int)
+{
+	puts("Termination signal received, quitting...");
+	quit_signal = true;
+}
+
+class CommandServer
+{
+public:
+	typedef CommandServer CLASSNAME;
+	CommandServer();
+	virtual ~CommandServer();
+
+	CommandServer&  Logging(bool l)                { logging = l; return *this; }
+	CommandServer&  Timing(bool t)                 { timing = t; return *this; }
+	CommandServer&  Filter(const char *ip);
+
+	void            Execute(Socket& socket);
+	bool            StartServer(int port, const String& cmdline);
+	void            StopServer(int port);
+	void            RunServer(int port);
+	void            RunClient();
+	void            Quit()                         { quit_flag = true; }
+
+protected:
+	String          GetConInput(const char *prompt);
+	virtual void    ExecTimer();
+//	void            RunCommand(String cmd, Socket& socket);
+	String          CheckFiles(const char *f);
+	String          FileRemove(const char *f);
+	String          DeleteFolderDeep(const char *f);
+	String          UploadFiles(const char *f);
+	String          DownloadFiles(const char *f);
+	String          CreateDir(const char *f);
+	String          GetFileInfo(const char *f);
+
+protected:
+	class Connection
+	{
+	public:
+		Connection(Socket socket) : socket(socket), eof(false) {}
+		virtual ~Connection();
+
+		bool              IsEof() const   { return eof; }
+		String            GetName() const { return name; }
+		virtual bool      Run() = 0;
+
+	protected:
+		String            name;
+		Socket            socket;
+		bool              eof;
+	};
+
+	class CommandConnection : public Connection
+	{
+	public:
+		CommandConnection(Socket socket, const char *command);
+
+		virtual bool      Run();
+
+	private:
+		One<SlaveProcess> slave;
+	};
+
+	Array<Connection> connections;
+	int               timer_chunk;
+	bool              logging;
+	bool              timing;
+	bool              quit_flag;
+	Index<dword>      ip_filter;
+//	int             thread_count;
+};
+
+//////////////////////////////////////////////////////////////////////
+// CommandServer::Connection::
+
+CommandServer::Connection::~Connection()
+{
+	if(socket.IsOpen())
+		socket.StopWrite();
+}
+
+//////////////////////////////////////////////////////////////////////
+// CommandServer::CommandConnection::
+
+CommandServer::CommandConnection::CommandConnection(Socket _socket, const char *_command)
+: Connection(_socket)
+{
+	String environment;
+	String pathlist;
+	if(*_command == ':') {
+		const char *b = ++_command;
+		while(*_command && *_command++ != '\n')
+			;
+		environment = ASCII85Decode(String(b, _command));
+		for(b = environment; *b; b += strlen(b) + 1)
+			if(!MemICmp(b, "PATH=", 5)) {
+				pathlist = b + 5;
+				break;
+			}
+	}
+	if(*_command == '=')
+		_command++;
+	String command = _command;
+	if(!IsNull(pathlist)) {
+		String exec;
+		if(*_command == '\"') {
+			while(*++_command && (*_command != '\"' || *++_command == '\"'))
+				exec.Cat(*_command);
+		}
+		else
+			while(*_command && (byte)*_command > ' ')
+				exec.Cat(*_command++);
+		command = GetFileOnPath(exec, pathlist, true);
+#ifdef PLATFORM_WIN32
+		if(IsNull(command))
+			command = GetFileOnPath(exec + ".exe", pathlist, true);
+#endif
+		if(IsNull(command))
+			command = exec;
+		if(command.Find(' ') >= 0)
+			command = '\"' + command + '\"';
+		command << ' ' << _command;
+	}
+	LOG("CommandServer::CommandConnection(" << command << ")");
+	slave = StartProcess(command, environment);
+	LOG("CommandServer::CommandConnection -> OK");
+	socket.Write("+\0", 2);
+	name << "[command]" << command;
+}
+
+bool CommandServer::CommandConnection::Run()
+{
+//	SVRLOG("CommandConnection::Run");
+	if(eof)
+		return true;
+	ASSERT(socket.IsOpen());
+	bool work = false;
+	String inp = socket.ReadUntil('\0', 0, 10000000);
+	if(inp.IsVoid())
+	{ // broken pipe
+		slave -> Kill();
+		eof = true;
+		return true;
+	}
+	if(!inp.IsEmpty())
+	{
+		SVRLOG("-> input data: <" << inp << ">");
+		work = true;
+		slave -> Write(inp);
+	}
+	String out = Null;
+	eof = !slave -> Read(out);
+	if(!out.IsEmpty())
+	{
+		work = true;
+		SVRLOG("-> output data: <" << out << ">");
+		socket.Write(out);
+	}
+	if(eof)
+	{
+		work = true;
+		socket.Write("\0", 1);
+		SVRLOG("Process terminated, exit code = " << slave -> GetExitCode());
+		String ec = IntStr(slave -> GetExitCode());
+		socket.Write(ec, ec.GetLength() + 1);
+		socket.StopWrite();
+	}
+//	SVRLOG("/ CommandConnection::Run -> " << (work ? "working" : "idle"));
+	return work;
+}
+
+//////////////////////////////////////////////////////////////////////
+// CommandServer::
+
+CommandServer::CommandServer()
+{
+	timer_chunk = 100;
+	quit_flag = true;
+	Logging(false);
+	Timing(false);
+}
+
+CommandServer::~CommandServer()
+{
+}
+
+CommandServer& CommandServer::Filter(const char *ip)
+{
+	Socket::Init();
+	hostent *he = gethostbyname(ip);
+	if(he)
+		ip_filter.FindAdd(Peek32be((in_addr *)(he -> h_addr_list[0])));
+	else
+		fputs(NFormat("gethostbyname: adresa '%s' nebyla nalezena ...\n", ip), stderr);
+	return *this;
+}
+
+String CommandServer::CheckFiles(const char *f)
+{
+	int line = 0;
+	String out = "OK\n";
+	while(*f)
+	{
+		line++;
+		const char *b = f;
+		while(*f && *f != '\n' && *f != '\t')
+			f++;
+		String fn = NativePath(String(b, f));
+		int t;
+		if(*f != '\t' || IsNull(t = ScanInt(f + 1, &f)))
+			return NFormat("ERROR(%s): file time expected at line %d", fn, line);
+
+		Time time = Time(2000, 1, 1) + t;
+		int l;
+		if(*f != '\t' || IsNull(l = ScanInt(f + 1, &f)))
+			return NFormat("ERROR(%s): file size expected at line %d", fn, line);
+
+			FindFile ff(fn);
+			if(ff && tabs(Time(ff.GetLastWriteTime()) - time) <= 2 && ff.GetLength() == l)
+				out << fn << '\n';
+
+		while(*f && *f++ != '\n')
+			;
+	}
+	return out;
+}
+
+String CommandServer::FileRemove(const char *f)
+{
+	String out;
+	while(*f)
+	{
+		const char *b = f;
+		while(*f && *f != '\n')
+			f++;
+		String fn(b, f);
+		if(!IsNull(fn) && !FileDelete(NativePath(fn)))
+			out << NFormat("%s: error deleting file\n", fn);
+		while(*f && *f++ != '\n')
+			;
+	}
+	if(IsNull(out))
+		out = "OK";
+	return out;
+}
+
+String CommandServer::DeleteFolderDeep(const char *f)
+{
+	while(*f)
+	{
+		const char *b = f;
+		while(*f && *f != '\n')
+			f++;
+		String fn(b, f);
+		if(!IsNull(fn))
+			Upp::DeleteFolderDeep(NativePath(fn));
+		while(*f && *f++ != '\n')
+			;
+	}
+	return "OK";
+}
+
+String CommandServer::GetFileInfo(const char *f)
+{
+	int td = ScanInt(f, &f) - (int)(GetSysTime() - Time(2000, 1, 1));
+	if(*f++ != ':')
+		return "ERROR(@): ':' expected after time delta";
+	int line = 0;
+	String output;
+	while(*f)
+	{
+		line++;
+		const char *b = f;
+		while(*f && *f != '\n')
+			f++;
+		String fn(b, f);
+		FindFile ff;
+		output << fn;
+		if(ff.Search(NativePath(fn)))
+			output << '\t' << ((int)(Time(ff.GetLastWriteTime()) - Time(2000, 1, 1)) + td)
+				<< '\t' << (ff.IsFile() ? (int)ff.GetLength() : -1);
+		output << "\n";
+		while(*f && *f++ != '\n')
+			;
+	}
+	return output;
+}
+
+String CommandServer::UploadFiles(const char *f)
+{
+	SVRLOG("CommandServer::UploadFiles");
+	int line = 0;
+	while(*f)
+	{
+		++line;
+		const char *b = f;
+		while(*f && *f != '\t' && *f != '\n')
+			f++;
+		String fn = NativePath(String(b, f));
+		if(IsNull(fn))
+			return NFormat("ERROR: file name expected at line %d", line);
+		SVRLOG("Updating file '" << fn << "'...");
+		int t;
+		if(*f != '\t' || IsNull(t = ScanInt(f + 1, &f)))
+			return NFormat("ERROR(%s): file time expected at line %d", fn, line);
+
+		Time time = Time(2000, 1, 1) + t;
+		int l;
+		if(*f != '\t' || IsNull(l = ScanInt(f + 1, &f)))
+			return NFormat("ERROR(%s): file size expected at line %d", fn, line);
+
+		if(*f != '\t')
+			return NFormat("ERROR(%s): file content expected at line %d", fn, line);
+		b = ++f;
+		while(*f && *f != '\n')
+			f++;
+		if(*f != '\n')
+			return NFormat("ERROR(%s): unexpected end of file at line %d", fn, line);
+		SVRLOG("ASCII85 length = " << (int)(f - b));
+		String bz = ASCII85Decode((const byte *)b, f - b);
+		SVRLOG("BZ compressed length = " << bz.GetLength());
+		String content = BZ2Decompress(bz);
+		SVRLOG("Content length = " << content.GetLength());
+		if(content.GetLength() != l)
+			return NFormat("ERROR(%s): file size (%d) doesn't match decompressed size %d", fn, l, content.GetLength());
+		RealizePath(fn);
+		if(!SaveFile(fn, content) || !FileSetTime(fn, time))
+			return NFormat("ERROR(%s): cannot write file", fn);
+		SVRLOG(NFormat("FileSetTime(%s, %`) -> %`", fn, time, FileGetTime(fn)));
+		while(*f && *f++ != '\n')
+			;
+	}
+	SVRLOG("// CommandServer::UploadFiles");
+	return "OK";
+}
+
+String CommandServer::DownloadFiles(const char *f)
+{
+	int line = 0;
+	String output;
+	while(*f)
+	{
+		line++;
+		const char *b = f;
+		while(*f && *f != '\n')
+			f++;
+		String fn(b, f);
+		FindFile ff;
+		output << fn;
+		String nfn = NativePath(fn);
+		if(ff.Search(nfn))
+		{
+			String data = LoadFile(nfn);
+			output << '\t' << data.GetLength() << '\t' << ASCII85Encode(BZ2Compress(data));
+		}
+		output << "\n";
+		while(*f && *f++ != '\n')
+			;
+	}
+	return output;
+}
+
+String CommandServer::CreateDir(const char *f)
+{
+	RealizeDirectory(f);
+	return "OK";
+}
+
+/*
+void CommandServer::RunCommand(const String& _command, Socket& socket)
+{
+	String command = _command;
+#ifdef PLATFORM_WIN32
+	if(*command == '/')
+		command = "x:" + command;
+#endif
+	LOG("CommandServer::RunCommand(" << command << ")");
+	One<SlaveProcess> process = StartProcess(command);
+	LOG("CommandServer::RunCommand -> OK");
+	socket.Send("+\0", 2);
+	bool work = false, running;
+	do
+	{
+		if(socket.Peek())
+		{
+			SVRLOG("-> socket peek");
+			String inp = socket.Recv(0 | Socket::MULTIPART);
+			SVRLOG("-> input data: <" << inp << ">");
+			if(!inp.IsEmpty())
+			{
+				work = true;
+				process -> Write(inp);
+			}
+		}
+		String out = Null;
+		running = process -> Read(out);
+//		SVRLOG("-> output data: <" << out << ">");
+		if(!out.IsEmpty())
+		{
+			work = true;
+			socket.Send(out);
+		}
+		else
+			MtSleep(200);
+//		SVRLOG("work = " << work << ", running = " << running);
+//		if(!work && running)
+	}
+	while(running);
+	socket.Send("\0", 1);
+	LOG("Process terminated, exit code = " << process -> GetExitCode());
+	String ec = IntStr(process -> GetExitCode());
+	socket.Send(ec, ec.GetLength() + 1);
+}
+*/
+
+void CommandServer::Execute(Socket& socket)
+{
+	String cmd = socket.ReadUntil('\0', Null, 10000000);
+	if(logging)
+		puts(cmd);
+	SVRLOG(cmd);
+	String out;
+	const char *data = cmd;
+	switch(*data++)
+	{
+	case '?':
+		out = "+" TSERV_VERSION "\x1A";
+		break;
+
+	case '.':
+		Quit();
+		out = ".QUITTING\x1A";
+		break;
+
+	case ':':
+	case '=':
+		connections.Add(new CommandConnection(socket, cmd));
+		return;
+
+	case '-':
+		out = FileRemove(data);
+		break;
+
+	case '~':
+		out = DeleteFolderDeep(data);
+		break;
+
+	case '<':
+		out = CheckFiles(data);
+		break;
+
+	case '>':
+		out = UploadFiles(data);
+		break;
+
+	case '^':
+		out = DownloadFiles(data);
+		break;
+
+	case '*':
+		out = CreateDir(data);
+		break;
+
+	case '@':
+		out = GetFileInfo(data);
+		break;
+
+	default:
+		throw Exc(NFormat("Invalid command: '%s'", cmd));
+	}
+	socket.Write(out);
+	socket.Write("\0", 1);
+	socket.Close();
+}
+
+void CommandServer::ExecTimer()
+{
+}
+
+bool CommandServer::StartServer(int port, const String& cmdline)
+{
+#ifdef PLATFORM_WIN32
+	STARTUPINFO sinfo;
+	GetStartupInfo(&sinfo);
+	PROCESS_INFORMATION pinfo;
+	Buffer<char> cmd(cmdline.GetLength() + 1);
+	memcpy(cmd, cmdline, cmdline.GetLength() + 1);
+	if(!CreateProcess(NULL, cmd, NULL, NULL, false,
+		CREATE_NO_WINDOW, NULL, NULL, &sinfo, &pinfo))
+		throw Exc(NFormat("Cannot create process '%s':\n%s", cmdline, GetErrorMessage(GetLastError())));
+	// detach from process
+	CloseHandle(pinfo.hThread);
+	CloseHandle(pinfo.hProcess);
+#else
+	pid_t pid = fork();
+	if(pid == -1)
+		throw Exc(NFormat("Error executing fork(), error code: %d", errno));
+//	printf("fork -> %d\n", pid);
+	if(!pid)
+	{ // new process, return true to fall through to server loop
+		Logging(false);
+		Timing(false);
+		return true;
+	}
+#endif
+	Socket::Init();
+	String sockerr;
+	String self = Socket::GetHostName();
+	Socket socket;
+	if(!ClientSocket(socket, self, port))
+		throw Exc(NFormat("Error opening server %s:%d: %s", self, port, Socket::GetErrorText()));
+	socket.Write("?\n");
+	String res = socket.ReadUntil('\x1A');
+	if(*res == '\x08')
+		throw Exc(res.Mid(1));
+	if(res != TSERV_VERSION)
+		throw Exc("Cannot run server process.");
+	return false;
+}
+
+void CommandServer::StopServer(int port)
+{
+	Socket::Init();
+	Socket socket;
+	if(!ClientSocket(socket, Socket::GetHostName(), port))
+		throw Exc(NFormat("Error opening server at port %d", port));
+	socket.Write(".\n");
+	socket.ReadUntil('\x1A');
+}
+
+void CommandServer::RunServer(int port)
+{
+//	thread_count = 0;
+
+	puts(NFormat("Running server at port %d", port));
+	if(logging)
+		puts(NFormat("Creating server socket at port %d ...", port));
+
+	String error;
+	Socket server;
+	if(!ServerSocket(server, port, true, 100)) {
+		puts(NFormat("Error creating server socket at port %d: %s", port, Socket::GetErrorText()));
+		return;
+	}
+	server.NoLinger();
+
+	if(logging) {
+		if(ip_filter.IsEmpty())
+			puts("IP Filtering: off (accepting requests from all IP addresses)");
+		else
+		{
+			fputs("IP filter:", stdout);
+			for(int i = 0; i < ip_filter.GetCount(); i++)
+				fputs(' ' + FormatIP(ip_filter[i]), stdout);
+			putc('\n', stdout);
+		}
+		puts("Running accept loop ...");
+	}
+
+	dword ipaddr;
+	dword ticks = GetTickCount() + 1000;
+	for(quit_flag = false; !quit_flag && !quit_signal;)
+	{
+		bool work = false;
+		Socket connection;
+		if(server.Accept(connection, &ipaddr, true, timer_chunk))
+		{
+			work = true;
+			if(logging)
+			{
+				fputc('\r', stderr);
+				fputs(Format(GetSysTime()), stderr);
+				fflush(stderr);
+			}
+			ExecTimer();
+			if(!connection.IsOpen())
+				continue;
+
+			try
+			{
+				if(!ip_filter.IsEmpty() && ip_filter.Find(ipaddr) < 0)
+					throw Exc(NFormat("Invalid request source IP address: %s", FormatIP(ipaddr)));
+				Execute(connection);
+			}
+			catch(Exc e)
+			{
+				if(connection.IsOpen())
+					connection.Write('-' + e + '\0');
+				if(logging)
+					puts(NFormat("ERROR: %s", e));
+			}
+		}
+		if(!connections.IsEmpty())
+		{
+			for(int i = connections.GetCount(); --i >= 0;)
+			{
+				Connection& conn = connections[i];
+				bool err = false;
+				try
+				{
+					if(conn.Run())
+						work = true;
+				}
+				catch(Exc e)
+				{
+					puts(NFormat("%s: %s", conn.GetName(), e));
+					err = true;
+				}
+				if(err || conn.IsEof())
+				{
+					connections.Remove(i);
+					continue;
+				}
+			}
+		}
+		if(!work)
+			Sleep(timer_chunk);
+		dword new_ticks = GetTickCount();
+		if(new_ticks >= ticks)
+		{
+			ticks = new_ticks + 1000;
+			fputs(String().Cat() << "\r" << Format(GetSysTime()), stderr);
+			fflush(stderr);
+		}
+	}
+	if(logging)
+		fputs("\nServer is shutting down ...                \n", stderr);
+}
+
+/*
+static void PutConsole(const char *p)
+{
+	enum { ROW_BATCH = 20 };
+	int rows = ROW_BATCH;
+	int col = 0;
+	const char *b = p;
+
+	while(*p)
+	{
+		char c = *p;
+		putchar(c);
+		if(*p++ == '\n' || ++col >= 70)
+		{
+			col = 0;
+			if(*p && --rows <= 0)
+			{
+				rows = ROW_BATCH;
+				fputs("\n==== Pokracovat pomoci Enter ====\n", stdout);
+				fflush(stdout);
+				bool quit = false;
+				for(int c; (c = getchar()) >= 0 && c != '\n'; quit |= (c == 'Q' || c == 'q'))
+					;
+				if(quit)
+					break;
+			}
+		}
+	}
+	if(p > b && p[-1] != '\n')
+		putchar('\n');
+}
+*/
+
+String CommandServer::GetConInput(const char *prompt)
+{
+	fputc('\n', stdout);
+	fputs(prompt, stdout);
+	int i = getchar();
+	if(i == EOF)
+		return String::GetVoid();
+	String s;
+	while(i != '\n')
+	{
+		s.Cat(i);
+		if((i = getchar()) == EOF)
+			break;
+	}
+	return s;
+}
+
+void CommandServer::RunClient()
+{
+	Socket::Init();
+	quit_flag = false;
+	for(String in; !quit_flag && !(in = GetConInput("run> ")).IsVoid();)
+	{
+		if(!CompareNoCase(in, "."))
+			break;
+
+		try
+		{
+			One<SlaveProcess> sp = StartProcess(in);
+			for(String s; sp -> Read(s); fputs(s, stdout))
+			{
+//				puts("Flushing application...");
+				Sleep(500);
+			}
+			printf("\nTerminated, exit code = %d\n", sp -> GetExitCode());
+		}
+		catch(Exc e)
+		{
+			puts("Error: " + e);
+		}
+	}
+}
+
+void TryMain()
+{
+	bool start = false;
+	bool stop = false;
+	int port = -1;
+
+	CommandServer server;
+	Vector<String> cmdline;
+	cmdline <<= CommandLine();
+
+	for(int c = 0; c < cmdline.GetCount(); c++)
+	{
+		const char *arg = cmdline[c];
+		if(*arg == '-')
+			switch(arg++, *arg++)
+			{
+			case 'r': start = true; break;
+			case 's': stop = true; break;
+			default:  throw Exc(NFormat("invalid option: '%s'", cmdline[c]));
+			}
+		else if(IsDigit(*arg))
+		{ // port number
+			port = atoi(arg);
+		}
+	}
+
+	bool noport = (port < 0);
+	if(noport)
+		port = DEFAULT_PORT;
+
+	if(stop)
+	{
+		server.StopServer(port);
+		return;
+	}
+
+	if(noport)
+	{ // run client against host
+		server.RunClient();
+		return;
+	}
+
+	if(start)
+	{
+		String cmd_line;
+		cmd_line << port;
+		if(!server.StartServer(port, cmd_line))
+			return;
+	}
+
+	server.RunServer(port);
+}
+
+CONSOLE_APP_MAIN
+{
+#ifdef PLATFORM_POSIX
+	signal(SIGPIPE, SIG_IGN);
+	signal(SIGINT, &QuitSignal);
+	signal(SIGTERM, &QuitSignal);
+#endif//PLATFORM_POSIX
+	puts(String().Cat() << "TSERV " TSERV_VERSION ", release date: " << TSERV_DATE << "\n"
+	TSERV_COPYRIGHT);
+
+/*
+	Vector<String> test;
+	for(int i = 0; i < 1000; i++)
+		test.Add(GetRandomIdent(10000));
+	test.Clear();
+
+	puts("Done !");
+	SetExitCode(111);
+	return;
+*/
+	int retcode = 1;
+	try
+	{
+//		SetLanguage(LNG_ENGLISH);
+		TryMain();
+	}
+	catch(Exc e)
+	{
+		puts("Error: " + e);
+		SetExitCode(1);
+	}
+}
diff --git a/uppsrc/Web/TServ/version.h b/uppsrc/Web/TServ/version.h
new file mode 100644
index 000000000..908df0167
--- /dev/null
+++ b/uppsrc/Web/TServ/version.h
@@ -0,0 +1,3 @@
+#define TSERV_VERSION   "2.17c"
+#define TSERV_DATE      Date(2007, 6, 5)
+#define TSERV_COPYRIGHT "Copyright (c) 2001-2007 Tomas Rylek"
diff --git a/uppsrc/Web/Web.h b/uppsrc/Web/Web.h
new file mode 100644
index 000000000..25844827c
--- /dev/null
+++ b/uppsrc/Web/Web.h
@@ -0,0 +1,47 @@
+#ifndef WEB_H
+#define WEB_H
+
+#include <Core/Core.h>
+//#include <RichText/RichText.h>
+
+#if defined(PLATFORM_WIN32)
+#define W_P(w, p) w
+#if !defined(PLATFORM_CYGWIN)
+#include <winsock2.h>
+#endif
+typedef int socklen_t;
+#elif defined(PLATFORM_POSIX)
+#define W_P(w, p) p
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netdb.h>
+#include <netinet/in.h>
+//#include <libiberty.h>
+enum
+{
+	INVALID_SOCKET = -1,
+	TCP_NODELAY    = 1,
+	SD_RECEIVE     = 0,
+	SD_SEND        = 1,
+	SD_BOTH        = 2,
+};
+typedef int SOCKET;
+#else
+#error Unsupported platform
+#endif//PLATFORM switch
+
+NAMESPACE_UPP
+
+#include "util.h"
+#include "html.h"
+//#include "RichHtml.h"
+#include "socket.h"
+#include "httpsrv.h"
+#include "httpcli.h"
+#include "auth.h"
+#include "smtp.h"
+#include "sproc.h"
+
+END_UPP_NAMESPACE
+
+#endif
diff --git a/uppsrc/Web/Web.t b/uppsrc/Web/Web.t
new file mode 100644
index 000000000..079b29bba
--- /dev/null
+++ b/uppsrc/Web/Web.t
@@ -0,0 +1,481 @@
+#ifdef _MSC_VER
+#pragma setlocale("C")
+#endif
+// httpsrv.cpp
+
+T_("If you're not redirected automatically please use %s.")
+csCZ("Pokud nebudete automaticky přesměrováni, použijte prosím %s.")
+deDE("Wenn Sie nicht automatisch weitergeleitet werden, benutzen Sie bitte %s")
+esES("Si no es redirigido automáticamente, utilice %s.")
+fiFI("Jos toiminto ei etene automaattisesti, käytä %s.")
+frFR("Si vous n'êtes pas automatiquement redirigé, veuillez utiliser %s.")
+huHU("Ha nem történik automatikus átirányítás használja %s")
+itIT("")
+plPL("Jeśli nie zostałeś automatycznie przekierowany użyj proszę %s.")
+roRO("Dacă nu sunteţi redirectaţi automat folosiţi %s.")
+ruRU("Если Вы не перенаправлены автоматически, "
+     "пожайлуста, используйте %s.")
+srSP("")
+trTR("Eğer otomatik olarak yönlendirlmediyseniz lütfen %s bağlantısını "
+     "kullanın.")
+zhCN("如果没有自动重定向,请使用%s.")
+
+T_("this link")
+csCZ("tento odkaz")
+deDE(" diesen Link.")
+esES("este enlace")
+fiFI("tämä linkki")
+frFR("ce lien")
+huHU("ezt a hivatkozást")
+itIT("")
+plPL("tego odnośnika")
+roRO("acest link")
+ruRU("эту ссылку")
+srSP("")
+trTR("bu bağlantı")
+zhCN("本链接")
+
+T_("Redirection to another web address")
+csCZ("Přesměrování na jinou adresu")
+deDE("Weiterleitung zu einer anderen Netzadresse")
+esES("Redirección a otra dirección web")
+fiFI("Reititys toiseen web -osoitteeseen")
+frFR("Redirection vers une autre adresse web")
+huHU("Átirányítás másik webcímre")
+itIT("")
+plPL("Przekierowanie do innej strony")
+roRO("Redirectare spre o altă adresă web")
+ruRU("Перенаправление на другой веб адрес")
+srSP("")
+trTR("başka bir ağ adresine yönlendiriliyor")
+zhCN("重定向到其他web地址")
+
+T_("... (total length: %d bytes)")
+csCZ("... (celková délka: %d bytů)")
+deDE("... (Gesamtgröße: %d Bytes)")
+esES("... (tamaño total: %d bytes)")
+fiFI("... (kokonaispituus: %d tavua)")
+frFR("(longueur totale : %d octets")
+huHU("... (teljes hossz: %d bájt)")
+itIT("")
+plPL("... (całkowita długość: %d bajtów)")
+roRO("... (lungime totală: %d bytes)")
+ruRU("... (полный размер: %d байт)")
+srSP("")
+trTR("... (toplam boyut: %d byte)")
+zhCN("... (总长: %d 字节)")
+
+T_("The web server is unable to satisfy your request:\n<p>\n")
+csCZ("Internetový server nebyl schopen vyřídit požadavek:\n<p>\n")
+deDE("Der Netzserver kann Ihre Anforderung nicht erfüllen:\n<p>\n")
+esES("El servidor web no puede satisfacer su solicitud:\n<p>\n")
+fiFI("Web palvelin ei kykene täyttämään pyyntöäsi:\n<p>\n")
+frFR("Ce serveur web ne peut pas satisfaire votre requête :\n<p>\n")
+huHU("A webkiszolgáló nem tudja teljesíteni a kérést:\n<p>\n")
+itIT("")
+plPL("Ten serwer sieciowy nie jest w stanie odpowiedzieć na twoje żądanie:\n"
+     "<p>\n")
+roRO("Serverul nu este în masură să va satisfacă cererea:\n<p>\n")
+ruRU("Этот веб сервер не может удовлетворить "
+     "Ваш запрос:\n<p>\n")
+srSP("")
+trTR("Ağ sunucusu isteğinizi yerine getiremiyor:\n<p>\n")
+zhCN("web服务器不支持您的请求:\n<p>\n")
+
+T_("Reason:")
+csCZ("Důvod chyby: ")
+deDE("Grund:")
+esES("Razón:")
+fiFI("Syy:")
+frFR("Raison :")
+huHU("Ok:")
+itIT("")
+plPL("Powód:")
+roRO("Motiv:")
+ruRU("Причина:")
+srSP("")
+trTR("Sebep:")
+zhCN("原因:")
+
+T_("Detailed query data:")
+csCZ("Detailní informace o dotazu:")
+deDE("Genaue Abfragedaten:")
+esES("Datos detallados de consulta:")
+fiFI("Yksityiskohtainen kysely tieto:")
+frFR("Données détaillées de la requête :")
+huHU("Részletes lekérési adatok:")
+itIT("")
+plPL("Szczegółowe dane zapytania:")
+roRO("Date detaliate despre cerere:")
+ruRU("Детали запроса:")
+srSP("")
+trTR("Detaylı sorgulama verileri:")
+zhCN("详细查询数据")
+
+T_("Web server error")
+csCZ("Chyba internetového serveru")
+deDE("Netzserverfehler")
+esES("Error de servidor Web")
+fiFI("Web -palvelin virhe")
+frFR("Erreur du serveur web")
+huHU("Webkiszolgáló hiba")
+itIT("")
+plPL("Błąd serwera sieciowego")
+roRO("Eroare de server web")
+ruRU("Ошибка веб сервера")
+srSP("")
+trTR("Sunucu hatası")
+zhCN("Web服务器错误")
+
+
+// httpcli.cpp
+
+T_("%s:%d receiving headers timed out")
+csCZ("%s:%d vypršel časový limit při načítání hlaviček")
+deDE("%s:%d Timeout beim Headerempfang")
+esES("%s:%d recibiendo encabezados, tiempo de espera agotado")
+fiFI("%s:%d headerien vastaanotto aikakatkaistu")
+frFR("%s:%d temps dépassé à la réception de l'en-tête")
+huHU("%s:%d időtúllépés fejlécek fogadása közben")
+itIT("")
+plPL("%s:%d przekroczono czas odbierania nagłówka")
+roRO("%s:%d obținerea antetelor a depășit limita de timp")
+ruRU("%s:%d превишен интервал ожидания при получении "
+     "заголовков")
+srSP("")
+trTR("%s:%d: Üstbilgi alışverişi zaman aşımına uğradı.")
+zhCN("%s:%d 接收头超时")
+
+T_("%s:%d: connecting to host timed out")
+csCZ("%s:%d: vypršel časový limit pro připojení k hostiteli")
+deDE("%s:%d Timeout bei der Verbindungsaufnahme mit dem Server")
+esES("%s:%d: tiempo de espera agotado conectando al host")
+fiFI("%s:%d: kytkeytyminen isäntään aikakatkaistu")
+frFR("%s:%d : l'hôte n'a pas accepté la connexion dans le temps imparti")
+huHU("%s:%d: időtúllépés a szerverhez kapcsolódás közben")
+itIT("")
+plPL("%s:%d przekroczono czas łączenia się z hostem")
+roRO("%s:%d: depășire de limită de timp la conectare")
+ruRU("%s:%d превишен интервал ожидания при подключении "
+     "к серверу")
+srSP("")
+trTR("%s:%d: Sunucu bağlantısı zaman aşımına uğradı")
+zhCN("%s:%d: 连接到主机超时")
+
+T_("%s:%d: timed out sending request to server")
+csCZ("%s:%d: vypršel časový limit při odesílání požadavku")
+deDE("%s:%d Timeout beim Übermitteln der Abfrage an den Server")
+esES("%s:%d: tiempo de espera agotado enviado respuesta a servidor")
+fiFI("%s:%d: palvelupyynnön lähettäminen palvelimelle aikakatkaistu")
+frFR("%s:%d : le serveur n'a pas répondu dans le temps imparti")
+huHU("%s:%d: időtúllépés a kérés elküldésénél")
+itIT("")
+plPL("%s:%d: przekroczono czas wysyłania żądania do serwera")
+roRO("%s:%d: depășire de limită de timp la trimitere cerere spre server")
+ruRU("%s:%d: таймаут отправки запроса на сервер")
+srSP("")
+trTR("%s:%d: İstek zaman aşımına uğradı")
+zhCN("%s:%d: 发送请求到服务器超时")
+
+T_("%s:%d: invalid server response: %s")
+csCZ("%s:%d: neplatná odezva ze serveru: %s")
+deDE("%s:%d: Ungültige Serverantwort: %s")
+esES("%s:%d: respuesta inválida del servidor: %s")
+fiFI("%s:%d: virheellinen palvelinvastine: %s")
+frFR("%s:%d : réponse du serveur invalide : %s")
+huHU("%s:%d: érvénytelen kiszolgálói válasz")
+itIT("")
+plPL("%s:%d: niepoprawna odpowiedź serwera: %s")
+roRO("%s:%d: răspuns invalid de la server: %s")
+ruRU("%s:%d: неправильный ответ сервера: %s")
+srSP("")
+trTR("%s:%d: Sunucudan gelen yanıt geçersiz")
+zhCN("%s:%d: 无效服务器反应: %s")
+
+T_("%s:%d: maximum data length exceeded (%d B)")
+csCZ("%s:%d: byla překročena maximální délka dat (%d B)")
+deDE("%s:%d: Maximale Datenlänge überschritten (%d B)")
+esES("%s:%d: longitud de datos máxima excedida (%d B)")
+fiFI("%s:%d: datan enimmäispituus ylitetty (%d B)")
+frFR("%s:%d : dépassement de la longueur maximale des données (%d O)")
+huHU("%s:%d: maximális adathossz túllépése (%d B)")
+itIT("")
+plPL("%s:%d: przekroczono dopuszczalny rozmiar danych (%d B)")
+roRO("%s:%d: dimeniunea maximă a datelor a fost depășită (%d B)")
+ruRU("%s:%d: превышен максимальный размер данных "
+     "(%d B)")
+srSP("")
+trTR("%s:%d: maksimum veri boyutu aşıldı (%d B)")
+zhCN("%s:%d: 超出了最大数据长度(%d B)")
+
+T_("%s:%d: maximum header length exceeded (%d B)")
+csCZ("%s:%d: byla překročena maximální délka hlaviček (%d B)")
+deDE("%s:%d: Maximale Headerlänge überschritten (%d B)")
+esES("%s:%d: longitud de encabezado máxima excedida (%d B)")
+fiFI("%s:%d: headerin enimmäispituus ylitetty (%d B)")
+frFR("%s:%d : dépassement de la longueur maximale de l'en-tête (%d O)")
+huHU("%s:%d: maximális fejléchossz túllépése (%d B)")
+itIT("")
+plPL("%s:%d: przekroczono dopuszczalną długość nagłówka (%d B)")
+roRO("%s:%d: dimeniunea maximă a antetului a fost depășită (%d B)")
+ruRU("%s:%d: превышен максимальный размер заголовка "
+     "(%d B)")
+srSP("")
+trTR("%s:%d:Maksimum üstbilgi boyutu aşıldı (%d B)")
+zhCN("%s:%d: 超出了最大头长度(%d B)")
+
+T_("%s:%d: timed out when receiving server response")
+csCZ("%s:%d: vypršel časový limit při načítání odpovědi")
+deDE("%s:%d: Timeout beim Empfang der Serverantwort")
+esES("%s:%d: tiempo de espera agotado esperando respuesta del servidor")
+fiFI("%s:%d: palvelinvastineen vastaanotto aikakatkaistu")
+frFR("%s%d : temps dépassé à la réception de la réponse du serveur")
+huHU("%s:%d: időtúllépés a kiszolgáló válaszára várva")
+itIT("")
+plPL("%s:%d: przekroczono czas oczekiwania na odpowiedź serwera")
+roRO("%s:%d: limită de timp depășită la primirea răspunsului de la server")
+ruRU("%s:%d: таймаут при приёме ответа от сервера")
+srSP("")
+trTR("%s:%d: Sunucudan  yanıt beklenirken zaman aşımı meydana geldi")
+zhCN("%s:%d: 接收服务器反应时超时")
+
+T_("Maximum content size exceeded: %d")
+csCZ("Překročena maximální povolená délka datového obsahu: %d")
+deDE("Maximaler Datenumfang überschritten: %d")
+esES("Tamaño de contenido máximo excedido: %d")
+fiFI("Sisällön enimmäiskoko ylitetty: %d")
+frFR("")
+huHU("A maximális tartalomhossz túllépve: %d")
+itIT("")
+plPL("Przekroczono dopuszczalny rozmiar zawartości: %d")
+roRO("Dimeniunea maximă a conținutului depășită: %d")
+ruRU("Превышен максимальный размер содержимого: "
+     "%d")
+srSP("")
+trTR("Maksimum içerik boyutu aşıldı: %d")
+zhCN("最大内容长度超出:%d")
+
+T_("Partial input: %d out of %d")
+csCZ("Přijata neúplná data: %d z %d")
+deDE("Unvollständiger Empfang: %d von %d")
+esES("Entrada parcial: %d de %d")
+fiFI("Osittainen syöte: %d / %d")
+frFR("Saisie partielle : %d de %d")
+huHU("Részleges beolvasás: %d a %d-ból")
+itIT("")
+plPL("Dane częściowe: %d z %d")
+roRO("Intrări parțiale: %d din %d")
+ruRU("Частичный ввод: %d из %d")
+srSP("")
+trTR("Kısmi girdi: %d/%d")
+zhCN("部分输入: %d out of %d")
+
+
+// smtp.cpp
+
+T_("Communication Failure: Timeout.")
+csCZ("Porucha komunikace: vypršel časový limit.")
+deDE("Kommunikationsfehler: Timeout")
+esES("Fallo de comunicación: Tiempo de espera agotado.")
+fiFI("Viestintävirhe: Aikakatkaisu.")
+frFR("")
+huHU("Kommunikációs hiba: Időtúllépés")
+itIT("")
+plPL("")
+roRO("Eroare în comunicare: Limită de timp depășită.")
+ruRU("Ошибка связи. Таймаут.")
+srSP("")
+trTR("Bağlantı başarısız: Zaman aşımı.")
+zhCN("")
+
+T_("Error writing data to socket: communication port closed.")
+csCZ("Chyba při zápisu dat do socketu: komunikační kanál byl uzavřen.")
+deDE("Socketfehler beim Schreiben der Daten: Port wurde geschlossen.")
+esES("Error escribiendo datos de socket: puerto de comunicación cerrado.")
+fiFI("Virhe socketiin kirjoitettaessa: kommunikointiportti suljettu.")
+frFR("")
+huHU("Hiba az adatok socket-re írásakor: kommunikációs port zárva.")
+itIT("")
+plPL("")
+roRO("Eroare la scriere în soclu: portul de comunicare este închis.")
+ruRU("Ошибка посылки данных в сокет: порт связи "
+     "закрыт")
+srSP("")
+trTR("Sokete yazma hatası: bağlantı kesildi.")
+zhCN("")
+
+T_("Error writing data to socket, error code: ")
+csCZ("Chyba při zápisu dat do socketu, kód chyby: ")
+deDE("Socketfehler beim Schreiben der Daten, Fehlercode: ")
+esES("Error escribiendo datos a socket, código de error: ")
+fiFI("Virhe socketiin kirjoitettaessa, virhe koodi: ")
+frFR("")
+huHU("Hiba az adatok socket-re írásakor, hibakód: ")
+itIT("")
+plPL("")
+roRO("Eroare la scriere în soclu, cod:")
+ruRU("Ошибка посылки данных в сокет: код оибки: ")
+srSP("")
+trTR("Sokete yazma hatası meydana geldi. Hata kodu: ")
+zhCN("")
+
+T_("Error reading data from socket: commuication port closed.")
+csCZ("Chyba při čtení dat ze socketu: komunikační kanál byl uzavřen.")
+deDE("Socketfehler beim Lesen der Daten: Port wurde geschlossen.")
+esES("Error leyendo datos de socket: puerto de comunicación cerrado.")
+fiFI("Virhe socketista luettaessa: kommunikointiportti suljettu.")
+frFR("")
+huHU("Hiba az adatok socket-ről olvasásakor:  kommunikációs port zárva.")
+itIT("")
+plPL("")
+roRO("Eroare la citire din soclu: portul de comunicare este închis.")
+ruRU("Ошибка чтения данных из сокета: порт связи "
+     "закрыт")
+srSP("")
+trTR("Soket okuma hatası: bağlantı kesildi.")
+zhCN("")
+
+T_("Host not set.")
+csCZ("Hostitel není zadán.")
+deDE("Host nicht eingerichtet")
+esES("Host no especificado.")
+fiFI("Isäntää ei ole asetettu.")
+frFR("")
+huHU("A távoli gép nincs megadva.")
+itIT("")
+plPL("")
+roRO("Host-ul nu este ales.")
+ruRU("Сервер не определен")
+srSP("")
+trTR("Host hazır değil.")
+zhCN("")
+
+T_("Recipient not set.")
+csCZ("Není zadán příjemce.")
+deDE("Empfänger nicht eingerichtet")
+esES("Recipiente no especificado.")
+fiFI("Vastaanottajaa ei ole asetettu.")
+frFR("")
+huHU("A fogadó gép nincs megadva.")
+itIT("")
+plPL("")
+roRO("Receptorul nu este ales")
+ruRU("Получатель не определен")
+srSP("")
+trTR("Alıcı hazır değil.")
+zhCN("")
+
+
+// sproc.cpp
+
+T_("pipe() error; error code = %d")
+csCZ("chyba pipe(); kód chyby = %d")
+deDE("pipe()-Fehler; Fehlercode = %d")
+esES("error en pipe(); codigo = %d")
+fiFI("pipe() virhe; virhe koodi = %d")
+frFR("erreur pipe(); code d'erreur = %d")
+huHU("pipe() hiba; hibakód = %d")
+itIT("")
+plPL("błąd pipe(); kod błędu = %d")
+roRO("eroare pipe(); cod = %d")
+ruRU("ошибка pipe(); код ошибки = %d")
+srSP("")
+trTR("pipe() hatası; hata kodu = %d")
+zhCN("pipe() error; error code = %d")
+
+T_("fork() error; error code = %d")
+csCZ("chyba fork(); kód chyby = %d")
+deDE("fork()-Fehler; Fehlercode = %d")
+esES("error en fork(); codigo = %d")
+fiFI("fork() virhe; virhe koodi = %d")
+frFR("erreur fork(); code d'erreur = %d")
+huHU("fork() hiba; hibakód = %d")
+itIT("")
+plPL("błąd fork(); kod błędu = %d")
+roRO("eroare fork(): cod = %d")
+ruRU("ошибка fork(); код ошибки = %d")
+srSP("")
+trTR("fork() hatası; hata kodu = %d")
+zhCN("fork() error; error code = %d")
+
+T_("Opening host '%s' / port %d failed, error = %s")
+csCZ("Připojování k hostiteli '%s' / port %d selhalo, chyba = %s")
+deDE("Zugriff auf den Host '%s' / port %d fehlgeschlagen, Fehler = %s")
+esES("Abriendo host '%s' / falló puerto %d, error = %s")
+fiFI("Kytkentä isäntään '%s' / portti %d epäonnistui, virhe = %s")
+frFR("Erreur d'ouverture de '%s' / port %d, erreur = %s")
+huHU("A '%s' gép / %d port megnyitása sikertelen, hiba = %s")
+itIT("")
+plPL("Łączenie z hostem '%s' / port %d nie powiodło się, błąd = %s")
+roRO("Se deschide host-ul '%s' / eșuare pe portul %d, eroare = %s")
+ruRU("Подсоединение к хосту '%s' / порту %d не удачно, "
+     "ошибка = %s")
+srSP("")
+trTR("'%s' hostuna '%d' portundan bağlanma girişi başarısız oldu. Hata "
+     "= %s")
+zhCN("Opening host '%s' / port %d failed, error = %s")
+
+T_("Error running process: %s\nCommand: %s")
+csCZ("Chyba při spouštění procesu: %s\nPříkaz: %s")
+deDE("Fehler beim Ausführen des Prozesses: %s\nBefehl: %s")
+esES("Error ejecutando proceso: %s\nComando: %s")
+fiFI("Virhe prosessin suorittamisessa: %s\nCommand: %s")
+frFR("Erreur d'exécution du programme : %s\nCommande : %s")
+huHU("Hiba a %s folyamat\n%s parancs futtatásánál")
+itIT("")
+plPL("Błąd uruchamiania procesu: %s\nKomenda: %s")
+roRO("Eroare execuție proces: %s\nComanda: %s")
+ruRU("Ошибка при запуске процесса: %s\nКоманда: "
+     "%s")
+srSP("")
+trTR("'%s' işleminin çalıştırılması sırasında hata oluştu\nKomut: "
+     "%s")
+zhCN("运行进城错误:%s\n命令: %s")
+
+T_("Communication error; process = %s")
+csCZ("Chyba spojení; proces = %s")
+deDE("Kommunikationsfehler; Prozess = %s")
+esES("Error de comunicación; proceso = %s")
+fiFI("Kommunikointi virhe; prosessi = %s")
+frFR("Erreur de communication ; processus = %s")
+huHU("Kommunikációs hiba; folyamat = %s")
+itIT("")
+plPL("Błąd komunikacji; proces = %s")
+roRO("Erare de comunicare, procesul = %s")
+ruRU("Ошибка коммуникации; процесс = %s")
+srSP("")
+trTR("İletişim hatası; işlem = %s")
+zhCN("通信错误; 进城 = %s")
+
+T_("Missing command line (host = %s).")
+csCZ("Chybí příkazová řádka (hostitel = %s).")
+deDE("Fehlende Befehlszeile (Host = %s)")
+esES("Línea de comandos ausente (host=%s).")
+fiFI("Puuttuva komentorivi (isäntä = %s).")
+frFR("Ligne de commande manquante (hôte = %s).")
+huHU("Hiányzó parancssor (gép = %s)")
+itIT("")
+plPL("Brak linii poleceń (host = %s).")
+roRO("Linie de comandă negasită (host = %s)")
+ruRU("Не указана командная строка (хост = %s)")
+srSP("")
+trTR("Eksik komut satırı (Host = %s).")
+zhCN("缺少命令行(主机 = %s).")
+
+
+// Obsolete
+
+T_("Cannot open socket %s:%d: %s")
+csCZ("Nelze otevřít socket %s:%d: %s")
+deDE("Socket %s:%d: %s kann nicht geöffnet werden.")
+esES("")
+fiFI("Socketia ei voi avata %s:%d: %s")
+frFR("")
+huHU("Sikertelen socket-megnyitás %s:%d: %s")
+itIT("")
+plPL("")
+roRO("Nu se poate deschide soclul %s:%d: %s")
+ruRU("Не могу открыть сокет %s:%d: %s")
+srSP("")
+trTR("Hata: Soket açılamadı. %s:%d: %s")
+zhCN("")
diff --git a/uppsrc/Web/Web.upp b/uppsrc/Web/Web.upp
new file mode 100644
index 000000000..34d4b478e
--- /dev/null
+++ b/uppsrc/Web/Web.upp
@@ -0,0 +1,37 @@
+description "TCP/IP related stuff";
+
+uses
+	Core;
+
+library(SOLARIS) "nsl socket";
+
+library(WIN32) ws2_32;
+
+file
+	Web.h,
+	Package readonly separator,
+	Web.t charset "UTF-8",
+	Web_init.icpp,
+	Code readonly separator,
+	util.h,
+	util.cpp,
+	md5.cpp,
+	html.h,
+	html.cpp,
+	socket.h,
+	socket.cpp,
+	httpsrv.h,
+	httpsrv.cpp,
+	httpcli.h,
+	httpcli.cpp,
+	auth.h,
+	auth.cpp,
+	smtp.h,
+	smtp.cpp,
+	sproc.h,
+	sproc.cpp,
+	Info readonly separator,
+	COPYING,
+	COPYING-PLAIN,
+	AUTHORS;
+
diff --git a/uppsrc/Web/Web_init.icpp b/uppsrc/Web/Web_init.icpp
new file mode 100644
index 000000000..5d9f295f1
--- /dev/null
+++ b/uppsrc/Web/Web_init.icpp
@@ -0,0 +1,8 @@
+#include "Web.h"
+
+NAMESPACE_UPP
+
+#define TFILE <Web/Web.t>
+#include <Core/t.h>
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/Web/auth.cpp b/uppsrc/Web/auth.cpp
new file mode 100644
index 000000000..899a3e38d
--- /dev/null
+++ b/uppsrc/Web/auth.cpp
@@ -0,0 +1,289 @@
+#include "Web.h"
+
+NAMESPACE_UPP
+
+enum { EXPIRE = 60 * 30 }; // 30 minutes inactivity expires token
+
+static Array<WebUser>          user_map;
+static CriticalSection         user_lock;
+static Index<String>           token_map;
+static Vector<Time>            token_expire;
+static Vector<String>          token_args;
+static CriticalSection         token_lock;
+
+//////////////////////////////////////////////////////////////////////
+// WebUser::
+
+void WebUser::Serialize(Stream& stream)
+{
+	int version = 1;
+	stream / version;
+	if(version != 1)
+	{
+		stream.SetError();
+		return;
+	}
+	stream % name;
+	String p;
+	if(stream.IsStoring())
+		p = Garble(pass);
+	stream % p;
+	if(stream.IsLoading())
+		pass = Garble(p);
+	stream % args;
+}
+
+//////////////////////////////////////////////////////////////////////
+
+String WebUser::CheckToken(String token)
+{
+	CriticalSection::Lock __(token_lock);
+	int i = token_map.Find(token);
+	if(i < 0)
+		return String::GetVoid();
+	Time time = GetSysTime();
+	if(time <= token_expire[i])
+	{
+		token_expire[i] = time + EXPIRE;
+		return token_args[i];
+	}
+
+	token_map.Remove(i);
+	token_expire.Remove(i);
+	token_args.Remove(i);
+	return String::GetVoid();
+}
+
+//////////////////////////////////////////////////////////////////////
+
+String WebUser::CreateToken(String args)
+{
+	String token;
+	for(;;)
+	{
+		char buffer[128];
+		int len = 30 + rand() % 10;
+		for(int i = 0; i < len; i++)
+			buffer[i] = 'A' + rand() % ('Z' - 'A' + 1);
+		token = String(buffer, len);
+		token_lock.Enter();
+		if(token_map.Find(token) < 0)
+			break;
+		token_lock.Leave();
+	}
+	token_map.Add(token);
+	token_expire.Add(GetSysTime() + EXPIRE);
+	token_args.Add(args);
+	token_lock.Leave();
+	return token;
+}
+
+//////////////////////////////////////////////////////////////////////
+
+void WebUser::DeleteToken(String token)
+{
+	CriticalSection::Lock guard(token_lock);
+	int i = token_map.Find(token);
+	if(i >= 0)
+	{
+		token_map.Remove(i);
+		token_expire.Remove(i);
+		token_args.Remove(i);
+	}
+}
+
+//////////////////////////////////////////////////////////////////////
+
+void WebUser::SetMap(const Array<WebUser>& map)
+{
+	CriticalSection::Lock guard(user_lock);
+	user_map <<= map;
+}
+
+//////////////////////////////////////////////////////////////////////
+
+Array<WebUser> WebUser::GetMap()
+{
+	CriticalSection::Lock guard(user_lock);
+	return Array<WebUser>(user_map, 0);
+}
+
+//////////////////////////////////////////////////////////////////////
+
+void WebUser::SerializeMap(String& s, bool write)
+{
+	StringStream stream;
+	if(!write)
+		stream.Open(Garble(Decode64(s)));
+
+	int version = StreamHeading(stream, 1, 1, 1, "WebUser");
+	if(version >= 1)
+	{
+		CriticalSection::Lock guard(user_lock);
+		stream % user_map;
+	}
+
+	if(write)
+	{
+		String st = stream.GetResult();
+		LOG("stream > " << st.GetLength());
+		st = Garble(st);
+		LOG("Garble > " << st.GetLength());
+		s = Encode64(st);
+		LOG("Encode = " << s);
+	}
+}
+
+//////////////////////////////////////////////////////////////////////
+
+void WebUser::ClearMap()
+{
+	CriticalSection::Lock guard(user_lock);
+	user_map.Clear();
+}
+
+//////////////////////////////////////////////////////////////////////
+
+void WebUser::SetUser() const
+{
+	CriticalSection::Lock guard(user_lock);
+	for(int i = 0; i < user_map.GetCount(); i++)
+		if(user_map[i].name == name)
+		{
+			user_map[i].pass = pass;
+			user_map[i].args = args;
+		}
+	WebUser& u = user_map.Add();
+	u.name = name;
+	u.pass = pass;
+	u.args = args;
+}
+
+//////////////////////////////////////////////////////////////////////
+
+String WebUser::GetArgs() const
+{
+	CriticalSection::Lock guard(user_lock);
+	LOG("name = " << name << ", pass = " << pass);
+	LOG("WebUser::GetArgs; user map # = " << user_map.GetCount());
+	for(int t = 0; t < user_map.GetCount(); t++)
+		LOG(user_map[t].name << "/" << user_map[t].pass << ": " << (user_map[t].name == name));
+	for(int i = 0; i < user_map.GetCount(); i++)
+		if(user_map[i].name == name) {
+			if(user_map[i].pass != pass) break;
+			LOG("index found = " << i);
+			return user_map[i].args;
+		}
+	return String::GetVoid();
+}
+
+//////////////////////////////////////////////////////////////////////
+
+static String GetConnectPage(HttpQuery& out_map, const HttpQuery& map, const String& error)
+{
+	out_map.Set("AUTH", "1");
+
+	Htmls body;
+	body << HtmlRow() % (HtmlCell() / "U�ivatelsk� jm�no:&nbsp;"
+		+ HtmlCell() / HtmlEdit("USER", 20, 30, map.GetString("USER")))
+		<< HtmlRow() % (HtmlCell() / "P��stupov� heslo:&nbsp;"
+		+ HtmlCell() / HtmlEdit("PASS", 20, 30, map.GetString("PASS"), true))
+		<< HtmlRow() % (HtmlCell() / "" + HtmlCell() / HtmlButton("LOGIN", "  P�ipojit  "));
+
+	Htmls out;
+	if(!IsNull(error))
+		out << HtmlWarn() / error << "\n<p>\n";
+	out << HtmlTable() % body;
+	return out;
+}
+
+//////////////////////////////////////////////////////////////////////
+
+static String GetSetPassPage(HttpQuery& out_map, const HttpQuery& map, const String &error)
+{
+	out_map.Set("USER", map.GetString("USER"));
+	out_map.Set("AUTH", map.GetString("AUTH"));
+	Htmls out;
+	out << HtmlTag("H2") / "P�ipojen� bylo �sp�n�"
+		<< "\n\n<p>P�ipojen� ke vzd�len�mu po��ta�i prob�hlo �sp�n�. "
+		"P��stupov� k�d ztrat� platnost po p�lhodinov� ne�innosti "
+		"klienta nebo na v�slovnou ��dost o odhl�en�.\n"
+		"\n"
+		"<p>";
+	if(!IsNull(error))
+		out << HtmlWarn() / error << "\n<p>\n";
+	out
+		<< HtmlTable() % (HtmlRow() % (HtmlCell() / "Zm�na hesla:&nbsp;"
+		+ HtmlCell() / HtmlEdit("NEW_PASS", 20, 30, map.GetString("NEW_PASS"), true))
+		+ HtmlRow() % (HtmlCell() / "Opakovat heslo:&nbsp;"
+		+ HtmlCell() / HtmlEdit("RETYPE_PASS", 20, 30, map.GetString("RETYPE_PASS"), true))
+		+ HtmlRow() % (HtmlCell() + HtmlCell() / (HtmlButton("SET_PASS", "Zm�nit heslo")
+		+ "&nbsp;&nbsp;&nbsp;" + HtmlButton("CANCEL", " Pokra�ovat "))))
+		<< "\n";
+	return out;
+}
+
+//////////////////////////////////////////////////////////////////////
+
+String WebUser::Login(const HttpQuery& map, String& args, const char *iname, bool *save_cfg)
+{
+	String isapi_name;
+	if(iname && *iname)
+		isapi_name = iname;
+	else
+		isapi_name = map.GetString("$$PATH");
+	HttpQuery out_map;
+	String out;
+	String auth = map.GetString("AUTH");
+	if(auth.GetLength() == 1)
+		auth = Null;
+	args = CheckToken(auth);
+	if(!args.IsVoid())
+	{
+		if(map.GetBool("SET_PASS"))
+		{ // set password
+			String p1 = map.GetString("NEW_PASS");
+			String p2 = map.GetString("RETYPE_PASS");
+			if(IsNull(p1))
+				out = GetSetPassPage(out_map, map, "Zadejte pros�m nov� p��stupov� heslo.");
+			else if(p1 != p2)
+				out = GetSetPassPage(out_map, map, "Zadejte pros�m do obou pol� stejn� heslo.");
+			else
+			{ // set it now
+				WebUser wu(map.GetString("USER"), p1, args);
+				wu.SetUser();
+				if(save_cfg)
+					*save_cfg = true;
+				return Null;
+			}
+		}
+		else
+			return Null;
+	}
+
+	if(IsNull(auth) && !map.IsEmpty("LOGIN"))
+	{
+		WebUser user;
+		user.name = map.GetString("USER");
+		user.pass = map.GetString("PASS");
+		LOG("WID_LOGIN; name = " << user.name << ", pass = " << user.pass);
+		String args;
+		if(!IsNull(user.name) && !IsNull(user.pass) && !(args = user.GetArgs()).IsVoid())
+		{
+			out = GetSetPassPage(out_map, map, Null);
+			out_map.Set("AUTH", WebUser::CreateToken(args));
+		}
+	}
+
+	if(IsNull(out))
+		out = GetConnectPage(out_map, map,
+		!IsNull(auth) ? "Platnost p��stupov�ho k�du vypr�ela. Zadejte pros�m znovu u�ivatelsk� jm�no a heslo."
+		: !map.IsEmpty("LOGIN") ? "Zadan� u�ivatelsk� jm�no nebo heslo je neplatn�!" : "");
+
+	String hid = out_map.GetHidden();
+	return HtmlForm(isapi_name) % (hid + out);
+}
+
+//////////////////////////////////////////////////////////////////////
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/Web/auth.h b/uppsrc/Web/auth.h
new file mode 100644
index 000000000..4805b5af5
--- /dev/null
+++ b/uppsrc/Web/auth.h
@@ -0,0 +1,30 @@
+class WebUser
+{
+public:
+	WebUser(String name = Null, String pass = Null, String args = Null)
+		: name(name), pass(pass), args(args) {}
+
+	void                   Serialize(Stream& stream);
+
+	// low-level
+	static String          CheckToken(String token);
+	static String          CreateToken(String args);
+	static void            DeleteToken(String token);
+
+	// high-level
+	static void            SetMap(const Array<WebUser>& map);
+	static Array<WebUser>  GetMap();
+	static void            SerializeMap(String& s, bool write);
+	static void            ClearMap();
+
+	void                   SetUser() const;
+	String                 GetArgs() const;
+
+	static String          Login(const HttpQuery& map, String& args,
+		const char *isapi_name = NULL, bool *save_cfg = 0);
+
+public:
+	String                 name;
+	String                 pass;
+	String                 args;
+};
diff --git a/uppsrc/Web/ctrl/AUTHORS b/uppsrc/Web/ctrl/AUTHORS
new file mode 100644
index 000000000..f782e5b62
--- /dev/null
+++ b/uppsrc/Web/ctrl/AUTHORS
@@ -0,0 +1,2 @@
+Mirek Fidler <cxl@ntllib.org>
+Tomas Rylek  <rylek@volny.cz>
\ No newline at end of file
diff --git a/uppsrc/Web/ctrl/COPYING b/uppsrc/Web/ctrl/COPYING
new file mode 100644
index 000000000..33aa39102
--- /dev/null
+++ b/uppsrc/Web/ctrl/COPYING
@@ -0,0 +1,30 @@
+Copyright (C) 2005 Mirek Fidler, Tomas Rylek and various contributors (see AUTHORS)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to
+deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies of the Software and its Copyright notices. In addition publicly
+documented acknowledgment must be given that this software has been used if no
+source code of this software is made available publicly. This includes
+acknowledgments in either Copyright notices, Manuals, Publicity and Marketing
+documents or any documentation provided with any product containing this
+software. This License does not apply to any software that links to the
+libraries provided by this software (statically or dynamically), but only to
+the software provided.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+-----------
+
+Please see the COPYING.PLAIN for a plain-english explanation of this notice
+and it's intent.
diff --git a/uppsrc/Web/ctrl/COPYING-PLAIN b/uppsrc/Web/ctrl/COPYING-PLAIN
new file mode 100644
index 000000000..770a8132f
--- /dev/null
+++ b/uppsrc/Web/ctrl/COPYING-PLAIN
@@ -0,0 +1,33 @@
+Plain English Copyright Notice
+
+This file is not intended to be the actual License. The reason this file
+exists is that we here are programmers and engineers. We aren't lawyers. We
+provide licenses that we THINK say the right things, but we have our own
+intentions at heart. This is a plain-english explanation of what those
+intentions are, and if you follow them you will be within the "spirit" of
+the license.
+
+The intent is for us to enjoy writing software that is useful to us (the
+AUTHORS) and allow others to use it freely and also benefit from the work we
+put into making it. We don't want to restrict others using it. They should
+not *HAVE* to make the source code of the applications they write that
+simply link to these libraries (be that statically or dynamically), or for
+them to be limited as to what license they choose to use (be it open, closed
+or anything else). But we would like to know you are using these libraries.
+We simply would like to know that it has been useful to someone. This is why
+we ask for acknowledgement of some sort.
+
+You can do what you want with the source of this software - it doesn't
+matter. We still have it here for ourselves and it is open and free to use
+and download and play with. It can't be taken away. We don't really mind what
+you do with the source to your software. We would simply like to know that
+you are using it - especially if it makes it to a commerical product. If you
+simply e-mail all the AUTHORS (see COPYING and AUTHORS files) telling us, and
+then make sure you include a paragraph or page in the manual or in the "About.."
+box for the product with the copyright notice and state that you used this
+software, we will be very happy. If you want to contribute back modifications
+and fixes you may have made we will welcome those too with open arms (generally).
+If you want help with changes needed, ports needed or features to be added,
+arrangements can be easily made with some dialogue.
+
+Mirek Fidler <cxl@ntllib.org>
diff --git a/uppsrc/Web/ctrl/DlgHttpServer.cpp b/uppsrc/Web/ctrl/DlgHttpServer.cpp
new file mode 100644
index 000000000..97f57d91e
--- /dev/null
+++ b/uppsrc/Web/ctrl/DlgHttpServer.cpp
@@ -0,0 +1,382 @@
+//////////////////////////////////////////////////////////////////////
+// DlgServerGui: ISAPI web server connector.
+
+#include "WebCtrl.h"
+#pragma hdrstop
+
+#define LNGFILE    <Web/Ctrl/DlgHttpServer.lay>
+#define LANGUAGE   LNG_CZECH
+#include           <Core/lng_header.h>
+
+#define LNGFILE    <Web/Ctrl/DlgHttpServer.lay>
+#define LNGMODULE  Web_Ctrl_DlgHttpServer_lay
+#define LANGUAGE   LNG_CZECH
+#include           <Core/lng_master.h>
+#define LANGUAGE   LNG_ENGLISH
+#include           <Core/lng_version.h>
+
+#define LAYOUTFILE <Web/Ctrl/DlgHttpServer.lay>
+#include           <CtrlCore/lay.h>
+
+#undef LNGFILE
+#undef LNGMODULE
+
+#define LNGFILE    <Web/Ctrl/DlgHttpServer.lng>
+#define LANGUAGE   LNG_CZECH
+#include           <Core/lng_header.h>
+#define LNGFILE    <Web/Ctrl/DlgHttpServer.lng>
+#define LNGMODULE  Web_Ctrl_DlgHttpServer
+#define LANGUAGE   LNG_CZECH
+#include           <Core/lng_master.h>
+#define LANGUAGE   LNG_ENGLISH
+#include           <Core/lng_version.h>
+
+#include "WebImg.h"
+
+#define IMAGECLASS WebImg
+#define IMAGEFILE  <Web/Ctrl/web.iml>
+#include           <Draw/iml_source.h>
+
+//////////////////////////////////////////////////////////////////////
+
+void DeleteMask(const char *path, const char *mask)
+{
+	Vector<String> files;
+	FindFile ff;
+	if(ff.Search(AppendFileName(path, mask)))
+		do
+			if(!ff.IsDirectory())
+				files.Add(ff.GetName());
+		while(ff.Next());
+	while(!files.IsEmpty())
+		DeleteFile(AppendFileName(path, files.Pop()));
+}
+
+//////////////////////////////////////////////////////////////////////
+
+void DeleteMask(const char *mask)
+{
+	DeleteMask(GetFileDirectory(mask), GetFileNamePos(mask));
+}
+
+//////////////////////////////////////////////////////////////////////
+
+template class Moveable<HttpServer *>;
+
+class DlgServerGui : public WithHttpServerLayout<TopWindow>
+{
+	friend class DlgHttpServer;
+
+public:
+	typedef DlgServerGui CLASSNAME;
+	DlgServerGui();
+
+	bool                           Run(int timeout);
+
+	void                           AddServer(HttpServer& server);
+	void                           RemoveServer(HttpServer& server);
+	int                            GetServerCount() const;
+	HttpServer&                    GetServer(int i) const;
+
+	One<HttpRequest>               GetRequest();
+
+private:
+	void                           OnMinimize();
+	void                           OnStop();
+
+protected:
+	HttpServer                    *activeserver;
+	Index<HttpServer *>            servers;
+	GradientDisplay                gradient;
+	bool                           minimized;
+	bool                           stopped;
+	Time                           start_time;
+};
+
+//////////////////////////////////////////////////////////////////////
+
+RegisterHelpTopicObjectTitle(DlgHttpServer, s_(DlgHttpServerTitle))
+
+DlgServerGui::DlgServerGui()
+: gradient(Point(0, -1), Color(192, 255, 192), Point(-1, 0), White)
+{
+	activeserver = NULL;
+	minimized = false;
+
+	CtrlLayoutOKCancel(*this, DlgHttpServerHelpTitle());
+	HelpTopic("DlgHttpServer");
+	run_time.SetReadOnly();
+	response.SetReadOnly();
+	trailing.SetReadOnly();
+	elapsed_time.SetReadOnly();
+	hits.SetReadOnly();
+
+	Icon(WebImg::small_web_server(), WebImg::large_web_server());
+
+	ActiveFocus(ok);
+	Background(gradient);
+	MinimizeBox();
+
+	ok <<= THISBACK(OnMinimize);
+	cancel <<= WhenClose = THISBACK(OnStop);
+	run_time <<= Format(start_time = GetSysTime());
+}
+
+//////////////////////////////////////////////////////////////////////
+
+/*
+static void LogExc(const Exc& e, WebConfig& cfg)
+{
+	cfg.Log("exception at " + Format(GetSysTime()) + ": " + e);
+}
+*/
+
+//////////////////////////////////////////////////////////////////////
+
+bool DlgServerGui::Run(int timeout_msec)
+{
+	stopped = false;
+	activeserver = NULL;
+	try
+	{
+//		if(context.LogRequests)
+//			context.Log("normal startup at " + Format(dog_time = GetSysTime()) + "\r\n");
+
+		if(!IsOpen())
+		{
+			TopWindow::OpenMain();
+			if(minimized)
+				Minimize(false);
+		}
+
+/*
+		if(!IsNull(context.dlg_position.x) && context.dlg_position.y >= 0)
+		{
+			Size dlgSize = dialog.GetScreenRect().Size();
+			dialog.SetRect(Rect(minmax<Point>(context.dlg_position, Point(0, 0),
+				Point(ScreenInfo().GetPagePixels() - dlgSize)), dlgSize));
+		}
+#ifdef PLATFORM_MFC
+		CWinApp *app = AfxGetApp();
+		bool set_main_wnd = false;
+		if(app && !app -> m_pMainWnd)
+		{
+			set_main_wnd = true;
+			app -> m_pMainWnd = GetCWnd();
+		}
+#endif//PLATFORM_MFC
+*/
+
+		String text;
+		int delta = fround(GetSysTime() - start_time);
+		if(delta < 60)
+			text << delta << " s";
+		else if(delta < 3600)
+			text = Format(s_(DlgHttpServerFormatMinSec), delta / 60, delta % 60);
+		else
+			text = Format(s_(DlgHttpServerFormatHourMinSec), delta / 3600, delta / 60 % 60, delta % 60);
+		elapsed_time = text;
+
+		double s_hits = 0, s_response = 0, s_trailing = 0;
+		for(int i = 0; i < servers.GetCount(); i++)
+		{
+			s_hits += servers[i] -> GetHitCount();
+			s_response += servers[i] -> GetAvgTime();
+			s_trailing += servers[i] -> GetAvgLagTime();
+		}
+		int ndiv = max(servers.GetCount(), 1);
+		hits = AsString(s_hits, 0);
+		response = AsString(s_response / ndiv, 0);
+		trailing = AsString(s_trailing / ndiv, 0);
+
+		semaphore.SetImage(WebImg::semaphore_green());
+		Show();
+
+		ProcessEvents();
+
+		activeserver = HttpServer::Wait(servers.GetKeys(), min(timeout_msec, 100));
+		if(activeserver)
+		{
+			semaphore.SetImage(WebImg::semaphore_red());
+			semaphore.Sync();
+		}
+		return !stopped;
+	}
+	catch(Exc e)
+	{
+//		LogExc(e, context);
+#ifdef _DEBUG
+		PromptOK(e);
+#endif//_DEBUG
+//		context.exit_code = Null;
+		return false;
+	}
+}
+
+//////////////////////////////////////////////////////////////////////
+
+void DlgServerGui::AddServer(HttpServer& server)
+{
+	servers.FindAdd(&server);
+}
+
+//////////////////////////////////////////////////////////////////////
+
+void DlgServerGui::RemoveServer(HttpServer& server)
+{
+	int i = servers.Find(&server);
+	if(i >= 0)
+		servers.Remove(i);
+}
+
+//////////////////////////////////////////////////////////////////////
+
+int DlgServerGui::GetServerCount() const
+{
+	return servers.GetCount();
+}
+
+//////////////////////////////////////////////////////////////////////
+
+HttpServer& DlgServerGui::GetServer(int i) const
+{
+	return *servers[i];
+}
+
+//////////////////////////////////////////////////////////////////////
+
+One<HttpRequest> DlgServerGui::GetRequest()
+{
+	if(!activeserver)
+		return NULL;
+	One<HttpRequest> request = activeserver -> GetRequest();
+	activeserver = NULL;
+	return request;
+}
+
+//////////////////////////////////////////////////////////////////////
+
+void DlgServerGui::OnMinimize()
+{
+	Minimize();
+}
+
+//////////////////////////////////////////////////////////////////////
+
+void DlgServerGui::OnStop()
+{
+	stopped = true;
+}
+
+//////////////////////////////////////////////////////////////////////
+// DlgHttpServer::
+
+DlgHttpServer::DlgHttpServer()
+{
+	gui = new DlgServerGui;
+}
+
+//////////////////////////////////////////////////////////////////////
+
+DlgHttpServer::~DlgHttpServer()
+{
+}
+
+//////////////////////////////////////////////////////////////////////
+
+void DlgHttpServer::Title(const char *t)
+{
+	gui -> Title(t);
+}
+
+//////////////////////////////////////////////////////////////////////
+
+void DlgHttpServer::Icon(Image small_icon, Image large_icon)
+{
+	gui -> Icon(small_icon, large_icon);
+}
+
+//////////////////////////////////////////////////////////////////////
+
+void DlgHttpServer::Minimize(bool min)
+{
+	if(!gui -> IsOpen())
+		gui -> minimized = min;
+	else if(min)
+		gui -> Minimize();
+	else
+		gui -> Restore();
+}
+
+//////////////////////////////////////////////////////////////////////
+
+bool DlgHttpServer::IsMinimized() const
+{
+	return gui -> IsOpen() ? gui -> IsMinimized() : gui -> minimized;
+}
+
+//////////////////////////////////////////////////////////////////////
+
+void DlgHttpServer::Position(Point pt)
+{
+	if(gui -> IsOverlapped())
+	{
+		Rect old_rc = gui -> GetRect();
+		Rect work_rc = Ctrl::GetWorkArea();
+		Size rc = old_rc.Size();
+		pt.x += (pt.x >= 0 ? work_rc.left : work_rc.right  + pt.x - rc.cx);
+		pt.y += (pt.y >= 0 ? work_rc.top  : work_rc.bottom + pt.y - rc.cy);
+		gui -> SetRect(old_rc + (pt - old_rc.TopLeft()));
+	}
+}
+
+//////////////////////////////////////////////////////////////////////
+
+Point DlgHttpServer::GetPosition() const
+{
+	return gui -> GetRect().TopLeft();
+}
+
+//////////////////////////////////////////////////////////////////////
+
+bool DlgHttpServer::Wait(int msec)
+{
+	return gui -> Run(msec);
+}
+
+//////////////////////////////////////////////////////////////////////
+
+One<HttpRequest> DlgHttpServer::GetRequest()
+{
+	return gui -> GetRequest();
+}
+
+//////////////////////////////////////////////////////////////////////
+
+void DlgHttpServer::AddServer(HttpServer& server)
+{
+	gui -> AddServer(server);
+}
+
+//////////////////////////////////////////////////////////////////////
+
+void DlgHttpServer::RemoveServer(HttpServer& server)
+{
+	gui -> RemoveServer(server);
+}
+
+//////////////////////////////////////////////////////////////////////
+
+int DlgHttpServer::GetServerCount() const
+{
+	return gui -> GetServerCount();
+}
+
+//////////////////////////////////////////////////////////////////////
+
+HttpServer& DlgHttpServer::GetServer(int i) const
+{
+	return gui -> GetServer(i);
+}
+
+//////////////////////////////////////////////////////////////////////
diff --git a/uppsrc/Web/ctrl/DlgHttpServer.h b/uppsrc/Web/ctrl/DlgHttpServer.h
new file mode 100644
index 000000000..f5b838593
--- /dev/null
+++ b/uppsrc/Web/ctrl/DlgHttpServer.h
@@ -0,0 +1,33 @@
+//////////////////////////////////////////////////////////////////////
+
+class DlgServerGui;
+
+class DlgHttpServer
+{
+public:
+	DlgHttpServer();
+	~DlgHttpServer();
+
+	void              AddServer(HttpServer& server);
+	void              RemoveServer(HttpServer& server);
+	int               GetServerCount() const;
+	HttpServer&       GetServer(int i) const;
+
+	void              Title(const char *t);
+	void              Icon(Image small_icon, Image large_icon);
+	void              Icon(Image small_icon) { Icon(small_icon, small_icon); }
+
+	void              Minimize(bool min = true);
+	bool              IsMinimized() const;
+
+	void              Position(Point pt);
+	Point             GetPosition() const;
+
+	bool              Wait(int msec);
+	One<HttpRequest>  GetRequest();
+
+private:
+	One<DlgServerGui> gui;
+};
+
+//////////////////////////////////////////////////////////////////////
diff --git a/uppsrc/Web/ctrl/DlgHttpServer.lay b/uppsrc/Web/ctrl/DlgHttpServer.lay
new file mode 100644
index 000000000..2dc6301af
--- /dev/null
+++ b/uppsrc/Web/ctrl/DlgHttpServer.lay
@@ -0,0 +1,19 @@
+#ifdef LAYOUTFILE
+
+LAYOUT(HttpServerLayout, 250, 144)
+	ITEM(Label, semaphore, LeftPosZ(24, 30).TopPosZ(12, 48))
+	ITEM(Label, dv___1, SetLabel(t_("Hit count:")).LeftPosZ(80, 76).TopPosZ(4, 19))
+	ITEM(EditField, hits, LeftPosZ(156, 90).TopPosZ(4, 19))
+	ITEM(Label, dv___3, SetLabel(t_("Response:")).LeftPosZ(80, 76).TopPosZ(26, 19))
+	ITEM(EditField, response, LeftPosZ(156, 90).TopPosZ(26, 19))
+	ITEM(Label, dv___5, SetLabel(t_("Lagging:")).LeftPosZ(80, 76).TopPosZ(48, 19))
+	ITEM(EditField, trailing, LeftPosZ(156, 90).TopPosZ(48, 19))
+	ITEM(Label, dv___7, SetLabel(t_("Elapsed time:")).LeftPosZ(4, 74).TopPosZ(70, 19))
+	ITEM(EditField, elapsed_time, LeftPosZ(80, 166).TopPosZ(70, 19))
+	ITEM(Label, dv___9, SetLabel(t_("Startup time:")).LeftPosZ(4, 74).TopPosZ(92, 19))
+	ITEM(EditField, run_time, LeftPosZ(80, 166).TopPosZ(92, 19))
+	ITEM(Button, ok, SetLabel(t_("Hide")).RightPosZ(90, 80).BottomPosZ(4, 22))
+	ITEM(Button, cancel, SetLabel(t_("Stop")).RightPosZ(4, 80).BottomPosZ(4, 22))
+END_LAYOUT
+
+#endif
diff --git a/uppsrc/Web/ctrl/DlgHttpServer.lng b/uppsrc/Web/ctrl/DlgHttpServer.lng
new file mode 100644
index 000000000..4715647c6
--- /dev/null
+++ b/uppsrc/Web/ctrl/DlgHttpServer.lng
@@ -0,0 +1,19 @@
+#if LANGUAGE == LNG_CZECH
+
+txt(DlgHttpServerTitle, "Internetov� server")
+txt(DlgHttpServerFormatMinSec, "%d min, %d s")
+txt(DlgHttpServerFormatHourMinSec, "%2d:%02d:%02d")
+txt(DlgHttpServerFormatResponse, " ms / dotaz")
+txt(DlgHttpServerFormatLaggingResponse, " ms / dotaz")
+
+#endif
+
+#if LANGUAGE == LNG_ENGLISH
+
+txt(DlgHttpServerTitle, "Web server")
+txt(DlgHttpServerFormatMinSec, "%d min, %d sec")
+txt(DlgHttpServerFormatHourMinSec, "%2d:%02d:%02d")
+txt(DlgHttpServerFormatResponse, " msec / query")
+txt(DlgHttpServerFormatLaggingResponse, " msec / query")
+
+#endif
diff --git a/uppsrc/Web/ctrl/WebCtrl.h b/uppsrc/Web/ctrl/WebCtrl.h
new file mode 100644
index 000000000..ddb2d7c73
--- /dev/null
+++ b/uppsrc/Web/ctrl/WebCtrl.h
@@ -0,0 +1,9 @@
+#ifndef __WebCtrl__
+#define __WebCtrl__
+
+#include <Web/Web.h>
+#include <CtrlLib/CtrlLib.h>
+#include <TDraw/TDraw.h>
+#include "DlgHttpServer.h"
+
+#endif//__WebCtrl__
diff --git a/uppsrc/Web/ctrl/WebImg.h b/uppsrc/Web/ctrl/WebImg.h
new file mode 100644
index 000000000..bb1590a7a
--- /dev/null
+++ b/uppsrc/Web/ctrl/WebImg.h
@@ -0,0 +1,3 @@
+#define IMAGECLASS WebImg
+#define IMAGEFILE <Web/Ctrl/web.iml>
+#include <Draw/iml_header.h>
diff --git a/uppsrc/Web/ctrl/ctrl.upp b/uppsrc/Web/ctrl/ctrl.upp
new file mode 100644
index 000000000..e95748bd8
--- /dev/null
+++ b/uppsrc/Web/ctrl/ctrl.upp
@@ -0,0 +1,17 @@
+uses
+	Web,
+	TCtrlLib,
+	TDraw;
+
+file
+	WebCtrl.h,
+	DlgHttpServer.h,
+	DlgHttpServer.cpp,
+	DlgHttpServer.lay,
+	DlgHttpServer.lng,
+	web.iml,
+	WebImg.h,
+	Info readonly separator,
+	COPYING,
+	COPYING-PLAIN,
+	AUTHORS;
diff --git a/uppsrc/Web/ctrl/web.iml b/uppsrc/Web/ctrl/web.iml
new file mode 100644
index 000000000..1c60d7c11
--- /dev/null
+++ b/uppsrc/Web/ctrl/web.iml
@@ -0,0 +1,157 @@
+IMAGE_BEGIN(small_web_server)
+	IMAGE_SCAN("\314\001\000\000\000")
+	IMAGE_SCAN("\312\001\000\000\000\303\001\000\000\000")
+	IMAGE_SCAN("\305\202\000\000\000\305\001\000\000\000")
+	IMAGE_SCAN("\303\202\000\000\000\202\377\377\377\202\000\000\000\301\001\000\000\000\301\001\000\000\000\301\001\000\000\000")
+	IMAGE_SCAN("\301\202\000\000\000\206\377\377\377\001\000\000\000\302\001\000\000\000")
+	IMAGE_SCAN("\001\000\000\000\206\377\377\377\203\000\000\000\302\001\000\000\000")
+	IMAGE_SCAN("\203\000\000\000\202\377\377\377\202\000\000\000\202\377\377\377\001\000\000\000\302\001\000\000\000")
+	IMAGE_SCAN("\001\000\000\000\202\377\377\377\202\000\000\000\204\377\377\377\001\000\000\000\301\203\000\000\000")
+	IMAGE_SCAN("\203\000\000\000\002\377\377\377\000\000\000\204\377\377\377\001\000\000\000\301\203\000\000\000")
+	IMAGE_SCAN("\001\000\000\000\202\377\377\377\202\000\000\000\204\377\377\377\001\000\000\000\301\001\000\000\000")
+	IMAGE_SCAN("\005\000\000\000\377\377\377\000\000\000\377\377\377\000\000\000\204\377\377\377\202\000\000\000")
+	IMAGE_SCAN("\002\000\000\000\377\377\377\203\000\000\000\204\377\377\377\001\000\000\000")
+	IMAGE_SCAN("\001\000\000\000\202\377\377\377\202\000\000\000\204\377\377\377\001\000\000\000")
+	IMAGE_SCAN("\001\000\000\000\203\377\377\377\001\000\000\000\202\377\377\377\202\000\000\000")
+	IMAGE_SCAN("\301\202\000\000\000\001\377\377\377\203\000\000\000")
+	IMAGE_SCAN("\303\202\000\000\000")
+IMAGE_END(small_web_server, 16, 16)
+
+IMAGE_BEGIN(large_web_server)
+	IMAGE_SCAN("\332\001\000\000\000")
+	IMAGE_SCAN("\327\001\000\000\000\302\001\000\000\000\302\001\000\000\000")
+	IMAGE_SCAN("\330\001\000\000\000\303\001\000\000\000")
+	IMAGE_SCAN("")
+	IMAGE_SCAN("\326\202\000\000\000\302\001\000\000\000\302\202\000\000\000")
+	IMAGE_SCAN("\332\001\000\000\000")
+	IMAGE_SCAN("\313\202\000\000\000\313\001\000\000\000\301\001\000\000\000\301\001\000\000\000")
+	IMAGE_SCAN("\311\202\000\000\000\202\377\377\377\202\000\000\000\310\001\000\000\000\302\001\000\000\000\302\001\000\000\000")
+	IMAGE_SCAN("\307\202\000\000\000\206\377\377\377\202\000\000\000\311\001\000\000\000")
+	IMAGE_SCAN("\305\202\000\000\000\212\377\377\377\202\000\000\000\307\001\000\000\000")
+	IMAGE_SCAN("\303\202\000\000\000\212\377\377\377\202\000\000\000\002\377\377\377\000\000\000\306\203\000\000\000")
+	IMAGE_SCAN("\301\202\000\000\000\212\377\377\377\202\000\000\000\203\377\377\377\001\000\000\000\306\203\000\000\000")
+	IMAGE_SCAN("\301\002\000\000\000\377\377\377\202\000\000\000\206\377\377\377\202\000\000\000\205\377\377\377\001\000\000\000\306\203\000\000\000")
+	IMAGE_SCAN("\301\001\000\000\000\203\377\377\377\202\000\000\000\202\377\377\377\202\000\000\000\207\377\377\377\001\000\000\000\305\205\000\000\000")
+	IMAGE_SCAN("\301\203\000\000\000\203\377\377\377\202\000\000\000\211\377\377\377\001\000\000\000\306\203\000\000\000")
+	IMAGE_SCAN("\301\001\000\000\000\202\377\377\377\202\000\000\000\202\377\377\377\001\000\000\000\211\377\377\377\001\000\000\000\307\001\000\000\000")
+	IMAGE_SCAN("\301\203\000\000\000\202\377\377\377\203\000\000\000\211\377\377\377\001\000\000\000\306\202\000\000\000")
+	IMAGE_SCAN("\301\001\000\000\000\202\377\377\377\202\000\000\000\202\377\377\377\001\000\000\000\211\377\377\377\001\000\000\000\304\203\000\000\000")
+	IMAGE_SCAN("\301\001\000\000\000\204\377\377\377\203\000\000\000\211\377\377\377\001\000\000\000\302\204\000\000\000")
+	IMAGE_SCAN("\301\001\000\000\000\206\377\377\377\001\000\000\000\211\377\377\377\205\000\000\000")
+	IMAGE_SCAN("\301\001\000\000\000\202\377\377\377\202\000\000\000\202\377\377\377\001\000\000\000\211\377\377\377\203\000\000\000")
+	IMAGE_SCAN("\301\001\000\000\000\202\377\377\377\205\000\000\000\211\377\377\377\001\000\000\000")
+	IMAGE_SCAN("\301\001\000\000\000\204\377\377\377\203\000\000\000\211\377\377\377\001\000\000\000")
+	IMAGE_SCAN("\301\001\000\000\000\206\377\377\377\001\000\000\000\211\377\377\377\001\000\000\000")
+	IMAGE_SCAN("\301\001\000\000\000\206\377\377\377\001\000\000\000\211\377\377\377\001\000\000\000")
+	IMAGE_SCAN("\301\001\000\000\000\206\377\377\377\001\000\000\000\210\377\377\377\202\000\000\000")
+	IMAGE_SCAN("\301\001\000\000\000\206\377\377\377\001\000\000\000\206\377\377\377\202\000\000\000")
+	IMAGE_SCAN("\301\202\000\000\000\205\377\377\377\001\000\000\000\204\377\377\377\202\000\000\000")
+	IMAGE_SCAN("\303\202\000\000\000\203\377\377\377\001\000\000\000\202\377\377\377\202\000\000\000")
+	IMAGE_SCAN("\305\202\000\000\000\001\377\377\377\203\000\000\000")
+	IMAGE_SCAN("\307\202\000\000\000")
+IMAGE_END(large_web_server, 32, 32)
+
+IMAGE_BEGIN(semaphore_green)
+	IMAGE_SCAN("\313\210\377\000\000")
+	IMAGE_SCAN("\312\001\377\000\000\210\377\377\377\001\377\000\000")
+	IMAGE_SCAN("\311\001\377\000\000\202\377\377\377\206\377\000\000\202\377\377\377\001\377\000\000")
+	IMAGE_SCAN("\310\001\377\000\000\202\377\377\377\202\377\000\000\204\000\000\000\202\377\000\000\302\001\377\000\000")
+	IMAGE_SCAN("\307\001\377\000\000\202\377\377\377\202\377\000\000\001\000\000\000\204\204\202\204\001\000\000\000\202\377\000\000\302\001\377\000\000")
+	IMAGE_SCAN("\307\002\377\000\000\377\377\377\202\377\000\000\001\000\000\000\206\204\202\204\001\000\000\000\202\377\000\000\301\001\377\000\000")
+	IMAGE_SCAN("\307\002\377\000\000\377\377\377\202\377\000\000\001\000\000\000\206\204\202\204\001\000\000\000\202\377\000\000\301\001\377\000\000")
+	IMAGE_SCAN("\307\002\377\000\000\377\377\377\202\377\000\000\001\377\377\377\206\204\202\204\001\377\377\377\202\377\000\000\301\001\377\000\000")
+	IMAGE_SCAN("\307\002\377\000\000\377\377\377\202\377\000\000\001\377\377\377\206\204\202\204\001\377\377\377\202\377\000\000\301\001\377\000\000")
+	IMAGE_SCAN("\307\002\377\000\000\377\377\377\203\377\000\000\001\377\377\377\204\204\202\204\001\377\377\377\203\377\000\000\301\001\377\000\000")
+	IMAGE_SCAN("\307\002\377\000\000\377\377\377\204\377\000\000\204\377\377\377\204\377\000\000\301\001\377\000\000")
+	IMAGE_SCAN("\307\002\377\000\000\377\377\377\214\377\000\000\301\001\377\000\000")
+	IMAGE_SCAN("\307\002\377\000\000\377\377\377\204\377\000\000\204\000\000\000\204\377\000\000\301\001\377\000\000")
+	IMAGE_SCAN("\307\002\377\000\000\377\377\377\203\377\000\000\001\000\000\000\204\204\202\204\001\000\000\000\203\377\000\000\301\001\377\000\000")
+	IMAGE_SCAN("\307\002\377\000\000\377\377\377\202\377\000\000\001\000\000\000\206\204\202\204\001\000\000\000\202\377\000\000\301\001\377\000\000")
+	IMAGE_SCAN("\307\002\377\000\000\377\377\377\202\377\000\000\001\000\000\000\206\204\202\204\001\000\000\000\202\377\000\000\301\001\377\000\000")
+	IMAGE_SCAN("\307\002\377\000\000\377\377\377\202\377\000\000\001\377\377\377\206\204\202\204\001\377\377\377\202\377\000\000\301\001\377\000\000")
+	IMAGE_SCAN("\307\002\377\000\000\377\377\377\202\377\000\000\001\377\377\377\206\204\202\204\001\377\377\377\202\377\000\000\301\001\377\000\000")
+	IMAGE_SCAN("\307\002\377\000\000\377\377\377\203\377\000\000\001\377\377\377\204\204\202\204\001\377\377\377\203\377\000\000\301\001\377\000\000")
+	IMAGE_SCAN("\307\002\377\000\000\377\377\377\204\377\000\000\204\377\377\377\204\377\000\000\301\001\377\000\000")
+	IMAGE_SCAN("\307\002\377\000\000\377\377\377\214\377\000\000\301\001\377\000\000")
+	IMAGE_SCAN("\307\002\377\000\000\377\377\377\204\377\000\000\204\000\000\000\204\377\000\000\301\001\377\000\000")
+	IMAGE_SCAN("\307\002\377\000\000\377\377\377\203\377\000\000\001\000\000\000\204\000\377\000\001\000\000\000\203\377\000\000\301\001\377\000\000")
+	IMAGE_SCAN("\307\002\377\000\000\377\377\377\202\377\000\000\001\000\000\000\206\000\377\000\001\000\000\000\202\377\000\000\301\001\377\000\000")
+	IMAGE_SCAN("\307\002\377\000\000\377\377\377\202\377\000\000\001\000\000\000\206\000\377\000\001\000\000\000\202\377\000\000\301\001\377\000\000")
+	IMAGE_SCAN("\307\002\377\000\000\377\377\377\202\377\000\000\001\377\377\377\206\000\377\000\001\377\377\377\202\377\000\000\301\001\377\000\000")
+	IMAGE_SCAN("\307\002\377\000\000\377\377\377\202\377\000\000\001\377\377\377\206\000\377\000\001\377\377\377\202\377\000\000\301\001\377\000\000")
+	IMAGE_SCAN("\307\001\377\000\000\202\377\377\377\202\377\000\000\001\377\377\377\204\000\377\000\001\377\377\377\203\377\000\000\301\001\377\000\000")
+	IMAGE_SCAN("\310\001\377\000\000\202\377\377\377\202\377\000\000\204\377\377\377\203\377\000\000\301\001\377\000\000")
+	IMAGE_SCAN("\311\001\377\000\000\302\207\377\000\000\301\001\377\000\000")
+	IMAGE_SCAN("\312\001\377\000\000\310\001\377\000\000")
+	IMAGE_SCAN("\313\210\377\000\000")
+IMAGE_END(semaphore_green, 32, 32)
+
+IMAGE_BEGIN(semaphore_yellow)
+	IMAGE_SCAN("\313\210\377\000\000")
+	IMAGE_SCAN("\312\001\377\000\000\210\377\377\377\001\377\000\000")
+	IMAGE_SCAN("\311\001\377\000\000\202\377\377\377\206\377\000\000\202\377\377\377\001\377\000\000")
+	IMAGE_SCAN("\310\001\377\000\000\202\377\377\377\202\377\000\000\204\000\000\000\202\377\000\000\302\001\377\000\000")
+	IMAGE_SCAN("\307\001\377\000\000\202\377\377\377\202\377\000\000\001\000\000\000\204\204\202\204\001\000\000\000\202\377\000\000\302\001\377\000\000")
+	IMAGE_SCAN("\307\002\377\000\000\377\377\377\202\377\000\000\001\000\000\000\206\204\202\204\001\000\000\000\202\377\000\000\301\001\377\000\000")
+	IMAGE_SCAN("\307\002\377\000\000\377\377\377\202\377\000\000\001\000\000\000\206\204\202\204\001\000\000\000\202\377\000\000\301\001\377\000\000")
+	IMAGE_SCAN("\307\002\377\000\000\377\377\377\202\377\000\000\001\377\377\377\206\204\202\204\001\377\377\377\202\377\000\000\301\001\377\000\000")
+	IMAGE_SCAN("\307\002\377\000\000\377\377\377\202\377\000\000\001\377\377\377\206\204\202\204\001\377\377\377\202\377\000\000\301\001\377\000\000")
+	IMAGE_SCAN("\307\002\377\000\000\377\377\377\203\377\000\000\001\377\377\377\204\204\202\204\001\377\377\377\203\377\000\000\301\001\377\000\000")
+	IMAGE_SCAN("\307\002\377\000\000\377\377\377\204\377\000\000\204\377\377\377\204\377\000\000\301\001\377\000\000")
+	IMAGE_SCAN("\307\002\377\000\000\377\377\377\214\377\000\000\301\001\377\000\000")
+	IMAGE_SCAN("\307\002\377\000\000\377\377\377\204\377\000\000\204\000\000\000\204\377\000\000\301\001\377\000\000")
+	IMAGE_SCAN("\307\002\377\000\000\377\377\377\203\377\000\000\001\000\000\000\204\000\306\377\001\000\000\000\203\377\000\000\301\001\377\000\000")
+	IMAGE_SCAN("\307\002\377\000\000\377\377\377\202\377\000\000\001\000\000\000\206\000\306\377\001\000\000\000\202\377\000\000\301\001\377\000\000")
+	IMAGE_SCAN("\307\002\377\000\000\377\377\377\202\377\000\000\001\000\000\000\206\000\306\377\001\000\000\000\202\377\000\000\301\001\377\000\000")
+	IMAGE_SCAN("\307\002\377\000\000\377\377\377\202\377\000\000\001\377\377\377\206\000\306\377\001\377\377\377\202\377\000\000\301\001\377\000\000")
+	IMAGE_SCAN("\307\002\377\000\000\377\377\377\202\377\000\000\001\377\377\377\206\000\306\377\001\377\377\377\202\377\000\000\301\001\377\000\000")
+	IMAGE_SCAN("\307\002\377\000\000\377\377\377\203\377\000\000\001\377\377\377\204\000\306\377\001\377\377\377\203\377\000\000\301\001\377\000\000")
+	IMAGE_SCAN("\307\002\377\000\000\377\377\377\204\377\000\000\204\377\377\377\204\377\000\000\301\001\377\000\000")
+	IMAGE_SCAN("\307\002\377\000\000\377\377\377\214\377\000\000\301\001\377\000\000")
+	IMAGE_SCAN("\307\002\377\000\000\377\377\377\204\377\000\000\204\000\000\000\204\377\000\000\301\001\377\000\000")
+	IMAGE_SCAN("\307\002\377\000\000\377\377\377\203\377\000\000\001\000\000\000\204\204\202\204\001\000\000\000\203\377\000\000\301\001\377\000\000")
+	IMAGE_SCAN("\307\002\377\000\000\377\377\377\202\377\000\000\001\000\000\000\206\204\202\204\001\000\000\000\202\377\000\000\301\001\377\000\000")
+	IMAGE_SCAN("\307\002\377\000\000\377\377\377\202\377\000\000\001\000\000\000\206\204\202\204\001\000\000\000\202\377\000\000\301\001\377\000\000")
+	IMAGE_SCAN("\307\002\377\000\000\377\377\377\202\377\000\000\001\377\377\377\206\204\202\204\001\377\377\377\202\377\000\000\301\001\377\000\000")
+	IMAGE_SCAN("\307\002\377\000\000\377\377\377\202\377\000\000\001\377\377\377\206\204\202\204\001\377\377\377\202\377\000\000\301\001\377\000\000")
+	IMAGE_SCAN("\307\001\377\000\000\202\377\377\377\202\377\000\000\001\377\377\377\204\204\202\204\001\377\377\377\203\377\000\000\301\001\377\000\000")
+	IMAGE_SCAN("\310\001\377\000\000\202\377\377\377\202\377\000\000\204\377\377\377\203\377\000\000\301\001\377\000\000")
+	IMAGE_SCAN("\311\001\377\000\000\302\207\377\000\000\301\001\377\000\000")
+	IMAGE_SCAN("\312\001\377\000\000\310\001\377\000\000")
+	IMAGE_SCAN("\313\210\377\000\000")
+IMAGE_END(semaphore_yellow, 32, 32)
+
+IMAGE_BEGIN(semaphore_red)
+	IMAGE_SCAN("\313\210\377\000\000")
+	IMAGE_SCAN("\312\001\377\000\000\210\377\377\377\001\377\000\000")
+	IMAGE_SCAN("\311\001\377\000\000\202\377\377\377\206\377\000\000\202\377\377\377\001\377\000\000")
+	IMAGE_SCAN("\310\001\377\000\000\202\377\377\377\202\377\000\000\204\000\000\000\202\377\000\000\302\001\377\000\000")
+	IMAGE_SCAN("\307\001\377\000\000\202\377\377\377\202\377\000\000\001\000\000\000\204\000\000\377\001\000\000\000\202\377\000\000\302\001\377\000\000")
+	IMAGE_SCAN("\307\002\377\000\000\377\377\377\202\377\000\000\001\000\000\000\206\000\000\377\001\000\000\000\202\377\000\000\301\001\377\000\000")
+	IMAGE_SCAN("\307\002\377\000\000\377\377\377\202\377\000\000\001\000\000\000\206\000\000\377\001\000\000\000\202\377\000\000\301\001\377\000\000")
+	IMAGE_SCAN("\307\002\377\000\000\377\377\377\202\377\000\000\001\377\377\377\206\000\000\377\001\377\377\377\202\377\000\000\301\001\377\000\000")
+	IMAGE_SCAN("\307\002\377\000\000\377\377\377\202\377\000\000\001\377\377\377\206\000\000\377\001\377\377\377\202\377\000\000\301\001\377\000\000")
+	IMAGE_SCAN("\307\002\377\000\000\377\377\377\203\377\000\000\001\377\377\377\204\000\000\377\001\377\377\377\203\377\000\000\301\001\377\000\000")
+	IMAGE_SCAN("\307\002\377\000\000\377\377\377\204\377\000\000\204\377\377\377\204\377\000\000\301\001\377\000\000")
+	IMAGE_SCAN("\307\002\377\000\000\377\377\377\214\377\000\000\301\001\377\000\000")
+	IMAGE_SCAN("\307\002\377\000\000\377\377\377\204\377\000\000\204\000\000\000\204\377\000\000\301\001\377\000\000")
+	IMAGE_SCAN("\307\002\377\000\000\377\377\377\203\377\000\000\001\000\000\000\204\204\202\204\001\000\000\000\203\377\000\000\301\001\377\000\000")
+	IMAGE_SCAN("\307\002\377\000\000\377\377\377\202\377\000\000\001\000\000\000\206\204\202\204\001\000\000\000\202\377\000\000\301\001\377\000\000")
+	IMAGE_SCAN("\307\002\377\000\000\377\377\377\202\377\000\000\001\000\000\000\206\204\202\204\001\000\000\000\202\377\000\000\301\001\377\000\000")
+	IMAGE_SCAN("\307\002\377\000\000\377\377\377\202\377\000\000\001\377\377\377\206\204\202\204\001\377\377\377\202\377\000\000\301\001\377\000\000")
+	IMAGE_SCAN("\307\002\377\000\000\377\377\377\202\377\000\000\001\377\377\377\206\204\202\204\001\377\377\377\202\377\000\000\301\001\377\000\000")
+	IMAGE_SCAN("\307\002\377\000\000\377\377\377\203\377\000\000\001\377\377\377\204\204\202\204\001\377\377\377\203\377\000\000\301\001\377\000\000")
+	IMAGE_SCAN("\307\002\377\000\000\377\377\377\204\377\000\000\204\377\377\377\204\377\000\000\301\001\377\000\000")
+	IMAGE_SCAN("\307\002\377\000\000\377\377\377\214\377\000\000\301\001\377\000\000")
+	IMAGE_SCAN("\307\002\377\000\000\377\377\377\204\377\000\000\204\000\000\000\204\377\000\000\301\001\377\000\000")
+	IMAGE_SCAN("\307\002\377\000\000\377\377\377\203\377\000\000\001\000\000\000\204\204\202\204\001\000\000\000\203\377\000\000\301\001\377\000\000")
+	IMAGE_SCAN("\307\002\377\000\000\377\377\377\202\377\000\000\001\000\000\000\206\204\202\204\001\000\000\000\202\377\000\000\301\001\377\000\000")
+	IMAGE_SCAN("\307\002\377\000\000\377\377\377\202\377\000\000\001\000\000\000\206\204\202\204\001\000\000\000\202\377\000\000\301\001\377\000\000")
+	IMAGE_SCAN("\307\002\377\000\000\377\377\377\202\377\000\000\001\377\377\377\206\204\202\204\001\377\377\377\202\377\000\000\301\001\377\000\000")
+	IMAGE_SCAN("\307\002\377\000\000\377\377\377\202\377\000\000\001\377\377\377\206\204\202\204\001\377\377\377\202\377\000\000\301\001\377\000\000")
+	IMAGE_SCAN("\307\001\377\000\000\202\377\377\377\202\377\000\000\001\377\377\377\204\204\202\204\001\377\377\377\203\377\000\000\301\001\377\000\000")
+	IMAGE_SCAN("\310\001\377\000\000\202\377\377\377\202\377\000\000\204\377\377\377\203\377\000\000\301\001\377\000\000")
+	IMAGE_SCAN("\311\001\377\000\000\302\207\377\000\000\301\001\377\000\000")
+	IMAGE_SCAN("\312\001\377\000\000\310\001\377\000\000")
+	IMAGE_SCAN("\313\210\377\000\000")
+IMAGE_END(semaphore_red, 32, 32)
diff --git a/uppsrc/Web/html.cpp b/uppsrc/Web/html.cpp
new file mode 100644
index 000000000..cd12eb6d0
--- /dev/null
+++ b/uppsrc/Web/html.cpp
@@ -0,0 +1,614 @@
+#include "Web.h"
+
+NAMESPACE_UPP
+
+String ToHtml(const char *s)
+{
+	if(*s == '`')
+		return String(++s);
+
+	String result;
+	while(*s) {
+		if(*s == 31)
+			result.Cat("&nbsp;");
+		else
+		if(*s == '<')
+			result.Cat("&lt;");
+		else
+		if(*s == '>')
+			result.Cat("&gt;");
+		else
+		if(*s == '&')
+			result.Cat("&amp;");
+		else
+		if(*s == '\"')
+			result.Cat("&quot;");
+		else
+		if((byte)*s < ' ')
+			result.Cat(NFormat("&#%d;", (byte)*s));
+		else
+			result.Cat(*s);
+		s++;
+	}
+	return result;
+}
+
+/*
+Htmls& Htmls::Qtf(const char *qtf) {
+	HtmlDocOut html;
+	html.Qtf(qtf);
+	Cat(html.Get());
+	return *this;
+}
+*/
+
+Htmls& Htmls::Text(const char *s)                  { Cat(ToHtml(s)); return *this; }
+Htmls& Htmls::Quote(const char *s)                 { Cat('\"' + ToHtml(s) + '\"'); return *this; }
+Htmls& Htmls::Color(class Color color)             { Quote(ColorToHtml(color)); return *this; }
+Htmls& Htmls::Percent(double d)                    { return Quote(UPP::Format("%g%%", d)); }
+
+Htmls& Htmls::Color(const char *nm, class Color c) {
+	if(!UPP::IsNull(c))
+		Attr(nm); Cat('='); return Color(c);
+}
+
+Htmls& Htmls::Percent(const char *nm, double d)    { Attr(nm); Cat('='); return Percent(d); }
+
+Htmls& Htmls::Attr(const char *a)                  { Cat(' '); Cat(a); return *this; }
+Htmls& Htmls::Attr(const char *a, const char *s)   { Attr(a); Cat('='); return Quote(s); }
+Htmls& Htmls::Attr(const char *a, String s)        { return Attr(a, ~s); }
+Htmls& Htmls::Attr(const char *a, int i)           { return Attr(a, UPP::Format("%d", i)); }
+Htmls& Htmls::Attr(const char *a, double d)        { return Attr(a, UPP::Format("%g", d)); }
+Htmls& Htmls::Attr(const char *a, Date d)          { return Attr(a, UPP::Format(d)); }
+Htmls& Htmls::Attr(const char *a, Value v)         { return Attr(a, StdFormat(v)); }
+
+Htmls& Htmls::Attp(const char *a, double v)        { return v >= 0 ? Attr(a, v) : Percent(a, -v); }
+
+Htmls& Htmls::Atth(const char *a, const char *h)
+{
+	Attr(a);
+	Cat('=');
+	Cat('\"');
+	Cat(h);
+	Cat('\"');
+	return *this;
+}
+
+Htmls& Htmls::Tag(const char *tag)                 { Cat('<'); Cat(tag); return *this; }
+Htmls& Htmls::Gat()                                { Cat('>'); return *this; }
+
+Htmls& Htmls::Nbsp()                               { Cat("&nbsp;"); return *this; }
+Htmls& Htmls::Br()                                 { Cat("<BR>", 4); return *this; }
+Htmls& Htmls::Hr()                                 { Cat("<HR>", 4); return *this; }
+Htmls& Htmls::Lf()                                 { Cat('\n'); return *this; }
+
+Htmls& Htmls::Cat(const HtmlTag& tag)
+{
+	Cat(tag.GetTag());
+	Cat(tag.GetEndTag());
+	return *this;
+}
+
+HtmlTag& HtmlTag::Type(const char *s)       { return Attr("TYPE", s); }
+
+HtmlTag& HtmlTag::Name(const char *s)       { return Attr("NAME", s); }
+HtmlTag& HtmlTag::Name(String id)           { return Attr("NAME", ~id); }
+
+HtmlTag& HtmlTag::Data(const char *v)       { return Attr("VALUE", v); }
+HtmlTag& HtmlTag::Data(String v)            { return Attr("VALUE", v); }
+HtmlTag& HtmlTag::Data(double v)            { return Attr("VALUE", v); }
+HtmlTag& HtmlTag::Data(Value v)             { return Attr("VALUE", v); }
+
+HtmlTag& HtmlTag::ReadOnly()                { return Attr("READONLY"); }
+HtmlTag& HtmlTag::Multiple()                { return Attr("MULTIPLE"); }
+HtmlTag& HtmlTag::Selected()                { return Attr("SELECTED"); }
+
+HtmlTag& HtmlTag::Align(Alignment align)
+{
+	switch(align) {
+		case ALIGN_CENTER: return Attr("ALIGN", "CENTER");
+		case ALIGN_RIGHT:  return Attr("ALIGN", "RIGHT");
+		default:           return Attr("ALIGN", "LEFT");
+	}
+}
+
+HtmlTag& HtmlTag::Left()                    { return Align(ALIGN_LEFT); }
+HtmlTag& HtmlTag::Right()                   { return Align(ALIGN_RIGHT); }
+HtmlTag& HtmlTag::Center()                  { return Align(ALIGN_CENTER); }
+
+HtmlTag& HtmlTag::VAlign(Alignment align)
+{
+	switch(align) {
+		case ALIGN_CENTER: return Attr("VALIGN", "MIDDLE");
+		case ALIGN_BOTTOM: return Attr("VALIGN", "BOTTOM");
+		default:           return Attr("VALIGN", "TOP");
+	}
+}
+
+HtmlTag& HtmlTag::Top()                     { return VAlign(ALIGN_TOP); }
+HtmlTag& HtmlTag::VCenter()                 { return VAlign(ALIGN_CENTER); }
+HtmlTag& HtmlTag::Bottom()                  { return VAlign(ALIGN_BOTTOM); }
+
+HtmlTag& HtmlTag::HotKey(char c)            { return c ? Attr("ACCESSKEY", String(c, 1)) : *this; }
+HtmlTag& HtmlTag::Size(int c)               { return Attr("SIZE", c); }
+HtmlTag& HtmlTag::Size(int cx, int cy)      { return Attr("SIZE", Format("%d, %d", cx, cy)); }
+
+HtmlTag& HtmlTag::Color(class Color color)      { return Color("COLOR", color); }
+HtmlTag& HtmlTag::BorderColor(class Color col)  { return Color("BORDERCOLOR", col); }
+HtmlTag& HtmlTag::BgColor(class Color color)    { return Color("BGCOLOR", color); }
+
+HtmlTag& HtmlTag::Face(const char *s)       { return Attr("FACE", s); }
+HtmlTag& HtmlTag::Border(int i)             { return Attr("BORDER", i); }
+HtmlTag& HtmlTag::CellSpacing(int i)        { return Attr("CELLSPACING", i); }
+HtmlTag& HtmlTag::CellPadding(int i)        { return Attr("CELLPADDING", i); }
+
+HtmlTag& HtmlTag::Width(double w)           { return Attp("WIDTH", w); }
+HtmlTag& HtmlTag::Height(double h)          { return Attp("HEIGHT", h); }
+
+HtmlTag& HtmlTag::RowSpan(int i)            { return Attr("ROWSPAN", i); }
+HtmlTag& HtmlTag::ColSpan(int i)            { return Attr("COLSPAN", i); }
+
+HtmlTag& HtmlTag::Class(const char *s)      { return Attr("CLASS", s); }
+HtmlTag& HtmlTag::DataFld(const char *s)    { return Attr("DATAFLD", s); }
+HtmlTag& HtmlTag::DataSrc(const char *s)    { return Attr("DATASRC", s); }
+HtmlTag& HtmlTag::Href(const char *s)       { return Atth("HREF", s); }
+HtmlTag& HtmlTag::HtmlId(const char *s)     { return Attr("ID", s); }
+HtmlTag& HtmlTag::Lang(const char *s)       { return Attr("LANG", s); }
+HtmlTag& HtmlTag::Language(const char *s)   { return Attr("LANGUAGE", s); }
+HtmlTag& HtmlTag::JavaScript()              { return Language("JAVASCRIPT"); }
+HtmlTag& HtmlTag::VbScript()                { return Language("VBSCRIPT"); }
+HtmlTag& HtmlTag::Methods(const char *s)    { return Attr("METHODS", s); }
+HtmlTag& HtmlTag::Rel(const char *s)        { return Attr("REL", s); }
+HtmlTag& HtmlTag::Rev(const char *s)        { return Attr("REV", s); }
+HtmlTag& HtmlTag::Style(const char *s)      { return Attr("STYLE", s); }
+HtmlTag& HtmlTag::TabIndex(int i)           { return Attr("TABINDEX", i); }
+HtmlTag& HtmlTag::Target(const char *s)     { return Attr("TARGET", s); }
+HtmlTag& HtmlTag::TargetBlank()             { return Target("_blank"); }
+HtmlTag& HtmlTag::TargetParent()            { return Target("_parent"); }
+HtmlTag& HtmlTag::TargetSelf()              { return Target("_self"); }
+HtmlTag& HtmlTag::TargetTop()               { return Target("_top"); }
+HtmlTag& HtmlTag::Title(const char *s)      { return Attr("TITLE", s); }
+HtmlTag& HtmlTag::Urn(const char *s)        { return Attr("URN", s); }
+HtmlTag& HtmlTag::Alt(const char *s)        { return Attr("ALT", s); }
+HtmlTag& HtmlTag::Coords(const char *s)     { return Attr("COORDS", s); }
+HtmlTag& HtmlTag::NoHref()                  { return Attr("NOHREF"); }
+HtmlTag& HtmlTag::Shape(const char *s)      { return Attr("SHAPE", s); }
+HtmlTag& HtmlTag::ShapeCirc()               { return Shape("CIRC"); }
+HtmlTag& HtmlTag::ShapePoly()               { return Shape("POLY"); }
+HtmlTag& HtmlTag::ShapeRect()               { return Shape("RECT"); }
+HtmlTag& HtmlTag::Balance(double v)         { return Attr("BALANCE", v); }
+HtmlTag& HtmlTag::Loop(int i)               { return Attr("LOOP", i); }
+HtmlTag& HtmlTag::Volume(double v)          { return Attr("VOLUME", v); }
+HtmlTag& HtmlTag::Src(const char *s)        { return Attr("SRC", s); }
+HtmlTag& HtmlTag::Alink(class Color c)      { return Color("ALINK", c); }
+HtmlTag& HtmlTag::Vlink(class Color c)      { return Color("VLINK", c); }
+HtmlTag& HtmlTag::Link(class Color c)       { return Color("LINK", c); }
+HtmlTag& HtmlTag::Background(const char *s) { return Attr("BACKGROUND", s); }
+HtmlTag& HtmlTag::OnClick(const char *s)    { return Atth("onClick", s); }
+
+Htmls HtmlTag::GetTag() const {
+	return tag.IsEmpty() ? (String&)tag : tag + '>';
+}
+
+Htmls HtmlTag::GetEndTag() const {
+	return end;
+}
+
+void  HtmlTag::Combine(const HtmlTag& tag2)
+{
+	if(tag2.IsEmpty()) return;
+	if(tag.GetLength()) {
+		tag = tag + '>' + tag2.tag;
+		end = tag2.end + end;
+	}
+	else {
+		tag = tag2.tag;
+		end = tag2.end;
+	}
+}
+
+Htmls HtmlTag::ApplyTo(String s) const
+{
+	Htmls h;
+	h.Cat(GetTag());
+	h.Cat(s);
+	h.Cat(GetEndTag());
+	return h;
+}
+
+Htmls HtmlTag::ApplyTo(const char *s) const
+{
+	Htmls h;
+	h.Cat(GetTag());
+	h.Cat(s);
+	h.Cat(GetEndTag());
+	return h;
+}
+
+HtmlTag& HtmlTag::SingleTag(const char *s)
+{
+	tag = "<";
+	tag.Cat(s);
+	return *this;
+}
+
+HtmlTag& HtmlTag::PairTag(const char *s)
+{
+	SingleTag(s);
+	end = "</";
+	end.Cat(s);
+	end.Cat('>');
+	end.Cat('\n');
+	return *this;
+}
+
+HtmlTag::HtmlTag(const char *tag) {
+	PairTag(tag);
+}
+
+HtmlTag HtmlSingleTag(const char *tag) {
+	return HtmlTag().SingleTag(tag);
+}
+
+HtmlTag HtmlInput(const char *type, const char *name)
+{
+	HtmlTag tag = HtmlSingleTag("INPUT").Type(type);
+	if(name && *name)
+		tag.Name(name);
+	return tag;
+}
+
+HtmlTag HtmlEdit(String name)
+{
+	return HtmlInput("TEXT", name);
+}
+
+HtmlTag HtmlEdit(String name, int size, int maxlength, const char *defaultValue, bool password)
+{
+	HtmlTag tag = HtmlInput(password ? "PASSWORD" : "TEXT", name)
+		.Size(size).Attr("MAXLENGTH", maxlength);
+	if(defaultValue && *defaultValue)
+		tag.Data(defaultValue);
+	return tag;
+}
+
+HtmlTag HtmlHidden(String name, Value val) {
+	return HtmlInput("HIDDEN").Name(name).Data(val);
+}
+
+HtmlTag HtmlHidden(const char *name, Value val) {
+	return HtmlInput("HIDDEN").Name(name).Data(val);
+}
+
+HtmlTag HtmlHidden(Value val) {
+	return HtmlHidden("STATE", val);
+}
+
+HtmlTag HtmlSubmit(const char *s) {
+	return HtmlInput("SUBMIT").Data(s);
+}
+
+HtmlTag HtmlSelect(String name) {
+	return HtmlTag("SELECT").Name(name);
+}
+
+Htmls HtmlOption(const Value& val, const char *text, bool selected)
+{
+	HtmlTag option("OPTION");
+	option.Data(val);
+	if(selected)
+		option.Selected();
+	return option / text;
+}
+
+HtmlTag HtmlTable() {
+	return HtmlTag("TABLE");
+}
+
+HtmlTag HtmlRow() {
+	return HtmlTag("TR");
+}
+
+HtmlTag HtmlCell() {
+	return HtmlTag("TD");
+}
+
+/*
+HtmlTag HtmlFont(Font font) {
+	HtmlTag tag;
+	if(font.IsBold())
+		tag /= HtmlTag("B");
+	if(font.IsItalic())
+		tag /= HtmlTag("I");
+	if(font.IsUnderline())
+		tag /= HtmlTag("U");
+	if(font.IsStrikeout())
+		tag /= HtmlTag("S");
+	HtmlTag fnt("FONT");
+	fnt.Face(FontFaceToHtml(font));
+	fnt.Size(FontSizeToHtml(font));
+	return tag / fnt;
+}
+*/
+
+HtmlTag HtmlLink(const char *link)
+{
+	return HtmlTag("A").Href(link);
+}
+
+Htmls HtmlBlock(Htmls html, double width, double left, double top, double right, double bottom,
+				Alignment align)
+{
+	Htmls h;
+	if(top)
+		h = HtmlRow() / HtmlCell().Height(top) / "";
+	if(left || right || align != ALIGN_LEFT)
+		h += HtmlRow() / (
+				HtmlCell().Width(left) +
+				HtmlCell().Align(align).Width(width) / html +
+				HtmlCell().Width(right)
+			 );
+	if(bottom)
+		h += HtmlRow() / HtmlCell().Height(bottom) / "";
+	return h.GetLength() ? HtmlTable().Border(0).Width(-100).CellSpacing(0).CellPadding(0) / h
+		                 : html;
+}
+
+HtmlTag HtmlHeader(const char *title, String css, const char *other)
+{
+	String h =
+		"HTML>\r\n"
+	    "<HEAD>\t\n"
+	    "<META HTTP-EQUIV=\"Content-Type\" CONTENT=\"text/html; charset=utf-8\">\t\n"
+	    "<META NAME=\"Generator\" CONTENT=\"U++ HTML Package\">\t\n"
+	    "<TITLE>" + String(title) + "</TITLE>\r\n"
+	;
+	if(!IsNull(css))
+		h << "<STYLE TYPE=\"text/css\"><!--\r\n"
+		  << css << "\r\n-->\r\n</STYLE>\r\n";
+	if(other)
+		h << other;
+	h << "</HEAD";
+	return HtmlSingleTag(h) / HtmlTag("BODY");
+}
+
+Htmls operator+(const HtmlTag& tag1, const HtmlTag& tag2)
+{
+	Htmls h;
+	h.Cat(tag1);
+	h.Cat(tag2);
+	return h;
+}
+
+Htmls operator+(const String& s, const HtmlTag& tag)
+{
+	Htmls h;
+	h.Cat(s);
+	h.Cat(tag);
+	return h;
+}
+
+Htmls operator+(const HtmlTag& tag, const String& s)
+{
+	Htmls h;
+	h.Cat(tag);
+	h.Cat(s);
+	return h;
+}
+
+Htmls operator+(const char *s, const HtmlTag& tag) {
+	Htmls h;
+	h.Cat(s);
+	h.Cat(tag);
+	return h;
+}
+
+Htmls operator+(const HtmlTag& tag, const char *s)
+{
+	Htmls h;
+	h.Cat(tag);
+	h.Cat(s);
+	return h;
+}
+
+HtmlTag operator/(const HtmlTag& t1, const HtmlTag& t2)
+{
+	HtmlTag t = t1;
+	t.Combine(t2);
+	return t;
+}
+
+HtmlTag& operator/=(HtmlTag& tag, const HtmlTag& s)
+{
+	tag.Combine(s);
+	return tag;
+}
+
+HtmlTag operator % (const HtmlTag& t1, const HtmlTag& t2)
+{
+	if(t1.Tag().IsEmpty())
+		return t2;
+	else if(t2.Tag().IsEmpty())
+		return t1;
+	else
+	{
+		HtmlTag t;
+		t.Tag() = t1.Tag() + ">\n" + t2.Tag();
+		t.End() = t2.End() + "\n" + t1.End();
+		return t;
+	}
+}
+
+Htmls operator % (const HtmlTag& tag, const char *s)
+{
+	Htmls h;
+	h.Cat(tag.GetTag());
+	h.Lf();
+	h.Cat(s);
+	h.Lf();
+	h.Cat(tag.GetEndTag());
+//	h.Lf();
+	return h;
+}
+
+HtmlTag HtmlFontColor(Color c)   { return !IsNull(c) ? HtmlTag("FONT").Color(c) : HtmlTag(); }
+HtmlTag HtmlFontSize(int s)      { return HtmlTag("FONT").Attr("SIZE", s); }
+
+HtmlTag HtmlLink(const char *link, const char *target)
+{
+	HtmlTag tag("A");
+	tag.Href(link);
+	if(target && *target)
+		tag.Target(target);
+	return tag;
+}
+
+HtmlTag HtmlImg(String src, String alt)
+{
+	return HtmlSingleTag("IMG").Src(src).Alt(alt);
+}
+
+Htmls HtmlTextArea(String name, Size size, const char *defaultValue)
+{
+	return HtmlTag("TEXTAREA").Name(name).Attr("ROWS", size.cy).Attr("COLS", size.cx)
+		.Attr("WRAP", "virtual")
+		/ ToHtml(defaultValue ? defaultValue : "");
+}
+
+HtmlTag HtmlButton(String name, const char *text)
+{
+	return HtmlInput("SUBMIT", name).Data(text);
+}
+
+HtmlTag HtmlWarn(Color color)
+{
+	return HtmlItalic() / HtmlFontColor(color);
+}
+
+HtmlTag HtmlPackedTable()
+{
+	return HtmlTable().Border(0).CellSpacing(0).CellPadding(0);
+}
+
+HtmlTag HtmlForm(String action, bool multipart, String method)
+{
+	HtmlTag tag = HtmlTag("FORM").Attr("ACTION", action).Attr("METHOD", method);
+	if(multipart)
+		tag.Attr("ENCTYPE", "multipart/form-data");
+	return tag;
+}
+
+Htmls HtmlUpload(String name)
+{
+	return HtmlInput("FILE", name);
+}
+
+Htmls HtmlCheck(String name, bool on)
+{
+	HtmlTag tag = HtmlInput("CHECKBOX", name).Data("1");
+	if(on)
+		tag.Attr("CHECKED");
+	return tag;
+}
+
+HtmlTag HtmlTCell()
+{
+	return HtmlCell().Top();
+}
+
+HtmlTag HtmlRowCell()
+{
+	return HtmlRow() % HtmlCell();
+}
+
+HtmlTag HtmlRowTCell()
+{
+	return HtmlRow() % HtmlTCell();
+}
+
+Htmls HtmlMenu(bool active, const char *text, const char *url, int wd)
+{
+	HtmlTag table = HtmlTable().CellSpacing(0).Border(2)
+		.BorderColor(Black).BgColor(active ? Yellow : WhiteGray);
+	if(wd)
+		table.Width(wd);
+	return table % HtmlRow() % HtmlCell().Center()
+		/ HtmlLink(url) / HtmlFontColor(Black) / (active ? HtmlBold() / text : Htmls(text));
+}
+
+HtmlTag HtmlDialog(int width)
+{
+	return HtmlTable().Width(width).CellSpacing(0).CellPadding(1).Border(1).BgColor(WhiteGray)
+		% HtmlRow() % HtmlCell()
+		% HtmlTable().Width(-100).CellSpacing(4).CellPadding(0).Border(0).BgColor(WhiteGray);
+}
+
+Htmls HtmlHead(String title, const char *charset)
+{
+	Htmls head;
+	head << HtmlTag("TITLE") / title << '\n'
+		<< HtmlSingleTag("META")
+			.Attr("HTTP-EQUIV", "Content-Type")
+			.Attr("CONTENT", String("text/html; charset=") + charset);
+	return HtmlTag("HEAD") % head + "\n\n";
+}
+
+Htmls HtmlPage(String title, const Htmls& body, Color bgcolor, const char *charset)
+{
+	return HtmlTag("HTML") % (HtmlHead(title, charset) + HtmlTag("BODY").BgColor(bgcolor) % body);
+}
+
+Htmls HtmlTitlePage(String title, const Htmls& body, Color bgcolor, const char *charset)
+{
+	return HtmlPage(title, HtmlTag("H1") / title + "\n\n" + body, bgcolor);
+}
+
+HtmlTag HtmlLine()
+{
+	return HtmlRow() / HtmlCell();
+}
+
+HtmlTag HtmlPara()
+{
+	return HtmlTag("p");
+}
+
+HtmlTag HtmlCourier(int size)
+{
+	return HtmlTag("span")
+	       .Attr("style", Sprintf("font-size: %dpt; font-family: monospace;", size));
+}
+
+HtmlTag HtmlArial(int size)
+{
+	return HtmlTag("span")
+	       .Attr("style", Sprintf("font-size: %dpt; font-family: sans-serif;", size));
+}
+
+HtmlTag HtmlRoman(int size)
+{
+	return HtmlTag("span")
+	       .Attr("style", Sprintf("font-size: %dpt; font-family: serif;", size));
+}
+
+HtmlTag HtmlCourier()
+{
+	return HtmlTag("span").Attr("style", "font-family: monospace;");
+}
+
+HtmlTag HtmlArial()
+{
+	return HtmlTag("span").Attr("style", "font-family: sans-serif;");
+}
+
+HtmlTag HtmlRoman()
+{
+	return HtmlTag("span").Attr("style", "font-family: serif;");
+}
+
+HtmlTag HtmlFntSize(int size)
+{
+	return HtmlTag("span").Attr("style", Sprintf("font-size: %dpt", size));
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/Web/html.h b/uppsrc/Web/html.h
new file mode 100644
index 000000000..efe22904c
--- /dev/null
+++ b/uppsrc/Web/html.h
@@ -0,0 +1,294 @@
+#ifndef __tinet_html__
+#define __tinet_html__
+
+//#define HtmlTag TInetHtmlTag
+//#define Htmls   TInetHtmls
+//#define ToHtml  TInetToHtml
+
+String      ToHtml(const char *s);
+
+class HtmlTag;
+
+class Htmls : public String, Moveable<Htmls> {
+public:
+	bool   IsNullInstance() const { return IsEmpty(); }
+
+	Htmls& Text(const char *s);
+	Htmls& Quote(const char *text);
+
+	Htmls& Color(class Color color);
+	Htmls& Percent(double d);
+
+	Htmls& Color(const char *name, class Color color);
+	Htmls& Percent(const char *name, double d);
+
+	Htmls& Attr(const char *attr);
+	Htmls& Attr(const char *attr, const char *s);
+	Htmls& Attr(const char *attr, String s);
+	Htmls& Attr(const char *attr, int i);
+	Htmls& Attr(const char *attr, double d);
+	Htmls& Attr(const char *attr, Date date);
+	Htmls& Attr(const char *attr, Value v);
+
+	Htmls& Attp(const char *attr, double val_or_percent);
+	Htmls& Atth(const char *attr, const char *href);
+
+	Htmls& Tag(const char *tag);
+	Htmls& Gat();
+
+	Htmls& Cat(const HtmlTag& tag);
+	Htmls& Cat(String s)              { String::Cat(s); return *this; }
+	Htmls& Cat(const char *s)         { String::Cat(s); return *this; }
+	Htmls& Cat(char c)                { String::Cat(c); return *this; }
+	Htmls& Cat(const char *s, int n)  { String::Cat(s, n); return *this; }
+
+	Htmls& Nbsp();
+	Htmls& Br();
+	Htmls& Hr();
+	Htmls& Lf();
+
+	Htmls(const char *s) : String(s) {}
+	Htmls(const String& s) : String(s) {}
+	Htmls() {}
+	Htmls(const Nuller&) {}
+};
+
+class HtmlTag : Moveable<HtmlTag> {
+protected:
+	Htmls  tag;
+	String end;
+
+public:
+	HtmlTag&      Text(const char *s)                        { tag.Text(s); return *this; }
+	HtmlTag&      Quote(const char *s)                       { tag.Quote(s); return *this; }
+
+	HtmlTag&      Percent(double d)                          { tag.Percent(d); return *this; }
+
+	HtmlTag&      Color(const char *name, class Color color) { tag.Color(name, color); return *this; }
+	HtmlTag&      Percent(const char *name, double d)        { tag.Percent(name, d); return *this; }
+
+	HtmlTag&      Attr(const char *attr)                     { tag.Attr(attr); return *this; }
+	HtmlTag&      Attr(const char *attr, const char *v)      { tag.Attr(attr, v); return *this; }
+	HtmlTag&      Attr(const char *attr, String v)           { tag.Attr(attr, v); return *this; }
+	HtmlTag&      Attr(const char *attr, int v)              { tag.Attr(attr, v); return *this; }
+	HtmlTag&      Attr(const char *attr, double v)           { tag.Attr(attr, v); return *this; }
+	HtmlTag&      Attr(const char *attr, Date v)             { tag.Attr(attr, v); return *this; }
+	HtmlTag&      Attr(const char *attr, const Value& v)     { tag.Attr(attr, v); return *this; }
+
+	HtmlTag&      Attp(const char *attr, double vp)          { tag.Attp(attr, vp); return *this; }
+	HtmlTag&      Atth(const char *attr, const char *href)   { tag.Atth(attr, href); return *this; }
+
+	HtmlTag&      Type(const char *s);
+
+	HtmlTag&      Name(const char *s);
+	HtmlTag&      Name(String id);
+
+	HtmlTag&      Data(const char *v);
+	HtmlTag&      Data(String v);
+	HtmlTag&      Data(double d);
+	HtmlTag&      Data(Value v);
+
+	HtmlTag&      ReadOnly();
+	HtmlTag&      Multiple();
+	HtmlTag&      Selected();
+
+	HtmlTag&      Align(Alignment align);
+	HtmlTag&      Left();
+	HtmlTag&      Right();
+	HtmlTag&      Center();
+
+	HtmlTag&      VAlign(Alignment align);
+	HtmlTag&      Top();
+	HtmlTag&      VCenter();
+	HtmlTag&      Bottom();
+
+	HtmlTag&      HotKey(char c);
+
+	HtmlTag&      Size(int c);
+	HtmlTag&      Size(int cx, int cy);
+
+	HtmlTag&      Color(class Color color);
+	HtmlTag&      BorderColor(class Color color);
+	HtmlTag&      BgColor(class Color color);
+
+	HtmlTag&      Face(const char *s);
+	HtmlTag&      Border(int i);
+	HtmlTag&      CellSpacing(int i);
+	HtmlTag&      CellPadding(int i);
+
+	HtmlTag&      Width(double d);
+	HtmlTag&      Height(double d);
+
+	HtmlTag&      RowSpan(int i);
+	HtmlTag&      ColSpan(int i);
+
+	HtmlTag&      Class(const char *s);
+	HtmlTag&      DataFld(const char *s);
+	HtmlTag&      DataSrc(const char *s);
+	HtmlTag&      Href(const char *s);
+	HtmlTag&      HtmlId(const char *s);
+	HtmlTag&      Lang(const char *s);
+	HtmlTag&      Language(const char *s);
+	HtmlTag&      JavaScript();
+	HtmlTag&      VbScript();
+	HtmlTag&      Methods(const char *s);
+	HtmlTag&      Rel(const char *s);
+	HtmlTag&      Rev(const char *s);
+	HtmlTag&      Style(const char *s);
+	HtmlTag&      TabIndex(int i);
+	HtmlTag&      Target(const char *s);
+	HtmlTag&      TargetBlank();
+	HtmlTag&      TargetParent();
+	HtmlTag&      TargetSelf();
+	HtmlTag&      TargetTop();
+	HtmlTag&      Title(const char *s);
+	HtmlTag&      Urn(const char *s);
+	HtmlTag&      Alt(const char *s);
+	HtmlTag&      Coords(const char *s);
+	HtmlTag&      NoHref();
+	HtmlTag&      Shape(const char *s);
+	HtmlTag&      ShapeCirc();
+	HtmlTag&      ShapePoly();
+	HtmlTag&      ShapeRect();
+	HtmlTag&      Balance(double v);
+	HtmlTag&      Loop(int i);
+	HtmlTag&      Volume(double v);
+	HtmlTag&      Src(const char *s);
+	HtmlTag&      Alink(class Color c);
+	HtmlTag&      Vlink(class Color c);
+	HtmlTag&      Link(class Color c);
+	HtmlTag&      Background(const char *s);
+
+	HtmlTag&      OnClick(const char *js);
+
+	Htmls         GetTag() const;
+	Htmls         GetEndTag() const;
+
+	void          Combine(const HtmlTag& tag);
+
+	Htmls         ApplyTo(String s) const;
+	Htmls         ApplyTo(const char *s) const;
+
+	HtmlTag&      PairTag(const char *s);
+	HtmlTag&      SingleTag(const char *s);
+
+	HtmlTag       operator()() const                         { return *this; }
+	Htmls         operator~() const                          { return ApplyTo(Null); }
+	operator      Htmls() const                              { return ApplyTo(Null); }
+	String        ToString() const                           { return ApplyTo(Null); }
+
+	const Htmls&  Tag() const                                { return tag; }
+	Htmls&        Tag()                                      { return tag; }
+
+	const String& End() const                                { return end; }
+	String&       End()                                      { return end; }
+
+	bool          IsEmpty() const                            { return tag.IsEmpty(); }
+
+	HtmlTag(const char *s);
+	HtmlTag() {}
+};
+
+HtmlTag HtmlSingleTag(const char *s);
+HtmlTag HtmlInput(const char *type, const char *name = 0);
+HtmlTag HtmlEdit(String name);
+HtmlTag HtmlEdit(String name, int size, int maxlength = 256,
+                 const char *defaultValue = 0, bool password = false);
+
+HtmlTag HtmlHidden(String name, Value val);
+HtmlTag HtmlHidden(const char *name, Value val);
+HtmlTag HtmlHidden(Value val);
+
+HtmlTag HtmlSubmit(const char *text);
+
+HtmlTag HtmlSelect(String name);
+Htmls   HtmlOption(Value val, const char *text, bool selected = false);
+
+HtmlTag HtmlTable();
+HtmlTag HtmlRow();
+HtmlTag HtmlCell();
+
+HtmlTag HtmlHeader(const char *title, String css = Null, const char *other = NULL);
+
+//HtmlTag HtmlFont(Font font);
+
+HtmlTag HtmlLink(const char *link);
+
+Htmls   HtmlBlock(Htmls html, double width,
+				              double left, double top = 0, double right = 0, double bottom = 0,
+				              Alignment align = ALIGN_LEFT);
+
+inline Htmls& operator<<(Htmls& s, const HtmlTag& tag) { s.Cat(tag); return s; }
+inline Htmls& operator<<(Htmls& s, const Htmls& v)     { s.Cat(v); return s; }
+inline Htmls& operator<<(Htmls& s, String v)           { s.Cat(v); return s; }
+inline Htmls& operator<<(Htmls& s, const char *v)      { s.Cat(v); return s; }
+
+inline Htmls& operator+=(Htmls& s, const HtmlTag& tag) { s.Cat(tag); return s; }
+
+Htmls operator+(const HtmlTag& tag1, const HtmlTag& tag2);
+Htmls operator+(const String& s, const HtmlTag& tag);
+Htmls operator+(const HtmlTag& tag, const String& s);
+Htmls operator+(const char *s, const HtmlTag& tag);
+Htmls operator+(const HtmlTag& tag, const char *s);
+
+HtmlTag operator/(const HtmlTag& t1, const HtmlTag& t2);
+HtmlTag& operator/=(HtmlTag& tag, const HtmlTag& s);
+
+inline Htmls operator/(const HtmlTag& tag, String s)         { return tag.ApplyTo(s); }
+inline Htmls operator/(const HtmlTag& tag, const char *s)    { return tag.ApplyTo(s); }
+
+//////////////////////////////////////////////////////////////////////
+// from htmlutil
+
+HtmlTag        operator % (const HtmlTag& t1, const HtmlTag& t2);
+Htmls          operator % (const HtmlTag& tag, const char *s);
+inline Htmls   operator % (const HtmlTag& tag, String s)     { return tag % ~s; }
+
+//////////////////////////////////////////////////////////////////////
+
+inline HtmlTag HtmlBold()    { return HtmlTag("B"); }
+inline HtmlTag HtmlItalic()  { return HtmlTag("I"); }
+inline HtmlTag HtmlBig()     { return HtmlTag("BIG"); }
+
+//////////////////////////////////////////////////////////////////////
+
+HtmlTag        HtmlFontColor(Color c);
+HtmlTag        HtmlFontSize(int s);
+
+//////////////////////////////////////////////////////////////////////
+
+inline Htmls   ToHtml(String s)   { return ToHtml(~s); }
+HtmlTag        HtmlLink(const char *link, const char *target);
+HtmlTag        HtmlImg(String src, String alt = "");
+
+Htmls          HtmlTextArea(String id, Size size, const char *defaultValue = 0);
+
+HtmlTag        HtmlButton(String id, const char *text);
+HtmlTag        HtmlWarn(Color color = LtRed);
+HtmlTag        HtmlPackedTable();
+HtmlTag        HtmlForm(String action, bool multipart = false, String method = "POST");
+
+Htmls          HtmlCheck(String name, bool on);
+Htmls          HtmlUpload(String name);
+
+HtmlTag        HtmlTCell();
+HtmlTag        HtmlRowCell();
+HtmlTag        HtmlRowTCell();
+
+Htmls          HtmlMenu(bool active, const char *text, const char *url, int wd = 0);
+HtmlTag        HtmlDialog(int width = -100);
+Htmls          HtmlHead(String title, const char *charset = "windows-1250");
+Htmls          HtmlPage(String title, const Htmls& body, Color bgcolor = White, const char *charset = "windows-1250");
+Htmls          HtmlTitlePage(String title, const Htmls& body, Color bgcolor = White, const char *charset = "windows-1250");
+
+HtmlTag HtmlLine();
+HtmlTag HtmlPara();
+HtmlTag HtmlCourier(int size);
+HtmlTag HtmlArial(int size);
+HtmlTag HtmlRoman(int size);
+HtmlTag HtmlCourier();
+HtmlTag HtmlArial();
+HtmlTag HtmlRoman();
+HtmlTag HtmlFntSize(int size);
+
+#endif//__tinet_html__
diff --git a/uppsrc/Web/httpcli.cpp b/uppsrc/Web/httpcli.cpp
new file mode 100644
index 000000000..6b533bb9c
--- /dev/null
+++ b/uppsrc/Web/httpcli.cpp
@@ -0,0 +1,423 @@
+#include "Web.h"
+
+NAMESPACE_UPP
+
+#define LLOG(x)       RLOG(x)
+#define LLOGBLOCK(x)  // RLOGBLOCK(x)
+#define LDUMP(x)      // RDUMP(x)
+
+HttpClient::HttpClient()
+{
+	port = DEFAULT_PORT;
+	timeout_msecs = DEFAULT_TIMEOUT_MSECS;
+	max_header_size = DEFAULT_MAX_HEADER_SIZE;
+	max_content_size = DEFAULT_MAX_CONTENT_SIZE;
+	keepalive = false;
+	std_headers = true;
+	method = METHOD_GET;
+}
+
+HttpClient& HttpClient::URL(const char *u)
+{
+	const char *t = u;
+	while(*t && *t != '?')
+		if(*t++ == '/' && *t == '/') {
+			u = ++t;
+			break;
+		}
+	t = u;
+	while(*u && *u != ':' && *u != '/' && *u != '?')
+		u++;
+	host = String(t, u);
+	port = DEFAULT_PORT;
+	if(*u == ':')
+		port = ScanInt(u + 1, &u);
+	path = u;
+	return *this;
+}
+
+HttpClient& HttpClient::Proxy(const char *p)
+{
+	const char *t = p;
+	while(*p && *p != ':')
+		p++;
+	proxy_host = String(t, p);
+	proxy_port = 80;
+	if(*p++ == ':' && IsDigit(*p))
+		proxy_port = ScanInt(p);
+	return *this;
+}
+
+String HttpClient::ExecuteRedirect(int max_redirect, int retries, Gate2<int, int> progress)
+{
+	int nredir = 0;
+	for(;;) {
+		if(progress(0, 0)) {
+			aborted = true;
+			return String::GetVoid();
+		}
+		String data = Execute(progress);
+		if(status_code >= 400 && status_code < 500) {
+			error = status_line;
+			return String::GetVoid();
+		}
+		int r = 0;
+		while(data.IsVoid()) {
+			if(progress(0, 0)) {
+				aborted = true;
+				return String::GetVoid();
+			}
+			if(++r >= retries)
+				return String::GetVoid();
+			data = Execute(progress);
+		}
+		if(!IsRedirect())
+			return data;
+		if(++nredir > max_redirect) {
+			error = NFormat("Maximum number of redirections exceeded: %d", max_redirect);
+			return String::GetVoid();
+		}
+		URL(GetRedirectURL());
+	}
+}
+
+String HttpClient::ReadUntilProgress(char until, int start_time, int end_time, Gate2<int, int> progress)
+{
+	String out;
+	while(!socket.IsEof() && !socket.IsError()) {
+		out.Cat(socket.Read(1000, 1000));
+		int f = out.Find('\n');
+		if(f >= 0) {
+			socket.UnRead(out.Mid(f + 1));
+			out.Trim(f);
+			return out;
+		}
+		int t = msecs();
+		if(t >= end_time) {
+			socket.SetErrorText(NFormat(t_("%s:%d receiving headers timed out"), host, port));
+			break;
+		}
+		if(progress(msecs(start_time), end_time - start_time)) {
+			aborted = true;
+			break;
+		}
+	}
+	return String::GetVoid();
+}
+
+String HttpClient::Execute(Gate2<int, int> progress)
+{
+	LLOGBLOCK("HttpClient::Execute");
+	int start_time = msecs();
+	int end_time = start_time + timeout_msecs;
+	aborted = false;
+	server_headers = Null;
+	status_line = Null;
+	status_code = 0;
+	is_redirect = false;
+	redirect_url = Null;
+	if(socket.IsOpen() && IsError())
+		Close();
+	error = Null;
+	bool use_proxy = !IsNull(proxy_host);
+	String sock_host = (use_proxy ? proxy_host : host);
+	int sock_port = (use_proxy ? proxy_port : port);
+
+	LLOG("socket host = " << sock_host << ":" << sock_port);
+	if(!socket.IsOpen() && !ClientSocket(socket, sock_host, sock_port, true, NULL, 0, false)) {
+		error = Socket::GetErrorText();
+		return String::GetVoid();
+	}
+	while(!socket.PeekWrite(1000)) {
+		int time = msecs();
+		if(time >= end_time) {
+			error = NFormat(t_("%s:%d: connecting to host timed out"), sock_host, sock_port);
+			return String::GetVoid();
+		}
+		if(progress(time - start_time, end_time - start_time)) {
+			aborted = true;
+			return String::GetVoid();
+		}
+	}
+	String request;
+	switch(method) {
+		case METHOD_GET:  request << "GET "; break;
+		case METHOD_POST: request << "POST "; break;
+        case METHOD_HEAD: request << "HEAD "; break;
+		default: NEVER(); // invalid method
+	}
+	String host_port = host;
+	if(port != DEFAULT_PORT)
+		host_port << ':' << port;
+	String url;
+	url << "http://" << host_port << Nvl(path, "/");
+	if(use_proxy)
+		request << url;
+	else
+		request << Nvl(path, "/");
+	request << " HTTP/1.1\r\n";
+	if(std_headers) {
+		request
+			<< "URL: " << url << "\r\n"
+			<< "Host: " << host_port << "\r\n"
+			<< "Connection: " << (keepalive ? "keep-alive" : "close") << "\r\n";
+		if(keepalive)
+			request << "Keep-alive: 300\r\n"; // 5 minutes (?)
+		request << "Accept: " << Nvl(accept, "*/*") << "\r\n";
+		request << "Accept-Encoding: gzip\r\n";
+		request << "Agent: " << Nvl(agent, "Ultimate++ HTTP client") << "\r\n";
+		if(method == METHOD_POST)
+			request << "Content-Length: " << postdata.GetLength() << "\r\n";
+	}
+	if(use_proxy && !IsNull(proxy_username))
+		 request << "Proxy-Authorization: basic " << Base64Encode(proxy_username + ':' + proxy_password) << "\r\n";
+	if(!IsNull(username) || !IsNull(password))
+		request << "Authorization: basic " << Base64Encode(username + ":" + password) << "\r\n";
+	request << client_headers << "\r\n" << postdata;
+	LLOG("host = " << host << ", port = " << port);
+	LLOG("request: " << request);
+	int written = 0;
+	while(msecs() < end_time) {
+		int nwrite = socket.WriteWait(request.GetIter(written), request.GetLength() - written, 1000);
+		if(socket.IsError()) {
+			error = Socket::GetErrorText();
+			return String::GetVoid();
+		}
+		if((written += nwrite) >= request.GetLength())
+			break;
+		if(progress(written, request.GetLength())) {
+			aborted = true;
+			return String::GetVoid();
+		}
+	}
+	if(written < request.GetLength()) {
+		error = NFormat(t_("%s:%d: timed out sending request to server"), host, port);
+		return String::GetVoid();
+	}
+	status_line = ReadUntilProgress('\n', start_time, end_time, progress);
+	if(socket.IsError()) {
+		error = Socket::GetErrorText();
+		return String::GetVoid();
+	}
+	if(status_line.GetLength() < 5 || MemICmp(status_line, "HTTP/", 5)) {
+		error = NFormat(t_("%s:%d: invalid server response: %s"), host, port, status_line);
+		return String::GetVoid();
+	}
+
+	status_code = 0;
+	const char *p = status_line.Begin() + 5;
+	while(*p && *p != ' ')
+		p++;
+	if(*p == ' ' && IsDigit(*++p))
+		status_code = stou(p);
+	is_redirect = (status_code >= 300 && status_code < 400);
+
+	int content_length = -1;
+	bool tc_chunked = false;
+	bool ce_gzip = false;
+	for(;;) {
+		String line = ReadUntilProgress('\n', start_time, end_time, progress);
+		if(socket.IsError()) {
+			error = Socket::GetErrorText();
+			return String::GetVoid();
+		}
+
+		for(p = line; *p && (byte)*p <= ' '; p++)
+			;
+		const char *b = p, *e = line.End();
+		while(e > b && (byte)e[-1] < ' ')
+			e--;
+		if(b >= e)
+			break;
+		static const char cl[] = "content-length:";
+		static const char ce[] = "content-encoding:";
+		static const char te[] = "transfer-encoding:";
+		static const char lo[] = "location:";
+		static const int CL_LENGTH = sizeof(cl) - 1;
+		static const int CE_LENGTH = sizeof(ce) - 1;
+		static const int TE_LENGTH = sizeof(te) - 1;
+		static const int LO_LENGTH = sizeof(lo) - 1;
+		if(!MemICmp(p, cl, CL_LENGTH)) {
+			for(p += CL_LENGTH; *p == ' '; p++)
+				;
+			if(IsDigit(*p)) {
+				content_length = minmax<int>(stou(p), 0, max_content_size);
+				if(content_length > max_content_size) {
+					error = NFormat(t_("%s:%d: maximum data length exceeded (%d B)"), host, port, max_content_size);
+					return String::GetVoid();
+				}
+			}
+		}
+		else if(!MemICmp(p, ce, CE_LENGTH)) {
+			for(p += CE_LENGTH; *p == ' '; p++)
+				;
+			static const char gzip[] = "gzip";
+			if(e - p == sizeof(gzip) - 1 && !memcmp(p, gzip, sizeof(gzip) - 1))
+				ce_gzip = true;
+		}
+		else if(!MemICmp(p, te, TE_LENGTH)) {
+			for(p += TE_LENGTH; *p == ' '; p++)
+				;
+			static const char ch[] = "chunked";
+			if(e - p == sizeof(ch) - 1 && !memcmp(p, ch, sizeof(ch) - 1))
+				tc_chunked = true;
+		}
+		else if(!MemICmp(p, lo, LO_LENGTH)) {
+			for(p += LO_LENGTH; *p == ' '; p++)
+				;
+			redirect_url = String(p, e);
+			int q = redirect_url.Find('?');
+			int p = path.Find('?');
+			if(p >= 0 && q < 0)
+				redirect_url.Cat(path.GetIter(p));
+		}
+		if(server_headers.GetLength() + (e - b) + 2 > max_header_size) {
+			error = NFormat(t_("%s:%d: maximum header length exceeded (%d B)"), host, port, max_header_size);
+			return String::GetVoid();
+		}
+		server_headers.Cat(b, int(e - b));
+		server_headers.Cat("\r\n");
+	}
+	if(method == METHOD_HEAD)
+		return String::GetVoid();
+	String chunked;
+	String body;
+	while(body.GetLength() < content_length || content_length < 0 || tc_chunked) {
+		if(msecs(end_time) >= 0) {
+			error = NFormat(t_("%s:%d: timed out when receiving server response"), host, port);
+			return String::GetVoid();
+		}
+		String part = socket.Read(1000);
+		if(!part.IsEmpty()) {
+			if(body.GetLength() + part.GetLength() > DEFAULT_MAX_CONTENT_SIZE) {
+				error = NFormat(t_("Maximum content size exceeded: %d"), body.GetLength() + part.GetLength());
+				return tc_chunked ? chunked : body;
+			}
+			body.Cat(part);
+			if(tc_chunked)
+				for(;;) {
+					const char *p = body.Begin(), *e = body.End();
+					while(p < e && *p != '\n')
+						p++;
+					if(p >= e)
+						break;
+					int nextline = int(p + 1 - body.Begin());
+					p = body.Begin();
+					int part_length = ctoi(*p);
+					if((unsigned)part_length >= 16) {
+						body.Remove(0, nextline);
+						continue;
+					}
+					for(int i; (unsigned)(i = ctoi(*++p)) < 16; part_length = part_length * 16 + i)
+						;
+					body.Remove(0, nextline);
+					if(part_length <= 0) {
+						p = body.Begin();
+						while(p < e - 2)
+							if(*p == '\n' && (p[1] == '\n' || p[1] == '\r' && p[2] == '\n'))
+								goto EXIT;
+							else
+								p++;
+						while(socket.IsOpen() && !socket.IsError() && !socket.IsEof()) {
+							if(msecs(end_time) >= 0) {
+								error = NFormat("Timeout reading footer block (%d B).", body.GetLength());
+								goto EXIT;
+							}
+							if(body.GetLength() > 3)
+								body.Remove(0, body.GetLength() - 3);
+							String part = socket.Read(1000);
+							body.Cat(part);
+							const char *p = body;
+							while(*p && !(*p == '\n' && (p[1] == '\n' || p[1] == '\r' && p[2] == '\n')))
+								p++;
+							if(*p)
+								goto EXIT;
+						}
+						break;
+					}
+					if(body.GetLength() >= part_length) {
+						chunked.Cat(body, part_length);
+						body.Remove(0, part_length);
+						continue;
+					}
+					for(;;) {
+						String part = socket.Read(-msecs(end_time));
+						if(part.IsEmpty()) {
+							error = NFormat("Timeout reading Transfer-encoding: chunked block (%d B).", part_length);
+							goto EXIT;
+						}
+						body.Cat(part);
+						if(body.GetLength() >= part_length) {
+							chunked.Cat(body, part_length);
+							body.Remove(0, part_length);
+							break;
+						}
+						if(progress(chunked.GetLength() + body.GetLength(), 0)) {
+							aborted = true;
+							return chunked;
+						}
+					}
+				}
+		}
+		if(!socket.IsOpen() || socket.IsError() || socket.IsEof()) {
+			if(socket.IsError())
+				error = Socket::GetErrorText();
+			else if(!tc_chunked && content_length > 0 && body.GetLength() < content_length)
+				error = NFormat(t_("Partial input: %d out of %d"), body.GetLength(), content_length);
+			break;
+		}
+		if(progress(chunked.GetLength() + body.GetLength(), max(content_length, 0))) {
+			aborted = true;
+			return tc_chunked ? chunked : body;
+		}
+	}
+
+EXIT:
+	if(!keepalive || socket.IsError() || socket.IsEof())
+		Close();
+
+	if(ce_gzip) {
+		body = GZDecompress(body);
+		return body;
+	}
+	return tc_chunked ? chunked : body;
+}
+
+String HttpClientGet(String url, String proxy, String username, String password,
+	String *server_headers, String *error, Gate2<int, int> progress,
+	int timeout, int num_redirect, int retries)
+{
+	HttpClient client;
+	String out = client
+		.URL(url)
+		.User(username, password)
+		.TimeoutMsecs(timeout)
+		.Proxy(proxy)
+		.ExecuteRedirect(num_redirect, progress, progress);
+	if(server_headers)
+		*server_headers = client.GetHeaders();
+	if(error)
+		*error = client.GetError();
+	return out;
+}
+
+String HttpClientGet(String url, String proxy, String *server_headers, String *error,
+	Gate2<int, int> progress, int timeout, int max_redirect, int retries)
+{
+	return HttpClientGet(url, proxy, Null, Null, server_headers, error, progress, timeout, max_redirect, retries);
+}
+
+String HttpClientGet(String url, String username, String password,
+	String *server_headers, String *error, Gate2<int, int> progress,
+	int timeout, int num_redirect, int retries)
+{
+	return HttpClientGet(url, Null, username, password, server_headers, error, progress, timeout, num_redirect, retries);
+}
+
+String HttpClientGet(String url, String *server_headers, String *error,
+	Gate2<int, int> progress, int timeout, int max_redirect, int retries)
+{
+	return HttpClientGet(url, Null, Null, Null, server_headers, error, progress, timeout, max_redirect, retries);
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/Web/httpcli.h b/uppsrc/Web/httpcli.h
new file mode 100644
index 000000000..02b83df58
--- /dev/null
+++ b/uppsrc/Web/httpcli.h
@@ -0,0 +1,128 @@
+#ifndef _Web_httpcli_h_
+#define _Web_httpcli_h_
+
+class HttpClient
+{
+public:
+	HttpClient();
+
+	HttpClient&  TimeoutMsecs(int t)              { timeout_msecs = t; return *this; }
+	HttpClient&  MaxHeaderSize(int m)             { max_header_size = m; return *this; }
+	HttpClient&  MaxContentSize(int m)            { max_content_size = m; return *this; }
+
+	HttpClient&  Host(String h)                   { host = h; return *this; }
+	HttpClient&  Port(int p)                      { port = p; return *this; }
+	HttpClient&  Path(String p)                   { path = p; return *this; }
+	HttpClient&  User(String u, String p)         { username = u; password = p; return *this; }
+	HttpClient&  URL(const char *url);
+	HttpClient&  KeepAlive(bool k)                { keepalive = k; return *this; }
+	HttpClient&  Proxy(String h, int p)           { proxy_host = h; proxy_port = p; return *this; }
+	HttpClient&  Proxy(const char *url);
+	HttpClient&  ProxyAuth(String u, String p)    { proxy_username = u; proxy_password = p; return *this; }
+
+	HttpClient&  Headers(String h)                { client_headers = h; return *this; }
+	HttpClient&  ClearHeaders()                   { return Headers(Null); }
+	HttpClient&  AddHeaders(String h)             { client_headers.Cat(h); return *this; }
+
+	HttpClient&  StdHeaders(bool sh)              { std_headers = sh; return *this; }
+	HttpClient&  NoStdHeaders()                   { return StdHeaders(false); }
+	HttpClient&  Accept(String a)                 { accept = a; return *this; }
+	HttpClient&  Agent(String a)                  { agent = a; return *this; }
+
+	HttpClient&  Method(int m)                    { method = m; return *this; }
+	HttpClient&  Get()                            { return Method(METHOD_GET); }
+	HttpClient&  Post()                           { return Method(METHOD_POST); }
+	HttpClient&  Head()                           { return Method(METHOD_HEAD); }
+
+	HttpClient&  PostData(String pd)              { postdata = pd; return *this; }
+
+	String       Execute(Gate2<int, int> progress = false);
+	String       ExecuteRedirect(int max_redirect = DEFAULT_MAX_REDIRECT,
+		int retries = DEFAULT_RETRIES, Gate2<int, int> progress = false);
+
+	bool         IsError() const                  { return !IsNull(error); }
+	String       GetError() const                 { return error; }
+	bool         IsAborted() const                { return aborted; }
+
+	int          GetStatusCode() const            { return status_code; }
+	String       GetStatusLine() const            { return status_line; }
+	String       GetHeaders() const               { return server_headers; }
+
+	bool         IsRedirect() const               { return is_redirect; }
+	String       GetRedirectURL() const           { return redirect_url; }
+
+	void         Close()                          { socket.Close(); }
+
+public:
+	Socket       socket;
+	bool         keepalive;
+	bool         aborted;
+	String       error;
+
+	int          timeout_msecs;
+	int          max_header_size;
+	int          max_content_size;
+
+	String       host;
+	int          port;
+	bool         is_post;
+	bool         std_headers;
+	int          method;
+	String       proxy_host;
+	int          proxy_port;
+	String       proxy_username;
+	String       proxy_password;
+	String       path;
+	String       username;
+	String       password;
+	String       client_headers;
+	String       accept;
+	String       agent;
+	String       postdata;
+
+	int          status_code;
+	String       status_line;
+	String       server_headers;
+
+	bool         is_redirect;
+	String       redirect_url;
+
+	enum {
+		DEFAULT_PORT             = 80,
+		DEFAULT_TIMEOUT_MSECS    = 120000,
+		DEFAULT_MAX_HEADER_SIZE  = 1000000,
+		DEFAULT_MAX_CONTENT_SIZE = 10000000,
+		DEFAULT_MAX_REDIRECT     = 5,
+		DEFAULT_RETRIES          = 3,
+	};
+
+	enum {
+		METHOD_GET,
+		METHOD_POST,
+		METHOD_HEAD,
+	};
+
+private:
+	String       ReadUntilProgress(char until, int start_time, int end_time, Gate2<int, int> progress);
+};
+
+String HttpClientGet(String url, String *server_headers = NULL, String *error = NULL,
+	Gate2<int, int> progress = false, int timeout = HttpClient::DEFAULT_TIMEOUT_MSECS,
+	int max_redirect = HttpClient::DEFAULT_MAX_REDIRECT, int retries = HttpClient::DEFAULT_RETRIES);
+
+String HttpClientGet(String url, String username, String password,
+	String *server_headers = NULL, String *error = NULL,
+	Gate2<int, int> progress = false, int timeout = HttpClient::DEFAULT_TIMEOUT_MSECS,
+	int max_redirect = HttpClient::DEFAULT_MAX_REDIRECT, int retries = HttpClient::DEFAULT_RETRIES);
+
+String HttpClientGet(String url, String proxy,
+	String *server_headers = NULL, String *error = NULL,
+	Gate2<int, int> progress = false, int timeout = HttpClient::DEFAULT_TIMEOUT_MSECS,
+	int max_redirect = HttpClient::DEFAULT_MAX_REDIRECT, int retries = HttpClient::DEFAULT_RETRIES);
+
+String HttpClientGet(String url, String proxy, String username, String password,
+	String *server_headers = NULL, String *error = NULL,
+	Gate2<int, int> progress = false, int timeout = HttpClient::DEFAULT_TIMEOUT_MSECS,
+	int max_redirect = HttpClient::DEFAULT_MAX_REDIRECT, int retries = HttpClient::DEFAULT_RETRIES);
+
+#endif
diff --git a/uppsrc/Web/httpcli_old.cpp b/uppsrc/Web/httpcli_old.cpp
new file mode 100644
index 000000000..159458008
--- /dev/null
+++ b/uppsrc/Web/httpcli_old.cpp
@@ -0,0 +1,421 @@
+#include "Web.h"
+#pragma hdrstop
+
+NAMESPACE_UPP
+
+#define LLOG(x)       // RLOG(x)
+#define LLOGBLOCK(x)  // RLOGBLOCK(x)
+#define LDUMP(x)      // RDUMP(x)
+
+HttpClient::HttpClient()
+{
+	port = DEFAULT_PORT;
+	timeout_msecs = DEFAULT_TIMEOUT_MSECS;
+	max_header_size = DEFAULT_MAX_HEADER_SIZE;
+	max_content_size = DEFAULT_MAX_CONTENT_SIZE;
+	keepalive = false;
+	std_headers = true;
+	method = METHOD_GET;
+}
+
+HttpClient& HttpClient::URL(const char *u)
+{
+	const char *t = u;
+	while(*t && *t != '?')
+		if(*t++ == '/' && *t == '/') {
+			u = ++t;
+			break;
+		}
+	t = u;
+	while(*u && *u != ':' && *u != '/' && *u != '?')
+		u++;
+	host = String(t, u);
+	port = DEFAULT_PORT;
+	if(*u == ':')
+		port = ScanInt(u + 1, &u);
+	path = u;
+	return *this;
+}
+
+HttpClient& HttpClient::Proxy(const char *p)
+{
+	const char *t = p;
+	while(*p && *p != ':')
+		p++;
+	proxy_host = String(t, p);
+	proxy_port = 80;
+	if(*p++ == ':' && IsDigit(*p))
+		proxy_port = ScanInt(p);
+	return *this;
+}
+
+String HttpClient::ExecuteRedirect(int max_redirect, int retries, Gate2<int, int> progress)
+{
+	int nredir = 0;
+	for(;;) {
+		if(progress(0, 0)) {
+			aborted = true;
+			return String::GetVoid();
+		}
+		String data = Execute(progress);
+		if(status_code >= 400 && status_code < 500) {
+			error = status_line;
+			return String::GetVoid();
+		}
+		int r = 0;
+		while(data.IsVoid()) {
+			if(progress(0, 0)) {
+				aborted = true;
+				return String::GetVoid();
+			}
+			if(++r >= retries)
+				return String::GetVoid();
+			data = Execute(progress);
+		}
+		if(!IsRedirect())
+			return data;
+		if(++nredir > max_redirect) {
+			error = NFormat("Maximum number of redirections exceeded: %d", max_redirect);
+			return String::GetVoid();
+		}
+		URL(GetRedirectURL());
+	}
+}
+
+String HttpClient::ReadUntilProgress(char until, int start_time, int end_time, Gate2<int, int> progress)
+{
+	String out;
+	while(!socket.IsEof() && !socket.IsError()) {
+		out.Cat(socket.Read(1000, 1000));
+		int f = out.Find('\n');
+		if(f >= 0) {
+			socket.UnRead(out.Mid(f + 1));
+			out.Trim(f);
+			return out;
+		}
+		int t = msecs();
+		if(t >= end_time) {
+			socket.SetErrorText(NFormat(t_("%s:%d receiving headers timed out"), host, port));
+			break;
+		}
+		if(progress(msecs(start_time), end_time - start_time)) {
+			aborted = true;
+			break;
+		}
+	}
+	return String::GetVoid();
+}
+
+String HttpClient::Execute(Gate2<int, int> progress)
+{
+	LLOGBLOCK("HttpClient::Execute");
+	int start_time = msecs();
+	int end_time = start_time + timeout_msecs;
+	aborted = false;
+	server_headers = Null;
+	status_line = Null;
+	status_code = 0;
+	is_redirect = false;
+	redirect_url = Null;
+	if(socket.IsOpen() && IsError())
+		Close();
+	error = Null;
+	bool use_proxy = !IsNull(proxy_host);
+	String sock_host = (use_proxy ? proxy_host : host);
+	int sock_port = (use_proxy ? proxy_port : port);
+
+	LLOG("socket host = " << sock_host << ":" << sock_port);
+	if(!socket.IsOpen() && !ClientSocket(socket, sock_host, sock_port, true, NULL, 0, false)) {
+		error = Socket::GetErrorText();
+		return String::GetVoid();
+	}
+	while(!socket.PeekWrite(1000)) {
+		int time = msecs();
+		if(time >= end_time) {
+			error = NFormat(t_("%s:%d: connecting to host timed out"), sock_host, sock_port);
+			return String::GetVoid();
+		}
+		if(progress(time - start_time, end_time - start_time)) {
+			aborted = true;
+			return String::GetVoid();
+		}
+	}
+	String request;
+	switch(method) {
+		case METHOD_GET:  request << "GET "; break;
+		case METHOD_POST: request << "POST "; break;
+		default: NEVER(); // invalid method
+	}
+	String host_port = host;
+	if(port != DEFAULT_PORT)
+		host_port << ':' << port;
+	String url;
+	url << "http://" << host_port << Nvl(path, "/");
+	if(use_proxy)
+		request << url;
+	else
+		request << Nvl(path, "/");
+	request << " HTTP/1.1\r\n";
+	if(std_headers) {
+		request
+			<< "URL: " << url << "\r\n"
+			<< "Host: " << host_port << "\r\n"
+			<< "Connection: " << (keepalive ? "keep-alive" : "close") << "\r\n";
+		if(keepalive)
+			request << "Keep-alive: 300\r\n"; // 5 minutes (?)
+		request << "Accept: " << Nvl(accept, "*/*") << "\r\n";
+		request << "Accept-Encoding: gzip\r\n";
+		request << "Agent: " << Nvl(agent, "Ultimate++ HTTP client") << "\r\n";
+		if(method == METHOD_POST)
+			request << "Content-Length: " << postdata.GetLength() << "\r\n";
+	}
+	if(use_proxy && !IsNull(proxy_username))
+		 request << "Proxy-Authorization: basic " << Base64Encode(proxy_username + ':' + proxy_password) << "\r\n";
+	if(!IsNull(username) || !IsNull(password))
+		request << "Authorization: basic " << Base64Encode(username + ":" + password) << "\r\n";
+	request << client_headers << "\r\n" << postdata;
+	LLOG("host = " << host << ", port = " << port);
+	LLOG("request: " << request);
+	int written = 0;
+	while(msecs() < end_time) {
+		int nwrite = socket.WriteWait(request.GetIter(written), request.GetLength() - written, 1000);
+		if(socket.IsError()) {
+			error = Socket::GetErrorText();
+			return String::GetVoid();
+		}
+		if((written += nwrite) >= request.GetLength())
+			break;
+		if(progress(written, request.GetLength())) {
+			aborted = true;
+			return String::GetVoid();
+		}
+	}
+	if(written < request.GetLength()) {
+		error = NFormat(t_("%s:%d: timed out sending request to server"), host, port);
+		return String::GetVoid();
+	}
+	status_line = ReadUntilProgress('\n', start_time, end_time, progress);
+	if(socket.IsError()) {
+		error = Socket::GetErrorText();
+		return String::GetVoid();
+	}
+	if(status_line.GetLength() < 5 || MemICmp(status_line, "HTTP/", 5)) {
+		error = NFormat(t_("%s:%d: invalid server response: %s"), host, port, status_line);
+		return String::GetVoid();
+	}
+
+	status_code = 0;
+	const char *p = status_line.Begin() + 5;
+	while(*p && *p != ' ')
+		p++;
+	if(*p == ' ' && IsDigit(*++p))
+		status_code = stou(p);
+	is_redirect = (status_code >= 300 && status_code < 400);
+
+	int content_length = -1;
+	bool tc_chunked = false;
+	bool ce_gzip = false;
+	for(;;) {
+		String line = ReadUntilProgress('\n', start_time, end_time, progress);
+		if(socket.IsError()) {
+			error = Socket::GetErrorText();
+			return String::GetVoid();
+		}
+
+		for(p = line; *p && (byte)*p <= ' '; p++)
+			;
+		const char *b = p, *e = line.End();
+		while(e > b && (byte)e[-1] < ' ')
+			e--;
+		if(b >= e)
+			break;
+		static const char cl[] = "content-length:";
+		static const char ce[] = "content-encoding:";
+		static const char te[] = "transfer-encoding:";
+		static const char lo[] = "location:";
+		static const int CL_LENGTH = sizeof(cl) - 1;
+		static const int CE_LENGTH = sizeof(ce) - 1;
+		static const int TE_LENGTH = sizeof(te) - 1;
+		static const int LO_LENGTH = sizeof(lo) - 1;
+		if(!MemICmp(p, cl, CL_LENGTH)) {
+			for(p += CL_LENGTH; *p == ' '; p++)
+				;
+			if(IsDigit(*p)) {
+				content_length = minmax<int>(stou(p), 0, max_content_size);
+				if(content_length > max_content_size) {
+					error = NFormat(t_("%s:%d: maximum data length exceeded (%d B)"), host, port, max_content_size);
+					return String::GetVoid();
+				}
+			}
+		}
+		else if(!MemICmp(p, ce, CE_LENGTH)) {
+			for(p += CE_LENGTH; *p == ' '; p++)
+				;
+			static const char gzip[] = "gzip";
+			if(e - p == sizeof(gzip) - 1 && !memcmp(p, gzip, sizeof(gzip) - 1))
+				ce_gzip = true;
+		}
+		else if(!MemICmp(p, te, TE_LENGTH)) {
+			for(p += TE_LENGTH; *p == ' '; p++)
+				;
+			static const char ch[] = "chunked";
+			if(e - p == sizeof(ch) - 1 && !memcmp(p, ch, sizeof(ch) - 1))
+				tc_chunked = true;
+		}
+		else if(!MemICmp(p, lo, LO_LENGTH)) {
+			for(p += LO_LENGTH; *p == ' '; p++)
+				;
+			redirect_url = String(p, e);
+			int q = redirect_url.Find('?');
+			int p = path.Find('?');
+			if(p >= 0 && q < 0)
+				redirect_url.Cat(path.GetIter(p));
+		}
+		if(server_headers.GetLength() + (e - b) + 2 > max_header_size) {
+			error = NFormat(t_("%s:%d: maximum header length exceeded (%d B)"), host, port, max_header_size);
+			return String::GetVoid();
+		}
+		server_headers.Cat(b, int(e - b));
+		server_headers.Cat("\r\n");
+	}
+	String chunked;
+	String body;
+	while(body.GetLength() < content_length || content_length < 0 || tc_chunked) {
+		if(msecs(end_time) >= 0) {
+			error = NFormat(t_("%s:%d: timed out when receiving server response"), host, port);
+			return String::GetVoid();
+		}
+		String part = socket.Read(1000);
+		if(!part.IsEmpty()) {
+			if(body.GetLength() + part.GetLength() > DEFAULT_MAX_CONTENT_SIZE) {
+				error = NFormat(t_("Maximum content size exceeded: %d"), body.GetLength() + part.GetLength());
+				return tc_chunked ? chunked : body;
+			}
+			body.Cat(part);
+			if(tc_chunked)
+				for(;;) {
+					const char *p = body.Begin(), *e = body.End();
+					while(p < e && *p != '\n')
+						p++;
+					if(p >= e)
+						break;
+					int nextline = int(p + 1 - body.Begin());
+					p = body.Begin();
+					int part_length = ctoi(*p);
+					if((unsigned)part_length >= 16) {
+						body.Remove(0, nextline);
+						continue;
+					}
+					for(int i; (unsigned)(i = ctoi(*++p)) < 16; part_length = part_length * 16 + i)
+						;
+					body.Remove(0, nextline);
+					if(part_length <= 0) {
+						p = body.Begin();
+						while(p < e - 2)
+							if(*p == '\n' && (p[1] == '\n' || p[1] == '\r' && p[2] == '\n'))
+								goto EXIT;
+							else
+								p++;
+						while(socket.IsOpen() && !socket.IsError() && !socket.IsEof()) {
+							if(msecs(end_time) >= 0) {
+								error = NFormat("Timeout reading footer block (%d B).", body.GetLength());
+								goto EXIT;
+							}
+							if(body.GetLength() > 3)
+								body.Remove(0, body.GetLength() - 3);
+							String part = socket.Read(1000);
+							body.Cat(part);
+							const char *p = body;
+							while(*p && !(*p == '\n' && (p[1] == '\n' || p[1] == '\r' && p[2] == '\n')))
+								p++;
+							if(*p)
+								goto EXIT;
+						}
+						break;
+					}
+					if(body.GetLength() >= part_length) {
+						chunked.Cat(body, part_length);
+						body.Remove(0, part_length);
+						continue;
+					}
+					for(;;) {
+						String part = socket.Read(-msecs(end_time));
+						if(part.IsEmpty()) {
+							error = NFormat("Timeout reading Transfer-encoding: chunked block (%d B).", part_length);
+							goto EXIT;
+						}
+						body.Cat(part);
+						if(body.GetLength() >= part_length) {
+							chunked.Cat(body, part_length);
+							body.Remove(0, part_length);
+							break;
+						}
+						if(progress(chunked.GetLength() + body.GetLength(), 0)) {
+							aborted = true;
+							return chunked;
+						}
+					}
+				}
+		}
+		if(!socket.IsOpen() || socket.IsError() || socket.IsEof()) {
+			if(socket.IsError())
+				error = Socket::GetErrorText();
+			else if(!tc_chunked && content_length > 0 && body.GetLength() < content_length)
+				error = NFormat(t_("Partial input: %d out of %d"), body.GetLength(), content_length);
+			break;
+		}
+		if(progress(chunked.GetLength() + body.GetLength(), max(content_length, 0))) {
+			aborted = true;
+			return tc_chunked ? chunked : body;
+		}
+	}
+
+EXIT:
+	if(!keepalive || socket.IsError() || socket.IsEof())
+		Close();
+
+	if(ce_gzip) {
+		body = GZDecompress(body);
+		return body;
+	}
+	return tc_chunked ? chunked : body;
+}
+
+String HttpClientGet(String url, String proxy, String username, String password,
+	String *server_headers, String *error, Gate2<int, int> progress,
+	int timeout, int num_redirect, int retries)
+{
+	HttpClient client;
+	String out = client
+		.URL(url)
+		.User(username, password)
+		.TimeoutMsecs(timeout)
+		.Proxy(proxy)
+		.ExecuteRedirect(num_redirect, progress, progress);
+	if(server_headers)
+		*server_headers = client.GetHeaders();
+	if(error)
+		*error = client.GetError();
+	return out;
+}
+
+String HttpClientGet(String url, String proxy, String *server_headers, String *error,
+	Gate2<int, int> progress, int timeout, int max_redirect, int retries)
+{
+	return HttpClientGet(url, proxy, Null, Null, server_headers, error, progress, timeout, max_redirect, retries);
+}
+
+String HttpClientGet(String url, String username, String password,
+	String *server_headers, String *error, Gate2<int, int> progress,
+	int timeout, int num_redirect, int retries)
+{
+	return HttpClientGet(url, Null, username, password, server_headers, error, progress, timeout, num_redirect, retries);
+}
+
+String HttpClientGet(String url, String *server_headers, String *error,
+	Gate2<int, int> progress, int timeout, int max_redirect, int retries)
+{
+	return HttpClientGet(url, Null, Null, Null, server_headers, error, progress, timeout, max_redirect, retries);
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/Web/httpsrv.cpp b/uppsrc/Web/httpsrv.cpp
new file mode 100644
index 000000000..9f1368c5c
--- /dev/null
+++ b/uppsrc/Web/httpsrv.cpp
@@ -0,0 +1,1003 @@
+#include "Web.h"
+
+NAMESPACE_UPP
+
+#define LLOG(x) // RLOG(x)
+
+#define SLOWWRITE 4 // KB/s, comment out to turn off
+
+String MIMECharsetName(byte charset)
+{
+	if(charset == CHARSET_DEFAULT)
+		charset = GetDefaultCharset();
+	switch(charset) {
+	case CHARSET_ISO8859_1:  return "ISO-8859-1";
+	case CHARSET_ISO8859_2:  return "ISO-8859-2";
+	case CHARSET_ISO8859_3:  return "ISO-8859-3";
+	case CHARSET_ISO8859_4:  return "ISO-8859-4";
+	case CHARSET_ISO8859_5:  return "ISO-8859-5";
+	case CHARSET_ISO8859_6:  return "ISO-8859-6";
+	case CHARSET_ISO8859_7:  return "ISO-8859-7";
+	case CHARSET_ISO8859_8:  return "ISO-8859-8";
+	case CHARSET_ISO8859_9:  return "ISO-8859-9";
+	case CHARSET_ISO8859_10: return "ISO-8859-10";
+	case CHARSET_ISO8859_13: return "ISO-8859-13";
+	case CHARSET_ISO8859_14: return "ISO-8859-14";
+	case CHARSET_ISO8859_15: return "ISO-8859-15";
+	case CHARSET_ISO8859_16: return "ISO-8859-16";
+	case CHARSET_WIN1250:    return "windows-1250";
+	case CHARSET_WIN1251:    return "windows-1251";
+	case CHARSET_WIN1252:    return "windows-1252";
+	case CHARSET_WIN1253:    return "windows-1253";
+	case CHARSET_WIN1254:    return "windows-1254";
+	case CHARSET_WIN1255:    return "windows-1255";
+	case CHARSET_WIN1256:    return "windows-1256";
+	case CHARSET_WIN1257:    return "windows-1257";
+	case CHARSET_WIN1258:    return "windows-1258";
+//	case CHARSET_KOI8_R:
+//	case CHARSET_CP852:
+//	case CHARSET_MJK:
+	case CHARSET_TOASCII:    return "us-ascii";
+	case CHARSET_UTF8:       return "UTF-8";
+//	case CHARSET_UNICODE:
+	default:                 return Null;
+	}
+}
+
+HttpRequest::HttpRequest(HttpServer& server, pick_ Socket& _socket, HttpQuery query_)
+: server(server), socket(_socket), query(query_)
+, request_ticks(GetTickCount())
+{
+	socket.Linger(1000);
+#ifdef PLATFORM_WIN32
+	event.Read(socket);
+#endif
+	String auth = query.GetString("$$AUTHORIZATION");
+	if(!IsNull(auth)) {
+		String dec = UrlDecode(auth);
+		if(dec.GetLength() >= 6 && !MemICmp(dec, "basic ", 6)) {
+			const char *p = dec.GetIter(6);
+			while(*p == ' ')
+				p++;
+			String b6d = Base64Decode(p);
+			const char *un = b6d, *unp = un;
+			while(*unp && *unp != ':')
+				unp++;
+			query.Set("$$AUTH_TYPE", "BASIC");
+			query.Set("$$AUTH_USERNAME", String(un, unp));
+			if(*unp == ':')
+				unp++;
+			query.Set("$$AUTH_PASSWORD", String(unp));
+		}
+		else if(dec.GetLength() >= 7 && !MemICmp(dec, "digest ", 7)) {
+			query.Set("$$AUTH_TYPE", "DIGEST");
+			const char *p = dec.GetIter(7);
+			while(*p)
+				if((byte)*p <= ' ' || *p == ',')
+					p++;
+				else {
+					const char *b = p;
+					while(*p && *p != '=')
+						p++;
+					const char *e = p;
+					while(e > b && (byte)e[-1] <= ' ')
+						e--;
+					String key(b, e);
+					String value;
+					if(*p == '=') {
+						p++;
+						if(*p == '\"') {
+							b = ++p;
+							while(*p && *p != '\"')
+								if(*p != '\\' || *++p)
+									value.Cat(*p++);
+							if(*p == '\"')
+								p++;
+						}
+						else {
+							while((byte)*p >= ' ' && *p != ',')
+								value.Cat(*p++);
+						}
+					}
+					query.Set("$$AUTH_" + key, value);
+				}
+		}
+	}
+
+	LLOG("HttpRequest:\n" << query);
+}
+
+void HttpRequest::LogTime(const char *s, int level)
+{
+	server.LogTime(NFormat("(ID:%d)%s", (int)(uintptr_t)this, s), level);
+}
+
+int HttpRequest::GetDuration() const
+{
+	return GetTickCount() - request_ticks;
+}
+
+void HttpRequest::Write(String header, String body)
+{
+	Write(header, body, 200, "OK");
+}
+
+void HttpRequest::Write(String header, String body, int result_code, String result_text)
+{
+	int duration = GetDuration();
+	if(IsNull(header))
+		header = query.GetString("$$DEFAULT_HEADER");
+
+	LogTime(NFormat("HttpRequest::Write(%d): done in %d msecs: %d bytes\n%s",
+		result_code, duration, body.GetLength(), header), 2);
+
+	server.AddRequest(GetTickCount() - request_ticks);
+
+	String out;
+	int httpver = query.GetInt("$$HTTP_VERSION");
+	if(httpver >= 1000) { // send status line & headers
+		out << NFormat("HTTP/%d.%d %d %s\r\n", httpver / 1000, httpver % 1000, result_code, result_text)
+		<< header
+		<< "Content-Length: " << body.GetLength() << "\r\n"
+		"\r\n";
+	}
+	if(query.GetString("$$METHOD") != "HEAD")
+		out.Cat(body);
+//	out.Cat('\0', 8192);
+	ASSERT(socket.IsOpen());
+	server.AddWrite(socket, out);
+	LogTime(NFormat("HttpRequest::Write(%d): %d bytes added to delayed write list",
+		result_code, out.GetLength()), 2);
+}
+
+void HttpRequest::Redirect(String url)
+{
+	Htmls body = NFormat(t_("If you're not redirected automatically please use %s."), HtmlLink(url) / t_("this link"));
+	body = HtmlPage(t_("Redirection to another web address"), body);
+	String header;
+	header << "Location: " << url << "\r\n";
+	Write(header, body, 302, "Object Moved");
+/*
+	String out;
+	if(query.GetInt("$$HTTP_VERSION") >= 1000) { // send status line & headers
+		out <<
+		"HTTP/1.0 302 Object Moved\r\n"
+		<< "Location: " << url << "\r\n"
+		<< "Content-Length: " << body.GetLength() << "\r\n"
+		"\r\n";
+	}
+	out.Cat(body);
+	server.AddWrite(socket, out);
+	LogTime(NFormat("HttpRequest::Redirect() added to delayed write list: %s", url), 2);
+*/
+}
+
+void HttpRequest::Error(String err)
+{
+	LogTime(NFormat("error after %d msecs: %s", GetDuration(), err), 0);
+	Htmls body = GetHttpErrorPage(query, err, server.IsShowQuery());
+	Write(HttpContentType(HttpTextHtml()), body);
+}
+
+//////////////////////////////////////////////////////////////////////
+// HttpServer::
+
+HttpServer::SocketWrite::SocketWrite(Socket socket_, String data_, int ticks_)
+: socket(socket_), data(data_), done(0), ticks(ticks_)
+{
+#ifdef PLATFORM_WIN32
+	sock_event.Write(socket);
+#endif
+}
+
+HttpServer::HttpServer()
+{
+	show_headers = true;
+	server_port = 0;
+	default_header = HttpContentType(HttpTextHtml());
+	start_time = GetSysTime();
+	hit_count = 0;
+	total_response_msec = 0;
+	trailing_sum = 0;
+	trailing_count = 0;
+	max_post_size = DEFAULT_MAX_POST_SIZE;
+	max_request_time = DEFAULT_MAX_REQUEST_TIME;
+}
+
+void HttpServer::Logging(const char *log, int mls)
+{
+	max_log_size = mls;
+	logfile = log;
+	if(logfile.IsEmpty())
+		logfile = ConfigFile("requests.txt");
+}
+
+void HttpServer::Log(const char *s, int level)
+{
+	enum { MAX_LOG_SIZE = 500000 };
+	WhenLog(s, level);
+	if(logfile.IsEmpty())
+		return;
+//	VppLog() << s;
+	FileStream fs;
+	if(!fs.Open(logfile, FileStream::APPEND) && !fs.Open(logfile, FileStream::CREATE))
+		return;
+	fs.Put(s);
+	int len = (int)fs.GetSize();
+	fs.Close();
+	if(len < max_log_size)
+		return;
+	String bak = ForceExt(logfile, "") + ".old" + GetFileExt(logfile);
+	FileDelete(bak);
+	FileMove(logfile, bak);
+/*
+#if defined(PLATFORM_WIN32)
+	DeleteFile(bak);
+	MoveFile(logfile, bak);
+#elif defined(PLATFORM_POSIX)
+	unlink(bak);
+	rename(logfile, bak);
+#else
+	#error Unsupported platform
+#endif
+*/
+	if(fs.Open(logfile, FileStream::APPEND)) {
+		fs << "[" << Format(GetSysTime()) << "] old '" << logfile << "' backed up (" << len << " bytes)\n";
+		fs.Close();
+	}
+}
+
+void HttpServer::LogTime(const char *s, int level)
+{
+	String str;
+	Log(str << '[' << Format(GetSysTime()) << " @ " << int(msecs() % 10000u) << "]: " << s << '\n', level);
+}
+
+bool HttpServer::Open(int port, int listen_count)
+{
+	LogTime(NFormat("HttpServer::Open(port = %d)", port), 1);
+	if(!ServerSocket(socket, server_port = port, true, listen_count))
+		return false;
+#ifdef PLATFORM_WIN32
+	sock_event.Accept(socket);
+#endif
+	return true;
+}
+
+bool HttpServer::Reopen()
+{
+	Close();
+	return Open(server_port);
+}
+
+void HttpServer::Close()
+{
+	LogTime("HttpServer::Close()", 1);
+	socket.Close();
+}
+
+bool HttpServer::DelayedWrite()
+{
+//	if(!delayed_writes.IsEmpty())
+//		LogTime("HttpServer::DelayedWrite, #writes = " + FormatInt(delayed_writes.GetCount()), 2);
+	for(int i = delayed_writes.GetCount(); --i >= 0;) {
+		SocketWrite& sw = delayed_writes[i];
+//		int part = sw.data.GetLength() - sw.done; Mirek:unused
+		int count = max(sw.socket.WriteWait(sw.data.Begin() + sw.done, sw.data.GetLength() - sw.done, 0), 0);
+		if(sw.socket.IsError()) {
+			LogTime(NFormat("HttpServer::DelayedWrite(): %s", Socket::GetErrorText()), 0);
+			delayed_writes.Remove(i);
+			continue;
+		}
+		if(count > 0)
+			LogTime(NFormat("HttpServer::DelayedWrite(): %d bytes written on %d", count, sw.socket.GetNumber()), 2);
+		if((sw.done += count) >= sw.data.GetLength()) {
+			LogTime(NFormat("HttpServer::DelayedWrite(): finished %d (%d left)",
+				sw.socket.GetNumber(), delayed_writes.GetCount() - 1), 2);
+			sw.socket.Block(); // set to blocking mode before close
+			sw.socket.PeekWrite(1000);
+			sw.socket.StopWrite();
+			sw.socket.Close();
+//			sw.socket.StopWrite();
+			delayed_writes.Remove(i);
+		}
+		else if(msecs(sw.ticks) >= max_request_time) {
+			LogTime(NFormat("HttpServer::DelayedWrite(): timeout after sending %d out of %d bytes",
+				sw.done, sw.data.GetLength()), 0);
+			sw.socket.Block(); // set to blocking mode before close
+			sw.socket.StopWrite();
+			sw.socket.Close();
+			delayed_writes.Remove(i);
+		}
+	}
+	return !delayed_writes.IsEmpty();
+}
+
+HttpServer *HttpServer::Wait(const Vector<HttpServer *>& list, int msec)
+{
+	Vector<Socket *> read, write;
+	for(int i = 0; i < list.GetCount(); i++) {
+		list[i]->GetReadSockets(read);
+		list[i]->GetWriteSockets(write);
+	}
+	if(msec > 0) {
+		LLOG(String() << "HttpServer::Wait(" << list.GetCount() << " servers for " << msec
+			<< " msecs) -> Socket::Wait(#read = " << read.GetCount() << ", #write = " << write.GetCount() << ")");
+		if(read.IsEmpty() && write.IsEmpty() || !Socket::Wait(read, write, msec))
+			return NULL;
+	}
+	for(int i = 0; i < list.GetCount(); i++)
+		if(list[i]->Accept())
+			return list[i];
+	return NULL;
+}
+
+bool HttpServer::Wait(int msec)
+{
+//	LogTime(NFormat("wait(%d msec)", msec), 2);
+	Vector<HttpServer *> list;
+	list.SetCount(1);
+	list[0] = this;
+	bool ok = !!Wait(list, msec);
+//	LogTime(NFormat("//wait -> %d", ok), 2);
+	return ok;
+}
+
+void HttpServer::GetReadSockets(Vector<Socket *>& sockets)
+{
+	if(socket.IsOpen())
+		sockets.Add(&socket);
+	if(connection.IsOpen())
+		sockets.Add(&connection);
+}
+
+void HttpServer::GetWriteSockets(Vector<Socket *>& sockets)
+{
+	for(int i = 0; i < delayed_writes.GetCount(); i++)
+		sockets.Add(&delayed_writes[i].socket);
+}
+
+#ifdef PLATFORM_WIN32
+void HttpServer::GetWaitEvents(Vector<Event *>& events)
+{
+	if(socket.IsOpen())
+		events.Add(&sock_event);
+	if(connection.IsOpen())
+		events.Add(&conn_event);
+	for(int i = 0; i < delayed_writes.GetCount(); i++)
+		events.Add(&delayed_writes[i].sock_event);
+}
+#endif
+
+bool HttpServer::Accept()
+{
+	if(connection.IsOpen())
+		return true;
+	if(socket.Accept(connection, &ipaddr, true, 0)) {
+		connection.NoBlock();
+#ifdef PLATFORM_WIN32
+		conn_event.Read(connection);
+#endif
+		first_line = Null;
+		sapi_request = Null;
+		post_data = Null;
+		headers_length = 0;
+		request_version = 0;
+		post_length = 0;
+		request_time = GetTickCount();
+		request_state = RS_FIRST;
+		request_query = HttpQuery();
+		LogTime(NFormat("HttpServer::Accept: accepted socket %d from %d.%d.%d.%d", connection.GetNumber(),
+				int(ipaddr >> 24) & 0xff, int(ipaddr >> 16) & 0xff, int(ipaddr >> 8) & 0xff, int(ipaddr >> 0) & 0xff), 2);
+		return true;
+	}
+	if(socket.IsError()) {
+		LogTime(NFormat("HttpServer::Accept: error %s", Socket::GetErrorText()), 0);
+		return false;
+	}
+	return true;
+}
+
+#define FOURCHAR(a,b,c,d) ((int(a)) + (int(b) * 0x100) + (int(c) * 0x10000) + (int(d) * 0x1000000))
+
+One<HttpRequest> HttpServer::GetRequest()
+{
+	Socket conn = connection;
+	connection.Clear();
+
+	if(!conn.IsOpen())
+		return NULL;
+	if(conn.IsError()) {
+		LogTime(NFormat("HttpServer::GetRequest: error on socket %d: %s", conn.GetNumber(), Socket::GetErrorText()), 2);
+		return NULL;
+	}
+	int rtm = GetTickCount() - request_time;
+	if(rtm >= max_request_time) {
+		LogTime("request time elapsed, request trashed", 1);
+		return NULL;
+	}
+	String data = conn.Read(0, max_post_size);
+	if(data.IsVoid()) {
+		LogTime(NFormat("Socket %d closed by client.", conn.GetNumber()), 1);
+		return NULL;
+	}
+	if(conn.IsError()) {
+		LogTime(NFormat("Request transmission error, request trashed (after %d bytes)", data.GetLength()), 1);
+		return NULL;
+	}
+	LogTime(NFormat("%d bytes read: %s", data.GetLength(), data), 2);
+	const char *p = data.Begin(), *e = data.End();
+	while(p < e) {
+		const char *b = p;
+		switch(request_state) {
+		case RS_FIRST:
+			if(first_line.GetLength() < 4) {
+				int left = min<int>(e - p, 4 - first_line.GetLength());
+				first_line.Cat(p, left);
+				p += left;
+				break;
+			} {
+				int four = Peek32le(first_line);
+				if(four == FOURCHAR('S', 'A', 'P', 'I')) {
+					if(first_line.GetLength() < 8) {
+						int left = min<int>(e - p, 8 - first_line.GetLength());
+						first_line.Cat(p, left);
+						p += left;
+						break;
+					}
+					sapi_length = Peek32le(first_line.GetIter(4));
+					if(sapi_length < 0 || sapi_length > max_post_size) {
+						LogTime(NFormat("Invalid SAPI request length (%d), request trashed", sapi_length), 1);
+						conn.Close();
+						return NULL;
+					}
+					LogTime("SAPI request detected", 2);
+					request_state = RS_SAPI;
+					break;
+				}
+				if(four == FOURCHAR('S', 'T', 'A', 'T')) {
+					String out;
+					String cmdline;
+#ifdef PLATFORM_WIN32
+					cmdline = GetCommandLine();
+#endif
+					out << "READY " << cmdline << "\r\n";
+					conn.Write(out);
+//					conn.StopWrite();
+					conn.Close();
+					return NULL;
+				}
+				if(four != FOURCHAR('P', 'O', 'S', 'T') && four != FOURCHAR('G', 'E', 'T', ' ')
+				&& four != FOURCHAR('H', 'E', 'A', 'D')) {
+					LogTime(NFormat("Invalid HTTP request type (%s), request trashed", first_line), 1);
+					return NULL;
+				}
+				while(p < e && *p != '\n')
+					p++;
+				if(first_line.GetLength() + (int)(p - b) > max_post_size) {
+					LogTime("HTTP request length limit reached, request trashed", 1);
+					return NULL;
+				}
+				first_line.Cat(b, p - b);
+				if(p >= e)
+					break;
+				p++;
+
+				const char *r = first_line;
+				while(*r && *r != ' ' && *r != '\n')
+					r++;
+				if(*r == ' ') {
+					r++;
+					const char *s = r;
+					while(*r && *r != ' ' && *r != '?')
+						r++;
+					request_query.Set("$$PATH", UrlDecode(String(s, r)));
+					const char *e = r, *t = r;
+					while(e > s && e[-1] != '/')
+						if(*--e == '.')
+							t = e;
+					request_query.Set("$$TITLE", UrlDecode(String(e, t)));
+					if(e > s)
+						e--;
+					t = e;
+					while(e > s && e[-1] != '/')
+						e--;
+					request_query.Set("$$DIR", UrlDecode(String(e, t)));
+					if(s < r && *s == '/')
+						s++;
+					t = s;
+					while(s < r && *s != '/')
+						s++;
+					if(s < r)
+						request_query.Set("$$ROOT", UrlDecode(String(t, s)));
+					if(*r == '?') {
+						s = ++r;
+						while(*r && *r != ' ' && *r != '\n')
+							r++;
+						String raw_query(s, r);
+						request_query.Set("$$QUERY", raw_query);
+						request_query.Set(HttpQuery(raw_query));
+					}
+					if(!memcmp(r, " HTTP/", 6) && IsDigit(r[6])) { // HTTP version
+						int upper = stou(r + 6, &r);
+						int lower = 0;
+						if(*r == '.' && IsDigit(*++r))
+							lower = stou(r, &r);
+						request_version = 1000 * upper + lower;
+						request_query.SetInt("$$HTTP_VERSION", request_version);
+					}
+				}
+				request_query.Set("$$IPADDR", FormatIP(ipaddr));
+				request_query.Set("$$DEFAULT_HEADER", default_header);
+				request_query.Set("$$METHOD", four == FOURCHAR('P', 'O', 'S', 'T') ? "POST"
+					: four == FOURCHAR('H', 'E', 'A', 'D') ? "HEAD" : "GET");
+				if(request_version >= 1000)
+					request_state = (four == FOURCHAR('P', 'O', 'S', 'T') ? RS_POST_HEADERS : RS_GET_HEADERS);
+				else { // simple HTTP request without headers
+					One<HttpRequest> req = new HttpRequest(*this, conn, request_query);
+					req->LogTime(GetHttpURI(request_query), 1);
+					return req;
+				}
+			}
+			break;
+
+		case RS_SAPI:
+			if(sapi_request.GetLength() < sapi_length) {
+				int add = min<int>(e - p, sapi_length - sapi_request.GetLength());
+				LogTime(NFormat("SAPI request length = %d, collected %d, adding %d",
+					sapi_length, sapi_request.GetLength(), add), 2);
+				sapi_request.Cat(p, add);
+				p += add;
+			}
+			if(sapi_request.GetLength() >= sapi_length) {
+				LogTime("Streaming SAPI request", 2);
+				StringStream strm(sapi_request);
+				strm % request_query;
+				if(strm.IsError()) {
+					LOG("Invalid SAPI request data, request trashed");
+					return NULL;
+				}
+				request_query.Set("$$DEFAULT_HEADER", default_header);
+				One<HttpRequest> req = new HttpRequest(*this, conn, request_query);
+				req->LogTime(GetHttpURI(request_query), 1);
+				return req;
+			}
+
+		case RS_GET_HEADERS:
+		case RS_POST_HEADERS:
+			while(p < e && *p != '\n')
+				p++;
+			if(headers_length + header_line.GetLength() + (int)(p - b) > max_post_size) {
+				LogTime("Header line too long, request trashed", 1);
+				return NULL;
+			}
+			header_line.Cat(b, p - b);
+			LOG("b - b = " << (p - b) << ", header_line = " << header_line);
+			if(p >= e)
+				break;
+			p++;
+
+			{ // read header item
+				const char *r = header_line;
+				while(*r && (byte)*r <= ' ')
+					r++;
+				if(*r == 0) { // end of headers
+					if(request_state == RS_POST_HEADERS) {
+						post_length = request_query.GetInt("$$CONTENT_LENGTH");
+						if(!IsNull(post_length) && post_length > max_post_size) {
+							LogTime(NFormat("HTTP POST length limit exceeded (%d), request trashed", post_length), 1);
+							return NULL;
+						}
+						request_state = RS_POST_DATA;
+						break;
+					}
+					else {
+						One<HttpRequest> req = new HttpRequest(*this, conn, request_query);
+						req->LogTime(GetHttpURI(request_query), 1);
+						return req;
+					}
+				}
+				String var = "$$";
+				for(; *r && *r != ':'; r++)
+					if(IsAlNum(*r))
+						var.Cat(ToUpper(*r));
+					else if(*r == '-' && !var.IsEmpty() && *var.Last() != '_')
+						var.Cat('_');
+				if(var.GetLength() > 2 && *r == ':') {
+					while(*++r == ' ')
+						;
+					const char *s = r;
+					r = header_line.End();
+					while(r > s && (byte)r[-1] <= ' ')
+						r--;
+					String v = request_query.GetString(var);
+					if(!v.IsEmpty())
+						v.Cat(", ");
+					v.Cat(s, r - s);
+					request_query.Set(var, v);
+					headers_length += var.GetLength() + v.GetLength();
+				}
+				header_line = Null;
+				break;
+			}
+			break;
+
+		case RS_POST_DATA:
+			if(post_length == 0) {
+				while(p < e && *p != '\n')
+					p++;
+				if(post_data.GetLength() + (int)(p - b) > max_post_size) {
+					LogTime("HTTP POST length exceeded, request trashed", 1);
+					return NULL;
+				}
+				post_data.Cat(b, p - b);
+				if(p >= e)
+					break;
+				p++;
+			}
+			else if(post_data.GetLength() < post_length) {
+				int add = min<int>(post_length - post_data.GetLength(), e - p);
+				post_data.Cat(p, add);
+				p += add;
+				if(post_data.GetLength() < post_length)
+					break;
+			}
+			{
+				String content = request_query.GetString("$$CONTENT_TYPE");
+				static const char mtag[] = "multipart/";
+				request_query.Set("$$POSTDATA", post_data);
+				if(!socket.IsError() && strnicmp(content, mtag, 10))
+					request_query.SetURL(post_data);
+				else
+					GetHttpPostData(request_query, post_data);
+				One<HttpRequest> req = new HttpRequest(*this, conn, request_query);
+				req->LogTime(GetHttpURI(request_query), 1);
+				return req;
+			}
+			break;
+
+		default:
+			NEVER();
+			break;
+		}
+	}
+
+	connection = conn;
+	return NULL;
+
+/*
+	bool post = false;
+	HttpQuery query;
+	LOG((int)GetTickCount() << " HttpServer::GetRequest->PeekCount(4) on socket " << (SOCKET)sconn);
+	String request = sconn.PeekCount(4, 100);
+	LOG((int)GetTickCount() << " HttpServer::GetRequest on socket " << (SOCKET)sconn);
+	if(request.GetLength() == 4)
+		if(!memcmp(request, "GET ", 4))
+			post = false;
+		else if(!memcmp(request, "POST", 4))
+			post = true;
+		else if(!memcmp(request, "SAPI", 4)) {
+			request = sconn.ReadCount(8);
+			int len = PeekIL(request.Begin() + 4);
+			if(len < 0 || len > max_post_size)
+				return NULL;
+			StringStream strm(sconn.ReadCount(len));
+			if(sconn.IsError()) {
+				LogTime("HttpServer::ReadRequest: ISAPI request error: " + sconn.GetError());
+				return NULL;
+			}
+			strm % query;
+			if(strm.IsError())
+				return NULL;
+			query.Set(WID__DEFAULT_HEADER, default_header);
+			One<HttpRequest> req = new HttpRequest(*this, sconn, query);
+			req->LogTime(GetHttpURI(query));
+			return req;
+		}
+		else if(!memcmp(request, "STAT", 4)) {
+			String out;
+			String cmdline;
+#ifdef PLATFORM_WIN32
+			cmdline = GetCommandLine();
+#endif
+			out << "READY " << cmdline << "\r\n";
+			sconn.Write(out);
+			sconn.StopWrite();
+			sconn.Close();
+			return NULL;
+		}
+		else
+			return NULL;
+	int http_version = 9;
+	request = sconn.ReadUntil('\n');
+	const char *p = request;
+	while(*p && *p != ' ' && *p != '\n')
+		p++;
+	if(*p == ' ') {
+		p++;
+		const char *b = p;
+		while(*p && *p != ' ' && *p != '?')
+			p++;
+		query.Set(WID__PATH, String(b, p));
+		if(*p == '?') {
+			b = ++p;
+			while(*p && *p != ' ' && *p != '\n')
+				p++;
+			String raw_query(b, p);
+			query.Set(WID__QUERY, raw_query);
+			query.Set(HttpQuery(raw_query));
+		}
+		if(!memcmp(p, " HTTP/", 6) && IsDigit(p[6])) { // HTTP version
+			int upper = stou(p + 6, &p);
+			int lower = 0;
+			if(*p == '.' && IsDigit(*++p))
+				lower = stou(p, &p);
+			http_version = 1000 * upper + lower;
+			query.SetInt(WID__HTTP_VERSION, http_version);
+		}
+	}
+	query.Set(WID__DEFAULT_HEADER, default_header);
+	query.Set(WID__METHOD, post ? "POST" : "GET");
+	if(post && http_version < 1000)
+		return NULL; // must be at least HTTP/1.0 to handle POST
+	if(http_version >= 1000) { // read headers
+		while(!sconn.IsError()) {
+			request = sconn.ReadUntil('\n');
+			p = request;
+			while(*p && (byte)*p <= ' ')
+				p++;
+			if(*p == 0)
+				break;
+			String var = "$$";
+			for(; *p && *p != ':'; p++)
+				if(IsAlNum(*p))
+					var.Cat(ToUpper(*p));
+				else if(*p == '-' && !var.IsEmpty() && *var.Last() != '_')
+					var.Cat('_');
+			if(var.GetLength() > 2 && *p == ':') {
+				while(*++p == ' ')
+					;
+				const char *b = p;
+				p = request.End();
+				while((byte)p[-1] <= ' ')
+					p--;
+				String s = query(var);
+				if(!s.IsEmpty())
+					s.Cat(", ");
+				s.Cat(b, p - b);
+				query.Set(var, s);
+			}
+		}
+	}
+
+	if(post)
+		ReadPostData(sconn, query);
+	if(sconn.IsError()) {
+		LogTime(String() << "HttpServer::GetRequest: " << sconn.GetError());
+		return NULL;
+	}
+	One<HttpRequest> req = new HttpRequest(*this, sconn, query);
+	req->LogTime(GetHttpURI(query));
+	return req;
+*/
+}
+
+void HttpServer::ReadPostData(Socket& socket, HttpQuery& query)
+{
+	int length = query.GetInt("$$CONTENT_LENGTH");
+	String buffer;
+	if(length > 0)
+		buffer = socket.ReadCount(min(length, max_post_size));
+	else // length unknown, read just 1 line (works for www-form-urlencoded)
+		buffer = socket.ReadUntil('\n', Null, max_post_size);
+	String content = query.GetString("$$CONTENT_TYPE");
+	static const String mtag = "multipart/";
+	if(!socket.IsError() && strnicmp(content, mtag, mtag.GetLength())) { // assume single-part data
+		query.SetURL(buffer);
+		return;
+	}
+	GetHttpPostData(query, buffer);
+}
+
+void HttpServer::AddWrite(Socket socket, String data)
+{
+	if(data.GetLength() > 0)
+		delayed_writes.Add(new SocketWrite(socket, data, msecs()));
+}
+
+bool HttpServer::IsDelayedWrite() const
+{
+	return !delayed_writes.IsEmpty();
+}
+
+double HttpServer::GetElapsedTime() const
+{
+	return (double)((GetSysTime() - start_time) * 1000);
+}
+
+double HttpServer::GetAvgTime() const
+{
+	return hit_count ? total_response_msec / hit_count : 0;
+}
+
+double HttpServer::GetAvgLagTime() const
+{
+	if(trailing_count == 0)
+		return 0;
+	return (double)trailing_sum / trailing_count;
+}
+
+void HttpServer::AddRequest(int response_msec)
+{
+	hit_count++;
+	total_response_msec += response_msec;
+	if(trailing_count >= TRAILER) {
+		trailing_sum -= trailing_times[0];
+		Copy(trailing_times, trailing_times + 1, trailing_times + TRAILER);
+//		memmove(&trailing_times[0], &trailing_times[1], (TRAILER - 1) * sizeof(*trailing_times));
+		trailing_count--;
+	}
+	trailing_sum += (trailing_times[trailing_count++] = response_msec);
+}
+
+String GetHttpURI(HttpQuery query)
+{
+	String out = query.GetString("$$PATH");
+	if(!query.IsEmpty("$$QUERY"))
+		out << '?' << query.GetString("$$QUERY");
+	return out;
+}
+
+void GetHttpPostData(HttpQuery& query, String buffer)
+{
+	const char *p = buffer;
+	while(p[0] != '-' || p[1] != '-') {
+		while(*p != '\n')
+			if(*p++ == 0)
+				return; // end of file, boundary not found
+		p++;
+	}
+	String delimiter;
+ { // read multipart delimiter
+		const char *b = (p += 2);
+		while(*p && *p++ != '\n')
+			;
+		const char *e = p;
+		while(e > b && (byte)e[-1] <= ' ')
+			e--;
+		delimiter = String(b, e);
+	}
+//	DUMP(delimiter);
+
+	int delta = 4 + delimiter.GetLength();
+	const char *e = buffer.End();
+	if(e - p < delta)
+		return;
+	e -= delta;
+	while(p < e) { // read individual parts
+		String filename, content_type, name;
+		while(!MemICmp(p, "content-", 8)) { // parse content specifiers
+			p += 8;
+			if(!MemICmp(p, "disposition:", 12)) {
+				p += 12;
+				while(*p && *p != '\n')
+					if((byte)*p <= ' ')
+						p++;
+					else { // fetch key-value pair
+						const char *kp = p;
+						while(*p && *p != '\n' && *p != '=' && *p != ';')
+							p++;
+						const char *ke = p;
+						String value;
+						if(*p == '=') {
+							const char *b = ++p;
+							if(*p == '\"') { // quoted value
+								b++;
+								while(*++p && *p != '\n' && *p != '\"')
+									;
+								value = String(b, p);
+								if(*p == '\"')
+									p++;
+							}
+							else {
+								while(*p && *p != '\n' && *p != ';')
+									p++;
+								value = String(b, p);
+							}
+						}
+						if(ke - kp == 4 && !MemICmp(kp, "name", 4))
+							name = value;
+						else if(ke - kp == 8 && !MemICmp(kp, "filename", 8))
+							filename = value;
+						if(*p == ';')
+							p++;
+					}
+			}
+			else if(!MemICmp(p, "type:", 5)) {
+				p += 5;
+				while(*p && *p != '\n' && (byte)*p <= ' ')
+					p++;
+				const char *b = p;
+				while(*p && *p != '\n')
+					p++;
+				const char *e = p;
+				while(e > b && (byte)e[-1] <= ' ')
+					e--;
+				content_type = String(b, e);
+			}
+				;
+			while(*p && *p++ != '\n')
+				;
+		}
+		if(*p++ != '\r' || *p++ != '\n')
+			return;
+		const char *b = p;
+		while(p < e) {
+			p = (const char *)memchr(p, '\r', e - p);
+			if(!p)
+				return;
+			if(p[0] == '\r' && p[1] == '\n' && p[2] == '-' && p[3] == '-'
+				&& !memcmp(p + 4, delimiter, delimiter.GetLength()))
+				break;
+			p++;
+		}
+//		DUMP(name);
+//		DUMP(content_type);
+//		DUMP(filename);
+//		DUMP(String(b, p));
+		if(!name.IsEmpty()) { // add variables
+			if(!filename.IsEmpty())
+				query.Set("$$FILENAME$$" + name, filename);
+			if(!content_type.IsEmpty())
+				query.Set("$$CONTENT_TYPE$$" + name, content_type);
+			query.Set(name, String(b, p));
+		}
+		p += delta;
+		while(*p && *p++ != '\n')
+			;
+	}
+}
+
+static HtmlTag HtmlSmallFont()
+{
+	return HtmlFontSize(-2);
+}
+
+String GetHttpQueryDump(HttpQuery query)
+{
+	Htmls table;
+	for(int i = 0; i < query.GetCount(); i++) {
+		Htmls row;
+		row << HtmlCell().VAlign(ALIGN_TOP) / HtmlSmallFont() / HtmlBold() / (ToHtml(query.GetKey(i)) + "&nbsp;") << '\n';
+		String value = query.GetValue(i);
+		if(value.GetLength() >= 1000) {
+			value.Trim(1000);
+			value << NFormat(t_("... (total length: %d bytes)"), value.GetLength());
+		}
+		row << HtmlCell().VAlign(ALIGN_TOP) / HtmlSmallFont() / ToHtml(value);
+		table << HtmlRow() % row;
+	}
+	return HtmlTable().Border(0).CellSpacing(0).CellPadding(0) % table;
+}
+
+String GetHttpErrorPage(HttpQuery query, String err, bool show_query)
+{
+	Htmls body;
+	body << t_("The web server is unable to satisfy your request:\n<p>\n");
+	String request = query.GetString("$$PATH");
+	if(!query.IsEmpty("$$QUERY"))
+		request << '?' << query.GetString("$$QUERY");
+	body << HtmlTag("TT") / ToHtml(request)
+	<< "\n<p>\n"
+	<< HtmlBold() / t_("Reason:") << err
+	<< "\n<p>\n";
+	if(show_query)
+		body
+		<< HtmlSmallFont() / HtmlBold() / t_("Detailed query data:")
+		<< "\n<br>\n"
+		<< GetHttpQueryDump(query);
+
+	return HtmlTitlePage(t_("Web server error"), body);
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/Web/httpsrv.h b/uppsrc/Web/httpsrv.h
new file mode 100644
index 000000000..862656bdd
--- /dev/null
+++ b/uppsrc/Web/httpsrv.h
@@ -0,0 +1,185 @@
+String MIMECharsetName(byte charset);
+
+inline String HttpContentType(String type)                  { return "Content-Type: " + type + "\r\n"; }
+
+inline String HttpTextHtml(String encoding)                 { return "text/html; charset=" + encoding; }
+inline String HttpTextHtml(byte charset = CHARSET_DEFAULT)  { return HttpTextHtml(MIMECharsetName(charset)); }
+//inline String HttpTextHtml1250()                          { return "text/html; charset=windows-1250"; }
+inline String HttpTextPlain(String encoding)                { return "text/plain; charset=" + encoding; }
+//inline String HttpTextPlain1250()                         { return "text/plain; charset=windows-1250"; }
+inline String HttpTextPlain(byte charset = CHARSET_DEFAULT) { return HttpTextPlain(MIMECharsetName(charset)); }
+inline String HttpTextXml()                                 { return "text/xml"; }
+inline String HttpImage(String format)                      { return "image/" + format; }
+inline String HttpImageGif()                                { return "image/gif"; }
+inline String HttpImageJpg()                                { return "image/jpeg"; }
+inline String HttpImagePng()                                { return "image/png"; }
+inline String HttpBinary()                                  { return "application/octet-stream"; }
+
+class HttpServer;
+
+class HttpRequest
+{
+	friend class HttpServer;
+
+public:
+	HttpRequest(HttpServer& server, pick_ Socket& socket, HttpQuery query);
+
+	HttpServer&   GetServer()                              { return server; }
+	Socket&       GetSocket()                              { return socket; }
+#ifdef PLATFORM_WIN32
+	Event&        GetEvent()                               { return event; }
+#endif
+	HttpQuery     GetQuery() const                         { return query; }
+
+	bool          IsLogging() const;
+	void          LogTime(const char *s, int level);
+	int           GetDuration() const;
+
+	void          Write(String header, String body, int result_code, String result_text);
+	void          Write(String header, String body);
+	void          Write(String body)                       { Write(Null, body); }
+	void          Redirect(String url);
+	void          Error(String err);
+
+private:
+	HttpServer&   server;
+	Socket        socket;
+#ifdef PLATFORM_WIN32
+	SocketEvent   event;
+#endif
+	HttpQuery     query;
+	dword         request_ticks;
+};
+
+class HttpServer
+{
+public:
+	HttpServer();
+
+	bool               Open(int port, int listen_count = 5);
+	bool               Reopen();
+	void               Close();
+
+	bool               IsOpen() const                 { return socket.IsOpen(); }
+	bool               IsError() const                { return socket.IsError(); }
+	int                GetPort() const                { return server_port; }
+	Socket&            GetSocket()                    { return socket; }
+	Socket&            GetConnSocket()                { return connection; }
+#ifdef PLATFORM_WIN32
+	Event&             GetEvent()                     { return sock_event; }
+	Event&             GetConnEvent()                 { return conn_event; }
+#endif
+
+	void               Logging(const char *log = NULL, int max_log_size = 500000);
+	void               NoLogging()                    { logfile = Null; }
+	bool               IsLogging() const              { return !logfile.IsEmpty(); }
+	void               Log(const char *s, int level);
+	void               LogTime(const char *s, int level);
+	HttpServer&        operator << (const char *s)    { Log(s, 0); return *this; }
+
+	static HttpServer *Wait(const Vector<HttpServer *>& list, int msec);
+	bool               Wait(int msec);
+	void               GetReadSockets(Vector<Socket *>& sockets);
+	void               GetWriteSockets(Vector<Socket *>& sockets);
+#ifdef PLATFORM_WIN32
+	void               GetWaitEvents(Vector<Event *>& events);
+#endif
+	One<HttpRequest>   GetRequest();
+
+	Time               GetStartTime() const           { return start_time; }
+	double             GetHitCount() const            { return hit_count; }
+	double             GetResponseTime() const        { return total_response_msec; }
+	double             GetAvgTime() const;
+	double             GetAvgLagTime() const;
+	double             GetElapsedTime() const; // msec
+
+	String             GetDefaultHeader() const       { return default_header; }
+	void               DefaultHeader(String h)        { default_header = h; }
+
+	int                GetMaxPostSize() const         { return max_post_size; }
+	void               MaxPostSize(int size)          { max_post_size = size; }
+
+	int                GetMaxRequestTime() const      { return max_request_time; }
+	void               MaxRequestTime(int time)       { max_request_time = time; }
+
+	bool               IsShowQuery() const            { return show_headers; }
+	void               ShowQuery(bool sh = true)      { show_headers = sh; }
+
+	void               AddRequest(int duration_msec);
+	void               ReadPostData(Socket& socket, HttpQuery& query);
+
+	void               AddWrite(Socket socket, String data);
+	bool               DelayedWrite();
+	bool               IsDelayedWrite() const;
+
+public:
+	Callback2<String, int> WhenLog;
+
+private:
+	bool               Accept();
+
+private:
+	Socket             socket;
+	Socket             connection;
+#ifdef PLATFORM_WIN32
+	SocketEvent        sock_event;
+	SocketEvent        conn_event;
+#endif
+	class SocketWrite
+	{
+	public:
+		SocketWrite(Socket socket, String data, int ticks = 0);
+
+	public:
+		Socket      socket;
+#ifdef PLATFORM_WIN32
+		SocketEvent sock_event;
+#endif
+		String      data;
+		int         done;
+		int         ticks;
+	};
+	Array<SocketWrite> delayed_writes;
+
+	int                server_port;
+	dword              ipaddr;
+	String             default_header;
+	String             logfile;
+	int                max_log_size;
+	enum { DEFAULT_MAX_POST_SIZE = 1000000 };
+	int                max_post_size;
+	enum { DEFAULT_MAX_REQUEST_TIME = 60000 };
+	int                max_request_time;
+	bool               show_headers;
+
+	int                request_time;
+	int                request_state;
+	enum { RS_FIRST, RS_SAPI, RS_GET_HEADERS, RS_POST_HEADERS, RS_POST_DATA };
+	String             first_line;
+	String             sapi_request;
+	int                sapi_length;
+	int                request_version;
+	String             header_line;
+	int                headers_length;
+	int                post_length;
+	String             post_data;
+	HttpQuery          request_query;
+
+	Time               start_time;
+	double             hit_count;
+	double             total_response_msec;
+
+	enum { TRAILER = 10 };
+	dword              trailing_times[TRAILER];
+	dword              trailing_sum;
+	int                trailing_count;
+};
+
+inline bool   HttpRequest::IsLogging() const { return server.IsLogging(); }
+
+inline String GetHttpPath(HttpQuery query)  { return query.GetString("$$PATH"); }
+inline String GetHttpQuery(HttpQuery query) { return query.GetString("$$QUERY"); }
+String        GetHttpURI(HttpQuery query);
+void          GetHttpPostData(HttpQuery& query, String data);
+String        GetHttpQueryDump(HttpQuery query);
+String        GetHttpErrorPage(HttpQuery query, String err, bool show_query);
diff --git a/uppsrc/Web/init b/uppsrc/Web/init
new file mode 100644
index 000000000..d1df1ae75
--- /dev/null
+++ b/uppsrc/Web/init
@@ -0,0 +1,5 @@
+#ifndef _Web_icpp_init_stub
+#define _Web_icpp_init_stub
+#include "Core/init"
+#include "Web_init.icpp"
+#endif
diff --git a/uppsrc/Web/md5.cpp b/uppsrc/Web/md5.cpp
new file mode 100644
index 000000000..14b4c14e7
--- /dev/null
+++ b/uppsrc/Web/md5.cpp
@@ -0,0 +1,336 @@
+#include "Web.h"
+
+NAMESPACE_UPP
+
+/* MD5 context. */
+typedef struct {
+	dword state[4];                                   /* state (ABCD) */
+	dword count[2];        /* number of bits, modulo 2^64 (lsb first) */
+	unsigned char buffer[64];                         /* input buffer */
+} MD5_CTX;
+
+void MD5Init (MD5_CTX *);
+void MD5Update (MD5_CTX *, const unsigned char *, unsigned int);
+void MD5Final (unsigned char [16], MD5_CTX *);
+
+String MD5Digest(const char *text, int length)
+{
+	MD5_CTX context;
+	unsigned char digest[16];
+
+	MD5Init (&context);
+	MD5Update (&context, (const unsigned char *)text, length);
+	MD5Final (digest, &context);
+
+	return String(digest, 16);
+}
+
+/* MD5C.C - RSA Data Security, Inc., MD5 message-digest algorithm
+*/
+
+/* Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
+rights reserved.
+
+License to copy and use this software is granted provided that it
+is identified as the "RSA Data Security, Inc. MD5 Message-Digest
+Algorithm" in all material mentioning or referencing this software
+or this function.
+
+License is also granted to make and use derivative works provided
+that such works are identified as "derived from the RSA Data
+Security, Inc. MD5 Message-Digest Algorithm" in all material
+mentioning or referencing the derived work.
+
+RSA Data Security, Inc. makes no representations concerning either
+the merchantability of this software or the suitability of this
+software for any particular purpose. It is provided "as is"
+without express or implied warranty of any kind.
+
+These notices must be retained in any copies of any part of this
+documentation and/or software.
+*/
+
+/* Constants for MD5Transform routine.
+*/
+
+#define S11 7
+#define S12 12
+#define S13 17
+#define S14 22
+#define S21 5
+#define S22 9
+#define S23 14
+#define S24 20
+#define S31 4
+#define S32 11
+#define S33 16
+#define S34 23
+#define S41 6
+#define S42 10
+#define S43 15
+#define S44 21
+
+static void MD5Transform (dword [4], const unsigned char [64]);
+static void Encode (unsigned char *, const dword *, unsigned int);
+static void Decode (dword *, const unsigned char *, unsigned int);
+static void MD5_memcpy (void *, const void *, unsigned int);
+static void MD5_memset (void *, int, unsigned int);
+
+static unsigned char PADDING[64] = {
+	0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+};
+
+/* F, G, H and I are basic MD5 functions.
+*/
+#define F(x, y, z) (((x) & (y)) | ((~x) & (z)))
+#define G(x, y, z) (((x) & (z)) | ((y) & (~z)))
+#define H(x, y, z) ((x) ^ (y) ^ (z))
+#define I(x, y, z) ((y) ^ ((x) | (~z)))
+
+/* ROTATE_LEFT rotates x left n bits.
+*/
+#define ROTATE_LEFT(x, n) (((x) << (n)) | ((x) >> (32-(n))))
+
+/* FF, GG, HH, and II transformations for rounds 1, 2, 3, and 4.
+Rotation is separate from addition to prevent recomputation.
+*/
+#define FF(a, b, c, d, x, s, ac) { \
+		(a) += F ((b), (c), (d)) + (x) + (dword)(ac); \
+		(a) = ROTATE_LEFT ((a), (s)); \
+		(a) += (b); \
+	}
+#define GG(a, b, c, d, x, s, ac) { \
+		(a) += G ((b), (c), (d)) + (x) + (dword)(ac); \
+		(a) = ROTATE_LEFT ((a), (s)); \
+		(a) += (b); \
+	}
+#define HH(a, b, c, d, x, s, ac) { \
+		(a) += H ((b), (c), (d)) + (x) + (dword)(ac); \
+		(a) = ROTATE_LEFT ((a), (s)); \
+		(a) += (b); \
+	}
+#define II(a, b, c, d, x, s, ac) { \
+		(a) += I ((b), (c), (d)) + (x) + (dword)(ac); \
+		(a) = ROTATE_LEFT ((a), (s)); \
+		(a) += (b); \
+	}
+
+/* MD5 initialization. Begins an MD5 operation, writing a new context.
+*/
+void MD5Init (MD5_CTX *context)
+{
+	context->count[0] = context->count[1] = 0;
+	/* Load magic initialization constants.
+*/
+	context->state[0] = 0x67452301;
+	context->state[1] = 0xefcdab89;
+	context->state[2] = 0x98badcfe;
+	context->state[3] = 0x10325476;
+}
+
+/* MD5 block update operation. Continues an MD5 message-digest
+	operation, processing another message block, and updating the
+	context.
+*/
+void MD5Update (MD5_CTX *context, const unsigned char *input, unsigned int inputLen)
+//MD5_CTX *context;                                        /* context */
+//unsigned char *input;                                /* input block */
+//unsigned int inputLen;                     /* length of input block */
+{
+	unsigned int i, index, partLen;
+
+	/* Compute number of bytes mod 64 */
+	index = (unsigned int)((context->count[0] >> 3) & 0x3F);
+
+	/* Update number of bits */
+	if ((context->count[0] += ((dword)inputLen << 3)) < ((dword)inputLen << 3))
+		context->count[1]++;
+	context->count[1] += ((dword)inputLen >> 29);
+
+	partLen = 64 - index;
+
+	/* Transform as many times as possible.
+*/
+	if (inputLen >= partLen) {
+		MD5_memcpy
+			((void *)&context->buffer[index], (void *)input, partLen);
+		MD5Transform (context->state, context->buffer);
+
+		for (i = partLen; i + 63 < inputLen; i += 64)
+			MD5Transform (context->state, &input[i]);
+
+		index = 0;
+	}
+	else
+		i = 0;
+
+	/* Buffer remaining input */
+	MD5_memcpy((void *)&context->buffer[index], (void *)&input[i],
+	inputLen-i);
+}
+
+/* MD5 finalization. Ends an MD5 message-digest operation, writing the
+	the message digest and zeroizing the context.
+*/
+void MD5Final (unsigned char *digest, MD5_CTX *context)
+{
+	unsigned char bits[8];
+	unsigned int index, padLen;
+
+	/* Save number of bits */
+	Encode (bits, context->count, 8);
+
+	/* Pad out to 56 mod 64.
+*/
+	index = (unsigned int)((context->count[0] >> 3) & 0x3f);
+	padLen = (index < 56) ? (56 - index) : (120 - index);
+	MD5Update (context, PADDING, padLen);
+
+	/* Append length (before padding) */
+	MD5Update (context, bits, 8);
+
+	/* Store state in digest */
+	Encode (digest, context->state, 16);
+
+	/* Zeroize sensitive information.
+*/
+	MD5_memset ((void *)context, 0, sizeof (*context));
+}
+
+/* MD5 basic transformation. Transforms state based on block.
+*/
+static void MD5Transform (dword state[4], const unsigned char block[64])
+{
+	dword a = state[0], b = state[1], c = state[2], d = state[3], x[16];
+
+	Decode (x, block, 64);
+
+	/* Round 1 */
+	FF (a, b, c, d, x[ 0], S11, 0xd76aa478); /* 1 */
+	FF (d, a, b, c, x[ 1], S12, 0xe8c7b756); /* 2 */
+	FF (c, d, a, b, x[ 2], S13, 0x242070db); /* 3 */
+	FF (b, c, d, a, x[ 3], S14, 0xc1bdceee); /* 4 */
+	FF (a, b, c, d, x[ 4], S11, 0xf57c0faf); /* 5 */
+	FF (d, a, b, c, x[ 5], S12, 0x4787c62a); /* 6 */
+	FF (c, d, a, b, x[ 6], S13, 0xa8304613); /* 7 */
+	FF (b, c, d, a, x[ 7], S14, 0xfd469501); /* 8 */
+	FF (a, b, c, d, x[ 8], S11, 0x698098d8); /* 9 */
+	FF (d, a, b, c, x[ 9], S12, 0x8b44f7af); /* 10 */
+	FF (c, d, a, b, x[10], S13, 0xffff5bb1); /* 11 */
+	FF (b, c, d, a, x[11], S14, 0x895cd7be); /* 12 */
+	FF (a, b, c, d, x[12], S11, 0x6b901122); /* 13 */
+	FF (d, a, b, c, x[13], S12, 0xfd987193); /* 14 */
+	FF (c, d, a, b, x[14], S13, 0xa679438e); /* 15 */
+	FF (b, c, d, a, x[15], S14, 0x49b40821); /* 16 */
+
+/* Round 2 */
+	GG (a, b, c, d, x[ 1], S21, 0xf61e2562); /* 17 */
+	GG (d, a, b, c, x[ 6], S22, 0xc040b340); /* 18 */
+	GG (c, d, a, b, x[11], S23, 0x265e5a51); /* 19 */
+	GG (b, c, d, a, x[ 0], S24, 0xe9b6c7aa); /* 20 */
+	GG (a, b, c, d, x[ 5], S21, 0xd62f105d); /* 21 */
+	GG (d, a, b, c, x[10], S22,  0x2441453); /* 22 */
+	GG (c, d, a, b, x[15], S23, 0xd8a1e681); /* 23 */
+	GG (b, c, d, a, x[ 4], S24, 0xe7d3fbc8); /* 24 */
+	GG (a, b, c, d, x[ 9], S21, 0x21e1cde6); /* 25 */
+	GG (d, a, b, c, x[14], S22, 0xc33707d6); /* 26 */
+	GG (c, d, a, b, x[ 3], S23, 0xf4d50d87); /* 27 */
+
+	GG (b, c, d, a, x[ 8], S24, 0x455a14ed); /* 28 */
+	GG (a, b, c, d, x[13], S21, 0xa9e3e905); /* 29 */
+	GG (d, a, b, c, x[ 2], S22, 0xfcefa3f8); /* 30 */
+	GG (c, d, a, b, x[ 7], S23, 0x676f02d9); /* 31 */
+	GG (b, c, d, a, x[12], S24, 0x8d2a4c8a); /* 32 */
+
+	/* Round 3 */
+	HH (a, b, c, d, x[ 5], S31, 0xfffa3942); /* 33 */
+	HH (d, a, b, c, x[ 8], S32, 0x8771f681); /* 34 */
+	HH (c, d, a, b, x[11], S33, 0x6d9d6122); /* 35 */
+	HH (b, c, d, a, x[14], S34, 0xfde5380c); /* 36 */
+	HH (a, b, c, d, x[ 1], S31, 0xa4beea44); /* 37 */
+	HH (d, a, b, c, x[ 4], S32, 0x4bdecfa9); /* 38 */
+	HH (c, d, a, b, x[ 7], S33, 0xf6bb4b60); /* 39 */
+	HH (b, c, d, a, x[10], S34, 0xbebfbc70); /* 40 */
+	HH (a, b, c, d, x[13], S31, 0x289b7ec6); /* 41 */
+	HH (d, a, b, c, x[ 0], S32, 0xeaa127fa); /* 42 */
+	HH (c, d, a, b, x[ 3], S33, 0xd4ef3085); /* 43 */
+	HH (b, c, d, a, x[ 6], S34,  0x4881d05); /* 44 */
+	HH (a, b, c, d, x[ 9], S31, 0xd9d4d039); /* 45 */
+	HH (d, a, b, c, x[12], S32, 0xe6db99e5); /* 46 */
+	HH (c, d, a, b, x[15], S33, 0x1fa27cf8); /* 47 */
+	HH (b, c, d, a, x[ 2], S34, 0xc4ac5665); /* 48 */
+
+	/* Round 4 */
+	II (a, b, c, d, x[ 0], S41, 0xf4292244); /* 49 */
+	II (d, a, b, c, x[ 7], S42, 0x432aff97); /* 50 */
+	II (c, d, a, b, x[14], S43, 0xab9423a7); /* 51 */
+	II (b, c, d, a, x[ 5], S44, 0xfc93a039); /* 52 */
+	II (a, b, c, d, x[12], S41, 0x655b59c3); /* 53 */
+	II (d, a, b, c, x[ 3], S42, 0x8f0ccc92); /* 54 */
+	II (c, d, a, b, x[10], S43, 0xffeff47d); /* 55 */
+	II (b, c, d, a, x[ 1], S44, 0x85845dd1); /* 56 */
+	II (a, b, c, d, x[ 8], S41, 0x6fa87e4f); /* 57 */
+	II (d, a, b, c, x[15], S42, 0xfe2ce6e0); /* 58 */
+	II (c, d, a, b, x[ 6], S43, 0xa3014314); /* 59 */
+	II (b, c, d, a, x[13], S44, 0x4e0811a1); /* 60 */
+	II (a, b, c, d, x[ 4], S41, 0xf7537e82); /* 61 */
+	II (d, a, b, c, x[11], S42, 0xbd3af235); /* 62 */
+	II (c, d, a, b, x[ 2], S43, 0x2ad7d2bb); /* 63 */
+	II (b, c, d, a, x[ 9], S44, 0xeb86d391); /* 64 */
+
+	state[0] += a;
+	state[1] += b;
+	state[2] += c;
+	state[3] += d;
+
+	/* Zeroize sensitive information.
+
+*/
+	MD5_memset ((void *)x, 0, sizeof (x));
+}
+
+/* Encodes input (dword) into output (unsigned char). Assumes len is
+	a multiple of 4.
+*/
+static void Encode (unsigned char *output, const dword *input, unsigned int len)
+{
+	unsigned int i, j;
+
+	for (i = 0, j = 0; j < len; i++, j += 4) {
+		output[j] = (unsigned char)(input[i] & 0xff);
+		output[j+1] = (unsigned char)((input[i] >> 8) & 0xff);
+		output[j+2] = (unsigned char)((input[i] >> 16) & 0xff);
+		output[j+3] = (unsigned char)((input[i] >> 24) & 0xff);
+	}
+}
+
+/* Decodes input (unsigned char) into output (dword). Assumes len is
+	a multiple of 4.
+*/
+static void Decode (dword *output, const unsigned char *input, unsigned int len)
+{
+	unsigned int i, j;
+
+	for (i = 0, j = 0; j < len; i++, j += 4)
+		output[i] = ((dword)input[j]) | (((dword)input[j+1]) << 8) |
+		(((dword)input[j+2]) << 16) | (((dword)input[j+3]) << 24);
+}
+
+/* Note: Replace "for loop" with standard memcpy if possible.
+*/
+
+static void MD5_memcpy (void * output, const void * input, unsigned int len)
+{
+	memcpy(output, input, len);
+}
+
+/* Note: Replace "for loop" with standard memset if possible.
+*/
+static void MD5_memset (void * output, int value, unsigned int len)
+{
+	memset(output, value, len);
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/Web/smtp.cpp b/uppsrc/Web/smtp.cpp
new file mode 100644
index 000000000..c6068d854
--- /dev/null
+++ b/uppsrc/Web/smtp.cpp
@@ -0,0 +1,363 @@
+#include "Web.h"
+
+NAMESPACE_UPP
+
+//#define SMTP_DEBUG // uncomment this line to turn on LOG-based SMTP emulation
+#define SMTP_LOG // uncomment this line to turn on command-line based logging of SMTP communication
+
+static String GetDelimiter(const char *b, const char *e, String init)
+{
+	static const char delimiters[] =
+		"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdef"
+		"ghijklmnopqrstuvxyz()+/:?0123456"
+		"789abcdefghijklmnopqrstuvwxyzABC"
+		"DEFGHIJKLMNOPQRSTUVWXYZ012345678";
+
+	String out = init;
+	if(b == e)
+		return out;
+	if(IsNull(out))
+		out.Cat(delimiters[*b++ & 0x7F]);
+	int l = out.GetLength();
+	for(; b != e; b++)
+	{
+		b = (const char *)memchr(b, *out, e - b);
+		if(!b || e - b < l)
+			return out;
+		if(!memcmp(b, out, l))
+		{
+			if(e - b == l)
+				return out + '/';
+			out.Cat(delimiters[b[l] & 0x7F]);
+		}
+	}
+	return out;
+}
+
+static String GetDelimiter(String s, String init)
+{
+	return GetDelimiter(s.Begin(), s.End(), init);
+}
+
+static void Send(Socket& socket, const String &s, String *transcript = 0, int timeout = 60)
+{
+#ifdef SMTP_LOG
+	puts("Command: " + s);
+#endif
+	if(transcript && !s.IsEmpty())
+	{
+		transcript -> Cat(s);
+		if(*s.Last() != '\n')
+			transcript -> Cat('\n');
+	}
+#ifdef SMTP_DEBUG
+	GetVppLog().Put(s);
+	return;
+#endif
+	dword end_time = (timeout >= 0 ? GetTickCount() + 1000 * timeout : 0xFFFFFFFF);
+	const char *p = s.Begin(), *e = s.End();
+	while(p != e)
+	{
+		if((dword)GetTickCount() > end_time)
+			throw Exc(t_("Communication Failure: Timeout."));
+
+		int amount = socket.WriteRaw(p, int(e - p)), err;
+		if(amount > 0)
+		{ // some data has been sent - reset timeout
+			p += amount;
+			end_time = (timeout >= 0 ? GetTickCount() + 1000 * timeout : 0xFFFFFFFF);
+		}
+		else if(amount == 0)
+			throw Exc(t_("Error writing data to socket: communication port closed."));
+		else if((err = Socket::GetErrorCode()) != SOCKERR(EWOULDBLOCK)) {
+			String str;
+			throw Exc(str << t_("Error writing data to socket, error code: ") << err);
+		}
+		else
+			Sleep(100);
+	}
+}
+
+static String SendRecv(Socket& socket, const String& s, String *transcript = 0, int timeout = 60)
+{
+	Send(socket, s, transcript, timeout);
+#ifdef SMTP_DEBUG
+	return "250 OK";
+#endif
+	String dest;
+	dword end_time = (timeout >= 0 ? GetTickCount() + 1000 * timeout : 0xFFFFFFFF);
+	for(;;)
+	{
+		if((dword)GetTickCount() > end_time)
+			throw Exc(t_("Communication Failure: Timeout."));
+		char buffer[100];
+		int amount = socket.ReadRaw(buffer, sizeof(buffer)), err;
+		if(amount > 0)
+		{
+			dest.Cat(buffer, amount);
+			while(--amount >= 0)
+				if(buffer[amount] == '\n')
+				{
+					if(transcript && !dest.IsEmpty())
+					{
+						transcript -> Cat(dest);
+						if(*dest.Last() != '\n')
+							transcript -> Cat('\n');
+					}
+#ifdef SMTP_LOG
+					puts("Reply: " + dest);
+#endif
+					return dest;
+				}
+		}
+		else if(amount == 0)
+			throw Exc(t_("Error reading data from socket: commuication port closed."));
+		else if((err = Socket::GetErrorCode()) != SOCKERR(EWOULDBLOCK)) {
+			String str;
+			throw Exc(str << "Chyba p�i �ten� dat ze socketu, k�d chyby: " << err);
+		}
+		else
+			Sleep(100);
+	}
+}
+
+static void SendRecvOK(Socket& socket, const String& s, String *transcript = 0, int timeout = 60)
+{
+	String ans = SendRecv(socket, s, transcript, timeout);
+	if(ans[0] != '2' || ans[1] != '5' || ans[2] != '0')
+		throw Exc(ans);
+}
+
+//////////////////////////////////////////////////////////////////////
+// SmtpMail::
+
+SmtpMail::SmtpMail()
+: port(25)
+, no_header(false)
+, no_header_sep(false)
+, time_sent(GetSysTime())
+{
+}
+
+static const char default_mime[] = "application/octet-stream";
+
+SmtpMail& SmtpMail::AttachFile(const char *filename, const char *mime)
+{
+	Attachment& attach = attachments.Add();
+	attach.name = GetFileNamePos(filename);
+	attach.mime = (mime ? mime : default_mime);
+	attach.file = filename;
+	return *this;
+}
+
+SmtpMail& SmtpMail::Attach(const char *name, String data, const char *mime)
+{
+	Attachment& attach = attachments.Add();
+	attach.name = name;
+	attach.mime = (mime ? mime : default_mime);
+	attach.data = data;
+	return *this;
+}
+
+bool SmtpMail::Send()
+{
+	Socket socket;
+	String ipaddr;
+
+	try
+	{
+		if(IsNull(host))
+			throw Exc(t_("Host not set."));
+
+		if(to.IsEmpty())
+			throw Exc(t_("Recipient not set."));
+
+#ifdef SMTP_DEBUG
+		ipaddr = "1.2.3.4";
+#else
+		Socket::Init();
+		dword my_addr;
+		if(!ClientSocket(socket, host, port, true, &my_addr, 10000, true))
+			throw Exc(NFormat("Cannot open socket %s:%d: %s", host, port, Socket::GetErrorText()));
+
+		ipaddr
+			<< (int)((my_addr >>  0) & 0xFF) << '.'
+			<< (int)((my_addr >>  8) & 0xFF) << '.'
+			<< (int)((my_addr >> 16) & 0xFF) << '.'
+			<< (int)((my_addr >> 24) & 0xFF);
+#endif
+
+		String *trans_ptr = (transcript ? &transcript_text : 0);
+		String ans;
+
+		// receive initial message & send hello
+		SendRecv(socket, Null, trans_ptr, 30);
+		String org;
+		int pos = from.Find('@');
+		if(pos >= 0)
+		{
+			int start = ++pos, len = from.GetLength();
+			while(pos < len && from[pos] != '>')
+				pos++;
+			org = from.Mid(start, pos - start);
+		}
+		else
+			org << ipaddr;
+
+		SendRecvOK(socket, "HELO " + org + "\r\n", trans_ptr);
+		SendRecvOK(socket, "MAIL FROM:<" + from + ">\r\n", trans_ptr);
+		for(int i = 0; i < to.GetCount(); i++)
+			SendRecv(socket, "RCPT TO:<" + to[i] + ">\r\n", trans_ptr);
+		ans = SendRecv(socket, "DATA\r\n", trans_ptr);
+#ifndef SMTP_DEBUG
+		if(memcmp(ans, "354", 3))
+			throw Exc(ans);
+#endif
+
+		String delimiter = "?";
+		for(int i = 0; i < text.GetCount(); i++)
+			delimiter = GetDelimiter(text[i], delimiter);
+		bool alter = text.GetCount() > 1;
+		bool multi = !attachments.IsEmpty();
+
+		{ // format message
+			String msg;
+			if(!no_header)
+			{ // generate message header
+				msg << "From: " << from << "\r\n";
+				static const AS as_list[] = { TO, CC, BCC };
+				static const char *as_name[] = { "To", "CC", "BCC" };
+				for(int a = 0; a < __countof(as_list); a++)
+				{
+					int pos = 0;
+					for(int i = 0; i < as.GetCount(); i++)
+						if(as[i] == as_list[a])
+						{
+							if(pos && pos + to[i].GetLength() >= 70)
+							{
+								msg << "\r\n     ";
+								pos = 5;
+							}
+							else if(pos)
+							{
+								msg << ", ";
+								pos += 2;
+							}
+							else
+							{
+								msg << as_name[a] << ": ";
+								pos = (int)strlen(as_name[a]) + 2;
+							}
+							msg << to[i];
+						}
+					if(pos)
+						msg << "\r\n";
+				}
+				if(!IsNull(subject))
+					msg << "Subject: " << subject << "\r\n";
+				if(!IsNull(reply_to))
+					msg << "Reply-To: " << reply_to << "\r\n";
+				if(!IsNull(time_sent)) {
+					static const char *dayofweek[] =
+					{ "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" };
+					static const char *month[] =
+					{ "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" };
+					msg << "Date: "
+						<< dayofweek[DayOfWeek(time_sent)] << ", "
+						<< (int)time_sent.day << ' ' << month[time_sent.month - 1] << ' ' << (int)time_sent.year
+						<< ' ' << Sprintf("%2d:%02d:%02d +0100", time_sent.hour, time_sent.minute, time_sent.second)
+						<< "\r\n";
+				}
+				if(multi || alter)
+					msg << "Content-Type: Multipart/" << (alter ? "alternative" : "mixed")
+						<< "; boundary=\"" << delimiter << "\"\r\n"
+						"\r\n";
+			}
+
+			for(int i = 0; i < text.GetCount(); i++) {
+				String t = text[i], m = mime[i];
+				if(!no_header) {
+					if(multi || alter)
+						msg << "--" << delimiter << "\r\n";
+					if(IsNull(m))
+						m << "text/plain; charset=\"" << MIMECharsetName(CHARSET_DEFAULT) << "\"";
+					msg << "Content-Type: " << m << "\r\n"
+					"Content-Transfer-Encoding: quoted-printable\r\n";
+				}
+				if(!no_header_sep)
+					msg << "\r\n";
+				bool begin = true;
+				for(const char *p = t.Begin(), *e = t.End(); p != e; p++)
+					if(*p >= 33 && *p <= 126 && *p != '=' && (*p != '.' || !begin)) {
+						msg.Cat(*p);
+						begin = false;
+					}
+					else if(*p == '.' && begin) {
+						msg.Cat("..");
+						begin = false;
+					}
+					else if(*p == ' ' && p + 1 != e && p[1] != '\r' && p[1] != '\n') {
+						msg.Cat(' ');
+						begin = false;
+					}
+					else if(*p == '\r')
+						;
+					else if(*p == '\n') {
+						msg.Cat("\r\n");
+						begin = true;
+					}
+					else {
+						static const char hex[] = "0123456789ABCDEF";
+						msg.Cat('=');
+						msg.Cat(hex[(*p >> 4) & 15]);
+						msg.Cat(hex[*p & 15]);
+					}
+
+				if(!begin)
+					msg.Cat("\r\n");
+			}
+			for(int i = 0; i < attachments.GetCount(); i++) {
+				const Attachment& a = attachments[i];
+				One<Stream> source;
+				if(!IsNull(a.file)) {
+					One<FileIn> fi = new FileIn(a.file);
+					if(fi -> IsOpen())
+						source = -fi;
+				}
+				else
+					source = new StringStream(a.data);
+				msg << "--" << delimiter << "\r\n"
+					"Content-Type: " << a.mime << "; name=\"" << a.name << "\"\r\n"
+					"Content-Transfer-Encoding: base64\r\n"
+					"Content-Disposition: attachment; filename=\"" << a.name << "\"\r\n"
+					"\r\n";
+
+				char buffer[54];
+				for(int c; (c = source -> Get(buffer, sizeof(buffer))) != 0;)
+				{
+					msg.Cat(Base64Encode(buffer, buffer + c));
+					msg.Cat('\r');
+					msg.Cat('\n');
+					if(msg.GetLength() >= 65536) {
+						UPP::Send(socket, msg, trans_ptr);
+						msg = Null;
+					}
+				}
+			}
+			if(multi || alter)
+				msg << "--" << delimiter << "--\r\n";
+			msg.Cat(".\r\n");
+			SendRecvOK(socket, msg, trans_ptr);
+		}
+
+		SendRecv(socket, "QUIT\r\n", trans_ptr);
+		return true;
+	}
+	catch(Exc e)
+	{
+		error = e;
+		return false;
+	}
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/Web/smtp.h b/uppsrc/Web/smtp.h
new file mode 100644
index 000000000..b8414207d
--- /dev/null
+++ b/uppsrc/Web/smtp.h
@@ -0,0 +1,56 @@
+class SmtpMail
+{
+public:
+	enum AS { TO, CC, BCC };
+
+	SmtpMail();
+
+	SmtpMail&      Host(String h)                 { host = h; return *this; }
+	SmtpMail&      Port(int p)                    { port = p; return *this; }
+	SmtpMail&      From(String f)                 { from = f; return *this; }
+	SmtpMail&      To(String t, AS a = TO)        { to.Add(t); as.Add(a); return *this; }
+	SmtpMail&      Text(String t, String m = Null) { text.Add(t); mime.Add(m); return *this; }
+	SmtpMail&      NoHeader()                     { no_header = true; return *this; }
+	SmtpMail&      NoHeaderSep()                  { no_header_sep = true; return *this; }
+	SmtpMail&      ReplyTo(String r)              { reply_to = r; return *this; }
+	SmtpMail&      TimeSent(Time t)               { time_sent = t; return *this; }
+	SmtpMail&      Subject(String s)              { subject = s; return *this; }
+	SmtpMail&      Transcript(bool t = true)      { transcript = t; return *this; }
+	SmtpMail&      AttachFile(const char *filename, const char *mime = 0);
+	SmtpMail&      Attach(const char *name, String data, const char *mime = 0);
+
+	bool           Send();
+
+	String         GetError() const          { return error; }
+	String         GetTranscript() const     { return transcript_text; }
+
+private:
+	struct Attachment
+	{
+		String name; // mail name
+		String file; // source path (dynamic attachments only)
+		String mime; // content type (application/octet-stream by default)
+		String data;
+	};
+
+	String         host;
+	int            port; // default = 25
+	String         from;
+	Vector<String> to;
+	Vector<char>   as;
+	Vector<String> text;
+	Vector<String> mime; // default: text/plain; charset=<default application charset>
+	bool           transcript; // default = false
+	Array<Attachment> attachments;
+
+	// header-related parts
+	bool           no_header; // default = false
+	bool           no_header_sep; // default = false
+	Time           time_sent;
+	String         reply_to;
+	String         subject;
+
+	// state automaton
+	String         error;
+	String         transcript_text;
+};
diff --git a/uppsrc/Web/socket.cpp b/uppsrc/Web/socket.cpp
new file mode 100644
index 000000000..2d953f973
--- /dev/null
+++ b/uppsrc/Web/socket.cpp
@@ -0,0 +1,823 @@
+#include "Web.h"
+
+#ifdef PLATFORM_WIN32
+#include <winsock2.h>
+#endif
+
+NAMESPACE_UPP
+
+#define FAKEERROR 0
+#define FAKESLOWLINE 0 // 57600 // Bd fake line speed, 0 = off
+
+#ifdef PLATFORM_WIN32
+#pragma comment(lib, "ws2_32.lib")
+#endif
+
+enum {
+	NB_TIMEOUT  = 30000,
+	SOCKBUFSIZE = 65536,
+
+#ifdef PLATFORM_WIN32
+	IS_BLOCKED = SOCKERR(EWOULDBLOCK),
+#else
+	IS_BLOCKED = SOCKERR(EINPROGRESS),
+#endif
+};
+
+static bool LogSocketFlag = false;
+
+void LogSockets(bool ls) { LogSocketFlag = ls; }
+bool IsLogSockets()      { return LogSocketFlag; }
+
+#define SLOG(x) if(!LogSocketFlag) ; else RLOG("[" << GetSysTime() << " @ " << int(GetTickCount() % 10000u) << "] " << x)
+#define LLOG(x)
+
+#ifdef PLATFORM_POSIX
+
+const char *SocketErrorDesc(int code)
+{
+	return strerror(code);
+}
+
+#else
+
+const char *SocketErrorDesc(int code)
+{
+	switch(code) {
+#define ERRINFO(code, desc) case code: return desc " (" #code ")";
+
+ERRINFO(WSAEINTR,                 "Interrupted function call.")
+ERRINFO(WSAEACCES,                "Permission denied.")
+ERRINFO(WSAEFAULT,                "Bad address.")
+ERRINFO(WSAEINVAL,                "Invalid argument.")
+ERRINFO(WSAEMFILE,                "Too many open files.")
+ERRINFO(WSAEWOULDBLOCK,           "Resource temporarily unavailable.")
+ERRINFO(WSAEINPROGRESS,           "Operation now in progress.")
+ERRINFO(WSAEALREADY,              "Operation already in progress.")
+ERRINFO(WSAENOTSOCK,              "Socket operation on nonsocket.")
+ERRINFO(WSAEDESTADDRREQ,          "Destination address required.")
+ERRINFO(WSAEMSGSIZE,              "Message too long.")
+ERRINFO(WSAEPROTOTYPE,            "Protocol wrong type for socket.")
+ERRINFO(WSAENOPROTOOPT,           "Bad protocol option.")
+ERRINFO(WSAEPROTONOSUPPORT,       "Protocol not supported.")
+ERRINFO(WSAESOCKTNOSUPPORT,       "Socket type not supported.")
+ERRINFO(WSAEOPNOTSUPP,            "Operation not supported.")
+ERRINFO(WSAEPFNOSUPPORT,          "Protocol family not supported.")
+ERRINFO(WSAEAFNOSUPPORT,          "Address family not supported by protocol family.")
+ERRINFO(WSAEADDRINUSE,            "Address already in use.")
+ERRINFO(WSAEADDRNOTAVAIL,         "Cannot assign requested address.")
+ERRINFO(WSAENETDOWN,              "Network is down.")
+ERRINFO(WSAENETUNREACH,           "Network is unreachable.")
+ERRINFO(WSAENETRESET,             "Network dropped connection on reset.")
+ERRINFO(WSAECONNABORTED,          "Software caused connection abort.")
+ERRINFO(WSAECONNRESET,            "Connection reset by peer.")
+ERRINFO(WSAENOBUFS,               "No buffer space available.")
+ERRINFO(WSAEISCONN,               "Socket is already connected.")
+ERRINFO(WSAENOTCONN,              "Socket is not connected.")
+ERRINFO(WSAESHUTDOWN,             "Cannot send after socket shutdown.")
+ERRINFO(WSAETIMEDOUT,             "Connection timed out.")
+ERRINFO(WSAECONNREFUSED,          "Connection refused.")
+ERRINFO(WSAEHOSTDOWN,             "Host is down.")
+ERRINFO(WSAEHOSTUNREACH,          "No route to host.")
+ERRINFO(WSAEPROCLIM,              "Too many processes.")
+ERRINFO(WSASYSNOTREADY,           "Network subsystem is unavailable.")
+ERRINFO(WSAVERNOTSUPPORTED,       "Winsock.dll version out of range.")
+ERRINFO(WSANOTINITIALISED,        "Successful WSAStartup not yet performed.")
+ERRINFO(WSAEDISCON,               "Graceful shutdown in progress.")
+ERRINFO(WSATYPE_NOT_FOUND,        "Class type not found.")
+ERRINFO(WSAHOST_NOT_FOUND,        "Host not found.")
+ERRINFO(WSATRY_AGAIN,             "Nonauthoritative host not found.")
+ERRINFO(WSANO_RECOVERY,           "This is a nonrecoverable error.")
+ERRINFO(WSANO_DATA,               "Valid name, no data record of requested type.")
+//ERRINFO(WSA_INVALID_HANDLE,       "Specified event object handle is invalid.")
+//ERRINFO(WSA_INVALID_PARAMETER,    "One or more parameters are invalid.")
+//ERRINFO(WSA_IO_INCOMPLETE,        "Overlapped I/O event object not in signaled state.")
+//ERRINFO(WSA_IO_PENDING,           "Overlapped operations will complete later.")
+//ERRINFO(WSA_NOT_ENOUGH_MEMORY,    "Insufficient memory available.")
+//ERRINFO(WSA_OPERATION_ABORTED,    "Overlapped operation aborted.")
+//ERRINFO(WSAINVALIDPROCTABLE,      "Invalid procedure table from service provider.")
+//ERRINFO(WSAINVALIDPROVIDER,       "Invalid service provider version number.")
+//ERRINFO(WSAPROVIDERFAILEDINIT,    "Unable to initialize a service provider.")
+ERRINFO(WSASYSCALLFAILURE,        "System call failure.")
+
+#undef ERRINFO
+	default: return "Unknown error code.";
+	}
+}
+
+#endif
+
+Socket::Data::Data()
+: socket(INVALID_SOCKET)
+, is_blocking(true)
+, is_error(false)
+, is_eof(false)
+, fake_error(0)
+{
+}
+
+Value Socket::Data::GetInfo(String info) const
+{
+	return ErrorValue(info);
+}
+
+bool Socket::Data::Open(bool block)
+{
+	Init();
+	Close(0);
+	is_blocking = block;
+	ClearError();
+	if((socket = ::socket(PF_INET, SOCK_STREAM, 0)) == INVALID_SOCKET)
+		return false;
+	SLOG("Socket::Data::Open() -> " << (int)socket);
+	if(!block)
+		Block(false);
+	return true;
+}
+
+bool Socket::Data::OpenServer(int port, bool nodelay, int listen_count, bool block)
+{
+	if(!Open(block))
+		return false;
+	if(nodelay)
+		NoDelay();
+	sockaddr_in sin;
+	Zero(sin);
+	sin.sin_family = AF_INET;
+	sin.sin_port = htons(port);
+	sin.sin_addr.s_addr = htonl(INADDR_ANY);
+	if(bind(socket, (const sockaddr *)&sin, sizeof(sin))) {
+		SetSockError(NFormat("bind(port=%d)", port));
+		return false;
+	}
+	if(listen(socket, listen_count)) {
+		SetSockError(NFormat("listen(port=%d, count=%d)", port, listen_count));
+		return false;
+	}
+	return true;
+}
+
+bool Socket::Data::OpenClient(const char *host, int port, bool nodelay, dword *my_addr, int timeout, bool block)
+{
+	SLOG("Socket::Data::OpenClient(" << host << ':' << port << ", timeout " << timeout << ", block " << block << ')');
+
+	int ticks = msecs();
+	static StaticCriticalSection host_lock;
+	sockaddr_in sin;
+	sockaddr_in addr;
+
+	{
+		CriticalSection::Lock __(host_lock);
+		Socket::Init();
+		hostent *he = gethostbyname(host);
+		if(!he) {
+			SetSockError(NFormat("gethostbyname(%s)", host));
+			return false;
+		}
+
+		Zero(sin);
+		sin.sin_family = AF_INET;
+		sin.sin_port = htons(0);
+		sin.sin_addr.s_addr = htonl(INADDR_ANY);
+
+		Zero(addr);
+		addr.sin_family = AF_INET;
+		addr.sin_port = htons(port);
+		addr.sin_addr = *(in_addr *)(he -> h_addr_list[0]);
+	}
+
+	if(!Open(block))
+		return false;
+
+	if(nodelay)
+		NoDelay();
+
+	while(bind(socket, (const sockaddr *)&sin, sizeof(sin))) {
+		if(GetLastError() != SOCKERR(EINPROGRESS) || !IsNull(timeout) && msecs(ticks) >= timeout) {
+			SetSockError(NFormat("bind(host=%s, port=%d)", FormatIP(Peek32be(&addr.sin_addr)), port));
+			return false;
+		}
+		Sleep(500);
+	}
+	if(my_addr)
+		*my_addr = sin.sin_addr.s_addr;
+
+#if FAKEERROR
+	fake_error = (rand() * 11111) % 100000;
+	SLOG("Socket::OpenClient -> fake error = " << fake_error);
+#else
+	fake_error = 0;
+#endif
+
+	if(!connect(socket, (sockaddr *)&addr, sizeof(addr)))
+		return true;
+
+	int err = GetLastError();
+	if(err != IS_BLOCKED) {
+		SetSockError(NFormat("connect(%s:%d)", host, port));
+		SLOG("Socket::Data::OpenClient -> connect error, returning false");
+		return false;
+	}
+/*
+	if(!Peek(IsNull(timeout) ? NB_TIMEOUT : max<int>(0, timeout - msecs(ticks)), true)) {
+		SetSockError("connect timeout expired");
+		return false;
+	}
+*/
+	return true;
+}
+
+bool Socket::Data::Close(int msecs_timeout)
+{
+	SLOG("Socket::Data::Close(" << (int)socket << ", timeout = " << msecs_timeout << ")");
+	bool ok = CloseRaw(msecs_timeout);
+	SLOG("//Socket::Data::Close, ok = " << ok);
+	return ok;
+}
+
+bool Socket::Data::CloseRaw(int msecs_timeout)
+{
+	if(socket == INVALID_SOCKET)
+		return false;
+	bool ok = !is_error && Peek(msecs_timeout, true);
+	SOCKET old_socket = socket;
+	socket = INVALID_SOCKET;
+	if(old_socket != INVALID_SOCKET) {
+		SLOG("Socket::Data::CloseRaw(" << (int)old_socket << ")");
+		int res;
+#if defined(PLATFORM_WIN32)
+		res = closesocket(old_socket);
+#elif defined(PLATFORM_POSIX)
+		res = close(old_socket);
+#else
+#error Unsupported platform
+#endif
+		if(res && !IsError()) {
+			SetSockError("close");
+			ok = false;
+		}
+	}
+	SLOG("//Socket::Data::CloseRaw, ok = " << ok);
+	return ok;
+}
+
+int Socket::Data::Read(void *buf, int amount)
+{
+	int res = recv(socket, (char *)buf, amount, 0);
+#if FAKESLOWLINE
+	if(res > 0) {
+		int end = msecs() + iscale(res, 10000, FAKESLOWLINE) + 10;
+		for(int delta; (delta = end - msecs()) > 0; Sleep(delta))
+			;
+	}
+#endif
+#ifndef NOFAKEERROR
+	if(fake_error && res > 0) {
+		if((fake_error -= res) <= 0) {
+			fake_error = 0;
+			SetError();
+			Socket::SetSockError(socket, "recv", "fake error");
+			return -1;
+		}
+		else
+			LLOG("Socket::Data::Read: fake error after " << fake_error);
+	}
+#endif
+	if(res == 0)
+		is_eof = true;
+	else if(res < 0 && GetLastError() != IS_BLOCKED)
+		SetSockError("recv");
+	return res;
+}
+
+int Socket::Data::Write(const void *buf, int amount)
+{
+	int res = send(socket, (const char *)buf, amount, 0);
+	if(res == 0 || res < 0 && GetLastError() != IS_BLOCKED)
+		SetSockError("send");
+	return res;
+}
+
+bool Socket::Data::Accept(Socket& socket, dword *ipaddr, bool nodelay, int timeout_msec)
+{
+	SOCKET connection = AcceptRaw(ipaddr, timeout_msec);
+	if(connection == INVALID_SOCKET)
+		return false;
+	One<Socket::Data> data = new Data;
+	data->Attach(connection, nodelay, is_blocking);
+	socket.Attach(data);
+	return true;
+}
+
+SOCKET Socket::Data::AcceptRaw(dword *ipaddr, int timeout_msec)
+{
+	ASSERT(IsOpen());
+	if(!IsNull(timeout_msec) && !Peek(timeout_msec, false))
+		return INVALID_SOCKET;
+	sockaddr_in addr;
+	Zero(addr);
+	socklen_t addr_len = sizeof(addr);
+//	puts("Socket::Accept: accepting socket...");
+	SOCKET connection = accept(socket, (sockaddr *)&addr, &addr_len);
+	if(connection == INVALID_SOCKET) {
+		SetSockError("accept");
+		return INVALID_SOCKET;
+	}
+//	puts("Socket::Accept: socket accepted...");
+	dword ip = ntohl(addr.sin_addr.s_addr);
+	if(ipaddr)
+		*ipaddr = ip;
+	SLOG("Socket::Accept() -> " << (int)connection << " &" << FormatIP(ip));
+	return connection;
+}
+
+void Socket::Data::Attach(SOCKET s, bool nodelay, bool blocking)
+{
+	CloseRaw(0);
+	socket = s;
+	if(nodelay)
+		NoDelay();
+	is_blocking = blocking;
+	if(!is_blocking)
+		Block(false);
+}
+
+bool Socket::Data::Peek(int timeout_msec, bool write)
+{
+	if(!write && !leftover.IsEmpty())
+		return true;
+	if(timeout_msec < 0 || socket == INVALID_SOCKET)
+		return false;
+	fd_set set[1];
+	FD_ZERO(set);
+	int maxindex = (int)socket;
+	FD_SET(socket, set);
+	timeval tval;
+	tval.tv_sec = timeout_msec / 1000;
+	tval.tv_usec = 1000 * (timeout_msec % 1000);
+	int avail;
+	if(write) {
+		avail = select(maxindex + 1, 0, set, 0, &tval);
+	}
+	else {
+		avail = select(maxindex + 1, set, 0, 0, &tval);
+	}
+	return avail > 0;
+}
+
+void Socket::Data::SetSockError(String context)
+{
+	SetError();
+	Socket::SetSockError(socket, context);
+}
+
+void Socket::Data::NoDelay()
+{
+	ASSERT(IsOpen());
+	int __true = 1;
+	SLOG("NoDelay(" << (int)socket << ")");
+	if(setsockopt(socket, IPPROTO_TCP, TCP_NODELAY, (const char *)&__true, sizeof(__true)))
+		SetSockError("setsockopt(TCP_NODELAY)");
+}
+
+void Socket::Data::Linger(int msecs)
+{
+	ASSERT(IsOpen());
+	linger ls;
+	ls.l_onoff = !IsNull(msecs) ? 1 : 0;
+	ls.l_linger = !IsNull(msecs) ? (msecs / 1000) + 1 : 0;
+	if(setsockopt(socket, SOL_SOCKET, SO_LINGER,
+		reinterpret_cast<const char *>(&ls), sizeof(ls)))
+		SetSockError("setsockopt(SO_LINGER)");
+}
+
+void Socket::Data::Block(bool b)
+{
+	ASSERT(IsOpen());
+#ifdef PLATFORM_WIN32
+	u_long arg = b ? 0 : 1;
+	if(ioctlsocket(socket, FIONBIO, &arg))
+		SetSockError("ioctlsocket(FIO[N]BIO)");
+#else
+	if(fcntl(socket, F_SETFL, (fcntl(socket, F_GETFL, 0) & ~O_NONBLOCK) | (b ? 0 : O_NONBLOCK)))
+		SetSockError("fcntl(O_[NON]BLOCK)");
+#endif
+	is_blocking = b;
+}
+
+void Socket::Data::Reuse()
+{
+	int optval = 1;
+	setsockopt(socket, SOL_SOCKET, SO_REUSEADDR, (const char *)&optval, sizeof(optval));
+}
+
+/*
+void Socket::Data::WriteTimeout(int msecs)
+{
+	ASSERT(IsOpen());
+	if(IsNull(msecs)) msecs = 0;
+	if(setsockopt(socket, SOL_SOCKET, SO_SNDTIMEO, (const char *)&msecs, sizeof(msecs))) {
+		SetSockError("setsockopt(SO_SNDTIMEO)");
+		SLOG("msecs = " << msecs);
+	}
+}
+*/
+
+/*
+void Socket::Data::ReadTimeout(int msecs)
+{
+	ASSERT(IsOpen());
+	if(IsNull(msecs)) msecs = 0;
+	if(setsockopt(socket, SOL_SOCKET, SO_RCVTIMEO, (const char *)&msecs, sizeof(msecs)))
+		SetSockError("setsockopt(SO_RCVTIMEO)");
+}
+*/
+
+void Socket::Data::StopWrite()
+{
+	ASSERT(IsOpen());
+	if(shutdown(socket, SD_SEND))
+		SetSockError("shutdown(SD_SEND)");
+}
+
+void Socket::Init()
+{
+#if defined(PLATFORM_WIN32)
+	ONCELOCK {
+		WSADATA wsadata;
+		WSAStartup(0x101, &wsadata);
+	}
+#elif defined(PLATFORM_POSIX)
+	// no initialization necessary
+#else
+#error Unsupported platform
+#endif
+}
+
+String Socket::GetHostName()
+{
+	Init();
+	char buffer[256];
+	gethostname(buffer, __countof(buffer));
+	return buffer;
+}
+
+bool Socket::Close(int msecs_timeout)
+{
+	if(!data)
+		return false;
+	bool res = data->Close(msecs_timeout);
+	data = NULL;
+	return res;
+}
+
+int Socket::WriteWait(const char *s, int length, int timeout_msec)
+{
+	SLOG("WriteWait(@ " << GetNumber() << ": " << length << ", Tmax = " << timeout_msec << ")");
+	ASSERT(IsOpen());
+	if(length < 0 && s)
+		length = (int)strlen(s);
+	if(!s || length <= 0 || IsError())
+		return 0;
+/*
+	if(data->is_blocking) {
+//		data->WriteTimeout(timeout_msec);
+		int count = data->Write(s, length);
+		SLOG("WriteWait(blocking, " << length << ", " << timeout_msec << ") -> " << count);
+		if(count == 0) {
+			SetSockError("WriteWait(blocking)->broken line");
+			return 0;
+		}
+		if(count < 0 / * && GetLastError() != SOCKERR(ETIMEDOUT)* /)
+			SetSockError("WriteWait(blocking)");
+		SLOG("//WriteWait(blocking) -> " << count);
+		return max(count, 0);
+	}
+*/
+	int done = 0;
+	int end_ticks = msecs() + timeout_msec;
+	bool peek = data->is_blocking;
+	while(done < length) {
+		if(peek) {
+			int delta = IsNull(timeout_msec) ? NB_TIMEOUT : max(end_ticks - msecs(), 0);
+			if(!PeekWrite(delta))
+				return done;
+			peek = data->is_blocking;
+		}
+		int count = data->Write(s + done, length - done);
+		if(IsError())
+			return done;
+		if(count > 0)
+			done += count;
+		else
+			peek = true;
+	}
+	SLOG("//WriteWait() -> " << done);
+	return done;
+}
+
+bool Socket::Wait(const Vector<SOCKET>& read, const Vector<SOCKET>& write, int timeout_msec)
+{
+	if(timeout_msec < 0 || read.IsEmpty() && write.IsEmpty())
+		return false;
+	fd_set rdset[1], wrset[1];
+	FD_ZERO(rdset);
+	FD_ZERO(wrset);
+	SLOG("Socket::Wait(" << read.GetCount() << " SOCKETs for read, " << write.GetCount() << " SOCKETs for write, " << timeout_msec << " msecs)");
+	int maxindex = -1;
+	int i;
+	for(i = 0; i < read.GetCount(); i++)
+		if(read[i] != INVALID_SOCKET) {
+			SLOG("-> add read socket " << (int)read[i]);
+			FD_SET(read[i], rdset);
+			maxindex = max<int>(maxindex, (int)read[i]);
+		}
+	for(i = 0; i < write.GetCount(); i++)
+		if(write[i] != INVALID_SOCKET) {
+			SLOG("-> add write socket " << (int)write[i]);
+			FD_SET(write[i], wrset);
+			maxindex = max<int>(maxindex, (int)write[i]);
+		}
+	if(maxindex < 0)
+		return false;
+//	LOGHEXDUMP(set, sizeof(set));
+	timeval tval;
+	tval.tv_sec = timeout_msec / 1000;
+	tval.tv_usec = 1000 * (timeout_msec % 1000);
+	int avail = select(maxindex + 1, read.IsEmpty() ? 0 : rdset, write.IsEmpty() ? 0 : wrset, 0, &tval);
+	SLOG("//Socket::Wait -> avail = " << avail);
+//	if(avail) { LOG("select() -> " << avail); }
+//	puts(STR "Socket::Peek: timeout = " << timeout_msec << ", avail = " << avail);
+	return avail > 0;
+}
+
+bool Socket::Wait(const Vector<Socket *>& read, const Vector<Socket *>& write, int timeout_msec)
+{
+	SLOG("Socket::Wait(" << read.GetCount() << " Sockets for read, " << write.GetCount() << " Sockets for write, " << timeout_msec << " msecs)");
+	Vector<SOCKET> readfds, writefds;
+	int i;
+	readfds.Reserve(read.GetCount());
+	for(i = 0; i < read.GetCount(); i++)
+		if(read[i]->IsOpen()) {
+			if(read[i]->data->Peek(0, false))
+				return true;
+			readfds.Add(read[i]->GetSocket());
+		}
+	writefds.Reserve(write.GetCount());
+	for(i = 0; i < write.GetCount(); i++)
+		if(write[i]->IsOpen()) {
+			if(write[i]->data->Peek(0, true))
+				return true;
+			writefds.Add(write[i]->GetSocket());
+		}
+	return Wait(readfds, writefds, timeout_msec);
+}
+
+bool Socket::PeekAbort(int timeout_msec)
+{
+	if(!data)
+		return true;
+	String left = data->leftover;
+	data->leftover = Null;
+	char buffer;
+	int count = -1;
+	if(data->Peek(timeout_msec, false))
+		count = data->Read(&buffer, 1);
+	left.Cat(data->leftover);
+	if(count > 0)
+		left.Cat(buffer);
+	data->leftover = left;
+	return count == 0;
+}
+
+String Socket::Read(int timeout, int maxlen)
+{
+	if(!data->leftover.IsEmpty()) {
+		String out = data->leftover;
+		data->leftover = Null;
+		return out;
+	}
+	if(IsError() || IsEof())
+		return String::GetVoid();
+	int ticks = GetTickCount(), end_ticks = ticks + timeout;
+	if(data->is_blocking && !IsNull(timeout)
+	|| !data->is_blocking && timeout != 0)
+		if(!Peek(IsNull(timeout) ? NB_TIMEOUT : end_ticks - ticks))
+			return Null;
+	char buffer[SOCKBUFSIZE];
+	int count = data->Read(buffer, min<int>(maxlen, sizeof(buffer)));
+	SLOG("recv(" << GetNumber() << ") -> " << count);
+	if(data->IsError())
+		return String::GetVoid();
+	if(count <= 0) {
+		if(!data->IsEof()) {
+			SLOG("Socket::Read(" << GetNumber() << ") -> ewouldblock");
+		}
+		return Null;
+	}
+	return String(buffer, count);
+}
+
+int Socket::ReadCount(void *buffer, int count, int timeout_msec)
+{
+	SLOG("ReadCount(@" << GetNumber() << ": " << count << ", Tmax = " << timeout_msec << ")");
+	int done = 0;
+	if(!data->leftover.IsEmpty()) {
+//		SLOG("-> leftover = <" << BinHexEncode(data->leftover) << ">");
+		done = min(data->leftover.GetLength(), count);
+		memcpy(buffer, data->leftover, done);
+		if(done < data->leftover.GetLength()) {
+			data->leftover.Remove(0, done);
+			return done;
+		}
+		data->leftover.Clear();
+	}
+	int end_ticks = msecs() + timeout_msec;
+	while(done < count && !IsError() && !IsEof()) {
+//		SLOG("ReadCount(@" << GetNumber() << ": " << count << ", done " << done << ") -> peek");
+		if(!IsNull(timeout_msec) && !Peek(max(end_ticks - msecs(), 0)))
+			break;
+//		SLOG("ReadCount(@" << GetNumber() << ": " << count << ", done " << done << ") -> read");
+		int part = ReadRaw((char *)buffer + done, count - done);
+		if(part > 0)
+			done += part;
+	}
+	SLOG("//ReadCount -> " << done);
+	return done;
+}
+
+String Socket::ReadCount(int count, int timeout_msec)
+{
+	// int end_ticks = msecs() + timeout_msec; Mirek:unused
+	if(count == 0)
+		return Null;
+	StringBuffer out(count);
+	int done = ReadCount(out, count, timeout_msec);
+	if(!done && IsEof())
+		return String::GetVoid();
+	out.SetLength(done);
+	return out;
+/*
+	do {
+		String part = Read(IsNull(timeout_msec) ? int(Null) : end_ticks - msecs(), count - out.GetLength());
+		if(part.IsVoid())
+			return !IsNull(out) ? out : String::GetVoid();
+		out.Cat(part);
+	}
+	while(out.GetLength() < count && (IsNull(timeout_msec) || msecs(end_ticks) <= 0));
+	return out;
+*/
+}
+
+String Socket::ReadUntil(char term, int timeout, int maxlen)
+{
+	SLOG("Socket::RecvUntil(term = " << (int)term << ", maxlen = " << maxlen << ", timeout = " << timeout << ")");
+	ASSERT(IsOpen() && maxlen != 0);
+	int ticks = GetTickCount(), end_ticks = IsNull(timeout) ? int(Null) : ticks + timeout, seek = 0;
+	String out = Read(timeout, maxlen);
+	if(out.IsVoid())
+		return out;
+
+	for(;;) {
+		int f = out.Find((byte)term, seek);
+		if(f >= 0) {
+			data->leftover = String(out.Begin() + f + 1, out.GetLength() - f - 1) + data->leftover;
+			return out.Left(f);
+		}
+		seek = out.GetLength();
+		ticks = GetTickCount();
+		if(!IsNull(timeout)) timeout = end_ticks - ticks;
+		if(!IsNull(timeout) && timeout <= 0 || out.GetLength() >= maxlen)
+			return out;
+		String part = Read(timeout, maxlen - out.GetLength());
+		if(part.IsVoid()) {
+			SLOG("term " << (int)term << " not found in: " << out);
+			return out;
+		}
+		out.Cat(part);
+	}
+}
+
+void Socket::UnRead(const void *buffer, int len)
+{
+	ASSERT(len >= 0);
+	ASSERT(!!data);
+	if(len > 0)
+		data->leftover.Insert(0, (const char *)buffer, len);
+}
+
+String Socket::PeekCount(int count, int timeout_msec)
+{
+	String s = ReadCount(count, timeout_msec);
+	data->leftover.Insert(0, s);
+	return s;
+}
+
+String Socket::PeekUntil(char term, int timeout_msec, int maxlen)
+{
+	String s = ReadUntil(term, timeout_msec, maxlen);
+	data->leftover.Insert(0, s);
+	return s;
+}
+
+static String& SockErrorText()
+{
+	static StaticCriticalSection csect;
+	CriticalSection::Lock lock(csect);
+	static Index<int> thread_index;
+	static Array<String> thread_errors;
+	static Vector<int> error_ticks;
+	int t = msecs();
+	if(thread_index.GetCount() >= 1000) {
+		for(int i = thread_index.GetCount(); --i >= 0;)
+			if(t - error_ticks[i] >= 60000) {
+				thread_index.Remove(i);
+				thread_errors.Remove(i);
+				error_ticks.Remove(i);
+			}
+	}
+#ifdef PLATFORM_WIN32
+	int tid = GetCurrentThreadId();
+#else
+	int tid = 0; //!! todo: thread ID in posix
+#endif
+	int f = thread_index.Find(tid);
+	if(f < 0) {
+		f = thread_index.GetCount();
+		thread_index.Add(tid);
+		thread_errors.Add();
+		error_ticks.Add();
+	}
+	error_ticks[f] = t;
+	return thread_errors[f];
+}
+
+String Socket::GetErrorText()
+{
+	return SockErrorText();
+}
+
+void Socket::SetErrorText(String text)
+{
+	SLOG("Socket::SetLastErrorText = " << text);
+	SockErrorText() = text;
+}
+
+void Socket::SetSockError(SOCKET socket, const char *context)
+{
+	SetSockError(socket, context, SocketErrorDesc(GetErrorCode()));
+}
+
+void Socket::SetSockError(SOCKET socket, const char *context, const char *errordesc)
+{
+	String err;
+	if(socket != INVALID_SOCKET)
+		err << "socket(" << (int)socket << ") / ";
+	err << context << ": " << errordesc;
+	SetErrorText(err);
+}
+
+bool ServerSocket(Socket& socket, int port, bool nodelay, int listen_count, bool blocking)
+{
+	One<Socket::Data> data = new Socket::Data;
+	if(!data->OpenServer(port, nodelay, listen_count, blocking))
+		return false;
+	socket.Attach(data);
+	return true;
+}
+
+bool ClientSocket(Socket& socket, const char *host, int port, bool nodelay, dword *my_addr, int timeout, bool blocking)
+{
+	One<Socket::Data> data = new Socket::Data;
+	if(!data->OpenClient(host, port, nodelay, my_addr, timeout, blocking))
+		return false;
+	socket.Attach(data);
+	return true;
+}
+
+#ifdef PLATFORM_WIN32
+
+void SocketEvent::Read(Socket& socket)
+{
+	Select(socket, FD_READ);
+}
+
+void SocketEvent::Write(Socket& socket)
+{
+	Select(socket, FD_WRITE);
+}
+
+void SocketEvent::Accept(Socket& socket)
+{
+	Select(socket, FD_ACCEPT);
+}
+
+void SocketEvent::Select(Socket& socket, int fd_flags)
+{
+	if(SOCKET sock = socket.GetSocket())
+		WSAEventSelect(sock, (WSAEVENT)handle, fd_flags);
+}
+
+#endif
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/Web/socket.h b/uppsrc/Web/socket.h
new file mode 100644
index 000000000..985e105ff
--- /dev/null
+++ b/uppsrc/Web/socket.h
@@ -0,0 +1,151 @@
+//#define NOFAKEERROR
+
+static const int DEFAULT_CONNECT_TIMEOUT = 5000;
+
+static const int SOCKKIND_STD = 1; // GetKind() for ordinary socket
+
+class Socket : Moveable<Socket>
+{
+public:
+	class Data
+	{
+	public:
+		Data();
+		virtual ~Data() { CloseRaw(0); }
+
+		bool                    Open(bool is_blocking);
+		bool                    OpenServer(int port, bool nodelay, int listen_count, bool is_blocking);
+		bool                    OpenClient(const char *host, int port, bool nodelay, dword *my_addr, int timeout, bool is_blocking);
+		bool                    IsOpen() const     { return socket != INVALID_SOCKET; }
+		bool                    CloseRaw(int timeout_msec);
+
+		bool                    IsEof() const          { return is_eof && leftover.IsEmpty(); }
+		bool                    IsError() const        { return is_error; }
+		void                    SetError()             { is_error = true; }
+		void                    ClearError()           { is_error = false; }
+		void                    SetSockError(String context);
+
+		void                    NoDelay();
+		void                    Linger(int msecs);
+		void                    Block(bool b = true);
+		void                    Reuse();
+//		void                    WriteTimeout(int msecs);
+//		void                    ReadTimeout(int msecs);
+		void                    StopWrite();
+
+		virtual int             GetKind() const        { return SOCKKIND_STD; }
+
+		virtual bool            Peek(int timeout_msec, bool write);
+		virtual int             Read(void *buf, int amount);
+		virtual int             Write(const void *buf, int amount);
+		virtual bool            Accept(Socket& socket, dword *ipaddr, bool nodelay, int timeout_msec);
+		virtual bool            Close(int timeout_msec);
+		virtual Value           GetInfo(String info) const;
+
+	public:
+		SOCKET                  socket;
+		String                  leftover;
+		bool                    is_blocking;
+		bool                    is_error;
+		bool                    is_eof;
+#ifndef NOFAKEERROR
+		int                     fake_error;
+#endif
+
+	protected:
+		SOCKET                  AcceptRaw(dword *ipaddr, int timeout_msec);
+		void                    Attach(SOCKET socket, bool nodelay, bool is_blocking);
+		void                    SetSockResError(String context);
+	};
+
+	Socket() {}
+	Socket(One<Data> data) : data(data) {}
+
+	static void     Init();
+
+	void            Attach(One<Data> d)                      { data = d; }
+	void            Clear()                                  { data.Clear(); }
+
+	bool            IsOpen() const                           { return !!data; }
+
+	bool            IsEof() const                            { return !data || data->IsEof(); }
+	bool            IsError() const                          { return data->IsError(); }
+	void            ClearError()                             { data->ClearError(); }
+
+	SOCKET          GetSocket() const                        { return IsOpen() ? data->socket : INVALID_SOCKET; }
+	int             GetNumber() const                        { return (int)GetSocket(); }
+
+	int             GetKind() const                          { return data->GetKind(); }
+	Value           GetInfo(String info) const               { return data->GetInfo(info); }
+
+	bool            Accept(Socket& socket, dword *ipaddr = 0, bool nodelay = true, int timeout_msec = DEFAULT_CONNECT_TIMEOUT) { return data->Accept(socket, ipaddr, nodelay, timeout_msec); }
+	bool            Close(int msecs_timeout = 0);
+
+	void            NoDelay()                                { data->NoDelay(); }
+	void            Linger(int msecs)                        { data->Linger(msecs); }
+	void            NoLinger()                               { data->Linger(Null); }
+	void            Block(bool b = true)                     { data->Block(b); }
+	void            NoBlock()                                { data->Block(false); }
+	void            Reuse()                                  { data->Reuse(); }
+
+	static bool     Wait(const Vector<SOCKET>& read, const Vector<SOCKET>& write, int timeout_msec);
+	static bool     Wait(const Vector<Socket *>& read, const Vector<Socket *>& write, int timeout_msec);
+
+	bool            Peek(int timeout_msec = 0)               { return data->Peek(timeout_msec, false); }
+	bool            PeekWrite(int timeout_msec = 0)          { return data->Peek(timeout_msec, true); }
+	bool            PeekAbort(int timeout_msec = 0);
+	String          PeekCount(int count, int timeout_msec = Null);
+	String          PeekUntil(char term, int timeout_msec = Null, int maxlen = 1000000);
+
+	int             ReadRaw(void *buffer, int maxlen)        { return data->Read(buffer, maxlen); }
+	String          Read(int timeout_msec = Null, int maxlen = 1000000);
+	int             ReadCount(void *buffer, int count, int timeout_msec = Null);
+	String          ReadCount(int count, int timeout_msec = Null);
+	String          ReadUntil(char term, int timeout_msec = Null, int maxlen = 1000000);
+	void            UnRead(const void *buffer, int len);
+	void            UnRead(String data)                      { UnRead(data.Begin(), data.GetLength()); }
+
+	int             WriteRaw(const void *buffer, int maxlen) { return data->Write(buffer, maxlen); }
+	int             WriteWait(const char *s, int length, int timeout_msec);
+	void            Write(const char *s, int length)         { WriteWait(s, length, Null); }
+	void            Write(String s)                          { Write(s.Begin(), s.GetLength()); }
+
+	void            StopWrite()                              { data->StopWrite(); }
+
+	static String   GetHostName();
+
+	static String   GetErrorText();
+	static void     SetErrorText(String text);
+	static void     ClearErrorText()                         { SetErrorText(Null); }
+	static void     SetSockError(const char *context)        { SetSockError(INVALID_SOCKET, context); }
+	static void     SetSockError(SOCKET socket, const char *context);
+	static void     SetSockError(SOCKET socket, const char *context, const char *errordesc);
+
+#if defined(PLATFORM_WIN32)
+	static int      GetErrorCode()                           { return WSAGetLastError(); }
+#define SOCKERR(x) COMBINE(WSA, x)
+#elif defined(PLATFORM_POSIX)
+	static int      GetErrorCode()                           { return errno; }
+#define SOCKERR(x) x
+#else
+#error Unsupported platform
+#endif
+
+private:
+	One<Data>       data;
+};
+
+#ifdef PLATFORM_WIN32
+class SocketEvent : public Event {
+public:
+	SocketEvent() {}
+
+	void     Read(Socket& socket);
+	void     Write(Socket& socket);
+	void     Accept(Socket& socket);
+	void     Select(Socket& socket, int fd_flags);
+};
+#endif
+
+bool ServerSocket(Socket& socket, int port, bool nodelay = true, int listen_count = 5, bool is_blocking = true);
+bool ClientSocket(Socket& socket, const char *host, int port, bool nodelay = true, dword *my_addr = NULL, int timeout = DEFAULT_CONNECT_TIMEOUT, bool is_blocking = true);
diff --git a/uppsrc/Web/sproc.cpp b/uppsrc/Web/sproc.cpp
new file mode 100644
index 000000000..aa97aecaa
--- /dev/null
+++ b/uppsrc/Web/sproc.cpp
@@ -0,0 +1,631 @@
+#include "Web.h"
+
+#ifdef PLATFORM_POSIX
+//#BLITZ_APPROVE
+#include <signal.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+#endif
+
+NAMESPACE_UPP
+
+/* Mirek:unused
+static void WriteLog(const String& s)
+{
+#ifdef PLATFORM_POSIX
+	if(s.IsEmpty())
+		return;
+	int fd = open("con", O_WRONLY | O_APPEND);
+	if(fd >= 0)
+		write(fd, s, s.GetLength());
+	close(fd);
+#endif
+}
+*/
+
+#define DO_SVRLOG 0
+
+#if DO_SVRLOG
+#define SVRLOG(x) { StringStream ss; ss << x << '\n'; RLOG(ss.GetResult()); WriteLog(ss.GetResult()); }
+#else
+#define SVRLOG(x)
+#endif
+
+class LocalSlaveProcess : public SlaveProcess
+{
+public:
+	typedef LocalSlaveProcess CLASSNAME;
+	LocalSlaveProcess()                                            { Init(); }
+	LocalSlaveProcess(const char *cmdline, const char *envptr = 0) { Init(); Open(cmdline, envptr); }
+	virtual ~LocalSlaveProcess()                                   { Kill(); }
+
+	void         Open(const char *cmdline, const char *envptr = 0);
+
+	virtual void Kill();
+	virtual bool IsRunning();
+	virtual void Write(String s);
+	virtual bool Read(String& s);
+	virtual int  GetExitCode();
+	virtual void Detach();
+
+private:
+	void         Init();
+	void         Free();
+#ifdef PLATFORM_POSIX
+	bool         DecodeExitCode(int code);
+#endif
+
+private:
+#ifdef PLATFORM_WIN32
+	HANDLE       hProcess;
+	HANDLE       hOutputRead;
+	HANDLE       hInputWrite;
+#endif
+#ifdef PLATFORM_POSIX
+	Buffer<char> cmd_buf;
+	Vector<char *> args;
+	pid_t        pid;
+	int          rpipe[2], wpipe[2];
+	String       exit_string;
+	bool         output_read;
+#endif
+	int          exit_code;
+};
+
+One<SlaveProcess> StartLocalProcess(const char *cmdline, const char *envptr)
+{
+	return new LocalSlaveProcess(cmdline, envptr);
+}
+
+void LocalSlaveProcess::Init() {
+#ifdef PLATFORM_WIN32
+	hProcess = hOutputRead = hInputWrite = NULL;
+#endif
+#ifdef PLATFORM_POSIX
+	pid = 0;
+	rpipe[0] = rpipe[1] = wpipe[0] = wpipe[1] = -1;
+	output_read = false;
+#endif
+	exit_code = Null;
+}
+
+void LocalSlaveProcess::Free() {
+#ifdef PLATFORM_WIN32
+	if(hProcess) {
+		CloseHandle(hProcess);
+		hProcess = NULL;
+	}
+	if(hOutputRead) {
+		CloseHandle(hOutputRead);
+		hOutputRead = NULL;
+	}
+	if(hInputWrite) {
+		CloseHandle(hInputWrite);
+		hInputWrite = NULL;
+	}
+#endif
+#ifdef PLATFORM_POSIX
+	SVRLOG("\nLocalSlaveProcess::Free, pid = " << (int)getpid());
+	SVRLOG("rpipe[" << rpipe[0] << ", " << rpipe[1] << "]");
+	SVRLOG("wpipe[" << wpipe[0] << ", " << wpipe[1] << "]");
+	if(rpipe[0] >= 0) { close(rpipe[0]); rpipe[0] = -1; }
+	if(rpipe[1] >= 0) { close(rpipe[1]); rpipe[1] = -1; }
+	if(wpipe[0] >= 0) { close(wpipe[0]); wpipe[0] = -1; }
+	if(wpipe[1] >= 0) { close(wpipe[1]); wpipe[1] = -1; }
+	if(pid) waitpid(pid, 0, WNOHANG | WUNTRACED);
+	pid = 0;
+	output_read = false;
+#endif
+}
+
+void LocalSlaveProcess::Open(const char *command, const char *envptr) {
+	SVRLOG("LocalSlaveProcess::Open(" << command << ")");
+
+	Kill();
+
+	while(*command && (byte)*command <= ' ')
+		command++;
+
+#ifdef PLATFORM_WIN32
+	HANDLE hOutputReadTmp, hInputRead;
+	HANDLE hInputWriteTmp, hOutputWrite;
+	HANDLE hErrorWrite;
+	SECURITY_ATTRIBUTES sa;
+
+	sa.nLength = sizeof(SECURITY_ATTRIBUTES);
+	sa.lpSecurityDescriptor = NULL;
+	sa.bInheritHandle = TRUE;
+
+	HANDLE hp = GetCurrentProcess();
+
+	CreatePipe(&hOutputReadTmp, &hOutputWrite, &sa, 0);
+	DuplicateHandle(hp, hOutputWrite, hp, &hErrorWrite, 0, TRUE, DUPLICATE_SAME_ACCESS);
+	CreatePipe(&hInputRead, &hInputWriteTmp, &sa, 0);
+	DuplicateHandle(hp, hOutputReadTmp, hp, &hOutputRead, 0, FALSE, DUPLICATE_SAME_ACCESS);
+	DuplicateHandle(hp, hInputWriteTmp, hp, &hInputWrite, 0, FALSE, DUPLICATE_SAME_ACCESS);
+	CloseHandle(hOutputReadTmp);
+	CloseHandle(hInputWriteTmp);
+
+	PROCESS_INFORMATION pi;
+	STARTUPINFO si;
+	ZeroMemory(&si, sizeof(STARTUPINFO));
+	si.cb = sizeof(STARTUPINFO);
+	si.dwFlags = STARTF_USESTDHANDLES | STARTF_USESHOWWINDOW;
+	si.wShowWindow = SW_HIDE;
+	si.hStdInput  = hInputRead;
+	si.hStdOutput = hOutputWrite;
+	si.hStdError  = hErrorWrite;
+	int n = (int)strlen(command) + 1;
+	Buffer<char> cmd(n);
+	memcpy(cmd, command, n);
+	bool h = CreateProcess(NULL, cmd, &sa, &sa, TRUE,
+	                       NORMAL_PRIORITY_CLASS, (void *)envptr, NULL, &si, &pi);
+	SVRLOG("CreateProcess " << (h ? "succeeded" : "failed"));
+	CloseHandle(hErrorWrite);
+	CloseHandle(hInputRead);
+	CloseHandle(hOutputWrite);
+	if(h) {
+		hProcess = pi.hProcess;
+		CloseHandle(pi.hThread);
+	}
+	else {
+		Free();
+		throw Exc(NFormat("Error running process: %s\nCommand: %s", GetErrorMessage(GetLastError()), command));
+	}
+#endif
+#ifdef PLATFORM_POSIX
+	// parse command line for execve
+	cmd_buf.Alloc(strlen(command) + 1);
+	char *cmd_out = cmd_buf;
+	const char *p = command;
+	const char *b = p;
+	while(*p && (byte)*p > ' ')
+		if(*p++ == '\"')
+			while(*p && *p++ != '\"')
+				;
+	const char *app = cmd_out;
+	args.Add(cmd_out);
+	memcpy(cmd_out, b, p - b);
+	cmd_out += p - b;
+	*cmd_out++ = '\0';
+
+	while(*p)
+		if((byte)*p <= ' ')
+			p++;
+		else {
+			args.Add(cmd_out);
+			while(*p && (byte)*p > ' ')
+				if(*p == '\\') {
+					if(*++p)
+						*cmd_out++ = *p++;
+				}
+				else if(*p == '\"') {
+					p++;
+					while(*p && *p != '\"')
+						if(*p == '\\') {
+							if(*++p)
+								*cmd_out++ = *p++;
+						}
+						else
+							*cmd_out++ = *p++;
+					if(*p == '\"')
+						p++;
+				}
+				else
+					*cmd_out++ = *p++;
+			*cmd_out++ = '\0';
+		}
+
+	args.Add(NULL);
+
+	String app_full = GetFileOnPath(app, getenv("PATH"), true);
+	if(IsNull(app_full))
+		throw Exc(Format("Cannot find executable '%s'\n", app));
+
+	if(pipe(rpipe) || pipe(wpipe))
+		throw Exc(NFormat(t_("pipe() error; error code = %d"), errno));
+	SVRLOG("\nLocalSlaveProcess::Open");
+	SVRLOG("rpipe[" << rpipe[0] << ", " << rpipe[1] << "]");
+	SVRLOG("wpipe[" << wpipe[0] << ", " << wpipe[1] << "]");
+	pid = fork();
+	SVRLOG("\tfork, pid = " << (int)pid << ", getpid = " << (int)getpid());
+	if(pid < 0)
+		throw Exc(NFormat(t_("fork() error; error code = %d"), errno));
+	if(pid)
+	{ // parent process; clear child pipe endpoints
+		SVRLOG("parent process - continue");
+//		rpipe[0] = wpipe[1] = -1;
+		return;
+	}
+	SVRLOG("child process - execute application");
+//	rpipe[1] = wpipe[0] = -1;
+	if(dup2(rpipe[0], 0) < 0)
+	{ // stdin
+		SVRLOG("dup2(stdin) error: " << errno << ", " << strerror(errno));
+	}
+	if(dup2(wpipe[1], 1) < 0)
+	{ // stdout
+		SVRLOG("dup2(stdout) error: " << errno << ", " << strerror(errno));
+	}
+	if(dup2(wpipe[1], 2) < 0)
+	{ // stderr
+		SVRLOG("dup2(stderr) error: " << errno << ", " << strerror(errno));
+	}
+
+#if DO_SVRLOG
+	SVRLOG(args.GetCount() << "arguments:");
+	for(int a = 0; a < args.GetCount(); a++)
+		SVRLOG("[" << a << "]: <" << (args[a] ? args[a] : "NULL") << ">");
+#endif//DO_SVRLOG
+
+	SVRLOG("running execve, app = " << app << ", #args = " << args.GetCount());
+	const char *from = envptr;
+	Vector<const char *> env;
+	while(*from) {
+		env.Add(from);
+		from += strlen(from) + 1;
+	}
+	env.Add(NULL);
+	execve(app_full, args.Begin(), (char *const *)env.Begin());
+	SVRLOG("execve failed, errno = " << errno);
+	printf("Error running '%s', error code %d\n", command, errno);
+	exit(-errno);
+#endif
+}
+
+#ifdef PLATFORM_POSIX
+bool LocalSlaveProcess::DecodeExitCode(int status)
+{
+	if(WIFEXITED(status)) {
+		exit_code = (byte)WEXITSTATUS(status);
+		return true;
+	}
+	else if(WIFSIGNALED(status) || WIFSTOPPED(status)) {
+		static const struct {
+			const char *name;
+			int         code;
+		}
+		signal_map[] = {
+#define SIGDEF(s) { #s, s },
+SIGDEF(SIGHUP) SIGDEF(SIGINT) SIGDEF(SIGQUIT) SIGDEF(SIGILL) SIGDEF(SIGABRT)
+SIGDEF(SIGFPE) SIGDEF(SIGKILL) SIGDEF(SIGSEGV) SIGDEF(SIGPIPE) SIGDEF(SIGALRM)
+SIGDEF(SIGPIPE) SIGDEF(SIGTERM) SIGDEF(SIGUSR1) SIGDEF(SIGUSR2) SIGDEF(SIGTRAP)
+SIGDEF(SIGURG) SIGDEF(SIGVTALRM) SIGDEF(SIGXCPU) SIGDEF(SIGXFSZ) SIGDEF(SIGIOT)
+SIGDEF(SIGIO) SIGDEF(SIGWINCH)
+#ifndef PLATFORM_FREEBSD
+//SIGDEF(SIGCLD) SIGDEF(SIGPWR)
+#endif
+//SIGDEF(SIGSTKFLT) SIGDEF(SIGUNUSED) // not in Solaris, make conditional if needed
+#undef SIGDEF
+		};
+
+		int sig = (WIFSIGNALED(status) ? WTERMSIG(status) : WSTOPSIG(status));
+		exit_code = (WIFSIGNALED(status) ? 1000 : 2000) + sig;
+		exit_string << "\nProcess " << (WIFSIGNALED(status) ? "terminated" : "stopped") << " on signal " << sig;
+		for(int i = 0; i < __countof(signal_map); i++)
+			if(signal_map[i].code == sig)
+			{
+				exit_string << " (" << signal_map[i].name << ")";
+				break;
+			}
+		exit_string << "\n";
+		return true;
+	}
+	return false;
+}
+#endif//PLATFORM_POSIX
+
+void LocalSlaveProcess::Kill() {
+#ifdef PLATFORM_WIN32
+	if(hProcess && IsRunning()) {
+		TerminateProcess(hProcess, (DWORD)-1);
+		exit_code = 255;
+	}
+#endif
+#ifdef PLATFORM_POSIX
+	if(IsRunning()) {
+		SVRLOG("\nLocalSlaveProcess::Kill, pid = " << (int)pid);
+		exit_code = 255;
+		kill(pid, SIGTERM);
+		GetExitCode();
+		int status;
+		if(pid && waitpid(pid, &status, 0) == pid)
+			DecodeExitCode(status);
+		exit_string = "Child process has been killed.\n";
+	}
+#endif
+	Free();
+}
+
+void LocalSlaveProcess::Detach()
+{
+	Free();
+}
+
+bool LocalSlaveProcess::IsRunning() {
+#ifdef PLATFORM_WIN32
+	dword exitcode;
+	if(!hProcess)
+		return false;
+	if(GetExitCodeProcess(hProcess, &exitcode) && exitcode == STILL_ACTIVE)
+		return true;
+	dword n;
+	if(PeekNamedPipe(hOutputRead, NULL, 0, NULL, &n, NULL) && n)
+		return true;
+	exit_code = exitcode;
+	return false;
+#endif
+#ifdef PLATFORM_POSIX
+	if(!pid || !IsNull(exit_code)) {
+		SVRLOG("IsRunning() -> no");
+		return false;
+	}
+	int status = 0, wp;
+	if((wp = waitpid(pid, &status, WNOHANG | WUNTRACED)) != pid || !DecodeExitCode(status))
+		return true;
+	SVRLOG("IsRunning() -> no, just exited, exit code = " << exit_code);
+	return false;
+#endif
+}
+
+int  LocalSlaveProcess::GetExitCode() {
+#ifdef PLATFORM_WIN32
+	return IsRunning() ? (int)Null : exit_code;
+#endif
+#ifdef PLATFORM_POSIX
+	if(!IsRunning())
+		return Nvl(exit_code, -1);
+	int status;
+	if(waitpid(pid, &status, WNOHANG | WUNTRACED) != pid || !DecodeExitCode(status)) {
+		SVRLOG("GetExitCode() -> -1 (waitpid would hang)");
+		return -1;
+	}
+	exit_code = WEXITSTATUS(status);
+	SVRLOG("GetExitCode() -> " << exit_code << " (just exited)");
+	return exit_code;
+#endif
+}
+
+bool LocalSlaveProcess::Read(String& res) {
+	res = Null;
+#ifdef PLATFORM_WIN32
+	if(!hOutputRead) return false;
+	dword n;
+	if(!PeekNamedPipe(hOutputRead, NULL, 0, NULL, &n, NULL) || n == 0)
+		return IsRunning();
+	char buffer[1024];
+	if(!ReadFile(hOutputRead, buffer, sizeof(buffer), &n, NULL))
+		return false;
+	res.Cat(buffer, n);
+	return true;
+#endif
+#ifdef PLATFORM_POSIX
+//??!
+	if(wpipe[0] < 0) return false;
+	bool was_running = IsRunning();
+//	SVRLOG("output_read = " << (output_read ? "yes" : "no"));
+	if(!was_running && output_read) {
+		if(exit_string.IsEmpty())
+			return false;
+		res = exit_string;
+		exit_string = Null;
+		return true;
+	}
+	fd_set set[1];
+	FD_ZERO(set);
+	FD_SET(wpipe[0], set);
+	timeval tval = { 0, 0 };
+	int sv;
+	while((sv = select(wpipe[0] + 1, set, NULL, NULL, &tval)) > 0) {
+		SVRLOG("Read() -> select");
+		char buffer[1024];
+		int done = read(wpipe[0], buffer, sizeof(buffer));
+//		printf("pipe = %d, done %d bytes: %.*s\n", wpipe[0], done, done, buffer);
+		SVRLOG("Read(), read -> " << done << ": " << String(buffer, done));
+		if(done > 0)
+			res.Cat(buffer, done);
+	}
+	if(sv < 0) {
+		SVRLOG("select -> " << sv);
+	}
+	if(!was_running)
+		output_read = true;
+	return !IsNull(res) || was_running;
+#endif
+}
+
+void LocalSlaveProcess::Write(String s)
+{
+#ifdef PLATFORM_WIN32
+	dword n;
+	WriteFile(hInputWrite, s, s.GetLength(), &n, NULL);
+#endif
+#ifdef PLATFORM_POSIX
+	write(rpipe[1], s, s.GetLength());
+#endif
+}
+
+class RemoteSlaveProcess : public SlaveProcess
+{
+public:
+	RemoteSlaveProcess() { Init(); }
+	RemoteSlaveProcess(const char *host, int port, const char *cmdline,
+		const char *envptr = NULL, int timeout = Null)
+	{ Init(); Open(host, port, cmdline, envptr, timeout); }
+	virtual ~RemoteSlaveProcess();
+
+	void         Open(const char *host, int port, const char *cmdline,
+		const char *envptr = NULL, int timeout = Null);
+
+	virtual void Kill();
+	virtual bool IsRunning();
+	virtual void Write(String s);
+	virtual bool Read(String& s);
+	virtual int  GetExitCode();
+
+	enum
+	{
+		DEFAULT_PORT = 2346,
+		REQUEST_TIMEOUT = 1000,
+	};
+
+private:
+	void         Init();
+	void         Recv(int part, int timeout);
+
+private:
+	Socket       socket;
+	String       output[3];
+	bool         terminated;
+	int          current_part;
+	int          timeout;
+};
+
+One<SlaveProcess> StartRemoteProcess(const char *host, int port, const char *cmdline, const char *envptr, int timeout)
+{
+	return new RemoteSlaveProcess(host, port, cmdline, envptr, timeout);
+}
+
+void RemoteSlaveProcess::Init()
+{
+	terminated = true;
+}
+
+RemoteSlaveProcess::~RemoteSlaveProcess()
+{
+}
+
+void RemoteSlaveProcess::Open(const char *host, int port, const char *cmdline, const char *envptr, int to)
+{
+	SVRLOG("RemoteSlaveProcess(" << host << ":" << port << ")=" << cmdline);
+	Kill();
+
+	timeout = to;
+	Socket::Init();
+	String localhost;
+	if(host == 0 || *host == 0)
+	{
+		localhost = Socket::GetHostName();
+		host = localhost;
+	}
+	if(port == 0)
+		port = DEFAULT_PORT;
+	terminated = false;
+	current_part = 0;
+	output[0] = output[1] = output[2] = Null;
+	if(!ClientSocket(socket, host, port, true, NULL, REQUEST_TIMEOUT))
+		throw Exc(NFormat(t_("Opening host '%s' / port %d failed, error = %s"), host, port, Socket::GetErrorText()));
+	int len = (int)strlen(cmdline);
+	if(envptr && *envptr) {
+		const char *e = envptr;
+		while(*e)
+			e = e + strlen(e) + 1;
+		socket.Write(":");
+		socket.Write(ASCII85Encode(String(envptr, e + 1)));
+		socket.Write("\n");
+	}
+	socket.Write("=");
+	socket.Write(cmdline, len + 1); // send terminating 0 as well
+	Recv(0, timeout);
+	if(output[0][0] == '-')
+		throw Exc(NFormat(t_("Error running process: %s\nCommand: %s"), output[0].Begin() + 1, cmdline));
+
+	if(output[0] != "+")
+		throw Exc(NFormat(t_("Communication error; process = %s"), cmdline));
+}
+
+void RemoteSlaveProcess::Kill()
+{
+	socket.Close();
+	terminated = true;
+}
+
+bool RemoteSlaveProcess::IsRunning()
+{
+	Recv(0, Null);
+	return !terminated;
+}
+
+void RemoteSlaveProcess::Write(String s)
+{
+	ASSERT(socket.IsOpen());
+	socket.Write(s);
+}
+
+bool RemoteSlaveProcess::Read(String& s)
+{
+	Recv(0, Null);
+	s = output[1];
+	output[1] = Null;
+	return !terminated || !s.IsEmpty();
+}
+
+void RemoteSlaveProcess::Recv(int part, int timeout)
+{
+	if(terminated)
+		return;
+	if(!socket.IsOpen())
+	{
+		SVRLOG("-> broken pipe");
+		terminated = true;
+		return;
+	}
+//	LOG("RemoteSlaveProcess::Recv(" << part << ")");
+	unsigned end = (IsNull(timeout) ? (unsigned)-1 : GetTickCount() + timeout);
+	while(GetTickCount() <= (int)end && (socket.Peek() || current_part <= part))
+	{
+		String data = socket.Read(0);
+		SVRLOG("-> [" << current_part << "] = " << data.GetLength() << " bytes: <" << data << ">");
+		if(data.IsVoid())
+		{
+			SVRLOG("-> broken pipe");
+			terminated = true;
+			return;
+		}
+		const char *p = data, *e = data.End();
+		ASSERT(current_part >= 0 && current_part < __countof(output));
+		for(const char *t; e > p && (t = (const char *)memchr(p, 0, e - p));)
+		{
+			output[current_part].Cat(p, int(t - p));
+			p = t + 1;
+			if(++current_part >= __countof(output))
+			{
+				SVRLOG("-> EOF");
+				terminated = true;
+				return;
+			}
+		}
+		if(p < e)
+			output[current_part].Cat(p, int(e - p));
+	}
+	SVRLOG("-> finished, current_part = " << current_part);
+}
+
+int RemoteSlaveProcess::GetExitCode()
+{
+	if(!terminated)
+		return Null;
+	Recv(2, timeout);
+	return StrInt(output[2]);
+}
+
+One<SlaveProcess> StartProcess(const char *cmdline, const char *envptr, int timeout)
+{
+	if(*cmdline != '(')
+		return StartLocalProcess(cmdline, envptr);
+	const char *b = cmdline + 1, *p = b;
+	while(*p && *p != ')' && *p != ':')
+		p++;
+	String host(b, p);
+	int port = 0;
+	if(*p == ':')
+		port = stou(p + 1, &p);
+	while(*p && *p++ != ')')
+		;
+	if(*p == 0)
+		throw Exc(NFormat(t_("Missing command line (host = %s)."), host));
+	One<RemoteSlaveProcess> rsp = new RemoteSlaveProcess(host, port, p, envptr, timeout);
+	return rsp.Detach();
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/Web/sproc.h b/uppsrc/Web/sproc.h
new file mode 100644
index 000000000..eeda0d00f
--- /dev/null
+++ b/uppsrc/Web/sproc.h
@@ -0,0 +1,21 @@
+class SlaveProcess
+{
+public:
+	SlaveProcess() {}
+	virtual ~SlaveProcess() {}
+
+	virtual void Kill() = 0;
+	virtual bool IsRunning() = 0;
+	virtual void Write(String s) = 0;
+	virtual bool Read(String& s) = 0;
+	virtual int  GetExitCode() = 0;
+	virtual void Detach() {};
+
+private:
+	SlaveProcess(const SlaveProcess& sp);
+	void         operator = (const SlaveProcess& sp);
+};
+
+One<SlaveProcess> StartLocalProcess(const char *cmdline, const char *envptr = NULL);
+One<SlaveProcess> StartRemoteProcess(const char *host, int port, const char *cmdline, const char *envptr = NULL, int timeout = Null);
+One<SlaveProcess> StartProcess(const char *cmdline, const char *envptr = NULL, int timeout = Null);
diff --git a/uppsrc/Web/util.cpp b/uppsrc/Web/util.cpp
new file mode 100644
index 000000000..4fe197533
--- /dev/null
+++ b/uppsrc/Web/util.cpp
@@ -0,0 +1,881 @@
+#include "Web.h"
+
+NAMESPACE_UPP
+
+bool IsSameTextFile(const char *p, const char *q)
+{
+	for(;;)
+	{
+		if(*p == 0)
+		{
+			while(*q && (byte)*q <= ' ')
+				q++;
+			return *q == 0;
+		}
+		if(*q == 0)
+		{
+			while(*p && (byte)*p <= ' ')
+				p++;
+			return *p == 0;
+		}
+		bool pcr = false;
+		if(*p == '\r' || *p == '\n')
+		{
+			if(p[1] == (*p == '\r' ? '\n' : '\r'))
+				p++;
+			p++;
+			pcr = true;
+		}
+		bool qcr = false;
+		if(*q == '\r' || *q == '\n')
+		{
+			if(q[1] == (*q == '\r' ? '\n' : '\r'))
+				q++;
+			q++;
+			qcr = true;
+		}
+		if(pcr || qcr)
+		{
+			if(pcr != qcr)
+				return false;
+		}
+		else if(*p++ != *q++)
+			return false;
+	}
+}
+
+String StringSample(const char *s, int limit)
+{
+	const char *e = (const char *)memchr(s, 0, limit + 1);
+	if(e)
+		return String(s, e);
+	return String(s, limit) + "...";
+}
+
+static String ToQuotedHtml(String s)
+{
+	String out;
+	for(const char *p = s.Begin(), *e = s.End(); p < e; p++)
+		switch(*p)
+		{
+		case 31:   out.Cat("&nbsp;"); break;
+		case '<':  out.Cat("&lt;");   break;
+		case '>':  out.Cat("&gt;");   break;
+		case '&':  out.Cat("&amp;");  break;
+		case '\"': out.Cat("&quot;"); break;
+		case '\r': break;
+		case '\t': out.Cat("&#9;");   break;
+		case '\n': out.Cat("&#10;");  break;
+		default:   out.Cat(*p);       break;
+		}
+	return out;
+}
+
+String FormatIP(dword _ip)
+{
+	byte ip[4];
+	Poke32be(ip, _ip);
+	return Format("%d.%d.%d.%d", ip[0], ip[1], ip[2], ip[3]);
+}
+
+static const char hex_digits[] = "0123456789ABCDEF";
+
+String UrlEncode(String s)
+{
+	const char *p = s, *e = s.End();
+	String out;
+	for(; p < e; p++)
+	{
+		const char *b = p;
+		while(p < e && (byte)*p > ' ' && (byte)*p < 127
+			&& (IsAlNum(*p) || *p == ',' || *p == '.' || *p == '-'))
+			p++;
+		if(p > b)
+			out.Cat(b, int(p - b));
+		if(p >= e)
+			break;
+		if(*p == ' ')
+			out << '+';
+		else
+			out << '%' << hex_digits[(*p >> 4) & 15] << hex_digits[*p & 15];
+	}
+	return out;
+}
+
+String UrlEncode(String s, const char *specials)
+{
+	int l = (int)strlen(specials);
+	const char *p = s, *e = s.End();
+	String out;
+	for(; p < e; p++)
+	{
+		const char *b = p;
+		while(p < e && (byte)*p > ' ' && (byte)*p < 127 && memchr(specials, *p, l) == 0)
+			p++;
+		if(p > b)
+			out.Cat(b, int(p - b));
+		if(p >= e)
+			break;
+		if(*p == ' ')
+			out << '+';
+		else
+			out << '%' << hex_digits[(*p >> 4) & 15] << hex_digits[*p & 15];
+	}
+	return out;
+}
+
+String UrlDecode(String s)
+{
+	const char *p = s, *e = p + s.GetLength();
+	String out;
+	for(; p < e; p++)
+		if(*p == '+')
+			out.Cat(' ');
+		else if(*p == '%' && isxdigit(p[1]))
+		{
+			byte d1 = ctoi(*++p);
+			byte d2 = ctoi(p[1]);
+			if(d2 < 16)
+			{
+				p++;
+				d1 = (d1 << 4) | d2;
+			}
+			out.Cat(d1);
+		}
+		else
+			out.Cat(*p);
+	return out;
+}
+
+String GetRandomIdent(int length)
+{
+	StringBuffer ident(length);
+	char *p = ident;
+	for(int i = 0; i < length; i++)
+		*p++ = 'A' + rand() % ('Z' - 'A' + 1);
+	return ident;
+}
+
+static unsigned AddCRC(unsigned old, byte next, unsigned crc)
+{
+	for(int i = 0; i < 8; i++)
+	{
+		old = (old << 1) ^ (old & 0x80000000u ? crc : 0) ^ (next & 1);
+		next >>= 1;
+	}
+	return old;
+}
+
+enum { CRC = 0x84030625 };
+
+String OtpEncode(String password, String otp_seed)
+{
+	if(IsNull(password))
+		return Null;
+	unsigned crc_sum[4];
+	memset(crc_sum, 0, sizeof(crc_sum));
+	for(int j = 0; j < otp_seed.GetLength(); j++)
+	{
+		unsigned sum = crc_sum[j & 3];
+		sum = AddCRC(sum, otp_seed[j], CRC);
+		for(int i = 0; i < password.GetLength(); i++)
+			sum = AddCRC(sum, password[i], CRC);
+		crc_sum[j & 3] = sum;
+	}
+	char h[100];
+	sprintf(h, "%08X%08X%08X%08X", crc_sum[0], crc_sum[1], crc_sum[2], crc_sum[3]);
+	return h;
+}
+
+String EncryptString(String password, String otp_key)
+{
+	unsigned crc = 0;
+	int i;
+	for(i = 0; i < otp_key.GetLength(); i++)
+		crc = AddCRC(crc, otp_key[i], CRC);
+	int pl = password.GetLength();
+	StringBuffer out(pl);
+	char *p = out;
+	for(i = 0; i < pl; i++)
+	{
+		*p++ = password[i] ^ crc;
+		crc = AddCRC(crc, otp_key[(int)(crc % otp_key.GetLength())], CRC);
+	}
+	return out;
+}
+
+String BinHexEncode(const char *s, const char *e)
+{
+	static const char bh[] = "0123456789ABCDEF";
+	int l = int(e - s);
+	StringBuffer out(2 * l);
+	char *p = out;
+	for(; s < e; s++) {
+		*p++ = bh[(*s >> 4) & 0xF];
+		*p++ = bh[*s & 0xF];
+	}
+	return out;
+}
+
+String BinHexDecode(const char *p, const char *e)
+{
+	StringBuffer out;
+	if((e - p) & 1)
+		e--;
+	for(; p < e; p++)
+		if(IsXDigit(*p) && IsXDigit(p[1])) {
+			out.Cat(ctoi(p[0]) * 16 + ctoi(p[1]));
+			p++;
+		}
+	return out;
+}
+
+String Base64Encode(const char *b, const char *e)
+{
+	static const char encoder[] =
+		"ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+		"abcdefghijklmnopqrstuvwxyz"
+		"0123456789+/";
+	if(b == e)
+		return Null;
+	int out = (int(e - b) + 2) / 3 * 4;
+	int rem = int(e - b) % 3;
+	e -= rem;
+	StringBuffer s(out);
+	char *p = s;
+	while(b < e)
+	{
+		p[0] = encoder[(b[0] >> 2) & 0x3F];
+		p[1] = encoder[((b[0] << 4) & 0x30) | ((b[1] >> 4) & 0x0F)];
+		p[2] = encoder[((b[1] << 2) & 0x3C) | ((b[2] >> 6) & 0x03)];
+		p[3] = encoder[b[2] & 0x3F];
+		b += 3;
+		p += 4;
+	}
+	if(rem == 1)
+	{
+		p[0] = encoder[(b[0] >> 2) & 0x3F];
+		p[1] = encoder[(b[0] << 4) & 0x30];
+		p[2] = p[3] = '=';
+	}
+	else if(rem == 2)
+	{
+		p[0] = encoder[(b[0] >> 2) & 0x3F];
+		p[1] = encoder[((b[0] << 4) & 0x30) | ((b[1] >> 4) & 0x0F)];
+		p[2] = encoder[(b[1] << 2) & 0x3C];
+		p[3] = '=';
+	}
+	return s;
+}
+
+String Base64Decode(const char *b, const char *e)
+{
+	static byte dec64[] =
+	{
+/* 0x */0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+/* 1x */0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+/* 2x */0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x3E, 0xFF, 0xFF, 0xFF, 0x3F,
+/* 3x */0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3A, 0x3B, 0x3C, 0x3D, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+/* 4x */0xFF, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E,
+/* 5x */0x0F, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+/* 6x */0xFF, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F, 0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28,
+/* 7x */0x29, 0x2A, 0x2B, 0x2C, 0x2D, 0x2E, 0x2F, 0x30, 0x31, 0x32, 0x33, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+/* 8x */0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+/* 9x */0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+/* Ax */0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+/* Bx */0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+/* Cx */0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+/* Dx */0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+/* Ex */0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+/* Fx */0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	};
+	StringBuffer out;
+	byte c[4];
+	int pos = 0;
+	for(; b < e; b++)
+		if((byte)*b > ' ') {
+			byte ch = dec64[(byte)*b];
+			if(ch & 0xC0)
+				break;
+			c[pos++] = ch;
+			if(pos == 4) {
+				out.Cat((c[0] << 2) | (c[1] >> 4));
+				out.Cat((c[1] << 4) | (c[2] >> 2));
+				out.Cat((c[2] << 6) | (c[3] >> 0));
+				pos = 0;
+			}
+		}
+	if(pos >= 2) {
+		out.Cat((c[0] << 2) | (c[1] >> 4));
+		if(pos >= 3) {
+			out.Cat((c[1] << 4) | (c[2] >> 2));
+			if(pos >= 4)
+				out.Cat((c[2] << 6) | (c[3] >> 0));
+		}
+	}
+	return out;
+}
+
+String ASCII85Encode(const byte *p, int length)
+{
+	StringBuffer out;
+	out.Reserve((length >> 2) * 5 + (length & 3) + 1);
+	while(length >= 4)
+	{
+		dword chunk = (p[0] << 24) + (p[1] << 16) + (p[2] << 8) + p[3];
+		if(chunk == 0)
+			out.Cat('z');
+		else {
+			out.Cat(33 + chunk / (85 * 85 * 85 * 85));
+			out.Cat(33 + (chunk / (85 * 85 * 85)) % 85);
+			out.Cat(33 + (chunk / (85 * 85)) % 85);
+			out.Cat(33 + (chunk / 85) % 85);
+			out.Cat(33 + chunk % 85);
+		}
+		p += 4;
+		length -= 4;
+	}
+	if(length)
+	{
+		dword chunk = *p++ << 24;
+		if(length > 1) chunk += *p++ << 16;
+		if(length > 2) chunk += *p++ << 8;
+		out.Cat(33 + chunk / (85 * 85 * 85 * 85));
+		out.Cat(33 + (chunk / (85 * 85 * 85)) % 85);
+		if(length > 1)
+			out.Cat(33 + (chunk / (85 * 85)) % 85);
+		if(length > 2)
+			out.Cat(33 + (chunk / 85) % 85);
+	}
+	return out;
+}
+
+String ASCII85Decode(const byte *p, int length)
+{
+	byte buffer[5];
+	int pos = 0;
+	String out;
+	for(const byte *e = p + length; p < e; p++)
+		if(*p >= 33 && *p < 33 + 85)
+		{
+			buffer[pos++] = *p - 33;
+			if(pos >= 5)
+			{
+				unsigned v = buffer[4] + 85 * (buffer[3] + 85 * (buffer[2] + 85 * (buffer[1] + 85 * buffer[0])));
+				out.Cat((byte)(v >> 24));
+				out.Cat((byte)(v >> 16));
+				out.Cat((byte)(v >> 8));
+				out.Cat((byte)v);
+				pos = 0;
+			}
+		}
+		else if(*p == 'z')
+		{
+			out.Cat("\0\0\0", 4);
+			pos = 0;
+		}
+	switch(pos)
+	{
+	case 2:
+		{
+			unsigned v = 84 + 84 * 85 + 84 * 85 * 85 + 85 * 85 * 85 * (buffer[1] + 85 * buffer[0]);
+			out.Cat((byte)(v >> 24));
+		}
+		break;
+
+	case 3:
+		{
+			unsigned v = 84 + 84 * 85 + 85 * 85 * (buffer[2] + 85 * (buffer[1] + 85 * buffer[0]));
+			out.Cat((byte)(v >> 24));
+			out.Cat((byte)(v >> 16));
+		}
+		break;
+
+	case 4:
+		{
+			unsigned v = 84 + 85 * (buffer[3] + 85 * (buffer[2] + 85 * (buffer[1] + 85 * buffer[0])));
+			out.Cat((byte)(v >> 24));
+			out.Cat((byte)(v >> 16));
+			out.Cat((byte)(v >> 8));
+		}
+		break;
+	}
+	return out;
+}
+
+static const dword *GetCRCTable()
+{
+	enum { CTL = 0xDAA97221 };
+	static dword table[256];
+	if(table[1] == 0)
+	{
+		for(int i = 1; i < __countof(table); i++)
+		{
+			dword v = i << 24;
+			for(int t = 0; t < 8; t++)
+				v = (v << 1) ^ (v & (1 << 31) ? CTL : 0);
+			table[i] = v;
+		}
+	}
+	return table;
+}
+
+dword AddCRC(dword crc, const byte *data, int count)
+{
+	const dword *t = GetCRCTable();
+	for(const byte *e = data + count; data < e; data++)
+		crc = ((crc << 8) | (*data & 0xFF)) ^ t[(crc >> 24) & 0xFF];
+	return crc;
+}
+
+static void GetLineIndex(String file, HashBase& hash, Vector<String>& lines)
+{
+	const char *p = file;
+	while(*p)
+	{
+		while(*p && *p != '\n' && (byte)*p <= ' ')
+			p++;
+		const char *b = p;
+		while(*p && *p++ != '\n')
+			;
+		const char *e = p;
+		while(e > b && (byte)e[-1] <= ' ')
+			e--;
+		String s(b, e);
+		hash.Add(GetHashValue(s));
+		lines.Add(s);
+	}
+}
+
+int LocateLine(String old_file, int old_line, String new_file)
+{
+	HashBase old_hash, new_hash;
+	Vector<String> old_lines, new_lines;
+	GetLineIndex(old_file, old_hash, old_lines);
+	GetLineIndex(new_file, new_hash, new_lines);
+	if(old_line <= 0)
+		return 0;
+	if(old_line >= old_lines.GetCount())
+		return new_lines.GetCount();
+	String line = old_lines[old_line];
+	//int hash = old_hash[old_line]; Mirek: unused
+	//int fore_count = old_lines.GetCount() - old_line - 1;
+	int best_match = 0, best_value = 0;
+	for(int r = 0; r < 10 && !best_value; r++)
+	{
+		int src = (r & 1 ? old_line + (r >> 1) + 1 : old_line - (r >> 1));
+		if(src < 0 || src >= old_lines.GetCount())
+			continue;
+		dword hash = old_hash[src];
+		for(int i = new_hash.Find(hash); i >= 0; i = new_hash.FindNext(i))
+			if(new_lines[i] == old_lines[src])
+			{
+				int max_back = min(i, src);
+				int max_fore = min(new_lines.GetCount() - i, old_lines.GetCount() - src) - 1;
+				if(max_back + max_fore <= best_value)
+					continue;
+				int back = 1;
+				while(back <= max_back && new_hash[i - back] == old_hash[src - back]
+					&& new_lines[i - back] == old_lines[src - back])
+					back++;
+				int fore = 1;
+				while(fore < max_fore && new_hash[i + fore] == old_hash[src + fore]
+					&& new_lines[i + fore] == old_lines[src + fore])
+					fore++;
+				if(back + fore > best_value)
+				{
+					best_value = back + fore;
+					best_match = minmax(i, 0, new_lines.GetCount());
+				}
+			}
+	}
+	return best_match;
+}
+
+void AppVersion(const char *ver)
+{
+#ifdef PLATFORM_WIN32
+	String out = "set RAW_VERSION=";
+	out.Cat(ver);
+	out.Cat("\r\n"
+		"set APP_VERSION=");
+	for(; *ver; ver++)
+		out.Cat(IsAlNum(*ver) ? *ver : '_');
+	out.Cat("\r\n");
+	SaveFile("ver.bat", out);
+#else
+	fputs(ver, stdout);
+#endif
+}
+
+//////////////////////////////////////////////////////////////////////
+// HttpQuery::
+
+RefPtr<HttpQuery::Data> HttpQuery::Empty()
+{
+	static RefPtr<Data> emp = new Data;
+	return emp;
+}
+
+void HttpQuery::Serialize(Stream& stream)
+{
+	int version = StreamHeading(stream, 1, 1, 1, "HttpQuery");
+	if(version >= 1)
+	{
+		if(stream.IsLoading())
+			Clear();
+		int count = GetCount();
+		stream / count;
+		for(int i = 0; i < count; i++)
+		{
+			String key, value;
+			if(stream.IsStoring())
+			{
+				key = data -> map.GetKey(i);
+				value = data -> map[i];
+			}
+			stream % key % value;
+			if(stream.IsLoading())
+				Set(key, value);
+		}
+	}
+}
+
+HttpQuery& HttpQuery::SetURL(String url)
+{
+	const char *p = url;
+	while(*p && *p != '\1' && *p != '?')
+		p++;
+	p = (*p == '?' ? p + 1 : ~url);
+
+	// const char *e = url.End(); Mirek:unused
+	while(*p)
+	{
+		const char *last = p;
+		while(*p && *p != '=' && *p != '&')
+			p++;
+		String key = ToUpper(UrlDecode(String(last, p)));
+		if(*p == '=')
+			p++;
+		last = p;
+		while(*p && *p != '&')
+			p++;
+		Set(key, UrlDecode(String(last, p)));
+		if(*p)
+			p++;
+	}
+	return *this;
+}
+
+String HttpQuery::GetHidden() const
+{
+	String out;
+	for(int i = 0; i < GetCount(); i++)
+		if(!IsInternal(i))
+		{
+			out << "<INPUT TYPE=HIDDEN NAME=\"" << ToHtml(GetKey(i))
+			<< "\" VALUE=\"" << ToQuotedHtml(GetValue(i)) << "\">\n";
+		}
+	return out;
+}
+
+String HttpQuery::GetQuery(bool empty) const
+{
+	String result;
+	for(int i = 0, n = GetCount(); i < n; i++)
+		if(!IsInternal(i))
+		{
+			String key = GetKey(i), value = GetValue(i);
+			if(empty || !value.IsEmpty())
+			{
+				if(!result.IsEmpty()) result.Cat('&');
+				result.Cat(UrlEncode(key));
+				result.Cat('=');
+				result.Cat(UrlEncode(value));
+			}
+		}
+	return result;
+}
+
+String HttpQuery::GetQuery(HttpQuery patch, bool empty) const
+{
+	String result;
+	int i, n;
+	for(i = 0, n = GetCount(); i < n; i++)
+		if(!IsInternal(i))
+		{
+			String key = GetKey(i), value = GetValue(i);
+			if(patch.Find(key) < 0)
+			{
+				if(empty || !value.IsEmpty())
+				{
+					if(!result.IsEmpty()) result.Cat('&');
+					result.Cat(UrlEncode(key));
+					result.Cat('=');
+					result.Cat(UrlEncode(value));
+				}
+			}
+		}
+	for(i = 0, n = patch.GetCount(); i < n; i++)
+		if(!patch.IsInternal(i))
+		{
+			String key = patch.GetKey(i), value = patch.GetValue(i);
+			if(empty || !value.IsEmpty())
+			{
+				if(!result.IsEmpty()) result.Cat('&');
+				result.Cat(UrlEncode(key));
+				result.Cat('=');
+				result.Cat(UrlEncode(value));
+			}
+		}
+
+	return result;
+}
+
+bool HttpQuery::IsEmpty(String key) const
+{
+	int f = Find(key);
+	return f < 0 || data -> map[f].IsEmpty();
+}
+
+bool HttpQuery::IsInternal(int i) const
+{
+	String key = GetKey(i);
+	return key[0] == '$' && key[1] == '$';
+}
+
+void HttpQuery::Get(String key, Ref result) const
+{
+	switch(result.GetType())
+	{
+	case BOOL_V:   result.SetValue(GetBool(key)); break;
+	case INT_V:    RefInt(result)    = GetInt(key); break;
+	case DOUBLE_V: RefDouble(result) = GetDouble(key); break;
+	case STRING_V: RefString(result) = GetString(key); break;
+	case DATE_V:   RefDate(result)   = GetDate(key); break;
+	case TIME_V:   RefTime(result)   = GetTime(key); break;
+	default: NEVER();
+	}
+}
+
+bool HttpQuery::GetBool(String key) const
+{
+	int i = Find(key);
+	return i >= 0 && data -> map[i] != "0";
+}
+
+int HttpQuery::GetInt(String key) const
+{
+	int i = Find(key);
+	return i < 0 || data->map[i].IsEmpty() ? (int)Null : atoi(data->map[i]);
+}
+
+double HttpQuery::GetDouble(String key) const
+{
+	int i = Find(key);
+	return i < 0 || data->map[i].IsEmpty() ? (double)Null : atof(data->map[i]);
+}
+
+String HttpQuery::GetString(String key) const
+{
+	int i = Find(key);
+	return i >= 0 ? data -> map[i] : String::GetVoid();
+}
+
+Date HttpQuery::GetDate(String key) const
+{
+	int i = Find(key);
+	return i >= 0 ? Date(StdConvertDate().Scan(data -> map[i])) : Date(Null);
+}
+
+Time HttpQuery::GetTime(String key) const
+{
+	int i = Find(key);
+	return i >= 0 ? Time(StdConvertTime().Scan(data -> map[i])) : Time(Null);
+}
+
+Color HttpQuery::GetColor(String key) const
+{
+	String s = GetString(key);
+	if(s.GetLength() >= 6)
+	{
+		int digit[6];
+		int i = 0;
+		while(i < 6 && (digit[i] = ctoi(s[i])) < 16)
+			i++;
+		if(i >= 6)
+			return Color(digit[0] * 16 + digit[1], digit[2] * 16 + digit[3], digit[4] * 16 + digit[5]);
+	}
+	return Null;
+}
+
+HttpQuery& HttpQuery::SetColor(String key, Color c)
+{
+	if(IsNull(c))
+		SetString(key, Null);
+	else
+		SetString(key, NFormat("%02x%02x%02x", c.GetR(), c.GetG(), c.GetB()));
+	return *this;
+}
+
+bool HttpQuery::GetBool(String key, bool dflt) const
+{
+	int i = Find(key);
+	return i >= 0 ? data -> map[i] != "0" : dflt;
+}
+
+int HttpQuery::GetInt(String key, int min, int max, int dflt) const
+{
+	int v = GetInt(key);
+	return !IsNull(v) ? minmax(v, min, max) : dflt;
+}
+
+double HttpQuery::GetDouble(String key, double min, double max, double dflt) const
+{
+	double v = GetDouble(key);
+	return !IsNull(v) ? minmax(v, min, max) : dflt;
+}
+
+String HttpQuery::GetString(String key, String dflt) const
+{
+	int i = Find(key);
+	return i >= 0 && !data -> map[i].IsEmpty() ? data -> map[i] : dflt;
+}
+
+HttpQuery& HttpQuery::SetBool(String key, bool b)
+{
+	return Set(key, b ? "1" : "");
+}
+
+HttpQuery& HttpQuery::SetInt(String key, int i)
+{
+	return Set(key, IntStr(i));
+}
+
+HttpQuery& HttpQuery::SetDouble(String key, double f)
+{
+	return Set(key, DblStr(f));
+}
+
+HttpQuery& HttpQuery::Set(String key, String s)
+{
+	int i = Find(key);
+	if(i < 0 || data -> map[i] != s)
+	{
+		Clone();
+		if(i < 0)
+			data -> map.Add(key, s);
+		else
+			data -> map[i] = s;
+	}
+	return *this;
+}
+
+HttpQuery& HttpQuery::SetDate(String key, Date d)
+{
+	return Set(key, Format(d));
+}
+
+HttpQuery& HttpQuery::SetTime(String key, Time t)
+{
+	return Set(key, Format(t));
+}
+
+HttpQuery& HttpQuery::SetValue(String key, Value v)
+{
+	return Set(key, StdFormat(v));
+}
+
+HttpQuery& HttpQuery::Set(HttpQuery query)
+{
+	if(int n = query.GetCount())
+	{
+		Clone();
+		RefCon<Data> s = query.data;
+		for(int i = 0; i < n; i++)
+			Set(s -> map.GetKey(i), s -> map[i]);
+	}
+	return *this;
+}
+
+HttpQuery& HttpQuery::Remove(String key)
+{
+	int i = Find(key);
+	if(i < 0)
+		return *this;
+	if(data -> map.GetCount() == 1)
+		Clear();
+	else
+	{
+		Clone();
+		data -> map.Remove(i);
+	}
+	return *this;
+}
+
+HttpQuery& HttpQuery::Remove(const Vector<String>& keys)
+{
+	if(!data)
+		return *this;
+	Index<int> todo;
+	for(int i = 0; i < keys.GetCount(); i++)
+	{
+		int f = data -> map.Find(keys[i]);
+		if(f >= 0)
+			todo.FindAdd(f);
+	}
+	if(todo.IsEmpty())
+		return *this;
+	Clone();
+	Vector<int> todo_us = todo.PickKeys();
+	Sort(todo_us);
+	while(!todo_us.IsEmpty())
+		data -> map.Remove(todo_us.Pop());
+	return *this;
+}
+
+HttpQuery& HttpQuery::Remove(const Vector<Id>& keys)
+{
+	if(!data)
+		return *this;
+	Index<int> todo;
+	for(int i = 0; i < keys.GetCount(); i++)
+	{
+		int f = data -> map.Find(~keys[i]);
+		if(f >= 0)
+			todo.FindAdd(f);
+	}
+	if(todo.IsEmpty())
+		return *this;
+	Clone();
+	Vector<int> todo_us = todo.PickKeys();
+	Sort(todo_us);
+	while(!todo_us.IsEmpty())
+		data -> map.Remove(todo_us.Pop());
+	return *this;
+}
+
+String HttpQuery::ToString() const
+{
+	String out;
+	out << "HttpQuery (" << GetCount() << " items)\n";
+	for(int i = 0; i < GetCount(); i++)
+	{
+		out << "[" << i;
+		if(IsInternal(i))
+			out << ":internal";
+		out << "]: <" << GetKey(i) << "> = <";
+		String value = GetValue(i);
+		if(value.GetLength() <= 1000)
+			out << value;
+		else
+		{
+			out.Cat(value, 1000);
+			out << " ... (length = " << value.GetLength() << ")";
+		}
+		out << ">\n";
+	}
+	return out;
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/Web/util.h b/uppsrc/Web/util.h
new file mode 100644
index 000000000..f76e83dcc
--- /dev/null
+++ b/uppsrc/Web/util.h
@@ -0,0 +1,287 @@
+#ifndef __tweb_util__
+#define __tweb_util__
+
+bool          IsSameTextFile(const char *p, const char *q);
+String        StringSample(const char *s, int limit);
+String        FormatIP(dword _ip);
+String        UrlEncode(String s);
+String        UrlEncode(String s, const char *specials);
+String        UrlDecode(String s);
+String        GetRandomIdent(int length);
+String        OtpEncode(String password, String otp_key);
+String        EncryptString(String password, String otp_key);
+String        BinHexEncode(const char *b, const char *e);
+inline String BinHexEncode(String data)           { return BinHexEncode(data.Begin(), data.End()); }
+String        BinHexDecode(const char *b, const char *e);
+inline String BinHexDecode(String data)           { return BinHexDecode(data.Begin(), data.End()); }
+String        Base64Encode(const char *b, const char *e);
+inline String Base64Encode(String data)           { return Base64Encode(data.Begin(), data.End()); }
+String        Base64Decode(const char *b, const char *e);
+inline String Base64Decode(String data)           { return Base64Decode(data.Begin(), data.End()); }
+String        ASCII85Encode(const byte *p, int length);
+inline String ASCII85Encode(String s)             { return ASCII85Encode(s, s.GetLength()); }
+String        ASCII85Decode(const byte *p, int length);
+inline String ASCII85Decode(String s)             { return ASCII85Decode(s, s.GetLength()); }
+dword         AddCRC(dword crc, const byte *data, int count);
+inline dword  AddCRC(dword crc, String s)         { return AddCRC(crc, s, s.GetLength()); }
+inline dword  GetCRC(const byte *data, int count) { return AddCRC(0x80000000, data, count); }
+inline dword  GetCRC(String s)                    { return AddCRC(0x80000000, s, s.GetLength()); }
+int           LocateLine(String old_file, int old_line, String new_file);
+void          AppVersion(const char *ver);
+String        MD5Digest(const char *text, int length);
+inline String MD5Digest(String s)                 { return MD5Digest(s.Begin(), s.GetLength()); }
+
+#define WID(s) static const String COMBINE(WID_, s)(#s);
+
+class RefBase
+{
+public:
+	RefBase()
+	{
+		refcount = 0;
+#ifdef REF_DEBUG
+		allocindex = ++nextindex;
+#endif//REF_DEBUG
+	}
+
+	RefBase(const RefBase& rb)
+	{
+		refcount = 0;
+#ifdef REF_DEBUG
+		allocindex = ++nextindex;
+#endif//REF_DEBUG
+	}
+
+	virtual ~RefBase()
+	{
+		ASSERT(refcount == 0);
+	}
+
+	void           AddRef() const      { if(this) AtomicInc(refcount); }
+	int            GetRefCount() const { return AtomicXAdd(refcount, 0); }
+	void           Release() const     { if(this && !AtomicDec(refcount)) delete this; }
+#ifdef REF_DEBUG
+	int            GetAllocIndex() const { return allocindex; }
+#endif//REF_DEBUG
+
+private:
+	mutable Atomic refcount;
+#ifdef REF_DEBUG
+	int            allocindex;
+	static int     nextindex;
+#endif//REF_DEBUG
+
+private:
+	RefBase&    operator = (const RefBase& rb) { NEVER(); return *this; }
+};
+
+template <class T>
+class RefCon : Moveable< RefCon<T> >
+{
+public:
+	RefCon(const Nuller& = Null) : t(0) {}
+	RefCon(const T *t);
+	RefCon(const RefCon<T>& rp);
+	~RefCon();
+
+	void            Clear()                                { if(t) { t->Release(); t = NULL; } }
+	bool            IsNullInstance() const                 { return !t; }
+
+	RefCon<T>&      operator = (const RefCon<T>& rp);
+
+	bool            operator ! () const                    { return !t; }
+	const T        *Get() const                            { return t; }
+	const T        *operator ~ () const                    { return t; }
+	const T        *operator -> () const                   { ASSERT(t); return t; }
+	const T&        operator * () const                    { ASSERT(t); return *t; }
+
+	String          ToString() const                       { return t ? AsString(*t) : String("NULL"); }
+
+	friend bool     operator == (RefCon<T> a, RefCon<T> b) { return a.t == b.t; }
+	friend bool     operator != (RefCon<T> a, RefCon<T> b) { return a.t != b.t; }
+	friend unsigned GetHashValue(RefCon<T> r)              { return GetHashValue(r.t); }
+
+protected:
+	const T        *t;
+};
+
+template <class T>
+RefCon<T>::RefCon(const T *t)
+: t(t)
+{
+	t->AddRef();
+#ifdef REF_DEBUG
+	if(t && t->GetRefCount() == 1)
+		RefMemStat::App().Add(typeid(*t).name(), t->GetAllocIndex());
+#endif//REF_DEBUG
+}
+
+template <class T>
+RefCon<T>::RefCon(const RefCon<T>& rp)
+: t(rp.t)
+{ t->AddRef(); }
+
+template <class T>
+RefCon<T>::~RefCon()
+{
+#ifdef REF_DEBUG
+	if(t && t->GetRefCount() == 1)
+		RefMemStat::App().Remove(typeid(*t).name(), t->GetAllocIndex());
+#endif//REF_DEBUG
+	t->Release();
+}
+
+template <class T>
+RefCon<T>& RefCon<T>::operator = (const RefCon<T>& rp)
+{
+	const T *old = t;
+	t = rp.t;
+	t->AddRef();
+#ifdef REF_DEBUG
+	if(old && old->GetRefCount() == 1)
+		RefMemStat::App().Remove(typeid(*old).name(), old->GetAllocIndex());
+#endif//REF_DEBUG
+	old->Release();
+	return *this;
+}
+
+template <class T>
+class RefPtr : public RefCon<T>, public Moveable< RefPtr<T> >
+{
+public:
+	RefPtr(const Nuller& = Null)                 {}
+	RefPtr(T *t) : RefCon<T>(t)                  {}
+	RefPtr(const RefPtr<T>& rp) : RefCon<T>(rp)  {}
+
+	RefPtr<T>&  operator = (const RefPtr<T>& rp) { RefCon<T>::operator = (rp); return *this; }
+
+	T          *Get() const                      { return const_cast<T *>(this->t); }
+	T          *operator ~ () const              { return Get(); }
+	T          *operator -> () const             { ASSERT(this->t); return Get(); }
+	T&          operator * () const              { ASSERT(this->t); return *Get(); }
+};
+
+template <class T>
+class RefValueRep : public RawValueRep<T>
+{
+public:
+	RefValueRep(T v) : RawValueRep<T>(v) {}
+
+	virtual bool       IsNull() const                { return this->v == 0; }
+	virtual unsigned   GetHashValue() const          { return (unsigned)~this->v; }
+	virtual bool       IsEqual(const Value::Void *p);
+	virtual String     AsString()                    { return !!this->v ? UPP::AsString(*this->v) : String(Null); }
+
+	static const RawValueRep<T> *Cast(const Value::Void *p)
+	{ ASSERT(dynamic_cast<const RawValueRep<T> *>(p)); return (const RawValueRep<T> *)p; }
+};
+
+template <class T>
+bool RefValueRep<T>::IsEqual(const Value::Void *p)
+{
+	const RawValueRep<T> *cast = dynamic_cast<const RawValueRep<T> *>(p);
+	return cast && cast->Get() == this->v;
+}
+
+template <class T>
+class RefPCValue : public Value
+{
+protected:
+	typedef RefValueRep<T> Rep;
+
+public:
+	RefPCValue(T x) : Value(new Rep(x)) {}
+	static T Get(const Value& v)       { return UPP::IsNull(v) ? 0 : Rep::Cast(v.GetVoidPtr())->Get(); }
+	static T Extract(const Value& v)   { return UPP::IsNull(v) ? 0 : Rep::Cast(v.GetVoidPtr())->Get(); }
+};
+
+template <class T>
+inline Value RefConToValue(RefCon<T> p)        { return RefPCValue< RefCon<T> >(p); }
+
+template <class T>
+inline Value RefPtrToValue(RefPtr<T> p)        { return RefPCValue< RefPtr<T> >(p); }
+
+class HttpQuery
+{
+private:
+	class Data : public RefBase
+	{
+	public:
+		Data() {}
+		Data(const Data& d) : map(d.map, 0) {}
+
+		VectorMap<String, String> map;
+	};
+
+public:
+	HttpQuery(const Nuller& = Null) : data(Empty())    {}
+	explicit HttpQuery(String url) { data = Empty(); SetURL(url); }
+
+	void                   Serialize(Stream& stream);
+
+	String                 GetHidden() const;
+	String                 GetQuery(bool empty = false) const;
+	String                 GetQuery(HttpQuery patch, bool empty = false) const;
+
+	void                   Clear()                                            { data = Empty(); }
+
+	bool                   IsEmpty() const                                    { return data -> map.IsEmpty(); }
+	bool                   IsEmpty(String key) const;
+
+	int                    GetCount() const                                   { return data -> map.GetCount(); }
+	int                    Find(String key) const                             { return data -> map.Find(key); }
+	String                 GetKey(int i) const                                { return data -> map.GetKey(i); }
+	String                 GetValue(int i) const                              { return data -> map[i]; }
+	bool                   IsInternal(int i) const;
+
+	void                   Get(String key, Ref p1) const;
+	HttpQuery&             SetValue(String key, Value v);
+	HttpQuery&             Set(String key, String value);
+	HttpQuery&             SetRaw(String key, String value);
+
+	bool                   GetBool(String key) const;
+	bool                   GetBool(String key, bool dflt) const;
+	HttpQuery&             SetBool(String key, bool b);
+
+	int                    GetInt(String key) const;
+	int                    GetInt(String key, int min, int max, int dflt = 0) const;
+	HttpQuery&             SetInt(String key, int i);
+
+	double                 GetDouble(String key) const;
+	double                 GetDouble(String key, double min, double max, double dflt = Null) const;
+	HttpQuery&             SetDouble(String key, double f);
+
+	String                 GetString(String key) const;
+	String                 GetString(String key, String dflt) const;
+	HttpQuery&             SetString(String key, String s)                    { return Set(key, s); }
+
+	Date                   GetDate(String key) const;
+	Date                   GetDate(String key, Date dflt) const               { return Nvl(GetDate(key), dflt); }
+	HttpQuery&             SetDate(String key, Date d);
+
+	Time                   GetTime(String key) const;
+	Time                   GetTime(String key, Time dflt) const               { return Nvl(GetTime(key), dflt); }
+	HttpQuery&             SetTime(String key, Time t);
+
+	Color                  GetColor(String key) const;
+	Color                  GetColor(String key, Color dflt) const             { return Nvl(GetColor(key), dflt); }
+	HttpQuery&             SetColor(String key, Color c);
+
+	HttpQuery&             Set(HttpQuery query);
+	HttpQuery&             SetURL(String url);
+
+	HttpQuery&             Remove(String key);
+	HttpQuery&             Remove(const Vector<String>& keys);
+	HttpQuery&             Remove(const Vector<Id>& keys);
+
+	String                 ToString() const;
+
+private:
+	static RefPtr<Data>    Empty();
+	void                   Clone() { if(data -> GetRefCount() > 1) data = new Data(*data); }
+
+private:
+	RefPtr<Data>           data;
+};
+
+#endif//__tweb_util__
diff --git a/uppsrc/Web/weblink/AUTHORS b/uppsrc/Web/weblink/AUTHORS
new file mode 100644
index 000000000..f782e5b62
--- /dev/null
+++ b/uppsrc/Web/weblink/AUTHORS
@@ -0,0 +1,2 @@
+Mirek Fidler <cxl@ntllib.org>
+Tomas Rylek  <rylek@volny.cz>
\ No newline at end of file
diff --git a/uppsrc/Web/weblink/COPYING b/uppsrc/Web/weblink/COPYING
new file mode 100644
index 000000000..33aa39102
--- /dev/null
+++ b/uppsrc/Web/weblink/COPYING
@@ -0,0 +1,30 @@
+Copyright (C) 2005 Mirek Fidler, Tomas Rylek and various contributors (see AUTHORS)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to
+deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies of the Software and its Copyright notices. In addition publicly
+documented acknowledgment must be given that this software has been used if no
+source code of this software is made available publicly. This includes
+acknowledgments in either Copyright notices, Manuals, Publicity and Marketing
+documents or any documentation provided with any product containing this
+software. This License does not apply to any software that links to the
+libraries provided by this software (statically or dynamically), but only to
+the software provided.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+-----------
+
+Please see the COPYING.PLAIN for a plain-english explanation of this notice
+and it's intent.
diff --git a/uppsrc/Web/weblink/COPYING-PLAIN b/uppsrc/Web/weblink/COPYING-PLAIN
new file mode 100644
index 000000000..770a8132f
--- /dev/null
+++ b/uppsrc/Web/weblink/COPYING-PLAIN
@@ -0,0 +1,33 @@
+Plain English Copyright Notice
+
+This file is not intended to be the actual License. The reason this file
+exists is that we here are programmers and engineers. We aren't lawyers. We
+provide licenses that we THINK say the right things, but we have our own
+intentions at heart. This is a plain-english explanation of what those
+intentions are, and if you follow them you will be within the "spirit" of
+the license.
+
+The intent is for us to enjoy writing software that is useful to us (the
+AUTHORS) and allow others to use it freely and also benefit from the work we
+put into making it. We don't want to restrict others using it. They should
+not *HAVE* to make the source code of the applications they write that
+simply link to these libraries (be that statically or dynamically), or for
+them to be limited as to what license they choose to use (be it open, closed
+or anything else). But we would like to know you are using these libraries.
+We simply would like to know that it has been useful to someone. This is why
+we ask for acknowledgement of some sort.
+
+You can do what you want with the source of this software - it doesn't
+matter. We still have it here for ourselves and it is open and free to use
+and download and play with. It can't be taken away. We don't really mind what
+you do with the source to your software. We would simply like to know that
+you are using it - especially if it makes it to a commerical product. If you
+simply e-mail all the AUTHORS (see COPYING and AUTHORS files) telling us, and
+then make sure you include a paragraph or page in the manual or in the "About.."
+box for the product with the copyright notice and state that you used this
+software, we will be very happy. If you want to contribute back modifications
+and fixes you may have made we will welcome those too with open arms (generally).
+If you want help with changes needed, ports needed or features to be added,
+arrangements can be easily made with some dialogue.
+
+Mirek Fidler <cxl@ntllib.org>
diff --git a/uppsrc/Web/weblink/weblink.cpp b/uppsrc/Web/weblink/weblink.cpp
new file mode 100644
index 000000000..8f370780d
--- /dev/null
+++ b/uppsrc/Web/weblink/weblink.cpp
@@ -0,0 +1,228 @@
+#include <Web/Web.h>
+#include <plugin/bz2/bz2.h>
+
+#define WEBLINK_VERSION    "1.0.r3"
+#define WEBLINK_DATE       Date(2004, 7, 1)
+#define WEBLINK_COPYRIGHT  "Copyright � 2004 Tomas Rylek"
+
+struct FilePacket
+{
+	void Serialize(Stream& stream);
+
+	String filename;
+	String filedata;
+	Time   filetime;
+};
+
+void FilePacket::Serialize(Stream& stream)
+{
+	int version = StreamHeading(stream, 1, 1, 1, "FilePacket");
+	if(version >= 1)
+		stream % filename % filedata % filetime;
+}
+
+static void SendFilePacket(String host, int port, FilePacket& packet)
+{
+	Socket socket = ClientSocket(host, port);
+	if(IsNull(socket))
+		throw Exc(NFormat("cannot open %s:%d: %s", host, port, Socket::GetErrorText()));
+	StringStream stream;
+	stream % packet;
+	String compressed = BZ2Compress(stream.GetResult());
+	char temp[12];
+	strcpy(temp, "SEND");
+	PokeIL(temp + 4, compressed.GetLength());
+	int crc = GetCRC(compressed);
+	PokeIL(temp + 8, crc);
+	if(!socket.WriteWait(temp, 12, 2000))
+		throw Exc("timeout writing packet header");
+	for(int done = 0; done < compressed.GetLength();) {
+		fputs(NFormat("\r%s .. %d B", packet.filename, done), stdout);
+		fflush(stdout);
+		int bytes = socket.WriteRaw(compressed.GetIter(done), min<int>(compressed.GetLength() - done, 1024));
+		if(socket.IsError())
+			throw Exc(NFormat("%s:%d: error writing socket: %s", host, port, Socket::GetErrorText()));
+		if(bytes > 0)
+			done += bytes;
+		socket.PeekWrite(1000);
+	}
+	fputs(NFormat("\rUpload of %s, %d B .. (done)", packet.filename, packet.filedata.GetLength()), stdout);
+	fflush(stdout);
+	for(;;) {
+		String peek = socket.PeekCount(4, 100);
+		if(peek.GetLength() >= 4) {
+			if(PeekIL(peek) != crc)
+				throw Exc(NFormat("%s:%d: bad checksum on file %s", host, port, packet.filename));
+			fputs(" .. (OK)\n", stdout);
+			fflush(stdout);
+			break;
+		}
+	}
+}
+
+static void RecvFilePacket(String host, int port, FilePacket& packet)
+{
+	Socket socket = ClientSocket(host, port);
+	if(IsNull(socket))
+		throw Exc(NFormat("cannot open %s:%d: %s", host, port, Socket::GetErrorText()));
+	StringStream stream;
+	stream % packet;
+	String compressed = BZ2Compress(stream.GetResult());
+	char temp[12];
+	strcpy(temp, "RECV");
+	PokeIL(temp + 4, compressed.GetLength());
+	int crc = GetCRC(compressed);
+	PokeIL(temp + 8, crc);
+	if(!socket.WriteWait(temp, 12, 2000) || !socket.WriteWait(compressed, compressed.GetLength(), 10000))
+		throw Exc("timeout writing request");
+	if(socket.ReadCount(temp, 12, 30000) != 12 || memcmp(temp, "DOWN", 4))
+		throw Exc(NFormat("%s:%d: error receiving response header", host, port));
+	int downlen = PeekIL(temp + 4);
+	compressed = Null;
+	while(compressed.GetLength() < downlen) {
+		String part = socket.Read(1000, downlen - compressed.GetLength());
+		if(!part.IsEmpty())
+			compressed.Cat(part);
+		fputs(NFormat("\r%d / %d B", compressed.GetLength(), downlen,
+			iscale(compressed.GetLength(), 100, max(downlen, 1))), stdout);
+		fflush(stdout);
+	}
+	if(GetCRC(compressed) != PeekIL(temp + 8))
+		throw Exc(NFormat("%s:%d: download CRC mismatch", host, port));
+	stream.Open(BZ2Decompress(compressed));
+	stream % packet;
+	if(stream.IsError())
+		throw Exc(NFormat("%s:%d: download stream error", host, port));
+}
+
+static void RunServer(int port)
+{
+	Socket socket = ServerSocket(port);
+	if(IsNull(socket))
+		throw Exc(NFormat("cannot open server socket %d: %s", port, Socket::GetErrorText()));
+	for(;;)
+		try {
+			fputs(NFormat("\rweblink server (version %s) running at port %d (%`)", WEBLINK_VERSION, port, GetSysTime()), stdout);
+			fflush(stdout);
+			Socket new_socket = socket.Accept(NULL, true, 1000);
+			if(!IsNull(new_socket)) {
+				char temp[12];
+				if(new_socket.ReadCount(temp, 12, 30000) < 12)
+					throw Exc("error reading request header");
+				String compressed;
+				int clen = PeekIL(temp + 4);
+				while(compressed.GetLength() < clen) {
+					fputs(NFormat("\r%d / %d B", compressed.GetLength(), clen), stdout);
+					fflush(stdout);
+					compressed.Cat(new_socket.Read(clen - compressed.GetLength(), 1000));
+				}
+				if(GetCRC(compressed) != PeekIL(temp + 8))
+					throw Exc("invalid request CRC");
+				StringStream stream(BZ2Decompress(compressed));
+				FilePacket packet;
+				stream % packet;
+				if(stream.IsError())
+					throw Exc("request header error");
+				if(!memcmp(temp, "SEND", 4)) {
+					if(!SaveFile(packet.filename, packet.filedata) || !FileSetTime(packet.filename, packet.filetime))
+						throw Exc(NFormat("error saving file %s (%d B)", packet.filename, packet.filedata.GetLength()));
+					fputs(NFormat("\nUpload: %s, %d B\n", packet.filename, packet.filedata.GetLength()), stdout);
+					fflush(stdout);
+					if(!new_socket.WriteWait(temp + 8, 4, 10000))
+						throw Exc("handshake error");
+				}
+				else if(!memcmp(temp, "RECV", 4)) {
+					packet.filedata = LoadFile(packet.filename);
+					packet.filetime = FileGetTime(packet.filename);
+					if(packet.filedata.IsVoid())
+						throw Exc(NFormat("error reading file '%s'", packet.filename));
+					stream.Create();
+					stream % packet;
+					compressed = BZ2Compress(stream.GetResult());
+					strcpy(temp, "DOWN");
+					PokeIL(temp + 4, compressed.GetLength());
+					PokeIL(temp + 8, GetCRC(compressed));
+					if(!new_socket.WriteWait(temp, 12, 30000))
+						throw Exc("error writing response header");
+					for(int done = 0; done < compressed.GetLength();) {
+						fputs(NFormat("\r%s .. %d / %d B", packet.filename, done, compressed.GetLength(),
+							iscale(done, 100, (compressed.GetLength(), 1))), stdout);
+						fflush(stdout);
+						int part = new_socket.WriteRaw(compressed.GetIter(done), min<int>(compressed.GetLength() - done, 1024));
+						if(part > 0)
+							done += part;
+					}
+					puts(NFormat("Download: %s, %d B\n", packet.filename, packet.filedata.GetLength()));
+					fflush(stdout);
+				}
+				else
+					throw Exc("request header error");
+			}
+
+		}
+		catch(Exc e) {
+			puts(e);
+		}
+}
+
+static void TryMain()
+{
+	String server;
+	int port = 4444;
+
+	const Vector<String>& cmd = CommandLine();
+	if(!cmd.IsEmpty() && cmd[0] == "-v") {
+		AppVersion(WEBLINK_VERSION);
+		return;
+	}
+	for(int i = 0; i < cmd.GetCount(); i++) {
+		const char *arg = cmd[i];
+		if(*arg == '-' || *arg == '+') {
+			bool upload = (*arg++ == '+');
+			if(!*arg) {
+				if(!*arg && ++i >= cmd.GetCount())
+					throw Exc("+/- missing file name");
+				arg = cmd[i];
+			}
+			String file = arg;
+			if(IsNull(server))
+				throw Exc("+/-: server name not set");
+			FilePacket packet;
+			if(upload) {
+				packet.filename = GetFileName(file);
+				packet.filedata = LoadFile(file);
+				packet.filetime = FileGetTime(file);
+				if(packet.filedata.IsVoid())
+					throw Exc(NFormat("error reading file '%s'", file));
+				SendFilePacket(server, port, packet);
+			}
+			else {
+				packet.filename = GetFileName(file);
+				RecvFilePacket(server, port, packet);
+				if(!SaveFile(file, packet.filedata) || !FileSetTime(file, packet.filetime))
+					throw Exc(NFormat("error writing file '%s'", file));
+			}
+		}
+		else if(IsDigit(*arg)) {
+			port = ScanInt(arg + 1);
+			if(port < 1 || port > 65535)
+				throw Exc(NFormat("invalid port number: %d", port));
+		}
+		else
+			server = arg;
+	}
+
+	if(IsNull(server))
+		RunServer(port);
+}
+
+CONSOLE_APP_MAIN
+{
+	try {
+		TryMain();
+	}
+	catch(Exc e) {
+		puts(e);
+		SetExitCode(1);
+	}
+}
diff --git a/uppsrc/Web/weblink/weblink.upp b/uppsrc/Web/weblink/weblink.upp
new file mode 100644
index 000000000..f28158fa6
--- /dev/null
+++ b/uppsrc/Web/weblink/weblink.upp
@@ -0,0 +1,13 @@
+uses
+	Web,
+	plugin\bz2;
+
+file
+	weblink.cpp,
+	Info readonly separator,
+	COPYING,
+	COPYING-PLAIN,
+	AUTHORS;
+
+mainconfig
+	"" = "";
diff --git a/uppsrc/Web/wisapi/AUTHORS b/uppsrc/Web/wisapi/AUTHORS
new file mode 100644
index 000000000..f782e5b62
--- /dev/null
+++ b/uppsrc/Web/wisapi/AUTHORS
@@ -0,0 +1,2 @@
+Mirek Fidler <cxl@ntllib.org>
+Tomas Rylek  <rylek@volny.cz>
\ No newline at end of file
diff --git a/uppsrc/Web/wisapi/COPYING b/uppsrc/Web/wisapi/COPYING
new file mode 100644
index 000000000..33aa39102
--- /dev/null
+++ b/uppsrc/Web/wisapi/COPYING
@@ -0,0 +1,30 @@
+Copyright (C) 2005 Mirek Fidler, Tomas Rylek and various contributors (see AUTHORS)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to
+deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies of the Software and its Copyright notices. In addition publicly
+documented acknowledgment must be given that this software has been used if no
+source code of this software is made available publicly. This includes
+acknowledgments in either Copyright notices, Manuals, Publicity and Marketing
+documents or any documentation provided with any product containing this
+software. This License does not apply to any software that links to the
+libraries provided by this software (statically or dynamically), but only to
+the software provided.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+-----------
+
+Please see the COPYING.PLAIN for a plain-english explanation of this notice
+and it's intent.
diff --git a/uppsrc/Web/wisapi/COPYING-PLAIN b/uppsrc/Web/wisapi/COPYING-PLAIN
new file mode 100644
index 000000000..770a8132f
--- /dev/null
+++ b/uppsrc/Web/wisapi/COPYING-PLAIN
@@ -0,0 +1,33 @@
+Plain English Copyright Notice
+
+This file is not intended to be the actual License. The reason this file
+exists is that we here are programmers and engineers. We aren't lawyers. We
+provide licenses that we THINK say the right things, but we have our own
+intentions at heart. This is a plain-english explanation of what those
+intentions are, and if you follow them you will be within the "spirit" of
+the license.
+
+The intent is for us to enjoy writing software that is useful to us (the
+AUTHORS) and allow others to use it freely and also benefit from the work we
+put into making it. We don't want to restrict others using it. They should
+not *HAVE* to make the source code of the applications they write that
+simply link to these libraries (be that statically or dynamically), or for
+them to be limited as to what license they choose to use (be it open, closed
+or anything else). But we would like to know you are using these libraries.
+We simply would like to know that it has been useful to someone. This is why
+we ask for acknowledgement of some sort.
+
+You can do what you want with the source of this software - it doesn't
+matter. We still have it here for ourselves and it is open and free to use
+and download and play with. It can't be taken away. We don't really mind what
+you do with the source to your software. We would simply like to know that
+you are using it - especially if it makes it to a commerical product. If you
+simply e-mail all the AUTHORS (see COPYING and AUTHORS files) telling us, and
+then make sure you include a paragraph or page in the manual or in the "About.."
+box for the product with the copyright notice and state that you used this
+software, we will be very happy. If you want to contribute back modifications
+and fixes you may have made we will welcome those too with open arms (generally).
+If you want help with changes needed, ports needed or features to be added,
+arrangements can be easily made with some dialogue.
+
+Mirek Fidler <cxl@ntllib.org>
diff --git a/uppsrc/Web/wisapi/prj.aux b/uppsrc/Web/wisapi/prj.aux
new file mode 100644
index 000000000..b0539af5d
--- /dev/null
+++ b/uppsrc/Web/wisapi/prj.aux
@@ -0,0 +1,2 @@
+file
+	d:\temp\uppout\Web\wisapi\CONSOLE-DLL-MAIN-MSC-MT-RELEASE-WIN32\wisapi.map;
diff --git a/uppsrc/Web/wisapi/version.h b/uppsrc/Web/wisapi/version.h
new file mode 100644
index 000000000..9996c5742
--- /dev/null
+++ b/uppsrc/Web/wisapi/version.h
@@ -0,0 +1,3 @@
+#define WISAPI_VERSION   "5.r13"
+#define WISAPI_DATE      "31.10.2007"
+#define WISAPI_COPYRIGHT "Copyright �1999-2007 Tomas Rylek"
diff --git a/uppsrc/Web/wisapi/wisapi.cpp b/uppsrc/Web/wisapi/wisapi.cpp
new file mode 100644
index 000000000..137baeb00
--- /dev/null
+++ b/uppsrc/Web/wisapi/wisapi.cpp
@@ -0,0 +1,1408 @@
+//////////////////////////////////////////////////////////////////////
+// wisapi: WISAPI extension library.
+
+#include <Web/Web.h>
+#include <TCore/TCore.h>
+#include <httpext.h>
+#include <wininet.h>
+#pragma hdrstop
+#include "version.h"
+
+using namespace Upp;
+
+#define TFILE "wisapi.t"
+#include <Core/t.h>
+
+enum { DEFAULT_PORT = 1571 };
+
+static void AddHeaders(HttpQuery& query, const char *h)
+{
+	while(*h)
+		if((byte)*h > ' ') {
+			String var;
+			for(; *h && *h != ':'; h++)
+				if(IsAlNum(*h))
+					var.Cat(ToUpper(*h));
+				else if(*h == '-' && !var.IsEmpty() && *var.Last() != '_')
+					var.Cat('_');
+			String value;
+			LOG("var = " << var);
+			if(*h == ':') {
+				while((byte)*++h <= ' ' && *h && *h != '\n')
+					;
+				const char *b = h;
+				while(*h && *h++ != '\n')
+					;
+				const char *e = h;
+				while(e > b && (byte)e[-1] < ' ')
+					e--;
+				value = String(b, e);
+				LOG("value = " << value);
+			}
+			if(!IsNull(var)) {
+				var.Insert(0, "$$");
+				String old = query.GetString(var);
+				if(!IsNull(old) && !IsNull(value)) {
+					old << ", " << value;
+					value = old;
+				}
+				LOG("AddHeaders: " << var << "=" << value);
+				query.Set(var, value);
+			}
+		}
+		else
+			h++;
+}
+
+class CheckedSection {
+public:
+	CheckedSection() : lock(0) { InitializeCriticalSection(&section); }
+	~CheckedSection()          { DeleteCriticalSection(&section); }
+
+	void            Enter()    { EnterCriticalSection(&section); AtomicInc(lock); }
+	void            Leave()    { LeaveCriticalSection(&section); AtomicDec(lock); }
+
+	int             Get() const { return lock; }
+
+	class Lock
+	{
+	public:
+		Lock(CheckedSection& cs) : cs(cs) { cs.Enter(); }
+		~Lock()                           { cs.Leave(); }
+
+	private:
+		CheckedSection& cs;
+	};
+
+private:
+	CRITICAL_SECTION section;
+	Atomic           lock;
+};
+
+/*
+class SHandle
+{
+public:
+	SHandle(SC_HANDLE handle = 0) : handle(handle) {}
+	~SHandle() { if(handle) CloseServiceHandle(handle); }
+
+	operator SC_HANDLE () const             { return handle; }
+
+	void           Clear()                  { Attach(0); }
+
+	SC_HANDLE      Detach()                 { SC_HANDLE h = handle; handle = 0; return h; }
+	void           Attach(SC_HANDLE h)      { if(handle) CloseServiceHandle(handle); handle = h; }
+
+	SHandle&       operator = (SC_HANDLE h) { Attach(h); return *this; }
+
+	bool           Query(SERVICE_STATUS& s) { return handle && QueryServiceStatus(handle, &s); }
+
+private:
+	SC_HANDLE      handle;
+};
+
+struct ServiceInfo
+{
+	String display_name;
+	String service_name;
+	dword  state;
+};
+template class Moveable<ServiceInfo>;
+
+static Array<ServiceInfo> EnumServices(SHandle& manager)
+{
+	dword resume_handle = 0;
+	dword more = 0;
+	bool cont;
+	Array<ServiceInfo> list;
+	do
+	{
+		dword done;
+		union
+		{
+			ENUM_SERVICE_STATUS status[1];
+			char                buffer[10000];
+		};
+		bool result = EnumServicesStatus(manager, SERVICE_WIN32,
+			SERVICE_STATE_ALL, status, sizeof(buffer), &more, &done, &resume_handle);
+		cont = (!result && GetLastError() == ERROR_MORE_DATA);
+		if(!result && !cont)
+			break;
+		for(int i = 0; i < done; i++)
+		{
+			ServiceInfo& info = list.Add();
+			info.display_name = status[i].lpDisplayName;
+			info.service_name = status[i].lpServiceName;
+			info.state        = status[i].ServiceStatus.dwCurrentState;
+		}
+	}
+	while(cont);
+	return list;
+}
+*/
+
+static HtmlTag HtmlSimpleRow()
+{
+	return HtmlRow() % HtmlCell().ColSpan(2).Width(-100);
+}
+
+static Htmls HtmlSplitRow(const char *tag, const Htmls& content)
+{
+	return HtmlRow() % (HtmlCell().Width(-30) / tag + "\n" + HtmlCell().Left().Width(-70) / content);
+}
+
+static Htmls HtmlValueRow(const char *tag, const Value& value)
+{
+	return HtmlSplitRow(tag, HtmlBold() / StdFormat(value));
+}
+
+static Htmls HtmlMenu(bool active, const char *text, const char *url, int wd)
+{
+	HtmlTag table = HtmlTable().CellSpacing(0).Border(2)
+		.BorderColor(Black).BgColor(active ? Yellow : WhiteGray);
+	if(wd)
+		table.Width(wd);
+	return table % HtmlRow() % HtmlCell().Center()
+		/ HtmlLink(url) / HtmlFontColor(Black) / (active ? HtmlBold() / text : Htmls(text));
+}
+
+static Htmls HtmlHardSpace(int count = 1)
+{
+	StringBuffer s(count * 6);
+	char *p = s;
+	for(int i = 0; i < count; i++) {
+		memcpy(p, "&nbsp;", 6);
+		p += 6;
+	}
+	return String(s);
+}
+
+static HtmlTag HtmlIsapiTable()
+{
+	return HtmlTable().Width(-100).CellSpacing(0).CellPadding(1).Border(1).BgColor(WhiteGray)
+		% HtmlRow() % HtmlCell()
+		% HtmlTable().Width(-100).CellSpacing(2).CellPadding(0).Border(0).BgColor(WhiteGray);
+}
+
+static Htmls HtmlButton(const char *text, const char *id)
+{
+	return HtmlSubmit(text).Name(id);
+}
+
+static String ReadServerVariable(EXTENSION_CONTROL_BLOCK *ecb, const char *varname)
+{
+	byte buffer[1024];
+	DWORD needed = __countof(buffer);
+	if(ecb->GetServerVariable(ecb->ConnID, (char *)varname, buffer, &needed))
+		return String(buffer, (int)needed - 1);
+	StringBuffer strbuf(needed);
+	if(ecb->GetServerVariable(ecb->ConnID, (char *)varname, strbuf, &needed)) {
+		strbuf.SetLength((int)needed - 1);
+		return strbuf;
+	}
+	return String::GetVoid();
+}
+
+static void WriteHeader(EXTENSION_CONTROL_BLOCK *ecb, const char *response, const char *header)
+{
+//	LOGHEXDUMP(header, strlen(header));
+	LOG("WriteHeader(response = " << (response ? response : "(null)") << ", headers = " << (header ? header : "(null)") << ")");
+	ecb->ServerSupportFunction(ecb->ConnID, HSE_REQ_SEND_RESPONSE_HEADER, (void *)response, 0, (dword *)header);
+}
+
+static void WriteClient(EXTENSION_CONTROL_BLOCK *ecb, const void *data, int count)
+{
+	dword c = (count >= 0 ? count : strlen((const char *)data));
+//	LOG("client output (" << (int)c << "bytes): " << (const char *)data << "(eocd)");
+//	LOGHEXDUMP(data, count);
+//	LOG("(eocd raw)");
+	ecb->WriteClient(ecb->ConnID, (void *)data, &c, HSE_IO_SYNC);
+}
+
+static void WriteClient(EXTENSION_CONTROL_BLOCK *ecb, const String& data)
+{
+	WriteClient(ecb, data, data.GetLength());
+}
+
+static HINSTANCE       dll_module;
+static String          dll_filename;
+static bool            log_isapi = true;
+static bool            show_headers = false;
+static bool            remote_admin = true;
+static bool            isapi_english = true;
+static int             isapi_timeout = 5000;
+static long            log_id = 0;
+static CheckedSection  log_lock;
+static int             retry_msec = 1000;
+
+static void WriteLog(const String& s)
+{
+	CheckedSection::Lock guard(log_lock);
+	Stream& strm = VppLog();
+	int i = GetTickCount();
+	int l = InterlockedIncrement(&log_id);
+	String out = NFormat("%d.%d, #%d, T%d: %s\n", i / 1000, (i / 100) % 10, l, (int)GetCurrentThreadId(), s);
+	strm.Put(out);
+	strm.Flush();
+}
+
+#define ISAPILOG(x) if(log_isapi) WriteLog(String() << x); else ;
+#define ISAPIDEBUG(x) if(log_isapi) { ISAPILOG("<< " #x); x; ISAPILOG(">> " #x); } else { x; }
+
+//timeout_title[] = "Chyba: server je p�et�en",
+//timeout_desc[]  = "P�ipojen� k internetov�mu serveru se nezda�ilo,\n"
+//"proto�e server je pln� vyt�en vy�izov�n�m po�adavk� ostatn�ch klient�.\n"
+//"\n"
+//"<P>\n"
+//"Zkuste se pros�m p�ipojit pozd�ji.\n";
+
+static String GetError(const char *title, const char *desc)
+{
+	return String() <<
+		"\n"
+		"<HTML>\n"
+		"<HEAD>\n"
+		"<TITLE>" << title << "</TITLE>\n"
+		"</HEAD>\n"
+		"<BODY>\n"
+		"<H1>" << title << "</H1>\n"
+		"<P>\n"
+		<< desc <<
+		"\n"
+		"</BODY>\n"
+		"</HTML>\n";
+}
+
+static String Trim(const char *s, const char *e)
+{
+	while(s < e && (byte)*s <= ' ')
+		s++;
+	while(e > s && (byte)e[-1] <= ' ')
+		e--;
+	return String(s, e);
+}
+
+class WIsapiClient
+{
+public:
+	WIsapiClient();
+	~WIsapiClient();
+
+	dword             Run(int cid, EXTENSION_CONTROL_BLOCK *ecb);
+
+private:
+	void              ReadPostData(HttpQuery& query, EXTENSION_CONTROL_BLOCK *ecb);
+	bool              Run(int cid, const HttpQuery& query, EXTENSION_CONTROL_BLOCK *ecb);
+
+	Htmls             Config(const HttpQuery& query);
+	Htmls             Body(String english);
+	Htmls             Configuration(String english);
+	Htmls             Login();
+	Htmls             English();
+	Htmls             Logging();
+	Htmls             ShowHeaders();
+	Htmls             Timing();
+	Htmls             RemoteAdmin();
+//	HtmlTag           Edit(Id id, int& value);
+	Htmls             Servers();
+//	Htmls             Commit();
+
+	Htmls             Statistics();
+
+	Htmls             Services();
+	Htmls             ServiceTable();
+
+	bool              CanWrite();
+
+	void              AddHost(const String& host);
+	void              RemoveHost(const String& host);
+
+	void              LoadConfig();
+	void              SaveConfig();
+
+private:
+	class Connection
+	{
+	public:
+		Connection(WIsapiClient& owner, const String& raw_host);
+
+		bool        Run(int conn_id, const HttpQuery& query, One<CheckedSection::Lock>& owner_lock, EXTENSION_CONTROL_BLOCK *ecb);
+		String      RawRun(const HttpQuery& query, EXTENSION_CONTROL_BLOCK *ecb, int& data_length);
+		void        Kill();
+		void        Status();
+		void        CONNLOG(const String& log);
+
+	public:
+		// configuration
+		String          raw_host;
+		String          host;
+		int             port;
+		String          status;
+		dword           retry_ticks;
+		bool            is_error;
+		bool            is_busy;
+
+		// statistics
+		Time            run_time;
+		double          hit_count;
+		int             last_msecs;
+		double          total_msecs;
+		double          total_bytes;
+		int             max_msecs;
+		double          error_count;
+
+		// state parameters
+		int             conn_id;
+		CheckedSection  conn_lock;
+		WIsapiClient&   owner;
+		HttpQuery       query;
+		Socket          socket; // server connection
+	};
+	friend class Connection;
+
+	Array<Connection> connections;
+	CheckedSection    client_lock;
+	Event             free_event;
+
+	Time              run_time;
+	double            hit_count;
+	double            total_msecs;
+	double            total_bytes;
+	double            max_msecs;
+	double            error_count;
+
+	HttpQuery         cfg_query;
+	String            cfg_filename;
+	String            cfg_default_host;
+	String            cfg_error;
+	String            cfg_url;
+	String            cfg_password;
+	int               cfg_can_write;
+};
+
+WIsapiClient::Connection::Connection(WIsapiClient& owner, const String& raw_host)
+: owner(owner), raw_host(raw_host)
+{
+	const char *p = raw_host;
+	while(*p && *p != '@')
+		p++;
+	host = String(raw_host.Begin(), p);
+	port = DEFAULT_PORT;
+	if(*p++ == '@' && IsDigit(*p))
+		port = stou(p);
+	hit_count = total_msecs = total_bytes = error_count = 0;
+	max_msecs = 0;
+	last_msecs = 0;
+	run_time = GetSysTime();
+	is_busy = false;
+	is_error = false;
+	retry_ticks = GetTickCount();
+	Status();
+}
+
+void WIsapiClient::Connection::CONNLOG(const String& log)
+{
+	ISAPILOG("Connection(" << conn_id << "): " << log);
+}
+
+void WIsapiClient::Connection::Status()
+{
+	ISAPILOG("Connection::Status->OpenClient");
+	dword ticks = GetTickCount();
+	String response;
+	ISAPILOG("Connection::Status->OpenClient, opening socket");
+	if(ClientSocket(socket, host, port)) {
+		ISAPILOG("Connection::Status->ClientSocket open, sending STAT");
+		socket.Write("STAT\n");
+		response = socket.ReadUntil('\n');
+		if(!socket.Close())
+		{
+			status = Socket::GetErrorText();
+			ISAPILOG("Connection::Status->" << status);
+			is_error = true;
+		}
+		else
+		{
+			ISAPILOG("-> response=" << response);
+			if(!strnicmp(response, "READY ", 6))
+			{
+				status = response.Mid(6);
+				is_error = false;
+				return;
+			}
+			status = t_("Invalid server response: ") + response;
+		}
+	}
+	else {
+		ISAPILOG("Connection::Status->ClientSocket failed to open, " << Socket::GetErrorText());
+		status = NFormat(t_("Error opening socket %s:%d: %s"), host, port, Socket::GetErrorText());
+	}
+	is_error = true;
+	dword new_ticks = GetTickCount();
+	retry_ticks = new_ticks + minmax(retry_msec, 10 * (int)(new_ticks - ticks), 60000);
+	ISAPILOG("retry ticks = " << (int)retry_ticks);
+}
+
+bool WIsapiClient::Connection::Run(int cid, const HttpQuery& new_query, One<CheckedSection::Lock>& owner_lock, EXTENSION_CONTROL_BLOCK *ecb)
+{
+	{
+		CheckedSection::Lock conn_guard(conn_lock);
+
+		if(is_busy) {
+			CONNLOG("connection busy, ignoring new request " + FormatInt(cid));
+			return false;
+		}
+
+		if(is_error) {
+			int delta = GetTickCount() - retry_ticks;
+			ISAPILOG("WIsapiClient::Connection; retry in " << delta);
+			if(delta >= 0)
+				Status();
+			if(is_error)
+				return false;
+		}
+
+		conn_id = cid;
+		is_busy = true;
+	}
+
+	CONNLOG(String() << "before leaving client lock: " << owner.client_lock.Get());
+	CONNLOG(String() << "owner lock = " << FormatIntHex(~owner_lock));
+	owner_lock.Clear();
+//	owner.client_lock.Leave();
+	CONNLOG(String() << "after leaving client lock: " << owner.client_lock.Get());
+
+	dword start_ticks = GetTickCount();
+
+	int data_length = 0;
+	String error = RawRun(new_query, ecb, data_length);
+
+	CONNLOG(String() << "before re-entering client lock: " << owner.client_lock.Get());
+	owner_lock = new CheckedSection::Lock(owner.client_lock);
+	CONNLOG(String() << "after re-entering client lock: " << owner.client_lock.Get());
+//	owner.client_lock.Enter();
+
+	bool is_ok = IsNull(error);
+	if(is_error = !is_ok)
+	{
+		CONNLOG(error);
+		socket.Close();
+	}
+
+	{
+		CheckedSection::Lock conn_guard(conn_lock);
+		hit_count++;
+		owner.hit_count++;
+		if(is_ok)
+		{
+			last_msecs = GetTickCount() - start_ticks;
+			total_msecs += last_msecs;
+			owner.total_msecs += last_msecs;
+
+			total_bytes += data_length;
+			owner.total_bytes += data_length;
+
+			if(last_msecs > max_msecs) max_msecs = last_msecs;
+			if(last_msecs > owner.max_msecs) owner.max_msecs = last_msecs;
+		}
+		else
+		{
+			error_count++;
+			owner.error_count++;
+			is_busy = false;
+		}
+	}
+
+	if(is_ok)
+		owner.free_event.Set();
+
+	return true;
+}
+
+String WIsapiClient::Connection::RawRun(const HttpQuery& new_query, EXTENSION_CONTROL_BLOCK *ecb, int& data_length)
+{
+	CONNLOG("OpenClient");
+	if(!ClientSocket(socket, host, port))
+		return Socket::GetErrorText();
+	CONNLOG(String() << "OpenClient->socket " << socket.GetNumber());
+	query = new_query;
+	StringStream out;
+	out.Put("SAPI");
+	out.PutIL(0);
+	out % query;
+	out.Seek(4);
+	out.PutIL((int)(out.GetSize() - 8));
+	socket.Write(out.GetResult());
+//		socket.StopWrite();
+
+	CONNLOG("executing");
+	String line = socket.ReadUntil('\n');
+	if(socket.IsError())
+		return Socket::GetErrorText();
+	CONNLOG("-> response=" + line);
+	int trim = line.GetLength();
+	while(trim > 0 && line[trim - 1] <= ' ')
+		trim--;
+	line.Trim(trim);
+	if(trim < 5 || memicmp(line, "HTTP/", 5))
+		return NFormat(t_("Invalid server response: %s\n"
+	"<br>...\n"), HtmlTag("TT") / ToHtml(line));
+
+	const char *p = line.Begin() + 5;
+	while(*p && *p != ' ')
+		p++;
+	String status_line;
+	if(*p == ' ' && IsDigit(*++p)) {
+		status_line = p;
+	}
+	int content_length = 0;
+	String headers;
+	for(;;)
+	{
+		line = socket.ReadUntil('\n');
+		if(socket.IsError())
+			return Socket::GetErrorText();
+
+		CONNLOG(String() << "-> header=" << line);
+		for(p = line; *p && (byte)*p <= ' '; p++)
+			;
+		const char *b = p, *e = line.End();
+		while(e > b && (byte)e[-1] < ' ')
+			e--;
+		if(b >= e)
+		{
+			headers.Cat("\r\n");
+			break;
+		}
+		static const char cl[] = "content-length:";
+		enum
+		{
+			CL_LENGTH = sizeof(cl) - 1,
+			MAX_DATA_SIZE = 10000000,
+		};
+		if(!strnicmp(p, cl, CL_LENGTH))
+		{
+			for(p += CL_LENGTH; *p == ' '; p++)
+				;
+			if(IsDigit(*p))
+				content_length = minmax<int>(stou(p), 0, MAX_DATA_SIZE);
+		}
+		headers.Cat(b, e - b);
+		headers.Cat("\r\n");
+	}
+	String body;
+	while(body.GetLength() < content_length) {
+		String part = socket.Read(isapi_timeout);
+		if(part.IsEmpty())
+			return NFormat("Partial input received, %d out of %d for #%d", body.GetLength(), content_length, conn_id);
+		body.Cat(part);
+	}
+	CONNLOG(String() << "-> transmitted " << body.GetLength() << " bytes");
+
+	socket.Close();
+	int old_id = conn_id;
+
+	{
+		CheckedSection::Lock guard(conn_lock);
+		is_busy = false;
+		CONNLOG("-> connection freed");
+	}
+	owner.free_event.Set();
+
+	WriteHeader(ecb, !IsNull(status_line) ? ~status_line : NULL, headers);
+	WriteClient(ecb, body);
+
+	data_length = headers.GetLength() + body.GetLength();
+
+	return Null;
+}
+
+WIsapiClient::WIsapiClient()
+{
+	cfg_filename = ForceExt(dll_filename, ".cfg");
+	cfg_default_host << "localhost@" << (int)DEFAULT_PORT;
+	hit_count = total_msecs = total_bytes = max_msecs = error_count = 0;
+	run_time = GetSysTime();
+	show_headers = false;
+	LoadConfig();
+}
+
+WIsapiClient::~WIsapiClient()
+{
+}
+
+void WIsapiClient::ReadPostData(HttpQuery& query, EXTENSION_CONTROL_BLOCK *ecb)
+{
+	unsigned left = ecb->cbTotalBytes;
+	unsigned length = left;
+	StringBuffer b(length);
+	char *out = b;
+	if(ecb->cbAvailable)
+	{
+		unsigned count = min<unsigned>(ecb->cbAvailable, left);
+		memcpy(out, ecb->lpbData, count);
+		out += count;
+		left -= count;
+	}
+	while(left > 0)
+	{
+		dword count = left;
+		if(!ecb->ReadClient(ecb->ConnID, out, &count) || count > left)
+		{
+			ISAPILOG(">>> HttpExtensionProc: POST fetch error");
+			return; // error reading client data
+		}
+		left -= count;
+		out += count;
+	}
+	String buffer = b;
+	if(buffer.Find('\n') < 0)
+	{
+		query.SetURL(buffer);
+		return;
+	}
+	GetHttpPostData(query, buffer);
+}
+
+bool WIsapiClient::Run(int cid, const HttpQuery& query, EXTENSION_CONTROL_BLOCK *ecb)
+{
+	dword ticks = GetTickCount();
+
+	ISAPILOG("WIsapiClient(" << cid << "): assigning request");
+	enum { ASSIGN_TIMEOUT = 60000 };
+	do {
+		ISAPILOG("WIsapiClient(" << cid << "): before entering client lock: " << client_lock.Get());
+		One<CheckedSection::Lock> lock = new CheckedSection::Lock(client_lock);
+		ISAPILOG("WIsapiClient(" << cid << "): after entering client lock: " << client_lock.Get());
+//		client_lock.Enter();
+		if(connections.IsEmpty())
+			return false;
+		int repcnt = connections.GetCount();
+		int i = 0;
+		if(repcnt > 0) {
+			int ticks = connections[0].last_msecs;
+			for(int t = 1; t < connections.GetCount(); t++)
+				if(connections[t].last_msecs < ticks)
+					ticks = connections[i = t].last_msecs;
+		}
+		while(--repcnt >= 0) {
+			Connection& conn = connections[i];
+			ISAPILOG("WIsapiClient(" << cid << "): trying connection #" << i);
+			if(conn.Run(cid, query, lock, ecb)) {
+//				client_lock.Leave();
+				ISAPILOG("WIsapiClient(" << cid << "): request completed, lock = " << client_lock.Get());
+				return true;
+			}
+			if(++i >= connections.GetCount())
+				i = 0;
+		}
+		ISAPILOG("WIsapiClient(" << cid << "): before leaving client lock: " << client_lock.Get());
+		lock.Clear();
+//		client_lock.Leave();
+		ISAPILOG("WIsapiClient(" << cid << "): after leaving client lock: " << client_lock.Get());
+		ISAPIDEBUG(free_event.Wait(500);)
+	}
+	while(int(GetTickCount() - ticks) <= ASSIGN_TIMEOUT);
+	ISAPILOG("WIsapiClient(" << cid << "): request assignment timeout\n");
+	return false;
+}
+
+dword WIsapiClient::Run(int cid, EXTENSION_CONTROL_BLOCK *ecb)
+{
+/*	bool empty = false;
+	for(int i = 0; i < connections.GetCount(); i++)
+		if(!connections[i].ecb)
+		{
+			empty = true;
+			break;
+		}
+	if(!empty)
+	{
+		ISAPILOG("ECB busy");
+		return HSE_STATUS_SUCCESS;
+	}
+*/
+	int start_time = GetTickCount();
+
+	ISAPILOG("WIsapiClient(" << cid << ")");
+
+	ecb->dwHttpStatusCode = HTTP_STATUS_OK;
+
+//	ISAPILOG("ALL_HTTP:\n" << ReadServerVariable(ecb, "ALL_HTTP"));
+//	ISAPILOG("ALL_RAW:\n" << ReadServerVariable(ecb, "ALL_RAW"));
+//	ISAPILOG("AUTH_PASSWORD:\n" << ReadServerVariable(ecb, "AUTH_PASSWORD"));
+//	ISAPILOG("AUTH_TYPE:\n" << ReadServerVariable(ecb, "AUTH_TYPE"));
+//	ISAPILOG("AUTH_USER:\n" << ReadServerVariable(ecb, "AUTH_USER"));
+//	ISAPILOG("LOCAL_ADDR:\n" << ReadServerVariable(ecb, "LOCAL_ADDR"));
+
+	HttpQuery query;
+
+	AddHeaders(query, ReadServerVariable(ecb, "ALL_RAW"));
+
+	query.Set("$$IPADDR", ReadServerVariable(ecb, "REMOTE_ADDR"));
+	query.Set("$$WISAPI", dll_filename);
+	query.Set("$$METHOD", ecb->lpszMethod);
+	query.Set("$$QUERY",  ecb->lpszQueryString);
+	query.SetInt("$$HTTP_VERSION", 1000);
+	query.SetURL(ecb->lpszQueryString);
+	if(ecb->lpszPathInfo && *ecb->lpszPathInfo)
+		query.Set("$$PATH", ecb->lpszPathInfo);
+	else
+//		query.Set(WID__PATH, "http://www.wmap.cz:1571/atlaszp");
+		query.Set("$$PATH", GetFileName(dll_filename));
+	query.Set("$$CONTENT_TYPE", ecb->lpszContentType);
+
+	if(!stricmp(ecb->lpszMethod, "POST"))
+		ReadPostData(query, ecb);
+
+	ISAPILOG("WIsapiClient(" << cid << "): query = " << query);
+
+	String out;
+
+	if(query.Find("CONFIGURE") >= 0)
+	{ // config page
+		out = Config(query);
+		String header = HttpContentType(HttpTextHtml(CHARSET_DEFAULT));
+		header << "Content-length: " << out.GetLength() << "\r\n\r\n";
+		WriteHeader(ecb, NULL, header);
+		WriteClient(ecb, out);
+		return HSE_STATUS_SUCCESS;
+	}
+
+	if(Run(cid, query, ecb)) {
+		ISAPILOG("end: status = " << (int)ecb->dwHttpStatusCode);
+		return HSE_STATUS_SUCCESS;
+//			ISAPILOG("-> accepted");
+//			ecb->dwHttpStatusCode = HTTP_STATUS_ACCEPTED;
+//			return HSE_STATUS_PENDING;
+	}
+
+	CheckedSection::Lock guard(client_lock);
+	if(connections.IsEmpty())
+		out << t_("Currently there are no servers connected.\n"
+	"You can connect servers using ")
+		<< HtmlLink(query.GetString("$$PATH") + "?configure") / t_("the configuration page")
+		<< ".";
+	else
+		out << t_("No connected server can process the current request.");
+
+	ISAPILOG("WIsapiClient(" << cid << "):->error page: " << out);
+	out = GetHttpErrorPage(query, out, show_headers);
+	String header = HttpContentType(HttpTextHtml(CHARSET_DEFAULT));
+	header << "Content-length: " << out.GetLength() << "\r\n\r\n";
+	WriteHeader(ecb, NULL, header);
+	WriteClient(ecb, out);
+	return HSE_STATUS_SUCCESS;
+}
+
+static const char *Title() { return t_("Web server connector configuration"); }
+
+Htmls WIsapiClient::Config(const HttpQuery& query)
+{
+	CheckedSection::Lock guard(client_lock);
+
+	cfg_url = GetHttpPath(cfg_query = query) + "?configure";
+	cfg_can_write = -1;
+	cfg_error = Null;
+
+	String eng = English();
+	return HtmlTitlePage(Title(), Body(eng));
+}
+
+Htmls WIsapiClient::Body(String eng)
+{
+	Htmls body;
+	body
+		<< HtmlTag("SMALL") / t_("Library location: ")
+		<< HtmlTag("TT") / ToHtml(dll_filename) << "<BR>\n"
+		<< HtmlTag("SMALL") / (String() << t_("Version: <B>")
+			<< WISAPI_VERSION << t_("</B>, release date: <B>")
+			<< WISAPI_DATE "</B><BR>\n" WISAPI_COPYRIGHT "<P>\n");
+
+	String s = cfg_query.GetString("CONFIGURE");
+	enum { CONFIG, STAT /*, SERV */ } page = CONFIG;
+	switch(*s)
+	{
+	case 's': page = STAT; break;
+//	case 'r': page = SERV; break;
+	}
+	Htmls menu;
+	if(remote_admin)
+	{
+		menu
+			<< HtmlCell() / ::HtmlMenu(page == CONFIG, t_("Configuration"), cfg_url, 120)
+			<< HtmlCell() / HtmlHardSpace(2);
+	}
+	else
+		page = STAT;
+	menu
+		<< HtmlCell() / ::HtmlMenu(page == STAT, t_("Statistics"), cfg_url + "=s", 120)
+//		<< HtmlCell() / HtmlHardSpace(2)
+//		<< HtmlCell() / HtmlMenu(page == SERV, "Slu�by", cfg_url + "=r", 120)
+	;
+
+	body << HtmlTable().CellSpacing(0) % HtmlRow() % menu
+		<< "<P>\n";
+
+	switch(page)
+	{
+	case CONFIG: body << Configuration(eng); break;
+	case STAT:   body << Statistics(); break;
+//	case SERV:   body << Services(); break;
+	}
+
+	return body;
+}
+
+Htmls WIsapiClient::Configuration(String eng)
+{
+	Htmls content;
+	content << Login()
+		<< HtmlSimpleRow() << eng
+		<< HtmlSimpleRow() << Logging()
+		<< HtmlSimpleRow() << ShowHeaders()
+		<< HtmlSimpleRow() << Timing()
+		<< HtmlSimpleRow() << RemoteAdmin()
+		<< HtmlSimpleRow() << Servers();
+//	content // must be the last one as Timing() and Servers() might modify some client data
+//		<< HtmlSimpleRow() << Commit();
+	if(!IsNull(cfg_error))
+		content = HtmlSimpleRow() / HtmlFontColor(LtRed) / (HtmlBig() / (t_("Error: ") + HtmlBold() / cfg_error))
+		+ HtmlSimpleRow() + content;
+	return HtmlTag("FORM").Attr("METHOD", "POST").Attr("ACTION", cfg_url) % HtmlIsapiTable() % content;
+}
+
+Htmls WIsapiClient::English()
+{
+	int engstate = Null;
+	if(!cfg_query.IsEmpty("ENGLISH"))
+		engstate = 1;
+	else if(!cfg_query.IsEmpty("CZECH"))
+		engstate = 0;
+	if(!IsNull(engstate) && CanWrite()) {
+		bool new_eng = !!engstate;
+		if(new_eng != isapi_english)
+		{
+			isapi_english = new_eng;
+			SaveConfig();
+			SetLanguage(isapi_english ? LNG_ENGLISH : LNG_CZECH);
+		}
+	}
+	return HtmlSplitRow(HtmlBig() / (t_("ISAPI library language: ")
+		+ HtmlFontColor(LtRed) / t_("english")),
+		HtmlButton(isapi_english ? "  Czech " : " Anglicky ", isapi_english ? "CZECH" : "ENGLISH"));
+}
+
+Htmls WIsapiClient::Logging()
+{
+	int logstate = Null;
+	if(!cfg_query.IsEmpty("LOGON"))
+		logstate = 1;
+	else if(!cfg_query.IsEmpty("LOGOFF"))
+		logstate = 0;
+	if(!IsNull(logstate) && CanWrite())
+	{
+		bool new_log = !!logstate;
+		if(new_log != log_isapi)
+		{
+			log_isapi = new_log;
+			SaveConfig();
+		}
+	}
+	return HtmlSplitRow(HtmlBig() / (t_("Log-file: ")
+		+ HtmlFontColor(LtRed) / (log_isapi ? t_("yes") : t_("no"))),
+		HtmlButton(log_isapi ? t_("Disable") : t_("Enable"), log_isapi ? "LOGOFF" : "LOGON"));
+}
+
+Htmls WIsapiClient::ShowHeaders()
+{
+	int hdrstate = Null;
+	if(!cfg_query.IsEmpty("HDRON"))
+		hdrstate = 1;
+	else if(!cfg_query.IsEmpty("HDROFF"))
+		hdrstate = 0;
+	if(!IsNull(hdrstate) && CanWrite())
+	{
+		bool new_hdr = !!hdrstate;
+		if(new_hdr != show_headers)
+		{
+			show_headers = new_hdr;
+			SaveConfig();
+		}
+	}
+	return HtmlSplitRow(HtmlBig() / (t_("Show headers on error: ")
+		+ HtmlFontColor(LtRed) / (show_headers ? t_("yes") : t_("no"))),
+		HtmlButton(show_headers ? t_("Disable") : t_("Enable"), show_headers ? "HDROFF" : "HDRON"));
+}
+
+Htmls WIsapiClient::RemoteAdmin()
+{
+	bool noadmin = false;
+	if(!cfg_query.IsEmpty("NOADMIN1") && CanWrite())
+	{
+		remote_admin = false;
+		SaveConfig();
+		return HtmlSplitRow(HtmlBig() / (t_("Remote administration: ") + HtmlFontColor(LtRed) / t_("off")), Null);
+	}
+	if(!cfg_query.IsEmpty("NOADMIN") && CanWrite())
+		return HtmlSplitRow(HtmlBig() / HtmlFontColor(LtRed) / (t_("After confirmation the remote "
+	"administration option will be disabled. You can re-enable remote "
+	"administration by removing the line ADMIN=0 from the "
+	"configuration file ")
+			+ cfg_filename + "."), HtmlButton(t_(" Confirm "), "NOADMIN1"));
+	return HtmlSplitRow(HtmlBig() / (t_("Remote administration: ") + HtmlFontColor(LtRed) / t_("on")),
+		HtmlButton(t_("  Disable  "), "NOADMIN"));
+}
+
+Htmls WIsapiClient::Timing()
+{
+	if(!cfg_query.IsEmpty("SAVE_TIMEOUT") && CanWrite())
+	{
+		isapi_timeout = cfg_query.GetInt("TIMEOUT", 1000, 60000, 1000);
+		SaveConfig();
+	}
+	return HtmlSplitRow(HtmlBig() / (t_("Internal timeout (msec):")),
+		HtmlEdit("TIMEOUT").Data(cfg_query.GetString("TIMEOUT", IntStr(isapi_timeout)))
+		+ "&nbsp;&nbsp;" + HtmlButton(t_(" Commit "), "SAVE_TIMEOUT"));
+}
+
+/*
+HtmlTag WIsapiClient::Edit(Id id, int& value)
+{
+	int vsec = value / 1000;
+	int new_value = cfg_query.GetInt(id);
+	if(!IsNull(new_value) && new_value != vsec)
+	{
+		if(new_value >= 1 && new_value <= 600)
+			value = new_value * 1000;
+		else
+			cfg_error = "Hodnota je mimo povolen� rozsah (1 - 600 s).";
+	}
+	if(IsNull(new_value))
+		new_value = vsec;
+	return HtmlEdit(id).Data(IntStr(new_value)).Size(6);
+}
+*/
+
+static Htmls HtmlTableRow(const Htmls& host, const Htmls& state, const Htmls& modf, Color c)
+{
+	Htmls cells;
+	cells << HtmlCell().Width(-30) % host;
+	if(!modf.IsEmpty())
+		cells
+			<< HtmlCell().Width(-60) % state
+			<< HtmlCell().Width(-10) % modf;
+	else
+		cells
+			<< HtmlCell().ColSpan(3).Width(-100) % state;
+	return HtmlRow().BgColor(c) % cells;
+}
+
+static const char *NoGenerators() { return t_("Currently no generators are connected."); }
+
+static Htmls NoGenMsg()
+{
+	return HtmlFontColor(LtBlue) / HtmlTag("I") / NoGenerators();
+}
+
+Htmls WIsapiClient::Servers()
+{
+	int count = cfg_query.GetInt("HOSTCOUNT");
+	if(!IsNull(count))
+	{
+		for(int i = 0; i < count; i++)
+			if(!cfg_query.IsEmpty("RMHOST" + IntStr(i)))
+			{ // remove this host
+				String hostid = cfg_query.GetString("HOST" + IntStr(i));
+				if(CanWrite())
+					try
+					{
+						RemoveHost(hostid);
+					}
+					catch(Exc e)
+					{
+						cfg_error = e;
+					}
+				break;
+			}
+	}
+
+	if(!cfg_query.IsEmpty("ADDHOST"))
+	{
+		String ah = cfg_query.GetString("ADDHOST");
+		ISAPILOG("ADDHOST=<" << ah << "> (" << ah.GetLength() << " bytes)");
+		if(CanWrite())
+			try
+			{
+				// advance current port number
+				String s = cfg_query.GetString("NEW_HOST");
+				AddHost(s);
+				int i = s.Find('@');
+				int port = DEFAULT_PORT;
+				if(i < 0)
+					i = s.GetLength();
+				else
+				{
+					port = stou(s.Begin() + i + 1);
+					if(port == -1)
+						port = DEFAULT_PORT;
+				}
+				s.Trim(i);
+				s << '@' << (port + 1);
+				cfg_query.Set("NEW_HOST", s);
+			}
+			catch(Exc e)
+			{
+				cfg_error = e;
+			}
+	}
+
+	Htmls table;
+	table << HtmlTableRow(HtmlBold() / t_("Generator"), HtmlBold() / t_("Active state"), "", Yellow);
+
+	// output connection parameters
+	count = connections.GetCount();
+	table << HtmlHidden("HOSTCOUNT", count) << "\n";
+	for(int i = 0; i < count; i++)
+	{
+		Connection& conn = connections[i];
+		CheckedSection::Lock guard(conn.conn_lock);
+		table << HtmlHidden("HOST" + IntStr(i), conn.raw_host) << "\n";
+		String status;
+		if(conn.is_busy)
+			status = t_("(working)") + conn.status;
+		else if(conn.is_error)
+			status = conn.status;
+		else
+			status = conn.status;
+		table << HtmlTableRow(conn.raw_host, status,
+			~HtmlSubmit(t_("Remove")).Name((const char *)("RMHOST" + IntStr(i))), White);
+	}
+
+	DUMP(cfg_query.GetString("NEW_HOST"));
+	DUMP(cfg_default_host);
+	Htmls new_host;
+	new_host << t_("Add generator: ") << HtmlEdit("NEW_HOST").Data(cfg_query.GetString("NEW_HOST", cfg_default_host))
+		<< "  " << HtmlSubmit(t_("  Insert  ")).Name("ADDHOST");
+
+	Htmls s;
+	s << HtmlSimpleRow() / HtmlBig() / t_("Active generators");
+	if(count > 0)
+		s << HtmlSimpleRow()
+		% (HtmlTable().CellSpacing(0).CellPadding(0)
+		.BgColor(White).Border(0).Center().Width(-100) % table);
+	else
+		s << HtmlSimpleRow() / NoGenMsg();
+	s << HtmlSimpleRow() / new_host;
+	return s;
+}
+
+Htmls WIsapiClient::Login()
+{
+	Htmls s;
+	s << HtmlSimpleRow() / HtmlBig() / t_("Admin password")
+		<< HtmlSplitRow(t_("Password:"), ~HtmlInput("PASSWORD").Name("PASSWORD").Data(cfg_query.GetString("PASSWORD", Null)));
+	return s;
+}
+
+/*
+Htmls WIsapiClient::Commit()
+{
+	Htmls text;
+	text << HtmlSimpleRow()
+	<< HtmlSimpleRow().Left() % HtmlSubmit("Zapsat konfiguraci").Name(WID_SAVE_CONFIG);
+
+	if(map.Find(ID_SAVE_CONFIG) >= 0 && CanWrite())
+		if(client.Save())
+			text << HtmlSimpleRow()
+			<< HtmlSimpleRow() % HtmlFontColor(LtBlue)
+			/ HtmlBig() / "Konfigura�n� soubor byl korektn� ulo�en.";
+		else
+			error = "Chyba p�i z�pisu konfigura�n�ho souboru.";
+	return text;
+}
+*/
+
+static Htmls HtmlStatGenRow(const Value& gen, const Value& num, const Value& byt, const Value& avg, const Value& max, const Value& err,
+							const HtmlTag& tag = HtmlTag())
+{
+	return Htmls()
+		<< HtmlCell().Width(-25) / tag / StdFormat(gen)
+		<< HtmlCell().Width(-15) / tag / StdFormat(num)
+		<< HtmlCell().Width(-15) / tag / StdFormat(byt)
+		<< HtmlCell().Width(-15) / tag / StdFormat(avg)
+		<< HtmlCell().Width(-15) / tag / StdFormat(max)
+		<< HtmlCell().Width(-15) / tag / StdFormat(err);
+}
+
+Htmls WIsapiClient::Statistics()
+{
+	Htmls content;
+
+	double duration = (double)(GetSysTime() - run_time);
+	int id = fround(duration);
+	String dd;
+	if(id < 60)
+		dd << id << t_(" sec");
+	else if(id < 60 * 60)
+		dd << id / 60 << t_(" min, ") << id % 60 << t_(" hrs, ");
+	else
+	{
+		int hours = ffloor(duration / 3600);
+		id = fround(duration - 3600.0 * hours);
+		dd << hours << t_(" hrs, ") << id / 60 << t_(" min, ") << id % 60 << t_(" sec");
+	}
+
+	content
+		<< HtmlSimpleRow() % HtmlBig() / t_("Overall statistics")
+		<< HtmlValueRow(t_("Server started:"), run_time)
+		<< HtmlValueRow(t_("Running time:"), dd)
+		<< HtmlValueRow(t_("Hit count:"), hit_count)
+		<< HtmlValueRow(t_("Error count:"), error_count)
+		<< HtmlValueRow(t_("Transferred data (KB):"), FormatDouble(total_bytes * 1e-3, 4, FD_REL))
+		<< HtmlValueRow(t_("Average response (msecs):"), FormatDouble(total_msecs / max<double>(hit_count - error_count, 1), 4, FD_REL))
+		<< HtmlValueRow(t_("Slowest response (msecs):"), max_msecs)
+		<< HtmlSimpleRow()
+		<< HtmlSimpleRow() % HtmlBig() / t_("Statistics by generators")
+		<< HtmlSimpleRow();
+
+	int count = connections.GetCount();
+	if(count == 0)
+		content << HtmlSimpleRow() % NoGenMsg();
+	else
+	{
+		Htmls table;
+		table << HtmlRow().BgColor(Yellow)
+			% HtmlStatGenRow(t_("Generator"),
+				t_("Requests"),
+				t_("Data (KB)"),
+				t_("Response (msec)"),
+				t_("Max (msec)"), t_("Errors"), HtmlBold());
+		for(int i = 0; i < count; i++)
+		{
+			Connection& conn = connections[i];
+			CheckedSection::Lock guard(conn.conn_lock);
+			table << HtmlRow().BgColor(White)
+				% HtmlStatGenRow(conn.raw_host, conn.hit_count, floor(conn.total_bytes * 1e-3),
+				conn.total_msecs / max<double>(conn.hit_count - conn.error_count, 1),
+				conn.max_msecs, conn.error_count);
+		}
+		content << HtmlSimpleRow() % HtmlTable().CellSpacing(0).CellPadding(0)
+			.BgColor(White).Border(0).Center().Width(-100) % table;
+	}
+
+	return HtmlIsapiTable() % content;
+}
+
+bool WIsapiClient::CanWrite()
+{
+	if(cfg_can_write < 0)
+	{
+		String pwd = ToLower(cfg_query.GetString("PASSWORD"));
+		if(pwd.IsEmpty())
+		{
+			DUMP(cfg_query.GetString("PASSWORD"));
+			cfg_can_write = 0;
+			cfg_error = t_("To commit changes you must "
+	"enter the password.");
+		}
+		else
+			if(!(cfg_can_write = (pwd == ToLower(cfg_password))))
+				cfg_error = t_("Password invalid; check keyboard "
+	"settings.");
+	}
+	return !!cfg_can_write;
+}
+
+/*
+Htmls WIsapiClient::Services()
+{
+	Htmls content;
+	content << Login()
+		<< HtmlSimpleRow() % HtmlBig("Instalovan� slu�by")
+		<< HtmlSimpleRow() % ServiceTable();
+
+	if(!IsNull(error))
+		content = HtmlSimpleRow() / HtmlFontColor(LtRed) / (HtmlBig("Chyba: " + HtmlBold(error)))
+		+ HtmlSimpleRow() + content;
+	return HtmlTag("FORM").Attr("METHOD", "POST").Attr("ACTION", config_url + "=r")
+		% HtmlIsapiTable() % content;
+}
+*/
+
+/*
+static Htmls HtmlServiceRow(Htmls cell1, Htmls cell2, Htmls cell3)
+{
+	Htmls s;
+	s << HtmlCell().Width(-50) / cell1
+		<< HtmlCell().Width(-25) / cell2
+		<< HtmlCell().Width(-25) / (cell3 + "&nbsp;");
+	return s;
+}
+*/
+
+/*
+Htmls WIsapiClient::ServiceTable()
+{
+	SHandle mgr = OpenSCManager(0, 0, GENERIC_READ | GENERIC_WRITE);
+	if(!mgr)
+	{
+		error = "P��stup ke spr�vci slu�eb byl odm�tnut.";
+		return Htmls();
+	}
+	Array<ServiceInfo> services = EnumServices(mgr);
+	SortX(services, XField(&ServiceInfo::display_name), StdCsNumSort);
+
+	Htmls table = HtmlRow().BgColor(Yellow) % HtmlServiceRow(HtmlBold("N�zev slu�by"), HtmlBold("Stav"), Null);
+
+	for(int i = 0; i < services.GetCount(); i++)
+	{
+		const ServiceInfo& s = services[i];
+		const char *state = "(?)";
+		switch(s.state)
+		{
+		case SERVICE_START_PENDING:    state = "spou�t� se"; break;
+		case SERVICE_RUNNING:          state = "b��"; break;
+		case SERVICE_STOP_PENDING:     state = "vyp�n� se"; break;
+		case SERVICE_STOPPED:          state = "vypnut�"; break;
+		case SERVICE_CONTINUE_PENDING: state = "obnovuje se"; break;
+		case SERVICE_PAUSE_PENDING:    state = "pozastavuje se"; break;
+		case SERVICE_PAUSED:           state = "pozastavena"; break;
+		}
+		table << HtmlRow() % HtmlServiceRow(ToHtml(s.display_name), state, Null);
+	}
+	return HtmlTable().Width(-100).CellSpacing(0).CellPadding(0).Border(0).BgColor(White) % table;
+}
+*/
+
+void WIsapiClient::AddHost(const String& host)
+{
+	CheckedSection::Lock guard(client_lock);
+	if(FindFieldIndex(connections, &Connection::raw_host, host) >= 0)
+		throw Exc(NFormat(t_("Generator '%s' is already "
+	"connected."), host));
+	connections.Add(new Connection(*this, host));
+	SaveConfig();
+}
+
+void WIsapiClient::RemoveHost(const String& host)
+{
+	CheckedSection::Lock guard(client_lock);
+	int x = FindFieldIndex(connections, &Connection::raw_host, host);
+	if(x < 0)
+		throw Exc(NFormat(t_("Server '%s' not found."), host));
+	{
+		CheckedSection::Lock conn_guard(connections[x].conn_lock);
+		if(connections[x].is_busy)
+			throw Exc(NFormat(t_("Cannot disconnect server '%s' "
+	"while it's processing a request."), host));
+	}
+	connections.Remove(x);
+}
+
+void WIsapiClient::SaveConfig()
+{
+	CheckedSection::Lock guard(client_lock);
+	StringStream cfg;
+	cfg <<
+	"PASSWORD=" << cfg_password << "\n"
+	"LOGGING=" << (log_isapi ? '1' : '0') << "\n"
+	"HEADERS=" << (show_headers ? '1' : '0') << "\n"
+	"ENGLISH=" << (isapi_english ? '1' : '0') << "\n"
+	"TIMEOUT=" << isapi_timeout << "\n"
+	"ADMIN=" << (remote_admin ? '1' : '0') << "\n"
+//	"RETRY=" << retry_msec << "\n"
+	;
+	for(int i = 0; i < connections.GetCount(); i++)
+		cfg << "HOST=" << connections[i].raw_host << '\n';
+	DeleteFile(cfg_filename);
+	if(!SaveFile(cfg_filename, cfg))
+		throw Exc(NFormat(t_("Error saving file '%s'."), cfg_filename));
+	SetFileAttributes(cfg_filename, FILE_ATTRIBUTE_HIDDEN);
+}
+
+void WIsapiClient::LoadConfig()
+{
+	CheckedSection::Lock guard(client_lock);
+	ASSERT(connections.IsEmpty());
+	VectorMap<String, String> cfg = LoadKeyMapFile(cfg_filename);
+	log_isapi = (*cfg.Get("LOGGING", Null) == '1');
+	show_headers = (*cfg.Get("HEADERS", "1") == '1');
+	remote_admin = (*cfg.Get("ADMIN", "1") == '1');
+	isapi_english = (*cfg.Get("ENGLISH", "1") == '1');
+	cfg_password = cfg.Get("PASSWORD", "wisapi");
+//	retry_msec = ::minmax(stoi(cfg("RETRY", "1000")), 0, 60000);
+	isapi_timeout = ::minmax(ScanInt(cfg.Get("TIMEOUT", "1000")), 1000, 60000);
+	SetLanguage(isapi_english ? LNG_ENGLISH : LNG_CZECH);
+	for(int i = cfg.Find("HOST"); i >= 0; i = cfg.FindNext(i))
+		connections.Add(new Connection(*this, cfg[i]));
+//	LOG("WIsapiClient::LoadConfig: retry = " << retry_msec);
+	LOG("WIsapiClient::LoadConfig: timeout = " << isapi_timeout);
+}
+
+static One<WIsapiClient> client;
+
+extern "C" dword WINAPI HttpExtensionProc(EXTENSION_CONTROL_BLOCK *ecb)
+{
+	try
+	{
+		static long epid = 0;
+		int cid = InterlockedIncrement(&epid);
+		ISAPILOG("HttpExtensionProc, epid = " << cid << ", thread " << (int)GetCurrentThreadId());
+		return client->Run(cid, ecb);
+	}
+	catch(Exc e)
+	{
+		ISAPILOG("HttpExtensionProc->Exc(" << e << ")");
+		ecb->dwHttpStatusCode = HTTP_STATUS_SERVER_ERROR;
+		return HSE_STATUS_ERROR;
+	}
+	catch(...)
+	{
+		ISAPILOG("HttpExtensionProc->Exc (unknown)");
+		ecb->dwHttpStatusCode = HTTP_STATUS_SERVER_ERROR;
+		return HSE_STATUS_ERROR;
+	}
+}
+
+extern "C" BOOL WINAPI GetExtensionVersion(HSE_VERSION_INFO *pVer)
+{
+	pVer->dwExtensionVersion = MAKELONG(HSE_VERSION_MINOR, HSE_VERSION_MAJOR);
+	strcpy(pVer->lpszExtensionDesc, "ISAPI extension: Copyright � 1999-2003 Ultimate Development spol. s r.o.");
+	return TRUE;
+}
+
+extern "C" BOOL WINAPI DllMain(HANDLE module, DWORD reason, LPVOID lpReserved)
+{
+	if(reason == DLL_PROCESS_ATTACH) {
+		SetLanguage(LNG_ENGLISH);
+		SetDefaultCharset(CHARSET_WIN1250);
+		dll_module = (HINSTANCE)module;
+		dll_filename = GetModuleFileName(dll_module);
+		String lfn = ForceExt(dll_filename, "_log.txt");
+		DeleteFile(lfn);
+		SetVppLogName(lfn);
+		SetVppLogSizeLimit(500000);
+		ISAPILOG("WISAPI DllMain/DLL_PROCESS_ATTACH: creating WIsapiClient object");
+		client = new WIsapiClient;
+		ISAPILOG("WISAPI DllMain/DLL_PROCESS_ATTACH: done");
+	}
+	else if(reason == DLL_PROCESS_DETACH) {
+		ISAPILOG("WISAPI DllMain/DLL_PROCESS_DETACH: destroying WIsapiClient object");
+		client.Clear();
+		ISAPILOG("WISAPI DllMain/DLL_PROCESS_DETACH: done");
+	}
+	else if(reason == DLL_THREAD_ATTACH) {
+		ISAPILOG("WISAPI DllMain/DLL_THREAD_ATTACH");
+	}
+	else if(reason == DLL_THREAD_DETACH) {
+		ISAPILOG("WISAPI DllMain/DLL_THREAD_DETACH");
+	}
+	return TRUE;
+}
+
+#ifndef flagDLL
+CONSOLE_APP_MAIN
+{
+}
+#endif
diff --git a/uppsrc/Web/wisapi/wisapi.def b/uppsrc/Web/wisapi/wisapi.def
new file mode 100644
index 000000000..d4c51fa64
--- /dev/null
+++ b/uppsrc/Web/wisapi/wisapi.def
@@ -0,0 +1,5 @@
+LIBRARY	     "wisapi"
+
+EXPORTS
+	HttpExtensionProc
+	GetExtensionVersion
diff --git a/uppsrc/Web/wisapi/wisapi.lng b/uppsrc/Web/wisapi/wisapi.lng
new file mode 100644
index 000000000..4dac56e71
--- /dev/null
+++ b/uppsrc/Web/wisapi/wisapi.lng
@@ -0,0 +1,156 @@
+#if LANGUAGE == LNG_CZECH
+
+// wisapi.cpp
+
+txt(WIsapiClientConnStatusResponseError, "Chybn� odpov�� serveru: ")
+txt(WIsapiClientConnStatusOpenError, "Socket %s:%d nelze otev��t: %s")
+txt(WIsapiClientConnRunError, "Neplatn� odezva ze serveru: %s\n"
+	"<br>...\n")
+txt(WIsapiClientNoConnError, "V tuto chv�li nejsou p�ipojeny ��dn� "
+	"servery.\n"
+	"Nastaven� m��ete prov�st pomoc� ")
+txt(WIsapiClientNoConnConfigRef, "konfigura�n� str�nky")
+txt(WIsapiClientConnAllError, "��dn� z p�ipojen�ch server� nen� "
+	"schopen zpracovat zadan� dotaz.")
+txt(WIsapiClientConfigTitle, "Konfigurace konektoru internetov�ho "
+	"serveru")
+txt(WIsapiClientConfigIsapiPath, "Um�st�n� knihovny: ")
+txt(WIsapiClientConfigVersion, "Verze: <B>")
+txt(WIsapiClientConfigReleaseDate, "</B>, datum v�roby: <B>")
+txt(WIsapiClientConfigConfiguration, "Konfigurace")
+txt(WIsapiClientConfigStatistics, "Statistika")
+txt(WIsapiClientConfigErrorRow, "Chyba: ")
+txt(WIsapiClientConfigEnglish, "Jazyk knihovny ISAPI: ")
+txt(WIsapiClientConfigLogFile, "Log-soubor: ")
+txt(WIsapiClientConfigLogNo, "ne")
+txt(WIsapiClientConfigLogYes, "ano")
+txt(WIsapiClientConfigLogOff, "Vypnout")
+txt(WIsapiClientConfigLogOn, "Zapnout")
+txt(WIsapiClientConfigHeaders, "Zobrazit hlavi�ky p�i chyb�: ")
+txt(WIsapiClientConfigRemoteAdminOff, "vypnut�")
+txt(WIsapiClientConfigRemoteAdmin, "Vzd�len� spr�va: ")
+txt(WIsapiClientConfigRemoteAdminWarn, "Po potvrzen� bude vzd�len� "
+	"zpr�va trvale odpojena. Vzd�lenou zpr�vu m��ete znovu aktivovat "
+	"smaz�n�m ��dku ADMIN=0 z konfigura�n�ho souboru ")
+txt(WIsapiClientConfigRemoteAdminConfirm, " Potvrdit ")
+txt(WIsapiClientConfigRemoteAdminOn, "zapnut�")
+txt(WIsapiClientConfigRemoteAdminDisable, "  Vypnout  ")
+txt(WIsapiClientConfigTimeout, "Vnit�n� timeout (ms): ")
+txt(WIsapiClientConfigTimeoutSet, " Zm�nit ")
+txt(WIsapiClientConfigNoGen, "V tuto chv�li nejsou p�ipojeny ��dn� "
+	"gener�tory.")
+txt(WIsapiClientConfigGenerator, "Gener�tor")
+txt(WIsapiClientConfigState, "Akt. stav")
+txt(WIsapiClientConfigWorking, "(pracuje) ")
+txt(WIsapiClientConfigRemove, "Smazat")
+txt(WIsapiClientConfigAdd, "P�idat gener�tor: ")
+txt(WIsapiClientConfigAddButton, "  Vlo�it  ")
+txt(WIsapiClientConfigGenRunnnig, "Aktivn� gener�tory")
+txt(WIsapiClientConfigWritePwd, "Heslo pro z�pis")
+txt(WIsapiClientConfigPassword, "Heslo:")
+txt(WIsapiClientConfigSec, " s")
+txt(WIsapiClientConfigMin, " min, ")
+txt(WIsapiClientConfigHours, " h, ")
+txt(WIsapiClientConfigStatGlobal, "Celkov� statistika")
+txt(WIsapiClientConfigRunTime, "Spu�t�n� serveru:")
+txt(WIsapiClientConfigElapsedTime, "Doba b�hu:")
+txt(WIsapiClientConfigHitCount, "Po�et dotaz�:")
+txt(WIsapiClientConfigErrorCount, "Po�et chyb:")
+txt(WIsapiClientConfigDataLength, "P�enesen� data (KB):")
+txt(WIsapiClientConfigResponse, "Pr�m�rn� odezva (ms):")
+txt(WIsapiClientConfigMaxResponse, "Nejdel�� odezva (ms):")
+txt(WIsapiClientConfigGenStat, "Statistika po gener�torech")
+txt(WIsapiClientConfigRequests, "Dotazy")
+txt(WIsapiClientConfigDataSize, "Data (KB)")
+txt(WIsapiClientConfigResponseTime, "Odezva (ms)")
+txt(WIsapiClientConfigResponseMaxTime, "Max (ms)")
+txt(WIsapiClientConfigErrors, "Chyby")
+txt(WIsapiClientConfigWritePwdError, "P�i z�pisu zm�n mus�te zadat "
+	"platn� heslo.")
+txt(WIsapiClientConfigBadPwdError, "Neplatn� heslo; zkontrolujte "
+	"nastaven� kl�vesnice.")
+txt(WIsapiClientConfigGenAlreadyPresent, "Gener�tor '%s' je ji� "
+	"p�ipojen.")
+txt(WIsapiClientConfigServerNotFound, "Server '%s' nebyl nalezen.")
+txt(WIsapiClientConfigServerBusy, "Server '%s' nelze odpojit, dokud "
+	"vy�izuje po�adavek.")
+txt(WIsapiClientConfigSaveConfigError, "Nelze ulo�it soubor '%s'.")
+
+#elif LANGUAGE == LNG_('E', 'N', 'U', 'S')
+
+// wisapi.cpp
+
+txt(WIsapiClientConnStatusResponseError, "Invalid server response: ")
+txt(WIsapiClientConnStatusOpenError, "Error opening socket %s:%d: %s")
+txt(WIsapiClientConnRunError, "Invalid server response: %s\n"
+	"<br>...\n")
+txt(WIsapiClientNoConnError, "Currently there are no servers "
+	"connected.\n"
+	"You can connect servers using ")
+txt(WIsapiClientNoConnConfigRef, "the configuration page")
+txt(WIsapiClientConnAllError, "No connected server can process the "
+	"current request.")
+txt(WIsapiClientConfigTitle, "Web server connector configuration")
+txt(WIsapiClientConfigIsapiPath, "Library location: ")
+txt(WIsapiClientConfigVersion, "Version: <B>")
+txt(WIsapiClientConfigReleaseDate, "</B>, release date: <B>")
+txt(WIsapiClientConfigConfiguration, "Configuration")
+txt(WIsapiClientConfigStatistics, "Statistics")
+txt(WIsapiClientConfigErrorRow, "Error: ")
+txt(WIsapiClientConfigEnglish, "ISAPI library language: ")
+txt(WIsapiClientConfigLogFile, "Log-file: ")
+txt(WIsapiClientConfigLogNo, "no")
+txt(WIsapiClientConfigLogYes, "yes")
+txt(WIsapiClientConfigLogOff, "Disable")
+txt(WIsapiClientConfigLogOn, "Enable")
+txt(WIsapiClientConfigHeaders, "Show headers on error: ")
+txt(WIsapiClientConfigRemoteAdminOff, "off")
+txt(WIsapiClientConfigRemoteAdmin, "Remote administration: ")
+txt(WIsapiClientConfigRemoteAdminWarn, "After confirmation the remote "
+	"administration option will be disabled. You can re-enable remote "
+	"administration by removing the line ADMIN=0 from the "
+	"configuration file ")
+txt(WIsapiClientConfigRemoteAdminConfirm, " Confirm ")
+txt(WIsapiClientConfigRemoteAdminOn, "on")
+txt(WIsapiClientConfigRemoteAdminDisable, "  Disable  ")
+txt(WIsapiClientConfigTimeout, "Internal timeout (msec):")
+txt(WIsapiClientConfigTimeoutSet, " Commit ")
+txt(WIsapiClientConfigNoGen, "Currently no generators are connected.")
+txt(WIsapiClientConfigGenerator, "Generator")
+txt(WIsapiClientConfigState, "Active state")
+txt(WIsapiClientConfigWorking, "(working)")
+txt(WIsapiClientConfigRemove, "Remove")
+txt(WIsapiClientConfigAdd, "Add generator: ")
+txt(WIsapiClientConfigAddButton, "  Insert  ")
+txt(WIsapiClientConfigGenRunnnig, "Active generators")
+txt(WIsapiClientConfigWritePwd, "Admin password")
+txt(WIsapiClientConfigPassword, "Password:")
+txt(WIsapiClientConfigSec, " sec")
+txt(WIsapiClientConfigMin, " min, ")
+txt(WIsapiClientConfigHours, " hrs, ")
+txt(WIsapiClientConfigStatGlobal, "Overall statistics")
+txt(WIsapiClientConfigRunTime, "Server started:")
+txt(WIsapiClientConfigElapsedTime, "Running time:")
+txt(WIsapiClientConfigHitCount, "Hit count:")
+txt(WIsapiClientConfigErrorCount, "Error count:")
+txt(WIsapiClientConfigDataLength, "Transferred data (KB):")
+txt(WIsapiClientConfigResponse, "Average response (msecs):")
+txt(WIsapiClientConfigMaxResponse, "Slowest response (msecs):")
+txt(WIsapiClientConfigGenStat, "Statistics by generators")
+txt(WIsapiClientConfigRequests, "Requests")
+txt(WIsapiClientConfigDataSize, "Data (KB)")
+txt(WIsapiClientConfigResponseTime, "Response (msec)")
+txt(WIsapiClientConfigResponseMaxTime, "Max (msec)")
+txt(WIsapiClientConfigErrors, "Errors")
+txt(WIsapiClientConfigWritePwdError, "To commit changes you must "
+	"enter the password.")
+txt(WIsapiClientConfigBadPwdError, "Password invalid; check keyboard "
+	"settings.")
+txt(WIsapiClientConfigGenAlreadyPresent, "Generator '%s' is already "
+	"connected.")
+txt(WIsapiClientConfigServerNotFound, "Server '%s' not found.")
+txt(WIsapiClientConfigServerBusy, "Cannot disconnect server '%s' "
+	"while it's processing a request.")
+txt(WIsapiClientConfigSaveConfigError, "Error saving file '%s'.")
+
+#endif
diff --git a/uppsrc/Web/wisapi/wisapi.t b/uppsrc/Web/wisapi/wisapi.t
new file mode 100644
index 000000000..77bfe0f28
--- /dev/null
+++ b/uppsrc/Web/wisapi/wisapi.t
@@ -0,0 +1,198 @@
+
+// wisapi.cpp
+
+T_("Invalid server response: ")
+csCZ("Chybná odpověď serveru: ")
+
+T_("Error opening socket %s:%d: %s")
+csCZ("Nelze otevřít socket %s:%d: %s")
+
+T_("Invalid server response: %s\n<br>...\n")
+csCZ("Chybná odpověď serveru: %s\n<br>...\n")
+
+T_("Currently there are no servers connected.\nYou can connect servers using ")
+csCZ("V tuto chvíli nejsou připojeny žádné "
+	"servery.\n"
+	"Nastavení můžete provést pomocí ")
+
+T_("the configuration page")
+csCZ("konfigurační stránky")
+
+T_("No connected server can process the current request.")
+csCZ("Žádný z připojených serverů není "
+	"schopen zpracovat zadaný dotaz.")
+
+T_("Web server connector configuration")
+csCZ("Konfigurace konektoru internetového "
+	"serveru")
+
+T_("Library location: ")
+csCZ("Umístění knihovny: ")
+
+T_("Version: <B>")
+csCZ("Verze: <B>")
+
+T_("</B>, release date: <B>")
+csCZ("</B>, datum výroby: <B>")
+
+T_("Configuration")
+csCZ("Konfigurace")
+
+T_("Statistics")
+csCZ("Statistika")
+
+T_("Error: ")
+csCZ("Chyba: ")
+
+T_("ISAPI library language: ")
+csCZ("Jazyk knihovny ISAPI: ")
+
+T_("Log-file: ")
+csCZ("Log-soubor: ")
+
+T_("yes")
+csCZ("ano")
+
+T_("no")
+csCZ("ne")
+
+T_("Disable")
+csCZ("Vypnout")
+
+T_("Enable")
+csCZ("Povolit")
+
+T_("Show headers on error: ")
+csCZ("Zobrazit hlavičky při chybě: ")
+
+T_("Remote administration: ")
+csCZ("Vzdálená správa: ")
+
+T_("off")
+csCZ("vyp")
+
+T_("After confirmation the remote administration option will be disabled. "
+     "You can re-enable remote administration by removing the line ADMIN=0 from "
+     "the configuration file ")
+csCZ("Po potvrzení bude vzdálená "
+	"zpráva trvale odpojena. Vzdálenou zprávu můžete znovu aktivovat "
+	"smazáním řádku ADMIN=0 z konfiguračního souboru ")
+
+T_(" Confirm ")
+csCZ(" Potvrdit ")
+
+T_("on")
+csCZ("zapnutá")
+
+T_("  Disable  ")
+csCZ("  Vypnout  ")
+
+T_("Internal timeout (msec):")
+csCZ("Vnitřní timeout (ms): ")
+
+T_(" Commit ")
+csCZ(" Změnit ")
+
+T_("Currently no generators are connected.")
+csCZ("V tuto chvíli nejsou připojeny žádné "
+	"generátory.")
+
+T_("Generator")
+csCZ("Generátor")
+
+T_("Active state")
+csCZ("Akt. stav")
+
+T_("(working)")
+csCZ("(pracuje)")
+
+T_("Remove")
+csCZ("Odstranit")
+
+T_("Add generator: ")
+csCZ("Přidat generátor: ")
+
+T_("  Insert  ")
+csCZ("  Vložit  ")
+
+T_("Active generators")
+csCZ("Aktivní generátory")
+
+T_("Admin password")
+csCZ("Heslo pro zápis")
+
+T_("Password:")
+csCZ("Heslo:")
+
+T_(" sec")
+csCZ(" s")
+
+T_(" min, ")
+csCZ(" min,")
+
+T_(" hrs, ")
+csCZ(" h, ")
+
+T_("Overall statistics")
+csCZ("Celková statistika")
+
+T_("Server started:")
+csCZ("Spuštění serveru:")
+
+T_("Running time:")
+csCZ("Doba běhu:")
+
+T_("Hit count:")
+csCZ("Počet dotazů:")
+
+T_("Error count:")
+csCZ("Počet chyb:")
+
+T_("Transferred data (KB):")
+csCZ("Přenesená data (KB):")
+
+T_("Average response (msecs):")
+csCZ("Průměrná odezva (ms):")
+
+T_("Slowest response (msecs):")
+csCZ("Nejdelší odezva (ms):")
+
+T_("Statistics by generators")
+csCZ("Statistika po generátorech")
+
+T_("Requests")
+csCZ("Dotazy")
+
+T_("Data (KB)")
+csCZ("Data (KB)")
+
+T_("Response (msec)")
+csCZ("Odezva (ms)")
+
+T_("Max (msec)")
+csCZ("Max (ms)")
+
+T_("Errors")
+csCZ("Chyby")
+
+T_("To commit changes you must enter the password.")
+csCZ("Při zápisu změn musíte zadat "
+	"platné heslo.")
+
+T_("Password invalid; check keyboard settings.")
+csCZ("Neplatné heslo; zkontrolujte "
+	"nastavení klávesnice.")
+
+T_("Generator '%s' is already connected.")
+csCZ("Generátor '%s' je již "
+	"připojen.")
+
+T_("Server '%s' not found.")
+csCZ("Server '%s' nebyl nalezen.")
+
+T_("Cannot disconnect server '%s' while it's processing a request.")
+csCZ("Server '%s' nelze odpojit, dokud "
+	"vyřizuje požadavek.")
+
+T_("Error saving file '%s'.")
+csCZ("Nelze uložit soubor '%s'.")
diff --git a/uppsrc/Web/wisapi/wisapi.upp b/uppsrc/Web/wisapi/wisapi.upp
new file mode 100644
index 000000000..6872e6e23
--- /dev/null
+++ b/uppsrc/Web/wisapi/wisapi.upp
@@ -0,0 +1,24 @@
+uses
+	Web,
+	TCore;
+
+link(MAIN DLL) /DEF:wisapi.def;
+
+link(!DEBUG) /MAP;
+
+file
+	version.h,
+	wisapi.t charset "UTF-8",
+	wisapi.cpp,
+	wisapi.def,
+	Info readonly separator,
+	COPYING,
+	COPYING-PLAIN,
+	AUTHORS;
+
+mainconfig
+	"" = "DLL MT";
+
+custom() "pre-link",
+	"restserv w3svc",
+	"";
diff --git a/uppsrc/Web/wisapi/wisapicfg.cpp b/uppsrc/Web/wisapi/wisapicfg.cpp
new file mode 100644
index 000000000..b25a6064b
--- /dev/null
+++ b/uppsrc/Web/wisapi/wisapicfg.cpp
@@ -0,0 +1,544 @@
+//////////////////////////////////////////////////////////////////////
+// isapicfg: HTML-based configuration dialog.
+
+#if 0
+
+#include "wisapicfg.h"
+#include "version.h"
+#include <winsvc.h>
+
+//////////////////////////////////////////////////////////////////////
+
+static const char title[] = "Konfigurace konektoru internetov�ho serveru";
+
+//////////////////////////////////////////////////////////////////////
+
+class SHandle
+{
+public:
+	SHandle(SC_HANDLE handle = 0) : handle(handle) {}
+	~SHandle() { if(handle) CloseServiceHandle(handle); }
+
+	operator SC_HANDLE () const             { return handle; }
+
+	void           Clear()                  { Attach(0); }
+
+	SC_HANDLE      Detach()                 { SC_HANDLE h = handle; handle = 0; return h; }
+	void           Attach(SC_HANDLE h)      { if(handle) CloseServiceHandle(handle); handle = h; }
+
+	SHandle&       operator = (SC_HANDLE h) { Attach(h); return *this; }
+
+	bool           Query(SERVICE_STATUS& s) { return handle && QueryServiceStatus(handle, &s); }
+
+private:
+	SC_HANDLE      handle;
+};
+
+//////////////////////////////////////////////////////////////////////
+
+struct ServiceInfo
+{
+	String display_name;
+	String service_name;
+	dword  state;
+};
+template class Moveable<ServiceInfo>;
+
+//////////////////////////////////////////////////////////////////////
+
+static Array<ServiceInfo> EnumServices(SHandle& manager)
+{
+	dword resume_handle = 0;
+	dword more = 0;
+	bool cont;
+	Array<ServiceInfo> list;
+	do
+	{
+		dword done;
+		union
+		{
+			ENUM_SERVICE_STATUS status[1];
+			char                buffer[10000];
+		};
+		bool result = EnumServicesStatus(manager, SERVICE_WIN32,
+			SERVICE_STATE_ALL, status, sizeof(buffer), &more, &done, &resume_handle);
+		cont = (!result && GetLastError() == ERROR_MORE_DATA);
+		if(!result && !cont)
+			break;
+		for(int i = 0; i < done; i++)
+		{
+			ServiceInfo& info = list.Add();
+			info.display_name = status[i].lpDisplayName;
+			info.service_name = status[i].lpServiceName;
+			info.state        = status[i].ServiceStatus.dwCurrentState;
+		}
+	}
+	while(cont);
+	return list;
+}
+
+//////////////////////////////////////////////////////////////////////
+
+static HtmlTag HtmlSimpleRow()
+{
+	return HtmlRow() % HtmlCell().ColSpan(2).Width(-100);
+}
+
+//////////////////////////////////////////////////////////////////////
+
+static Htmls HtmlSplitRow(const char *tag, const Htmls& content)
+{
+	return HtmlRow() % (HtmlCell().Width(-30) / tag + "\n" + HtmlCell().Left().Width(-70) / content);
+}
+
+//////////////////////////////////////////////////////////////////////
+
+static Htmls HtmlValueRow(const char *tag, const Value& value)
+{
+	return HtmlSplitRow(tag, HtmlBold() / value.Format());
+}
+
+//////////////////////////////////////////////////////////////////////
+
+static Htmls HtmlMenu(bool active, const char *text, const char *url, int wd)
+{
+	HtmlTag table = HtmlTable().CellSpacing(0).Border(2)
+		.BorderColor(Black).BgColor(active ? Yellow : WhiteGray);
+	if(wd)
+		table.Width(wd);
+	return table % HtmlRow() % HtmlCell().Center()
+		/ HtmlLink(url) / HtmlFontColor(Black) / (active ? HtmlBold() / text : Htmls(text));
+}
+
+//////////////////////////////////////////////////////////////////////
+
+static Htmls HtmlHardSpace(int count = 1)
+{
+	StringBuffer s(count * 6);
+	char *p = s;
+	for(int i = 0; i < count; i++)
+	{
+		memcpy(p, "&nbsp;", 6);
+		p += 6;
+	}
+	return s;
+}
+
+//////////////////////////////////////////////////////////////////////
+
+static HtmlTag HtmlIsapiTable()
+{
+	return HtmlTable().Width(-70).CellSpacing(0).CellPadding(1).Border(1).BgColor(WhiteGray)
+		% HtmlRow() % HtmlCell()
+		% HtmlTable().Width(-100).CellSpacing(2).CellPadding(0).Border(0).BgColor(WhiteGray);
+}
+
+//////////////////////////////////////////////////////////////////////
+
+IsapiCfg::IsapiCfg(IsapiClient& client, const char *url)
+: map(url)
+, client(client)
+, config_url(client.isapi_url + "?configure")
+, can_write(-1)
+{
+	default_host << "localhost@" << DEFAULT_PORT;
+#ifdef _DEBUG
+	for(int i = 0; i < map.GetCount(); i++)
+		LOG("map[" << i << "] = (" << map.GetKey(i) << " / " << map[i]);
+#endif
+}
+
+//////////////////////////////////////////////////////////////////////
+
+bool IsapiCfg::Run(String& header, String& content, String& error)
+{
+	Htmls body = Body();
+
+	content = HtmlTag("HTML") %
+		(HtmlTag("HEAD") % (HtmlTag("TITLE") / title)
+		+ HtmlTag("BODY").BgColor(White) % body);
+
+	return true;
+}
+
+//////////////////////////////////////////////////////////////////////
+
+Htmls IsapiCfg::Body()
+{
+	Htmls body;
+	body
+		<< HtmlTag("H1") / title
+		<< HtmlTag("SMALL") / "Um�st�n� knihovny: "
+		<< HtmlTag("TT") / ToHtml(client.isapi_path) << "<BR>\n"
+		<< HtmlTag("SMALL") / "Verze: <B>" ISAPI_VERSION "</B>, datum v�roby: <B>"
+		ISAPI_DATE "</B><BR>\n" ISAPI_COPYRIGHT "<P>\n";
+
+	String s = map.GetString(ID_CONFIGURE);
+	enum { CONFIG, STAT /*, SERV */ } page = CONFIG;
+	switch(*s)
+	{
+	case 's': page = STAT; break;
+//	case 'r': page = SERV; break;
+	}
+
+	Htmls menu;
+	menu
+		<< HtmlCell() / HtmlMenu(page == CONFIG, "Konfigurace", config_url, 120)
+		<< HtmlCell() / HtmlHardSpace(2)
+		<< HtmlCell() / HtmlMenu(page == STAT, "Statistika", config_url + "=s", 120)
+//		<< HtmlCell() / HtmlHardSpace(2)
+//		<< HtmlCell() / HtmlMenu(page == SERV, "Slu�by", config_url + "=r", 120)
+	;
+
+	body << HtmlTable().CellSpacing(0) % HtmlRow() % menu
+		<< "<P>\n";
+
+	switch(page)
+	{
+	case CONFIG: body << Configuration(); break;
+	case STAT:   body << Statistics(); break;
+//	case SERV:   body << Services(); break;
+	}
+
+	return body;
+}
+
+//////////////////////////////////////////////////////////////////////
+
+Htmls IsapiCfg::Configuration()
+{
+	Htmls content;
+	content << Login()
+		<< HtmlSimpleRow() << Timing()
+		<< HtmlSimpleRow() << Servers();
+	content // must be the last one as Timing() and Servers() might modify some client data
+		<< HtmlSimpleRow() << Commit();
+	if(!IsNull(error))
+		content = HtmlSimpleRow() / HtmlFontColor(LtRed) / (HtmlBig() / ("Chyba: " + HtmlBold() / error))
+		+ HtmlSimpleRow() + content;
+	return HtmlTag("FORM").Attr("METHOD", "POST").Attr("ACTION", config_url) % HtmlIsapiTable() % content;
+}
+
+//////////////////////////////////////////////////////////////////////
+
+Htmls IsapiCfg::Timing()
+{
+	Htmls s;
+	s << HtmlSimpleRow() % HtmlBig() / "�asov� konstanty"
+		<< HtmlSplitRow("P�ed�n� dotazu (s):", ~Edit(ID_QUERY_TIMEOUT, client.query_timeout))
+		<< HtmlSplitRow("V�sledek dotazu (s):", ~Edit(ID_ANSWER_TIMEOUT, client.answer_timeout));
+	return s;
+}
+
+//////////////////////////////////////////////////////////////////////
+
+HtmlTag IsapiCfg::Edit(Id id, int& value)
+{
+	int vsec = value / 1000;
+	int new_value = map.GetInt(id);
+	if(!IsNull(new_value) && new_value != vsec)
+	{
+		if(new_value >= 1 && new_value <= 600)
+			value = new_value * 1000;
+		else
+			error = "Hodnota je mimo povolen� rozsah (1 - 600 s).";
+	}
+	if(IsNull(new_value))
+		new_value = vsec;
+	return HtmlEdit(id).Data(IntStr(new_value)).Size(6);
+}
+
+//////////////////////////////////////////////////////////////////////
+
+static Htmls HtmlTableRow(const Htmls& host, const Htmls& state, const Htmls& modf, Color c)
+{
+	Htmls cells;
+	cells << HtmlCell().Width(-50) % host;
+	if(!IsNull(modf))
+		cells
+			<< HtmlCell().Width(-10) % state
+			<< HtmlCell().Width(-40) % modf;
+	else
+		cells
+			<< HtmlCell().ColSpan(2).Width(-50) % state;
+	return HtmlRow().BgColor(c) % cells;
+}
+
+//////////////////////////////////////////////////////////////////////
+
+static const char no_gen[] = "V tuto chv�li nejsou p�ipojeny ��dn� gener�tory.";
+
+static Htmls NoGenMsg()
+{
+	return HtmlFontColor(LtBlue) / HtmlTag("I") / no_gen;
+}
+
+//////////////////////////////////////////////////////////////////////
+
+Htmls IsapiCfg::Servers()
+{
+	int count = map.GetInt(ID_HOSTCOUNT);
+	if(!IsNull(count))
+	{
+		for(int i = 0; i < count; i++)
+			if(map.Find("RMHOST" + IntStr(i)) >= 0)
+			{ // remove this host
+				String hostid = map.GetString("HOST" + IntStr(i));
+				if(CanWrite())
+					error = client.Remove(hostid);
+				break;
+			}
+	}
+
+	if(map.Find(ID_ADDHOST) >= 0 && CanWrite()
+		&& IsNull(error = client.Add(map.GetString(ID_NEW_HOST))))
+	{ // advance current port number
+		String s = map.GetString(ID_NEW_HOST);
+		int i = s.Find('@');
+		int port = DEFAULT_PORT;
+		if(i < 0)
+			i = s.GetLength();
+		else
+		{
+			port = stou(s.Begin() + i + 1);
+			if(port == -1)
+				port = DEFAULT_PORT;
+		}
+		s.Trim(i);
+		s << '@' << (port + 1);
+		map.Set(ID_NEW_HOST, s);
+	}
+
+	Htmls table;
+	table << HtmlTableRow(HtmlBold() / "Gener�tor", HtmlBold() / "Akt. stav", "", Yellow);
+
+	// output connection parameters
+	client.LockConnections();
+	count = client.GetCount();
+	table << HtmlHidden(ID_HOSTCOUNT, count) << "\n";
+	for(int i = 0; i < count; i++)
+	{
+		const IsapiClient::Connection& conn = client[i];
+		table << HtmlHidden("HOST" + IntStr(i), conn.GetHost()) << "\n";
+		String status;
+		if(conn.IsBusy())
+			status = "pracuje";
+		else if(conn.IsError())
+			status = "chyba";
+		else
+			status = "�ek�";
+		String host = conn.GetHost();
+		table << HtmlTableRow(host, status,
+			~HtmlSubmit("Smazat").Name((const char *)("RMHOST" + IntStr(i))), White);
+	}
+	client.UnlockConnections();
+
+	Htmls new_host;
+	new_host << "P�idat gener�tor: " << HtmlEdit(ID_NEW_HOST).Data(map(ID_NEW_HOST, default_host)) << "  "
+		<< HtmlSubmit("  Vlo�it  ").Name(ID_ADDHOST);
+
+	Htmls s;
+	s << HtmlSimpleRow() / HtmlBig() / "Aktivn� gener�tory";
+	if(count > 0)
+		s << HtmlSimpleRow()
+		% (HtmlTable().CellSpacing(0).CellPadding(0)
+		.BgColor(White).Border(0).Center().Width(-100) % table);
+	else
+		s << HtmlSimpleRow() / NoGenMsg();
+	s << HtmlSimpleRow() / new_host;
+	return s;
+}
+
+//////////////////////////////////////////////////////////////////////
+
+Htmls IsapiCfg::Login()
+{
+	Htmls s;
+	s << HtmlSimpleRow() / HtmlBig() / "Heslo pro z�pis"
+		<< HtmlSplitRow("Heslo:", ~HtmlInput("PASSWORD").Name(ID_PASSWORD).Data(map(ID_PASSWORD, Null)));
+	return s;
+}
+
+//////////////////////////////////////////////////////////////////////
+
+Htmls IsapiCfg::Commit()
+{
+	Htmls text;
+	text << HtmlSimpleRow()
+	<< HtmlSimpleRow().Left() % HtmlSubmit("Zapsat konfiguraci").Name(ID_SAVE_CONFIG);
+
+	if(map.Find(ID_SAVE_CONFIG) >= 0 && CanWrite())
+		if(client.Save())
+			text << HtmlSimpleRow()
+			<< HtmlSimpleRow() % HtmlFontColor(LtBlue)
+			/ HtmlBig() / "Konfigura�n� soubor byl korektn� ulo�en.";
+		else
+			error = "Chyba p�i z�pisu konfigura�n�ho souboru.";
+	return text;
+}
+
+//////////////////////////////////////////////////////////////////////
+
+static Htmls HtmlStatGenRow(const Value& gen, const Value& num, const Value& avg, const Value& max, const Value& err,
+							const HtmlTag& tag = HtmlTag())
+{
+	return Htmls()
+		<< HtmlCell().Width(-32) / tag / gen.Format()
+		<< HtmlCell().Width(-17) / tag / num.Format()
+		<< HtmlCell().Width(-17) / tag / avg.Format()
+		<< HtmlCell().Width(-17) / tag / max.Format()
+		<< HtmlCell().Width(-17) / tag / err.Format();
+}
+
+//////////////////////////////////////////////////////////////////////
+
+Htmls IsapiCfg::Statistics()
+{
+	Htmls content;
+
+	client.LockStatistics();
+
+	double duration = GetSysTime() - client.run_time;
+	int id = fround(duration);
+	String dd;
+	if(id < 60)
+		dd << id << " s";
+	else if(id < 60 * 60)
+		dd << id / 60 << " min, " << id % 60 << " s";
+	else
+	{
+		int hours = ffloor(duration / 3600);
+		id = fround(duration - 3600.0 * hours);
+		dd << hours << " h, " << id / 60 << " min, " << id % 60 << " s";
+	}
+
+	content
+		<< HtmlSimpleRow() % HtmlBig() / "Celkov� statistika"
+		<< HtmlValueRow("Spu�t�n� serveru:", client.run_time)
+		<< HtmlValueRow("Doba b�hu:", dd)
+		<< HtmlValueRow("Po�et dotaz�:", client.num_requests)
+		<< HtmlValueRow("Po�et chyb:", client.num_errors)
+		<< HtmlValueRow("Pr�m�rn� odezva (ms):",
+			client.total_ticks / max(client.num_requests - client.num_errors, 1))
+		<< HtmlValueRow("Nejdel�� odezva (ms):", client.max_ticks)
+		<< HtmlSimpleRow()
+		<< HtmlSimpleRow() % HtmlBig() / "Statistika po gener�torech"
+		<< HtmlSimpleRow();
+
+	client.UnlockStatistics();
+
+	client.LockConnections();
+	int count = client.GetCount();
+	if(count == 0)
+		content << HtmlSimpleRow() % NoGenMsg();
+	else
+	{
+		Htmls table;
+		table << HtmlRow().BgColor(Yellow)
+			% HtmlStatGenRow("Gener�tor", "Dotazy", "Odezva (ms)", "Max (ms)", "Chyby", HtmlBold());
+		for(int i = 0; i < count; i++)
+		{
+			IsapiClient::Connection& conn = client[i];
+			conn.Enter();
+			table << HtmlRow().BgColor(White)
+				% HtmlStatGenRow(conn.GetHost(), conn.num_requests,
+				conn.total_ticks / max(conn.num_requests - conn.num_errors, 1), conn.max_ticks, conn.num_errors);
+			conn.Leave();
+		}
+		content << HtmlSimpleRow() % HtmlTable().CellSpacing(0).CellPadding(0)
+			.BgColor(White).Border(0).Center().Width(-100) % table;
+	}
+	client.UnlockConnections();
+
+	return HtmlIsapiTable() % content;
+}
+
+//////////////////////////////////////////////////////////////////////
+
+bool IsapiCfg::CanWrite()
+{
+	if(can_write < 0)
+	{
+		String pwd = CsToLower(map.GetString(ID_PASSWORD));
+		if(IsNull(pwd))
+		{
+			can_write = 0;
+			error = "P�i z�pisu zm�n mus�te zadat platn� heslo.";
+		}
+		else
+			if(!(can_write = (pwd == CsToLower(client.admin_pwd))))
+				error = "Neplatn� heslo; zkontrolujte nastaven� kl�vesnice.";
+	}
+	return !!can_write;
+}
+
+//////////////////////////////////////////////////////////////////////
+
+/*
+Htmls IsapiCfg::Services()
+{
+	Htmls content;
+	content << Login()
+		<< HtmlSimpleRow() % HtmlBig("Instalovan� slu�by")
+		<< HtmlSimpleRow() % ServiceTable();
+
+	if(!IsNull(error))
+		content = HtmlSimpleRow() / HtmlFontColor(LtRed) / (HtmlBig("Chyba: " + HtmlBold(error)))
+		+ HtmlSimpleRow() + content;
+	return HtmlTag("FORM").Attr("METHOD", "POST").Attr("ACTION", config_url + "=r")
+		% HtmlIsapiTable() % content;
+}
+*/
+
+//////////////////////////////////////////////////////////////////////
+
+/*
+static Htmls HtmlServiceRow(Htmls cell1, Htmls cell2, Htmls cell3)
+{
+	Htmls s;
+	s << HtmlCell().Width(-50) / cell1
+		<< HtmlCell().Width(-25) / cell2
+		<< HtmlCell().Width(-25) / (cell3 + "&nbsp;");
+	return s;
+}
+*/
+
+//////////////////////////////////////////////////////////////////////
+
+/*
+Htmls IsapiCfg::ServiceTable()
+{
+	SHandle mgr = OpenSCManager(0, 0, GENERIC_READ | GENERIC_WRITE);
+	if(!mgr)
+	{
+		error = "P��stup ke spr�vci slu�eb byl odm�tnut.";
+		return Htmls();
+	}
+	Array<ServiceInfo> services = EnumServices(mgr);
+	SortX(services, XField(&ServiceInfo::display_name), StdCsNumSort);
+
+	Htmls table = HtmlRow().BgColor(Yellow) % HtmlServiceRow(HtmlBold("N�zev slu�by"), HtmlBold("Stav"), Null);
+
+	for(int i = 0; i < services.GetCount(); i++)
+	{
+		const ServiceInfo& s = services[i];
+		const char *state = "(?)";
+		switch(s.state)
+		{
+		case SERVICE_START_PENDING:    state = "spou�t� se"; break;
+		case SERVICE_RUNNING:          state = "b��"; break;
+		case SERVICE_STOP_PENDING:     state = "vyp�n� se"; break;
+		case SERVICE_STOPPED:          state = "vypnut�"; break;
+		case SERVICE_CONTINUE_PENDING: state = "obnovuje se"; break;
+		case SERVICE_PAUSE_PENDING:    state = "pozastavuje se"; break;
+		case SERVICE_PAUSED:           state = "pozastavena"; break;
+		}
+		table << HtmlRow() % HtmlServiceRow(ToHtml(s.display_name), state, Null);
+	}
+	return HtmlTable().Width(-100).CellSpacing(0).CellPadding(0).Border(0).BgColor(White) % table;
+}
+*/
+
+//////////////////////////////////////////////////////////////////////
+
+#endif
diff --git a/uppsrc/Web/wisapi/wisapicfg.h b/uppsrc/Web/wisapi/wisapicfg.h
new file mode 100644
index 000000000..45c68e4fd
--- /dev/null
+++ b/uppsrc/Web/wisapi/wisapicfg.h
@@ -0,0 +1,51 @@
+//////////////////////////////////////////////////////////////////////
+// wisapicfg: HTML-based configuration dialog.
+
+#ifndef __tinet_wisapi_wisapicfg__
+#define __tinet_wisapi_wisapicfg__
+
+#include <tcore/all.h>
+#include <tcore/event.h>
+#include <tinet/html.h>
+#include <tinet/http.h>
+
+WID(NEW_HOST)
+WID(STAT)
+WID(HOSTCOUNT)
+WID(ADDHOST)
+WID(SAVE_CONFIG)
+WID(CONFIGURE)
+
+class IsapiCfg
+{
+public:
+	IsapiCfg(IsapiClient& client, const char *url);
+
+	bool         Run(String& header, String& content, String& error);
+
+private:
+	Htmls        Body();
+	Htmls        Configuration();
+	Htmls        Login();
+	Htmls        Timing();
+	HtmlTag      Edit(Id id, int& value);
+	Htmls        Servers();
+	Htmls        Commit();
+
+	Htmls        Statistics();
+
+	Htmls        Services();
+	Htmls        ServiceTable();
+
+	bool         CanWrite();
+
+private:
+	IsapiClient& client;
+	WebMap       map;
+	String       default_host;
+	String       error;
+	String       config_url;
+	int          can_write;
+};
+
+#endif//__tinet_wisapi_wisapicfg__
diff --git a/uppsrc/XmlView/XmlView.h b/uppsrc/XmlView/XmlView.h
new file mode 100644
index 000000000..3abc42a7c
--- /dev/null
+++ b/uppsrc/XmlView/XmlView.h
@@ -0,0 +1,41 @@
+#ifndef _XmlView_XmlView_h
+#define _XmlView_XmlView_h
+
+#include <CtrlLib/CtrlLib.h>
+
+using namespace Upp;
+
+#define IMAGEFILE  <XmlView/XmlView.iml>
+#define IMAGECLASS XmlImg
+#include <Draw/iml_header.h>
+
+class XmlView : public TopWindow {
+public:
+	virtual bool Key(dword key, int);
+private:
+	TreeCtrl              xml;
+	LineEdit              view;
+	FrameTop<StaticRect>  errorbg;
+	Label                 error;
+	FileList              files;
+	ParentCtrl            data;
+	Splitter              splitter;
+	String                dir;
+
+	void Load(int parent, XmlParser& p);
+	void Load(const char *filename);
+	void Enter();
+	void DoDir();
+	void CopyPath();
+
+public:
+	typedef XmlView CLASSNAME;
+
+	void Serialize(Stream& s);
+	void LoadDir(const char *d);
+	void LoadDir()                      { LoadDir(dir); }
+
+	XmlView();
+};
+
+#endif
diff --git a/uppsrc/XmlView/XmlView.iml b/uppsrc/XmlView/XmlView.iml
new file mode 100644
index 000000000..8f41c733d
--- /dev/null
+++ b/uppsrc/XmlView/XmlView.iml
@@ -0,0 +1,99 @@
+IMAGE_META(icon_file, "icon.ico")
+IMAGE_META(icon_small, "Icon")
+IMAGE_META(icon_bpp, "8")
+IMAGE_BEGIN(Tag)
+	IMAGE_SCAN("")
+	IMAGE_SCAN("")
+	IMAGE_SCAN("")
+	IMAGE_SCAN("ņ\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377\377\377\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377\377\377\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377\377\377��\0\0�\377\377\377\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377\377\377\1�\0\0�\377\377\377\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\377\377\377��\0\0�\377\377\377\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377\377\377\1�\0\0�\377\377\377\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377\377\377��\0\0�\377\377\377\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377\377\377\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377\377\377\1\0\0\0")
+	IMAGE_SCAN("ņ\0\0\0")
+IMAGE_PACKED(Tag, "\2\21\0\0\0\20\0\0\0\0\0\0\0\1\0\0\0\0\0\0\0")
+IMAGE_BEGIN(Text)
+	IMAGE_SCAN("")
+	IMAGE_SCAN("")
+	IMAGE_SCAN("")
+	IMAGE_SCAN("�\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\377\377\377\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\377\377\377\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\377\377\377��\0\0\5\377\377\377�\0\0\377\377\377�\0\0\377\377\377��\0\0\2\377\377\377\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\377\377\377\1�\0\0�\377\377\377\3�\0\0\377\377\377�\0\0�\377\377\377\1�\0\0�\377\377\377\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\377\377\377\1�\0\0�\377\377\377\1�\0\0�\377\377\377\1�\0\0�\377\377\377\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\377\377\377\1�\0\0�\377\377\377\3�\0\0\377\377\377�\0\0�\377\377\377\1�\0\0�\377\377\377\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\377\377\377\1�\0\0�\377\377\377\3�\0\0\377\377\377�\0\0�\377\377\377\1�\0\0�\377\377\377\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\377\377\377\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\377\377\377\1\0\0\0")
+	IMAGE_SCAN("�\0\0\0")
+IMAGE_PACKED(Text, "\2\21\0\0\0\20\0\0\0\377\377\377\377\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(PI)
+	IMAGE_SCAN("")
+	IMAGE_SCAN("")
+	IMAGE_SCAN("")
+	IMAGE_SCAN("�\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\377\377\0\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377\377\0\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377\377\0��\0\0�\377\377\0\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377\377\0\1�\0\0�\377\377\0\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377\377\0\1�\0\0�\377\377\0\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377\377\0\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377\377\0\1�\0\0�\377\377\0\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377\377\0\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377\377\0\1\0\0\0")
+	IMAGE_SCAN("ŋ\0\0\0")
+IMAGE_PACKED(PI, "\2\21\0\0\0\20\0\0\0\0\0\0\0\1\0\0\0\0\0\0\0")
+IMAGE_BEGIN(Decl)
+	IMAGE_SCAN("")
+	IMAGE_SCAN("")
+	IMAGE_SCAN("")
+	IMAGE_SCAN("ŋ\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\377\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\377\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\377\1�\0\0�\0\377\377\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\377\1�\0\0�\0\377\377\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\377\1�\0\0�\0\377\377\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\377\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\377\1�\0\0�\0\377\377\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\377\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\0\377\377\1\0\0\0")
+	IMAGE_SCAN("�\0\0\0")
+IMAGE_PACKED(Decl, "\2\21\0\0\0\20\0\0\0\0\0\0\0\1\0\0\0\0\0\0\0")
+IMAGE_BEGIN(Comment)
+	IMAGE_SCAN("")
+	IMAGE_SCAN("")
+	IMAGE_SCAN("")
+	IMAGE_SCAN("ņ\0\0\0")
+	IMAGE_SCAN("Â\0\0\0�����\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0����\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0����\1�\0\0����\1�\0\0����\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0����\1�\0\0����\1�\0\0����\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0����\1�\0\0����\1�\0\0����\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0����\1�\0\0����\1�\0\0����\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0����\1�\0\0����\1�\0\0����\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0����\1\0\0\0")
+	IMAGE_SCAN("Â\0\0\0�����\0\0\0")
+	IMAGE_SCAN("ņ\0\0\0")
+IMAGE_PACKED(Comment, "\2\21\0\0\0\20\0\0\0\0\0\0\0\1\0\0\0\0\0\0\0")
+IMAGE_BEGIN(Icon)
+	IMAGE_SCAN("")
+	IMAGE_SCAN("")
+	IMAGE_SCAN("")
+	IMAGE_SCAN("Ĉ\0\0\0")
+	IMAGE_SCAN("‚\0\0\0�\377\377\377�\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377\377\377\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\377\377\377\11�\0\0\377\377\377�\0\0\377\377\377�\0\0\377\377\377�\0\0\377\377\377�\0\0�\377\377\377\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\377\377\377\4�\0\0\377\377\377�\0\0\377\377\377��\0\0\2\377\377\377�\0\0�\377\377\377\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\377\377\377\1�\0\0�\377\377\377\5�\0\0\377\377\377�\0\0\377\377\377�\0\0�\377\377\377\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\377\377\377\11�\0\0\377\377\377�\0\0\377\377\377�\0\0\377\377\377�\0\0\377\377\377�\0\0�\377\377\377\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\377\377\377\10�\0\0\377\377\377�\0\0\377\377\377�\0\0\377\377\377�\0\0\377\377\377��\0\0\2\377\377\377\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377\377\377\1\0\0\0")
+	IMAGE_SCAN("‚\0\0\0�\377\377\377�\0\0\0")
+	IMAGE_SCAN("Ĉ\0\0\0")
+IMAGE_PACKED(Icon, "\2\20\0\0\0\20\0\0\0\377\377\377\377\0\0\0\0\0\0\0\0")
diff --git a/uppsrc/XmlView/XmlView.rc b/uppsrc/XmlView/XmlView.rc
new file mode 100644
index 000000000..7d9626aed
--- /dev/null
+++ b/uppsrc/XmlView/XmlView.rc
@@ -0,0 +1 @@
+5555 ICON "icon.ico"
\ No newline at end of file
diff --git a/uppsrc/XmlView/XmlView.upp b/uppsrc/XmlView/XmlView.upp
new file mode 100644
index 000000000..a3603f8da
--- /dev/null
+++ b/uppsrc/XmlView/XmlView.upp
@@ -0,0 +1,13 @@
+description "XML viewer - with added \"path\" capability";
+
+uses
+	CtrlLib;
+
+file
+	XmlView.h,
+	main.cpp,
+	XmlView.iml,
+	XmlView.rc;
+
+mainconfig
+	"" = "GUI";
diff --git a/uppsrc/XmlView/icon.ico b/uppsrc/XmlView/icon.ico
new file mode 100644
index 000000000..bf49cd8a7
Binary files /dev/null and b/uppsrc/XmlView/icon.ico differ
diff --git a/uppsrc/XmlView/main.cpp b/uppsrc/XmlView/main.cpp
new file mode 100644
index 000000000..c9a099fad
--- /dev/null
+++ b/uppsrc/XmlView/main.cpp
@@ -0,0 +1,182 @@
+#include "XmlView.h"
+
+#define IMAGEFILE  <XmlView/XmlView.iml>
+#define IMAGECLASS XmlImg
+#include <Draw/iml_source.h>
+
+void XmlView::Load(int parent, XmlParser& p)
+{
+	if(p.IsTag()) {
+		String tag = p.ReadTag();
+		String txt = tag;
+		for(int i = 0; i < p.GetAttrCount(); i++)
+			txt << ' ' << p.GetAttr(i) << "=\"" << p[i] << "\"";
+		parent = xml.Add(parent, XmlImg::Tag(), tag, txt);
+		while(!p.End()) {
+			if(p.IsEof())
+				throw XmlError("");
+			Load(parent, p);
+		}
+	}
+	else
+	if(p.IsText())
+		xml.Add(parent, XmlImg::Text(), Null, NormalizeSpaces(p.ReadText()));
+	else
+	if(p.IsPI())
+		xml.Add(parent, XmlImg::PI(), Null, NormalizeSpaces(p.ReadPI()));
+	else
+	if(p.IsDecl())
+		xml.Add(parent, XmlImg::Decl(), Null, NormalizeSpaces(p.ReadDecl()));
+	else
+	if(p.IsComment())
+		xml.Add(parent, XmlImg::Comment(), Null, NormalizeSpaces(p.ReadComment()));
+	else
+		NEVER();
+}
+
+void XmlView::Load(const char *filename)
+{
+	int64 l = GetFileLength(filename);
+	if(l < 0 || l > 16000000)
+		return;
+	String txt = LoadFile(filename);
+	XmlParser p(txt);
+	xml.Clear();
+	try {
+		while(!p.IsEof())
+			Load(0, p);
+	}
+	catch(XmlError e) {
+		error = "XML parsing error: " + e;
+		view.Show();
+		view <<= txt;
+		view.SetCursor(view.GetPos(p.GetLine() - 1, p.GetColumn() - 1));
+		view.SetFocus();
+		return;
+	}
+	xml.Show();
+	xml.SetFocus();
+}
+
+void XmlView::LoadDir(const char *d)
+{
+	files.Clear();
+	dir = d;
+	Title(dir);
+#ifdef PLATFORM_WIN32
+	if(dir.GetLength())
+#else
+	if(dir.GetLength() > 1)
+#endif
+		files.Add("..", CtrlImg::DirUp(), StdFont(), SColorText(), true);
+	::Load(files, dir, "*.*");
+	SortByExt(files);
+}
+
+void XmlView::Enter()
+{
+	if(!files.IsCursor()) {
+		Title(dir);
+		return;
+	}
+	const FileList::File& f = files.Get(files.GetCursor());
+	xml.Hide();
+	view.Hide();
+	if(f.name == "..") {
+		Title(dir);
+		return;
+	}
+	String p = AppendFileName(dir, f.name);
+	Title(p);
+	if(!f.isdir)
+		Load(p);
+}
+
+void XmlView::DoDir()
+{
+	if(!files.IsCursor())
+		return;
+	const FileList::File& f = files.Get(files.GetCursor());
+	if(!f.isdir)
+		return;
+	if(f.name == "..") {
+		String n = DirectoryUp(dir);
+		LoadDir(dir);
+		files.FindSetCursor(n);
+	}
+	else
+		LoadDir(AppendFileName(dir, f.name));
+}
+
+bool XmlView::Key(dword key, int)
+{
+	if(key == K_ENTER) {
+		DoDir();
+		return true;
+	}
+	return false;
+}
+
+void XmlView::Serialize(Stream& s)
+{
+	int version = 0;
+	s / version;
+	SerializePlacement(s);
+	s % files;
+	s % dir;
+	s % splitter;
+}
+
+void XmlView::CopyPath()
+{
+	String path;
+	int id = xml.GetCursor();
+	while(id >= 0) {
+		String tag = xml.Get(id);
+		if(tag.GetCount())
+			path = "[" + AsCString(tag) + "]" + path;
+		id = xml.GetParent(id);
+	}
+	WriteClipboardText(path);
+}
+
+XmlView::XmlView()
+{
+	xml.NoRoot();
+
+	error.SetFont(Arial(20)).SetInk(Red);
+	errorbg.Height(25).Add(error.SizePos());
+	view.AddFrame(errorbg);
+	view.SetReadOnly();
+	view.SetColor(LineEdit::PAPER_READONLY, SColorPaper());
+
+	xml.Hide();
+	view.Hide();
+
+	data.Add(xml.SizePos());
+	data.Add(view.SizePos());
+
+	splitter.Horz(files, data.SizePos());
+	splitter.SetPos(2700);
+	Add(splitter.SizePos());
+
+	files.WhenEnterItem = THISBACK(Enter);
+	files.WhenLeftDouble = THISBACK(DoDir);
+
+	Sizeable().Zoomable();
+
+	dir = GetCurrentDirectory();
+
+	Icon(XmlImg::Icon());
+
+	xml.WhenLeftDouble = THISBACK(CopyPath);
+}
+
+GUI_APP_MAIN
+{
+	XmlView x;
+	LoadFromFile(x);
+	x.LoadDir();
+	x.Run();
+	StoreToFile(x);
+}
diff --git a/uppsrc/art/BlueBar/Blue.iml b/uppsrc/art/BlueBar/Blue.iml
new file mode 100644
index 000000000..8254f90c5
--- /dev/null
+++ b/uppsrc/art/BlueBar/Blue.iml
@@ -0,0 +1,9 @@
+PREMULTIPLIED
+IMAGE_ID(BH)
+IMAGE_ID(BP)
+IMAGE_ID(B1)
+
+IMAGE_BEGIN_DATA
+IMAGE_DATA(120,156,99,96,102,96,102,128,1,25,173,19,255,145,113,76,210,225,255,232,98,12,248,52,172,88,97,135,95,67,75,247)
+IMAGE_DATA(255,255,32,172,102,246,1,76,159,191,248,239,63,175,80,16,152,15,162,65,24,0,64,4,59,154,0,0,0,0,0,0)
+IMAGE_END_DATA(64, 3)
diff --git a/uppsrc/art/BlueBar/BlueBar.h b/uppsrc/art/BlueBar/BlueBar.h
new file mode 100644
index 000000000..3477ab4d6
--- /dev/null
+++ b/uppsrc/art/BlueBar/BlueBar.h
@@ -0,0 +1,14 @@
+#ifndef _BlueSkin_BlueSkin_h
+#define _BlueSkin_BlueSkin_h
+
+#include <CtrlLib/CtrlLib.h>
+
+NAMESPACE_UPP
+
+void InstallBlueToolBar();
+void InstallBlueMenuBar();
+void InstallBlueBar();
+
+END_UPP_NAMESPACE
+
+#endif
diff --git a/uppsrc/art/BlueBar/BlueBar.upp b/uppsrc/art/BlueBar/BlueBar.upp
new file mode 100644
index 000000000..e793192f3
--- /dev/null
+++ b/uppsrc/art/BlueBar/BlueBar.upp
@@ -0,0 +1,6 @@
+description "Visual style for ToolBar and MenuBar";
+
+file
+	BlueBar.h,
+	BlueSkin.iml,
+	BlueSkin.cpp;
diff --git a/uppsrc/art/BlueBar/BlueSkin.cpp b/uppsrc/art/BlueBar/BlueSkin.cpp
new file mode 100644
index 000000000..9512126f2
--- /dev/null
+++ b/uppsrc/art/BlueBar/BlueSkin.cpp
@@ -0,0 +1,56 @@
+#include "BlueBar.h"
+
+NAMESPACE_UPP
+
+#define IMAGECLASS BlueImg
+#define IMAGEFILE <art/BlueBar/BlueSkin.iml>
+#include <Draw/iml.h>
+
+void InstallBlueToolBar()
+{
+	ToolBar::Style& s = ToolBar::StyleDefault().Write();
+	s = s.Standard();
+	s.buttonstyle.look[CTRL_NORMAL] = Null;
+	s.buttonstyle.look[CTRL_HOT] = BlueImg::BH();
+	s.buttonstyle.look[CTRL_PRESSED] = BlueImg::BP();
+	s.buttonstyle.look[CTRL_DISABLED] = Null;
+	s.buttonstyle.look[CTRL_CHECKED] = BlueImg::B1();
+	s.buttonstyle.look[CTRL_HOTCHECKED] = BlueImg::BH();
+
+	for(int i = 0; i < 6; i++) {
+		s.buttonstyle.light[i] = false;
+		s.buttonstyle.contrast[i] = -40;
+	}
+	s.buttonstyle.contrast[CTRL_HOT] = s.buttonstyle.contrast[CTRL_HOTCHECKED] = 0;
+	s.arealook = Null;
+	s.look = BlueImg::LK();
+}
+
+void InstallBlueMenuBar()
+{
+	MenuBar::Style& s = MenuBar::StyleDefault().Write();
+	s = s.Standard();
+	s.arealook = Null;
+	s.look = BlueImg::LK();
+	s.topitem[1] = s.item = BlueImg::BH();
+	s.itemtext = s.topitemtext[0] = s.topitemtext[1] = s.topitemtext[2] = SColorText();
+	s.leftgap = 24;
+	s.lsepm = s.leftgap + s.textgap;
+	s.popupiconbar = BlueImg::LR();
+	ImageBuffer ib(7, 7);
+	Fill(ib, SColorShadow(), 7 * 7);
+	for(int i = 0; i < 5; i++)
+		Fill(ib[i + 1] + 1, SColorMenu(), 5);
+	ib.SetHotSpot(Point(2, 2));
+	ib.Set2ndSpot(Point(4, 4));
+	s.popupframe = Image(ib);
+	s.topitem[2] = BlueImg::TK();
+}
+
+void InstallBlueBar()
+{
+	InstallBlueMenuBar();
+	InstallBlueToolBar();
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/art/BlueBar/BlueSkin.iml b/uppsrc/art/BlueBar/BlueSkin.iml
new file mode 100644
index 000000000..fe708b78e
--- /dev/null
+++ b/uppsrc/art/BlueBar/BlueSkin.iml
@@ -0,0 +1,15 @@
+PREMULTIPLIED
+IMAGE_ID(BH)
+IMAGE_ID(BP)
+IMAGE_ID(B1)
+IMAGE_ID(LK)
+IMAGE_ID(LR)
+IMAGE_ID(TK)
+
+IMAGE_BEGIN_DATA
+IMAGE_DATA(120,156,99,96,102,96,102,96,132,194,168,228,231,255,145,241,218,13,239,254,163,139,49,224,211,48,117,198,57,226,52,128)
+IMAGE_DATA(0,136,62,127,241,223,127,116,0,84,198,193,0,1,236,12,207,159,255,253,127,255,254,223,255,87,175,254,254,127,242,212)
+IMAGE_DATA(143,255,123,246,125,249,191,97,243,199,255,75,87,188,255,63,123,222,91,144,233,76,96,165,32,211,79,223,250,248,127,213)
+IMAGE_DATA(206,115,255,203,90,102,252,71,102,51,176,50,176,128,21,128,20,131,4,176,225,139,15,127,194,49,62,49,116,12,0,22)
+IMAGE_DATA(60,184,148,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0)
+IMAGE_END_DATA(160, 6)
diff --git a/uppsrc/art/BlueBar/init b/uppsrc/art/BlueBar/init
new file mode 100644
index 000000000..834034f85
--- /dev/null
+++ b/uppsrc/art/BlueBar/init
@@ -0,0 +1,3 @@
+#ifndef _BlueSkin_icpp_init_stub
+#define _BlueSkin_icpp_init_stub
+#endif
diff --git a/uppsrc/bench.txt b/uppsrc/bench.txt
new file mode 100644
index 000000000..7e21b3c99
--- /dev/null
+++ b/uppsrc/bench.txt
@@ -0,0 +1,44 @@
+* /home/cxl/upp/out/GCC.Force_speed/StableSort 10.04.2008 12:24:03, user: cxl
+
+TIMING L std::stable_sort std::string:   1.7 s  -  16.5 ms (  1.7 s  / 100 ), min:  16.0 ms, max:  18.0 ms, nesting: 1 - 100
+TIMING L std::sort std::string:   1.2 s  -  11.6 ms (  1.2 s  / 100 ), min:  11.0 ms, max:  13.0 ms, nesting: 1 - 100
+TIMING L std::stable_sort String: 835.8 ms -   8.4 ms (836.0 ms / 100 ), min:   8.0 ms, max:   9.0 ms, nesting: 1 - 100
+TIMING L std::sort String: 802.8 ms -   8.0 ms (803.0 ms / 100 ), min:   7.0 ms, max:   9.0 ms, nesting: 1 - 100
+TIMING L StableSort   :   1.1 s  -  11.3 ms (  1.1 s  / 100 ), min:  11.0 ms, max:  12.0 ms, nesting: 1 - 100
+TIMING L GetSortOrder : 660.8 ms -   6.6 ms (661.0 ms / 100 ), min:   6.0 ms, max:   7.0 ms, nesting: 1 - 100
+TIMING L Sort         : 641.8 ms -   6.4 ms (642.0 ms / 100 ), min:   6.0 ms, max:   7.0 ms, nesting: 1 - 100
+TIMING X std::stable_sort std::string:   1.4 s  -  13.8 ms (  1.4 s  / 100 ), min:  13.0 ms, max:  15.0 ms, nesting: 1 - 100
+TIMING X std::sort std::string: 488.8 ms -   4.9 ms (489.0 ms / 100 ), min:   4.0 ms, max:   6.0 ms, nesting: 1 - 100
+TIMING X std::stable_sort String: 226.8 ms -   2.3 ms (227.0 ms / 100 ), min:   2.0 ms, max:   3.0 ms, nesting: 1 - 100
+TIMING X std::sort String: 211.8 ms -   2.1 ms (212.0 ms / 100 ), min:   2.0 ms, max:   3.0 ms, nesting: 1 - 100
+TIMING X Array QStableSortCmp: 411.8 ms -   4.1 ms (412.0 ms / 100 ), min:   4.0 ms, max:   5.0 ms, nesting: 1 - 100
+TIMING X Array QStableSort: 405.8 ms -   4.1 ms (406.0 ms / 100 ), min:   4.0 ms, max:   5.0 ms, nesting: 1 - 100
+TIMING X Array NewStableSort: 304.8 ms -   3.0 ms (305.0 ms / 100 ), min:   3.0 ms, max:   4.0 ms, nesting: 1 - 100
+TIMING X Array StableSort: 369.8 ms -   3.7 ms (370.0 ms / 100 ), min:   3.0 ms, max:   4.0 ms, nesting: 1 - 100
+TIMING X QStableSortCmp: 393.8 ms -   3.9 ms (394.0 ms / 100 ), min:   3.0 ms, max:   5.0 ms, nesting: 1 - 100
+TIMING X QStableSort  : 393.8 ms -   3.9 ms (394.0 ms / 100 ), min:   3.0 ms, max:   4.0 ms, nesting: 1 - 100
+TIMING X NewStableSort: 238.8 ms -   2.4 ms (239.0 ms / 100 ), min:   2.0 ms, max:   3.0 ms, nesting: 1 - 100
+TIMING X StableSort   : 341.8 ms -   3.4 ms (342.0 ms / 100 ), min:   3.0 ms, max:   4.0 ms, nesting: 1 - 100
+TIMING X GetSortOrder : 152.8 ms -   1.5 ms (153.0 ms / 100 ), min:   1.0 ms, max:   2.0 ms, nesting: 1 - 100
+TIMING X Sort         : 135.8 ms -   1.4 ms (136.0 ms / 100 ), min:   1.0 ms, max:   2.0 ms, nesting: 1 - 100
+TIMING std::stable_sort std::string:   1.6 s  -  15.6 ms (  1.6 s  / 100 ), min:  15.0 ms, max:  17.0 ms, nesting: 1 - 100
+TIMING std::sort std::string:   1.0 s  -  10.2 ms (  1.0 s  / 100 ), min:   9.0 ms, max:  11.0 ms, nesting: 1 - 100
+TIMING std::stable_sort String: 224.8 ms -   2.2 ms (225.0 ms / 100 ), min:   2.0 ms, max:   3.0 ms, nesting: 1 - 100
+TIMING std::sort String: 199.8 ms -   2.0 ms (200.0 ms / 100 ), min:   1.0 ms, max:   3.0 ms, nesting: 1 - 100
+TIMING Array QStableSortCmp: 270.8 ms -   2.7 ms (271.0 ms / 100 ), min:   2.0 ms, max:   3.0 ms, nesting: 1 - 100
+TIMING Array QStableSort: 268.8 ms -   2.7 ms (269.0 ms / 100 ), min:   2.0 ms, max:   3.0 ms, nesting: 1 - 100
+TIMING Array NewStableSort: 316.8 ms -   3.2 ms (317.0 ms / 100 ), min:   3.0 ms, max:   4.0 ms, nesting: 1 - 100
+TIMING Array StableSort: 369.8 ms -   3.7 ms (370.0 ms / 100 ), min:   3.0 ms, max:   4.0 ms, nesting: 1 - 100
+TIMING QStableSortCmp : 256.8 ms -   2.6 ms (257.0 ms / 100 ), min:   2.0 ms, max:   3.0 ms, nesting: 1 - 100
+TIMING QStableSort    : 254.8 ms -   2.5 ms (255.0 ms / 100 ), min:   2.0 ms, max:   3.0 ms, nesting: 1 - 100
+TIMING NewStableSort  : 232.8 ms -   2.3 ms (233.0 ms / 100 ), min:   2.0 ms, max:   3.0 ms, nesting: 1 - 100
+TIMING StableSort     : 355.8 ms -   3.6 ms (356.0 ms / 100 ), min:   3.0 ms, max:   4.0 ms, nesting: 1 - 100
+TIMING GetSortOrder   : 214.8 ms -   2.1 ms (215.0 ms / 100 ), min:   2.0 ms, max:   3.0 ms, nesting: 1 - 100
+TIMING Sort           : 168.8 ms -   1.7 ms (169.0 ms / 100 ), min:   1.0 ms, max:   2.0 ms, nesting: 1 - 100
+TIMING M std::stable_sort std::string:   1.6 s  -  16.5 ms (  1.6 s  / 100 ), min:  16.0 ms, max:  18.0 ms, nesting: 1 - 100
+TIMING M std::sort std::string:   1.1 s  -  11.0 ms (  1.1 s  / 100 ), min:  10.0 ms, max:  12.0 ms, nesting: 1 - 100
+TIMING M std::stable_sort String: 750.8 ms -   7.5 ms (751.0 ms / 100 ), min:   7.0 ms, max:   9.0 ms, nesting: 1 - 100
+TIMING M std::sort String: 716.8 ms -   7.2 ms (717.0 ms / 100 ), min:   7.0 ms, max:   8.0 ms, nesting: 1 - 100
+TIMING M StableSort   :   1.1 s  -  10.6 ms (  1.1 s  / 100 ), min:  10.0 ms, max:  12.0 ms, nesting: 1 - 100
+TIMING M GetSortOrder : 605.8 ms -   6.1 ms (606.0 ms / 100 ), min:   5.0 ms, max:   7.0 ms, nesting: 1 - 100
+TIMING M Sort         : 580.8 ms -   5.8 ms (581.0 ms / 100 ), min:   5.0 ms, max:   7.0 ms, nesting: 1 - 100
diff --git a/uppsrc/coff/AUTHORS b/uppsrc/coff/AUTHORS
new file mode 100644
index 000000000..408e0afa1
--- /dev/null
+++ b/uppsrc/coff/AUTHORS
@@ -0,0 +1 @@
+Tomas Rylek  <rylek@volny.cz>
\ No newline at end of file
diff --git a/uppsrc/coff/COPYING b/uppsrc/coff/COPYING
new file mode 100644
index 000000000..33aa39102
--- /dev/null
+++ b/uppsrc/coff/COPYING
@@ -0,0 +1,30 @@
+Copyright (C) 2005 Mirek Fidler, Tomas Rylek and various contributors (see AUTHORS)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to
+deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies of the Software and its Copyright notices. In addition publicly
+documented acknowledgment must be given that this software has been used if no
+source code of this software is made available publicly. This includes
+acknowledgments in either Copyright notices, Manuals, Publicity and Marketing
+documents or any documentation provided with any product containing this
+software. This License does not apply to any software that links to the
+libraries provided by this software (statically or dynamically), but only to
+the software provided.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+-----------
+
+Please see the COPYING.PLAIN for a plain-english explanation of this notice
+and it's intent.
diff --git a/uppsrc/coff/COPYING-PLAIN b/uppsrc/coff/COPYING-PLAIN
new file mode 100644
index 000000000..770a8132f
--- /dev/null
+++ b/uppsrc/coff/COPYING-PLAIN
@@ -0,0 +1,33 @@
+Plain English Copyright Notice
+
+This file is not intended to be the actual License. The reason this file
+exists is that we here are programmers and engineers. We aren't lawyers. We
+provide licenses that we THINK say the right things, but we have our own
+intentions at heart. This is a plain-english explanation of what those
+intentions are, and if you follow them you will be within the "spirit" of
+the license.
+
+The intent is for us to enjoy writing software that is useful to us (the
+AUTHORS) and allow others to use it freely and also benefit from the work we
+put into making it. We don't want to restrict others using it. They should
+not *HAVE* to make the source code of the applications they write that
+simply link to these libraries (be that statically or dynamically), or for
+them to be limited as to what license they choose to use (be it open, closed
+or anything else). But we would like to know you are using these libraries.
+We simply would like to know that it has been useful to someone. This is why
+we ask for acknowledgement of some sort.
+
+You can do what you want with the source of this software - it doesn't
+matter. We still have it here for ourselves and it is open and free to use
+and download and play with. It can't be taken away. We don't really mind what
+you do with the source to your software. We would simply like to know that
+you are using it - especially if it makes it to a commerical product. If you
+simply e-mail all the AUTHORS (see COPYING and AUTHORS files) telling us, and
+then make sure you include a paragraph or page in the manual or in the "About.."
+box for the product with the copyright notice and state that you used this
+software, we will be very happy. If you want to contribute back modifications
+and fixes you may have made we will welcome those too with open arms (generally).
+If you want help with changes needed, ports needed or features to be added,
+arrangements can be easily made with some dialogue.
+
+Mirek Fidler <cxl@ntllib.org>
diff --git a/uppsrc/coff/binobj/AUTHORS b/uppsrc/coff/binobj/AUTHORS
new file mode 100644
index 000000000..408e0afa1
--- /dev/null
+++ b/uppsrc/coff/binobj/AUTHORS
@@ -0,0 +1 @@
+Tomas Rylek  <rylek@volny.cz>
\ No newline at end of file
diff --git a/uppsrc/coff/binobj/COPYING b/uppsrc/coff/binobj/COPYING
new file mode 100644
index 000000000..33aa39102
--- /dev/null
+++ b/uppsrc/coff/binobj/COPYING
@@ -0,0 +1,30 @@
+Copyright (C) 2005 Mirek Fidler, Tomas Rylek and various contributors (see AUTHORS)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to
+deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies of the Software and its Copyright notices. In addition publicly
+documented acknowledgment must be given that this software has been used if no
+source code of this software is made available publicly. This includes
+acknowledgments in either Copyright notices, Manuals, Publicity and Marketing
+documents or any documentation provided with any product containing this
+software. This License does not apply to any software that links to the
+libraries provided by this software (statically or dynamically), but only to
+the software provided.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+-----------
+
+Please see the COPYING.PLAIN for a plain-english explanation of this notice
+and it's intent.
diff --git a/uppsrc/coff/binobj/COPYING-PLAIN b/uppsrc/coff/binobj/COPYING-PLAIN
new file mode 100644
index 000000000..770a8132f
--- /dev/null
+++ b/uppsrc/coff/binobj/COPYING-PLAIN
@@ -0,0 +1,33 @@
+Plain English Copyright Notice
+
+This file is not intended to be the actual License. The reason this file
+exists is that we here are programmers and engineers. We aren't lawyers. We
+provide licenses that we THINK say the right things, but we have our own
+intentions at heart. This is a plain-english explanation of what those
+intentions are, and if you follow them you will be within the "spirit" of
+the license.
+
+The intent is for us to enjoy writing software that is useful to us (the
+AUTHORS) and allow others to use it freely and also benefit from the work we
+put into making it. We don't want to restrict others using it. They should
+not *HAVE* to make the source code of the applications they write that
+simply link to these libraries (be that statically or dynamically), or for
+them to be limited as to what license they choose to use (be it open, closed
+or anything else). But we would like to know you are using these libraries.
+We simply would like to know that it has been useful to someone. This is why
+we ask for acknowledgement of some sort.
+
+You can do what you want with the source of this software - it doesn't
+matter. We still have it here for ourselves and it is open and free to use
+and download and play with. It can't be taken away. We don't really mind what
+you do with the source to your software. We would simply like to know that
+you are using it - especially if it makes it to a commerical product. If you
+simply e-mail all the AUTHORS (see COPYING and AUTHORS files) telling us, and
+then make sure you include a paragraph or page in the manual or in the "About.."
+box for the product with the copyright notice and state that you used this
+software, we will be very happy. If you want to contribute back modifications
+and fixes you may have made we will welcome those too with open arms (generally).
+If you want help with changes needed, ports needed or features to be added,
+arrangements can be easily made with some dialogue.
+
+Mirek Fidler <cxl@ntllib.org>
diff --git a/uppsrc/coff/binobj/binobj.cpp b/uppsrc/coff/binobj/binobj.cpp
new file mode 100644
index 000000000..78d035ed5
--- /dev/null
+++ b/uppsrc/coff/binobj/binobj.cpp
@@ -0,0 +1,505 @@
+#include "binobj.h"
+#include <plugin/z/z.h>
+#include <plugin/bz2/bz2.h>
+
+NAMESPACE_UPP
+
+BinObjInfo::BinObjInfo()
+{
+}
+
+void BinObjInfo::Parse(CParser& binscript, String base_dir)
+{
+	while(!binscript.IsEof()) {
+		String binid = binscript.ReadId();
+		bool ba = (binid == "BINARY_ARRAY");
+		bool bm = (binid == "BINARY_MASK");
+		if(binid == "BINARY" || ba || bm) {
+			binscript.PassChar('(');
+			Block blk;
+			blk.scriptline = binscript.GetLine();
+			blk.ident = binscript.ReadId();
+			ArrayMap<int, Block>& brow = blocks.GetAdd(blk.ident);
+			binscript.PassChar(',');
+			blk.index = -1;
+			if(ba) {
+				blk.flags |= Block::FLG_ARRAY;
+				blk.index = binscript.ReadInt();
+				if(blk.index < 0 || blk.index > 1000000)
+					binscript.ThrowError(NFormat("invalid array index: %d", blk.index));
+				binscript.PassChar(',');
+			}
+			else if(bm) {
+				blk.flags |= Block::FLG_MASK;
+				blk.index = brow.GetCount();
+			}
+			String file = binscript.ReadString();
+			if(binscript.Id("ZIP"))
+				blk.encoding = Block::ENC_ZIP;
+			else if(binscript.Id("BZ2"))
+				blk.encoding = Block::ENC_BZ2;
+			binscript.PassChar(')');
+			FindFile ff;
+			String searchpath = NormalizePath(file, base_dir);
+			String searchdir = GetFileDirectory(searchpath);
+			Vector<String> files;
+			Vector<int64> lengths;
+			if(ff.Search(searchpath))
+				do
+					if(ff.IsFile()) {
+						files.Add(ff.GetName());
+						lengths.Add(ff.GetLength());
+					}
+				while(ff.Next());
+			if(files.IsEmpty())
+				binscript.ThrowError(NFormat("'%s' not found or not a file", file));
+			if(!(blk.flags & Block::FLG_MASK) && files.GetCount() > 1)
+				binscript.ThrowError(NFormat("Multiple files found (e.g. %s, %s) in single file mode", files[0], files[1]));
+			IndexSort(files, lengths);
+			for(int i = 0; i < files.GetCount(); i++) {
+				blk.file = AppendFileName(searchdir, files[i]);
+				blk.length = (int)lengths[i];
+				int f = brow.Find(blk.index);
+				if(f >= 0)
+					binscript.ThrowError(NFormat("%s[%d] already seen at line %d", blk.ident, blk.index, brow[f].scriptline));
+				if(blk.index < 0 && !brow.IsEmpty() || blk.index >= 0 && !brow.IsEmpty() && brow[0].index < 0)
+					binscript.ThrowError(NFormat("%s: mixing non-array and array elements", blk.ident));
+				brow.Add(blk.index, blk);
+				if(!(blk.flags & Block::FLG_MASK))
+					break;
+				blk.index++;
+			}
+		}
+		else
+			binscript.ThrowError("binary script item identifier expected");
+	}
+}
+
+class BinObj : public BinObjInfo {
+public:
+	BinObj(Callback1<String> WhenConsole);
+
+	void Run(String objectfile, CParser& binscript, String base_dir);
+
+public:
+	Callback1<String> WhenConsole;
+
+private:
+	void PrepareSymbolTable(String binfile);
+	void PrepareMetaData();
+	void FixAuxSymbols(int data_size);
+	void WriteFile(String objectfile);
+
+	int  AddSymbol(COFF_IMAGE_SYMBOL& sym, const char *name);
+	int  AddMetaData(int value, int reloc_section = -1);
+
+	static int Align(int len) { return (len + 3) & -4; }
+
+private:
+	Vector<byte> metadata;
+//	int          data_size;
+	Vector<byte> relocations;
+	Vector<byte> symbol_table;
+	Vector<byte> symbol_table_strtbl;
+
+	enum {
+		SCN_COMDAT,
+		SCN_METADATA,
+		SCN_DATA,
+	};
+
+	int          aux_metadata_scn;
+	int          aux_data_scn;
+	int          symtbl_metasec;
+	int          symtbl_datasec;
+};
+
+static const char metadata_secn[] = ".data$BM";
+static const char data_secn[] = ".data$BD";
+
+BinObj::BinObj(Callback1<String> WhenConsole_)
+: WhenConsole(WhenConsole_)
+{
+	symbol_table_strtbl.SetCountR(4);
+}
+
+void BinObj::Run(String objectfile, CParser& binscript, String base_dir)
+{
+	Parse(binscript, base_dir);
+	PrepareSymbolTable(binscript.GetFileName());
+	PrepareMetaData();
+	WriteFile(objectfile);
+}
+
+void BinObj::PrepareMetaData()
+{
+//	data_size = 0;
+	for(int i = 0; i < blocks.GetCount(); i++) {
+		String ident;
+		ident << '_' << blocks.GetKey(i);
+		ArrayMap<int, Block>& belem = blocks[i];
+		int flags = belem[0].flags;
+		if(flags & (Block::FLG_ARRAY | Block::FLG_MASK)) {
+			int count = Max(belem.GetKeys()) + 1;
+			Vector<Block *> blockref;
+			blockref.SetCount(count, 0);
+			for(int a = 0; a < belem.GetCount(); a++) {
+				Block& b = belem[a];
+//				b.offset = data_size;
+				blockref[b.index] = &b;
+//				data_size += Align(b.length + 1);
+			}
+			COFF_IMAGE_SYMBOL countsym;
+			Zero(countsym);
+			countsym.Value = AddMetaData(count);
+			countsym.SectionNumber = SCN_METADATA;
+			countsym.StorageClass = COFF_IMAGE_SYM_CLASS_EXTERNAL;
+			countsym.Type = 4;
+			AddSymbol(countsym, ident + "_count");
+			COFF_IMAGE_SYMBOL lensym;
+			Zero(lensym);
+			lensym.Value = metadata.GetCount();
+			lensym.SectionNumber = SCN_METADATA;
+			lensym.StorageClass = COFF_IMAGE_SYM_CLASS_EXTERNAL;
+			lensym.Type = COFF_IMAGE_SYM_TYPE_INT + 256 * COFF_IMAGE_SYM_DTYPE_ARRAY;
+			AddSymbol(lensym, ident + "_length");
+			for(int a = 0; a < count; a++) {
+				if(blockref[a])
+					blockref[a]->len_meta_offset = metadata.GetCount();
+				AddMetaData(-1);
+			}
+			COFF_IMAGE_SYMBOL ptrsym;
+			Zero(ptrsym);
+			ptrsym.Value = metadata.GetCount();
+			ptrsym.SectionNumber = SCN_METADATA;
+			ptrsym.StorageClass = COFF_IMAGE_SYM_CLASS_EXTERNAL;
+			ptrsym.Type = COFF_IMAGE_SYM_TYPE_INT + 256 * COFF_IMAGE_SYM_DTYPE_ARRAY;
+			AddSymbol(ptrsym, ident);
+			for(int a = 0; a < count; a++) {
+				if(blockref[a])
+					blockref[a]->off_meta_offset = metadata.GetCount();
+				AddMetaData(0, blockref[a] ? symtbl_datasec : 0);
+			}
+			if(flags & Block::FLG_MASK) {
+				Vector<int> fn_offsets;
+				fn_offsets.SetCount(count);
+				for(int a = 0; a < count; a++) {
+					String fn;
+					if(blockref[a])
+						fn = GetFileName(blockref[a]->file);
+					int pos = metadata.GetCount();
+					fn_offsets[a] = pos;
+					metadata.SetCountR(pos + fn.GetLength() + 1);
+					memcpy(&metadata[pos], fn, fn.GetLength() + 1);
+				}
+				metadata.SetCountR(Align(metadata.GetCount()), 0);
+				COFF_IMAGE_SYMBOL filesym;
+				Zero(filesym);
+				filesym.Value = metadata.GetCount();
+				filesym.SectionNumber = SCN_METADATA;
+				filesym.StorageClass = COFF_IMAGE_SYM_CLASS_EXTERNAL;
+				filesym.Type = COFF_IMAGE_SYM_TYPE_INT + 256 * COFF_IMAGE_SYM_DTYPE_ARRAY;
+				AddSymbol(filesym, ident + "_files");
+				for(int a = 0; a < count; a++)
+					AddMetaData(fn_offsets[a], symtbl_metasec);
+			}
+		}
+		else {
+			Block& b = belem[0];
+			COFF_IMAGE_SYMBOL lensym;
+			Zero(lensym);
+			b.len_meta_offset = metadata.GetCount();
+			lensym.Value = AddMetaData(b.length);
+			lensym.SectionNumber = SCN_METADATA;
+			lensym.StorageClass = COFF_IMAGE_SYM_CLASS_EXTERNAL;
+			lensym.Type = COFF_IMAGE_SYM_TYPE_INT;
+			AddSymbol(lensym, ident + "_length");
+			COFF_IMAGE_SYMBOL datasym;
+			Zero(datasym);
+			b.off_meta_offset = metadata.GetCount();
+			datasym.Value = AddMetaData(0, symtbl_datasec);
+			datasym.SectionNumber = SCN_METADATA;
+			datasym.StorageClass = COFF_IMAGE_SYM_CLASS_EXTERNAL;
+			datasym.Type = COFF_IMAGE_SYM_TYPE_INT;
+			AddSymbol(datasym, ident);
+		}
+	}
+}
+
+void BinObj::PrepareSymbolTable(String binfile)
+{
+	{ // FILE
+		COFF_IMAGE_SYMBOL filesym;
+		Zero(filesym);
+		filesym.SectionNumber = -2;
+		filesym.StorageClass = COFF_IMAGE_SYM_CLASS_FILE;
+		filesym.NumberOfAuxSymbols = int(binfile.GetLength() / sizeof(COFF_IMAGE_SYMBOL) + 1);
+		memcpy(symbol_table.GetIter(AddSymbol(filesym, ".file")), binfile, binfile.GetLength() + 1);
+	}
+
+	{ // metadata section header
+		symtbl_metasec = symbol_table.GetCount() / COFF_IMAGE_SIZEOF_SYMBOL;
+		COFF_IMAGE_SYMBOL msecsym;
+		Zero(msecsym);
+		msecsym.SectionNumber = 1;
+		msecsym.StorageClass = COFF_IMAGE_SYM_CLASS_STATIC;
+		msecsym.NumberOfAuxSymbols = 1;
+		aux_metadata_scn = AddSymbol(msecsym, metadata_secn);
+	}
+
+	{ // data section header
+		symtbl_datasec = symbol_table.GetCount() / COFF_IMAGE_SIZEOF_SYMBOL;
+		COFF_IMAGE_SYMBOL dsecsym;
+		Zero(dsecsym);
+		dsecsym.SectionNumber = 2;
+		dsecsym.StorageClass = COFF_IMAGE_SYM_CLASS_STATIC;
+		dsecsym.NumberOfAuxSymbols = 1;
+		aux_data_scn = AddSymbol(dsecsym, data_secn);
+	}
+}
+
+void BinObj::FixAuxSymbols(int data_size)
+{
+	{ // metadata section info symbol
+		COFF_IMAGE_AUX_SYMBOL msecaux;
+		Zero(msecaux);
+		msecaux.Section.Length = metadata.GetCount();
+		msecaux.Section.NumberOfRelocations = int(relocations.GetCount() / sizeof(COFF_IMAGE_RELOCATION));
+		msecaux.Section.Number = SCN_METADATA;
+		memcpy(symbol_table.GetIter(aux_metadata_scn), &msecaux, COFF_IMAGE_SIZEOF_SYMBOL);
+	}
+
+	{ // data section info symbol
+		COFF_IMAGE_AUX_SYMBOL dsecaux;
+		Zero(dsecaux);
+		dsecaux.Section.Length = data_size;
+		dsecaux.Section.Number = SCN_DATA;
+		memcpy(symbol_table.GetIter(aux_data_scn), &dsecaux, COFF_IMAGE_SIZEOF_SYMBOL);
+	}
+
+	Poke32le(symbol_table_strtbl.Begin(), symbol_table_strtbl.GetCount());
+}
+
+void BinObj::WriteFile(String objectfile)
+{
+	FileOut fo;
+	if(!fo.Open(objectfile))
+		throw Exc(NFormat("error creating file '%s'", objectfile));
+
+	int section_map_offset = sizeof(COFF_IMAGE_FILE_HEADER);
+	int symtbl_offset = section_map_offset + 2 * sizeof(COFF_IMAGE_SECTION_HEADER);
+	int strtbl_offset = symtbl_offset + symbol_table.GetCount();
+	int reloc_offset = strtbl_offset + symbol_table_strtbl.GetCount();
+	int sec1_offset = reloc_offset + relocations.GetCount();
+	int sec2_offset = sec1_offset + metadata.GetCount();
+
+	fo.Put('\0', sec2_offset);
+
+	int data_size = 0;
+
+	{ // data section
+		ASSERT(fo.GetPos() == sec2_offset);
+		for(int i = 0; i < blocks.GetCount(); i++) {
+			const ArrayMap<int, Block>& belem = blocks[i];
+			for(int a = 0; a < belem.GetCount(); a++) {
+				const Block& b = belem[a];
+				String data = LoadFile(b.file);
+				if(data.IsVoid())
+					throw Exc(NFormat("error reading file '%s'", b.file));
+				if(data.GetLength() != b.length)
+					throw Exc(NFormat("length of file '%s' changed (%d -> %d) during object creation",
+						b.file, b.length, data.GetLength()));
+				switch(b.encoding) {
+					case Block::ENC_ZIP: data = ZCompress(data); break;
+					case Block::ENC_BZ2: data = BZ2Compress(data); break;
+				}
+				int offset = (int)fo.GetPos() - sec2_offset;
+				fo.Put(data, data.GetLength());
+				int align = Align(data.GetLength() + 1);
+				fo.Put('\0', align - data.GetLength());
+				ASSERT(b.len_meta_offset >= 0);
+				Poke32le(&metadata[b.len_meta_offset], data.GetLength());
+				Poke32le(&metadata[b.off_meta_offset], offset);
+				data_size += align;
+			}
+		}
+	}
+
+	fo.Seek(0);
+
+	FixAuxSymbols(data_size);
+
+	{ // file header
+		ASSERT(fo.GetPos() == 0);
+		COFF_IMAGE_FILE_HEADER hdr;
+		Zero(hdr);
+		hdr.Machine = COFF_IMAGE_FILE_MACHINE_I386;
+		hdr.NumberOfSections = 2;
+		hdr.TimeDateStamp = (dword)time(NULL);
+		hdr.PointerToSymbolTable = symtbl_offset;
+		hdr.NumberOfSymbols = symbol_table.GetCount() / COFF_IMAGE_SIZEOF_SYMBOL;
+		hdr.Characteristics = COFF_IMAGE_FILE_LINE_NUMS_STRIPPED
+			| COFF_IMAGE_FILE_LOCAL_SYMS_STRIPPED
+			| COFF_IMAGE_FILE_BYTES_REVERSED_LO
+			| COFF_IMAGE_FILE_32BIT_MACHINE;
+		fo.Put(&hdr, sizeof(COFF_IMAGE_FILE_HEADER));
+	}
+
+	{ // section map
+		ASSERT(fo.GetPos() == section_map_offset);
+		COFF_IMAGE_SECTION_HEADER meta;
+		Zero(meta);
+		strncpy((char *)meta.Name, metadata_secn, 8);
+		meta.PointerToRawData = sec1_offset;
+		meta.SizeOfRawData = metadata.GetCount();
+		meta.PointerToRelocations = (relocations.IsEmpty() ? 0 : reloc_offset);
+		meta.NumberOfRelocations = int(relocations.GetCount() / sizeof(COFF_IMAGE_RELOCATION));
+		meta.Characteristics = COFF_IMAGE_SCN_CNT_INITIALIZED_DATA
+			| COFF_IMAGE_SCN_ALIGN_4BYTES
+			| COFF_IMAGE_SCN_MEM_READ | COFF_IMAGE_SCN_MEM_WRITE;
+		fo.Put(&meta, sizeof(COFF_IMAGE_SECTION_HEADER));
+
+		COFF_IMAGE_SECTION_HEADER data;
+		Zero(data);
+		strncpy((char *)data.Name, data_secn, 8);
+		data.PointerToRawData = sec2_offset;
+		data.SizeOfRawData = data_size;
+		data.Characteristics = COFF_IMAGE_SCN_CNT_INITIALIZED_DATA
+			| COFF_IMAGE_SCN_ALIGN_4BYTES
+			| COFF_IMAGE_SCN_MEM_READ | COFF_IMAGE_SCN_MEM_WRITE;
+		fo.Put(&data, sizeof(COFF_IMAGE_SECTION_HEADER));
+	}
+
+	{ // symbol table
+		ASSERT(fo.GetPos() == symtbl_offset);
+		fo.Put(symbol_table.Begin(), symbol_table.GetCount());
+		ASSERT(fo.GetPos() == strtbl_offset);
+		fo.Put(symbol_table_strtbl.Begin(), symbol_table_strtbl.GetCount());
+	}
+
+	{ // relocations
+		ASSERT(fo.GetPos() == reloc_offset);
+		fo.Put(relocations.Begin(), relocations.GetCount());
+	}
+
+	{ // metadata section
+		ASSERT(fo.GetPos() == sec1_offset);
+		fo.Put(metadata.Begin(), metadata.GetCount());
+	}
+
+	fo.Close();
+	if(fo.IsError())
+		throw Exc(NFormat("error writing file '%s'", objectfile));
+}
+
+int BinObj::AddMetaData(int value, int reloc_symbol)
+{
+	int len = metadata.GetCount();
+	metadata.SetCountR(len + 4);
+	Poke32le(metadata.GetIter(len), value);
+	if(reloc_symbol >= 0) {
+		COFF_IMAGE_RELOCATION reloc;
+		reloc.VirtualAddress = len;
+		reloc.SymbolTableIndex = reloc_symbol;
+		reloc.Type = COFF_IMAGE_REL_I386_DIR32;
+		int off = relocations.GetCount();
+		relocations.InsertN(off, sizeof(COFF_IMAGE_RELOCATION));
+		memcpy(relocations.GetIter(off), &reloc, sizeof(COFF_IMAGE_RELOCATION));
+	}
+	return len;
+}
+
+int BinObj::AddSymbol(COFF_IMAGE_SYMBOL& sym, const char *name)
+{
+	sym.N.Name.Short = sym.N.Name.Long = 0;
+	int nl = (int)strlen(name);
+	if(nl <= 8)
+		memcpy(sym.N.ShortName, name, nl);
+	else {
+		int symlen = symbol_table_strtbl.GetCount();
+		sym.N.Name.Long = symlen;
+		symbol_table_strtbl.InsertN(symlen, nl + 1);
+		memcpy(symbol_table_strtbl.GetIter(symlen), name, nl + 1);
+	}
+	int len = symbol_table.GetCount();
+	symbol_table.InsertN(len, COFF_IMAGE_SIZEOF_SYMBOL * (1 + sym.NumberOfAuxSymbols));
+	memcpy(symbol_table.GetIter(len), &sym, COFF_IMAGE_SIZEOF_SYMBOL);
+	return (sym.NumberOfAuxSymbols ? len + COFF_IMAGE_SIZEOF_SYMBOL : -1);
+}
+
+void BinaryToObject(String objectfile, CParser& binscript, String base_dir, Callback1<String> WhenConsole)
+{
+	BinObj(WhenConsole).Run(objectfile, binscript, base_dir);
+}
+
+#ifdef flagMAIN
+
+#define BINOBJ_VERSION   "1.0.r1"
+#define BINOBJ_DATE      Date(2004, 10, 2)
+#define BINOBJ_COPYRIGHT "Copyright (c) 2004 Tomas Rylek"
+
+static String Usage()
+{
+	String out;
+	out <<
+	"BINOBJ: binary to object converter\n"
+	"Version:      " BINOBJ_VERSION "\n"
+	"Release date: " << BINOBJ_DATE << "\n"
+	BINOBJ_COPYRIGHT "\n"
+	"\n"
+	"Usage: binobj <definition file> [<output object file>]\n"
+	"\n"
+	"Binary definition file syntax:\n"
+	"BINARY(ident, \"abc.def\") // expose file abc.def as identifier ident\n"
+	"BINARY_ARRAY(array, 0, \"abc.def\") // expose file abc.def as array[0]\n"
+	"\n"
+	"Interfacing declarations:\n"
+	"\n"
+	"extern const unsigned char ident[];\n"
+	"extern const int ident_length;\n"
+	"extern const unsigned char *array[];\n"
+	"extern const int array_length[];\n"
+	"extern const int array_count;\n"
+	;
+	return out;
+}
+
+static void TryMain()
+{
+	const Vector<String>& cmdline = CommandLine();
+	String binfile, outfile;
+	for(int i = 0; i < cmdline.GetCount(); i++) {
+		String arg = cmdline[i];
+		if(IsNull(binfile))
+			binfile = AppendExt(arg, ".bin");
+		else if(IsNull(outfile))
+			outfile = AppendExt(arg, ".obj");
+		else
+			throw Exc(NFormat("no use for argument '%s'", arg));
+	}
+	if(IsNull(binfile)) {
+		puts(Usage());
+		SetExitCode(-1);
+		return;
+	}
+	if(IsNull(outfile))
+		outfile = ForceExt(binfile, ".obj");
+	String bindata = LoadFile(binfile);
+	if(bindata.IsVoid())
+		throw Exc(NFormat("error reading file '%s'", binfile));
+	CParser parser(bindata, binfile);
+	BinaryToObject(outfile, parser, GetFileDirectory(binfile));
+}
+
+CONSOLE_APP_MAIN
+{
+	try {
+		TryMain();
+	}
+	catch(Exc e) {
+		puts("BINOBJ: " + e);
+	}
+}
+#endif
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/coff/binobj/binobj.h b/uppsrc/coff/binobj/binobj.h
new file mode 100644
index 000000000..35d6f240b
--- /dev/null
+++ b/uppsrc/coff/binobj/binobj.h
@@ -0,0 +1,47 @@
+#ifndef _coff_binobj_binobj_h_
+#define _coff_binobj_binobj_h_
+
+#include <coff/coff.h>
+
+
+NAMESPACE_UPP
+
+class BinObjInfo {
+public:
+	BinObjInfo();
+
+	void Parse(CParser& binscript, String base_dir);
+
+	struct Block {
+		Block() : index(-1), length(0), scriptline(-1), encoding(ENC_PLAIN), flags(0), offset(-1), len_meta_offset(-1) {}
+
+		String ident;
+		int    index;
+		String file;
+		int    length;
+		int    scriptline;
+		int    encoding;
+		enum {
+			ENC_PLAIN,
+			ENC_ZIP,
+			ENC_BZ2,
+		};
+		int    flags;
+		enum {
+			FLG_ARRAY = 0x01,
+			FLG_MASK  = 0x02,
+		};
+
+		int    offset;
+		int    off_meta_offset;
+		int    len_meta_offset;
+	};
+
+	VectorMap< String, ArrayMap<int, Block> > blocks;
+};
+
+void BinaryToObject(String objectfile, CParser& binscript, String base_dir, Callback1<String> WhenConsole);
+
+END_UPP_NAMESPACE
+
+#endif
diff --git a/uppsrc/coff/binobj/binobj.upp b/uppsrc/coff/binobj/binobj.upp
new file mode 100644
index 000000000..30b14267f
--- /dev/null
+++ b/uppsrc/coff/binobj/binobj.upp
@@ -0,0 +1,19 @@
+description "Converts binary data to COFF object files";
+
+optimize_speed;
+
+uses
+	coff,
+	plugin\bz2;
+
+file
+	binobj.h,
+	binobj.cpp,
+	Info readonly separator,
+	COPYING,
+	COPYING-PLAIN,
+	AUTHORS;
+
+mainconfig
+	"" = "";
+
diff --git a/uppsrc/coff/binobj/init b/uppsrc/coff/binobj/init
new file mode 100644
index 000000000..9ec3744a5
--- /dev/null
+++ b/uppsrc/coff/binobj/init
@@ -0,0 +1,5 @@
+#ifndef _coff_binobj_icpp_init_stub
+#define _coff_binobj_icpp_init_stub
+#include "coff/init"
+#include "plugin\bz2/init"
+#endif
diff --git a/uppsrc/coff/coff.cpp b/uppsrc/coff/coff.cpp
new file mode 100644
index 000000000..6e50cff9e
--- /dev/null
+++ b/uppsrc/coff/coff.cpp
@@ -0,0 +1,6 @@
+#include "coff.h"
+
+void Main()
+{
+
+}
diff --git a/uppsrc/coff/coff.h b/uppsrc/coff/coff.h
new file mode 100644
index 000000000..f2003f571
--- /dev/null
+++ b/uppsrc/coff/coff.h
@@ -0,0 +1,22 @@
+#ifndef _coff_coff_h
+#define _coff_coff_h
+
+#include <Core/Core.h>
+#include <time.h>
+
+
+NAMESPACE_UPP
+
+#include "defs.h"
+#include "util.h"
+#include "lib.h"
+
+#ifdef PLATFORM_WIN32
+	#define PATH_HAS_CASE 0
+#else
+	#define PATH_HAS_CASE 1
+#endif
+
+END_UPP_NAMESPACE
+
+#endif
diff --git a/uppsrc/coff/coff.upp b/uppsrc/coff/coff.upp
new file mode 100644
index 000000000..e4573aa7c
--- /dev/null
+++ b/uppsrc/coff/coff.upp
@@ -0,0 +1,24 @@
+description "Library for handling with COFF object file format (used by GCC toolchain)";
+
+optimize_speed;
+
+uses
+	Core;
+
+file
+	coff.h,
+	defs.h,
+	defs.cpp,
+	stab.def,
+	util.h,
+	util.cpp,
+	lib.h,
+	lib.cpp,
+	Info readonly separator,
+	COPYING,
+	COPYING-PLAIN,
+	AUTHORS;
+
+mainconfig
+	"" = "";
+
diff --git a/uppsrc/coff/defs.cpp b/uppsrc/coff/defs.cpp
new file mode 100644
index 000000000..4a3fa7c4b
--- /dev/null
+++ b/uppsrc/coff/defs.cpp
@@ -0,0 +1,70 @@
+#include "coff.h"
+
+NAMESPACE_UPP
+
+#ifdef PLATFORM_WIN32
+
+#define MACHINE(mach) { ASSTRING(mach), COMBINE(COFF_IMAGE_FILE_MACHINE_, mach) },
+
+static const MachineInfo _COFFMachineList[] =
+{
+	MACHINE(I386)
+	MACHINE(R3000)
+	MACHINE(R4000)
+	MACHINE(R10000)
+	MACHINE(WCEMIPSV2)
+	MACHINE(ALPHA)
+	MACHINE(POWERPC)
+	MACHINE(SH3)
+	MACHINE(SH3E)
+	MACHINE(SH4)
+	MACHINE(ARM)
+	MACHINE(THUMB)
+	MACHINE(IA64)
+	MACHINE(MIPS16)
+	MACHINE(MIPSFPU)
+	MACHINE(MIPSFPU16)
+	MACHINE(ALPHA64)
+	MACHINE(AXP64)
+	{ NULL, -1 }
+};
+
+const MachineInfo *COFFMachineList() { return _COFFMachineList; }
+
+String COFFMachineNames()
+{
+	String out;
+	for(const MachineInfo *mlist = COFFMachineList(), *mi = mlist; mi->name; mi++)
+		out << (mi == mlist ? "" : ", ") << mi->name;
+	return out;
+}
+
+String COFFMachineName(int code)
+{
+	for(const MachineInfo *mi = COFFMachineList(); mi->name; mi++)
+		if(mi->code == code)
+			return mi->name;
+	return NFormat("UNKNOWN(%04x)", code);
+}
+
+int COFFMachineCode(String name)
+{
+	for(const MachineInfo *mi = COFFMachineList(); mi->name; mi++)
+		if(mi->name == name)
+			return mi->code;
+	return COFF_IMAGE_FILE_MACHINE_UNKNOWN;
+}
+
+String COFFSymbolName(const COFF_IMAGE_SYMBOL& sym, const char *strtbl)
+{
+	String name;
+	if(sym.N.Name.Short)
+		name = MaxLenString(sym.N.ShortName, 8);
+	else
+		name = strtbl + sym.N.Name.Long;
+	return name;
+}
+
+#endif
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/coff/defs.h b/uppsrc/coff/defs.h
new file mode 100644
index 000000000..be07fb1b4
--- /dev/null
+++ b/uppsrc/coff/defs.h
@@ -0,0 +1,779 @@
+#ifndef _console_coff_defs_h_
+#define _console_coff_defs_h_
+
+// compatibility COFF headers
+
+#ifdef COMPILER_MSC
+#pragma pack(push, 1)
+#endif
+
+const int  COFF_IMAGE_ARCHIVE_START_SIZE  = 8;
+#define    COFF_IMAGE_ARCHIVE_START                  "!<arch>\n"
+const char COFF_IMAGE_ARCHIVE_PAD = '\n';
+const char COFF_IMAGE_ARCHIVE_END1 = '`';
+const char COFF_IMAGE_ARCHIVE_END2 = '\n';
+
+const int COFF_IMAGE_FILE_RELOCS_STRIPPED          = 0x0001;  // Relocation info stripped from file.
+const int COFF_IMAGE_FILE_EXECUTABLE_IMAGE         = 0x0002;  // File is executable  (i.e. no unresolved externel references).
+const int COFF_IMAGE_FILE_LINE_NUMS_STRIPPED       = 0x0004;  // Line nunbers stripped from file.
+const int COFF_IMAGE_FILE_LOCAL_SYMS_STRIPPED      = 0x0008;  // Local symbols stripped from file.
+const int COFF_IMAGE_FILE_AGGRESIVE_WS_TRIM        = 0x0010;  // Agressively trim working set
+const int COFF_IMAGE_FILE_LARGE_ADDRESS_AWARE      = 0x0020;  // App can handle >2gb addresses
+const int COFF_IMAGE_FILE_BYTES_REVERSED_LO        = 0x0080;  // Bytes of machine word are reversed.
+const int COFF_IMAGE_FILE_32BIT_MACHINE            = 0x0100;  // 32 bit word machine.
+const int COFF_IMAGE_FILE_DEBUG_STRIPPED           = 0x0200;  // Debugging info stripped from file in .DBG file
+const int COFF_IMAGE_FILE_REMOVABLE_RUN_FROM_SWAP  = 0x0400;  // If Image is on removable media, copy and run from the swap file.
+const int COFF_IMAGE_FILE_NET_RUN_FROM_SWAP        = 0x0800;  // If Image is on Net, copy and run from the swap file.
+const int COFF_IMAGE_FILE_SYSTEM                   = 0x1000;  // System File.
+const int COFF_IMAGE_FILE_DLL                      = 0x2000;  // File is a DLL.
+const int COFF_IMAGE_FILE_UP_SYSTEM_ONLY           = 0x4000;  // File should only be run on a UP machine
+const int COFF_IMAGE_FILE_BYTES_REVERSED_HI        = 0x8000;  // Bytes of machine word are reversed.
+
+const int COFF_IMAGE_FILE_MACHINE_UNKNOWN   = 0;
+const int COFF_IMAGE_FILE_MACHINE_I386      = 0x014c;  // Intel 386.
+const int COFF_IMAGE_FILE_MACHINE_R3000     = 0x0162;  // MIPS little-endian; 0x160 big-endian
+const int COFF_IMAGE_FILE_MACHINE_R4000     = 0x0166;  // MIPS little-endian
+const int COFF_IMAGE_FILE_MACHINE_R10000    = 0x0168;  // MIPS little-endian
+const int COFF_IMAGE_FILE_MACHINE_WCEMIPSV2 = 0x0169;  // MIPS little-endian WCE v2
+const int COFF_IMAGE_FILE_MACHINE_ALPHA     = 0x0184;  // Alpha_AXP
+const int COFF_IMAGE_FILE_MACHINE_POWERPC   = 0x01F0;  // IBM PowerPC Little-Endian
+const int COFF_IMAGE_FILE_MACHINE_SH3       = 0x01a2;  // SH3 little-endian
+const int COFF_IMAGE_FILE_MACHINE_SH3E      = 0x01a4;  // SH3E little-endian
+const int COFF_IMAGE_FILE_MACHINE_SH4       = 0x01a6;  // SH4 little-endian
+const int COFF_IMAGE_FILE_MACHINE_ARM       = 0x01c0;  // ARM Little-Endian
+const int COFF_IMAGE_FILE_MACHINE_THUMB     = 0x01c2;
+const int COFF_IMAGE_FILE_MACHINE_IA64      = 0x0200;  // Intel 64
+const int COFF_IMAGE_FILE_MACHINE_MIPS16    = 0x0266;  // MIPS
+const int COFF_IMAGE_FILE_MACHINE_MIPSFPU   = 0x0366;  // MIPS
+const int COFF_IMAGE_FILE_MACHINE_MIPSFPU16 = 0x0466;  // MIPS
+const int COFF_IMAGE_FILE_MACHINE_ALPHA64   = 0x0284;  // ALPHA64
+const int COFF_IMAGE_FILE_MACHINE_AXP64     = COFF_IMAGE_FILE_MACHINE_ALPHA64;
+
+struct MachineInfo
+{
+	const char *name;
+	int code;
+};
+
+const MachineInfo *COFFMachineList();
+String             COFFMachineNames();
+String             COFFMachineName(int code);
+int                COFFMachineCode(String name);
+
+struct COFF_IMAGE_SYMBOL
+{
+	union {
+		byte    ShortName[8];
+		struct {
+			dword   Short;     // if 0, use LongName
+			dword   Long;      // offset into string table
+		} Name;
+		byte  *LongName[2];
+	} N;
+	dword   Value;
+	short   SectionNumber;
+	word    Type;
+	byte    StorageClass;
+	byte    NumberOfAuxSymbols;
+}
+#ifdef COMPILER_GCC
+__attribute__((packed))
+#endif
+;
+
+struct COFF_IMAGE_FILE_HEADER
+{
+	word    Machine;
+	word    NumberOfSections;
+	dword   TimeDateStamp;
+	dword   PointerToSymbolTable;
+	dword   NumberOfSymbols;
+	word    SizeOfOptionalHeader;
+	word    Characteristics;
+}
+#ifdef COMPILER_GCC
+__attribute__((packed))
+#endif
+;
+
+const int COFF_IMAGE_NUMBEROF_DIRECTORY_ENTRIES = 16;
+
+struct COFF_IMAGE_DATA_DIRECTORY
+{
+	dword   VirtualAddress;
+	dword   Size;
+}
+#ifdef COMPILER_GCC
+__attribute__((packed))
+#endif
+;
+
+struct COFF_IMAGE_OPTIONAL_HEADER32
+{
+	//
+	// Standard fields.
+	//
+
+	word    Magic;
+	byte    MajorLinkerVersion;
+	byte    MinorLinkerVersion;
+	dword   SizeOfCode;
+	dword   SizeOfInitializedData;
+	dword   SizeOfUninitializedData;
+	dword   AddressOfEntryPoint;
+	dword   BaseOfCode;
+	dword   BaseOfData;
+
+	//
+	// NT additional fields.
+	//
+
+	dword   ImageBase;
+	dword   SectionAlignment;
+	dword   FileAlignment;
+	word    MajorOperatingSystemVersion;
+	word    MinorOperatingSystemVersion;
+	word    MajorImageVersion;
+	word    MinorImageVersion;
+	word    MajorSubsystemVersion;
+	word    MinorSubsystemVersion;
+	dword   Win32VersionValue;
+	dword   SizeOfImage;
+	dword   SizeOfHeaders;
+	dword   CheckSum;
+	word    Subsystem;
+	word    DllCharacteristics;
+	dword   SizeOfStackReserve;
+	dword   SizeOfStackCommit;
+	dword   SizeOfHeapReserve;
+	dword   SizeOfHeapCommit;
+	dword   LoaderFlags;
+	dword   NumberOfRvaAndSizes;
+	COFF_IMAGE_DATA_DIRECTORY DataDirectory[COFF_IMAGE_NUMBEROF_DIRECTORY_ENTRIES];
+}
+#ifdef COMPILER_GCC
+__attribute__((packed))
+#endif
+;
+
+struct COFF_IMPORT_OBJECT_HEADER
+{
+	word    Sig1;                       // Must be IMAGE_FILE_MACHINE_UNKNOWN
+	word    Sig2;                       // Must be IMPORT_OBJECT_HDR_SIG2.
+	word    Version;
+	word    Machine;
+	dword   TimeDateStamp;              // Time/date stamp
+	dword   SizeOfData;                 // particularly useful for incremental links
+
+	union {
+		word    Ordinal;                // if grf & IMPORT_OBJECT_ORDINAL
+		word    Hint;
+	};
+
+	word    Type : 2;                   // IMPORT_TYPE
+	word    NameType : 3;               // IMPORT_NAME_TYPE
+	word    Reserved : 11;              // Reserved. Must be zero.
+}
+#ifdef COMPILER_GCC
+__attribute__((packed))
+#endif
+;
+
+enum COFF_IMPORT_TYPE
+{
+	COFF_IMPORT_CODE = 0,
+	COFF_IMPORT_DATA = 1,
+	COFF_IMPORT_CONST = 2,
+};
+
+enum COFF_IMPORT_OBJECT_NAME_TYPE
+{
+	COFF_IMPORT_OBJECT_ORDINAL = 0,          // Import by ordinal
+	COFF_IMPORT_OBJECT_NAME = 1,             // Import name == public symbol name.
+	COFF_IMPORT_OBJECT_NAME_NO_PREFIX = 2,   // Import name == public symbol name skipping leading ?, @, or optionally _.
+	COFF_IMPORT_OBJECT_NAME_UNDECORATE = 3,  // Import name == public symbol name skipping leading ?, @, or optionally _
+	                                    // and truncating at first @
+};
+
+struct COFF_IMAGE_EXPORT_DIRECTORY_TABLE
+{
+	dword       ExportFlags;
+	dword       DateTimeStamp;
+	word        MajorVersion;
+	word        MinorVersion;
+	dword       NameRVA;
+	dword       OrdinalBase;
+	dword       AddressTableEntries;
+	dword       NumberOfNamePointers;
+	dword       ExportAddressTableRVA;
+	dword       NamePointerTableRVA;
+	dword       OrdinalTableRVA;
+}
+#ifdef COMPILER_GCC
+__attribute__((packed))
+#endif
+;
+
+const size_t COFF_IMAGE_SIZEOF_SHORT_NAME = 8;
+
+struct COFF_IMAGE_SECTION_HEADER
+{
+	byte    Name[COFF_IMAGE_SIZEOF_SHORT_NAME];
+	union {
+			dword   PhysicalAddress;
+			dword   VirtualSize;
+	} Misc;
+	dword   VirtualAddress;
+	dword   SizeOfRawData;
+	dword   PointerToRawData;
+	dword   PointerToRelocations;
+	dword   PointerToLinenumbers;
+	word    NumberOfRelocations;
+	word    NumberOfLinenumbers;
+	dword   Characteristics;
+}
+#ifdef COMPILER_GCC
+__attribute__((packed))
+#endif
+;
+
+const dword COFF_IMAGE_SCN_TYPE_REG                  = 0x00000000;  // Reserved.
+const dword COFF_IMAGE_SCN_TYPE_DSECT                = 0x00000001;  // Reserved.
+const dword COFF_IMAGE_SCN_TYPE_NOLOAD               = 0x00000002;  // Reserved.
+const dword COFF_IMAGE_SCN_TYPE_GROUP                = 0x00000004;  // Reserved.
+const dword COFF_IMAGE_SCN_TYPE_NO_PAD               = 0x00000008;  // Reserved.
+const dword COFF_IMAGE_SCN_TYPE_COPY                 = 0x00000010;  // Reserved.
+
+const dword COFF_IMAGE_SCN_CNT_CODE                  = 0x00000020;  // Section contains code.
+const dword COFF_IMAGE_SCN_CNT_INITIALIZED_DATA      = 0x00000040;  // Section contains initialized data.
+const dword COFF_IMAGE_SCN_CNT_UNINITIALIZED_DATA    = 0x00000080;  // Section contains uninitialized data.
+
+const dword COFF_IMAGE_SCN_LNK_OTHER                 = 0x00000100;  // Reserved.
+const dword COFF_IMAGE_SCN_LNK_INFO                  = 0x00000200;  // Section contains comments or some other type of information.
+const dword COFF_IMAGE_SCN_TYPE_OVER                 = 0x00000400;  // Reserved.
+const dword COFF_IMAGE_SCN_LNK_REMOVE                = 0x00000800;  // Section contents will not become part of image.
+const dword COFF_IMAGE_SCN_LNK_COMDAT                = 0x00001000;  // Section contents comdat.
+//                                            = 0x00002000;  // Reserved.
+//const dword COFF_IMAGE_SCN_MEM_PROTECTED - Obsolete=   0x00004000
+const dword COFF_IMAGE_SCN_NO_DEFER_SPEC_EXC         = 0x00004000;  // Reset speculative exceptions handling bits in the TLB entries for this section.
+const dword COFF_IMAGE_SCN_GPREL                     = 0x00008000;  // Section content can be accessed relative to GP
+const dword COFF_IMAGE_SCN_MEM_FARDATA               = 0x00008000;
+//const dword COFF_IMAGE_SCN_MEM_SYSHEAP  - Obsolete =   0x00010000
+const dword COFF_IMAGE_SCN_MEM_PURGEABLE             = 0x00020000;
+const dword COFF_IMAGE_SCN_MEM_16BIT                 = 0x00020000;
+const dword COFF_IMAGE_SCN_MEM_LOCKED                = 0x00040000;
+const dword COFF_IMAGE_SCN_MEM_PRELOAD               = 0x00080000;
+
+const dword COFF_IMAGE_SCN_ALIGN_1BYTES              = 0x00100000;  //
+const dword COFF_IMAGE_SCN_ALIGN_2BYTES              = 0x00200000;  //
+const dword COFF_IMAGE_SCN_ALIGN_4BYTES              = 0x00300000;  //
+const dword COFF_IMAGE_SCN_ALIGN_8BYTES              = 0x00400000;  //
+const dword COFF_IMAGE_SCN_ALIGN_16BYTES             = 0x00500000;  // Default alignment if no others are specified.
+const dword COFF_IMAGE_SCN_ALIGN_32BYTES             = 0x00600000;  //
+const dword COFF_IMAGE_SCN_ALIGN_64BYTES             = 0x00700000;  //
+const dword COFF_IMAGE_SCN_ALIGN_128BYTES            = 0x00800000;  //
+const dword COFF_IMAGE_SCN_ALIGN_256BYTES            = 0x00900000;  //
+const dword COFF_IMAGE_SCN_ALIGN_512BYTES            = 0x00A00000;  //
+const dword COFF_IMAGE_SCN_ALIGN_1024BYTES           = 0x00B00000;  //
+const dword COFF_IMAGE_SCN_ALIGN_2048BYTES           = 0x00C00000;  //
+const dword COFF_IMAGE_SCN_ALIGN_4096BYTES           = 0x00D00000;  //
+const dword COFF_IMAGE_SCN_ALIGN_8192BYTES           = 0x00E00000;  //
+
+const dword COFF_IMAGE_SCN_ALIGN_MASK                = 0x00F00000;
+
+// Unused                                     = 0x00F00000;
+
+const dword COFF_IMAGE_SCN_LNK_NRELOC_OVFL           = 0x01000000;  // Section contains extended relocations.
+const dword COFF_IMAGE_SCN_MEM_DISCARDABLE           = 0x02000000;  // Section can be discarded.
+const dword COFF_IMAGE_SCN_MEM_NOT_CACHED            = 0x04000000;  // Section is not cachable.
+const dword COFF_IMAGE_SCN_MEM_NOT_PAGED             = 0x08000000;  // Section is not pageable.
+const dword COFF_IMAGE_SCN_MEM_SHARED                = 0x10000000;  // Section is shareable.
+const dword COFF_IMAGE_SCN_MEM_EXECUTE               = 0x20000000;  // Section is executable.
+const dword COFF_IMAGE_SCN_MEM_READ                  = 0x40000000;  // Section is readable.
+const dword COFF_IMAGE_SCN_MEM_WRITE                 = 0x80000000;  // Section is writeable.
+
+const int COFF_IMAGE_SYM_TYPE_NULL                 = 0x0000;  // no type.
+const int COFF_IMAGE_SYM_TYPE_VOID                 = 0x0001;  //
+const int COFF_IMAGE_SYM_TYPE_CHAR                 = 0x0002;  // type character.
+const int COFF_IMAGE_SYM_TYPE_SHORT                = 0x0003;  // type short integer.
+const int COFF_IMAGE_SYM_TYPE_INT                  = 0x0004;  //
+const int COFF_IMAGE_SYM_TYPE_LONG                 = 0x0005;  //
+const int COFF_IMAGE_SYM_TYPE_FLOAT                = 0x0006;  //
+const int COFF_IMAGE_SYM_TYPE_DOUBLE               = 0x0007;  //
+const int COFF_IMAGE_SYM_TYPE_STRUCT               = 0x0008;  //
+const int COFF_IMAGE_SYM_TYPE_UNION                = 0x0009;  //
+const int COFF_IMAGE_SYM_TYPE_ENUM                 = 0x000A;  // enumeration.
+const int COFF_IMAGE_SYM_TYPE_MOE                  = 0x000B;  // member of enumeration.
+const int COFF_IMAGE_SYM_TYPE_BYTE                 = 0x000C;  //
+const int COFF_IMAGE_SYM_TYPE_WORD                 = 0x000D;  //
+const int COFF_IMAGE_SYM_TYPE_UINT                 = 0x000E;  //
+const int COFF_IMAGE_SYM_TYPE_DWORD                = 0x000F;  //
+const int COFF_IMAGE_SYM_TYPE_PCODE                = 0x8000;  //
+//
+// Type (derived) values.
+//
+
+const int COFF_IMAGE_SYM_DTYPE_NULL                = 0;       // no derived type.
+const int COFF_IMAGE_SYM_DTYPE_POINTER             = 1;       // pointer.
+const int COFF_IMAGE_SYM_DTYPE_FUNCTION            = 2;       // function.
+const int COFF_IMAGE_SYM_DTYPE_ARRAY               = 3;       // array.
+
+//
+// TLS Chaacteristic Flags
+//
+const int COFF_IMAGE_SCN_SCALE_INDEX               = 0x00000001; // Tls index is scaled
+
+const int COFF_IMAGE_SYM_CLASS_END_OF_FUNCTION     = (byte )-1;
+const int COFF_IMAGE_SYM_CLASS_NULL                = 0x0000;
+const int COFF_IMAGE_SYM_CLASS_AUTOMATIC           = 0x0001;
+const int COFF_IMAGE_SYM_CLASS_EXTERNAL            = 0x0002;
+const int COFF_IMAGE_SYM_CLASS_STATIC              = 0x0003;
+const int COFF_IMAGE_SYM_CLASS_REGISTER            = 0x0004;
+const int COFF_IMAGE_SYM_CLASS_EXTERNAL_DEF        = 0x0005;
+const int COFF_IMAGE_SYM_CLASS_LABEL               = 0x0006;
+const int COFF_IMAGE_SYM_CLASS_UNDEFINED_LABEL     = 0x0007;
+const int COFF_IMAGE_SYM_CLASS_MEMBER_OF_STRUCT    = 0x0008;
+const int COFF_IMAGE_SYM_CLASS_ARGUMENT            = 0x0009;
+const int COFF_IMAGE_SYM_CLASS_STRUCT_TAG          = 0x000A;
+const int COFF_IMAGE_SYM_CLASS_MEMBER_OF_UNION     = 0x000B;
+const int COFF_IMAGE_SYM_CLASS_UNION_TAG           = 0x000C;
+const int COFF_IMAGE_SYM_CLASS_TYPE_DEFINITION     = 0x000D;
+const int COFF_IMAGE_SYM_CLASS_UNDEFINED_STATIC    = 0x000E;
+const int COFF_IMAGE_SYM_CLASS_ENUM_TAG            = 0x000F;
+const int COFF_IMAGE_SYM_CLASS_MEMBER_OF_ENUM      = 0x0010;
+const int COFF_IMAGE_SYM_CLASS_REGISTER_PARAM      = 0x0011;
+const int COFF_IMAGE_SYM_CLASS_BIT_FIELD           = 0x0012;
+
+const int COFF_IMAGE_SYM_CLASS_FAR_EXTERNAL        = 0x0044;  //
+
+const int COFF_IMAGE_SYM_CLASS_BLOCK               = 0x0064;
+const int COFF_IMAGE_SYM_CLASS_FUNCTION            = 0x0065;
+const int COFF_IMAGE_SYM_CLASS_END_OF_STRUCT       = 0x0066;
+const int COFF_IMAGE_SYM_CLASS_FILE                = 0x0067;
+// new
+const int COFF_IMAGE_SYM_CLASS_SECTION             = 0x0068;
+const int COFF_IMAGE_SYM_CLASS_WEAK_EXTERNAL       = 0x0069;
+
+const int COFF_IMAGE_SIZEOF_SYMBOL = 18;
+
+union COFF_IMAGE_AUX_SYMBOL
+{
+	struct {
+		dword    TagIndex;                      // struct, union, or enum tag index
+		union {
+			struct {
+				word    Linenumber;             // declaration line number
+				word    Size;                   // size of struct, union, or enum
+			} LnSz;
+			dword    TotalSize;
+		} Misc;
+		union {
+			struct {                            // if ISFCN, tag, or .bb
+				dword    PointerToLinenumber;
+				dword    PointerToNextFunction;
+			} Function;
+			struct {                            // if ISARY, up to 4 dimen.
+				word     Dimension[4];
+			} Array_;
+		} FcnAry;
+		word    TvIndex;                        // tv index
+	} Sym;
+	struct {
+		byte    Name[COFF_IMAGE_SIZEOF_SYMBOL];
+	} File;
+	struct {
+		dword   Length;                         // section length
+		word    NumberOfRelocations;            // number of relocation entries
+		word    NumberOfLinenumbers;            // number of line numbers
+		dword   CheckSum;                       // checksum for communal
+		short   Number;                         // section number to associate with
+		byte    Selection;                      // communal selection type
+	} Section;
+}
+#ifdef COMPILER_GCC
+__attribute__((packed))
+#endif
+;
+
+const int COFF_IMAGE_COMDAT_SELECT_NODUPLICATES   = 1;
+const int COFF_IMAGE_COMDAT_SELECT_ANY            = 2;
+const int COFF_IMAGE_COMDAT_SELECT_SAME_SIZE      = 3;
+const int COFF_IMAGE_COMDAT_SELECT_EXACT_MATCH    = 4;
+const int COFF_IMAGE_COMDAT_SELECT_ASSOCIATIVE    = 5;
+const int COFF_IMAGE_COMDAT_SELECT_LARGEST        = 6;
+const int COFF_IMAGE_COMDAT_SELECT_NEWEST         = 7;
+
+struct COFF_IMAGE_RELOCATION : Moveable<COFF_IMAGE_RELOCATION>
+{
+	union {
+		dword   VirtualAddress;
+		dword   RelocCount;             // Set to the real count when IMAGE_SCN_LNK_NRELOC_OVFL is set
+	};
+	dword   SymbolTableIndex;
+	word    Type;
+}
+#ifdef COMPILER_GCC
+__attribute__((packed))
+#endif
+;
+
+const int COFF_IMAGE_SUBSYSTEM_DEFAULT             = -1;  // system-specific default (ULD-specific)
+
+const int COFF_IMAGE_SUBSYSTEM_UNKNOWN             = 0;   // Unknown subsystem.
+const int COFF_IMAGE_SUBSYSTEM_NATIVE              = 1;   // Image doesn't require a subsystem.
+const int COFF_IMAGE_SUBSYSTEM_WINDOWS_GUI         = 2;   // Image runs in the Windows GUI subsystem.
+const int COFF_IMAGE_SUBSYSTEM_WINDOWS_CUI         = 3;   // Image runs in the Windows character subsystem.
+const int COFF_IMAGE_SUBSYSTEM_OS2_CUI             = 5;   // image runs in the OS/2 character subsystem.
+const int COFF_IMAGE_SUBSYSTEM_POSIX_CUI           = 7;   // image runs in the Posix character subsystem.
+const int COFF_IMAGE_SUBSYSTEM_NATIVE_WINDOWS      = 8;   // image is a native Win9x driver.
+const int COFF_IMAGE_SUBSYSTEM_WINDOWS_CE_GUI      = 9;   // Image runs in the Windows CE subsystem.
+
+struct COFF_IMAGE_ARCHIVE_MEMBER_HEADER
+{
+	byte     Name[16];                          // File member name - `/' terminated.
+	byte     Date[12];                          // File member date - decimal.
+	byte     UserID[6];                         // File member user id - decimal.
+	byte     GroupID[6];                        // File member group id - decimal.
+	byte     Mode[8];                           // File member mode - octal.
+	byte     Size[10];                          // File member size - decimal.
+	byte     EndHeader[2];                      // String to end header.
+}
+#ifdef COMPILER_GCC
+__attribute__((packed))
+#endif
+;
+
+struct COFF_IMAGE_IMPORT_DESCRIPTOR
+{
+	union {
+		dword   Characteristics;            // 0 for terminating null import descriptor
+		dword   OriginalFirstThunk;         // RVA to original unbound IAT (PIMAGE_THUNK_DATA)
+	};
+	dword   TimeDateStamp;                  // 0 if not bound,
+	                                        // -1 if bound, and real date\time stamp
+	                                        //     in IMAGE_DIRECTORY_ENTRY_BOUND_IMPORT (new BIND)
+	                                        // O.W. date/time stamp of DLL bound to (Old BIND)
+
+	dword   ForwarderChain;                 // -1 if no forwarders
+	dword   Name;
+	dword   FirstThunk;                     // RVA to IAT (if bound this IAT has actual addresses)
+}
+#ifdef COMPILER_GCC
+__attribute__((packed))
+#endif
+;
+
+//
+// I386 relocation types.
+//
+const word COFF_IMAGE_REL_I386_ABSOLUTE         = 0x0000;  // Reference is absolute, no relocation is necessary
+const word COFF_IMAGE_REL_I386_DIR16            = 0x0001;  // Direct 16-bit reference to the symbols virtual address
+const word COFF_IMAGE_REL_I386_REL16            = 0x0002;  // PC-relative 16-bit reference to the symbols virtual address
+const word COFF_IMAGE_REL_I386_DIR32            = 0x0006;  // Direct 32-bit reference to the symbols virtual address
+const word COFF_IMAGE_REL_I386_DIR32NB          = 0x0007;  // Direct 32-bit reference to the symbols virtual address, base not included
+const word COFF_IMAGE_REL_I386_SEG12            = 0x0009;  // Direct 16-bit reference to the segment-selector bits of a 32-bit virtual address
+const word COFF_IMAGE_REL_I386_SECTION          = 0x000A;
+const word COFF_IMAGE_REL_I386_SECREL           = 0x000B;
+const word COFF_IMAGE_REL_I386_REL32            = 0x0014;  // PC-relative 32-bit reference to the symbols virtual address
+
+//
+// MIPS relocation types.
+//
+
+const word COFF_IMAGE_REL_MIPS_ABSOLUTE         = 0x0000;  // Reference is absolute, no relocation is necessary
+const word COFF_IMAGE_REL_MIPS_REFHALF          = 0x0001;
+const word COFF_IMAGE_REL_MIPS_REFWORD          = 0x0002;
+const word COFF_IMAGE_REL_MIPS_JMPADDR          = 0x0003;
+const word COFF_IMAGE_REL_MIPS_REFHI            = 0x0004;
+const word COFF_IMAGE_REL_MIPS_REFLO            = 0x0005;
+const word COFF_IMAGE_REL_MIPS_GPREL            = 0x0006;
+const word COFF_IMAGE_REL_MIPS_LITERAL          = 0x0007;
+const word COFF_IMAGE_REL_MIPS_SECTION          = 0x000A;
+const word COFF_IMAGE_REL_MIPS_SECREL           = 0x000B;
+const word COFF_IMAGE_REL_MIPS_SECRELLO         = 0x000C;  // Low 16-bit section relative referemce (used for >32k TLS)
+const word COFF_IMAGE_REL_MIPS_SECRELHI         = 0x000D;  // High 16-bit section relative reference (used for >32k TLS)
+const word COFF_IMAGE_REL_MIPS_JMPADDR16        = 0x0010;
+const word COFF_IMAGE_REL_MIPS_REFWORDNB        = 0x0022;
+const word COFF_IMAGE_REL_MIPS_PAIR             = 0x0025;
+
+//
+// Alpha Relocation types.
+//
+
+const word COFF_IMAGE_REL_ALPHA_ABSOLUTE        = 0x0000;
+const word COFF_IMAGE_REL_ALPHA_REFLONG         = 0x0001;
+const word COFF_IMAGE_REL_ALPHA_REFQUAD         = 0x0002;
+const word COFF_IMAGE_REL_ALPHA_GPREL32         = 0x0003;
+const word COFF_IMAGE_REL_ALPHA_LITERAL         = 0x0004;
+const word COFF_IMAGE_REL_ALPHA_LITUSE          = 0x0005;
+const word COFF_IMAGE_REL_ALPHA_GPDISP          = 0x0006;
+const word COFF_IMAGE_REL_ALPHA_BRADDR          = 0x0007;
+const word COFF_IMAGE_REL_ALPHA_HINT            = 0x0008;
+const word COFF_IMAGE_REL_ALPHA_INLINE_REFLONG  = 0x0009;
+const word COFF_IMAGE_REL_ALPHA_REFHI           = 0x000A;
+const word COFF_IMAGE_REL_ALPHA_REFLO           = 0x000B;
+const word COFF_IMAGE_REL_ALPHA_PAIR            = 0x000C;
+const word COFF_IMAGE_REL_ALPHA_MATCH           = 0x000D;
+const word COFF_IMAGE_REL_ALPHA_SECTION         = 0x000E;
+const word COFF_IMAGE_REL_ALPHA_SECREL          = 0x000F;
+const word COFF_IMAGE_REL_ALPHA_REFLONGNB       = 0x0010;
+const word COFF_IMAGE_REL_ALPHA_SECRELLO        = 0x0011;  // Low 16-bit section relative reference
+const word COFF_IMAGE_REL_ALPHA_SECRELHI        = 0x0012;  // High 16-bit section relative reference
+const word COFF_IMAGE_REL_ALPHA_REFQ3           = 0x0013;  // High 16 bits of 48 bit reference
+const word COFF_IMAGE_REL_ALPHA_REFQ2           = 0x0014;  // Middle 16 bits of 48 bit reference
+const word COFF_IMAGE_REL_ALPHA_REFQ1           = 0x0015;  // Low 16 bits of 48 bit reference
+const word COFF_IMAGE_REL_ALPHA_GPRELLO         = 0x0016;  // Low 16-bit GP relative reference
+const word COFF_IMAGE_REL_ALPHA_GPRELHI         = 0x0017;  // High 16-bit GP relative reference
+
+
+//
+// IBM PowerPC relocation types.
+//
+
+const word COFF_IMAGE_REL_PPC_ABSOLUTE          = 0x0000;  // NOP
+const word COFF_IMAGE_REL_PPC_ADDR64            = 0x0001;  // 64-bit address
+const word COFF_IMAGE_REL_PPC_ADDR32            = 0x0002;  // 32-bit address
+const word COFF_IMAGE_REL_PPC_ADDR24            = 0x0003;  // 26-bit address, shifted left 2 (branch absolute)
+const word COFF_IMAGE_REL_PPC_ADDR16            = 0x0004;  // 16-bit address
+const word COFF_IMAGE_REL_PPC_ADDR14            = 0x0005;  // 16-bit address, shifted left 2 (load doubleword)
+const word COFF_IMAGE_REL_PPC_REL24             = 0x0006;  // 26-bit PC-relative offset, shifted left 2 (branch relative)
+const word COFF_IMAGE_REL_PPC_REL14             = 0x0007;  // 16-bit PC-relative offset, shifted left 2 (br cond relative)
+const word COFF_IMAGE_REL_PPC_TOCREL16          = 0x0008;  // 16-bit offset from TOC base
+const word COFF_IMAGE_REL_PPC_TOCREL14          = 0x0009;  // 16-bit offset from TOC base, shifted left 2 (load doubleword)
+
+const word COFF_IMAGE_REL_PPC_ADDR32NB          = 0x000A;  // 32-bit addr w/o image base
+const word COFF_IMAGE_REL_PPC_SECREL            = 0x000B;  // va of containing section (as in an image sectionhdr)
+const word COFF_IMAGE_REL_PPC_SECTION           = 0x000C;  // sectionheader number
+const word COFF_IMAGE_REL_PPC_IFGLUE            = 0x000D;  // substitute TOC restore instruction iff symbol is glue code
+const word COFF_IMAGE_REL_PPC_IMGLUE            = 0x000E;  // symbol is glue code; virtual address is TOC restore instruction
+const word COFF_IMAGE_REL_PPC_SECREL16          = 0x000F;  // va of containing section (limited to 16 bits)
+const word COFF_IMAGE_REL_PPC_REFHI             = 0x0010;
+const word COFF_IMAGE_REL_PPC_REFLO             = 0x0011;
+const word COFF_IMAGE_REL_PPC_PAIR              = 0x0012;
+const word COFF_IMAGE_REL_PPC_SECRELLO          = 0x0013;  // Low 16-bit section relative reference (used for >32k TLS)
+const word COFF_IMAGE_REL_PPC_SECRELHI          = 0x0014;  // High 16-bit section relative reference (used for >32k TLS)
+const word COFF_IMAGE_REL_PPC_GPREL             = 0x0015;
+
+const word COFF_IMAGE_REL_PPC_TYPEMASK          = 0x00FF;  // mask to isolate above values in IMAGE_RELOCATION.Type
+
+// Flag bits in IMAGE_RELOCATION.TYPE
+
+const word COFF_IMAGE_REL_PPC_NEG               = 0x0100;  // subtract reloc value rather than adding it
+const word COFF_IMAGE_REL_PPC_BRTAKEN           = 0x0200;  // fix branch prediction bit to predict branch taken
+const word COFF_IMAGE_REL_PPC_BRNTAKEN          = 0x0400;  // fix branch prediction bit to predict branch not taken
+const word COFF_IMAGE_REL_PPC_TOCDEFN           = 0x0800;  // toc slot defined in file (or, data in toc)
+
+//
+// Hitachi SH3 relocation types.
+//
+const word COFF_IMAGE_REL_SH3_ABSOLUTE          = 0x0000;  // No relocation
+const word COFF_IMAGE_REL_SH3_DIRECT16          = 0x0001;  // 16 bit direct
+const word COFF_IMAGE_REL_SH3_DIRECT32          = 0x0002;  // 32 bit direct
+const word COFF_IMAGE_REL_SH3_DIRECT8           = 0x0003;  // 8 bit direct, -128..255
+const word COFF_IMAGE_REL_SH3_DIRECT8_WORD      = 0x0004;  // 8 bit direct .W (0 ext.)
+const word COFF_IMAGE_REL_SH3_DIRECT8_LONG      = 0x0005;  // 8 bit direct .L (0 ext.)
+const word COFF_IMAGE_REL_SH3_DIRECT4           = 0x0006;  // 4 bit direct (0 ext.)
+const word COFF_IMAGE_REL_SH3_DIRECT4_WORD      = 0x0007;  // 4 bit direct .W (0 ext.)
+const word COFF_IMAGE_REL_SH3_DIRECT4_LONG      = 0x0008;  // 4 bit direct .L (0 ext.)
+const word COFF_IMAGE_REL_SH3_PCREL8_WORD       = 0x0009;  // 8 bit PC relative .W
+const word COFF_IMAGE_REL_SH3_PCREL8_LONG       = 0x000A;  // 8 bit PC relative .L
+const word COFF_IMAGE_REL_SH3_PCREL12_WORD      = 0x000B;  // 12 LSB PC relative .W
+const word COFF_IMAGE_REL_SH3_STARTOF_SECTION   = 0x000C;  // Start of EXE section
+const word COFF_IMAGE_REL_SH3_SIZEOF_SECTION    = 0x000D;  // Size of EXE section
+const word COFF_IMAGE_REL_SH3_SECTION           = 0x000E;  // Section table index
+const word COFF_IMAGE_REL_SH3_SECREL            = 0x000F;  // Offset within section
+const word COFF_IMAGE_REL_SH3_DIRECT32_NB       = 0x0010;  // 32 bit direct not based
+
+const word COFF_IMAGE_REL_ARM_ABSOLUTE          = 0x0000;  // No relocation required
+const word COFF_IMAGE_REL_ARM_ADDR32            = 0x0001;  // 32 bit address
+const word COFF_IMAGE_REL_ARM_ADDR32NB          = 0x0002;  // 32 bit address w/o image base
+const word COFF_IMAGE_REL_ARM_BRANCH24          = 0x0003;  // 24 bit offset << 2 & sign ext.
+const word COFF_IMAGE_REL_ARM_BRANCH11          = 0x0004;  // Thumb: 2 11 bit offsets
+const word COFF_IMAGE_REL_ARM_SECTION           = 0x000E;  // Section table index
+const word COFF_IMAGE_REL_ARM_SECREL            = 0x000F;  // Offset within section
+
+//
+// IA64 relocation types.
+//
+
+const word COFF_IMAGE_REL_IA64_ABSOLUTE         = 0x0000;
+const word COFF_IMAGE_REL_IA64_IMM14            = 0x0001;
+const word COFF_IMAGE_REL_IA64_IMM22            = 0x0002;
+const word COFF_IMAGE_REL_IA64_IMM64            = 0x0003;
+const word COFF_IMAGE_REL_IA64_DIR32            = 0x0004;
+const word COFF_IMAGE_REL_IA64_DIR64            = 0x0005;
+const word COFF_IMAGE_REL_IA64_PCREL21B         = 0x0006;
+const word COFF_IMAGE_REL_IA64_PCREL21M         = 0x0007;
+const word COFF_IMAGE_REL_IA64_PCREL21F         = 0x0008;
+const word COFF_IMAGE_REL_IA64_GPREL22          = 0x0009;
+const word COFF_IMAGE_REL_IA64_LTOFF22          = 0x000A;
+const word COFF_IMAGE_REL_IA64_SECTION          = 0x000B;
+const word COFF_IMAGE_REL_IA64_SECREL22         = 0x000C;
+const word COFF_IMAGE_REL_IA64_SECREL64I        = 0x000D;
+const word COFF_IMAGE_REL_IA64_SECREL32         = 0x000E;
+const word COFF_IMAGE_REL_IA64_LTOFF64          = 0x000F;
+const word COFF_IMAGE_REL_IA64_DIR32NB          = 0x0010;
+const word COFF_IMAGE_REL_IA64_RESERVED_11      = 0x0011;
+const word COFF_IMAGE_REL_IA64_RESERVED_12      = 0x0012;
+const word COFF_IMAGE_REL_IA64_RESERVED_13      = 0x0013;
+const word COFF_IMAGE_REL_IA64_RESERVED_14      = 0x0014;
+const word COFF_IMAGE_REL_IA64_RESERVED_15      = 0x0015;
+const word COFF_IMAGE_REL_IA64_RESERVED_16      = 0x0016;
+const word COFF_IMAGE_REL_IA64_ADDEND           = 0x001F;
+
+const word COFF_IMAGE_REL_BASED_ABSOLUTE       = 0;
+const word COFF_IMAGE_REL_BASED_HIGH           = 1;
+const word COFF_IMAGE_REL_BASED_LOW            = 2;
+const word COFF_IMAGE_REL_BASED_HIGHLOW        = 3;
+const word COFF_IMAGE_REL_BASED_HIGHADJ        = 4;
+const word COFF_IMAGE_REL_BASED_MIPS_JMPADDR   = 5;
+const word COFF_IMAGE_REL_BASED_SECTION        = 6;
+const word COFF_IMAGE_REL_BASED_REL32          = 7;
+
+const word COFF_IMAGE_REL_BASED_MIPS_JMPADDR16 = 9;
+const word COFF_IMAGE_REL_BASED_IA64_IMM64     = 9;
+const word COFF_IMAGE_REL_BASED_DIR64          = 10;
+const word COFF_IMAGE_REL_BASED_HIGH3ADJ       = 11;
+
+const int COFF_IMAGE_DIRECTORY_ENTRY_EXPORT         =  0;   // Export Directory
+const int COFF_IMAGE_DIRECTORY_ENTRY_IMPORT         =  1;   // Import Directory
+const int COFF_IMAGE_DIRECTORY_ENTRY_RESOURCE       =  2;   // Resource Directory
+const int COFF_IMAGE_DIRECTORY_ENTRY_EXCEPTION      =  3;   // Exception Directory
+const int COFF_IMAGE_DIRECTORY_ENTRY_SECURITY       =  4;   // Security Directory
+const int COFF_IMAGE_DIRECTORY_ENTRY_BASERELOC      =  5;   // Base Relocation Table
+const int COFF_IMAGE_DIRECTORY_ENTRY_DEBUG          =  6;   // Debug Directory
+//        COFF_IMAGE_DIRECTORY_ENTRY_COPYRIGHT      =  7;   // (X86 usage)
+const int COFF_IMAGE_DIRECTORY_ENTRY_ARCHITECTURE   =  7;   // Architecture Specific Data
+const int COFF_IMAGE_DIRECTORY_ENTRY_GLOBALPTR      =  8;   // RVA of GP
+const int COFF_IMAGE_DIRECTORY_ENTRY_TLS            =  9;   // TLS Directory
+const int COFF_IMAGE_DIRECTORY_ENTRY_LOAD_CONFIG    = 10;   // Load Configuration Directory
+const int COFF_IMAGE_DIRECTORY_ENTRY_BOUND_IMPORT   = 11;   // Bound Import Directory in headers
+const int COFF_IMAGE_DIRECTORY_ENTRY_IAT            = 12;   // Import Address Table
+const int COFF_IMAGE_DIRECTORY_ENTRY_DELAY_IMPORT   = 13;   // Delay Load Import Descriptors
+const int COFF_IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR = 14;   // COM Runtime descriptor
+
+struct COFF_IMAGE_RESOURCE_DIRECTORY
+{
+	dword   Characteristics;
+	dword   TimeDateStamp;
+	word    MajorVersion;
+	word    MinorVersion;
+	word    NumberOfNamedEntries;
+	word    NumberOfIdEntries;
+//  IMAGE_RESOURCE_DIRECTORY_ENTRY DirectoryEntries[];
+}
+#ifdef COMPILER_GCC
+__attribute__((packed))
+#endif
+;
+
+struct COFF_IMAGE_RESOURCE_DIRECTORY_ENTRY
+{
+	union {
+		struct {
+			dword NameOffset:31;
+			dword NameIsString:1;
+		};
+		dword   Name;
+		word    Id;
+	};
+	union {
+		dword   OffsetToData;
+		struct {
+			dword   OffsetToDirectory:31;
+			dword   DataIsDirectory:1;
+		};
+	};
+}
+#ifdef COMPILER_GCC
+__attribute__((packed))
+#endif
+;
+
+struct COFF_IMAGE_RESOURCE_DATA_ENTRY
+{
+	dword   OffsetToData;
+	dword   Size;
+	dword   CodePage;
+	dword   Reserved;
+}
+#ifdef COMPILER_GCC
+__attribute__((packed))
+#endif
+;
+
+#define COFF_IMAGE_RESOURCE_NAME_IS_STRING        0x80000000
+#define COFF_IMAGE_RESOURCE_DATA_IS_DIRECTORY     0x80000000
+
+// GNU stab-specific information
+
+/* Stabs entries use a 12 byte format:
+     4 byte string table index
+     1 byte stab type
+     1 byte stab other field
+     2 byte stab desc field
+     4 byte stab value
+   FIXME: This will have to change for a 64 bit object format.
+
+   The stabs symbols are divided into compilation units.  For the
+   first entry in each unit, the type of 0, the value is the length of
+   the string table for this unit, and the desc field is the number of
+   stabs symbols for this unit.  */
+
+const int STAB_STRDXOFF = 0;
+const int STAB_TYPEOFF  = 4;
+const int STAB_OTHEROFF = 5;
+const int STAB_DESCOFF  = 6;
+const int STAB_VALOFF   = 8;
+const int STAB_STABSIZE = 12;
+
+struct STAB_INFO : Moveable<STAB_INFO>
+{
+	int  strdx;
+	byte type;
+	byte other;
+	word desc;
+	int  value;
+}
+#ifdef COMPILER_GCC
+__attribute__((packed))
+#endif
+;
+
+#define __define_stab(NAME, CODE, STRING) NAME=CODE,
+#define __define_stab_duplicate(NAME, CODE, STRING) NAME=CODE,
+
+enum STAB_DEBUG_CODE
+{
+#include "stab.def"
+LAST_UNUSED_STAB_CODE
+};
+
+#undef __define_stab
+
+/* Definitions of "desc" field for N_SO stabs in Solaris2.  */
+
+const int STAB_N_SO_AS      = 1;
+const int STAB_N_SO_C       = 2;
+const int STAB_N_SO_ANSI_C  = 3;
+const int STAB_N_SO_CC      = 4; /* C++ */
+const int STAB_N_SO_FORTRAN = 5;
+const int STAB_N_SO_PASCAL  = 6;
+
+/* Solaris2: Floating point type values in basic types.  */
+
+const int STAB_NF_NONE      = 0;
+const int STAB_NF_SINGLE    = 1; /* IEEE 32-bit */
+const int STAB_NF_DOUBLE    = 2; /* IEEE 64-bit */
+const int STAB_NF_COMPLEX   = 3; /* Fortran complex */
+const int STAB_NF_COMPLEX16 = 4; /* Fortran double complex */
+const int STAB_NF_COMPLEX32 = 5; /* Fortran complex*16 */
+const int STAB_NF_LDOUBLE   = 6; /* Long double (whatever that is) */
+
+#ifdef COMPILER_MSC
+#pragma pack(pop)
+#endif
+
+String COFFSymbolName(const COFF_IMAGE_SYMBOL& sym, const char *strtbl);
+
+#endif
diff --git a/uppsrc/coff/imagehlp.dli b/uppsrc/coff/imagehlp.dli
new file mode 100644
index 000000000..2320a0229
--- /dev/null
+++ b/uppsrc/coff/imagehlp.dli
@@ -0,0 +1 @@
+FN_C(DWORD, __stdcall, UnDecorateSymbolName, (PCSTR dn,  PSTR udn, DWORD len, DWORD Flags))
diff --git a/uppsrc/coff/init b/uppsrc/coff/init
new file mode 100644
index 000000000..f55c3975e
--- /dev/null
+++ b/uppsrc/coff/init
@@ -0,0 +1,4 @@
+#ifndef _coff_icpp_init_stub
+#define _coff_icpp_init_stub
+#include "Core/init"
+#endif
diff --git a/uppsrc/coff/lib.cpp b/uppsrc/coff/lib.cpp
new file mode 100644
index 000000000..2c5e57969
--- /dev/null
+++ b/uppsrc/coff/lib.cpp
@@ -0,0 +1,341 @@
+#include "coff.h"
+
+NAMESPACE_UPP
+
+#ifdef PLATFORM_WIN32
+
+enum { HEADER_SIZE = sizeof(COFF_IMAGE_ARCHIVE_MEMBER_HEADER) };
+
+static double ToLibraryTime(Time time)
+{
+	if(IsNull(time))
+		return Null;
+	SYSTEMTIME tm, tb;
+	Zero(tm); Zero(tb);
+	tm.wYear   = time.year;   tb.wYear   = 1970;
+	tm.wMonth  = time.month;  tb.wMonth  = 1;
+	tm.wDay    = time.day;    tb.wDay    = 1;
+	tm.wHour   = time.hour;   tb.wHour   = 2;
+	tm.wMinute = time.minute;
+	tm.wSecond = time.second;
+	FileTime /*ftl,*/ ftg;
+	SystemTimeToFileTime(&tm, &ftg);
+//	LocalFileTimeToFileTime(&ftl, &ftg);
+	FileTime fbl, fbg;
+	SystemTimeToFileTime(&tb, &fbl);
+	LocalFileTimeToFileTime(&fbl, &fbg);
+#ifdef PLATFORM_WIN32
+	int64 tg = ftg.dwLowDateTime + (int64(1) << 32) * ftg.dwHighDateTime;
+	int64 bg = fbg.dwLowDateTime + (int64(1) << 32) * fbg.dwHighDateTime;
+	return (double)((tg - bg) / 10000000);
+#else
+	return tg - bg;
+#endif
+}
+
+ArchiveJob::Object::Object(ArchiveJob& archive, int index, String fn, String od, double ft, int ho, bool nf)
+: archive(archive), index(index), filename(fn), object_data(od), filetime(ft), header_offset(ho), newfile(nf)
+{
+	trimmed_name = archive.TrimObjectName(filename);
+	longname_offset = -1;
+	header_offset = -1;
+}
+
+void ArchiveJob::Object::ReadObject()
+{
+	if(archive.verbose)
+		PutStdOut(NFormat("%s: reading object file (%d B)", filename, object_data.GetLength()));
+	const byte *begin = object_data;
+
+ 	const COFF_IMAGE_FILE_HEADER *header = (const COFF_IMAGE_FILE_HEADER *)begin;
+	const COFF_IMAGE_SYMBOL *symtbl = (const COFF_IMAGE_SYMBOL *)(begin + header->PointerToSymbolTable), *symptr = symtbl;
+	const char *strtbl = (const char *)(symtbl + header->NumberOfSymbols);
+	for(int i = 0; i < (int)header->NumberOfSymbols; i++, symptr++)
+	{
+		if(symptr->StorageClass == COFF_IMAGE_SYM_CLASS_STATIC && symptr->SectionNumber != 0
+		&& symptr->Value == 0 && symptr->NumberOfAuxSymbols >= 1)
+			; // ignore section symbols
+		else if((symptr->StorageClass == COFF_IMAGE_SYM_CLASS_EXTERNAL || symptr->StorageClass == COFF_IMAGE_SYM_CLASS_STATIC)
+		&& (symptr->SectionNumber != 0 || symptr->Value != 0))
+			archive.AddGlobal(index, COFFSymbolName(*symptr, strtbl));
+		i += symptr->NumberOfAuxSymbols;
+		symptr += symptr->NumberOfAuxSymbols;
+	}
+}
+
+ArchiveJob::ArchiveJob()
+{
+	keep_object_paths = false;
+	use_existing_archive = true;
+	trim_longname_objects = false;
+	skip_duplicates = true;
+	verbose = false;
+#if defined(CPU_IA32)
+	machine = COFF_IMAGE_FILE_MACHINE_I386;
+#else
+	machine = COFF_IMAGE_FILE_MACHINE_UNKNOWN;
+#endif
+}
+
+void ArchiveJob::LoadFile(String file)
+{
+	FileMapping mapping;
+	if(!mapping.Open(file))
+		throw Exc(NFormat("%s: file failed to open", file));
+	objects[AddObject(file, mapping.GetData(0, (dword)mapping.GetFileSize()), mapping.GetTime())].ReadObject();
+}
+
+int ArchiveJob::AddObject(String filename, String object_data, Time filetime)
+{
+	return objects.Add(new Object(*this, objects.GetCount(), filename, object_data,
+		ToLibraryTime(filetime), -1, true)).index;
+}
+
+void ArchiveJob::LoadLibrary(String libfile)
+{
+	FileMapping mapping;
+	if(!mapping.Open(libfile))
+	{
+		if(archive_must_exist)
+			throw Exc(NFormat("%s: archive file failed to open", libfile));
+		if(use_existing_archive && verbose)
+			PutStdOut(NFormat("%s: archive not found", libfile));
+		return;
+	}
+	if(memcmp(~mapping, "!<arch>\n", 8))
+		throw Exc(NFormat("%s: not a valid library file (missing !<arch>\\n header)", libfile));
+	if(verbose)
+		PutStdOut(NFormat("%s: reading archive (%d B)", libfile, mapping.GetFileSize()));
+
+	int objcount = -1;
+	const byte *ptr = mapping.GetIter(8);
+	const byte *end = mapping.End();
+	const byte *longptr = NULL;
+	while(ptr + HEADER_SIZE <= end)
+	{
+//		if(*ptr == '\n')
+//			ptr++;
+		int offset = int(ptr - mapping.Begin());
+		COFF_IMAGE_ARCHIVE_MEMBER_HEADER hdr;
+		memcpy(&hdr, ptr, sizeof(hdr));
+		ptr += sizeof(hdr);
+		int size = atoi((const char *)hdr.Size);
+		const byte *brk = ptr + ((size + 1) & -2);
+		if(hdr.Name[0] == '/' && hdr.Name[1] == '/')
+		{ // longnames
+			longptr = ptr;
+		}
+		else if(hdr.Name[0] != '/' || hdr.Name[1] != ' ')
+		{ // object
+			const byte *nameptr, *namelim;
+			if(hdr.Name[0] != '/')
+			{
+				nameptr = hdr.Name;
+				namelim = nameptr + __countof(hdr.Name);
+			}
+			else
+			{
+				int loff = atoi((const char *)hdr.Name + 1);
+				nameptr = longptr + loff;
+				namelim = end;
+			}
+			const byte *p = nameptr;
+			while(p < namelim && *p && *p != '/')
+				p++;
+			String objname(nameptr, int(p - nameptr));
+			String objdata(ptr, size);
+			char temp[13];
+			memcpy(temp, hdr.Date, 12);
+			temp[12] = 0;
+			double membertime = ScanDouble(temp);
+			const COFF_IMPORT_OBJECT_HEADER *imphdr = (const COFF_IMPORT_OBJECT_HEADER *)ptr;
+			int oindex = objects.GetCount();
+			if(skip_duplicates && FindObject(objname) >= 0)
+			{
+				if(verbose)
+					PutStdOut(NFormat("%s: skipping object '%s' (inserting object with the same name)", libfile, objname));
+			}
+			else
+			{
+				if(imphdr->Sig1 == 0 && imphdr->Sig2 == 0xFFFF)
+				{
+					if(imphdr->Machine != machine)
+						throw Exc(NFormat("%s:%s: invalid machine type (%d) in import library module",
+							libfile, objname, imphdr->Machine));
+					const char *pname = (const char *)ptr + sizeof(COFF_IMPORT_OBJECT_HEADER);
+					AddGlobal(oindex, pname);
+					objects.Add(new Object(*this, oindex, objname, objdata, membertime, offset, false));
+				}
+				else
+					objects.Add(new Object(*this, oindex, objname, objdata, membertime, offset, false)).ReadObject();
+			}
+		}
+		ptr = brk;
+	}
+}
+
+String ArchiveJob::TrimObjectName(String objname) const
+{
+	String out = objname;
+	if(!keep_object_paths)
+		out = GetFileName(out);
+	out = ToLower(out);
+	if(trim_longname_objects && out.GetLength() > 15)
+	{
+		for(int f; out.GetLength() > 15 && ((f = out.Find('/')) >= 0 || (f = out.Find('\\')) >= 0); out.Remove(0, f + 1))
+			;
+		if(out.GetLength() > 15)
+			out.Trim(15);
+	}
+	return out;
+}
+
+int ArchiveJob::FindObject(String objname) const
+{
+	return FindFieldIndex(objects, &Object::trimmed_name, TrimObjectName(objname));
+}
+
+void ArchiveJob::BuildLibrary(String libfile, bool keep_archive_backups)
+{
+	SortGlobals();
+	BuildSymbolIndex();
+	BuildLongNameIndex();
+	CalcArchiveOffsets();
+	WriteArchive(libfile, keep_archive_backups);
+}
+
+void ArchiveJob::AddGlobal(int object, String symbol)
+{
+	if(symbol_names.FindAdd(symbol) >= symbol_objects.GetCount())
+		symbol_objects.Add(object);
+}
+
+void ArchiveJob::SortGlobals()
+{
+	Vector<String> symn = symbol_names.PickKeys();
+	IndexSort(symn, symbol_objects, StdLess<String>());
+	symbol_names = symn;
+}
+
+void ArchiveJob::BuildLongNameIndex()
+{
+	for(int i = 0; i < objects.GetCount(); i++)
+	{
+		String n = objects[i].trimmed_name;
+		if(n.GetLength() >= 16)
+		{
+			objects[i].longname_offset = longnames.GetLength();
+			longnames.Cat(n, n.GetLength() + 1);
+		}
+	}
+}
+
+void ArchiveJob::BuildSymbolIndex()
+{
+	for(int i = 0; i < symbol_names.GetCount(); i++)
+		symbolnames.Cat(symbol_names[i], symbol_names[i].GetLength() + 1);
+}
+
+void ArchiveJob::CalcArchiveOffsets()
+{
+	first_index_offset = 8; // header length
+	first_index_datasize = 4 + 4 * symbol_names.GetCount() + symbolnames.GetLength();
+	second_index_offset = first_index_offset + HEADER_SIZE + ((first_index_datasize + 1) & -2);
+	second_index_datasize = 4 + 4 * objects.GetCount() + 4 + 2 * symbol_names.GetCount() + symbolnames.GetLength();
+	longnames_offset = second_index_offset + HEADER_SIZE + ((second_index_datasize + 1) & -2);
+	archive_length = longnames_offset + HEADER_SIZE + ((longnames.GetLength() + 1) & -2);
+	for(int i = 0; i < objects.GetCount(); i++)
+	{
+		objects[i].header_offset = archive_length;
+		archive_length += HEADER_SIZE + ((objects[i].object_data.GetLength() + 1) & -2);
+	}
+}
+
+static void WriteMemberHeader(byte *out, String name, int longname_offset, double time, int size)
+{
+	memset(out, ' ', sizeof(COFF_IMAGE_ARCHIVE_MEMBER_HEADER));
+	if(longname_offset < 0)
+	{
+		memcpy(out, name, name.GetLength());
+		out[name.GetLength()] = '/';
+	}
+	else
+	{
+		String tmp = FormatInt(longname_offset);
+		out[0] = '/';
+		memcpy(out + 1, tmp, tmp.GetLength());
+	}
+	String tmp = FormatDoubleFix(time, 0);
+	memcpy(out + 16, tmp, min(tmp.GetLength(), 12));
+	out[28] = '0';
+	out[34] = '0';
+	memcpy(out + 40, "100666", 6);
+	tmp = FormatInt(size);
+	memcpy(out + 48, tmp, tmp.GetLength());
+	out[58] = COFF_IMAGE_ARCHIVE_END1;
+	out[59] = COFF_IMAGE_ARCHIVE_END2;
+	if(size & 1)
+		out[HEADER_SIZE + size] = COFF_IMAGE_ARCHIVE_PAD;
+}
+
+void ArchiveJob::WriteArchive(String libraryfile, bool keep_archive_backups)
+{
+	Vector<byte> archive;
+	archive.SetCount(archive_length);
+	memcpy(archive.Begin(), "!<arch>\n", 8);
+	double nulltime = ToLibraryTime(GetSysTime());
+	WriteMemberHeader(archive.GetIter(first_index_offset), "", -1, nulltime, first_index_datasize);
+	WriteMemberHeader(archive.GetIter(second_index_offset), "", -1, nulltime, second_index_datasize);
+	WriteIndex(archive.GetIter(first_index_offset + HEADER_SIZE), archive.GetIter(second_index_offset + HEADER_SIZE));
+	WriteMemberHeader(archive.GetIter(longnames_offset), "/", -1, nulltime, longnames.GetLength());
+	memcpy(archive.GetIter(longnames_offset + HEADER_SIZE), longnames, longnames.GetLength());
+	for(int i = 0; i < objects.GetCount(); i++)
+	{
+		const Object& o = objects[i];
+		WriteMemberHeader(archive.GetIter(o.header_offset), o.trimmed_name, o.longname_offset, o.filetime, o.object_data.GetLength());
+		memcpy(archive.GetIter(o.header_offset + HEADER_SIZE), o.object_data, o.object_data.GetLength());
+	}
+	String tmpfile = libraryfile + ".tmp";
+	String oldfile = libraryfile + ".old";
+	FileOut fo;
+	if(!fo.Open(tmpfile))
+		throw Exc(NFormat("%s: failed to create file", tmpfile));
+	if(verbose)
+		PutStdOut(NFormat("%s: saving updated archive (%d B)", libraryfile, archive_length));
+	fo.Put(archive.Begin(), archive_length);
+	fo.Close();
+	if(fo.IsError())
+	{
+		FileDelete(tmpfile);
+		throw Exc(NFormat("%s: error writing file", tmpfile));
+	}
+	FileDelete(oldfile);
+	FileMove(libraryfile, oldfile);
+	if(!FileMove(tmpfile, libraryfile))
+		throw Exc(NFormat("%s: error replacing %s", tmpfile, libraryfile));
+	if(!keep_archive_backups)
+		FileDelete(oldfile);
+}
+
+void ArchiveJob::WriteIndex(byte *first, byte *second)
+{
+	int nsym = symbol_names.GetCount();
+	Poke32be(first, nsym);
+	first += 4;
+	for(int i = 0; i < nsym; i++, first += 4)
+		Poke32be(first, objects[symbol_objects[i]].header_offset);
+	memcpy(first, symbolnames, symbolnames.GetLength());
+	Poke32le(second, objects.GetCount());
+	second += 4;
+	for(int i = 0; i < objects.GetCount(); i++, second += 4)
+		Poke32le(second, objects[i].header_offset);
+	Poke32le(second, nsym);
+	second += 4;
+	for(int i = 0; i < symbol_names.GetCount(); i++, second += 2)
+		Poke16le(second, symbol_objects[i] + 1);
+	memcpy(second, symbolnames, symbolnames.GetLength());
+}
+
+#endif
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/coff/lib.h b/uppsrc/coff/lib.h
new file mode 100644
index 000000000..ff1a46a96
--- /dev/null
+++ b/uppsrc/coff/lib.h
@@ -0,0 +1,88 @@
+#ifndef _coff_lib_h_
+#define _coff_lib_h_
+
+#ifdef PLATFORM_WIN32
+
+class ArchiveJob
+{
+protected:
+	class Object;
+	friend class ArchiveJob::Object;
+
+public:
+	ArchiveJob();
+
+	int            AddObject(String filename, String object_data, Time filetime);
+	void           AddGlobal(int object, String symbol);
+
+	void           SortGlobals();
+
+	void           BuildLibrary(String libfile, bool keep_archive_backups);
+
+protected:
+	void           LoadFile(String file);
+	void           LoadLibrary(String libfile);
+	int            FindObject(String objname) const;
+	String         TrimObjectName(String objname) const;
+
+	void           WriteArchive(String libfile, bool keep_archive_backups);
+
+	class Object
+	{
+	public:
+		Object(ArchiveJob& archive, int index, String filename, String objdata, double filetime, int header_offset, bool newfile);
+
+		void        ReadObject();
+
+	public:
+		ArchiveJob& archive;
+		int         index;
+
+		String      filename;
+		String      trimmed_name;
+		String      object_data;
+		double      filetime;
+		bool        newfile;
+
+		int         longname_offset;
+		int         header_offset;
+	};
+
+public:
+	int            machine;
+	bool           keep_object_paths;
+	bool           use_existing_archive;
+	bool           archive_must_exist;
+	bool           trim_longname_objects;
+	bool           skip_duplicates;
+	bool           verbose;
+	enum MODE { MODE_MSLIB, MODE_GNUAR };
+	MODE           armode;
+
+protected:
+	Array<Object>  objects;
+	Vector<String> object_names;
+
+	Vector<int>    symbol_objects;
+	Index<String>  symbol_names;
+
+	String         longnames;
+	String         symbolnames;
+
+	int            first_index_offset;
+	int            first_index_datasize;
+	int            second_index_offset;
+	int            second_index_datasize;
+	int            longnames_offset;
+	int            archive_length;
+
+private:
+	void           BuildLongNameIndex();
+	void           BuildSymbolIndex();
+	void           CalcArchiveOffsets();
+	void           WriteIndex(byte *first, byte *second);
+};
+
+#endif
+
+#endif
diff --git a/uppsrc/coff/stab.def b/uppsrc/coff/stab.def
new file mode 100644
index 000000000..e2b41915c
--- /dev/null
+++ b/uppsrc/coff/stab.def
@@ -0,0 +1,268 @@
+/* Table of DBX symbol codes for the GNU system.
+   Copyright 1988, 1991, 1992, 1993, 1994, 1996, 1998
+   Free Software Foundation, Inc.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 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 General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
+/* New stab from Solaris 2.  This uses an n_type of 0, which in a.out files
+   overlaps the N_UNDF used for ordinary symbols.  In ELF files, the
+   debug information is in a different file section, so there is no conflict.
+   This symbol's n_value gives the size of the string section associated
+   with this file.  The symbol's n_strx (relative to the just-updated
+   string section start address) gives the name of the source file,
+   e.g. "foo.c", without any path information.  The symbol's n_desc gives
+   the count of upcoming symbols associated with this file (not including
+   this one).  */
+/* __define_stab (N_UNDF, 0x00, "UNDF")  */
+
+/* Global variable.  Only the name is significant.
+   To find the address, look in the corresponding external symbol.  */
+__define_stab (N_GSYM, 0x20, "GSYM")
+
+/* Function name for BSD Fortran.  Only the name is significant.
+   To find the address, look in the corresponding external symbol.  */
+__define_stab (N_FNAME, 0x22, "FNAME")
+
+/* Function name or text-segment variable for C.  Value is its address.
+   Desc is supposedly starting line number, but GCC doesn't set it
+   and DBX seems not to miss it.  */
+__define_stab (N_FUN, 0x24, "FUN")
+
+/* Data-segment variable with internal linkage.  Value is its address.
+   "Static Sym".  */
+__define_stab (N_STSYM, 0x26, "STSYM")
+
+/* BSS-segment variable with internal linkage.  Value is its address.  */
+__define_stab (N_LCSYM, 0x28, "LCSYM")
+
+/* Name of main routine.  Only the name is significant.  */
+__define_stab (N_MAIN, 0x2a, "MAIN")
+
+/* Solaris2:  Read-only data symbols.  */
+__define_stab (N_ROSYM, 0x2c, "ROSYM")
+
+/* Global symbol in Pascal.
+   Supposedly the value is its line number; I'm skeptical.  */
+__define_stab (N_PC, 0x30, "PC")
+
+/* Number of symbols:  0, files,,funcs,lines according to Ultrix V4.0. */
+__define_stab (N_NSYMS, 0x32, "NSYMS")
+
+/* "No DST map for sym: name, ,0,type,ignored"  according to Ultrix V4.0. */
+__define_stab (N_NOMAP, 0x34, "NOMAP")
+
+/* New stab from Solaris 2.  Like N_SO, but for the object file.  Two in
+   a row provide the build directory and the relative path of the .o from it.
+   Solaris2 uses this to avoid putting the stabs info into the linked
+   executable; this stab goes into the ".stab.index" section, and the debugger
+   reads the real stabs directly from the .o files instead.  */
+__define_stab (N_OBJ, 0x38, "OBJ")
+
+/* New stab from Solaris 2.  Options for the debugger, related to the
+   source language for this module.  E.g. whether to use ANSI
+   integral promotions or traditional integral promotions.  */
+__define_stab (N_OPT, 0x3c, "OPT")
+
+/* Register variable.  Value is number of register.  */
+__define_stab (N_RSYM, 0x40, "RSYM")
+
+/* Modula-2 compilation unit.  Can someone say what info it contains?  */
+__define_stab (N_M2C, 0x42, "M2C")
+
+/* Line number in text segment.  Desc is the line number;
+   value is corresponding address.  On Solaris2, the line number is
+   relative to the start of the current function.  */
+__define_stab (N_SLINE, 0x44, "SLINE")
+
+/* Similar, for data segment.  */
+__define_stab (N_DSLINE, 0x46, "DSLINE")
+
+/* Similar, for bss segment.  */
+__define_stab (N_BSLINE, 0x48, "BSLINE")
+
+/* Sun's source-code browser stabs.  ?? Don't know what the fields are.
+   Supposedly the field is "path to associated .cb file".  THIS VALUE
+   OVERLAPS WITH N_BSLINE!  */
+__define_stab_duplicate (N_BROWS, 0x48, "BROWS")
+
+/* GNU Modula-2 definition module dependency.  Value is the modification time
+   of the definition file.  Other is non-zero if it is imported with the
+   GNU M2 keyword %INITIALIZE.  Perhaps N_M2C can be used if there
+   are enough empty fields? */
+__define_stab(N_DEFD, 0x4a, "DEFD")
+
+/* New in Solaris2.  Function start/body/end line numbers.  */
+__define_stab(N_FLINE, 0x4C, "FLINE")
+
+/* THE FOLLOWING TWO STAB VALUES CONFLICT.  Happily, one is for Modula-2
+   and one is for C++.   Still,... */
+/* GNU C++ exception variable.  Name is variable name.  */
+__define_stab (N_EHDECL, 0x50, "EHDECL")
+/* Modula2 info "for imc":  name,,0,0,0  according to Ultrix V4.0.  */
+__define_stab_duplicate (N_MOD2, 0x50, "MOD2")
+
+/* GNU C++ `catch' clause.  Value is its address.  Desc is nonzero if
+   this entry is immediately followed by a CAUGHT stab saying what exception
+   was caught.  Multiple CAUGHT stabs means that multiple exceptions
+   can be caught here.  If Desc is 0, it means all exceptions are caught
+   here.  */
+__define_stab (N_CATCH, 0x54, "CATCH")
+
+/* Structure or union element.  Value is offset in the structure.  */
+__define_stab (N_SSYM, 0x60, "SSYM")
+
+/* Solaris2:  Last stab emitted for module.  */
+__define_stab (N_ENDM, 0x62, "ENDM")
+
+/* Name of main source file.
+   Value is starting text address of the compilation.
+   If multiple N_SO's appear, the first to contain a trailing / is the
+   compilation directory.  The first to not contain a trailing / is the
+   source file name, relative to the compilation directory.  Others (perhaps
+   resulting from cfront) are ignored.
+   On Solaris2, value is undefined, but desc is a source-language code.  */
+
+__define_stab (N_SO, 0x64, "SO")
+
+/* SunPro F77:  Name of alias.  */
+__define_stab (N_ALIAS, 0x6c, "ALIAS")
+
+/* Automatic variable in the stack.  Value is offset from frame pointer.
+   Also used for type descriptions.  */
+__define_stab (N_LSYM, 0x80, "LSYM")
+
+/* Beginning of an include file.  Only Sun uses this.
+   In an object file, only the name is significant.
+   The Sun linker puts data into some of the other fields.  */
+__define_stab (N_BINCL, 0x82, "BINCL")
+
+/* Name of sub-source file (#include file).
+   Value is starting text address of the compilation.  */
+__define_stab (N_SOL, 0x84, "SOL")
+
+/* Parameter variable.  Value is offset from argument pointer.
+   (On most machines the argument pointer is the same as the frame pointer.  */
+__define_stab (N_PSYM, 0xa0, "PSYM")
+
+/* End of an include file.  No name.
+   This and N_BINCL act as brackets around the file's output.
+   In an object file, there is no significant data in this entry.
+   The Sun linker puts data into some of the fields.  */
+__define_stab (N_EINCL, 0xa2, "EINCL")
+
+/* Alternate entry point.  Value is its address.  */
+__define_stab (N_ENTRY, 0xa4, "ENTRY")
+
+/* Beginning of lexical block.
+   The desc is the nesting level in lexical blocks.
+   The value is the address of the start of the text for the block.
+   The variables declared inside the block *precede* the N_LBRAC symbol.
+   On Solaris2, the value is relative to the start of the current function.  */
+__define_stab (N_LBRAC, 0xc0, "LBRAC")
+
+/* Place holder for deleted include file.  Replaces a N_BINCL and everything
+   up to the corresponding N_EINCL.  The Sun linker generates these when
+   it finds multiple identical copies of the symbols from an include file.
+   This appears only in output from the Sun linker.  */
+__define_stab (N_EXCL, 0xc2, "EXCL")
+
+/* Modula-2 scope information.  Can someone say what info it contains?  */
+__define_stab (N_SCOPE, 0xc4, "SCOPE")
+
+/* End of a lexical block.  Desc matches the N_LBRAC's desc.
+   The value is the address of the end of the text for the block.
+   On Solaris2, the value is relative to the start of the current function.  */
+__define_stab (N_RBRAC, 0xe0, "RBRAC")
+
+/* Begin named common block.  Only the name is significant.  */
+__define_stab (N_BCOMM, 0xe2, "BCOMM")
+
+/* End named common block.  Only the name is significant
+   (and it should match the N_BCOMM).  */
+__define_stab (N_ECOMM, 0xe4, "ECOMM")
+
+/* Member of a common block; value is offset within the common block.
+   This should occur within a BCOMM/ECOMM pair.  */
+__define_stab (N_ECOML, 0xe8, "ECOML")
+
+/* Solaris2: Pascal "with" statement: type,,0,0,offset */
+__define_stab (N_WITH, 0xea, "WITH")
+
+/* These STAB's are used on Gould systems for Non-Base register symbols
+   or something like that.  FIXME.  I have assigned the values at random
+   since I don't have a Gould here.  Fixups from Gould folk welcome... */
+__define_stab (N_NBTEXT, 0xF0, "NBTEXT")
+__define_stab (N_NBDATA, 0xF2, "NBDATA")
+__define_stab (N_NBBSS,  0xF4, "NBBSS")
+__define_stab (N_NBSTS,  0xF6, "NBSTS")
+__define_stab (N_NBLCS,  0xF8, "NBLCS")
+
+/* Second symbol entry containing a length-value for the preceding entry.
+   The value is the length.  */
+__define_stab (N_LENG, 0xfe, "LENG")
+
+/* The above information, in matrix format.
+
+			STAB MATRIX
+	_________________________________________________
+	| 00 - 1F are not dbx stab symbols		|
+	| In most cases, the low bit is the EXTernal bit|
+
+	| 00 UNDEF  | 02 ABS	| 04 TEXT   | 06 DATA	|
+	| 01  |EXT  | 03  |EXT	| 05  |EXT  | 07  |EXT	|
+
+	| 08 BSS    | 0A INDR	| 0C FN_SEQ | 0E WEAKA	|
+	| 09  |EXT  | 0B 	| 0D WEAKU  | 0F WEAKT	|
+
+	| 10 WEAKD  | 12 COMM	| 14 SETA   | 16 SETT	|
+	| 11 WEAKB  | 13	| 15 	    | 17	|
+
+	| 18 SETD   | 1A SETB	| 1C SETV   | 1E WARNING|
+	| 19	    | 1B	| 1D 	    | 1F FN	|
+
+	|_______________________________________________|
+	| Debug entries with bit 01 set are unused.	|
+	| 20 GSYM   | 22 FNAME	| 24 FUN    | 26 STSYM	|
+	| 28 LCSYM  | 2A MAIN	| 2C ROSYM  | 2E	|
+	| 30 PC	    | 32 NSYMS	| 34 NOMAP  | 36	|
+	| 38 OBJ    | 3A	| 3C OPT    | 3E	|
+	| 40 RSYM   | 42 M2C	| 44 SLINE  | 46 DSLINE |
+	| 48 BSLINE*| 4A DEFD	| 4C FLINE  | 4E	|
+	| 50 EHDECL*| 52	| 54 CATCH  | 56        |
+	| 58        | 5A        | 5C        | 5E	|
+	| 60 SSYM   | 62 ENDM	| 64 SO	    | 66 	|
+	| 68 	    | 6A	| 6C ALIAS  | 6E	|
+	| 70	    | 72	| 74	    | 76	|
+	| 78	    | 7A	| 7C	    | 7E	|
+	| 80 LSYM   | 82 BINCL	| 84 SOL    | 86	|
+	| 88	    | 8A	| 8C	    | 8E	|
+	| 90	    | 92	| 94	    | 96	|
+	| 98	    | 9A	| 9C	    | 9E	|
+	| A0 PSYM   | A2 EINCL	| A4 ENTRY  | A6	|
+	| A8	    | AA	| AC	    | AE	|
+	| B0	    | B2	| B4	    | B6	|
+	| B8	    | BA	| BC	    | BE	|
+	| C0 LBRAC  | C2 EXCL	| C4 SCOPE  | C6	|
+	| C8	    | CA	| CC	    | CE	|
+	| D0	    | D2	| D4	    | D6	|
+	| D8	    | DA	| DC	    | DE	|
+	| E0 RBRAC  | E2 BCOMM	| E4 ECOMM  | E6	|
+	| E8 ECOML  | EA WITH	| EC	    | EE	|
+	| F0	    | F2	| F4	    | F6	|
+	| F8	    | FA	| FC	    | FE LENG	|
+	+-----------------------------------------------+
+ * 50 EHDECL is also MOD2.
+ * 48 BSLINE is also BROWS.
+ */
diff --git a/uppsrc/coff/uar/AUTHORS b/uppsrc/coff/uar/AUTHORS
new file mode 100644
index 000000000..408e0afa1
--- /dev/null
+++ b/uppsrc/coff/uar/AUTHORS
@@ -0,0 +1 @@
+Tomas Rylek  <rylek@volny.cz>
\ No newline at end of file
diff --git a/uppsrc/coff/uar/COPYING b/uppsrc/coff/uar/COPYING
new file mode 100644
index 000000000..33aa39102
--- /dev/null
+++ b/uppsrc/coff/uar/COPYING
@@ -0,0 +1,30 @@
+Copyright (C) 2005 Mirek Fidler, Tomas Rylek and various contributors (see AUTHORS)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to
+deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies of the Software and its Copyright notices. In addition publicly
+documented acknowledgment must be given that this software has been used if no
+source code of this software is made available publicly. This includes
+acknowledgments in either Copyright notices, Manuals, Publicity and Marketing
+documents or any documentation provided with any product containing this
+software. This License does not apply to any software that links to the
+libraries provided by this software (statically or dynamically), but only to
+the software provided.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+-----------
+
+Please see the COPYING.PLAIN for a plain-english explanation of this notice
+and it's intent.
diff --git a/uppsrc/coff/uar/COPYING-PLAIN b/uppsrc/coff/uar/COPYING-PLAIN
new file mode 100644
index 000000000..770a8132f
--- /dev/null
+++ b/uppsrc/coff/uar/COPYING-PLAIN
@@ -0,0 +1,33 @@
+Plain English Copyright Notice
+
+This file is not intended to be the actual License. The reason this file
+exists is that we here are programmers and engineers. We aren't lawyers. We
+provide licenses that we THINK say the right things, but we have our own
+intentions at heart. This is a plain-english explanation of what those
+intentions are, and if you follow them you will be within the "spirit" of
+the license.
+
+The intent is for us to enjoy writing software that is useful to us (the
+AUTHORS) and allow others to use it freely and also benefit from the work we
+put into making it. We don't want to restrict others using it. They should
+not *HAVE* to make the source code of the applications they write that
+simply link to these libraries (be that statically or dynamically), or for
+them to be limited as to what license they choose to use (be it open, closed
+or anything else). But we would like to know you are using these libraries.
+We simply would like to know that it has been useful to someone. This is why
+we ask for acknowledgement of some sort.
+
+You can do what you want with the source of this software - it doesn't
+matter. We still have it here for ourselves and it is open and free to use
+and download and play with. It can't be taken away. We don't really mind what
+you do with the source to your software. We would simply like to know that
+you are using it - especially if it makes it to a commerical product. If you
+simply e-mail all the AUTHORS (see COPYING and AUTHORS files) telling us, and
+then make sure you include a paragraph or page in the manual or in the "About.."
+box for the product with the copyright notice and state that you used this
+software, we will be very happy. If you want to contribute back modifications
+and fixes you may have made we will welcome those too with open arms (generally).
+If you want help with changes needed, ports needed or features to be added,
+arrangements can be easily made with some dialogue.
+
+Mirek Fidler <cxl@ntllib.org>
diff --git a/uppsrc/coff/uar/lib.cpp b/uppsrc/coff/uar/lib.cpp
new file mode 100644
index 000000000..3a74a059c
--- /dev/null
+++ b/uppsrc/coff/uar/lib.cpp
@@ -0,0 +1,267 @@
+#include "uar.h"
+#pragma hdrstop
+
+#include "lib.h"
+#include "version.h"
+
+UARArchiveJob::UARArchiveJob()
+{
+	dump_flags = 0;
+	delete_source_objects = false;
+	keep_archive_backups = true;
+	nologo = false;
+}
+
+String UARArchiveJob::Usage()
+{
+	return String().Cat()
+		<< NFormat("uar COFF librarian, version %d.%d.r%d, release date %`\n%s",
+		UAR_VERSION_MAJOR, UAR_VERSION_MINOR, UAR_VERSION_RELEASE, UAR_DATE, UAR_COPYRIGHT) << "\n"
+		"\n"
+		"Currently supported MS lib-compatible options:\n"
+		"\n"
+		"-out:<filename> .. name of lib file to produce\n"
+		"-list[:<filename>] .. dump library contents\n"
+		"-nologo .. suppress startup banner (ignored)\n"
+		"-machine:<one-of " << COFFMachineNames() << ">\n"
+		"-verbose .. verbose link process report\n"
+		"   (handled as a neutral, not MS-specific option)\n"
+		"\n"
+		"Currently supported GNU ar-compatible options:\n"
+		"\n"
+		"-c .. don't complain when creating new archive\n"
+		"      (automatic, warnings shown in verbose mode only)\n"
+		"-d .. remove files from archive\n"
+		"-m .. move files to archive (delete original files)\n"
+		"-p .. print archive contents\n"
+		"-q .. quick append (same as -r in uar)\n"
+		"-r .. replace & insert files in archive\n"
+		"-s .. create archive index (ignored, automatic)\n"
+		"-t .. type archive contents\n"
+		"-x .. extract archive members\n"
+		"\n"
+		"uar-specific options:\n"
+		"\n"
+		"-dumpsym .. display archive symbol table\n"
+		"-demangle .. display demangled symbol table\n"
+		;
+}
+
+void UARArchiveJob::ReadCommand(const char *cmd)
+{
+	ReadCommand(SplitCmdArgs(cmd));
+}
+
+void UARArchiveJob::ReadCommand(const Vector<String>& cmdline)
+{
+	for(int i = 0; i < cmdline.GetCount(); i++)
+	{
+		String arg = cmdline[i];
+		if(*arg == '-' || *arg == '/')
+		{
+			const char *ptr = ~arg + 1;
+			const char *end = ptr;
+			while(*end && *end != ':')
+				end++;
+			String cmd(ptr, end);
+			String lcmd = ToLower(cmd);
+			String val;
+			if(*end == ':')
+				val = end + 1;
+			bool eaten = true;
+			if(lcmd == "out" && !IsNull(val))
+				libraryfile = val;
+			else if(lcmd == "list")
+			{
+				command = CMD_PRINT;
+				printfile = val;
+			}
+			else if(lcmd == "nologo")
+				nologo = true;
+			else if(lcmd == "machine" && !IsNull(val))
+			{
+				val = ToUpper(val);
+				int m = COFFMachineCode(val);
+				if(m == COFF_IMAGE_FILE_MACHINE_UNKNOWN)
+					PutStdOut(NFormat("Unknown machine type: %s; supported machines are: %s", val, COFFMachineNames()));
+				machine = m;
+			}
+			else
+				eaten = false;
+			if(eaten)
+				armode = MODE_MSLIB;
+			else
+			{
+//				if(lcmd == "dumpobj")
+//					dump_flags |= DUMP_OBJECTS;
+				if(lcmd == "dumpsym")
+					dump_flags |= DUMP_SYMBOLS;
+				else if(lcmd == "demangle")
+					dump_flags |= DUMP_SYMBOLS | DUMP_SYMBOLS_DEMANGLED;
+				else if(lcmd == "verbose")
+					verbose = true;
+				else
+				{
+					for(const char *p = ~arg + 1; *p;)
+						switch(*p++)
+						{
+						case 'c': // don't complain when creating archive
+							if(verbose)
+								PutStdOut("option '-c' ignored (automatic)");
+							break;
+
+						case 'd': // delete files
+							command = CMD_REMOVE;
+							break;
+
+						case 'm': // move files
+							command = CMD_ADD;
+							delete_source_objects = true;
+							break;
+
+						case 'p': // print files
+							command = CMD_PRINT;
+							break;
+
+						case 'q': // quick append
+							command = CMD_ADD;
+							break;
+
+						case 'r': // replace & insert
+							command = CMD_ADD;
+							break;
+
+						case 's': // create archive index
+							if(verbose)
+								PutStdOut("option '-s' ignored (automatic)");
+							break;
+
+						case 't': // type contents
+							command = CMD_CONTENTS;
+							break;
+
+						case 'x': // extract
+							command = CMD_EXTRACT;
+							throw Exc("option '-x' not supported (yet)");
+
+						default: throw Exc(NFormat("Invalid command line option: '%s'", arg));
+						}
+
+					armode = MODE_GNUAR;
+				}
+			}
+		}
+		else if(IsNull(libraryfile))
+			libraryfile = AppendExt(arg, ".a");
+		else
+		{
+			String fn = AppendExt(arg, armode == MODE_GNUAR ? ".o" : ".obj");
+			if(command == CMD_ADD)
+				LoadFile(fn);
+			else
+				object_names.Add(fn);
+		}
+	}
+}
+
+void UARArchiveJob::Build()
+{
+	if(IsNull(libraryfile))
+		throw Exc("Archive file not specified.");
+
+	archive_must_exist = (command != CMD_ADD && use_existing_archive);
+	if(use_existing_archive)
+		LoadLibrary(libraryfile);
+
+	SortGlobals();
+
+	if(dump_flags & DUMP_SYMBOLS)
+	{
+		PutStdOut(NFormat("%d symbol(s) in %d object file(s)", symbol_names.GetCount(), objects.GetCount()));
+		PutStdOut("Object          Symbol");
+		for(int i = 0; i < symbol_names.GetCount(); i++)
+		{
+			String symname = symbol_names[i];
+			if(dump_flags & DUMP_SYMBOLS_DEMANGLED)
+				symname = DemangleName(symname, armode == MODE_MSLIB ? MANGLING_MSC : MANGLING_GCC);
+			PutStdOut(NFormat("%15<s %s", objects[symbol_objects[i]].trimmed_name, symname));
+		}
+	}
+
+	if(command == CMD_CONTENTS || command == CMD_PRINT)
+	{
+		Print();
+		return;
+	}
+
+	if(command == CMD_EXTRACT)
+	{
+		Extract();
+		return;
+	}
+
+	if(command == CMD_REMOVE)
+		Remove();
+
+	if(objects.IsEmpty())
+		PutStdOut(NFormat("%s: empty archive", libraryfile));
+
+	BuildLibrary(libraryfile, keep_archive_backups);
+	if(delete_source_objects) {
+		if(verbose)
+			PutStdOut("Deleting source objects:");
+		for(int i = 0; i < objects.GetCount(); i++)
+			if(objects[i].newfile) {
+				String fn = objects[i].filename;
+				if(verbose)
+					PutStdOut(NFormat("%d: deleting object file", fn));
+				if(!FileDelete(fn))
+					PutStdOut(NFormat("%s: error deleting file", fn));
+			}
+	}
+}
+
+void UARArchiveJob::Remove()
+{
+	for(int i = 0; i < object_names.GetCount(); i++)
+	{
+		String n = TrimObjectName(object_names[i]);
+		int t = FindFieldIndex(objects, &Object::trimmed_name, n);
+		if(t >= 0)
+			objects.Remove(t);
+		else
+			PutStdOut(NFormat("%s: not found in archive (trimmed name = %s)", object_names[i], n));
+	}
+}
+
+void UARArchiveJob::Extract()
+{
+	for(int i = 0; i < object_names.GetCount(); i++)
+	{
+		String fn = object_names[i], n = TrimObjectName(fn);
+		int t = FindFieldIndex(objects, &Object::trimmed_name, n);
+		if(t >= 0)
+		{
+			if(!SaveFile(fn, objects[t].object_data))
+				throw Exc(NFormat("%s: error writing extracted file (trimmed name = %s)", fn, n));
+			if(verbose)
+				PutStdOut(NFormat("%s: extracted member %s (%d B)", fn, n, objects[t].object_data.GetLength()));
+		}
+		else
+			PutStdOut(NFormat("%s: not found in archive (trimmed name = %s)", fn, n));
+	}
+}
+
+void UARArchiveJob::Print()
+{
+	PutStdOut("Offset  Size   Time     Object");
+	for(int i = 0; i < objects.GetCount(); i++)
+	{
+		const Object& o = objects[i];
+		PutStdOut(NFormat("%10>d %10>d %12>0n %s", o.header_offset, o.object_data.GetLength(), o.filetime, o.filename));
+		if(command == CMD_PRINT)
+			for(int s = 0; s < symbol_names.GetCount(); s++)
+				if(symbol_objects[s] == i)
+					PutStdOut("\t" + symbol_names[s]);
+	}
+}
diff --git a/uppsrc/coff/uar/lib.h b/uppsrc/coff/uar/lib.h
new file mode 100644
index 000000000..af0b01c40
--- /dev/null
+++ b/uppsrc/coff/uar/lib.h
@@ -0,0 +1,38 @@
+#ifndef _coff_uar_lib_h_
+#define _coff_uar_lib_h_
+
+class UARArchiveJob : public ArchiveJob
+{
+public:
+	UARArchiveJob();
+
+	static String  Usage();
+
+	void           ReadCommand(const char *cmd);
+	void           ReadCommand(const Vector<String>& cmdline);
+
+	void           Build();
+
+private:
+	void           Print();
+	void           Extract();
+	void           Remove();
+
+private:
+	enum
+	{
+		DUMP_SYMBOLS           = 0x00000001,
+		DUMP_SYMBOLS_DEMANGLED = 0x00000004,
+	};
+	int            dump_flags;
+	enum COMMAND { CMD_ADD, CMD_REMOVE, CMD_EXTRACT, CMD_CONTENTS, CMD_PRINT };
+	COMMAND        command;
+
+	String         libraryfile;
+	String         printfile;
+	bool           delete_source_objects;
+	bool           keep_archive_backups;
+	bool           nologo;
+};
+
+#endif
diff --git a/uppsrc/coff/uar/main.cpp b/uppsrc/coff/uar/main.cpp
new file mode 100644
index 000000000..3bef43a50
--- /dev/null
+++ b/uppsrc/coff/uar/main.cpp
@@ -0,0 +1,91 @@
+#include "uar.h"
+#pragma hdrstop
+
+#include "lib.h"
+
+static void TryMain()
+{
+#ifndef flagTEST
+	if(CommandLine().IsEmpty())
+	{
+		PutStdOut(UARArchiveJob::Usage());
+		return;
+	}
+#endif
+
+	UARArchiveJob archjob;
+	archjob.ReadCommand(
+#ifdef flagTEST
+
+"-sr "
+"\"C:/upp0802/out/CtrlLib/MINGW.Gui\\CtrlLib.a\" "
+"\"C:/upp0802/out/CtrlLib/MINGW.Gui\\LabelBase.o\" "
+"\"C:/upp0802/out/CtrlLib/MINGW.Gui\\Button.o\" "
+"\"C:/upp0802/out/CtrlLib/MINGW.Gui\\Switch.o\" "
+"\"C:/upp0802/out/CtrlLib/MINGW.Gui\\EditField.o\" "
+"\"C:/upp0802/out/CtrlLib/MINGW.Gui\\Text.o\" "
+"\"C:/upp0802/out/CtrlLib/MINGW.Gui\\LineEdit.o\" "
+"\"C:/upp0802/out/CtrlLib/MINGW.Gui\\DocEdit.o\" "
+"\"C:/upp0802/out/CtrlLib/MINGW.Gui\\ScrollBar.o\" "
+"\"C:/upp0802/out/CtrlLib/MINGW.Gui\\HeaderCtrl.o\" "
+"\"C:/upp0802/out/CtrlLib/MINGW.Gui\\ArrayCtrl.o\" "
+"\"C:/upp0802/out/CtrlLib/MINGW.Gui\\MultiButton.o\" "
+"\"C:/upp0802/out/CtrlLib/MINGW.Gui\\PopupTable.o\" "
+"\"C:/upp0802/out/CtrlLib/MINGW.Gui\\DropList.o\" "
+"\"C:/upp0802/out/CtrlLib/MINGW.Gui\\DropChoice.o\" "
+"\"C:/upp0802/out/CtrlLib/MINGW.Gui\\Static.o\" "
+"\"C:/upp0802/out/CtrlLib/MINGW.Gui\\Splitter.o\" "
+"\"C:/upp0802/out/CtrlLib/MINGW.Gui\\FrameSplitter.o\" "
+"\"C:/upp0802/out/CtrlLib/MINGW.Gui\\SliderCtrl.o\" "
+"\"C:/upp0802/out/CtrlLib/MINGW.Gui\\ColumnList.o\" "
+"\"C:/upp0802/out/CtrlLib/MINGW.Gui\\Progress.o\" "
+"\"C:/upp0802/out/CtrlLib/MINGW.Gui\\AKeys.o\" "
+"\"C:/upp0802/out/CtrlLib/MINGW.Gui\\RichTextView.o\" "
+"\"C:/upp0802/out/CtrlLib/MINGW.Gui\\Prompt.o\" "
+"\"C:/upp0802/out/CtrlLib/MINGW.Gui\\Help.o\" "
+"\"C:/upp0802/out/CtrlLib/MINGW.Gui\\DateTimeCtrl.o\" "
+"\"C:/upp0802/out/CtrlLib/MINGW.Gui\\Bar.o\" "
+"\"C:/upp0802/out/CtrlLib/MINGW.Gui\\MenuItem.o\" "
+"\"C:/upp0802/out/CtrlLib/MINGW.Gui\\MenuBar.o\" "
+"\"C:/upp0802/out/CtrlLib/MINGW.Gui\\ToolButton.o\" "
+"\"C:/upp0802/out/CtrlLib/MINGW.Gui\\ToolBar.o\" "
+"\"C:/upp0802/out/CtrlLib/MINGW.Gui\\ToolTip.o\" "
+"\"C:/upp0802/out/CtrlLib/MINGW.Gui\\StatusBar.o\" "
+"\"C:/upp0802/out/CtrlLib/MINGW.Gui\\TabCtrl.o\" "
+"\"C:/upp0802/out/CtrlLib/MINGW.Gui\\TreeCtrl.o\" "
+"\"C:/upp0802/out/CtrlLib/MINGW.Gui\\DlgColor.o\" "
+"\"C:/upp0802/out/CtrlLib/MINGW.Gui\\ColorPopup.o\" "
+"\"C:/upp0802/out/CtrlLib/MINGW.Gui\\ColorPusher.o\" "
+"\"C:/upp0802/out/CtrlLib/MINGW.Gui\\FileList.o\" "
+"\"C:/upp0802/out/CtrlLib/MINGW.Gui\\FileSel.o\" "
+"\"C:/upp0802/out/CtrlLib/MINGW.Gui\\PrinterJob.o\" "
+"\"C:/upp0802/out/CtrlLib/MINGW.Gui\\Windows.o\" "
+"\"C:/upp0802/out/CtrlLib/MINGW.Gui\\Win32.o\" "
+"\"C:/upp0802/out/CtrlLib/MINGW.Gui\\TrayIconWin32.o\" "
+"\"C:/upp0802/out/CtrlLib/MINGW.Gui\\TrayIconX11.o\" "
+"\"C:/upp0802/out/CtrlLib/MINGW.Gui\\CtrlUtil.o\" "
+"\"C:/upp0802/out/CtrlLib/MINGW.Gui\\Update.o\" "
+"\"C:/upp0802/out/CtrlLib/MINGW.Gui\\LNGCtrl.o\" "
+"\"C:/upp0802/out/CtrlLib/MINGW.Gui\\Ch.o\" "
+"\"C:/upp0802/out/CtrlLib/MINGW.Gui\\ChWin32.o\" "
+"\"C:/upp0802/out/CtrlLib/MINGW.Gui\\ChGtk.o\" "
+
+#else
+	CommandLine()
+#endif
+	);
+	archjob.Build();
+}
+
+CONSOLE_APP_MAIN
+{
+	try
+	{
+		TryMain();
+	}
+	catch(Exc e)
+	{
+		puts(e);
+		SetExitCode(1);
+	}
+}
diff --git a/uppsrc/coff/uar/uar.h b/uppsrc/coff/uar/uar.h
new file mode 100644
index 000000000..d5b531818
--- /dev/null
+++ b/uppsrc/coff/uar/uar.h
@@ -0,0 +1,8 @@
+#ifndef _coff_uar_uar_h_
+#define _coff_uar_uar_h_
+
+#include <coff/coff.h>
+
+using namespace Upp;
+
+#endif
diff --git a/uppsrc/coff/uar/uar.upp b/uppsrc/coff/uar/uar.upp
new file mode 100644
index 000000000..c97621575
--- /dev/null
+++ b/uppsrc/coff/uar/uar.upp
@@ -0,0 +1,23 @@
+description "Ultimate++ COFF archiver (GNU binutils compatible, faster)";
+
+uses
+	coff;
+
+target(!DEBUG !TEST) ar.exe;
+
+link(GCC) "-Xlinker -dumpcommand";
+
+file
+	uar.h,
+	version.h,
+	lib.h,
+	lib.cpp,
+	main.cpp,
+	Info readonly separator,
+	COPYING,
+	COPYING-PLAIN,
+	AUTHORS;
+
+mainconfig
+	"" = "",
+	"" = ".TEST";
diff --git a/uppsrc/coff/uar/version.h b/uppsrc/coff/uar/version.h
new file mode 100644
index 000000000..f13c846d2
--- /dev/null
+++ b/uppsrc/coff/uar/version.h
@@ -0,0 +1,10 @@
+#ifndef _coff_uar_version_h_
+#define _coff_uar_version_h_
+
+#define UAR_VERSION_MAJOR 1
+#define UAR_VERSION_MINOR 0
+#define UAR_VERSION_RELEASE 4
+#define UAR_DATE Date(2008, 3, 25)
+#define UAR_COPYRIGHT "Copyright (c) 2003,2004,2008 Tomas Rylek"
+
+#endif
diff --git a/uppsrc/coff/uld/AUTHORS b/uppsrc/coff/uld/AUTHORS
new file mode 100644
index 000000000..408e0afa1
--- /dev/null
+++ b/uppsrc/coff/uld/AUTHORS
@@ -0,0 +1 @@
+Tomas Rylek  <rylek@volny.cz>
\ No newline at end of file
diff --git a/uppsrc/coff/uld/COPYING b/uppsrc/coff/uld/COPYING
new file mode 100644
index 000000000..33aa39102
--- /dev/null
+++ b/uppsrc/coff/uld/COPYING
@@ -0,0 +1,30 @@
+Copyright (C) 2005 Mirek Fidler, Tomas Rylek and various contributors (see AUTHORS)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to
+deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies of the Software and its Copyright notices. In addition publicly
+documented acknowledgment must be given that this software has been used if no
+source code of this software is made available publicly. This includes
+acknowledgments in either Copyright notices, Manuals, Publicity and Marketing
+documents or any documentation provided with any product containing this
+software. This License does not apply to any software that links to the
+libraries provided by this software (statically or dynamically), but only to
+the software provided.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+-----------
+
+Please see the COPYING.PLAIN for a plain-english explanation of this notice
+and it's intent.
diff --git a/uppsrc/coff/uld/COPYING-PLAIN b/uppsrc/coff/uld/COPYING-PLAIN
new file mode 100644
index 000000000..770a8132f
--- /dev/null
+++ b/uppsrc/coff/uld/COPYING-PLAIN
@@ -0,0 +1,33 @@
+Plain English Copyright Notice
+
+This file is not intended to be the actual License. The reason this file
+exists is that we here are programmers and engineers. We aren't lawyers. We
+provide licenses that we THINK say the right things, but we have our own
+intentions at heart. This is a plain-english explanation of what those
+intentions are, and if you follow them you will be within the "spirit" of
+the license.
+
+The intent is for us to enjoy writing software that is useful to us (the
+AUTHORS) and allow others to use it freely and also benefit from the work we
+put into making it. We don't want to restrict others using it. They should
+not *HAVE* to make the source code of the applications they write that
+simply link to these libraries (be that statically or dynamically), or for
+them to be limited as to what license they choose to use (be it open, closed
+or anything else). But we would like to know you are using these libraries.
+We simply would like to know that it has been useful to someone. This is why
+we ask for acknowledgement of some sort.
+
+You can do what you want with the source of this software - it doesn't
+matter. We still have it here for ourselves and it is open and free to use
+and download and play with. It can't be taken away. We don't really mind what
+you do with the source to your software. We would simply like to know that
+you are using it - especially if it makes it to a commerical product. If you
+simply e-mail all the AUTHORS (see COPYING and AUTHORS files) telling us, and
+then make sure you include a paragraph or page in the manual or in the "About.."
+box for the product with the copyright notice and state that you used this
+software, we will be very happy. If you want to contribute back modifications
+and fixes you may have made we will welcome those too with open arms (generally).
+If you want help with changes needed, ports needed or features to be added,
+arrangements can be easily made with some dialogue.
+
+Mirek Fidler <cxl@ntllib.org>
diff --git a/uppsrc/coff/uld/diff b/uppsrc/coff/uld/diff
new file mode 100644
index 000000000..76f75db95
--- /dev/null
+++ b/uppsrc/coff/uld/diff
@@ -0,0 +1,128 @@
+-------- linkjob.cpp
+[B] linkjob.err(117): 1 lines inserted
+	+verbose = false;
+[B] linkjob.err(266): 1 lines inserted
+	+"-verbose .. display additional link information\n"
+[B] linkjob.err(487): 2 lines inserted
+	+else if(lcmd == "verbose")
+	+verbose = true;
+[B] linkjob.err(682): 2 lines inserted
+	+if(verbose)
+	+PutConsole(NFormat("%s: loading object file", file));
+[B] linkjob.err(697): 2 lines inserted
+	+if(verbose)
+	+PutConsole(NFormat("%s: loading static library", file));
+[B] linkjob.err(886): 2 lines inserted
+	+if(verbose)
+	+PutConsole(NFormat("%s: loading shared library", file));
+[B] linkjob.err(1998): 2 lines inserted
+	+else if(sec_atom == rsrc_atom)
+	+sx = GRP_RSRC;
+[A] linkjob.cpp(2072): 7 lines deleted
+	-int last = groups[i + 1].first_section - 1;
+	-const Section& lastsec = section_map[last];
+	-//		const ObjectFile::Section& oflast = GetSection(lastsec.obj_sec);
+	-while(last >= first && section_map[last].obj_sec.section == 0)
+	-last--;
+	-const Section *rawsec = (last >= first ? &section_map[last] : NULL);
+	-//		const ObjectFile::Section& ofsec = GetSection(sec.obj_sec);
+[A] linkjob.cpp(2081): 1 lines replaced
+	-groups[i].raw_size = rawsec ? rawsec->rva + GetSection(rawsec->obj_sec).size - sec.rva : 0;
+[B] linkjob.err(2086): 22 replacement lines
+	+int last = groups[i + 1].first_section - 1;
+	+if(last >= first)
+	+{
+	+const Section& lastsec = section_map[last];
+	+//			if(i != GRP_UDATA)
+	+{
+	+//		const ObjectFile::Section& oflast = GetSection(lastsec.obj_sec);
+	+/*
+	+while(last >= first)
+	+{
+	+const ObjectFile::Section& ofsec = GetSection(section_map[last].obj_sec);
+	+if(ofsec.offset)
+	+break;
+	+last--;
+	+}
+	+const Section *rawsec = (last >= first ? &section_map[last] : NULL);
+	+*/
+	+//		const ObjectFile::Section& ofsec = GetSection(sec.obj_sec);
+	+//			groups[i].raw_size = rawsec ? rawsec->rva + GetSection(rawsec->obj_sec).size - sec.rva : 0;
+	+groups[i].raw_size = lastsec.rva + GetSection(lastsec.obj_sec).size - sec.rva;
+	+rfa = (rfa + groups[i].raw_size + file_align - 1) & -file_align;
+	+}
+[A] linkjob.cpp(2083): 1 lines replaced
+	-rfa = (rfa + groups[i].raw_size + file_align - 1) & -file_align;
+[B] linkjob.err(2109): 1 replacement lines
+	+}
+[A] linkjob.cpp(2492): 1 lines replaced
+	-sechdr.SizeOfRawData = 0;
+[B] linkjob.err(2518): 3 replacement lines
+	+//		sechdr.SizeOfRawData = (first.group == GRP_UDATA ? 0 : (sechdr.Misc.VirtualSize + file_align - 1) & -file_align);
+	+sechdr.SizeOfRawData = (sechdr.Misc.VirtualSize + file_align - 1) & -file_align;
+	+/*
+[A] linkjob.cpp(2496): 1 lines replaced
+	-if(chk.obj_sec.section != 0)
+[B] linkjob.err(2524): 2 replacement lines
+	+const ObjectFile::Section& ofsec = GetSection(chk.obj_sec);
+	+if(ofsec.offset)
+[A] linkjob.cpp(2498): 1 lines deleted
+	-const ObjectFile::Section& ofsec = GetSection(chk.obj_sec);
+[B] linkjob.err(2531): 2 lines inserted
+	+sechdr.SizeOfRawData = (sechdr.SizeOfRawData + file_align - 1) & -file_align;
+	+*/
+[A] linkjob.cpp(2527): 1 lines replaced
+	-stab.Misc.VirtualSize = stab.SizeOfRawData = output_stab_info.GetCount();
+[B] linkjob.err(2557): 2 replacement lines
+	+stab.Misc.VirtualSize = output_stab_info.GetCount();
+	+stab.SizeOfRawData = (stab.Misc.VirtualSize + file_align - 1) & -file_align;
+[A] linkjob.cpp(2540): 1 lines replaced
+	-stabstr.Misc.VirtualSize = stabstr.SizeOfRawData = output_stab_strings.GetCount();
+[B] linkjob.err(2571): 2 replacement lines
+	+stabstr.Misc.VirtualSize = output_stab_strings.GetCount();
+	+stabstr.SizeOfRawData = (stabstr.Misc.VirtualSize + file_align - 1) & -file_align;
+[A] linkjob.cpp(2554): 1 lines replaced
+	-sym.Misc.VirtualSize = sym.SizeOfRawData = coff_output_symbols.GetCount() * sizeof(COFF_IMAGE_SYMBOL)
+[B] linkjob.err(2586): 1 replacement lines
+	+sym.Misc.VirtualSize = coff_output_symbols.GetCount() * sizeof(COFF_IMAGE_SYMBOL)
+[B] linkjob.err(2588): 1 lines inserted
+	+sym.SizeOfRawData = (sym.Misc.VirtualSize + file_align - 1) & -file_align;
+[A] linkjob.cpp(2570): 1 lines replaced
+	-reloc.Misc.VirtualSize = reloc.SizeOfRawData = output_fixups.GetCount();
+[B] linkjob.err(2603): 2 replacement lines
+	+reloc.Misc.VirtualSize = output_fixups.GetCount();
+	+reloc.SizeOfRawData = (reloc.Misc.VirtualSize + file_align - 1) & -file_align;
+[B] linkjob.err(2722): 1 lines inserted
+	+if(verbose)
+[B] linkjob.err(3087): 5 lines inserted
+	+const ObjectFile::Section& ofsec = GetSection(sec.obj_sec);
+	+//		if(/*ofsec.type == ObjectFile::SEC_INULL ||*/ sec.group == GRP_UDATA)
+	+//			continue;
+	+if(ofsec.type == ObjectFile::SEC_ANON_COMDAT)
+	+continue;
+[A] linkjob.cpp(3053): 3 lines deleted
+	-const ObjectFile::Section& ofsec = GetSection(sec.obj_sec);
+	-if(/*ofsec.type == ObjectFile::SEC_INULL ||*/ ofsec.type == ObjectFile::SEC_ANON_COMDAT)
+	-continue;
+[A] linkjob.cpp(3058): 1 lines deleted
+	-if(ofsec.offset)
+[A] linkjob.cpp(3393): 7 lines replaced
+	-case GRP_CODE:  return "CODE";
+	-case GRP_RDATA: return "RDATA";
+	-case GRP_EDATA: return "EDATA";
+	-case GRP_IDATA: return "IDATA";
+	-case GRP_DATA:  return "DATA";
+	-case GRP_UDATA: return "BSS";
+	-case GRP_DEBUG: return "DEBUG";
+[B] linkjob.err(3429): 11 replacement lines
+	+case GRP_CODE:    return "CODE";
+	+case GRP_RDATA:   return "RDATA";
+	+case GRP_EDATA:   return "EDATA";
+	+case GRP_IDATA:   return "IDATA";
+	+case GRP_DATA:    return "DATA";
+	+case GRP_UDATA:   return "BSS";
+	+case GRP_DEBUG:   return "DEBUG";
+	+case GRP_RSRC:    return "RSRC";
+	+case GRP_STAB:    return "STAB";
+	+case GRP_STABSTR: return "STABSTR";
+	+case GRP_SYMBOLS: return "SYMBOLS";
diff --git a/uppsrc/coff/uld/dump.cpp b/uppsrc/coff/uld/dump.cpp
new file mode 100644
index 000000000..d7be56855
--- /dev/null
+++ b/uppsrc/coff/uld/dump.cpp
@@ -0,0 +1,231 @@
+#include "uld.h"
+#pragma hdrstop
+
+class FileDump
+{
+public:
+	FileDump() : dump_stabs(false), dump_globals(false) {}
+
+	void        Run(const char *fn);
+
+private:
+	void        RunCOFF();
+	void        RunSymbols(int symoff, int symcnt);
+	void        RunStab(int staboff, int stablen, int stroff, int strlen);
+
+private:
+	String      filename;
+	FileMapping mapping;
+	int         ne_offset;
+	bool        dump_stabs;
+	bool        dump_globals;
+};
+
+void FileDump::RunSymbols(int symoff, int symcnt)
+{
+	const COFF_IMAGE_SYMBOL *sym = (COFF_IMAGE_SYMBOL *)&mapping[symoff];
+	const COFF_IMAGE_SYMBOL *end = sym + symcnt;
+	const char *strtbl = (const char *)end;
+	puts(NFormat("Global symbol table (%d entries)", symcnt));
+	puts("Sect Value    Type Cl Name");
+	for(; sym < end; sym++)
+	{
+		puts(NFormat("%4>04x %08x %04x %02x %s",
+			sym->SectionNumber, (int)sym->Value, sym->Type, sym->StorageClass, COFFSymbolName(*sym, strtbl)));
+		if(sym->NumberOfAuxSymbols)
+		{
+			if(sym->StorageClass == COFF_IMAGE_SYM_CLASS_FILE)
+				puts(NFormat("\tFile: %s", (const char *)(sym + 1)));
+		}
+		sym += sym->NumberOfAuxSymbols;
+	}
+}
+
+void FileDump::RunStab(int staboff, int stablen, int stabstroff, int stabstrlen)
+{
+	int entries = stablen / STAB_STABSIZE;
+	puts(NFormat("STAB debug info (%d entries)", entries));
+	const STAB_INFO *info = (const STAB_INFO *)&mapping[staboff];
+	const char *str = (const char *)&mapping[stabstroff];
+	int counts[256], sizes[256];
+	ZeroArray(counts);
+	ZeroArray(sizes);
+	int strtotal = 0;
+	static VectorMap<String, int> old_histogram;
+	VectorMap<String, int> histogram;
+	for(int i = 0; i < entries; i++, info++)
+	{
+		counts[info->type]++;
+		int sl = strlen(str + info->strdx) + 1;
+		sizes[info->type] += sl;
+		strtotal += sl;
+		puts(NFormat("%06x %02x %02x %04x %08x %s",
+			i, info->type, info->other, info->desc, info->value, str + info->strdx));
+		String hentry = NFormat("%02x %02x %04x %08x %s", info->type, info->other, info->desc, 0/*info->value*/, str + info->strdx);
+		histogram.GetAdd(hentry, 0)++;
+	}
+	puts(NFormat("%d B, compressed %d B = %d%%",
+		strtotal, stabstrlen, 100 * (1 - stabstrlen / double(max(strtotal, 1)))));
+	for(int i = 0; i < 256; i++)
+		if(counts[i])
+			puts(NFormat("[%02x]: %6>d times, %8>d B", i, counts[i], sizes[i]));
+	puts("\nHistogram:");
+	Vector<int> order = GetSortOrder(histogram.GetValues(), StdGreater<int>());
+	for(int i = 0; i < order.GetCount(); i++)
+		puts(NFormat("%4>d * %s", histogram[order[i]], histogram.GetKey(order[i])));
+	if(!old_histogram.IsEmpty())
+	{
+		puts("\nDifferential histogram:");
+		VectorMap<String, int> diff;
+		diff <<= histogram;
+		for(int i = 0; i < old_histogram.GetCount(); i++)
+			diff.GetAdd(old_histogram.GetKey(i), 0) -= old_histogram[i];
+		for(int i = diff.GetCount(); --i >= 0;)
+			if(!diff[i])
+				diff.Remove(i);
+		order = GetSortOrder(diff.GetValues(), StdGreater<int>());
+		for(int i = 0; i < order.GetCount(); i++)
+		{
+			String key = diff.GetKey(order[i]);
+			puts(NFormat("(%4>d) %4>~d <- %4>~d * %s", diff[order[i]], histogram.Get(key, Null), old_histogram.Get(key, Null), key));
+		}
+	}
+	old_histogram = histogram;
+}
+
+void FileDump::RunCOFF()
+{
+	const COFF_IMAGE_FILE_HEADER *hdr = (const COFF_IMAGE_FILE_HEADER *)&mapping[ne_offset + 4];
+	puts(NFormat("File:                 %s", filename));
+	puts(NFormat("File size:            %d B", mapping.GetFileSize()));
+	const MachineInfo *mach = COFFMachineList();
+	while(mach->name && mach->code != hdr->Machine)
+		mach++;
+	puts(NFormat("Machine:              0x%04x (%s)", hdr->Machine, mach->name));
+	puts(NFormat("NumberOfSections:     %d", hdr->NumberOfSections));
+	time_t stamp = hdr->TimeDateStamp;
+	puts(NFormat("TimeDateStamp:        0x%08x, (%s)", (int)hdr->TimeDateStamp, asctime(localtime(&stamp))));
+	puts(NFormat("PointerToSymbolTable: 0x%08x", (int)hdr->PointerToSymbolTable));
+	puts(NFormat("NumberOfSymbols:      %d", (int)hdr->NumberOfSymbols));
+	puts(NFormat("SizeOfOptionalHeader: %d", hdr->SizeOfOptionalHeader));
+	puts(NFormat("Characteristics:      0x%08x", hdr->Characteristics));
+	if(hdr->SizeOfOptionalHeader < sizeof(COFF_IMAGE_OPTIONAL_HEADER32))
+		return;
+
+	const COFF_IMAGE_OPTIONAL_HEADER32 *opthdr = (const COFF_IMAGE_OPTIONAL_HEADER32 *)
+			&mapping[ne_offset + 4 + sizeof(COFF_IMAGE_FILE_HEADER)];
+
+	puts(NFormat("Magic:                       0x%08x", opthdr->Magic));
+	puts(NFormat("MajorLinkerVersion:          %d", opthdr->MajorLinkerVersion));
+	puts(NFormat("MinorLinkerVersion:          %d", opthdr->MinorLinkerVersion));
+	puts(NFormat("SizeOfCode:                  0x%08x", (int)opthdr->SizeOfCode));
+	puts(NFormat("SizeOfInitializedData:       0x%08x", (int)opthdr->SizeOfInitializedData));
+	puts(NFormat("SizeOfUninitializedData:     0x%08x", (int)opthdr->SizeOfUninitializedData));
+	puts(NFormat("AddressOfEntryPoint:         0x%08x", (int)opthdr->AddressOfEntryPoint));
+	puts(NFormat("BaseOfCode:                  0x%08x", (int)opthdr->BaseOfCode));
+	puts(NFormat("BaseOfData:                  0x%08x", (int)opthdr->BaseOfData));
+	puts(NFormat("ImageBase:                   0x%08x", (int)opthdr->ImageBase));
+	puts(NFormat("SectionAlignment:            0x%08x", (int)opthdr->SectionAlignment));
+	puts(NFormat("FileAlignment:               0x%08x", (int)opthdr->FileAlignment));
+	puts(NFormat("MajorOperatingSystemVersion: %d", opthdr->MajorOperatingSystemVersion));
+	puts(NFormat("MinorOperatingSystemVersion: %d", opthdr->MinorOperatingSystemVersion));
+	puts(NFormat("MajorImageVersion:           %d", opthdr->MajorImageVersion));
+	puts(NFormat("MinorImageVersion:           %d", opthdr->MinorImageVersion));
+	puts(NFormat("MajorSubsystemVersion:       %d", opthdr->MajorSubsystemVersion));
+	puts(NFormat("MinorSubsystemVersion:       %d", opthdr->MinorSubsystemVersion));
+	puts(NFormat("Win32VersionValue:           %d", (int)opthdr->Win32VersionValue));
+	puts(NFormat("SizeOfImage:                 0x%08x", (int)opthdr->SizeOfImage));
+	puts(NFormat("SizeOfHeaders:               0x%08x", (int)opthdr->SizeOfHeaders));
+	puts(NFormat("CheckSum:                    0x%08x", (int)opthdr->CheckSum));
+	puts(NFormat("Subsystem:                   %d", opthdr->Subsystem));
+	puts(NFormat("DllCharacteristics:          0x%08x", opthdr->DllCharacteristics));
+	puts(NFormat("SizeOfStackReserve:          0x%08x", (int)opthdr->SizeOfStackReserve));
+	puts(NFormat("SizeOfStackCommit:           0x%08x", (int)opthdr->SizeOfStackCommit));
+	puts(NFormat("SizeOfHeapReserve:           0x%08x", (int)opthdr->SizeOfHeapReserve));
+	puts(NFormat("SizeOfHeapCommit:            0x%08x", (int)opthdr->SizeOfHeapCommit));
+	puts(NFormat("LoaderFlags:                 0x%08x", (int)opthdr->LoaderFlags));
+	puts(NFormat("NumberOfRvaAndSizes:         %d", (int)opthdr->NumberOfRvaAndSizes));
+	const COFF_IMAGE_DATA_DIRECTORY *dir = opthdr->DataDirectory;
+	puts("Index RVA        Size");
+	int i;
+	for(i = 0; i < (int)opthdr->NumberOfRvaAndSizes; i++, dir++)
+		if(dir->VirtualAddress || dir->Size)
+			puts(NFormat("0x%02x  0x%08x 0x%08x", i, (int)dir->VirtualAddress, (int)dir->Size));
+	const COFF_IMAGE_SECTION_HEADER *sechdr = (const COFF_IMAGE_SECTION_HEADER *)dir;
+	puts("#  Section  RVA        RFA        Size       PtrData    PtrReloc   NumReloc   PtrLineNo  NumLineNo  Char");
+	int stab_rfa = 0, stabstr_rfa = 0, stab_len = 0, stabstr_len;
+	for(i = 0; i < hdr->NumberOfSections; i++, sechdr++)
+	{
+		char temp[9];
+		temp[8] = 0;
+		memcpy(temp, sechdr->Name, COFF_IMAGE_SIZEOF_SHORT_NAME);
+		if(!strcmp(temp, ".stab"))
+		{
+			stab_rfa = sechdr->PointerToRawData;
+			stab_len = sechdr->Misc.VirtualSize;
+		}
+		else if(!strcmp(temp, ".stabstr"))
+		{
+			stabstr_rfa = sechdr->PointerToRawData;
+			stabstr_len = sechdr->Misc.VirtualSize;
+		}
+		String line;
+		line
+		<< NFormat("%2<d %8<s 0x%08x 0x%08x 0x%08x ",
+			i + 1,
+			temp,
+			(int)sechdr->VirtualAddress,
+			(int)sechdr->PointerToRawData,
+			(int)sechdr->Misc.VirtualSize)
+		<< NFormat("0x%08x 0x%08x 0x%08x 0x%08x 0x%08x 0x%08x",
+			(int)sechdr->PointerToRawData,
+			(int)sechdr->PointerToRelocations, (int)sechdr->NumberOfRelocations,
+			(int)sechdr->PointerToLinenumbers, (int)sechdr->NumberOfLinenumbers,
+			(int)sechdr->Characteristics);
+		puts(line);
+	}
+	if(dump_globals && hdr->PointerToSymbolTable)
+		RunSymbols(hdr->PointerToSymbolTable, hdr->NumberOfSymbols);
+	if(dump_stabs && stab_rfa > 0 && stabstr_rfa > 0)
+		RunStab(stab_rfa, stab_len, stabstr_rfa, stabstr_len);
+}
+
+void FileDump::Run(const char *fn)
+{
+	for(;;)
+		if(!memicmp(fn, "stab;", 5))
+		{
+			fn += 5;
+			dump_stabs = true;
+		}
+		else if(!memicmp(fn, "global;", 7))
+		{
+			fn += 7;
+			dump_globals = true;
+		}
+		else
+			break;
+	filename = fn;
+	if(!mapping.Open(filename = fn))
+		throw Exc("file failed to open");
+	if(mapping.GetCount() >= 0x40 && mapping[0] == 'M' && mapping[1] == 'Z'
+	&& (ne_offset = PeekIL(&mapping[0x3C])) >= 0x40 && ne_offset < mapping.GetFileSize()
+	&& PeekIL(&mapping[ne_offset]) == 'P' + 256 * 'E')
+	{
+		RunCOFF();
+		return;
+	}
+	throw Exc("unknown file format");
+}
+
+void DumpFile(String fn)
+{
+	try
+	{
+		FileDump().Run(fn);
+	}
+	catch(Exc e)
+	{
+		throw Exc(NFormat("%s: %s", fn, e));
+	}
+}
diff --git a/uppsrc/coff/uld/linkjob.cpp b/uppsrc/coff/uld/linkjob.cpp
new file mode 100644
index 000000000..7349b1430
--- /dev/null
+++ b/uppsrc/coff/uld/linkjob.cpp
@@ -0,0 +1,3858 @@
+#include "uld.h"
+#pragma hdrstop
+
+#include "obj.h"
+#include "version.h"
+
+#define LTIMING(x) // RTIMING(x)
+#define LDUMP(x)   // RDUMP(x)
+
+static const byte std_stub[] =
+{
+	0x4d, 0x5a, 0x90, 0x00, 0x03, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00,
+	0xb8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x0e, 0x1f, 0xba, 0x0e, 0x00, 0xb4, 0x09, 0xcd, 0x21, 0xb8, 0x01, 0x4c, 0xcd, 0x21, 0x54, 0x68,
+	0x69, 0x73, 0x20, 0x70, 0x72, 0x6f, 0x67, 0x72, 0x61, 0x6d, 0x20, 0x63, 0x61, 0x6e, 0x6e, 0x6f,
+	0x74, 0x20, 0x62, 0x65, 0x20, 0x72, 0x75, 0x6e, 0x20, 0x69, 0x6e, 0x20, 0x44, 0x4f, 0x53, 0x20,
+	0x6d, 0x6f, 0x64, 0x65, 0x2e, 0x0d, 0x0d, 0x0a, 0x24, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+};
+
+String LinkJob::Symbol::ToString() const
+{
+	return NFormat("OBJ %5>d SEC %5>d VAL %8>d TYP %04x", obj_sec.object, obj_sec.section, value, type);
+}
+
+bool LinkJob::GlobalAddressOrder::operator () (int a, int b) const
+{
+	const Symbol& ga = linkjob.globals[a], & gb = linkjob.globals[b];
+	if(ga.obj_sec.section < 0 || gb.obj_sec.section < 0) {
+		if(ga.obj_sec.section != gb.obj_sec.section)
+			return ga.obj_sec.section < gb.obj_sec.section;
+		return ga.value < gb.value;
+	}
+	if(ga.obj_sec.object < 0 || gb.obj_sec.object < 0) {
+		if(ga.obj_sec.object != gb.obj_sec.object)
+			return ga.obj_sec.object < gb.obj_sec.object;
+		return ga.value < gb.value;
+	}
+	int seca = linkjob.GetSection(ga.obj_sec).sec_map_index;
+	int secb = linkjob.GetSection(gb.obj_sec).sec_map_index;
+	if(seca < 0 || secb < 0)
+		return seca > secb;
+	int rva = linkjob.section_map[seca].rva - linkjob.section_map[secb].rva;
+	if(rva) return rva < 0;
+	if(ga.value != gb.value)
+		return ga.value < gb.value;
+	return langinfo(linkjob[linkjob.globals.GetKey(a)], linkjob[linkjob.globals.GetKey(b)]);
+}
+
+/*
+unsigned LinkJob::Stab::GetHashValue() const
+{
+	CombineHash ch;
+	ch.Put(::GetHashValue(text));
+	ch.Put(MAKELONG(MAKEWORD(type, other), desc));
+	ch.Put(value);
+	ch.Put(fixup.object);
+	ch.Put(fixup.section);
+	ch.Put(fileatom);
+	return ch;
+}
+*/
+
+/*
+bool LinkJob::Stab::Equals(const Stab& b) const
+{
+	return type == b.type && other == b.other
+		&& desc == b.desc && value == b.value
+		&& fixup == b.fixup && text == b.text
+		&& fileatom == b.fileatom;
+}
+*/
+
+/*
+void LinkJob::Cache::Serialize(Stream& stream)
+{
+	stream % library % file % time % offset % size;
+}
+*/
+
+LinkJob::LinkJob()
+{
+	start_time = msecs();
+
+//	mangling_style = MANGLING_MSC;
+	file_align = 0x1000;
+	image_align = 0x1000;
+	image_base = 0;
+	image_fixed = false;
+	stack_reserve = 0x100000;
+	stack_commit = 0x1000;
+	heap_reserve = 0x100000;
+	heap_commit = 0x1000;
+	ignore_code_alignment = true;
+	linkermode = (!CompareNoCase(GetFileTitle(GetExeFilePath()), "link") ? MODE_MSLINK : MODE_GNULD);
+#ifdef _DEBUG
+	dump_flags = DUMP_COMMANDLINE; //DUMP_STAT | DUMP_TIMING;
+#else
+	dump_flags = 0;
+#endif
+#if defined(CPU_IA32)
+	machine = COFF_IMAGE_FILE_MACHINE_I386;
+#else
+	machine = COFF_IMAGE_FILE_MACHINE_UNKNOWN;
+#endif
+	write_mapfile = false;
+	mapfile_stdout = false;
+	write_xref = false;
+	debug_info_raw = -1;
+	debug_info = false;
+	show_logo = true;
+	autocollect_crt_only = false; // VC71 fpinit!!!
+//	cache_objects = false;
+	cache_object_data = false;
+	static_libraries = true;
+	make_lib = false;
+	make_def = false;
+	make_dll = false;
+	verbose = false;
+	major_version = 1;
+	minor_version = 1;
+	major_subsystem_version = 4;
+	minor_subsystem_version = 0;
+	auto_dll_base = false;
+	subsystem = COFF_IMAGE_SUBSYSTEM_DEFAULT;
+	atoms.Add(Null);
+	text_atom = Atomize(".text");
+	data_atom = Atomize(".data");
+	edata_atom = Atomize(".edata");
+	crt_atom = Atomize(".CRT");
+	ctors_atom = Atomize(".ctors");
+	dtors_atom = Atomize(".dtors");
+	gcc_except_atom = Atomize(".gcc_except_table");
+	CTOR_LIST_atom = Atomize("__CTOR_LIST__");
+	_CTOR_LIST_atom = Atomize("___CTOR_LIST__");
+	CTOR_LIST_END_atom = Atomize("__CTOR_LIST_END__");
+	DTOR_LIST_atom = Atomize("__DTOR_LIST__");
+	_DTOR_LIST_atom = Atomize("___DTOR_LIST__");
+	DTOR_LIST_END_atom = Atomize("__DTOR_LIST_END__");
+	idata_atom = atoms.FindAdd(".idata");
+	idata_idesc_atom = atoms.FindAdd(".idata$2");
+	idata_inull_atom = atoms.FindAdd(".idata$3");
+	idata_iat1_atom = atoms.FindAdd(".idata$4");
+	idata_iat2_atom = atoms.FindAdd(".idata$5");
+	idata_names_atom = atoms.FindAdd(".idata$6");
+	rdata_atom = atoms.FindAdd(".rdata");
+	bss_atom = atoms.FindAdd(".bss");
+	debug_atom = atoms.FindAdd(".debug");
+	drectve_atom = Atomize(".drectve");
+	stab_atom = Atomize(".stab");
+	stabstr_atom = Atomize(".stabstr");
+	rsrc_atom = Atomize(".rsrc");
+	AddGlobal(Atomize("__image_base__"), Symbol(Null, 0, COFF_IMAGE_SYM_TYPE_BASE));
+
+	stab_section = -1;
+	stabstr_section = -1;
+	symbol_section = -1;
+	reloc_section = -1;
+	has_stabs = false;
+//	has_symbols = false;
+//	has_relocs = false;
+	idata_last = -1;
+	idata_null_found = false;
+
+	mapping_cache_limit = 100;
+
+	{
+		ASSERT(objects.GetCount() == OBJ_MARKER);
+		ObjectFile& of = objects.Add(new ObjectFile(*this, OBJ_MARKER, Null, Null, ObjectFile::INTERNAL, 0, Null, 0));
+		of.sections.SetCount(OBJM_COUNT);
+		static const char *sec_names[] = { "..data", ".data$PSR", ".data$PSR", "..bss", ".~bss" };
+		for(int i = 1; i < OBJM_COUNT; i++) {
+			ObjectFile::Section& sec = of.sections[i];
+			sec.name_atom = Atomize(sec_names[i - 1]);
+			sec.sec_atom = (i < OBJM_BSS_BEGIN ? data_atom : bss_atom);
+			sec.size = sec.raw_size = 0;
+			sec.flags = (i < OBJM_BSS_BEGIN ? COFF_IMAGE_SCN_CNT_INITIALIZED_DATA : COFF_IMAGE_SCN_CNT_UNINITIALIZED_DATA)
+				| (COFF_IMAGE_SCN_MEM_READ | COFF_IMAGE_SCN_MEM_WRITE | COFF_IMAGE_SCN_ALIGN_1BYTES);
+			sec.type = ObjectFile::SEC_RAW;
+			sec.autocollect = true;
+		}
+		AddGlobal(Atomize("__data_start__"), Symbol(ObjSec(OBJ_MARKER, OBJM_DATA_BEGIN)));
+		AddGlobal(Atomize("__data_end__"), Symbol(ObjSec(OBJ_MARKER, OBJM_BSS_BEGIN)));
+		AddGlobal(Atomize("___RUNTIME_PSEUDO_RELOC_LIST__"), Symbol(ObjSec(OBJ_MARKER, OBJM_PSEUDO_RELOC_BEGIN)));
+		AddGlobal(Atomize("___RUNTIME_PSEUDO_RELOC_LIST_END__"), Symbol(ObjSec(OBJ_MARKER, OBJM_PSEUDO_RELOC_END)));
+		AddGlobal(Atomize("__bss_start__"), Symbol(ObjSec(OBJ_MARKER, OBJM_BSS_BEGIN)));
+		AddGlobal(Atomize("__bss_end__"), Symbol(ObjSec(OBJ_MARKER, OBJM_BSS_END)));
+	}
+
+	{
+		ASSERT(objects.GetCount() == OBJ_CTOR);
+		ObjectFile& of = objects.Add(new ObjectFile(*this, OBJ_CTOR, Null, Null, ObjectFile::INTERNAL, 0, Null, 0));
+		of.sections.SetCount(OBJC_COUNT);
+		static const char *sec_names[] = { ".ctors", ".ctors$_end", ".dtors", ".dtors$_end", ".idata$6", ".idata$3" };
+		for(int i = 1; i < OBJC_COUNT; i++) {
+			ObjectFile::Section& sec = of.sections[i];
+			sec.name_atom = Atomize(sec_names[i - 1]);
+			sec.sec_atom = (i >= OBJC_IDATA_HOLE ? idata_atom : data_atom);
+			sec.size = sec.raw_size = (i == OBJC_IDATA_NULL ? sizeof(COFF_IMAGE_IMPORT_DESCRIPTOR) : 4);
+			sec.flags = COFF_IMAGE_SCN_CNT_INITIALIZED_DATA
+				| COFF_IMAGE_SCN_MEM_READ | (i == OBJC_IDATA_NULL ? 0 : COFF_IMAGE_SCN_MEM_WRITE)
+				| COFF_IMAGE_SCN_ALIGN_4BYTES;
+			sec.section_data.SetCount(sec.size, i == OBJC_CTOR_BEGIN || i == OBJC_DTOR_BEGIN ? 0xFF : 0x00);
+			sec.type = ObjectFile::SEC_RAW;
+			sec.autocollect = true;
+		}
+	}
+
+/*
+	if(idata_last >= 0 && !idata_null_found) {
+		ObjectFile& of = objects[idata_last];
+		ObjectFile::Section& ofsec = of.sections.Add();
+//		ObjectFile::Section& prev = of.sections[of.sections.GetCount() - 2];
+		ofsec.name_atom = idata_inull_atom;
+		ofsec.sec_atom = idata_atom;
+		ofsec.size = sizeof(COFF_IMAGE_IMPORT_DESCRIPTOR);
+		ofsec.raw_size = 0;
+		ofsec.offset = 0;
+		ofsec.flags = COFF_IMAGE_SCN_CNT_INITIALIZED_DATA
+			| COFF_IMAGE_SCN_MEM_READ | COFF_IMAGE_SCN_MEM_WRITE;
+		ofsec.ref_sec_index = of.ref_sections.GetCount();
+		ofsec.ref_ext_index = of.ref_externals.GetCount();
+		ofsec.sec_map_index = -1;
+		of.used_any = ofsec.used = true;
+		ofsec.type = ObjectFile::SEC_INULL;
+	}
+*/
+
+	AddGlobal(CTOR_LIST_atom,     Symbol(ObjSec(OBJ_CTOR, OBJC_CTOR_BEGIN), 0, COFF_IMAGE_SYM_TYPE_CTOR_DTOR));
+	AddGlobal(_CTOR_LIST_atom,    Symbol(ObjSec(OBJ_CTOR, OBJC_CTOR_BEGIN), 0, COFF_IMAGE_SYM_TYPE_CTOR_DTOR));
+	AddGlobal(CTOR_LIST_END_atom, Symbol(ObjSec(OBJ_CTOR, OBJC_CTOR_END),   0, COFF_IMAGE_SYM_TYPE_CTOR_DTOR));
+	AddGlobal(DTOR_LIST_atom,     Symbol(ObjSec(OBJ_CTOR, OBJC_DTOR_BEGIN), 0, COFF_IMAGE_SYM_TYPE_CTOR_DTOR));
+	AddGlobal(_DTOR_LIST_atom,    Symbol(ObjSec(OBJ_CTOR, OBJC_DTOR_BEGIN), 0, COFF_IMAGE_SYM_TYPE_CTOR_DTOR));
+	AddGlobal(DTOR_LIST_END_atom, Symbol(ObjSec(OBJ_CTOR, OBJC_DTOR_END),   0, COFF_IMAGE_SYM_TYPE_CTOR_DTOR));
+ {
+		ASSERT(objects.GetCount() == OBJ_EXPORT);
+		ObjectFile& of = objects.Add(new ObjectFile(*this, OBJ_EXPORT, Null, Null, ObjectFile::INTERNAL, 0, Null, 0));
+		of.sections.SetCount(OBJE_COUNT);
+		static const char *sec_names[] = { ".edata$1dir", ".edata$2adr", ".edata$3ptr", ".edata$4ord", ".edata$5nam" };
+		for(int i = 1; i < OBJE_COUNT; i++) {
+			ObjectFile::Section& sec = of.sections[i];
+			sec.name_atom = Atomize(sec_names[i - 1]);
+			sec.sec_atom = edata_atom;
+			sec.flags = COFF_IMAGE_SCN_CNT_INITIALIZED_DATA
+				| COFF_IMAGE_SCN_MEM_READ | COFF_IMAGE_SCN_MEM_WRITE | COFF_IMAGE_SCN_ALIGN_4BYTES;
+			sec.type = ObjectFile::SEC_RAW;
+			sec.autocollect = true;
+		}
+	}
+
+	output_stab_info.SetCountR(STAB_STABSIZE, 0);
+	output_stab_strings.SetCountR(1, 0);
+}
+
+String LinkJob::DemangleAtom(int atom) const
+{
+	return ::DemangleName(atoms[atom], linkermode == MODE_MSLINK ? MANGLING_MSC : MANGLING_GCC);
+}
+
+FileMapping& LinkJob::GetMapping(String filename)
+{
+	int f = mapping_cache.Find(filename);
+	if(f >= 0)
+		return mapping_cache[f].mapping;
+	if(mapping_cache.GetCount() >= mapping_cache_limit) {
+		for(int t = 0; t < mapping_cache.GetCount() && mapping_cache.GetCount() >= mapping_cache_limit; t++)
+			if(mapping_cache[t].lock == 0)
+				mapping_cache.Remove(t--);
+	}
+	One<Cache> nc = new Cache;
+	nc->lock = 0;
+	static FileMapping dummy;
+	if(!nc->mapping.Open(filename))
+		return dummy;
+	if(!nc->mapping.Map(0, (dword)nc->mapping.GetFileSize()))
+		return dummy;
+	Cache *pc = ~nc;
+	mapping_cache.Add(filename, -nc);
+	return pc->mapping;
+}
+
+void LinkJob::LockMapping(String filename)
+{
+	int f = mapping_cache.Find(filename);
+	if(f >= 0)
+		mapping_cache[f].lock++;
+}
+
+void LinkJob::UnlockMapping(String filename)
+{
+	int f = mapping_cache.Find(filename);
+	if(f >= 0)
+		mapping_cache[f].lock--;
+}
+
+void LinkJob::ReadCommand(const char *cmd, bool user)
+{
+	ReadCommand(SplitCmdArgs(cmd), user);
+}
+
+String LinkJob::Usage()
+{
+	return String().Cat()
+		<< NFormat("uld COFF linker, version %d.%d.r%d, release date: %`\n%s",
+			ULD_VERSION_MAJOR, ULD_VERSION_MINOR, ULD_VERSION_RELEASE, ULD_DATE, ULD_COPYRIGHT) << "\n"
+		"\n"
+		"Currently supported MS linker-compatible options:\n"
+		"\n"
+		"-align:<alignment factor:1,2,4,8,16,...65536>\n"
+		"-base:<image base address>\n"
+		"-debug\n"
+		"-defaultlib:<default library path>\n"
+		"-fixed .. build fixed address executable\n"
+		"-lib .. build static library\n"
+		"-libpath:<library path>\n"
+		"-machine:<one-of " << COFFMachineNames() << ">\n"
+		"-map[:<map file>]\n"
+		"-merge:<section>=<section>\n"
+		"-nodefaultlib:<library to exclude from defaults>\n"
+		"-disallowlib:<same as -nodefaultlib>\n"
+		"-entry:<symbol> .. override default entry point\n"
+		"-nologo .. suppress startup banner\n"
+		"-out:<filename> .. name of exe file to produce\n"
+		"-stub:<filename> .. file to use as DOS stub\n"
+		"-subsystem:<one-of: NATIVE, CONSOLE, POSIX, WINDOWS,"
+		" WINDOWSCE, OS2>\n"
+		"-version:<major>[.<minor>] .. DLL version number\n"
+		"-verbose .. display additional link information\n"
+		"\n"
+		"Currently supported GNU LD-compatible options:\n"
+		"\n"
+		"-Map <mapfile>"
+		"--subsystem <one-of: windows, console>\n"
+		"--map-file .. outputs on stdout\n"
+		"--start-group, --end-group (ignored, automatic)\n"
+		"--gc-sections (ignored, automatic)\n"
+		"--major-image-version <major> .. major DLL version\n"
+		"--minor-image-version <minor> .. minor DLL version\n"
+		"-B <one-of: static, dynamic>\n"
+		"-e <symbol> .. override default entry point\n"
+		"-L <library path>\n"
+		"-l <file to load as lib<file>.a>\n"
+		"-M .. write mapfile on stdout\n"
+		"-O ### .. optimization level (ignored)\n"
+		"-o ### .. write output on file ###\n"
+		"-s .. strip debug information from file\n"
+		"\n"
+		"uld-specific options:\n"
+//		"-nocache .. do not cache link information in helper file\n"
+//		"   (default = on)\n"
+		"-collectdata .. automatically collect all initialized data\n"
+		"   from any referenced object (default=CRT sections only)\n"
+		"-aligncode .. honor alignment in code sections (default=off)\n"
+		"-keepsections .. keep /xxx gcc code COMDAT section names\n"
+		"   (default = convert to .text / .data / .bss)\n"
+		"-dump:[stab;][global;]<exe file name> .. dump executable\n"
+		"-dumpcollect .. dump object tree collector output\n"
+		"-dumpcomdats .. dump remapped COMDATs\n"
+		"-dumpcommand .. dump command line as C string constant\n"
+		"-dumpdll .. dump exports from loaded dynamic libraries\n"
+		"-dumpexports .. dump export systems with ordinals\n"
+		"-dumpfixups .. dump fixups\n"
+		"-dumpimp .. dump import libraries\n"
+		"-dumpimplib .. dump contents of loaded import libraries\n"
+		"-dumpobj .. dump object files\n"
+		"-dumpobjlib .. dump contents of loaded object libraries\n"
+		"-dumpsec[:all | :defines] .. dump sections\n"
+		"     / all contributions / all contrib's + defined symbols\n"
+		"-dumpstabs .. dump output stabs\n"
+		"-dumpstabtypes .. dump stab collector output\n"
+		"-dumpstat .. dump general linking statistics\n"
+		"-dumptime .. dump linker phase timing\n"
+		"-makedef .. write DEF-file based on given import libraries\n"
+		"-mapall .. write all symbols to map file\n"
+		"-mapout .. write mapfile to <outputfile>.map\n"
+		"-mapxref .. write cross references into map file\n"
+		"-mapunused .. write unused linked in symbols to map file\n"
+	;
+}
+
+void LinkJob::ReadCommand(const Vector<String>& cmdlist, bool user)
+{
+	command_args.Append(cmdlist);
+	if(user)
+		user_command_args.Append(cmdlist);
+	int start = msecs();
+	for(int i = 0; i < cmdlist.GetCount(); i++) {
+		String arg = cmdlist[i];
+		bool is_opt = false;
+		if(*arg == '/') {
+			const char *p = arg;
+			is_opt = true;
+			while(*++p && *p != ':' && *p != '=' && *p != '/' && *p != '.')
+				;
+			is_opt = (*p == 0 || *p == ':');
+		}
+
+		if(is_opt || *arg == '-') {
+			const char *ptr = ~arg + 1;
+			const char *end = ptr;
+			while(*end && *end != ':')
+				end++;
+			String cmd(ptr, end);
+			String lcmd = ToLower(cmd);
+			if(cmd == "Map") {
+				linkermode = MODE_GNULD;
+				write_mapfile = true;
+				mapfile = FetchCmdArg(cmdlist, i);
+				continue;
+			}
+			String val;
+			if(*end == ':')
+				val = end + 1;
+			bool eaten = true;
+			if(lcmd == "align") {
+				int at = IsDigit(*val) ? ScanInt(val) : 4096;
+				image_align = 0x100;
+				while(image_align < at && image_align < 65536)
+					image_align <<= 1;
+				if(image_align < 0x1000)
+					file_align = image_align;
+			}
+			else if(lcmd == "alternatename") {
+				int f = val.Find('=');
+				if(f >= 0) {
+					String name = val.Left(f), alt = val.Mid(f + 1);
+					AddWeakExternal(Atomize(name), Atomize(alt));
+				}
+				else
+					PutStdOut("'alternatename' option has invalid syntax (missing '=')");
+			}
+			else if(lcmd == "base")
+				image_base = ScanCInt(val);
+			else if(lcmd == "debug")
+				debug_info_raw = 1;
+			else if(lcmd == "defaultlib" && !IsNull(val))
+				defaultlibs.FindAdd(NormalizePathCase(val));
+			else if(lcmd == "entry" && !IsNull(val))
+				entrypoint = val;
+			else if(lcmd == "fixed")
+				image_fixed = true;
+			else if(lcmd == "include") {
+			}
+			else if(lcmd == "lib")
+				make_lib = true;
+			else if(lcmd == "libpath" && !IsNull(val))
+				libpaths.Add(val);
+			else if(lcmd == "machine" && !IsNull(val)) {
+				val = ToUpper(val);
+				machine = COFFMachineCode(ToUpper(val));
+				if(machine == COFF_IMAGE_FILE_MACHINE_UNKNOWN)
+					PutStdOut(NFormat("Unknown machine type: %s; supported machines are: %s", val, COFFMachineNames()));
+			}
+			else if(lcmd == "map") {
+				write_mapfile = true;
+				if(!IsNull(val))
+					mapfile = val;
+			}
+			else if(lcmd == "merge") {
+				const char *p = val;
+				while(*p && *p != '=')
+					p++;
+				String from(~val, p);
+				if(*p++ != '=' || !*p || IsNull(from))
+					PutStdOut("Invalid syntax of /merge command.");
+				else
+					section_merge.GetAdd(Atomize(from)) = Atomize(p);
+			}
+			else if((lcmd == "nodefaultlib" || lcmd == "disallowlib") && !IsNull(val))
+				nodefaultlibs.FindAdd(NormalizePathCase(val));
+			else if(lcmd == "nologo")
+				show_logo = false;
+			else if(lcmd == "out") {
+				if(!IsNull(outputfile))
+					PutStdOut(NFormat("Duplicate output file: %s (was %s)", val, outputfile));
+				outputfile = val;
+			}
+			else if(lcmd == "stub") {
+				if(!IsNull(stub_filename))
+					PutStdOut(NFormat("Duplicate stub file name: %s (was %s)", val, stub_filename));
+				stub_filename = val;
+			}
+			else if(lcmd == "subsystem" && !IsNull(val)) {
+				val = ToUpper(val);
+				/**/ if(val == "CONSOLE")   subsystem = COFF_IMAGE_SUBSYSTEM_WINDOWS_CUI;
+				else if(val == "NATIVE")    subsystem = COFF_IMAGE_SUBSYSTEM_NATIVE;
+				else if(val == "POSIX")     subsystem = COFF_IMAGE_SUBSYSTEM_POSIX_CUI;
+				else if(val == "WINDOWS")   subsystem = COFF_IMAGE_SUBSYSTEM_WINDOWS_GUI;
+#ifdef COMPILER_MSC
+				else if(val == "WINDOWSCE") subsystem = COFF_IMAGE_SUBSYSTEM_WINDOWS_CE_GUI;
+#endif
+				else if(val == "OS2")       subsystem = COFF_IMAGE_SUBSYSTEM_OS2_CUI;
+				else
+					PutStdOut(NFormat("Unknown subsystem: %s", val));
+			}
+			else if(lcmd == "version" && !IsNull(val)) {
+				const char *p = val;
+				major_version = (word)ScanInt(p, &p);
+				if(*p++ == '.' && IsDigit(*p))
+					minor_version = (word)ScanInt(p);
+			}
+			else
+				eaten = false;
+			if(eaten)
+				linkermode = MODE_MSLINK;
+			else {
+				eaten = true;
+				if(lcmd == "aligncode")
+					ignore_code_alignment = false;
+				else if(lcmd == "collectdata")
+					autocollect_crt_only = false;
+				else if(lcmd == "makedef")
+					make_def = true;
+				else if(lcmd == "dump" && !IsNull(val)) {
+					void DumpFile(String fn);
+					DumpFile(val);
+				}
+				else if(lcmd == "dumpcollect")
+					dump_flags |= DUMP_COLLECTOR;
+				else if(lcmd == "dumpcomdats")
+					dump_flags |= DUMP_COMDAT_REMAPS;
+				else if(lcmd == "dumpcommand")
+					dump_flags |= DUMP_COMMANDLINE;
+				else if(lcmd == "dumpdll")
+					dump_flags |= DUMP_DLL_EXPORTS;
+				else if(lcmd == "dumpexports")
+					dump_flags |= DUMP_EXPORTS;
+				else if(lcmd == "dumpfixups")
+					dump_flags |= DUMP_REF_FIXUPS;
+				else if(lcmd == "dumpimp")
+					dump_flags |= DUMP_IMPORT;
+				else if(lcmd == "dumpimplib")
+					dump_flags |= DUMP_IMPORT_LIBS;
+				else if(lcmd == "dumpobj")
+					dump_flags |= DUMP_OBJECTS;
+				else if(lcmd == "dumpobjlib")
+					dump_flags |= DUMP_OBJECT_LIBS;
+				else if(lcmd == "dumpsec")
+					dump_flags |= (val == "def" ? DUMP_SEC_DEFINES : val == "all" ? DUMP_SECTIONS_ALL : DUMP_SECTIONS);
+				else if(lcmd == "dumpstabs")
+					dump_flags |= DUMP_STABS;
+				else if(lcmd == "dumpstabtypes")
+					dump_flags |= DUMP_STAB_TYPES;
+				else if(lcmd == "dumpstat")
+					dump_flags |= DUMP_STAT;
+				else if(lcmd == "dumptime")
+					dump_flags |= DUMP_TIMING;
+				else if(lcmd == "mapall")
+					dump_flags |= DUMP_MAP_ALL;
+				else if(lcmd == "mapout")
+					write_mapfile = true;
+				else if(lcmd == "mapxref")
+					write_xref = true;
+				else if(lcmd == "mapunused")
+					dump_flags |= DUMP_MAP_UNUSED;
+				else if(lcmd == "verbose")
+					verbose = true;
+				else
+					eaten = false;
+			}
+			if(!eaten) {
+				ptr = ~arg + 1;
+				const char *pfx;
+				eaten = true;
+				switch(*ptr++) {
+				case '-':
+					if(pfx = EatPrefix(ptr, "dll-search-prefix="))
+						dll_search_prefix = pfx;
+					else if(!strcmp(ptr, "dynamic"))
+						static_libraries = false;
+					else if(!strcmp(ptr, "enable-auto-image-base"))
+						auto_dll_base = true;
+					else if(!strcmp(ptr, "gc-sections"))
+						; // automatic for the moment
+					else if(!strcmp(ptr, "major-image-version"))
+						major_version = (word)ScanInt(FetchCmdArg(cmdlist, i));
+					else if(!strcmp(ptr, "major-subsystem-version"))
+						major_subsystem_version = (word)ScanInt(FetchCmdArg(cmdlist, i));
+					else if(!strcmp(ptr, "map-file"))
+						write_mapfile = mapfile_stdout = true;
+					else if(!strcmp(ptr, "minor-image-version"))
+						minor_version = (word)ScanInt(FetchCmdArg(cmdlist, i));
+					else if(!strcmp(ptr, "minor-subsystem-version"))
+						minor_subsystem_version = (word)ScanInt(FetchCmdArg(cmdlist, i));
+					else if(!strcmp(ptr, "start-group") || !strcmp(ptr, "end-group"))
+						; // ignore these for the moment
+					else if(!strcmp(ptr, "static"))
+						static_libraries = true;
+					else if(!strcmp(ptr, "shared"))
+						make_dll = true;
+					else if(!strcmp(ptr, "subsystem")) {
+						String sub = FetchCmdArg(cmdlist, i);
+						if(sub == "windows") {
+							if(subsystem != COFF_IMAGE_SUBSYSTEM_WINDOWS_CUI)
+								subsystem = COFF_IMAGE_SUBSYSTEM_WINDOWS_GUI;
+						}
+						else if(sub == "windowsce") {
+							subsystem = COFF_IMAGE_SUBSYSTEM_WINDOWS_CE_GUI;
+						}
+						else if(sub == "console")
+							subsystem = COFF_IMAGE_SUBSYSTEM_WINDOWS_CUI;
+						else
+							PutStdOut(NFormat("Unknown --subsystem: %s", sub));
+					}
+					else
+						eaten = false;
+					break;
+
+				case 'B':
+					{
+						String style = FetchCmdArg(cmdlist, i, ptr);
+						if(style == "static")
+							static_libraries = true;
+						else if(style == "dynamic")
+							static_libraries = true;
+						else if(style == "shareable")
+							make_dll = true;
+						else
+							eaten = false;
+						break;
+					}
+
+				case 'e':
+					entrypoint = FetchCmdArg(cmdlist, i, ptr);
+					break;
+
+				case 'L':
+					libpaths.Add(FetchCmdArg(cmdlist, i, ptr));
+					break;
+
+				case 'l': {
+					files_to_load.Add() << "lib" << ptr << ".a";
+					break;
+				}
+
+				case 'M':
+					write_mapfile = true;
+					mapfile_stdout = true;
+					break;
+
+				case 'O':
+					ptr = FetchCmdArg(cmdlist, i, ptr);
+					PutStdOut(NFormat("(option '-O %s' ignored)", ptr));
+					break;
+
+				case 'o':
+					outputfile = FetchCmdArg(cmdlist, i, ptr);
+					break;
+
+				case 's':
+					debug_info_raw = 0;
+					image_fixed = true;
+					break;
+
+				case 'x':
+				case 'X':
+					debug_info_raw = 0;
+					break;
+
+				default:
+					eaten = false;
+					break;
+				}
+				if(eaten)
+					linkermode = MODE_GNULD;
+			}
+			if(!eaten)
+				PutStdOut(NFormat("Unknown option: %s", arg));
+		}
+		else
+			files_to_load.Add(arg);
+	}
+}
+
+String FindLinkFile(String fn, String dir, bool has_ext)
+{
+	String natdir = NormalizePathCase(NativePath(dir));
+	String nat = NormalizePathCase(NativePath(fn));
+	String out;
+	if(FileExists(out = AppendFileName(natdir, nat)))
+		return out;
+	if(has_ext)
+		return Null;
+	if(FileExists(out = AppendFileName(natdir, nat + ".obj"))
+	|| FileExists(out = AppendFileName(natdir, nat + ".o"))
+	|| FileExists(out = AppendFileName(natdir, nat + ".lib"))
+	|| FileExists(out = AppendFileName(natdir, nat + ".a"))
+	|| FileExists(out = AppendFileName(natdir, "lib" + nat + ".a")))
+		return out;
+	return Null;
+}
+
+void LinkJob::LoadFile(String fn, bool defaultlib)
+{
+	LTIMING("LinkJob::LoadFile");
+	String relfn = NormalizeRelPath(NormalizePathCase(fn));
+	if(loaded_files.Find(relfn) >= 0)
+		return;
+	bool has_ext = *GetFileExtPos(relfn);
+	String file;
+	ObjectFile::FILETYPE ft = ObjectFile::FULL_PATH;
+	file = FindLinkFile(relfn, Null, has_ext);
+	if(IsNull(file) && !IsNull(dll_search_prefix))
+		file = FindLinkFile(AppendFileName(GetFileDirectory(relfn), dll_search_prefix + GetFileName(relfn)), Null, has_ext);
+#ifdef PLATFORM_WIN32
+	String cygfn = TranslateCygWinPath(fn);
+	if(IsNull(file) && !IsNull(cygfn))
+		file = FindLinkFile(cygfn, Null, has_ext);
+#endif
+	if(IsNull(file) && !IsFullPath(relfn)) {
+		ft = ObjectFile::LIB_PATH;
+		for(int i = 0; i < libpaths.GetCount(); i++) {
+			if(!IsNull(file = FindLinkFile(relfn, libpaths[i], has_ext)))
+				break;
+#ifdef PLATFORM_WIN32
+			if(!IsNull(cygfn = TranslateCygWinPath(libpaths[i])) && !IsNull(file = FindLinkFile(relfn, cygfn, has_ext)))
+				break;
+#endif
+		}
+	}
+	if(IsNull(outputfile))
+		outputfile = ForceExt(file, "");
+//	if(cache_objects && IsNull(cache_file_name))
+//		cache_file_name = ForceExt(outputfile, ".uld");
+	if(defaultlib)
+		ft = ObjectFile::DEFAULTLIB;
+	FileMapping& mapping = LinkJob::GetMapping(file);
+	if(!mapping.IsOpen()) {
+		PutStdOut(NFormat("File '%s' not found.", fn));
+		return;
+	}
+	if(loaded_files.Find(file) >= 0)
+		return;
+	loaded_files.Add(fn);
+//	loaded_files.Add(full);
+	loaded_files.Add(file);
+	if(dump_flags & DUMP_OBJECTS)
+		PutStdOut(file);
+	if(mapping[0] == 'M' && mapping[1] == 'Z') {
+		LoadDLL(file, mapping, ft);
+		return;
+	}
+	if(*(const word *)~mapping == machine) {
+		if(ft == ObjectFile::FULL_PATH)
+			ft = ObjectFile::DIRECT;
+		LoadObject(file, mapping, ft);
+		return;
+	}
+	if(!memcmp(~mapping, "!<arch>\n", 8)) {
+		LoadLibrary(file, mapping, ft);
+		return;
+	}
+	PutStdOut(NFormat("File '%s' has unknown type.", file));
+}
+
+void LinkJob::LoadObject(String file, const FileMapping& mapping, ObjectFile::FILETYPE filetype)
+{
+	LTIMING("LinkJob::LoadObject");
+	if(verbose)
+		PutStdOut(NFormat("%s: loading object file", file));
+	int nobj = objects.GetCount();
+	ObjectFile& obj = objects.Add(new ObjectFile(*this, nobj, Null, file, filetype, 0, mapping.GetTime(), (unsigned)mapping.GetFileSize()));
+	if(cache_object_data) {
+		obj.object_data = String(~mapping, obj.object_size);
+		obj.ReadFile(obj.object_data);
+	}
+	else
+		obj.ReadFile(~mapping);
+}
+
+void LinkJob::LoadLibrary(String file, const FileMapping& mapping, ObjectFile::FILETYPE filetype)
+{
+	if(verbose)
+		PutStdOut(NFormat("%s: loading static library", file));
+	LTIMING("LinkJob::LoadLibrary");
+	int objcount = -1;
+	String libprefix = GetFileTitle(file) + ":";
+	const byte *ptr = mapping.GetIter(8);
+	const byte *end = mapping.End();
+	const byte *longptr = NULL;
+//	int objid = 0;
+	Time file_time = mapping.GetTime();
+	enum { HEADER_SIZE = sizeof(COFF_IMAGE_ARCHIVE_MEMBER_HEADER) };
+	while(ptr + HEADER_SIZE <= end && ptr[HEADER_SIZE - 2] == COFF_IMAGE_ARCHIVE_END1
+		&& ptr[HEADER_SIZE - 1] == COFF_IMAGE_ARCHIVE_END2) {
+//		if(*ptr == '\n')
+//			ptr++;
+		int offset = ptr - mapping.Begin();
+		COFF_IMAGE_ARCHIVE_MEMBER_HEADER hdr;
+		memcpy(&hdr, ptr, sizeof(hdr));
+		ptr += sizeof(hdr);
+		int size = atoi((const char *)hdr.Size);
+		const byte *brk = ptr + ((size + 1) & -2);
+		if(hdr.Name[0] == '/' && hdr.Name[1] == '/') { // longnames
+			longptr = ptr;
+		}
+		else if(hdr.Name[0] != '/' || hdr.Name[1] != ' ') { // object
+			const byte *nameptr, *namelim;
+			if(hdr.Name[0] != '/') {
+				nameptr = hdr.Name;
+				namelim = nameptr + __countof(hdr.Name);
+			}
+			else {
+				int loff = atoi((const char *)hdr.Name + 1);
+				nameptr = longptr + loff;
+				namelim = end;
+			}
+			const byte *p = nameptr;
+			while(p < namelim && *p && *p != '/')
+				p++;
+			String objname(nameptr, p - nameptr);
+			String modname = libprefix + objname;
+			const COFF_IMPORT_OBJECT_HEADER *imphdr = (const COFF_IMPORT_OBJECT_HEADER *)ptr;
+			if(imphdr->Sig1 == 0 && imphdr->Sig2 == 0xFFFF) {
+				if(imphdr->Machine != machine)
+					throw Exc(NFormat("%s: invalid machine type (0x%04x) in import library module", file, imphdr->Machine));
+				const char *pname = (const char *)ptr + sizeof(COFF_IMPORT_OBJECT_HEADER);
+				atom_t impsym_atom = Atomize(pname);
+				atom_t dll_atom = Atomize(NormalizePathCase(pname + strlen(pname) + 1));
+				if(dump_flags & DUMP_IMPORT_LIBS) {
+					String iname = atoms[impsym_atom];
+					PutStdOut(NFormat(iname == pname ? "%18<s %08x  @%5>d  %s" : "%18<s %08x  @%5>d  %s -> %s",
+						atoms[dll_atom], offset, imphdr->Hint, pname, atoms[impsym_atom]));
+				}
+				int objn = dll_objects.Get(dll_atom, -1);
+				if(objn < 0) {
+					dll_objects.Add(dll_atom, objn = objects.GetCount());
+					ObjectFile& obj = objects.Add(new ObjectFile(*this, objn, file, objname, filetype, 0, file_time, size));
+					obj.dll_atom = dll_atom;
+					obj.sections.SetCount(ObjectFile::DLL_SECTIONS);
+					ObjectFile::Section& stubsec = obj.sections[ObjectFile::SEC_DLL_STUBS];
+					stubsec.name_atom = stubsec.sec_atom = text_atom;
+					stubsec.flags = COFF_IMAGE_SCN_CNT_CODE | COFF_IMAGE_SCN_ALIGN_1BYTES
+						| COFF_IMAGE_SCN_MEM_EXECUTE | COFF_IMAGE_SCN_MEM_READ;
+					ObjectFile::Section& namesec = obj.sections[ObjectFile::SEC_DLL_NAMES];
+					namesec.name_atom = idata_names_atom;
+					namesec.sec_atom = idata_atom;
+					namesec.flags = COFF_IMAGE_SCN_CNT_INITIALIZED_DATA | COFF_IMAGE_SCN_ALIGN_2BYTES | COFF_IMAGE_SCN_MEM_READ;
+					ObjectFile::Section& impsec = obj.sections[ObjectFile::SEC_DLL_IMPORTS];
+					impsec.name_atom = idata_iat1_atom;
+					impsec.sec_atom = idata_atom;
+					impsec.flags = COFF_IMAGE_SCN_CNT_INITIALIZED_DATA | COFF_IMAGE_SCN_ALIGN_4BYTES
+						| COFF_IMAGE_SCN_MEM_READ | COFF_IMAGE_SCN_MEM_WRITE;
+					ObjectFile::Section& boundsec = obj.sections[ObjectFile::SEC_DLL_BOUND];
+					boundsec.name_atom = idata_iat2_atom;
+					boundsec.sec_atom = idata_atom;
+					boundsec.flags = COFF_IMAGE_SCN_CNT_INITIALIZED_DATA | COFF_IMAGE_SCN_ALIGN_4BYTES
+						| COFF_IMAGE_SCN_MEM_READ | COFF_IMAGE_SCN_MEM_WRITE;
+					ObjectFile::Section& descsec = obj.sections[ObjectFile::SEC_DLL_DESCRIPTOR];
+					descsec.name_atom = idata_idesc_atom;
+					descsec.sec_atom = idata_atom;
+					descsec.flags = COFF_IMAGE_SCN_CNT_INITIALIZED_DATA | COFF_IMAGE_SCN_ALIGN_4BYTES
+						| COFF_IMAGE_SCN_MEM_READ | COFF_IMAGE_SCN_MEM_WRITE;
+/*
+					ObjectFile::Section& nullsec = obj.sections[ObjectFile::SEC_DLL_NULL_DESC];
+					nullsec.name_atom = idata_inull_atom;
+					nullsec.sec_atom = idata_atom;
+					nullsec.flags = COFF_IMAGE_SCN_CNT_INITIALIZED_DATA | COFF_IMAGE_SCN_ALIGN_4BYTES
+						| COFF_IMAGE_SCN_MEM_READ | COFF_IMAGE_SCN_MEM_WRITE;
+*/
+				}
+				ObjectFile::Import& dllimp = objects[objn].imports.Add();
+				dllimp.app_atom = impsym_atom;
+				dllimp.ordinal_hint = imphdr->Hint;
+				switch(imphdr->NameType) {
+				case COFF_IMPORT_OBJECT_ORDINAL:
+					dllimp.ordinal_hint = imphdr->Ordinal;
+					while(*pname == '_')
+						pname++;
+					break;
+
+				case COFF_IMPORT_OBJECT_NAME:
+					dllimp.imp_atom = impsym_atom;
+					break;
+
+				case COFF_IMPORT_OBJECT_NAME_NO_PREFIX:
+				case COFF_IMPORT_OBJECT_NAME_UNDECORATE:
+					while(*pname == '@' || *pname == '_' || *pname == '?')
+						pname++; {
+						const char *end = pname;
+						if(imphdr->NameType == COFF_IMPORT_OBJECT_NAME_NO_PREFIX)
+							end += strlen(end);
+						else
+							while(*end && *end != '@')
+								end++;
+						dllimp.imp_atom = Atomize(String(pname, end));
+					}
+					break;
+
+				default:
+					throw Exc(NFormat("%s: invalid import name type (%d)", modname, imphdr->NameType));
+				}
+				Symbol global;
+				global.obj_sec.object = objn;
+				global.value = objects[objn].imports.GetCount() - 1;
+				if(imphdr->Type == COFF_IMPORT_CODE) {
+					global.obj_sec.section = ObjectFile::SEC_DLL_STUBS;
+					global.type = COFF_IMAGE_SYM_TYPE_IMPORT_STUB;
+					AddGlobal(impsym_atom, global);
+				}
+				global.obj_sec.section = ObjectFile::SEC_DLL_BOUND;
+				int import_atom = Atomize(String("__imp__") + pname);
+				global.type = (imphdr->NameType == COFF_IMPORT_OBJECT_ORDINAL
+					? COFF_IMAGE_SYM_TYPE_IMPORT_ORDINAL : COFF_IMAGE_SYM_TYPE_IMPORT_NAME);
+				AddGlobal(import_atom, global);
+//				RLOG("Import atom " << atoms[import_atom] << " in " << modname);
+			}
+			else {
+				int nobj = objects.GetCount();
+				if(objcount < 0)
+					objcount = nobj;
+				ObjectFile& obj = objects.Add(new ObjectFile(*this, nobj, file, objname,
+					filetype, ptr - mapping.Begin(), file_time, size));
+//				if(cache_object_data && filetype != ObjectFile::DEFAULTLIB)
+//				{
+//					obj.object_data = String(ptr, size);
+//					obj.ReadFile(obj.object_data);
+//				}
+//				else
+					obj.ReadFile(ptr);
+				if(dump_flags & DUMP_OBJECT_LIBS) {
+					for(int g = 0; g < globals.GetCount(); g++) {
+						const Symbol& sym = globals[g];
+						if(sym.obj_sec.object != nobj || sym.type >= COFF_IMAGE_SYM_TYPE_SPECIAL)
+							continue;
+						const ObjectFile& of = objects[sym.obj_sec.object];
+						String secname;
+						if(sym.obj_sec.section < 0)
+							secname = "ABS";
+						else if(sym.obj_sec.section == 0)
+							secname = "COMDAT";
+						else
+							secname = atoms[of.sections[sym.obj_sec.section].name_atom];
+						PutStdOut(NFormat("%15<s  %12<s  %12<s  %08x  %s",
+							GetFileName(of.library_file), GetFileName(of.object_file), secname, sym.value, DemangleAtom(globals.GetKey(g))));
+					}
+				}
+			}
+		}
+		ptr = brk;
+	}
+}
+
+void LinkJob::LoadDLL(String file, const FileMapping& mapping, ObjectFile::FILETYPE filetype)
+{
+	try {
+		if(verbose)
+			PutStdOut(NFormat("%s: loading shared library", file));
+		unsigned header;
+		if(mapping.GetFileSize() < 0x40 || (header = PeekIL(&mapping[0x3C]))
+			+ 4 + sizeof(COFF_IMAGE_FILE_HEADER) + sizeof(COFF_IMAGE_OPTIONAL_HEADER32) > (unsigned)mapping.GetFileSize()
+		|| PeekIL(&mapping[header]) != 'P' + 256 * 'E')
+			throw Exc("not a valid PE file");
+		COFF_IMAGE_FILE_HEADER hdr;
+		COFF_IMAGE_OPTIONAL_HEADER32 opthdr;
+		memcpy(&hdr, &mapping[header + 4], sizeof(hdr));
+		if(hdr.Machine != machine)
+			throw Exc(NFormat("invalid machine code: %s", COFFMachineName(hdr.Machine)));
+		if(!(hdr.Characteristics & IMAGE_FILE_DLL))
+			throw Exc("not a dynamic library");
+		if(hdr.SizeOfOptionalHeader < sizeof(opthdr))
+			throw Exc(NFormat("invalid optional header size = %d", hdr.SizeOfOptionalHeader));
+		memcpy(&opthdr, &mapping[header + 4 + sizeof(hdr)], sizeof(opthdr));
+		if(opthdr.NumberOfRvaAndSizes < COFF_IMAGE_DIRECTORY_ENTRY_EXPORT)
+			throw Exc("not enough data directories in image (EXPORT section not present)");
+		unsigned export_rva = opthdr.DataDirectory[COFF_IMAGE_DIRECTORY_ENTRY_EXPORT].VirtualAddress;
+		unsigned export_end = export_rva + opthdr.DataDirectory[COFF_IMAGE_DIRECTORY_ENTRY_EXPORT].Size;
+		Buffer<COFF_IMAGE_SECTION_HEADER> sections(hdr.NumberOfSections);
+		memcpy(sections, &mapping[header + 4 + sizeof(hdr) + hdr.SizeOfOptionalHeader],
+			hdr.NumberOfSections * sizeof(COFF_IMAGE_SECTION_HEADER));
+		int rva_fpos = 0;
+		bool found = false;
+		for(int i = 0; i < hdr.NumberOfSections; i++) {
+			const COFF_IMAGE_SECTION_HEADER& sec = sections[i];
+			if(export_rva >= sec.VirtualAddress && export_end <= sec.VirtualAddress + sec.Misc.VirtualSize) {
+				rva_fpos = sec.PointerToRawData - sec.VirtualAddress;
+				found = true;
+				break;
+			}
+		}
+		if(!found)
+			throw Exc("invalid export section RVA (not in any section)");
+		COFF_IMAGE_EXPORT_DIRECTORY_TABLE expdir;
+		memcpy(&expdir, &mapping[export_rva + rva_fpos], sizeof(expdir));
+
+		atom_t dll_atom = Atomize(ToUpper(GetFileName(file)));
+		int objn = objects.GetCount();
+		dll_objects.Add(dll_atom, objn);
+		ObjectFile& obj = objects.Add(new ObjectFile(*this, objn, Null, file, filetype, 0, mapping.GetTime(), (unsigned)mapping.GetFileSize()));
+		obj.dll_atom = dll_atom;
+		obj.sections.SetCount(ObjectFile::DLL_SECTIONS);
+		ObjectFile::Section& stubsec = obj.sections[ObjectFile::SEC_DLL_STUBS];
+		stubsec.name_atom = stubsec.sec_atom = text_atom;
+		stubsec.flags = COFF_IMAGE_SCN_CNT_CODE
+			| (machine == COFF_IMAGE_FILE_MACHINE_I386
+				? COFF_IMAGE_SCN_ALIGN_1BYTES
+				: COFF_IMAGE_SCN_ALIGN_4BYTES)
+			| COFF_IMAGE_SCN_MEM_EXECUTE | COFF_IMAGE_SCN_MEM_READ;
+		ObjectFile::Section& namesec = obj.sections[ObjectFile::SEC_DLL_NAMES];
+		namesec.name_atom = idata_names_atom;
+		namesec.sec_atom = idata_atom;
+		namesec.flags = COFF_IMAGE_SCN_CNT_INITIALIZED_DATA | COFF_IMAGE_SCN_ALIGN_2BYTES | COFF_IMAGE_SCN_MEM_READ;
+		ObjectFile::Section& impsec = obj.sections[ObjectFile::SEC_DLL_IMPORTS];
+		impsec.name_atom = idata_iat1_atom;
+		impsec.sec_atom = idata_atom;
+		impsec.flags = COFF_IMAGE_SCN_CNT_INITIALIZED_DATA | COFF_IMAGE_SCN_ALIGN_4BYTES
+			| COFF_IMAGE_SCN_MEM_READ | COFF_IMAGE_SCN_MEM_WRITE;
+		ObjectFile::Section& boundsec = obj.sections[ObjectFile::SEC_DLL_BOUND];
+		boundsec.name_atom = idata_iat2_atom;
+		boundsec.sec_atom = idata_atom;
+		boundsec.flags = COFF_IMAGE_SCN_CNT_INITIALIZED_DATA | COFF_IMAGE_SCN_ALIGN_4BYTES
+			| COFF_IMAGE_SCN_MEM_READ | COFF_IMAGE_SCN_MEM_WRITE;
+		ObjectFile::Section& descsec = obj.sections[ObjectFile::SEC_DLL_DESCRIPTOR];
+		descsec.name_atom = idata_idesc_atom;
+		descsec.sec_atom = idata_atom;
+		descsec.flags = COFF_IMAGE_SCN_CNT_INITIALIZED_DATA | COFF_IMAGE_SCN_ALIGN_4BYTES
+			| COFF_IMAGE_SCN_MEM_READ | COFF_IMAGE_SCN_MEM_WRITE;
+
+		if(dump_flags & DUMP_DLL_EXPORTS)
+			PutStdOut(NFormat("%s: %d named export(s):", file, (int)expdir.NumberOfNamePointers));
+		for(int i = 0; i < (int)expdir.NumberOfNamePointers; i++) {
+			int nameptr = PeekIL(&mapping[expdir.NamePointerTableRVA + rva_fpos + 4 * i]);
+			String name = (const char *)&mapping[nameptr + rva_fpos];
+			word ordinal = PeekIW(&mapping[expdir.OrdinalTableRVA + rva_fpos + 2 * i]);
+			if(ordinal >= (int)expdir.AddressTableEntries)
+				throw Exc(NFormat("export symbol %s has invalid ordinal: %d (# address entries = %d)",
+					name, ordinal, (int)expdir.AddressTableEntries));
+			unsigned bound = PeekIL(&mapping[expdir.ExportAddressTableRVA + rva_fpos + 4 * ordinal]);
+
+			if(dump_flags & DUMP_DLL_EXPORTS)
+				PutStdOut(NFormat("\t(%d) %s", (int)(ordinal + expdir.OrdinalBase), name));
+			ObjectFile::Import& dllimp = obj.imports.Add();
+			dllimp.app_atom = Atomize("_" + name);
+			dllimp.imp_atom = Atomize(name);
+			dllimp.ordinal_hint = ordinal + expdir.OrdinalBase;
+			Symbol global;
+			global.obj_sec.object = objn;
+			global.value = obj.imports.GetCount() - 1;
+			unsigned sec_flags = 0;
+			for(int s = 0; s < hdr.NumberOfSections; s++) {
+				const COFF_IMAGE_SECTION_HEADER& sec = sections[s];
+				if(bound >= sec.VirtualAddress && bound < sec.VirtualAddress + sec.Misc.VirtualSize) {
+					sec_flags = sec.Characteristics;
+					break;
+				}
+			}
+			if(sec_flags & COFF_IMAGE_SCN_CNT_CODE) {
+				global.obj_sec.section = ObjectFile::SEC_DLL_STUBS;
+				global.type = COFF_IMAGE_SYM_TYPE_IMPORT_STUB;
+				AddGlobal(dllimp.app_atom, global);
+			}
+			global.obj_sec.section = ObjectFile::SEC_DLL_BOUND;
+			int import_atom = Atomize("__imp__" + name);
+			global.type = COFF_IMAGE_SYM_TYPE_IMPORT_NAME;
+			AddGlobal(import_atom, global);
+		}
+	}
+	catch(Exc e) {
+		PutStdOut(NFormat("%s: %s", file, e));
+	}
+}
+
+void LinkJob::Dump() const
+{
+	RLOG("LinkJob(" << objects.GetCount() << " objects)");
+	int i;
+	RLOG("DefaultLibs: " << defaultlibs.GetCount());
+	for(i = 0; i < defaultlibs.GetCount(); i++)
+		RLOG(NFormat("defaultlib[%d] = %s, %s", i, defaultlibs[i],
+			nodefaultlibs.Find(defaultlibs[i]) >= 0 ? "ignored" : "used"));
+	RLOG("NoDefaultLibs: " << nodefaultlibs.GetCount());
+	for(i = 0; i < nodefaultlibs.GetCount(); i++)
+		RLOG(NFormat("nodefaultlib[%d] = %s", i, nodefaultlibs[i]));
+	int atom_size = (16 + 16) * atoms.GetCount();
+	for(i = 0; i < atoms.GetCount(); i++)
+		atom_size += atoms[i].GetLength();
+	RLOG("#atoms = " << atoms.GetCount() << ", size = " << atom_size);
+	RLOG("#globals = " << globals.GetCount() << ", size = " << globals.GetCount() * (sizeof(Symbol) + 16));
+	for(i = 0; i < globals.GetCount(); i++)
+		RLOG(NFormat("[%3>d]: %30<s = %s", i, atoms[globals.GetKey(i)], globals[i].ToString()));
+	RLOG("#objects = " << objects.GetCount());
+//	for(i = 0; i < objects.GetCount(); i++)
+//		objects[i].Dump();
+}
+
+/*
+int LinkJob::AddGlobal(int atom, const Symbol& symbol)
+{
+	globals.Add(atom, symbol);
+
+	int pos = globals.Find(atom);
+	if(pos < 0) {
+		pos = globals.GetCount();
+		globals.Add(atom, symbol);
+		return pos;
+	}
+	Symbol& old_symbol = globals[pos];
+//	if(old_symbol.storage_class != symbol.storage_class)
+//		PutStdOut(NFormat("%s: storage class mismatch (%02x / %02x)", atoms[atom], old_symbol.storage_class, symbol.storage_class));
+	if(old_symbol.section == 0)
+		old_symbol = symbol;
+	else if(symbol.section != 0) { // duplicate / comdat
+		if(old_symbol.type != symbol.type)
+			PutStdOut(NFormat("%s: symbol type mismatch (%04x / %04x)", atoms[atom], old_symbol.type, symbol.type));
+		if(old_symbol.section > 0 && symbol.section > 0) {
+			ObjectFile::Section& sec1 = objects[old_symbol.object].sections[old_symbol.section];
+			ObjectFile::Section& sec2 = objects[symbol.object].sections[symbol.section];
+			if((sec1.flags & sec2.flags) & COFF_IMAGE_SCN_LNK_COMDAT) {
+				if(sec1.comdat_packing != sec2.comdat_packing)
+					PutStdOut(NFormat("%s: comdat packing style mismatch: %d / %d",
+						atoms[atom], sec1.comdat_packing, sec2.comdat_packing));
+				switch(sec2.comdat_packing) {
+				case COFF_IMAGE_COMDAT_SELECT_NODUPLICATES:
+					break;
+
+				case COFF_IMAGE_COMDAT_SELECT_ANY:
+					return pos;
+
+				case COFF_IMAGE_COMDAT_SELECT_SAME_SIZE:
+					if(sec2.size == sec1.size)
+						return pos;
+					break;
+
+				case COFF_IMAGE_COMDAT_SELECT_EXACT_MATCH:
+					if(sec2.size == sec1.size && sec2.exact_comdat == sec1.exact_comdat)
+						return pos;
+					break;
+
+				case COFF_IMAGE_COMDAT_SELECT_ASSOCIATIVE:
+					break;
+
+				case COFF_IMAGE_COMDAT_SELECT_LARGEST:
+					if(sec2.size > sec1.size)
+						old_symbol = symbol;
+					return pos;
+				}
+			}
+		}
+
+		PutStdOut(NFormat("%s: duplicate (%s:%d / %s:%d)", atoms[atom],
+			objects[old_symbol.object].file, old_symbol.section,
+			objects[symbol.object].file, symbol.section));
+	}
+	return pos;
+}
+*/
+
+void LinkJob::ReadDefaultLibs()
+{
+	LTIMING("LinkJob::ReadDefaultLibs");
+	for(int i = 0; i < defaultlibs.GetCount(); i++)
+		if(nodefaultlibs.Find(defaultlibs[i]) < 0) {
+			if(dump_flags & DUMP_OBJECTS)
+				PutStdOut(NFormat("defaultlib: %s", defaultlibs[i]));
+			LoadFile(defaultlibs[i], true);
+		}
+}
+
+void LinkJob::SetEntryPoint()
+{
+	if(IsNull(entrypoint))
+		if(make_dll)
+			entrypoint = "_DllMainCRTStartup";
+		else if(subsystem == COFF_IMAGE_SUBSYSTEM_WINDOWS_GUI || subsystem == COFF_IMAGE_SUBSYSTEM_WINDOWS_CE_GUI)
+			entrypoint = "_WinMainCRTStartup";
+		else
+			entrypoint = "_mainCRTStartup";
+	entrypoint_atom = Atomize(entrypoint);
+}
+
+void LinkJob::SetExportSymbols()
+{
+	if(exports.IsEmpty() && make_dll) { // collect all globals
+		int ordinal = 0;
+		for(int i = 0; i < globals.GetCount(); i++) {
+			atom_t gatom = globals.GetKey(i);
+			const Symbol& sym = globals[i];
+			if(gatom != entrypoint_atom && sym.external && objects[sym.obj_sec.object].export_symbols && sym.obj_sec.section >= 0) {
+				String name = atoms[gatom];
+				const char *p = name;
+				if(*p == '_')
+					p++;
+				exports.Add(gatom, Export(p, ++ordinal));
+			}
+		}
+	}
+}
+
+void LinkJob::SetRootSymbols()
+{
+	AddCollect(entrypoint_atom);
+	for(int i = 0; i < exports.GetCount(); i++)
+		AddCollect(exports.GetKey(i));
+}
+
+void LinkJob::CollectObject(int index)
+{
+	const ObjectFile& of = objects[index];
+	Index<ObjSec> osv;
+	for(int t = 0; t < of.sections.GetCount(); t++)
+		if(of.sections[t].autocollect)
+			osv.Add(ObjSec(index, t));
+	CollectSectionSymbols(osv, 0);
+}
+
+void LinkJob::CollectSectionSymbols(Index<ObjSec>& collect_objsec, int referer_index)
+{
+	LTIMING("LinkJob::CollectSectionSymbols");
+
+	int ref = globals.GetKey(referer_index), setref = ref;
+	for(int si = 0; si < collect_objsec.GetCount(); si++) {
+		ObjSec objsec = collect_objsec[si];
+		ObjectFile& of = objects[objsec.object];
+		if(!of.collected) {
+			of.collected = true;
+			for(int s = 0; s < of.sections.GetCount(); s++)
+				if(of.sections[s].autocollect) {
+					if(dump_flags & DUMP_COLLECTOR)
+						PutStdOut(NFormat("%s: autocollect section %d, %s", AsString(of), s, atoms[of.sections[s].name_atom]));
+					collect_objsec.FindAdd(ObjSec(objsec.object, s));
+				}
+		}
+
+		if(objsec.section < 0)
+			continue;
+		ObjectFile::Section& ofsec = of.sections[objsec.section];
+		if(ofsec.sec_atom == debug_atom || ofsec.comdat_state == ObjectFile::COM_TRASHED) {
+//			if(si == 0)
+//				referer_index = ofsec.comdat_forward;
+			continue;
+		}
+
+		bool was_used = ofsec.used;
+
+//		LTIMING("LinkJob::CollectSectionSymbols / unused section");
+		if(ofsec.flags & COFF_IMAGE_SCN_LNK_COMDAT)
+			ofsec.comdat_state = ObjectFile::COM_SELECTED;
+/*
+		if(ofsec.comdat_state != ObjectFile::COM_SELECTED && ()) {
+//			LTIMING("LinkJob::CollectSectionSymbols / COMDAT");
+			Vector<int> candidates;
+			for(int f = globals.Find(ofsec.name_atom); f >= 0; f = globals.FindNext(f))
+				candidates.Add(f);
+			if(dump_flags & DUMP_COLLECTOR)
+				PutStdOut(NFormat("\tCOMDAT section (%d candidates)", candidates.GetCount()));
+			int chosen = -1;
+			int current = -1;
+			if(candidates.GetCount() > 1) {
+				for(int i = 0; i < candidates.GetCount(); i++) {
+					ObjSec otheros = globals[candidates[i]].obj_sec;
+					if(otheros == objsec) { // current section
+						current = i;
+						continue;
+					}
+					ObjectFile& otherof = objects[otheros.object];
+					ObjectFile::Section& othersec = otherof.sections[otheros.section];
+					if(othersec.used) {
+						chosen = i;
+						break;
+					}
+					if(!(othersec.flags & COFF_IMAGE_SCN_LNK_COMDAT)) {
+						puts(NFormat("%s: %s is not a COMDAT, whereas %s:%d is (non-COMDAT selected)",
+							atoms[ofsec.name_atom], FormatSection(otheros),
+							AsString(of), objsec.section));
+						chosen = i;
+					}
+					if(othersec.comdat_packing != ofsec.comdat_packing) {
+						PutStdOut(NFormat("%s: %s has COMDAT packing style %d, %s has %d",
+							atoms[ofsec.name_atom],
+							FormatSection(otheros), othersec.comdat_packing,
+							FormatSection(objsec), ofsec.comdat_packing));
+					}
+					switch(ofsec.comdat_packing) {
+					case COFF_IMAGE_COMDAT_SELECT_NODUPLICATES:
+						PutStdOut(NFormat("%s: duplicate COMDAT definitions %s / %s",
+							atoms[ofsec.name_atom], FormatSection(otheros),
+							FormatSection(objsec)));
+						break;
+
+					case COFF_IMAGE_COMDAT_SELECT_ANY:
+						break;
+
+					case COFF_IMAGE_COMDAT_SELECT_SAME_SIZE:
+						if(othersec.size != ofsec.size)
+							PutStdOut(NFormat("%s: COMDAT size mismatch: %s - %d B, %s - %d B",
+								atoms[ofsec.name_atom],
+								FormatSection(otheros), othersec.size,
+								FormatSection(objsec), ofsec.size));
+
+					case COFF_IMAGE_COMDAT_SELECT_LARGEST:
+						if(chosen < 0 && othersec.size > ofsec.size
+						|| chosen >= 0 && othersec.size > GetSection(globals[candidates[chosen]].obj_sec).size)
+							chosen = i;
+						break;
+
+					case COFF_IMAGE_COMDAT_SELECT_EXACT_MATCH:
+						if(othersec.size != ofsec.size
+						|| memcmp(othersec.section_data.Begin(), ofsec.section_data.Begin(), ofsec.size))
+							PutStdOut(NFormat("%s: COMDAT data mismatch: %s / %s",
+								atoms[ofsec.name_atom], FormatSection(otheros),
+								FormatSection(objsec)));
+						break;
+
+					case COFF_IMAGE_COMDAT_SELECT_ASSOCIATIVE:
+						break;
+
+					}
+				}
+				if(chosen >= 0) {
+					int candidate = candidates[chosen];
+					if(si == 0)
+						referer_index = candidate;
+					ObjSec otheros = globals[candidates[chosen]].obj_sec;
+					for(int i = 0; i < candidates.GetCount(); i++)
+						if(i != chosen) {
+							ObjectFile::Section& othersec = GetSection(globals[candidates[i]].obj_sec);
+							othersec.comdat_state = ObjectFile::COM_TRASHED;
+							othersec.comdat_forward = candidate;
+						}
+					if(dump_flags & DUMP_COLLECTOR) {
+						ObjectFile& otherof = objects[otheros.object];
+						puts(NFormat("\tCOMDAT section %s discarded, %s selected",
+							FormatSection(objsec), FormatSection(otheros)));
+					}
+					GetSection(otheros).comdat_state = ObjectFile::COM_SELECTED;
+					collect_objsec.FindAdd(otheros);
+					continue;
+				}
+				else if(current >= 0) {
+					int candidate = candidates[current];
+					for(int i = 0; i < candidates.GetCount(); i++)
+						if(i != current) {
+							ObjSec otheros = globals[candidates[i]].obj_sec;
+							ObjectFile::Section& othersec = GetSection(otheros);
+							othersec.comdat_state = ObjectFile::COM_TRASHED;
+							othersec.comdat_forward = candidate;
+						}
+				}
+			}
+		}
+*/
+
+		of.used_any = ofsec.used = true;
+
+		if(setref) {
+			for(int rs = global_obj_sec_index.Find(objsec); rs >= 0; rs = global_obj_sec_index.FindNext(rs))
+				if(globals.GetKey(rs) == setref) {
+					globals[rs].linked = globals[rs].used = true;
+					setref = 0;
+					break;
+				}
+		}
+
+		if(!was_used) {
+			if(dump_flags & DUMP_COLLECTOR)
+				PutStdOut(NFormat("%s: collecting section %d (%d B) %s (referer = %s)",
+					AsString(of), objsec.section, ofsec.size, atoms[ofsec.name_atom], atoms[globals.GetKey(referer_index)]));
+			for(int rs = global_obj_sec_index.Find(objsec); rs >= 0; rs = global_obj_sec_index.FindNext(rs)) {
+				int f = collected_symbols.Find(globals.GetKey(rs));
+				globals[rs].linked = true;
+				if(f >= 0 && collected_symbols[f] < 0) {
+					globals[rs].used = true;
+					collected_symbols[f] = rs;
+				}
+//				bool u = (globals.GetKey(rs) == ref);
+//				if(u)
+//					globals[rs].used = true;
+				if(dump_flags & DUMP_COLLECTOR)
+					PutStdOut(NFormat("\tdefines: %-30s VAL %08x TYP %04x %[1:*]s",
+						atoms[globals.GetKey(rs)], globals[rs].value, globals[rs].type, globals[rs].used));
+			}
+		}
+
+		if(objsec.section <= 0)
+			continue;
+
+		if(!was_used) {
+			for(int ca = of.comdat_assoc.Find(objsec.section); ca >= 0; ca = of.comdat_assoc.FindNext(ca)) {
+	//			LTIMING("LinkJob::CollectSectionSymbols / COMDAT_ASSOC");
+				ObjSec cca(of.index, of.comdat_assoc[ca]);
+				if(collect_objsec.Find(cca) < 0) {
+					collect_objsec.Add(cca);
+					if(!was_used && (dump_flags & DUMP_COLLECTOR))
+						PutStdOut(NFormat("\tassoc comdat: %d", cca.section));
+				}
+			}
+		}
+
+		int sec_end = of.ref_sections.GetCount();
+		int ext_end = of.ref_externals.GetCount();
+		if(objsec.section + 1 < of.sections.GetCount()) {
+			sec_end = of.sections[objsec.section + 1].ref_sec_index;
+			ext_end = of.sections[objsec.section + 1].ref_ext_index;
+		}
+		if(ofsec.type == ObjectFile::SEC_STD) {
+//			LTIMING("LinkJob::CollectSectionSymbols / references + xrefs + collector");
+			if(!was_used) {
+//				LTIMING("LinkJob::CollectSectionSymbols / section references");
+				for(int x = ofsec.ref_sec_index; x < sec_end; x++) {
+					int isec = of.ref_sections[x];
+					const ObjectFile::Section& sec = of.sections[isec];
+					if(!sec.used) {
+						collect_objsec.FindAdd(ObjSec(of.index, isec));
+						if(!was_used && (dump_flags & DUMP_COLLECTOR))
+							PutStdOut(NFormat("\tintra-object reference to section %d", isec));
+					}
+				}
+//				LTIMING("LinkJob::CollectSectionSymbols / symbol references");
+				for(int x = ofsec.ref_ext_index; x < ext_end; x++) {
+					int sx = obj_static_global_index.Get(Point(objsec.object, of.ref_externals[x]), -1);
+					if(sx >= 0) { // static global
+						const ObjectFile::Section& sec = GetSection(globals[sx].obj_sec);
+						if(!sec.used) {
+							collect_objsec.FindAdd(globals[sx].obj_sec);
+							if(!was_used && (dump_flags & DUMP_COLLECTOR))
+								PutStdOut(NFormat("\tintra-object reference to static %s", atoms[globals.GetKey(sx)]));
+						}
+					}
+					else
+						AddCollect(of.ref_externals[x]);
+				}
+			}
+			if(write_xref) {
+				for(int x = ofsec.ref_ext_index; x < ext_end; x++)
+					collected_referer.GetAdd(of.ref_externals[x]).FindAdd(globals.GetKey(referer_index));
+			}
+			if((dump_flags & DUMP_COLLECTOR) && !was_used) {
+				for(int x = ofsec.ref_ext_index; x < ext_end; x++)
+					PutStdOut(NFormat("\treferences: %s", atoms[of.ref_externals[x]]));
+			}
+		}
+	}
+}
+
+void LinkJob::CollectSymbols()
+{
+//	int xxx = Atomize("__crtBreakAlloc");
+	bool error = false;
+	LTIMING("LinkJob::CollectSymbols");
+	for(int i = 0; i < objects.GetCount(); i++)
+		if(objects[i].filetype == ObjectFile::DIRECT)
+			CollectObject(i);
+/* {
+			const ObjectFile& of = objects[i];
+			Index<ObjSec> osv;
+			for(int t = 0; t < of.sections.GetCount(); t++)
+				if(of.sections[t].autocollect)
+					osv.Add(ObjSec(i, t));
+			CollectSectionSymbols(osv, 0);
+		}
+*/
+	Index<int> undefined;
+	Vector<ObjSec> undef_ref;
+	for(int i = 0; i < collected_symbols.GetCount(); i++) {
+		atom_t ref = collected_symbols.GetKey(i);
+//		if(ref == CTOR_LIST_atom || ref == _CTOR_LIST_atom || ref == CTOR_LIST_END_atom
+//		|| ref == DTOR_LIST_atom || ref == _DTOR_LIST_atom || ref == DTOR_LIST_END_atom)
+//			__asm int 3
+		if(dump_flags & DUMP_COLLECTOR)
+			PutStdOut(atoms[ref] + ": collecting symbol");
+//		if(ref == xxx)
+//			__asm int 3
+		int a, af = globals.Find(ref);
+		if(af < 0) {
+			if((a = weak_externals.Find(ref)) >= 0) {
+				if((af = weak_externals.FindNext(a)) >= 0)
+					PutStdOut(NFormat("%s: weak external has multiple aliases (%s, %s)",
+						atoms[ref], atoms[a], atoms[af]));
+				AddCollect(weak_externals[a]);
+				if(write_xref)
+					collected_referer.GetAdd(weak_externals[a]).FindAdd(ref);
+				continue;
+			}
+			if(undefined.Find(collected_symbols.GetKey(i)) < 0) {
+				undefined.Add(collected_symbols.GetKey(i));
+				undef_ref.Add(ext_obj_sec.Get(ref, Null));
+			}
+			continue;
+		}
+		int collect_global = -1;
+		int collect_byfile = -1;
+//		ObjectFile *collect_file = NULL;
+//		Index<int> collect_sections;
+		for(a = af; a >= 0; a = globals.FindNext(a)) {
+			if(globals[a].used) {
+				collect_global = a;
+				break;
+			}
+			int secno = globals[a].obj_sec.section;
+			if(secno > 0) {
+				ObjectFile& of = objects[globals[a].obj_sec.object];
+				if(of.used_any) {
+					collect_byfile = a;
+	//				globals[a].used = true;
+	//				collected_symbols[i] = a;
+	//				collect_file = &of;
+	//				collect_sections.FindAdd(secno);
+				}
+			}
+		}
+		if(collect_global < 0)
+			collect_global = collect_byfile;
+		if(collect_global < 0) {
+//			if(ref == Atomize("__acmdln"))
+//				__asm int 3
+			Index<int> dflib_candidates;
+			Index<int> lib_candidates;
+			Index<int> full_candidates;
+			Index<int> direct_candidates;
+			Index<int> inner_candidates;
+			for(a = af; a >= 0; a = globals.FindNext(a)) {
+				int atom = globals.GetKey(a);
+				Symbol& global = globals[a];
+				if(global.obj_sec.object < OBJ_FIRST) {
+					inner_candidates.Add(a);
+					continue;
+				}
+				const ObjectFile& of = objects[global.obj_sec.object];
+				if(of.used_any)
+					inner_candidates.Add(a);
+				else if(of.filetype == of.DIRECT)
+					direct_candidates.Add(a);
+				else if(of.filetype == of.FULL_PATH)
+					full_candidates.Add(a);
+				else if(of.filetype == of.LIB_PATH)
+					lib_candidates.Add(a);
+				else
+					dflib_candidates.Add(a);
+			}
+			if(inner_candidates.IsEmpty())
+				inner_candidates = direct_candidates;
+			if(inner_candidates.IsEmpty())
+				inner_candidates = full_candidates;
+			if(inner_candidates.IsEmpty())
+				inner_candidates = lib_candidates;
+			if(inner_candidates.IsEmpty())
+				inner_candidates = dflib_candidates;
+			if(inner_candidates.GetCount() > 1) {
+				for(a = 1; a < inner_candidates.GetCount(); a++) {
+					bool matched = false;
+					const Symbol& sym1 = globals[inner_candidates[0]];
+					const Symbol& sym2 = globals[inner_candidates[a]];
+					if(sym1.type != sym2.type) {
+/*						PutStdOut(NFormat("%s: symbol type mismatch (%s:%d:%04x / %s:%d:%04x)",
+							atoms[ref],
+							sym1.obj_sec.object >= 0 ? AsString(objects[sym1.obj_sec.object]) : String("(linker)"),
+							sym1.obj_sec.section, sym1.type,
+							sym2.obj_sec.object >= 0 ? AsString(objects[sym2.obj_sec.object]) : String("(linker)"),
+							sym2.obj_sec.section, sym2.type));
+*/					}
+					else if((sym1.type == COFF_IMAGE_SYM_TYPE_IMPORT_NAME || sym1.type == COFF_IMAGE_SYM_TYPE_IMPORT_ORDINAL
+						|| sym1.type == COFF_IMAGE_SYM_TYPE_IMPORT_STUB) && sym2.type == sym1.type) {
+						const ObjectFile::Import& imp1 = objects[sym1.obj_sec.object].imports[sym1.value];
+						const ObjectFile::Import& imp2 = objects[sym2.obj_sec.object].imports[sym2.value];
+						bool m = true;
+						if(imp1.imp_atom != imp2.imp_atom) {
+							m = false;
+							PutStdOut(NFormat("%s: import name mismatch (%s, %s)", atoms[ref], atoms[imp1.imp_atom], atoms[imp2.imp_atom]));
+						}
+						if(sym1.type == COFF_IMAGE_SYM_TYPE_IMPORT_ORDINAL && imp1.ordinal_hint != imp2.ordinal_hint) {
+							m = false;
+							PutStdOut(NFormat("%s: import library ordinal mismatch (%d, %d)", atoms[ref], imp1.ordinal_hint, imp2.ordinal_hint));
+						}
+						if(m)
+							matched = true;
+					}
+					else if(sym1.obj_sec.section > 0 && sym2.obj_sec.section > 0) {
+						ObjectFile::Section& sec1 = GetSection(sym1.obj_sec);
+						ObjectFile::Section& sec2 = GetSection(sym2.obj_sec);
+						if((sec1.flags | sec2.flags) & COFF_IMAGE_SCN_LNK_COMDAT)
+							matched = true;
+					}
+					else if(sym1.obj_sec.section == 0 && sym2.obj_sec.section == 0 && sym1.value == sym2.value)
+						matched = true;
+					if(!matched) {
+						PutStdOut(NFormat(
+							"%s: duplicate\n"
+							"-> used:      %s\n"
+							"-> discarded: %s",
+							atoms[ref], FormatSection(sym1.obj_sec), FormatSection(sym2.obj_sec)));
+					}
+				}
+			}
+			if(!inner_candidates.IsEmpty()) {
+//				collected_symbols[i] = inner_candidates[0];
+				int chosen = inner_candidates[0];
+				Symbol& sym = globals[chosen];
+				if(sym.obj_sec.object >= 0 && sym.obj_sec.section > 0)
+					collect_global = chosen;
+//				sym.used = true;
+//				if(sym.obj_sec.object >= 0) {
+//					ObjectFile& fo = objects[sym.obj_sec.object];
+//					if(fo.dll_atom)
+//						__asm int 3
+//					if(fo.dll_atom)
+//						PutStdOut(NFormat("collecting DLL import %s", atoms[ref]));
+//					if(sym.obj_sec.section > 0)
+//						collect_global = chosen;
+//					{
+//						collect_file = &fo;
+//						collect_sections.FindAdd(sym.obj_sec.section);
+//					}
+/*
+					else if(sym.obj_sec.section == 0) { // anon comdat
+						int comdat_align = 1;
+						while(comdat_align < 16 && !(sym.value & comdat_align))
+							comdat_align <<= 1;
+						int v = (fo.sections[0].size + comdat_align - 1) & -comdat_align;
+						fo.sections[0].size = v + sym.value;
+						fo.used_any = fo.sections[0].used = true;
+						sym.value = v;
+					}
+*///				}
+				if((sym.obj_sec.section || sym.obj_sec.object < 0) && collect_global < 0)
+					globals[collected_symbols[i] = chosen].used = true;
+			}
+		}
+		if(collect_global >= 0) // && !collect_file->dll_atom)
+		{
+			ObjSec os = globals[collect_global].obj_sec;
+//			if(os.object == OBJ_CTOR)
+//				__asm int 3
+			if(os.object >= 0) {
+				Index<ObjSec> objsec;
+				objsec.Add(os);
+				CollectSectionSymbols(objsec, collect_global);
+/*
+				if(!globals[collect_global].used) {
+					int i;
+					for(i = globals.Find(ref); i >= 0 && !globals[i].used; i = globals.FindNext(i))
+						;
+					collect_global = i;
+					if(i >= 0)
+						while((i = globals.FindNext(i)) >= 0 && !globals[i].used)
+							;
+					if(i >= 0)
+						puts(NFormat("%s: duplicate in %s (used, %s (discarded)",
+							atoms[ref], FormatSection(globals[collect_global].obj_sec),
+								FormatSection(globals[i].obj_sec)));
+				}
+				if(collect_global < 0)
+					puts(NFormat("%s: undefined", atoms[ref]));
+*/
+			}
+			else
+				collected_symbols[i] = collect_global;
+		}
+	}
+
+	for(int i = 0; i < collected_symbols.GetCount(); i++)
+		if(collected_symbols[i] < 0) {
+			int atom = collected_symbols.GetKey(i);
+			int f = globals.Find(atom);
+			int anon = -1;
+			while(f >= 0 && !globals[f].linked) {
+				if(anon < 0) {
+					ObjSec objsec = globals[f].obj_sec;
+					if(objsec.section == 0 && objsec.object >= OBJ_FIRST)
+						anon = f;
+				}
+				f = globals.FindNext(f);
+			}
+			if(f >= 0) {
+				int g = f;
+				while((g = globals.FindNext(g)) >= 0 && !globals[g].used)
+					;
+				if(g >= 0) {
+					if(!(GetSection(globals[g].obj_sec).flags & GetSection(globals[f].obj_sec).flags
+					& COFF_IMAGE_SCN_LNK_COMDAT)) {
+						puts(NFormat("%s: duplicate\n"
+							"-> used:      %s\n"
+							"-> discarded: %s",
+							atoms[atom], FormatSection(globals[f].obj_sec), FormatSection(globals[g].obj_sec)));
+						globals[g].used = false;
+					}
+				}
+				else if(dump_flags & DUMP_COLLECTOR)
+					puts(NFormat("%s: delayed collect from %s", atoms[atom], FormatSection(globals[f].obj_sec)));
+				collected_symbols[i] = f;
+				globals[f].used = true;
+			}
+			else if(anon >= 0) {
+				Symbol& sym = globals[anon];
+				ObjectFile& of = objects[sym.obj_sec.object];
+				ObjectFile::Section& ofsec = of.sections[ObjectFile::SEC_ANON_COMDAT];
+				int comdat_align = 1;
+				while(comdat_align < 16 && !(sym.value & comdat_align))
+					comdat_align <<= 1;
+				int v = (ofsec.size + comdat_align - 1) & -comdat_align;
+				ofsec.size = v + sym.value;
+				of.used_any = ofsec.used = true;
+				sym.value = v;
+				sym.used = sym.linked = true;
+				collected_symbols[i] = anon;
+//				puts(NFormat("%s: anon comdat collect from %d", atoms[globals.GetKey(anon)], sym.obj_sec.object));
+				fflush(stdout);
+			}
+		}
+
+	for(int i = 0; i < weak_externals.GetCount(); i++) {
+		int f = collected_symbols.Find(weak_externals.GetKey(i));
+		if(f >= 0 && collected_symbols[f] < 0)
+			collected_symbols[f] = collected_symbols.Get(weak_externals[i], -1);
+	}
+
+	if(idata_last >= 0) {
+		Index<ObjSec> collect;
+		collect.Add(ObjSec(OBJ_CTOR, OBJC_IDATA_HOLE));
+		if(!idata_null_found)
+			collect.Add(ObjSec(OBJ_CTOR, OBJC_IDATA_NULL));
+		CollectSectionSymbols(collect, 0);
+	}
+
+	if(!undefined.IsEmpty()) {
+		Vector<String> untext;
+		untext.SetCount(undefined.GetCount());
+		int u;
+		for(u = 0; u < undefined.GetCount(); u++)
+			untext[u] = atoms[undefined[u]];
+		Vector<int> order = GetSortOrder(untext);
+		PutStdOut(NFormat("%d undefined symbol(s):", untext.GetCount()));
+		for(u = 0; u < order.GetCount(); u++) {
+			int o = order[u];
+			String ident = untext[o];
+			ObjSec obj_sec = ext_obj_sec.Get(undefined[o], Null);
+			if(!IsNull(obj_sec)) {
+				String os_globals;
+				for(int t = global_obj_sec_index.Find(obj_sec); t >= 0; t = global_obj_sec_index.FindNext(t))
+					if(os_globals.GetLength() >= 80) {
+						os_globals << "; ...";
+						break;
+					}
+					else
+						os_globals << "; " << DemangleName(atoms[globals.GetKey(t)], linkermode == MODE_GNULD ? MANGLING_GCC : MANGLING_MSC);
+				PutStdOut(NFormat("%s (referenced from %s%s)", ident, FormatSection(obj_sec), os_globals));
+			}
+			else
+				PutStdOut(ident);
+		}
+		error = true;
+	}
+
+	if(dump_flags & DUMP_STAT) {
+		PutStdOut(NFormat("#objects = %d", objects.GetCount()));
+		int atom_size = (16 + 16) * atoms.GetCount();
+		int i;
+		for(i = 0; i < atoms.GetCount(); i++)
+			atom_size += atoms[i].GetLength();
+		PutStdOut(NFormat("#atoms = %d, size = %d", atoms.GetCount(), atom_size));
+		int used_globals = 0;
+		for(i = 0; i < globals.GetCount(); i++)
+			if(globals[i].used)
+				used_globals++;
+		PutStdOut(NFormat("#globals = %d (%d used), size = %d", globals.GetCount(), used_globals,
+			(int)(globals.GetCount() * (sizeof(Symbol) + 16))));
+	}
+
+	if(error)
+		throw Exc("linking aborted due to fatal errors");
+
+//	FixupAnonComdats();
+
+//	CheckDuplicates();
+}
+
+/*
+void LinkJob::FixupAnonComdats()
+{
+	for(int i = 0; i < collected_symbols.GetCount(); i++) {
+		atom_t atom = collected_symbols.GetKey(i);
+		int iglo = collected_symbols[i];
+		Symbol& sym = globals[iglo];
+		if(sym.obj_sec.object >= OBJ_FIRST && sym.obj_sec.section == ObjectFile::SEC_ANON_COMDAT) {
+			int f = -1;
+			if(globals.FindPrev(iglo) >= 0 || globals.FindNext(iglo) >= 0) {
+				String name = atoms[atom];
+//				PutStdOut(NFormat("anon comdat: %s (%s)", name, FormatSection(sym.obj_sec)));
+				for(f = globals.Find(atom); f >= 0; f = globals.FindNext(f))
+					if(f != iglo) {
+						const Symbol& sym = globals[f];
+//						PutStdOut(NFormat("-> %s", FormatSection(sym.obj_sec)));
+						if(sym.linked && sym.obj_sec.section > 0)
+							break;
+					}
+			}
+			if(f >= 0) { // remap to non-comdat
+				if(dump_flags & DUMP_COMDAT_REMAPS)
+					PutStdOut(NFormat("%s: COMDAT remapped to %s", atoms[atom], FormatSection(globals[f].obj_sec)));
+				collected_symbols[i] = f;
+				sym.used = false;
+				globals[f].used = true;
+			}
+			else {
+				ObjectFile& of = objects[sym.obj_sec.object];
+				ObjectFile::Section& ofsec = of.sections[ObjectFile::SEC_ANON_COMDAT];
+				int comdat_align = 1;
+				while(comdat_align < 16 && !(sym.value & comdat_align))
+					comdat_align <<= 1;
+				int v = (ofsec.size + comdat_align - 1) & -comdat_align;
+				ofsec.size = v + sym.value;
+				of.used_any = ofsec.used = true;
+				sym.value = v;
+			}
+		}
+	}
+}
+*/
+
+/*
+void LinkJob::CheckDuplicates()
+{
+	bool error = false;
+	for(int i = 0; i < globals.GetCount(); i++)
+		if(globals[i].type != COFF_IMAGE_SYM_TYPE_SECTION && globals.FindPrev(i) < 0) {
+			int atom = globals.GetKey(i);
+			const Symbol *first = NULL;
+			for(int f = i; f >= 0; f = globals.FindNext(f)) {
+				const Symbol& global = globals[f];
+				if(!global.used || global.obj_sec.object < 0)
+					continue;
+				const ObjectFile& object = objects[global.obj_sec.object];
+				if(!first) {
+					first = &global;
+					continue;
+				}
+				if(first -> type == COFF_IMAGE_SYM_TYPE_SECTION && global.type == COFF_IMAGE_SYM_TYPE_SECTION)
+					continue;
+				if((first->type == COFF_IMAGE_SYM_TYPE_IMPORT_NAME || first->type == COFF_IMAGE_SYM_TYPE_IMPORT_ORDINAL)
+				&& global.type == first->type) {
+					const ObjectFile::Import& imp1 = objects[first->obj_sec.object].imports[first->value];
+					const ObjectFile::Import& imp2 = objects[global.obj_sec.object].imports[global.value];
+					if(imp1.imp_atom != imp2.imp_atom)
+						PutStdOut(NFormat("%s: import name mismatch (%s, %s)", atoms[atom], atoms[imp1.imp_atom], atoms[imp2.imp_atom]));
+					if(first->type == COFF_IMAGE_SYM_TYPE_IMPORT_ORDINAL && imp1.ordinal_hint != imp2.ordinal_hint)
+						PutStdOut(NFormat("%s: import ordinal mismatch (%d, %d)", atoms[atom], imp1.ordinal_hint, imp2.ordinal_hint));
+					continue;
+				}
+				error = true;
+				PutStdOut(NFormat("%s: duplicate (%s / %s)", atoms[atom],
+					FormatSection(first->obj_sec), FormatSection(global.obj_sec)));
+			}
+		}
+//	if(error)
+//		throw Exc("duplicates found, linking aborted");
+}
+*/
+
+void LinkJob::CollectImports()
+{
+	for(int i = 0; i < dll_objects.GetCount(); i++) {
+		ObjectFile& of = objects[dll_objects[i]];
+		ASSERT(of.dll_atom);
+		ASSERT(of.used_imports.IsEmpty());
+		if(of.used_any) {
+			ObjectFile::Section& stubsec = of.sections[ObjectFile::SEC_DLL_STUBS];
+			ObjectFile::Section& namesec = of.sections[ObjectFile::SEC_DLL_NAMES];
+			ObjectFile::Section& impsec  = of.sections[ObjectFile::SEC_DLL_IMPORTS];
+			ObjectFile::Section& bimpsec = of.sections[ObjectFile::SEC_DLL_BOUND];
+			ObjectFile::Section& descsec = of.sections[ObjectFile::SEC_DLL_DESCRIPTOR];
+//			ObjectFile::Section& nullsec = of.sections[ObjectFile::SEC_DLL_NULL_DESC];
+			String dllfn = ToUpper(GetFileName(of.object_file));
+			CatN(namesec.section_data, dllfn.GetLength() + 1, dllfn);
+			if(namesec.section_data.GetCount() & 1)
+				namesec.section_data.Add(0);
+			namesec.size = namesec.section_data.GetCount();
+			namesec.used = true;
+			int g;
+			for(g = global_obj_sec_index.Find(ObjSec(of.index, ObjectFile::SEC_DLL_STUBS)); g >= 0; g = global_obj_sec_index.FindNext(g)) {
+				Symbol& stubimp = globals[g];
+				if(!stubimp.used)
+					continue;
+//				if(of.used_stubs.Find(stubimp.value) < 0)
+//					PutStdOut(NFormat("stub import[%d] = %s", of.used_stubs.GetCount(), atoms[globals.GetKey(g)]));
+				of.used_imports.FindAdd(stubimp.value);
+				stubimp.value = imp_stub_size * of.used_stubs.FindAdd(stubimp.value);
+				stubsec.used = impsec.used = true;
+			}
+			for(g = global_obj_sec_index.Find(ObjSec(of.index, ObjectFile::SEC_DLL_BOUND)); g >= 0; g = global_obj_sec_index.FindNext(g)) {
+				Symbol& imp = globals[g];
+				if(!imp.used)
+					continue;
+				ObjectFile::Import& import = of.imports[imp.value];
+				of.used_imports.Add(imp.value);
+				imp.value = imp_entry_size * (1 + of.used_imports.FindAdd(imp.value));
+				impsec.used = true;
+			}
+			stubsec.size = imp_stub_size * of.used_stubs.GetCount();
+			if(!of.used_imports.IsEmpty()) {
+				ASSERT(impsec.used);
+				used_dll_objects.Add(of.index);
+				impsec.used = bimpsec.used = true;
+				impsec.size = bimpsec.size = imp_entry_size * (of.used_imports.GetCount() + 1);
+				impsec.section_data.SetCount(impsec.size, 0);
+				for(g = 0; g < of.used_imports.GetCount(); g++) {
+					const ObjectFile::Import& oi = of.imports[of.used_imports[g]];
+					int ival = oi.ordinal_hint | 0x80000000;
+					if(oi.imp_atom) { // create hint/name table entry
+						ival = namesec.size;
+						String ia = atoms[oi.imp_atom];
+						int offset = CatN0(namesec.section_data, ((ia.GetLength() + 4) & -2));
+						PokeIW(&namesec.section_data[offset], oi.ordinal_hint);
+						memcpy(&namesec.section_data[offset + 2], ia, ia.GetLength());
+						namesec.size = namesec.section_data.GetCount();
+					}
+					byte *ient = impsec.section_data.GetIter(imp_entry_size * (g + 1));
+					PokeIL(ient, ival);
+				}
+				bimpsec.section_data <<= impsec.section_data;
+				descsec.used = true;
+				descsec.size = sizeof(COFF_IMAGE_IMPORT_DESCRIPTOR);
+/*
+				if(used_dll_objects.GetCount() == 1) {
+					nullsec.used = true;
+					nullsec.size = sizeof(COFF_IMAGE_IMPORT_DESCRIPTOR);
+				}
+*/
+				if(dump_flags & DUMP_IMPORT) {
+					PutStdOut(NFormat("%s: %d imports used; %d using stub; %d bytes in name table",
+						of.object_file, of.used_imports.GetCount(), of.used_stubs.GetCount(), namesec.size));
+					for(g = 0; g < of.used_imports.GetCount(); g++) {
+						int uimp = of.used_imports[g];
+						const ObjectFile::Import& ofimp = of.imports[uimp];
+						if(ofimp.app_atom == ofimp.imp_atom)
+							PutStdOut(NFormat("\t(%d) %s: %[1:stub]s",
+								ofimp.ordinal_hint, atoms[ofimp.imp_atom],
+								of.used_stubs.Find(uimp) >= 0));
+						else
+							PutStdOut(NFormat("\t(%d) %s -> %s: %[1:stub]s",
+								ofimp.ordinal_hint, atoms[ofimp.app_atom], atoms[ofimp.imp_atom],
+								of.used_stubs.Find(uimp) >= 0));
+					}
+				}
+			}
+		}
+	}
+}
+
+void LinkJob::CollectExports()
+{
+	if(exports.IsEmpty())
+		return;
+	ObjectFile& ofe = objects[OBJ_EXPORT];
+	ObjectFile::Section& dir = ofe.sections[OBJE_DIRECTORY];
+	ObjectFile::Section& adr = ofe.sections[OBJE_ADDRESS_TABLE];
+	ObjectFile::Section& ptr = ofe.sections[OBJE_NAME_POINTERS];
+	ObjectFile::Section& ord = ofe.sections[OBJE_ORDINALS];
+	ObjectFile::Section& nam = ofe.sections[OBJE_NAMES];
+
+	dir.size = dir.raw_size = sizeof(COFF_IMAGE_EXPORT_DIRECTORY_TABLE);
+	COFF_IMAGE_EXPORT_DIRECTORY_TABLE expdir;
+	Zero(expdir);
+
+	int min_ordinal, max_ordinal;
+	min_ordinal = max_ordinal = exports[0].ordinal;
+	Vector<String> named_exports;
+	Vector<int> named_ordinals;
+	for(int i = 0; i < exports.GetCount(); i++) {
+		int e = exports[i].ordinal;
+		if(e < min_ordinal) min_ordinal = e;
+		if(e > max_ordinal) max_ordinal = e;
+		if(!IsNull(exports[i].export_name)) {
+			named_exports.Add(exports[i].export_name);
+			named_ordinals.Add(e);
+		}
+	}
+	expdir.DateTimeStamp = time(NULL);
+	expdir.MajorVersion = major_version;
+	expdir.MinorVersion = minor_version;
+	expdir.NameRVA = 0;
+	String dll_name = ToUpper(GetFileName(outputfile));
+	CatN(nam.section_data, dll_name.GetLength() + 1, dll_name);
+	expdir.OrdinalBase = min_ordinal;
+	expdir.AddressTableEntries = max_ordinal - min_ordinal + 1;
+	expdir.NumberOfNamePointers = named_exports.GetCount();
+
+	adr.size = adr.raw_size = 4 * (max_ordinal - min_ordinal + 1);
+	adr.section_data.SetCount(adr.size, 0);
+
+	IndexSort(named_exports, named_ordinals, StdLess<String>());
+	ptr.size = ptr.raw_size = 4 * named_exports.GetCount();
+	ord.size = ord.raw_size = 2 * named_exports.GetCount();
+	ptr.section_data.SetCount(ptr.size);
+	ord.section_data.SetCount(ord.size);
+
+	for(int i = 0; i < named_exports.GetCount(); i++) {
+		PokeIL(ptr.section_data.GetIter(4 * i), nam.section_data.GetCount());
+		PokeIW(ord.section_data.GetIter(2 * i), named_ordinals[i] - min_ordinal);
+		String exp = named_exports[i];
+		CatN(nam.section_data, exp.GetLength() + 1, exp);
+	}
+	nam.size = nam.raw_size = nam.section_data.GetCount();
+
+	CatN(dir.section_data, dir.size, &expdir);
+
+	if(dump_flags & DUMP_EXPORTS) {
+		PutStdOut("Ordinal Export");
+		for(int i = 0; i < exports.GetCount(); i++) {
+			String ename = exports[i].export_name;
+			String sname = atoms[exports.GetKey(i)];
+			if(sname == ename)
+				PutStdOut(NFormat("%7<d %s", exports[i].ordinal, ename));
+			else
+				PutStdOut(NFormat("%7<d %30<s %s", exports[i].ordinal, ename, sname));
+		}
+	}
+
+	CollectObject(OBJ_EXPORT);
+}
+
+void LinkJob::CollectSections()
+{
+	iat2_rva = iat2_end_rva = 0;
+	idesc_rva = idesc_end_rva = 0;
+	rsrc_rva = rsrc_end_rva = 0;
+
+/*
+	if(idata_last >= 0 && !idata_null_found) {
+		ObjectFile& of = objects[idata_last];
+		ObjectFile::Section& ofsec = of.sections.Add();
+//		ObjectFile::Section& prev = of.sections[of.sections.GetCount() - 2];
+		ofsec.name_atom = idata_inull_atom;
+		ofsec.sec_atom = idata_atom;
+		ofsec.size = sizeof(COFF_IMAGE_IMPORT_DESCRIPTOR);
+		ofsec.raw_size = 0;
+		ofsec.offset = 0;
+		ofsec.flags = COFF_IMAGE_SCN_CNT_INITIALIZED_DATA
+			| COFF_IMAGE_SCN_MEM_READ | COFF_IMAGE_SCN_MEM_WRITE;
+		ofsec.ref_sec_index = of.ref_sections.GetCount();
+		ofsec.ref_ext_index = of.ref_externals.GetCount();
+		ofsec.sec_map_index = -1;
+		of.used_any = ofsec.used = true;
+		ofsec.type = ObjectFile::SEC_INULL;
+	}
+*/
+
+//	for(i = 0; i < SEC_COUNT; i++)
+//		section_map[i].Clear();
+/*
+	if(debug_info) {
+		Section& se = section_map.Add();
+		se.obj_sec = Null;
+		se.group = GRP_SYMBOLS;
+		se.name = ".symbols";
+		se.rva = se.rfa = -1;
+		se.size = coff_output_symbols.GetCount() * sizeof(COFF_IMAGE_SYMBOL)
+			+ coff_output_symbol_strings.GetLength();
+	}
+*/
+	for(int i = 0; i < objects.GetCount(); i++)
+		if(objects[i].used_any) {
+			const ObjectFile& of = objects[i];
+			for(int s = 0; s < of.sections.GetCount(); s++)
+				if(of.sections[s].used) {
+					const ObjectFile::Section& ofsec = of.sections[s];
+					int sec_atom = section_merge.Get(ofsec.sec_atom, ofsec.sec_atom);
+					int sx = GRP_NONE;
+					if(i == OBJ_EXPORT)
+						sx = GRP_EDATA;
+					else if(sec_atom == rsrc_atom)
+						sx = GRP_RSRC;
+					else if(sec_atom == debug_atom)
+						sx = GRP_DEBUG;
+					else if(sec_atom == idata_atom)
+						sx = GRP_IDATA;
+					else if(ofsec.flags & COFF_IMAGE_SCN_CNT_CODE)
+						sx = GRP_CODE;
+					else if(!(ofsec.flags & COFF_IMAGE_SCN_MEM_WRITE))
+						sx = GRP_RDATA;
+					else if(ofsec.flags & COFF_IMAGE_SCN_CNT_UNINITIALIZED_DATA)
+						sx = GRP_UDATA;
+					else
+						sx = GRP_DATA;
+					Section& se = section_map.Add();
+					se.obj_sec = ObjSec(i, s);
+					se.group = sx;
+					se.udata = (ofsec.type == ObjectFile::SEC_ANON_COMDAT
+						|| ofsec.type == ObjectFile::SEC_STD && ofsec.offset == 0
+						|| (ofsec.flags & (COFF_IMAGE_SCN_CNT_INITIALIZED_DATA
+							| COFF_IMAGE_SCN_CNT_UNINITIALIZED_DATA | COFF_IMAGE_SCN_CNT_CODE))
+							== COFF_IMAGE_SCN_CNT_UNINITIALIZED_DATA);
+//					if(se.udata)
+//						puts(NFormat("UDATA[%08x], s0=%d: %s:%d", ofsec.flags,
+//							ofsec.type == ObjectFile::SEC_ANON_COMDAT,
+//							of.object_file, s));
+					se.sec_atom = (sx == GRP_CODE ? text_atom
+						: sx == GRP_DATA ? data_atom
+						: sx == GRP_RDATA ? rdata_atom
+						: sx == GRP_UDATA ? bss_atom : sec_atom);
+					se.name = atoms[ofsec.name_atom];
+					ASSERT(!se.name.IsEmpty());
+					se.size = ofsec.size;
+					if(ofsec.sec_atom == idata_atom || ofsec.sec_atom == crt_atom) {
+						se.name << ':';
+						if(!IsNull(of.library_file))
+							se.name << of.library_file << ':';
+						se.name << of.object_file;
+					}
+				}
+		}
+
+	ZeroArray(groups);
+	Sort(section_map, &LinkJob::Less);
+	section_object_index.Reserve(section_map.GetCount());
+//	section_obj_sec_index.Reserve(section_map.GetCount());
+	int rva = 0; //, rfa = 0;
+	int prev_sec = 0;
+	int prev_grp = 0;
+	for(int i = 0; i < section_map.GetCount(); i++) {
+		Section& section = section_map[i];
+		int rva_align = image_align, rfa_align = image_align;
+		ObjectFile::Section& ofsec = GetSection(section.obj_sec);
+//		ofsec_atom = ofsec.name_atom;
+		rva_align = CoffGetLengthAlignment(1 << CoffSectionAlignShift(ofsec.flags), ofsec.size);
+		rfa_align = rva_align;
+//			sec_size = ofsec.size;
+		ofsec.sec_map_index = i;
+		if(section.sec_atom != prev_sec) {
+			section_name_map.Add(prev_sec = section.sec_atom, i);
+			rva_align = max(rva_align, image_align);
+			rfa_align = max(rfa_align, file_align);
+		}
+		section.app_section = section_name_map.GetCount() - 1;
+		section.rva = rva = (rva + rva_align - 1) & -rva_align;
+//		section.rfa = rfa = (rfa + rfa_align - 1) & -rfa_align;
+		if(iat2_rva == 0 && ofsec.name_atom == idata_iat2_atom)
+			iat2_rva = iat2_end_rva = rva;
+		if(idesc_rva == 0 && ofsec.sec_atom == idata_atom)
+			idesc_rva = idesc_end_rva = rva;
+		if(rsrc_rva == 0 && ofsec.sec_atom == rsrc_atom)
+			rsrc_rva = rsrc_end_rva = rva;
+		section_object_index.Add(section.obj_sec.object);
+//		section_obj_sec_index.Add(section.obj_sec);
+		rva += section.size;
+//		rfa += ofsec.size;
+		if(ofsec.name_atom == idata_iat2_atom)
+			iat2_end_rva = rva;
+//		if(ofsec.name_atom == idata_idesc_atom || ofsec.name_atom == idata_inull_atom)
+//			idesc_end_rva = rva;
+		if(ofsec.sec_atom == idata_atom)
+			idesc_end_rva = rva;
+		if(ofsec.sec_atom == rsrc_atom)
+			rsrc_end_rva = rva;
+		const Section *nxt = (i + 1 >= section_map.GetCount() ? NULL : &section_map[i + 1]);
+		while(prev_grp <= section.group)
+			groups[prev_grp++].first_section = i;
+	}
+	while(prev_grp <= GRP_COUNT)
+		groups[prev_grp++].first_section = section_map.GetCount();
+
+	int rfa = 0, end_rva = 0;
+	for(int i = 0; i <= GRP_COUNT; i++) {
+		int first = groups[i].first_section;
+		if(first >= section_map.GetCount()) {
+			groups[i].rva = end_rva;
+			groups[i].rfa = rfa;
+			continue;
+		}
+		const Section& sec = section_map[first];
+		int last = groups[i + 1].first_section - 1;
+		const Section& lastsec = section_map[last];
+//		const ObjectFile::Section& oflast = GetSection(lastsec.obj_sec);
+		while(last >= first && section_map[last].udata)
+			last--;
+		const Section *rawsec = (last >= first ? &section_map[last] : NULL);
+//		const ObjectFile::Section& ofsec = GetSection(sec.obj_sec);
+		groups[i].rva = sec.rva;
+		groups[i].rfa = rfa;
+		groups[i].raw_size = rawsec ? rawsec->rva + GetSection(rawsec->obj_sec).size - sec.rva : 0;
+		end_rva = (lastsec.rva + sec.size + image_align - 1) & -image_align;
+		rfa = (rfa + groups[i].raw_size + file_align - 1) & -file_align;
+	}
+
+	for(int i = 0; i < section_map.GetCount(); i++) {
+		Section& sec = section_map[i];
+		Group& grp = groups[sec.group];
+		if(!sec.udata)
+			sec.rfa = sec.rva - grp.rva + grp.rfa;
+	}
+
+	if(dump_flags & DUMP_STAT)
+		PutStdOut(NFormat("#collected sections = %d", section_map.GetCount()));
+}
+
+void LinkJob::RelocateGlobals()
+{
+	for(int i = 0; i < globals.GetCount(); i++) {
+		Symbol& global = globals[i];
+		if(global.used) {
+			if(global.type != COFF_IMAGE_SYM_TYPE_BASE && global.obj_sec.section >= 0) {
+				ObjSec os = global.obj_sec;
+//				if(os.section == 0 && global.type < COFF_IMAGE_SYM_TYPE_SPECIAL)
+//					os.object = 0; // comdat
+				global.value += section_map[GetSection(os).sec_map_index].rva + code_rva;
+			}
+			global.relocated = true;
+		}
+	}
+}
+
+void LinkJob::RelocateExports()
+{
+	ObjectFile& ofe = objects[OBJ_EXPORT];
+	if(!ofe.used_any)
+		return;
+
+	ObjectFile::Section& dir = ofe.sections[OBJE_DIRECTORY];
+	ObjectFile::Section& adr = ofe.sections[OBJE_ADDRESS_TABLE];
+	ObjectFile::Section& ptr = ofe.sections[OBJE_NAME_POINTERS];
+	ObjectFile::Section& ord = ofe.sections[OBJE_ORDINALS];
+	ObjectFile::Section& nam = ofe.sections[OBJE_NAMES];
+	ASSERT(dir.sec_map_index >= 0 && adr.sec_map_index >= 0 && nam.sec_map_index >= 0);
+
+	int nam_rva = section_map[nam.sec_map_index].rva + code_rva;
+	int ptr_rva = section_map[ptr.sec_map_index].rva + code_rva;
+	int adr_rva = section_map[adr.sec_map_index].rva + code_rva;
+
+	COFF_IMAGE_EXPORT_DIRECTORY_TABLE expdir;
+	memcpy(&expdir, dir.section_data.Begin(), sizeof(expdir));
+	expdir.NameRVA = nam_rva;
+	expdir.ExportAddressTableRVA = adr_rva;
+	if(ptr.sec_map_index >= 0) {
+		ASSERT(ord.sec_map_index >= 0);
+		expdir.NamePointerTableRVA = ptr_rva;
+		expdir.OrdinalTableRVA = section_map[ord.sec_map_index].rva + code_rva;
+	}
+	memcpy(dir.section_data.Begin(), &expdir, sizeof(expdir));
+
+	for(int i = 0; i < ptr.size; i += 4) {
+		byte *p = ptr.section_data.GetIter(i);
+		PokeIL(p, PeekIL(p) + nam_rva);
+	}
+
+	for(int i = 0; i < exports.GetCount(); i++) {
+		int f = collected_symbols.Get(exports.GetKey(i), -1);
+		if(f >= 0) {
+			Symbol& sym = globals[f];
+			int offset = 4 * (exports[i].ordinal - expdir.OrdinalBase);
+			PokeIL(adr.section_data.GetIter(offset), sym.value);
+		}
+	}
+}
+
+bool LinkJob::Less(const Section& a, const Section& b)
+{
+	int i;
+	if((i = a.group - b.group) || (i = cmp(a.name, b.name)))
+		return i < 0;
+	if((i = a.obj_sec.object - b.obj_sec.object) || (i = a.obj_sec.section - b.obj_sec.section))
+		return i < 0;
+	return false;
+}
+
+void LinkJob::AddAuxCOFFSymbol(const COFF_IMAGE_SYMBOL& sym)
+{
+	coff_output_symbols.Add() = sym;
+}
+
+bool LinkJob::AddCOFFSymbol(String name, int object, const COFF_IMAGE_SYMBOL& sym)
+{
+	int value = sym.Value;
+	int secno = sym.SectionNumber;
+//	bool reloc_value = false;
+	if(*name == '.' && sym.StorageClass != COFF_IMAGE_SYM_CLASS_FILE)
+		return false; // probably also section entry
+	if(sym.SectionNumber == 0 && sym.StorageClass == COFF_IMAGE_SYM_CLASS_EXTERNAL
+	|| sym.StorageClass == COFF_IMAGE_SYM_CLASS_BLOCK || sym.StorageClass == COFF_IMAGE_SYM_CLASS_FUNCTION
+	|| sym.StorageClass == COFF_IMAGE_SYM_CLASS_END_OF_STRUCT// || sym.StorageClass == COFF_IMAGE_SYM_CLASS_FILE
+	|| sym.StorageClass == COFF_IMAGE_SYM_CLASS_REGISTER_PARAM || sym.StorageClass == COFF_IMAGE_SYM_CLASS_ARGUMENT
+	|| sym.StorageClass == COFF_IMAGE_SYM_CLASS_REGISTER || sym.StorageClass == COFF_IMAGE_SYM_CLASS_AUTOMATIC
+	|| sym.StorageClass == COFF_IMAGE_SYM_CLASS_END_OF_FUNCTION || sym.StorageClass == COFF_IMAGE_SYM_CLASS_SECTION) { // external symbol / anon COMDAT
+		return false;
+/*
+		int global = collected_symbols.Get(Atomize(name), -1);
+		if(global < 0)
+			return false;
+		value = globals[global].value;
+		if(globals[global].obj_sec.section > 0)
+			reloc_value = true;
+*/
+	}
+
+	int appsec = sym.SectionNumber;
+	if(sym.SectionNumber >= 0) {
+		int sec_map_index = GetSection(ObjSec(object, sym.SectionNumber)).sec_map_index;
+		if(sec_map_index < 0)
+			return false;
+		appsec = section_map[sec_map_index].app_section;
+		value += section_map[sec_map_index].rva - section_map[section_name_map[appsec]].rva;
+		appsec++;
+//		reloc_value = true;
+	}
+
+	int offset = coff_output_symbols.GetCount() * sizeof(COFF_IMAGE_SYMBOL);
+	COFF_IMAGE_SYMBOL& outsym = coff_output_symbols.Add();
+	Zero(outsym);
+	if(name.GetLength() <= 8)
+		memcpy(outsym.N.ShortName, name, name.GetLength());
+	else {
+		outsym.N.Name.Long = coff_output_symbol_strings.GetLength() + 4;
+		coff_output_symbol_strings.Cat(name, name.GetLength() + 1);
+//		coff_reloc_offsets.Add(offset + __offsetof(COFF_IMAGE_SYMBOL, N.Name.Long));
+	}
+//	if(reloc_value)
+//	{
+//		value += image_base;
+//		coff_reloc_offsets.Add(offset + __offsetof(COFF_IMAGE_SYMBOL, Value));
+//	}
+	outsym.Value = value;
+	outsym.SectionNumber = appsec;
+	outsym.StorageClass = sym.StorageClass;
+	outsym.Type = sym.Type;
+	outsym.NumberOfAuxSymbols = sym.NumberOfAuxSymbols;
+	return true;
+}
+
+void LinkJob::AddWeakExternal(atom_t atom, int refatom)
+{
+	for(int f = weak_externals.Find(atom); f >= 0; f = weak_externals.FindNext(f))
+		if(weak_externals[f] == refatom)
+			return;
+	weak_externals.Add(atom, refatom);
+}
+
+void LinkJob::AddGlobal(int atom, const Symbol& symbol)
+{
+	if(!symbol.external)
+		obj_static_global_index.Add(Point(symbol.obj_sec.object, atom), globals.GetCount());
+	globals.Add(atom, symbol);
+	global_obj_sec_index.Add(symbol.obj_sec);
+}
+
+void LinkJob::PrepareImageHeader()
+{
+	output_image.Clear();
+	String stub_data;
+	if(!stub_filename.IsEmpty()) {
+		stub_data = ::LoadFile(stub_filename);
+		if(stub_data.IsVoid())
+			PutStdOut(NFormat("%s: error loading stub file", stub_filename));
+	}
+	if(IsNull(stub_data))
+		stub_data = String(std_stub, sizeof(std_stub));
+
+	CatN(output_image, stub_data.GetLength(), stub_data);
+	if(output_image.GetCount() < 0x40)
+		output_image.SetCountR(0x40, 0);
+	PokeIL(output_image.GetIter(0x3C), output_image.GetCount());
+	CatN(output_image, 4, "PE\0\0");
+	ifhdr_pos = CatN0(output_image, sizeof(COFF_IMAGE_FILE_HEADER));
+	iohdr_pos = CatN0(output_image, sizeof(COFF_IMAGE_OPTIONAL_HEADER32));
+	section_count = section_name_map.GetCount();
+	if(has_stabs && debug_info) {
+		stab_section = section_count++;
+		stabstr_section = section_count++;
+	}
+	if(debug_info) {
+//		has_symbols = true;
+		symbol_section = section_count++;
+	}
+	if(!image_fixed) {
+//		has_relocs = true;
+		reloc_section = section_count++;
+	}
+	secmap_pos = CatN0(output_image, sizeof(COFF_IMAGE_SECTION_HEADER) * section_count);
+//	impmap_pos = CatN0(output_image, sizeof(COFF_IMAGE_IMPORT_DESCRIPTOR) * (used_dll_objects.GetCount() + 1));
+	header_size = output_image.GetCount();
+	code_rfa = (header_size + file_align - 1) & -file_align;
+	code_rva = (header_size + image_align - 1) & -image_align;
+	output_image.SetCount(code_rfa + groups[GRP_COUNT].rfa, 0);
+	memset(output_image.GetIter(code_rfa), 0x90, groups[GRP_DATA_BEGIN].rfa - groups[GRP_TEXT_BEGIN].rfa);
+}
+
+static bool SymTblLess(const COFF_IMAGE_SYMBOL& a, const COFF_IMAGE_SYMBOL& b)
+{
+	if(a.SectionNumber != b.SectionNumber) return a.SectionNumber < b.SectionNumber;
+	return a.Value < b.Value;
+}
+
+void LinkJob::PrepareSymbolTable()
+{
+	LTIMING("LinkJob::PrepareSymbolTable");
+
+/*
+	for(int i = 0; i < section_name_map.GetCount(); i++) { // generate section beginning symbols
+		COFF_IMAGE_SYMBOL secsym;
+		Zero(secsym);
+		strncpy((char *)secsym.N.ShortName, atoms[section_name_map.GetKey(i)], 8);
+		secsym.SectionNumber = i + 1;
+		secsym.Value = 0;
+		secsym.StorageClass = COFF_IMAGE_SYM_CLASS_EXTERNAL;
+		coff_output_symbols.Add(secsym);
+	}
+*/
+
+//	Sort(coff_output_symbols, &SymTblLess);
+	int rawsize = coff_output_symbols.GetCount() * sizeof(COFF_IMAGE_SYMBOL)
+		+ 4 + coff_output_symbol_strings.GetLength();
+	int imagesize = (rawsize + image_align - 1) & -image_align;
+	int filesize = (rawsize + file_align - 1) & -file_align;
+	for(int g = GRP_SYMBOLS; ++g <= GRP_COUNT;) {
+		groups[g].rva += imagesize;
+		groups[g].rfa += filesize;
+	}
+//	for(int g = 0; g < coff_output_symbols.GetCount(); g += 1 + coff_output_symbols[g].NumberOfAuxSymbols)
+//		if(coff_output_symbols[g].N.Name.Short == 0)
+//			coff_output_symbols[g].N.Name.Long += groups[GRP_SYMBOLS].rva + code_rva + image_base;
+}
+
+#ifdef CPU_LE // && CPU_32BIT
+	#define GET_STAB(dest, ptr) dest = (STAB_INFO *)(ptr);
+#else
+	#define GET_STAB(dest, ptr) \
+		dest->strdx = PeekIL(ptr + STAB_STRDXOFF); \
+		dest->type = ptr[STAB_TYPEOFF]; \
+		dest->other = ptr[STAB_OTHEROFF]; \
+		dest->desc = PeekIW(ptr + STAB_DESCOFF); \
+		dest->value = PeekIL(ptr + STAB_VALUEOFF);
+#endif
+
+void LinkJob::PrepareStabBlocks()
+{
+	LTIMING("LinkJob::PrepareStabBlocks");
+
+	int count_stabs = output_stab_info.GetCount() / STAB_STABSIZE;
+	if(dump_flags & DUMP_STABS) {
+		STAB_INFO aux_stab, *stab = &aux_stab;
+		for(int i = 0; i < count_stabs; i++) {
+			GET_STAB(stab, output_stab_info.GetIter(i * STAB_STABSIZE));
+			String desc;
+			desc << NFormat("[%d]: type %02x, desc %04x, value %08x, %s",
+				i, stab->type, stab->desc, stab->value, output_stab_strings.GetIter(stab->strdx));
+			puts(desc);
+		}
+		puts(NFormat("Total %d stabs, .stab = %d B, .stabstr = %d B",
+			count_stabs, output_stab_info.GetCount(), output_stab_strings.GetCount()));
+	}
+/*
+	for(int f = 0; f < output_stab_fixup_pos.GetCount(); f++) {
+		int sec_index = GetSection(output_stab_fixups[f]).sec_map_index;
+		if(sec_index >= 0) {
+			int pos = output_stab_fixup_pos[f];
+			byte *p = output_stab_info.GetIter(STAB_STABSIZE * pos + STAB_VALOFF);
+			PokeIL(p, PeekIL(p) + section_map[sec_index].rva + code_rva + image_base);
+			highlow_fixup_rva.Add(pos * STAB_STABSIZE + STAB_VALOFF + groups[GRP_STAB].rva + code_rva);
+		}
+	}
+*/
+	PokeIW(output_stab_info.GetIter(STAB_DESCOFF), count_stabs);
+	PokeIL(output_stab_info.GetIter(STAB_VALOFF), output_stab_strings.GetCount());
+
+	groups[GRP_STABSTR].rva = groups[GRP_STAB].rva + ((output_stab_info.GetCount() + image_align - 1) & -image_align);
+	groups[GRP_STABSTR].rfa = groups[GRP_STAB].rfa + ((output_stab_info.GetCount() + file_align - 1) & -file_align);
+	groups[GRP_COUNT].rva = groups[GRP_SYMBOLS].rva = groups[GRP_STABSTR].rva + ((output_stab_strings.GetCount() + image_align - 1) & -image_align);
+	groups[GRP_COUNT].rfa = groups[GRP_SYMBOLS].rfa = groups[GRP_STABSTR].rfa + ((output_stab_strings.GetCount() + file_align - 1) & -file_align);
+}
+
+void LinkJob::PrepareFixupBlocks()
+{
+	Sort(highlow_fixup_rva);
+	int first = -1;
+	Vector<byte> block;
+	for(int i = 0; i < highlow_fixup_rva.GetCount(); i++) {
+		int fp = highlow_fixup_rva[i];
+		ASSERT(i == 0 || fp > highlow_fixup_rva[i - 1]); // duplicate relocations
+		if(block.IsEmpty() || ((fp ^ first) & -4096)) {
+			if(!block.IsEmpty()) {
+				ASSERT(first >= 0);
+				if(block.GetCount() & 2) {
+					block.Add(0);
+					block.Add(0);
+				}
+				int o = CatN(output_fixups, 8, NULL);
+				PokeIL(&output_fixups[o], first);
+				PokeIL(&output_fixups[o + 4], 8 + block.GetCount());
+				output_fixups.AppendPick(block);
+				block.Clear();
+			}
+			first = fp & -4096;
+		}
+		fp -= first;
+		block.Add(fp);
+		block.Add((fp >> 8) + 16 * COFF_IMAGE_REL_BASED_HIGHLOW);
+	}
+	if(!block.IsEmpty()) {
+		ASSERT(first >= 0);
+		if(block.GetCount() & 2) {
+			block.Add(0);
+			block.Add(0);
+		}
+		int o = CatN(output_fixups, 8, NULL);
+		PokeIL(&output_fixups[o], first);
+		PokeIL(&output_fixups[o + 4], 8 + block.GetCount());
+		output_fixups.AppendPick(block);
+	}
+}
+
+void LinkJob::PrepareImageInfo()
+{
+	CheckUnresolved();
+	if(debug_info && stab_section >= 0)
+		PrepareStabBlocks();
+//	if(has_symbols)
+	if(symbol_section >= 0)
+		PrepareSymbolTable();
+	if(!image_fixed)
+		PrepareFixupBlocks();
+
+	if(dump_flags & DUMP_SECTIONS) {
+		PutStdOut(NFormat("Sections (%d total, %d parts):", section_name_map.GetCount(), section_map.GetCount()));
+		for(int i = 0; i < section_name_map.GetCount(); i++) {
+			const Section& sec = section_map[section_name_map[i]];
+			int last_index = (i + 1 < section_name_map.GetCount()
+				? section_name_map[i + 1] : section_map.GetCount()) - 1;
+			const Section& last = section_map[last_index];
+			const ObjectFile::Section& oflast = GetSection(last.obj_sec);
+			PutStdOut(NFormat("%10<s RVA %08x RFA %08x LEN %08x",
+				atoms[section_name_map.GetKey(i)], sec.rva, sec.rfa,
+				last.rva - sec.rva + oflast.size));
+		}
+		PutStdOut(NFormat("Section groups (%d total):", GRP_COUNT));
+		for(int i = 0; i <= GRP_COUNT; i++)
+			PutStdOut(NFormat("[%d] RVA: %08x RFA %08x RAWSIZE %08x", i, groups[i].rva, groups[i].rfa, groups[i].raw_size));
+	}
+
+	if(dump_flags & DUMP_SECTIONS_ALL) {
+		PutStdOut("Section map:");
+		for(int i = 0; i < section_map.GetCount(); i++) {
+			const Section& sec = section_map[i];
+			const ObjectFile& of = objects[sec.obj_sec.object];
+			const ObjectFile::Section& ofsec = of.sections[sec.obj_sec.section];
+			PutStdOut(NFormat("RVA %08x, RFA %08x (%08x): %10<s %s: %s", sec.rva, sec.rfa,
+				ofsec.size, atoms[ofsec.sec_atom], atoms[ofsec.name_atom], FormatSection(sec.obj_sec)));
+			if(dump_flags & DUMP_SEC_DEFINES)
+				for(int s = global_obj_sec_index.Find(sec.obj_sec); s >= 0; s = global_obj_sec_index.FindNext(s))
+					if(globals[s].type != COFF_IMAGE_SYM_TYPE_SECTION)
+						PutStdOut(NFormat("\tdefines: %s", atoms[globals.GetKey(s)]));
+		}
+//		for(i = 0; i < section_name_map.GetCount(); i++)
+///			PutStdOut(NFormat("%s
+	}
+
+	int i;
+	for(i = 0; i < section_name_map.GetCount(); i++) {
+		COFF_IMAGE_SECTION_HEADER sechdr;
+		Zero(sechdr);
+		String name = atoms[section_name_map.GetKey(i)];
+		memcpy(sechdr.Name, name, min(name.GetLength(), 8));
+		int first_part = section_name_map[i];
+		Section& first = section_map[first_part];
+		int last_part;
+		if(i + 1 < section_name_map.GetCount())
+			last_part = section_name_map[i + 1] - 1;
+		else
+			last_part = section_map.GetCount() - 1;
+		const Section& last = section_map[last_part];
+		sechdr.Misc.VirtualSize = last.rva - first.rva + GetSection(last.obj_sec).size;
+		sechdr.VirtualAddress = code_rva + first.rva;
+		sechdr.SizeOfRawData = 0;
+		for(; last_part >= first_part; last_part--) {
+			const Section& chk = section_map[last_part];
+			if(!chk.udata) {
+				const ObjectFile::Section& ofsec = GetSection(chk.obj_sec);
+				sechdr.SizeOfRawData = chk.rva - first.rva + ofsec.size;
+				break;
+			}
+		}
+		sechdr.SizeOfRawData = (sechdr.SizeOfRawData + file_align - 1) & -file_align;
+		sechdr.PointerToRawData = (sechdr.SizeOfRawData ? code_rfa + first.rfa : 0);
+		sechdr.PointerToRelocations = 0;
+		sechdr.PointerToLinenumbers = 0;
+		sechdr.Characteristics = GetSection(first.obj_sec).flags
+			& (COFF_IMAGE_SCN_CNT_CODE | COFF_IMAGE_SCN_CNT_INITIALIZED_DATA | COFF_IMAGE_SCN_CNT_UNINITIALIZED_DATA
+				| COFF_IMAGE_SCN_MEM_EXECUTE | COFF_IMAGE_SCN_MEM_READ | COFF_IMAGE_SCN_MEM_WRITE
+				| COFF_IMAGE_SCN_MEM_SHARED | COFF_IMAGE_SCN_MEM_DISCARDABLE | COFF_IMAGE_SCN_MEM_NOT_CACHED
+				| COFF_IMAGE_SCN_MEM_NOT_PAGED);
+		memcpy(&output_image[secmap_pos + (int)sizeof(COFF_IMAGE_SECTION_HEADER) * i], &sechdr, sizeof(sechdr));
+	}
+
+	enum {
+//		STAB_SEC_STYLE = COFF_IMAGE_SCN_CNT_INITIALIZED_DATA | COFF_IMAGE_SCN_MEM_READ
+//			| COFF_IMAGE_SCN_MEM_SHARED | COFF_IMAGE_SCN_MEM_DISCARDABLE
+		STAB_SEC_STYLE = COFF_IMAGE_SCN_MEM_DISCARDABLE | COFF_IMAGE_SCN_MEM_READ
+		| COFF_IMAGE_SCN_TYPE_NOLOAD | COFF_IMAGE_SCN_LNK_REMOVE
+	};
+
+	if(stab_section >= 0) {
+		COFF_IMAGE_SECTION_HEADER stab;
+		Zero(stab);
+		strcpy((char *)stab.Name, ".stab");
+		stab.Misc.VirtualSize = output_stab_info.GetCount();
+		stab.SizeOfRawData = (stab.Misc.VirtualSize + file_align - 1) & -file_align;
+		stab.VirtualAddress = groups[GRP_STAB].rva + code_rva;
+		stab.PointerToRawData = groups[GRP_STAB].rfa + code_rfa;
+		stab.Characteristics = STAB_SEC_STYLE;
+		memcpy(&output_image[secmap_pos + (int)sizeof(COFF_IMAGE_SECTION_HEADER) * stab_section],
+			&stab, sizeof(stab));
+	}
+
+	if(stabstr_section >= 0) {
+		COFF_IMAGE_SECTION_HEADER stabstr;
+		Zero(stabstr);
+		memcpy((char *)stabstr.Name, ".stabstr", 8);
+		stabstr.Misc.VirtualSize = output_stab_strings.GetCount();
+		stabstr.SizeOfRawData = (stabstr.Misc.VirtualSize + file_align - 1) & -file_align;
+//		stabstr.Misc.VirtualSize = stabstr.SizeOfRawData = groups[GRP_COUNT].rva - groups[GRP_STABSTR].rva;
+		stabstr.VirtualAddress = groups[GRP_STABSTR].rva  + code_rva;
+		stabstr.PointerToRawData = groups[GRP_STABSTR].rfa + code_rfa;
+		stabstr.Characteristics = STAB_SEC_STYLE;
+		memcpy(&output_image[secmap_pos + (int)sizeof(COFF_IMAGE_SECTION_HEADER) * stabstr_section],
+			&stabstr, sizeof(stabstr));
+	}
+
+	if(symbol_section >= 0) {
+		COFF_IMAGE_SECTION_HEADER sym;
+		Zero(sym);
+		strcpy((char *)sym.Name, ".symbol");
+		sym.Misc.VirtualSize = coff_output_symbols.GetCount() * sizeof(COFF_IMAGE_SYMBOL)
+			+ 4 + coff_output_symbol_strings.GetLength();
+		sym.SizeOfRawData = (sym.Misc.VirtualSize + file_align - 1) & -file_align;
+		sym.VirtualAddress = groups[GRP_SYMBOLS].rva + code_rva;
+		sym.PointerToRawData = groups[GRP_SYMBOLS].rfa + code_rfa;
+		sym.Characteristics = COFF_IMAGE_SCN_LNK_REMOVE | COFF_IMAGE_SCN_MEM_DISCARDABLE
+			| COFF_IMAGE_SCN_MEM_READ | COFF_IMAGE_SCN_TYPE_NOLOAD;
+		memcpy(&output_image[secmap_pos + (int)sizeof(COFF_IMAGE_SECTION_HEADER) * symbol_section],
+			&sym, sizeof(sym));
+	}
+
+	output_fixup_size = 0;
+	if(reloc_section >= 0) { // fill in relocation segment header
+		COFF_IMAGE_SECTION_HEADER reloc;
+		Zero(reloc);
+		strcpy((char *)reloc.Name, ".reloc");
+		reloc.SizeOfRawData = reloc.Misc.VirtualSize = output_fixups.GetCount();
+		output_fixup_size = (reloc.Misc.VirtualSize + file_align - 1) & -file_align;
+		reloc.VirtualAddress = groups[GRP_COUNT].rva + code_rva;
+		reloc.PointerToRawData = groups[GRP_COUNT].rfa + code_rfa;
+		reloc.Characteristics = COFF_IMAGE_SCN_MEM_DISCARDABLE | COFF_IMAGE_SCN_MEM_READ;
+		memcpy(&output_image[secmap_pos + (int)sizeof(COFF_IMAGE_SECTION_HEADER) * reloc_section],
+			&reloc, sizeof(reloc));
+	}
+
+/*
+	for(i = 0; i < used_dll_objects.GetCount(); i++) {
+		const ObjectFile& of = objects[used_dll_objects[i]];
+		COFF_IMAGE_IMPORT_DESCRIPTOR idesc;
+		Zero(idesc);
+		idesc.OriginalFirstThunk = section_map[of.sections[ObjectFile::SEC_DLL_IMPORTS].sec_map_index].rva;
+		idesc.ForwarderChain = -1;
+		idesc.Name = section_map[of.sections[ObjectFile::SEC_DLL_NAMES].sec_map_index].rva;
+		idesc.FirstThunk = section_map[of.sections[ObjectFile::SEC_DLL_BOUND].sec_map_index].rva;
+		memcpy(&output_image[impmap_pos + i * (int)sizeof(idesc)], &idesc, sizeof(idesc));
+	}
+*/
+	COFF_IMAGE_OPTIONAL_HEADER32 opthdr;
+	Zero(opthdr);
+	opthdr.Magic = 0x10b; // PE32; PE32+ = 0x20b
+	opthdr.MajorLinkerVersion = ULD_VERSION_MAJOR * 10 + ULD_VERSION_MINOR;
+	opthdr.MinorLinkerVersion = ULD_VERSION_RELEASE;
+	opthdr.SizeOfCode = groups[GRP_DATA_BEGIN].rva;
+	opthdr.SizeOfInitializedData = groups[GRP_BSS_BEGIN].rva - groups[GRP_DATA_BEGIN].rva;
+	opthdr.SizeOfUninitializedData = groups[GRP_BSS_END].rva - groups[GRP_BSS_BEGIN].rva;
+	int entry = collected_symbols[0];
+	if(entry >= 0) {
+		const Symbol& sym = globals[entry];
+		if(sym.obj_sec.section < 0 && !image_fixed)
+			PutStdOut(NFormat("%s: absolute entry point in non-fixed application, application may not work", atoms[globals.GetKey(entry)]));
+		opthdr.AddressOfEntryPoint = sym.value;
+	}
+	opthdr.BaseOfCode = code_rva;
+	opthdr.BaseOfData = code_rva + groups[GRP_DATA_BEGIN].rva;
+
+	opthdr.ImageBase = image_base;
+	opthdr.SectionAlignment = image_align;
+	opthdr.FileAlignment = file_align;
+	opthdr.MajorOperatingSystemVersion = 4;
+	opthdr.MinorOperatingSystemVersion = 0;
+	opthdr.MajorImageVersion = major_version;
+	opthdr.MinorImageVersion = minor_version;
+	opthdr.MajorSubsystemVersion = major_subsystem_version;
+	opthdr.MinorSubsystemVersion = minor_subsystem_version;
+	opthdr.Win32VersionValue = 0;
+//	opthdr.SizeOfImage = (code_rva + groups[GRP_COUNT].rva + output_fixups.GetCount() + file_align - 1) & -file_align;
+	opthdr.SizeOfImage = code_rva + groups[GRP_COUNT].rva + ((output_fixup_size + image_align - 1) & -image_align);
+	opthdr.SizeOfHeaders = code_rfa;
+	opthdr.CheckSum = 0;
+	opthdr.Subsystem = subsystem;
+	opthdr.DllCharacteristics;
+	opthdr.SizeOfStackReserve = stack_reserve;
+	opthdr.SizeOfStackCommit = stack_commit;
+	opthdr.SizeOfHeapReserve = heap_reserve;
+	opthdr.SizeOfHeapCommit = heap_commit;
+	opthdr.LoaderFlags = 0;
+	opthdr.NumberOfRvaAndSizes = __countof(opthdr.DataDirectory);
+	opthdr.DataDirectory[COFF_IMAGE_DIRECTORY_ENTRY_BASERELOC].Size = output_fixups.GetCount();
+	if(!output_fixups.IsEmpty())
+		opthdr.DataDirectory[COFF_IMAGE_DIRECTORY_ENTRY_BASERELOC].VirtualAddress = groups[GRP_COUNT].rva + code_rva;
+	if(opthdr.DataDirectory[COFF_IMAGE_DIRECTORY_ENTRY_EXPORT].Size = groups[GRP_EDATA].raw_size)
+		opthdr.DataDirectory[COFF_IMAGE_DIRECTORY_ENTRY_EXPORT].VirtualAddress = groups[GRP_EDATA].rva + code_rva;
+	if(opthdr.DataDirectory[COFF_IMAGE_DIRECTORY_ENTRY_IMPORT].Size = idesc_end_rva - idesc_rva)
+		opthdr.DataDirectory[COFF_IMAGE_DIRECTORY_ENTRY_IMPORT].VirtualAddress = idesc_rva + code_rva;
+	if(opthdr.DataDirectory[COFF_IMAGE_DIRECTORY_ENTRY_IAT].Size = iat2_end_rva - iat2_rva)
+		opthdr.DataDirectory[COFF_IMAGE_DIRECTORY_ENTRY_IAT].VirtualAddress = iat2_rva + code_rva;
+	if(opthdr.DataDirectory[COFF_IMAGE_DIRECTORY_ENTRY_RESOURCE].Size = rsrc_end_rva - rsrc_rva)
+		opthdr.DataDirectory[COFF_IMAGE_DIRECTORY_ENTRY_RESOURCE].VirtualAddress = code_rva + rsrc_rva;
+	memcpy(&output_image[iohdr_pos], &opthdr, sizeof(opthdr));
+
+	COFF_IMAGE_FILE_HEADER ifhdr;
+	Zero(ifhdr);
+	ifhdr.Machine = machine;
+	ifhdr.NumberOfSections = section_count;
+	ifhdr.TimeDateStamp = timestamp = time(NULL);
+	ifhdr.PointerToSymbolTable = 0;
+	ifhdr.NumberOfSymbols = 0;
+	if(symbol_section >= 0) {
+		ifhdr.PointerToSymbolTable = code_rfa + groups[GRP_SYMBOLS].rfa;
+		ifhdr.NumberOfSymbols = coff_output_symbols.GetCount();
+	}
+	ifhdr.SizeOfOptionalHeader = sizeof(opthdr); //!! temporary
+	ifhdr.Characteristics = COFF_IMAGE_FILE_EXECUTABLE_IMAGE
+		| COFF_IMAGE_FILE_32BIT_MACHINE
+//		| COFF_IMAGE_FILE_BYTES_REVERSED_LO
+		| COFF_IMAGE_FILE_LINE_NUMS_STRIPPED
+		| (debug_info ? 0 : COFF_IMAGE_FILE_LOCAL_SYMS_STRIPPED)
+		| (debug_info ? 0 : COFF_IMAGE_FILE_DEBUG_STRIPPED)
+		| (image_fixed ? COFF_IMAGE_FILE_RELOCS_STRIPPED : 0)
+		| (make_dll ? COFF_IMAGE_FILE_DLL : 0)
+		// COFF_IMAGE_FILE_AGGRESSIVE_WS_TRIM
+		// COFF_IMAGE_FILE_LARGE_ADDRESS_AWARE
+		// COFF_IMAGE_FILE_16BIT_MACHINE
+		// COFF_IMAGE_FILE_REMOVABLE_RUN_FROM_SWAP
+		// COFF_IMAGE_FILE_SYSTEM
+		// COFF_IMAGE_FILE_DLL
+		// COFF_IMAGE_FILE_UP_SYSTEM_ONLY
+		// COFF_IMAGE_FILE_BYTES_REVERSED_HI
+		;
+	memcpy(&output_image[ifhdr_pos], &ifhdr, sizeof(ifhdr));
+
+	if(dump_flags & DUMP_STAT) {
+		PutStdOut(NFormat("Preferred image base: %08x", image_base));
+		PutStdOut(NFormat("Entry point RVA:      %08x", (int)opthdr.AddressOfEntryPoint));
+	}
+}
+
+void LinkJob::WriteImageFile()
+{
+	outputfile = AppendExt(outputfile, ".exe");
+	FileOut fo;
+	if(!fo.Open(outputfile))
+		throw Exc(NFormat("%s: error creating file", outputfile));
+	if(verbose)
+		PutStdOut(NFormat("%s: writing output file (%d bytes)",
+			outputfile, groups[GRP_COUNT].rfa + code_rfa + output_fixups.GetCount()));
+	fo.Put(output_image.Begin(), output_image.GetCount());
+	if(stab_section >= 0) {
+		fo.Put(0, int(groups[GRP_STAB].rfa + code_rfa - fo.GetPos()));
+		fo.Put(output_stab_info.Begin(), output_stab_info.GetCount());
+	}
+	if(stabstr_section >= 0) {
+		fo.Put(0, int(groups[GRP_STABSTR].rfa + code_rfa - fo.GetPos()));
+		fo.Put(output_stab_strings.Begin(), output_stab_strings.GetCount());
+	}
+	if(symbol_section >= 0) {
+		fo.Put(0, int(groups[GRP_SYMBOLS].rfa + code_rfa - fo.GetPos()));
+		fo.Put(coff_output_symbols.Begin(), coff_output_symbols.GetCount() * sizeof(COFF_IMAGE_SYMBOL));
+		fo.PutIL(coff_output_symbol_strings.GetLength() + 4);
+		fo.Put(coff_output_symbol_strings.Begin(), coff_output_symbol_strings.GetLength());
+	}
+	fo.Put(0, int(code_rfa + groups[GRP_COUNT].rfa - fo.GetPos()));
+	if(!image_fixed)
+		fo.Put(output_fixups.Begin(), output_fixups.GetCount());
+//	fo.Put(0, int(opthdr.SizeOfImage - fo.GetPos()));
+	fo.Close();
+	if(fo.IsError()) {
+		FileDelete(outputfile);
+		throw Exc(NFormat("%s: error writing output file", outputfile));
+	}
+
+	if(write_mapfile)
+		WriteMapFile();
+}
+
+/*
+static const char cachefile_header[32] = "ULD Link Cache File v. 1\r\n\x1A\0";
+enum
+{
+	CACHE_TAG_SIZE    = 32,
+	CACHE_DIROFF_SIZE = 4,
+	CACHE_DATA_POS    = CACHE_TAG_SIZE + CACHE_DIROFF_SIZE,
+	CACHE_DIR_HEAD    = 0x02468ACE,
+	CACHE_DIR_TAIL    = 0x13579BDF,
+	CACHE_MAX_SIZE    = 500000000,
+};
+*/
+
+/*
+void LinkJob::OpenCacheFile()
+{
+	cache_dirty = false;
+	if(!cache_objects || IsNull(cache_file_name))
+		return;
+	if(cache_file.Open(cache_file_name, FileStream::READWRITE)) {
+		char buffer[CACHE_TAG_SIZE + CACHE_DIROFF_SIZE];
+		if(!cache_file.GetAll(buffer, sizeof(buffer)) || memcmp(buffer, cachefile_header, CACHE_TAG_SIZE))
+			cache_file.SetError();
+		else {
+			int offset = PeekIL(buffer + CACHE_TAG_SIZE); ASSERT(CACHE_DIROFF_SIZE == 4);
+			if(offset < CACHE_DATA_POS || offset >= (int)cache_file.GetSize() - 8)
+				cache_file.SetError();
+			else {
+				cache_file.Seek(offset);
+				if(cache_file.GetIL() != CACHE_DIR_HEAD)
+					cache_file.SetError();
+				else {
+					cache_file.SetLoading();
+					cache_file % object_cache;
+					int tail = cache_file.GetIL();
+					if(tail != CACHE_DIR_TAIL || cache_file.GetLeft() != 0)
+						cache_file.SetError();
+				}
+			}
+		}
+		if(cache_file.IsError()) {
+			PutStdOut(NFormat("Rewriting cache file '%s'", cache_file_name));
+			object_cache.Clear();
+			cache_file.ClearError();
+			cache_file.Seek(0);
+			cache_file.SetSize(0);
+		}
+		else
+			PutStdOut(NFormat("Open cache file '%s', %d objects", cache_file_name, object_cache.GetCount()));
+		cache_name_index.Clear();
+		cache_library_index.Clear();
+		for(int i = 0; i < object_cache.GetCount(); i++) {
+			const Cache& obj = object_cache[i];
+			cache_name_index.Add(String().Cat() << obj.library << ':' << obj.file);
+			cache_library_index.Add(obj.library);
+		}
+	}
+}
+*/
+
+/*
+void LinkJob::SaveCacheFile()
+{
+	if(!cache_objects)
+		return;
+	if(cache_dirty) {
+		if(!cache_file.IsError()) {
+			int first_pos = CACHE_DATA_POS, used_size = 0;
+			for(int i = 0; i < object_cache.GetCount(); i++) {
+				used_size += object_cache[i].size;
+				first_pos = object_cache[i].offset + object_cache[i].size;
+			}
+			if(cache_file.GetSize() >= 2u * used_size)
+				cache_file.SetError();
+			else {
+				cache_file.Seek(first_pos);
+				cache_file.PutIL(CACHE_DIR_HEAD);
+				cache_file.SetStoring();
+				cache_file % object_cache;
+				cache_file.PutIL(CACHE_DIR_TAIL);
+				cache_file.SetSize(cache_file.GetSize());
+				if(!cache_file.IsError()) {
+					cache_file.Seek(CACHE_TAG_SIZE);
+					cache_file.PutIL(first_pos);
+				}
+			}
+		}
+	}
+	cache_file.Close();
+	if(cache_file.IsError())
+		FileDelete(cache_file_name);
+}
+*/
+
+void LinkJob::WriteImageSections()
+{
+	LTIMING("LinkJob::WriteImageSections");
+
+//	OpenCacheFile();
+
+	for(int i = 0; i < objects.GetCount(); i++) {
+		ObjectFile& of = objects[i];
+		if(!of.used_any)
+			continue;
+		if(of.dll_atom)
+			RelocateImport(of);
+		else if(of.filetype == ObjectFile::INTERNAL)
+			RelocateInternal(of);
+		else {
+			const byte *begin = 0;
+/*
+			Buffer<byte> cachebuf;
+			String cache_key;
+			if(cache_objects)
+				cache_key << of.library_file << ':' << of.object_file;
+			int f;
+			if(cache_objects && !cache_file.IsError() && (f = cache_name_index.Find(cache_key)) >= 0) {
+				Cache& cache = object_cache[f];
+				ASSERT(cache.library == of.library_file);
+				ASSERT(cache.file == of.object_file);
+				if(cache.time == of.file_time && cache.size == of.object_size) {
+					LTIMING("reading cache data");
+					cachebuf.Alloc(cache.size);
+					cache_file.Seek(cache.offset);
+					if(!cache_file.GetAll(cachebuf, cache.size))
+						cache_file.SetError();
+					if(!cache_file.IsError())
+						begin = cachebuf;
+				}
+				else {
+					Vector<int> to_remove;
+					if(IsNull(of.library_file))
+						to_remove.Add(f);
+					else
+						for(int r = cache_library_index.Find(of.library_file); r >= 0; r = cache_library_index.FindNext(r))
+							to_remove.Add(r);
+					while(!to_remove.IsEmpty()) {
+						int i = to_remove.Pop();
+						cache_name_index.Remove(i);
+						cache_library_index.Remove(i);
+						object_cache.Remove(i);
+					}
+				}
+			}
+*/
+			if(!begin && !of.object_data.IsEmpty())
+				begin = of.object_data;
+			if(!begin) {
+				String ofile = Nvl(of.library_file, of.object_file);
+				FileMapping& mapping = GetMapping(ofile);
+				if(!mapping.IsOpen())
+					throw Exc(NFormat("%s: error opening file", ofile));
+				begin = mapping.Begin() + of.library_offset;
+/*
+				if(cache_objects && !cache_file.IsError()) {
+					int first_pos = 36;
+					int i = 0;
+					while(i < object_cache.GetCount() && object_cache[i].offset - first_pos < of.object_size) {
+						first_pos = object_cache[i].offset + object_cache[i].size;
+						i++;
+					}
+					if(i && i >= object_cache.GetCount())
+						first_pos += object_cache.Top().size >> 3;
+					if(first_pos + of.object_size < CACHE_MAX_SIZE) {
+						if(!cache_dirty) {
+							if(cache_file.GetSize() < CACHE_TAG_SIZE) {
+								cache_file.Seek(0);
+								cache_file.Put(cachefile_header, CACHE_TAG_SIZE);
+							}
+							cache_file.Seek(CACHE_TAG_SIZE);
+							cache_file.PutIL(0); ASSERT(CACHE_DIROFF_SIZE == 4);
+							cache_dirty = true;
+						}
+						if((unsigned)first_pos > cache_file.GetSize()) {
+							cache_file.SeekEnd();
+							cache_file.Put('\0', int(first_pos - cache_file.GetPos()));
+						}
+						else
+							cache_file.Seek(first_pos);
+						cache_file.Put(begin, of.object_size);
+						Cache& new_item = object_cache.Insert(i);
+						new_item.library = of.library_file;
+						new_item.file = of.object_file;
+						new_item.time = of.file_time;
+						new_item.offset = first_pos;
+						new_item.size = of.object_size;
+						cache_name_index.Insert(i, cache_key);
+						cache_library_index.Insert(i, new_item.library);
+					}
+				}
+*/
+			}
+			LTIMING("relocating objects");
+			RelocateObject(of, begin);
+			if(debug_info)
+				RelocateStabs(of, begin);
+		}
+	}
+
+//	SaveCacheFile();
+}
+
+void LinkJob::RelocateImport(const ObjectFile& of)
+{
+	const ObjectFile::Section& stubsec = of.sections[ObjectFile::SEC_DLL_STUBS];
+	const ObjectFile::Section& impsec = of.sections[ObjectFile::SEC_DLL_IMPORTS];
+	int impsec_rva = section_map[impsec.sec_map_index].rva + code_rva;
+	const ObjectFile::Section& bimpsec = of.sections[ObjectFile::SEC_DLL_BOUND];
+	int bimpsec_rva = section_map[bimpsec.sec_map_index].rva + code_rva;
+	const ObjectFile::Section& namesec = of.sections[ObjectFile::SEC_DLL_NAMES];
+	int namesec_rva = (namesec.sec_map_index >= 0 ? section_map[namesec.sec_map_index].rva + code_rva : 0);
+	const ObjectFile::Section& descsec = of.sections[ObjectFile::SEC_DLL_DESCRIPTOR];
+	int descsec_rva = section_map[descsec.sec_map_index].rva + code_rva;
+	for(int s = section_object_index.Find(of.index); s >= 0; s = section_object_index.FindNext(s)) {
+		const Section& sec = section_map[s];
+		ASSERT(sec.obj_sec.object == of.index);
+		int sec_rva = code_rva + sec.rva;
+		byte *sbegin = &output_image[code_rfa + sec.rfa];
+		const ObjectFile::Section& ofsec = of.sections[sec.obj_sec.section];
+		memcpy(sbegin, ofsec.section_data.Begin(), ofsec.section_data.GetCount());
+		if(sec.obj_sec.section == ObjectFile::SEC_DLL_STUBS) {
+			ASSERT(ofsec.size == imp_stub_size * of.used_stubs.GetCount());
+			for(int i = 0; i < of.used_stubs.GetCount(); i++, sbegin += imp_stub_size) {
+				int imp = (1 + of.used_imports.Find(of.used_stubs[i])) * imp_entry_size;
+				switch(machine) {
+					case COFF_IMAGE_FILE_MACHINE_I386: {
+						sbegin[0] = 0xFF; // JMP dword ptr [12345678]
+						sbegin[1] = 0x25;
+						ASSERT(imp >= 0);
+						PokeIL(sbegin + 2, image_base + bimpsec_rva + imp);
+						highlow_fixup_rva.Add(sec_rva + 2 + i * imp_stub_size);
+						break;
+					}
+					case COFF_IMAGE_FILE_MACHINE_ARM: {
+						PokeIL(sbegin + 0, 0xE59FC000);
+						PokeIL(sbegin + 4, 0xE59CF000);
+						PokeIL(sbegin + 8, image_base + bimpsec_rva + imp);
+						highlow_fixup_rva.Add(sec_rva + 8 + i * imp_stub_size);
+						break;
+					}
+					default: {
+						PutStdOut(NFormat("%s: stub generation for %s not implemented", AsString(of), COFFMachineName(machine)));
+						return;
+					}
+				}
+			}
+		}
+		else if(sec.obj_sec.section == ObjectFile::SEC_DLL_IMPORTS || sec.obj_sec.section == ObjectFile::SEC_DLL_BOUND) {
+			for(int i = 0; i < of.used_imports.GetCount(); i++) {
+				sbegin += imp_entry_size;
+				int imptr = PeekIL(sbegin);
+				if(!(imptr & 0x80000000)) {
+					imptr += namesec_rva;
+					PokeIL(sbegin, imptr);
+//					highlow_fixup_rva.Add(sec_rva + IMP_ENTRY_SIZE * (i + 1));
+				}
+			}
+		}
+		else if(sec.obj_sec.section == ObjectFile::SEC_DLL_DESCRIPTOR) {
+			COFF_IMAGE_IMPORT_DESCRIPTOR idesc;
+			Zero(idesc);
+			idesc.OriginalFirstThunk = impsec_rva + imp_entry_size;
+			idesc.ForwarderChain = 0;
+			idesc.Name = namesec_rva;
+			idesc.FirstThunk = bimpsec_rva + imp_entry_size;
+			memcpy(sbegin, &idesc, sizeof(idesc));
+//			highlow_fixup_rva.Add(sec_rva + __offsetof(COFF_IMAGE_IMPORT_DESCRIPTOR, OriginalFirstThunk));
+//			highlow_fixup_rva.Add(sec_rva + __offsetof(COFF_IMAGE_IMPORT_DESCRIPTOR, Name));
+//			highlow_fixup_rva.Add(sec_rva + __offsetof(COFF_IMAGE_IMPORT_DESCRIPTOR, FirstThunk));
+		}
+	}
+}
+
+void LinkJob::RelocateInternal(const ObjectFile& of)
+{
+	LTIMING("LinkJob::RelocateInternal");
+
+	for(int s = section_object_index.Find(of.index); s >= 0; s = section_object_index.FindNext(s)) {
+		const Section& sec = section_map[s];
+		if(sec.obj_sec.object == 0 && sec.obj_sec.section == 0)
+			continue; // comdat
+		ASSERT(sec.obj_sec.object == of.index);
+		int destseg_rva = code_rva + sec.rva;
+		byte *sbegin = &output_image[code_rfa + sec.rfa];
+		const ObjectFile::Section& ofsec = GetSection(sec.obj_sec);
+		if(/*ofsec.type == ObjectFile::SEC_INULL ||*/ ofsec.type == ObjectFile::SEC_ANON_COMDAT)
+			continue;
+		ASSERT(ofsec.type == ObjectFile::SEC_STD || ofsec.type == ObjectFile::SEC_RAW);
+		int datalen = min(ofsec.section_data.GetCount(), ofsec.size);
+		memcpy(sbegin, ofsec.section_data.Begin(), datalen);
+	}
+}
+
+void LinkJob::RelocateObject(const ObjectFile& of, const byte *begin)
+{
+	LTIMING("LinkJob::RelocateObject");
+
+	const COFF_IMAGE_FILE_HEADER *header = (const COFF_IMAGE_FILE_HEADER *)begin;
+	const COFF_IMAGE_SECTION_HEADER *sechdr = (const COFF_IMAGE_SECTION_HEADER *)(begin
+		+ sizeof(COFF_IMAGE_FILE_HEADER) + header->SizeOfOptionalHeader);
+	const COFF_IMAGE_SYMBOL *symtbl = (const COFF_IMAGE_SYMBOL *)(begin + header->PointerToSymbolTable);
+	const char *strtbl = (const char *)(symtbl + header->NumberOfSymbols);
+	for(int s = section_object_index.Find(of.index); s >= 0; s = section_object_index.FindNext(s)) {
+		const Section& sec = section_map[s];
+		if(sec.obj_sec.object == 0 && sec.obj_sec.section == 0 || sec.udata)
+			continue; // comdat
+		ASSERT(sec.obj_sec.object == of.index);
+		int destseg_rva = code_rva + sec.rva;
+		byte *sbegin = &output_image[code_rfa + sec.rfa];
+		const ObjectFile::Section& ofsec = GetSection(sec.obj_sec);
+		ASSERT(ofsec.type == ObjectFile::SEC_STD);
+		const COFF_IMAGE_SECTION_HEADER& secdata = sechdr[sec.obj_sec.section - 1];
+		if(ofsec.offset)
+			memcpy(sbegin, begin + ofsec.offset, ofsec.raw_size);
+		const COFF_IMAGE_RELOCATION *relptr = (const COFF_IMAGE_RELOCATION *)(begin + secdata.PointerToRelocations);
+		const COFF_IMAGE_RELOCATION *relend = relptr + secdata.NumberOfRelocations;
+		for(; relptr < relend; relptr++) {
+			int delta_rva = relptr->VirtualAddress - secdata.VirtualAddress;
+			int target_rva = destseg_rva + delta_rva;
+			byte *target = &output_image[(int)(code_rfa + sec.rfa + delta_rva)];
+			int value = 0;
+			ObjSec obj_sec = Null;
+			const COFF_IMAGE_SYMBOL& relsym = symtbl[relptr->SymbolTableIndex];
+			int ref_atom = NameAtom(symtbl[relptr->SymbolTableIndex], strtbl);
+			if(relsym.SectionNumber < 0) {
+				value = relsym.Value;
+				obj_sec.section = relsym.SectionNumber;
+			}
+			else if(relsym.StorageClass == COFF_IMAGE_SYM_CLASS_EXTERNAL
+			|| relsym.StorageClass == COFF_IMAGE_SYM_CLASS_WEAK_EXTERNAL
+//			|| relsym.SectionNumber > 0 && of.sections[relsym.SectionNumber].flags & COFF_IMAGE_SCN_LNK_COMDAT
+			) {
+				int coll = collected_symbols.Find(ref_atom);
+				if(coll < 0 || collected_symbols[coll] < 0) {
+					if(relsym.StorageClass == COFF_IMAGE_SYM_CLASS_WEAK_EXTERNAL) {
+						for(int f = weak_externals.Find(ref_atom); f >= 0; f = weak_externals.FindNext(f)) {
+							int c = collected_symbols.Find(weak_externals[f]);
+							if(c >= 0 && collected_symbols[c] >= 0) {
+								coll = c;
+								break;
+							}
+						}
+					}
+					unresolved.FindAdd(ref_atom);
+					continue;
+				}
+				const Symbol& sym = globals[collected_symbols[coll]];
+				if(!sym.relocated) {
+					unresolved.FindAdd(ref_atom);
+					continue;
+				}
+				value = sym.value;
+				obj_sec = sym.obj_sec;
+			}
+			else if(relsym.SectionNumber > 0) {
+				int sec_map_index = of.sections[relsym.SectionNumber].sec_map_index;
+				if(sec_map_index >= 0) {
+					obj_sec.object = of.index;
+					obj_sec.section = relsym.SectionNumber;
+					value = relsym.Value + section_map[sec_map_index].rva + code_rva;
+				}
+				else
+					PutStdOut(NFormat("%s: invalid static relocation to %s (%d)",
+						AsString(of), atoms[ref_atom], relsym.SectionNumber));
+			}
+			else
+				PutStdOut(NFormat("%s: invalid relocation to %s (%d)",
+					AsString(of), atoms[ref_atom], relsym.SectionNumber));
+			switch(machine) {
+				case COFF_IMAGE_FILE_MACHINE_I386: {
+					switch(relptr->Type) {
+						case COFF_IMAGE_REL_I386_ABSOLUTE: {
+							break;
+						}
+			//			case COFF_IMAGE_REL_I386_DIR16:
+			//			case COFF_IMAGE_REL_I386_REL16:
+						case COFF_IMAGE_REL_I386_DIR32: {
+							PokeIL(target, PeekIL(target) + value + (obj_sec.section >= 0 ? image_base : 0));
+							if(obj_sec.section >= 0)
+								highlow_fixup_rva.Add(target_rva);
+							break;
+						}
+
+						case COFF_IMAGE_REL_I386_DIR32NB: {
+							PokeIL(target, PeekIL(target) + value);
+							break;
+						}
+
+			//			case COFF_IMAGE_REL_I386_SEG12:
+						case COFF_IMAGE_REL_I386_SECTION:
+						case COFF_IMAGE_REL_I386_SECREL: {
+								int xsec = obj_sec.section >= 0 ? section_map[GetSection(obj_sec).sec_map_index].app_section : -1;
+								if(relptr->Type == COFF_IMAGE_REL_I386_SECTION)
+									PokeIW(target, PeekIW(target) + xsec);
+								else
+									PokeIL(target, PeekIL(target) + code_rva + sec.rva - (xsec >= 0 ? section_map[section_name_map[xsec]].rva : 0));
+							}
+							break;
+
+						case COFF_IMAGE_REL_I386_REL32: {
+							PokeIL(target, PeekIL(target) + value - target_rva - 4);
+							break;
+						}
+
+						default: {
+							PutStdOut(NFormat("%s: invalid i386 relocation type %d", AsString(of), relptr->Type));
+							break;
+						}
+					}
+					break;
+				}
+				case COFF_IMAGE_FILE_MACHINE_ARM: {
+					switch(relptr->Type) {
+						case COFF_IMAGE_REL_ARM_ABSOLUTE: {
+							break;
+						}
+						case COFF_IMAGE_REL_ARM_ADDR32: {
+							PokeIL(target, PeekIL(target) + value + (obj_sec.section >= 0 ? image_base : 0));
+							if(obj_sec.section >= 0)
+								highlow_fixup_rva.Add(target_rva);
+							break;
+						}
+						case COFF_IMAGE_REL_ARM_ADDR32NB: {
+							PokeIL(target, PeekIL(target) + value);
+							break;
+						}
+						case COFF_IMAGE_REL_ARM_BRANCH24: {
+							int displ = value - target_rva - 8;
+							int trunc = (displ & (1 << 25)) ? (displ | (-1 << 26)) : (displ & ((1 << 26) - 1)) & -4;
+							if(displ & 3)
+								PutStdOut(NFormat("%s: misaligned 24-bit relocation (delta = %08x)", AsString(of), displ));
+							else if(displ != trunc)
+								PutStdOut(NFormat("%s: 24-bit relocation out of range (delta = %08x)", AsString(of), displ));
+							else
+								PokeIL(target, (PeekIL(target) & (-1 << 24)) | ((displ >> 2) & ((1 << 24) - 1)));
+							break;
+						}
+						case COFF_IMAGE_REL_ARM_BRANCH11: {
+							int displ = value - target_rva - 8;
+							int trunc = (displ & (1 << 23)) ? (displ | (-1 << 24)) : (displ & ((1 << 24) - 1)) & -4;
+							if(displ & 3)
+								PutStdOut(NFormat("%s: misaligned 22-bit relocation (delta = %08x)", AsString(of), displ));
+							else if(displ != trunc)
+								PutStdOut(NFormat("%s: 22-bit relocation out of range (delta = %08x)", AsString(of), displ));
+							else {
+								PokeIW(target + 0, (PeekIW(target + 0) & (-1 << 11)) | ((displ >> 2) & ((1 << 11) - 1)));
+								PokeIW(target + 2, (PeekIW(target + 2) & (-1 << 11)) | ((displ >> 13) & ((1 << 11) - 1)));
+							}
+							break;
+						}
+						case COFF_IMAGE_REL_ARM_SECTION:
+						case COFF_IMAGE_REL_ARM_SECREL: {
+							int xsec = obj_sec.section >= 0 ? section_map[GetSection(obj_sec).sec_map_index].app_section : -1;
+							if(relptr->Type == COFF_IMAGE_REL_ARM_SECTION)
+								PokeIW(target, PeekIW(target) + xsec);
+							else
+								PokeIL(target, PeekIL(target) + code_rva + sec.rva - (xsec >= 0 ? section_map[section_name_map[xsec]].rva : 0));
+							break;
+						}
+					default:
+						PutStdOut(NFormat("%s: invalid ARM relocation type %d", AsString(of), relptr->Type));
+						break;
+					}
+					break;
+				}
+				default: {
+					PutStdOut(NFormat("%s: relocations for machine %04x not implemented", AsString(of), machine));
+					break;
+				}
+			}
+		}
+	}
+
+	if(debug_info) {
+		const COFF_IMAGE_SYMBOL *symend = symtbl + header->NumberOfSymbols;
+		for(const COFF_IMAGE_SYMBOL *symp = symtbl; symp < symend; symp++) {
+			if(symp->StorageClass == COFF_IMAGE_SYM_CLASS_STATIC && symp->SectionNumber != 0
+			&& symp->Value == 0 && symp->NumberOfAuxSymbols >= 1)
+				symp += symp->NumberOfAuxSymbols; // section entry
+			else if(AddCOFFSymbol(COFFSymbolName(*symp, strtbl), of.index, *symp))
+				for(int naux = symp->NumberOfAuxSymbols; --naux >= 0;)
+					AddAuxCOFFSymbol(*++symp);
+			else
+				symp += symp->NumberOfAuxSymbols;
+		}
+	}
+}
+
+void LinkJob::RelocateStabs(const ObjectFile& of, const byte *begin)
+{
+	LTIMING("LinkJob::RelocateStabs");
+
+	if(of.stab_index < 0 || of.stabstr_index < 0)
+		return;
+	if(dump_flags & DUMP_STAB_TYPES)
+		puts(NFormat("Relocating STABs for object '%s':", AsString(of)));
+	const char *stabstrtbl = (const char *)begin + of.sections[of.stabstr_index].offset;
+	const ObjectFile::Section& sec = of.sections[of.stab_index];
+	ASSERT(sizeof(STAB_INFO) == 12);
+	int count = sec.size / sizeof(STAB_INFO);
+	STAB_INFO aux_stab, *stab = &aux_stab;
+	STAB_INFO aux_stab2, *stab2 = &aux_stab2;
+//	int match_inc = -1;
+//	int begin_inc = -1;
+	int fileatom = 0;
+	Vector<bool> incl_stack;
+	bool incl_use = true;
+	int func_use = -1;
+//	Stab filestab;
+	const COFF_IMAGE_FILE_HEADER *header = (const COFF_IMAGE_FILE_HEADER *)begin;
+	const COFF_IMAGE_SECTION_HEADER *secptr = (const COFF_IMAGE_SECTION_HEADER *)(begin
+		+ sizeof(COFF_IMAGE_FILE_HEADER) + header->SizeOfOptionalHeader) + (of.stab_index - 1);
+	const COFF_IMAGE_RELOCATION *reloc = (const COFF_IMAGE_RELOCATION *)(begin + secptr->PointerToRelocations);
+	const COFF_IMAGE_SYMBOL *symtbl = (const COFF_IMAGE_SYMBOL *)(begin + header->PointerToSymbolTable), *symptr = symtbl;
+	const char *strtbl = (const char *)(symtbl + header->NumberOfSymbols);
+	Vector<int> stab_ref;
+	stab_ref.SetCount(count, 0);
+
+	for(int nreloc = secptr->NumberOfRelocations; --nreloc >= 0; reloc++) {
+		int entry = reloc->VirtualAddress / sizeof(STAB_INFO);
+		if(entry < 0 || entry >= count)
+			continue;
+		const COFF_IMAGE_SYMBOL& sym = symtbl[reloc->SymbolTableIndex];
+		if(sym.SectionNumber > 0 && !(of.sections[sym.SectionNumber].flags & COFF_IMAGE_SCN_LNK_COMDAT))
+			stab_ref[entry] = ~sym.SectionNumber;
+		else if(sym.StorageClass == COFF_IMAGE_SYM_CLASS_EXTERNAL || sym.StorageClass == COFF_IMAGE_SYM_CLASS_STATIC)
+			stab_ref[entry] = NameAtom(sym, strtbl);
+	}
+
+	Index<String> types_found;
+	Index<String> type_stab_ident;
+	Vector<int> type_stab_index;
+	Vector<const char *> type_stab_def;
+
+	LTIMING("LinkJob::RelocateStabs / stepping through stabs");
+	int lastfile = 0;
+	const byte *pstab = begin + sec.offset;
+	int out_index = output_stab_info.GetCount() / STAB_STABSIZE;
+	for(int istab = 0; istab < count; istab++, pstab += sizeof(STAB_INFO)) {
+		GET_STAB(stab, pstab)
+		if(stab->type == 0)
+			continue;
+		bool use_stab = !!func_use;
+		byte outtype = stab->type;
+//		Stab outstab;
+//		outstab.type = stab->type;
+		if(stab->type == N_BINCL) { // include matching
+			LTIMING("LinkJob::RelocateStabs / checking includes");
+			use_stab = true;
+			int checksum = 0;
+			int nesting = 0;
+			const char *textptr = stabstrtbl + stab->strdx;
+			const byte *npstab = pstab;
+			int nstab = istab;
+			while(++nstab < count) {
+				npstab += sizeof(STAB_INFO);
+				GET_STAB(stab2, npstab);
+				if(stab2->type == N_EINCL) {
+					if(--nesting < 0)
+						break;
+				}
+				else if(stab2->type == N_BINCL)
+					nesting++;
+				else if(nesting == 0) {
+					LTIMING("LinkJob::RelocateStabs / calculating checksums");
+					const char *str = stabstrtbl + stab2->strdx;
+					for(byte c; c = *str++;)
+						if(c == '(') {
+							while((byte)(*str++ - '0') < 10)
+								;
+							str--;
+						}
+						else if(*str == '(') {
+							checksum += c;
+							str++;
+							while((byte)(*str++ - '0') < 10)
+								;
+							str--;
+						}
+						else if(*str == 0) {
+							checksum += c;
+							break;
+						}
+						else {
+							checksum += c;
+							str++;
+						}
+				}
+			}
+			String hash;
+			int len = strlen(textptr);
+			hash.Reserve(len + sizeof(checksum));
+			hash.Cat(textptr, len);
+			hash.Cat((const char *)&checksum, sizeof(checksum));
+			incl_stack.Add(incl_use);
+			int sc = stab_bincl_map.GetCount();
+			incl_use = (stab_bincl_map.FindAdd(hash) >= sc);
+//			incl_use = true;
+			if(!incl_use)
+				outtype = N_EXCL;
+		}
+		else if(stab->type == N_EINCL) {
+			use_stab = incl_use;
+			if(!incl_stack.IsEmpty())
+				incl_use = incl_stack.Pop();
+		}
+		else if(stab->type == N_FUN) {
+			if(stab->strdx) { // beginning
+				int sr = stab_ref[istab];
+				func_use = (sr < 0 ? of.sections[~sr].used : collected_symbols.Find(sr) >= 0) ? 1 : 0;
+				use_stab = !!func_use;
+			}
+			else {
+				func_use = -1;
+			}
+		}
+		else if(func_use < 0 && (stab->type == N_STSYM || stab->type == N_LCSYM)) {
+			int sr = stab_ref[istab];
+			use_stab = (sr < 0 ? of.sections[~sr].used : collected_symbols.Find(sr) >= 0);
+		}
+		else
+			use_stab &= incl_use;
+
+		if(use_stab) {
+			LTIMING("LinkJob::RelocateStabs / used stab");
+			int value = stab->value;
+			int ref = stab_ref[istab];
+			int xsec;
+			if(ref < 0 && (xsec = of.sections[~ref].sec_map_index) >= 0) {
+				value += section_map[xsec].rva + code_rva + image_base;
+//				highlow_fixup_rva.Add(out_index * STAB_STABSIZE + STAB_VALOFF + groups[GRP_STAB].rva + code_rva);
+			}
+			else if(ref > 0) {
+				int c = collected_symbols.Find(ref);
+				if(c >= 0) {
+					const Symbol& sym = globals[collected_symbols[c]];
+					value += sym.value + image_base;
+//					highlow_fixup_rva.Add(out_index * STAB_STABSIZE + STAB_VALOFF + groups[GRP_STAB].rva + code_rva);
+				}
+			}
+			int outdx = 0;
+			if(stab->strdx) {
+				const char *text = stabstrtbl + stab->strdx;
+				int len = strlen(text) + 1;
+				unsigned hash = memhash(text, len - 1);
+				for(int f = output_stab_string_hash.Find(hash); f >= 0; f = output_stab_string_hash.FindNext(f)) {
+					int pos = output_stab_string_hash[f];
+					if(!memcmp(output_stab_strings.GetIter(pos), text, len)) {
+						outdx = pos;
+						break;
+					}
+				}
+				if(!outdx) {
+					outdx = output_stab_strings.GetCount();
+					output_stab_strings.SetCountR(outdx + len);
+					memcpy(output_stab_strings.GetIter(outdx), text, len);
+					output_stab_string_hash.Add(hash, outdx);
+				}
+			}
+
+			int ipos = output_stab_info.GetCount();
+			output_stab_info.SetCountR(ipos + STAB_STABSIZE);
+			byte *outstab = output_stab_info.GetIter(ipos);
+			PokeIL(outstab + STAB_STRDXOFF, outdx);
+			outstab[STAB_TYPEOFF] = outtype;
+			outstab[STAB_OTHEROFF] = stab->other;
+			PokeIW(outstab + STAB_DESCOFF, stab->desc);
+			PokeIL(outstab + STAB_VALOFF, value);
+			out_index++;
+		}
+	}
+}
+
+void LinkJob::CheckUnresolved()
+{
+	if(unresolved.IsEmpty())
+		return;
+	PutStdOut(NFormat("%d unresolved externals:", unresolved.GetCount()));
+	Vector<int> unrn = unresolved.PickKeys();
+	Sort(unrn, AtomOrder(*this));
+	for(int i = 0; i < unrn.GetCount(); i++) {
+		int uatom = unrn[i];
+		PutStdOut(atoms[uatom]);
+		int e = ext_obj_sec.Find(uatom);
+		if(e >= 0)
+			PutStdOut(NFormat("\t? referenced from %s", AsString(objects[ext_obj_sec[e].object])));
+		for(int g = globals.Find(uatom); g >= 0; g = globals.FindNext(g)) {
+			ObjSec os = globals[g].obj_sec;
+			PutStdOut(NFormat("\t= defined in %s", FormatSection(os)));
+		}
+	}
+}
+
+String LinkJob::GetGroupName(int group)
+{
+	switch(group) {
+	case GRP_CODE:    return "CODE";
+	case GRP_RDATA:   return "RDATA";
+	case GRP_EDATA:   return "EDATA";
+	case GRP_IDATA:   return "IDATA";
+	case GRP_DATA:    return "DATA";
+	case GRP_UDATA:   return "BSS";
+	case GRP_DEBUG:   return "DEBUG";
+	case GRP_RSRC:    return "RSRC";
+	case GRP_STAB:    return "STAB";
+	case GRP_STABSTR: return "STABSTR";
+	case GRP_SYMBOLS: return "SYMBOLS";
+	default: NEVER(); return NFormat("(%d)", group);
+	}
+}
+
+void LinkJob::WriteMapGlobals(String& map, const Vector<int>& used, String name)
+{
+	map <<
+		"Section Offset   RVA      FPOS     Library      Object       " << name << "\n";
+
+	for(int i = 0; i < used.GetCount(); i++) {
+		const Symbol& sym = globals[used[i]];
+		const ObjectFile *of = (sym.obj_sec.object >= 0 ? &objects[sym.obj_sec.object] : NULL);
+		int atom = globals.GetKey(used[i]);
+		String section;
+		int value = sym.value;
+		int section_rva = 0;
+		int section_rfa = 0;
+		int delta_rva = 0;
+		int delta_rfa = 0;
+		if(sym.obj_sec.object < 0)
+			section = "LINKER";
+		else if(sym.obj_sec.section < 0)
+			section = (sym.obj_sec.section == -1 ? "ABS" : "DEBUG");
+		else {
+//			int secx = GetSection0(sym.obj_sec).sec_map_index;
+			int secx = GetSection(sym.obj_sec).sec_map_index;
+			if(secx >= 0) {
+				const Section& sec = section_map[secx];
+				section = atoms[section_name_map.GetKey(sec.app_section)];
+				const Section& secbegin = section_map[section_name_map[sec.app_section]];
+				section_rva = secbegin.rva + code_rva;
+				section_rfa = (secbegin.rfa < 0 ? -1 : secbegin.rfa + code_rfa);
+	//			delta_rva = code_rva;
+	//			delta_rfa = code_rfa + section_rfa;
+				if(!sym.used)
+					value += section_rva;
+			}
+			else
+				section = "UNUSED";
+		}
+		map << NFormat("%7<s %08x %08x %08x %12<s %12<s %s\n",
+			section, value - section_rva, value, (section_rfa < 0 ? -1 : value - section_rva + section_rfa),
+			of ? GetFileName(of->library_file) : String(Null),
+			of ? GetFileName(of->object_file) : String(Null),
+			DemangleAtom(atom));
+	}
+}
+
+void LinkJob::WriteMapFile()
+{
+	int time = msecs();
+
+	String map;
+	map <<
+		"Output file:  " << outputfile << "\n"
+		"Timestamp:    " << FormatIntHex(timestamp) << ", " << ctime(&timestamp) <<
+		"Load address: " << FormatIntHex(image_base) << "\n"
+		"\n"
+		"Segment  #   Class RVA       FPOS      Length\n";
+
+	int i;
+	for(i = 0; i < section_name_map.GetCount(); i++) {
+		const Section& sec = section_map[section_name_map[i]];
+		int lastid = (i + 1 >= section_name_map.GetCount() ? section_map.GetCount() : section_name_map[i + 1]) - 1;
+		const Section& lastsec = section_map[lastid];
+		String secname = atoms[section_name_map.GetKey(i)];
+		map << NFormat("%8<s %3<d %5<s %08x  %08x  %08x\n",
+			secname, i + 1, GetGroupName(sec.group), code_rva + sec.rva, code_rfa + sec.rfa, lastsec.rva - sec.rva
+			+ GetSection(lastsec.obj_sec).size);
+	}
+	map << NFormat(".reloc %20>08x  %08x  %08x\n", groups[GRP_COUNT].rva, groups[GRP_COUNT].rfa, output_fixups.GetCount())
+		<< "\n";
+
+	Vector<int> used;
+	for(i = 0; i < globals.GetCount(); i++) {
+		bool u = globals[i].used || (dump_flags & DUMP_MAP_ALL);
+		if(!u && (dump_flags & DUMP_MAP_UNUSED)) {
+			const Symbol& sym = globals[i];
+			if(sym.obj_sec.object >= 0 && sym.obj_sec.section >= 0 && GetSection(sym.obj_sec).used) {
+				int f = i;
+				while((f = globals.FindPrev(f)) >= 0) {
+					const Symbol& prev = globals[f];
+					if(prev.used || prev.obj_sec.object >= 0 && prev.obj_sec.section >= 0
+						&& GetSection(prev.obj_sec).used)
+						break;
+				}
+				if(f < 0)
+					u = true;
+			}
+		}
+		if(u)
+			used.Add(i);
+	}
+
+	Sort(used, GlobalAddressOrder(*this));
+	WriteMapGlobals(map, used, "Publics by address");
+	map << "\n";
+	Vector<String> demangled;
+	demangled.SetCount(used.GetCount());
+	for(i = 0; i < used.GetCount(); i++)
+		demangled[i] = DemangleAtom(globals.GetKey(used[i]));
+	IndexSort(demangled, used, GetLanguageInfo());
+	WriteMapGlobals(map, used, "Publics by name");
+
+	if(write_xref) {
+		map << "\n"
+			"Cross-reference map (Target: <- Referer)\n";
+		for(int i = 0; i < used.GetCount(); i++) {
+			int atom = globals.GetKey(used[i]);
+			map << DemangleAtom(atom) << ":\n";
+			Vector<String> referer;
+			int f = collected_referer.Find(atom);
+			if(f >= 0) {
+				for(int r = 0; r < collected_referer[f].GetCount(); r++)
+					referer.Add(DemangleAtom(collected_referer[f][r]));
+				Sort(referer, GetLanguageInfo());
+			}
+			for(int r = 0; r < referer.GetCount(); r++)
+				map << "\t<- " << referer[r] << "\n";
+			if(referer.IsEmpty())
+				map << "\t(root symbol)\n";
+		}
+	}
+
+	map << "\n"
+		"DLL Imports:\n";
+	for(i = 0; i < used_dll_objects.GetCount(); i++) {
+		const ObjectFile& of = objects[used_dll_objects[i]];
+		map << NFormat("%s (%d imports)\n", of.object_file, of.used_imports.GetCount());
+		for(int s = 0; s < of.used_imports.GetCount(); s++) {
+			const ObjectFile::Import& imp = of.imports[of.used_imports[s]];
+			map << NFormat("%5>d %s\n", imp.ordinal_hint, atoms[imp.imp_atom]);
+		}
+	}
+
+	if(mapfile_stdout)
+		PutStdOut(map);
+	else {
+		if(IsNull(mapfile)) {
+			if(mapfile_stdout)
+				return;
+			mapfile = ForceExt(outputfile, ".map");
+		}
+		if(!SaveFile(mapfile, map)) {
+			FileDelete(mapfile);
+			throw Exc(NFormat("%s: error writing map file", mapfile));
+		}
+
+		PutStdOut(NFormat("%s(1): mapfile written in %d msecs", mapfile, msecs(time)));
+	}
+}
+
+void LinkJob::BuildLibrary()
+{
+	int start = msecs();
+	ArchiveJob job;
+	job.machine = machine;
+	job.keep_object_paths = true;
+	job.use_existing_archive = false;
+	job.archive_must_exist = false;
+	//job.trim_longname_objects;
+	job.verbose = verbose;
+	String msg;
+	outputfile = AppendExt(outputfile, ".lib");
+	String msgline = NFormat("Writing library '%s'... ", outputfile);
+	for(int i = OBJ_FIRST; i < objects.GetCount(); i++) {
+		ObjectFile& of = objects[i];
+		if(of.dll_atom || !IsNull(of.library_file))
+			continue;
+		FileMapping& mapping = GetMapping(of.object_file);
+		if(!mapping.IsOpen())
+			throw Exc(NFormat("%s: error opening file", of.object_file));
+		of.archive_index = job.AddObject(of.object_file, mapping.GetData(0, (dword)mapping.GetFileSize()), mapping.GetTime());
+		String t = GetFileTitle(of.object_file);
+		if(!msgline.IsEmpty() && msgline.GetLength() + t.GetLength() > 70) {
+			msg << msgline << "\n\t";
+			msgline = t;
+		}
+		else
+			msgline << ' ' << t;
+	}
+	if(dump_flags & DUMP_TIMING)
+		PutStdOut(NFormat("Archived objects collected in %d msecs.", msecs(start)));
+
+	if(!IsNull(msgline))
+		msg << msgline << '\n';
+	start = msecs();
+	for(int i = 0; i < globals.GetCount(); i++) {
+		const Symbol& glo = globals[i];
+		int ai;
+		if(glo.type < COFF_IMAGE_SYM_TYPE_SPECIAL && glo.external
+		&& glo.obj_sec.section > 0 && glo.obj_sec.object >= 0
+		&& (ai = objects[glo.obj_sec.object].archive_index) >= 0)
+			job.AddGlobal(ai, atoms[globals.GetKey(i)]);
+	}
+	if(dump_flags & DUMP_TIMING)
+		PutStdOut(NFormat("Global symbols collected in %d msecs.", msecs(start)));
+	if(verbose)
+		PutStdOut(msg);
+	start = msecs();
+	job.BuildLibrary(outputfile, false);
+	if(dump_flags & DUMP_TIMING)
+		PutStdOut(NFormat("Library '%s' created in %d msecs.", GetFileName(outputfile), msecs(start)));
+}
+
+void LinkJob::BuildDefFiles()
+{
+	for(int i = OBJ_FIRST; i < objects.GetCount(); i++) {
+		const ObjectFile& of = objects[i];
+		if(!of.dll_atom || of.imports.IsEmpty())
+			continue;
+		int start = msecs();
+		String output = ForceExt(of.library_file, ".def");
+		PutStdOut(NFormat("%s -> %s", of.library_file, output));
+		String data;
+		data << "LIBRARY " << AsCString(atoms[of.dll_atom]) << "\n"
+		"EXPORTS\n";
+		Vector<int> order = GetSortOrder(of.imports, FieldRelation(&ObjectFile::Import::ordinal_hint, StdLess<int>()));
+		for(int o = 0; o < order.GetCount(); o++) {
+			const ObjectFile::Import& imp = of.imports[order[o]];
+			String n = atoms[imp.app_atom];
+			const char *p = n;
+			if(IsAlpha(*p) || *p == '_')
+				p++;
+			while(IsAlNum(*p) || *p == '_')
+				p++;
+			if(*p)
+				continue;
+			data << "\t_" << n;
+			if(imp.ordinal_hint)
+				data << " @" << imp.ordinal_hint; // << " NONAME";
+			data << '\n';
+		}
+		if(SaveFile(output, data))
+			PutStdOut(NFormat(" (OK, %d B, %d msecs)\n", data.GetLength(), msecs(start)));
+		else
+			throw Exc(NFormat("Error writing DEF-file '%s' (%d B)\n", output, data.GetLength()));
+	}
+}
+
+void LinkJob::Link()
+{
+	if(dump_flags & DUMP_ENVIRONMENT) {
+		PutStdOut("Environment: <<");
+		const VectorMap<String, String>& env = Environment();
+		for(int i = 0; i < env.GetCount(); i++)
+			PutStdOut(NFormat("%s=%s", env.GetKey(i), env[i]));
+		PutStdOut(">> End of environment");
+	}
+
+	if(dump_flags & DUMP_COMMANDLINE) {
+		PutStdOut(NFormat("Current directory: %s", GetCurrentDirectory()));
+		PutStdOut("Command line: <<");
+		for(int i = 0; i < user_command_args.GetCount(); i++)
+			if(!IsNull(user_command_args[i]))
+				PutStdOut(AsCString(user_command_args[i] + ' '));
+		PutStdOut(">> End of command line");
+	}
+
+	PutStdOut(NFormat("Target machine: %s", COFFMachineName(machine)));
+	switch(machine) {
+		case COFF_IMAGE_FILE_MACHINE_I386: {
+			imp_stub_size = I386_IMP_STUB_SIZE;
+			imp_entry_size = I386_IMP_ENTRY_SIZE;
+			break;
+		}
+		case COFF_IMAGE_FILE_MACHINE_ARM: {
+			imp_stub_size = ARM_IMP_STUB_SIZE;
+			imp_entry_size = ARM_IMP_ENTRY_SIZE;
+			break;
+		}
+		default: {
+			imp_stub_size = imp_entry_size = 0;
+			break;
+		}
+	}
+
+	DUMPC(files_to_load);
+
+	for(int i = 0; i < files_to_load.GetCount(); i++)
+		LoadFile(files_to_load[i], false);
+
+	if(objects.GetCount() <= OBJ_FIRST && IsNull(outputfile))
+		return;
+
+	if(make_lib) {
+		BuildLibrary();
+		return;
+	}
+
+	if(make_def) {
+		BuildDefFiles();
+		return;
+	}
+
+	if(!image_base)
+		if(machine == COFF_IMAGE_FILE_MACHINE_ARM)
+			image_base = 0x10000;
+		else if(!make_dll)
+			image_base = 0x400000;
+		else if(!auto_dll_base)
+			image_base = 0x10000000;
+		else
+			image_base = 0x10000000 + ((GetHashValue(outputfile) % 0x6000) << 16);
+
+	if(subsystem == COFF_IMAGE_SUBSYSTEM_DEFAULT)
+#ifdef PLATFORM_WIN32
+		subsystem = COFF_IMAGE_SUBSYSTEM_WINDOWS_CUI;
+#else
+		subsystem = COFF_IMAGE_SUBSYSTEM_POSIX;
+#endif
+
+	debug_info = (debug_info_raw > 0 || debug_info_raw != 0 && linkermode == MODE_GNULD);
+	int start = msecs();
+	ReadDefaultLibs();
+	if(dump_flags & DUMP_TIMING) {
+		PutStdOut(NFormat("Default libraries:   %d msecs", msecs(start)));
+		PutStdOut(NFormat("Total load time:     %d msecs", msecs(start_time)));
+	}
+	start = msecs();
+	SetEntryPoint();
+	SetExportSymbols();
+	SetRootSymbols();
+	CollectSymbols();
+	if(dump_flags & DUMP_TIMING)
+		PutStdOut(NFormat("Collecting symbols:  %d msecs", msecs(start)));
+	start = msecs();
+	CollectImports();
+	if(dump_flags & DUMP_TIMING)
+		PutStdOut(NFormat("Collecting imports:  %d msecs", msecs(start)));
+	start = msecs();
+	CollectExports();
+	if(dump_flags & DUMP_TIMING)
+		PutStdOut(NFormat("Collecting exports:  %d msecs", msecs(start)));
+	start = msecs();
+	CollectSections();
+	if(dump_flags & DUMP_TIMING)
+		PutStdOut(NFormat("Collecting sections: %d msecs", msecs(start)));
+	start = msecs();
+	PrepareImageHeader();
+	if(dump_flags & DUMP_TIMING)
+		PutStdOut(NFormat("Preparing header:    %d msecs", msecs(start)));
+	start = msecs();
+	RelocateGlobals();
+	RelocateExports();
+	if(dump_flags & DUMP_TIMING)
+		PutStdOut(NFormat("Relocating globals:  %d msecs", msecs(start)));
+	start = msecs();
+	WriteImageSections();
+	if(dump_flags & DUMP_TIMING)
+		PutStdOut(NFormat("Composing sections:  %d msecs", msecs(start)));
+	start = msecs();
+	PrepareImageInfo();
+	if(dump_flags & DUMP_TIMING)
+		PutStdOut(NFormat("Composing image:     %d msecs", msecs(start)));
+	start = msecs();
+	WriteImageFile();
+	if(dump_flags & DUMP_TIMING)
+		PutStdOut(NFormat("Writing image file:  %d msecs", msecs(start)));
+	if(dump_flags & DUMP_TIMING)
+		PutStdOut(NFormat("Total link time:     %d msecs", msecs(start_time)));
+}
+
+String LinkJob::FormatSection(ObjSec os) const
+{
+	if(IsNull(os))
+		return "(null)";
+	return NFormat("%s:%d", AsString(objects[os.object]), os.section);
+}
diff --git a/uppsrc/coff/uld/main.cpp b/uppsrc/coff/uld/main.cpp
new file mode 100644
index 000000000..dafea3d25
--- /dev/null
+++ b/uppsrc/coff/uld/main.cpp
@@ -0,0 +1,118 @@
+#include "uld.h"
+#pragma hdrstop
+#include "obj.h"
+
+void TryMain()
+{
+//	PutConsole("ULD::TryMain");
+	int start = msecs();
+	LinkJob linkjob;
+	String cfgfile = LoadFile(ForceExt(GetExeFilePath(), ".cfg"));
+
+#ifndef flagTEST
+	if(CommandLine().IsEmpty())
+	{
+		PutStdOut(LinkJob::Usage());
+		return;
+	}
+
+	linkjob.ReadCommand(cfgfile, false);
+	linkjob.ReadCommand(CommandLine(), true);
+	linkjob.Link();
+#else
+//*
+	linkjob.ReadCommand(
+
+"--subsystem "
+"windows "
+"-Bstatic "
+"-o "
+"C:\\upp0802\\out\\MINGW.Gui\\HelloWorld.exe "
+"c:/upp0802/mingw/bin/../lib/gcc/mingw32/4.3.0/../../../crt2.o "
+"c:/upp0802/mingw/bin/../lib/gcc/mingw32/4.3.0/crtbegin.o "
+"-LC:\\upp0802\\mingw\\lib "
+"-Lc:/upp0802/mingw/bin/../lib/gcc/mingw32/4.3.0 "
+"-Lc:/upp0802/mingw/bin/../lib/gcc "
+"-Lc:/upp0802/mingw/bin/../lib/gcc/mingw32/4.3.0/../../.. "
+"-s "
+"-O "
+"2 "
+"C:/upp0802/out/HelloWorld/MINGW.Gui.Main\\hello.o "
+"C:/upp0802/out/CtrlLib/MINGW.Gui\\CtrlLib.o "
+"C:/upp0802/out/CtrlCore/MINGW.Gui\\CtrlCore.o "
+"C:/upp0802/out/RichText/MINGW.Gui\\RichImage.o "
+"C:/upp0802/out/plugin/bmp/MINGW.Gui\\BmpReg.o "
+"C:/upp0802/out/plugin/png/MINGW.Gui\\pngreg.o "
+"--start-group "
+"C:/upp0802/out/CtrlLib/MINGW.Gui\\CtrlLib.a "
+"-ladvapi32 "
+"-lcomdlg32 "
+"-lcomctl32 "
+"C:/upp0802/out/CtrlCore/MINGW.Gui\\CtrlCore.a "
+"C:/upp0802/out/RichText/MINGW.Gui\\RichText.a "
+"-luser32 "
+"-lgdi32 "
+"C:/upp0802/out/Draw/MINGW.Gui\\Draw.a "
+"C:/upp0802/out/plugin/bmp/MINGW.Gui\\bmp.a "
+"-ladvapi32 "
+"-lshell32 "
+"-lwinmm "
+"-lmpr "
+"-lole32 "
+"-loleaut32 "
+"-luuid "
+"C:/upp0802/out/Core/MINGW.Gui\\Core.a "
+"C:/upp0802/out/plugin/z/MINGW.Gui\\z.a "
+"C:/upp0802/out/plugin/png/MINGW.Gui\\png.a "
+"--end-group "
+"-lstdc++ "
+"-lmingw32 "
+"-lgcc "
+"-lmoldname "
+"-lmingwex "
+"-lmsvcrt "
+"-lgdi32 "
+"-lcomdlg32 "
+"-luser32 "
+"-lkernel32 "
+"-ladvapi32 "
+"-lshell32 "
+"-lmingw32 "
+"-lgcc "
+"-lmoldname "
+"-lmingwex "
+"-lmsvcrt "
+"c:/upp0802/mingw/bin/../lib/gcc/mingw32/4.3.0/crtend.o "
+
+	, true);
+	linkjob.Link();
+#endif
+}
+
+CONSOLE_APP_MAIN
+{
+/*
+	{
+		RTIMING("VectorMap");
+		VectorMap<int, int> temp;
+		for(int i = 0; i < 1000000; i++)
+			temp.Add(i, -1);
+	}
+*/
+
+//	static void *hovno;
+//	__asm int 3
+//	__asm jmp [hovno]
+
+//	PutConsole("ULD::Main");
+
+	try
+	{
+		TryMain();
+	}
+	catch(Exc e)
+	{
+		PutStdOut(e);
+		SetExitCode(1);
+	}
+}
diff --git a/uppsrc/coff/uld/notes.txt b/uppsrc/coff/uld/notes.txt
new file mode 100644
index 000000000..8dba7679e
--- /dev/null
+++ b/uppsrc/coff/uld/notes.txt
@@ -0,0 +1,16 @@
+padani inicializace
+
+* ? zarovnat raw data size u segmentu text / data / bss (v hlavicce je vetsi nez v section headeru)
+
+* ? relokacni informace je cca 1.5 x delsi u ULD
+
+* ? export section je o 8 bytu delsi u ULD
+
+* ? reloc section je u ULD DISCARDABLE + READ, u LD je READ + WRITE
+  navic u LD je pred STABy, u ULD za STABy
+
+* ? importy u LD jsou serazene podle ordinalu
+
+* ? exporty u LD jsou serazene podle abecedy
+
+spojovat templaty
diff --git a/uppsrc/coff/uld/obj.h b/uppsrc/coff/uld/obj.h
new file mode 100644
index 000000000..45307d13a
--- /dev/null
+++ b/uppsrc/coff/uld/obj.h
@@ -0,0 +1,564 @@
+#ifndef _console_uld_obj_h_
+#define _console_uld_obj_h_
+
+static inline int CoffSectionAlignShift(int flags)
+{
+	int v = (flags >> 20) & 15;
+	return v ? v - 1 : 2;
+}
+
+static inline int CoffGetLengthAlignment(int align, int length)
+{
+/*
+	for(int i = 1; i < align; i <<= 1)
+		if(length & i)
+			return i;
+*/
+	return align;
+}
+
+typedef int atom_t;
+
+class LinkJob;
+
+class ObjSec : Moveable<ObjSec>
+{
+public:
+	ObjSec() {}
+	ObjSec(const Nuller& nuller) : object(-1), section(0) {}
+	ObjSec(int object, int section) : object(object), section(section) {}
+
+	unsigned GetHashValue() const   { return CombineHash(::GetHashValue(object), ::GetHashValue(section)); }
+	bool     IsNullInstance() const { return object < 0; }
+
+public:
+	int      object;
+	int      section;
+};
+
+inline bool operator == (const ObjSec& a, const ObjSec& b) { return a.object == b.object && a.section == b.section; }
+inline bool operator != (const ObjSec& a, const ObjSec& b) { return !(a == b); }
+
+namespace Upp {
+NTL_MOVEABLE(COFF_IMAGE_SYMBOL)
+};
+
+class ObjectFile
+{
+public:
+	enum FILETYPE { DIRECT, FULL_PATH, LIB_PATH, DEFAULTLIB, INTERNAL, };
+	ObjectFile(LinkJob& job, int index, String library_file, String object_file,
+		FILETYPE filetype, int library_offset, Time file_time, int object_size);
+
+	void       ReadFile(const byte *mapping);
+	String     ToString() const;
+
+	void       Dump() const;
+
+public:
+	enum SEC_TYPE { SEC_ANON_COMDAT, SEC_STD, SEC_STAB, SEC_STABSTR, /*SEC_INULL,*/ SEC_RAW, SEC_DEBUG };
+	enum COM_STATE { COM_UNK, COM_SELECTED, COM_TRASHED };
+
+	struct Section
+	{
+		Section() : name_atom(0), sec_atom(0), size(0), raw_size(0), offset(0), flags(0)
+			, ref_sec_index(0), ref_ext_index(0), sec_map_index(-1) /*, comdat_forward(-1)*/
+			, used(false), autocollect(false), comdat_state(COM_UNK), type(SEC_RAW), comdat_packing(0) {}
+
+		int          name_atom;
+		int          sec_atom;
+		int          size;
+		int          raw_size;
+		int          offset;
+		int          flags;
+		int          ref_sec_index;
+		int          ref_ext_index;
+		int          sec_map_index;
+//		int          comdat_forward;
+		Vector<byte> section_data;
+		bool         autocollect;
+		bool         used;
+		COM_STATE    comdat_state;
+		SEC_TYPE     type;
+		char         comdat_packing;
+	};
+
+	struct Import
+	{
+		Import() : app_atom(0), imp_atom(0), ordinal_hint(0) {}
+
+		int    app_atom;
+		int    imp_atom;
+		int    ordinal_hint;
+	};
+
+public:
+	LinkJob&        linkjob;
+	int             index;
+	int             archive_index;
+	String          library_file;
+	String          object_file;
+	Time            file_time;
+	int             object_size;
+	String          object_data;
+	int             library_offset;
+	int             dll_atom;
+	int             stab_index;
+	int             stabstr_index;
+	FILETYPE        filetype;
+	bool            used_any;
+	bool            collected;
+	bool            has_ctors_dtors;
+	bool            export_symbols;
+//	String          directives;
+	Vector<int>     ref_sections;
+	Vector<int>     ref_externals;
+	Array<Section>  sections;
+	Array<Import>   imports;
+	Index<int>      used_stubs;
+	Index<int>      used_imports;
+	enum
+	{
+		SEC_COMDAT,
+		SEC_DLL_STUBS,
+		SEC_DLL_NAMES,
+		SEC_DLL_IMPORTS,
+		SEC_DLL_BOUND,
+		SEC_DLL_DESCRIPTOR,
+//		SEC_DLL_NULL_DESC,
+		DLL_SECTIONS
+	};
+	VectorMap<int, int> comdat_assoc;
+};
+
+class LinkJob
+{
+public:
+	enum
+	{
+		COFF_IMAGE_SYM_TYPE_SPECIAL = 0xFF00,
+		COFF_IMAGE_SYM_TYPE_SECTION,
+		COFF_IMAGE_SYM_TYPE_IMPORT_NAME,
+		COFF_IMAGE_SYM_TYPE_IMPORT_ORDINAL,
+		COFF_IMAGE_SYM_TYPE_IMPORT_STUB,
+		COFF_IMAGE_SYM_TYPE_BASE,
+		COFF_IMAGE_SYM_TYPE_CTOR_DTOR,
+	};
+	enum SPECIAL_OBJECTS
+	{
+		OBJ_MARKER,
+		OBJ_CTOR,
+		OBJ_EXPORT,
+		OBJ_FIRST, // first user object
+	};
+	enum
+	{
+		OBJM_COMDAT,
+		OBJM_DATA_BEGIN,
+		OBJM_PSEUDO_RELOC_BEGIN,
+		OBJM_PSEUDO_RELOC_END,
+		OBJM_BSS_BEGIN,
+		OBJM_BSS_END,
+		OBJM_COUNT,
+	};
+	enum
+	{
+		OBJC_COMDAT,
+		OBJC_CTOR_BEGIN,
+		OBJC_CTOR_END,
+		OBJC_DTOR_BEGIN,
+		OBJC_DTOR_END,
+		OBJC_IDATA_HOLE,
+		OBJC_IDATA_NULL,
+		OBJC_COUNT
+	};
+	enum
+	{
+		OBJE_COMDAT,
+		OBJE_DIRECTORY,
+		OBJE_ADDRESS_TABLE,
+		OBJE_NAME_POINTERS,
+		OBJE_ORDINALS,
+		OBJE_NAMES,
+		OBJE_COUNT,
+	};
+
+	struct Symbol
+	{
+		Symbol(ObjSec obj_sec = Null, int value = 0, word type = 0, bool external = false)
+			: obj_sec(obj_sec), value(value), type(type)
+			, linked(false), used(false), relocated(false), external(external) {}
+
+		ObjSec obj_sec;
+		int    value;
+		word   type;
+		bool   linked    : 1;
+		bool   used      : 1;
+		bool   relocated : 1;
+		bool   external  : 1;
+
+		String ToString() const;
+	};
+
+	enum
+	{
+		GRP_CODE,
+		GRP_RDATA,
+		GRP_DATA,
+		GRP_UDATA,
+		GRP_EDATA,
+		GRP_IDATA,
+		GRP_RSRC,
+		GRP_DEBUG,
+		GRP_STAB,
+		GRP_STABSTR,
+		GRP_SYMBOLS,
+		GRP_COUNT,
+
+		GRP_NONE = -1,
+		GRP_TEXT_BEGIN = GRP_CODE,
+		GRP_DATA_BEGIN = GRP_RDATA,
+		GRP_BSS_BEGIN  = GRP_UDATA,
+		GRP_BSS_END    = GRP_UDATA + 1,
+	};
+
+	static String GetGroupName(int group_id);
+
+	struct Group
+	{
+		int    first_section;
+		int    rva;
+		int    rfa;
+		int    raw_size;
+	};
+
+	struct Section
+	{
+		Section() : obj_sec(Null), udata(false), group(0), app_section(0), sec_atom(0), rva(-1), rfa(-1), size(0) {}
+
+		ObjSec obj_sec;
+		byte   group;
+		bool   udata;
+		word   app_section;
+		String name;
+		int    sec_atom;
+		int    rva;
+		int    rfa;
+		int    size;
+	};
+
+	struct Stab
+	{
+		Stab() : textoff(0), type(0), other(0), desc(0), value(0), /*fileatom(0),*/ fixup(Null) {}
+
+		int         textoff;
+		byte        type;
+		byte        other;
+		word        desc;
+		int         value;
+//		int         fileatom;
+		ObjSec      fixup;
+
+//		unsigned    GetHashValue() const;
+//		bool        Equals(const Stab& b) const;
+
+//		friend bool operator == (const Stab& a, const Stab& b) { return a.Equals(b); }
+//		friend bool operator != (const Stab& a, const Stab& b) { return !a.Equals(b); }
+	};
+
+	struct Export
+	{
+		Export(String export_name, int ordinal) : export_name(export_name), ordinal(ordinal) {}
+
+		String      export_name;
+		int         ordinal;
+	};
+
+	struct Cache
+	{
+		FileMapping mapping;
+		int         lock;
+	};
+
+/*
+	struct Cache
+	{
+		String      library;
+		String      file;
+		Time        time;
+		int         offset;
+		int         size;
+
+		void        Serialize(Stream& stream);
+	};
+*/
+
+	struct AtomOrder
+	{
+		AtomOrder(const LinkJob& linkjob) : linkjob(linkjob), langinfo(GetLanguageInfo()) {}
+		bool operator () (int a, int b) const { return langinfo(linkjob[a], linkjob[b]); }
+		const LinkJob& linkjob;
+		const LanguageInfo& langinfo;
+	};
+
+	struct GlobalAddressOrder
+	{
+		GlobalAddressOrder(const LinkJob& linkjob) : linkjob(linkjob), langinfo(GetLanguageInfo()) {}
+		bool operator () (int a, int b) const;
+		const LinkJob& linkjob;
+		const LanguageInfo& langinfo;
+	};
+
+	static bool Less(const Section& a, const Section& b);
+
+public:
+	LinkJob();
+
+	static String         Usage();
+
+	void                  ReadCommand(const Vector<String>& cmdline, bool user);
+	void                  ReadCommand(const char *cmdline, bool user);
+	void                  ReadDefaultLibs();
+
+	void                  Link();
+
+	void                  LoadFile(String file, bool defaultlib);
+	void                  LoadObject(String file, const FileMapping& mapping, ObjectFile::FILETYPE filetype);
+	void                  LoadDLL(String file, const FileMapping& mapping, ObjectFile::FILETYPE filetype);
+	void                  LoadLibrary(String file, const FileMapping& mapping, ObjectFile::FILETYPE filetype);
+
+	void                  SetEntryPoint();
+	void                  SetExportSymbols();
+	void                  SetRootSymbols();
+	void                  CollectSymbols();
+	void                  CollectSectionSymbols(Index<ObjSec>& collect_objsec, int referer_index);
+	void                  CollectObject(int index);
+	void                  FixupAnonComdats();
+//	void                  CheckDuplicates();
+	void                  CollectImports();
+	void                  CollectExports();
+	void                  CollectSections();
+	void                  PrepareImageHeader();
+	void                  RelocateGlobals();
+	void                  RelocateExports();
+	void                  PrepareImageInfo();
+	void                  WriteImageFile();
+//	void                  OpenCacheFile();
+//	void                  SaveCacheFile();
+	void                  WriteImageSections();
+	void                  RelocateImport(const ObjectFile& of);
+	void                  RelocateObject(const ObjectFile& of, const byte *object_ptr);
+	void                  RelocateInternal(const ObjectFile& of);
+	void                  RelocateStabs(const ObjectFile& of, const byte *object_ptr);
+	void                  CheckUnresolved();
+	void                  PrepareSymbolTable();
+	void                  PrepareStabBlocks();
+	void                  PrepareFixupBlocks();
+	void                  WriteMapFile();
+	void                  WriteMapGlobals(String& map, const Vector<int>& used, String name);
+	void                  BuildLibrary();
+	void                  BuildDefFiles();
+
+	atom_t                Atomize(String atom)            { return atoms.FindAdd(atom); }
+	String                operator [] (atom_t atom) const { return atoms[atom]; }
+	atom_t                NameAtom(const COFF_IMAGE_SYMBOL& isym, const char *strtbl) { return Atomize(COFFSymbolName(isym, strtbl)); }
+	String                DemangleAtom(atom_t atom) const;
+	FileMapping&          GetMapping(String filename);
+	void                  LockMapping(String filename);
+	void                  UnlockMapping(String filename);
+
+	ObjectFile::Section&  GetSection(ObjSec os)             { return objects[os.object].sections[os.section]; }
+	const ObjectFile::Section& GetSection(ObjSec os) const  { return objects[os.object].sections[os.section]; }
+//	const ObjectFile::Section& GetSection0(ObjSec os) const { return objects[os.section ? os.object : 0].sections[os.section]; }
+	String                FormatSection(ObjSec os) const;
+
+	void                  AddExternal(atom_t atom, ObjSec obj_sec)  { ext_obj_sec.Add(atom, obj_sec); }
+	void                  AddWeakExternal(atom_t atom, int refatom);
+	void                  AddGlobal(atom_t atom, const Symbol& symbol);
+	void                  AddCollect(atom_t atom)                   { collected_symbols.FindAdd(atom, -1); }
+
+	bool                  AddCOFFSymbol(String name, int object, const COFF_IMAGE_SYMBOL& sym);
+	void                  AddAuxCOFFSymbol(const COFF_IMAGE_SYMBOL& sym);
+
+	void                  Dump() const;
+
+public:
+	enum
+	{
+		DUMP_IMPORT_LIBS    = 0x00000001,
+		DUMP_OBJECT_LIBS    = 0x00000002,
+		DUMP_COLLECTOR      = 0x00000004,
+		DUMP_REF_FIXUPS     = 0x00000008,
+		DUMP_SECTIONS       = 0x00000010,
+		DUMP_SECTIONS_ALL   = 0x00000020,
+		DUMP_SEC_DEFINES    = 0x00000040,
+		DUMP_STAT           = 0x00000080,
+		DUMP_IMPORT         = 0x00000100,
+		DUMP_OBJECTS        = 0x00000200,
+		DUMP_TIMING         = 0x00000400,
+		DUMP_MAP_UNUSED     = 0x00000800,
+		DUMP_STABS          = 0x00001000,
+		DUMP_STAB_TYPES     = 0x00002000,
+		DUMP_MAP_ALL        = 0x00004000,
+		DUMP_EXPORTS        = 0x00008000,
+		DUMP_DLL_EXPORTS    = 0x00010000,
+		DUMP_COMMANDLINE    = 0x00020000,
+		DUMP_ENVIRONMENT    = 0x00040000,
+		DUMP_COMDAT_REMAPS  = 0x00080000,
+	};
+	int                   dump_flags;
+	Vector<String>        libpaths;
+	Index<String>         defaultlibs;
+	Index<String>         nodefaultlibs;
+	String                dll_search_prefix;
+	int                   subsystem;
+	int                   machine;
+	String                outputfile;
+	String                mapfile;
+	bool                  write_mapfile;
+	bool                  mapfile_stdout;
+	bool                  write_xref;
+	signed char           debug_info_raw;
+	bool                  debug_info;
+	bool                  show_logo;
+	bool                  autocollect_crt_only;
+	bool                  ignore_code_alignment;
+	bool                  static_libraries;
+	bool                  make_lib;
+	bool                  make_dll;
+	bool                  make_def;
+	bool                  auto_dll_base;
+//	bool                  cache_objects;
+	bool                  cache_object_data;
+	bool                  verbose;
+	word                  major_version;
+	word                  minor_version;
+	word                  major_subsystem_version;
+	word                  minor_subsystem_version;
+	enum MODE { MODE_MSLINK, MODE_GNULD };
+	MODE                  linkermode;
+	int                   file_align;
+	int                   image_align;
+	int                   image_base;
+	bool                  image_fixed;
+	int                   stack_reserve;
+	int                   stack_commit;
+	int                   heap_reserve;
+	int                   heap_commit;
+
+	Index<String>         atoms;
+	atom_t                text_atom;
+	atom_t                data_atom;
+	atom_t                edata_atom;
+	atom_t                crt_atom;
+	atom_t                ctors_atom;
+	atom_t                dtors_atom;
+	atom_t                gcc_except_atom;
+	atom_t                CTOR_LIST_atom;
+	atom_t                _CTOR_LIST_atom;
+	atom_t                CTOR_LIST_END_atom;
+	atom_t                DTOR_LIST_atom;
+	atom_t                _DTOR_LIST_atom;
+	atom_t                DTOR_LIST_END_atom;
+	atom_t                idata_atom;
+	atom_t                idata_idesc_atom;
+	atom_t                idata_inull_atom;
+	atom_t                idata_iat1_atom;
+	atom_t                idata_iat2_atom;
+	atom_t                idata_names_atom;
+	atom_t                rdata_atom;
+	atom_t                bss_atom;
+	atom_t                debug_atom;
+	atom_t                drectve_atom;
+	atom_t                stab_atom;
+	atom_t                stabstr_atom;
+	atom_t                rsrc_atom;
+//	int                   mangling_style;
+
+	enum {
+		I386_IMP_STUB_SIZE = 6,
+		ARM_IMP_STUB_SIZE = 12,
+		I386_IMP_ENTRY_SIZE = 4,
+		ARM_IMP_ENTRY_SIZE = 4,
+	};
+
+//	Array<Cache>          object_cache;
+//	Index<String>         cache_name_index;
+//	Index<String>         cache_library_index;
+//	FileStream            cache_file;
+//	String                cache_file_name;
+//	bool                  cache_dirty;
+
+	Vector<String>        command_args;
+	Vector<String>        user_command_args;
+	Vector<String>        files_to_load;
+	Index<String>         loaded_files;
+	Array<ObjectFile>     objects;
+	VectorMap<atom_t, int> dll_objects; // dll name -> index into objects
+	Vector<atom_t>        used_dll_objects;
+	int                   stab_section;
+	int                   stabstr_section;
+	int                   symbol_section;
+	int                   reloc_section;
+	int                   section_count;
+	bool                  has_stabs;
+//	bool                  has_symbols;
+//	bool                  has_relocs;
+
+	String                            entrypoint;
+	atom_t                            entrypoint_atom;
+	VectorMap<atom_t, int>            collected_symbols;
+	VectorMap<atom_t, Index<atom_t> > collected_referer;
+	VectorMap<atom_t, atom_t>         weak_externals;
+	VectorMap<atom_t, atom_t>         section_merge;
+	ArrayMap<atom_t, Symbol>          globals;
+	Index<ObjSec>                     global_obj_sec_index;
+	VectorMap<Point, int>             obj_static_global_index;
+	VectorMap<atom_t, ObjSec>         ext_obj_sec;
+
+	ArrayMap<String, Cache>           mapping_cache;
+	int                               mapping_cache_limit;
+
+	Segtor<Section, 256>              section_map;
+	Index<int>                        section_object_index;
+//	Index<ObjSec>                     section_obj_sec_index;
+	VectorMap<atom_t, int>            section_name_map; // atom -> sec_map_index
+	Group                             groups[GRP_COUNT + 1];
+	Index<atom_t>                     unresolved;
+
+	Vector<COFF_IMAGE_SYMBOL>         coff_output_symbols;
+	String                            coff_output_symbol_strings;
+//	Vector<int>                       coff_reloc_offsets;
+
+	SegtorMap<atom_t, Export, 256>    exports;
+
+	Vector<byte>                      output_image;
+	Vector<byte>                      output_fixups;
+	int                               output_fixup_size;
+	VectorMap<String, int>            stab_bincl_map;
+	Vector<byte>                      output_stab_info;
+	Vector<char>                      output_stab_strings;
+	VectorMap<unsigned, int>          output_stab_string_hash;
+	Vector<int>                       highlow_fixup_rva;
+	time_t                            timestamp;
+	int                               ifhdr_pos;
+	int                               iohdr_pos;
+	int                               secmap_pos;
+	int                               header_size;
+	int                               code_rva;
+	int                               code_rfa;
+	int                               idesc_rva;
+	int                               idesc_end_rva;
+	int                               rsrc_rva;
+	int                               rsrc_end_rva;
+	int                               iat2_rva;
+	int                               iat2_end_rva;
+	int                               idata_last;
+	bool                              idata_null_found;
+	int                               start_time;
+	String                            stub_filename;
+	int                               imp_stub_size;
+	int                               imp_entry_size;
+};
+
+#endif//_console_uld_obj_h_
diff --git a/uppsrc/coff/uld/object.cpp b/uppsrc/coff/uld/object.cpp
new file mode 100644
index 000000000..5b4f52a2f
--- /dev/null
+++ b/uppsrc/coff/uld/object.cpp
@@ -0,0 +1,396 @@
+#include "uld.h"
+#pragma hdrstop
+
+#include "obj.h"
+
+#define LTIMING(x) // RTIMING(x)
+#define LDUMP(x)   // RDUMP(x)
+
+/*
+static inline unsigned MemHash(const char *b, const char *p)
+{
+	unsigned out = p - b;
+	while(p - b >= 4)
+	{
+		out ^= PeekIL(b);
+		b += 4;
+	}
+	switch(p - b)
+	{
+	case 3: out ^= byte(b[2]) << 16;
+	case 2: out ^= byte(b[1]) << 8;
+	case 1: out ^= byte(b[0]) << 0;
+	}
+	return out;
+}
+*/
+
+/*
+static inline Point ScanStabType(const char *p, const char *& endptr)
+{
+	ASSERT(*p == '(' && IsDigit(p[1]));
+	Point out(0, 0);
+	while(IsDigit(*++p))
+		out.x = 10 * out.x + *p - '0';
+	if(*p == ',')
+		while(IsDigit(*++p))
+			out.y = 10 * out.y + *p - '0';
+	if(*p == ')')
+		p++;
+	endptr = p;
+	return out;
+}
+*/
+
+/*
+static inline const char *ScanStab(const char *p)
+{
+	if(*p == '(')
+		while(*p && *p++ != ')')
+			;
+	else if(IsDigit(*p))
+		while(IsDigit(*++p))
+			;
+	return p;
+}
+*/
+
+static inline String TrimClassName(String clss)
+{
+	int f = clss.Find('$');
+	if(f >= 0)
+		clss.Trim(f);
+	return clss;
+}
+
+static String Undecorate(String s)
+{
+	const char *p = s;
+	while(*p && *p != '$')
+		p++;
+	if(*p != '$')
+		return s;
+	const char *b = ++p;
+	while(*p && *p != '@')
+		p++;
+	return String(b, p);
+}
+
+ObjectFile::ObjectFile(LinkJob& j, int i, String lf, String of, FILETYPE ft, int lo, Time tm, int os)
+: linkjob(j), index(i), library_file(lf), object_file(of)
+, filetype(ft), library_offset(lo), file_time(tm), object_size(os)
+{
+	archive_index = -1;
+	collected = used_any = false;
+	dll_atom = 0;
+	stab_index = -1;
+	stabstr_index = -1;
+	has_ctors_dtors = false;
+	//!! terrible kludge
+	String title = ToLower(GetFileTitle(object_file));
+	export_symbols = (filetype == DIRECT && title != "dllcrt2" && title != "crtbegin");
+}
+
+String ObjectFile::ToString() const
+{
+	if(IsNull(library_file))
+	{
+		if(IsNull(object_file))
+			return "(linker)";
+		return object_file;
+	}
+	return GetFileName(library_file) + ":" + object_file;
+}
+
+void ObjectFile::ReadFile(const byte *begin)
+{
+ 	const COFF_IMAGE_FILE_HEADER *header = (const COFF_IMAGE_FILE_HEADER *)begin;
+
+	int i;
+/*
+	const COFF_IMAGE_SYMBOL *symtbl = (const COFF_IMAGE_SYMBOL *)(begin + header->PointerToSymbolTable);
+	int nsym = header->NumberOfSymbols;
+	const COFF_IMAGE_SYMBOL *symend = symtbl + nsym;
+	const char *strtbl = (const char *)symend;
+	symbols.Reserve(nsym);
+	while(symtbl < symend)
+	{
+		String name;
+		if(symtbl->N.Name.Short)
+			name = MaxLenString(symtbl->N.ShortName, 8);
+		else
+			name = strtbl + symtbl->N.Name.Long;
+		int atom = linkjob.Atomize(name);
+		int naux = symtbl->NumberOfAuxSymbols;
+		symbols.Add(atom, *symtbl++);
+		while(--naux >= 0)
+			symbols.Add(0, *symtbl++);
+	}
+*/
+	const COFF_IMAGE_SECTION_HEADER *sechdr = (const COFF_IMAGE_SECTION_HEADER *)(begin
+		+ sizeof(COFF_IMAGE_FILE_HEADER) + header->SizeOfOptionalHeader), *secptr;
+	sections.SetCount(header->NumberOfSections + 1);
+	Section& comdat = sections[0];
+	comdat.type = SEC_ANON_COMDAT;
+	comdat.name_atom = comdat.sec_atom = linkjob.bss_atom;
+	comdat.flags = COFF_IMAGE_SCN_CNT_UNINITIALIZED_DATA | COFF_IMAGE_SCN_ALIGN_16BYTES
+		| COFF_IMAGE_SCN_MEM_READ | COFF_IMAGE_SCN_MEM_WRITE;
+	comdat.comdat_packing = 0;
+	for(i = 1, secptr = sechdr; i < sections.GetCount(); i++, secptr++) {
+		Section& sec = sections[i];
+		sec.size = sec.raw_size = max(secptr->SizeOfRawData, secptr->Misc.VirtualSize);
+//		if(!(sec.size = secptr->Misc.VirtualSize))
+//			sec.size = sec.raw_size;
+		sec.offset = secptr->PointerToRawData;
+		ASSERT(sec.offset >= 0);
+		sec.flags = secptr->Characteristics;
+		sec.comdat_packing = 0;
+//		sec.comdat_assoc = 0;
+
+		String secn = MaxLenString(secptr->Name, sizeof(secptr->Name));
+		if(secn[0] != '.') {
+			if(sec.flags & COFF_IMAGE_SCN_CNT_CODE)
+				secn = ".text$" + secn;
+			else if(sec.flags & COFF_IMAGE_SCN_CNT_INITIALIZED_DATA)
+				secn = ".data$" + secn;
+			else
+				secn = ".bss$" + secn;
+		}
+		sec.name_atom = linkjob.Atomize(secn);
+		secn = TrimClassName(secn);
+		sec.sec_atom = linkjob.Atomize(secn);
+		bool ctor_dtor_section = false;
+		if(sec.sec_atom == linkjob.ctors_atom || sec.sec_atom == linkjob.dtors_atom) {
+			sec.sec_atom = linkjob.data_atom;
+//			sec.flags = (sec.flags & ~COFF_IMAGE_SCN_ALIGN_MASK) | COFF_IMAGE_SCN_ALIGN_4BYTES;
+			has_ctors_dtors = ctor_dtor_section = true;
+		}
+		if(sec.sec_atom == linkjob.idata_atom)
+			linkjob.idata_last = index;
+		if(sec.name_atom == linkjob.idata_inull_atom)
+			linkjob.idata_null_found = true;
+
+		sec.type = (sec.sec_atom == linkjob.stab_atom
+			? SEC_STAB : sec.sec_atom == linkjob.stabstr_atom
+				? SEC_STABSTR : sec.sec_atom == linkjob.debug_atom
+					? SEC_DEBUG : SEC_STD);
+		if(sec.type == SEC_STAB)
+			stab_index = i;
+		else if(sec.type == SEC_STABSTR)
+			stabstr_index = i;
+		sec.autocollect = sec.type == SEC_STD
+			&& (sec.sec_atom == linkjob.crt_atom
+				|| ctor_dtor_section
+				|| sec.sec_atom == linkjob.idata_atom
+				|| sec.sec_atom == linkjob.rsrc_atom
+				|| !linkjob.autocollect_crt_only && (sec.flags & COFF_IMAGE_SCN_CNT_INITIALIZED_DATA));
+		if(sec.name_atom == linkjob.drectve_atom && (sec.flags & COFF_IMAGE_SCN_LNK_INFO))
+		{
+			String directives = String(begin + secptr->PointerToRawData, secptr->SizeOfRawData);
+			linkjob.ReadCommand(directives, false);
+		}
+
+		if(sec.flags & COFF_IMAGE_SCN_CNT_CODE)
+			sec.sec_atom = linkjob.text_atom;
+	}
+
+	if(stab_index >= 0 && stabstr_index >= 0)
+		linkjob.has_stabs = true;
+
+	const COFF_IMAGE_SYMBOL *symtbl = (const COFF_IMAGE_SYMBOL *)(begin + header->PointerToSymbolTable), *symptr = symtbl;
+	const char *strtbl = (const char *)(symtbl + header->NumberOfSymbols);
+//	int xxxatom = linkjob.Atomize("?AppMain@@YAXXZ");
+	for(i = 0; i < (int)header->NumberOfSymbols; i++, symptr++)
+	{
+//		if(symptr->SectionNumber > 0 && linkjob.NameAtom(*symptr, strtbl) == xxxatom)
+//			__asm int 3;
+//		RLOG(NFormat("%30<s SEC %04d VAL %08x %s", linkjob[linkjob.NameAtom(*symptr, strtbl)],
+//			symptr->SectionNumber, (int)symptr->Value, file));
+
+		if(symptr->StorageClass == COFF_IMAGE_SYM_CLASS_STATIC && symptr->SectionNumber != 0
+		&& symptr->Value == 0 && symptr->NumberOfAuxSymbols >= 1)
+//		&& linkjob.Atomize(TrimClassName(COFFSymbolName(*symptr, strtbl))) == sections[(int)symptr->SectionNumber].name_atom)
+		{ // section aux symbol
+			LinkJob::Symbol lsym;
+			lsym.obj_sec.object = index;
+			lsym.obj_sec.section = symptr->SectionNumber;
+			lsym.value = 0;
+			lsym.type = LinkJob::COFF_IMAGE_SYM_TYPE_SECTION;
+			Section& sec = sections[(int)symptr->SectionNumber];
+			if(sec.name_atom != linkjob.ctors_atom && sec.name_atom != linkjob.dtors_atom) {
+				String secn = COFFSymbolName(*symptr, strtbl);
+				sec.name_atom = linkjob.Atomize(secn);
+				if(sec.flags & COFF_IMAGE_SCN_CNT_CODE)
+					sec.sec_atom = linkjob.text_atom;
+				else {
+					secn = TrimClassName(secn);
+					sec.sec_atom = linkjob.Atomize(secn);
+				}
+			}
+			linkjob.AddGlobal(sec.name_atom, lsym);
+			const COFF_IMAGE_AUX_SYMBOL *aux = (const COFF_IMAGE_AUX_SYMBOL *)(symptr + 1);
+			if(sec.flags & COFF_IMAGE_SCN_LNK_COMDAT)
+			{
+				sec.comdat_packing = aux->Section.Selection;
+				comdat_assoc.Add(aux->Section.Number, symptr->SectionNumber);
+//				sec.comdat_assoc = aux->Section.Number;
+				if(sec.comdat_packing == COFF_IMAGE_COMDAT_SELECT_EXACT_MATCH)
+				{
+					secptr = sechdr + (symptr->SectionNumber);
+					sec.section_data.Reserve(secptr->SizeOfRawData + secptr->NumberOfRelocations * sizeof(COFF_IMAGE_RELOCATION));
+					CatN(sec.section_data, secptr->SizeOfRawData, begin + secptr->PointerToRawData);
+					const COFF_IMAGE_RELOCATION *relptr = (const COFF_IMAGE_RELOCATION *)(begin + secptr->PointerToRelocations);
+					const COFF_IMAGE_RELOCATION *relend = relptr + secptr->NumberOfRelocations;
+					while(relptr < relend)
+					{
+						COFF_IMAGE_RELOCATION r = *relptr++;
+						r.SymbolTableIndex = linkjob.NameAtom(symtbl[r.SymbolTableIndex], strtbl);
+						CatN(sec.section_data, sizeof(COFF_IMAGE_RELOCATION), &r);
+					}
+				}
+			}
+		}
+		else if((symptr->StorageClass == COFF_IMAGE_SYM_CLASS_EXTERNAL || symptr->StorageClass == COFF_IMAGE_SYM_CLASS_STATIC)
+		&& (symptr->SectionNumber != 0 || symptr->Value != 0))
+		{
+			LinkJob::Symbol lsym;
+			lsym.obj_sec.object = index;
+			lsym.obj_sec.section = symptr->SectionNumber;
+			lsym.value = symptr->Value;
+			lsym.type = symptr->Type;
+			lsym.external = (symptr->StorageClass == COFF_IMAGE_SYM_CLASS_EXTERNAL);
+			int atom = linkjob.NameAtom(*symptr, strtbl);
+			linkjob.AddGlobal(atom, lsym);
+		}
+		else if(symptr->StorageClass == COFF_IMAGE_SYM_CLASS_WEAK_EXTERNAL && symptr->NumberOfAuxSymbols >= 1)
+		{
+			int refsym = symptr[1].N.Name.Short;
+			linkjob.AddWeakExternal(linkjob.NameAtom(*symptr, strtbl), linkjob.NameAtom(symtbl[refsym], strtbl));
+		}
+		i += symptr->NumberOfAuxSymbols;
+		symptr += symptr->NumberOfAuxSymbols;
+	}
+
+	for(i = 1, secptr = sechdr; i < sections.GetCount(); i++, secptr++)
+	{
+		Section& sec = sections[i];
+		sec.ref_sec_index = ref_sections.GetCount();
+		sec.ref_ext_index = ref_externals.GetCount();
+		const COFF_IMAGE_RELOCATION *reloc = (const COFF_IMAGE_RELOCATION *)(begin + secptr->PointerToRelocations);
+		if(sec.type == SEC_STD)
+		{
+			Index<int> ref_sec, ref_ext;
+			for(int nreloc = secptr->NumberOfRelocations; --nreloc >= 0; reloc++)
+			{
+				const COFF_IMAGE_SYMBOL& sym = symtbl[reloc->SymbolTableIndex];
+				if(sym.SectionNumber > 0 && sym.StorageClass != COFF_IMAGE_SYM_CLASS_EXTERNAL)
+					ref_sec.FindAdd(sym.SectionNumber);
+				if(sym.StorageClass == COFF_IMAGE_SYM_CLASS_STATIC && sym.SectionNumber > 0
+				&& sym.Value == 0 && sym.NumberOfAuxSymbols >= 1 && !(sections[sym.SectionNumber].flags & COFF_IMAGE_SCN_LNK_COMDAT))
+				{} // no-op for section externals
+				else if(sym.StorageClass == COFF_IMAGE_SYM_CLASS_EXTERNAL
+				|| sym.StorageClass == COFF_IMAGE_SYM_CLASS_STATIC
+				|| sym.StorageClass == COFF_IMAGE_SYM_CLASS_WEAK_EXTERNAL)
+				{
+					int atom = linkjob.NameAtom(sym, strtbl);
+					if(sym.SectionNumber == 0)
+						linkjob.AddExternal(atom, ObjSec(index, i));
+					ref_ext.FindAdd(atom);
+				}
+	/*
+				{
+					LinkJob::Symbol symbol;
+					symbol.object = index;
+					symbol.value = sym.Value;
+					symbol.type = sym.Type;
+					symbol.section = sym.SectionNumber;
+					ref_ext.FindAdd(linkjob.AddGlobal(linkjob.NameAtom(sym, strtbl), symbol));
+				}
+	*/
+			}
+			ref_sections.AppendPick(ref_sec.PickKeys());
+			ref_externals.AppendPick(ref_ext.PickKeys());
+		}
+/*
+		else if(sec.type == SEC_STAB && stabstr_index >= 0)
+		{
+			ASSERT(sizeof(STAB_INFO) == 12);
+			int count = sec.size / sizeof(STAB_INFO);
+			stabs.SetCount(count);
+			const byte *p = begin + sec.offset;
+#ifdef CPU_LE // && CPU_32BIT
+			memcpy(stabs.Begin(), p, count * sizeof(STAB_INFO));
+#else
+			for(STAB_INFO *sp = stabs.Begin(), *se = stabs.End(); sp < se; sp++, p += 12)
+			{
+				sp->strdx = PeekIL(p + STAB_STRDXOFF);
+				sp->type = p[STAB_TYPEOFF];
+				sp->other = p[STAB_OTHEROFF];
+				sp->desc = PeekIW(p[STAB_DESCOFF]);
+				sp->value = PeekIL(p[STAB_VALUEOFF]);
+			}
+#endif
+			stab_ref.SetCount(count, 0);
+			for(int nreloc = secptr->NumberOfRelocations; --nreloc >= 0; reloc++)
+			{
+				int entry = reloc->VirtualAddress / sizeof(STAB_INFO);
+				if(entry < 0 || entry >= count)
+					continue;
+				const COFF_IMAGE_SYMBOL& sym = symtbl[reloc->SymbolTableIndex];
+				if(sym.SectionNumber)
+					stab_ref[entry] = ~sym.SectionNumber;
+				else if(sym.StorageClass == COFF_IMAGE_SYM_CLASS_EXTERNAL || sym.StorageClass == COFF_IMAGE_SYM_CLASS_STATIC)
+					stab_ref[entry] = linkjob.NameAtom(sym, strtbl);
+			}
+			if(linkjob.dump_flags & LinkJob::DUMP_STABS)
+			{
+				const Section& strsec = sections[stabstr_index];
+				puts(NFormat("%s: %d stabs, .stab = %d bytes, .stabstr = %d bytes",
+					ToString(), count, sec.size, strsec.size));
+				const byte *str = begin + strsec.offset;
+				for(int i = 0; i < stabs.GetCount(); i++)
+				{
+					const STAB_INFO& stab = stabs[i];
+					String desc;
+					desc << NFormat("[%d]: offset %08x, type %02x, desc %04x, value %08x, reloc %08x",
+						i, stab.strdx, stab.type, stab.desc, stab.value, stab_ref[i]);
+					puts(desc);
+					if(stab.strdx)
+						puts((const char *)(str + stab.strdx));
+				}
+			}
+		}
+*/
+	}
+
+	ref_sections.Shrink();
+	ref_externals.Shrink();
+}
+
+void ObjectFile::Dump() const
+{
+	int sym_size = (ref_sections.GetCount() + ref_externals.GetCount()) * sizeof(int);
+	int sec_size = sections.GetCount() * sizeof(Section);
+	int mapped_size = sizeof(ObjectFile) + sym_size + sec_size;
+
+	RLOG("ObjectFile(" << library_file << ":" << object_file << "), mapped size = " << mapped_size
+		<< " (" << sym_size << " in symbols, " << sec_size << " in sections)");
+//	RLOG("Linker directives: " << directives);
+	RLOG("#sections = " << sections.GetCount());
+/*
+	for(int i = 0; i < sections.GetCount(); i++)
+	{
+		const Section& sec = sections[i];
+		RLOG(NFormat("[%d]: %s", i, linkjob[sec.name_atom]));
+		int end_ext = (i + 1 < sections.GetCount() ? sections[i + 1].ref_ext_index : ref_externals.GetCount());
+		int end_sec = (i + 1 < sections.GetCount() ? sections[i + 1].ref_sec_index : ref_sections.GetCount());
+		RLOG("#external references = " << (end_ext - sec.ref_ext_index));
+		int r;
+		for(r = sec.ref_ext_index; r < end_ext; r++)
+			RLOG(linkjob[linkjob.globals.GetKey(ref_externals[r])]);
+		RLOG("#section references = " << (end_sec - sec.ref_sec_index));
+		for(r = sec.ref_sec_index; r < end_sec; r++)
+			RLOG(NFormat("%04x", ref_sections[r]));
+	}
+*/
+}
diff --git a/uppsrc/coff/uld/uld.h b/uppsrc/coff/uld/uld.h
new file mode 100644
index 000000000..060447324
--- /dev/null
+++ b/uppsrc/coff/uld/uld.h
@@ -0,0 +1,14 @@
+#ifndef __uld_uld__
+#define __uld_uld__
+
+#include <coff/coff.h>
+
+using namespace Upp;
+
+inline dword PeekIL(const void *p) { return Peek32le(p); }
+inline word  PeekIW(const void *p) { return Peek16le(p); }
+
+inline void  PokeIL(const void *p, dword d) { return Poke32le(p, d); }
+inline void  PokeIW(const void *p, word d)  { return Poke16le(p, d); }
+
+#endif//__uld_uld__
diff --git a/uppsrc/coff/uld/uld.upp b/uppsrc/coff/uld/uld.upp
new file mode 100644
index 000000000..2eeb7b611
--- /dev/null
+++ b/uppsrc/coff/uld/uld.upp
@@ -0,0 +1,31 @@
+description "Ultimate++ COFF linker (GNU binutils compatible, faster)";
+
+uses
+	coff;
+
+target(TEST) ld-test.exe;
+
+target(!TEST) ld.exe;
+
+link(GCC) "-v ";
+
+file
+	Main readonly separator,
+	version.h,
+	notes.txt,
+	solved.txt,
+	uld.h,
+	dump.cpp,
+	obj.h,
+	object.cpp,
+	linkjob.cpp,
+	diff,
+	main.cpp,
+	Info readonly separator,
+	COPYING,
+	COPYING-PLAIN,
+	AUTHORS;
+
+mainconfig
+	"" = "",
+	"" = ".TEST";
diff --git a/uppsrc/coff/uld/version.h b/uppsrc/coff/uld/version.h
new file mode 100644
index 000000000..e8e7d61e3
--- /dev/null
+++ b/uppsrc/coff/uld/version.h
@@ -0,0 +1,10 @@
+#ifndef _console_uld_version_h_
+#define _console_uld_version_h_
+
+#define ULD_VERSION_MAJOR 1
+#define ULD_VERSION_MINOR 2
+#define ULD_VERSION_RELEASE 21
+#define ULD_DATE Date(2008, 3, 25)
+#define ULD_COPYRIGHT "Copyright (c) 2003-2006,2008 Tomas Rylek"
+
+#endif
diff --git a/uppsrc/coff/util.cpp b/uppsrc/coff/util.cpp
new file mode 100644
index 000000000..80118d819
--- /dev/null
+++ b/uppsrc/coff/util.cpp
@@ -0,0 +1,698 @@
+// Copyright (C) 2003 Mirek Fidler, Tomas Rylek. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 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 General Public License for more details. You should have received a copy of the GNU General Public License (see COPYING) along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+#include "coff.h"
+
+#ifdef PLATFORM_WIN32
+#include <winver.h>
+#include <imagehlp.h>
+#endif
+
+NAMESPACE_UPP
+
+#ifdef PLATFORM_WIN32
+
+#define DLLFILENAME "imagehlp.dll"
+#define DLIHEADER   <coff/imagehlp.dli>
+#define DLIMODULE   ImageHlp
+#include            <Core/dli.h>
+
+Vector<String> EnumWinRegSubkeys(const char *path, HKEY base_key) {
+	HKEY key = 0;
+	Vector<String> keys;
+	if(RegOpenKeyEx(base_key, path, 0, KEY_READ, &key) != ERROR_SUCCESS)
+		return keys;
+	for(DWORD index = 0;; index++) {
+		char name[1000];
+		dword length = sizeof(name);
+		FILETIME time;
+		if(RegEnumKeyEx(key, index, name, &length, 0, NULL, NULL, &time) != ERROR_SUCCESS)
+			break;
+		keys.Add(String(name, length));
+	}
+	RegCloseKey(key);
+	return keys;
+}
+
+String TranslateCygWinPath(const char *path)
+{
+	static String base_key = "SOFTWARE\\Cygnus Solutions\\Cygwin\\mounts v2";
+	static String cygdrive = GetWinRegString("cygdrive prefix", base_key, HKEY_LOCAL_MACHINE);
+	static Vector<String> root = EnumWinRegSubkeys(base_key, HKEY_LOCAL_MACHINE);
+	static Vector<String> mount;
+	if(mount.IsEmpty()) {
+		mount.SetCount(root.GetCount());
+		for(int i = 0; i < root.GetCount(); i++)
+			mount[i] = GetWinRegString("native", base_key + "\\" + root[i], HKEY_LOCAL_MACHINE);
+	}
+	if(!memcmp(path, cygdrive, cygdrive.GetLength()) && path[cygdrive.GetLength()] == '/') {
+		const char *drv = path + cygdrive.GetLength() + 1;
+		if(IsAlpha(*drv) && drv[1] == '/')
+			return AppendFileName(String(*drv, 1) + ":\\", drv + 2);
+	}
+	String bestroot, bestmount, bestrel;
+	for(int i = 0; i < root.GetCount(); i++) {
+		int l = root[i].GetLength();
+		if(!memcmp(path, root[i], l) && (*root[i].Last() == '/' || path[l] == 0 || path[l] == '/')) {
+			if(l > bestroot.GetLength()) {
+				bestroot = root[i];
+				bestmount = mount[i];
+				const char *p = path + l;
+				if(*p == '/')
+					p++;
+				bestrel = p;
+			}
+		}
+	}
+	if(!IsNull(bestroot))
+		return AppendFileName(bestmount, bestrel);
+
+	return Null;
+}
+#endif
+
+const char *EatPrefix(const char *string, const char *prefix)
+{
+	int len = (int)strlen(prefix);
+	return (!MemICmp(string, prefix, len) ? string + len : NULL);
+}
+
+Vector<String> SplitCmdArgs(const char *cmd)
+{
+	Vector<String> out;
+	while(*cmd)
+		if((byte)*cmd <= ' ')
+			cmd++;
+		else
+		{
+			String arg;
+			while(*cmd > ' ')
+				if(*cmd == '\"')
+				{
+					cmd++;
+					while(*cmd && (*cmd != '\"' || *++cmd == '\"'))
+						arg.Cat(*cmd++);
+				}
+				else
+					arg.Cat(*cmd++);
+			out.Add(arg);
+		}
+	return out;
+}
+
+const char *FetchCmdArg(const Vector<String>& cmdlist, int& cmdi)
+{
+	if(cmdi + 1 >= cmdlist.GetCount())
+		throw Exc(NFormat("Argument missing for option '%s'.", cmdlist[cmdi]));
+	return cmdlist[++cmdi];
+}
+
+const char *FetchCmdArg(const Vector<String>& cmdlist, int& cmdi, const char *ptr)
+{
+	return (ptr && *ptr ? ptr : FetchCmdArg(cmdlist, cmdi));
+}
+
+int ScanCInt(const char *line)
+{
+	while(*line && (byte)*line <= ' ')
+		line++;
+	bool sign = (*line == '-');
+	if(sign || *line == '+')
+		line++;
+	if(!IsDigit(*line))
+		return Null;
+	int out = 0;
+	if(*line == '0')
+	{
+		if(line[1] == 'x')
+		{ // hexadecimal
+			line += 2;
+			if(!IsXDigit(*line))
+				return Null;
+			for(; IsXDigit(*line); line++)
+				out = 16 * out + (*line <= '9' ? *line - '0' : (*line & ~0x20) - 'A' + 10);
+		}
+		else
+		{ // octal
+			while(unsigned(*++line - '0') < 8)
+				out = 8 * out + *line - '0';
+		}
+	}
+	else
+	{ // decimal
+		do
+			out = 10 * out + *line++ - '0';
+		while(IsDigit(*line));
+	}
+	return sign ? -out : out;
+}
+
+static inline bool IsDirSep(char c) { return c == '/' || c == '\\'; }
+
+String NormalizeRelPath(const char *path)
+{
+	String out;
+	while(*path)
+	{
+		while(IsDirSep(*path))
+		{
+			out.Cat('\\');
+			path++;
+		}
+		const char *b = path;
+		while(*path && !IsDirSep(*path))
+			path++;
+		if(path - b == 1 && *b == '.')
+		{
+			if(!out.IsEmpty() && !IsDirSep(*out.Last()))
+				out.Cat('\\');
+			while(IsDirSep(*path))
+				path++;
+			continue;
+		}
+		if(path - b == 2 && *b == '.' && b[1] == '.')
+		{
+			const char *o = out.Begin(), *e = out.End();
+			if(e - o >= 2 && IsDirSep(e[-1]) && !IsDirSep(e[-2]))
+			{
+				e -= 2;
+				while(e > o && !IsDirSep(e[-1]))
+					e--;
+				out.Trim(int(e - o));
+				while(IsDirSep(*path))
+					path++;
+				continue;
+			}
+		}
+		out.Cat(b, int(path - b));
+	}
+	return out;
+}
+
+int CatN0(Vector<byte>& out, int length)
+{
+	int l = out.GetCount();
+	out.AddN(length);
+	memset(&out[l], 0, length);
+	return l;
+}
+
+int CatN(Vector<byte>& out, int length, const void *in)
+{
+	int l = out.GetCount();
+	if(length > 0)
+	{
+		out.AddN(length);
+		if(in)
+			memcpy(&out[l], in, length);
+	}
+	return l;
+}
+
+#ifdef PLATFORM_WIN32
+static String WipeClass(const char *p)
+{
+	String out;
+	while(*p)
+		if(IsAlpha(*p) || *p == '_')
+		{
+			const char *b = p++;
+			while(IsAlNum(*p) || *p == '_')
+				p++;
+			if(p - b == 5 && !memcmp(b, "class", 5))
+			{
+				while(*p == ' ')
+					p++;
+			}
+			else
+				out.Cat(b, int(p - b));
+		}
+		else
+			out.Cat(*p++);
+	return out;
+}
+#endif
+
+static inline bool IsIdent(char c) { return IsAlNum(c) || c == '_'; }
+
+static inline const char *ReadIdent(const char *p, int len)
+{
+	const char *b = p;
+	while(IsIdent(*p) && ++p - b < len)
+		;
+	return p;
+}
+
+static const char *DemangleGccDeclarator(String& base, String& prefix, const char *p,
+	Vector<String>& templmap, Vector<String>& argmap, bool is_template);
+
+static const char *DemangleGccDeclarator(String& out, const char *p,
+	Vector<String>& templmap, Vector<String>& argmap, bool is_template)
+{
+	String base, prefix;
+	p = DemangleGccDeclarator(base, prefix, p, templmap, argmap, is_template);
+	out << base;
+	if(!IsNull(prefix))
+		out << ' ' << prefix;
+	return p;
+}
+
+static const char *DemangleGccDeclarator(String& out, String& prefix, const char *p,
+	Vector<String>& templmap, Vector<String>& argmap, bool is_template)
+{
+	String base;
+	switch(*p++)
+	{
+	case 'b':
+		base << "bool";
+		break;
+
+	case 'c':
+		base << "char";
+		break;
+
+	case 'd':
+		base << "double";
+		break;
+
+	case 'F':
+		p = DemangleGccDeclarator(base, p, templmap, argmap, false);
+		prefix = "(" + prefix + ")(";
+		while(p && *p && *p != 'E')
+		{
+			if(*prefix.Last() != '(')
+				prefix << ", ";
+			p = DemangleGccDeclarator(prefix, p, templmap, argmap, false);
+		}
+		if(p && *p == 'E')
+			p++;
+		prefix.Cat(')');
+		break;
+
+	case 'h':
+		base << "byte";
+		break;
+
+	case 'E': // single argument
+		p = DemangleGccDeclarator(base, p + 1, templmap, argmap, is_template);
+		break;
+
+	case 'I':
+		{ // multiple arguments
+			String tmpargs;
+//			Vector<String> auxmap;
+			while(p && *p && *p != 'E')
+			{
+				if(!tmpargs.IsEmpty())
+					tmpargs.Cat(", ");
+				String arg;
+				p = DemangleGccDeclarator(arg, p, templmap, argmap, is_template);
+				tmpargs.Cat(arg);
+			}
+			if(tmpargs[0] == '<' || !tmpargs.IsEmpty() && *tmpargs.Last() == '>')
+				base << "< " << tmpargs << " >";
+			else
+				base << '<' << tmpargs << '>';
+			if(p && *p == 'E')
+				p++;
+		}
+		break;
+
+	case 'i':
+		base << "int";
+		break;
+
+	case 'j':
+		base << "unsigned";
+		break;
+
+	case 'K':
+		if(!IsNull(prefix))
+			prefix = "const " + prefix;
+		else
+			base << "const ";
+		p = DemangleGccDeclarator(base, prefix, p, templmap, argmap, is_template);
+		break;
+
+	case 'L':
+		if(*p == 'i')
+		{
+			int num = ScanInt(p + 1, &p);
+			if(!IsNull(num))
+			{
+				base << num;
+				break;
+			}
+		}
+		goto UNKNOWN;
+
+	case 'm':
+		base << "dword";
+		break;
+
+	case 'P':
+		prefix = "*" + prefix;
+		p = DemangleGccDeclarator(base, prefix, p, templmap, argmap, is_template);
+		break;
+
+	case 'R':
+		prefix = "&" + prefix;
+		p = DemangleGccDeclarator(base, prefix, p, templmap, argmap, is_template);
+		break;
+
+	case 'S':
+		{
+			int equiv = 0;
+			if(IsDigit(*p))
+			{
+				equiv = ScanInt(p, &p);
+				if(equiv < 0)
+				{
+					base << "error(S)";
+					return NULL;
+				}
+			}
+			if(*p++ != '_')
+			{
+				base << "error(S_)";
+				return NULL;
+			}
+			if(!argmap.IsEmpty() && equiv == argmap.GetCount()) // ??
+				base.Cat(argmap.Top());
+			else if(equiv >= argmap.GetCount())
+			{
+				base << "error(S" << equiv << "_)";
+				return NULL;
+			}
+			else
+				base.Cat(argmap[equiv]);
+		}
+		break;
+
+	case 'T':
+		{
+			int equiv = 0;
+			if(IsDigit(*p))
+			{
+				equiv = ScanInt(p, &p);
+				if(equiv < 0)
+				{
+					base << "error(T)";
+					return NULL;
+				}
+			}
+			if(*p++ != '_')
+			{
+				base << "error(T_)";
+				return NULL;
+			}
+			if(!templmap.IsEmpty() && equiv == templmap.GetCount()) // ??
+				base.Cat(templmap.Top());
+			else if(equiv >= templmap.GetCount())
+			{
+				base << "error(T" << equiv << "_)";
+				return NULL;
+			}
+			else
+				base.Cat(templmap[equiv]);
+		}
+		break;
+
+	case 't':
+		base << "word";
+		break;
+
+	case 'v': // void
+		base << "void";
+		break;
+
+	case 'z':
+		base << "...";
+		break;
+
+	case 'N':
+		{
+			bool first = true;
+			while(p && *p != 'E')
+			{
+				if(!IsDigit(*p))
+					break;
+				int ident = ScanInt(p, &p);
+				if(ident <= 0)
+					break;
+				const char *b = p;
+				p = ReadIdent(p, ident);
+				if(p - b < ident)
+					break;
+				if(!first)
+					base.Cat("::");
+				base.Cat(b, int(p - b));
+				if(*p == 'I')
+					p = DemangleGccDeclarator(base, p, templmap, argmap, true);
+				first = false;
+			}
+			if(!p)
+				base << "(error)";
+			else if(*p == 'E')
+				p++;
+		}
+		break;
+
+	default:
+		if(IsDigit(*--p))
+		{
+			int ident = ScanInt(p, &p);
+			if(ident <= 0)
+				break;
+			const char *b = p;
+			p = ReadIdent(p, ident);
+			if(p - b < ident)
+				break;
+			base.Cat(b, int(p - b));
+			if(*p == 'I')
+				p = DemangleGccDeclarator(base, p, templmap, argmap, true);
+			break;
+		}
+
+	UNKNOWN:
+		base << "unknown " << *p;
+		return NULL;
+	}
+	if(is_template)
+		templmap.Add(base);
+	argmap.Add(base);
+	out.Cat(base);
+	return p;
+}
+
+const char *DemangleOperator(char a, char b)
+{
+	const char *functor = NULL;
+	/**/ if(a == 'e' && b == 'q') functor = "==";
+	else if(a == 'n' && b == 'e') functor = "!=";
+	else if(a == 'l' && b == 't') functor = "<";
+	else if(a == 'l' && b == 'e') functor = "<=";
+	else if(a == 'g' && b == 't') functor = ">";
+	else if(a == 'g' && b == 'e') functor = ">=";
+	else if(a == 'i' && b == 'x') functor = "[]";
+	else if(a == 'r' && b == 'm') functor = "%";
+	else if(a == 'p' && b == 'L') functor = "+=";
+	else if(a == 'a' && b == 'S') functor = "=";
+	else if(a == 'p' && b == 'l') functor = "+";
+	else if(a == 'l' && b == 's') functor = "<<";
+	else if(a == 'l' && b == 'S') functor = "<<=";
+	return functor;
+}
+
+String DemangleGccName(const char *name)
+{
+	const char *p = name;
+	if(*p++ != '_' || *p++ != '_' || *p++ != 'Z')
+		return name;
+	String out;
+	bool method = (*p == 'N');
+	if(method)
+		p++;
+	bool methconst = (*p == 'K');
+	if(methconst)
+		p++;
+	if(IsDigit(*p))
+	{
+		if(!IsDigit(*p))
+			return name;
+		int ident = ScanInt(p, &p);
+		if(ident <= 0)
+			return name;
+		const char *b = p;
+		p = ReadIdent(p, ident);
+		if(p - b < ident)
+			return name;
+		out.Cat(b, ident);
+	}
+	else
+	{
+		const char *functor = (*p ? DemangleOperator(p[0], p[1]) : NULL);
+		if(!functor)
+			return name;
+		p += 2;
+		out << "operator " << functor << ' ';
+	}
+	Vector<String> templmap, argmap;
+	bool retval = false;
+	if(*p == 'I')
+	{
+		String arg;
+		p = DemangleGccDeclarator(arg, p, templmap, argmap, true);
+		out.Cat(arg);
+		retval = (!method);
+	}
+	if(!p)
+	{
+		out << "; " << name;
+		return out;
+	}
+	String root = out;
+	if(method)
+		argmap.Add(out);
+	if(method)
+	{
+		while(p && *p && *p != 'E' && *p != 'I')
+		{
+			int notempl = root.Find('<');
+			if(notempl < 0)
+				notempl = root.GetLength();
+			if(*p == 'C')
+			{
+				retval = false;
+				out.Cat("::");
+				out.Cat(root, notempl);
+				p++;
+				if(*p != '1' && *p != '2')
+					return name;
+				p++;
+				break;
+			}
+			if(*p == 'D')
+			{
+				retval = false;
+				out.Cat("::~");
+				out.Cat(root, notempl);
+				p++;
+				if(*p != '0' && *p != '1' && *p != '2')
+					return name;
+				p++;
+				break;
+			}
+			String subname, functor;
+			if(*p == 'c' && p[1] == 'v')
+			{
+				retval = false;
+				p += 2;
+				subname << "operator ";
+				p = DemangleGccDeclarator(subname, p, templmap, argmap, false);
+			}
+			else if(*p && !IsNull(functor = DemangleOperator(p[0], p[1])))
+				p += 2;
+			else if(!IsDigit(*p))
+				return name;
+			else
+			{
+				int ident = ScanInt(p, &p);
+				if(ident <= 0)
+					return name;
+				const char *b = p;
+				p = ReadIdent(p, ident);
+				if(p - b < ident)
+					return name;
+				subname = String(b, ident);
+			}
+			if(!IsNull(functor))
+				subname << "operator " << functor << ' ';
+			out.Cat("::");
+			out.Cat(subname);
+			root = subname;
+//			if(*p == 'I' || *p == 'E')
+//				p = DemangleGccDeclarator(subname, p, templmap, argmap, false);
+		}
+		if(!p || *p != 'E')
+			return name;
+		p++;
+	}
+	if(retval)
+	{
+		String rvl;
+		p = DemangleGccDeclarator(rvl, p, templmap, argmap, false);
+		if(!rvl.IsEmpty() && IsIdent(*rvl.Last()))
+			rvl.Cat(' ');
+		rvl.Cat(out);
+		out = rvl;
+	}
+	out.Cat('(');
+	while(p && *p)
+	{
+		if(*out.Last() != '(')
+			out.Cat(", ");
+		String arg;
+		p = DemangleGccDeclarator(arg, p, templmap, argmap, false);
+		out.Cat(arg);
+		argmap.Add(arg);
+	}
+	out.Cat(')');
+	if(methconst)
+		out.Cat(" const");
+//	if(!p)
+		out << "; " << name;
+	return out;
+}
+
+String DemangleName(String name, int mangling_style)
+{
+	String out = name;
+#ifdef PLATFORM_WIN32
+	if(mangling_style == MANGLING_MSC && ImageHlp())
+	{
+		char buffer[1024];
+		ImageHlp().UnDecorateSymbolName(name, buffer, sizeof(buffer),
+			UNDNAME_NO_ACCESS_SPECIFIERS | UNDNAME_NO_MEMBER_TYPE | UNDNAME_NO_MS_KEYWORDS);
+		out = WipeClass(buffer);
+	}
+	else
+#endif
+	if(mangling_style == MANGLING_GCC)
+		out = DemangleGccName(name);
+	return out;
+}
+
+
+String NormalizePathCase(String file)
+{
+#if PATH_HAS_CASE
+	return file;
+#else
+	return ToLower(file);
+#endif
+}
+
+bool EqualsPathCase(String f1, String f2)
+{
+#if PATH_HAS_CASE
+	return f1 == f2;
+#else
+	return !CompareNoCase(f1, f2);
+#endif
+}
+
+void PutStdOut(const char *text)
+{
+	puts(text);
+	fflush(stdout);
+}
+
+String MaxLenString(const byte *b, int maxlen)
+{
+	const byte *e = b + maxlen;
+	while(e > b && e[-1] == 0)
+		e--;
+	return String(b, int(e - b));
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/coff/util.h b/uppsrc/coff/util.h
new file mode 100644
index 000000000..b604789a7
--- /dev/null
+++ b/uppsrc/coff/util.h
@@ -0,0 +1,36 @@
+// Copyright (C) 2003 Mirek Fidler, Tomas Rylek. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 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 General Public License for more details. You should have received a copy of the GNU General Public License (see COPYING) along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+#ifndef _console_coff_util_h_
+#define _console_coff_util_h_
+
+#ifdef __offsetof
+	#undef __offsetof
+#endif
+
+#ifdef PLATFORM_FREEBSD
+#include <sys/types.h>
+#include <sys/stat.h>
+#endif
+
+#define __offsetof(obj, item) (int(&reinterpret_cast<obj *>(1)->item) - 1)
+
+inline bool    IsCIdent(char c) { return IsAlNum(c) || c == '_'; }
+
+Vector<String> SplitCmdArgs(const char *cmdline);
+const char    *FetchCmdArg(const Vector<String>& cmdlist, int& cmdi);
+const char    *FetchCmdArg(const Vector<String>& cmdlist, int& cmdi, const char *ptr);
+const char    *EatPrefix(const char *string, const char *prefix);
+int            ScanCInt(const char *line);
+String         NormalizeRelPath(const char *path);
+int            CatN0(Vector<byte>& out, int length);
+int            CatN(Vector<byte>& out, int length, const void *in);
+String         NormalizePathCase(String file);
+bool           EqualsPathCase(String f1, String f2);
+enum { MANGLING_NONE, MANGLING_MSC, MANGLING_GCC };
+String         DemangleName(String name, int mangling_style);
+void           PutStdOut(const char *text);
+String         MaxLenString(const byte *b, int maxlen);
+#ifdef PLATFORM_WIN32
+String         TranslateCygWinPath(const char *path);
+#endif
+#endif
diff --git a/uppsrc/docpp/AUTHORS b/uppsrc/docpp/AUTHORS
new file mode 100644
index 000000000..f782e5b62
--- /dev/null
+++ b/uppsrc/docpp/AUTHORS
@@ -0,0 +1,2 @@
+Mirek Fidler <cxl@ntllib.org>
+Tomas Rylek  <rylek@volny.cz>
\ No newline at end of file
diff --git a/uppsrc/docpp/COPYING b/uppsrc/docpp/COPYING
new file mode 100644
index 000000000..33aa39102
--- /dev/null
+++ b/uppsrc/docpp/COPYING
@@ -0,0 +1,30 @@
+Copyright (C) 2005 Mirek Fidler, Tomas Rylek and various contributors (see AUTHORS)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to
+deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies of the Software and its Copyright notices. In addition publicly
+documented acknowledgment must be given that this software has been used if no
+source code of this software is made available publicly. This includes
+acknowledgments in either Copyright notices, Manuals, Publicity and Marketing
+documents or any documentation provided with any product containing this
+software. This License does not apply to any software that links to the
+libraries provided by this software (statically or dynamically), but only to
+the software provided.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+-----------
+
+Please see the COPYING.PLAIN for a plain-english explanation of this notice
+and it's intent.
diff --git a/uppsrc/docpp/COPYING-PLAIN b/uppsrc/docpp/COPYING-PLAIN
new file mode 100644
index 000000000..770a8132f
--- /dev/null
+++ b/uppsrc/docpp/COPYING-PLAIN
@@ -0,0 +1,33 @@
+Plain English Copyright Notice
+
+This file is not intended to be the actual License. The reason this file
+exists is that we here are programmers and engineers. We aren't lawyers. We
+provide licenses that we THINK say the right things, but we have our own
+intentions at heart. This is a plain-english explanation of what those
+intentions are, and if you follow them you will be within the "spirit" of
+the license.
+
+The intent is for us to enjoy writing software that is useful to us (the
+AUTHORS) and allow others to use it freely and also benefit from the work we
+put into making it. We don't want to restrict others using it. They should
+not *HAVE* to make the source code of the applications they write that
+simply link to these libraries (be that statically or dynamically), or for
+them to be limited as to what license they choose to use (be it open, closed
+or anything else). But we would like to know you are using these libraries.
+We simply would like to know that it has been useful to someone. This is why
+we ask for acknowledgement of some sort.
+
+You can do what you want with the source of this software - it doesn't
+matter. We still have it here for ourselves and it is open and free to use
+and download and play with. It can't be taken away. We don't really mind what
+you do with the source to your software. We would simply like to know that
+you are using it - especially if it makes it to a commerical product. If you
+simply e-mail all the AUTHORS (see COPYING and AUTHORS files) telling us, and
+then make sure you include a paragraph or page in the manual or in the "About.."
+box for the product with the copyright notice and state that you used this
+software, we will be very happy. If you want to contribute back modifications
+and fixes you may have made we will welcome those too with open arms (generally).
+If you want help with changes needed, ports needed or features to be added,
+arrangements can be easily made with some dialogue.
+
+Mirek Fidler <cxl@ntllib.org>
diff --git a/uppsrc/docpp/Parser.cpp b/uppsrc/docpp/Parser.cpp
new file mode 100644
index 000000000..9a4ed5286
--- /dev/null
+++ b/uppsrc/docpp/Parser.cpp
@@ -0,0 +1,825 @@
+#include "docpp.h"
+
+String Purify(const char *s) {
+	String res;
+	while(*s) {
+		if(*s >= 'a' && *s <= 'z') {
+			String q;
+			while(*s >= 'a' && *s <= 'z')
+				q.Cat(*s++);
+			if(q != "virtual" && q != "inline")
+				res.Cat(q);
+			else
+				while((byte)*s <= ' ' && *s) s++;
+		}
+		else
+		if((byte)*s <= ' ') {
+			res.Cat(' ');
+			while(*s <= ' ' && *s)
+				s++;
+		}
+		else
+			res.Cat(*s++);
+	}
+	return res;
+}
+
+void ScAdd(String& s, const String& a)
+{
+	if(a.IsEmpty()) return;
+	if(!s.IsEmpty())
+		s << ';';
+	s << a;
+}
+
+String Parser::Context::Dump() const
+{
+	return "Namespace: " + nameing + " Struct: " + nesting;
+}
+
+void Parser::Context::operator<<=(const Context& t)
+{
+	nameing = t.nameing;
+	nesting = t.nesting;
+	typenames <<= t.typenames;
+	access = t.access;
+}
+
+
+Parser::Decla::Decla()
+{
+	function = type_def = false;
+	s_static = s_auto = s_register = s_extern = s_mutable = s_explicit = s_virtual = false;
+	isfriend = istemplate = istructor = isptr = nofn = false;
+}
+
+bool Parser::Key(int code)
+{
+	if(lex == code) {
+		++lex;
+		return true;
+	}
+	return false;
+}
+
+int  Parser::GetLine(const char *p)
+{
+	int pos = p - ~file.text;
+	int l = 0;
+	int h = file.linepos.GetCount();
+	while(l < h) {
+		int q = (l + h) / 2;
+		if(file.linepos[q] < pos)
+			l = q + 1;
+		else
+			h = q;
+	}
+	return l;
+}
+
+void Parser::Line()
+{
+	int pos = lex.Pos() - ~file.text;
+	while(line + 1 < file.linepos.GetCount() && file.linepos[line + 1] <= pos)
+		line++;
+}
+
+void Parser::ThrowError(const String& e)
+{
+	throw Error(Format("(%d) : %s", GetLine(lex.Pos()), ~e));
+}
+
+void Parser::Check(bool b, const char *err)
+{
+	if(!b) ThrowError(err);
+}
+
+void Parser::CheckKey(int c)
+{
+	if(!Key(c)) ThrowError(Format("Missing %c", c));
+}
+
+String Parser::TemplateParams(String& param)
+{
+	const char *pos = lex.Pos();
+	CheckKey('<');
+	int level = 1;
+	String id;
+	bool gp = true;
+	for(;;) {
+		if(lex.IsId() && gp)
+			id = lex.GetId();
+		else
+		if(Key(',')) {
+			ScAdd(param, id);
+			id.Clear();
+			gp = true;
+		}
+		else
+		if(Key('=')) {
+			if(!id.IsEmpty()) {
+				ScAdd(param, id);
+				id.Clear();
+			}
+			gp = false;
+		}
+		else
+		if(Key('>')) {
+			level--;
+			if(level <= 0) {
+				ScAdd(param, id);
+				break;
+			}
+		}
+		else
+		if(Key('<'))
+			level++;
+		else
+			++lex;
+	}
+	return String(pos, lex.Pos());
+}
+
+String Parser::TemplateParams()
+{
+	String dummy;
+	return TemplateParams(dummy);
+}
+
+String Parser::TemplatePnames()
+{
+	String pnames;
+	TemplateParams(pnames);
+	return pnames;
+}
+
+String Parser::Name()
+{
+	String s;
+	if(Key(t_dblcolon))
+		s << "::";
+	Check(lex.IsId(), "Name expected");
+	while(lex.IsId()) {
+		s << lex.GetId();
+		if(lex == '<')
+			s << TemplateParams();
+		if(Key(t_dblcolon)) {
+			s << "::";
+			if(Key('~'))
+				s << "~";
+		}
+		else
+			break;
+	}
+	return s;
+}
+
+String Parser::Constant()
+{
+	const char *p = lex.Pos();
+	const char *p1 = p;
+	int level = 0;
+	for(;;) {
+		p1 = lex.Pos();
+		if(lex == t_eof) break;
+		if(level <= 0 && (lex == ',' || lex == ';' || lex == ')' || lex == '}' || lex == ']'))
+			break;
+		if(Key('(') || Key('[') || Key('{')) level++;
+		else
+		if(Key(')') || Key(']') || Key('}')) level--;
+		else
+			++lex;
+	}
+	return String(p, p1);
+}
+
+String Parser::SimpleType()
+{
+	if(Key(tk_struct) || Key(tk_class) || Key(tk_union) || Key(tk_enum) || Key(tk_typename)) {
+		if(lex.IsId() || lex == t_dblcolon) Name();
+		if(lex == '{') EatBody();
+		return Null;
+	}
+	if(Key(tk_bool) || Key(tk_float) || Key(tk_double) || Key(tk_void))
+		return Null;
+	bool sgn = Key(tk_signed) || Key(tk_unsigned);
+	if(Key(tk_long)) {
+		Key(tk_int);
+		return Null;
+	}
+	if(Key(tk_short)) {
+		Key(tk_int);
+		return Null;
+	}
+	if(Key(tk_int) || Key(tk_char) ||
+	   Key(tk___int8) || Key(tk___int16) || Key(tk___int32) || Key(tk___int64)) return Null;
+	if(sgn) return Null;
+	const char *p = lex.Pos();
+	int cs = 0;
+	Index<int> cix;
+	Key(t_dblcolon);
+	Check(lex.IsId(), "Name expected");
+	while(lex.IsId()) {
+		if(cix.Find(lex) >= 0)
+			cs++;
+		else
+			cix.Add(lex);
+		++lex;
+		if(lex == '<')
+			TemplateParams();
+		if(Key(t_dblcolon))
+			Key('~');
+		else
+			break;
+	}
+	return cs ? String(p, lex.Pos()) : String();
+}
+
+void Parser::Qualifier()
+{
+	Key(tk_const);
+	Key(tk_volatile);
+	if(Key(tk_throw)) {
+		while(lex != t_eof && !Key(')'))
+			++lex;
+	}
+}
+
+void Parser::Elipsis(Decl& d)
+{
+	Decl& q = d.param.Add();
+	q.name = "...";
+	CheckKey(')');
+}
+
+void Parser::ParamList(Decl& d) {
+	if(!Key(')'))
+		for(;;) {
+			if(Key(t_elipsis)) {
+				Elipsis(d);
+				break;
+			}
+			else
+				d.param.Add() = Declaration().Top();
+			if(Key(t_elipsis)) {
+				Elipsis(d);
+				break;
+			}
+			if(Key(')')) break;
+			CheckKey(',');
+		}
+}
+
+int Parser::RPtr()
+{
+	int n = 0;
+	int q = 0;
+	int tlevel = 0;
+	for(;;) {
+		int t = lex[n];
+		if(t == '*') return n + 1;
+		if(t == '<') {
+			tlevel++;
+			n++;
+		}
+		else
+		if(t == '>') {
+			tlevel--;
+			n++;
+		}
+		else
+		if(t == t_dblcolon || lex.IsId(n) || t == ',' && tlevel > 0)
+			n++;
+		else
+			return 0;
+	}
+}
+
+void Parser::EatInitializers()
+{
+	if(Key(':')) {
+		while(lex != '{' && lex != t_eof) ++lex;
+	}
+}
+
+String Parser::ReadOper() {
+	const char *p = lex.Pos();
+	const char *p1 = p;
+	Key(tk_operator);
+	int level = 0;
+	if(Key('('))
+		level++;
+	for(;;) {
+		p1 = lex.Pos();
+		if(lex == t_eof) break;
+		if(level <= 0 && lex == '(') break;
+		if(Key('(') || Key('[')) level++;
+		else
+		if(Key(')')  || Key(']')) level--;
+		else
+			++lex;
+	}
+	return TrimRight(Purify(String(p, p1)));
+}
+
+void Parser::Declarator(Decl& d, const char *p)
+{
+	int n = RPtr();
+	if(n) {
+		while(n--) lex.Get();
+		Declarator(d, p);
+		d.isptr = true;
+		return;
+	}
+	if(Key('&')) {
+		Declarator(d, p);
+		return;
+	}
+	if(Key(tk_const)) {
+		Declarator(d, p);
+		return;
+	}
+	if(Key('(')) {
+		Declarator(d, p);
+		if(d.isptr)
+			d.nofn = true;
+		CheckKey(')');
+	}
+	if(lex == tk_operator)
+		d.name = ReadOper();
+	else
+	if(lex.IsId() || lex == t_dblcolon) {
+		d.name = Name();
+		if(Key(':'))
+			if(!Key(t_integer))
+				Name();
+	}
+	if(Key('(')) {
+		if((lex < 256 || lex == tk_true || lex == tk_false) && lex != ')') {
+			int level = 0;
+			for(;;) {
+				if(lex == t_eof) break;
+				if(Key('(')) level++;
+				else
+				if(Key(')')) {
+					if(--level < 0) break;
+				}
+				else
+					++lex;
+			}
+			return;
+		}
+		else {
+			d.header = String(p, lex.Pos() - 1);
+			d.function = !d.nofn;
+			ParamList(d);
+			p = lex.Pos();
+			Qualifier();
+			d.ender = String(p, lex.Pos());
+		}
+	}
+	EatInitializers();
+	while(Key('[')) {
+		const char *p = lex.Pos();
+		int level = 1;
+		while(level && lex != t_eof) {
+			if(Key('[')) level++;
+			else
+			if(Key(']')) level--;
+			else
+				++lex;
+		}
+	}
+	if(Key('=')) {
+		Constant();
+	}
+}
+
+Parser::Decl& Parser::Finish(Decl& d, const char *s)
+{
+	d.natural = String(s, lex.Pos());
+	return d;
+}
+
+Parser::Decl Parser::Type() {
+	Decl d;
+	const char *p = lex.Pos();
+	Qualifier();
+	SimpleType();
+	Declarator(d, p);
+	return Finish(d, p);
+}
+
+Array<Parser::Decl> Parser::Declaration(bool l0, bool more)
+{
+	Array<Decl> r;
+	Decla d;
+	const char *p = lex.Pos();
+	if(Key(tk_typedef)) {
+		r = Declaration();
+		r.Top().type_def = true;
+		r.Top().natural = String(p, lex.Pos());
+		return r;
+	}
+	if(Key(tk_friend))
+		d.isfriend = true;
+//	if(Key(tk_template)) {
+//		d.istemplate = true;
+//		d.template_params = TemplateParams(d.tnames);
+//	}
+	for(;;) {
+		if(Key(tk_static))
+			d.s_static = true;
+		else
+		if(Key(tk_extern))
+			d.s_extern = true;
+		else
+		if(Key(tk_auto))
+			d.s_auto = true;
+		else
+		if(Key(tk_register))
+			d.s_register = true;
+		else
+		if(Key(tk_mutable))
+			d.s_mutable = true;
+		else
+		if(Key(tk_explicit))
+			d.s_explicit = true;
+		else
+		if(Key(tk_virtual))
+			d.s_virtual = true;
+		else
+		if(!Key(tk_inline))
+			break;
+	}
+	Qualifier();
+	bool isdestructor = Key('~');
+	if(l0 && context.typenames.Find(lex) >= 0 && lex[1] == '(') {
+		Decl& a = r.Add();
+		a.name = lex.GetId();
+		a.isdestructor = isdestructor;
+		a.function = true;
+		a.istructor = true;
+		a.header = String(p, lex.Pos());
+		++lex;
+		ParamList(a);
+		const char *p1 = lex.Pos();
+		Qualifier();
+		a.ender = String(p1, lex.Pos());
+		a.natural = String(p, lex.Pos());
+		EatInitializers();
+		return r;
+	}
+	if(lex == tk_operator) {
+		Decl& a = r.Add();
+		(Decla&)a = d;
+		a.name = ReadOper();
+		a.header = String(p, lex.Pos());
+		Key('(');
+		ParamList(a);
+		const char *p1 = lex.Pos();
+		Qualifier();
+		a.ender = String(p1, lex.Pos());
+		a.function = true;
+		a.natural = String(p, lex.Pos());
+		return r;
+	}
+	String st = SimpleType();
+	if(!st.IsEmpty()) {
+		Decl& a = r.Add();
+		a.name = st;
+		a.isdestructor = st.Find('~') > 0;
+		a.function = true;
+		a.istructor = true;
+		a.header = String(p, lex.Pos());
+		if(Key('('))
+			ParamList(a);
+		const char *p1 = lex.Pos();
+		Qualifier();
+		a.ender = String(p1, lex.Pos());
+		a.natural = String(p, lex.Pos());
+		EatInitializers();
+		return r;
+	}
+	String natural1 = String(p, lex.Pos());
+	do {
+		const char *p1 = lex.Pos();
+		Decl& a = r.Add();
+		(Decla&)a = d;
+		Declarator(a, p);
+		a.natural = natural1 + String(p1, lex.Pos());
+		p = lex.Pos();
+	}
+	while(more && Key(','));
+	return r;
+}
+
+bool Parser::EatBody()
+{
+	if(!Key('{')) return false;
+	int level = 1;
+	while(level && lex != t_eof) {
+		if(Key('{')) level++;
+		else
+		if(Key('}')) level--;
+		else
+			++lex;
+	}
+	return true;
+}
+
+String CleanTp(const String& tp)
+{
+	int q = tp.Find('<');
+	int w = tp.ReverseFind('>');
+	if(q < 0 || w < 0) return tp;
+	String a = TrimLeft(TrimRight(tp.Mid(q + 1, w - q - 1)));
+	const char *s = a;
+	String r;
+	while(*s) {
+		if(*s == ',') {
+			r.Cat(';');
+			s++;
+			while(*s == ' ')
+				s++;
+		}
+		else
+			r.Cat(*s++);
+	}
+	return r;
+}
+
+bool Parser::Nest(const String& tp, const String& tn) {
+	if(Key(tk_namespace)) {
+		Check(lex.IsId(), "Expected name of namespace");
+		String name = lex.GetId();
+		if(Key('{')) {
+			Context cc;
+			cc <<= context;
+			context.nameing << name << "::";
+			Do();
+			context <<= cc;
+			Key('}');
+		}
+		Key(';');
+		return true;
+	}
+	if((lex == tk_class || lex == tk_struct || lex == tk_union) &&
+	   lex.IsId(1) &&
+	   (lex[2] == ':' || lex[2] == ';' || lex[2] == '{')) {
+		int t = lex.GetCode();
+		context.typenames.FindAdd(lex);
+		String name = lex.GetId();
+		Context cc;
+		cc <<= context;
+		if(context.nesting.IsEmpty())
+			context.nesting = name + TrimRight(tp);
+		else
+			context.nesting = context.nesting + "::" + name + TrimRight(tp);
+		context.access = t == tk_class ? PRIVATE : PUBLIC;
+		String nn;
+		if(!tp.IsEmpty())
+			nn = "template " + tp + " ";
+		nn << (t == tk_class ? "class " : t == tk_union ? "union " : "struct ") + name;
+		CppItem& im = Item(context.nameing, context.nesting, nn);
+		im.kind = tp.IsEmpty() ? STRUCT : STRUCTTEMPLATE;
+		im.name = name;
+		im.access = cc.access;
+		im.tname = tn;
+		im.tparam = CleanTp(tp);
+		if(Key(':')) {
+			do {
+				String access = t == tk_class ? "private" : "public";
+				if(Key(tk_public)) access = "public";
+				else
+				if(Key(tk_protected)) access = "protected";
+				else
+				if(Key(tk_private)) access = "private";
+				if(Key(tk_virtual)) access << " virtual";
+				String n = Name();
+				ScAdd(im.pname, n);
+				ScAdd(im.param, access + ' ' + n);
+			}
+			while(Key(','));
+		}
+		if(Key('{')) {
+			Do();
+			CheckKey('}');
+		}
+		CheckKey(';');
+		context = cc;
+		return true;
+	}
+	return false;
+}
+
+CppItem& Parser::Item(const String& nameing, const String& nesting, const String& item)
+{
+	CppItem& im = base->GetAdd(nameing).GetAdd(nesting).GetAdd(TrimRight(Purify(item)));
+	im.pname.Clear();
+	im.param.Clear();
+	im.package = package;
+	im.file = filename;
+	im.line = line + 1;
+	im.name.Clear();
+	return im;
+}
+
+void Parser::Do()
+{
+	while(lex != t_eof && lex != '}') {
+		Line();
+		if(Key(tk_using)) {
+			while(!Key(';'))
+				++lex;
+		}
+		else
+		if(Key(tk_extern) && lex == t_string) {
+			++lex;
+			++lex;
+			if(Key('{')) {
+				Do();
+				Key('}');
+			}
+			Key(';');
+		}
+		else
+		if(Key(tk_template)) {
+			if(lex.IsId() || lex == tk_class && lex.IsId(1)) {
+				Key(tk_class);
+				for(;;) {
+					if(lex.IsId())
+						lex.GetId();
+					else
+					if(!Key(t_dblcolon))
+						break;
+				}
+				TemplateParams();
+				Key(';');
+			}
+			else {
+				String tnames;
+				String tparam = TemplateParams(tnames);
+				if(!Nest(tparam, tnames)) {
+					Array<Decl> r = Declaration(true, true);
+					for(int i = 0; i < r.GetCount(); i++) {
+						Decl& d = r[i];
+						d.natural = "template" + tparam + ' ' + d.natural;
+						if(context.access != PRIVATE && !d.isfriend && d.function) {
+							CppItem& im = Item(context.nameing, context.nesting, d.natural);
+							im.name = d.name;
+							im.access = context.access;
+							im.header = Purify(d.header);
+							im.ender = Purify(d.ender);
+							im.kind = context.nesting.IsEmpty() ? FUNCTIONTEMPLATE :
+									  d.s_static ? CLASSFUNCTIONTEMPLATE
+												 : INSTANCEFUNCTIONTEMPLATE;
+							for(int i = 0; i < d.param.GetCount(); i++) {
+								ScAdd(im.param, d.param[i].natural);
+								ScAdd(im.pname, d.param[i].name);
+							}
+							im.tname = tnames;
+							im.tparam = CleanTp(tparam);
+						}
+					}
+					EatBody();
+					Key(';');
+				}
+			}
+		}
+		else
+		if(lex == tk_enum && (lex[1] == '{' || lex[2] == '{')) {
+			++lex;
+			String name;
+			if(lex.IsId())
+				name = lex.GetId();
+			String param;
+			String pname;
+			String n = "enum " + name + " { ";
+			Key('{');
+			for(;;) {
+				String val;
+				Check(lex.IsId(), "Expected identifier");
+				String nm = lex.GetId();
+				if(Key('='))
+					val = Constant();
+				if(!param.IsEmpty())
+					n << ", ";
+				n << nm;
+				ScAdd(param, nm + " = " + val);
+				ScAdd(pname, nm);
+				Key(',');
+				if(Key('}')) break;
+			}
+			n << " }";
+			CppItem& im = Item(context.nameing, context.nesting, n);
+			im.kind = ENUM;
+			im.name = name;
+			im.access = context.access;
+			im.param = param;
+			im.pname = pname;
+			if(lex.IsId())
+				im.name = lex.GetId();
+			CheckKey(';');
+		}
+		else
+		if(Key('#')) {
+			String n = lex.GetText();
+			CppItem& im = Item(context.nameing, context.nesting, n);
+			im.kind = MACRO;
+			im.name.Clear();
+			const char *s = n;
+			while(*s && iscid(*s))
+				im.name.Cat(*s++);
+			s = strchr(n, '(');
+			if(s) {
+				s++;
+				String p;
+				for(;;) {
+					if(iscid(*s))
+						p.Cat(*s++);
+					else {
+						ScAdd(im.pname, p);
+						p.Clear();
+						if(*s == ')' || *s == '\0') break;
+						s++;
+					}
+				}
+			}
+			im.access = context.access;
+		}
+		else
+		if(!Nest(String(), String())) {
+			if(Key(tk_public)) {
+				context.access = PUBLIC;
+				Key(':');
+			}
+			else
+			if(Key(tk_private)) {
+				context.access = PRIVATE;
+				Key(':');
+			}
+			else
+			if(Key(tk_protected)) {
+				context.access = PROTECTED;
+				Key(':');
+			}
+			else {
+				const char *p = lex.Pos();
+				Array<Decl> r = Declaration(true, true);
+				bool body = EatBody();
+				for(int i = 0; i < r.GetCount(); i++) {
+					Decl& d = r[i];
+					if(context.access != PRIVATE && !d.isfriend || d.isfriend && body) {
+						CppItem& im = Item(context.nameing, context.nesting, d.natural);
+						im.name = d.name;
+						im.header = Purify(d.header);
+						im.ender = Purify(d.ender);
+						im.access = context.access;
+						if(d.function) {
+							im.kind = d.istructor ? (d.isdestructor ? DESTRUCTOR : CONSTRUCTOR) :
+							          d.isfriend ? INLINEFRIEND :
+							          context.nesting.IsEmpty() ? FUNCTION :
+							          d.s_static ? CLASSFUNCTION : INSTANCEFUNCTION;
+							for(int i = 0; i < d.param.GetCount(); i++) {
+								ScAdd(im.param, d.param[i].natural);
+								ScAdd(im.pname, d.param[i].name);
+							}
+						}
+						else
+							im.kind = d.type_def ? TYPEDEF :
+							          context.nesting.IsEmpty() ? VARIABLE :
+							          d.s_static ? CLASSVARIABLE : INSTANCEVARIABLE;
+					}
+				}
+				EatBody();
+				Key(';');
+			}
+		}
+	}
+}
+
+void Parser::Do(Stream& in, const Vector<String>& ignore, CppBase& _base,
+                const String& p, const String& f) throw(Parser::Error)
+{
+	base = &_base;
+	file = PreProcess(in);
+	lex = ~file.text;
+	lex.Ignore(ignore);
+	context.nesting.Clear();
+	context.nameing = "::";
+	context.access = PUBLIC;
+	context.typenames.Clear();
+	package = p;
+	filename = f;
+	lpos = 0;
+	line = 0;
+	Do();
+}
+
+void Parse(Stream& s, const Vector<String>& ignore, CppBase& base,
+           const String& package, const String& file) throw(Parser::Error)
+{
+	Parser p;
+	p.Do(s, ignore, base, package, file);
+}
diff --git a/uppsrc/docpp/Pre.cpp b/uppsrc/docpp/Pre.cpp
new file mode 100644
index 000000000..f253179cb
--- /dev/null
+++ b/uppsrc/docpp/Pre.cpp
@@ -0,0 +1,95 @@
+#include "docpp.h"
+
+String SSpaces(const char *txt)
+{
+	String r;
+	while(*txt)
+		if(*txt == ' ') {
+			while((byte)*txt <= ' ' && *txt) txt++;
+			r.Cat(' ');
+		}
+		else
+			r.Cat(*txt++);
+	return r;
+}
+
+void SLPos(SrcFile& res)
+{
+	res.linepos.Add(res.text.GetLength());
+}
+
+SrcFile PreProcess(Stream& in)
+{
+	SrcFile res;
+	bool include = true;
+	while(!in.IsEof()) {
+		String ln = in.GetLine();
+		SLPos(res);
+		while(*ln.Last() == '\\') {
+			ln.Trim(ln.GetLength() - 1);
+			ln.Cat(in.GetLine());
+			SLPos(res);
+		}
+		const char *rm = ln;
+		while(*rm == ' ' || *rm == '\t') rm++;
+		if(*rm == '#') {
+			if(rm[1] == 'd' && rm[2] == 'e' && rm[3] == 'f' &&
+			   rm[4] == 'i' && rm[5] == 'n' && rm[6] == 'e' && !iscid(rm[7])) {
+				const char *s = rm + 8;
+				while(*s == ' ') s++;
+				String macro;
+				while(iscid(*s))
+					macro.Cat(*s++);
+				if(*s == '(') {
+					while(*s != ')' && *s)
+						macro.Cat(*s++);
+					macro << ')';
+				}
+				res.text << '#' << AsCString(SSpaces(macro));
+			}
+		}
+		else {
+			String cmd;
+			while(*rm) {
+				if(rm[0] == '/' && rm[1] == '/') {
+					cmd = rm + 2;
+					break;
+				}
+				if(rm[0] == '/' && rm[1] == '*') {
+					rm += 2;
+					for(;;) {
+						if(*rm == '\0') {
+							if(in.IsEof()) break;
+							SLPos(res);
+							ln = in.GetLine();
+							rm = ~ln;
+						}
+						if(rm[0] == '*' && rm[1] == '/') {
+							rm += 2;
+							break;
+						}
+						rm++;
+					}
+					if(include)
+						res.text.Cat(' ');
+				}
+				else {
+					if(include)
+						res.text.Cat(*rm);
+					rm++;
+				}
+			}
+			if(include)
+				res.text << ' ';
+			if(cmd[0] == '$') {
+				if(cmd[1] == '-') include = false;
+				if(cmd[1] == '+') include = true;
+				if(cmd[1]) {
+					res.text.Cat(~cmd + 2);
+					res.text.Cat(' ');
+				}
+			}
+		}
+	}
+	return res;
+}
diff --git a/uppsrc/docpp/cpplex.cpp b/uppsrc/docpp/cpplex.cpp
new file mode 100644
index 000000000..089bee890
--- /dev/null
+++ b/uppsrc/docpp/cpplex.cpp
@@ -0,0 +1,324 @@
+#include "docpp.h"
+
+#define case_id \
+	case '_':case 'a':case 'b':case 'c':case 'd':case 'e':case 'f':case 'g':case 'h': \
+	case 'i':case 'j':case 'k':case 'l':case 'm':case 'n':case 'o':case 'p':case 'q': \
+	case 'r':case 's':case 't':case 'u':case 'v':case 'w':case 'x':case 'y':case 'z': \
+	case 'A':case 'B':case 'C':case 'D':case 'E':case 'F':case 'G':case 'H':case 'I': \
+	case 'J':case 'K':case 'L':case 'M':case 'N':case 'O':case 'P':case 'Q':case 'R': \
+	case 'S':case 'T':case 'U':case 'V':case 'W':case 'X':case 'Y':case 'Z'
+
+#define case_nonzero_digit \
+	case '1':case '2':case '3':case '4':case '5':case '6':case '7':case '8':case '9'
+
+
+const char *_CppKeyword[] = {
+#define CPPID(x) #x,
+#include "keyword.i"
+#undef  CPPID
+	NULL
+};
+
+const char **CppKeyword() { return _CppKeyword; }
+
+Lex::Lex()
+{
+	const char **cppk = CppKeyword();
+	for(int i = 0; cppk[i]; i++)
+		id.Add(cppk[i]);
+	endkey = id.GetCount();
+}
+
+void Lex::Ignore(const Vector<String>& ig)
+{
+	for(int i = 0; i < ig.GetCount(); i++)
+		ignore.Add(id.FindAdd(ig[i]));
+}
+
+int Lex::GetCharacter()
+{
+	if(*ptr == '\0') return t_eof;
+	int c = *ptr++;
+	if(c == '\\') {
+		c = *ptr++;
+		switch(c) {
+		case 'a': return '\a';
+		case 'b': return '\b';
+		case 't': return '\t';
+		case 'v': return '\v';
+		case 'n': return '\n';
+		case 'r': return '\r';
+		case 'f': return '\f';
+		case 'x':
+			c = 0;
+			if(isxdigit(*ptr)) {
+				c = (*ptr >= 'A' ? ToUpper(*ptr) - 'A' + 10 : *ptr - '0');
+				ptr++;
+				if(isxdigit(*ptr)) {
+					c = 16 * c + (*ptr >= 'A' ? ToUpper(*ptr) - 'A' + 10 : *ptr - '0');
+					ptr++;
+				}
+			}
+			break;
+		default:
+			if(c >= '0' && c <= '7') {
+				c -= '0';
+				if(*ptr >= '0' && *ptr <= '7')
+					c = 8 * c + *ptr++ - '0';
+				if(*ptr >= '0' && *ptr <= '7')
+					c = 8 * c + *ptr++ - '0';
+			}
+		}
+	}
+	return (byte)c;
+}
+
+#pragma optimize("t", on)
+
+void Lex::Next()
+{
+	while((byte)*ptr <= ' ') {
+		if(*ptr == '\0') return;
+		ptr++;
+	}
+	pos = ptr;
+	int c = (byte)*ptr++;
+	if(c == '\0') return;
+	switch(c) {
+	case_id: {
+			String x;
+			x.Reserve(12);
+			x.Cat(c);
+			while(iscid(*ptr))
+				x.Cat(*ptr++);
+			int q = id.FindAdd(x);
+			if(ignore.Find(q) < 0)
+				AddCode(q + 256);
+			break;
+		}
+	case ':': AddCode(Char(':') ? t_dblcolon : ':'); break;
+	case '*': AssOp('*', t_mulass); break;
+	case '/': AssOp('/', t_divass); break;
+	case '%': AssOp('%', t_modass); break;
+	case '^': AssOp('^', t_xorass); break;
+	case '!': AssOp('!', t_neq); break;
+	case '.':
+		if(Char('*')) AddCode(t_dot_asteriks);
+		else
+		if(*ptr == '.' && ptr[1] == '.') {
+			AddCode(t_elipsis);
+			ptr += 2;
+		}
+		else
+			AddCode('.');
+		break;
+	case '+':
+		if(Char('+')) AddCode(t_inc);
+		else
+			AssOp('+', t_addass);
+		return;
+	case '-':
+		if(Char('-')) AddCode(t_dec);
+		else
+		if(Char('>'))
+			AddCode(Char('*') ? t_arrow_asteriks : t_arrow);
+		else
+			AssOp('-', t_subass);
+		break;
+	case '&':
+		if(Char('&'))
+			AddCode(t_and);
+		else
+			AssOp('&', t_andass);
+		break;
+	case '|':
+		if(Char('|'))
+			AddCode(t_or);
+		else
+			AssOp('|', t_orass);
+		break;
+	case '=':
+		AssOp('=', t_eq);
+		break;
+	case '<':
+		if(Char('<'))
+			AssOp(t_shl, t_shlass);
+		else
+			AssOp('<', t_le);
+		break;
+	case '>':
+		if(Char('>'))
+			AssOp(t_shr, t_shrass);
+		else
+			AssOp('>', t_ge);
+		break;
+	case '0': {
+			dword w = 0;
+			if(Char('x') || Char('X')) {
+				for(;;) {
+					int d;
+					if(*ptr >= '0' && *ptr <= '9')
+						d = *ptr - '0';
+					else
+					if(*ptr >= 'A' && *ptr <= 'F')
+						d = *ptr - 'A' + 10;
+					else
+					if(*ptr >= 'a' && *ptr <= 'f')
+						d = *ptr - 'a' + 10;
+					else
+						break;
+					if(w >= 0x8000000u - d) {
+						AddCode(te_integeroverflow);
+						return;
+					}
+					w = w * 16 + d - '0';
+					ptr++;
+				}
+			}
+			else
+				while(*ptr >= '0' && *ptr <= '7') {
+					int d = *ptr++ - '0';
+					if(w >= 0x1000000u - d) {
+						AddCode(te_integeroverflow);
+						return;
+					}
+					w = w * 8 + d - '0';
+				}
+			Term& tm = term.AddTail();
+			tm.code = t_integer;
+			tm.ptr = pos;
+			tm.number = w;
+		}
+		break;
+	case_nonzero_digit: {
+			double w = c - '0';
+			bool fp = false;
+			while(*ptr >= '0' && *ptr <= '9')
+				w = w * 10 + *ptr++ - '0';
+			if(*ptr == '.') { // TO BE Completed !!!
+				fp = true;
+				ptr++;
+				double x = 0.1;
+				while(*ptr >= '0' && *ptr <= '9') {
+					w += x * (*ptr++ - '0');
+					x /= 10;
+				}
+			}
+			Term& tm = term.AddTail();
+			if(fp || w < INT_MIN || w > INT_MAX)
+				tm.code = t_double;
+			else
+				tm.code = t_integer;
+			tm.ptr = pos;
+			tm.number = w;
+		}
+		break;
+	case '\'': {
+			Term& tm = term.AddTail();
+			tm.code = t_character;
+			tm.ptr = pos;
+			tm.text = String(GetCharacter(), 1);
+			if(*ptr == '\'')
+				ptr++;
+			else
+				tm.code = te_badcharacter;
+		}
+		break;
+	case '\"': {
+			Term& tm = term.AddTail();
+			tm.code = t_string;
+			tm.ptr = pos;
+			for(;;) {
+				while(*ptr != '\"') {
+					if((byte)*ptr < ' ') {
+						tm.code = te_badstring;
+						return;
+					}
+					tm.text.Cat(GetCharacter());
+				}
+				ptr++;
+				while(*ptr && (byte)*ptr <= ' ') ptr++;
+				if(*ptr != '\"') break;
+				ptr++;
+			}
+		}
+		break;
+	default:
+		AddCode(c);
+		return;
+	}
+}
+
+#pragma optimize("t", off)
+
+bool Lex::Prepare(int pos) {
+	while(term.GetCount() <= pos) {
+		if(*ptr == '\0') return false;
+		Next();
+	}
+#ifdef _DEBUG
+	pp = term[0].ptr;
+#endif
+	return true;
+}
+
+int Lex::Code(int pos)
+{
+	if(!Prepare(pos)) return t_eof;
+	return term[pos].code;
+}
+
+bool   Lex::IsId(int pos)
+{
+	return Code(pos) >= endkey + 256;
+}
+
+String Lex::Id(int pos)
+{
+	ASSERT(IsId(pos));
+	return id[Code(pos) - 256];
+}
+
+void Lex::Get(int n)
+{
+	while(n--) {
+		if(term.GetCount())
+			term.DropHead();
+		if(term.GetCount() == 0)
+			Next();
+	}
+}
+
+int Lex::Int(int pos)
+{
+	Prepare(pos);
+	ASSERT(term[pos].code == t_integer);
+	return (int)term[pos].number;
+}
+
+double Lex::Double(int pos)
+{
+	Prepare(pos);
+	ASSERT(term[pos].code == t_double);
+	return term[pos].number;
+}
+
+String Lex::Text(int pos)
+{
+	Prepare(pos);
+	ASSERT(term[pos].code == t_string);
+	return term[pos].text;
+}
+
+int Lex::Chr(int pos)
+{
+	Prepare(pos);
+	ASSERT(term[pos].code == t_character);
+	return (byte)*term[pos].text;
+}
+
+const char *Lex::Pos(int pos)
+{
+	Prepare(pos);
+	return pos < term.GetCount() ? term[pos].ptr : ptr;
+}
diff --git a/uppsrc/docpp/docpp.h b/uppsrc/docpp/docpp.h
new file mode 100644
index 000000000..c27a72845
--- /dev/null
+++ b/uppsrc/docpp/docpp.h
@@ -0,0 +1,250 @@
+#ifndef DOCPP_H
+#define DOCPP_H
+
+#include <Core/Core.h>
+
+enum {
+	Tmarker_before_first = 255,
+#define CPPID(x)   tk_##x,
+#include "keyword.i"
+#undef  CPPID
+};
+
+enum {
+	t_eof,
+	t_string = -200,
+	t_integer,
+	t_double,
+	t_character,
+	t_dblcolon,
+	t_mulass,
+	t_divass,
+	t_modass,
+	t_xorass,
+	t_neq,
+	t_dot_asteriks,
+	t_elipsis,
+	t_inc,
+	t_addass,
+	t_dec,
+	t_arrow_asteriks,
+	t_arrow,
+	t_subass,
+	t_and,
+	t_andass,
+	t_or,
+	t_orass,
+	t_eq,
+	t_shl,
+	t_shlass,
+	t_le,
+	t_shr,
+	t_shrass,
+	t_ge,
+	te_integeroverflow,
+	te_badcharacter,
+	te_badstring,
+};
+
+const char **CppKeyword();
+
+class Lex {
+#ifdef _DEBUG
+	const char *pp;
+#endif
+	const char *ptr;
+	const char *pos;
+
+	Index<String> id;
+	Index<int>    ignore;
+	int           endkey;
+
+	struct Term  : Moveable<Term>{
+		const  char *ptr;
+		int    code;
+		String text;
+		double number;
+	};
+
+	BiVector<Term> term;
+
+	bool Char(int c)                 { if(*ptr == c) { ptr++; return true; } else return false; }
+	void AddCode(int code)           { Term& tm = term.AddTail(); tm.code = code; tm.ptr = pos; }
+	void AssOp(int noass, int ass)   { AddCode(Char('=') ? ass : noass); }
+	void Next();
+	bool Prepare(int pos);
+	int  GetCharacter();
+
+public:
+	int         Code(int pos = 0);
+	bool        IsId(int pos = 0);
+	String      Id(int pos = 0);
+	int         Int(int pos = 0);
+	double      Double(int pos = 0);
+	int         Chr(int pos = 0);
+	String      Text(int pos = 0);
+
+	void        Get(int n = 1);
+	int         GetCode()                   { int q = Code(); Get(); return q; }
+	String      GetId()                     { String q = Id(); Get(); return q; }
+	int         GetInt()                    { int q = Int(); Get(); return q; }
+	double      GetDouble()                 { double q = Double(); Get(); return q; }
+	int         GetChr()                    { int q = Chr(); Get(); return q; }
+	String      GetText()                   { String q = Text(); Get(); return q; }
+
+	const char *Pos(int pos = 0);
+	int         operator[](int pos)         { return Code(pos); }
+	operator    int()                       { return Code(0); }
+	void        operator++()                { Get(); }
+
+	void        operator=(const char *s)    { ptr = s; term.Clear(); }
+	void        Ignore(const Vector<String>& ignore);
+
+	Lex();
+};
+
+struct SrcFile {
+	String      text;
+	Vector<int> linepos;
+};
+
+SrcFile PreProcess(Stream& in);
+
+
+enum Kind {
+	MACRO, ENUM, TYPEDEF, VARIABLE,
+	STRUCT, FUNCTION,
+	INSTANCEFUNCTION, INSTANCEVARIABLE,
+	CLASSFUNCTION, CLASSVARIABLE,
+	CONSTRUCTOR, DESTRUCTOR,
+	STRUCTTEMPLATE, FUNCTIONTEMPLATE,
+	INSTANCEFUNCTIONTEMPLATE, CLASSFUNCTIONTEMPLATE,
+	INLINEFRIEND,
+	OTHER
+};
+
+enum {
+	PRIVATE, PROTECTED, PUBLIC
+};
+
+struct CppItem {
+	String         package;
+
+	int            kind;
+	String         name;
+	int            access;
+	String         tparam;
+	String         header;
+	String         param;
+	String         ender;
+	String         pname;
+	String         tname;
+
+	String         file;
+	int            line;
+
+	CppItem()      { line = 0; }
+};
+
+typedef ArrayMap<String, CppItem>      CppNest;
+typedef ArrayMap<String, CppNest>      CppNamespace;
+typedef ArrayMap<String, CppNamespace> CppBase;
+
+class Parser {
+	struct Context {
+		String      nameing;
+		String      nesting;
+		Index<int>  typenames;
+		int         access;
+
+		void operator<<=(const Context& t);
+
+		String  Dump() const;
+	};
+
+	struct Decla {
+		bool    s_static:1;
+		bool    s_extern:1;
+		bool    s_register:1;
+		bool    s_auto:1;
+		bool    s_mutable:1;
+		bool    s_explicit:1;
+		bool    s_virtual:1;
+		String  name;
+		bool    function:1;
+		bool    type_def:1;
+		bool    isfriend:1;
+		bool    istemplate:1;
+		bool    istructor:1;
+		bool    isdestructor:1;
+		bool    isptr:1;
+		bool    nofn:1;
+
+		String  header;
+		String  ender;
+		String  template_params;
+		String  tnames;
+		String  natural;
+
+		Decla();
+	};
+
+	struct Decl : Decla {
+		Array<Decl> param;
+	};
+
+	SrcFile file;
+	Lex     lex;
+	String  package, filename;
+	Context context;
+
+	int     lpos, line;
+
+	CppBase *base;
+
+	int    RPtr();
+
+	bool   Key(int code);
+	bool   EatBody();
+
+	void   Cv();
+	String SimpleType();
+	void   Qualifier();
+	void   ParamList(Decl& d);
+	void   Declarator(Decl& d, const char *p);
+	void   EatInitializers();
+	Decl   Type();
+	Array<Decl> Declaration(bool l0 = false, bool more = false);
+	void   Do();
+	void   Elipsis(Decl& d);
+	Decl&  Finish(Decl& d, const char *p);
+	bool   Nest(const String& tp, const String& tn);
+
+	String TemplateParams(String& pnames);
+	String TemplateParams();
+	String TemplatePnames();
+	String Name();
+	String Constant();
+	String ReadOper();
+
+	int    GetLine(const char *pos);
+	void   Line();
+	void   Check(bool b, const char *err);
+	void   CheckKey(int c);
+
+	CppItem& Item(const String& nameing, const String& nesting, const String& item);
+
+public:
+	struct Error : public String { Error() {}; Error(const char *s) : String(s) {} };
+
+	void   ThrowError(const String& e);
+
+	void   Do(Stream& s, const Vector<String>& ignore, CppBase& base,
+	          const String& package, const String& file)
+	  throw(Parser::Error);
+};
+
+void Parse(Stream& s, const Vector<String>& ignore, CppBase& base,
+           const String& package, const String& file) throw(Parser::Error);
+
+#endif
diff --git a/uppsrc/docpp/docpp.upp b/uppsrc/docpp/docpp.upp
new file mode 100644
index 000000000..509fec4bb
--- /dev/null
+++ b/uppsrc/docpp/docpp.upp
@@ -0,0 +1,13 @@
+uses
+	RichEdit;
+
+file
+	docpp.h,
+	keyword.i,
+	Pre.cpp,
+	cpplex.cpp,
+	Parser.cpp,
+	Info readonly separator,
+	COPYING,
+	COPYING-PLAIN,
+	AUTHORS;
diff --git a/uppsrc/docpp/keyword.i b/uppsrc/docpp/keyword.i
new file mode 100644
index 000000000..2baa815a5
--- /dev/null
+++ b/uppsrc/docpp/keyword.i
@@ -0,0 +1,80 @@
+#pragma BLITZ_APPROVE
+
+CPPID(__asm)
+CPPID(else)
+CPPID(struct)
+CPPID(enum)
+CPPID(switch)
+CPPID(auto)
+CPPID(__except)
+CPPID(template)
+CPPID(explicit)
+CPPID(this)
+CPPID(bool)
+CPPID(extern)
+CPPID(mutable)
+CPPID(thread)
+CPPID(break)
+CPPID(false)
+CPPID(throw)
+CPPID(case)
+CPPID(__fastcall)
+CPPID(namespace)
+CPPID(true)
+CPPID(catch)
+CPPID(__finally)
+CPPID(new)
+CPPID(try)
+CPPID(__cdecl)
+CPPID(float)
+CPPID(__try)
+CPPID(char)
+CPPID(for)
+CPPID(operator)
+CPPID(typedef)
+CPPID(class)
+CPPID(friend)
+CPPID(private)
+CPPID(typeid)
+CPPID(const)
+CPPID(goto)
+CPPID(protected)
+CPPID(typename)
+CPPID(const_cast)
+CPPID(if)
+CPPID(public)
+CPPID(union)
+CPPID(continue)
+CPPID(inline)
+CPPID(register)
+CPPID(unsigned)
+CPPID(__declspec)
+CPPID(__inline)
+CPPID(reinterpret_cast)
+CPPID(using)
+CPPID(default)
+CPPID(int)
+CPPID(return)
+CPPID(delete)
+CPPID(__int8)
+CPPID(short)
+CPPID(__uuidof)
+CPPID(dllexport)
+CPPID(__int16)
+CPPID(signed)
+CPPID(virtual)
+CPPID(dllimport)
+CPPID(__int32)
+CPPID(sizeof)
+CPPID(void)
+CPPID(do)
+CPPID(__int64)
+CPPID(static)
+CPPID(volatile)
+CPPID(double)
+CPPID(__leave)
+CPPID(static_cast)
+CPPID(dynamic_cast)
+CPPID(long)
+CPPID(__stdcall)
+CPPID(while)
diff --git a/uppsrc/done.txt b/uppsrc/done.txt
new file mode 100644
index 000000000..4deb1d543
--- /dev/null
+++ b/uppsrc/done.txt
@@ -0,0 +1,378 @@
+============
+valgrind support in TheIDE
+
+XmlParser::Tag(const String&)
+
+============
+String Compare
+
+Stream::GetLine
+
+New leak debugging
+
+
+    	BIG ScrollButton chameleon problem
+
+Highlightinh "1e-15"
+    Highlightinh "1e-15"
+
+
+	DecorationLess windows http://www.ultimatepp.org/forum/index.php?t=msg&goto=13093&#msg_13093
+	                       http://fixunix.com/xwindows/91717-window-without-title-bar.html
+
+	SQLSqlExp tutorial
+
+	DropDate DOES NOT WORK IN LINUX!
+
+	.cfg paths
+	DropList Chameleon
+	OK/Cancel swap
+
+	"Build mode" "MSC71cdb Debug" looks ugly in XP clearlooks...
+     I found that if child dialog is resizeable the icon set for main app window is not passed to it
+	Special font for .t files
+	Selecting text left->right: I beam, right->left arrow?!
+	Fix hydra
+	1 hour theide bug...
+
+Weekend {
+	RichEdit left triple
+	SetWndForeground in SetFocus
+}
+
+============
+	Menu bigger than screen....
+	Fix IconDes - scroll up/down in 3x mode (seems NONAA), undo does now work
+	"Standard Style" (in default constructor)
+
+
+
+GKS_PosClient-maybe-fixed.exe
+
+	DropList in ArrayCtrl - does not highlight when appears...
+	PosDropDate - Transparent problem (?!)
+
+Vista:
+	Drag preview -> Cursor Image with Alpha
+	Caret in the EditField
+	Win64 support
+	Bigger font in buttons (?!)
+	Layout designer = edit field height minimal
+	Font without Aero
+	Menu shadow
+	Menu selection (and other selections?)
+	Editfiels "w" issue
+	DropList Chameleon
+
+
+
+	F1 key switching between code and help without changing current help article or closing help tree.
+
+		Fix blitz
+
+* "Seems OK except for some of the hot-key listings on the menus (eg ctrl+100dc for split horizontal)"
+
+* No blitz package flag
+
+* FLUXBOX in ubuntu
+
+* TabCtrl - rightedge problem (?)
+
+
+
+Weekend {
+
+* Problem with menu fade in settings...
+* PCRE
+* fullscreen
+
+}
+
+Weekend {
+	New ImageView example
+	Fixed JPEG seeking
+	Fixed Image scaler to be linear (non-seeking)
+	Documented Format
+	RectTracker lines
+	reference/RectTracker
+}
+
+
+* struc ArrayCtrl - why it is not first in class browser?
+
+* Crashed DrawOpWin32.cpp line 15 in debug mode ide -> Assist Window
+
+* ide - bottom pane - paint bug
+
+* RichText: Set minimal cell height
+
+* IntersectClip //	ASSERT(q != ERROR);
+
+- Child position - missing parent refresh (splitter)
+
+Option, Switch in LayDes
+
+	- Mouse wheel should increment / decrement numbers
+
+
+Weekend {
+	Assist++ {
+		- Constructor call
+		- Type selection (Ctrl+Up/Down)
+	}
+
+	- LRUList & UWord
+}
+
+
+Assist++ {
+	- global scope macros
+	- EB\idu.cpp 266 k.[ok.] - improved resume & heurestics
+	- Alt+J neskace podle signatury
+	  int Odpady::SlozenkaVars(VectorMap<String, Value>& var,
+	                           Osob0*|*Doklad od, Date datum,
+	                           bool  preplatek, bool nedoplatek,
+	                           bool& dotisk);
+}
+TheIDE {
+	- "Go to line or definition" case insensitive option?
+	- Fixed IconDes
+}
+
+* Prestalo chodit XmlView!!!
+
+* Fixed width editfield
+
+* A jeste porad, uz delsi dobu, je ve WebMapu uplne dementni chyba, ktera netusim, cim muze byt zpusobena: mam v HeaderCtrl::WhenAction vyvolavani lokalniho menu pro sloupce nejake tabulky. To menu se normalne rozbali, muzes v nem jezdit, ale nemuzes nic vybrat
+
+* Assist++: http://www.arilect.com/upp/forum/index.php?t=msg&th=457&start=0&S=ce930e323063ffa5157426d3ee9f4939 (Zrejme ":" v constructoru)
+
+* Enter in non-editable table rows usually equals doubleclick in GUIs. Why to make everybody reimplement his? Maybe ArrayCtrl could be improved to provide this interception.* Multiple selection in RichEditView
+
+* choice for line numbers lengths in the gutter... After 999 is 1000 not 000 ...
+
+* chlog - zmena SetFocus u ArrayCtrl
+
+**********
+602 critical bugs:
+
+- problem s crashem na startu
+- problem s CriticalSection v Linuxu
+- problem focusem v Linuxu - Gnome 2.10.0 to be exact, IDE, Alt+Tab
+- problem s umk - nevraci se z linkeru
+----------
+
+* problem Could the problem be that the ide package has a groupping item (IDE) as the first entry and not a file?
+
+* EditField, kdyz je Null, umel misto toho prazdneho pole ukazovat nejaky text (treba "(default)"
+
+* if(convert && convert->Scan(text).IsError()) paper = Blend(paper, Color(255, 0, 0), 32);
+
+* Assist++: Ep, select. (select je WithQueryLayout<TopWindow>) (ONCELOCK!)
+
+* U++ applications have a distinct look which does not match the native Windows 2k look to the extent Qt does. Some examples are arrows in the combo boxes, the file open dialog, radio buttons, scrollbars
+
+* Assist++: CodeEditor::Hightlight: SyntaxState ss; ss. (asi nepozna nested tridu...)
+
+* Assist++ - Ucto si myslim ze ShowObdobi je v Bilance
+
+* Italic (comment) + "_"
+
+* Dodelat Configutation do umk!
+
+* Layout - visgen by se mel omezit na selected (neni-li, tak vsechno)
+
+* Remove WhenHelpDefault in Bar
+
+* examples/Puzzle "Ready" in StatusBar....
+
+* V SOCI nechodi THISBACKs
+
+* Code generator
+
+* V SOCI nechodi THISBACKs
+
+* RichText - place external formats to another package
+
+* assist: CtrlCtrlCtrlCtrl ....
+
+* examples/Puzzle "Ready" in StatusBar....
+
+* Remove WhenHelpDefault in Bar
+
+* Esc - matrika <:SPOLECNEZ:NAVICZ:> sluplo (asi out-of-stack)
+
+****
+Topic browser fixed:
+
+Here is a bug in topic++ browser.
+- Click the topic tree on the left to move keyboard focus there.
+- Press cursor down to move to the next topic.
+- See that the main (richtext) widget of the topic browser *also* processed the cursor down because it scrolled down one line.
+
+And there is more: Scroll down a topic in the richtext window a bit. Now start pressing page-up. It first scrolls up by pages. Once it reaches the top of the richtext, the tree gets the keyboard focus in the last line of the tree. If the last line of the tree points to a topic, then the current topic is changed to that one. Just because you pressed page-up.
+
+There is one more thing that is probably not a bug but annoys me. Here is how to reproduce it: You expand the tree by opening every group. Now click on the first topic, and try to go through every topic by pressing the cursor down. There is one magical topic (CtrlLib Widgets) that moves the keyboard focus up 6 lines once you reach it. So you can not use the cursor to go to a topic after that one. Annoying.
+
+Even stranger things happen when you press page down while the tree has the keyboard focus: The keyboard focus indication disappears and the richtext gets scrolled.
+****
+
+* Fixed RichText::ApplyZoom
+
+-----------
+* RichText/RichTxt::FormatInfo f = GetFormatInfo();
+
+* Assist++: Asi nechodi lokalni promenne?
+
+* Assist++ rekvalifikace: Vyjmenovana slova, fundamentalni metody
+
+* Mizeni v Browseru - (nejaky refresh aktualni tridy)
+
+* Zrychlit psani pri assist++ (rozdelit podle prvniho 1 nebo 2 pismen?)
+
+
+*************
+1. In "assembly setup" dialog (edit assembly)  - there is a miss-spelling of
+"asembly" in "asembly name" label.
+
+1b. In assmebly setup dialog, the left hand pane for assembly list has
+slightly greater height than the right hand pane with package list.
+
+2. In create new package dialog there are duplicated template options.
+
+3. In create new package dialog, the "create in" edit box isn't wide enough
+to see the full path.  (Shouldn't edit/combo boxes allow cursoring along the
+text even when in read-only mode?).
+
+4. In "package organizer" dialog there is a miss-spelling of additional  -
+"aditional libraries"
+
+
+
+* zabranit autoassist v retezci / poznamce
+
+* Top-level Assist++ should list types (RichEditWithToolBar)
+
+* Alt+C destruktor - chybne umisteni '~'
+
+* typedef v Assist fixed
+
+* Matrika - na notebooku klikani na droplist nebo menu - vsechno osklive blika
+
+* Alt+C - variable as extern?
+
+* Alt+C globalni funkce by mohla vynechat \t
+
+* chybne mizi cervene zavorky
+
+* Soci::EditRozho2	Rozho2 r(*this); - problem s refreshovanim zavorek...
+
+* Nechodi Alt+I v RichText::Paint
+
+* Alt+C - missing 'const' (RichText - Paint)
+
+* Nevklada ceddily - Report, Put, .Paint
+
+* ToolBar artefacts when pressing F5
+
+* AUTOCOMPLET previous!!! pada a klavesa je spatne zvolena
+
+* 140 0x8c "�\214"
+
+* Switch between cpp and h file. In Visual Assist, Alt-O is "open opposite" -- if you're in a .h file, it will open the corresponding C file and vice versa. Very convenient! See http://www.wholetomato.com/products/features/header.html
+
+* "completion" - type one or more characters and hit complete-previous or complete-next and you can step through the names that match that prefix.
+
+* TheIDE - readonly toolbar button nechodi?
+
+
+Assist++
+* Show non-exact case matches in completion window. Don't remove matches that don't match the exact case, but just list exact-case matches first and non-exact case matches next.
+* :: should show types too!
+
+******** Weekend: 2005-12-4:
+* DHCtrl Layout fixed
+* void TimeSlider::Play(bool forward /*= true */)  (remove default parameters)
+* Does not work for me, when I hit "Insert" key, cursor remains same ("insert" one), and edited text is not overwritten.
+* Column indicator - draw faint dashed line at column 80. User-configurable line color and column number. See http://www.wholetomato.com/products/features/column.html
+* Insert the top match if the user hits TAB. (Saves having to hit down arrow and enter, which make the hand move far.)
+* ScrollBug fixed
+* this->
+* Show autocomplete on "::" in addition to "." and "->". Especially for calling static class functions and filling out member functions (if for some reason I forgot to alt-c).
+********
+
+* 2005-11-13:
+class TimeSlider()
+{
+    TimeSlider();  << alt+c not work for this!
+}
+
+* MSC8 nechodi sponsor
+
+* Porbably this is already known.. (511r3)
+
+  Alt + c insted of '\n' returns _
+
+  Matrix Quaternion::ToMatrix()_{_}__
+
+
+- 2005-11-12: Topic ikony
+- * Dodelat LNG zalezitost
+* Vyresit systemovy font
+* ReportDlg SetPdf
+new release come out don't forget to add button to select dir in sdl directory in 'Auto setup' window
+- All Ctrls example / doc
+- Problem s "GUI"
+
+- SDL
+- Fix Sqlite
+- TopWindow docs
+
+* Velikost fontu
+
+* Layout editor - copy - zvore Win1250
+
+* Assist++
+	- m.pos. kdyz se napise tak chybi druhy assist
+	- visual assist use alt+i, builder c++ ctrl-f6 (Switch to header)
+	- Parsovat .lay soubory
+	- Dodelat Override virtual method
+	- Dodelat Scoped copy
+	- pouze mazani iscid by melo zachovat assist
+	- () by melo skocit rovnou za )
+	- kratky - vyska nezapocitava velikost Headeru
+	- sirka i minimalni (kvuli typum)
+	- rozdelit nest a type
+	- data vkladaji ()
+	- , pri otevrenem assist
+	- ) je blbost
+	- Goto dodelat parsovani filu
+	- Testovat jestli se Assist ma delat (project file, .cpp / .h)
+    - Nechodi v Assist++ po Context
+
+* Another small but useful change would be that selecting some text then
+hitting '(' or '{' or " should enclose the selected text
+appropriately.
+
+* Obalit TabCtrl...
+
+* Kdyz tim levym droplistem prehodim Main Package
+Configuration, tak v titulku okna se ten text zmeni, ale v tom DropListu
+zustava napsana porad ta stara konfigurace.
+
+* BTW Mirek now Ctrl-B opens browser++. Could the same combination close it. I know ESC do the same but I got used to it
+* Vazny problem s Pte/Ptr derivovaneho
+-----------------------
+Fix MingW debugging (partly done, needs internal debugger)
+
+-----------------------
+Do Callback by se mohlo dodelat CallSelf, aby se jednoduseji delaly default callbacky...
+
+-----------------------
+Jeste jednou se ozvu s jednou prastarou prudou: kdyz se v IDE kompiluje a ty pritom otevres menu bar, tak pri kazdem souboru se to menu zavre. Evidentne nejaky problem s focusem. Nemohl by ses na to zkusit podivat? Je to dost pruda, kdyz chces treba pri kompilaci vypnout / zapnout Verbose a ono ti to furt utika.
+
+------------------------
+Is it possible to add key shortcut to hide/show panel with project files  (it would be
+extremely useful especialy when layout editor is open)
+
+-----------------------
diff --git a/uppsrc/help b/uppsrc/help
new file mode 100644
index 000000000..281243b04
--- /dev/null
+++ b/uppsrc/help
@@ -0,0 +1 @@
+"٤�ۍ���Ǯ�ʧ���𲠽���������Ī�ϞŶ�����ष��͕������٤��ͬ��ǖ₺�������������˜�ɚә��Ĭ�����������������ؔ��������򉘌�������ޯ纆��⻄�Ƿ������ΐ���ß̀���竽�ސ�א��ȗ���͓������ꎬ�\377�������ڲ��η�����������������������د�����Ƶ짯���Ēަ����򰳫�����ս̫ʢ����ԫբ�⥚�ڍ�و���Χ��������������ޘ�����߬�ص���������̽�����å�ﵔʅ˛̿��������������������̭�ɾ�������")
\ No newline at end of file
diff --git a/uppsrc/ide/AUTHORS b/uppsrc/ide/AUTHORS
new file mode 100644
index 000000000..1db9228b8
--- /dev/null
+++ b/uppsrc/ide/AUTHORS
@@ -0,0 +1,3 @@
+Mirek Fidler <cxl@ntllib.org>
+Tomas Rylek  <rylek@volny.cz>
+Daniel Kos   <unodgs@tlen.pl>
diff --git a/uppsrc/ide/Assist.cpp b/uppsrc/ide/Assist.cpp
new file mode 100644
index 000000000..eb61e4d6d
--- /dev/null
+++ b/uppsrc/ide/Assist.cpp
@@ -0,0 +1,984 @@
+#include "ide.h"
+
+#define LDUMP(x)    //DUMP(x)
+#define LDUMPC(x)   //DUMPC(x)
+#define LLOG(x)     //LOG(x)
+
+class IndexSeparatorFrameCls : public CtrlFrame {
+	virtual void FrameLayout(Rect& r)                   { r.right -= 1; }
+	virtual void FramePaint(Draw& w, const Rect& r) {
+		w.DrawRect(r.right - 1, r.top, 1, r.Height(), SColorShadow);
+	}
+	virtual void FrameAddSize(Size& sz) { sz.cx += 2; }
+};
+
+AssistEditor::AssistEditor()
+{
+	assist.NoHeader();
+	assist.NoGrid();
+	assist.AddColumn().Margin(0).SetDisplay(Single<CppItemInfoDisplay>());
+	assist.WhenLeftClick = THISBACK(AssistInsert);
+	type.NoHeader();
+	type.NoGrid();
+	type.AddColumn();
+	type.WhenCursor = THISBACK(SyncAssist);
+	type.NoWantFocus();
+	popup.Horz(type, assist);
+	popup.SetPos(2000);
+	auto_assist = true;
+	commentdp = false;
+
+	InsertFrame(1, indexframe);
+	indexframe.Left(indexpane, HorzLayoutZoom(140));
+	int q = indexpane.GetStdSize().cy;
+	indexpane.Add(searchindex.HSizePos().TopPos(0, q));
+	indexpane.Add(index.HSizePos().VSizePos(q, 0));
+	index.AddColumn("").Margin(2);
+	index.AddIndex();
+	index.NoHeader().AutoHideSb().NoGrid();
+	index.SetFrame(Single<IndexSeparatorFrameCls>());
+	index.WhenLeftClick = index.WhenLeftDouble = THISBACK(IndexClick);
+	searchindex.SetFilter(CharFilterAlphaToUpper);
+	searchindex <<= THISBACK(SearchIndex);
+	showindex = true;
+}
+
+Vector<String> TemplatePars(const String& type)
+{
+	Vector<String> r;
+	int q = type.Find('<');
+	if(q >= 0) {
+		const char *s = ~type + q + 1;
+		int lvl = 0;
+		String t;
+		while(*s && (lvl || *s != '>')) {
+			if(*s == '<')
+				lvl++;
+			if(*s == '>')
+				lvl--;
+			if(*s == ',') {
+				r.Add(t);
+				t.Clear();
+				s++;
+			}
+			else
+				t.Cat(*s++);
+		}
+		r.Add(t);
+	}
+	return r;
+}
+
+void SubstituteTpars(Vector<String>& type, const String& tname)
+{
+	Vector<String> tp = TemplatePars(tname);
+	for(int i = 0; i < type.GetCount(); i++)
+		if(IsDigit(type[i][0])) {
+			int q = atoi(type[i]);
+			if(q >= 0 && q < tp.GetCount()) {
+				LLOG(type[i] << " -> " << tp[q]);
+				type[i] = tp[q];
+			}
+		}
+}
+
+bool AssistEditor::NestId(const CppNest& n, const String& id, Vector<String>& type, bool& code,
+                          String& t)
+{
+	int q = n.name.Find(NoTemplatePars(id));
+	if(q >= 0) {
+		do {
+			const CppItem& m = n[q];
+			const String& qt = m.qtype;
+			if(!IsNull(qt) && FindIndex(type, qt) < 0 && (m.IsCode() || m.IsData())) {
+				type.Add(qt);
+				if(m.IsCode())
+					code = true;
+			}
+			q = n.name.FindNext(q);
+		}
+		while(q >= 0);
+		return true;
+	}
+	q = n.key.Find("class");
+	if(q < 0)
+		q = n.key.Find("struct");
+	if(q < 0)
+		q = n.key.Find("typedef");
+	LDUMP(q);
+	if(q >= 0) {
+		Vector<String> base = Split(n[q].qptype, ';');
+		LDUMP(id);
+		LDUMPC(base);
+		SubstituteTpars(base, t);
+		for(int i = 0; i < base.GetCount(); i++) {
+			q = BrowserBase().Find(NoTemplatePars(base[i]));
+			String h = base[i];
+			if(q >= 0 && NestId(BrowserBase()[q], id, type, code, h)) {
+				t = h;
+				return true;
+			}
+		}
+	}
+	return false;
+}
+
+void AssistScanError(int line, const String& text)
+{
+	PutVerbose(String().Cat() << "(" << line << "): " << text);
+}
+
+void AssistEditor::Context(Parser& parser, int pos)
+{
+	StartBrowserBase();
+	theide->ScanFile();
+	String s = Get(0, pos);
+	StringStream ss(s);
+	parser.dobody = true;
+	parser.Do(ss, IgnoreList(), BrowserBase(), Null, callback(AssistScanError));
+	QualifyTypes(BrowserBase(), parser.current_nest, parser.current);
+	inbody = parser.IsInBody();
+}
+
+void AssistEditor::TypeOf(const String& id, Vector<String>& r, bool& code)
+{
+	Parser parser;
+	Context(parser, GetCursor());
+	code = false;
+	if(id == "this") {
+		r.Add(parser.current_nest);
+		return;
+	}
+	if(IsNull(id)) {
+		r.Add(parser.current_nest);
+		if(parser.current_nest != "::")
+			r.Add("::");
+		return;
+	}
+	int q = parser.local.FindLast(id);
+	if(q >= 0) {
+		r.Add(parser.local[q]);
+		return;
+	}
+	Vector<String> p = Split(parser.current.pname, ';', false);
+	q = FindIndex(p, id);
+	if(q >= 0) {
+		p = Split(parser.current.qptype, ';');
+		if(q < p.GetCount())
+			r.Add(p[q]);
+		return;
+	}
+	String n = parser.current_nest;
+	for(;;) {
+		String type = n + "::" + id;
+		if(BrowserBase().Find(type)) {
+			code = true;
+			r.Add(type);
+		}
+		int q = n.ReverseFind(':');
+		if(q < 1 || n[q - 1] != ':')
+			break;
+		n.Trim(q - 1);
+	}
+	q = BrowserBase().Find(parser.current_nest);
+	String dummy;
+	if(q >= 0 && NestId(BrowserBase()[q], id, r, code, dummy))
+		return;
+	q = BrowserBase().Find("::"); // Better namespace support needed !!!
+	if(q >= 0)
+		NestId(BrowserBase()[q], id, r, code, dummy);
+}
+
+Vector<String> AssistEditor::Operator(const char *oper, const Vector<String>& type)
+{
+	Vector<String> nt;
+	bool d;
+	for(int i = 0; i < type.GetCount(); i++) {
+		String t = type[i];
+		int q = BrowserBase().Find(NoTemplatePars(t));
+		if(q < 0 || !NestId(BrowserBase()[q], oper, nt, d, t))
+			nt.Add(type[i]);
+		SubstituteTpars(nt, t);
+	}
+	return nt;
+}
+
+Vector<String> AssistEditor::TypeOf(const Vector<String>& xp, const String& tp)
+{
+	Vector<String> type;
+	bool code;
+	if(!IsNull(tp)) {
+		Parser parser;
+		Context(parser, GetCursor());
+		type.Add(Qualify(BrowserBase(), parser.current_nest, tp));
+	}
+	else {
+		if(xp.GetCount() == 0 || !iscid(xp[0][0]))
+			return type;
+		TypeOf(xp[0], type, code);
+	}
+	LDUMPC(xp);
+	LDUMPC(type);
+	int q = 1;
+	if(code && xp.GetCount() > 1 && xp[1][0] == '(')
+		q++;
+	while(q < xp.GetCount() && type.GetCount()) {
+		int c = xp[q][0];
+		LDUMP(xp[q]);
+		if(iscid(c)) {
+			Vector<String> nt;
+			bool code = false;
+			for(int i = 0; i < type.GetCount(); i++) {
+				String t = type[i];
+				int j = BrowserBase().Find(NoTemplatePars(t));
+				if(j >= 0)
+					NestId(BrowserBase()[j], xp[q], nt, code, t);
+				LDUMPC(nt);
+				SubstituteTpars(nt, t);
+			}
+			if(code && q + 1 < xp.GetCount() && xp[q + 1][0] == '(')
+				q++;
+			type = nt;
+		}
+		if(c == '(')
+			type = Operator("operator()", type);
+		if(c == '[')
+			type = Operator("operator[]", type);
+		if(c == '-')
+			type = Operator("operator->", type);
+		q++;
+	}
+	LDUMPC(type);
+	return type;
+}
+
+int CharFilterT(int c)
+{
+	return c >= '0' && c <= '9' ? "TUVWXYZMNO"[c - '0'] : c;
+}
+
+void AssistEditor::GatherItems(const String& type, bool nom, Index<String>& in_types, bool tp)
+{
+	LLOG("GatherItems " << type);
+	if(in_types.Find(type) >= 0) {
+		LLOG("-> recursion, exiting");
+		return;
+	}
+	in_types.Add(type);
+	String ntp = NoTemplatePars(type);
+	int q = BrowserBase().Find(ntp);
+	LDUMP(q);
+	if(q < 0)
+		return;
+	if(tp) {
+		if(ntp != "::")
+			ntp << "::";
+		int typei = assist_type.FindAdd("<types>");
+		for(int i = 0; i < BrowserBase().GetCount(); i++) {
+			String n = BrowserBase().GetKey(i);
+			if(n.GetLength() > ntp.GetLength() && memcmp(~ntp, ~n, ntp.GetLength()) == 0) {
+				LDUMP(n);
+				CppNest& m = BrowserBase()[i];
+				for(int i = 0; i < m.GetCount(); i++) {
+					const CppItem& im = m[i];
+					String name = m.name[i];
+					if(im.IsType()) {
+						CppItemInfo& f = assist_item.Add(name);
+						f.name = name;
+						f.typei = typei;
+						(CppSimpleItem&)f = im;
+						break;
+					}
+				}
+			}
+		}
+	}
+	const CppNest& m = BrowserBase()[q];
+	String base;
+	int typei = assist_type.FindAdd(ntp);
+	for(int i = 0; i < m.GetCount(); i++) {
+		const CppItem& im = m[i];
+		String name = m.name[i];
+		if(im.IsType())
+			base = im.qptype;
+		LDUMP(name);
+		if((im.IsCode() || im.IsData() || im.IsMacro() && type == "::")
+		   && (nom || im.access == PUBLIC)) {
+			if(im.IsCode()) {
+				int q = assist_item.Find(name);
+				while(q >= 0) {
+					if(assist_item[q].typei != typei)
+						assist_item[q].over = true;
+					q = assist_item.FindNext(q);
+				}
+			}
+			CppItemInfo& f = assist_item.Add(name);
+			f.name = name;
+			f.typei = typei;
+			(CppSimpleItem&)f = im;
+		}
+	}
+	Vector<String> b = Split(base, ';');
+	SubstituteTpars(b, type);
+	for(int i = 0; i < b.GetCount(); i++)
+		GatherItems(b[i], nom, in_types, tp);
+	in_types.Drop();
+}
+
+struct CppItemInfoOrder {
+	bool operator()(const CppItemInfo& a, const CppItemInfo& b) const {
+		return CombineCompare(a.name, b.name)(a.natural, b.natural) < 0;
+	}
+};
+
+void AssistEditor::CloseAssist()
+{
+	if(popup.IsOpen())
+		popup.Close();
+	assist_item.Clear();
+}
+
+String AssistEditor::ReadIdBack(int q)
+{
+	String id;
+	while(q > 0 && iscid(GetChar(q - 1)))
+		q--;
+	while(q < GetLength() && iscid(GetChar(q)))
+		id << (char)GetChar(q++);
+	return id;
+}
+
+int AssistEditor::Ch(int i)
+{
+	return i >= 0 && i < GetLength() ? GetChar(i) : 0;
+}
+
+int AssistEditor::ParsBack(int q)
+{
+	int level = 1;
+	--q;
+	while(q > 0) {
+		if(isrbrkt(Ch(q)))
+			level++;
+		if(islbrkt(Ch(q)))
+			if(--level <= 0)
+				break;
+		--q;
+	}
+	return max(0, q);
+}
+
+bool IsSpc(int c)
+{
+	return c > 0 && c <= 32;
+}
+
+void AssistEditor::SkipSpcBack(int& q)
+{
+	while(q > 0 && IsSpc(Ch(q - 1)))
+		q--;
+}
+
+String AssistEditor::IdBack(int& qq)
+{
+	int q = qq;
+	while(iscid(Ch(q - 1)))
+		q--;
+	if(!iscib(Ch(q)))
+		return Null;
+	String r;
+	qq = q;
+	while(q < GetLength() && iscid(Ch(q)))
+		r.Cat(Ch(q++));
+	return r;
+}
+
+Vector<String> AssistEditor::ReadBack(int q, String& type)
+{
+	Vector<String> r;
+	type.Clear();
+	bool wasid = true;
+	for(;;) {
+		if(r.GetCount() > 200) {
+			r.Clear();
+			type.Clear();
+			break;
+		}
+		SkipSpcBack(q);
+		int c = Ch(q - 1);
+		int c1 = Ch(q - 2);
+		if(c == ':' && c1 == ':') {
+			for(;;) {
+				q -= 2;
+				SkipSpcBack(q);
+				String id = IdBack(q);
+				if(IsNull(id))
+					break;
+				type = id + type;
+				SkipSpcBack(q);
+				if(Ch(q - 1) != ':' || Ch(q - 2) != ':')
+					break;
+				type = "::" + type;
+			}
+			break;
+		}
+		if(iscid(c)) {
+			if(wasid)
+				break;
+			String id = IdBack(q);
+			if(IsNull(id))
+				break;
+			r.Add() = id;
+			wasid = true;
+			continue;
+		}
+		else {
+			if(c == ']') {
+				if(wasid)
+					break;
+				r.Add("[]");
+				q = ParsBack(q - 1);
+				wasid = false;
+				continue;
+			}
+			else
+			if(c == ')') {
+				if(wasid)
+					break;
+				r.Add("()");
+				q = ParsBack(q - 1);
+				wasid = false;
+				continue;
+			}
+			wasid = false;
+			c = Ch(q - 1);
+			if(c == '>' && Ch(q - 2) == '-') {
+				r.Add("->");
+				q -= 2;
+				continue;
+			}
+			if(c == '.') {
+				r.Add(".");
+				q--;
+				continue;
+			}
+		}
+		break;
+	}
+	Reverse(r);
+	return r;
+}
+
+int memcmp_i(const char *s, const char *t, int n)
+{
+	while(n--) {
+		int q = ToUpper(*s++) - ToUpper(*t++);
+		if(q)
+			return q;
+	}
+	return 0;
+}
+
+void AssistEditor::SyncAssist()
+{
+	String name;
+	name = ReadIdBack(GetCursor());
+	assist.Clear();
+	int typei = type.GetCursor() - 1;
+	VectorMap<String, int> over;
+	for(int p = 0; p < 2; p++)
+		for(int i = 0; i < assist_item.GetCount(); i++) {
+			const CppItemInfo& m = assist_item[i];
+			if((typei < 0 || m.typei == typei) &&
+			   (p ? memcmp_i(name, m.name, name.GetCount()) == 0
+			        && memcmp(name, m.name, name.GetCount())
+			      : memcmp(name, m.name, name.GetCount()) == 0)) {
+				int q = over.Find(m.name);
+				if(q < 0 || over[q] == m.typei) {
+					assist.Add(RawToValue(m));
+					if(q < 0)
+						over.Add(m.name, m.typei);
+				}
+			}
+		}
+}
+
+void AssistEditor::Assist()
+{
+	if(!assist_active)
+		return;
+	CloseAssist();
+	int q = GetCursor();
+	assist_cursor = q;
+	while(iscid(Ch(q - 1)))
+		q--;
+	String tp;
+	Vector<String> h = ReadBack(q, tp);
+	Vector<String> type;
+	bool d;
+	if(h.GetCount() == 0 && IsNull(tp))
+		TypeOf(Null, type, d);
+	else {
+		type = TypeOf(h, tp);
+		if(type.GetCount() == 0)
+			return;
+	}
+	assist_type.Clear();
+	assist_item.Clear();
+	for(int i = 0; i < type.GetCount(); i++) {
+		Index<String> in_types;
+		GatherItems(type[i], h.GetCount() == 0, in_types, !IsNull(tp) || h.GetCount() == 0);
+	}
+	if(assist_item.GetCount() == 0)
+		return;
+	Sort(assist_item, CppItemInfoOrder());
+	PopUpAssist();
+}
+
+void AssistEditor::PopUpAssist(bool auto_insert)
+{
+	int lcy = max(16, BrowserFont().Info().GetHeight());
+	type.Clear();
+	type.Add(AttrText("<all>").Ink(SColorHighlight()));
+	for(int i = 0; i < assist_type.GetCount(); i++) {
+		String s = assist_type[i];
+		if(s[0] == ':' && s[1] == ':')
+			s = s.Mid(2);
+		s = Nvl(s, "<globals>");
+		if(s[0] == '<')
+			type.Add(AttrText(s).Ink(SColorMark()));
+		else
+			type.Add(Nvl(s, "<globals>"));
+	}
+	type.SetCursor(0);
+	if(!assist.GetCount())
+		return;
+	int cy = min(300, lcy * max(type.GetCount(), assist.GetCount()));
+	cy += 4;
+	cy += HeaderCtrl::GetStdHeight();
+	assist.SetLineCy(lcy);
+	Point p = GetCaretPoint() + GetScreenView().TopLeft();
+	Rect wa = GetWorkArea();
+	int cx = min(wa.Width() - 100, HorzLayoutZoom(600));
+	Rect r = RectC(p.x, p.y, cx, cy);
+	if(p.x + cx > wa.right)
+		p.x = wa.right - cx;
+	if(p.y + cy + GetFontSize().cy < wa.bottom)
+		popup.SetRect(p.x, p.y + GetFontSize().cy, cx, cy);
+	else
+		popup.SetRect(p.x, p.y - cy, cx, cy);
+	popup.BackPaint();
+	if(auto_insert && assist.GetCount() == 1) {
+		assist.GoBegin();
+		AssistInsert();
+	}
+	else
+		popup.Ctrl::PopUp(this, false, false, true);
+}
+
+void AssistEditor::Complete()
+{
+	CloseAssist();
+	Index<String> id;
+	int l = GetCursorLine() - 1;
+	while(l >= 0) {
+		String x = GetUtf8Line(l);
+		CParser p(x);
+		while(!p.IsEof())
+			if(p.IsId())
+				id.FindAdd(p.ReadId());
+			else
+				p.SkipTerm();
+		l--;
+	}
+	for(int i = 0; i < id.GetCount(); i++) {
+		CppItemInfo& f = assist_item.Add(id[i]);
+		f.name = id[i];
+		f.natural = id[i];
+		f.access = 0;
+		f.kind = 100;
+	}
+	PopUpAssist(true);
+}
+
+void AssistEditor::AssistInsert()
+{
+	if(assist.IsCursor()) {
+		const CppItemInfo& f = ValueTo<CppItemInfo>(assist.Get(0));
+		String txt = f.name;
+		int l = txt.GetCount();
+		int pl = txt.GetCount();
+		if(f.kind >= FUNCTION && f.kind <= INLINEFRIEND) {
+			txt << '(';
+			pl = l = txt.GetCount();
+			if(IsNull(f.param))
+				l++;
+			else {
+				Vector<String> p = Split(f.param, ';', false);
+				for(int i = 0; i < p.GetCount(); i++) {
+					if(i) {
+						txt << (inbody ? (char)184 : ',');
+						txt << ' ';
+					}
+					txt << p[i];
+					if(i == 0)
+						pl = txt.GetCount();
+				}
+			}
+			txt << ')';
+		}
+		int cl = GetCursor();
+		int ch = cl;
+		while(iscid(Ch(cl - 1)))
+			cl--;
+		while(iscid(Ch(ch)))
+			ch++;
+		Remove(cl, ch - cl);
+		SetCursor(cl);
+		int n = Paste(ToUnicode(txt, CHARSET_WIN1250));
+		if(!inbody)
+			SetCursor(cl + n);
+		else
+		if(pl > l)
+			SetSelection(cl + l, cl + pl);
+		else
+			SetCursor(cl + l);
+	}
+	CloseAssist();
+	IgnoreMouseUp();
+}
+
+bool AssistEditor::InCode()
+{
+	int pos = GetCursor();
+	int line = GetLinePos(pos);
+	SyntaxState st = ScanSyntax(line);
+	WString l = GetWLine(line);
+	st.ScanSyntax(l, ~l + pos);
+	return !st.comment && !st.string && !st.linecomment;
+}
+
+bool AssistEditor::Key(dword key, int count)
+{
+	if(searchindex.HasFocus())
+		return IndexKey(key);
+	if(popup.IsOpen()) {
+		int k = key & ~K_CTRL;
+		ArrayCtrl& kt = key & K_CTRL ? type : assist;
+		if(k == K_UP || k == K_PAGEUP || k == K_CTRL_PAGEUP || k == K_CTRL_END)
+			if(kt.IsCursor())
+				return kt.Key(k, count);
+			else {
+				kt.SetCursor(kt.GetCount() - 1);
+				return true;
+			}
+		if(k == K_DOWN || k == K_PAGEDOWN || k == K_CTRL_PAGEDOWN || k == K_CTRL_HOME)
+			if(kt.IsCursor())
+				return kt.Key(k, count);
+			else {
+				kt.SetCursor(0);
+				return true;
+			}
+		if(key == K_ENTER && assist.IsCursor()) {
+			AssistInsert();
+			return true;
+		}
+		if(key == K_TAB && !assist.IsCursor() && assist.GetCount()) {
+			assist.GoBegin();
+			AssistInsert();
+			return true;
+		}
+	}
+#ifdef _DEBUG
+	if(key == K_ALT_F12) {
+		PutConsole("Type is");
+		String tp;
+		Vector<String> h = ReadBack(GetCursor(), tp);
+		Vector<String> r = TypeOf(h, tp);
+		PutConsole(tp);
+		for(int i = 0; i < r.GetCount(); i++)
+			PutConsole(r[i]);
+	}
+#endif
+	int c = GetCursor();
+	int cc = GetChar(c);
+	int bcc = c > 0 ? GetChar(c - 1) : 0;
+	bool b = CodeEditor::Key(key, count);
+	if(assist.IsOpen()) {
+		if(!iscid(key) &&
+		   !(iscid(cc) && (key == K_DELETE || key == K_RIGHT)) &&
+		   !(iscid(bcc) && (key == K_LEFT || key == K_BACKSPACE))) {
+			if(b) {
+				CloseAssist();
+				if(key == '.')
+					Assist();
+			}
+		}
+		else
+			SyncAssist();
+	}
+	else {
+		if(auto_assist &&
+		   (key == '.' || key == '>' && Ch(GetCursor() - 2) == '-' ||
+		    key == ':' && Ch(GetCursor() - 2) == ':') &&
+		    InCode())
+				Assist();
+
+	}
+	if(key == ',') {
+		if(Ch(GetCursor()) == 184) {
+			int q = GetCursor() + 1;
+			int lvl = 0;
+			while(q < GetLength()) {
+				int ch = Ch(q);
+				if(ch == '\n')
+					return b;
+				if(ch == 184 || lvl <= 0 && ch == ')') {
+					SetSelection(GetCursor(), q);
+					return b;
+				}
+				if(ch == '(')
+					lvl++;
+				if(ch == '(')
+					lvl--;
+				q++;
+			}
+		}
+	}
+	return b;
+}
+
+void AssistEditor::MouseWheel(Point p, int zdelta, dword keyflags)
+{
+	if(assist.IsOpen())
+		assist.MouseWheel(p, zdelta, keyflags);
+	else
+		CodeEditor::MouseWheel(p, zdelta, keyflags);
+}
+
+void AssistEditor::LeftDown(Point p, dword keyflags)
+{
+	CloseAssist();
+	CodeEditor::LeftDown(p, keyflags);
+}
+
+void AssistEditor::LostFocus()
+{
+	CloseAssist();
+}
+
+String AssistEditor::RemoveDefPar(const char *s)
+{
+	String r;
+	int lvl = 0;
+	bool dp = true;
+	while(*s) {
+		byte c = *s++;
+		if(c == '(')
+			lvl++;
+		if(lvl == 0) {
+			if(c == '=') {
+				dp = false;
+				if(commentdp)
+					r.Cat("/* ");
+				else
+					while(r.GetCount() && *r.Last() == ' ')
+						r.Trim(r.GetCount() - 1);
+			}
+			if(c == ')') {
+				if(!dp && commentdp)
+					r.Cat("*/");
+				r.Cat(')');
+				if(CParser(s).Char('='))
+					break;
+				r.Cat(s);
+				break;
+			}
+			if(c == ',') {
+				if(!dp && commentdp)
+					r.Cat("*/");
+				dp = true;
+			}
+		}
+		else
+		if(c == ')')
+			lvl--;
+		if(dp || commentdp)
+			r.Cat(c);
+	}
+	return r;
+}
+
+String AssistEditor::MakeDefinition(const String& cls, const String& _n)
+{
+	String n = TrimLeft(_n);
+	CParser p(n);
+	bool dest = false;
+	const char *beg = n;
+	while(!p.IsEof()) {
+		const char *b = p.GetPtr();
+		if(p.Id("operator"))
+			return NormalizeSpaces(String(beg, b) + ' ' + cls + "::" + b);
+		if(p.Char('~')) {
+			beg = p.GetPtr();
+			dest = true;
+		}
+		else
+		if(p.IsId()) {
+			String id = p.ReadId();
+			if(p.Char('(')) {
+				String rp = RemoveDefPar(p.GetPtr());
+				if(dest)
+					return NormalizeSpaces(String(beg, b) + cls + "::~" + id + '(' + rp);
+				else
+					return NormalizeSpaces(String(beg, b) + ' ' + cls + "::" + id + '(' + rp);
+			}
+		}
+		else
+			p.SkipTerm();
+	}
+	return n;
+}
+
+void AssistEditor::DCopy()
+{
+	String r;
+	int l, h;
+	if(!GetSelection(l, h)) {
+		int i = GetLine(GetCursor());
+		l = GetPos(i);
+		h = l + line[i].GetLength() + 1;
+	}
+	Parser ctx;
+	Context(ctx, l);
+	String txt = Get(l, h - l);
+	StringStream ss(txt);
+	String cls = ctx.current_nest.Mid(ctx.current_namespacel);
+	if(cls[0] == ':' && cls[1] == ':')
+		cls = cls.Mid(2);
+	CppBase cpp;
+	Parser parser;
+	parser.Do(ss, IgnoreList(), cpp, Null, CNULL, Split(cls, ':'));
+	for(int i = 0; i < cpp.GetCount(); i++) {
+		const CppNest& nest = cpp[i];
+		for(int j = 0; j < nest.GetCount(); j++) {
+			const CppItem& m = nest[j];
+			if(m.IsCode())
+				if(cls.GetCount())
+					r << MakeDefinition(cls, m.natural) << "\n{\n}\n\n";
+				else {
+					if(cpp.IsType(i))
+					   r << '\t';
+					r << m.natural << ";\n";
+				}
+			if(m.IsData())
+				r << "extern " << m.natural << ";\n";
+		}
+	}
+	WriteClipboardText(r);
+}
+
+String GetIdNest(const String& nest, const String& id, Index<String>& done)
+{
+	if(done.Find(nest) >= 0)
+		return Null;
+	done.Add(nest);
+	String n = NoTemplatePars(nest);
+	int q = BrowserBase().Find(n);
+	if(q < 0)
+		return Null;
+	CppNest& m = BrowserBase()[q];
+	Vector<String> r;
+	if(m.name.Find(id) >= 0)
+		return n;
+	for(int i = 0; i < m.GetCount(); i++) {
+		const CppItem& im = m[i];
+		if(im.IsType()) {
+			Vector<String> b = Split(im.qptype, ';');
+			SubstituteTpars(b, nest);
+			for(int i = 0; i < b.GetCount(); i++) {
+				String r = GetIdNest(b[i], id, done);
+				if(!IsNull(r))
+					return r;
+			}
+		}
+	}
+	return Null;
+}
+
+void Ide::JumpS()
+{
+	if(designer || !editor.assist_active)
+		return;
+	int q = editor.GetCursor();
+	while(iscid(editor.Ch(q - 1)))
+		q--;
+	String tp;
+	Vector<String> h = editor.ReadBack(q, tp);
+	Vector<String> type;
+	Parser parser;
+	editor.Context(parser, editor.GetCursor());
+	if(h.GetCount() == 0 && IsNull(tp)) {
+		type.Add(parser.current_nest);
+	}
+	else {
+		type = editor.TypeOf(h, tp);
+		if(type.GetCount() == 0)
+			return;
+	}
+	String id = editor.GetWord();
+	Vector<String> nest;
+	for(int i = 0; i < type.GetCount(); i++) {
+		Index<String> done;
+		String r = GetIdNest(type[i], id, done);
+		if(!IsNull(r))
+			nest.Add(r);
+	}
+
+	if(nest.GetCount() == 0) {
+		Index<String> done;
+		String r = GetIdNest("::", id, done);
+		if(IsNull(r)) {
+			String t = Qualify(BrowserBase(), parser.current_nest, id);
+			if(BrowserBase().Find(t) < 0)
+				return;
+			nest.Add(t);
+		}
+		else
+			nest.Add(r);
+	}
+
+	if(nest.GetCount() == 0)
+		return;
+
+	q = BrowserBase().Find(nest[0]);
+	if(q < 0)
+		return;
+	const CppNest& n = BrowserBase()[q];
+	q = n.name.Find(id);
+
+	if(q < 0)
+		return;
+
+	if(nest.GetCount() > 1 || n.name.FindNext(q) >= 0) {
+		browser.SetId(id, nest);
+		SetBottom(BBROWSER);
+		SetBar();
+	}
+
+	const CppItem& m = n[q];
+	if(m.pos.GetCount() == 0)
+		return;
+	int ai = 0;
+	for(int i = 0; i < m.pos.GetCount(); i++) {
+		const CppPos& fp = m.pos[i];
+		if(fp.impl) {
+			GotoCpp(fp);
+			return;
+		}
+		String ext = ToLower(GetFileExt(fp.GetFile()));
+		if(ext == ".CPP" || ext == ".C" || ext == ".CC")
+			ai = i;
+	}
+	GotoCpp(m.pos[ai]);
+}
diff --git a/uppsrc/ide/AutoSetup.cpp b/uppsrc/ide/AutoSetup.cpp
new file mode 100644
index 000000000..6cb543a69
--- /dev/null
+++ b/uppsrc/ide/AutoSetup.cpp
@@ -0,0 +1,403 @@
+#include "ide.h"
+
+extern FileSel& sSD();
+
+static void sSetFolder(EditField *f)
+{
+	if(!sSD().ExecuteSelectDir()) return;
+	*f <<= ~sSD();
+}
+
+void DirSel(EditField& f, FrameRight<Button>& b)
+{
+	f.AddFrame(b);
+	b <<= callback1(&sSetFolder, &f);
+	b.SetImage(CtrlImg::smallright()).NoWantFocus();
+}
+
+String NormalizePathNN(const String& path)
+{
+	return IsNull(path) ? path : NormalizePath(path);
+}
+
+
+#ifdef PLATFORM_WIN32
+bool ExistProgram(String& bin, const char *dir, const char *file)
+{
+	String win = NormalizePath(GetWindowsDirectory());
+	if(FileExists(AppendFileName(win.Mid(0, 3) + dir, file))) {
+		bin = win.Mid(0, 3) + dir;
+		return true;
+	}
+	return false;
+}
+
+void AutoSetup()
+{
+	WithAutoSetupLayout<TopWindow> dlg;
+	CtrlLayoutOKCancel(dlg, "Ultimate++ methods auto-setup");
+	String mw = GetExeDirFile("mingw");
+	FindFile ff(mw);
+	if(ff && ff.IsDirectory())
+		dlg.mingw <<= mw;
+	else
+		dlg.mingw <<=
+			NormalizePathNN(GetWinRegString("Inno Setup: App Path",
+		       "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\MinGW_is1"));
+	dlg.mingwmethod <<= "MINGW";
+	dlg.domingw <<= !IsNull(dlg.mingw);
+
+
+	String vs = GetWinRegString("ProductDir", "SOFTWARE\\Microsoft\\VisualStudio\\7.1\\Setup\\VC");
+	dlg.visualcpp71 <<=
+		NormalizePathNN(
+			Nvl(
+				GetWinRegString("InstallLocation",
+	                            "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\"
+	                            "{362882AE-E40A-4435-B214-6420634C401F}"),
+	            vs)
+	    );
+	dlg.visualcppmethod71 <<= "MSC71";
+	dlg.dovisualcpp71 <<= !IsNull(dlg.visualcpp71);
+
+	String sdk8 = GetWinRegString("InstallationFolder",
+	                             "Software\\Microsoft\\Microsoft SDKs\\Windows\\v6.0",
+	                             HKEY_CURRENT_USER);
+	String bin8;
+	if(!IsNull(sdk8)) {
+		sdk8 = NormalizePath(sdk8);
+		dlg.sdk8 <<= sdk8;
+		dlg.sdk71 <<= sdk8;
+		dlg.visualcpp8 <<= bin8 = sdk8;
+	}
+	else {
+		dlg.visualcpp8 <<= bin8 = NormalizePathNN(
+			GetWinRegString("8.0", "SOFTWARE\\Microsoft\\VisualStudio\\SxS\\VS7")
+		);
+		dlg.sdk8 <<= NormalizePathNN(GetWinRegString("Install Dir", "SOFTWARE\\Microsoft\\MicrosoftSDK\\InstalledSDKs\\8F9E5EF3-A9A5-491B-A889-C58EFFECE8B3"));
+	}
+	dlg.visualcppmethod8 <<= "MSC8";
+	dlg.dovisualcpp8 <<= !IsNull(dlg.visualcpp8);
+	if(bin8.GetLength() && FileExists(AppendFileName(bin8, "VC\\Bin\\x64\\cl.exe"))) {
+		dlg.dovisualcpp8x64 = true;
+	}
+	dlg.visualcppmethod8x64 <<= "MSC8x64";
+	String  sdk9 = NormalizePathNN(GetWinRegString("InstallationFolder",
+	                                               "Software\\Microsoft\\Microsoft SDKs\\Windows\\v6.0a",
+	                                                HKEY_CURRENT_USER));
+	String bin9;
+	if(!IsNull(sdk9) && FileExists(AppendFileName(sdk9, "VC\\Bin\\cl.exe")))
+		bin9 = sdk9;
+	else
+		ExistProgram(bin9, "Program Files (x86)\\Microsoft Visual Studio 9.0", "VC\\Bin\\cl.exe")
+		|| ExistProgram(bin9, "Program Files\\Microsoft Visual Studio 9.0", "VC\\Bin\\cl.exe");
+	dlg.sdk9 <<= sdk9;
+	dlg.visualcpp9 <<= bin9;
+	dlg.visualcppmethod9 <<= "MSC9";
+	dlg.dovisualcpp9 <<= !IsNull(dlg.visualcpp9);
+	if(bin9.GetLength() && FileExists(AppendFileName(bin9, "VC\\Bin\\x64\\cl.exe"))) {
+		dlg.dovisualcpp9x64 = true;
+	}
+	dlg.visualcppmethod9x64 <<= "MSC9x64";
+
+	dlg.mysql <<= NormalizePathNN(GetWinRegString("Location", "SOFTWARE\\MySQL AB\\MySQL Server 4.1"));
+
+	String sdl = NormalizePathNN(ConfigFile("SDL-1.2.9"));
+	if(DirectoryExists(sdl))
+		dlg.sdl <<= sdl;
+
+	Array< FrameRight<Button> > bd;
+	DirSel(dlg.mingw, bd.Add());
+	DirSel(dlg.visualcpp71, bd.Add());
+	DirSel(dlg.visualcpp8, bd.Add());
+	DirSel(dlg.visualcpp9, bd.Add());
+	DirSel(dlg.sdk71, bd.Add());
+	DirSel(dlg.sdk8, bd.Add());
+	DirSel(dlg.sdk9, bd.Add());
+	DirSel(dlg.sdl, bd.Add());
+	DirSel(dlg.mysql, bd.Add());
+	if(dlg.Run() != IDOK)
+		return;
+
+	String dir = GetFileFolder(GetExeFilePath());
+
+	String exe;
+	String include;
+	String lib;
+
+	sdl = ~dlg.sdl;
+	if(!IsNull(sdl)) {
+		exe << ";" << AppendFileName(sdl, "lib");
+		include << ";" << AppendFileName(sdl, "include");
+		lib << ";" << AppendFileName(sdl, "lib");
+	}
+
+	String mysql = ~dlg.mysql;
+	String mlib;
+	if(!IsNull(mysql)) {
+		exe << ";" << AppendFileName(mysql, "bin");
+		include << ";" << AppendFileName(mysql, "include");
+		mlib << ";" << AppendFileName(mysql, "bin");
+	}
+
+	String mingw = ~dlg.mingw;
+	if(!IsNull(mingw) && dlg.domingw) {
+		String m = ~dlg.mingwmethod;
+		SaveFile(
+			AppendFileName(dir, m + ".bm"),
+			"BUILDER = \"GCC\";\n"
+			"DEBUG_INFO = \"2\";\n"
+			"DEBUG_BLITZ = \"1\";\n"
+			"DEBUG_LINKMODE = \"0\";\n"
+			"DEBUG_OPTIONS = \"-O0 -gstabs\";\n"
+			"RELEASE_BLITZ = \"1\";\n"
+			"RELEASE_LINKMODE = \"0\";\n"
+			"RELEASE_OPTIONS = \"-O3 -ffunction-sections\";\n" // -funroll-loops ?
+			"RELEASE_SIZE_OPTIONS = \"-Os -finline-limit=20 -ffunction-sections\";\n"
+			"DEBUGGER = \"gdb\";\n"
+			"REMOTE_HOST = \"\";\n"
+			"REMOTE_OS = \"\";\n"
+			"REMOTE_TRANSFER = \"\";\n"
+			"REMOTE_MAP = \"\";\n"
+			"PATH = " + AsCString(AppendFileName(~dlg.mingw, "bin") + exe) + ";\n"
+			"INCLUDE = " + AsCString(AppendFileName(~dlg.mingw, "include") + include) + ";\n"
+			"LIB = " + AsCString(AppendFileName(~dlg.mingw, "lib") + lib + mlib) + ";\n"
+		);
+		SaveFile(AppendFileName(dir, "default_method"), m);
+	}
+
+	if(!IsNull(mysql)) {
+		lib << ";" << AppendFileName(mysql, "lib");
+	}
+
+
+	String vs9 = ~dlg.visualcpp9;
+	if(!IsNull(vs9) && dlg.dovisualcpp9x64) {
+		String vc = AppendFileName(vs9, "Vc");
+		String m = ~dlg.visualcppmethod9x64;
+		String sdk = ~dlg.sdk9;
+		if(IsNull(sdk))
+			sdk = AppendFileName(vc, "PlatformSDK");
+		SaveFile(
+			AppendFileName(dir, m + ".bm"),
+			"BUILDER = \"MSC9X64\";\n"
+			"DEBUG_INFO = \"2\";\n"
+			"DEBUG_BLITZ = \"1\";\n"
+			"DEBUG_LINKMODE = \"0\";\n"
+			"DEBUG_OPTIONS = \"-Od\";\n"
+			"RELEASE_BLITZ = \"0\";\n"
+			"RELEASE_LINKMODE = \"0\";\n"
+			"RELEASE_OPTIONS = \"-O2 -GS-\";\n"
+			"RELEASE_SIZE_OPTIONS = \"-O1 -GS-\";\n"
+			"DEBUGGER = \"\";\n"
+			"REMOTE_HOST = \"\";\n"
+			"REMOTE_OS = \"\";\n"
+			"REMOTE_TRANSFER = \"\";\n"
+			"REMOTE_MAP = \"\";\n"
+			"PATH = " + AsCString(
+			                AppendFileName(vs9, "Common7\\Ide") + ';' +
+							AppendFileName(vc, "Bin\\x64") + ';' +
+							AppendFileName(sdk, "Bin") +
+							exe
+						) + ";\n"
+			"INCLUDE = " + AsCString(
+							AppendFileName(vc, "Include") + ';' +
+							AppendFileName(sdk, "Include") +
+							include
+						   ) + ";\n"
+			"LIB = " + AsCString(
+							AppendFileName(vc, "Lib\\x64") + ';' +
+							AppendFileName(sdk, "Lib\\x64") +
+							lib
+			           ) + ";\n"
+		);
+		SaveFile(AppendFileName(dir, "default_method"), m);
+	}
+
+	if(!IsNull(vs9) && dlg.dovisualcpp9) {
+		String vc = AppendFileName(vs9, "Vc");
+		String m = ~dlg.visualcppmethod9;
+		String sdk = ~dlg.sdk9;
+		if(IsNull(sdk9))
+			sdk = AppendFileName(vc, "PlatformSDK");
+		SaveFile(
+			AppendFileName(dir, m + ".bm"),
+			"BUILDER = \"MSC9\";\n"
+			"DEBUG_INFO = \"2\";\n"
+			"DEBUG_BLITZ = \"1\";\n"
+			"DEBUG_LINKMODE = \"0\";\n"
+			"DEBUG_OPTIONS = \"-Od\";\n"
+			"RELEASE_BLITZ = \"0\";\n"
+			"RELEASE_LINKMODE = \"0\";\n"
+			"RELEASE_OPTIONS = \"-O2 -GS-\";\n"
+			"RELEASE_SIZE_OPTIONS = \"-O1 -GS-\";\n"
+			"DEBUGGER = \"\";\n"
+			"REMOTE_HOST = \"\";\n"
+			"REMOTE_OS = \"\";\n"
+			"REMOTE_TRANSFER = \"\";\n"
+			"REMOTE_MAP = \"\";\n"
+			"PATH = " + AsCString(
+			                AppendFileName(vs9, "Common7\\Ide") + ';' +
+							AppendFileName(vc, "Bin") + ';' +
+							AppendFileName(sdk, "Bin") +
+							exe
+						) + ";\n"
+			"INCLUDE = " + AsCString(
+							AppendFileName(vc, "Include") + ';' +
+							AppendFileName(sdk, "Include") +
+							include
+						   ) + ";\n"
+			"LIB = " + AsCString(
+							AppendFileName(vc, "Lib") + ';' +
+							AppendFileName(sdk, "Lib") +
+							lib
+			           ) + ";\n"
+		);
+		SaveFile(AppendFileName(dir, "default_method"), m);
+	}
+
+	String vs8 = ~dlg.visualcpp8;
+	if(!IsNull(vs8) && dlg.dovisualcpp8x64) {
+		String vc = AppendFileName(vs8, "Vc");
+		String m = ~dlg.visualcppmethod8x64;
+		String sdk = ~dlg.sdk8;
+		if(IsNull(sdk))
+			sdk = AppendFileName(vc, "PlatformSDK");
+		SaveFile(
+			AppendFileName(dir, m + ".bm"),
+			"BUILDER = \"MSC8X64\";\n"
+			"DEBUG_INFO = \"2\";\n"
+			"DEBUG_BLITZ = \"1\";\n"
+			"DEBUG_LINKMODE = \"0\";\n"
+			"DEBUG_OPTIONS = \"-Od\";\n"
+			"RELEASE_BLITZ = \"0\";\n"
+			"RELEASE_LINKMODE = \"0\";\n"
+			"RELEASE_OPTIONS = \"-O2 -GS-\";\n"
+			"RELEASE_SIZE_OPTIONS = \"-O1 -GS-\";\n"
+			"DEBUGGER = \"\";\n"
+			"REMOTE_HOST = \"\";\n"
+			"REMOTE_OS = \"\";\n"
+			"REMOTE_TRANSFER = \"\";\n"
+			"REMOTE_MAP = \"\";\n"
+			"PATH = " + AsCString(
+			                AppendFileName(vs8, "Common7\\Ide") + ';' +
+							AppendFileName(vc, "Bin\\x64") + ';' +
+							AppendFileName(sdk, "Bin") +
+							exe
+						) + ";\n"
+			"INCLUDE = " + AsCString(
+							AppendFileName(vc, "Include") + ';' +
+							AppendFileName(sdk, "Include") +
+							include
+						   ) + ";\n"
+			"LIB = " + AsCString(
+							AppendFileName(vc, "Lib\\x64") + ';' +
+							AppendFileName(sdk, "Lib\\x64") +
+							lib
+			           ) + ";\n"
+		);
+		SaveFile(AppendFileName(dir, "default_method"), m);
+	}
+
+	if(!IsNull(vs8) && dlg.dovisualcpp8) {
+		String vc = AppendFileName(vs8, "Vc");
+		String m = ~dlg.visualcppmethod8;
+		String sdk = ~dlg.sdk8;
+		if(IsNull(sdk8))
+			sdk = AppendFileName(vc, "PlatformSDK");
+		SaveFile(
+			AppendFileName(dir, m + ".bm"),
+			"BUILDER = \"MSC8\";\n"
+			"DEBUG_INFO = \"2\";\n"
+			"DEBUG_BLITZ = \"1\";\n"
+			"DEBUG_LINKMODE = \"0\";\n"
+			"DEBUG_OPTIONS = \"-Od\";\n"
+			"RELEASE_BLITZ = \"0\";\n"
+			"RELEASE_LINKMODE = \"0\";\n"
+			"RELEASE_OPTIONS = \"-O2 -GS-\";\n"
+			"RELEASE_SIZE_OPTIONS = \"-O1 -GS-\";\n"
+			"DEBUGGER = \"\";\n"
+			"REMOTE_HOST = \"\";\n"
+			"REMOTE_OS = \"\";\n"
+			"REMOTE_TRANSFER = \"\";\n"
+			"REMOTE_MAP = \"\";\n"
+			"PATH = " + AsCString(
+			                AppendFileName(vs8, "Common7\\Ide") + ';' +
+							AppendFileName(vc, "Bin") + ';' +
+							AppendFileName(sdk, "Bin") +
+							exe
+						) + ";\n"
+			"INCLUDE = " + AsCString(
+							AppendFileName(vc, "Include") + ';' +
+							AppendFileName(sdk, "Include") +
+							include
+						   ) + ";\n"
+			"LIB = " + AsCString(
+							AppendFileName(vc, "Lib") + ';' +
+							AppendFileName(sdk, "Lib") +
+							lib
+			           ) + ";\n"
+		);
+		SaveFile(AppendFileName(dir, "default_method"), m);
+	}
+
+	String vc7 = ~dlg.visualcpp71;
+	if(PathIsEqual(vc7, vs))
+		vs = AppendFileName(GetFileFolder(NormalizePath(vs)), "Common7\\ide") + ";";
+	else
+		vs.Clear();
+	if(!IsNull(vc7) && dlg.dovisualcpp71) {
+		String m = ~dlg.visualcppmethod71;
+		String sdk = ~dlg.sdk71;
+		if(IsNull(sdk))
+			sdk = AppendFileName(vc7, "PlatformSDK");
+		SaveFile(
+			AppendFileName(dir, m + ".bm"),
+			"BUILDER = \"MSC71\";\n"
+			"DEBUG_INFO = \"2\";\n"
+			"DEBUG_BLITZ = \"1\";\n"
+			"DEBUG_LINKMODE = \"0\";\n"
+			"DEBUG_OPTIONS = \"-Od\";\n"
+			"RELEASE_BLITZ = \"0\";\n"
+			"RELEASE_LINKMODE = \"0\";\n"
+			"RELEASE_OPTIONS = \"-O2\";\n"
+			"RELEASE_SIZE_OPTIONS = \"-O1\";\n"
+			"DEBUGGER = \"\";\n"
+			"REMOTE_HOST = \"\";\n"
+			"REMOTE_OS = \"\";\n"
+			"REMOTE_TRANSFER = \"\";\n"
+			"REMOTE_MAP = \"\";\n"
+			"PATH = " + AsCString(
+			                vs +
+							AppendFileName(vc7, "Bin") + ';' +
+							AppendFileName(sdk, "Bin") +
+							exe
+						) + ";\n"
+			"INCLUDE = " + AsCString(
+							AppendFileName(vc7, "Include") + ';' +
+							AppendFileName(sdk, "Include") +
+							include
+						   ) + ";\n"
+			"LIB = " + AsCString(
+							AppendFileName(vc7, "Lib") + ';' +
+							AppendFileName(sdk, "Lib") +
+							lib
+			           ) + ";\n"
+		);
+		SaveFile(AppendFileName(dir, "default_method"), m);
+	}
+}
+#endif
+
+#ifdef PLATFORM_X11
+
+void AutoSetup() {}
+
+#endif
+
+void Ide::AutoSetup()
+{
+	::AutoSetup();
+	SyncBuildMode();
+	SetBar();
+}
diff --git a/uppsrc/ide/Bottom.cpp b/uppsrc/ide/Bottom.cpp
new file mode 100644
index 000000000..26074a431
--- /dev/null
+++ b/uppsrc/ide/Bottom.cpp
@@ -0,0 +1,251 @@
+#include "ide.h"
+
+RightTabs::RightTabs()
+{
+	cx = 3;
+	cursor = -1;
+	Transparent();
+}
+
+void RightTabs::Clear()
+{
+	tab.Clear();
+	cx = 3;
+	cursor = -1;
+	Refresh();
+}
+
+void RightTabs::Repos()
+{
+	int y = 0;
+	for(int i = 0; i < tab.GetCount(); i++) {
+		tab[i].y = y;
+		y += tab[i].GetHeight();
+	}
+	RefreshParentLayout();
+}
+
+void RightTabs::Add(const Image& img, const String& tip)
+{
+	Tab& t = tab.Add();
+	t.img = img;
+	t.tip = tip;
+	cx = max(cx, img.GetSize().cx + 7);
+	Repos();
+}
+
+void RightTabs::PaintTab(Draw& w, int x, int y, int cx, int cy, Color paper, const Image& img, Color hl)
+{
+	Color fc = FieldFrameColor();
+	w.DrawRect(x, y + 1, cx - 1, cy - 2, paper);
+	w.DrawRect(x, y, cx - 1, 1, fc);
+	w.DrawRect(x + cx - 1, y + 1, 1, cy - 2, fc);
+	w.DrawRect(x, y + cy - 1, cx - 1, 1, fc);
+	Size isz = img.GetSize();
+	int ix = (cx - isz.cx) / 2 + x;
+	int iy = (cy - isz.cx) / 2 + y;
+	if(!IsNull(hl)) {
+		w.DrawImage(ix - 1, iy - 1, img, hl);
+		w.DrawImage(ix - 1, iy + 1, img, hl);
+		w.DrawImage(ix + 1, iy - 1, img, hl);
+		w.DrawImage(ix + 1, iy + 1, img, hl);
+	}
+	w.DrawImage(ix, iy, img);
+}
+
+void RightTabs::Paint(Draw& w)
+{
+	Size sz = GetSize();
+	w.DrawRect(sz, Blend(SColorFace, SColorPaper));
+	Color hc = Blend(Yellow, LtRed, 100);
+	Color inactive = Blend(SColorPaper, SColorShadow);
+	for(int i = 0; i < tab.GetCount(); i++) {
+		Tab& t = tab[i];
+		if(i != cursor)
+			PaintTab(w, 0, t.y + 2, cx - 1, t.GetHeight() - 1, inactive, t.img, i == hl ? hc : Null);
+	}
+	if(cursor >= 0) {
+		Tab& t = tab[cursor];
+		PaintTab(w, 0, t.y, cx, t.GetHeight() + 3, SColorPaper, t.img, cursor == hl ? hc : Null);
+	}
+}
+
+int RightTabs::GetPos(Point p)
+{
+	for(int i = 0; i < tab.GetCount(); i++)
+		if(p.y < tab[i].GetRight())
+			return i;
+	return -1;
+}
+
+void RightTabs::SetCursor(int i)
+{
+	ASSERT(cursor < tab.GetCount());
+	cursor = i;
+	Refresh();
+}
+
+void RightTabs::LeftDown(Point p, dword)
+{
+	int c = GetPos(p);
+	if(c >= 0 && c != cursor) {
+		cursor = c;
+		UpdateActionRefresh();
+		if(GetParent())
+			GetParent()->RefreshFrame();
+	}
+}
+
+void RightTabs::MouseMove(Point p, dword)
+{
+	int c = GetPos(p);
+	if(c != hl) {
+		hl = c;
+		Refresh();
+		Tip(c >= 0 ? tab[c].tip : "");
+	}
+}
+
+void RightTabs::MouseLeave()
+{
+	CancelMode();
+}
+
+void RightTabs::CancelMode()
+{
+	hl = -1;
+	Refresh();
+	if(GetParent())
+		GetParent()->RefreshFrame();
+}
+
+void RightTabs::FramePaint(Draw& w, const Rect& rr)
+{
+	Rect r = rr;
+	r.right -= cx;
+	DrawFrame(w, r, FieldFrameColor());
+	DrawFrame(w, r.Deflated(1), SColorPaper);
+	if(cursor >= 0) {
+		Tab& t = tab[cursor];
+		w.DrawRect(r.right - 1, t.y + 1, 1, t.GetHeight() + 1, SColorFace);
+	}
+}
+
+void RightTabs::FrameLayout(Rect& r)
+{
+	LayoutFrameRight(r, this, cx);
+	r.top += 2;
+	r.right -= 2;
+	r.left += 2;
+	r.bottom -= 2;
+}
+
+void RightTabs::FrameAddSize(Size& sz)
+{
+	sz += 4;
+	sz.cx += cx + 2;
+}
+
+void Ide::BTabs()
+{
+	btabs.Clear();
+	btabs.Add(IdeImg::close, "Close");
+	btabs.Add(IdeImg::console, "Console");
+	btabs.Add(IdeImg::browser, "Browser");
+	btabs.Add(IdeImg::calc, "Calc");
+	if(bottomctrl)
+		btabs.Add(IdeImg::debug, "Debug");
+}
+
+void Ide::SyncBottom()
+{
+	int q = btabs.GetCursor();
+	if(q == BCLOSE) {
+		HideBottom();
+		return;
+	}
+	if(editor_bottom.GetZoom() >= 0)
+		editor_bottom.NoZoom();
+	console.Show(q == BCONSOLE);
+	browser.Show(q == BBROWSER);
+	calc.Show(q == BCALC);
+	if(bottomctrl)
+		bottomctrl->Show(q == BDEBUG);
+	calc.LoadHlStyles(editor.StoreHlStyles());
+	calc.SetFont(editorfont);
+	SetBar();
+	if(q == BBROWSER) {
+		StartBrowserBase();
+		if(!browser.nesting.IsCursor())
+			browser.nesting.GoBegin();
+	}
+	if(q == BCALC)
+		ActiveFocus(calc);
+}
+
+void Ide::SetBottom(int i)
+{
+	btabs.SetCursor(i);
+	SyncBottom();
+}
+
+void Ide::ToggleBottom(int i)
+{
+	if(i == btabs.GetCursor() && IsBottomShown())
+		HideBottom();
+	else
+		SetBottom(i);
+}
+
+bool Ide::IsBottomShown() const
+{
+	return editor_bottom.GetZoom() < 0;
+}
+
+void Ide::SwapBottom()
+{
+	if(editor.assist.IsOpen()) {
+		editor.CloseAssist();
+		return;
+	}
+	if(editor.IsFindOpen())
+		editor.FindClose();
+	else
+	if(!designer && !editor.HasFocusDeep())
+		ActiveFocus(editor);
+	else
+	if(IsBottomShown())
+		HideBottom();
+	else {
+		if(btabs.GetCursor() <= 0)
+			btabs.SetCursor(1);
+		SyncBottom();
+	}
+}
+
+void Ide::HideBottom() {
+	editor_bottom.Zoom(0);
+	editor.SetWantFocus();
+	SetBar();
+}
+
+void Ide::IdeSetBottom(Ctrl& ctrl)
+{
+	bottom.Add(ctrl.SizePos());
+	bottomctrl = &ctrl;
+	BTabs();
+	SetBottom(4);
+}
+
+void Ide::IdeRemoveBottom(Ctrl& ctrl)
+{
+	ctrl.Remove();
+	bottomctrl = NULL;
+	BTabs();
+	HideBottom();
+}
+
+void Ide::IdeActivateBottom()
+{
+	SetBottom(BDEBUG);
+}
diff --git a/uppsrc/ide/Browser/AUTHORS b/uppsrc/ide/Browser/AUTHORS
new file mode 100644
index 000000000..e69de29bb
diff --git a/uppsrc/ide/Browser/Base.cpp b/uppsrc/ide/Browser/Base.cpp
new file mode 100644
index 000000000..16215342a
--- /dev/null
+++ b/uppsrc/ide/Browser/Base.cpp
@@ -0,0 +1,359 @@
+#include "Browser.h"
+
+#define LTIMING(x) // RTIMING(x)
+#define QLOG(x)
+
+static const char s_dbver[] = "Assist++ 1.1";
+
+CppBase& BrowserBase()
+{
+	static CppBase b;
+	return b;
+}
+
+ArrayMap<String, BrowserFileInfo>& FileSet()
+{
+	static ArrayMap<String, BrowserFileInfo> x;
+	return x;
+}
+
+Vector<Browser *>& RBrowser()
+{
+	static Vector<Browser *> bp;
+	return bp;
+}
+
+void     Register(Browser *b)
+{
+	RBrowser().Add(b);
+}
+
+void     UnRegister(Browser *b)
+{
+	Vector<Browser *>& rb = RBrowser();
+	int q = FindIndex(rb, b);
+	if(q >= 0)
+		rb.Remove(q);
+}
+
+static bool   s_console;
+static String s_file;
+
+void BrowserScanError(int line, const String& text)
+{
+	if(s_console)
+		PutConsole(String().Cat() << s_file << " (" << line << "): " << text);
+}
+
+int NoSlash(int c)
+{
+	return c == '/' || c == '\\' || c == ':' ? '$' : c;
+}
+
+void SaveBrowserBase()
+{
+	CppBase& base = BrowserBase();
+	if(base.GetCount() == 0)
+		return;
+	ArrayMap<String, BrowserFileInfo>& fileset = FileSet();
+	ArrayMap<String, StringStream> out;
+	String s;
+	for(int j = 0; j < base.GetCount(); j++) {
+		CppNest& nest = base[j];
+		for(int k = 0; k < nest.GetCount(); k++) {
+			CppItem& m = nest.item[k];
+			for(int p = 0; p < m.pos.GetCount(); p++) {
+				StringStream& o = out.GetAdd(m.pos[p].GetFile());
+				s = base.GetKey(j);
+				o % s;
+				s = nest.key[k];
+				o % s;
+				s = nest.name[k];
+				o % s;
+				o % nest.namespacel;
+				o % m;
+				o % m.pos[p].line;
+			}
+		}
+	}
+
+	const Workspace& wspc = GetIdeWorkspace();
+	for(int i = 0; i < wspc.GetCount(); i++) {
+		String package = wspc[i];
+		String cfg = ConfigFile("cfg");
+		RealizeDirectory(cfg);
+		FileOut fo(AppendFileName(cfg, ForceExt(Filter(Nvl(package, "&"), NoSlash) + '@' + GetVarsName(), ".cdb")));
+		s = s_dbver;
+		fo % s;
+		for(int i = 0; i < fileset.GetCount(); i++)
+			if(fileset[i].package == package) {
+				String fn = fileset.GetKey(i);
+				String q = out.GetAdd(fn).GetResult();
+				BrowserFileInfo& f = fileset[i];
+				fo % fn;
+				fo % f.file;
+				fo % f.time;
+				fo % q;
+			}
+	}
+}
+
+void LoadBrowserBase(Progress& pi)
+{
+	CppBase& base = BrowserBase();
+	ArrayMap<String, BrowserFileInfo>& fileset = FileSet();
+	String s;
+	const Workspace& wspc = GetIdeWorkspace();
+	pi.SetText("Assist++ loading packages");
+	pi.SetTotal(wspc.GetCount());
+	pi.SetPos(0);
+	for(int i = 0; i < wspc.GetCount(); i++) {
+		pi.Step();
+		String package = wspc[i];
+		String cfg = ConfigFile("cfg");
+		FileIn in(AppendFileName(cfg, ForceExt(Filter(package, NoSlash) + '@' + GetVarsName(), ".cdb")));
+		in.LoadThrowing();
+		if(in) {
+			try {
+				in % s;
+				if(s != s_dbver)
+					throw LoadingError();
+				while(!in.IsEof()) {
+					String fn;
+					in % fn;
+					BrowserFileInfo& f = fileset.GetAdd(fn);
+					in % f.file;
+					in % f.time;
+					f.package = package;
+					String q;
+					in % q;
+					StringStream ss(q);
+					ss.LoadThrowing();
+					while(!ss.IsEof()) {
+						String nest, key, name;
+						ss % nest;
+						ss % key;
+						ss % name;
+						CppNest& n = base.GetAdd(nest);
+						ss % n.namespacel;
+						CppItem& m = n.GetAdd(key, name);
+						ss % m;
+						CppPos& p = m.pos.Add();
+						p.file = GetCppFileIndex(fn);
+						ss % p.line;
+					}
+				}
+			}
+			catch(LoadingError) {
+				BrowserBase().Clear();
+				fileset.Clear();
+				return;
+			}
+		}
+	}
+}
+
+Vector<String> IgnoreList()
+{
+	Vector<String> ignore;
+	FileIn in(CommonPath("dppignore.txt"));
+	while(!in.IsEof()) {
+		String s = in.GetLine();
+		if(!s.IsEmpty())
+			ignore.Add(s);
+	}
+	return ignore;
+}
+
+void FinishBase(const CppWordsHash& w)
+{
+	TimeStop tm;
+	Qualify(BrowserBase(), w);
+}
+
+void ReQualifyBrowserBase()
+{
+	Qualify(BrowserBase(), AllCppWords());
+}
+
+Vector<String> SortedNests()
+{
+	LTIMING("SortedNests()");
+	CppBase& base = BrowserBase();
+	Vector<String> n;
+	for(int i = 0; i < base.GetCount(); i++)
+		if(!base.nest.IsUnlinked(i))
+			n.Add(base.GetKey(i));
+	Sort(n);
+	return n;
+}
+
+CppWordsHash Difference(const Vector<String>& a)
+{
+	TimeStop tm;
+	Vector<String> b = SortedNests();
+	CppWordsHash h;
+	int ai = 0;
+	int bi = 0;
+	while(ai < a.GetCount() && bi < b.GetCount()) {
+		int q = SgnCompare(a[ai], b[bi]);
+		if(q < 0)
+			h.AddWords(a[ai++]);
+		else
+		if(q > 0)
+			h.AddWords(b[bi++]);
+		else {
+			ai++;
+			bi++;
+		}
+	}
+	while(ai < a.GetCount())
+		h.AddWords(a[ai++]);
+	while(bi < b.GetCount())
+		h.AddWords(b[bi++]);
+	QLOG("Difference " << tm);
+	return h;
+}
+
+void UpdateBrowserBase(Progress& pi)
+{
+	Index<String> fp;
+	Vector<String> scan;
+	ArrayMap<String, BrowserFileInfo>& set = FileSet();
+	const Workspace& wspc = GetIdeWorkspace();
+	CppBase& base = BrowserBase();
+	pi.SetText("Assist++ checking packages");
+	pi.SetTotal(wspc.GetCount());
+	pi.SetPos(0);
+	for(int i = 0; i < wspc.GetCount(); i++) {
+		pi.Step();
+		const Package& pk = wspc.GetPackage(i);
+		String n = wspc[i];
+		for(int i = 0; i < pk.file.GetCount(); i++) {
+			String path = SourcePath(n, pk.file[i]);
+			String ext = ToUpper(GetFileExt(path));
+			if(ext == ".C" || ext == ".CPP" || ext == ".CC" || ext == ".CXX" ||
+			   ext == ".H" || ext == ".HPP" || ext == ".HH" || ext == ".HXX" ||
+			   ext == ".LAY") {
+				fp.Add(path);
+				int q = set.Find(path);
+				Time tm = FileGetTime(path);
+				if(q < 0 || set[q].time != tm)
+					scan.Add(path);
+				BrowserFileInfo& bf = set.GetAdd(path);
+				bf.package = n;
+				bf.file = pk.file[i];
+				bf.time = tm;
+			}
+		}
+	}
+
+	Vector<String> remove(scan, 1);
+	Vector<int> rm;
+	for(int i = 0; i < set.GetCount(); i++)
+		if(fp.Find(set.GetKey(i)) < 0) {
+			remove.Add(set.GetKey(i));
+			rm.Add(i);
+		}
+	if(remove.GetCount() == 0)
+		return;
+	set.Remove(rm);
+	Remove(base, remove);
+	if(scan.GetCount()) {
+		pi.SetTotal(scan.GetCount());
+		pi.SetPos(0);
+		pi.AlignText(ALIGN_LEFT);
+		Vector<String> ignore = IgnoreList();
+		for(int i = 0; i < scan.GetCount(); i++) {
+			s_file = scan[i];
+			pi.SetText(s_file);
+			pi.Step();
+			String ext = ToUpper(GetFileExt(s_file));
+			if(ext == ".LAY")
+				ScanLayFile(s_file);
+			else {
+				FileIn fi(s_file);
+				Parse(fi, ignore, base, s_file, callback(BrowserScanError));
+			}
+		}
+	}
+}
+
+void BrowserBaseScan(Stream& s, const String& fn)
+{
+	LTIMING("BrowserBaseScan");
+	TimeStop tm;
+	Vector<String> before = SortedNests();
+	QLOG("Scan1 " << tm);
+	CppBase& base = BrowserBase();
+	QLOG("Scan2 " << tm);
+	Vector<String> remove;
+	remove.Add(fn);
+	Remove(base, remove);
+	QLOG("Scan3 " << tm);
+	Parse(s, IgnoreList(), base, fn, CNULL);
+	QLOG("Scan4 " << tm);
+	FinishBase(Difference(before));
+	QLOG("Scan total " << tm);
+	QLOG("---------");
+}
+
+void BrowserBaseScanLay(const String& fn)
+{
+	LTIMING("BrowserBaseScanLay");
+	Vector<String> before = SortedNests();
+	CppBase& base = BrowserBase();
+	Vector<String> remove;
+	remove.Add(fn);
+	Remove(base, remove);
+	ScanLayFile(fn);
+	FinishBase(Difference(before));
+}
+
+void ClearBrowserBase()
+{
+	BrowserBase().Clear();
+	FileSet().Clear();
+}
+
+void StartBrowserBase()
+{
+	if(BrowserBase().GetCount() == 0) {
+		Progress pi;
+		pi.Title("Assist++");
+		LoadBrowserBase(pi);
+		UpdateBrowserBase(pi);
+		FinishBase(AllCppWords());
+	}
+}
+
+void SyncBrowserBase()
+{
+	if(BrowserBase().GetCount()) {
+		Progress pi;
+		pi.Title("Assist++");
+		UpdateBrowserBase(pi);
+		FinishBase(AllCppWords());
+	}
+}
+
+void RescanBrowserBase()
+{
+	ClearBrowserBase();
+	s_console = true;
+	Progress pi;
+	pi.Title("Assist++");
+	UpdateBrowserBase(pi);
+	FinishBase(AllCppWords());
+	s_console = false;
+}
+
+bool ExistsBrowserItem(const String& item)
+{
+	String nest, key;
+	if(!SplitNestKey(item, nest, key))
+		return false;
+	CppBase& base = BrowserBase();
+	int q = base.Find(nest);
+	return q >= 0 ? base[q].key.Find(key) >= 0 : false;
+}
diff --git a/uppsrc/ide/Browser/Browser.cpp b/uppsrc/ide/Browser/Browser.cpp
new file mode 100644
index 000000000..ab560f61e
--- /dev/null
+++ b/uppsrc/ide/Browser/Browser.cpp
@@ -0,0 +1,468 @@
+#include "Browser.h"
+
+#define IMAGECLASS BrowserImg
+#define IMAGEFILE <ide/Browser/Browser.iml>
+#include <Draw/iml_source.h>
+
+bool MatchItemFile(const CppItem& m, const BrowserQuery& q)
+{
+	if(IsNull(q.package) && IsNull(q.file))
+		return true;
+	for(int i = 0; i < m.pos.GetCount(); i++) {
+		int w = FileSet().Find(m.pos[i].GetFile());
+		if(w >= 0) {
+			const BrowserFileInfo& f = FileSet()[w];
+			if((IsNull(q.package) || q.package == f.package) && (IsNull(q.file) || q.file == f.file))
+				return true;
+		}
+	}
+	return false;
+}
+
+String JoinNestKey(const String& nest, const String& key)
+{
+	String s = nest;
+	if(s != "::")
+		s << "::";
+	s << key;
+	return s;
+}
+
+bool MatchDocumented(const String& nest, const String& key, const String& name, const BrowserQuery& q)
+{
+	int n = GetRefLinks(JoinNestKey(nest, key)).GetCount();
+	return q.notdocumented && q.documented || q.notdocumented && n == 0 || q.documented && n;
+}
+
+bool MatchItem(const String& nest, const CppItem& m, const String& key, const String& name, const BrowserQuery& q, bool all)
+{
+	if(q.a_private && m.access == PRIVATE ||
+	   q.a_protected && m.access == PROTECTED ||
+	   q.a_public && m.access == PUBLIC)
+		if(q.type && m.IsType() ||
+		   q.code && m.IsCode() ||
+		   q.data && m.IsData() ||
+		   q.macro && m.IsMacro())
+			if(all || IsNull(q.name) || name == q.name || nest + "::" + name == q.name)
+				return MatchItemFile(m, q) && MatchDocumented(nest, key, name, q);
+	return false;
+}
+
+bool MatchNestName(const char *nest, const String& name)
+{
+	for(;;) {
+		if(strncmp(nest, name, name.GetLength()) == 0) {
+			int c = nest[name.GetLength()];
+			if(c == '\0' || c == ':')
+				return true;
+		}
+		while(*nest != ':') {
+			if(*nest == '\0')
+				return false;
+			nest++;
+		}
+		while(*nest == ':')
+			nest++;
+	}
+}
+
+bool MatchNest(const char *nest, const CppNest& m, const BrowserQuery& q)
+{
+	if(MatchNestName(nest, q.name))
+		for(int i = 0; i < m.GetCount(); i++)
+			if(MatchItem(nest, m[i], m.key[i], m.name[i], q, true))
+				return true;
+	for(int i = 0; i < m.GetCount(); i++)
+		if(MatchItem(nest, m[i], m.key[i], m.name[i], q, false))
+			return true;
+	return false;
+}
+
+bool Browser::FindSet(const String& knesting, const String& kitem, int nestingsc, int itemsc)
+{
+	if(!IsNull(knesting) && nesting.FindSetCursor(knesting)) {
+		nesting.ScCursor(nestingsc);
+		if(!IsNull(kitem))
+			for(int i = 0; i < item.GetCount(); i++)
+				if(ValueTo<CppItemInfo>(item.Get(i)).key == kitem) {
+					item.SetCursor(i);
+					item.SetSbPos(itemsc);
+					return true;
+				}
+	}
+	return false;
+}
+
+void Browser::Reload()
+{
+	item.active_topics = WhenShowTopic;
+	CppBase& base = BrowserBase();
+	String knesting, kitem;
+	int nestingsc, itemsc;
+	if(nesting.IsCursor()) {
+		knesting = nesting.GetKey();
+		nestingsc = nesting.GetCursorSc();
+		if(item.IsCursor()) {
+			kitem = ValueTo<CppItemInfo>(item.Get(item.GetCursor())).key;
+			itemsc = item.GetSbPos();
+		}
+	}
+	nesting.Clear();
+	item.Clear();
+	for(int i = 0; i < base.GetCount(); i++)
+		if(MatchNest(base.GetKey(i), base[i], query)) {
+			CppNestingInfo f;
+			f.namespacel = base[i].namespacel;
+			f.nesting = base.GetKey(i);
+			nesting.Add(f.nesting, i, RawToValue<CppNestingInfo>(f));
+		}
+	nesting.Sort();
+	if(!IsNull(knesting) && nesting.FindSetCursor(knesting)) {
+		nesting.ScCursor(nestingsc);
+		for(int i = 0; i < item.GetCount(); i++)
+			if(ValueTo<CppItemInfo>(item.Get(i)).key == kitem) {
+				item.SetSbPos(itemsc);
+				break;
+			}
+	}
+}
+
+int ItemCompare(const Value& v1, const Value& v2)
+{
+	const CppItemInfo& a = ValueTo<CppItemInfo>(v1);
+	const CppItemInfo& b = ValueTo<CppItemInfo>(v2);
+/*	int ak = a.kind >= FUNCTION && a.kind <= CLASSFUNCTIONTEMPLATE ? FUNCTION : a.kind;
+	int bk = b.kind >= FUNCTION && b.kind <= CLASSFUNCTIONTEMPLATE ? FUNCTION : b.kind;
+	if(ak != bk)
+	return ak - bk;*/
+	int q = a.inherited - b.inherited;
+	if(q) return q;
+	q = a.fn.Compare(b.fn);
+	return q ? q : a.line - b.line;
+}
+
+void Browser::LoadNest(const String& nest, ArrayMap<String, CppItemInfo>& item, int inherited)
+{
+	int q = BrowserBase().Find(nest);
+	if(q < 0)
+		return;
+	CppNest& m = BrowserBase()[q];
+	bool all = !IsNull(query.name) && MatchNestName(nest, query.name) || inherited;
+	String base;
+	for(int i = 0; i < m.GetCount(); i++) {
+		if(MatchItem(nest, m[i], m.key[i], m.name[i], query, all)) {
+			const CppItem& im = m[i];
+			String k = m.key[i];
+			int q = item.Find(k);
+			if(q >= 0 && im.IsCode())
+				item[q].over = true;
+			CppItemInfo& f = item.Add(k);
+			if(im.IsType())
+				base = im.qptype;
+			f.inherited = inherited;
+			(CppSimpleItem&)f = im;
+			f.name = m.name[i];
+			f.key = k;
+			f.nesting = nest;
+			int cline = 0;
+			String cfn;
+			int hline = 0;
+			String hfn;
+			for(int i = 0; i < im.pos.GetCount(); i++) {
+				const CppPos& p = im.pos[i];
+				String fn = p.GetFile();
+				if(ToUpper(GetFileExt(p.GetFile())) == ".H") {
+					if(p.line > hline) {
+						hline = p.line;
+						hfn = fn;
+					}
+				}
+				else
+					if(p.line > cline) {
+						cline = p.line;
+						cfn = fn;
+					}
+			}
+			if(!IsNull(hfn)) {
+				f.fn = hfn;
+				f.line = hline;
+			}
+			else
+			if(IsNull(f.fn)) {
+				f.fn = cfn;
+				f.line = cline;
+			}
+			if(q >= 0)
+				for(;;) {
+					q = item.FindNext(q);
+					if(q < 0)
+						break;
+					if(im.IsCode())
+						item[q].overed = true;
+				}
+		}
+	}
+	if(show_inherited) {
+		Vector<String> b = Split(base, ';');
+		for(int i = 0; i < b.GetCount(); i++)
+			LoadNest(b[i], item, ++inherited);
+	}
+}
+
+void Browser::EnterNesting()
+{
+	item.Clear();
+	if(nesting.IsCursor()) {
+		ArrayMap<String, CppItemInfo> m;
+		LoadNest(nesting.GetKey(), m, false);
+		for(int i = 0; i < m.GetCount(); i++)
+			item.Add(RawToValue(m[i]));
+		item.Sort(FnValueOrder(ItemCompare));
+	}
+}
+
+void Browser::EnterItem()
+{
+	pos = 0;
+	WhenItem();
+}
+
+void Browser::GotoItem()
+{
+	GotoPos(pos++);
+}
+
+void Browser::ItemClick()
+{
+	if(clickpos)
+		GotoItem();
+}
+
+void Browser::ItemDblClk()
+{
+	GotoItem();
+	WhenItemDblClk();
+}
+
+bool Browser::IsCurrentItem()
+{
+	if(!item.IsCursor())
+		return false;
+	const CppItemInfo& m = ValueTo<CppItemInfo>(item.Get(item.GetCursor()));
+	int q = BrowserBase().Find(m.nesting);
+	if(q < 0)
+		return false;
+	CppNest& n = BrowserBase()[q];
+	q = n.key.Find(m.key);
+	return q >= 0 && q < n.item.GetCount();
+}
+
+CppItem& Browser::CurrentItem()
+{
+	ASSERT(nesting.IsCursor() && item.IsCursor());
+	const CppItemInfo& m = ValueTo<CppItemInfo>(item.Get(item.GetCursor()));
+	CppNest& n = BrowserBase().GetAdd(m.nesting);
+	return n.item[n.key.Find(m.key)];
+}
+
+void Browser::GotoPos(int pos)
+{
+	if(!IsCurrentItem())
+		return;
+	CppItem& m = CurrentItem();
+	CppPos& p = m.pos[pos % m.pos.GetCount()];
+	WhenPos(p.GetFile(), p.line);
+}
+
+String Browser::GetItem(int i)
+{
+	if(i < 0 || i >= item.GetCount())
+		return Null;
+	String s = (String)nesting.GetKey();
+	if(s != "::")
+		s << "::";
+	s << ValueTo<CppItemInfo>(item.Get(i)).key;
+	return s;
+}
+
+CppItemInfo Browser::GetItemInfo(int i)
+{
+	if(i < 0 || i >= item.GetCount())
+		return CppItemInfo();
+	return ValueTo<CppItemInfo>(item.Get(i));
+}
+
+bool SplitNestKey(const String& s, String& nest, String& key)
+{
+	CParser p(s);
+	if(!p.Char2(':', ':'))
+		return false;
+	const char *q = s;
+	for(;;) {
+		q = p.GetPtr();
+		if(p.Char('~') || p.Id("operator"))
+			break;
+		if(p.IsId()) {
+			String h = p.ReadId();
+			if(!p.Char2(':', ':'))
+				break;
+			nest << "::" << h;
+		}
+		else
+			break;
+	}
+	key = q;
+	nest = Nvl(nest, "::");
+	return true;
+}
+
+bool Browser::FindSet(const String& s)
+{
+	String n;
+	String m;
+	if(!SplitNestKey(s, n, m))
+		return false;
+	return FindSet(n, m);
+}
+
+void Browser::ItemMenu(Bar& bar)
+{
+	if(IsCurrentItem()) {
+		if(WhenPos) {
+			CppItem& m = CurrentItem();
+			for(int i = 0; i < m.pos.GetCount(); i++) {
+		    	CppPos& p = m.pos[i];
+		    	bar.Add(String().Cat() << GetFileName(p.GetFile()) << " (" << p.line << ')',
+		    	        IdeFileImage(p.GetFile()),
+		    	        THISBACK1(GotoPos, i));
+			}
+			if(!m.pos.IsEmpty())
+				bar.Separator();
+		}
+		if(WhenShowTopic) {
+			Vector<String> link = GetRefLinks(GetItem());
+			for(int i = 0; i < link.GetCount(); i++)
+				bar.Add(GetTopicTitle(link[i]), BrowserImg::Ref(), THISBACK1(ShowTopic, link[i]));
+			if(link.GetCount())
+				bar.Separator();
+		}
+	}
+	bar.Add("Query..", BrowserImg::Query(), THISBACK(DoDoQuery));
+	bar.Separator();
+	bar.Add(false, AsString(nesting.GetCount()) + " nests, " + AsString(item.GetCount()) + " items", Callback());
+}
+
+void Browser::QueryNest()
+{
+	query.name = nesting.GetKey();
+	querydlg.name <<= query.name;
+	Reload();
+	nesting.GoBegin();
+	item.SetCursor(0);
+}
+
+void Browser::QueryWord(const String& w)
+{
+	StartBrowserBase();
+	query.package.Clear();
+	query.file.Clear();
+	query.name = w;
+	querydlg.Clear();
+	querydlg.name <<= w;
+	Reload();
+	nesting.GoBegin();
+}
+
+void Browser::SetId(const String& id, const Vector<String>& nest)
+{
+	StartBrowserBase();
+	query.package.Clear();
+	query.file.Clear();
+	query.name = id;
+	querydlg.Clear();
+	querydlg.name <<= id;
+	CppBase& base = BrowserBase();
+	nesting.Clear();
+	for(int i = 0; i < nest.GetCount(); i++) {
+		int q = base.Find(nest[i]);
+		if(q >= 0) {
+			CppNestingInfo f;
+			f.namespacel = base[q].namespacel;
+			f.nesting = nest[i];
+			nesting.Add(f.nesting, i, RawToValue<CppNestingInfo>(f));
+		}
+	}
+	nesting.GoBegin();
+}
+
+void Browser::ShowTopic(String w)
+{
+	WhenShowTopic(w);
+}
+
+void Browser::ShowHelp()
+{
+	Vector<String> link = GetRefLinks(GetItem());
+	if(link.GetCount())
+		ShowTopic(link[0]);
+}
+
+void Browser::SerializeWspc(Stream& s)
+{
+	s.Magic();
+	s % query;
+	s % querydlg;
+	String is = GetItem();
+	s % is;
+	if(s.IsLoading())
+		FindSet(is);
+}
+
+void Browser::Serialize(Stream& s)
+{
+	int version = 1;
+	s % version;
+	s % item;
+	if(version >= 1)
+		s % split;
+}
+
+void CppNestingInfoDisplay::Paint(Draw& w, const Rect& r, const Value& q,
+                                  Color _ink, Color paper, dword style) const {
+	w.DrawRect(r, paper);
+	const CppNestingInfo& f = ValueTo<CppNestingInfo>(q);
+	bool focuscursor = (style & (FOCUS|CURSOR)) == (FOCUS|CURSOR) || (style & SELECT);
+	int t = r.top + (r.Height() - Draw::GetStdFontCy()) / 2;
+	w.DrawText(r.left, t, f.nesting, StdFont(), focuscursor ? _ink : Magenta(), f.namespacel);
+	w.DrawText(r.left + GetTextSize(f.nesting, StdFont(), f.namespacel).cx, t, ~f.nesting + f.namespacel,
+	           StdFont(), _ink);
+}
+
+Browser::Browser()
+{
+	nesting.NoHeader().NoGrid();
+	nesting.AddKey();
+	nesting.AddIndex();
+	nesting.AddColumn("").SetDisplay(Single<CppNestingInfoDisplay>());
+	nesting.WhenEnterRow = THISBACK(EnterNesting);
+	nesting.WhenLeftDouble = THISBACK(QueryNest);
+	nesting.NoWantFocus();
+	item.WhenEnterItem = THISBACK(EnterItem);
+	item.WhenLeftClick = THISBACK(ItemClick);
+	item.WhenLeftDouble = THISBACK(ItemDblClk);
+	item.WhenBar = THISBACK(ItemMenu);
+	item.active_topics = false;
+	item.Columns(2);
+	split.SetPos(2000);
+	Add(split.Horz(nesting, item).SizePos());
+	Register(this);
+	Reload();
+	BackPaint();
+	clickpos = true;
+	show_inherited = true;
+}
+
+Browser::~Browser()
+{
+	UnRegister(this);
+}
diff --git a/uppsrc/ide/Browser/Browser.h b/uppsrc/ide/Browser/Browser.h
new file mode 100644
index 000000000..0eb6abc36
--- /dev/null
+++ b/uppsrc/ide/Browser/Browser.h
@@ -0,0 +1,379 @@
+#ifndef _Browser_Browser_h
+#define _Browser_Browser_h
+
+#include <CtrlLib/CtrlLib.h>
+#include <CppBase/CppBase.h>
+#include <ide/Common/Common.h>
+#include <RichEdit/RichEdit.h>
+#include <PdfDraw/PdfDraw.h>
+
+#define LAYOUTFILE <ide/Browser/Browser.lay>
+#include <CtrlCore/lay.h>
+
+#define IMAGECLASS BrowserImg
+#define IMAGEFILE <ide/Browser/Browser.iml>
+#include <Draw/iml_header.h>
+
+enum { WITHBODY = 33 };
+
+inline Font BrowserFont()
+#ifdef PLATFORM_WIN32
+{ return Arial(Ctrl::VertLayoutZoom(11)); }
+#else
+{ return Arial(Ctrl::VertLayoutZoom(9)); }
+#endif
+
+struct CppNestingInfo {
+	String nesting;
+	int    namespacel;
+};
+
+struct CppItemInfo : CppSimpleItem, CppNestingInfo {
+	String key;
+	String name;
+	bool   over;
+	bool   overed;
+	int    inherited;
+	String fn;
+	int    line;
+	int    typei;
+	int    nesti;
+
+	CppItemInfo() { over = overed = virt = false; inherited = line = namespacel = 0; }
+};
+
+enum {
+	ITEM_TEXT,
+	ITEM_NAME,
+	ITEM_CPP_TYPE,
+	ITEM_CPP,
+	ITEM_PNAME,
+	ITEM_TNAME,
+	ITEM_NUMBER,
+	ITEM_SIGN,
+	ITEM_RET,
+	ITEM_TYPE,
+	ITEM_PTYPE = ITEM_TYPE + 10000,
+};
+
+struct ItemTextPart : Moveable<ItemTextPart> {
+	int pos;
+	int len;
+	int type;
+	int ii;
+};
+
+Vector<ItemTextPart> ParseItemNatural(const CppItemInfo& m, const char *natural);
+Vector<ItemTextPart> ParseItemNatural(const CppItemInfo& m);
+
+bool SplitNestKey(const String& s, String& nest, String& key);
+
+struct BrowserFileInfo {
+	Time     time;
+	String   package;
+	String   file;
+
+	BrowserFileInfo() { time = Null; }
+};
+
+ArrayMap<String, BrowserFileInfo>& FileSet();
+
+int GetItemHeight(const CppSimpleItem& m, int cx);
+
+struct BrowserQuery {
+	String name;
+	String package;
+	String file;
+	bool   a_private, a_protected, a_public;
+	bool   code, data, type, macro;
+	bool   documented, notdocumented;
+
+	void Clear();
+	void Serialize(Stream& s);
+
+	BrowserQuery() { Clear(); }
+};
+
+struct QueryDlg : public WithQueryLayout<TopWindow> {
+	typedef QueryDlg CLASSNAME;
+
+	void Serialize(Stream& s);
+	void EnterPackage();
+	void Clear();
+
+	int Perform(BrowserQuery& q);
+
+	QueryDlg();
+};
+
+struct CppItemInfoDisplay : public Display
+{
+	String hkey;
+	int    htopic;
+
+	int DoPaint(Draw& w, const Rect& r, const Value& q,
+		        Color _ink, Color paper, dword style) const;
+	virtual void Paint(Draw& w, const Rect& r, const Value& q,
+		               Color _ink, Color paper, dword style) const;
+	virtual Size GetStdSize(const Value& q) const;
+};
+
+struct CppNestingInfoDisplay : public Display
+{
+	virtual void Paint(Draw& w, const Rect& r, const Value& q,
+		               Color _ink, Color paper, dword style) const;
+};
+
+class ItemList : public ColumnList {
+	CppItemInfoDisplay display;
+
+	friend struct ItemDisplay;
+
+	int    GetTopic(Point p, String& key);
+	String Item(int i);
+
+public:
+	bool active_topics;
+
+	void Clear();
+
+	ItemList();
+};
+
+class Browser : public StaticRect {
+public:
+	void Serialize(Stream& s);
+	void SerializeWspc(Stream& s);
+
+	ArrayCtrl              nesting;
+	ItemList               item;
+	Splitter               split;
+	BrowserQuery           query;
+	QueryDlg               querydlg;
+	Callback2<String, int> WhenPos;
+	int                    pos;
+	Callback               WhenItem;
+	Callback               WhenItemDblClk;
+	Callback1<String>      WhenShowTopic;
+	bool                   clickpos;
+	bool                   show_inherited;
+
+	void     LoadNest(const String& nest, ArrayMap<String, CppItemInfo>& item, int inherited);
+	bool     IsCurrentItem();
+	CppItem& CurrentItem();
+	void     Reload();
+	void     EnterNesting();
+	void     EnterItem();
+	void     ItemClick();
+	void     ItemDblClk();
+	void     GotoItem();
+	void     GotoPos(int n);
+	void     ItemMenu(Bar& bar);
+	void     QueryNest();
+	bool     FindSet(const String& knesting, const String& kitem, int nestingsc = 0, int itemsc = 0);
+	bool     FindSet(const String& item);
+
+	String      GetItem(int i);
+	CppItemInfo GetItemInfo(int i);
+
+	String      GetItem()               { return GetItem(item.GetCursor()); }
+	CppItemInfo GetItemInfo()           { return GetItemInfo(item.GetCursor()); }
+
+	bool     DoQuery();
+	void     DoDoQuery()                { DoQuery(); }
+	void     QueryWord(const String& w);
+	void     SetId(const String& id, const Vector<String>& nest);
+
+	void     ShowTopic(String w);
+	void     ShowHelp();
+
+	typedef Browser CLASSNAME;
+	Browser();
+	~Browser();
+};
+
+Vector<String> IgnoreList();
+CppBase&       BrowserBase();
+void           StartBrowserBase();
+void           BrowserBaseScan(Stream& s, const String& fn);
+void           ClearBrowserBase();
+void           RescanBrowserBase();
+void           SyncBrowserBase();
+void           SaveBrowserBase();
+void           Register(Browser *b);
+void           UnRegister(Browser *b);
+bool           ExistsBrowserItem(const String& item);
+void           ReQualifyBrowserBase();
+
+void           BrowserBaseScanLay(const String& fn);
+void           ScanLayFile(const char *fn);
+
+struct TopicInfo : Moveable<TopicInfo> {
+	Time           time;
+	String         path;
+	String         title;
+	Vector<int>    words;
+};
+
+void            SyncRefs();
+void            SyncTopicFile(const RichText& text, const String& link, const String& path,
+                              const String& title);
+void            SyncTopicFile(const String& link, const String& path);
+String          GetTopicTitle(const String& link);
+
+Vector<String>  GetRefLinks(const String& ref);
+
+int             TopicWordIndex(const String& w);
+
+bool            MatchTopicLink(const String& link, const Vector<int>& query);
+
+#define LAYOUTFILE <ide/Browser/Topic.lay>
+#include <CtrlCore/lay.h>
+
+struct ReferenceDlg : WithReferenceDlgLayout<TopWindow> {
+	void   EnterItem();
+	void   EnterItemOk();
+	void   Set(const String& s);
+	String Get() const            { return ~reference; }
+
+	void   Serialize(Stream& s)   { browser.SerializeWspc(s); SerializePlacement(s); }
+
+	typedef ReferenceDlg CLASSNAME;
+
+	ReferenceDlg();
+};
+
+#define IMAGEFILE <ide/Browser/Topic.iml>
+#define IMAGECLASS TopicImg
+#include <Draw/iml_header.h>
+
+int  CharFilterID(int c);
+
+bool ParseTopicFileName(const String& fn, String& topic, int& lang);
+
+Topic  ReadTopic(const char *text);
+Vector<String> GatherLabels(const RichText& text);
+String WriteTopic(const char *title, const RichText& text);
+
+void LoadTopics(FileList& topic, const String& dir);
+
+TopicLink ParseTopicFilePath(const String& path);
+String    TopicFilePath(const TopicLink& tl);
+
+struct StyleDlg;
+
+class TopicEditor : public IdeDesigner, public Ctrl {
+public:
+	virtual String GetFileName() const;
+	virtual void   Save();
+	virtual void   EditMenu(Bar& menu);
+	virtual Ctrl&  DesignerCtrl()                                   { return *this; }
+	virtual void   SetFocus();
+
+	virtual bool Key(dword key, int);
+
+protected:
+	ToolBar           tool;
+
+	FileList          topic;
+
+	EditString        title;
+	RichEdit          editor;
+
+	StaticRect        right;
+	Splitter          left_right;
+
+	String            grouppath;
+	String            topicpath;
+
+	static String     laststylesheet;
+	static int        lastlang;
+	static bool       allfonts;
+
+	struct FileInfo {
+		Time               time;
+		RichEdit::UndoInfo undo;
+		RichEdit::PosInfo  pos;
+
+		FileInfo() { time = Time(1, 1, 1); }
+	};
+
+	static VectorMap<String, String>  grouptopic;
+	static ArrayMap<String, FileInfo> editstate;
+
+	void   FormatMenu(Bar& bar);
+	void   TableMenu(Bar& bar);
+	void   TopicMenu(Bar& bar);
+	void   MainTool(Bar& bar);
+	void   FileBar(Bar& bar);
+	void   StyleSheetMenu(Bar& bar);
+	void   Exit();
+	void   SetBar();
+
+	String GetCurrentTopicPath();
+
+	void   NewTopic();
+	void   RenameTopic();
+	void   RemoveTopic();
+
+	bool         autosave;
+	ReferenceDlg ref;
+
+	void   ShowTopic(bool b = true);
+	void   HideTopic()                   { ShowTopic(false); }
+
+	void   TopicCursor();
+
+	int    Execute(StyleDlg& d);
+	void   EditStylesheets();
+	void   StoreStylesheet();
+	void   ApplyStylesheet();
+	void   ApplyStylesheetGroup();
+
+	void   Hyperlink(String&, WString&);
+
+	void   Load(const String& path);
+	void   SaveTopic();
+	void   SaveInc();
+	void   Flush();
+
+	void   SyncFonts();
+	void   AllFonts();
+
+	void   Tools(Bar& bar);
+	void   Label(String&);
+	void   CreateQtf(const String& item, const CppItemInfo& m, String& p1, String& p2);
+	void   InsertItem();
+
+	void   FindBrokenRef();
+
+	void   Repair();
+	void   CompressGroup();
+
+public:
+	enum {
+		TIMEID_AUTOSAVE = Ctrl::TIMEID_COUNT,
+	    TIMEID_COUNT
+	};
+
+	static Size TopicPage()                          { return Size(3968, INT_MAX); }
+
+	void   ExportPdf();
+	void   Print();
+
+	typedef TopicEditor CLASSNAME;
+
+	void Open(const String& grouppath);
+	void GoTo(const String& topic, const String& link);
+
+	static int  GetSerial();
+
+	static void SerializeEditPos(Stream& s);
+
+	void Serialize(Stream& s);
+
+	TopicEditor();
+	virtual ~TopicEditor();
+};
+
+#endif
diff --git a/uppsrc/ide/Browser/Browser.iml b/uppsrc/ide/Browser/Browser.iml
new file mode 100644
index 000000000..3bc97e15c
--- /dev/null
+++ b/uppsrc/ide/Browser/Browser.iml
@@ -0,0 +1,57 @@
+PREMULTIPLIED
+IMAGE_ID(data)
+IMAGE_ID(instance_data)
+IMAGE_ID(class_data)
+IMAGE_ID(function)
+IMAGE_ID(instance_function)
+IMAGE_ID(inline_friend)
+IMAGE_ID(destructor)
+IMAGE_ID(constructor)
+IMAGE_ID(class_function)
+IMAGE_ID(template_function)
+IMAGE_ID(mprotected)
+IMAGE_ID(type_enum)
+IMAGE_ID(mprivate)
+IMAGE_ID(impl)
+IMAGE_ID(type_struct)
+IMAGE_ID(template_struct)
+IMAGE_ID(unknown)
+IMAGE_ID(inherited)
+IMAGE_ID(type_def)
+IMAGE_ID(macro)
+IMAGE_ID(All)
+IMAGE_ID(Ref)
+IMAGE_ID(Query)
+
+IMAGE_BEGIN_DATA
+IMAGE_DATA(120,156,237,153,97,150,194,32,12,132,115,4,143,220,163,121,51,118,213,181,82,74,96,146,169,178,197,140,47,79,255,124)
+IMAGE_DATA(211,146,66,136,84,46,114,17,145,148,100,62,37,48,116,62,165,118,4,63,55,207,205,159,243,41,138,129,206,119,166,82)
+IMAGE_DATA(240,147,243,96,204,163,40,6,58,127,189,94,155,17,252,220,60,24,243,232,36,197,192,155,252,7,179,111,13,17,31,166)
+IMAGE_DATA(197,100,249,126,139,219,246,24,205,143,206,223,203,195,255,252,247,62,179,45,254,82,223,80,12,42,173,33,52,145,136,22)
+IMAGE_DATA(147,229,145,165,216,92,204,131,249,209,249,91,61,74,31,137,98,160,43,138,129,206,106,19,17,104,49,85,254,206,2,187)
+IMAGE_DATA(106,147,5,118,246,46,107,224,171,44,56,6,39,123,231,85,54,58,131,247,40,138,129,206,30,177,179,229,247,80,249,221)
+IMAGE_DATA(189,182,200,62,172,59,123,141,69,121,231,245,217,241,239,198,16,157,193,7,20,197,64,103,115,110,193,23,210,134,95,148)
+IMAGE_DATA(239,14,191,157,252,242,199,25,23,243,34,122,88,138,137,227,250,236,248,119,247,176,216,243,47,18,197,192,166,111,40,6)
+IMAGE_DATA(149,19,100,104,34,17,39,209,44,223,61,9,239,120,140,230,71,231,111,245,40,125,36,138,129,46,168,24,44,191,73,120)
+IMAGE_DATA(134,69,79,38,255,160,62,57,151,63,140,220,167,199,174,59,195,75,27,159,154,71,198,182,164,122,48,60,200,170,30,163)
+IMAGE_DATA(249,209,249,59,226,249,151,30,158,249,151,123,120,231,127,205,199,202,89,117,116,103,144,37,125,8,47,124,5,167,248,24)
+IMAGE_DATA(255,119,143,255,212,250,224,223,4,234,1,101,85,221,197,22,59,131,139,53,122,244,119,54,39,219,241,128,216,35,60,152)
+IMAGE_DATA(49,48,57,4,217,170,135,145,221,120,56,217,213,131,96,63,163,55,20,131,209,149,57,248,224,163,51,240,232,61,157,1)
+IMAGE_DATA(227,119,175,193,201,239,113,102,254,193,190,78,190,253,30,231,28,255,127,224,31,30,126,246,196,58,201,219,132,155,200,191)
+IMAGE_DATA(25,84,197,103,248,98,129,155,61,24,126,195,58,60,24,190,202,90,95,205,58,249,38,139,188,154,53,196,60,130,139,1)
+IMAGE_DATA(115,146,185,24,78,96,53,86,28,30,25,155,60,30,12,95,176,155,9,136,120,48,188,194,194,30,12,223,97,187,30,12)
+IMAGE_DATA(15,178,170,71,62,215,208,208,238,1,253,104,57,68,227,64,253,0,230,152,116,15,0,0,0,0,0,0,0,0,0,0)
+IMAGE_END_DATA(544, 16)
+
+IMAGE_BEGIN_DATA
+IMAGE_DATA(120,156,237,151,221,14,131,32,12,133,123,191,93,248,200,60,154,111,198,152,137,6,187,182,244,103,40,70,79,210,197,176)
+IMAGE_DATA(126,167,8,4,16,38,152,0,32,103,24,91,89,136,54,155,152,104,243,60,219,230,101,86,230,219,236,221,249,200,216,71)
+IMAGE_DATA(230,93,187,230,252,235,245,60,9,155,65,180,227,17,62,207,243,28,25,188,8,191,176,107,56,60,34,252,142,117,120,92)
+IMAGE_DATA(115,17,62,26,67,131,222,12,162,11,56,127,21,240,201,181,28,62,153,146,193,135,228,13,62,34,143,124,14,171,239,125)
+IMAGE_DATA(127,3,183,227,29,220,198,59,185,107,171,227,102,64,157,76,150,211,138,58,25,53,167,229,230,143,114,217,54,174,174,38)
+IMAGE_DATA(122,240,193,254,63,227,119,238,248,253,244,163,230,21,117,207,211,160,55,131,184,210,246,141,103,251,175,149,167,101,169,124)
+IMAGE_DATA(43,139,61,60,117,165,232,201,71,251,143,89,252,108,101,165,54,45,107,245,184,154,94,240,6,180,25,112,223,156,212,142)
+IMAGE_DATA(86,6,37,241,129,115,13,190,134,235,237,210,150,74,61,28,92,238,136,190,204,181,150,245,43,191,205,220,53,143,202,85)
+IMAGE_DATA(205,197,65,39,69,196,159,122,185,110,30,9,202,100,85,97,241,192,172,213,3,231,19,60,246,96,175,32,12,187,243,168)
+IMAGE_DATA(163,246,208,176,82,125,129,143,204,165,121,14,189,117,17,255,151,245,23,96,15,211,7,195,21,141,246,0,0,0,0,0)
+IMAGE_END_DATA(320, 7)
diff --git a/uppsrc/ide/Browser/Browser.lay b/uppsrc/ide/Browser/Browser.lay
new file mode 100644
index 000000000..a6fb725a7
--- /dev/null
+++ b/uppsrc/ide/Browser/Browser.lay
@@ -0,0 +1,22 @@
+LAYOUT(QueryLayout, 612, 416)
+	ITEM(Label, dv___0, SetLabel(t_("Name")).LeftPosZ(8, 72).TopPosZ(4, 19))
+	ITEM(WithDropChoice<EditString>, name, LeftPosZ(8, 168).TopPosZ(24, 19))
+	ITEM(LabelBox, dv___2, SetLabel(t_("Access")).LeftPosZ(8, 164).TopPosZ(52, 72))
+	ITEM(Option, a_private, SetLabel(t_("private")).LeftPosZ(20, 56).TopPosZ(68, 16))
+	ITEM(Option, a_protected, SetLabel(t_("protected")).LeftPosZ(20, 64).TopPosZ(84, 16))
+	ITEM(Option, a_public, SetLabel(t_("public")).LeftPosZ(20, 56).TopPosZ(100, 16))
+	ITEM(LabelBox, dv___6, SetLabel(t_("Kind")).LeftPosZ(8, 164).TopPosZ(148, 88))
+	ITEM(Option, type, SetLabel(t_("Type")).LeftPosZ(20, 44).TopPosZ(164, 16))
+	ITEM(Option, code, SetLabel(t_("Code")).LeftPosZ(20, 44).TopPosZ(180, 16))
+	ITEM(Option, data, SetLabel(t_("Data")).LeftPosZ(20, 44).TopPosZ(196, 16))
+	ITEM(Option, macro, SetLabel(t_("Macro")).LeftPosZ(20, 52).TopPosZ(212, 16))
+	ITEM(LabelBox, dv___11, SetLabel(t_("Documentation")).LeftPosZ(8, 164).TopPosZ(260, 60))
+	ITEM(Option, documented, SetLabel(t_("Documented")).LeftPosZ(20, 100).TopPosZ(280, 15))
+	ITEM(Option, notdocumented, SetLabel(t_("Not documented")).LeftPosZ(20, 100).TopPosZ(296, 15))
+	ITEM(FileList, package, LeftPosZ(184, 208).VSizePosZ(8, 44))
+	ITEM(FileList, file, HSizePosZ(400, 8).VSizePosZ(8, 44))
+	ITEM(Button, clear, SetLabel(t_("Clear")).LeftPosZ(12, 64).BottomPosZ(8, 24))
+	ITEM(Button, ok, SetLabel(t_("OK")).RightPosZ(8, 64).BottomPosZ(8, 24))
+	ITEM(Button, cancel, SetLabel(t_("Cancel")).RightPosZ(80, 64).BottomPosZ(8, 24))
+END_LAYOUT
+
diff --git a/uppsrc/ide/Browser/Browser.upp b/uppsrc/ide/Browser/Browser.upp
new file mode 100644
index 000000000..bff127627
--- /dev/null
+++ b/uppsrc/ide/Browser/Browser.upp
@@ -0,0 +1,38 @@
+description "TheIDE - code browser and Topic++";
+
+uses
+	CppBase,
+	ide\Common,
+	PdfDraw,
+	RichEdit;
+
+file
+	Browser.h,
+	Browser readonly separator,
+	Lay.cpp,
+	Base.cpp optimize_speed,
+	ItemList.cpp,
+	Query.cpp,
+	Browser.cpp,
+	Browser.lay,
+	Browser.iml,
+	Topic readonly separator,
+	TopicBase.cpp,
+	Reference.cpp,
+	File.cpp optimize_speed,
+	Topic.cpp,
+	Stylesheet.cpp,
+	Link.cpp,
+	TopicWin.cpp,
+	IdeTopic.cpp,
+	TopicI.icpp,
+	Topic.lay,
+	Topic.iml;
+
+mainconfig
+	"" = "GUI";
+
+RichEdit 
+
+,
+	PdfDraw;
diff --git a/uppsrc/ide/Browser/COPYING b/uppsrc/ide/Browser/COPYING
new file mode 100644
index 000000000..e69de29bb
diff --git a/uppsrc/ide/Browser/COPYING-PLAIN b/uppsrc/ide/Browser/COPYING-PLAIN
new file mode 100644
index 000000000..e69de29bb
diff --git a/uppsrc/ide/Browser/File.cpp b/uppsrc/ide/Browser/File.cpp
new file mode 100644
index 000000000..b6b8cee0c
--- /dev/null
+++ b/uppsrc/ide/Browser/File.cpp
@@ -0,0 +1,97 @@
+#include "Browser.h"
+
+int CharFilterID(int c)
+{
+	return IsAlNum(c) || c == '_' ? c : 0;
+}
+
+bool ParseTopicFileName(const String& fn, String& topic, int& lang)
+{
+	String q = GetFileTitle(fn);
+	int w = q.Find('$');
+	if(w < 0)
+		return false;
+	topic = q.Mid(0, w);
+	lang = LNGFromText(q.Mid(w + 1));
+	return lang;
+}
+
+Topic ReadTopic(const char *text)
+{
+	Topic topic;
+	CParser p(text);
+	try {
+		while(!p.IsEof()) {
+			if(p.Id("TITLE")) {
+				p.PassChar('(');
+				topic.title = p.ReadString();
+				p.PassChar(')');
+			}
+			else
+			if(p.Id("REF")) {
+				p.PassChar('(');
+				p.ReadString();
+				p.PassChar(')');
+			}
+			else
+			if(p.Id("TOPIC_TEXT")) {
+				p.PassChar('(');
+				topic.text << p.ReadString();
+				p.PassChar(')');
+			}
+			else
+			if(p.Id("COMPRESSED")) {
+				StringBuffer b;
+				b.Reserve(1024);
+				while(p.IsInt()) {
+					b.Cat(p.ReadInt());
+					p.PassChar(',');
+				}
+				topic.text = ZDecompress(b, b.GetLength());
+			}
+			else {
+				topic.text << p.GetPtr();
+				break;
+			}
+		}
+	}
+	catch(CParser::Error e) {
+		topic.text = String::GetVoid();
+		topic.title = e;
+	}
+	return topic;
+}
+
+Vector<String> GatherLabels(const RichText& text)
+{
+	Vector<RichValPos> p = text.GetValPos(TopicEditor::TopicPage(), RichText::LABELS);
+	Index<String> ref;
+	for(int i = 0; i < p.GetCount(); i++)
+		if(!IsNull(p[i].data))
+			ref.FindAdd(p[i].data.ToString());
+	return ref.PickKeys();
+}
+
+String WriteTopic(const char *title, const RichText& text)
+{
+	StringBuffer r;
+	r << "TITLE(" << AsCString(title) << ")\r\n";
+	String cpsd = ZCompress(AsQTF(text, CHARSET_UTF8, QTF_BODY|QTF_ALL_STYLES));
+	r << "COMPRESSED\r\n";
+	const char *s = cpsd;
+	const char *e = cpsd.End();
+	int q = 0;
+	while(s < e) {
+		int c = (byte)*s++;
+		if(c >= 100)
+			r.Cat(c / 100 + '0');
+		if(c >= 10)
+			r.Cat(c / 10 % 10 + '0');
+		r.Cat(c % 10 + '0');
+		r.Cat(',');
+		if((++q & 255) == 0)
+			r << "\r\n";
+	}
+	r << "\r\n\r\n";
+	return r;
+}
diff --git a/uppsrc/ide/Browser/IdeTopic.cpp b/uppsrc/ide/Browser/IdeTopic.cpp
new file mode 100644
index 000000000..192f79bbf
--- /dev/null
+++ b/uppsrc/ide/Browser/IdeTopic.cpp
@@ -0,0 +1,382 @@
+#include "Browser.h"
+
+#ifdef _DEBUG
+//#define REPAIR
+#endif
+
+void TopicEditor::Label(String& label)
+{
+	Save();
+	if(ref.browser.item.IsMulti())
+		ref.browser.item.ClearSelection();
+	ref.browser.item.Multi(false);
+	ref.Title("Reference");
+	ref.Set(label);
+	ref.classlist.Hide();
+	if(ref.Execute() != IDOK)
+		return;
+	label = ref.Get();
+}
+
+#ifdef _DEBUG
+void TopicEditor::CompressGroup()
+{
+	Progress pi;
+	pi.SetTotal(topic.GetCount());
+	for(;;) {
+		if(IsNull(topicpath))
+			return;
+		pi.SetText(GetFileTitle(topicpath));
+		pi.SetPos(topic.GetCursor());
+		editor.SetModify();
+		Save();
+		if(!topic.IsCursor())
+			break;
+		int c = topic.GetCursor() + 1;
+		if(c >= topic.GetCount()) {
+			PromptOK("Group finished.");
+			break;
+		}
+		topic.SetCursor(c);
+	}
+}
+#endif
+
+struct FindBrokenRefIterator : RichText::Iterator {
+	int cursor;
+
+	virtual bool operator()(int pos, const RichPara& para)
+	{
+		if(pos >= cursor && para.format.label[0] == ':' && para.format.label[1] == ':') {
+			String nest;
+			String key;
+			if(para.GetLength() && SplitNestKey(para.format.label, nest, key)) {
+				int q = BrowserBase().Find(nest);
+				if(q >= 0 && BrowserBase()[q].key.Find(key) >= 0)
+					return false;
+			}
+			cursor = pos;
+			return true;
+		}
+		return false;
+	}
+};
+
+void TopicEditor::FindBrokenRef()
+{
+	StartBrowserBase();
+	Progress pi;
+	pi.SetTotal(topic.GetCount());
+	for(;;) {
+		if(IsNull(topicpath))
+			return;
+		pi.SetText(GetFileTitle(topicpath));
+		pi.SetPos(topic.GetCursor());
+		FindBrokenRefIterator fi;
+		fi.cursor = editor.GetCursor();
+		if(editor.Get().Iterate(fi)) {
+			editor.Move(fi.cursor);
+			break;
+		}
+		if(!topic.IsCursor())
+			break;
+		int c = topic.GetCursor() + 1;
+		if(c >= topic.GetCount()) {
+			PromptOK("No more broken references.");
+			break;
+		}
+		topic.SetCursor(c);
+		if(!IsNull(topicpath))
+			editor.Move(0);
+	}
+}
+
+void TopicEditor::Tools(Bar& bar)
+{
+	bar.Add("Insert code item..", IdeCommonImg::InsertItem(), THISBACK(InsertItem))
+	   .Key(K_INSERT);
+	bar.Add("Find broken references..", IdeCommonImg::FindBrokenRef(), THISBACK(FindBrokenRef))
+	   .Key(K_CTRL_F3);
+#ifdef REPAIR
+	bar.Separator();
+	bar.Add("Repair!", CtrlImg::Toggle(), THISBACK(Repair)).Key(K_ALT_F5);
+	bar.Separator();
+#endif
+}
+
+void TopicEditor::MainTool(Bar& bar)
+{
+	editor.StyleTool(bar);
+	bar.Gap();
+	editor.FontTools(bar);
+	bar.Gap();
+	editor.InkTool(bar);
+	editor.PaperTool(bar);
+	bar.Gap();
+	editor.LanguageTool(bar);
+	editor.SpellCheckTool(bar);
+	bar.Gap();
+	editor.IndexEntryTool(bar);
+	bar.Break();
+	editor.HyperlinkTool(bar, 300);
+	bar.Gap();
+	editor.ParaTools(bar);
+	bar.Gap();
+	editor.EditTools(bar);
+	bar.Gap();
+	bar.Add("Print", CtrlImg::print(), THISBACK(Print))
+	   .Key(K_CTRL_P);
+	bar.GapRight();
+	bar.Break();
+	editor.LabelTool(bar, 500);
+	bar.Gap();
+	Tools(bar);
+	bar.Gap();
+	editor.TableTools(bar);
+}
+
+String NaturalDeQtf(const char *s) {
+	StringBuffer r;
+	r.Reserve(256);
+	bool cm = false;
+	while(*s) {
+		if(*s == ' ')
+			r.Cat(cm ? ' ' : '_');
+		else {
+			if((byte)*s > ' ' && !IsDigit(*s) && !IsAlpha(*s) && (byte)*s < 128)
+				r.Cat('`');
+			r.Cat(*s);
+			if(*s == ',')
+				cm = true;
+			else
+				cm = false;
+		}
+		s++;
+	}
+	return r;
+}
+
+static int sSplitT(int c) {
+	return c == ';' || c == '<' || c == '>' || c == ',';
+}
+
+String DecoratedItem(const CppItemInfo& m, const char *natural)
+{
+	String qtf = "[%00-00K ";
+	Vector<ItemTextPart> n = ParseItemNatural(m, natural);
+	if(m.virt)
+		qtf << "virtual ";
+	if(m.kind == CLASSFUNCTION || m.kind == CLASSFUNCTIONTEMPLATE)
+		qtf << "static ";
+	Vector<String> qt = Split(m.qptype, sSplitT, false);
+	Vector<String> tt = Split(m.qtype, sSplitT, false);
+	for(int i = 0; i < n.GetCount(); i++) {
+		ItemTextPart& p = n[i];
+		qtf << "[";
+		switch(p.type) {
+		case ITEM_PNAME:
+		case ITEM_NUMBER:
+			qtf << "@r";
+			break;
+		case ITEM_TNAME:
+			qtf << "@g";
+			break;
+		case ITEM_NAME:
+			qtf << "@k";
+			break;
+		case ITEM_CPP_TYPE:
+			qtf << "@B";
+			break;
+		default:
+			int q = p.type - ITEM_PTYPE;
+			if(q >= 0 && q < qt.GetCount())
+				qtf << '^' << qt[q] << '^';
+			q = p.type - ITEM_TYPE;
+			if(q >= 0 && q < tt.GetCount())
+				qtf << '^' << tt[q] << '^';
+			break;
+		}
+		qtf << ' ';
+		qtf << NaturalDeQtf(String(~m.natural + p.pos, p.len));
+		qtf << ']';
+	}
+	return qtf + "]";
+}
+
+static const char styles[] =
+	"[ $$0,0#00000000000000000000000000000000:Default]"
+	"[i448;a25;kKO9;*@(64)2 $$1,0#37138531426314131252341829483370:item]"
+	"[i448;a25;kKO9;*@(64)3 $$2,0#37138531426314131252341829483380:class]"
+	"[l288;2 $$3,0#27521748481378242620020725143825:desc]"
+;
+
+
+void TopicEditor::CreateQtf(const String& item, const CppItemInfo& m, String& p1, String& p2)
+{
+	String qtf = styles;
+	bool str = m.kind == STRUCT || m.kind == STRUCTTEMPLATE;
+/*
+	qtf << "Type: " << DeQtf(m.type) << " - " << DeQtf(m.qtype) << '&';
+	qtf << "PType: " << DeQtf(m.ptype) << " - " << DeQtf(m.qptype) << '&';
+//*/
+	qtf << (str ? "[s2;:" : "[s1;:") << DeQtf(item) << ": ";
+	if(m.IsTemplate()) {
+		int q = 0;
+		int w = 0;
+		while(q < m.natural.GetLength()) {
+			if(m.natural[q] == '<')
+				w++;
+			if(m.natural[q] == '>') {
+				w--;
+				if(w == 0) {
+					q++;
+					break;
+				}
+			}
+			q++;
+		}
+		qtf << DecoratedItem(m, m.natural.Mid(0, q));
+		if(q < m.natural.GetLength()) {
+			while(m.natural[q] == ' ')
+				q++;
+			qtf << '&' << DecoratedItem(m, m.natural.Mid(q));
+		}
+	}
+	else
+		qtf << DecoratedItem(m, m.natural);
+
+	qtf << "&]";
+	p1 = qtf;
+	qtf = styles;
+	qtf << "[s3%EN-US ";
+	String d;
+	Vector<String> t = Split(m.tname, ';');
+	for(int i = 0; i < t.GetCount(); i++) {
+		if(i)
+			d << ' ';
+		d << "[%00-00*@g " << DeQtf(t[i]) << "]";
+	}
+	d.Clear();
+	d = "[%EN-US ";
+	Vector<String> p = Split(m.pname, ';');
+	if(!str)
+		for(int i = 0; i < p.GetCount(); i++) {
+			if(!IsNull(d))
+				d << ' ';
+			d << "[%00-00*@r " << DeQtf(p[i]) << "]";
+		}
+	if(!IsNull(d))
+		qtf << ' ' << d << ' ';
+	qtf << "&]";
+	qtf << "[s0 &]";
+	p2 = qtf;
+	return;
+}
+
+void TopicEditor::InsertItem()
+{
+	if(IsNull(topicpath))
+		return;
+	Save();
+	ref.Title("Insert");
+	if(ref.browser.item.IsCursor())
+		ref.browser.item.SetFocus();
+	ref.browser.item.Multi();
+	ref.classlist.Show();
+	int c = ref.Execute();
+	if(c == IDCANCEL)
+		return;
+	if(c == IDYES) {
+		String qtf = "&{{1 ";
+		for(int i = 0; i < ref.browser.nesting.GetCount(); i++) {
+			const CppNestingInfo& f = ValueTo<CppNestingInfo>(ref.browser.nesting.Get(i, 2));
+			if(i)
+				qtf << ":: ";
+			qtf << DeQtf(f.nesting);
+		}
+		qtf << "}}&";
+		editor.PasteText(ParseQTF(qtf));
+		return;
+	}
+	String p1, p2;
+	if(ref.browser.item.IsSelection()) {
+		for(int i = 0; i < ref.browser.item.GetCount(); i++)
+			if(ref.browser.item.IsSelected(i)) {
+				String a1, a2;
+				CreateQtf(ref.browser.GetItem(i), ref.browser.GetItemInfo(i), a1, a2);
+				p1 << p2 << a1;
+				p2 = a2;
+			}
+	}
+	else
+	if(ref.browser.item.IsCursor())
+		CreateQtf(ref.browser.GetItem(), ref.browser.GetItemInfo(), p1, p2);
+	else
+		return;
+	editor.BeginOp();
+	int a = editor.GetCursor();
+	editor.PasteText(ParseQTF(p1));
+	c = editor.GetCursor();
+	editor.PasteText(ParseQTF(p2));
+	editor.Move(a);
+	editor.Move(c);
+}
+
+String TopicEditor::GetFileName() const
+{
+	return grouppath;
+}
+
+void TopicEditor::Save()
+{
+	SaveTopic();
+	SaveInc();
+}
+
+void TopicEditor::SetFocus()
+{
+	if(editor.IsEnabled())
+		editor.SetFocus();
+	else
+		Ctrl::SetFocus();
+}
+
+#ifdef _DEBUG
+void TopicEditor::Repair()
+{
+	StartBrowserBase();
+	RichText text = editor.CopyText(0, editor.GetLength());
+	RichPara def;
+	for(int i = 0; i < text.GetPartCount(); i++)
+		if(text.IsPara(i)) {
+			RichPara para = text.Get(i);
+			String l = para.format.label;
+			if(l[0] == ':') {
+				String nest, key;
+				if(SplitNestKey(l, nest, key)) {
+					CppBase& base = BrowserBase();
+					int q = base.Find(nest);
+					if(q >= 0) {
+						int w = base[q].key.Find(key);
+						if(w >= 0) {
+							CppItemInfo m;
+							(CppSimpleItem&)m = base[q].item[w];
+							m.name = base[q].name[w];
+							m.key = key;
+							String qtf;
+							if(m.kind != ENUM) {
+								qtf << styles << "[s1 " << DecoratedItem(m, m.natural);
+								RichText txt = ParseQTF(qtf);
+								text.OverrideStyles(txt.GetStyles());
+								text.Set(i, txt.Get(0), txt.GetStyles());
+							}
+						}
+					}
+				}
+			}
+		}
+	editor.Move(0);
+	editor.RemoveText(editor.GetLength());
+	editor.PasteText(text);
+}
+#endif
diff --git a/uppsrc/ide/Browser/ItemList.cpp b/uppsrc/ide/Browser/ItemList.cpp
new file mode 100644
index 000000000..8b4e73765
--- /dev/null
+++ b/uppsrc/ide/Browser/ItemList.cpp
@@ -0,0 +1,325 @@
+#include "Browser.h"
+
+bool IsCppKeyword(const String& id)
+{
+	static Index<String> kw;
+	if(kw.GetCount() == 0) {
+		const char **cppk = CppKeyword();
+		for(int i = 0; cppk[i]; i++)
+			kw.Add(cppk[i]);
+	}
+	return kw.Find(id) >= 0;
+}
+
+bool IsCppType(const String& id)
+{
+	static const char *t[] = {
+		"int", "long", "short", "void", "float", "double", "char", "signed", "unsigned", "bool",
+	    "const", "mutable", "struct", "class", "union", "public", "private", "protected"
+	};
+	static Index<String> kt;
+	if(kt.GetCount() == 0) {
+		for(int i = 0; i < __countof(t); i++)
+			kt.Add(t[i]);
+	}
+	return kt.Find(id) >= 0;
+}
+
+int InScListIndext(const char *s, const char *list)
+{
+	int ii = 0;
+	for(;;) {
+		const char *q = s;
+		while(*list == ' ') list++;
+		for(;;) {
+			if(*q == '\0' && *list == '\0') return ii;
+			if(*q != *list) {
+				if(*q == '\0' && (*list == '<' || *list == ';' || *list == ',' || *list == '>'))
+					return ii;
+				if(*list == '\0') return -1;
+				break;
+			}
+			q++;
+			list++;
+		}
+		while(*list && *list != ';' && *list != '<' && *list != '>' && *list != ',') list++;
+		if(*list == '\0') return -1;
+		list++;
+		ii++;
+	}
+}
+
+Vector<ItemTextPart> ParseItemNatural(const CppItemInfo& m, const char *s)
+{
+	Vector<ItemTextPart> part;
+	bool param = false;
+	while(*s) {
+		ItemTextPart& p = part.Add();
+		p.pos = (int)(s - ~m.natural);
+		p.type = ITEM_TEXT;
+		int n = 1;
+		if(*s >= '0' && *s <= '9') {
+			while(s[n] >= '0' && s[n] <= '9')
+				n++;
+			p.type = ITEM_NUMBER;
+		}
+		else
+		if(iscid(*s) || *s == ':') {
+			if(strncmp(s, m.name, m.name.GetLength()) == 0 && !iscid(s[m.name.GetLength()])) {
+				p.type = ITEM_NAME;
+				n = m.name.GetLength();
+				param = true;
+			}
+			else {
+				String id;
+				n = 0;
+				while(IsAlNum(s[n]) || s[n] == '_' || s[n] == ':')
+					id.Cat(s[n++]);
+				if(IsCppType(id))
+					p.type = ITEM_CPP_TYPE;
+				else
+				if(IsCppKeyword(id))
+					p.type = ITEM_CPP;
+				else
+				if(InScList(id, m.pname))
+					p.type = ITEM_PNAME;
+				else
+				if(InScList(id, m.tname))
+					p.type = ITEM_TNAME;
+				if(param) {
+					int ii = InScListIndext(id, m.ptype);
+					if(ii >= 0)
+						p.type = ITEM_PTYPE + ii;
+				}
+				else {
+					int ii = InScListIndext(id, m.type);
+					if(ii >= 0)
+						p.type = ITEM_TYPE + ii;
+				}
+			}
+		}
+		else {
+			p.type = ITEM_SIGN;
+			while(s[n] && !iscid(s[n]))
+				n++;
+		}
+		p.len = n;
+		s += n;
+	}
+	return part;
+}
+
+Vector<ItemTextPart> ParseItemNatural(const CppItemInfo& m)
+{
+	return ParseItemNatural(m, ~m.natural + m.at);
+}
+
+int CppItemInfoDisplay::DoPaint(Draw& w, const Rect& r, const Value& q,
+	                            Color _ink, Color paper, dword style) const
+{
+	const CppItemInfo& m = ValueTo<CppItemInfo>(q);
+	w.DrawRect(r, paper);
+	bool focuscursor = (style & (FOCUS|CURSOR)) == (FOCUS|CURSOR) || (style & SELECT);
+	if(IsNull(q)) return 0;
+	int x = r.left;
+	if(m.access == PROTECTED)
+		w.DrawImage(x, r.top + 1, BrowserImg::mprotected());
+	else
+	if(m.access == PRIVATE)
+		w.DrawImage(x, r.top + 1, BrowserImg::mprivate());
+	else
+	if(m.access == WITHBODY)
+		w.DrawImage(x, r.top + 1, BrowserImg::impl());
+	x += 6;
+	Image img = BrowserImg::unknown();
+	Image bk;
+	switch(m.kind) {
+	case FUNCTIONTEMPLATE:
+		bk = BrowserImg::template_function();
+	case FUNCTION:
+		img = BrowserImg::function();
+		break;
+	case INSTANCEFUNCTIONTEMPLATE:
+		bk = BrowserImg::template_function();
+	case INSTANCEFUNCTION:
+		img = BrowserImg::instance_function();
+		break;
+	case CLASSFUNCTIONTEMPLATE:
+		bk = BrowserImg::template_function();
+	case CLASSFUNCTION:
+		img = BrowserImg::class_function();
+		break;
+	case STRUCTTEMPLATE:
+		bk = BrowserImg::template_struct();
+	case STRUCT:
+		img = BrowserImg::type_struct();
+		break;
+	case INSTANCEVARIABLE:
+		img = BrowserImg::instance_data();
+		break;
+	case CLASSVARIABLE:
+		img = BrowserImg::class_data();
+		break;
+	case VARIABLE:
+		img = BrowserImg::data();
+		break;
+	case ENUM:
+		img = BrowserImg::type_enum();
+		break;
+	case INLINEFRIEND:
+		img = BrowserImg::inline_friend();
+		break;
+	case TYPEDEF:
+		img = BrowserImg::type_def();
+		break;
+	case CONSTRUCTOR:
+		img = BrowserImg::constructor();
+		break;
+	case DESTRUCTOR:
+		img = BrowserImg::destructor();
+		break;
+	case MACRO:
+		img = BrowserImg::macro();
+		break;
+	}
+
+	int ry = (r.top + r.bottom) / 2;
+	int by = ry - bk.GetSize().cy / 2;
+	int iy = ry - img.GetSize().cy / 2;
+
+	if(focuscursor) {
+		DrawHighlightImage(w, x, by, bk);
+		w.DrawImage(x, iy, img);
+	}
+	else {
+		w.DrawImage(x, by, bk);
+		w.DrawImage(x, iy, img);
+	}
+	if(m.inherited) {
+		w.DrawImage(x + 10, r.top, BrowserImg::inherited());
+		for(int i = 1; i < min(m.inherited, 5); i++)
+			w.DrawRect(x + 10, r.top + 7 + 2 * i, 7, 1, SColorText);
+	}
+	x += 20;
+	int y = r.top;
+	int x0 = x;
+	Vector<ItemTextPart> n = ParseItemNatural(m);
+	for(int i = 0; i < n.GetCount(); i++) {
+		ItemTextPart& p = n[i];
+		Font f = BrowserFont();
+		Color ink = SColorText;
+		switch(p.type) {
+		case ITEM_PNAME:
+			f.Bold();
+		case ITEM_NUMBER:
+			ink = Red;
+			break;
+		case ITEM_TNAME:
+			ink = Green;
+		case ITEM_NAME:
+			f.Bold();
+			break;
+		case ITEM_CPP_TYPE:
+		case ITEM_CPP:
+			ink = LtBlue;
+			break;
+		case ITEM_SIGN:
+			ink = Magenta;
+			break;
+		}
+		if(m.overed)
+			f.Italic();
+		Size fsz = GetTextSize(~m.natural + p.pos, f, p.len);
+		w.DrawText(x, y, ~m.natural + p.pos, f, focuscursor ? _ink : ink, p.len);
+		x += fsz.cx;
+	}
+	if(m.virt || m.over)
+		w.DrawRect(x0, r.bottom - 2, x - x0, 1, m.over ? m.virt ? LtRed : LtBlue : SColorText);
+	if(m.inherited && m.IsType())
+		w.DrawRect(r.left, r.top, r.Width(), 1, SColorDisabled);
+
+	String k = m.nesting;
+	if(k != "::")
+		k << "::";
+	k << m.key;
+	int cnt = GetRefLinks(k).GetCount();
+	if(cnt) {
+		Size sz = BrowserImg::Ref().GetSize();
+		int xx = r.right - sz.cx - 1;
+		int yy = r.top + (r.Height() - sz.cy) / 2;
+		DrawHighlightImage(w, xx, yy, BrowserImg::Ref());
+		if(cnt > 1) {
+			String txt = AsString(cnt);
+			Font fnt = Arial(10).Bold();
+			Size tsz = GetTextSize(txt, fnt);
+			Point p(xx + (sz.cx - tsz.cx) / 2, yy + (sz.cy - tsz.cy) / 2);
+			for(int ax = -1; ax <= 1; ax++)
+				for(int ay = -1; ay <= 1; ay++)
+					w.DrawText(p.x + ax, p.y + ay, txt, fnt, White);
+			w.DrawText(p.x, p.y, txt, fnt, Blue);
+		}
+		x += sz.cx + 3;
+	}
+
+	return x;
+}
+
+void CppItemInfoDisplay::Paint(Draw& w, const Rect& r, const Value& q,
+                                  Color _ink, Color paper, dword style) const {
+	DoPaint(w, r, q, _ink, paper, style);
+}
+
+Size CppItemInfoDisplay::GetStdSize(const Value& q) const
+{
+	NilDraw w;
+	return Size(DoPaint(w, Rect(0, 0, INT_MAX, INT_MAX), q, Null, Null, 0),
+	            max(16, BrowserFont().Info().GetHeight()));
+}
+
+String ItemList::Item(int i)
+{
+	const CppItemInfo& m = ValueTo<CppItemInfo>(Get(i));
+	String k = m.nesting;
+	if(k != "::")
+		k << "::";
+	k << m.key;
+	return k;
+}
+
+int ItemList::GetTopic(Point p, String& key)
+{
+	if(!active_topics)
+		return -1;
+	int i = GetItem(p);
+	if(i < 0)
+		return -1;
+	String m = Item(i);
+	int c = GetRefLinks(m).GetCount();
+	Size sz = BrowserImg::Ref().GetSize();
+	Rect r = GetItemRect(i);
+	p.y -= r.top + (r.Height() - sz.cy) / 2;
+	if(p.y >= 0 && p.y <  sz.cy) {
+		i = (r.right - 1 - p.x) / sz.cx;
+		if(i >= 0 && i < c) {
+			key = m;
+			return i;
+		}
+	}
+	return -1;
+}
+
+void ItemList::Clear()
+{
+	display.htopic = -1;
+	ColumnList::Clear();
+}
+
+ItemList::ItemList()
+{
+	display.htopic = -1;
+	SetDisplay(display);
+	ItemHeight(BrowserFont().Info().GetHeight() + 3);
+	NoRoundSize();
+	NoWantFocus();
+	active_topics = false;
+}
diff --git a/uppsrc/ide/Browser/Lay.cpp b/uppsrc/ide/Browser/Lay.cpp
new file mode 100644
index 000000000..535426626
--- /dev/null
+++ b/uppsrc/ide/Browser/Lay.cpp
@@ -0,0 +1,69 @@
+#include "Browser.h"
+
+#define LTIMING(x) // RTIMING(x)
+#define LDUMP(x)   // DUMP(x)
+
+void LaySkipRest(CParser& p)
+{
+	int lvl = 1;
+	while(!p.IsEof()) {
+		if(p.Char('('))
+			lvl++;
+		else
+		if(p.Char(')')) {
+			if(--lvl == 0)
+				break;
+		}
+		else
+			p.SkipTerm();
+	}
+}
+
+void ScanLayFile(const char *fn)
+{
+	LTIMING("Lay file");
+	String s = LoadFile(fn);
+	CParser p(s);
+	String r;
+	try {
+		if(p.Char('#') && p.Id("ifdef")) {
+			if(!p.Id("LAYOUTFILE"))
+				p.Id("LAYOUT");
+		}
+		while(!p.IsEof()) {
+			p.PassId("LAYOUT");
+			p.PassChar('(');
+			r << "template <class T> struct With" << p.ReadId() << " : public T {\n"
+			  << "\tstatic Size GetLayoutSize();\n";
+			LaySkipRest(p);
+			for(;;) {
+				if(p.Id("ITEM")) {
+					p.PassChar('(');
+					if(p.IsId()) {
+						String type = p.ReadIdt();
+						if(strncmp(type, "dv___", 5)) {
+							r << '\t' << type;
+							p.PassChar(',');
+							r << ' ' << p.ReadId() << ";\n";
+						}
+					}
+				}
+				else
+				if(p.Id("UNTYPED"))
+					p.Char('(');
+				else
+					break;
+				LaySkipRest(p);
+			}
+			p.PassId("END_LAYOUT");
+			if(p.Char('#'))
+				p.Id("endif");
+			r << "};\n\n";
+		}
+	}
+	catch(CParser::Error) {}
+	LDUMP(r);
+	StringStream ss(r);
+	CppBase& base = BrowserBase();
+	Parse(ss, IgnoreList(), base, fn, CNULL);
+}
diff --git a/uppsrc/ide/Browser/Link.cpp b/uppsrc/ide/Browser/Link.cpp
new file mode 100644
index 000000000..5f554084b
--- /dev/null
+++ b/uppsrc/ide/Browser/Link.cpp
@@ -0,0 +1,120 @@
+#include "Browser.h"
+
+struct TopicLinkDlg : WithTopicLinkLayout<TopWindow> {
+	void   Package();
+	void   Group();
+	void   Topic();
+	void   Label();
+	String LinkString();
+	String ActualDir();
+	String PackageGroup(const char *name);
+
+	typedef TopicLinkDlg CLASSNAME;
+	TopicLinkDlg();
+};
+
+TopicLinkDlg::TopicLinkDlg()
+{
+	CtrlLayoutOKCancel(*this, "Hyperlink");
+	package.WhenKillCursor = package.WhenEnterItem = THISBACK(Package);
+	group.WhenKillCursor = group.WhenEnterItem = THISBACK(Group);
+	topic.WhenKillCursor = topic.WhenEnterItem = THISBACK(Topic);
+	label.WhenKillCursor = label.WhenEnterItem = THISBACK(Label);
+	const Workspace& wspc = GetIdeWorkspace();
+	for(int i = 0; i < wspc.GetCount(); i++)
+		package.Add(wspc[i]);
+	insert <<= Breaker(IDYES);
+}
+
+String TopicLinkDlg::PackageGroup(const char *name)
+{
+	return AppendFileName(PackageDirectory(package.GetCurrentName()), String(name) + ".tpp");
+}
+
+void TopicLinkDlg::Package()
+{
+	String pg = group.GetCurrentName();
+	group.Clear();
+	if(!package.IsCursor())
+		return;
+	FindFile ff(PackageGroup("*"));
+	while(ff) {
+		if(ff.IsFolder())
+			group.Add(GetFileTitle(ff.GetName()), TopicImg::Group());
+		ff.Next();
+	}
+	topic.Clear();
+	group.FindSetCursor(pg);
+}
+
+void TopicLinkDlg::Group()
+{
+	topic.Clear();
+	if(package.IsCursor() && group.IsCursor())
+		LoadTopics(topic, PackageGroup(group.GetCurrentName()));
+}
+
+String TopicLinkDlg::LinkString()
+{
+	return "topic://" + (String)package.GetCurrentName() + '/' + (String)group.GetCurrentName()
+	       + '/' + (String)topic.GetCurrentName();
+}
+
+void TopicLinkDlg::Topic()
+{
+	if(package.IsCursor() && group.IsCursor() && topic.IsCursor()) {
+		link <<= LinkString();
+		RichText txt = ParseQTF(ReadTopic(LoadFile(
+						NormalizePath(
+							AppendFileName(PackageGroup(group.GetCurrentName()),
+		        			               topic.GetCurrentName() + ".tpp")
+		               ))).text);
+		Vector<String> ref = GatherLabels(txt);
+		label.Clear();
+		for(int i = 0; i < ref.GetCount(); i++)
+			label.Add(ref[i]);
+	}
+}
+
+void TopicLinkDlg::Label()
+{
+	if(package.IsCursor() && group.IsCursor() && topic.IsCursor() && label.IsCursor())
+		link <<= LinkString() + '#' + label.GetCurrentName();
+}
+
+void TopicEditor::Hyperlink(String& link, WString& text)
+{
+	TopicLinkDlg d;
+	d.link <<= link;
+	String label;
+	TopicLink tl;
+	int q = link.ReverseFind('#');
+	if(q >= 0) {
+		label = link.Mid(q + 1);
+		tl = ParseTopicLink(link.Mid(0, q));
+	}
+	else
+		tl = ParseTopicLink(link);
+	if(IsNull(tl.topic)) {
+		d.package.FindSetCursor(GetFileTitle(GetFileFolder(grouppath))) &&
+		d.group.FindSetCursor(GetFileTitle(grouppath)) &&
+		d.topic.FindSetCursor(topic.GetCurrentName());
+	}
+	else {
+		d.package.FindSetCursor(tl.package) &&
+		d.group.FindSetCursor(tl.group) &&
+		d.topic.FindSetCursor(tl.topic) &&
+		d.label.FindSetCursor(label);
+	}
+	int c = d.Run();
+	if(c == IDCANCEL)
+		return;
+	link = ~d.link;
+	if(c == IDOK)
+		return;
+	if(d.topic.IsCursor()) {
+		String fn = AppendFileName(d.PackageGroup(d.group.GetCurrentName()),
+		                           d.topic.GetCurrentName() + ".tpp");
+		text = ReadTopic(LoadFile(fn)).title.ToWString();
+	}
+}
diff --git a/uppsrc/ide/Browser/Query.cpp b/uppsrc/ide/Browser/Query.cpp
new file mode 100644
index 000000000..cb5f6ea84
--- /dev/null
+++ b/uppsrc/ide/Browser/Query.cpp
@@ -0,0 +1,108 @@
+#include "Browser.h"
+
+void BrowserQuery::Clear()
+{
+	name.Clear();
+	package.Clear();
+	file.Clear();
+	a_private = a_protected = a_public = true;
+	code = data = type = macro = true;
+	documented = notdocumented = true;
+}
+
+void BrowserQuery::Serialize(Stream& s)
+{
+	s % name % package % file;
+	s % a_private % a_protected % a_public;
+	s % code % data % type % macro;
+	s % documented % notdocumented;
+}
+
+void QueryDlg::Clear()
+{
+	name <<= Null;
+	package.SetCursor(0);
+}
+
+void QueryDlg::EnterPackage()
+{
+	file.Clear();
+	int q = package.GetCursor();
+	file.Enable(q);
+	if(q) {
+		file.Add("<all>", BrowserImg::All(), StdFont().Bold(), SColorDisabled);
+		const Package& p = GetIdeWorkspace().GetPackage(q - 1);
+		for(int i = 0; i < p.GetCount(); i++)
+			file.Add(p[i], IdeFileImage(p[i]));
+		file.SetCursor(0);
+	}
+}
+
+QueryDlg::QueryDlg()
+{
+	CtrlLayoutOKCancel(*this, "Browser++ query");
+	ActiveFocus(name);
+	package.WhenEnterItem = THISBACK(EnterPackage);
+	clear <<= THISBACK(Clear);
+	Sizeable().Zoomable();
+}
+
+int QueryDlg::Perform(BrowserQuery& q)
+{
+	const Workspace& wspc = GetIdeWorkspace();
+	package.Clear();
+	package.Add("<all>", BrowserImg::All(), StdFont().Bold(), SColorDisabled);
+	for(int i = 0; i < wspc.GetCount(); i++)
+		package.Add(wspc[i], IdeCommonImg::Package());
+	name <<= q.name;
+	if(package.FindSetCursor(q.package)) {
+		if(!file.FindSetCursor(q.file))
+			file.SetCursor(0);
+	}
+	else
+		package.SetCursor(0);
+	code = q.code;
+	data = q.data;
+	type = q.type;
+	macro = q.macro;
+	a_protected = q.a_protected;
+	a_private = q.a_private;
+	a_public = q.a_public;
+	documented = q.documented;
+	notdocumented = q.notdocumented;
+	if(Execute() != IDOK)
+		return false;
+	q.name = ~name;
+	q.code = code;
+	q.data = data;
+	q.type = type;
+	q.macro = macro;
+	q.a_protected = a_protected;
+	q.a_private = a_private;
+	q.a_public = a_public;
+	q.documented = documented;
+	q.notdocumented = notdocumented;
+	name.AddHistory();
+	q.file = file.GetCursor() > 0 ? file.GetCurrentName() : String();
+	q.package = package.GetCursor() > 0 ? package.GetCurrentName() : String();
+	return true;
+}
+
+void QueryDlg::Serialize(Stream& s)
+{
+	name.SerializeList(s);
+	s % name;
+	s % package % file;
+	SerializePlacement(s);
+}
+
+bool Browser::DoQuery()
+{
+	if(querydlg.Perform(query) != IDOK)
+		return false;
+	if(BrowserBase().GetCount() == 0)
+		StartBrowserBase();
+	Reload();
+	nesting.GoBegin();
+	return true;
+}
diff --git a/uppsrc/ide/Browser/Reference.cpp b/uppsrc/ide/Browser/Reference.cpp
new file mode 100644
index 000000000..af2e61494
--- /dev/null
+++ b/uppsrc/ide/Browser/Reference.cpp
@@ -0,0 +1,37 @@
+#include "Browser.h"
+
+void ReferenceDlg::EnterItem()
+{
+	String s = browser.GetItem();
+	if(!IsNull(s))
+		reference <<= s;
+}
+
+void ReferenceDlg::EnterItemOk()
+{
+	EnterItem();
+	Break(IDOK);
+}
+
+void ReferenceDlg::Set(const String& s)
+{
+	StartBrowserBase();
+	if(ExistsBrowserItem(s)) {
+		browser.query.Clear();
+		browser.Reload();
+		browser.FindSet(s);
+	}
+	reference <<= s;
+}
+
+ReferenceDlg::ReferenceDlg()
+{
+	CtrlLayoutOKCancel(*this, "Reference");
+	browser.WhenItem = THISBACK(EnterItem);
+	browser.WhenItemDblClk = THISBACK(EnterItemOk);
+	browser.show_inherited = false;
+	query <<= callback(&browser, &Browser::DoDoQuery);
+	Sizeable().Zoomable();
+	Icon(TopicImg::Topic());
+	Breaker(classlist, IDYES);
+}
diff --git a/uppsrc/ide/Browser/Stylesheet.cpp b/uppsrc/ide/Browser/Stylesheet.cpp
new file mode 100644
index 000000000..5a72f228c
--- /dev/null
+++ b/uppsrc/ide/Browser/Stylesheet.cpp
@@ -0,0 +1,149 @@
+#include "Browser.h"
+
+struct StyleDlg : public WithStylesheetLayout<TopWindow> {
+	virtual bool Accept();
+
+	EditString editname;
+
+	void Edit();
+	void Load();
+	void Save();
+	String CommonFile(const char *s)      { return AppendFileName(GetCommonDir(), s); }
+
+	typedef StyleDlg CLASSNAME;
+
+	StyleDlg();
+};
+
+void StyleDlg::Edit()
+{
+	if(!style.IsCursor())
+		return;
+	RichEdit e;
+	e.SetQTF((String)style.Get(1));
+	e.Styles();
+	style.Set(1, StylesAsQTF(e.Get()));
+}
+
+void StyleDlg::Load()
+{
+	style.Clear();
+	FindFile ff(CommonFile("*.style"));
+	while(ff) {
+		style.Add(GetFileTitle(ff.GetName()), LoadFile(CommonFile(ff.GetName())));
+		ff.Next();
+	}
+	style.Sort();
+	style.GoBegin();
+}
+
+bool StyleDlg::Accept()
+{
+	if(!TopWindow::Accept())
+		return false;
+	Index<String> nm;
+	for(int i = 0; i < style.GetCount(); i++) {
+		String n = style.Get(i, 0);
+		if(nm.Find(n) >= 0) {
+			Exclamation("Duplicate style [* " + DeQtf(n) + "] !");
+			return false;
+		}
+	}
+	return true;
+}
+
+void StyleDlg::Save()
+{
+	Index<String> saved;
+	for(int i = 0; i < style.GetCount(); i++) {
+		String fn = CommonFile((String)style.Get(i, 0) + ".style");
+		saved.Add(fn);
+		String st = style.Get(i, 1);
+		if(LoadFile(fn) != st)
+			SaveFile(fn, st);
+	}
+	FindFile ff(CommonFile("*.style"));
+	while(ff) {
+		String fn = CommonFile(ff.GetName());
+		if(saved.Find(fn) < 0)
+			DeleteFile(fn);
+		ff.Next();
+	}
+}
+
+StyleDlg::StyleDlg()
+{
+	CtrlLayoutOKCancel(*this, "Stylesheets");
+	edit <<= THISBACK(Edit);
+	style.NoHeader();
+	style.AddColumn().Edit(editname);
+	style.AddIndex().InsertValue("[%EN-US3 $$0,0#00000000000000000000000000000000:Default]");
+	style.Inserting().Removing().Duplicating().NoAppendLine();
+	editname.NotNull();
+	editname.MaxLen(30);
+	editname.SetFilter(CharFilterID);
+}
+
+int TopicEditor::Execute(StyleDlg& d)
+{
+	d.Load();
+	d.style.FindSetCursor(laststylesheet);
+	if(!d.style.IsCursor())
+		d.style.GoBegin();
+	return d.Run();
+}
+
+void TopicEditor::EditStylesheets()
+{
+	StyleDlg d;
+	if(Execute(d) == IDOK) {
+		d.Save();
+		if(d.style.IsCursor())
+			laststylesheet = d.style.GetKey();
+	}
+}
+
+void TopicEditor::StoreStylesheet()
+{
+	StyleDlg d;
+	d.Title("Store as stylesheet");
+	d.edit.Hide();
+	if(Execute(d) == IDOK) {
+		if(d.style.IsCursor()) {
+			d.style.Set(1, AsQTF(editor.Get(), CHARSET_UTF8, QTF_ALL_STYLES));
+			laststylesheet = d.style.GetKey();
+		}
+		d.Save();
+	}
+}
+
+void TopicEditor::ApplyStylesheet()
+{
+	if(!topic.IsCursor())
+		return;
+	StyleDlg d;
+	d.Title("Apply stylesheet to current topic");
+	d.edit.Hide();
+	if(Execute(d) != IDOK)
+		return;
+	d.Save();
+	editor.ApplyStylesheet(ParseQTF((String)d.style.Get(1)));
+}
+
+void TopicEditor::ApplyStylesheetGroup()
+{
+	StyleDlg d;
+	d.Title("Apply stylesheet to current group");
+	d.edit.Hide();
+	if(Execute(d) != IDOK)
+		return;
+	d.Save();
+	RichText ss = ParseQTF((String)d.style.Get(1));
+	int c = topic.GetCursor();
+	Progress pi("Applying stylesheet");
+	for(int i = 0; i < topic.GetCount(); i++) {
+		topic.SetCursor(i);
+		editor.ApplyStylesheet(ss);
+	}
+	topic.SetCursor(c);
+}
diff --git a/uppsrc/ide/Browser/Topic.cpp b/uppsrc/ide/Browser/Topic.cpp
new file mode 100644
index 000000000..3b57c0ed5
--- /dev/null
+++ b/uppsrc/ide/Browser/Topic.cpp
@@ -0,0 +1,212 @@
+#include "Browser.h"
+
+ArrayMap<String, TopicEditor::FileInfo> TopicEditor::editstate;
+VectorMap<String, String>               TopicEditor::grouptopic;
+
+String     TopicEditor::laststylesheet;
+int        TopicEditor::lastlang;
+bool       TopicEditor::allfonts;
+
+struct ListOrder : FileList::Order {
+public:
+	virtual bool operator()(const FileList::File& a, const FileList::File& b) const {
+		return ToUpper(a.name) < ToUpper(b.name);
+	}
+};
+
+void LoadTopics(FileList& topic, const String& grouppath)
+{
+	topic.Clear();
+	FindFile ff(AppendFileName(grouppath, "*.tpp"));
+	while(ff) {
+		if(ff.IsFile())
+			topic.Add(GetFileTitle(ff.GetName()), TopicImg::Topic());
+		ff.Next();
+	}
+	topic.Sort(ListOrder());
+	topic.Enable();
+}
+
+void TopicEditor::Open(const String& _grouppath)
+{
+	grouppath = _grouppath;
+	if(FileExists(grouppath))
+		DeleteFile(grouppath);
+	DirectoryCreate(grouppath);
+	LoadTopics(topic, grouppath);
+	int q = grouptopic.Find(grouppath);
+	if(q >= 0)
+		topic.FindSetCursor(grouptopic[q]);
+	else
+		topic.SetCursor(0);
+}
+
+void TopicEditor::GoTo(const String& _topic, const String& link)
+{
+	if(topic.FindSetCursor(_topic) && !IsNull(link))
+		editor.GotoLabel(link);
+}
+
+String TopicEditor::GetCurrentTopicPath()
+{
+	if(topic.IsCursor())
+		return NormalizePath(AppendFileName(grouppath, topic.GetCurrentName() + ".tpp"));
+	else
+		return Null;
+}
+
+void TopicEditor::ShowTopic(bool b)
+{
+	title.Enable(b);
+	title.Show(b);
+	editor.Enable(b);
+	editor.Show(b);
+}
+
+void TopicEditor::TopicCursor()
+{
+	HideTopic();
+	if(!topic.IsCursor())
+		return;
+	String h = GetCurrentTopicPath();
+	if(h != topicpath)
+		Load(h);
+	else
+		ShowTopic();
+}
+
+void TopicEditor::Load(const String& fn)
+{
+	Flush();
+
+	Topic t = ReadTopic(LoadFile(fn));
+	if(t.text.IsVoid()) {
+		Exclamation("Error loading the topic file:&[* " + DeQtf(fn));
+		topic.KillCursor();
+		return;
+	}
+
+	title <<= t.title;
+	editor <<= t.text;
+	topicpath = fn;
+
+	int q = editstate.Find(fn);
+	if(q >= 0) {
+		FileInfo& fi = editstate[q];
+		if(fi.time == FileGetTime(fn)) {
+			editor.SetPickUndoInfo(fi.undo);
+			fi.time = Time(1, 1, 1);
+		}
+		editor.SetPosInfo(fi.pos);
+	}
+
+	grouptopic.GetAdd(grouppath) = GetFileTitle(fn);
+
+	ShowTopic();
+
+	editor.SetFocus();
+	editor.ClearModify();
+	title.ClearModify();
+}
+
+int sSerial = 0;
+
+int TopicEditor::GetSerial()
+{
+	return sSerial;
+}
+
+void TopicEditor::SaveTopic()
+{
+	if(IsNull(topicpath))
+		return;
+	if(IsNull(~title)) {
+		const RichText& txt = editor.Get();
+		if(txt.IsPara(0)) {
+			RichPara para = txt.Get(0);
+			WString t;
+			for(int i = 0; i < para.GetCount(); i++)
+				if(para[i].IsText())
+					for(const wchar *s = para[i].text; *s; s++)
+						if(*s == '\t' || *s == 160)
+							t.Cat(' ');
+						else
+						if(*s >= ' ')
+							t.Cat(*s);
+			if(!IsNull(t))
+				title <<= t;
+		}
+	}
+	if(!editor.IsModified() && !title.IsModified())
+		return;
+	String r = WriteTopic((String)~title, editor.Get());
+	if(LoadFile(topicpath) != r) {
+		sSerial++;
+		SaveFile(topicpath, r);
+		TopicLink tl = ParseTopicFilePath(topicpath);
+		if(tl)
+			SyncTopicFile(editor.Get(), TopicLinkString(tl), topicpath, ~title);
+	}
+}
+
+void TopicEditor::Flush()
+{
+	SaveTopic();
+	FileInfo& fi = editstate.GetAdd(topicpath);
+	fi.time = FileGetTime(topicpath);
+	fi.pos = editor.GetPosInfo();
+	fi.undo = editor.PickUndoInfo();
+	topicpath.Clear();
+	editor.Clear();
+	HideTopic();
+}
+
+void TopicEditor::SaveInc()
+{
+	String packagedir = GetFileFolder(grouppath);
+	String group = GetFileTitle(grouppath);
+
+	if(IsNull(packagedir) || IsNull(group))
+		return;
+
+	String gh;
+	FindFile ff(AppendFileName(AppendFileName(packagedir, group + ".tpp"), "*.tpp"));
+
+	while(ff) {
+		if(ff.IsFile()) {
+			gh << "TOPIC(" << AsCString(GetFileTitle(ff.GetName())) << ")\r\n";
+			gh << "#include \"" << ff.GetName() << "\"\r\n";
+			gh << "END_TOPIC\r\n\r\n";
+		}
+		ff.Next();
+	}
+
+	String fn = AppendFileName(AppendFileName(packagedir, group + ".tpp"), "all.i");
+	if(LoadFile(fn) != gh)
+		if(IsNull(gh))
+			DeleteFile(fn);
+		else
+			SaveFile(fn, gh);
+}
+
+TopicLink ParseTopicFilePath(const String& path)
+{
+	TopicLink tl;
+	tl.topic = GetFileTitle(path);
+	String q = GetFileFolder(path);
+	tl.group = GetFileTitle(q);
+	q = GetFileFolder(q);
+	const Workspace& wspc = GetIdeWorkspace();
+	for(int i = 0; i < wspc.GetCount(); i++)
+		if(PathIsEqual(PackageDirectory(wspc[i]), q)) {
+			tl.package = wspc[i];
+			return tl;
+		}
+	return TopicLink();
+}
+
+String TopicFilePath(const TopicLink& tl)
+{
+	return AppendFileName(AppendFileName(PackageDirectory(tl.package), tl.group + ".tpp"),
+	                      tl.topic + ".tpp");
+}
diff --git a/uppsrc/ide/Browser/Topic.iml b/uppsrc/ide/Browser/Topic.iml
new file mode 100644
index 000000000..f0656e2e1
--- /dev/null
+++ b/uppsrc/ide/Browser/Topic.iml
@@ -0,0 +1,17 @@
+IMAGE_ID(Package)
+IMAGE_ID(Topic)
+IMAGE_ID(Group)
+IMAGE_ID(Label)
+
+IMAGE_BEGIN_DATA
+IMAGE_DATA(120,156,237,150,105,18,131,32,12,133,57,130,71,246,104,220,140,22,59,209,103,200,198,162,191,26,135,169,11,31,143,132)
+IMAGE_DATA(36,211,180,165,45,189,96,69,24,93,243,171,229,156,143,223,192,90,5,13,159,235,26,184,158,197,39,186,36,253,239,181)
+IMAGE_DATA(239,123,23,127,211,212,121,201,63,207,127,92,227,152,135,67,210,175,218,245,94,216,195,249,30,191,19,75,60,206,225,60)
+IMAGE_DATA(178,56,159,235,211,224,188,229,63,232,89,57,208,196,159,235,123,231,71,251,215,252,87,246,174,250,208,232,199,107,65,139)
+IMAGE_DATA(201,122,251,53,131,178,124,113,60,108,107,88,124,114,46,143,159,213,247,44,194,243,194,164,17,229,255,250,186,246,136,62)
+IMAGE_DATA(177,37,144,63,154,110,101,71,120,100,35,252,76,254,14,217,83,205,160,218,172,51,94,67,144,214,137,6,241,228,216,161)
+IMAGE_DATA(68,52,121,66,246,234,223,147,178,52,188,87,4,252,94,226,173,2,92,161,79,190,140,232,99,49,74,241,179,180,121,49)
+IMAGE_DATA(242,162,146,244,175,125,167,48,223,250,124,49,56,60,94,106,0,86,29,188,222,0,208,158,108,6,43,140,7,161,55,40)
+IMAGE_DATA(188,224,165,6,16,229,181,6,98,237,89,107,46,214,1,123,13,201,251,135,36,105,187,239,12,223,165,248,89,49,152,213)
+IMAGE_DATA(95,233,255,72,252,103,207,95,227,165,231,8,63,147,255,61,246,1,230,192,65,151,0,0,0,0,0,0,0,0,0,0)
+IMAGE_END_DATA(320, 4)
diff --git a/uppsrc/ide/Browser/Topic.lay b/uppsrc/ide/Browser/Topic.lay
new file mode 100644
index 000000000..29110696f
--- /dev/null
+++ b/uppsrc/ide/Browser/Topic.lay
@@ -0,0 +1,54 @@
+LAYOUT(NewTopicLayout, 268, 92)
+	ITEM(Label, dv___0, SetLabel(t_("Topic")).LeftPosZ(8, 56).TopPosZ(8, 19))
+	ITEM(EditString, topic, LeftPosZ(68, 92).TopPosZ(8, 19))
+	ITEM(LNGCtrl, lang, LeftPosZ(164, 96).TopPosZ(8, 19))
+	ITEM(Label, dv___3, SetLabel(t_("Stylesheet")).LeftPosZ(8, 56).TopPosZ(32, 19))
+	ITEM(DropList, stylesheet, LeftPosZ(68, 192).TopPosZ(32, 19))
+	ITEM(Button, ok, SetLabel(t_("OK")).LeftPosZ(128, 64).TopPosZ(60, 24))
+	ITEM(Button, cancel, SetLabel(t_("Cancel")).LeftPosZ(196, 64).TopPosZ(60, 24))
+END_LAYOUT
+
+LAYOUT(RenameTopicLayout, 268, 64)
+	ITEM(Label, dv___0, SetLabel(t_("Topic")).LeftPosZ(8, 56).TopPosZ(8, 19))
+	ITEM(EditString, topic, LeftPosZ(68, 92).TopPosZ(8, 19))
+	ITEM(LNGCtrl, lang, LeftPosZ(164, 96).TopPosZ(8, 19))
+	ITEM(Button, ok, SetLabel(t_("OK")).LeftPosZ(128, 64).TopPosZ(32, 24))
+	ITEM(Button, cancel, SetLabel(t_("Cancel")).LeftPosZ(196, 64).TopPosZ(32, 24))
+END_LAYOUT
+
+LAYOUT(StylesheetLayout, 216, 344)
+	ITEM(ArrayCtrl, style, LeftPosZ(8, 200).TopPosZ(8, 296))
+	ITEM(Button, edit, SetLabel(t_("Edit..")).LeftPosZ(8, 64).TopPosZ(312, 24))
+	ITEM(Button, ok, SetLabel(t_("OK")).LeftPosZ(76, 64).TopPosZ(312, 24))
+	ITEM(Button, cancel, SetLabel(t_("Cancel")).LeftPosZ(144, 64).TopPosZ(312, 24))
+END_LAYOUT
+
+LAYOUT(TopicLinkLayout, 716, 404)
+	ITEM(Label, dv___0, SetLabel(t_("Link")).LeftPosZ(8, 28).TopPosZ(12, 13))
+	ITEM(EditString, link, LeftPosZ(44, 664).TopPosZ(8, 19))
+	ITEM(FileList, package, LeftPosZ(8, 144).TopPosZ(32, 332))
+	ITEM(FileList, group, LeftPosZ(156, 148).TopPosZ(32, 332))
+	ITEM(FileList, topic, LeftPosZ(308, 148).TopPosZ(32, 332))
+	ITEM(FileList, label, LeftPosZ(460, 248).TopPosZ(32, 332))
+	ITEM(Button, insert, SetLabel(t_("Insert")).LeftPosZ(8, 64).TopPosZ(372, 24))
+	ITEM(Button, ok, SetLabel(t_("OK")).LeftPosZ(576, 64).TopPosZ(372, 24))
+	ITEM(Button, cancel, SetLabel(t_("Cancel")).LeftPosZ(644, 64).TopPosZ(372, 24))
+END_LAYOUT
+
+LAYOUT(GroupDlgLayout, 148, 68)
+	ITEM(Label, dv___0, SetLabel(t_("Group")).LeftPosZ(8, 36).TopPosZ(8, 19))
+	ITEM(EditString, group, LeftPosZ(48, 92).TopPosZ(8, 19))
+	ITEM(Button, ok, SetLabel(t_("OK")).LeftPosZ(8, 64).TopPosZ(36, 24))
+	ITEM(Button, cancel, SetLabel(t_("Cancel")).LeftPosZ(76, 64).TopPosZ(36, 24))
+END_LAYOUT
+
+LAYOUT(ReferenceDlgLayout, 644, 392)
+	ITEM(Label, dv___0, SetLabel(t_("Reference")).LeftPosZ(8, 56).TopPosZ(4, 19))
+	ITEM(EditString, reference, HSizePosZ(68, 4).TopPosZ(4, 19))
+	ITEM(Browser, browser, HSizePosZ(8, 8).VSizePosZ(28, 40))
+	ITEM(Button, query, SetLabel(t_("Query")).LeftPosZ(8, 64).BottomPosZ(8, 24))
+	ITEM(Button, classlist, SetLabel(t_("Class list")).RightPosZ(144, 64).BottomPosZ(8, 24))
+	ITEM(Button, ok, SetLabel(t_("OK")).RightPosZ(76, 64).BottomPosZ(8, 24))
+	ITEM(Button, cancel, SetLabel(t_("Cancel")).RightPosZ(8, 64).BottomPosZ(8, 24))
+END_LAYOUT
+
diff --git a/uppsrc/ide/Browser/TopicBase.cpp b/uppsrc/ide/Browser/TopicBase.cpp
new file mode 100644
index 000000000..4c988de73
--- /dev/null
+++ b/uppsrc/ide/Browser/TopicBase.cpp
@@ -0,0 +1,216 @@
+#include "Browser.h"
+
+Index<String>& ref_link()
+{
+	static Index<String> x;
+	return x;
+}
+
+Index<String>& ref_ref()
+{
+	static Index<String> x;
+	return x;
+}
+
+Index<String>& TopicWords()
+{
+	static Index<String> x;
+	return x;
+}
+
+int TopicWordIndex(const String& w)
+{
+	return TopicWords().FindAdd(w);
+}
+
+String TopicIndexWord(int i)
+{
+	return TopicWords()[i];
+}
+
+VectorMap<String, TopicInfo>& topic_info()
+{
+	static VectorMap<String, TopicInfo> x;
+	return x;
+}
+
+void AddLinkRef(const String& link, const String& ref)
+{
+	int q = ref_link().Put(link);
+	if(q < ref_ref().GetCount())
+		ref_ref().Set(q, ref);
+	else
+		ref_ref().Add(ref);
+}
+
+void ClearLinkRef(const String& link)
+{
+	int q = ref_link().Find(link);
+	while(q >= 0) {
+		int w = q;
+		q = ref_link().FindNext(q);
+		ref_link().Unlink(w);
+	}
+}
+
+struct ScanTopicIterator : RichText::Iterator {
+	String         link;
+	Index<int>     words;
+	Index<String>  ref;
+
+	virtual bool operator()(int pos, const RichPara& para)
+	{
+		if(!IsNull(para.format.label)) {
+			AddLinkRef(link, para.format.label);
+			ref.FindAdd(para.format.label);
+		}
+		
+		for(int i = 0; i < para.part.GetCount(); i++)
+			if(para.part[i].IsText()) {
+				const wchar *s = para.part[i].text;
+				for(;;) {
+					while(!IsLetter(*s) && *s)
+						s++;
+					if(*s == '\0')
+						break;
+					WStringBuffer wb;
+					while(IsLetter(*s))
+						wb.Cat(ToLower(*s++));
+					words.FindAdd(TopicWordIndex(FromUnicode(wb)));
+				}
+			}
+		return false;
+	}
+};
+
+int NoSlashDot(int c)
+{
+	return c == '/' || c == '\\' || c == ':' ? '.' : c;
+}
+
+String TopicCacheName(const char *path)
+{
+	String cfg = ConfigFile("cfg");
+	RealizeDirectory(cfg);
+	return AppendFileName(cfg, ForceExt(Filter(path, NoSlashDot), ".tdx"));
+}
+
+void SyncTopicFile(const RichText& text, const String& link, const String& path, const String& title)
+{
+	ClearLinkRef(link);
+	
+	ScanTopicIterator sti;
+	sti.link = link;
+	text.Iterate(sti);
+	
+	TopicInfo& ti = topic_info().GetAdd(link);
+	ti.title = title;
+	ti.path = path;
+	ti.time = FileGetTime(path);
+	ti.words = sti.words.PickKeys();
+	Sort(ti.words);
+	
+	FileOut out(TopicCacheName(path));
+	out << title << '\n';
+	for(int i = 0; i < sti.ref.GetCount(); i++)
+		out << sti.ref[i] << '\n';
+	out << '\n';
+	for(int i = 0; i < ti.words.GetCount(); i++)
+		out << TopicIndexWord(ti.words[i]) << '\n';
+}
+
+void SyncTopicFile(const String& link, const String& path)
+{
+	TopicInfo& ti = topic_info().GetAdd(link);
+	Time tm = FileGetTime(path);
+	if(ti.path == ":ide:" || ti.path == path && ti.time == tm)
+		return;
+	String fn = TopicCacheName(path);
+	if(FileGetTime(fn) > tm) {
+		ClearLinkRef(link);
+		FileIn in(fn);
+		ti.title = in.GetLine();
+		ti.words.Clear();
+		ti.path = path;
+		ti.time = tm;
+		while(!in.IsEof()) {
+			String x = in.GetLine();
+			if(IsNull(x))
+				break;
+			AddLinkRef(link, x);
+		}
+		while(!in.IsEof()) {
+			String x = in.GetLine();
+			if(IsNull(x))
+				break;
+			ti.words.Add(TopicWordIndex(x));
+		}
+		Sort(ti.words);
+		return;
+	}
+	Topic tp = ReadTopic(LoadFile(path));
+	SyncTopicFile(ParseQTF(tp.text), link, path, tp.title);
+}
+
+void SyncRefs()
+{
+	Progress pi;
+	pi.AlignText(ALIGN_LEFT);
+	Vector<String> upp = GetUppDirs();
+	for(int i = 0; i < upp.GetCount(); i++) {
+		for(FindFile pff(AppendFileName(upp[i], "*.*")); pff; pff.Next()) {
+			if(pff.IsFolder()) {
+				pi.Step();
+				String package = pff.GetName();
+				String pdir = PackageDirectory(package);
+				TopicLink tl;
+				tl.package = package;
+				for(FindFile ff(AppendFileName(pdir, "*.tpp")); ff; ff.Next()) {
+					if(ff.IsFolder()) {
+						String group = GetFileTitle(ff.GetName());
+						tl.group = group;
+						String dir = AppendFileName(pdir, ff.GetName());
+						for(FindFile ft(AppendFileName(dir, "*.tpp")); ft; ft.Next()) {
+							if(ft.IsFile()) {
+								String path = AppendFileName(dir, ft.GetName());
+								tl.topic = GetFileTitle(ft.GetName());
+								String link = TopicLinkString(tl);
+								pi.SetText("Indexing topic " + tl.topic);
+								SyncTopicFile(link, path);
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+}
+
+Vector<String> GetRefLinks(const String& ref)
+{
+	Vector<String> l;
+	int q = ref_ref().Find(ref);
+	while(q >= 0) {
+		l.Add(ref_link()[q]);
+		q = ref_ref().FindNext(q);
+	}
+	return l;
+}
+
+String GetTopicTitle(const String& link)
+{
+	int q = topic_info().Find(link);
+	return q >= 0 ? topic_info()[q].title : Null;
+}
+
+bool MatchTopicLink(const String& link, const Vector<int>& query)
+{
+	int q = topic_info().Find(link);
+	if(q < 0)
+		return false;
+	TopicInfo& f = topic_info()[q];
+	for(int i = 0; i < query.GetCount(); i++)
+		if(FindIndex(f.words, query[i]) < 0)
+			return false;
+	return true;
+}
diff --git a/uppsrc/ide/Browser/TopicI.icpp b/uppsrc/ide/Browser/TopicI.icpp
new file mode 100644
index 000000000..6a0710cad
--- /dev/null
+++ b/uppsrc/ide/Browser/TopicI.icpp
@@ -0,0 +1,27 @@
+#include "Browser.h"
+
+bool IsTopicGroup(const char *path)
+{
+	return ToLower(GetFileExt(path)) == ".tpp";
+}
+
+struct TopicModule : public IdeModule {
+	virtual Image FileIcon(const char *path) {
+		return IsTopicGroup(path) ? TopicImg::Group() : Null;
+	}
+	virtual IdeDesigner *CreateDesigner(const char *path, byte cs) {
+		if(IsTopicGroup(path)) {
+			TopicEditor *d = new TopicEditor;
+			d->Open(path);
+			return d;
+		}
+		return false;
+	}
+	virtual void Serialize(Stream& s) {
+		TopicEditor::SerializeEditPos(s);
+	}
+};
+
+INITBLOCK {
+	RegisterIdeModule(Single<TopicModule>());
+}
diff --git a/uppsrc/ide/Browser/TopicWin.cpp b/uppsrc/ide/Browser/TopicWin.cpp
new file mode 100644
index 000000000..7b341731a
--- /dev/null
+++ b/uppsrc/ide/Browser/TopicWin.cpp
@@ -0,0 +1,342 @@
+#include "Browser.h"
+
+#define IMAGEFILE <ide/Browser/Topic.iml>
+#define IMAGECLASS TopicImg
+#include <Draw/iml_source.h>
+
+TopicEditor::TopicEditor()
+{
+	SizePos();
+	editor.InsertFrame(0, TopSeparatorFrame());
+	editor.InsertFrame(1, tool);
+	SetBar();
+	Font tf = Arial(16).Bold();
+	int dcy = EditField::GetStdHeight(tf);
+	title.SetFont(tf);
+	right.Add(title.HSizePos(2, 2).TopPos(0, dcy));
+	right.Add(editor.VSizePos(dcy + 4, 0).HSizePos());
+	Add(left_right.Horz(topic, right));
+	left_right.SetPos(1200);
+
+	topic.NoRoundSize().Columns(1);
+
+	title.Tip("Topic title");
+
+	topic.WhenSel = THISBACK(TopicCursor);
+	topic.WhenBar = THISBACK(TopicMenu);
+	topic.NoWantFocus();
+
+	editor.SetPage(TopicPage());
+	editor.WhenRefreshBar = THISBACK(SetBar);
+	editor.WhenHyperlink = THISBACK(Hyperlink);
+
+	editor.Disable();
+	title.Disable();
+
+	lastlang = LNG_ENGLISH;
+
+	allfonts = false;
+
+	editor.WhenLabel = THISBACK(Label);
+	
+	LoadFromGlobal(*this, "topic-editor");
+}
+
+TopicEditor::~TopicEditor()
+{
+	StoreToGlobal(*this, "topic-editor");
+	Flush();
+}
+
+INITBLOCK {
+	RegisterGlobalConfig("topic-editor");
+}
+
+void TopicEditor::Serialize(Stream& s)
+{
+	int version = 0;
+	s / version;
+	editor.SerializeSettings(s);
+	s % left_right;
+	topic.Serialize(s);
+	s % allfonts;
+	SyncFonts();
+}
+
+void TopicEditor::SerializeEditPos(Stream& s)
+{
+	int version = 0;
+	s / version;
+	if(s.IsStoring()) {
+		for(int i = 0; i < editstate.GetCount(); i++) {
+			String fn = editstate.GetKey(i);
+			if(!IsNull(fn) && FileExists(fn)) {
+				s % fn;
+				s % editstate[i].pos;
+			}
+		}
+		String empty;
+		s % empty;
+	}
+	else
+		for(;;) {
+			String fn;
+			s % fn;
+			if(IsNull(fn))
+				break;
+			s % editstate.GetAdd(fn).pos;
+		}
+	s % grouptopic;
+	s % lastlang;
+	s % laststylesheet;
+}
+
+void TopicEditor::ExportPdf()
+{
+	FileSel fs;
+	fs.Type("PDF files", "*.pdf")
+	  .AllFilesType()
+	  .DefaultExt("pdf");
+	if(!fs.ExecuteSaveAs("Output PDF file"))
+		return;
+	Size page = Size(3968, 6074);
+	PdfDraw pdf(page + 400);
+	::Print(pdf, editor.Get(), page);
+	SaveFile(~fs, pdf.Finish());
+}
+
+void TopicEditor::Print()
+{
+	UPP::Print(editor.Get(), Size(3968, 6074), 0);
+}
+
+void TopicEditor::Exit()
+{
+	Close();
+}
+
+void TopicEditor::SyncFonts()
+{
+	Vector<int> ff;
+	ff.Add(Font::ARIAL);
+	ff.Add(Font::ROMAN);
+	ff.Add(Font::COURIER);
+	if(allfonts)
+		for(int i = Font::COURIER + 1; i < Font::GetFaceCount(); i++)
+			if(Font::GetFaceInfo(i) & Font::SCALEABLE &&
+			   !(Font::GetFaceInfo(i) & Font::SYMBOLTYPE))
+				ff.Add(i);
+	editor.FontFaces(ff);
+}
+
+void TopicEditor::AllFonts()
+{
+	allfonts = !allfonts;
+	SyncFonts();
+}
+
+void TopicEditor::TopicMenu(Bar& bar)
+{
+	bar.Add("New topic..", THISBACK(NewTopic))
+	   .Key(K_CTRL_N).Key(K_ALT_INSERT);
+	bar.Add(topic.IsCursor(), "Rename topic..", THISBACK(RenameTopic));
+	bar.Add(topic.IsCursor(), "Remove topic", THISBACK(RemoveTopic))
+	   .Key(K_ALT_DELETE);
+}
+
+void TopicEditor::FileBar(Bar& bar)
+{
+	TopicMenu(bar);
+	bar.Separator();
+	bar.Add(!IsNull(topicpath), "Save", THISBACK(Save))
+	   .Key(K_CTRL_S);
+	bar.Separator();
+	bar.Add("Print", CtrlImg::print(), THISBACK(Print))
+	   .Key(K_CTRL_P);
+	bar.Add("Export to PDF..", THISBACK(ExportPdf));
+	bar.Separator();
+	bar.Add("Exit", THISBACK(Exit));
+#ifdef _DEBUG
+	bar.Separator();
+	bar.Add("Compress group", THISBACK(CompressGroup));
+	bar.Add("Repair", THISBACK(Repair)).Key(K_ALT_R);
+#endif
+}
+
+void TopicEditor::EditMenu(Bar& bar)
+{
+	bar.Add("Topic", THISBACK(FileBar));
+	bar.Separator();
+	editor.CutTool(bar);
+	editor.CopyTool(bar);
+	editor.PasteTool(bar);
+	bar.Separator();
+	editor.UndoTool(bar);
+	editor.RedoTool(bar);
+	bar.Separator();
+	editor.FindReplaceTool(bar);
+	bar.Separator();
+	bar.Add("All fonts", THISBACK(AllFonts))
+	   .Check(allfonts);
+	bar.Separator();
+	bar.Add("Table", THISBACK(TableMenu));
+	bar.Add("Format", THISBACK(FormatMenu));
+	bar.Add("Stylesheet", THISBACK(StyleSheetMenu));
+}
+
+void TopicEditor::FormatMenu(Bar& bar)
+{
+	editor.StyleTool(bar);
+	bar.Separator();
+	editor.FontTools(bar);
+	bar.Separator();
+	editor.InkTool(bar);
+	editor.PaperTool(bar);
+	bar.Separator();
+	editor.LanguageTool(bar);
+	editor.SpellCheckTool(bar);
+	bar.Separator();
+	editor.IndexEntryTool(bar);
+	bar.Break();
+	editor.HyperlinkTool(bar, 300);
+	bar.Separator();
+	editor.ParaTools(bar);
+}
+
+void TopicEditor::TableMenu(Bar& bar)
+{
+	editor.TableTools(bar);
+}
+
+void TopicEditor::StyleSheetMenu(Bar& bar)
+{
+	bar.Add("Stylesheets..", THISBACK(EditStylesheets));
+	bar.Add(!IsNull(topicpath), "Store stylesheet..", THISBACK(StoreStylesheet));
+	bar.Add(!IsNull(topicpath), "Apply stylesheet..", THISBACK(ApplyStylesheet));
+	bar.Add("Apply stylesheet to group..", THISBACK(ApplyStylesheetGroup));
+}
+
+void CreateTopic(const char *fn, int lang, const String& ss)
+{
+	SaveFile(fn,  WriteTopic("", ParseQTF(ss + "[{_}%" + LNGAsText(lang) + " ")));
+}
+
+template <class T>
+struct TopicDlg : T {
+	String GetName() const {
+		return (String)~T::topic + "$" + ToLower(LNGAsText(~T::lang)) + ".tpp";
+	}
+
+	TopicDlg(const char *title) {
+		CtrlLayoutOKCancel(*this, title);
+		T::topic.NotNull();
+		T::topic.MaxLen(30);
+		T::topic.SetFilter(CharFilterID);
+	}
+};
+
+void TopicEditor::NewTopic()
+{
+	TopicDlg<WithNewTopicLayout<TopWindow> > d("New topic");
+	d.lang <<= lastlang;
+
+	Vector<String> name;
+	Vector<String> style;
+	name.Add("<none>");
+	style.Add("");
+	FindFile ff(AppendFileName(GetCommonDir(), "*.style"));
+	while(ff) {
+		name.Add(GetFileTitle(ff.GetName()));
+		style.Add(LoadFile(AppendFileName(GetCommonDir(), ff.GetName())));
+		ff.Next();
+	}
+	IndexSort(name, style);
+	for(int i = 0; i < name.GetCount(); i++)
+		d.stylesheet.Add(name[i]);
+
+	if(d.stylesheet.HasKey(laststylesheet))
+		d.stylesheet <<= laststylesheet;
+	else
+		d.stylesheet.SetIndex(0);
+
+	d.ActiveFocus(d.topic);
+	String fn;
+	for(;;) {
+		if(d.Run() != IDOK)
+			return;
+		fn = AppendFileName(grouppath, d.GetName());
+		if(!FileExists(fn))
+			break;
+		if(PromptYesNo("Topic already exists.&Do you want to clear it?"))
+			break;
+	}
+	laststylesheet = ~d.stylesheet;
+	lastlang = ~d.lang;
+	int q = d.stylesheet.GetIndex();
+	CreateTopic(fn, ~d.lang, q >= 0 ? style[q] : Null);
+	Flush();
+	Open(grouppath);
+	Load(fn);
+	SaveInc();
+	topic.FindSetCursor(GetFileTitle(fn));
+	editor.SetFocus();
+}
+
+void TopicEditor::RenameTopic()
+{
+	if(!topic.IsCursor())
+		return;
+	TopicDlg<WithRenameTopicLayout<TopWindow> > d("Rename topic");
+	String p = GetCurrentTopicPath();
+	String tn;
+	int    lng;
+	ParseTopicFileName(p, tn, lng);
+	d.topic <<= tn;
+	d.lang <<= lng;
+	if(d.Run() != IDOK)
+		return;
+	String np = AppendFileName(grouppath, d.GetName());
+	if(FindFile(np)) {
+		Exclamation("Target file aready exists!");
+		return;
+	}
+	Flush();
+	FileMove(p, np);
+	Open(grouppath);
+	Load(np);
+	SaveInc();
+	topic.FindSetCursor(GetFileTitle(np));
+	editor.SetFocus();
+}
+
+void TopicEditor::RemoveTopic()
+{
+	if(!topic.IsCursor() ||
+	   !PromptYesNo("Delete topic [* " + DeQtf(topic.GetCurrentName()) + "] ?"))
+		return;
+	String p = GetCurrentTopicPath();
+	int q = topic.GetCursor();
+	Flush();
+	DeleteFile(p);
+	Open(grouppath);
+	SaveInc();
+	topic.SetCursor(q);
+	if(q >= 0)
+		editor.SetFocus();
+}
+
+void TopicEditor::SetBar()
+{
+	tool.Set(THISBACK(MainTool));
+}
+
+bool TopicEditor::Key(dword key, int cnt)
+{
+	switch(key) {
+	case K_ALT_UP:
+		return topic.Key(K_UP, 0);
+	case K_ALT_DOWN:
+		return topic.Key(K_DOWN, 0);
+	}
+	return false;
+}
diff --git a/uppsrc/ide/Browser/init b/uppsrc/ide/Browser/init
new file mode 100644
index 000000000..a1ca1d74a
--- /dev/null
+++ b/uppsrc/ide/Browser/init
@@ -0,0 +1,8 @@
+#ifndef _ide_Browser_icpp_init_stub
+#define _ide_Browser_icpp_init_stub
+#include "CppBase/init"
+#include "ide\Common/init"
+#include "PdfDraw/init"
+#include "RichEdit/init"
+#include "TopicI.icpp"
+#endif
diff --git a/uppsrc/ide/Build.cpp b/uppsrc/ide/Build.cpp
new file mode 100644
index 000000000..b489e8eda
--- /dev/null
+++ b/uppsrc/ide/Build.cpp
@@ -0,0 +1,853 @@
+#include "ide.h"
+
+#include <plugin/bz2/bz2.h>
+
+#define LDUMP(x) // DUMP(x)
+
+const TargetMode& Ide::GetTargetMode()
+{
+	return (targetmode == 0 ? debug : release);
+}
+
+Index<String> Ide::PackageConfig(const Workspace& wspc, int package,
+                                 const VectorMap<String, String>& bm, String mainparam,
+                                 Host& host, Builder& b, String *target)
+{
+	String packagepath = PackagePath(wspc[package]);
+	const Package& pkg = wspc.package[package];
+	Index<String> cfg;
+	mainparam << ' ' << bm.Get(targetmode ? "RELEASE_FLAGS" : "DEBUG_FLAGS", NULL);
+	cfg = SplitFlags(mainparam, package == 0, wspc.GetAllAccepts(package));
+	cfg.FindAdd(bm.Get("BUILDER", "GCC"));
+	const TargetMode& m = GetTargetMode();
+	if(targetmode == 0)
+		cfg.FindAdd("DEBUG");
+	switch(m.linkmode) {
+	case 2:
+		cfg.FindAdd("SO");
+	case 1:
+		cfg.FindAdd("SHARED");
+	}
+	if(targetmode == 2)
+		cfg.FindAdd("FORCE_SPEED");
+	if(targetmode == 3)
+		cfg.FindAdd("FORCE_SIZE");
+	int q = m.package.Find(wspc[package]);
+	if(q >= 0) {
+		const PackageMode& p = m.package[q];
+		switch(p.debug >= 0 ? p.debug : m.def.debug) {
+		case 1:  cfg.FindAdd("DEBUG_MINIMAL"); break;
+		case 2:  cfg.FindAdd("DEBUG_FULL"); break;
+		}
+		if(!pkg.noblitz && (p.blitz >= 0 ? p.blitz : m.def.blitz))
+			cfg.FindAdd("BLITZ");
+	}
+	else {
+		switch(m.def.debug) {
+		case 1:  cfg.FindAdd("DEBUG_MINIMAL"); break;
+		case 2:  cfg.FindAdd("DEBUG_FULL"); break;
+		}
+		if(!pkg.noblitz && m.def.blitz)
+			cfg.FindAdd("BLITZ");
+	}
+	host.AddFlags(cfg);
+	b.AddFlags(cfg);
+	if(target)
+		*target = Gather(pkg.target, cfg.GetKeys());
+	return cfg;
+}
+
+static String NoCr(const char *s)
+{
+	String out;
+	while(*s)
+	{
+		const char *b = s;
+		while(*s && *s != '\r')
+			s++;
+		out.Cat(b, int(s - b));
+		if(*s == '\r')
+			s++;
+	}
+	return out;
+}
+
+bool Ide::SyncHostFiles(RemoteHost& host)
+{
+	HdependTimeDirty();
+	String query = "<";
+//	Vector<String> remotepath;
+	Vector<String> fdata;
+	ArrayMap<String, TransferFileInfo> info;
+	Vector<int> nocrsize;
+	const Workspace& wspc = IdeWorkspace();
+	int p;
+	for(p = 0; p < wspc.GetCount(); p++) {
+		const Package& pkg = wspc.GetPackage(p);
+		String pn = wspc[p];
+		for(int f = -1; f < pkg.file.GetCount(); f++)
+			if(f < 0 || !pkg.file[f].separator) {
+				Vector<String> pkgfiles;
+				String pk = (f >= 0 ? SourcePath(pn, pkg.file[f]) : PackagePath(pn));
+				if(!FindFile(pk).IsFile())
+					continue;
+				pkgfiles.Add(f >= 0 ? SourcePath(pn, pkg.file[f]) : PackagePath(pn));
+				pkgfiles.AppendPick(HdependGetDependencies(pkgfiles[0]));
+				for(int d = 0; d < pkgfiles.GetCount(); d++) {
+					TransferFileInfo newinfo;
+					newinfo.sourcepath = pkgfiles[d];
+					String rp = host.GetHostPath(newinfo.sourcepath);
+					if(info.Find(rp) >= 0 || (d && UnixPath(rp) == UnixPath(newinfo.sourcepath)))
+						continue;
+					FindFile ff(newinfo.sourcepath);
+					newinfo.filetime = (int)(Time(ff.GetLastWriteTime()) - RemoteHost::TimeBase());
+					newinfo.filesize = (int)ff.GetLength();
+					int pos = transferfilecache.Find(rp);
+					if(pos < 0 || transferfilecache[pos].filetime != newinfo.filetime
+						|| transferfilecache[pos].filesize != newinfo.filesize)
+					{
+						String content = NoCr(LoadFile(newinfo.sourcepath));
+						query << rp << '\t' << newinfo.filetime << '\t' << content.GetLength() << '\n';
+	//					remotepath.Add(rp);
+						fdata.Add(content);
+						info.Add(rp, newinfo);
+						nocrsize.Add(content.GetLength());
+						PutVerbose("Checking remote " + rp);
+	/*
+						if(msecs(ticks) >= 0)
+						{
+							ShowConsole();
+							console.Sync();
+							ticks = msecs(-200);
+						}
+	*/				}
+				}
+			}
+	}
+	if(info.IsEmpty())
+		return true;
+//	String host = GetVar("REMOTE_HOST");
+//	int port = 2346;
+//	int ppos = host.Find(':');
+//	if(ppos >= 0)
+//	{
+//		port = ScanInt(host.GetIter(ppos + 1));
+//		host.Trim(ppos);
+//	}
+
+	Index<String> ignore;
+	{
+		console << NFormat("Retrieving update list for remote filesystem %s\n", host.host);
+		ShowConsole();
+		console.Sync();
+		String out = host.RemoteExec(query);
+		if(out[0] != 'O' || out[1] != 'K')
+		{
+			console << out << "\n";
+			return false;
+		}
+
+		const char *s = out;
+		while(*s && *s++ != '\n')
+			;
+		while(*s)
+		{
+			const char *b = s;
+			while(*s && *s != '\n')
+				s++;
+			ignore.FindAdd(NormalizePath(NativePath(String(b, s))));
+			if(*s)
+				s++;
+		}
+		if(ignore.GetCount() == info.GetCount())
+			console << "Remote source tree is up to date.\n";
+		else
+		{
+			console << NFormat("%d file(s) missing in remote source tree:\n", info.GetCount() - ignore.GetCount());
+			for(p = 0; p < info.GetCount(); p++)
+			{
+//				console << "   " << remotepath[p] << " - "
+//					<< FormatInt(p) << " @ " << FormatInt(ignore.Find(remotepath[p])) << "\n";
+				if(ignore.Find(NormalizePath(NativePath(info.GetKey(p)))) < 0)
+					console << "   " << info.GetKey(p) << "\n";
+			}
+		}
+	}
+
+	Vector<String> update;
+	for(p = 0; p < info.GetCount(); p++)
+		if(ignore.Find(NormalizePath(NativePath(info.GetKey(p)))) < 0)
+		{
+			String rawdata = fdata[p];
+			console << "Compressing " << info[p].sourcepath << " (" << FormatInt(rawdata.GetLength()) << " B)\n";
+			console.Sync();
+			String bzdata = BZ2Compress(rawdata);
+//			console << ", BZ2 = " << FormatInt(bzdata.GetLength()) << " B";
+//			console.Sync();
+			String comp = ASCII85Encode(bzdata);
+//			console << ", ASCII85 = " << FormatInt(comp.GetLength()) << "\n";
+//			console.Sync();
+			if(update.IsEmpty() || update.Top().GetLength() + comp.GetLength() >= 500000)
+				update.Add(">");
+			update.Top() << info.GetKey(p) << '\t' << info[p].filetime << '\t' << nocrsize[p] << '\t' << comp << '\n';
+		}
+
+	for(p = 0; p < update.GetCount(); p++)
+	{
+		console << NFormat("Uploading block %d / %d (%d B)\n", p + 1, update.GetCount(), update[p].GetLength());
+		ShowConsole();
+		console.Sync();
+		String result = host.RemoteExec(update[p]);
+		if(result[0] != 'O' || result[1] != 'K')
+		{
+			console << result << "\n";
+			return false;
+		}
+	}
+
+	for(p = 0; p < info.GetCount(); p++)
+		transferfilecache.GetAdd(info.GetKey(p)) = info[p];
+	return true;
+}
+
+One<Host> Ide::CreateHost(bool sync_files)
+{
+	SetupDefaultMethod();
+	VectorMap<String, String> bm = GetMethodVars(method);
+	String rm = bm.Get("REMOTE_HOST", Null);
+	One<Host> outhost;
+	if(!IsNull(rm)) {
+		One<RemoteHost> host = new RemoteHost;
+		host->host = rm;
+		host->port = 2346;
+		int f = rm.Find(':');
+		if(f >= 0) {
+			host->host = rm.Left(f);
+			host->port = Nvl(ScanInt(rm.GetIter(f + 1)), host->port);
+		}
+		host->os_type = bm.Get("REMOTE_OS", "UNIX");
+		Vector<String> path_map = Split(bm.Get("REMOTE_MAP", Null), ';');
+		for(int p = 0; p < path_map.GetCount(); p++) {
+			f = path_map[p].Find('>');
+			if(f >= 0) {
+				host->path_map_local.Add(path_map[p].Left(f));
+				host->path_map_remote.Add(path_map[p].Mid(f + 1));
+			}
+		}
+		VectorMap<String, String> env(Environment(), 1);
+		Vector<String> exedirs = SplitDirs(bm.Get("PATH", "") + ';' + env.Get("PATH", ""));
+		env.GetAdd("PATH") = Join(exedirs, ";");
+		for(int i = 0; i < env.GetCount(); i++)
+			host->environment << env.GetKey(i) << '=' << env[i] << '\0';
+		host->environment.Cat(0);
+		if(sync_files && bm.Get("REMOTE_TRANSFER", Null) != "0")
+			SyncHostFiles(*host);
+		outhost = -host;
+	}
+	else {
+		One<LocalHost> host = new LocalHost;
+		VectorMap<String, String> env(Environment(), 1);
+		host->exedirs = SplitDirs(bm.Get("PATH", "") + ';' + env.Get("PATH", ""));
+		env.GetAdd("PATH") = Join(host->exedirs, ";");
+		env.GetAdd("UPP_MAIN__") = GetFileDirectory(PackagePath(main));
+		for(int i = 0; i < env.GetCount(); i++) {
+			LDUMP(env.GetKey(i));
+			LDUMP(env[i]);
+			host->environment << env.GetKey(i) << '=' << env[i] << '\0';
+		}
+		host->environment.Cat(0);
+		host->cmdout = &cmdout;
+		outhost = -host;
+	}
+	return outhost;
+}
+
+One<Builder> Ide::CreateBuilder(Host *host)
+{
+	SetupDefaultMethod();
+	VectorMap<String, String> bm = GetMethodVars(method);
+	String builder = bm.Get("BUILDER", "GCC");
+	One<Builder> b = (*BuilderMap().Get(builder))();
+	b->host = host;
+	b->compiler = bm.Get("COMPILER", "");
+	b->include = SplitDirs(GetVar("UPP") + ';' + bm.Get("INCLUDE", ""));
+	b->libpath = SplitDirs(bm.Get("LIB", ""));
+	b->debug_options = bm.Get("DEBUG_OPTIONS", "");
+	b->release_options = bm.Get("RELEASE_OPTIONS", "");
+	b->release_size_options = bm.Get("RELEASE_SIZE_OPTIONS", "");
+	b->script = bm.Get("SCRIPT", "");
+	return b;
+}
+
+int CharFilterSlash(int c)
+{
+	return c == '\\' ? '/' : c;
+}
+
+String Ide::OutDir(const Index<String>& cfg, const String& package, const VectorMap<String, String>& bm,
+                   bool use_target)
+{
+	Index<String> excl;
+	excl.Add(bm.Get("BUILDER", "GCC"));
+	excl.Add("MSC");
+	LocalHost().AddFlags(excl);
+	Vector<String> x;
+	bool dbg = cfg.Find("DEBUG_FULL") >= 0 || cfg.Find("DEBUG_MINIMAL") >= 0;
+	if(cfg.Find("DEBUG") >= 0) {
+		excl.Add("BLITZ");
+		if(cfg.Find("BLITZ") < 0)
+			x.Add("NOBLITZ");
+	}
+	else
+		if(dbg)
+			x.Add("RELEASE");
+	if(use_target)
+		excl.Add("MAIN");
+	for(int i = 0; i < cfg.GetCount(); i++)
+		if(excl.Find(cfg[i]) < 0)
+			x.Add(cfg[i]);
+	Sort(x);
+	for(int i = 0; i < x.GetCount(); i++)
+		x[i] = InitCaps(x[i]);
+	String outdir = GetVar("OUTPUT");
+	if(!use_target)
+		outdir = AppendFileName(outdir, package);
+	outdir = AppendFileName(outdir, method + "." + Join(x, "."));
+	outdir = Filter(outdir, CharFilterSlash);
+	return outdir;
+}
+
+struct OneFileHost : Host {
+	One<Host> host;
+	String    onefile;
+
+	virtual String GetEnvironment()                { return host->GetEnvironment(); }
+	virtual String GetHostPath(const String& path) { return host->GetHostPath(path); }
+	virtual String GetLocalPath(const String& path) { return host->GetLocalPath(path); }
+	virtual String NormalizePath(const String& path) { return host->NormalizePath(path); }
+	virtual void   DeleteFile(const Vector<String>& path) { host->DeleteFile(path); }
+	virtual void   DeleteFolderDeep(const String& folder) { host->DeleteFolderDeep(folder); }
+	virtual void   ChDir(const String& path) { host->ChDir(path); }
+	virtual void   RealizeDir(const String& path) { host->RealizeDir(path); }
+	virtual void   SaveFile(const String& path, const String& data) { host->SaveFile(path, data); }
+	virtual String LoadFile(const String& path) { return host->LoadFile(path); }
+	virtual int    Execute(const char *c) { return host->Execute(c); }
+	virtual int    ExecuteWithInput(const char *c) { return host->ExecuteWithInput(c); }
+	virtual int    Execute(const char *c, Stream& o) { return host->Execute(c, o); }
+	virtual int    AllocSlot() { return host->AllocSlot(); }
+	virtual bool   Run(const char *cmdline, int slot, String key, int blitz_count) { return host->Run(cmdline, slot, key, blitz_count); }
+	virtual bool   Run(const char *cmdline, Stream& out, int slot, String key, int blitz_count) { return host->Run(cmdline, out, slot, key, blitz_count); }
+	virtual bool   Wait() { return host->Wait(); }
+	virtual One<SlaveProcess> StartProcess(const char *c) { return host->StartProcess(c); }
+	virtual void   Launch(const char *cmdline, bool) { host->Launch(cmdline); }
+	virtual void   AddFlags(Index<String>& cfg) { host->AddFlags(cfg); }
+
+	virtual Vector<FileInfo> GetFileInfo(const Vector<String>& path) {
+		Vector<FileInfo> fi = host->GetFileInfo(path);
+		for(int i = 0; i < path.GetCount(); i++)
+			if(path[i] == onefile)
+				(Time &)fi[i] = GetSysTime();
+			else
+				(Time &)fi[i] = Time::Low();
+		return fi;
+	}
+};
+
+bool Ide::BuildPackage(const Workspace& wspc, int pkindex, int pknumber, int pkcount,
+	String mainparam, String outfile, Vector<String>& linkfile, String& linkopt, bool link)
+{
+	String package = wspc[pkindex];
+	String mainpackage = wspc[0];
+	const Package& pkg = wspc.package[pkindex];
+	VectorMap<String, String> bm = GetMethodVars(method);
+	if(bm.GetCount() == 0) {
+		PutConsole("Invalid build method");
+		return false;
+	}
+	One<Host> host = CreateHost(false);
+	if(!IsNull(onefile)) {
+		OneFileHost *h = new OneFileHost;
+		h->host = host;
+		h->onefile = onefile;
+		host = h;
+	}
+	One<Builder> b = CreateBuilder(~host);
+	b->config = PackageConfig(wspc, pkindex, bm, mainparam, *host, *b);
+	const TargetMode& m = targetmode == 0 ? debug : release;
+	b->version = m.version;
+	b->method = method;
+	b->outdir = OutDir(b->config, package, bm);
+	host->RealizeDir(b->outdir);
+	String mainfn = Null;
+	Index<String> mcfg = PackageConfig(wspc, 0, bm, mainparam, *host, *b, &mainfn);
+	HdependClearDependencies();
+	for(int i = 0; i < pkg.GetCount(); i++) {
+		const Array<OptItem>& f = pkg[i].depends;
+		for(int j = 0; j < f.GetCount(); j++)
+			if(MatchWhen(f[j].when, mcfg.GetKeys()))
+				HdependAddDependency(SourcePath(package, pkg[i]), SourcePath(package, f[j].text));
+	}
+	String tout = OutDir(mcfg, mainpackage, bm, use_target);
+	host->RealizeDir(tout);
+	if(IsNull(mainfn))
+		mainfn = GetFileTitle(mainpackage) + b->GetTargetExt();
+	if(!IsNull(outfile))
+		target = NormalizePath(outfile, tout);
+	else {
+		if(m.target_override && !IsNull(m.target) && IsFolder(m.target))
+			target = host->NormalizePath(AppendFileName(m.target, mainfn));
+		else
+		if(m.target_override && (IsFullPath(m.target) || *m.target == '/' || *m.target == '\\'))
+			target = m.target;
+		else
+		if(m.target_override && !IsNull(m.target))
+			target = host->NormalizePath(AppendFileName(tout, m.target));
+		else
+		if(IsFullPath(mainfn))
+			target = mainfn;
+		else
+			target = host->NormalizePath(AppendFileName(tout, mainfn));
+	}
+	b->target = target;
+	if(IsNull(onefile)) {
+		String out;
+		out << "----- " << package << " ( " << Join(b->config.GetKeys(), " ") << " )";
+		if(pkcount > 1)
+			out << " (" << (pknumber + 1) << " / " << pkcount << ')';
+		PutConsole(out);
+	}
+	else
+		b->config.FindAdd("NOLIB");
+	bool ok = b->BuildPackage(package, linkfile, linkopt,
+		                      GetAllUses(wspc, pkindex),
+		                      GetAllLibraries(wspc, pkindex, bm, mainparam, *host, *b),
+		                      targetmode - 1);
+	Vector<String> errors = console.PickErrors();
+	host->DeleteFile(errors);
+	if(!ok || !errors.IsEmpty())
+		return false;
+	if(link) {
+		ok = b->Link(linkfile, linkopt, GetTargetMode().createmap);
+		errors = console.PickErrors();
+		host->DeleteFile(errors);
+		if(!ok || !errors.IsEmpty())
+			return false;
+	}
+	return true;
+}
+
+void Ide::SetHdependDirs()
+{
+	HdependSetDirs(SplitDirs(GetVar("UPP") + ';'
+	                         + GetMethodVars(method).Get("INCLUDE", "") + ';'
+	                         + Environment().Get("INCLUDE", "")));
+}
+
+void Ide::BeginBuilding(bool sync_files, bool clear_console)
+{
+	SetupDefaultMethod();
+	HdependTimeDirty();
+	Renumber();
+	ShowConsole();
+	StopDebug();
+	SaveFile();
+	SaveWorkspace();
+	SetIdeState(BUILDING);
+	console.Kill();
+	console.ClearError();
+	if(clear_console)
+		console.Clear();
+	build_time = GetTickCount();
+	CreateHost(sync_files);
+	cmdout.Clear();
+}
+
+void Ide::EndBuilding(bool ok)
+{
+	console.EndGroup();
+	console.Wait();
+	Vector<String> errors = console.PickErrors();
+	CreateHost(false)->DeleteFile(errors);
+	if(!errors.IsEmpty())
+		ok = false;
+	PutConsole("");
+	PutConsole((ok ? "OK. " : "There were errors. ") + GetPrintTime(build_time));
+	SetIdeState(EDITING);
+	if(GetTopWindow()->IsOpen())
+		if(ok)
+			BeepMuteInformation();
+		else
+			BeepMuteExclamation();
+}
+
+Vector<String> Ide::GetAllUses(const Workspace& wspc, int f)
+{
+	String package = wspc[f];
+	Index<String> all_uses;
+	bool warn = true;
+	int n = 0;
+	while(f >= 0) {
+		const Package& p = wspc.package[f];
+		for(int fu = 0; fu < p.uses.GetCount(); fu++)
+			if(p.uses[fu].text != package)
+				all_uses.FindAdd(p.uses[fu].text);
+			else if(warn) {
+				::PutConsole(NFormat("%s: circular 'uses' chain", package));
+				warn = false;
+			}
+		f = -1;
+		while(n < all_uses.GetCount() && (f = wspc.package.Find(all_uses[n++])) < 0)
+			;
+	}
+	return all_uses.PickKeys();
+}
+
+Vector<String> Ide::GetAllLibraries(const Workspace& wspc, int index,
+	const VectorMap<String, String>& bm, String mainparam,
+	Host& host, Builder& builder)
+{
+	Vector<String> uses = GetAllUses(wspc, index);
+	uses.Add(wspc[index]);
+	Index<String> libraries;
+	for(int i = 0; i < uses.GetCount(); i++) {
+		int f = wspc.package.Find(uses[i]);
+		if(f >= 0) {
+			const Package& pk = wspc.package[f];
+			Index<String> config = PackageConfig(wspc, f, bm, mainparam, host, builder);
+			Vector<String> pklibs = Split(Gather(pk.library, config.GetKeys()), ' ');
+			FindAppend(libraries, pklibs);
+		}
+	}
+	return libraries.PickKeys();
+}
+
+bool Ide::Build(const Workspace& wspc, String mainparam, String outfile, bool clear_console)
+{
+	ClearErrorEditor();
+	BeginBuilding(true, clear_console);
+	bool ok = true;
+	if(wspc.GetCount()) {
+		Vector<int> build_order;
+		if(GetTargetMode().linkmode != 2) {
+			for(int i = 1; i < wspc.GetCount(); i++)
+				build_order.Add(i);
+		}
+		else {
+			Index<int> remaining;
+			for(int i = 1; i < wspc.GetCount(); i++)
+				remaining.Add(i);
+			while(!remaining.IsEmpty()) {
+				int t;
+				for(t = 0; t < remaining.GetCount(); t++) {
+					const Package& pk = wspc.package[remaining[t]];
+					bool delay = false;
+					for(int u = 0; u < pk.uses.GetCount(); u++)
+						if(remaining.Find(wspc.package.Find(pk.uses[u].text)) >= 0) {
+							delay = true;
+							break;
+						}
+					if(!delay)
+						break;
+				}
+				if(t >= remaining.GetCount())
+					t = 0;
+				build_order.Add(remaining[t]);
+				remaining.Remove(t);
+			}
+		}
+		String mainpackage = wspc[0];
+		Vector<String> linkfile;
+		String linkopt;
+		ok = true;
+		int ms = msecs();
+		for(int i = 0; i < build_order.GetCount() && (ok || !stoponerrors); i++) {
+			int px = build_order[i];
+			ok = BuildPackage(wspc, px, i, build_order.GetCount() + 1,
+				mainparam, Null, linkfile, linkopt) && ok;
+			if(msecs() - ms >= 200) {
+				ProcessEvents();
+				ms = msecs();
+			}
+		}
+		if(ok || !stoponerrors)
+			ok = BuildPackage(wspc, 0, build_order.GetCount(), build_order.GetCount() + 1,
+				mainparam, outfile, linkfile, linkopt, ok) && ok;
+	}
+	EndBuilding(ok);
+	ReQualifyBrowserBase();
+	SetErrorEditor();
+	return ok;
+}
+
+bool Ide::Build()
+{
+	VectorMap<String, String> bm = GetMethodVars(method);
+	if(bm.GetCount() == 0) {
+		PutConsole("Invalid build method");
+		return false;
+	}
+	One<Host> host = CreateHost(false);
+	Index<String> p = PackageConfig(IdeWorkspace(), 0, bm, mainconfigparam,
+	                                *host, *CreateBuilder(~host));
+	Workspace wspc;
+	wspc.Scan(main, p.GetKeys());
+	return Build(wspc, mainconfigparam, Null);
+}
+
+void Ide::DoBuild()
+{
+	Build();
+}
+
+void Ide::PackageBuild()
+{
+	BeginBuilding();
+	int pi = package.GetCursor();
+	const Workspace& wspc = IdeWorkspace();
+	if(pi >= 0 && pi <= wspc.GetCount()) {
+		Vector<String> linkfile;
+		String linkopt;
+		bool ok = BuildPackage(wspc, pi, 0, 1, mainconfigparam, Null, linkfile, linkopt);
+		EndBuilding(ok);
+	}
+}
+
+void Ide::StopBuild()
+{
+	if(idestate == BUILDING) {
+		console.Kill();
+		PutConsole("User break.");
+		SetIdeState(EDITING);
+	}
+}
+
+String Ide::GetOutputDir()
+{
+	return GetFileFolder(target);
+}
+
+void Ide::CleanPackage(const Workspace& wspc, int package)
+{
+	PutConsole(NFormat("Cleaning %s", wspc[package]));
+	One<Host> host = CreateHost(false);
+	host->DeleteFolderDeep(OutDir(PackageConfig(wspc, package, GetMethodVars(method), mainconfigparam,
+		*host, *CreateBuilder(~host)), wspc[package], GetMethodVars(method)));
+}
+
+void Ide::Clean()
+{
+	console.Clear();
+	const Workspace& wspc = IdeWorkspace();
+	for(int i = 0; i < wspc.GetCount(); i++)
+		CleanPackage(wspc, i);
+	PutConsole("...done");
+}
+
+void Ide::PackageClean()
+{
+	int pi = package.GetCursor();
+	const Workspace& wspc = IdeWorkspace();
+	if(pi >= 0 && pi < wspc.GetCount()) {
+		console.Clear();
+		CleanPackage(wspc, pi);
+	}
+}
+
+void Ide::RebuildAll()
+{
+	Clean();
+	Build();
+}
+
+void Ide::CleanUppOut()
+{
+	String out = GetVar("OUTPUT");
+	if(!PromptYesNo(NFormat("Erase the whole output directory [* \1%s\1]?", out)))
+		return;
+	console.Clear();
+	PutConsole("UPPOUT cleanup...");
+	DeleteFolderDeep(out);
+	PutConsole("(done)");
+	HideBottom();
+}
+
+void Ide::SwitchHeader() {
+	int c = filelist.GetCursor();
+	if(c < 0) return;
+	String currfile = filelist[c];
+	const char *ext = GetFileExtPos(currfile);
+	if(!stricmp(ext, ".h") || !stricmp(ext, ".hpp")
+	|| !stricmp(ext, ".lay") || !stricmp(ext, ".iml")) {
+		int f = filelist.Find(ForceExt(currfile, ".cpp"));
+		if(f < 0) f = filelist.Find(ForceExt(currfile, ".c"));
+		if(f < 0) f = filelist.Find(ForceExt(currfile, ".cc"));
+		if(f >= 0) filelist.SetCursor(f);
+	}
+}
+
+void Ide::FileCompile()
+{
+	if(editfile.IsEmpty())
+		return;
+	ClearErrorEditor(editfile);
+	SwitchHeader();
+	BeginBuilding();
+	const Workspace& wspc = IdeWorkspace();
+	bool ok = true;
+	onefile = editfile;
+	if(wspc.GetCount()) {
+		Vector<String> linkfile;
+		String linkopt;
+		for(int i = 0; i < wspc.GetCount(); i++)
+			BuildPackage(wspc, i, 1, wspc.GetCount(), mainconfigparam, Null, linkfile, linkopt, false);
+	}
+	onefile.Clear();
+	EndBuilding(ok);
+	SetErrorEditor();
+}
+
+void Ide::Preprocess() {
+	if(editfile.IsEmpty())
+		return;
+	int pi = package.GetCursor();
+	if(pi < 0) return;
+	SwitchHeader();
+	String pfn = ConfigFile(GetFileTitle(editfile) + ".i.tmp");
+	DeleteFile(pfn);
+	const Workspace& wspc = IdeWorkspace();
+	if(pi >= wspc.GetCount())
+		return;
+	One<Host> host = CreateHost(true);
+	One<Builder> b = CreateBuilder(~host);
+	Vector<String> linkfile;
+	String linkopt;
+	b->config = PackageConfig(wspc, pi, GetMethodVars(method), mainconfigparam, *host, *b);
+	console.Clear();
+	PutConsole("Preprocessing " + editfile);
+	b->Preprocess(wspc[pi], editfile, pfn);
+	HideBottom();
+	if(FileExists(pfn)) {
+		EditFile(pfn);
+		if(!editor.IsReadOnly())
+			ToggleReadOnly();
+	}
+}
+
+void Ide::CreateMakefile()
+{
+	const Workspace& wspc = IdeWorkspace();
+	if(wspc.GetCount() == 0) {
+		PutConsole("Project is empty!");
+		return;
+	}
+	FileSel mfout;
+	mfout.AllFilesType();
+	mfout <<= AppendFileName(GetFileDirectory(PackagePath(wspc[0])), "Makefile");
+	if(!mfout.ExecuteSaveAs("Save makefile as"))
+		return;
+	SaveMakeFile(~mfout);
+}
+
+void Ide::SaveMakeFile(const String& fn)
+{
+	const Workspace& wspc = IdeWorkspace();
+
+	BeginBuilding(false);
+
+	VectorMap<String, String> bm = GetMethodVars(method);
+	One<Host> host = CreateHost(false);
+	One<Builder> b = CreateBuilder(~host);
+	const TargetMode& tm = GetTargetMode();
+
+	String makefile;
+
+	Vector<String> uppdirs = GetUppDirs();
+	String uppout = host->GetHostPath(GetVar("OUTPUT"));
+	String inclist;
+
+	Index<String> allconfig = PackageConfig(wspc, 0, bm, mainconfigparam, *host, *b);
+	bool win32 = allconfig.Find("WIN32") >= 0;
+
+	for(int i = 1; i < wspc.GetCount(); i++) {
+		Index<String> modconfig = PackageConfig(wspc, i, bm, mainconfigparam, *host, *b);
+		for(int a = allconfig.GetCount(); --a >= 0;)
+			if(modconfig.Find(allconfig[a]) < 0)
+				allconfig.Remove(a);
+	}
+
+	for(int i = 0; i < uppdirs.GetCount(); i++) {
+		String srcdir = GetMakePath(AdjustMakePath(host->GetHostPath(AppendFileName(uppdirs[i], ""))), win32);
+		makefile << "UPPDIR" << (i + 1) << " = " << srcdir << "\n";
+		inclist << " -I$(UPPDIR" << (i + 1) << ")";
+	}
+	Vector<String> includes = SplitDirs(bm.Get("INCLUDE",""));
+	for(int i = 0; i < includes.GetCount(); i++)
+		inclist << " -I" << includes[i];
+
+	makefile << "\n"
+		"UPPOUT = " << GetMakePath(AdjustMakePath(host->GetHostPath(AppendFileName(uppout, ""))), win32) << "\n"
+		"CINC = " << inclist << "\n"
+		"Macro = ";
+
+	for(int i = 0; i < allconfig.GetCount(); i++)
+		makefile << " -Dflag" << allconfig[i];
+	makefile << "\n";
+
+	String output, config, install, rules, linkdep, linkfiles, linkfileend;
+
+	for(int i = 0; i < wspc.GetCount(); i++) {
+		b->config = PackageConfig(wspc, i, bm, mainconfigparam, *host, *b);
+		b->version = tm.version;
+		b->method = method;
+		MakeFile mf;
+		b->AddMakeFile(mf, wspc[i], GetAllUses(wspc, i), GetAllLibraries(wspc, i, bm, mainconfigparam, *host, *b), allconfig);
+		if(!i) {
+			String tdir = mf.outdir;
+			String trg;
+			if(tm.target_override) {
+				trg = GetMakePath(AdjustMakePath(tm.target), win32);
+				if(!trg.IsEmpty() && *trg.Last() == (win32 ? '\\' : '/'))
+					trg << mf.outfile;
+				else if(trg.Find(win32 ? '\\' : '/') < 0)
+					trg.Insert(0, "$(OutDir)");
+			}
+			output = Nvl(trg, mf.output);
+			install << "\n"
+				"OutDir = " << tdir << "\n"
+				"OutFile = " << output << "\n"
+				"\n"
+				".PHONY: all\n"
+				"all: install $(OutFile)\n"
+				"\n"
+				".PHONY: install\n"
+				"install:\n";
+		}
+		config << mf.config;
+		install << mf.install;
+		rules << mf.rules;
+		linkdep << mf.linkdep;
+		linkfiles << mf.linkfiles;
+		linkfileend << mf.linkfileend;
+	}
+
+	makefile
+		<< config
+		<< install
+		<< "\n"
+		"$(OutFile): " << linkdep << "\n\t" << linkfiles << linkfileend << "\n"
+		<< rules;
+
+	if(::SaveFile(fn, makefile))
+		PutConsole(NFormat("%s(1): makefile generation complete", fn));
+	else
+		PutConsole(NFormat("%s: error writing makefile", fn));
+
+	EndBuilding(true);
+}
+
+#ifdef PLATFORM_WIN32
+void Ide::OpenOutputFolder()
+{
+	LaunchWebBrowser(GetFileFolder(target));
+}
+#endif
diff --git a/uppsrc/ide/Builders/Builders.h b/uppsrc/ide/Builders/Builders.h
new file mode 100644
index 000000000..71ffedd10
--- /dev/null
+++ b/uppsrc/ide/Builders/Builders.h
@@ -0,0 +1,142 @@
+#ifndef BUILDERS_H
+#define BUILDERS_H
+
+#include <ide/Common/Common.h>
+
+void PutCompileTime(int time, int count);
+
+struct Blitz {
+	bool   build;
+	int    count;
+	String path;
+	String object;
+	String info;
+};
+
+struct CppBuilder : Builder {
+	virtual String GetTargetExt() const;
+
+	const Workspace& wspc;
+	Time             targettime;
+
+	String                 GetSharedLibPath(const String& package) const;
+	String                 GetHostPath(const String& path) const;
+	String                 GetHostPathShort(const String& path) const;
+	String                 GetHostPathQ(const String& path) const;
+	String                 GetHostPathShortQ(const String& path) const;
+	String                 GetLocalPath(const String& path) const;
+	Vector<Host::FileInfo> GetFileInfo(const Vector<String>& path) const;
+	Host::FileInfo         GetFileInfo(const String& path) const;
+	Time                   GetFileTime(const String& path) const;
+	bool                   FileExists(const String& path) const;
+	void                   DeleteFile(const Vector<String>& path);
+	void                   DeleteFile(const String& path);
+	void                   ChDir(const String& path);
+	void                   SaveFile(const String& path, const String& data);
+	String                 LoadFile(const String& path);
+	int                    Execute(const char *cmdline);
+	int                    Execute(const char *cl, Stream& out);
+	int                    AllocSlot();
+	bool                   Run(const char *cmdline, int slot, String key, int blitz_count);
+	bool                   Run(const char *cmdline, Stream& out, int slot, String key, int blitz_count);
+	bool                   Wait();
+	bool                   HasFlag(const char *f) const        { return config.Find(f) >= 0; }
+	Vector<String>         CustomStep(const String& file);
+
+	String                 Includes(const char *sep);
+	String                 IncludesShort(const char *sep);
+	String                 IncludesDefinesTargetTime();
+
+	String                 GetMakePath(String fn) const;
+	Point                  ExtractVersion();
+
+	void                   ShowTime(int count, int start_time);
+
+	Blitz BlitzStep(Vector<String>& sfile, Vector<String>& soptions,
+	                Vector<String>& obj, const char *objext, Vector<bool>& optimize);
+
+	virtual void           AddMakeFile(MakeFile& makefile, String package,
+		const Vector<String>& all_uses, const Vector<String>& all_libraries,
+		const Index<String>& common_config);
+
+	CppBuilder() : wspc(GetIdeWorkspace()) {}
+};
+
+struct GccBuilder : CppBuilder {
+	virtual void   AddFlags(Index<String>& cfg);
+	virtual bool   BuildPackage(const String& package, Vector<String>& linkfile, String& linkoptions,
+		const Vector<String>& all_uses, const Vector<String>& all_libraries, int optimize);
+	virtual bool   Link(const Vector<String>& linkfile, const String& linkoptions, bool createmap);
+	virtual bool   Preprocess(const String& package, const String& file, const String& target);
+
+	String CompilerName() const;
+	String CmdLine();
+	void BinaryToObject(String objfile, CParser& binscript, String basedir);
+};
+
+struct MscBuilder : CppBuilder {
+	typedef MscBuilder CLASSNAME;
+
+	virtual void   AddFlags(Index<String>& cfg);
+	virtual bool   BuildPackage(const String& package, Vector<String>& linkfile, String& linkoptions,
+		const Vector<String>& all_uses, const Vector<String>& all_libraries, int optimize);
+	virtual bool   Link(const Vector<String>& linkfile, const String& linkoptions, bool createmap);
+	virtual bool   Preprocess(const String& package, const String& file, const String& target);
+
+	String CmdLine();
+	String MachineName() const;
+	String LinkerName() const;
+	String PdbPch(String package, int slot, bool do_pch) const;
+	bool   HasAnyDebug() const;
+	void   BinObjConsole(String c) { PutConsole(c); }
+	bool   IsMsc89() const;
+	bool   IsMsc86() const;
+	bool   IsMscArm() const;
+	bool   IsMsc64() const;
+};
+
+struct JavaBuilder : CppBuilder {
+	virtual bool   BuildPackage(const String& package, Vector<String>& linkfile, String& linkoptions,
+		const Vector<String>& all_uses, const Vector<String>& all_libraries, int optimize);
+	virtual bool   Link(const Vector<String>& linkfile, const String& linkoptions, bool createmap);
+	virtual bool   Preprocess(const String& package, const String& file, const String& target);
+
+	bool           PreprocessJava(String file, String target, String options);
+	Time           AddClassDeep(String& link, String dir, String reldir);
+
+	String         JavaLine();
+	String         JarLine();
+};
+
+struct ScriptBuilder : CppBuilder {
+public:
+	typedef ScriptBuilder CLASSNAME;
+	ScriptBuilder() : is_parsed(false), script_error(false) {}
+
+	virtual bool   BuildPackage(const String& package, Vector<String>& linkfile, String& linkoptions,
+		const Vector<String>& all_uses, const Vector<String>& all_libraries, int optimize);
+	virtual bool   Link(const Vector<String>& linkfile, const String& linkoptions, bool createmap);
+	virtual bool   Preprocess(const String& package, const String& file, const String& target);
+
+	String         CmdLine();
+
+private:
+	void           CheckParse();
+
+	EscValue       ExecuteIf(const char *fn, Vector<EscValue>& args);
+	EscValue       ExecuteIf(const char *fn);
+	EscValue       ExecuteIf(const char *fn, EscValue arg);
+	EscValue       ExecuteIf(const char *fn, EscValue arg1, EscValue arg2);
+	EscValue       ExecuteIf(const char *fn, EscValue arg1, EscValue arg2, EscValue arg3);
+
+	void           ESC_Execute(EscEscape& e);
+	void           ESC_PutConsole(EscEscape& e);
+	void           ESC_PutVerbose(EscEscape& e);
+
+private:
+	ArrayMap<String, EscValue> globals;
+	bool is_parsed;
+	bool script_error;
+};
+
+#endif
diff --git a/uppsrc/ide/Builders/Builders.upp b/uppsrc/ide/Builders/Builders.upp
new file mode 100644
index 000000000..36de371bb
--- /dev/null
+++ b/uppsrc/ide/Builders/Builders.upp
@@ -0,0 +1,14 @@
+description "TheIDE - builders - routines to compile programs";
+
+uses
+	ide\Common,
+	coff\binobj;
+
+file
+	Builders.h,
+	CppBuilder.cpp,
+	GccBuilder.cpp,
+	MscBuilder.cpp,
+	JavaBuilder.cpp,
+	ScriptBuilder.cpp;
+
diff --git a/uppsrc/ide/Builders/CppBuilder.cpp b/uppsrc/ide/Builders/CppBuilder.cpp
new file mode 100644
index 000000000..3302fc804
--- /dev/null
+++ b/uppsrc/ide/Builders/CppBuilder.cpp
@@ -0,0 +1,593 @@
+#include "Builders.h"
+
+void PutCompileTime(int time, int count)
+{
+	PutConsole(String().Cat() << count << " file(s) compiled in " << GetPrintTime(time)
+	           << " " << int(GetTickCount() - time) / count << " msec/file");
+}
+
+String CppBuilder::GetTargetExt() const
+{
+	if(!HasFlag("WIN32") && !HasFlag("WINCE"))
+		return HasFlag("DLL") ? ".so" : "";
+	else
+		return HasFlag("DLL") ? ".dll" : ".exe";
+}
+
+String CppBuilder::GetSharedLibPath(const String& package) const
+{
+	String outfn;
+	for(const char *p = package; *p; p++)
+		outfn.Cat(IsAlNum(*p) || *p == '-' ? *p : '_');
+	if(!IsNull(version))
+		outfn << version;
+	outfn << (HasFlag("WIN32") || HasFlag("WINCE") ? ".dll" : ".so");
+	return CatAnyPath(GetFileFolder(target), outfn);
+}
+
+String CppBuilder::GetHostPath(const String& path) const
+{
+	return host->GetHostPath(path);
+}
+
+String CppBuilder::GetHostPathShort(const String& path) const
+{
+#ifdef PLATFORM_WIN32
+	const dword SHORT_PATH_LENGTH = 2048;
+	char short_path[SHORT_PATH_LENGTH];
+	dword length = ::GetShortPathName((LPCTSTR) path, (LPTSTR) short_path, SHORT_PATH_LENGTH);
+	if(length > 0)
+		return String(short_path, length);
+#endif
+	return path;
+}
+
+String CppBuilder::GetHostPathQ(const String& path) const
+{
+	return '\"' + GetHostPath(path) + '\"';
+}
+
+String CppBuilder::GetHostPathShortQ(const String& path) const
+{
+	return '\"' + GetHostPathShort(path) + '\"';
+}
+
+String CppBuilder::GetLocalPath(const String& path) const
+{
+	return host->GetLocalPath(path);
+}
+
+Vector<Host::FileInfo> CppBuilder::GetFileInfo(const Vector<String>& path) const
+{
+	return host->GetFileInfo(path);
+}
+
+Host::FileInfo CppBuilder::GetFileInfo(const String& path) const
+{
+	return GetFileInfo(Vector<String>() << path)[0];
+}
+
+Time CppBuilder::GetFileTime(const String& path) const
+{
+	return GetFileInfo(path);
+}
+
+void CppBuilder::DeleteFile(const Vector<String>& path)
+{
+	host->DeleteFile(path);
+}
+
+void CppBuilder::DeleteFile(const String& path)
+{
+	host->DeleteFile(Vector<String>() << path);
+}
+
+int CppBuilder::Execute(const char *cmdline)
+{
+	return host->Execute(cmdline);
+}
+
+int CppBuilder::Execute(const char *cl, Stream& out)
+{
+	return host->Execute(cl, out);
+}
+
+int CppBuilder::AllocSlot()
+{
+	return host->AllocSlot();
+}
+
+bool CppBuilder::Run(const char *cmdline, int slot, String key, int blitz_count)
+{
+	return host->Run(cmdline, slot, key, blitz_count);
+}
+
+bool CppBuilder::Run(const char *cmdline, Stream& out, int slot, String key, int blitz_count)
+{
+	return host->Run(cmdline, out, slot, key, blitz_count);
+}
+
+bool CppBuilder::Wait()
+{
+	return host->Wait();
+}
+
+void CppBuilder::ChDir(const String& path)
+{
+	host->ChDir(path);
+}
+
+void CppBuilder::SaveFile(const String& path, const String& data)
+{
+	host->SaveFile(path, data);
+}
+
+String CppBuilder::LoadFile(const String& path)
+{
+	return host->LoadFile(path);
+}
+
+bool CppBuilder::FileExists(const String& path) const
+{
+	return !IsNull(GetFileInfo(path).length);
+}
+
+int CasFilter(int c) {
+	return c == '\n' ? '\n' : c == '\t' ? ' ' : c >= ' ' ? c : 0;
+}
+
+int CharFilterEol(int c) {
+	return c == '\n' || c == '\r' ? c : 0;
+}
+
+Vector<String> Cuprep(const String& m, const VectorMap<String, String>& mac,
+                      const Vector<String>& inc) {
+	String r;
+	String q = Filter(m, CasFilter);
+	const char *s = q;
+	while(*s)
+		if(*s == '$') {
+			String v;
+			s++;
+			if(*s == '$') {
+				r.Cat('$');
+				s++;
+			}
+			else
+			if(*s == '(') {
+				s++;
+				bool pinc = false;
+				if(*s == '!') {
+					pinc = true;
+					s++;
+				}
+				for(;;) {
+					if(*s == ')') {
+						s++;
+						break;
+					}
+					if(*s == '\0')
+						break;
+					v.Cat(*s++);
+				}
+				if(pinc)
+					for(int i = 0; i < inc.GetCount(); i++)
+						if(inc[i].Find(' '))
+							r << v << '"' << inc[i] << "\" ";
+						else
+							r << v << inc[i] << ' ';
+				else
+					r.Cat(mac.Get(v, Null));
+			}
+			else
+				r.Cat('$');
+		}
+		else
+			r.Cat(*s++);
+	return Split(r, CharFilterTextTest(CharFilterEol));
+}
+
+bool IsCd(const String& cmd) {
+	if(cmd.GetLength() > 2 && ToLower(cmd.Mid(0, 3)) == "cd ") {
+	#ifdef PLATFOTM_POSIX
+		chdir(path);
+	#endif
+	#ifdef PLATFORM_WIN32
+		SetCurrentDirectory(cmd.Mid(3));
+	#endif
+		return true;
+	}
+	return false;
+}
+
+static void AddPath(VectorMap<String, String>& out, String key, String path)
+{
+	out.Add(key, path);
+	out.Add(key + "_WIN", WinPath(path));
+	out.Add(key + "_UNIX", UnixPath(path));
+}
+
+Vector<String> CppBuilder::CustomStep(const String& path)
+{
+	String file = GetHostPath(path);
+	String ext = ToLower(GetFileExt(file));
+	for(int i = 0; i < wspc.GetCount(); i++) {
+		const Array< ::CustomStep >& mv = wspc.GetPackage(i).custom;
+		for(int j = 0; j < mv.GetCount(); j++) {
+			const ::CustomStep& m = mv[j];
+			if(MatchWhen(m.when, config.GetKeys()) && m.MatchExt(ext)) {
+				VectorMap<String, String> mac;
+				AddPath(mac, "PATH", file);
+				AddPath(mac, "DIR", GetFileFolder(file));
+				mac.Add("FILE", GetFileName(file));
+				mac.Add("TITLE", GetFileTitle(file));
+				AddPath(mac, "OUTPATH", GetHostPath(target));
+				AddPath(mac, "OUTDIR", GetHostPath(outdir));
+				mac.Add("OUTFILE", GetFileName(target));
+				mac.Add("OUTTITLE", GetFileTitle(target));
+				mac.Add("INCLUDE", Join(include, ";"));
+				Vector<String> out = Cuprep(m.output, mac, include);
+				bool dirty = out.IsEmpty();
+				for(int i = 0; !dirty && i < out.GetCount(); i++)
+					dirty = (GetFileTime(file) > GetFileTime(out[i]));
+				if(dirty) {
+					HdependTimeDirty();
+					PutConsole(GetFileName(file));
+					Vector<String> cmd = Cuprep(m.command, mac, include);
+					String cmdtext;
+					for(int c = 0; c < cmd.GetCount(); c++)
+						if(!IsCd(cmd[c])) {
+							String ctext = cmd[c];
+							const char *cm = ctext;
+							if(*cm == '?')
+								cm++;
+							if(*ctext != '?' && Execute(cm)) {
+								for(int t = 0; t < out.GetCount(); t++)
+									DeleteFile(out[t]);
+								return Vector<String>();
+							}
+						}
+				}
+				return out;
+			}
+		}
+	}
+	Vector<String> out;
+	out.Add(path);
+	return out;
+}
+
+static Time s_bb = Null;
+
+Time BlitzBaseTime()
+{
+	if(IsNull(s_bb))
+		s_bb = GetSysTime();
+	return max(GetSysTime() - 3600, s_bb);
+}
+
+Blitz CppBuilder::BlitzStep(Vector<String>& sfile, Vector<String>& soptions,
+                            Vector<String>& obj, const char *objext,
+                            Vector<bool>& optimize)
+{
+	Blitz b;
+	Time now = GetSysTime();
+	Vector<String> excluded;
+	Vector<String> excludedoptions;
+	Vector<bool>   excludedoptimize;
+	b.object = CatAnyPath(outdir, "$blitz" + String(objext));
+	Time blitztime = GetFileTime(b.object);
+	String blitz;
+	b.count = 0;
+	b.build = false;
+	if(!IdeGetOneFile().IsEmpty())
+		return b;
+	for(int i = 0; i < sfile.GetCount(); i++) {
+		String fn = sfile[i];
+		String ext = ToLower(GetFileExt(fn));
+		String objfile = CatAnyPath(outdir, GetFileTitle(fn) + objext);
+		Time fntime = GetFileTime(fn);
+		if((ext == ".cpp" || ext == ".cc" || ext == ".cxx")
+		   && HdependBlitzApproved(fn) && IsNull(soptions[i]) && !optimize[i]
+//		   && (fntime < blitztime || !blitzexists)
+//		   && (!FileExists(objfile) || now - fntime > 3600)) { // Causes a strage oscillation
+		   && fntime < BlitzBaseTime()) {
+			if(HdependFileTime(fn) > blitztime)
+				b.build = true;
+			blitz << "\r\n"
+			      << "#define BLITZ_INDEX__ F" << i << "\r\n"
+			      << "#include \"" << GetHostPath(fn) << "\"\r\n";
+			b.info << ' ' << GetFileName(fn);
+			const Vector<String>& d = HdependGetDefines(fn);
+			for(int i = 0; i < d.GetCount(); i++)
+				blitz << "#ifdef " << d[i] << "\r\n"
+				      << "#undef " << d[i] << "\r\n"
+				      << "#endif\r\n";
+			blitz << "#undef BLITZ_INDEX__\r\n";
+			b.count++;
+		}
+		else {
+			excluded.Add(fn);
+			excludedoptions.Add(soptions[i]);
+			excludedoptimize.Add(optimize[i]);
+		}
+	}
+	b.path = CatAnyPath(outdir, "$blitz.cpp");
+	if(b.count > 1) {
+		sfile = excluded;
+		soptions = excludedoptions;
+		optimize = excludedoptimize;
+		if(LoadFile(b.path) != blitz) {
+			SaveFile(b.path, blitz);
+			b.build = true;
+		}
+		obj.Add(b.object);
+	}
+	else {
+		DeleteFile(b.path);
+		b.build = false;
+	}
+	return b;
+}
+
+String CppBuilder::Includes(const char *sep)
+{
+	String cc;
+	for(int i = 0; i < include.GetCount(); i++)
+		cc << sep << GetHostPathQ(include[i]);
+	return cc;
+}
+
+String CppBuilder::IncludesShort(const char *sep)
+{
+	String cc;
+	for(int i = 0; i < include.GetCount(); i++)
+		cc << sep << GetHostPathShortQ(include[i]);
+	return cc;
+}
+
+String CppBuilder::IncludesDefinesTargetTime()
+{
+	String cc = Includes(" -I");
+	for(int i = 0; i < config.GetCount(); i++)
+		cc << " -Dflag" << config[i];
+	Time t = GetSysTime();
+	cc << " -DbmYEAR=" << (int)t.year;
+	cc << " -DbmMONTH=" << (int)t.month;
+	cc << " -DbmDAY=" << (int)t.day;
+	cc << " -DbmHOUR=" << (int)t.hour;
+	cc << " -DbmMINUTE=" << (int)t.minute;
+	cc << " -DbmSECOND=" << (int)t.second;
+	targettime = GetFileTime(target);
+	return cc;
+}
+
+static String MakeIdent(const char *name)
+{
+	String out;
+	for(; *name; name++)
+		out << (iscid(*name) ? *name : '_');
+	return out;
+}
+
+static String MakeSourcePath(const Vector<String>& dirs, String fn, bool raw)
+{
+	fn = UnixPath(fn);
+	for(int i = 0; i < dirs.GetCount(); i++)
+	{
+		int dl = dirs[i].GetLength();
+		if(fn.GetLength() >= dl + 2 && !memcmp(fn, dirs[i], dl) && fn[dl] == '/')
+			return String().Cat() << "$(UPPDIR" << (i + 1) << ")" << AdjustMakePath(fn.GetIter(dl + 1));
+	}
+	return raw ? String() : AdjustMakePath(fn);
+}
+
+String CppBuilder::GetMakePath(String fn) const
+{
+	return ::GetMakePath(fn, HasFlag("WIN32"));
+}
+
+void CppBuilder::AddMakeFile(MakeFile& makefile, String package,
+	const Vector<String>& all_uses, const Vector<String>& all_libraries,
+	const Index<String>& common_config)
+{
+	String packagepath = PackagePath(package);
+	Package pkg;
+	pkg.Load(packagepath);
+	String packagedir = GetFileFolder(packagepath);
+	Vector<String> src = GetUppDirs();
+	for(int i = 0; i < src.GetCount(); i++)
+		src[i] = UnixPath(src[i]);
+
+	bool main = HasFlag("MAIN");
+	bool is_shared = HasFlag("SO");
+	bool libout = !main && !HasFlag("NOLIB");
+	bool win32 = HasFlag("WIN32");
+
+	String pack_ident = MakeIdent(package);
+	String outdir = "OutDir_" + pack_ident;
+	String macros = "Macro_" + pack_ident;
+	String macdef = "$(Macro)";
+	String objext = (HasFlag("MSC") || HasFlag("EVC") ? ".obj" : ".o");
+
+	Vector<String> x(config.GetKeys(), 1);
+	Sort(x);
+	for(int i = 0; i < x.GetCount(); i++) {
+		if(common_config.Find(x[i]) < 0)
+			macdef << " -Dflag" << x[i];
+		x[i] = InitCaps(x[i]);
+	}
+
+	makefile.outdir << "$(" << outdir << ")";
+	makefile.outfile << AdjustMakePath(GetFileTitle(NativePath(package)));
+	if(main)
+		makefile.outfile << GetTargetExt();
+	else if(is_shared)
+		makefile.outfile << (win32 ? ".dll" : ".so");
+	else
+		makefile.outfile << (win32 && HasFlag("MSC") ? ".lib" : ".a");
+	makefile.output << (main ? String("$(OutDir)") : makefile.outdir) << makefile.outfile;
+
+	if(main) {
+		String cc = "c++ -c";
+		if(HasFlag("DEBUG"))
+			cc << " -D_DEBUG " << debug_options;
+		else
+			cc << ' ' << release_options;
+		if(HasFlag("DEBUG_MINIMAL"))
+			cc << " -ggdb -g1";
+		if(HasFlag("DEBUG_FULL"))
+			cc << " -ggdb -g2";
+		if(is_shared && !win32)
+			cc << " -fPIC ";
+		cc << ' ' << Gather(pkg.option, config.GetKeys());
+		makefile.config << "CC = " << cc << "\n"
+			"CFLAGS = $(CC) -x c\n"
+			"CPPFLAGS = $(CC) -x c++ \n"
+			"LIBPATH = ";
+		for(int i = 0; i < libpath.GetCount(); i++)
+			makefile.config << " -L" << GetMakePath(AdjustMakePath(GetHostPathQ(libpath[i])));
+		makefile.config << "\n"
+			"AR = ar -sr\n";
+
+		makefile.install << "\t-mkdir -p $(OutDir)\n";
+
+		Vector<String> lib;
+		String lnk;
+		lnk << "c++";
+		if(!HasFlag("SHARED"))
+			lnk << " -static";
+		if(HasFlag("WIN32")) {
+			lnk << " -mwindows";
+			if(!HasFlag("GUI"))
+				makefile.linkfiles << " -mconsole";
+		}
+		lnk << " -o $(OutFile)";
+		if(HasFlag("DEBUG") || HasFlag("DEBUG_MINIMAL") || HasFlag("DEBUG_FULL"))
+			lnk << " -ggdb";
+		else
+			lnk << (!HasFlag("OSX11") ? " -Wl,-s" : "");
+
+		lnk << " $(LIBPATH)";
+		if (!HasFlag("OSX11"))
+		  lnk << " -Wl,-O,2";
+		lnk << " $(LINKOPTIONS)";
+
+		makefile.linkfiles = lnk;
+	}
+
+	makefile.config << outdir << " = $(UPPOUT)"
+		<< GetMakePath(AdjustMakePath(String().Cat() << package << '/' << method << '-' << Join(x, "-") << '/')) << "\n"
+		<< macros << " = " << macdef << "\n";
+
+	makefile.install << "\t-mkdir -p $(" << outdir << ")\n";
+
+	String libdep, libfiles;
+
+	libdep << makefile.output << ":";
+	if(is_shared)
+	{
+		libfiles = "c++ -shared -fPIC"; // -v";
+		Point p = ExtractVersion();
+		if(!IsNull(p.x)) {
+			libfiles << " -Xlinker --major-image-version -Xlinker " << p.x;
+			if(!IsNull(p.y))
+				libfiles << " -Xlinker --minor-image-version -Xlinker " << p.y;
+		}
+		libfiles << " -o ";
+	}
+	else
+		libfiles = "$(AR) ";
+	libfiles << makefile.output;
+
+	for(int i = 0; i < pkg.GetCount(); i++)
+		if(!pkg[i].separator) {
+			String gop = Gather(pkg[i].option, config.GetKeys());
+			String fn = SourcePath(package, pkg[i]);
+			String ext = ToLower(GetFileExt(fn));
+			bool isc = ext == ".c";
+			bool isrc = (ext == ".rc" && HasFlag("WIN32"));
+			bool iscpp = (ext == ".cpp" || ext == ".cc" || ext == ".cxx");
+			bool isicpp = (ext == ".icpp");
+			if(isc || isrc || iscpp || isicpp) {
+				String outfile;
+				outfile << makefile.outdir << AdjustMakePath(GetFileTitle(fn)) << (isrc ? "_rc" : "") << objext;
+				String srcfile = GetMakePath(MakeSourcePath(src, fn, false));
+				makefile.rules << outfile << ": " << srcfile;
+				Vector<String> dep = HdependGetDependencies(fn);
+				Sort(dep, GetLanguageInfo());
+				for(int d = 0; d < dep.GetCount(); d++) {
+					String dfn = MakeSourcePath(src, dep[d], true);
+					if(!IsNull(dfn))
+						makefile.rules << " \\\n\t" << GetMakePath(dfn);
+				}
+				makefile.rules << "\n"
+					"\t" << (isc ? "$(CFLAGS)" : "$(CPPFLAGS)") << " $(CINC) $(" << macros << ") "
+						<< gop << " " << srcfile << " -o " << outfile << "\n\n";
+				if(!libout || isicpp) {
+					makefile.linkdep << " \\\n\t" << outfile;
+					makefile.linkfiles << " \\\n\t\t" << outfile;
+				}
+				else {
+					libdep << " \\\n\t" << outfile;
+					libfiles << " \\\n\t\t" << outfile;
+				}
+			}
+			else
+			if(ext == ".o" || ext == ".obj" || ext == ".a" || ext == ".so" || ext == ".lib" || ext == ".dll") {
+				makefile.linkdep << " \\\n\t" << fn;
+				makefile.linkfiles << ' ' << fn;
+			}
+		}
+
+	if(libout) {
+		makefile.rules << libdep << "\n\t" << libfiles << "\n\n";
+		makefile.linkdep << " \\\n\t" << makefile.output;
+		makefile.linkfiles << " \\\n\t\t\t" << makefile.output;
+	}
+
+	if(main) {
+		if(!HasFlag("SOLARIS")&&!HasFlag("OSX11"))
+			makefile.linkfiles << " \\\n\t\t-Wl,--start-group ";
+		for(int i = 0; i < all_libraries.GetCount(); i++) {
+			String ln = all_libraries[i];
+			String ext = ToLower(GetFileExt(ln));
+			if(ext == ".a" || ext == ".so" || ext == ".dll")
+				makefile.linkfileend << " \\\n\t\t\t" << GetHostPathQ(FindInDirs(libpath, ln));
+			else
+				makefile.linkfileend << " \\\n\t\t\t-l" << ln;
+		}
+		if(!HasFlag("SOLARIS")&&!HasFlag("OSX11"))
+			makefile.linkfileend << " \\\n\t\t-Wl,--end-group\n\n";
+	}
+}
+
+Point CppBuilder::ExtractVersion()
+{
+	Point v = Point(Null, Null);
+	CParser p(version);
+	while(!p.IsEof()) {
+		if(p.IsNumber()) {
+			v.x = p.ReadNumber();
+			break;
+		}
+		p.GetChar();
+		p.Spaces();
+	}
+	while(!p.IsEof()) {
+		if(p.IsNumber()) {
+			v.y = p.ReadNumber();
+			break;
+		}
+		p.GetChar();
+		p.Spaces();
+	}
+	return v;
+}
+
+void CppBuilder::ShowTime(int count, int start_time)
+{
+	if(count)
+		PutConsole(NFormat("%d file(s) compiled in %s %d msec/file",
+			count, GetPrintTime(start_time), msecs(start_time) / count));
+}
diff --git a/uppsrc/ide/Builders/GccBuilder.cpp b/uppsrc/ide/Builders/GccBuilder.cpp
new file mode 100644
index 000000000..bec6cfa5a
--- /dev/null
+++ b/uppsrc/ide/Builders/GccBuilder.cpp
@@ -0,0 +1,475 @@
+#include "Builders.h"
+
+#include <coff/binobj/binobj.h>
+#include <plugin/bz2/bz2.h>
+
+void   GccBuilder::AddFlags(Index<String>& cfg)
+{
+}
+
+String GccBuilder::CompilerName() const
+{
+	if(!IsNull(compiler)) return compiler;
+	return HasFlag("GCC_ARM") ? "arm-wince-pe-c++" : "c++";
+}
+
+String GccBuilder::CmdLine()
+{
+	String cc = CompilerName();
+	cc << " -c ";
+	cc << IncludesDefinesTargetTime();
+	if(HasFlag("GCC32"))
+		cc << " -m32";
+	return cc;
+}
+
+void GccBuilder::BinaryToObject(String objfile, CParser& binscript, String basedir)
+{
+	BinObjInfo info;
+	info.Parse(binscript, basedir);
+	String fo;
+	for(int i = 0; i < info.blocks.GetCount(); i++) {
+		String ident = info.blocks.GetKey(i);
+		ArrayMap<int, BinObjInfo::Block>& belem = info.blocks[i];
+		if(belem[0].flags & (BinObjInfo::Block::FLG_ARRAY | BinObjInfo::Block::FLG_MASK)) {
+			int count = Max(belem.GetKeys()) + 1;
+			Vector<BinObjInfo::Block *> blockref;
+			blockref.SetCount(count, 0);
+			for(int a = 0; a < belem.GetCount(); a++) {
+				BinObjInfo::Block& b = belem[a];
+				blockref[b.index] = &b;
+			}
+			for(int i = 0; i < blockref.GetCount(); i++)
+				if(blockref[i]) {
+					BinObjInfo::Block& b = *blockref[i];
+					fo << "static char " << ident << "_" << i << "[] =\n";
+					String data = ::LoadFile(b.file);
+					if(data.IsVoid())
+						throw Exc(NFormat("Error reading file '%s'", b.file));
+					if(data.GetLength() != b.length)
+						throw Exc(NFormat("length of file '%s' changed (%d -> %d) during object creation",
+							b.file, b.length, data.GetLength()));
+					switch(b.encoding) {
+						case BinObjInfo::Block::ENC_BZ2: data = BZ2Compress(data); break;
+						case BinObjInfo::Block::ENC_ZIP: data = ZCompress(data); break;
+					}
+					b.length = data.GetLength();
+					data.Cat('\0');
+					fo << AsCString(data, 70) << ";\n\n";
+				}
+
+			fo << "int " << ident << "_count = " << blockref.GetCount() << ";\n\n"
+			"int " << ident << "_length[] = {\n";
+			for(int i = 0; i < blockref.GetCount(); i++)
+				fo << '\t' << (blockref[i] ? blockref[i]->length : -1) << ",\n";
+			fo << "};\n\n"
+			"char *" << ident << "[] = {\n";
+			for(int i = 0; i < blockref.GetCount(); i++)
+				if(blockref[i])
+					fo << '\t' << ident << '_' << i << ",\n";
+				else
+					fo << "\t0,\n";
+			fo << "};\n\n";
+			if(belem[0].flags & BinObjInfo::Block::FLG_MASK) {
+				fo << "char *" << ident << "_files[] = {\n";
+				for(int i = 0; i < blockref.GetCount(); i++)
+					fo << '\t' << AsCString(blockref[i] ? GetFileName(blockref[i]->file) : String(Null)) << ",\n";
+				fo << "};\n\n";
+			}
+		}
+		else {
+			BinObjInfo::Block& b = belem[0];
+			fo << "char *" << ident << " =\n";
+			String data = ::LoadFile(b.file);
+			if(data.IsVoid())
+				throw Exc(NFormat("Error reading file '%s'", b.file));
+			if(data.GetLength() != b.length)
+				throw Exc(NFormat("length of file '%s' changed (%d -> %d) during object creation",
+					b.file, b.length, data.GetLength()));
+			switch(b.encoding) {
+				case BinObjInfo::Block::ENC_BZ2: data = BZ2Compress(data); break;
+				case BinObjInfo::Block::ENC_ZIP: data = ZCompress(data); break;
+			}
+			int b_length = data.GetLength();
+			data.Cat('\0');
+			fo << AsCString(data, 70) << ";\n\n"
+			"int " << ident << "_length = " << b_length << ";\n\n";
+		}
+	}
+
+	String tmpfile = ForceExt(objfile, ".c");
+	SaveFile(tmpfile, fo);
+	String cc = CmdLine();
+	cc << " -c -o " << GetHostPathQ(objfile) << " -x c " << GetHostPathQ(tmpfile);
+	int slot = AllocSlot();
+	if(slot < 0 || !Run(cc, slot, objfile, 1))
+		throw Exc(NFormat("Error compiling binary object '%s'.", objfile));
+}
+
+bool GccBuilder::BuildPackage(const String& package, Vector<String>& linkfile,
+	String& linkoptions, const Vector<String>& all_uses, const Vector<String>& all_libraries,
+	int opt)
+{
+	int i;
+	String packagepath = PackagePath(package);
+	Package pkg;
+	pkg.Load(packagepath);
+	String packagedir = GetFileFolder(packagepath);
+	ChDir(packagedir);
+	PutVerbose("cd " + packagedir);
+	IdeConsoleBeginGroup(package);
+	Vector<String> obj;
+
+	bool is_shared = HasFlag("SO");
+	String shared_ext = (HasFlag("WIN32") ? ".dll" : ".so");
+
+	String cc = CmdLine();
+	if(HasFlag("WIN32") && HasFlag("MT"))
+		cc << " -mthreads";
+	if(HasFlag("DEBUG_MINIMAL"))
+		cc << (HasFlag("WIN32") ? " -g1" : " -ggdb -g1");
+	if(HasFlag("DEBUG_FULL"))
+		cc << (HasFlag("WIN32") ? " -g2" : " -ggdb -g2");
+	String fuse_cxa_atexit;
+	if(is_shared /*&& !HasFlag("MAIN")*/) {
+		cc << " -shared -fPIC";
+		fuse_cxa_atexit = " -fuse-cxa-atexit";
+	}
+	if(!HasFlag("SHARED") && !is_shared)
+		cc << " -static ";
+//	else if(!HasFlag("WIN32")) // TRC 05/03/08: dynamic fPIC doesn't seem to work in MinGW
+//		cc << " -dynamic -fPIC "; // TRC 05/03/30: dynamic fPIC doesn't seem to work in GCC either :-)
+	cc << ' ' << Gather(pkg.option, config.GetKeys());
+	cc << " -fexceptions ";
+
+	if (HasFlag("OSX11")) {
+	  if (HasFlag("POWERPC"))
+		cc << " -arch ppc";
+	  if (HasFlag("X86"))
+		cc << " -arch i386";
+	}
+
+	String cc_speed = cc;
+	bool   release = false;
+
+	if(HasFlag("DEBUG"))
+		cc << " -D_DEBUG " << debug_options;
+	else {
+		release = true;
+		cc << ' ' << release_size_options;
+		cc_speed << ' ' << release_options;
+		if(opt == R_SPEED || pkg.optimize_speed)
+			cc = cc_speed;
+	}
+
+	if(HasFlag("SSE2"))
+		cc << " -msse2 -mfpmath=sse";
+
+	Vector<String> sfile, isfile;
+	Vector<String> soptions, isoptions;
+	Vector<bool>   optimize, ioptimize;
+	bool           error = false;
+
+	for(i = 0; i < pkg.GetCount(); i++) {
+		if(!IdeIsBuilding())
+			return false;
+		if(!pkg[i].separator) {
+			String gop = Gather(pkg[i].option, config.GetKeys());
+			Vector<String> srcfile = CustomStep(SourcePath(package, pkg[i]));
+			if(srcfile.GetCount() == 0)
+				error = true;
+			for(int j = 0; j < srcfile.GetCount(); j++) {
+				String fn = srcfile[j];
+				String ext = ToLower(GetFileExt(fn));
+				if(ext == ".c" || ext == ".cpp" || ext == ".cc" || ext == ".cxx"
+				|| ext == ".s" || ext == ".S"
+				|| ext == ".brc" || (ext == ".rc" && HasFlag("WIN32"))) {
+					sfile.Add(fn);
+					soptions.Add(gop);
+					optimize.Add(release && pkg[i].optimize_speed && opt == R_OPTIMAL);
+				}
+				else
+				if(ext == ".icpp") {
+					isfile.Add(fn);
+					isoptions.Add(gop);
+					ioptimize.Add(release && pkg[i].optimize_speed && opt == R_OPTIMAL);
+				}
+				else
+				if(ext == ".o")
+					obj.Add(fn);
+				else
+				if(ext == ".a" || ext == ".so")
+					linkfile.Add(fn);
+			}
+		}
+	}
+
+	if(HasFlag("BLITZ")) {
+		Blitz b = BlitzStep(sfile, soptions, obj, ".o", optimize);
+		if(b.build) {
+			PutConsole("BLITZ:" + b.info);
+			int slot = AllocSlot();
+			if(slot < 0 || !Run(String().Cat() << cc << ' '
+			<< GetHostPathQ(b.path) << " -o " << GetHostPathQ(b.object), slot, GetHostPath(b.object), b.count))
+				error = true;
+		}
+	}
+
+	int first_ifile = sfile.GetCount();
+	sfile.AppendPick(isfile);
+	soptions.AppendPick(isoptions);
+	optimize.AppendPick(ioptimize);
+
+	int ccount = 0;
+	for(i = 0; i < sfile.GetCount(); i++) {
+		if(!IdeIsBuilding())
+			return false;
+		String fn = sfile[i];
+		String ext = ToLower(GetFileExt(fn));
+		bool rc = (ext == ".rc");
+		bool brc = (ext == ".brc");
+		bool init = (i >= first_ifile);
+		String objfile = CatAnyPath(outdir, GetFileTitle(fn) + (rc ? "$rc.o" : brc ? "$brc.o" : ".o"));
+		if(HdependFileTime(fn) > GetFileTime(GetHostPath(objfile))) {
+			PutConsole(GetFileName(fn));
+			int time = GetTickCount();
+			bool execerr = false;
+			if(rc) {
+				String exec;
+				exec << "windres -i " << GetHostPathQ(fn)
+					<< " -o " << GetHostPathQ(objfile) << IncludesShort(" --include-dir=");
+				PutVerbose(exec);
+				int slot = AllocSlot();
+				execerr = (slot < 0 || !Run(exec, slot, GetHostPath(objfile), 1));
+			}
+			else if(brc) {
+				try {
+//					String hfn = GetHostPath(fn);
+					String brcdata = LoadFile(fn);
+					if(brcdata.IsVoid())
+						throw Exc(NFormat("error reading file '%s'", fn));
+					CParser parser(brcdata, fn);
+					BinaryToObject(GetHostPath(objfile), parser, GetFileDirectory(fn));
+				}
+				catch(Exc e) {
+					PutConsole(e);
+					execerr = true;
+				}
+			}
+			else {
+				String exec = optimize[i] ? cc_speed : cc;
+				if(ext == ".c")
+					exec << " -x c ";
+				else if(ext == ".s" || ext == ".S")
+					exec << " -x assembler-with-cpp ";
+				else
+					exec << fuse_cxa_atexit << " -x c++ ";
+				exec << GetHostPathQ(fn) << " -o " << GetHostPathQ(objfile);
+				PutVerbose(exec);
+				int slot = AllocSlot();
+				execerr = (slot < 0 || !Run(exec, slot, GetHostPath(objfile), 1));
+			}
+			if(execerr)
+				DeleteFile(objfile);
+			error |= execerr;
+			PutVerbose("compiled in " + GetPrintTime(time));
+			ccount++;
+		}
+		if(init)
+			linkfile.Add(objfile);
+		else
+			obj.Add(objfile);
+	}
+
+	if(error) {
+//		if(ccount)
+//			PutCompileTime(time, ccount);
+		IdeConsoleEndGroup();
+		return false;
+	}
+
+	linkoptions << Gather(pkg.link, config.GetKeys());
+
+	Vector<String> libs = Split(Gather(pkg.library, config.GetKeys()), ' ');
+	linkfile.Append(libs);
+
+	int libtime = GetTickCount();
+	if(!HasFlag("MAIN")) {
+		if(HasFlag("BLITZ") || HasFlag("NOLIB")) {
+			linkfile.Append(obj);
+			IdeConsoleEndGroup();
+//			if(ccount)
+//				PutCompileTime(time, ccount);
+			return true;
+		}
+		IdeConsoleEndGroup();
+		if(!Wait())
+			return false;
+		String product;
+		if(is_shared)
+			product = GetSharedLibPath(package);
+		else
+			product = CatAnyPath(outdir, GetAnyFileName(package) + ".a");
+		String hproduct = GetHostPath(product);
+		Time producttime = GetFileTime(hproduct);
+//		LOG("hproduct = " << hproduct << ", time = " << producttime);
+		linkfile.Add(GetHostPath(product));
+		for(int i = 0; i < obj.GetCount(); i++)
+			if(GetFileTime(obj[i]) > producttime) {
+				String lib;
+				if(is_shared) {
+					lib = CompilerName();
+					lib << " -shared -fPIC -fuse-cxa-atexit";
+					if(!HasFlag("SHARED") && !is_shared)
+						lib << " -static";
+//					else if(!HasFlag("WIN32")) // TRC 05/03/08: dynamic fPIC causes trouble in MinGW
+//						lib << " -dynamic -fPIC"; // TRC 05/03/30: dynamic fPIC doesn't seem to work in GCC either :-)
+					if(HasFlag("GCC32"))
+						lib << " -m32";
+					Point p = ExtractVersion();
+					if(!IsNull(p.x)) {
+						lib << " -Xlinker --major-image-version -Xlinker " << p.x;
+						if(!IsNull(p.y))
+							lib << " -Xlinker --minor-image-version -Xlinker " << p.y;
+					}
+					lib << ' ' << Gather(pkg.link, config.GetKeys());
+					lib << " -o ";
+				}
+				else
+					lib = "ar -sr ";
+				lib << GetHostPathQ(product);
+				for(int i = 0; i < obj.GetCount(); i++)
+					lib << ' ' << GetHostPathQ(obj[i]);
+				PutConsole("Creating library...");
+				DeleteFile(hproduct);
+				if(is_shared) {
+					for(int i = 0; i < libpath.GetCount(); i++)
+						lib << " -L" << GetHostPathQ(libpath[i]);
+					for(int i = 0; i < all_uses.GetCount(); i++)
+						lib << ' ' << GetHostPathQ(GetSharedLibPath(all_uses[i]));
+					for(int i = 0; i < all_libraries.GetCount(); i++)
+						lib << " -l" << GetHostPathQ(all_libraries[i]);
+				}
+				if(!Execute(lib) == 0) {
+					DeleteFile(hproduct);
+					return false;
+				}
+				PutConsole(String().Cat() << hproduct << " (" << GetFileInfo(hproduct).length
+				           << " B) created in " << GetPrintTime(libtime));
+				break;
+			}
+		return true;
+	}
+
+	IdeConsoleEndGroup();
+	obj.Append(linkfile);
+	linkfile = obj;
+	return true;
+}
+
+
+bool GccBuilder::Link(const Vector<String>& linkfile, const String& linkoptions, bool)
+{
+	if(!Wait())
+		return false;
+	int time = GetTickCount();
+	for(int i = 0; i < linkfile.GetCount(); i++)
+		if(GetFileTime(linkfile[i]) >= targettime) {
+			Vector<String> lib;
+			String lnk = CompilerName();
+			if(HasFlag("GCC32"))
+				lnk << " -m32";
+			if(HasFlag("DLL"))
+				lnk << " -shared";
+			if(!HasFlag("SHARED") && !HasFlag("SO"))
+				lnk << " -static";
+//			else if(!HasFlag("WIN32")) // TRC 05/03/08: see above
+//				lnk << " -dynamic -fPIC"; // TRC 05/03/30: dynamic fPIC doesn't seem to work in GCC either :-)
+			if(HasFlag("WINCE"))
+				lnk << " -mwindowsce";
+			else if(HasFlag("WIN32")) {
+				lnk << " -mwindows";
+				if(!HasFlag("GUI"))
+					lnk << " -mconsole";
+			}
+			lnk << " -o " << GetHostPathQ(target);
+			if(HasFlag("DEBUG") || HasFlag("DEBUG_MINIMAL") || HasFlag("DEBUG_FULL"))
+				lnk << " -ggdb";
+			else
+				lnk << (!HasFlag("OSX11") ? " -Wl,-s" : "");
+			for(i = 0; i < libpath.GetCount(); i++)
+				lnk << " -L" << GetHostPathQ(libpath[i]);
+//			lnk << " -Wl,--gc-sections,-O,2 ";
+			if (!HasFlag("OSX11"))
+			  lnk << " -Wl,-O,2 "; // CXL 05/11/14 --gc-sections causing trouble on ubuntu
+			lnk << linkoptions;
+
+			if (HasFlag("OSX11")) {
+			  if (HasFlag("POWERPC"))
+				lnk << " -arch ppc";
+			  if (HasFlag("X86"))
+				lnk << " -arch i386";
+			}
+
+			for(i = 0; i < linkfile.GetCount(); i++)
+				if(ToLower(GetFileExt(linkfile[i])) == ".o")
+					lnk  << ' ' << GetHostPathQ(linkfile[i]);
+				else
+					lib.Add(linkfile[i]);
+			if(!HasFlag("SOLARIS")&&!HasFlag("OSX11"))
+				lnk << " -Wl,--start-group ";
+			for(i = 0; i < lib.GetCount(); i++) {
+				String ln = lib[i];
+				String ext = ToLower(GetFileExt(ln));
+				if(ext == ".a" || ext == ".so" || ext == ".dll" || ext == ".lib")
+					lnk << ' ' << GetHostPathQ(FindInDirs(libpath, lib[i]));
+				else
+					lnk << " -l" << ln;
+			}
+			if(!HasFlag("SOLARIS")&&!HasFlag("OSX11"))
+				lnk << " -Wl,--end-group";
+			PutConsole("Linking...");
+			CustomStep(".pre-link");
+			if(Execute(lnk) == 0) {
+				CustomStep(".post-link");
+				PutConsole(String().Cat() << GetHostPath(target) << " (" << GetFileInfo(target).length
+				           << " B) linked in " << GetPrintTime(time));
+				return true;
+			}
+			else {
+				DeleteFile(target);
+				return false;
+			}
+		}
+	PutConsole(String().Cat() << GetHostPath(target) << " (" << GetFileInfo(target).length
+	           << " B) is up to date.");
+	return true;
+}
+
+bool GccBuilder::Preprocess(const String& package, const String& file, const String& target)
+{
+	Package pkg;
+	String packagepath = PackagePath(package);
+	pkg.Load(packagepath);
+	String packagedir = GetFileFolder(packagepath);
+	ChDir(packagedir);
+	PutVerbose("cd " + packagedir);
+
+	FileOut out(target);
+	String cmd = CmdLine();
+	cmd << " " << Gather(pkg.option, config.GetKeys());
+	cmd << " -E " << GetHostPathQ(file);
+	return Execute(cmd, out);
+}
+
+Builder *CreateGccBuilder()
+{
+	return new GccBuilder;
+}
+
+void RegisterGccBuilder()
+{
+	RegisterBuilder("GCC", CreateGccBuilder);
+	RegisterBuilder("GCC32", CreateGccBuilder);
+	RegisterBuilder("GCC_ARM", CreateGccBuilder);
+}
diff --git a/uppsrc/ide/Builders/JavaBuilder.cpp b/uppsrc/ide/Builders/JavaBuilder.cpp
new file mode 100644
index 000000000..058a4015b
--- /dev/null
+++ b/uppsrc/ide/Builders/JavaBuilder.cpp
@@ -0,0 +1,314 @@
+#include "Builders.h"
+
+String AdjustLines(const String& file)
+{
+	String out;
+	const char *p = file;
+	while(*p)
+	{
+		const char *b = p;
+		while(*p && (byte)*p <= ' ' && *p != '\r' && *p != '\n')
+			p++;
+		if(*p == '#')
+		{
+			out.Cat("//");
+			b = p;
+			while(*p && *p != '\n' && *p != '\"')
+				p++;
+			out.Cat(b, (int)(p - b));
+			b = p;
+			if(*p == '\"')
+			{
+				out.Cat('\"');
+				b = ++p;
+				while(*p && *p++ != '\n')
+					;
+				const char *e = p;
+				while(e > b && (byte)e[-1] <= ' ')
+					e--;
+				if(e[-1] == '\"')
+					e--;
+				out.Cat(UnixPath(String(b, e)));
+				out.Cat("\"\r\n");
+				b = p;
+				continue;
+			}
+		}
+		out.Cat(b, (int)(p - b));
+		while(*p && *p != '\n')
+		{
+			b = p;
+			while(*p && *p != '\n' && *p != '\r')
+				p++;
+			out.Cat(b, (int)(p - b));
+			while(*p == '\r')
+				p++;
+		}
+		if(*p == '\n')
+		{
+			p++;
+			out.Cat("\r\n");
+		}
+	}
+	return out;
+}
+
+String JavaBuilder::JavaLine()
+{
+	return "javac";
+}
+
+String JavaBuilder::JarLine()
+{
+	return "jar";
+}
+
+enum { MAINCLASS, MAINDIR, MANIFEST, ITEMCOUNT };
+
+bool JavaBuilder::BuildPackage(const String& package, Vector<String>& linkfile, String& linkoptions,
+	const Vector<String>& all_uses, const Vector<String>& all_libraries, int)
+{
+	int time = msecs();
+	int i;
+	int manifest = -1;
+	String packagepath = PackagePath(package);
+	Package pkg;
+	pkg.Load(packagepath);
+	String packagedir = GetFileFolder(packagepath);
+	ChDir(packagedir);
+	PutVerbose("cd " + packagedir);
+	Vector<String> pkgsfile;
+	Vector<String> sfile;
+	Vector<String> sobjfile;
+	Vector<String> soptions;
+	bool           error = false;
+	bool main = HasFlag("MAIN");
+
+	for(i = 0; i < pkg.GetCount(); i++) {
+		if(!IdeIsBuilding())
+			return false;
+		if(!pkg[i].separator) {
+			String gop = Gather(pkg[i].option, config.GetKeys());
+			Vector<String> srcfile = CustomStep(SourcePath(package, pkg[i]));
+			if(srcfile.GetCount() == 0)
+				error = true;
+			for(int j = 0; j < srcfile.GetCount(); j++)
+			{
+				String fn = srcfile[j];
+				String ext = ToLower(GetFileExt(fn));
+				bool ismf = false;
+				if(ext == ".java" || main && ext == ".mf")
+				{
+					if(ext == ".mf")
+					{
+						ismf = true;
+						if(manifest >= 0)
+						{
+							PutConsole(NFormat("%s(1): duplicate manifest file", GetHostPath(fn)));
+							PutConsole(NFormat("%s(1): (previous manifest file)", GetHostPath(sfile[manifest])));
+						}
+						manifest = sfile.GetCount();
+					}
+					String pkgfile = AppendFileName(package, pkg[i]);
+					pkgsfile.Add(pkgfile);
+					sfile.Add(fn);
+					soptions.Add(gop);
+					String objfile = NativePath(CatAnyPath(outdir, ismf ? String("manifest.mf") : pkgfile));
+					sobjfile.Add(objfile);
+				}
+			}
+		}
+	}
+
+	Vector<Host::FileInfo> sobjinfo = host->GetFileInfo(sobjfile);
+	int ccount = 0;
+	for(i = 0; i < sfile.GetCount(); i++) {
+		if(!IdeIsBuilding())
+			return false;
+		if(HdependFileTime(sfile[i]) > sobjinfo[i]) {
+			ccount++;
+			if(!PreprocessJava(sfile[i], sobjfile[i], soptions[i]))
+				error = true;
+		}
+	}
+	linkfile.Add(outdir);
+	if(ccount > 0)
+		PutConsole(String().Cat() << ccount << " file(s) preprocessed in " << GetPrintTime(time) <<
+		           " " << int(GetTickCount() - time) / ccount << " msec/file");
+	linkoptions << ' ' << Gather(pkg.link, config.GetKeys());
+
+	if(!error && HasFlag("MAIN") && !sfile.IsEmpty())
+	{
+		String mainfile = sfile.Top();
+		String mainobj = sobjfile.Top();
+		String maincls = ForceExt(mainobj, ".class");
+		String libs;
+		int i;
+		for(i = 0; i < libpath.GetCount(); i++)
+			libs << (i ? ";" : " -classpath ") << '\"' << libpath[i] << '\"';
+		String linkcmd;
+		linkcmd << "javac";
+		linkcmd << (HasFlag("DEBUG") ? " -g" : " -g:none");
+		if(!HasFlag("DEBUG"))
+			if(!IsNull(release_options))
+				linkcmd << ' ' << release_options;
+			else
+				linkcmd << " -O";
+		linkcmd << " -deprecation" << linkoptions << " -sourcepath ";
+		bool win32 = HasFlag("WIN32");
+		for(i = 0; i < linkfile.GetCount(); i++) {
+			linkcmd << (i ? (win32 ? ";" : ":") : "");
+			if(linkfile[i].Find(' ') >= 0)
+				linkcmd << '\"' << linkfile[i] << '\"';
+			else
+				linkcmd << linkfile[i];
+		}
+		linkfile.InsertN(0, ITEMCOUNT);
+		linkfile[MAINCLASS] = maincls;
+		linkfile[MAINDIR] = outdir;
+		linkfile[MANIFEST] = (manifest >= 0 ? sobjfile[manifest] : String());
+		linkcmd << ' ' << mainobj;
+		linkoptions = linkcmd;
+	}
+	return !error;
+}
+
+bool JavaBuilder::Preprocess(const String& package, const String& file, const String& target)
+{
+	return Preprocess(file, target, Null);
+}
+
+bool JavaBuilder::PreprocessJava(String file, String target, String options)
+{
+	String mscpp = GetVar("MSCPP_JDK");
+	String cc;
+	if(!IsNull(mscpp))
+		cc = mscpp + " /C /TP /P /nologo ";
+	else
+		cc = "cpp -C ";
+	cc << IncludesDefinesTargetTime();
+	int time = GetTickCount();
+	RealizePath(target);
+	String execpath;
+	execpath << cc << ' ' << options << ' ';
+	String prepfile;
+	bool error = false;
+	if(!IsNull(mscpp))
+	{
+		prepfile = ForceExt(file, ".i");
+		host->ChDir(GetFileFolder(prepfile));
+		execpath << GetHostPath(file);
+	}
+	else
+	{
+		PutConsole(file);
+		execpath << GetHostPath(file) << " " << GetHostPath(target);
+		prepfile = target;
+	}
+	if(Execute(execpath) != 0)
+	{
+		DeleteFile(target);
+		error = true;
+	}
+	String prep = LoadFile(prepfile);
+	if(prep.IsEmpty())
+	{
+		PutConsole(NFormat("Error loading preprocessed file %s", prepfile));
+		error = true;
+	}
+	DeleteFile(prepfile);
+	if(!prep.IsEmpty() && !::SaveFile(target, AdjustLines(prep)))
+	{
+		DeleteFile(target);
+		error = true;
+		PutConsole(NFormat("%s: error saving file.", target));
+	}
+	PutVerbose("preprocessed in " + GetPrintTime(time));
+	return !error;
+}
+
+Time JavaBuilder::AddClassDeep(String& link, String dir, String reldir)
+{
+	Time time = Time::Low();
+	Vector<String> folders;
+	for(FindFile ff(AppendFileName(dir, AppendFileName(reldir, "*"))); ff; ff.Next()) {
+		if(ff.IsFolder())
+			folders.Add(ff.GetName());
+		else if(!stricmp(GetFileExtPos(ff.GetName()), ".class"))
+		{
+			link << " -C \"" << dir << "\" \"" << UnixPath(CatAnyPath(reldir, ff.GetName())) << '\"';
+			time = max(time, Time(ff.GetLastWriteTime()));
+		}
+	}
+	for(int f = 0; f < folders.GetCount(); f++)
+		time = max(time, AddClassDeep(link, dir, AppendFileName(reldir, folders[f])));
+	return time;
+}
+
+bool JavaBuilder::Link(const Vector<String>& linkfile, const String& linkoptions, bool)
+{
+	if(linkfile.GetCount() < ITEMCOUNT)
+		return false;
+	int time = GetTickCount();
+	String mainclass = linkfile[MAINCLASS];
+	String maindir = linkfile[MAINDIR];
+	String manifest = linkfile[MANIFEST];
+	PutConsole("Compiling...");
+	if(Execute(linkoptions) != 0) {
+		DeleteFile(mainclass);
+		return false;
+	}
+	PutVerbose("compiled in " + GetPrintTime(time));
+	host->ChDir(maindir);
+
+	PutConsole("Archiving...");
+	String cmdline;
+	cmdline << "cf";
+	if(!manifest.IsEmpty())
+		cmdline << 'm';
+	cmdline << ' ' << GetHostPath(target);
+	if(!manifest.IsEmpty())
+		cmdline << ' ' << GetHostPath(manifest);
+	Time tm = Time::Low();
+	for(int i = ITEMCOUNT; i < linkfile.GetCount(); i++)
+		tm = max(tm, AddClassDeep(cmdline, linkfile[i], Null));
+	if(tm > targettime) {
+		CustomStep(".pre-link");
+		String link, response;
+		link << "jar ";
+		if(cmdline.GetLength() < 32000)
+			link << cmdline;
+		else {
+			response = GetTempFileName("jar");
+			link << '@' << response;
+			if(!UPP::SaveFile(response, cmdline)) {
+				PutConsole(String().Cat() << "Error writing JAR response file '" << response << "'");
+				return false;
+			}
+		}
+		bool ok = (Execute(link) == 0);
+		if(!IsNull(response))
+			FileDelete(response);
+		if(!ok) {
+			DeleteFile(target);
+			return false;
+		}
+		CustomStep(".post-link");
+		PutConsole(String().Cat() << target << " (" << GetFileInfo(target).length
+		           << " B) archived in " << GetPrintTime(time));
+	}
+	else
+		PutConsole(String().Cat() << GetHostPath(target) << " (" << GetFileInfo(target).length
+		           << " B) is up to date.");
+	return true;
+}
+
+static Builder *CreateJavaBuilder()
+{
+	return new JavaBuilder;
+}
+
+void RegisterJavaBuilder()
+{
+	RegisterBuilder("JDK", &CreateJavaBuilder);
+}
diff --git a/uppsrc/ide/Builders/MscBuilder.cpp b/uppsrc/ide/Builders/MscBuilder.cpp
new file mode 100644
index 000000000..99554171c
--- /dev/null
+++ b/uppsrc/ide/Builders/MscBuilder.cpp
@@ -0,0 +1,554 @@
+#include "Builders.h"
+
+#include <coff/binobj/binobj.h>
+
+#ifdef PLATFORM_WIN32
+static bool HasTail(String s, const char *tail)
+{
+	int tl = (int)strlen(tail);
+	int sl = s.GetLength();
+	if(sl < tl)
+		return false;
+	for(const char *p = s.GetIter(sl - tl); *p; p++, tail++)
+		if(*tail != '*' && *tail != *p)
+			return false;
+	return *tail == 0;
+}
+#endif
+
+static void AddObjectExports(const char *path, Index<String>& out)
+{
+#ifdef PLATFORM_WIN32
+	FileMapping mapping;
+	if(!mapping.Open(path))
+		return;
+	const byte *begin = mapping.Begin();
+	const COFF_IMAGE_FILE_HEADER *hdr = (const COFF_IMAGE_FILE_HEADER *)begin;
+	if(hdr->Machine != COFF_IMAGE_FILE_MACHINE_I386)
+		return;
+	const COFF_IMAGE_SECTION_HEADER *sechdr = (const COFF_IMAGE_SECTION_HEADER *)(begin
+		+ sizeof(COFF_IMAGE_FILE_HEADER) + hdr->SizeOfOptionalHeader);
+	Index<int> code_sections;
+	for(int i = 0; i < hdr->NumberOfSections; i++)
+		if(sechdr[i].Characteristics & COFF_IMAGE_SCN_CNT_CODE)
+			code_sections.Add(i + 1);
+	const COFF_IMAGE_SYMBOL *symtbl = (const COFF_IMAGE_SYMBOL *)(begin + hdr->PointerToSymbolTable);
+	const char *strtbl = (const char *)(symtbl + hdr->NumberOfSymbols);
+	for(int i = 0; i < (int)hdr->NumberOfSymbols; i++)
+	{
+		const COFF_IMAGE_SYMBOL& sym = symtbl[i];
+		if(sym.StorageClass == COFF_IMAGE_SYM_CLASS_EXTERNAL && code_sections.Find(sym.SectionNumber) >= 0)
+		{
+			String name = COFFSymbolName(sym, strtbl);
+			if(!HasTail(name, "AEPAXI@Z"))
+			{
+				if(*name == '_' && name.Find('@') < 0)
+					name.Remove(0, 1);
+				out.FindAdd(name);
+			}
+		}
+		i += sym.NumberOfAuxSymbols;
+	}
+#endif
+}
+
+void   MscBuilder::AddFlags(Index<String>& cfg)
+{
+	cfg.FindAdd("MSC");
+}
+
+String MscBuilder::CmdLine()
+{
+	String cc;
+	if(HasFlag("ARM"))
+		cc = "clarm";
+	else
+	if(HasFlag("MIPS"))
+		cc = "clmips";
+	else
+	if(HasFlag("SH3"))
+		cc = "shcl /Qsh3";
+	else
+	if(HasFlag("SH4"))
+		cc = "shcl /Qsh4";
+	else
+	if(HasFlag("MSC8ARM"))
+		cc = "cl -GS- ";
+	else
+		cc = HasFlag("INTEL") ? "icl" : "cl";
+// TRC 080605-documentation says Wp64 works in 32-bit compilation only
+//	cc << (IsMsc64() ? " -nologo -Wp64 -W3 -GR -c" : " -nologo -W3 -GR -c");
+	cc << " -nologo -W3 -GR -c";
+	cc << IncludesDefinesTargetTime();
+	return cc;
+}
+
+String MscBuilder::MachineName() const
+{
+	if(HasFlag("ARM"))     return "ARM";
+	if(HasFlag("MIPS"))    return "MIPS";
+	if(HasFlag("SH3"))     return "SH3";
+	if(HasFlag("SH4"))     return "SH4";
+	if(IsMscArm())         return "ARM";
+	if(IsMsc64())          return "x64";
+	if(HasFlag("WIN32"))   return "I386";
+	return "IX86";
+}
+
+bool MscBuilder::IsMsc89() const
+{
+	return IsMsc86() || IsMsc64() || IsMscArm();
+}
+
+bool MscBuilder::IsMsc86() const
+{
+	return HasFlag("MSC8") || HasFlag("MSC9");
+}
+
+bool MscBuilder::IsMscArm() const
+{
+	return HasFlag("MSC8ARM") || HasFlag("MSC9ARM");
+}
+
+bool MscBuilder::IsMsc64() const
+{
+	return HasFlag("MSC8X64") || HasFlag("MSC9X64");
+}
+
+String MscBuilder::LinkerName() const
+{
+	if(HasFlag("ULD")) return "uld";
+	if(HasFlag("INTEL")) return "xilink";
+	return "link";
+}
+
+static bool sContainsPchOptions(const String& x)
+{
+	Index<String> a = Split(x, ' ');
+	return  a.Find("-GL") >= 0 || a.Find("/GL") >= 0 || a.Find("-Y-") >= 0 || a.Find("/Y-") >= 0
+	     || a.Find("-Yc") >= 0 || a.Find("/Yc") >= 0 || a.Find("-Yd") >= 0 || a.Find("/Yd") >= 0
+	     || a.Find("-Yl") >= 0 || a.Find("/Yl") >= 0 || a.Find("-Yu") >= 0 || a.Find("/Yu") >= 0
+	     || a.Find("-YX") >= 0 || a.Find("/YX") >= 0;
+}
+
+bool MscBuilder::HasAnyDebug() const
+{
+	return HasFlag("DEBUG") || HasFlag("DEBUG_MINIMAL") || HasFlag("DEBUG_FULL");
+}
+
+String MscBuilder::PdbPch(String package, int slot, bool do_pch) const
+{
+	String pkg_slot = NFormat("%s-%d", GetAnyFileName(package), slot + 1);
+	String pdb = GetHostPathQ(CatAnyPath(outdir, pkg_slot + ".pdb"));
+	String cc;
+	cc << " -Gy -Fd" << pdb;
+	if(do_pch && !IsMsc89()) // MSC8/9 does not support automatic precompiled headers...
+		cc << " -YX -Fp" << GetHostPathQ(CatAnyPath(outdir, pkg_slot + ".pch")) << ' ';
+	return cc;
+}
+
+bool MscBuilder::BuildPackage(const String& package, Vector<String>& linkfile, String& linkoptions,
+	const Vector<String>& all_uses, const Vector<String>& all_libraries, int opt)
+{
+	int i;
+	String packagepath = PackagePath(package);
+	Package pkg;
+	pkg.Load(packagepath);
+	String packagedir = GetFileFolder(packagepath);
+	ChDir(packagedir);
+	PutVerbose("cd " + packagedir);
+	IdeConsoleBeginGroup(package);
+	Vector<String> obj;
+
+	bool is_shared = HasFlag("SO");
+
+	String cc = CmdLine();
+	if(HasFlag("EVC")) {
+		if(!HasFlag("SH3") && !HasFlag("SH4"))
+			cc << " -Gs8192"; // disable stack checking
+		cc << " -GF" // read-only string pooling
+		      " -GX-"; // turn off exception handling
+	}
+	else
+	if(IsMsc89())
+		cc << " -EHsc";
+	else
+		cc << " -GX";
+//	String pdb = GetHostPathQ(CatAnyPath(outdir, GetAnyFileName(package) + ".pdb"));
+//	String pch;
+//	if(!HasFlag("MSC8")) // MSC8 does not support automatic precompiled headers...
+//		pch << " -YX -Fp" << GetHostPathQ(CatAnyPath(outdir, GetAnyFileName(package) + ".pch")) << ' ';
+//	cc << " -Gy -Fd" << pdb;
+	if(HasFlag("DEBUG_MINIMAL"))
+		cc << " -Zd";
+	if(HasFlag("DEBUG_FULL"))
+		cc << " -Zi";
+	cc << ' ' << Gather(pkg.option, config.GetKeys());
+	cc << (HasFlag("SHARED") || is_shared ? " -MD"
+	      : (HasFlag("MT") || IsMsc89()) ? " -MT" : " -ML");
+
+	String cc_size = cc;
+	String cc_speed = cc;
+	bool   release = false;
+
+	if(HasFlag("DEBUG"))
+		cc << "d " << debug_options;
+	else {
+		release = true;
+		cc << ' ' << release_size_options;
+		cc_speed << ' ' << release_options;
+		if(opt == R_SPEED || pkg.optimize_speed)
+			cc = cc_speed;
+	}
+
+	if(HasFlag("SSE2"))
+		cc << " /arch:SSE2";
+
+	Vector<String> sfile, isfile;
+	Vector<String> soptions, isoptions;
+	Vector<bool>   optimize, ioptimize;
+	Vector<String> sobjfile;
+	bool           error = false;
+
+	for(i = 0; i < pkg.GetCount(); i++) {
+		if(!IdeIsBuilding())
+			return false;
+		if(!pkg[i].separator) {
+			String gop = Gather(pkg[i].option, config.GetKeys());
+			Vector<String> srcfile = CustomStep(SourcePath(package, pkg[i]));
+			if(srcfile.GetCount() == 0)
+				error = true;
+			for(int j = 0; j < srcfile.GetCount(); j++) {
+				String fn = srcfile[j];
+				String ext = ToLower(GetFileExt(fn));
+				if(ext == ".c" || ext == ".cpp" || ext == ".cc" || ext == ".cxx" || ext == ".rc" || ext == ".brc") {
+					sfile.Add(fn);
+					soptions.Add(gop);
+					optimize.Add(release && pkg[i].optimize_speed && opt == R_OPTIMAL);
+				}
+				else
+				if(ext == ".icpp") {
+					isfile.Add(fn);
+					isoptions.Add(gop);
+					ioptimize.Add(release && pkg[i].optimize_speed && opt == R_OPTIMAL);
+				}
+				else
+				if(ext == ".obj")
+					obj.Add(fn);
+				else
+				if(ext == ".lib")
+					linkfile.Add(fn);
+			}
+		}
+	}
+
+	if(HasFlag("BLITZ")) {
+		Blitz b = BlitzStep(sfile, soptions, obj, ".obj", optimize);
+		if(b.build) {
+			PutConsole("BLITZ:" + b.info);
+			int slot = AllocSlot();
+			if(slot < 0 || ! Run(cc + PdbPch(package, slot, false)
+			+ " -Tp " + GetHostPathQ(b.path) + " -Fo" + GetHostPathQ(b.object), slot, GetHostPath(b.object), b.count))
+				error = true;
+		}
+	}
+
+	int first_ifile = sfile.GetCount();
+	sfile.AppendPick(isfile);
+	soptions.AppendPick(isoptions);
+	optimize.AppendPick(ioptimize);
+
+	int ccount = 0;
+
+//	if(sContainsPchOptions(cc))
+//		pch = Null;
+
+	for(i = 0; i < sfile.GetCount(); i++) {
+		if(!IdeIsBuilding())
+			return false;
+		String fn = sfile[i];
+		String ext = ToLower(GetFileExt(fn));
+		bool rc = (ext == ".rc");
+		bool brc = (ext == ".brc");
+		bool init = (i >= first_ifile);
+		String objfile = CatAnyPath(outdir, GetFileTitle(fn) + (rc ? "$rc.obj" : brc ? "$brc.obj" : ".obj"));
+		if(HdependFileTime(fn) > GetFileTime(objfile)) {
+			int time = GetTickCount();
+			bool execerr = false;
+			if(rc) {
+				PutConsole(GetFileNamePos(fn));
+				int slot = AllocSlot();
+				if(slot < 0 || !Run("rc /fo" + GetHostPathQ(objfile) + Includes(" /i")
+					+ ' ' + GetHostPathQ(fn), slot, GetHostPath(objfile), 1))
+					execerr = true;
+			}
+			else
+			if(brc) {
+				PutConsole(GetFileNamePos(fn));
+				try {
+					String hfn = GetHostPath(fn);
+					String brcdata = LoadFile(hfn);
+					if(brcdata.IsVoid())
+						throw Exc(NFormat("error reading file '%s'", hfn));
+					CParser parser(brcdata, hfn);
+					BinaryToObject(GetHostPath(objfile), parser, GetFileDirectory(hfn), THISBACK(BinObjConsole));
+				}
+				catch(Exc e) {
+					PutConsole(e);
+					execerr = true;
+				}
+			}
+			else {
+				String c = cc;
+				if(optimize[i])
+					c = cc_speed;
+				int slot = AllocSlot();
+				if(slot < 0 || !Run(c + PdbPch(package, slot, !sContainsPchOptions(cc) && !sContainsPchOptions(soptions[i]))
+				+ soptions[i] + (ext == ".c" ? " -Tc " : " -Tp ")
+				+ GetHostPathQ(fn) + " -Fo" + GetHostPathQ(objfile), slot, GetHostPath(objfile), 1))
+					execerr = true;
+			}
+			if(execerr)
+				DeleteFile(objfile);
+			error |= execerr;
+			PutVerbose("compiled in " + GetPrintTime(time));
+			ccount++;
+		}
+		if(init)
+			linkfile.Add(objfile);
+		else
+			obj.Add(objfile);
+	}
+	if(error) {
+//		ShowTime(ccount, time);
+		IdeConsoleEndGroup();
+		return false;
+	}
+
+	Vector<String> pkglibs = Split(Gather(pkg.library, config.GetKeys()), ' ');
+	for(int i = 0; i < pkglibs.GetCount(); i++) {
+		String libfile = AppendExt(pkglibs[i], ".lib");
+		if(!IsFullPath(libfile)) {
+			for(int p = 0; p < libpath.GetCount(); p++) {
+				String nf = NormalizePath(libfile, libpath[p]);
+				if(FileExists(nf)) {
+					libfile = nf;
+					break;
+				}
+			}
+		}
+		linkfile.Add(libfile);
+	}
+	linkoptions << ' ' << Gather(pkg.link, config.GetKeys());
+
+	int linktime = GetTickCount();
+	if(!HasFlag("MAIN")) {
+		if(HasFlag("BLITZ") || HasFlag("NOLIB")) {
+			linkfile.Append(obj);
+//			ShowTime(ccount, time);
+			IdeConsoleEndGroup();
+			return true;
+		}
+		String product;
+		if(is_shared)
+			product = GetSharedLibPath(package);
+		else
+			product = CatAnyPath(outdir, GetAnyFileName(package) + ".lib");
+		Time producttime = GetFileTime(product);
+		linkfile.Add(ForceExt(product, ".lib"));
+		if(!Wait()) {
+			IdeConsoleEndGroup();
+			return false;
+		}
+		Vector<Host::FileInfo> objinfo = host->GetFileInfo(obj);
+		for(int i = 0; i < obj.GetCount(); i++)
+			if(objinfo[i] > producttime) {
+				String lib;
+				if(is_shared) {
+					lib << LinkerName() << " -dll -nologo -machine:" << MachineName()
+						<< " -pdb:" << GetHostPathQ(ForceExt(product, ".pdb"))
+						<< " -out:" << GetHostPathQ(product)
+						<< " -incremental:no";
+					if(HasFlag("FORCE_SIZE")){
+						if(sContainsPchOptions(release_size_options))
+							lib << " -ltcg";
+					}
+					else
+					if(HasFlag("FORCE_SPEED"))
+						if(sContainsPchOptions(release_options))
+							lib << " -ltcg";
+					if(HasAnyDebug())
+						lib << " -debug -OPT:NOREF";
+					else
+						lib << " -release -OPT:REF,ICF,NOWIN98";
+					if(IsMscArm())
+						lib <<  " -subsystem:windowsce,4.20 /ARMPADCODE";
+					else
+					if(HasFlag("GUI"))
+						lib << (HasFlag("WIN32") ? " -subsystem:windows"
+						                         : " -subsystem:windowsce");
+					else
+						lib << " -subsystem:console";
+					Index<String> exports;
+					for(int o = 0; o < obj.GetCount(); o++)
+						AddObjectExports(obj[o], exports);
+					String def;
+					def << "LIBRARY " << AsCString(GetFileName(product)) << "\n\n"
+						"EXPORTS\n";
+					for(int o = 0; o < exports.GetCount(); o++)
+						def << '\t' << exports[o] << "\n"; //" @" << (o + 1) << "\n";
+					String deffile = ForceExt(product, ".def");
+					if(!SaveChangedFile(deffile, def))
+					{
+						PutConsole(NFormat("%s: error saving file", deffile));
+						return false;
+					}
+					lib << " -def:" << GetHostPathQ(deffile);
+					for(int i = 0; i < libpath.GetCount(); i++)
+						lib << " -LIBPATH:" << GetHostPathQ(libpath[i]);
+					lib << ' ' << Gather(pkg.link, config.GetKeys());
+					for(int i = 0; i < all_uses.GetCount(); i++)
+						lib << ' ' << GetHostPathQ(ForceExt(GetSharedLibPath(all_uses[i]), ".lib"));
+					for(int i = 0; i < all_libraries.GetCount(); i++) {
+						String libfile = AppendExt(all_libraries[i], ".lib");
+						if(!IsFullPath(libfile)) {
+							for(int p = 0; p < libpath.GetCount(); p++) {
+								String nf = NormalizePath(libfile, libpath[p]);
+								if(FileExists(nf)) {
+									libfile = nf;
+									break;
+								}
+							}
+						}
+						lib << ' ' << GetHostPathQ(libfile);
+					}
+				}
+				else{
+					lib << (HasFlag("INTEL") ? "xilib" : "link /lib") << " -nologo";
+					if(HasFlag("FORCE_SIZE")){
+						if(sContainsPchOptions(release_size_options))
+							lib << " -ltcg";
+					}
+					else
+					if(HasFlag("FORCE_SPEED"))
+						if(sContainsPchOptions(release_options))
+							lib << " -ltcg";
+					lib << " -out:" << GetHostPathQ(product) << ' ' << Gather(pkg.link, config.GetKeys());
+				}
+				for(int i = 0; i < obj.GetCount(); i++)
+					lib << ' ' << GetHostPathQ(obj[i]);
+				PutConsole("Creating library...");
+				IdeConsoleEndGroup();
+				DeleteFile(product);
+				if(Execute(lib)) {
+					DeleteFile(product);
+					return false;
+				}
+				else
+				if((IsMsc86() || IsMsc64()) && is_shared) {
+					String mt("mt -nologo -manifest ");
+					mt << GetHostPathQ(product) << ".manifest -outputresource:" << GetHostPathQ(product) << ";2";
+					Execute(mt);
+				}
+				PutConsole(String().Cat() << product << " (" << GetFileInfo(product).length
+				           << " B) created in " << GetPrintTime(linktime));
+				break;
+			}
+		return true;
+	}
+
+	IdeConsoleEndGroup();
+	obj.Append(linkfile);
+	linkfile = obj;
+	return true;
+}
+
+bool MscBuilder::Link(const Vector<String>& linkfile, const String& linkoptions, bool createmap)
+{
+	int time = GetTickCount();
+	if(!Wait())
+		return false;
+	for(int i = 0; i < linkfile.GetCount(); i++)
+		if(GetFileTime(linkfile[i]) >= targettime) {
+			String link;
+			link << LinkerName() << " -nologo -machine:" << MachineName()
+			<< " -pdb:" << GetHostPathQ(ForceExt(target, ".pdb"))
+			<< " -out:" << GetHostPathQ(target);
+			if(HasFlag("FORCE_SIZE")){
+				if(sContainsPchOptions(release_size_options))
+					link << " -ltcg";
+			}
+			else
+			if(HasFlag("FORCE_SPEED"))
+				if(sContainsPchOptions(release_options))
+					link << " -ltcg";
+			if(HasAnyDebug())
+				link << " -incremental:yes -debug -OPT:NOREF";
+			else
+				link << " -incremental:no -release -OPT:REF,ICF,NOWIN98";
+			if(IsMscArm())
+				link << " -subsystem:windowsce,4.20 /ARMPADCODE -NODEFAULTLIB:\"oldnames.lib\" ";
+			else
+			if(HasFlag("GUI") || IsMscArm())
+				link << (HasFlag("WIN32") ? " -subsystem:windows" : " -subsystem:windowsce");
+			else
+				link << " -subsystem:console";
+			if(createmap)
+				link << " -MAP";
+			if(HasFlag("DLL"))
+				link << " -DLL";
+			for(i = 0; i < libpath.GetCount(); i++)
+				link << " -LIBPATH:\"" << libpath[i] << '\"';
+			link << ' ' << linkoptions << ' ';
+			for(i = 0; i < linkfile.GetCount(); i++)
+				link << ' ' << GetHostPathQ(AppendExt(linkfile[i], ".lib"));
+			PutConsole("Linking...");
+			CustomStep(".pre-link");
+			if(Execute(link) == 0) {
+				CustomStep(".post-link");
+				if((IsMsc86() || IsMsc64()) && HasFlag("SHARED")) {
+					String mt("mt -nologo -manifest ");
+					mt << GetHostPathQ(target) << ".manifest -outputresource:" << GetHostPathQ(target)
+				           << (HasFlag("DLL") ? ";2" : ";1");
+				   Execute(mt);
+				}
+				PutConsole(String().Cat() << GetHostPath(target) << " (" << GetFileInfo(target).length
+				           << " B) linked in " << GetPrintTime(time));
+				return true;
+			}
+			else {
+				DeleteFile(target);
+				return false;
+			}
+		}
+	PutConsole(String().Cat() << GetHostPath(target) << " (" << GetFileInfo(target).length
+	           << " B) is up to date.");
+	return true;
+}
+
+bool MscBuilder::Preprocess(const String& package, const String& file, const String& target)
+{
+	FileOut out(target);
+	return Execute(CmdLine() + " -E " + file, out);
+}
+
+Builder *CreateMscBuilder()
+{
+	return new MscBuilder;
+}
+
+void RegisterMscBuilder()
+{
+	RegisterBuilder("MSC71", CreateMscBuilder);
+	RegisterBuilder("MSC8", CreateMscBuilder);
+	RegisterBuilder("MSC8X64", CreateMscBuilder);
+	RegisterBuilder("MSC8ARM", CreateMscBuilder);
+	RegisterBuilder("MSC9", CreateMscBuilder);
+	RegisterBuilder("MSC9X64", CreateMscBuilder);
+	RegisterBuilder("MSC9ARM", CreateMscBuilder);
+	RegisterBuilder("EVC_ARM", CreateMscBuilder);
+	RegisterBuilder("EVC_MIPS", CreateMscBuilder);
+	RegisterBuilder("EVC_SH3", CreateMscBuilder);
+	RegisterBuilder("EVC_SH4", CreateMscBuilder);
+	RegisterBuilder("INTEL", CreateMscBuilder);
+}
diff --git a/uppsrc/ide/Builders/ScriptBuilder.cpp b/uppsrc/ide/Builders/ScriptBuilder.cpp
new file mode 100644
index 000000000..dac1f79a7
--- /dev/null
+++ b/uppsrc/ide/Builders/ScriptBuilder.cpp
@@ -0,0 +1,343 @@
+#include "Builders.h"
+
+#include <Esc/Esc.h>
+
+EscValue ScriptBuilder::ExecuteIf(const char *fn, Vector<EscValue>& args)
+{
+	CheckParse();
+	EscValue out;
+	int f = globals.Find(fn);
+	if(f < 0)
+		return out;
+	try
+	{
+		out = ::Execute(globals, NULL, globals[f], args, 50000);
+	}
+	catch(Exc e)
+	{
+		script_error = true;
+		PutConsole(e);
+	}
+	return out;
+}
+
+EscValue ScriptBuilder::ExecuteIf(const char *fn)
+{
+	Vector<EscValue> args;
+	return ExecuteIf(fn, args);
+}
+
+EscValue ScriptBuilder::ExecuteIf(const char *fn, EscValue arg)
+{
+	Vector<EscValue> args;
+	args.Add(arg);
+	return ExecuteIf(fn, args);
+}
+
+EscValue ScriptBuilder::ExecuteIf(const char *fn, EscValue arg1, EscValue arg2)
+{
+	Vector<EscValue> args;
+	args.Add(arg1);
+	args.Add(arg2);
+	return ExecuteIf(fn, args);
+}
+
+EscValue ScriptBuilder::ExecuteIf(const char *fn, EscValue arg1, EscValue arg2, EscValue arg3)
+{
+	Vector<EscValue> args;
+	args.Add(arg1);
+	args.Add(arg2);
+	args.Add(arg3);
+	return ExecuteIf(fn, args);
+}
+
+void ScriptBuilder::ESC_Execute(EscEscape& e)
+{
+	e = Execute(String(e[0])) ? 0 : 1;
+}
+
+void ScriptBuilder::ESC_PutConsole(EscEscape& e)
+{
+	PutConsole(String(e[0]));
+}
+
+void ScriptBuilder::ESC_PutVerbose(EscEscape& e)
+{
+	PutVerbose(String(e[0]));
+}
+
+void ScriptBuilder::CheckParse()
+{
+	if(is_parsed)
+		return;
+	script_error = false;
+	is_parsed = true;
+	StdLib(globals);
+	Escape(globals, "Execute(cmdline)", THISBACK(ESC_Execute));
+	Escape(globals, "PutConsole(text)", THISBACK(ESC_PutConsole));
+	Escape(globals, "PutVerbose(text)", THISBACK(ESC_PutVerbose));
+	EscValue inclist;
+	inclist.SetEmptyArray();
+	for(int i = 0; i < include.GetCount(); i++)
+		inclist.ArrayAdd(GetHostPathQ(include[i]));
+	globals.GetAdd("INCLUDE") = inclist;
+	EscValue liblist;
+	liblist.SetEmptyArray();
+	for(int i = 0; i < libpath.GetCount(); i++)
+		liblist.ArrayAdd(GetHostPathQ(libpath[i]));
+	globals.GetAdd("LIBPATH") = liblist;
+
+	try
+	{
+		String sdata = LoadFile(script);
+		if(IsNull(sdata))
+			throw Exc(NFormat("%s: not found or empty", script));
+		CParser parser(sdata, script, 1);
+		while(!parser.IsEof()) {
+			String id = parser.ReadId();
+			globals.GetAdd(id) = ReadLambda(parser);
+		}
+	}
+	catch(Exc e)
+	{
+		script_error = true;
+		PutConsole(e);
+	}
+}
+
+bool ScriptBuilder::BuildPackage(const String& package, Vector<String>& linkfile, String& linkoptions,
+	const Vector<String>& all_uses, const Vector<String>& all_libraries, int)
+{
+	int i;
+	String packagepath = PackagePath(package);
+	Package pkg;
+	pkg.Load(packagepath);
+	String packagedir = GetFileFolder(packagepath);
+	ChDir(packagedir);
+	PutVerbose("cd " + packagedir);
+	Vector<String> obj;
+	script_error = false;
+
+	String gfl = Gather(pkg.option, config.GetKeys());
+
+	Vector<String> sfile;
+	Vector<String> soptions;
+	bool           error = false;
+
+	for(i = 0; i < pkg.GetCount(); i++) {
+		if(!IdeIsBuilding())
+			return false;
+		if(!pkg[i].separator) {
+			String gop = Gather(pkg[i].option, config.GetKeys());
+			Vector<String> srcfile = CustomStep(SourcePath(package, pkg[i]));
+			if(srcfile.GetCount() == 0)
+				error = true;
+			for(int j = 0; j < srcfile.GetCount(); j++) {
+				String fn = srcfile[j];
+				String ext = ToLower(GetFileExt(fn));
+				if(ext == ".c" || ext == ".cpp" || ext == ".cc" || ext == ".cxx" ||
+				   (ext == ".rc" && HasFlag("WIN32"))) {
+					sfile.Add(fn);
+					soptions.Add(gfl + " " + gop);
+				}
+				else
+				if(ext == ".o")
+					obj.Add(fn);
+				else
+				if(ext == ".a" || ext == ".so")
+					linkfile.Add(fn);
+			}
+		}
+	}
+
+/*
+	if(HasFlag("BLITZ")) {
+		Blitz b = BlitzStep(sfile, soptions, obj, ".o");
+		if(b.build) {
+			PutConsole("BLITZ:" + b.info);
+			int time = GetTickCount();
+			if(Execute(cc + " " + GetHostPathQ(b.path) + " -o " + GetHostPathQ(b.object)) == 0)
+				PutCompileTime(time, b.count);
+			else
+				error = true;
+		}
+	}
+*/
+	int time = GetTickCount();
+	int ccount = 0;
+	for(i = 0; i < sfile.GetCount() && !script_error; i++) {
+		if(!IdeIsBuilding())
+			return false;
+		String fn = sfile[i];
+		String ext = ToLower(GetFileExt(fn));
+//		bool rc = ext == ".rc";
+		String objfile = ExecuteIf("objectfile", fn);
+		if(script_error)
+			return false;
+		if(IsNull(objfile))
+			objfile = CatAnyPath(outdir, GetFileTitle(fn) + ".o");
+		if(HdependFileTime(fn) > GetFileTime(GetHostPath(objfile))) {
+			PutConsole(GetFileName(fn));
+			int time = GetTickCount();
+			if(!ExecuteIf("compile", GetHostPathQ(fn), GetHostPathQ(objfile), soptions[i]).GetNumber()) {
+				DeleteFile(objfile);
+				error = true;
+			}
+			PutVerbose("compiled in " + GetPrintTime(time));
+			ccount++;
+		}
+		obj.Add(objfile);
+	}
+	if(ccount)
+		PutCompileTime(time, ccount);
+
+	if(error || script_error)
+		return false;
+
+	linkoptions << Gather(pkg.link, config.GetKeys());
+
+	Vector<String> libs = Split(Gather(pkg.library, config.GetKeys()), ' ');
+	linkfile.Append(libs);
+
+	time = GetTickCount();
+	if(!HasFlag("MAIN")) {
+		if(HasFlag("NOLIB")) {
+			linkfile.Append(obj);
+			return true;
+		}
+		String product = ExecuteIf("libraryfile", package);
+		if(IsNull(product))
+			product = CatAnyPath(outdir, GetAnyFileName(package) + ".a");
+		Time producttime = GetFileTime(product);
+		linkfile.Add("*" + product); //!! ugly
+		for(int i = 0; i < obj.GetCount(); i++)
+			if(GetFileTime(obj[i]) > producttime) {
+				PutConsole("Creating library...");
+				DeleteFile(product);
+				EscValue objlist;
+				objlist.SetEmptyArray();
+				for(int i = 0; i < obj.GetCount(); i++)
+					objlist.ArrayAdd(GetHostPathQ(obj[i]));
+				if(!ExecuteIf("library", objlist, product).GetNumber()) {
+					DeleteFile(product);
+					error = true;
+					return false;
+				}
+				PutConsole(String().Cat() << product << " (" << GetFileInfo(product).length
+				           << " B) created in " << GetPrintTime(time));
+				break;
+			}
+		return true;
+	}
+
+	obj.Append(linkfile);
+	linkfile = obj;
+	return true;
+}
+
+bool ScriptBuilder::Link(const Vector<String>& linkfile, const String& linkoptions, bool)
+{
+	int time = GetTickCount();
+	for(int i = 0; i < linkfile.GetCount(); i++)
+		if(GetFileTime(linkfile[i]) >= targettime) {
+			EscValue objlist;
+			objlist.SetEmptyArray();
+			EscValue liblist;
+			liblist.SetEmptyArray();
+			for(i = 0; i < linkfile.GetCount(); i++)
+				if(*linkfile[i] == '*')
+					liblist.ArrayAdd(GetHostPathQ(linkfile[i].Mid(1)));
+				else
+					objlist.ArrayAdd(GetHostPathQ(linkfile[i]));
+			Vector<EscValue> linkargs;
+			linkargs.Add(objlist);
+			linkargs.Add(liblist);
+			linkargs.Add(GetHostPathQ(target));
+			linkargs.Add(linkoptions);
+			PutConsole("Linking...");
+			CustomStep(".pre-link");
+			if(!ExecuteIf("link", linkargs).GetNumber()) {
+				DeleteFile(target);
+				return false;
+			}
+			CustomStep(".post-link");
+			PutConsole(String().Cat() << GetHostPath(target) << " (" << GetFileInfo(target).length
+				<< " B) linked in " << GetPrintTime(time));
+			return true;
+		}
+	PutConsole(String().Cat() << GetHostPath(target) << " (" << GetFileInfo(target).length
+	           << " B) is up to date.");
+	return true;
+}
+
+bool ScriptBuilder::Preprocess(const String& package, const String& file, const String& target)
+{
+	return ExecuteIf("preprocess", file, target).GetNumber();
+}
+
+Builder *CreateScriptBuilder()
+{
+	return new ScriptBuilder;
+}
+
+void RegisterScriptBuilder()
+{
+	RegisterBuilder("SCRIPT", CreateScriptBuilder);
+}
+
+/*
+EscValue LayoutItem::CreateEsc() const
+{
+	EscValue ctrl;
+	String tp = type;
+	String tm;
+	if(ParseTemplate(tp, tm)) {
+		CreateMethods(ctrl, tp, true);
+		ctrl("CtrlPaint") = ctrl("Paint");
+		CreateMethods(ctrl, tm, false);
+	}
+	else
+		CreateMethods(ctrl, tp, false);
+	for(int q = 0; q < property.GetCount(); q++) {
+		EscValue& w = ctrl(property[q].name);
+		const Value& v = ~property[q];
+		if(IsType<Font>(v))
+			w = EscFont(v);
+		if(IsString(v))
+			w = (WString)v;
+		if(IsNumber(v))
+			w = (double)v;
+		if(IsType<Color>(v))
+			w = EscColor(v);
+	}
+	ctrl("type") = (WString)type;
+	ctrl("GetSize") = ReadLambda(Format("() { return Size(%d, %d); }",
+	                                    csize.cx, csize.cy));
+	ctrl("GetRect") = ReadLambda(Format("() { return Rect(0, 0, %d, %d); }",
+	                                    csize.cx, csize.cy));
+	return ctrl;
+}
+
+EscValue LayoutItem::ExecuteMethod(const char *method, Vector<EscValue>& arg) const
+{
+	try {
+		EscValue self = CreateEsc();
+		return ::Execute(UscGlobal(), &self, method, arg, 50000);
+	}
+	catch(CParser::Error& e) {
+		PutConsole(e + "\n");
+	}
+	return EscValue();
+}
+
+EscValue LayoutItem::ExecuteMethod(const char *method) const
+{
+	Vector<EscValue> arg;
+	return ExecuteMethod(method, arg);
+}
+
+Size LayoutItem::GetMinSize()
+{
+	return SizeEsc(ExecuteMethod("GetMinSize"));
+}
+*/
diff --git a/uppsrc/ide/COPYING b/uppsrc/ide/COPYING
new file mode 100644
index 000000000..33aa39102
--- /dev/null
+++ b/uppsrc/ide/COPYING
@@ -0,0 +1,30 @@
+Copyright (C) 2005 Mirek Fidler, Tomas Rylek and various contributors (see AUTHORS)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to
+deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies of the Software and its Copyright notices. In addition publicly
+documented acknowledgment must be given that this software has been used if no
+source code of this software is made available publicly. This includes
+acknowledgments in either Copyright notices, Manuals, Publicity and Marketing
+documents or any documentation provided with any product containing this
+software. This License does not apply to any software that links to the
+libraries provided by this software (statically or dynamically), but only to
+the software provided.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+-----------
+
+Please see the COPYING.PLAIN for a plain-english explanation of this notice
+and it's intent.
diff --git a/uppsrc/ide/COPYING-PLAIN b/uppsrc/ide/COPYING-PLAIN
new file mode 100644
index 000000000..770a8132f
--- /dev/null
+++ b/uppsrc/ide/COPYING-PLAIN
@@ -0,0 +1,33 @@
+Plain English Copyright Notice
+
+This file is not intended to be the actual License. The reason this file
+exists is that we here are programmers and engineers. We aren't lawyers. We
+provide licenses that we THINK say the right things, but we have our own
+intentions at heart. This is a plain-english explanation of what those
+intentions are, and if you follow them you will be within the "spirit" of
+the license.
+
+The intent is for us to enjoy writing software that is useful to us (the
+AUTHORS) and allow others to use it freely and also benefit from the work we
+put into making it. We don't want to restrict others using it. They should
+not *HAVE* to make the source code of the applications they write that
+simply link to these libraries (be that statically or dynamically), or for
+them to be limited as to what license they choose to use (be it open, closed
+or anything else). But we would like to know you are using these libraries.
+We simply would like to know that it has been useful to someone. This is why
+we ask for acknowledgement of some sort.
+
+You can do what you want with the source of this software - it doesn't
+matter. We still have it here for ourselves and it is open and free to use
+and download and play with. It can't be taken away. We don't really mind what
+you do with the source to your software. We would simply like to know that
+you are using it - especially if it makes it to a commerical product. If you
+simply e-mail all the AUTHORS (see COPYING and AUTHORS files) telling us, and
+then make sure you include a paragraph or page in the manual or in the "About.."
+box for the product with the copyright notice and state that you used this
+software, we will be very happy. If you want to contribute back modifications
+and fixes you may have made we will welcome those too with open arms (generally).
+If you want help with changes needed, ports needed or features to be added,
+arrangements can be easily made with some dialogue.
+
+Mirek Fidler <cxl@ntllib.org>
diff --git a/uppsrc/ide/Calc.cpp b/uppsrc/ide/Calc.cpp
new file mode 100644
index 000000000..5461c8f0f
--- /dev/null
+++ b/uppsrc/ide/Calc.cpp
@@ -0,0 +1,74 @@
+#include "ide.h"
+
+IdeCalc::IdeCalc()
+{
+	Highlight(HIGHLIGHT_CALC);
+	NoHorzScrollbar();
+	HideBar();
+}
+
+int LfToSpaceFilter(int c)
+{
+	return c == '\n' ? ' ' : c;
+}
+
+void IdeCalc::Execute()
+{
+	int li = GetLineCount() - 1;
+	if(IsSelection()) {
+		String s = GetSelection();
+		if(s.GetLength() < 80) {
+			SetCursor(GetLength());
+			Paste(Filter(s, LfToSpaceFilter).ToWString());
+		}
+		return;
+	}
+	if(GetLine(GetCursor()) != li) {
+		WString s = GetWLine(GetLine(GetCursor()));
+		if(s[0] == '$') s = s.Mid(1);
+		SetCursor(GetLength());
+		Paste(s);
+		return;
+	}
+	String txt;
+	try {
+		ArrayMap<String, EscValue>& g = UscGlobal();
+		for(int i = 0; i < g.GetCount(); i++)
+			vars.GetAdd(g.GetKey(i)) = g[i];
+		String s = GetUtf8Line(li);
+		if(IsNull(s))
+			return;
+		EscValue v = Evaluatex(s, vars);
+		txt = v.ToString(GetSize().cx / max(1, GetFont().Info()['x']), 4, true);
+		vars.GetAdd("_") = v;
+	}
+	catch(CParser::Error e) {
+		const char *x = strchr(e, ':');
+		txt << "ERROR: " << (x ? x + 1 : ~e);
+	}
+	SetCursor(GetPos(li));
+	Paste("$");
+	SetCursor(GetLength());
+	Paste("\n");
+	Paste(FromUtf8(txt));
+	Paste("\n");
+}
+
+void IdeCalc::LeftDouble(Point p, dword flags)
+{
+	CodeEditor::LeftDouble(p, flags);
+	if(IsSelection())
+		Execute();
+}
+
+bool IdeCalc::Key(dword key, int count)
+{
+	switch(key) {
+	case K_ENTER:
+		Execute();
+		break;
+	default:
+		return CodeEditor::Key(key, count);
+	}
+	return true;
+}
diff --git a/uppsrc/ide/Common/ComDlg.cpp b/uppsrc/ide/Common/ComDlg.cpp
new file mode 100644
index 000000000..998726c95
--- /dev/null
+++ b/uppsrc/ide/Common/ComDlg.cpp
@@ -0,0 +1,102 @@
+#include "Common.h"
+
+void IdeFileIcon0(bool dir, const String& filename, Image& img, bool fast = false)
+{
+	if(dir) return;
+	String ext = ToLower(GetFileExt(filename));
+	if(ext == ".h" || ext == ".hpp" || ext == ".hh" || ext == ".hxx")
+		img = IdeCommonImg::Header();
+	for(int i = 0; i < GetIdeModuleCount(); i++) {
+		Image m = GetIdeModule(i).FileIcon(filename);
+		if(!IsNull(m)) {
+			img = m;
+			break;
+		}
+	}
+	if(ext == ".usc")
+		img = IdeCommonImg::Script();
+	if(ext == ".lng" || ext == ".lngj" || ext == ".t" || ext == ".jt")
+		img = IdeCommonImg::Language();
+	if(fast)
+		img = IdeCommonImg::Fast();
+	if(ext == ".icpp")
+		img = fast ? IdeCommonImg::FastISource() : IdeCommonImg::ISource();
+	if(ext == ".c" || ext == ".cpp" || ext == ".cc" || ext == ".cxx")
+		img = fast ? IdeCommonImg::FastSource() : IdeCommonImg::Source();
+}
+
+Image IdeFileImage(const String& filename, bool fast)
+{
+	Image img = CtrlImg::File();
+	IdeFileIcon0(false, filename, img, fast);
+	return img;
+}
+
+void IdeFileIcon(bool dir, const String& filename, Image& img)
+{
+	IdeFileIcon0(dir, filename, img);
+}
+
+void IdeFs(FileSel& fs) {
+	fs.WhenIcon = callback(IdeFileIcon);
+	fs.AllFilesType();
+	fs.Multi();
+	fs.NoAsking();
+	fs.ReadOnlyOption();
+}
+
+void SourceFs(FileSel& fs) {
+	String mask = "*.cpp *.h *.hpp *.c *.C *.cc *.cxx *.lay *.iml *.lng *.sch *.usc *.rc *.brc *.upt";
+	fs.Type("Source files (" + mask + ")", mask);
+	IdeFs(fs);
+}
+
+FileSel& AnySourceFs() {
+	static FileSel *fsp;
+	if(!fsp) {
+		static FileSel fs;
+		SourceFs(fs);
+		fsp = &fs;
+	}
+	fsp->Multi();
+	return *fsp;
+}
+
+FileSel& AnyPackageFs() {
+	static FileSel fs;
+	static bool b;
+	if(!b) {
+		fs.Type("Ultimate++ package (*.upp)", "*.upp");
+		fs.AllFilesType();
+		b = true;
+	}
+	return fs;
+}
+
+FileSel& BasedSourceFs() {
+	static FileSel *fsp;
+	if(!fsp) {
+		static FileSel fs;
+		SourceFs(fs);
+		fsp = &fs;
+	}
+	fsp->Multi();
+	return *fsp;
+}
+
+FileSel& OutputFs() {
+	static FileSel *fsp;
+	if(!fsp) {
+		static FileSel fs;
+		fs.AllFilesType();
+		fs.Type("Various (*.log *.map *.ini *.sql)", "*.log *.map *.ini *.sql");
+		fs.Type("Log files (*.log)", "*.log");
+		fs.Type("Map files (*.map)", "*.map");
+		fs.Type("Ini files (*.ini)", "*.ini");
+		fs.Type("SQL scripts (*.sql)", "*.sql");
+		IdeFs(fs);
+		fsp = &fs;
+	}
+	fsp->Multi();
+	return *fsp;
+}
diff --git a/uppsrc/ide/Common/Common.cpp b/uppsrc/ide/Common/Common.cpp
new file mode 100644
index 000000000..a78d23340
--- /dev/null
+++ b/uppsrc/ide/Common/Common.cpp
@@ -0,0 +1,477 @@
+#include "Common.h"
+
+#define IMAGECLASS IdeCommonImg
+#define IMAGEFILE  <ide/Common/common.iml>
+#include <Draw/iml_source.h>
+
+typedef VectorMap<String, Builder *(*)()> BuilderMapType;
+GLOBAL_VAR(BuilderMapType, BuilderMap)
+
+void RegisterBuilder(const char *name, Builder *(*create)())
+{
+	ASSERT(BuilderMap().Find(name) < 0);
+	BuilderMap().Add(name, create);
+}
+
+String FindInDirs(const Vector<String>& dir, const String& file)
+{
+	if(!IsFullPath(file))
+		for(int i = 0; i < dir.GetCount(); i++) {
+			String ef = CatAnyPath(dir[i], file);
+			if(FileExists(ef))
+				return ef;
+		}
+	return file;
+}
+
+String FindCommand(const Vector<String>& exedir, const String& cmdline)
+{
+	String app;
+	const char *s = cmdline;
+	while(*s && (byte)*s <= ' ')
+		s++;
+	if(*s == '\"')
+	{
+		const char *b = ++s;
+		while(*s && *s != '\"')
+			s++;
+		app = String(b, s);
+		if(*s)
+			s++;
+	}
+	else
+	{
+		const char *b = s;
+		while(*s && (byte)*s > ' ')
+			s++;
+		app = String(b, s);
+	}
+	String tail = s;
+	String fn = FindInDirs(exedir, app);
+	if(!FileExists(fn))
+#ifdef PLATFORM_WIN32
+		fn = FindInDirs(exedir, ForceExt(app, ".exe"));
+#endif
+#ifdef PLATFORM_POSIX
+		fn = FindInDirs(exedir, app);
+#endif
+	if(fn.Find(' ') >= 0)
+		fn = '\"' + fn + '\"';
+	return fn + tail;
+}
+
+String GetMakePath(String fn, bool win32)
+{
+	fn = UnixPath(fn);
+	if(!win32)
+		return fn;
+	String out;
+	for(const char *p = fn; *p; p++)
+		if(*p == '/')
+			out << "\\\\";
+		else
+			out.Cat(*p);
+	return out;
+}
+
+String AdjustMakePath(const char *fn)
+{
+	String out;
+	for(; *fn; fn++)
+		if(*fn == '$')
+			out << '$' << '$';
+		else
+			out << *fn;
+	return out;
+}
+
+static IdeContext *the_ide;
+
+IdeContext *TheIde() { return the_ide; }
+void        TheIde(IdeContext *context) { the_ide = context; }
+
+void PutConsole(const char *s) { if(the_ide) the_ide->PutConsole(s); }
+void PutVerbose(const char *s) { if(the_ide) the_ide->PutVerbose(s); }
+
+const Workspace& GetIdeWorkspace()
+{
+	if(the_ide)
+		return the_ide->IdeWorkspace();
+	static Workspace x;
+	return x;
+}
+
+bool IdeIsBuilding()
+{
+	return the_ide && the_ide->IdeIsBuilding();
+}
+
+void IdeSetBar()
+{
+	if(the_ide)
+		the_ide->IdeSetBar();
+}
+
+String IdeGetOneFile()
+{
+	return the_ide ? the_ide->IdeGetOneFile() : String(Null);
+}
+
+int IdeConsoleExecute(const char *cmdline, Stream *out, const char *envptr, bool quiet)
+{
+	return the_ide ? the_ide->IdeConsoleExecute(cmdline, out, envptr, quiet) : -1;
+}
+
+int IdeConsoleExecuteWithInput(const char *cmdline, Stream *out, const char *envptr, bool quiet)
+{
+	return the_ide ? the_ide->IdeConsoleExecuteWithInput(cmdline, out, envptr, quiet) : -1;
+}
+
+int IdeConsoleExecute(One<SlaveProcess> process, const char *cmdline, Stream *out, bool quiet)
+{
+	return the_ide ? the_ide->IdeConsoleExecute(process, cmdline, out, quiet) : -1;
+}
+
+int IdeConsoleAllocSlot()
+{
+	return the_ide ? the_ide->IdeConsoleAllocSlot() : 0;
+}
+
+bool IdeConsoleRun(const char *cmdline, Stream *out, const char *envptr, bool quiet, int slot, String key, int blitz_count)
+{
+	return the_ide && the_ide->IdeConsoleRun(cmdline, out, envptr, quiet, slot, key, blitz_count);
+}
+
+bool IdeConsoleRun(One<SlaveProcess> process, const char *cmdline, Stream *out, bool quiet, int slot, String key, int blitz_count)
+{
+	return the_ide && the_ide->IdeConsoleRun(process, cmdline, out, quiet, slot, key, blitz_count);
+}
+
+void IdeConsoleFlush()
+{
+	if(the_ide) the_ide->IdeConsoleFlush();
+}
+
+void IdeConsoleBeginGroup(String group)
+{
+	if(the_ide) the_ide->IdeConsoleBeginGroup(group);
+}
+
+void IdeConsoleEndGroup()
+{
+	if(the_ide) the_ide->IdeConsoleEndGroup();
+}
+
+bool IdeConsoleWait()
+{
+	return the_ide && the_ide->IdeConsoleWait();
+}
+
+void IdeSetBottom(Ctrl& ctrl)
+{
+	if(the_ide) the_ide->IdeSetBottom(ctrl);
+}
+
+void  IdeActivateBottom() {
+	if(the_ide) the_ide->IdeActivateBottom();
+}
+
+
+void IdeRemoveBottom(Ctrl& ctrl)
+{
+	if(the_ide) the_ide->IdeRemoveBottom(ctrl);
+}
+
+void IdeSetRight(Ctrl& ctrl)
+{
+	if(the_ide) the_ide->IdeSetRight(ctrl);
+}
+
+void IdeRemoveRight(Ctrl& ctrl)
+{
+	if(the_ide) the_ide->IdeRemoveRight(ctrl);
+}
+
+bool IdeIsDebug()
+{
+	return the_ide && the_ide->IdeIsDebug();
+}
+
+void IdeEndDebug()
+{
+	if(the_ide)
+		the_ide->IdeEndDebug();
+}
+
+void IdeSetDebugPos(const String& file, int line, const Image& img, int i)
+{
+	if(the_ide)
+		the_ide->IdeSetDebugPos(file, line, img, i);
+}
+
+void IdeHidePtr()
+{
+	if(the_ide)
+		the_ide->IdeHidePtr();
+}
+
+bool IdeDebugLock()
+{
+	return the_ide && the_ide->IdeDebugLock();
+}
+
+bool IdeDebugUnLock()
+{
+	return the_ide && the_ide->IdeDebugUnLock();
+}
+
+bool IdeIsDebugLock()
+{
+	return the_ide && the_ide->IdeIsDebugLock();
+}
+
+String IdeGetFileName()
+{
+	return the_ide ? the_ide->IdeGetFileName() : String(Null);
+}
+
+int    IdeGetFileLine()
+{
+	return the_ide ? the_ide->IdeGetFileLine() : 0;
+}
+
+String IdeGetLine(int i)
+{
+	return the_ide ? the_ide->IdeGetLine(i) : String(Null);
+}
+
+bool SaveChangedFile(const char *path, String data, bool delete_empty)
+{
+	if(LoadFile(path) == data)
+		return true;
+	if(delete_empty && IsNull(data))
+		return FileDelete(path);
+	else
+		return SaveFile(path, data);
+}
+
+static int sReadCharc(CParser& p)
+{
+	p.PassChar('\'');
+	if(!IsAlpha(p.PeekChar()))
+		p.ThrowError("language code alphabetic character expected");
+	char c = p.GetChar();
+	p.PassChar('\'');
+	return c;
+}
+
+static void sReadLNG(CParser& p, char *c)
+{
+	p.PassChar('(');
+	c[0] = sReadCharc(p);
+	p.PassChar(',');
+	c[1] = sReadCharc(p);
+	p.PassChar(',');
+	c[2] = sReadCharc(p);
+	p.PassChar(',');
+	c[3] = sReadCharc(p);
+}
+
+int ReadLNG(CParser& p) {
+	char c[4];
+	if(p.Id("LNG_CZECH"))
+		return LNG_CZECH;
+	else
+	if(p.Id("LNG_ENGLISH"))
+		return LNG_ENGLISH;
+	else
+	if(p.Id("LNG_")) {
+		sReadLNG(p, c);
+		p.PassChar(')');
+		return LNG_(c[0], c[1], c[2], c[3]);
+	}
+	else
+	if(p.Id("LNGC_")) {
+		sReadLNG(p, c);
+		p.PassChar(',');
+		dword l = LNGC_(c[0], c[1], c[2], c[3], p.ReadInt());
+		p.PassChar(')');
+		return l;
+	}
+	else
+		p.ThrowError("invalid language code");
+	return 0;
+}
+
+String MakeLNG(int lang)
+{
+	int cs = GetLNGCharset(lang);
+	String str;
+	if(cs)
+		return str << "LNGC_('"
+		       << char(((lang >> 15) & 31) + 'A' - 1) << "', '"
+		       << char(((lang >> 10) & 31) + 'A' - 1) << "', '"
+		       << char(((lang >>  5) & 31) + 'A' - 1) << "', '"
+		       << char((lang & 31) + 'A' - 1) << "', " << cs << ")";
+	else
+		return str << "LNG_('"
+		       << char(((lang >> 15) & 31) + 'A' - 1) << "', '"
+		       << char(((lang >> 10) & 31) + 'A' - 1) << "', '"
+		       << char(((lang >>  5) & 31)+ 'A' - 1) << "', '"
+		       << char((lang & 31) + 'A' - 1) << "')";
+}
+
+String PrintTime(int time) {
+	int q = time % 1000 / 10;
+	time /= 1000;
+	return Format("(%d:%02d.%02d)", time / 60, time % 60, q);
+}
+
+Point ReadNums(CParser& p) {
+	Point pt;
+	pt.x = p.ReadInt();
+	p.PassChar(',');
+	pt.y = p.ReadInt();
+	return pt;
+}
+
+Point ReadPoint(CParser& p)
+{
+	Point pt;
+	p.PassChar('(');
+	pt = ReadNums(p);
+	p.PassChar(')');
+	return pt;
+}
+
+static Vector<IdeModule *>& sM()
+{
+	static Vector<IdeModule *> m;
+	return m;
+}
+
+void RegisterIdeModule(IdeModule& module)
+{
+	sM().Add(&module);
+}
+
+int  GetIdeModuleCount()
+{
+	return sM().GetCount();
+}
+
+IdeModule& GetIdeModule(int q)
+{
+	return *sM()[q];
+}
+
+bool FinishSave(String tmpfile, String outfile)
+{
+	Progress progress;
+	int time = GetTickCount();
+	for(;;) {
+		progress.SetTotal(10000);
+		progress.SetText("Saving '" + GetFileName(outfile) + "'");
+		if(!FileExists(tmpfile))
+			return false;
+		FileDelete(outfile);
+		if(FileMove(tmpfile, outfile))
+			return true;
+		IdeConsoleFlush();
+		Sleep(200);
+		if(progress.SetPosCanceled((GetTickCount() - time) % progress.GetTotal())) {
+			int art = Prompt(Ctrl::GetAppName(), CtrlImg::exclamation(),
+				"Unable to save current file.&"
+				"Retry save, ignore it or save file to another location?",
+				"Save as...", "Retry", "Ignore");
+			if(art < 0)
+				return false;
+			if(art && AnySourceFs().ExecuteSaveAs())
+				outfile = AnySourceFs();
+			progress.SetPos(0);
+		}
+	}
+}
+
+bool FinishSave(String outfile)
+{
+	return FinishSave(outfile + ".$tmp", outfile);
+}
+
+bool SaveFileFinish(const String& filename, const String& data)
+{
+	if(!SaveFile(filename + ".$tmp", data)) {
+		Exclamation("Error creating temporary file " + filename);
+		return false;
+	}
+	return FinishSave(filename);
+}
+
+bool SaveChangedFileFinish(const String& filename, const String& data)
+{
+	if(data == LoadFile(filename))
+		return true;
+	return SaveFileFinish(filename, data);
+}
+
+typedef VectorMap<String, String> StringMap;
+
+GLOBAL_VAR(StringMap,  sWorkspaceCfg)
+GLOBAL_VAR(Vector<Callback>, sWorkspaceCfgFlush)
+
+void    RegisterWorkspaceConfig(const char *name)
+{
+	ASSERT(sWorkspaceCfg().Find(name) < 0);
+	sWorkspaceCfg().Add(name);
+}
+
+void    RegisterWorkspaceConfig(const char *name, Callback WhenFlush)
+{
+	RegisterWorkspaceConfig(name);
+	sWorkspaceCfgFlush().Add(WhenFlush);
+}
+
+
+String& WorkspaceConfigData(const char *name)
+{
+	return sWorkspaceCfg().GetAdd(name);
+}
+
+void  SerializeWorkspaceConfigs(Stream& s)
+{
+	int i;
+	for(i = 0; i < sWorkspaceCfgFlush().GetCount(); i++)
+		sWorkspaceCfgFlush()[i]();
+	VectorMap<String, String>& cfg = sWorkspaceCfg();
+	int version = 0;
+	s / version;
+	int count = cfg.GetCount();
+	s / count;
+	for(i = 0; i < count; i++) {
+		String name;
+		if(s.IsStoring())
+			name = cfg.GetKey(i);
+		s % name;
+		int q = cfg.Find(name);
+		if(q >= 0)
+			s % cfg[q];
+		else
+		{
+			String dummy;
+			s % dummy;
+		}
+	}
+	s.Magic();
+}
+
+bool OldLang() {
+	static int q = -1;
+	if(q < 0)
+		q = FileExists(ConfigFile("oldlang"));
+	return q;
+}
+
+int CharFilterCid(int c)
+{
+	return IsAlNum(c) || c == '_' ? c : 0;
+}
diff --git a/uppsrc/ide/Common/Common.h b/uppsrc/ide/Common/Common.h
new file mode 100644
index 000000000..63fd3f58a
--- /dev/null
+++ b/uppsrc/ide/Common/Common.h
@@ -0,0 +1,467 @@
+#ifndef COMMON_H
+#define COMMON_H
+
+#include <CtrlLib/CtrlLib.h>
+#include <Esc/Esc.h>
+#include <Web/Web.h>
+
+using namespace Upp;
+
+#define IMAGECLASS IdeCommonImg
+#define IMAGEFILE  <ide/Common/common.iml>
+#include <Draw/iml_header.h>
+
+int CharFilterCid(int c);
+
+int    ReadLNG(CParser& p);
+String MakeLNG(int lang);
+
+bool   OldLang();
+
+String        PrintTime(int msecs);
+inline String GetPrintTime(dword time0) { return PrintTime(msecs(time0)); }
+
+bool   SaveChangedFile(const char *path, String data, bool delete_empty = false);
+
+class Workspace;
+
+struct Ide;
+
+class IdeContext
+{
+public:
+	virtual void      PutConsole(const char *s) = 0;
+	virtual void      PutVerbose(const char *s) = 0;
+
+	virtual const Workspace& IdeWorkspace() const = 0;
+	virtual bool             IdeIsBuilding() const = 0;
+	virtual String           IdeGetOneFile() const = 0;
+	virtual int              IdeConsoleExecute(const char *cmdline, Stream *out = NULL, const char *envptr = NULL, bool quiet = false) = 0;
+	virtual int              IdeConsoleExecuteWithInput(const char *cmdline, Stream *out, const char *envptr, bool quiet) = 0;
+	virtual int              IdeConsoleExecute(One<SlaveProcess> process, const char *cmdline, Stream *out = NULL, bool quiet = false) = 0;
+	virtual int              IdeConsoleAllocSlot() = 0;
+	virtual bool             IdeConsoleRun(const char *cmdline, Stream *out = NULL, const char *envptr = NULL, bool quiet = false, int slot = 0, String key = Null, int blitz_count = 1) = 0;
+	virtual bool             IdeConsoleRun(One<SlaveProcess> process, const char *cmdline, Stream *out = NULL, bool quiet = false, int slot = 0, String key = Null, int blitz_count = 1) = 0;
+	virtual void             IdeConsoleFlush() = 0;
+	virtual void             IdeConsoleBeginGroup(String group) = 0;
+	virtual void             IdeConsoleEndGroup() = 0;
+	virtual bool             IdeConsoleWait() = 0;
+
+	virtual bool      IdeIsDebug() const = 0;
+	virtual void      IdeEndDebug() = 0;
+	virtual void      IdeSetBottom(Ctrl& ctrl) = 0;
+	virtual void      IdeActivateBottom() = 0;
+	virtual void      IdeRemoveBottom(Ctrl& ctrl) = 0;
+	virtual void      IdeSetRight(Ctrl& ctrl) = 0;
+	virtual void      IdeRemoveRight(Ctrl& ctrl) = 0;
+
+	virtual String    IdeGetFileName() const = 0;
+	virtual int       IdeGetFileLine() = 0;
+	virtual String    IdeGetLine(int i) const = 0;
+
+	virtual void      IdeSetDebugPos(const String& fn, int line, const Image& img, int i) = 0;
+	virtual void      IdeHidePtr() = 0;
+	virtual bool      IdeDebugLock() = 0;
+	virtual bool      IdeDebugUnLock() = 0;
+	virtual bool      IdeIsDebugLock() const = 0;
+	virtual void      IdeSetBar() = 0;
+	
+	virtual ~IdeContext() {}
+};
+
+IdeContext *TheIde();
+void        TheIde(IdeContext *context);
+
+void      PutConsole(const char *s);
+void      PutVerbose(const char *s);
+
+const Workspace& GetIdeWorkspace();
+bool             IdeIsBuilding();
+String           IdeGetOneFile();
+int              IdeConsoleExecute(const char *cmdline, Stream *out = NULL, const char *envptr = NULL, bool quiet = false);
+int              IdeConsoleExecuteWithInput(const char *cmdline, Stream *out, const char *envptr, bool quiet);
+int              IdeConsoleExecute(One<SlaveProcess> process, const char *cmdline, Stream *out = NULL, bool quiet = false);
+int              IdeConsoleAllocSlot();
+bool             IdeConsoleRun(const char *cmdline, Stream *out = NULL, const char *envptr = NULL, bool quiet = false, int slot = 0, String key = Null, int blitz_count = 1);
+bool             IdeConsoleRun(One<SlaveProcess> process, const char *cmdline, Stream *out = NULL, bool quiet = false, int slot = 0, String key = Null, int blitz_count = 1);
+void             IdeConsoleFlush();
+void             IdeConsoleBeginGroup(String group);
+void             IdeConsoleEndGroup();
+bool             IdeConsoleWait();
+
+bool      IdeIsDebug();
+void      IdeEndDebug();
+void      IdeSetBottom(Ctrl& ctrl);
+void      IdeActivateBottom();
+void      IdeRemoveBottom(Ctrl& ctrl);
+void      IdeSetRight(Ctrl& ctrl);
+void      IdeRemoveRight(Ctrl& ctrl);
+
+String    IdeGetFileName();
+int       IdeGetFileLine();
+String    IdeGetLine(int i);
+
+void      IdeSetDebugPos(const String& fn, int line, const Image& img, int i);
+void      IdeHidePtr();
+bool      IdeDebugLock();
+bool      IdeDebugUnLock();
+bool      IdeIsDebugLock();
+
+void      IdeSetBar();
+
+struct IdeDesigner  {
+	virtual String GetFileName() const = 0;
+	virtual void   Save() = 0;
+	virtual void   SyncUsc()                                        {}
+	virtual void   SaveEditPos()                                    {}
+	virtual void   EditMenu(Bar& menu) = 0;
+	virtual int    GetCharset() const                               { return -1; }
+	virtual Ctrl&  DesignerCtrl() = 0;
+	virtual void   SetFocus()                                       { DesignerCtrl().SetFocus(); }
+
+	virtual ~IdeDesigner() {}
+};
+
+struct IdeModule {
+	virtual void         CleanUsc() {}
+	virtual bool         ParseUsc(CParser&)                                       { return false; }
+	virtual Image        FileIcon(const char *filename)                           { return Null; }
+	virtual IdeDesigner *CreateDesigner(Ide *ide, const char *path, byte charset) { return CreateDesigner(path, charset); }
+	virtual IdeDesigner *CreateDesigner(const char *path, byte charset)           { return NULL; }
+	virtual void         Serialize(Stream& s) {}
+	
+	virtual ~IdeModule() {}
+};
+
+void       RegisterIdeModule(IdeModule& module);
+int        GetIdeModuleCount();
+IdeModule& GetIdeModule(int q);
+
+struct IdeMacro {
+	IdeMacro();
+
+	int hotkey;
+	String menu;
+	String submenu;
+	EscValue code;
+};
+
+ArrayMap<String, EscValue>& UscGlobal();
+Array<IdeMacro>&            UscMacros();
+
+void CleanUsc();
+void ParseUscFile(const char *filename) throw(CParser::Error);
+
+Point ReadNums(CParser& p);
+Point ReadPoint(CParser& p);
+
+struct SemiTextTest : public TextTest {
+	virtual const char *Accept(const char *s) const;
+};
+
+Vector<String> SplitDirs(const char *s);
+
+String VarFilePath();
+String VarFilePath(String name);
+
+bool   SaveVarFile(const char *filename, const VectorMap<String, String>& var);
+bool   LoadVarFile(const char *name, VectorMap<String, String>& var);
+bool   SaveVars(const char *name);
+bool   LoadVars(const char *name);
+String GetVar(const String& var);
+String GetVarsName();
+String VarFilePath();
+Vector<String> GetUppDirs();
+String GetUppDir();
+void   SetVar(const String& var, const String& value);
+
+String GetAnyFileName(const char *path);
+String GetAnyFileTitle(const char *path);
+String CatAnyPath(String path, const char *more);
+String PackagePath(const String& name);
+String SourcePath(const String& package, const String& name);
+inline
+String PackageDirectory(const String& name) { return GetFileDirectory(PackagePath(name)); }
+
+String GetCommonDir();
+String CommonPath(const String& filename);
+
+String GetLocalDir();
+String LocalPath(const String& filename);
+
+bool   IsFullDirectory(const String& d);
+
+bool   IsCSourceFile(const char *path);
+bool   IsCHeaderFile(const char *path);
+
+String FollowCygwinSymlink(const String& filename);
+
+void   SplitPathMap(const char *path_map, Vector<String>& local, Vector<String>& remote);
+String JoinPathMap(const Vector<String>& local, const Vector<String>& remote);
+void   SplitHostName(const char *hostname, String& host, int& port);
+
+Vector<String> SplitFlags0(const char *flags);
+Vector<String> SplitFlags(const char *flags, bool main = false);
+Vector<String> SplitFlags(const char *flags, bool main, const Vector<String>& accepts);
+
+bool   MatchWhen(const String& when, const Vector<String>& flag);
+String ReadWhen(CParser& p);
+String AsStringWhen(const String& when);
+
+struct OptItem {
+	String   when;
+	String   text;
+};
+
+struct CustomStep {
+	String when;
+	String ext;
+	String command;
+	String output;
+
+	void   Load(CParser& p) throw(CParser::Error);
+	String AsString() const;
+
+	String GetExt() const;
+	bool   MatchExt(const char *fn) const;
+};
+
+Vector<String> Combine(const Vector<String>& conf, const char *flags);
+String Gather(const Array<OptItem>& set, const Vector<String>& conf);
+
+bool   HasFlag(const Vector<String>& conf, const char *flag);
+
+enum {
+	FLAG_MISMATCH = -2,
+	FLAG_UNDEFINED = -1,
+};
+
+int    GetType(const Vector<String>& conf, const char *flags);
+int    GetType(const Vector<String>& conf, const char *flags, int def);
+bool   GetFlag(const Vector<String>& conf, const char *flag);
+String RemoveType(Vector<String>& conf, const char *flags);
+
+class Package {
+public:
+	struct File : public String {
+		Array<OptItem> option;
+		Array<OptItem> depends;
+		bool           readonly;
+		bool           separator;
+		int            tabsize;
+		byte           charset;
+		int            font;
+		String         highlight;
+		String         unknown;
+		int            optimize_speed;
+
+		void operator=(const String& s)   { String::operator=(s); readonly = separator = false; }
+		void Init()  { readonly = separator = false; tabsize = Null; charset = 0; font = 0;
+		               optimize_speed = false; }
+
+		File()                            { Init(); }
+		File(const String& s) : String(s) { Init(); }
+	};
+	struct Config {
+		String name;
+		String param;
+	};
+	byte                     charset;
+	bool                     optimize_speed;
+	bool                     noblitz;
+	String                   description;
+	Vector<String>           accepts;
+	Array<OptItem>           flag;
+	Array<OptItem>           uses;
+	Array<OptItem>           target;
+	Array<OptItem>           library;
+	Array<OptItem>           link;
+	Array<OptItem>           option;
+	Array<File>              file;
+	Array<Config>            config;
+	Array<CustomStep>        custom;
+	String                   unknown;
+	Time                     time;
+
+	int   GetCount() const                { return file.GetCount(); }
+	File& operator[](int i)               { return file[i]; }
+	const File& operator[](int i) const   { return file[i]; }
+
+	void  Load(const char *file);
+	bool  Save(const char *file) const;
+
+	Package();
+};
+
+class Workspace {
+	void     AddUses(Package& p, bool match, const Vector<String>& flag);
+	void     AddLoad(const String& name, bool match, const Vector<String>& flag);
+
+public:
+	ArrayMap<String, Package> package;
+
+	void           Clear()                     { package.Clear(); }
+	String         operator[](int i) const     { return package.GetKey(i); }
+	Package&       GetPackage(int i)           { return package[i]; }
+	const Package& GetPackage(int i) const     { return package[i]; }
+	int            GetCount() const            { return package.GetCount(); }
+
+	void           Scan(const char *prjname);
+	void           Scan(const char *prjname, const Vector<String>& flag);
+
+	Vector<String> GetAllAccepts(int pk) const;
+
+	void     Dump();
+};
+
+struct Ide;
+
+bool FinishSave(String tmpfile, String outfile);
+bool FinishSave(String outfile);
+bool SaveFileFinish(const String& filename, const String& data);
+bool SaveChangedFileFinish(const String& filename, const String& data);
+
+enum {
+	DEBUG_NONE, DEBUG_MINIMAL, DEBUG_FULL
+};
+
+struct Host {
+	struct FileInfo : Time, Moveable<FileInfo> {
+		int length;
+	};
+	virtual String             GetEnvironment() = 0;
+	virtual String             GetHostPath(const String& path) = 0;
+	virtual String             GetLocalPath(const String& path) = 0;
+	virtual String             NormalizePath(const String& path) = 0;
+	virtual Vector<FileInfo>   GetFileInfo(const Vector<String>& path) = 0;
+	virtual void               DeleteFile(const Vector<String>& path) = 0;
+	virtual void               DeleteFolderDeep(const String& dir) = 0;
+	virtual void               ChDir(const String& path) = 0;
+	virtual void               RealizeDir(const String& path) = 0;
+	virtual void               SaveFile(const String& path, const String& data) = 0;
+	virtual String             LoadFile(const String& path) = 0;
+	virtual int                Execute(const char *cmdline) = 0;
+	virtual int                ExecuteWithInput(const char *cmdline) = 0;
+	virtual int                Execute(const char *cmdline, Stream& out) = 0;
+	virtual int                AllocSlot() = 0;
+	virtual bool               Run(const char *cmdline, int slot, String key, int blitz_count) = 0;
+	virtual bool               Run(const char *cmdline, Stream& out, int slot, String key, int blitz_count) = 0;
+	virtual bool               Wait() = 0;
+	virtual One<SlaveProcess>  StartProcess(const char *cmdline) = 0;
+	virtual void               Launch(const char *cmdline, bool console = false) = 0;
+	virtual void               AddFlags(Index<String>& cfg) = 0;
+
+	virtual ~Host() {}
+};
+
+String FindInDirs(const Vector<String>& dir, const String& file);
+String FindCommand(const Vector<String>& exedir, const String& cmdline);
+
+struct MakeFile {
+	String outdir;
+	String outfile;
+	String output;
+	String config;
+	String install;
+	String rules;
+	String linkdep;
+	String linkfiles;
+	String linkfileend;
+};
+
+String GetMakePath(String fn, bool win32);
+String AdjustMakePath(const char *fn);
+
+enum {
+	R_OPTIMAL,
+	R_SPEED,
+	R_SIZE
+};
+
+struct Builder {
+	Host            *host;
+	Index<String>    config;
+	String           compiler;
+	String           method;
+	String           outdir;
+	Vector<String>   include;
+	Vector<String>   libpath;
+	String           target;
+	String           debug_options;
+	String           release_options;
+	String           release_size_options;
+	String           version;
+	String           script;
+	bool             doall;
+
+	virtual bool BuildPackage(const String& package, Vector<String>& linkfile, String& linkoptions,
+		const Vector<String>& all_uses, const Vector<String>& all_libraries, int optimize)
+	{ return false; }
+	virtual bool Link(const Vector<String>& linkfile, const String& linkoptions, bool createmap)
+	{ return false; }
+	virtual bool Preprocess(const String& package, const String& file, const String& result)
+	{ return false; }
+	virtual void   AddFlags(Index<String>& cfg) {}
+	virtual void   AddMakeFile(MakeFile& mfinfo, String package,
+		const Vector<String>& all_uses, const Vector<String>& all_libraries,
+		const Index<String>& common_config) {}
+	virtual String GetTargetExt() const = 0;
+
+	Builder()          { doall = false; }
+	virtual ~Builder() {}
+};
+
+VectorMap<String, Builder *(*)()>& BuilderMap();
+void RegisterBuilder(const char *name, Builder *(*create)());
+
+struct Debugger {
+	virtual void DebugBar(Bar& bar) = 0;
+	virtual bool SetBreakpoint(const String& filename, int line, const String& bp) = 0;
+	virtual bool RunTo() = 0;
+	virtual void Run() = 0;
+	virtual void Stop() = 0;
+	virtual bool IsFinished() = 0;
+
+	virtual ~Debugger() {}
+};
+
+void                  HdependSetDirs(pick_ Vector<String>& id);
+void                  HdependTimeDirty();
+void                  HdependClearDependencies();
+void                  HdependAddDependency(const String& file, const String& depends);
+Time                  HdependFileTime(const String& path);
+Vector<String>        HdependGetDependencies(const String& path);
+bool                  HdependBlitzApproved(const String& path);
+const Vector<String>& HdependGetDefines(const String& path);
+const Vector<String>& HdependGetAllFiles();
+
+void      SourceFs(FileSel& fsel);
+FileSel&  AnySourceFs();
+FileSel&  AnyPackageFs();
+FileSel&  BasedSourceFs();
+FileSel&  OutputFs();
+
+Image     IdeFileImage(const String& filename, bool fast = false);
+
+void             RegisterWorkspaceConfig(const char *name);
+void             RegisterWorkspaceConfig(const char *name, Callback WhenFlush);
+String&          WorkspaceConfigData(const char *name);
+
+template <class T>
+bool LoadFromWorkspace(T& x, const char *name)
+{
+	StringStream ss(WorkspaceConfigData(name));
+	return ss.IsEof() || Load(x, ss);
+}
+
+template <class T>
+void StoreToWorkspace(T& x, const char *name)
+{
+	StringStream ss;
+	Store(x, ss);
+	WorkspaceConfigData(name) = ss;
+}
+
+void SerializeWorkspaceConfigs(Stream& s);
+
+#endif
diff --git a/uppsrc/ide/Common/Common.upp b/uppsrc/ide/Common/Common.upp
new file mode 100644
index 000000000..22361990f
--- /dev/null
+++ b/uppsrc/ide/Common/Common.upp
@@ -0,0 +1,16 @@
+description "TheIDE - common library";
+
+uses
+	CtrlLib,
+	Esc;
+
+file
+	Common.h,
+	Common.cpp,
+	Hdepend.cpp optimize_speed,
+	Package.cpp,
+	Workspace.cpp,
+	usc.cpp,
+	ComDlg.cpp,
+	common.iml;
+
diff --git a/uppsrc/ide/Common/Hdepend.cpp b/uppsrc/ide/Common/Hdepend.cpp
new file mode 100644
index 000000000..31e6a8322
--- /dev/null
+++ b/uppsrc/ide/Common/Hdepend.cpp
@@ -0,0 +1,474 @@
+#include "Common.h"
+
+class Hdepend {
+	struct Info {
+		Time                      time;
+		Vector<int>               depend;
+		Vector<bool>              bydefine;
+		Index<String>             macroinclude;
+		Vector<String>            define;
+		bool                      flag;
+		bool                      macroflag;
+		bool                      timedirty;
+		bool                      guarded;
+		bool                      blitzprohibit;
+
+		bool                      CanBlitz() { return guarded && !blitzprohibit; }
+
+		Info()                   { time = Null; flag = false; timedirty = true; guarded = false; }
+	};
+
+	ArrayMap<String, Info>            map;
+	Vector<String>                    incdir;
+	VectorMap<String, Index<String> > depends;
+
+	void   Include(const char *trm, Info& info, const String& filedir, bool bydefine);
+	void   ScanFile(const String& path, int map_index);
+	int    File(const String& path);
+	Time   FileTime(int i);
+	void   ClearFlag();
+	void   ClearMacroFlag();
+	void   GetMacroIndex(Index<String>& dest, int ix);
+
+public:
+	void  SetDirs(pick_ Vector<String>& id)  { incdir = id; map.Clear(); }
+	void  TimeDirty();
+
+	void  ClearDependencies()  { depends.Clear(); }
+	void  AddDependency(const String& file, const String& depends);
+
+	Time                  FileTime(const String& path);
+	bool                  BlitzApproved(const String& path);
+	const Vector<String>& GetDefines(const String& path);
+	Vector<String>        GetDependencies(const String& path);
+	const Vector<String>& GetAllFiles()                           { return map.GetKeys(); }
+};
+
+void Hdepend::AddDependency(const String& file, const String& dep)
+{
+	depends.GetAdd(NormalizePath(file)).FindAdd(NormalizePath(dep));
+}
+
+const char *SkipSpc(const char *term) {
+	while(*term == '\t' || *term == ' ')
+		term++;
+	return term;
+}
+
+const char *RestOfLine(const char *term, String& val) {
+	while(*term && *term != '\r' && *term != '\n')
+		val.Cat(*term++);
+	return term;
+}
+
+void Hdepend::Include(const char *trm, Hdepend::Info& info, const String& filedir, bool bydefine) {
+	int type = *trm;
+	if(type == '<' || type == '\"' || type == '?') {
+		trm++;
+		String name;
+		if(type == '<') type = '>';
+		while(*trm != '\r' && *trm != '\n') {
+			if(*trm == type) {
+				if(type == '\"') {
+					String fn = NormalizePath(name, filedir);
+					FindFile ff(fn);
+					if(ff && ff.IsFile()) {
+						info.depend.Add(File(fn));
+						info.bydefine.Add(bydefine);
+						break;
+					}
+				}
+				for(int i = 0; i < incdir.GetCount(); i++) {
+					String fn = CatAnyPath(incdir[i], name);
+					FindFile ff(fn);
+					if(ff && ff.IsFile()) {
+						info.depend.Add(File(fn));
+						info.bydefine.Add(bydefine);
+						break;
+					}
+				}
+				break;
+			}
+			name.Cat(*trm++);
+		}
+	}
+	else if(IsAlpha(type) || type == '_') {
+		const char *macid = trm;
+		while(IsAlNum(*++trm) || *trm == '_')
+			;
+		info.macroinclude.FindAdd(String(macid, trm));
+	}
+}
+
+static const char *SkipComment(const char *s) {
+	if(*s == '/')
+		if(s[1] == '/')
+			for(s += 2; *s && *s != '\n';)
+				s++;
+		else if(s[1] == '*')
+		{
+			for(s += 2; *s && (*s != '*' || s[1] != '/'); s++)
+				;
+			if(*s)
+				s += 2;
+		}
+	return s;
+}
+
+void Hdepend::ScanFile(const String& path, int map_index) {
+	Info& info = map[map_index];
+	String src = LoadFile(path);
+	const char *term = src;
+	info.depend.Clear();
+	info.bydefine.Clear();
+	info.guarded = false;
+	info.blitzprohibit = false;
+	String filedir = GetFileDirectory(path);
+	bool testg = true;
+	bool defines = IsCSourceFile(path);
+	goto begin;
+	while(*term) {
+		if(term[0] == '/' && term[1] == '*') {
+			while(*term) {
+				if(term[0] == '*' && term[1] == '/') {
+					term += 2;
+					break;
+				}
+				term++;
+			}
+		}
+		else
+		if(term[0] == '/' && term[1] == '/') {
+			if(term[2] == '#') {
+				CParser p(term + 3);
+				if(p.Id("BLITZ_APPROVE") || p.Id("once"))
+					info.guarded = true;
+				else
+				if(p.Id("BLITZ_PROHIBIT"))
+					info.blitzprohibit = true;
+			}
+			while(*term) {
+				if(*term == '\n') break;
+				term++;
+			}
+		}
+		else
+		if(*term == '\n') {
+			term++;
+		begin:
+			while(*term == '\r' || *term == ' ' || *term == '\t') term++;
+			if(*term == '#') {
+				term++;
+				while(*term == ' ' || *term == '\t') term++;
+				if(term[0] == 'i' && term[1] == 'n' && term[2] == 'c' && term[3] == 'l' &&
+				   term[4] == 'u' && term[5] == 'd' && term[6] == 'e' &&
+				   (term[7] == ' ' || term[7] == '\t')) {
+					term = SkipSpc(term + 7);
+					String val;
+					term = RestOfLine(term, val);
+					val = TrimRight(val);
+					Include(val, info, filedir, false);
+				}
+				else
+				if(testg && term[0] == 'i' && term[1] == 'f' && term[2] == 'n' &&
+				   term[3] == 'd' && term[4] == 'e' && term[5] == 'f' &&
+				   (term[6] == ' ' || term[6] == '\t')) {
+					testg = false;
+					CParser p(term + 6);
+					if(p.IsId()) {
+						String id = p.ReadId();
+						if(p.Char('#') && p.Id("define") && p.IsId() && id == p.ReadId())
+							info.guarded = true;
+					}
+				}
+				else
+				if(defines && term[0] == 'd' && term[1] == 'e' && term[2] == 'f' &&
+				   term[3] == 'i' && term[4] == 'n' && term[5] == 'e' &&
+				   (term[6] == ' ' || term[6] == '\t')) {
+				       CParser p(term + 6);
+				       if(p.IsId())
+				          info.define.Add(p.ReadId());
+				       term = p.GetPtr();
+				}
+				else
+				if(term[0] == 'p' && term[1] == 'r' && term[2] == 'a' &&
+				   term[3] == 'g' && term[4] == 'm' && term[5] == 'a' &&
+				   (term[6] == ' ' || term[6] == '\t')) {
+					CParser p(term + 6);
+					if(p.Id("BLITZ_APPROVE") || p.Id("once"))
+						info.guarded = true;
+					else
+					if(p.Id("BLITZ_PROHIBIT"))
+						info.blitzprohibit = true;
+					term = p.GetPtr();
+				}
+			}
+			else if(IsAlpha(*term) || *term == '_') {
+				const char *id = term;
+				while(IsAlNum(*++term) || *term == '_')
+					;
+				bool is_bin = (term - id == 6 && !memcmp(id, "BINARY", 6));
+				bool is_mask = (term - id == 11 && !memcmp(id, "BINARY_MASK", 11));
+				bool is_array = (term - id == 12 && !memcmp(id, "BINARY_ARRAY", 12));
+				if(is_bin || is_mask || is_array) {
+					while(*term && (byte)*term <= ' ')
+						term++;
+					if(*term == '(') {
+						while(*term && *term != ')' && *term != ',')
+							term++;
+						if(is_array && *term == ',') {
+							while(*++term && *term != ')' && *term != ',')
+								;
+						}
+						if(*term == ',') {
+							while(*++term && *term != ')' && (byte)*term <= ' ')
+								;
+							if(*term == '\"')
+								Include(term, info, filedir, false);
+						}
+					}
+				}
+			}
+		}
+		else {
+			if((byte)*term > ' ')
+				testg = false;
+			term++;
+		}
+	}
+	Index<String> minc;
+	for(;;) {
+		ClearMacroFlag();
+		Index<String> new_minc;
+		GetMacroIndex(new_minc, map_index);
+		if(new_minc.GetCount() <= minc.GetCount())
+			return;
+		minc = new_minc;
+		term = src;
+		while(*term) {
+			while(*term && (byte)*term <= ' ')
+				term++;
+			if(*term == '#') {
+				term++;
+				while(*term && *term != '\n' && (byte)*term <= ' ')
+					term++;
+				if(Peek32le(term) == 'd' + ('e' << 8) + ('f' << 16) + ('i' << 24)
+				&& Peek16le(term + 4) == 'n' + ('e' << 8)) {
+					term += 6;
+					while(*term && *term != '\n' && (byte)*term <= ' ')
+						term++;
+					const char *id = term;
+					if(IsAlpha(*term) || *term == '_')
+						while(IsAlNum(*++term) || *term == '_')
+							;
+					String ident(id, term);
+					if(minc.Find(ident) >= 0) {
+						term = SkipSpc(term);
+						String incfn;
+						id = term;
+						while(*term && *term != '\n')
+							term++;
+						const char *e = term;
+						while(e > id && (byte)e[-1] <= ' ')
+							e--;
+						Include(String(id, e), info, filedir, true);
+					}
+				}
+			}
+			while(*term && *term != '\n')
+				if(*term == '/' && (term[1] == '*' || term[1] == '/'))
+					term = SkipComment(term);
+				else
+					term++;
+			if(*term)
+				term++;
+		}
+	}
+}
+
+int Hdepend::File(const String& f) {
+	String path = NormalizePath(f);
+	int ii = map.FindAdd(path);
+	Info& info = map[ii];
+	if(info.flag) return ii;
+	info.flag = true;
+	FindFile ff(path);
+	if(!ff || ff.GetLastWriteTime() == info.time) {
+		if(info.timedirty) {
+			for(int i = 0; i < info.depend.GetCount(); i++)
+				File(map.GetKey(info.depend[i]));
+			info.timedirty = false;
+		}
+	}
+	else {
+		info.time = ff.GetLastWriteTime();
+		if(info.time > GetSysTime() + 10)
+			PutConsole(String().Cat() << "WARNING: " << path << " has invalid (future) time " << info.time);
+		ScanFile(path, ii);
+	}
+	return ii;
+}
+
+void Hdepend::GetMacroIndex(Index<String>& dest, int ix) {
+	Info& info = map[ix];
+	if(!info.macroflag) {
+		info.macroflag = true;
+		int i;
+		for(i = 0; i < info.macroinclude.GetCount(); i++)
+			dest.FindAdd(info.macroinclude[i]);
+		for(i = 0; i < info.depend.GetCount(); i++)
+			GetMacroIndex(dest, info.depend[i]);
+	}
+}
+
+Time Hdepend::FileTime(int ii)
+{
+//	LOG("FileTime " << map.GetKey(ii));
+//	LOGBEGIN();
+	Info& info = map[ii];
+//	DUMP(info.time);
+	Time time = info.time;
+	if(!info.flag) {
+		info.flag = true;
+		for(int i = 0; i < info.depend.GetCount(); i++)
+			time = max(time, FileTime(info.depend[i]));
+	}
+//	LOGEND();
+	return time;
+}
+
+Vector<String> Hdepend::GetDependencies(const String& path)
+{
+	ClearFlag();
+	Index<int> out;
+	out.Add(File(path));
+	for(int i = 0; i < out.GetCount(); i++)
+		if(out[i] >= 0)
+			FindAppend(out, map[out[i]].depend);
+	Vector<String> outnames;
+	for(int i = 1; i < out.GetCount(); i++)
+		if(out[i] >= 0)
+			outnames.Add(map.GetKey(out[i]));
+	return outnames;
+}
+
+void Hdepend::ClearFlag()
+{
+	for(int i = 0; i < map.GetCount(); i++)
+		map[i].flag = false;
+}
+
+void Hdepend::ClearMacroFlag()
+{
+	for(int i = 0; i < map.GetCount(); i++)
+		map[i].macroflag = false;
+}
+
+void Hdepend::TimeDirty()
+{
+	for(int i = 0; i < map.GetCount(); i++)
+		map[i].timedirty = true;
+}
+
+
+Time Hdepend::FileTime(const String& path)
+{
+	String p = NormalizePath(path);
+	ClearFlag();
+	int d = File(p);
+	ClearFlag();
+	Time h = FileTime(d);
+	d = depends.Find(p);
+	if(d >= 0) {
+		const Index<String>& dep = depends[d];
+		for(int i = 0; i < dep.GetCount(); i++) {
+			FindFile ff(dep[i]);
+			if(ff) {
+				Time tm = ff.GetLastWriteTime();
+				if(tm > GetSysTime() + 10)
+					PutConsole(String().Cat() << "WARNING: " << dep[i] << " has invalid (future) time " << tm);
+				if(tm > h)
+					h = tm;
+			}
+		}
+	}
+	return h;
+}
+
+bool Hdepend::BlitzApproved(const String& path)
+{
+	ClearFlag();
+	int d = File(path);
+	ClearFlag();
+	Info& info = map[d];
+	if(info.blitzprohibit)
+		return false;
+	if(info.guarded)
+		return true;
+	if(info.guarded)
+		return true;
+	for(int i = 0; i < info.depend.GetCount(); i++)
+		if(!info.bydefine[i] && !map[info.depend[i]].CanBlitz()) {
+			PutVerbose(String().Cat() << map.GetKey(info.depend[i])
+			           << "(1) : blocks BLITZ of " << path);
+			return false;
+		}
+	return true;
+}
+
+const Vector<String>& Hdepend::GetDefines(const String& path)
+{
+	ClearFlag();
+	int d = File(path);
+	ClearFlag();
+	return map[d].define;
+}
+
+void HdependSetDirs(pick_ Vector<String>& id)
+{
+	Single<Hdepend>().SetDirs(id);
+}
+
+void HdependTimeDirty()
+{
+	Single<Hdepend>().TimeDirty();
+}
+
+Time HdependFileTime(const String& path)
+{
+	String of = IdeGetOneFile();
+	if(IsNull(of))
+		return Single<Hdepend>().FileTime(path);
+	else
+		return of == path ? GetSysTime() : Time::Low();
+}
+
+bool HdependBlitzApproved(const String& path)
+{
+	return Single<Hdepend>().BlitzApproved(path);
+}
+
+const Vector<String>& HdependGetDefines(const String& path)
+{
+	return Single<Hdepend>().GetDefines(path);
+}
+
+Vector<String> HdependGetDependencies(const String& file)
+{
+	return Single<Hdepend>().GetDependencies(file);
+}
+
+void  HdependClearDependencies()
+{
+	Single<Hdepend>().ClearDependencies();
+}
+
+void  HdependAddDependency(const String& file, const String& depends)
+{
+	Single<Hdepend>().AddDependency(file, depends);
+}
+
+const Vector<String>& HdependGetAllFiles()
+{
+	return Single<Hdepend>().GetAllFiles();
+}
diff --git a/uppsrc/ide/Common/Package.cpp b/uppsrc/ide/Common/Package.cpp
new file mode 100644
index 000000000..bac1ef8d8
--- /dev/null
+++ b/uppsrc/ide/Common/Package.cpp
@@ -0,0 +1,418 @@
+#include "Common.h"
+
+bool IsUppValueChar(int c)
+{
+	return c > ' ' && c != ',' && c != ';';
+}
+
+String ReadValue(CParser& p)
+{
+	p.Spaces();
+	if(p.IsString())
+		return p.ReadOneString();
+	StringBuffer v;
+	while(IsUppValueChar(p.PeekChar()))
+		v.Cat(p.GetChar());
+	p.Spaces();
+	return v;
+}
+
+static bool sMatchOr(CParser& p, const Vector<String>& flag);
+
+static bool sMatchFlag(CParser& p, const Vector<String>& flag)
+{
+	if(p.Char('!'))
+		return !sMatchFlag(p, flag);
+	if(p.Char('(')) {
+		bool b = sMatchOr(p, flag);
+		p.PassChar(')');
+		return b;
+	}
+	if(p.IsEof())
+		return true;
+	return FindIndex(flag, p.ReadId()) >= 0;
+}
+
+static bool sMatchAnd(CParser& p, const Vector<String>& flag)
+{
+	bool b = sMatchFlag(p, flag);
+	while(p.IsId() || p.IsChar('!') || p.IsChar('(') || p.Char2('&', '&') || p.Char('&'))
+		b = sMatchFlag(p, flag) && b;
+	return b;
+}
+
+static bool sMatchOr(CParser& p, const Vector<String>& flag)
+{
+	bool b = sMatchAnd(p, flag);
+	while(p.Char2('|', '|') || p.Char('|'))
+		b = sMatchFlag(p, flag) || b;
+	return b;
+}
+
+bool MatchWhen_X(const String& when, const Vector<String>& flag)
+{
+	CParser p(when);
+	bool b = sMatchOr(p, flag);
+	if(!p.IsEof())
+		p.ThrowError("expected end of expression");
+	return b;
+}
+
+bool MatchWhen(const String& when, const Vector<String>& flag)
+{
+	try {
+		return MatchWhen_X(when, flag);
+	}
+	catch(CParser::Error e) {
+		PutConsole(String().Cat()
+		           << "Invalid When expression: " << AsCString(when) << ": " << e);
+		return false;
+	}
+}
+
+String ReadWhen(CParser& p) {
+	String when;
+	if(p.Char('('))
+		if(p.IsString())
+			when = p.ReadString();
+		else {
+			const char *b = p.GetPtr();
+			int lvl = 0;
+			for(;;) {
+				if(p.IsEof() || lvl == 0 && p.IsChar(')'))
+					break;
+				if(p.Char('('))
+					lvl++;
+				else
+				if(p.Char(')'))
+					lvl--;
+				else
+					p.SkipTerm();
+			}
+			when = String(b, p.GetPtr());
+			p.Char(')');
+		}
+	return when;
+}
+
+String AsStringWhen(const String& when) {
+	String out;
+	try {
+		Vector<String> x;
+		MatchWhen_X(when, x);
+		out << '(' << when << ')';
+	}
+	catch(CParser::Error) {
+		out << '(' << AsCString(when) << ')';
+	}
+	return out;
+}
+
+String CustomStep::AsString() const {
+	return "custom" + AsStringWhen(when) + ' ' + AsCString(ext) + ",\n\t" +
+					  AsCString(command, 70, "\t") + ",\n\t" +
+					  AsCString(output, 70, "\t") + ";\n\n";
+}
+
+void CustomStep::Load(CParser& p) throw(CParser::Error) {
+	when = ReadWhen(p);
+	ext = p.ReadString();
+	p.PassChar(',');
+	command = p.ReadString();
+	p.PassChar(',');
+	output = p.ReadString();
+	p.PassChar(';');
+}
+
+String CustomStep::GetExt() const {
+	return ext[0] != '.' ? "." + ToLower(ext) : ToLower(ext);
+}
+
+bool   CustomStep::MatchExt(const char *fn) const {
+	return ToLower(GetFileExt(fn)) == GetExt();
+}
+
+bool LoadOpt(CParser& p, const char *key, Array<OptItem>& v) {
+	if(p.Id(key)) {
+		String when = ReadWhen(p);
+		do {
+			OptItem& m = v.Add();
+			m.when = when;
+			m.text = ReadValue(p);
+		}
+		while(p.Char(','));
+		return true;
+	}
+	return false;
+}
+
+bool LoadFOpt(CParser& p, const char *key, Array<OptItem>& v) {
+	if(p.Id(key)) {
+		OptItem& m = v.Add();
+		m.when = ReadWhen(p);
+		m.text = ReadValue(p);
+		return true;
+	}
+	return false;
+}
+
+Package::Package()
+{
+	charset = 0;
+	optimize_speed = false;
+	noblitz = true;
+}
+
+void Package::Load(const char *path) {
+	for(;;) {
+		charset = 0;
+		optimize_speed = false;
+		noblitz = false;
+		library.Clear();
+		target.Clear();
+		flag.Clear();
+		option.Clear();
+		link.Clear();
+		uses.Clear();
+		accepts.Clear();
+		file.Clear();
+		config.Clear();
+		custom.Clear();
+		unknown.Clear();
+		description.Clear();
+		String f = LoadFile(path);
+		time = FileGetTime(path);
+		CParser p(f);
+		try {
+			while(!p.IsEof()) {
+				if(!LoadOpt(p, "options", option) &&
+				   !LoadOpt(p, "link", link) &&
+				   !LoadOpt(p, "library", library) &&
+				   !LoadOpt(p, "flags", flag) &&
+				   !LoadOpt(p, "target", target) &&
+				   !LoadOpt(p, "uses", uses))
+				if(p.Id("charset"))
+					charset = CharsetByName(p.ReadString());
+				else
+				if(p.Id("description"))
+					description = p.ReadString();
+				else
+				if(p.Id("acceptflags")) {
+					do
+						accepts.Add(ReadValue(p));
+					while(p.Char(','));
+				}
+				else
+				if(p.Id("noblitz"))
+				   noblitz = true;
+				else
+				if(p.Id("optimize_speed"))
+					optimize_speed = true;
+				else
+				if(p.Id("optimize_size"))
+					optimize_speed = false;
+				else
+				if(p.Id("file")) {
+					do {
+						file.Add(ReadValue(p));
+						while(!p.IsChar(',') && !p.IsChar(';')) {
+							if(!LoadFOpt(p, "options", file.Top().option) &&
+							   !LoadFOpt(p, "depends", file.Top().depends))
+							if(p.Id("optimize_speed"))
+								file.Top().optimize_speed = true;
+							else
+							if(p.Id("optimize_size"))
+								file.Top().optimize_speed = false;
+							else
+							if(p.Id("readonly"))
+								file.Top().readonly = true;
+							else
+							if(p.Id("separator"))
+								file.Top().separator = true;
+							else
+							if(p.Id("charset"))
+								file.Top().charset = CharsetByName(p.ReadString());
+							else
+							if(p.Id("tabsize"))
+								file.Top().tabsize = minmax(p.ReadInt(), 1, 20);
+							else
+							if(p.Id("font"))
+								file.Top().font = minmax(p.ReadInt(), 0, 3);
+							else
+							if(p.Id("highlight"))
+								file.Top().highlight = p.ReadId();
+							else {
+								const char *q = p.GetPtr();
+								if(p.Char('('))
+									while(!p.Char(')'))
+										p.SkipTerm();
+								else
+									p.SkipTerm();
+								file.Top().unknown.Cat(' ');
+								file.Top().unknown.Cat(q, int(p.GetPtr() - q));
+							}
+						}
+					}
+					while(p.Char(','));
+				}
+				else
+				if(p.Id("mainconfig")) {
+					do {
+						String c = p.ReadString();
+						p.Char('=');
+						p.Id("external"); // Backward compatibility...
+						p.Id("console");
+						p.Id("remotelinux");
+						p.Id("normal");
+						String f = p.ReadString();
+						Config& cf = config.Add();
+						cf.name = c;
+						cf.param = f;
+					}
+					while(p.Char(','));
+				}
+				else
+				if(p.Id("custom"))
+					custom.Add().Load(p);
+				else {
+					unknown << p.ReadId() << " ";
+					const char *q = p.GetPtr();
+					while(!p.Char(';') && !p.IsEof())
+						p.SkipTerm();
+					unknown.Cat("\r\n\r\n");
+					unknown.Cat(q, p.GetPtr());
+				}
+				p.Char(';');
+			}
+			return;
+		}
+		catch(CParser::Error error) {
+		prompt:
+			switch(Prompt(Ctrl::GetAppName(), CtrlImg::exclamation(),
+			              error + "&while parsing package " + DeQtf(path),
+				          "Edit \\& Retry", "Ignore",  "Stop")) {
+			case 0:
+				if(!PromptYesNo("Ignoring will damage package. Everything past the "
+					            "point of error will be lost.&Do you want to continue ?"))
+					goto prompt;
+				Save(path);
+				return;
+			case 1: {
+					TopWindow win;
+					LineEdit edit;
+					edit.Set(f);
+					edit.SetCursor(edit.GetPos(p.GetLine() - 1));
+					win.Title(path);
+					win.Add(edit.SizePos());
+					win.Run();
+					SaveFile(path, edit.Get());
+				}
+				break;
+			case -1:
+				exit(1);
+			}
+		}
+	}
+}
+
+String WriteValue(const String& x) {
+	for(const char *s = x; s < x.End(); s++)
+		if(!IsUppValueChar(*s))
+			return AsCString(x);
+	return x;
+}
+
+void putopt(Stream& out, const char *key, const Array<OptItem>& m) {
+	bool was = false;
+	for(int i = 0; i < m.GetCount(); i++)
+		if(IsNull(m[i].when)) {
+			if(was)
+				out << ",\n\t";
+			else
+				out << key << "\n\t";
+			out << WriteValue(m[i].text);
+			was = true;
+		}
+	if(was)
+		out << ";\n\n";
+	for(int i = 0; i < m.GetCount(); i++)
+		if(!IsNull(m[i].when))
+			out << key << AsStringWhen(m[i].when) << ' ' << WriteValue(m[i].text) << ";\n\n";
+}
+
+void putp(Stream& out, const char *key, const Vector<String>& v)
+{
+	if(v.GetCount()) {
+		out << key << "\n";
+		for(int i = 0; i < v.GetCount(); i++) {
+			if(i) out << ",\n";
+			out << '\t' << WriteValue(v[i]);
+		}
+		out << ";\n\n";
+	}
+}
+
+void putfopt(Stream& out, const char *key, const Array<OptItem>& m)
+{
+	for(int i = 0; i < m.GetCount(); i++)
+		out << "\n\t\t" << key << AsStringWhen(m[i].when) << ' ' << WriteValue(m[i].text);
+}
+
+bool Package::Save(const char *path) const {
+	StringStream out;
+	if(description.GetCount())
+		out << "description " << AsCString(description) << ";\n\n";
+	if(charset > 0 && charset < CharsetCount() || charset == CHARSET_UTF8)
+		out << "charset " << AsCString(CharsetName(charset)) << ";\n\n";
+	if(optimize_speed)
+		out << "optimize_speed;\n\n";
+	if(noblitz)
+		out << "noblitz;\n\n";
+	putp(out, "acceptflags", accepts);
+	putopt(out, "flags", flag);
+	putopt(out, "uses", uses);
+	putopt(out, "target", target);
+	putopt(out, "library", library);
+	putopt(out, "options", option);
+	putopt(out, "link", link);
+	if(file.GetCount()) {
+		out << "file\n";
+		int i;
+		for(i = 0; i < file.GetCount(); i++) {
+			if(i) out << ",\n";
+			const File& f = file[i];
+			out << '\t' << WriteValue(f);
+			if(f.readonly)
+				out << " readonly";
+			if(f.separator)
+				out << " separator";
+			if(f.tabsize > 0)
+				out << " tabsize " << f.tabsize;
+			if(f.font > 0)
+				out << " font " << f.font;
+			if(f.optimize_speed)
+				out << " optimize_speed";
+			if(f.charset > 0 && f.charset < CharsetCount() || f.charset == CHARSET_UTF8)
+				out << " charset " << AsCString(CharsetName(f.charset));
+			if(!IsNull(f.highlight))
+				out << " highlight " << f.highlight;
+			putfopt(out, "options", f.option);
+			putfopt(out, "depends", f.depends);
+			out << f.unknown;
+		}
+		out << ";\n\n";
+	}
+	if(config.GetCount()) {
+		out << "mainconfig\n";
+		for(int i = 0; i < config.GetCount(); i++) {
+			const Config& f = config[i];
+			if(i) out << ",\n";
+			out << '\t' << AsCString(f.name) << " = " << AsCString(f.param);
+		}
+		out << ";\n\n";
+	}
+	for(int i = 0; i < custom.GetCount(); i++)
+		out << custom[i].AsString();
+	out << unknown;
+	return SaveChangedFile(path, out.GetResult());
+}
diff --git a/uppsrc/ide/Common/Workspace.cpp b/uppsrc/ide/Common/Workspace.cpp
new file mode 100644
index 000000000..af8dc38a7
--- /dev/null
+++ b/uppsrc/ide/Common/Workspace.cpp
@@ -0,0 +1,370 @@
+#include "Common.h"
+
+String GetCommonDir()
+{
+	return GetVar("COMMON");
+}
+
+String CommonPath(const String& filename)
+{
+	String s = GetCommonDir();
+	if(s.IsEmpty())
+		return ConfigFile(filename);
+	return AppendFileName(s, filename);
+}
+
+String GetLocalDir()
+{
+	return ConfigFile("UppLocal");
+}
+
+String LocalPath(const String& filename)
+{
+	return AppendFileName(GetLocalDir(), filename);
+}
+
+String FollowCygwinSymlink(const String& file) {
+	for(String fn = file;;) {
+		if(fn.IsEmpty())
+			return fn;
+		FileIn fi(fn);
+		if(!fi.IsOpen())
+			return fn;
+		char buffer[10];
+		if(!fi.GetAll(buffer, 10) || memcmp(buffer, "!<symlink>", 10))
+			return fn;
+		fn = NormalizePath(LoadStream(fi), GetFileDirectory(fn));
+	}
+}
+
+const char *SemiTextTest::Accept(const char *s) const {
+	if(*s != ';') return NULL;
+	s++;
+	while(*s == ' ') s++;
+	return s;
+};
+
+Vector<String> SplitDirs(const char *s) {
+	return Split(s, Single<SemiTextTest>());
+}
+
+static GLOBAL_VARP(String, varsname, ("default"));
+typedef VectorMap<String, String> sHT;
+static GLOBAL_VAR(sHT, sVar);
+
+String GetVarsName() {
+	return varsname();
+}
+
+String VarFilePath(String name) {
+	return ConfigFile(name + ".var");
+}
+
+String VarFilePath() {
+	return VarFilePath(GetVarsName());
+}
+
+bool SaveVarFile(const char *filename, const VectorMap<String, String>& var)
+{
+	FileOut out(filename);
+	for(int i = 0; i < var.GetCount(); i++)
+		out << var.GetKey(i) << " = " << AsCString(var[i]) << ";\n";
+	out.Close();
+	return !out.IsError();
+}
+
+bool SaveVars(const char *name)
+{
+	if(!SaveVarFile(VarFilePath(name), sVar()))
+		return false;
+	varsname() = name;
+	return true;
+}
+
+bool LoadVarFile(const char *name, VectorMap<String, String>& _var)
+{
+	try {
+		VectorMap<String, String> var;
+		String env = LoadFile(name);
+		CParser p(env);
+		while(!p.IsEof()) {
+			String v = p.ReadId();
+			p.Char('=');
+			if(p.IsString())
+				var.GetAdd(v) = p.ReadString();
+			else {
+				String ln;
+				while(p.PeekChar() != '\r' && p.PeekChar() != '\n' && p.PeekChar() != ';')
+					ln.Cat(p.GetChar());
+				var.GetAdd(v) = ln;
+				p.Spaces();
+			}
+			p.Char(';');
+		}
+		_var = var;
+		return true;
+	}
+	catch(...) {
+		return false;
+	}
+}
+
+bool   LoadVars(const char *name) {
+	varsname() = (name && *name ? name : "default");
+	return LoadVarFile(VarFilePath(), sVar());
+}
+
+String GetVar(const String& var) {
+	return sVar().Get(var, Null);
+}
+
+void SetVar(const String& var, const String& val) {
+	sVar().GetAdd(var) = val;
+	SaveVars(GetVarsName());
+}
+
+Vector<String> GetUppDirs() {
+	return SplitDirs(GetVar("UPP"));
+}
+
+String GetUppDir() {
+	Vector<String> s = GetUppDirs();
+#ifdef PLATFORM_WIN32
+	return s.GetCount() == 0 ? GetFileFolder(GetExeFilePath()) : s[0];
+#endif
+#ifdef PLATFORM_POSIX
+	return s.GetCount() == 0 ? GetHomeDirectory() : s[0];
+#endif
+}
+
+bool IsCSourceFile(const char *path)
+{
+	String ext = ToLower(GetFileExt(path));
+	return ext == ".cpp" || ext == ".c" || ext == ".cc" || ext == ".cxx" || ext == ".icpp";
+}
+
+bool IsCHeaderFile(const char *path)
+{
+	String ext = ToLower(GetFileExt(path));
+	return ext == ".h" || ext == ".hpp" || ext == ".hh" || ext == ".hxx";
+}
+
+bool IsFullDirectory(const String& d) {
+	if(IsFullPath(d)) {
+		FindFile ff(d);
+		if(ff) return ff.IsDirectory();
+	}
+	return false;
+}
+
+String PackagePath(const String& name) {
+	String uppfile = NativePath(name);
+	if(IsFullPath(uppfile)) return NormalizePath(uppfile);
+	Vector<String> d = GetUppDirs();
+	String p;
+	for(int i = 0; i < d.GetCount(); i++) {
+		p = NormalizePath(AppendFileName(AppendFileName(d[i], uppfile),
+		                  GetFileName(uppfile)) + ".upp");
+		if(FileExists(p)) return p;
+	}
+	return d.GetCount() ? NormalizePath(AppendFileName(AppendFileName(d[0], uppfile),
+		                                GetFileName(uppfile)) + ".upp") : "";
+}
+
+String SourcePath(const String& package, const String& file) {
+	if(IsFullPath(file)) return NativePath(file);
+	return NormalizePath(AppendFileName(GetFileFolder(PackagePath(package)), file));
+}
+
+String GetAnyFileName(const char *path)
+{
+	const char *p = path;
+	for(char c; (c = *path++) != 0;)
+		if(c == '\\' || c == '/' || c == ':')
+			p = path;
+	return p;
+}
+
+String GetAnyFileTitle(const char *path)
+{
+	String fn = GetAnyFileName(path);
+	const char *p = fn;
+	const char *e = p;
+	while(*e && *e != '.')
+		e++;
+	return String(p, e);
+}
+
+String CatAnyPath(String path, const char *more)
+{
+	if(!more || !*more)
+		return path;
+	if(!path.IsEmpty() && *path.Last() != '\\' && *path.Last() != '/' &&
+	*more != '\\' && *more != '/')
+#ifdef PLATFORM_WIN32
+		path.Cat('\\');
+#else
+		path.Cat('/');
+#endif
+	path.Cat(more);
+	return path;
+}
+
+
+void SplitHostName(const char *hostname, String& host, int& port) {
+	enum { DEFAULT_REMOTE_PORT = 2346 };
+	const char *p = hostname;
+	while(p && *p != ':')
+		p++;
+	host = String(hostname, p);
+	if(*p++ == ':' && IsDigit(*p))
+		port = stou(p);
+	else
+		port = DEFAULT_REMOTE_PORT;
+}
+
+Vector<String> SplitFlags0(const char *flags) {
+	return Split(flags, CharFilterTextTest(CharFilterWhitespace));
+}
+
+Vector<String> SplitFlags(const char *flags, bool main, const Vector<String>& accepts)
+{
+	Vector<String> v = SplitFlags0(flags);
+	Vector<String> h;
+	for(int i = 0; i < v.GetCount(); i++)
+		if(v[i][0] == '.') {
+			String f = v[i].Mid(1);
+			if(main || FindIndex(accepts, f) >= 0)
+				h.Add(v[i].Mid(1));
+		}
+		else
+			h.Add(v[i]);
+	if(main)
+		h.Add("MAIN");
+	return h;
+}
+
+Vector<String> SplitFlags(const char *flags, bool main)
+{
+	Vector<String> dummy;
+	return SplitFlags(flags, main, dummy);
+}
+
+bool HasFlag(const Vector<String>& conf, const char *flag) {
+	return FindIndex(conf, flag) >= 0;
+}
+
+Vector<String> Combine(const Vector<String>& conf, const char *flags) {
+	Vector<String> cfg(conf, 1);
+	CParser p(flags);
+	while(!p.IsEof()) {
+		bool isnot = p.Char('!');
+		if(!p.IsId()) break;
+		String flg = p.ReadId();
+		int i = FindIndex(cfg, flg);
+		if(isnot) {
+			if(i >= 0) cfg.Remove(i);
+		}
+		else
+			if(i < 0) cfg.Add(flg);
+	}
+	return cfg;
+}
+
+String Gather(const Array<OptItem>& set, const Vector<String>& conf) {
+	String s;
+	for(int i = 0; i < set.GetCount(); i++)
+		if(MatchWhen(set[i].when, conf)) {
+			if(!s.IsEmpty()) s.Cat(' ');
+			s.Cat(set[i].text);
+		}
+	return s;
+}
+
+int    GetType(const Vector<String>& conf, const char *flags) {
+	Vector<String> f = SplitFlags(flags);
+	int q = FLAG_UNDEFINED;
+	for(int i = 0; i < f.GetCount(); i++)
+		if(HasFlag(conf, f[i]))
+			if(q == FLAG_UNDEFINED)
+				q = i;
+			else
+				q = FLAG_MISMATCH;
+	return q;
+}
+
+String RemoveType(Vector<String>& conf, const char *flags)
+{
+	String old;
+	Index<String> f = SplitFlags(flags);
+	for(int i = conf.GetCount(); --i >= 0;)
+		if(f.Find(conf[i]) >= 0)
+		{
+			old = conf[i];
+			conf.Remove(i);
+		}
+	return old;
+}
+
+int    GetType(const Vector<String>& conf, const char *flags, int def) {
+	int q = GetType(conf, flags);
+	return q == FLAG_UNDEFINED ? def : q;
+}
+
+bool   GetFlag(const Vector<String>& conf, const char *flag) {
+	return FindIndex(conf, flag) >= 0;
+}
+
+void Workspace::AddLoad(const String& name, bool match, const Vector<String>& flag)
+{
+	package.Add(name).Load(PackagePath(name));
+}
+
+void Workspace::AddUses(Package& p, bool match, const Vector<String>& flag)
+{
+	int q = package.GetCount();
+	for(int i = 0; i < p.uses.GetCount(); i++)
+		if((!match || MatchWhen(p.uses[i].when, flag)) && package.Find(p.uses[i].text) < 0)
+			AddLoad(p.uses[i].text, match, flag);
+	for(int i = q; i < package.GetCount(); i++)
+		AddUses(package[i], match, flag);
+}
+
+void Workspace::Scan(const char *prjname) {
+	package.Clear();
+	AddLoad(prjname, false, Vector<String>());
+	AddUses(package[0], false, Vector<String>());
+}
+
+void Workspace::Scan(const char *prjname, const Vector<String>& flag) {
+	package.Clear();
+	AddLoad(prjname, true, flag);
+	AddUses(package[0], true, flag);
+}
+
+void Workspace::Dump() {
+	for(int i = 0; i < package.GetCount(); i++) {
+		Package& prj = package[i];
+		LOG("Package " << package.GetKey(i));
+		LOG(" file ");
+		for(int i = 0; i < prj.file.GetCount(); i++)
+			LOG("\t" << prj.file[i]);
+	}
+}
+
+Vector<String> Workspace::GetAllAccepts(int pk) const
+{
+	Index<String> accepts;
+	Index<int> pkg;
+	pkg.Add(pk);
+	for(int i = 0; i < pkg.GetCount(); i++) {
+		const Package& p = package[pkg[i]];
+		FindAppend(accepts, p.accepts);
+		for(int u = 0; u < p.uses.GetCount(); u++) {
+			int f = package.Find(p.uses[u].text);
+			if(f >= 0)
+				pkg.FindAdd(f);
+		}
+	}
+	return accepts.PickKeys();
+}
diff --git a/uppsrc/ide/Common/common.iml b/uppsrc/ide/Common/common.iml
new file mode 100644
index 000000000..4775552fe
--- /dev/null
+++ b/uppsrc/ide/Common/common.iml
@@ -0,0 +1,252 @@
+IMAGE_BEGIN(Header)
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�\2\377\0\0�\0\0�\2\377\0\0�\0\0�")
+	IMAGE_SCAN("�\2\377\0\0�\0\0�\2\377\0\0�\0\0�")
+	IMAGE_SCAN("�\2\377\0\0�\0\0�\2\377\0\0�\0\0�")
+	IMAGE_SCAN("��\377\0\0\1�\0\0�\377\0\0\1�\0\0�\377\0\0�")
+	IMAGE_SCAN("���\0\0�")
+	IMAGE_SCAN("�\2\377\0\0�\0\0�\2\377\0\0�\0\0�")
+	IMAGE_SCAN("�\2\377\0\0�\0\0�\2\377\0\0�\0\0�")
+	IMAGE_SCAN("��\377\0\0\1�\0\0�\377\0\0\1�\0\0�\377\0\0�")
+	IMAGE_SCAN("���\0\0�")
+	IMAGE_SCAN("�\2\377\0\0�\0\0�\2\377\0\0�\0\0�")
+	IMAGE_SCAN("�\2\377\0\0�\0\0�\2\377\0\0�\0\0�")
+	IMAGE_SCAN("�\2\377\0\0�\0\0�\2\377\0\0�\0\0�")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�")
+IMAGE_PACKED(Header, "\2\20\0\0\0\20\0\0\0\377\377\377\377\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(FindBrokenRef)
+	IMAGE_SCAN("ă\0\0\0ƒ\0\0\0�")
+	IMAGE_SCAN("�\3\0\0\0\377\377\377\0\0\0�\3\0\0\0\377\377\377\0\0\0�")
+	IMAGE_SCAN("ă\0\0\0ƒ\0\0\0�")
+	IMAGE_SCAN("�\2\0\0\0\377\377\377�\0\0\0\1\377\377\377�\0\0\0�")
+	IMAGE_SCAN("�\2\0\0\0\377\377\377�\0\0\0�\2\0\0\0\377\377\377�\0\0\0�")
+	IMAGE_SCAN("�\2\0\0\0\377\377\377�\0\0\0\1\377\377\377�\0\0\0�")
+	IMAGE_SCAN("‚\0\0\0\1\377\377\377�\0\0\0\1\377\377\377�\0\0\0�")
+	IMAGE_SCAN("�\2\0\0\0\377\377\377�\0\0\0\1\377\377\377�\0\0\0�")
+	IMAGE_SCAN("�\2\0\0\0\377\377\377�\0\0\0�\1\377\377\377�\0\0\0�")
+	IMAGE_SCAN("�\2\0\0\0\377\377\377�\0\0\0��\0\0���\0\0\0�")
+	IMAGE_SCAN("�\3\0\0\0\377\377\377\0\0\0��\0\0�\3\0\377\377\0\0�\0\377\377�\0\0���\0\0\0�")
+	IMAGE_SCAN("�\3\0\0\0\377\377\377\0\0\0�\1\0\0��\0\377\377\1\0\0���\0\0\0�")
+	IMAGE_SCAN("��\0\0\0��\0\0�\3\0\377\377\0\0�\0\377\377�\0\0���\0\0\0�")
+	IMAGE_SCAN("�\1\0\0��\0\377\377\1\0\0��")
+	IMAGE_SCAN("ł\0\0�\3\0\377\377\0\0�\0\377\377�\0\0��")
+	IMAGE_SCAN("ƅ\0\0��")
+IMAGE_PACKED(FindBrokenRef, "\2\20\0\0\0\20\0\0\0\0\0\0\0\377\377\377\377\0\0\0\0")
+IMAGE_BEGIN(InsertItem)
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�\1\377\0\0�\1\377\0\0�")
+	IMAGE_SCAN("��\377\0\0�")
+	IMAGE_SCAN("�\1\377\0\0�\1\377\0\0�")
+	IMAGE_SCAN("��\377\0\0�")
+	IMAGE_SCAN("�\1\377\0\0�\1\377\0\0�")
+	IMAGE_SCAN("Ƈ�\0\0\1\0\0\0�")
+	IMAGE_SCAN("�\1�\0\0�\377\377\377��\0\0�")
+	IMAGE_SCAN("�\1�\0\0�\377\377\377\3�\0\0\377\377\377�\0\0�")
+	IMAGE_SCAN("�\2�\0\0\377\377\377��\0\0\1\377\377\377��\0\0�")
+	IMAGE_SCAN("�\1�\0\0�\377\377\377\1�\0\0�")
+	IMAGE_SCAN("�\2�\0\0\377\377\377��\0\0\2\377\377\377�\0\0�")
+	IMAGE_SCAN("�\1�\0\0�\377\377\377\1�\0\0�")
+	IMAGE_SCAN("Ɖ�\0\0�")
+	IMAGE_SCAN("�")
+IMAGE_PACKED(InsertItem, "\2\20\0\0\0\20\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(Package)
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("ƅ\0\0\0�")
+	IMAGE_SCAN("…\0\0\0����\1\0\0\377�\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\377\377\377\2\0\0\0����\0\0\377\4\0\0\0\377\377\377���\0\0\0�")
+	IMAGE_SCAN("�\2\0\0\0\377\377\377�\0\377\377\1\0\0\0�\0\0\377\5\0\377\377\0\0\0\0\377\377���\0\0\0�")
+	IMAGE_SCAN("�\2\0\0\0\377\377\377�\0\377\377\2\0\0\0\0\0\377�\0\377\377\4\0\0\0\0\377\377���\0\0\0�")
+	IMAGE_SCAN("��\0\0\0�\0\377\377\1\0\377\0�\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0����\2\0\0\0\0\377\377�\0\377\0\1\0\0\0����\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0����\1\0\0\0�\0\377\0\2\377\377\0\0\0\0����\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0����\2\0\0\0\0\377\0�\377\377\0\1\0\0\0����\1\0\0\0�")
+	IMAGE_SCAN("��\0\0\0�\377\377\0\1\377\0\0�\0\0\0�")
+	IMAGE_SCAN("�\2\0\0\0\377\377\377�\0\377\377\2\0\0\0\377\377\0�\377\0\0\4\0\0\0\0\377\377���\0\0\0�")
+	IMAGE_SCAN("�\2\0\0\0�������\1\0\0\0�\377\0\0\2���\0\0\0����\1\0\0\0�")
+	IMAGE_SCAN("…\0\0\0\1\377\0\0�����\0\0\0�")
+	IMAGE_SCAN("ƅ\0\0\0�")
+	IMAGE_SCAN("�")
+IMAGE_PACKED(Package, "\2\20\0\0\0\20\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(FastPackage)
+	IMAGE_SCAN("˅\0\0\0")
+	IMAGE_SCAN("Ɔ\0\0\0�\377\0\377\1\0\0\0")
+	IMAGE_SCAN("…\0\0\0����\1\0\0\377�\0\0\0\1\377\0\377�\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377\377\377\2\0\0\0����\0\0\377�\0\0\0�\377\0\377\1\0\0\0")
+	IMAGE_SCAN("�\2\0\0\0\377\377\377�\0\377\377\1\0\0\0�\0\0\377\1\0\377\377�\0\0\0\1\377\0\377�\0\0\0")
+	IMAGE_SCAN("�\2\0\0\0\377\377\377�\0\377\377\2\0\0\0\0\0\377�\0\377\377�\0\0\0\2\377\0\377\0\0\0�")
+	IMAGE_SCAN("��\0\0\0�\0\377\377\1\0\377\0�\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0����\2\0\0\0\0\377\377�\0\377\0\1\0\0\0����\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0����\1\0\0\0�\0\377\0\2\377\377\0\0\0\0����\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0����\2\0\0\0\0\377\0�\377\377\0\1\0\0\0����\1\0\0\0�")
+	IMAGE_SCAN("��\0\0\0�\377\377\0\1\377\0\0�\0\0\0�")
+	IMAGE_SCAN("�\2\0\0\0\377\377\377�\0\377\377\2\0\0\0\377\377\0�\377\0\0\4\0\0\0\0\377\377���\0\0\0�")
+	IMAGE_SCAN("�\2\0\0\0�������\1\0\0\0�\377\0\0\2���\0\0\0����\1\0\0\0�")
+	IMAGE_SCAN("…\0\0\0\1\377\0\0�����\0\0\0�")
+	IMAGE_SCAN("ƅ\0\0\0�")
+	IMAGE_SCAN("�")
+IMAGE_PACKED(FastPackage, "\2\20\0\0\0\20\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(FFff)
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�\1\0\0\0��\0\0\0�")
+	IMAGE_SCAN("�\3\0\0\0\0\377\377\0\0\0�����\1\0\0\377�\0\0\0�")
+	IMAGE_SCAN("�\3\0\0\0\0\377\377\0\0\0�\1����\0\0\377\4\0\0\0\377\377\377���\0\0\0�")
+	IMAGE_SCAN("�\3\0\0\0\0\377\377\0\0\0‚\0\0\377\5\0\377\377\0\0\0\0\377\377���\0\0\0�")
+	IMAGE_SCAN("�\2\0\0\0\0\377\377�\0\0\0�\1\0\0\377�\0\377\377\4\0\0\0\0\377\377���\0\0\0�")
+	IMAGE_SCAN("�\2\0\0\0\0\377\377�\0\0\0\2\0\377\377\0\0\0�\2\0\377\377\0\377\0�\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\377\1\0\0\0��\0\377\0\1\0\0\0����\1\0\0\0�")
+	IMAGE_SCAN("\1\0\0\0�\0\377\377\3\0\0\0\0\377\377\0\0\0��\0\377\0\2\377\377\0\0\0\0����\1\0\0\0�")
+	IMAGE_SCAN("\2\0\0\0\0\377\377�\0\0\0\2\0\377\377\0\0\0�\1\0\377\0�\377\377\0\1\0\0\0����\1\0\0\0�")
+	IMAGE_SCAN("�\4\0\0\0\0\377\377\0��\0\0\0‚\377\377\0\1\377\0\0�\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\377\1\0\0\0�\1\377\377\0�\377\0\0\4\0\0\0\0\377\377���\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\377\1\0\0\0�\1\0\0\0�\377\0\0\2���\0\0\0����\1\0\0\0�")
+	IMAGE_SCAN("�\3\0\0\0\0\377\377\0\0\0�\1\0\0\0�����\0\0\0�")
+	IMAGE_SCAN("��\0\0\0Å\0\0\0�")
+	IMAGE_SCAN("�")
+IMAGE_PACKED(FFff, "\2\20\0\0\0\20\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(Source)
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("Ƅ\0\0\0�")
+	IMAGE_SCAN("�\2���\0\0\0�\377\377\377�\0\0\377�\0\0\0�")
+	IMAGE_SCAN("�\1����\377\377\377�\0\0\377\1����")
+	IMAGE_SCAN("�\2\0\0\0\377\377\377�\0\0\377�����\0\0\377\1\0\0\0�")
+	IMAGE_SCAN("�\2\0\0\0\377\377\377�\0\0\377\1����\1����\0\0�\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\0\0\377\1����")
+	IMAGE_SCAN("�\1\0\0\0�\0\0\377\1����")
+	IMAGE_SCAN("�\1\0\0\0�\0\0\377\1����\4���\377\377\377\0\0�\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\0\0\377����\1\377\377\377�\0\0\377\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\0\0\377\1����")
+	IMAGE_SCAN("Ă\0\0\0�\0\0\377�\0\0\0�")
+	IMAGE_SCAN("Ƅ\0\0\0�")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�")
+IMAGE_PACKED(Source, "\2\20\0\0\0\20\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(FastSource)
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("Ƅ\0\0\0�")
+	IMAGE_SCAN("�\2���\0\0\0�\377\377\377�\0\0\377�\0\0\0�")
+	IMAGE_SCAN("�\1����\377\377\377�\0\0\377\1����")
+	IMAGE_SCAN("�\2\0\0\0\377\377\377�\0\0\377�����\0\0\377\1\0\0\0�")
+	IMAGE_SCAN("�\2\0\0\0\377\377\377�\0\0\377\1����\1����\0\0�\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\0\0\377\1���Ņ\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\0\0\377\1����\1\0\0\0�\0\377\377\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\0\0\377\1����\4���\377\377\377\0\0\0\0\377\377�\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\0\0\377����\3\377\377\377\0\0\377\0\0\0�\0\377\377\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\0\0\377\2\0\0\0\0\377\377�\0\0\0")
+	IMAGE_SCAN("Ă\0\0\0�\0\0\377�\0\0\0\2\0\377\377\0\0\0�")
+	IMAGE_SCAN("Ƅ\0\0\0��\0\0\0�")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�")
+IMAGE_PACKED(FastSource, "\2\20\0\0\0\20\0\0\0\377\377\377\377\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(Fast)
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("‰\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\377\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\377\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\377�\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\377\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\377�\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\377\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\377\1\0\0\0�\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\377�\0\0\0�\1\0\0\0�\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\377\1\0\0\0�\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\377\1\0\0\0�\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\377\1\0\0\0�\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\377\1\0\0\0�")
+	IMAGE_SCAN("„\0\0\0�\1\0\0\0�")
+	IMAGE_SCAN("�")
+IMAGE_PACKED(Fast, "\2\20\0\0\0\20\0\0\0\377\377\377\377\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(ISource)
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("Ƅ\0\0\0�")
+	IMAGE_SCAN("�\2���\0\0\0�\377\377\377���\0�\0\0\0�")
+	IMAGE_SCAN("�\1����\377\377\377���\0\1����")
+	IMAGE_SCAN("�\2\0\0\0\377\377\377���\0�������\0\1\0\0\0�")
+	IMAGE_SCAN("�\2\0\0\0\377\377\377���\0\1����\1����\0\0�\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0���\0\1����")
+	IMAGE_SCAN("�\1\0\0\0���\0\1����")
+	IMAGE_SCAN("�\1\0\0\0���\0\1����\4���\377\377\377\0\0�\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0���\0����\1\377\377\377���\0\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0���\0\1����")
+	IMAGE_SCAN("Ă\0\0\0���\0�\0\0\0�")
+	IMAGE_SCAN("Ƅ\0\0\0�")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�")
+IMAGE_PACKED(ISource, "\2\20\0\0\0\20\0\0\0\377\377\377\377\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(FastISource)
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("Ƅ\0\0\0�")
+	IMAGE_SCAN("�\2���\0\0\0�\377\377\377���\0�\0\0\0�")
+	IMAGE_SCAN("�\1����\377\377\377���\0\1����")
+	IMAGE_SCAN("�\2\0\0\0\377\377\377���\0�������\0\1\0\0\0�")
+	IMAGE_SCAN("�\2\0\0\0\377\377\377���\0\1����\1����\0\0�\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0���\0\1���Ņ\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0���\0\1����\1\0\0\0�\0\377\377\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0���\0\1����\4���\377\377\377\0\0\0\0\377\377�\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0���\0����\3\377\377\377��\0\0\0\0�\0\377\377\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0���\0\2\0\0\0\0\377\377�\0\0\0")
+	IMAGE_SCAN("Ă\0\0\0���\0�\0\0\0\2\0\377\377\0\0\0�")
+	IMAGE_SCAN("Ƅ\0\0\0��\0\0\0�")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�")
+IMAGE_PACKED(FastISource, "\2\20\0\0\0\20\0\0\0\377\377\377\377\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(Script)
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("ň\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\0\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\0�\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\0\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\0\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\0\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\0\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\0\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\0\1\0\0\0�")
+	IMAGE_SCAN("��\0\0\0�\0\377\0\1\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\0\1\0\0\0�")
+	IMAGE_SCAN("��\0\0\0�")
+	IMAGE_SCAN("�")
+	IMAGE_SCAN("�")
+IMAGE_PACKED(Script, "\2\20\0\0\0\20\0\0\0\377\377\377\377\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(Images)
+	IMAGE_SCAN("�\15\27\377Â\377I�‚\32�\377�\1\0\0\0")
+	IMAGE_SCAN("�\15\27\377Â\377I���\32�\377Ă\0\0\0")
+	IMAGE_SCAN("�\0\0\0��\0\0\0\2\377I�\0\0\0�\1\32�\377�\2\0\0\0��\0\1\0\0\0")
+	IMAGE_SCAN("��\0\0\0�\377\377\377\2\0\0\0\377\377\377�\0\0\0�\1\0\0\0���\0\1\0\0\0")
+	IMAGE_SCAN("�\0\0\0�\377\377\377\5\0\0\0\377\377\377\0\0\0\377\377\377\0\0\0�\1\0\0\0���\0\1\0\0\0")
+	IMAGE_SCAN("\2\0\0\0\377\377\377�\0\0\0\5\377\377\377\0\0\0\377\377\377\0\0\0\377\377\377�\0\0\0���\0\2\0\0\0��\0\1\0\0\0")
+	IMAGE_SCAN("�\0\0\0\3\377\377\377\0\0\0\377\377\377�\0\0\0���\0�\0\0\0\1��\0\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0���ڄ\0\0\0����\1\0\0\0���\0�\0\0\0\1��\0\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0���ڂ\0\0\0���\0\2\0\0\0��\0\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0���ڄ\0\377�����\1\0\0\0�\1\0\0\0���\0\1\0\0\0")
+	IMAGE_SCAN("\4\0\0\0���\0\377�\0\0\0�\0\377�\3\0\0\0\0\377���ڄ\0\0\0���\0\1\0\0\0")
+	IMAGE_SCAN("\2\0\0\0��چ\0\377�\2���\0\0\0���\0\1\0\0\0")
+	IMAGE_SCAN("\3\0\0\0���\0\377��\0\0\0\2\0\377���ڇ\0\0\0")
+	IMAGE_SCAN("\1\0\0\0���ڄ\0\377�����\1\0\0\0�")
+	IMAGE_SCAN("��\0\0\0���ڂ\0\0\0�")
+	IMAGE_SCAN("Ä\0\0\0�")
+IMAGE_PACKED(Images, "\2\20\0\0\0\20\0\0\0\377\377\377\377\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(Language)
+	IMAGE_SCAN("�\0\0\0�")
+	IMAGE_SCAN("\5\0\0\0\0\377\377\377xK\0\377\377\377xK�\0\0\377\1\0\0\0�")
+	IMAGE_SCAN("\1\0\0\0�\377xK�\377\377\377\1\0\0\0�")
+	IMAGE_SCAN("\5\0\0\0\0\377\377\377xK\0\377\377\377xK�\0\0\377\1\0\0\0�")
+	IMAGE_SCAN("\1\0\0\0�\0\0\377�\0\0\0�")
+	IMAGE_SCAN("\1\0\0\0�\377\377\377\1\0\0\0�\377xK\3\0\377\377\377xK\0\377\377�\377xK\1\0\0\0�")
+	IMAGE_SCAN("\1\0\0\0�\0\0\377\3\0\0\0\377xK\0\377\377�\377xK\1\0\377\377�\377xK\1\0\0\0�")
+	IMAGE_SCAN("�\0\0\0\1\0\377\377�\377xK\3\0\377\377\377xK\0\0\0�")
+	IMAGE_SCAN("�\1\0\0\0�\377xK�\0\0\0")
+	IMAGE_SCAN("�\5\0\0\0\0\377\377\377xK\0\0\0\377xK�\377\377\377\1\0\0\0")
+	IMAGE_SCAN("�\4\0\0\0\377xK\0\377\377\0\0\0�\377xK�\377\377\377\1\0\0\0")
+	IMAGE_SCAN("Ä\0\0\0�\377xK�\377\377\377\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377xK�\0\0\377\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377xK�\0\0\377\1\0\0\0")
+	IMAGE_SCAN("�\2\0\0\0\377xK�\0\0\377\1\0\0\0")
+	IMAGE_SCAN("Ɗ\0\0\0")
+IMAGE_PACKED(Language, "\2\20\0\0\0\20\0\0\0\377\377\377\377\0\0\0\0\0\0\0\0")
diff --git a/uppsrc/ide/Common/init b/uppsrc/ide/Common/init
new file mode 100644
index 000000000..64ab525dc
--- /dev/null
+++ b/uppsrc/ide/Common/init
@@ -0,0 +1,5 @@
+#ifndef _ide_Common_icpp_init_stub
+#define _ide_Common_icpp_init_stub
+#include "CtrlLib/init"
+#include "Esc/init"
+#endif
diff --git a/uppsrc/ide/Common/usc.cpp b/uppsrc/ide/Common/usc.cpp
new file mode 100644
index 000000000..be64cd540
--- /dev/null
+++ b/uppsrc/ide/Common/usc.cpp
@@ -0,0 +1,113 @@
+#include "Common.h"
+
+ArrayMap<String, EscValue>& UscGlobal()
+{
+	static ArrayMap<String, EscValue> global;
+	return global;
+}
+
+IdeMacro::IdeMacro()
+{
+	hotkey = 0;
+}
+
+GLOBAL_VAR(Array<IdeMacro>, UscMacros)
+
+void ESC_cout(EscEscape& e)
+{
+	if(e[0].IsArray())
+		PutConsole((String) e[0]);
+	else
+	if(e[0].IsNumber()) {
+		String str;
+		str << e[0].GetNumber();
+		PutConsole(str);
+	}
+	else
+	if(!e[0].IsVoid())
+		e.ThrowError("invalid argument to 'cout'" + e.DumpType(0));
+}
+
+void ESC_dump(EscEscape& e)
+{
+	PutConsole(e[0].ToString());
+}
+
+void CleanUsc()
+{
+	UscGlobal().Clear();
+	UscMacros().Clear();
+	for(int i = 0; i < GetIdeModuleCount(); i++)
+		GetIdeModule(i).CleanUsc();
+	StdLib(UscGlobal());
+	Escape(UscGlobal(), "cout(x)", ESC_cout);
+	Escape(UscGlobal(), "dump(x)", ESC_dump);
+}
+
+bool IdeModuleUsc(CParser& p)
+{
+	for(int i = 0; i < GetIdeModuleCount(); i++)
+		if(GetIdeModule(i).ParseUsc(p))
+			return true;
+	return false;
+}
+
+static void ReadMacro(CParser& p)
+{
+	IdeMacro macro;
+	if(p.IsString()) {
+		macro.menu = p.ReadString();
+		if(p.Char(':'))
+			macro.submenu = p.ReadString();
+	}
+	if(!p.IsChar('{'))
+		macro.hotkey = ParseKeyDesc(p);
+	EscLambda& l = macro.code.CreateLambda();
+	const char *t = p.GetPtr();
+	l.filename = p.GetFileName();
+	l.line = p.GetLine();
+	if(!p.Char('{'))
+		p.ThrowError("missing '{'");
+	SkipBlock(p);
+	l.code = String(t, p.GetPtr());
+	Array<IdeMacro>& mlist = UscMacros();
+	if(macro.hotkey) {
+		int f = FindFieldIndex(mlist, &IdeMacro::hotkey, macro.hotkey);
+		if(f >= 0) {
+			PutConsole(NFormat("%s(%d): duplicate macro hotkey %s\n", l.filename, l.line, GetKeyDesc(macro.hotkey)));
+			const EscLambda& lambda = UscMacros()[f].code.GetLambda();
+			PutConsole(NFormat("%s(%d): previously defined here\n", lambda.filename, lambda.line));
+		}
+	}
+	if(!IsNull(macro.menu)) {
+		for(int i = 0; i < mlist.GetCount(); i++)
+			if(mlist[i].menu == macro.menu && mlist[i].submenu == macro.submenu) {
+				PutConsole(NFormat("%s(%d): duplicate macro menu item (%s:%s)\n",
+					l.filename, l.line, macro.menu, macro.submenu));
+				const EscLambda& lambda = UscMacros()[i].code.GetLambda();
+				PutConsole(NFormat("%s(%d): previously defined here\n", lambda.filename, lambda.line));
+				break;
+			}
+	}
+	mlist.Add(macro);
+}
+
+void ParseUscFile(const char *filename) throw(CParser::Error)
+{
+	String d = LoadFile(filename);
+	CParser p(d, filename);
+	while(!p.IsEof()) {
+		if(p.Id("fn")) {
+			EscValue& v = UscGlobal().GetPut(p.ReadId());
+			v = ReadLambda(p);
+		}
+		else
+		if(p.Id("macro"))
+			ReadMacro(p);
+		else
+		if(!IdeModuleUsc(p)) {
+			EscValue& v = UscGlobal().GetPut(p.ReadId());
+			v = ReadLambda(p);
+		}
+	}
+}
diff --git a/uppsrc/ide/Console.cpp b/uppsrc/ide/Console.cpp
new file mode 100644
index 000000000..7a893a4ed
--- /dev/null
+++ b/uppsrc/ide/Console.cpp
@@ -0,0 +1,350 @@
+#include "ide.h"
+
+class TopTextFrame : public CtrlFrame {
+	virtual void FrameLayout(Rect& r)                   { r.top++; }
+	virtual void FramePaint(Draw& w, const Rect& r) {
+		w.DrawRect(r.left, r.top, r.Width(), 1, TopSeparator1());
+	}
+	virtual void FrameAddSize(Size& sz) { sz.cy++; }
+};
+
+Console::Console() {
+	verbosebuild = false;
+	processes.SetCount(1);
+	console_lock = -1;
+	wrap_text = true;
+	console = false;
+	SetReadOnly();
+	NoHorzScrollbar();
+	SetColor(PAPER_READONLY, SColorPaper);
+	input.Height(EditString::GetStdHeight());
+	input.SetFrame(Single<TopTextFrame>());
+	AddFrame(input);
+	input.Hide();
+}
+
+void Console::LeftDouble(Point p, dword) {
+	WhenSelect();
+}
+
+void Console::RightDown(Point p, dword)
+{
+	MenuBar::Execute(WhenBar);
+}
+
+static int sAppf(int c) {
+	return c >= ' ' || c == '\n' ? c : c == '\t' ? ' ' : 0;
+}
+
+void Console::Append(const String& s) {
+	if(s.IsEmpty()) return;
+	if(console) {
+		Puts(s);
+		return;
+	}
+	int l, h;
+	GetSelection(l, h);
+	if(GetCursor() == GetLength()) l = -1;
+	EditPos p = GetEditPos();
+	SetEditable();
+	MoveTextEnd();
+	String t = Filter(s, sAppf);
+	if(wrap_text) {
+		int mg = sb.GetReducedViewSize().cx / GetFont().Info().GetAveWidth();
+		for(const char *q = t; *q; q++) {
+			if(mg > 2 && GetColumnLine(GetCursor()).x >= mg - 1)
+				Paste(ToUnicode("\n\t", CHARSET_WIN1252));
+			Paste(String(*q, 1).ToWString());
+		}
+	}
+	else
+		Paste(t.ToWString());
+	SetReadOnly();
+	if(l >= 0) {
+		SetEditPos(p);
+		SetSelection(l, h);
+	}
+}
+
+bool Console::Key(dword key, int count) {
+	if(key == K_ENTER) {
+		if(input.IsVisible()) {
+			if(processes.GetCount() && processes[0].process)
+#ifdef PLATFORM_POSIX
+				processes[0].process->Write(String(~input) + "\n");
+#else
+				processes[0].process->Write(String(~input) + "\r\n");
+#endif
+			input <<= Null;
+		}
+		else
+			WhenSelect();
+		return true;
+	}
+	return LineEdit::Key(key, count);
+}
+
+int Console::Flush()
+{
+	bool done_output = false;
+	int num_running = 0;
+	for(int i = 0; i < processes.GetCount(); i++)
+		if(!!processes[i].process)
+			num_running++;
+	if(num_running) {
+		int time = msecs();
+		for(int i = 0; i < processes.GetCount(); i++) {
+			Slot& slot = processes[i];
+			if(!!slot.process) {
+				Group& group = groups.GetAdd(slot.group);
+				group.msecs += (time - slot.last_msecs) / num_running;
+				group.raw_msecs += time - slot.last_msecs;
+				slot.last_msecs = time;
+			}
+		}
+	}
+	bool running = false;
+	for(int i = 0; i < processes.GetCount(); i++) {
+		Slot& slot = processes[i];
+		if(!slot.process)
+			continue;
+		String s;
+		slot.process->Read(s);
+		if(!IsNull(s)) {
+			done_output = true;
+			if(slot.outfile)
+				slot.outfile->Put(s);
+			if(!slot.quiet) {
+				if(console_lock < 0 || console_lock == i) {
+					console_lock = i;
+					Append(s);
+				}
+				else
+					slot.output.Cat(s);
+			}
+		}
+		if(!slot.process->IsRunning()) {
+			Kill(i);
+			if(slot.exitcode != 0 && verbosebuild)
+				spooled_output.Cat("Error executing " + slot.cmdline + "\n");
+			if(console_lock == i)
+				console_lock = -1;
+			FlushConsole();
+			CheckEndGroup();
+			continue;
+		}
+		running = true;
+	}
+	return !running ? -1 : done_output ? 1 : 0;
+}
+
+int Console::Execute(One<SlaveProcess> p, const char *command, Stream *out, bool q)
+{
+	Wait();
+	if(!Run(p, command, out, q, 0))
+		return -1;
+	Wait();
+	return processes[0].exitcode;
+}
+
+int Console::Execute(const char *command, Stream *out, const char *envptr, bool q)
+{
+	try {
+		Wait();
+		return Execute(StartProcess(command, envptr, REMOTE_TIMEOUT), command, out, q);
+	}
+	catch(Exc e) {
+		ProcessEvents();
+		return Null;
+	}
+}
+
+int Console::AllocSlot()
+{
+	int sleep = 0;
+	for(;;) {
+		for(int i = 0; i < processes.GetCount(); i++)
+			if(!IsRunning(i))
+				return i;
+		switch(Flush()) {
+			case -1: break;
+			case  0: sleep = min(sleep + 5, 20); break;
+			case +1: sleep = 0; break;
+		}
+		Sleep(sleep);
+		ProcessEvents();
+	}
+}
+
+bool Console::Run(const char *cmdline, Stream *out, const char *envptr, bool quiet, int slot, String key, int blitz_count)
+{
+	try {
+		Wait(slot);
+		One<SlaveProcess> sproc = StartProcess(cmdline, envptr, REMOTE_TIMEOUT);
+		return !!sproc && Run(sproc, cmdline, out, quiet, slot, key, blitz_count);
+	}
+	catch(Exc e) {
+		Append(e);
+		ProcessEvents();
+		return false;
+	}
+}
+
+bool Console::Run(One<SlaveProcess> process, const char *cmdline, Stream *out, bool quiet, int slot, String key, int blitz_count)
+{
+	if(!process) {
+		if(verbosebuild)
+			spooled_output << "Error running " << cmdline << "\n";
+		FlushConsole();
+		return false;
+	}
+	else if(verbosebuild)
+		spooled_output << cmdline << "\n";
+	Wait(slot);
+	Slot& pslot = processes[slot];
+	pslot.process = process;
+	pslot.cmdline = cmdline;
+	pslot.outfile = out;
+	pslot.output = Null;
+	pslot.quiet = quiet;
+	pslot.key = key;
+	pslot.group = current_group;
+	pslot.last_msecs = msecs();
+	groups.GetAdd(pslot.group).count += blitz_count;
+	if(processes.GetCount() == 1)
+		Wait(slot);
+	return true;
+}
+
+void Console::FlushConsole()
+{
+	if(console_lock < 0) {
+		Append(spooled_output);
+		spooled_output = Null;
+	}
+}
+
+void Console::BeginGroup(String group)
+{
+	Flush();
+	groups.GetAdd(current_group).finished = true;
+	groups.GetAdd(current_group = group);
+	CheckEndGroup();
+}
+
+void Console::EndGroup()
+{
+	groups.GetAdd(current_group).finished = true;
+	CheckEndGroup();
+	current_group = Null;
+}
+
+bool Console::IsRunning()
+{
+	for(int i = 0; i < processes.GetCount(); i++)
+		if(IsRunning(i))
+			return true;
+	return false;
+}
+
+bool Console::IsRunning(int slot)
+{
+	if(slot < 0 || slot >= processes.GetCount() || !processes[slot].process)
+		return false;
+	return processes[slot].process->IsRunning();
+}
+
+void Console::Wait(int slot)
+{
+	int sleep = 0;
+	while(processes[slot].process) {
+		ProcessEvents();
+		switch(Flush()) {
+			case -1: return;
+			case  0: sleep = min(sleep + 5, 20); break;
+			case +1: sleep = 0; break;
+		}
+		Ctrl::GuiSleep(sleep);
+	}
+}
+
+bool Console::Wait()
+{
+	int sleep = 0;
+	for(;;) {
+		ProcessEvents();
+		switch(Flush()) {
+			case -1: return error_keys.IsEmpty();
+			case  0: sleep = min(sleep + 5, 20); break;
+			case +1: sleep = 0; break;
+		}
+		Ctrl::GuiSleep(sleep);
+	}
+}
+
+void Console::Kill()
+{
+	for(int i = 0; i < processes.GetCount(); i++)
+		Kill(i);
+}
+
+void Console::Kill(int islot)
+{
+	Slot& slot = processes[islot];
+	if(slot.process) {
+		slot.process->Kill();
+		slot.exitcode = slot.process->GetExitCode();
+		if(slot.exitcode != 0 && !IsNull(slot.key))
+			error_keys.Add(slot.key);
+		slot.process.Clear();
+		spooled_output.Cat(slot.output);
+		if(console_lock == islot)
+			console_lock = -1;
+		FlushConsole();
+	}
+	CheckEndGroup();
+}
+
+void Console::SetSlots(int s)
+{
+	Kill();
+	processes.SetCount(s);
+}
+
+void Console::CheckEndGroup()
+{
+	for(int g = groups.GetCount(); --g >= 0;) {
+		String gname = groups.GetKey(g);
+		Group& group = groups[g];
+		if(!IsNull(gname) && group.finished) {
+			int p = processes.GetCount();
+			while(--p >= 0 && !(!!processes[p].process && processes[p].group == gname))
+				;
+			if(p < 0) {
+				if(group.count > 0) {
+					int duration = msecs(group.start_time);
+					String msg = NFormat("%s: %d file(s) built in %s, %d msecs / file, duration = %d msecs",
+						gname, group.count, PrintTime(group.msecs), group.msecs / group.count, duration);
+					if(processes.GetCount() > 1) {
+						int k = 100 * processes.GetCount() / (processes.GetCount() - 1);
+						msg << NFormat(", parallelization %d%%", minmax(k - group.msecs * k / max(group.raw_msecs, 1), 0, 100));
+					}
+					msg << '\n';
+					spooled_output.Cat(msg);
+					if(console_lock < 0) {
+						Append(spooled_output);
+						spooled_output = Null;
+					}
+				}
+				groups.Remove(g);
+			}
+		}
+	}
+}
+
+void Console::Input(bool b)
+{
+	input.Show(b);
+	if(b)
+		input.SetFocus();
+}
diff --git a/uppsrc/ide/Custom.cpp b/uppsrc/ide/Custom.cpp
new file mode 100644
index 000000000..5666b4ca3
--- /dev/null
+++ b/uppsrc/ide/Custom.cpp
@@ -0,0 +1,139 @@
+#include "ide.h"
+
+struct Custom : public WithCustomLayout<TopWindow> {
+	LineEdit   output;
+	LineEdit   command;
+
+	DropList   package;
+	EditString when;
+	EditString extension;
+
+	void InsertCmd(String s);
+	void InsertOut(String s);
+	void DoMenu(Button& b, Callback1<String> cb);
+	void OutMenu();
+	void CmdMenu();
+
+	void Perform(const char *main);
+
+	Custom();
+
+	typedef Custom CLASSNAME;
+};
+
+void Custom::InsertCmd(String s) {
+	command.Paste(s.ToWString());
+	command.SetFocus();
+}
+
+void Custom::InsertOut(String s) {
+	output.Paste(s.ToWString());
+	output.SetFocus();
+}
+
+void Custom::DoMenu(Button& b, Callback1<String> cb) {
+	if(!list.IsCursor()) return;
+	MenuBar menu;
+//	CallbackArg<String> set;
+//	set <<= cb;
+	String pk = list.Get(0);
+	String ext = (String)list.Get(2);
+	if(ext[0] != '.')
+		ext = '.' + ext;
+	String sample = SourcePath(pk, ForceExt("sample", ext));
+	menu.Add("Input file path (like '" + UnixPath(sample) + "')", callback1(cb, "$(PATH)"));
+	menu.Add("Input file directory (like '" + UnixPath(GetFileFolder(sample)) + "')", callback1(cb, "$(DIR)"));
+	menu.Add("Input file name (like '" + GetFileName(sample) + "')", callback1(cb, "$(FILE)"));
+	menu.Add("Input file title (like '" + GetFileTitle(sample) + "')", callback1(cb, "$(TITLE)"));
+	Vector<String> ss = SplitFlags0((String)list.Get(1));
+	String opath = "f:/out/app/WIN32-ST/somefile.ext";
+	menu.Add("Package output directory (like '" + UnixPath(GetFileFolder(opath)) + "')", callback1(cb, "$(OUTDIR)"));
+	menu.Add("Package output path (like '" + UnixPath(opath) + "')", callback1(cb, "$(OUTPATH)"));
+	menu.Add("Package output path (like '" + GetFileName(opath) + "')", callback1(cb, "$(OUTFILE)"));
+	menu.Add("Package output path (like '" + GetFileTitle(opath) + "')", callback1(cb, "$(OUTTITLE)"));
+	menu.Add("Semicolon separated include dirs (like '/bin/include;/cpp/inc')", callback1(cb, "$(INCLUDE)"));
+	menu.Add("Prefixed include dirs (like '-inc/include -inc/cpp/inc' for '$(!-inc)')",
+		     callback1(cb, "$(!)"));
+	menu.Add("$ character", callback1(cb, "$$"));
+	menu.Execute(b.GetScreenRect().BottomLeft());
+}
+
+void Custom::OutMenu() {
+	DoMenu(outputmenu, THISBACK(InsertOut));
+}
+
+void Custom::CmdMenu() {
+	DoMenu(commandmenu, THISBACK(InsertCmd));
+}
+
+Custom::Custom() {
+	CtrlLayoutExit(*this, "Custom build steps");
+	Sizeable().MaximizeBox();
+	list.AutoHideSb();
+	list.Appending().Removing();
+	list.AddColumn("Host package", 85).Edit(package);
+	list.AddColumn("When", 416).Edit(when);
+	when.SetFilter(CondFilter);
+	list.AddColumn(".extension", 74).Edit(extension);
+	list.AddCtrl(command);
+	list.AddCtrl(output);
+	outputmenu.SetFrame(InsetFrame());
+	outputmenu.SetImage(CtrlImg::smalldown()).NoWantFocus();
+	outputmenu <<= THISBACK(OutMenu);
+	commandmenu.SetFrame(InsetFrame());
+	commandmenu.SetImage(CtrlImg::smalldown()).NoWantFocus();
+	commandmenu <<= THISBACK(CmdMenu);
+}
+
+class CustomOrder : public ArrayCtrl::Order {
+public:
+	virtual bool operator()(const Vector<Value>& row1, const Vector<Value>& row2) const {
+		for(int i = 0; i < 3; i++)
+			if(String(row1[i]) != String(row2[i]))
+				return String(row1[i]) < String(row2[i]);
+		return false;
+	}
+};
+
+void Custom::Perform(const char *main) {
+	Workspace wspc;
+	wspc.Scan(main);
+	list.Clear();
+	int i;
+	for(i = 0; i < wspc.GetCount(); i++) {
+		package.Add(wspc[i]);
+		if(i == 0)
+			list.IndexInfo(0).InsertValue(wspc[i]);
+		Array<CustomStep>& m = wspc.GetPackage(i).custom;
+		for(int j = 0; j < m.GetCount(); j++)
+			list.Add(wspc[i], m[j].when, m[j].ext, m[j].command, m[j].output);
+	}
+	list.Sort(Single<CustomOrder>());
+	list.SetCursor(0);
+	Run();
+	for(i = 0; i < wspc.GetCount(); i++)
+		wspc.GetPackage(i).custom.Clear();
+	for(i = 0; i < list.GetCount(); i++) {
+		String pk = list.Get(i, 0);
+		for(int k = 0; k < wspc.GetCount(); k++)
+			if(wspc[k] == pk) {
+				CustomStep& m = wspc.GetPackage(k).custom.Add();
+				m.when = list.Get(i, 1);
+				m.ext = list.Get(i, 2);
+				m.command = list.Get(i, 3);
+				m.output = list.Get(i, 4);
+				break;
+			}
+	}
+	for(i = 0; i < wspc.GetCount(); i++) {
+		String pp = PackagePath(wspc[i]);
+		RealizePath(pp);
+		wspc.GetPackage(i).Save(pp);
+	}
+}
+
+void Ide::CustomSteps() {
+	Custom dlg;
+	dlg.Perform(main);
+	ScanWorkspace();
+}
diff --git a/uppsrc/ide/Debug.cpp b/uppsrc/ide/Debug.cpp
new file mode 100644
index 000000000..d1d9f63a4
--- /dev/null
+++ b/uppsrc/ide/Debug.cpp
@@ -0,0 +1,282 @@
+#include "ide.h"
+
+void Ide::RunArgs() {
+	WithRunLayout<TopWindow> dlg;
+	CtrlLayoutOKCancel(dlg, "Run options");
+
+	SelectDirButton dir_browse("Run in folder");
+	dir_browse.Attach(dlg.dir);
+	dlg.dir = rundir.ToWString();
+
+	dlg.arg <<= runarg;
+
+	{
+		StringStream ss(recent_runarg);
+		dlg.arg.SerializeList(ss);
+	}
+
+	SaveFileButton stdout_browse("Save STDOUT as");
+	stdout_browse.Type("Text files (*.txt)", "*.txt").AllFilesType();
+	stdout_browse.Attach(dlg.stdout_file);
+
+	{
+		StringStream ss(recent_stdout_file);
+		dlg.stdout_file.SerializeList(ss);
+		dlg.stdout_file <<= stdout_file;
+	}
+
+	dlg.runmode <<= runmode;
+	dlg.external = runexternal;
+	dlg.runmode <<= dlg.Breaker(222);
+
+	for(;;) {
+		int rm = ~dlg.runmode;
+		dlg.stdout_file.Enable(rm == RUN_FILE || rm == RUN_FILE_CONSOLE);
+		switch(dlg.Run()) {
+		case IDOK:
+			rundir  = dlg.dir;
+			runarg  = ~dlg.arg;
+			runmode = ~dlg.runmode;
+			runexternal = dlg.external;
+			stdout_file = ~dlg.stdout_file;
+			dlg.arg.AddHistory();
+			{
+				StringStream ss;
+				dlg.arg.SerializeList(ss);
+				recent_runarg = ss;
+			}
+			{
+				StringStream ss;
+				dlg.stdout_file.SerializeList(ss);
+				recent_stdout_file = ss;
+			}
+			return;
+
+		case IDCANCEL:
+			return;
+		}
+	}
+}
+
+One<Host> Ide::CreateHostRunDir()
+{
+	One<Host> h = CreateHost(false);
+	if(IsNull(rundir))
+		h->ChDir(GetFileFolder(target));
+	else
+		h->ChDir(rundir);
+	return h;
+}
+
+void Ide::BuildAndExecute()
+{
+	if(Build()) {
+		int time = msecs();
+		One<Host> h = CreateHostRunDir();
+		h->ChDir(Nvl(rundir, GetFileFolder(target)));
+		String cmdline;
+		if(!runexternal)
+			cmdline << '\"' << h->GetHostPath(target) << "\" ";
+		cmdline << runarg;
+		switch(runmode) {
+		case RUN_WINDOW:
+			HideBottom();
+			h->Launch(cmdline, FindIndex(SplitFlags(mainconfigparam, true), "GUI") < 0);
+			break;
+		case RUN_CONSOLE:
+			ShowConsole();
+			PutConsole(String().Cat() << "Executing: " << cmdline);
+			console.Sync();
+			h->ExecuteWithInput(cmdline);
+			PutConsole("Finished in " + GetPrintTime(time));
+			break;
+		case RUN_FILE: {
+				HideBottom();
+				String fn;
+				if(IsNull(stdout_file))
+					fn = ForceExt(target, ".ol");
+				else
+					fn = stdout_file;
+				FileOut out(fn);
+				if(!out) {
+					PromptOK("Unable to open output file [* " + DeQtf(stdout_file) + "] !");
+					return;
+				}
+				if(h->Execute(cmdline, out) >= 0) {
+					out.Close();
+					EditFile(fn);
+				}
+			}
+		}
+	}
+}
+
+void Ide::BuildAndDebug0(const String& srcfile)
+{
+	if(Build()) {
+		One<Host> h = CreateHostRunDir();
+		h->ChDir(GetFileFolder(target));
+		VectorMap<String, String> bm = GetMethodVars(method);
+		String dbg = bm.Get("DEBUGGER", Null);
+		if(IsNull(dbg)) {
+			if(bm.Get("BUILDER", Null) == "MSC71") {
+				String sln = ForceExt(target, ".sln");
+				if(GetFileLength(sln) > 0)
+					h->Launch("devenv \"" + h->GetHostPath(sln) + "\" " + "\"" + h->GetHostPath(srcfile) + "\"");
+				else
+					h->Launch("devenv \"" + h->GetHostPath(target) + "\" \""
+					          + h->GetHostPath(srcfile) + "\" /debugexe ");
+				return;
+			}
+			dbg = "gdb";
+		}
+		else
+			h->Launch('\"' + dbg + "\" \""
+//			          + h->GetHostPath(srcfile) + ' '
+			          + h->GetHostPath(target) + "\"", true);
+	}
+}
+
+void Ide::BuildAndExtDebug()
+{
+	BuildAndDebug0(Null);
+}
+
+void Ide::BuildAndExtDebugFile()
+{
+	BuildAndDebug0(editfile);
+}
+
+One<Debugger> GdbCreate(One<Host> host, const String& exefile, const String& cmdline);
+#ifdef PLATFORM_WIN32
+One<Debugger> CdbCreate(One<Host> host, const String& exefile, const String& cmdline);
+One<Debugger> PdbCreate(One<Host> host, const String& exefile, const String& cmdline);
+#endif
+
+void Ide::BuildAndDebug(bool runto)
+{
+	VectorMap<String, String> bm = GetMethodVars(method);
+	String builder = bm.Get("BUILDER", "");
+	if(!Build())
+		return;
+	if(designer)
+		EditAsText();
+	One<Host> host = CreateHostRunDir();
+	host->ChDir(Nvl(rundir, GetFileFolder(target)));
+	HideBottom();
+	editor.Disable();
+#ifdef COMPILER_MSC
+	debugger = builder == "GCC" ? GdbCreate(host, target, runarg) : PdbCreate(host, target, runarg);
+#else
+	debugger = GdbCreate(host, target, runarg);
+#endif
+	debuglock = 0;
+	const Workspace& wspc = IdeWorkspace();
+	for(int i = 0; i < wspc.GetCount(); i++) {
+		const Package& pk = wspc.GetPackage(i);
+		String n = wspc[i];
+		for(int i = 0; i < pk.file.GetCount(); i++) {
+			String file = SourcePath(n, pk.file[i]);
+			LineInfo& ln = Filedata(file).lineinfo;
+			for(int i = 0; i < ln.GetCount(); i++) {
+				LineInfoRecord& lr = ln[i];
+				if(!lr.breakpoint.IsEmpty())
+					if(!debugger->SetBreakpoint(file, lr.lineno, lr.breakpoint)) {
+						lr.breakpoint = "\xe";
+						if(PathIsEqual(file, editfile))
+							editor.SetBreakpoint(lr.lineno, "\xe");
+					}
+			}
+		}
+	}
+	SetBar();
+	editor.Enable();
+	if(runto) {
+		if(!debugger->RunTo())
+			IdeEndDebug();
+	}
+	else
+		debugger->Run();
+}
+
+void Ide::DebugClearBreakpoints()
+{
+	const Workspace& wspc = IdeWorkspace();
+	for(int i = 0; i < wspc.GetCount(); i++) {
+		const Package& pk = wspc.GetPackage(i);
+		String n = wspc[i];
+		for(int i = 0; i < pk.file.GetCount(); i++) {
+			String file = SourcePath(n, pk.file[i]);
+			LineInfo& ln = Filedata(file).lineinfo;
+			if(debugger)
+				for(int i = 0; i < ln.GetCount(); i++) {
+					const LineInfoRecord& lr = ln[i];
+					if(!lr.breakpoint.IsEmpty())
+						debugger->SetBreakpoint(file, lr.lineno, "");
+				}
+			ClearBreakpoints(ln);
+		}
+	}
+	editor.ClearBreakpoints();
+}
+
+void Ide::OnBreakpoint(int i)
+{
+	if(!editfile.IsEmpty() && !designer && debugger) {
+		String q = editor.GetBreakpoint(i);
+		if(q[0] != 0xe && !debugger->SetBreakpoint(editfile, i, q))
+			if(!q.IsEmpty())
+				editor.SetBreakpoint(i, "\xe");
+	}
+}
+
+void Ide::DebugToggleBreak()
+{
+	if(editfile.IsEmpty() || designer)
+		return;
+	int ln = editor.GetCursorLine();
+	String brk = editor.GetBreakpoint(ln);
+	if(!brk.IsEmpty())
+		editor.SetBreakpoint(ln, Null);
+	else
+		editor.SetBreakpoint(ln, "1");
+	editor.RefreshFrame();
+}
+
+void Ide::ConditionalBreak()
+{
+	if(editfile.IsEmpty() || designer)
+		return;
+	int ln = editor.GetCursorLine();
+	String brk = editor.GetBreakpoint(ln);
+	if(EditText(brk, "Conditional breakpoint", "Condition"))
+		editor.SetBreakpoint(ln, brk);
+	editor.RefreshFrame();
+}
+
+void Ide::StopDebug()
+{
+	if(debugger)
+		debugger->Stop();
+	console.Kill();
+	PosSync();
+}
+
+String Ide::GetLogPath()
+{
+	if(target.GetCount() == 0)
+		return Null;
+#ifdef PLATFORM_WIN32
+	return ForceExt(target, ".log");
+#else
+	String p = GetFileTitle(target);
+	return GetHomeDirFile(".upp/" + p + "/" + p + ".log");
+#endif
+}
+
+void Ide::OpenLog()
+{
+	String p = GetLogPath();
+	if(FileExists(p))
+		EditFile(p);
+}
diff --git a/uppsrc/ide/Debuggers/Code.cpp b/uppsrc/ide/Debuggers/Code.cpp
new file mode 100644
index 000000000..40b717ea5
--- /dev/null
+++ b/uppsrc/ide/Debuggers/Code.cpp
@@ -0,0 +1,447 @@
+#include "Debuggers.h"
+
+#ifdef COMPILER_MSC
+
+#define LLOG(x) // LOG(x)
+
+int Pdb::Disassemble(adr_t ip)
+{
+	char out[256];
+	byte code[32];
+	memset(code, 0, 32);
+	int i;
+	for(i = 0; i < 32; i++) {
+		int q = Byte(i + ip);
+		if(q < 0)
+			break;
+		code[i] = q;
+	}
+	int sz = NDisassemble(out, code, ip);
+	if(sz > i)
+		return -1;
+	disas.Add(ip, out, Null);
+	return sz;
+}
+
+void Pdb::Reg(Label& reg, adr_t val)
+{
+	String h = Sprintf("%08X", val);
+	if(h != reg.GetText()) {
+		reg.SetLabel(h);
+		reg.SetInk(LtRed);
+	}
+	else
+		reg.SetInk(SColorText);
+}
+
+bool Pdb::IsValidFrame(adr_t eip)
+{
+	for(int i = 0; i < module.GetCount(); i++) {
+		const ModuleInfo& f = module[i];
+		if(eip >= f.base && eip < f.base + f.size)
+			return true;
+	}
+	return false;
+}
+
+void Pdb::Sync0()
+{
+	stop = false;
+	const CONTEXT& context = threads.Get((int)~threadlist).context;
+	#ifdef CPU_32
+	adr_t eip = context.Eip;
+	adr_t ebp = context.Ebp;
+	#else
+	adr_t eip = context.Rip;
+	adr_t ebp = context.Rbp;
+	#endif
+	adr_t spmax = threads.Get(event.dwThreadId).sp;
+	framelist.Clear();
+	frame.Clear();
+	int ndx = 0;
+	FnInfo fn = GetFnInfo(eip);
+	int c = -1;
+	for(;;) {
+		Frame& f = frame.Add();
+		f.reip = eip;
+		f.rebp = ebp;
+		f.fn = fn;
+		String r;
+		if(IsNull(fn.name)) {
+			r = Sprintf("0x%08x", f.reip);
+			for(int i = 0; i < module.GetCount(); i++) {
+				const ModuleInfo& f = module[i];
+				if(eip >= f.base && eip < f.base + f.size) {
+					r << " (" << GetFileName(f.path) << ")";
+					break;
+				}
+			}
+		}
+		else {
+			GetLocals(eip, ebp, f.param, f.local);
+			r = fn.name;
+			r << '(';
+			for(int i = 0; i < f.param.GetCount(); i++) {
+				if(i)
+					r << ", ";
+				r << f.param.GetKey(i) << "=" << Visualise(f.param[i], 30).GetString();
+			}
+			r << ')';
+			if(c < 0)
+				c = frame.GetCount() - 1;
+		}
+		framelist.Add(frame.GetCount() - 1, r);
+		int q = 0;
+		for(;;) {
+			if(ebp > spmax || ++q > 1024 * 64)
+				goto end;
+			adr_t neip, nebp;
+			if(!Copy(ebp, &nebp, 4))
+				goto end;
+			if(!Copy(ebp + 4, &neip, 4))
+				goto end;
+			if(nebp >= ebp && nebp < spmax && IsValidFrame(neip)) {
+				fn = GetFnInfo(neip);
+				if(!IsNull(fn.name)) {
+					eip = neip;
+					ebp = nebp;
+					break;
+				}
+			}
+			ebp += 4;
+		}
+	}
+end:
+	framelist <<= max(c, 0);
+}
+
+void Pdb::Sync()
+{
+	threadlist.Clear();
+	for(int i = 0; i < threads.GetCount(); i++) {
+		int thid = threads.GetKey(i);
+		AttrText x(Format("0x%x", thid));
+		if(thid == event.dwThreadId)
+			x.font = StdFont().Bold();
+		threadlist.Add(thid, x);
+	}
+	threadlist <<= (int)event.dwThreadId;
+	Sync0();
+	SetFrame();
+	IdeActivateBottom();
+}
+
+void Pdb::SetThread()
+{
+	Sync0();
+	SetFrame();
+	IdeActivateBottom();
+}
+
+void Pdb::SetFrame()
+{
+	int q = ~framelist;
+	if(q >= 0 && q < frame.GetCount()) {
+		Frame& f = frame[q];
+		Image ptrimg = q == 0 ? DbgImg::IpLinePtr() : DbgImg::FrameLinePtr();
+		bool df = disas.HasFocus();
+		FilePos fp = GetFilePos(f.reip);
+		IdeHidePtr();
+		autotext.Clear();
+		if(fp) {
+			IdeSetDebugPos(fp.path, fp.line, ptrimg, 0);
+			autotext = IdeGetLine(fp.line - 1) + ' ' + IdeGetLine(fp.line)
+			           + ' ' + IdeGetLine(fp.line + 1);
+		}
+		if(!disas.InRange(f.reip) || f.fn.name != disas_name) {
+			disas_name = f.fn.name;
+			disas.Clear();
+			adr_t ip = f.fn.address;
+			adr_t h = f.fn.address + f.fn.size;
+			if(f.reip < ip || f.reip >= h) {
+				ip = f.reip;
+				h = ip + 1024;
+			}
+			while(ip < h) {
+				int q = Disassemble(ip);
+				if(q < 0)
+					break;
+				ip += q;
+			}
+		}
+		disas.SetCursor(f.reip);
+		disas.SetIp(f.reip, ptrimg);
+		const CONTEXT& context = threads.Get((int)~threadlist).context;
+		#ifdef CPU_32
+		Reg(regs.eax, context.Eax);
+		Reg(regs.ebx, context.Ebx);
+		Reg(regs.ecx, context.Ecx);
+		Reg(regs.edx, context.Edx);
+		Reg(regs.esi, context.Esi);
+		Reg(regs.edi, context.Edi);
+		Reg(regs.ebp, context.Ebp);
+		Reg(regs.esp, context.Esp);
+		#else
+		Reg(regs.eax, context.Rax);
+		Reg(regs.ebx, context.Rbx);
+		Reg(regs.ecx, context.Rcx);
+		Reg(regs.edx, context.Rdx);
+		Reg(regs.esi, context.Rsi);
+		Reg(regs.edi, context.Rdi);
+		Reg(regs.ebp, context.Rbp);
+		Reg(regs.esp, context.Rsp);
+		#endif
+		if(df)
+			disas.SetFocus();
+		Data();
+	}
+}
+
+bool Pdb::SetBreakpoint(const String& filename, int line, const String& bp)
+{
+	adr_t a = GetAddress(FilePos(filename, line));
+	if(!a)
+		return false;
+	int q = breakpoint.Find(a);
+	if(bp.IsEmpty()) {
+		if(q >= 0) {
+			if(!RemoveBp(a))
+				return false;
+			breakpoint.Remove(q);
+		}
+	}
+	else {
+		if(q < 0) {
+			if(!AddBp(a))
+				return false;
+			breakpoint.Add(a);
+		}
+	}
+	return true;
+}
+
+adr_t Pdb::CursorAdr()
+{
+	adr_t a = disas.HasFocus() ? disas.GetCursor() : GetAddress(FilePos(IdeGetFileName(), IdeGetFileLine()));
+	if(!a)
+		Exclamation("No code at choosen location !");
+	return a;
+}
+
+bool Pdb::RunTo()
+{
+	adr_t a = CursorAdr();
+	if(!a)
+		return false;
+	if(!SingleStep())
+		return false;
+		#ifdef CPU_32
+		if(context.Eip != a) {
+		#else
+		if(context.Rip != a) {
+		#endif
+		SetBreakpoints();
+		AddBp(a);
+		if(!Continue())
+			return false;
+	}
+	Sync();
+	return true;
+}
+
+void Pdb::Run()
+{
+	SingleStep();
+	SetBreakpoints();
+	if(!Continue())
+		return;
+	Sync();
+}
+
+void Pdb::SetIp()
+{
+	adr_t a = CursorAdr();
+	if(!a)
+		return;
+	#ifdef CPU_32
+	context.Eip = a;
+	#else
+	context.Rip = a;
+	#endif
+	WriteContext();
+	frame[0].reip = a;
+	framelist <<= 0;
+	SetFrame();
+}
+
+bool Pdb::Step(bool over)
+{
+	TimeStop ts;
+	#ifdef CPU_32
+	byte b = Byte(context.Eip);
+	byte b1 = (Byte(context.Eip + 1) >> 3) & 7;
+	#else
+	byte b = Byte(context.Rip);
+	byte b1 = (Byte(context.Rip + 1) >> 3) & 7;
+	#endif
+	if(b == 0xe8 || b == 0x9a || b == 0xff && (b1 == 2 || b1 == 3)) {
+		if(over) {
+			int l = 5;
+			if(b != 0xe8) {
+				char out[256];
+				byte code[32];
+				memset(code, 0, 32);
+				for(int i = 0; i < 32; i++) {
+					#ifdef CPU_32
+					int q = Byte(context.Eip + i);
+					#else
+					int q = Byte(context.Rip + i);
+					#endif
+					if(q < 0)
+						break;
+					code[i] = q;
+				}
+				#ifdef CPU_32
+				l = NDisassemble(out, code, context.Eip);
+				#else
+				l = NDisassemble(out, code, context.Rip);
+				#endif
+			}
+			#ifdef CPU_32
+			adr_t bp0 = context.Eip;
+			adr_t bp = context.Eip + l;
+			#else
+			adr_t bp0 = context.Rip;
+			adr_t bp = context.Rip + l;
+			#endif
+			int lvl = 0;
+			Lock();
+			for(;;) {
+				if(!SingleStep()) {
+					Unlock();
+					return false;
+				}
+				SetBreakpoints();
+				if(breakpoint.Find(bp0) < 0)
+					AddBp(bp0);
+				else
+					bp0 = 0;
+				AddBp(bp);
+				if(!Continue()) {
+					Unlock();
+					return false;
+				}
+				#ifdef CPU_32
+				if(context.Eip == bp0)
+				#else
+				if(context.Rip == bp0)
+				#endif
+					lvl++;
+				else
+				#ifdef CPU_32
+				if(context.Eip == bp) {
+				#else
+				if(context.Rip == bp) {
+				#endif
+					if(lvl <= 0) {
+						Unlock();
+						return true;
+					}
+					lvl--;
+				}
+				else {
+					Unlock();
+					return true;
+				}
+				if(ts.Elapsed() > 100)
+					Ctrl::ProcessEvents();
+			}
+		}
+		else {
+			if(!SingleStep())
+				return false;
+			#ifdef CPU_32
+			byte b = Byte(context.Eip);
+			#else
+			byte b = Byte(context.Rip);
+			#endif
+			if(b == 0xeb || b == 0xe9)
+				return SingleStep();
+			return true;
+		}
+	}
+	else
+		return SingleStep();
+}
+
+void Pdb::Trace(bool over)
+{
+	#ifdef CPU_32
+	adr_t ip0 = context.Eip;
+	#else
+	adr_t ip0 = context.Rip;
+	#endif
+	FilePos p0 = GetFilePos(ip0);
+	if(IsNull(p0.path) || disas.HasFocus()) {
+		if(!Step(over))
+			return;
+		Sync();
+		return;
+	}
+	bool locked = false;
+	int n = 0;
+	TimeStop ts;
+	for(;;) {
+		if(ts.Elapsed() > 100) {
+			if(!locked) {
+				Lock();
+				locked = true;
+			}
+			ProcessEvents();
+		}
+		if(!Step(over))
+			break;
+
+		#ifdef CPU_32
+		FilePos p = GetFilePos(context.Eip);
+		if(context.Eip < ip0 || p.path != p0.path || p.line != p0.line || stop) {
+		#else
+		FilePos p = GetFilePos(context.Rip);
+		if(context.Rip < ip0 || p.path != p0.path || p.line != p0.line || stop) {
+		#endif
+			Sync();
+			break;
+		}
+	}
+	if(locked)
+		Unlock();
+}
+
+void Pdb::StepOut()
+{
+	Lock();
+	TimeStop ts;
+	for(;;) {
+		#ifdef CPU_32
+		if(Byte(context.Eip) == 0xc2 || Byte(context.Eip) == 0xc3) {
+		#else
+		if(Byte(context.Rip) == 0xc2 || Byte(context.Rip) == 0xc3) {
+		#endif
+			if(!SingleStep())
+				break;
+			Sync();
+			break;
+		}
+		if(stop) {
+			Sync();
+			break;
+		}
+		if(!Step(true))
+			break;
+		if(ts.Elapsed() > 100)
+			Ctrl::ProcessEvents();
+	}
+	Unlock();
+}
+
+#endif
diff --git a/uppsrc/ide/Debuggers/Data.cpp b/uppsrc/ide/Debuggers/Data.cpp
new file mode 100644
index 000000000..b2f91620d
--- /dev/null
+++ b/uppsrc/ide/Debuggers/Data.cpp
@@ -0,0 +1,542 @@
+#include "Debuggers.h"
+
+#ifdef COMPILER_MSC
+
+#define LLOG(x) // LOG(x)
+
+VectorMap<String, Value> Pdb::DataMap(const ArrayCtrl& a)
+{
+	VectorMap<String, Value> r;
+	for(int i = 0; i < a.GetCount(); i++)
+		r.Add(a.Get(i, 0), a.Get(i, 1));
+	return r;
+}
+
+Value Pdb::Vis(const String& key, const VectorMap<String, Value>& prev, pick_ Visual& vis,
+               bool& ch)
+{
+	int q = prev.Find(key);
+	ch = false;
+	for(int i = 0; i < vis.part.GetCount(); i++) {
+		VisualPart& p = vis.part[i];
+		p.mark = false;
+		if(q >= 0 && IsType<Visual>(prev[q])) {
+			const Visual& v = ValueTo<Visual>(prev[q]);
+			if(v.part.GetCount() == vis.part.GetCount() && v.part[i].text != p.text)
+				ch = p.mark = true;
+		}
+	}
+	return RawPickToValue(vis);
+}
+
+void Pdb::Vis(ArrayCtrl& a, const String& key, const VectorMap<String, Value>& prev,
+              pick_ Visual& vis)
+{
+	bool ch;
+	a.Add(key, Vis(key, prev, vis, ch));
+//	if(ch)
+//		a.SetDisplay(a.GetCount() - 1, 0, Single<RedDisplay>());
+}
+
+void Pdb::Locals()
+{
+	VectorMap<String, Value> prev = DataMap(locals);
+	locals.Clear();
+	int q = ~framelist;
+	if(q >= 0 && q < frame.GetCount()) {
+		Frame& f = frame[q];
+		for(int i = 0; i < f.param.GetCount(); i++)
+			Vis(locals, f.param.GetKey(i), prev, Visualise(f.param[i]));
+		for(int i = 0; i < f.local.GetCount(); i++)
+			Vis(locals, f.local.GetKey(i), prev, Visualise(f.local[i]));
+	}
+}
+
+void Pdb::Watches()
+{
+	VectorMap<String, Value> prev = DataMap(watches);
+	for(int i = 0; i < watches.GetCount(); i++) {
+		bool ch;
+		watches.Set(i, 1, Vis((String)watches.Get(i, 0),
+		            prev, Visualise((String)watches.Get(i, 0)), ch));
+		if(ch)
+			watches.SetDisplay(i, 0, Single<RedDisplay>());
+		else
+			watches.SetDisplay(i, 0, StdDisplay());
+	}
+}
+
+void Pdb::Explore(const Val& val, const VectorMap<String, Value>& prev)
+{
+	const Type& t = GetType(val.type);
+	for(int i = 0; i < t.base.GetCount(); i++) {
+		Val b = t.base[i];
+		b.address += val.address;
+		Vis(explorer, ':' + GetType(b.type).name, prev, Visualise(b));
+	}
+	for(int i = 0; i < t.member.GetCount(); i++) {
+		Val r = t.member[i];
+		r.address += val.address;
+		Vis(explorer, '.' + t.member.GetKey(i), prev, Visualise(r));
+	}
+	for(int i = 0; i < t.static_member.GetCount(); i++)
+		Vis(explorer, "::" + t.static_member.GetKey(i), prev, Visualise(t.static_member[i]));
+}
+
+void Pdb::Explorer()
+{
+	VectorMap<String, Value> prev = DataMap(explorer);
+	explorer.Clear();
+	try {
+		String x = ~expexp;
+		if(!IsNull(x)) {
+			CParser p(x);
+			Val v = Exp(p);
+			Vis(explorer, "=", prev, Visualise(v));
+			if(v.type >= 0 && v.ref == 0 && !v.rvalue)
+				Explore(v, prev);
+			if(v.ref > 0 && GetRVal(v).address)
+				for(int i = 0; i < 20; i++)
+					Vis(explorer, Format("[%d]", i), prev, Visualise(DeRef(Compute(v, RValue(i), '+'))));
+		}
+	}
+	catch(CParser::Error e) {
+		Visual v;
+		v.Cat(e, LtRed);
+		explorer.Add("", RawPickToValue(v));
+	}
+	exback.Enable(exprev.GetCount());
+	exfw.Enable(exnext.GetCount());
+}
+
+void Pdb::Explore(const String& exp)
+{
+	exprev.Add(~expexp);
+	expexp = exp;
+	Explorer();
+	DoExplorer();
+}
+
+String Pdb::GetExpExp()
+{
+	String w;
+	if(explorer.IsCursor()) {
+		w = expexp;
+		for(const char *s = w; *s; s++)
+			if(strchr("*/+-", *s)) {
+				w = '(' + w + ')';
+				break;
+			}
+		String k = (String)explorer.GetKey();
+		if(k != "=")
+			w = w + k;
+	}
+	return w;
+}
+
+void Pdb::ExpExp()
+{
+	if(explorer.GetCursor() > 0)
+		Explore(GetExpExp());
+}
+
+void Pdb::ExplorerTree()
+{
+	SetTree(GetExpExp());
+}
+
+void Pdb::DoExplorer()
+{
+	tab.Set(3);
+	expexp.SetFocus();
+	expexp.SetSelection();
+	Explorer();
+}
+
+void Pdb::ExBack()
+{
+	if(exprev.GetCount()) {
+		exnext.Add(~expexp);
+		expexp <<= exprev.Pop();
+		Explorer();
+	}
+}
+
+void Pdb::ExFw()
+{
+	if(exnext.GetCount()) {
+		exprev.Add(~expexp);
+		expexp <<= exnext.Pop();
+		Explorer();
+	}
+}
+
+void Pdb::ExploreKey(ArrayCtrl *a)
+{
+	if(a && a->IsCursor()) {
+		tab.Set(3);
+		Explore(a->GetKey());
+	}
+}
+
+void Pdb::TryAuto(const String& exp, const VectorMap<String, Value>& prev)
+{
+	if(autos.Find(exp) < 0) {
+		Visual r;
+		try {
+			CParser p(exp);
+			Val v = Exp(p);
+			Visualise(r, v, 2, 20);
+		}
+		catch(CParser::Error) {
+			r.Clear();
+		}
+		if(r.part.GetCount())
+			Vis(autos, exp, prev, r);
+	}
+}
+
+void Pdb::Autos()
+{
+	VectorMap<String, Value> prev = DataMap(autos);
+	autos.Clear();
+	CParser p(autotext);
+	while(!p.IsEof())
+		if(p.IsId()) {
+			String exp = p.ReadId();
+			TryAuto(exp, prev);
+			for(;;) {
+				if(p.Char('.') && p.IsId())
+					exp << '.';
+				else
+				if(p.Char2('-', '>') && p.IsId())
+					exp << "->";
+				else
+					break;
+				exp << p.ReadId();
+				TryAuto(exp, prev);
+			}
+		}
+		else
+			p.SkipTerm();
+	autos.Sort();
+//	MarkChanged(prev, autos);
+}
+
+void Pdb::Data()
+{
+	switch(tab.Get()) {
+	case 0: Autos(); break;
+	case 1: Locals(); break;
+	case 2: Watches(); break;
+	case 3: Explorer(); break;
+	}
+}
+
+void Pdb::TreeNode(int parent, const String& name, Pdb::Val val)
+{
+	NamedVal nv;
+	nv.name = name;
+	nv.val = val;
+	tree.Add(parent, Null, RawToValue(nv), name + "=" + Visualise(val).GetString(), val.type >= 0 || val.ref > 0);
+}
+
+void Pdb::TreeExpand(int node)
+{
+	if(tree.GetChildCount(node))
+		return;
+	const NamedVal& nv = ValueTo<NamedVal>(tree.Get(node));
+	Val val = nv.val;
+	if(nv.val.ref > 0) {
+		val = DeRef(val);
+		if(val.type < 0 || val.ref > 0) {
+			TreeNode(node, '*' + nv.name, val);
+			SaveTree();
+			return;
+		}
+	}
+	if(val.type < 0) {
+		SaveTree();
+		return;
+	}
+	const Type& t = GetType(val.type);
+	if(t.vtbl_typeindex == -2) {
+		int count = GetSymInfo(t.modbase, type.GetKey(val.type), TI_GET_COUNT);
+		Val prtti;
+		prtti.ref = 1;
+		prtti.type = UINT4;
+		prtti.address = val.address - 4;
+		Val rtti = GetRVal(prtti);
+		FnInfo rtf = GetFnInfo(rtti.address);
+		TreeNode(node, rtf.name, prtti);
+		for(int i = 0; i < count; i++) {
+			Val ventry;
+			ventry.type = PFUNC;
+			ventry.address = val.address + 4 * i;
+			TreeNode(node, NFormat("[%d]", i), ventry);
+		}
+		return;
+	}
+	if(t.vtbl_typeindex >= 0) {
+		Val vtbl;
+		vtbl.ref = 1;
+		vtbl.address = val.address + t.vtbl_offset;
+		vtbl.type = t.vtbl_typeindex;
+		TreeNode(node, "virtual", vtbl);
+/*
+		Val vloc = GetRVal(vtbl);
+		FnInfo vtbl_type = GetFnInfo(vloc.address);
+		const char *p = vtbl_type.name, *e = p;
+		while(*e && !(*e == ':' && e[1] == ':'))
+			e++;
+		String fullsym(p, e);
+		FnInfo ffs = GetFnInfo(fullsym);
+		if(ffs.pdbtype) {
+			Val typeval;
+			typeval.address = val.address;
+			TypeVal(typeval, ffs.pdbtype, t.modbase);
+			TreeNode(node, String().Cat() << '[' << ffs.name << ']', typeval);
+		}
+*/
+	}
+	for(int i = 0; i < t.base.GetCount(); i++) {
+		Val r = t.base[i];
+		r.address += val.address;
+		if(r.type >= 0) {
+			const Type& bt = GetType(r.type);
+			TreeNode(node, bt.name, r);
+		}
+	}
+	for(int i = 0; i < t.member.GetCount(); i++) {
+		Val r = t.member[i];
+		r.address += val.address;
+		TreeNode(node, t.member.GetKey(i), r);
+	}
+	for(int i = 0; i < t.static_member.GetCount(); i++) {
+		Val r = t.static_member[i];
+		TreeNode(node, t.static_member.GetKey(i), r);
+	}
+}
+
+String Pdb::StoreTree(int parent)
+{
+	String result;
+	int n = tree.GetChildCount(parent);
+	for(int i = 0; i < n; i++) {
+		int child = tree.GetChild(parent, i);
+		if(tree.IsOpen(child)) {
+			const NamedVal& nv = ValueTo<NamedVal>(tree.Get(child));
+			if(!IsNull(result))
+				result << ';';
+			result << nv.name;
+			String w = StoreTree(child);
+			if(!IsNull(w))
+				result << '{' << w << '}';
+		}
+	}
+	return result;
+}
+
+void Pdb::SaveTree()
+{
+	Value v = tree.Get(0);
+	if(!IsType<NamedVal>(v))
+		return;
+	const NamedVal& nv = ValueTo<NamedVal>(v);
+	if(nv.val.type < 0)
+		return;
+	String w;
+	Point p = tree.GetScroll();
+	w << p.x << ' ' << p.y << ' ' << tree.GetCursor() << ' ' << StoreTree(0);
+	treetype.GetAdd(GetType(nv.val.type).name) = w;
+	LOG("SaveTree " << GetType(nv.val.type).name << ' ' << w);
+}
+
+void Pdb::ExpandTreeType(int parent, CParser& p)
+{
+	for(;;) {
+		String id;
+		if(p.Char('*'))
+			id = "*";
+		if(p.IsId())
+		 	id << p.ReadId();
+		else
+			break;
+		for(;;)
+			if(p.Char('<'))
+				id << '<';
+			else
+			if(p.Char('>'))
+				id << '>';
+			else
+			if(p.Char(','))
+				id << ',';
+			else
+			if(p.IsInt())
+				id << AsString(p.ReadInt());
+			else
+			if(p.IsString())
+				id << '\"' << AsCString(p.ReadString()) << '\"';
+			else
+			if(p.IsId())
+				id << p.ReadId();
+			else
+				break;
+		int n = tree.GetChildCount(parent);
+		for(int i = 0; i < n; i++) {
+			int child = tree.GetChild(parent, i);
+			const NamedVal& nv = ValueTo<NamedVal>(tree.Get(child));
+			if(nv.name == id) {
+				tree.Open(child);
+				if(p.Char('{')) {
+					ExpandTreeType(child, p);
+					p.PassChar('}');
+				}
+				break;
+			}
+		}
+		p.Char(';');
+	}
+}
+
+void Pdb::SetTree(const String& exp)
+{
+	SaveTree();
+	tree.Clear();
+	NamedVal nv;
+	try {
+		CParser p(exp);
+		nv.val = Exp(p);
+	}
+	catch(CParser::Error) {
+		return;
+	}
+	nv.name = exp;
+	String n = exp;
+	if(nv.val.type >= 0)
+		n = GetType(nv.val.type).name;
+	tree.SetRoot(Null, RawToValue(nv), n + '=' + Visualise(nv.val).GetString());
+	if(nv.val.type >= 0) {
+		String w = treetype.Get(n, Null);
+		LOG("SetTree " << n << ' ' << w);
+		tree.Open(0);
+		CParser p(w);
+		try {
+			Point sc;
+			sc.x = p.ReadInt();
+			sc.y = p.ReadInt();
+			int cursor = p.ReadInt();
+			ExpandTreeType(0, p);
+			tree.ScrollTo(sc);
+			if(cursor >= 0)
+				tree.SetCursor(cursor);
+		}
+		catch(CParser::Error) {}
+	}
+}
+
+void Pdb::SetTreeA(ArrayCtrl *array)
+{
+	SetTree(array->Get(0));
+}
+
+void Pdb::MemoryGoto(const String& exp)
+{
+	CParser p(exp);
+	try {
+		Val v = Exp(p);
+		adr_t adr = 0;
+		if(v.ref > 0)
+			adr = GetRVal(v).address;
+		else
+		if(v.rvalue)
+			adr = (adr_t)GetInt(v);
+		else
+			adr = v.address;
+		memory.SetCursor(adr);
+		memory.SetSc(adr);
+		tab.Set(4);
+	}
+	catch(CParser::Error e) {
+		Exclamation("Invalid expression!&" + DeQtf(e));
+	}
+}
+
+
+void Pdb::MemMenu(ArrayCtrl& array, Bar& bar, const String& exp)
+{
+	if(bar.IsScanKeys())
+		return;
+	CParser p(exp);
+	try {
+		Val v = Exp(p);
+		bool sep = true;
+		if(v.ref > 0) {
+			if(sep)
+				bar.Separator();
+			sep = false;
+			bar.Add("Memory at " + exp, THISBACK1(MemoryGoto, exp));
+		}
+		else
+		if(v.rvalue) {
+			if(sep)
+				bar.Separator();
+			sep = false;
+			bar.Add("Memory at 0x" + FormatIntHex((dword)GetInt(v)), THISBACK1(MemoryGoto, "&" + exp));
+		}
+		if(!v.rvalue) {
+			if(sep)
+				bar.Separator();
+			sep = false;
+			bar.Add("Memory at &&" + exp, THISBACK1(MemoryGoto, "&" + exp));
+		}
+	}
+	catch(CParser::Error e) {
+	}
+}
+
+void Pdb::DataMenu(ArrayCtrl& array, Bar& bar, const String& exp)
+{
+	bar.Add("Explore", THISBACK1(ExploreKey, &array));
+	MemMenu(array, bar, exp);
+}
+
+void Pdb::AutosMenu(Bar& bar)
+{
+	DataMenu(autos, bar, autos.GetKey());
+}
+
+void Pdb::LocalsMenu(Bar& bar)
+{
+	DataMenu(locals, bar, locals.GetKey());
+}
+
+void Pdb::WatchesMenu(Bar& bar)
+{
+	String exp = watches.GetKey();
+	if(!IsNull(exp))
+		exp = "(" + exp + ")";
+	DataMenu(watches, bar, exp);
+	bar.Separator();
+	watches.StdBar(bar);
+}
+
+void Pdb::ExplorerMenu(Bar& bar)
+{
+	bar.Add("Explore", THISBACK(ExpExp));
+	MemMenu(watches, bar, GetExpExp());
+}
+
+void Pdb::SetTab(int i)
+{
+	tab.Set(i);
+	Tab();
+}
+
+void Pdb::AddWatch()
+{
+	SetTab(2);
+	watches.DoAppend();
+}
+
+#endif
diff --git a/uppsrc/ide/Debuggers/Dbg.cpp b/uppsrc/ide/Debuggers/Dbg.cpp
new file mode 100644
index 000000000..aeed9b505
--- /dev/null
+++ b/uppsrc/ide/Debuggers/Dbg.cpp
@@ -0,0 +1,235 @@
+#include "Debuggers.h"
+
+#define LLOG(x) // LOG(x)
+
+#define IMAGECLASS DbgImg
+#define IMAGEFILE  <ide/Debuggers/Debuggers.iml>
+#include <Draw/iml_source.h>
+
+const char *FindTag(const char *txt, const char *tag)
+{
+	while(*txt) {
+		const char *q = txt;
+		const char *t = tag;
+		while(*q == *t) {
+			q++;
+			t++;
+			if(*t == '\0') return txt;
+		}
+		txt++;
+	}
+	return NULL;
+}
+
+const char *AfterTag(const char *txt, const char *tag)
+{
+	while(*txt) {
+		const char *q = txt;
+		const char *t = tag;
+		while(*q == *t) {
+			q++;
+			t++;
+			if(*t == '\0') return q;
+		}
+		txt++;
+	}
+	return NULL;
+}
+
+const char *AfterHeading(const char *txt, const char *heading)
+{
+	while(*heading)
+		if(*txt++ != *heading++)
+			return false;
+	return txt;
+}
+
+void RedDisplay::Paint(Draw& w, const Rect& r, const Value& q, Color ink, Color paper, dword s) const {
+	w.DrawRect(r, paper);
+	DrawSmartText(w, r.left, r.top, r.Width(), String(q), StdFont(), LtRed());
+}
+
+VectorMap<String, String> DataMap(const ArrayCtrl& data)
+{
+	VectorMap<String, String> m;
+	for(int i = 0; i < data.GetCount(); i++)
+		m.Add(data.Get(i, 0), data.Get(i, 1));
+	return m;
+}
+
+void MarkChanged(const VectorMap<String, String>& m, ArrayCtrl& data)
+{
+	for(int i = 0; i < data.GetCount(); i++) {
+		int q = m.Find(data.Get(i, 0));
+		if(q >= 0 && m[q] != data.Get(i, 1))
+			data.SetDisplay(i, 1, Single<RedDisplay>());
+		else
+			data.SetDisplay(i, 1, StdDisplay());
+	}
+}
+
+void Dbg::Lock()
+{
+	IdeDebugLock();
+	watches.Disable();
+	locals.Disable();
+	frame.Disable();
+	dlock.Show();
+}
+
+void Dbg::Unlock()
+{
+	if(IdeDebugUnLock()) {
+		watches.Enable();
+		locals.Enable();
+		frame.Enable();
+		dlock.Hide();
+	}
+}
+
+String Dbg::Cmd(const char *command)
+{
+	if(!dbg || !dbg->IsRunning() || IdeIsDebugLock()) return Null;
+#ifdef _DEBUG
+	TimeStop ts;
+#endif
+	Lock();
+	if(command) {
+		LLOG("Cmd: " << command);
+		dbg->Write(String(command) + "\n"); // TRC 04/10/11: must not use \r\n, LINUX doesn't like it
+		PutVerbose(command);
+	}
+	String result;
+	int sleep = 0;
+	while(dbg) {
+		String s;
+		if(!dbg->Read(s)) {
+			LLOG(result);
+			PutVerbose(result);
+			PutVerbose("Debugger terminated");
+			break;
+		}
+		if(!s.IsEmpty() && Result(result, s)) {
+			LLOG(result);
+			PutVerbose(result);
+			break;
+		}
+		GuiSleep(sleep);
+		Ctrl::ProcessEvents();
+		sleep = min(20, sleep + max(1, 3 * sleep / 2));
+	}
+	Unlock();
+#ifdef _DEBUG
+	if(command)
+		LLOG("Time of `" << command <<"` " << ts);
+#endif
+	return result;
+}
+
+String Dbg::FastCmd(const char *command)
+{
+	if(!dbg || !dbg->IsRunning() || IdeIsDebugLock()) return Null;
+	bool lock = false;
+	if(command) {
+		LLOG("FastCmd: " << command);
+		dbg->Write(String(command) + "\n"); // TRC 04/10/20: must not use \r\n as LINUX hates it
+		PutVerbose(command);
+	}
+	String result;
+	TimeStop ts;
+	while(dbg) {
+		String s;
+//		if(!lock)
+			Sleep(0);
+		if(!dbg->Read(s)) {
+			LLOG(result);
+			PutVerbose(result);
+			PutVerbose("dbg terminated");
+			break;
+		}
+		if(!s.IsEmpty() && Result(result, s)) {
+			LLOG(result);
+			LLOG("Result length: " << result.GetLength());
+			if(result.GetLength() < 1000)
+				PutVerbose(result);
+			break;
+		}
+		if(ts.Elapsed() > 4000) {
+			if(!lock) {
+				lock = true;
+				Lock();
+			}
+//			Ctrl::GuiSleep()(20);
+			Ctrl::ProcessEvents();
+		}
+	}
+	if(lock)
+		Unlock();
+#ifdef _DEBUG
+	if(command)
+		LLOG("Time of `" << command <<"` " << ts);
+#endif
+	return result;
+}
+
+void Dbg::Stop()
+{
+	if(dbg && dbg->IsRunning())
+		dbg->Kill();
+}
+
+bool Dbg::IsFinished()
+{
+	return !dbg->IsRunning() && !IdeIsDebugLock();
+}
+
+Dbg::Dbg()
+{
+	CtrlLayout(regs);
+	regs.Height(regs.GetLayoutSize().cy);
+	AddReg("eax", &regs.eax);
+	AddReg("ebx", &regs.ebx);
+	AddReg("ecx", &regs.ecx);
+	AddReg("edx", &regs.edx);
+	AddReg("esi", &regs.esi);
+	AddReg("edi", &regs.edi);
+	AddReg("ebp", &regs.ebp);
+	AddReg("esp", &regs.esp);
+	regs.Color(SColorLtFace);
+	regs.AddFrame(TopSeparatorFrame());
+	regs.AddFrame(RightSeparatorFrame());
+
+	locals.NoHeader();
+	locals.AddColumn("", 1);
+	locals.AddColumn("", 6);
+	watches.NoHeader();
+	watches.AddColumn("", 1).Edit(watchedit);
+	watches.AddColumn("", 6);
+	watches.Inserting().Removing();
+	autos.NoHeader();
+	autos.AddColumn("", 1);
+	autos.AddColumn("", 6);
+	Add(tab.SizePos());
+	tab.Add(watches.SizePos(), "Watches");
+	tab.Add(locals.SizePos(), "Locals");
+	tab.Add(autos.SizePos(), "Autos");
+	Add(frame.HSizePos(200, 0).TopPos(2, EditField::GetStdHeight()));
+	frame.Ctrl::Add(dlock.SizePos());
+	dlock = "  Running..";
+	dlock.SetFrame(BlackFrame());
+	dlock.SetInk(Red);
+	dlock.NoTransparent();
+	dlock.Hide();
+
+	CtrlLayoutOKCancel(quickwatch, "Quick watch");
+	quickwatch.WhenClose = quickwatch.Breaker(IDCANCEL);
+	quickwatch.value.SetReadOnly();
+	quickwatch.value.SetFont(Courier(12));
+	quickwatch.Sizeable().Zoomable();
+	quickwatch.NoCenter();
+	quickwatch.SetRect(0, 150, 300, 400);
+	quickwatch.Icon(DbgImg::QuickWatch());
+
+	Transparent();
+//	log.Open(ConfigFile("debug.log"));
+}
diff --git a/uppsrc/ide/Debuggers/Debug.cpp b/uppsrc/ide/Debuggers/Debug.cpp
new file mode 100644
index 000000000..6f32305a8
--- /dev/null
+++ b/uppsrc/ide/Debuggers/Debug.cpp
@@ -0,0 +1,458 @@
+#include "Debuggers.h"
+
+#ifdef COMPILER_MSC
+
+#define LLOG(x)   // LOG(x)
+
+void Pdb::Error()
+{
+	LLOG("ERROR: " << DeQtf(GetLastErrorMessage()));
+	Exclamation("Error!&" + DeQtf(GetLastErrorMessage()));
+	running = false;
+	Stop();
+}
+
+void Pdb::UnloadModuleSymbols()
+{
+	for(int i = 0; i < module.GetCount(); i++) {
+		ModuleInfo& f = module[i];
+		if(f.symbols) {
+			SymUnloadModule64(hProcess, f.base);
+			LLOG("Unloaded symbols for " << f.path << ' ' << FormatIntHex(module[i].base) << '/' << hProcess);
+		}
+	}
+}
+
+int  Pdb::FindModuleIndex(adr_t base)
+{
+	for(int i = 0; i < module.GetCount(); i++)
+		if(module[i].base == base)
+			return i;
+	return -1;
+}
+
+static Vector<String> test;
+
+BOOL CALLBACK Pdb::EnumGlobals(PSYMBOL_INFO pSym, ULONG SymbolSize, PVOID UserContext)
+{
+//	LocalsCtx& c = *(GlobalsCtx *)UserContext;
+	if(pSym->Tag == SymTagData)
+		test.Add(pSym->Name);
+	return TRUE;
+}
+
+void Pdb::LoadModuleInfo()
+{
+	ModuleInfo f;
+	dword cb = 1;
+	HMODULE  h;
+	if(!EnumProcessModules(hProcess, &h, sizeof(HMODULE), &cb)) {
+		Error();
+		return;
+	}
+	int n = cb / sizeof(HMODULE);
+	Buffer<HMODULE> m(n);
+	if(!EnumProcessModules(hProcess, m, cb, &cb)) {
+		Error();
+		return;
+	}
+	Vector<ModuleInfo> nm;
+	for (int i = 0; i < n; i++) {
+		MODULEINFO mi;
+		if(GetModuleInformation(hProcess, m[i], &mi, sizeof(mi))) {
+			ModuleInfo& f = nm.Add();
+			f.base = (adr_t)mi.lpBaseOfDll;
+			f.size = mi.SizeOfImage;
+			int q = FindModuleIndex(f.base);
+			if(q >= 0) {
+				ModuleInfo& of = module[q];
+				f.path = of.path;
+				f.symbols = of.symbols;
+				of.symbols = false;
+				LLOG("Stable " << FormatIntHex(f.base) << " (" << FormatIntHex(f.size) << "): " << f.path);
+			}
+			else {
+				char name[MAX_PATH];
+				if(GetModuleFileNameEx(hProcess, m[i], name, MAX_PATH)) {
+					f.path = name;
+					if(FileExists(ForceExt(f.path, ".pdb"))) {
+						adr_t w = (adr_t)SymLoadModule64(hProcess, NULL, name, 0, f.base, f.size);
+						if(w) {
+							LLOG("Loading symbols " << FormatIntHex(f.base) << '/' << hProcess << " returned base " << FormatIntHex(w));
+							f.symbols = true;
+						#if 0
+							TimeStop t;
+						    SymEnumSymbols(hProcess, w, 0, &EnumGlobals, 0);
+						#endif
+						}
+					}
+				}
+				LLOG(FormatIntHex(f.base) << " (" << FormatIntHex(f.size) << "): " << f.path);
+			}
+		}
+	}
+	UnloadModuleSymbols();
+	module = nm;
+	refreshmodules = false;
+}
+
+bool Pdb::AddBp(adr_t address)
+{
+	LLOG("AddBp: " << FormatIntHex(address));
+	if(bp_set.Find(address) >= 0)
+		return true;
+	byte prev;
+	if(!ReadProcessMemory(hProcess, (LPCVOID) address, &prev, 1, NULL))
+		return false;
+	byte int3 = 0xcc;
+	if(!WriteProcessMemory(hProcess, (LPVOID) address, &int3, 1, NULL))
+		return false;
+	FlushInstructionCache (hProcess, (LPCVOID)address, 1);
+	bp_set.Put(address, prev);
+	return true;
+}
+
+bool Pdb::RemoveBp(adr_t address)
+{
+	int pos = bp_set.Find(address);
+	if(pos < 0)
+		return true;
+	if(!WriteProcessMemory(hProcess, (LPVOID)address, &bp_set[pos], 1, NULL))
+		return false;
+	FlushInstructionCache(hProcess, (LPCVOID)address, 1);
+	bp_set.Unlink(pos);
+	return true;
+}
+
+bool Pdb::RemoveBp()
+{
+	for(int i = bp_set.GetCount(); --i >= 0;)
+		if(!bp_set.IsUnlinked(i)) {
+			adr_t address = bp_set.GetKey(i);
+			if(!WriteProcessMemory(hProcess, (LPVOID)address, &bp_set[i], 1, NULL))
+				return false;
+			FlushInstructionCache(hProcess, (LPCVOID)address, 1);
+			bp_set.Unlink(i);
+		}
+	bp_set.Clear();
+	return true;
+}
+
+void Pdb::Lock()
+{
+	if(lock == 0) {
+		IdeHidePtr();
+		IdeDebugLock();
+		watches.Disable();
+		locals.Disable();
+		framelist.Disable();
+		dlock.Show();
+		IdeSetBar();
+	}
+	lock++;
+}
+
+void Pdb::Unlock()
+{
+	lock--;
+	if(lock == 0) {
+		IdeDebugUnLock();
+		watches.Enable();
+		locals.Enable();
+		framelist.Enable();
+		dlock.Hide();
+		IdeSetBar();
+	}
+}
+
+void Pdb::AddThread(dword dwThreadId, HANDLE hThread)
+{
+	if(threads.Find(dwThreadId) >= 0)
+		return;
+	CONTEXT ctx;
+	ctx.ContextFlags = CONTEXT_FULL;
+	GetThreadContext(hThread, &ctx);
+	Thread& f = threads.GetAdd(dwThreadId);
+	#ifdef CPU_32
+	f.sp = ctx.Esp;
+	#else
+	f.sp = ctx.Rsp;
+	#endif
+	f.hThread = hThread;
+	LLOG("Adding thread " << dwThreadId << ", Thread SP: " << FormatIntHex(ctx.Esp) << ", handle: " << FormatIntHex((dword)(hThread)));
+}
+
+void Pdb::RemoveThread(dword dwThreadId)
+{
+	int q = threads.Find(dwThreadId);
+	if(q >= 0) {
+		Thread& f = threads[q];
+		LLOG("Closing thread " << dwThreadId << ", handle: " << FormatIntHex((dword)(f.hThread)));
+		CloseHandle(f.hThread);
+		threads.Remove(q);
+	}
+}
+
+#define EXID(id)       { id, #id },
+
+struct {
+	adr_t code;
+	const char *text;
+}
+ex_desc[] = {
+	EXID(EXCEPTION_ACCESS_VIOLATION)
+	EXID(EXCEPTION_ARRAY_BOUNDS_EXCEEDED)
+	EXID(EXCEPTION_DATATYPE_MISALIGNMENT)
+	EXID(EXCEPTION_FLT_DENORMAL_OPERAND)
+	EXID(EXCEPTION_FLT_DIVIDE_BY_ZERO)
+	EXID(EXCEPTION_FLT_INEXACT_RESULT)
+	EXID(EXCEPTION_FLT_INVALID_OPERATION)
+	EXID(EXCEPTION_FLT_OVERFLOW)
+	EXID(EXCEPTION_FLT_STACK_CHECK)
+	EXID(EXCEPTION_FLT_UNDERFLOW)
+	EXID(EXCEPTION_ILLEGAL_INSTRUCTION)
+	EXID(EXCEPTION_IN_PAGE_ERROR)
+	EXID(EXCEPTION_INT_DIVIDE_BY_ZERO)
+	EXID(EXCEPTION_INT_OVERFLOW)
+	EXID(EXCEPTION_INVALID_DISPOSITION)
+	EXID(EXCEPTION_NONCONTINUABLE_EXCEPTION)
+	EXID(EXCEPTION_PRIV_INSTRUCTION)
+	EXID(EXCEPTION_STACK_OVERFLOW )
+};
+
+void Pdb::RestoreForeground()
+{
+	if(hWnd) {
+		SetForegroundWindow(hWnd);
+		LLOG("Restored foreground window: " << FormatIntHex((dword)hWnd));
+	}
+	hWnd = NULL;
+}
+
+void Pdb::SaveForeground()
+{
+	HWND hwnd = GetForegroundWindow();
+	if(hwnd) {
+		DWORD pid;
+		GetWindowThreadProcessId(hwnd, &pid);
+		if(pid == processid) {
+			hWnd = hwnd;
+			LLOG("Saved foreground window: " << FormatIntHex((adr_t)hWnd));
+		}
+	}
+}
+
+bool Pdb::RunToException()
+{
+	LLOG("RUN TO EXCEPTION");
+	TimeStop ts;
+	bool disasfocus = disas.HasFocus();
+	bool locked = false;
+	bool frestored = false;
+	invalidpage.Clear();
+	mempage.Clear();
+	int opn = 0;
+	for(;;) {
+		if(terminated) {
+			if(locked)
+				Unlock();
+			return false;
+		}
+		opn++;
+		if(WaitForDebugEvent(&event, 0)) {
+			opn = 0;
+			running = false;
+			switch(event.dwDebugEventCode) {
+			case EXCEPTION_DEBUG_EVENT: {
+				SaveForeground();
+				const EXCEPTION_RECORD& x = event.u.Exception.ExceptionRecord;
+				if(x.ExceptionCode != EXCEPTION_BREAKPOINT && x.ExceptionCode != EXCEPTION_SINGLE_STEP) {
+					if(event.u.Exception.dwFirstChance) {
+						LLOG("First chance " << FormatIntHex(x.ExceptionCode));
+						break;
+					}
+					String desc = Format("Exception: [* %X] at [* %08X]&",
+					                     (int64)x.ExceptionCode, (int64)x.ExceptionAddress);
+					for(int i = 0; i < __countof(ex_desc); i++)
+						if(ex_desc[i].code == x.ExceptionCode)
+							desc << "[* " << DeQtf(ex_desc[i].text) << "]&";
+					if(x.ExceptionCode == EXCEPTION_ACCESS_VIOLATION) {
+						desc << (x.ExceptionInformation[0] ? "[*@3 writing]" : "[*@4 reading]");
+						desc << Format(" at [* %08X]", (int)x.ExceptionInformation[1]);
+					}
+					PromptOK(desc);// better owner!!!
+				}
+				TopWindow *w = GetTopWindow();
+				if(w && !w->IsForeground()) {
+					LLOG("Setting theide as foreground");
+					GetTopWindow()->SetForeground();
+				}
+				if(disasfocus)
+					disas.SetFocus();
+				if(locked)
+					Unlock();
+				if(refreshmodules)
+					LoadModuleInfo();
+				LLOG("event.dwThreadId = " << event.dwThreadId);
+				for(int i = 0; i < threads.GetCount(); i++) {
+					CONTEXT& c = threads[i].context;
+					c.ContextFlags = CONTEXT_FULL;
+					GetThreadContext(threads[i].hThread, &c);
+					if(event.dwThreadId == threads.GetKey(i))
+						context = c;
+				}
+				if(event.u.Exception.ExceptionRecord.ExceptionCode == EXCEPTION_BREAKPOINT
+				&& bp_set.Find((adr_t)event.u.Exception.ExceptionRecord.ExceptionAddress) >= 0)
+					#ifdef CPU_32
+					context.Eip = (adr_t)event.u.Exception.ExceptionRecord.ExceptionAddress;
+					#else
+					context.Rip = (adr_t)event.u.Exception.ExceptionRecord.ExceptionAddress;
+					#endif
+
+				RemoveBp();
+				LLOG("Exception: " << FormatIntHex(event.u.Exception.ExceptionRecord.ExceptionCode) <<
+				     " at: " << FormatIntHex(event.u.Exception.ExceptionRecord.ExceptionAddress) <<
+				     " first: " << event.u.Exception.dwFirstChance);
+				return true;
+			}
+			case CREATE_THREAD_DEBUG_EVENT:
+				LLOG("Create thread: " << event.dwThreadId);
+				AddThread(event.dwThreadId, event.u.CreateThread.hThread);
+				break;
+			case EXIT_THREAD_DEBUG_EVENT:
+				LLOG("Exit thread: " << event.dwThreadId);
+				RemoveThread(event.dwThreadId);
+				break;
+			case CREATE_PROCESS_DEBUG_EVENT:
+				LLOG("Create process: " << event.dwProcessId);
+				processid = event.dwProcessId;
+				AddThread(event.dwThreadId, event.u.CreateProcessInfo.hThread);
+				CloseHandle(event.u.CreateProcessInfo.hFile);
+				CloseHandle(event.u.CreateProcessInfo.hProcess);
+				break;
+			case EXIT_PROCESS_DEBUG_EVENT:
+				LLOG("Exit process: " << event.dwProcessId);
+				if(locked)
+					Unlock();
+				terminated = true;
+				CleanupOnExit();
+				if(ContinueDebugEvent(event.dwProcessId, event.dwThreadId, DBG_CONTINUE))
+					LLOG("ContinueDebugEvent(EXIT_PROCESS_DEBUG_EVENT) -> OK");
+				else
+					LLOG("ContinueDebugEvent -> " << GetErrorMessage(GetLastError()));
+				return false;
+			case LOAD_DLL_DEBUG_EVENT: {
+				LLOG("Load dll: " << event.u.LoadDll.lpBaseOfDll);
+				CloseHandle(event.u.LoadDll.hFile);
+				refreshmodules = true;
+				break;
+			}
+			case UNLOAD_DLL_DEBUG_EVENT:
+				LLOG("UnLoad dll: " << event.u.UnloadDll.lpBaseOfDll);
+				refreshmodules = true;
+				break;
+			case RIP_EVENT:
+				LLOG("RIP!");
+				Exclamation("Process being debugged died unexpectedly!");
+				terminated = true;
+				if(locked)
+					Unlock();
+				return false;
+			}
+			ContinueDebugEvent(event.dwProcessId, event.dwThreadId, DBG_EXCEPTION_NOT_HANDLED);
+			running = true;
+		}
+		if(ts.Elapsed() > 200) {
+			if(!lock) {
+				Lock();
+				locked = true;
+			}
+			if(!frestored) {
+				RestoreForeground();
+				frestored = true;
+			}
+		}
+		if(lock) {
+			GuiSleep(opn < 1000 ? 0 : 100);
+			Ctrl::ProcessEvents();
+		}
+		else
+			Sleep(opn < 1000 ? 0 : 100);
+	}
+}
+
+const CONTEXT& Pdb::CurrentContext()
+{
+	return threads.Get((int)~threadlist).context;
+}
+
+void Pdb::WriteContext(dword cf)
+{
+	context.ContextFlags = cf;
+	HANDLE hThread = threads.Get(event.dwThreadId).hThread;
+	SetThreadContext(hThread, &context);
+}
+
+bool Pdb::SingleStep()
+{
+	LLOG("SINGLE STEP 0");
+	context.EFlags |= 0x100;
+	WriteContext();
+	running = true;
+	ContinueDebugEvent(event.dwProcessId, event.dwThreadId, DBG_CONTINUE);
+	if(!RunToException())
+		return false;
+	context.EFlags &= ~0x100;
+	WriteContext();
+	return true;
+}
+
+bool Pdb::Continue()
+{
+	running = true;
+	ContinueDebugEvent(event.dwProcessId, event.dwThreadId, DBG_CONTINUE);
+	return RunToException();
+}
+
+void Pdb::SetBreakpoints()
+{
+	RemoveBp();
+	for(int i = 0; i < breakpoint.GetCount(); i++)
+		AddBp(breakpoint[i]);
+}
+
+void Pdb::BreakRunning()
+{
+	stop = true;
+	if(running) {
+		BOOL (WINAPI *debugbreak)(HANDLE Process);
+		debugbreak = (BOOL (WINAPI *)(HANDLE))
+		             GetProcAddress(GetModuleHandle("kernel32.dll"), "DebugBreakProcess");
+		if(debugbreak)
+			(*debugbreak)(hProcess);
+		else
+			for(int i = 0; i < threads.GetCount(); i++) {
+				HANDLE hThread = threads[i].hThread;
+				SuspendThread(hThread);
+				CONTEXT ctx;
+				ctx.ContextFlags = CONTEXT_CONTROL;
+				GetThreadContext(hThread, &ctx);
+				ctx.EFlags |= 0x100;
+				SetThreadContext(hThread, &ctx);
+				GetThreadContext(hThread, &ctx);
+				ResumeThread(hThread);
+			}
+	}
+}
+
+void Pdb::Stop()
+{
+	terminated = true;
+}
+
+bool Pdb::IsFinished()
+{
+	return terminated;
+}
+
+#endif
diff --git a/uppsrc/ide/Debuggers/Debuggers.h b/uppsrc/ide/Debuggers/Debuggers.h
new file mode 100644
index 000000000..e06d4b0a7
--- /dev/null
+++ b/uppsrc/ide/Debuggers/Debuggers.h
@@ -0,0 +1,177 @@
+#ifndef __Debuggers__
+#define __Debuggers__
+
+#include <ide/Common/Common.h>
+
+#include <HexView/HexView.h>
+
+#define  IMAGECLASS DbgImg
+#define  IMAGEFILE  <ide/Debuggers/Debuggers.iml>
+#include <Draw/iml_header.h>
+
+#define  LAYOUTFILE    <ide/Debuggers/Gdb.lay>
+#include <CtrlCore/lay.h>
+
+typedef uintptr_t adr_t;
+
+class DbgDisas : public Ctrl {
+public:
+	virtual void Paint(Draw& w);
+	virtual void Layout();
+	virtual void LeftDown(Point p, dword);
+	virtual void MouseWheel(Point, int zdelta, dword);
+	virtual bool Key(dword key, int);
+	virtual void GotFocus();
+	virtual void LostFocus();
+
+private:
+	Index<adr_t> addr;
+	struct Inst : Moveable<Inst> {
+		String code;
+		String args;
+	};
+
+	ScrollBar    sb;
+	Vector<Inst> inst;
+	Index<adr_t> taddr;
+	int          codecx;
+	adr_t        low, high;
+	int          cursor;
+	int          ip;
+	Image        ipimg;
+
+	Size GetBox() const;
+	void Scroll();
+
+	typedef DbgDisas CLASSNAME;
+
+public:
+	Callback WhenCursor;
+	Callback WhenFocus;
+
+	void  Clear();
+	void  Add(adr_t adr, const String& code, const String& args);
+	void  AddT(adr_t tadr)              { taddr.Add(tadr); }
+
+	void  WriteClipboard();
+
+	void  Set(const String& s);
+	bool  InRange(adr_t adr)            { return addr.Find(adr) >= 0; }
+	void  SetCursor(adr_t adr);
+	adr_t GetCursor() const             { return cursor >= 0 ? addr[cursor] : 0; }
+	void  SetIp(adr_t adr, const Image& img);
+
+	DbgDisas();
+};
+
+struct Dbg : Debugger, ParentCtrl {
+	virtual void Stop();
+	virtual bool IsFinished();
+
+	One<Host>          host;
+	One<SlaveProcess>  dbg;
+
+	FrameBottom<WithRegistersLayout<StaticRect> > regs;
+
+	Vector<String>     regname;
+	Vector<Label *>    reglbl;
+
+	DbgDisas           disas;
+
+	EditString         watchedit;
+	DropList           frame;
+	TabCtrl            tab;
+	ArrayCtrl          locals;
+	ArrayCtrl          watches;
+	ArrayCtrl          autos;
+	Label              dlock;
+
+	WithQuickwatchLayout<TopWindow> quickwatch;
+
+	String             file;
+	int                line;
+	adr_t              addr;
+
+	FileOut            log;
+
+	void      AddReg(const char *reg, Label *lbl) { regname.Add(reg); reglbl.Add(lbl); }
+
+	String    GetHostPath(const String& path)   { return host->GetHostPath(path); }
+	String    GetLocalPath(const String& path)  { return host->GetLocalPath(path); }
+
+	void      Lock();
+	void      Unlock();
+
+	String    Cmd(const char *command);
+	String    FastCmd(const char *command);
+
+	virtual bool      Result(String& result, const String& s) = 0;
+
+	typedef Dbg CLASSNAME;
+
+	Dbg();
+};
+
+struct RedDisplay : public Display {
+	void Paint(Draw& w, const Rect& r, const Value& q,
+	           Color ink, Color paper, dword s) const;
+};
+
+const char *FindTag(const char *txt, const char *tag);
+const char *AfterTag(const char *txt, const char *tag);
+const char *AfterHeading(const char *txt, const char *heading);
+VectorMap<String, String> DataMap(const ArrayCtrl& data);
+void MarkChanged(const VectorMap<String, String>& m, ArrayCtrl& data);
+
+struct Gdb : Dbg {
+	virtual bool Result(String& result, const String& s);
+	virtual void DebugBar(Bar& bar);
+	virtual bool SetBreakpoint(const String& filename, int line, const String& bp);
+	virtual bool RunTo();
+	virtual void Run();
+	virtual bool Key(dword key, int count);
+
+	String          autoline;
+	bool            firstrun;
+
+	bool      TryBreak(const char *command);
+	void      CheckEnd(const char *result);
+
+	void      Step(const char *cmd);
+
+	String    Cmdp(const char *cmdline, bool fr = false);
+
+	void      DoRunTo() { RunTo(); }
+
+	void      SetDisas(const String& text);
+	void      SyncDisas(bool fr);
+
+	void      DisasCursor();
+	void      DisasFocus();
+	void      DropFrames();
+	void      ShowFrame();
+
+
+	String    Print(const String& exp);
+	void      Locals();
+	void      Watches();
+	void      Autos();
+	void      Data();
+
+	void      QuickWatch();
+
+	void      CopyStack();
+	void      CopyDisas();
+
+	bool      Create(One<Host> host, const String& exefile, const String& cmdline);
+
+	typedef Gdb CLASSNAME;
+
+	virtual ~Gdb();
+};
+
+#ifdef COMPILER_MSC
+#include "Pdb.h"
+#endif
+
+#endif
diff --git a/uppsrc/ide/Debuggers/Debuggers.iml b/uppsrc/ide/Debuggers/Debuggers.iml
new file mode 100644
index 000000000..3af647cca
--- /dev/null
+++ b/uppsrc/ide/Debuggers/Debuggers.iml
@@ -0,0 +1,37 @@
+IMAGE_ID(IpLinePtr)
+IMAGE_ID(SetIp)
+IMAGE_ID(QuickWatch)
+IMAGE_ID(FrameLinePtr)
+IMAGE_ID(DisasPtr)
+IMAGE_ID(StepInto)
+IMAGE_ID(StepOver)
+IMAGE_ID(StepOut)
+IMAGE_ID(RunTo)
+IMAGE_ID(Run)
+IMAGE_ID(Stop)
+IMAGE_ID(ExplorerBack)
+IMAGE_ID(ExplorerFw)
+
+IMAGE_BEGIN_DATA
+IMAGE_DATA(120,156,237,90,89,118,131,48,12,244,1,242,209,35,251,104,185,153,155,16,48,150,172,101,100,150,164,52,202,211,107,27)
+IMAGE_DATA(102,70,194,182,132,11,164,91,186,165,82,210,59,173,204,14,227,159,230,112,74,235,47,51,227,20,106,169,186,194,33,152)
+IMAGE_DATA(214,239,247,187,196,153,190,95,220,193,10,249,155,216,142,27,192,182,177,182,219,207,227,115,210,98,218,154,52,178,136,180)
+IMAGE_DATA(152,117,81,69,7,186,181,118,65,128,26,132,195,29,208,144,240,161,248,220,247,24,67,167,48,59,126,176,80,5,126,168)
+IMAGE_DATA(112,59,126,176,144,59,126,34,231,31,46,214,46,151,65,110,155,203,49,118,98,51,120,175,229,199,32,46,62,194,107,63)
+IMAGE_DATA(168,78,203,157,70,121,118,84,67,226,114,13,148,187,148,1,170,33,241,35,57,88,185,143,158,67,132,187,240,183,140,63)
+IMAGE_DATA(215,136,206,191,164,19,229,157,105,111,216,102,110,217,86,130,87,146,178,78,156,207,163,120,159,39,226,249,213,91,195,27)
+IMAGE_DATA(56,130,7,112,21,15,226,42,30,196,197,45,176,152,186,45,75,16,143,234,163,246,197,31,131,31,222,194,146,109,10,191)
+IMAGE_DATA(22,228,198,3,73,137,182,143,70,14,105,228,156,201,192,48,126,153,143,67,92,37,190,165,209,29,227,124,41,134,204,127)
+IMAGE_DATA(254,228,110,243,251,99,148,235,228,175,232,226,88,231,220,188,248,222,49,36,198,38,254,14,249,111,206,239,116,59,242,127)
+IMAGE_DATA(150,204,26,202,203,115,65,138,58,59,19,97,105,148,182,1,208,9,33,19,176,106,172,223,25,220,10,161,147,72,11,172)
+IMAGE_DATA(80,124,223,16,136,166,88,160,70,44,171,200,123,195,242,95,52,250,216,2,23,57,54,16,95,53,224,252,143,227,239,144)
+IMAGE_DATA(191,185,254,62,206,206,186,129,145,131,205,128,115,251,239,240,174,159,3,205,128,115,133,248,102,51,144,48,122,131,81,155)
+IMAGE_DATA(1,200,151,227,115,140,215,160,248,110,33,177,241,46,66,65,112,140,21,159,115,129,130,80,49,91,175,216,8,127,143,43)
+IMAGE_DATA(250,30,141,228,116,187,246,221,204,126,224,99,157,154,22,154,55,193,133,237,128,132,98,15,94,169,186,66,31,224,187,88)
+IMAGE_DATA(116,129,126,119,10,87,223,41,92,187,25,236,107,121,240,190,71,78,214,125,23,125,49,180,60,155,207,22,184,16,79,226)
+IMAGE_DATA(191,190,163,13,75,199,105,250,226,206,70,228,75,121,121,92,157,135,217,40,239,95,218,9,205,160,40,14,113,179,226,128)
+IMAGE_DATA(70,197,150,36,223,24,53,52,8,151,199,118,52,68,220,242,164,17,208,16,185,226,239,32,159,243,70,248,146,6,202,31)
+IMAGE_DATA(201,127,195,248,169,26,32,87,212,8,174,159,78,131,59,192,173,26,138,239,111,31,240,58,29,55,244,100,39,28,252,106)
+IMAGE_DATA(221,188,156,12,60,193,25,248,233,239,250,28,210,199,155,60,52,255,245,13,30,248,13,166,202,3,241,132,23,192,175,118)
+IMAGE_DATA(221,135,230,203,91,31,46,143,189,228,229,242,68,188,255,208,220,197,17,252,95,124,104,254,11,214,178,8,161,0,0,0)
+IMAGE_END_DATA(672, 13)
diff --git a/uppsrc/ide/Debuggers/Debuggers.upp b/uppsrc/ide/Debuggers/Debuggers.upp
new file mode 100644
index 000000000..d557b23b3
--- /dev/null
+++ b/uppsrc/ide/Debuggers/Debuggers.upp
@@ -0,0 +1,27 @@
+description "TheIDE - debuggers";
+
+uses
+	ide\Common,
+	plugin\ndisasm,
+	HexView;
+
+file
+	Debuggers.h,
+	Debuggers.iml,
+	Gdb.lay,
+	Disas.cpp,
+	Dbg.cpp,
+	Gdb.cpp,
+	PDB readonly separator,
+	Pdb.h,
+	cvconst.h,
+	Debug.cpp,
+	Mem.cpp,
+	Sym.cpp,
+	Exp.cpp,
+	Visualise.cpp,
+	Data.cpp,
+	Code.cpp,
+	Pdb.cpp,
+	Pdb.key;
+
diff --git a/uppsrc/ide/Debuggers/Disas.cpp b/uppsrc/ide/Debuggers/Disas.cpp
new file mode 100644
index 000000000..d3fbdb3f3
--- /dev/null
+++ b/uppsrc/ide/Debuggers/Disas.cpp
@@ -0,0 +1,161 @@
+#include "Debuggers.h"
+
+void DbgDisas::MouseWheel(Point, int zdelta, dword)
+{
+	sb.Wheel(zdelta);
+}
+
+Size DbgDisas::GetBox() const
+{
+	return GetTextSize("12345678", Courier(12));
+}
+
+void DbgDisas::Layout()
+{
+	sb.SetPage(GetSize().cy / GetBox().cy);
+}
+
+void DbgDisas::Paint(Draw& w)
+{
+	Size sz = GetSize();
+	Size box = GetBox();
+	int i = sb;
+	int y = 0;
+	while(i < inst.GetCount() && y < sz.cy) {
+		Inst& n = inst[i];
+		Color ink = HasFocus() && i == cursor ? SColorPaper : SColorText;
+		int x = 0;
+		w.DrawRect(0, y, sz.cx, box.cy, i == cursor ? HasFocus() ? SColorHighlight : SColorFace
+		                                            : SColorPaper);
+		if(sz.cx > 3 * box.cx) {
+			w.DrawText(0, y, Sprintf("%08X", addr[i]), Courier(12),
+			           HasFocus() && i == cursor ? SColorPaper
+			                                     : taddr.Find(addr[i]) >= 0 ? LtRed : SColorText);
+			x += box.cx;
+		}
+		if(i == ip)
+			DrawHighlightImage(w, x + 2, y + (box.cy - 12) / 2, ipimg);
+		x += 18;
+		w.DrawText(x, y, n.code, StdFont(), ink);
+		w.DrawText(x + codecx, y, n.args, StdFont(), ink);
+		y += box.cy;
+		i++;
+	}
+	w.DrawRect(0, y, sz.cx, sz.cy, SColorPaper);
+}
+
+void DbgDisas::LeftDown(Point p, dword)
+{
+	SetFocus();
+	cursor = minmax(p.y / GetBox().cy + sb, 0, addr.GetCount() - 1);
+	WhenCursor();
+	Refresh();
+}
+
+bool DbgDisas::Key(dword key, int)
+{
+	int p = GetSize().cy / GetBox().cy;
+	switch(key) {
+	case K_UP:
+		cursor--;
+		break;
+	case K_DOWN:
+		cursor++;
+		break;
+	case K_HOME:
+		cursor = 0;
+		break;
+	case K_END:
+		cursor = INT_MAX;
+		break;
+	case K_PAGEUP:
+		cursor -= p;
+		break;
+	case K_PAGEDOWN:
+		cursor += p;
+		break;
+	default:
+		return false;
+	}
+	cursor = minmax(cursor, 0, addr.GetCount() - 1);
+	sb.ScrollInto(cursor);
+	Refresh();
+	WhenCursor();
+	return true;
+}
+
+void DbgDisas::Clear()
+{
+	low = 0xffffffff;
+	high = 0;
+	cursor = -1;
+	inst.Clear();
+	taddr.Clear();
+	addr.Clear();
+	codecx = GetTextSize("movlmo", StdFont()).cx;
+}
+
+void  DbgDisas::Add(adr_t adr, const String& code, const String& args)
+{
+	if(adr < low)
+		low = adr;
+	if(adr > high)
+		high = adr;
+	addr.Add(adr);
+	Inst& n = inst.Add();
+	n.code = code;
+	n.args = args;
+	sb.SetTotal(inst.GetCount());
+	Refresh();
+	int cx = GetTextSize(n.code, StdFont()).cx;
+	if(cx > codecx)
+		codecx = cx;
+}
+
+void DbgDisas::Scroll()
+{
+	Refresh();
+}
+
+void DbgDisas::SetCursor(adr_t adr)
+{
+	cursor = addr.Find(adr);
+	if(cursor >= 0)
+		sb.ScrollInto(cursor);
+	Refresh();
+}
+
+void DbgDisas::SetIp(adr_t adr, const Image& img)
+{
+	ip = addr.Find(adr);
+	ipimg = img;
+	Refresh();
+}
+
+void DbgDisas::GotFocus()
+{
+	WhenFocus();
+	Refresh();
+}
+
+void DbgDisas::LostFocus()
+{
+	WhenFocus();
+	Refresh();
+}
+
+void DbgDisas::WriteClipboard()
+{
+	String s;
+	for(int i = 0; i < addr.GetCount(); i++)
+		s << Format("%08X  ", (int)addr[i]) << inst[i].code << " " << inst[i].args << "\n";
+	WriteClipboardText(s);
+}
+
+DbgDisas::DbgDisas()
+{
+	SetFrame(InsetFrame());
+	AddFrame(sb);
+	sb.WhenScroll = THISBACK(Scroll);
+	low = high = 0;
+}
diff --git a/uppsrc/ide/Debuggers/Exp.cpp b/uppsrc/ide/Debuggers/Exp.cpp
new file mode 100644
index 000000000..99f1048b5
--- /dev/null
+++ b/uppsrc/ide/Debuggers/Exp.cpp
@@ -0,0 +1,427 @@
+#include "Debuggers.h"
+
+#ifdef COMPILER_MSC
+
+void Pdb::ThrowError(const char *s)
+{
+	throw CParser::Error(s);
+}
+
+int Pdb::SizeOfType(int ti)
+{
+	if(ti >= 0)
+		return GetType(ti).size;
+	switch(ti) {
+	case BOOL1:
+	case SINT1:
+	case UINT1:
+		return 1;
+	case SINT2:
+	case UINT2:
+		return 2;
+	case SINT4:
+	case UINT4:
+	case FLT:
+		return 4;
+	case SINT8:
+	case UINT8:
+	case DBL:
+		return 8;
+	}
+	return 0;
+}
+
+#define READINT(q, type) \
+case q: { \
+	type x; \
+	if(!Copy(v.address, &x, sizeof(x))) \
+		ThrowError("??"); \
+	v.ival = x; \
+	break; \
+} \
+
+#define READFLT(q, type) \
+case q: { \
+	type x; \
+	if(!Copy(v.address, &x, sizeof(x))) \
+		ThrowError("??"); \
+	v.fval = x; \
+	break; \
+} \
+
+Pdb::Val Pdb::GetRVal(Pdb::Val v)
+{
+	if(v.rvalue)
+		return v;
+	v.rvalue = true;
+	if(v.array) {
+		v.array = false;
+		v.ref++;
+	}
+	else
+	if(v.ref) {
+		if(!Copy(v.address, &v.address, 4))
+			ThrowError("??");
+	}
+	else
+	if(v.bitcnt) {
+		dword w;
+		if(!Copy(v.address, &w, 4))
+			ThrowError("??");
+		w = (w >> v.bitpos) & (0xffffffff >> (32 - v.bitcnt));
+		if(v.type == SINT1 || v.type == SINT2 || v.type == SINT4 || v.type == SINT8) {
+			if(w & (1 << (v.bitcnt - 1)))
+				w |= (0xffffffff << v.bitcnt);
+			v.ival = (int32)w;
+		}
+		else
+			v.ival = w;
+	}
+	else
+		switch(v.type) {
+		READINT(BOOL1, bool)
+		READINT(UINT1, byte);
+		READINT(SINT1, int8);
+		READINT(UINT2, uint16);
+		READINT(SINT2, int16);
+		READINT(UINT4, uint32);
+		READINT(SINT4, int32);
+		READINT(UINT8, uint64);
+		READINT(SINT8, int64);
+		READFLT(FLT, float);
+		READFLT(DBL, double);
+		READINT(PFUNC, uint32);
+		case UNKNOWN:
+			break;
+		default:
+			ThrowError("Invalid operand");
+		}
+	return v;
+}
+
+#define GETINT(q, type) case q: return (type)v.ival;
+
+int64 Pdb::GetInt(Pdb::Val v)
+{
+	v = GetRVal(v);
+	switch(v.type) {
+	GETINT(BOOL1, bool)
+	GETINT(UINT1, byte);
+	GETINT(SINT1, int8);
+	GETINT(UINT2, uint16);
+	GETINT(SINT2, int16);
+	GETINT(UINT4, uint32);
+	GETINT(SINT4, int32);
+	GETINT(UINT8, uint64);
+	GETINT(SINT8, int64);
+	case FLT:
+	case DBL:
+		if(v.fval >= _I64_MIN && v.fval <= _I64_MAX)
+			return (int64)v.fval;
+	}
+	ThrowError("Invalid operand");
+	return 0;
+}
+
+#define GETINT(q, type) case q: return (type)v.ival;
+
+double Pdb::GetFlt(Pdb::Val v)
+{
+	v = GetRVal(v);
+	if(v.type == DBL || v.type == FLT)
+		return v.fval;
+	return (double)GetInt(v);
+}
+
+Pdb::Val Pdb::Compute(Pdb::Val v1, Pdb::Val v2, int oper)
+{
+	if(v1.ref) {
+		int q = (int)GetInt(v2) * (v1.ref > 1 ? 4 : SizeOfType(v1.type));
+		v1 = GetRVal(v1);
+		switch(oper) {
+		case '+': v1.address += q; break;
+		case '-': v1.address -= q; break;
+		default: ThrowError("Invalid pointer arithmetics");
+		}
+		return v1;
+	}
+	if(v2.ref) {
+		int q = (int)GetInt(v1) * (v2.ref ? 4 : SizeOfType(v2.type));
+		v2 = GetRVal(v2);
+		if(oper == '+')
+			v2.address += q;
+		else
+			ThrowError("Invalid pointer arithmetics");
+		return v2;
+	}
+	Pdb::Val res;
+	res.type = max(v1.type, v2.type);
+	res.rvalue = true;
+	if(res.type == DBL || res.type == FLT) {
+		double a = GetFlt(v1);
+		double b = GetFlt(v2);
+		switch(oper) {
+		case '+': res.fval = a + b; break;
+		case '-': res.fval = a - b; break;
+		case '*': res.fval = a * b; break;
+		case '/': res.fval = a / b; break;
+		default: ThrowError("Invalid operands for operation");
+		}
+	}
+	else {
+		int64 a = GetInt(v1);
+		int64 b = GetInt(v2);
+		switch(oper) {
+		case '+': res.ival = a + b; break;
+		case '-': res.ival = a - b; break;
+		case '*': res.ival = a * b; break;
+		case '/': res.ival = a / b; break;
+		case '%': res.ival = a % b; break;
+		default: ThrowError("Invalid operands for operation");
+		}
+	}
+	return res;
+}
+
+Pdb::Val Pdb::RValue(int i)
+{
+	Val v;
+	v.rvalue = true;
+	v.ival = i;
+	v.type = i >= -128 && i <= 127 ? SINT1 :
+	         i >= -32768 && i <= 32767 ? SINT2 :
+	         SINT4;
+	return v;
+}
+
+Pdb::Val Pdb::DeRef(Pdb::Val v)
+{
+	if(v.ref <= 0)
+		ThrowError("Only pointer can be dereferenced");
+	v = GetRVal(v);
+	v.ref--;
+	v.rvalue = false;
+	return v;
+}
+
+Pdb::Val Pdb::Ref(Pdb::Val v)
+{
+	if(v.rvalue)
+		ThrowError("R-value cannot be referenced");
+	v.rvalue = true;
+	v.ref++;
+	return v;
+}
+
+Pdb::Val Pdb::Field0(Pdb::Val v, const String& field)
+{
+	Val v1;
+	v1.type = Null;
+	if(v.rvalue || v.ref || v.array || v.type < 0)
+		return v1;
+	const Type& t = GetType(v.type);
+	int q = t.member.Find(field);
+	if(q >= 0) {
+		Val r = t.member[q];
+		r.address += v.address;
+		return r;
+	}
+	q = t.static_member.Find(field);
+	if(q >= 0)
+		return t.static_member[q];
+	for(int i = 0; i < t.base.GetCount(); i++) {
+		v1 = t.base[i];
+		v1.address += v.address;
+		if(v1.type >= 0) {
+			if(GetType(v1.type).name == field)
+				return v1;
+			v1 = Field0(v1, field);
+			if(!IsNull(v1.type))
+				return v1;
+		}
+	}
+	return v1;
+}
+
+Pdb::Val Pdb::Field(Pdb::Val v, const String& field)
+{
+	if(v.type < 0)
+		ThrowError("Must be struct, class or union");
+	v = Field0(v, field);
+	if(IsNull(v.type))
+		ThrowError("Unknown member \'" + field + "\'");
+	return v;
+}
+
+Pdb::Val Pdb::Term(CParser& p)
+{
+	if(p.Char2('0', 'x') || p.Char2('0', 'X'))
+		return RValue(p.ReadNumber(16));
+	if(p.IsChar2('0', '.')) {
+		Val v;
+		v.type = DBL;
+		v.rvalue = true;
+		v.fval = p.ReadDouble();
+		return v;
+	}
+	if(p.Char('0'))
+		return RValue(p.IsNumber() ? p.ReadNumber(8) : 0);
+	if(p.IsNumber()) {
+		double d = p.ReadDouble();
+		if(d >= INT_MIN && d <= INT_MAX && (int)d == d) {
+			return RValue((int)d);
+		}
+		else {
+			Val v;
+			v.type = DBL;
+			v.rvalue = true;
+			v.fval = d;
+			return v;
+		}
+	}
+	if(p.IsChar('\'')) {
+		String s = p.ReadString('\'');
+		if(s.GetLength() != 1)
+			ThrowError("Invalid character literal");
+		return RValue(s[0]);
+	}
+	if(p.Char('(')) {
+		Val v = Exp0(p);
+		p.PassChar(')');
+		return v;
+	}
+	if(!p.IsId())
+		ThrowError("Missing id");
+	String id = p.ReadId();
+	while(p.Char2(':', ':') && p.IsId())
+		id << "::" << p.ReadId();
+	int q = ~framelist;
+	if(q >= 0 && q < frame.GetCount()) {
+		Frame& f = frame[q];
+		q = f.local.Find(id);
+		if(q >= 0)
+			return f.local[q];
+		q = f.param.Find(id);
+		if(q >= 0)
+			return f.param[q];
+		q = f.local.Find("this");
+		if(q >= 0)
+			return Field(DeRef(f.local[q]), id);
+		Val v = GetGlobal(f.fn.name, id);
+		if(v.address)
+			return v;
+	}
+	ThrowError("\'" + id + "\' undefined");
+	return Val();
+}
+
+String ReadType(CParser& p)
+{
+	String t = p.ReadId();
+	if(p.Char('<')) {
+		t << '<';
+		int l = 1;
+		while(l > 0) {
+			if(p.Char('<')) {
+				t << '<';
+				l++;
+			}
+			else
+			if(p.Char('>')) {
+				t << '>';
+				l--;
+			}
+			else
+			if(p.IsNumber())
+				t << p.ReadInt();
+			else
+			if(p.Char(','))
+				t << ',';
+			else
+				t << p.ReadId();
+		}
+	}
+	return t;
+}
+
+Pdb::Val Pdb::Post(CParser& p)
+{
+	Val v = Term(p);
+	for(;;) {
+		if(p.Char(':'))
+			v = Field(v.ref ? DeRef(v) : v, ReadType(p));
+		else
+		if(p.Char('.') || p.Char2(':', ':') || p.Char2('-', '>'))
+			v = Field(v.ref ? DeRef(v) : v, p.ReadId());
+		else
+		if(p.Char('[')) {
+			int i = (int)GetInt(Exp0(p));
+			p.Char(']');
+			v = DeRef(Compute(v, RValue(i), '+'));
+		}
+		else
+			break;
+	}
+	return v;
+}
+
+Pdb::Val Pdb::Unary(CParser& p)
+{
+	if(p.Char('-'))
+		return Compute(RValue(0), Unary(p), '-');
+	if(p.Char('+'))
+		return GetRVal(Unary(p));
+	if(p.Char('*'))
+		return DeRef(Unary(p));
+	if(p.Char('&'))
+		return Ref(Unary(p));
+	return Post(p);
+}
+
+Pdb::Val Pdb::Multiplicative(CParser& p)
+{
+	Val v = Unary(p);
+	for(;;) {
+		if(p.Char('*'))
+			v = Compute(v, Unary(p), '*');
+		else
+		if(p.Char('/'))
+			v = Compute(v, Unary(p), '/');
+		else
+		if(p.Char('%'))
+			v = Compute(v, Unary(p), '%');
+		else
+			break;
+	}
+	return v;
+}
+
+Pdb::Val Pdb::Additive(CParser& p)
+{
+	Val v = Multiplicative(p);
+	for(;;) {
+		if(p.Char('+'))
+			v = Compute(v, Multiplicative(p), '+');
+		else
+		if(p.Char('-'))
+			v = Compute(v, Multiplicative(p), '-');
+		else
+			break;
+	}
+	return v;
+}
+
+Pdb::Val Pdb::Exp0(CParser& p)
+{
+	return Additive(p);
+}
+
+Pdb::Val Pdb::Exp(CParser& p)
+{
+	Pdb::Val v = Exp0(p);
+	if(!p.IsEof())
+		ThrowError("Extra tokens");
+	return v;
+}
+
+#endif
diff --git a/uppsrc/ide/Debuggers/Gdb.cpp b/uppsrc/ide/Debuggers/Gdb.cpp
new file mode 100644
index 000000000..89910c92a
--- /dev/null
+++ b/uppsrc/ide/Debuggers/Gdb.cpp
@@ -0,0 +1,605 @@
+#include "Debuggers.h"
+
+#define PROMPT "<\xcd\xeb>"
+
+bool Gdb::Result(String& result, const String& s)
+{
+	int l = result.GetLength();
+	result.Cat(s);
+	const char *q = FindTag(~result + max(l - 5, 0), PROMPT);
+	if(q) {
+		result.Trim((int)(q - ~result));
+		return true;
+	}
+	return false;
+}
+
+void Gdb::DebugBar(Bar& bar)
+{
+	bar.Add("Stop debugging", THISBACK(Stop))
+	   .Key(K_SHIFT_F5);
+	bar.Separator();
+	bool b = !IdeIsDebugLock();
+	bar.Add(b, "Step into", DbgImg::StepInto(), THISBACK1(Step, disas.HasFocus() ? "stepi"
+	                                                                             : "step"))
+	   .Key(K_F11);
+	bar.Add(b, "Step over", DbgImg::StepOver(), THISBACK1(Step, disas.HasFocus() ? "nexti"
+	                                                                             : "next"))
+	   .Key(K_F10);
+	bar.Add(b, "Step out", DbgImg::StepOut(), THISBACK1(Step, "finish"))
+	   .Key(K_SHIFT_F11);
+	bar.Add(b, "Run to", DbgImg::RunTo(), THISBACK(DoRunTo))
+	   .Key(K_CTRL_F10);
+	bar.Add(b, "Run", DbgImg::Run(), THISBACK(Run))
+	   .Key(K_F5);
+	bar.Separator();
+	bar.Add(b, "Quick watch", THISBACK(QuickWatch))
+	   .Key(K_CTRL_Q);
+	bar.MenuSeparator();
+	bar.Add(b, "Copy backtrace", THISBACK(CopyStack));
+	bar.Add(b, "Copy dissassembly", THISBACK(CopyDisas));
+}
+
+void Gdb::CopyStack()
+{
+	DropFrames();
+	String s;
+	for(int i = 0; i < frame.GetCount(); i++)
+		s << frame.GetValue(i) << "\n";
+	WriteClipboardText(s);
+}
+
+void Gdb::CopyDisas()
+{
+	disas.WriteClipboard();
+}
+
+int CharFilterReSlash(int c)
+{
+	return c == '\\' ? '/' : c;
+}
+
+String Bpoint(Host& host, const String& file, int line)
+{
+	return String().Cat() << Filter(host.GetHostPath(NormalizePath(file)), CharFilterReSlash) << ":" << line + 1;
+}
+
+bool Gdb::TryBreak(const char *text)
+{
+	return FindTag(FastCmd(text), "Breakpoint");
+}
+
+bool Gdb::SetBreakpoint(const String& filename, int line, const String& bp)
+{
+	String bi = Bpoint(*host, filename, line);
+	if(bp.IsEmpty())
+		FastCmd("clear " + bi);
+	else
+		FastCmd("b " + bi);
+	return true;
+}
+
+void Gdb::SetDisas(const String& text)
+{
+	disas.Clear();
+	StringStream ss(text);
+	while(!ss.IsEof()) {
+		String ln = ss.GetLine();
+		CParser p(ln);
+		if(p.Char2('0', 'x')) {
+			dword adr = p.IsNumber(16) ? p.ReadNumber(16) : 0;
+			String code;
+			String args;
+			int level = 0;
+			while(!p.IsEof()) {
+				if(p.Char(':') && level == 0)
+					break;
+				else
+				if(p.Char('<'))
+					level++;
+				else
+				if(p.Char('>'))
+					level--;
+				else
+					p.GetChar();
+			}
+			p.Spaces();
+			if(p.IsId()) {
+				code = p.ReadId();
+				for(;;) {
+					if(p.Spaces())
+						args.Cat(' ');
+					if(p.IsEof())
+						break;
+					if(p.Char2('0', 'x')) {
+						dword adr = 0;
+						if(p.IsNumber(16))
+							adr = p.ReadNumber(16);
+						String fname;
+						bool   usefname = false;
+						if(p.Char('<')) {
+							const char *b = p.GetPtr();
+							int level = 1;
+							usefname = true;
+							while(!p.IsEof()) {
+								if(p.Char('>') && --level == 0) {
+									fname = String(b, p.GetPtr() - 1);
+									break;
+								}
+								if(p.Char('<'))
+									level++;
+								if(p.Char('+'))
+									usefname = false;
+								else {
+									p.GetChar();
+									p.Spaces();
+								}
+							}
+						}
+						args << (usefname ? fname : Sprintf("0x%X", adr));
+						disas.AddT(adr);
+					}
+					else
+					if(p.Id("DWORD"))
+						args.Cat("dword ");
+					else
+					if(p.Id("WORD"))
+						args.Cat("word ");
+					else
+					if(p.Id("BYTE"))
+						args.Cat("byte ");
+					else
+					if(p.Id("PTR"))
+						args.Cat("ptr ");
+					else
+						args.Cat(p.GetChar());
+				}
+			}
+			disas.Add(adr, code, args);
+		}
+	}
+}
+
+void Gdb::SyncDisas(bool fr)
+{
+	if(!disas.IsVisible())
+		return;
+	if(!disas.InRange(addr))
+		SetDisas(FastCmd("disas"));
+	disas.SetCursor(addr);
+	disas.SetIp(addr, fr ? DbgImg::FrameLinePtr() : DbgImg::IpLinePtr());
+	String s = FastCmd("info registers");
+	StringStream ss(s);
+	for(int i = 0; i < reglbl.GetCount(); i++)
+		reglbl[i]->SetInk(SColorText);
+	while(!ss.IsEof()) {
+		String ln = ss.GetLine();
+		CParser p(ln);
+		String name;
+		if(p.IsId()) {
+			name = p.ReadId();
+			if(p.Char2('0', 'x')) {
+				String n = Sprintf("%08X", p.ReadNumber(16));
+				for(int i = 0; i < reglbl.GetCount(); i++) {
+					if(regname[i] == name) {
+						if(reglbl[i]->GetText() != n) {
+							reglbl[i]->SetLabel(n);
+							reglbl[i]->SetInk(LtRed);
+						}
+					}
+				}
+			}
+		}
+	}
+}
+
+String FormatFrame(const char *s)
+{
+	if(*s++ != '#')
+		return Null;
+	while(IsDigit(*s))
+		s++;
+	while(*s == ' ')
+		s++;
+	if(s[0] == '0' && ToUpper(s[1]) == 'X') {
+		s += 2;
+		while(IsXDigit(*s))
+			s++;
+		while(*s == ' ')
+			s++;
+		if(s[0] != 'i' && s[1] != 'n')
+			return Null;
+		s += 2;
+		while(*s == ' ')
+			s++;
+	}
+	if(!IsAlpha(*s))
+		return Null;
+	const char *w = strchr(s, '\r');
+	if(w)
+		return String(s, w);
+	w = strchr(s, '\n');
+	if(w)
+		return String(s, w);
+	return s;
+}
+
+bool ParsePos(const String& s, String& fn, int& line, adr_t & adr)
+{
+	const char *q = FindTag(s, "\x1a\x1a");
+	if(!q) return false;
+	q += 2;
+	Vector<String> p = Split(q + 2, ':');
+	p.SetCount(5);
+	fn = String(q, q + 2) + p[0];
+	line = atoi(p[1]);
+	CParser pa(p[4]);
+	pa.Char2('0', 'x');
+	if(pa.IsNumber(16))
+		adr = pa.ReadNumber(16);
+	return true;
+}
+
+void Gdb::CheckEnd(const char *s)
+{
+	if(!dbg) {
+		Stop();
+		return;
+	}
+	if(FindTag(s, "Program exited normally.")) {
+		Stop();
+		return;
+	}
+	const char *q = FindTag(s, "Program exited with code ");
+	if(q) {
+		PutConsole(q);
+		Stop();
+		return;
+	}
+}
+
+String Gdb::Cmdp(const char *cmdline, bool fr)
+{
+	String s = Cmd(cmdline);
+	if(ParsePos(s, file, line, addr)) {
+		IdeSetDebugPos(GetLocalPath(file), line - 1, fr ? DbgImg::FrameLinePtr()
+		                                                : DbgImg::IpLinePtr(), 0);
+		IdeSetDebugPos(GetLocalPath(file), line - 1,
+		               disas.HasFocus() ? fr ? DbgImg::FrameLinePtr() : DbgImg::IpLinePtr()
+		                                : Image(), 1);
+		SyncDisas(fr);
+		autoline = IdeGetLine(line - 2) + ' ' + IdeGetLine(line - 1) + ' ' + IdeGetLine(line);
+	}
+	else {
+		file = Null;
+		CParser pa(s);
+		pa.Char2('0', 'x');
+		if(pa.IsNumber(16))
+			addr = pa.ReadNumber(16);
+		SyncDisas(fr);
+	}
+	frame.Clear();
+	frame.Add(0, FormatFrame(Cmd("frame")));
+	frame <<= 0;
+	Data();
+	return s;
+}
+
+bool Gdb::RunTo()
+{
+	String bi;
+	bool df = disas.HasFocus();
+	if(df) {
+		if(!disas.GetCursor())
+			return false;
+		bi = Sprintf("*0x%X", disas.GetCursor());
+	}
+	else
+		bi = Bpoint(*host, IdeGetFileName(), IdeGetFileLine());
+	if(!TryBreak("b " + bi)) {
+		Exclamation("No code at chosen location !");
+		return false;
+	}
+	String e = Cmdp(firstrun ? "run" : "continue");
+	firstrun = false;
+	FastCmd("clear " + bi);
+	if(df)
+		disas.SetFocus();
+	CheckEnd(e);
+	IdeActivateBottom();
+	return true;
+}
+
+void Gdb::Run()
+{
+	CheckEnd(Cmdp(firstrun ? "run" : "continue"));
+	firstrun = false;
+	IdeActivateBottom();
+}
+
+void Gdb::Step(const char *cmd)
+{
+	bool b = disas.HasFocus();
+	String s = Cmdp(cmd);
+	if(b) disas.SetFocus();
+	CheckEnd(s);
+	IdeActivateBottom();
+}
+
+void Gdb::DisasCursor()
+{
+	if(!disas.HasFocus())
+		return;
+	int line;
+	String file;
+	adr_t addr;
+	if(ParsePos(FastCmd(Sprintf("info line *0x%X", disas.GetCursor())), file, line, addr))
+		IdeSetDebugPos(file, line - 1, DbgImg::DisasPtr(), 1);
+	disas.SetFocus();
+}
+
+void Gdb::DisasFocus()
+{
+//	if(!disas.HasFocus())
+//		IdeSetDebugPos(file, 0, Null, 1);
+}
+
+void Gdb::DropFrames()
+{
+	int i = 0;
+	int q = ~frame;
+	frame.Clear();
+	for(;;) {
+		String s = FormatFrame(FastCmd(Sprintf("frame %d", i)));
+		if(IsNull(s)) break;
+		frame.Add(i++, s);
+	}
+	frame <<= q;
+}
+
+void Gdb::ShowFrame()
+{
+	int i = (int)~frame;
+	Cmdp(Sprintf("frame %d", i), i);
+}
+
+String DataClean(CParser& p)
+{
+	String r;
+	if(p.Char('{')) {
+		while(!p.IsEof() && !p.Char('}')) {
+			p.Id("static");
+			if(p.Char('<')) {
+				int level = 1;
+				while(level > 0)
+					if(p.Char('<'))
+						level++;
+					else
+					if(p.Char('>'))
+						level--;
+					else
+						p.GetChar();
+				p.Spaces();
+				p.Char('=');
+				String q = DataClean(p);
+				if(!q.IsEmpty()) {
+					if(!r.IsEmpty())
+						r << ", ";
+					r << q;
+				}
+			}
+			else
+			if(p.IsId()) {
+				String id = p.ReadId();
+				p.Char('=');
+				String q = DataClean(p);
+				if(!q.IsEmpty()) {
+					if(!r.IsEmpty())
+						r << ", ";
+					r << id << "=" << q;
+				}
+			}
+			else {
+				p.GetChar();
+				p.Spaces();
+			}
+		}
+		if(!r.IsEmpty() && (*r != '{' || *r.Last() != '}'))
+
+			return '{' + r + '}';
+		return r;
+	}
+	p.Spaces();
+	for(;;) {
+		bool sp = p.Spaces();
+		if(p.IsChar('}') || p.IsChar(',') || p.IsEof())
+			break;
+		if(sp)
+			r << ' ';
+		if(p.IsString())
+			r << AsCString(p.ReadString());
+		else
+			r.Cat(p.GetChar());
+	}
+	return r;
+}
+
+String DataClean(const char *s)
+{
+	CParser p(s);
+	return DataClean(p);
+}
+
+void Gdb::Locals()
+{
+	VectorMap<String, String> prev = DataMap(locals);
+	locals.Clear();
+	String s = FastCmd("info locals");
+	StringStream ss(s);
+	while(!ss.IsEof()) {
+		String ln = ss.GetLine();
+		const char *s = ln;
+		const char *q = strchr(s, '=');
+		if(!q) break;
+		const char *e = q;
+		while(e > s && e[-1] == ' ')
+			e--;
+		q++;
+		while(*q == ' ')
+			q++;
+		locals.Add(String(s, e), DataClean(q));
+	}
+	MarkChanged(prev, locals);
+}
+
+String Gdb::Print(const String& exp)
+{
+	String q = FastCmd("print " + exp);
+	StringStream ss(q);
+	String ln = ss.GetLine();
+	const char *s = strchr(ln, '=');
+	if(s) {
+		s++;
+		while(*s == ' ')
+			s++;
+		return DataClean(s);
+	}
+	else
+		return DataClean(ln);
+}
+
+void Gdb::Watches()
+{
+	VectorMap<String, String> prev = DataMap(watches);
+	for(int i = 0; i < watches.GetCount(); i++)
+		watches.Set(i, 1, Print(watches.Get(i, 0)));
+	MarkChanged(prev, watches);
+}
+
+void Gdb::Autos()
+{
+	VectorMap<String, String> prev = DataMap(autos);
+	autos.Clear();
+	CParser p(autoline);
+	while(!p.IsEof()) {
+		if(p.IsId()) {
+			String exp = p.ReadId();
+			for(;;) {
+				if(p.Char('.') && p.IsId())
+					exp << '.';
+				else
+				if(p.Char2('-', '>') && p.IsId())
+					exp << "->";
+				else
+					break;
+				exp << p.ReadId();
+			}
+			if(autos.Find(exp) < 0) {
+				String val = Print(exp);
+				if(!IsNull(val) && val.Find('(') < 0)
+					autos.Add(exp, val);
+			}
+		}
+		p.SkipTerm();
+	}
+	autos.Sort();
+	MarkChanged(prev, autos);
+}
+
+void Gdb::QuickWatch()
+{
+	for(;;) {
+		int q = quickwatch.Run();
+		if(q == IDCANCEL)
+			break;
+		FastCmd("set print pretty on");
+		String s = FastCmd("p " + (String)~quickwatch.expression);
+		const char *a = strchr(s, '=');
+		if(a) {
+			a++;
+			while(*a == ' ')
+				a++;
+			quickwatch.value <<= a;
+			quickwatch.expression.AddHistory();
+		}
+		else
+			quickwatch.value <<= s;
+		FastCmd("set print pretty off");
+	}
+	quickwatch.Close();
+}
+
+void Gdb::Data()
+{
+	switch(tab.Get()) {
+	case 0: Watches(); break;
+	case 1: Locals(); break;
+	case 2: Autos(); break;
+	}
+}
+
+bool Gdb::Key(dword key, int count)
+{
+	if(key >= 32 && key < 65535 && tab.Get() == 2) {
+		watches.DoInsertAfter();
+		Ctrl* f = GetFocusCtrl();
+		if(f && watches.HasChildDeep(f))
+			f->Key(key, count);
+		return true;
+	}
+	return Ctrl::Key(key, count);
+}
+
+bool Gdb::Create(One<Host> _host, const String& exefile, const String& cmdline)
+{
+	host = _host;
+	dbg = host->StartProcess("gdb " + GetHostPath(exefile));
+	if(!dbg) {
+		Exclamation("Error invoking gdb !");
+		return false;
+	}
+	IdeSetBottom(*this);
+	IdeSetRight(disas);
+
+	disas.AddFrame(regs);
+	disas.WhenCursor = THISBACK(DisasCursor);
+	disas.WhenFocus = THISBACK(DisasFocus);
+	frame.WhenDrop = THISBACK(DropFrames);
+	frame <<= THISBACK(ShowFrame);
+
+	watches.WhenAcceptEdit = THISBACK(Data);
+	tab <<= THISBACK(Data);
+
+	Cmd("set prompt " PROMPT);
+	Cmd("set disassembly-flavor intel");
+	Cmd("set exec-done-display off");
+	Cmd("set annotate 1");
+	Cmd("set height 0");
+	Cmd("set width 0");
+	Cmd("set confirm off");
+	Cmd("set print asm-demangle");
+
+	if(!IsNull(cmdline))
+		Cmd("set args " + cmdline);
+
+
+	firstrun = true;
+
+	return true;
+}
+
+Gdb::~Gdb()
+{
+	IdeRemoveBottom(*this);
+	IdeRemoveRight(disas);
+}
+
+One<Debugger> GdbCreate(One<Host> host, const String& exefile, const String& cmdline)
+{
+	Gdb *dbg = new Gdb;
+	if(!dbg->Create(host, exefile, cmdline)) {
+		delete dbg;
+		return NULL;
+	}
+	return dbg;
+}
diff --git a/uppsrc/ide/Debuggers/Gdb.lay b/uppsrc/ide/Debuggers/Gdb.lay
new file mode 100644
index 000000000..b2368132c
--- /dev/null
+++ b/uppsrc/ide/Debuggers/Gdb.lay
@@ -0,0 +1,26 @@
+LAYOUT(RegistersLayout, 224, 88)
+	ITEM(Label, dv___0, SetLabel(t_("EAX")).LeftPosZ(4, 26).TopPosZ(4, 19))
+	ITEM(Label, eax, SetLabel(t_("00000000")).SetFont(ScreenFixed(11)).LeftPosZ(33, 72).TopPosZ(4, 19))
+	ITEM(Label, dv___2, SetLabel(t_("EBX")).LeftPosZ(4, 26).TopPosZ(24, 19))
+	ITEM(Label, ebx, SetLabel(t_("00000000")).SetFont(ScreenFixed(11)).LeftPosZ(33, 72).TopPosZ(24, 19))
+	ITEM(Label, dv___4, SetLabel(t_("ECX")).LeftPosZ(4, 26).TopPosZ(44, 19))
+	ITEM(Label, ecx, SetLabel(t_("00000000")).SetFont(ScreenFixed(11)).LeftPosZ(33, 72).TopPosZ(44, 19))
+	ITEM(Label, dv___6, SetLabel(t_("EDX")).LeftPosZ(4, 26).TopPosZ(64, 19))
+	ITEM(Label, edx, SetLabel(t_("00000000")).SetFont(ScreenFixed(11)).LeftPosZ(33, 72).TopPosZ(64, 19))
+	ITEM(Label, dv___8, SetLabel(t_("ESI")).LeftPosZ(120, 26).TopPosZ(4, 19))
+	ITEM(Label, esi, SetLabel(t_("00000000")).SetFont(ScreenFixed(11)).LeftPosZ(148, 72).TopPosZ(4, 19))
+	ITEM(Label, dv___10, SetLabel(t_("EDI")).LeftPosZ(120, 26).TopPosZ(24, 19))
+	ITEM(Label, edi, SetLabel(t_("00000000")).SetFont(ScreenFixed(11)).LeftPosZ(148, 72).TopPosZ(24, 19))
+	ITEM(Label, dv___12, SetLabel(t_("EBP")).LeftPosZ(120, 26).TopPosZ(44, 19))
+	ITEM(Label, ebp, SetLabel(t_("00000000")).SetFont(ScreenFixed(11)).LeftPosZ(148, 72).TopPosZ(44, 19))
+	ITEM(Label, dv___14, SetLabel(t_("ESP")).LeftPosZ(120, 26).TopPosZ(64, 19))
+	ITEM(Label, esp, SetLabel(t_("00000000")).SetFont(ScreenFixed(11)).LeftPosZ(148, 72).TopPosZ(64, 19))
+END_LAYOUT
+
+LAYOUT(QuickwatchLayout, 400, 200)
+	ITEM(WithDropChoice<EditString>, expression, HSizePosZ(4, 72).TopPosZ(4, 19))
+	ITEM(Button, ok, SetLabel(t_("Evaluate")).RightPosZ(4, 64).TopPosZ(4, 20))
+	ITEM(LineEdit, value, HSizePosZ(4, 4).VSizePosZ(28, 4))
+	ITEM(Button, cancel, RightPosZ(4, 28).BottomPosZ(-32, 16))
+END_LAYOUT
+
diff --git a/uppsrc/ide/Debuggers/Mem.cpp b/uppsrc/ide/Debuggers/Mem.cpp
new file mode 100644
index 000000000..8ec8d9f89
--- /dev/null
+++ b/uppsrc/ide/Debuggers/Mem.cpp
@@ -0,0 +1,70 @@
+#include "Debuggers.h"
+
+#ifdef COMPILER_MSC
+
+#define LLOG(x) // LOG(x)
+
+int    Pdb::Byte(adr_t addr)
+{
+	int page = (int) (addr >> 10);
+	if(invalidpage.Find(page) >= 0)
+		return -1;
+	int pos = (int) (addr & 1023);
+	int q = mempage.Find(page);
+	if(q >= 0)
+		return (byte)mempage[q].data[pos];
+	if(mempage.GetCount() > 1024)
+		mempage.Clear();
+	byte data[1024];
+	if(ReadProcessMemory(hProcess, (LPCVOID) (addr & ~1023), data, 1024, NULL)) {
+		memcpy(mempage.Add(page).data, data, 1024);
+		return (byte)data[pos];
+	}
+	LLOG("ReadProcessMemory: " << GetLastErrorMessage());
+	invalidpage.Add(page);
+	return -1;
+}
+
+bool    Pdb::Copy(adr_t addr, void *ptr, int count)
+{
+	byte *s = (byte *)ptr;
+	while(count--) {
+		int q = Byte(addr++);
+		if(q < 0)
+			return false;
+		*s++ = (byte)q;
+	}
+	return true;
+}
+
+String Pdb::ReadString(adr_t addr, int maxlen)
+{
+	String r;
+	while(r.GetLength() < maxlen) {
+		int q = Byte(addr++);
+		if(q <= 0)
+			break;
+		r.Cat(q);
+	}
+	return r;
+}
+
+WString Pdb::ReadWString(adr_t addr, int maxlen)
+{
+	WString r;
+	while(r.GetLength() < maxlen) {
+		int q = Byte(addr++);
+		if(q < 0)
+			break;
+		int w = Byte(addr++);
+		if(w < 0)
+			break;
+		w = MAKEWORD(q, w);
+		if(w == 0)
+			break;
+		r.Cat(w);
+	}
+	return r;
+}
+
+#endif
diff --git a/uppsrc/ide/Debuggers/Pdb.cpp b/uppsrc/ide/Debuggers/Pdb.cpp
new file mode 100644
index 000000000..f91a89c04
--- /dev/null
+++ b/uppsrc/ide/Debuggers/Pdb.cpp
@@ -0,0 +1,301 @@
+#include "Debuggers.h"
+
+#ifdef COMPILER_MSC
+
+#pragma comment(lib, "DbgHelp.lib")
+#pragma comment(lib, "psapi.lib")
+
+#define LLOG(x) // LOG(x)
+
+#define KEYGROUPNAME "PdbDebugger"
+#define KEYNAMESPACE PdbKeys
+#define KEYFILE      <ide/Debuggers/Pdb.key>
+#include             <CtrlLib/key_source.h>
+
+using namespace PdbKeys;
+
+void Pdb::DebugBar(Bar& bar)
+{
+	bar.Add(AK_STOP, THISBACK(Stop));
+	bool b = !IdeIsDebugLock();
+	bar.Separator();
+	bar.Add(b, AK_STEPINTO, DbgImg::StepInto(), THISBACK1(Trace, false));
+	bar.Add(b, AK_STEPOVER, DbgImg::StepOver(), THISBACK1(Trace, true));
+	bar.Add(b, AK_STEPOUT, DbgImg::StepOut(), THISBACK(StepOut));
+	bar.Add(b, AK_RUNTO, DbgImg::RunTo(), THISBACK(DoRunTo));
+	bar.Add(b, AK_RUN, DbgImg::Run(), THISBACK(Run));
+	bar.Add(b, AK_SETIP, DbgImg::SetIp(), THISBACK(SetIp));
+	bar.Add(!b, AK_STOP, DbgImg::Stop(), THISBACK(BreakRunning));
+	bar.MenuSeparator();
+	bar.Add(b, AK_AUTOS, THISBACK1(SetTab, 0));
+	bar.Add(b, AK_LOCALS, THISBACK1(SetTab, 1));
+	bar.Add(b, AK_WATCHES, THISBACK1(SetTab, 2));
+	bar.Add(b, AK_ADDWATCH, THISBACK(AddWatch));
+	bar.Add(b, AK_EXPLORER, THISBACK(DoExplorer));
+	bar.Add(b, AK_MEMORY, THISBACK1(SetTab, 4));
+	bar.MenuSeparator();
+	bar.Add(b, "Copy backtrace", THISBACK(CopyStack));
+	bar.Add(b, "Copy dissassembly", THISBACK(CopyDisas));
+}
+
+void Pdb::Tab()
+{
+	switch(tab.Get()) {
+	case 0: autos.SetFocus(); break;
+	case 1: locals.SetFocus(); break;
+	case 2: watches.SetFocus(); break;
+	case 3: explorer.SetFocus(); break;
+	case 4: memory.SetFocus(); break;
+	}
+	Data();
+}
+
+bool Pdb::Key(dword key, int count)
+{
+	if(key >= 32 && key < 65535 && tab.Get() == 2) {
+		watches.DoInsertAfter();
+		Ctrl* f = GetFocusCtrl();
+		if(f && watches.HasChildDeep(f))
+			f->Key(key, count);
+		return true;
+	}
+	if(key == K_ENTER && expexp.HasFocus()) {
+		Explore(~expexp);
+		return true;
+	}
+	return Ctrl::Key(key, count);
+}
+
+#define CONFIGNAME "pdb debugger"
+
+void Pdb::Serialize(Stream& s)
+{
+	int version = 0;
+	s / version;
+	memory.SerializeSettings(s);
+	s % split;
+}
+
+INITBLOCK
+{
+	RegisterGlobalConfig(CONFIGNAME);
+}
+
+bool Pdb::Create(One<Host> local, const String& exefile, const String& cmdline)
+{
+	STARTUPINFO si;
+	ZeroMemory(&si, sizeof(STARTUPINFO));
+	si.cb = sizeof(STARTUPINFO);
+	si.dwFlags = 0;
+	String cl;
+	if(exefile.Find(' ') >= 0)
+		cl << '\"' << exefile << '\"';
+	else
+		cl << exefile;
+	if(!IsNull(cmdline))
+		cl << ' ' << cmdline;
+	Buffer<char> cmd(cl.GetLength() + 1);
+	memcpy(cmd, cl, cl.GetLength() + 1);
+	PROCESS_INFORMATION pi;
+	ZeroMemory(&pi, sizeof(PROCESS_INFORMATION));
+	Buffer<char> env(local->GetEnvironment().GetCount() + 1);
+	memcpy(env, ~local->GetEnvironment(), local->GetEnvironment().GetCount() + 1);
+	bool h = CreateProcess(exefile, cmd, NULL, NULL, TRUE,
+	                       NORMAL_PRIORITY_CLASS|CREATE_NEW_CONSOLE|DEBUG_ONLY_THIS_PROCESS,
+	                       ~env, NULL, &si, &pi);
+	if(!h) {
+		Exclamation("Error creating process&[* " + DeQtf(exefile) + "]");
+		return false;
+	}
+	hProcess = pi.hProcess;
+	CloseHandle(pi.hThread);
+
+	IdeSetBottom(*this);
+	IdeSetRight(disas);
+
+	LoadFromGlobal(*this, CONFIGNAME);
+
+	if(!SymInitialize(hProcess, 0, FALSE)) {
+		Error();
+		return false;
+	}
+	SymSetOptions(SYMOPT_LOAD_LINES|SYMOPT_UNDNAME|SYMOPT_NO_UNQUALIFIED_LOADS);
+
+	lock = 0;
+	stop = false;
+	refreshmodules = true;
+	terminated = false;
+
+	running = true;
+
+	RunToException();
+//	Sync();
+
+	return true;
+}
+
+Pdb::Pdb()
+{
+	hProcess = INVALID_HANDLE_VALUE;
+
+	CtrlLayout(regs);
+	regs.Height(regs.GetLayoutSize().cy);
+	AddReg("eax", &regs.eax);
+	AddReg("ebx", &regs.ebx);
+	AddReg("ecx", &regs.ecx);
+	AddReg("edx", &regs.edx);
+	AddReg("esi", &regs.esi);
+	AddReg("edi", &regs.edi);
+	AddReg("ebp", &regs.ebp);
+	AddReg("esp", &regs.esp);
+	regs.Color(SColorLtFace);
+	regs.AddFrame(TopSeparatorFrame());
+	regs.AddFrame(RightSeparatorFrame());
+
+	locals.NoHeader();
+	locals.AddColumn("", 1);
+	locals.AddColumn("", 6).SetDisplay(Single<VisualDisplay>());
+	locals.WhenEnterRow = THISBACK1(SetTreeA, &locals);
+	locals.WhenBar = THISBACK(LocalsMenu);
+	locals.WhenLeftDouble = THISBACK1(ExploreKey, &locals);
+
+	watches.NoHeader();
+	watches.AddColumn("", 1).Edit(watchedit);
+	watches.AddColumn("", 6).SetDisplay(Single<VisualDisplay>());
+	watches.Inserting().Removing();
+	watches.WhenEnterRow = THISBACK1(SetTreeA, &watches);
+	watches.WhenBar = THISBACK(WatchesMenu);
+	watches.WhenLeftDouble = THISBACK1(ExploreKey, &watches);
+
+	autos.NoHeader();
+	autos.AddColumn("", 1);
+	autos.AddColumn("", 6).SetDisplay(Single<VisualDisplay>());
+	autos.WhenEnterRow = THISBACK1(SetTreeA, &autos);
+	autos.WhenBar = THISBACK(AutosMenu);
+	autos.WhenLeftDouble = THISBACK1(ExploreKey, &autos);
+
+	int c = EditField::GetStdHeight();
+	explorer.AddColumn("", 1);
+	explorer.AddColumn("", 6).SetDisplay(Single<VisualDisplay>());
+	explorer_pane.Add(exback.LeftPos(0, c).TopPos(0, c));
+	explorer_pane.Add(exfw.LeftPos(c + 2, c).TopPos(0, c));
+	explorer_pane.Add(expexp.HSizePos(2 * c + 4).TopPos(0, c));
+	explorer_pane.Add(explorer.HSizePos().VSizePos(EditField::GetStdHeight(), 0));
+	explorer.NoHeader();
+	explorer.WhenEnterRow = THISBACK(ExplorerTree);
+	explorer.WhenLeftDouble = THISBACK(ExpExp);
+	explorer.WhenBar = THISBACK(ExplorerMenu);
+
+	exback.SetImage(DbgImg::ExplorerBack());
+	exback <<= THISBACK(ExBack);
+	exfw.SetImage(DbgImg::ExplorerFw());
+	exfw <<= THISBACK(ExFw);
+	exback.Disable();
+	exfw.Disable();
+
+	tab.Add(autos.SizePos(), "Autos");
+	tab.Add(locals.SizePos(), "Locals");
+	tab.Add(watches.SizePos(), "Watches");
+	tab.Add(explorer_pane.SizePos(), "Explorer");
+	memory.cdb = this;
+	tab.Add(memory.SizePos(), "Memory");
+
+	dlock = "  Running..";
+	dlock.SetFrame(BlackFrame());
+	dlock.SetInk(Red);
+	dlock.NoTransparent();
+	dlock.Hide();
+	framelist.Ctrl::Add(dlock.SizePos());
+
+	pane.Add(tab.SizePos());
+	pane.Add(threadlist.LeftPosZ(320, 60).TopPos(2, EditField::GetStdHeight()));
+	pane.Add(framelist.HSizePosZ(384, 0).TopPos(2, EditField::GetStdHeight()));
+	split.Horz(pane, tree.SizePos());
+	split.SetPos(8000);
+	Add(split);
+
+	disas.AddFrame(regs);
+	disas.WhenCursor = THISBACK(DisasCursor);
+	disas.WhenFocus = THISBACK(DisasFocus);
+
+	memory.WhenGoto = THISBACK(MemoryGoto);
+
+	tab <<= THISBACK(Tab);
+
+	framelist <<= THISBACK(SetFrame);
+	threadlist <<= THISBACK(SetThread);
+
+	watches.WhenAcceptEdit = THISBACK(Data);
+	tab <<= THISBACK(Data);
+
+	tree.WhenOpen = THISBACK(TreeExpand);
+
+	FileIn in(CommonPath("TreeTypes.txt"));
+	while(!in.IsEof()) {
+		String type = in.GetLine();
+		String desc = in.GetLine();
+		treetype.Add(type, desc);
+	}
+}
+
+void Pdb::CleanupOnExit()
+{
+	if(hProcess != INVALID_HANDLE_VALUE) {
+		while(threads.GetCount())
+			RemoveThread(threads.GetKey(0));
+		UnloadModuleSymbols();
+		SymCleanup(hProcess);
+		CloseHandle(hProcess);
+		hProcess = INVALID_HANDLE_VALUE;
+	}
+}
+
+void Pdb::CopyStack()
+{
+	String s;
+	for(int i = 0; i < framelist.GetCount(); i++)
+		s << framelist.GetValue(i) << "\n";
+	WriteClipboardText(s);
+}
+
+void Pdb::CopyDisas()
+{
+	disas.WriteClipboard();
+}
+
+Pdb::~Pdb()
+{
+	SaveTree();
+	String fn = CommonPath("TreeTypes.txt");
+	FileOut out(fn);
+	for(int i = 0; i < treetype.GetCount(); i++)
+		out << treetype.GetKey(i) << "\r\n" << treetype[i] << "\r\n";
+	if(hProcess != INVALID_HANDLE_VALUE) {
+		if(!running)
+			ContinueDebugEvent(event.dwProcessId, event.dwThreadId, DBG_CONTINUE);
+		TerminateProcess(hProcess, -1);
+		do {
+			if(!WaitForDebugEvent(&event, INFINITE))
+				break;
+			if(!ContinueDebugEvent(event.dwProcessId, event.dwThreadId, DBG_CONTINUE))
+				break;
+		}
+		while(event.dwDebugEventCode != EXIT_PROCESS_DEBUG_EVENT);
+		CleanupOnExit();
+	}
+	StoreToGlobal(*this, CONFIGNAME);
+	IdeRemoveBottom(*this);
+	IdeRemoveRight(disas);
+}
+
+One<Debugger> PdbCreate(One<Host> host, const String& exefile, const String& cmdline)
+{
+	Pdb *dbg = new Pdb;
+	if(!dbg->Create(host, exefile, cmdline)) {
+		delete dbg;
+		return NULL;
+	}
+	return dbg;
+}
+
+#endif
diff --git a/uppsrc/ide/Debuggers/Pdb.h b/uppsrc/ide/Debuggers/Pdb.h
new file mode 100644
index 000000000..fb1125dd7
--- /dev/null
+++ b/uppsrc/ide/Debuggers/Pdb.h
@@ -0,0 +1,349 @@
+#include <WinVer.h>
+#include <DbgHelp.h>
+#include <psapi.h>
+#include "cvconst.h"
+
+#include <plugin/ndisasm/ndisasm.h>
+
+#define KEYGROUPNAME "Pdb debugger"
+#define KEYNAMESPACE PdbKeys
+#define KEYFILE      <ide/Debuggers/Pdb.key>
+#include             <CtrlLib/key_header.h>
+
+using namespace PdbKeys;
+
+struct Pdb : Debugger, ParentCtrl {
+	virtual void Stop();
+	virtual bool IsFinished();
+	virtual bool Key(dword key, int count);
+	virtual void DebugBar(Bar& bar);
+	virtual bool SetBreakpoint(const String& filename, int line, const String& bp);
+	virtual bool RunTo();
+	virtual void Run();
+	virtual void Serialize(Stream& s);
+
+	struct ModuleInfo : Moveable<ModuleInfo> {
+		adr_t  base;
+		dword  size;
+		String path;
+		bool   symbols;
+
+		ModuleInfo() { base = size = 0; symbols = false; }
+	};
+
+	struct FilePos {
+		String path;
+		int    line;
+		adr_t  address;
+
+		operator bool() const                   { return !IsNull(path); }
+
+		FilePos() {}
+		FilePos(const String& p, int l) : path(p), line(l) {}
+	};
+
+	struct MemPg : Moveable<MemPg> {
+		char data[1024];
+	};
+
+	struct CdbHexView : HexView {
+		Pdb *cdb;
+
+		virtual int Byte(int64 addr)            { return cdb->Byte((adr_t)addr); }
+
+		CdbHexView()                            { SetTotal(0x80000000); }
+	}
+	memory;
+
+	struct FnInfo {
+		String name;
+		adr_t  address;
+		dword  size;
+		dword  pdbtype;
+
+		FnInfo() { address = size = pdbtype = 0; }
+	};
+
+	struct Val : Moveable<Val> {
+		int    type;
+		int    ref;
+		bool   array:1;
+		bool   rvalue:1;
+		byte   bitpos;
+		byte   bitcnt;
+		union {
+			adr_t  address;
+			int64  ival;
+			double fval;
+		};
+
+		Val() { rvalue = false; ref = 0; array = false; bitcnt = 0; address = 0; }
+	};
+
+	struct NamedVal : Moveable<NamedVal> {
+		String name;
+		Val    val;
+	};
+
+	enum { UNKNOWN = -99, BOOL1, SINT1, UINT1, SINT2, UINT2, SINT4, UINT4, SINT8, UINT8, FLT, DBL, PFUNC };
+
+	struct Type : Moveable<Type> {
+		Type() : size(-1), vtbl_typeindex(-1) {}
+
+		adr_t  modbase;
+
+		String name;
+		int    size;
+
+		int    vtbl_typeindex;
+		int    vtbl_offset;
+
+		Vector<Val>            base;
+		VectorMap<String, Val> member;
+		VectorMap<String, Val> static_member;
+	};
+
+	struct Frame : Moveable<Frame> {
+		adr_t               reip, rebp;
+		FnInfo                 fn;
+		VectorMap<String, Val> param;
+		VectorMap<String, Val> local;
+	};
+
+	struct VisualPart : Moveable<VisualPart> {
+		String  text;
+		Color   ink;
+		bool    mark;
+	};
+
+	struct Visual {
+		int                length;
+		Vector<VisualPart> part;
+
+		void   Cat(const String& text, Color ink = SColorText);
+		void   Cat(const char *text, Color ink = SColorText);
+		String GetString() const;
+		void   Clear() { part.Clear(); length = 0; }
+
+		Visual()       { length = 0; }
+	};
+
+	struct VisualDisplay : Display {
+		virtual void Paint(Draw& w, const Rect& r, const Value& q,
+	                       Color ink, Color paper, dword style) const;
+	};
+
+	struct Thread {
+		HANDLE  hThread;
+		adr_t   sp;
+		CONTEXT context;
+	};
+
+	int                      	lock;
+	bool                     	running;
+	bool                     	stop;
+	HANDLE                   	hProcess;
+	DWORD                    	processid;
+	ArrayMap<dword, Thread>  threads;
+	bool                     	terminated;
+	bool                     	refreshmodules;
+	Vector<ModuleInfo>       	module;
+	DEBUG_EVENT              	event;
+	HWND                     	hWnd;
+	VectorMap<adr_t, byte>   bp_set;
+	CONTEXT                  	context;
+
+	Index<adr_t>            	invalidpage;
+	VectorMap<adr_t, MemPg> 	mempage;
+
+	Index<adr_t>            breakpoint;
+
+	ArrayMap<int, Type>     	type;
+
+	String                  	disas_name;
+
+	Array<Frame>            	frame;
+	String                  	autotext;
+
+
+	FrameBottom<WithRegistersLayout<StaticRect> > regs;
+
+	Vector<String>     regname;
+	Vector<Label *>    reglbl;
+
+	DbgDisas           disas;
+
+	EditString         watchedit;
+
+	TabCtrl            tab;
+	DropList           threadlist;
+	DropList           framelist;
+	Label              dlock;
+	ArrayCtrl          locals;
+	ArrayCtrl          watches;
+	ArrayCtrl          autos;
+	ArrayCtrl          explorer;
+	EditString         expexp;
+	Button             exback, exfw;
+	StaticRect         explorer_pane;
+	StaticRect         pane;
+	Splitter           split;
+	TreeCtrl           tree;
+
+	VectorMap<String, String> treetype;
+
+	Vector<String>      exprev, exnext;
+
+	Index<String>          noglobal;
+	VectorMap<String, Val> global;
+
+	void       Error();
+
+// debug
+	void       LoadModuleInfo();
+	int        FindModuleIndex(adr_t base);
+	void       UnloadModuleSymbols();
+	void       CleanupOnExit();
+	void       AddThread(dword dwThreadId, HANDLE hThread);
+	void       RemoveThread(dword dwThreadId);
+	void       Lock();
+	void       Unlock();
+	bool       RunToException();
+	bool       AddBp(adr_t address);
+	bool       RemoveBp(adr_t address);
+	bool       RemoveBp();
+	bool       IsBpSet(adr_t address) const { return bp_set.Find(address) >= 0; }
+	bool       Continue();
+	bool       SingleStep();
+	void       BreakRunning();
+	void       SetBreakpoints();
+	void       SaveForeground();
+	void       RestoreForeground();
+
+	const CONTEXT& CurrentContext();
+	void           WriteContext(dword cf = CONTEXT_CONTROL);
+
+// mem
+	int        Byte(adr_t addr);
+	bool       Copy(adr_t addr, void *ptr, int count);
+	String     ReadString(adr_t addr, int maxlen = INT_MAX);
+	WString    ReadWString(adr_t addr, int maxlen = INT_MAX);
+
+// sym
+	struct LocalsCtx;
+	static BOOL CALLBACK  EnumLocals(PSYMBOL_INFO pSymInfo, ULONG SymbolSize, PVOID UserContext);
+	static BOOL CALLBACK  EnumGlobals(PSYMBOL_INFO pSymInfo, ULONG SymbolSize, PVOID UserContext);
+	void                  TypeVal(Pdb::Val& v, int typeId, adr_t modbase);
+	String                GetSymName(adr_t modbase, dword typeindex);
+	dword                 GetSymInfo(adr_t modbase, dword typeindex, IMAGEHLP_SYMBOL_TYPE_INFO info);
+	const Type&           GetType(int ti);
+	int                   GetTypeIndex(adr_t modbase, dword typeindex);
+	const Type&           GetTypeId(adr_t modbase, dword typeindex) { return GetType(GetTypeIndex(modbase, typeindex)); }
+	Val                   GetGlobal(const char *fn, const String& name);
+
+	adr_t                 GetAddress(FilePos p);
+	FilePos               GetFilePos(adr_t address);
+	FnInfo                GetFnInfo(adr_t address);
+//	FnInfo                GetFnInfo(String name);
+	void                  GetLocals(adr_t reip, adr_t rebp, VectorMap<String, Pdb::Val>& param,
+	                                VectorMap<String, Pdb::Val>& local);
+	String                TypeAsString(int ti, bool deep = true);
+
+// exp
+	void       ThrowError(const char *s);
+	int        SizeOfType(int ti);
+	Val        GetRVal(Val v);
+	Val        DeRef(Val v);
+	Val        Ref(Val v);
+	int64      GetInt(Val v);
+	double     GetFlt(Val v);
+	Val        Compute(Val v1, Val v2, int oper);
+	Val        RValue(int v);
+	Val        Field0(Pdb::Val v, const String& field);
+	Val        Field(Pdb::Val v, const String& field);
+	Val        Term(CParser& p);
+	Val        Post(CParser& p);
+	Val        Unary(CParser& p);
+	Val        Additive(CParser& p);
+	Val        Multiplicative(CParser& p);
+	Val        Exp0(CParser& p);
+	Val        Exp(CParser& p);
+	void       Visualise(Visual& result, Pdb::Val val, int expandptr, int slen, int maxlen = 250);
+	Visual     Visualise(Val v, int maxlen = 250);
+	Visual     Visualise(const String& rexp, int maxlen = 250);
+
+// code
+	int        Disassemble(adr_t ip);
+	void       Reg(Label& reg, adr_t val);
+	bool       IsValidFrame(adr_t eip);
+	void       Sync0();
+	void       Sync();
+	void       SetThread();
+	void       SetFrame();
+	bool       Step(bool over);
+	void       Trace(bool over);
+	void       StepOut();
+	void       DoRunTo() { RunTo(); }
+	adr_t      CursorAdr();
+	void       SetIp();
+
+	void       Break();
+
+// data
+	static VectorMap<String, Value> DataMap(const ArrayCtrl& a);
+	static Value Vis(const String& key, const VectorMap<String, Value>& prev,
+	                 pick_ Visual& vis, bool& ch);
+	static void  Vis(ArrayCtrl& a, const String& key,
+	                 const VectorMap<String, Value>& prev, pick_ Visual& vis);
+
+	void      DisasCursor() {}
+	void      DisasFocus() {}
+	void      Locals();
+	void      Watches();
+	void      TryAuto(const String& exp, const VectorMap<String, Value>& prev);
+	void      Autos();
+	void      Explore(const Val& val, const VectorMap<String, Value>& prev);
+	void      Explore(const String& exp);
+	void      ExploreKey(ArrayCtrl *a);
+	void      Explorer();
+	void      ExpExp();
+	void      ExBack();
+	void      ExFw();
+	void      DoExplorer();
+	String    GetExpExp();
+	void      ExplorerTree();
+	void      Data();
+	void      AddWatch();
+	void      SetTab(int i);
+
+	void      SetTree(const String& exp);
+	void      SetTreeA(ArrayCtrl *data);
+	void      TreeNode(int parent, const String& name, Val val);
+	void      TreeExpand(int node);
+	String    StoreTree(int parent);
+	void      SaveTree();
+	void      ExpandTreeType(int parent, CParser& p);
+
+	void      CopyStack();
+	void      CopyDisas();
+
+	void      MemoryGoto(const String& exp);
+
+	void      MemMenu(ArrayCtrl& array, Bar& bar, const String& exp);
+	void      DataMenu(ArrayCtrl& array, Bar& bar, const String& exp);
+	void      AutosMenu(Bar& bar);
+	void      LocalsMenu(Bar& bar);
+	void      WatchesMenu(Bar& bar);
+	void      ExplorerMenu(Bar& bar);
+
+	void      Tab();
+
+	void      AddReg(const char *reg, Label *lbl) { regname.Add(reg); reglbl.Add(lbl); }
+
+	bool      Create(One<Host> host, const String& exefile, const String& cmdline);
+
+	typedef Pdb CLASSNAME;
+
+	Pdb();
+	virtual ~Pdb();
+};
diff --git a/uppsrc/ide/Debuggers/Pdb.key b/uppsrc/ide/Debuggers/Pdb.key
new file mode 100644
index 000000000..00385ff24
--- /dev/null
+++ b/uppsrc/ide/Debuggers/Pdb.key
@@ -0,0 +1,14 @@
+KEY(STOP, "Stop debugging", K_SHIFT_F5)
+KEY(STEPINTO, "Step into", K_F11)
+KEY(STEPOVER, "Step over", K_F10)
+KEY(STEPOUT, "Step out", K_SHIFT_F11)
+KEY(RUNTO, "Run to", K_CTRL_F10)
+KEY(RUN, "Run", K_F5)
+KEY(BREAK, "Stop!", K_CTRL_BREAK)
+KEY(SETIP, "Set EIP", 0)
+KEY(AUTOS, "Autos", K_SHIFT_F6)
+KEY(LOCALS, "Locals", K_SHIFT_F7)
+KEY(WATCHES, "Watches", K_SHIFT_F8)
+KEY(ADDWATCH, "Add watch", K_CTRL|K_SHIFT_F8)
+KEY(EXPLORER, "Explorer", K_SHIFT_F9)
+KEY(MEMORY, "Memory", K_SHIFT_F10)
diff --git a/uppsrc/ide/Debuggers/Sym.cpp b/uppsrc/ide/Debuggers/Sym.cpp
new file mode 100644
index 000000000..6db90d83a
--- /dev/null
+++ b/uppsrc/ide/Debuggers/Sym.cpp
@@ -0,0 +1,427 @@
+#include "Debuggers.h"
+
+#ifdef COMPILER_MSC
+
+#define LLOG(x) // LOG(x)
+
+#ifdef _DEBUG
+char * SymTagAsString( DWORD symTag )
+{
+	switch( symTag )
+	{
+#define SYMTAG(t) case SymTag##t: return #t;
+		SYMTAG(Function)
+		SYMTAG(Data)
+		SYMTAG(PublicSymbol)
+		SYMTAG(UDT)
+		SYMTAG(Enum)
+		SYMTAG(Typedef)
+		SYMTAG(PointerType)
+		SYMTAG(ArrayType)
+		SYMTAG(BaseType)
+		SYMTAG(VTableShape)
+		SYMTAG(VTable)
+#undef SYMTAG
+		default: return "???";
+	}
+}
+
+char * BaseTypeAsString( DWORD baseType )
+{
+	switch ( baseType )
+	{
+	case btNoType: return "btNoType";
+	case btVoid: return "btVoid";
+	case btChar: return "btChar";
+	case btWChar: return "btWChar";
+	case btInt: return "btInt";
+	case btUInt: return "btUInt";
+	case btFloat: return "btFloat";
+	case btBCD: return "btBCD";
+	case btBool: return "btBool";
+	case btLong: return "btLong";
+	case btULong: return "btULong";
+	case btCurrency: return "btCurrency";
+	case btDate: return "btDate";
+	case btVariant: return "btVariant";
+	case btComplex: return "btComplex";
+	case btBit: return "btBit";
+	case btBSTR: return "btBSTR";
+	case btHresult: return "btHresult";
+	default: return "???";
+	}
+}
+#endif
+
+adr_t Pdb::GetAddress(FilePos p)
+{
+	LONG dummy;
+	IMAGEHLP_LINE ln;
+	ln.SizeOfStruct = sizeof(ln);
+	char h[MAX_PATH];
+	strcpy(h, p.path);
+	if(SymGetLineFromName(hProcess, NULL, h, p.line + 1, &dummy, &ln)) {
+		LLOG("GetAddress " << p.path << "(" << p.line << "): " << FormatIntHex(ln.Address));
+		return ln.Address;
+	}
+	LLOG("GetAddress " << p.path << "(" << p.line << "): ??");
+	return NULL;
+}
+
+Pdb::FilePos Pdb::GetFilePos(adr_t address)
+{
+	FilePos fp;
+	DWORD dummy;
+	IMAGEHLP_LINE ln;
+	ln.SizeOfStruct = sizeof(ln);
+	fp.address = address;
+	if(SymGetLineFromAddr(hProcess, address, &dummy, &ln) && FileExists(ln.FileName)) {
+		fp.line = ln.LineNumber - 1;
+		fp.path = ln.FileName;
+		fp.address = ln.Address;
+	}
+	LLOG("GetFilePos(" << FormatIntHex(address) << "): " << fp.path << ": " << fp.line);
+	return fp;
+}
+
+#define MAX_SYM_NAME 1024
+
+Pdb::FnInfo Pdb::GetFnInfo(adr_t address)
+{
+	DWORD64 h;
+
+	ULONG64 buffer[(sizeof(SYMBOL_INFO) +
+	    MAX_SYM_NAME +
+	    sizeof(ULONG64) - 1) /
+	    sizeof(ULONG64)];
+	SYMBOL_INFO *f = (SYMBOL_INFO*)buffer;
+
+	f->SizeOfStruct = sizeof(SYMBOL_INFO);
+	f->MaxNameLen = MAX_SYM_NAME;
+
+	FnInfo fn;
+	if(SymFromAddr(hProcess, address, &h, f)) {
+		LLOG("GetFnInfo " << f->Name
+		     << ", type index: " << f->TypeIndex
+		     << ", Flags: " << FormatIntHex(f->Flags)
+		     << ", Address: " << FormatIntHex((dword)f->Address)
+		     << ", Size: " << FormatIntHex((dword)f->Size)
+		     << ", Tag: " << SymTagAsString(f->Tag));
+		fn.name = f->Name;
+		fn.address = (dword)f->Address;
+		fn.size = f->Size;
+		fn.pdbtype = f->TypeIndex;
+	}
+	return fn;
+}
+/*
+Pdb::FnInfo Pdb::GetFnInfo(String name)
+{
+	ULONG64 b[(sizeof(SYMBOL_INFO) + MAX_SYM_NAME + sizeof(ULONG64) - 1) / sizeof(ULONG64)];
+	SYMBOL_INFO *f = (SYMBOL_INFO*)b;
+
+	f->SizeOfStruct = sizeof(SYMBOL_INFO);
+	f->MaxNameLen = MAX_SYM_NAME;
+
+	FnInfo fn;
+	if(SymFromName(hProcess, const_cast<char *>(~name), f)) {
+		LLOG("GetFnInfo " << f->Name
+		     << ", type index: " << f->TypeIndex
+		     << ", Flags: " << FormatIntHex(f->Flags)
+		     << ", Address: " << FormatIntHex((dword)f->Address)
+		     << ", Size: " << FormatIntHex((dword)f->Size)
+		     << ", Tag: " << SymTagAsString(f->Tag));
+		fn.name = f->Name;
+		fn.address = (dword)f->Address;
+		fn.size = f->Size;
+		fn.pdbtype = f->TypeIndex;
+	}
+	return fn;
+}
+*/
+void Pdb::TypeVal(Pdb::Val& v, int typeId, adr_t modbase)
+{
+	adr_t tag;
+	for(;;) {
+		tag = GetSymInfo(modbase, typeId, TI_GET_SYMTAG);
+		if(tag == SymTagPointerType) {
+			v.ref++;
+			const Type& tptr = GetTypeId(modbase, typeId);
+		}
+		else
+		if(tag == SymTagArrayType)
+			v.array = true;
+		else
+			break;
+		typeId = GetSymInfo(modbase, typeId, TI_GET_TYPE);
+	}
+	v.type = UNKNOWN;
+	if(tag == SymTagUDT)
+		v.type = GetTypeIndex(modbase, typeId);
+	else {
+		ULONG64 sz = 0;
+		SymGetTypeInfo(hProcess, modbase, typeId, TI_GET_LENGTH, &sz);
+		dword size = (dword)sz;
+		if(tag == SymTagEnum)
+			v.type = size == 8 ? SINT8 : size == 4 ? SINT4 : size == 2 ? SINT2 : SINT1;
+		else {
+			switch(GetSymInfo(modbase, typeId, TI_GET_BASETYPE)) {
+			case btBool:
+				v.type = BOOL1;
+				break;
+			case btChar:
+			case btWChar:
+			case btInt:
+			case btLong:
+				v.type = size == 8 ? SINT8 : size == 4 ? SINT4 : size == 2 ? SINT2 : SINT1;
+				break;
+			case btUInt:
+			case btULong:
+				v.type = size == 8 ? UINT8 : size == 4 ? UINT4 : size == 2 ? UINT2 : UINT1;
+				break;
+			case btFloat:
+				v.type = size == 8 ? DBL : FLT;
+				break;
+			}
+		}
+	}
+}
+
+struct Pdb::LocalsCtx {
+	adr_t                       ebp;
+	VectorMap<String, Pdb::Val> param;
+	VectorMap<String, Pdb::Val> local;
+	Pdb                        *pdb;
+};
+
+BOOL CALLBACK Pdb::EnumLocals(PSYMBOL_INFO pSym, ULONG SymbolSize, PVOID UserContext)
+{
+	LocalsCtx& c = *(LocalsCtx *)UserContext;
+
+	if(pSym->Tag == SymTagFunction)
+		return TRUE;
+
+	if(pSym->Flags & IMAGEHLP_SYMBOL_INFO_REGISTER)
+		return TRUE;
+
+	Val& v = (pSym->Flags & IMAGEHLP_SYMBOL_INFO_PARAMETER ? c.param : c.local).GetAdd(pSym->Name);
+	v.address = (adr_t)pSym->Address;
+	if(pSym->Flags & IMAGEHLP_SYMBOL_INFO_REGRELATIVE)
+		v.address += c.ebp;
+	c.pdb->TypeVal(v, pSym->TypeIndex, (adr_t)pSym->ModBase);
+	return TRUE;
+}
+
+void Pdb::GetLocals(adr_t eip, adr_t ebp, VectorMap<String, Pdb::Val>& param,
+                    VectorMap<String, Pdb::Val>& local)
+{
+	static IMAGEHLP_STACK_FRAME f;
+	f.InstructionOffset = eip;
+	SymSetContext(hProcess, &f, 0);
+	LocalsCtx c;
+	c.ebp = ebp;
+	c.pdb = this;
+	SymEnumSymbols(hProcess, 0, 0, &EnumLocals, &c);
+	param = c.param;
+	local = c.local;
+}
+
+Pdb::Val Pdb::GetGlobal(const char *fn, const String& name)
+{
+	return Val();
+
+	ULONG64 b[(sizeof(SYMBOL_INFO) + MAX_SYM_NAME + sizeof(ULONG64) - 1) / sizeof(ULONG64)];
+	PSYMBOL_INFO pSymbol = (PSYMBOL_INFO)b;
+	pSymbol->SizeOfStruct = sizeof(SYMBOL_INFO);
+	pSymbol->MaxNameLen = MAX_SYM_NAME;
+	SymSetOptions(SYMOPT_LOAD_LINES|SYMOPT_UNDNAME
+	              |SYMOPT_NO_UNQUALIFIED_LOADS|SYMOPT_NO_PUBLICS);
+	Vector<String> n = Split(fn, ':');
+	if(noglobal.GetCount() > 5000)
+		noglobal.Clear();
+	String nm;
+	for(;;) {
+		if(n.GetCount())
+			n.Drop();
+		nm = n.GetCount() ? Join(n, "::") + "::" + name : name;
+		int q = global.Find(nm);
+		if(q >= 0) {
+			SymSetOptions(SYMOPT_LOAD_LINES|SYMOPT_UNDNAME|SYMOPT_NO_UNQUALIFIED_LOADS);
+			return global[q];
+		}
+		if(noglobal.Find(nm) < 0) {
+			Buffer<char> h(nm.GetLength() + 1);
+			strcpy(h, nm);
+			if(SymFromName(hProcess, h, pSymbol))
+				break;
+		}
+		noglobal.FindAdd(nm);
+		if(n.GetCount() == 0) {
+			SymSetOptions(SYMOPT_LOAD_LINES|SYMOPT_UNDNAME|SYMOPT_NO_UNQUALIFIED_LOADS);
+			return Val();
+		}
+	}
+	SymSetOptions(SYMOPT_LOAD_LINES|SYMOPT_UNDNAME|SYMOPT_NO_UNQUALIFIED_LOADS);
+	if(pSymbol->Flags & (IMAGEHLP_SYMBOL_INFO_PARAMETER|IMAGEHLP_SYMBOL_INFO_LOCAL) ||
+	   pSymbol->Tag != SymTagData) {
+		noglobal.FindAdd(nm);
+		return Val();
+	}
+	Val v;
+	v.address = (adr_t)pSymbol->Address;
+	TypeVal(v, pSymbol->TypeIndex, (adr_t)pSymbol->ModBase);
+	global.Add(nm, v);
+	return v;
+}
+
+String Pdb::GetSymName(adr_t modbase, dword typeindex)
+{
+    WCHAR *pwszTypeName;
+    if(SymGetTypeInfo(hProcess, modbase, typeindex, TI_GET_SYMNAME, &pwszTypeName)) {
+		WString w((const wchar *)pwszTypeName);
+		LocalFree(pwszTypeName);
+		return w.ToString();
+    }
+    return Null;
+}
+
+dword Pdb::GetSymInfo(adr_t modbase, dword typeindex, IMAGEHLP_SYMBOL_TYPE_INFO info)
+{
+	dword dw = 0;
+	SymGetTypeInfo(hProcess, modbase, typeindex, info, &dw);
+	return dw;
+}
+
+int Pdb::GetTypeIndex(adr_t modbase, dword typeindex)
+{
+	int q = type.Find(typeindex);
+	if(q < 0) {
+		q = type.GetCount();
+		type.Add(typeindex).modbase = modbase;
+	}
+	return q;
+}
+
+const Pdb::Type& Pdb::GetType(int ti)
+{
+	Type& t = type[ti];
+	int typeindex = type.GetKey(ti);
+	if(t.size < 0) {
+		t.name = GetSymName(t.modbase, typeindex);
+		ULONG64 sz = 0;
+		SymGetTypeInfo(hProcess, t.modbase, typeindex, TI_GET_LENGTH, &sz);
+		t.size = (dword)sz;
+		dword count = GetSymInfo(t.modbase, typeindex, TI_GET_CHILDRENCOUNT);
+		if(count) {
+			Buffer<byte> b(sizeof(TI_FINDCHILDREN_PARAMS) + sizeof(ULONG) * count);
+			TI_FINDCHILDREN_PARAMS *children = (TI_FINDCHILDREN_PARAMS *) ~b;
+			children->Count = count;
+			children->Start = 0;
+			if(SymGetTypeInfo(hProcess, t.modbase, typeindex, TI_FINDCHILDREN, children)) {
+				for(dword i = 0; i < count; i++) {
+					dword ch = children->ChildId[i];
+					dword tag = GetSymInfo(t.modbase, ch, TI_GET_SYMTAG);
+					dword kind = GetSymInfo(t.modbase, ch, TI_GET_DATAKIND);
+					if(tag == SymTagData) {
+						String name = GetSymName(t.modbase, ch);
+						if(kind == DataIsMember) {
+							Val& v = t.member.Add(name);
+							TypeVal(v, GetSymInfo(t.modbase, ch, TI_GET_TYPEID), t.modbase);
+							v.address = GetSymInfo(t.modbase, ch, TI_GET_OFFSET);
+							ULONG64 bitcnt = 0;
+							SymGetTypeInfo(hProcess, t.modbase, ch, TI_GET_LENGTH, &bitcnt);
+							if(bitcnt) {
+								v.bitcnt = (byte)bitcnt;
+								v.bitpos = (byte)GetSymInfo(t.modbase, ch, TI_GET_BITPOSITION);
+							}
+						}
+						if(kind == DataIsStaticMember || kind == DataIsGlobal) {
+							Val& v = t.static_member.Add(name);
+							TypeVal(v, GetSymInfo(t.modbase, ch, TI_GET_TYPEID), t.modbase);
+							ULONG64 adr = 0;
+							SymGetTypeInfo(hProcess, t.modbase, ch, TI_GET_ADDRESS, &adr);
+							v.address = (adr_t)adr;
+						}
+					}
+					else
+					if(tag == SymTagBaseClass) {
+						DUMP(kind);
+						Val& v = t.base.Add();
+						TypeVal(v, GetSymInfo(t.modbase, ch, TI_GET_TYPEID), t.modbase);
+						v.address = GetSymInfo(t.modbase, ch, TI_GET_OFFSET);
+					}
+					else
+					if(tag == SymTagVTable) {
+						t.vtbl_offset = GetSymInfo(t.modbase, ch, TI_GET_OFFSET);
+						dword typeId = GetSymInfo(t.modbase, ch, TI_GET_TYPEID);
+						while(GetSymInfo(t.modbase, typeId, TI_GET_SYMTAG) == SymTagPointerType)
+							typeId = GetSymInfo(t.modbase, typeId, TI_GET_TYPE);
+						if((t.vtbl_typeindex = type.Find(typeId)) < 0) {
+							t.vtbl_typeindex = type.GetCount();
+							Type& vt = type.Add(typeId);
+							vt.modbase = t.modbase;
+							vt.size = 0;
+							vt.vtbl_typeindex = -2;
+						}
+					}
+	            }
+		    }
+		}
+	}
+	return t;
+}
+
+#ifdef _DEBUG
+
+String Pdb::TypeAsString(int ti, bool deep)
+{
+	String r;
+	#define sTYPE(x)     case x: return #x;
+	switch(ti) {
+	sTYPE(BOOL1)
+	sTYPE(UINT1)
+	sTYPE(SINT1)
+	sTYPE(UINT2)
+	sTYPE(SINT2)
+	sTYPE(UINT4)
+	sTYPE(SINT4)
+	sTYPE(UINT8)
+	sTYPE(SINT8)
+	sTYPE(FLT)
+	sTYPE(DBL)
+	sTYPE(UNKNOWN)
+	}
+	if(ti < 0)
+		return r;
+	const Type& t = GetType(ti);
+	r << t.name << "(sizeof = " << t.size << ") ";
+	if(!deep)
+		return r;
+	if(t.member.GetCount()) {
+		r << "{ ";
+		for(int i = 0; i < t.member.GetCount(); i++) {
+			if(i)
+				r << ", ";
+			r << t.member.GetKey(i) << " +" << t.member[i].address;
+			if(t.member[i].ref)
+				r << TypeAsString(t.member[i].type, false) << String('*', t.member[i].ref);
+			else
+				r << ": " << TypeAsString(t.member[i].type);
+		}
+		r << " }";
+	}
+	if(t.base.GetCount()) {
+		r << " BASE: ";
+		for(int i = 0; i < t.base.GetCount(); i++) {
+			if(i)
+				r << ", ";
+			r << " +" << t.base[i].address;
+			r << TypeAsString(t.base[i].type);
+		}
+	}
+	return r;
+}
+
+#endif
+
+#endif
diff --git a/uppsrc/ide/Debuggers/Visualise.cpp b/uppsrc/ide/Debuggers/Visualise.cpp
new file mode 100644
index 000000000..9bdf7a02c
--- /dev/null
+++ b/uppsrc/ide/Debuggers/Visualise.cpp
@@ -0,0 +1,228 @@
+#include "Debuggers.h"
+
+#ifdef COMPILER_MSC
+
+void Pdb::Visual::Cat(const String& text, Color ink)
+{
+	VisualPart& p = part.Add();
+	p.text = text;
+	p.ink = ink;
+	p.mark = false;
+	length += text.GetLength();
+}
+
+void Pdb::Visual::Cat(const char *s, Color ink)
+{
+	Cat(String(s), ink);
+}
+
+String Pdb::Visual::GetString() const
+{
+	String r;
+	for(int i = 0; i < part.GetCount(); i++)
+		r << part[i].text;
+	return r;
+}
+
+String IntFormat(int64 i)
+{
+	String r;
+	if(i < 0)
+		r << '-' << Format64(-i);
+	else
+		r << Format64(i);
+	if(i >= 32 && i < 128)
+		r << " \'" << (char)i << '\'';
+	return r;
+}
+
+bool IsOk(const String& q)
+{
+	const char *s = ~q;
+	const char *e = q.End();
+	while(s < e) {
+		if((byte)*s < 32 && *s != '\t' && *s != '\r' && *s != '\n' && *s != '\f')
+			return false;
+		s++;
+	}
+	return true;
+}
+
+void Pdb::Visualise(Visual& result, Pdb::Val val, int expandptr, int slen, int maxlen)
+{
+	if(result.length > maxlen)
+		return;
+	if(val.ref > 0 || val.type < 0)
+		val = GetRVal(val);
+	if(val.ref > 0) {
+		result.Cat(FormatIntHex(val.address, 0), LtMagenta);
+		if(val.type == UINT1 || val.type == SINT1) {
+			if(Byte(val.address) < 0)
+				result.Cat("??", SColorDisabled);
+			else {
+				String x = ReadString(val.address, slen + 1);
+				String dt;
+				if(x.GetLength() > (IsOk(x) ? slen : 10)) {
+					x.Trim(x.GetLength() - 1);
+					dt = "..";
+				}
+				result.Cat(" ");
+				result.Cat(AsCString(x) + dt, Red);
+			}
+			return;
+		}
+		if(expandptr > 0 && (val.type != UNKNOWN || val.ref > 1) && val.address) {
+			result.Cat("->", SColorMark);
+			Visualise(result, DeRef(val), expandptr - 1, slen, maxlen);
+		}
+		return;
+	}
+	if(val.type < 0) {
+		#define RESULTINT(x, type) case x: result.Cat(IntFormat((type)val.ival), Red); break;
+		switch(val.type) {
+		RESULTINT(BOOL1, bool)
+		RESULTINT(UINT1, byte)
+		RESULTINT(SINT1, int8)
+		RESULTINT(UINT2, uint16)
+		RESULTINT(SINT2, int16)
+		RESULTINT(UINT4, uint32)
+		RESULTINT(SINT4, int32)
+		RESULTINT(UINT8, uint64)
+		RESULTINT(SINT8, int64)
+		case DBL:
+		case FLT:
+			result.Cat(FormatDouble(val.fval, 20), Red); break;
+		case PFUNC: {
+			result.Cat(FormatIntHex(val.address), Red);
+			FnInfo fi = GetFnInfo(val.address);
+			if(!IsNull(fi.name)) {
+				result.Cat("->", SColorMark);
+				result.Cat(fi.name, SColorText);
+			}
+			break;
+		}
+		default:
+			result.Cat("<void>", SColorMark);
+		}
+		return;
+	}
+	const Type& t = GetType(val.type);
+	if(t.vtbl_typeindex == -2) {
+		result.Cat(Nvl(GetFnInfo(val.address).name, "??"), SColorText);
+		return;
+	}
+	result.Cat("{ ", SColorMark);
+	bool cm = false;
+	for(int i = 0; i < t.member.GetCount(); i++) {
+		if(cm)
+			result.Cat(", ");
+		cm = true;
+		if(result.length > maxlen) {
+			result.Cat("..");
+			break;
+		}
+		result.Cat(t.member.GetKey(i));
+		result.Cat("=", SColorMark);
+		Val r = t.member[i];
+		r.address += val.address;
+		try {
+			Visualise(result, r, max(expandptr - 1, 0), 20, maxlen);
+		}
+		catch(CParser::Error e) {
+			result.Cat(e, SColorDisabled);
+		}
+	}
+	for(int i = 0; i < t.static_member.GetCount(); i++) {
+		if(cm)
+			result.Cat(", ");
+		cm = true;
+		if(result.length > maxlen) {
+			result.Cat("..");
+			break;
+		}
+		result.Cat(t.static_member.GetKey(i));
+		result.Cat("=", SColorMark);
+		try {
+			Visualise(result, t.static_member[i], max(expandptr - 1, 0), 20, maxlen);
+		}
+		catch(CParser::Error e) {
+			result.Cat(e, SColorDisabled);
+		}
+	}
+	for(int i = 0; i < t.base.GetCount(); i++) {
+		const Val& b = t.base[i];
+		if(b.type >= 0) {
+			adr_t adr = b.address + val.address;
+			const Type& t = GetType(b.type);
+			for(int i = 0; i < t.member.GetCount(); i++) {
+				if(cm)
+					result.Cat(", ");
+				cm = true;
+				if(result.length > maxlen) {
+					result.Cat("..");
+					break;
+				}
+				result.Cat(t.member.GetKey(i));
+				result.Cat("=", SColorMark);
+				Val r = t.member[i];
+				r.address += adr;
+				try {
+					Visualise(result, r, max(expandptr - 1, 0), 32, maxlen);
+				}
+				catch(CParser::Error e) {
+					result.Cat(e, SColorDisabled);
+				}
+			}
+		}
+	}
+	result.Cat(" }", SColorMark);
+}
+
+Pdb::Visual Pdb::Visualise(Val v, int maxlen)
+{
+	Visual r;
+	try {
+		Visualise(r, v, 2, 150, maxlen);
+	}
+	catch(CParser::Error e) {
+		r.Cat(e, SColorDisabled);
+	}
+	return r;
+}
+
+Pdb::Visual Pdb::Visualise(const String& exp, int maxlen)
+{
+	Visual r;
+	try {
+		CParser p(exp);
+		Val v = Exp(p);
+		Visualise(r, v, 2, 150, maxlen);
+	}
+	catch(CParser::Error e) {
+		r.Cat(e, SColorDisabled);
+	}
+	return r;
+}
+
+void Pdb::VisualDisplay::Paint(Draw& w, const Rect& r, const Value& q, Color ink, Color paper, dword style)
+const
+{
+	int x = r.left;
+	int y = r.top + (r.Height() - Draw::GetStdFontCy()) / 2;
+	bool blue = (style & (Display::CURSOR|Display::FOCUS)) == (Display::CURSOR|Display::FOCUS);
+	if(IsType<Visual>(q)) {
+		const Visual& v = ValueTo<Visual>(q);
+		for(int i = 0; i < v.part.GetCount() && x < r.right; i++) {
+			const VisualPart& p = v.part[i];
+			Size sz = GetTextSize(p.text, StdFont());
+			w.DrawRect(x, y, sz.cx, r.Height(), blue || !p.mark ? paper : SColorLtFace);
+//			if(p.mark)
+//				w.DrawRect(x, r.bottom - 1, sz.cx, 1, SLtRed);
+			w.DrawText(x, y, p.text, StdFont(), blue ? ink : p.ink);
+			x += sz.cx;
+		}
+	}
+	w.DrawRect(x, y, r.right - x, r.Height(), paper);
+}
+
+#endif
diff --git a/uppsrc/ide/Debuggers/cvconst.h b/uppsrc/ide/Debuggers/cvconst.h
new file mode 100644
index 000000000..154e3e870
--- /dev/null
+++ b/uppsrc/ide/Debuggers/cvconst.h
@@ -0,0 +1,432 @@
+/*
+ * File cvconst.h - MS debug information
+ *
+ * Copyright (C) 2004, Eric Pouech
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+/* information in this file is highly derivated from MSDN DIA information pages */
+
+/* symbols & types enumeration */
+enum SymTagEnum
+{
+   SymTagNull,
+   SymTagExe,
+   SymTagCompiland,
+   SymTagCompilandDetails,
+   SymTagCompilandEnv,
+   SymTagFunction,
+   SymTagBlock,
+   SymTagData,
+   SymTagAnnotation,
+   SymTagLabel,
+   SymTagPublicSymbol,
+   SymTagUDT,
+   SymTagEnum,
+   SymTagFunctionType,
+   SymTagPointerType,
+   SymTagArrayType,
+   SymTagBaseType,
+   SymTagTypedef,
+   SymTagBaseClass,
+   SymTagFriend,
+   SymTagFunctionArgType,
+   SymTagFuncDebugStart,
+   SymTagFuncDebugEnd,
+   SymTagUsingNamespace,
+   SymTagVTableShape,
+   SymTagVTable,
+   SymTagCustom,
+   SymTagThunk,
+   SymTagCustomType,
+   SymTagManagedType,
+   SymTagDimension,
+   SymTagMax
+};
+
+enum BasicType
+{
+    btNoType = 0,
+    btVoid = 1,
+    btChar = 2,
+    btWChar = 3,
+    btInt = 6,
+    btUInt = 7,
+    btFloat = 8,
+    btBCD = 9,
+    btBool = 10,
+    btLong = 13,
+    btULong = 14,
+    btCurrency = 25,
+    btDate = 26,
+    btVariant = 27,
+    btComplex = 28,
+    btBit = 29,
+    btBSTR = 30,
+    btHresult = 31,
+};
+
+/* kind of UDT */
+enum UdtKind
+{
+    UdtStruct,
+    UdtClass,
+    UdtUnion
+};
+
+/* where a SymTagData is */
+enum LocationType
+{
+    LocIsNull,
+    LocIsStatic,
+    LocIsTLS,
+    LocIsRegRel,
+    LocIsThisRel,
+    LocIsEnregistered,
+    LocIsBitField,
+    LocIsSlot,
+    LocIsIlRel,
+    LocInMetaData,
+    LocIsConstant
+};
+
+/* kind of SymTagData */
+enum DataKind
+{
+    DataIsUnknown,
+    DataIsLocal,
+    DataIsStaticLocal,
+    DataIsParam,
+    DataIsObjectPtr,
+    DataIsFileStatic,
+    DataIsGlobal,
+    DataIsMember,
+    DataIsStaticMember,
+    DataIsConstant
+};
+
+/* values for registers (on different CPUs) */
+enum CV_HREG_e
+{
+    /* those values are common to all supported CPUs (and CPU independant) */
+    CV_ALLREG_ERR       = 30000,
+    CV_ALLREG_TEB       = 30001,
+    CV_ALLREG_TIMER     = 30002,
+    CV_ALLREG_EFAD1     = 30003,
+    CV_ALLREG_EFAD2     = 30004,
+    CV_ALLREG_EFAD3     = 30005,
+    CV_ALLREG_VFRAME    = 30006,
+    CV_ALLREG_HANDLE    = 30007,
+    CV_ALLREG_PARAMS    = 30008,
+    CV_ALLREG_LOCALS    = 30009,
+
+    /* Intel x86 CPU */
+    CV_REG_NONE         = 0,
+    CV_REG_AL           = 1,
+    CV_REG_CL           = 2,
+    CV_REG_DL           = 3,
+    CV_REG_BL           = 4,
+    CV_REG_AH           = 5,
+    CV_REG_CH           = 6,
+    CV_REG_DH           = 7,
+    CV_REG_BH           = 8,
+    CV_REG_AX           = 9,
+    CV_REG_CX           = 10,
+    CV_REG_DX           = 11,
+    CV_REG_BX           = 12,
+    CV_REG_SP           = 13,
+    CV_REG_BP           = 14,
+    CV_REG_SI           = 15,
+    CV_REG_DI           = 16,
+    CV_REG_EAX          = 17,
+    CV_REG_ECX          = 18,
+    CV_REG_EDX          = 19,
+    CV_REG_EBX          = 20,
+    CV_REG_ESP          = 21,
+    CV_REG_EBP          = 22,
+    CV_REG_ESI          = 23,
+    CV_REG_EDI          = 24,
+    CV_REG_ES           = 25,
+    CV_REG_CS           = 26,
+    CV_REG_SS           = 27,
+    CV_REG_DS           = 28,
+    CV_REG_FS           = 29,
+    CV_REG_GS           = 30,
+    CV_REG_IP           = 31,
+    CV_REG_FLAGS        = 32,
+    CV_REG_EIP          = 33,
+    CV_REG_EFLAGS       = 34,
+
+    /* <pcode> */
+    CV_REG_TEMP         = 40,
+    CV_REG_TEMPH        = 41,
+    CV_REG_QUOTE        = 42,
+    CV_REG_PCDR3        = 43,   /* this includes PCDR4 to PCDR7 */
+    CV_REG_CR0          = 80,   /* this includes CR1 to CR4 */
+    CV_REG_DR0          = 90,   /* this includes DR1 to DR7 */
+    /* </pcode> */
+
+    CV_REG_GDTR         = 110,
+    CV_REG_GDTL         = 111,
+    CV_REG_IDTR         = 112,
+    CV_REG_IDTL         = 113,
+    CV_REG_LDTR         = 114,
+    CV_REG_TR           = 115,
+
+    CV_REG_PSEUDO1      = 116, /* this includes Pseudo02 to Pseuso09 */
+    CV_REG_ST0          = 128, /* this includes ST1 to ST7 */
+    CV_REG_CTRL         = 136,
+    CV_REG_STAT         = 137,
+    CV_REG_TAG          = 138,
+    CV_REG_FPIP         = 139,
+    CV_REG_FPCS         = 140,
+    CV_REG_FPDO         = 141,
+    CV_REG_FPDS         = 142,
+    CV_REG_ISEM         = 143,
+    CV_REG_FPEIP        = 144,
+    CV_REG_FPEDO        = 145,
+    CV_REG_MM0          = 146, /* this includes MM1 to MM7 */
+    CV_REG_XMM0         = 154, /* this includes XMM1 to XMM7 */
+    CV_REG_XMM00        = 162,
+    CV_REG_XMM0L        = 194, /* this includes XMM1L to XMM7L */
+    CV_REG_XMM0H        = 202, /* this includes XMM1H to XMM7H */
+    CV_REG_MXCSR        = 211,
+    CV_REG_EDXEAX       = 212,
+    CV_REG_EMM0L        = 220,
+    CV_REG_EMM0H        = 228,
+    CV_REG_MM00         = 236,
+    CV_REG_MM01         = 237,
+    CV_REG_MM10         = 238,
+    CV_REG_MM11         = 239,
+    CV_REG_MM20         = 240,
+    CV_REG_MM21         = 241,
+    CV_REG_MM30         = 242,
+    CV_REG_MM31         = 243,
+    CV_REG_MM40         = 244,
+    CV_REG_MM41         = 245,
+    CV_REG_MM50         = 246,
+    CV_REG_MM51         = 247,
+    CV_REG_MM60         = 248,
+    CV_REG_MM61         = 249,
+    CV_REG_MM70         = 250,
+    CV_REG_MM71         = 251,
+
+    /* Motorola 68K CPU */
+    CV_R68_D0           = 0, /* this includes D1 to D7 too */
+    CV_R68_A0           = 8, /* this includes A1 to A7 too */
+    CV_R68_CCR          = 16,
+    CV_R68_SR           = 17,
+    CV_R68_USP          = 18,
+    CV_R68_MSP          = 19,
+    CV_R68_SFC          = 20,
+    CV_R68_DFC          = 21,
+    CV_R68_CACR         = 22,
+    CV_R68_VBR          = 23,
+    CV_R68_CAAR         = 24,
+    CV_R68_ISP          = 25,
+    CV_R68_PC           = 26,
+    CV_R68_FPCR         = 28,
+    CV_R68_FPSR         = 29,
+    CV_R68_FPIAR        = 30,
+    CV_R68_FP0          = 32, /* this includes FP1 to FP7 */
+    CV_R68_MMUSR030     = 41,
+    CV_R68_MMUSR        = 42,
+    CV_R68_URP          = 43,
+    CV_R68_DTT0         = 44,
+    CV_R68_DTT1         = 45,
+    CV_R68_ITT0         = 46,
+    CV_R68_ITT1         = 47,
+    CV_R68_PSR          = 51,
+    CV_R68_PCSR         = 52,
+    CV_R68_VAL          = 53,
+    CV_R68_CRP          = 54,
+    CV_R68_SRP          = 55,
+    CV_R68_DRP          = 56,
+    CV_R68_TC           = 57,
+    CV_R68_AC           = 58,
+    CV_R68_SCC          = 59,
+    CV_R68_CAL          = 60,
+    CV_R68_TT0          = 61,
+    CV_R68_TT1          = 62,
+    CV_R68_BAD0         = 64, /* this includes BAD1 to BAD7 */
+    CV_R68_BAC0         = 72, /* this includes BAC1 to BAC7 */
+
+    /* MIPS 4000 CPU */
+    CV_M4_NOREG         = CV_REG_NONE,
+    CV_M4_IntZERO       = 10,
+    CV_M4_IntAT         = 11,
+    CV_M4_IntV0         = 12,
+    CV_M4_IntV1         = 13,
+    CV_M4_IntA0         = 14, /* this includes IntA1 to IntA3 */
+    CV_M4_IntT0         = 18, /* this includes IntT1 to IntT7 */
+    CV_M4_IntS0         = 26, /* this includes IntS1 to IntS7 */
+    CV_M4_IntT8         = 34,
+    CV_M4_IntT9         = 35,
+    CV_M4_IntKT0        = 36,
+    CV_M4_IntKT1        = 37,
+    CV_M4_IntGP         = 38,
+    CV_M4_IntSP         = 39,
+    CV_M4_IntS8         = 40,
+    CV_M4_IntRA         = 41,
+    CV_M4_IntLO         = 42,
+    CV_M4_IntHI         = 43,
+    CV_M4_Fir           = 50,
+    CV_M4_Psr           = 51,
+    CV_M4_FltF0         = 60, /* this includes FltF1 to Flt31 */
+    CV_M4_FltFsr        = 92,
+
+    /* Alpha AXP CPU */
+    CV_ALPHA_NOREG      = CV_REG_NONE,
+    CV_ALPHA_FltF0      = 10, /* this includes FltF1 to FltF31 */
+    CV_ALPHA_IntV0      = 42,
+    CV_ALPHA_IntT0      = 43, /* this includes T1 to T7 */
+    CV_ALPHA_IntS0      = 51, /* this includes S1 to S5 */
+    CV_ALPHA_IntFP      = 57,
+    CV_ALPHA_IntA0      = 58, /* this includes A1 to A5 */
+    CV_ALPHA_IntT8      = 64,
+    CV_ALPHA_IntT9      = 65,
+    CV_ALPHA_IntT10     = 66,
+    CV_ALPHA_IntT11     = 67,
+    CV_ALPHA_IntRA      = 68,
+    CV_ALPHA_IntT12     = 69,
+    CV_ALPHA_IntAT      = 70,
+    CV_ALPHA_IntGP      = 71,
+    CV_ALPHA_IntSP      = 72,
+    CV_ALPHA_IntZERO    = 73,
+    CV_ALPHA_Fpcr       = 74,
+    CV_ALPHA_Fir        = 75,
+    CV_ALPHA_Psr        = 76,
+    CV_ALPHA_FltFsr     = 77,
+    CV_ALPHA_SoftFpcr   = 78,
+
+    /* Motorola & IBM PowerPC CPU */
+    CV_PPC_GPR0         = 1, /* this includes GPR1 to GPR31 */
+    CV_PPC_CR           = 33,
+    CV_PPC_CR0          = 34, /* this includes CR1 to CR7 */
+    CV_PPC_FPR0         = 42, /* this includes FPR1 to FPR31 */
+
+    CV_PPC_FPSCR        = 74,
+    CV_PPC_MSR          = 75,
+    CV_PPC_SR0          = 76, /* this includes SR1 to SR15 */
+    /* some PPC registers missing */
+
+    /* Hitachi SH3 CPU */
+    CV_SH3_NOREG        = CV_REG_NONE,
+    CV_SH3_IntR0        = 10, /* this include R1 to R13 */
+    CV_SH3_IntFp        = 24,
+    CV_SH3_IntSp        = 25,
+    CV_SH3_Gbr          = 38,
+    CV_SH3_Pr           = 39,
+    CV_SH3_Mach         = 40,
+    CV_SH3_Macl         = 41,
+    CV_SH3_Pc           = 50,
+    CV_SH3_Sr           = 51,
+    CV_SH3_BarA         = 60,
+    CV_SH3_BasrA        = 61,
+    CV_SH3_BamrA        = 62,
+    CV_SH3_BbrA         = 63,
+    CV_SH3_BarB         = 64,
+    CV_SH3_BasrB        = 65,
+    CV_SH3_BamrB        = 66,
+    CV_SH3_BbrB         = 67,
+    CV_SH3_BdrB         = 68,
+    CV_SH3_BdmrB        = 69,
+    CV_SH3_Brcr         = 70,
+    CV_SH_Fpscr         = 75,
+    CV_SH_Fpul          = 76,
+    CV_SH_FpR0          = 80, /* this includes FpR1 to FpR15 */
+    CV_SH_XFpR0         = 96, /* this includes XFpR1 to XXFpR15 */
+
+    /* ARM CPU */
+    CV_ARM_NOREG        = CV_REG_NONE,
+    CV_ARM_R0           = 10, /* this includes R1 to R12 */
+    CV_ARM_SP           = 23,
+    CV_ARM_LR           = 24,
+    CV_ARM_PC           = 25,
+    CV_ARM_CPSR         = 26,
+
+    /* Intel IA64 CPU */
+    CV_IA64_NOREG       = CV_REG_NONE,
+    CV_IA64_Br0         = 512, /* this includes Br1 to Br7 */
+    CV_IA64_P0          = 704, /* this includes P1 to P63 */
+    CV_IA64_Preds       = 768,
+    CV_IA64_IntH0       = 832, /* this includes H1 to H15 */
+    CV_IA64_Ip          = 1016,
+    CV_IA64_Umask       = 1017,
+    CV_IA64_Cfm         = 1018,
+    CV_IA64_Psr         = 1019,
+    CV_IA64_Nats        = 1020,
+    CV_IA64_Nats2       = 1021,
+    CV_IA64_Nats3       = 1022,
+    CV_IA64_IntR0       = 1024, /* this includes R1 to R127 */
+    CV_IA64_FltF0       = 2048, /* this includes FltF1 to FltF127 */
+    /* some IA64 registers missing */
+
+    /* TriCore CPU */
+    CV_TRI_NOREG        = CV_REG_NONE,
+    CV_TRI_D0           = 10, /* includes D1 to D15 */
+    CV_TRI_A0           = 26, /* includes A1 to A15 */
+    CV_TRI_E0           = 42,
+    CV_TRI_E2           = 43,
+    CV_TRI_E4           = 44,
+    CV_TRI_E6           = 45,
+    CV_TRI_E8           = 46,
+    CV_TRI_E10          = 47,
+    CV_TRI_E12          = 48,
+    CV_TRI_E14          = 49,
+    CV_TRI_EA0          = 50,
+    CV_TRI_EA2          = 51,
+    CV_TRI_EA4          = 52,
+    CV_TRI_EA6          = 53,
+    CV_TRI_EA8          = 54,
+    CV_TRI_EA10         = 55,
+    CV_TRI_EA12         = 56,
+    CV_TRI_EA14         = 57,
+    /* some TriCode registers missing */
+
+    /* AM33 (and the likes) CPU */
+    CV_AM33_NOREG       = CV_REG_NONE,
+    CV_AM33_E0          = 10, /* this includes E1 to E7 */
+    CV_AM33_A0          = 20, /* this includes A1 to A3 */
+    CV_AM33_D0          = 30, /* this includes D1 to D3 */
+    CV_AM33_FS0         = 40, /* this includes FS1 to FS31 */
+
+    /* Mitsubishi M32R CPU */
+    CV_M32R_NOREG       = CV_REG_NONE,
+    CV_M32R_R0          = 10, /* this includes R1 to R11 */
+    CV_M32R_R12         = 22,
+    CV_M32R_R13         = 23,
+    CV_M32R_R14         = 24,
+    CV_M32R_R15         = 25,
+    CV_M32R_PSW         = 26,
+    CV_M32R_CBR         = 27,
+    CV_M32R_SPI         = 28,
+    CV_M32R_SPU         = 29,
+    CV_M32R_SPO         = 30,
+    CV_M32R_BPC         = 31,
+    CV_M32R_ACHI        = 32,
+    CV_M32R_ACLO        = 33,
+    CV_M32R_PC          = 34,
+};
+
+typedef enum
+{
+   THUNK_ORDINAL_NOTYPE,
+   THUNK_ORDINAL_ADJUSTOR,
+   THUNK_ORDINAL_VCALL,
+   THUNK_ORDINAL_PCODE,
+   THUNK_ORDINAL_LOAD
+} THUNK_ORDINAL;
diff --git a/uppsrc/ide/Debuggers/init b/uppsrc/ide/Debuggers/init
new file mode 100644
index 000000000..8fe2eeabc
--- /dev/null
+++ b/uppsrc/ide/Debuggers/init
@@ -0,0 +1,6 @@
+#ifndef _ide_Debuggers_icpp_init_stub
+#define _ide_Debuggers_icpp_init_stub
+#include "ide\Common/init"
+#include "plugin\ndisasm/init"
+#include "HexView/init"
+#endif
diff --git a/uppsrc/ide/FindInFiles.cpp b/uppsrc/ide/FindInFiles.cpp
new file mode 100644
index 000000000..2374b7f4a
--- /dev/null
+++ b/uppsrc/ide/FindInFiles.cpp
@@ -0,0 +1,426 @@
+#include "ide.h"
+
+void Ide::SerializeFf(Stream& s) {
+	s % ff.find;
+	ff.find.SerializeList(s);
+	s % ff.wholeword % ff.ignorecase % ff.wildcards;
+	s % ff.replace;
+	ff.replace.SerializeList(s);
+}
+
+FileSel& sSD()
+{
+	static bool b;
+	static FileSel fs;
+	if(!b) {
+		fs.AllFilesType();
+		b = true;
+	}
+	return fs;
+}
+
+void Ide::SerializeFindInFiles(Stream& s) {
+	int version = 2;
+	s / version;
+	s % ff.files;
+	ff.files.SerializeList(s);
+	s % ff.folder;
+	ff.folder.SerializeList(s);
+	if(version >= 2)
+	{
+		s % ff.replace;
+		ff.replace.SerializeList(s);
+		s % ff.style;
+	}
+	if(version >= 1)
+		s % sSD();
+}
+
+void SearchForFiles(Vector<String>& files, String dir, String mask, Progress& pi) {
+	FindFile ff(AppendFileName(dir, "*.*"));
+	while(ff) {
+		if(ff.IsFolder())
+			SearchForFiles(files, AppendFileName(dir, ff.GetName()), mask, pi);
+		else
+		if(ff.IsFile() && PatternMatchMulti(mask, ff.GetName())) {
+			if(pi.StepCanceled()) return;
+			files.Add(AppendFileName(dir, ff.GetName()));
+		}
+		ff.Next();
+	}
+}
+
+enum {
+	WILDANY = 16,
+	WILDONE,
+	WILDSPACE,
+	WILDNUMBER,
+	WILDID,
+};
+
+bool Match(const char *f, const char *s, bool we, bool ignorecase) {
+	while(*f) {
+		if(*f == WILDANY) {
+			f++;
+			for(;;) {
+				if(Match(f, s, we, ignorecase))
+					return true;
+				if(!*s++) break;
+			}
+			return false;
+		}
+		else
+		if(*f == WILDONE) {
+			if(!*s++) return false;
+		}
+		else
+		if(*f == WILDSPACE) {
+			if(*s != ' ' && *s != '\t') return false;
+			s++;
+			while(*s == ' ' || *s == '\t')
+				s++;
+		}
+		else
+		if(*f == WILDNUMBER) {
+			if(*s < '0' || *s > '9') return false;
+			s++;
+			while(*s >= '0' && *s <= '9')
+				s++;
+		}
+		else
+		if(*f == WILDID) {
+			if(!iscib(*s)) return false;
+			s++;
+			while(iscid(*s)) s++;
+		}
+		else {
+			if(ignorecase ? ToUpper(*s) != ToUpper(*f) : *s != *f) return false;
+			s++;
+		}
+		f++;
+	}
+	return we && iscid(*s) ? false : true;
+}
+
+bool Ide::SearchInFile(const String& fn, const String& pattern, bool wholeword, bool ignorecase,
+					   int& n) {
+	FileIn in(fn);
+	if(!in) return true;
+	int ln = 1;
+	bool wb = wholeword ? iscid(*pattern) : false;
+	bool we = wholeword ? iscid(*pattern.Last()) : false;
+	int infile = 0;
+	while(!in.IsEof()) {
+		String line = in.GetLine();
+		bool bw = true;
+		for(const char *s = line; *s; s++) {
+			if(bw && Match(pattern, s, we, ignorecase)) {
+				console << fn << Format("(%d):", ln) << line << "\n";
+				console.Sync();
+				infile++;
+				n++;
+				break;
+			}
+			if(wb) bw = !iscid(*s);
+		}
+		ln++;
+	}
+
+	in.Close();
+	int ffs = ~ff.style;
+	if(infile && ffs != STYLE_NO_REPLACE)
+	{
+		EditFile(fn);
+		bool doit = true;
+		if(ffs == STYLE_CONFIRM_REPLACE)
+		{
+			editor.SetCursor(0);
+			editor.Find(false, true);
+			switch(PromptYesNoCancel(NFormat("Replace %d lines in %s?", infile, fn)))
+			{
+			case 1:  break;
+			case 0:  doit = false; break;
+			case -1: return false;
+			}
+		}
+		if(doit)
+		{
+			editor.SelectAll();
+			editor.BlockReplace();
+			SaveFile();
+			console << NFormat("%s: %d replacements made\n", fn, infile);
+			console.Sync();
+		}
+	}
+
+	return true;
+}
+
+static bool RawFileMatch(const char *pattern, const char *file, const char *& endptr)
+{
+	for(char c; (c = *pattern++) != 0;)
+		if(c == '*')
+		{
+			do
+				if(RawFileMatch(pattern, file, endptr))
+					return true;
+			while(*file++);
+			endptr = pattern;
+			return false;
+		}
+		else if(c == '?')
+		{
+			if(*file++ == 0)
+			{
+				endptr = pattern - 1;
+				return false;
+			}
+		}
+		else if(ToLower(c) != ToLower(*file++))
+		{
+			endptr = pattern - 1;
+			return false;
+		}
+	endptr = file;
+	return true;
+}
+
+static const char *FindFileMatch(const char *pattern, const char *file, String& cont)
+{
+	const char *endptr;
+	if(!RawFileMatch(pattern, file, endptr))
+		return endptr;
+	if(cont.IsVoid())
+	{
+		cont = endptr;
+		return NULL;
+	}
+	const char *p = cont;
+	while(*p && ToLower(*p) == ToLower(*endptr++))
+		p++;
+	cont.Trim(int(p - cont.Begin()));
+	return NULL;
+}
+
+void Ide::FindFileName() {
+	const Workspace& wspc = IdeWorkspace();
+
+	WithFindFileLayout<TopWindow> ffdlg;
+	CtrlLayoutOKCancel(ffdlg, "Find file");
+	ffdlg.list.AutoHideSb();
+	ffdlg.list.AddColumn("Package");
+	ffdlg.list.AddColumn("File");
+	ffdlg.list.WhenLeftDouble = ffdlg.Acceptor(IDOK);
+	ffdlg.mask <<= ffdlg.Breaker(IDYES);
+	int prev = 0;
+	for(;;)
+	{
+		ffdlg.list.Clear();
+		String mask = ffdlg.mask.GetText().ToString();
+		String rem = String::GetVoid();
+		bool simple = (mask.Find('/') < 0 && mask.Find('\\') < 0);
+		const char *best_err = NULL;
+		for(int p = 0; p < wspc.GetCount(); p++) {
+			String packname = wspc[p];
+			const Package& pack = wspc.GetPackage(p);
+			for(int f = 0; f < pack.file.GetCount(); f++) {
+				String fn = pack.file[f];
+				String rr = rem;
+				const char *errptr = FindFileMatch(mask, fn, rr);
+				if(errptr && simple) {
+					const char *b = fn.Begin(), *e = fn.End();
+					while(e > b && e[-1] != '\\' && e[-1] != '/')
+						e--;
+					if(b != e) {
+						rr = rem;
+						errptr = FindFileMatch(mask, e, rr);
+					}
+				}
+				if(!errptr) {
+					rem = rr;
+					ffdlg.list.Add(packname, pack.file[f]);
+				}
+				else if(!best_err || errptr > best_err)
+					best_err = errptr;
+			}
+		}
+		if(ffdlg.list.GetCount() == 0) {
+			int px = int(best_err - mask.Begin());
+			ffdlg.mask.SetSelection(px, ffdlg.mask.GetLength());
+			BeepMuteExclamation();
+		}
+		else if(!rem.IsEmpty() && prev < mask.GetLength()) {
+			int l, h;
+			ffdlg.mask.GetSelection(l, h);
+			if(l == mask.GetLength()) {
+				ffdlg.mask.SetText((mask + rem).ToWString());
+				ffdlg.mask.SetSelection(l, l + rem.GetLength());
+			}
+		}
+		prev = mask.GetLength();
+		if(ffdlg.list.GetCount() > 0)
+			ffdlg.list.SetCursor(0);
+
+		switch(ffdlg.Run()) {
+		case IDCANCEL:
+			return;
+		case IDOK:
+			if(ffdlg.list.IsCursor()) {
+				EditFile(SourcePath(ffdlg.list.Get(0),  ffdlg.list.Get(1)));
+				return;
+			}
+			break;
+		case IDYES:
+			break;
+		}
+	}
+}
+
+void Ide::FindInFiles() {
+	StringStream ss;
+	editor.SerializeFind(ss);
+	ss.Open(ss.GetResult());
+	SerializeFf(ss);
+	if(String(ff.folder).IsEmpty())
+		ff.folder <<= GetUppDir();
+	ff.style <<= STYLE_NO_REPLACE;
+	ff.itext = editor.GetI();
+	int c = ff.Execute();
+	ss.Create();
+	SerializeFf(ss);
+	ss.Open(ss.GetResult());
+	editor.SerializeFind(ss);
+	if(c == IDOK && !String(ff.find).IsEmpty()) {
+		Renumber();
+		ff.find.AddHistory();
+		ff.files.AddHistory();
+		ff.folder.AddHistory();
+		ff.replace.AddHistory();
+
+		Progress pi("Found %d files to search.");
+		Vector<String> files;
+		SearchForFiles(files, NormalizePath((String)ff.folder, GetUppDir()), ~ff.files, pi);
+		if(!pi.Canceled()) {
+			String pattern;
+			if(ff.wildcards) {
+				String q = ~ff.find;
+				for(const char *s = q; *s; s++)
+					if(*s == '\\') {
+						s++;
+						if(*s == '\0') break;
+						q.Cat(*s);
+					}
+					else
+					switch(*s) {
+					case '*': pattern.Cat(WILDANY); break;
+					case '?': pattern.Cat(WILDONE); break;
+					case '%': pattern.Cat(WILDSPACE); break;
+					case '#': pattern.Cat(WILDNUMBER); break;
+					case '$': pattern.Cat(WILDID); break;
+					default:  pattern.Cat(*s);
+					}
+			}
+			else
+				pattern = ~ff.find;
+			pi.SetTotal(files.GetCount());
+			ShowConsole();
+			console.Clear();
+			pi.SetPos(0);
+			int n = 0;
+			for(int i = 0; i < files.GetCount(); i++) {
+				pi.SetText(files[i]);
+				if(pi.StepCanceled()) break;
+				if(!SearchInFile(files[i], pattern, ff.wholeword, ff.ignorecase, n))
+					break;
+			}
+			console << Format("%d occurrence(s) have been found.\n", n);
+		}
+	}
+	SetErrorEditor();
+}
+
+void Ide::FindString(bool back)
+{
+	if(!editor.FindString(back))
+		BeepMuteExclamation();
+}
+
+void Ide::TranslateString()
+{
+	int l, h;
+	if(editor.GetSelection(l, h)) {
+		editor.Insert(l, "t_(");
+		editor.Insert(h + 3, ")");
+		editor.SetCursor(h + 4);
+		FindString(false);
+	}
+}
+
+void Ide::InsertWildcard(int c) {
+	iwc = c;
+}
+
+void Ide::FindWildcard() {
+	int l, h;
+	ff.find.GetSelection(l, h);
+	iwc = 0;
+	FindWildcardMenu(THISBACK(InsertWildcard), ff.find.GetPushScreenRect().TopRight(), false);
+	if(iwc) {
+		ff.wildcards = true;
+		ff.find.SetFocus();
+		ff.find.SetSelection(l, h);
+		ff.find.RemoveSelection();
+		ff.find.Insert(iwc);
+	}
+}
+
+void Ide::FindSetStdDir(String n)
+{
+	ff.folder <<= n;
+}
+
+void Ide::FindStdDir()
+{
+	String n = GetFileFolder(editfile);
+	MenuBar menu;
+	if(!IsNull(n))
+		menu.Add(n, THISBACK1(FindSetStdDir, n));
+	Vector<String> d = GetUppDirs();
+	for(int i = 0; i < d.GetCount(); i++)
+		menu.Add(d[i], THISBACK1(FindSetStdDir, d[i]));
+	menu.Execute(&ff.folder, ff.folder.GetPushScreenRect().BottomLeft());
+}
+
+void Ide::FindFolder()
+{
+	if(!sSD().ExecuteSelectDir()) return;
+	ff.folder <<= ~sSD();
+}
+
+void Ide::ConstructFindInFiles() {
+	ff.find.AddButton().SetMonoImage(CtrlImg::smallright()) <<= THISBACK(FindWildcard);
+	ff.files <<= String("*.cpp *.h *.hpp *.c *.C *.cxx *.cc");
+	ff.files.AddList((String)"*.cpp *.h *.hpp *.c *.C *.cxx *.cc");
+	ff.files.AddList((String)"*.txt");
+	ff.files.AddList((String)"*.*");
+	ff.folder.AddButton().SetMonoImage(CtrlImg::smalldown()) <<= THISBACK(FindStdDir);
+	ff.folder.AddButton().SetMonoImage(CtrlImg::smallright()) <<= THISBACK(FindFolder);
+	editor.PutI(ff.find);
+	editor.PutI(ff.replace);
+	CtrlLayoutOKCancel(ff, "Find In Files");
+}
+
+bool Ide::FindInFiles::Key(dword key, int count)
+{
+	if(key == K_CTRL_I) {
+		if(find.HasFocus()) {
+			find <<= itext;
+			return true;
+		}
+		if(replace.HasFocus()) {
+			replace <<= itext;
+			return true;
+		}
+	}
+	return TopWindow::Key(key, count);
+}
diff --git a/uppsrc/ide/FormatCode.cpp b/uppsrc/ide/FormatCode.cpp
new file mode 100644
index 000000000..7d6df686d
--- /dev/null
+++ b/uppsrc/ide/FormatCode.cpp
@@ -0,0 +1,192 @@
+#include "ide.h"
+
+using namespace astyle;
+
+/////////////////////////////////////////////////////////////////////////////////////////
+// CLASS ASStreamIterator
+class ASStreamIterator : public ASSourceIterator
+{
+	protected:
+
+		enum EolMode { crlf, lf, cr, lfcr } ;
+		WString const &src;
+		int p;
+		EolMode eolMode;
+
+	public:
+		ASStreamIterator(WString const &Src);
+		virtual ~ASStreamIterator() {}
+		virtual bool hasMoreLines() const;
+		virtual WString nextLine();
+
+		WString getEol();
+
+}; // END Class ASStreamIterator
+
+// Constructor Class ASStreamIterator
+ASStreamIterator::ASStreamIterator(WString const &Src) : ASSourceIterator(), src(Src)
+{
+	// initializes buffer pointer
+	p = 0;
+
+	// initializes Eol Mode
+	eolMode = crlf;
+
+} // END Constructor Class ASStreamIterator
+
+
+WString ASStreamIterator::getEol()
+{
+	switch(eolMode)
+	{
+		case cr:
+			return "\r";
+		case lf:
+			return "\n";
+		case lfcr:
+			return "\r\n";
+		default:
+			return "\n\r";
+	}
+
+} // END ASStreamIterator::getEol()
+
+bool ASStreamIterator::hasMoreLines() const
+{
+	return src[p] != 0;
+
+} // END ASStreamIterator::hasMoreLines()
+
+WString ASStreamIterator::nextLine()
+{
+	int p2 = p;
+	wchar c1, c2;
+	while(src[p2] && src[p2] != '\n' && src[p2] != '\r')
+		p2++;
+	WString line = src.Mid(p, p2 - p);
+
+	if( (c1 = src[p2]) != 0)
+	{
+		p2++;
+		c2 = src[p2];
+		if(c1 == '\r' && c2 == '\n')
+		{
+			p2++;
+			eolMode = crlf;
+		}
+		else if(c1 == '\n' && c2 == '\r')
+		{
+			p2++;
+			eolMode = lfcr;
+		}
+		else if(c1 == '\n')
+			eolMode = lf;
+		else
+			eolMode = cr;
+	}
+	p = p2;
+
+	return line;
+
+} // END ASStreamIterator::nextLine()
+
+/////////////////////////////////////////////////////////////////////////////////////////
+// Formats a string of code with a given formatter
+WString Ide::FormatCodeString(WString const &Src, ASFormatter &Formatter)
+{
+	// Creates the output string
+	WString Dest;
+
+	// Creates the iterator for the formatter
+	ASStreamIterator streamIterator(Src);
+
+	// Initializes the formatter to work on selected stream
+	Formatter.init(&streamIterator);
+
+	// Processes all text in source file and put them in output file
+	while (Formatter.hasMoreLines())
+		Dest << Formatter.nextLine() << streamIterator.getEol();
+
+	// returns output string
+	return Dest;
+
+} // END Ide::FormatCodeString()
+
+/////////////////////////////////////////////////////////////////////////////////////////
+// Formats editor's code with Ide format parameters
+void Ide::FormatCode()
+{
+	// Gets editor contents from editor
+	WString Src;
+	int l, h;
+	bool sel = editor.GetSelection(l, h);
+	if(sel)
+		Src = editor.GetSelectionW();
+	else
+	 	Src = editor.GetW();
+
+	// Instantiate the formatter object
+	ASFormatter Formatter;
+
+	// Sets up the formatter for C++ formatting
+	Formatter.setCStyle();
+
+	///////////////////////////////////////////////////////////////////////////////////////////////////////////
+	// Sets up astyle options
+	Formatter.setBracketIndent(astyle_BracketIndent);
+	Formatter.setNamespaceIndent(astyle_NamespaceIndent);
+	Formatter.setBlockIndent(astyle_BlockIndent);
+	Formatter.setCaseIndent(astyle_CaseIndent);
+	Formatter.setClassIndent(astyle_ClassIndent);
+	Formatter.setLabelIndent(astyle_LabelIndent);
+	Formatter.setSwitchIndent(astyle_SwitchIndent);
+	Formatter.setPreprocessorIndent(astyle_PreprocessorIndent);
+	Formatter.setMaxInStatementIndentLength(astyle_MaxInStatementIndentLength);
+	Formatter.setMinConditionalIndentLength(astyle_MinInStatementIndentLength);
+	Formatter.setBreakClosingHeaderBracketsMode(astyle_BreakClosingHeaderBracketsMode);
+	Formatter.setBreakElseIfsMode(astyle_BreakElseIfsMode);
+	Formatter.setBreakOneLineBlocksMode(astyle_BreakOneLineBlocksMode);
+	Formatter.setSingleStatementsMode(astyle_SingleStatementsMode);
+	Formatter.setBreakBlocksMode(astyle_BreakBlocksMode);
+	Formatter.setBreakClosingHeaderBlocksMode(astyle_BreakClosingHeaderBlocksMode);
+	Formatter.setBracketFormatMode((astyle::BracketMode)astyle_BracketFormatMode);
+	switch(astyle_ParensPaddingMode)
+	{
+		case PAD_INSIDE :
+			Formatter.setParensInsidePaddingMode(true);
+			Formatter.setParensOutsidePaddingMode(false);
+			break;
+		case PAD_OUTSIDE :
+			Formatter.setParensInsidePaddingMode(false);
+			Formatter.setParensOutsidePaddingMode(true);
+			break;
+		case PAD_BOTH :
+			Formatter.setParensInsidePaddingMode(true);
+			Formatter.setParensOutsidePaddingMode(true);
+			break;
+		default :
+			Formatter.setParensOutsidePaddingMode(false);
+			Formatter.setParensInsidePaddingMode(false);
+			break;
+	}
+	Formatter.setParensUnPaddingMode(astyle_ParensUnPaddingMode);
+	Formatter.setOperatorPaddingMode(astyle_OperatorPaddingMode);
+	Formatter.setEmptyLineFill(astyle_EmptyLineFill);
+	Formatter.setTabSpaceConversionMode(astyle_TabSpaceConversionMode);
+	if(!indent_spaces)
+		Formatter.setTabIndentation(editortabsize, true);
+	else
+		Formatter.setSpaceIndentation(indent_amount);
+	
+	WString Dest = FormatCodeString(Src, Formatter);
+
+	editor.NextUndo();
+	if(sel) {
+		editor.Remove(l, h - l);
+		editor.SetSelection(l, l + editor.Insert(l, Dest));
+	}
+	else {
+		editor.Remove(0, editor.GetLength());
+		editor.Insert(0, Dest);
+	}
+}
diff --git a/uppsrc/ide/Goto.cpp b/uppsrc/ide/Goto.cpp
new file mode 100644
index 000000000..c54150837
--- /dev/null
+++ b/uppsrc/ide/Goto.cpp
@@ -0,0 +1,257 @@
+#include "ide.h"
+
+struct GotoDlg : public WithGotoLayout<TopWindow> {
+	bool               global;
+	Array<CppItemInfo> item;
+	Index<String>      type;
+	CppBase            lbase;
+	CppBase           *gbase;
+
+	void SyncList();
+	int  GetLine();
+	void SyncOk();
+
+	void Serialize(Stream& s);
+
+	typedef GotoDlg CLASSNAME;
+
+	GotoDlg(const String& s);
+};
+
+void GotoDlg::SyncList()
+{
+	list.Clear();
+	String n = ~target;
+	int typei = Null;
+	int nesti = Null;
+	Vector<String> h = Split(n, ':');
+	if(n[0] == ':') {
+		if(h.GetCount() > 1 && *n.Last() != ':') {
+			n = h.Top();
+			h.Drop();
+		}
+		else
+			n.Clear();
+		nesti = gbase->Find("::" + Join(h, "::"));
+		if(nesti < 0)
+			nesti = -1;
+	}
+	else
+	if(h.GetCount() > 1 || h.GetCount() == 1 && *n.Last() == ':') {
+		if(h.GetCount() > 1 && *n.Last() != ':') {
+			n = h.Top();
+			h.Drop();
+		}
+		else
+			n.Clear();
+		typei = type.Find(Join(h, "::"));
+		if(typei < 0)
+			typei = -1;
+	}
+	if(IsDigit(*n))
+		n.Clear();
+	Index<String> nc;
+	for(int ci = 0; ci < 2; ci++)
+		for(int i = 0; i < item.GetCount(); i++) {
+			const CppItemInfo& f = item[i];
+			int q = memcmp(n, f.name, n.GetLength());
+			if((n.GetLength() == 0 ||
+			    (ci ? q && memcmp_i(n, f.name, n.GetLength()) == 0 : q == 0)) &&
+			   (IsNull(typei) || typei == f.typei) &&
+			   (IsNull(nesti) || nesti == f.nesti)) {
+				list.Add(RawToValue(CppNestingInfo(f)), RawToValue(f), f.key, f.line, f.fn, f.nesting);
+				nc.FindAdd(f.nesting);
+			}
+		}
+	list.HeaderTab(0).SetText(Format("Nesting (%d)", nc.GetCount()));
+	list.HeaderTab(1).SetText(Format("Symbol (%d)", list.GetCount()));
+	SyncOk();
+}
+
+int GotoDlg::GetLine()
+{
+	if(list.IsCursor() && list.HasFocus())
+		return list.Get(3);
+	String s = ~target;
+	if(IsDigit(s[0]))
+		return atoi(s);
+	if(list.IsCursor())
+		return list.Get(3);
+	if(list.GetCount())
+		return list.Get(0, 3);
+	return -1;
+}
+
+void GotoDlg::SyncOk()
+{
+	ok.Enable(GetLine() >= 0);
+}
+
+int GotoFilter(int c)
+{
+	return IsDigit(c) || IsAlpha(c) || c == '_' || c == ':' ? c : c == '.' ? ':' : 0;
+}
+
+void GotoDlg::Serialize(Stream& s)
+{
+	SerializePlacement(s);
+	list.SerializeHeader(s);
+}
+
+struct CppItemInfoSortLine {
+	bool operator()(const CppItemInfo& a, const CppItemInfo& b) const {
+		return a.line < b.line;
+	}
+};
+
+struct CppItemInfoSortGlobal {
+	bool operator()(const CppItemInfo& a, const CppItemInfo& b) const {
+		return CombineCompare(a.nesting, b.nesting)(a.fn, b.fn)(a.line, b.line) < 0;
+	}
+};
+
+GotoDlg::GotoDlg(const String& s)
+{
+	global = IsNull(s);
+	if(!global) {
+		StringStream ss(s);
+		Parser parser;
+		parser.Do(ss, IgnoreList(), lbase, Null, CNULL);
+	}
+	CtrlLayoutOKCancel(*this, IsNull(s) ? "Go to global" : "Go to line or symbol");
+	CppBase& base = IsNull(s) ? BrowserBase() : lbase;
+	gbase = &base;
+	for(int i = 0; i < base.GetCount(); i++) {
+		CppNest& n = base[i];
+		for(int j = 0; j < n.GetCount(); j++) {
+			const CppItem& m = n[j];
+			for(int l = 0; l < m.pos.GetCount(); l++) {
+				CppItemInfo mf;
+				(CppSimpleItem&)mf = n[j];
+				mf.nesting = base.GetKey(i);
+				mf.namespacel = n.namespacel;
+				const CppPos& p = m.pos[l];
+				mf.name = n.name[j];
+				mf.line = p.line;
+				mf.fn = p.GetFile();
+				mf.virt = false;
+				mf.access = m.pos[l].impl ? (int)WITHBODY : (int)PUBLIC;
+				mf.key = global ? String().Cat() << GetFileName(mf.fn) << " (" << p.line << ')' : AsString(p.line);
+				int nl = mf.namespacel + 2;
+				String tp;
+				if(nl < mf.nesting.GetLength())
+					tp = mf.nesting.Mid(nl);
+				mf.typei = type.FindAdd(tp);
+				mf.nesti = i;
+				item.Add(mf);
+			}
+		}
+	}
+	if(global)
+		Sort(item, CppItemInfoSortGlobal());
+	else
+		Sort(item, CppItemInfoSortLine());
+	target.SetFilter(GotoFilter);
+	target <<= THISBACK(SyncList);
+	list.AddColumn("Nesting").SetDisplay(Single<CppNestingInfoDisplay>());
+	list.AddColumn().SetDisplay(Single<CppItemInfoDisplay>());
+	list.AddColumn(global ? "Position" : "Line");
+	if(global)
+		list.ColumnWidths("181 466 112");
+	else
+		list.ColumnWidths("174 516 37");
+	list.WhenCursor = THISBACK(SyncOk);
+	list.WhenLeftDouble = Breaker(IDOK);
+	list.EvenRowColor();
+	SyncList();
+	ActiveFocus(target);
+	Sizeable().Zoomable();
+	Icon(IdeImg::Navigator());
+}
+
+INITBLOCK
+{
+	RegisterGlobalConfig("IdeGoto");
+	RegisterGlobalConfig("IdeGotoGlobal");
+}
+
+void Ide::Goto()
+{
+	if(designer || editor.GetLength() == 0)
+		return;
+	GotoDlg dlg(~editor);
+	LoadFromGlobal(dlg, "IdeGoto");
+	int c = dlg.Run();
+	StoreToGlobal(dlg, "IdeGoto");
+	if(c != IDOK)
+		return;
+	int l = dlg.GetLine();
+	if(l > 0) {
+		editor.SetCursor(editor.GetPos(l - 1));
+		editor.TopCursor();
+	}
+}
+
+void Ide::GotoGlobal()
+{
+	SaveFile();
+	StartBrowserBase();
+	GotoDlg dlg(Null);
+	LoadFromGlobal(dlg, "IdeGotoGlobal");
+	int c = dlg.Run();
+	StoreToGlobal(dlg, "IdeGotoGlobal");
+	if(c != IDOK)
+		return;
+	int l = dlg.GetLine();
+	if(l > 0 && dlg.list.GetCount()) {
+		String file = dlg.list.IsCursor() ? dlg.list.Get(4) : dlg.list.Get(0, 4);
+		GotoPos(file, l);
+	}
+}
+
+void AssistEditor::SwapSContext(Parser& p)
+{
+	int i = GetCursor();
+	if(Ch(i - 1) == ';')
+		i--;
+	else
+		for(;;) {
+			int c = Ch(i);
+			if(c == '{') {
+				i++;
+				break;
+			}
+			if(c == 0 || c == ';' || c == '}')
+				break;
+			i++;
+		}
+	Context(p, i);
+}
+
+void Ide::SwapS()
+{
+	if(designer || !editor.assist_active)
+		return;
+	Parser p;
+	editor.SwapSContext(p);
+	int q = BrowserBase().Find(p.current_nest);
+	if(q < 0)
+		return;
+	const CppNest& n = BrowserBase()[q];
+	q = n.key.Find(QualifyKey(BrowserBase(), p.current_nest, p.current_key));
+	if(q < 0)
+		return;
+	int    line = -1;
+	if(p.current.pos.GetCount())
+		line = p.current.pos.Top().line;
+	const CppItem& m = n[q];
+	int i;
+	for(i = 0; i < m.pos.GetCount(); i++) {
+		const CppPos& fp = m.pos[i];
+		if(fp.GetFile() == editfile && fp.line == line) {
+			i++;
+			break;
+		}
+	}
+	GotoCpp(m.pos[i % m.pos.GetCount()]);
+}
diff --git a/uppsrc/ide/Help.cpp b/uppsrc/ide/Help.cpp
new file mode 100644
index 000000000..e84d4195f
--- /dev/null
+++ b/uppsrc/ide/Help.cpp
@@ -0,0 +1,523 @@
+#include "ide.h"
+
+#ifdef PLATFORM_WIN32
+#include "shellapi.h"
+#endif
+
+#define TOPICFILE <ide/app.tpp/all.i>
+#include <Core/topic_group.h>
+
+Size MakeLogo(Ctrl& parent, Array<Ctrl>& ctrl)
+{
+	Image logo = IdeImg::logo();
+	Size  isz = logo.GetSize();
+	ImageCtrl& l = ctrl.Create<ImageCtrl>();
+	Label& v = ctrl.Create<Label>();
+	Label& v1 = ctrl.Create<Label>();
+	l.SetImage(logo);
+	Size sz = Size(isz.cx, isz.cy + 80);
+	v = IDE_VERSION;
+	v.LeftPos(300, 100).TopPos(90, 40);
+	if(sizeof(void *) == 8) {
+		v = IDE_VERSION " (64 bit)";
+		v.RightPos(3, Ctrl::MINSIZE).TopPos(90, 40);
+	}
+	l.Add(v);
+	v.SetFont(Arial(20));
+	v.SetInk(Blend(Gray, Blue));
+	v1 = Format("%d`KB", MemoryUsedKb());
+	v1.LeftPos(300, 100).BottomPos(20, 12);
+	v1.SetFont(Arial(10));
+	l.Add(v1);
+	parent.Add(ctrl.Create<StaticRect>().Color(White).SizePos());
+	parent.Add(l.TopPos(0, isz.cy).LeftPos(0, isz.cx));
+	parent.Add(ctrl.Create<StaticRect>().Color(Blue).LeftPos(2, isz.cx - 4).TopPos(isz.cy, 1));
+	RichTextView& w = ctrl.Create<RichTextView>();
+	w.SetQTF(GetTopic("ide/app/Sponsor$en-us"));
+	w.PageWidth(2900);
+	w.NoSb();
+	w.SetFrame(NullFrame());
+	parent.Add(w.TopPos(isz.cy + 3, 99).LeftPos(0, isz.cx));
+	return sz;
+}
+
+struct Splash : Ctrl {
+	Array<Ctrl> ctrl;
+
+	Splash() {
+		SetRect(GetWorkArea().CenterRect(MakeLogo(*this, ctrl) + 2));
+		SetFrame(BlackFrame());
+	}
+};
+
+void HideSplash()
+{
+	if(Single<Splash>().IsOpen())
+		Single<Splash>().Close();
+}
+
+void ShowSplash()
+{
+	Single<Splash>().PopUp(NULL, false, false);
+	SetTimeCallback(750, callback(HideSplash));
+}
+
+bool IsSplashOpen()
+{
+	return Single<Splash>().IsOpen();
+}
+
+struct AboutDlg : TopWindow {
+	Array<Ctrl>  ctrl;
+	RichTextView about;
+
+	typedef AboutDlg CLASSNAME;
+
+	virtual bool Key(dword key, int) {
+		if(key == K_ALT_M)
+			MemoryProfileInfo();
+		return false;
+	}
+
+	AboutDlg() {
+		Size isz = MakeLogo(*this, ctrl);
+		SetRect(0, 0, 1000, isz.cy);
+		about.SetQTF(GetTopic("ide/app/About$en-us"), Zoom(130, 1024));
+		about.SetZoom(Zoom(1, 1));
+		about.RightPos(0, 1000 - isz.cx).VSizePos();
+		about.HMargins(4);
+		about.SetFrame(NullFrame());
+		Background(PaintRect(ColorDisplay(), SColorPaper()));
+		Add(about);
+		Title("About TheIDE");
+	}
+};
+
+void Ide::About()
+{
+	AboutDlg().Execute();
+}
+
+struct GatherLinksIterator : RichText::Iterator {
+	Index<String> link;
+
+	virtual bool operator()(int pos, const RichPara& para)
+	{
+		for(int i = 0; i < para.GetCount(); i++) {
+			String l = para[i].format.link;
+			if(!IsNull(l))
+				link.FindAdd(l);
+		}
+		return false;
+	}
+};
+
+void GatherLinks(Index<String>& link, const char *topic)
+{
+	if(link.Find(topic) < 0) {
+		Topic p = GetTopic(topic);
+		if(IsNull(p.text))
+			return;
+		link.Add(topic);
+		RichText txt = ParseQTF(p.text);
+		SyncTopicFile(txt, topic, ":ide:", p.title);
+		GatherLinksIterator ti;
+		txt.Iterate(ti);
+		for(int i = 0; i < ti.link.GetCount(); i++)
+			GatherLinks(link, ti.link[i]);
+	}
+}
+
+void TopicCtrl::SyncDocTree()
+{
+	Vector<String> ss = Split((String)~search, ' ');
+	Vector<int> sdx;
+	for(int i = 0; i < ss.GetCount(); i++)
+		sdx.Add(TopicWordIndex(ToUtf8(ToLower(FromUtf8(ss[i])))));
+
+	ClearTree();
+
+	static Index<String> idelink;
+	String hdx = "topic://ide/app/index$en-us";
+	if(idelink.GetCount() == 0)
+		GatherLinks(idelink, hdx);
+	int ide = AddTree(0, IdeImg::Package(), "\3" + hdx, "TheIDE help");
+	for(int i = 0; i < idelink.GetCount(); i++)
+		if(idelink[i] != hdx && MatchTopicLink(idelink[i], sdx))
+			AddTree(ide, TopicImg::Topic(), "\3" + idelink[i], GetTopic(idelink[i]).title);
+
+	Index<String> used;
+	const Workspace& wspc = GetIdeWorkspace();
+	for(int i = 0; i < wspc.GetCount(); i++)
+		used.Add(wspc[i]);
+
+	VectorMap<String, VectorMap<String, Vector<String> > > map;
+	Vector<String> upp = GetUppDirs();
+	String lng = ~lang;
+	lang.Clear();
+	lang.Add("All");
+	Index<String> li;
+	for(int i = 0; i < upp.GetCount(); i++) {
+		TopicLink tl;
+		for(FindFile pff(AppendFileName(upp[i], "*.*")); pff; pff.Next()) {
+			if(pff.IsFolder()) {
+				String pdir = AppendFileName(upp[i], pff.GetName());
+				tl.package = pff.GetName();
+				for(FindFile ff(AppendFileName(pdir, "*.tpp")); ff; ff.Next())
+					if(ff.IsFolder()) {
+						tl.group = GetFileTitle(ff.GetName());
+						String dir = AppendFileName(pdir, ff.GetName());
+						for(FindFile ft(AppendFileName(dir, "*.tpp")); ft; ft.Next())
+							if(ft.IsFile()) {
+								tl.topic = GetFileTitle(ft.GetName());
+								int q = tl.topic.ReverseFind('$');
+								String l;
+								if(q >= 0) {
+									l = ToUpper(tl.topic.Mid(q + 1));
+									li.FindAdd(l);
+								}
+								String link = TopicLinkString(tl);
+								if(idelink.Find(link) < 0 && MatchTopicLink(link, sdx) &&
+								   (lng == "All" || lng == l))
+									map.GetAdd(tl.package).GetAdd(tl.group).Add(tl.topic);
+							}
+					}
+			}
+		}
+	}
+	Vector<String> sli = li.PickKeys();
+	Sort(sli);
+	for(int i = 0; i < sli.GetCount(); i++)
+		lang.Add(sli[i]);
+	if(lang.Find(lng))
+		lang <<= lng;
+
+	int usid = AddTree(0, IdeImg::Package(), Null, "Used packages");
+	int otid = AddTree(0, IdeImg::Package(), Null, "Other packages");
+
+	for(int i = 0; i < map.GetCount(); i++) {
+		TopicLink tl;
+		tl.package = map.GetKey(i);
+		int pid = AddTree(used.Find(tl.package) >= 0 ? usid : otid,
+		                      TopicImg::Package(), Null, tl.package);
+		VectorMap<String, Vector<String> >& package = map[i];
+		for(int i = 0; i < package.GetCount(); i++) {
+			tl.group = package.GetKey(i);
+			if(all || tl.group == "src" || tl.group == "srcdoc" || tl.group == "srcimp") {
+				int gid = AddTree(pid, Null, "\1" + tl.group, tl.group);
+				Vector<String> group = package[i];
+				for(int i = 0; i < group.GetCount(); i++) {
+					tl.topic = group[i];
+					String p = TopicLinkString(tl);
+					String t = GetTopicTitle(p);
+					AddTree(gid, TopicImg::Topic(), p, t);
+				}
+			}
+		}
+	}
+	SortTree(ide);
+	SortTree(usid);
+	SortTree(otid);
+	FinishTree();
+	if(sdx.GetCount())
+		OpenDeep();
+}
+
+Vector<String> GetTypeRefLinks(const String& t, String &label)
+{
+	const char *tp[] = { "", "::struct", "::class", "::union", "::typedef", "::enum" };
+	Vector<String> f;
+	for(int i = 0; i < __countof(tp); i++) {
+		label = t + tp[i];
+		f = GetRefLinks(label);
+		if(f.GetCount())
+			break;
+	}
+	return f;
+}
+
+String recent_topic;
+
+Topic TopicCtrl::AcquireTopic(const String& t)
+{
+	recent_topic = t;
+	String topic = t;
+	internal = (byte)*topic < 32;
+	if(*topic == '\3')
+		return GetTopic(topic.Mid(1));
+	if(*topic == '\1') {
+		Topic t;
+		t.title = "Summary";
+		String group = topic.Mid(1);
+		const Workspace& wspc = GetIdeWorkspace();
+		for(int i = 0; i < wspc.GetCount(); i++) {
+			String package = wspc[i];
+			String path = AppendFileName(AppendFileName(PackageDirectory(wspc[i]), group + ".tpp"), "index$en-us.tpp");
+			if(FileExists(path)) {
+				t.text << "[R5* " << wspc[i] << "]&" << ReadTopic(LoadFile(path)).text << "&&&";
+			}
+		}
+		return t;
+	}
+	if(*topic == '\2')
+		topic = topic.Mid(1);
+	if(topic[0] == ':' && topic[1] == ':') {
+		String lbl;
+		Vector<String> link = GetTypeRefLinks(topic, lbl);
+		if(link.GetCount() == 0)
+			return Topic();
+		if(link.GetCount() == 1)
+			topic = link[0];
+		else {
+			WithSimpleListLayout<TopWindow> dlg;
+			CtrlLayoutOKCancel(dlg, "Choose one of more link targets");
+			dlg.list.AddKey();
+			dlg.list.AddColumn("Topic");
+			for(int i = 0; i < link.GetCount(); i++)
+				dlg.list.Add(link[i], GetTopicTitle(link[i]));
+			dlg.list.SetCursor(0);
+			if(dlg.Run() != IDOK || !dlg.list.IsCursor())
+				return Topic();
+			topic = dlg.list.GetKey();
+		}
+		if(lbl.GetCount())
+			topic << '#' << lbl;
+	}
+	TopicLink tl = ParseTopicLink(topic);
+	if(!IsNull(tl.package)) {
+		String path = AppendFileName(
+						AppendFileName(PackageDirectory(tl.package), tl.group + ".tpp"),
+						tl.topic + ".tpp");
+		Topic t = ReadTopic(LoadFile(path));
+		t.label = tl.label;
+		tl.label.Clear();
+		t.link = TopicLinkString(tl);
+		return t;
+	}
+	return Topic();
+}
+
+struct HighlightWords : RichText::Iterator {
+	Index<String> words;
+	struct Pos : Moveable<Pos> { int pos, len; };
+	Vector<Pos>   pos;
+
+	virtual bool operator()(int tpos, const RichPara& para) {
+		WString text = para.GetText();
+		const wchar *s = text;
+		for(;;) {
+			while(!IsLetter(*s) && *s)
+				s++;
+			if(*s == '\0')
+				break;
+			WStringBuffer wb;
+			const wchar *b = s;
+			while(IsLetter(*s))
+				wb.Cat(ToLower(*s++));
+			if(words.Find(FromUnicode(wb)) >= 0) {
+				Pos& p = pos.Add();
+				p.pos = int(b - ~text) + tpos;
+				p.len = int(s - b);
+			}
+		}
+		return false;
+	}
+};
+
+void TopicCtrl::FinishText(RichText& text)
+{
+	if(!showwords)
+		return;
+	Vector<String> ss = Split((String)~search, ' ');
+	if(ss.GetCount() == 0)
+		return;
+	HighlightWords hw;
+	hw.words = ss;
+	text.Iterate(hw);
+	RichText::FormatInfo fi;
+	fi.charvalid = RichText::PAPER|RichText::INK;
+	fi.paravalid = 0;
+	fi.paper = SColorHighlight();
+	fi.ink = SColorHighlightText();
+	for(int i = 0; i < hw.pos.GetCount(); i++)
+		text.ApplyFormatInfo(hw.pos[i].pos, fi, hw.pos[i].len);
+}
+
+void TopicCtrl::OpenTopic()
+{
+	WhenTopic();
+}
+
+void TopicCtrl::Search()
+{
+	if(issearch) {
+		search <<= Null;
+		issearch = false;
+	}
+	else {
+		search.AddHistory(20);
+		issearch = true;
+	}
+	SyncDocTree();
+	SetBar();
+}
+
+void TopicCtrl::SearchWord(const String& s)
+{
+	issearch = false;
+	search <<= s;
+	Search();
+}
+
+void TopicCtrl::ShowWords()
+{
+	showwords = !showwords;
+	SetBar();
+	GoTo(GetCurrent());
+}
+
+void TopicCtrl::All()
+{
+	all = !all;
+	SyncDocTree();
+	SetBar();
+}
+
+void TopicCtrl::Lang()
+{
+	SyncDocTree();
+	SetBar();
+}
+
+bool TopicCtrl::Key(dword key, int count)
+{
+	if(key == K_ENTER && search.HasFocus()) {
+		Search();
+		return true;
+	}
+	return HelpWindow::Key(key, count);
+}
+
+void  TopicCtrl::BarEx(Bar& bar)
+{
+	bar.Gap();
+	bar.Add(lang, HorzLayoutZoom(60));
+	bar.Add("All topics", IdeImg::HelpAll(), THISBACK(All))
+	   .Check(all);
+	bar.Gap(HorzLayoutZoom(30));
+	bar.Add(search_label, HorzLayoutZoom(50));
+	bar.Add(search, HorzLayoutZoom(300));
+	bar.Add("Full text search", IdeImg::HelpSearch(), THISBACK(Search))
+	   .Check(issearch);
+	bar.Add("Highlight search keywords in topic", IdeImg::ShowWords(), THISBACK(ShowWords))
+	   .Check(showwords);
+	bar.GapRight();
+	bar.Separator();
+	bar.Add(!internal && GetCurrent().StartsWith("topic:"),
+	        TopicImg::Topic(), THISBACK(OpenTopic));
+}
+
+void TopicCtrl::Serialize(Stream& s)
+{
+	int version = 2;
+	s / version;
+	search.SerializeList(s);
+	if(version >= 1)
+		s % showwords;
+	if(version >= 2)
+		s % all;
+}
+
+struct HelpDes : public IdeDesigner {
+	TopicCtrl *topic;
+
+	virtual String GetFileName() const              { return HELPNAME; }
+	virtual void   Save()                           {}
+	virtual void   EditMenu(Bar& menu)              {}
+	virtual Ctrl&  DesignerCtrl()                   { return *topic; }
+	virtual void   SetFocus()                       { topic->SetFocus(); }
+};
+
+bool IsHelpName(const char *path)
+{
+	return strcmp(path, HELPNAME) == 0;
+}
+
+struct HelpModule : public IdeModule {
+	virtual Image FileIcon(const char *path) {
+		return IsHelpName(path) ? IdeImg::help() : Null;
+	}
+	virtual IdeDesigner *CreateDesigner(Ide *ide, const char *path, byte cs) {
+		if(IsHelpName(path)) {
+			GetRefLinks("");
+			if(ide->doc.GetCurrent().IsEmpty()) {
+				ide->doc.SyncDocTree();
+				ide->doc.GoTo(Nvl(recent_topic, "\3topic://ide/app/index$en-us"));
+			}
+			HelpDes *d = new HelpDes;
+			d->topic = &ide->doc;
+			return d;
+		}
+		return false;
+	}
+	virtual void Serialize(Stream& s) {
+		s % recent_topic;
+	}
+};
+
+INITBLOCK {
+	RegisterIdeModule(Single<HelpModule>());
+}
+
+TopicCtrl::TopicCtrl()
+{
+	Icon(IdeImg::doc());
+	search_label = "Search: ";
+	showwords = issearch = all = false;
+	lang.Add("All");
+	lang.Add("EN-US");
+	lang <<= "EN-US";
+	lang <<= THISBACK(Lang);
+	lang.Tip("Language"),
+	search.Tip("Full text search");
+	internal = true;
+}
+
+void Ide::ShowTopics()
+{
+	if(designer && designer->GetFileName() == HELPNAME) {
+		CycleFiles();
+		tabi = 0;
+		return;
+	}
+	if(doc_serial != TopicEditor::GetSerial()) {
+		GetRefLinks("");
+		doc.SyncDocTree();
+		doc.GoTo("\3topic://ide/app/index$en-us");
+		doc_serial = TopicEditor::GetSerial();
+	}
+	EditFile(HELPNAME);
+}
+
+void Ide::SearchTopics()
+{
+	String s = editor.GetWord();
+	GetRefLinks("");
+	doc.SyncDocTree();
+	doc.GoTo("\3topic://ide/app/index$en-us");
+	EditFile(HELPNAME);
+	if(s.GetLength())
+		doc.SearchWord(s);
+}
+
+void Ide::RefreshBrowser()
+{
+	browser.Refresh();
+	doc.SyncDocTree();
+}
+
+void Ide::ShowTopic(String link)
+{
+	ShowTopics();
+	doc.GoTo(link + '#' + browser.GetItem());
+}
diff --git a/uppsrc/ide/Host.cpp b/uppsrc/ide/Host.cpp
new file mode 100644
index 000000000..d29ca9e1f
--- /dev/null
+++ b/uppsrc/ide/Host.cpp
@@ -0,0 +1,544 @@
+#include "ide.h"
+
+#define LLOG(x)
+
+#include <plugin/bz2/bz2.h>
+
+String LocalHost::GetEnvironment()
+{
+	return environment;
+}
+
+String LocalHost::GetHostPath(const String& path)
+{
+	return path;
+}
+
+String LocalHost::GetLocalPath(const String& path)
+{
+	return path;
+}
+
+String LocalHost::NormalizePath(const String& path)
+{
+	return ::NormalizePath(path);
+}
+
+Vector<Host::FileInfo> LocalHost::GetFileInfo(const Vector<String>& path)
+{
+	Vector<FileInfo> fi;
+	for(int i = 0; i < path.GetCount(); i++) {
+		FindFile ff(path[i]);
+		FileInfo& f = fi.Add();
+		if(ff) {
+			(Time&)f = ff.GetLastWriteTime();
+#ifdef PLATFORM_WIN32
+			f.second = f.second & ~1; // FAT vs NTFS accuracy fix
+#endif
+			f.length = ff.IsFile() ? (int)ff.GetLength() : -1;
+		}
+		else {
+			(Time&)f = Time::Low();
+			f.length = Null;
+		}
+	}
+	return fi;
+}
+
+void LocalHost::DeleteFile(const Vector<String>& path)
+{
+	for(int i = 0; i < path.GetCount(); i++)
+		::DeleteFile(path[i]);
+}
+
+void LocalHost::DeleteFolderDeep(const String& folder)
+{
+	::DeleteFolderDeep(folder);
+}
+
+void LocalHost::ChDir(const String& path)
+{
+#ifdef PLATFORM_WIN32
+	SetCurrentDirectory(path);
+#endif
+#ifdef PLATFORM_POSIX
+	chdir(path);
+#endif
+	if(cmdout)
+		*cmdout << "cd \"" << GetHostPath(path) << "\"\n";
+}
+
+void LocalHost::DoDir(const String& dir)
+{
+	if(dir.GetLength() > 3) {
+		DoDir(GetFileFolder(dir));
+		*cmdout << "mkdir \"" << dir << "\"\n";
+	}
+}
+
+void LocalHost::RealizeDir(const String& path)
+{
+	RealizeDirectory(path);
+	if(cmdout)
+		DoDir(path);
+}
+
+void    LocalHost::SaveFile(const String& path, const String& data)
+{
+	::SaveFile(path, data);
+}
+
+String  LocalHost::LoadFile(const String& path)
+{
+	return ::LoadFile(path);
+}
+
+int LocalHost::Execute(const char *cmdline)
+{
+	if(cmdout)
+		*cmdout << cmdline << '\n';
+	PutVerbose(cmdline);
+	int q = IdeConsoleExecute(FindCommand(exedirs, cmdline), NULL, environment, false);
+	PutVerbose(Format("Exitcode: %d", q));
+	return q;
+}
+
+int LocalHost::ExecuteWithInput(const char *cmdline)
+{
+	if(cmdout)
+		*cmdout << cmdline << '\n';
+	PutVerbose(cmdline);
+	int q = IdeConsoleExecuteWithInput(FindCommand(exedirs, cmdline), NULL, environment, false);
+	PutVerbose(Format("Exitcode: %d", q));
+	return q;
+}
+
+int LocalHost::Execute(const char *cmdline, Stream& out)
+{
+	PutVerbose(cmdline);
+	int q = IdeConsoleExecute(FindCommand(exedirs, cmdline), &out, environment, true);
+	PutVerbose(Format("Exitcode: %d", q));
+	return q;
+}
+
+int LocalHost::AllocSlot()
+{
+	return IdeConsoleAllocSlot();
+}
+
+bool LocalHost::Run(const char *cmdline, int slot, String key, int blitz_count)
+{
+	return IdeConsoleRun(FindCommand(exedirs, cmdline), NULL, environment, false, slot, key, blitz_count);
+}
+
+bool LocalHost::Run(const char *cmdline, Stream& out, int slot, String key, int blitz_count)
+{
+	return IdeConsoleRun(FindCommand(exedirs, cmdline), &out, environment, true, slot, key, blitz_count);
+}
+
+bool LocalHost::Wait()
+{
+	return IdeConsoleWait();
+}
+
+One<SlaveProcess> LocalHost::StartProcess(const char *cmdline)
+{
+	try {
+		PutVerbose(cmdline);
+		return ::StartProcess(FindCommand(exedirs, cmdline), environment, REMOTE_TIMEOUT);
+	}
+	catch(...) {
+		return NULL;
+	}
+}
+
+#ifdef PLATFORM_POSIX
+//#BLITZ_APPROVE
+#include <signal.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+
+static Vector<int>& sPid()
+{
+	static Vector<int> q;
+	return q;
+}
+
+void sCleanZombies(int signal_number)
+{
+	Vector<int>& pid = sPid();
+	int i = 0;
+	while(i < pid.GetCount())
+		if(pid[i] && waitpid(pid[i], 0, WNOHANG | WUNTRACED) > 0)
+			pid.Remove(i);
+		else
+			i++;
+}
+#endif
+
+String LinuxHostConsole = "/usr/bin/xterm -e";
+
+void LocalHost::Launch(const char *_cmdline, bool console)
+{
+	String cmdline = FindCommand(exedirs, _cmdline);
+	PutVerbose(cmdline);
+#ifdef PLATFORM_WIN32
+	if(console)
+		cmdline = GetExeFilePath() + " ! " + cmdline;
+	int n = cmdline.GetLength() + 1;
+	Buffer<char> cmd(n);
+	memcpy(cmd, cmdline, n);
+	SECURITY_ATTRIBUTES sa;
+	sa.nLength = sizeof(SECURITY_ATTRIBUTES);
+	sa.lpSecurityDescriptor = NULL;
+	sa.bInheritHandle = TRUE;
+	PROCESS_INFORMATION pi;
+	STARTUPINFO si;
+	ZeroMemory(&si, sizeof(STARTUPINFO));
+	si.cb = sizeof(STARTUPINFO);
+	Buffer<char> env(environment.GetCount() + 1);
+	memcpy(env, environment, environment.GetCount() + 1);
+	if(CreateProcess(NULL, cmd, &sa, &sa, TRUE,
+		             NORMAL_PRIORITY_CLASS|CREATE_NEW_CONSOLE,
+	                ~env, NULL, &si, &pi)) {
+		CloseHandle(pi.hProcess);
+		CloseHandle(pi.hThread);
+	}
+	else
+		PutConsole("Unable to launch " + String(_cmdline));
+#endif
+#ifdef PLATFORM_POSIX
+	String script = ConfigFile("console-script-" + AsString(getpid()));
+	if(console) {
+		FileStream out(script, FileStream::CREATE, 0777);
+		out << "#!/bin/sh\n"
+		    << cmdline << '\n'
+		    << "echo \"<--- Finished, press any key to close the window --->\"\nread\n";
+		cmdline = LinuxHostConsole + " bash " + script;
+	}
+	DUMP(LoadFile(script));
+	SaveFile(GetHomeDirFile("test"), LoadFile(script));
+	Buffer<char> cmd_buf(strlen(cmdline) + 1);
+	char *cmd_out = cmd_buf;
+	Vector<char *> args;
+	const char *p = cmdline;
+	const char *b = p;
+	while(*p && (byte)*p > ' ')
+		if(*p++ == '\"')
+			while(*p && *p++ != '\"')
+				;
+	args.Add(cmd_out);
+	memcpy(cmd_out, b, p - b);
+	cmd_out += p - b;
+	*cmd_out++ = '\0';
+
+	while(*p)
+		if((byte)*p <= ' ')
+			p++;
+		else {
+			args.Add(cmd_out);
+			b = p;
+			while(*p && (byte)*p > ' ')
+				if(*p++ == '\"')
+				{
+					memcpy(cmd_out, b, p - b - 1);
+					cmd_out += p - b - 1;
+					b = p;
+					while(*p && *p != '\"')
+						p++;
+					memcpy(cmd_out, b, p - b);
+					cmd_out += p - b;
+					if(*p == '\"')
+						p++;
+					b = p;
+				}
+			memcpy(cmd_out, b, p - b);
+			cmd_out += p - b;
+			*cmd_out++ = '\0';
+		}
+
+	args.Add(NULL);
+
+	ONCELOCK {
+		struct sigaction sigchld_action;
+  		memset(&sigchld_action, 0, sizeof(sigchld_action));
+  		sigchld_action.sa_handler = sCleanZombies;
+  		sigaction(SIGCHLD, &sigchld_action, NULL);
+	}
+
+	pid_t pid = fork();
+	if(pid == 0)
+	{
+		const char *from = environment;
+		Vector<const char *> env;
+		while(*from)
+		{
+			env.Add(from);
+			from += strlen(from) + 1;
+		}
+		env.Add(NULL);
+		const char **envp = env.Begin();
+		execve(args[0], args, (char *const *)envp);
+		abort();
+	}
+	LLOG("Launch pid: " << pid);
+	sPid().Add(pid);
+#endif
+}
+
+void LocalHost::AddFlags(Index<String>& cfg)
+{
+#if   defined(PLATFORM_WIN32)
+	cfg.Add("WIN32");
+#endif
+#ifdef PLATFORM_LINUX
+	cfg.Add("LINUX");
+#elif defined(PLATFORM_FREEBSD)
+	cfg.Add("FREEBSD");
+#elif defined(PLATFORM_SOLARIS)
+	cfg.Add("SOLARIS");
+#elif defined(PLATFORM_OSX11)
+	cfg.Add("OSX11");
+#endif
+}
+
+static bool IsSamePath(const char *a, const char *b, int count) {
+	for(; --count >= 0; a++, b++)
+		if(a != b && ToLower(*a) != ToLower(*b) && !((*a == '\\' || *a == '/') && (*b == '\\' || *b == '/')))
+			return false;
+	return true;
+}
+
+String RemoteHost::GetEnvironment()
+{
+	return environment;
+}
+
+String RemoteHost::GetHostPath(const String& path)
+{
+	bool slash = (os_type != "WINDOWS");
+	for(int i = 0; i < path_map_local.GetCount(); i++) {
+		String lc = path_map_local[i];
+		if(path.GetLength() >= lc.GetLength() && IsSamePath(path, lc, lc.GetLength()))
+		{
+			String r = CatAnyPath(path_map_remote[i], path.Mid(lc.GetLength()));
+			return slash ? UnixPath(r) : WinPath(r);
+		}
+	}
+	return slash ? UnixPath(path) : WinPath(path);
+}
+
+String RemoteHost::GetLocalPath(const String& path)
+{
+	for(int i = 0; i < path_map_remote.GetCount(); i++) {
+		String rc = path_map_remote[i];
+		if(path.GetLength() >= rc.GetLength() && IsSamePath(path, rc, rc.GetLength()))
+		   return path_map_local[i] + path.Mid(rc.GetLength());
+	}
+	if(!memcmp(path, "/cygdrive/", 10))
+	{
+		const char *s = path.Begin() + 10;
+		String out;
+		if(*s)
+			out << *s++ << ':';
+		out << s;
+		return out;
+	}
+	return NativePath(path);
+}
+
+String RemoteHost::NormalizePath(const String& path)
+{
+	return path;
+}
+
+String RemoteHost::RemoteExec(String cmd)
+{
+	Socket socket;
+	String sockerr;
+/*
+	String hostname = host;
+	int port = 2346;
+	int ppos = hostname.Find(':');
+	if(ppos >= 0)
+	{
+		port = atoi(host.GetIter(ppos + 1));
+		hostname.Trim(ppos);
+	}
+*/
+	if(!ClientSocket(socket, host, port, true, NULL, 2000)) {
+		PutConsole(NFormat("Error connecting to '%s', port %d: %s", host, port, Socket::GetErrorText()));
+		return String::GetVoid();
+	}
+	socket.Write(cmd);
+	socket.Write("\0", 1);
+	return socket.ReadUntil('\0', Null, 10000000);
+}
+
+Vector<Host::FileInfo> RemoteHost::GetFileInfo(const Vector<String>& path)
+{
+	VectorMap<String, FileInfo> out;
+	out.Reserve(path.GetCount());
+	String request;
+	request << "@" << (int)(GetSysTime() - TimeBase()) << ":";
+	for(int i = 0; i < path.GetCount(); i++)
+	{
+		String hp = GetHostPath(path[i]);
+		request << hp << "\n";
+		FileInfo& fi = out.Add(hp);
+		(Time&)fi = Time::Low();
+		fi.length = Null;
+	}
+	String result = RemoteExec(request);
+	const char *p = result;
+	while(*p)
+	{
+		const char *b = p;
+		while(*p && *p != '\n' && *p != '\t')
+			p++;
+		String fn(b, p);
+		Time time = Time::Low();
+		int size = Null;
+		if(*p == '\t')
+		{
+			int t = ScanInt(p + 1, &p);
+			if(!IsNull(t))
+				time = TimeBase() + t;
+			if(*p == '\t')
+				size = ScanInt(p + 1, &p);
+		}
+		int ifn = out.Find(fn);
+		if(ifn >= 0)
+		{
+			(Time&)out[ifn] = time;
+			out[ifn].length = size;
+		}
+		while(*p && *p++ != '\n')
+			;
+	}
+	return out.PickValues();
+}
+
+void RemoteHost::DeleteFile(const Vector<String>& path)
+{
+	String request = "-";
+	for(int i = 0; i < path.GetCount(); i++)
+		request << GetHostPath(path[i]) << "\n";
+	String out = RemoteExec(request);
+	if(!IsNull(out) && out != "OK")
+		PutVerbose(out);
+}
+
+void RemoteHost::DeleteFolderDeep(const String& folder)
+{
+	String out = RemoteExec("~" + GetHostPath(folder));
+	if(out != "OK")
+		PutConsole(out);
+}
+
+void RemoteHost::ChDir(const String& path)
+{
+	chdir_path = GetHostPath(path);
+}
+
+void RemoteHost::RealizeDir(const String& path)
+{
+	RemoteExec("*" + GetHostPath(path));
+}
+
+void RemoteHost::SaveFile(const String& path, const String& data)
+{
+	String request;
+	request << ">" << GetHostPath(path)
+		<< "\t" << int(GetSysTime() - TimeBase())
+		<< "\t" << data.GetLength()
+		<< "\t" << ASCII85Encode(BZ2Compress(data))
+		<< "\n";
+	String out = RemoteExec(request);
+	if(out != "OK")
+		PutConsole(out);
+}
+
+String  RemoteHost::LoadFile(const String& path)
+{
+	String hpath = GetHostPath(path);
+	String request = "^" + hpath;
+	String out = RemoteExec(request);
+	const char *p = out;
+	while(*p && *p != '\n' && *p != '\t')
+		p++;
+	if(*p++ != '\t')
+		return String::GetVoid();
+	int len = ScanInt(p, &p);
+	if(IsNull(len) || len <= 0 || *p++ != '\t')
+		return String::GetVoid();
+	String data = BZ2Decompress(ASCII85Decode(p));
+	if(data.GetLength() != len)
+	{
+		PutConsole(NFormat("%s: decompressed length (%d) doesn't match length in header (%d)",
+			hpath, data.GetLength(), len));
+		return String::GetVoid();
+	}
+	return data;
+}
+
+int RemoteHost::Execute(const char *cmdline)
+{
+	int q = IdeConsoleExecute(StartProcess(cmdline), cmdline);
+	PutVerbose(Format("Exitcode: %d", q));
+	return q;
+}
+
+int RemoteHost::ExecuteWithInput(const char *cmdline)
+{
+	int q = IdeConsoleExecute(StartProcess(cmdline), cmdline);
+	PutVerbose(Format("Exitcode: %d", q));
+	return q;
+}
+
+int RemoteHost::Execute(const char *cmdline, Stream& out)
+{
+	int q = IdeConsoleExecute(StartProcess(cmdline), cmdline, &out, true);
+	PutVerbose(Format("Exitcode: %d", q));
+	return q;
+}
+
+int RemoteHost::AllocSlot()
+{
+	return IdeConsoleAllocSlot();
+}
+
+bool RemoteHost::Run(const char *cmdline, int slot, String key, int blitz_count)
+{
+	return IdeConsoleRun(StartProcess(cmdline), cmdline, NULL, false, slot, key, blitz_count);
+}
+
+bool RemoteHost::Run(const char *cmdline, Stream& out, int slot, String key, int blitz_count)
+{
+	return IdeConsoleRun(StartProcess(cmdline), cmdline, &out, false, slot, key, blitz_count);
+}
+
+bool RemoteHost::Wait()
+{
+	return IdeConsoleWait();
+}
+
+One<SlaveProcess> RemoteHost::StartProcess(const char *cmdline)
+{
+	try {
+		PutVerbose(cmdline);
+		return StartRemoteProcess(host, port, cmdline, environment, REMOTE_TIMEOUT);
+	}
+	catch(...) {
+		return NULL;
+	}
+}
+
+void RemoteHost::Launch(const char *_cmdline, bool)
+{
+}
+
+void RemoteHost::AddFlags(Index<String>& cfg)
+{
+	cfg.Add(os_type);
+}
diff --git a/uppsrc/ide/IconDes/IconDes.h b/uppsrc/ide/IconDes/IconDes.h
new file mode 100644
index 000000000..f8e74ffc8
--- /dev/null
+++ b/uppsrc/ide/IconDes/IconDes.h
@@ -0,0 +1,30 @@
+#ifndef _ide_IconDes_IconDes_h_
+#define _ide_IconDes_IconDes_h_
+
+#include <ide/Common/Common.h>
+#include <IconDes/IconDes.h>
+
+struct IdeIconDes : IdeDesigner, IconDes {
+	virtual String GetFileName() const;
+	virtual void   Save();
+	virtual void   SaveEditPos();
+	virtual void   EditMenu(Bar& menu);
+	virtual Ctrl&  DesignerCtrl()             { return *this; }
+
+	virtual void Serialize(Stream& s);
+
+	int     format;
+	String  filename;
+	Time    filetime;
+
+	virtual void   ToolEx(Bar& bar);
+
+	bool   Load(const char *filename);
+	void   FileProperties();
+
+	typedef IdeIconDes CLASSNAME;
+
+	IdeIconDes()                              { format = 0; }
+};
+
+#endif
diff --git a/uppsrc/ide/IconDes/IconDes.upp b/uppsrc/ide/IconDes/IconDes.upp
new file mode 100644
index 000000000..ea9f95e38
--- /dev/null
+++ b/uppsrc/ide/IconDes/IconDes.upp
@@ -0,0 +1,10 @@
+description "TheIDE - .iml designer";
+
+uses
+	IconDes,
+	ide\Common;
+
+file
+	IconDes.h,
+	IdeDes.cpp;
+
diff --git a/uppsrc/ide/IconDes/IdeDes.cpp b/uppsrc/ide/IconDes/IdeDes.cpp
new file mode 100644
index 000000000..3d3d6f534
--- /dev/null
+++ b/uppsrc/ide/IconDes/IdeDes.cpp
@@ -0,0 +1,192 @@
+#include "IconDes.h"
+
+#include <plugin/bmp/bmp.h>
+#include <plugin/png/png.h>
+
+bool IdeIconDes::Load(const char *_filename)
+{
+	Clear();
+	filename = _filename;
+	filetime = FileGetTime(filename);
+	Array<ImlImage> m;
+	int f;
+	if(!LoadIml(LoadFile(filename), m, f))
+		return false;
+	format = f;
+	for(int i = 0; i < m.GetCount(); i++)
+		AddImage(m[i].name, m[i].image, m[i].exp);
+	return true;
+}
+
+
+void IdeIconDes::Save()
+{
+	if(format == 1) {
+		for(int i = 0; i < GetCount(); i++) {
+			Image m = GetImage(i);
+			Point p = m.Get2ndSpot();
+			if(m.GetKind() == IMAGE_ALPHA || p.x || p.y) {
+				if(PromptYesNo("Legacy file format does not support images "
+				               "with full alpha channel or 2nd hotspot - "
+				               "the information would be lost.&"
+				               "Do you wish to convert the file to the new format?")) {
+					format = 0;
+				}
+				break;
+			}
+		}
+	}
+	StoreToGlobal(*this, "icondes-ctrl");
+	Array<ImlImage> m;
+	VectorMap<Size, Image> exp;
+	String folder = GetFileFolder(filename);
+	for(int i = 0; i < GetCount(); i++) {
+		ImlImage& c = m.Add();
+		c.name = GetName(i);
+		c.image = GetImage(i);
+		c.exp = GetExport(i);
+		if(c.exp) {
+			Size sz = c.image.GetSize();
+			exp.GetAdd(sz) = c.image;
+			PNGEncoder png;
+			png.SaveFile(AppendFileName(folder, String().Cat() << "icon" << sz.cx << 'x' << sz.cy << ".png"), c.image);
+		}
+	}
+	String d = SaveIml(m, format);
+	if(!SaveChangedFileFinish(filename, d))
+		return;
+	filetime = FileGetTime(filename);
+	if(exp.GetCount())
+		SaveFile(AppendFileName(folder, "icon.ico"), WriteIcon(exp.GetValues()));
+}
+
+void IdeIconDes::ToolEx(Bar& bar)
+{
+	bar.Separator();
+	bar.Add("File properties..", IconDesImg::FileProperties(), THISBACK(FileProperties));
+}
+
+void IdeIconDes::FileProperties()
+{
+	WithFilePropertiesLayout<TopWindow> dlg;
+	CtrlLayoutOKCancel(dlg, "File properties");
+	dlg.format <<= format;
+	if(dlg.Run() == IDOK)
+		format = ~dlg.format;
+}
+
+void IdeIconDes::Serialize(Stream& s)
+{
+	SerializeSettings(s);
+}
+
+struct IdeIconEditPos : IconDes::EditPos, Moveable<IdeIconEditPos> {
+	Time filetime;
+
+	IdeIconEditPos() { filetime = Null; }
+};
+
+static VectorMap<String, IdeIconEditPos>& sEP()
+{
+	static VectorMap<String, IdeIconEditPos> x;
+	return x;
+}
+
+void IdeIconDes::SaveEditPos()
+{
+	IdeIconEditPos& ep = sEP().GetAdd(filename);
+	ep.filetime = filetime;
+	(EditPos&)ep = GetEditPos();
+}
+
+void SerializeIconDesPos(Stream& s)
+{
+	VectorMap<String, IdeIconEditPos>& filedata = sEP();
+	if(s.IsStoring()) {
+		for(int i = 0; i < filedata.GetCount(); i++) {
+			String fn = filedata.GetKey(i);
+			if(!fn.IsEmpty()) {
+				FindFile ff(fn);
+				IdeIconEditPos& ep = filedata[i];
+				if(ff && ff.GetLastWriteTime() == ep.filetime) {
+					s % fn;
+					s % ep.filetime;
+					s % ep.cursor;
+					s % ep.sc;
+				}
+			}
+		}
+		String end;
+		s % end;
+	}
+	else {
+		String fn;
+		filedata.Clear();
+		for(;;) {
+			s % fn;
+			if(fn.IsEmpty()) break;
+			IdeIconEditPos& ep = filedata.GetAdd(fn);
+			s % ep.filetime;
+			s % ep.cursor;
+			s % ep.sc;
+		}
+	}
+}
+
+String IdeIconDes::GetFileName() const
+{
+	return filename;
+}
+
+bool IsImlFile(const char *path)
+{
+	return ToLower(GetFileExt(path)) == ".iml";
+}
+
+void IdeIconDes::EditMenu(Bar& bar)
+{
+	EditBar(bar);
+	ToolEx(bar);
+	bar.Add("List", THISBACK(ListMenu));
+	bar.Add("Selection", THISBACK(SelectBar));
+	bar.Add("Image", THISBACK(ImageBar));
+	bar.Add("Draw", THISBACK(DrawBar));
+	bar.Add("Settings", THISBACK(SettingBar));
+}
+
+struct IconDesModule : public IdeModule {
+	virtual void CleanUsc() {}
+	virtual bool ParseUsc(CParser& p) { return false; }
+	virtual Image FileIcon(const char *path) {
+		return IsImlFile(path) ? IconDesImg::FileIcon() : Null;
+	}
+	virtual IdeDesigner *CreateDesigner(const char *path, byte) {
+		if(IsImlFile(path)) {
+			IdeIconDes *d = new IdeIconDes;
+			LoadFromGlobal(*d, "icondes-ctrl");
+			if(d->Load(path)) {
+				IdeIconEditPos& ep = sEP().GetAdd(path);
+				if(ep.filetime == d->filetime)
+					d->SetEditPos(ep);
+				return d;
+			}
+			delete d;
+			return NULL;
+		}
+		return false;
+	}
+	virtual void Serialize(Stream& s) {
+		int version = 0;
+		s / version;
+		SerializeIconDesPos(s);
+	}
+};
+
+void RegisterIconDes()
+{
+	RegisterIdeModule(Single<IconDesModule>());
+}
+
+INITBLOCK {
+	RegisterGlobalConfig("icondes-ctrl");
+}
diff --git a/uppsrc/ide/IconDes/init b/uppsrc/ide/IconDes/init
new file mode 100644
index 000000000..8edf92c27
--- /dev/null
+++ b/uppsrc/ide/IconDes/init
@@ -0,0 +1,5 @@
+#ifndef _ide_IconDes_icpp_init_stub
+#define _ide_IconDes_icpp_init_stub
+#include "IconDes/init"
+#include "ide\Common/init"
+#endif
diff --git a/uppsrc/ide/Index.cpp b/uppsrc/ide/Index.cpp
new file mode 100644
index 000000000..2d7308c13
--- /dev/null
+++ b/uppsrc/ide/Index.cpp
@@ -0,0 +1,256 @@
+#include "ide.h"
+
+void AssistEditor::CreateIndex()
+{
+	searchindex.Clear();
+	Renumber2();
+	indexitem.Clear();
+	if(!assist_active) {
+		indexframe.Show(false);
+		return;
+	}
+	const Index<String>& cppkeywords = CppKeywords();
+	String sop = "operator";
+	String klass;
+	for(int i = 0; i < min(GetLineCount(), 10000); i++) {
+		String l = GetEncodedLine(i, CHARSET_UTF8);
+		int plevel = 0;
+		int tlevel = 0;
+		Color ink = Gray;
+		bool fn = false;
+		bool td = false;
+		if(l[0] > 32) {
+			String nklass, id;
+			try {
+				CParser p(l);
+				if(p.Char('#')) {
+					if(p.Id("define") && p.IsId()) {
+						id = p.ReadId();
+						ink = Magenta;
+					}
+				}
+				else {
+					while(!p.IsEof())
+						if(p.Id("typedef")) {
+							td = true;
+							ink = LtBlue;
+						}
+						else
+						if((p.Id("class") || p.Id("struct") || p.Id("union") || p.Id("enum")) && tlevel == 0 && p.IsId()) {
+							id = p.ReadId();
+							if(p.Char(';'))
+								id.Clear();
+							ink = LtBlue;
+							break;
+						}
+						else
+						if(p.Char('~') && p.IsId())
+							id = '~' + p.ReadId();
+						else
+						if(p.Char2(':', ':') && tlevel == 0)
+							nklass = id;
+						else
+						if(p.IsId() && tlevel == 0) {
+							id = p.ReadId();
+							if(id == sop) {
+								static char oc[] = "<>!^&*+=-%";
+								while(strchr(oc, *p.GetPtr())) {
+									id.Cat(*p.GetPtr());
+									p.SkipTerm();
+								}
+							}
+						}
+						else
+						if(p.Char('(')) {
+							if(plevel == 0) {
+								fn = true;
+								ink = Black;
+								int q = i;
+								for(;;) {
+									if(p.IsEof()) {
+										if(++q >= GetLineCount() || q > i + 6) {
+											id.Clear();
+											break;
+										}
+										l = GetEncodedLine(q, CHARSET_UTF8);
+										p.Set(l);
+									}
+									if(p.Char('{'))
+										break;
+									if(p.Char(';')) {
+										id.Clear();
+										break;
+									}
+									p.SkipTerm();
+								}
+								break;
+							}
+							plevel++;
+						}
+						else
+						if(p.Char(')'))
+							plevel--;
+						else
+						if(p.Char('>')) {
+							tlevel--;
+							id.Clear();
+						}
+						else
+						if(p.Char('<'))
+							tlevel++;
+						else
+						if(p.Char(';') || p.Char('=') && plevel == 0) {
+							if(!td) ink = Green;
+							break;
+						}
+						else
+							p.SkipTerm();
+				}
+			}
+			catch(CParser::Error) {}
+			if(id.GetCount() && CppKeywords().Find(id) < 0) {
+				if(nklass != klass) {
+					klass = nklass;
+					if(klass.GetCount()) {
+						IndexItem& m = indexitem.Add();
+						m.text = klass + "::";
+						m.ink = LtBlue;
+						m.line = i;
+					}
+				}
+				if(klass.GetCount())
+					id = "  " + id;
+				IndexItem& m = indexitem.Add();
+				m.text = id;
+				m.ink = ink;
+				m.line = i;
+			}
+		}
+	}
+	SyncIndex();
+	SyncIndexCursor();
+}
+
+void AssistEditor::SyncIndex()
+{
+	searchindex.NullText(String("Search (") + GetKeyDesc(IdeKeys::AK_SEARCHINDEX().key[0]) + ") ",
+	                     StdFont().Italic(), SColorDisabled());
+	bool b = indexitem.GetCount() && showindex && assist_active;
+	indexframe.Show(b);
+	index.Clear();
+	if(!b) return;
+	String s = ~searchindex;
+	for(int i = 0; i < indexitem.GetCount(); i++) {
+		const IndexItem& m = indexitem[i];
+		if(s.GetCount() == 0 || ToUpper(m.text).Find(s) >= 0)
+			index.Add(AttrText(m.text).Ink(m.ink), m.line);
+	}
+}
+
+void AssistEditor::IndexSync()
+{
+	if(index.IsCursor()) {
+		int q = index.Get(1);
+		for(int i = 0; i < GetLineCount(); i++)
+			if(GetLine2(i) >= q) {
+				SetCursor(GetPos(i));
+				TopCursor();
+				return;
+			}
+	}
+}
+
+void AssistEditor::IndexClick()
+{
+	IndexSync();
+	SetFocus();
+	SyncIndexCursor();
+}
+
+void AssistEditor::SyncIndexCursor()
+{
+	CodeEditor::SelectionChanged();
+	if(!index.IsCursor())
+		index.SetCursor(0);
+	if(!index.GetCount() || searchindex.HasFocus())
+		return;
+	int ln = GetLine2(GetCursorLine());
+	int ii = index.GetCursor();
+	while(ii > 0 && (int)index.Get(ii, 1) > ln)
+		ii--;
+	while(ii < index.GetCount() - 1 && (int)index.Get(ii + 1, 1) <= ln)
+		ii++;
+	index.SetCursor(ii);
+}
+
+void AssistEditor::SelectionChanged()
+{
+	SyncIndexCursor();
+}
+
+void AssistEditor::SearchIndex()
+{
+	SyncIndex();
+	index.GoBegin();
+	IndexSync();
+}
+
+bool AssistEditor::IndexKey(dword key)
+{
+	switch(key) {
+	case K_ENTER:
+	case K_ESCAPE:
+		searchindex.Clear();
+		SetFocus();
+		SyncIndex();
+		SyncIndexCursor();
+		return true;
+	case K_UP:
+	case K_DOWN:
+		index.Key(key, 1);
+		IndexSync();
+		return true;
+	}
+	return false;
+}
+
+bool AssistEditor::IsIndex()
+{
+	return showindex;
+}
+
+void AssistEditor::ShowIndex(bool b)
+{
+	showindex = b;
+	indexframe.Show(showindex);
+	if(showindex) {
+		SetFocus();
+		CreateIndex();
+		SyncIndex();
+		SyncIndexCursor();
+	}
+}
+
+void AssistEditor::SerializeIndex(Stream& s)
+{
+	int version = 0;
+	s / version;
+	s % indexframe;
+	s % showindex;
+	if(searchindex.HasFocus())
+		SetFocus();
+	SyncIndex();
+	SyncIndexCursor();
+}
+
+void Ide::ToggleIndex()
+{
+	editor.ShowIndex(!editor.IsIndex());
+}
+
+void Ide::SearchIndex()
+{
+	editor.ShowIndex(true);
+	if(editor.index.IsVisible())
+		editor.searchindex.SetFocus();
+}
diff --git a/uppsrc/ide/Install.cpp b/uppsrc/ide/Install.cpp
new file mode 100644
index 000000000..cc7720142
--- /dev/null
+++ b/uppsrc/ide/Install.cpp
@@ -0,0 +1,401 @@
+#include "ide.h"
+//#include "Install.h"
+
+#ifdef PLATFORM_WIN32
+
+String GetShellFolder(const char *name, HKEY type)
+{
+	return GetWinRegString(name, "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders", type);
+}
+
+void DelKey(const char *dir, const char *key)
+{
+	HKEY hkey;
+	if(RegOpenKeyEx(HKEY_LOCAL_MACHINE, dir, 0, KEY_READ, &hkey) != ERROR_SUCCESS)
+		return;
+	RegDeleteKey(hkey, key);
+	RegCloseKey(hkey);
+}
+
+void RemoveWindowsItems()
+{
+	DeleteFile(AppendFileName(GetShellFolder("Common Programs", HKEY_LOCAL_MACHINE), "Ultimate++ IDE.lnk"));
+	DeleteFile(AppendFileName(GetShellFolder("Desktop", HKEY_CURRENT_USER), "TheIde.lnk"));
+
+	DelKey("SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Ultimate++", "DisplayName");
+	DelKey("SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Ultimate++", "UninstallString");
+	DelKey("SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall", "Ultimate++");
+}
+
+void Uninstall()
+{
+	String path = GetExeFilePath();
+	String bat = AppendFileName(GetShellFolder("Desktop", HKEY_CURRENT_USER), "removepp.bat");
+	String dir = GetFileFolder(path);
+	if(!PromptYesNo("[*3 Do you wish to uninstall Ultimate`+`+ development system ?&&]"
+	                "Uninstall will remove [* " + DeQtf(dir) + "] directory and all "
+	                "registry and desktop items associated with Ultimate`+`+.")) return;
+	DeleteFolderDeep(dir);
+	RemoveWindowsItems();
+	SaveFile(bat,
+		":Repeat\r\n"
+		"del \"" + path + "\"\r\n"
+		"if exist \"" + path + "\" goto Repeat\r\n"
+		"del \"" + GetExeDirFile("theide.log") + "\"\r\n"
+		"del \"" + GetExeDirFile("dbghelp.dll") + "\"\r\n"
+		"rmdir \"" + dir + "\"\r\n"
+		"del \"" + bat + "\"\r\n"
+	);
+
+	STARTUPINFO si;
+	PROCESS_INFORMATION pi;
+	ZeroMemory(&si, sizeof(si));
+	si.cb = sizeof(si);
+	si.dwFlags = STARTF_USESHOWWINDOW;
+	si.wShowWindow = SW_HIDE;
+	char h[512];
+	strcpy(h, bat);
+	if(CreateProcess(NULL, h, NULL, NULL, FALSE,
+	                  IDLE_PRIORITY_CLASS, NULL, GetShellFolder("Desktop", HKEY_CURRENT_USER),
+	                  &si, &pi))
+		Exclamation("Uninstall successful.");
+	else
+		Exclamation("Uninstall failed to remove some files...&" + DeQtf(GetLastErrorMessage()));
+}
+
+#define Ptr Ptr_
+#define byte byte_
+#define CY win32_CY_
+
+
+#include <winnls.h>
+#include <winnetwk.h>
+
+#include <wincon.h>
+#include <shlobj.h>
+
+#undef Ptr
+#undef byte
+#undef CY
+
+bool CreateShellLink(const char *filepath, const char *linkpath, const char *desc, int icon)
+{
+	HRESULT hres;
+	IShellLink* psl;
+	IPersistFile* ppf;
+	CoInitialize(NULL);
+	hres = CoCreateInstance(CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER, IID_IShellLink,
+	                        (PVOID *) &psl);
+	if(SUCCEEDED(hres)) {
+		psl->SetPath(filepath);
+		psl->SetDescription(desc);
+		if(icon >= 0)
+			psl->SetIconLocation(filepath, icon);
+		hres = psl->QueryInterface(IID_IPersistFile, (PVOID *) &ppf);
+		if (SUCCEEDED(hres)) {
+			WCHAR szPath[_MAX_PATH] = { 0 };
+			MultiByteToWideChar(CP_ACP, 0, linkpath, (int)strlen(linkpath), szPath, _MAX_PATH);
+			hres = ppf->Save(szPath, TRUE);
+			ppf->Release();
+		}
+	}
+	psl->Release();
+	CoUninitialize();
+	return SUCCEEDED(hres);
+}
+
+bool InstallDesktopIcon(const char *exe, const char *lnk, const char *desc)
+{
+	return CreateShellLink(exe,
+	                       AppendFileName(GetShellFolder("Desktop", HKEY_CURRENT_USER), lnk),
+	                       desc, -1);
+}
+
+bool InstallProgramGroup(const char *exe, const char *groupname, const char *lnk, int icon = -1)
+{
+	String dir = GetShellFolder("Common Programs", HKEY_LOCAL_MACHINE);
+	if(groupname) {
+		dir = AppendFileName(dir, groupname);
+		CreateDirectory(dir, NULL);
+	}
+	return CreateShellLink(exe, AppendFileName(dir, lnk), "", icon);
+}
+
+void InstallUninstall(const char *name, const char *dname, const char *cmdline)
+{
+	String path = "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\" + String(name);
+	SetWinRegString(dname, "DisplayName", path);
+	SetWinRegString(cmdline, "UninstallString", path);
+}
+
+void InstallUninstall(const char *exe, const char *name)
+{
+	InstallUninstall(name, name, String(exe) + " -uninstall");
+}
+
+String Rdir(const char *s, const String& dir, const String& dir2)
+{
+	String r;
+	while(*s) {
+		if(*s == '#')
+			r.Cat(dir);
+		else
+		if(*s == '@')
+			r.Cat(dir2);
+		else
+			r.Cat(*s);
+		s++;
+	}
+	return r;
+}
+
+bool CheckLicense()
+{
+	if(!FileExists((GetExeDirFile("license.chk"))))
+		return true;
+	ShowSplash();
+	Ctrl::ProcessEvents();
+	Sleep(2000);
+	HideSplash();
+	Ctrl::ProcessEvents();
+	WithLicenseLayout<TopWindow> d;
+	CtrlLayoutOKCancel(d, "License agreement");
+	d.license = GetTopic("ide/app/BSD$en-us").text;
+	d.license.Margins(4);
+	d.license.SetZoom(Zoom(18, 100));
+	d.ActiveFocus(d.license);
+	if(d.Run() != IDOK) {
+		Uninstall();
+		return false;
+	}
+	DeleteFile(GetExeDirFile("license.chk"));
+	return true;
+}
+
+bool Install()
+{
+	{
+		WithInfoLayout<TopWindow> d;
+		CtrlLayoutOKCancel(d, "Installation guide");
+		d.info = GetTopic("ide/app/install$en-us").text;
+		d.info.Margins(4);
+		d.info.SetZoom(Zoom(18, 100));
+		d.ActiveFocus(d.info);
+		if(d.Run() != IDOK)
+			return false;
+		WithInstallLayout<TopWindow> dlg;
+		CtrlLayoutOKCancel(dlg, "Ultimate++ user-code setup");
+		dlg.myapps <<= GetExeFilePath().Mid(0, 3) + "MyApps";
+		dlg.ActiveFocus(dlg.myapps);
+		if(dlg.Run() != IDOK)
+			return false;
+		String ipp = GetExeDirFile("install.upp");
+		String exe = GetExeFilePath();
+		String dir = GetFileFolder(exe);
+		String dir2 = ~dlg.myapps;
+		RealizeDirectory(dir2);
+		FileIn in(ipp);
+		while(!in.IsEof()) {
+			Vector<String> ln = Split(in.GetLine(), '|');
+			if(ln.GetCount() != 4)
+				break;
+			SaveFile(AppendFileName(dir, ln[0]),
+				"UPP = " + AsCString(Rdir(ln[1], dir, dir2)) + ";\r\n"
+				"COMMON = " + AsCString(Rdir(ln[2], dir, dir2)) + ";\r\n"
+				"OUTPUT = " + AsCString(Rdir(ln[3], dir, dir2)) + ";\r\n"
+			);
+		}
+		in.Close();
+		if(dlg.icon)
+			InstallDesktopIcon(exe, "TheIde.lnk", "Ultimate++ IDE");
+		InstallProgramGroup(exe, NULL, "Ultimate++ IDE.lnk");
+		InstallUninstall(exe, "Ultimate++");
+		DeleteFile(ipp);
+	}
+	AutoSetup();
+	PromptOK("Ultimate`+`+ setup was finished.&Press OK to launch TheIDE.&"
+	         "[* WARNING:] Do not put important files into the install directory as they "
+	         "would be [* deleted] during [* uninstall] or [* upgrade] process!");;
+	return true;
+}
+
+#else
+
+bool CopyFolder(Progress& pi, const char *dst, const char *src)
+{
+	if(strcmp(src, dst) == 0)
+		return true;
+	RealizeDirectory(dst);
+	pi.SetText(dst);
+	FindFile ff(AppendFileName(src, "*"));
+	while(ff) {
+		if(pi.StepCanceled())
+			return false;
+		String s = AppendFileName(src, ff.GetName());
+		String d = AppendFileName(dst, ff.GetName());
+		if(ff.IsFolder())
+			if(!CopyFolder(pi, d, s))
+				return false;
+		if(ff.IsFile())
+			SaveFile(d, LoadFile(s));
+		ff.Next();
+	}
+	return true;
+}
+
+void ChkSupp(const char *s, String& dir)
+{
+	if(IsNull(dir) && FileExists(AppendFileName(s, "GCC.bm")))
+		dir = s;
+}
+
+String DefaultInstallFolder()
+{
+	String DefaultFolder;
+	String ExeTitle = ToUpper(GetExeTitle());
+	for(int i = 0 ; i < ExeTitle.GetCount();i++) {
+		if(ExeTitle[i] >= 'a' && ExeTitle[i] <= 'z')
+			ExeTitle.Set(i, ExeTitle[i] + 'A'-'a');
+	}
+	if(ExeTitle.Find("SVN") >= 0)
+		DefaultFolder = "upp-svn";
+	else if(ExeTitle.Find("DEV") >= 0)
+		DefaultFolder = "upp-dev";
+	else if(ExeTitle.Find("BETA") >= 0)
+		DefaultFolder = "upp-beta";
+	else
+		DefaultFolder = "upp";
+
+	return DefaultFolder;
+
+}
+
+struct XInstallDlg : public WithXInstallLayout<TopWindow> {
+
+private:
+
+	FrameRight<Button> pathbrowse;
+
+	void	FindInstFolder();
+
+public:
+
+	typedef XInstallDlg CLASSNAME;
+
+	XInstallDlg();
+
+};
+
+void XInstallDlg::FindInstFolder() {
+	FileSel *fs = &OutputFs();
+	fs->Set(path);
+	if(! fs->ExecuteSelectDir("Select output directory ..."))
+		return;
+	path <<= ~(*fs);
+}
+
+XInstallDlg::XInstallDlg() {
+	CtrlLayoutOKCancel(*this, "Ultimate++ user setup");
+	pathbrowse <<= THISBACK(FindInstFolder);
+	pathbrowse.SetMonoImage(CtrlImg::smallright()).NoWantFocus();
+	uppsrc = true;
+	reference = true;
+	examples = true;
+	tutorial = true;
+	bazaar = true;
+	path.AddFrame(pathbrowse);
+	if(FileExists(ConfigFile("installpath")))
+		path <<= LoadFile(ConfigFile("installpath"));
+	else
+		path <<= AppendFileName(FromSystemCharset(getenv("HOME")), DefaultInstallFolder());
+}
+
+bool Install()
+{
+	XInstallDlg dlg;
+	String supp;
+	String Folder = DefaultInstallFolder();
+	ChkSupp("/usr/local/share/" + Folder, supp);
+	ChkSupp("/usr/X11R6/share/" + Folder, supp);
+	ChkSupp("/usr/local/lib/" + Folder, supp);
+	ChkSupp("/usr/local/bin/" + Folder, supp);
+	ChkSupp("/usr/share/" + Folder, supp);
+	ChkSupp("/usr/lib/" + Folder, supp);
+	ChkSupp("/usr/bin/" + Folder, supp);
+	if(IsNull(supp)) {
+		Exclamation("'" + Folder + "' directory not found.");
+		return true;
+	}
+	Progress pi;
+	if(dlg.Run() != IDOK) return true;
+	String upp(dlg.path);
+
+	SaveFile(ConfigFile("installpath"), upp);
+
+	String uppsrc;
+	String pp;
+	String out = AppendFileName(upp, "out");
+	String Common = AppendFileName(upp, "Common");
+	pp << "\nOUTPUT = " << AsCString(out)
+	   << "\nCOMMON = " << AsCString(AppendFileName(upp, "Common"));
+	DirectoryCreate(out);
+	if(!CopyFolder(pi, Common, AppendFileName(supp, "Common")))
+		return false;
+	if(dlg.uppsrc) {
+		if(!CopyFolder(pi, AppendFileName(upp, "uppsrc"), AppendFileName(supp, "uppsrc")))
+			return false;
+		uppsrc = AppendFileName(upp, "uppsrc");
+	}
+	else
+		uppsrc = AppendFileName(supp, "uppsrc");
+	SaveFile(ConfigFile("uppsrc.var"), "UPP = " + AsCString(uppsrc) + pp);
+	String u;
+	if(dlg.reference) {
+		if(!CopyFolder(pi, AppendFileName(upp, "reference"), AppendFileName(supp, "reference")))
+			return false;
+		u = AppendFileName(upp, "reference");
+	}
+	else
+		u = AppendFileName(supp, "reference");
+	SaveFile(ConfigFile("reference.var"), "UPP = " + AsCString(u + ';' + uppsrc) + pp);
+	if(dlg.examples) {
+		if(!CopyFolder(pi, AppendFileName(upp, "examples"), AppendFileName(supp, "examples")))
+			return false;
+		u = AppendFileName(upp, "examples");
+	}
+	else
+		u = AppendFileName(supp, "examples");
+	SaveFile(ConfigFile("examples.var"), "UPP = " + AsCString(u + ';' + uppsrc) + pp);
+	if(dlg.tutorial) {
+		if(!CopyFolder(pi, AppendFileName(upp, "tutorial"), AppendFileName(supp, "tutorial")))
+			return false;
+		u = AppendFileName(upp, "tutorial");
+	}
+	else
+		u = AppendFileName(supp, "tutorial");
+	SaveFile(ConfigFile("tutorial.var"), "UPP = " + AsCString(u + ';' + uppsrc) + pp);
+	if(dlg.bazaar) {
+		if(!CopyFolder(pi, AppendFileName(upp, "bazaar"), AppendFileName(supp, "bazaar")))
+			return false;
+		u = AppendFileName(upp, "bazaar");
+	}
+	else
+		u = AppendFileName(supp, "bazaar");
+	SaveFile(ConfigFile("bazaar.var"), "UPP = " + AsCString(u + ';' + uppsrc) + pp);
+	SaveFile(ConfigFile("MyApps.var"), "UPP = " + AsCString(AppendFileName(upp, "MyApps;" + uppsrc)) + pp);
+	SaveFile(ConfigFile("MyApps-Bazaar.var"), "UPP = " + AsCString(AppendFileName(upp, "MyApps;") + AppendFileName(upp, "bazaar;") + uppsrc) + pp);
+	String bm = ConfigFile("GCC.bm");
+	if(IsNull(LoadFile(bm)))
+		SaveFile(bm, LoadFile(AppendFileName(supp, "GCC.bm")));
+	// 2008/06/01 -- add valgrind suppression file
+	String ValgSupp = ConfigFile("valgrind.supp");
+	if(IsNull(LoadFile(ValgSupp)))
+		SaveFile(ValgSupp, LoadFile(AppendFileName(supp, "uppsrc/ide/valgrind.supp")));
+	// 2008/06/01 -- END
+	PromptOK("Ultimate`+`+ user setup was finished.&Press OK to launch TheIDE.");
+	return true;
+}
+
+void Uninstall() {}
+
+#endif
diff --git a/uppsrc/ide/LayDes/LayDes.h b/uppsrc/ide/LayDes/LayDes.h
new file mode 100644
index 000000000..ffd9a8897
--- /dev/null
+++ b/uppsrc/ide/LayDes/LayDes.h
@@ -0,0 +1,467 @@
+#ifndef LAYDES_H
+#define LAYDES_H
+
+#include <ide/Common/Common.h>
+#include <RichEdit/RichEdit.h>
+#include <CodeEditor/CodeEditor.h>
+#include <IconDes/IconDes.h>
+
+#define LAYOUTFILE <ide/LayDes/LayDes.lay>
+#include <CtrlCore/lay.h>
+
+#define IMAGECLASS LayImg
+#define IMAGEFILE  <ide/LayDes/LayDes.iml>
+#include <Draw/iml_header.h>
+
+#define KEYNAMESPACE LayoutKeys
+#define KEYGROUPNAME "Layout"
+#define KEYFILE      <ide/LayDes/laydes.key>
+#include             <CtrlLib/key_header.h>
+
+class DiffPacker {
+	String master;
+	int         mapn;
+	Buffer<int> map;
+	Buffer<int> prev;
+
+public:
+	void   SetMaster(const String& master);
+	String Pack(const String& data);
+};
+
+String DiffPack(const String& master, const String& data);
+String DiffUnpack(const String& master, const String& pack);
+
+struct TypeProperty : Moveable<TypeProperty> {
+	int    level;
+	String type;
+	String name;
+	String defval;
+	String help;
+
+	TypeProperty() { level = 0; }
+};
+
+enum { LAYOUT_CTRL, LAYOUT_SUBCTRL, LAYOUT_TEMPLATE };
+
+struct LayoutType : Moveable<LayoutType> {
+	int                        kind;
+	Array<TypeProperty>        property;
+	ArrayMap<String, EscValue> methods;
+	String                     group;
+	Image                      icon[2];
+	Size                       iconsize[2];
+
+	LayoutType()               { iconsize[0] = iconsize[1] = Null; }
+};
+
+VectorMap<String, VectorMap<String, String> >& LayoutEnums();
+VectorMap<String, LayoutType>&                 LayoutTypes();
+
+Point ReadPoint(CParser& p);
+
+struct EscDraw : public EscHandle {
+	Draw& w;
+
+	void DrawRect(EscEscape& e);
+	void DrawLine(EscEscape& e);
+	void DrawText(EscEscape& e);
+	void DrawSmartText(EscEscape& e);
+	void DrawQtf(EscEscape& e);
+	void GetTextSize(EscEscape& e);
+	void DrawImage(EscEscape& e);
+	void DrawImageColor(EscEscape& e);
+
+	typedef EscDraw CLASSNAME;
+
+	EscDraw(EscValue& v, Draw& w);
+};
+
+EscValue EscColor(Color c);
+Color    ColorEsc(EscValue v);
+
+EscValue EscSize(Size sz);
+Size     SizeEsc(EscValue v);
+
+EscValue EscPoint(Point sz);
+Point    PointEsc(EscValue v);
+
+EscValue EscRect(const Rect& r);
+Rect     RectEsc(EscValue v);
+
+EscValue EscFont(Font f);
+Font     FontEsc(EscValue v);
+
+struct ItemProperty : public Ctrl {
+	int     level;
+	String  name;
+	Value   defval;
+	String  help;
+
+	virtual void     Paint(Draw& w);
+
+	virtual int      GetHeight() const;
+
+	virtual void     SetCharset(byte charset);
+	virtual void     Read(CParser& p);
+	virtual String   Save() const;
+	virtual bool     PlaceFocus(dword k, int c);
+
+	ItemProperty() { NoWantFocus(); level = 0; }
+	virtual ~ItemProperty() {}
+
+	static VectorMap<String, ItemProperty *(*)()>& Factory();
+	static ItemProperty *Create(const String& name);
+	static void          Register(const char *name, ItemProperty *(*creator)());
+};
+
+template <class Editor>
+class EditorProperty : public ItemProperty {
+public:
+	virtual Value    GetData() const            { return ~editor; }
+	virtual bool     PlaceFocus(dword k, int c) { editor.SetFocus(); return editor.Key(k, c); }
+
+protected:
+	void EditAction()                           { this->UpdateActionRefresh(); }
+
+	Editor editor;
+
+	EditorProperty() {
+		editor.WhenAction = callback(this, &EditorProperty::EditAction);
+	}
+};
+
+String ReadPropertyParam(CParser& p);
+
+struct RawProperty : public EditorProperty<EditString>
+{
+	virtual String   Save() const;
+	virtual void     Read(CParser& p);
+
+	static ItemProperty *Create()            { return new RawProperty; }
+
+	RawProperty() {
+		Add(editor.HSizePos(100, 2).TopPos(2));
+	}
+};
+
+struct PropertyPane : public StaticRect {
+	virtual void Layout();
+	virtual void ChildGotFocus();
+
+	int        y;
+	StaticRect pane;
+	ScrollBar  sb;
+
+	void Clear();
+	void Add(ItemProperty& c);
+	void SetSb();
+	void Scroll();
+	void AfterCreate();
+
+	typedef PropertyPane CLASSNAME;
+
+	PropertyPane();
+};
+
+struct LayoutItem {
+	String              type;
+	String              variable;
+	Ctrl::LogPos        pos;
+	Array<ItemProperty> property;
+	bool                hide;
+	byte                charset;
+
+private:
+	Size      csize;
+	Drawing   cache;
+
+	void   UnknownPaint(Draw& w);
+	void   CreateProperties(const String& classname, int level);
+	void   CreateMethods(EscValue& ctrl, const String& type, bool copy) const;
+
+public:
+	void     Invalidate()               { csize.cx = -1; }
+	EscValue CreateEsc() const;
+	EscValue ExecuteMethod(const char *method, Vector<EscValue>& arg) const;
+	EscValue ExecuteMethod(const char *method) const;
+	Size     GetMinSize();
+	Size     GetStdSize();
+	void     Paint(Draw& w, Size sz, bool sample = false);
+	void     Create(const String& type);
+	int      FindProperty(const String& s) const;
+	void     SetCharset(byte charset);
+	void     ReadProperties(CParser& p, bool addunknow = true);
+	String   SaveProperties() const;
+	String   Save(int i) const;
+
+	LayoutItem()                      { csize.cx = -1; hide = false; charset = CHARSET_UNICODE; }
+};
+
+Image GetTypeIcon(const String& type, int cx, int cy, int i, Color bg);
+
+Array<LayoutItem> ReadItems(CParser& p, byte charset);
+
+class LayoutUndo {
+	Vector<String> stack;
+
+public:
+	void               Clear()                        { stack.Clear(); }
+	int                GetCount() const               { return stack.GetCount(); }
+	operator           bool() const                   { return stack.GetCount(); }
+	void               Push(const String& state);
+	const String&      Top() const                    { return stack.Top(); }
+	String             Pop();
+};
+
+struct LayoutData {
+	String name;
+	Size   size;
+	Array<LayoutItem> item;
+	LayoutUndo undo, redo;
+	byte charset;
+
+private:
+	String      MakeState();
+	void        LoadState(const String& s);
+	void        Do(LayoutUndo& u1, LayoutUndo& u2);
+	String      GetTID(int i);
+
+public:
+	void        SetCharset(byte charset);
+	void        Read(CParser& p);
+	String      Save();
+	String      Save(const Vector<int>& sel);
+	void        SaveState();
+	bool        IsUndo();
+	void        Undo();
+	bool        IsRedo();
+	void        Redo();
+
+	LayoutData() { size = Size(400, 200); charset = CHARSET_UNICODE; }
+};
+
+class LayDesigner;
+
+struct LayDesEditPos {
+	Time              filetime;
+	Array<LayoutUndo> undo;
+	Array<LayoutUndo> redo;
+	int               layouti;
+	Vector<int>       cursor;
+
+	LayDesEditPos() { filetime = Null; }
+};
+
+class LayDes : public StaticRect {
+public:
+	virtual void   Paint(Draw& w);
+	virtual Image  CursorImage(Point p, dword keyflags);
+	virtual void   LeftDown(Point p, dword keyflags);
+	virtual void   LeftRepeat(Point p, dword keyflags);
+	virtual void   MouseMove(Point p, dword keyflags);
+	virtual void   LeftUp(Point p, dword keyflags);
+	virtual void   RightDown(Point p, dword keyflags);
+	virtual void   Layout();
+
+private:
+	bool   DoKey(dword key, int count);
+
+	struct KeyMaster : public ParentCtrl {
+		LayDes *d;
+
+		virtual bool   Key(dword key, int count) {
+			return d->DoKey(key, count);
+		}
+	};
+
+	String   filename;
+	byte     charset;
+	String   layfile;
+	bool     newfile;
+	Time     filetime;
+	String   fileerror;
+
+	friend class LayDesigner;
+
+	LayDesigner       *frame;
+	ToolBar            toolbar;
+	MenuBar            menubar;
+	ArrayCtrl          layoutlist;
+	ArrayCtrl          item;
+	PropertyPane       property;
+
+	WithDropChoice<EditString> type;
+	EditString                 variable;
+
+	KeyMaster          km;
+	Splitter           lsplit, isplit, rsplit;
+	FrameTop<Splitter> twsplit;
+	ScrollBars        sb;
+	FrameRight<Label> status;
+
+	Array<LayoutData> layout;
+	int               currentlayout;
+
+	Vector<Point>     handle;
+	Vector<int>       cursor;
+	int               draghandle;
+	Point             dragbase;
+	Size              draglayoutsize;
+	Rect              dragrect;
+	Vector<Rect>      itemrect;
+	int               basesel;
+
+	bool              usegrid;
+	bool              ignoreminsize;
+
+	WithMatrixLayout<TopWindow>  matrix;
+	WithSettingLayout<TopWindow> setting;
+
+	struct TempGroup {
+		String temp;
+		String group;
+		bool operator==(const TempGroup& b) const { return temp == b.temp && group == b.group; }
+		friend unsigned GetHashValue(const TempGroup& g) { return 0; }
+		TempGroup(const String& temp, const String& group) : temp(temp), group(group) {}
+	};
+
+	Rect   CtrlRect(Ctrl::LogPos pos, Size sz);
+	Rect   CtrlRectZ(Ctrl::LogPos pos, Size sz);
+	void   AddHandle(Draw& w, int x, int y);
+	Point  Normalize(Point p);
+	Point  ZPoint(Point p);
+	int    FindHandle(Point p);
+	int    FindItem(Point p);
+	void   GetSprings(Rect& l, Rect& t, Rect& r, Rect& b);
+	void   DrawSpring(Draw& w, const Rect& r, bool horz, bool spring);
+	void   SelectOne(int ii, dword flags);
+	void   StoreItemRects();
+	void   LoadItems();
+	void   LoadItem(int item);
+	void   ReloadItems();
+	void   SyncItems();
+	void   SyncItem(int item, int style);
+	void   SyncProperties(bool sync);
+	void   SyncLayoutList();
+	void   CreateCtrl(const String& type);
+	void   Group(Bar& bar, const String& group);
+	void   Templates(Bar& bar);
+	void   TemplateGroup(Bar& bar, TempGroup tg);
+	void   Template(Bar& bar, const String& temp);
+	int    ParseLayoutRef(String cls, String& base) const;
+	void   PaintLayoutItems(Draw& w, int layout, Size size, Index<int>& passed, const Vector<bool>& cursor);
+
+	void   SaveState();
+	void   SetSb();
+
+	void   FrameFocus();
+	void   PropertyChanged();
+
+	void   SetBar();
+	void   Scroll();
+
+	void   SetStatus(bool down = false);
+
+	void        Flush();
+	LayoutData& CurrentLayout();
+	void        LayoutCursor();
+
+	LayoutItem& CurrentItem();
+	void        ItemClick();
+
+	String      SaveSelection();
+	LayoutData  LoadLayoutData(const String& s);
+
+	void        Undo();
+	void        Redo();
+	void        Cut();
+	void        Copy();
+	void        VisGen();
+	void        Paste();
+	void        Delete();
+	void        Duplicate();
+	void        MoveUp();
+	void        MoveDown();
+	void        SelectAll();
+
+	void        Matrix();
+
+	void        TypeEdit();
+	void        VariableEdit();
+
+	void        ToggleGrid();
+	void        ToggleMinSize();
+	void        Settings();
+
+	enum Code {
+		A_LEFT, A_HCENTER, A_RIGHT, A_TOP, A_VCENTER, A_BOTTOM, A_LABEL,
+		A_SAMEWIDTH, A_SAMEHEIGHT, A_SAMESIZE, A_VERTCENTER, A_HORZCENTER,
+		A_MINWIDTH, A_MINHEIGHT, AUTOSPRING
+	};
+
+	void        Align(int type);
+	void        SetSprings(dword s);
+	void        ShowSelection(bool s);
+
+	void        AddLayout();
+	void        RenameLayout();
+	void        RemoveLayout();
+	void        PrevLayout();
+	void        NextLayout();
+	void        MoveLayoutUp();
+	void        MoveLayoutDown();
+	void        LayoutMenu(Bar& bar);
+
+	void        EditBar(Bar& bar);
+	void        AlignBar(Bar& bar);
+	void        SizeBar(Bar& bar);
+	void        MoveBar(Bar& bar);
+	void        SpringBar(Bar& bar);
+	void        OptionBar(Bar& bar);
+	void        MainToolBar(Bar& bar);
+
+	void        LayoutBar(Bar& bar);
+	void        ItemBar(Bar& bar);
+	void        MainMenuBar(Bar& bar);
+
+	void        EditMenu(Bar& bar);
+
+	void        SyncUsc();
+	void        Save();
+	void        CloseDesigner();
+
+	void        SaveEditPos();
+	void        RestoreEditPos();
+
+	bool           Load(const char *filename, byte charset);
+
+	typedef LayDes CLASSNAME;
+
+	LayDes();
+
+public:
+	Ctrl&          DesignerCtrl()             { return km; }
+	void           Serialize(Stream& s);
+};
+
+class LayDesigner : public IdeDesigner {
+	LayDes         designer;
+	ParentCtrl     parent;
+
+public:
+	virtual String GetFileName() const        { return designer.filename; }
+	virtual void   Save()                     { designer.Save(); }
+	virtual void   SyncUsc()                  { designer.SyncUsc(); }
+	virtual void   SaveEditPos()              { designer.SaveEditPos(); }
+	virtual void   EditMenu(Bar& menu)        { designer.EditMenu(menu); }
+	virtual int    GetCharset() const         { return designer.charset; }
+	virtual Ctrl&  DesignerCtrl()             { return parent; }
+
+	void Serialize(Stream& s)                 { designer.Serialize(s); }
+	bool Load(const char *filename, byte cs)  { return designer.Load(filename, cs); }
+
+	LayDesigner()                             { parent.Add(designer.DesignerCtrl().SizePos()); }
+};
+
+#endif
diff --git a/uppsrc/ide/LayDes/LayDes.iml b/uppsrc/ide/LayDes/LayDes.iml
new file mode 100644
index 000000000..9859b1bfa
--- /dev/null
+++ b/uppsrc/ide/LayDes/LayDes.iml
@@ -0,0 +1,105 @@
+IMAGE_ID(CrossCursor)
+IMAGE_ID(RwIconSmall)
+IMAGE_ID(RwIconLarge)
+IMAGE_ID(Layout)
+IMAGE_ID(AlignLeft)
+IMAGE_ID(AlignRight)
+IMAGE_ID(AlignTop)
+IMAGE_ID(AlignBottom)
+IMAGE_ID(VertCenter)
+IMAGE_ID(HorzCenter)
+IMAGE_ID(SameWidth)
+IMAGE_ID(SameHeight)
+IMAGE_ID(SameSize)
+IMAGE_ID(Grid)
+IMAGE_ID(AlignHCenter)
+IMAGE_ID(AlignVCenter)
+IMAGE_ID(MinHeight)
+IMAGE_ID(MinWidth)
+IMAGE_ID(AlignLbl)
+IMAGE_ID(SpringLeft)
+IMAGE_ID(SpringHSize)
+IMAGE_ID(SpringHCenter)
+IMAGE_ID(SpringRight)
+IMAGE_ID(SpringTop)
+IMAGE_ID(SpringVSize)
+IMAGE_ID(SpringVCenter)
+IMAGE_ID(SpringBottom)
+IMAGE_ID(SpringTopLeft)
+IMAGE_ID(SpringAuto)
+IMAGE_ID(Duplicate)
+IMAGE_ID(MoveUp)
+IMAGE_ID(MoveDown)
+IMAGE_ID(MinSize)
+IMAGE_ID(Id)
+IMAGE_ID(Context)
+IMAGE_ID(Members)
+IMAGE_ID(ImageError)
+
+IMAGE_BEGIN_DATA
+IMAGE_DATA(120,156,237,89,219,181,226,48,12,244,199,22,112,75,184,61,108,31,212,65,25,148,66,9,148,64,23,251,71,43,89,12)
+IMAGE_DATA(107,98,108,189,44,77,8,100,175,56,58,9,177,199,99,201,146,236,64,250,74,95,233,215,245,195,200,196,53,24,229,211)
+IMAGE_DATA(240,147,65,151,228,223,26,254,71,62,73,114,49,64,201,225,112,152,188,90,240,215,248,27,86,36,254,124,62,15,107,139)
+IMAGE_DATA(47,146,242,224,132,140,224,169,49,52,124,209,27,246,207,239,219,117,100,254,45,94,27,195,130,151,198,24,193,103,149,226)
+IMAGE_DATA(199,50,255,186,159,134,223,239,247,157,31,37,254,230,217,227,90,240,82,252,43,82,251,192,149,155,197,127,108,167,239,235)
+IMAGE_DATA(231,71,222,71,34,5,53,90,140,11,191,167,160,70,148,226,191,23,195,185,0,158,78,167,71,255,186,109,105,254,114,159)
+IMAGE_DATA(249,91,222,185,104,227,249,215,244,191,103,67,140,232,187,242,31,143,71,151,34,249,61,114,185,92,54,193,159,53,143,229)
+IMAGE_DATA(209,45,196,223,218,252,187,221,238,166,117,60,228,107,250,119,168,120,5,127,89,203,58,183,146,241,144,187,148,255,11,63)
+IMAGE_DATA(106,14,17,126,196,28,162,252,209,57,32,248,35,115,64,241,123,231,128,242,127,173,175,226,231,114,113,164,70,123,249,139)
+IMAGE_DATA(173,148,239,235,186,81,158,181,251,115,185,247,240,23,46,11,127,225,105,207,6,17,126,105,61,90,123,181,179,74,116,255)
+IMAGE_DATA(137,214,195,230,101,184,139,101,171,82,121,48,160,8,65,141,179,142,228,95,6,167,55,50,97,141,151,217,104,50,80,120)
+IMAGE_DATA(203,156,53,188,36,22,124,132,31,177,153,80,124,220,51,14,223,222,115,207,150,224,247,218,31,137,223,85,165,249,155,32)
+IMAGE_DATA(58,41,20,222,88,193,187,50,246,192,103,201,11,85,95,159,241,165,24,208,248,22,91,157,8,18,93,84,176,252,65,251)
+IMAGE_DATA(189,130,196,11,187,46,187,253,144,254,75,186,223,58,188,125,221,244,245,115,240,151,123,175,253,235,8,232,63,67,112,16)
+IMAGE_DATA(146,65,46,37,7,129,127,26,67,75,78,53,201,229,226,128,226,71,217,63,44,11,225,201,160,167,146,68,192,243,126,76)
+IMAGE_DATA(157,253,122,178,219,214,207,203,79,225,251,135,201,108,191,89,48,69,132,56,25,120,21,41,156,195,44,220,236,130,233,187)
+IMAGE_DATA(245,189,31,23,48,74,65,64,241,71,237,7,137,244,242,168,189,88,118,73,104,108,107,219,219,126,82,27,114,254,91,192)
+IMAGE_DATA(59,132,63,25,88,22,124,139,237,90,192,89,2,114,36,224,209,243,135,8,91,104,5,157,39,198,23,59,75,65,148,138)
+IMAGE_DATA(173,165,32,71,249,163,246,71,100,116,3,198,242,3,79,6,134,73,137,1,44,224,77,59,130,194,175,38,32,122,254,163)
+IMAGE_DATA(254,50,5,174,148,4,237,119,9,75,37,10,120,254,148,139,156,235,95,176,222,245,67,196,79,25,135,111,4,232,186,242)
+IMAGE_DATA(218,98,32,138,132,183,112,136,109,194,177,222,132,87,142,245,4,158,126,215,148,250,244,109,253,187,238,220,167,127,159,189)
+IMAGE_DATA(43,25,248,13,63,221,7,195,143,178,255,73,28,254,39,219,188,120,139,108,174,24,124,186,68,23,66,221,141,149,29,182)
+IMAGE_DATA(122,54,41,152,185,189,229,47,137,38,159,10,230,49,106,60,157,232,154,226,248,17,246,71,252,31,92,255,255,91,22,44)
+IMAGE_DATA(6,209,5,96,131,71,217,33,30,248,26,91,7,175,114,66,120,226,167,146,103,148,191,36,143,242,195,227,98,246,127,50)
+IMAGE_DATA(63,194,255,145,245,143,216,111,208,247,18,112,49,136,86,102,118,7,144,118,170,26,47,237,98,220,24,18,63,21,140,158)
+IMAGE_DATA(147,129,244,189,229,167,120,168,239,212,206,76,205,87,87,28,63,194,126,132,255,81,235,207,217,207,241,7,227,127,85,249)
+IMAGE_DATA(11,177,105,161,43,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0)
+IMAGE_END_DATA(864, 13)
+
+IMAGE_BEGIN_DATA
+IMAGE_DATA(120,156,237,88,11,146,131,48,8,245,8,61,242,30,173,55,115,199,110,107,131,62,18,2,52,152,45,111,38,19,117,120)
+IMAGE_DATA(124,12,144,232,114,91,110,139,35,86,195,245,21,144,254,199,34,253,143,68,71,51,176,58,46,228,175,199,151,197,13,36)
+IMAGE_DATA(255,188,223,159,173,27,238,247,251,131,179,205,27,222,124,34,91,220,239,207,9,167,212,5,100,29,236,123,196,207,98,208)
+IMAGE_DATA(250,61,68,143,178,192,111,40,87,60,167,239,176,156,129,204,129,119,94,195,114,102,228,28,236,123,197,143,149,118,200,234)
+IMAGE_DATA(80,111,6,53,103,37,129,32,153,214,66,72,100,106,92,169,140,214,255,90,97,178,114,84,233,179,65,208,228,18,203,236)
+IMAGE_DATA(207,223,201,221,244,79,58,60,236,123,196,191,139,54,244,86,248,150,245,247,200,63,206,134,36,255,165,62,58,195,249,51)
+IMAGE_DATA(161,130,31,163,243,90,254,198,59,14,139,14,45,196,92,75,17,63,248,204,214,7,7,226,27,237,91,227,103,184,30,107)
+IMAGE_DATA(103,89,195,168,252,29,136,65,205,160,51,113,206,124,38,113,47,204,39,139,15,248,173,228,32,137,123,224,215,146,26,38)
+IMAGE_DATA(127,193,151,22,135,214,62,140,79,17,63,193,132,235,79,249,139,141,63,6,91,51,248,192,129,67,8,139,101,233,81,173)
+IMAGE_DATA(197,165,223,135,165,16,184,7,122,232,3,112,141,116,143,226,3,125,168,25,252,112,241,71,248,191,130,107,116,143,248,66)
+IMAGE_DATA(244,28,213,37,58,180,136,171,60,136,216,102,240,223,208,251,243,175,206,71,120,243,87,48,211,31,103,58,190,213,190,37)
+IMAGE_DATA(254,68,40,178,25,120,66,92,12,160,48,100,197,136,11,179,228,215,155,193,153,207,238,144,74,251,150,248,19,161,200,102)
+IMAGE_DATA(240,113,116,236,142,104,183,61,23,229,178,23,241,81,54,154,111,141,63,17,138,108,6,67,208,121,50,56,21,88,231,206)
+IMAGE_DATA(220,195,71,39,3,173,125,107,252,137,80,180,155,129,199,207,150,151,30,11,212,124,235,174,84,41,128,228,75,248,96,12)
+IMAGE_DATA(134,199,207,190,47,176,159,205,64,96,120,242,98,76,254,21,154,89,84,254,119,212,175,236,51,97,146,206,118,77,251,217)
+IMAGE_DATA(140,194,139,113,234,252,25,103,63,155,193,229,237,103,51,153,190,25,253,185,161,227,89,249,110,39,131,169,63,17,208,34)
+IMAGE_DATA(54,22,147,216,89,17,252,248,232,103,29,121,207,74,190,213,190,37,126,250,50,42,99,32,190,122,35,233,179,207,55,131)
+IMAGE_DATA(25,27,1,77,102,48,186,248,242,34,122,205,124,49,203,249,86,251,150,248,155,168,232,44,237,115,115,109,151,214,242,81)
+IMAGE_DATA(142,106,237,91,227,151,226,154,167,132,95,222,23,236,181,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0)
+IMAGE_END_DATA(608, 16)
+
+IMAGE_BEGIN_DATA
+IMAGE_DATA(120,156,205,151,221,118,195,32,8,128,189,223,46,250,200,62,90,222,140,105,87,22,163,128,252,184,68,118,56,166,212,15)
+IMAGE_DATA(4,140,117,233,149,94,9,32,173,20,80,42,203,31,199,33,170,134,47,67,136,151,124,88,214,79,249,152,241,105,168,211)
+IMAGE_DATA(95,135,52,245,227,220,46,232,178,203,7,147,203,144,19,203,143,245,131,75,93,45,60,178,94,62,186,31,60,188,82,227)
+IMAGE_DATA(18,59,12,34,27,12,155,18,97,87,248,192,231,95,201,57,67,171,181,89,189,237,234,35,194,247,126,226,188,191,22,103)
+IMAGE_DATA(252,106,104,199,222,54,137,127,217,164,13,67,28,10,100,255,196,216,116,254,235,196,87,255,125,248,144,172,190,25,244,11)
+IMAGE_DATA(167,116,103,126,129,68,55,115,232,101,90,240,50,59,132,63,204,116,245,127,138,31,15,115,91,206,94,126,245,143,153,87)
+IMAGE_DATA(58,254,31,254,77,88,33,218,171,17,119,69,130,60,86,124,208,44,240,48,241,129,223,73,60,231,163,181,205,248,126,126)
+IMAGE_DATA(239,79,195,35,71,173,229,14,62,178,254,72,253,40,86,219,63,137,213,236,31,163,238,33,223,229,239,230,195,64,124,137)
+IMAGE_DATA(5,230,78,251,172,81,160,120,246,206,167,98,239,183,113,40,121,96,51,85,177,68,4,102,212,250,110,155,64,249,160,230)
+IMAGE_DATA(115,177,103,243,165,207,146,175,136,143,125,100,118,77,201,217,190,112,100,234,88,124,67,251,89,195,34,195,61,91,124,244)
+IMAGE_DATA(163,134,69,237,115,105,237,82,92,212,62,126,107,183,196,175,210,218,115,202,111,245,228,255,246,85,88,28,37,150,125,254)
+IMAGE_DATA(196,231,214,64,245,31,115,104,69,202,225,186,30,24,175,9,90,254,147,43,37,38,254,193,248,146,206,120,147,124,149,95)
+IMAGE_DATA(150,51,240,121,55,181,40,157,168,110,30,55,159,178,75,190,119,152,103,157,235,169,241,157,107,248,1,235,46,32,105,0)
+IMAGE_END_DATA(416, 8)
diff --git a/uppsrc/ide/LayDes/LayDes.lay b/uppsrc/ide/LayDes/LayDes.lay
new file mode 100644
index 000000000..3cf7fd745
--- /dev/null
+++ b/uppsrc/ide/LayDes/LayDes.lay
@@ -0,0 +1,74 @@
+LAYOUT(LayoutsLayout, 260, 288)
+	ITEM(ArrayCtrl, list, LeftPosZ(6, 242).TopPosZ(6, 242))
+	ITEM(Button, ok, SetLabel(t_("OK")).LeftPosZ(118, 64).TopPosZ(254, 24))
+	ITEM(Button, cancel, SetLabel(t_("Cancel")).LeftPosZ(186, 64).TopPosZ(254, 24))
+END_LAYOUT
+
+LAYOUT(FontPropertyDlgLayout, 232, 182)
+	ITEM(Switch, face, SetLabel(t_("StdFont\nScreenSans\nScreenSerif\nScreenFixed\nRoman\nArial\nCourier")).LeftPosZ(14, 88).TopPosZ(20, 114))
+	ITEM(WithDropChoice<EditIntSpin>, height, LeftPosZ(166, 56).TopPosZ(4, 19))
+	ITEM(Option, bold, SetLabel(t_("Bold")).LeftPosZ(122, 68).TopPosZ(44, 18))
+	ITEM(Option, italic, SetLabel(t_("Italic")).LeftPosZ(122, 68).TopPosZ(62, 18))
+	ITEM(Option, underline, SetLabel(t_("Underline")).LeftPosZ(122, 68).TopPosZ(80, 18))
+	ITEM(Option, strikeout, SetLabel(t_("Strikeout")).LeftPosZ(122, 68).TopPosZ(98, 18))
+	ITEM(Option, nonaa, SetLabel(t_("NonAntiAliased")).LeftPosZ(122, 96).TopPosZ(116, 18))
+	ITEM(Button, ok, SetLabel(t_("OK")).LeftPosZ(94, 64).TopPosZ(152, 24))
+	ITEM(Button, cancel, SetLabel(t_("Cancel")).LeftPosZ(162, 64).TopPosZ(152, 24))
+	ITEM(Label, dv___9, SetLabel(t_("Height")).LeftPosZ(120, 39).TopPosZ(8, 13))
+	ITEM(LabelBox, dv___10, SetLabel(t_("Face")).LeftPosZ(6, 100).TopPosZ(2, 140))
+	ITEM(LabelBox, dv___11, SetLabel(t_("Options")).LeftPosZ(114, 112).TopPosZ(30, 112))
+END_LAYOUT
+
+LAYOUT(LangSetupLayout, 176, 236)
+	ITEM(ArrayCtrl, list, LeftPosZ(6, 164).TopPosZ(6, 190))
+	ITEM(Button, ok, SetLabel(t_("OK")).LeftPosZ(36, 64).TopPosZ(204, 24))
+	ITEM(Button, cancel, SetLabel(t_("Cancel")).LeftPosZ(104, 64).TopPosZ(204, 24))
+END_LAYOUT
+
+LAYOUT(MatrixLayout, 206, 88)
+	ITEM(Label, dv___0, SetLabel(t_("&Horizontal")).LeftPosZ(4, 54).TopPosZ(4, 19))
+	ITEM(EditIntSpin, nx, LeftPosZ(60, 42).TopPosZ(4, 19))
+	ITEM(Label, dv___2, SetLabel(t_("&spacing")).LeftPosZ(108, 50).TopPosZ(4, 19))
+	ITEM(EditIntSpin, dx, LeftPosZ(156, 42).TopPosZ(4, 19))
+	ITEM(Label, dv___4, SetLabel(t_("&Vertical")).LeftPosZ(4, 54).TopPosZ(28, 19))
+	ITEM(EditIntSpin, ny, LeftPosZ(60, 42).TopPosZ(28, 19))
+	ITEM(Label, dv___6, SetLabel(t_("s&pacing")).LeftPosZ(108, 50).TopPosZ(28, 19))
+	ITEM(EditIntSpin, dy, LeftPosZ(156, 42).TopPosZ(28, 19))
+	ITEM(Button, ok, SetLabel(t_("OK")).LeftPosZ(64, 64).TopPosZ(56, 24))
+	ITEM(Button, cancel, SetLabel(t_("Cancel")).LeftPosZ(134, 64).TopPosZ(56, 24))
+END_LAYOUT
+
+LAYOUT(SettingLayout, 162, 130)
+	ITEM(LabelBox, dv___0, SetLabel(t_("Grid")).LeftPosZ(4, 98).TopPosZ(2, 42))
+	ITEM(EditIntSpin, gridx, LeftPosZ(10, 38).TopPosZ(18, 19))
+	ITEM(EditIntSpin, gridy, LeftPosZ(58, 38).TopPosZ(18, 19))
+	ITEM(Label, dv___3, SetLabel(t_("x")).LeftPosZ(50, 6).TopPosZ(20, 13))
+	ITEM(Option, paintgrid, SetLabel(t_("Paint grid")).LeftPosZ(10, 146).TopPosZ(52, 18))
+	ITEM(Option, showicons, SetLabel(t_("Show icons in layout list")).LeftPosZ(10, 146).TopPosZ(70, 18))
+	ITEM(Button, ok, SetLabel(t_("OK")).LeftPosZ(24, 64).TopPosZ(100, 24))
+	ITEM(Button, cancel, SetLabel(t_("Cancel")).LeftPosZ(92, 64).TopPosZ(100, 24))
+END_LAYOUT
+
+LAYOUT(InsertLangLayout, 252, 68)
+	ITEM(LNGCtrl, lang, LeftPosZ(8, 128).TopPosZ(8, 20))
+	ITEM(DropList, charset, LeftPosZ(140, 104).TopPosZ(8, 19))
+	ITEM(Button, ok, SetLabel(t_("OK")).LeftPosZ(112, 64).TopPosZ(36, 24))
+	ITEM(Button, cancel, SetLabel(t_("Cancel")).LeftPosZ(180, 64).TopPosZ(36, 24))
+END_LAYOUT
+
+LAYOUT(VisGenLayout, 724, 488)
+	ITEM(Switch, type, SetLabel(t_("Dialog class\nModal classless dialog\nCtrl list\nCtrl list pairs")).LeftPosZ(8, 156).TopPosZ(8, 76))
+	ITEM(Label, name_lbl, SetLabel(t_("Name")).LeftPosZ(8, 32).TopPosZ(96, 19))
+	ITEM(EditString, name, LeftPosZ(44, 120).TopPosZ(96, 19))
+	ITEM(Option, pars, SetLabel(t_("Parenthesis")).LeftPosZ(8, 152).TopPosZ(124, 15))
+	ITEM(LabelBox, dv___4, SetLabel(t_("First")).LeftPosZ(8, 76).TopPosZ(148, 56))
+	ITEM(Option, toupper1, SetLabel(t_("ToUpper")).LeftPosZ(12, 64).TopPosZ(164, 15))
+	ITEM(Option, name1, SetLabel(t_("name.")).LeftPosZ(12, 64).TopPosZ(180, 15))
+	ITEM(LabelBox, dv___7, SetLabel(t_("Second")).LeftPosZ(88, 76).TopPosZ(148, 56))
+	ITEM(Option, toupper2, SetLabel(t_("ToUpper")).LeftPosZ(92, 64).TopPosZ(164, 15))
+	ITEM(Option, name2, SetLabel(t_("name.")).LeftPosZ(92, 64).TopPosZ(180, 15))
+	ITEM(CodeEditor, view, LeftPosZ(172, 544).TopPosZ(8, 440))
+	ITEM(Button, ok, SetLabel(t_("Copy to clipboard")).LeftPosZ(552, 96).TopPosZ(456, 24))
+	ITEM(Button, cancel, SetLabel(t_("Cancel")).LeftPosZ(652, 64).TopPosZ(456, 24))
+END_LAYOUT
+
diff --git a/uppsrc/ide/LayDes/LayDes.upp b/uppsrc/ide/LayDes/LayDes.upp
new file mode 100644
index 000000000..4a7bdb739
--- /dev/null
+++ b/uppsrc/ide/LayDes/LayDes.upp
@@ -0,0 +1,28 @@
+description "TheIDE - .lay designer";
+
+uses
+	ide\Common,
+	RichEdit,
+	Esc,
+	IconDes,
+	CodeEditor;
+
+file
+	LayDes.h,
+	laydes.key,
+	sdiff.cpp,
+	laylib.cpp,
+	layusc.cpp,
+	property.cpp,
+	textprop.cpp,
+	fontprop.cpp,
+	propane.cpp,
+	item.cpp,
+	layout.cpp optimize_speed,
+	visgen.cpp,
+	laydes.cpp,
+	layfile.cpp,
+	laywin.cpp,
+	LayDes.lay,
+	LayDes.iml;
+
diff --git a/uppsrc/ide/LayDes/fontprop.cpp b/uppsrc/ide/LayDes/fontprop.cpp
new file mode 100644
index 000000000..186ebb035
--- /dev/null
+++ b/uppsrc/ide/LayDes/fontprop.cpp
@@ -0,0 +1,199 @@
+#include "LayDes.h"
+
+static const char *s_fontname[] = {
+	"StdFont", "ScreenSans", "ScreenSerif", "ScreenFixed", "Roman", "Arial", "Courier"
+};
+
+static const char *s_fontnamez[] = {
+	"StdFontZ", "ScreenSansZ", "ScreenSerifZ", "ScreenFixedZ", "RomanZ", "ArialZ", "CourierZ"
+};
+
+String FormatFont(Font font)
+{
+	int q = font.GetFace();
+	String txt;
+	int h = font.GetHeight();
+	if(q >= 0 && q < __countof(s_fontname))
+		txt << (h ? s_fontnamez : s_fontname)[q] << "(";
+	else
+		txt << "Font(" << AsCString(font.GetFaceName()) << ", ";
+	txt << (h ? Format("%d)", h) : ")");
+	if(font.IsBold())
+		txt << ".Bold()";
+	if(font.IsItalic())
+		txt << ".Italic()";
+	if(font.IsUnderline())
+		txt << ".Underline()";
+	if(font.IsStrikeout())
+		txt << ".Strikeout()";
+	if(font.IsNonAntiAliased())
+		txt << ".NonAntiAliased()";
+	return txt;
+}
+
+struct FontDisplay : public Display {
+	virtual void Paint(Draw& w, const Rect& r, const Value& q,
+	                   Color ink, Color paper, dword style) const {
+		w.DrawRect(r, paper);
+		Font font = q;
+		String text = FormatFont(font);
+		font.Height(StdFont().Info().GetHeight() - 1);
+		w.DrawText(2, (r.Height() - font.Info().GetHeight()) / 2, text, font, ink);
+	}
+};
+
+struct FontDlg : public WithFontPropertyDlgLayout<TopWindow> {
+	void SetFont(Font f);
+	Font GetFont() const;
+
+	void Action() { WhenAction(); }
+
+	typedef FontDlg CLASSNAME;
+
+	FontDlg();
+};
+
+void FontDlg::SetFont(Font f)
+{
+	face <<= f.GetFace();
+	height <<= f.GetHeight() ? f.GetHeight() : Null;
+	bold = f.IsBold();
+	italic = f.IsItalic();
+	underline = f.IsUnderline();
+	strikeout = f.IsStrikeout();
+	nonaa = f.IsNonAntiAliased();
+}
+
+Font FontDlg::GetFont() const
+{
+	Font f;
+	f.Face(~face);
+	if(!IsNull(~height))
+		f.Height(~height);
+	else
+		f.Height(0);
+	f.Bold(bold);
+	f.Italic(italic);
+	f.Underline(underline);
+	f.Strikeout(strikeout);
+	f.NonAntiAliased(nonaa);
+	return f;
+}
+
+FontDlg::FontDlg()
+{
+	int i;
+	CtrlLayoutOKCancel(*this, "Font");
+	ToolWindow();
+	for(i = 6; i < 70; i++)
+		height.AddList(i);
+	face <<= height
+	     <<= bold <<= italic <<= underline <<= strikeout <<= nonaa <<= THISBACK(Action);
+	height.Min(0);
+}
+
+struct FontProperty : public EditorProperty<DataPusher> {
+	virtual String   Save() const           { return FormatFont(~editor); }
+	virtual void     Read(CParser& p);
+
+	One<FontDlg> fdlg;
+
+	FontDlg& Dlg();
+
+	void FontChanged();
+	void Perform();
+
+	typedef FontProperty CLASSNAME;
+
+	FontProperty();
+
+	static ItemProperty *Create() { return new FontProperty; }
+};
+
+void FontProperty::Read(CParser& p) {
+	Font f = StdFont();
+	for(int i = 0; i < __countof(s_fontname); i++)
+		if(p.Id(s_fontname[i]) || p.Id(s_fontnamez[i])) {
+			f.Face(i);
+			break;
+		}
+	p.PassChar('(');
+	if(p.IsInt())
+		f.Height(p.ReadInt());
+	else
+		f.Height(0);
+	p.PassChar(')');
+	while(p.Char('.')) {
+		if(p.Id("Bold"))
+			f.Bold();
+		else
+		if(p.Id("Italic"))
+			f.Italic();
+		else
+		if(p.Id("Underline"))
+			f.Underline();
+		else
+		if(p.Id("Strikeout"))
+			f.Strikeout();
+		else {
+			p.PassId("NonAntiAliased");
+			f.NonAntiAliased();
+		}
+		p.PassChar('(');
+		p.PassChar(')');
+	}
+	editor.SetData(f);
+}
+
+FontDlg& FontProperty::Dlg()
+{
+	if(!fdlg)
+		fdlg = new FontDlg;
+	return *fdlg;
+}
+
+void FontProperty::FontChanged()
+{
+	editor.SetData(Dlg().GetFont());
+	WhenAction();
+}
+
+void FontProperty::Perform()
+{
+	editor.SetFocus();
+	Font f = editor.GetData();
+	Dlg().WhenAction = THISBACK(FontChanged);
+	Dlg().SetFont(f);
+	Size sz = Dlg().GetRect().Size();
+	Rect er = editor.GetScreenRect();
+	Rect wa = Ctrl::GetWorkArea();
+	Rect r(er.TopRight(), sz);
+	if(r.bottom > wa.bottom) {
+		r.top = wa.bottom - sz.cy;
+		r.bottom = wa.bottom;
+	}
+	if(r.right > wa.right) {
+		r.left = wa.right - sz.cx;
+		r.right = wa.right;
+	}
+	Dlg().NoCenter();
+	Dlg().SetRect(r);
+	if(Dlg().Execute() == IDOK)
+		editor.SetData(Dlg().GetFont());
+	else
+		editor.SetData(f);
+	editor.SetFocus();
+}
+
+FontProperty::FontProperty() {
+	editor.SetData(StdFont());
+	Add(editor.HSizePos(100, 2).TopPos(2));
+	editor.SetDisplay(Single<FontDisplay>());
+	editor.WhenAction = THISBACK(Perform);
+	editor <<= StdFont();
+}
+
+void RegisterFontProperty()
+{
+	ItemProperty::Register("Font", FontProperty::Create);
+}
diff --git a/uppsrc/ide/LayDes/init b/uppsrc/ide/LayDes/init
new file mode 100644
index 000000000..b4233f2eb
--- /dev/null
+++ b/uppsrc/ide/LayDes/init
@@ -0,0 +1,8 @@
+#ifndef _ide_LayDes_icpp_init_stub
+#define _ide_LayDes_icpp_init_stub
+#include "ide\Common/init"
+#include "RichEdit/init"
+#include "Esc/init"
+#include "IconDes/init"
+#include "CodeEditor/init"
+#endif
diff --git a/uppsrc/ide/LayDes/item.cpp b/uppsrc/ide/LayDes/item.cpp
new file mode 100644
index 000000000..691187cd4
--- /dev/null
+++ b/uppsrc/ide/LayDes/item.cpp
@@ -0,0 +1,378 @@
+#include "LayDes.h"
+
+struct EnumProperty : public EditorProperty<DropList> {
+	virtual void     SetData(const Value& v);
+	virtual String   Save() const              { return ~editor; }
+	virtual void     Read(CParser& p)          { SetData(ReadPropertyParam(p)); }
+
+	EnumProperty(VectorMap<String, String>& e) {
+		Add(editor.HSizePos(100, 2).TopPos(2));
+		for(int i = 0; i < e.GetCount(); i++)
+			editor.Add(e.GetKey(i), e[i]);
+		SetData(defval = e.GetKey(0));
+	}
+};
+
+void  EnumProperty::SetData(const Value& v)
+{
+	if(!editor.HasKey(v))
+		editor.Add(v, v);
+	editor <<= v;
+}
+
+bool ParseTemplate(String& type, String& temp)
+{
+	int q = type.Find('<');
+	if(q < 0)
+		return false;
+	temp = type.Mid(q + 1);
+	type.Trim(q);
+	q = temp.Find('>');
+	if(q >= 0)
+		temp.Trim(q);
+	Swap(temp, type);
+	return true;
+}
+
+void LayoutItem::Create(const String& _type)
+{
+	Invalidate();
+	property.Clear();
+	type = _type;
+	pos.x = Ctrl::PosLeft(0, 10);
+	pos.y = Ctrl::PosTop(0, 10);
+	String tp = type;
+	String tm;
+	if(ParseTemplate(tp, tm))
+		CreateProperties(tm, 0);
+	CreateProperties(tp, 1);
+}
+
+void LayoutItem::CreateProperties(const String& classname, int level)
+{
+	int q = LayoutTypes().Find(classname);
+	if(q < 0)
+		q = LayoutTypes().Find("Unknown");
+	if(q < 0)
+		return;
+	const LayoutType& c = LayoutTypes()[q];
+	for(int i = 0; i < c.property.GetCount(); i++) {
+		const TypeProperty& r = c.property[i];
+		if(IsNull(r.type))
+			CreateProperties(r.name, level + 1);
+		else {
+			ItemProperty *n = ItemProperty::Create(r.type);
+			if(!n) {
+				q = LayoutEnums().Find(r.type);
+				if(q >= 0)
+					n = new EnumProperty(LayoutEnums()[q]);
+			}
+			if(!n)
+				n = new RawProperty;
+			n->SetCharset(charset);
+			int q = -1;
+			for(int i = 0; i < property.GetCount(); i++)
+				if(r.name == property[i].name)
+					q = i;
+			int l = q >= 0 ? property[q].level : level + r.level;
+			ItemProperty& ip = q >= 0 ? property.Set(q, n) : property.Add(n);
+			ip.level = l;
+			ip.name = r.name;
+			if(!IsNull(r.defval))
+				try {
+					CParser p(r.defval);
+					ip.Read(p);
+					ip.defval = ~ip;
+				}
+				catch(CParser::Error e) {
+					PutConsole(e + "\n");
+				}
+			else
+				ip.defval = ~ip;
+			ip.help = r.help;
+		}
+	}
+}
+
+void LayoutItem::SetCharset(byte cs)
+{
+	charset = cs;
+	for(int i = 0; i < property.GetCount(); i++)
+		property[i].SetCharset(charset);
+}
+
+void LayoutItem::ReadProperties(CParser& p, bool addunknown)
+{
+	do {
+		if(p.Id("LeftPosZ") || p.Id("LeftPos")) {
+			Point pt = ReadPoint(p);
+			pos.x = Ctrl::PosLeft(pt.x, pt.y);
+		}
+		else
+		if(p.Id("RightPosZ") || p.Id("RightPos")) {
+			Point pt = ReadPoint(p);
+			pos.x = Ctrl::PosRight(pt.x, pt.y);
+		}
+		else
+		if(p.Id("HSizePosZ") || p.Id("HSizePos")) {
+			Point pt = ReadPoint(p);
+			pos.x = Ctrl::PosSize(pt.x, pt.y);
+		}
+		else
+		if(p.Id("HCenterPosZ") || p.Id("HCenterPos")) {
+			Point pt = ReadPoint(p);
+			pos.x = Ctrl::PosCenter(pt.x, pt.y);
+		}
+		else
+		if(p.Id("TopPosZ") || p.Id("TopPos")) {
+			Point pt = ReadPoint(p);
+			pos.y = Ctrl::PosLeft(pt.x, pt.y);
+		}
+		else
+		if(p.Id("BottomPosZ") || p.Id("BottomPos")) {
+			Point pt = ReadPoint(p);
+			pos.y = Ctrl::PosRight(pt.x, pt.y);
+		}
+		else
+		if(p.Id("VSizePosZ") || p.Id("VSizePos")) {
+			Point pt = ReadPoint(p);
+			pos.y = Ctrl::PosSize(pt.x, pt.y);
+		}
+		else
+		if(p.Id("VCenterPosZ") || p.Id("VCenterPos")) {
+			Point pt = ReadPoint(p);
+			pos.y = Ctrl::PosCenter(pt.x, pt.y);
+		}
+		else {
+			String name = p.ReadId();
+			int q = FindProperty(name);
+			if(q < 0)
+				if(addunknown) {
+					q = property.GetCount();
+					ItemProperty& new_prop = property.Add(new RawProperty);
+					new_prop.SetCharset(charset);
+					new_prop.name = name;
+				}
+				else {
+					p.PassChar('(');
+					ReadPropertyParam(p);
+					p.PassChar(')');
+				}
+			if(q >= 0) {
+				ItemProperty& ip = property[q];
+				ip.SetCharset(charset);
+				p.PassChar('(');
+				ip.Read(p);
+				p.PassChar(')');
+			}
+		}
+	}
+	while(p.Char('.'));
+}
+
+int  LayoutItem::FindProperty(const String& s) const
+{
+	for(int i = 0; i < property.GetCount(); i++)
+		if(property[i].name == s)
+			return i;
+	return -1;
+}
+
+String LayoutItem::SaveProperties() const
+{
+	String out;
+	Vector<int> o = GetSortOrder(property, FieldRelation(&ItemProperty::level, StdLess<int>()));
+	for(int i = 0; i < o.GetCount(); i++) {
+		const ItemProperty& ip = property[o[i]];
+		if(ip.GetData() != ip.defval)
+			out << '.' << ip.name << '(' << ip.Save() << ')';
+	}
+	switch(pos.x.GetAlign()) {
+	case Ctrl::LEFT:   out << Format(".LeftPosZ(%d, %d)", pos.x.GetA(), pos.x.GetB()); break;
+	case Ctrl::RIGHT:  out << Format(".RightPosZ(%d, %d)", pos.x.GetA(), pos.x.GetB()); break;
+	case Ctrl::SIZE:   out << Format(".HSizePosZ(%d, %d)", pos.x.GetA(), pos.x.GetB()); break;
+	case Ctrl::CENTER: out << Format(".HCenterPosZ(%d, %d)", pos.x.GetB(), pos.x.GetA()); break;
+	}
+	switch(pos.y.GetAlign()) {
+	case Ctrl::TOP:    out << Format(".TopPosZ(%d, %d)", pos.y.GetA(), pos.y.GetB()); break;
+	case Ctrl::BOTTOM: out << Format(".BottomPosZ(%d, %d)", pos.y.GetA(), pos.y.GetB()); break;
+	case Ctrl::SIZE:   out << Format(".VSizePosZ(%d, %d)", pos.y.GetA(), pos.y.GetB()); break;
+	case Ctrl::CENTER: out << Format(".VCenterPosZ(%d, %d)", pos.y.GetB(), pos.y.GetA()); break;
+	}
+	out.Remove(0);
+	return out;
+}
+
+String LayoutItem::Save(int i) const
+{
+	String out;
+	if(type.IsEmpty())
+		out << "\tUNTYPED(";
+	else
+		out << "\tITEM(" << type << ", ";
+	String var = variable.IsEmpty() ? Format("dv___%d", i) : variable;
+	out << var << ", " << SaveProperties() << ")\r\n";
+	return out;
+}
+
+void LayoutItem::UnknownPaint(Draw& w)
+{
+	DrawFrame(w, 0, 0, csize.cx, csize.cy, SColorShadow);
+	int q = FindProperty("SetLabel");
+	if(q >= 0 && IsString(~property[q]))
+		DrawSmartText(w, 0, 0, csize.cx, ToUtf8((WString)~property[q]));
+	Size tsz = GetTextSize(type, Arial(11));
+	w.DrawRect(csize.cx - tsz.cx, csize.cy - tsz.cy, tsz.cx, tsz.cy, SColorShadow);
+	w.DrawText(csize.cx - tsz.cx, csize.cy - tsz.cy, type, Arial(11), SColorLight);
+}
+
+void LayoutItem::CreateMethods(EscValue& ctrl, const String& type, bool copy) const
+{
+	int q = LayoutTypes().Find(type);
+	if(q < 0)
+		q = LayoutTypes().Find("Unknown");
+	if(q < 0)
+		return;
+	const LayoutType& m = LayoutTypes()[q];
+	for(q = 0; q < m.property.GetCount(); q++)
+		if(IsNull(m.property[q].type))
+			CreateMethods(ctrl, m.property[q].name, copy);
+	for(q = 0; q < m.methods.GetCount(); q++) {
+		ctrl.MapSet(m.methods.GetKey(q), m.methods[q]);
+		if(copy)
+			ctrl.MapSet("Ctrl" + m.methods.GetKey(q), m.methods[q]);
+	}
+}
+
+EscValue LayoutItem::CreateEsc() const
+{
+	EscValue ctrl;
+	String tp = type;
+	String tm;
+	if(ParseTemplate(tp, tm)) {
+		CreateMethods(ctrl, tp, true);
+		if(ctrl.IsMap())
+			ctrl.MapSet("CtrlPaint", ctrl.MapGet("Paint"));
+		CreateMethods(ctrl, tm, false);
+	}
+	else
+		CreateMethods(ctrl, tp, false);
+	for(int q = 0; q < property.GetCount(); q++) {
+		EscValue w;
+		const Value& v = ~property[q];
+		if(IsType<Font>(v)) {
+			Font fnt = v;
+			if(fnt.GetHeight())
+				fnt.Height(Ctrl::VertLayoutZoom(fnt.GetHeight()));
+			w = EscFont(fnt);
+		}
+		if(IsString(v))
+			w = (WString)v;
+		if(IsNumber(v))
+			w = (double)v;
+		if(IsType<Color>(v))
+			w = EscColor(v);
+		ctrl.MapSet(property[q].name, w);
+	}
+	ctrl.MapSet("type", (WString)type);
+	ctrl.MapSet("GetSize", ReadLambda(Format("() { return Size(%d, %d); }", csize.cx, csize.cy)));
+	ctrl.MapSet("GetRect", ReadLambda(Format("() { return Rect(0, 0, %d, %d); }", csize.cx, csize.cy)));
+	return ctrl;
+}
+
+EscValue LayoutItem::ExecuteMethod(const char *method, Vector<EscValue>& arg) const
+{
+	try {
+		EscValue self = CreateEsc();
+		return ::Execute(UscGlobal(), &self, method, arg, 50000);
+	}
+	catch(CParser::Error& e) {
+		PutConsole(e + "\n");
+	}
+	return EscValue();
+}
+
+EscValue LayoutItem::ExecuteMethod(const char *method) const
+{
+	Vector<EscValue> arg;
+	return ExecuteMethod(method, arg);
+}
+
+Size LayoutItem::GetMinSize()
+{
+	return SizeEsc(ExecuteMethod("GetMinSize"));
+}
+
+Size LayoutItem::GetStdSize()
+{
+	return SizeEsc(ExecuteMethod("GetStdSize"));
+}
+
+void LayoutItem::Paint(Draw& w, Size sz, bool sample)
+{
+	if(csize != sz) {
+		csize = sz;
+		DrawingDraw dw(csize);
+		int q = LayoutTypes().Find(type);
+		if(q < 0)
+			q = LayoutTypes().Find("Unknown");
+		if(q < 0)
+			UnknownPaint(dw);
+		else {
+			try {
+				EscValue ctrl = CreateEsc();
+				if(ctrl.MapGet("Paint").IsLambda()) {
+					if(sample) {
+						ctrl.MapSet("SetLabel", (WString)type);
+						Vector<EscValue> arg;
+						::Execute(UscGlobal(), &ctrl, "Sample", arg, 50000);
+					}
+					Vector<EscValue> arg;
+					EscValue draw;
+					new EscDraw(draw, dw);
+					arg.Add(draw);
+					::Execute(UscGlobal(), &ctrl, "Paint", arg, 50000);
+				}
+				else
+					UnknownPaint(dw);
+				cache = dw;
+			}
+			catch(CParser::Error e) {
+				PutConsole(e);
+				DrawingDraw edw;
+				edw.DrawRect(0, 0, csize.cx, csize.cy, Red);
+				edw.DrawText(2, 2, e, Arial(11).Bold(), Yellow);
+				cache = edw;
+			}
+		}
+	}
+	w.DrawDrawing(sz, cache);
+}
+
+Image GetTypeIcon(const String& type, int cx, int cy, int i, Color bg)
+{
+	ASSERT(i >= 0 && i < 2);
+	int q = LayoutTypes().Find(type);
+	if(q < 0)
+		return Null;
+	LayoutType& p = LayoutTypes()[q];
+	Image& icon = p.icon[i];
+	if(p.iconsize[i] != Size(cx, cy)) {
+		p.iconsize[i] = Size(cx, cy);
+		LayoutItem m;
+		m.Create(type);
+		Size stdsize = m.GetStdSize();
+		if(stdsize.cx == 0 || stdsize.cy == 0)
+			return Null;
+
+		ImageDraw w(stdsize);
+		w.DrawRect(stdsize, bg);
+		m.Paint(w, stdsize, true);
+		if(stdsize.cx * cy > stdsize.cy * cx)
+			cy = stdsize.cy * cx / stdsize.cx;
+		else
+			cx = stdsize.cx * cy / stdsize.cy;
+		icon = Rescale(w, cx, cy);
+	}
+	return icon;
+}
diff --git a/uppsrc/ide/LayDes/laydes.cpp b/uppsrc/ide/LayDes/laydes.cpp
new file mode 100644
index 000000000..3d7be5616
--- /dev/null
+++ b/uppsrc/ide/LayDes/laydes.cpp
@@ -0,0 +1,1536 @@
+#include "LayDes.h"
+
+using namespace LayoutKeys;
+
+#define IMAGECLASS LayImg
+#define IMAGEFILE  <ide/LayDes/LayDes.iml>
+#include <Draw/iml_source.h>
+
+#define LTIMING(x) // TIMING(x)
+
+#define MARGIN 8
+
+static void sLay1(int& pos, int& r, int align, int a, int b, int sz)
+{
+	pos = a;
+	int size = b;
+	switch(align) {
+	case Ctrl::CENTER:
+		pos = (sz - b) / 2 + a;
+		break;
+	case Ctrl::RIGHT:
+		pos = sz - (a + b);
+		break;
+	case Ctrl::SIZE:
+		size = sz - (a + b);
+		break;
+	}
+	r = pos + max(size, 0);
+}
+
+Rect LayDes::CtrlRect(Ctrl::LogPos pos, Size sz)
+{
+	Rect r;
+	sLay1(r.left, r.right, pos.x.GetAlign(), pos.x.GetA(), pos.x.GetB(), sz.cx);
+	sLay1(r.top, r.bottom, pos.y.GetAlign(), pos.y.GetA(), pos.y.GetB(), sz.cy);
+	return r;
+}
+
+Rect LayDes::CtrlRectZ(Ctrl::LogPos pos, Size sz)
+{
+	Rect r = CtrlRect(pos, sz);
+	r.left = HorzLayoutZoom(r.left);
+	r.right = HorzLayoutZoom(r.right);
+	r.top = VertLayoutZoom(r.top);
+	r.bottom = VertLayoutZoom(r.bottom);
+	return r;
+}
+
+void LayDes::AddHandle(Draw& w, int x, int y)
+{
+	w.DrawRect(x, y, 6, 6, SColorMark);
+	handle.Add(Point(x, y));
+}
+
+Point LayDes::Normalize(Point p)
+{
+	p += sb;
+	p.Offset(-MARGIN, -MARGIN);
+	return p;
+}
+
+Point LayDes::ZPoint(Point p)
+{
+	Size csz, dsz;
+	GetZoomRatio(csz, dsz);
+	if(csz.cx && csz.cy && dsz.cx && dsz.cy) {
+		p.x = p.x * dsz.cx / csz.cx;
+		p.y = p.y * dsz.cy / csz.cy;
+	}
+	return p;
+}
+
+void LayDes::SetSb()
+{
+	Size sz = Size(0, 0);
+	if(currentlayout >= 0) {
+		LayoutData& l = CurrentLayout();
+		sz = l.size;
+		for(int i = 0; i < l.item.GetCount(); i++)
+			sz = max(sz, (Size)CtrlRect(l.item[i].pos, l.size).BottomRight());
+	}
+	sz += Size(MARGIN, MARGIN);
+	Size csz, dsz;
+	GetZoomRatio(csz, dsz);
+	if(csz.cx && csz.cy && dsz.cx && dsz.cy) {
+		sz.cx = sz.cx * csz.cx / dsz.cx;
+		sz.cy = sz.cy * csz.cy / dsz.cy;
+	}
+	sb.SetTotal(sz);
+	sb.SetPage(sb.GetReducedViewSize());
+}
+
+void LayDes::Scroll()
+{
+	Refresh();
+}
+
+void LayDes::Layout()
+{
+	SetSb();
+	layoutlist.ScrollIntoCursor();
+}
+
+void LayDes::GetSprings(Rect& l, Rect& t, Rect& r, Rect& b)
+{
+	if(currentlayout < 0 || !cursor.GetCount()) {
+		l = t = r = b = Null;
+		return;
+	}
+	Rect ir = CtrlRectZ(CurrentItem().pos, CurrentLayout().size);
+	int h4 = ir.Height() / 4;
+	int w4 = ir.Width() / 4;
+	l = RectC(-MARGIN, ir.top + h4 - 5, ir.left + MARGIN, 10);
+	t = RectC(ir.left + w4 - 5, -MARGIN, 10, ir.top + MARGIN);
+	r = RectC(ir.right, ir.bottom - h4 - 5, 9999, 10);
+	b = RectC(ir.right - w4 - 5, ir.bottom, 10, 9999);
+}
+
+void LayDes::DrawSpring(Draw& w, const Rect& r, bool horz, bool hard)
+{
+	if(hard)
+		w.DrawRect(horz ? r.DeflatedVert(4) : r.DeflatedHorz(4), Red);
+	else
+		if(horz)
+			for(int x = r.left; x < r.right; x += 4)
+				w.DrawRect(x, r.top, 1, r.Height(), SColorShadow);
+		else
+			for(int y = r.top; y < r.bottom; y += 4)
+				w.DrawRect(r.left, y, r.Width(), 1, SColorShadow);
+}
+
+int LayDes::ParseLayoutRef(String cls, String& base) const
+{
+	const char *p = cls;
+	if(p[0] != 'W' || p[1] != 'i' || p[2] != 't' || p[3] != 'h')
+		return -1;
+	const char *b = (p += 4);
+	while(IsAlNum(*p) || *p == '_')
+		p++;
+	if(p <= b)
+		return -1;
+	String layoutid(b, p);
+	int fi = FindFieldIndex(layout, &LayoutData::name, layoutid);
+	if(fi < 0)
+		return -1;
+	while(*p && (byte)*p <= ' ')
+		p++;
+	if(*p++ != '<')
+		return -1;
+	while(*p && (byte)*p <= ' ')
+		p++;
+	const char *e = cls.End();
+	while(e > p && (byte)e[-1] <= ' ')
+		e--;
+	if(e > p && e[-1] == '>')
+		e--;
+	while(e > p && (byte)e[-1] <= ' ')
+		e--;
+	base = String(p, e);
+	return fi;
+}
+
+void LayDes::PaintLayoutItems(Draw& w, int layid, Size size, Index<int>& passed, const Vector<bool>& cursor)
+{
+	if(passed.Find(layid) >= 0)
+		return;
+	passed.Add(layid);
+	LayoutData& l = layout[layid];
+	bool nocursor = true;
+	for(int i = 0; i < l.item.GetCount(); i++) {
+		LayoutItem& m = l.item[i];
+		if(m.hide)
+			continue;
+		Rect r = CtrlRectZ(m.pos, size);
+		String dummy;
+		int lr = ParseLayoutRef(m.type, dummy);
+		DrawFrame(w, r, WhiteGray);
+		w.Clipoff(r);
+		if(lr < 0)
+			m.Paint(w, r.Size());
+		else
+		if(i >= cursor.GetCount() ? nocursor : cursor[i]) {
+			PaintLayoutItems(w, lr, r.Size(), passed, Vector<bool>());
+			nocursor = false;
+		}
+		w.End();
+	}
+	passed.Drop();
+}
+
+void LayDes::Paint(Draw& w)
+{
+	LTIMING("Paint");
+	Size sz = GetSize();
+	w.DrawRect(sz, SColorPaper);
+	if(!IsNull(fileerror))
+		w.DrawText(16, 16, "FILE ERROR: " + fileerror, Arial(14).Bold(), Red);
+	if(currentlayout < 0)
+		return;
+	w.Offset(-sb.Get());
+	LayoutData& l = CurrentLayout();
+	w.Offset(MARGIN, MARGIN);
+	Size lsz = LayoutZoom(l.size);
+	w.DrawRect(0, 0, lsz.cx, lsz.cy, SLtGray);
+	if(setting.paintgrid) {
+		int gx = minmax((int)~setting.gridx, 1, 32);
+		int gy = minmax((int)~setting.gridy, 1, 32);
+		for(int x = 0; x < l.size.cx; x += gx)
+			for(int y = 0; y < l.size.cy; y += gy)
+				w.DrawRect(x, y, 1, 1, SColorPaper);
+	}
+	DrawFrame(w, -1, -1, lsz.cx + 2, lsz.cy + 2, SColorText);
+	handle.Clear();
+	AddHandle(w, lsz.cx, lsz.cy / 2 - 3);
+	AddHandle(w, lsz.cx / 2 - 3, lsz.cy);
+	AddHandle(w, lsz.cx, lsz.cy);
+	int i;
+	Index<int> passed;
+	Vector<bool> cursorflags;
+	if(!cursor.IsEmpty()) {
+		cursorflags.SetCount(l.item.GetCount(), cursor.IsEmpty());
+		for(i = 0; i < cursor.GetCount(); i++)
+			cursorflags[cursor[i]] = true;
+	}
+	PaintLayoutItems(w, currentlayout, l.size, passed, cursorflags);
+	if(!HasCapture() || draghandle == 14) {
+		for(i = 0; i < cursor.GetCount(); i++) {
+			LayoutItem& m = l.item[cursor[i]];
+			Rect r = CtrlRectZ(m.pos, l.size);
+			DrawFatFrame(w, r, i == cursor.GetCount() - 1 ? Cyan : Brown, -3);
+			if(i == cursor.GetCount() - 1) {
+				int lrm = r.left + r.Width() / 2 - 3;
+				int tbm = r.top + r.Height() / 2 - 3;
+				AddHandle(w, r.left - 6, r.top - 6);
+				AddHandle(w, lrm, r.top - 6);
+				AddHandle(w, r.right, r.top - 6);
+				AddHandle(w, r.left - 6, tbm);
+				AddHandle(w, r.right, tbm);
+				AddHandle(w, r.left - 6, r.bottom);
+				AddHandle(w, lrm, r.bottom);
+				AddHandle(w, r.right, r.bottom);
+			}
+		}
+		if(cursor.GetCount()) {
+			LayoutItem& m = CurrentItem();
+			Rect l, t, r, b;
+			GetSprings(l, t, r, b);
+			DrawSpring(w, l, true, m.pos.x.GetAlign() & Ctrl::LEFT);
+			DrawSpring(w, r, true, m.pos.x.GetAlign() & Ctrl::RIGHT);
+			DrawSpring(w, t, false, m.pos.y.GetAlign() & Ctrl::TOP);
+			DrawSpring(w, b, false, m.pos.y.GetAlign() & Ctrl::BOTTOM);
+		}
+	}
+	if(HasCapture() && draghandle == 14)
+		DrawFrame(w, dragrect.Normalized(), LtRed);
+	w.End();
+	w.End();
+}
+
+void  LayDes::SaveState()
+{
+	if(currentlayout < 0)
+		return;
+	CurrentLayout().SaveState();
+	SetBar();
+}
+
+void  LayDes::SetStatus(bool down)
+{
+	String s;
+	if(currentlayout >= 0) {
+		Size sz = CurrentLayout().size;
+		s << sz;
+		if(cursor.GetCount()) {
+			Rect r = CtrlRect(CurrentItem().pos, sz);
+			s << ": " << r << " - {" << sz.cx - r.right << ", " << sz.cy - r.bottom << '}';
+		}
+	}
+	status.SetLabel(s);
+	Refresh();
+	SetBar();
+	SetSb();
+}
+
+int   LayDes::FindHandle(Point p)
+{
+	for(int i = 0; i < handle.GetCount(); i++) {
+		Point h = handle[i];
+		if(p.x >= h.x - 1 && p.x < h.x + 7 && p.y >= h.y - 1 && p.y < h.y + 7)
+			return i;
+	}
+	return -1;
+}
+
+int   LayDes::FindItem(Point p)
+{
+	if(currentlayout < 0)
+		return -1;
+	LayoutData& l = CurrentLayout();
+	int ii = -1;
+	int min = INT_MAX;
+	for(int i = 0; i < l.item.GetCount(); i++) {
+		LayoutItem& m = l.item[i];
+		if(m.hide)
+			continue;
+		Rect r = CtrlRect(m.pos, l.size);
+		if(r.Contains(p)) {
+			int mm = r.Width() * r.Height();
+			if(mm < min) {
+				ii = i;
+				min = mm;
+			}
+		}
+	}
+	return ii;
+}
+
+Image LayDes::CursorImage(Point p, dword keyflags)
+{
+	int hi;
+	if(HasCapture())
+		hi = draghandle;
+	else
+	 	hi = FindHandle(Normalize(p));
+	Image (*id[11])() = {
+		Image::SizeHorz, Image::SizeVert, Image::SizeBottomRight,
+		Image::SizeTopLeft, Image::SizeVert, Image::SizeTopRight,
+		Image::SizeHorz, Image::SizeHorz,
+		Image::SizeBottomLeft, Image::SizeVert, Image::SizeBottomRight,
+	};
+	if(hi >= 0 && hi < 11)
+		return (*id[hi])();
+	return Image::Arrow();
+}
+
+Ctrl::Logc MakeLogc(int align, int a, int b, int sz)
+{
+	int isz = b - a;
+	switch(align) {
+	case Ctrl::LEFT:
+		return Ctrl::PosLeft(a, isz);
+	case Ctrl::RIGHT:
+		return Ctrl::PosRight(sz - b, isz);
+	case Ctrl::CENTER:
+		return Ctrl::PosCenter(isz, a - (sz - isz) / 2);
+	}
+	return Ctrl::PosSize(a, sz - b);
+}
+
+Ctrl::LogPos MakeLogPos(int ax, int ay, const Rect& r, Size sz)
+{
+	return Ctrl::LogPos(MakeLogc(ax, r.left, r.right, sz.cx),
+	                    MakeLogc(ay, r.top, r.bottom, sz.cy));
+}
+
+Ctrl::LogPos MakeLogPos(Ctrl::LogPos p, const Rect& r, Size sz)
+{
+	return MakeLogPos(p.x.GetAlign(), p.y.GetAlign(), r, sz);
+}
+
+struct IDisplay : public Display {
+	Color paper, ink;
+	void Paint(Draw& w, const Rect& r, const Value& q,
+	           Color, Color, dword s) const {
+		w.DrawRect(r, paper);
+		DrawSmartText(w, r.left + 8, r.top, r.Width(),
+					  String(IsString(q) ? q : StdConvert().Format(q)), StdFont(), ink);
+	}
+	IDisplay(Color paper, Color ink)
+		: paper(paper), ink(ink) {}
+};
+
+struct TDisplay : public Display {
+	Color paper, ink;
+
+	void Paint(Draw& w, const Rect& r, const Value& q,
+	           Color, Color, dword s) const {
+		w.DrawRect(r, paper);
+		int dx = r.Height() * 8 / 3;
+		Image icon = GetTypeIcon(String(q), dx, r.Height(), 1, paper);
+		w.DrawImage(r.left + 8, r.top + (r.Height() - icon.GetSize().cy) / 2, icon);
+		DrawSmartText(w, r.left + dx + 12, r.top, r.Width(), String(q), StdFont(), ink);
+	}
+	TDisplay(Color paper, Color ink)
+		: paper(paper), ink(ink) {}
+};
+
+struct IDisplayH : public Display {
+	Color paper, ink;
+	void Paint(Draw& w, const Rect& r, const Value& q,
+	           Color, Color, dword s) const {
+		w.DrawRect(r, paper);
+		DrawSmartText(w, r.left + 8, r.top, r.Width(),
+					  String(IsString(q) ? q : StdConvert().Format(q)), StdFont().Italic(), ink);
+	}
+	IDisplayH(Color paper, Color ink)
+		: paper(paper), ink(ink) {}
+};
+
+struct TDisplayH : public Display {
+	Color paper, ink;
+
+	void Paint(Draw& w, const Rect& r, const Value& q,
+	           Color, Color, dword s) const {
+		w.DrawRect(r, paper);
+		int dx = r.Height() * 8 / 3;
+		Image icon = GetTypeIcon(String(q), dx, r.Height(), 1, paper);
+		w.DrawImage(r.left + 8, r.top + (r.Height() - icon.GetSize().cy) / 2, icon);
+		DrawSmartText(w, r.left + dx + 12, r.top, r.Width(), String(q), StdFont().Italic(), ink);
+	}
+	TDisplayH(Color paper, Color ink)
+		: paper(paper), ink(ink) {}
+};
+
+void LayDes::SyncItems()
+{
+	LTIMING("SyncItems");
+	if(currentlayout < 0)
+		return;
+	int i;
+	for(i = 0; i < item.GetCount(); i++)
+		SyncItem(i, 0);
+	for(i = 0; i < cursor.GetCount(); i++)
+		SyncItem(cursor[i], 1);
+	if(cursor.GetCount()) {
+		SyncItem(cursor.Top(), 2);
+		item.SetCursor(cursor.Top());
+	}
+	else
+		item.KillCursor();
+	SetStatus();
+	SyncProperties(true);
+}
+
+void LayDes::SyncItem(int i, int style)
+{
+	if(CurrentLayout().item[i].hide) {
+		static IDisplayH dnormal(SColorPaper, SColorText);
+		static IDisplayH dselect(SColorLtFace, SColorText);
+		static IDisplayH dcursor(SColorFace, SColorText);
+		static TDisplayH tnormal(SColorPaper, SColorText);
+		static TDisplayH tselect(SColorLtFace, SColorText);
+		static TDisplayH tcursor(SColorFace, SColorText);
+		static IDisplayH lnormal(SColorPaper, Green);
+		static IDisplayH lselect(SColorLtFace, Green);
+		static IDisplayH lcursor(SColorFace, Green);
+		const Display *noicon[] = { &dnormal, &dselect, &dcursor };
+		const Display *isicon[] = { &tnormal, &tselect, &tcursor };
+		const Display *label[] = { &lnormal, &lselect, &lcursor };
+		bool icons = setting.showicons;
+		item.SetDisplay(i, 0, *(icons ? isicon : noicon)[style]);
+		item.SetDisplay(i, 1, *(IsNull(CurrentLayout().item[i].variable) ? label : noicon)[style]);
+	}
+	else {
+		static IDisplay dnormal(SColorPaper, SColorText);
+		static IDisplay dselect(SColorLtFace, SColorText);
+		static IDisplay dcursor(SColorFace, SColorText);
+		static TDisplay tnormal(SColorPaper, SColorText);
+		static TDisplay tselect(SColorLtFace, SColorText);
+		static TDisplay tcursor(SColorFace, SColorText);
+		static IDisplay lnormal(SColorPaper, Green);
+		static IDisplay lselect(SColorLtFace, Green);
+		static IDisplay lcursor(SColorFace, Green);
+		const Display *noicon[] = { &dnormal, &dselect, &dcursor };
+		const Display *isicon[] = { &tnormal, &tselect, &tcursor };
+		const Display *label[] = { &lnormal, &lselect, &lcursor };
+		bool icons = setting.showicons;
+		item.SetDisplay(i, 0, *(icons ? isicon : noicon)[style]);
+		item.SetDisplay(i, 1, *(IsNull(CurrentLayout().item[i].variable) ? label : noicon)[style]);
+	}
+}
+
+void LayDes::SyncProperties(bool sync_type_var)
+{
+	property.Clear();
+	if(sync_type_var) {
+		type.Disable();
+		variable.Disable();
+		type <<= variable <<= Null;
+	}
+	if(cursor.GetCount()) {
+		LayoutItem& m = CurrentItem();
+		int i;
+		for(i = 0; i < m.property.GetCount(); i++) {
+			property.Add(m.property[i]);
+			m.property[i].WhenAction = THISBACK(PropertyChanged);
+		}
+		if(sync_type_var) {
+			String tp = m.type;
+			type <<= m.type;
+			for(i = 0; i < cursor.GetCount() - 1; i++)
+				if(CurrentLayout().item[cursor[i]].type != tp) {
+					type <<= Null;
+					break;
+				}
+			variable <<= m.variable;
+			type.Enable();
+			variable.Enable();
+		}
+	}
+}
+
+void LayDes::SelectOne(int ii, dword flags)
+{
+	if(ii < 0) {
+		if(flags & (K_SHIFT|K_CTRL))
+			return;
+		cursor.Clear();
+	}
+	else
+	if(flags & (K_SHIFT|K_CTRL)) {
+		int q = FindIndex(cursor, ii);
+		if(q >= 0)
+			cursor.Remove(q);
+		else
+			cursor.Add(ii);
+	}
+	else {
+		cursor.Clear();
+		cursor.Add(ii);
+	}
+	SyncItems();
+}
+
+void LayDes::StoreItemRects()
+{
+	if(currentlayout < 0)
+		return;
+	LayoutData& l = CurrentLayout();
+	itemrect.SetCount(cursor.GetCount());
+	for(int i = 0; i < cursor.GetCount(); i++)
+		itemrect[i] = CtrlRect(l.item[cursor[i]].pos, l.size);
+}
+
+void  LayDes::LeftDown(Point p, dword keyflags)
+{
+	if(currentlayout < 0)
+		return;
+	SaveState();
+	SetFocus();
+	SetCapture();
+	LayoutData& l = CurrentLayout();
+	draglayoutsize = l.size;
+	p = Normalize(p);
+	draghandle = FindHandle(p);
+	dragbase = ZPoint(p);
+	if(draghandle >= 0)
+		StoreItemRects();
+	else {
+		int ii = FindItem(dragbase);
+		if(ii >= 0) {
+			if(GetShift() || GetCtrl() || FindIndex(cursor, ii) < 0)
+				SelectOne(ii, keyflags);
+			if(cursor.GetCount()) {
+				draghandle = 11;
+				StoreItemRects();
+				SetStatus();
+			}
+		}
+		else {
+			if(cursor.GetCount()) {
+				LayoutItem& m = CurrentItem();
+				StoreItemRects();
+				Rect lr, tr, rr, br;
+				GetSprings(lr, tr, rr, br);
+				int xa = m.pos.x.GetAlign();
+				int ya = m.pos.y.GetAlign();
+				if(lr.Contains(p))
+					xa ^= 1;
+				if(rr.Contains(p))
+					xa ^= 2;
+				if(tr.Contains(p))
+					ya ^= 1;
+				if(br.Contains(p))
+					ya ^= 2;
+				if(xa != m.pos.x.GetAlign() || ya != m.pos.y.GetAlign()) {
+					SetSprings(MAKELONG(xa, ya));
+					SetStatus();
+					return;
+				}
+			}
+			dragrect.left = dragrect.right = p.x;
+			dragrect.top = dragrect.bottom = p.y;
+			draghandle = 14;
+			if(GetCtrl() || GetShift())
+				basesel = cursor.GetCount();
+			else {
+				basesel = 0;
+				cursor.Clear();
+			}
+			SyncItems();
+		}
+	}
+	SetStatus(true);
+}
+
+void  LayDes::LeftRepeat(Point p, dword keyflags)
+{
+	MouseMove(p, keyflags);
+}
+
+void  LayDes::MouseMove(Point p, dword keyflags)
+{
+	if(!HasCapture() || currentlayout < 0)
+		return;
+	Point pz = Normalize(p);
+	p = ZPoint(pz);
+	LayoutData& l = CurrentLayout();
+	bool smallmove = max(abs(p.x - dragbase.x), abs(p.y - dragbase.y)) < 4;
+	if(draghandle == 14) {
+		dragrect.right = pz.x;
+		dragrect.bottom = pz.y;
+		cursor.SetCount(basesel);
+		Rect r = dragrect.Normalized();
+		r = Rect(ZPoint(r.TopLeft()), ZPoint(r.BottomRight()));
+		int mind = INT_MAX;
+		int mini = -1;
+		for(int i = 0; i < l.item.GetCount(); i++) {
+			LayoutItem& m = l.item[i];
+			Rect ir = CtrlRect(m.pos, l.size);
+			if(r.Contains(ir) && FindIndex(cursor, i) < 0) {
+				Point ip = ir.CenterPoint();
+				int mm = (ip.x - dragrect.left) * (ip.x - dragrect.left)
+				       + (ip.y - dragrect.top) * (ip.y - dragrect.top);
+				if(mm < mind) {
+					mind = mm;
+					mini = cursor.GetCount();
+				}
+				cursor.Add(i);
+			}
+		}
+		if(mini >= 0)
+			Swap(cursor.Top(), cursor[mini]);
+		if(cursor.GetCount())
+			item.SetCursor(cursor.Top());
+		else
+			item.KillCursor();
+		SyncItems();
+		SetStatus(false);
+		LTIMING("MouseMove Sync");
+		Sync();
+		return;
+	}
+	int gx = 1;
+	int gy = 1;
+	if(usegrid == !(keyflags & K_ALT)) {
+		gx = minmax((int)~setting.gridx, 1, 32);
+		gy = minmax((int)~setting.gridy, 1, 32);
+	}
+	p -= dragbase;
+	if(draghandle < 3) {
+		if((draghandle + 1) & 1)
+			l.size.cx = max(0, draglayoutsize.cx + p.x) / gx * gx;
+		if((draghandle + 1) & 2)
+			l.size.cy = max(0, draglayoutsize.cy + p.y) / gy * gy;
+		SetStatus(true);
+		SetSb();
+		Sync();
+		return;
+	}
+	if(!item.IsCursor())
+		return;
+	if(draghandle == 11) {
+		if(smallmove)
+			return;
+		draghandle = 12;
+	}
+	Point md = Point(0, 0);
+	for(int i = 0; i < cursor.GetCount(); i++) {
+		LayoutItem& m = l.item[cursor[i]];
+		Rect r = itemrect[i];
+		Size minsize = ignoreminsize ? Size(0, 0) : m.GetMinSize();
+		if(keyflags & K_CTRL)
+			minsize = Size(0, 0);
+		if(draghandle == 3 || draghandle == 4 || draghandle == 5)
+			r.top = min(r.bottom - minsize.cy, (r.top + p.y) / gy * gy);
+		if(draghandle == 8 || draghandle == 9 || draghandle == 10)
+			r.bottom = max(r.top + minsize.cy, (r.bottom + p.y) / gy * gy);
+		if(draghandle == 3 || draghandle == 6 || draghandle == 8)
+			r.left = min(r.right - minsize.cx, (r.left + p.x) / gy * gy);
+		if(draghandle == 5 || draghandle == 7 || draghandle == 10)
+			r.right = max(r.left + minsize.cx, (r.right + p.x) / gy * gy);
+		if(draghandle == 12) {
+			Size sz = r.Size();
+			if(i == 0) {
+				Rect q = r;
+				r.left = (r.left + p.x) / gx * gx;
+				r.top = (r.top + p.y) / gy * gy;
+				md = r.TopLeft() - q.TopLeft();
+			}
+			else
+				r += md;
+			r.SetSize(sz);
+		}
+		m.pos = MakeLogPos(m.pos, r, draglayoutsize);
+	}
+	SetStatus(true);
+	Sync();
+}
+
+void  LayDes::LeftUp(Point p, dword keyflags)
+{
+	if(draghandle == 11 && (keyflags & (K_SHIFT|K_CTRL)) == 0)
+		SelectOne(FindItem(ZPoint(Normalize(p))), 0);
+	draghandle = -1;
+	SyncItems();
+}
+
+void LayDes::CreateCtrl(const String& _type)
+{
+	if(currentlayout < 0)
+		return;
+	LOG("CreateCtrl");
+	LayoutData& l = CurrentLayout();
+	int c = l.item.GetCount();
+	if(cursor.GetCount())
+		c = Max(cursor) + 1;
+	LayoutItem& m = l.item.Insert(c);
+	m.Create(_type);
+	Point p = dragbase;
+	if(usegrid) {
+		p.x = p.x / (int)~setting.gridx * (int)~setting.gridx;
+		p.y = p.y / (int)~setting.gridy * (int)~setting.gridy;
+	}
+	Rect r(p, m.GetStdSize());
+	m.pos = MakeLogPos(Ctrl::LEFT, Ctrl::TOP, r, l.size);
+	cursor.Clear();
+	cursor.Add(c);
+	ReloadItems();
+	if(IsNull(_type))
+		type.SetFocus();
+	else {
+		int q = m.FindProperty("SetLabel");
+		if(q >= 0)
+			m.property[q].SetFocus();
+		else
+			variable.SetFocus();
+	}
+	LOG("Create " << ::Name(GetFocusCtrl()));
+
+}
+
+void LayDes::Group(Bar& bar, const String& group)
+{
+	int i;
+	Vector<String> type;
+	for(i = 0; i < LayoutTypes().GetCount(); i++) {
+		LayoutType& m = LayoutTypes()[i];
+		if((IsNull(group) || m.group == group) && m.kind == LAYOUT_CTRL)
+			type.Add(LayoutTypes().GetKey(i));
+	}
+	Sort(type);
+	int h = 3 * StdFont().Info().GetHeight() / 2;
+	int w = 8 * h / 3;
+	((MenuBar&)bar).LeftGap(w + 2);
+	int q = 0;
+	for(i = 0; i < type.GetCount(); i++) {
+		bar.Add(type[i], GetTypeIcon(type[i], w, h, 0, SColorFace),
+		        THISBACK1(CreateCtrl, type[i]));
+		if((q++ + 2) % 16 == 0)
+			bar.Break();
+	}
+	LOG("End " << ::Name(GetFocusCtrl()));
+}
+
+void LayDes::TemplateGroup(Bar& bar, TempGroup tg)
+{
+	int i;
+	Vector<String> type;
+	for(i = 0; i < LayoutTypes().GetCount(); i++) {
+		LayoutType& m = LayoutTypes()[i];
+		if((IsNull(tg.group) || m.group == tg.group) && m.kind == LAYOUT_CTRL)
+			type.Add(LayoutTypes().GetKey(i));
+	}
+	Sort(type);
+	int h = 3 * StdFont().Info().GetHeight() / 2;
+	int w = 8 * h / 3;
+	((MenuBar&)bar).LeftGap(w + 2);
+	int q = 0;
+	for(i = 0; i < type.GetCount(); i++) {
+		bar.Add(type[i], GetTypeIcon(type[i], w, h, 0, SColorFace),
+		        THISBACK1(CreateCtrl, tg.temp + '<' + type[i] + '>'));
+		if((q++ + 2) % 16 == 0)
+			bar.Break();
+	}
+}
+
+void LayDes::Template(Bar& bar, const String& temp)
+{
+	Index<String> group;
+	Vector<String> type;
+	int h = 3 * StdFont().Info().GetHeight() / 2;
+	int w = 8 * h / 3;
+	((MenuBar&)bar).LeftGap(w + 2);
+	int i;
+	for(i = 0; i < LayoutTypes().GetCount(); i++) {
+		LayoutType& m = LayoutTypes()[i];
+		if(!IsNull(m.group))
+			group.FindAdd(m.group);
+		else
+		if(m.kind == LAYOUT_CTRL)
+			type.Add(LayoutTypes().GetKey(i));
+	}
+	Vector<String> sg = group.PickKeys();
+	Sort(sg);
+	Sort(type);
+	int q = 0;
+	for(i = 0; i < sg.GetCount(); i++) {
+		bar.Add(sg[i], THISBACK1(TemplateGroup, TempGroup(temp, sg[i])));
+		if((q++ + 2) % 16 == 0)
+			bar.Break();
+	}
+	bar.Add("All", THISBACK1(TemplateGroup, TempGroup(temp, String())));
+	if((q++ + 2) % 16 == 0)
+		bar.Break();
+	for(i = 0; i < type.GetCount(); i++) {
+		bar.Add(type[i], GetTypeIcon(type[i], w, h, 0, SColorFace),
+		        THISBACK1(CreateCtrl, temp + '<' + type[i] + '>'));
+		if((q++ + 2) % 16 == 0)
+			bar.Break();
+	}
+}
+
+void LayDes::Templates(Bar& bar)
+{
+	Vector<String> temp;
+	int i;
+	for(i = 0; i < LayoutTypes().GetCount(); i++)
+		if(LayoutTypes()[i].kind == LAYOUT_TEMPLATE)
+			temp.Add(LayoutTypes().GetKey(i));
+	Sort(temp);
+	int q = 0;
+	for(i = 0; i < temp.GetCount(); i++) {
+		bar.Add(temp[i], THISBACK1(Template, temp[i]));
+		if((q++ + 2) % 16 == 0)
+			bar.Break();
+	}
+}
+
+void LayDes::RightDown(Point p, dword keyflags)
+{
+	if(currentlayout < 0 || HasCapture()) return;
+	dragbase = Normalize(p);
+	MenuBar menu;
+	menu.MaxIconSize(Size(64, 64));
+	int h = StdFont().Info().GetHeight();
+	int w = 8 * h / 3;
+	menu.LeftGap(w + 2);
+	menu.Add("User class", THISBACK1(CreateCtrl, ""));
+	menu.Separator();
+	Index<String> group;
+	Vector<String> type;
+	int i;
+	for(i = 0; i < LayoutTypes().GetCount(); i++) {
+		LayoutType& m = LayoutTypes()[i];
+		if(!IsNull(m.group))
+			group.FindAdd(m.group);
+		else
+		if(m.kind == LAYOUT_CTRL)
+			type.Add(LayoutTypes().GetKey(i));
+	}
+	Vector<String> sg = group.PickKeys();
+	Sort(sg);
+	Sort(type);
+	int q = 0;
+	for(i = 0; i < sg.GetCount(); i++) {
+		menu.Add(sg[i], THISBACK1(Group, sg[i]));
+		if((q++ + 2) % 16 == 0)
+			menu.Break();
+	}
+	menu.Add("All", THISBACK1(Group, String()));
+	menu.Add("Templates", THISBACK(Templates));
+	if((q++ + 2) % 16 == 0)
+		menu.Break();
+	for(i = 0; i < type.GetCount(); i++) {
+		menu.Add(type[i], GetTypeIcon(type[i], w, h, 0, SColorFace),
+		                  THISBACK1(CreateCtrl, type[i]));
+		if((q++ + 2) % 16 == 0)
+			menu.Break();
+	}
+	menu.Execute();
+}
+
+void  LayDes::LoadItems()
+{
+	int nitems = CurrentLayout().item.GetCount();
+	item.SetCount(nitems);
+	for(int i = 0; i < nitems; i++)
+		LoadItem(i);
+	property.Clear();
+}
+
+String GetLabel(const LayoutItem& m)
+{
+	EscValue l = m.ExecuteMethod("GetLabelMethod");
+	if(l.IsVoid())
+		for(int p = 0; p < m.property.GetCount(); p++)
+			if(m.property[p].name == "SetLabel") {
+				Value prop = ~m.property[p];
+				return IsString(prop) && !IsNull(prop) ? AsCString(prop) : Null;
+			}
+	return l;
+}
+
+void LayDes::LoadItem(int ii)
+{
+	const LayoutItem& m = CurrentLayout().item[ii];
+	String varlbl = m.variable;
+	if(IsNull(varlbl))
+		varlbl = GetLabel(m);
+	item.Set(ii, 0, m.type);
+	item.Set(ii, 1, varlbl);
+	item.Set(ii, 2, m.hide);
+}
+
+void  LayDes::ReloadItems()
+{
+	int q = item.GetScroll();
+	LoadItems();
+	item.ScrollTo(q);
+	SyncItems();
+}
+
+void  LayDes::Undo()
+{
+	if(currentlayout < 0)
+		return;
+	if(CurrentLayout().IsUndo()) {
+		CurrentLayout().Undo();
+		cursor.Clear();
+		ReloadItems();
+	}
+}
+
+void LayDes::Redo()
+{
+	if(currentlayout < 0)
+		return;
+	if(CurrentLayout().IsRedo()) {
+		CurrentLayout().Redo();
+		cursor.Clear();
+		ReloadItems();
+	}
+}
+
+void LayDes::Cut()
+{
+	if(currentlayout < 0 || cursor.GetCount() == 0)
+		return;
+	Copy();
+	Delete();
+}
+
+void LayDes::Delete()
+{
+	SaveState();
+	Vector<int> sel(cursor, 1);
+	Sort(sel);
+	cursor.Clear();
+	CurrentLayout().item.Remove(sel);
+	ReloadItems();
+}
+
+String LayDes::SaveSelection()
+{
+	return CurrentLayout().Save(cursor) + "\r\n";
+}
+
+LayoutData LayDes::LoadLayoutData(const String& s)
+{
+	try {
+		LayoutData l;
+		l.SetCharset(charset);
+		CParser p(s);
+		l.Read(p);
+		return l;
+	}
+	catch(CParser::Error) {}
+	return LayoutData();
+}
+
+void LayDes::Copy()
+{
+	if(currentlayout < 0 || cursor.GetCount() == 0)
+		return;
+	WriteClipboardUnicodeText(ToUnicode(SaveSelection(), charset));
+}
+
+void LayDes::SelectAll()
+{
+	if(currentlayout < 0)
+		return;
+	LayoutData& l = CurrentLayout();
+	int q = cursor.GetCount() ? cursor.Top() : -1;
+	cursor.Clear();
+	for(int i = 0; i < l.item.GetCount(); i++)
+		if(i != q)
+			cursor.Add(i);
+	if(q >= 0)
+		cursor.Add(q);
+	SyncItems();
+}
+
+void LayDes::Duplicate()
+{
+	if(currentlayout < 0 || cursor.GetCount() == 0)
+		return;
+	SaveState();
+	LayoutData& l = CurrentLayout();
+	LayoutData d = LoadLayoutData(SaveSelection());
+	int q = Max(cursor) + 1;
+	cursor.Clear();
+	for(int i = 0; i < d.item.GetCount(); i++) {
+		LayoutItem& m = d.item[i];
+		d.item[i].pos = MakeLogPos(m.pos, CtrlRect(m.pos, l.size).Offseted(20, 20), l.size);
+		cursor.Add(q + i);
+	}
+	CurrentLayout().item.InsertPick(q, d.item);
+	ReloadItems();
+}
+
+void LayDes::Matrix()
+{
+	if(currentlayout < 0 || cursor.GetCount() == 0)
+		return;
+	SaveState();
+	if(matrix.Execute() != IDOK)
+		return;
+	LayoutData& l = CurrentLayout();
+	Rect r = CtrlRect(l.item[cursor[0]].pos, l.size);
+	for(int i = 1; i < cursor.GetCount(); i++)
+		r.Union(CtrlRect(l.item[cursor[i]].pos, l.size));
+	String ls = SaveSelection();
+	int q = Max(cursor) + 1;
+	for(int x = 0; x < Nvl((int)~matrix.nx, 1); x++)
+		for(int y = 0; y < Nvl((int)~matrix.ny, 1); y++)
+			if(x || y) {
+				LayoutData d = LoadLayoutData(ls);
+				for(int i = 0; i < d.item.GetCount(); i++) {
+					LayoutItem& m = d.item[i];
+					Rect r = CtrlRect(m.pos, l.size);
+					r.Offset((r.Width() + Nvl((int)~matrix.dx)) * x,
+					         (r.Height() + Nvl((int)~matrix.dy)) * y);
+					d.item[i].pos = MakeLogPos(m.pos, r, l.size);
+					cursor.Add(q + i);
+				}
+				int w = d.item.GetCount();
+				CurrentLayout().item.InsertPick(q, d.item);
+				q += w;
+			}
+	ReloadItems();
+}
+
+void LayDes::Paste()
+{
+	if(currentlayout < 0)
+		return;
+	SaveState();
+	try {
+		LayoutData l = LoadLayoutData(FromUnicode(ReadClipboardUnicodeText(), charset));
+		int q = item.GetCount();
+		if(cursor.GetCount())
+		{
+			q = 0;
+			for(int i = 0; i < cursor.GetCount(); i++)
+				q = max(q, cursor[i] + 1);
+		}
+		cursor.Clear();
+		for(int i = 0; i < l.item.GetCount(); i++)
+			cursor.Add(i + q);
+		CurrentLayout().item.InsertPick(q, l.item);
+		ReloadItems();
+	}
+	catch(CParser::Error) {}
+}
+
+void LayDes::Align(int type)
+{
+	if(currentlayout < 0 || cursor.GetCount() == 0)
+		return;
+	SaveState();
+	LayoutData& l = CurrentLayout();
+	Rect cr = CtrlRect(l.item[cursor.Top()].pos, l.size);
+	for(int i = 0; i < cursor.GetCount(); i++) {
+		LayoutItem& m = l.item[cursor[i]];
+		Rect r = CtrlRect(m.pos, l.size);
+		switch(type) {
+		case A_LEFT:
+			r.OffsetHorz(cr.left - r.left);
+			break;
+		case A_HCENTER:
+			r.OffsetHorz(cr.left + (cr.Width() - r.Width()) / 2 - r.left);
+			break;
+		case A_RIGHT:
+			r.OffsetHorz(cr.right - r.right);
+			break;
+		case A_TOP:
+			r.OffsetVert(cr.top - r.top);
+			break;
+		case A_VCENTER:
+			r.OffsetVert(cr.top + (cr.Height() - r.Height()) / 2 - r.top);
+			break;
+		case A_BOTTOM:
+			r.OffsetVert(cr.bottom - r.bottom);
+			break;
+		case A_SAMEWIDTH:
+			r.right = r.left + cr.Width();
+			break;
+		case A_SAMEHEIGHT:
+			r.bottom = r.top + cr.Height();
+			break;
+		case A_SAMESIZE:
+			r.SetSize(cr.Size());
+			break;
+		case A_HORZCENTER:
+			r.OffsetHorz((l.size.cx - r.Width()) / 2 - r.left);
+			break;
+		case A_VERTCENTER:
+			r.OffsetVert((l.size.cy - r.Height()) / 2 - r.top);
+			break;
+		case A_MINWIDTH:
+			r.SetSize(m.GetMinSize().cx, r.Height());
+			break;
+		case A_MINHEIGHT:
+			r.SetSize(r.Width(), m.GetMinSize().cy);
+			break;
+		case A_LABEL:
+			if(m.type == "Label") {
+				Rect rr = r;
+				int q = cursor[i] - 1;
+				while(q >= 0) {
+					if(l.item[q].type != "Label") {
+						rr = CtrlRect(l.item[q].pos, l.size);
+						break;
+					}
+					q--;
+				}
+				q = cursor[i] + 1;
+				while(q < l.item.GetCount()) {
+					if(l.item[q].type != "Label") {
+						rr = CtrlRect(l.item[q].pos, l.size);
+						break;
+					}
+					q++;
+				}
+				r.OffsetVert(rr.top + (rr.Height() - r.Height()) / 2 - r.top);
+			}
+			break;
+		}
+		m.pos = MakeLogPos(m.pos, r, l.size);
+//		if(i == cursor.GetCount() - 1)
+//			sb.ScrollInto(r.Offseted(MARGIN, MARGIN));
+	}
+	SetStatus();
+}
+
+void LayDes::SetSprings(dword s)
+{
+	if(currentlayout < 0)
+		return;
+	LayoutData& l = CurrentLayout();
+	SaveState();
+	int xa = (int16)LOWORD(s);
+	int ya = (int16)HIWORD(s);
+	for(int i = 0; i < cursor.GetCount(); i++) {
+		Ctrl::LogPos& pos = l.item[cursor[i]].pos;
+		Rect r = CtrlRect(pos, l.size);
+		if(xa >= 0)
+			pos.x = MakeLogc(xa, r.left, r.right, l.size.cx);
+		if(ya >= 0)
+			pos.y = MakeLogc(ya, r.top, r.bottom, l.size.cy);
+		if(xa == AUTOSPRING) {
+			pos.x = MakeLogc((r.left < l.size.cx / 2 ? LEFT : 0) |
+			                 (r.right > l.size.cx / 2 ? RIGHT : 0),
+			                 r.left, r.right, l.size.cx);
+			pos.y = MakeLogc((r.top < l.size.cy / 2 ? TOP : 0) |
+			                 (r.bottom > l.size.cy/ 2 ? BOTTOM : 0),
+			                 r.top, r.bottom, l.size.cy);
+		}
+	}
+	SetStatus();
+}
+
+void LayDes::ShowSelection(bool s)
+{
+	if(currentlayout < 0 || cursor.GetCount() == 0)
+		return;
+	LayoutData& l = CurrentLayout();
+	for(int i = 0; i < cursor.GetCount(); i++)
+		l.item[cursor[i]].hide = !s;
+	SyncItems();
+	Refresh();
+}
+
+void LayDes::MoveUp()
+{
+	SaveState();
+	if(currentlayout < 0 || cursor.GetCount() == 0)
+		return;
+	LayoutData& l = CurrentLayout();
+	Vector<int> sc(cursor, 1);
+	Sort(sc);
+	int q = 0;
+	while(q < sc.GetCount() && sc[q] == q)
+		q++;
+	int im = q;
+	while(q < sc.GetCount()) {
+		int i = sc[q++];
+		l.item.Swap(i, i - 1);
+	}
+	for(q = 0; q < cursor.GetCount(); q++)
+		if(cursor[q] >= im)
+			cursor[q]--;
+	ReloadItems();
+}
+
+void LayDes::MoveDown()
+{
+	SaveState();
+	if(currentlayout < 0 || cursor.GetCount() == 0)
+		return;
+	LayoutData& l = CurrentLayout();
+	Vector<int> sc(cursor, 1);
+	Sort(sc);
+	int q = sc.GetCount() - 1;
+	int u = l.item.GetCount() - 1;
+	while(q >= 0 && sc[q] == u--)
+		q--;
+	int im = q >= 0 ? sc[q] : -1;
+	while(q >= 0) {
+		int i = sc[q--];
+		l.item.Swap(i, i + 1);
+	}
+	for(q = 0; q < cursor.GetCount(); q++)
+		if(cursor[q] <= im)
+			cursor[q]++;
+	ReloadItems();
+}
+
+void LayDes::Flush()
+{
+	currentlayout = -1;
+}
+
+LayoutData& LayDes::CurrentLayout()
+{
+	return layout[currentlayout];
+}
+
+void LayDes::LayoutCursor()
+{
+	Flush();
+	draghandle = -1;
+	currentlayout = layoutlist.GetCursor();
+	cursor.Clear();
+	type.Disable();
+	variable.Disable();
+	property.Clear();
+	if(currentlayout < 0)
+		return;
+	LoadItems();
+	SyncItems();
+	SetSb();
+	SetFocus();
+}
+
+void LayDes::PrevLayout()
+{
+	layoutlist.Key(K_UP, 0);
+}
+
+void LayDes::NextLayout()
+{
+	layoutlist.Key(K_DOWN, 0);
+}
+
+void LayDes::SyncLayoutList()
+{
+	layoutlist.Clear();
+	int i;
+	for(i = 0; i < layout.GetCount(); i++)
+		layoutlist.Add(layout[i].name);
+	LayoutCursor();
+}
+
+void LayDes::AddLayout()
+{
+	String name;
+	for(;;) {
+		if(!EditText(name, "Add new layout", "Layout", CharFilterCid))
+			return;
+		CParser p(name);
+		if(p.IsId())
+			break;
+		Exclamation("Invalid name!");
+	}
+	int q = layout.GetCount();
+	layout.Add().name = name;
+	SyncLayoutList();
+	layoutlist.SetCursor(q);
+	LayoutCursor();
+}
+
+void LayDes::RenameLayout()
+{
+	if(currentlayout < 0)
+		return;
+	String name = layout[currentlayout].name;
+	if(!EditText(name, "Rename layout", "Layout", CharFilterCid))
+		return;
+	int q = layoutlist.GetCursor();
+	layout[currentlayout].name = name;;
+	SyncLayoutList();
+	layoutlist.SetCursor(q);
+	LayoutCursor();
+}
+
+void LayDes::RemoveLayout()
+{
+	if(currentlayout < 0 || !PromptYesNo("Remove [* " + DeQtf(layout[currentlayout].name) + "] ?"))
+		return;
+	int q = layoutlist.GetCursor();
+	layout.Remove(currentlayout);
+	SyncLayoutList();
+	if(q < layoutlist.GetCount())
+		layoutlist.SetCursor(q);
+	else
+	if(layoutlist.GetCount())
+		layoutlist.SetCursor(layoutlist.GetCount() - 1);
+	LayoutCursor();
+}
+
+void LayDes::MoveLayoutUp()
+{
+	int q = layoutlist.GetCursor();
+	if(layoutlist.GetCursor() > 0) {
+		layout.Swap(q, q - 1);
+		layoutlist.SwapUp();
+	}
+}
+
+void LayDes::MoveLayoutDown()
+{
+	int q = layoutlist.GetCursor();
+	if(q >= 0 && q < layoutlist.GetCount() - 1) {
+		layout.Swap(q, q + 1);
+		layoutlist.SwapDown();
+	}
+}
+
+void LayDes::LayoutMenu(Bar& bar)
+{
+	bar.Add("Add new layout..", THISBACK(AddLayout));
+	bar.Add("Rename layout..", THISBACK(RenameLayout));
+	bar.Add("Remove layout..", THISBACK(RemoveLayout));
+	bar.Separator();
+	bar.Add(layoutlist.IsCursor() && layoutlist.GetCursor() > 0,
+	        AK_MOVELAYOUTUP, LayImg::MoveUp(), THISBACK(MoveLayoutUp));
+	bar.Add(layoutlist.IsCursor() && layoutlist.GetCursor() < layoutlist.GetCount() - 1,
+	        AK_MOVELAYOUTDOWN, LayImg::MoveDown(), THISBACK(MoveLayoutDown));
+}
+
+LayoutItem& LayDes::CurrentItem()
+{
+	return CurrentLayout().item[cursor.Top()];
+}
+
+void LayDes::PropertyChanged()
+{
+	if(item.IsCursor())
+	{
+		CurrentItem().Invalidate();
+		int c = item.GetCursor();
+		LoadItem(c);
+		SyncItem(c, 2);
+	}
+	Refresh();
+	SetBar();
+}
+
+void LayDes::FrameFocus()
+{
+	if(property.HasFocusDeep()) {
+		SaveState();
+		SetStatus();
+	}
+}
+
+void LayDes::ItemClick()
+{
+	if(currentlayout < 0)
+		return;
+	SaveState();
+	if(GetShift()) {
+		if(cursor.GetCount()) {
+			int i = minmax(item.GetCursor(), 0, cursor.Top());
+			int m = max(item.GetCursor(), cursor.Top());
+			cursor.Clear();
+			while(i <= m)
+				cursor.Add(i++);
+			SyncItems();
+		}
+	}
+	else if(item.IsCursor()) {
+		if(!GetCtrl())
+			cursor.Clear();
+		cursor.Add(item.GetCursor());
+	}
+	SetFocus();
+	SyncItems();
+}
+
+void LayDes::SyncUsc()
+{
+	type.ClearList();
+	for(int i = 0; i < LayoutTypes().GetCount(); i++)
+		type.AddList(LayoutTypes().GetKey(i));
+	if(currentlayout >= 0) {
+		LayoutData& d = CurrentLayout();
+		for(int i = 0; i < d.item.GetCount(); i++)
+			d.item[i].Invalidate();
+	}
+	Refresh();
+}
+
+void LayDes::TypeEdit()
+{
+	if(currentlayout < 0 || cursor.GetCount() == 0)
+		return;
+	LayoutData& l = CurrentLayout();
+	for(int i = 0; i < cursor.GetCount(); i++) {
+		LayoutItem& m = l.item[cursor[i]];
+		m.SetCharset(charset);
+		String s = m.SaveProperties();
+		m.Create(~type);
+		try {
+			CParser p(s);
+			m.ReadProperties(p, false);
+		}
+		catch(CParser::Error&) {}
+		item.Set(cursor[i], 0, m.type);
+	}
+	SyncProperties(false);
+	SetStatus();
+}
+
+void LayDes::VariableEdit()
+{
+	if(currentlayout < 0 || cursor.GetCount() == 0)
+		return;
+	LayoutData& l = CurrentLayout();
+	LayoutItem& m = l.item[cursor.Top()];
+	m.variable = ~variable;
+	if(IsNull(m.variable))
+		item.Set(cursor.Top(), 1, GetLabel(m));
+	else
+		item.Set(cursor.Top(), 1, m.variable);
+	SyncItem(cursor.Top(), 2);
+}
+
+static int RoundStep(int org, int d, int g)
+{
+	return d ? itimesfloor(org + d * g + (d > 0 ? 0 : g - 1), g) - org : 0;
+}
+
+bool LayDes::DoKey(dword key, int count)
+{
+	SaveState();
+	Point move(0, 0);
+	if(currentlayout >= 0 && !cursor.IsEmpty()) {
+		switch(key & ~K_CTRL) {
+		case K_SHIFT_LEFT:   move.x = -1; break;
+		case K_SHIFT_RIGHT:  move.x = +1; break;
+		case K_SHIFT_UP:     move.y = -1; break;
+		case K_SHIFT_DOWN:   move.y = +1; break;
+		}
+		if(move.x | move.y) {
+			Size grid(1, 1);
+			if(usegrid) {
+				grid.cx = minmax<int>(~setting.gridx, 1, 32);
+				grid.cy = minmax<int>(~setting.gridy, 1, 32);
+			}
+			LayoutData& l = CurrentLayout();
+			Rect master = CtrlRect(l.item[cursor.Top()].pos, l.size);
+			Size shift;
+			shift.cx = RoundStep(key & K_CTRL ? master.Width()  : master.left, move.x, grid.cx);
+			shift.cy = RoundStep(key & K_CTRL ? master.Height() : master.top,  move.y, grid.cy);
+			for(int i = 0; i < cursor.GetCount(); i++) {
+				LayoutItem& item = l.item[cursor[i]];
+				Rect rc = CtrlRect(item.pos, l.size);
+				rc.right  += shift.cx;
+				rc.bottom += shift.cy;
+				if(!(key & K_CTRL)) {
+					rc.left += shift.cx;
+					rc.top  += shift.cy;
+				}
+				item.pos = MakeLogPos(item.pos, rc, l.size);
+			}
+			SetStatus(false);
+			return true;
+		}
+	}
+	switch(key) {
+	case K_PAGEUP:
+		PrevLayout();
+		return true;
+	case K_PAGEDOWN:
+		NextLayout();
+		return true;
+	case K_UP:
+	case K_DOWN:
+		{
+			dword k = (key == K_PAGEUP ? K_UP : key == K_PAGEDOWN ? K_DOWN : key);
+			Ptr<Ctrl> focus = GetFocusCtrl();
+			if(!item.IsCursor() && item.GetCount() > 0)
+				item.SetCursor(k = K_DOWN ? 0 : item.GetCount() - 1);
+			else
+				item.Key(k, count);
+			ItemClick();
+			if(!!focus)
+				focus->SetWantFocus();
+		}
+		return true;
+	default:
+		if(key >= ' ' && key < 65536) {
+			if(currentlayout < 0 || cursor.GetCount() == 0)
+				return false;
+			LayoutItem& m = CurrentItem();
+			for(int i = 0; i < m.property.GetCount(); i++)
+				if(m.property[i].name == "SetLabel")
+					return m.property[i].PlaceFocus(key, count);
+		}
+		break;
+	}
+	return MenuBar::Scan(THISBACK(LayoutMenu), key);
+}
diff --git a/uppsrc/ide/LayDes/laydes.key b/uppsrc/ide/LayDes/laydes.key
new file mode 100644
index 000000000..ee3ca944b
--- /dev/null
+++ b/uppsrc/ide/LayDes/laydes.key
@@ -0,0 +1,42 @@
+KEY(DUPLICATESEL, "Duplicate", K_CTRL_D)
+KEY(MATRIXDUPLICATE, "Matrix duplicate..", 0)
+KEY(MOVEUP, "Move Up", K_CTRL_UP)
+KEY(MOVEDOWN, "Move Down", K_CTRL_DOWN)
+KEY(LAYOUTS, "Layouts..", 0)
+KEY(PREVLAYOUT, "Previous layout", K_ALT_PAGEUP)
+KEY(NEXTLAYOUT, "Next layout", K_ALT_PAGEDOWN)
+
+KEY(HIDESELECTION, "Hide selection", K_CTRL_SUBTRACT)
+KEY(SHOWSELECTION, "Show selection", K_CTRL_ADD)
+
+KEY(HCENTERLAY, "Horizontal center in layout", K_SHIFT_CTRL_F9)
+KEY(VCENTERLAY, "Vertical center in layout", K_CTRL_F9)
+KEY(LEFT, "Left", K_ALT_LEFT|K_SHIFT)
+KEY(HCENTER, "Horizontal center", K_SHIFT_F9)
+KEY(RIGHT, "Right", K_ALT_RIGHT|K_SHIFT)
+KEY(TOP, "Top",K_ALT_UP|K_SHIFT)
+KEY(VCENTER, "Vertical center", K_F9)
+KEY(BOTTOM, "Bottom", K_ALT_DOWN|K_SHIFT)
+KEY(LABELS, "Align label", K_ALT_F9)
+
+KEY(SAMEWIDTH, "Same width", K_SHIFT_F8)
+KEY(SAMEHEIGHT, "Same height", K_CTRL_F8)
+KEY(SAMESIZE, "Same size", K_F8)
+KEY(MINIMALWIDTH, "Minimal width", K_CTRL_W)
+KEY(MINIMALHEIGHT, "Minimal height", K_CTRL_H)
+
+KEY(SPRINGLEFT, "Fixed Left", 0)
+KEY(SPRINGRIGHT, "Fixed Right", 0)
+KEY(SPRINGHSIZE, "Spring Horizontal size", 0)
+KEY(SPRINGHCENTER, "Spring Horizontal center", 0)
+KEY(SPRINGTOP, "Fixed Top", 0)
+KEY(SPRINGBOTTOM, "Fixed Bottom", 0)
+KEY(SPRINGVSIZE, "Spring Vertical size", 0)
+KEY(SPRINGVCENTER, "Spring Vertical center", 0)
+KEY(AUTOSPRINGS, "Auto springs", 0)
+KEY(TOPLEFTSPRINGS, "Top left springs", 0)
+
+KEY(MOVELAYOUTUP, "Move Layout Up", K_ALT|K_CTRL_UP)
+KEY(MOVELAYOUTDOWN, "Move Layout Down", K_ALT|K_CTRL_DOWN)
+
+KEY(VISGEN, "Generate code..", K_ALT_C)
diff --git a/uppsrc/ide/LayDes/layfile.cpp b/uppsrc/ide/LayDes/layfile.cpp
new file mode 100644
index 000000000..fbca408eb
--- /dev/null
+++ b/uppsrc/ide/LayDes/layfile.cpp
@@ -0,0 +1,146 @@
+#include "LayDes.h"
+
+ArrayMap<String, LayDesEditPos>& LayFileDataVar()
+{
+	static ArrayMap<String, LayDesEditPos> x;
+	return x;
+}
+
+void SerializeLayEditPos(Stream& s)
+{
+	ArrayMap<String, LayDesEditPos>& filedata = LayFileDataVar();
+	int dummy;
+	if(s.IsStoring()) {
+		for(int i = 0; i < filedata.GetCount(); i++) {
+			String fn = filedata.GetKey(i);
+			if(!fn.IsEmpty()) {
+				FindFile ff(fn);
+				LayDesEditPos& ep = filedata[i];
+				if(ff && ff.GetLastWriteTime() == ep.filetime) {
+					s % fn;
+					s % ep.filetime;
+					s % ep.layouti;
+					s % dummy;
+				}
+			}
+		}
+		String h;
+		s % h;
+	}
+	else {
+		String fn;
+		filedata.Clear();
+		for(;;) {
+			s % fn;
+			if(fn.IsEmpty()) break;
+			LayDesEditPos& ep = filedata.GetAdd(fn);
+			ep.undo.Clear();
+			ep.redo.Clear();
+			ep.cursor.Clear();
+			s % ep.filetime;
+			s % ep.layouti;
+			s % dummy;
+		}
+	}
+
+}
+
+void LayDes::SaveEditPos()
+{
+	LayDesEditPos& p = LayFileDataVar().GetAdd(filename);
+	p.filetime = filetime;
+	p.undo.SetCount(layout.GetCount());
+	p.redo.SetCount(layout.GetCount());
+	for(int i = 0; i < layout.GetCount(); i++) {
+		p.undo[i] = layout[i].undo;
+		p.redo[i] = layout[i].redo;
+	}
+	p.layouti = layoutlist.GetCursor();
+	p.cursor = cursor;
+}
+
+void LayDes::RestoreEditPos()
+{
+	if(IsNull(filetime)) return;
+	int q = LayFileDataVar().Find(filename);
+	if(q < 0)
+		return;
+	LayDesEditPos& p = LayFileDataVar()[q];
+	if(p.filetime != filetime) return;
+	if(layout.GetCount() == p.undo.GetCount()) {
+		for(int i = 0; i < layout.GetCount(); i++) {
+			layout[i].undo = p.undo[i];
+			layout[i].redo = p.redo[i];
+		}
+	}
+	if(p.layouti >= 0 && p.layouti < layoutlist.GetCount()) {
+		layoutlist.SetCursor(p.layouti);
+		LayoutCursor();
+	}
+	cursor = p.cursor;
+	SyncItems();
+}
+
+bool LayDes::Load(const char *file, byte _charset)
+{
+	charset = _charset;
+	layout.Clear();
+	filename = file;
+	FileIn in(file);
+	if(in) {
+		layfile = LoadStream(in);
+		newfile = false;
+		filetime = in.GetTime();
+		fileerror.Clear();
+		try {
+			CParser p(layfile);
+			if(p.Char('#') && p.Id("ifdef")) {
+				if(!p.Id("LAYOUTFILE"))
+					p.Id("LAYOUT");
+			}
+			while(!p.IsEof()) {
+				LayoutData& ld = layout.Add();
+				ld.SetCharset(charset);
+				ld.Read(p);
+				if(p.Char('#'))
+					p.Id("endif");
+			}
+		}
+		catch(CParser::Error& e) {
+			PutConsole(file + e);
+			return false;
+		}
+	}
+	else {
+		newfile = true;
+		filetime = Null;
+	}
+	SyncLayoutList();
+	if(layout.GetCount()) {
+		layoutlist.SetCursor(0);
+		LayoutCursor();
+	}
+	RestoreEditPos();
+	return true;
+}
+
+void LayDes::Save()
+{
+	StoreToGlobal(*this, "laydes-ctrl");
+
+	if(!IsNull(fileerror))
+		return;
+	String r;
+	for(int i = 0; i < layout.GetCount(); i++) {
+		layout[i].SetCharset(charset);
+		r << layout[i].Save() << "\r\n";
+	}
+	layfile = r;
+	if(!SaveChangedFileFinish(filename, r))
+		return;
+	FindFile ff(filename);
+	if(ff) {
+		newfile = false;
+		filetime = ff.GetLastWriteTime();
+	}
+}
diff --git a/uppsrc/ide/LayDes/laylib.cpp b/uppsrc/ide/LayDes/laylib.cpp
new file mode 100644
index 000000000..9d9362611
--- /dev/null
+++ b/uppsrc/ide/LayDes/laylib.cpp
@@ -0,0 +1,475 @@
+#include "LayDes.h"
+
+#define LLOG(x) // LOG(x)
+
+struct ImlImageMaker : ImageMaker {
+	String id;
+	virtual String Key() const {
+		return id;
+	}
+	virtual Image Make() const {
+		Vector<String> s = Split(id, ':');
+		if(s.GetCount() != 3)
+			return LayImg::ImageError();
+		Array<ImlImage> iml;
+		int f;
+		LoadIml(LoadFile(SourcePath(s[0], s[1])), iml, f);
+		bool recolor = false;
+		if(*s[2].Last() == '*') {
+			s[2].Trim(s[2].GetLength() - 1);
+			recolor = true;
+		}
+		Image m = LayImg::ImageError();
+		for(int i = 0; i < iml.GetCount(); i++)
+			if(iml[i].name == s[2]) {
+				m = iml[i].image;
+				break;
+			}
+		return recolor ? AdjustColors(m) : m;
+	}
+};
+
+Image GetUscImage(const String& id)
+{
+	Image m = GetImlImage(id);
+	if(!IsNull(m))
+		return AdjustColors(m);
+	ImlImageMaker q;
+	q.id = id;
+	return MakeImage(q);
+}
+
+EscValue EscColor(Color c)
+{
+	EscValue v;
+	if(!IsNull(c)) {
+		v.MapSet("r", c.GetR());
+		v.MapSet("g", c.GetG());
+		v.MapSet("b", c.GetB());
+	}
+	return v;
+}
+
+Color ColorEsc(EscValue v)
+{
+	return v.IsVoid() ? Color(Null) : Color(v.GetFieldInt("r"), v.GetFieldInt("g"), v.GetFieldInt("b"));
+}
+
+EscValue EscRect(const Rect& r)
+{
+	EscValue v;
+	v.MapSet("left", r.left);
+	v.MapSet("right", r.right);
+	v.MapSet("top", r.top);
+	v.MapSet("bottom", r.bottom);
+	return v;
+}
+
+Rect RectEsc(EscValue v)
+{
+	return Rect(v.GetFieldInt("left"), v.GetFieldInt("top"),
+	            v.GetFieldInt("right"), v.GetFieldInt("bottom"));
+}
+
+EscValue EscSize(Size sz)
+{
+	EscValue v;
+	v.MapSet("cx", sz.cx);
+	v.MapSet("cy", sz.cy);
+	return v;
+}
+
+Size SizeEsc(EscValue v)
+{
+	return Size(v.GetFieldInt("cx"), v.GetFieldInt("cy"));
+}
+
+EscValue EscPoint(Point sz)
+{
+	EscValue v;
+	v.MapSet("x", sz.x);
+	v.MapSet("y", sz.y);
+	return v;
+}
+
+Point PointEsc(EscValue v)
+{
+	return Point(v.GetFieldInt("x"), v.GetFieldInt("y"));
+}
+
+void SIC_Print(EscEscape& e)
+{
+	if(e[0].IsArray())
+		VppLog() << (String) e[0];
+	else
+	if(e[0].IsNumber())
+		VppLog() << e[0].GetNumber();
+	else
+	if(!e[0].IsVoid())
+		e.ThrowError("invalid argument to 'print'");
+}
+
+bool GetOptFlag(EscEscape& e) {
+	if(!e.GetCount())
+		return true;
+	return IsTrue(e[0]);
+}
+
+struct SIC_Font : public EscHandle {
+	Font font;
+
+	void Height(EscEscape& e) {
+		e = EscFont(FontEsc(e.self).Height(e.Int(0)));
+	}
+	void Bold(EscEscape& e) {
+		e = EscFont(FontEsc(e.self).Bold(GetOptFlag(e)));
+	}
+	void Italic(EscEscape& e) {
+		e = EscFont(FontEsc(e.self).Italic(GetOptFlag(e)));
+	}
+	void Underline(EscEscape& e) {
+		e = EscFont(FontEsc(e.self).Underline(GetOptFlag(e)));
+	}
+
+	typedef SIC_Font CLASSNAME;
+
+	SIC_Font(EscValue& v) {
+		v.Escape("Height(h)", this, THISBACK(Height));
+		v.Escape("Bold(...)", this, THISBACK(Bold));
+		v.Escape("Italic(...)", this, THISBACK(Italic));
+		v.Escape("Underline(...)", this, THISBACK(Underline));
+	}
+};
+
+EscValue EscFont(Font f)
+{
+	EscValue v;
+	(new SIC_Font(v))->font = f;
+	return v;
+}
+
+Font FontEsc(EscValue v)
+{
+	if(!v.IsMap())
+		return Null;
+	const VectorMap<EscValue, EscValue>& m = v.GetMap();
+	int q = m.Find("Height");
+	if(q < 0)
+		return Null;
+	const EscLambda& l = m[q].GetLambda();
+	if(!dynamic_cast<SIC_Font *>(l.handle))
+		return Null;
+	Font f = ((SIC_Font *)l.handle)->font;
+	if(f.GetHeight() == 0)
+		f.Height(StdFont().GetHeight());
+	return f;
+}
+
+void SIC_StdFont(EscEscape& e)
+{
+	if(e.GetCount() == 1)
+		e = EscFont(StdFont()(e.Int(0)));
+	else
+		e = EscFont(StdFont());
+}
+
+void SIC_Arial(EscEscape& e)
+{
+	e = EscFont(Arial(e.Int(0)));
+}
+
+void SIC_Roman(EscEscape& e)
+{
+	e = EscFont(Roman(e.Int(0)));
+}
+
+void SIC_Courier(EscEscape& e)
+{
+	e = EscFont(Courier(e.Int(0)));
+}
+
+void SIC_GetImageSize(EscEscape& e)
+{
+	e.CheckArray(0);
+	e = EscSize(GetUscImage((String)e[0]).GetSize());
+}
+
+void SIC_GetTextSize(EscEscape& e)
+{
+	if(e.GetCount() < 1 || e.GetCount() > 2)
+		e.ThrowError("wrong number of arguments in call to 'GetTextSize'");
+	e.CheckArray(0);
+	WString text = e[0];
+	Font font = StdFont();
+	if(e.GetCount() > 1)
+		font = FontEsc(e[1]);
+	e = EscSize(GetTextSize(text, font));
+}
+
+void SIC_GetSmartTextSize(EscEscape& e)
+{
+	if(e.GetCount() < 1 || e.GetCount() > 2)
+		e.ThrowError("wrong number of arguments in call to 'GetTextSize'");
+	e.CheckArray(0);
+	String text = ToUtf8((WString)(e[0]));
+	ExtractAccessKey(text, text);
+	Font font = StdFont();
+	if(e.GetCount() > 1)
+		font = FontEsc(e[1]);
+	e = EscSize(GetSmartTextSize(text, font));
+}
+
+void SIC_GetQtfHeight(EscEscape& e)
+{
+	int zoom = e.Int(0);
+	e.CheckArray(0);
+	String text = e[1];
+	int cx = e.Int(2);
+	RichText doc;
+	doc = ParseQTF(text);//!!!!!
+	e = doc.GetHeight(Zoom(zoom, 1024), cx);
+}
+
+#ifdef _DEBUG
+void SIC_DumpLocals(EscEscape& e)
+{
+	LOG("--- DUMP of SIC local variables -------------------------");
+	for(int i = 0; i < e.esc.var.GetCount(); i++)
+		LOG(e.esc.var.GetKey(i) << " = " << e.esc.var[i].ToString());
+	LOG("---------------------------------------------------------");
+}
+#endif
+
+static const char laysrc[] = {
+"Color(r, g, b) { c.r = r; c.g = g; c.b = b; return c; }\n"
+"Point(x, y) { p.x = x; p.y = y; return p; }\n"
+"Size(cx, cy) { sz.cx = cx; sz.cy = cy; return sz; }\n"
+"Rect(l, t, r, b) { e.left = l; e.top = t; e.right = r; e.bottom = b; return e; }\n"
+"RectC(x, y, cx, cy) { e.left = x; e.top = y; e.right = x + cx; e.bottom = y + cy; return e; }\n"
+};
+
+void LayLib()
+{
+	ArrayMap<String, EscValue>& global = UscGlobal();
+
+	Scan(global, laysrc, "laydes library");
+	Escape(global, "StdFont(...)", SIC_StdFont);
+	Escape(global, "Arial(h)", SIC_Arial);
+	Escape(global, "Roman(h)", SIC_Roman);
+	Escape(global, "Courier(h)", SIC_Courier);
+	Escape(global, "GetImageSize(name)", SIC_GetImageSize);
+	Escape(global, "GetTextSize(...)", SIC_GetTextSize);
+	Escape(global, "GetSmartTextSize(...)", SIC_GetSmartTextSize);
+	Escape(global, "GetQtfHeight(zoom, text, cx)", SIC_GetQtfHeight);
+#ifdef _DEBUG
+	Escape(global, "dump_locals()", SIC_DumpLocals);
+#endif
+
+	Escape(global, "print(x)", SIC_Print);
+
+	global.Add("Black", EscColor(Black));
+	global.Add("Gray", EscColor(Gray));
+	global.Add("LtGray", EscColor(LtGray));
+	global.Add("WhiteGray", EscColor(WhiteGray));
+	global.Add("White", EscColor(White));
+	global.Add("Red", EscColor(Red));
+	global.Add("Green", EscColor(Green));
+	global.Add("Brown", EscColor(Brown));
+	global.Add("Blue", EscColor(Blue));
+	global.Add("Magenta", EscColor(Magenta));
+	global.Add("Cyan", EscColor(Cyan));
+	global.Add("Yellow", EscColor(Yellow));
+	global.Add("LtRed", EscColor(LtRed));
+	global.Add("LtGreen", EscColor(LtGreen));
+	global.Add("LtYellow", EscColor(LtYellow));
+	global.Add("LtBlue", EscColor(LtBlue));
+	global.Add("LtMagenta", EscColor(LtMagenta));
+	global.Add("LtCyan", EscColor(LtCyan));
+	global.Add("SBlack", EscColor(Black));
+	global.Add("SGray", EscColor(Gray));
+	global.Add("SLtGray", EscColor(LtGray));
+	global.Add("SWhiteGray", EscColor(WhiteGray));
+	global.Add("SWhite", EscColor(White));
+	global.Add("SRed", EscColor(Red));
+	global.Add("SGreen", EscColor(Green));
+	global.Add("SBrown", EscColor(Brown));
+	global.Add("SBlue", EscColor(Blue));
+	global.Add("SMagenta", EscColor(Magenta));
+	global.Add("SCyan", EscColor(Cyan));
+	global.Add("SYellow", EscColor(Yellow));
+	global.Add("SLtRed", EscColor(LtRed));
+	global.Add("SLtGreen", EscColor(LtGreen));
+	global.Add("SLtYellow", EscColor(LtYellow));
+	global.Add("SLtBlue", EscColor(LtBlue));
+	global.Add("SLtMagenta", EscColor(LtMagenta));
+	global.Add("SLtCyan", EscColor(LtCyan));
+
+	global.Add("IntNull", (int)Null);
+	global.Add("DblNullLim", DOUBLE_NULL_LIM);
+}
+
+void EscDraw::DrawRect(EscEscape& e)
+{
+	if(e.GetCount() == 2)
+		w.DrawRect(RectEsc(e[0]), ColorEsc(e[1]));
+	else
+	if(e.GetCount() == 5)
+		w.DrawRect(e.Int(0), e.Int(1), e.Int(2), e.Int(3), ColorEsc(e[4]));
+	else
+		e.ThrowError("wrong number of arguments in call to 'DrawRect'");
+}
+
+void EscDraw::DrawLine(EscEscape& e)
+{
+	if(e.GetCount() == 4)
+		w.DrawLine(PointEsc(e[0]), PointEsc(e[1]), e.Int(2), ColorEsc(e[3]));
+	else
+	if(e.GetCount() == 6)
+		w.DrawLine(e.Int(0), e.Int(1), e.Int(2), e.Int(3), e.Int(4), ColorEsc(e[5]));
+	else
+		e.ThrowError("wrong number of arguments in call to 'DrawLine'");
+}
+
+void EscDraw::DrawText(EscEscape& e)
+{
+	if(e.GetCount() < 3 || e.GetCount() > 6)
+		e.ThrowError("wrong number of arguments in call to 'DrawText'");
+	int x = e.Int(0);
+	int y = e.Int(1);
+	Font font = StdFont();
+	Color color = SColorText;
+	if(e[2].IsInt())
+	{
+		int z = e.Int(2);
+		e.CheckArray(3);
+		WString text = e[3];
+		if(e.GetCount() > 4)
+			font = FontEsc(e[4]);
+		if(e.GetCount() > 5)
+			color = ColorEsc(e[5]);
+		w.DrawText(x, y, z, text, Nvl(font, StdFont()), color);
+	}
+	else
+	{
+		e.CheckArray(2);
+		WString text = e[2];
+		if(e.GetCount() > 3)
+			font = FontEsc(e[3]);
+		if(e.GetCount() > 4)
+			color = ColorEsc(e[4]);
+		w.DrawText(x, y, text, Nvl(font, StdFont()), color);
+	}
+}
+
+void EscDraw::DrawSmartText(EscEscape& e)
+{
+	if(e.GetCount() < 3 || e.GetCount() > 6)
+		e.ThrowError("wrong number of arguments in call to 'DrawSmartText'");
+	int x = e.Int(0);
+	int y = e.Int(1);
+	int ii = 2;
+	int cx = INT_MAX;
+	if(e[ii].IsInt())
+		cx = e.Int(ii++);
+	String text;
+	if(ii < e.GetCount() && e[ii].IsArray())
+		text = ToUtf8((WString)e[ii++]);
+	byte accesskey = ExtractAccessKey(text, text);
+	Font font = StdFont().Height(11);
+	if(ii < e.GetCount())
+		font = FontEsc(e[ii++]);
+	if(font.GetHeight() == 0)
+#ifdef PLATFORM_XFT
+		font.Height(12);
+#else
+		font.Height(11);
+#endif
+	Color color = SColorText;
+	if(ii < e.GetCount())
+		color = ColorEsc(e[ii++]);
+	::DrawSmartText(w, x, y, INT_MAX, text, font, color, accesskey);
+}
+
+void EscDraw::DrawQtf(EscEscape& e)
+{
+	if(e.GetCount() < 5 || e.GetCount() > 6)
+		e.ThrowError("wrong number of arguments in call to 'DrawQtf'");
+//	int zoom = e.Int(0);
+	int x = e.Int(1);
+	int y = e.Int(2);
+	e.CheckArray(3);
+	WString text = e[3];
+	int cx = e.Int(4);
+	String txt = '\1' + ToUtf8(text);
+	::DrawSmartText(w, x, y, cx, txt, StdFont(), SColorText, 0);
+}
+
+void EscDraw::GetTextSize(EscEscape& e)
+{
+	if(e.GetCount() < 1 || e.GetCount() > 2)
+		e.ThrowError("wrong number of arguments in call to 'GetTextSize'");
+	e.CheckArray(0);
+	WString text = e[0];
+	Font font = StdFont();
+	if(font.GetHeight() == 0)
+#ifdef PLATFORM_XFT
+		font.Height(12);
+#else
+		font.Height(11);
+#endif
+	if(e.GetCount() > 1)
+		font = FontEsc(e[1]);
+	e = EscSize(::GetTextSize(text, font));
+}
+
+void EscDraw::DrawImage(EscEscape& e)
+{
+	int cnt = e.GetCount();
+	if(cnt == 2)
+		w.DrawImage(RectEsc(e[0]), GetUscImage((String)e[1]));
+	else
+	if(cnt == 3)
+		w.DrawImage(e.Int(0), e.Int(1), GetUscImage((String)e[2]));
+	else
+	if(cnt == 5)
+		w.DrawImage(e.Int(0), e.Int(1), e.Int(2), e.Int(3), GetUscImage((String)e[4]));
+	else
+		e.ThrowError("wrong number of arguments in call to 'DrawImage'");
+}
+
+void EscDraw::DrawImageColor(EscEscape& e)
+{
+	int cnt = e.GetCount();
+	if(cnt != 4 && cnt != 5 && cnt != 7)
+		e.ThrowError("wrong number of arguments in call to 'DrawImageColor'");
+
+	Image img = Colorize(GetUscImage((String)e[cnt - 3]), ColorEsc(e[cnt - 2]), e.Int(cnt - 1));
+
+	if(cnt == 4)
+		w.DrawImage(RectEsc(e[0]), img);
+	else
+	if(cnt == 5)
+		w.DrawImage(e.Int(0), e.Int(1), img);
+	else
+	if(cnt == 7)
+		w.DrawImage(e.Int(0), e.Int(1), e.Int(2), e.Int(3), img);
+}
+
+EscDraw::EscDraw(EscValue& v, Draw& w)
+	: w(w)
+{
+	v.Escape("DrawRect(...)", this, THISBACK(DrawRect));
+	v.Escape("DrawLine(...)", this, THISBACK(DrawLine));
+	v.Escape("DrawText(...)", this, THISBACK(DrawText));
+	v.Escape("DrawSmartText(...)", this, THISBACK(DrawSmartText));
+	v.Escape("DrawQtf(...)", this, THISBACK(DrawQtf));
+	v.Escape("GetTextSize(...)", this, THISBACK(GetTextSize));
+	v.Escape("DrawImage(...)", this, THISBACK(DrawImage));
+	v.Escape("DrawImageColor(...)", this, THISBACK(DrawImageColor));
+}
+
+ArrayMap<String, EscValue>& LayGlobal()
+{
+	static ArrayMap<String, EscValue> global;
+	return global;
+}
diff --git a/uppsrc/ide/LayDes/layout.cpp b/uppsrc/ide/LayDes/layout.cpp
new file mode 100644
index 000000000..6cc76839d
--- /dev/null
+++ b/uppsrc/ide/LayDes/layout.cpp
@@ -0,0 +1,169 @@
+#include "LayDes.h"
+
+void LayoutUndo::Push(const String& state)
+{
+	if(stack.GetCount()) {
+		if(state != stack.Top()) {
+			stack.Top() = DiffPack(state, stack.Top());
+			stack.Add(state);
+		}
+	}
+	else
+		stack.Add(state);
+}
+
+String LayoutUndo::Pop()
+{
+	ASSERT(stack.GetCount());
+	String state = stack.Pop();
+	if(stack.GetCount())
+		stack.Top() = DiffUnpack(state, stack.Top());
+	return state;
+}
+
+String ReadVar(CParser& p) {
+	String var;
+	for(;;) {
+		if(p.IsId())
+			var << p.ReadId();
+		else
+		if(p.IsInt())
+			var << p.ReadInt();
+		else
+		if(p.Char('.'))
+			var << '.';
+		else
+		if(p.Char('['))
+			var << '[';
+		else
+		if(p.Char(']'))
+			var << ']';
+		else
+			return var;
+	}
+}
+
+Array<LayoutItem> ReadItems(CParser& p, byte charset)
+{
+	Array<LayoutItem> items;
+	for(;;) {
+		String type;
+		if(p.Id("ITEM")) {
+			p.PassChar('(');
+			if(p.IsId()) type = p.ReadIdt();
+			p.PassChar(',');
+		}
+		else
+		if(p.Id("UNTYPED"))
+			p.PassChar('(');
+		else
+			return items;
+		LayoutItem& m = items.Add();
+		m.Create(type);
+		m.SetCharset(charset);
+		if(p.IsId()) m.variable = ReadVar(p);
+		if(strncmp(m.variable, "dv___", 5) == 0)
+			m.variable.Clear();
+		p.PassChar(',');
+		m.ReadProperties(p, charset);
+		p.PassChar(')');
+	}
+}
+
+void LayoutData::SetCharset(byte cs)
+{
+	charset = cs;
+	for(int i = 0; i < item.GetCount(); i++)
+		item[i].SetCharset(charset);
+}
+
+void  LayoutData::Read(CParser& p)
+{
+	p.PassId("LAYOUT");
+	p.PassChar('(');
+	name = p.ReadId();
+	p.PassChar(',');
+	size.cx = p.ReadInt();
+	p.PassChar(',');
+	size.cy = p.ReadInt();
+	p.PassChar(')');
+	item = ReadItems(p, charset);
+	p.PassId("END_LAYOUT");
+}
+
+String LayoutData::Save()
+{
+	String out;
+	out << "LAYOUT(" << name << ", " << size.cx << ", " << size.cy << ")\r\n";
+	for(int i = 0; i < item.GetCount(); i++) {
+		out << item[i].Save(i);
+	}
+	out << "END_LAYOUT\r\n";
+	return out;
+}
+
+String LayoutData::Save(const Vector<int>& sel)
+{
+	Vector<int> cs(sel, 1);
+	Sort(cs);
+	String out;
+	out << "LAYOUT(" << name << ", " << size.cx << ", " << size.cy << ")\r\n";
+	for(int i = 0; i < cs.GetCount(); i++)
+		out << item[cs[i]].Save(cs[i]);
+	out << "END_LAYOUT\r\n";
+	return out;
+}
+
+String LayoutData::MakeState()
+{
+	byte cs = charset;
+	SetCharset(CHARSET_UTF8);
+	String out = Save();
+	SetCharset(cs);
+	return out;
+}
+
+void LayoutData::LoadState(const String& s)
+{
+	CParser p(s);
+	byte cs = charset;
+	SetCharset(CHARSET_UTF8);
+	Read(p);
+	SetCharset(cs);
+}
+
+void LayoutData::SaveState()
+{
+	undo.Push(MakeState());
+	redo.Clear();
+}
+
+bool LayoutData::IsUndo()
+{
+	return undo && (undo.GetCount() > 1 || undo.Top() != MakeState());
+}
+
+bool LayoutData::IsRedo()
+{
+	return redo && (redo.GetCount() > 1 || redo.Top() != MakeState());
+}
+
+void LayoutData::Do(LayoutUndo& u1, LayoutUndo& u2)
+{
+	String s = MakeState();
+	u2.Push(s);
+	String q = u1.Pop();
+	if(q == s && u1)
+		q = u1.Pop();
+	LoadState(q);
+}
+
+void LayoutData::Undo()
+{
+	Do(undo, redo);
+}
+
+void LayoutData::Redo()
+{
+	Do(redo, undo);
+}
diff --git a/uppsrc/ide/LayDes/layusc.cpp b/uppsrc/ide/LayDes/layusc.cpp
new file mode 100644
index 000000000..a248aea22
--- /dev/null
+++ b/uppsrc/ide/LayDes/layusc.cpp
@@ -0,0 +1,99 @@
+#include "LayDes.h"
+
+VectorMap<String, LayoutType>& LayoutTypes()
+{
+	static VectorMap<String, LayoutType> q;
+	return q;
+}
+
+VectorMap<String, VectorMap<String, String> >& LayoutEnums()
+{
+	static VectorMap<String, VectorMap<String, String> > q;
+	return q;
+}
+
+void ReadClass(CParser& p, int kind)
+{
+	LayoutType& m = LayoutTypes().GetAdd(p.ReadId());
+	m.kind = kind;
+	p.PassChar('{');
+	while(!p.Char('}')) {
+		if(p.Char('>')) {
+			String n = p.ReadId();
+			m.property.Add().name = n;
+			if(IsNull(m.group)) {
+				int q = LayoutTypes().Find(n);
+				if(q >= 0)
+					m.group = LayoutTypes()[q].group;
+			}
+			p.PassChar(';');
+		}
+		else
+		if(p.Id("group")) {
+			m.group = p.ReadString();
+			p.PassChar(';');
+		}
+		else {
+			String id = p.ReadId();
+			if(p.IsChar('('))
+				m.methods.GetAdd(id) = ReadLambda(p);
+			else {
+				TypeProperty& r = m.property.Add();
+				r.type = id;
+				r.name = p.ReadId();
+				if(p.Char('=')) {
+					const char *b = p.GetPtr();
+					while(!p.IsChar(';') && !p.IsChar('?') && !p.IsChar('@'))
+						p.SkipTerm();
+					r.defval = String(b, p.GetPtr());
+				}
+				if(p.Char('@'))
+					r.level = p.ReadInt();
+				if(p.Char('?'))
+					r.help = p.ReadString();
+				p.PassChar(';');
+			}
+		}
+	}
+	p.Char(';');
+}
+
+void  LayLib();
+
+void LayUscClean()
+{
+	LayoutEnums().Clear();
+	LayoutTypes().Clear();
+	LayLib();
+}
+
+bool LayUscParse(CParser& p) throw(CParser::Error)
+{
+	if(p.Id("ctrl"))
+		ReadClass(p, LAYOUT_CTRL);
+	else
+	if(p.Id("subctrl"))
+		ReadClass(p, LAYOUT_SUBCTRL);
+	else
+	if(p.Id("template"))
+		ReadClass(p, LAYOUT_TEMPLATE);
+	else
+	if(p.Id("enum_property")) {
+		VectorMap<String, String>& e = LayoutEnums().GetAdd(p.ReadId());
+		p.PassChar('{');
+		for(;;) {
+			String key = p.IsString() ? p.ReadString() : p.ReadId();
+			String text = key;
+			if(p.Char(':'))
+				text = p.IsString() ? p.ReadString() : p.ReadId();
+			e.Add(key, text);
+			if(p.Char('}'))
+				break;
+			p.PassChar(',');
+		}
+		p.Char(';');
+	}
+	else
+		return false;
+	return true;
+}
diff --git a/uppsrc/ide/LayDes/laywin.cpp b/uppsrc/ide/LayDes/laywin.cpp
new file mode 100644
index 000000000..a9f77dd8a
--- /dev/null
+++ b/uppsrc/ide/LayDes/laywin.cpp
@@ -0,0 +1,353 @@
+#include "LayDes.h"
+
+#define LTIMING(x) //TIMING(x)
+
+#define KEYNAMESPACE LayoutKeys
+#define KEYGROUPNAME "Layout"
+#define KEYFILE      <ide/LayDes/laydes.key>
+#include             <CtrlLib/key_source.h>
+
+using namespace LayoutKeys;
+
+void LayDes::EditBar(Bar& bar)
+{
+	bool islayout = currentlayout >= 0;
+	bool iscursor = islayout && cursor.GetCount();
+	bar.Add(iscursor, "Cut", CtrlImg::cut(), THISBACK(Cut))
+	   .Key(K_SHIFT_DELETE)
+	   .Key(K_CTRL_X);
+	bar.Add(iscursor, "Copy", CtrlImg::copy(), THISBACK(Copy))
+	   .Key(K_CTRL_INSERT)
+	   .Key(K_CTRL_C);
+	bar.Add(islayout, "Paste", CtrlImg::paste(), THISBACK(Paste))
+	   .Key(K_SHIFT_INSERT)
+	   .Key(K_CTRL_V);
+	bar.Add(iscursor, "Delete", CtrlImg::remove(), THISBACK(Delete))
+	   .Key(K_DELETE);
+	bar.Add(iscursor, AK_DUPLICATESEL, LayImg::Duplicate(), THISBACK(Duplicate));
+	bar.Add(iscursor, AK_MATRIXDUPLICATE, THISBACK(Matrix));
+	bar.Add(islayout, "Select all", THISBACK(SelectAll))
+	   .Key(K_CTRL_A);
+	bar.Add(islayout, AK_VISGEN, LayImg::Members(), THISBACK(VisGen));
+	bar.Separator();
+	bar.Add(islayout && CurrentLayout().IsUndo(), "Undo", CtrlImg::undo(), THISBACK(Undo))
+	   .Key(K_ALT_BACKSPACE)
+	   .Key(K_CTRL_Z);
+	bar.Add(islayout && CurrentLayout().IsRedo(), "Redo", CtrlImg::redo(), THISBACK(Redo))
+	   .Key(K_SHIFT|K_ALT_BACKSPACE)
+	   .Key(K_SHIFT_CTRL_Z);
+	bar.MenuSeparator();
+	bar.Add(iscursor, AK_HIDESELECTION, THISBACK1(ShowSelection, false))
+		.Key(K_CTRL_SUBTRACT);
+	bar.Add(iscursor, AK_SHOWSELECTION, THISBACK1(ShowSelection, true))
+		.Key(K_CTRL_ADD);
+}
+
+void LayDes::MoveBar(Bar& bar)
+{
+	bool iscursor = currentlayout >= 0 && cursor.GetCount();
+	bar.Add(iscursor, AK_MOVEUP, LayImg::MoveUp(), THISBACK(MoveUp));
+	bar.Add(iscursor, AK_MOVEDOWN, LayImg::MoveDown(), THISBACK(MoveDown));
+}
+
+void LayDes::AlignBar(Bar& bar)
+{
+	bool islayout = currentlayout >= 0;
+	bool iscursor = islayout && cursor.GetCount();
+	bool group = islayout && cursor.GetCount() > 1;
+	bar.Add(iscursor, AK_HCENTERLAY, LayImg::HorzCenter(), THISBACK1(Align, A_HORZCENTER));
+	bar.Add(iscursor, AK_VCENTERLAY, LayImg::VertCenter(), THISBACK1(Align, A_VERTCENTER));
+	bar.Separator();
+	bar.Add(group, AK_LEFT, LayImg::AlignLeft(), THISBACK1(Align, A_LEFT));
+	bar.Add(group, AK_HCENTER, LayImg::AlignHCenter(), THISBACK1(Align, A_HCENTER));
+	bar.Add(group, AK_RIGHT, LayImg::AlignRight(), THISBACK1(Align, A_RIGHT));
+	bar.Separator();
+	bar.Add(group, AK_TOP, LayImg::AlignTop(), THISBACK1(Align, A_TOP));
+	bar.Add(group, AK_VCENTER, LayImg::AlignVCenter(), THISBACK1(Align, A_VCENTER));
+	bar.Add(group, AK_BOTTOM, LayImg::AlignBottom(), THISBACK1(Align, A_BOTTOM));
+	bar.Add(cursor.GetCount(), AK_LABELS, LayImg::AlignLbl(), THISBACK1(Align, A_LABEL));
+}
+
+void LayDes::SizeBar(Bar& bar)
+{
+	bool islayout = currentlayout >= 0;
+	bool iscursor = islayout && cursor.GetCount();
+	bool group = islayout && cursor.GetCount() > 1;
+	bar.Add(group, AK_SAMEWIDTH, LayImg::SameWidth(), THISBACK1(Align, A_SAMEWIDTH));
+	bar.Add(group, AK_SAMEHEIGHT, LayImg::SameHeight(), THISBACK1(Align, A_SAMEHEIGHT));
+	bar.Add(group, AK_SAMESIZE, LayImg::SameSize(), THISBACK1(Align, A_SAMESIZE));
+	bar.Separator();
+	bar.Add(iscursor, AK_MINIMALWIDTH, LayImg::MinWidth(), THISBACK1(Align, A_MINWIDTH));
+	bar.Add(iscursor, AK_MINIMALHEIGHT, LayImg::MinHeight(), THISBACK1(Align, A_MINHEIGHT));
+}
+
+void LayDes::SpringBar(Bar& bar)
+{
+	bool islayout = currentlayout >= 0;
+	bool iscursor = islayout && cursor.GetCount();
+	int va = -1;
+	int ha = -1;
+	if(currentlayout >= 0 && cursor.GetCount()) {
+		LayoutData& l = CurrentLayout();
+		Ctrl::LogPos p = l.item[cursor.Top()].pos;
+		ha = p.x.GetAlign();
+		va = p.y.GetAlign();
+		for(int i = 0; i < cursor.GetCount() - 1; i++) {
+			p = l.item[cursor[i]].pos;
+			if(p.x.GetAlign() != ha)
+				ha = -1;
+			if(p.y.GetAlign() != va)
+				va = -1;
+		}
+	}
+	bar.Add(iscursor, AK_SPRINGLEFT, LayImg::SpringLeft(),
+	       THISBACK1(SetSprings, MAKELONG(Ctrl::LEFT, -1)))
+		.Check(ha == Ctrl::LEFT);
+	bar.Add(iscursor, AK_SPRINGRIGHT, LayImg::SpringRight(),
+	       THISBACK1(SetSprings, MAKELONG(Ctrl::RIGHT, -1)))
+		.Check(ha == Ctrl::RIGHT);
+	bar.Add(iscursor, AK_SPRINGHSIZE, LayImg::SpringHSize(),
+	       THISBACK1(SetSprings, MAKELONG(Ctrl::SIZE, -1)))
+		.Check(ha == Ctrl::SIZE);
+	bar.Add(iscursor, AK_SPRINGHCENTER, LayImg::SpringHCenter(),
+	       THISBACK1(SetSprings, MAKELONG(Ctrl::CENTER, -1)))
+		.Check(ha == Ctrl::CENTER);
+	bar.Separator();
+	bar.Add(iscursor, AK_SPRINGTOP, LayImg::SpringTop(),
+	       THISBACK1(SetSprings, MAKELONG(-1, Ctrl::TOP)))
+		.Check(va == Ctrl::TOP);
+	bar.Add(iscursor, AK_SPRINGBOTTOM, LayImg::SpringBottom(),
+	       THISBACK1(SetSprings, MAKELONG(-1, Ctrl::BOTTOM)))
+		.Check(va == Ctrl::BOTTOM);
+	bar.Add(iscursor, AK_SPRINGVSIZE, LayImg::SpringVSize(),
+	       THISBACK1(SetSprings, MAKELONG(-1, Ctrl::SIZE)))
+		.Check(va == Ctrl::SIZE);
+	bar.Add(iscursor, AK_SPRINGVCENTER, LayImg::SpringVCenter(),
+	       THISBACK1(SetSprings, MAKELONG(-1, Ctrl::CENTER)))
+		.Check(va == Ctrl::CENTER);
+	bar.Separator();
+	bar.Add(iscursor, AK_AUTOSPRINGS, LayImg::SpringAuto(),
+	       THISBACK1(SetSprings, MAKELONG(AUTOSPRING, 0)));
+	bar.Add(iscursor, AK_TOPLEFTSPRINGS, LayImg::SpringTopLeft(),
+	       THISBACK1(SetSprings, MAKELONG(Ctrl::LEFT, Ctrl::TOP)));
+}
+
+void LayDes::ToggleGrid()
+{
+	usegrid = !usegrid;
+	SetBar();
+}
+
+void LayDes::ToggleMinSize()
+{
+	ignoreminsize = !ignoreminsize;
+	SetBar();
+}
+
+void LayDes::Settings()
+{
+	setting.Execute();
+	Refresh();
+	SyncItems();
+}
+
+void LayDes::OptionBar(Bar& bar)
+{
+	bar.Add("Use grid", LayImg::Grid(), THISBACK(ToggleGrid))
+	   .Check(usegrid);
+	bar.Add("Ignore min size", LayImg::MinSize(), THISBACK(ToggleMinSize))
+	   .Check(ignoreminsize);
+	bar.Add("Settings..", THISBACK(Settings));
+}
+
+void LayDes::MainToolBar(Bar& bar)
+{
+	EditBar(bar);
+	bar.Separator();
+	MoveBar(bar);
+	bar.Separator();
+	OptionBar(bar);
+	bar.Separator();
+	bar.Add(status, INT_MAX);
+	bar.Break();
+	AlignBar(bar);
+	bar.Separator();
+	SizeBar(bar);
+	bar.Separator();
+	SpringBar(bar);
+}
+
+void LayDes::ItemBar(Bar& bar)
+{
+	bar.Add("Position", THISBACK(MoveBar));
+	bar.Add("Alignment", THISBACK(AlignBar));
+	bar.Add("Size", THISBACK(SizeBar));
+	bar.Add("Springs", THISBACK(SpringBar));
+}
+
+void LayDes::MainMenuBar(Bar& bar)
+{
+	bar.Add("Edit", THISBACK(EditBar));
+	bar.Add("Item", THISBACK(ItemBar));
+	bar.Add("Options", THISBACK(OptionBar));
+}
+
+void LayDes::EditMenu(Bar& bar)
+{
+	EditBar(bar);
+	bar.Separator();
+	bar.Add("Item", THISBACK(ItemBar));
+	bar.Separator();
+	OptionBar(bar);
+}
+
+void LayDes::SetBar()
+{
+	LTIMING("SetBar");
+	toolbar.Set(THISBACK(MainToolBar));
+}
+
+class CVFrame : public CtrlFrame {
+	virtual void FrameLayout(Rect& r) { r.bottom -= 4; r.left += 2; r.right -= 2; }
+	virtual void FramePaint(Draw& w, const Rect& r) { w.DrawRect(r, SColorFace); }
+	virtual void FrameAddSize(Size& sz) { sz.cy += 4; sz.cx += 4; }
+};
+
+void LayDes::Serialize(Stream& s)
+{
+	int version = 0;
+	s / version;
+	s % setting.gridx % setting.gridy;
+	s % setting.paintgrid % setting.showicons;
+	s % ignoreminsize % usegrid;
+	s % lsplit % isplit % rsplit;
+	item.SerializeHeader(s);
+	SetBar();
+}
+
+LayDes::LayDes()
+{
+	charset = CHARSET_UTF8;
+
+	currentlayout = -1;
+	draghandle = -1;
+
+	usegrid = true;
+	ignoreminsize = false;
+
+	SetBar();
+
+	status.Width(400);
+	status.NoTransparent();
+
+	km.d = this;
+	km.Add(lsplit.SizePos());
+	lsplit.Horz(rsplit, *this).SetPos(2000);
+	rsplit.Vert(layoutlist, isplit);
+	rsplit.SetPos(1000);
+	isplit.Vert(item, property);
+	twsplit.Height(EditField::GetStdHeight() + 4);
+	twsplit.Horz(type, variable);
+	twsplit.SetFrame(Single<CVFrame>());
+	property.AddFrame(twsplit);
+	property.AddFrame(ThinInsetFrame());
+	property.AfterCreate();
+	type <<= THISBACK(TypeEdit);
+	variable <<= THISBACK(VariableEdit);
+	type.Disable();
+	variable.Disable();
+
+	item.AddColumn("Type", 20).Margin(0);
+	item.AddColumn("Var / lbl", 10).Margin(0);
+	item.WhenLeftClick = THISBACK(ItemClick);
+	item.NoWantFocus();
+
+	SetFrame(toolbar);
+	AddFrame(InsetFrame());
+	AddFrame(sb);
+
+	sb.WhenScroll = THISBACK(Scroll);
+
+	layoutlist.NoHeader().NoGrid();
+	layoutlist.AddColumn();
+	layoutlist.WhenCursor = THISBACK(LayoutCursor);
+	layoutlist.WhenBar = THISBACK(LayoutMenu);
+	layoutlist.NoWantFocus();
+
+	NoWantFocus();
+	item.NoWantFocus();
+
+	BackPaint();
+
+	SyncUsc();
+
+	CtrlLayoutOKCancel(matrix, "Matrix duplicate");
+	matrix.nx.MinMax(1, 32);
+	matrix.nx <<= 2;
+	matrix.dx.MinMax(1, 32);
+	matrix.dx <<= 0;
+	matrix.ny.MinMax(1, 32);
+	matrix.ny <<= 1;
+	matrix.dy.MinMax(1, 32);
+	matrix.dy <<= 0;
+
+	CtrlLayoutOKCancel(setting, "Settings");
+	setting.gridx.MinMax(1, 32);
+	setting.gridx <<= 4;
+	setting.gridy.MinMax(1, 32);
+	setting.gridy <<= 4;
+}
+
+LayDesigner *CreateLayDesigner(const char *filename, byte charset, const char *cfgname)
+{
+	LayDesigner *q = new LayDesigner();
+	LoadFromGlobal(*q, "laydes-ctrl");
+	if(q->Load(filename, charset))
+		return q;
+	delete q;
+	return NULL;
+}
+
+void LayUscClean();
+bool LayUscParse(CParser& p) throw(CParser::Error);
+void SerializeLayEditPos(Stream& s);
+
+bool IsLayFile(const char *path)
+{
+	return ToLower(GetFileExt(path)) == ".lay";
+}
+
+struct LayDesModule : public IdeModule {
+	virtual void CleanUsc() {
+		LayUscClean();
+	}
+	virtual bool ParseUsc(CParser& p) {
+		return LayUscParse(p);
+	}
+	virtual Image FileIcon(const char *path) {
+		return IsLayFile(path) ? LayImg::Layout() : Null;
+	}
+	virtual IdeDesigner *CreateDesigner(const char *path, byte cs) {
+		if(IsLayFile(path)) {
+			LayDesigner *d = CreateLayDesigner(path, cs, "laydes-ctrl");
+			return d;
+		}
+		return false;
+	}
+	virtual void Serialize(Stream& s) {
+		int version = 0;
+		s / version;
+		SerializeLayEditPos(s);
+	}
+	
+	virtual ~LayDesModule() {}
+};
+
+void RegisterLayDes()
+{
+	RegisterIdeModule(Single<LayDesModule>());
+}
+
+INITBLOCK {
+	RegisterGlobalConfig("laydes-ctrl");
+}
diff --git a/uppsrc/ide/LayDes/propane.cpp b/uppsrc/ide/LayDes/propane.cpp
new file mode 100644
index 000000000..342dc25b6
--- /dev/null
+++ b/uppsrc/ide/LayDes/propane.cpp
@@ -0,0 +1,55 @@
+#include "LayDes.h"
+
+void PropertyPane::Layout()
+{
+	sb.SetTotal(y);
+	sb.SetPage(GetSize().cy);
+}
+
+void PropertyPane::Clear()
+{
+	y = 0;
+	sb.Set(0, 0, 0);
+	while(pane.GetFirstChild())
+		pane.GetFirstChild()->Remove();
+}
+
+void PropertyPane::Add(ItemProperty& c)
+{
+	pane.Add(c);
+	int cy = c.GetHeight();
+	c.HSizePos().TopPos(y, cy);
+	y += cy;
+	pane.TopPos(0, y);
+	Layout();
+}
+
+void PropertyPane::Scroll()
+{
+	pane.TopPos(-sb, y);
+}
+
+void PropertyPane::ChildGotFocus()
+{
+	Ctrl *f = GetFocusCtrl();
+	for(Ctrl *q = pane.GetFirstChild(); q; q = q->GetNext())
+		if(q->HasChildDeep(f)) {
+			Rect r = q->GetRect();
+			sb.ScrollInto(r.top, r.Height());
+			break;
+		}
+}
+
+void PropertyPane::AfterCreate()
+{
+	Ctrl::Add(pane.HSizePos());
+}
+
+PropertyPane::PropertyPane()
+{
+	Clear();
+	SetFrame(sb);
+	sb.AutoHide();
+	sb.WhenScroll = THISBACK(Scroll);
+	Color(SColorFace);
+}
diff --git a/uppsrc/ide/LayDes/property.cpp b/uppsrc/ide/LayDes/property.cpp
new file mode 100644
index 000000000..54680be27
--- /dev/null
+++ b/uppsrc/ide/LayDes/property.cpp
@@ -0,0 +1,212 @@
+#include "LayDes.h"
+
+void ItemProperty::Paint(Draw& w)
+{
+	Size sz = GetSize();
+	w.DrawRect(sz, SColorLtFace);
+	w.DrawRect(0, GetHeight() - 1, sz.cx, 1, SColorText);
+	w.DrawText(2,
+	           (EditField::GetStdHeight() + 6 - GetTextSize(name, Arial(11)).cy) / 2, name,
+	           GetData() == defval ? Arial(11) : Arial(11).Bold());
+}
+
+int ItemProperty::GetHeight() const
+{
+	return EditField::GetStdHeight() + 5;
+}
+
+bool ItemProperty::PlaceFocus(dword, int) { return false; }
+
+void ItemProperty::SetCharset(byte charset)
+{
+}
+
+void ItemProperty::Read(CParser& p)
+{
+}
+
+String ItemProperty::Save() const
+{
+	return Null;
+}
+
+VectorMap<String, ItemProperty *(*)()>& ItemProperty::Factory()
+{
+	return Single< VectorMap<String, ItemProperty *(*)()> >();
+}
+
+void ItemProperty::Register(const char *name, ItemProperty *(*cr)())
+{
+	ASSERT(Factory().Find(name) < 0);
+	Factory().Add(name, cr);
+}
+
+String ReadPropertyParam(CParser& p)
+{
+	const char *b = p.GetPtr();
+	int level = 0;
+	while(!p.IsEof()) {
+		if(p.IsChar(';'))
+			break;
+		if(p.IsChar(')') && level == 0)
+			break;
+		if(p.Char(')')) {
+			if(level == 0)
+				break;
+			level--;
+		}
+		else
+		if(p.Char('('))
+			level++;
+		else
+			p.SkipTerm();
+	}
+	return TrimLeft(TrimRight(String(b, p.GetPtr())));
+}
+
+ItemProperty *ItemProperty::Create(const String& name)
+{
+	int q = Factory().Find(name);
+	if(q >= 0)
+		return (*Factory()[q])();
+	return NULL;
+}
+
+void RawProperty::Read(CParser& p)
+{
+	editor.SetData(ToUnicode(ReadPropertyParam(p), CHARSET_WIN1252));
+}
+
+String RawProperty::Save() const
+{
+	String s = ~editor;
+	CParser p(s);
+	int level = 0;
+	while(!p.IsEof()) {
+		if(p.Char('('))
+			level++;
+		else
+		if(p.Char(')'))
+			level--;
+		else
+			p.SkipTerm();
+	}
+	if(level < 0)
+		s = String('(', -level) + s;
+	else
+		s = String(')', level) + s;
+	return s;
+}
+
+struct IntProperty : public EditorProperty<EditInt> {
+	virtual void   Read(CParser& p) {
+		if(p.Id("Null"))
+			editor.SetData(Null);
+		else
+			editor.SetData(p.ReadInt());
+	}
+	virtual String Save() const {
+		int q = ~editor;
+		return IsNull(q) ? "Null" : AsString(q);
+	}
+
+	IntProperty() {
+		Add(editor.HSizePos(100, 2).TopPos(2));
+	}
+
+	static ItemProperty *Create() { return new IntProperty; }
+};
+
+struct DoubleProperty : public EditorProperty<EditDouble> {
+	virtual void   Read(CParser& p) {
+		if(p.Id("Null"))
+			editor.SetData(Null);
+		else
+			editor.SetData(p.ReadDouble());
+	}
+	virtual String Save() const {
+		return FormatDouble(~editor, 10);
+	}
+
+	DoubleProperty() {
+		Add(editor.HSizePos(100, 2).TopPos(2));
+	}
+
+	static ItemProperty *Create() { return new DoubleProperty; }
+};
+
+struct StringProperty : public EditorProperty<EditString> {
+	virtual void     Read(CParser& p) {
+		if(p.Id("Null"))
+			editor.SetData(Null);
+		else
+			editor.SetData(p.ReadString());
+	}
+	virtual String   Save() const {
+		return AsCString(~editor);
+	}
+	StringProperty() {
+		Add(editor.HSizePos(100, 2).TopPos(2));
+	}
+
+	static ItemProperty *Create() { return new StringProperty; }
+};
+
+struct BoolProperty : public EditorProperty<Option> {
+	virtual void Read(CParser& p) {
+		if(p.Id("true"))
+			editor.SetData(1);
+		else {
+			p.Id("false");
+			editor.SetData(0);
+		}
+	}
+	virtual String   Save() const {
+		return (int)~editor ? "true" : "false";
+	}
+	BoolProperty() {
+		Add(editor.HSizePos(100, 2).TopPos(3));
+	}
+
+	static ItemProperty *Create() { return new BoolProperty; }
+};
+
+struct ColorProperty : public EditorProperty<ColorPusher> {
+	virtual String   Save() const           { return FormatColor(~editor); }
+	virtual void     Read(CParser& p);
+
+	void FontChanged();
+	void Perform();
+
+	typedef ColorProperty CLASSNAME;
+
+	ColorProperty() {
+		Add(editor.HSizePos(100, 2).TopPos(2));
+		editor.WithText().SColors().NullText("Null").Track();
+	}
+
+	static ItemProperty *Create() { return new ColorProperty; }
+};
+
+void ColorProperty::Read(CParser& p)
+{
+	if(p.Id("Null")) {
+		editor.SetData(Null);
+		return;
+	}
+	p.Char(':');
+	editor.SetData(ReadColor(p));
+}
+
+INITBLOCK
+{
+	ItemProperty::Register("raw", RawProperty::Create);
+	ItemProperty::Register("int", IntProperty::Create);
+	ItemProperty::Register("double", DoubleProperty::Create);
+	ItemProperty::Register("String", StringProperty::Create);
+	ItemProperty::Register("bool", BoolProperty::Create);
+	ItemProperty::Register("Color", ColorProperty::Create);
+
+	void RegisterTextProperties(); RegisterTextProperties();
+	void RegisterFontProperty(); RegisterFontProperty();
+}
diff --git a/uppsrc/ide/LayDes/sdiff.cpp b/uppsrc/ide/LayDes/sdiff.cpp
new file mode 100644
index 000000000..070a1cd71
--- /dev/null
+++ b/uppsrc/ide/LayDes/sdiff.cpp
@@ -0,0 +1,158 @@
+#include "LayDes.h"
+
+static inline int sMatchLen(const char *a, const char *al, const char *b, const char *bl)
+{
+	const char *q = a;
+	if(al - a < bl - b)
+		while(a < al && *a == *b) {
+			a++;
+			b++;
+		}
+	else
+		while(b < bl && *a == *b) {
+			a++;
+			b++;
+		}
+	return int(a - q);
+}
+
+unsigned HashPos(byte *s)
+{
+	return s[0] + (s[1] << 8) + (s[2] << 16) + (s[3] << 24);
+}
+
+void DiffPacker::SetMaster(const String& m)
+{
+	master = m;
+	mapn = master.GetLength() | 5;
+	prev.Alloc(master.GetLength(), -1);
+	map.Alloc(mapn, -1);
+	for(int i = master.GetLength() - 4; i >= 0; --i) {
+		int hp = HashPos((byte *)~master + i) % mapn;
+		prev[i] = map[hp];
+		map[hp] = i;
+	}
+}
+
+String DiffPacker::Pack(const String& data)
+{
+	String result;
+	const char *masterend = master.End();
+	const char *dataend = data.End();
+	const char *s = data;
+	while(s < dataend) {
+		int pos = 0;
+		int ml = 0;
+		int p = map[HashPos((byte *)s) % mapn];
+		int ni = INT_MAX;
+		while(p >= 0 && ml < ni) {
+			int l = sMatchLen(s, dataend, ~master + p, masterend);
+			if(l > ml) {
+				pos = p;
+				ml = l;
+			}
+			p = prev[p];
+			ni >>= 1;
+		}
+		if(ml > 65535)
+			ml = 65535;
+		if(pos <= 255 && ml <= 255 && ml > 3) {
+			result.Cat(0xfb);
+			result.Cat(pos);
+			result.Cat(ml);
+			s += ml;
+		}
+		else
+		if(pos <= 65535 && ml <= 255 && ml > 4) {
+			result.Cat(0xfc);
+			result.Cat(LOBYTE(pos));
+			result.Cat(HIBYTE(pos));
+			result.Cat(ml);
+			s += ml;
+		}
+		else
+		if(pos <= 65535 && ml > 5) {
+			result.Cat(0xfd);
+			result.Cat(LOBYTE(pos));
+			result.Cat(HIBYTE(pos));
+			result.Cat(LOBYTE(ml));
+			result.Cat(HIBYTE(ml));
+			s += ml;
+		}
+		else
+		if(ml > 7) {
+			result.Cat(0xfe);
+			result.Cat(LOBYTE(LOWORD(pos)));
+			result.Cat(HIBYTE(LOWORD(pos)));
+			result.Cat(LOBYTE(HIWORD(pos)));
+			result.Cat(HIBYTE(HIWORD(pos)));
+			result.Cat(LOBYTE(ml));
+			result.Cat(HIBYTE(ml));
+			s += ml;
+		}
+		else {
+			if((byte)*s >= 0xfb)
+				result.Cat(0xff);
+			result.Cat(*s++);
+		}
+	}
+	result.Shrink();
+	return result;
+}
+
+String DiffPack(const String& master, const String& data)
+{
+	DiffPacker p;
+	p.SetMaster(master);
+	return p.Pack(data);
+}
+
+String DiffUnpack(const String& master, const String& pack)
+{
+	String result;
+	const char *s = pack;
+	while(s < pack.End()) {
+		int c = (byte)*s++;
+		if(c == 0xfb) {
+			ASSERT(s <= pack.End() - 2);
+			byte p = (byte)*s++;
+			byte l = (byte)*s++;
+			result.Cat(~master + p, l);
+		}
+		else
+		if(c == 0xfc) {
+			ASSERT(s <= pack.End() - 3);
+			byte pl = (byte)*s++;
+			byte ph = (byte)*s++;
+			byte ln = (byte)*s++;
+			result.Cat(~master + MAKEWORD(pl, ph), ln);
+		}
+		else
+		if(c == 0xfd) {
+			ASSERT(s <= pack.End() - 4);
+			byte pl = (byte)*s++;
+			byte ph = (byte)*s++;
+			byte ll = (byte)*s++;
+			byte lh = (byte)*s++;
+			result.Cat(~master + MAKEWORD(pl, ph), MAKEWORD(ll, lh));
+		}
+		else
+		if(c == 0xfe) {
+			ASSERT(s <= pack.End() - 5);
+			byte pll = (byte)*s++;
+			byte plh = (byte)*s++;
+			byte phl = (byte)*s++;
+			byte phh = (byte)*s++;
+			byte ll = (byte)*s++;
+			byte lh = (byte)*s++;
+			result.Cat(~master + MAKELONG(MAKEWORD(pll, plh), MAKEWORD(phl, phh)),
+			           MAKEWORD(ll, lh));
+		}
+		else
+		if(c == 0xff)
+			result.Cat(*s++);
+		else
+			result.Cat(c);
+	}
+	return result;
+}
diff --git a/uppsrc/ide/LayDes/textprop.cpp b/uppsrc/ide/LayDes/textprop.cpp
new file mode 100644
index 000000000..a54357191
--- /dev/null
+++ b/uppsrc/ide/LayDes/textprop.cpp
@@ -0,0 +1,296 @@
+#include "LayDes.h"
+
+struct EditStringNE : EditString {
+	virtual bool Key(dword key, int rep) {
+		return key == K_ENTER ? true : EditString::Key(key, rep);
+	}
+};
+
+struct LTProperty : public ItemProperty, public Convert {
+	EditStringNE           lid;
+	ButtonOption           context, id;
+	byte                   charset;
+
+	void Id();
+	void Context();
+	void EditAction();
+	void SyncLid();
+
+	virtual void     SetCharset(byte charset);
+	virtual void     Read(CParser& p);
+	virtual String   Save() const;
+	virtual void     Set(const WString& text) = 0;
+	virtual WString  Get() const = 0;
+	virtual int      Filter(int chr) const;
+	virtual Value    Format(const Value& q) const      { return q; }
+	virtual Value    Scan(const Value& text) const     { return text; }
+
+	typedef LTProperty CLASSNAME;
+
+	LTProperty();
+};
+
+int FilterOutCr(int c)
+{
+	return c == '\r' ? 0 : c;
+}
+
+String NoCr(const String& s)
+{
+	return Filter(s, FilterOutCr);
+}
+
+int  LTProperty::Filter(int chr) const
+{
+	return charset == CHARSET_UNICODE ? chr : FromUnicode(chr, charset) == DEFAULTCHAR ? 0 : chr;
+}
+
+void LTProperty::EditAction()
+{
+	UpdateActionRefresh();
+}
+
+LTProperty::LTProperty()
+{
+	context = LayImg::Context();
+	context.WhenAction = THISBACK(Context);
+	id = LayImg::Id();
+	id.WhenAction = THISBACK(Id);
+	charset = CHARSET_UNICODE; //!! not good, but better than a crash; TRC 06/04/10//TODO
+}
+
+void LTProperty::SyncLid()
+{
+	lid.Enable(context || id);
+}
+
+void LTProperty::Id()
+{
+	if(id)
+		context = false;
+	SyncLid();
+	if(lid.IsEnabled())
+		lid.SetFocus();
+}
+
+void LTProperty::Context()
+{
+	if(context)
+		id = false;
+	SyncLid();
+	if(lid.IsEnabled())
+		lid.SetFocus();
+}
+
+void LTProperty::SetCharset(byte cs)
+{
+	charset = cs;
+}
+
+void LTProperty::Read(CParser& p)
+{
+	lid <<= Null;
+	if(p.Id("t_")) {
+		p.PassChar('(');
+		String q = p.ReadString();
+		p.PassChar(')');
+		for(const char *s = ~q; *s; s++) {
+			if(*s == '\v' && s[1] != '\v') {
+				context = true;
+				lid <<= String(~q, s);
+				Set(ToUnicode(s + 1, charset));
+				SyncLid();
+				return;
+			}
+			if(*s == '\a' && s[1] != '\a') {
+				id = true;
+				lid <<= String(~q, s);
+				Set(ToUnicode(s + 1, charset));
+				SyncLid();
+				return;
+			}
+		}
+		Set(ToUnicode(q, charset));
+	}
+	else
+	if(p.IsString())
+		Set(ToUnicode(NoCr(p.ReadString()), CHARSET_WIN1250));
+	else
+		Set(Null);
+	SyncLid();
+}
+
+String LTProperty::Save() const
+{
+	String px = ~lid;
+	String txt = FromUnicode((WString)Get(), charset);
+	if(id)
+		return "t_(" + AsCString(px + "\a" + txt) + ')';
+	else
+	if(context)
+		return "t_(" + AsCString(px + "\v" + txt) + ')';
+	else
+		return "t_(" + AsCString(txt) + ')';
+}
+
+template <class Editor>
+struct TextEditProperty : public LTProperty {
+	virtual Value    GetData() const                { return Get(); }
+	virtual WString  Get() const                    { return ~editor; }
+	virtual void     Set(const WString& text)       { editor <<= text; }
+
+	virtual bool     PlaceFocus(dword k, int c)     { editor.SetFocus(); return editor.Key(k, c); }
+
+protected:
+	Editor     editor;
+	FrameBottom<ParentCtrl> p;
+
+	TextEditProperty() {
+		editor.WhenAction = callback(this, &TextEditProperty::EditAction);
+		int c = EditField::GetStdHeight();
+		p.Height(c);
+		editor.AddFrame(p);
+		p.Add(lid.HSizePos(0, 2 * c).TopPos(0, c));
+		p.Add(id.TopPos(0, c).RightPos(0, c));
+		p.Add(context.TopPos(0, c).RightPos(c, c));
+	}
+};
+
+template <class Editor>
+struct SmartTextEditProperty : public TextEditProperty<Editor> {
+	typedef TextEditProperty<Editor> B;
+	virtual WString  Get() const {
+		WString text = ~B::editor;
+		WString r;
+		for(const wchar *s = text; *s; s++) {
+			if(*s == '\\' && s[1] == '1') {
+				r.Cat('\1');
+				s++;
+			}
+			else
+			if(*s == '\\' && s[1] == 'b') {
+				r.Cat('\b');
+				s++;
+			}
+			else
+			if(*s == '\n' || *s >= ' ')
+				r.Cat(*s);
+		}
+		return r;
+	}
+	virtual void Set(const WString& text) {
+		WString r;
+		for(const wchar *s = text; *s; s++) {
+			if(*s == '\1')
+				r.Cat("\\1");
+			else
+			if(*s == '\b')
+				r.Cat("\\b");
+			else
+			if(*s == '\n' || *s >= ' ')
+				r.Cat(*s);
+		}
+		B::editor.SetCharset(B::charset);
+		B::editor <<= r;
+	}
+};
+
+struct TextProperty : public SmartTextEditProperty<EditString>
+{
+	virtual int      GetHeight() const {
+		return 2 * EditField::GetStdHeight() + 6;
+	}
+
+	TextProperty() {
+		Add(editor.HSizePos(100, 2).TopPos(2));
+		editor.SetConvert(*this);
+	}
+
+	static ItemProperty *Create() { return new TextProperty; }
+};
+
+struct DocProperty : public SmartTextEditProperty<DocEdit>
+{
+	Button  large;
+
+	virtual int      GetHeight() const {
+		return EditField::GetStdHeight() + 6 + 120 + 1;
+	}
+
+	void LargeEdit();
+
+	typedef DocProperty CLASSNAME;
+
+	DocProperty() {
+		editor.UpDownLeave();
+		Add(editor.HSizePos(2, 2).TopPos(EditField::GetStdHeight() + 2, 120));
+		Add(large.RightPos(2, 16).TopPos(2, 16));
+		large.SetLabel("...");
+		large <<= THISBACK(LargeEdit);
+	}
+
+	static ItemProperty *Create() { return new DocProperty; }
+};
+
+Rect s_texteditorpos;
+
+void DocProperty::LargeEdit()
+{
+	editor.SetFocus();
+	TopWindow w;
+	w.NoCenter();
+	w.Sizeable();
+	w.SetRect(s_texteditorpos);
+	w.Title(name.ToWString());
+	DocEdit edit;
+	edit.SetFont(Arial(14));
+	edit <<= GetData();
+	w.Add(edit.SizePos());
+	w.Run();
+	editor.SetData(~edit);
+	s_texteditorpos = w.GetRect();
+}
+
+struct QtfProperty : public TextEditProperty<RichTextView>
+{
+	Button  large;
+
+	virtual int    GetHeight() const           { return EditField::GetStdHeight() + 6 + 120 + 1; }
+
+	void LargeEdit();
+
+	typedef QtfProperty CLASSNAME;
+
+	QtfProperty() {
+		Add(editor.HSizePos(2, 2).TopPos(EditField::GetStdHeight() + 2, 120));
+		Add(large.RightPos(2, 16).TopPos(2, 16));
+		large.SetLabel("...");
+		large <<= THISBACK(LargeEdit);
+		editor.SetZoom(Zoom(1, 7));
+		defval = ~editor;
+	}
+
+	static ItemProperty *Create() { return new QtfProperty; }
+};
+
+void QtfProperty::LargeEdit()
+{
+	large.SetFocus();
+	TopWindow w;
+	w.NoCenter();
+	w.Sizeable();
+	w.Title(name.ToWString());
+	w.SetRect(s_texteditorpos);
+	RichEditWithToolBar edit;
+	edit <<= GetData();
+	w.Add(edit.SizePos());
+	w.Run();
+	editor.SetData(~edit);
+	s_texteditorpos = w.GetRect();
+}
+
+void RegisterTextProperties() {
+	ItemProperty::Register("Text", TextProperty::Create);
+	ItemProperty::Register("Qtf", QtfProperty::Create);
+	ItemProperty::Register("Doc", DocProperty::Create);
+}
diff --git a/uppsrc/ide/LayDes/visgen.cpp b/uppsrc/ide/LayDes/visgen.cpp
new file mode 100644
index 000000000..87f5f9e0d
--- /dev/null
+++ b/uppsrc/ide/LayDes/visgen.cpp
@@ -0,0 +1,158 @@
+#include "LayDes.h"
+
+struct VisGenDlg : public WithVisGenLayout<TopWindow> {
+	LayoutData&  layout;
+	Vector<int>  sel;
+
+	void Refresh();
+	bool HasItem(const char *id);
+	void Type();
+	String GetName();
+
+	typedef VisGenDlg CLASSNAME;
+
+	VisGenDlg(LayoutData& layout, const Vector<int>& cursor);
+};
+
+bool VisGenDlg::HasItem(const char *id)
+{
+	for(int i = 0; i < layout.item.GetCount(); i++)
+		if(layout.item[i].variable == id)
+			return true;
+	return false;
+}
+
+String VisGenDlg::GetName()
+{
+	String n = layout.name;
+	int l = n.GetCount() - 6;
+	if(l > 0 && n.Mid(l) == "Layout")
+		n = n.Mid(0, l);
+	return n;
+}
+
+void VisGenDlg::Refresh()
+{
+	String s;
+	int q = ~type;
+	pars.Enable(q >= 2);
+	toupper1.Enable(q >= 2);
+	name1.Enable(q >= 2);
+	toupper2.Enable(q >= 3);
+	name2.Enable(q >= 3);
+	String oce = "\tCtrlLayout";
+	bool ok = false;
+	if(HasItem("ok")) {
+		ok = true;
+		oce << "OK";
+	}
+	if(HasItem("cancel"))
+		oce << "Cancel";
+	if(HasItem("exit"))
+		oce << "Exit";
+	if(q == 0) {
+		String n = ~name;
+		if(IsNull(n)) {
+			n = GetName();
+		}
+		s << "class " << n << " : public With" << layout.name << "<TopWindow> {\n"
+		  << "\ttypedef " << n << " CLASSNAME;\n"
+		  << "\n"
+		  << "public:\n"
+		  << "\t" << n << "();\n"
+		  << "};\n"
+		  << "\n"
+		  << n << "::" << n << "()\n"
+		  << "{\n"
+		  << oce;
+		s << "(*this, \"\");\n";
+		s << "}\n";
+	}
+	else
+	if(q == 1) {
+		String n = ~name;
+		if(IsNull(n))
+			n = "dlg";
+		s << "\tWith" << layout.name << "<TopWindow> " << n << ";\n"
+		  << oce << '(' << n << ", \"\");\n";
+		if(ok)
+			s << "\tif(" << n << ".Execute() != IDOK)\n\t\treturn;\n";
+		else
+			s << '\t' << n << ".Execute();\n";
+	}
+	else
+		for(int i = 0; i < sel.GetCount(); i++) {
+			String id = layout.item[sel[i]].variable;
+			if(!IsNull(id)) {
+				if(pars)
+					s << '(';
+				if(name1 && !IsNull(~name))
+					s << ~name << '.';
+				if(toupper1)
+					s << ToUpper(id);
+				else
+					s << id;
+				if(q == 3) {
+					s << ", ";
+					if(name2 && !IsNull(~name))
+						s << ~name << '.';
+					if(toupper2)
+						s << ToUpper(id);
+					else
+						s << id;
+				}
+				if(pars)
+					s << ')';
+				s << '\n';
+			}
+		}
+	view <<= s;
+}
+
+void VisGenDlg::Type()
+{
+	String n = GetName();
+	switch((int)~type) {
+	case 0:
+		name <<= GetName() + "Dlg";
+		break;
+	case 1:
+		name <<= "dlg";
+		break;
+	default:
+		name <<= "";
+	}
+	Refresh();
+}
+
+VisGenDlg::VisGenDlg(LayoutData& layout, const Vector<int>& cursor)
+:	layout(layout)
+{
+	type <<= 0;
+	CtrlLayoutOKCancel(*this, "Code generator");
+	type <<= THISBACK(Type);
+	name <<=
+	pars <<=
+	toupper1 <<=
+	name1 <<=
+	toupper2 <<=
+	name2 <<= THISBACK(Refresh);
+	Refresh();
+	view.Highlight(CodeEditor::HIGHLIGHT_CPP);
+	view.HideBar();
+	view.SetFont(Courier(12));
+	if(cursor.GetCount())
+		sel <<= cursor;
+	else
+		for(int i = 0; i < layout.item.GetCount(); i++)
+			sel.Add(i);
+}
+
+void LayDes::VisGen()
+{
+	if(currentlayout < 0)
+		return;
+	VisGenDlg dlg(CurrentLayout(), cursor);
+	if(dlg.Run() == IDOK)
+		WriteClipboardText(~dlg.view);
+}
diff --git a/uppsrc/ide/Macro.cpp b/uppsrc/ide/Macro.cpp
new file mode 100644
index 000000000..4eca1b9fa
--- /dev/null
+++ b/uppsrc/ide/Macro.cpp
@@ -0,0 +1,429 @@
+#include "ide.h"
+
+EscValue Ide::MacroEditor()
+{
+	EscValue out;
+	out.Escape("GetLength()", THISBACK(MacroGetLength));
+	out.Escape("GetLineCount()", THISBACK(MacroGetLineCount));
+	out.Escape("GetLinePos(line)", THISBACK(MacroGetLinePos));
+	out.Escape("GetCursor()", THISBACK(MacroGetCursor));
+	out.Escape("GetLine(pos)", THISBACK(MacroGetLine));
+	out.Escape("GetColumn(pos)", THISBACK(MacroGetColumn));
+	out.Escape("GetSelBegin()", THISBACK(MacroGetSelBegin));
+	out.Escape("GetSelCount()", THISBACK(MacroGetSelCount));
+	out.Escape("SetCursor(pos)", THISBACK(MacroSetCursor));
+	out.Escape("SetSelection(begin, count)", THISBACK(MacroSetSelection));
+	out.Escape("ClearSelection()", THISBACK(MacroClearSelection));
+	out.Escape("Get(...)", THISBACK(MacroGet));
+	out.Escape("Remove(...)", THISBACK(MacroRemove));
+	out.Escape("Insert(...)", THISBACK(MacroInsert));
+	out.Escape("Find(...)", THISBACK(MacroFind));
+	out.Escape("FindMatchingBrace(pos)", THISBACK(MacroFindMatchingBrace));
+    out.Escape("FindClosingBrace(pos)", THISBACK(MacroFindClosingBrace));
+    out.Escape("FindOpeningBrace(pos)", THISBACK(MacroFindOpeningBrace));
+    out.Escape("Replace(...)", THISBACK(MacroReplace));
+	out.Escape("MoveLeft(...)", THISBACK(MacroMoveLeft));
+	out.Escape("MoveRight(...)", THISBACK(MacroMoveRight));
+	out.Escape("MoveWordLeft(...)", THISBACK(MacroMoveWordLeft));
+	out.Escape("MoveWordRight(...)", THISBACK(MacroMoveWordRight));
+	out.Escape("MoveUp(...)", THISBACK(MacroMoveUp));
+	out.Escape("MoveDown(...)", THISBACK(MacroMoveDown));
+	out.Escape("MoveHome(...)", THISBACK(MacroMoveHome));
+	out.Escape("MoveEnd(...)", THISBACK(MacroMoveEnd));
+	out.Escape("MovePageUp(...)", THISBACK(MacroMovePageUp));
+	out.Escape("MovePageDown(...)", THISBACK(MacroMovePageDown));
+	out.Escape("MoveTextBegin(...)", THISBACK(MacroMoveTextBegin));
+	out.Escape("MoveTextEnd(...)", THISBACK(MacroMoveTextEnd));
+	out.Escape("Input(...)", THISBACK(MacroInput));
+	out.Escape("Build(...)", THISBACK(MacroBuild));
+	out.Escape("BuildProject(...)", THISBACK(MacroBuildProject));
+	out.Escape("Execute(cmdline)", THISBACK(MacroExecute));
+	out.Escape("Launch(cmdline)", THISBACK(MacroLaunch));
+	out.Escape("ClearConsole()", THISBACK(MacroClearConsole));
+	out.Escape("EditFile(...)", THISBACK(MacroEditFile));
+	out.Escape("SaveCurrentFile()", THISBACK(MacroSaveCurrentFile));
+	out.Escape("ProjectDir()", THISBACK(MacroProjectDir));
+	out.Escape("FileName()", THISBACK(MacroFileName));
+	return out;
+}
+
+void Ide::MacroGetLength(EscEscape& e)
+{
+	e = editor.GetLength();
+}
+
+void Ide::MacroGetLineCount(EscEscape& e)
+{
+	e = editor.GetLineCount();
+}
+
+void Ide::MacroGetLinePos(EscEscape& e)
+{
+	e = editor.GetPos(e.Int(0));
+}
+
+void Ide::MacroGetCursor(EscEscape& e)
+{
+	e = editor.GetCursor();
+}
+
+void Ide::MacroGetLine(EscEscape& e)
+{
+	e = editor.GetLine(e.Int(0));
+}
+
+void Ide::MacroGetColumn(EscEscape& e)
+{
+	int pos = e.Int(0);
+	editor.GetLinePos(pos);
+	e = pos;
+}
+
+void Ide::MacroGetSelBegin(EscEscape& e)
+{
+	int l, h;
+	if(editor.GetSelection(l, h))
+		e = l;
+	else
+		e = editor.GetCursor();
+}
+
+void Ide::MacroGetSelEnd(EscEscape& e)
+{
+	int l, h;
+	if(editor.GetSelection(l, h))
+		e = h;
+	else
+		e = editor.GetCursor();
+}
+
+void Ide::MacroGetSelCount(EscEscape& e)
+{
+	int l, h;
+	if(editor.GetSelection(l, h))
+		e = h - l;
+	else
+		e = 0.0;
+}
+
+void Ide::MacroSetCursor(EscEscape& e)
+{
+	editor.SetCursor(e.Int(0));
+}
+
+void Ide::MacroSetSelection(EscEscape& e)
+{
+	int b = e.Int(0), c = e.Int(1);
+	if(b < 0 || b > editor.GetLength() || c < 0 || c > editor.GetLength() || b + c > editor.GetLength())
+		e.ThrowError(NFormat("invalid selection: begin = %d, count = %d (text length = %d)",
+			b, c, editor.GetLength()));
+	editor.SetSelection(b, b + c);
+}
+
+void Ide::MacroClearSelection(EscEscape& e)
+{
+	editor.ClearSelection();
+}
+
+void Ide::MacroGet(EscEscape& e)
+{
+	if(e.GetCount() < 1 || e.GetCount() > 2)
+		e.ThrowError("wrong number of arguments in call to Get (1 or 2 expected)");
+	int pos = e.Int(0);
+	int count = e.GetCount() > 1 ? e.Int(1) : 1;
+	if(pos < 0 || pos > editor.GetLength() || count <= 0 || pos + count > editor.GetLength())
+		e.ThrowError(NFormat("error in Get(%d, %d), text length = %d", pos, count, editor.GetLength()));
+	e = editor.GetW(pos, count);
+}
+
+void Ide::MacroRemove(EscEscape& e)
+{
+	int c = e.GetCount();
+	if(c > 2)
+		e.ThrowError("wrong number of arguments in call to Remove (0 to 2 expected)");
+	int len = editor.GetLength();
+	int cur = editor.GetCursor();
+	if(c == 0) {
+		int l, h;
+		if(editor.GetSelection(l, h))
+			editor.Remove(l, h - l);
+		else if(cur < len)
+			editor.Remove(cur, 1);
+	}
+	else {
+		int start = (c > 1 ? e.Int(0) : cur);
+		int count = e.Int(c - 1);
+		if(count < 0 || count > len || start < 0 || start + count > len)
+			e.ThrowError(NFormat("cannot remove %d character(s) at position %d, text length is only %d",
+				count, start, len));
+		editor.Remove(start, count);
+	}
+}
+
+void Ide::MacroInsert(EscEscape& e)
+{
+	int c = e.GetCount();
+	if(c < 1 || c > 2)
+		e.ThrowError("wrong number of arguments in call to Insert (1 or 2 expected)");
+	WString text = e[c - 1];
+	editor.Insert(c > 1 ? e.Int(0) : editor.GetCursor(), text);
+}
+
+void Ide::MacroFind(EscEscape& e)
+{
+	int n = e.GetCount();
+	if(n < 1 || n > 6)
+		e.ThrowError("wrong number of arguments in call to Find (1 to 5 expected)");
+	WString text = e[0];
+	bool down = (n <= 1 || e.Int(1) > 0);
+	bool whole_word = (n > 2 && e.Int(2) > 0);
+	bool ignore_case = (n > 3 && e.Int(3) > 0);
+	bool wildcards = (n > 4 && e.Int(4) > 0);
+	e = editor.Find(!down, text, whole_word, ignore_case, wildcards, false);
+}
+
+void Ide::MacroReplace(EscEscape& e)
+{
+	int n = e.GetCount();
+	if(n < 2 || n > 5)
+		e.ThrowError("wrong number of arguments in call to Find (2 to 5 expected)");
+	WString find = e[0];
+	WString replace = e[1];
+	bool whole_word = (n > 2 && e.Int(2) > 0);
+	bool ignore_case = (n > 3 && e.Int(3) > 0);
+	bool wildcards = (n > 4 && e.Int(4) > 0);
+	e = editor.BlockReplace(find, replace, whole_word, ignore_case, wildcards);
+}
+
+void Ide::MacroFindMatchingBrace(EscEscape& e)
+{
+    int FindMatchingBrace(int pos);
+}
+
+void Ide::MacroFindClosingBrace(EscEscape& e)
+{
+    int FindClosingBrace(int pos);
+}
+
+void Ide::MacroFindOpeningBrace(EscEscape& e)
+{
+    int FindOpeningBrace(int pos);
+}
+
+void Ide::MacroMoveLeft(EscEscape& e)
+{
+	if(e.GetCount() > 1) e.ThrowError("MoveLeft(sel = false) takes at most 1 parameter");
+	editor.MoveLeft(e.GetCount() > 0 && e.Int(0) > 0);
+}
+
+void Ide::MacroMoveRight(EscEscape& e)
+{
+	if(e.GetCount() > 1) e.ThrowError("MoveRight(sel = false) takes at most 1 parameter");
+	editor.MoveRight(e.GetCount() > 0 && e.Int(0) > 0);
+}
+
+void Ide::MacroMoveUp(EscEscape& e)
+{
+	if(e.GetCount() > 1) e.ThrowError("MoveUp(sel = false) takes at most 1 parameter");
+	editor.MoveUp(e.GetCount() > 0 && e.Int(0) > 0);
+}
+
+void Ide::MacroMoveDown(EscEscape& e)
+{
+	if(e.GetCount() > 1) e.ThrowError("MoveDown(sel = false) takes at most 1 parameter");
+	editor.MoveDown(e.GetCount() > 0 && e.Int(0) > 0);
+}
+
+void Ide::MacroMoveHome(EscEscape& e)
+{
+	if(e.GetCount() > 1) e.ThrowError("MoveHome(sel = false) takes at most 1 parameter");
+	editor.MoveHome(e.GetCount() > 0 && e.Int(0) > 0);
+}
+
+void Ide::MacroMoveEnd(EscEscape& e)
+{
+	if(e.GetCount() > 1) e.ThrowError("MoveEnd(sel = false) takes at most 1 parameter");
+	editor.MoveEnd(e.GetCount() > 0 && e.Int(0) > 0);
+}
+
+void Ide::MacroMovePageUp(EscEscape& e)
+{
+	if(e.GetCount() > 1) e.ThrowError("MovePageUp(sel = false) takes at most 1 parameter");
+	editor.MovePageUp(e.GetCount() > 0 && e.Int(0) > 0);
+}
+
+void Ide::MacroMovePageDown(EscEscape& e)
+{
+	if(e.GetCount() > 1) e.ThrowError("MovePageDown(sel = false) takes at most 1 parameter");
+	editor.MovePageDown(e.GetCount() > 0 && e.Int(0) > 0);
+}
+
+void Ide::MacroMoveTextBegin(EscEscape& e)
+{
+	if(e.GetCount() > 1) e.ThrowError("MoveTextBegin(sel = false) takes at most 1 parameter");
+	editor.MoveTextBegin(e.GetCount() > 0 && e.Int(0) > 0);
+}
+
+void Ide::MacroMoveTextEnd(EscEscape& e)
+{
+	if(e.GetCount() > 1) e.ThrowError("MoveTextEnd(sel = false) takes at most 1 parameter");
+	editor.MoveTextEnd(e.GetCount() > 0 && e.Int(0) > 0);
+}
+
+void Ide::MacroMoveWordRight(EscEscape& e)
+{
+	if(e.GetCount() > 1) e.ThrowError("MoveWordRight(sel = false) takes at most 1 parameter");
+ 	int p = editor.GetCursor();
+ 	int b = p;
+	int l = editor.GetLength();
+	if(iscid(editor.GetChar(p)))
+		while(p < l && iscid(editor.GetChar(p))) p++;
+	else
+		while(p < l && !iscid(editor.GetChar(p))) p++;
+	if(e.GetCount() > 0 && e.Int(0) > 0)
+		editor.SetSelection(b, p);
+	else
+		editor.SetCursor(p);
+}
+
+void Ide::MacroMoveWordLeft(EscEscape& e)
+{
+	if(e.GetCount() > 1) e.ThrowError("MoveWordLeft(sel = false) takes at most 1 parameter");
+	int p = editor.GetCursor();
+	if(p == 0) return;
+	int b = p;
+	if(iscid(editor.GetChar(p - 1)))
+		while(p > 0 && iscid(editor.GetChar(p - 1))) p--;
+	else
+		while(p > 0 && !iscid(editor.GetChar(p - 1))) p--;
+	if(e.GetCount() > 0 && e.Int(0) > 0)
+		editor.SetSelection(p, b);
+	else
+		editor.SetCursor(p);
+}
+
+void Ide::MacroInput(EscEscape& e)
+{
+	TopWindow dialog;
+	Vector<String> tags;
+	tags.SetCount(max(e.GetCount(), 1));
+	int xdim = 0;
+	enum {
+		SIDE_GAP = 4,
+		LINE_DIST = 22,
+		LINE_HEIGHT = 19,
+		BUTTON_HEIGHT = 22,
+		BUTTON_WIDTH = 80,
+	};
+	for(int i = 0; i < e.GetCount(); i++)
+		xdim = max(xdim, GetTextSize(tags[i] = e[i], StdFont()).cx + 10);
+	dialog.HCenterPos(xdim + 200, 0).VCenterPos(LINE_DIST * tags.GetCount() + 2 * SIDE_GAP + BUTTON_HEIGHT, 0);
+	Array<Label> label;
+	Array<EditField> editors;
+	for(int i = 0; i < tags.GetCount(); i++) {
+		Label& lbl = label.Add();
+		lbl.SetLabel(tags[i]);
+		lbl.LeftPos(SIDE_GAP, xdim).TopPos(SIDE_GAP + LINE_DIST * i, LINE_HEIGHT);
+		dialog << lbl;
+		EditField& fld = editors.Add();
+		fld.HSizePos(SIDE_GAP + xdim, SIDE_GAP).TopPos(SIDE_GAP + LINE_DIST * i, LINE_HEIGHT);
+		dialog << fld;
+	}
+	Button ok, cancel;
+	ok.SetLabel("OK") <<= dialog.Acceptor(IDOK);
+	cancel.SetLabel("Cancel") <<= dialog.Rejector(IDCANCEL);
+	dialog << ok.Ok().BottomPos(SIDE_GAP, BUTTON_HEIGHT).RightPos(2 * SIDE_GAP + BUTTON_WIDTH, BUTTON_WIDTH)
+		<< cancel.Cancel().BottomPos(SIDE_GAP, BUTTON_HEIGHT).RightPos(SIDE_GAP, BUTTON_WIDTH);
+	dialog.Title("Macro input box");
+	if(dialog.Run() != IDOK) {
+		e = EscValue();
+		return;
+	}
+	if(tags.GetCount() == 1)
+		e = (WString)~editors[0];
+	else {
+		EscValue out;
+		for(int i = 0; i < tags.GetCount(); i++)
+			out.MapSet(i, (WString)~editors[i]);
+		e = out;
+	}
+}
+
+void Ide::MacroBuild(EscEscape& e)
+{
+	String outfile;
+	String maincfg = mainconfigparam;
+	switch(e.GetCount()) {
+		case 2: outfile = e[1]; break;
+		case 1: maincfg = e[0]; break;
+		case 0: break;
+		default: e.ThrowError("Build: 0 to 2 arguments expected ([maincfg[, outfile]])");
+	}
+	e = Build(IdeWorkspace(), maincfg, outfile, false);
+}
+
+void Ide::MacroBuildProject(EscEscape& e)
+{
+	String outfile;
+	switch(e.GetCount()) {
+		case 3: outfile = e[2];
+		case 2: break;
+		default:  e.ThrowError("BuildProject: 2 or 3 arguments expected (uppfile, maincfg[, outfile])");
+	}
+	String uppfile = e[0];
+	String maincfg = e[1];
+	Workspace wspc;
+	wspc.Scan(uppfile);
+	e = Build(wspc, maincfg, outfile, false);
+}
+
+void Ide::MacroExecute(EscEscape& e)
+{
+	int time = msecs();
+	String cmdline = e[0];
+	One<Host> h = CreateHostRunDir();
+	h->ChDir(Nvl(rundir, GetFileFolder(target)));
+	ShowConsole();
+	PutConsole(String().Cat() << "MacroExecute: " << cmdline);
+	console.Sync();
+	e = h->Execute(cmdline);
+	PutVerbose("Finished in " + GetPrintTime(time));
+}
+
+void Ide::MacroLaunch(EscEscape& e)
+{
+	String cmdline = e[0];
+	One<Host> h = CreateHostRunDir();
+	h->ChDir(Nvl(rundir, GetFileFolder(target)));
+	h->Launch(cmdline);
+}
+
+void Ide::MacroClearConsole(EscEscape& e)
+{
+	console.Clear();
+}
+
+void Ide::MacroEditFile(EscEscape& e)
+{
+	String filename;
+	if(e.GetCount() == 1)
+		filename = e[0];
+	else if(e.GetCount() == 2)
+		filename = SourcePath(e[0], e[1]);
+	EditFile(filename);
+}
+
+void Ide::MacroSaveCurrentFile(EscEscape& e)
+{
+	SaveFile();
+}
+
+void Ide::MacroProjectDir(EscEscape& e)
+{
+	e = GetFileFolder(PackagePathA(GetActivePackage()));
+}
+
+void Ide::MacroFileName(EscEscape& e)
+{
+	e = editfile;
+}
diff --git a/uppsrc/ide/Methods.cpp b/uppsrc/ide/Methods.cpp
new file mode 100644
index 000000000..ef339bafb
--- /dev/null
+++ b/uppsrc/ide/Methods.cpp
@@ -0,0 +1,419 @@
+#include "ide.h"
+
+String GetDefaultMethod()
+{
+	return LoadFile(ConfigFile("default_method"));
+}
+
+VectorMap<String, String> GetMethodVars(const String& method)
+{
+	VectorMap<String, String> map;
+	LoadVarFile(ConfigFile((String)~method + ".bm"), map);
+	return map;
+}
+
+class TextOption : public Option {
+public:
+	virtual void   SetData(const Value& data);
+	virtual Value  GetData() const;
+};
+
+void  TextOption::SetData(const Value& data)
+{
+	String s = data;
+	Set(!(IsNull(s) || s == "0"));
+}
+
+Value TextOption::GetData() const
+{
+	return Get() ? "1" : "0";
+}
+
+class TextSwitch : public Switch {
+public:
+	virtual void   SetData(const Value& data);
+	virtual Value  GetData() const;
+};
+
+void  TextSwitch::SetData(const Value& data)
+{
+	String s = data;
+	Switch::SetData(atoi((String)data));
+}
+
+Value TextSwitch::GetData() const
+{
+	return AsString(Switch::GetData());
+}
+
+class DirTable : public ArrayCtrl {
+public:
+	virtual void   SetData(const Value& data);
+	virtual Value  GetData() const;
+
+protected:
+	void Modify()  { Update(); }
+
+	EditString      edit;
+	SelectDirButton edit_dir;
+
+public:
+	DirTable(const char *name);
+};
+
+void   DirTable::SetData(const Value& data)
+{
+	Vector<String> l = Split((String)data, ';');
+	Clear();
+	for(int i = 0; i < l.GetCount(); i++)
+		Add(l[i]);
+}
+
+Value  DirTable::GetData() const
+{
+	String s;
+	for(int i = 0; i < GetCount(); i++) {
+		if(i) s << ';';
+		s << (String)Get(i, 0);
+	}
+	return s;
+}
+
+DirTable::DirTable(const char *name)
+{
+	AutoHideSb();
+	AddColumn(name).Edit(edit);
+	Appending().Removing().Moving();
+	edit_dir.Attach(edit);
+	edit_dir.AllFilesType();
+	WhenArrayAction = edit <<= callback(this, &DirTable::Modify);
+}
+
+class DirMap : public ArrayCtrl {
+public:
+	virtual void   SetData(const Value& data);
+	virtual Value  GetData() const;
+
+protected:
+	void Modify()  { Update(); }
+
+	EditString      localpath, remotepath;
+	SelectDirButton edit_dir;
+
+public:
+	DirMap();
+};
+
+void DirMap::SetData(const Value& data)
+{
+	Vector<String> l = Split((String)data, ';');
+	Clear();
+	for(int i = 0; i < l.GetCount(); i++) {
+		String li = l[i];
+		int f = li.Find('>');
+		if(f >= 0)
+			Add(li.Left(f), li.Mid(f + 1));
+	}
+}
+
+Value DirMap::GetData() const
+{
+	String s;
+	for(int i = 0; i < GetCount(); i++) {
+		if(i) s << ';';
+		s << (String)Get(i, 0) << '>' << (String)Get(i, 1);
+	}
+	return s;
+}
+
+DirMap::DirMap()
+{
+	AutoHideSb();
+	AddColumn("Map local path").Edit(localpath);
+	AddColumn("To remote path").Edit(remotepath);
+	Appending().Removing().Moving();
+	edit_dir.Attach(localpath);
+	WhenArrayAction = localpath <<= remotepath <<= callback(this, &DirMap::Modify);
+}
+
+struct BuildMethods : public WithBuildMethodsLayout<TopWindow>
+{
+	TextOption debug_blitz;
+	TextSwitch debug_linkmode;
+	TextOption release_blitz;
+	TextSwitch release_linkmode;
+	TextOption linkmode_lock;
+	DirTable   path;
+	DirTable   include;
+	DirTable   lib;
+	DirMap     remote_path_map;
+	OpenFileButton open_script;
+
+	EditStringNotNull name;
+	Index<String>     origfile;
+	String            default_method;
+
+	void Load();
+	bool Save();
+
+	void NewBuilder();
+	void ShowDefault();
+	void SetDefault();
+	void ChangeMethod();
+	void Import();
+
+	void MethodMenu(Bar& bar);
+
+	typedef BuildMethods CLASSNAME;
+
+	BuildMethods();
+};
+
+int CharFilterFileName(int c)
+{
+	return IsAlNum(c) || c == '_' ? c : 0;
+}
+
+BuildMethods::BuildMethods()
+:	path("PATH - executable directories"),
+	include("INCLUDE directories"),
+	lib("LIB directories")
+{
+	CtrlLayoutOKCancel(*this, "Build methods");
+	method.AddColumn("Method").Edit(name);
+	name.SetFilter(CharFilterFileName);
+	method.AddCtrl("BUILDER", builder);
+	method.AddCtrl("COMPILER", compiler);
+	method.AddCtrl("DEBUG_INFO", debug_info);
+	method.AddCtrl("DEBUG_BLITZ", debug_blitz);
+	method.AddCtrl("DEBUG_LINKMODE", debug_linkmode);
+	method.AddCtrl("DEBUG_OPTIONS", debug_options);
+	method.AddCtrl("DEBUG_FLAGS", debug_flags);
+	method.AddCtrl("RELEASE_BLITZ", release_blitz);
+	method.AddCtrl("RELEASE_LINKMODE", release_linkmode);
+	method.AddCtrl("RELEASE_OPTIONS", speed_options);
+	method.AddCtrl("RELEASE_SIZE_OPTIONS", size_options);
+	method.AddCtrl("RELEASE_FLAGS", release_flags);
+	method.AddCtrl("DEBUGGER", debugger);
+	method.AddCtrl("PATH", path);
+	method.AddCtrl("INCLUDE", include);
+	method.AddCtrl("LIB", lib);
+	method.AddCtrl("REMOTE_HOST", remote_host);
+	method.AddCtrl("REMOTE_OS", remote_os);
+	remote_os.Add("WIN32");
+	remote_os.Add("LINUX");
+	remote_os.Add("WINCE");
+	remote_os.Add("UNIX");
+	remote_os.Add("SOLARIS");
+	remote_os.Add("FREEBSD");
+	method.AddCtrl("REMOTE_TRANSFER", remote_file_access);
+	remote_file_access.Add("0", "direct (SAMBA)");
+	remote_file_access.Add("1", "indirect (transfer)");
+	method.AddCtrl("REMOTE_MAP", remote_path_map);
+	method.AddCtrl("SCRIPT", scriptfile);
+	method.AddCtrl("LINKMODE_LOCK", linkmode_lock);
+	open_script.Attach(scriptfile);
+	open_script.Type("Build scripts (*.bsc)", "*.bsc")
+		.AllFilesType();
+	open_script.DefaultExt("bsc");
+	method.Appending().Removing().Duplicating();
+	method.WhenCursor = THISBACK(ChangeMethod);
+	method.WhenBar = THISBACK(MethodMenu);
+
+	debug_info.Add("0", "None");
+	debug_info.Add("1", "Minimal");
+	debug_info.Add("2", "Full");
+
+	for(int i = 0; i < BuilderMap().GetCount(); i++)
+		builder.Add(BuilderMap().GetKey(i));
+
+	builder <<= THISBACK(NewBuilder);
+	setdefault <<= THISBACK(SetDefault);
+
+	linkmode_lock.SetLabel("Lock link mode");
+}
+
+void BuildMethods::MethodMenu(Bar& bar)
+{
+	method.StdBar(bar);
+	bar.Separator();
+	bar.Add("Import", THISBACK(Import));
+}
+
+void BuildMethods::Import()
+{
+	if(!Save())
+		return;
+	FileSel fsel;
+	fsel.Type("Build methods (*.bm)", "*.bm")
+		.AllFilesType()
+		.Multi()
+		.DefaultExt("bm");
+	if(!fsel.ExecuteOpen())
+		return;
+	for(int i = 0; i < fsel.GetCount(); i++) {
+		String f = LoadFile(fsel[i]);
+		if(f.IsVoid()) {
+			if(!PromptOKCancel(NFormat("Failed to load [* \1%s\1]. Continue?", fsel[i])))
+				break;
+			continue;
+		}
+		String nf = ConfigFile(GetFileNamePos(fsel[i]));
+		if(FileExists(nf) && !PromptOKCancel(NFormat("File already exists: [* \1%s\1]. Overwrite?", nf)))
+			continue;
+		if(!SaveFile(nf, f))
+			if(!PromptOKCancel(NFormat("Failed to save [* \1%s\1]. Continue?", nf)))
+				break;
+	}
+	Load();
+}
+
+static int sCompare(const Value& v1, const Value& v2)
+{
+	return (String)v1 < (String)v2;
+}
+
+static bool IsGccBuilder(String b) { return b == "GCC" || b == "GCC32" || b == "GCC_ARM"; }
+
+void BuildMethods::NewBuilder()
+{
+	String b = ~builder;
+	if(IsNull(speed_options)) {
+		if(IsGccBuilder(b))
+		#ifdef PLATFORM_WIN32
+			speed_options <<= "-O3 -ffunction-sections";
+		#else
+			speed_options <<= "-O3";
+		#endif
+		else
+			speed_options <<= "-O2";
+	}
+	if(IsNull(size_options)) {
+		if(IsGccBuilder(b))
+		#ifdef PLATFORM_WIN32
+			size_options <<= "-Os -finline-limit=20 -ffunction-sections";
+		#else
+			size_options <<= "-Os -finline-limit=20";
+		#endif
+		else
+			size_options <<= "-O1";
+	}
+	if(IsNull(debug_options)) {
+		if(IsGccBuilder(b))
+			debug_options <<= "-O0";
+		else
+			debug_options <<= "-Od";
+	}
+	if(IsNull(debugger)) {
+		if(IsGccBuilder(b))
+			debugger <<= "gdb";
+		else
+			debugger <<= "msdev";
+	}
+	ChangeMethod();
+}
+
+void BuildMethods::ChangeMethod()
+{
+	String b;
+	if(method.IsCursor())
+		b = method.Get("BUILDER");
+	scriptfile.Enable(b == "SCRIPT");
+}
+
+void BuildMethods::Load()
+{
+	FindFile ff(ConfigFile("*.bm"));
+	while(ff) {
+		VectorMap<String, String> map;
+		String fn = ConfigFile(ff.GetName());
+		if(LoadVarFile(fn, map)) {
+			origfile.Add(fn);
+			method.Add(GetFileTitle(fn));
+			for(int j = 1; j < method.GetIndexCount(); j++)
+				method.Set(method.GetCount() - 1, j, map.Get(method.GetId(j).ToString(), Null));
+		}
+		ff.Next();
+	}
+	method.Sort(0, sCompare);
+	method.GoBegin();
+	NewBuilder();
+}
+
+bool BuildMethods::Save()
+{
+	int i;
+	Index<String> name;
+	for(i = 0; i < method.GetCount(); i++) {
+		String n = method.Get(i, 0);
+		if(name.Find(n) >= 0) {
+			Exclamation("Duplicate method [* " + DeQtf(n) + "] !");
+			return false;
+		}
+		name.Add(n);
+	}
+	Index<String> saved;
+	for(i = 0; i < method.GetCount(); i++) {
+		VectorMap<String, String> map;
+		for(int j = 1; j < method.GetIndexCount(); j++)
+			map.Add(method.GetId(j).ToString(), method.Get(i, j));
+		if(map.Get("BUILDER", "") != "SCRIPT")
+			map.RemoveKey("SCRIPT");
+		String fn = ConfigFile(String(method.Get(i, 0)) + ".bm");
+		if(!SaveVarFile(fn, map)) {
+			Exclamation("Error saving [* " + fn + "] !");
+			return false;
+		}
+		saved.Add(fn);
+	}
+	for(i = 0; i < origfile.GetCount(); i++)
+		if(saved.Find(origfile[i]) < 0)
+			DeleteFile(origfile[i]);
+	return true;
+}
+
+struct BoldDisplay : Display {
+	virtual void Paint(Draw& w, const Rect& r, const Value& q,
+					   Color ink, Color paper, dword style) const {
+		w.DrawRect(r, paper);
+		DrawSmartText(w, r.left, r.top, r.Width(), (String)q, StdFont().Bold(), ink);
+	}
+};
+
+
+void BuildMethods::ShowDefault()
+{
+	String m = GetDefaultMethod();
+	for(int i = 0; i < method.GetCount(); i++)
+		if((String)method.Get(i, 0) == m)
+			method.SetDisplay(i, 0, Single<BoldDisplay>());
+		else
+			method.SetDisplay(i, 0, StdDisplay());
+}
+
+void BuildMethods::SetDefault()
+{
+	if(method.IsCursor()) {
+		SaveFile(ConfigFile("default_method"), method.GetKey());
+		ShowDefault();
+	}
+}
+
+void Ide::SetupBuildMethods()
+{
+	BuildMethods m;
+	m.Load();
+	m.ShowDefault();
+	m.use_target = use_target;
+	for(;;) {
+		int c = m.Run();
+		if(c == IDCANCEL)
+			break;
+		if(c == IDOK && m.Save()) {
+			use_target = m.use_target;
+			break;
+		}
+	}
+	SyncBuildMode();
+	SetBar();
+}
diff --git a/uppsrc/ide/OutputMode.cpp b/uppsrc/ide/OutputMode.cpp
new file mode 100644
index 000000000..69da829db
--- /dev/null
+++ b/uppsrc/ide/OutputMode.cpp
@@ -0,0 +1,309 @@
+#include "ide.h"
+
+INITBLOCK
+{
+	RegisterWorkspaceConfig("outputmode-release");
+	RegisterWorkspaceConfig("outputmode-debug");
+}
+
+void TargetMode::Serialize(Stream& s)
+{
+	int ver = 4;
+	s / ver;
+	s % target_override % target;
+	if(ver < 3) {
+		int dummy;
+	 	s % dummy;
+	}
+	if(ver < 1) {
+		String dummy; //!! holy shit
+		s % dummy;
+	}
+	else
+		s % version;
+	s % def % package;
+	if(ver == 2) {
+		int dummy;
+		s % dummy;
+	}
+	if(ver >= 3)
+		s % linkmode;
+	if(ver >= 4)
+		s % createmap;
+}
+
+struct ModePane : WithModePaneLayout<StaticRect> {
+	DropList       debugs;
+	DropList       blitzs;
+	SaveFileButton target_browse;
+
+	void  Serialize(Stream& s) { target.SerializeList(s); }
+
+	void  Load(const TargetMode& m);
+	void  Save(TargetMode& m);
+
+	ModePane();
+};
+
+void ModePane::Load(const TargetMode& m)
+{
+	target_override = m.target_override;
+	target <<= m.target;
+	map = m.createmap;
+	linkmode = m.linkmode;
+	version = m.version.ToWString();
+	debug = m.def.debug;
+	blitz = m.def.blitz;
+	const Workspace& wspc = GetIdeWorkspace();
+	package.Clear();
+	for(int i = 0; i < wspc.GetCount(); i++) {
+		int q;
+		String p = wspc[i];
+		q = m.package.Find(p);
+		if(q >= 0) {
+			const PackageMode& k = m.package[q];
+			package.Add(p, k.debug, k.blitz);
+		}
+		else
+			package.Add(p);
+	}
+}
+
+void ModePane::Save(TargetMode& m)
+{
+	m.target_override = target_override;
+	m.target = ~target;
+	m.createmap = map;
+	m.linkmode = (int)~linkmode;
+	m.version = ~version;
+	m.def.debug = ~debug;
+	m.def.blitz = ~blitz;
+	m.package.Clear();
+	for(int i = 0; i < package.GetCount(); i++) {
+		PackageMode k;
+		k.debug = package.Get(i, 1);
+		k.blitz = package.Get(i, 2);
+		if(!IsNull(k.debug) || !IsNull(k.blitz))
+			m.package.Add(package.Get(i, 0)) = k;
+	}
+	target.AddHistory();
+}
+
+void DebugF(One<Ctrl>& ctrl)
+{
+	ctrl.Create<DropList>()
+	   .Add(Null, "")
+	   .Add(0, "None")
+	   .Add(1, "Minimal")
+	   .Add(2, "Full");
+}
+
+void BlitzF(One<Ctrl>& ctrl)
+{
+	ctrl.Create<Option>().ThreeState();
+}
+
+ModePane::ModePane()
+{
+	CtrlLayout(*this);
+	package.AddColumn("Package");
+	package.AddColumn("Debug").Ctrls(DebugF);
+	package.AddColumn("Blitz").Ctrls(BlitzF);
+	package.ColumnWidths("80 96 96");
+	package.EvenRowColor();
+	package.NoHorzGrid();
+	package.SetLineCy(EditField::GetStdHeight() + 2);
+	package.NoCursor();
+	debug.Add(0, "None")
+	     .Add(1, "Minimal")
+	     .Add(2, "Full");
+	target_browse.Attach(target);
+}
+
+struct OutMode : WithOutputModeLayout<TopWindow> {
+	Ide& ide;
+	ModePane debug;
+	ModePane release;
+
+	void Load();
+	void Save();
+	void Preset();
+	void SyncLock();
+
+	typedef OutMode CLASSNAME;
+
+	OutMode(Ide& ide);
+};
+
+void OutMode::Load()
+{
+	method.Clear();
+	FindFile ff(ConfigFile("*.bm"));
+	while(ff) {
+		method.Add(GetFileTitle(ff.GetName()));
+		ff.Next();
+	}
+	method <<= ide.method;
+	mode <<= ide.targetmode;
+	debug.Load(ide.debug);
+	LoadFromWorkspace(debug, "outputmode-debug");
+	release.Load(ide.release);
+	LoadFromWorkspace(release, "outputmode-release");
+	SyncLock();
+}
+
+void OutMode::Save()
+{
+	ide.method = ~method;
+	ide.targetmode = ~mode;
+	debug.Save(ide.debug);
+	StoreToWorkspace(debug, "outputmode-debug");
+	release.Save(ide.release);
+	StoreToWorkspace(release, "outputmode-release");
+	StringStream ss;
+	ide.SerializeOutputMode(ss);
+	ide.recent_buildmode.GetAdd(ide.method) = ss.GetResult();
+}
+
+bool MapFlag(const VectorMap<String, String>& map, const char *key)
+{
+	return map.Get(key, "0") == "1";
+}
+
+void Ide::SerializeOutputMode(Stream& s)
+{
+	int version = 0;
+	s / version;
+	s % method;
+	s / targetmode;
+	s % debug;
+	s % release;
+	s % recent_buildmode;
+}
+
+void OutMode::SyncLock()
+{
+	bool b = GetMethodVars(~method).Get("LINKMODE_LOCK", "") != "1";
+	release.linkmode.Enable(b);
+	debug.linkmode.Enable(b);
+}
+
+void OutMode::Preset()
+{
+	int q = ide.recent_buildmode.Find(~method);
+	SyncLock();
+	if(q < 0) {
+		VectorMap<String, String> map = GetMethodVars(~method);
+		debug.linkmode = atoi(map.Get("DEBUG_LINKMODE", "0"));
+		debug.debug = atoi(map.Get("DEBUG_INFO", "0"));
+		debug.blitz = MapFlag(map, "DEBUG_BLITZ");
+		release.linkmode = MapFlag(map, "RELEASE_LINKMODE");
+		release.debug <<= 0;
+		release.blitz = MapFlag(map, "RELEASE_BLITZ");
+	}
+	else {
+		StringStream ss(ide.recent_buildmode[q]);
+		TargetMode x;
+		String dummy;
+		int m;
+		ss / m;
+		ss % dummy;
+		ss / m;
+		mode = !!m;
+		ss % x;
+		debug.Load(x);
+		ss % x;
+		release.Load(x);
+	}
+}
+
+OutMode::OutMode(Ide& ide)
+:	ide(ide)
+{
+	CtrlLayoutOKCancel(*this, "Output mode");
+	method <<= THISBACK(Preset);
+	SyncLock();
+}
+
+void Ide::SetupOutputMode()
+{
+	SetupDefaultMethod();
+	OutMode m(*this);
+	m.Load();
+	if(m.Execute() != IDOK)
+		return;
+	m.Save();
+	SyncBuildMode();
+	SetBar();
+}
+
+void Ide::SyncBuildMode()
+{
+	SetupDefaultMethod();
+	Vector<String> bmlist;
+	for(FindFile ff(ConfigFile("*.bm")); ff; ff.Next())
+		bmlist.Add(GetFileTitle(ff.GetName()));
+	Sort(bmlist);
+	methodlist.Clear();
+	Append(methodlist, bmlist);
+	String h = method + ' ';
+	switch(targetmode) {
+	case 1: h << "Optimal"; break;
+	case 2: h << "Speed"; break;
+	case 3: h << "Size"; break;
+	default:
+		h << "Debug";
+	}
+	buildmode <<= h;
+}
+
+void Ide::DropMethodList()
+{
+	methodlist.PopUp(&buildmode);
+	int i = methodlist.Find(method);
+	if(i >= 0)
+		methodlist.SetCursor(i);
+}
+
+void Ide::SelectMethod()
+{
+	method = methodlist.GetKey();
+	int q = recent_buildmode.Find(~method);
+	if(q >= 0) {
+		StringStream ss(recent_buildmode[q]);
+		SerializeOutputMode(ss);
+	}
+	SyncBuildMode();
+}
+
+void Ide::DropModeList()
+{
+	modelist.PopUp(&buildmode);
+	modelist.SetCursor(targetmode);
+}
+
+void Ide::SelectMode()
+{
+	targetmode = modelist.GetCursor();
+	SyncBuildMode();
+}
+
+void Ide::SetupDefaultMethod()
+{
+	if(IsNull(method)) {
+		method = GetDefaultMethod();
+		if(IsNull(method)) {
+			FindFile ff(ConfigFile("*.bm"));
+			if(!ff)
+				return;
+			method = GetFileTitle(ff.GetName());
+		}
+		VectorMap<String, String> map = GetMethodVars(method);
+		debug.linkmode = atoi(map.Get("DEBUG_LINKMODE", "0"));
+		debug.def.debug = atoi(map.Get("DEBUG_INFO", "0"));
+		debug.def.blitz = MapFlag(map, "DEBUG_BLITZ");
+		release.linkmode = atoi(map.Get("RELEASE_SO", "0"));
+		release.def.debug <<= 0;
+		release.def.blitz = MapFlag(map, "RELEASE_BLITZ");
+	}
+}
diff --git a/uppsrc/ide/QuickTabs.cpp b/uppsrc/ide/QuickTabs.cpp
new file mode 100644
index 000000000..fa07beef5
--- /dev/null
+++ b/uppsrc/ide/QuickTabs.cpp
@@ -0,0 +1,63 @@
+#include "ide.h"
+
+void Ide::TabFile()
+{
+	int q = tabs.GetCursor();
+	if(q >= 0)
+		EditFile(tabs.GetFile(q));
+}
+
+void Ide::TabFile2()
+{
+	int q = tabs2.GetCursor();
+	if(q >= 0) {
+		String fn = tabs2.GetFile(q);
+		SwapEditors();
+		EditFile(fn);
+	}
+}
+
+void Ide::ClearTab()
+{
+	int c = tabs.GetCursor();
+	if(c >= 0)
+		tabs.Close(c);
+	tabs2.Set(tabs);
+}
+
+void Ide::ClearTabs()
+{
+	tabs.Clear();
+	FileSelected();
+}
+
+void Ide::CloseRest(QuickTabs *tabs)
+{
+	Index<String> fn;
+	const Workspace& wspc = IdeWorkspace();
+	for(int i = 0; i < wspc.GetCount(); i++)
+		for(int j = 0; j < wspc.GetPackage(i).file.GetCount(); j++)
+			fn.Add(SourcePath(wspc[i], wspc.GetPackage(i).file[j]));
+	String cfn;
+	if(tabs->GetCursor() >= 0)
+		cfn = tabs->GetFile(tabs->GetCursor());
+	for(int i = tabs->GetCount() - 1; i >= 0; i--)
+		if(fn.Find(tabs->GetFile(i)) < 0)
+			tabs->Close(i);
+	tabs->FindSetFile(cfn);
+}
+
+void Ide::TabsLR(int d)
+{
+	int c = tabs.GetCursor();
+	if(c < 0 || tabs.GetCount() <= 1)
+		return;
+	c = minmax(c + d, 0, tabs.GetCount() - 1);
+	EditFile(tabs.GetFile(c));
+}
+
+void Ide::FileSelected()
+{
+	if(!IsNull(editfile))
+		tabs.SetAddFile(editfile);
+}
diff --git a/uppsrc/ide/QuickTabs/QuickTabs.cpp b/uppsrc/ide/QuickTabs/QuickTabs.cpp
new file mode 100644
index 000000000..1dfff132d
--- /dev/null
+++ b/uppsrc/ide/QuickTabs/QuickTabs.cpp
@@ -0,0 +1,892 @@
+#include <ide/QuickTabs/QuickTabs.h>
+#include <ide/Common/Common.h>
+
+#define IMAGECLASS Img
+#define IMAGEFILE <ide/QuickTabs/QuickTabs.iml>
+#include <Draw/iml_source.h>
+
+static String ParseGroup(const String &s)
+{
+	if(!s.IsEmpty())
+	{
+		if(s[0] == '/' || s[0] == '\\')
+			return s.Mid(1);
+		else if(s[1] == ':')
+			return s.Mid(3);
+	}
+	return Null;
+}
+
+TabScrollBar::TabScrollBar()
+{
+	total = 0;
+	pos = 0;
+	ps = 0;
+	start_pos = 0;
+	new_pos = 0;
+	old_pos = 0;
+	ready = false;
+}
+
+void TabScrollBar::UpdatePos(bool update)
+{
+	sz = GetSize();
+	if(total <= 0 || sz.cx <= 0)
+		cs = ics = 0;
+	else
+	{
+		cs = sz.cx / ((double) total + 0.5);
+		ics = total / ((double) sz.cx);
+	}
+	size = sz.cx * cs;
+	if(update)
+		pos = new_pos - start_pos;
+	if(pos < 0)
+		pos = 0;
+	else if(pos + size > sz.cx)
+		pos = sz.cx - size;
+
+	ps = total > sz.cx ? pos * ics : 0;
+	WhenScroll();
+}
+
+void TabScrollBar::Paint(Draw &w)
+{
+	if(!ready)
+	{
+		UpdatePos();
+		ready = true;
+	}
+	Size sz = GetSize();
+	w.DrawRect(sz, White);
+	if(total > sz.cx)
+		w.DrawRect(ffloor(pos), 1, fceil(size), 2, Blue);
+	else
+		w.DrawRect(0, 1, sz.cx, 2, Blue);
+}
+
+void TabScrollBar::Layout()
+{
+	UpdatePos(false);
+}
+
+void TabScrollBar::LeftDown(Point p, dword keyflags)
+{
+	SetCapture();
+	old_pos = new_pos = p.x;
+	if(p.x < pos || p.x > pos + size)
+		start_pos = size / 2;
+	else
+		start_pos = tabs(p.x - pos);
+	UpdatePos();
+	Refresh();
+}
+
+void TabScrollBar::LeftUp(Point p, dword keyflags)
+{
+	ReleaseCapture();
+	old_pos = p.x;
+}
+
+void TabScrollBar::MouseMove(Point p, dword keyflags)
+{
+	if(!HasCapture())
+		return;
+
+	new_pos = p.x;
+	UpdatePos();
+	Refresh();
+}
+
+void TabScrollBar::MouseWheel(Point p, int zdelta, dword keyflags)
+{
+	AddPos(-zdelta / 4, true);
+}
+
+int TabScrollBar::GetPos() const
+{
+	return ffloor(ps);
+}
+
+void TabScrollBar::SetPos(int p, bool dontscale)
+{
+	pos = total > 0 ? dontscale ? p : iscale(p, sz.cx, total) : 0;
+	UpdatePos(false);
+	Refresh();
+}
+
+void TabScrollBar::AddPos(int p, bool dontscale)
+{
+	pos += total > 0 ? dontscale ? p : iscale(p, sz.cx, total) : 0;
+	UpdatePos(false);
+	Refresh();
+}
+
+int TabScrollBar::GetTotal() const
+{
+	return total;
+}
+
+void TabScrollBar::SetTotal(int t)
+{
+	bool upd = total < t;
+	total = t;
+	UpdatePos(upd);
+	Refresh();
+}
+
+void TabScrollBar::AddTotal(int t)
+{
+	total += t;
+	UpdatePos();
+	Refresh();
+}
+
+void TabScrollBar::GoEnd()
+{
+	pos = total;
+	UpdatePos(false);
+	Refresh();
+}
+
+void TabScrollBar::GoBegin()
+{
+	pos = 0;
+	UpdatePos(false);
+	Refresh();
+}
+
+void TabScrollBar::Set(const TabScrollBar& t)
+{
+	total = t.total;
+	pos = t.pos;
+	ps = t.ps;
+	Refresh();
+}
+
+QuickTabs::QuickTabs()
+{
+	AddFrame(sc.Height(QT_SBHEIGHT));
+	sc.WhenScroll = THISBACK(Scroll);
+	highlight = -1;
+	active = -1;
+	cross = -1;
+	target = -1;
+	crosses = true;
+	file_icons = false;
+	grouping = true;
+	isctrl = false;
+	isdrag = false;
+	id = -1;
+
+	Group &g = groups.Add();
+	g.name = "All";
+	group = 0;
+
+	SetStyle(TabCtrl::StyleDefault());
+	BackPaint();
+}
+
+void QuickTabs::CloseAll()
+{
+	for(int i = tabs.GetCount() - 1; i >= 0; i--)
+		if(i != active)
+			tabs.Remove(i);
+
+	sc.SetTotal(tabs[0].cx);
+	MakeGroups();
+	Repos();
+	SetCursor(0);
+}
+
+int QuickTabs::GetNextId()
+{
+	return ++id;
+}
+
+void QuickTabs::Menu(Bar& bar)
+{
+	bar.Add(tabs.GetCount() > 1, "Close", THISBACK1(Close, highlight));
+	bar.Separator();
+	int cnt = groups.GetCount();
+	for(int i = 0; i < cnt; i++)
+	{
+		String name = Format("%s (%d)", groups[i].name, groups[i].count);
+		Bar::Item &it = i > 0 ? bar.Add(name, THISBACK1(GroupMenu, i))
+		                      : bar.Add(name, THISBACK1(DoGrouping, i));
+		if(i == group)
+			it.Image(Img::CHK);
+		if(i == 0 && cnt > 1)
+			bar.Separator();
+	}
+	bar.Separator();
+
+	bar.Add("Close all tabs except current", THISBACK(CloseAll));
+	bar.Add("Close non-project tabs", WhenCloseRest);
+}
+
+void QuickTabs::GroupMenu(Bar &bar, int n)
+{
+	bar.Add("Set active", THISBACK1(DoGrouping, n));
+	bar.Add("Close", THISBACK1(DoCloseGroup, n));
+}
+
+bool Tab::HasMouse(const Point& p)
+{
+	return visible && p.x >= x && p.x < x + cx;
+}
+
+bool Tab::HasMouseCross(const Point& p, int h)
+{
+	if(!visible)
+		return false;
+
+	Size isz = Img::CR0().GetSize();
+	int iy = (h - isz.cy) / 2;
+	int ix = x + cx - isz.cx - QT_MARGIN;
+
+	return p.x >= ix && p.x < ix + isz.cx &&
+	       p.y >= iy && p.y < iy + isz.cy;
+}
+
+
+int QuickTabs::FindGroup(const String& g)
+{
+	for(int i = 0; i < groups.GetCount(); i++)
+		if(groups[i].path == g)
+			return i;
+	return -1;
+}
+
+void QuickTabs::MakeGroups()
+{
+	groups[0].count = tabs.GetCount();
+	groups[0].first = 0;
+	groups[0].last = tabs.GetCount() - 1;
+
+	for(int i = 1; i < groups.GetCount(); i++)
+	{
+		groups[i].count = 0;
+		groups[i].first = 1000000;
+		groups[i].last = 0;
+	}
+
+	for(int i = 0; i < tabs.GetCount(); i++)
+	{
+		Tab &tab = tabs[i];
+		String s = ParseGroup(tab.group);
+		if(IsNull(s))
+			continue;
+		int n = FindGroup(tab.group);
+		if(n < 0)
+		{
+			Group &g = groups.Add();
+			g.count = 1;
+			g.first = 1000000;
+			g.last = 0;
+			g.name = s;
+			g.path = tab.group;
+			g.active = tab.id;
+			n = groups.GetCount() - 1;
+		}
+		else
+		{
+			groups[n].count++;
+			groups[n].last = i;
+		}
+
+		if(i < groups[n].first)
+			groups[n].first = i;
+		if(i > groups[n].last)
+			groups[n].last = i;
+	}
+
+
+	int removed = 0;
+	for(int i = 1; i < groups.GetCount(); i++)
+		if(groups[i].count == 0)
+		{
+			groups.Remove(i - removed);
+			removed++;
+		}
+	if(group > groups.GetCount() - 1 && group > 0)
+		group--;
+
+}
+
+void QuickTabs::DoGrouping(int n)
+{
+	group = n;
+	Repos();
+	SetCursor(-1);
+}
+
+void QuickTabs::DoCloseGroup(int n)
+{
+	int cnt = groups.GetCount();
+	if(cnt <= 0)
+		return;
+
+	if(cnt == n)
+		--group;
+
+	String group = groups[n].path;
+
+	for(int i = tabs.GetCount() - 1; i >= 0; i--)
+	{
+		String s = ParseGroup(tabs[i].group);
+		if(IsNull(s))
+			continue;
+		if(group == tabs[i].group && tabs.GetCount() > 1)
+			tabs.Remove(i);
+	}
+	if(cnt > 1)
+		groups.Remove(n);
+	MakeGroups();
+	Repos();
+	SetCursor(-1);
+}
+
+void QuickTabs::DrawTab(Draw &w, int i)
+{
+	Size sz = GetSize();
+
+	Size isz = Img::CR0().GetSize();
+	int cnt = tabs.GetCount();
+
+	Tab &t = tabs[i];
+
+	int lx = i > 0 ? style->extendleft : 0;
+
+	int x = t.x - sc.GetPos() + style->margin - lx;
+
+	bool ac = i == active;
+	bool hl = i == highlight;
+
+	int ndx = !IsEnabled() ? CTRL_DISABLED :
+		       ac ? CTRL_PRESSED :
+		       hl ? CTRL_HOT : CTRL_NORMAL;
+
+	const Value& sv = (cnt == 1 ? style->both : i == 0 ? style->first : i == cnt - 1 ? style->last : style->normal)[ndx];
+
+	if(ac)
+		ChPaint(w, x - style->sel.left,
+		           0,
+		           t.cx + style->sel.right + style->sel.left + lx,
+		           t.cy + style->sel.bottom,
+		           sv);
+	else
+		ChPaint(w, x,
+		           style->sel.top,
+		           t.cx + lx,
+		           t.cy - style->sel.top,
+		           sv);
+
+	int h = sz.cy + (ac ? 0 : style->sel.top);
+
+	if(crosses && tabs.GetCount() > 1)
+		w.DrawImage(x + t.cx - isz.cx - QT_MARGIN,
+		            (h - isz.cy) / 2,
+		            (ac || hl) ? (cross == i ? Img::CR2 : ac ? Img::CR1 : Img::CR0) : Img::CR0);
+
+	if(file_icons)
+	{
+		//Image icon = Img::ARH;
+		Image icon = IdeFileImage(t.name);
+		w.DrawImage(x + QT_MARGIN, (h - icon.GetSize().cx) / 2, icon);
+	}
+
+	String fn = GetFileName(t.name);
+	int ty = (h - t.tsz.cy) / 2 + 1;
+	DrawFileName(w, x + QT_MARGIN + (QT_FILEICON + QT_SPACEICON) * int(file_icons), ty,
+	             t.tsz.cx, t.tsz.cy, fn.ToWString(),
+	             false, StdFont(), Black, LtBlue, Null, Null, false);
+
+}
+
+void QuickTabs::Paint(Draw &w)
+{
+	Size sz = GetSize();
+	w.DrawRect(sz, SColorFace());
+	w.DrawRect(0, sz.cy - 1, sz.cx, 1, Color(128, 128, 128));
+
+	for(int i = 0; i < tabs.GetCount(); i++)
+		if(tabs[i].visible && i != active)
+			DrawTab(w, i);
+
+	if(active >= 0)
+		DrawTab(w, active);
+
+
+	if(target >= 0)
+	{
+		int last = GetLast();
+		int first = GetFirst();
+
+		if(target != active && target != active + 1)
+		{
+			int x = (target == last + 1 ? tabs[last].Right() : tabs[target].x)
+			        - sc.GetPos() - (target <= first ? 1 : 2)
+			        + style->margin - (target > 0 ? style->extendleft : 0);
+
+			int y = style->sel.top;
+			int cy = sz.cy - y;
+			Color c(255, 0, 0);
+			w.DrawRect(x + 1, y, 2, cy, c);
+			w.DrawRect(x, y, 4, 1, c);
+			w.DrawRect(x, y + cy - 1, 4, 1, c);
+		}
+	}
+}
+
+void QuickTabs::Scroll()
+{
+	Refresh();
+}
+
+int QuickTabs::GetWidth(int n)
+{
+	Tab &t = tabs[n];
+	t.tsz = GetTextSize(GetFileName(t.name), StdFont());
+	return QT_MARGIN * 2 + t.tsz.cx + (QT_SPACE + Img::CR0().GetSize().cx) * crosses
+	                                + (QT_FILEICON + QT_SPACEICON) * file_icons;
+}
+
+void QuickTabs::Add(const char *name, bool make_active)
+{
+	Tab &t = tabs.Add();
+
+//	int cnt = tabs.GetCount() - 1; Mirek: unused
+	t.name = name;
+	t.group = GetFileFolder(name);
+	t.id = GetNextId();
+	MakeGroups();
+	Repos();
+	SetCursor(tabs.GetCount() - 1);
+}
+
+int QuickTabs::GetWidth()
+{
+//	int j = GetLast(); Mirek: unused
+	return tabs[GetLast()].Right() + style->margin * 2;
+}
+
+int QuickTabs::GetHeight()
+{
+	return style->tabheight + style->sel.top /*+ style->sel.bottom */ + QT_SBHEIGHT + QT_SBSEPARATOR;
+}
+
+void QuickTabs::Repos()
+{
+	if(!tabs.GetCount())
+		return;
+
+	String g = GetGroupName();
+
+	int j = 0;
+	bool first = true;
+	for(int i = 0; i < tabs.GetCount(); i++)
+	{
+		bool v = IsNull(g) ? true : g == tabs[i].group;
+		if(v)
+		{
+			tabs[i].x = first ? 0 : tabs[j].Right();
+			j = i;
+			first = false;
+		}
+		else
+			tabs[i].x = 0;
+
+		tabs[i].visible = v;
+		tabs[i].y = 0;
+		tabs[i].cx = GetWidth(i);
+		tabs[i].cy = style->tabheight + style->sel.top;
+	}
+	sc.SetTotal(GetWidth());
+}
+
+int QuickTabs::Find(int id)
+{
+	for(int i = 0; i < tabs.GetCount(); i++)
+		if(tabs[i].id == id)
+			return i;
+	return -1;
+}
+
+int QuickTabs::GetNext(int n)
+{
+	for(int i = n + 1; i < tabs.GetCount(); i++)
+		if(tabs[i].visible)
+			return i;
+	return -1;
+}
+
+int QuickTabs::GetPrev(int n)
+{
+	for(int i = n - 1; i >= 0; i--)
+		if(tabs[i].visible)
+			return i;
+	return -1;
+}
+
+void QuickTabs::Clear()
+{
+	tabs.Clear();
+	Refresh();
+}
+
+QuickTabs& QuickTabs::FileIcons(bool b)
+{
+	file_icons = b;
+	Repos();
+	return *this;
+}
+
+QuickTabs& QuickTabs::Crosses(bool b)
+{
+	crosses = b;
+	Repos();
+	return *this;
+}
+
+QuickTabs& QuickTabs::Grouping(bool b)
+{
+	grouping = b;
+	return *this;
+}
+
+void QuickTabs::LeftDown(Point p, dword keyflags)
+{
+	if(keyflags & K_SHIFT)
+	{
+		highlight = -1;
+		Refresh();
+		SetCapture();
+		oldp = p;
+		return;
+	}
+
+	isctrl = keyflags & K_CTRL;
+	if(isctrl)
+		return;
+
+	if(cross != -1)
+		Close(cross);
+	else if(highlight >= 0)
+		SetCursor(highlight);
+}
+
+void QuickTabs::LeftUp(Point p, dword keyflags)
+{
+	ReleaseCapture();
+}
+
+void QuickTabs::RightDown(Point p, dword keyflags)
+{
+	MenuBar::Execute(THISBACK(Menu), GetMousePos());
+}
+
+void QuickTabs::MiddleDown(Point p, dword keyflags)
+{
+	Close(highlight);
+}
+
+void QuickTabs::MiddleUp(Point p, dword keyflags)
+{
+}
+
+int QuickTabs::GetTargetTab(Point p)
+{
+	p.x += sc.GetPos();
+
+	int f = GetFirst();
+	int l = GetLast();
+
+	if(tabs[f].visible && p.x < tabs[f].x + tabs[f].cx / 2)
+		return f;
+
+	for(int i = l; i >= f; i--)
+		if(tabs[i].visible && p.x >= tabs[i].x + tabs[i].cx / 2)
+			return i == l ? i + 1 : GetNext(i);
+	return -1;
+}
+
+void QuickTabs::MouseWheel(Point p, int zdelta, dword keyflags)
+{
+	sc.AddPos(-zdelta / 4, true);
+	MouseMove(p, 0);
+}
+
+void QuickTabs::MouseMove(Point p, dword keyflags)
+{
+	if(HasCapture())
+	{
+		sc.AddPos(p.x - oldp.x, true);
+		oldp = p;
+		return;
+	}
+
+	p.x += sc.GetPos() - style->margin;
+	Size sz = GetSize();
+
+	int h = highlight;
+	bool iscross = false;
+	bool istab = false;
+	for(int i = 0; i < tabs.GetCount(); i++)
+	{
+		Point np(p.x + (i > 0 ? style->extendleft : 0), p.y);
+		if(tabs[i].HasMouse(np))
+		{
+			istab = true;
+			int h = sz.cy + (active == i ? 0 : style->sel.top);
+			iscross = crosses ? tabs[i].HasMouseCross(np, h) : false;
+			if(highlight != i || (iscross && cross != i))
+			{
+				cross = iscross ? i : -1;
+				highlight = i;
+				Refresh();
+				return;
+			}
+		}
+	}
+
+	if(!istab && h >= 0)
+	{
+		highlight = -1;
+		Refresh();
+	}
+
+	if(!iscross && cross >= 0)
+	{
+		cross = -1;
+		Refresh();
+	}
+}
+
+void QuickTabs::MouseLeave()
+{
+	if(isdrag)
+		return;
+
+	highlight = -1;
+	cross = -1;
+	Refresh();
+}
+
+void QuickTabs::FrameLayout(Rect &r)
+{
+	LayoutFrameTop(r, this, GetHeight());
+	r.top += 2;
+	r.left += 2;
+	r.right -= 2;
+	r.bottom -= 2;
+}
+
+void QuickTabs::FrameAddSize(Size& sz)
+{
+	sz += 4;
+	sz.cy += GetHeight();
+}
+
+void QuickTabs::FramePaint(Draw& w, const Rect& rr)
+{
+	Rect r = rr;
+	r.top += GetHeight();
+	ViewFrame().FramePaint(w, r);
+}
+
+void QuickTabs::DragAndDrop(Point p, PasteClip& d)
+{
+	int c = GetTargetTab(p);
+	int tab = isctrl ? highlight : active;
+
+	bool sametab = c == tab || c == tab + 1;
+	bool internal = AcceptInternal<QuickTabs>(d, "tabs");
+
+	if(!sametab && d.IsAccepted())
+	{
+		if(internal)
+		{
+			int id = tabs[active].id;
+			Tab t = tabs[tab];
+			tabs.Insert(c, t);
+			tabs.Remove(tab + int(c < tab));
+			active = Find(id);
+			isdrag = false;
+			MakeGroups();
+			Repos();
+			return;
+		}
+		else if(d.IsPaste())
+		{
+			CancelMode();
+			return;
+		}
+	}
+	else
+	{
+		//d.Reject();
+		//unfortunately after Reject DragLeave stops working until d is accepted
+	}
+
+	if(c != target)
+	{
+		target = c;
+		Refresh();
+	}
+}
+
+void QuickTabs::CancelMode()
+{
+	isdrag = false;
+	target = -1;
+	Refresh();
+}
+
+void QuickTabs::LeftDrag(Point p, dword keyflags)
+{
+	if(keyflags & K_SHIFT)
+		return;
+	if(highlight < 0)
+		return;
+
+	isdrag = true;
+	DoDragAndDrop(InternalClip(*this, "tabs"));
+}
+
+void QuickTabs::DragEnter()
+{
+}
+
+void QuickTabs::DragLeave()
+{
+	target = -1;
+	Refresh();
+}
+
+void QuickTabs::DragRepeat(Point p)
+{
+	if(target >= 0)
+	{
+		int dx = GetDragScroll(this, p, 16).x;
+		if(dx != 0)
+			sc.AddPos(dx);
+	}
+}
+
+void QuickTabs::SetCursor(int n)
+{
+	if(tabs.GetCount() == 0)
+		return;
+
+	if(n < 0)
+	{
+		n = max(0, Find(GetActiveGroup()));
+		active = -1;
+	}
+
+	bool is_all = IsGroupAll();
+	bool same_group = tabs[n].group == GetGroupName();
+
+	if((same_group || is_all) && active == n)
+		return;
+
+	active = n;
+
+	if(!is_all && !same_group)
+	{
+		SetGroup(tabs[n].group);
+		Repos();
+	}
+
+	SetActiveGroup(tabs[n].id);
+
+	int cx = tabs[n].x - sc.GetPos();
+	if(cx < 0)
+		sc.AddPos(cx - 10);
+	else
+	{
+		cx = tabs[n].x + tabs[n].cx - GetSize().cx - sc.GetPos();
+		if(cx > 0)
+			sc.AddPos(cx + 10);
+	}
+	if(HasMouse())
+		MouseMove(GetMouseViewPos(), 0);
+
+	UpdateActionRefresh();
+}
+
+void QuickTabs::Close(int n)
+{
+	if(tabs.GetCount() <= 1)
+		return;
+
+	if(n == active)
+	{
+		int c = Find(tabs[n].id);
+		int nc = GetNext(c);
+		if(nc < 0)
+			nc = max(0, GetPrev(c));
+
+		SetActiveGroup(tabs[nc].id);
+	}
+	sc.AddTotal(-tabs[n].cx);
+	tabs.Remove(n);
+	MakeGroups();
+	Repos();
+	SetCursor(-1);
+}
+
+bool QuickTabs::FindSetFile(const String& fn)
+{
+	for(int i = 0; i < tabs.GetCount(); i++)
+		if(tabs[i].name == fn) {
+			SetCursor(i);
+			return true;
+		}
+	return false;
+}
+
+void QuickTabs::SetAddFile(const String& fn)
+{
+	if(IsNull(fn))
+		return;
+	if(FindSetFile(fn))
+		return;
+	Add(fn, true);
+	Refresh();
+}
+
+void QuickTabs::RenameFile(const String& fn, const String& nn)
+{
+	for(int i = 0; i < tabs.GetCount(); i++)
+		if(tabs[i].name == fn)
+		{
+			tabs[i].name = nn;
+			tabs[i].group = GetFileFolder(nn);
+		}
+	Repos();
+}
+
+void QuickTabs::Set(const QuickTabs& t)
+{
+	active = t.active;
+	file_icons = t.file_icons;
+	crosses = t.crosses;
+	grouping = t.grouping;
+
+	cross = -1;
+	highlight = -1;
+	target = -1;
+
+	tabs.SetCount(t.GetCount());
+	for(int i = 0; i < t.GetCount(); i++)
+	{
+		tabs[i].name = t.tabs[i].name;
+		tabs[i].group = t.tabs[i].group;
+	}
+	MakeGroups();
+	SetGroup(t.GetGroup());
+	Repos();
+	sc.Set(t.sc);
+}
diff --git a/uppsrc/ide/QuickTabs/QuickTabs.h b/uppsrc/ide/QuickTabs/QuickTabs.h
new file mode 100644
index 000000000..61d938b5e
--- /dev/null
+++ b/uppsrc/ide/QuickTabs/QuickTabs.h
@@ -0,0 +1,197 @@
+#ifndef _QuickTabs_QuickTabs_h
+#define _QuickTabs_QuickTabs_h
+
+#include <CtrlLib/CtrlLib.h>
+
+using namespace Upp;
+
+#define IMAGECLASS Img
+#define IMAGEFILE <ide/QuickTabs/QuickTabs.iml>
+#include <Draw/iml_header.h>
+
+enum
+{
+	QT_MARGIN = 6,
+	QT_SPACE = 10,
+	QT_SBHEIGHT = 4,
+	QT_SBSEPARATOR = 1,
+	QT_FILEICON = 16,
+	QT_SPACEICON = 5
+};
+
+class TabScrollBar : public Ctrl
+{
+	private:
+		int total;
+		double pos, ps;
+		int new_pos;
+		int old_pos;
+		double start_pos;
+		double size;
+		double cs, ics;
+		void UpdatePos(bool update = true);
+		bool ready;
+		Size sz;
+
+	public:
+		TabScrollBar();
+
+		virtual void Paint(Draw &w);
+		virtual void LeftDown(Point p, dword keyflags);
+		virtual void LeftUp(Point p, dword keyflags);
+		virtual void MouseMove(Point p, dword keyflags);
+		virtual void MouseWheel(Point p, int zdelta, dword keyflags);
+		virtual void Layout();
+
+		int  GetPos() const;
+		void SetPos(int p, bool dontscale = false);
+		void AddPos(int p, bool dontscale = false);
+		int  GetTotal() const;
+		void AddTotal(int t);
+		void SetTotal(int t);
+		void GoEnd();
+		void GoBegin();
+		void Set(const TabScrollBar& t);
+		Callback WhenScroll;
+};
+
+struct Tab : Moveable<Tab>
+{
+	String name;
+	String group;
+	bool visible;
+	int x, cx;
+	int y, cy;
+	int id;
+	Size tsz;
+	Tab() : visible(true), id(-1)
+	{}
+	int Right() { return x + cx; }
+	bool HasMouse(const Point& p);
+	bool HasMouseCross(const Point& p, int h);
+};
+
+struct Group : Moveable<Group>
+{
+	Group()	{}
+	String name;
+	String path;
+	int active;
+	int count;
+	int first;
+	int last;
+};
+
+class QuickTabs : public FrameCtrl<Ctrl>
+{
+	public:
+
+	private:
+
+		int id;
+		FrameBottom<TabScrollBar> sc;
+		void Scroll();
+
+		Vector<Group> groups;
+		Vector<Tab> tabs;
+		int highlight;
+		int active;
+		int target;
+		int cross;
+		bool crosses;
+		bool file_icons;
+		bool isctrl;
+		bool isdrag;
+		bool grouping;
+		Point mouse, oldp;
+		int group;
+
+		const TabCtrl::Style *style;
+
+		virtual void Paint(Draw &w);
+		virtual void LeftDown(Point p, dword keysflags);
+		virtual void LeftUp(Point p, dword keysflags);
+		virtual void RightDown(Point p, dword keyflags);
+		virtual void MiddleDown(Point p, dword keyflags);
+		virtual void MiddleUp(Point p, dword keyflags);
+		virtual void MouseMove(Point p, dword keysflags);
+		virtual void MouseLeave();
+		virtual void FrameLayout(Rect &r);
+		virtual void FrameAddSize(Size& sz);
+		virtual void FramePaint(Draw& w, const Rect& r);
+		virtual void DragAndDrop(Point p, PasteClip& d);
+		virtual void LeftDrag(Point p, dword keyflags);
+		virtual void DragEnter();
+		virtual void DragLeave();
+		virtual void DragRepeat(Point p);
+		virtual void CancelMode();
+		virtual void MouseWheel(Point p, int zdelta, dword keyflags);
+
+		void DrawTab(Draw &w, int i);
+		void Repos();
+		int  Find(int id);
+		int  GetNext(int n);
+		int  GetPrev(int n);
+
+		int GetWidth(int n);
+		int GetTargetTab(Point p);
+
+		int GetWidth();
+		int GetHeight();
+
+		void Menu(Bar& bar);
+		void GroupMenu(Bar &bar, int n);
+
+		void CloseAll();
+
+		void MakeGroups();
+		int  FindGroup(const String& g);
+
+		void DoGrouping(int n);
+		void DoCloseGroup(int n);
+
+		String GetGroupName() const      { return group == 0 ? Null : groups[group].path; }
+		int  SetGroup(const String &s)   { group = max(0, FindGroup(s)); return group; }
+		int  SetGroup(int c)             { group = c; return group; }
+		int  GetGroup() const            { return group;                }
+		void SetActiveGroup(int id)      { groups[group].active = id;   }
+		int  GetActiveGroup() const      { return groups[group].active; }
+		int  GetFirst() const            { return groups[group].first;  }
+		int  GetLast() const             { return groups[group].last;   }
+		bool IsGroupAll() const          { return group == 0;           }
+
+	public:
+		Callback WhenCloseRest;
+
+		QuickTabs();
+
+		void Add(const char *name, bool make_active = false);
+		void Close(int n);
+		void Clear();
+
+		QuickTabs& FileIcons(bool b = true);
+		QuickTabs& Crosses(bool b = true);
+		QuickTabs& Grouping(bool b = true);
+
+		typedef QuickTabs CLASSNAME;
+
+		int    GetCount() const { return tabs.GetCount(); }
+		int    GetCursor() const { return active; }
+		String GetFile(int n) const { return tabs[n].name; }
+		bool   FindSetFile(const String& fn);
+		void   SetAddFile(const String& fn);
+		void   RenameFile(const String& fn, const String& nn);
+		void   Set(const QuickTabs& t);
+
+		QuickTabs& SetStyle(const TabCtrl::Style& s)  { style = &s; Refresh(); return *this; }
+		static const TabCtrl::Style& StyleDefault();
+
+		int    GetNextId();
+
+		const Vector<Tab>& GetTabs() { return tabs; }
+		int GetPos() { return sc.GetPos(); }
+
+		void SetCursor(int n);
+};
+
+#endif
diff --git a/uppsrc/ide/QuickTabs/QuickTabs.iml b/uppsrc/ide/QuickTabs/QuickTabs.iml
new file mode 100644
index 000000000..b858ca254
--- /dev/null
+++ b/uppsrc/ide/QuickTabs/QuickTabs.iml
@@ -0,0 +1,101 @@
+PREMULTIPLIED
+IMAGE_ID(BA)
+IMAGE_ID(BH)
+IMAGE_ID(BN)
+IMAGE_ID(LA)
+IMAGE_ID(LH)
+IMAGE_ID(RA)
+IMAGE_ID(RH)
+IMAGE_ID(RN)
+IMAGE_ID(DND)
+IMAGE_ID(LN)
+IMAGE_ID(CR0)
+IMAGE_ID(CR1)
+IMAGE_ID(CR2)
+IMAGE_ID(UD)
+IMAGE_ID(UD2)
+IMAGE_ID(CHK)
+IMAGE_ID(AD)
+IMAGE_ID(AR)
+IMAGE_ID(ARH)
+
+IMAGE_BEGIN_DATA
+IMAGE_DATA(120,156,237,154,9,108,84,215,21,134,71,74,147,32,148,86,81,33,138,186,168,161,85,81,165,86,170,26,85,170,18,213)
+IMAGE_DATA(144,218,98,80,12,178,193,1,146,154,136,69,74,28,182,0,45,78,41,78,33,114,98,21,146,180,180,13,9,105,138,205)
+IMAGE_DATA(226,221,216,120,55,54,222,247,109,12,6,19,140,61,227,241,224,89,188,239,118,241,70,212,191,231,92,124,135,251,134,177)
+IMAGE_DATA(141,52,173,70,145,252,208,167,119,255,119,207,121,239,190,247,223,227,123,109,161,123,90,247,93,157,60,190,159,92,7,79)
+IMAGE_DATA(24,27,27,243,136,153,153,25,143,152,158,158,254,90,51,53,53,229,17,147,147,147,94,101,98,98,194,171,12,15,15,123)
+IMAGE_DATA(68,79,79,143,87,233,237,237,245,42,222,30,127,127,127,191,87,25,24,24,240,136,193,193,65,143,24,26,26,242,8,79)
+IMAGE_DATA(231,191,183,209,169,139,81,84,84,20,60,97,113,49,90,92,140,22,23,163,197,197,104,113,49,90,92,140,60,94,140,202)
+IMAGE_DATA(202,202,224,9,163,163,163,30,97,183,219,61,194,102,179,121,21,171,213,250,181,198,219,223,207,83,44,22,139,71,24,141)
+IMAGE_DATA(70,143,48,153,76,30,209,214,214,230,17,102,179,217,35,218,219,219,189,202,157,59,119,60,194,219,243,223,225,112,120,68)
+IMAGE_DATA(103,103,167,71,120,123,49,9,15,15,247,8,221,55,148,197,200,245,207,117,178,221,210,210,34,86,110,110,183,82,123,124)
+IMAGE_DATA(124,92,236,228,89,115,155,119,229,188,51,149,127,170,187,123,247,174,56,75,205,49,140,140,231,133,71,246,75,205,72,61)
+IMAGE_DATA(50,50,34,144,154,95,212,85,51,82,247,245,245,9,164,230,137,193,139,147,170,153,185,250,229,98,166,106,158,28,82,115)
+IMAGE_DATA(91,237,151,19,71,106,110,119,117,117,57,53,183,93,117,119,119,183,83,203,157,164,170,121,103,200,90,53,215,85,187,53)
+IMAGE_DATA(75,254,90,202,237,164,164,36,167,89,201,201,201,26,179,162,163,163,53,102,197,198,196,104,204,138,139,139,213,152,21,31)
+IMAGE_DATA(31,167,49,43,41,49,81,99,22,223,95,53,235,82,74,138,198,172,212,75,151,52,102,165,165,165,106,204,74,79,79,215)
+IMAGE_DATA(152,145,153,145,161,49,43,39,59,91,211,159,147,147,163,49,43,247,114,174,198,172,188,188,60,141,89,249,249,249,26,179)
+IMAGE_DATA(164,150,102,21,20,20,104,204,42,44,44,212,152,85,82,82,162,49,171,112,54,94,154,197,90,53,199,85,107,204,82,43)
+IMAGE_DATA(138,15,54,136,141,146,215,216,32,190,121,235,236,53,54,136,141,146,85,227,90,85,210,36,181,202,216,20,25,47,77,146)
+IMAGE_DATA(90,154,164,106,30,164,212,114,208,82,75,147,164,150,91,61,169,165,73,115,245,75,147,164,150,166,168,253,124,77,106,54)
+IMAGE_DATA(69,213,108,2,95,83,53,35,53,27,164,106,105,146,212,242,247,60,215,247,115,87,85,194,3,213,172,200,200,72,49,219)
+IMAGE_DATA(93,205,226,234,114,53,139,171,64,53,139,171,76,53,139,171,76,53,75,86,153,52,135,171,76,53,139,159,171,154,197,247)
+IMAGE_DATA(87,205,226,42,83,205,226,42,83,205,226,42,83,205,224,42,83,205,226,42,83,251,185,202,84,179,184,202,84,179,184,202)
+IMAGE_DATA(84,179,184,202,84,179,184,170,84,179,164,150,230,112,149,169,102,113,149,169,102,113,149,169,102,45,84,85,172,53,102,149)
+IMAGE_DATA(150,150,162,170,170,202,105,22,255,134,200,27,203,242,242,114,113,173,163,163,67,124,112,190,86,83,83,227,252,24,124,173)
+IMAGE_DATA(130,98,84,93,89,89,233,220,152,184,211,85,85,90,93,77,207,85,243,107,170,171,181,186,198,85,215,56,55,190,172,107)
+IMAGE_DATA(73,203,141,172,208,181,181,206,141,41,235,58,210,114,163,201,186,190,190,222,185,113,148,90,110,228,220,105,131,193,224,220)
+IMAGE_DATA(168,177,110,104,104,208,140,191,193,208,160,25,31,107,185,49,146,241,143,162,165,57,172,231,221,96,212,252,84,7,21,245)
+IMAGE_DATA(154,107,204,162,254,255,235,135,252,112,183,193,224,234,226,42,227,54,87,21,207,94,174,50,57,155,121,38,112,149,113,53)
+IMAGE_DATA(113,91,206,40,174,30,119,90,206,64,174,38,85,115,53,169,154,171,73,205,231,106,210,234,26,141,174,157,213,178,194,184)
+IMAGE_DATA(154,88,203,10,171,155,213,178,194,184,90,88,203,10,147,90,86,152,212,178,162,184,154,84,205,179,157,181,172,48,174,30)
+IMAGE_DATA(117,252,82,203,241,201,120,89,65,143,162,101,101,177,126,168,178,190,69,255,228,113,96,255,190,240,211,159,158,202,46,43)
+IMAGE_DATA(45,70,81,97,254,188,148,22,23,130,99,101,78,69,121,41,140,173,183,97,105,111,67,187,217,228,22,238,107,51,181,130)
+IMAGE_DATA(99,239,63,167,8,55,174,95,197,205,166,70,52,221,184,54,47,50,166,184,40,95,192,121,215,27,27,4,215,174,214,139)
+IMAGE_DATA(190,198,107,6,231,53,21,142,173,40,47,209,228,113,108,199,29,51,186,187,236,206,220,78,135,85,192,49,146,242,178,98)
+IMAGE_DATA(228,230,102,227,26,245,95,165,231,52,54,242,143,43,43,173,69,118,113,182,90,45,162,205,24,12,181,180,100,148,208,71)
+IMAGE_DATA(175,67,17,61,43,61,53,5,13,245,181,168,175,173,70,93,77,149,56,219,58,44,112,216,58,156,240,119,204,201,202,64)
+IMAGE_DATA(222,229,108,65,86,70,26,82,146,19,81,95,87,77,147,177,82,80,83,93,65,223,207,8,27,61,139,225,113,23,22,228)
+IMAGE_DATA(33,255,202,101,113,46,42,188,130,244,180,20,36,196,199,136,248,234,170,114,145,211,102,106,161,111,110,18,200,54,223,71)
+IMAGE_DATA(126,139,210,146,66,90,251,47,210,254,226,188,136,175,170,44,19,125,95,222,188,46,226,249,190,57,217,25,228,107,179,128)
+IMAGE_DATA(253,226,28,62,243,24,99,163,207,163,170,162,12,149,228,103,97,126,158,120,95,62,243,123,240,57,55,39,11,217,153,233)
+IMAGE_DATA(40,42,184,130,178,146,34,148,211,188,186,148,156,68,251,147,56,241,252,146,226,2,228,209,183,189,156,147,73,123,132,44)
+IMAGE_DATA(241,62,252,76,190,206,253,242,121,236,65,124,92,180,152,51,23,147,226,133,86,199,194,154,199,93,89,81,170,33,51,35)
+IMAGE_DATA(85,51,71,147,18,226,196,251,186,35,45,53,89,144,152,16,235,204,209,20,7,31,135,223,124,35,220,248,198,46,52,7)
+IMAGE_DATA(4,205,75,203,235,59,192,177,50,199,180,119,63,134,170,232,39,65,51,173,193,183,140,238,161,190,17,195,117,152,246,188)
+IMAGE_DATA(45,114,91,67,118,163,43,54,21,221,201,57,232,74,202,186,79,66,230,131,118,226,44,212,238,190,152,77,231,108,220,222)
+IMAGE_DATA(178,21,183,54,110,65,103,108,6,28,103,47,10,108,255,140,163,184,76,216,35,19,97,143,74,130,227,92,178,64,180,57)
+IMAGE_DATA(38,58,21,173,187,247,163,121,227,102,202,75,167,62,202,249,34,14,255,182,88,113,111,106,146,238,155,73,58,22,83,35)
+IMAGE_DATA(163,2,199,5,202,191,144,2,71,76,26,140,33,251,80,19,184,65,104,123,100,60,28,241,105,152,158,156,192,189,123,51)
+IMAGE_DATA(152,161,243,228,192,128,104,51,150,127,197,192,188,255,61,56,62,143,70,227,91,123,144,229,191,14,157,103,226,97,59,125)
+IMAGE_DATA(30,29,167,206,162,57,58,14,83,180,225,157,161,141,177,164,226,248,95,209,232,19,0,211,170,87,97,246,217,140,226,117)
+IMAGE_DATA(65,136,209,175,69,215,39,95,192,118,242,83,226,20,172,39,78,98,136,54,142,147,19,147,130,49,250,73,119,123,107,8)
+IMAGE_DATA(236,171,233,125,244,193,232,37,178,253,3,113,202,207,15,221,20,107,139,248,16,182,63,127,132,62,171,13,125,253,131,24)
+IMAGE_DATA(24,28,70,119,103,23,250,169,221,223,221,139,129,144,80,140,232,183,96,204,63,24,201,47,175,67,196,106,31,116,135,29)
+IMAGE_DATA(131,237,112,24,44,161,71,208,220,216,4,27,197,23,28,141,64,238,107,219,97,233,176,194,76,88,66,14,98,84,255,42)
+IMAGE_DATA(198,41,239,220,26,61,194,95,242,65,239,190,3,176,147,159,183,131,118,34,89,31,136,156,176,247,112,211,103,131,24,91)
+IMAGE_DATA(238,142,93,72,217,246,22,28,126,65,24,245,255,237,253,60,189,30,31,109,8,128,37,104,27,108,65,59,112,99,85,48)
+IMAGE_DATA(12,47,6,163,241,215,91,232,27,4,163,211,55,24,131,126,175,162,151,24,165,247,26,33,198,253,183,226,184,175,175,152)
+IMAGE_DATA(51,159,173,245,69,255,230,32,244,236,13,68,231,129,64,244,254,46,16,131,135,2,49,26,26,136,187,127,8,192,132,228)
+IMAGE_DATA(157,13,72,219,164,215,204,209,15,252,245,136,90,175,199,153,245,107,112,38,96,13,34,233,124,54,208,15,231,2,238,115)
+IMAGE_DATA(129,218,199,95,242,117,230,60,84,28,159,135,30,74,168,255,225,10,148,235,116,243,82,253,204,51,224,88,153,99,120,106)
+IMAGE_DATA(57,122,18,50,48,84,209,128,161,82,131,123,168,175,63,35,31,134,165,203,68,110,221,138,21,48,135,70,160,253,216,223)
+IMAGE_DATA(208,254,238,95,238,115,228,227,7,237,176,89,184,125,244,36,157,79,162,114,233,82,84,208,243,205,161,39,96,220,115,84)
+IMAGE_DATA(208,178,227,29,138,251,24,173,33,97,84,4,127,130,113,239,49,129,104,83,191,233,247,17,168,91,178,28,149,50,143,250)
+IMAGE_DATA(90,118,254,17,227,77,45,248,207,244,140,184,127,203,206,195,152,25,26,22,152,14,132,195,116,240,125,152,14,29,135,225)
+IMAGE_DATA(177,101,72,165,188,118,186,135,113,87,24,204,71,78,224,43,154,212,124,112,238,116,79,31,228,113,243,205,195,184,241,236)
+IMAGE_DATA(11,104,223,17,138,252,199,159,198,223,41,207,178,231,93,24,119,30,66,203,182,253,168,166,201,39,115,229,145,244,242,70)
+IMAGE_DATA(20,80,220,117,162,137,56,79,28,38,58,94,15,129,113,211,118,24,95,217,134,86,255,77,24,180,118,80,1,126,37,24)
+IMAGE_DATA(31,30,69,173,110,9,218,249,254,68,39,241,15,98,43,97,243,127,5,70,191,117,48,174,13,64,151,137,86,198,190,65)
+IMAGE_DATA(244,209,59,217,172,118,244,80,187,199,209,133,222,37,43,49,76,177,227,196,251,132,47,97,127,254,5,152,126,246,60,190)
+IMAGE_DATA(92,249,115,84,23,151,195,68,241,81,191,242,195,103,212,119,171,213,132,38,162,121,233,115,24,35,125,151,56,72,248,240)
+IMAGE_DATA(179,159,253,1,204,203,190,131,58,106,127,64,124,242,139,23,197,252,224,177,157,214,125,19,17,186,167,68,91,205,91,191)
+IMAGE_DATA(124,25,110,209,217,68,148,16,185,132,252,6,252,62,253,179,239,196,57,195,179,121,107,9,158,51,219,233,220,67,56,190)
+IMAGE_DATA(77,177,223,163,184,231,40,254,71,20,251,99,29,166,126,162,195,180,100,165,14,31,206,230,200,57,186,154,230,206,94,186)
+IMAGE_DATA(182,139,216,77,236,33,222,38,14,204,142,235,16,161,87,114,104,15,252,152,179,48,104,196,112,199,170,95,234,86,51,178)
+IMAGE_DATA(29,240,27,93,160,72,120,156,210,23,74,86,81,227,212,138,116,213,226,120,146,254,61,194,241,112,226,131,235,112,211,15)
+IMAGE_DATA(55,184,139,159,43,110,161,251,207,61,174,39,117,79,204,17,59,239,224,23,26,236,255,102,112,115,29,79,60,236,194,66)
+IMAGE_DATA(95,124,174,235,11,57,241,168,241,11,143,199,117,208,234,31,35,93,175,187,235,83,255,55,238,92,215,213,190,133,226,221)
+IMAGE_DATA(221,223,245,218,127,1,218,41,220,130,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0)
+IMAGE_END_DATA(2496, 19)
diff --git a/uppsrc/ide/QuickTabs/QuickTabs.upp b/uppsrc/ide/QuickTabs/QuickTabs.upp
new file mode 100644
index 000000000..9aefa9412
--- /dev/null
+++ b/uppsrc/ide/QuickTabs/QuickTabs.upp
@@ -0,0 +1,11 @@
+uses
+	CtrlLib;
+
+file
+	QuickTabs.h,
+	QuickTabs.cpp,
+	QuickTabs.iml;
+
+mainconfig
+	"" = "GUI";
+
diff --git a/uppsrc/ide/QuickTabs/init b/uppsrc/ide/QuickTabs/init
new file mode 100644
index 000000000..af3fd7f82
--- /dev/null
+++ b/uppsrc/ide/QuickTabs/init
@@ -0,0 +1,4 @@
+#ifndef _ide_QuickTabs_icpp_init_stub
+#define _ide_QuickTabs_icpp_init_stub
+#include "CtrlLib/init"
+#endif
diff --git a/uppsrc/ide/SelectPkg.cpp b/uppsrc/ide/SelectPkg.cpp
new file mode 100644
index 000000000..ced398fc4
--- /dev/null
+++ b/uppsrc/ide/SelectPkg.cpp
@@ -0,0 +1,590 @@
+#include "ide.h"
+
+class BaseSetupDlg : public WithBaseSetupLayout<TopWindow>
+{
+public:
+	typedef BaseSetupDlg CLASSNAME;
+	BaseSetupDlg();
+
+	bool Run(String& vars);
+
+private:
+	void OnUpp();
+	void OnBrowseUpp();
+
+private:
+	FrameRight<Button> browse_upp;
+	SelectDirButton    browse_out;
+	SelectDirButton    browse_common;
+	bool               new_base;
+};
+
+bool BaseSetup(String& vars) { return BaseSetupDlg().Run(vars); }
+
+BaseSetupDlg::BaseSetupDlg()
+: browse_out("Output & intermediate files")
+, browse_common("Common files")
+{
+	CtrlLayoutOKCancel(*this, "Assembly setup");
+	browse_upp.SetImage(CtrlImg::right_arrow());
+	browse_upp <<= THISBACK(OnBrowseUpp);
+	upp.AddFrame(browse_upp);
+	upp <<= THISBACK(OnUpp);
+	browse_out.Attach(output);
+	browse_common.Attach(common);
+}
+
+bool BaseSetupDlg::Run(String& vars)
+{
+	upp <<= GetVar("UPP");
+	output <<= GetVar("OUTPUT");
+	common <<= GetVar("COMMON");
+	base <<= vars;
+	new_base = IsNull(vars);
+	while(TopWindow::Run() == IDOK)
+	{
+		String varname = ~base;
+		String varfile = VarFilePath(varname);
+		if(varname != vars)
+		{
+			if(FileExists(varfile) && !PromptOKCancel(NFormat("Overwrite existing base file [* \1%s\1]?", varfile)))
+				continue;
+			if(!SaveVars(varname))
+			{
+				Exclamation(NFormat("Error writing base file [* \1%s\1].", VarFilePath(varname)));
+				continue;
+			}
+		}
+		SetVar("UPP", ~upp);
+		SetVar("OUTPUT", ~output);
+		SetVar("COMMON", ~common);
+		Vector<String> paths = SplitDirs(upp.GetText().ToString());
+		for(int i = 0; i < paths.GetCount(); i++)
+			RealizeDirectory(paths[i]);
+		RealizeDirectory(output);
+		vars = varname;
+		return true;
+	}
+	return false;
+}
+
+void BaseSetupDlg::OnBrowseUpp()
+{
+	String s = ~upp;
+	int b, e;
+	if(upp.HasFocus())
+		upp.GetSelection(b, e);
+	else
+		e = s.GetLength();
+	b = e;
+	while(b > 0 && s[b - 1] != ';')
+		b--;
+	while(e < s.GetLength() && s[e] != ';')
+		e++;
+	FileSel fsel;
+	String pre = s.Left(b), post = s.Mid(e);
+	fsel.ActiveDir(s.Mid(b, e - b));
+	if(fsel.ExecuteSelectDir()) {
+		String newdir = ~fsel;
+		upp <<= pre + newdir + Nvl(post, ";");
+		upp.SetWantFocus();
+		OnUpp();
+	}
+}
+
+void BaseSetupDlg::OnUpp()
+{
+	if(new_base) {
+		String s = ~upp;
+		int f = s.Find(';');
+		if(f >= 0) s.Trim(f);
+		base <<= GetFileTitle(s);
+	}
+}
+
+inline bool PackageLess(String a, String b)
+{
+	int nc = CompareNoCase(a, b);
+	if(nc) return nc < 0;
+	return a < b;
+};
+
+
+struct SelectPackageDlg : public WithListLayout<TopWindow> {
+	virtual bool Key(dword key, int count);
+
+	typedef SelectPackageDlg CLASSNAME;
+
+	SelectPackageDlg(const char *title, bool selectvars, bool main);
+
+	String         Run(String startwith);
+
+	void           Serialize(Stream& s);
+
+	ArrayCtrl      base;
+	ParentCtrl     list;
+	FileList       clist;
+	ArrayCtrl      alist;
+
+	bool           selectvars;
+	bool           loading;
+	bool           finished;
+	String         selected;
+	int            update;
+
+	struct PkInfo {
+		String package;
+		String description;
+		String path;
+		String stxt;
+
+		bool operator<(const PkInfo& b) const { return PackageLess(package, b.package); }
+	};
+
+	Array<PkInfo> packages;
+
+	String         GetCurrentName();
+	int            GetCurrentIndex();
+	void           SyncBrief();
+
+	void           ToolBase(Bar& bar);
+
+	void           OnBaseAdd();
+	void           OnBaseEdit();
+	void           OnBaseRemove();
+
+	void           OnOK();
+
+	void           OnNew();
+	void           OnBase();
+	void           OnAll();
+
+	void           ListCursor();
+	void           ChangeDescription();
+
+	void           Load();
+	void           Load(String upp, String dir, int progress_pos, int progres_count, String& case_fixed);
+	void           SyncBase(String initvars);
+	void           SyncList();
+	static bool    Pless(const SelectPackageDlg::PkInfo& a, const SelectPackageDlg::PkInfo& b);
+};
+
+bool SelectPackageDlg::Key(dword key, int count)
+{
+	if((clist.HasFocus() || alist.HasFocus()) && search.Key(key, count))
+		return true;
+	return TopWindow::Key(key, count);
+}
+
+void SelectPackageDlg::Serialize(Stream& s)
+{
+	SerializePlacement(s);
+	s % brief;
+}
+
+String SelectPackageDlg::GetCurrentName()
+{
+	if(clist.IsShown())
+		return clist.GetCurrentName();
+	else
+	if(alist.IsCursor())
+		return alist.Get(0);
+	return Null;
+}
+
+int   SelectPackageDlg::GetCurrentIndex()
+{
+	String s = GetCurrentName();
+	for(int i = 0; i < packages.GetCount(); i++)
+		if(packages[i].package == s)
+			return i;
+	return -1;
+}
+
+void SelectPackageDlg::ChangeDescription()
+{
+	int ii = GetCurrentIndex();
+	if(ii >= 0 && ii < packages.GetCount()) {
+		PkInfo& p = packages[ii];
+		WithDescriptionLayout<TopWindow> dlg;
+		CtrlLayoutOKCancel(dlg, "Package description");
+		dlg.text <<= p.description;
+		if(dlg.Run() != IDOK)
+			return;
+		Package pkg;
+		pkg.Load(p.path);
+		pkg.description = ~dlg.text;
+		pkg.Save(p.path);
+		p.description = description <<= ~dlg.text;
+		if(alist.IsCursor())
+			alist.Set(1, ~dlg.text);
+	}
+}
+
+void SelectPackageDlg::ListCursor()
+{
+	int c = GetCurrentIndex();
+	if(c >= 0 && c < packages.GetCount())
+		description <<= packages[c].description;
+	else
+		description <<= Null;
+}
+
+void SelectPackageDlg::SyncBrief()
+{
+	bool b = brief;
+	alist.Show(!b);
+	clist.Show(b);
+}
+
+SelectPackageDlg::SelectPackageDlg(const char *title, bool selectvars_, bool main)
+: selectvars(selectvars_)
+{
+	CtrlLayoutOKCancel(*this, title);
+	Sizeable().Zoomable();
+	Icon(IdeImg::Package(), IdeImg::Package());
+	base.AutoHideSb();
+	base.NoGrid();
+	base.AddColumn("Assembly");
+	base.WhenCursor = THISBACK(OnBase);
+	base.WhenBar = THISBACK(ToolBase);
+	base.WhenLeftDouble = THISBACK(OnBaseEdit);
+	ok <<= clist.WhenLeftDouble = alist.WhenLeftDouble = THISBACK(OnOK);
+	clist.Columns(4);
+	clist.WhenEnterItem = clist.WhenKillCursor = THISBACK(ListCursor);
+	alist.AddColumn("Package");
+	alist.AddColumn("Description", 3);
+	alist.WhenCursor = THISBACK(ListCursor);
+	alist.EvenRowColor();
+	alist.SetLineCy(max(16, Draw::GetStdFontCy()));
+	list.Add(clist.SizePos());
+	list.Add(alist.SizePos());
+	splitter.Horz(base, list);
+	splitter.SetPos(2000);
+	splitter.Zoom(selectvars ? -1 : 1);
+	newu <<= THISBACK(OnNew);
+	all <<= THISBACK(OnAll);
+	all.Show(main);
+	all = !main;
+	progress.Hide();
+	brief <<= THISBACK(SyncBrief);
+	search.NullText("Search", StdFont().Italic(), SColorDisabled());
+	search <<= THISBACK(SyncList);
+	search.SetFilter(CharFilterDefaultToUpperAscii);
+	SyncBrief();
+	description <<= THISBACK(ChangeDescription);
+	ActiveFocus(brief ? (Ctrl&)clist : (Ctrl&)alist);
+	clist.BackPaintHint();
+	alist.BackPaintHint();
+	base.BackPaintHint();
+}
+
+String SelectPackageDlg::Run(String startwith)
+{
+	finished = false;
+	if(!IsSplashOpen())
+		Open();
+	if(selectvars)
+		SyncBase(GetVarsName());
+	else
+		OnBase();
+	String bkvar = GetVarsName();
+	if(finished)
+		return GetCurrentName();
+	alist.FindSetCursor(startwith);
+	clist.FindSetCursor(startwith);
+	ActiveFocus(alist.IsShown() ? (Ctrl&)alist : (Ctrl&)clist);
+	switch(TopWindow::Run()) {
+	case IDOK:  return GetCurrentName();
+	case IDYES: return selected;
+	default:
+		LoadVars(bkvar);
+		SyncBase(GetVarsName());
+		return Null;
+	}
+}
+
+void SelectPackageDlg::OnOK()
+{
+	loading = false;
+	finished = true;
+	AcceptBreak(IDOK);
+}
+
+void SelectPackageDlg::OnAll()
+{
+	OnBase();
+}
+
+void SelectPackageDlg::OnBase()
+{
+	Load();
+}
+
+void SelectPackageDlg::OnNew() {
+	TemplateDlg dlg;
+	LoadFromGlobal(dlg, "NewPackage");
+	dlg.Load(GetUppDirs(), !all);
+	while(dlg.Run() == IDOK) {
+		String nest = ~dlg.nest;
+		String name = NativePath(String(~dlg.package));
+		String path = AppendFileName(nest, AppendFileName(name, GetFileName(name) + ".upp"));
+		if(FileExists(path) && !PromptYesNo("Package [* \1" + path + "\1] already exists.&"
+		                                    "Do you wish to recreate the files?"))
+			continue;
+		RealizePath(path);
+		if(!SaveFile(path, Null)) {
+			Exclamation("Error writing the file [* \1" + path + "\1].");
+			continue;
+		}
+		dlg.Create();
+		selected = name;
+		Break(IDYES);
+		break;
+	}
+	StoreToGlobal(dlg, "NewPackage");
+}
+
+void SelectPackageDlg::ToolBase(Bar& bar)
+{
+	bar.Add("New assembly", THISBACK(OnBaseAdd))
+		.Key(K_INSERT);
+	bar.Add(base.IsCursor(), "Edit assembly", THISBACK(OnBaseEdit))
+		.Key(K_CTRL_ENTER);
+	bar.Add(base.IsCursor(), "Remove assembly", THISBACK(OnBaseRemove))
+		.Key(K_CTRL_DELETE);
+}
+
+void SelectPackageDlg::OnBaseAdd()
+{
+	String vars;
+	if(BaseSetup(vars))
+		SyncBase(vars);
+}
+
+void SelectPackageDlg::OnBaseEdit()
+{
+	if(!base.IsCursor())
+		return;
+	String vars = base.Get(0), oldvars = vars;
+	if(BaseSetup(vars))
+	{
+		if(vars != oldvars)
+			DeleteFile(VarFilePath(oldvars));
+		SyncBase(vars);
+	}
+}
+
+void SelectPackageDlg::OnBaseRemove()
+{
+	int c = base.GetCursor();
+	if(c < 0)
+		return;
+	String next;
+	if(c + 1 < base.GetCount())
+		next = base.Get(c + 1);
+	else if(c > 0)
+		next = base.Get(c - 1);
+	String vars = base.Get(0);
+	String varpath = VarFilePath(vars);
+	if(PromptOKCancel(NFormat("Remove base file [* \1%s\1]?", varpath)) && !FileDelete(varpath))
+		Exclamation(NFormat("Error deleting file [* \1%s\1].", varpath));
+	SyncBase(next);
+}
+
+void SelectPackageDlg::Load()
+{
+	update = msecs();
+	if(selectvars)
+	{
+		list.Enable(base.IsCursor());
+		if(!base.IsCursor())
+			return;
+		LoadVars((String)base.Get(0));
+	}
+	Vector<String> upp = GetUppDirs();
+	packages.Clear();
+	all.Hide();
+	search.Hide();
+	brief.Hide();
+	progress.Show();
+	loading = true;
+	String case_fixed;
+	for(int i = 0; i < upp.GetCount() && (all || i < 1) && loading; i++) {
+		if(!IsSplashOpen() && !IsOpen())
+			Open();
+		Load(upp[i], Null, 1000 * i, 1000, case_fixed);
+	}
+	if(!IsNull(case_fixed))
+		PromptOK("Case was fixed in some of the files:[* " + case_fixed);
+	progress.Hide();
+	while(IsSplashOpen())
+		ProcessEvents();
+	if(!IsOpen())
+		Open();
+	all.Show();
+	search.Show();
+	brief.Show();
+	if(loading)
+	{
+		loading = false;
+		SyncList();
+	}
+}
+
+void FixName(const String& dir, const String& name, String& case_fixed)
+{
+	if(IsFullPath(name))
+		return;
+	String rp = AppendFileName(dir, name);
+	FindFile ff(rp);
+	if(!ff || ff.GetName() == GetFileName(name))
+		return;
+	MoveFile(rp, rp);
+	case_fixed << '&' << DeQtf(rp);
+}
+
+int DirSep(int c)
+{
+	return c == '\\' || c == '/' ? c : 0;
+}
+
+void SelectPackageDlg::Load(String upp, String dir, int progress_pos, int progress_count, String& case_fixed)
+{
+	if(msecs(update) >= 200)
+	{
+		if(!IsSplashOpen() && !IsOpen())
+			Open();
+		progress.Set(progress_pos);
+		SyncList();
+		ProcessEvents();
+		if(!loading)
+			return;
+		update = msecs();
+	}
+
+	String d = AppendFileName(upp, dir);
+	Vector<String> folders;
+	for(FindFile ff(AppendFileName(d, "*.*")); ff; ff.Next())
+		if(ff.IsFolder())
+			folders.Add(ff.GetName());
+	Sort(folders, &PackageLess);
+	for(int i = 0; i < folders.GetCount() && loading; i++)
+	{
+		String fo = folders[i];
+		String dd = AppendFileName(d, fo);
+		String nm = fo + ".upp";
+		String pkg = AppendFileName(dir, fo);
+		String desc;
+		String pf = AppendFileName(dd, nm);
+		if(FileExists(pf)) {
+			Package p;
+			p.Load(pf);
+			FixName(dd, nm, case_fixed);
+			for(int i = 0; i < p.GetCount(); i++)
+				if(!p[i].separator)
+					FixName(dd, p[i], case_fixed);
+			if(all || p.config.GetCount()) {
+				PkInfo& pk = packages.Add();
+				pk.package = pkg;
+				pk.description = p.description;
+				pk.path = pf;
+				pk.stxt = ToUpper(pk.package + pk.description);
+			}
+		}
+		int ppos = progress_pos + i * progress_count / folders.GetCount();
+		int npos = progress_pos + (i + 1) * progress_count / folders.GetCount();
+		Load(upp, pkg, ppos, npos - ppos, case_fixed);
+	}
+}
+
+void SelectPackageDlg::SyncBase(String initvars)
+{
+	Vector<String> varlist;
+	for(FindFile ff(ConfigFile("*.var")); ff; ff.Next())
+		if(ff.IsFile())
+			varlist.Add(GetFileTitle(ff.GetName()));
+	Sort(varlist, &PackageLess);
+	base.Clear();
+	Append(base, varlist);
+	if(!base.FindSetCursor(initvars))
+		if(base.GetCount() > 0)
+			base.SetCursor(0);
+		else
+			OnBase();
+}
+
+bool SelectPackageDlg::Pless(const SelectPackageDlg::PkInfo& a, const SelectPackageDlg::PkInfo& b)
+{
+	return PackageLess(a.package, b.package);
+}
+
+struct PackageDisplay : Display {
+	Font fnt;
+
+	virtual Size GetStdSize(const Value& q) const {
+		Size sz = GetTextSize(String(q), fnt);
+		sz.cx += 20;
+		sz.cy = max(sz.cy, 16);
+		return sz;
+	}
+
+	virtual void Paint(Draw& w, const Rect& r, const Value& q, Color ink, Color paper, dword style) const {
+		w.DrawRect(r, paper);
+		w.DrawImage(r.left, r.top + (r.Height() - 16) / 2, IdeImg::Package());
+		w.DrawText(r.left + 20, r.top + (r.Height() - Draw::GetStdFontCy()) / 2, String(q), fnt, ink);
+	}
+
+	PackageDisplay() { fnt = StdFont(); }
+};
+
+bool Match(const Vector<String>& l, const String& s)
+{
+	for(int i = 0; i < l.GetCount(); i++)
+		if(memcmp(l[i], s, s.GetLength()) == 0)
+			return true;
+	return false;
+}
+
+void SelectPackageDlg::SyncList()
+{
+	Sort(packages);
+	String n = GetCurrentName();
+	int asc = alist.GetScroll();
+	int csc = clist.GetSbPos();
+	alist.Clear();
+	clist.Clear();
+	ListCursor();
+	static PackageDisplay pd, bpd;
+	bpd.fnt.Bold();
+	String s = ~search;
+	for(int i = 0; i < packages.GetCount(); i++)
+		if(packages[i].stxt.Find(s) >= 0) {
+			clist.Add(packages[i].package, IdeImg::Package());
+			alist.Add(packages[i].package, packages[i].description);
+			alist.SetDisplay(alist.GetCount() - 1, 0, pd);
+		}
+	if(!alist.FindSetCursor(n))
+		alist.GoBegin();
+	if(!clist.FindSetCursor(n) && clist.GetCount())
+		clist.SetCursor(0);
+	alist.ScrollTo(asc);
+	clist.SetSbPos(csc);
+}
+
+INITBLOCK
+{
+	RegisterGlobalConfig("SelectPkgMain");
+	RegisterGlobalConfig("SelectPkg");
+}
+
+String SelectPackage(const char *title, const char *startwith, bool selectvars, bool main)
+{
+	SelectPackageDlg dlg(title, selectvars, main);
+	const char *c = main ? "SelectPkgMain" : "SelectPkg";
+	LoadFromGlobal(dlg, c);
+	dlg.SyncBrief();
+	String b = dlg.Run(startwith);
+	StoreToGlobal(dlg, c);
+	return b;
+}
diff --git a/uppsrc/ide/Setup.cpp b/uppsrc/ide/Setup.cpp
new file mode 100644
index 000000000..fd79e8b1d
--- /dev/null
+++ b/uppsrc/ide/Setup.cpp
@@ -0,0 +1,544 @@
+#include "ide.h"
+
+#define LLOG(x) // LOG(x)
+
+int CharFilterVar(int c)
+{
+	return IsAlNum(c) || c == '_' ? c : 0;
+}
+
+void DlCharset(DropList& d)
+{
+	d.Add(CHARSET_UTF8, "UTF8");
+	for(int i = 1; i < CharsetCount(); i++)
+		d.Add(i, CharsetName(i));
+}
+
+class FontSelectManager {
+	DropList *face;
+	DropList *height;
+	Option   *bold;
+	Option   *italic;
+	Option   *naa;
+
+	void FaceSelect();
+	void Select();
+
+public:
+	Callback  WhenAction;
+
+	typedef FontSelectManager CLASSNAME;
+
+	void Set(DropList& _face, DropList& _height,
+	         Option& _bold, Option& _italic, Option& _naa);
+	void Set(Font f);
+	Font Get();
+};
+
+void FontSelectManager::FaceSelect() {
+	height->Clear();
+#ifdef PLATFORM_WIN32
+	int f = face->GetData();
+	int h = -1;
+	int lh = height->GetData();
+	int lhh = -1;
+
+	int i;
+	for(i = 1; i < 32; i++) {
+		FontInfo fi = Font(f, i).Info();
+		int hh = fi.GetHeight();
+		if(hh != h) {
+			height->Add(hh);
+			if(hh >= lh && lhh < 0)
+				lhh = hh;
+			h = hh;
+		}
+	}
+	if(lhh >= 0)
+		height->SetData(lhh);
+	else
+	if(height->GetCount())
+		height->SetIndex(0);
+#else
+	for(int i = 6; i < 32; i++)
+		height->Add(i);
+#endif
+	Select();
+}
+
+void FontSelectManager::Select() {
+	WhenAction();
+}
+
+void FontSelectManager::Set(DropList& _face, DropList& _height,
+                            Option& _bold, Option& _italic, Option& _naa) {
+	face = &_face;
+	face->WhenAction = THISBACK(FaceSelect);
+	height = &_height;
+	height->WhenAction = THISBACK(Select);
+	bold = &_bold;
+	bold->WhenAction = THISBACK(Select);
+	italic = &_italic;
+	italic->WhenAction = THISBACK(Select);
+	naa = &_naa;
+	naa->WhenAction = THISBACK(Select);
+	face->Clear();
+	for(int i = 0; i < Font::GetFaceCount(); i++)
+		if(Font::GetFaceInfo(i) & Font::FIXEDPITCH) {
+			face->Add(i, Font::GetFaceName(i));
+			LLOG("Face: " << Font::GetFaceName(i));
+		}
+	face->SetIndex(0);
+	FaceSelect();
+}
+
+void FontSelectManager::Set(Font f) {
+	face->SetData(f.GetFace());
+	FaceSelect();
+	height->SetData(f.GetHeight());
+	for(int i = 0; i < height->GetCount(); i++) {
+		int q = height->GetKey(i);
+		if(f.GetHeight() <= q) {
+			height->SetData(q);
+			break;
+		}
+	}
+	*bold = f.IsBold();
+	*italic = f.IsItalic();
+	*naa = f.IsNonAntiAliased();
+}
+
+Font FontSelectManager::Get() {
+	Font f(face->GetData(), height->GetData());
+	if(*bold) f.Bold();
+	if(*italic) f.Italic();
+	if(*naa) f.NonAntiAliased();
+	return f;
+}
+
+void Ide::UpdateFormat(CodeEditor& editor, QuickTabs& tabs)
+{
+	if(!IsActiveFile() || ActiveFile().tabsize <= 0)
+		editor.TabSize(editortabsize);
+	if(!designer)
+		if(filetabs)
+			editor.SetFrame(tabs);
+		else
+			editor.SetFrame(ViewFrame());
+	editor.IndentSpaces(indent_spaces);
+	editor.IndentAmount(indent_amount);
+	editor.ShowTabs(show_tabs);
+	editor.NoParenthesisIndent(no_parenthesis_indent);
+	editor.HiliteScope(hilite_scope);
+	editor.HiliteBracket(hilite_bracket);
+	editor.HiliteIfDef(hilite_ifdef);
+	editor.HiliteIfEndif(hilite_if_endif);
+	editor.LineNumbers(line_numbers);
+	editor.AutoEnclose(auto_enclose);
+	editor.MarkLines(mark_lines);
+	editor.BorderColumn(bordercolumn, bordercolor);
+	editor.Refresh();
+	tabs.Grouping(tabs_grouping);
+	tabs.FileIcons(tabs_icons);
+	tabs.Crosses(tabs_crosses);
+
+}
+
+void Ide::UpdateFormat() {
+	SetupEditor();
+	UpdateFormat(editor, tabs);
+	UpdateFormat(editor2, tabs2);
+	console.SetFont(consolefont);
+	console.WrapText(wrap_console_text);
+	statusbar.Show(show_status_bar);
+	SetupBars();
+}
+
+struct FormatDlg : TabDlg {
+	ColorPusher hl_color[CodeEditor::HL_COUNT];
+};
+
+void HlPusherFactory(One<Ctrl>& ctrl)
+{
+	ctrl.Create<ColorPusher>().NotNull().Track();
+}
+
+void Ide::ReadHlStyles(ArrayCtrl& hlstyle)
+{
+	hlstyle.Clear();
+	for(int i = 0; i < CodeEditor::HL_COUNT; i++) {
+		const CodeEditor::HlStyle& s = editor.GetHlStyle(i);
+		hlstyle.Add(editor.GetHlName(i), s.color, s.bold, s.italic, s.underline);
+	}
+}
+
+class AStyleSetupDialog : public WithSetupAstyleLayout<ParentCtrl> {
+	Ide *ide;
+
+	typedef AStyleSetupDialog CLASSNAME;
+
+public:
+	AStyleSetupDialog(Ide *_ide);
+	void AstyleTest();
+	void UppDefaults();
+};
+
+AStyleSetupDialog::AStyleSetupDialog(Ide *_ide)
+{
+	ide = _ide;
+
+	BracketFormatMode.Add(astyle::NONE_MODE, "none");
+	BracketFormatMode.Add(astyle::ATTACH_MODE, "attach");
+	BracketFormatMode.Add(astyle::BREAK_MODE, "break");
+	ParensPaddingMode.Add(astyle::PAD_NONE, "no space pad around parenthesis");
+	ParensPaddingMode.Add(astyle::PAD_INSIDE, "pad parenthesis inside with space");
+	ParensPaddingMode.Add(astyle::PAD_OUTSIDE, "pad parenthesis outside with space");
+	ParensPaddingMode.Add(astyle::PAD_BOTH, "pad both parenthesis sides with spaces");
+
+	Test <<= THISBACK(AstyleTest);
+	Defaults << THISBACK(UppDefaults);
+
+}
+
+void AStyleSetupDialog::AstyleTest()
+{
+	astyle::ASFormatter Formatter;
+
+	// sets up parameters from astyle dialog
+	Formatter.setBracketIndent(BracketIndent);
+	Formatter.setNamespaceIndent(NamespaceIndent);
+	Formatter.setBlockIndent(BlockIndent);
+	Formatter.setCaseIndent(CaseIndent);
+	Formatter.setClassIndent(ClassIndent);
+	Formatter.setLabelIndent(LabelIndent);
+	Formatter.setSwitchIndent(SwitchIndent);
+	Formatter.setPreprocessorIndent(PreprocessorIndent);
+	Formatter.setMaxInStatementIndentLength(MaxInStatementIndentLength);
+	Formatter.setMinConditionalIndentLength(MinInStatementIndentLength);
+	Formatter.setBreakClosingHeaderBracketsMode(BreakClosingHeaderBracketsMode);
+	Formatter.setBreakElseIfsMode(BreakElseIfsMode);
+	Formatter.setBreakOneLineBlocksMode(BreakOneLineBlocksMode);
+	Formatter.setSingleStatementsMode(SingleStatementsMode);
+	Formatter.setBreakBlocksMode(BreakBlocksMode);
+	Formatter.setBreakClosingHeaderBlocksMode(BreakClosingHeaderBlocksMode);
+	Formatter.setBracketFormatMode((astyle::BracketMode)BracketFormatMode.GetIndex());
+	switch(ParensPaddingMode.GetIndex()) {
+	case astyle::PAD_INSIDE :
+		Formatter.setParensInsidePaddingMode(true);
+		Formatter.setParensOutsidePaddingMode(false);
+		break;
+	case astyle::PAD_OUTSIDE :
+		Formatter.setParensInsidePaddingMode(false);
+		Formatter.setParensOutsidePaddingMode(true);
+		break;
+	case astyle::PAD_BOTH :
+		Formatter.setParensInsidePaddingMode(true);
+		Formatter.setParensOutsidePaddingMode(true);
+		break;
+	default :
+		Formatter.setParensOutsidePaddingMode(false);
+		Formatter.setParensInsidePaddingMode(false);
+		break;
+	}
+	Formatter.setParensUnPaddingMode(ParensUnPaddingMode);
+	Formatter.setOperatorPaddingMode(OperatorPaddingMode);
+	Formatter.setEmptyLineFill(EmptyLineFill);
+	Formatter.setTabSpaceConversionMode(TabSpaceConversionMode);
+	Formatter.setTabIndentation(ide->editortabsize, ide->indent_spaces ? false : true);
+	Formatter.setSpaceIndentation(ide->indent_spaces ? ide->indent_amount : ide->editortabsize);
+
+	// formats text in test box
+	TestBox.Set(ide->FormatCodeString(TestBox.GetW(), Formatter));
+}
+
+void AStyleSetupDialog::UppDefaults()
+{
+	BracketIndent = false;
+	NamespaceIndent = true;
+	BlockIndent = false;
+	CaseIndent = true;
+	ClassIndent = true;
+	LabelIndent = true;
+	SwitchIndent = true;
+	PreprocessorIndent = false;
+	MaxInStatementIndentLength = 20;
+	MinInStatementIndentLength = 2;
+	BreakClosingHeaderBracketsMode = 0;
+	BreakElseIfsMode = true;
+	BreakOneLineBlocksMode = true;
+	SingleStatementsMode = true;
+	BreakBlocksMode = false;
+	BreakClosingHeaderBlocksMode = false;
+	BracketFormatMode.SetIndex(1);
+	ParensPaddingMode.SetIndex(0);
+	ParensUnPaddingMode = true;
+	OperatorPaddingMode = false;
+	EmptyLineFill = false;
+	TabSpaceConversionMode = false;
+}
+
+void SetConsole(EditString *e, const char *text)
+{
+	*e <<= text;
+}
+
+void Ide::SetupFormat() {
+	FormatDlg dlg;
+	dlg.Title("Format setup");
+	WithSetupFontLayout<ParentCtrl> fnt;
+	WithSetupHlLayout<ParentCtrl> hlt;
+	WithSetupEditorLayout<ParentCtrl> edt;
+	WithSetupIdeLayout<ParentCtrl> ide;
+	AStyleSetupDialog ast(this);
+#ifdef PLATFORM_WIN32
+	ide.console_txt.Hide();
+	ide.console.Hide();
+	ide.kde.Hide();
+	ide.gnome.Hide();
+	ide.xterm.Hide();
+#endif
+	ide.kde <<= callback2(SetConsole, &ide.console, "/usr/bin/konsole -e");
+	ide.gnome <<= callback2(SetConsole, &ide.console, "/usr/bin/gnome-terminal -x");
+	ide.xterm <<= callback2(SetConsole, &ide.console, "/usr/bin/xterm -e");
+	dlg.Add(fnt, "Fonts");
+	dlg.Add(hlt, "Syntax highlighting");
+	dlg.Add(edt, "Editor");
+	dlg.Add(ide, "IDE");
+	dlg.Add(ast, "Code formatting");
+	dlg.WhenClose = dlg.Acceptor(IDYES);
+	FontSelectManager ed, vf, con, f1, f2, tf;
+	ed.Set(fnt.face, fnt.height, fnt.bold, fnt.italic, fnt.naa);
+	vf.Set(fnt.vface, fnt.vheight, fnt.vbold, fnt.vitalic, fnt.vnaa);
+	con.Set(fnt.cface, fnt.cheight, fnt.cbold, fnt.citalic, fnt.cnaa);
+	tf.Set(fnt.tface, fnt.theight, fnt.tbold, fnt.titalic, fnt.tnaa);
+	f1.Set(fnt.face1, fnt.height1, fnt.bold1, fnt.italic1, fnt.naa1);
+	f2.Set(fnt.face2, fnt.height2, fnt.bold2, fnt.italic2, fnt.naa2);
+	ed.Set(editorfont);
+	vf.Set(veditorfont);
+	con.Set(consolefont);
+	tf.Set(tfont);
+	f1.Set(font1);
+	f2.Set(font2);
+	DlCharset(edt.charset);
+	edt.tabsize.MinMax(1, 100).NotNull();
+	edt.tabsize <<= editortabsize;
+	edt.indent_amount.MinMax(1, 100).NotNull();
+	edt.indent_amount <<= indent_spaces ? indent_amount : editortabsize;
+	edt.indent_amount.Enable(indent_spaces);
+	CtrlRetriever rtvr;
+	int hs = hilite_scope;
+	rtvr
+		(hlt.hilite_scope, hs)
+		(hlt.hilite_bracket, hilite_bracket)
+		(hlt.hilite_ifdef, hilite_ifdef)
+		(hlt.hilite_if_endif, hilite_if_endif)
+		(edt.indent_spaces, indent_spaces)
+		(edt.no_parenthesis_indent, no_parenthesis_indent)
+		(edt.showtabs, show_tabs)
+		(edt.tabs_icons, tabs_icons)
+		(edt.tabs_crosses, tabs_crosses)
+		(edt.tabs_grouping, tabs_grouping)
+		(edt.filetabs, filetabs)
+		(edt.numbers, line_numbers)
+		(edt.bookmark_pos, bookmark_pos)
+		(edt.header_guards, header_guards)
+		(edt.insert_include, insert_include)
+		(edt.auto_enclose, auto_enclose)
+		(edt.mark_lines, mark_lines)
+		(edt.bordercolumn, bordercolumn)
+		(edt.bordercolor, bordercolor)
+		(ide.show_status_bar, show_status_bar)
+		(ide.toolbar_in_row, toolbar_in_row)
+		(ide.splash_screen, splash_screen)
+		(ide.mute_sounds, mute_sounds)
+		(ide.wrap_console_text, wrap_console_text)
+		(ide.browser_clickpos, browser.clickpos)
+		(ide.browser_closeesc, browser_closeesc)
+		(ide.assist, editor.auto_assist)
+		(ide.commentdp, editor.commentdp)
+		(ide.hydra1_threads, hydra1_threads)
+		(ide.chstyle, chstyle)
+		(ide.console, LinuxHostConsole)
+		(ast.BracketIndent,					astyle_BracketIndent)
+		(ast.NamespaceIndent,               astyle_NamespaceIndent)
+		(ast.BlockIndent,                   astyle_BlockIndent)
+		(ast.CaseIndent,                    astyle_CaseIndent)
+		(ast.ClassIndent,                   astyle_ClassIndent)
+		(ast.LabelIndent,                   astyle_LabelIndent)
+		(ast.SwitchIndent,                  astyle_SwitchIndent)
+		(ast.PreprocessorIndent,            astyle_PreprocessorIndent)
+		(ast.MinInStatementIndentLength,    astyle_MinInStatementIndentLength)
+		(ast.MaxInStatementIndentLength,    astyle_MaxInStatementIndentLength)
+		(ast.BreakClosingHeaderBracketsMode,astyle_BreakClosingHeaderBracketsMode)
+		(ast.BreakElseIfsMode,              astyle_BreakElseIfsMode)
+		(ast.BreakOneLineBlocksMode,        astyle_BreakOneLineBlocksMode)
+		(ast.SingleStatementsMode,          astyle_SingleStatementsMode)
+		(ast.BreakBlocksMode,               astyle_BreakBlocksMode)
+		(ast.BreakClosingHeaderBlocksMode,  astyle_BreakClosingHeaderBlocksMode)
+		(ast.BracketFormatMode,             astyle_BracketFormatMode)
+		(ast.ParensPaddingMode,             astyle_ParensPaddingMode)
+		(ast.ParensUnPaddingMode,           astyle_ParensUnPaddingMode)
+		(ast.OperatorPaddingMode,           astyle_OperatorPaddingMode)
+		(ast.EmptyLineFill,                 astyle_EmptyLineFill)
+		(ast.TabSpaceConversionMode,        astyle_TabSpaceConversionMode)
+		(ast.TestBox,						astyle_TestBox)
+	;
+	hlt.hlstyle.AddColumn("Style");
+	hlt.hlstyle.AddColumn("Color").Ctrls(HlPusherFactory);
+	hlt.hlstyle.AddColumn("Bold").Ctrls<Option>();
+	hlt.hlstyle.AddColumn("Italic").Ctrls<Option>();
+	hlt.hlstyle.AddColumn("Underline").Ctrls<Option>();
+	hlt.hlstyle.ColumnWidths("130 70 40 40 70");
+	hlt.hlstyle.EvenRowColor().NoHorzGrid().SetLineCy(EditField::GetStdHeight() + 2);
+	ReadHlStyles(hlt.hlstyle);
+	edt.charset <<= (int)default_charset;
+	edt.tabsize <<= rtvr <<=
+		hlt.hlstyle.WhenCtrlsAction = ed.WhenAction = tf.WhenAction =
+		con.WhenAction = f1.WhenAction = f2.WhenAction = dlg.Breaker(222);
+	hlt.hl_restore <<= dlg.Breaker(333);
+	ide.chstyle.Add(0, "Host platform");
+	ide.chstyle.Add(1, "Standard");
+	ide.chstyle.Add(2, "Classic");
+	ide.chstyle.Add(3, "Host platform, blue bars");
+	ide.chstyle.Add(4, "Standard, blue bars");
+	for(;;) {
+		int c = dlg.Run();
+		editorfont = ed.Get();
+		tfont = tf.Get();
+		veditorfont = vf.Get();
+		consolefont = con.Get();
+		font1 = f1.Get();
+		font2 = f2.Get();
+		editortabsize = Nvl((int)~edt.tabsize, 4);
+		rtvr.Retrieve();
+		console.SetSlots(hydra1_threads);
+		hilite_scope = hs;
+		if(indent_spaces)
+			indent_amount = ~edt.indent_amount;
+		else
+		{
+			indent_amount = editortabsize;
+			edt.indent_amount <<= editortabsize;
+		}
+		edt.indent_amount.Enable(indent_spaces);
+		default_charset = (byte)(int)~edt.charset;
+		for(int i = 0; i < CodeEditor::HL_COUNT; i++)
+			editor.SetHlStyle(i, hlt.hlstyle.Get(i, 1), hlt.hlstyle.Get(i, 2),
+			                     hlt.hlstyle.Get(i, 3), hlt.hlstyle.Get(i, 4));
+		UpdateFormat();
+		if(c == IDYES)
+			break;
+		if(c == 333 && PromptYesNo("Restore default highlighting colors?")) {
+			editor.DefaultHlStyles();
+			ReadHlStyles(hlt.hlstyle);
+		}
+	}
+	if(filelist.IsCursor()) {
+		FlushFile();
+		FileCursor();
+	}
+	if(editor.auto_assist)
+		StartBrowserBase();
+	SyncCh();
+}
+
+struct MainConfigDlg : public WithConfigLayout<TopWindow> {
+	EditString ce, fe;
+	FrameRight<Button> cb;
+
+	void FlagDlg();
+
+	bool Perform(const String& startwith);
+
+	typedef MainConfigDlg CLASSNAME;
+
+	MainConfigDlg();
+};
+
+bool SetSw(const String& flag, Switch& sw, const char *flg) {
+	if(flag == flg) {
+		sw <<= 1;
+		return true;
+	}
+	return false;
+}
+
+String GetSw(Switch& sw, const char *flag) {
+	if((int)~sw)
+		return String(flag) + ' ';
+	return Null;
+}
+
+void MainConfigDlg::FlagDlg()
+{
+	WithConfLayout<TopWindow> cfg;
+	CtrlLayoutOKCancel(cfg, "Configuration flags");
+	Vector<String> flg = SplitFlags0(String(fe));
+	cfg.other.SetFilter(FlagFilterM);
+	cfg.dll <<= cfg.gui <<= cfg.mt <<= 0;
+	for(int i = 0; i < flg.GetCount(); i++) {
+		String f = flg[i];
+		if(!SetSw(f, cfg.dll, "DLL")
+		   && !SetSw(f, cfg.gui, "GUI")
+		   && !SetSw(f, cfg.mt, "MT")) {
+			String s = cfg.other.GetText().ToString();
+			if(!s.IsEmpty())
+				s << ' ';
+			s << f;
+			cfg.other = s.ToWString();
+		}
+	}
+	if(cfg.Run() == IDOK) {
+		String flags;
+		flags
+			<< GetSw(cfg.dll, "DLL")
+		    << GetSw(cfg.gui, "GUI")
+		    << GetSw(cfg.mt, "MT")
+			<< cfg.other.GetText().ToString();
+		;
+		fe = Join(SplitFlags0(flags), " ").ToWString();
+	}
+}
+
+MainConfigDlg::MainConfigDlg() {
+	CtrlLayoutOKCancel(*this, "Main package configuration(s)");
+	fe.AddFrame(cb);
+	fe.SetFilter(FlagFilterM);
+	cb.SetImage(CtrlImg::smallright()).NoWantFocus();
+	cb <<= THISBACK(FlagDlg);
+	list.AddColumn("Flags", 3).Edit(fe);
+	list.AddColumn("Optional name", 2).Edit(ce);
+	list.Appending().Removing();
+}
+
+bool MainConfigDlg::Perform(const String& startwith) {
+	list.SetCursor(0);
+	list.FindSetCursor(startwith);
+	return Run() == IDOK;
+}
+
+void Ide::MainConfig() {
+	package.SetCursor(0);
+	if(package.GetCursor() != 0) return;
+	MainConfigDlg dlg;
+	for(int i = 0; i < actual.config.GetCount(); i++) {
+		const Package::Config& f = actual.config[i];
+		dlg.list.Add(f.param, f.name);
+	}
+	if(!dlg.Perform(mainconfigname)) return;
+	actual.config.Clear();
+	for(int i = 0; i < dlg.list.GetCount(); i++) {
+		Package::Config& f = actual.config.Add();
+		f.param = dlg.list.Get(i, 0);
+		f.name = dlg.list.Get(i, 1);
+	}
+	SavePackage();
+	if(dlg.list.IsCursor()) {
+		mainconfigparam = dlg.list.Get(0);
+		mainconfigname = Nvl((String)dlg.list.Get(1), mainconfigparam);
+		MakeTitle();
+	}
+	SyncMainConfigList();
+	SetHdependDirs();
+	MakeTitle();
+}
diff --git a/uppsrc/ide/Template.cpp b/uppsrc/ide/Template.cpp
new file mode 100644
index 000000000..980d13ab3
--- /dev/null
+++ b/uppsrc/ide/Template.cpp
@@ -0,0 +1,374 @@
+#include "ide.h"
+
+int ReadTemplateType(CParser& p)
+{
+	static const char *nm[] = { "id", "filename", "option", "select", "text" };
+	for(int i = 0; i < __countof(nm); i++)
+		if(p.Id(nm[i]))
+			return i;
+	p.ThrowError("Unknown type");
+	return 0;
+}
+
+PackageTemplate ReadTemplate(const char *filename)
+{
+	PackageTemplate pt;
+	FileIn in(filename);
+	String header;
+	String l;
+	for(;;) {
+		if(in.IsEof())
+			break;
+		l = in.GetLine();
+		if(l[0] == '@' && l[1] == '@')
+			break;
+		header << l << '\n';
+	}
+	CParser p(header, filename);
+	p.PassId("template");
+	pt.name = p.ReadString();
+	pt.main = pt.sub = false;
+	for(;;) {
+		if(p.Id("main"))
+			pt.main = true;
+		else
+		if(p.Id("sub"))
+			pt.sub = true;
+		else
+			break;
+	}
+	p.PassChar(';');
+	while(!p.IsEof()) {
+		int type = ReadTemplateType(p);
+		TemplateItem& m = pt.item.Add();
+		m.type = type;
+		if(type == TEMPLATEITEM_SELECT) {
+			p.PassChar('(');
+			do
+				m.value.Add(p.ReadString());
+			while(p.Char(','));
+			p.PassChar(')');
+		}
+		m.label = p.ReadString();
+		m.id = p.ReadId();
+		if(p.Char('=')) {
+			const char *b = p.GetPtr();
+			while(!p.IsChar(';')) {
+				if(p.IsEof())
+					p.ThrowError("unexpected end of file");
+				p.SkipTerm();
+			}
+			m.init = String(b, p.GetPtr());
+		}
+		p.PassChar(';');
+	}
+	for(;;) {
+		pt.file.Add();
+		pt.file.Top().filename = l.Mid(2);
+		for(;;) {
+			if(in.IsEof())
+				return pt;
+			l = in.GetLine();
+			if(l[0] == '@' && l[1] == '@')
+				break;
+			if(l[0] == '?' && l[1] == '?')
+				pt.file.Top().condition = l.Mid(2);
+			else
+				pt.file.Top().text << l << "\r\n";
+		}
+	}
+}
+
+int NoCr(int c)
+{
+	return c == '\r' ? 0 : c;
+}
+
+AppPreview::AppPreview()
+{
+	SetFrame(ViewFrame());
+	AddFrame(sb);
+	sb <<= THISBACK(Scroll);
+	NoWantFocus();
+}
+
+AppPreview::~AppPreview() {}
+
+void AppPreview::MouseWheel(Point p, int zdelta, dword keyflags) {
+	sb.Wheel(zdelta);
+}
+
+void AppPreview::Layout()
+{
+	sb.SetTotal(line.GetCount());
+	sb.SetPage(GetSize().cy / Courier(12).Info().GetHeight());
+}
+
+void AppPreview::Paint(Draw& w)
+{
+	Size sz = GetSize();
+	FontInfo fi = Courier(12).Info();
+	int y = 0;
+	int i = sb;
+	while(y < sz.cy) {
+		bool hdr = i < line.GetCount() && line[i].header;
+		w.DrawRect(0, y, sz.cx, fi.GetHeight(), hdr ? LtCyan : SColorPaper);
+		if(i < line.GetCount())
+			w.DrawText(0, y, line[i].text, hdr ? Arial(12).Bold().Italic() : Courier(12), SColorText);
+		y += fi.GetHeight();
+		i++;
+	}
+}
+
+void AppPreview::Add(const String& data, bool header)
+{
+	Vector<String> l = Split(Filter(data, NoCr), '\n', false);
+	for(int i = 0; i < l.GetCount(); i++) {
+		Line& q = line.Add();
+		const char *s = l[i];
+		while(*s == '\t') {
+			q.text << "    ";
+			s++;
+		}
+		q.text << s;
+		q.header = header;
+	}
+	Refresh();
+	Layout();
+}
+
+int FilterPackageName(int c)
+{
+	return c == '_' || IsAlNum(c) || c == '/' ? c : c == '\\' ? '/' : 0;
+}
+
+TemplateDlg::TemplateDlg()
+{
+	CtrlLayoutOKCancel(*this, "Create new package");
+	Sizeable().Zoomable();
+	description <<= THISBACK(Preview);
+	delay <<= THISBACK(Preview);
+	delay.SetDelay(300);
+	templist.AddColumn("Template");
+	templist.WhenEnterRow = THISBACK(EnterTemplate);
+	ok.Disable();
+	package <<= THISBACK(EnableCreate);
+	package.SetFilter(FilterPackageName);
+	Icon(IdeImg::CreatePackage());
+}
+
+TemplateDlg::~TemplateDlg() {}
+
+const PackageTemplate& TemplateDlg::ActualTemplate()
+{
+	if(templist.GetCursor() > 0)
+		return pt[templist.GetCursor() - 1];
+	static PackageTemplate t;
+	return t;
+}
+
+int IdFilter(int c)
+{
+	return c == '_' || IsAlNum(c) ? c : 0;
+}
+
+int FilenameFilter(int c)
+{
+	return c == '_' || IsAlNum(c) || c == '.' ? c : 0;
+}
+
+String ToUpper_Caps(const String& name)
+{
+	String output("");
+	int str_len = name.GetLength();
+	for (int i = 0; i < str_len; ++i)
+	{
+		int ch = name[i];
+		if (IsAlNum(ch))
+		{
+			output += ToUpper(ch);
+			if (i < str_len - 1)
+				if (IsLower(ch) && IsUpper(name[i + 1]))
+					output += '_';
+		}
+		else
+			output += '_';
+	}
+	return output;
+}
+
+ArrayMap<String, EscValue> TemplateDlg::MakeVars0()
+{
+	ArrayMap<String, EscValue> var;
+	String n = ~package;
+	int q = n.ReverseFind('/');
+	var.Add("PACKAGE", q >= 0 ? n.Mid(q + 1) : n);
+	var.Add("PACKAGE_TOUPPER", ToUpper(n));
+	var.Add("PACKAGE_TOUPPER_CAPS", ToUpper_Caps(n));
+	var.Add("DESCRIPTION", String(~description));
+	return var;
+}
+
+ArrayMap<String, EscValue> TemplateDlg::MakeVars()
+{
+	const PackageTemplate& tp = ActualTemplate();
+	ArrayMap<String, EscValue> var = MakeVars0();
+	for(int i = 0; i < tp.item.GetCount(); i++)
+		var.Add(tp.item[i].id, EscFromStdValue(~ctrl[i]));
+	StdLib(var);
+	return var;
+}
+
+void TemplateDlg::Preview()
+{
+	const PackageTemplate& tp = ActualTemplate();
+	ArrayMap<String, EscValue> var = MakeVars();
+	int sc = preview.sb;
+	preview.Clear();
+	for(int i = 0; i < tp.file.GetCount(); i++) {
+		const FileTemplate& ft = tp.file[i];
+		if(IsNull(ft.condition) || IsTrue(Evaluate(ft.condition, var))) {
+			preview.Add(Expand(ft.filename, var), true);
+			preview.Add(Expand(ft.text, var));
+		}
+	}
+	preview.sb = sc;
+}
+
+void TemplateDlg::Create()
+{
+	const PackageTemplate& tp = ActualTemplate();
+	ArrayMap<String, EscValue> var = MakeVars();
+	for(int i = 0; i < tp.file.GetCount(); i++) {
+		const FileTemplate& ft = tp.file[i];
+		if(IsNull(ft.condition) || IsTrue(Evaluate(ft.condition, var))) {
+			String fn = Expand(ft.filename, var);
+			if(!IsNull(fn)) {
+				fn = AppendFileName(AppendFileName(~nest, (String)~package), fn);
+				RealizePath(fn);
+				SaveFile(fn, Expand(ft.text, var));
+			}
+		}
+	}
+	Package p;
+	String f = AppendFileName(AppendFileName(~nest, (String)~package), (String)~package + ".upp");
+	p.Load(f);
+	p.description = ~description;
+	p.Save(f);
+}
+
+void TemplateDlg::Inits()
+{
+	const PackageTemplate& tp = ActualTemplate();
+	ArrayMap<String, EscValue> var = MakeVars0();
+	for(int i = 0; i < tp.item.GetCount(); i++) {
+		String init = tp.item[i].init;
+		if(!IsNull(init) && !ctrl[i].IsModified()) {
+			ctrl[i] <<= StdValueFromEsc(Evaluate(init, var));
+			ctrl[i].ClearModify();
+		}
+	}
+}
+
+void TemplateDlg::EnterTemplate()
+{
+	const PackageTemplate& tp = ActualTemplate();
+	ArrayMap<String, EscValue> var;
+	var.Add("PACKAGE", (String)~package);
+	StdLib(var);
+	label.Clear();
+	ctrl.Clear();
+	Point pos = templist.GetRect().BottomLeft();
+	pos.y += 8;
+	int cx = cancel.GetRect().right - pos.x;
+	for(int i = 0; i < tp.item.GetCount(); i++) {
+		const TemplateItem& m = tp.item[i];
+		if(m.type == TEMPLATEITEM_OPTION)
+			ctrl.Create<Option>().SetLabel(m.label);
+		else {
+			label.Add().SetLabel(m.label).LeftPos(pos.x, cx).TopPos(pos.y);
+			Add(label.Top());
+			pos.y += label.Top().GetMinSize().cy;
+			switch(m.type) {
+			case TEMPLATEITEM_ID: {
+				EditField *e = new EditField;
+				e->SetFilter(IdFilter);
+				ctrl.Add(e);
+				break;
+			}
+			case TEMPLATEITEM_FILENAME: {
+				EditField *e = new EditField;
+				e->SetFilter(FilenameFilter);
+				ctrl.Add(e);
+				break;
+			}
+			case TEMPLATEITEM_SELECT: {
+				DropList *d = new DropList;
+				for(int i = 0; i < m.value.GetCount(); i++)
+					d->Add(i, m.value[i]);
+				if(m.value.GetCount())
+					d->SetIndex(0);
+				ctrl.Add(d);
+				break;
+			}
+			case TEMPLATEITEM_TEXT: {
+			    EditField *e = new EditField;
+			    ctrl.Add(e);
+			    break;
+			}
+			}
+		}
+		Add(ctrl.Top());
+		ctrl.Top() << delay;
+		ctrl.Top().LeftPos(pos.x, cx).TopPos(pos.y);
+		pos.y += ctrl.Top().GetMinSize().cy + 6;
+		ctrl.Top().ClearModify();
+	}
+	Inits();
+	Preview();
+}
+
+void TemplateDlg::LoadNest(const char *path, bool main, bool recurse)
+{
+	FindFile ff(AppendFileName(path, "*.*"));
+	while(ff) {
+		String p = AppendFileName(path, ff.GetName());
+		if(ff.IsFolder()) {
+			if(recurse)
+				LoadNest(p, main);
+		}
+		else
+		if(ToLower(GetFileExt(ff.GetName())) == ".upt") {
+			try {
+				PackageTemplate t = ReadTemplate(p);
+				if(main && t.main || !main && t.sub)
+					pt.Add() = t;
+			}
+			catch(CParser::Error e) {
+				Exclamation("Package template [* " + DeQtf(p) + "] is invalid&[* " + e);
+			}
+		}
+		ff.Next();
+	}
+}
+
+void TemplateDlg::Load(const Vector<String>& p, bool main)
+{
+	pt.Clear();
+	for(int i = 0; i < p.GetCount(); i++) {
+		LoadNest(p[i], main);
+		nest.Add(p[i]);
+	}
+	LoadNest(GetCommonDir(), main);
+	LoadNest(GetLocalDir(), main);
+	LoadNest(GetFileFolder(ConfigFile("x")), main, false);
+	Sort(pt, FieldRelation(&PackageTemplate::name, StdLess<String>()));
+	templist.Clear();
+	templist.Add("<empty>");
+	for(int i = 0; i < pt.GetCount(); i++)
+		templist.Add(pt[i].name);
+	if(nest.GetCount())
+		nest.SetIndex(0);
+	templist.GoBegin();
+	ActiveFocus(package);
+}
diff --git a/uppsrc/ide/Thisbacks.cpp b/uppsrc/ide/Thisbacks.cpp
new file mode 100644
index 000000000..4a47ac08a
--- /dev/null
+++ b/uppsrc/ide/Thisbacks.cpp
@@ -0,0 +1,179 @@
+#include "ide.h"
+
+bool IsCb(String t) {
+	int q = t.Find('<');
+	if(q >= 0)
+		t.Trim(q);
+	return  t == "::Callback" || t == "::Callback1" || t == "::Callback2" ||
+	        t == "::Callback3" || t == "::Gate" || t == "::Gate1" || t == "::Gate2";
+}
+
+struct ThisbacksDlg : WithThisbacksLayout<TopWindow> {
+	struct CbInfo {
+		String nest;
+		String type;
+		String name;
+	};
+
+	Index<String> nname;
+	Array<CbInfo> cb;
+
+	void GatherCallbacks(const String& pfx, Index<String>& done, const String& nest, int access);
+	void CbEdit(One<Ctrl>& ctrl);
+	void Generate(String& ins, String& clip, const String& nest);
+
+	typedef ThisbacksDlg CLASSNAME;
+
+	ThisbacksDlg(const String& nest);
+};
+
+int FilterId(int c)
+{
+	return iscid(c) ? c : 0;
+}
+
+void ThisbacksDlg::CbEdit(One<Ctrl>& ctrl)
+{
+	ctrl.Create<EditString>().SetFilter(FilterId);
+}
+
+ThisbacksDlg::ThisbacksDlg(const String& nest)
+{
+	CtrlLayoutOKCancel(*this, "THISBACKs");
+	list.AddColumn("Defined in");
+	list.AddColumn("Type");
+	list.AddColumn("Callback");
+	list.AddColumn("Insert").Ctrls<Option>();
+	list.AddColumn("Method name").Ctrls(THISBACK(CbEdit));
+	list.SetLineCy(EditField::GetStdHeight());
+	list.ColumnWidths("110 245 157 41 129");
+	list.EvenRowColor();
+	list.NoCursor();
+	Sizeable().Zoomable();
+	int q = BrowserBase().Find(nest);
+	if(q < 0)
+		return;
+	CppNest& m = BrowserBase()[q];
+	for(int i = 0; i < m.GetCount(); i++)
+		nname.Add(m.name[i]);
+	Index<String> done;
+	GatherCallbacks("", done, nest, PRIVATE);
+}
+
+void ThisbacksDlg::GatherCallbacks(const String& pfx, Index<String>& done,
+                                   const String& nest, int access)
+{
+	String h = pfx + nest;
+	if(done.Find(h) >= 0)
+		return;
+	done.Add(h);
+	int q = BrowserBase().Find(NoTemplatePars(nest));
+	if(q < 0)
+		return;
+	CppNest& m = BrowserBase()[q];
+	for(int i = 0; i < m.GetCount(); i++) {
+		const CppItem& im = m[i];
+		if(im.IsData() && IsCb(im.qtype) && im.access <= access) {
+			String n = m.name[i];
+			String name = pfx + '.' + n;
+			if(*name == '.')
+				name = name.Mid(1);
+			if(name == "WhenAction")
+				n = "Action";
+			else {
+				Vector<String> ss = Split(name, '.');
+				for(int i = 0; i < ss.GetCount(); i++) {
+					String& s = ss[i];
+					if(s == "WhenAction")
+						s.Clear();
+					else {
+						if(memcmp(s, "When", 4) == 0)
+							s = s.Mid(4);
+						if(s.GetCount())
+							s.Set(0, ToUpper(s[0]));
+					}
+				}
+				n = Join(ss, "");
+				while(nname.Find(n) >= 0)
+					n = "On" + n;
+			}
+			list.Add(nest, im.type, name, 0, n, m.name[i]);
+		}
+	}
+	for(int i = 0; i < m.GetCount(); i++) {
+		const CppItem& im = m[i];
+		if(im.IsType() && im.access <= access) {
+			Vector<String> b = Split(im.qptype, ';');
+			SubstituteTpars(b, nest);
+			for(int i = 0; i < b.GetCount(); i++)
+				GatherCallbacks(pfx, done, b[i], min(access, (int)PROTECTED));
+		}
+	}
+	for(int i = 0; i < m.GetCount(); i++) {
+		const CppItem& im = m[i];
+		if(im.IsData() && im.type.GetCount() && !IsCb(im.qtype)
+		   && im.natural.Find('&') < 0 && im.natural.Find('*') < 0
+		   && im.access <= access
+		   && memcmp(m.name[i], "dv___", 5))
+			GatherCallbacks(pfx + "." + m.name[i], done, im.qtype, min(access, (int)PUBLIC));
+	}
+}
+
+void ThisbacksDlg::Generate(String& ins, String& clip, const String& nest)
+{
+	String ac;
+	for(int i = 0; i < list.GetCount(); i++) {
+		if((bool)list.Get(i, 3)) {
+			String type = list.Get(i, 1);
+			String name = list.Get(i, 2);
+			String method = list.Get(i, 4);
+			int q = name.Find('.');
+			if((String)list.Get(i, 5) == "WhenAction" && q >= 0)
+				ins << name.Mid(0, q) << " <<= THISBACK(" << method;
+			else
+				ins << name << " = THISBACK(" << method;
+			ins << ");\n";
+			if(nname.Find(method) < 0) {
+				String param;
+				q = type.Find('<');
+				if(q >= 0) {
+					int qq = type.ReverseFind('>');
+					if(q < qq) {
+						param = String(~type + q + 1, ~type + qq);
+						type.Trim(q);
+					}
+				}
+				String n = nest;
+				if(n[0] == ':' && n[1] == ':')
+					n = n.Mid(2);
+				String t = (memcmp(type, "Gate", 4) == 0 ? "bool " : "void ");
+				clip << t << n << "::" << method << "(" << param << ")\n{\n}\n\n";
+				ac << '\t' << t << method << "(" << param << ");\n";
+			}
+		}
+	}
+	clip << ac;
+}
+
+INITBLOCK
+{
+	RegisterGlobalConfig("ThisbacksDlg");
+}
+
+void AssistEditor::Thisbacks()
+{
+	Parser ctx;
+	Context(ctx, GetCursor());
+	if(IsNull(ctx.current_nest) || ctx.current_nest == "::" || !ctx.IsInBody())
+		return;
+	ThisbacksDlg dlg(ctx.current_nest);
+	LoadFromGlobal(dlg, "ThisbacksDlg");
+	int c = dlg.Run();
+	StoreToGlobal(dlg, "ThisbacksDlg");
+	if(c != IDOK)
+		return;
+	String a, b;
+	dlg.Generate(a, b, ctx.current_nest);
+	Paste(a.ToWString());
+	WriteClipboardText(b);
+}
diff --git a/uppsrc/ide/Uninstall.cpp b/uppsrc/ide/Uninstall.cpp
new file mode 100644
index 000000000..505b75da8
--- /dev/null
+++ b/uppsrc/ide/Uninstall.cpp
@@ -0,0 +1,71 @@
+#include "ide.h"
+
+#ifdef PLATFORM_WIN32
+
+String GetShellFolder(const char *name, HKEY type)
+{
+	return GetWinRegString(name,
+	         "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders",
+		     type);
+}
+
+void DelKey(const char *dir, const char *key)
+{
+	HKEY hkey;
+	if(RegOpenKeyEx(HKEY_LOCAL_MACHINE, dir, 0, KEY_READ, &hkey) != ERROR_SUCCESS)
+		return;
+	RegDeleteKey(hkey, key);
+	RegCloseKey(hkey);
+}
+
+void RemoveWindowsItems()
+{
+	DeleteFile(AppendFileName(GetShellFolder("Common Programs", HKEY_LOCAL_MACHINE), "Ultimate++ IDE.lnk"));
+	DeleteFile(AppendFileName(GetShellFolder("Desktop", HKEY_CURRENT_USER), "TheIde.lnk"));
+
+	DelKey("SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Ultimate++",
+	       "DisplayName");
+	DelKey("SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Ultimate++",
+	       "UninstallString");
+	DelKey("SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall",
+	       "Ultimate++");
+}
+
+void Uninstall()
+{
+	String path = GetExeFilePath();
+	String bat = AppendFileName(GetShellFolder("Desktop", HKEY_CURRENT_USER), "removepp.bat");
+	String dir = GetFileFolder(path);
+	if(!PromptYesNo("[*3 Do you wish to uninstall Ultimate`+`+ development system ?&&]"
+	                "Uninstall will remove [* " + DeQtf(dir) + "] directory and all "
+	                "registry and desktop items associated with Ultimate`+`+.")) return;
+	DeleteFolderDeep(dir);
+	RemoveWindowsItems();
+	SaveFile(bat,
+		":Repeat\r\n"
+		"del \"" + path + "\"\r\n"
+		"if exist \"" + path + "\" goto Repeat\r\n"
+		"del \"" + GetExeDirFile("theide.log") + "\"\r\n"
+		"rmdir \"" + dir + "\"\r\n"
+		"del \"" + bat + "\"\r\n"
+	);
+
+	STARTUPINFO si;
+	PROCESS_INFORMATION pi;
+	ZeroMemory(&si, sizeof(si));
+	si.cb = sizeof(si);
+	si.dwFlags = STARTF_USESHOWWINDOW;
+	si.wShowWindow = SW_HIDE;
+	char h[512];
+	strcpy(h, bat);
+	if(!CreateProcess(NULL, h, NULL, NULL, FALSE,
+	                  IDLE_PRIORITY_CLASS, NULL, GetShellFolder("Desktop", HKEY_CURRENT_USER),
+	                  &si, &pi))
+		Exclamation("Uninstall failed to remove some files...&" + DeQtf(GetLastErrorMessage()));
+}
+
+#else
+
+void Uninstall() {}
+
+#endif
diff --git a/uppsrc/ide/UppDlg.cpp b/uppsrc/ide/UppDlg.cpp
new file mode 100644
index 000000000..19abec169
--- /dev/null
+++ b/uppsrc/ide/UppDlg.cpp
@@ -0,0 +1,575 @@
+#include "ide.h"
+
+struct OptionDisplay : Display {
+	virtual void Paint(Draw& w, const Rect& r, const Value& q, Color ink,
+	                   Color paper, dword style) const
+	{
+		WString txt = q;
+		w.DrawRect(r, paper);
+		w.Clipoff(r.left + 10, r.top, r.Width() - 20, r.Height());
+		int tcy = GetTLTextHeight(txt, StdFont());
+		DrawTLText(w, 0, max((r.Height() - tcy) / 2, 0), r.Width(), txt, StdFont(), ink);
+		w.End();
+	}
+};
+
+struct OptionHeaderDisplay : Display {
+	virtual void Paint(Draw& w, const Rect& r, const Value& q, Color ink,
+	                   Color paper, dword style) const
+	{
+		WString txt = q;
+		w.DrawRect(r, SColorInfo);
+		w.Clipoff(r.left + 5, r.top, r.Width(), r.Height());
+		int tcy = GetTLTextHeight(txt, StdFont().Bold());
+		DrawTLText(w, 0, max((r.Height() - tcy) / 2, 0), r.Width(), txt,
+		           StdFont().Bold(), SColorText);
+		w.End();
+	}
+};
+
+struct DependsDisplay : Display {
+	virtual void Paint(Draw& w, const Rect& r, const Value& q, Color ink,
+	                   Color paper, dword style) const
+	{
+		WString txt = q;
+		w.DrawRect(r, paper);
+		w.Clipoff(r.left + 10, r.top, r.Width() - 20, r.Height());
+		Image img = IdeFileImage(q);
+		Size isz = img.GetSize();
+		w.DrawImage(0, (r.Height() - isz.cy) / 2, img);
+		int tcy = GetTLTextHeight(txt, StdFont());
+		DrawTLText(w, isz.cx + 4, max((r.Height() - tcy) / 2, 0), r.Width(), txt, StdFont(), ink);
+		w.End();
+	}
+};
+
+struct UsesDisplay : Display {
+	virtual void Paint(Draw& w, const Rect& r, const Value& q, Color ink,
+	                   Color paper, dword style) const
+	{
+		WString txt = q;
+		w.DrawRect(r, paper);
+		w.Clipoff(r.left + 10, r.top, r.Width() - 20, r.Height());
+		Size isz = IdeImg::Package().GetSize();
+		w.DrawImage(0, (r.Height() - isz.cy) / 2, IdeImg::Package());
+		int tcy = GetTLTextHeight(txt, StdFont());
+		DrawTLText(w, isz.cx + 4, max((r.Height() - tcy) / 2, 0), r.Width(), txt, StdFont(), ink);
+		w.End();
+	}
+};
+
+int FlagFilter(int c) {
+	return IsAlNum(c) || c == '_' || c == ' ' ? ToUpper(c) : 0;
+}
+
+int FlagFilterM(int c) {
+	return c == '.' ? '.' : FlagFilter(c);
+}
+
+int CondFilter(int c) {
+	return c == '!' || c == '(' || c == ')' || c == '&' || c == '|' ? c : FlagFilter(c);
+}
+
+void UsesDlg::New()
+{
+	text <<= SelectPackage("Select package");
+}
+
+UsesDlg::UsesDlg()
+{
+	CtrlLayoutOKCancel(*this, "Uses");
+	when.SetFilter(CondFilter);
+	text.SetDisplay(Single<UsesDisplay>());
+	text.WhenPush = THISBACK(New);
+}
+
+void PackageEditor::SaveOptions() {
+	if(!actualpackage.IsEmpty()) {
+		actual.description = ~description;
+		actual.charset = (byte)(int)~charset;
+		actual.accepts = Split(accepts.GetText().ToString(), ' ');
+		actual.optimize_speed = optimize_speed;
+		actual.noblitz = noblitz;
+		if(IsActiveFile())
+			ActiveFile().optimize_speed = optimize_speed_file;
+		SavePackage();
+	}
+}
+
+bool PackageEditor::Key(dword key, int count)
+{
+	if(key == K_ESCAPE) {
+		Close();
+		return true;
+	}
+	return TopWindow::Key(key, count);
+}
+
+void PackageEditor::Empty()
+{
+	FileEmpty();
+	charset.Disable();
+	noblitz.Disable();
+	description.Disable();
+	optimize_speed.Disable();
+	filelist.Clear();
+	filelist.Disable();
+	option.Clear();
+	option.Disable();
+}
+
+void PackageEditor::FileEmpty()
+{
+	fileoption.Clear();
+	fileoption.Disable();
+	optimize_speed_file = false;
+	optimize_speed_file.Disable();
+}
+
+void PackageEditor::OptionAdd(ArrayCtrl& option, int type, const char *title, const Array<OptItem>& o)
+{
+	if(o.GetCount() == 0)
+		return;
+	option.Add(-1, -1, "when", title);
+	option.SetDisplay(option.GetCount() - 1, 0, Single<OptionHeaderDisplay>());
+	option.SetDisplay(option.GetCount() - 1, 1, Single<OptionHeaderDisplay>());
+	for(int i = 0; i < o.GetCount(); i++) {
+		option.Add(type, i, o[i].when, o[i].text);
+		if(type == USES)
+			option.SetDisplay(option.GetCount() - 1, 1, Single<UsesDisplay>());
+		if(type == FILEDEPENDS)
+			option.SetDisplay(option.GetCount() - 1, 1, Single<DependsDisplay>());
+	}
+}
+
+void PackageEditor::OptionAdd(int type, const char *title, const Array<OptItem>& o)
+{
+	OptionAdd(option, type, title, o);
+}
+
+void PackageEditor::PackageCursor()
+{
+	WorkspaceWork::PackageCursor();
+	if(IsNull(actualpackage))
+		Empty();
+	else {
+		description <<= actual.description;
+		charset <<= (int)actual.charset;
+		optimize_speed = actual.optimize_speed;
+		noblitz = actual.noblitz;
+		String s;
+		for(int i = 0; i < actual.accepts.GetCount(); i++) {
+			if(i) s << ' ';
+			s << actual.accepts[i];
+		}
+		accepts = s.ToWString();
+		description.Enable();
+		charset.Enable();
+		noblitz.Enable();
+		optimize_speed.Enable();
+		accepts.Enable();
+		option.Enable();
+		option.Clear();
+		for(int i = FLAG; i <= COMPILER; i++)
+			OptionAdd(i, opt_name[i], *opt[i]);
+	}
+}
+
+void PackageEditor::AdjustOptionCursor(ArrayCtrl& option)
+{
+	int q = option.GetCursor();
+	if(q < 0)
+		return;
+	if((int)option.Get(q, 0) < 0 && q + 1 < option.GetCount())
+		option.SetCursor(q + 1);
+}
+
+void PackageEditor::AdjustPackageOptionCursor()
+{
+	AdjustOptionCursor(option);
+}
+
+void PackageEditor::FindOpt(ArrayCtrl& option, int type, const String& when, const String& text)
+{
+	for(int i = 0; i < option.GetCount(); i++)
+		if((int)option.Get(i, 0) == type &&
+		   (String)option.Get(i, 2) == when && (String)option.Get(i, 3) == text) {
+			option.SetCursor(i);
+			option.SetFocus();
+			break;
+		 }
+}
+
+void PackageEditor::FindOpt(ArrayCtrl& option, int type, int ii)
+{
+	for(int i = 0; i < option.GetCount(); i++)
+		if((int)option.Get(i, 0) == type && (int)option.Get(i, 1) == ii) {
+			option.SetCursor(i);
+			option.SetFocus();
+			break;
+		 }
+}
+
+void PackageEditor::SetOpt(ArrayCtrl& opt, int type, OptItem& m, const String& when, const String& text)
+{
+	m.when = when;
+	m.text = text;
+	SaveLoadPackage();
+	FindOpt(opt, type, when, text);
+}
+
+void PackageEditor::AddOption(int type)
+{
+	if(IsNull(actualpackage))
+		return;
+	if(type == USES) {
+		UsesDlg dlg;
+		dlg.New();
+		if(dlg.Run() == IDOK)
+			SetOpt(option, USES, actual.uses.Add(), ~dlg.when, ~dlg.text);
+		return;
+	}
+	WithUppOptDlg<TopWindow> dlg;
+	CtrlLayoutOKCancel(dlg, opt_name[type]);
+	dlg.when.SetFilter(CondFilter);
+	if(dlg.Run() != IDOK)
+		return;
+	SetOpt(option, type, opt[type]->Add(), ~dlg.when, ~dlg.text);
+}
+
+void PackageEditor::RemoveOption()
+{
+	if(!option.IsCursor() || IsNull(actualpackage))
+		return;
+	int type = option.Get(0);
+	if(type >= FLAG && type <= COMPILER) {
+		Array<OptItem>& m = *opt[type];
+		int i = option.Get(1);
+		if(i >= 0 && i < m.GetCount())
+			m.Remove(i);
+		SaveLoadPackage();
+	}
+}
+
+void PackageEditor::EditOption()
+{
+	if(!option.IsCursor() || IsNull(actualpackage))
+		return;
+	int type = option.Get(0);
+	if(type == USES) {
+		Array<OptItem>& m = *opt[type];
+		int i = option.Get(1);
+		if(i >= 0 && i < m.GetCount()) {
+			UsesDlg dlg;
+			dlg.when <<= m[i].when;
+			dlg.text <<= m[i].text;
+			if(dlg.Run() == IDOK)
+				SetOpt(option, USES, m[i], ~dlg.when, ~dlg.text);
+		}
+		return;
+	}
+	if(type >= FLAG && type <= COMPILER) {
+		Array<OptItem>& m = *opt[type];
+		int i = option.Get(1);
+		if(i >= 0 && i < m.GetCount()) {
+			WithUppOptDlg<TopWindow> dlg;
+			CtrlLayoutOKCancel(dlg, opt_name[type]);
+			dlg.when <<= m[i].when;
+			dlg.text <<= m[i].text;
+			if(dlg.Run() != IDOK)
+				return;
+			SetOpt(option, type, m[i], ~dlg.when, ~dlg.text);
+		}
+	}
+}
+
+void PackageEditor::MoveOption(int d)
+{
+	if(!option.IsCursor() || IsNull(actualpackage))
+		return;
+	int type = option.Get(0);
+	if(type >= FLAG && type <= COMPILER) {
+		Array<OptItem>& m = *opt[type];
+		int i = option.Get(1);
+		if(min(i, i + d) >= 0 && max(i, i + d) < m.GetCount()) {
+			Swap(m[i], m[i + d]);
+			SaveLoadPackage();
+			FindOpt(option, type, i + d);
+		}
+	}
+}
+
+void PackageEditor::OptionMenu(Bar& bar)
+{
+	bool b = !IsNull(actualpackage);
+	bar.Add(b, "Add package..", IdeImg::package_add(), THISBACK1(AddOption, USES));
+	for(int j = FLAG; j <= COMPILER; j++)
+		if(j != USES)
+			bar.Add(b, "New " + opt_name[j] + "..", THISBACK1(AddOption, j));
+	bar.Separator();
+	b = option.IsCursor() && (int)option.Get(0) >= 0;
+	bar.Add(b, "Edit..", THISBACK(EditOption))
+		.Key(K_CTRL_ENTER);
+	bar.Add(b, "Remove", THISBACK(RemoveOption))
+	   .Key(K_DELETE);
+	bar.Separator();
+	int type = option.IsCursor() ? (int)option.Get(0) : -1;
+	int i = -1;
+	Array<OptItem> *m = NULL;
+	if(type >= FLAG && type <= COMPILER) {
+		m = opt[type];
+		i = option.Get(1);
+	}
+	bar.Add(i >= 0 && min(i, i - 1) >= 0,
+	        "Move up", THISBACK1(MoveOption, -1))
+	   .Key(K_CTRL_UP);
+	bar.Add(m && i >= 0 && max(i, i + 1) < m->GetCount(),
+	        "Move down", THISBACK1(MoveOption, 1))
+	   .Key(K_CTRL_DOWN);
+}
+
+void PackageEditor::FileCursor()
+{
+	WorkspaceWork::FileCursor();
+	if(IsActiveFile()) {
+		Package::File& f = ActiveFile();
+		if(!f.separator) {
+			optimize_speed_file.Enable();
+			optimize_speed_file = actual.file[actualfileindex].optimize_speed;
+			fileoption.Enable();
+			fileoption.Clear();
+			OptionAdd(fileoption, FILEOPTION, "Additional compiler options for the file",
+			          f.option);
+			OptionAdd(fileoption, FILEDEPENDS, "Additional dependencies for the file",
+			          f.depends);
+			return;
+		}
+	}
+	FileEmpty();
+}
+
+void PackageEditor::AdjustFileOptionCursor()
+{
+	AdjustOptionCursor(fileoption);
+}
+
+void PackageEditor::FileOptionMenu(Bar& bar)
+{
+	bool b = IsActiveFile();
+	bar.Add(b, "Add compiler flags..", THISBACK(AddFileOption)).Key(K_INSERT);
+	bar.Add(b, "Add dependence..", THISBACK1(AddDepends, false)).Key(K_CTRL_INSERT);
+	bar.Add(b, "Add external dependence..", THISBACK1(AddDepends, true)).Key(K_SHIFT_INSERT);
+	bar.Separator();
+	b = fileoption.IsCursor() && (int)fileoption.Get(0) >= 0;
+	int type = b ? (int)fileoption.Get(0) : -1;
+	bar.Add(b, "Edit..", THISBACK(EditFileOption)).Key(K_CTRL_ENTER);
+	bar.Add(b, "Remove", THISBACK(RemoveFileOption)).Key(K_DELETE);
+	bar.Separator();
+	int i = -1;
+	Array<OptItem> *m = NULL;
+	if(type >= 0) {
+		m = type == FILEDEPENDS ? &ActiveFile().depends : &ActiveFile().option;
+		i = fileoption.Get(1);
+	}
+	bar.Add(i >= 0 && min(i, i - 1) >= 0,
+	        "Move up", THISBACK1(MoveFileOption, -1))
+	   .Key(K_CTRL_UP);
+	bar.Add(m && i >= 0 && max(i, i + 1) < m->GetCount(),
+	        "Move down", THISBACK1(MoveFileOption, 1))
+	   .Key(K_CTRL_DOWN);
+}
+
+void PackageEditor::MoveFileOption(int d)
+{
+	if(!fileoption.IsCursor() || !IsActiveFile())
+		return;
+	int type = fileoption.Get(0);
+	if(type < 0)
+		return;
+	Array<OptItem>& m = type == FILEDEPENDS ? ActiveFile().depends : ActiveFile().option;
+	int i = fileoption.Get(1);
+	if(min(i, i + d) >= 0 && max(i, i + d) < m.GetCount()) {
+		Swap(m[i], m[i + d]);
+		SaveLoadPackage();
+		FindOpt(fileoption, type, i + d);
+	}
+}
+
+void DependsDlg::New()
+{
+	FileSel *fs;
+	if(!IsNull(package)) {
+		fs = &BasedSourceFs();
+		fs->BaseDir(GetFileFolder(PackagePath(package)));
+		fs->Multi(false);
+	}
+	else {
+		fs = &OutputFs();
+		fs->Multi(false);
+	}
+	if(fs->ExecuteOpen("Additional file dependency"))
+		text <<= ~*fs;
+	fs->Multi();
+}
+
+DependsDlg::DependsDlg()
+{
+	CtrlLayoutOKCancel(*this, "Additional file dependency");
+	when.SetFilter(CondFilter);
+	text.SetDisplay(Single<DependsDisplay>());
+	text.WhenPush = THISBACK(New);
+}
+
+void PackageEditor::AddDepends(bool extdep)
+{
+	if(!IsActiveFile())
+		return;
+	DependsDlg dlg;
+	if(!extdep)
+		dlg.package = GetActivePackage();
+	dlg.New();
+	if(dlg.Run() == IDOK)
+		SetOpt(fileoption, FILEDEPENDS, ActiveFile().depends.Add(), ~dlg.when, ~dlg.text);
+}
+
+void PackageEditor::AddFileOption()
+{
+	if(!IsActiveFile())
+		return;
+	WithUppOptDlg<TopWindow> dlg;
+	CtrlLayoutOKCancel(dlg, "Compiler options for the file");
+	dlg.when.SetFilter(CondFilter);
+	if(dlg.Run() == IDOK)
+		SetOpt(fileoption, FILEDEPENDS, ActiveFile().option.Add(), ~dlg.when, ~dlg.text);
+}
+
+void PackageEditor::EditFileOption()
+{
+	if(!IsActiveFile() || !fileoption.IsCursor())
+		return;
+	int ii = (int)fileoption.Get(1);
+	Package::File& f = ActiveFile();
+	if(ii < 0 || ii >= f.option.GetCount())
+		return;
+	OptItem& m = f.option[(int)fileoption.Get(1)];
+	WithUppOptDlg<TopWindow> dlg;
+	CtrlLayoutOKCancel(dlg, "Compiler options for the file");
+	dlg.when.SetFilter(CondFilter);
+	dlg.when <<= m.when;
+	dlg.text <<= m.text;
+	if(dlg.Run() != IDOK)
+		return;
+	m.when = dlg.when;
+	m.text = dlg.text;
+	SaveLoadPackage();
+	FindOpt(fileoption, FILEOPTION, ~dlg.when, ~dlg.text);
+}
+
+void PackageEditor::RemoveFileOption()
+{
+	if(!IsActiveFile() || !fileoption.IsCursor())
+		return;
+	int ii = (int)fileoption.Get(1);
+	Package::File& f = ActiveFile();
+	int type = fileoption.Get(0);
+	if(type == FILEOPTION && ii >= 0 && ii < f.option.GetCount())
+		f.option.Remove(ii);
+	if(type == FILEDEPENDS && ii >= 0 && ii < f.depends.GetCount())
+		f.depends.Remove(ii);
+	SaveLoadPackage();
+}
+
+void PackageEditor::Serialize(Stream& s) {
+	int version = 2;
+	s / version;
+	s % filelist % package % package;
+	SerializePlacement(s);
+	if(version >= 1 && version <= 2) {
+		Splitter dummy;
+		s % dummy % dummy % dummy % dummy % dummy % dummy;
+	}
+}
+
+void PackageEditor::Add(const char *name, Array<OptItem>& m)
+{
+	opt.Add(&m);
+	opt_name.Add(name);
+}
+
+void PackageEditor::Init(ArrayCtrl& option)
+{
+	option.AddIndex();
+	option.AddIndex();
+	option.AddColumn("").SetDisplay(Single<OptionDisplay>()).Margin(0);
+	option.AddColumn("", 2).SetDisplay(Single<OptionDisplay>()).Margin(0);
+	option.NoHeader();
+	option.SetLineCy(max(IdeImg::Package().GetSize().cy, Draw::GetStdFontCy()));
+}
+
+void PackageEditor::SaveOptionsLoad()
+{
+	SaveOptions();
+	SaveLoadPackage();
+}
+
+void PackageEditor::Description()
+{
+	WithDescriptionLayout<TopWindow> dlg;
+	CtrlLayoutOKCancel(dlg, "Package description");
+	dlg.text <<= ~description;
+	if(dlg.Run() != IDOK)
+		return;
+	description <<= ~dlg.text;
+	SaveOptions();
+}
+
+PackageEditor::PackageEditor()
+{
+	organizer = true;
+	CtrlLayoutOKCancel(*this, "Package organizer");
+	description.Disable();
+	description <<= THISBACK(Description);
+	DlCharsetD(charset);
+	charset.Disable();
+	optimize_speed.Disable();
+	filelist.Disable();
+	accepts.SetFilter(FlagFilter);
+	accepts <<=
+	charset <<= THISBACK(SaveOptions);
+	noblitz <<=
+	optimize_speed <<=
+	optimize_speed_file <<= THISBACK(SaveOptionsLoad);
+
+	Add("Add/remove flags", actual.flag);
+	Add("Uses", actual.uses);
+	Add("Targets", actual.target);
+	Add("Libraries", actual.library);
+	Add("Link options", actual.link);
+	Add("Compiler options", actual.option);
+
+	Init(option);
+	option.WhenCursor = THISBACK(AdjustPackageOptionCursor);
+	option.WhenBar = THISBACK(OptionMenu);
+	option.WhenLeftDouble = THISBACK(EditOption);
+
+	Init(fileoption);
+	fileoption.WhenCursor = THISBACK(AdjustFileOptionCursor);
+	fileoption.WhenBar = THISBACK(FileOptionMenu);
+	fileoption.WhenLeftDouble = THISBACK(EditFileOption);
+}
+
+void EditPackages(const char *main, const char *startwith, String& cfg) {
+	PackageEditor pe;
+	pe.Sizeable();
+	StringStream in(cfg);
+	pe.Serialize(in);
+	pe.SetMain(main);
+	pe.ScanWorkspace();
+	pe.SyncWorkspace();
+	pe.FindSetPackage(startwith);
+	if(pe.Run() != IDOK)
+		pe.RestoreBackup();
+	StringStream out;
+	pe.Serialize(out);
+	cfg = out;
+}
diff --git a/uppsrc/ide/UppDlg.h b/uppsrc/ide/UppDlg.h
new file mode 100644
index 000000000..c84c9e7bf
--- /dev/null
+++ b/uppsrc/ide/UppDlg.h
@@ -0,0 +1,269 @@
+#ifdef PLATFORM_POSIX
+inline bool MoveFile(const char *oldpath, const char *newpath)
+{
+	return !rename(oldpath, newpath);
+}
+#endif
+
+struct FileTemplate {
+	String filename;
+	String condition;
+	String text;
+};
+
+enum {
+	TEMPLATEITEM_ID, TEMPLATEITEM_FILENAME, TEMPLATEITEM_OPTION, TEMPLATEITEM_SELECT,
+	TEMPLATEITEM_TEXT
+};
+
+struct TemplateItem {
+	String         label;
+	int            type;
+	String         id;
+	Vector<String> value;
+	String         init;
+};
+
+struct PackageTemplate {
+	String              name;
+	bool                main, sub;
+	Array<TemplateItem> item;
+	Array<FileTemplate> file;
+};
+
+struct AppPreview : Ctrl {
+	virtual void Paint(Draw& w);
+	virtual void Layout();
+	virtual void MouseWheel(Point p, int zdelta, dword keyflags);
+
+	ScrollBar      sb;
+	struct Line : Moveable<Line> {
+		String text;
+		bool   header;
+	};
+	Vector<Line> line;
+
+	void Scroll() { Refresh(); }
+
+	void Clear() { line.Clear(); Refresh(); sb.Set(0); }
+	void Add(const String& data, bool header = false);
+
+	typedef AppPreview CLASSNAME;
+
+	AppPreview();
+	virtual ~AppPreview();
+};
+
+struct TemplateDlg : public WithNewPackageLayout<TopWindow> {
+	AppPreview      preview;
+
+	Array<PackageTemplate> pt;
+
+	Array<Label>  label;
+	Array<Ctrl>   ctrl;
+	DelayCallback delay;
+
+	const PackageTemplate& ActualTemplate();
+
+	String GetPackageFile();
+	void Preview();
+	void EnterTemplate();
+	void LoadNest(const char *dir, bool main, bool recurse = true);
+	void Load(const Vector<String>& path, bool main);
+	void EnableCreate() { ok.Enable(!IsNull(package)); Inits(); delay.Invoke(); }
+	void Inits();
+
+	ArrayMap<String, EscValue> MakeVars0();
+	ArrayMap<String, EscValue> MakeVars();
+	void Create();
+
+	void Serialize(Stream& s) { SerializePlacement(s); }
+
+	typedef TemplateDlg CLASSNAME;
+	TemplateDlg();
+	virtual ~TemplateDlg();
+};
+
+String SelectPackage(const char *title, const char *startwith = NULL,
+	bool selectvars = false, bool all = false);
+
+int CondFilter(int c);
+int FlagFilter(int c);
+int FlagFilterM(int c);
+
+struct UsesDlg : public WithUppOptPushDlg<TopWindow> {
+	void New();
+
+	typedef UsesDlg CLASSNAME;
+
+	UsesDlg();
+};
+
+struct DependsDlg : public WithUppOptPushDlg<TopWindow> {
+	String package;
+
+	void New();
+
+	typedef DependsDlg CLASSNAME;
+
+	DependsDlg();
+};
+
+struct WorkspaceWork {
+	static    Font ListFont();
+
+	FileList    package;
+	FileList    filelist;
+	Vector<int> fileindex;
+
+	String    main;
+	String    actualpackage;
+	int       actualfileindex;
+	Package   actual;
+
+	struct Sepfo : Moveable<Sepfo> {
+		String package;
+		String separator;
+
+		bool operator==(const Sepfo& s) const { return package == s.package && separator == s.separator; }
+		unsigned GetHashValue() const         { return CombineHash(::GetHashValue(package),
+		                                                           ::GetHashValue(separator)); }
+		void Serialize(Stream& s)             { s % package % separator; }
+		Sepfo(const String& package, const String& separator) : package(package), separator(separator) {}
+		Sepfo() {}
+	};
+
+	Index<Sepfo> closed;
+
+	struct Backup {
+		FileTime time;
+		String   data;
+	};
+
+	ArrayMap<String, Backup> backup;
+
+	bool         organizer;
+
+	virtual void   PackageCursor();
+	virtual void   FileCursor();
+	virtual void   BuildPackageMenu(Bar& bar)         {}
+	virtual void   BuildFileMenu(Bar& bar)            {}
+	virtual void   FilePropertiesMenu(Bar& bar)       {}
+	virtual String GetOutputDir()                     { return Null; }
+	virtual void   SyncWorkspace()                    {}
+	virtual void   FileSelected()                     {}
+	virtual void   FileRename(const String& nm)       {}
+
+	void   ScanWorkspace();
+	void   SavePackage();
+	void   RestoreBackup();
+
+	void SerializeFileSetup(Stream& s)                { s % filelist % package; }
+
+	Sepfo  GetActiveSepfo();
+	void   Group();
+	void   OpenAllGroups();
+	void   CloseAllGroups();
+	void   GroupOrFile(Point pos);
+
+	void   SetMain(const String& m)                           { main = m; }
+	void   FindSetPackage(const String& s)                    { package.FindSetCursor(s); }
+
+	void   ShowFile(int pi);
+
+	String         GetActivePackage() const                   { return package.GetCurrentName(); }
+	String         GetActiveFileName() const;
+	bool           IsActiveFile() const;
+	Package::File& ActiveFile();
+	String         FileName(int i) const;
+	bool           IsSeparator(int i) const;
+
+	void LoadActualPackage();
+	void SaveLoadPackage();
+	void SaveLoadPackageNS();
+
+	void MoveFile(int d);
+	void Move(Vector<String>& v, FileList& ta, int d);
+
+	enum ADDFILE { PACKAGE_FILE, OUTPUT_FILE, HOME_FILE, COMMON_FILE, LOCAL_FILE, ANY_FILE };
+	void AddFile(ADDFILE type);
+	void AddItem(const String& name, bool separator, bool readonly);
+	void AddTopicGroup();
+	void AddSeparator();
+	void RemoveFile();
+	void DelFile();
+	void RenameFile();
+	void ToggleFileSpeed();
+
+	void AddNormalUses();
+	void AddAnyUses();
+	void TogglePackageSpeed();
+
+	void RemovePackageMenu(Bar& bar);
+	void RemovePackage(String from_package);
+
+	void PackageMenu(Bar& bar);
+	void FileMenu(Bar& bar);
+
+	String PackagePathA(const String& pn);
+
+	void SerializeClosed(Stream& s);
+
+	typedef WorkspaceWork CLASSNAME;
+
+	WorkspaceWork();
+	virtual ~WorkspaceWork() {}
+};
+
+struct PackageEditor : WorkspaceWork, WithUppLayout<TopWindow> {
+	virtual bool Key(dword key, int);
+	virtual void FileCursor();
+	virtual void PackageCursor();
+
+	enum OptionType {
+		FLAG = 0, USES, TARGET, LIBRARY, LINK, COMPILER,
+		FILEOPTION, FILEDEPENDS
+	};
+
+	Vector<Array<OptItem> *> opt;
+	Vector<String>           opt_name;
+
+	void Add(const char *name, Array<OptItem>& m);
+
+	void Serialize(Stream& s);
+	void SaveOptions();
+	void SaveOptionsLoad();
+
+	void Empty();
+	void FileEmpty();
+	void OptionAdd(ArrayCtrl& option, int type, const char *title, const Array<OptItem>& o);
+	void FindOpt(ArrayCtrl& option, int type, const String& when, const String& text);
+	void FindOpt(ArrayCtrl& option, int type, int ii);
+	void AdjustOptionCursor(ArrayCtrl& option);
+	void Init(ArrayCtrl& option);
+	void SetOpt(ArrayCtrl& opt, int type, OptItem& m, const String& when, const String& text);
+
+	void OptionAdd(int type, const char *title, const Array<OptItem>& o);
+	void AdjustPackageOptionCursor();
+	void AddOption(int type);
+	void OptionMenu(Bar& bar);
+	void RemoveOption();
+	void EditOption();
+	void MoveOption(int d);
+
+	void AdjustFileOptionCursor();
+	void FindFileOpt(int type, const String& when, const String& text);
+	void FileOptionMenu(Bar& bar);
+	void MoveFileOption(int d);
+	void AddDepends(bool external_deps);
+	void AddFileOption();
+	void EditFileOption();
+	void RemoveFileOption();
+	void Description();
+
+	typedef PackageEditor CLASSNAME;
+
+	PackageEditor();
+};
+
+void EditPackages(const char *main, const char *startwith, String& cfg);
diff --git a/uppsrc/ide/UppWspc.cpp b/uppsrc/ide/UppWspc.cpp
new file mode 100644
index 000000000..5acaef4f3
--- /dev/null
+++ b/uppsrc/ide/UppWspc.cpp
@@ -0,0 +1,664 @@
+#include "ide.h"
+
+const char tempaux[] = "<temp-aux>";
+const char prjaux[] = "<prj-aux>";
+const char ideaux[] = "<ide-aux>";
+
+Font WorkspaceWork::ListFont()
+{
+	return StdFont();
+};
+
+String WorkspaceWork::PackagePathA(const String& pn) {
+	if(pn == prjaux) {
+		String nm;
+		String cfg = ConfigFile("cfg");
+		for(const char *s = main; *s; s++)
+			nm.Cat(*s == '\\' || *s == '/' ? '$' : *s);
+		RealizeDirectory(cfg);
+		return AppendFileName(cfg, ForceExt(nm + '@' + GetVarsName(), ".aux"));
+	}
+	if(pn == ideaux)
+		return ConfigFile("ide.aux");
+	if(pn == tempaux)
+		return ConfigFile(Sprintf("aux%x.tmp",
+#ifdef PLATFORM_WIN32
+		          GetCurrentProcessId()
+#endif
+#ifdef PLATFORM_POSIX
+		          getpid()
+#endif
+		       ));
+	return PackagePath(pn);
+}
+
+void WorkspaceWork::ScanWorkspace() {
+	Workspace wspc;
+	wspc.Scan(main);
+	actualpackage.Clear();
+	actualfileindex = -1;
+	filelist.Clear();
+	package.Clear();
+	for(int i = 0; i < wspc.package.GetCount(); i++)
+		package.Add(wspc.package.GetKey(i),
+		            wspc.GetPackage(i).optimize_speed ? IdeCommonImg::FastPackage() : IdeImg::Package(),
+		            i == 0 ? ListFont().Bold() : ListFont(), SColorText, false, 0, Null, SColorMark);
+	if(!organizer) {
+		package.Add(prjaux, IdeImg::PrjAux(), ListFont(), Magenta);
+		package.Add(ideaux, IdeImg::IdeAux(), ListFont(), Magenta);
+		package.Add(tempaux, IdeImg::TempAux(), ListFont(), Magenta);
+	}
+	package.SetCursor(0);
+}
+
+void WorkspaceWork::SavePackage()
+{
+	if(IsNull(actualpackage))
+		return;
+	String pp = PackagePathA(actualpackage);
+	RealizePath(pp);
+	if(organizer && backup.Find(pp) < 0) {
+		Backup& b = backup.Add(pp);
+		FindFile ff(pp);
+		if(ff) {
+			b.time = ff.GetLastWriteTime();
+			b.data = LoadFile(pp);
+		}
+		else
+			b.data = String::GetVoid();
+	}
+	actual.Save(pp);
+	String init;
+	String mnm = Filter('_' + actualpackage + "_icpp_init_stub", CharFilterMacro);
+	init << "#ifndef " << mnm << "\r\n";
+	init << "#define " << mnm << "\r\n";
+	Index<String> once;
+	for(int i = 0; i < actual.uses.GetCount(); i++) {
+		String u = actual.uses[i].text;
+		if(once.Find(u) < 0) {
+			once.Add(u);
+			init << "#include \"" << actual.uses[i].text << "/init\"\r\n";
+		}
+	}
+	for(int i = 0; i < actual.GetCount(); i++) {
+		String f = actual[i];
+		if(ToLower(GetFileExt(f)) == ".icpp")
+			init << "#include \"" << f << "\"\r\n";
+	}
+	init << "#endif\r\n";
+	SaveChangedFile(SourcePath(actualpackage, "init"), init);
+}
+
+void WorkspaceWork::RestoreBackup()
+{
+	for(int i = 0; i < backup.GetCount(); i++) {
+		Backup& b = backup[i];
+		String fn = backup.GetKey(i);
+		if(b.data.IsVoid())
+			DeleteFile(fn);
+		else {
+			SaveFile(fn, b.data);
+			SetFileTime(fn, b.time);
+		}
+	}
+}
+
+void WorkspaceWork::SaveLoadPackageNS()
+{
+	SavePackage();
+	String p = actualpackage;
+	String f;
+	if(IsActiveFile())
+		f = ActiveFile();
+	int psc = package.GetSbPos();
+	int fsc = filelist.GetSbPos();
+	ScanWorkspace();
+	package.SetSbPos(psc);
+	package.FindSetCursor(p);
+	filelist.SetSbPos(fsc);
+	filelist.FindSetCursor(f);
+}
+
+void WorkspaceWork::SaveLoadPackage()
+{
+	SaveLoadPackageNS();
+	SyncWorkspace();
+}
+
+void WorkspaceWork::LoadActualPackage()
+{
+	filelist.Clear();
+	fileindex.Clear();
+	bool open = true;
+	for(int i = 0; i < actual.file.GetCount(); i++) {
+		Package::File& f = actual.file[i];
+		if(f.separator) {
+			open = closed.Find(Sepfo(actualpackage, f)) < 0;
+			filelist.Add(f, open ? IdeImg::SeparatorClose() : IdeImg::SeparatorOpen(),
+			             ListFont().Bold(), open ? SColorMark : SColorText, true, 0, Null);
+			fileindex.Add(i);
+		}
+		else
+		if(open) {
+			filelist.Add(f, IdeFileImage(f, f.optimize_speed), ListFont(), SColorText, false, 0,
+			             Null, SColorMark);
+			fileindex.Add(i);
+		}
+	}
+}
+
+void WorkspaceWork::PackageCursor()
+{
+	actualpackage = GetActivePackage();
+	if(actualpackage.IsEmpty()) return;
+	String pp = PackagePathA(actualpackage);
+	RealizePath(pp);
+	actual.Load(pp);
+	LoadActualPackage();
+	filelist.Enable();
+}
+
+void WorkspaceWork::FileCursor()
+{
+	int i = filelist.GetCursor();
+	actualfileindex = -1;
+	if(i >= 0 && i < fileindex.GetCount())
+		actualfileindex = fileindex[i];
+}
+
+String WorkspaceWork::FileName(int i) const
+{
+	return i >= 0 && i < fileindex.GetCount() ? (String)actual.file[fileindex[i]] : Null;
+}
+
+bool WorkspaceWork::IsSeparator(int i) const
+{
+	return i >= 0 && i < fileindex.GetCount() ? actual.file[fileindex[i]].separator : true;
+}
+
+String WorkspaceWork::GetActiveFileName() const
+{
+	return FileName(filelist.GetCursor());
+}
+
+bool   WorkspaceWork::IsActiveFile() const
+{
+	int i = filelist.GetCursor();
+	return i >= 0 && i < fileindex.GetCount() && fileindex[i] < actual.file.GetCount();
+}
+
+Package::File& WorkspaceWork::ActiveFile()
+{
+	return actual.file[fileindex[filelist.GetCursor()]];
+}
+
+void WorkspaceWork::AddFile(ADDFILE af)
+{
+	String active = GetActivePackage();
+	if(active.IsEmpty()) return;
+	FileSel fss;
+	FileSel *fs = &OutputFs();
+	RealizeDirectory(GetCommonDir());
+	RealizeDirectory(GetLocalDir());
+	switch(af)
+	{
+	case PACKAGE_FILE: fs = &BasedSourceFs(); fs->BaseDir(GetFileFolder(PackagePathA(active))); break;
+	case ANY_FILE:     fs = &AnySourceFs(); break;
+	case OUTPUT_FILE:  fs->ActiveDir(GetOutputDir()); break;
+#ifdef PLATFORM_POSIX
+	case HOME_FILE:    fs->ActiveDir(GetHomeDirectory()); break;
+#endif
+	case COMMON_FILE:  fs->ActiveDir(GetCommonDir()); break;
+	case LOCAL_FILE:   fs->ActiveDir(GetLocalDir()); break;
+	}
+	if(!fs->ExecuteOpen("Add files to package..")) return;
+	int fci = filelist.GetCursor();
+	int cs = filelist.GetSbPos();
+	int ci = fci >= 0 && fci < fileindex.GetCount() ? fileindex[fci] : -1;
+	for(int i = 0; i < fs->GetCount(); i++) {
+		Package::File& f = ci >= 0 ? actual.file.Insert(ci++) : actual.file.Add();
+		f = (*fs)[i];
+		f.readonly = fs->GetReadOnly();
+	}
+	SaveLoadPackage();
+	filelist.SetSbPos(cs);
+	filelist.SetCursor(fci >= 0 ? fci : filelist.GetCount() - 1);
+	FileSelected();
+}
+
+void WorkspaceWork::AddItem(const String& name, bool separator, bool readonly)
+{
+	int fci = filelist.GetCursor();
+	int cs = filelist.GetSbPos();
+	int ci = fci >= 0 && fci < fileindex.GetCount() ? fileindex[fci] : -1;
+	Package::File& f = ci >= 0 ? actual.file.Insert(ci) : actual.file.Add();
+	f = name;
+	f.separator = separator;
+	f.readonly = readonly;
+	SaveLoadPackage();
+	filelist.SetSbPos(cs);
+	filelist.SetCursor(fci >= 0 ? fci : filelist.GetCount() - 1);
+	FileSelected();
+}
+
+void WorkspaceWork::AddSeparator()
+{
+	String active = GetActivePackage();
+	if(active.IsEmpty()) return;
+	String name;
+	if(!EditText(name, "Insert separator", "Name"))
+		return;
+	AddItem(~name, true, true);
+}
+
+
+class Tpp : public WithTppLayout<TopWindow> {
+public:
+	void Sync() {
+		bool en = group.IsCursor() && IsNull(group.GetKey());
+		name_lbl.Enable(en);
+		name.Enable(en);
+		name_tpp.Enable(en);
+	}
+
+	void Load(const char *dir)
+	{
+		Index<String> exist;
+		FindFile ff(AppendFileName(dir, "*.tpp"));
+		while(ff) {
+			if(ff.IsFolder()) {
+				String s = GetFileTitle(ff.GetName());
+				group.Add(s, AttrText(s).SetFont(StdFont().Bold()));
+				exist.Add(s);
+			}
+			ff.Next();
+		}
+		static const char *h[4] = { "src.tpp", "srcdoc.tpp", "srcimp.tpp", "app.tpp" };
+		for(int i = 0; i < __countof(h); i++) {
+			String s = GetFileTitle(h[i]);
+			if(exist.Find(s) < 0)
+				group.Add(s, s + " (new)");
+		}
+		group.Add(Null, "<other new>");
+		group.GoBegin();
+	}
+
+	String GetName()
+	{
+		String s;
+		if(group.IsCursor()) {
+			s = group.GetKey();
+			if(IsNull(s))
+				s << ~name;
+			s << ".tpp";
+		}
+		return s;
+	}
+
+	typedef Tpp CLASSNAME;
+
+	Tpp() {
+		CtrlLayoutOKCancel(*this, "Insert topic group");
+		group.AddKey();
+		group.AddColumn("Group");
+		group.WhenSel = THISBACK(Sync);
+		name.SetFilter(CharFilterAlpha);
+	}
+};
+
+void WorkspaceWork::AddTopicGroup()
+{
+	String package = GetActivePackage();
+	if(IsNull(package)) return;
+	Tpp dlg;
+	dlg.Load(PackageDirectory(package));
+	if(dlg.Run() != IDOK) return;
+	String g = dlg.GetName();
+	if(g.GetCount())
+		AddItem(g, false, false);
+}
+
+void WorkspaceWork::RemoveFile()
+{
+	int i = filelist.GetCursor();
+	int s = filelist.GetSbPos();
+	if(i >= 0 && i < fileindex.GetCount()) {
+		int fx = fileindex[i];
+		if(actual.file[fx].separator && closed.Find(GetActiveSepfo()) >= 0) {
+			int px = fx, c;
+			while(--px >= 0 && !actual.file[fx].separator)
+				;
+			if(px >= 0 && (c = closed.Find(Sepfo(GetActivePackage(), actual.file[px]))) >= 0)
+				closed.Unlink(c);
+		}
+		actual.file.Remove(fx);
+	}
+	SaveLoadPackage();
+	filelist.SetSbPos(s);
+	filelist.SetCursor(i);
+}
+
+void WorkspaceWork::DelFile()
+{
+	if(!filelist.IsCursor() || filelist[filelist.GetCursor()].isdir) return;
+	String file = SourcePath(GetActivePackage(), GetActiveFileName());
+	if(IsFolder(file)) {
+		if(!PromptYesNo("Remove the topic group and discard ALL topics?")) return;
+		RemoveFile();
+		DeleteFolderDeep(file);
+	}
+	else {
+		if(!PromptYesNo("Remove the file from package and discard it ?")) return;
+		RemoveFile();
+		::DeleteFile(file);
+	}
+}
+
+void WorkspaceWork::RenameFile()
+{
+	if(!filelist.IsCursor()) return;
+	String n = GetActiveFileName();
+	if(!EditText(n, "Rename file", "New name")) return;
+	String spath = SourcePath(GetActivePackage(), GetActiveFileName());
+	String dpath = SourcePath(GetActivePackage(), n);
+	if(!filelist[filelist.GetCursor()].isdir && GetFileLength(spath) >= 0) {
+		if(!::MoveFile(spath, dpath)) {
+			Exclamation("Failed to rename the file.&&" + GetErrorMessage(GetLastError()));
+			return;
+		}
+	}
+	FileRename(dpath);
+	int i = filelist.GetCursor();
+	int s = filelist.GetSbPos();
+	if(i >= 0 && i < fileindex.GetCount())
+		(String &)actual.file[i] = n;
+	SaveLoadPackage();
+	filelist.SetSbPos(s);
+	filelist.SetCursor(i);
+}
+
+void WorkspaceWork::MoveFile(int d)
+{
+	int fi = filelist.GetCursor();
+	int s = filelist.GetSbPos();
+	if(fi < 0 || fi >= fileindex.GetCount())
+		return;
+	int a = fileindex[fi];
+	int b = fileindex[fi + d];
+	ShowFile(a);
+	ShowFile(b);
+	if(a < 0 || a >= actual.file.GetCount() || b < 0 || b >= actual.file.GetCount())
+		return;
+	Swap(actual.file[a], actual.file[b]);
+	ShowFile(a);
+	ShowFile(b);
+	SavePackage();
+	LoadActualPackage();
+	filelist.SetSbPos(s);
+	for(int i = 0; i < fileindex.GetCount(); i++)
+		if(fileindex[i] == b) {
+			filelist.SetCursor(i);
+			break;
+		}
+	filelist.Sync();
+}
+
+WorkspaceWork::Sepfo WorkspaceWork::GetActiveSepfo()
+{
+	return Sepfo(GetActivePackage(), GetActiveFileName());
+}
+
+void WorkspaceWork::GroupOrFile(Point pos)
+{
+	if(pos.x < filelist.GetIconWidth())
+		Group();
+	if(filelist.IsCursor() && !filelist[filelist.GetCursor()].isdir)
+		FileSelected();
+}
+
+void   WorkspaceWork::Group()
+{
+	if(!filelist.IsCursor() || !filelist[filelist.GetCursor()].isdir)
+		return;
+	int i = filelist.GetCursor();
+	int s = filelist.GetSbPos();
+	Sepfo as = GetActiveSepfo();
+	if(closed.Find(as) >= 0)
+		closed.UnlinkKey(as);
+	else
+		closed.Put(as);
+	SaveLoadPackage();
+	filelist.SetSbPos(s);
+	filelist.SetCursor(i);
+}
+
+void WorkspaceWork::OpenAllGroups()
+{
+	for(int i = 0; i < actual.file.GetCount(); i++)
+		if(actual.file[i].separator)
+			closed.UnlinkKey(Sepfo(GetActivePackage(), actual.file[i]));
+	SaveLoadPackage();
+}
+
+void WorkspaceWork::CloseAllGroups()
+{
+	for(int i = 0; i < actual.file.GetCount(); i++)
+		if(actual.file[i].separator)
+			closed.FindPut(Sepfo(GetActivePackage(), actual.file[i]));
+	SaveLoadPackage();
+}
+
+void  WorkspaceWork::ShowFile(int pi)
+{
+	bool open = true;
+	Sepfo sf;
+	for(int i = 0; i < actual.file.GetCount(); i++) {
+		if(actual.file[i].separator) {
+			sf = Sepfo(GetActivePackage(), actual.file[i]);
+			open = closed.Find(sf) < 0;
+		}
+		else
+		if(i == pi) {
+			if(!open) {
+				int i = filelist.GetCursor();
+				int s = filelist.GetSbPos();
+				closed.UnlinkKey(sf);
+				SaveLoadPackage();
+				filelist.SetSbPos(s);
+				filelist.SetCursor(i);
+			}
+			return;
+		}
+	}
+}
+
+void WorkspaceWork::FileMenu(Bar& menu)
+{
+	bool sel = filelist.IsCursor() && filelist[filelist.GetCursor()].isdir;
+	bool isaux = (actualpackage == tempaux || actualpackage == prjaux || actualpackage == ideaux);
+	menu.Add(!isaux, "Insert package directory file(s)", THISBACK1(AddFile, PACKAGE_FILE))
+		.Help("Insert file relative to current package");
+	menu.Add(!isaux, "Insert topic++ group", THISBACK(AddTopicGroup));
+	menu.Add("Insert separator", THISBACK(AddSeparator))
+		.Help("Insert text separator line");
+	menu.Separator();
+	menu.Add("Insert any file(s)", THISBACK1(AddFile, ANY_FILE))
+		.Key(K_SHIFT|K_CTRL_I)
+		.Help("Insert files from anywhere on disk (discouraged in portable packages)");
+	menu.Add(isaux && GetOutputDir().GetCount(), "Insert output directory file(s)", THISBACK1(AddFile, OUTPUT_FILE))
+		.Help("Open file selector in output / intermediate directory for current package");
+	menu.Add(isaux, "Insert Common directory file(s)", THISBACK1(AddFile, COMMON_FILE))
+		.Help("Open file selector in Common directory for current package");
+	menu.Add(isaux, "Insert Local directory file(s)", THISBACK1(AddFile, LOCAL_FILE))
+		.Help("Open file selector in Local directory for current package");
+#ifdef PLATFORM_POSIX
+	menu.Add("Insert home directory file(s)", THISBACK1(AddFile, HOME_FILE))
+		.Help("Open file selector in current user's HOME directory");
+#endif
+	menu.Separator();
+	if(!organizer) {
+		if(sel)
+			menu.Add(closed.Find(GetActiveSepfo()) < 0 ? "Close group\t[double-click]"
+			                                           : "Open group\t[double-click]", THISBACK(Group));
+		menu.Add("Open all groups", THISBACK(OpenAllGroups));
+		menu.Add("Close all groups", THISBACK(CloseAllGroups));
+		menu.Separator();
+		BuildFileMenu(menu);
+		menu.Separator();
+	}
+	menu.Add("Rename...", THISBACK(RenameFile))
+	    .Help("Rename file / separator / topic group");
+	menu.Add("Remove", THISBACK(RemoveFile))
+		.Key(organizer ? K_DELETE : K_ALT_DELETE)
+		.Help("Remove file / separator / topic group from package");
+	menu.Add(filelist.IsCursor() && !sel, "Delete", THISBACK(DelFile))
+		.Help("Remove file / topic group reference from package & delete file / folder on disk");
+	menu.Separator();
+	menu.Add(filelist.GetCursor() > 0, "Move up", THISBACK1(MoveFile, -1))
+		.Key(organizer ? K_CTRL_UP : K_SHIFT_CTRL_UP)
+		.Help("Move current file one position towards package beginning");
+	menu.Add(filelist.IsCursor() && filelist.GetCursor() < filelist.GetCount() - 1, "Move down",
+	         THISBACK1(MoveFile, 1))
+		.Key(organizer ? K_CTRL_DOWN : K_SHIFT_CTRL_DOWN)
+		.Help("Move current file one position towards package end");
+	menu.Separator();
+	menu.Add(IsActiveFile(), "Optimize for speed", THISBACK(ToggleFileSpeed))
+	    .Check(IsActiveFile() && ActiveFile().optimize_speed);
+	FilePropertiesMenu(menu);
+}
+
+void WorkspaceWork::ToggleFileSpeed()
+{
+	if(IsActiveFile()) {
+		ActiveFile().optimize_speed = !ActiveFile().optimize_speed;
+		SaveLoadPackageNS();
+	}
+}
+
+void WorkspaceWork::AddNormalUses()
+{
+	String p = SelectPackage("Select package");
+	if(p.IsEmpty()) return;
+	OptItem& m = actual.uses.Add();
+	m.text = p;
+	SaveLoadPackage();
+}
+
+void WorkspaceWork::Move(Vector<String>& v, FileList& ta, int d)
+{
+	int i = ta.GetCursor();
+	if(i < 0 || i + d < 0 || i + d > v.GetCount() - 1) return;
+	Swap(v[i], v[i + d]);
+	SaveLoadPackage();
+	ta.SetCursor(i + d);
+}
+
+void WorkspaceWork::RemovePackageMenu(Bar& bar)
+{
+	if(bar.IsScanKeys() || bar.IsScanHelp() || !bar.IsMenuBar())
+		return;
+	String active = GetActivePackage();
+	int usecnt = 0;
+	for(int i = 0; i < package.GetCount(); i++)
+	{
+		String pn = package[i].name;
+		Package prj;
+		String pp = PackagePath(pn);
+		prj.Load(pp);
+		for(int i = 0; i < prj.uses.GetCount(); i++)
+			if(prj.uses[i].text == active) {
+				usecnt++;
+				bar.Add("Remove from '" + UnixPath(pn) + '\'', THISBACK1(RemovePackage, pn))
+					.Help(NFormat("Remove package '%s' from uses section in '%s'", active, pp));
+			}
+	}
+	if(usecnt > 1)
+	{
+		bar.MenuSeparator();
+		bar.Add("Remove all uses", THISBACK1(RemovePackage, String(Null)))
+			.Help(NFormat("Remove package '%s' from all uses in active project and its submodules", active));
+	}
+}
+
+void WorkspaceWork::RemovePackage(String from_package)
+{
+	String active = GetActivePackage();
+	if(IsNull(from_package) && !PromptYesNo(NFormat(
+		"Remove package [* \1%s\1] from uses sections of all current packages ?", active)))
+		return;
+	for(int i = 0; i < package.GetCount(); i++)
+		if(IsNull(from_package) || package[i].name == from_package)
+		{
+			String pp = PackagePath(package[i].name);
+			RealizePath(pp);
+			Package prj;
+			prj.Load(pp);
+			for(int i = prj.uses.GetCount(); --i >= 0;)
+				if(prj.uses[i].text == active)
+					prj.uses.Remove(i);
+			prj.Save(pp);
+		}
+	ScanWorkspace();
+	SyncWorkspace();
+}
+
+void WorkspaceWork::TogglePackageSpeed()
+{
+	if(!package.IsCursor())
+		return;
+	actual.optimize_speed = !actual.optimize_speed;
+	SaveLoadPackageNS();
+}
+
+void WorkspaceWork::PackageMenu(Bar& menu)
+{
+	if(!menu.IsScanKeys()) {
+		String act = UnixPath(GetActivePackage());
+		menu.Add(~NFormat("Add package to '%s'", act), IdeImg::package_add(), THISBACK(AddNormalUses));
+		RemovePackageMenu(menu);
+		if(menu.IsMenuBar()) {
+			menu.Separator();
+			menu.Add(package.IsCursor(), "Optimize for speed", THISBACK(TogglePackageSpeed))
+			    .Check(actual.optimize_speed);
+			menu.Separator();
+			BuildPackageMenu(menu);
+		}
+	}
+}
+
+WorkspaceWork::WorkspaceWork()
+{
+	package <<= THISBACK(PackageCursor);
+	package.WhenBar = THISBACK(PackageMenu);
+	package.NoRoundSize();
+	package.Columns(2);
+	filelist <<= THISBACK(FileCursor);
+	filelist.WhenLeftClickPos = THISBACK(GroupOrFile);
+	filelist.WhenLeftDouble = THISBACK(Group);
+	filelist.WhenBar = THISBACK(FileMenu);
+	filelist.Columns(2);
+	filelist.NoRoundSize();
+	actualfileindex = -1;
+	organizer = false;
+	package.BackPaintHint();
+	filelist.BackPaintHint();
+}
+
+void WorkspaceWork::SerializeClosed(Stream& s)
+{
+	Workspace wspc;
+	wspc.Scan(main);
+	Vector<Sepfo> list;
+	for(int i = 0; i < wspc.GetCount(); i++) {
+		String pk = wspc[i];
+		const Package& p = wspc.GetPackage(i);
+		for(int i = 0; i < p.GetCount(); i++)
+			if(p[i].separator) {
+				Sepfo sf(pk, p[i]);
+				if(closed.Find(sf) >= 0)
+					list.Add(sf);
+			}
+	}
+	s % list;
+	closed = list;
+}
diff --git a/uppsrc/ide/Util.cpp b/uppsrc/ide/Util.cpp
new file mode 100644
index 000000000..566458778
--- /dev/null
+++ b/uppsrc/ide/Util.cpp
@@ -0,0 +1,25 @@
+#include "ide.h"
+
+FileSelButton::FileSelButton(MODE mode, const char *title)
+: title(title), mode(mode)
+{
+	button.NoWantFocus();
+	button.SetImage(CtrlImg::right_arrow());
+	button <<= THISBACK(OnAction);
+}
+
+void FileSelButton::OnAction()
+{
+	Ctrl *owner = button.GetParent();
+	ASSERT(owner);
+	String old = ~*owner;
+	if(mode == MODE_DIR)
+		ActiveDir(old);
+	else
+		Set(old);
+	if(mode == MODE_OPEN ? ExecuteOpen(title) : mode == MODE_SAVE ? ExecuteSaveAs(title) : ExecuteSelectDir(title))
+	{
+		*owner <<= Get();
+		owner->Action();
+	}
+}
diff --git a/uppsrc/ide/Valgrind.cpp b/uppsrc/ide/Valgrind.cpp
new file mode 100644
index 000000000..71d9c077b
--- /dev/null
+++ b/uppsrc/ide/Valgrind.cpp
@@ -0,0 +1,154 @@
+#include "ide.h"
+
+bool Ide::IsValgrind()
+{
+	static bool is;
+	ONCELOCK {
+		is = system("which valgrind") == 0;
+	}
+	return is;
+}
+
+void Ide::Valgrind()
+{
+	if(!IsValgrind())
+		return;
+	static String ValgrindLogFile;
+	if(IsNull(ValgrindLogFile)) {
+		StringStream ss;
+		CreateHostRunDir()->Execute("valgrind --help", ss);
+		String txt = ss;
+		if(txt.Find("--log-file-exactly") > 0)
+		   ValgrindLogFile = "--log-file-exactly=";
+		else
+		   ValgrindLogFile = "--log-file=";
+	}
+
+	if(!Build())
+		return;
+	One<Host> h = CreateHostRunDir();
+	h->ChDir(Nvl(rundir, GetFileFolder(target)));
+	String cmdline;
+	String fn = GetTempFileName();
+	cmdline << "valgrind --xml=yes --num-callers=40 " << ValgrindLogFile << fn << ' ';
+	// 2008/06/01 -- add valgrind suppression file
+	String ValgSupp = ConfigFile("valgrind.supp");
+	if(!IsNull(LoadFile(ValgSupp)))
+		cmdline << "--suppressions=" << ValgSupp << ' ';
+	// 2008/06/01 -- END
+	cmdline << '\"' << h->GetHostPath(target) << "\" ";
+	cmdline << runarg;
+	ConsoleClear();
+	PutConsole("Valgrind..");
+	if(IsNull(h->Execute(cmdline))) {
+		PutConsole("Error executing valgrind");
+		return;
+	}
+	PutConsole("Parsing valgrind output..");
+	Sync();
+	String txt = LoadFile(fn);
+	DeleteFile(fn);
+	try {
+		XmlParser p(txt);
+		while(!p.IsTag())
+			p.Skip();
+		p.PassTag("valgrindoutput");
+		while(!p.End()) {
+			if(p.Tag("error")) {
+				String hdr = "Error (missing description)";
+				String pos;
+				Vector<String> ln;
+				bool src = false;
+				while(!p.End()) {
+					if(p.Tag("what")) {
+						hdr = p.ReadText();
+						p.SkipEnd();
+					}
+					else
+					if(p.Tag("stack")) {
+						while(!p.End()) {
+							String ip = "?";
+							String obj;
+							String fn;
+							String dir;
+							String file;
+							String line;
+							if(p.Tag("frame")) {
+								bool hasdir = false;
+								bool hasfile = false;
+								bool hasline = false;
+								bool haspos = false;
+								while(!p.End()) {
+									if(p.Tag("ip")) {
+										ip = p.ReadText();
+										p.SkipEnd();
+									}
+									else
+									if(p.Tag("obj")) {
+										obj = p.ReadText();
+										p.SkipEnd();
+										haspos = true;
+									}
+									else
+									if(p.Tag("fn")) {
+										fn = p.ReadText();
+										p.SkipEnd();
+									}
+									else
+									if(p.Tag("dir")) {
+										dir = p.ReadText();
+										p.SkipEnd();
+										hasdir = true;
+									}
+									else
+									if(p.Tag("file")) {
+										file = p.ReadText();
+										p.SkipEnd();
+										hasfile = true;
+									}
+									else
+									if(p.Tag("line")) {
+										line = p.ReadText();
+										p.SkipEnd();
+										hasline = true;
+									}
+									else
+										p.Skip();
+								}
+								src = src || hasline && hasdir && hasfile;
+								if(pos.IsEmpty() && haspos)
+									pos << fn << ' ' << ip << ' '<< obj;
+								if(hasline && hasdir && hasfile)
+									ln.Add(AppendFileName(dir, file) + ':' + line);
+								else {
+									String h;
+									h << fn << ' ' << ip << ' ' << obj;
+									if(hasdir && hasfile)
+										h << AppendFileName(dir, file);
+									else
+										h << file << ' ';
+									h << line;
+									ln.Add(h);
+								}
+							}
+							else
+								p.Skip();
+						}
+					}
+					else
+						p.Skip();
+				}
+				PutConsole(hdr);
+				PutConsole("  " + pos);
+				if(src)
+					for(int i = 0; i < ln.GetCount(); i++)
+						PutConsole("     " + ln[i]);
+			}
+			else
+				p.Skip();
+		}
+	}
+	catch(XmlError) {
+		PutConsole("Error parsing valgrind output");
+	}
+}
diff --git a/uppsrc/ide/VectorDes/IdeVectorDes.cpp b/uppsrc/ide/VectorDes/IdeVectorDes.cpp
new file mode 100644
index 000000000..ad4fd4fcb
--- /dev/null
+++ b/uppsrc/ide/VectorDes/IdeVectorDes.cpp
@@ -0,0 +1,109 @@
+#include "IdeVectorDes.h"
+
+#define IMAGECLASS IdeVecImg
+#define IMAGEFILE  <ide/VectorDes/IdeVectorDes.iml>
+#include <Draw/iml.h>
+
+static const char ctrl_key[] = "vectordes-ctrl";
+
+INITBLOCK
+{
+	RegisterGlobalConfig(ctrl_key);
+}
+
+bool VectorDesigner::Load(const char *fn)
+{
+	filename = fn;
+	try {
+		String data = LoadFile(filename);
+		if(data.IsVoid())
+			throw Exc(NFormat("Error reading file '%s'.", filename));
+		CParser parser(data, filename);
+		designer->LoadVecFile(parser);
+		return true;
+	}
+	catch(Exc e) {
+		PutConsole(NFormat("%s: %s\n", filename, e));
+		return false;
+	}
+}
+
+void VectorDesigner::Save()
+{
+	if(!SaveChangedFileFinish(filename, designer->SaveVecFile()))
+		Exclamation(NFormat("Error saving file [* \1%s\1].", filename));
+}
+
+bool IsVecFile(String path) { return !CompareNoCase(GetFileExt(path), ".vec"); }
+
+typedef ArrayMap<String, VectorDesigner::EditPos> EditPosMap;
+GLOBAL_VAR(EditPosMap, VectorFileDataVar);
+
+void VectorDesigner::EditPos::Serialize(Stream& stream)
+{
+}
+
+void VectorDesigner::SaveEditPos()
+{
+}
+
+void VectorDesigner::SerializeEditPos(Stream& s)
+{
+	s % VectorFileDataVar();
+}
+
+VectorDesigner *CreateVectorDesigner(const char *filename, const char *cfgname)
+{
+	One<VectorDesigner> q = new VectorDesigner;
+	LoadFromGlobal(*q, cfgname);
+	q->SetConfigName(cfgname);
+	if(q->Load(filename))
+		return -q;
+	return NULL;
+}
+
+struct VectorDesModule : public IdeModule {
+	virtual void CleanUsc()
+	{
+	}
+
+	virtual bool ParseUsc(CParser& p)
+	{
+		return false;
+	}
+
+	virtual Image FileIcon(const char *path)
+	{
+		return IsVecFile(path) ? IdeVecImg::ide_icon() : Null;
+	}
+
+	virtual IdeDesigner *CreateDesigner(const char *path, byte cs) {
+		if(IsVecFile(path)) {
+			VectorDesigner *d = CreateVectorDesigner(path, ctrl_key);
+			return d;
+		}
+		return false;
+	}
+	virtual void Serialize(Stream& s) {
+		int version = 0;
+		s / version;
+		VectorDesigner::SerializeEditPos(s);
+	}
+};
+
+void RegisterIdeVectorDes()
+{
+	RegisterIdeModule(Single<VectorDesModule>());
+	RegisterStdVectorObjects();
+}
+
+/*
+GUI_APP_MAIN
+{
+	void AppMain___();
+	void RegisterVectorDes(); RegisterIdeVectorDes();
+	RegisterStdVectorObjects();
+	RichObject::Register(RichObjectTypeVectorImage());
+	AppMain___();
+}
+*/
diff --git a/uppsrc/ide/VectorDes/IdeVectorDes.h b/uppsrc/ide/VectorDes/IdeVectorDes.h
new file mode 100644
index 000000000..aed1bcd24
--- /dev/null
+++ b/uppsrc/ide/VectorDes/IdeVectorDes.h
@@ -0,0 +1,41 @@
+#ifndef _IdeVectorDes_IdeVectorDes_h_
+#define _IdeVectorDes_IdeVectorDes_h_
+
+#include <VectorDes/VectorDes.h>
+#include <ide/Common/Common.h>
+
+class VectorDesigner : public IdeDesigner, public VectorDesHost
+{
+	One<VectorDes> designer;
+
+public:
+	VectorDesigner()                               { designer = new VectorDes(*this); }
+	~VectorDesigner()                              { designer->Shutdown(); }
+
+	virtual String GetFileName() const             { return filename; }
+	virtual void   Save();
+	virtual void   SaveEditPos();
+	virtual void   EditMenu(Bar& menu)             { designer->EditMenu(menu); }
+	virtual Ctrl&  DesignerCtrl()                  { return *designer; }
+
+	void           Serialize(Stream& s)            { designer->Serialize(s); }
+	bool           Load(const char *fn);
+	void           SetConfigName(const char *name) { cfgname = name; }
+
+	static void    SerializeEditPos(Stream& stream);
+
+	struct EditPos {
+		Time filetime;
+
+		void Serialize(Stream& stream);
+	};
+
+private:
+	String         cfgname;
+	String         filename;
+};
+
+VectorDesigner *CreateVectorDesigner(const char *filename, const char *cfgname, bool topwindow);
+void            RegisterIdeVectorDes();
+
+#endif
diff --git a/uppsrc/ide/VectorDes/IdeVectorDes.iml b/uppsrc/ide/VectorDes/IdeVectorDes.iml
new file mode 100644
index 000000000..74130b485
--- /dev/null
+++ b/uppsrc/ide/VectorDes/IdeVectorDes.iml
@@ -0,0 +1,17 @@
+IMAGE_BEGIN(ide_icon)
+	IMAGE_SCAN("�\1\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0Â\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\1\0\0\0�\0\377\0\1\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\1\0\0\0�\0\377\0\1\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\1\0\0\0�\0\377\0\1\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\0\1\0\0\0�\0\377\0\1\0\0\0�\0\377\0\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\0�\0\0\0�\0\377\0�\0\0\0�\0\377\0\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\0\377\0�\0\0\0�\0\377\0�\0\0\0�\0\377\0\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\0\377\0\1\0\0\0")
+	IMAGE_SCAN("�\0\0\0")
+	IMAGE_SCAN("")
+	IMAGE_SCAN("")
+	IMAGE_SCAN("�\0\0\0")
+IMAGE_PACKED(ide_icon, "\2\20\0\0\0\20\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0")
diff --git a/uppsrc/ide/VectorDes/VectorDes.upp b/uppsrc/ide/VectorDes/VectorDes.upp
new file mode 100644
index 000000000..69958219b
--- /dev/null
+++ b/uppsrc/ide/VectorDes/VectorDes.upp
@@ -0,0 +1,11 @@
+uses
+	VectorDes,
+	ide\Common;
+
+file
+	IdeVectorDes.h,
+	IdeVectorDes.cpp,
+	IdeVectorDes.iml;
+
+mainconfig
+	"" = "GUI";
diff --git a/uppsrc/ide/Virtuals.cpp b/uppsrc/ide/Virtuals.cpp
new file mode 100644
index 000000000..a50ac1bc7
--- /dev/null
+++ b/uppsrc/ide/Virtuals.cpp
@@ -0,0 +1,140 @@
+#include "ide.h"
+
+struct AssistItemInfo : CppSimpleItem {
+	String defined;
+	String overed;
+	String name;
+};
+
+void GatherVirtuals(ArrayMap<String, AssistItemInfo>& item, const String& nest,
+                    Index<String>& done)
+{
+	if(done.Find(nest) >= 0)
+		return;
+	done.Add(nest);
+	int q = BrowserBase().Find(NoTemplatePars(nest));
+	if(q < 0)
+		return;
+	CppNest& m = BrowserBase()[q];
+	for(int i = 0; i < m.GetCount(); i++) {
+		const CppItem& im = m[i];
+		if(im.IsType()) {
+			Vector<String> b = Split(im.qptype, ';');
+			SubstituteTpars(b, nest);
+			for(int i = 0; i < b.GetCount(); i++)
+				GatherVirtuals(item, b[i], done);
+		}
+	}
+	for(int i = 0; i < m.GetCount(); i++) {
+		const CppItem& im = m[i];
+		if(im.IsCode()) {
+			String k = m.key[i];
+			if(im.IsCode()) {
+				int q = item.Find(k);
+				if(q >= 0)
+					item[q].overed = nest;
+				else
+				if(im.virt) {
+					AssistItemInfo& f = item.Add(k);
+					f.defined = f.overed = nest;
+					f.name = m.name[i];
+					(CppSimpleItem&)f = im;
+				}
+			}
+		}
+	}
+}
+
+struct VirtualsDlg : public WithVirtualsLayout<TopWindow> {
+	ArrayMap<String, AssistItemInfo> item;
+
+	virtual bool Key(dword key, int count)
+	{
+		return HotKey(key) || find.Key(key, count);
+	}
+
+	void Sync() {
+		String name = ~find;
+		String k = list.GetKey();
+		list.Clear();
+		for(int i = 0; i < item.GetCount(); i++) {
+			CppItemInfo f;
+			(CppSimpleItem&)f = item[i];
+			f.virt = false;
+			f.name = item[i].name;
+			if(memcmp_i(name, f.name, name.GetCount()) == 0)
+				list.Add(item.GetKey(i), f.natural, RawToValue(f),
+				         item[i].defined, item[i].overed);
+		}
+		if(!list.FindSetCursor(k))
+			list.GoBegin();
+	}
+
+	void DblClk() {
+		if(list.IsCursor()) {
+			list.Set(5, 1);
+			Break(IDOK);
+		}
+	}
+
+	void Serialize(Stream& s)
+	{
+		SerializePlacement(s);
+		list.SerializeHeader(s);
+	}
+
+	typedef VirtualsDlg CLASSNAME;
+
+	VirtualsDlg(const String& nest) {
+		Index<String> done;
+		GatherVirtuals(item, nest, done);
+		CtrlLayoutOKCancel(*this, "Virtual methods");
+		list.AddIndex();
+		list.AddIndex();
+		list.AddColumn("Virtual function").SetDisplay(Single<CppItemInfoDisplay>());
+		list.AddColumn("Defined in");
+		list.AddColumn("Last override");
+		list.SetLineCy(Arial(11).Info().GetHeight() + 3);
+		list.ColumnWidths("500 100 100");
+		list.WhenLeftDouble = THISBACK(DblClk);
+		list.MultiSelect();
+		list.EvenRowColor();
+		Sizeable().Zoomable();
+		find <<= THISBACK(Sync);
+		Sync();
+	}
+};
+
+INITBLOCK
+{
+	RegisterGlobalConfig("VirtualsDlg");
+}
+
+void AssistEditor::Virtuals()
+{
+	Parser ctx;
+	Context(ctx, GetCursor());
+	if(IsNull(ctx.current_nest) || ctx.current_nest == "::" || ctx.IsInBody())
+		return;
+	VirtualsDlg dlg(ctx.current_nest);
+	LoadFromGlobal(dlg, "VirtualsDlg");
+	int c = dlg.Run();
+	StoreToGlobal(dlg, "VirtualsDlg");
+	if(c != IDOK)
+		return;
+	String cls = ctx.current_nest.Mid(ctx.current_namespacel);
+	if(cls[0] == ':' && cls[1] == ':')
+		cls = cls.Mid(2);
+	String text;
+	String ctext;
+	if(!dlg.list.IsSelection() && dlg.list.IsCursor())
+		dlg.list.Select(dlg.list.GetCursor());
+	for(int i = 0; i < dlg.list.GetCount(); i++)
+		if(dlg.list.IsSelected(i)) {
+			String n = (String)dlg.list.Get(i, 1);
+			text << "\tvirtual " << RemoveDefPar(n) << ";\r\n";
+			ctext << MakeDefinition(cls, n) << "\n{\n}\n\n";
+		}
+	Paste(text.ToWString());
+	WriteClipboardText(ctext);
+}
diff --git a/uppsrc/ide/app.tpp/About$en-us.tpp b/uppsrc/ide/app.tpp/About$en-us.tpp
new file mode 100644
index 000000000..385a58e71
--- /dev/null
+++ b/uppsrc/ide/app.tpp/About$en-us.tpp
@@ -0,0 +1,59 @@
+TITLE("Copyright © 1999-2005 Ultimate++ team")
+COMPRESSED
+120,156,205,125,201,118,27,87,150,224,175,188,163,174,42,147,54,8,137,148,37,91,82,102,158,2,73,136,130,77,145,76,0,148,82,165,67,19,1,224,1,8,51,16,1,199,64,26,202,204,117,125,67,47,115,217,139,94,213,31,116,118,253,87,223,225,141,49,112,16,184,104,157,76,75,0,34,222,112,223,157,167,247,89,252,203,191,60,107,61,251,31,207,238,248,243,250,80,206,130,34,202,47,62,255,245,242,239,255,218,61,217,57,31,136,207,217,179,55,223,246,142,100,126,156,76,130,232,48,76,223,124,183,187,251,131,248,183,11,250,129,254,125,144,172,214,105,56,95,228,226,255,252,47,177,251,234,213,171,209,206,222,179,103,63,138,243,40,15,151,65,46,71,223,141,190,19,185,12,150,252,82,248,195,179,239,223,156,190,122,243,237,47,139,60,95,141,94,143,158,142,158,78,231,217,168,189,10,38,240,159,104,244,244,23,26,246,243,183,191,252,242,92,116,138,124,145,164,217,235,11,252,40,118,254,118,241,25,254,122,31,166,242,234,242,237,63,255,247,52,146,105,139,127,18,244,
+203,48,89,254,243,31,255,253,143,203,254,58,146,87,45,113,113,24,196,161,140,46,127,78,178,210,228,48,60,44,60,206,211,112,92,228,106,2,154,22,166,24,4,241,52,73,47,223,37,191,230,217,186,37,254,35,75,162,252,242,80,142,83,217,18,71,69,56,77,46,7,147,69,184,92,202,40,107,193,2,231,69,150,39,151,253,100,25,196,240,49,13,127,45,50,177,47,211,56,201,3,248,253,125,56,89,4,176,132,78,52,150,105,46,224,139,32,157,20,217,229,251,160,88,4,105,222,18,63,5,241,229,199,48,130,183,225,233,163,52,144,75,121,121,150,202,56,15,39,48,223,135,112,2,203,187,132,241,38,11,9,79,247,174,195,73,112,121,86,68,191,134,19,28,43,95,132,65,150,93,14,138,120,10,147,199,211,84,222,92,238,7,105,24,69,129,154,59,186,124,31,202,244,139,252,85,222,100,87,97,75,28,6,203,80,198,151,103,73,250,91,129,35,126,132,165,202,244,242,163,140,191,200,168,37,62,255,235,179,103,59,207,158,57,135,115,115,115,51,106,207,130,40,10,227,249,
+180,200,39,139,81,123,42,225,148,196,126,144,193,107,243,197,69,75,188,13,198,97,114,185,95,100,50,207,19,51,241,153,188,10,254,251,127,226,148,105,26,198,0,181,36,207,171,11,248,41,88,202,76,12,23,0,64,128,192,103,103,230,197,247,191,127,25,181,199,81,50,207,86,73,62,106,79,146,229,47,98,144,134,57,64,46,136,197,32,188,14,230,69,90,180,46,0,236,121,145,194,130,254,239,127,182,68,63,136,102,2,78,40,150,225,20,208,67,156,5,215,50,18,167,89,30,172,100,124,149,224,3,69,36,122,73,28,230,73,88,180,196,73,146,210,209,188,75,102,248,248,16,215,241,5,222,250,53,0,12,218,151,113,18,230,128,42,69,150,37,112,190,195,84,174,197,7,152,188,31,174,104,112,153,203,20,143,123,142,159,6,248,247,90,156,132,87,97,30,198,120,62,89,22,46,19,113,8,11,120,43,167,50,130,19,237,165,184,138,107,209,137,228,239,128,104,248,218,81,48,78,1,77,113,209,203,36,255,130,95,29,38,75,0,119,2,79,93,7,169,252,34,14,11,64,22,
+169,142,56,132,245,100,203,160,6,165,135,0,151,44,10,8,163,1,147,1,201,82,56,22,0,123,248,229,11,157,203,85,244,207,255,2,116,73,150,201,124,29,34,186,70,112,20,140,155,101,228,234,227,33,166,211,203,35,64,166,10,154,0,148,196,105,244,207,127,148,247,92,179,166,179,190,24,253,155,24,116,79,113,69,116,24,151,131,60,13,242,48,170,121,248,156,184,197,113,50,79,92,138,236,39,184,192,203,15,105,34,151,97,150,73,126,241,187,93,224,50,240,79,241,215,191,62,135,63,175,95,190,124,249,3,49,172,42,235,17,114,25,132,209,197,235,215,244,251,47,248,33,79,70,175,139,213,106,244,239,113,14,168,61,30,181,147,116,254,139,112,190,193,47,244,27,254,136,128,170,82,172,130,185,52,3,90,156,197,1,218,217,108,212,142,101,254,139,135,205,68,71,72,154,114,194,184,204,15,63,157,37,105,1,120,141,15,190,126,250,244,2,30,107,23,106,182,213,170,121,17,244,90,205,2,104,26,59,0,237,171,60,73,117,14,126,224,226,239,127,247,65,91,243,79,31,
+18,1,240,186,193,161,136,128,89,197,153,124,205,167,177,139,210,228,223,183,246,94,124,223,222,123,241,162,189,247,124,111,155,86,185,231,200,138,173,131,109,65,98,130,152,185,120,27,18,47,103,234,19,196,190,5,80,135,0,236,15,129,246,196,196,225,213,98,43,147,82,116,206,135,239,78,251,131,109,94,218,158,208,127,159,201,20,113,36,76,98,17,102,98,33,83,57,94,139,57,208,69,46,129,69,206,82,120,53,153,9,68,237,57,208,83,158,192,52,107,1,180,12,228,45,146,113,30,132,49,16,158,8,96,198,213,26,159,4,14,155,137,44,153,229,55,64,136,180,38,32,234,100,18,2,8,166,98,154,76,138,37,240,106,192,102,120,125,6,103,11,171,203,23,82,140,158,12,212,43,163,39,219,52,205,84,6,145,8,99,129,191,234,223,196,13,240,178,164,200,69,42,51,216,222,4,71,105,193,67,147,168,152,226,42,244,207,81,184,12,213,28,248,58,65,48,195,65,129,225,182,104,165,45,177,76,166,225,12,255,150,180,177,85,49,142,194,108,209,18,211,48,99,200,193,151,
+25,126,73,39,213,194,157,60,77,82,145,201,40,194,17,66,88,57,237,214,174,142,158,193,89,86,8,210,92,1,137,230,189,1,18,240,119,2,64,154,21,105,12,83,74,122,103,154,0,208,104,198,95,1,223,241,27,124,124,150,68,81,114,131,91,131,3,157,134,184,163,236,117,249,4,135,240,96,48,78,174,37,237,140,209,5,164,41,44,156,23,132,7,178,178,167,172,126,202,64,226,68,98,44,21,248,96,21,0,236,160,113,115,52,84,8,80,60,40,205,145,181,69,15,94,156,242,234,24,142,147,104,109,142,26,6,14,38,87,113,114,19,201,233,28,191,16,75,80,0,112,226,121,120,45,241,128,130,188,132,52,72,37,99,9,191,193,113,193,164,51,152,9,126,44,210,9,238,112,42,171,88,6,255,94,6,240,67,112,13,140,42,24,71,210,44,163,13,208,129,95,213,30,51,13,50,127,69,248,187,144,128,59,32,154,42,219,67,169,20,23,1,234,46,103,52,104,152,175,9,24,160,152,92,201,28,207,70,111,21,128,150,18,121,248,104,190,74,147,235,16,1,140,232,201,228,
+147,38,211,2,78,25,169,84,17,144,183,33,181,234,99,198,61,24,14,206,3,150,35,130,213,10,32,171,104,208,236,158,32,8,218,198,85,166,209,6,184,113,10,140,0,222,50,115,3,81,251,48,219,202,112,121,160,164,194,136,176,236,233,58,6,61,131,62,2,253,1,250,139,36,166,185,52,200,112,92,243,178,30,182,237,227,226,183,128,140,239,186,98,112,250,118,248,177,211,239,138,222,0,164,217,233,135,222,97,247,16,40,188,51,128,47,70,79,64,54,246,128,21,157,15,5,60,211,239,156,12,63,137,211,183,162,115,242,73,252,220,59,57,108,137,238,95,206,250,221,193,64,156,246,69,239,253,217,113,175,11,223,245,78,14,142,207,15,123,39,71,98,31,222,59,57,29,138,227,222,251,222,16,134,29,158,210,148,106,168,94,119,128,131,189,239,246,15,222,193,199,206,126,239,184,55,252,4,250,86,111,120,130,99,190,133,65,59,226,172,211,31,246,14,206,143,59,125,113,118,222,63,59,29,116,97,250,67,24,246,164,119,242,182,15,179,116,223,119,79,134,128,215,39,240,157,
+232,126,128,15,98,240,174,115,124,76,83,41,70,42,246,187,176,136,206,254,113,151,71,133,245,31,28,119,122,239,65,23,233,188,239,28,117,105,3,167,240,66,159,30,83,11,249,248,174,75,95,193,208,29,248,223,193,176,119,122,130,43,62,56,61,25,246,225,35,112,244,211,254,208,188,250,177,55,232,130,214,209,239,13,112,239,111,251,167,48,60,66,14,222,56,165,65,224,189,147,46,143,130,80,245,193,15,143,224,231,243,65,215,174,229,176,219,57,134,177,6,248,178,251,112,187,86,150,189,218,115,254,229,73,50,77,81,138,48,137,95,88,110,101,16,80,73,184,189,221,151,63,190,254,225,199,231,123,139,221,55,32,232,158,125,207,2,238,187,31,94,0,146,227,163,107,45,153,241,43,101,196,192,87,191,252,251,158,249,246,11,12,10,95,253,209,124,241,147,12,226,209,78,148,20,43,208,8,67,196,99,77,150,162,131,210,17,223,55,15,247,126,58,18,63,157,117,143,212,210,214,222,72,168,157,29,7,49,112,240,179,69,24,133,48,94,20,76,193,74,193,111,126,10,151,98,
+63,41,192,156,0,113,123,12,210,240,32,77,38,87,248,225,167,34,10,65,179,125,15,27,46,96,122,20,69,199,5,144,216,105,10,234,35,104,169,18,244,4,73,35,194,144,25,42,242,72,51,162,159,0,31,86,150,145,248,0,32,27,75,20,94,248,194,232,27,208,27,195,95,65,110,176,44,73,136,37,45,229,18,212,57,195,145,123,160,4,131,102,62,69,86,74,59,58,74,1,4,222,102,199,95,194,213,158,15,43,94,235,64,2,249,78,189,103,65,172,100,65,182,172,123,250,93,128,154,236,0,52,242,88,12,193,116,10,150,160,253,131,21,7,31,251,5,202,202,183,160,38,92,137,159,147,156,116,145,1,40,71,11,137,118,70,116,77,240,73,22,49,240,211,217,140,44,189,79,69,26,138,255,8,86,73,154,204,101,14,27,124,215,86,214,64,39,190,70,229,159,30,127,27,34,204,127,134,237,161,40,2,107,34,70,147,231,8,14,76,28,68,112,178,218,104,131,83,8,198,57,40,39,104,158,204,192,96,20,253,54,236,238,154,12,57,180,145,66,80,57,135,96,196,129,101,
+42,142,254,249,95,75,249,69,91,78,3,156,20,216,204,20,65,33,126,106,163,53,146,100,56,205,32,7,243,23,204,129,107,241,115,128,246,227,56,6,253,0,12,217,113,40,197,71,212,85,200,158,185,134,17,63,38,164,222,27,115,85,252,12,44,27,182,114,156,20,55,100,178,130,92,16,31,131,155,20,68,58,26,46,96,130,188,133,83,2,91,192,131,253,217,201,145,7,247,35,176,46,0,182,100,230,100,163,157,51,185,72,201,138,162,61,131,80,60,12,35,178,155,142,138,181,232,130,254,131,22,80,16,197,65,238,141,58,248,45,10,115,233,13,124,216,214,230,137,120,23,174,124,100,201,195,153,247,236,0,212,255,99,57,155,241,153,2,57,128,148,66,67,123,181,8,39,0,129,94,60,113,120,133,199,32,58,112,100,64,185,153,52,76,1,101,133,18,114,172,96,140,158,172,162,98,30,198,163,39,160,104,165,18,141,117,144,209,125,9,166,36,34,119,138,42,79,170,213,99,152,109,145,220,72,64,38,82,76,172,84,91,128,85,132,122,244,104,7,204,130,21,136,49,20,249,
+234,37,150,178,242,247,137,92,145,244,5,170,57,62,58,59,214,63,79,53,194,183,235,118,224,233,227,187,175,118,21,155,130,95,192,214,2,66,63,250,120,33,112,74,64,6,80,5,215,89,46,151,98,203,40,80,52,51,218,40,59,104,140,222,128,150,26,193,169,201,108,27,224,139,234,253,11,82,239,119,95,60,219,238,123,159,104,146,104,119,239,71,61,211,124,50,17,207,219,96,13,92,128,0,78,34,56,184,48,174,218,2,223,3,78,73,71,67,123,11,8,54,13,88,39,198,83,226,109,185,227,170,29,128,46,240,190,88,226,98,127,94,32,105,30,6,49,232,19,3,252,6,64,222,13,64,45,5,240,38,235,41,50,180,43,9,198,116,12,202,2,146,104,27,200,5,173,249,67,216,254,59,25,78,127,149,240,237,65,2,202,7,124,4,36,13,127,183,124,43,43,205,239,72,151,207,123,188,20,141,27,153,56,58,56,112,0,91,0,254,210,64,251,189,147,243,97,239,120,192,160,117,142,241,226,14,211,233,143,223,246,191,219,3,99,248,232,228,92,28,117,79,186,253,206,49,
+200,250,253,227,222,1,72,227,131,238,201,160,203,203,249,227,83,241,1,150,138,136,178,135,28,61,150,232,146,219,229,31,213,146,159,150,64,191,251,234,199,87,45,122,236,94,7,240,84,188,120,5,204,97,185,2,28,61,139,2,244,82,13,104,131,207,159,63,107,1,152,81,206,0,207,232,8,241,108,111,119,119,119,180,179,251,252,217,15,2,164,118,135,223,31,255,248,28,20,172,46,80,193,26,4,146,208,202,124,158,179,225,64,118,23,194,202,26,46,2,158,29,195,58,150,158,46,15,47,70,70,161,100,253,148,21,61,64,175,120,142,82,27,108,150,80,41,154,40,200,141,122,247,71,92,194,183,79,251,223,139,51,96,67,75,32,54,119,101,195,133,161,189,140,168,119,9,91,114,44,64,248,63,232,9,225,60,230,245,230,1,96,84,112,19,172,197,26,152,4,25,152,83,52,142,18,180,72,148,157,65,43,130,173,230,109,33,246,215,108,204,6,25,44,23,229,31,29,169,4,238,11,246,33,107,228,70,81,38,77,63,71,217,72,83,205,139,128,236,88,121,247,84,100,231,234,
+53,143,118,70,59,240,208,18,87,154,21,164,97,75,207,216,160,167,113,171,200,150,208,40,2,67,37,5,67,136,213,246,134,197,161,242,142,135,129,35,35,132,148,56,111,66,161,209,55,37,51,90,169,253,172,19,128,2,14,54,250,18,13,75,28,154,21,38,164,32,52,60,201,208,229,3,133,53,109,13,208,253,194,175,53,77,230,237,110,2,166,100,170,77,6,134,183,82,210,26,225,14,252,65,6,211,246,182,16,159,146,66,76,128,67,176,169,194,139,33,232,171,21,103,104,220,39,109,23,129,62,162,210,112,3,16,94,201,224,138,244,72,247,48,90,248,19,174,44,69,33,145,146,173,148,232,179,108,17,182,174,64,20,130,205,36,78,97,154,250,21,102,21,52,116,15,23,204,39,88,34,75,21,178,186,45,162,56,68,101,105,201,91,159,216,82,104,132,202,30,226,4,155,89,50,189,70,43,27,140,87,28,250,6,236,124,116,107,232,169,64,242,73,176,126,125,171,54,37,192,129,114,68,132,168,94,4,252,133,143,206,171,248,140,66,90,15,45,225,117,192,66,1,107,84,218,
+56,14,2,214,62,232,74,180,94,13,255,55,202,41,160,134,67,59,216,140,59,37,243,49,195,145,1,206,153,119,74,195,4,135,200,209,57,65,231,201,78,21,58,157,88,58,48,117,92,51,25,79,3,64,25,135,83,68,94,228,95,228,218,137,137,250,213,100,202,61,131,160,3,20,207,174,248,167,4,79,39,69,90,78,29,39,14,90,198,244,142,55,139,242,226,210,224,19,153,162,72,193,39,86,240,99,56,6,13,38,15,21,107,194,145,21,100,107,79,214,133,104,11,87,164,30,102,103,17,210,147,11,146,183,240,128,252,61,64,206,222,186,117,216,12,204,7,17,232,35,0,152,45,36,145,227,28,221,186,180,115,98,38,98,134,250,44,205,135,46,18,244,143,240,214,229,36,132,161,208,193,16,144,138,101,93,90,46,238,182,153,250,232,221,18,122,195,43,107,34,188,150,65,61,7,221,120,215,6,19,97,28,80,56,237,58,50,80,194,240,153,165,70,14,16,63,200,155,104,84,70,32,248,87,168,81,194,167,109,89,135,53,44,206,243,27,56,99,176,25,178,215,98,11,52,45,
+235,188,242,79,1,209,117,11,196,58,24,18,50,85,104,227,200,178,27,80,75,23,4,171,140,126,140,228,28,200,223,241,119,41,25,233,122,246,180,51,79,29,171,59,159,183,250,78,132,62,57,60,27,25,224,9,18,155,69,198,172,246,132,195,147,190,83,164,76,9,68,174,154,18,52,38,210,9,72,45,191,11,82,238,65,157,154,102,230,108,152,239,198,9,188,159,162,196,90,91,70,226,241,26,56,153,158,143,164,228,250,194,93,132,204,176,51,224,245,56,11,88,105,44,53,86,65,134,74,47,170,24,122,125,40,176,28,148,130,229,170,51,132,197,220,104,108,97,110,168,212,1,156,49,129,179,9,227,0,12,66,58,121,120,76,121,178,64,29,88,146,220,37,167,22,47,131,21,64,56,102,64,87,28,0,120,55,186,241,133,114,200,234,177,180,224,2,187,55,149,171,130,253,101,62,2,189,197,231,162,117,139,102,115,25,25,174,45,95,128,62,2,242,30,38,5,29,1,129,154,131,208,25,59,190,177,21,254,140,108,3,49,17,185,48,241,152,235,36,156,210,66,166,200,71,83,
+222,14,136,60,141,32,9,91,219,129,63,33,237,38,4,243,1,204,248,130,253,102,228,255,86,147,56,86,11,186,19,1,91,39,68,135,236,221,179,195,192,223,32,176,100,30,160,229,195,108,21,144,35,102,39,40,157,18,129,158,28,154,192,195,39,96,67,164,14,192,121,46,237,67,53,86,13,33,169,194,49,196,80,90,57,10,4,248,30,79,192,60,24,144,118,215,46,107,112,43,196,8,67,220,36,210,140,199,153,6,71,26,34,55,133,129,146,198,126,198,191,137,242,233,147,15,200,83,28,251,47,238,86,195,251,98,216,237,191,31,144,31,238,224,244,228,176,135,46,45,246,215,29,156,158,125,234,157,28,129,153,210,27,12,251,189,253,115,242,118,225,131,239,79,15,123,111,123,7,29,252,66,197,198,208,216,192,73,79,95,189,65,139,231,59,48,175,196,179,139,207,207,69,123,231,111,23,158,83,213,81,199,20,34,211,233,192,78,89,85,186,73,210,43,197,92,140,149,18,104,231,249,10,245,120,163,33,89,206,181,72,34,148,87,89,176,86,250,244,18,244,92,56,38,203,122,
+166,204,0,232,61,134,181,86,206,235,53,23,82,42,49,62,114,198,11,68,255,233,88,2,136,91,172,16,153,13,144,140,113,118,129,235,103,230,25,192,219,180,155,113,192,172,128,38,55,227,137,165,4,241,169,253,223,206,79,198,155,45,211,240,26,78,23,144,146,134,225,13,216,77,71,193,205,107,199,214,67,240,63,221,99,140,13,105,121,0,14,88,9,191,236,185,188,253,169,196,42,73,181,201,142,42,143,90,145,49,102,112,83,40,55,92,124,203,52,43,55,58,0,186,25,8,36,124,140,17,80,120,17,204,17,142,91,239,128,209,2,59,153,145,255,71,191,160,2,95,158,17,95,138,33,169,40,20,30,23,128,210,157,126,244,4,117,222,46,10,7,69,96,196,51,131,233,20,212,15,162,182,12,222,0,177,4,15,150,64,4,210,5,4,200,53,235,38,137,130,61,234,118,247,163,51,100,110,72,215,158,178,110,209,251,13,51,113,82,12,139,60,11,137,151,128,208,134,209,53,74,5,19,178,65,210,34,174,156,134,98,251,90,201,194,64,32,43,141,52,26,48,106,96,47,42,
+160,229,188,162,151,66,129,131,112,70,19,226,113,147,148,33,254,28,230,36,124,69,35,54,162,51,197,122,55,97,117,192,10,113,113,20,13,34,142,8,251,172,89,241,118,27,173,8,13,68,198,187,180,64,141,31,199,202,112,22,45,217,204,84,24,85,105,215,179,141,23,98,87,243,12,210,168,130,245,253,205,108,75,89,223,100,158,126,31,100,158,234,143,24,142,17,55,32,176,37,72,158,2,212,66,19,172,177,202,62,64,109,21,78,138,164,200,148,123,27,216,22,201,15,192,116,248,70,69,45,113,127,164,161,168,85,186,79,213,7,5,97,23,147,8,157,164,41,174,90,171,29,111,196,149,148,43,36,32,68,14,173,107,170,64,152,150,146,228,170,75,60,108,211,246,105,78,145,200,76,198,19,10,210,225,222,236,208,248,12,169,180,214,138,117,180,16,31,118,229,120,178,153,39,74,84,152,215,125,186,74,90,230,212,216,44,35,205,90,233,84,192,188,23,235,12,35,93,154,2,136,19,104,219,50,80,202,98,160,53,96,24,37,80,202,107,162,61,138,8,2,163,170,57,186,32,
+202,253,223,181,71,65,107,244,141,56,182,87,198,49,165,142,210,92,188,253,180,30,181,52,103,46,49,204,124,81,144,172,94,242,70,26,169,172,165,228,123,21,163,73,136,248,252,85,137,146,58,177,53,80,219,222,229,240,115,29,2,7,160,65,3,126,75,198,38,222,69,38,171,209,108,58,187,16,164,181,5,81,176,189,243,55,99,207,76,130,34,99,99,200,104,187,156,61,128,218,61,156,4,29,3,236,27,217,134,198,87,10,112,18,159,208,212,68,39,195,124,140,223,214,92,109,138,132,162,48,150,159,106,55,174,107,92,93,23,33,58,2,201,76,229,192,20,0,104,146,11,152,57,33,51,74,34,250,133,180,199,52,183,42,6,126,151,177,200,197,61,150,217,172,62,120,124,135,12,135,100,70,217,18,174,42,24,160,162,194,51,4,8,13,77,5,40,21,137,164,195,116,74,35,32,98,53,105,35,90,253,104,4,195,4,192,160,140,17,115,36,90,253,136,1,7,73,65,6,245,124,202,110,41,178,119,208,57,151,6,40,246,144,121,221,160,223,7,152,185,99,242,50,56,17,151,
+233,71,56,193,20,37,186,230,248,72,83,132,162,206,64,164,228,42,9,205,126,181,116,10,66,62,69,214,67,54,47,186,135,80,152,164,120,40,160,184,49,131,140,227,164,0,54,69,9,9,54,129,228,62,172,211,40,129,205,214,219,22,42,227,17,102,141,40,77,208,224,133,162,16,60,32,245,240,182,245,199,144,23,145,56,129,99,139,72,207,120,48,199,229,17,145,18,207,146,114,14,233,121,28,74,144,221,158,136,235,80,222,52,48,84,212,138,186,58,84,242,26,133,182,39,211,243,76,70,51,237,85,213,240,70,151,177,201,72,48,39,205,64,102,71,135,15,222,22,51,180,102,153,111,180,141,223,138,48,101,79,18,143,86,26,168,189,93,225,243,218,25,68,111,114,10,134,201,145,240,48,147,102,183,132,193,134,116,136,90,6,252,78,25,35,153,84,222,36,2,17,154,194,244,138,82,179,154,8,82,177,82,88,233,24,215,17,100,73,12,163,145,203,26,149,174,148,212,81,171,209,224,195,153,4,218,67,236,194,9,50,133,186,75,128,244,53,154,142,249,130,114,98,236,17,181,
+76,230,13,17,104,11,157,116,94,46,136,138,184,233,229,19,225,148,88,16,57,111,130,172,52,53,58,215,139,188,233,5,64,221,165,51,44,188,77,76,135,204,98,102,46,108,28,133,217,237,162,134,216,171,171,202,42,81,198,99,104,59,54,137,155,121,80,75,121,185,173,79,135,45,82,165,224,43,189,27,44,152,223,209,245,175,143,30,143,54,85,211,104,245,181,32,121,193,190,28,248,130,236,101,222,86,42,231,65,58,5,145,64,179,195,75,226,6,197,186,245,248,121,72,87,160,141,159,187,222,17,10,59,228,54,51,73,73,70,148,78,168,102,57,62,78,210,136,51,223,29,134,25,98,100,110,166,24,214,137,213,218,217,149,1,207,189,17,112,104,148,127,224,76,197,166,149,252,93,166,108,183,107,167,32,251,187,208,27,19,213,194,222,177,230,104,53,17,58,102,180,109,151,213,30,98,21,4,78,198,23,101,208,1,67,155,207,17,134,122,22,109,126,209,182,16,72,181,148,95,86,228,136,113,114,150,84,51,74,109,227,231,64,92,39,81,177,100,161,13,114,34,73,193,198,83,
+60,222,110,151,21,107,203,173,198,169,230,143,206,234,172,4,36,235,168,65,2,86,213,183,231,247,49,17,202,155,43,239,11,69,29,47,64,43,83,123,219,200,18,18,78,3,212,129,1,56,230,73,145,19,159,66,253,238,22,101,44,67,109,12,214,176,167,82,2,27,84,50,96,34,232,38,84,180,104,18,119,110,215,198,58,19,10,183,199,20,215,49,103,135,223,69,146,164,101,202,78,119,18,165,75,160,50,208,199,70,59,168,3,48,135,181,198,80,75,49,15,77,254,119,248,71,26,246,70,120,160,206,120,130,85,5,75,76,23,94,115,218,32,233,10,198,75,138,242,139,21,187,55,0,207,214,173,202,93,117,155,129,161,76,210,253,91,226,58,136,66,158,2,83,239,128,237,231,228,139,148,98,45,131,148,66,92,214,212,177,250,214,186,165,172,2,165,144,197,24,9,100,23,125,172,181,126,14,12,106,19,37,162,84,91,173,210,43,0,186,40,222,34,193,174,14,160,10,114,43,243,203,199,227,29,6,43,144,255,223,28,194,164,17,215,194,24,97,193,92,198,49,166,73,231,85,
+124,159,173,179,114,232,174,97,235,168,255,144,87,48,136,96,109,49,179,69,250,72,241,111,118,101,204,200,133,26,163,22,139,204,22,12,199,138,107,70,187,60,188,53,185,122,219,221,36,77,123,212,250,147,66,51,244,15,0,28,82,149,90,50,40,198,90,176,140,25,250,245,42,145,231,118,152,89,174,195,142,62,94,22,5,83,249,132,150,70,36,227,67,20,193,103,175,181,111,8,2,72,41,158,252,150,108,16,119,253,236,106,52,104,232,206,206,83,106,79,66,101,93,240,61,76,82,160,41,22,90,35,8,12,201,168,200,136,120,156,220,113,66,159,89,128,4,32,103,97,28,218,20,114,245,60,179,240,52,92,113,64,126,234,74,66,206,45,9,204,129,97,196,26,102,15,92,141,196,238,8,118,249,142,19,143,90,172,52,102,43,73,7,111,210,138,90,149,253,184,212,67,1,81,20,56,202,171,136,91,161,144,170,241,78,25,189,217,125,109,203,166,33,171,145,1,70,99,54,102,240,156,182,45,33,44,131,95,73,122,47,1,169,73,237,221,210,217,51,45,113,133,185,105,17,235,
+60,25,242,249,109,189,67,16,111,41,219,196,42,119,137,252,98,200,136,253,253,163,193,149,161,96,34,133,136,214,108,166,210,86,65,160,8,148,124,232,62,244,170,234,194,172,162,134,56,147,161,42,231,208,134,78,230,198,48,18,146,1,217,101,147,9,173,68,165,187,144,22,30,168,120,62,33,199,138,19,107,72,123,54,111,161,89,0,156,154,20,111,127,128,10,50,106,181,158,148,94,26,12,126,40,200,158,200,106,213,87,143,127,74,78,100,79,138,249,162,100,94,91,55,237,114,5,230,153,147,178,227,12,82,242,106,57,192,104,84,62,190,39,229,227,66,121,34,64,249,224,73,220,194,6,183,120,193,85,140,124,165,132,49,26,119,41,127,95,161,211,154,108,57,165,51,104,41,224,25,140,29,36,75,16,134,75,120,141,212,168,27,210,63,147,198,233,111,153,29,6,198,88,28,227,42,197,215,130,2,37,136,78,76,71,225,19,226,9,123,234,114,221,178,12,189,106,200,163,14,79,129,52,195,143,217,149,70,192,208,201,11,116,238,200,180,171,67,218,224,165,206,11,9,109,98,
+162,93,24,145,24,157,31,218,87,20,131,81,11,72,177,134,138,124,130,179,34,98,14,132,89,181,147,230,67,125,225,106,148,26,115,92,179,24,177,120,149,151,140,163,44,68,119,171,73,96,193,119,84,154,11,177,107,3,24,212,200,137,42,48,52,76,5,62,236,144,246,67,229,202,7,217,124,100,232,160,202,179,114,80,136,147,159,208,24,15,180,193,200,101,2,139,112,28,230,28,159,136,130,27,147,37,161,108,216,234,126,120,28,16,79,9,198,254,199,218,41,138,11,247,180,251,82,196,98,75,57,198,154,173,6,246,50,97,248,118,98,240,137,231,15,148,187,218,59,125,91,146,67,62,31,149,231,245,144,232,40,175,216,46,191,4,196,146,185,101,12,205,42,90,188,188,0,156,160,24,83,142,89,205,172,99,220,102,99,220,1,135,220,77,41,41,17,156,34,22,148,121,154,122,13,111,52,81,123,254,133,243,117,42,169,21,126,90,133,94,151,95,215,212,16,103,214,9,44,138,157,133,32,113,148,115,117,86,164,42,96,224,164,253,232,234,46,19,68,24,125,99,237,97,197,166,
+21,199,80,245,108,84,222,22,198,109,225,19,152,74,20,98,77,12,140,111,248,239,132,107,174,52,201,170,240,154,195,216,75,17,144,198,195,251,1,15,175,55,83,122,4,186,133,128,158,77,128,4,133,76,154,139,95,11,85,26,197,58,145,99,71,171,112,63,232,189,40,209,164,126,104,166,142,89,135,81,208,239,36,182,56,206,191,12,85,102,168,126,55,203,10,153,109,183,92,148,37,117,156,192,75,248,129,40,181,165,147,146,198,107,181,42,208,59,73,1,2,195,222,76,108,24,254,182,86,11,48,53,19,104,42,87,54,134,153,162,226,196,161,128,164,34,124,144,58,232,182,197,121,13,122,53,191,203,222,58,149,164,70,222,56,39,98,145,40,221,63,195,84,42,192,186,44,92,22,17,208,180,228,152,25,7,110,64,20,205,149,26,91,195,233,137,194,109,106,165,196,236,125,218,175,125,77,169,22,149,67,92,59,248,218,64,146,42,225,66,84,210,197,130,82,226,8,16,109,17,177,222,168,42,8,211,100,13,134,201,122,180,67,217,28,14,209,59,138,136,158,6,142,45,48,249,
+247,40,252,116,160,81,69,144,56,221,158,139,189,144,11,170,79,96,182,146,218,2,27,49,206,71,201,246,140,202,209,69,108,128,101,105,248,142,1,74,168,172,155,210,194,99,111,245,99,98,157,192,191,83,20,126,198,145,69,167,124,203,242,107,117,198,82,136,203,243,172,81,173,106,132,138,60,219,226,152,254,24,51,233,74,210,42,249,156,117,176,36,156,20,81,0,108,58,76,39,197,50,35,150,207,140,112,28,68,150,255,75,119,120,55,147,152,157,173,58,90,164,31,114,2,45,181,207,163,209,71,40,229,78,155,213,108,213,115,37,174,138,148,248,94,141,47,17,206,173,80,72,71,159,152,41,56,121,65,153,205,95,193,40,6,96,242,90,121,5,201,13,169,147,44,181,15,146,64,135,245,140,42,244,69,250,11,63,249,198,159,28,75,50,89,99,141,188,21,234,224,167,146,111,8,131,121,170,70,204,23,165,188,106,31,1,216,4,105,89,55,114,136,148,161,74,70,199,42,182,61,49,196,177,162,248,3,213,155,98,69,38,58,70,18,76,169,183,201,82,115,76,160,241,138,159,
+181,221,74,198,45,134,93,82,10,205,98,70,102,101,73,100,176,167,74,133,7,154,85,22,18,101,146,42,33,144,196,236,215,207,136,106,41,129,104,226,88,144,230,165,55,202,57,92,172,76,80,156,242,220,158,78,147,152,15,96,10,50,107,74,217,193,36,87,69,182,32,20,66,149,83,37,56,123,44,206,20,122,242,250,44,175,82,139,228,176,148,201,64,81,92,82,201,79,230,211,139,36,156,212,88,102,195,18,77,185,72,76,73,140,184,110,156,20,99,26,148,137,118,163,44,216,49,64,69,94,243,147,99,89,149,109,44,154,179,188,194,204,155,36,229,143,44,41,171,78,107,149,225,83,88,169,238,152,15,54,71,5,143,74,167,92,146,237,70,165,66,202,158,30,123,20,50,94,219,208,158,235,89,96,54,111,21,157,74,98,23,242,85,178,14,51,111,29,53,50,133,242,6,166,83,246,148,172,168,108,24,16,20,31,199,58,170,178,15,201,73,54,2,209,168,130,145,204,202,205,86,108,226,165,247,170,87,15,194,126,168,152,244,136,101,66,42,140,6,4,179,151,34,83,19,200,
+41,74,213,88,145,124,192,2,218,89,63,24,21,9,80,57,70,139,120,175,206,18,129,23,0,230,106,151,168,138,189,142,147,105,53,188,216,116,214,175,240,172,209,83,213,88,144,128,240,211,217,45,169,188,14,41,176,205,136,128,41,237,215,92,180,99,18,35,26,10,19,88,185,64,173,25,9,17,254,134,77,15,112,199,222,24,100,233,1,14,131,234,16,162,148,128,29,101,171,48,13,77,25,62,26,198,72,242,234,13,46,155,193,21,130,158,139,222,70,120,97,42,1,241,34,226,253,156,252,69,83,152,244,88,14,252,0,122,198,53,252,159,116,123,53,54,158,39,23,198,7,116,206,84,92,154,145,225,166,159,136,11,172,7,181,185,192,70,199,70,39,213,140,188,14,165,103,43,214,13,243,92,39,5,82,9,244,209,19,228,45,152,70,151,234,33,48,225,208,171,142,48,89,48,78,189,175,117,20,151,108,35,69,126,154,63,234,101,37,169,22,57,222,92,250,196,109,106,101,19,126,84,119,111,130,60,12,134,245,157,64,104,25,229,13,152,163,54,52,244,43,84,116,120,255,213,
+104,60,127,249,172,148,70,246,236,162,173,117,87,157,125,236,80,22,169,38,149,228,30,202,95,100,254,238,85,110,168,48,168,71,253,37,157,158,241,145,130,238,72,158,210,151,63,186,190,2,173,7,107,245,43,205,212,72,25,35,143,93,22,121,7,0,74,211,53,61,246,134,202,124,146,165,68,82,204,88,192,24,151,106,102,146,222,85,41,15,10,73,58,12,77,159,64,9,83,187,22,44,31,152,39,65,148,177,30,34,169,228,70,225,34,171,29,192,174,10,78,228,134,247,173,195,130,190,210,5,97,126,141,21,107,52,203,196,40,52,88,40,198,137,33,83,96,67,74,4,153,87,230,204,117,162,117,13,2,8,191,118,142,50,145,79,78,77,207,3,245,194,222,139,151,250,133,9,162,204,4,112,102,247,226,243,4,157,123,159,39,66,92,236,75,155,250,228,100,190,219,188,239,114,131,150,230,106,2,51,64,203,196,200,127,39,77,198,202,15,52,34,88,173,161,138,218,224,166,125,41,56,63,132,211,4,172,191,15,129,203,50,23,79,94,131,171,44,48,137,31,192,62,158,94,88,
+189,84,25,208,58,19,198,221,216,232,201,231,167,36,93,178,139,209,19,147,137,107,182,161,88,198,85,136,205,187,20,103,81,94,75,73,22,0,106,144,33,102,171,154,140,30,102,213,190,97,172,194,232,252,172,30,93,37,217,45,57,66,149,7,84,54,196,42,255,44,204,99,100,232,28,73,113,172,9,165,7,3,140,134,54,225,32,13,179,43,39,28,245,91,17,152,129,84,40,207,181,55,156,35,37,255,47,48,10,24,110,176,32,91,202,125,0,193,69,145,15,142,214,51,243,10,192,180,95,74,5,121,86,181,16,213,99,44,1,203,48,106,192,101,104,4,135,84,174,130,48,101,65,148,166,172,241,181,111,193,194,61,196,63,244,48,247,176,101,140,224,18,5,21,17,48,62,201,10,190,144,230,129,14,131,41,179,58,131,29,236,220,141,215,21,20,105,9,207,151,65,113,82,210,179,156,140,72,7,137,26,51,163,2,87,15,82,249,136,148,21,71,75,227,42,68,58,194,105,176,12,230,92,165,97,211,190,214,154,150,91,58,214,67,191,83,134,16,168,21,44,190,89,189,205,41,
+2,200,131,0,211,13,169,210,18,241,84,29,169,42,186,0,5,82,225,16,247,29,242,22,11,187,217,186,176,243,87,113,84,68,9,167,162,0,227,12,200,243,137,127,143,37,62,205,69,113,68,124,193,100,82,144,32,193,162,121,120,3,179,30,139,76,149,219,115,242,136,96,166,234,184,174,56,49,21,180,21,44,15,43,225,33,74,30,10,18,73,219,173,198,171,56,205,96,233,219,23,42,228,17,170,210,54,165,29,123,52,190,182,109,124,130,41,235,111,122,46,108,128,161,96,163,139,227,20,60,157,178,20,205,63,191,237,127,47,186,39,135,216,242,164,174,68,196,171,212,214,109,104,158,162,215,27,247,210,33,59,156,29,211,67,210,79,224,203,79,200,251,79,64,59,83,2,215,116,5,82,245,218,187,90,98,79,97,147,81,178,194,140,63,214,229,108,198,151,83,155,169,12,32,181,185,57,85,36,1,45,242,46,35,198,7,173,71,146,118,170,28,15,248,16,186,88,200,175,191,64,91,138,213,19,78,236,33,217,24,230,37,25,197,178,217,212,146,97,222,153,71,16,78,69,179,
+155,41,72,170,89,219,108,207,252,99,104,157,220,121,30,168,48,160,213,234,76,226,119,226,226,8,170,94,100,1,102,193,12,247,128,235,55,111,47,245,195,148,186,73,129,62,252,69,5,186,48,90,107,234,159,185,66,138,83,65,129,184,174,229,90,201,36,160,138,76,105,152,126,246,56,13,69,99,100,204,32,73,39,117,50,48,176,78,198,240,23,144,32,96,76,235,156,205,85,66,86,30,55,227,146,170,166,155,2,51,42,155,19,107,237,80,81,209,96,210,232,112,176,43,240,207,31,16,222,52,158,206,237,112,64,130,169,254,49,70,14,121,46,236,78,72,217,133,1,39,147,5,132,38,84,111,240,39,111,80,191,175,192,31,48,121,228,79,48,21,13,133,188,156,180,54,251,138,247,46,89,238,142,248,240,16,229,141,41,233,245,208,131,181,124,91,249,232,13,24,230,245,201,192,183,86,220,35,215,117,180,100,111,192,219,53,65,91,221,195,221,23,244,100,199,54,102,233,141,182,229,103,225,111,87,173,135,246,253,0,229,122,124,148,237,186,192,188,175,92,157,147,214,54,129,110,
+1,63,90,222,88,200,168,117,247,42,236,248,164,181,185,55,70,89,81,161,224,138,126,129,172,206,27,170,212,163,10,153,231,93,93,170,208,120,149,132,120,222,72,183,28,15,183,99,160,210,119,52,79,179,6,16,97,56,196,37,41,155,86,227,101,16,53,79,228,141,230,133,179,45,236,223,112,39,183,178,105,226,97,136,55,78,185,157,70,107,195,70,26,102,215,14,7,196,10,95,242,211,184,153,69,232,239,100,249,65,25,41,92,187,140,226,84,98,174,100,154,196,176,113,174,173,93,97,123,38,0,108,13,111,237,85,20,60,39,137,186,101,248,187,170,167,10,16,254,169,201,51,143,194,43,37,13,72,237,134,231,136,159,102,92,49,228,165,99,3,37,203,215,254,190,52,94,196,96,201,92,179,9,165,201,236,229,171,86,137,235,32,211,17,194,103,57,141,195,76,18,180,219,232,104,59,251,131,211,227,243,97,247,248,147,107,214,188,97,21,139,177,77,228,107,160,171,209,136,10,200,111,70,223,180,171,116,89,102,92,86,186,146,184,147,17,206,200,17,5,143,143,121,35,169,130,
+68,227,251,211,38,241,27,111,1,147,209,55,238,226,202,164,128,226,16,89,193,122,133,58,12,197,67,109,225,130,221,3,187,73,236,136,138,108,116,141,188,87,62,224,89,247,141,229,157,167,51,138,183,169,16,153,157,147,210,18,148,39,113,140,178,158,210,71,200,122,38,119,144,83,51,216,184,60,85,6,200,17,28,98,77,99,196,24,24,118,180,51,129,101,92,145,54,184,148,113,1,48,149,203,12,59,159,160,188,34,247,7,182,225,201,188,230,29,53,104,238,176,14,74,44,197,126,2,244,10,210,105,178,134,97,182,116,43,11,147,130,175,70,3,91,107,91,112,83,6,152,12,157,48,17,199,197,98,174,219,192,44,6,42,94,181,38,131,45,91,3,233,94,177,106,145,191,104,211,7,51,31,148,37,28,96,86,15,48,141,55,156,229,71,239,32,190,103,117,100,243,41,89,39,211,53,54,33,99,150,163,26,162,234,137,51,221,34,83,45,136,40,17,181,32,37,73,212,90,156,1,71,35,135,128,224,128,182,84,230,43,208,127,198,213,249,153,80,249,85,152,190,149,109,27,199,
+42,76,203,29,203,222,5,216,112,174,150,119,255,129,51,160,148,38,63,92,3,113,39,241,159,90,2,56,27,32,97,68,189,138,156,199,213,3,45,108,228,147,133,186,200,242,3,224,98,29,53,52,247,178,49,206,54,21,168,180,62,45,196,76,23,101,216,155,229,212,188,27,67,194,68,117,83,151,73,6,152,42,144,38,152,63,161,251,88,174,29,79,157,42,171,160,210,106,148,107,44,164,157,166,171,216,7,19,215,224,206,232,68,106,50,155,102,165,6,215,158,68,102,70,55,58,75,90,119,114,152,130,114,172,173,183,251,119,194,169,56,194,47,254,254,119,211,52,205,144,143,223,123,108,112,120,172,215,4,20,21,174,86,186,163,24,232,226,211,228,38,51,237,196,144,136,218,83,64,67,52,176,220,222,102,229,158,88,47,84,79,172,23,220,19,235,96,143,119,208,219,239,119,250,159,110,173,199,135,71,119,254,182,243,55,193,127,154,59,100,29,24,45,121,175,172,205,222,187,63,22,190,10,127,244,124,27,202,120,24,108,147,86,89,118,148,13,123,102,185,144,25,125,214,178,142,
+140,142,48,205,114,125,152,83,235,18,159,185,88,137,189,206,180,161,101,215,196,142,108,137,201,215,99,169,107,229,196,60,209,50,185,162,76,155,90,56,28,110,116,81,93,26,66,157,225,238,183,246,242,14,118,179,22,95,102,156,199,104,245,101,6,243,26,59,125,93,211,47,111,97,27,55,255,170,135,155,69,160,150,178,110,110,99,31,45,55,36,131,146,222,140,165,156,82,152,48,108,147,94,239,236,230,101,58,82,131,72,53,67,233,178,41,221,76,209,111,33,166,34,211,202,103,69,199,162,91,122,41,116,155,37,246,72,9,196,102,40,183,181,151,15,136,77,91,124,153,161,30,167,213,151,25,238,113,90,126,153,225,30,165,245,151,25,237,49,90,128,217,193,30,165,21,88,9,189,55,108,9,102,134,122,156,214,96,102,184,225,230,45,194,92,12,111,110,21,102,244,147,230,78,97,62,196,238,221,49,204,27,221,111,23,102,9,121,179,182,97,112,74,115,64,127,119,167,143,208,65,204,12,167,202,107,148,43,21,213,50,171,249,87,148,48,103,249,42,46,228,140,163,202,74,84,
+90,188,41,251,47,109,81,39,71,176,193,19,112,218,78,124,69,78,73,51,88,117,94,234,6,163,11,94,152,168,74,109,212,215,42,248,199,26,58,60,102,105,42,127,156,86,105,62,142,32,107,67,27,47,209,225,72,157,96,229,166,192,83,62,86,67,255,52,135,29,185,27,253,138,54,106,150,237,62,180,157,154,86,174,235,54,88,234,170,230,116,221,242,91,171,53,118,84,115,54,184,97,103,53,51,82,201,24,176,103,255,160,254,106,22,207,54,239,179,102,198,50,73,39,27,245,93,243,144,226,94,253,215,74,156,107,163,62,108,22,145,238,223,143,205,150,23,121,57,245,222,177,217,192,200,189,123,179,81,14,148,105,208,102,193,66,77,96,84,161,165,231,184,43,219,175,78,51,190,114,243,54,123,254,143,210,196,205,87,80,239,108,230,230,31,216,123,84,209,81,129,182,90,150,13,56,34,26,187,122,91,181,235,171,182,28,204,136,205,206,95,157,194,121,131,165,82,90,239,194,173,192,129,81,144,207,177,248,81,35,118,136,206,209,140,239,54,174,61,237,184,204,10,28,181,216,
+236,171,237,107,224,184,203,223,200,152,52,105,50,110,113,67,105,191,112,4,111,40,41,140,68,96,66,173,76,84,79,85,12,27,49,67,157,162,75,39,183,113,120,62,95,246,207,133,49,27,135,30,229,81,125,89,160,187,62,88,251,44,242,18,230,170,214,151,74,241,215,120,21,216,86,14,165,52,89,174,184,117,79,151,9,52,240,196,2,16,103,84,176,242,196,73,102,156,0,122,131,88,198,228,67,252,118,44,243,27,234,188,229,214,224,96,225,63,107,232,129,163,150,171,32,60,150,28,98,228,99,237,118,32,62,86,62,153,146,252,15,28,13,135,163,39,86,232,107,243,218,19,97,228,67,231,221,101,180,89,111,170,138,180,115,64,31,0,243,74,230,9,247,127,208,221,100,130,50,130,210,238,156,172,94,27,240,52,69,84,14,198,5,32,221,127,207,11,228,162,48,25,183,29,205,44,62,163,242,1,200,232,212,57,134,92,60,176,28,83,116,94,245,231,115,16,216,246,101,152,249,92,218,219,149,111,214,223,22,141,65,166,6,108,153,74,107,85,113,90,45,126,233,20,35,237,
+241,64,212,64,78,224,96,70,203,129,113,121,114,51,82,77,236,201,34,225,52,228,202,6,55,234,203,169,86,178,42,37,84,214,85,203,120,57,200,223,160,194,241,40,224,244,104,218,51,231,146,252,71,87,119,212,93,253,148,198,11,72,157,186,57,115,75,114,87,153,117,168,100,47,64,251,220,250,91,61,88,25,68,40,98,39,243,88,59,29,19,12,112,197,170,92,195,166,237,145,119,124,42,87,169,210,204,205,120,220,240,135,224,78,13,78,244,27,42,143,103,12,0,158,133,14,147,42,165,181,185,67,89,72,231,166,155,140,230,127,119,249,44,189,180,111,95,231,243,160,94,191,61,229,42,160,47,29,145,2,50,193,113,38,57,249,121,158,91,134,226,1,212,172,72,103,130,184,227,58,70,110,141,182,22,234,158,116,236,2,50,89,149,58,172,139,132,187,245,81,58,101,145,200,203,84,100,79,165,92,248,166,123,144,169,70,48,153,49,5,96,168,5,112,126,204,197,228,82,115,244,254,25,54,204,131,76,21,133,169,119,125,46,38,13,179,15,38,196,45,102,69,236,118,26,50,
+62,33,236,36,57,212,193,232,208,168,176,14,23,35,37,39,66,57,132,238,145,32,67,203,69,29,207,82,185,242,253,83,104,20,39,95,223,237,213,12,84,215,245,85,136,51,116,210,71,228,80,194,24,134,46,92,97,65,195,66,119,98,229,138,229,126,117,29,74,21,219,27,61,241,187,152,234,86,89,153,255,16,23,142,90,149,9,84,57,166,117,238,171,198,53,250,229,46,78,142,137,77,169,41,248,21,46,60,165,76,122,11,120,170,213,204,241,226,26,106,27,83,14,33,212,129,249,36,201,109,78,1,122,162,117,62,16,219,236,218,190,224,228,161,59,149,175,122,202,229,182,64,28,3,52,23,124,169,86,5,160,191,212,172,139,189,189,15,8,3,32,194,60,70,103,94,31,56,207,74,55,156,117,76,141,97,169,45,175,81,240,53,188,72,213,116,25,252,195,58,243,154,20,53,182,124,194,47,210,98,52,103,173,125,85,239,94,69,194,119,157,215,22,133,72,85,36,119,244,196,141,16,141,158,108,183,171,157,100,173,178,209,220,81,182,100,92,195,175,150,112,84,251,13,211,230,
+137,227,12,6,168,150,21,41,11,30,179,12,93,158,13,32,225,10,119,78,104,37,76,141,193,222,65,139,54,90,107,29,135,181,185,170,226,100,151,175,130,158,69,198,233,223,86,228,121,43,160,233,183,137,185,97,87,18,171,58,53,51,178,209,147,99,189,217,219,250,34,87,208,72,21,96,91,10,167,245,153,140,197,218,51,55,137,116,12,229,10,195,114,98,19,62,252,157,214,202,199,118,254,198,214,202,14,118,187,45,150,197,253,58,42,187,51,216,163,124,148,206,202,86,63,131,239,112,93,112,76,120,137,22,213,28,61,188,231,178,227,155,254,218,222,203,117,104,129,87,137,26,215,186,74,19,120,96,3,28,43,228,238,108,132,99,69,72,115,255,27,75,197,143,208,7,199,129,218,227,244,195,113,140,164,250,190,56,183,250,242,30,161,135,181,131,239,155,245,178,54,3,89,11,207,244,205,204,202,244,209,208,227,218,233,111,109,209,221,187,190,227,107,91,93,59,158,5,111,33,229,150,215,185,206,33,159,249,235,197,92,24,188,13,204,67,80,157,94,31,230,40,62,238,221,3,
+91,15,138,121,28,222,249,155,39,76,66,184,167,109,185,239,185,225,123,231,159,187,109,219,125,249,254,61,179,53,203,116,156,94,181,244,244,192,38,218,94,24,231,43,155,105,91,248,60,66,83,237,10,43,216,164,185,182,227,110,118,211,164,93,199,188,147,191,217,216,70,187,44,183,106,9,125,227,142,218,30,154,109,222,89,219,42,250,178,222,107,182,103,241,240,238,190,218,37,177,172,196,165,165,216,123,246,215,62,118,29,53,26,251,173,135,103,227,62,219,22,134,155,246,219,246,97,37,4,168,93,200,71,253,126,185,228,159,86,237,190,168,196,187,172,70,213,2,94,136,241,182,13,35,218,234,53,14,220,153,25,154,27,119,123,99,61,70,19,239,242,250,38,181,235,83,61,185,29,77,160,220,87,27,87,232,15,180,113,99,237,242,210,166,219,212,248,2,172,251,9,187,38,77,103,107,5,54,141,169,142,146,107,148,104,95,231,163,20,124,110,176,166,202,136,120,63,89,177,226,204,244,177,190,42,160,172,183,91,166,239,15,134,16,87,235,106,185,226,30,157,56,40,205,231,148,
+32,165,67,98,55,186,153,136,126,199,27,140,156,78,215,201,21,202,221,92,119,32,182,129,231,64,204,147,100,138,85,74,120,153,231,108,134,185,209,216,238,54,54,17,233,150,63,28,79,197,177,152,210,174,108,101,112,65,229,64,68,124,14,204,170,16,107,121,235,6,28,68,199,139,170,139,82,205,182,85,45,31,103,12,114,181,48,23,188,248,203,202,51,211,45,131,251,129,101,164,18,2,70,207,138,250,184,13,232,204,94,150,128,115,188,164,2,56,142,3,148,144,196,77,126,43,40,123,38,73,56,50,236,83,182,89,128,214,10,76,83,150,27,25,69,163,29,210,30,75,125,170,75,206,69,26,199,66,212,239,209,229,116,165,220,155,234,210,64,237,153,139,215,77,131,140,118,12,34,186,248,203,24,75,234,170,86,3,205,207,136,30,62,163,209,213,232,65,100,154,151,223,118,242,161,202,43,99,128,121,67,33,240,252,153,212,177,215,1,185,206,240,24,110,210,138,220,42,245,27,180,36,215,210,199,147,180,155,181,38,119,99,70,155,182,40,183,234,244,198,173,202,235,68,170,137,
+174,61,184,101,121,131,98,254,149,173,203,125,143,242,38,45,204,205,72,143,210,202,220,162,88,93,106,210,163,244,52,119,181,237,205,123,155,219,237,111,214,227,220,49,40,110,235,117,222,172,252,110,216,236,188,236,27,52,222,99,99,0,222,214,244,92,61,84,110,122,238,68,33,55,111,126,238,82,249,173,77,208,125,73,245,220,106,216,201,42,183,109,175,74,58,143,27,49,188,51,159,183,41,129,158,21,29,110,140,226,150,164,233,83,19,92,203,234,17,159,147,84,198,133,31,247,183,185,48,217,198,25,75,231,234,56,207,222,186,43,59,140,201,200,182,92,217,221,97,169,137,32,200,126,210,254,98,121,227,148,70,146,142,85,78,237,182,76,235,238,101,144,95,19,206,70,162,55,215,81,183,80,54,168,110,41,254,102,77,47,26,181,84,39,149,21,163,84,135,204,222,89,81,51,5,226,58,147,219,19,26,153,129,118,125,174,91,60,81,117,110,250,109,213,252,151,84,29,123,220,154,53,133,41,166,219,164,38,144,226,47,155,159,204,238,125,60,94,176,33,178,129,236,12,53,26,
+42,245,215,102,34,153,213,165,142,167,188,80,37,125,213,236,205,89,224,202,194,13,51,93,178,98,132,159,206,130,34,180,214,2,139,131,23,83,233,11,20,215,27,68,4,225,41,236,186,14,225,86,235,236,251,219,221,51,101,190,228,92,202,103,129,237,167,42,124,221,21,6,102,176,141,174,50,208,77,226,29,225,246,40,23,19,88,7,240,198,23,20,216,161,30,216,35,191,246,248,106,58,105,63,172,119,182,245,155,60,66,15,109,75,49,119,244,210,230,230,145,186,85,184,163,36,187,114,190,172,204,61,168,195,182,231,54,252,250,78,219,62,180,95,180,69,199,167,49,19,112,140,147,18,25,84,154,85,86,252,106,156,59,16,102,94,113,2,235,70,101,149,96,188,86,189,62,84,89,224,212,37,63,55,234,70,14,208,76,135,20,27,98,228,38,30,165,187,159,89,164,228,44,36,76,85,203,146,72,149,102,25,62,82,142,78,249,50,183,229,57,183,114,109,16,130,217,28,97,79,38,229,169,127,152,74,97,210,107,34,147,50,118,251,142,42,160,179,120,192,141,56,74,87,21,104,
+70,25,212,228,91,25,190,103,107,171,28,172,82,231,174,142,184,236,57,220,110,121,193,248,250,101,59,39,232,37,45,148,146,196,44,40,27,2,34,22,116,154,227,190,228,126,76,186,65,245,172,172,11,234,228,154,187,66,170,84,167,115,39,204,233,171,37,182,94,192,68,3,197,72,156,44,25,95,42,135,153,39,213,60,235,202,229,93,218,153,204,174,71,142,189,215,166,199,213,224,98,137,63,248,49,3,198,103,187,95,27,37,81,69,121,24,37,65,191,136,45,178,66,250,36,223,44,26,35,142,71,144,173,233,58,74,196,176,165,183,61,46,9,49,111,226,84,234,226,4,39,217,124,184,112,129,5,66,10,211,20,108,138,58,59,236,244,250,168,222,150,19,119,168,14,108,166,187,252,96,159,174,6,97,97,46,20,177,197,19,124,124,20,185,138,193,152,72,201,113,143,198,246,18,100,37,94,94,227,37,1,0,18,21,19,170,47,142,130,53,18,53,7,78,72,20,36,169,114,134,101,75,138,96,6,147,52,201,156,47,194,24,27,166,88,137,99,98,253,91,104,8,226,111,100,61,
+146,169,10,44,8,132,204,60,231,90,41,229,57,116,194,96,188,1,59,86,200,180,226,166,225,181,42,166,47,159,51,171,142,148,160,137,113,31,7,149,60,54,200,119,225,25,250,240,227,234,168,193,57,184,74,241,213,18,43,40,179,123,78,215,98,39,18,242,196,146,146,244,178,62,122,125,154,171,14,107,173,50,250,220,194,178,76,129,116,147,44,109,164,179,91,162,13,47,45,78,225,149,15,178,9,52,198,47,133,161,135,186,141,58,105,241,234,68,84,26,187,9,235,42,58,50,77,169,43,242,144,73,167,22,201,95,130,140,86,92,94,53,18,212,6,154,81,202,84,180,196,4,157,40,9,135,5,107,89,174,62,92,224,8,46,15,160,198,204,190,92,117,193,212,32,54,90,85,253,91,129,179,172,31,235,211,225,32,22,117,243,45,199,127,236,41,114,234,166,213,60,221,160,123,41,213,129,53,101,210,73,37,213,223,36,55,92,233,201,69,79,104,108,185,142,168,57,16,45,43,134,220,74,99,92,204,41,79,187,26,208,106,142,34,154,34,181,114,228,135,97,107,99,175,94,44,
+70,237,176,66,101,161,74,110,224,116,123,83,208,232,158,144,246,78,210,182,60,177,90,235,172,115,171,224,148,227,184,241,246,204,158,93,162,165,189,130,53,103,34,24,114,67,243,189,163,78,71,77,109,20,59,46,10,125,85,144,187,199,74,148,89,31,152,217,25,53,249,69,159,41,93,48,128,14,125,118,45,147,167,2,67,197,14,71,72,157,70,221,148,114,171,232,164,97,107,92,166,101,214,199,55,198,185,33,209,220,169,15,109,14,43,218,139,188,204,89,222,97,161,121,35,220,106,173,85,224,97,43,92,116,88,166,28,175,163,132,220,27,153,74,131,53,102,89,91,119,220,73,231,13,85,111,241,109,83,4,190,202,186,61,29,148,185,157,55,90,153,169,180,106,96,84,133,132,195,169,188,209,170,92,139,176,195,21,2,42,183,203,179,177,156,10,202,242,112,92,233,233,212,247,185,164,69,226,90,87,91,58,204,208,132,60,188,209,28,64,148,50,215,202,49,78,114,135,113,35,117,174,236,75,18,127,40,67,232,180,66,244,116,155,2,206,133,180,249,56,228,16,214,25,82,153,
+10,26,135,113,101,159,158,220,166,203,109,85,51,25,52,213,81,25,85,141,36,117,41,40,139,86,39,222,228,47,206,118,125,52,27,115,150,81,47,253,41,118,222,68,49,183,222,66,232,13,114,203,141,132,198,48,103,14,128,171,83,138,124,41,238,174,154,73,19,137,56,33,190,151,65,75,203,211,186,187,12,203,231,19,171,163,80,215,26,218,187,12,137,217,184,54,74,115,172,190,198,231,225,18,215,125,29,30,248,167,209,233,193,153,39,183,95,24,70,219,110,0,146,1,98,157,251,163,57,214,255,1,94,34,138,114,17,153,188,181,17,82,185,185,143,167,212,137,45,147,37,30,169,39,79,82,235,28,227,10,5,53,78,166,107,20,121,138,160,217,91,89,185,222,79,95,24,164,90,190,186,249,146,183,26,185,78,22,172,43,223,40,237,21,179,17,144,117,148,43,4,169,111,0,79,98,198,73,37,115,20,205,38,92,71,34,194,218,191,229,170,225,186,62,63,196,177,241,181,125,53,122,246,195,175,239,243,92,86,27,94,227,231,168,216,27,95,231,231,193,170,114,173,95,201,196,
+228,52,249,5,70,23,98,141,199,97,230,185,248,236,29,65,186,100,195,175,82,243,47,117,154,57,247,151,232,146,219,82,189,143,10,47,87,14,35,240,24,103,25,74,198,249,229,44,136,227,100,152,20,108,111,23,178,154,119,38,249,182,155,124,161,238,216,240,213,126,85,13,194,45,249,202,62,166,250,40,117,45,12,127,176,46,121,246,150,234,20,15,149,128,226,213,57,213,196,8,43,42,49,58,222,70,59,227,245,104,135,147,101,209,165,131,249,175,145,116,178,71,220,90,22,183,37,140,227,33,182,211,243,237,130,181,206,168,138,9,147,105,32,115,161,99,217,233,85,103,181,152,96,127,35,159,215,251,173,13,134,168,206,237,185,9,109,214,0,48,204,108,243,114,51,136,233,14,165,114,122,42,1,6,219,5,229,38,121,160,166,107,10,61,77,229,10,203,112,215,178,33,17,225,217,14,164,2,212,166,20,22,177,45,29,245,59,51,151,207,141,4,157,217,185,46,2,188,103,36,163,172,20,249,70,116,115,194,223,81,179,65,87,11,13,5,129,153,155,19,107,116,58,237,47,12,
+243,166,235,229,61,251,25,47,88,97,61,210,87,170,185,207,111,2,26,159,162,93,195,32,144,43,56,0,117,101,154,57,147,218,189,254,216,246,174,168,107,190,113,147,180,97,220,126,233,242,205,90,4,254,170,75,56,45,219,123,200,101,156,165,149,53,57,140,28,235,250,1,23,116,90,150,222,124,81,231,3,110,234,180,198,230,230,55,118,90,184,111,126,115,167,143,18,175,202,215,9,62,248,190,78,235,108,125,132,123,59,239,58,209,7,220,223,105,249,228,230,247,120,250,206,168,198,251,60,189,216,115,221,61,150,101,97,183,209,189,158,150,132,54,191,223,179,150,176,111,185,231,211,71,162,221,103,109,113,199,21,159,95,3,26,214,220,31,124,213,167,67,120,247,184,242,211,97,41,165,219,63,203,49,185,199,185,5,180,65,113,252,234,219,64,205,120,143,113,43,104,189,71,177,246,200,119,241,106,160,205,46,6,53,195,61,198,5,161,110,176,115,211,139,66,45,6,105,161,180,209,133,161,214,3,189,209,197,161,117,188,113,131,11,68,29,130,123,140,139,68,45,139,172,191,80,
+212,168,187,119,93,40,234,168,220,27,92,44,106,115,17,60,54,185,241,5,163,30,163,220,240,162,81,135,21,220,247,194,209,91,242,60,31,235,198,81,43,55,31,233,230,81,63,165,219,125,122,163,43,72,189,205,111,126,7,169,179,237,205,239,34,117,100,198,102,119,146,58,44,242,161,119,147,154,116,113,59,198,102,87,148,154,113,54,189,170,212,161,161,13,175,44,181,112,126,148,171,75,237,194,30,227,10,83,23,238,245,87,153,30,120,57,236,225,230,119,153,154,209,190,226,78,211,146,124,223,107,235,240,224,29,215,153,58,198,150,119,157,169,21,200,143,113,173,105,85,169,187,235,122,83,189,174,230,235,77,29,190,244,104,215,156,90,140,124,140,235,78,93,205,225,49,174,61,181,142,214,123,95,127,90,66,139,231,109,202,249,250,202,155,79,205,72,229,27,80,239,104,242,84,189,9,213,140,244,8,23,162,90,170,217,252,98,84,23,92,27,222,140,90,177,63,54,190,33,213,12,245,40,55,165,214,105,220,27,220,152,234,105,86,119,223,156,234,22,243,251,55,167,86,20,72,
+31,88,15,187,57,245,126,171,170,37,149,239,239,127,121,170,151,24,111,47,79,117,93,24,247,189,68,21,231,88,2,91,37,219,79,123,48,129,83,120,164,191,209,213,170,206,185,111,114,197,170,165,224,13,175,90,181,118,209,163,92,185,106,37,205,35,92,189,234,169,190,119,95,193,234,98,144,189,220,160,114,241,106,9,209,94,180,197,126,247,160,115,62,232,138,225,187,174,233,141,213,27,232,126,88,135,226,109,191,219,197,75,8,15,222,117,250,71,221,22,62,215,239,226,19,39,167,102,36,61,7,117,199,114,6,130,167,79,233,115,247,47,195,238,201,80,156,117,251,239,123,195,33,140,186,255,73,116,206,206,96,146,206,254,49,60,222,249,104,183,209,253,203,65,247,108,40,62,190,235,158,136,83,156,237,99,15,150,55,24,118,240,189,222,137,248,216,239,13,123,39,71,52,46,118,226,234,247,142,222,13,197,187,211,227,195,110,159,218,117,61,61,237,155,193,104,0,190,82,172,59,16,103,253,211,15,189,67,127,175,163,39,157,1,108,103,244,196,92,112,102,118,3,187,238,156,
+88,192,253,220,59,57,108,137,110,143,134,236,254,229,172,223,29,32,128,96,203,189,247,176,149,46,252,216,59,57,56,62,63,164,222,96,251,48,210,201,233,16,230,129,45,195,99,195,83,130,157,53,60,248,29,61,27,46,15,230,43,223,142,134,77,197,154,174,71,51,67,217,107,210,8,214,48,24,156,80,191,55,248,89,192,214,212,9,252,249,188,99,6,132,99,128,177,222,119,78,14,232,100,221,85,57,24,128,224,16,159,78,207,49,126,8,112,57,62,244,192,134,160,236,138,195,238,219,238,193,176,247,1,240,2,158,132,233,6,231,239,237,96,124,66,131,33,1,242,248,88,156,116,15,96,31,248,246,160,219,255,208,59,32,56,245,187,103,157,94,95,80,91,181,126,31,71,59,61,169,231,138,47,219,120,252,128,210,221,15,136,76,231,39,199,8,149,126,247,207,231,176,223,26,148,194,49,59,71,128,190,8,124,120,213,162,171,194,160,143,61,88,20,94,103,87,70,163,22,189,10,63,88,244,249,4,8,121,42,222,119,62,113,143,55,139,21,140,112,176,12,211,12,206,199,47,
+56,2,139,246,157,253,83,132,213,62,254,76,203,132,133,1,224,204,96,120,196,135,157,247,157,163,238,192,65,38,90,138,234,87,215,18,131,179,238,65,15,255,1,191,3,50,3,174,28,11,7,227,15,78,129,108,255,124,142,88,0,63,168,193,68,7,208,1,71,66,252,230,35,23,72,244,136,187,39,26,215,96,45,138,17,84,208,97,203,174,165,138,215,226,248,116,64,200,123,216,25,118,4,237,0,254,222,239,194,211,102,160,126,247,4,224,74,4,220,57,56,56,239,3,49,227,147,248,38,172,110,112,14,228,221,59,225,67,68,68,34,54,210,235,31,26,202,197,243,176,80,234,244,142,207,251,26,119,205,34,97,37,167,0,106,28,154,112,215,30,224,224,244,237,16,232,172,187,221,34,220,17,189,183,86,132,156,31,188,83,167,142,147,184,7,254,14,142,110,191,11,143,119,14,63,244,136,210,121,62,160,181,65,79,193,12,190,194,17,204,112,10,222,141,29,8,225,207,157,151,186,226,165,72,230,210,36,113,241,255,0,68,186,0,53,
+
diff --git a/uppsrc/ide/app.tpp/Assist$en-us.tpp b/uppsrc/ide/app.tpp/Assist$en-us.tpp
new file mode 100644
index 000000000..6d37422a4
--- /dev/null
+++ b/uppsrc/ide/app.tpp/Assist$en-us.tpp
@@ -0,0 +1,927 @@
+TITLE("Assist++")
+COMPRESSED
+120,156,132,186,249,115,98,89,150,38,248,175,184,89,214,244,82,21,153,230,218,124,137,48,27,171,177,236,249,181,122,108,122,250,167,180,180,73,207,8,207,74,159,137,12,207,9,247,236,234,156,177,41,123,98,17,32,196,46,129,16,155,208,2,66,136,69,32,246,29,45,136,29,9,1,98,151,216,17,251,190,195,92,228,81,217,85,99,101,214,146,11,57,79,239,222,123,238,57,223,249,206,119,46,239,87,139,47,254,234,175,94,126,245,242,103,47,255,59,95,95,255,135,247,191,123,247,167,239,63,255,250,87,223,47,190,121,243,205,135,133,133,197,151,223,188,91,120,253,205,127,124,251,205,63,254,227,63,254,98,97,249,229,155,111,230,147,45,128,201,22,94,46,47,45,44,46,128,107,47,151,23,95,47,172,188,125,249,118,229,205,194,155,151,75,175,151,23,87,94,191,92,249,250,143,239,126,124,247,135,95,255,234,221,155,165,111,254,250,127,125,5,70,45,126,181,242,179,165,133,165,133,151,11,175,22,151,193,93,47,151,94,46,46,47,44,174,44,188,121,179,188,240,122,229,205,
+210,219,87,175,190,254,246,221,31,63,127,248,248,195,175,127,245,219,249,184,101,48,108,9,12,123,249,250,205,171,229,5,48,104,121,101,113,233,245,202,50,24,188,188,12,204,91,2,11,191,126,245,250,245,215,159,63,124,254,254,253,175,127,245,97,110,55,176,246,151,115,43,151,191,122,245,51,96,221,226,107,48,114,121,113,249,213,242,210,155,197,165,133,55,139,139,175,222,46,45,191,93,6,102,47,44,126,253,225,243,123,96,228,111,151,23,191,121,7,126,230,195,86,192,122,203,43,203,11,75,192,35,203,175,87,150,192,109,175,193,239,229,151,111,23,22,193,162,111,94,174,172,128,245,222,255,215,127,114,211,111,129,131,230,78,154,143,125,5,150,92,124,189,50,31,241,102,249,205,194,210,235,55,139,203,139,175,22,129,17,47,95,131,141,206,45,88,249,250,187,247,159,190,5,99,151,22,23,190,249,12,204,250,230,151,127,187,242,205,2,24,252,250,171,215,63,91,124,249,246,229,226,171,215,111,193,162,192,96,176,231,165,183,111,23,150,222,128,69,151,23,86,94,46,44,125,
+253,237,199,239,192,62,127,187,184,242,114,233,121,197,55,32,20,175,192,204,207,110,89,121,181,0,140,94,92,122,3,150,124,189,176,180,4,94,87,150,223,188,254,250,211,251,121,48,62,127,252,241,215,191,250,235,191,253,119,47,127,241,242,23,139,43,43,255,126,62,252,45,24,254,102,105,121,105,105,249,213,219,229,133,151,75,96,25,48,199,242,220,103,175,94,130,112,46,172,44,190,249,250,183,239,62,129,53,63,131,75,175,191,120,118,97,142,38,224,251,165,55,43,75,96,233,87,224,5,196,21,108,112,9,248,103,241,237,242,155,165,165,55,47,191,254,246,251,119,159,62,253,228,164,185,131,254,122,190,201,133,133,175,22,22,126,246,122,238,219,149,165,197,229,183,115,231,44,45,2,39,47,190,90,121,187,0,188,188,242,106,249,229,226,215,63,190,255,191,254,244,225,199,247,127,120,255,3,112,243,7,0,143,111,254,41,68,63,97,17,24,243,5,138,139,95,45,44,2,48,174,188,122,245,114,238,175,21,0,136,197,165,21,224,240,151,11,111,150,129,69,224,27,132,249,243,
+79,104,252,237,127,219,195,210,87,11,75,63,123,187,184,188,4,44,121,187,188,12,60,0,38,88,120,187,176,176,240,242,13,248,6,59,3,126,121,198,199,194,79,192,250,105,249,47,195,151,191,90,88,254,217,107,0,99,16,169,183,203,243,229,223,46,205,253,183,8,220,191,248,234,229,10,136,195,226,151,225,139,115,175,47,254,21,240,251,194,226,155,249,207,179,231,23,86,190,90,0,249,0,76,92,88,89,1,251,94,2,174,94,124,3,246,190,2,124,191,244,12,241,133,215,111,190,254,187,247,255,240,233,63,188,251,252,254,39,192,252,245,47,255,234,11,210,22,94,125,181,240,234,103,47,231,227,87,222,188,5,1,92,88,158,251,111,105,121,249,237,226,219,165,165,149,197,183,43,75,175,94,2,63,126,250,146,208,243,193,243,148,122,78,199,191,76,242,250,171,133,215,32,185,192,94,87,86,192,238,159,135,129,157,191,94,152,155,178,248,230,237,171,185,23,126,154,228,55,63,255,254,195,15,115,59,0,50,190,249,2,134,191,254,229,223,44,44,188,158,79,244,6,36,205,155,
+55,175,94,46,189,5,206,0,62,120,185,2,144,14,8,225,13,8,52,136,243,34,72,131,57,35,124,251,127,190,251,251,247,191,249,249,79,217,250,108,194,28,129,43,75,43,111,230,184,5,35,129,233,192,8,48,207,219,151,47,95,129,43,111,222,128,108,250,250,239,223,253,241,95,0,112,241,229,87,139,47,1,138,0,255,172,128,164,4,107,1,248,189,124,59,231,18,192,12,32,2,128,138,222,174,124,65,224,111,126,254,195,251,79,159,223,127,7,130,191,242,242,121,219,139,11,95,45,46,0,223,1,252,173,172,188,89,94,126,5,236,5,107,191,158,83,211,60,132,32,129,87,94,47,125,253,191,188,3,249,242,255,252,239,255,239,255,240,63,255,221,207,255,243,127,122,241,171,79,139,223,188,248,159,62,125,250,240,233,243,111,254,230,55,127,243,111,126,253,171,79,47,255,249,133,23,239,126,120,247,253,159,255,239,247,159,94,252,242,249,237,60,83,95,124,252,221,139,63,127,252,211,143,47,254,248,227,199,255,227,253,183,159,193,61,223,205,255,255,95,62,0,18,120,241,233,
+253,127,121,255,227,187,239,95,252,233,211,251,223,253,233,251,23,159,63,126,252,254,211,47,94,252,221,199,207,239,95,124,254,253,187,207,47,254,225,247,31,190,127,255,226,219,63,253,248,35,72,131,159,102,253,105,145,31,95,124,248,244,2,164,8,184,245,239,63,126,252,238,171,23,31,62,191,248,253,187,79,47,190,255,240,135,15,159,223,205,25,244,211,139,223,252,28,76,243,254,197,31,62,126,250,252,226,195,31,254,248,241,199,207,239,192,52,31,127,120,63,31,251,188,0,24,244,221,71,96,200,15,31,63,191,120,255,95,255,56,55,238,15,239,190,253,241,227,139,239,222,255,238,195,15,31,230,211,60,91,252,233,219,119,96,190,143,63,124,255,231,191,108,228,19,216,213,183,96,232,191,251,195,251,249,223,62,129,185,191,123,247,35,216,220,247,239,62,255,238,227,143,127,120,241,251,247,239,190,123,255,227,167,23,239,126,124,255,60,255,124,142,31,222,127,247,239,127,241,226,63,254,240,108,215,71,240,242,35,48,250,135,47,214,3,155,222,253,22,108,247,243,71,224,185,63,
+190,127,241,15,31,62,255,254,139,237,95,54,254,187,247,239,62,255,9,32,113,238,173,239,94,124,248,225,197,127,158,95,6,67,127,248,246,251,63,125,247,225,135,191,127,1,82,109,190,250,251,79,191,248,41,54,243,95,75,255,20,162,185,59,230,33,249,205,207,191,253,8,238,123,63,223,220,79,247,253,111,191,159,59,4,120,255,191,133,230,251,249,8,16,188,103,4,189,248,195,251,63,252,246,121,47,191,251,12,76,254,252,231,63,206,151,251,205,191,253,231,100,250,226,23,191,254,205,191,253,234,255,127,241,55,63,255,31,255,213,203,95,127,13,46,191,248,248,227,220,235,223,127,248,22,164,195,159,95,252,118,238,220,247,192,86,48,247,191,184,251,151,159,127,252,254,55,127,243,159,64,246,188,255,245,215,255,108,107,224,215,223,254,237,135,63,128,140,250,122,241,229,155,229,127,3,146,118,101,29,206,128,161,87,161,127,250,234,39,153,21,150,5,127,96,11,14,118,91,164,39,82,46,66,82,215,124,42,67,95,104,245,179,113,154,209,3,174,158,235,63,92,178,54,44,214,
+209,35,214,184,77,92,207,238,90,206,81,244,114,176,204,144,186,206,201,89,159,236,241,228,18,78,102,72,169,71,143,69,134,152,84,91,219,44,220,248,152,220,245,94,65,65,187,45,31,61,204,130,237,187,139,49,233,134,20,14,223,208,195,201,85,148,121,95,40,147,201,134,50,157,206,180,113,228,74,247,57,250,83,175,150,236,63,12,63,234,119,38,227,226,248,193,34,228,98,54,203,246,224,182,64,239,113,81,107,137,193,233,145,188,112,17,104,176,8,229,167,224,67,41,124,100,63,68,134,142,220,251,2,58,253,164,25,118,90,6,162,156,165,210,117,113,214,61,227,22,61,62,139,58,102,120,25,50,35,223,2,67,155,54,55,85,211,181,204,58,72,55,3,85,185,219,105,62,236,204,26,25,239,88,220,74,207,210,42,127,150,76,183,26,102,133,85,71,191,62,120,176,244,184,167,197,51,133,134,162,21,24,97,135,125,108,175,154,13,94,205,252,206,108,72,159,53,25,156,54,197,141,80,174,62,186,73,105,157,172,120,168,48,57,157,77,178,106,169,82,220,221,118,19,184,237,
+113,96,53,227,129,14,217,125,150,237,97,207,132,72,140,60,146,228,141,180,59,164,243,48,34,218,29,59,67,112,41,155,18,22,123,156,211,251,81,88,223,227,129,11,159,44,240,202,183,15,221,114,194,67,141,37,241,213,75,33,74,51,50,231,166,210,244,88,119,74,245,233,34,147,184,179,128,100,213,149,157,59,150,228,164,85,167,115,249,179,203,70,241,164,77,26,230,66,190,1,182,176,125,35,180,112,55,55,43,2,73,59,126,172,64,6,88,249,196,5,74,227,62,150,75,20,51,51,151,239,152,93,66,89,87,176,192,170,214,116,225,71,101,109,168,31,63,81,102,107,246,235,217,149,233,92,66,217,92,175,117,5,118,151,114,119,63,124,160,54,137,137,23,38,97,56,218,98,77,15,58,157,205,195,167,188,34,47,104,60,12,88,59,56,201,165,198,238,83,114,226,5,31,111,146,245,140,181,103,53,211,186,75,233,126,242,26,247,77,180,76,110,48,126,160,144,84,2,163,75,173,182,86,52,225,59,114,55,113,37,26,62,141,249,66,214,147,190,197,210,93,43,249,2,61,233,
+208,118,119,20,203,27,167,254,72,233,254,104,213,234,101,219,161,196,1,176,13,174,110,205,130,168,90,93,119,166,86,99,41,9,161,8,139,152,196,238,177,240,125,182,120,223,117,118,43,204,92,231,31,238,239,248,221,216,132,221,209,185,248,216,90,73,23,114,246,244,181,115,8,70,189,229,182,93,249,199,241,118,30,239,11,77,180,113,172,146,54,124,156,209,7,166,86,237,6,215,63,158,237,215,110,102,88,194,36,231,63,101,108,108,105,205,143,39,202,243,130,212,27,89,107,192,118,84,168,184,97,21,90,53,179,208,44,8,122,216,93,221,109,131,60,64,194,33,31,200,10,42,100,182,162,32,232,30,162,100,182,134,10,91,101,194,223,187,87,208,110,80,161,129,161,156,95,43,149,15,235,167,181,70,218,225,17,37,175,119,103,23,246,244,73,184,158,246,37,74,227,123,190,158,95,230,6,15,172,142,115,188,239,12,186,223,164,92,109,105,5,125,18,118,124,65,206,227,3,121,251,163,127,191,90,136,165,90,217,184,80,19,62,208,39,210,87,50,36,131,207,160,208,146,222,19,
+86,191,134,230,22,224,102,190,159,166,13,134,248,88,93,132,30,24,108,149,30,175,176,118,113,2,165,199,170,51,183,149,200,192,158,209,41,152,187,107,163,13,238,186,247,246,241,194,207,63,202,4,198,167,166,220,160,185,153,83,18,66,235,188,94,162,213,219,84,149,118,199,189,3,86,25,45,48,217,160,109,133,159,102,210,22,181,214,158,195,21,79,37,239,225,194,210,99,20,79,62,76,99,43,50,71,70,54,160,159,139,79,207,243,22,126,70,210,217,99,14,142,147,145,221,122,83,209,234,71,201,182,108,104,59,219,173,224,7,186,29,213,24,235,223,33,198,104,123,16,83,68,161,105,187,92,131,59,178,123,239,123,74,162,27,18,21,203,179,65,233,177,139,87,118,133,190,47,14,54,183,237,228,65,222,65,65,105,214,145,168,17,61,89,227,223,57,144,54,241,228,22,53,82,106,42,146,85,211,126,130,65,179,112,180,16,36,31,112,67,140,148,51,146,240,15,232,216,71,9,55,47,228,108,251,100,97,245,216,188,126,98,40,108,158,223,117,155,119,5,130,33,179,21,196,180,
+130,253,251,217,128,18,59,25,4,249,45,221,58,54,77,171,225,33,243,182,49,224,115,135,179,190,139,115,10,97,216,60,18,164,177,54,67,76,211,144,203,70,202,29,101,143,204,237,101,249,82,31,165,107,172,143,163,221,200,104,144,179,77,148,172,203,44,22,201,62,41,99,160,188,61,131,172,106,196,119,22,190,203,43,80,144,46,143,239,247,66,244,213,104,172,100,246,85,154,62,13,47,153,127,124,204,145,74,27,30,107,110,83,241,184,127,108,46,101,166,153,28,162,98,103,166,121,158,164,149,208,176,99,122,155,79,69,105,247,32,231,171,169,175,133,76,230,109,102,224,241,176,7,234,3,136,249,196,167,108,13,33,181,218,101,225,203,251,251,118,173,95,119,176,13,49,229,78,15,81,27,244,175,162,183,49,253,228,181,196,168,131,176,144,87,134,192,67,144,181,158,123,6,224,26,242,39,0,66,95,0,8,61,163,115,213,181,30,44,232,101,224,190,117,159,7,88,221,15,168,193,95,119,183,139,216,184,161,101,21,123,194,154,86,161,12,135,204,41,250,185,209,231,62,75,231,
+245,123,49,54,6,130,164,215,49,158,184,157,217,12,219,149,83,85,174,161,205,67,187,80,29,239,138,21,120,150,167,88,169,235,161,86,87,99,235,96,126,186,43,8,120,168,95,143,149,112,114,155,19,83,40,65,119,32,58,57,153,53,20,102,183,228,195,253,42,157,102,25,76,198,192,80,52,228,76,203,172,28,104,63,253,4,65,117,229,9,254,188,160,103,175,1,187,242,158,231,125,104,231,251,72,78,57,163,25,165,93,110,247,147,231,83,149,147,95,219,192,140,47,246,72,77,65,140,171,246,83,134,6,22,235,144,110,98,97,38,119,34,216,9,4,109,105,176,113,21,2,95,188,200,16,181,144,223,140,217,30,223,136,147,109,164,149,211,25,142,76,201,17,214,52,117,154,116,181,105,46,164,200,132,34,117,25,112,200,195,217,245,48,208,243,138,77,163,145,99,54,6,65,235,234,24,65,170,134,237,179,13,244,25,195,160,48,210,22,141,7,118,219,57,114,154,212,78,75,51,13,7,235,29,5,239,148,19,231,104,230,172,63,122,19,110,170,244,114,208,21,109,234,98,133,115,
+189,18,184,105,251,116,162,113,207,218,15,124,66,211,52,57,137,231,252,222,199,114,68,208,61,224,50,16,167,226,92,3,87,146,144,109,84,210,80,146,25,245,146,193,208,108,84,77,223,142,101,217,178,29,142,180,177,57,30,26,4,53,113,247,78,113,101,18,77,234,123,137,179,228,224,145,208,47,219,123,55,211,178,60,238,53,206,198,45,137,113,214,79,209,76,227,172,4,63,237,8,93,226,33,134,104,144,251,99,227,211,68,112,171,60,36,114,75,14,42,30,97,44,203,147,179,94,171,164,36,76,227,209,161,109,144,113,222,147,81,235,104,67,221,152,132,32,157,143,8,22,128,247,180,137,51,83,255,1,213,236,136,148,149,203,209,164,55,73,206,250,245,71,63,63,231,21,249,109,155,90,59,197,237,72,68,204,167,46,83,33,120,99,228,101,211,198,135,186,218,108,207,142,166,7,220,40,71,98,106,141,107,211,33,46,57,102,41,119,109,91,103,112,4,155,49,75,121,82,237,180,138,176,31,206,19,135,235,206,174,177,23,107,201,36,149,97,183,36,11,149,58,134,225,168,119,
+48,27,228,57,51,147,193,128,139,230,146,67,169,51,72,163,209,100,251,91,147,65,167,147,229,76,72,119,137,222,174,152,113,118,117,155,147,166,253,157,116,63,12,191,151,86,201,227,104,243,166,139,156,138,218,181,73,105,148,28,177,169,157,161,60,239,45,243,187,6,57,182,201,181,205,132,199,17,133,212,95,181,26,147,220,124,160,44,212,15,197,202,107,81,13,49,205,158,58,187,132,115,50,39,49,64,251,20,216,214,36,139,237,142,85,74,173,79,86,10,166,221,149,105,67,194,132,85,96,253,152,120,150,140,197,208,187,147,157,83,74,222,236,72,152,102,149,164,56,202,233,134,115,6,53,44,216,105,40,7,183,99,66,201,67,40,57,75,51,57,28,226,183,171,78,172,82,210,174,141,211,83,70,176,168,228,76,195,87,121,14,238,176,77,153,152,56,57,73,151,133,28,221,99,12,242,171,106,239,182,215,74,114,37,174,226,94,173,88,27,63,228,201,49,7,103,237,128,102,186,47,180,6,206,102,78,116,17,227,53,74,113,155,201,38,105,149,103,27,142,161,206,191,133,96,247,
+40,233,43,158,190,166,83,136,28,37,12,179,90,80,40,26,130,225,232,17,73,187,136,123,30,246,114,161,60,141,101,43,140,243,102,37,153,173,158,28,23,105,21,188,240,65,146,224,11,113,24,36,155,227,88,71,224,125,180,158,253,73,164,41,140,172,179,72,58,100,236,78,38,147,125,35,103,82,40,250,249,73,216,116,144,205,209,210,184,128,6,117,65,35,194,145,149,169,58,224,196,175,5,31,228,214,100,157,48,137,210,146,51,129,187,234,221,139,220,43,139,219,62,167,152,97,183,203,118,78,116,173,48,44,96,137,27,109,169,44,167,65,95,213,156,178,180,4,129,102,198,145,61,229,72,179,8,50,116,50,30,207,142,213,88,95,179,226,103,193,25,184,122,73,199,174,118,111,167,199,23,4,166,193,168,237,87,15,91,91,122,232,65,172,57,164,181,43,201,130,196,208,190,77,8,37,250,102,98,84,195,225,246,218,15,100,82,146,105,112,180,89,99,78,242,180,55,171,136,166,87,122,135,164,125,121,60,78,22,204,156,193,108,131,99,111,202,90,107,152,248,104,171,51,18,119,
+70,97,3,162,58,119,215,246,132,219,214,110,105,111,78,248,197,232,68,88,135,218,148,128,99,184,171,9,136,194,29,201,177,138,225,230,141,115,68,143,182,37,114,103,207,118,61,49,89,132,56,74,132,11,104,214,46,1,196,79,130,237,54,16,70,200,74,226,162,54,250,14,131,41,154,49,222,109,1,135,233,24,42,211,153,125,74,79,95,195,156,226,188,212,135,151,155,20,39,189,166,102,192,39,15,235,167,245,218,131,156,58,204,9,43,87,248,93,15,137,212,229,36,75,213,52,94,195,168,21,171,58,147,210,104,104,103,210,150,156,23,9,245,213,8,103,213,126,57,218,179,194,8,90,105,99,154,139,54,115,235,140,131,54,106,16,108,163,125,238,217,72,78,51,14,171,135,237,62,55,191,127,215,156,182,115,187,229,51,239,86,217,160,225,178,199,122,181,154,152,29,152,137,158,205,241,96,16,46,109,76,124,204,34,135,169,52,233,81,198,135,196,218,53,52,214,115,123,201,179,3,254,94,251,220,92,152,244,144,83,64,64,113,125,168,37,25,220,205,12,237,52,175,68,82,135,
+174,178,119,27,84,173,61,46,188,18,31,135,28,23,200,84,106,108,145,195,68,48,178,61,162,157,236,92,68,130,178,73,243,102,120,231,22,99,131,149,73,85,123,23,28,238,55,35,145,186,175,97,51,233,182,186,145,29,19,246,196,239,170,71,34,83,143,244,74,167,129,30,90,125,76,143,61,204,95,234,250,155,132,73,208,138,34,179,227,181,220,250,40,97,50,34,57,94,215,38,10,170,183,155,108,112,165,164,47,20,80,242,75,110,251,210,219,218,214,196,86,161,92,239,60,29,143,85,131,33,145,146,192,214,23,162,227,138,78,185,237,100,113,9,55,215,103,151,60,211,100,175,40,90,133,92,48,205,83,21,143,86,42,175,185,4,221,180,19,171,179,4,65,239,96,19,153,16,210,17,102,60,84,223,91,75,158,109,129,160,89,133,248,209,84,207,227,249,210,199,57,216,97,187,50,219,176,162,212,144,154,228,47,115,123,136,245,170,116,213,201,19,235,177,212,20,135,87,190,25,101,50,98,88,98,184,137,225,32,206,11,160,246,168,82,13,95,191,96,35,74,135,205,130,182,138,
+81,133,71,133,67,138,115,130,196,177,99,120,213,49,109,184,239,139,168,103,218,59,218,225,240,204,11,10,223,73,183,95,190,60,159,85,43,147,125,165,52,98,75,14,8,22,111,164,152,48,61,9,249,155,3,245,32,159,4,20,147,21,23,239,2,154,125,81,62,120,69,135,83,135,5,187,225,170,183,217,111,208,140,114,172,231,188,66,135,109,33,141,89,139,30,148,195,98,58,113,30,175,109,14,79,147,231,33,198,198,73,231,42,205,42,210,200,29,154,194,116,70,186,141,80,100,110,156,233,202,49,42,198,216,120,5,114,205,56,145,175,66,210,198,101,236,48,180,110,8,155,171,152,73,131,148,95,47,197,203,169,209,70,226,156,48,212,61,68,88,72,103,182,130,115,81,153,176,0,226,148,109,186,81,216,147,20,198,21,210,249,36,152,157,220,87,247,212,3,28,186,148,237,68,120,195,82,68,176,153,204,194,212,21,99,112,74,61,24,7,25,214,120,145,195,87,38,156,60,165,236,145,191,135,223,18,35,175,189,40,72,46,105,71,181,231,61,56,73,125,6,17,184,58,172,253,
+200,170,98,9,132,166,224,241,61,17,203,218,242,34,180,86,201,96,182,197,97,120,76,171,198,241,192,115,252,244,176,23,160,71,98,76,145,140,117,60,74,10,98,217,72,119,32,184,120,34,22,99,10,134,33,83,42,97,77,167,233,19,42,28,50,250,139,135,92,70,54,103,228,80,124,73,173,12,166,96,214,40,220,82,209,49,32,30,247,209,134,217,173,236,106,92,56,70,114,38,76,147,116,48,147,31,209,195,172,238,62,138,150,220,10,29,110,177,25,84,202,56,221,187,222,56,240,99,148,188,53,85,245,28,126,50,32,247,178,112,113,229,48,25,149,92,220,196,26,27,52,4,158,120,253,168,53,180,181,187,237,72,19,47,106,147,229,84,252,9,16,71,114,254,61,125,171,61,188,186,180,228,54,166,129,147,184,11,135,82,229,250,39,17,101,5,237,214,196,125,120,97,235,46,95,77,7,25,185,30,202,150,84,24,50,79,206,4,107,53,147,18,86,215,165,149,12,222,7,183,119,124,17,161,185,116,147,117,41,189,168,106,79,54,194,196,21,179,237,77,76,87,24,214,220,211,
+252,50,39,179,103,156,220,54,237,204,140,189,83,216,212,110,240,71,220,75,47,32,156,88,62,135,239,195,9,169,70,212,158,79,227,110,75,163,226,201,141,72,2,24,135,214,158,248,44,251,48,159,123,215,95,243,249,13,165,250,160,75,228,142,112,190,187,19,161,232,118,157,70,115,150,31,3,130,54,29,222,107,232,20,209,222,117,188,124,197,141,72,196,226,157,26,246,190,93,145,176,20,72,95,255,28,181,77,195,180,125,37,225,225,13,194,168,182,221,157,74,158,208,241,54,189,46,14,24,99,158,146,110,199,87,176,31,94,165,58,201,181,167,82,108,44,90,165,43,129,254,197,142,179,142,176,113,85,117,172,210,221,162,139,19,206,122,107,107,27,61,221,110,103,18,218,20,136,146,21,85,184,172,60,176,135,88,137,177,109,106,58,37,250,78,112,164,38,112,140,147,12,69,114,230,173,62,221,32,170,189,169,214,181,235,73,147,143,98,188,182,191,99,168,31,231,199,44,129,219,81,16,51,54,156,130,34,23,53,219,132,114,73,155,133,115,181,165,63,46,86,103,105,31,236,68,
+44,247,243,90,105,227,46,90,17,42,41,198,251,49,101,178,174,210,73,24,70,209,32,142,205,5,243,54,64,52,227,13,203,137,45,132,17,242,77,52,175,72,217,223,117,152,11,77,200,176,173,63,117,53,87,17,236,100,133,56,84,96,185,140,187,30,5,130,6,14,186,190,83,178,34,176,236,246,117,44,106,18,10,138,119,84,173,134,65,1,66,183,190,17,171,83,15,75,165,40,202,123,229,76,43,6,221,10,145,153,189,114,33,170,146,18,252,24,239,60,52,2,225,251,48,149,194,207,249,108,174,15,213,66,210,80,64,2,35,183,73,118,241,192,72,183,129,50,73,210,66,102,239,133,148,22,243,178,39,2,191,100,58,149,112,166,113,192,140,88,142,126,210,106,159,207,102,67,255,108,214,10,219,188,211,73,30,199,49,141,50,38,227,44,217,228,204,122,114,201,52,217,10,207,70,41,147,177,55,110,98,147,211,166,48,31,242,83,249,109,127,158,169,120,4,51,175,66,3,222,154,181,135,73,74,246,49,201,99,25,122,82,64,88,77,20,10,176,217,188,65,212,22,238,168,67,
+88,216,96,1,66,81,187,139,102,157,61,173,79,54,124,40,51,4,93,33,185,97,248,149,130,75,243,22,183,253,171,42,86,68,169,40,117,232,113,93,68,52,22,23,30,220,83,87,238,212,95,234,68,172,204,179,202,40,3,208,170,116,58,169,78,187,202,52,9,7,66,113,113,124,90,225,137,137,129,174,229,9,157,127,80,180,76,17,237,225,54,231,224,176,82,186,244,58,1,37,202,114,174,74,131,103,64,94,163,91,227,113,77,220,80,240,221,171,219,39,215,243,245,209,113,157,242,142,157,33,63,49,180,124,226,73,24,121,72,26,219,105,2,63,247,201,67,11,9,60,105,251,93,54,124,68,80,136,73,254,131,8,47,202,199,156,13,163,100,163,250,46,73,115,54,2,186,146,237,180,151,102,148,118,81,140,187,173,241,221,19,149,193,211,171,99,3,215,6,5,23,103,42,81,15,97,199,110,219,119,180,219,46,142,47,101,114,37,219,73,50,180,186,189,158,252,104,171,152,54,156,76,59,84,181,82,23,13,227,149,146,66,53,249,232,158,170,66,68,27,182,197,27,76,67,221,
+80,138,113,173,152,202,172,209,122,62,169,18,160,50,107,110,114,54,169,51,242,241,10,184,59,152,8,107,162,247,86,14,254,132,180,174,117,145,16,226,51,118,139,238,239,4,103,119,182,50,117,104,183,187,168,55,221,76,156,78,57,89,47,41,19,10,244,99,5,86,194,193,207,135,158,92,242,145,68,55,49,42,91,57,87,48,44,61,238,196,243,242,39,185,164,66,232,28,249,187,67,57,33,137,73,146,12,189,81,105,10,105,186,61,233,32,87,84,92,226,174,27,153,212,1,111,84,88,93,181,147,180,102,205,214,35,194,40,112,240,168,118,201,56,207,14,152,58,153,230,168,48,149,232,104,62,202,132,96,161,203,25,107,151,61,56,186,166,100,164,189,157,29,81,39,230,29,103,1,151,94,81,49,58,173,76,121,24,204,41,87,179,110,241,109,56,38,151,12,239,122,44,109,152,30,74,7,125,253,125,76,196,194,201,49,248,1,170,6,222,164,159,113,123,21,206,41,118,199,39,87,81,32,191,49,39,245,57,211,92,47,103,221,74,79,193,74,29,254,163,13,121,99,41,240,214,
+242,21,87,37,32,206,51,164,190,108,61,108,27,155,105,215,74,118,166,122,117,207,110,170,18,233,167,155,16,169,42,48,105,28,119,164,90,247,56,157,166,209,130,52,92,15,169,237,74,93,150,64,195,150,169,208,81,51,24,144,43,173,167,115,46,237,4,238,162,32,204,226,130,149,208,92,187,239,230,141,119,36,237,141,183,161,76,60,243,10,207,87,72,9,194,84,73,0,11,183,243,220,140,11,23,138,64,84,0,38,169,202,43,242,70,85,83,43,159,55,100,152,13,190,238,44,77,26,243,39,100,20,145,17,154,195,128,81,172,75,164,22,110,207,165,239,60,144,102,105,169,20,79,212,238,78,246,85,108,150,61,53,141,32,111,220,166,2,111,182,37,47,14,175,16,158,173,134,102,192,133,80,9,106,79,85,225,211,34,179,137,195,22,92,99,49,145,37,247,184,84,114,7,135,98,93,133,245,52,188,178,86,140,64,153,196,147,144,191,165,80,8,142,108,213,237,204,149,53,128,10,148,175,16,50,20,227,236,108,127,186,29,162,150,15,92,92,75,169,180,147,129,83,42,116,3,
+127,176,137,134,227,215,31,238,118,219,57,110,31,213,9,93,123,102,204,76,206,185,203,243,89,221,161,109,52,4,101,240,150,2,44,168,64,203,196,164,97,3,81,205,205,168,59,12,180,95,133,134,144,30,52,66,92,160,61,222,87,208,98,83,64,118,4,73,64,55,189,189,97,69,160,112,160,45,149,238,155,65,26,207,27,108,30,125,213,103,129,115,225,14,200,133,70,224,119,58,40,164,241,218,70,130,160,222,19,4,24,95,230,35,14,42,56,232,129,72,140,106,137,227,29,67,74,39,224,93,187,185,146,41,171,13,210,61,13,247,33,221,99,97,62,111,87,112,107,54,254,16,193,79,186,133,118,101,128,231,110,201,133,148,154,232,74,177,221,221,60,14,209,105,226,34,191,92,111,181,46,15,91,105,239,14,133,114,153,205,17,175,91,162,176,40,56,141,161,91,150,156,182,197,245,99,227,237,158,125,29,139,105,228,198,78,50,71,152,110,100,183,39,9,91,19,14,131,109,211,208,241,194,173,209,218,155,77,188,245,39,151,207,86,136,8,12,118,148,160,27,15,201,110,6,116,
+253,113,24,238,154,177,77,222,130,56,107,11,240,226,252,150,215,219,0,149,39,152,218,114,70,6,162,85,141,242,64,120,98,193,138,228,100,166,240,97,208,39,107,26,220,146,19,114,174,195,184,88,100,8,211,202,120,66,240,117,171,151,147,119,185,34,125,113,207,51,11,199,227,222,221,3,2,253,194,79,9,107,240,101,153,132,203,47,93,219,98,4,108,139,194,114,223,84,114,143,188,139,110,131,226,138,219,182,214,109,33,145,27,49,189,111,37,88,45,174,153,58,116,79,74,154,241,20,123,174,89,245,33,175,70,231,217,131,16,219,27,72,63,220,91,37,26,138,157,247,220,133,192,2,202,70,92,72,37,177,226,187,245,202,17,109,40,217,49,53,7,211,36,35,198,159,220,175,215,146,166,26,162,199,112,181,85,122,189,254,244,238,248,172,178,169,26,17,69,226,245,39,153,213,134,75,154,143,86,3,165,245,85,195,152,254,96,223,109,59,184,83,78,126,93,26,102,179,181,73,39,80,226,97,80,187,174,202,107,134,211,195,144,112,146,119,231,28,233,33,218,80,195,25,26,205,
+74,128,92,208,55,140,176,195,75,186,76,52,102,143,170,87,46,202,86,21,179,191,91,138,36,180,220,67,153,198,188,105,6,185,163,241,121,243,79,62,11,189,192,203,87,98,253,81,153,7,154,135,44,51,150,178,221,197,196,109,209,154,234,28,21,211,133,180,46,106,88,58,41,21,171,37,103,146,219,171,30,37,2,112,21,170,74,212,154,227,65,162,214,55,208,180,104,220,194,190,178,154,186,35,73,180,69,45,195,177,69,176,209,90,67,241,230,208,127,121,37,164,101,7,49,119,98,61,212,62,101,7,225,217,11,14,129,51,245,55,87,211,6,124,255,200,163,149,63,12,206,209,77,219,4,113,36,150,138,128,44,246,41,1,177,31,99,226,249,182,41,161,140,19,204,171,26,153,152,47,105,55,138,66,70,38,49,60,191,161,186,17,201,187,222,169,63,14,47,78,170,9,180,60,123,219,75,250,248,173,116,35,142,27,85,220,6,66,36,120,59,21,89,173,48,73,40,72,54,249,68,171,78,219,245,233,13,231,86,166,220,48,147,205,133,221,155,29,127,129,23,136,194,160,85,168,
+249,92,208,108,90,75,14,130,80,16,11,160,126,94,120,161,7,41,48,128,168,13,66,230,13,224,158,113,241,218,55,237,171,6,104,236,141,213,60,215,227,79,0,63,141,115,13,107,215,234,21,75,48,8,188,20,228,20,81,75,220,28,14,125,143,161,97,45,91,173,101,93,66,63,193,103,6,61,4,194,74,107,178,13,237,141,42,165,235,209,117,27,249,144,64,114,130,107,15,226,21,8,114,237,224,16,226,140,233,188,198,239,98,66,60,225,205,48,91,106,221,4,65,58,237,121,174,67,69,113,30,5,12,185,221,109,115,149,145,107,227,121,92,104,227,56,203,82,47,71,107,237,177,3,85,190,171,184,211,29,238,81,162,26,204,141,146,154,128,200,164,112,89,105,174,202,238,45,57,139,137,207,14,39,97,144,11,58,68,136,55,177,113,127,143,149,91,219,149,155,207,194,78,189,47,123,213,180,192,228,219,27,30,105,228,97,180,195,228,195,205,234,221,54,204,50,58,214,179,61,132,152,241,9,254,212,224,217,27,76,129,223,82,216,113,147,90,158,94,75,142,242,51,212,249,86,
+202,113,192,182,208,93,125,49,233,54,227,62,170,112,180,197,115,74,224,58,147,107,224,139,112,2,198,41,185,173,28,113,110,14,61,2,250,216,112,177,182,102,43,66,210,61,244,29,235,140,119,210,54,251,207,26,117,234,24,47,125,146,135,149,55,119,101,88,198,182,158,156,212,211,13,60,229,62,118,121,72,177,116,186,164,30,239,240,122,115,135,8,68,13,115,75,128,117,24,194,216,110,8,119,196,163,112,105,242,44,23,21,112,194,17,226,71,199,228,169,159,13,94,240,58,252,253,195,236,1,42,3,115,239,18,181,208,93,218,97,61,86,141,8,196,146,112,72,88,245,57,5,187,237,86,188,222,43,192,145,226,73,187,202,33,141,52,190,52,2,110,41,64,117,235,113,27,109,40,100,109,172,29,102,63,112,155,110,92,42,30,53,251,148,68,164,39,118,103,208,6,166,0,59,65,214,185,189,156,234,184,106,139,236,102,220,140,213,88,103,19,167,113,122,178,217,139,172,62,83,149,103,175,201,113,99,212,86,128,124,35,220,142,161,173,231,57,119,228,45,14,60,65,177,170,57,
+46,22,151,161,75,38,195,44,71,235,92,130,186,54,109,230,21,165,222,105,34,33,137,147,28,158,138,29,214,105,215,209,49,102,34,173,71,165,98,241,213,81,41,231,228,109,158,169,114,235,194,128,227,130,224,155,174,62,28,221,149,185,52,233,81,84,152,91,71,178,25,146,166,165,144,189,163,176,180,196,89,55,127,105,127,76,207,137,24,111,75,11,140,231,189,116,154,110,80,172,113,57,155,14,43,146,163,67,246,246,93,39,247,112,200,150,66,16,46,221,91,237,43,74,206,155,43,22,2,167,25,35,177,184,190,30,199,241,36,251,171,70,104,195,34,88,139,185,71,142,107,203,169,107,45,66,148,78,143,41,92,66,166,161,157,159,171,162,253,173,174,207,102,216,220,219,89,109,56,53,243,19,197,167,43,230,69,33,18,26,157,152,29,79,23,146,236,110,6,212,10,250,105,3,211,207,94,161,76,155,240,159,112,141,194,225,28,86,206,168,84,130,118,32,62,146,11,180,223,62,183,166,79,104,79,55,50,16,116,49,87,78,71,251,237,100,22,158,107,50,37,124,205,22,34,91,
+172,68,52,169,181,187,200,165,54,39,199,240,200,37,102,11,93,7,234,40,20,29,175,66,96,120,10,169,171,162,78,76,90,237,206,217,109,177,231,57,15,73,119,71,149,91,52,197,183,234,134,44,133,93,128,72,219,142,187,229,169,225,217,1,103,156,56,8,29,222,50,214,47,110,73,251,248,220,83,149,208,218,80,209,116,164,168,207,232,96,221,202,56,5,130,141,215,85,133,31,69,65,242,62,175,96,189,47,233,134,226,75,98,235,1,9,117,129,93,219,231,50,31,220,141,98,215,72,46,82,80,20,85,202,88,216,56,209,69,46,148,60,123,225,40,53,103,138,56,35,0,142,109,20,195,120,55,118,187,113,119,251,145,10,186,34,174,92,59,32,80,52,137,128,49,98,174,112,193,210,132,184,79,81,156,82,183,93,104,222,186,181,71,183,37,155,13,166,161,227,251,70,121,152,217,202,81,92,248,13,43,12,80,202,156,201,142,209,113,230,152,53,124,16,113,157,166,168,45,147,8,138,219,125,51,254,160,189,63,191,9,220,83,64,63,39,202,185,28,21,99,72,54,53,99,223,
+64,148,180,211,54,52,248,57,248,178,122,114,97,14,190,184,177,121,98,244,21,232,44,141,3,2,184,71,131,49,34,32,126,99,244,39,143,59,75,103,48,78,217,235,53,249,250,153,238,94,18,42,86,175,179,252,174,229,216,39,239,35,196,158,211,68,86,254,100,137,22,155,8,14,195,189,73,238,6,31,227,138,8,102,147,49,217,232,239,181,103,192,208,216,234,233,151,141,169,11,119,20,237,3,163,106,194,51,165,13,189,114,205,5,173,113,225,158,44,55,233,101,249,19,56,233,169,111,3,120,192,103,46,72,1,7,194,184,240,53,52,48,126,155,132,102,213,1,87,2,170,60,74,237,182,249,94,222,102,29,250,2,163,171,242,6,245,95,237,207,208,160,63,67,24,181,104,243,252,38,48,163,225,232,164,173,49,41,215,32,168,30,153,19,114,132,162,237,143,107,221,221,139,14,4,173,2,147,58,134,11,29,82,181,225,11,243,65,158,141,142,123,49,65,123,168,126,242,6,247,120,220,104,134,173,33,133,122,129,48,57,180,29,21,66,129,167,44,79,32,140,199,130,196,163,147,
+41,18,197,112,95,185,181,252,88,123,166,104,37,122,116,38,173,140,11,118,252,49,194,125,133,33,169,157,167,142,200,146,246,3,157,235,165,30,34,170,145,65,146,197,108,93,110,116,234,211,173,98,32,54,170,104,183,111,130,248,203,53,92,104,199,155,223,206,11,219,112,255,163,224,241,142,52,124,168,15,10,58,49,101,106,228,164,103,152,13,236,126,59,237,183,244,0,87,234,88,213,147,81,102,214,22,166,178,15,59,216,225,131,112,87,201,17,210,25,241,147,227,70,80,151,113,33,228,58,155,134,112,197,88,139,87,250,173,106,43,61,28,85,141,189,102,134,55,142,73,66,238,130,120,35,38,243,132,125,110,183,38,121,198,205,197,58,143,229,168,230,105,66,220,21,27,115,201,76,117,67,138,200,11,212,171,17,65,189,51,30,142,70,17,3,115,20,148,72,196,65,130,42,50,34,230,163,21,198,61,141,166,180,229,102,145,152,82,225,57,213,79,102,19,99,127,224,142,23,135,179,66,46,215,201,179,41,102,87,52,225,224,201,89,58,95,133,93,129,137,142,155,97,126,249,136,
+113,207,201,117,7,29,229,30,193,178,95,148,162,61,71,109,23,74,101,144,155,159,104,163,29,187,243,162,144,117,5,139,5,58,41,111,218,57,145,43,201,195,136,2,77,207,196,67,170,131,61,198,118,190,167,188,12,7,246,196,183,229,40,81,234,22,27,55,163,50,63,237,232,162,216,180,7,5,141,212,69,127,175,89,227,106,240,209,109,206,192,208,207,59,88,57,241,110,155,220,162,50,207,82,148,56,82,99,195,250,9,21,216,150,160,112,183,17,101,187,72,173,8,211,110,29,239,27,226,221,150,78,92,174,212,156,42,186,128,21,244,68,98,18,255,58,77,31,101,139,71,126,165,29,227,69,154,93,154,45,138,15,153,201,73,143,5,237,222,176,176,181,109,244,209,112,169,170,103,84,48,70,214,187,133,145,199,67,227,223,182,226,101,37,207,139,113,181,57,233,9,171,166,141,151,207,88,174,77,166,112,208,141,85,137,103,218,11,64,189,254,170,38,246,116,60,91,219,191,40,12,72,242,157,19,132,187,126,47,8,68,66,90,207,153,253,28,135,42,105,166,50,29,27,175,80,
+247,57,189,188,146,71,47,214,182,93,237,110,39,50,90,213,32,165,49,83,178,99,4,138,224,84,10,121,116,25,182,128,68,145,184,8,6,216,22,9,81,93,155,160,18,238,90,225,182,214,37,105,104,247,88,67,85,111,56,148,110,109,221,219,181,1,158,188,158,109,149,50,161,90,176,245,180,249,56,40,110,39,219,53,29,127,122,122,159,54,167,49,6,227,153,229,138,27,229,84,148,112,4,155,21,202,149,78,85,168,91,119,190,164,243,111,229,29,165,156,210,89,29,139,2,170,65,186,163,173,58,25,1,4,30,251,176,115,94,85,53,114,44,43,31,101,76,105,253,180,225,174,186,169,206,186,19,167,155,113,248,234,99,202,69,39,72,232,195,38,141,25,77,119,81,166,216,68,162,103,196,183,51,83,153,95,145,139,226,123,221,209,8,247,20,171,142,96,26,149,46,95,167,180,162,84,180,161,88,218,24,21,210,89,185,255,104,67,214,196,122,157,107,177,67,183,173,43,158,112,123,51,181,176,166,130,56,174,182,112,68,126,236,218,42,230,174,67,230,201,71,69,165,75,169,169,
+149,136,154,11,29,41,244,132,141,135,195,221,56,18,22,56,53,218,236,50,141,181,118,201,226,82,24,44,199,120,43,95,30,84,107,169,245,81,164,218,169,29,203,149,215,170,132,177,28,177,221,198,194,245,244,237,153,17,199,94,197,42,91,27,61,136,161,19,246,164,81,109,194,212,57,217,25,237,138,61,237,168,240,172,148,61,51,137,253,217,137,150,57,155,93,43,108,155,129,66,205,149,137,142,140,35,104,128,74,145,243,28,69,216,52,195,204,252,40,113,171,116,80,154,236,28,233,97,180,252,118,109,149,171,84,117,81,41,164,144,125,75,173,57,226,240,14,190,193,139,134,108,42,85,210,142,74,37,234,30,218,90,198,72,26,246,8,15,166,32,51,163,80,24,49,40,46,7,241,100,165,157,153,45,102,126,83,194,189,50,212,156,252,107,106,143,209,33,141,48,182,68,209,122,158,147,110,240,128,0,182,121,241,62,161,47,92,56,144,66,33,156,41,195,178,13,54,60,212,92,171,24,21,153,186,181,4,188,102,110,63,182,238,55,92,19,104,125,231,153,247,98,174,139,66,192,
+44,201,94,239,62,23,78,146,184,255,252,118,247,108,254,22,180,92,183,160,231,154,183,92,16,254,203,253,122,151,163,96,15,173,142,210,55,26,238,84,192,151,113,125,95,26,175,0,111,191,253,96,93,87,81,6,234,80,31,145,240,80,129,54,156,166,147,135,164,51,208,197,65,152,117,78,156,31,182,121,207,226,130,86,240,16,203,109,55,21,160,30,132,52,28,252,102,123,168,239,200,140,52,215,118,182,228,134,237,72,3,225,50,204,126,191,118,182,109,75,116,115,91,121,104,83,205,246,131,62,121,237,46,46,223,243,230,74,151,174,204,42,16,90,37,238,128,223,221,204,93,111,20,182,173,185,20,245,220,182,177,54,38,164,219,144,154,44,162,144,181,251,173,235,56,92,103,206,85,215,136,67,95,18,84,52,249,32,113,89,156,42,163,221,211,14,156,60,224,29,182,49,153,49,79,126,24,229,84,143,112,147,112,24,190,186,151,28,84,171,145,206,72,71,15,157,103,247,239,116,17,209,106,134,199,85,170,61,40,28,148,6,13,102,250,170,105,13,53,83,162,209,137,54,162,172,
+220,109,5,196,187,103,93,166,74,52,232,204,8,247,227,227,195,48,225,33,58,108,181,246,25,146,27,227,58,130,90,165,113,135,112,243,233,54,222,151,206,63,54,92,50,171,196,124,155,65,86,111,141,30,177,210,209,205,34,133,241,220,19,45,25,51,218,105,15,41,158,93,50,73,113,105,245,252,94,27,58,58,63,16,33,170,155,53,225,228,52,229,157,165,141,114,205,134,237,89,38,202,219,9,93,251,28,89,221,163,34,180,23,85,16,136,220,161,163,141,72,160,192,63,207,38,178,218,14,211,96,120,141,42,1,53,232,57,165,106,210,150,95,17,209,35,31,153,11,55,179,10,243,34,69,210,106,240,173,36,203,161,171,84,53,123,236,158,4,149,18,183,37,146,138,56,88,82,156,232,110,195,130,184,244,88,209,227,172,203,69,213,80,82,184,229,38,137,98,81,201,25,42,5,203,34,240,219,80,103,222,134,184,123,5,216,108,203,110,125,192,40,20,208,17,100,69,193,129,160,74,42,93,39,103,64,207,173,253,179,250,42,253,82,95,205,132,194,238,42,104,79,114,252,139,59,
+4,91,47,212,143,160,194,97,202,16,249,75,189,221,4,56,66,29,143,67,235,118,241,250,248,22,111,189,155,15,7,145,134,151,24,168,26,165,164,113,92,209,69,23,81,79,187,213,3,66,111,11,105,68,61,132,130,16,116,44,237,2,245,122,237,59,181,149,38,217,190,146,72,121,114,179,247,219,150,59,202,112,95,138,201,66,144,57,31,54,90,189,48,159,237,64,142,247,161,188,147,72,32,86,233,225,195,200,44,169,170,73,157,29,43,25,184,9,227,64,25,114,175,153,118,31,215,18,55,40,232,38,7,118,119,90,226,242,245,0,78,253,71,207,161,184,171,9,90,31,113,2,108,152,104,207,64,15,39,187,115,255,17,181,57,66,75,239,167,60,134,135,58,119,86,172,175,91,177,234,46,141,140,187,156,182,19,182,138,55,155,232,111,19,88,251,19,232,68,236,224,98,69,101,85,49,34,125,44,220,238,246,143,205,110,201,164,218,189,60,171,65,25,233,158,159,52,76,162,132,41,114,36,196,94,111,89,144,164,161,70,78,214,242,169,20,19,38,166,40,195,163,215,39,93,139,
+204,73,219,19,129,30,60,120,0,85,91,49,41,45,20,245,148,1,243,229,104,133,29,28,136,38,218,101,67,22,210,150,82,41,125,58,13,115,25,155,18,138,112,64,158,12,30,115,57,158,48,124,105,166,213,110,85,58,6,206,142,163,216,172,101,149,142,16,117,51,195,179,202,99,52,18,163,53,145,118,28,188,170,179,162,232,16,9,8,212,27,139,162,144,43,244,10,40,236,65,124,152,50,238,245,172,37,174,179,110,216,240,56,243,247,58,73,223,93,176,60,220,0,66,216,38,101,205,24,3,193,42,201,59,202,86,149,246,4,139,138,229,227,106,85,113,159,29,109,17,148,173,138,99,45,22,114,139,225,146,251,172,234,210,49,169,176,203,71,1,98,34,145,144,101,240,208,129,45,101,177,122,171,104,57,151,230,183,21,114,158,254,184,119,92,59,211,96,148,195,152,129,189,46,79,233,20,115,245,87,189,62,158,171,191,245,208,76,124,228,57,211,38,69,65,218,94,58,115,164,29,183,175,188,14,141,107,118,158,70,24,54,243,213,3,162,182,11,109,92,63,112,77,125,77,202,
+41,49,141,29,81,99,205,208,171,63,250,189,108,227,64,118,17,65,79,10,9,32,190,136,253,198,154,235,1,32,116,27,27,70,224,119,182,144,83,37,89,122,186,1,109,192,172,84,20,206,190,110,8,107,225,251,156,83,72,141,154,75,99,87,16,52,200,60,34,252,249,92,201,3,72,238,18,27,191,178,74,227,176,169,0,197,221,152,179,94,22,27,111,222,85,75,44,208,72,156,206,193,124,65,71,227,226,162,52,173,121,140,69,178,108,86,8,194,175,202,231,205,4,232,37,44,137,90,138,14,68,97,110,238,93,91,193,173,171,11,146,189,59,206,201,77,45,159,80,105,122,6,95,220,183,165,89,63,96,140,128,204,107,6,75,226,200,57,111,180,37,200,198,73,198,204,142,86,62,130,239,76,238,69,46,82,117,204,92,11,57,163,109,136,223,204,132,173,189,36,187,181,206,26,66,64,111,207,174,42,114,134,218,224,119,61,98,120,69,166,169,58,104,5,2,129,28,31,142,26,227,15,182,157,218,195,112,2,9,107,68,229,27,92,24,131,137,175,107,169,18,102,123,88,128,3,
+230,208,185,115,3,190,109,48,61,171,25,166,69,45,66,172,82,110,245,5,93,190,238,104,60,187,237,61,164,104,214,252,44,71,171,184,121,87,64,75,173,170,42,58,142,208,125,246,120,127,0,219,215,93,140,49,59,105,94,152,73,128,185,51,45,88,66,222,40,86,42,165,222,160,26,87,185,133,194,64,20,46,20,142,110,196,166,104,2,191,113,207,233,14,234,55,140,61,37,193,132,133,123,124,157,6,22,231,129,80,106,18,160,52,160,127,175,128,60,187,46,144,167,60,37,158,67,111,174,211,188,213,40,81,212,85,3,172,91,197,118,94,92,22,180,242,35,204,83,250,160,226,76,35,83,141,230,106,228,64,203,192,32,30,216,133,8,150,203,207,94,221,159,184,77,21,91,147,113,89,236,62,198,105,137,180,212,89,139,197,238,57,228,154,74,197,182,96,26,195,226,44,115,44,114,168,234,124,163,24,58,186,162,3,182,63,4,229,103,76,66,178,243,185,156,147,86,242,58,182,213,99,157,1,95,212,157,54,160,209,137,172,45,231,172,197,123,211,115,223,190,10,105,37,80,55,
+80,232,73,184,91,194,37,196,172,70,41,174,45,162,228,209,182,107,166,223,221,220,221,111,60,212,166,77,61,72,3,10,168,0,179,231,79,149,106,62,251,104,221,128,46,80,11,7,87,255,50,111,220,247,35,61,215,39,203,12,170,18,2,184,166,46,106,37,237,104,128,70,120,180,244,71,143,4,131,244,18,105,113,67,62,14,98,19,191,67,217,210,218,195,72,93,172,208,8,84,239,180,49,35,133,102,187,113,114,214,98,184,80,173,27,55,214,194,245,102,243,150,243,208,244,26,55,85,67,162,83,135,142,26,181,52,110,197,52,153,25,55,148,206,137,121,148,219,172,114,40,155,117,238,117,230,154,245,64,135,205,187,215,253,246,89,139,111,211,109,229,43,150,106,109,139,161,164,106,17,167,163,137,47,169,10,250,117,169,112,239,250,150,112,28,151,106,187,128,226,177,162,106,101,22,201,176,8,181,72,82,50,58,242,136,203,98,131,82,57,60,215,55,8,98,49,211,24,127,8,197,245,226,228,62,205,172,223,204,111,102,249,45,104,112,132,127,208,238,182,211,190,35,94,155,27,
+76,61,105,164,250,158,168,134,78,65,57,24,104,171,29,71,86,83,148,154,49,31,150,89,88,115,25,112,105,250,153,245,47,100,10,36,91,31,132,251,70,63,189,135,165,145,213,3,49,134,219,107,34,159,245,68,235,154,164,61,175,78,44,127,233,207,142,158,235,71,126,223,211,94,139,141,110,195,5,126,126,16,217,129,204,247,174,147,251,130,229,188,209,150,251,70,183,238,194,57,143,68,93,133,32,78,22,187,109,240,160,13,76,173,53,195,81,118,74,252,70,80,104,31,102,110,149,244,29,188,56,172,84,211,45,57,24,175,140,133,204,110,160,164,11,174,72,65,192,18,32,53,211,205,22,38,45,99,171,68,146,246,248,228,177,1,65,10,144,171,250,155,249,233,81,203,99,247,94,108,96,248,154,16,157,119,168,210,65,2,50,222,121,57,221,116,149,6,126,12,250,184,116,136,179,163,92,247,15,106,22,228,65,131,66,135,163,99,226,18,39,70,81,221,183,184,110,84,21,51,85,183,75,31,146,137,89,127,42,198,66,2,61,5,73,5,68,223,51,191,240,230,106,250,88,100,
+228,135,21,72,195,150,148,215,116,243,135,60,220,5,21,117,179,234,151,145,180,144,107,253,102,206,83,64,147,71,166,168,169,218,151,61,96,197,109,25,188,111,245,97,192,155,119,255,50,159,8,39,46,89,185,189,220,148,118,18,59,91,245,48,110,227,250,38,105,226,198,250,90,61,25,5,148,4,193,129,26,197,165,48,179,237,237,14,152,197,136,114,177,49,90,219,121,131,214,162,209,186,180,82,39,34,102,9,202,119,226,186,143,201,132,92,155,151,88,3,125,91,130,7,148,236,22,22,96,140,161,49,197,21,225,112,18,209,170,185,77,189,87,250,48,156,33,154,2,106,173,127,251,126,141,9,241,172,50,164,135,112,58,33,242,132,237,7,35,177,242,132,129,30,14,118,217,192,170,19,16,210,141,221,121,213,183,162,96,207,85,255,140,88,158,87,125,48,7,98,112,84,5,228,10,141,158,223,165,17,193,164,67,0,58,102,227,42,104,153,165,172,47,125,251,16,212,234,51,80,172,81,128,59,135,44,46,129,61,84,8,133,145,42,83,142,117,238,173,183,46,14,163,84,213,126,
+224,154,217,195,181,239,228,106,10,206,167,172,132,54,117,209,102,38,173,24,147,252,116,231,163,204,0,185,200,88,224,56,57,117,216,127,178,61,122,42,21,81,130,145,55,105,181,14,101,25,68,247,70,210,15,144,93,249,200,148,140,41,43,248,245,237,72,14,146,109,67,148,71,169,47,57,76,23,15,67,137,65,214,48,234,37,70,195,118,145,230,74,78,233,97,164,149,163,23,108,33,196,97,125,13,161,111,251,91,226,158,165,204,203,209,204,194,46,255,36,131,103,59,13,236,251,109,30,144,111,27,74,69,17,55,99,195,178,179,170,222,74,37,35,211,121,138,116,13,59,57,69,133,7,129,131,9,118,149,201,68,72,129,85,100,45,149,178,83,138,231,3,178,202,254,72,126,143,180,235,213,106,79,33,114,95,160,230,81,218,76,174,115,230,39,243,64,174,246,133,183,205,245,182,76,225,47,238,185,54,208,151,165,147,162,20,103,245,162,46,129,234,78,203,32,171,74,144,228,135,14,249,163,38,12,97,221,218,30,21,154,110,237,150,34,188,205,185,233,57,237,46,119,186,48,224,
+33,75,105,54,235,164,169,231,202,99,206,211,241,213,90,118,124,5,218,226,144,107,179,141,180,118,8,173,92,103,155,62,134,61,94,66,30,188,21,117,138,91,7,21,220,47,55,43,85,105,116,252,42,194,156,92,84,183,144,236,177,254,68,21,151,138,133,68,7,2,131,69,116,54,184,119,40,14,240,216,26,151,113,158,154,43,163,44,151,203,136,51,237,92,213,236,134,168,19,205,82,41,163,149,42,17,139,203,182,70,212,171,210,221,36,207,124,234,30,95,46,196,105,44,186,53,190,233,41,30,202,237,38,147,199,156,78,103,227,238,188,106,105,32,57,144,205,228,18,181,234,167,53,136,2,10,237,62,62,228,115,199,21,3,79,150,206,82,170,4,137,164,127,50,246,197,178,217,195,56,242,114,104,232,218,142,117,171,10,172,109,114,36,174,162,199,49,94,114,132,107,102,214,89,249,43,110,76,41,184,77,187,241,215,121,3,65,189,125,222,110,201,176,24,59,110,149,135,177,162,26,56,208,21,165,132,13,86,59,156,57,156,142,99,152,171,82,73,42,37,106,175,231,31,254,186,
+194,9,60,50,57,211,14,6,182,213,252,67,138,126,207,70,75,89,103,0,207,60,238,128,244,196,135,138,112,223,5,240,245,252,100,17,182,141,120,238,112,124,207,167,60,255,218,185,209,49,118,130,151,136,136,171,144,11,5,110,133,7,16,198,50,168,248,59,80,253,185,226,231,11,70,199,200,61,137,168,3,95,4,167,136,164,73,145,43,78,87,44,198,219,24,29,55,143,253,97,204,218,102,72,41,109,54,178,58,195,56,40,92,205,76,234,33,50,36,211,207,211,92,225,243,155,117,235,173,106,173,22,23,171,103,160,178,203,42,236,1,151,32,222,110,81,96,195,36,189,92,215,154,83,107,207,68,33,62,4,24,109,155,162,162,59,20,5,66,12,120,217,156,131,190,29,135,73,238,71,28,242,224,78,19,107,201,178,103,26,215,184,69,188,56,65,169,152,83,143,52,165,156,22,110,181,70,227,93,169,114,227,73,15,207,240,134,220,249,62,162,196,169,199,226,160,144,71,123,140,90,52,59,242,139,77,216,251,120,227,177,13,225,30,17,95,0,124,70,249,2,224,238,254,23,0,
+199,213,95,0,108,223,207,228,20,133,210,206,154,24,238,114,121,154,1,121,253,210,34,109,199,75,10,62,32,201,234,229,145,231,188,234,85,70,133,141,89,168,26,151,59,187,124,87,124,170,28,121,16,220,58,188,48,223,233,73,220,231,118,132,236,1,59,214,168,7,13,194,225,218,165,118,76,169,102,43,221,51,55,173,221,133,187,110,248,41,174,141,213,5,218,158,66,109,99,130,195,232,205,37,99,77,179,179,71,161,7,120,61,80,195,16,88,86,187,79,136,48,207,102,242,86,127,223,125,69,79,25,146,17,8,32,245,2,240,248,85,111,120,21,206,229,54,184,206,107,221,140,112,109,144,249,224,132,158,1,193,62,161,184,236,50,108,252,104,146,31,123,42,206,81,33,146,128,73,197,85,75,34,57,121,68,166,133,77,149,88,28,187,39,143,244,91,80,127,183,61,155,147,46,174,106,107,0,210,141,206,46,47,31,145,39,201,120,60,76,144,43,57,213,238,158,169,8,107,84,61,185,32,163,121,209,195,5,141,221,136,98,221,167,230,53,30,204,195,85,126,132,96,208,196,136,
+45,142,184,159,108,68,8,229,106,245,196,113,24,206,66,46,251,243,57,236,100,222,132,201,205,172,199,121,19,118,203,138,153,120,125,174,218,233,116,170,116,216,206,176,130,191,219,238,62,209,240,67,95,76,21,235,171,93,70,10,187,147,65,228,143,175,49,52,19,101,221,187,91,185,219,60,61,210,87,19,27,201,252,157,151,62,19,114,81,140,107,200,76,6,161,10,40,16,226,205,216,140,191,6,107,10,54,248,204,93,248,201,188,40,91,57,130,227,35,222,14,243,9,210,63,160,191,0,254,150,203,26,1,174,70,32,158,245,7,4,9,46,158,97,14,109,127,129,185,21,241,5,230,103,247,95,218,183,2,102,247,38,92,104,141,43,102,208,220,131,242,239,59,4,229,255,145,226,132,246,32,136,0,150,208,62,89,123,129,68,233,41,180,37,126,210,181,92,226,19,44,214,69,162,149,163,57,197,241,153,115,104,160,210,91,153,29,37,84,170,84,142,43,249,32,171,179,83,239,222,134,171,244,68,202,197,114,9,163,141,88,105,186,158,11,69,20,17,72,109,6,237,224,89,78,212,
+14,221,225,173,204,82,146,175,115,10,227,234,202,110,133,74,31,56,54,234,228,235,157,120,174,111,10,173,33,225,78,130,180,189,110,224,48,206,207,46,10,246,107,97,50,17,65,200,90,165,9,204,197,196,75,195,192,193,207,93,90,75,143,245,51,120,167,76,151,134,77,206,48,54,125,217,212,69,23,163,223,75,40,29,189,179,138,221,85,140,39,11,253,198,121,204,162,33,239,11,3,142,234,86,138,109,28,230,199,245,157,222,36,32,47,81,123,29,125,180,80,61,124,8,151,122,85,217,36,130,223,69,179,14,103,212,48,80,187,112,229,209,160,65,136,83,169,16,142,119,123,171,210,123,80,171,219,188,185,225,7,253,182,136,31,212,122,143,111,179,209,171,220,41,150,220,31,52,26,55,103,167,55,98,145,135,109,119,137,248,235,226,65,176,45,131,237,202,20,182,232,97,201,133,173,197,189,237,30,187,231,43,197,189,42,206,44,161,181,221,71,194,151,91,189,70,220,121,208,10,40,7,167,12,95,86,249,112,147,219,151,145,230,207,65,180,45,45,64,194,243,86,143,0,122,61,
+208,234,89,154,107,246,195,53,109,91,177,42,186,119,31,91,195,118,117,174,238,163,91,7,160,224,98,12,201,219,235,75,177,176,101,243,158,19,248,2,147,203,86,128,228,80,11,212,88,36,151,193,133,39,185,28,113,155,94,196,245,72,26,26,214,96,74,102,196,1,8,232,140,254,245,23,157,129,251,162,51,162,53,128,121,228,137,51,157,169,4,125,57,254,144,65,165,230,195,25,30,34,16,246,154,54,105,141,190,44,235,57,186,26,22,42,70,143,53,180,22,203,86,174,80,105,217,163,77,165,82,158,113,219,80,248,89,39,227,125,110,86,186,154,186,75,20,91,148,142,122,192,48,18,46,49,216,144,188,164,120,62,105,216,62,154,129,78,175,7,59,175,94,170,70,35,162,137,162,164,146,134,249,243,198,221,20,244,103,19,89,4,22,150,29,3,229,203,191,47,201,173,121,174,26,234,133,65,57,220,223,241,201,145,230,88,222,121,209,161,106,26,185,85,166,28,109,102,1,66,102,49,41,240,173,92,134,177,6,173,157,115,225,248,57,85,67,207,106,228,89,127,152,231,71,16,
+208,79,159,255,172,62,63,77,64,212,250,158,159,38,160,175,178,158,159,26,24,84,16,207,79,13,104,11,204,47,178,4,240,249,179,44,97,9,185,163,227,154,162,83,90,11,41,226,154,156,138,227,212,61,227,59,118,180,97,106,25,18,206,50,84,115,235,80,101,189,255,54,166,15,228,89,188,157,236,141,97,91,32,14,123,92,187,252,150,181,111,76,161,7,121,125,251,0,165,68,201,228,83,50,59,22,47,25,180,145,240,48,161,158,168,251,103,97,253,41,67,23,82,33,18,18,84,118,222,91,164,131,86,239,164,114,228,34,213,121,176,241,133,136,16,165,146,36,6,23,196,225,56,13,181,10,235,138,224,37,123,251,150,157,19,158,226,218,65,46,169,242,16,151,179,79,58,134,95,95,80,4,209,177,240,140,10,49,215,17,248,216,206,23,253,98,111,103,238,169,137,150,102,3,43,195,104,17,118,210,182,132,145,93,239,100,114,98,99,100,103,51,38,10,70,154,66,98,207,167,203,227,155,33,125,205,233,167,212,142,132,249,112,151,193,188,113,198,115,5,85,60,114,134,170,180,
+134,238,44,123,237,172,88,191,90,27,17,102,145,238,141,219,93,242,234,13,124,97,249,244,250,6,174,206,217,79,195,12,254,76,48,171,140,122,217,116,141,161,75,202,198,103,1,161,49,113,149,193,68,224,187,82,255,188,181,190,22,20,34,158,147,14,39,64,112,42,113,174,20,237,192,219,74,165,246,138,233,125,118,148,185,77,166,71,188,248,88,83,84,200,34,204,202,39,188,202,17,12,11,141,227,99,83,153,70,114,80,50,124,106,197,29,185,69,203,146,21,6,13,27,55,87,225,236,138,82,217,89,35,15,161,185,61,154,8,15,94,236,122,46,152,178,75,203,116,98,175,39,208,22,217,125,140,74,229,186,179,71,137,245,251,115,56,150,129,144,38,231,124,240,44,191,75,251,153,227,76,50,65,180,240,154,152,85,241,164,226,126,24,13,8,204,77,157,238,201,87,136,60,142,89,242,16,26,197,46,123,143,112,83,87,245,174,198,158,181,36,217,195,19,197,84,197,138,12,84,199,254,135,140,202,26,31,228,44,165,93,179,75,63,63,6,3,189,194,151,99,147,184,236,42,2,
+20,84,214,122,233,37,104,74,138,221,246,216,181,175,96,69,196,103,201,128,106,227,212,169,134,243,78,70,251,168,1,183,39,98,83,225,190,199,233,174,241,75,150,137,117,243,44,227,225,30,130,98,103,179,31,109,85,140,247,98,244,148,119,57,144,41,233,2,75,160,69,208,92,102,245,236,147,150,118,252,148,145,198,66,91,17,2,81,119,226,238,199,148,179,113,33,119,197,219,240,65,182,98,198,14,42,141,200,44,182,109,209,180,76,9,186,18,177,157,87,111,110,229,103,107,48,23,28,113,132,223,1,141,64,149,217,237,241,155,30,6,227,8,101,139,183,7,71,158,152,65,255,229,3,222,108,197,58,56,111,240,12,125,74,93,98,12,71,225,156,190,66,177,225,211,113,210,235,173,210,117,176,64,171,221,120,200,138,251,38,247,76,29,102,144,180,93,31,44,118,59,68,41,101,146,74,54,31,21,93,15,180,246,9,44,142,183,178,17,103,45,175,14,25,213,134,220,247,25,116,98,171,85,91,149,113,219,247,7,104,214,222,252,97,8,244,65,221,162,116,197,132,148,90,2,246,
+64,29,198,234,193,221,53,208,165,158,180,235,46,98,88,236,175,70,31,168,215,3,95,125,13,80,207,151,167,20,96,220,231,102,2,148,32,243,151,244,53,27,190,164,239,170,249,75,250,34,160,47,233,91,216,190,163,106,65,195,2,17,153,243,246,243,201,122,193,81,158,110,64,80,127,227,75,27,156,236,101,13,188,105,229,88,41,214,217,202,185,52,77,163,3,42,12,203,120,204,235,196,161,18,189,34,42,246,242,16,46,191,142,85,169,143,195,66,181,79,104,15,151,143,163,187,13,158,244,154,229,146,174,142,165,249,126,52,102,244,184,244,182,18,139,227,48,140,247,58,157,221,85,212,25,200,97,236,118,211,29,59,232,212,118,152,245,209,163,161,191,141,6,230,226,194,88,131,92,177,47,181,89,25,235,46,123,39,151,21,202,205,206,124,190,89,139,230,31,244,2,218,157,66,202,94,77,21,30,31,98,35,178,78,143,127,34,30,220,113,252,157,199,231,244,101,105,54,177,19,115,28,118,59,242,62,118,204,128,227,170,243,199,86,21,140,60,131,197,222,112,222,150,196,196,158,
+133,119,67,219,21,116,82,217,125,215,41,219,53,112,217,162,20,178,152,230,99,9,117,97,126,244,126,166,244,59,117,137,222,100,4,146,112,235,204,95,27,92,163,144,101,88,114,99,146,143,144,183,182,197,15,145,234,84,156,226,24,197,135,236,124,180,210,124,234,95,210,137,137,110,156,115,166,205,239,143,159,250,106,123,17,165,146,221,143,124,202,1,161,90,29,67,162,198,237,141,250,92,158,56,105,224,107,74,126,123,104,186,158,8,147,15,149,120,237,82,239,118,204,134,213,30,217,119,71,86,109,239,18,255,210,223,28,207,229,225,222,83,123,60,121,44,249,120,56,28,162,218,224,93,231,158,38,236,140,93,181,71,35,65,135,2,77,226,216,207,127,184,232,72,248,119,23,227,232,32,117,194,137,142,143,47,125,154,248,250,53,177,39,10,144,19,55,145,73,214,116,186,113,183,103,82,60,84,147,65,50,185,104,115,180,34,180,204,188,254,165,245,182,11,247,89,158,120,117,13,114,30,164,124,110,31,228,188,236,18,148,144,91,133,119,205,127,121,225,84,110,83,109,238,245,251,
+198,8,65,115,92,73,28,247,18,202,93,74,69,223,189,101,126,81,56,79,246,129,86,115,28,166,29,208,50,196,88,106,215,137,72,70,99,180,107,110,215,216,227,250,20,86,100,7,185,222,157,156,142,57,21,86,203,213,34,111,17,167,98,67,66,144,52,208,30,114,149,193,62,122,152,141,92,174,22,8,184,3,97,24,37,186,197,67,187,56,107,10,245,165,129,146,202,105,25,249,154,47,235,60,0,141,122,66,220,206,143,137,186,224,57,215,135,82,184,198,9,89,244,112,44,180,20,236,172,72,21,219,210,73,244,187,201,213,202,38,130,84,211,39,92,202,32,29,126,89,240,209,230,250,218,79,213,222,88,179,172,205,33,5,167,89,87,37,84,119,178,91,145,59,169,192,22,106,17,230,21,130,66,39,223,25,102,49,95,236,42,109,215,198,67,86,229,100,207,92,35,219,226,113,136,219,235,233,113,118,135,120,191,69,62,217,234,117,14,149,25,113,41,35,103,211,112,38,173,6,119,42,72,171,111,118,194,141,219,243,94,146,53,74,62,145,238,241,186,13,141,147,70,139,223,230,
+24,154,7,203,181,65,157,182,28,234,124,188,162,13,34,174,205,159,127,157,63,7,210,73,198,4,122,127,142,247,68,108,168,38,236,117,10,77,46,9,149,122,7,50,127,64,231,155,250,152,197,90,14,17,195,214,130,164,198,117,169,68,231,230,217,235,70,74,57,18,141,159,135,44,213,129,178,71,33,51,131,135,21,174,122,182,121,153,223,186,112,212,71,132,168,176,70,179,207,28,145,124,52,74,38,92,86,186,124,243,122,124,116,36,22,40,218,112,6,157,54,148,87,142,130,7,163,248,116,53,113,216,247,197,24,61,126,27,229,13,69,206,27,211,145,32,229,144,217,240,196,85,255,243,121,42,214,130,8,236,60,73,27,37,23,78,63,176,165,203,4,166,11,63,111,223,199,141,214,33,45,57,205,138,84,241,196,168,95,47,242,57,196,113,56,85,65,24,37,117,160,6,60,151,155,113,229,105,86,201,34,180,244,232,39,245,28,9,127,249,220,254,191,199,51,15,95,120,198,193,179,230,21,10,8,58,207,61,127,234,81,56,183,242,158,15,156,16,253,103,94,21,234,67,249,59,
+9,235,137,83,58,21,239,114,108,81,247,166,131,143,226,168,184,213,181,18,71,147,144,100,141,106,44,143,117,25,116,227,66,214,251,192,81,108,166,160,36,18,123,172,209,229,208,198,20,115,144,228,39,66,49,4,27,101,141,145,50,172,164,137,104,237,181,61,197,227,211,53,255,4,93,179,158,59,203,249,249,209,210,153,0,107,200,144,189,55,165,118,30,121,227,57,217,114,12,110,144,152,17,91,117,205,221,111,211,135,6,246,24,103,180,147,16,85,188,65,232,47,56,114,45,170,77,27,19,33,31,3,163,88,217,152,169,19,26,86,29,12,146,232,144,141,222,54,194,191,54,151,126,118,110,73,233,213,25,40,7,28,87,163,114,251,212,123,50,81,252,48,84,194,117,134,141,243,30,105,106,254,51,191,220,178,93,179,187,148,130,94,142,149,197,13,70,28,118,167,142,92,138,202,182,100,36,75,59,205,122,206,215,175,19,241,114,78,22,217,73,242,147,194,3,207,32,148,134,97,176,221,52,179,119,35,164,168,36,129,167,6,157,149,101,194,198,12,27,55,16,243,29,81,77,122,
+45,246,212,188,83,38,171,100,198,43,81,134,4,148,143,61,211,169,145,175,46,173,202,136,153,137,193,249,173,183,133,181,53,62,135,14,98,48,201,29,182,55,212,233,241,237,195,86,240,246,122,67,147,149,68,148,149,50,45,144,174,70,70,115,37,189,127,19,16,85,147,118,151,73,228,103,17,216,84,82,84,107,80,221,87,97,110,141,58,91,220,118,110,222,200,145,129,144,229,194,74,153,110,135,202,44,148,196,5,59,124,12,1,193,64,206,12,79,36,242,217,160,142,100,186,220,244,6,191,131,49,233,142,102,249,66,171,46,108,152,208,59,49,179,255,250,145,127,206,63,140,162,195,205,11,165,7,227,33,243,85,235,205,232,67,235,38,85,23,77,35,73,228,196,183,202,133,59,96,200,59,118,153,76,210,206,44,50,2,209,210,196,236,137,137,241,180,176,68,217,170,22,120,114,53,213,245,216,188,25,234,176,25,68,117,207,223,98,18,110,169,218,117,89,12,207,211,81,158,10,83,194,81,56,224,63,176,86,42,135,24,130,176,10,239,57,125,8,183,55,98,50,117,79,17,211,
+116,39,50,219,179,105,227,246,166,110,181,146,12,97,208,172,141,11,43,138,53,39,24,156,95,241,255,241,245,102,191,237,44,219,185,216,191,178,225,135,139,123,131,11,231,58,118,110,242,146,135,32,8,242,22,228,225,2,65,16,24,240,246,57,63,95,111,100,159,179,141,115,182,141,248,141,18,37,81,20,37,82,34,69,82,20,39,145,20,231,73,18,231,177,197,65,164,56,139,99,115,110,138,51,217,156,231,169,187,67,106,219,177,207,141,157,7,169,165,170,174,85,171,86,85,125,245,173,234,238,85,108,246,187,126,44,111,102,221,75,237,217,56,194,127,247,233,247,76,195,209,112,166,207,138,177,162,191,237,242,127,186,181,113,125,251,53,48,222,91,214,22,80,248,251,145,66,118,178,247,199,52,162,1,216,183,157,247,182,234,71,2,142,108,249,122,196,209,223,147,32,110,84,176,125,237,146,20,242,219,253,82,124,198,204,22,125,62,254,53,236,15,190,205,76,106,201,64,26,8,19,67,60,239,158,222,243,39,144,122,151,89,124,46,22,25,45,167,59,19,108,27,203,86,188,162,
+92,7,204,35,120,240,32,21,120,135,50,64,83,15,205,65,88,249,121,237,152,89,124,112,18,67,222,75,190,207,134,180,206,186,20,207,10,208,242,198,148,189,90,114,29,69,99,236,118,79,108,247,243,238,89,46,154,77,91,100,27,137,222,234,15,134,244,172,209,252,145,65,17,199,54,222,150,236,46,54,131,225,178,90,221,251,191,81,58,169,247,166,185,5,110,91,235,188,237,104,89,101,59,194,142,145,86,221,224,93,96,58,246,121,18,81,248,100,212,205,206,202,225,82,192,55,241,96,61,216,221,115,195,129,197,71,237,37,16,145,50,51,181,137,21,107,72,122,96,214,90,25,8,88,122,139,117,108,178,171,158,30,66,3,249,113,133,70,171,92,214,79,120,38,166,79,235,159,39,108,121,177,61,54,33,58,78,208,187,204,129,48,72,102,15,2,134,62,85,241,146,52,206,193,93,158,117,151,111,110,43,217,67,206,171,106,102,166,215,74,11,32,238,127,140,190,62,222,175,240,243,255,95,127,34,240,245,20,9,23,62,62,255,101,31,233,233,11,117,100,42,220,172,92,192,227,
+204,39,172,131,179,126,226,236,125,124,61,37,114,181,215,135,167,68,206,96,232,83,138,26,78,29,155,103,203,224,226,37,158,9,15,234,206,5,75,164,201,157,117,204,44,180,185,119,164,207,88,245,251,5,57,107,250,72,22,63,211,162,167,129,144,20,18,247,237,117,51,174,8,243,251,70,215,83,227,37,186,25,80,57,35,86,253,100,19,8,215,163,36,5,138,174,9,212,112,89,236,39,117,67,120,1,134,247,221,158,242,56,146,15,67,178,249,180,94,181,21,212,139,212,245,121,109,188,98,191,184,153,242,124,173,101,41,210,56,129,182,104,1,165,41,138,25,194,58,95,17,162,228,124,217,217,52,183,68,164,18,52,92,87,34,105,42,205,81,27,206,78,15,142,216,49,114,32,41,92,94,160,66,105,170,76,242,249,246,126,202,38,52,106,101,236,190,220,126,97,91,79,202,79,55,123,135,35,191,168,203,37,123,26,95,111,77,150,148,66,143,241,232,78,103,187,13,27,154,80,216,42,170,229,125,226,117,49,208,188,212,44,126,155,180,60,140,49,137,96,119,110,158,134,163,47,
+71,206,72,205,122,222,52,58,114,168,144,250,40,11,94,195,143,22,117,97,125,86,137,181,223,19,142,153,228,98,122,207,127,246,128,160,146,248,170,225,39,237,182,92,19,234,155,106,121,230,235,140,49,69,15,175,229,217,79,120,170,155,37,7,90,11,200,33,142,166,52,203,168,11,94,227,75,168,187,236,56,108,230,95,54,176,182,38,109,93,146,233,68,245,254,66,232,188,84,102,63,245,150,159,213,226,139,190,20,110,4,101,199,245,65,155,208,34,50,41,177,64,45,197,185,89,38,150,199,43,190,88,106,180,208,205,215,124,78,164,234,127,127,216,208,159,63,19,77,214,29,244,152,62,225,5,110,122,104,220,158,33,151,223,35,0,177,40,203,114,42,108,242,73,85,201,179,156,115,219,122,134,106,86,161,93,226,63,106,102,152,204,122,236,51,239,218,9,67,89,207,114,105,116,238,72,253,12,239,167,202,139,101,172,165,63,138,180,199,100,9,79,183,199,140,86,55,222,61,94,204,245,145,42,20,240,87,71,141,49,191,40,4,220,185,153,10,169,113,50,79,245,129,150,243,209,
+126,4,202,90,113,93,109,51,191,230,80,19,50,85,158,29,9,248,248,61,142,170,20,231,165,118,52,86,124,161,40,137,142,189,79,147,40,110,234,225,130,191,78,45,15,146,253,119,164,252,234,166,56,201,180,13,145,149,58,174,10,252,141,199,170,68,78,82,57,85,132,179,193,2,115,71,133,179,123,168,161,49,43,216,219,115,173,133,113,130,146,31,6,179,143,145,163,120,23,238,119,120,23,240,173,85,107,50,62,80,221,2,127,127,106,206,94,173,130,217,213,102,218,127,149,237,61,151,208,91,95,127,240,92,180,53,66,117,226,25,80,157,151,200,1,62,186,188,162,128,121,46,41,250,66,14,227,125,198,131,77,151,235,214,219,0,189,182,129,151,158,80,44,192,42,246,60,38,57,192,7,194,203,231,83,180,103,163,251,238,8,177,211,247,171,32,81,120,142,112,238,118,113,95,178,77,242,163,37,12,83,45,177,49,136,173,91,0,8,237,172,140,94,126,87,104,62,125,68,74,226,198,36,218,104,48,61,79,229,250,181,72,110,47,182,123,146,157,106,15,39,85,209,30,78,212,
+252,146,169,4,46,4,59,129,57,57,47,19,205,76,168,215,143,31,109,251,234,233,7,39,82,242,114,6,224,220,92,248,136,68,37,71,208,189,191,189,29,84,44,26,218,195,108,243,233,240,49,243,82,92,95,22,36,20,29,94,129,132,76,91,22,146,6,75,99,125,95,106,158,204,217,51,234,204,52,70,67,9,170,5,37,82,46,62,223,164,246,181,145,218,114,124,12,45,240,35,147,115,122,42,90,135,31,220,208,142,58,73,35,52,120,184,69,81,62,70,119,44,162,221,128,198,208,184,222,100,115,2,163,169,3,149,147,24,129,130,77,6,19,254,32,218,44,24,18,61,230,211,199,105,246,227,227,104,171,105,25,88,249,28,79,159,223,86,94,189,77,227,16,73,226,249,78,116,38,214,205,88,49,64,7,127,138,239,220,0,191,55,220,251,227,78,181,22,91,44,75,191,124,104,254,74,184,224,70,79,193,249,99,55,220,77,197,20,207,225,167,139,5,21,222,66,204,12,200,101,246,151,232,243,10,95,160,10,248,148,245,98,137,32,17,109,161,234,92,45,135,252,6,237,85,93,
+11,9,247,200,149,162,9,153,197,2,97,152,179,183,177,145,139,210,56,207,247,175,55,235,7,247,216,4,64,88,11,154,120,2,116,253,225,133,13,170,215,124,248,210,150,93,16,240,233,188,15,192,24,232,152,208,233,178,238,34,139,153,248,143,35,92,148,75,150,206,6,36,163,123,7,40,57,18,96,138,199,243,115,0,62,176,200,81,168,252,175,124,45,217,86,103,20,245,55,243,77,238,83,143,244,135,108,44,37,89,250,175,85,254,194,201,33,155,12,254,146,189,9,230,62,137,136,40,48,40,198,170,75,194,56,141,134,101,191,16,50,141,103,116,82,70,226,62,164,221,58,77,206,32,59,140,8,66,3,138,39,54,179,127,180,109,148,37,251,33,123,134,195,237,138,98,192,84,23,94,125,196,46,172,177,54,5,73,161,159,158,94,131,35,156,65,141,82,35,9,220,31,243,144,243,236,242,148,213,134,247,224,197,255,218,209,17,122,138,95,59,58,174,208,229,36,98,35,168,74,108,185,230,73,17,63,191,164,124,234,114,69,239,167,193,30,118,157,72,131,117,102,199,209,210,195,
+161,0,123,78,208,187,144,35,123,99,207,225,112,45,110,157,106,138,231,231,143,52,70,49,204,240,43,219,36,79,157,182,89,190,177,5,252,60,125,224,152,69,108,24,247,62,70,176,19,156,225,66,27,205,171,235,178,13,28,242,123,152,31,143,199,69,239,29,165,112,125,99,221,132,211,188,88,131,87,127,120,119,199,120,238,39,237,217,178,199,117,199,94,150,33,193,48,134,217,70,110,90,218,105,115,248,136,33,103,180,69,78,50,79,182,101,138,99,42,140,108,219,96,235,140,45,31,108,177,155,21,234,188,226,201,163,135,119,156,58,172,29,244,238,29,4,251,21,207,210,172,211,240,151,155,169,219,196,204,165,196,163,139,85,36,39,75,26,165,58,195,71,27,150,216,152,219,34,181,105,122,160,107,50,74,176,48,102,102,114,141,56,162,191,189,118,216,194,245,71,193,73,235,19,192,133,172,85,0,213,113,237,78,200,225,160,127,136,169,183,61,123,77,79,37,214,167,190,70,213,144,119,104,116,116,93,24,55,156,154,201,44,91,100,239,49,70,221,105,207,201,56,73,213,201,174,
+182,87,231,148,231,181,151,166,213,100,168,233,146,100,53,89,234,178,64,254,172,111,212,30,173,84,36,127,58,114,11,174,227,77,137,218,60,21,185,139,3,209,249,133,67,52,48,3,217,154,152,126,251,226,25,40,121,12,98,248,37,95,2,223,15,159,101,26,141,86,229,91,95,201,98,21,237,81,243,36,158,121,113,155,226,203,51,77,248,178,192,216,158,89,194,29,170,45,19,150,80,92,208,155,106,230,92,13,203,150,77,176,88,215,240,46,78,2,1,248,40,12,57,237,210,228,52,239,43,6,74,67,114,80,141,177,242,197,96,145,242,57,150,152,158,38,171,42,4,69,183,44,183,232,101,49,119,102,200,149,119,117,225,184,104,204,114,76,194,158,214,127,254,176,49,154,41,150,162,90,219,231,219,201,235,184,113,189,80,79,217,22,62,155,66,225,247,5,253,148,155,98,12,156,243,28,100,93,115,79,9,105,196,35,77,169,22,97,19,67,47,162,98,184,57,226,169,88,238,198,124,201,40,202,44,39,151,31,145,217,169,109,52,81,16,51,131,220,197,27,71,123,101,203,159,227,
+187,95,8,191,131,2,213,218,197,182,178,122,209,127,38,117,11,22,118,242,11,47,212,101,106,4,31,179,177,116,21,32,136,120,142,140,189,118,73,254,94,246,56,4,7,147,64,106,77,118,152,238,63,240,171,182,107,190,136,157,201,17,239,101,163,124,160,133,123,200,159,215,175,37,242,89,165,214,124,18,48,219,250,135,250,149,249,49,42,39,101,156,91,198,7,66,183,141,228,163,177,44,187,105,183,194,180,202,126,146,18,30,195,56,21,126,207,95,154,234,179,89,226,57,249,48,163,10,136,94,97,196,18,73,33,109,215,102,228,137,57,49,12,89,98,187,24,80,152,19,176,213,21,176,2,240,218,28,62,40,173,173,63,244,203,0,196,228,91,249,234,238,241,153,69,112,149,220,109,197,175,69,179,237,125,12,248,148,84,195,24,3,197,64,46,21,149,79,195,194,155,247,199,29,182,113,64,91,199,179,34,253,114,166,231,233,141,250,179,232,238,77,139,90,146,37,1,182,27,183,0,20,28,123,134,187,214,118,97,204,162,179,152,182,175,126,10,58,185,120,185,165,19,69,185,199,
+37,177,174,96,216,249,182,119,170,132,241,51,101,148,107,175,31,49,190,164,238,111,76,213,143,159,123,225,137,192,70,228,4,54,162,103,197,203,217,252,32,125,151,139,193,188,8,216,6,176,245,53,147,194,119,26,252,159,244,97,184,188,129,253,67,143,99,94,254,146,108,233,124,73,102,232,10,59,73,116,92,199,231,249,42,154,157,65,55,12,197,44,214,35,148,80,78,104,145,190,61,246,120,79,37,122,131,210,33,134,223,22,106,233,198,85,123,228,104,247,219,220,85,7,147,2,247,242,143,190,186,127,222,7,28,210,245,72,235,137,245,158,103,146,90,246,193,96,138,104,147,79,44,91,189,201,134,218,124,49,62,29,184,210,177,41,100,205,206,150,11,6,187,238,135,131,194,235,23,8,113,29,212,221,105,87,181,152,250,74,77,235,180,148,179,194,132,221,35,11,178,179,128,20,90,124,74,106,95,146,154,201,167,47,73,187,54,127,201,244,68,74,143,249,62,109,229,103,33,224,186,3,40,215,227,181,40,60,120,127,164,18,83,200,157,115,85,193,63,43,234,84,226,197,53,69,
+191,86,16,79,157,167,139,77,242,164,240,78,69,196,186,229,82,121,255,240,233,122,178,180,33,207,135,79,203,41,62,219,167,126,87,212,218,73,238,82,57,103,84,112,179,218,107,5,205,42,174,37,158,102,18,176,200,174,233,75,33,231,39,17,224,144,121,74,62,242,10,111,112,239,120,170,27,10,219,210,148,190,47,204,119,68,217,97,240,67,151,123,164,62,19,103,18,162,128,31,24,217,2,123,53,244,61,254,201,71,236,145,251,120,24,71,249,133,187,221,34,38,162,123,11,10,213,94,155,96,166,235,72,137,197,189,44,6,247,122,35,101,233,105,251,63,223,229,161,232,57,18,206,91,130,15,116,192,233,52,91,24,204,52,109,168,226,111,161,169,179,37,24,165,46,101,137,236,150,94,121,13,249,143,89,185,51,31,176,0,202,173,5,219,161,228,58,196,207,1,124,66,18,137,190,219,239,111,186,198,97,23,190,142,242,174,55,172,190,94,71,163,50,133,104,169,122,222,178,198,95,16,74,93,195,247,204,236,149,198,244,179,63,107,137,166,91,253,234,84,223,160,210,76,69,37,
+111,199,117,24,25,64,61,75,120,60,114,11,249,98,113,254,42,207,127,167,186,165,17,161,96,182,219,43,251,248,160,91,0,94,24,183,42,93,215,121,77,99,62,17,126,72,75,24,155,202,162,57,187,95,114,132,245,9,68,227,16,176,59,104,59,241,231,49,67,96,225,13,157,250,179,60,253,3,127,253,40,222,190,185,1,139,249,198,113,67,150,77,131,96,195,189,138,25,203,74,99,253,220,253,254,24,167,186,1,154,106,225,36,238,168,45,169,158,180,76,91,30,61,5,59,192,205,70,235,29,5,41,214,219,82,107,33,198,200,40,207,153,23,147,207,19,255,108,69,92,83,45,181,231,233,236,202,92,112,188,162,220,216,181,181,211,108,30,140,110,227,95,170,76,247,61,186,60,98,47,246,173,118,238,189,170,106,115,182,226,167,188,222,132,188,40,243,222,26,65,35,101,152,210,27,215,173,109,122,144,233,56,102,81,65,155,63,241,178,50,106,202,251,126,174,203,243,238,182,175,149,136,74,253,215,155,30,109,211,246,91,2,247,142,15,219,146,23,30,54,234,250,165,233,169,55,
+116,204,130,188,172,39,198,17,139,92,167,55,214,78,134,56,253,170,246,214,66,217,187,109,14,104,218,25,53,215,121,254,167,107,190,245,0,158,97,163,237,106,75,215,42,65,171,199,105,77,123,31,188,1,164,38,95,156,242,136,234,172,149,124,123,221,141,74,67,60,159,167,205,197,147,31,19,151,217,175,6,136,111,59,158,123,151,196,184,217,178,212,235,186,102,211,182,27,249,197,104,88,254,174,212,116,85,197,53,213,246,102,82,99,125,201,50,239,183,172,159,106,218,78,204,92,70,23,239,37,229,66,58,52,137,184,249,207,155,112,199,2,59,159,177,144,232,132,103,31,81,59,239,95,131,209,134,215,23,198,164,240,68,104,21,157,62,202,85,224,149,180,231,222,57,144,171,77,191,111,24,137,186,219,203,79,174,209,205,31,172,13,180,64,93,248,53,46,249,78,50,24,121,78,170,250,239,206,160,53,48,148,38,83,124,32,195,163,168,102,33,39,254,140,117,111,101,191,56,26,152,44,193,122,148,159,160,146,254,227,205,187,239,49,241,66,219,247,163,123,65,221,207,191,78,238,
+236,171,222,192,35,122,152,4,251,57,64,59,76,130,253,28,184,61,76,130,253,28,112,29,38,193,126,14,160,13,189,206,237,9,192,85,145,87,225,240,113,89,71,180,228,10,245,201,139,201,79,86,139,167,148,220,100,223,81,119,123,218,109,13,100,67,43,239,49,213,153,101,231,209,103,180,131,139,64,241,0,249,218,74,164,122,39,52,55,191,103,171,150,0,109,246,220,122,34,10,132,195,247,142,84,199,242,50,45,101,107,3,165,116,182,246,1,17,70,56,159,145,169,153,61,89,57,192,240,10,185,49,119,123,157,236,181,38,110,180,174,125,226,229,111,142,229,156,133,112,54,209,195,43,105,159,107,25,151,67,94,238,83,135,238,150,222,68,159,130,130,89,199,56,189,85,23,122,76,121,132,83,185,23,110,119,73,181,52,217,79,240,237,34,42,113,102,180,18,5,49,29,87,68,2,145,64,124,211,158,39,76,170,26,159,209,52,239,58,39,81,225,205,217,35,205,120,142,96,248,231,18,116,244,254,135,1,12,255,247,191,254,246,219,95,130,45,254,240,251,239,126,253,195,239,255,
+230,199,239,255,254,219,175,255,253,33,104,230,119,191,250,254,183,135,96,143,223,253,221,183,223,253,252,195,175,190,255,241,187,223,252,244,119,95,17,97,191,251,191,190,253,253,239,15,209,19,127,243,211,33,255,231,159,190,251,253,183,31,15,65,41,127,253,237,247,63,252,238,219,175,191,251,205,183,159,255,250,167,95,127,133,174,252,249,80,193,87,92,197,63,12,170,248,63,255,246,231,111,191,251,243,67,217,31,126,251,251,125,5,223,253,240,243,191,22,91,241,63,254,233,159,253,155,63,249,239,255,12,135,15,225,109,56,28,14,255,134,125,133,86,164,112,250,37,98,95,100,17,94,159,126,182,158,158,205,5,117,100,90,187,187,189,221,30,45,175,63,42,79,23,164,183,42,210,102,58,85,253,58,131,173,146,20,18,108,118,38,191,65,108,235,241,150,181,219,58,208,41,54,199,250,22,204,57,101,93,23,18,23,27,34,102,191,92,170,52,82,7,22,17,181,114,101,160,104,188,68,180,166,40,214,13,214,143,112,217,156,21,138,124,144,86,177,231,171,163,152,20,162,112,9,138,
+110,39,54,132,146,186,75,69,76,27,73,82,242,206,184,185,181,120,158,82,112,175,196,203,243,149,207,105,59,185,36,24,174,116,88,107,93,106,20,173,123,133,57,109,169,23,39,45,39,21,228,139,59,31,253,201,53,188,217,26,161,229,98,40,151,26,152,133,22,86,188,60,58,193,61,69,201,71,49,4,128,70,112,172,192,167,124,190,29,105,123,140,62,21,233,74,243,98,7,223,199,70,211,106,222,122,125,122,77,124,76,135,21,136,54,175,158,46,188,187,37,231,67,137,195,73,178,130,202,64,205,63,137,27,244,51,38,224,217,61,237,107,236,112,26,253,215,164,150,181,13,11,202,139,156,26,163,156,78,61,59,60,110,68,210,52,192,209,222,128,174,15,230,17,5,135,171,84,94,78,236,251,127,67,199,215,135,84,141,231,230,21,143,195,153,47,143,100,135,204,23,54,193,98,87,2,53,225,80,218,146,93,162,143,215,107,151,7,8,73,175,113,184,172,217,72,89,45,137,78,43,94,32,67,66,64,233,226,129,231,96,224,112,237,42,185,255,74,114,154,20,42,147,106,150,79,
+117,47,50,145,238,11,179,200,99,76,19,189,192,213,125,136,209,17,200,129,237,135,143,143,172,41,32,55,37,59,89,165,8,184,87,50,3,114,185,72,66,127,170,28,127,141,209,108,143,26,39,171,96,18,189,230,76,207,43,143,252,126,122,118,201,181,113,62,180,7,117,105,125,223,245,136,87,205,31,243,10,121,167,112,148,85,191,89,71,115,112,228,134,59,40,84,109,114,142,226,254,199,194,237,190,33,175,18,243,224,98,149,43,217,8,116,123,34,186,225,232,158,92,159,43,226,106,223,17,148,246,161,35,148,73,120,155,83,87,44,112,152,109,228,47,236,246,55,146,111,223,119,139,243,213,228,2,9,180,109,171,119,138,113,37,55,153,117,136,255,161,80,118,101,88,55,217,97,144,98,122,64,160,154,44,77,1,12,99,111,209,123,132,195,93,216,78,236,202,6,13,135,151,78,88,196,194,17,238,117,7,227,79,121,27,53,177,48,62,51,239,173,250,68,105,128,55,7,179,238,109,253,254,101,207,19,123,184,143,96,115,19,99,195,156,195,48,20,138,225,247,217,138,235,145,209,
+112,108,255,220,153,143,121,56,98,165,120,98,239,171,99,151,102,62,25,71,192,153,247,69,135,133,16,45,42,38,136,42,123,87,108,78,205,188,134,144,139,161,159,229,35,144,99,227,75,43,42,245,217,65,161,108,28,158,22,120,46,231,83,101,177,118,78,86,202,169,165,53,168,243,237,237,248,174,28,190,11,168,51,48,141,191,238,100,251,28,240,58,54,247,95,40,54,105,91,60,96,213,176,196,91,23,32,2,77,32,135,67,199,143,220,120,254,38,163,170,218,27,11,242,106,184,0,187,200,197,88,151,142,132,194,215,19,149,237,184,236,207,79,215,165,254,155,43,76,83,234,157,138,113,96,182,27,204,55,166,244,174,59,235,45,102,23,11,174,210,180,232,154,242,126,241,84,52,83,175,102,155,114,249,102,228,158,193,97,183,173,235,189,231,202,176,94,45,64,86,178,253,158,92,1,81,122,178,253,70,204,24,79,17,143,41,69,217,109,43,123,21,246,105,212,79,71,90,219,32,91,230,209,193,92,96,121,29,117,8,166,201,124,172,244,186,29,9,35,183,189,186,79,134,54,110,
+143,83,132,203,197,228,13,48,76,163,45,171,68,121,37,158,251,230,183,35,77,102,162,197,134,242,70,220,169,120,42,212,153,105,115,122,57,4,177,1,123,247,120,47,237,18,77,122,159,103,219,10,160,233,51,67,247,178,41,226,188,95,115,245,105,95,72,56,24,154,201,11,235,29,18,218,172,225,68,140,7,23,182,230,246,48,164,173,4,118,144,53,86,84,44,117,220,105,167,199,46,61,219,239,63,235,212,208,105,134,180,208,117,111,10,206,183,134,195,32,187,214,67,76,64,156,57,181,243,111,132,137,1,241,131,86,13,194,55,210,190,45,149,188,25,213,77,50,90,161,48,8,241,167,165,83,181,153,223,74,5,58,59,215,248,178,117,139,198,83,15,207,246,68,11,122,78,76,162,92,254,186,110,29,44,135,151,183,121,145,137,148,194,61,13,152,155,200,234,20,150,13,218,147,181,195,40,121,2,147,216,177,14,141,195,5,241,26,141,28,243,54,155,106,197,98,178,39,153,229,84,217,48,225,103,187,220,156,18,120,222,42,120,150,90,104,137,99,206,51,220,17,174,14,78,198,
+133,68,81,22,15,116,67,154,185,42,75,89,117,25,48,125,148,145,112,98,116,177,21,94,235,161,165,130,16,98,188,125,246,42,235,178,66,129,41,244,88,111,26,22,236,81,115,73,115,12,211,18,249,228,138,61,205,200,57,49,112,155,229,210,208,0,108,109,18,216,153,24,159,12,23,246,166,89,102,8,246,30,241,250,222,4,141,79,125,150,146,38,59,62,183,198,219,129,114,140,220,212,9,113,82,90,188,161,32,136,90,91,230,104,13,204,143,180,14,222,66,132,147,14,150,101,249,86,109,188,180,30,155,54,187,119,148,201,66,151,110,174,233,42,73,85,123,114,149,26,1,7,154,4,236,24,26,3,167,201,237,69,242,238,101,120,98,23,142,65,205,169,189,187,126,172,176,70,38,203,91,213,113,203,68,207,90,129,135,232,226,195,129,99,46,134,57,94,201,215,102,57,209,160,155,75,106,57,119,50,217,71,35,177,220,221,16,147,24,116,151,12,215,94,117,112,182,141,158,106,211,173,213,117,204,246,148,107,77,223,110,158,251,243,204,7,255,154,200,89,109,163,148,13,71,67,
+182,205,82,29,44,58,128,248,250,148,57,121,92,94,158,193,217,134,99,131,98,101,3,136,117,173,206,235,18,249,115,253,186,37,59,189,236,171,85,250,83,25,51,139,141,82,94,80,125,255,102,84,26,8,109,174,164,129,197,23,49,121,60,29,122,194,189,201,195,37,235,96,119,23,177,95,58,92,221,133,225,225,77,221,176,142,94,92,29,179,79,243,228,11,213,208,110,151,104,196,243,176,101,100,234,183,210,226,140,181,8,65,221,174,56,63,167,178,243,115,200,112,173,7,59,187,12,111,77,136,166,107,32,181,163,55,73,252,58,34,67,141,20,60,124,51,208,142,177,183,69,176,106,79,210,107,247,126,80,216,77,61,165,21,113,41,118,129,93,4,141,173,72,150,167,83,72,7,92,155,10,140,47,55,198,34,164,161,171,135,215,35,13,168,79,168,98,181,216,92,121,73,139,150,92,48,234,29,107,148,37,137,91,221,50,9,203,75,207,174,120,52,183,191,36,180,13,113,229,170,32,122,176,98,174,61,240,208,199,39,118,23,70,181,139,66,102,236,102,169,109,173,149,86,147,119,
+127,103,98,110,191,59,26,110,66,40,45,74,40,76,241,228,219,35,220,232,161,210,135,207,214,238,245,104,191,100,224,95,45,231,171,67,108,87,166,96,143,75,184,34,254,108,143,86,184,17,235,122,143,97,184,215,198,34,123,190,122,131,156,169,165,57,29,209,25,118,157,13,93,235,169,13,91,71,184,248,170,190,71,77,225,54,65,176,131,105,167,98,243,249,82,219,75,241,228,45,184,214,142,107,109,9,250,177,163,51,254,25,203,145,51,54,47,185,125,96,115,81,166,130,105,66,156,49,225,222,110,188,98,188,66,58,7,18,252,71,37,239,185,151,12,175,86,47,249,247,61,204,250,201,224,40,156,128,138,114,103,126,213,68,53,40,178,112,188,15,30,69,228,6,103,185,46,242,18,173,15,249,107,67,194,31,211,223,27,190,241,54,231,87,122,202,15,172,187,189,182,103,49,226,42,61,241,171,145,36,221,126,213,29,243,227,144,248,72,26,107,3,250,143,220,233,229,246,152,87,162,226,112,145,176,247,21,150,177,79,6,190,75,241,2,90,57,113,163,230,242,208,196,118,203,98,
+173,52,104,229,199,220,48,158,161,244,47,159,86,93,99,102,219,97,55,70,43,210,126,33,12,116,50,103,246,185,58,222,62,237,199,247,190,164,157,80,189,115,98,86,97,37,112,101,106,139,48,65,255,67,108,140,67,247,81,250,237,50,202,110,93,115,16,229,181,142,19,49,116,200,184,2,110,189,48,31,155,34,225,72,160,118,91,179,136,175,163,56,220,96,98,57,98,12,219,115,61,249,20,119,134,235,213,166,123,5,24,184,87,194,195,222,242,151,184,226,151,229,95,71,172,47,203,11,27,232,17,20,124,0,254,144,77,253,143,63,238,249,214,111,191,255,249,135,191,251,246,227,223,255,19,191,251,23,152,217,127,250,254,47,255,57,47,59,132,10,255,171,31,126,119,96,136,63,127,251,205,33,240,247,33,229,64,25,255,248,15,107,248,63,254,65,228,247,63,254,254,167,95,226,160,255,191,119,30,196,253,205,247,7,22,249,183,63,126,255,21,192,251,219,33,220,246,175,254,250,167,159,190,194,109,255,240,243,31,127,247,159,126,250,238,215,123,34,249,211,158,114,126,5,19,223,
+23,221,211,204,191,252,233,251,223,237,233,232,129,102,254,33,251,252,10,79,254,255,9,211,253,231,255,133,78,255,219,225,212,129,111,135,160,225,191,254,246,171,31,15,103,48,124,69,102,63,196,68,255,165,121,123,178,250,243,79,63,29,98,147,255,229,223,254,252,15,97,208,255,225,180,134,125,214,94,199,191,248,163,95,125,251,245,15,63,254,248,253,95,252,209,94,223,125,250,175,14,210,246,133,127,254,246,253,175,191,34,148,255,244,155,223,124,255,251,127,255,221,95,126,251,213,247,123,53,255,248,143,255,248,95,161,177,127,250,31,254,195,158,198,254,201,49,190,114,108,61,208,88,223,47,52,22,224,244,185,240,115,205,184,187,244,149,92,25,170,177,159,104,117,179,140,162,235,85,66,139,221,106,142,142,185,149,208,67,91,100,1,168,245,251,227,215,107,134,179,25,90,6,1,172,91,24,106,223,10,91,7,13,188,130,231,120,238,88,43,118,146,116,85,202,241,14,255,130,123,45,94,76,234,228,51,100,178,89,134,150,154,110,25,235,71,227,250,188,47,80,72,146,197,182,206,
+208,150,236,3,40,244,242,180,216,22,125,24,149,36,243,191,76,157,58,44,247,158,57,194,85,162,199,243,70,160,160,228,202,81,107,238,163,238,87,119,68,99,221,101,193,164,10,161,104,116,153,70,117,102,3,150,20,223,30,227,94,187,238,194,60,64,15,60,56,199,254,194,115,40,231,183,215,196,11,7,195,1,173,251,167,92,209,150,105,93,150,207,1,139,118,223,194,235,205,233,166,222,218,200,22,138,113,126,121,102,58,77,30,237,73,50,46,110,143,98,124,25,212,182,193,162,205,24,249,140,35,167,99,33,34,69,98,118,157,249,204,128,193,47,103,56,220,194,248,185,241,58,58,163,210,6,217,34,234,34,223,255,88,122,241,4,23,47,12,143,175,127,153,7,11,66,251,122,45,61,213,223,54,195,114,76,229,155,44,72,231,187,88,152,142,195,221,154,137,160,244,147,149,213,112,61,231,8,119,226,9,160,135,240,103,199,115,45,113,115,53,231,165,180,96,201,150,163,132,41,235,250,33,14,112,85,203,127,56,244,194,251,135,84,182,191,60,177,219,180,195,53,123,53,35,30,
+174,189,179,205,201,33,123,129,71,142,205,251,171,237,89,231,92,88,38,124,79,11,133,109,227,46,38,160,199,148,56,82,108,47,98,135,231,217,96,218,244,157,151,221,230,83,152,55,122,139,19,130,219,227,61,143,62,71,82,210,156,199,151,148,229,243,218,203,91,141,244,182,167,121,121,95,232,239,148,74,113,83,47,189,127,148,130,104,247,225,146,61,245,11,148,86,131,208,229,192,237,251,79,181,87,171,222,163,235,72,234,0,255,221,238,9,66,200,213,34,220,213,70,212,102,244,234,115,27,198,141,43,183,99,225,117,12,135,123,184,24,33,237,201,219,139,48,150,66,7,220,121,126,32,47,206,219,16,16,208,54,237,94,168,25,126,237,142,141,157,44,109,175,56,145,35,202,196,20,132,24,40,85,79,204,181,113,179,114,54,254,20,126,9,240,211,59,180,121,240,180,219,218,153,144,234,165,46,143,225,141,227,9,182,183,141,65,120,14,74,39,18,95,41,163,41,39,230,129,142,1,125,79,163,153,73,180,28,236,95,28,23,156,229,194,25,58,245,43,201,128,39,101,22,130,123,
+220,135,12,39,48,109,116,137,163,31,249,159,239,250,123,120,196,33,39,93,218,156,125,235,236,157,38,249,56,220,61,46,44,94,108,136,184,131,65,79,144,67,76,25,156,237,200,105,97,55,1,116,71,226,121,41,199,124,45,118,14,25,113,25,220,231,67,44,42,177,7,42,110,90,123,175,123,148,210,166,233,136,90,179,248,227,100,223,25,21,60,105,83,239,185,73,26,253,243,145,243,8,183,26,61,100,145,196,102,149,245,94,14,91,143,37,207,76,250,25,62,5,27,186,179,252,54,11,21,86,187,116,219,182,164,244,51,82,53,188,184,58,163,59,211,248,19,163,45,16,243,234,150,28,162,46,205,228,198,35,23,139,0,109,125,57,126,113,84,10,233,169,141,71,35,116,222,104,51,123,136,233,169,204,130,30,190,74,177,173,13,227,229,154,35,198,127,212,134,124,192,73,20,185,142,246,121,124,98,19,140,13,43,69,251,149,223,150,238,218,207,86,44,246,168,251,182,70,244,206,128,129,61,72,2,242,181,254,82,214,172,218,186,224,34,90,196,231,22,105,230,2,171,81,209,190,
+32,69,51,102,91,55,58,171,138,221,8,111,50,253,59,4,217,212,63,172,70,3,236,149,211,219,62,249,163,167,67,160,42,198,190,117,127,217,166,169,106,71,151,42,211,92,132,251,40,13,39,227,12,112,161,61,67,90,66,172,56,67,131,220,208,248,241,138,197,130,49,198,6,29,2,8,157,99,123,25,55,135,219,244,9,37,92,61,139,76,219,49,210,39,212,28,245,131,246,109,116,88,209,61,250,203,192,13,223,16,142,5,211,72,247,254,42,95,83,18,36,176,55,138,87,113,32,195,147,136,215,142,17,12,205,110,194,10,191,17,85,31,157,237,123,223,185,203,9,98,47,9,3,166,140,227,94,216,2,227,240,18,229,110,30,109,80,20,86,19,55,245,193,221,6,118,196,244,40,239,184,224,217,14,208,58,107,251,210,103,147,119,173,35,96,96,167,187,71,173,126,111,119,102,226,250,231,175,252,204,116,81,140,149,96,149,115,111,171,163,141,215,168,94,242,196,159,129,44,108,149,39,107,80,172,91,35,235,135,156,242,133,127,151,37,138,163,209,203,83,10,76,11,231,139,72,
+181,212,123,31,250,62,187,216,124,240,193,29,43,74,198,231,180,52,34,48,88,149,59,245,112,59,157,124,236,206,82,240,13,226,140,39,161,250,148,93,187,76,242,124,210,254,179,141,134,118,83,246,76,73,77,106,249,29,107,46,103,134,159,7,168,243,114,8,85,146,98,25,199,147,213,169,196,235,219,182,20,112,166,168,109,194,222,254,178,199,86,136,215,245,106,169,180,52,133,46,156,138,220,44,0,167,202,251,70,166,59,162,73,84,55,182,127,2,83,50,171,126,133,36,234,166,224,41,127,214,162,33,66,211,13,139,245,28,185,56,158,201,53,71,134,64,104,30,40,119,161,228,128,5,181,32,235,158,54,154,157,235,105,90,24,176,111,39,106,206,124,14,212,223,89,175,77,255,53,126,28,221,109,203,217,89,128,183,142,199,154,111,137,7,105,20,179,140,26,246,142,24,48,117,210,180,171,214,56,184,59,133,96,218,50,184,31,59,168,211,82,5,169,215,48,151,6,190,208,243,161,97,139,46,121,232,6,13,215,188,8,95,207,55,108,221,167,243,147,218,78,137,116,164,169,136,
+194,27,32,173,10,242,210,138,21,89,5,86,111,176,157,53,214,155,237,236,79,89,255,12,233,238,20,25,47,171,67,147,200,41,139,57,119,149,137,133,12,113,90,34,212,43,205,23,125,48,22,142,165,147,254,69,193,202,127,7,148,190,182,239,253,146,225,230,25,170,51,169,76,222,171,216,134,190,173,156,231,156,172,57,47,80,178,150,123,24,161,4,17,5,148,234,252,73,189,11,175,147,99,76,2,146,70,217,185,149,154,158,224,95,106,9,55,53,1,208,122,181,243,98,129,149,94,24,99,68,24,33,254,128,11,74,115,39,161,60,234,44,172,4,73,114,26,87,104,184,124,139,105,135,246,6,177,201,204,163,29,231,104,186,122,106,180,105,79,68,173,235,163,121,18,51,17,112,43,28,103,143,1,163,99,82,68,240,176,199,35,231,195,1,76,113,21,211,191,130,199,62,179,83,52,222,37,94,161,214,245,196,135,130,131,204,199,234,181,229,216,175,162,214,79,108,243,72,68,230,1,219,93,136,167,71,52,180,61,142,188,142,247,0,100,200,10,217,128,59,27,247,130,73,2,150,
+210,246,244,16,138,214,108,163,34,116,149,42,213,60,53,246,25,32,38,203,210,242,214,26,124,19,163,47,119,179,213,235,75,126,95,19,240,137,128,49,61,148,91,3,155,55,186,44,42,8,28,183,109,166,249,203,181,210,41,231,160,64,173,75,151,77,21,136,4,17,54,21,185,188,159,171,77,41,72,79,47,251,117,205,63,21,115,55,94,103,106,67,41,249,128,206,98,187,198,76,233,54,205,131,42,121,79,12,252,162,77,179,73,113,119,184,87,101,155,150,75,77,225,213,5,164,64,124,92,118,144,238,137,31,210,71,64,44,45,77,15,5,19,213,214,86,210,192,123,65,244,133,130,75,177,108,78,182,182,61,95,248,112,73,48,254,54,13,197,122,229,139,49,248,226,231,197,197,38,40,211,254,160,173,49,233,182,118,121,255,38,206,57,180,169,11,159,60,194,110,157,71,183,103,221,51,93,74,20,197,149,113,15,148,17,44,53,165,198,9,193,46,152,229,141,168,210,131,33,153,132,54,77,12,234,238,246,190,231,158,48,56,189,252,195,250,246,138,95,177,201,27,226,131,251,15,
+41,204,158,211,252,114,242,202,129,53,254,238,219,223,252,248,253,175,190,125,247,55,255,18,181,250,133,150,125,157,184,243,117,252,206,47,199,237,28,40,230,129,207,125,81,165,3,125,251,238,223,126,221,247,149,246,183,191,251,253,79,191,251,238,119,63,252,231,191,254,121,207,161,254,234,167,223,125,251,37,253,23,214,245,239,254,253,215,127,191,253,246,127,255,252,207,106,252,34,105,135,29,199,61,71,251,171,67,233,95,116,58,176,195,255,226,236,153,255,233,160,197,111,191,255,187,31,254,243,247,255,236,192,153,191,248,163,255,243,191,250,175,191,251,95,127,73,254,246,143,156,246,175,126,248,241,219,159,239,105,222,191,253,245,47,199,176,253,75,167,192,252,47,127,254,239,190,251,171,191,253,237,175,190,26,251,15,251,165,255,116,90,205,247,63,254,248,15,167,229,236,181,59,104,243,251,127,148,253,143,135,8,29,234,248,67,130,248,63,252,19,67,252,111,255,228,191,249,55,127,242,223,253,217,159,226,240,143,120,205,158,60,224,19,200,23,69,100,114,122,14,226,173,248,45,196,
+149,97,71,159,227,38,187,173,171,251,8,177,147,115,249,233,77,252,232,222,244,246,116,250,152,61,185,207,209,47,222,30,114,39,85,66,51,247,88,28,115,243,167,23,235,65,254,50,54,182,175,90,205,94,232,153,43,138,132,219,159,238,41,167,89,1,24,66,135,162,13,99,84,137,77,105,179,118,80,205,131,77,169,96,191,97,59,191,186,29,188,96,67,99,210,251,187,125,61,68,34,219,225,146,11,89,112,82,221,203,139,240,101,8,54,175,180,66,221,139,8,144,157,5,3,203,225,204,19,212,166,83,209,149,236,252,94,234,176,139,162,133,93,206,50,141,7,11,32,39,197,208,38,249,182,82,235,69,240,178,66,26,125,22,172,96,170,180,209,226,201,19,179,229,244,93,151,242,215,180,147,248,231,184,252,122,226,154,173,30,177,244,45,140,181,98,224,115,121,141,216,215,165,158,119,69,233,157,220,115,35,150,53,99,222,88,25,210,31,52,91,58,55,79,207,106,166,124,138,156,71,189,180,27,25,235,57,255,188,176,85,117,240,192,228,176,181,182,67,17,54,191,233,218,123,133,
+90,92,57,56,39,35,183,179,89,155,41,20,57,141,133,171,83,72,229,139,135,161,197,89,244,245,154,123,193,229,37,113,15,86,145,55,143,50,110,188,52,55,234,236,25,186,94,190,6,47,83,196,251,178,70,66,46,184,236,154,96,126,60,96,77,91,102,0,85,35,23,171,224,22,9,84,198,226,249,117,94,186,4,226,141,152,162,165,42,108,243,136,240,62,104,46,207,109,172,245,71,87,236,9,63,62,158,31,63,156,31,183,215,204,143,129,200,195,73,67,193,71,255,189,254,248,141,46,160,70,114,234,192,56,219,94,38,158,183,87,49,72,33,227,216,196,147,186,105,146,53,40,252,59,16,110,232,211,116,29,246,4,37,27,20,185,172,248,60,8,16,38,154,146,134,207,207,55,206,164,183,72,250,110,128,46,152,108,33,253,110,147,71,124,196,141,59,47,29,44,106,252,5,240,222,241,71,247,21,10,111,145,154,20,198,188,215,105,46,119,99,6,95,68,222,136,207,31,5,1,3,56,109,20,150,150,9,108,213,48,1,75,242,45,153,164,147,140,96,217,185,77,172,209,166,193,
+38,106,76,171,1,238,216,229,235,34,210,96,7,122,170,85,199,162,96,124,156,233,6,147,207,88,41,103,174,150,29,134,168,19,152,44,252,72,179,54,182,6,197,112,206,176,148,215,18,241,121,86,227,79,49,21,146,183,179,241,154,118,226,186,62,121,114,93,247,25,195,108,214,114,21,226,21,58,212,171,186,13,50,151,223,230,78,250,108,10,102,68,216,174,231,151,17,19,227,166,200,146,54,247,197,23,92,6,95,45,227,232,133,27,172,183,221,217,108,84,53,8,96,47,47,160,137,14,23,211,100,155,201,154,178,40,51,44,44,123,115,54,48,189,249,12,34,77,222,174,231,143,171,116,182,98,189,9,187,68,231,81,202,252,105,95,169,183,64,72,176,228,222,182,250,37,213,165,68,37,77,142,130,172,110,130,65,85,138,99,176,11,94,70,51,191,44,158,0,46,196,85,237,32,255,60,25,135,177,52,182,252,24,127,230,199,143,59,197,253,169,240,165,141,189,23,123,71,250,28,251,97,175,255,104,47,46,219,219,44,106,227,35,173,195,232,236,8,58,50,81,87,109,24,20,28,
+167,187,207,231,82,172,193,227,170,173,253,180,102,211,82,113,86,61,235,216,118,149,35,89,144,155,210,144,194,49,168,60,152,168,173,0,9,8,220,192,177,63,21,176,99,199,127,148,131,121,145,53,211,3,35,103,85,53,27,185,240,58,172,247,161,11,127,238,220,37,76,138,120,30,201,249,73,244,10,241,59,92,250,182,242,204,9,160,111,43,135,206,4,89,250,213,152,40,54,195,122,155,56,129,37,141,237,134,169,194,192,198,237,110,151,41,246,208,175,241,221,152,50,53,215,167,161,144,230,76,230,153,29,94,91,176,14,79,41,118,62,250,22,108,96,195,43,93,222,116,231,142,22,78,210,22,181,34,31,115,44,173,213,231,88,201,142,22,17,166,214,246,140,245,9,105,146,143,16,45,78,75,129,66,198,46,26,70,204,111,195,204,243,230,88,228,78,171,172,91,151,33,122,105,175,55,132,120,144,51,52,13,181,49,251,110,188,37,48,149,37,197,5,195,183,80,151,249,25,53,188,91,243,101,189,121,191,11,245,220,113,46,37,100,29,100,210,18,125,242,205,231,158,7,206,28,
+236,55,122,237,254,72,53,85,41,27,46,128,114,232,25,4,139,119,121,204,182,241,124,40,108,103,180,131,109,88,177,52,97,159,144,17,67,118,124,147,3,86,22,40,26,108,98,84,2,38,141,110,196,98,133,176,5,220,20,198,98,42,52,181,14,175,67,146,24,186,234,204,58,124,22,10,111,11,82,242,6,76,125,130,169,30,154,59,85,82,44,233,10,179,198,230,107,36,219,235,156,242,76,113,125,21,93,22,55,43,19,48,29,123,129,221,231,36,74,81,1,11,191,205,88,68,167,200,25,5,178,160,70,237,209,124,8,204,170,142,25,51,98,111,141,189,182,92,180,176,76,230,96,237,14,232,239,130,38,141,5,91,201,232,8,1,217,128,43,102,9,153,8,106,25,54,47,255,172,153,143,140,88,94,147,118,228,219,102,114,87,205,51,168,44,196,25,82,221,100,158,29,128,144,158,82,103,13,249,170,179,242,122,29,57,103,176,151,248,147,120,187,61,255,140,133,102,5,153,199,50,222,233,116,123,90,177,136,218,176,185,60,166,42,65,104,217,102,44,205,90,49,35,236,148,133,
+59,133,86,3,179,117,131,204,98,253,121,250,41,109,69,109,3,100,115,73,137,242,39,52,87,167,70,144,150,49,17,210,196,107,243,8,72,242,99,31,234,66,88,176,13,26,162,26,107,102,67,44,104,176,106,97,47,121,178,138,6,176,41,17,190,226,35,195,26,223,58,232,120,252,218,2,246,57,82,74,157,43,75,66,221,154,15,109,245,234,200,45,38,22,162,133,173,135,85,170,129,252,151,38,215,111,119,110,202,48,147,63,195,87,18,167,88,90,237,13,89,24,23,141,188,22,73,199,214,96,98,49,79,201,39,92,10,1,108,129,141,157,108,21,20,43,100,169,185,176,159,31,247,215,47,10,249,166,229,204,168,143,52,60,234,97,158,63,196,151,178,144,101,57,220,74,232,15,165,49,183,159,51,33,211,194,149,167,0,104,208,157,49,132,46,172,205,231,132,8,96,89,34,176,40,41,197,218,155,109,125,25,227,206,208,110,244,212,37,42,27,230,94,89,164,64,1,22,83,23,198,84,149,97,239,141,98,253,121,155,120,23,166,243,46,131,100,96,1,115,25,102,13,50,215,146,
+204,97,115,219,163,153,6,171,246,52,13,3,163,156,215,198,219,15,227,181,125,110,194,56,134,133,53,233,215,218,237,235,93,144,166,0,175,233,90,103,119,126,234,119,168,236,219,81,67,202,65,245,59,171,67,113,106,63,31,172,13,122,152,251,228,234,77,213,234,124,154,219,80,236,218,30,254,5,129,105,156,1,175,93,151,58,81,36,61,28,144,250,221,237,150,251,89,124,150,19,141,129,38,7,198,182,167,253,214,170,174,160,145,162,169,240,154,207,183,240,167,158,36,169,108,66,8,187,74,234,217,20,227,54,199,158,140,169,168,237,5,219,240,39,56,112,204,150,247,106,66,113,94,119,193,76,205,58,32,95,222,17,53,13,6,117,99,218,134,94,174,45,96,126,233,217,251,131,192,150,119,197,223,96,0,85,205,138,99,197,66,196,210,177,207,193,28,215,130,54,132,6,102,148,11,52,133,181,12,31,197,188,221,105,249,33,81,51,93,238,90,105,76,160,164,112,214,239,24,127,99,24,45,201,43,98,47,63,196,96,94,247,29,188,25,134,148,152,103,213,20,209,210,18,197,248,
+158,166,190,119,200,232,54,198,133,195,35,19,3,203,119,80,93,132,29,152,208,0,173,117,241,76,164,192,139,23,106,99,53,20,230,110,63,17,255,253,204,177,107,187,118,172,244,13,15,109,92,196,251,138,60,42,187,125,169,170,223,154,146,243,227,247,99,154,148,230,77,122,44,53,143,144,18,133,176,198,162,63,228,112,47,173,51,44,89,136,98,108,150,110,230,212,139,188,240,137,139,214,17,13,19,66,195,60,190,154,23,40,150,38,204,84,106,243,155,81,58,73,218,119,67,215,0,246,47,156,43,110,205,166,15,236,20,143,105,3,245,52,76,177,100,242,74,166,99,97,218,206,41,200,132,203,126,119,110,230,156,117,70,159,141,102,167,241,120,80,63,201,112,145,21,199,217,141,95,130,192,196,7,163,153,237,77,61,191,185,23,206,38,106,250,100,214,155,86,133,209,124,201,1,68,65,182,204,154,169,79,213,154,172,73,161,49,96,100,173,223,16,3,102,220,73,31,23,97,243,45,45,198,59,100,111,13,197,152,51,7,250,1,196,130,1,134,22,179,102,91,34,96,232,93,142,
+108,151,38,173,34,187,156,173,98,71,3,80,164,144,189,192,121,17,20,2,135,232,68,107,120,70,9,10,240,174,144,120,236,53,15,235,182,204,138,201,208,254,106,25,142,150,214,22,133,168,132,218,0,147,26,245,134,45,86,62,215,210,199,39,165,87,142,214,38,187,140,168,211,246,113,119,14,14,145,6,12,75,202,243,116,42,112,4,134,29,213,74,55,253,160,148,146,157,221,169,211,197,212,228,182,183,252,26,187,150,111,10,228,26,11,93,85,143,26,124,90,59,128,34,4,173,170,60,176,238,42,13,26,158,228,169,237,96,141,101,17,177,156,146,64,254,214,186,166,199,173,115,186,50,106,91,180,27,29,2,182,20,98,120,231,212,231,80,158,14,237,159,159,138,156,99,146,6,13,181,252,51,204,69,15,239,26,62,48,58,153,188,205,89,155,120,116,73,159,56,177,180,140,68,234,117,206,209,52,43,11,37,147,182,160,202,108,183,19,58,148,190,127,10,197,167,152,198,180,3,61,204,70,31,173,128,248,165,174,90,165,32,0,13,117,144,101,183,241,78,78,156,47,244,7,249,
+177,241,246,78,206,58,76,139,32,127,147,167,105,208,89,88,156,90,166,180,60,30,182,237,132,115,124,150,101,142,24,146,82,251,118,115,87,88,74,200,230,113,119,4,67,38,231,230,94,142,215,138,239,55,107,122,210,129,127,73,110,161,231,121,80,121,102,2,38,92,184,188,27,76,18,134,170,59,165,106,72,175,13,250,220,123,192,54,213,24,198,101,146,116,93,198,58,243,41,99,234,2,75,88,70,5,42,63,180,123,178,161,103,56,202,187,116,192,161,100,244,151,192,68,15,162,205,219,38,136,78,217,144,221,83,50,148,183,79,189,188,84,167,86,148,79,82,248,124,132,46,35,43,96,150,192,114,25,154,168,175,210,204,46,142,107,122,174,10,55,186,138,150,201,29,29,222,35,116,106,55,213,135,252,112,21,164,72,230,133,20,118,226,72,205,194,215,187,163,177,34,104,161,42,125,134,52,204,212,177,141,246,181,82,130,206,42,70,68,167,201,221,101,31,238,4,47,81,22,119,170,12,96,219,30,129,143,53,46,164,243,84,194,240,14,10,21,194,164,110,207,188,20,29,2,247,
+51,51,28,196,215,237,217,150,108,155,211,162,93,134,150,14,190,44,222,187,146,249,122,63,206,206,236,250,78,198,112,162,126,200,31,192,197,72,74,99,90,71,71,162,110,149,188,78,100,143,247,154,221,133,119,158,89,232,0,123,16,233,18,164,177,213,176,159,122,30,242,172,85,6,44,247,12,239,173,171,179,177,28,44,218,230,47,202,142,20,218,164,103,67,186,98,111,79,195,26,11,1,160,179,93,231,223,29,215,43,12,97,211,113,42,163,137,3,110,134,58,19,15,210,21,36,72,63,14,77,214,105,204,104,159,187,247,16,201,53,45,206,116,123,136,180,24,20,141,200,182,163,205,78,141,76,181,198,217,16,43,153,115,103,107,99,68,176,109,2,229,66,8,66,106,150,66,89,74,159,59,211,166,65,70,34,33,166,82,32,93,222,38,51,108,243,222,130,218,208,244,27,246,188,58,11,207,139,240,68,170,236,161,243,231,241,250,211,183,200,154,154,220,74,56,45,177,149,95,205,76,147,118,174,188,168,91,134,214,33,251,17,29,42,136,177,29,190,47,240,158,77,231,244,33,107,
+66,74,18,56,163,121,201,196,91,49,239,205,159,45,38,188,216,20,178,51,208,167,216,206,131,20,210,101,247,120,200,225,145,54,61,129,166,191,11,57,55,136,155,190,28,140,19,203,216,157,178,205,221,242,203,36,52,134,0,60,128,189,41,137,20,140,26,176,93,152,131,235,89,11,157,149,34,240,177,214,178,94,110,173,39,211,242,242,149,123,68,2,36,210,173,182,176,246,40,55,140,76,195,216,109,212,20,210,28,106,76,147,239,87,177,22,202,102,231,31,29,207,94,24,47,76,3,193,253,2,86,231,50,20,208,22,153,115,10,49,108,52,179,240,135,218,11,198,198,94,243,96,105,194,13,111,228,236,76,106,101,29,82,175,164,106,159,166,48,119,151,156,189,31,153,194,203,178,201,17,137,25,146,219,178,195,81,128,210,133,133,109,214,191,32,65,249,195,204,86,116,51,201,243,252,189,42,86,159,249,103,17,72,89,138,109,17,43,28,229,3,230,14,135,200,142,21,18,203,154,5,214,2,34,241,198,155,84,70,207,223,156,240,142,131,247,199,236,229,202,78,95,30,191,109,231,
+151,218,252,50,45,223,14,145,129,122,139,44,13,65,173,138,241,50,122,107,48,207,161,225,93,222,90,137,153,95,90,210,110,17,38,20,115,204,36,100,239,248,187,140,78,94,145,162,142,55,225,187,253,98,221,37,133,180,202,86,244,158,124,251,196,138,101,96,199,82,159,128,137,121,125,168,224,66,67,145,176,211,233,112,192,48,160,213,189,125,194,26,158,1,48,59,146,165,253,162,144,180,241,87,54,195,250,24,218,77,185,183,167,188,13,87,167,7,5,87,227,142,2,105,209,94,121,122,48,247,28,71,54,76,156,136,188,181,5,115,44,120,9,97,74,133,163,222,173,174,140,207,254,123,163,124,62,79,48,185,244,81,64,119,98,235,111,153,246,153,110,177,77,19,31,177,133,247,189,75,163,38,108,39,7,0,201,223,234,83,192,34,107,40,68,99,232,107,42,199,231,38,156,219,154,14,225,115,239,45,53,81,146,228,212,111,144,42,65,2,77,80,67,199,228,88,110,70,75,94,12,216,100,58,248,1,192,203,13,125,44,199,16,187,43,111,173,29,135,150,80,182,46,197,48,52,
+50,84,99,134,78,246,212,75,209,97,140,182,194,171,30,69,24,137,185,186,139,107,249,20,58,50,27,232,54,234,243,161,29,46,93,169,90,49,187,14,43,93,249,90,42,199,34,158,10,109,173,40,62,195,125,134,210,249,228,178,108,107,15,177,180,180,135,216,106,203,76,217,88,57,77,187,201,149,98,218,50,105,164,13,206,242,194,214,53,51,38,111,106,132,9,158,134,45,146,12,198,129,75,250,28,186,80,43,77,202,15,77,42,157,86,133,36,233,246,150,200,213,240,20,118,199,230,254,185,212,123,210,78,169,38,127,230,73,75,152,198,136,177,220,150,54,54,86,188,205,177,21,70,189,169,89,253,70,246,145,222,83,33,222,57,82,182,52,174,123,141,249,3,92,0,184,218,40,236,213,57,11,249,253,226,58,84,240,101,235,216,22,69,101,230,126,84,144,12,186,38,122,226,229,222,151,187,51,47,73,35,151,94,183,183,160,162,112,164,70,246,0,49,63,50,118,196,239,251,225,47,222,204,196,1,62,207,34,29,27,59,181,33,187,12,173,92,29,208,137,109,8,233,33,215,82,
+25,53,63,129,66,179,188,171,133,7,101,48,214,155,207,51,61,102,89,63,192,56,163,55,93,14,164,94,196,117,17,158,59,149,168,11,16,92,44,19,197,220,17,123,104,99,4,213,107,63,52,206,195,209,52,195,48,104,156,233,192,50,182,177,63,86,75,206,143,216,174,3,116,3,68,221,130,109,94,246,223,96,70,223,208,76,62,58,120,155,16,9,107,53,62,176,184,186,126,23,35,6,227,148,204,28,46,26,148,10,205,28,228,99,74,43,227,94,109,205,204,207,184,194,121,188,201,125,209,20,6,206,247,212,108,169,206,154,23,150,137,156,214,5,132,101,103,41,164,102,26,53,174,161,252,45,25,223,58,55,177,104,203,59,76,232,20,85,229,249,154,208,158,85,235,181,228,98,147,191,52,235,238,163,130,123,96,110,213,124,92,18,247,99,244,170,217,89,32,189,221,98,149,30,202,185,229,15,83,135,216,239,238,242,82,242,85,172,109,192,162,64,175,96,3,186,105,77,184,127,153,235,160,79,146,155,200,57,226,63,61,248,118,241,148,12,85,244,177,144,73,101,95,107,97,226,
+144,109,157,123,248,201,27,175,18,2,166,145,215,173,209,49,27,53,119,111,166,152,125,116,198,226,57,246,124,102,71,146,106,81,251,80,154,246,140,139,183,147,3,80,163,240,199,140,104,138,0,13,216,216,49,149,140,136,213,80,104,86,15,150,228,9,130,134,13,63,69,155,41,99,101,108,94,61,117,212,64,142,121,145,79,178,192,242,50,111,111,151,10,107,198,156,9,116,170,254,196,26,243,20,177,252,51,73,18,93,127,222,211,74,139,221,74,214,194,134,220,52,230,244,24,82,156,190,165,91,54,236,199,160,47,7,230,63,184,166,36,32,20,91,169,33,163,50,71,124,153,43,187,121,144,225,20,137,172,122,131,73,41,184,12,53,82,130,12,87,126,159,127,43,248,249,80,94,117,91,225,80,118,163,76,132,191,40,44,178,246,139,1,134,38,243,14,133,6,219,204,203,227,152,19,27,64,124,221,82,90,73,243,116,198,254,154,6,68,85,18,93,147,162,44,78,34,208,70,221,61,34,6,241,233,163,238,91,154,138,10,191,12,188,36,174,226,67,94,188,49,107,223,92,20,100,
+112,194,10,247,39,110,188,188,191,209,73,231,125,15,180,189,82,183,164,44,118,244,250,97,143,165,220,107,5,100,42,180,220,106,173,13,237,192,133,1,119,3,111,17,73,29,220,188,134,81,108,88,50,198,42,70,172,188,158,26,121,112,147,151,177,61,205,181,209,130,73,92,120,214,121,18,100,119,57,186,169,132,137,124,14,217,57,216,15,100,167,62,143,212,251,73,109,90,147,50,128,7,56,173,151,138,106,58,170,238,86,91,55,181,69,110,62,128,75,153,226,134,49,86,150,209,123,208,185,8,214,50,187,210,56,108,13,145,57,82,243,204,192,102,0,155,110,217,20,237,230,10,75,172,72,32,239,72,67,199,113,215,212,21,72,237,101,67,90,161,46,16,74,54,214,48,47,213,42,203,175,13,14,93,93,210,176,52,57,114,166,180,78,105,192,186,157,11,80,226,172,180,107,96,178,195,190,180,158,173,161,44,246,3,82,209,92,88,55,114,58,61,132,240,211,130,75,120,136,186,58,203,160,61,53,103,195,70,180,211,209,26,121,218,20,22,233,158,135,27,112,97,88,52,6,77,
+221,11,26,102,214,36,22,14,108,66,200,127,84,219,88,110,146,180,226,121,145,72,12,90,118,164,169,55,176,86,220,33,6,174,237,66,216,218,56,32,86,242,234,150,205,230,175,27,55,158,224,226,168,122,213,36,106,200,103,216,228,166,69,217,64,165,22,127,74,141,117,129,25,15,86,64,21,16,193,208,20,196,243,234,185,19,37,247,101,214,98,119,211,213,1,97,23,74,223,62,78,61,196,227,135,123,205,13,157,196,23,156,55,99,103,221,206,194,58,12,25,97,77,113,227,189,42,228,160,23,153,45,227,26,198,160,197,100,57,216,6,134,21,35,96,93,23,166,49,77,105,193,89,246,74,181,121,111,110,227,207,147,212,28,120,161,246,62,230,232,239,167,5,101,43,189,93,143,0,158,3,20,73,223,128,230,222,171,146,149,90,247,86,211,38,249,145,167,133,40,165,237,250,25,230,104,11,230,65,194,20,14,23,119,217,13,137,156,95,140,202,161,244,38,12,112,144,26,66,140,177,1,249,198,66,113,12,192,134,82,155,93,19,96,249,7,168,153,159,93,165,165,247,208,192,124,
+102,86,76,38,228,90,154,29,108,150,148,31,12,53,253,176,113,55,30,199,20,11,160,147,123,43,13,215,73,195,64,161,187,96,68,83,86,113,53,34,133,177,71,247,150,73,33,151,202,35,68,204,115,4,175,82,173,1,1,89,108,153,186,140,183,179,73,86,75,3,210,240,121,202,246,143,91,82,212,215,242,157,135,181,193,76,122,183,206,21,252,105,189,69,184,131,55,160,147,15,159,197,250,241,237,186,164,201,183,235,76,89,166,205,168,48,186,163,1,1,45,21,77,149,79,19,168,69,228,72,32,37,94,23,104,119,194,204,182,235,239,16,144,100,1,250,178,236,221,195,5,5,105,233,92,102,189,58,5,172,153,45,231,48,135,37,186,161,165,163,188,170,101,78,77,225,123,181,189,177,121,95,70,248,142,113,70,14,82,162,78,238,98,208,193,67,14,76,135,85,194,78,83,20,179,183,37,44,30,108,2,145,55,186,206,86,182,91,231,45,29,56,208,143,142,22,208,57,73,238,37,58,10,167,233,56,229,217,4,33,141,32,109,137,205,44,42,207,30,60,125,134,62,137,169,177,
+180,63,239,27,111,126,178,22,173,173,128,42,168,117,140,158,230,227,22,223,62,142,162,48,41,150,95,34,29,109,62,133,37,98,94,8,82,13,114,102,120,200,232,237,2,37,252,66,193,152,4,159,25,92,79,33,104,32,155,16,138,2,70,180,4,97,21,12,94,118,251,11,131,39,121,220,142,188,145,97,208,42,207,223,128,177,99,127,8,19,230,217,249,79,58,24,182,151,28,184,19,179,148,117,240,239,83,174,149,208,26,156,229,77,18,71,12,219,189,46,155,246,49,8,58,159,43,150,123,233,222,111,15,120,148,218,210,174,61,103,67,206,169,167,137,47,91,214,22,108,57,200,45,207,212,247,90,235,0,230,129,195,50,50,120,205,148,180,101,254,203,180,192,151,169,242,170,180,165,74,232,150,220,193,11,34,193,207,67,145,225,20,133,158,183,20,174,117,82,225,199,86,176,127,190,97,170,236,173,17,125,239,97,107,236,219,15,63,18,67,35,138,253,146,13,112,44,216,125,114,193,85,0,141,183,154,116,96,201,163,189,41,104,95,47,17,250,48,187,118,1,154,107,21,146,107,
+16,224,78,169,148,208,136,181,130,12,223,202,200,168,21,112,105,185,78,237,230,30,54,79,109,40,133,180,133,18,103,190,233,86,92,218,237,238,150,183,255,21,98,123,238,244,178,60,42,242,94,87,79,226,159,207,206,117,175,112,68,226,231,166,125,10,102,55,99,55,72,217,89,237,98,36,158,163,226,118,208,181,64,37,190,231,205,101,3,84,77,111,85,229,242,188,74,242,65,230,212,106,23,35,129,206,225,225,147,24,142,109,17,115,68,243,182,164,92,169,0,252,200,210,41,69,11,71,189,252,156,145,224,114,134,182,21,107,28,137,149,167,88,6,239,135,158,90,202,54,27,218,189,66,40,153,194,121,194,240,82,142,105,244,58,214,98,115,162,93,187,29,173,16,6,95,105,138,13,41,219,241,112,8,77,220,16,215,209,58,31,50,157,195,229,112,71,140,14,161,109,139,194,91,190,36,49,135,108,210,159,152,250,5,117,125,166,46,27,52,134,150,52,12,234,20,28,0,3,24,188,97,73,129,130,159,110,115,126,144,127,78,52,168,234,35,6,150,107,156,35,55,199,31,118,95,
+224,250,196,229,190,62,225,130,187,254,198,2,98,171,201,171,14,195,208,162,104,48,232,108,231,99,18,153,189,14,213,52,232,234,216,201,31,172,199,69,199,150,135,213,90,3,254,146,214,226,45,117,42,0,24,148,29,27,116,234,44,60,3,133,134,140,205,239,207,82,49,165,191,129,214,161,36,182,122,229,123,216,41,235,156,249,146,27,45,147,121,195,217,89,78,34,193,150,48,127,214,229,174,40,218,205,96,148,18,56,32,231,236,20,82,88,123,90,96,254,78,234,159,81,10,83,27,161,15,174,99,4,39,182,37,76,236,75,168,60,109,65,65,108,206,131,108,109,83,105,200,53,135,150,208,115,63,9,0,246,151,157,100,135,152,118,205,163,163,152,21,232,140,212,244,103,88,212,137,149,52,232,203,189,58,125,164,81,219,46,67,75,127,17,16,118,109,150,23,170,192,148,164,16,111,206,189,45,127,104,216,123,40,159,31,183,159,178,243,138,172,211,176,201,151,58,105,244,14,154,169,242,33,245,107,97,40,240,20,22,14,94,93,178,137,93,50,123,8,52,31,135,95,153,198,247,
+186,166,94,211,5,245,187,5,82,104,222,111,13,77,170,198,208,158,55,84,158,116,26,20,102,106,131,201,209,132,217,47,55,38,102,233,210,155,182,85,87,131,32,54,20,176,232,185,34,230,230,32,67,250,177,173,189,106,35,88,239,154,236,197,139,26,45,150,235,93,111,214,100,203,142,84,185,133,45,159,54,43,205,102,106,74,69,89,26,206,200,150,188,50,196,1,195,173,213,45,6,230,94,206,88,10,196,45,141,113,119,45,45,223,67,15,244,243,163,19,56,61,135,27,141,200,103,187,145,37,44,186,218,237,60,234,79,139,38,162,132,199,186,200,235,221,100,127,67,79,79,139,109,139,126,154,108,158,198,215,39,29,174,78,219,127,60,167,239,57,183,147,12,5,206,175,185,188,224,46,186,224,113,186,126,141,140,227,40,178,73,173,106,4,203,166,158,183,179,98,251,118,142,174,189,67,229,248,140,64,93,218,207,226,192,54,207,100,209,219,121,191,243,195,58,87,231,74,23,87,161,179,75,174,224,126,140,214,120,111,199,237,213,135,148,116,238,154,141,122,222,235,210,221,245,149,
+157,56,179,109,182,51,76,224,108,31,149,22,20,204,67,210,242,138,22,17,214,171,109,8,68,249,241,215,118,154,181,36,154,84,105,116,17,198,248,200,13,11,116,7,112,116,5,223,28,112,229,220,117,203,54,51,92,215,31,135,221,225,218,49,248,40,252,229,57,201,113,177,146,63,228,63,186,174,175,72,69,210,67,226,144,44,28,31,225,126,41,230,186,214,107,70,234,125,210,225,199,119,170,121,195,29,210,250,76,202,18,105,182,40,101,172,22,139,99,59,147,241,34,205,171,164,123,209,50,227,249,241,235,238,227,182,67,251,225,176,95,188,153,6,187,221,121,114,152,135,197,163,80,94,200,224,205,251,112,99,104,173,149,86,142,97,75,194,111,167,250,39,227,189,208,189,204,151,235,62,253,32,111,37,150,42,6,118,152,135,125,14,203,24,141,191,27,62,215,199,220,6,176,89,118,33,44,181,38,94,44,165,252,251,27,83,163,133,97,16,158,162,97,157,163,193,152,98,60,7,86,111,141,161,183,191,151,245,240,246,165,32,93,42,194,214,67,63,7,85,211,168,106,45,210,7,
+185,125,42,127,231,165,56,95,38,219,18,41,102,77,75,59,23,14,117,80,159,47,245,63,114,171,30,19,240,86,134,36,229,72,45,100,150,106,155,216,78,231,210,92,31,197,39,52,134,76,243,120,203,239,205,87,98,191,7,114,64,150,176,178,35,22,221,54,242,124,107,167,198,79,233,68,33,131,36,85,21,193,18,30,82,88,176,140,23,251,138,52,161,133,209,124,12,10,215,121,71,106,25,239,242,23,215,184,5,14,236,222,57,62,208,201,190,57,241,164,37,163,235,31,79,212,119,90,20,205,54,242,10,237,184,35,229,119,69,119,83,84,42,40,146,218,60,221,171,1,119,236,50,88,103,146,48,184,233,202,251,197,254,141,92,99,64,182,99,163,241,98,159,175,248,199,252,226,62,63,111,236,75,108,81,217,221,29,177,58,91,15,222,231,106,22,171,115,243,250,196,230,56,51,149,90,224,200,50,86,11,149,213,99,240,248,252,4,236,30,221,61,149,224,77,23,54,58,4,61,55,199,32,221,118,47,83,224,253,125,94,79,165,42,28,188,156,85,34,178,235,55,69,216,114,99,
+102,196,161,59,108,112,172,151,250,246,195,225,186,91,84,214,220,51,181,58,83,224,169,164,169,161,161,106,86,74,169,33,152,136,166,192,252,75,35,112,157,253,136,92,132,89,34,247,25,41,214,203,147,192,148,172,60,97,106,222,82,252,13,17,184,136,171,55,244,234,229,47,245,143,15,245,79,105,148,6,72,235,250,179,156,116,10,123,1,115,102,150,124,168,161,107,93,77,107,142,211,116,220,100,47,188,188,0,152,23,28,193,55,234,171,11,78,245,4,62,210,167,174,126,81,64,238,151,154,50,251,162,190,125,217,179,68,235,83,211,124,180,102,104,148,97,241,146,152,86,92,95,90,147,8,241,214,70,145,190,109,248,251,6,40,70,231,24,13,118,11,89,119,195,183,170,72,115,122,125,174,89,167,159,63,173,25,201,85,1,134,137,115,154,50,26,235,18,189,137,141,48,237,50,72,76,253,115,98,186,242,8,110,194,66,54,151,87,213,86,131,181,139,226,154,212,78,155,85,129,212,177,20,156,251,98,60,140,85,201,227,142,42,121,46,149,38,129,29,198,207,18,213,33,64,135,
+111,185,173,78,24,221,27,254,138,125,41,113,11,243,174,21,77,57,215,3,111,233,219,236,220,124,119,80,228,189,241,25,55,51,94,147,175,113,131,245,208,99,192,251,32,242,85,242,61,167,115,220,72,161,71,200,154,57,155,215,4,130,226,125,45,118,79,124,19,191,173,240,160,48,79,55,115,24,175,172,125,55,75,18,251,66,38,180,205,197,125,150,253,58,26,109,93,232,170,196,105,131,36,179,86,147,47,247,163,212,43,242,10,189,188,173,218,203,143,166,94,13,231,153,183,164,155,57,82,227,18,71,89,120,30,190,211,24,156,218,205,141,241,124,223,87,66,27,218,102,239,167,90,90,255,20,182,25,122,243,91,170,56,56,103,130,149,127,108,151,98,223,46,100,252,54,124,46,8,19,37,101,195,248,124,39,223,207,6,229,241,248,255,33,229,59,187,146,135,186,109,255,122,224,145,46,130,72,81,122,17,233,65,74,164,23,165,10,8,82,3,161,41,72,13,69,122,135,27,112,220,113,207,59,206,57,159,238,87,220,66,18,246,156,107,206,185,214,230,239,235,187,223,99,95,223,
+119,253,104,78,24,228,121,8,25,253,35,60,96,155,28,97,113,184,36,58,200,195,214,212,206,139,176,61,190,192,192,154,1,161,125,27,94,189,132,212,176,179,218,28,159,210,45,68,151,10,195,182,10,209,18,234,192,190,35,7,219,200,29,241,223,70,78,56,159,216,18,189,27,29,23,140,199,67,138,227,119,88,211,251,253,93,221,13,111,133,171,16,23,213,60,13,55,33,227,41,59,221,10,18,108,201,105,202,75,15,207,40,15,89,205,187,191,11,95,139,238,206,180,17,247,212,22,36,42,163,114,148,192,170,209,154,100,60,46,143,246,159,73,164,126,244,40,88,6,93,125,165,244,115,82,62,72,49,138,215,58,190,53,1,195,105,59,30,56,89,115,211,117,106,11,251,228,193,120,229,135,11,127,33,65,23,169,215,247,146,241,228,107,174,69,242,28,148,77,62,199,219,163,119,249,49,230,72,42,216,53,22,60,55,190,225,163,161,209,157,213,84,239,63,63,237,45,133,35,170,58,13,32,246,224,241,3,140,53,135,111,11,236,13,125,80,182,111,202,104,7,106,34,109,154,121,
+167,148,229,196,51,193,173,207,62,216,238,135,88,23,218,149,242,247,60,10,140,52,63,235,184,230,133,126,95,201,204,16,225,127,90,135,231,157,89,251,234,149,125,97,109,57,249,253,194,174,149,47,224,239,223,152,39,58,77,15,230,167,36,64,124,105,3,191,222,178,159,169,115,67,193,39,211,113,0,0,144,86,136,214,55,8,241,202,35,67,182,133,120,234,145,3,15,255,206,41,187,15,233,100,100,234,216,76,79,120,68,111,63,174,49,160,99,229,64,253,136,160,200,190,46,58,78,34,163,253,24,215,161,202,16,237,116,213,77,96,251,56,225,207,67,231,11,122,147,171,8,160,242,49,22,146,212,10,96,117,189,110,79,2,84,89,12,142,47,94,122,244,143,185,33,166,108,64,15,116,138,80,119,143,142,242,109,181,202,42,79,210,126,133,124,138,81,237,22,190,21,76,51,251,205,245,149,203,71,162,98,37,40,73,9,228,101,235,227,111,131,166,201,29,142,131,164,91,162,230,108,223,141,54,193,182,9,199,199,176,195,109,123,129,161,233,162,190,91,12,228,105,253,167,193,205,
+13,71,53,183,139,29,237,253,27,17,255,83,228,57,158,243,245,152,131,38,59,202,41,247,194,37,73,185,132,93,142,196,215,124,126,149,52,155,113,200,218,88,80,80,10,101,14,75,63,24,97,33,127,113,103,231,234,110,177,231,231,192,171,55,214,2,148,227,229,87,251,190,231,65,101,55,138,19,143,93,161,64,35,56,210,211,144,248,75,41,40,54,88,41,249,213,143,233,244,245,123,5,230,21,111,209,121,255,209,171,49,204,116,47,12,38,44,35,202,184,140,115,105,220,88,119,63,30,98,119,53,35,253,198,108,73,87,161,27,20,198,172,243,123,10,91,16,111,34,141,144,112,119,210,235,254,121,72,195,215,210,190,137,6,211,183,165,222,209,112,186,253,82,137,73,79,100,139,230,1,161,121,209,243,13,88,168,83,123,193,238,91,107,191,171,246,142,75,177,50,138,178,183,52,238,141,253,224,108,210,42,241,154,63,134,24,150,79,157,110,241,64,115,37,161,194,171,85,102,126,59,14,31,243,26,42,115,101,112,157,239,71,131,221,207,143,0,142,161,143,69,34,11,233,133,197,
+142,242,38,221,69,56,239,166,134,242,41,63,72,112,90,136,75,178,253,149,49,78,164,110,70,107,242,209,192,252,59,198,175,87,63,175,76,66,80,6,114,36,138,12,125,6,66,35,82,52,111,191,177,180,154,224,19,140,168,222,65,101,109,169,33,216,185,29,233,237,117,183,253,115,240,5,75,147,79,205,39,228,94,4,156,252,200,121,59,106,101,212,133,65,216,68,194,190,125,139,207,137,233,38,115,76,75,197,194,92,159,147,235,193,81,190,93,225,93,193,215,169,52,129,177,6,178,46,237,189,183,108,116,187,55,248,30,35,17,210,21,202,156,110,160,212,201,255,219,81,145,241,25,105,140,41,134,99,243,31,154,236,200,172,245,194,206,13,140,12,25,244,143,194,202,208,14,62,129,172,218,141,117,115,187,48,249,70,244,237,141,153,27,151,125,98,66,58,253,210,253,174,205,154,139,25,116,220,46,116,190,173,162,60,131,116,177,33,2,190,26,214,33,13,106,120,58,189,6,57,97,189,42,252,228,179,146,167,193,245,183,80,123,213,125,101,42,175,185,78,238,207,113,180,63,48,
+142,181,176,164,36,22,212,71,48,94,142,168,215,18,249,235,51,246,182,81,235,254,112,32,199,148,225,48,151,6,149,114,78,132,63,60,164,201,15,85,116,238,59,189,211,47,250,74,190,153,189,209,24,44,53,67,87,221,252,83,122,192,79,115,28,234,66,81,40,204,59,46,36,231,5,223,120,169,211,56,189,38,154,161,46,95,14,144,197,147,41,1,0,212,119,220,224,92,189,229,55,30,194,175,16,80,249,241,64,137,224,105,255,220,193,1,210,28,218,147,161,61,129,201,117,124,158,14,195,17,27,74,59,127,48,242,153,221,157,23,254,26,4,146,15,150,139,235,160,97,96,174,198,105,213,120,235,36,105,164,142,158,73,41,194,24,216,59,48,122,26,111,242,193,232,1,125,106,215,227,22,239,142,93,206,230,125,135,188,68,208,250,61,145,1,249,183,234,57,236,62,114,226,28,59,169,252,89,192,3,254,30,114,254,184,14,170,20,57,11,10,137,145,32,133,89,239,208,145,75,4,19,4,224,19,90,59,217,255,194,7,207,200,107,243,206,242,208,203,203,218,49,249,2,228,31,
+191,134,201,254,109,42,154,7,2,1,79,217,227,233,223,110,43,206,224,188,39,244,154,205,102,234,215,43,222,83,56,157,24,167,98,241,62,9,111,150,57,103,241,139,3,22,228,212,138,243,124,227,8,76,106,28,17,30,200,47,219,185,108,201,83,133,25,184,94,25,148,97,173,116,242,245,229,255,208,165,50,144,161,245,174,210,133,36,84,21,135,210,203,111,175,182,91,174,190,36,127,17,23,149,58,37,174,76,122,6,128,5,43,35,155,87,5,104,168,28,95,72,182,163,39,202,42,76,114,121,184,98,7,95,40,204,221,101,251,217,15,212,164,155,136,188,78,39,63,106,220,15,98,42,6,157,94,250,126,224,244,27,93,50,9,64,0,192,250,175,66,235,251,31,115,77,132,18,228,175,11,121,115,65,235,89,123,236,118,245,211,110,187,218,54,110,77,30,57,250,69,85,0,0,155,230,19,6,38,7,22,92,215,104,64,130,82,149,91,161,29,12,5,154,5,101,175,220,134,141,235,159,68,254,11,251,38,172,248,48,164,6,130,177,22,2,162,11,242,214,170,245,18,187,224,212,
+32,22,139,69,13,77,231,10,0,194,255,208,36,142,204,238,243,27,209,142,103,178,5,245,30,112,189,161,167,59,176,36,38,248,104,32,118,34,25,104,125,10,215,190,96,234,197,50,35,157,108,89,235,206,209,252,168,80,210,3,139,80,152,145,108,164,185,152,216,152,89,133,117,33,164,236,183,54,66,255,190,16,197,167,221,38,6,164,142,219,223,189,1,184,93,158,126,177,109,144,74,125,125,185,164,246,168,114,150,32,29,1,224,41,141,116,194,219,8,246,156,57,92,161,149,79,104,156,184,26,135,255,60,191,79,39,192,76,60,179,183,130,241,64,7,96,1,40,142,252,229,199,158,203,39,185,58,194,35,90,229,185,112,156,227,68,158,114,98,184,6,120,129,107,20,7,12,252,183,214,199,192,43,68,146,238,191,206,75,183,100,59,23,32,119,114,255,190,28,40,0,48,111,222,65,130,180,225,132,218,43,177,184,85,49,65,12,71,30,15,0,102,28,250,78,144,122,35,174,233,106,103,7,121,198,31,148,16,15,101,220,80,64,246,35,254,53,172,203,213,219,251,95,30,0,172,
+235,233,236,131,157,84,183,41,208,77,165,157,157,145,140,234,246,116,229,224,90,217,122,240,57,223,44,181,115,171,214,250,157,83,90,60,137,84,45,28,233,231,87,105,245,31,133,234,55,146,133,199,179,55,177,186,102,254,158,196,13,196,2,21,109,105,159,109,63,207,116,170,242,177,9,182,186,254,15,79,163,56,47,166,103,155,166,238,169,23,124,229,242,110,70,81,156,159,135,71,55,47,64,53,39,130,137,51,33,91,42,102,196,56,214,201,54,228,186,50,237,102,176,102,212,243,93,73,197,124,222,182,252,44,138,105,16,98,173,170,53,124,31,223,72,164,123,113,81,55,149,244,5,224,191,140,91,221,176,245,190,169,21,169,99,196,237,111,196,61,6,106,248,135,246,30,68,247,159,119,89,29,15,20,129,185,48,216,174,147,13,25,238,67,119,60,8,218,0,169,65,76,113,16,139,228,152,224,118,136,236,172,147,163,225,199,164,132,4,83,67,23,247,240,145,216,245,121,179,232,219,147,153,142,114,90,91,4,100,151,237,9,237,211,93,22,100,167,146,76,20,158,10,233,178,136,
+129,142,242,27,158,195,97,197,88,45,181,148,29,87,207,255,4,23,169,129,75,200,202,83,99,54,152,0,20,187,245,183,48,68,29,19,52,130,22,50,174,165,51,155,119,27,255,7,105,156,244,85,66,105,115,0,63,91,186,202,151,138,155,207,44,241,109,25,152,138,50,131,119,21,20,180,126,7,217,58,83,84,136,19,112,140,200,86,231,95,68,69,193,135,4,219,63,49,128,41,229,81,145,228,25,51,218,108,32,206,85,135,210,252,251,135,180,196,57,247,205,167,175,175,193,62,80,4,134,177,232,73,214,152,34,244,153,193,4,234,13,160,178,112,131,230,223,151,179,17,172,13,66,3,58,247,241,137,182,48,76,14,200,44,247,64,40,43,156,229,167,86,47,78,118,198,231,161,160,11,131,68,235,229,31,76,149,85,160,46,222,245,4,203,125,161,15,194,10,47,142,201,152,229,167,170,96,60,85,167,23,144,182,134,146,41,108,227,54,2,237,35,108,207,235,253,83,82,85,209,189,54,151,239,239,6,204,9,49,100,94,150,186,49,157,7,114,22,46,224,23,188,86,32,12,60,
+52,17,253,77,247,239,228,142,233,35,28,75,131,12,57,250,169,137,129,253,214,69,102,208,143,126,165,189,213,150,205,76,76,205,154,181,201,197,163,193,115,251,139,85,224,126,139,55,238,188,255,192,80,160,4,234,40,241,237,205,182,129,211,175,187,58,147,201,9,248,119,141,131,251,246,125,186,122,241,199,2,241,1,2,164,69,99,81,183,87,161,100,63,99,4,212,162,28,222,3,254,107,169,104,81,89,87,104,52,170,130,86,247,84,223,222,117,154,239,59,108,71,106,240,24,170,230,50,244,25,7,248,21,152,180,245,7,49,25,14,168,175,212,224,249,7,92,241,210,237,185,56,36,105,172,33,6,35,218,119,24,250,193,196,25,25,201,200,48,9,251,121,196,150,250,177,181,21,154,63,40,156,245,173,229,166,16,184,1,164,28,12,120,242,7,48,171,88,24,34,67,28,86,62,1,160,203,212,216,11,100,14,146,152,19,225,163,159,133,71,121,225,108,247,67,16,187,129,35,177,85,101,141,45,144,15,220,188,216,21,164,158,61,238,186,17,120,154,104,62,181,25,245,116,98,236,
+199,246,158,186,84,213,141,195,102,179,155,145,102,236,115,233,143,65,177,88,116,224,9,180,57,69,243,116,202,233,117,234,116,58,141,122,189,222,20,2,90,110,118,189,140,146,214,174,191,21,212,222,72,56,220,239,149,132,0,0,6,171,223,50,123,61,43,200,87,245,7,235,43,180,28,75,5,48,149,90,221,48,163,194,247,74,60,13,108,182,95,187,93,158,211,180,168,131,20,8,173,77,106,202,93,16,170,128,249,108,86,105,249,121,103,65,50,239,71,126,142,43,227,129,207,6,253,170,18,208,239,169,172,188,162,130,126,23,91,239,18,124,37,254,34,228,189,161,15,119,109,31,103,44,51,229,222,239,96,107,124,206,172,198,235,46,213,33,195,196,175,251,221,113,32,184,84,171,186,155,133,238,244,114,181,161,232,199,98,82,161,192,86,239,191,190,246,126,99,127,60,102,92,199,255,5,221,86,22,218,35,5,95,95,95,135,245,237,63,205,84,7,185,156,206,35,255,227,230,90,211,147,225,101,199,192,29,32,253,71,185,60,71,247,110,23,126,209,167,152,108,213,179,122,242,98,
+26,106,170,134,4,229,33,106,5,243,45,54,234,200,12,154,212,67,186,159,203,102,21,63,95,218,165,202,128,76,158,155,28,239,188,43,230,54,244,136,51,208,213,79,16,207,54,163,112,40,183,219,79,57,0,92,53,86,134,195,149,165,104,190,117,101,210,47,51,195,164,208,146,29,65,159,57,110,90,105,179,245,108,165,198,187,55,251,153,62,217,29,86,81,109,142,204,85,90,31,148,63,79,174,244,97,205,109,38,250,164,76,106,229,7,211,187,177,113,155,23,35,226,14,212,182,69,17,29,179,88,63,255,16,128,188,190,176,23,68,190,23,204,74,218,5,170,246,194,96,202,45,43,186,36,127,230,99,23,100,216,227,37,190,79,152,172,120,160,240,6,177,1,128,138,199,144,230,171,64,251,93,172,137,188,82,56,161,8,171,19,58,76,105,123,179,147,251,228,185,192,205,143,238,200,141,234,232,112,56,232,56,37,129,174,2,51,189,30,172,220,64,115,136,29,60,40,120,48,19,87,3,250,143,138,35,195,228,253,89,133,119,170,131,206,67,44,222,233,150,185,88,91,118,245,228,
+169,199,157,76,97,73,145,123,105,41,141,83,151,120,195,172,11,230,18,95,231,27,219,50,170,45,85,182,124,134,45,78,73,112,215,92,40,196,156,92,135,176,107,226,0,196,156,73,167,224,126,113,98,231,206,101,142,122,186,145,205,245,50,98,182,108,174,193,209,218,99,117,231,251,129,1,0,165,158,58,210,9,55,145,79,161,123,190,115,134,247,92,13,95,58,90,204,0,0,185,102,98,224,184,194,234,23,29,120,195,208,21,252,101,94,208,5,174,98,23,116,145,241,222,11,186,236,92,193,5,93,0,224,184,160,11,67,208,5,93,128,154,121,65,215,172,31,158,127,98,232,2,164,138,239,51,186,192,236,203,25,93,162,213,158,124,94,68,170,232,110,175,98,134,182,83,119,170,124,81,112,16,77,51,215,180,233,74,18,218,218,249,71,110,0,152,191,104,78,96,171,223,69,245,214,78,26,132,34,217,26,9,127,127,239,219,135,76,39,185,194,139,143,42,117,104,41,95,44,20,119,204,217,211,129,94,112,29,204,162,161,144,66,84,210,223,179,21,61,137,146,33,234,56,171,239,
+70,108,197,201,93,77,102,205,233,124,94,115,124,240,36,165,29,19,240,163,193,49,178,148,180,91,149,99,36,69,141,197,71,80,223,13,199,244,228,174,25,34,45,231,134,109,72,170,139,200,142,252,62,130,27,197,4,213,192,52,80,250,52,0,191,0,74,73,150,135,252,223,159,231,85,52,225,22,115,180,189,198,55,117,73,105,156,250,198,127,213,236,145,252,234,134,178,115,219,183,139,157,181,162,110,39,199,23,119,190,160,106,54,155,135,82,84,85,109,4,38,25,166,137,213,191,15,229,175,38,226,238,22,145,132,94,173,227,145,193,252,157,226,223,63,231,188,250,209,13,173,22,171,128,174,132,85,159,207,236,103,185,93,63,26,188,121,194,220,99,49,82,98,95,158,145,127,86,173,80,68,255,212,69,175,99,51,174,123,36,218,206,168,86,51,140,102,198,206,141,142,46,248,252,230,231,220,6,21,247,154,113,163,77,181,60,158,59,103,107,114,47,104,219,246,76,64,74,93,73,12,140,31,73,229,102,101,152,120,225,251,171,129,156,41,35,107,82,233,198,160,225,172,46,104,111,
+80,95,150,197,240,57,130,99,247,57,214,155,41,147,149,71,237,132,31,249,56,125,155,98,120,97,22,225,190,181,102,88,66,254,166,55,173,237,190,39,203,193,116,134,250,232,128,98,239,183,201,231,61,105,73,128,145,105,33,254,62,254,190,174,132,168,202,216,175,147,106,40,79,148,45,109,209,98,18,195,124,61,86,214,116,70,193,225,110,247,226,241,147,80,156,12,160,85,116,87,60,197,131,99,25,237,223,251,221,66,84,39,196,160,122,248,16,150,200,232,157,57,205,18,194,177,68,103,102,8,76,138,76,134,193,34,16,117,145,182,181,227,167,94,59,204,195,94,55,153,158,206,175,49,181,73,49,25,2,106,101,58,243,232,61,65,181,226,149,139,251,88,9,39,13,49,190,221,246,28,29,96,194,82,21,72,78,110,232,95,8,193,121,203,45,194,5,152,133,250,34,80,255,241,125,133,138,242,14,144,115,191,20,45,145,182,156,235,44,116,33,191,95,159,185,253,49,192,84,18,87,111,138,248,135,122,3,255,52,87,218,121,90,108,219,75,123,107,115,37,46,54,152,78,153,82,
+178,218,83,57,11,79,181,99,196,34,239,70,27,221,65,31,166,117,91,10,57,246,118,198,129,16,29,59,158,14,48,51,16,167,79,36,36,57,26,154,53,121,191,79,145,136,194,33,165,237,155,129,192,4,202,7,187,203,27,221,250,254,57,254,17,97,125,131,156,231,53,61,253,32,77,190,92,153,204,88,37,243,167,89,243,130,69,18,91,140,13,238,19,226,195,74,43,5,171,173,231,210,26,121,155,65,13,83,180,56,196,251,66,77,228,118,245,160,142,254,44,235,130,113,167,99,163,77,69,51,112,146,145,7,210,214,68,81,181,10,71,24,25,242,221,225,131,173,251,152,73,40,119,236,96,45,179,101,79,11,99,247,20,52,148,183,185,39,19,3,13,57,232,25,157,236,22,0,200,152,255,144,178,118,34,143,60,254,195,190,138,239,145,60,196,148,90,69,61,147,241,249,163,39,168,32,68,220,222,255,208,213,99,220,96,71,62,239,69,171,81,47,156,62,197,52,148,237,218,215,197,118,93,208,39,97,112,33,200,48,194,1,223,108,1,6,244,199,153,191,130,9,117,4,15,94,
+17,164,216,253,0,126,171,108,238,64,53,92,38,112,73,73,230,53,18,59,136,25,172,107,203,55,136,249,179,208,39,203,125,67,128,241,211,127,40,19,91,123,166,13,167,92,156,85,176,25,51,140,43,0,172,206,226,44,100,123,146,158,178,36,68,29,51,123,181,65,0,51,240,185,119,194,208,81,94,31,184,182,137,255,169,30,111,47,245,248,147,136,9,16,25,151,192,156,75,232,115,195,129,127,104,33,226,82,110,255,253,162,163,110,4,147,238,145,125,38,13,140,51,238,48,210,8,48,181,49,81,1,181,61,138,249,158,88,200,81,11,102,83,38,73,128,179,145,239,9,92,96,129,60,232,218,241,21,85,230,117,149,107,78,71,208,217,247,142,213,119,33,149,120,10,242,84,45,105,238,8,223,30,163,167,209,205,244,58,156,43,1,126,241,195,196,197,69,15,29,112,33,94,219,11,133,45,145,86,193,170,244,123,197,136,85,105,100,107,240,169,200,84,157,110,243,197,153,103,96,119,161,98,42,200,103,87,182,45,67,197,162,119,145,133,58,218,171,62,199,247,165,31,145,180,156,
+255,220,124,33,141,130,43,250,228,126,24,28,90,43,103,176,193,188,178,223,221,245,149,100,87,29,43,204,202,195,95,97,166,4,254,10,179,35,126,236,153,197,234,104,97,204,191,185,11,84,227,235,197,87,112,244,15,219,163,133,198,167,181,115,80,238,236,49,33,88,218,207,93,47,15,139,7,21,241,144,149,247,146,117,159,15,137,237,75,115,252,250,196,23,236,220,13,207,206,5,246,159,111,186,203,86,65,171,251,9,150,181,138,230,193,87,192,200,136,134,62,9,11,245,66,246,110,205,240,167,135,52,244,136,11,122,60,108,115,36,152,97,61,150,121,31,55,25,138,241,229,10,46,79,83,120,2,187,143,140,19,139,222,248,131,221,65,27,171,83,68,223,10,91,198,18,184,245,222,255,54,205,208,55,219,73,26,248,61,90,56,191,155,108,63,213,209,89,19,85,80,57,162,6,141,238,157,157,38,215,160,147,129,212,150,74,203,92,245,236,157,235,254,206,124,219,171,184,227,167,250,194,197,213,245,66,47,160,165,159,82,189,139,84,43,42,250,178,31,2,137,199,117,53,206,57,
+53,82,154,116,117,245,35,232,170,169,85,70,132,149,62,30,70,77,109,116,127,95,27,84,9,92,146,193,201,138,61,88,169,221,237,48,52,49,20,1,136,249,100,231,119,230,143,167,193,236,231,184,100,81,218,35,61,43,20,175,112,69,175,113,135,18,209,210,179,42,65,177,137,44,11,154,178,46,235,138,111,242,194,143,159,250,190,226,117,104,116,242,207,90,203,250,126,164,46,1,132,253,11,83,245,30,159,26,213,88,135,149,109,92,184,56,228,92,123,81,12,140,212,148,199,212,113,118,16,242,9,107,23,187,74,126,164,128,16,236,68,232,49,10,109,128,177,55,118,241,162,72,34,69,209,139,225,147,221,161,239,39,30,203,74,114,235,241,169,18,247,222,190,161,155,235,62,197,253,204,121,87,64,108,134,218,70,62,176,252,250,55,225,27,171,42,140,83,136,25,206,58,87,142,164,221,155,221,116,56,99,250,199,110,243,242,62,85,250,50,201,100,174,52,100,85,180,210,105,253,135,179,71,97,173,254,121,22,210,198,203,236,83,7,174,158,64,134,61,14,32,156,237,138,36,23,
+250,150,25,91,133,211,64,26,212,244,20,196,72,16,227,192,197,163,99,133,66,21,168,198,178,28,3,239,121,197,82,167,242,37,96,59,247,93,148,33,194,153,134,84,52,144,123,147,173,137,33,10,55,89,77,100,43,36,168,220,32,228,124,102,6,116,108,180,44,70,204,234,71,19,190,205,135,99,225,129,8,21,164,55,108,152,211,219,79,242,183,224,158,32,34,69,160,129,175,109,253,80,46,10,136,102,5,114,122,170,164,69,46,41,82,200,22,177,228,167,59,49,144,31,123,171,240,196,229,142,205,13,212,166,150,47,247,124,251,156,230,23,145,83,92,7,244,167,254,205,189,134,190,52,152,60,50,89,181,26,177,37,217,165,124,226,228,204,88,59,91,60,127,131,137,64,64,253,98,50,55,106,236,122,150,162,173,229,80,242,126,235,244,162,239,105,183,241,103,213,66,44,96,15,133,109,26,103,193,253,48,234,171,28,47,173,221,207,254,199,157,80,62,133,232,78,150,13,244,18,213,84,126,226,26,165,192,153,137,211,208,125,126,147,108,62,89,95,171,234,20,158,46,98,181,227,
+117,219,88,148,254,162,155,194,117,105,8,246,144,172,142,192,228,47,7,123,67,92,212,191,138,9,94,244,126,152,42,36,205,136,221,234,82,156,107,202,10,53,118,173,77,70,117,142,2,139,254,198,38,205,15,169,219,77,118,241,92,135,116,10,228,240,160,122,123,228,55,235,31,113,207,149,205,235,125,215,215,248,100,159,248,117,19,118,91,99,57,84,59,21,51,109,84,164,50,22,75,228,112,183,215,166,65,54,100,37,8,11,108,238,94,112,247,128,178,202,252,162,115,66,94,105,202,217,155,23,55,127,103,225,174,194,1,82,36,48,195,228,215,212,39,81,168,212,217,71,65,151,248,201,235,243,245,218,141,158,81,155,182,123,141,147,152,26,181,114,89,137,3,62,194,21,63,88,140,60,21,98,13,29,129,104,112,162,242,216,196,48,30,47,249,170,102,63,100,183,34,174,14,204,147,231,181,252,140,255,179,137,18,104,20,202,237,173,7,108,49,190,193,18,148,131,99,64,230,225,236,167,48,30,86,3,159,151,228,97,114,230,105,194,103,235,31,168,68,222,48,6,15,50,175,210,
+155,52,11,190,199,255,154,18,216,2,0,96,191,198,157,236,10,149,22,99,156,151,222,17,206,49,199,58,25,164,139,59,216,31,191,99,115,45,58,60,222,131,65,194,226,219,9,185,83,94,179,40,238,199,110,101,0,124,137,147,83,131,41,70,116,20,148,92,75,245,192,241,61,95,249,145,208,158,189,157,17,89,1,72,211,24,219,178,179,38,142,8,72,45,147,149,58,153,179,169,49,233,38,232,46,145,135,165,223,254,143,240,143,221,188,56,171,99,85,23,54,203,165,171,71,217,203,247,110,208,149,190,148,155,136,207,221,172,198,28,189,147,152,189,0,229,16,200,132,123,98,27,95,246,196,242,141,34,190,215,144,103,229,8,55,251,126,61,0,236,215,149,184,133,115,131,66,37,136,117,175,147,35,31,178,127,21,155,46,77,250,248,135,72,124,171,221,194,234,179,156,249,152,246,141,241,49,2,208,255,193,211,129,107,161,118,130,215,109,49,37,16,81,100,148,31,149,180,21,124,29,204,247,208,110,131,48,100,100,21,241,104,125,25,144,166,84,46,172,176,37,140,176,48,48,9,
+41,131,163,177,47,109,47,170,76,105,151,47,188,123,143,14,62,119,85,227,163,251,198,1,39,222,134,7,111,195,203,220,98,165,52,157,66,27,44,58,91,208,191,205,60,194,79,130,225,140,114,109,131,208,249,250,196,249,192,8,88,87,250,189,168,65,39,100,233,103,143,180,151,195,241,182,131,137,187,45,228,252,213,134,24,251,7,35,142,34,198,4,86,235,169,70,72,136,100,101,128,174,248,248,225,203,31,238,75,190,204,253,70,107,176,160,155,242,138,120,34,221,251,22,218,54,213,51,68,210,150,177,224,126,153,3,219,87,246,196,15,31,206,212,87,152,234,155,158,118,75,42,165,120,216,221,128,38,211,251,79,145,254,94,31,236,58,7,176,21,163,108,30,100,153,165,201,225,212,190,189,160,68,207,105,79,191,38,212,19,19,33,187,26,127,100,27,90,62,68,151,43,42,22,68,37,185,175,201,113,67,162,6,166,48,240,120,205,34,254,161,46,143,179,2,253,94,155,124,178,27,189,35,137,48,151,215,170,199,102,254,227,136,149,4,212,60,230,196,144,154,143,227,163,88,57,
+9,181,130,37,248,102,178,0,246,75,199,203,91,11,221,57,18,111,21,9,147,210,222,57,185,14,193,253,179,207,88,10,58,151,50,182,90,17,228,168,197,2,202,84,244,54,84,169,151,170,74,41,238,117,5,145,172,45,161,163,122,71,79,35,175,174,35,164,150,66,203,57,174,66,20,97,130,107,233,144,247,34,49,133,188,212,20,100,88,202,17,45,99,87,41,155,147,123,142,46,47,112,168,57,176,139,135,143,84,148,192,167,81,102,60,145,186,155,225,123,85,171,1,149,224,125,107,154,49,152,46,78,15,92,250,184,241,252,244,64,219,81,174,197,193,20,197,182,185,241,191,33,99,62,3,158,218,84,135,42,234,159,127,73,11,26,56,16,196,56,241,76,137,73,236,105,42,138,71,24,201,168,221,177,216,252,72,179,247,201,48,190,123,79,127,168,196,143,22,203,138,167,20,245,145,135,227,0,201,186,12,62,193,166,191,153,230,168,56,118,4,26,54,44,201,59,249,203,251,242,4,16,132,58,130,125,89,120,90,218,16,40,124,34,18,173,244,174,75,230,28,12,194,78,237,210,
+54,121,175,35,63,81,134,55,51,82,35,156,143,234,34,153,165,95,27,101,97,203,252,95,97,242,204,227,223,228,132,44,165,170,177,115,82,229,77,190,92,251,108,74,129,28,59,98,135,217,20,172,26,72,107,230,42,57,192,238,204,242,72,59,143,113,158,8,163,188,171,113,79,122,166,60,135,233,9,30,106,56,111,118,242,199,218,203,173,231,111,228,138,171,28,27,14,49,26,166,111,51,59,117,156,164,112,165,193,238,0,30,90,125,70,81,27,236,143,219,158,73,219,243,253,2,126,21,233,243,196,110,197,184,213,89,163,191,143,7,150,133,115,24,187,55,145,214,67,242,58,27,132,169,94,146,119,224,106,45,10,187,8,143,15,253,235,9,238,32,187,77,44,165,172,215,245,160,252,68,132,235,224,138,87,129,0,185,211,87,75,55,121,18,121,215,59,223,208,195,217,35,81,178,88,131,40,113,40,123,185,223,214,41,139,34,204,178,199,183,219,185,168,148,216,254,36,220,149,110,182,207,221,225,164,31,223,14,217,4,144,43,247,171,57,47,36,205,15,223,3,107,207,78,144,30,
+219,52,168,169,215,214,125,100,24,147,122,52,24,140,146,197,176,209,76,122,214,35,125,244,94,9,172,95,49,38,109,196,186,231,120,245,230,246,108,71,49,30,179,3,236,55,158,139,219,7,40,151,246,94,240,187,19,122,199,4,109,8,255,220,60,175,187,194,27,122,159,191,6,181,239,245,204,121,236,55,149,206,89,16,147,188,215,232,239,171,103,157,164,47,247,126,163,31,83,157,116,17,174,133,232,176,117,84,27,172,249,222,112,123,21,28,241,229,168,255,7,0,143,236,27,144,243,166,228,46,45,213,11,211,205,144,208,133,233,58,1,8,99,186,95,7,101,130,125,10,125,109,252,102,147,27,159,209,122,90,117,115,46,156,87,46,114,49,234,160,175,231,62,198,35,43,15,245,245,58,128,186,149,52,200,153,80,245,125,251,143,198,170,223,144,178,228,192,187,79,96,177,61,82,229,73,110,152,99,104,104,63,102,120,52,103,47,24,171,78,189,42,50,244,45,49,169,122,29,198,97,226,20,176,50,87,45,146,220,87,191,134,205,251,206,57,255,237,198,216,18,243,61,49,148,97,
+109,224,169,85,250,84,123,254,7,9,199,134,107,227,227,137,105,175,27,85,212,100,101,105,152,16,136,11,188,126,132,99,115,153,48,53,243,158,66,122,15,152,240,170,235,28,230,123,121,191,142,104,236,242,135,134,177,223,229,73,151,165,35,194,245,12,73,204,96,54,16,60,9,94,2,142,80,60,175,43,67,202,68,170,219,96,102,239,208,208,205,91,105,24,144,227,60,141,254,228,251,49,169,138,93,87,26,70,198,141,163,148,120,57,149,84,140,205,180,235,98,238,118,158,177,240,125,128,83,156,238,220,31,172,120,35,110,85,153,107,91,253,42,219,180,249,234,112,157,99,108,143,75,207,254,15,30,90,208,166,60,234,27,155,69,184,206,167,227,91,249,118,46,216,228,168,98,194,218,92,87,123,76,102,154,60,158,112,7,93,111,121,27,16,163,130,28,60,84,77,61,236,2,121,156,167,180,75,228,93,165,144,138,98,161,244,82,195,70,44,25,13,62,77,12,135,194,1,30,159,35,225,148,61,161,53,52,178,9,114,165,98,250,253,141,121,198,251,61,70,128,147,14,61,215,117,
+221,11,69,249,7,25,164,96,253,218,51,135,175,39,114,199,24,63,56,49,23,124,84,64,177,95,40,211,249,164,170,185,214,126,58,167,89,218,11,91,61,19,177,229,174,204,94,200,243,30,51,54,6,146,109,227,28,169,86,117,132,41,168,120,111,128,49,28,192,109,78,12,147,112,42,14,46,12,147,194,71,94,243,120,20,137,82,70,100,87,26,247,192,163,225,85,31,92,80,30,186,6,60,250,193,121,186,110,232,149,220,82,175,157,47,8,30,166,147,22,255,185,211,240,136,159,196,105,13,72,111,245,137,58,191,41,36,188,91,87,13,199,15,242,222,125,250,248,214,152,100,122,76,27,158,165,97,22,211,134,152,52,180,213,66,189,59,150,105,157,88,197,56,31,194,28,21,165,137,226,138,17,11,232,46,77,223,43,180,148,93,196,176,215,40,186,176,99,94,137,235,69,176,246,110,220,174,24,243,82,152,245,163,237,211,209,13,82,120,123,184,200,63,93,128,173,251,102,24,74,44,245,61,110,70,71,123,105,188,222,135,106,114,226,150,180,229,60,85,22,87,168,28,199,230,96,
+198,254,151,7,199,230,229,97,41,13,13,70,230,229,77,3,17,50,163,217,17,125,181,17,176,187,8,39,92,9,20,19,158,233,155,74,48,252,68,48,150,70,194,243,77,245,243,165,253,242,83,14,95,193,226,219,170,142,175,116,253,17,156,104,241,71,112,61,203,31,193,105,110,254,8,142,227,252,35,56,177,233,143,224,102,236,51,193,133,190,248,136,120,184,98,0,65,180,48,254,125,186,137,251,98,127,241,180,193,254,23,79,235,205,127,241,244,96,2,155,223,31,249,165,68,44,68,225,132,240,119,148,29,46,123,132,205,241,149,205,206,237,190,108,185,42,197,76,252,91,126,78,12,7,137,225,139,238,253,152,169,201,3,183,243,143,220,146,132,209,158,168,229,52,125,37,177,171,20,175,205,164,49,23,46,139,234,253,69,238,230,105,92,104,212,188,107,96,122,150,106,215,152,86,83,68,220,19,140,137,137,103,42,51,97,92,118,166,178,59,140,203,206,84,246,141,113,217,153,202,114,24,151,157,169,44,233,250,118,96,84,230,158,238,156,98,62,198,96,33,13,122,97,176,3,99,
+114,97,48,175,24,190,48,24,174,143,42,1,43,171,18,253,139,229,0,226,95,44,103,32,255,197,114,6,229,95,44,39,173,255,197,114,192,199,95,44,39,29,156,99,57,235,43,84,89,250,6,43,59,55,215,248,119,17,118,192,227,69,173,209,65,252,81,136,177,212,15,49,13,227,153,19,17,95,188,236,60,36,91,221,101,71,141,153,120,128,2,114,118,248,117,119,20,173,54,73,72,15,252,175,126,219,70,245,85,19,41,58,9,4,128,100,120,39,11,242,63,105,111,78,198,114,110,54,164,6,253,227,47,103,23,218,131,48,158,200,106,94,216,43,246,235,247,6,125,153,80,193,67,126,128,188,73,199,203,139,242,229,220,200,212,61,57,194,109,9,231,97,33,52,24,139,87,70,221,139,118,0,153,56,202,56,79,75,249,72,223,245,103,63,63,95,143,245,29,0,80,223,226,85,25,217,168,186,227,9,218,58,54,28,203,141,101,56,151,4,175,161,160,95,14,254,103,121,188,108,122,99,198,76,185,172,123,50,133,219,233,59,79,13,22,249,175,184,165,55,86,35,186,253,107,112,
+242,159,114,29,198,164,223,198,88,156,203,108,32,203,235,88,199,197,29,218,193,18,108,86,37,196,242,23,89,246,47,255,78,48,87,94,223,50,181,219,203,174,38,185,207,58,209,49,252,76,166,167,253,194,227,144,50,187,115,212,60,242,161,234,250,230,70,155,242,183,248,241,78,157,174,184,30,196,4,156,164,141,1,63,155,16,155,239,145,43,126,186,1,113,56,156,103,92,174,215,199,61,162,248,167,250,76,43,237,42,98,201,251,251,187,215,235,53,112,215,148,137,149,243,250,1,94,39,188,49,71,250,190,177,83,204,101,19,157,220,140,73,182,59,133,101,28,20,231,36,253,109,151,172,62,105,8,64,1,143,222,18,164,75,231,228,200,172,100,131,169,137,26,150,255,47,185,185,86,162,113,46,191,114,119,138,168,66,177,181,198,24,3,117,87,245,32,82,38,31,92,58,218,148,83,180,179,222,72,142,158,23,233,53,62,39,207,249,182,252,129,162,42,165,29,176,65,240,70,82,150,21,185,15,94,126,243,32,72,101,117,247,121,222,67,136,42,80,210,210,54,72,61,183,171,188,
+90,106,255,37,184,19,3,254,186,238,215,206,85,115,41,117,118,133,243,34,66,41,39,203,203,176,184,57,128,206,214,184,227,83,81,52,254,37,172,59,190,61,241,53,95,200,76,73,81,20,243,148,80,131,92,220,231,233,153,201,57,110,107,94,199,114,236,162,122,145,174,105,182,78,129,35,71,233,209,17,182,43,22,122,59,229,175,131,131,159,159,199,212,212,185,174,61,167,44,91,104,18,101,251,14,154,87,74,35,4,0,31,196,248,14,122,123,118,17,224,149,216,52,219,45,5,246,71,193,93,53,34,183,248,134,161,100,4,154,102,133,186,29,132,140,144,37,98,106,103,90,145,24,84,9,6,106,226,246,99,123,241,76,8,206,162,31,249,129,222,112,156,136,154,118,110,20,152,3,246,2,249,91,5,182,234,176,24,142,189,235,213,78,150,93,199,173,213,191,120,121,200,58,132,106,107,94,132,2,230,127,39,149,192,92,25,204,126,108,167,229,168,126,34,39,175,199,123,119,174,110,194,229,86,225,222,92,22,72,4,2,56,152,121,103,201,109,13,22,143,120,187,128,22,17,95,
+33,4,51,185,249,187,70,16,148,225,65,127,201,15,185,203,224,157,150,166,11,200,141,204,212,138,227,169,87,116,68,241,95,156,47,203,94,226,252,169,138,200,151,153,13,241,185,65,51,187,103,66,65,183,109,85,59,37,72,174,159,232,194,110,171,177,13,81,68,81,12,14,246,60,110,169,3,161,181,245,240,95,99,230,153,200,4,202,49,157,6,51,182,159,161,201,216,234,6,172,92,177,145,16,190,196,120,152,246,126,98,198,82,41,198,242,164,198,54,26,117,146,24,81,57,224,64,199,247,4,54,146,142,23,240,199,85,127,52,179,243,57,247,215,215,215,221,201,167,97,86,1,181,7,174,76,179,161,179,1,169,242,255,234,161,40,192,198,131,4,41,222,127,14,241,100,115,7,241,28,226,97,194,232,235,28,226,89,17,104,177,180,207,49,102,145,198,196,196,135,51,15,21,229,221,119,82,70,13,107,183,150,169,97,252,133,92,93,236,35,192,102,157,223,165,225,128,26,235,51,191,92,253,75,96,124,115,78,244,56,150,68,199,252,187,55,176,1,224,158,4,83,95,145,61,176,
+252,25,77,134,246,57,124,105,0,100,231,151,6,64,72,84,31,61,117,194,255,0,189,191,211,28,125,10,71,163,207,90,39,108,203,64,68,243,16,247,75,162,105,208,72,11,249,252,52,59,223,10,244,86,107,35,145,243,37,26,185,174,70,148,136,25,10,133,162,45,216,24,18,42,66,31,254,6,146,0,64,194,252,198,142,13,121,22,48,21,109,125,107,255,26,216,225,199,115,3,123,232,249,162,123,49,133,53,159,107,230,250,146,249,145,127,160,204,164,99,63,14,136,190,40,243,208,224,163,187,46,195,102,58,246,81,109,215,149,163,211,152,168,115,228,11,75,48,171,127,93,50,38,158,125,233,146,45,213,147,75,151,236,229,170,188,161,8,199,226,36,251,69,232,99,151,28,76,241,7,49,147,221,114,94,250,144,197,188,11,11,162,107,244,214,122,76,207,228,214,30,53,100,93,181,59,233,89,58,221,93,186,117,111,51,129,8,7,100,162,63,120,4,140,35,14,173,161,101,65,41,46,89,186,169,180,47,201,195,146,88,22,253,203,235,145,167,236,95,64,214,175,232,212,240,84,
+89,212,132,243,89,40,239,101,117,13,195,130,105,164,161,40,215,139,68,31,81,118,211,105,196,25,215,151,95,214,168,146,5,189,60,64,0,58,196,190,7,222,145,14,179,170,82,87,53,158,23,46,134,76,94,189,84,110,21,169,157,149,149,199,128,31,8,118,175,12,211,94,191,134,115,171,44,160,15,202,39,87,3,111,173,175,219,99,59,170,117,147,67,104,243,76,171,242,20,243,203,75,244,44,239,112,204,64,49,73,87,243,41,2,128,196,91,85,247,237,127,101,85,226,66,122,242,206,226,228,22,93,160,62,175,250,112,212,117,175,119,160,210,40,237,163,123,46,167,137,212,159,100,122,117,133,6,72,153,110,198,253,32,33,185,122,175,246,96,149,147,171,11,213,111,96,207,57,85,31,104,17,70,150,211,86,244,86,229,176,203,173,21,163,100,183,51,93,231,43,121,201,121,50,25,86,25,249,55,161,246,168,16,171,4,6,171,94,47,173,187,185,190,142,144,193,16,20,4,128,136,254,202,85,232,111,159,150,177,248,0,121,49,173,127,171,58,115,48,151,28,15,49,176,83,101,
+133,31,165,214,3,101,200,178,94,61,5,155,43,154,176,90,62,136,179,170,186,201,170,241,169,79,181,5,115,125,121,51,39,238,106,107,232,159,188,96,56,148,225,202,55,63,41,228,243,51,205,105,115,155,102,32,17,187,218,134,145,32,3,36,180,47,120,123,217,154,184,87,173,18,199,113,210,202,244,164,86,117,50,36,44,221,51,28,32,229,164,197,2,134,52,243,62,62,137,49,103,93,46,187,146,243,94,102,27,183,72,162,45,36,138,85,84,81,134,142,225,34,243,14,74,177,42,108,192,42,249,19,243,245,92,166,153,79,231,112,91,210,64,112,127,227,33,175,248,191,241,16,128,248,55,30,226,95,254,141,135,72,255,253,141,135,144,61,127,227,33,234,102,253,210,94,115,223,254,181,215,20,186,133,33,162,60,120,185,87,152,234,191,58,119,90,118,142,202,228,127,239,175,213,30,105,74,60,194,206,28,2,86,5,186,105,103,103,186,243,112,200,202,193,189,57,15,135,228,155,37,214,247,56,112,125,106,207,180,167,166,172,51,112,91,37,191,41,92,46,124,13,227,218,62,193,
+85,7,0,148,214,219,209,141,114,126,40,199,54,218,16,100,206,39,203,95,73,146,223,233,223,64,120,134,64,79,122,8,249,76,79,13,40,105,187,183,83,0,41,157,188,90,26,224,204,158,195,45,213,161,1,136,225,106,201,3,128,135,17,131,177,94,128,6,170,50,66,11,186,140,129,11,176,52,127,237,231,101,70,173,234,182,210,134,84,248,222,124,122,102,70,228,86,183,166,173,165,244,18,179,205,176,84,6,7,236,122,48,14,13,217,235,194,63,78,164,70,5,62,219,153,95,3,83,11,61,46,179,255,238,229,219,155,136,71,200,10,93,20,191,102,216,184,40,254,141,161,81,141,47,68,196,31,225,14,44,165,232,32,212,124,220,3,52,85,214,90,213,201,82,132,71,160,0,176,133,137,21,26,210,81,22,48,178,4,149,182,36,85,129,187,117,145,30,217,171,39,251,231,23,82,134,91,11,202,45,105,98,189,51,167,133,48,85,168,170,223,118,92,31,250,86,84,242,214,38,6,123,141,43,237,17,158,66,225,138,145,253,14,13,216,188,18,51,52,107,150,196,83,128,12,196,
+104,77,68,102,61,37,161,160,211,236,228,6,49,140,96,16,177,3,117,93,205,20,115,181,117,111,190,131,137,121,210,18,177,127,207,245,141,125,153,16,85,182,29,114,28,67,74,247,67,111,228,149,203,192,60,102,45,209,49,127,130,171,202,124,25,178,242,177,7,182,120,188,251,218,39,245,49,16,56,61,78,74,26,25,126,156,26,91,31,72,113,27,216,50,7,116,122,13,246,237,144,22,167,192,124,224,58,141,73,135,104,31,205,228,35,173,1,61,196,9,232,223,201,249,93,95,201,124,179,68,36,198,150,243,89,142,14,7,119,132,72,246,214,254,145,243,246,27,102,207,102,252,17,182,35,217,156,71,49,105,203,97,241,13,250,9,116,121,107,47,23,136,69,71,171,57,123,193,231,88,53,31,155,246,63,96,237,23,164,137,157,48,77,186,249,53,116,13,238,29,211,105,251,88,115,53,192,239,249,117,120,59,185,255,39,184,241,108,121,75,194,23,242,249,246,107,192,170,176,250,202,108,231,222,203,72,19,108,189,157,235,63,187,234,135,138,142,70,104,94,38,163,62,153,151,201,
+168,235,43,244,245,253,161,93,161,37,48,241,39,85,138,98,137,223,30,166,103,207,115,184,231,221,223,250,85,27,76,140,38,242,137,104,221,170,176,205,155,196,61,2,192,244,147,8,55,214,21,90,140,140,230,126,241,238,248,28,12,192,190,175,58,13,0,88,236,32,7,138,29,245,217,152,225,237,220,108,198,176,32,56,131,1,195,194,16,171,53,245,81,161,243,141,213,26,63,169,233,193,174,114,214,236,156,71,167,5,252,115,163,89,226,139,67,82,217,207,66,100,224,199,99,107,111,240,147,145,9,101,242,189,14,183,221,48,56,53,170,105,187,111,161,29,114,26,123,44,173,209,28,231,60,173,177,133,163,119,38,122,32,247,73,198,112,177,171,171,72,221,186,64,38,168,63,232,209,16,97,180,39,211,31,47,133,231,67,225,17,151,92,158,223,98,104,106,115,253,82,122,252,12,26,50,68,108,128,52,214,251,194,156,12,207,245,169,130,137,51,169,180,230,109,106,14,82,187,188,90,199,219,103,7,104,135,184,255,226,198,23,228,47,110,180,229,240,117,243,224,73,85,8,80,221,
+196,134,216,215,232,153,216,142,27,249,142,124,109,238,144,238,232,209,211,142,103,245,49,60,185,154,205,26,180,174,157,27,27,168,77,175,131,5,125,141,224,156,219,51,15,162,251,167,207,243,64,159,142,237,55,169,0,127,225,215,80,57,163,103,244,144,78,238,7,135,182,38,38,4,254,198,167,222,30,255,198,167,16,207,121,124,138,5,117,166,110,107,37,126,216,44,36,243,231,124,148,249,65,222,166,38,3,130,74,243,61,247,149,26,80,112,120,231,187,139,25,71,163,97,222,242,247,246,246,103,31,224,247,252,184,234,183,58,90,53,46,228,144,42,84,249,138,225,174,222,120,60,241,131,184,61,117,42,45,76,88,245,35,167,244,64,8,230,63,83,57,193,226,143,42,30,82,50,106,242,157,250,89,0,130,107,86,41,194,119,68,91,13,228,248,17,213,67,36,147,163,34,80,190,148,22,85,191,170,96,78,25,83,237,157,9,106,124,220,220,196,195,153,22,136,7,152,22,193,239,228,76,53,130,191,246,7,184,249,107,127,60,178,28,43,148,211,69,38,160,37,184,220,84,227,179,
+118,165,68,163,78,12,65,254,192,142,58,248,252,105,191,127,111,176,69,108,220,53,227,70,27,119,218,140,92,163,247,190,107,36,0,105,230,191,179,189,133,205,212,30,223,77,219,115,181,188,98,124,171,35,248,41,252,229,216,29,15,5,117,176,182,8,51,209,85,71,21,188,210,157,250,246,58,55,174,55,63,61,254,66,194,131,28,45,9,152,191,169,243,116,85,48,218,36,155,245,162,62,114,247,123,7,72,239,42,198,86,168,180,60,125,250,127,14,99,183,74,123,211,197,200,233,92,172,176,90,53,63,23,43,172,86,77,72,91,109,105,68,103,60,92,255,147,78,60,170,27,154,97,29,124,177,168,204,79,65,136,158,210,199,38,201,177,219,99,90,138,79,227,79,174,79,211,112,122,70,119,114,199,183,30,230,116,130,69,168,127,215,34,218,113,192,213,27,230,75,247,103,95,170,82,103,227,143,137,57,227,56,79,109,184,120,127,243,203,49,97,159,69,33,146,178,1,209,168,109,160,0,172,82,220,223,224,7,31,248,27,252,144,254,141,85,129,236,191,177,42,242,225,111,172,202,
+254,242,55,86,5,76,255,198,170,48,92,254,13,126,72,255,198,170,102,215,253,249,252,92,153,94,165,95,216,203,183,112,249,47,22,35,134,146,39,140,69,128,43,232,31,74,248,212,132,18,242,85,139,161,151,61,47,189,38,66,205,45,251,249,245,25,214,229,143,121,101,141,233,195,238,121,180,106,255,99,234,190,117,194,229,235,177,229,157,141,1,146,108,58,93,38,63,90,151,46,46,251,155,127,32,31,31,169,253,118,36,18,14,115,245,69,105,55,149,135,100,109,84,221,64,143,34,219,196,194,75,128,85,45,53,127,215,199,207,130,235,184,20,0,10,87,13,76,78,26,225,113,0,226,15,144,219,157,10,5,194,105,22,60,21,90,191,196,181,90,45,223,12,21,245,253,183,143,2,49,109,254,66,60,30,143,60,206,213,99,78,52,251,246,209,25,219,0,191,141,114,30,110,172,230,68,69,12,158,169,162,136,155,41,222,160,33,215,213,36,133,254,194,231,209,70,167,84,204,63,143,54,222,198,52,72,173,74,221,39,53,150,7,113,81,199,71,119,203,187,64,233,238,238,251,238,
+112,56,32,158,57,65,190,254,138,51,50,154,103,34,145,56,151,243,159,123,52,179,138,93,215,80,178,233,116,26,50,120,243,130,249,39,243,36,166,0,59,38,61,1,182,156,143,43,142,34,99,118,113,237,128,45,193,218,133,19,148,167,7,214,148,173,76,62,209,159,60,16,205,33,187,99,60,132,33,234,212,0,79,168,195,138,233,223,191,127,70,237,94,44,22,43,19,34,211,100,177,90,161,56,158,46,65,159,247,154,25,160,156,181,170,144,120,135,64,89,196,151,134,195,130,151,169,36,138,121,0,16,75,153,204,29,244,107,88,240,20,142,37,57,110,20,13,166,65,209,32,173,151,240,254,132,225,250,238,79,24,18,211,23,97,168,215,135,31,216,44,165,178,172,209,202,15,30,227,36,162,192,137,228,226,169,152,242,106,98,2,0,89,246,35,59,49,61,77,189,67,7,99,234,140,163,168,128,220,191,241,197,89,249,50,190,216,71,132,82,7,75,132,71,113,86,192,138,221,32,231,254,198,167,81,101,146,11,67,24,166,250,132,187,80,58,126,27,44,153,246,41,229,255,205,143,
+204,185,47,40,56,169,173,149,48,20,92,27,64,217,26,143,253,163,126,21,86,149,45,151,70,135,173,20,110,172,12,81,230,85,218,229,171,239,42,255,235,252,84,103,74,75,237,63,37,141,147,103,210,166,126,175,194,37,52,226,81,167,168,43,19,198,255,63,164,14,218,198,145,127,142,17,6,138,11,246,178,219,237,150,232,38,145,20,37,193,239,6,135,213,58,255,205,122,180,117,3,228,177,184,112,255,144,50,231,179,134,209,77,2,240,239,112,152,183,121,253,147,101,118,42,38,203,206,9,139,132,240,217,58,183,206,164,231,122,118,149,222,4,177,77,118,110,157,225,46,238,232,53,254,233,100,87,206,173,179,251,75,26,131,226,222,207,105,76,114,35,4,254,253,205,79,79,253,193,69,255,209,187,96,168,3,152,203,3,128,254,2,127,1,76,48,241,7,152,253,242,15,48,252,95,195,62,69,39,1,188,191,24,230,147,254,23,195,24,74,127,49,76,168,185,63,167,200,143,44,197,37,135,89,31,2,228,69,116,173,149,133,74,84,213,26,71,127,0,111,19,167,23,114,146,8,
+60,170,29,255,161,227,70,23,29,199,111,122,145,118,127,1,193,112,83,170,250,157,164,77,114,160,149,226,209,84,87,192,134,45,172,196,45,67,121,188,111,55,223,7,112,147,160,56,206,177,78,66,174,193,213,164,179,67,87,86,169,228,141,153,162,31,134,249,226,77,139,109,120,174,250,204,140,187,224,107,211,209,244,7,77,216,243,118,204,168,246,109,154,110,106,105,98,201,119,119,183,156,52,81,58,213,205,64,9,168,129,214,121,112,53,179,140,247,197,183,31,145,218,113,44,150,7,75,65,235,171,106,105,194,234,67,214,99,47,224,64,78,15,24,204,14,33,144,127,32,20,120,229,251,28,28,235,2,89,217,89,239,60,106,126,142,134,157,177,1,2,115,195,228,165,62,110,209,146,206,165,25,173,194,246,84,135,219,216,94,37,64,235,7,244,70,175,36,133,20,140,244,77,50,113,195,64,239,38,158,96,243,115,182,210,230,124,208,91,248,77,12,7,168,57,50,248,68,234,174,40,123,206,199,95,249,128,221,127,229,163,247,176,66,33,4,170,132,178,4,125,49,9,99,178,100,
+58,255,231,127,127,133,190,48,141,102,192,246,110,2,219,188,191,38,146,233,7,219,187,216,214,61,30,25,233,59,86,25,10,222,66,120,154,81,107,170,116,3,87,192,231,175,143,43,239,148,179,36,122,130,2,157,214,108,212,231,40,76,175,255,26,49,159,111,231,70,76,33,196,151,223,142,58,215,157,106,229,174,177,17,7,215,206,230,111,152,189,24,187,29,145,40,135,132,241,106,172,125,157,130,241,204,247,3,124,35,150,39,239,110,164,120,71,106,143,17,181,131,233,182,137,253,87,171,20,153,247,118,39,110,81,177,61,57,61,243,111,69,138,201,32,42,238,255,249,141,136,179,2,229,226,100,252,229,215,107,156,198,88,186,129,0,32,102,233,131,152,167,63,91,122,7,30,125,221,96,75,241,216,218,243,27,48,82,154,215,139,211,144,10,207,252,190,248,233,175,197,45,39,15,151,238,156,221,137,219,46,44,144,27,51,171,98,245,193,64,85,174,24,89,127,85,77,200,108,99,181,227,177,162,59,46,255,73,4,107,6,0,84,129,58,84,123,171,141,110,3,18,100,151,134,220,
+22,205,38,112,13,179,103,174,10,141,191,143,21,96,173,73,255,124,88,201,156,92,123,54,235,73,65,147,249,252,135,209,126,124,86,63,185,29,236,104,83,2,32,55,43,210,161,33,8,104,44,171,136,10,50,23,4,230,123,162,46,148,185,130,167,223,124,182,245,78,85,45,81,221,236,54,158,214,79,10,54,124,251,30,39,29,146,37,70,120,186,175,181,15,74,167,209,129,150,60,28,84,190,27,154,174,44,85,177,154,196,20,229,107,105,176,246,90,217,28,17,207,144,112,233,94,156,4,166,75,247,66,87,142,58,29,199,187,105,227,101,244,162,154,25,5,179,114,46,149,216,89,4,26,177,219,221,104,14,223,104,91,65,22,211,85,246,25,16,5,98,151,6,79,138,27,36,210,52,178,192,145,246,159,251,181,106,47,136,192,214,59,229,16,95,177,153,199,97,121,76,11,38,52,155,32,102,167,148,26,176,85,79,248,247,216,182,29,190,30,34,32,71,33,25,71,224,46,171,83,21,165,237,138,33,114,177,229,112,228,207,150,43,195,11,67,112,101,56,238,232,148,208,210,89,98,
+168,136,145,93,135,215,154,26,150,174,16,164,147,59,76,128,62,229,56,235,253,60,6,158,9,168,44,212,57,121,40,136,76,12,123,103,15,241,76,54,97,204,253,50,60,204,128,185,180,255,157,90,125,15,96,135,115,223,42,18,129,23,143,2,219,197,48,101,181,120,70,29,153,125,171,216,215,81,69,18,187,96,171,241,72,145,141,154,131,102,66,175,245,57,25,117,44,137,175,111,168,73,215,180,243,229,0,64,75,78,73,6,83,44,30,155,255,183,121,53,21,38,54,220,206,111,157,169,238,188,102,145,152,232,251,85,172,210,143,189,27,94,67,21,54,103,53,118,51,28,216,6,86,240,1,1,66,219,138,141,173,142,152,108,180,38,64,2,19,206,79,110,196,233,124,140,149,58,208,71,73,139,4,219,106,200,77,114,59,66,220,32,129,144,166,143,255,137,193,123,118,230,235,46,125,222,212,159,203,175,123,204,238,86,49,206,197,3,159,87,231,253,249,117,158,63,163,202,226,137,106,28,58,239,233,138,148,44,159,201,31,65,42,225,171,113,143,249,232,4,160,198,115,231,106,59,
+158,203,150,156,151,254,156,193,192,156,8,137,252,225,210,78,194,172,112,87,121,118,212,40,45,247,123,113,14,64,217,123,118,14,124,214,213,165,125,103,217,253,181,239,144,205,95,251,46,240,15,50,123,109,98,0,200,59,113,62,212,177,221,96,226,90,226,195,60,116,107,179,162,249,78,107,234,117,227,120,178,1,116,249,159,78,41,238,114,76,69,175,39,111,28,119,149,250,58,218,235,105,218,206,236,173,187,162,209,80,210,217,158,72,21,13,164,36,156,152,131,0,16,208,230,232,243,202,36,244,63,165,69,204,216,196,144,160,47,184,230,178,236,238,99,240,107,152,216,181,191,59,59,221,61,216,243,121,200,208,252,180,148,108,111,242,140,223,61,61,107,72,26,173,128,90,232,140,64,83,59,140,180,97,179,75,188,224,161,15,119,203,207,43,227,65,229,177,251,66,166,30,61,72,105,140,86,255,237,252,69,187,86,157,74,24,13,21,138,50,164,46,107,234,125,37,80,135,242,120,85,109,22,12,254,42,29,84,213,62,12,155,150,79,31,220,171,74,218,180,255,253,60,164,106,213,
+178,171,53,72,56,139,236,238,224,6,206,124,195,71,35,164,153,232,159,116,12,15,27,144,30,125,84,39,241,30,202,152,59,152,86,145,84,170,194,146,39,37,87,236,238,120,39,170,133,114,6,198,63,235,31,48,78,89,59,247,232,181,56,241,133,31,206,52,157,100,25,75,193,4,101,58,224,143,60,4,242,67,85,23,36,244,142,112,172,90,77,12,31,116,14,76,46,43,68,10,109,46,232,57,28,102,97,121,48,123,151,93,188,170,206,198,49,221,164,34,15,219,25,86,239,158,38,133,252,235,213,72,233,77,127,239,255,139,159,112,120,64,200,231,132,153,1,215,79,112,60,109,127,203,172,226,231,183,2,225,0,61,222,150,192,150,36,211,32,225,190,193,86,42,82,83,192,102,172,2,40,85,155,224,28,35,64,117,4,130,222,50,85,204,59,220,93,216,159,133,142,207,236,239,88,133,133,42,140,220,20,241,138,227,231,125,242,65,213,61,74,167,237,169,193,82,133,124,24,152,153,44,123,225,173,193,157,17,0,170,202,113,30,179,167,198,188,82,195,210,112,98,116,37,181,205,
+47,111,192,231,196,55,171,28,21,103,221,215,232,235,179,234,233,78,227,28,38,66,46,190,197,129,42,58,232,70,235,129,177,219,232,171,23,217,106,64,233,168,158,168,151,57,202,28,20,196,87,202,241,209,118,15,114,62,12,139,185,70,171,24,165,26,147,16,19,157,230,197,110,68,115,245,41,236,160,250,252,117,130,29,221,178,184,213,209,15,139,19,117,242,95,6,65,203,85,112,103,205,148,229,170,61,168,180,20,186,218,23,147,115,211,30,239,177,167,184,168,255,10,198,224,180,245,125,77,197,1,13,205,172,18,223,236,149,12,13,134,68,55,129,121,70,226,94,175,10,29,172,5,173,192,48,103,18,131,139,64,56,10,147,48,121,227,236,147,28,19,59,151,29,41,19,48,215,32,230,162,50,1,253,87,146,134,152,6,63,208,53,158,113,136,123,185,24,6,31,199,254,39,132,188,192,159,16,242,191,253,9,33,242,230,79,8,253,75,252,9,33,105,252,79,8,153,254,218,82,104,230,210,150,98,237,211,41,9,38,132,232,118,239,25,148,24,38,95,207,160,44,137,223,206,63,
+145,223,2,96,234,226,245,40,94,10,71,49,166,164,248,246,53,108,80,75,158,77,224,253,27,153,208,109,130,227,121,16,212,211,93,99,143,235,151,122,40,115,157,63,142,201,146,150,157,90,90,140,122,154,145,144,108,231,199,238,149,187,116,25,32,114,91,198,226,37,204,99,177,234,4,17,69,172,148,209,199,9,190,170,168,186,217,218,108,200,30,243,230,218,237,85,126,106,154,76,254,49,243,162,84,145,35,153,212,36,45,79,119,80,138,239,179,240,77,91,9,178,106,205,234,123,58,189,219,197,183,109,179,189,64,232,178,184,21,81,108,123,159,164,71,201,12,93,166,162,107,103,61,142,21,244,243,244,116,177,253,230,126,120,130,220,25,246,105,239,214,77,88,25,143,134,155,81,7,173,151,39,241,161,253,163,139,194,211,187,192,71,202,108,160,141,94,121,184,187,94,69,247,220,137,222,42,91,75,67,249,183,82,6,91,252,58,237,180,76,100,149,31,11,120,35,247,94,77,104,103,199,209,191,160,121,91,14,93,208,92,171,166,207,167,169,228,114,207,23,232,72,38,216,237,141,
+89,17,117,63,15,254,61,22,127,236,234,133,154,59,235,94,171,202,247,123,153,5,246,208,143,238,101,6,46,17,85,201,135,96,71,126,130,218,237,34,247,190,63,66,182,244,226,106,181,116,244,109,13,149,147,123,26,169,200,174,80,48,47,151,244,169,40,29,229,139,10,247,159,150,254,219,64,53,78,190,232,85,157,69,166,165,108,207,114,142,213,114,188,232,237,27,220,146,238,254,167,10,171,164,101,160,96,218,128,50,140,41,187,57,140,143,88,182,228,102,17,24,142,149,234,151,181,143,5,189,67,209,17,1,118,19,214,255,211,185,44,17,65,37,185,95,202,79,167,62,46,82,123,134,216,28,89,249,94,220,40,124,244,157,170,183,50,202,3,238,214,244,201,116,158,91,17,248,159,188,248,30,132,56,207,106,161,64,175,116,170,192,28,172,20,69,238,122,244,23,161,161,188,77,245,130,81,114,70,49,220,251,218,179,17,58,134,227,45,245,53,197,48,53,36,51,41,103,187,70,232,114,145,41,29,165,156,238,189,109,173,53,13,66,59,36,11,202,136,171,44,56,152,14,8,179,
+29,95,7,144,172,180,201,225,237,201,194,63,55,180,222,3,153,7,57,170,124,82,160,50,102,84,72,108,139,19,45,144,147,23,35,32,244,16,116,131,240,116,220,100,55,122,33,254,108,34,163,139,205,184,78,82,174,188,30,237,215,7,68,102,115,67,28,57,79,195,33,22,158,10,150,152,247,37,113,101,96,173,232,126,152,105,24,33,199,121,194,227,56,128,202,100,152,226,216,221,211,92,34,56,246,49,219,97,254,168,0,37,216,122,103,85,39,110,26,153,67,76,99,62,137,223,30,108,47,105,78,227,165,34,86,85,223,48,151,6,236,55,95,136,236,202,197,237,152,198,173,148,99,73,109,8,235,79,73,106,107,167,109,17,252,151,68,66,111,13,94,18,137,172,226,171,41,149,160,15,193,102,1,23,57,206,64,173,108,155,34,97,212,115,61,70,222,32,214,99,240,171,113,166,157,164,171,105,244,249,98,51,195,213,147,181,93,252,57,28,70,131,198,79,208,125,236,56,148,68,245,139,195,12,254,203,106,151,157,133,65,136,102,182,75,149,127,245,153,122,130,130,21,209,246,189,
+234,136,159,60,111,156,87,31,87,220,66,226,32,39,160,208,191,95,146,69,239,91,86,108,228,68,51,223,239,235,241,254,35,95,136,221,178,236,78,119,68,79,126,151,159,26,150,201,188,87,34,253,222,236,154,195,131,231,187,115,123,40,148,99,109,75,190,241,254,221,217,193,129,82,131,19,188,218,71,215,35,186,109,5,180,60,148,135,101,156,125,16,213,214,166,15,112,138,255,172,234,246,213,214,49,238,222,110,173,183,212,221,21,44,213,69,173,160,114,105,233,225,68,49,121,198,252,238,226,250,127,60,208,222,19,217,121,239,228,129,238,201,117,3,21,199,186,196,76,96,100,71,119,169,229,199,251,251,144,250,81,180,189,39,92,87,82,202,188,159,153,53,39,6,245,93,173,232,169,170,90,227,218,240,229,219,36,87,207,94,82,169,235,235,174,73,195,89,229,244,69,41,169,197,119,134,71,15,43,162,127,230,199,93,186,238,0,224,191,228,28,87,112,14,211,203,111,221,41,204,204,24,100,231,35,103,60,124,215,173,166,160,56,156,253,190,125,214,25,138,115,122,73,5,9,202,
+22,233,220,46,123,59,159,85,11,186,85,225,224,202,151,196,1,128,249,1,247,215,24,211,165,254,26,99,106,195,95,99,204,250,186,215,158,27,99,147,225,95,99,236,73,243,215,24,115,133,254,26,99,81,192,223,105,174,12,226,165,96,140,48,30,166,36,206,95,108,111,37,253,197,246,105,1,113,37,219,222,106,99,155,167,115,95,203,102,243,194,18,202,225,112,104,30,44,169,123,125,125,206,101,131,85,231,215,43,30,146,201,46,199,205,52,215,84,64,42,152,172,212,239,94,147,176,140,51,31,102,218,38,82,66,63,60,56,157,204,166,156,24,34,172,127,237,116,248,145,19,255,253,208,41,50,89,143,69,56,78,106,234,208,118,91,216,178,67,33,11,168,106,62,161,154,243,91,184,41,18,120,202,0,231,34,22,90,34,54,167,134,155,217,219,0,105,240,62,110,47,238,240,106,194,135,207,238,80,242,166,190,184,195,226,205,59,230,14,141,35,130,55,51,43,37,82,122,206,135,240,198,169,153,14,39,42,197,140,121,127,127,79,142,120,60,243,88,177,120,47,142,82,179,44,229,
+192,144,92,248,190,184,221,130,49,87,31,116,187,106,126,65,162,62,55,203,79,137,171,24,16,253,119,86,106,52,110,176,112,209,225,153,255,212,225,37,123,33,13,182,98,38,27,93,247,212,215,236,237,201,42,173,80,212,247,229,77,163,49,165,212,166,169,143,70,168,111,210,137,234,148,120,222,170,250,109,247,2,200,43,102,118,116,15,185,74,156,77,135,83,158,186,47,19,182,23,138,45,181,114,5,205,248,242,33,226,106,28,103,236,230,216,155,247,169,28,238,164,94,119,153,218,193,163,180,203,212,142,146,75,161,40,190,102,249,93,149,160,107,200,88,42,149,170,75,34,145,160,207,135,18,183,18,106,219,63,112,192,212,127,55,174,196,243,99,14,246,93,159,7,112,122,142,191,1,28,227,221,121,0,199,135,226,148,181,0,27,122,175,227,253,57,30,9,211,175,48,64,196,163,4,230,168,143,28,61,216,142,13,150,169,114,5,197,210,216,160,14,31,159,140,73,124,104,2,50,168,110,162,189,104,181,230,38,53,129,177,200,205,183,199,47,102,35,81,214,87,58,67,115,195,43,
+40,195,3,108,2,248,175,85,234,167,171,149,7,215,190,153,6,61,63,200,139,41,200,175,64,170,66,145,42,179,14,55,72,1,129,94,47,157,233,40,152,241,9,95,97,21,53,23,59,182,3,251,49,228,230,26,186,35,31,207,214,156,71,251,6,175,109,94,99,240,122,132,102,237,7,171,181,251,121,97,70,129,248,16,72,168,70,233,163,213,252,199,165,137,173,163,151,227,210,82,14,255,83,114,238,140,9,165,182,203,65,206,31,26,245,223,42,37,72,37,205,249,20,86,241,1,185,240,175,241,204,4,254,26,207,56,252,95,227,153,238,248,107,60,127,93,78,143,176,131,178,203,233,17,144,112,127,57,61,114,67,96,92,78,143,224,128,224,229,244,136,92,204,205,42,14,146,14,102,1,128,143,127,103,97,223,18,241,53,99,79,255,254,245,226,79,101,95,82,68,150,235,155,178,213,219,205,191,56,89,95,77,224,46,238,180,162,107,213,103,77,28,32,181,212,39,46,238,154,188,182,28,73,61,86,39,92,78,145,82,41,246,127,203,255,167,222,224,243,101,138,165,80,122,237,169,
+99,81,201,210,234,2,143,205,226,130,118,123,85,28,120,125,41,150,131,151,47,56,94,62,127,166,181,243,97,51,27,143,224,248,33,1,209,43,87,96,60,57,4,75,55,76,141,55,240,122,118,174,187,79,56,48,138,53,144,27,34,49,151,211,37,227,186,227,19,175,253,75,173,32,179,59,104,88,210,89,102,135,72,153,231,124,8,112,72,177,103,171,28,187,1,215,21,3,45,81,28,174,211,45,203,197,245,224,64,109,45,0,121,121,174,174,176,191,106,110,117,190,244,24,95,148,108,255,75,238,162,188,228,46,198,209,44,207,125,246,221,246,170,164,236,210,116,187,254,186,30,193,44,130,221,188,99,232,65,94,227,181,222,209,124,52,251,215,14,117,114,206,176,115,185,186,29,87,127,243,41,83,165,13,64,119,41,20,181,145,157,245,235,254,104,48,133,242,162,199,52,117,193,81,38,159,158,194,127,113,227,67,228,47,110,164,22,135,149,118,158,210,59,133,112,223,186,232,163,200,100,193,17,214,204,20,127,11,38,31,152,22,105,250,249,27,134,130,195,194,157,34,160,104,15,206,
+19,29,60,121,20,219,194,190,199,219,128,110,232,130,89,157,183,234,33,25,237,220,58,214,46,69,74,213,196,36,246,223,252,239,211,157,189,80,233,189,169,11,248,198,173,29,255,82,95,192,252,212,189,163,99,123,118,21,32,86,22,251,140,71,178,251,186,186,9,246,242,19,91,4,50,216,62,57,77,4,44,193,8,32,6,54,234,44,228,118,216,14,255,121,238,65,121,62,247,128,189,212,93,198,223,50,51,23,55,125,63,82,136,55,11,231,186,176,14,181,11,37,133,188,140,233,81,235,93,2,211,241,15,33,104,175,225,28,167,3,78,8,124,231,9,23,243,110,3,97,38,255,98,72,54,165,139,112,198,80,208,146,80,230,37,252,95,122,58,37,6,59,108,138,230,19,215,66,40,88,93,232,114,159,236,220,142,46,180,24,76,90,191,140,136,99,25,98,161,23,161,190,17,159,133,186,181,19,68,75,163,156,34,247,194,110,17,156,5,246,114,14,115,126,107,235,211,60,202,66,218,25,143,80,89,115,191,39,162,249,190,50,126,226,45,230,106,182,73,54,145,173,171,103,67,82,
+142,64,114,13,143,161,239,92,220,114,126,18,192,52,186,42,20,39,223,209,229,6,164,108,101,146,13,128,154,155,220,141,50,23,191,172,28,43,197,226,154,169,192,205,74,141,90,110,232,5,228,72,165,8,240,105,183,115,233,64,148,119,86,222,126,43,255,255,171,126,145,118,39,139,232,60,89,202,184,196,65,125,205,163,215,230,105,138,143,255,135,141,55,251,109,103,75,175,197,254,149,31,252,112,167,220,116,124,157,24,1,28,4,48,144,135,32,121,200,75,158,2,195,64,31,183,79,219,39,56,238,99,244,57,125,3,191,81,162,36,74,226,40,82,156,39,77,36,197,161,56,207,163,72,138,164,56,139,162,88,156,231,73,100,113,38,139,51,89,41,74,110,223,235,32,79,42,21,107,207,123,173,111,125,251,219,123,103,48,159,50,254,180,88,89,31,83,228,46,248,206,62,51,4,84,189,117,67,109,254,84,232,251,220,216,196,237,88,198,168,127,255,154,93,22,229,22,248,148,189,218,222,242,57,197,240,103,196,13,133,220,39,226,244,13,24,69,220,165,22,56,28,158,126,191,122,
+151,193,185,206,135,139,121,111,233,204,230,252,138,207,105,233,235,26,139,119,29,190,189,3,248,60,190,195,212,81,197,227,129,97,247,98,157,84,180,26,8,94,234,143,77,82,96,133,219,31,165,253,45,213,237,163,81,134,209,11,7,36,159,169,127,150,108,155,47,149,244,166,161,148,102,30,17,239,191,246,129,68,29,65,65,86,83,156,154,69,60,65,231,116,193,34,194,37,96,74,63,39,17,166,215,151,87,74,90,212,133,243,219,158,12,119,51,188,53,204,26,141,1,212,199,89,155,84,143,41,155,164,127,226,218,251,174,100,27,223,206,246,37,200,223,191,220,235,53,254,203,189,46,221,127,94,111,112,247,118,56,187,213,230,54,136,254,215,139,21,214,160,208,78,215,161,231,164,207,191,161,77,51,225,98,243,57,161,88,23,175,12,211,136,209,60,100,115,109,54,83,90,112,225,253,120,194,24,113,215,233,7,252,139,17,152,145,79,94,35,67,54,5,175,145,58,26,100,243,60,72,142,60,191,188,56,240,12,254,71,110,208,135,146,182,204,179,232,176,207,62,57,147,249,250,60,
+254,221,185,120,113,197,81,115,59,101,182,236,50,93,149,125,40,189,18,243,14,195,143,241,135,202,230,26,126,1,244,248,136,82,52,192,141,235,47,197,187,7,78,252,97,231,15,217,46,169,109,90,210,37,200,249,120,148,139,72,182,158,243,89,24,114,223,165,81,217,232,179,201,128,30,105,233,50,186,81,53,40,95,221,18,201,241,113,242,186,55,150,37,188,145,227,51,40,222,191,14,97,111,196,129,64,125,250,162,25,42,233,107,249,135,228,33,178,63,77,244,232,145,164,181,164,8,97,231,24,137,210,119,171,162,200,44,111,237,201,125,234,69,84,74,47,202,42,49,124,249,6,60,124,196,68,239,155,136,24,240,217,2,186,247,126,166,18,247,161,19,211,74,3,173,195,244,164,25,1,116,250,126,33,204,3,166,137,155,167,119,51,34,152,59,185,42,118,96,127,88,199,117,27,90,33,26,238,249,238,25,85,200,146,252,199,235,230,58,27,56,125,109,207,42,94,195,196,198,32,187,198,23,34,58,244,184,243,39,73,242,134,153,215,191,172,155,227,254,119,89,94,161,164,15,244,
+243,203,113,91,254,26,187,219,62,243,102,84,121,169,49,35,57,210,218,0,199,127,54,103,240,74,115,112,179,120,175,118,7,179,148,222,116,249,10,209,142,172,236,181,191,106,40,88,188,50,159,33,245,25,205,16,129,205,207,104,198,32,61,144,189,26,106,173,243,254,57,109,179,77,187,155,113,22,116,136,38,246,156,169,116,8,190,228,106,109,16,131,74,107,230,90,6,165,241,80,140,115,119,174,181,88,173,219,209,171,162,28,78,221,103,136,163,24,160,185,179,164,10,220,216,249,107,240,32,233,1,27,40,142,201,225,182,45,59,108,9,172,219,178,146,129,178,198,166,94,212,123,238,172,160,207,250,118,206,88,190,55,156,226,40,43,183,36,38,232,111,23,70,65,250,141,25,190,198,118,8,68,98,115,10,80,240,46,217,196,12,110,83,193,88,30,126,139,77,123,188,188,163,240,64,140,69,231,143,54,252,165,227,236,227,84,245,130,133,220,139,183,242,187,99,204,111,228,164,105,23,17,85,6,239,169,200,21,34,63,108,12,184,250,146,239,158,5,42,223,155,22,218,171,73,227,
+239,204,247,47,102,61,134,90,222,212,94,39,55,0,209,53,153,20,184,189,225,80,204,15,188,3,252,167,73,237,250,221,193,63,45,115,93,219,145,122,174,195,46,45,100,49,198,162,54,26,131,119,197,24,59,28,183,138,91,50,234,160,142,138,121,184,209,151,115,34,27,23,199,65,44,13,185,116,39,46,100,163,16,215,138,46,74,128,190,106,109,126,52,187,128,11,167,42,145,248,4,204,181,136,233,227,243,238,50,16,95,160,42,190,248,65,112,214,180,141,73,21,50,233,173,186,249,244,152,84,120,92,97,40,214,174,101,108,206,48,174,113,168,11,159,96,29,57,196,202,212,214,106,29,226,49,158,195,18,247,63,223,7,241,199,115,236,244,79,150,123,3,26,183,95,247,48,138,62,89,206,204,170,124,178,220,229,205,227,39,203,53,113,157,79,150,123,58,220,55,115,96,57,167,251,160,210,57,199,202,231,207,235,87,236,241,189,150,31,126,13,198,211,60,244,51,5,58,96,229,243,56,158,84,112,40,105,252,129,236,86,61,215,148,191,194,152,128,240,43,140,137,89,99,62,122,
+91,20,19,183,133,165,38,255,34,234,247,219,57,182,209,84,112,51,60,33,41,130,243,146,240,90,43,72,108,250,220,171,161,119,230,152,250,232,207,150,6,252,110,167,167,22,195,145,151,190,186,162,35,22,228,85,205,109,179,39,209,226,93,186,239,45,233,76,219,107,216,56,86,239,227,24,165,175,120,187,204,250,71,212,36,42,208,243,154,144,179,252,97,79,99,47,11,54,33,39,48,205,21,194,58,40,206,51,7,25,18,164,74,18,218,164,39,0,253,148,247,52,47,221,74,125,103,102,80,198,58,166,47,61,183,121,76,191,24,92,154,193,133,185,204,216,133,123,93,90,52,115,177,249,240,148,116,130,254,237,133,166,177,188,50,51,63,119,29,144,111,227,159,187,14,122,184,249,231,174,131,103,111,252,62,134,13,193,106,86,24,191,37,9,215,5,11,83,172,179,130,119,219,41,12,29,147,251,113,133,5,176,81,125,156,83,78,84,2,68,136,131,20,193,164,48,167,21,11,27,190,103,19,242,244,229,138,194,115,235,154,103,129,55,97,151,181,70,157,121,195,20,35,188,169,75,
+147,134,30,173,116,174,208,31,168,169,133,179,9,169,166,242,126,166,89,244,189,233,75,1,25,213,242,7,41,191,69,181,252,97,229,80,57,53,51,194,200,132,175,127,191,13,4,73,52,107,96,91,153,21,188,51,122,79,204,96,169,136,210,166,55,179,121,157,1,241,75,33,126,179,222,208,95,59,128,239,205,42,122,99,144,239,72,178,14,80,185,199,222,96,199,177,2,254,6,223,12,46,92,32,211,202,112,154,161,220,150,162,84,247,38,11,131,96,144,72,145,78,185,159,11,239,209,40,10,231,231,247,178,218,45,18,36,4,219,154,31,86,214,101,33,155,158,175,247,157,148,85,34,193,189,105,111,92,78,196,202,15,58,147,222,204,213,194,27,5,125,214,153,245,105,69,154,63,54,123,195,220,164,189,47,141,220,197,108,124,194,84,168,223,10,225,66,75,19,66,63,235,155,101,32,95,191,218,3,158,53,73,246,46,213,77,79,120,194,244,213,226,85,75,135,61,130,226,101,150,167,176,4,230,93,90,239,90,172,178,129,90,129,128,47,104,148,159,8,232,140,86,210,31,98,105,
+42,82,32,78,165,250,100,49,76,175,81,85,129,82,162,7,29,159,111,130,136,136,242,178,138,20,228,219,155,75,233,107,95,229,176,200,195,102,6,205,117,249,188,233,49,206,90,130,124,237,14,9,162,174,36,103,65,28,207,42,47,79,101,199,123,154,90,247,242,204,140,39,230,27,34,113,140,231,189,23,81,211,62,7,54,204,236,48,231,186,186,229,179,231,220,182,230,107,153,49,87,66,213,203,73,27,90,205,68,146,178,155,110,101,148,139,178,81,61,84,54,116,5,49,170,234,225,114,179,191,125,214,110,3,198,34,167,162,225,217,50,75,43,254,213,240,22,191,109,102,145,150,99,76,187,191,215,228,106,157,217,128,136,251,152,161,170,114,11,16,201,203,97,12,6,52,26,148,225,133,233,99,229,195,226,195,182,46,72,46,78,146,233,136,35,29,89,185,245,126,140,149,198,112,154,246,145,250,98,95,33,203,211,136,216,10,170,24,101,85,104,82,203,189,54,150,139,214,140,38,101,233,45,221,162,226,242,97,232,209,222,107,175,12,152,167,192,171,71,152,94,119,71,228,212,99,
+149,206,225,230,149,93,10,230,243,182,188,2,222,199,33,124,174,48,238,94,61,233,55,43,140,86,18,185,209,7,232,221,91,41,3,40,224,57,132,175,245,199,215,28,54,29,186,78,96,11,97,218,103,20,225,230,220,118,55,245,100,99,98,226,4,97,109,123,190,58,151,37,88,213,38,9,137,80,80,214,53,131,134,188,9,19,143,244,87,189,117,215,148,140,204,104,121,83,191,176,239,110,222,147,241,40,104,159,70,146,113,231,198,70,96,232,253,134,155,206,201,193,121,65,125,151,233,193,121,65,125,23,55,246,203,47,249,56,56,47,73,108,224,198,130,106,50,84,159,149,191,150,59,195,172,153,18,27,71,185,200,130,89,89,83,134,249,35,123,205,119,212,188,72,1,217,73,151,230,116,129,60,34,79,28,118,70,201,110,59,144,205,50,79,196,108,63,55,244,97,59,165,195,134,190,7,241,59,74,162,143,233,117,144,82,36,78,14,91,242,109,135,96,240,22,118,89,30,133,19,74,202,208,189,81,200,47,119,194,187,190,183,66,100,44,227,62,120,96,179,239,192,142,110,68,126,
+23,95,186,128,83,89,11,42,24,253,215,3,213,195,21,198,202,94,224,238,110,237,126,192,32,178,191,177,10,242,207,21,205,77,67,108,65,165,50,108,110,147,208,206,114,141,22,56,178,227,14,46,38,153,108,163,104,148,232,62,27,170,89,232,20,163,188,11,54,56,181,243,44,76,117,66,89,254,149,92,162,102,72,122,183,23,155,120,75,18,127,61,201,76,236,47,195,175,240,27,206,243,21,126,51,102,190,194,111,53,122,53,209,118,55,173,172,96,196,183,199,197,29,74,101,33,89,85,138,140,70,94,162,248,2,90,56,157,235,97,231,252,163,169,180,7,252,112,77,48,195,223,44,194,110,131,231,241,157,90,181,182,61,235,199,244,165,80,240,69,24,75,201,23,97,68,157,40,97,236,10,169,231,233,235,41,79,146,157,86,109,33,10,62,226,56,187,101,189,140,83,87,102,88,34,112,92,127,148,100,80,54,149,92,30,167,194,204,59,89,130,195,103,157,39,27,7,208,73,82,134,158,103,127,167,155,55,251,240,71,78,176,163,26,176,91,117,219,167,4,117,113,113,209,133,28,
+46,124,58,122,121,158,22,228,154,43,105,106,241,122,17,184,150,236,92,25,62,100,190,124,171,144,128,254,245,94,165,230,145,225,205,43,108,50,168,12,217,139,8,29,7,109,233,25,148,155,53,154,243,166,195,177,80,100,42,53,113,45,135,41,146,202,108,195,49,162,244,93,35,67,145,153,97,174,93,135,153,159,81,60,107,39,60,217,229,78,121,239,210,135,183,118,251,194,165,188,227,14,111,155,221,147,246,108,28,46,251,112,102,134,214,170,104,230,66,230,200,179,29,37,181,240,24,17,94,220,65,140,180,86,226,41,237,69,187,102,70,126,134,32,236,97,71,229,51,40,111,40,168,62,88,186,51,244,183,202,77,181,1,228,148,213,220,74,118,142,8,175,80,250,189,4,236,148,214,172,82,49,191,101,47,28,179,206,221,168,128,71,115,187,88,185,158,109,49,81,3,151,40,119,216,141,162,28,102,166,34,55,161,113,95,158,46,77,0,22,171,22,85,230,146,242,232,41,133,51,218,2,46,232,168,97,123,124,75,107,71,121,250,190,176,146,131,244,207,123,159,232,216,89,28,138,
+250,115,242,147,236,245,77,140,213,151,218,49,163,58,121,52,180,99,40,231,203,130,60,48,76,212,150,135,133,110,204,99,148,244,185,126,112,131,77,232,67,75,10,128,17,126,232,63,111,168,201,81,236,27,235,244,195,121,59,71,29,25,74,53,135,193,144,62,13,252,205,215,50,220,177,236,203,141,121,123,249,114,99,142,195,95,110,140,249,233,203,141,185,76,124,185,49,205,183,47,55,230,195,249,158,206,237,94,113,227,53,240,136,59,132,182,213,135,216,54,143,52,161,1,167,114,217,102,139,77,166,143,61,35,62,71,96,60,156,135,169,172,114,175,24,140,154,172,164,31,239,150,141,244,75,177,158,195,126,29,135,73,214,191,142,195,92,10,93,197,167,195,126,245,200,147,169,226,120,189,59,183,28,57,242,119,109,191,105,243,246,175,227,220,246,175,56,247,35,127,182,59,175,229,217,133,43,182,23,140,251,146,137,212,142,52,92,67,179,1,236,50,112,182,143,220,20,238,66,5,95,100,53,56,142,125,114,125,56,9,45,123,156,64,239,133,123,235,152,189,239,142,0,5,140,180,
+74,41,10,183,101,38,50,218,160,208,50,2,252,241,189,135,239,100,156,101,159,22,113,220,171,44,125,23,58,7,187,155,238,208,42,177,158,190,186,79,10,91,175,98,43,17,55,148,203,230,194,175,20,120,120,114,53,78,220,115,157,56,50,94,90,45,56,190,27,199,228,255,127,251,151,168,100,13,217,74,150,165,221,149,55,229,196,182,237,142,155,76,78,172,154,187,144,217,47,232,98,240,162,187,72,15,150,220,62,191,194,236,24,169,192,179,216,156,147,242,246,80,203,154,151,72,210,195,62,196,85,190,15,2,131,126,81,107,100,72,164,247,121,12,58,0,116,165,71,196,120,6,109,251,124,188,239,168,119,68,253,51,165,87,112,216,98,120,195,156,126,70,2,160,206,208,134,131,178,129,215,148,3,151,122,25,83,231,6,151,252,68,243,244,116,6,157,75,83,15,111,5,84,243,91,243,90,209,179,223,39,178,130,93,91,116,127,109,59,57,88,248,194,135,52,252,102,165,75,164,245,28,134,31,146,65,251,213,236,73,248,161,210,179,15,238,131,1,169,64,253,237,62,77,181,229,
+118,138,29,46,115,106,177,206,48,231,15,135,155,96,242,231,93,219,227,243,125,136,72,43,43,98,112,193,39,238,224,24,224,41,19,58,181,24,11,206,25,205,114,186,227,82,225,206,75,136,171,81,54,85,202,107,72,145,137,153,146,152,27,218,112,100,99,32,184,50,253,145,250,246,121,114,216,150,90,44,172,124,18,68,110,138,131,11,136,62,201,189,138,66,124,190,132,246,250,176,36,1,73,90,79,149,0,10,116,241,219,248,176,70,16,216,34,56,21,139,195,82,209,134,149,98,250,114,181,91,40,38,198,133,249,136,207,112,189,93,158,63,216,149,244,253,107,241,244,154,181,110,191,57,119,93,170,146,46,189,92,226,135,248,119,220,69,86,68,41,211,91,2,242,227,25,219,152,140,92,84,57,119,221,39,211,213,4,57,87,50,103,5,254,50,88,12,75,183,213,120,148,130,188,58,55,115,106,38,122,241,47,251,160,60,183,39,98,123,89,254,252,246,164,21,188,75,161,108,22,184,116,41,183,41,168,89,85,140,67,53,17,227,250,121,253,2,230,253,15,183,161,72,151,94,219,
+208,40,171,231,244,53,30,54,204,227,5,68,19,210,154,183,38,193,205,225,8,144,23,50,105,12,241,23,145,249,19,173,164,5,118,214,48,223,223,224,136,228,162,55,154,22,60,227,133,55,216,207,147,38,59,20,174,39,141,77,157,160,20,70,175,133,207,120,242,141,238,112,252,118,132,249,84,229,5,252,195,215,49,54,207,233,167,42,191,61,183,124,170,114,20,179,159,170,188,85,96,225,191,54,254,82,66,180,2,68,246,34,87,100,200,237,168,160,208,199,188,158,243,219,185,69,162,154,123,61,71,13,167,59,240,101,56,255,24,39,212,132,191,12,39,21,131,89,141,0,138,135,44,232,113,94,132,25,15,245,16,36,116,172,188,249,67,144,208,196,93,38,62,111,139,57,179,63,49,67,111,165,240,173,120,134,218,203,57,106,208,214,209,168,208,121,199,42,27,190,142,151,128,89,84,156,223,14,189,250,57,209,158,56,30,74,31,7,123,156,169,108,237,171,148,114,65,108,173,163,74,179,186,193,155,51,26,82,200,68,78,35,71,114,117,44,197,8,81,107,105,247,159,127,90,203,
+255,18,255,19,124,90,203,54,105,240,105,45,81,99,73,191,71,173,165,178,21,109,168,253,35,208,16,171,30,86,23,48,246,147,101,193,75,88,109,76,52,127,33,60,56,45,236,238,94,45,85,114,52,131,200,172,155,51,241,51,181,238,19,214,148,243,3,80,225,175,176,159,250,238,43,236,71,173,145,191,128,250,80,81,78,54,177,238,152,220,228,204,205,96,183,40,155,183,158,83,173,75,136,40,205,138,247,250,252,155,131,205,45,202,118,181,183,231,183,231,116,206,105,126,193,114,239,143,110,120,5,121,246,36,4,72,55,183,15,124,220,4,248,96,71,35,152,207,93,191,98,109,147,8,161,35,205,68,96,148,214,61,36,154,162,179,42,138,206,79,173,74,198,237,26,10,69,217,19,128,18,120,35,133,204,32,226,185,217,35,243,152,68,224,35,213,9,222,169,250,198,204,58,78,156,91,78,188,157,202,116,242,50,123,161,7,143,177,183,39,188,99,231,173,181,245,161,186,81,149,111,176,174,227,107,158,30,223,48,42,220,76,54,117,21,36,89,58,20,67,207,244,65,205,124,80,
+49,181,113,64,211,34,206,131,146,80,12,200,229,187,176,195,61,204,15,83,112,60,42,20,182,171,129,183,100,114,83,76,33,50,137,160,223,206,246,5,143,160,246,97,103,27,1,186,100,146,2,170,199,76,83,137,229,160,208,135,151,152,39,75,48,159,126,123,150,39,93,122,146,131,56,224,65,236,13,244,148,241,205,75,111,103,231,185,13,239,34,44,198,39,18,123,15,131,59,6,44,193,231,116,90,250,44,176,54,223,153,220,228,26,85,0,221,156,163,199,10,213,111,13,244,52,205,166,63,53,83,108,147,109,17,154,217,139,189,220,88,239,176,84,49,163,74,70,153,58,233,93,5,253,99,96,236,242,43,95,12,207,224,56,11,132,140,219,69,78,87,154,201,30,222,125,240,214,182,147,233,108,96,70,47,236,185,40,11,51,56,169,239,124,211,7,165,219,144,193,84,184,106,132,156,152,163,207,246,250,117,50,108,120,190,122,158,235,238,235,64,205,139,197,230,235,221,220,62,214,204,222,76,105,246,88,127,80,203,113,174,179,130,166,84,35,87,237,102,252,218,26,4,246,86,219,
+51,46,173,194,247,11,71,24,194,120,43,188,19,73,26,194,130,124,207,114,152,138,114,161,90,21,96,117,54,65,110,162,30,53,230,160,160,223,237,61,243,14,84,205,112,44,43,177,134,98,116,21,221,85,118,100,163,11,166,174,55,244,80,125,252,187,121,5,225,129,44,250,42,191,196,4,51,103,132,52,231,158,225,156,133,36,26,73,162,207,67,97,174,172,177,29,148,166,228,84,241,220,186,190,59,79,28,99,176,3,238,150,124,227,209,73,22,103,23,34,223,225,13,247,191,220,23,151,253,60,152,202,58,196,177,78,177,11,60,160,22,159,80,60,231,131,219,13,83,84,132,154,9,225,168,136,151,153,171,9,43,3,131,137,184,105,230,163,166,52,109,157,47,115,240,234,60,125,156,61,196,215,48,21,198,8,224,97,174,234,239,149,57,233,26,253,23,53,217,20,105,34,70,172,151,196,204,51,186,217,133,166,180,207,113,233,201,77,41,96,136,38,3,5,115,33,127,204,215,193,154,147,196,54,49,186,44,64,102,107,108,115,113,216,207,127,91,217,191,37,168,203,209,89,166,246,
+222,155,181,11,225,37,123,161,24,10,19,10,149,229,145,161,8,41,33,71,101,158,229,47,86,231,53,157,147,165,15,9,178,52,150,149,152,66,149,240,123,7,178,61,123,231,129,168,34,39,185,220,190,226,247,56,34,231,29,156,231,169,131,212,253,165,154,246,129,189,52,140,48,218,198,133,43,129,66,71,94,172,21,137,14,95,207,111,32,48,231,218,102,187,224,223,101,249,39,123,214,162,126,68,65,60,1,121,71,14,237,90,4,143,253,195,31,158,38,164,30,47,55,1,96,118,27,223,148,95,235,185,144,245,192,2,249,176,87,243,232,133,85,112,174,138,62,123,176,151,227,142,167,48,105,143,24,31,185,57,228,223,172,177,184,241,251,7,185,235,239,189,202,62,216,86,133,104,78,14,197,68,112,254,108,156,55,122,37,27,41,221,88,108,229,114,173,74,172,27,219,199,90,151,22,166,46,139,163,215,217,252,228,156,191,44,198,44,146,227,113,40,18,210,167,54,196,69,30,121,132,54,177,180,234,76,56,44,91,227,179,133,169,180,30,237,120,107,215,174,177,92,190,63,245,173,
+247,152,30,221,172,98,224,82,120,214,230,182,33,160,24,174,66,220,196,201,210,194,54,230,152,208,210,195,200,166,13,235,250,164,88,201,141,93,178,206,229,187,96,79,205,151,243,225,99,243,211,198,246,220,207,180,39,186,0,163,166,186,202,171,29,37,98,74,127,83,44,107,75,154,241,185,60,39,55,117,168,185,125,31,42,66,186,205,194,249,96,177,113,35,184,34,167,19,39,97,242,145,55,67,73,159,232,94,151,149,252,192,1,158,157,205,19,189,228,243,207,36,200,171,187,189,255,136,51,106,228,183,143,74,67,167,52,176,55,31,93,43,61,115,79,208,172,107,211,156,171,251,198,65,167,249,88,87,128,18,111,175,19,29,209,74,171,69,193,130,92,153,136,108,100,66,74,216,7,6,54,167,126,191,15,38,238,76,224,134,238,0,162,120,180,52,108,63,215,20,122,151,130,3,92,253,229,47,184,2,138,47,184,206,134,95,112,221,245,15,112,93,154,201,94,213,219,135,110,189,54,107,140,39,245,169,149,93,152,67,147,183,17,48,214,59,119,61,2,76,88,112,97,229,169,90,
+152,65,112,173,15,102,37,215,172,159,226,199,12,71,197,26,8,118,108,137,145,214,161,108,54,135,239,130,83,107,28,226,22,90,226,216,141,161,74,86,208,139,194,41,177,175,173,151,111,57,249,143,108,164,186,113,161,42,118,19,56,106,35,20,135,104,67,108,228,114,230,74,154,101,57,195,214,227,231,155,215,58,15,5,47,138,93,227,1,188,40,118,31,15,224,69,177,155,62,128,23,197,174,129,217,124,30,62,247,4,14,229,234,122,174,172,214,147,119,94,251,110,145,213,147,169,25,197,179,85,222,140,219,122,116,148,223,228,88,89,223,84,192,87,92,143,234,2,68,200,188,73,23,66,191,192,111,202,26,230,24,235,101,123,118,205,127,185,174,36,213,46,242,51,230,137,212,208,29,205,57,227,1,247,19,217,48,151,134,76,152,225,146,120,243,82,26,222,60,237,217,152,63,222,15,164,198,255,203,253,64,58,181,138,169,132,1,161,173,32,15,42,46,110,81,156,191,116,246,205,171,244,186,63,78,119,67,124,69,250,248,213,111,174,126,34,125,226,166,29,161,126,111,255,75,127,
+103,159,58,40,73,16,146,216,252,57,106,190,49,194,2,254,245,233,217,102,32,108,216,132,210,123,101,143,170,123,246,136,87,8,99,151,194,171,116,76,56,174,79,250,177,139,24,232,163,250,167,102,159,116,4,84,63,172,213,33,151,140,193,224,48,23,43,95,176,166,161,213,226,23,186,4,127,10,212,91,77,173,19,241,107,156,112,43,167,126,180,40,225,236,113,19,46,181,111,47,79,227,181,87,217,166,21,95,214,244,239,195,209,56,137,208,124,198,86,63,147,61,21,186,228,123,101,191,115,91,18,97,48,230,4,142,122,93,213,116,131,84,100,122,111,6,65,155,207,70,226,92,102,9,16,91,133,244,67,49,11,97,173,67,85,112,229,198,175,147,208,3,42,95,185,208,5,87,79,222,55,26,79,142,121,31,28,97,132,241,197,185,73,16,111,28,167,67,81,162,73,154,190,196,221,247,51,17,94,252,153,41,174,225,52,94,179,254,86,185,162,44,195,51,192,6,215,37,59,55,118,217,157,5,94,239,231,143,41,125,164,24,215,170,230,215,176,12,136,233,8,101,45,223,153,13,
+168,244,135,235,54,242,142,121,48,26,140,7,11,240,120,226,151,27,173,102,172,213,192,113,84,214,244,156,227,206,58,130,215,59,97,76,174,18,40,192,161,160,108,157,161,56,126,12,5,76,152,39,212,234,197,215,197,160,205,52,44,131,196,220,189,200,206,237,42,123,25,195,179,227,102,87,164,46,222,204,117,246,109,81,207,38,50,105,157,123,42,172,17,55,174,224,34,44,119,149,78,149,162,213,54,158,149,76,102,180,66,120,157,163,62,159,114,202,212,91,63,23,66,34,3,175,205,204,219,208,158,211,47,218,208,250,248,227,180,168,88,91,55,150,1,209,164,103,96,208,30,48,212,30,28,47,140,37,167,239,107,201,27,117,4,89,251,136,204,242,69,202,179,90,34,38,21,88,48,60,51,175,198,129,117,161,60,7,46,199,143,134,51,95,159,197,158,16,170,20,95,171,16,129,180,137,20,44,211,216,3,108,216,215,210,239,211,41,84,215,15,5,150,26,162,18,41,163,189,183,122,206,200,130,197,155,91,92,196,224,180,216,54,51,85,221,191,147,167,177,144,155,255,24,198,98,
+212,106,76,81,110,241,63,64,93,128,120,150,183,172,54,131,249,171,116,225,220,122,98,59,111,96,136,227,108,186,153,92,45,111,81,138,140,43,18,148,210,86,93,105,47,71,148,92,197,50,46,61,212,9,95,161,134,185,101,175,201,243,89,101,115,209,153,231,38,132,150,85,119,9,229,220,154,88,172,18,31,163,250,214,187,127,112,61,35,249,83,37,172,86,198,202,123,120,128,131,132,249,172,74,8,95,74,82,253,99,104,117,118,214,169,3,155,39,152,68,245,207,239,43,141,77,33,92,47,75,237,248,136,192,126,215,140,70,81,211,112,97,174,167,28,105,197,118,99,82,68,12,107,223,122,157,118,248,13,152,27,66,156,142,220,250,69,193,242,3,68,35,146,140,83,164,154,71,122,118,157,150,191,181,228,151,155,156,32,81,239,69,191,12,247,0,5,63,93,79,57,62,139,209,121,242,146,28,137,187,180,220,129,170,125,193,46,63,180,44,224,82,4,213,201,156,126,209,27,200,159,49,99,105,14,79,15,74,2,1,180,254,229,235,45,13,5,154,150,48,78,115,116,82,130,188,
+201,50,90,39,64,220,179,223,140,185,220,221,51,229,150,209,152,42,79,95,83,118,225,189,164,247,128,57,190,228,204,39,133,227,147,143,35,23,70,120,182,32,14,251,241,118,105,131,16,115,41,189,36,178,96,163,20,7,191,158,8,28,14,254,115,202,133,109,189,169,130,231,75,6,166,145,40,24,246,161,217,186,243,114,147,166,105,58,168,2,224,96,160,135,35,204,147,162,119,4,189,237,222,218,175,10,124,226,100,13,146,32,55,109,180,252,212,3,45,165,10,14,184,246,237,151,155,121,174,238,177,167,173,60,119,59,87,141,158,223,158,60,80,60,115,213,125,122,45,211,198,146,137,245,109,163,155,64,201,3,229,142,199,47,153,112,116,213,108,204,16,192,229,42,111,37,124,251,6,170,158,231,212,180,67,28,211,18,241,120,211,221,33,119,138,84,134,194,108,208,246,60,180,43,79,117,85,158,159,83,56,172,220,111,21,250,25,176,119,227,220,105,17,8,5,238,72,167,220,201,104,80,154,82,198,57,128,117,209,127,87,15,88,205,117,226,104,3,29,189,97,158,166,28,43,168,
+250,200,163,160,65,49,19,19,217,243,120,48,159,22,80,135,189,92,231,126,96,45,40,1,119,214,154,17,121,62,156,143,167,74,195,53,175,216,222,213,143,48,157,10,69,237,122,188,242,237,43,202,141,191,45,174,127,178,29,230,137,138,143,64,185,131,238,81,220,54,168,150,2,158,98,246,160,141,92,98,33,202,213,225,65,193,60,70,223,161,79,13,188,165,242,249,157,236,54,124,154,190,59,161,160,143,89,165,153,113,219,57,144,233,196,109,120,56,63,208,42,3,159,80,250,14,79,90,123,161,150,94,15,84,78,98,7,134,154,229,125,9,199,155,250,168,104,70,216,19,202,77,206,181,30,238,122,185,242,62,27,40,155,86,176,171,180,90,5,246,42,199,158,92,83,40,241,128,156,10,162,146,222,1,220,169,0,232,173,11,201,33,208,214,34,247,151,31,56,200,156,139,114,200,202,94,222,182,44,189,43,6,112,243,104,0,187,57,51,202,198,150,234,166,123,187,165,177,88,7,56,116,101,199,164,37,167,93,142,221,8,246,110,228,114,139,203,181,0,134,72,149,4,55,99,73,
+94,49,50,213,135,18,190,28,48,103,55,231,29,67,46,21,200,119,31,139,73,250,166,231,120,180,71,99,248,208,189,35,165,4,72,239,205,185,114,99,171,226,88,242,221,243,77,103,126,11,174,212,231,115,253,34,6,200,35,200,182,98,106,43,97,199,93,190,237,58,88,146,75,207,203,241,202,5,4,143,175,241,255,230,175,255,234,231,63,253,159,190,253,243,159,255,235,167,63,124,251,205,119,191,251,246,243,47,223,253,254,151,111,191,252,211,63,254,240,187,191,251,134,254,255,195,223,126,255,187,95,126,248,237,15,223,255,254,219,15,191,251,229,167,111,191,254,147,255,245,167,111,191,252,244,235,63,249,134,190,251,241,111,209,71,244,225,119,127,251,237,31,209,100,63,252,230,15,63,126,247,251,111,63,255,211,63,252,205,79,63,254,234,219,255,246,219,111,255,132,230,250,135,159,191,255,246,235,127,251,23,191,254,183,104,6,63,163,217,125,251,229,239,191,255,74,252,31,63,83,125,251,155,239,127,251,211,239,255,248,205,255,243,195,143,63,126,251,241,135,127,248,225,151,67,98,
+52,179,239,191,251,253,111,254,254,80,204,127,85,194,111,126,252,238,231,159,127,245,47,117,254,238,199,159,127,58,84,249,251,111,191,251,195,63,252,205,31,107,122,40,230,255,91,219,95,255,183,232,111,232,47,223,253,130,38,68,235,245,155,63,252,254,231,159,208,239,127,254,246,15,63,253,231,239,63,91,243,227,15,191,251,30,173,197,47,127,255,237,231,127,252,254,55,135,150,255,237,63,103,251,171,127,221,99,255,39,90,201,67,101,126,251,135,223,253,230,151,31,126,250,221,33,151,95,255,201,95,253,135,255,238,219,255,241,221,127,254,225,239,190,251,229,251,95,253,234,175,209,146,255,221,223,126,255,219,239,254,240,227,47,223,254,234,63,252,229,191,251,211,95,253,233,175,254,236,207,255,252,223,127,251,95,126,249,253,143,191,254,111,254,247,191,254,247,255,241,219,223,252,225,151,111,104,115,127,252,225,231,95,126,254,231,206,251,249,80,205,239,208,158,248,237,15,63,126,255,243,183,159,126,251,217,26,180,182,232,96,124,251,199,223,255,244,127,127,255,155,95,254,226,95,85,
+231,127,254,246,151,127,249,195,63,124,247,119,223,255,197,159,253,249,127,250,179,127,243,159,254,199,255,225,191,199,96,31,176,74,84,21,96,223,118,40,118,48,75,38,175,231,184,96,61,248,36,252,133,16,59,249,112,146,215,57,45,36,4,79,212,71,238,231,217,145,31,127,198,179,156,121,43,35,51,129,195,58,170,82,206,88,15,74,54,9,116,143,11,94,63,118,231,72,251,144,150,64,21,71,210,154,84,101,46,132,211,155,247,230,53,92,156,23,185,144,125,116,182,107,55,88,108,65,115,192,62,59,110,173,89,207,254,91,36,193,47,38,78,18,227,173,86,123,175,37,201,101,221,205,110,31,183,58,216,137,43,215,210,87,107,165,84,78,58,155,142,172,62,238,201,98,42,53,157,28,8,23,107,111,196,70,165,165,211,253,247,192,182,213,79,88,27,189,192,152,186,232,69,24,132,137,40,189,98,14,130,140,94,55,86,210,112,10,102,11,219,57,170,122,99,8,143,115,6,29,203,221,21,62,99,128,15,84,212,36,83,206,32,55,181,87,58,203,61,241,189,28,231,242,179,84,
+22,59,91,145,235,68,87,146,254,75,44,151,49,141,141,175,101,62,192,20,94,233,69,150,86,42,25,15,139,180,142,92,5,32,77,50,182,146,197,153,159,104,219,139,229,112,109,18,98,101,249,35,97,180,12,235,211,235,165,36,233,117,237,152,2,184,99,141,34,206,109,145,180,58,78,45,237,167,44,133,142,184,188,108,62,85,248,85,0,97,172,220,21,58,107,175,105,187,31,239,75,125,48,112,95,104,213,95,158,9,87,239,66,101,122,127,90,5,39,236,37,34,83,248,30,161,169,4,111,212,189,230,58,220,156,100,97,91,89,64,113,178,2,238,133,114,174,248,94,153,222,118,99,172,147,245,152,134,175,170,89,118,194,25,214,157,243,177,124,249,17,45,109,209,142,83,22,49,233,201,147,185,197,218,67,154,32,171,45,25,180,108,197,145,66,215,16,110,251,193,132,252,4,98,136,2,187,133,246,99,39,155,204,133,237,226,216,156,214,53,66,18,179,102,32,204,173,214,23,252,225,82,119,150,72,79,146,58,155,66,21,103,143,155,115,217,228,114,117,172,42,192,254,163,246,60,
+239,204,211,206,32,172,187,210,135,166,202,143,29,233,12,234,213,133,31,83,146,142,215,48,71,253,249,121,36,150,142,12,73,219,212,50,150,182,59,202,67,234,69,163,214,15,170,109,173,146,42,227,7,151,237,176,82,26,205,157,150,242,144,74,241,48,12,79,123,193,0,232,233,241,186,196,224,133,43,216,82,21,217,117,32,57,136,151,112,227,15,30,192,142,42,227,249,136,5,127,197,52,177,172,139,172,98,175,196,83,131,25,122,220,91,81,47,89,104,131,13,108,199,243,20,42,42,119,219,82,80,148,159,91,63,116,58,96,13,119,218,67,89,222,84,126,81,104,206,107,243,241,188,14,231,245,164,44,100,63,133,168,201,244,123,86,53,100,50,109,186,215,193,186,174,162,57,92,222,101,70,110,169,149,214,54,23,193,16,219,215,21,65,216,44,58,135,64,101,169,96,108,223,141,66,146,110,1,110,60,97,221,214,114,205,136,22,202,82,244,37,196,219,235,26,79,174,135,175,187,175,239,88,233,201,100,108,174,53,124,61,86,44,21,220,86,179,245,27,190,143,130,207,150,183,187,
+253,188,106,70,148,200,2,122,245,228,60,215,78,153,156,169,190,220,146,47,194,180,7,150,229,200,83,81,155,15,245,183,100,149,171,33,43,187,38,147,201,70,251,184,173,151,100,64,74,47,95,150,8,55,219,4,115,218,110,201,25,0,174,220,84,192,97,151,131,99,213,26,92,52,155,48,93,108,126,176,67,214,173,214,5,141,224,23,151,120,134,35,190,103,33,58,162,104,212,0,162,31,164,154,183,162,91,240,35,82,108,220,248,185,143,225,136,238,20,157,235,221,26,137,45,59,131,222,235,174,110,53,172,150,245,58,109,147,138,199,94,205,197,182,69,65,56,9,74,157,228,136,210,184,69,26,210,33,223,108,218,131,23,167,67,193,114,12,69,97,219,218,111,181,192,37,91,172,167,110,106,234,184,178,211,57,244,101,226,130,85,211,154,66,244,11,110,222,72,160,249,146,16,205,7,191,174,91,176,198,64,70,106,226,104,213,84,212,174,235,101,241,178,137,15,48,4,218,49,244,86,55,57,167,110,191,9,95,14,245,188,167,129,138,46,143,12,134,197,216,214,217,43,122,176,105,
+94,221,60,244,182,133,171,198,219,189,156,53,72,185,241,105,29,184,119,73,147,32,130,47,49,123,43,254,154,220,221,86,249,177,247,44,91,142,154,54,233,201,184,84,180,158,170,196,157,55,153,254,74,20,111,26,236,53,215,19,58,46,145,242,54,231,152,120,172,209,55,191,222,1,203,109,78,216,181,235,196,119,225,89,64,132,172,2,64,57,59,30,239,152,243,2,204,150,150,69,66,142,181,39,20,11,148,251,198,59,53,30,161,0,37,205,106,16,144,60,50,119,31,147,190,41,174,224,77,195,207,87,233,30,104,171,120,136,184,226,82,34,191,2,16,82,189,49,109,17,110,167,90,88,185,207,11,183,45,137,96,141,72,226,169,193,254,163,190,95,20,181,205,24,100,138,109,71,178,232,66,81,212,110,55,205,250,208,178,188,232,57,194,254,65,214,206,180,110,11,209,180,138,131,181,116,251,92,149,165,245,86,44,95,145,249,179,167,91,50,234,21,54,194,186,141,110,154,195,237,153,177,125,14,214,17,39,15,32,157,202,14,117,207,203,146,11,191,138,94,215,229,100,250,193,5,
+216,93,157,96,35,4,240,200,176,229,157,44,220,33,35,72,182,171,49,3,157,223,140,50,128,165,139,119,241,156,155,242,66,184,202,56,146,195,221,98,77,106,46,134,230,129,100,74,184,158,23,198,46,60,244,48,235,20,147,76,243,110,219,29,243,105,237,194,110,57,153,45,226,2,199,171,107,236,135,76,124,229,118,124,230,178,116,36,158,94,94,29,99,65,252,8,216,6,162,139,194,24,121,55,185,70,179,167,98,192,128,44,234,121,215,78,94,10,184,52,219,112,0,81,229,183,110,185,191,100,71,78,189,64,212,84,92,91,65,36,145,137,226,215,166,226,8,124,209,38,75,232,104,159,4,24,174,249,56,37,197,149,147,27,179,9,150,16,12,44,141,1,92,251,144,168,134,161,187,87,213,193,104,137,183,19,236,92,207,64,133,118,242,16,205,24,165,109,224,117,156,117,202,101,101,246,81,124,140,111,147,171,234,151,3,62,86,220,251,244,245,20,217,83,143,222,156,197,50,223,89,231,218,6,131,237,27,169,41,44,30,143,87,174,8,234,124,134,103,139,100,123,251,49,233,68,
+200,17,193,124,243,140,147,154,210,241,115,193,116,19,126,78,132,3,100,123,119,158,191,101,14,50,211,240,245,173,181,122,50,214,46,71,216,54,160,225,198,149,237,107,184,97,26,172,117,181,233,194,190,31,115,45,166,237,50,219,90,20,25,206,249,64,116,111,2,6,2,71,149,23,77,243,159,45,147,84,231,62,205,191,206,185,228,203,160,134,155,81,218,187,69,75,64,169,180,238,40,71,166,30,154,100,114,150,130,235,138,16,252,138,241,229,120,122,122,215,76,223,86,176,194,71,74,50,191,85,81,182,250,55,188,226,20,229,202,71,148,60,206,53,13,243,14,242,210,134,171,28,137,150,119,37,218,15,114,87,192,81,71,103,33,176,103,126,188,103,133,188,194,18,202,55,130,59,90,160,248,174,31,191,19,235,67,235,80,144,72,44,175,210,36,130,112,31,93,86,211,46,207,238,163,201,45,239,215,226,16,219,208,144,176,211,52,157,60,198,81,24,214,99,111,22,29,37,1,128,8,29,252,35,240,125,132,67,148,76,69,217,190,190,47,102,239,211,64,97,233,94,5,185,42,231,
+192,75,57,13,244,51,91,49,232,112,238,62,108,208,134,20,67,102,61,239,126,234,207,223,150,29,221,102,11,68,214,121,58,204,86,162,214,37,133,120,151,243,186,27,126,101,155,13,79,248,199,120,247,2,172,249,37,1,195,18,82,204,12,186,13,136,87,149,102,62,33,64,114,105,118,42,59,147,92,222,167,158,47,132,91,196,30,194,194,73,156,196,147,129,156,244,203,244,25,223,93,81,199,52,186,42,172,14,17,53,94,207,162,23,47,33,167,252,33,71,200,38,88,123,52,155,50,176,220,72,167,78,181,175,244,4,53,246,193,58,115,174,123,229,152,39,214,241,212,171,100,35,253,84,221,130,43,57,198,57,185,68,81,90,192,70,111,217,82,211,226,131,98,9,91,97,17,89,59,106,80,220,180,227,133,174,233,58,224,194,238,149,128,176,36,150,145,227,24,240,208,82,21,227,8,92,79,201,215,166,38,20,95,247,239,219,117,199,192,132,143,42,124,193,248,173,22,172,137,2,249,88,65,85,227,17,225,248,48,93,211,88,33,209,242,26,186,40,200,116,224,184,160,227,153,28,
+75,109,37,225,23,199,123,155,112,97,101,66,186,171,141,202,184,116,11,132,251,70,155,184,175,55,85,254,121,46,57,42,43,203,125,155,171,232,234,71,63,132,142,169,2,75,230,25,74,102,143,183,26,82,31,166,46,214,125,201,230,246,227,235,124,252,57,37,148,234,222,172,116,100,26,160,146,163,67,254,162,42,245,13,133,50,59,236,160,73,10,90,146,6,241,95,152,10,46,120,191,72,71,236,173,238,240,2,171,226,45,83,111,253,11,175,146,99,158,117,187,125,92,193,56,30,38,175,17,113,28,10,198,180,31,217,48,252,86,1,174,182,242,88,14,5,98,55,37,33,149,17,95,6,97,81,19,72,93,36,233,57,236,31,251,179,105,89,253,129,203,181,237,221,221,29,195,11,242,87,31,67,6,67,48,41,154,134,197,5,52,17,7,186,13,184,27,199,113,90,134,19,136,127,108,73,150,59,111,225,150,1,40,150,178,155,39,130,114,172,121,227,171,114,178,133,11,140,91,98,21,112,200,199,230,51,243,161,217,59,217,16,98,115,231,252,196,181,12,44,44,147,17,98,194,186,
+106,102,33,27,156,151,23,73,1,14,47,189,168,150,170,151,167,242,163,131,153,36,156,201,103,45,30,77,185,106,188,19,154,139,84,92,80,26,37,219,239,22,148,121,235,241,121,144,86,118,172,10,193,40,58,201,205,227,198,16,174,171,28,173,90,101,44,151,148,86,205,231,253,71,88,66,178,79,106,169,151,116,127,3,219,76,206,98,79,79,55,156,208,140,172,144,185,58,148,197,98,124,110,29,208,44,74,90,235,124,211,132,211,92,213,25,203,177,231,29,165,185,175,40,46,73,122,134,147,51,217,117,54,170,242,114,83,177,250,84,251,126,39,174,218,151,184,101,99,56,151,83,33,207,145,28,62,9,166,227,199,147,32,112,243,64,71,153,46,200,186,27,179,51,16,180,59,114,62,225,3,32,33,53,108,111,13,105,183,176,188,10,100,54,93,242,89,215,104,85,237,103,212,128,159,209,153,45,154,177,153,52,190,233,73,200,233,43,248,34,221,143,239,215,81,157,169,183,159,218,122,237,51,82,54,34,88,6,115,1,161,167,162,90,236,145,194,53,81,197,230,59,32,246,20,107,
+43,27,242,240,80,205,58,76,10,119,72,59,55,230,156,205,213,178,102,182,73,84,235,229,187,79,38,148,151,67,251,57,110,45,137,47,145,70,112,24,229,155,7,69,180,107,120,246,113,99,114,225,29,18,89,203,148,129,134,83,56,184,91,95,138,182,41,23,12,227,74,42,79,178,231,122,201,146,100,87,160,196,177,181,19,128,26,203,12,109,50,218,41,151,149,66,142,186,119,38,66,209,142,55,239,219,222,188,138,19,42,58,151,73,98,155,220,40,76,207,180,18,227,248,42,146,238,111,55,71,92,123,12,241,157,157,110,92,245,249,28,139,44,186,71,205,50,82,47,77,21,62,174,196,72,90,165,173,80,72,243,81,59,149,244,121,109,246,59,103,213,187,139,93,231,80,67,117,144,188,37,97,218,90,235,88,31,203,197,59,71,73,159,178,85,64,30,155,231,168,166,230,23,4,162,109,170,30,144,40,237,226,164,44,173,237,202,13,188,112,211,29,116,69,199,118,139,46,50,94,187,118,75,14,221,165,234,40,220,247,177,173,86,159,207,172,132,144,112,225,126,143,55,36,70,242,
+93,222,163,93,164,145,217,104,33,136,111,99,203,194,78,70,23,90,27,68,97,179,125,234,117,173,182,165,124,42,109,132,95,240,12,112,152,2,187,15,39,88,247,107,133,223,234,233,119,245,58,92,111,239,71,19,251,134,12,186,241,14,1,44,113,175,163,47,113,103,95,50,49,47,34,130,162,11,28,55,162,52,156,82,184,183,127,156,5,119,42,174,170,208,230,4,119,204,168,124,96,234,109,246,204,62,105,221,201,115,50,225,121,194,3,94,72,122,197,148,43,200,38,79,241,78,99,68,177,175,127,192,109,210,18,112,13,123,98,223,253,222,36,48,117,214,186,46,97,161,119,76,26,71,185,187,251,54,223,58,153,187,91,247,248,185,48,107,142,111,94,60,187,180,80,83,46,15,203,198,242,162,140,12,223,172,180,21,68,189,151,238,213,54,3,252,250,4,105,3,18,78,6,218,222,179,113,201,242,27,109,60,10,183,128,150,226,220,225,151,61,211,11,175,200,178,2,79,246,209,59,26,167,149,1,76,155,125,255,34,222,143,79,76,115,231,222,230,202,122,250,193,96,177,86,66,
+188,165,40,203,94,89,181,118,137,85,73,58,36,143,154,69,210,94,166,47,12,166,55,38,143,36,108,22,44,222,41,249,61,84,123,189,46,55,192,124,243,168,252,190,65,251,233,229,160,90,9,245,251,93,255,42,77,16,206,157,183,23,83,167,29,21,60,117,241,218,105,135,65,220,72,204,220,87,38,215,139,76,84,128,108,26,249,18,193,182,106,216,36,229,205,61,212,112,155,162,253,133,164,254,94,50,69,6,59,164,216,40,133,253,11,39,117,150,12,199,86,167,18,45,177,24,180,78,77,207,59,46,109,174,236,62,196,172,57,184,195,128,219,60,189,102,2,119,238,135,214,121,123,230,159,6,74,41,189,105,237,205,114,149,69,238,99,4,34,206,249,122,235,26,220,115,99,153,205,34,233,113,152,120,206,133,97,24,207,109,212,11,209,35,44,9,168,226,164,210,115,186,13,96,247,101,161,35,93,83,24,134,50,107,31,163,1,187,144,26,44,251,242,17,133,161,199,57,97,183,1,107,173,104,229,6,9,170,136,173,113,183,93,5,138,40,110,145,214,222,140,226,86,40,106,170,
+240,198,11,144,141,221,49,252,213,233,98,207,242,62,138,223,141,74,57,108,94,229,3,252,101,243,158,55,168,143,31,22,46,253,234,174,247,49,189,97,14,195,251,203,56,50,75,237,56,39,181,149,105,43,4,111,3,140,51,20,169,112,251,138,239,226,159,201,223,28,153,143,13,71,84,199,75,81,51,228,231,211,8,46,74,108,63,106,176,9,9,154,211,12,135,248,180,137,164,160,177,32,59,218,70,229,218,77,12,67,254,196,250,136,116,93,92,137,189,52,175,191,11,210,241,124,223,210,219,138,152,228,225,158,76,67,118,103,134,25,33,150,145,85,79,28,62,185,181,179,177,90,166,37,169,113,148,201,151,117,216,49,31,111,44,78,207,76,247,138,4,55,86,154,201,119,236,233,57,236,219,150,157,163,194,115,178,222,6,122,38,227,71,243,30,191,89,20,150,93,129,156,12,34,29,23,111,239,234,190,197,72,220,48,105,167,240,145,242,170,124,178,13,216,92,171,8,223,144,233,34,124,131,49,114,12,250,234,249,86,209,9,148,95,48,239,45,192,93,176,149,249,112,100,167,58,
+79,71,246,211,143,218,115,10,233,3,235,149,35,239,180,79,130,165,211,184,58,213,90,191,40,104,42,133,195,18,100,51,155,52,122,118,210,194,239,118,67,1,133,47,36,172,63,106,20,211,118,142,242,190,179,241,118,87,144,94,146,90,113,219,234,232,166,126,42,122,207,48,185,89,100,124,132,202,28,117,232,213,239,207,99,85,249,152,19,17,143,147,3,110,206,92,199,210,164,65,149,195,177,235,222,44,122,75,191,15,65,39,84,212,193,156,157,73,29,74,1,82,29,251,234,170,204,8,191,182,86,51,60,222,216,125,31,76,58,213,171,9,223,68,11,148,53,43,134,45,39,46,143,2,215,35,143,161,148,226,171,193,238,198,192,1,20,182,254,19,177,21,110,145,11,171,144,216,8,197,51,179,226,157,165,252,106,237,46,19,242,18,79,59,207,22,16,138,201,170,202,65,189,25,115,240,110,95,145,3,164,213,88,65,46,109,142,179,96,13,156,207,214,22,208,90,225,47,116,10,131,200,57,20,249,221,120,162,136,25,55,234,206,169,99,212,166,6,80,247,59,191,235,202,203,154,
+167,115,124,170,225,239,26,165,180,156,40,233,149,203,77,26,153,101,184,163,187,234,225,64,65,3,128,153,102,76,8,74,72,126,165,121,107,75,111,137,91,119,110,29,140,111,3,105,116,210,153,229,247,249,18,45,47,228,242,159,173,246,134,85,183,87,33,239,96,64,122,160,61,87,212,9,153,210,219,122,9,107,225,54,15,188,183,124,40,57,71,216,178,38,218,84,237,237,206,176,31,143,33,50,39,77,209,195,151,189,168,136,50,168,138,88,88,62,54,19,174,82,232,66,125,179,169,169,104,52,241,223,158,141,185,33,215,58,114,216,144,121,167,60,70,10,122,242,125,219,42,101,42,249,66,68,238,187,183,9,76,21,157,168,57,158,116,55,22,73,108,133,52,46,22,219,136,96,113,20,188,31,106,88,91,71,29,56,163,185,80,212,54,182,253,96,174,188,107,100,239,37,131,182,110,191,53,245,236,189,240,242,74,94,22,231,202,164,89,234,226,62,45,48,25,215,171,68,157,233,216,35,97,106,58,86,5,165,93,7,151,97,31,193,9,1,2,99,211,189,220,98,62,153,208,96,
+69,205,12,194,207,168,8,130,115,161,143,221,73,141,240,209,159,108,59,141,157,177,43,179,183,231,206,86,28,197,214,57,65,49,183,85,179,237,108,247,6,222,89,147,42,109,155,21,205,207,9,105,93,227,178,205,214,212,210,235,137,105,31,31,225,7,134,197,243,114,186,216,14,186,219,119,231,16,108,19,79,149,66,231,102,228,8,147,187,117,164,224,42,155,76,225,132,171,122,34,182,41,134,120,29,207,155,70,58,235,242,126,232,122,233,111,144,104,171,157,109,165,20,91,183,68,88,5,78,202,211,36,185,47,48,51,202,227,201,102,191,147,43,229,101,88,61,76,203,181,200,48,1,106,107,56,122,125,129,140,20,251,89,124,237,180,36,109,198,240,85,233,64,148,27,69,221,210,80,169,51,116,191,199,95,114,48,135,72,241,50,85,71,117,202,126,155,118,177,13,36,203,46,224,148,151,109,245,230,206,38,217,183,196,124,149,117,190,8,76,203,22,103,216,146,189,183,241,167,120,54,248,52,129,239,194,240,164,74,154,105,205,177,10,98,29,204,227,129,216,182,120,22,194,147,107,
+102,195,120,152,38,163,237,247,93,112,45,74,243,32,217,156,6,8,170,77,50,35,10,244,210,206,17,5,192,151,131,170,144,100,223,231,114,227,165,85,226,69,19,47,239,52,103,197,179,178,33,169,48,67,154,186,2,22,3,124,216,198,137,9,188,133,133,144,55,95,238,238,180,86,54,72,189,241,17,238,147,160,210,228,12,244,76,204,102,124,48,159,78,225,155,124,9,7,148,94,70,105,124,214,14,9,235,254,161,5,159,87,14,215,213,212,180,188,31,159,105,122,86,216,116,239,212,77,45,102,232,217,34,60,203,193,187,125,200,226,84,183,249,154,113,190,116,171,219,31,117,134,155,249,24,64,80,177,214,68,4,40,33,104,124,198,246,80,211,202,216,108,241,77,94,29,245,218,119,130,222,249,48,18,59,61,231,143,249,150,94,137,72,83,141,212,205,161,250,154,69,0,69,126,196,217,244,86,232,108,110,0,193,173,11,125,92,9,68,36,203,24,119,200,19,34,195,233,243,150,43,33,59,7,205,90,212,20,179,107,252,72,237,28,117,71,215,155,129,20,187,145,204,29,17,184,
+171,106,38,29,233,242,112,41,151,139,231,150,94,99,43,209,153,162,220,75,215,148,233,185,137,177,178,234,98,70,72,203,110,166,12,87,105,145,59,34,247,249,211,229,25,190,100,31,140,131,91,34,51,94,38,155,27,31,87,162,161,224,44,59,241,71,153,124,13,184,118,223,214,219,124,243,253,138,183,51,161,156,112,63,149,58,234,248,125,119,90,223,22,247,101,91,210,183,32,115,210,139,201,58,61,207,74,1,127,14,231,64,218,124,195,126,238,118,184,115,161,7,180,79,151,246,58,6,56,139,106,55,224,100,6,42,133,58,103,119,242,244,58,20,110,72,181,141,78,133,164,249,38,28,99,143,192,197,77,2,241,222,19,46,115,2,247,205,167,254,197,154,154,134,181,34,121,39,65,230,206,74,16,91,94,201,223,203,69,248,125,104,48,199,133,171,126,18,87,70,108,253,17,100,116,12,250,103,125,156,29,202,31,13,135,57,231,144,152,95,72,173,131,45,185,89,87,41,10,86,103,94,148,95,172,215,129,100,208,3,7,207,209,89,159,63,27,223,161,242,93,176,66,27,208,25,
+94,108,84,142,93,101,238,226,195,11,242,28,142,42,109,195,23,120,135,115,168,108,139,81,32,182,147,20,215,78,175,81,176,219,84,252,190,13,137,231,156,166,95,164,27,2,111,4,121,136,195,98,191,200,229,205,215,203,33,117,67,98,189,180,178,248,58,163,110,6,246,36,13,219,96,206,13,82,89,72,214,110,29,197,184,74,4,85,200,93,142,73,166,118,172,133,180,205,196,129,84,36,242,98,218,190,47,20,93,165,233,228,216,225,178,111,228,99,87,97,204,82,15,244,110,134,68,132,182,27,106,168,185,82,199,102,68,205,5,22,203,205,189,10,122,223,204,92,11,133,107,36,247,4,72,214,143,162,188,167,218,246,48,34,104,33,203,107,247,66,17,84,158,207,199,47,97,38,161,231,31,39,196,204,162,122,162,219,78,77,142,33,47,186,153,198,50,66,222,146,11,238,226,75,147,59,39,48,198,186,180,58,115,219,132,26,23,237,33,146,119,27,188,195,92,125,9,168,30,54,35,247,158,44,216,234,42,88,137,112,86,9,18,85,219,143,6,86,224,156,116,92,41,201,96,106,
+43,208,202,115,91,189,188,118,108,234,139,101,113,203,68,118,251,104,28,41,66,11,225,98,84,157,238,23,185,219,32,234,77,160,142,81,144,93,143,42,12,129,134,164,1,134,148,44,155,177,132,143,15,82,8,236,120,164,164,39,89,182,242,137,251,145,90,127,40,133,35,138,68,142,202,59,221,89,207,210,20,210,89,132,214,129,165,79,123,33,139,42,230,156,5,36,228,150,115,193,84,217,91,129,140,3,191,159,83,105,56,212,85,127,22,218,27,110,106,124,110,30,55,5,146,197,174,231,147,236,183,167,98,201,126,131,143,217,23,142,197,169,171,0,155,145,116,121,197,66,132,139,136,81,69,187,71,156,67,118,207,181,26,93,73,50,198,230,62,198,216,175,142,117,73,240,77,21,125,223,35,201,87,50,131,183,141,171,196,171,234,83,213,81,182,192,91,81,217,89,83,185,38,187,76,248,140,148,169,59,108,129,222,216,225,45,167,183,88,111,105,169,82,105,55,110,114,217,182,33,183,72,89,24,135,27,110,139,222,116,116,83,146,211,92,71,166,158,173,105,34,43,149,187,94,146,
+1,230,10,146,12,222,53,216,6,155,73,88,30,31,17,227,17,42,211,228,47,95,173,128,84,225,114,60,152,88,236,26,150,66,7,52,153,53,227,83,69,157,193,101,35,202,48,18,249,144,76,159,186,115,223,125,220,30,238,27,107,249,181,117,245,182,154,23,149,124,25,194,102,142,61,157,34,35,2,148,119,129,190,133,223,219,205,240,88,212,195,116,2,236,206,26,56,53,48,6,103,47,177,236,43,242,80,203,22,57,38,138,107,153,119,31,22,139,33,120,96,165,206,9,200,240,182,215,14,70,132,148,246,222,97,61,198,194,118,195,222,101,182,169,51,65,112,50,60,103,19,64,109,209,92,116,33,143,241,237,66,189,87,110,148,83,147,164,29,205,137,219,241,20,17,152,113,137,233,246,227,82,94,214,83,230,173,100,176,19,231,131,229,149,173,118,12,236,124,215,160,172,14,90,39,13,212,91,240,96,167,60,134,93,159,188,128,195,246,216,238,36,111,63,133,28,102,17,30,76,93,245,166,137,117,214,182,209,88,42,205,129,142,220,63,113,103,208,214,230,243,65,200,115,8,22,
+248,157,146,247,172,179,43,81,4,73,18,190,102,69,220,64,194,147,118,154,220,103,169,170,68,85,96,119,59,24,174,215,141,185,230,124,155,77,14,9,10,130,2,246,96,73,48,200,113,163,202,75,230,175,211,187,226,110,184,198,245,84,248,195,109,120,141,182,75,29,197,186,229,214,167,208,150,58,110,47,102,35,228,118,0,87,236,131,192,126,44,10,119,93,182,5,80,180,174,174,254,89,7,168,229,44,137,72,98,231,243,240,187,64,195,53,148,108,244,91,234,231,186,146,26,101,27,6,248,148,83,171,191,62,172,54,217,25,60,250,112,126,48,103,118,44,228,118,127,241,209,17,189,93,1,208,135,252,33,205,132,160,56,251,76,204,34,144,64,193,145,1,125,40,124,186,167,58,53,139,241,153,77,127,221,150,35,155,48,110,200,68,178,35,100,151,231,218,217,120,214,105,49,187,171,104,56,159,249,139,43,234,185,214,24,210,93,231,39,222,0,217,58,165,173,4,129,82,142,97,156,34,188,188,202,213,84,122,19,87,174,72,212,153,58,149,238,52,135,26,109,14,197,205,181,56,
+252,16,97,99,105,173,197,22,217,53,159,22,67,132,185,138,35,215,150,221,66,56,58,82,109,85,101,117,207,89,157,183,219,98,194,96,183,106,34,171,165,38,72,172,119,102,57,151,214,177,74,187,246,128,70,117,110,68,219,132,214,247,141,0,150,140,219,50,66,154,191,179,195,236,143,93,30,150,147,245,248,221,182,80,119,173,95,249,101,97,11,137,1,132,244,204,89,83,191,118,13,222,102,146,46,113,33,22,135,202,184,69,147,231,138,74,100,154,89,160,185,220,27,110,183,120,60,190,70,136,239,230,246,201,219,209,176,236,136,179,196,169,215,170,204,225,207,9,205,144,48,179,200,72,253,57,197,72,99,32,214,227,206,13,211,8,105,85,123,88,8,59,79,51,4,197,41,180,168,251,188,1,121,242,252,196,112,143,123,202,241,235,188,120,107,191,159,186,80,171,227,12,115,207,53,96,219,85,177,85,234,0,184,108,55,92,174,164,223,56,2,24,42,180,187,139,245,202,13,112,62,185,206,200,235,250,72,11,104,11,216,3,43,62,220,0,58,29,62,166,223,168,0,153,116,214,
+111,80,208,31,130,167,192,243,211,171,244,24,130,9,139,160,194,80,15,92,75,24,34,106,195,83,159,84,249,232,231,82,105,48,176,162,97,231,229,80,66,167,175,71,213,12,133,156,112,161,56,117,147,208,4,1,2,154,192,162,25,60,212,21,22,118,26,62,93,199,209,4,23,23,125,191,210,95,187,5,29,81,111,145,75,134,28,66,5,231,116,170,91,181,253,6,35,16,82,136,76,3,203,137,76,196,177,243,61,175,64,248,20,236,178,104,217,30,180,221,36,157,126,106,147,59,166,171,30,135,235,81,70,12,245,203,123,61,14,175,161,240,32,134,186,181,104,91,178,208,158,83,111,52,203,56,200,189,213,70,171,114,102,97,18,40,105,79,13,132,240,233,3,161,71,2,143,173,79,21,27,112,48,47,70,135,112,247,64,214,52,90,133,105,211,165,113,240,195,12,56,152,243,29,51,194,205,33,107,117,252,134,23,145,110,250,114,230,97,136,122,205,211,39,169,29,124,123,73,79,209,38,193,130,163,67,247,106,33,135,56,155,239,30,154,244,144,182,28,45,173,76,160,77,51,8,
+214,19,57,126,170,121,44,200,70,75,250,49,213,65,74,120,184,25,45,30,148,221,63,5,231,149,90,66,169,152,79,18,174,83,67,131,134,9,89,238,220,249,227,12,190,107,151,31,25,172,254,6,184,174,213,160,150,176,30,140,226,205,33,230,245,98,167,192,210,12,221,120,111,172,105,49,168,64,225,69,42,118,49,63,184,153,110,134,96,65,71,155,158,125,12,46,252,146,231,137,224,234,113,226,229,222,67,157,58,233,202,243,110,133,130,239,103,245,207,86,2,36,16,109,165,160,172,237,254,177,223,115,135,126,7,242,126,109,65,225,124,162,156,110,137,108,165,198,162,181,154,94,80,24,129,50,249,147,50,145,210,49,174,238,122,6,149,49,78,121,39,29,219,209,177,70,71,110,37,152,221,127,246,83,154,30,166,91,125,10,26,214,96,236,9,198,26,70,146,224,148,49,207,100,183,19,226,161,66,190,184,58,119,57,107,58,115,118,181,247,213,118,169,72,105,74,98,29,248,241,82,23,200,196,200,49,29,79,183,110,4,64,67,11,102,62,174,207,2,52,172,145,46,91,14,165,
+240,12,184,230,56,216,103,224,177,33,116,93,41,117,1,136,205,196,27,233,93,249,161,252,194,87,249,218,97,53,97,84,71,192,220,177,126,146,225,162,0,238,128,30,154,235,202,200,241,190,134,207,19,218,65,182,217,165,180,38,8,58,61,247,164,4,146,86,189,55,210,183,143,124,116,202,92,162,115,6,138,67,251,104,154,193,8,230,0,73,214,93,64,11,130,233,233,170,115,76,105,60,170,7,96,128,21,201,145,183,211,65,186,95,101,43,82,39,19,78,164,137,206,248,66,88,161,121,236,205,221,239,185,195,87,96,32,198,106,211,134,36,231,211,44,3,165,176,11,227,233,64,3,90,33,225,62,219,244,231,160,128,209,196,179,159,77,179,105,231,220,151,66,103,253,70,193,1,239,143,111,72,20,20,79,113,2,42,4,167,131,157,36,132,172,79,177,44,227,70,75,222,111,185,1,65,111,145,151,105,24,80,216,161,218,239,242,140,100,101,174,220,244,152,206,155,197,173,175,133,150,110,227,54,50,248,99,30,90,127,30,107,179,220,11,139,251,102,184,24,113,206,218,233,134,107,
+156,118,237,246,186,57,246,42,95,68,70,241,61,65,207,40,206,201,145,242,126,27,185,214,168,80,159,108,219,118,174,83,200,128,183,4,153,119,38,149,113,215,199,19,244,132,221,248,192,122,224,192,127,117,70,70,69,194,7,128,32,30,207,113,166,91,38,238,39,73,191,75,237,36,178,81,130,218,8,86,219,78,62,163,105,23,253,193,74,163,59,145,182,248,252,28,147,123,32,228,167,131,152,178,213,239,85,91,161,144,221,133,11,133,142,83,131,33,142,222,48,193,221,39,3,223,127,210,183,194,126,242,69,135,4,255,25,150,222,190,132,250,151,251,165,16,181,6,44,197,39,141,223,18,136,95,86,130,197,35,124,17,189,249,107,29,82,167,81,127,17,253,72,157,89,161,3,228,126,250,90,182,141,187,15,137,209,95,68,238,74,51,91,2,187,167,171,40,185,138,190,153,163,31,223,233,49,10,124,10,245,193,61,148,19,150,155,114,226,19,105,51,117,121,83,55,73,100,159,218,38,231,201,238,24,235,110,228,6,47,62,53,75,98,209,168,18,71,192,83,238,34,197,227,244,104,
+44,130,6,156,120,149,199,110,187,63,170,6,211,103,251,57,237,202,134,60,243,52,141,240,80,107,181,107,51,242,38,199,139,253,175,211,79,198,96,141,226,235,145,171,144,177,191,155,112,199,26,194,173,188,61,156,116,95,242,242,6,240,16,60,55,167,152,114,245,133,61,133,188,81,200,38,15,206,239,98,148,175,31,61,3,98,210,65,234,15,245,115,4,70,27,212,141,48,240,99,106,203,178,158,198,187,13,212,140,179,219,0,25,95,216,221,159,189,185,144,209,135,188,79,86,88,133,216,84,33,7,64,210,123,131,173,238,218,58,93,126,237,228,81,32,57,223,130,58,51,247,52,131,207,112,239,129,162,11,237,77,206,229,52,232,91,203,250,47,140,107,181,82,27,203,193,153,209,122,146,143,11,10,2,79,62,103,144,155,107,55,240,5,196,198,223,215,216,192,77,241,30,162,108,186,88,180,227,97,236,81,21,237,243,56,77,225,75,56,67,114,97,70,145,39,116,194,107,58,181,52,61,131,154,109,74,63,41,183,249,167,217,144,118,210,165,205,42,49,166,113,17,182,91,245,3,
+133,232,68,98,88,132,203,128,37,134,133,142,209,12,148,38,187,80,65,103,243,76,93,105,41,87,14,177,244,85,117,200,104,104,129,28,154,159,241,132,231,22,204,6,14,170,15,3,171,29,87,118,175,200,201,122,240,13,222,113,55,145,226,252,187,181,17,176,110,158,85,29,170,166,46,27,95,203,10,174,247,67,99,194,176,195,205,168,79,230,193,232,203,92,166,62,16,243,89,115,32,108,138,209,188,140,143,229,220,29,152,235,26,214,107,235,54,0,19,243,23,212,154,92,36,224,224,34,200,190,161,77,141,92,96,168,128,123,185,84,119,81,13,168,177,204,1,50,67,95,137,229,102,94,150,26,165,137,72,206,213,226,151,158,35,55,12,237,56,210,131,110,193,92,191,63,10,28,111,201,137,38,181,77,34,215,51,28,145,221,35,219,188,98,12,149,173,58,19,142,10,13,198,110,171,249,136,66,88,39,1,216,6,255,131,153,99,168,138,153,189,168,47,151,218,188,63,231,102,166,116,29,103,208,234,130,89,156,81,156,70,40,196,141,228,252,6,178,12,188,13,223,158,165,240,70,
+104,6,194,123,246,28,37,66,25,109,157,133,36,174,210,11,225,169,74,47,83,196,33,35,98,188,54,24,57,175,158,209,25,55,15,148,33,192,22,45,143,139,23,128,135,15,43,174,22,251,156,62,189,58,223,85,242,67,227,25,201,218,155,54,124,44,72,129,5,134,200,93,231,180,209,187,87,220,93,221,10,229,79,185,34,39,11,221,96,251,121,57,234,6,185,8,55,248,72,72,36,216,113,10,155,135,135,167,73,214,234,3,79,220,214,200,100,84,94,178,34,201,70,113,3,237,106,71,174,68,155,49,220,231,198,58,198,71,255,45,140,250,117,178,104,200,91,55,199,123,142,253,185,89,117,156,62,113,31,46,200,67,133,88,4,73,54,54,254,242,98,52,19,126,132,23,229,165,185,146,149,239,189,123,44,138,67,13,107,114,69,104,249,59,147,41,133,29,2,230,69,91,40,67,164,235,142,23,83,7,89,35,129,4,68,36,237,66,1,253,120,0,41,44,24,91,42,85,10,140,98,137,249,172,14,180,122,69,146,61,39,210,128,175,174,61,1,255,41,27,89,100,197,84,241,212,
+203,4,111,219,148,219,236,182,36,136,30,223,60,26,60,202,227,247,155,248,120,122,174,137,240,32,247,37,165,124,115,46,186,116,191,248,40,13,41,188,90,3,46,101,94,15,193,193,190,191,171,224,1,142,124,23,206,81,238,46,26,166,243,227,26,101,242,122,117,178,10,237,133,181,98,92,152,91,235,112,166,172,98,91,153,134,112,254,240,217,64,200,95,41,227,245,151,72,49,98,218,214,46,142,92,232,100,121,126,97,128,213,173,120,208,188,98,25,5,231,199,214,100,37,114,208,61,91,4,200,69,64,217,102,159,163,52,21,199,43,148,18,20,186,35,243,205,249,132,1,100,152,210,56,88,17,213,178,169,140,75,247,240,112,145,56,235,185,124,205,203,212,234,228,4,166,163,93,230,108,107,65,144,58,228,198,200,193,80,56,23,189,182,138,184,229,238,171,9,148,133,174,27,144,42,126,66,16,200,8,71,207,68,177,232,60,95,221,222,156,184,236,249,87,223,49,49,155,159,111,12,3,229,46,127,157,180,200,16,49,81,24,11,219,133,153,154,46,168,54,130,148,73,45,85,104,
+242,11,137,144,182,15,156,207,46,239,212,160,254,242,36,107,136,16,165,125,14,211,232,216,182,99,21,119,253,152,130,141,177,217,25,243,27,249,56,239,63,117,180,88,154,13,164,2,225,230,221,158,123,254,160,6,165,50,241,90,151,213,40,154,24,249,9,228,110,202,39,105,176,219,90,21,11,10,117,243,20,160,154,26,53,185,38,194,48,179,195,73,243,100,246,194,165,185,250,204,146,96,9,75,109,51,104,38,182,153,82,201,182,75,122,77,61,18,23,169,9,243,66,106,81,18,231,87,51,130,170,24,98,24,225,194,52,254,68,85,236,66,111,59,221,83,40,99,177,231,96,176,221,147,111,243,239,215,247,47,250,93,255,56,215,250,127,57,123,235,255,212,1,116,235,247,95,111,41,20,215,34,165,20,47,78,112,41,20,41,197,189,184,187,123,113,135,55,129,153,185,231,158,51,115,222,251,185,191,111,178,179,73,178,242,93,107,61,15,123,210,153,169,75,152,174,122,108,49,217,202,209,60,107,251,125,146,115,42,216,125,120,12,190,233,55,155,25,12,161,60,249,213,199,89,252,
+13,91,98,28,43,206,214,12,87,93,5,103,132,138,255,149,120,158,187,76,151,47,143,63,94,217,13,143,223,146,41,151,28,52,16,71,150,171,241,107,21,123,99,224,43,6,201,38,156,79,149,190,100,128,165,133,95,243,3,254,20,89,159,53,43,68,74,92,71,145,64,135,167,197,231,154,168,32,92,26,180,9,113,191,20,138,188,83,244,84,146,110,100,213,100,143,141,234,188,16,203,105,84,46,46,126,55,120,18,116,118,210,56,120,250,252,195,38,155,120,49,202,157,107,174,165,253,235,114,137,181,26,115,204,19,225,255,145,195,161,83,83,120,60,75,107,53,46,146,75,112,59,26,71,193,49,158,249,186,110,77,229,86,240,116,226,247,63,27,66,250,30,0,132,110,70,188,61,220,48,236,244,42,60,97,32,43,41,137,168,182,102,69,42,207,198,92,151,212,86,219,193,171,39,127,48,38,119,47,33,102,45,25,238,8,197,235,76,107,33,92,178,116,228,32,142,70,155,61,121,242,158,180,240,221,106,137,141,104,35,246,223,76,254,158,203,170,243,174,231,237,86,203,231,111,66,
+120,147,122,201,175,49,142,40,6,39,246,139,221,90,42,115,197,254,192,26,15,26,250,188,187,170,239,149,117,51,123,194,222,21,117,214,4,239,118,86,253,42,161,195,115,32,104,24,168,162,103,226,139,180,207,53,71,68,0,74,202,115,188,12,44,137,61,208,84,200,143,70,94,2,169,10,194,69,168,22,236,35,73,200,99,87,24,21,116,134,221,197,1,192,228,195,159,227,140,187,232,219,162,135,76,150,82,244,25,241,22,247,168,163,228,43,215,163,180,245,213,250,139,178,188,27,80,141,21,75,30,219,120,178,108,187,182,1,61,204,178,72,132,28,254,53,66,105,84,70,194,17,98,140,205,77,107,246,173,137,130,60,205,240,13,63,218,136,251,157,209,90,64,71,47,75,40,52,35,75,54,71,71,41,186,64,105,38,2,239,107,41,244,247,142,163,197,93,9,85,111,3,25,184,13,25,184,6,168,61,61,19,136,13,227,138,53,161,133,116,28,62,245,52,186,99,5,159,177,237,29,85,52,55,60,245,25,124,181,31,243,67,197,49,199,159,150,63,253,140,83,213,121,222,93,93,
+122,191,90,26,245,72,238,141,119,203,2,191,133,173,105,145,208,205,187,68,140,200,246,42,24,161,227,99,132,210,203,78,229,186,113,110,19,135,149,169,173,139,215,60,214,132,81,5,10,10,214,181,222,79,111,174,0,158,61,122,123,8,73,148,108,227,132,90,67,200,100,196,4,119,255,203,54,182,233,147,221,132,201,50,106,233,211,247,223,6,160,177,135,89,209,84,193,164,55,157,124,248,231,248,0,21,228,236,213,165,174,184,87,165,81,88,22,146,11,251,77,185,76,152,47,254,215,102,245,115,186,74,207,231,190,213,219,48,65,58,77,14,127,14,152,244,194,62,74,202,50,67,244,213,249,181,208,85,173,254,26,139,169,225,95,3,136,5,25,85,173,93,4,145,33,102,55,177,81,230,54,14,133,108,139,210,176,128,231,85,210,98,183,34,87,190,84,35,232,1,233,41,125,202,170,253,208,126,183,230,231,56,2,31,217,250,89,17,203,165,122,138,209,76,235,252,33,71,57,188,235,61,240,45,94,162,106,4,207,0,111,205,71,73,83,117,160,79,107,12,47,35,185,215,98,242,
+89,190,139,167,36,250,218,121,137,215,74,82,196,208,46,140,85,17,84,237,181,245,156,130,91,164,140,81,71,228,40,41,197,112,11,150,166,164,1,130,200,140,84,134,175,249,36,44,47,96,128,14,131,56,61,243,92,191,56,80,166,121,207,113,175,187,168,164,188,142,239,49,64,204,165,15,228,177,73,195,131,187,70,1,1,140,215,134,11,110,62,178,216,228,59,93,36,234,19,73,4,30,3,58,196,19,120,12,232,16,11,240,24,241,71,163,128,147,105,156,158,143,35,215,55,137,250,91,7,53,152,7,125,136,22,152,133,97,218,69,197,204,129,117,121,40,18,192,40,76,225,79,241,90,214,160,87,83,100,51,107,54,59,19,126,131,87,211,69,195,42,9,52,96,161,203,190,116,236,34,11,7,249,218,49,169,133,31,223,0,89,95,68,70,24,223,203,78,119,203,195,127,12,53,174,50,38,218,115,77,241,3,172,188,153,215,220,20,50,92,17,93,89,186,220,218,25,255,152,187,153,219,151,5,171,205,180,79,59,83,153,121,191,149,13,86,56,100,25,214,36,131,167,98,245,254,
+20,197,207,233,77,24,31,230,92,150,146,63,81,93,139,114,73,62,123,232,194,126,111,22,16,143,147,72,107,147,173,2,35,119,232,100,146,137,76,135,201,2,247,116,137,208,93,214,34,28,163,161,107,73,21,37,194,43,4,239,48,5,203,105,180,228,195,152,135,226,199,212,226,96,229,112,170,120,48,193,159,196,236,23,85,234,184,170,55,119,74,243,33,197,46,201,151,131,101,58,132,94,140,25,3,240,46,11,206,39,75,141,164,183,27,36,13,216,249,169,115,81,118,179,220,159,80,70,174,119,244,84,181,142,144,222,143,123,150,85,199,6,88,154,116,10,51,3,208,231,58,193,143,235,222,62,39,158,180,140,168,174,215,172,234,142,54,123,69,17,140,63,19,38,37,198,77,97,37,213,213,77,97,125,196,243,77,97,183,254,248,77,97,55,83,110,208,208,215,75,224,147,11,106,184,240,235,224,79,1,163,253,217,165,5,164,176,108,145,189,44,30,17,105,74,86,71,235,239,61,34,51,160,78,142,189,100,203,27,201,208,89,242,124,184,96,40,192,52,26,42,121,197,223,236,115,
+92,233,141,242,188,184,239,68,54,184,200,39,106,79,180,84,150,127,191,70,210,96,172,152,169,197,223,23,82,116,189,158,202,179,36,2,111,247,247,51,195,97,191,158,204,38,107,110,187,94,139,231,187,198,39,213,164,14,91,175,101,251,114,22,230,216,57,145,56,49,198,190,250,204,253,25,118,42,65,228,45,158,114,45,179,183,190,156,129,214,179,47,214,101,154,51,71,120,22,102,105,38,10,202,117,214,104,14,134,157,143,217,69,98,138,80,210,222,126,67,59,45,189,170,2,79,244,77,185,228,177,95,38,131,116,74,45,222,9,125,98,129,248,173,241,59,175,42,242,95,51,248,181,245,105,58,48,189,24,211,39,17,143,15,206,37,60,108,199,177,98,142,22,92,87,138,121,64,52,28,146,145,49,62,227,63,217,237,239,199,252,104,212,125,47,137,205,214,220,213,246,97,115,244,47,149,223,99,79,193,119,24,209,28,83,84,180,15,214,63,12,137,254,49,240,117,36,187,195,158,158,14,176,170,193,219,75,143,43,81,106,145,126,73,130,122,72,134,213,213,7,94,22,163,164,229,
+0,185,165,170,128,101,109,58,213,81,67,159,87,30,5,69,241,72,70,88,158,181,217,106,53,24,91,211,152,112,166,121,7,199,126,155,47,197,104,78,149,141,53,243,223,118,102,220,90,235,44,124,3,148,191,111,117,234,61,219,98,160,56,125,4,223,67,219,25,91,2,120,26,37,247,110,78,109,2,173,146,55,31,206,236,35,67,121,164,232,27,1,212,9,122,102,112,196,48,89,88,49,93,7,108,253,76,193,56,55,145,221,174,64,17,189,39,144,195,129,253,160,133,84,218,203,141,97,220,14,106,108,21,18,89,80,99,147,144,200,130,26,251,14,137,44,168,177,30,72,100,65,141,5,32,145,5,53,214,4,137,44,168,177,95,144,200,130,26,43,132,68,22,212,88,49,36,178,160,198,166,33,145,61,5,130,150,143,16,35,27,90,225,14,46,32,211,86,102,162,215,218,91,104,170,22,93,207,205,216,155,122,70,11,139,163,235,222,7,99,184,246,36,143,197,85,15,176,4,188,165,146,207,55,81,186,68,95,233,188,98,60,251,74,250,86,244,137,18,239,231,106,27,41,107,147,
+226,240,87,77,150,129,37,151,16,121,84,237,95,129,102,2,175,117,61,90,241,43,207,172,98,175,79,54,50,223,222,165,126,212,190,56,70,155,26,115,245,87,209,187,92,232,197,55,35,216,212,202,92,98,251,236,42,62,201,6,250,224,9,54,121,38,9,108,138,171,120,173,64,88,77,213,188,128,97,46,58,52,7,172,161,247,194,24,35,93,25,233,226,11,228,163,134,99,14,252,166,247,219,214,95,58,127,254,62,217,130,239,173,153,54,90,107,148,136,192,246,71,20,212,134,61,199,26,106,103,189,180,191,165,156,45,168,97,25,195,30,192,133,169,189,252,219,211,136,57,15,74,46,12,251,245,109,198,167,202,215,159,71,28,227,215,39,43,22,181,143,61,65,73,253,80,252,253,75,195,70,94,197,235,82,202,130,187,42,194,182,0,118,151,73,254,252,46,147,216,34,40,147,115,13,29,139,131,223,57,89,15,114,50,37,11,163,62,227,235,230,15,184,139,28,66,89,80,48,27,34,235,197,100,3,51,80,105,41,188,246,77,105,81,224,49,160,67,48,158,72,55,165,157,3,253,
+204,167,179,113,121,40,146,224,8,106,30,203,132,62,132,201,34,70,11,86,93,89,222,226,249,72,30,74,208,14,123,199,136,105,134,38,243,151,240,47,221,42,217,49,200,186,196,61,148,60,83,7,56,125,26,195,248,38,85,40,162,115,155,71,105,102,86,69,174,37,192,249,192,99,214,101,197,177,207,75,80,75,232,145,45,192,214,61,76,64,21,54,117,103,169,204,113,182,11,127,30,68,157,211,6,71,172,108,116,185,111,187,27,188,193,93,5,191,234,171,48,99,248,9,158,79,62,60,35,35,97,242,35,179,38,203,255,167,174,126,65,186,170,103,167,19,47,54,4,138,166,21,115,80,189,78,133,100,51,168,102,158,17,144,190,170,62,253,206,159,172,78,246,129,205,38,115,88,217,231,200,73,155,119,16,60,155,92,141,53,118,213,209,13,26,15,218,161,211,241,131,145,31,21,92,88,15,224,191,244,90,161,142,140,174,88,226,153,209,224,195,97,69,118,204,151,77,121,205,226,97,124,191,51,254,6,197,200,103,92,68,149,198,121,83,66,201,79,109,3,174,25,135,211,16,133,
+83,62,122,234,117,255,194,44,160,77,138,220,54,242,22,99,111,24,251,188,168,248,66,62,154,213,149,176,13,24,71,39,157,240,56,179,175,162,106,213,89,249,233,154,159,233,199,150,87,179,120,192,43,70,47,207,171,124,127,186,190,198,230,165,70,8,179,251,156,112,205,2,138,169,26,224,110,162,56,238,236,96,96,26,199,51,93,233,21,223,232,21,245,229,92,70,126,185,108,134,39,55,174,211,1,58,196,60,117,67,109,120,246,83,74,141,245,96,228,153,126,219,126,240,89,25,162,71,5,91,104,213,164,176,178,57,194,96,168,193,123,76,164,138,192,222,167,13,240,3,223,171,71,135,29,209,166,62,33,99,242,46,96,161,68,5,233,187,233,245,137,72,20,43,225,52,214,176,199,99,127,21,78,182,206,19,96,127,53,98,247,173,119,102,224,29,99,14,61,193,221,75,223,6,66,216,63,46,129,223,16,102,206,63,95,254,153,248,218,41,104,55,50,157,238,169,154,114,17,146,202,7,14,109,134,86,214,129,102,69,120,61,118,43,250,114,38,255,91,39,17,131,219,204,131,81,
+55,166,85,242,88,159,6,148,253,199,53,147,195,99,75,67,208,157,143,216,222,229,150,158,191,203,237,242,75,194,241,226,91,84,160,152,8,115,80,161,85,202,107,74,115,13,138,53,103,157,147,103,253,141,90,224,173,168,200,41,235,45,174,135,11,247,234,144,79,169,82,140,121,52,210,80,90,167,139,125,124,87,101,108,120,59,126,179,250,75,215,151,106,230,114,202,172,226,244,146,8,204,167,56,110,175,216,26,195,184,138,174,139,129,54,69,171,84,231,109,24,128,28,183,23,67,47,56,128,5,219,212,1,123,139,241,107,74,173,38,12,116,183,253,83,202,214,63,1,41,5,58,193,164,49,55,202,124,23,125,136,78,89,233,197,53,84,79,224,151,56,105,53,85,230,108,168,228,47,88,28,243,47,81,138,206,13,213,45,190,184,120,24,242,22,225,56,121,95,70,222,206,240,239,232,78,144,206,157,253,249,118,168,87,96,90,107,3,23,77,118,158,21,224,182,233,130,210,43,65,82,80,242,36,136,51,153,28,164,170,4,157,14,158,253,225,184,63,22,227,94,113,135,8,207,94,
+41,112,102,114,191,142,228,54,234,242,47,93,49,81,210,90,31,68,204,72,246,166,146,100,60,153,207,65,43,50,110,146,170,245,158,112,231,86,92,153,65,114,143,84,222,75,74,76,227,111,66,49,188,84,154,113,61,138,47,127,24,33,108,200,62,128,181,228,56,232,159,98,201,226,16,250,0,93,205,18,245,124,10,222,0,56,11,38,79,180,65,165,125,29,89,171,180,74,45,252,214,146,136,121,73,89,184,223,3,248,150,95,245,11,207,250,209,59,151,132,200,51,232,75,196,104,110,181,31,82,83,179,152,146,191,99,208,178,59,95,47,129,117,111,185,243,208,95,139,66,138,121,50,61,76,51,20,25,25,203,148,163,251,174,6,195,53,223,41,186,22,124,24,201,255,169,190,202,143,129,28,14,73,204,46,231,179,215,171,91,210,24,245,195,34,83,156,60,159,187,35,30,29,105,89,28,238,10,147,134,189,229,54,21,15,156,160,145,104,159,104,227,168,89,75,62,25,219,155,215,82,104,245,192,198,179,31,121,58,154,101,53,90,235,255,106,59,58,82,97,251,210,238,228,227,118,
+221,81,109,99,22,219,107,87,160,185,40,136,206,166,141,198,216,127,108,241,165,109,124,16,192,252,42,54,112,80,173,200,109,179,71,149,123,23,206,112,202,129,87,226,222,113,15,167,165,189,51,48,83,185,89,163,167,198,177,114,140,201,7,103,30,214,119,1,212,79,80,68,189,47,53,222,15,106,216,229,51,92,36,133,228,187,152,192,236,241,88,24,239,21,94,134,187,136,28,12,210,152,255,208,228,239,117,20,155,222,35,107,232,31,253,135,132,83,196,71,97,190,3,105,40,100,0,157,8,252,231,242,196,147,62,243,203,224,49,160,67,20,193,99,64,135,64,129,199,224,128,210,189,85,252,236,241,219,28,44,194,147,242,190,139,164,246,16,250,144,156,84,195,193,91,29,235,204,6,175,187,72,252,146,74,87,25,154,171,126,131,162,116,150,237,43,33,18,142,79,7,228,16,71,41,51,187,192,190,160,64,235,146,242,247,184,59,178,96,37,86,20,91,77,28,213,101,56,115,245,88,248,232,153,56,68,202,165,116,250,62,72,90,179,136,173,58,89,200,233,37,204,71,234,178,255,
+167,231,124,6,194,38,25,82,24,150,58,94,225,163,33,147,113,110,47,168,235,135,77,37,4,123,70,187,72,251,204,219,8,8,86,217,151,181,134,78,20,52,52,64,202,61,252,242,117,178,196,107,33,38,15,114,126,154,54,69,43,66,142,21,90,204,12,94,233,85,246,40,170,238,240,176,73,135,58,61,127,160,104,178,56,191,112,189,167,198,79,113,127,24,106,31,141,60,194,37,13,189,181,107,228,159,178,242,150,20,212,86,189,164,24,239,79,189,132,20,139,189,28,79,199,251,78,138,143,175,166,14,193,141,81,162,236,241,142,243,75,95,191,49,163,172,117,111,72,165,116,10,169,88,227,8,62,4,186,188,62,229,230,106,35,92,107,56,202,253,142,130,70,155,236,232,189,77,51,61,140,115,228,39,171,132,206,81,109,244,89,45,164,47,15,163,62,103,193,41,20,74,200,112,36,169,86,148,153,230,173,105,242,23,46,197,104,185,33,159,115,142,248,46,142,227,155,229,197,162,224,100,206,231,49,141,221,100,237,153,46,114,61,91,101,102,147,132,199,73,128,172,139,81,227,12,
+45,250,242,136,154,136,14,37,82,26,205,4,205,210,52,27,30,230,195,89,193,11,163,252,98,112,132,82,200,137,84,97,120,36,77,92,234,8,117,22,240,243,232,149,124,80,241,199,181,140,123,217,135,87,180,6,87,199,142,97,239,189,39,107,169,43,122,129,184,53,62,95,69,212,228,68,215,250,238,19,83,4,146,119,125,219,255,230,28,61,254,34,22,75,164,167,65,95,131,130,186,24,81,19,116,63,96,224,63,38,113,139,207,242,130,198,163,40,189,182,176,47,233,216,14,21,228,237,143,59,255,11,42,168,120,232,218,116,128,82,135,145,45,8,180,17,149,248,58,127,196,175,199,143,238,223,14,10,194,1,76,94,161,50,242,169,115,192,94,38,77,139,53,99,55,110,111,96,223,144,161,146,128,94,182,147,104,3,241,68,38,175,34,49,126,208,186,159,206,212,11,254,105,48,124,167,41,118,245,48,168,168,90,155,220,89,251,45,177,35,129,161,110,142,18,219,139,6,70,215,31,201,153,77,118,57,40,67,118,114,212,22,239,29,53,210,125,248,240,106,250,198,225,249,33,81,
+179,80,211,208,12,69,1,23,20,94,210,0,48,103,209,116,249,75,157,56,98,58,229,38,161,75,60,11,27,36,140,164,31,201,137,1,164,244,227,25,124,6,228,111,35,227,175,188,14,8,6,22,157,128,78,14,84,228,41,214,186,248,12,42,42,205,156,34,234,150,231,152,95,108,83,58,24,63,120,110,164,146,206,188,26,169,25,24,203,184,186,20,228,50,81,123,21,119,21,77,87,252,52,35,64,12,211,175,70,75,95,136,200,194,172,254,5,36,158,160,118,226,77,137,60,68,164,42,2,57,160,29,180,24,63,42,123,99,136,201,111,227,36,134,17,133,159,48,245,5,95,209,117,144,146,144,40,193,160,24,45,19,188,84,83,236,131,210,83,10,202,1,249,12,93,241,43,68,36,41,255,56,92,232,207,150,227,146,160,164,205,255,222,5,204,77,89,97,4,60,53,244,36,252,47,221,196,0,27,180,97,130,114,237,50,242,5,136,120,179,83,160,179,205,37,243,178,55,180,116,21,74,22,194,229,128,42,61,250,32,4,47,133,90,182,239,234,255,38,68,3,214,40,200,110,20,
+20,152,17,98,210,42,198,95,219,90,118,141,53,126,28,144,95,10,205,97,248,92,205,142,140,24,151,169,212,122,29,250,211,228,15,208,197,57,146,97,170,61,59,24,201,6,152,224,132,252,214,90,174,44,74,31,161,192,87,225,37,2,137,45,175,208,206,224,166,214,5,56,255,126,20,253,28,229,167,212,179,213,26,175,231,83,18,73,132,3,112,203,84,6,167,125,4,10,78,5,11,113,244,153,203,37,50,110,101,21,224,35,151,218,164,100,172,147,253,50,189,66,96,153,217,174,129,152,59,11,47,138,52,217,172,1,243,225,92,91,104,77,230,172,237,101,102,222,72,198,89,238,199,199,233,100,46,40,9,99,255,173,161,124,99,135,252,239,34,62,33,231,64,142,155,106,198,222,192,17,155,189,131,163,200,123,3,199,180,201,166,244,10,30,93,245,95,168,93,25,217,176,66,184,145,231,125,218,1,223,104,215,47,28,52,250,229,155,75,167,45,120,32,175,106,65,246,44,220,57,50,32,157,221,108,254,63,249,149,134,143,205,62,157,116,184,11,247,8,94,94,94,60,243,248,83,
+188,62,140,104,191,194,199,147,248,85,145,59,203,90,124,20,12,85,88,168,201,19,199,220,33,168,200,10,28,82,61,9,107,235,80,198,95,145,46,235,144,214,1,53,72,68,98,87,40,180,180,17,181,97,233,196,23,252,59,177,12,77,5,42,94,120,66,23,169,161,60,232,224,127,6,33,172,28,114,240,138,117,245,234,46,249,18,241,237,218,197,227,18,63,27,70,206,113,231,102,76,43,47,26,158,201,22,169,46,107,136,225,34,29,136,236,245,43,70,29,96,68,151,131,160,232,199,94,97,80,26,15,174,159,223,234,163,17,45,200,124,40,59,195,192,101,146,251,28,55,156,158,215,147,244,91,138,107,252,216,62,213,51,113,141,191,127,21,86,103,162,195,214,50,56,60,22,176,187,38,200,231,75,198,126,147,67,160,141,125,226,20,54,114,109,216,50,40,55,114,98,132,144,171,47,126,160,64,87,79,204,171,114,104,83,8,216,103,131,219,129,167,237,96,127,224,59,31,190,153,111,47,23,121,138,251,247,85,94,147,162,36,140,207,199,195,174,133,85,239,159,62,246,110,81,97,
+135,86,228,20,177,195,59,229,76,35,250,5,246,250,229,112,44,26,35,165,16,80,173,154,34,213,194,98,60,217,125,106,204,211,71,185,147,80,216,148,35,44,81,106,5,136,157,29,203,102,108,176,94,123,59,96,175,105,216,202,166,56,107,107,3,230,174,204,118,109,94,163,205,171,84,43,39,54,197,215,212,113,54,133,106,245,176,171,92,174,90,201,38,203,197,141,188,177,240,236,5,47,32,107,30,33,216,4,21,62,0,193,38,200,154,126,8,54,7,30,173,6,95,50,13,67,43,31,237,139,22,86,41,51,159,158,177,170,100,241,152,62,158,116,115,195,68,243,204,197,209,11,232,201,138,114,182,125,182,129,225,172,39,169,73,218,115,243,171,57,198,120,140,240,255,194,161,211,169,217,210,184,26,200,214,194,147,239,67,72,28,99,17,72,147,191,23,46,202,92,128,33,63,177,232,153,166,237,207,153,212,162,206,140,235,176,96,89,219,47,196,76,224,181,204,43,114,161,241,176,217,170,182,235,125,33,156,45,32,140,202,62,238,69,193,228,19,18,74,132,23,74,8,145,80,120,
+250,18,98,58,161,240,84,188,206,84,91,151,180,94,170,13,170,71,137,100,117,92,248,162,14,178,67,155,58,163,84,141,65,200,4,25,115,175,172,63,53,33,237,125,205,214,195,239,184,85,202,178,244,89,221,227,114,165,183,2,186,131,137,134,37,65,18,15,99,227,210,30,3,82,172,121,59,55,248,6,79,119,58,63,58,117,116,135,5,229,249,252,190,118,90,128,253,210,154,125,25,184,17,61,14,40,119,128,150,153,214,79,24,3,1,2,59,241,229,230,193,159,93,153,255,226,231,147,2,74,245,49,43,240,81,28,194,101,193,146,87,60,207,242,160,48,110,194,115,177,210,33,115,225,185,142,72,154,134,53,238,214,181,156,167,253,252,101,142,113,225,11,3,154,104,22,26,158,225,184,236,118,70,55,93,7,74,175,167,144,89,43,189,102,24,40,144,109,255,93,32,105,55,186,204,254,52,110,116,89,220,237,33,186,44,190,72,90,81,22,118,36,210,11,117,73,116,67,161,20,245,247,214,236,75,46,243,129,215,233,209,174,221,19,55,231,111,170,47,189,15,239,187,201,213,101,
+143,123,129,159,172,23,132,104,180,51,250,42,144,114,179,77,190,118,11,87,237,222,5,128,100,234,56,179,71,149,216,245,149,223,189,240,113,165,78,207,193,66,255,173,208,90,131,5,37,247,145,245,217,63,243,213,47,255,114,210,19,190,88,244,27,68,101,114,172,248,179,224,87,37,167,117,32,118,48,49,171,8,84,45,21,170,99,70,46,4,254,107,18,233,21,162,177,143,197,254,221,65,158,138,196,166,246,132,197,74,112,142,153,80,251,231,25,53,108,126,247,64,180,140,128,108,9,161,165,30,100,75,111,32,119,121,3,217,18,66,203,26,200,150,16,90,166,227,228,104,81,182,218,183,172,40,215,37,87,190,142,30,151,121,233,168,197,226,62,205,135,106,254,214,162,159,169,59,99,111,158,36,153,119,50,110,1,108,75,87,107,215,100,88,40,83,131,110,230,159,115,139,31,254,189,25,247,82,30,50,238,212,246,203,44,234,109,156,115,220,252,117,140,169,214,2,211,42,107,198,77,145,104,252,116,22,13,37,156,65,241,140,45,249,244,87,95,171,121,108,156,244,231,92,225,247,
+199,112,106,42,117,62,1,104,167,105,45,31,25,69,23,13,252,23,86,44,66,55,33,70,226,140,184,72,233,232,191,209,69,62,204,70,35,142,180,129,250,125,172,201,245,99,141,11,26,64,32,241,253,112,9,255,144,168,143,225,187,45,7,158,251,247,0,180,253,115,15,64,17,224,49,160,67,96,110,190,62,243,216,28,77,54,240,188,2,21,194,244,204,229,26,22,214,226,61,128,106,67,146,224,66,45,192,88,7,226,80,54,10,69,163,6,51,7,6,69,163,89,70,97,202,154,9,139,88,218,164,123,81,137,2,218,231,95,44,36,208,182,59,102,190,211,238,152,73,145,67,152,137,105,166,128,236,183,192,68,201,238,219,233,109,204,192,118,192,206,95,57,217,184,144,138,192,31,22,94,159,243,229,23,103,163,247,170,8,236,144,232,118,155,122,26,250,82,61,149,106,206,192,47,182,205,37,43,59,229,13,25,31,86,37,75,107,25,26,245,250,1,239,208,242,138,85,241,110,228,179,27,200,200,135,35,65,36,140,24,122,21,195,11,203,221,95,56,80,244,188,201,7,67,149,184,
+23,215,84,54,151,239,172,206,238,61,88,80,75,70,166,236,174,213,23,13,224,108,52,190,254,104,179,221,103,82,50,45,130,128,237,226,38,180,155,128,162,79,198,126,138,156,85,243,196,182,111,228,170,180,48,13,128,39,195,142,12,133,167,237,48,227,146,104,203,146,240,178,230,42,159,44,193,201,219,217,166,49,245,131,84,114,113,56,23,77,253,226,77,15,46,240,97,246,167,23,202,200,151,211,140,228,2,140,144,207,32,104,78,71,16,104,138,60,120,147,100,205,89,224,242,220,66,233,78,154,227,87,136,52,71,35,252,162,51,95,117,143,219,195,193,83,178,106,205,25,49,200,60,196,139,74,175,115,134,212,40,105,118,182,222,134,237,203,177,186,166,178,41,69,158,217,40,36,6,109,187,148,194,242,247,143,254,185,27,37,23,39,239,5,20,83,121,47,160,210,197,154,136,236,53,17,186,82,183,21,88,151,138,86,193,179,196,49,254,41,114,17,238,174,142,93,104,189,182,222,89,245,60,140,85,35,239,127,35,160,166,178,39,17,210,145,63,87,31,200,137,183,173,6,208,79,
+124,32,112,158,234,116,31,247,172,68,126,51,66,136,40,25,89,154,25,38,13,210,211,19,186,123,250,136,52,134,220,92,83,227,163,42,150,39,18,75,207,193,119,3,145,185,123,62,61,156,204,153,115,20,135,249,98,230,137,132,115,38,19,126,48,222,156,123,197,167,177,188,113,68,171,199,138,183,245,10,207,8,255,123,31,181,132,250,40,80,82,207,210,57,53,33,20,217,123,5,157,153,64,35,44,77,224,245,165,95,240,240,142,238,224,197,152,232,248,54,30,143,102,162,29,54,243,141,58,35,1,53,72,157,188,143,162,97,118,163,78,147,29,184,81,103,212,214,179,119,226,28,143,208,167,221,43,88,163,1,255,205,89,19,157,13,38,167,42,157,32,243,173,156,202,218,214,0,90,189,80,182,83,105,113,52,64,17,179,236,30,30,120,24,208,243,97,178,153,178,58,243,56,194,48,25,88,61,93,251,202,97,178,195,160,45,223,19,221,116,246,104,233,208,9,58,115,11,124,122,106,59,5,170,31,165,72,73,33,42,69,219,112,54,42,107,240,143,111,79,163,66,53,43,162,163,
+183,174,34,98,83,192,78,187,5,101,39,190,144,61,243,134,240,44,2,147,165,85,88,51,150,83,135,87,210,72,61,82,7,253,206,50,93,26,201,38,75,92,96,38,183,93,252,79,49,56,206,167,154,235,60,230,81,250,166,202,124,62,191,49,54,31,120,125,15,237,177,72,24,186,16,188,244,179,77,200,62,66,160,79,233,234,252,170,174,112,161,67,58,163,62,212,151,169,185,68,1,67,53,149,77,43,17,79,239,130,137,115,5,164,151,40,11,224,248,133,176,19,48,110,230,70,11,146,39,39,209,44,35,178,243,215,234,187,185,245,150,228,249,230,214,123,192,219,205,173,91,63,218,160,91,143,204,60,234,221,64,164,65,24,127,158,27,108,147,120,63,238,229,6,187,9,18,50,234,179,34,197,156,57,0,20,46,48,1,249,177,177,112,180,91,105,135,122,69,249,232,196,139,135,225,155,141,144,248,234,230,223,43,211,254,40,93,30,3,42,132,226,165,70,219,94,235,54,7,125,88,220,97,142,138,248,22,134,194,212,88,241,210,33,112,236,229,107,238,167,105,116,127,5,95,105,
+5,188,93,224,176,29,106,106,180,93,194,248,136,234,8,86,56,47,68,181,140,222,110,118,93,71,117,199,43,175,84,47,235,181,227,180,126,142,124,222,223,105,141,81,48,189,87,155,136,79,16,70,65,22,29,220,96,212,128,129,96,148,211,124,197,192,214,32,140,146,214,127,181,28,14,195,119,178,131,205,162,140,171,124,52,240,86,116,240,101,9,52,131,127,32,55,174,245,36,108,242,94,7,33,30,239,117,144,138,9,170,33,212,40,105,40,119,131,142,212,196,110,141,18,193,240,112,107,148,254,67,206,73,139,107,178,83,164,19,150,253,144,243,110,147,0,60,210,130,12,223,203,13,133,108,241,41,187,72,55,144,183,118,137,68,37,221,218,37,106,190,175,184,43,104,242,214,46,241,80,133,91,187,196,154,93,132,69,218,100,122,240,193,41,231,151,95,16,17,99,85,40,61,170,102,77,67,129,210,224,95,146,70,250,114,151,10,143,155,83,62,228,8,158,254,22,208,32,17,37,149,10,173,34,76,78,31,71,170,53,249,182,246,71,159,175,254,150,103,205,208,237,110,178,201,223,
+83,193,236,83,46,230,120,220,54,198,31,215,251,183,17,195,71,76,6,5,116,237,158,213,102,242,68,238,219,232,31,1,212,58,164,248,127,245,250,4,251,137,241,74,68,160,174,52,242,35,98,185,152,26,222,57,111,230,230,58,107,151,95,25,66,238,40,149,79,224,198,125,96,76,36,71,84,198,15,189,2,169,128,114,81,180,18,145,92,127,64,250,201,145,92,162,222,98,246,87,192,153,135,231,13,239,98,47,147,227,247,144,85,239,127,119,8,143,1,156,53,224,246,223,128,212,224,217,111,32,32,109,81,110,64,170,47,158,247,41,137,87,248,180,40,88,110,77,126,66,113,250,164,76,6,233,92,41,167,234,84,179,155,175,141,174,179,9,209,71,113,183,27,97,159,19,155,207,22,239,207,82,59,139,92,83,198,183,147,166,165,185,38,134,23,118,203,252,131,5,29,88,201,49,107,254,185,99,70,21,81,218,197,16,159,232,196,139,105,154,95,128,102,185,153,154,231,212,171,183,41,249,194,232,76,184,45,85,146,202,216,26,169,149,78,73,1,247,189,116,176,145,241,143,70,64,
+199,55,72,224,187,224,231,230,222,243,225,195,205,189,27,28,237,144,16,3,48,139,210,144,44,197,154,100,149,95,21,77,182,161,1,141,251,148,84,168,7,124,62,67,208,245,122,122,104,137,76,167,23,247,170,65,242,34,79,51,199,14,67,54,188,86,205,177,27,153,254,133,64,50,205,127,55,194,200,39,23,68,166,95,177,249,141,76,155,47,92,115,193,154,215,88,196,123,155,141,101,131,241,90,225,238,137,24,40,201,230,81,56,65,62,147,183,194,135,170,168,24,193,89,252,59,84,186,218,233,105,110,46,94,160,149,71,84,93,184,85,67,55,81,249,144,67,134,61,102,67,81,105,231,20,158,170,25,32,72,227,247,194,20,253,25,189,210,26,13,252,163,190,51,251,40,108,101,75,91,86,171,65,244,175,194,17,80,213,194,190,241,147,22,120,155,192,230,48,245,82,243,219,137,13,89,3,156,126,206,77,57,141,111,18,51,248,46,43,59,78,250,92,196,98,142,68,102,190,84,254,81,232,204,156,191,188,179,112,81,120,232,154,84,148,240,42,195,159,95,228,41,73,133,102,109,
+165,84,224,155,212,217,50,103,76,200,245,4,139,238,142,17,30,199,35,124,228,2,40,160,49,251,200,44,237,89,132,178,99,40,171,34,69,79,222,207,61,113,58,144,158,114,33,61,213,151,116,226,206,124,128,0,245,244,40,80,149,149,94,53,239,77,44,150,149,237,115,49,153,42,1,1,138,137,188,174,30,18,80,36,233,36,82,141,139,195,199,40,236,251,46,174,170,0,11,48,142,157,52,158,244,208,131,30,147,78,206,135,47,125,134,32,31,255,76,32,95,0,153,196,30,43,177,211,28,219,164,138,42,231,21,76,118,45,84,199,149,26,128,55,101,52,22,191,91,24,166,97,78,18,107,81,179,63,189,199,121,202,92,113,31,40,125,60,96,123,153,140,115,82,3,120,109,84,115,73,129,14,239,4,139,30,203,23,227,57,11,170,234,41,161,167,247,81,71,115,115,89,67,153,206,194,141,170,55,184,146,244,78,80,98,159,117,181,168,231,243,160,32,181,150,164,52,94,208,235,128,12,97,79,22,206,46,163,97,51,132,201,217,94,221,42,155,188,216,196,34,241,170,247,57,255,
+152,169,89,3,252,206,8,192,143,98,77,22,188,253,125,221,21,125,18,17,112,227,174,198,205,214,87,213,183,150,73,228,121,83,81,213,151,6,195,245,58,191,3,171,4,10,67,137,129,156,97,126,7,86,199,245,14,172,81,40,12,253,18,77,163,113,222,101,173,169,59,159,77,28,175,175,204,82,87,5,140,26,237,252,98,215,102,75,171,61,35,31,182,235,103,29,155,147,62,15,170,173,176,215,47,99,194,137,140,155,104,0,145,68,73,203,161,231,150,110,153,178,106,207,161,47,150,249,73,242,243,220,109,69,93,98,222,117,166,194,140,24,206,195,174,66,29,113,130,50,145,252,187,72,11,11,156,18,190,226,7,160,104,160,188,147,82,179,190,199,181,56,155,181,89,15,1,177,167,19,241,124,97,84,23,6,86,40,62,226,55,183,100,16,35,79,212,58,154,135,48,254,214,249,64,159,22,191,60,241,252,82,22,2,138,50,73,80,238,4,42,230,35,52,60,5,42,166,65,206,201,54,201,223,247,28,224,105,205,129,176,142,36,120,60,61,209,225,60,41,140,207,232,130,12,42,
+175,3,149,37,97,247,148,87,60,144,100,53,30,10,26,205,146,223,99,211,31,216,61,54,101,76,239,177,169,252,253,239,226,62,27,121,40,56,70,170,161,195,247,152,12,168,254,152,182,217,245,156,7,255,165,68,23,105,234,9,208,177,227,45,30,191,37,79,66,27,253,85,203,160,124,184,165,8,152,13,60,45,155,50,227,137,20,6,132,30,191,107,145,69,165,104,206,236,165,11,67,204,101,35,94,162,132,65,143,108,207,95,61,140,133,73,168,185,42,138,180,112,51,30,116,31,44,77,139,2,79,44,113,84,1,34,202,225,148,238,148,132,245,178,252,125,37,177,24,216,231,74,24,225,22,228,131,138,252,7,188,108,85,60,153,71,73,138,230,63,234,46,103,78,213,70,80,189,121,125,70,39,27,81,153,100,230,84,142,198,57,214,241,233,132,145,194,170,161,77,95,214,75,186,41,180,96,21,22,170,228,21,51,141,169,69,115,21,27,66,56,239,2,195,188,27,173,251,109,57,160,202,234,96,116,180,169,116,104,157,83,190,23,249,165,147,177,148,11,242,148,177,93,18,85,200,
+47,150,189,42,152,4,225,149,124,163,87,59,123,115,163,87,23,199,196,185,228,107,151,244,32,53,135,55,179,170,44,27,182,84,56,38,5,167,161,189,98,159,43,37,255,122,16,147,139,76,118,217,214,75,37,246,21,199,35,115,88,56,116,188,207,173,170,204,196,158,138,188,12,63,5,88,250,157,88,191,169,204,50,91,212,234,248,156,43,219,113,85,153,31,187,250,96,9,217,219,37,52,214,247,71,237,116,0,209,152,82,250,134,191,116,132,182,192,88,176,77,211,125,148,49,130,148,126,20,244,248,119,185,205,218,239,114,27,18,8,49,19,207,239,243,154,80,26,154,140,94,156,97,122,2,77,57,6,25,197,117,190,244,62,95,207,164,183,106,17,38,211,194,101,164,3,122,74,137,41,19,109,221,173,170,64,96,36,79,27,165,30,94,228,17,199,247,82,192,121,40,188,17,31,84,84,150,144,176,52,87,165,181,110,251,251,229,149,222,2,122,72,114,157,166,191,20,127,171,152,203,236,39,255,196,188,168,70,186,72,29,151,235,122,196,63,230,87,102,124,125,180,6,11,104,223,
+95,26,207,93,234,233,128,14,59,154,39,94,197,185,148,30,110,124,199,83,49,166,111,30,91,10,251,95,250,39,4,167,10,76,162,116,251,90,218,253,123,207,201,233,166,191,200,236,131,148,81,100,53,141,199,241,184,31,0,89,251,175,147,57,159,159,139,175,93,95,146,129,71,138,252,9,177,197,224,236,58,150,186,73,230,236,166,142,125,131,46,90,222,228,209,245,140,181,102,252,40,218,164,33,209,5,53,183,8,137,46,168,185,20,160,22,86,73,66,103,78,62,188,179,232,16,179,240,24,59,201,100,251,165,186,196,68,4,191,208,111,199,61,54,149,163,160,216,148,86,7,254,154,121,173,149,65,195,246,140,139,103,224,43,215,139,156,218,161,230,11,170,252,178,11,122,42,136,66,248,175,32,202,135,103,12,32,248,150,252,217,26,56,152,143,192,82,151,173,114,87,148,168,38,219,253,174,3,5,233,17,106,68,104,127,16,196,130,12,155,131,32,22,100,216,49,4,177,44,241,166,210,30,44,187,32,195,166,198,154,100,19,100,216,24,4,177,32,195,154,251,32,196,162,61,133,
+200,7,8,177,32,195,106,32,136,5,25,22,151,244,168,186,152,95,56,97,30,35,144,1,231,25,39,174,81,105,166,24,118,174,219,42,28,200,60,69,109,255,24,195,127,123,164,200,242,12,197,2,142,108,105,220,26,150,72,176,179,252,94,12,56,201,80,157,175,77,157,94,126,7,84,145,158,30,37,149,165,185,32,155,50,210,59,38,98,115,51,23,53,80,94,127,138,13,183,33,198,122,177,153,150,35,144,243,96,39,65,56,146,157,4,75,67,123,54,72,206,110,250,201,137,198,18,212,205,135,181,220,1,237,210,73,38,118,99,244,152,144,86,150,99,130,138,65,23,77,65,69,93,105,222,234,78,19,135,79,157,19,38,182,79,88,236,146,67,110,226,38,252,122,114,26,120,143,193,42,154,175,210,227,115,194,136,113,134,122,39,179,230,157,204,209,133,24,35,183,148,150,159,39,147,142,189,177,98,69,73,43,155,29,56,239,210,108,120,246,38,158,187,234,215,146,181,171,35,166,139,222,163,134,49,198,180,29,115,215,197,130,47,144,135,180,53,36,90,148,83,54,185,199,44,127,
+177,122,249,51,15,195,31,213,1,174,223,251,130,61,129,26,74,129,68,20,212,208,21,36,162,160,134,254,179,15,162,40,238,3,168,223,55,236,228,100,159,33,17,5,53,212,10,137,40,45,90,52,126,113,47,168,174,17,227,233,63,220,154,166,197,247,109,156,85,231,200,143,0,156,209,241,136,205,46,200,80,0,64,213,162,254,93,62,75,253,133,194,213,216,236,211,5,133,171,143,136,172,229,62,54,149,249,79,185,170,186,48,125,153,37,97,237,36,234,126,190,189,91,139,31,157,135,110,45,190,200,133,95,78,146,74,158,163,3,205,69,41,26,108,100,198,34,19,1,210,166,139,225,27,3,135,43,126,86,102,250,157,239,241,42,193,87,146,251,150,219,20,12,105,196,133,29,11,139,160,121,248,82,137,30,159,224,66,158,13,122,115,4,28,249,112,154,84,84,205,75,5,247,21,189,255,197,145,106,29,220,203,207,126,111,17,182,251,85,84,174,164,144,93,42,132,75,184,128,81,224,159,205,229,124,184,95,3,196,26,122,154,92,187,201,228,23,101,134,53,42,121,222,38,157,219,
+114,99,59,139,52,203,191,192,65,177,169,199,112,143,77,125,148,123,108,186,159,220,40,149,98,204,67,148,250,116,222,103,33,74,165,20,254,53,111,186,186,81,106,41,183,190,81,234,70,55,189,81,170,219,189,132,40,245,68,246,124,65,99,80,175,226,209,208,184,215,70,27,194,12,136,81,254,25,66,209,98,53,76,231,42,42,176,91,52,180,200,164,254,181,115,214,180,190,1,208,218,139,198,170,82,85,244,46,253,173,181,155,47,224,9,115,232,208,9,23,0,84,3,40,161,99,229,133,34,117,144,227,165,166,70,33,236,139,50,171,125,243,180,249,47,93,68,6,158,155,38,43,70,130,247,213,159,100,101,69,163,243,92,44,32,167,238,172,252,114,233,146,134,196,85,51,173,234,226,53,75,222,82,90,214,81,174,220,252,116,52,106,253,105,221,252,15,40,202,77,245,118,120,127,96,243,169,64,199,89,149,20,33,169,185,181,241,202,250,16,104,86,16,206,18,181,115,183,241,190,44,104,227,201,195,241,43,170,135,197,193,228,164,188,84,81,204,124,23,101,232,146,8,55,27,116,
+22,41,240,244,180,215,97,33,237,248,148,14,160,100,52,81,248,186,37,163,175,25,229,184,81,251,252,4,84,32,124,226,133,45,158,219,125,178,209,194,239,17,220,234,150,140,110,198,229,91,50,202,153,104,36,72,33,236,200,138,190,47,195,171,174,77,211,161,107,138,21,103,73,125,114,40,69,51,149,95,44,96,160,58,103,87,54,41,221,107,55,130,228,126,166,161,207,75,195,146,59,117,48,121,150,166,159,18,235,81,191,135,156,188,34,123,119,242,164,199,17,57,168,126,24,217,200,45,110,194,162,44,235,149,52,243,248,223,244,238,30,156,28,151,18,32,108,158,185,152,42,41,157,108,58,102,131,95,7,191,151,156,121,231,42,238,211,175,91,99,223,142,249,255,144,139,234,161,92,52,177,44,10,92,63,217,124,56,177,194,3,98,149,47,200,234,249,40,79,127,207,78,150,55,91,59,199,3,152,207,167,115,228,171,16,83,34,48,226,236,118,70,185,190,121,73,191,136,188,162,110,241,0,222,229,151,38,171,82,227,169,115,69,100,171,39,187,8,42,173,9,233,202,216,164,183,
+218,40,224,184,215,70,104,252,189,54,10,168,238,181,81,129,86,51,165,88,243,81,49,143,142,52,0,77,67,194,194,15,148,37,166,199,113,228,186,37,58,79,154,46,179,77,150,169,165,58,132,64,151,3,191,209,111,44,222,137,194,184,75,218,217,95,217,138,162,109,124,249,166,219,209,180,237,12,152,231,171,127,199,114,224,253,171,154,74,123,198,224,106,121,153,128,114,30,110,25,221,237,160,174,200,86,143,227,17,115,43,23,62,88,104,154,236,240,111,55,22,5,86,113,190,244,195,27,147,131,90,7,73,221,163,87,179,96,210,76,26,18,119,166,67,236,143,203,114,34,127,205,248,107,156,131,0,109,163,28,125,71,114,207,208,246,74,51,176,52,244,16,47,74,61,159,140,50,15,39,112,202,145,183,151,249,175,253,122,212,83,163,52,209,95,156,159,114,251,41,252,0,72,19,8,232,177,223,45,110,115,75,202,255,57,183,100,133,204,184,38,203,109,151,243,88,47,236,201,69,130,68,48,187,167,75,209,35,23,230,249,175,68,167,128,102,27,94,134,255,220,84,83,209,134,223,
+199,246,201,125,144,13,65,52,252,239,60,41,119,191,215,254,174,0,10,246,1,195,40,17,224,103,168,224,135,160,137,124,66,86,117,244,185,73,240,44,89,215,17,148,206,173,211,25,124,196,43,145,90,71,4,15,146,134,252,111,24,40,227,234,145,49,65,207,190,181,246,168,194,212,166,15,193,122,165,143,194,135,235,20,122,11,164,179,147,31,43,177,71,167,202,88,251,63,90,217,30,234,180,226,156,238,243,111,140,143,50,219,224,254,170,101,119,60,78,228,48,80,243,86,142,197,62,208,159,88,181,84,56,142,2,91,96,16,80,90,220,0,82,145,91,171,78,188,234,68,93,183,246,129,174,85,66,180,136,75,249,26,89,65,54,152,123,150,216,204,244,145,44,28,155,181,45,35,145,150,237,207,114,67,8,227,42,211,132,229,71,174,91,99,164,96,57,111,141,209,103,241,99,58,32,110,163,74,86,124,71,203,117,22,170,142,34,77,153,209,86,74,127,164,155,10,38,243,111,211,85,247,93,145,8,161,169,189,56,18,255,37,122,71,183,193,7,211,217,28,188,58,215,111,206,199,
+183,47,154,102,97,28,190,151,206,235,65,248,192,231,143,24,253,89,209,170,218,102,55,50,237,36,104,151,188,143,123,144,26,234,87,204,48,38,231,179,79,190,106,229,133,41,101,44,74,251,126,167,130,252,100,78,74,78,74,209,187,186,212,128,129,90,199,245,54,95,150,231,101,93,145,40,193,220,183,244,103,173,31,22,127,138,38,10,251,19,217,22,175,51,111,137,241,172,37,198,191,233,236,137,231,169,23,154,63,34,232,89,225,77,23,79,126,96,187,31,76,223,190,185,67,207,211,119,178,63,33,252,139,113,249,254,182,165,144,209,192,156,88,178,142,148,17,254,33,132,246,94,86,143,122,206,67,69,106,246,239,222,167,133,237,122,173,37,249,152,157,121,57,196,226,72,189,1,186,27,64,22,229,174,162,231,43,212,22,215,1,3,105,84,144,99,191,52,116,124,99,97,124,22,166,19,162,182,159,207,150,42,255,45,239,57,37,156,21,78,40,255,31,188,151,158,189,179,115,234,188,43,238,155,107,249,124,7,239,136,253,223,121,239,103,208,221,91,65,222,123,185,241,30,147,197,
+166,133,61,58,71,93,241,158,62,20,59,160,191,54,183,122,161,13,234,159,254,26,157,31,99,135,52,8,25,252,16,228,213,129,150,103,1,222,1,207,53,161,231,214,254,204,242,178,123,45,174,172,222,107,241,244,244,94,139,27,241,247,90,124,117,136,187,138,108,201,143,82,234,229,102,193,215,140,125,7,61,21,33,21,62,99,198,23,124,217,80,32,180,68,121,8,81,150,243,240,55,192,167,148,109,25,234,184,108,0,237,141,6,5,104,199,136,111,106,212,152,27,54,23,60,195,252,77,76,254,204,117,127,178,31,251,112,223,33,71,120,14,232,74,138,49,138,87,44,172,101,27,120,232,145,114,198,233,111,101,128,233,12,206,220,102,151,17,250,156,102,186,95,94,135,202,244,129,231,75,67,32,33,125,85,78,108,217,248,82,252,58,80,3,148,101,113,247,127,203,35,251,224,123,216,243,127,207,35,155,132,228,45,143,84,201,176,137,172,116,212,162,173,227,224,133,189,158,141,18,28,50,179,131,163,213,229,217,240,170,20,19,184,40,110,9,60,99,148,220,23,132,242,115,236,118,
+128,87,187,19,4,118,162,10,194,218,102,82,60,230,125,156,44,185,108,174,254,119,223,139,138,207,9,188,185,143,22,241,76,138,70,19,254,139,128,187,131,154,136,119,7,181,187,219,149,178,200,136,59,168,125,120,239,160,246,112,207,7,57,248,236,29,212,210,55,183,235,253,217,220,220,46,29,254,125,115,187,255,115,126,40,200,73,230,195,121,164,18,157,161,220,242,199,220,61,127,60,168,109,217,70,248,34,98,37,243,138,195,127,229,180,71,144,211,26,85,69,241,63,245,53,191,180,115,110,127,32,108,168,7,246,135,95,170,107,72,193,63,251,191,245,223,134,91,255,253,248,175,254,219,120,239,191,213,181,158,158,113,214,4,100,244,197,223,6,139,169,3,185,150,142,88,38,160,206,179,63,246,199,188,12,68,34,214,71,247,51,175,248,122,204,97,178,100,13,93,118,224,27,43,45,29,242,106,162,232,185,175,206,208,235,84,12,95,46,124,193,223,137,141,172,54,39,207,95,132,247,51,93,159,125,195,115,166,22,13,221,81,140,196,167,43,86,48,161,10,123,234,128,244,205,235,
+80,171,65,246,71,149,149,29,20,52,20,244,206,173,114,148,12,73,145,212,139,8,31,22,163,80,172,194,50,93,73,111,95,210,115,72,29,93,201,210,160,193,29,67,245,76,27,112,77,56,156,11,174,117,73,55,239,245,76,232,186,142,137,7,101,21,61,13,181,222,248,195,209,121,107,189,171,85,236,173,245,158,236,74,183,214,219,249,37,191,181,222,169,149,11,16,59,41,214,177,129,125,107,189,255,58,38,91,217,183,240,162,41,175,104,181,114,243,55,162,207,245,239,27,220,39,237,95,121,98,247,165,19,142,153,123,250,151,50,66,136,77,83,26,159,224,247,107,132,27,199,125,145,117,30,140,142,20,4,131,32,255,12,236,75,30,63,209,18,42,231,21,242,191,124,217,180,68,141,169,188,174,240,175,88,199,249,28,175,58,74,118,42,157,179,215,183,166,219,211,35,236,191,213,190,73,179,89,253,68,234,144,63,39,64,49,71,79,28,14,158,131,224,124,255,249,241,149,20,199,45,161,134,91,86,66,186,185,37,105,239,203,237,29,169,23,86,79,40,230,49,76,86,80,205,164,
+118,250,40,212,108,183,16,198,62,78,175,178,194,149,216,158,231,133,148,102,83,4,220,220,176,155,49,66,16,7,50,220,23,4,113,7,121,75,139,209,19,134,171,89,65,43,188,182,216,9,149,180,187,189,235,218,239,236,253,253,166,107,207,9,72,215,56,90,76,135,240,108,45,239,147,66,118,195,52,93,90,55,217,229,202,148,79,185,77,137,71,123,55,102,233,120,14,122,142,14,251,10,180,166,53,224,82,203,38,135,230,156,144,12,74,27,19,212,54,234,233,245,75,144,144,157,242,225,61,165,149,168,241,206,37,70,119,241,206,208,187,17,188,69,6,126,100,250,20,67,21,49,39,127,48,130,87,240,231,148,97,191,217,63,117,87,186,238,13,11,122,216,52,100,98,205,237,144,165,153,98,150,65,15,43,135,214,129,92,136,249,38,244,241,96,142,193,23,207,109,44,209,44,180,193,241,183,118,219,153,151,43,184,24,61,221,158,147,185,138,191,91,148,146,102,4,228,95,166,170,47,33,135,196,14,212,58,25,36,118,160,214,141,83,169,239,213,78,34,188,190,1,4,188,17,6,
+231,2,26,58,52,249,67,47,227,95,76,177,143,231,121,3,127,49,97,156,7,33,151,76,157,63,51,183,45,29,187,128,165,1,211,76,77,116,49,196,37,33,44,217,8,227,184,211,54,166,25,59,234,28,126,152,95,230,208,41,247,98,212,17,159,30,121,11,240,205,102,93,47,205,2,221,113,244,60,24,167,225,105,107,71,56,80,138,160,57,116,119,242,36,75,204,68,250,247,143,201,37,31,88,83,231,89,12,107,83,124,141,177,116,236,96,123,105,57,105,64,239,10,90,87,211,201,108,223,202,169,1,196,1,151,129,27,254,176,188,195,167,141,182,244,137,158,164,191,141,25,206,222,86,148,124,79,126,197,110,139,11,59,27,250,214,75,231,24,160,50,157,92,207,199,225,43,51,83,205,146,174,156,90,105,219,230,116,211,140,172,69,48,76,39,66,174,139,145,177,82,90,236,214,53,1,231,213,65,171,225,181,22,62,103,39,38,6,214,104,235,228,227,186,99,127,155,146,236,10,184,183,41,73,155,247,149,2,77,73,170,133,9,9,63,254,147,65,41,135,80,137,61,99,75,4,
+1,159,218,171,213,208,215,220,92,227,218,95,110,145,116,73,229,247,82,124,161,94,131,24,201,120,183,248,78,228,13,176,190,139,102,69,223,106,152,217,231,189,134,225,13,238,53,204,233,251,94,195,192,112,247,26,134,242,143,57,73,205,211,189,134,49,32,239,53,12,15,125,175,97,20,158,123,13,243,244,159,122,109,187,224,190,216,243,224,186,47,246,184,238,99,66,1,250,236,190,216,19,133,221,23,123,50,55,53,204,116,63,82,28,20,242,177,47,130,5,136,191,29,240,93,72,188,165,128,133,129,254,150,2,70,165,161,91,10,136,152,127,223,82,64,244,104,97,227,148,126,197,93,55,53,247,183,149,211,236,199,249,27,243,219,130,172,254,237,72,239,199,78,125,98,238,40,80,89,157,234,24,8,118,132,13,184,180,83,64,139,62,234,121,146,7,251,223,57,78,35,234,58,255,43,199,61,222,56,110,105,44,219,143,67,221,178,20,251,44,14,34,126,173,113,177,131,202,234,215,242,28,205,234,2,118,49,248,141,12,249,183,190,250,199,247,239,251,106,82,50,12,75,83,88,218,
+241,58,126,61,141,135,60,230,38,108,74,73,146,254,226,189,118,161,252,126,67,134,86,8,74,80,74,178,127,145,22,210,104,69,238,171,244,167,120,184,165,126,43,182,229,150,250,197,228,135,91,234,71,93,74,34,160,56,118,233,151,75,161,17,250,52,227,59,61,204,203,160,8,164,133,68,46,45,240,88,26,92,236,217,36,129,49,209,80,178,49,42,81,80,121,215,42,148,59,195,243,112,252,118,128,35,50,255,110,206,199,137,103,133,52,211,38,255,39,135,134,112,142,85,184,227,156,59,118,199,57,94,225,142,115,198,224,29,231,0,237,149,35,134,72,238,249,178,186,145,92,223,220,83,230,236,229,156,62,231,127,235,80,189,115,184,98,194,163,10,75,4,175,249,93,10,31,145,103,85,57,249,201,152,252,81,198,58,138,241,79,209,240,28,96,230,208,89,129,163,173,53,253,242,165,159,223,69,108,66,14,131,42,147,191,206,41,12,85,38,155,28,126,159,138,11,124,226,4,237,98,31,173,102,107,165,176,72,235,16,150,155,123,255,44,124,89,14,105,138,252,167,163,109,50,120,
+144,43,237,255,232,159,115,140,174,223,182,146,178,143,162,173,38,145,138,44,29,171,139,178,147,148,150,187,2,250,26,81,226,39,17,41,21,3,26,113,28,230,76,110,229,108,148,20,190,199,117,121,172,220,167,131,236,100,116,93,180,210,52,116,114,51,212,229,1,29,35,99,212,193,159,74,27,85,124,31,160,30,189,189,228,231,252,5,93,177,130,242,165,11,105,90,244,170,186,100,20,193,11,83,89,94,177,76,191,250,141,125,119,209,52,178,36,210,200,145,11,124,30,229,180,155,176,153,120,109,86,65,193,143,243,255,40,22,211,228,244,35,250,53,71,162,143,169,39,149,136,48,52,89,77,89,140,142,98,250,225,97,196,163,95,227,220,242,91,252,124,105,6,222,71,75,190,194,214,23,173,184,180,31,1,252,58,149,133,215,189,105,84,110,209,101,191,151,168,226,102,219,87,173,16,139,203,7,81,187,196,118,202,242,175,101,5,124,11,247,153,5,37,34,3,237,151,177,88,78,50,212,44,63,114,41,193,69,149,165,110,67,162,150,68,182,43,202,153,194,64,41,80,80,166,235,
+184,109,197,140,26,183,57,157,69,254,24,83,227,55,43,20,250,67,169,53,138,102,138,117,190,32,42,149,248,65,35,215,221,14,248,100,231,218,121,32,10,113,12,235,180,201,224,253,216,68,181,150,130,181,76,23,42,127,115,81,159,130,227,42,14,46,218,227,136,73,84,204,81,167,55,162,57,65,12,203,141,151,185,145,86,124,255,182,253,6,111,129,73,226,166,98,155,126,2,103,210,92,141,179,220,185,104,94,104,48,109,71,102,222,105,27,218,65,105,236,13,194,249,143,61,22,88,82,123,15,111,189,72,218,149,22,87,70,169,23,77,248,215,102,145,42,203,111,143,6,94,8,158,141,98,178,115,8,220,68,214,194,45,56,131,202,102,104,68,187,14,149,13,46,146,228,177,217,0,232,104,220,253,119,39,242,189,130,224,67,137,144,189,125,207,224,65,20,76,240,159,253,229,255,239,190,194,190,37,79,48,14,133,13,113,254,128,69,136,164,52,150,243,125,115,156,121,99,226,230,56,53,133,233,205,113,62,181,220,70,216,240,159,123,50,118,205,63,247,100,196,157,163,31,8,158,
+189,10,13,125,94,240,195,185,70,191,127,242,65,239,13,147,29,1,3,78,147,104,56,80,41,97,140,224,71,80,41,97,63,49,212,175,103,79,160,228,211,108,248,239,12,179,3,89,249,53,107,143,216,62,247,179,208,145,49,160,234,119,22,132,252,229,97,148,141,196,159,105,216,23,88,126,33,91,100,41,215,64,40,173,119,55,19,170,172,2,42,35,74,4,162,88,77,15,167,38,1,253,185,171,234,72,68,11,172,59,121,70,14,82,200,96,224,5,238,227,134,216,157,112,33,213,112,199,130,217,234,219,120,208,136,127,118,233,113,118,55,206,235,138,214,202,242,108,252,22,155,44,134,251,191,143,98,74,250,207,125,152,10,180,15,67,3,114,169,103,36,246,216,226,236,190,244,172,78,220,107,211,14,163,185,225,66,200,119,211,125,138,163,164,137,156,242,247,82,245,72,86,123,115,182,24,1,122,169,99,113,72,253,93,84,39,178,29,124,253,65,191,86,27,152,130,183,110,134,146,213,245,104,253,219,102,161,51,137,18,216,68,234,238,199,79,76,75,97,100,229,184,119,19,180,232,
+226,166,192,124,79,131,39,237,103,243,73,3,97,25,251,243,142,101,189,95,130,101,241,247,174,24,55,240,247,96,237,66,185,7,107,173,63,247,92,58,54,88,63,175,130,139,134,78,196,196,53,183,26,33,241,251,218,45,175,37,50,141,149,158,190,237,135,252,247,125,65,201,82,194,241,78,244,193,226,97,214,191,250,172,2,106,37,49,253,84,103,148,38,40,61,83,170,171,88,45,12,127,110,185,221,169,49,141,85,235,214,121,225,48,219,156,100,118,91,63,247,117,193,167,188,221,254,142,201,143,186,8,104,93,144,147,217,111,19,195,203,100,254,100,220,156,218,238,98,136,129,170,92,158,7,37,171,161,199,248,28,55,95,96,33,10,15,124,43,66,21,237,16,161,236,8,121,45,197,117,250,219,119,145,141,212,104,166,124,75,202,188,22,199,45,41,235,94,26,183,164,44,225,45,226,228,159,230,86,72,102,41,87,63,95,22,14,212,185,199,198,41,105,17,40,165,3,46,154,35,248,111,213,211,39,172,135,18,126,196,76,113,33,159,138,134,238,80,132,110,212,154,188,119,218,35,
+0,90,176,110,231,89,134,57,150,81,213,24,203,136,136,158,14,106,82,27,18,37,80,147,158,139,160,40,25,9,207,194,69,38,228,218,61,145,155,136,30,230,50,141,165,190,88,40,125,192,246,114,121,37,104,161,184,178,164,61,213,1,110,231,204,45,222,92,101,166,123,252,178,228,195,244,237,247,119,241,55,12,98,86,66,235,252,181,150,64,65,50,132,239,139,41,191,225,251,98,138,235,229,182,152,34,226,210,34,20,195,190,37,228,231,18,121,197,56,63,104,183,172,225,141,152,28,151,244,254,208,144,36,57,102,165,242,170,172,72,214,5,12,93,250,229,247,71,165,134,53,255,178,17,22,147,65,248,65,216,181,152,22,69,93,33,114,128,38,80,163,59,171,112,106,216,180,159,169,59,39,142,53,15,203,107,179,20,86,18,81,90,111,209,46,145,108,179,184,47,244,193,59,210,162,214,60,174,47,238,107,39,221,235,125,237,164,101,165,5,207,173,112,96,240,20,120,249,53,130,220,145,185,165,98,178,24,147,108,126,206,54,83,147,61,84,170,86,23,6,58,43,68,228,95,62,
+137,168,237,81,198,41,83,233,143,248,135,34,4,42,24,40,20,99,193,93,34,40,20,3,201,136,148,191,15,168,168,168,119,131,24,134,150,249,224,207,79,218,219,207,226,44,149,93,104,153,15,95,55,243,160,101,190,255,60,79,253,175,92,141,114,159,147,201,16,160,101,190,34,9,78,130,150,249,192,207,232,161,101,190,5,171,206,134,150,249,144,60,212,10,90,230,51,29,125,95,71,212,134,182,167,34,189,45,96,52,17,5,136,245,27,77,41,108,173,27,77,17,122,145,27,77,161,57,253,217,132,152,67,137,30,63,61,147,219,198,137,139,51,176,158,16,91,181,42,89,128,254,75,79,124,88,250,122,3,168,22,234,79,168,167,204,219,72,182,103,81,6,90,231,66,157,158,198,131,55,84,91,14,62,180,198,15,83,100,84,222,252,213,154,27,205,139,251,202,116,195,255,120,28,98,253,181,128,205,231,69,21,38,167,138,42,219,135,207,55,35,105,139,168,148,34,117,178,22,234,9,224,208,43,171,114,155,158,38,91,126,110,211,211,211,65,139,184,141,178,226,187,168,112,61,30,
+156,51,123,126,36,24,169,164,156,78,214,194,218,63,89,191,179,42,245,98,60,208,52,36,31,248,71,220,6,250,9,10,227,155,137,99,141,114,191,247,208,82,73,181,240,124,40,221,131,48,245,232,30,132,141,179,247,32,204,117,114,89,160,190,212,23,68,152,170,63,19,158,196,166,20,157,70,184,90,64,80,154,50,156,51,2,62,74,14,51,69,149,207,185,238,27,72,128,160,68,142,222,65,137,216,188,131,146,47,81,77,230,244,124,201,79,254,206,73,76,144,147,38,85,4,86,117,177,93,47,227,71,242,43,202,79,54,69,66,121,133,133,191,225,184,91,85,142,64,176,174,185,61,241,136,101,20,36,94,98,174,116,113,162,130,41,59,138,151,27,5,49,115,42,144,130,18,88,37,98,149,17,222,38,240,26,183,169,230,90,50,126,155,106,110,93,106,105,189,244,34,159,177,104,111,11,33,104,151,47,112,246,87,108,68,195,150,152,59,243,194,11,34,208,243,235,35,14,143,159,83,171,228,176,226,112,196,27,145,81,220,135,138,69,12,241,5,209,229,224,18,57,177,69,43,122,
+21,252,251,125,251,153,225,199,29,149,110,42,160,238,248,226,180,245,132,245,1,98,207,59,178,165,195,198,81,242,224,63,185,231,2,114,15,30,134,83,3,86,183,16,89,118,102,10,222,161,42,27,98,153,42,227,50,119,73,150,97,163,92,95,27,18,30,185,60,82,12,201,93,197,226,193,57,206,80,41,214,168,164,14,196,82,141,172,76,119,94,42,26,64,217,197,29,222,246,70,255,177,103,204,119,151,238,123,198,185,128,86,102,10,167,199,37,137,20,143,89,101,87,31,255,212,25,8,126,140,115,190,53,5,194,143,148,59,98,191,216,20,225,139,104,101,189,209,207,84,86,5,233,138,186,189,162,6,204,154,180,149,101,206,200,221,38,224,87,194,70,89,87,70,106,200,22,89,19,219,123,206,119,148,233,188,199,209,32,37,8,198,84,163,22,162,253,99,143,169,135,164,247,245,132,150,181,233,194,201,46,17,95,30,251,111,113,60,254,20,228,148,246,70,23,103,197,209,146,161,209,100,204,196,168,82,180,71,95,114,131,108,243,250,94,248,28,25,103,10,187,167,240,66,52,113,
+96,70,107,124,143,133,228,132,106,129,193,65,57,9,1,220,28,19,212,174,4,251,251,183,122,199,155,207,254,13,111,126,137,117,16,111,214,127,57,235,198,67,134,226,247,119,254,179,13,13,93,218,145,225,62,17,87,125,63,180,112,161,26,91,82,4,31,45,16,108,62,149,119,176,97,101,239,96,19,134,221,193,38,36,187,131,205,55,239,14,54,79,146,59,216,248,158,239,96,227,41,220,193,6,53,187,131,13,244,123,55,16,216,164,72,119,176,249,79,251,107,22,249,63,192,6,117,7,27,57,230,14,54,120,215,29,108,202,164,59,216,236,241,106,222,129,243,39,8,124,236,126,132,179,20,247,125,47,60,104,92,223,108,171,18,60,104,40,92,36,68,169,180,238,142,211,116,210,75,56,202,195,62,219,222,246,151,193,143,111,13,21,10,213,127,172,196,230,66,17,135,126,210,166,132,47,148,214,23,86,53,169,35,92,44,92,187,91,146,34,148,105,127,113,210,163,178,83,86,241,88,163,126,71,151,39,249,214,45,180,66,205,98,61,79,93,100,194,173,78,204,215,238,117,98,1,
+225,190,154,94,74,114,194,171,226,241,199,117,148,126,113,212,179,216,144,191,23,70,238,235,24,135,46,89,71,143,138,180,116,172,227,45,12,116,128,243,144,166,68,64,14,39,155,137,146,222,36,11,45,141,78,51,4,202,139,211,112,167,45,115,134,150,162,243,85,77,29,127,156,198,4,37,61,5,71,118,10,106,53,179,96,152,115,66,117,89,130,147,102,155,136,33,89,176,248,100,183,187,99,97,134,24,239,79,47,59,254,140,158,146,85,205,58,76,3,251,75,181,208,254,132,13,254,220,172,246,181,167,239,75,133,82,152,142,46,40,74,42,60,145,177,220,248,236,26,46,166,167,186,181,139,198,99,157,161,172,95,64,77,8,95,34,13,104,190,172,116,219,6,222,125,254,220,182,129,171,129,14,65,141,84,92,250,41,78,55,171,179,135,155,166,240,51,123,20,255,203,41,106,135,99,65,49,215,211,37,12,35,213,94,47,65,235,237,201,10,185,182,173,183,150,158,96,247,228,123,239,148,146,191,27,12,156,199,188,197,242,197,245,61,150,111,99,161,88,222,58,30,244,178,244,84,
+159,232,75,75,67,227,219,66,91,50,127,95,104,27,146,10,223,17,95,195,224,114,189,158,52,29,145,114,15,253,12,67,62,216,180,180,100,220,190,87,90,201,68,88,189,239,238,239,231,174,35,114,104,43,185,156,196,223,64,186,3,255,216,99,102,17,72,3,104,105,195,108,149,252,188,139,242,15,54,121,181,88,128,242,121,223,229,24,249,234,125,42,180,252,119,62,135,50,149,63,140,50,5,249,104,141,35,209,156,230,55,45,12,240,116,158,50,9,98,30,123,239,173,161,98,210,132,190,23,147,146,212,65,94,237,123,36,218,214,103,39,156,214,33,215,2,93,197,64,118,211,204,111,132,101,209,123,144,106,79,172,194,104,141,161,85,79,227,214,19,47,223,109,215,235,69,203,82,109,234,83,248,166,207,229,255,51,23,39,34,96,198,198,101,12,80,167,88,115,106,225,187,127,184,109,109,232,232,97,135,133,131,46,11,232,3,200,237,137,22,150,72,174,132,214,174,221,223,114,142,178,115,130,37,107,116,188,80,17,201,234,76,245,137,114,94,16,153,116,235,53,21,134,2,1,240,
+35,115,95,16,78,121,102,46,127,86,176,104,72,194,157,131,187,244,202,125,197,26,23,155,196,230,168,138,79,131,84,175,196,161,131,92,160,117,225,213,210,159,48,135,144,167,81,97,245,126,246,58,175,219,207,34,115,96,62,69,230,184,197,114,149,153,247,165,177,207,134,22,220,202,254,142,54,123,50,6,31,28,117,64,157,217,76,174,54,188,16,196,52,146,23,154,218,248,98,241,61,110,147,80,95,210,102,225,2,147,65,212,102,141,166,136,129,240,7,100,47,30,40,138,198,88,241,211,248,242,10,55,239,10,82,225,101,120,245,37,61,204,231,118,53,184,233,2,233,18,8,95,140,93,202,236,106,124,49,160,5,225,98,255,190,32,220,45,90,28,194,21,95,43,182,189,24,203,132,71,226,243,200,2,199,187,76,222,115,172,88,57,145,85,99,215,165,248,246,101,124,164,213,99,5,235,8,29,68,36,15,108,131,130,197,52,127,27,15,26,235,106,80,172,209,221,29,194,95,6,129,52,254,108,180,147,72,143,85,184,47,114,84,200,247,69,14,33,235,190,200,65,126,30,194,138,
+59,239,175,233,189,138,217,183,146,46,133,84,99,246,113,22,180,92,203,37,204,156,190,124,169,218,223,224,243,176,64,7,39,169,246,73,243,66,126,198,181,109,166,234,166,228,216,197,119,32,7,244,146,201,73,43,62,126,177,226,197,101,255,14,136,69,109,95,54,189,39,111,157,227,105,142,254,65,76,106,59,82,247,69,142,115,171,164,90,76,125,117,181,76,243,184,223,189,200,174,129,26,11,251,115,80,139,29,151,69,186,218,158,208,87,181,93,132,183,56,61,42,254,150,164,54,53,255,161,40,26,19,151,81,157,237,181,44,124,223,197,147,67,7,191,242,227,181,82,144,179,113,239,7,209,83,165,131,86,210,186,109,0,31,217,46,77,8,151,73,2,193,63,171,99,166,160,96,214,60,40,192,180,187,45,188,60,222,109,161,11,73,250,135,0,223,99,176,60,186,119,23,96,242,247,93,128,121,139,187,0,75,128,187,0,203,2,119,1,70,27,238,2,252,201,191,11,240,50,113,23,96,18,239,46,192,233,253,93,128,223,204,119,1,222,185,110,2,140,242,149,64,11,116,198,110,
+129,244,202,191,227,9,102,31,176,120,45,200,41,208,120,11,70,30,106,6,16,128,248,214,12,8,180,225,137,47,248,125,138,42,190,12,123,131,227,97,43,196,165,205,36,41,192,132,175,57,25,182,62,74,244,91,235,211,140,252,136,222,24,244,15,11,194,153,236,123,66,14,10,166,53,117,197,204,32,159,234,64,176,181,120,44,228,21,47,35,23,204,32,191,126,227,232,34,102,195,69,138,222,230,3,209,35,230,91,51,89,50,170,142,187,184,116,147,140,170,94,90,21,246,159,35,20,107,49,51,71,104,105,152,162,234,42,161,165,225,78,207,191,135,150,134,191,112,61,6,180,52,124,24,170,204,70,186,113,28,115,21,251,191,82,104,238,230,36,33,199,110,115,200,188,121,248,170,154,20,119,27,3,96,147,51,36,69,106,189,17,201,45,70,33,110,204,62,10,251,250,29,49,49,164,171,234,245,3,90,171,140,79,10,108,71,146,117,204,77,81,190,159,13,183,116,108,159,194,222,210,49,180,2,250,89,6,247,36,149,56,167,194,30,57,64,184,248,85,64,235,208,75,29,49,143,
+130,99,104,223,237,104,102,106,125,216,169,252,227,116,202,37,147,27,152,41,191,42,10,196,97,165,207,50,247,227,81,55,214,101,171,178,235,173,62,183,17,162,58,189,103,240,53,197,219,23,194,22,184,73,216,23,169,219,86,129,99,118,245,117,81,148,200,14,95,20,249,58,165,222,11,108,69,189,141,15,209,253,160,111,244,72,84,150,200,224,76,19,19,74,111,245,140,111,232,255,47,122,75,249,135,222,62,102,239,11,196,240,241,125,129,88,44,186,47,16,191,174,238,11,196,81,223,125,129,120,229,191,45,16,155,26,143,121,167,239,103,187,118,175,181,183,38,180,31,98,73,189,60,164,187,15,32,111,77,232,91,187,13,170,31,101,175,147,64,184,71,106,23,4,211,90,86,151,201,242,71,175,78,205,94,193,20,40,242,161,247,255,195,219,155,253,166,243,174,137,157,255,202,87,185,136,186,147,168,147,233,168,103,70,137,70,234,81,46,70,51,119,185,142,90,234,95,250,252,146,180,116,210,167,231,156,211,19,245,29,216,198,24,99,192,6,179,111,198,108,54,80,96,150,98,95,
+108,176,193,128,217,161,128,98,179,217,161,216,247,157,41,76,186,211,39,61,81,230,42,250,94,124,109,83,20,111,65,213,167,62,207,243,188,207,75,154,68,175,92,244,79,206,110,20,24,44,56,59,69,232,241,255,170,62,106,173,151,31,42,207,45,20,184,109,252,17,184,125,250,17,184,186,135,13,23,159,72,41,157,208,224,133,73,113,151,23,203,212,222,37,50,178,131,55,201,90,229,230,195,96,111,169,67,20,182,166,243,186,78,149,158,164,107,142,113,41,32,179,64,244,60,100,14,25,205,164,250,166,20,92,157,0,81,234,178,159,87,2,103,77,135,54,16,48,68,249,155,76,144,180,136,137,92,28,111,58,51,1,43,132,110,226,11,107,110,171,68,171,203,151,245,217,177,145,248,230,187,90,58,82,147,80,214,30,80,187,243,228,238,120,40,106,151,40,107,15,9,183,249,237,49,225,102,35,28,19,110,232,251,255,157,112,27,163,78,152,9,214,93,41,237,225,133,46,245,31,140,173,4,141,53,231,138,11,213,119,198,13,91,52,94,30,50,110,47,17,17,213,50,51,186,23,
+42,167,223,127,37,223,156,88,101,74,91,175,25,76,189,163,222,25,247,225,30,158,111,67,135,210,41,237,206,48,148,221,152,43,162,154,27,58,148,78,227,10,220,235,161,116,26,65,34,133,67,233,212,134,105,92,251,159,26,69,52,60,90,133,155,37,8,9,76,249,34,34,169,166,97,171,106,35,246,224,235,28,240,149,248,215,213,100,255,128,43,97,43,64,249,158,13,71,139,186,190,103,195,93,231,43,135,217,112,35,166,179,4,196,78,99,162,96,66,107,228,169,231,103,26,69,72,69,55,82,90,21,170,214,55,219,117,159,228,190,171,143,42,225,17,88,230,244,64,90,113,158,35,87,8,10,126,98,123,77,219,146,110,109,202,73,88,29,19,206,36,128,92,246,40,219,130,8,57,20,171,233,58,172,26,206,106,20,92,20,120,159,192,171,147,6,51,201,224,196,67,107,11,213,235,242,93,20,172,89,135,222,254,176,189,252,140,145,165,94,8,141,39,112,77,43,225,249,58,116,163,207,28,138,171,164,190,229,245,158,221,154,188,113,89,105,23,108,66,94,196,20,85,35,109,136,
+109,43,122,231,210,63,4,220,161,151,199,235,216,33,50,240,50,151,192,41,61,178,144,23,149,225,135,147,135,173,141,199,48,142,30,102,30,174,173,118,159,87,209,151,61,101,209,120,247,46,123,130,72,134,182,248,187,191,24,255,63,166,191,248,227,216,95,140,229,162,248,62,76,129,11,40,211,219,195,20,56,247,69,118,116,51,12,206,186,246,145,29,183,30,156,41,188,249,179,226,130,185,160,231,72,3,209,5,35,147,60,150,87,3,119,199,242,106,247,246,0,81,165,77,117,34,230,126,207,132,75,241,241,22,162,20,120,40,150,95,190,103,194,221,145,250,108,159,43,141,207,158,238,236,229,243,117,175,245,69,41,88,231,47,39,9,120,240,180,14,209,21,218,96,66,172,175,37,74,158,19,48,111,156,95,69,240,102,142,255,243,133,3,122,203,116,93,103,195,52,63,224,44,7,208,223,127,126,29,23,98,184,173,81,246,82,153,6,235,116,191,120,24,124,230,188,159,232,71,15,37,215,89,28,125,111,183,24,213,230,205,62,140,150,44,196,158,125,141,160,145,34,190,247,129,2,
+181,217,48,134,253,198,207,225,51,95,213,253,142,151,227,127,27,47,203,40,222,26,209,31,110,144,35,136,50,160,121,41,83,122,252,221,182,169,50,189,174,244,225,196,163,52,176,175,72,60,231,124,170,42,12,102,18,30,97,238,67,34,148,132,132,138,80,96,148,249,187,253,29,216,196,127,163,191,99,211,27,126,124,207,156,123,68,229,118,249,24,249,98,138,191,103,206,241,139,113,18,62,55,91,210,150,38,208,249,176,114,58,235,206,33,163,183,218,4,132,117,139,224,36,180,106,111,59,29,236,174,29,8,42,224,203,92,174,72,103,154,117,133,27,255,75,134,87,142,81,217,174,66,40,115,70,188,184,167,163,38,155,210,31,39,152,80,204,199,9,38,205,78,11,42,66,17,6,233,204,4,3,153,217,151,30,112,127,141,179,97,81,65,39,162,147,228,173,211,176,118,241,244,30,232,200,241,180,166,71,132,164,246,3,151,203,34,165,184,222,68,246,33,185,74,198,229,168,80,153,198,61,37,145,155,46,158,220,237,85,174,161,57,185,52,56,235,224,35,220,133,221,79,53,191,86,
+179,239,24,169,203,105,52,47,129,237,126,16,202,122,50,118,205,134,249,24,94,147,250,156,199,148,222,213,27,59,130,17,216,24,216,224,50,65,41,170,178,74,224,117,152,130,240,3,214,197,139,145,238,133,145,49,141,185,231,171,106,226,193,101,70,121,88,170,225,4,112,228,15,75,53,36,101,15,252,234,149,191,88,170,53,228,29,210,123,240,54,16,58,44,211,240,165,32,238,189,16,236,40,47,112,220,107,223,249,249,107,203,112,254,157,46,148,30,211,133,78,209,49,93,232,48,56,54,209,134,134,61,86,31,22,187,145,187,78,102,135,197,110,136,37,102,3,156,132,222,36,222,101,230,208,62,55,228,150,136,210,109,85,240,213,1,54,8,219,5,76,230,239,133,166,130,6,54,119,49,14,214,182,8,118,30,207,162,55,135,56,170,173,222,31,234,181,87,65,28,57,75,124,151,78,224,48,124,152,70,252,84,107,224,87,29,198,71,118,19,103,159,112,93,236,7,37,211,137,12,17,53,193,79,186,157,247,121,132,90,139,246,44,236,123,175,46,88,64,238,80,39,142,103,137,204,
+11,189,50,67,236,73,79,70,208,189,78,158,33,30,231,203,43,58,88,120,193,245,177,179,202,19,209,17,180,83,183,138,229,47,140,228,149,78,72,10,200,255,255,247,35,51,142,253,200,211,48,247,134,168,101,80,8,87,162,9,170,198,93,71,122,218,234,231,251,163,221,217,161,206,241,198,228,100,131,250,108,176,182,176,120,60,244,53,35,32,122,247,190,28,230,137,236,37,2,165,205,197,240,134,67,156,67,83,114,24,118,83,15,77,201,96,67,15,206,85,242,181,94,90,203,91,140,78,197,19,148,49,61,37,14,11,137,125,144,239,133,145,67,139,199,166,29,252,94,72,236,62,125,88,72,236,65,246,121,62,217,221,220,226,77,222,114,209,60,185,86,116,82,164,216,217,166,59,31,240,154,244,61,121,104,218,200,56,100,103,190,188,190,157,199,84,244,0,83,67,228,176,170,243,183,173,208,204,164,160,24,118,90,88,99,205,142,179,98,142,119,10,216,11,93,145,98,160,163,102,245,106,236,90,38,159,141,2,152,240,217,145,10,207,10,167,103,217,219,166,229,184,0,206,149,46,
+89,44,176,236,244,103,227,211,247,12,189,193,122,252,61,67,111,39,228,158,204,77,164,30,149,43,36,36,201,125,250,85,143,124,114,133,126,164,160,210,24,232,119,165,230,145,175,200,58,180,40,119,7,174,201,161,69,153,213,123,112,29,90,148,211,88,176,73,157,207,199,195,131,212,126,199,51,168,212,162,78,27,207,28,133,148,122,44,151,60,12,142,229,146,242,243,177,92,114,122,115,44,151,72,110,142,229,18,255,201,177,92,114,54,57,150,75,74,183,199,114,201,223,243,98,211,177,92,50,32,31,179,10,151,238,99,185,228,80,247,58,148,75,50,167,199,114,201,107,255,32,181,168,211,94,211,135,196,185,69,178,248,116,139,123,39,145,252,107,172,200,144,156,101,207,160,225,37,244,221,161,156,138,31,23,194,201,196,168,79,165,54,57,200,126,175,159,18,224,64,38,213,136,21,44,137,201,130,115,217,43,74,117,141,136,68,127,250,78,231,110,63,46,159,135,25,222,154,169,178,60,28,250,61,60,25,215,135,69,236,158,153,158,51,154,205,235,19,99,104,97,99,58,239,52,148,
+196,59,78,138,66,118,242,8,209,226,245,235,65,17,158,239,143,32,126,244,30,65,236,199,226,107,27,39,61,236,169,188,0,98,228,70,41,148,40,45,28,129,99,58,206,46,177,217,224,172,137,107,220,133,11,201,225,222,117,26,60,20,88,242,139,54,128,196,194,45,75,67,131,57,224,248,189,136,110,68,66,206,107,131,239,234,175,89,234,117,21,153,26,137,69,184,115,0,154,128,230,177,229,90,62,121,67,116,160,147,173,121,251,94,11,231,111,251,237,190,168,223,133,95,79,238,228,88,248,29,100,191,23,128,176,68,187,214,235,21,33,3,70,82,177,18,56,205,247,217,170,120,57,71,91,69,120,150,115,85,167,91,171,139,91,204,233,171,190,215,157,231,190,32,110,45,88,222,183,62,230,211,41,193,20,157,84,250,168,208,136,238,5,219,124,109,79,47,218,175,99,64,187,207,92,159,54,50,165,2,234,184,62,66,9,10,229,240,36,185,250,162,250,217,33,63,184,252,87,194,135,186,153,176,56,123,84,220,128,179,151,180,157,193,60,144,216,121,72,42,160,36,126,230,196,80,
+18,179,161,94,247,49,7,49,110,28,158,165,238,111,243,158,168,136,118,68,152,10,177,243,90,247,92,235,115,117,169,81,255,66,233,225,189,142,215,87,36,146,247,24,195,156,224,69,67,48,194,230,118,19,253,179,0,83,104,114,115,211,118,69,98,224,24,223,177,49,236,153,126,23,127,2,181,17,68,203,170,208,45,231,187,139,16,155,50,150,52,234,11,145,217,228,204,37,20,187,186,247,237,163,163,198,251,118,109,197,51,172,55,6,86,252,138,92,249,217,7,43,184,28,161,242,209,110,195,203,79,224,33,199,250,110,183,131,48,199,118,59,77,250,208,110,55,117,87,98,159,61,94,237,138,77,153,14,188,146,154,84,86,225,127,119,219,237,197,54,172,234,48,225,185,118,119,232,182,243,158,104,152,154,118,223,148,52,234,197,84,107,199,254,64,48,154,66,210,165,118,76,239,18,53,109,174,172,26,209,119,34,253,165,30,31,123,8,15,119,1,47,188,122,24,122,231,45,23,208,213,176,130,201,215,7,114,35,189,217,30,26,62,238,93,207,62,111,250,160,184,151,93,166,85,77,
+117,234,239,77,216,187,55,212,156,234,135,164,42,253,137,81,30,90,158,144,27,203,173,46,28,108,133,161,0,215,102,60,38,84,105,196,136,104,80,145,211,238,166,244,58,80,163,127,94,2,142,146,177,29,32,232,11,9,86,38,56,83,167,180,31,118,34,164,248,120,135,39,166,151,223,245,219,234,223,245,219,213,17,187,157,155,111,236,86,66,49,20,187,103,247,77,235,19,196,109,230,51,52,99,246,176,74,142,32,255,222,252,94,37,71,122,13,63,136,214,28,191,192,194,228,4,131,130,141,129,221,19,103,46,35,34,163,66,228,154,36,59,174,193,88,115,177,137,131,241,136,104,93,95,185,99,56,239,104,245,1,141,178,216,158,170,95,99,241,159,225,107,241,251,125,3,40,207,231,190,134,82,183,70,90,157,228,211,97,242,76,75,37,77,126,215,153,221,217,186,42,193,5,128,160,118,59,76,29,166,11,242,7,199,233,130,139,201,177,125,25,158,31,167,11,2,253,239,233,130,113,10,204,137,249,44,250,64,255,166,74,253,158,49,104,225,216,191,59,152,239,10,189,239,14,102,
+141,26,247,221,193,188,252,180,127,119,48,59,214,202,239,14,230,30,55,242,221,193,76,46,121,190,59,152,147,21,19,201,113,143,4,172,211,73,58,215,11,168,70,90,99,47,47,181,201,64,141,251,160,189,208,199,65,123,53,158,225,56,79,122,137,25,176,75,159,242,212,86,79,94,109,173,83,118,55,248,5,108,165,189,35,112,89,244,35,112,219,111,71,224,158,176,206,221,133,161,151,158,124,229,231,65,113,185,121,166,201,16,31,134,123,19,166,159,187,174,210,50,202,248,33,221,128,50,81,124,122,156,96,248,126,108,167,59,193,28,219,233,20,156,99,59,221,223,172,135,254,214,61,182,211,49,176,199,118,186,151,244,245,113,130,33,131,116,156,96,248,95,207,139,126,56,166,119,47,107,199,101,32,238,134,199,101,32,158,189,232,217,255,188,163,93,81,232,136,115,120,125,246,194,63,235,88,46,204,210,181,170,88,43,82,10,174,74,117,115,157,237,149,133,212,242,92,162,121,100,61,156,122,15,54,141,146,54,125,88,12,2,37,109,249,176,24,4,74,218,58,57,248,77,218,179,
+239,121,133,181,191,183,174,142,124,250,130,18,150,232,115,158,88,136,206,202,195,34,121,77,57,116,212,61,19,115,108,234,33,149,203,186,227,34,244,213,7,79,206,23,95,145,110,230,190,11,92,239,240,253,46,111,75,229,251,119,103,72,87,61,60,116,134,180,224,32,38,58,64,253,195,83,43,88,236,134,254,43,241,123,85,71,159,203,148,150,223,179,50,209,28,46,43,96,23,218,239,117,123,154,172,146,106,234,241,51,36,75,156,133,147,167,19,228,133,172,32,130,69,190,245,60,34,152,37,213,204,239,174,186,220,136,160,205,132,71,174,53,108,47,165,234,153,105,118,65,169,212,141,236,37,179,239,63,182,139,204,140,199,118,145,115,213,161,169,121,187,76,40,15,77,205,89,11,44,56,182,139,152,87,199,118,17,181,245,216,46,82,155,31,219,69,112,173,67,83,179,229,205,61,56,52,53,39,64,206,254,208,212,28,107,239,74,252,202,126,159,179,9,237,66,63,85,73,78,99,111,252,12,42,149,116,205,180,25,214,204,207,83,246,233,149,60,87,62,187,198,75,146,175,165,165,
+169,46,204,148,61,123,162,202,217,185,144,32,196,80,141,18,173,88,199,188,211,202,219,71,141,214,73,25,141,238,226,185,96,109,130,138,111,198,110,190,131,211,174,101,229,251,82,121,123,33,100,211,179,174,233,182,249,120,187,84,236,71,111,196,15,5,179,212,32,171,194,201,200,99,249,244,11,114,246,191,60,113,59,40,165,60,200,240,47,89,188,207,69,228,218,29,90,251,71,89,54,164,197,28,57,7,220,95,109,197,243,222,253,25,12,208,59,183,234,174,166,189,78,92,53,107,183,120,173,205,67,19,134,92,118,182,145,128,81,16,104,8,48,174,75,110,225,224,120,240,70,159,91,66,233,46,225,158,158,205,132,192,154,56,251,229,169,143,8,80,59,204,141,242,213,162,21,77,236,210,247,173,167,222,59,26,111,206,107,50,207,59,158,27,15,91,222,183,46,207,245,173,171,156,33,142,117,126,94,60,34,14,135,101,153,125,22,150,241,103,47,153,206,82,179,41,111,112,98,9,127,214,171,140,25,30,28,137,210,231,140,68,95,241,211,174,6,112,196,4,23,38,233,125,232,132,
+23,42,134,42,140,101,17,92,125,212,37,98,193,201,100,50,133,243,65,36,127,7,6,56,67,2,201,16,249,82,208,112,228,169,200,126,122,135,189,134,17,24,138,194,97,58,21,189,15,230,133,243,66,40,109,161,5,229,195,46,189,207,37,213,111,107,33,73,237,203,14,229,96,178,200,249,0,22,243,5,199,50,145,11,114,185,79,175,47,47,65,201,149,185,6,175,60,91,81,246,161,62,45,236,74,236,238,240,45,140,227,59,183,200,44,204,2,184,33,251,21,248,148,204,9,92,170,125,17,120,123,51,165,39,177,140,177,193,47,111,82,70,89,225,118,253,149,150,78,154,128,126,152,107,239,41,175,209,147,44,32,157,1,171,75,114,154,196,202,134,48,239,17,12,196,97,76,119,154,57,120,2,81,153,92,208,194,136,5,187,186,142,130,0,66,93,120,56,112,210,109,116,165,138,83,188,211,136,137,4,158,2,120,67,92,119,70,217,99,64,252,118,35,187,146,63,175,238,183,4,249,4,155,29,45,56,181,101,68,1,182,43,143,48,208,136,194,179,98,169,192,131,116,182,211,231,
+59,204,225,192,215,93,147,93,38,126,5,64,125,76,35,226,128,16,127,39,118,131,166,73,109,170,111,145,161,56,99,174,9,119,52,68,25,191,9,156,9,109,219,221,106,64,100,123,231,102,52,202,233,71,89,244,251,85,215,117,207,206,142,120,186,190,164,208,109,115,232,0,165,68,117,61,43,109,98,19,2,84,40,28,62,19,154,144,180,55,187,24,196,186,216,207,249,53,228,2,222,249,125,112,122,185,191,200,106,110,233,221,219,109,22,72,141,26,246,0,8,249,169,247,27,60,230,198,15,50,134,100,145,107,174,154,237,1,188,140,79,62,163,167,179,207,121,4,87,150,247,43,129,75,5,187,100,228,134,68,11,196,234,87,197,96,184,146,152,225,91,170,46,47,112,31,106,68,95,161,62,11,190,52,57,122,171,237,20,41,19,248,232,53,182,111,250,162,146,34,252,114,127,147,191,0,125,99,195,234,110,71,159,15,58,20,218,2,183,20,150,47,147,62,215,172,41,188,31,118,108,244,94,228,122,135,76,191,224,125,215,30,9,17,22,221,205,187,125,103,42,144,251,87,156,121,
+102,196,84,107,153,69,71,106,201,218,3,67,13,12,43,59,220,208,38,96,107,53,205,85,71,185,95,86,20,238,132,175,20,204,61,13,201,2,227,243,57,169,116,178,175,245,188,81,127,230,149,177,186,127,83,60,184,96,30,161,82,209,8,247,4,106,106,252,46,23,189,32,201,208,59,157,215,214,80,101,15,250,187,235,38,208,242,103,163,219,28,67,207,187,91,90,244,77,32,126,154,157,80,182,219,88,123,101,224,211,27,134,37,19,67,4,64,50,152,136,56,162,101,130,155,120,123,10,188,131,0,87,209,199,96,238,214,87,237,27,12,255,249,2,9,17,219,92,204,231,237,121,148,136,105,86,5,92,160,166,199,162,206,253,142,222,15,108,123,35,129,13,157,16,210,139,28,245,2,243,132,125,120,195,76,168,39,0,8,60,244,49,34,12,251,25,56,185,163,157,160,99,120,217,158,98,68,31,152,239,253,125,34,161,224,120,235,217,106,65,12,230,20,11,157,248,239,104,232,22,173,135,235,254,75,37,85,48,9,222,49,152,43,3,92,205,43,169,14,198,154,209,11,79,173,149,
+205,117,39,231,78,141,207,97,210,0,251,164,193,162,231,45,12,76,185,18,93,254,109,124,61,182,127,233,5,216,41,3,111,204,223,115,10,253,120,209,225,61,23,126,133,217,88,91,107,0,246,138,146,97,173,241,174,39,36,107,198,209,126,246,177,182,222,99,175,182,251,216,32,195,19,110,45,162,221,53,151,73,126,43,4,67,143,108,88,57,0,104,182,164,157,147,90,124,122,172,169,153,94,38,85,221,153,158,1,98,107,15,228,10,92,202,29,232,94,177,94,17,63,95,202,220,94,6,249,67,166,10,83,122,17,92,69,108,228,153,147,146,167,130,12,45,220,62,95,21,116,99,9,70,106,219,227,232,95,125,80,234,88,45,99,183,229,128,44,27,84,127,32,169,79,89,130,213,230,3,82,8,151,62,83,27,24,15,201,218,8,152,134,133,173,115,5,32,189,4,18,189,253,208,183,142,187,213,35,79,54,177,1,119,211,58,54,111,43,49,148,69,227,35,199,156,166,45,168,13,56,66,9,229,216,151,213,241,240,13,231,152,49,5,6,43,95,16,237,108,91,193,68,250,139,66,
+62,155,227,206,82,0,105,159,230,154,205,194,78,57,54,147,240,132,143,252,168,208,190,240,127,134,216,76,5,247,117,237,0,248,61,137,143,106,247,1,9,177,208,35,38,114,223,66,130,98,81,54,211,210,22,243,245,246,97,227,115,105,44,76,3,127,118,39,99,70,149,32,149,252,97,56,35,37,151,15,128,216,124,81,96,11,58,254,157,183,12,63,96,158,252,236,60,194,215,203,99,70,152,131,87,170,205,136,214,217,14,222,2,31,50,156,124,10,76,144,45,155,153,226,50,130,6,104,60,134,207,102,181,144,144,207,220,102,67,154,197,88,201,231,87,183,186,121,51,77,147,5,40,33,139,188,58,82,246,190,186,79,247,62,30,235,145,15,86,124,46,255,248,172,35,159,245,106,124,223,67,235,150,225,183,152,23,161,160,142,49,241,84,222,3,220,2,227,202,180,189,15,217,103,3,111,105,22,98,56,88,98,175,100,149,233,8,244,75,149,203,196,164,242,209,33,247,118,25,13,104,240,218,73,190,69,75,209,149,25,163,29,123,74,105,116,159,66,247,39,184,103,244,148,187,116,
+195,65,127,60,176,33,70,214,21,245,82,49,191,60,147,207,135,155,47,166,169,45,8,61,4,253,65,55,121,9,24,13,158,77,172,132,181,155,173,35,185,110,200,52,153,190,206,207,24,90,161,107,243,96,96,128,241,184,85,37,184,229,115,191,234,229,97,117,43,237,214,83,78,145,222,199,113,64,209,148,230,190,19,126,187,172,229,30,195,165,90,165,2,59,152,179,237,200,241,145,28,61,26,124,8,161,38,84,174,215,146,115,221,152,75,16,116,27,183,170,203,118,237,129,139,193,220,111,163,112,66,23,238,131,110,244,230,224,197,33,209,5,236,5,192,160,78,57,77,194,96,203,247,178,12,241,34,42,93,243,4,171,189,82,203,70,40,57,95,116,237,38,224,84,3,245,108,89,235,179,82,46,219,3,58,172,68,57,111,166,194,74,238,160,10,243,148,49,66,182,135,121,18,30,184,158,218,113,77,26,190,238,237,191,112,55,96,98,58,68,74,165,112,72,49,80,117,246,245,20,78,102,159,186,175,88,73,126,223,157,167,241,194,166,57,232,161,191,86,20,113,66,68,167,152,102,
+42,31,188,211,115,159,160,5,189,37,25,211,244,221,253,21,50,115,22,179,241,154,126,225,27,101,123,131,108,212,101,115,140,192,87,90,71,90,237,201,175,172,231,153,41,206,164,227,223,187,148,96,128,55,123,179,64,129,122,115,98,198,126,126,168,193,142,41,178,220,214,193,53,50,210,118,39,146,7,115,192,82,134,149,75,36,226,135,222,62,212,235,26,76,132,124,137,192,136,199,5,158,100,48,210,129,123,79,52,191,184,80,18,115,47,150,40,115,15,200,229,212,196,97,58,48,107,178,120,182,143,205,3,187,2,92,225,185,87,234,153,164,185,142,115,31,13,93,26,131,12,60,217,114,66,154,237,64,217,214,39,12,160,148,101,198,189,253,92,197,163,105,150,231,21,112,177,203,197,92,164,146,100,169,121,179,125,37,251,161,202,242,156,188,245,93,53,242,29,198,144,187,83,84,73,118,228,102,221,80,178,9,227,249,149,150,128,233,243,252,32,100,57,93,227,188,154,23,251,188,242,142,99,25,181,187,58,11,166,251,237,241,22,251,75,195,107,117,154,206,97,246,197,157,90,64,
+227,57,230,98,113,56,187,206,219,57,138,145,53,150,24,27,16,213,195,250,106,70,97,71,185,243,192,72,181,128,78,194,6,110,177,119,216,255,225,92,93,223,209,232,6,136,41,34,130,156,230,3,202,214,147,3,92,81,182,46,15,112,69,217,218,237,0,249,37,191,130,215,220,21,94,5,182,229,22,91,137,21,94,44,196,246,22,48,21,177,80,91,244,14,33,252,71,85,122,200,177,191,230,51,87,141,207,156,163,134,101,62,212,211,123,155,129,169,125,193,231,91,183,241,160,2,200,178,137,98,64,184,191,6,198,154,9,115,217,73,229,227,228,169,192,198,229,192,193,247,124,239,57,1,75,41,204,88,171,159,92,63,53,31,133,215,118,49,62,121,226,71,15,3,37,254,99,66,108,40,13,45,226,221,250,164,166,228,185,206,229,23,124,124,169,167,178,192,186,254,7,183,27,91,72,25,190,125,21,14,134,196,53,83,192,192,40,1,229,152,1,14,18,213,132,167,53,110,132,157,179,238,192,157,115,85,77,168,32,107,193,177,117,234,32,107,35,239,18,42,12,12,133,193,250,97,
+161,219,104,114,122,201,167,212,150,180,9,193,44,163,65,227,204,106,228,222,11,100,90,250,177,212,22,123,93,42,94,105,118,243,122,213,129,195,73,120,73,209,168,155,47,206,137,38,217,26,92,84,251,17,33,215,121,185,108,131,78,3,207,54,51,180,35,189,215,254,214,32,167,8,22,187,218,190,205,156,71,4,73,208,39,190,152,188,151,159,204,163,156,33,82,216,73,132,46,52,64,52,218,121,187,225,78,97,166,82,78,77,179,165,94,39,106,164,114,167,143,219,240,16,158,233,223,129,131,207,170,80,159,245,18,179,209,119,239,240,218,166,183,103,77,27,210,43,149,50,203,242,78,238,176,6,40,215,151,187,214,59,138,243,163,61,7,230,130,125,206,244,74,180,67,86,222,43,210,218,9,212,230,50,74,172,9,16,51,232,148,143,178,231,142,193,214,201,168,99,84,56,212,162,193,224,235,235,254,126,214,248,154,71,31,88,19,221,84,208,103,142,224,6,217,247,49,198,15,40,219,103,107,12,175,103,205,142,162,27,191,56,136,174,195,129,179,75,134,158,251,106,71,107,180,163,
+35,118,223,0,113,178,105,184,212,251,94,3,241,128,252,57,27,131,62,79,33,93,49,52,113,52,188,32,3,50,191,184,17,186,129,198,109,10,228,138,148,34,132,137,222,69,128,41,9,233,175,198,197,120,123,54,179,60,224,231,246,146,43,24,186,3,217,208,23,14,168,73,30,213,82,231,219,118,152,222,188,209,109,150,13,181,180,60,53,102,155,222,108,24,134,25,97,4,148,242,203,111,68,185,143,153,78,239,118,134,213,168,126,30,150,51,190,216,103,88,121,190,63,52,107,12,220,55,123,14,236,219,196,14,167,249,46,248,248,89,210,143,123,217,85,179,44,213,163,162,25,90,212,150,243,54,224,132,45,17,201,236,172,230,164,223,89,196,230,242,29,148,149,162,144,45,65,235,87,20,178,138,152,211,110,69,98,9,157,130,46,126,109,2,209,243,22,64,181,231,250,142,173,154,233,56,229,44,231,254,230,11,194,5,60,86,87,26,126,185,64,216,116,213,11,194,230,130,73,117,80,29,71,244,41,25,31,223,208,231,34,218,192,253,227,149,206,74,97,189,63,198,225,98,242,230,
+34,113,79,138,189,211,18,94,26,26,0,188,14,175,159,158,190,141,123,213,4,172,28,144,225,48,164,229,105,24,22,194,15,179,19,204,197,25,144,122,174,145,97,100,9,173,123,221,163,248,222,235,143,0,238,7,142,0,22,12,143,0,190,80,231,80,0,35,210,82,190,59,255,74,155,123,139,129,116,120,81,188,83,122,99,19,120,255,166,171,26,44,213,162,223,166,51,94,40,208,151,147,236,211,31,51,175,58,14,159,106,54,34,217,141,233,30,84,164,156,135,101,226,27,32,4,249,135,138,52,156,77,106,57,92,204,179,8,216,79,135,148,82,105,95,205,158,70,156,187,93,100,222,216,15,245,145,221,34,27,138,56,55,194,72,105,231,218,232,133,155,114,67,56,222,143,152,46,199,186,180,136,236,167,243,241,126,157,77,105,246,91,164,180,237,214,77,46,25,105,152,227,46,164,217,238,14,254,24,216,248,4,133,90,103,38,65,129,221,106,28,191,241,232,145,98,234,37,120,207,106,213,44,97,18,68,251,2,64,99,119,206,10,19,227,106,73,124,67,14,245,170,184,71,96,145,
+171,76,213,37,151,76,144,105,221,72,225,107,96,34,126,120,167,246,187,177,11,245,153,146,35,94,118,111,246,229,201,102,97,244,111,220,155,15,138,22,39,22,174,13,225,200,205,130,175,211,125,221,184,118,154,101,58,188,83,213,218,125,141,180,151,98,229,144,154,152,80,90,118,228,124,190,202,215,225,167,53,112,246,112,164,143,223,30,98,238,211,55,212,143,65,157,202,246,115,51,17,67,6,55,29,248,148,95,157,205,116,172,43,145,253,186,82,116,43,175,40,171,209,253,205,235,27,27,247,45,2,123,148,213,70,86,117,195,167,63,161,114,176,164,71,86,120,231,174,9,110,185,228,203,49,103,195,44,39,4,6,83,146,216,150,211,5,171,87,234,25,227,225,25,143,198,49,198,100,233,22,131,153,179,146,247,24,181,245,32,160,73,83,0,243,124,117,199,192,70,253,126,59,28,108,156,156,30,191,7,120,182,175,118,168,0,142,170,30,190,152,36,152,207,147,40,241,4,211,60,67,247,16,189,41,97,48,122,12,124,118,253,44,87,54,1,205,182,49,181,69,97,210,157,51,138,
+197,212,49,224,5,70,22,102,196,225,210,250,51,49,175,139,155,128,128,67,66,184,61,13,14,195,162,94,24,24,40,222,145,231,80,208,179,37,114,148,190,182,115,136,193,124,222,57,82,247,21,70,7,172,134,251,95,225,62,203,117,38,167,114,51,220,174,87,166,56,237,105,81,181,136,155,148,32,57,201,80,46,162,130,178,186,227,213,63,53,138,35,76,48,169,71,118,5,56,152,249,28,231,75,39,113,63,94,51,156,83,101,36,155,143,19,250,196,178,61,26,251,153,175,79,182,219,247,64,185,9,156,12,45,216,16,82,3,43,153,235,112,55,36,5,57,108,1,197,236,123,70,238,67,65,9,28,108,63,88,186,233,124,239,194,245,249,184,188,148,71,165,59,167,140,244,210,176,132,136,112,44,152,1,61,142,94,54,108,137,83,249,251,17,96,169,213,173,100,185,244,181,142,12,83,138,176,18,36,45,218,95,62,42,76,180,223,234,44,80,220,57,236,54,158,233,80,28,199,232,61,154,22,149,109,225,11,34,184,134,237,78,196,216,25,5,134,132,18,127,153,154,20,157,170,221,
+27,187,75,146,133,83,18,65,85,153,77,160,145,153,236,36,186,220,12,95,40,44,217,84,30,78,208,30,28,62,225,58,33,211,120,4,252,192,69,143,160,132,185,187,161,218,56,112,102,94,197,55,93,191,51,30,215,71,120,2,251,64,118,21,116,84,136,132,117,206,150,31,242,141,7,235,245,185,226,114,182,167,103,89,1,22,58,79,211,125,242,18,69,217,232,55,161,157,246,236,134,4,116,82,77,140,65,150,134,27,31,78,191,129,81,255,186,84,82,122,28,13,76,125,83,138,245,254,86,65,89,128,243,37,239,84,86,163,2,193,20,207,40,42,100,199,179,192,115,16,227,250,140,44,43,19,247,60,88,172,132,182,110,132,227,73,244,188,132,236,229,58,195,85,221,52,181,222,192,165,116,231,159,232,35,207,179,118,227,12,218,93,157,68,52,26,221,86,94,172,221,228,71,42,252,99,141,14,16,114,119,212,36,74,167,190,172,197,246,32,22,25,26,35,128,245,238,107,36,221,37,235,181,216,250,99,22,56,207,214,149,152,230,51,66,69,221,246,160,182,27,212,109,15,106,91,
+69,221,22,85,91,21,37,160,7,197,236,154,197,220,202,154,53,41,198,140,116,161,17,240,75,249,130,112,57,94,4,185,92,43,69,132,175,53,40,194,75,0,168,145,110,213,68,60,185,230,147,89,50,188,108,179,212,90,211,251,205,143,194,77,93,147,152,34,128,136,26,174,68,50,117,226,146,163,103,183,216,104,232,0,190,70,232,91,7,117,227,169,129,140,12,216,196,60,230,193,114,221,132,253,188,195,30,2,254,229,169,3,66,199,147,239,13,161,163,208,34,202,163,208,114,151,223,66,171,174,224,142,66,123,2,29,133,54,4,28,132,246,18,80,76,247,77,8,158,125,33,56,232,164,113,106,128,250,6,213,44,183,232,222,126,0,109,128,191,36,197,250,15,218,222,128,169,118,116,191,45,214,64,61,61,64,84,87,120,154,126,91,108,119,30,252,106,60,247,6,210,24,215,12,65,247,170,182,195,50,99,209,228,95,90,159,19,30,173,199,163,222,37,19,132,158,145,139,142,217,49,139,134,79,224,189,103,250,177,19,117,228,205,72,189,13,80,41,31,22,168,173,80,133,163,240,
+221,117,255,144,36,152,207,29,178,6,42,173,168,179,10,14,210,138,58,107,244,218,182,228,166,147,33,141,14,189,15,243,26,94,147,146,0,113,184,70,27,231,99,212,76,167,5,37,117,254,140,160,122,2,233,129,126,208,203,87,228,186,173,168,121,198,186,4,181,196,196,156,62,151,172,227,48,106,171,111,183,100,32,117,176,213,74,10,154,63,148,188,242,27,17,232,204,111,183,224,171,71,145,20,188,216,106,121,239,230,45,96,171,37,218,235,215,211,226,91,106,221,220,208,139,24,210,81,72,215,168,144,26,228,225,100,139,134,52,108,158,28,220,171,87,208,208,190,178,215,159,40,6,64,189,103,199,92,31,192,68,162,165,76,93,109,131,48,113,133,85,231,79,49,81,55,96,232,74,51,81,64,33,141,195,217,57,178,62,193,60,159,126,3,237,177,116,4,90,30,115,4,218,173,233,8,52,90,244,63,3,237,248,245,229,51,255,254,8,180,211,225,17,104,181,131,173,226,128,169,184,166,217,81,96,37,246,49,121,124,162,26,69,33,21,70,248,84,20,94,81,116,223,238,3,236,
+158,229,81,6,202,162,124,105,176,55,0,152,231,231,59,16,243,242,141,67,78,91,151,139,102,82,115,18,30,141,247,79,1,6,219,116,82,213,72,215,174,217,110,237,91,136,6,185,160,239,164,159,21,36,211,81,178,198,0,25,146,109,64,108,163,215,20,2,60,139,152,227,14,175,84,38,251,167,145,154,234,172,152,51,221,185,113,113,189,254,108,251,135,160,212,54,54,76,43,176,240,190,70,222,233,132,115,199,198,115,47,246,122,128,117,255,53,10,151,71,198,83,14,4,79,216,230,102,89,147,79,182,4,95,227,37,102,125,133,238,219,249,113,15,74,200,241,93,255,173,70,94,16,25,154,203,193,142,35,152,241,54,76,139,190,218,116,104,251,93,195,91,133,201,219,210,50,8,96,34,229,21,49,30,188,1,47,19,109,64,222,59,131,78,42,236,60,3,225,143,125,214,0,2,60,186,131,183,57,28,133,172,33,111,253,80,248,113,120,238,159,234,234,197,174,133,51,51,60,151,151,155,18,80,170,30,208,117,62,147,65,43,20,93,64,196,44,59,160,171,132,178,107,189,252,228,
+59,215,14,101,197,163,173,56,35,226,93,103,6,249,122,235,209,39,182,52,211,92,237,150,251,78,118,108,72,93,62,71,122,100,177,201,249,54,70,207,246,161,56,39,242,213,131,21,102,3,209,92,42,135,3,226,78,34,121,167,18,44,57,129,117,215,29,147,19,130,151,203,94,170,13,84,231,173,197,26,44,190,159,199,47,213,167,20,225,180,185,68,94,150,77,1,112,130,225,249,14,103,213,152,10,108,165,75,115,249,210,86,207,41,141,175,177,64,199,94,237,126,157,41,34,4,40,127,72,162,170,69,171,17,77,235,34,218,78,189,253,59,218,227,124,225,138,94,91,231,230,178,192,181,233,54,79,227,4,39,15,100,230,238,111,200,19,172,103,151,233,183,252,221,86,205,45,37,8,169,162,138,190,95,27,18,199,233,200,83,105,168,27,90,202,55,139,139,119,127,96,121,246,160,156,112,58,104,192,107,35,8,119,249,7,40,206,49,157,55,1,106,189,124,234,121,18,183,150,50,18,173,82,238,50,101,152,43,212,39,101,181,223,241,201,26,221,246,198,145,10,146,128,14,247,244,
+20,106,154,28,11,98,3,132,227,100,215,240,141,86,33,42,149,207,123,206,118,57,246,52,114,137,167,15,55,38,161,134,77,121,38,135,84,46,82,186,115,126,76,128,130,239,58,57,208,100,45,38,123,199,48,164,102,159,59,234,229,70,183,89,131,12,113,137,215,160,174,221,186,243,82,148,23,227,13,175,75,202,184,24,164,106,110,66,219,246,89,160,13,104,3,7,159,108,119,164,34,210,45,230,20,141,185,206,179,141,57,140,222,193,85,33,28,65,99,191,99,221,136,162,136,84,153,130,107,74,99,215,108,22,22,190,46,83,140,80,237,58,182,124,123,13,211,161,209,125,220,205,163,182,46,188,28,248,73,208,105,17,100,151,37,252,33,107,90,91,110,60,72,42,166,2,59,36,135,149,14,41,246,193,40,247,14,115,142,222,184,137,58,184,95,1,249,210,250,17,123,15,243,35,246,68,106,4,16,218,153,69,239,99,2,246,196,195,6,168,226,46,236,132,59,82,37,67,78,83,241,77,146,245,138,243,166,217,166,37,30,190,192,83,231,27,148,136,70,172,171,13,131,163,57,4,
+10,31,220,0,56,120,230,148,169,75,37,122,193,182,137,53,219,219,30,186,68,208,27,94,71,147,18,223,188,145,176,215,236,124,253,112,30,175,192,117,21,57,6,234,167,7,232,161,204,243,114,229,105,71,14,121,99,59,170,142,222,162,66,219,154,252,6,40,99,40,100,190,172,65,27,245,125,60,177,24,110,232,50,99,217,216,165,216,118,91,206,162,94,150,51,219,47,134,40,151,114,247,110,7,223,196,22,243,117,155,92,7,125,165,13,113,248,149,149,13,97,226,216,245,250,177,185,231,27,80,225,91,26,116,226,175,163,240,101,118,71,225,123,72,13,241,48,80,49,242,55,96,54,208,12,95,85,16,137,71,213,123,152,86,106,183,148,83,12,207,111,251,134,161,87,51,124,185,106,168,111,180,132,183,233,43,49,21,221,27,234,84,175,183,228,218,215,82,44,201,152,84,48,21,205,215,73,41,105,109,59,197,60,159,125,243,110,94,50,190,73,26,154,51,43,219,192,8,41,163,46,238,100,234,83,182,230,201,62,47,81,117,93,143,37,99,135,8,78,74,65,93,186,15,205,112,
+152,115,3,23,50,116,30,156,88,12,174,167,61,132,223,223,113,43,26,126,99,158,142,225,247,178,97,96,68,14,95,109,182,64,41,217,217,101,227,113,24,9,238,175,150,0,153,161,254,38,229,237,201,119,92,255,136,7,166,83,202,172,111,103,158,64,109,236,148,132,57,123,58,253,157,253,93,31,247,215,108,1,173,150,186,111,118,93,51,80,185,139,194,152,215,201,33,224,39,77,237,64,83,165,88,123,79,141,24,12,22,34,94,229,130,186,116,57,191,116,206,30,174,52,77,112,78,136,60,247,84,46,35,123,64,249,239,229,69,1,239,185,176,193,184,13,127,56,55,36,155,169,149,167,90,226,157,147,32,111,53,252,18,153,87,149,175,237,83,159,238,65,8,65,146,185,9,43,149,47,231,147,199,0,62,94,70,157,79,124,144,62,212,249,110,15,210,135,58,31,243,32,125,168,243,217,162,95,232,93,189,97,185,68,157,239,160,124,83,212,249,14,202,247,129,58,223,65,249,244,168,243,29,148,111,135,58,159,57,177,187,144,184,17,44,140,154,84,169,177,185,65,3,25,69,45,
+170,171,49,246,118,77,213,102,255,50,21,73,219,216,1,154,231,126,71,241,0,77,151,144,130,57,95,216,73,113,170,222,221,162,217,15,161,186,63,156,188,59,132,234,228,27,207,36,217,90,157,136,65,148,70,194,142,104,223,137,97,63,5,79,138,6,248,213,111,159,54,78,121,33,59,44,168,138,165,97,199,184,250,114,218,15,196,204,201,161,180,215,141,241,133,103,150,92,223,231,168,173,44,126,222,40,152,146,33,64,117,209,194,131,197,111,58,158,82,148,223,116,92,178,48,220,182,176,142,161,202,186,7,233,67,157,111,126,144,62,212,249,180,7,233,67,157,143,237,144,184,233,242,87,164,12,202,67,205,52,100,111,83,7,186,103,205,98,236,52,243,163,91,29,58,38,87,212,90,143,222,174,25,110,227,118,157,97,61,10,30,25,139,88,196,142,101,230,30,249,185,165,246,178,104,119,216,39,252,21,221,240,54,10,242,37,183,233,23,163,164,231,143,226,128,122,205,206,173,146,129,154,144,99,56,132,221,200,203,33,236,174,166,104,57,192,249,122,227,77,47,95,223,177,159,135,
+15,226,236,242,152,200,20,18,143,137,76,203,183,237,113,0,61,6,215,117,187,94,74,234,111,219,187,208,84,190,109,111,57,110,124,219,158,8,47,62,218,94,45,248,109,123,53,223,233,183,237,149,164,253,83,112,254,164,141,119,20,83,235,14,72,197,91,184,14,33,184,121,25,203,6,98,199,120,101,96,44,26,22,157,203,87,126,80,213,32,170,141,225,192,41,227,82,199,51,130,117,223,229,64,89,141,95,66,128,202,29,104,160,75,156,163,41,166,124,230,6,232,170,13,212,2,96,67,229,211,189,9,203,161,172,129,121,231,246,50,105,150,16,252,174,204,130,6,134,144,217,133,84,195,140,24,7,125,89,247,6,4,88,63,133,195,82,240,202,74,0,118,184,213,225,12,78,229,119,220,239,204,229,27,120,12,156,195,252,221,161,98,4,8,167,180,185,59,215,132,63,144,119,152,112,226,55,239,115,125,79,4,155,255,226,4,238,135,0,240,154,125,75,173,58,90,89,216,179,171,80,12,213,121,163,102,41,208,219,0,54,125,93,200,14,58,34,30,14,212,236,241,172,173,59,27,
+246,197,132,41,88,42,100,177,80,246,29,208,167,187,62,4,146,99,159,108,245,187,190,55,56,248,30,138,190,90,71,200,42,51,239,125,77,254,190,83,54,18,32,217,65,250,80,231,171,28,164,15,117,190,218,65,250,250,193,115,54,15,149,62,212,249,28,7,233,67,157,79,116,144,62,212,249,114,7,233,67,157,111,117,144,62,212,249,122,7,233,67,157,207,119,144,62,212,249,200,181,252,185,75,150,99,115,11,132,47,254,132,77,51,154,146,171,81,64,126,51,195,132,171,48,194,123,129,182,21,230,39,156,104,184,12,132,169,190,32,234,206,76,99,237,33,3,169,63,191,83,180,242,37,254,4,115,127,200,36,139,144,149,17,168,219,177,135,41,238,215,70,171,129,68,147,57,206,184,138,183,212,25,172,92,247,186,37,204,160,121,76,84,222,114,49,159,130,83,248,108,130,186,25,156,56,89,221,158,99,88,88,52,174,253,180,102,95,144,237,82,89,125,59,134,179,119,199,112,182,67,190,1,166,32,10,48,192,153,144,130,207,110,240,116,199,56,195,124,96,218,103,135,164,35,18,
+34,190,28,146,152,231,127,63,206,53,124,239,63,158,23,29,150,63,67,213,143,136,186,223,97,139,91,212,253,14,234,231,65,221,239,160,126,19,212,253,170,154,55,115,109,188,233,176,139,209,64,183,79,141,244,1,74,219,121,25,248,38,90,23,152,126,19,109,112,61,254,38,90,150,129,255,38,26,46,94,68,137,54,162,124,124,0,143,198,106,131,108,49,78,54,121,170,65,120,245,77,177,38,172,254,166,88,0,143,41,83,66,65,10,134,116,137,222,187,217,175,136,191,200,151,126,87,112,88,76,85,233,235,195,102,159,118,205,139,81,99,174,149,174,235,245,230,105,197,99,238,77,227,247,224,162,13,209,229,41,56,223,74,14,241,210,0,222,60,191,182,65,10,208,196,128,172,150,198,49,209,56,53,124,88,82,139,65,25,159,233,103,30,35,170,215,157,223,81,214,15,203,245,160,247,99,227,191,114,81,136,108,131,95,224,112,24,89,221,70,27,240,49,153,180,201,85,101,213,54,56,114,88,120,109,23,82,32,188,37,109,179,58,121,54,210,119,150,177,191,141,125,103,25,107,123,
+225,119,150,17,244,241,197,23,147,78,221,60,186,250,206,50,10,93,77,234,170,99,180,59,111,168,174,42,68,1,97,37,115,9,93,148,238,171,162,103,110,64,73,182,239,32,13,42,228,181,83,0,215,90,17,96,132,155,46,205,54,72,119,238,232,196,246,31,46,36,167,82,129,141,48,155,214,4,66,30,9,61,157,7,75,160,148,112,9,213,43,93,162,248,61,185,12,24,160,49,236,63,155,145,98,193,19,77,28,159,127,169,92,159,15,168,130,62,243,144,74,60,228,18,41,219,103,170,157,39,105,112,196,55,228,33,234,122,7,213,75,163,174,119,80,189,141,167,162,175,13,73,27,154,8,92,53,163,48,76,175,156,163,24,249,232,20,163,82,206,43,38,47,121,174,137,49,119,110,56,184,36,62,244,251,251,79,79,141,226,92,38,59,245,173,118,87,104,159,3,32,249,25,117,41,185,255,113,184,3,122,20,91,93,153,183,62,6,228,187,128,105,250,168,194,48,140,132,237,185,108,255,93,30,23,189,56,23,240,126,56,173,221,71,182,154,126,111,163,156,176,1,218,211,231,45,
+98,36,205,113,117,49,107,206,94,111,27,6,244,125,150,73,46,55,200,44,12,156,115,73,58,88,157,19,232,74,65,33,172,196,11,184,0,125,67,232,164,197,205,36,132,16,10,68,1,214,157,18,215,103,52,204,130,250,142,56,166,51,219,123,49,176,69,108,194,236,124,86,28,247,215,140,168,19,70,158,194,125,16,194,69,97,206,37,181,180,100,61,107,221,34,40,0,209,148,134,239,2,185,194,249,93,32,223,21,69,199,2,249,75,237,13,247,70,211,248,159,83,111,226,208,59,123,246,22,177,161,31,196,167,145,97,119,50,92,6,136,146,13,193,193,117,61,252,64,3,63,92,239,196,0,237,10,115,46,1,157,204,112,87,184,89,133,246,91,45,185,107,50,69,252,101,203,172,9,212,178,93,211,112,205,33,83,81,250,217,165,231,205,100,102,190,32,150,210,197,40,8,69,138,183,196,190,184,5,136,90,15,114,88,249,213,115,201,171,95,215,123,184,117,81,244,13,46,79,38,184,2,55,136,92,49,14,37,243,245,171,70,68,14,49,124,251,244,8,15,181,69,51,233,254,90,
+95,122,200,61,158,174,244,176,50,199,14,176,86,143,66,114,29,251,188,144,52,1,215,166,234,208,236,141,93,186,194,211,103,87,210,95,7,18,46,143,229,154,242,243,183,5,114,229,204,180,227,155,132,226,123,223,55,9,185,199,240,247,227,185,209,74,83,91,78,124,79,166,115,39,33,123,215,59,76,107,74,180,72,231,113,18,7,46,24,171,27,242,45,193,100,108,158,49,213,238,80,204,126,121,185,111,217,156,246,156,196,201,56,113,245,79,146,177,245,254,30,24,174,219,8,208,57,55,236,56,157,218,68,46,60,39,85,80,232,136,221,242,109,91,128,121,37,139,65,40,216,223,15,77,3,74,75,148,25,168,52,68,48,204,206,155,118,4,64,230,104,144,67,42,185,19,86,157,172,196,244,39,129,113,183,90,150,214,70,217,164,180,80,88,146,165,79,73,172,254,34,210,66,120,235,114,182,95,102,223,26,117,166,191,76,49,64,0,7,213,186,46,209,34,142,216,245,77,128,211,46,136,247,77,132,2,37,104,253,7,179,123,55,22,144,122,93,45,106,130,54,229,52,41,102,220,
+25,158,5,22,45,180,146,55,132,146,21,177,172,200,206,206,105,0,40,59,20,114,94,48,199,66,78,146,135,138,249,13,142,96,158,94,195,154,77,20,150,33,39,171,3,82,135,40,83,173,4,16,130,92,187,32,229,20,39,226,209,109,136,1,226,78,117,71,188,126,247,17,204,246,170,120,0,222,179,115,76,55,18,121,215,63,28,74,62,47,139,28,245,80,242,185,67,37,113,196,47,148,250,136,176,180,158,231,218,185,158,6,7,164,240,237,187,35,110,49,72,179,106,181,246,55,137,250,126,45,232,78,231,36,38,250,41,159,254,23,191,28,53,249,14,74,44,248,152,75,231,26,247,188,209,110,63,235,21,198,215,232,53,202,105,30,44,147,129,57,251,182,204,137,59,12,19,171,80,174,239,162,35,53,74,125,87,160,194,112,20,70,162,209,18,229,196,171,176,246,237,24,51,134,213,4,223,205,210,252,26,240,242,27,149,72,112,112,82,47,73,139,54,60,193,193,144,96,56,47,60,36,197,62,133,78,48,79,24,12,38,67,213,194,87,196,227,247,253,66,87,140,204,3,128,59,
+197,126,167,17,206,149,207,166,38,112,152,66,70,66,127,175,93,193,196,243,227,102,29,129,5,125,54,250,211,0,125,48,23,190,3,255,230,123,135,176,12,253,247,19,184,167,199,39,252,205,126,237,157,227,19,190,55,203,133,205,37,104,229,112,173,110,252,91,64,179,173,81,184,93,207,248,233,123,7,67,116,99,141,193,57,90,2,25,100,27,22,58,214,123,219,126,187,45,237,74,227,254,22,18,238,76,217,236,172,228,234,234,132,221,20,163,139,240,103,224,50,231,180,165,30,214,241,113,47,91,225,110,49,252,217,83,151,54,45,44,179,253,98,121,126,63,78,242,97,252,42,137,107,170,230,253,217,99,188,167,16,200,183,133,138,188,109,149,151,218,225,245,231,92,94,202,150,182,49,90,129,187,223,247,45,208,234,116,159,113,216,150,97,230,172,249,52,72,42,214,201,47,121,112,237,34,37,178,232,51,173,138,56,37,156,158,54,4,212,117,178,39,95,23,39,59,193,35,250,0,57,73,230,202,115,57,185,170,28,120,95,127,116,170,111,42,203,248,179,155,44,46,243,179,218,18,
+231,218,216,34,123,16,234,239,187,13,205,241,232,94,62,73,79,184,206,30,235,172,98,68,253,127,248,39,255,230,55,255,236,95,254,248,207,255,253,233,63,248,55,255,232,159,254,248,63,126,245,227,183,191,250,241,139,159,255,221,159,255,197,159,255,246,207,127,245,23,255,244,23,63,255,217,47,127,250,245,79,135,159,255,228,79,255,193,143,223,67,31,250,233,175,126,249,219,31,255,230,31,253,241,239,253,179,63,248,103,127,240,135,127,244,71,191,255,227,127,255,229,111,255,244,31,255,159,127,242,251,63,254,221,95,253,197,159,29,54,253,241,239,127,245,243,111,14,123,250,233,47,126,245,219,255,240,243,175,127,252,229,47,127,250,179,159,127,252,39,244,199,159,127,252,217,175,126,241,243,143,95,253,250,199,47,126,250,237,79,63,254,236,175,126,253,235,159,255,226,183,191,252,235,31,63,253,246,240,203,111,208,7,254,242,87,191,249,126,241,31,63,161,91,127,143,229,231,95,252,231,129,252,252,139,63,248,111,15,251,55,127,253,31,255,237,175,126,249,119,70,255,223,25,241,255,
+133,142,248,47,126,250,127,254,252,223,255,244,219,227,104,209,161,254,238,72,143,131,251,155,29,255,222,223,28,222,63,249,241,31,127,254,237,127,248,213,47,254,201,143,223,254,245,95,254,252,251,63,254,252,55,127,51,204,63,248,30,222,63,255,151,63,254,213,225,32,255,237,175,127,245,159,126,243,243,175,15,127,250,163,223,253,211,143,159,126,249,75,244,135,31,127,253,171,191,58,188,240,255,253,87,63,255,250,175,191,95,254,251,205,249,183,63,253,230,231,31,191,119,60,180,127,125,120,232,15,254,0,61,148,127,242,227,255,243,80,254,213,111,127,253,203,63,253,199,255,250,79,126,255,95,252,206,59,243,191,253,248,227,63,254,243,255,248,211,191,255,249,95,252,225,63,255,195,63,250,135,255,211,255,252,191,254,47,23,167,157,19,55,22,131,57,113,238,208,171,14,179,72,243,186,124,2,143,254,166,199,238,185,23,119,245,190,192,120,243,154,154,94,42,252,231,215,224,137,151,116,225,54,221,223,95,140,30,2,247,210,0,112,253,252,166,124,183,182,243,105,196,228,53,72,188,
+21,14,73,24,1,116,50,214,235,230,163,158,37,49,179,233,215,215,27,130,7,13,186,29,125,50,182,62,36,233,251,231,215,251,146,107,53,229,10,56,123,117,187,221,67,255,109,219,59,87,169,177,102,247,34,174,118,123,215,15,185,146,201,249,116,168,152,133,122,170,158,228,201,171,74,53,103,89,197,137,118,179,170,208,130,202,224,85,241,188,121,85,168,230,11,136,236,227,209,180,155,217,102,91,165,86,26,51,91,139,21,86,178,169,254,104,127,178,21,50,204,201,19,31,19,45,125,116,48,207,154,176,34,44,67,76,122,239,189,187,177,227,197,74,240,123,151,206,120,247,196,253,23,1,192,251,6,202,170,47,205,77,166,207,40,25,82,27,115,35,20,86,199,13,62,109,50,139,160,183,137,254,219,122,157,135,54,204,205,250,131,108,211,44,64,183,239,242,84,168,38,111,174,190,134,3,177,204,179,231,85,71,225,138,58,67,39,99,6,132,59,0,251,172,165,45,114,184,214,73,183,232,98,184,59,194,30,171,18,64,46,99,34,44,75,169,77,147,132,84,18,103,118,186,119,95,
+26,214,213,142,247,62,218,51,117,218,171,109,165,33,145,1,177,148,147,194,186,166,237,42,200,154,127,45,133,163,184,139,195,167,64,190,110,184,179,81,10,64,135,125,190,115,6,220,121,23,109,133,209,184,144,84,123,117,167,251,184,53,193,155,178,129,36,17,31,47,241,46,63,247,38,111,223,232,85,119,187,70,49,225,243,3,190,168,191,108,224,202,11,162,164,160,219,165,72,82,209,122,173,82,83,85,53,100,148,80,27,24,42,183,174,72,116,138,241,90,136,21,194,96,46,174,123,166,219,205,57,38,162,58,175,180,253,1,221,237,155,201,34,88,219,34,153,68,101,198,9,82,216,54,107,8,185,7,101,70,110,154,185,139,23,19,31,2,70,80,118,215,213,232,31,251,59,73,88,90,49,49,34,39,52,136,234,54,3,94,92,31,195,245,32,86,190,181,220,197,13,167,231,97,89,50,206,77,112,1,33,149,70,133,89,206,233,75,62,72,46,82,67,87,5,12,38,142,193,120,243,76,147,69,99,124,204,129,57,91,132,215,147,176,230,227,124,106,208,208,57,211,231,239,49,78,
+185,35,163,197,184,132,105,193,11,177,152,232,48,231,184,172,137,112,131,53,9,134,228,97,70,19,114,96,201,43,189,133,97,102,76,58,176,238,214,219,117,209,24,236,68,158,80,184,53,35,220,44,158,97,250,196,96,155,103,24,76,83,39,186,156,124,182,168,177,147,42,94,106,203,183,42,10,63,141,69,27,132,57,80,165,105,171,93,60,19,158,172,132,210,82,102,31,224,139,165,208,122,88,224,145,219,149,129,44,235,86,36,51,166,102,88,84,212,127,214,102,232,7,241,169,64,172,130,116,163,190,51,187,31,77,221,146,246,243,93,5,85,115,79,182,229,215,42,17,33,72,197,193,88,139,187,46,106,135,117,241,122,106,217,12,248,121,87,68,212,184,166,58,240,59,202,219,109,29,227,226,200,175,85,122,254,106,163,89,24,209,120,220,154,156,201,74,210,240,42,110,42,180,125,182,76,194,169,62,127,246,210,214,85,2,166,172,122,173,224,175,221,117,39,180,203,208,114,174,170,127,198,107,81,76,164,125,241,139,82,229,227,136,125,196,129,223,215,33,98,191,229,8,175,9,254,
+235,55,153,252,180,24,117,155,107,189,224,122,143,228,200,108,123,101,105,200,114,211,27,49,251,172,195,13,133,189,125,89,192,199,127,189,91,155,82,118,131,195,32,25,206,90,165,41,209,155,14,241,217,75,238,114,216,5,27,105,115,113,254,213,77,234,9,119,57,25,73,212,17,12,26,10,127,38,97,36,119,174,74,250,14,43,85,137,0,185,152,3,213,197,91,223,67,45,90,41,25,187,243,37,174,207,193,111,225,205,198,60,41,244,60,188,39,50,8,180,44,113,163,184,133,126,138,68,249,228,213,145,49,186,70,146,157,159,114,142,121,151,248,137,44,204,187,135,92,233,237,246,138,237,218,85,24,123,92,165,190,165,207,236,154,118,142,148,243,115,56,203,110,92,77,238,114,107,108,217,246,69,227,244,203,248,184,162,128,161,141,201,125,70,90,95,138,251,143,249,81,220,135,88,76,32,153,3,164,55,121,9,32,255,40,175,136,60,189,87,79,179,197,217,57,29,109,35,230,152,250,139,222,218,182,159,15,61,221,72,49,61,105,189,135,114,253,210,211,52,221,203,146,230,161,142,
+29,141,144,60,64,130,219,91,243,227,131,196,235,234,109,69,107,51,174,194,33,167,84,50,131,45,92,31,37,9,79,99,195,189,163,188,191,205,67,142,90,37,90,166,149,234,252,182,96,250,1,16,38,119,57,231,198,18,40,128,251,190,113,95,229,45,16,23,217,60,53,8,241,165,226,24,103,251,104,147,151,61,23,217,202,153,118,177,38,21,200,224,164,231,176,21,202,196,71,221,124,177,255,161,170,231,120,174,208,198,124,46,73,16,95,215,245,107,6,53,207,192,94,159,179,16,111,101,158,19,236,91,17,218,110,159,95,63,107,102,249,238,236,99,93,150,231,26,202,253,5,235,105,235,221,111,89,231,246,217,141,209,15,83,140,33,187,107,240,22,113,224,130,61,85,254,105,110,152,94,225,66,91,185,172,183,12,188,105,104,221,132,56,75,24,54,47,18,107,17,122,152,153,229,198,84,177,49,28,150,173,235,94,248,238,90,229,18,158,57,209,84,52,185,134,61,2,250,54,132,239,56,93,151,125,11,159,75,105,220,85,143,151,49,13,46,243,185,124,176,173,177,125,38,192,87,
+61,148,135,247,105,146,124,247,150,39,12,31,72,88,243,68,217,159,91,187,183,153,41,15,172,189,88,46,222,61,252,57,89,203,232,131,218,79,186,118,127,62,165,188,33,43,245,125,63,168,36,45,149,33,97,135,152,22,172,23,97,86,223,54,114,11,153,179,200,137,131,109,55,168,247,120,76,99,136,222,77,46,238,240,51,75,187,68,124,221,236,41,246,167,134,186,1,79,152,142,152,115,174,157,249,144,189,163,123,25,43,150,92,70,146,77,254,36,43,40,158,202,100,148,183,155,167,200,7,181,226,123,201,18,115,97,155,104,249,156,5,115,100,219,130,158,128,242,55,157,106,149,17,252,18,145,76,197,183,142,101,93,201,250,140,219,166,250,70,134,103,118,29,243,30,189,50,215,244,205,181,64,127,75,37,76,137,190,20,41,36,164,113,29,247,38,7,170,95,157,158,97,252,104,252,224,216,135,238,214,2,81,115,159,58,19,143,235,131,207,115,122,95,71,164,38,33,104,38,111,251,94,79,40,136,56,151,203,224,22,212,104,178,200,206,107,88,190,170,68,148,244,108,51,42,41,
+149,123,179,124,69,99,66,208,190,173,15,49,244,130,229,51,11,59,53,242,46,49,152,103,6,70,27,161,207,111,123,211,109,118,205,143,112,122,107,238,180,185,54,224,225,153,172,152,54,206,122,238,211,247,28,145,9,116,29,188,190,31,249,196,1,141,51,245,29,132,176,39,158,113,240,121,137,158,206,89,193,180,60,129,197,234,117,139,62,123,112,208,34,182,32,134,103,107,13,154,91,135,91,57,162,20,57,251,108,135,124,31,53,206,247,177,180,42,107,215,238,118,174,76,190,115,3,166,75,170,164,109,106,7,210,87,181,162,110,248,17,119,174,31,233,76,35,69,104,254,234,118,30,251,20,235,16,151,122,241,13,249,43,141,102,202,241,201,60,16,107,238,154,80,43,181,56,162,234,49,230,171,59,243,214,178,13,145,241,113,141,75,182,218,149,34,187,36,117,209,42,145,49,215,55,94,204,212,224,190,122,26,133,221,148,19,95,206,149,176,46,16,222,110,176,6,171,239,13,173,130,116,49,89,196,41,110,11,145,240,156,139,172,185,165,81,192,206,160,205,235,6,158,89,62,149,
+4,44,128,60,210,114,14,181,214,124,118,111,231,47,122,214,164,133,70,198,67,211,16,63,59,217,159,200,218,120,151,135,252,220,13,112,164,88,178,134,191,82,207,110,154,117,130,60,91,163,113,53,230,150,135,46,7,92,46,106,35,138,228,63,213,195,135,71,139,105,162,119,176,134,185,43,157,39,49,191,29,188,39,212,217,65,73,181,171,11,56,187,244,242,188,87,217,133,73,173,97,110,214,124,193,23,122,65,150,169,42,213,109,28,129,18,66,219,167,79,111,49,152,107,222,43,142,137,20,96,235,26,47,91,195,245,141,111,125,139,135,231,106,187,169,59,225,227,158,131,125,32,63,72,32,161,232,27,32,215,52,151,233,186,29,234,127,180,186,231,46,229,20,209,231,240,95,31,61,199,48,60,198,208,90,160,175,56,227,108,55,188,64,255,53,33,10,127,241,39,102,131,169,114,159,243,218,26,92,249,160,159,230,197,158,38,151,5,151,103,6,19,219,114,74,33,60,74,181,248,39,252,41,30,12,137,241,29,222,120,92,94,139,241,246,65,151,44,14,241,121,217,46,167,63,70,
+148,86,30,30,190,38,243,19,59,190,180,240,190,131,85,61,154,16,95,11,239,86,66,135,87,213,109,106,45,19,112,73,237,120,187,120,184,207,150,48,230,123,57,117,79,60,121,198,96,222,47,131,251,4,79,208,227,238,46,150,140,253,156,179,206,121,11,9,129,177,77,118,15,114,151,190,70,33,99,93,196,144,65,139,8,135,57,105,56,191,15,35,67,61,76,105,240,179,112,31,66,210,230,134,105,191,181,194,226,39,175,153,223,238,159,217,213,183,157,51,213,180,87,45,191,202,61,220,30,23,90,13,124,147,113,131,148,126,73,106,88,141,224,56,232,147,188,160,135,177,220,72,235,55,190,158,32,219,111,84,154,154,253,32,155,134,246,227,174,56,64,222,230,33,176,36,18,155,184,211,70,37,40,200,39,166,165,103,90,36,47,119,246,170,131,102,145,247,254,68,44,122,76,197,77,190,167,155,218,123,30,35,34,2,135,109,249,94,145,76,246,117,122,159,128,231,162,171,34,57,92,245,203,6,202,74,204,117,56,72,171,141,130,9,237,7,84,28,204,87,100,37,57,123,10,94,
+18,11,4,220,58,63,179,148,182,81,125,254,196,158,158,142,251,96,118,189,73,0,237,153,77,151,114,171,9,235,165,31,218,241,250,238,232,128,131,193,220,57,248,215,234,158,234,13,160,197,250,154,143,221,83,119,116,127,90,7,158,43,125,245,252,202,170,127,218,24,161,151,113,175,197,223,84,144,114,139,152,139,228,51,171,44,200,133,41,220,220,162,212,230,185,181,250,220,122,26,106,245,76,142,222,64,125,163,73,20,84,14,218,116,20,125,162,233,32,203,29,109,196,179,142,136,143,137,128,191,1,230,205,177,189,125,57,171,251,167,68,157,28,2,120,92,174,73,20,24,94,229,108,117,100,13,50,133,166,154,78,179,232,177,151,29,89,112,109,222,46,90,174,146,96,168,88,200,61,128,39,134,197,236,13,252,64,53,112,57,210,40,0,254,25,199,19,107,199,201,116,125,191,152,140,184,58,218,85,161,44,137,230,196,111,178,116,158,187,71,78,157,171,237,250,137,190,52,111,32,161,31,239,223,186,244,46,121,254,126,153,40,105,248,123,222,38,187,248,108,81,124,219,130,79,173,
+27,12,40,187,189,38,87,67,84,224,164,173,203,14,114,228,49,211,53,139,200,119,141,203,84,196,98,49,217,221,208,182,86,165,143,153,224,90,0,205,1,190,221,210,225,219,65,213,83,197,210,177,232,43,129,93,67,246,52,137,43,77,139,6,255,177,119,157,19,102,95,218,147,221,232,189,185,96,248,116,145,16,115,242,50,159,153,139,227,79,187,84,51,237,205,221,139,120,98,41,123,137,115,247,168,180,153,69,5,109,158,77,132,189,249,194,216,60,114,38,238,170,141,15,250,156,123,42,185,114,241,29,131,34,128,19,5,55,185,136,77,59,125,125,211,226,104,12,6,153,95,90,152,87,197,47,150,5,199,118,142,231,115,62,42,27,77,105,1,189,164,206,242,246,227,137,184,148,24,190,30,90,81,194,172,145,140,8,19,79,11,90,0,189,75,33,204,66,61,107,250,188,28,75,112,186,172,167,219,173,169,237,118,173,105,118,150,111,86,120,99,49,37,76,178,215,27,227,7,167,176,16,159,175,77,37,107,50,239,143,222,114,42,3,121,205,19,227,141,120,112,67,164,38,47,0,
+82,160,95,18,141,65,97,38,181,157,228,28,65,89,87,167,214,226,29,70,147,26,238,41,207,6,204,181,163,94,203,215,52,187,93,166,178,113,37,148,145,119,79,207,147,238,231,42,142,210,238,157,97,236,171,31,38,27,40,152,155,45,187,128,230,22,130,131,184,220,172,43,2,145,145,165,174,233,14,158,132,28,184,130,172,230,107,63,197,165,47,117,242,254,108,159,198,64,40,27,236,86,109,178,189,146,29,74,77,174,107,9,149,150,182,142,35,185,237,13,148,183,38,147,115,204,220,186,36,156,252,167,205,242,46,239,63,201,248,95,9,93,123,64,19,80,37,92,137,43,164,197,100,48,175,164,86,249,60,148,71,216,195,2,52,156,55,25,178,141,166,187,113,156,117,211,249,4,43,155,114,153,23,54,220,184,255,192,230,77,115,95,134,220,229,137,188,144,55,127,249,115,216,210,91,215,167,86,241,172,22,215,160,154,103,136,115,26,192,86,45,155,58,26,65,86,75,43,183,140,187,130,137,127,13,134,249,141,219,122,65,70,228,250,234,164,64,136,29,219,243,207,135,83,162,204,
+176,105,48,54,91,183,178,221,99,101,91,131,151,237,130,214,30,107,154,57,83,251,221,186,68,47,127,75,231,157,114,171,182,142,230,114,65,89,218,171,190,215,43,239,94,95,66,228,219,86,5,120,14,21,47,208,123,111,149,214,97,115,1,139,214,129,97,218,227,224,89,155,190,101,127,38,212,223,251,64,30,110,236,100,41,67,214,45,24,215,41,166,79,233,158,223,101,96,242,149,42,10,30,26,97,125,206,1,56,214,132,76,187,228,248,73,201,119,245,93,125,82,67,103,236,207,103,154,92,167,201,233,46,77,92,191,88,231,16,241,227,164,173,65,77,68,30,226,35,91,223,17,0,242,229,104,247,30,232,4,233,170,245,254,196,95,17,128,251,2,173,223,216,96,55,155,105,200,27,170,43,8,57,126,196,78,198,52,171,138,194,29,81,122,93,236,113,245,57,134,218,46,157,38,11,56,245,189,83,59,103,120,175,211,219,66,97,54,44,224,70,196,158,226,202,161,31,104,1,219,165,188,0,205,52,238,184,209,105,50,242,35,218,135,238,19,174,139,23,133,186,150,73,123,235,194,
+144,74,197,209,67,67,46,174,138,62,229,85,96,236,150,87,230,236,202,140,58,197,133,152,123,241,204,218,35,34,117,210,253,76,101,40,153,141,189,23,86,216,61,13,179,218,192,6,26,91,149,95,249,210,121,108,230,75,82,236,170,89,220,226,113,58,247,209,18,229,102,35,31,203,27,32,235,165,209,211,129,171,17,73,216,138,106,54,207,147,135,235,101,211,58,81,46,157,225,153,34,149,91,95,222,154,6,45,170,208,89,216,226,242,129,114,148,88,142,75,115,183,208,43,234,45,116,159,98,189,8,193,111,123,114,250,125,196,172,51,222,148,221,92,75,176,160,142,133,144,103,116,5,141,217,29,211,123,168,71,27,53,199,253,45,144,20,241,219,170,156,77,244,37,12,98,207,115,15,15,114,222,154,34,70,108,159,106,252,106,229,71,70,181,160,42,93,204,239,145,98,105,113,110,89,159,232,40,211,22,241,30,115,253,245,174,73,247,125,171,158,40,8,171,157,49,199,52,153,194,58,32,222,157,165,69,54,210,122,187,238,190,29,55,122,152,91,3,223,250,4,68,120,95,12,77,
+184,103,110,186,51,166,143,177,165,83,77,234,11,184,155,20,238,107,174,166,135,93,202,1,84,96,226,18,253,182,126,238,126,129,172,115,55,207,90,148,218,203,230,225,171,11,56,79,156,215,235,133,252,92,232,121,176,46,197,54,28,217,186,222,172,216,13,16,250,232,219,53,166,225,228,237,139,196,228,195,54,123,57,50,181,148,54,67,137,254,52,64,150,94,139,99,165,156,168,138,73,78,154,110,104,108,158,183,199,248,186,7,232,0,252,107,171,179,182,167,250,246,208,150,238,94,23,26,29,209,132,105,43,190,26,113,218,46,54,18,41,154,34,49,117,123,61,244,32,34,199,101,96,176,15,174,85,243,15,219,130,189,4,135,95,66,252,166,132,158,142,205,222,118,218,182,109,163,138,49,138,161,18,192,119,118,185,155,4,94,72,165,34,187,244,171,69,226,14,69,178,92,122,207,53,79,233,166,180,174,205,165,135,116,210,200,155,7,184,189,165,205,218,237,80,131,109,170,158,75,125,2,132,19,42,124,144,205,91,45,81,144,57,65,152,248,149,31,170,9,149,118,223,32,213,211,
+124,162,81,100,156,212,170,9,201,2,251,122,130,3,230,141,82,126,229,239,2,214,13,126,103,2,74,93,109,215,167,233,238,27,210,110,183,196,41,205,6,31,92,70,36,162,234,79,139,181,214,117,188,38,103,22,249,217,217,144,143,190,175,117,122,88,169,184,178,40,183,3,160,28,37,243,175,247,232,181,125,125,154,29,78,235,203,55,146,135,92,220,109,82,45,48,17,137,204,67,214,215,221,204,154,13,122,218,13,126,122,191,45,93,159,183,74,176,181,54,149,132,73,197,149,212,106,32,82,118,139,247,70,73,180,241,106,198,114,207,188,193,178,26,12,214,102,228,139,79,230,199,250,130,247,22,191,29,174,110,155,22,54,69,160,171,190,120,206,13,174,230,206,78,172,99,237,248,109,216,44,93,167,118,136,53,178,85,229,242,143,142,179,138,119,183,98,70,116,64,77,47,223,235,251,216,140,40,253,24,73,220,175,192,78,112,129,162,131,11,184,241,59,182,152,84,115,224,237,31,151,145,154,163,65,145,202,70,3,71,38,247,81,123,241,236,74,240,120,82,162,165,42,121,161,70,
+217,230,147,214,10,63,238,148,178,186,190,157,23,87,180,233,171,92,34,189,230,37,182,219,1,141,4,133,51,141,203,211,229,25,91,249,255,50,242,102,189,233,124,235,154,216,87,249,95,229,46,173,72,137,210,185,142,146,139,220,231,38,119,217,57,103,247,233,173,236,161,117,246,238,150,250,14,48,184,24,76,49,15,102,46,12,152,193,96,131,153,49,102,40,102,140,41,48,243,96,204,140,193,204,147,153,187,240,111,31,117,78,164,72,65,66,72,172,85,107,124,223,231,125,158,181,86,173,156,185,144,244,157,198,215,79,146,161,178,60,20,29,151,121,67,251,248,92,75,243,58,182,178,148,200,148,111,52,152,22,127,213,44,221,202,148,116,112,60,122,32,185,146,146,106,193,244,157,138,111,226,155,9,40,158,132,119,83,155,216,34,181,152,15,186,248,188,228,153,192,59,108,126,109,89,136,144,218,65,196,183,197,192,165,139,229,164,188,138,95,74,205,23,243,189,171,178,236,74,172,159,23,47,81,84,33,171,4,170,225,225,113,99,209,143,166,33,194,242,241,85,231,122,57,246,14,
+139,71,161,170,69,237,139,204,31,131,64,177,25,221,148,79,79,229,244,247,148,55,235,74,190,231,211,79,247,105,109,25,245,219,0,147,8,39,43,157,62,104,70,158,121,46,101,145,159,106,189,155,245,6,135,121,103,222,211,62,219,75,183,97,32,91,56,79,207,198,252,157,222,221,121,54,95,191,196,150,130,183,72,215,164,203,207,59,98,65,144,70,144,46,11,8,225,107,5,119,241,242,183,30,238,0,178,122,134,124,241,250,190,216,94,105,119,32,132,189,179,144,119,84,237,33,107,248,50,166,50,199,62,77,131,142,176,102,218,201,55,35,36,75,127,59,191,121,126,232,175,71,203,211,155,14,7,117,9,204,49,243,86,78,0,68,148,29,191,26,121,206,243,151,145,81,244,49,189,110,175,75,247,225,109,255,253,194,126,76,120,110,146,188,69,173,116,232,220,130,241,240,149,39,124,226,98,48,21,74,228,118,65,79,71,194,194,117,155,228,218,161,16,14,76,119,43,57,23,42,217,172,160,219,248,208,42,171,114,99,212,178,67,241,116,206,103,99,191,62,73,149,250,90,218,218,
+28,61,140,92,251,105,153,199,133,204,167,227,170,156,252,4,245,213,112,110,41,44,9,157,74,43,83,76,103,76,146,38,90,55,39,94,82,218,212,155,237,80,96,115,78,226,150,154,65,108,18,155,87,125,164,164,129,69,179,183,103,177,112,22,218,85,91,190,101,94,84,184,155,180,61,161,105,216,204,1,159,69,34,188,181,66,251,222,148,32,183,199,249,102,217,141,147,189,206,40,217,50,85,81,58,208,184,65,176,39,35,42,132,22,186,33,192,196,174,236,101,43,114,8,73,36,143,167,245,138,111,187,207,251,119,110,55,111,52,182,244,42,143,254,243,82,95,141,243,125,77,205,190,55,167,183,198,23,220,43,243,84,91,82,104,0,12,143,181,84,85,93,186,129,234,21,92,162,49,166,98,48,141,169,255,73,43,114,15,35,119,131,213,194,51,234,218,102,221,241,211,242,221,240,182,29,21,44,147,203,14,246,109,46,76,190,23,158,62,142,174,196,225,249,113,199,119,17,92,52,105,45,221,189,28,197,125,143,229,109,242,84,174,30,250,226,80,228,49,17,250,152,199,56,145,222,
+170,33,125,201,73,167,83,194,169,50,105,57,227,181,237,189,167,33,20,134,106,82,231,52,246,102,5,5,82,251,212,239,77,176,26,175,239,79,71,239,176,32,57,90,110,104,209,234,138,251,61,106,60,59,40,96,213,224,118,173,67,143,174,211,253,81,53,213,53,175,52,38,88,79,101,2,165,101,119,230,114,102,210,234,238,39,82,220,237,170,147,189,102,170,142,54,14,119,90,56,40,72,104,173,48,120,83,204,154,120,30,145,124,178,109,2,162,117,161,217,24,235,124,204,211,184,117,137,9,36,70,187,99,241,248,102,93,56,246,176,128,209,180,45,220,219,249,210,19,21,190,242,159,166,135,239,168,16,20,154,28,183,99,118,34,156,44,238,105,129,76,5,122,155,29,182,170,252,161,46,168,96,253,249,236,97,84,169,218,184,41,33,181,62,150,62,110,250,167,47,224,178,66,250,222,60,184,134,111,21,235,230,160,51,124,158,70,215,206,195,187,123,71,228,240,54,171,170,227,169,22,171,191,223,222,61,245,190,179,112,138,86,62,164,106,22,56,14,30,39,5,134,84,226,60,245,
+194,221,213,102,226,232,241,158,183,43,172,180,127,28,204,117,201,207,85,214,115,113,85,147,46,175,96,7,203,168,175,138,74,213,46,84,130,66,150,196,237,10,82,47,205,165,65,123,36,185,141,242,120,52,193,75,21,47,248,150,234,100,35,249,83,252,75,140,39,88,147,43,28,198,171,122,188,94,46,234,217,82,53,123,184,125,66,75,63,193,7,37,165,230,106,21,248,186,154,100,53,131,120,194,231,74,183,160,59,24,192,237,144,2,191,123,190,79,133,217,197,229,97,131,177,82,106,95,203,247,153,100,217,189,27,175,94,133,161,53,61,79,187,94,206,98,197,254,176,85,158,184,174,203,155,183,92,28,122,148,74,122,213,99,74,235,169,196,11,39,94,205,254,93,172,104,106,219,165,23,150,128,210,69,187,155,116,180,154,69,217,243,253,85,127,62,23,98,209,48,199,190,80,156,78,51,223,189,120,49,247,82,46,182,238,130,103,19,142,215,6,43,97,115,74,109,119,197,143,203,139,13,231,81,90,110,55,144,50,213,10,235,165,110,149,111,104,50,210,34,229,152,65,101,177,215,
+223,40,146,219,249,202,88,24,191,57,179,151,4,239,45,169,166,89,96,209,121,76,94,239,226,196,224,211,24,55,195,63,137,30,153,250,136,181,126,92,207,2,35,73,222,106,185,182,173,95,75,111,243,92,172,252,34,29,131,79,60,214,254,54,32,115,223,207,198,163,153,59,83,71,164,12,229,117,67,255,233,157,197,47,244,252,183,23,215,240,106,251,82,200,134,22,20,77,226,125,240,94,17,164,102,18,215,72,122,225,189,244,68,107,102,98,218,127,221,24,114,20,64,116,247,249,98,125,115,242,242,123,193,246,51,235,162,234,40,216,80,118,168,106,213,247,70,202,38,240,121,48,115,85,95,161,47,179,161,92,167,29,205,185,18,207,43,150,217,69,253,254,226,198,232,94,84,155,56,78,213,32,168,100,15,124,146,67,231,95,147,70,55,131,187,151,203,168,147,212,15,143,13,252,199,213,91,215,20,252,156,156,15,4,19,37,20,133,21,247,193,107,152,25,47,134,97,7,39,152,11,184,28,63,2,190,190,151,189,199,239,17,144,35,109,250,142,111,22,235,81,23,103,193,173,82,
+243,149,213,236,205,196,91,95,236,13,226,42,169,37,85,187,145,13,61,24,7,111,66,220,7,87,170,203,98,63,162,182,6,6,71,111,14,204,33,218,246,113,20,119,239,219,225,241,91,78,226,92,239,12,216,102,190,45,212,97,207,123,146,50,175,253,219,193,51,182,244,169,245,6,184,73,194,19,53,6,131,195,124,72,237,236,243,47,253,2,36,96,48,151,152,22,6,198,98,48,120,140,227,3,57,175,229,123,193,115,50,6,251,43,25,115,129,38,251,248,220,167,235,137,16,195,198,174,136,73,166,95,63,140,218,51,129,135,43,31,140,164,232,81,21,103,17,232,224,25,23,20,153,20,118,5,26,165,68,11,84,186,73,192,85,206,212,115,209,9,69,236,170,150,100,31,236,102,205,244,4,200,28,10,8,19,253,82,142,118,19,53,145,120,33,34,171,137,162,12,89,238,91,245,222,226,175,239,187,119,214,137,46,170,59,148,131,168,88,103,218,217,135,81,105,220,146,189,249,156,104,134,133,45,132,25,188,135,73,145,155,137,92,45,151,161,79,227,93,113,40,0,226,45,194,221,
+96,230,18,56,134,84,30,155,101,201,89,246,94,7,32,225,191,66,146,229,86,212,30,9,47,204,94,249,82,157,106,211,247,236,203,216,66,153,91,247,239,153,50,14,221,1,148,18,198,215,100,29,185,235,132,103,247,152,204,199,193,24,249,54,170,82,173,129,110,182,109,188,151,31,113,153,151,225,110,218,67,4,77,53,179,139,115,154,199,242,192,56,108,188,45,171,64,65,78,166,180,139,1,231,85,236,154,228,165,76,122,74,109,104,107,207,212,95,34,29,188,0,128,223,40,203,77,216,36,76,131,157,188,58,55,226,60,142,170,130,164,46,74,42,191,243,129,251,142,75,2,181,105,6,234,65,4,224,50,55,246,107,222,96,247,230,241,186,155,137,136,147,109,210,227,219,120,199,207,63,87,94,247,207,63,248,4,193,10,71,7,155,248,210,29,18,48,222,184,119,206,216,157,96,51,20,91,201,82,149,96,186,68,120,186,60,147,171,206,250,57,188,121,150,68,237,60,63,67,247,64,105,136,36,25,172,206,48,98,131,195,118,241,8,66,184,6,208,52,124,128,112,22,25,165,56,
+143,137,4,60,39,175,20,207,191,236,109,100,191,86,102,151,196,130,72,52,67,126,234,109,190,73,84,126,199,85,55,0,179,233,169,76,43,92,72,0,41,13,81,119,16,240,208,14,5,221,4,61,66,113,181,158,164,66,24,251,64,122,11,64,163,75,133,231,4,238,36,126,66,232,81,244,96,1,151,143,178,27,113,190,67,184,157,64,41,177,30,18,111,111,215,3,226,181,213,41,142,227,247,79,124,208,82,97,126,223,3,106,133,63,211,157,5,95,63,3,211,30,33,92,116,200,43,70,214,84,36,88,97,157,78,115,56,250,216,13,249,120,173,169,136,220,32,223,250,119,100,124,137,29,113,177,113,137,125,230,253,233,77,129,200,11,16,189,171,62,162,205,217,136,69,37,92,74,105,249,104,134,121,173,58,66,247,164,70,71,27,65,151,154,58,20,21,162,153,41,31,34,128,99,108,157,88,180,207,110,30,5,171,194,25,192,105,85,174,162,1,184,111,69,234,41,132,75,95,147,20,115,119,38,9,169,233,157,47,160,179,54,123,166,164,247,173,113,122,240,176,69,24,225,213,18,
+80,71,194,145,1,132,41,220,221,84,67,154,237,160,159,12,76,3,230,215,20,238,205,182,193,226,25,102,0,239,50,229,21,56,28,128,139,92,21,66,84,94,156,29,165,130,102,71,54,226,40,138,132,31,79,21,12,152,184,248,174,145,82,18,59,27,137,90,207,102,186,59,8,150,129,185,213,11,105,57,92,90,237,148,159,82,132,120,161,162,195,0,115,65,38,152,4,228,68,133,125,182,62,112,46,236,167,5,6,43,245,66,215,83,154,50,236,193,127,185,38,162,154,60,183,60,210,235,119,4,48,40,39,225,72,77,196,110,102,250,5,181,244,78,119,26,1,36,207,115,188,158,104,43,217,116,232,77,17,80,136,99,143,37,65,61,99,140,71,58,237,203,103,137,160,189,247,65,105,176,189,243,47,176,212,79,210,103,100,144,155,187,135,128,3,72,199,57,92,47,69,220,87,208,92,89,27,203,252,98,14,187,175,225,155,173,2,80,81,111,187,189,221,172,86,115,112,78,195,118,46,205,174,232,169,247,119,234,123,234,110,204,211,81,13,15,237,53,117,157,139,215,120,186,199,16,
+212,251,136,94,154,165,138,236,248,144,165,65,15,162,126,65,204,204,206,1,14,143,18,202,102,57,90,17,25,79,21,0,206,108,41,202,239,92,168,110,193,110,111,12,108,157,25,207,104,7,97,95,219,206,4,104,223,123,24,230,7,126,11,22,164,99,156,177,164,120,197,55,101,222,59,184,184,124,218,99,128,193,140,63,168,21,151,50,198,65,188,18,40,188,34,45,227,226,202,253,202,184,133,149,243,116,147,29,108,32,213,85,139,120,131,175,118,124,6,127,131,252,25,25,223,184,119,39,252,14,211,54,14,160,50,211,60,54,9,249,108,66,236,110,250,133,109,23,58,131,89,28,31,163,52,134,140,69,48,182,129,178,56,123,178,145,75,63,237,215,53,176,10,117,163,159,220,140,157,93,6,165,78,14,81,119,99,84,18,204,10,206,233,84,187,162,148,5,96,155,66,106,3,134,219,134,35,211,187,154,244,242,51,67,217,81,230,182,75,140,211,144,145,89,40,25,168,128,132,152,221,117,208,211,202,193,77,38,117,4,234,157,139,215,20,72,59,140,164,105,119,129,234,224,48,34,
+176,95,144,118,157,202,163,102,151,143,227,190,115,222,161,246,130,144,178,139,98,135,128,166,135,237,125,124,94,105,172,224,210,108,246,229,72,68,48,74,129,197,247,25,33,152,213,43,160,131,240,112,63,70,10,184,101,149,29,110,33,242,6,96,114,190,223,163,138,231,150,231,27,64,207,52,216,125,109,243,47,136,151,160,62,53,123,109,216,185,23,226,143,43,223,238,141,158,166,39,143,43,94,94,68,199,122,76,132,250,61,224,172,122,233,203,175,224,248,125,193,203,147,247,60,57,28,87,236,152,14,137,54,117,120,154,74,229,209,79,86,198,100,55,71,150,138,6,147,48,210,154,109,4,136,154,255,28,218,222,151,240,119,125,55,115,225,251,28,23,237,157,55,120,184,29,148,29,134,19,33,46,41,203,95,52,49,83,141,198,89,188,164,70,186,15,196,125,35,190,133,25,153,224,19,152,62,12,146,71,250,188,119,143,170,116,93,204,184,45,241,112,203,99,206,176,8,237,9,21,90,39,229,38,30,20,75,159,61,24,137,41,176,48,35,146,118,174,36,91,147,212,79,91,182,186,
+36,243,126,152,89,59,124,50,17,25,193,194,110,70,68,238,133,220,192,115,14,134,174,105,166,141,188,44,178,6,233,154,143,205,203,70,193,12,244,144,193,77,29,9,88,122,46,13,189,117,1,200,25,129,75,22,128,35,227,15,188,54,243,227,3,81,48,123,12,52,122,245,2,7,30,229,181,45,103,224,193,224,135,156,36,34,47,46,134,110,151,232,61,176,135,34,221,239,15,137,92,193,244,126,66,94,155,29,84,242,228,168,190,227,232,178,67,175,62,80,73,165,172,57,103,141,95,14,31,238,131,117,38,25,125,14,174,62,66,109,35,151,124,233,38,86,12,167,43,130,157,77,155,94,109,167,51,88,235,100,14,223,146,94,200,171,182,237,29,153,193,17,25,216,158,227,8,3,162,193,90,181,194,244,62,226,223,119,128,149,166,251,129,84,101,66,240,57,254,209,16,153,42,134,123,95,80,44,141,47,46,237,206,82,74,17,157,60,85,118,215,67,213,241,203,212,44,155,147,156,42,138,38,213,15,241,187,32,186,135,192,182,245,2,57,125,218,20,23,81,83,107,244,232,73,208,
+202,174,219,72,36,151,23,6,234,13,218,185,93,111,65,232,216,161,233,87,195,176,192,206,93,136,190,253,9,136,195,9,136,5,102,202,6,58,244,175,237,108,93,239,210,3,108,95,164,161,210,162,142,140,14,54,183,37,18,98,126,45,145,227,116,62,191,195,172,52,253,228,7,34,19,74,242,78,184,106,32,154,18,229,91,100,248,81,25,17,194,174,195,18,153,154,164,243,185,163,210,86,20,189,144,221,107,123,26,199,149,247,82,162,179,202,43,47,97,148,204,84,253,241,252,221,164,169,104,70,247,59,168,255,133,150,55,99,195,83,104,27,154,3,76,174,146,249,205,3,217,240,82,213,251,222,192,232,4,96,67,26,255,121,10,208,54,207,239,60,112,95,115,68,240,16,58,115,81,70,160,11,148,112,4,117,72,71,189,114,208,212,33,98,72,20,150,71,251,1,81,191,6,222,166,26,140,21,189,71,216,26,2,51,223,207,180,54,211,200,44,118,23,115,125,38,180,79,54,191,87,89,129,1,176,11,24,177,128,87,94,250,1,198,136,10,108,187,138,73,128,79,142,245,236,217,
+9,253,81,203,247,10,130,142,74,43,240,171,128,212,7,50,2,6,97,194,211,115,220,222,70,212,141,235,253,128,61,7,228,228,62,26,43,42,111,120,100,156,10,64,175,110,59,159,108,124,158,59,188,216,58,93,20,187,223,189,74,75,147,133,167,178,124,212,159,238,220,178,34,81,0,204,60,101,206,41,70,60,78,27,40,102,132,165,64,167,55,77,166,4,164,33,178,153,241,41,109,143,193,194,249,106,142,30,87,144,80,127,26,113,202,52,121,25,97,174,123,50,183,188,4,93,186,65,177,125,173,103,114,131,32,225,90,17,203,2,151,215,30,246,33,242,130,250,176,57,98,103,199,157,206,76,208,48,135,9,146,75,44,252,200,117,167,104,176,79,197,152,171,117,190,64,219,94,97,152,79,69,48,110,228,88,62,8,14,169,141,74,216,121,243,139,43,54,172,83,132,54,113,14,218,146,2,194,194,167,57,40,163,104,35,17,87,102,116,68,12,218,247,225,136,172,175,75,42,50,34,187,95,224,184,190,186,129,174,250,137,23,39,28,239,156,167,167,121,153,69,233,93,159,243,207,
+2,109,196,51,7,200,110,26,236,168,242,186,51,119,42,152,232,109,211,252,128,91,28,171,134,22,32,15,215,68,46,62,16,132,45,79,159,205,73,64,144,194,197,147,220,110,78,81,83,43,119,102,142,221,233,95,170,104,81,118,61,8,39,13,70,112,139,225,130,4,115,170,74,219,46,93,178,126,129,188,43,32,19,3,207,165,127,117,180,59,150,152,1,216,130,134,7,142,99,192,112,51,89,249,105,47,3,186,129,101,230,250,24,169,176,236,94,111,102,221,78,243,36,129,11,20,113,236,216,113,124,136,4,170,215,101,223,165,157,157,200,51,79,95,163,120,170,221,228,151,199,151,68,9,105,112,69,104,241,69,219,148,38,155,77,101,7,241,162,231,120,24,170,18,66,235,66,97,188,54,50,192,172,232,1,180,5,81,103,55,251,236,133,96,68,17,197,192,164,87,119,20,150,161,140,84,59,106,188,106,204,114,65,109,144,244,162,57,122,55,94,8,205,192,128,55,186,56,228,188,211,104,162,16,205,79,213,194,254,60,116,196,14,111,252,165,40,180,192,231,189,140,0,254,244,208,
+121,98,70,211,213,22,50,152,188,49,213,149,3,57,239,148,36,99,99,161,64,240,129,36,72,55,1,136,200,140,126,32,71,5,83,17,129,2,146,251,0,39,192,7,177,76,113,196,215,123,21,187,138,48,144,6,238,22,209,231,48,124,101,150,138,151,5,92,162,144,149,209,39,234,182,60,121,182,79,69,45,2,181,38,111,51,181,70,153,42,201,112,128,179,206,253,20,206,116,15,194,136,203,58,213,93,61,249,28,142,74,0,229,5,145,204,185,177,250,185,3,11,142,219,22,139,133,145,217,89,121,242,58,98,45,61,37,69,110,19,0,153,237,108,206,5,106,216,150,173,66,1,167,86,116,175,78,51,83,239,200,182,107,13,187,145,228,166,229,220,169,90,154,192,136,180,142,46,173,221,244,220,207,1,221,167,3,184,168,49,22,137,164,66,92,106,187,76,153,76,68,90,137,125,149,28,165,80,136,105,0,14,157,153,99,187,221,134,218,161,16,224,165,40,35,105,71,102,126,221,157,221,140,252,237,61,244,229,95,95,85,159,215,152,87,19,7,66,109,245,243,171,173,124,237,63,
+120,102,249,138,214,107,175,205,24,118,246,80,173,16,162,13,30,196,133,70,195,177,116,59,209,123,176,86,94,99,46,145,115,194,126,9,67,254,173,91,139,34,156,16,90,148,243,235,3,193,131,34,184,29,63,85,192,79,193,123,210,28,126,153,9,226,197,224,148,62,68,139,184,233,195,36,175,109,92,27,221,191,65,36,202,69,65,221,150,120,50,169,145,157,118,162,12,212,95,223,209,170,54,240,4,57,195,135,27,181,229,125,116,235,77,80,200,100,101,161,217,202,70,71,14,118,21,63,52,75,204,202,136,9,197,128,72,187,243,204,226,223,243,134,230,29,139,23,33,220,124,139,143,8,202,212,97,194,149,69,124,108,231,184,30,57,65,62,84,136,251,71,97,137,43,28,221,154,182,47,156,242,117,21,169,224,66,10,161,93,228,92,136,241,211,5,27,117,96,89,92,179,129,149,98,109,1,22,38,169,140,33,43,164,131,86,62,117,87,33,166,197,184,94,104,123,9,50,9,177,72,255,136,216,237,236,58,43,4,129,243,157,163,147,228,177,116,56,239,219,245,164,103,197,1,31,
+184,182,194,114,82,151,67,41,140,8,38,112,62,174,17,118,240,40,145,199,178,55,109,150,64,190,35,223,61,241,10,177,224,189,181,217,177,2,129,67,186,17,67,80,231,195,178,147,91,105,127,162,243,74,64,82,236,89,220,239,194,129,93,25,191,86,95,200,106,47,67,13,74,15,194,55,154,229,157,143,153,32,139,118,228,13,252,6,198,54,76,184,189,229,127,30,73,45,113,169,207,108,140,30,167,160,170,119,98,82,18,178,94,202,242,165,120,110,237,188,208,108,14,104,125,232,152,121,217,218,46,173,187,172,101,35,167,135,240,158,225,211,178,200,198,227,240,3,57,176,228,64,104,226,62,245,100,181,205,29,247,10,72,127,188,108,2,109,233,199,57,34,43,226,17,104,154,148,146,1,101,8,21,31,240,130,132,70,205,0,147,237,48,187,74,27,120,254,226,61,28,112,217,52,167,142,200,200,167,222,19,10,231,209,205,143,181,71,32,249,20,237,207,130,83,57,182,233,235,3,240,218,196,87,12,114,197,68,205,124,138,166,91,8,191,67,187,105,27,102,162,136,73,59,93,20,
+175,65,165,111,15,67,196,103,210,180,102,168,111,130,220,213,181,230,133,135,150,97,76,72,181,233,247,118,81,110,184,2,44,105,53,106,17,180,186,137,202,27,47,156,156,155,248,53,9,69,235,164,48,23,40,24,68,46,63,229,35,43,37,128,137,248,158,4,29,115,209,236,229,166,93,59,245,246,129,57,240,62,219,113,101,134,0,173,203,174,171,159,64,106,242,123,49,233,53,72,9,72,96,9,165,146,189,167,83,71,237,230,26,24,119,204,172,250,10,184,60,192,221,237,141,192,147,25,70,216,173,50,14,200,125,40,66,194,248,80,196,38,86,185,102,60,152,152,164,123,136,18,237,86,154,157,148,14,98,214,149,75,224,246,66,250,151,124,115,13,182,136,178,52,168,103,202,190,43,134,81,83,81,230,184,30,94,198,114,245,180,242,216,99,174,209,14,147,166,133,153,24,12,26,235,38,217,143,85,244,10,17,186,61,243,4,43,220,228,232,170,98,40,83,216,102,155,35,217,137,142,174,33,146,235,115,170,142,96,250,209,132,52,198,245,67,109,162,42,15,23,1,83,62,204,7,
+153,70,184,234,205,65,70,2,72,136,177,207,214,103,165,131,248,160,25,229,123,118,48,191,188,251,234,38,35,149,131,81,44,168,165,190,62,221,200,114,144,67,249,75,87,160,64,121,132,115,221,203,76,122,65,213,116,80,134,22,166,60,52,162,182,232,96,86,155,179,173,18,238,219,211,195,170,41,94,222,194,181,179,32,190,125,185,237,110,213,8,185,203,153,3,220,234,200,181,249,88,21,239,40,197,217,184,119,90,211,3,55,221,177,163,34,247,184,136,246,219,4,199,213,85,140,10,148,106,233,45,254,126,67,199,5,153,55,137,209,92,222,110,183,244,89,189,148,78,135,141,167,94,41,229,168,156,212,56,226,197,148,236,163,71,26,235,65,0,12,182,248,44,179,208,22,97,151,226,178,77,66,36,208,206,142,8,220,150,65,75,171,8,31,64,113,130,78,148,131,103,19,163,162,65,36,168,16,9,194,111,123,104,4,18,24,202,11,99,151,113,192,25,225,46,35,210,88,14,202,247,86,67,245,61,243,216,28,151,47,197,101,219,16,85,139,174,93,190,26,159,143,224,193,72,229,
+31,88,109,86,255,171,123,152,216,157,214,230,81,185,188,250,60,220,238,214,227,83,166,196,68,220,112,83,224,97,71,192,236,229,217,160,217,164,95,6,189,50,107,55,240,167,5,119,233,188,220,33,71,47,136,183,179,83,183,168,189,198,162,108,251,130,69,237,162,84,246,110,90,166,40,230,190,95,64,45,138,40,72,41,40,28,214,125,33,189,46,154,230,242,137,131,140,139,13,204,103,28,152,105,168,183,107,18,57,168,151,148,54,118,216,29,71,97,41,85,113,156,212,139,186,214,169,15,144,73,102,216,181,47,243,200,130,207,139,242,181,175,12,222,124,53,123,134,20,233,182,10,82,87,199,56,34,3,9,73,88,254,138,142,139,65,40,39,78,30,103,160,146,170,127,50,7,168,171,252,145,28,191,229,12,120,21,209,144,110,2,19,105,212,176,34,217,14,45,241,184,106,13,10,147,33,5,123,25,110,95,236,161,170,45,64,239,250,90,162,210,40,37,78,111,205,238,79,218,117,251,253,182,240,129,92,221,82,193,46,26,55,53,193,246,126,13,173,172,95,164,230,221,155,160,188,
+177,250,70,140,194,85,160,255,84,121,197,78,5,60,118,204,24,138,102,181,228,17,98,21,167,117,241,133,10,199,116,112,155,160,85,92,71,43,116,18,187,52,11,203,158,219,107,201,168,133,148,202,84,167,219,188,51,142,72,233,50,216,186,99,130,75,182,115,24,167,150,65,241,189,180,88,160,77,190,114,47,95,237,145,196,173,187,185,26,134,133,104,236,106,29,49,63,143,57,85,238,197,24,81,176,72,217,38,178,147,101,186,251,161,13,14,3,123,43,157,231,114,148,225,233,124,202,24,220,248,46,80,254,178,83,139,60,153,247,220,80,13,137,74,117,84,28,239,194,142,202,252,118,146,49,247,100,0,217,74,128,31,44,87,34,50,27,154,77,143,200,174,108,3,142,51,49,249,168,98,49,60,182,91,98,186,87,84,64,208,72,195,180,103,42,1,207,197,168,152,236,16,3,75,148,22,95,5,231,0,159,187,169,226,191,239,138,215,198,193,184,163,234,40,2,23,164,49,2,204,106,219,97,125,155,72,77,236,77,61,219,192,248,26,57,188,122,166,105,162,70,46,199,151,104,208,
+21,106,10,53,60,127,119,119,67,42,233,164,45,243,138,177,110,154,91,242,123,133,14,11,71,177,38,179,8,37,124,171,104,80,229,15,109,47,26,112,19,181,99,54,54,253,203,108,187,255,162,123,144,141,139,45,72,60,29,147,167,216,121,221,12,155,70,213,18,83,8,231,163,27,148,71,130,92,69,138,225,61,213,22,85,98,23,119,38,46,169,128,17,90,217,40,38,242,233,173,222,64,17,84,22,255,68,241,149,124,247,22,98,64,152,194,199,17,9,52,124,104,52,59,48,8,222,106,72,251,136,54,84,74,157,204,129,208,225,30,148,87,196,88,245,92,77,179,89,236,22,145,71,31,62,223,149,161,69,71,20,87,37,122,78,61,254,1,184,28,6,144,11,101,193,220,23,245,115,166,250,13,242,130,7,9,78,134,20,149,39,105,1,124,139,207,65,140,137,218,173,14,49,92,47,9,36,47,111,110,148,6,180,120,170,63,210,161,45,231,234,245,231,157,160,234,55,60,234,238,3,201,96,245,132,156,20,47,138,81,196,97,142,201,49,235,226,83,53,58,44,53,37,9,118,149,
+35,96,23,211,88,24,59,10,20,76,39,117,30,250,130,242,178,64,87,235,72,208,187,129,27,20,43,243,23,189,163,64,225,178,89,55,168,26,84,242,237,236,222,85,40,51,7,102,46,165,43,220,221,219,244,5,106,170,154,227,108,14,10,231,187,229,112,3,47,17,41,2,114,108,37,227,138,97,177,163,125,169,18,251,150,35,114,146,126,57,148,78,84,154,5,147,56,5,85,18,48,0,49,123,70,82,241,235,49,234,43,81,1,21,38,192,6,190,200,26,200,102,146,28,206,244,106,180,118,242,21,5,198,107,226,89,103,181,89,40,188,40,43,217,47,158,227,116,216,29,110,228,53,237,205,113,7,5,223,239,186,90,43,149,36,80,183,221,172,100,114,65,20,180,212,147,30,246,66,87,119,34,31,82,212,130,229,25,142,240,234,13,31,96,50,10,162,18,218,18,71,44,243,42,37,103,190,62,68,104,248,67,75,183,145,81,58,41,151,241,231,114,9,73,113,30,55,55,58,167,231,41,37,43,206,195,81,56,0,121,175,99,60,157,154,77,31,182,62,134,136,133,53,140,200,143,
+64,204,136,99,182,130,109,238,232,146,214,81,89,213,11,177,35,63,15,216,249,162,82,235,233,211,122,186,236,53,170,166,8,3,146,136,201,148,25,145,99,47,177,123,151,121,104,69,9,89,42,40,12,45,152,133,133,43,249,20,190,116,174,160,33,98,168,41,229,220,208,246,35,119,89,127,180,75,209,193,189,116,193,190,120,243,142,77,221,217,83,21,67,243,14,113,43,124,223,16,230,140,48,111,250,167,31,132,33,145,227,156,110,220,48,233,247,58,231,1,158,136,219,200,251,30,90,208,98,69,188,25,75,119,0,20,174,176,1,152,19,99,82,169,217,217,240,135,204,108,244,253,44,52,205,175,48,229,105,58,171,94,122,226,67,121,74,78,129,31,135,220,164,167,101,192,21,139,161,127,133,43,159,90,166,51,51,53,241,0,55,189,175,102,212,190,120,203,187,171,129,69,123,161,252,81,199,253,147,254,136,184,128,187,89,70,31,201,201,164,145,39,61,33,194,71,81,197,51,124,140,83,225,97,208,16,94,171,238,154,79,131,7,29,101,207,150,77,209,64,184,118,214,63,17,31,
+26,55,86,180,226,213,8,113,222,146,214,19,217,200,111,39,101,158,137,203,171,252,132,32,9,131,207,98,237,247,132,236,59,40,74,232,120,122,81,65,207,246,156,96,117,21,230,194,34,32,138,139,201,174,96,113,87,50,75,72,71,221,170,216,24,135,148,68,160,207,189,66,85,103,165,43,163,235,36,249,179,130,230,70,171,226,210,87,255,197,218,15,60,232,35,138,217,122,194,78,9,244,194,76,205,236,14,30,147,238,70,165,63,34,159,231,111,162,127,186,231,61,203,250,43,103,109,228,229,141,1,103,38,134,215,121,173,164,113,23,145,213,134,245,100,101,144,214,137,186,179,34,203,225,70,129,209,90,97,246,21,207,189,1,50,11,135,186,188,79,191,71,136,115,154,253,75,181,116,3,115,89,99,174,143,76,52,78,215,197,48,75,241,156,93,49,245,122,220,144,170,23,93,45,181,87,71,144,154,234,7,236,230,225,55,168,95,118,237,40,37,249,46,218,174,210,248,215,230,161,236,131,52,228,14,200,137,208,229,34,193,234,161,195,127,66,48,103,229,141,42,36,176,61,140,80,
+150,217,20,246,217,193,180,211,9,94,254,195,250,26,193,99,206,241,239,32,194,199,222,73,193,205,173,63,1,56,95,23,179,123,201,32,189,195,147,88,25,200,78,100,14,184,62,40,114,199,46,170,0,184,56,114,112,119,134,124,130,63,106,129,4,1,61,114,115,164,222,195,117,39,77,46,14,216,217,36,133,211,206,214,149,125,179,177,6,7,15,222,40,39,42,170,166,99,175,225,225,17,193,79,223,164,116,48,88,134,239,250,189,6,242,250,90,241,136,81,126,165,98,63,128,73,37,175,218,161,113,194,138,83,173,155,99,185,219,110,46,42,216,3,93,90,206,194,199,178,233,120,22,151,12,116,132,226,53,107,110,204,78,146,140,35,30,191,234,133,247,221,203,83,241,136,76,253,107,71,239,209,98,98,59,128,254,131,250,164,22,105,179,230,165,92,29,145,164,156,108,27,238,164,182,79,212,254,112,254,21,106,91,17,40,161,13,116,104,4,216,66,206,156,163,69,23,185,16,146,226,19,199,107,61,216,23,183,191,146,240,189,28,163,115,29,103,54,134,135,66,176,11,228,176,66,
+100,143,81,50,7,84,1,189,234,150,119,205,111,101,163,120,235,133,57,20,28,192,221,190,158,153,33,49,152,70,173,242,164,118,183,57,205,226,100,170,150,185,85,48,88,137,129,212,59,177,165,218,191,33,133,239,211,208,232,118,232,32,233,75,10,156,53,45,221,225,64,135,67,30,169,128,100,183,208,190,40,218,217,75,4,21,230,168,221,42,23,57,176,77,2,200,216,21,183,151,255,58,40,92,83,252,84,189,221,192,149,155,133,250,131,64,234,179,111,70,168,255,155,228,196,165,250,116,68,182,186,98,216,36,34,35,164,230,61,34,159,109,224,58,130,31,158,163,100,96,185,117,155,97,217,158,182,8,174,208,242,194,225,250,253,230,186,246,24,198,193,153,55,241,102,71,86,83,27,90,161,199,236,7,228,67,125,8,141,195,139,12,254,173,187,133,166,168,82,196,166,170,188,50,132,220,232,68,167,154,97,144,43,98,221,98,206,193,149,193,14,53,120,87,216,28,213,126,3,78,226,242,136,4,63,157,95,218,81,194,198,22,203,37,168,224,243,128,90,165,211,185,29,106,106,131,
+252,125,205,252,249,214,228,130,102,171,213,15,233,5,168,28,58,118,104,252,229,151,124,58,166,247,202,58,89,18,107,136,234,114,17,154,241,163,144,64,62,143,10,158,101,237,31,27,19,115,90,234,16,151,69,174,39,106,227,237,38,146,91,170,83,22,82,92,161,243,147,250,119,30,184,173,68,117,155,234,249,68,216,40,60,199,157,134,150,220,173,74,161,174,241,168,192,123,176,219,83,116,210,99,103,208,86,160,154,94,122,22,245,168,166,63,160,162,62,1,181,243,149,139,93,31,107,134,63,91,246,33,89,150,246,241,83,243,31,249,175,191,134,147,113,217,74,83,225,205,93,9,37,96,181,24,44,62,72,192,34,193,34,198,25,175,35,10,45,154,137,228,38,233,234,36,163,24,167,164,95,188,33,98,215,122,187,80,239,14,72,233,67,242,21,164,124,214,236,24,152,113,64,189,92,206,80,4,193,87,37,32,229,194,122,170,38,141,163,126,34,97,173,209,138,15,224,94,219,114,223,22,15,6,229,81,242,147,168,47,142,91,178,159,182,84,38,19,248,42,86,250,49,60,216,150,
+136,112,109,250,57,106,75,241,9,251,125,126,47,167,184,82,87,153,14,74,171,86,15,236,209,155,38,32,209,95,40,3,83,17,89,30,72,162,92,248,65,43,7,223,77,192,118,195,191,77,229,42,41,191,133,196,4,236,161,135,49,165,141,84,38,134,124,173,86,43,20,62,123,244,30,196,62,173,251,236,20,192,183,243,116,207,87,231,232,4,248,44,129,84,19,9,135,61,70,43,226,236,213,5,138,69,16,212,223,7,157,91,195,167,212,111,193,151,222,159,98,50,32,29,255,250,28,149,69,17,234,5,103,110,59,63,20,96,8,252,247,182,57,34,95,93,247,132,35,23,30,126,100,183,204,78,54,113,177,91,233,134,71,113,108,67,176,59,210,47,56,148,62,57,95,173,54,94,209,61,151,10,227,122,144,73,141,56,52,230,24,26,249,43,34,119,191,71,7,165,13,107,63,58,190,166,62,78,21,229,8,228,11,199,219,187,197,187,11,236,147,226,202,158,63,210,58,34,62,156,231,198,116,211,108,112,101,195,235,40,14,69,216,210,173,162,9,151,83,5,220,77,49,22,145,71,
+41,48,226,187,60,103,156,170,112,85,207,84,220,95,173,216,24,133,187,63,142,15,151,95,44,236,115,176,174,189,144,168,206,142,225,103,94,123,204,47,39,66,208,160,129,83,115,212,9,6,157,73,239,242,2,192,160,250,219,116,234,101,190,193,160,141,99,84,123,240,18,20,72,76,159,211,190,26,37,204,24,114,247,72,91,62,126,76,238,101,114,52,151,35,64,83,196,209,137,6,228,132,80,108,97,142,90,175,121,245,44,18,64,101,113,227,184,70,204,55,40,21,167,191,251,110,217,27,197,72,148,150,155,163,110,22,22,40,145,209,114,92,251,67,232,13,147,236,123,113,156,199,57,16,83,148,220,80,93,112,203,1,131,194,204,183,71,51,83,7,246,208,49,52,185,55,122,161,169,18,251,139,8,234,80,253,194,148,3,49,236,139,84,11,161,16,158,121,70,81,88,158,252,120,250,37,155,153,121,116,108,73,12,183,11,136,75,102,212,197,37,159,241,141,5,131,11,146,136,240,163,82,50,141,32,42,11,176,84,233,5,252,242,168,148,61,217,121,55,148,30,235,12,189,79,191,
+170,171,59,69,49,201,53,142,254,177,57,91,153,162,33,121,146,7,78,231,114,97,148,21,206,80,195,122,61,175,235,4,79,107,190,89,96,168,249,97,147,86,250,34,69,139,94,84,28,230,222,30,186,28,235,159,43,162,120,130,140,159,162,52,191,18,26,53,203,220,155,181,22,255,113,252,123,251,102,44,148,157,37,163,228,88,227,170,242,198,22,146,146,160,180,255,6,69,148,120,221,252,236,23,84,80,70,69,81,49,130,15,48,58,180,246,186,93,152,144,116,47,30,75,115,190,82,113,152,206,214,248,136,220,91,85,101,107,4,31,37,49,224,27,116,230,166,69,90,198,68,122,145,198,122,250,197,29,81,247,152,221,20,178,145,62,211,189,41,192,4,61,183,42,34,33,218,31,57,76,66,117,119,76,127,53,70,152,123,127,114,103,178,157,50,106,145,32,130,50,15,206,21,10,236,109,110,232,235,91,68,86,152,139,66,140,135,13,38,80,198,101,71,66,242,57,144,166,189,28,156,153,199,176,63,207,98,99,207,213,219,159,205,168,247,66,124,207,151,249,2,85,22,230,222,98,
+6,19,188,170,74,204,180,32,125,156,155,168,69,51,89,169,174,67,202,31,144,191,144,69,100,203,6,126,123,69,231,186,18,52,73,51,212,183,150,173,24,41,146,191,61,8,150,126,101,207,60,156,212,169,131,241,110,122,129,73,64,93,90,80,171,213,76,210,61,25,23,4,84,76,59,170,254,90,123,168,177,164,250,77,100,47,127,46,38,62,251,248,40,22,9,80,156,129,147,82,173,154,174,20,105,49,47,135,155,203,95,243,199,215,204,206,43,234,84,218,186,126,44,180,11,150,217,236,3,57,235,204,222,15,124,193,73,137,52,150,149,215,159,83,31,20,179,64,111,231,81,24,191,30,211,124,253,60,230,8,95,64,119,240,244,54,253,98,250,5,47,11,156,186,36,105,40,131,224,199,121,62,14,214,28,146,82,23,8,114,127,59,185,135,122,13,250,84,97,56,47,6,102,50,145,130,116,148,108,221,138,229,113,142,202,246,57,235,241,245,27,56,24,159,168,113,48,19,21,201,98,182,255,24,122,133,20,70,14,47,169,246,29,99,181,169,166,218,216,71,9,101,48,117,41,123,
+100,255,221,30,125,197,226,138,195,242,85,222,240,64,40,46,197,161,134,144,247,139,72,140,121,207,1,45,35,221,183,133,202,221,225,198,31,62,138,207,20,6,91,37,166,130,103,5,170,140,251,80,185,13,99,194,118,211,110,129,105,18,98,66,98,230,219,33,198,89,204,247,106,118,131,202,202,134,56,8,116,105,113,74,113,213,68,42,146,239,148,95,191,25,121,140,59,78,167,68,206,171,85,166,147,80,141,133,227,173,200,36,123,68,140,220,79,201,75,226,209,132,194,144,51,211,61,152,245,229,2,197,65,176,152,87,44,241,90,247,184,130,202,109,95,39,130,207,160,160,130,98,74,108,130,58,16,87,44,101,165,171,71,249,245,11,191,12,148,0,8,43,255,78,209,85,144,111,84,215,220,159,18,12,53,202,228,30,218,10,251,73,253,205,175,176,64,189,23,13,201,135,102,197,176,121,11,111,10,105,187,153,133,2,207,165,9,29,160,204,94,48,72,60,210,163,173,214,184,161,145,155,75,86,141,167,179,35,55,230,234,215,118,71,197,71,229,238,28,120,234,156,5,239,118,225,
+210,221,128,91,81,44,202,68,227,233,196,21,209,134,122,128,4,212,155,244,247,236,50,198,97,113,40,201,145,22,58,207,198,211,115,175,132,178,2,226,115,128,100,60,51,63,179,211,19,213,48,216,221,183,194,196,19,13,173,102,244,197,204,244,129,76,247,16,67,162,244,94,243,61,236,108,234,86,195,31,220,35,180,71,47,68,66,227,18,145,234,56,169,203,36,36,119,137,178,190,5,41,196,56,239,186,144,69,218,23,219,73,237,187,82,73,83,246,152,150,251,114,184,252,23,251,121,159,169,43,123,8,7,220,148,194,166,145,242,203,36,99,139,46,207,75,31,178,137,154,121,94,170,115,125,110,224,162,20,215,79,85,152,43,14,29,211,69,102,40,138,161,174,94,64,235,226,72,60,25,86,2,90,228,69,188,247,198,19,1,190,193,206,1,166,124,171,224,172,217,16,118,123,27,4,169,143,39,141,250,3,26,31,137,228,42,16,162,196,208,162,198,223,227,65,165,47,183,125,190,164,23,18,15,91,175,248,250,248,184,171,178,12,109,32,150,148,10,50,144,220,206,19,2,218,46,
+237,165,205,122,62,249,104,92,163,178,103,57,169,133,48,215,93,37,43,36,108,71,235,188,251,225,35,53,39,21,67,85,174,22,217,107,164,244,79,185,104,247,137,98,125,135,70,37,192,111,66,52,102,173,231,40,189,68,3,149,193,25,43,62,214,23,218,176,211,212,188,93,179,70,223,111,50,13,25,213,242,26,83,121,90,86,184,116,183,54,238,139,222,39,79,56,200,34,65,22,5,64,35,168,100,201,53,40,179,170,162,244,136,52,168,45,229,59,158,122,119,2,122,10,46,245,188,206,115,255,241,200,160,196,233,189,33,139,11,224,174,232,153,46,42,151,65,206,87,130,58,132,152,220,158,253,84,84,119,19,73,43,0,76,181,52,148,105,50,50,183,123,104,234,96,139,211,207,219,155,250,30,146,88,24,117,132,122,102,108,5,133,235,164,190,137,27,241,54,82,31,25,17,20,253,101,10,181,204,164,224,238,89,232,176,227,73,214,9,42,26,67,166,57,112,36,127,125,170,191,106,80,161,114,184,209,16,115,115,61,192,173,10,89,101,149,222,81,118,12,241,122,115,120,116,214,
+178,218,174,149,198,25,24,145,100,230,225,53,141,206,180,52,64,91,210,48,223,104,19,116,108,8,13,95,167,42,30,120,86,231,59,38,7,41,39,21,105,159,39,234,59,228,151,129,176,206,226,128,164,2,29,132,208,35,237,228,49,49,182,134,159,29,53,26,179,247,129,120,197,119,251,200,13,246,248,220,115,101,232,132,243,198,174,156,64,130,135,35,110,139,67,59,249,131,142,74,192,23,62,139,3,84,27,108,168,48,246,193,187,135,30,137,184,136,43,179,149,171,40,46,148,217,124,32,84,153,144,129,234,147,144,248,222,158,209,227,213,243,87,117,153,139,179,106,29,52,21,81,165,83,77,212,20,132,122,94,81,232,249,243,141,218,69,21,177,210,110,66,16,152,107,225,59,210,122,172,27,15,217,112,165,159,141,218,155,56,19,69,185,67,94,70,144,81,98,43,133,40,166,160,197,2,134,57,60,196,161,68,156,154,161,82,217,133,196,89,135,166,220,9,105,127,69,215,75,247,61,218,10,194,75,15,226,143,175,7,43,99,214,163,114,48,163,71,162,72,123,55,122,90,153,202,
+187,105,93,119,127,228,42,102,222,20,170,213,229,82,143,57,24,225,211,223,59,241,125,254,203,151,60,218,147,228,109,143,25,120,109,151,8,183,56,171,111,248,122,55,185,36,44,15,79,20,102,214,114,174,133,145,148,230,74,139,33,114,218,125,220,140,0,112,125,75,124,62,70,115,208,151,233,102,58,37,218,90,66,161,144,162,38,220,95,144,20,70,7,110,33,158,178,69,228,86,149,184,63,34,114,45,16,223,22,105,242,168,217,17,144,8,212,142,141,196,77,33,75,9,164,155,137,154,134,80,249,232,56,148,219,171,55,214,81,121,92,239,46,110,82,98,86,100,169,64,60,33,182,89,226,85,72,9,117,196,130,133,131,216,81,192,124,82,187,10,49,36,189,72,105,54,132,34,109,77,144,57,3,82,214,24,72,19,22,150,75,207,144,53,252,10,222,7,55,114,6,0,18,156,175,140,40,106,129,120,177,53,205,197,77,201,244,72,233,172,82,137,173,35,21,233,53,187,106,78,116,150,255,248,89,177,80,123,109,63,43,22,68,254,252,103,197,98,137,80,127,86,44,52,208,175,
+5,136,11,217,216,207,70,169,173,247,215,126,123,87,61,99,252,24,196,246,92,30,58,239,183,68,28,126,129,198,28,164,65,56,47,35,109,92,40,245,121,102,53,78,78,26,152,64,8,42,51,53,13,14,103,85,109,159,160,160,217,110,27,229,20,3,177,94,20,7,34,251,150,221,11,181,230,128,73,75,43,126,143,124,79,164,245,214,150,9,162,33,231,132,198,156,115,200,249,66,99,206,57,228,124,150,193,11,11,87,154,176,95,233,31,52,168,201,7,108,40,241,99,131,250,157,57,226,48,239,129,209,45,93,245,153,216,189,220,53,215,44,206,145,92,109,212,31,77,165,143,52,41,14,65,176,113,76,161,43,6,57,52,222,16,86,11,150,64,202,26,129,221,214,131,45,144,102,104,166,51,175,139,208,127,71,212,65,182,224,86,167,181,195,98,231,240,114,72,111,92,228,120,182,173,100,25,80,70,186,200,121,53,71,46,88,121,216,101,207,195,129,233,16,186,9,194,71,151,191,195,99,59,209,112,115,192,154,245,182,17,200,217,207,50,77,107,74,58,68,116,67,13,33,241,190,
+79,131,140,243,233,1,27,123,131,26,191,25,158,222,221,92,30,111,151,164,38,66,216,201,50,143,207,229,212,41,213,222,95,150,47,191,136,225,192,148,181,218,189,171,237,230,253,217,180,180,228,179,78,101,60,92,129,75,81,220,114,90,237,221,175,95,38,210,3,66,74,50,228,174,58,210,132,182,167,119,69,239,151,95,37,165,37,118,203,153,49,176,116,126,72,165,161,237,221,65,118,232,58,174,178,236,223,223,20,64,106,95,1,75,132,29,99,242,6,128,84,237,228,93,141,80,81,234,219,78,63,43,120,189,249,204,101,229,25,100,98,2,14,190,187,8,116,207,59,76,97,27,69,241,165,155,189,205,228,182,42,231,218,218,183,230,208,240,189,230,76,222,215,224,55,205,10,42,221,194,110,195,237,148,230,7,194,239,65,228,170,244,42,151,146,91,26,168,243,60,28,244,112,171,91,7,27,180,71,230,55,42,57,163,45,22,199,170,57,218,71,190,8,189,218,145,201,241,27,81,236,52,94,227,113,240,129,216,153,100,192,68,164,101,113,128,246,178,249,249,122,67,198,161,148,216,
+25,97,134,0,83,247,59,32,86,126,25,239,170,190,124,210,10,50,195,38,23,62,134,96,15,33,217,37,254,192,59,31,4,100,226,162,139,169,122,163,228,150,54,177,103,241,142,189,173,167,78,164,129,205,170,26,200,192,111,219,113,213,81,125,63,114,46,68,228,158,154,115,14,107,2,187,142,61,236,180,69,253,34,21,216,225,123,246,24,199,41,188,46,23,61,9,221,53,235,231,216,64,128,249,115,108,64,61,33,246,198,247,192,204,85,16,181,65,78,33,55,228,92,137,180,94,79,200,120,50,169,229,50,104,20,183,220,122,34,126,195,13,231,250,41,33,138,21,73,148,195,61,78,226,224,160,58,235,162,32,252,230,136,180,170,225,21,252,217,126,152,3,54,211,206,204,149,53,99,4,138,0,184,116,15,229,52,245,5,87,211,93,172,110,213,205,163,104,197,233,174,162,239,3,59,187,202,173,12,220,86,147,208,125,152,127,233,27,164,33,50,51,243,41,237,154,209,114,103,112,173,175,245,175,86,156,214,169,139,17,77,0,185,35,49,181,39,189,190,124,163,135,125,43,98,26,
+186,65,9,230,249,36,192,86,26,45,40,66,241,33,247,188,43,213,185,4,57,137,179,217,92,57,166,128,224,165,114,25,95,210,93,239,134,170,244,157,238,200,172,191,226,185,250,51,89,35,159,43,68,37,165,11,179,187,147,12,233,199,88,65,241,92,34,61,47,47,160,235,79,180,60,53,23,46,65,169,132,52,54,207,79,55,162,216,240,222,85,177,6,187,92,121,79,49,115,179,135,113,156,53,79,226,170,234,104,13,23,87,106,145,214,120,82,7,202,234,58,18,238,246,160,21,43,26,100,58,36,214,24,239,113,168,137,12,110,229,21,160,247,185,197,239,65,66,140,152,129,124,41,212,214,40,23,206,12,50,44,219,205,202,104,235,97,171,46,19,1,149,91,118,142,107,153,60,204,169,26,136,78,107,163,108,113,5,106,74,3,102,68,214,187,163,45,52,207,229,57,19,154,71,20,250,57,46,16,56,81,142,163,184,50,94,221,189,66,27,39,95,127,33,26,233,221,169,126,101,52,103,48,52,101,92,72,37,232,158,187,255,95,207,3,168,131,63,120,101,58,200,5,63,39,0,
+94,35,189,179,188,199,198,208,255,20,226,88,184,247,249,134,103,144,67,34,47,74,139,74,162,109,191,170,121,60,208,237,42,140,6,19,17,145,101,12,60,242,163,222,69,91,209,249,240,65,118,16,47,157,15,31,168,18,66,241,249,240,129,145,1,50,178,34,148,30,233,39,17,53,211,100,116,44,196,254,105,230,177,47,138,125,125,68,37,51,113,76,186,104,196,43,178,99,36,62,192,178,47,80,221,70,17,81,200,120,84,70,148,170,56,114,170,157,72,80,15,50,122,63,115,141,3,102,39,94,182,57,47,214,17,249,121,215,180,174,16,75,127,150,115,217,142,68,198,185,55,227,251,210,177,223,242,92,123,137,9,195,2,65,0,108,75,181,79,120,48,1,67,196,227,53,99,210,227,141,211,41,217,205,97,162,3,220,4,25,24,122,173,162,60,45,208,72,54,98,141,23,160,229,37,181,100,139,238,171,75,140,69,149,96,115,73,99,63,132,31,22,4,207,180,236,140,137,226,149,4,171,142,60,137,200,234,151,45,2,48,177,92,158,186,251,139,214,55,12,251,104,176,30,192,246,
+83,65,14,125,136,82,108,23,19,78,198,33,110,168,241,137,189,92,170,243,180,212,49,94,200,155,44,213,114,255,123,35,191,195,1,125,185,83,169,134,227,96,114,240,11,120,157,119,247,245,67,1,248,218,59,68,2,39,42,20,117,57,71,37,172,230,36,158,18,137,128,36,161,12,88,218,72,210,89,105,38,218,225,148,246,163,156,140,121,139,4,116,124,226,222,212,116,230,34,56,247,27,213,76,135,156,33,152,35,131,135,18,204,177,144,87,132,214,243,178,208,69,225,160,108,200,165,153,241,207,135,28,52,236,70,51,201,77,51,23,234,0,96,197,197,206,69,124,47,226,31,128,83,106,173,181,67,211,235,235,50,180,142,216,57,239,109,117,212,81,141,33,184,128,120,177,119,152,121,241,108,62,143,177,89,173,78,124,73,173,11,158,14,142,6,48,211,211,68,243,163,168,223,125,29,75,56,143,40,195,40,246,184,142,179,20,208,72,166,172,107,248,174,66,28,147,69,253,220,53,104,202,74,81,37,247,204,190,29,244,111,15,228,60,179,208,219,105,176,207,210,152,135,235,226,180,
+220,32,172,44,14,29,165,133,238,14,119,20,23,113,104,143,222,40,34,88,220,157,37,0,169,31,126,241,65,162,154,96,165,72,65,1,89,185,108,27,175,155,136,44,194,153,168,229,229,214,232,239,122,97,140,234,133,130,223,1,56,233,215,44,240,92,85,200,172,157,206,168,42,82,60,174,244,99,96,70,53,199,12,65,204,218,16,210,197,63,231,142,96,173,180,88,124,53,138,104,199,176,231,205,52,140,157,205,72,233,211,115,233,53,104,97,169,218,119,211,98,149,29,56,243,160,43,187,22,53,82,141,100,64,147,131,89,200,232,92,244,208,172,139,243,74,194,37,5,37,124,126,149,30,60,203,176,107,12,248,112,54,82,212,70,245,232,24,156,79,20,92,162,24,202,69,33,212,119,141,234,219,167,147,154,245,1,157,204,158,117,254,109,206,235,94,0,114,39,6,29,115,191,42,8,10,57,66,79,102,98,35,215,233,5,56,26,141,117,195,115,63,68,148,243,52,203,221,44,113,111,122,136,127,68,218,104,46,142,144,136,6,233,44,96,103,67,41,125,95,36,232,172,98,197,74,
+95,183,73,183,84,8,42,44,168,60,136,240,221,131,103,64,249,131,20,174,127,0,237,15,221,252,33,57,202,79,30,245,112,89,199,124,178,136,200,102,217,12,165,25,244,40,149,1,43,187,180,54,1,10,91,196,235,178,205,105,102,42,239,116,69,193,104,187,220,63,49,142,94,200,71,28,145,236,239,163,46,85,22,248,50,149,175,58,20,59,228,197,194,150,164,17,229,245,157,35,226,245,199,102,111,225,134,110,212,157,170,154,234,236,131,254,165,219,62,160,5,87,59,76,4,202,226,42,18,7,110,169,62,120,190,114,14,255,8,188,238,95,179,159,126,228,251,87,106,38,201,231,70,229,203,26,49,54,17,245,79,101,159,234,215,99,76,221,218,81,1,156,85,178,212,145,253,2,42,84,134,51,193,52,0,151,34,79,198,156,3,102,168,109,181,207,198,133,218,22,118,9,156,237,92,203,21,245,173,228,20,106,94,63,122,107,68,187,253,156,203,71,42,121,242,240,64,180,54,184,173,234,202,221,179,218,70,148,233,227,60,131,170,239,136,114,61,26,64,161,124,129,64,95,16,70,
+164,53,36,210,107,235,233,30,242,34,109,11,210,31,72,192,22,48,111,221,236,172,68,104,12,215,145,5,58,208,9,75,250,219,113,201,10,212,218,76,220,79,122,111,107,64,153,221,42,114,147,25,22,56,96,246,233,107,234,88,124,9,94,202,34,156,8,85,74,163,40,179,37,146,219,108,242,79,245,121,251,20,11,200,177,206,243,196,94,130,29,66,236,108,118,184,119,52,54,211,81,32,61,203,205,128,205,11,129,145,200,89,104,76,200,168,245,162,145,179,21,252,177,50,118,10,163,71,131,179,105,162,230,35,63,150,243,9,0,166,90,200,167,125,76,9,236,63,251,156,172,83,12,53,248,59,230,51,168,215,106,251,139,206,252,51,84,73,178,252,143,141,107,16,68,137,187,175,136,51,51,123,99,10,80,146,199,152,25,212,79,28,109,229,207,9,35,83,69,139,187,178,98,90,2,149,192,158,25,117,124,184,220,244,190,130,214,247,200,149,129,250,242,3,124,35,80,217,92,162,190,10,19,91,153,61,138,120,241,81,117,22,32,24,216,203,104,159,237,224,22,231,229,221,215,70,
+156,92,152,243,58,204,17,166,234,91,169,241,40,218,77,68,116,62,157,215,101,145,69,50,148,196,130,65,182,146,243,0,187,95,203,51,235,170,206,45,250,125,50,59,253,168,109,190,84,241,23,84,148,214,162,3,209,110,51,230,234,3,189,127,77,236,137,181,70,7,115,109,110,204,123,206,102,175,11,213,17,25,22,5,210,127,241,119,165,244,253,182,46,190,125,135,93,95,44,48,49,255,144,163,92,238,220,113,191,105,253,179,83,148,207,180,37,114,27,83,164,139,39,210,103,158,23,56,39,214,69,253,193,166,202,197,194,135,74,79,21,24,19,118,100,51,134,42,250,105,153,134,29,236,143,30,225,250,125,90,54,155,205,3,130,114,173,19,49,163,243,33,65,245,30,209,164,48,109,80,29,39,80,122,33,188,215,134,78,80,241,193,215,121,250,217,168,222,158,105,187,201,139,198,189,243,124,217,16,246,26,138,161,122,29,234,159,119,243,188,53,2,95,125,118,247,171,159,254,163,212,234,14,76,175,219,130,90,171,14,240,24,49,212,20,22,234,243,168,4,177,48,196,57,204,89,
+235,174,42,194,60,239,27,162,126,168,142,87,192,54,40,123,103,179,190,208,10,229,66,47,4,120,33,25,177,117,238,7,54,28,31,14,127,17,146,250,192,98,55,199,73,41,6,20,118,163,85,146,124,231,214,225,156,230,72,12,179,62,141,64,101,14,56,220,80,14,87,211,100,183,128,76,43,252,41,59,57,61,15,199,217,174,238,72,21,90,59,150,236,207,242,206,88,128,94,230,92,223,80,106,28,54,51,251,147,142,242,177,59,237,56,206,201,69,144,158,192,138,60,225,28,59,58,152,229,218,153,63,173,83,199,41,149,60,236,26,25,102,22,117,185,221,160,55,145,212,200,196,68,57,167,44,242,51,11,218,123,23,176,93,168,97,254,87,134,36,210,158,75,36,254,252,31,61,164,61,108,93,204,182,35,7,3,224,114,147,226,144,136,154,243,110,173,157,109,78,113,175,222,240,248,43,239,175,233,96,99,126,185,7,193,226,68,157,37,134,51,222,255,114,143,17,229,172,139,206,39,84,253,161,89,15,33,79,250,106,226,207,12,160,227,19,137,20,192,131,182,95,28,212,118,51,
+154,77,81,180,251,114,76,39,46,215,150,139,200,141,139,51,175,189,67,93,135,108,226,194,36,17,105,16,178,229,218,107,243,92,119,96,204,76,57,45,23,168,192,62,209,185,104,73,176,4,125,61,248,35,242,118,104,166,118,132,20,16,121,127,200,190,191,236,158,6,57,186,96,131,1,131,67,247,131,0,36,28,25,40,42,181,81,110,64,68,89,203,173,45,110,99,117,200,9,114,182,227,58,112,225,196,165,249,102,83,182,112,202,193,187,178,13,10,245,103,193,36,0,242,244,208,89,104,248,228,152,95,19,148,96,19,205,231,29,96,213,249,144,9,167,27,47,25,26,168,92,188,10,60,172,212,197,227,210,29,10,24,115,9,148,56,52,212,248,179,215,168,225,83,124,251,19,249,157,32,48,75,244,60,116,115,244,211,233,52,99,31,76,141,88,122,224,11,25,110,163,48,36,59,162,164,31,45,28,228,149,53,247,72,59,206,43,19,178,4,229,220,149,197,138,251,51,218,91,88,42,114,82,225,101,248,121,225,114,124,133,173,36,25,158,116,93,26,67,247,119,234,91,167,25,39,
+139,115,23,81,9,168,37,76,209,176,19,99,142,11,231,253,180,170,223,198,185,41,251,25,183,213,196,244,219,81,161,138,133,21,98,140,78,135,196,91,206,249,101,20,171,89,124,19,199,159,155,9,44,206,102,252,10,173,240,190,158,140,168,232,45,190,169,101,245,187,104,247,208,32,2,218,104,30,232,200,238,190,150,43,162,185,50,151,0,176,111,239,133,120,68,83,196,145,153,26,78,249,253,103,243,75,93,24,66,35,14,37,29,134,168,18,87,61,23,86,248,47,93,139,246,186,63,252,10,99,211,132,141,157,29,48,211,80,171,163,188,184,181,168,230,138,171,150,235,126,146,145,4,182,146,203,29,42,46,244,233,44,132,148,123,49,220,48,205,220,252,42,158,184,51,225,167,106,233,216,186,96,115,94,165,177,81,160,57,223,63,48,159,23,107,38,92,251,30,187,249,123,175,135,173,70,103,147,253,119,183,79,155,134,28,197,179,139,18,216,51,183,34,185,199,112,52,7,94,48,83,242,7,18,145,81,206,230,110,189,13,111,47,96,14,94,66,190,231,169,153,162,207,153,79,200,
+210,220,14,46,174,148,60,10,128,43,126,32,68,20,19,206,144,192,157,38,202,168,68,47,106,144,95,64,240,4,177,242,123,136,13,203,80,85,76,196,111,13,173,0,154,89,161,249,198,79,212,157,231,11,19,209,255,122,137,161,59,122,192,149,76,83,41,73,208,170,48,24,76,4,11,224,206,239,153,205,188,16,6,143,254,138,206,47,152,97,48,50,64,68,198,176,127,37,99,248,191,146,49,184,127,157,140,33,255,74,198,92,253,74,198,96,255,158,252,46,3,96,200,13,248,24,231,63,49,247,47,55,128,164,218,20,45,239,48,231,135,48,120,220,199,207,91,105,45,140,247,252,210,26,198,241,129,65,126,189,179,70,63,191,180,70,191,0,31,126,37,195,152,159,100,191,115,176,104,210,222,43,238,134,216,178,174,29,165,108,223,247,251,195,166,72,58,117,90,104,122,60,183,203,94,190,60,223,63,128,202,221,131,234,165,248,93,251,48,94,83,104,174,97,41,243,240,188,168,36,242,181,69,228,120,24,177,172,254,215,0,227,244,134,214,227,203,73,119,217,187,243,19,125,37,78,
+229,161,251,133,251,83,217,173,177,66,234,204,193,218,21,212,182,221,217,197,204,5,125,149,203,23,220,111,15,5,131,177,91,34,125,79,223,115,127,27,149,110,150,197,113,254,73,119,220,110,19,155,250,58,49,118,47,231,182,167,90,37,207,7,152,205,202,204,67,194,237,33,214,81,152,187,140,223,120,182,208,134,190,240,113,153,167,46,22,237,30,80,28,230,245,155,117,16,191,93,188,141,31,149,4,64,250,13,187,177,107,207,205,177,6,137,251,49,112,21,189,85,30,124,59,79,130,145,244,28,184,205,153,137,224,97,97,246,152,8,249,110,165,203,21,119,242,176,44,144,136,82,250,239,39,34,44,221,138,91,188,198,26,85,144,69,217,166,124,87,35,21,155,155,231,195,238,45,96,242,157,182,56,116,104,123,153,40,58,40,131,131,91,136,182,179,129,36,223,58,204,6,34,117,91,95,108,101,200,52,151,22,81,113,237,222,149,222,240,162,61,25,131,112,209,10,220,102,120,61,170,178,200,85,148,13,235,245,50,192,233,11,26,24,239,194,100,241,252,54,161,53,178,128,116,95,
+97,1,231,184,150,240,35,208,112,56,132,222,160,154,169,26,169,114,113,161,107,184,92,94,199,5,222,247,155,29,146,226,123,1,116,250,189,101,92,114,165,171,128,102,237,94,57,214,211,97,138,94,255,84,151,221,147,119,244,234,150,72,50,1,163,119,55,62,142,155,89,15,220,208,4,53,119,180,5,178,229,161,127,119,80,157,196,124,96,214,139,143,170,117,201,57,59,82,154,100,239,168,23,38,192,58,54,150,32,236,230,22,231,87,238,236,226,247,32,207,126,145,219,2,231,126,10,226,200,49,171,23,182,246,174,23,107,121,241,150,48,132,178,247,105,144,243,118,113,89,46,131,247,4,155,131,237,88,116,193,39,252,186,149,112,114,210,186,130,185,255,37,246,162,150,90,192,12,73,165,251,237,42,139,95,1,159,249,197,32,221,9,42,161,93,182,36,134,92,214,46,236,125,127,229,172,161,165,4,30,101,69,104,7,109,227,178,90,139,221,60,142,8,161,113,190,160,235,49,71,29,249,241,252,186,101,137,73,50,215,150,3,18,65,252,169,42,243,98,171,167,227,163,171,232,5,
+171,220,241,228,234,98,147,173,0,57,6,174,57,228,163,99,250,230,177,248,112,179,215,42,147,92,204,46,72,101,49,32,61,187,203,144,116,83,186,39,59,211,54,208,248,150,180,233,10,142,10,201,19,115,153,63,7,7,144,31,209,53,158,91,60,208,47,127,129,202,194,185,129,73,183,69,159,21,167,71,83,123,164,196,98,96,246,185,114,115,141,243,188,80,164,184,248,175,252,246,19,176,230,242,151,88,203,147,118,4,59,43,169,143,48,26,205,135,234,26,95,14,28,222,189,134,41,231,110,166,123,185,39,227,213,63,195,77,58,14,56,195,72,80,172,146,202,71,185,212,227,222,19,67,107,125,182,105,20,139,11,215,13,69,188,244,63,87,41,38,32,215,182,42,233,68,59,27,35,211,23,29,195,252,39,208,177,126,41,34,132,152,72,176,22,130,70,62,190,40,20,145,211,104,105,237,67,223,44,194,207,122,91,1,237,141,131,53,1,170,227,235,69,250,140,10,102,165,174,122,208,14,145,62,173,134,68,9,125,145,211,145,127,228,127,187,168,129,228,17,90,177,206,5,223,110,
+207,78,177,94,250,231,227,151,141,35,255,180,158,118,51,94,209,54,226,177,157,210,60,152,198,92,204,123,200,212,230,89,190,190,2,36,207,155,247,105,5,124,55,187,239,27,215,143,221,210,81,187,21,230,118,91,148,136,211,65,163,146,184,147,236,95,187,251,103,191,125,177,36,143,243,6,207,39,195,127,51,242,108,235,111,201,19,223,36,138,15,192,141,34,192,58,34,243,241,201,88,151,214,222,173,129,83,17,147,62,131,193,46,187,35,31,170,243,211,35,205,205,154,81,206,110,50,159,70,24,106,134,186,187,123,37,55,17,154,231,251,49,110,88,177,80,68,144,134,12,145,212,72,43,147,110,213,145,123,133,254,129,117,65,255,133,15,110,20,31,4,217,53,39,30,130,240,166,174,188,135,107,104,253,239,15,120,242,241,151,123,93,99,246,168,147,159,161,15,147,185,251,255,131,159,127,79,198,16,126,37,99,102,179,7,208,221,34,139,146,202,212,59,111,76,197,67,14,221,57,211,172,39,195,185,63,151,37,136,15,208,106,187,224,84,248,12,58,91,172,164,56,127,37,38,54,
+191,150,88,25,156,212,209,186,64,171,119,112,202,2,135,237,197,147,141,47,27,155,145,154,57,58,242,12,238,238,85,171,151,181,64,157,192,7,133,251,75,238,34,24,216,221,243,120,157,218,75,229,62,180,185,169,237,42,158,16,191,123,90,190,22,218,162,111,142,118,186,152,171,96,218,252,64,117,144,4,209,199,23,49,101,58,253,242,54,212,123,99,56,24,173,220,91,85,200,189,49,39,6,72,135,71,241,242,235,161,193,30,55,177,71,214,148,169,179,39,240,165,77,37,115,124,241,64,121,10,137,117,245,45,124,192,89,175,7,173,193,233,181,98,111,220,186,85,176,103,143,223,176,206,247,149,96,176,155,211,197,227,169,100,248,215,215,234,254,220,58,251,219,63,255,254,175,231,235,102,207,215,219,254,225,175,255,225,143,191,251,207,191,255,199,243,53,189,231,123,106,255,175,191,252,237,111,127,249,211,111,255,225,119,127,254,253,111,127,249,119,191,253,239,255,254,247,255,219,255,242,191,254,155,223,254,231,255,252,219,63,252,241,15,255,240,127,255,225,207,255,244,219,31,254,252,
+143,127,248,79,127,248,199,255,248,187,63,254,246,135,191,253,254,79,191,46,187,61,95,233,251,167,191,252,39,180,160,127,117,207,240,95,255,159,23,13,255,245,92,226,175,59,119,255,250,111,126,251,63,208,167,254,225,119,127,254,237,119,127,252,235,95,126,251,231,63,252,211,191,255,219,255,249,223,254,212,113,46,225,159,126,255,183,223,254,248,151,127,248,121,236,220,206,63,253,254,207,255,241,183,127,247,151,127,254,211,255,235,154,224,127,185,11,247,191,255,31,255,237,191,253,111,254,167,255,225,191,35,95,100,47,206,221,199,201,78,63,87,225,214,68,67,177,135,118,23,111,44,107,174,165,157,84,23,122,83,151,175,132,132,168,239,44,188,76,85,86,217,195,164,110,159,56,63,47,201,87,161,147,159,121,117,77,38,82,6,117,28,94,90,130,18,187,180,91,118,37,25,96,225,112,87,71,100,179,73,84,69,195,157,150,242,90,217,73,88,25,180,123,138,126,199,72,228,234,116,147,25,199,210,169,242,220,186,108,183,219,157,239,163,142,188,85,171,7,29,252,170,25,231,243,107,
+55,229,240,89,243,4,189,94,140,247,215,231,255,235,247,3,253,218,29,251,53,112,154,134,137,232,7,67,252,245,241,184,129,218,177,211,101,227,152,27,241,79,135,208,175,187,17,31,227,110,61,22,175,154,246,125,252,62,199,116,12,70,136,193,60,76,233,196,47,254,219,209,51,29,98,213,23,240,211,254,87,254,15,231,131,247,168,115,121,246,32,65,180,63,134,103,216,30,241,72,164,23,107,24,81,244,209,227,108,156,250,85,52,139,247,206,139,153,144,172,233,162,251,129,16,25,107,46,199,84,207,247,81,63,222,187,99,239,149,10,49,222,148,148,109,141,126,44,11,121,12,216,9,214,137,241,98,23,151,56,12,45,62,190,239,184,119,45,93,237,160,74,63,102,20,6,234,70,81,249,160,184,99,227,208,100,220,154,45,239,224,76,118,101,220,39,104,199,6,229,65,122,232,116,136,159,83,68,211,222,81,54,84,12,75,30,133,175,101,6,204,251,4,245,210,235,183,52,143,248,84,253,28,243,143,143,223,107,207,102,71,169,157,132,237,192,194,206,54,117,221,150,214,218,206,46,
+230,171,45,219,117,178,125,209,137,37,9,227,67,115,240,146,170,158,138,221,241,225,149,62,15,136,198,73,238,178,86,225,97,212,151,107,84,213,140,94,137,244,154,12,195,70,122,50,146,76,142,149,9,98,2,134,154,102,123,158,101,199,161,101,187,170,45,60,31,14,85,23,127,174,111,173,205,176,235,73,85,219,247,30,147,172,231,245,163,39,240,180,136,47,97,210,108,151,103,64,31,79,190,33,123,117,188,239,178,47,30,157,87,132,221,11,54,183,113,219,8,45,26,86,133,213,222,60,156,214,59,247,118,27,188,55,151,9,229,206,92,176,184,42,217,217,53,227,108,93,82,95,150,219,182,92,202,163,218,231,72,230,185,201,55,203,93,85,140,243,215,173,30,177,28,190,223,164,221,216,100,119,250,22,42,172,147,215,73,96,230,226,221,213,116,186,69,195,248,253,245,253,29,105,87,238,243,222,124,62,239,124,22,108,175,190,53,202,229,211,211,224,67,0,74,171,149,167,114,238,11,44,25,254,11,219,94,213,158,76,211,132,249,215,33,4,11,26,220,93,131,5,119,134,224,238,
+18,220,93,6,119,89,242,188,187,223,209,158,113,117,58,51,45,213,183,84,245,104,78,5,219,151,160,44,141,15,172,236,217,135,196,68,115,189,119,50,150,118,255,118,230,206,141,68,57,141,214,244,231,55,34,60,245,81,217,246,61,187,154,73,151,195,197,48,212,9,13,251,37,139,74,62,59,246,162,232,151,112,33,181,100,130,116,33,179,75,61,228,24,14,186,241,56,208,184,253,235,153,125,71,248,93,20,74,31,236,78,54,206,201,71,125,55,124,236,123,229,239,35,239,231,82,83,120,49,91,35,94,23,218,108,156,212,86,41,93,219,179,40,39,94,182,6,191,45,33,197,30,193,233,247,69,6,86,130,243,242,222,183,66,196,7,227,251,237,240,152,238,110,61,220,199,64,95,138,190,133,205,244,232,176,194,10,81,78,106,197,36,240,174,191,45,233,115,88,12,100,113,65,53,144,236,142,60,164,49,75,235,185,18,54,148,83,46,215,222,173,247,131,99,194,7,125,178,102,19,184,210,69,48,77,214,139,3,91,92,88,8,208,212,3,62,182,221,110,137,254,103,47,160,221,95,
+29,215,218,47,119,74,123,122,30,245,104,127,220,207,25,140,132,45,239,192,190,246,10,105,142,149,220,82,175,74,47,82,202,181,232,239,229,114,33,157,122,182,158,173,102,168,53,194,4,183,163,107,175,210,170,103,220,162,215,66,27,56,191,59,31,118,146,74,96,73,0,30,99,41,58,35,32,238,145,252,82,36,18,185,96,191,57,113,57,70,253,242,102,67,250,58,108,236,45,151,199,67,163,222,140,208,74,64,44,170,217,98,237,61,68,176,198,6,244,79,252,230,154,151,12,145,91,172,42,77,155,112,8,39,103,93,13,136,113,196,234,103,208,198,204,93,220,117,139,85,131,121,123,227,155,8,82,28,42,174,33,21,127,16,103,247,221,91,54,239,210,101,0,13,213,205,187,36,66,39,112,214,132,26,138,86,206,185,41,124,36,142,249,254,242,155,206,160,211,179,239,72,63,56,96,162,8,18,253,220,108,61,250,241,67,157,87,41,245,79,205,162,244,108,167,250,218,54,7,1,115,226,160,223,154,120,226,202,181,185,136,129,10,109,175,239,143,47,44,31,32,41,247,227,50,125,
+109,99,55,143,218,73,203,53,245,112,146,175,181,92,214,20,163,122,241,227,249,189,21,40,103,254,123,10,93,8,183,79,17,79,165,84,150,52,70,214,62,96,119,109,94,118,18,40,205,29,13,234,250,249,213,151,132,196,28,148,117,98,23,195,4,84,33,191,111,45,89,61,13,9,235,147,43,71,211,9,158,184,144,199,244,100,113,177,103,192,230,221,153,188,188,204,208,31,21,251,54,42,71,224,219,77,189,201,190,46,184,243,29,123,123,232,163,182,27,32,19,228,121,171,204,67,174,172,207,216,119,137,132,153,236,86,202,201,207,148,231,55,154,159,168,33,73,221,47,43,61,8,40,236,142,30,168,218,85,114,239,219,185,85,9,240,6,229,227,240,225,169,36,88,133,145,29,27,77,145,153,189,49,228,3,43,55,2,100,156,116,159,161,219,120,81,30,83,152,249,160,227,53,103,8,195,21,253,4,143,43,77,164,162,146,218,196,166,164,31,181,120,195,73,229,119,143,193,24,238,31,57,202,255,197,157,231,50,137,74,236,108,75,135,187,85,255,122,31,207,157,142,252,236,59,91,
+1,162,46,195,9,218,86,49,229,134,229,28,1,220,144,67,222,3,184,205,86,88,31,223,185,149,20,162,198,39,78,72,182,209,44,78,2,156,185,1,102,75,91,214,237,64,80,28,59,94,163,135,90,156,99,199,77,109,38,84,212,239,232,183,201,59,174,242,147,168,221,83,67,213,31,189,153,255,130,185,117,232,225,44,9,196,212,84,53,138,90,4,36,72,54,226,251,87,173,184,255,184,175,245,113,149,216,135,253,27,222,239,82,67,69,89,58,23,224,211,126,249,184,158,239,118,62,174,233,225,222,44,131,145,63,47,81,58,210,36,58,155,202,228,9,242,39,23,126,131,101,39,67,30,239,54,61,249,24,173,208,41,243,156,195,117,17,235,235,10,243,92,37,100,11,65,173,41,213,111,12,183,195,138,57,118,1,236,87,206,51,196,100,108,174,197,253,101,143,157,47,193,125,123,67,126,70,70,111,158,238,176,48,226,215,31,241,75,146,19,207,94,91,90,160,121,94,69,239,119,119,255,97,29,39,34,155,154,233,130,113,119,133,183,18,251,43,101,73,105,16,119,89,91,199,249,
+121,192,68,18,211,231,249,170,0,106,240,20,187,127,220,193,238,71,204,245,229,175,106,192,14,249,88,90,197,154,42,149,111,163,9,56,218,60,137,22,172,246,91,110,137,54,163,213,90,156,3,38,60,99,82,174,88,194,176,51,31,64,103,203,145,83,100,1,92,148,61,190,58,52,250,197,193,96,122,66,252,64,239,164,244,172,175,147,113,139,68,190,112,32,69,145,14,78,27,167,180,129,77,194,0,110,231,235,199,236,186,156,55,79,166,186,24,1,67,211,25,238,220,224,146,21,238,56,104,175,105,74,148,252,130,30,139,130,227,159,93,161,81,173,227,33,225,220,245,8,100,217,254,130,157,64,163,232,84,211,170,172,207,113,108,221,73,161,34,42,155,140,131,241,92,195,116,99,199,90,110,44,18,135,235,247,254,173,127,115,105,5,174,47,102,112,220,239,71,54,54,90,187,171,65,186,238,145,38,220,50,143,115,41,46,195,233,241,245,189,47,177,17,204,100,122,243,37,61,173,114,121,173,56,54,6,93,70,39,218,117,46,248,217,178,191,19,32,94,53,253,221,227,90,217,106,
+47,186,177,94,189,21,221,139,25,150,165,65,28,114,118,51,187,81,194,243,128,25,233,3,251,209,61,72,240,24,157,225,76,239,82,143,85,28,17,30,40,80,90,247,16,11,54,237,153,220,188,151,199,192,92,93,59,7,116,122,156,206,22,143,78,111,16,197,105,3,99,226,25,135,7,146,65,188,61,170,70,117,186,139,154,94,140,103,245,226,195,194,224,209,115,115,139,6,184,71,71,63,0,35,115,38,56,46,53,103,235,116,113,217,236,196,22,157,116,64,220,16,2,1,44,67,135,216,188,222,24,100,37,60,39,63,110,133,23,89,15,11,13,251,131,248,175,3,79,109,224,134,62,144,17,240,3,130,127,159,190,65,144,2,6,10,226,81,3,206,24,202,34,232,31,177,68,110,43,223,6,241,114,47,228,1,91,73,94,143,218,188,158,5,89,77,84,240,35,123,115,21,121,31,16,216,247,219,223,27,42,127,205,159,61,96,248,252,143,192,67,45,118,165,123,169,79,91,216,251,235,45,40,34,181,245,82,229,5,56,164,141,255,38,126,111,241,151,227,38,202,191,31,14,228,52,
+120,159,247,210,207,203,118,45,7,75,173,59,178,216,8,108,129,102,210,118,220,158,249,207,139,213,238,208,241,87,144,27,239,13,47,142,131,83,128,13,15,66,208,175,167,224,79,251,149,128,97,7,85,251,90,131,251,169,6,31,214,123,12,220,58,91,192,221,159,76,43,189,143,52,84,151,237,31,155,35,90,170,195,130,120,147,137,169,243,220,130,36,112,77,121,195,2,109,187,20,243,187,44,105,167,14,172,21,84,252,9,90,75,106,250,248,174,225,81,122,17,112,98,57,96,228,46,245,15,171,16,51,52,180,254,109,157,5,58,71,243,232,197,237,9,87,211,219,136,107,150,147,251,156,243,59,130,23,5,147,201,124,122,71,62,137,77,243,49,246,123,54,216,210,27,182,131,198,243,85,180,90,68,66,203,91,42,74,23,202,184,186,117,214,232,82,248,113,137,243,116,86,237,30,156,56,127,89,188,144,220,110,198,219,205,31,117,94,106,143,231,70,231,230,223,155,207,107,75,226,176,109,216,61,64,30,12,86,226,224,204,63,201,28,38,100,83,20,180,126,40,207,137,39,205,96,
+220,124,242,81,244,229,53,253,203,27,93,145,98,30,210,178,156,138,88,231,198,87,17,42,0,70,41,226,230,89,59,171,242,4,13,20,196,235,100,151,132,241,71,138,87,2,250,222,176,210,244,151,215,75,34,209,112,221,212,212,1,240,142,32,223,120,20,113,4,12,155,170,148,47,12,62,140,242,194,141,238,138,138,227,232,202,240,160,133,205,146,251,64,253,175,203,229,138,220,130,20,187,219,61,144,122,162,207,168,17,230,54,16,234,206,219,224,45,73,168,130,33,46,253,177,52,30,207,227,174,232,107,89,158,89,173,106,64,185,89,175,7,3,172,33,189,13,62,187,219,134,48,24,185,156,135,178,80,183,197,240,136,43,102,148,94,42,219,14,162,171,130,248,155,120,115,210,134,68,10,116,76,73,53,126,147,73,92,49,11,155,205,102,177,14,76,120,243,183,85,118,135,227,67,182,78,241,107,119,115,21,210,104,54,115,221,186,84,163,85,224,80,180,236,54,161,168,6,152,91,248,27,201,222,102,68,202,52,73,126,198,183,7,201,234,28,202,206,63,218,146,143,22,117,121,51,
+84,172,224,193,229,169,12,41,204,168,72,210,133,153,234,90,49,53,100,18,189,64,93,231,198,178,87,243,81,112,150,220,132,192,227,128,243,121,243,167,164,227,79,173,181,65,86,52,65,30,220,151,162,36,134,226,72,129,32,193,99,73,82,97,226,17,71,202,53,116,199,243,76,246,203,106,183,243,158,186,95,108,15,110,188,240,179,101,209,195,55,129,197,125,57,63,142,37,222,137,134,128,58,132,185,123,59,122,63,139,29,114,216,119,8,61,199,131,10,17,124,137,40,239,168,247,25,57,24,59,199,77,166,52,225,0,137,93,153,113,93,126,9,236,189,27,51,225,83,166,242,157,80,202,207,121,46,163,209,65,67,166,172,166,236,236,55,108,139,94,61,209,74,146,138,26,122,137,155,157,83,248,126,224,207,71,205,104,247,209,38,255,186,175,231,166,113,62,59,248,213,248,82,219,180,115,31,243,237,58,36,184,141,118,39,5,134,29,71,239,31,249,246,60,54,119,77,82,223,16,155,235,71,162,244,176,33,227,13,54,38,241,96,109,154,38,63,94,117,217,26,199,140,1,159,141,
+215,247,73,152,43,144,228,90,51,149,221,87,42,226,190,216,219,146,207,22,103,196,143,47,14,251,133,70,137,93,196,158,143,13,83,188,2,75,170,88,231,52,67,114,31,89,36,28,209,229,103,244,45,238,224,152,138,139,78,37,162,68,166,218,198,181,224,229,193,83,143,121,3,88,11,197,62,146,129,234,212,187,119,69,227,160,53,145,253,28,105,174,237,203,244,203,161,183,151,63,211,132,106,242,139,190,12,135,184,33,204,230,234,174,79,52,81,247,238,129,205,79,136,47,104,121,231,158,185,155,71,30,108,30,175,164,86,84,191,91,45,83,135,57,245,26,17,59,95,114,159,94,33,21,107,164,207,43,122,171,254,148,182,76,155,192,129,16,15,118,146,189,180,98,190,228,131,3,139,55,131,117,212,14,215,151,122,58,134,228,214,55,206,169,45,90,127,4,63,189,136,80,172,118,30,214,181,244,164,39,223,173,29,160,14,248,219,244,198,28,205,173,135,40,250,48,58,108,87,245,99,241,171,142,75,114,57,27,170,170,153,16,247,82,61,184,230,124,95,102,246,133,198,181,69,248,
+16,202,155,96,238,5,219,56,153,26,56,249,155,85,246,198,25,117,17,60,89,244,70,223,214,217,145,137,40,24,222,243,103,141,72,240,78,31,17,155,141,86,190,101,86,149,167,130,190,245,126,183,54,42,171,11,189,166,33,4,8,132,171,80,177,113,197,63,236,154,140,211,31,121,130,253,148,9,118,147,213,133,210,227,241,184,249,238,35,165,218,195,170,56,88,255,200,245,91,18,67,77,212,134,143,214,18,74,219,124,124,55,21,58,63,99,3,127,179,127,27,110,52,247,210,29,213,221,141,169,159,245,221,76,79,29,89,12,202,17,193,31,83,183,188,181,124,253,118,243,28,125,9,141,72,101,191,0,17,85,143,115,230,242,220,242,128,184,182,115,201,127,101,170,187,170,136,148,215,128,51,78,243,125,204,243,96,137,221,73,15,224,70,78,220,151,224,179,133,77,40,76,71,1,93,30,77,247,185,202,97,47,57,42,94,226,41,255,189,54,99,31,216,204,199,77,223,94,250,150,75,72,218,242,129,8,13,5,63,242,228,83,215,108,26,74,73,247,69,201,35,39,139,98,145,140,
+154,111,204,17,15,50,158,30,11,5,102,235,175,7,244,214,198,239,30,13,112,232,34,22,83,98,83,202,94,125,158,203,218,71,7,201,223,122,88,229,129,51,89,138,165,95,255,93,78,28,131,255,194,160,238,207,118,133,147,183,20,95,114,64,110,174,57,172,108,15,160,23,216,52,62,22,185,85,7,72,99,37,69,187,87,185,10,94,212,158,38,139,198,7,92,26,113,108,45,231,19,208,91,129,194,42,186,52,146,207,179,185,102,85,54,36,47,79,115,145,127,136,22,231,130,14,69,200,88,220,106,5,249,81,93,206,109,185,53,165,194,181,129,242,100,23,248,12,90,175,184,252,206,89,144,128,157,29,9,5,188,38,39,213,191,41,94,103,105,15,90,248,197,159,37,135,102,74,135,147,233,254,241,177,0,192,200,19,187,129,21,48,143,195,12,57,68,8,117,136,94,94,247,207,234,78,162,96,174,221,58,79,191,172,3,201,38,138,138,183,163,87,255,35,205,156,8,99,32,228,235,237,197,156,16,228,63,230,204,3,132,15,232,230,250,5,241,62,254,49,163,4,242,143,48,133,
+199,243,157,0,92,59,135,197,232,185,197,60,111,78,70,107,249,220,169,90,183,237,122,89,6,206,73,221,179,117,59,52,210,207,9,104,125,158,156,207,203,224,73,127,30,203,207,219,192,2,62,91,192,115,217,106,61,6,252,231,190,245,108,192,75,239,55,158,236,127,124,234,125,241,41,228,38,0,10,42,216,134,13,249,132,192,29,255,6,60,28,166,58,244,180,0,80,213,59,253,51,46,29,130,18,207,111,123,40,4,230,97,184,80,195,212,117,122,231,28,71,239,158,193,241,125,242,130,11,172,12,56,134,60,91,219,228,8,81,36,97,219,231,210,10,129,201,115,87,147,19,194,161,111,123,187,71,254,69,192,165,183,127,244,136,145,202,177,203,141,45,90,133,25,166,205,102,83,75,131,99,122,64,121,158,82,12,234,131,180,65,34,157,16,149,202,180,202,37,229,214,248,72,46,14,58,116,135,92,180,206,59,134,207,42,227,77,134,166,238,140,255,141,51,145,91,225,45,71,56,59,101,223,240,179,132,114,121,140,156,219,123,49,3,220,182,108,142,175,89,41,250,31,229,104,162,
+79,179,38,223,238,243,4,127,45,19,187,197,103,110,43,173,168,119,51,53,24,248,173,44,211,141,148,150,97,44,191,152,71,81,52,244,88,87,182,74,231,228,90,252,103,82,15,170,71,148,177,38,113,80,69,215,249,101,75,33,55,45,45,244,217,255,211,165,69,70,208,32,196,242,68,178,121,84,63,56,110,236,88,62,96,181,90,57,143,109,98,235,199,136,212,4,231,21,191,102,200,241,235,19,161,54,31,238,175,67,106,209,12,112,96,149,121,8,67,14,135,162,213,232,4,143,141,131,105,62,175,75,236,223,183,254,137,222,183,199,52,23,135,83,239,216,114,150,93,181,197,234,198,199,173,25,93,190,223,83,141,95,56,34,61,3,170,131,246,143,104,132,161,122,212,40,54,97,173,86,139,139,188,91,106,154,228,71,251,185,94,255,40,41,157,196,6,169,137,208,118,70,149,78,100,63,115,23,169,95,186,180,28,237,128,168,252,199,254,106,254,97,118,66,140,8,116,111,114,118,170,141,12,52,101,86,148,14,163,175,102,231,123,42,15,52,20,156,47,27,237,117,192,243,239,27,
+167,65,118,81,3,228,36,17,245,49,43,81,86,227,54,8,58,0,219,113,163,96,115,71,125,154,24,179,56,92,64,206,109,234,191,238,217,83,142,175,7,141,126,108,115,101,153,228,76,10,188,121,76,22,165,91,156,144,181,164,247,205,244,195,224,170,53,95,147,144,22,19,191,219,223,13,45,147,195,6,189,68,88,58,101,37,78,20,252,238,57,203,95,245,27,163,95,224,75,68,113,40,216,103,107,121,102,62,107,130,180,221,55,140,42,68,155,112,204,10,184,170,236,210,218,108,43,227,242,173,5,238,221,197,252,195,98,102,191,0,144,37,22,155,98,160,168,212,251,85,69,253,237,34,97,195,254,228,164,140,55,208,138,124,69,147,242,123,112,230,74,3,206,56,200,218,39,35,62,17,199,49,56,88,168,28,225,99,74,248,58,186,12,217,236,165,156,0,9,52,98,192,223,124,228,145,191,115,144,222,23,29,59,4,160,165,246,84,23,177,213,237,206,203,10,136,215,86,190,243,71,77,43,92,224,112,223,222,149,181,102,84,18,44,127,123,148,95,246,216,147,67,101,106,56,102,
+255,254,49,99,55,162,18,255,228,53,0,26,155,131,207,147,149,155,176,232,38,99,126,163,35,204,215,48,222,110,248,243,116,223,49,113,221,49,48,56,126,216,211,206,119,231,54,42,131,126,25,232,189,7,122,112,188,12,17,69,195,62,130,69,189,152,113,164,188,70,201,2,64,142,241,11,122,128,147,29,201,255,186,103,52,141,248,163,78,206,139,86,75,41,117,91,250,148,114,41,135,201,224,130,228,56,253,132,251,144,103,186,188,140,83,254,41,116,72,156,30,187,199,246,243,40,135,40,3,235,74,231,202,62,144,247,213,5,56,207,239,143,7,143,132,228,175,16,111,188,252,245,2,75,147,118,37,155,212,94,192,32,75,85,211,190,221,119,94,235,207,169,234,194,114,248,95,30,237,146,184,109,156,131,212,106,165,59,58,231,60,63,105,100,124,167,117,223,17,196,89,75,206,70,221,102,194,104,5,136,166,113,158,142,223,140,103,221,72,56,92,8,193,207,92,105,166,122,65,74,243,84,53,213,189,138,0,8,221,189,246,237,192,28,199,229,157,204,121,71,40,220,5,192,207,132,
+62,142,213,57,205,158,143,242,26,158,109,227,116,93,46,95,97,235,196,202,94,171,105,36,116,71,222,79,246,143,191,152,15,22,128,139,233,10,17,48,145,77,137,228,39,93,115,35,90,50,71,183,92,214,74,43,209,222,111,15,99,149,25,212,53,61,20,103,2,29,48,4,23,219,75,42,129,52,126,252,141,143,133,189,109,68,208,192,192,199,57,252,92,222,91,30,75,168,229,166,168,14,143,189,194,240,197,36,121,41,41,175,221,174,159,238,153,199,144,181,207,73,175,14,187,240,139,76,66,223,187,61,27,118,67,200,197,65,159,48,247,238,125,13,109,108,220,176,35,129,137,68,240,140,254,128,116,120,212,121,207,40,92,118,36,103,156,255,246,147,129,208,212,187,126,161,150,141,115,85,143,232,167,149,192,246,89,74,200,32,175,99,18,162,201,91,249,247,107,100,23,46,39,100,147,136,82,126,107,137,49,152,62,76,30,102,47,23,38,130,54,246,13,157,184,32,120,42,3,165,146,53,160,176,183,115,67,203,204,83,91,73,216,247,247,20,226,207,65,29,144,118,219,214,22,64,
+78,187,135,20,96,203,160,55,30,254,237,245,119,72,225,29,250,231,70,94,16,44,121,97,240,31,4,107,94,24,252,7,193,148,63,210,232,31,7,255,143,7,250,255,241,192,15,255,23,140,65,110,136,118,247,93,160,133,172,32,208,15,72,27,118,110,48,197,225,56,24,125,88,62,32,135,159,191,244,106,167,206,0,92,40,111,198,251,248,122,205,121,115,5,141,153,184,60,9,17,200,86,194,6,8,225,92,248,47,63,8,121,61,71,139,165,173,251,214,29,91,106,252,185,192,205,238,150,48,90,173,230,130,215,229,197,61,109,110,111,116,195,104,80,27,12,186,122,1,51,127,140,101,249,143,133,85,154,136,196,122,118,131,19,162,211,21,240,126,175,177,137,231,197,35,111,112,22,26,69,201,189,12,104,7,99,234,210,124,1,157,118,212,62,183,251,91,65,47,188,120,211,65,97,60,232,45,168,197,70,64,185,60,249,106,57,77,200,249,74,38,85,122,32,77,120,177,61,147,108,112,156,55,4,89,64,36,193,58,248,213,142,169,108,5,186,125,49,231,77,151,168,36,175,189,29,
+47,145,209,17,91,212,146,254,237,118,144,4,85,47,203,43,123,207,230,3,55,137,18,190,185,14,135,114,196,35,132,210,117,177,39,74,69,75,95,31,15,206,3,45,222,51,139,212,75,130,243,31,34,171,214,39,118,79,63,168,96,135,200,190,206,166,153,132,234,75,68,83,165,196,53,59,231,251,217,239,199,126,170,143,72,42,250,179,186,216,77,173,126,62,208,178,186,135,141,37,178,7,34,177,97,202,29,13,197,38,99,222,141,147,14,19,154,89,156,98,68,189,221,5,227,202,43,130,220,235,228,205,162,9,101,168,174,240,50,38,129,74,165,170,90,173,198,54,116,132,233,101,4,115,46,58,124,128,208,182,238,234,210,170,247,241,238,85,7,46,242,115,22,125,36,127,174,133,211,47,103,37,122,205,70,63,136,159,185,99,68,160,96,186,203,222,227,92,132,251,25,186,253,102,57,95,43,55,88,186,223,145,33,104,105,86,157,11,202,73,21,185,238,145,183,174,171,230,253,87,134,228,249,132,168,79,33,102,243,28,196,72,242,239,168,36,210,99,87,157,147,216,60,87,213,233,
+180,90,133,127,214,192,135,91,168,234,160,245,118,254,244,50,64,172,254,36,209,193,124,21,77,73,18,233,115,178,23,4,183,135,182,71,199,180,234,150,54,71,21,238,167,139,27,63,177,27,3,239,95,178,192,35,222,98,214,167,130,172,60,139,218,92,159,50,238,53,24,204,5,213,143,159,243,111,62,185,222,184,234,28,1,208,253,1,255,206,15,165,50,56,146,64,181,150,100,59,117,68,184,11,190,233,173,202,98,93,209,8,5,2,213,89,204,79,134,27,217,192,240,97,124,151,240,120,135,13,219,55,124,78,0,1,217,126,189,157,15,221,117,246,111,93,135,219,245,156,154,244,103,18,88,199,193,217,130,125,198,215,30,146,115,129,74,196,145,205,43,80,57,25,69,219,222,37,232,96,214,147,199,172,89,239,50,246,29,214,49,55,2,198,24,156,159,7,210,229,88,177,184,21,57,189,149,13,110,185,252,3,9,42,132,126,237,13,242,254,31,196,142,94,24,187,71,29,32,206,21,168,163,59,248,46,165,96,194,224,253,132,31,125,255,3,182,29,221,244,236,86,184,52,20,27,
+252,143,7,172,9,125,197,253,70,25,7,155,191,58,7,81,193,185,145,14,254,247,147,238,8,147,76,58,39,241,253,238,38,120,58,88,245,187,59,182,67,242,37,228,137,102,189,85,210,228,53,181,105,226,141,30,220,175,168,42,151,203,5,230,54,5,75,119,187,244,218,78,115,68,60,237,181,78,230,47,88,98,196,205,234,42,128,161,185,88,41,190,191,66,27,133,188,27,138,148,76,148,87,25,119,80,124,63,75,56,142,67,50,216,205,206,29,181,62,76,33,175,239,53,86,228,62,2,102,156,255,226,27,127,195,19,30,19,119,118,113,225,145,139,190,132,72,120,163,248,246,66,79,139,143,94,82,110,171,114,238,98,252,34,206,162,107,48,147,253,131,78,211,11,59,95,208,185,249,225,215,226,24,223,3,8,85,52,137,178,174,245,241,224,202,2,116,36,63,247,230,203,127,155,96,56,79,151,25,241,222,122,19,226,167,113,239,207,62,235,245,66,221,116,45,255,222,70,44,200,180,247,14,62,172,141,183,223,202,88,115,62,180,110,134,110,116,232,13,117,253,122,251,11,114,154,
+192,223,34,101,251,86,235,103,36,254,33,72,155,179,68,143,92,182,28,138,197,171,33,111,211,237,58,41,117,36,227,16,150,127,77,57,36,107,193,24,5,15,117,8,51,211,82,211,103,47,216,28,211,35,96,54,198,168,60,202,239,199,153,104,76,128,165,243,149,64,46,125,10,211,233,124,55,134,203,27,106,75,200,146,140,123,124,133,102,1,121,109,204,67,112,142,243,51,75,181,29,191,76,196,110,194,9,187,188,148,137,195,32,83,1,103,165,189,227,27,67,177,33,234,180,249,6,241,64,160,144,246,230,15,237,94,208,137,122,97,231,31,116,182,255,228,107,138,210,170,173,233,176,254,145,2,249,124,97,227,31,52,94,86,168,23,130,66,218,11,36,121,112,108,221,7,222,163,226,47,173,19,81,128,144,80,155,217,183,126,67,206,41,61,209,120,218,145,201,16,242,107,174,190,23,60,65,66,144,77,130,13,65,166,16,36,243,246,136,161,235,4,222,31,208,158,191,172,85,17,80,255,55,31,126,118,68,21,67,198,159,175,174,111,156,24,78,50,241,8,208,192,15,215,69,15,
+29,111,199,208,11,78,41,89,113,255,216,220,31,249,166,37,20,178,29,48,61,215,2,206,203,243,157,147,56,47,138,13,159,128,111,180,233,91,138,181,123,164,113,135,23,238,82,154,92,249,16,107,249,88,68,59,85,71,156,255,41,59,119,145,26,170,9,238,155,184,155,253,22,55,229,172,248,140,41,89,227,221,200,14,75,115,199,120,9,69,181,108,1,66,203,18,3,123,163,168,123,14,8,165,103,71,164,24,132,92,6,239,231,107,3,83,38,47,233,242,73,202,117,216,243,14,189,239,200,102,49,136,122,110,143,167,253,54,238,190,201,62,113,167,253,253,190,60,234,34,181,253,101,16,2,113,43,117,162,173,168,54,54,238,23,201,112,204,55,179,197,66,89,210,5,104,251,254,228,59,11,7,199,110,171,34,81,183,6,31,141,48,109,243,218,142,68,179,6,189,78,187,232,1,252,152,159,64,33,18,169,121,83,99,161,215,93,226,30,144,29,21,128,127,217,243,152,237,143,75,73,9,139,130,37,207,243,36,8,22,185,61,176,164,98,13,108,26,27,235,101,128,81,236,130,126,
+137,71,67,183,27,103,53,68,108,225,147,166,85,17,254,153,30,38,145,209,28,108,163,172,155,194,63,247,235,154,62,242,151,196,216,151,178,222,5,172,161,254,87,244,102,254,174,254,37,114,90,191,14,212,241,180,154,150,157,81,144,162,6,99,74,43,221,106,93,31,245,191,174,185,203,21,121,144,1,206,62,206,237,100,108,172,141,201,169,36,138,162,136,170,13,116,247,83,117,68,172,96,153,210,66,137,18,244,70,144,0,251,243,200,118,247,56,236,177,40,85,163,176,223,82,129,61,111,154,214,205,103,121,51,13,50,205,143,101,128,25,121,134,185,15,162,73,183,154,207,156,248,9,186,156,156,244,150,252,44,138,25,105,26,151,102,228,213,73,180,161,223,127,47,145,65,206,200,36,108,83,40,130,78,199,23,211,240,190,235,138,191,99,225,111,214,225,237,244,235,159,193,207,13,120,139,91,68,70,192,169,77,28,62,47,108,148,148,105,16,179,158,29,151,248,250,34,137,243,192,78,216,88,198,180,101,98,220,195,16,194,188,84,125,156,212,188,231,141,48,142,90,39,170,137,222,
+62,2,229,68,165,59,205,70,75,156,77,105,150,50,15,214,131,163,54,232,79,43,83,167,146,229,138,250,135,254,81,108,216,72,111,85,133,68,252,25,103,243,216,251,31,145,40,224,208,198,133,42,84,0,65,234,245,101,55,213,211,214,252,161,230,213,122,7,132,227,83,221,74,22,106,247,100,204,100,154,28,38,85,116,132,89,84,87,50,16,175,225,140,118,133,105,242,118,19,39,209,211,1,179,59,124,133,29,167,76,163,77,40,47,125,85,42,17,91,13,193,20,38,111,130,231,239,202,153,235,85,239,23,218,233,158,218,202,150,131,173,193,38,250,189,206,107,29,104,3,57,13,11,233,87,185,168,97,126,201,161,0,42,192,81,191,200,132,243,195,144,143,194,3,93,202,154,101,26,147,185,170,117,74,161,125,8,128,226,94,192,97,187,163,13,67,105,70,13,164,118,230,79,140,130,23,244,64,162,232,147,10,36,203,201,49,166,138,8,193,187,176,95,0,153,34,59,163,176,6,105,116,78,211,117,84,110,128,96,72,6,18,19,51,201,54,201,12,64,90,113,129,16,149,17,77,
+25,37,14,150,138,144,71,90,165,66,190,160,202,241,217,63,70,84,24,210,226,121,118,220,240,62,224,115,18,48,142,72,140,3,231,206,125,133,147,233,240,21,60,158,198,26,150,242,174,169,69,169,228,217,189,82,82,214,61,228,165,168,100,100,75,165,152,13,156,61,234,190,86,212,190,73,33,114,226,219,193,146,100,197,39,52,243,190,147,97,218,191,33,2,226,18,241,217,45,205,157,193,133,110,21,251,152,172,203,3,77,20,1,102,6,37,139,98,114,179,32,249,239,17,240,1,21,196,53,47,129,190,98,253,163,201,1,237,24,113,198,242,251,95,136,155,193,183,172,247,251,73,145,227,41,96,152,63,7,249,46,176,50,86,34,223,143,141,93,109,169,0,120,189,203,227,89,30,116,213,253,84,142,24,122,34,63,182,132,90,57,74,156,139,220,185,195,197,35,191,75,237,48,38,213,255,10,165,51,137,128,121,73,175,19,54,106,175,45,44,149,151,6,113,153,74,169,203,103,33,5,203,39,89,152,181,87,249,90,185,251,65,35,10,168,99,238,44,251,164,1,205,137,161,224,59,
+160,92,227,11,188,194,242,194,72,186,52,97,167,125,2,128,247,61,105,227,140,208,13,154,107,207,12,161,191,214,110,221,63,158,118,59,25,97,105,12,88,227,227,38,122,17,242,133,142,159,31,184,199,184,132,225,3,157,140,102,82,214,253,136,41,242,214,87,24,253,29,86,250,120,134,10,142,221,201,235,4,250,183,73,6,143,102,62,227,53,33,29,73,178,111,78,222,91,241,172,177,170,182,227,108,85,186,253,213,173,76,246,47,106,50,201,102,239,227,4,246,235,192,21,175,147,20,107,176,169,169,191,237,174,102,180,145,151,50,139,50,189,18,217,199,12,227,233,112,166,41,160,115,206,232,197,111,88,245,166,155,199,116,172,148,174,105,24,88,53,136,10,231,253,77,70,110,175,3,76,231,110,245,149,25,234,47,162,186,29,108,126,95,79,232,61,148,31,94,189,252,167,199,21,96,144,249,58,154,30,222,216,217,251,199,201,47,111,200,217,56,135,33,114,11,21,72,193,32,165,11,189,166,237,169,58,149,41,136,248,238,154,156,114,22,189,224,150,119,233,158,182,230,212,230,220,
+206,13,49,52,92,8,207,211,94,169,137,91,90,253,201,141,202,244,229,185,198,101,15,222,163,70,140,212,110,255,239,136,156,226,139,130,145,180,173,85,175,175,194,153,183,104,223,202,192,172,177,146,126,172,45,48,66,95,160,246,199,87,108,132,16,93,253,6,254,148,185,234,143,172,94,92,133,103,254,255,117,254,226,63,157,223,193,82,96,63,39,197,55,50,247,95,51,164,244,249,82,247,94,232,230,196,134,240,95,3,129,8,255,241,25,0,245,173,198,115,65,246,10,188,157,214,111,31,156,2,97,242,130,109,172,26,88,11,149,138,239,244,71,17,206,193,190,39,200,41,196,219,249,140,27,250,38,27,54,226,143,13,25,201,135,25,188,15,215,249,37,4,155,65,106,166,111,136,55,225,48,97,133,9,23,201,138,183,233,109,112,180,192,242,121,101,243,243,144,155,134,247,95,130,166,141,145,171,85,63,58,174,78,242,141,145,49,195,227,106,172,245,3,79,142,191,204,104,143,216,189,37,76,42,252,79,88,66,185,72,196,227,68,229,89,176,9,16,61,214,3,28,115,8,216,200,
+83,43,146,236,157,98,74,179,253,76,253,240,251,51,186,198,239,99,168,192,195,162,220,45,121,68,74,115,60,226,215,12,228,242,8,88,162,73,230,67,79,194,99,179,9,170,215,219,253,190,40,28,82,223,150,9,231,183,77,237,7,130,254,181,231,239,4,137,254,43,99,28,12,104,86,198,249,40,9,9,128,116,251,46,118,99,116,8,98,43,213,226,62,104,115,115,255,34,85,49,8,202,207,36,126,104,205,143,8,70,242,6,25,114,121,140,139,207,151,108,217,126,166,174,234,27,107,247,205,35,42,221,215,41,36,45,248,56,157,78,130,34,23,232,169,138,49,221,66,94,159,155,168,173,6,75,157,47,113,198,182,20,43,210,123,109,250,207,99,36,233,192,117,223,125,67,152,236,154,212,72,59,1,71,78,183,139,199,223,74,140,182,243,216,0,136,129,205,142,180,11,1,189,168,28,69,118,179,235,205,177,165,238,188,59,189,167,253,38,77,18,130,144,125,234,23,53,91,36,186,250,211,239,79,209,249,195,156,108,126,220,123,209,129,189,146,228,195,13,126,222,73,134,50,54,153,
+154,204,66,139,138,184,154,237,26,185,205,17,55,141,233,210,43,209,202,130,99,217,167,65,241,123,166,55,226,131,68,26,65,164,160,38,153,152,201,105,32,50,243,143,109,73,40,191,224,114,158,64,186,151,162,210,164,105,203,249,240,34,204,159,186,88,156,178,31,111,143,124,191,23,143,159,26,215,155,254,244,216,156,159,211,11,171,203,7,83,64,209,153,28,14,138,197,68,162,210,170,75,238,195,118,254,64,225,98,3,74,122,71,40,167,189,79,39,244,221,51,170,157,124,197,30,53,192,237,166,162,107,229,5,109,186,72,212,115,243,105,166,175,64,96,142,208,119,75,99,201,26,126,112,25,134,151,58,93,135,22,47,23,36,106,40,234,31,166,171,244,162,186,83,178,170,186,242,46,69,246,222,79,59,185,158,116,87,58,246,199,32,63,161,218,50,248,2,123,66,130,22,180,18,156,57,49,218,8,207,124,236,123,249,195,158,15,50,186,90,148,238,130,175,99,133,128,121,21,217,21,121,137,236,223,85,128,243,8,225,251,14,161,246,40,227,39,21,111,151,176,24,226,24,235,107,
+107,224,13,226,216,152,169,251,190,195,157,47,110,25,47,50,185,2,248,61,229,74,220,128,148,190,139,41,175,0,195,143,70,234,44,2,90,89,117,169,181,180,70,111,179,243,178,254,201,106,105,169,101,189,123,121,118,87,191,48,34,76,185,72,153,137,12,197,80,5,28,248,223,68,173,132,195,244,43,153,129,101,103,44,217,243,251,236,252,213,29,194,138,180,94,251,174,190,225,105,191,160,137,206,116,115,92,234,201,6,189,62,218,235,153,141,107,226,134,109,32,143,168,104,126,145,133,223,214,174,2,201,176,172,38,72,204,125,104,167,169,111,174,191,170,229,70,212,87,153,147,212,78,48,253,41,31,77,238,52,165,163,171,230,81,171,33,84,168,202,50,179,79,14,13,142,70,165,125,36,126,210,148,245,34,194,74,217,241,251,95,3,201,142,115,222,37,75,251,151,102,84,226,35,221,203,5,73,110,27,185,62,91,138,104,55,138,168,71,201,122,225,17,134,190,155,5,124,71,95,252,165,208,126,127,143,100,20,187,251,103,202,48,227,186,177,61,116,44,122,225,68,239,253,204,5,
+54,143,252,154,35,44,135,71,147,147,227,197,116,68,198,225,34,190,212,114,232,72,142,61,19,107,18,56,74,151,77,203,133,145,88,160,159,214,188,22,30,131,199,26,15,53,153,204,245,55,72,42,246,243,125,255,197,152,216,46,19,135,86,206,44,203,178,213,25,190,94,211,239,221,214,208,164,190,231,165,236,205,179,93,99,247,63,120,179,241,214,51,58,115,121,90,18,60,138,243,76,234,193,246,221,24,21,13,69,70,55,122,147,143,72,33,202,238,63,61,78,107,109,132,32,35,57,170,244,231,124,46,73,150,228,237,210,204,244,70,225,7,141,189,74,100,137,220,248,134,15,216,250,122,189,150,126,50,242,84,234,97,117,207,29,173,133,48,210,97,171,228,62,12,79,44,142,131,147,10,81,126,142,7,132,173,231,7,237,60,29,168,134,246,211,219,207,136,40,155,253,192,210,167,129,169,46,160,133,121,183,46,175,182,126,126,237,156,163,193,198,204,70,242,231,75,112,148,210,2,254,168,6,85,244,88,239,83,169,86,52,12,37,75,176,244,205,216,145,68,206,176,32,92,123,72,
+83,216,33,228,214,211,177,95,32,166,63,227,61,251,179,89,158,126,246,107,97,185,164,218,251,48,194,28,6,46,204,3,159,73,152,226,249,164,60,98,114,151,197,119,115,137,151,48,16,56,23,135,56,126,161,177,223,114,44,29,207,118,107,36,73,241,168,182,91,184,46,206,195,221,199,113,37,26,69,192,214,189,107,81,85,108,243,24,108,91,52,32,139,73,82,177,10,204,87,219,95,36,91,91,248,174,35,145,201,216,38,85,146,12,140,77,242,69,162,77,138,247,119,67,150,179,55,193,117,205,152,35,104,119,85,245,145,173,119,16,218,241,140,65,158,231,54,226,208,227,224,209,207,78,190,108,146,254,81,190,28,44,172,215,194,159,21,112,180,179,170,104,93,157,229,98,65,29,189,1,177,239,243,84,250,144,237,228,225,24,91,157,146,201,58,50,136,242,181,7,50,166,56,10,250,172,182,189,0,118,122,20,42,80,72,69,151,22,78,79,151,198,200,231,17,114,122,93,53,77,191,11,222,61,191,183,249,97,244,209,12,223,222,199,79,173,236,81,109,223,4,98,8,162,167,134,
+182,94,58,224,115,96,29,135,48,9,222,170,73,249,50,97,218,134,170,230,132,217,204,31,1,32,80,152,87,68,159,88,247,139,218,171,212,253,35,127,68,183,116,139,84,177,144,66,33,4,8,3,254,5,160,116,224,143,53,181,183,37,141,245,222,123,99,124,103,80,116,136,109,7,10,210,244,37,49,45,133,24,161,170,191,100,179,10,128,194,21,168,151,123,226,188,56,13,114,122,225,60,2,250,119,233,11,178,135,110,33,126,229,139,157,218,222,54,254,175,185,159,249,107,62,227,32,93,216,171,131,231,181,115,84,232,249,101,162,188,142,7,204,158,239,11,177,103,46,78,66,91,117,131,109,140,226,229,174,95,90,149,170,55,220,66,35,241,222,235,250,57,22,189,28,215,185,37,7,151,216,149,92,114,43,189,88,17,39,25,190,253,49,166,140,13,28,61,91,91,148,140,135,40,96,208,33,21,106,111,171,109,238,99,205,84,34,230,154,239,115,120,33,135,251,235,38,6,242,210,154,107,26,107,235,213,23,112,156,43,169,168,194,244,236,240,162,170,27,165,120,114,55,183,146,110,
+234,93,103,107,44,175,117,74,148,95,153,7,185,191,239,106,154,166,229,211,118,220,239,105,95,202,2,231,124,116,115,103,77,199,32,189,241,3,248,223,81,72,43,194,218,43,58,115,174,217,62,149,149,64,250,183,177,199,236,9,103,107,78,71,135,142,221,188,165,119,83,160,155,152,28,163,95,143,209,244,241,95,153,135,147,131,216,124,220,44,169,199,200,209,240,117,207,111,101,203,111,39,57,109,205,101,63,50,215,129,16,63,149,52,18,118,108,48,119,127,48,60,126,83,224,244,118,214,218,95,107,4,61,115,169,102,171,114,137,119,110,7,83,105,42,25,67,141,251,143,107,61,202,111,226,196,182,218,125,113,225,160,205,89,1,144,116,68,193,237,72,151,2,74,40,155,12,63,142,121,141,237,121,232,64,169,97,106,31,201,71,43,154,207,240,233,183,237,178,97,122,201,167,20,30,190,208,175,56,187,204,225,136,124,95,145,110,180,99,213,169,195,175,82,155,64,173,188,151,164,168,158,254,17,158,26,53,151,35,164,126,212,153,176,187,10,244,202,247,15,161,172,103,46,153,6,
+191,95,23,215,23,108,6,173,224,220,208,112,254,244,49,133,26,193,218,212,237,241,117,121,189,158,169,74,82,251,251,209,183,147,154,40,91,194,123,195,245,91,46,151,231,146,184,66,156,150,143,197,62,127,71,126,75,164,89,246,100,224,226,172,107,19,228,39,143,18,85,197,228,169,16,163,75,83,112,113,130,84,214,104,146,40,59,195,4,222,48,72,109,93,46,219,84,196,134,74,232,19,25,110,76,10,58,106,163,30,126,84,100,13,248,5,110,211,227,206,72,178,44,200,30,27,106,241,58,17,67,197,29,234,35,84,145,24,13,3,111,13,209,195,205,230,125,122,170,127,73,171,40,166,92,199,147,29,217,22,85,62,226,50,219,127,183,171,157,146,129,139,136,250,82,147,46,41,209,74,81,31,171,2,60,62,104,130,60,149,241,241,235,105,169,61,64,221,3,56,60,178,211,200,185,133,239,151,198,243,121,79,237,230,75,86,107,148,111,231,233,68,44,153,148,117,84,124,19,201,250,82,102,157,187,67,251,23,67,41,114,143,131,242,47,118,145,39,138,247,174,197,6,178,119,133,
+75,78,106,90,242,129,213,154,101,129,157,86,78,214,195,71,200,240,41,48,98,43,142,223,71,232,27,238,171,49,68,196,44,211,10,45,228,133,210,33,231,91,131,73,166,182,240,230,251,229,233,23,146,163,212,149,204,232,196,211,156,167,72,196,40,97,210,157,162,189,67,70,143,160,11,117,76,28,255,195,237,210,82,194,180,182,55,81,83,183,53,116,238,73,162,91,226,54,137,53,117,225,220,44,109,64,152,252,152,83,91,80,135,198,233,30,148,176,57,33,64,246,133,62,250,223,45,32,77,74,227,138,168,54,142,168,170,111,156,241,201,47,38,56,105,92,10,47,239,26,87,1,115,207,248,192,122,167,133,216,166,208,23,57,145,136,42,19,101,161,138,178,174,114,171,32,212,14,79,24,155,101,72,222,175,179,3,209,73,199,149,223,87,66,215,176,1,21,184,75,233,169,48,16,104,104,199,34,64,220,250,143,176,203,183,255,8,251,170,125,17,54,236,182,212,149,174,141,162,55,119,162,104,131,152,149,125,210,32,62,58,197,99,119,200,229,202,216,185,111,208,34,108,165,19,86,
+149,76,115,106,188,116,72,119,84,144,91,214,88,4,99,227,124,255,135,59,158,27,30,194,132,89,23,173,209,86,27,235,1,232,52,49,117,241,147,250,178,16,43,16,215,204,125,101,158,147,254,73,162,104,157,210,74,225,200,70,83,124,98,143,253,203,25,84,147,141,129,150,106,243,59,132,134,163,96,141,75,154,53,222,166,217,152,0,48,203,217,145,8,174,124,54,118,102,13,85,222,228,70,17,85,142,253,34,110,118,202,191,133,94,72,83,145,42,249,9,203,178,164,94,180,59,165,172,76,124,224,138,173,199,198,211,28,254,128,70,59,125,114,223,154,178,7,69,213,47,29,199,19,189,52,36,237,244,74,247,154,54,217,25,32,97,237,36,50,55,183,205,93,173,196,182,82,50,219,126,110,237,125,116,33,65,218,23,87,42,94,26,203,70,163,179,43,14,154,197,216,82,3,15,121,168,92,87,51,82,151,225,142,195,74,253,208,75,14,90,86,110,130,156,27,8,229,31,60,9,0,191,189,249,244,216,139,200,134,158,239,23,35,248,12,30,47,167,141,163,11,19,25,51,251,200,
+233,168,113,161,185,187,12,248,198,29,27,117,54,229,70,84,160,133,199,94,230,83,212,168,22,223,56,232,25,112,188,156,15,144,1,98,75,38,199,178,34,145,242,121,33,208,74,105,36,23,170,109,106,225,7,7,82,63,81,138,108,54,60,234,88,75,93,174,191,14,217,247,152,245,93,148,134,219,76,247,47,102,238,100,197,172,116,245,116,116,176,61,214,91,25,224,37,182,151,151,97,163,182,104,120,223,28,31,119,102,12,148,103,209,113,36,151,215,39,250,216,46,203,244,135,43,25,126,217,155,62,144,43,82,133,162,240,213,250,67,31,207,23,139,242,10,7,239,127,188,2,250,79,62,208,91,232,134,78,69,24,221,66,6,109,246,69,111,115,74,52,209,8,151,71,174,78,255,88,174,69,107,185,158,47,79,250,145,15,59,27,69,236,96,124,186,198,178,205,102,153,201,239,237,13,201,41,241,120,111,205,129,36,182,75,67,253,200,253,198,163,225,54,100,137,216,65,14,41,190,110,249,205,45,179,91,173,167,127,228,113,33,144,244,195,207,229,120,235,124,61,56,106,211,101,19,
+24,227,230,3,97,195,57,126,212,255,145,111,116,116,102,147,69,138,105,199,160,253,54,252,145,179,175,246,43,249,10,40,83,219,253,133,184,113,246,165,230,166,18,96,27,126,228,131,121,177,17,82,30,178,98,150,200,136,55,234,100,207,104,138,48,222,249,139,120,28,65,9,144,243,89,94,204,74,151,73,127,30,244,205,107,179,152,127,142,106,53,94,190,140,181,183,189,29,214,200,220,209,173,231,168,108,98,98,146,213,247,185,103,55,115,195,60,11,118,4,78,48,160,93,111,177,222,71,18,125,145,30,197,208,28,65,181,139,173,141,187,167,55,183,53,99,204,242,100,24,164,241,150,72,237,172,185,178,234,147,190,201,106,211,46,42,254,244,18,31,75,124,54,56,112,89,238,81,137,13,67,243,173,167,98,115,120,163,238,123,92,227,95,12,162,96,217,5,66,248,74,63,90,42,235,10,180,81,56,161,241,173,105,46,206,217,167,235,197,244,227,97,180,179,59,237,115,218,24,114,144,37,165,155,40,163,85,180,101,40,55,49,135,129,110,170,63,128,218,252,225,113,216,80,235,178,
+245,104,125,57,54,237,148,96,222,47,24,132,158,106,171,158,181,4,161,251,62,119,240,77,28,203,136,212,161,169,90,157,120,252,214,108,57,107,253,157,167,140,144,217,31,183,72,155,150,79,239,189,14,229,23,75,18,164,6,100,174,38,202,15,108,229,230,56,122,100,137,79,233,136,115,227,173,95,248,35,99,0,221,24,42,32,194,104,168,220,111,50,70,126,152,17,110,76,52,83,52,197,57,178,210,100,146,166,45,55,248,205,58,231,25,142,161,171,37,81,91,156,219,32,216,123,123,152,128,178,148,207,67,38,214,194,119,70,68,254,184,232,136,189,242,10,125,173,21,118,127,245,44,255,75,196,48,200,83,185,74,196,81,220,190,79,40,66,126,153,160,249,246,80,106,104,100,174,174,229,196,198,189,242,142,82,50,81,32,205,224,95,15,205,162,125,19,188,120,58,206,68,220,104,196,123,189,142,124,12,132,115,236,151,116,18,195,146,97,95,71,45,33,40,63,172,56,95,178,179,26,122,27,144,118,6,192,65,93,118,140,223,102,185,65,232,255,20,143,244,134,16,188,52,57,180,
+180,250,207,240,171,27,76,226,223,213,138,207,63,191,47,103,160,228,136,55,152,253,21,11,165,255,154,251,191,86,8,254,245,235,68,252,167,114,172,16,202,159,202,25,38,90,237,150,71,31,127,172,187,99,56,197,166,224,253,223,124,115,207,152,77,181,121,109,231,180,157,66,186,116,249,227,49,100,251,206,61,102,48,232,13,145,248,75,58,24,66,100,115,235,202,63,215,37,104,11,164,240,227,53,126,64,56,43,26,167,121,93,176,50,168,9,248,118,120,155,30,16,127,221,62,91,212,220,2,209,147,97,151,6,149,197,45,69,85,174,178,73,105,47,182,102,215,125,121,186,50,30,245,155,194,16,247,247,37,97,248,115,189,246,135,131,92,236,218,93,228,87,82,36,219,70,216,99,76,240,106,240,98,36,219,170,191,31,243,52,80,28,125,26,119,111,66,111,201,227,55,115,203,242,39,247,23,141,28,92,204,190,169,163,146,11,1,135,72,102,82,163,235,160,189,202,57,114,157,254,78,106,56,127,225,155,154,158,216,205,247,143,51,140,143,106,228,140,116,75,179,141,92,96,94,48,
+87,177,205,71,217,83,100,199,120,41,194,48,226,172,15,147,247,241,81,14,253,115,254,155,201,199,174,5,55,166,145,156,20,121,110,66,37,31,190,124,236,104,152,112,234,16,167,187,15,141,145,11,156,20,199,157,9,197,206,135,62,228,188,184,21,195,147,48,175,239,105,164,100,146,130,93,195,115,106,174,172,253,208,40,174,164,251,206,115,183,116,178,166,111,133,7,82,174,213,223,57,62,250,108,73,36,166,140,164,86,238,122,44,66,71,60,114,203,164,251,226,208,2,143,0,110,112,108,71,189,154,15,177,141,225,190,108,231,188,3,99,241,155,199,149,250,148,240,219,249,212,96,138,35,32,199,20,92,193,17,137,37,143,251,12,253,140,206,228,157,128,203,25,245,15,7,203,242,250,214,31,223,164,129,34,98,26,116,47,94,58,102,91,72,183,101,134,22,198,245,156,28,14,108,54,91,148,146,160,22,93,253,175,241,187,110,182,58,26,203,178,242,93,161,85,172,184,22,82,103,227,4,23,155,167,93,226,238,146,137,20,215,75,227,52,169,140,238,129,118,74,76,177,135,178,199,
+52,243,75,251,100,156,47,108,40,229,88,91,5,151,9,4,94,20,202,231,252,251,58,161,92,70,130,7,249,236,190,245,167,209,186,131,92,165,21,213,208,231,102,171,41,251,170,76,208,13,171,88,235,184,176,80,47,102,87,9,56,209,191,175,11,156,55,62,246,134,55,195,37,166,98,241,22,238,191,21,253,254,137,238,150,19,31,163,51,181,246,1,221,240,43,47,25,161,13,166,245,131,131,181,168,248,117,54,169,38,119,129,52,152,182,250,1,255,133,238,11,118,197,29,51,235,248,77,148,35,252,72,94,149,248,101,44,121,23,23,34,249,121,126,11,21,98,222,189,46,212,231,124,69,235,59,173,16,172,98,6,53,44,14,31,134,76,62,205,254,69,104,221,122,119,210,38,23,215,204,143,9,218,183,236,175,10,85,81,97,121,136,21,168,240,5,147,35,9,176,13,41,171,240,24,205,41,202,102,22,135,15,38,153,157,111,124,19,151,201,45,218,51,127,72,164,229,217,190,180,147,160,117,31,74,83,246,67,221,2,41,49,34,250,126,117,192,111,178,227,27,140,132,244,28,64,
+180,114,234,210,199,37,132,36,242,194,217,229,18,122,140,201,228,182,28,208,143,22,146,73,234,71,73,232,124,251,1,180,212,221,126,92,191,176,124,241,89,43,199,118,110,62,38,132,1,186,223,153,167,62,123,55,39,171,25,206,88,111,41,84,133,185,213,62,47,103,210,225,116,110,147,73,149,153,150,235,137,50,204,28,176,219,238,229,74,50,215,71,191,210,184,191,145,207,92,76,68,179,105,137,82,65,142,88,85,140,251,179,250,205,78,100,227,240,84,243,175,229,201,233,149,150,161,172,134,122,233,110,53,112,93,9,238,56,254,81,176,154,89,141,24,216,32,200,207,129,182,224,69,211,197,53,219,164,145,252,186,206,31,52,37,85,56,132,189,19,47,9,229,247,199,65,222,203,76,115,134,242,180,205,245,146,173,228,171,42,207,75,208,169,39,233,249,237,143,39,95,194,239,71,183,193,13,69,245,56,53,114,184,227,235,171,252,168,237,167,192,126,176,9,124,245,129,30,124,49,21,13,63,106,82,219,117,151,226,31,52,97,157,147,112,15,19,90,232,78,246,167,168,197,40,179,
+171,107,8,24,14,56,109,199,96,0,195,208,191,34,173,97,227,173,29,238,32,239,168,131,68,125,203,253,221,38,118,111,37,238,214,143,131,211,130,151,225,41,170,24,88,109,149,82,25,185,16,10,126,179,39,92,51,76,121,165,12,54,76,181,86,117,87,181,4,203,59,109,29,79,109,106,225,218,186,222,44,27,236,33,214,205,73,99,73,179,85,220,213,234,39,102,194,24,159,249,227,187,238,112,23,11,13,157,194,48,210,102,215,229,168,188,184,248,14,230,26,187,236,72,133,92,218,67,159,44,150,192,133,115,105,228,9,247,214,23,30,139,191,46,250,143,222,95,233,177,250,151,207,191,166,195,103,162,159,159,34,95,90,2,137,75,34,118,168,24,8,121,56,24,43,202,15,207,149,201,142,139,37,162,182,175,84,12,233,110,204,191,44,245,40,67,69,230,140,156,115,147,30,195,193,95,111,248,121,121,86,182,54,172,166,239,190,248,21,248,35,148,208,72,110,9,117,100,232,152,69,174,111,167,143,194,254,83,30,155,30,179,251,233,194,30,237,187,241,241,81,161,88,212,153,86,
+253,115,227,247,218,8,218,226,118,152,125,54,46,177,38,90,208,115,112,191,179,35,227,244,99,43,89,40,55,131,162,199,134,19,199,209,53,9,152,134,217,221,27,233,136,99,79,13,62,151,63,71,186,6,62,99,252,43,39,140,216,221,34,35,168,247,62,240,127,197,128,163,98,230,52,74,142,197,20,25,232,240,188,11,171,123,79,230,138,163,236,251,137,104,20,127,222,25,64,116,116,204,117,250,57,102,122,97,170,246,87,104,105,32,25,113,34,17,220,3,141,23,241,199,22,178,65,14,241,70,246,36,187,180,49,193,51,141,230,106,61,251,136,147,41,192,88,163,205,210,184,57,27,171,82,119,11,52,120,176,17,144,7,30,202,96,113,191,199,130,203,17,56,104,147,99,216,25,63,86,68,159,35,96,165,196,38,223,164,101,233,231,189,117,201,71,75,74,252,64,115,56,201,122,165,144,240,37,15,246,251,61,134,194,25,175,162,234,137,169,119,122,111,153,198,65,58,187,133,51,247,109,235,180,252,193,20,205,12,197,51,49,197,247,61,144,158,234,7,177,250,142,174,217,61,191,
+146,62,130,159,33,115,118,191,108,169,134,209,44,178,213,14,174,37,194,22,89,216,9,170,75,118,227,233,76,56,69,72,129,135,95,255,163,159,206,44,251,198,107,12,85,35,18,246,235,115,142,63,175,63,17,172,251,133,200,13,44,49,158,198,207,189,112,179,11,141,198,207,99,254,182,182,39,120,240,32,23,231,220,176,199,55,145,52,101,65,119,169,204,210,138,59,57,88,80,235,30,45,138,65,63,74,183,178,206,46,206,98,183,143,243,71,149,21,199,220,30,43,239,7,171,238,113,158,7,135,56,217,193,66,60,102,101,29,231,108,91,86,220,151,232,152,51,19,36,133,95,156,94,120,168,46,151,147,51,156,111,93,161,207,74,48,117,37,178,44,198,185,140,158,186,58,126,156,136,173,84,88,128,220,71,247,251,38,134,19,81,209,55,78,141,76,69,158,188,32,111,28,140,249,107,15,17,63,134,188,124,63,148,26,20,225,119,140,28,233,46,191,119,202,99,79,154,105,212,189,131,236,136,43,21,23,229,239,160,64,93,85,87,202,244,150,131,120,96,71,223,171,6,194,22,92,
+94,72,84,247,100,43,126,76,112,255,133,67,185,17,26,111,216,153,102,247,171,142,226,81,251,144,219,179,56,80,119,202,131,87,180,22,79,14,229,243,164,39,218,91,176,236,110,246,48,192,139,84,165,160,249,93,90,161,18,100,164,193,153,200,120,67,242,35,235,215,252,160,106,162,10,252,16,254,239,90,82,139,61,138,79,205,93,130,215,26,93,98,182,239,120,81,157,151,234,32,127,84,171,213,41,253,64,193,167,162,47,217,197,192,236,169,84,170,109,159,126,167,164,46,208,145,243,219,15,59,147,182,23,77,89,92,206,217,81,204,224,219,255,116,206,155,79,176,232,40,255,234,18,66,193,19,118,222,0,176,111,199,152,193,255,203,155,189,53,206,56,111,208,251,16,193,218,16,24,212,139,36,191,94,255,146,61,140,55,168,2,3,225,164,244,94,34,22,142,220,66,54,232,255,154,161,194,191,44,207,235,215,115,245,119,154,215,131,177,181,46,101,8,137,173,102,59,181,219,15,200,198,207,62,93,215,20,84,160,193,226,191,235,75,113,17,120,199,165,33,67,136,211,163,66,12,
+19,87,199,248,126,28,189,139,7,214,119,11,49,2,126,147,5,102,64,37,110,157,23,42,24,50,48,194,223,250,144,80,2,245,151,190,105,115,254,75,223,16,85,255,165,111,112,255,252,145,12,216,27,47,228,83,252,165,88,192,230,244,155,45,34,123,4,89,53,160,83,215,80,114,30,131,148,63,13,99,251,134,208,159,63,101,17,22,95,13,135,86,240,132,33,25,183,204,146,229,55,178,159,62,234,190,156,19,228,11,22,185,112,128,29,237,60,241,176,51,219,87,75,169,95,150,42,0,208,182,130,161,73,221,140,74,228,10,152,178,224,164,231,223,83,112,190,115,185,160,215,29,236,200,100,83,211,249,233,146,177,74,165,119,255,104,157,198,80,188,147,34,14,49,50,252,107,76,197,157,10,216,82,102,155,189,80,56,10,145,215,122,170,184,166,41,37,31,120,75,139,165,178,202,34,88,214,166,234,57,56,10,168,108,210,160,187,203,40,125,21,154,196,63,183,127,118,94,134,239,225,124,238,47,58,125,145,192,30,54,66,225,60,110,58,12,111,171,155,29,173,250,96,195,173,230,
+102,247,20,14,35,87,53,217,198,201,1,114,34,47,102,119,140,160,228,209,38,168,116,95,23,144,35,97,96,213,154,220,6,223,45,46,156,229,236,101,85,160,2,253,91,239,200,3,108,49,109,154,233,207,241,184,223,211,143,131,47,78,114,187,98,95,45,0,207,110,141,199,227,2,14,130,187,183,100,211,102,229,207,66,226,207,104,173,95,205,183,41,30,3,184,204,15,254,192,229,118,227,214,152,217,108,118,73,150,144,189,109,32,75,183,47,22,43,213,42,255,136,7,66,18,81,69,178,245,44,87,182,230,35,159,146,228,157,20,22,62,137,225,187,228,91,71,253,231,60,110,90,144,149,214,20,49,40,13,23,157,205,49,82,24,192,186,242,229,87,218,242,35,59,30,19,27,18,122,182,114,229,19,231,251,229,96,89,63,30,187,245,90,171,214,108,91,52,229,147,140,227,51,151,51,53,53,55,243,153,151,109,65,10,215,2,117,140,80,114,166,217,162,36,181,52,86,85,158,60,205,251,40,42,53,84,235,165,71,47,183,250,35,236,204,186,91,149,204,60,190,171,85,197,250,203,
+24,112,177,143,129,117,34,173,18,142,63,137,222,53,40,63,73,43,253,75,78,65,172,217,9,85,208,146,42,215,185,107,137,126,162,11,90,237,239,65,60,105,173,135,146,156,198,118,9,43,196,1,100,159,80,41,85,30,28,162,173,100,93,111,167,200,95,43,253,50,172,89,196,29,204,165,213,44,157,169,203,179,152,215,119,218,253,21,245,219,213,82,62,225,59,43,53,236,173,109,149,138,9,165,38,52,117,105,151,179,251,129,71,72,206,235,252,2,228,3,117,115,117,54,195,68,241,175,142,16,14,102,162,189,157,32,90,216,147,198,243,42,132,126,243,100,224,83,176,116,109,36,189,111,197,143,15,83,104,215,72,119,121,117,71,136,181,136,68,191,45,35,205,125,74,154,119,52,53,125,25,75,108,193,71,127,246,4,171,161,2,126,246,91,90,179,24,20,222,141,97,51,197,243,188,225,53,198,66,34,106,90,202,39,129,156,60,172,233,21,105,113,105,120,66,163,126,144,93,130,135,125,65,226,15,153,208,109,199,20,189,0,131,15,188,205,51,131,91,178,66,125,233,45,172,97,
+7,13,149,31,251,247,244,148,82,191,25,224,250,190,178,117,74,200,109,103,254,75,193,150,76,245,223,84,193,221,50,52,251,149,199,236,164,194,247,119,41,75,249,55,13,166,10,85,165,185,212,251,236,47,172,231,234,189,198,203,28,100,64,178,170,49,70,183,55,59,54,90,143,202,160,214,38,9,93,162,58,132,179,152,217,42,0,84,247,215,41,230,138,139,71,109,21,227,162,144,7,71,27,17,12,35,222,126,228,59,9,130,4,237,200,142,63,98,143,23,29,93,47,100,229,31,53,99,52,63,6,115,222,56,133,187,46,189,199,66,72,199,98,151,18,241,198,148,214,149,129,144,116,181,210,107,19,192,204,27,6,195,77,59,191,123,180,117,105,29,202,225,218,118,141,93,249,40,54,228,231,53,175,207,147,205,28,209,47,251,81,238,136,69,83,243,210,176,251,240,68,87,117,139,124,181,13,126,64,206,247,225,11,143,131,127,183,85,127,99,206,69,96,27,179,233,44,4,144,218,42,160,242,174,61,161,24,255,6,167,226,53,43,133,54,229,168,188,85,42,78,143,240,199,2,120,
+90,128,252,132,49,13,6,227,141,70,53,68,249,166,69,101,248,241,220,208,206,138,67,127,185,66,235,138,77,219,73,178,47,198,45,231,159,208,221,135,58,116,106,143,199,227,253,71,206,254,188,94,89,183,205,20,144,71,92,212,18,119,28,23,255,24,75,49,230,83,135,161,116,32,175,1,148,217,117,180,233,252,41,231,52,211,95,42,252,41,158,20,222,46,181,84,87,251,142,123,234,160,159,242,209,63,92,123,65,72,114,77,30,237,84,96,222,196,116,143,153,239,126,87,9,242,136,11,185,135,156,189,118,236,252,124,144,3,163,99,106,241,77,95,109,58,10,219,29,14,207,245,101,3,73,155,232,225,36,144,173,38,112,229,170,82,134,196,30,207,12,57,42,241,130,41,81,121,178,77,249,235,208,10,237,233,206,211,134,180,174,239,23,227,70,233,106,76,50,209,224,158,185,53,48,88,221,181,245,57,17,124,163,167,250,69,224,133,9,84,178,246,136,80,114,236,191,177,233,219,178,188,15,95,44,9,100,109,157,204,47,76,74,205,100,227,164,151,45,10,141,69,77,79,214,227,
+250,18,151,43,175,72,235,52,161,19,72,179,254,140,242,111,254,129,84,89,113,16,145,29,82,209,93,223,119,120,15,80,168,196,224,134,94,175,78,248,153,197,37,226,47,191,55,4,225,115,20,174,153,224,15,234,95,190,224,205,37,103,8,175,240,233,219,137,184,35,137,9,138,15,251,76,191,134,150,156,45,20,182,207,209,126,119,82,47,85,220,64,48,123,113,16,50,68,101,255,252,182,155,141,50,230,91,120,201,157,119,168,127,115,254,37,196,125,127,69,131,7,172,61,254,199,90,27,103,224,63,122,82,64,254,177,22,113,71,238,188,253,217,115,166,234,63,123,110,85,255,103,207,189,245,71,57,116,218,176,181,31,164,4,241,143,202,188,47,124,159,103,154,46,223,9,58,132,23,8,125,202,191,242,59,251,246,126,34,38,72,183,50,78,246,119,109,236,127,117,134,157,234,14,220,7,196,83,2,58,32,96,33,104,125,70,253,46,122,25,116,43,76,40,93,36,255,42,239,222,194,223,101,228,77,77,254,0,168,86,23,0,28,121,114,155,203,229,170,171,121,52,118,55,58,135,
+140,191,6,168,232,40,238,225,169,66,24,7,131,157,190,156,38,75,7,115,229,246,207,83,7,91,240,123,20,160,213,117,101,87,120,176,252,226,223,186,107,125,95,14,202,141,80,142,8,216,227,89,41,53,221,227,210,191,208,242,195,224,139,93,26,105,178,239,128,183,64,111,163,164,99,95,119,12,166,201,131,178,242,33,204,93,218,104,217,107,129,178,71,221,45,181,22,65,143,62,84,146,155,222,54,243,176,91,65,47,69,89,227,228,124,140,239,84,34,33,38,143,63,2,142,116,41,45,80,42,217,224,133,36,67,200,196,36,159,77,81,30,112,106,204,66,246,136,154,196,231,140,114,16,142,202,67,83,80,60,66,180,54,31,91,220,54,119,224,180,38,38,161,222,226,235,88,254,109,70,15,100,85,69,159,112,29,250,46,225,75,233,124,7,48,17,112,253,87,110,191,14,39,121,11,155,239,219,148,101,214,72,98,99,141,70,51,149,50,115,95,255,4,176,46,101,7,244,208,226,3,194,205,237,118,239,15,140,9,4,111,155,138,228,238,211,29,190,140,129,18,179,185,40,193,236,
+82,97,110,106,73,110,229,86,10,110,99,57,98,223,23,11,67,154,130,50,48,37,59,19,196,208,100,145,39,188,115,70,43,84,126,55,41,241,223,183,1,93,84,63,27,78,203,106,236,194,113,198,230,91,248,84,236,119,62,191,37,187,63,59,139,204,170,246,168,18,91,148,135,145,205,190,230,67,78,77,71,155,84,119,84,134,160,13,105,222,120,84,219,215,2,246,84,52,100,250,37,170,121,60,30,73,227,241,58,109,43,255,67,62,186,196,150,35,67,109,168,247,201,195,162,167,115,94,64,168,113,16,169,204,251,72,148,67,192,166,246,82,197,61,224,193,227,152,150,140,100,148,118,94,22,174,73,246,176,165,65,122,9,55,172,16,72,90,30,223,143,95,241,177,22,37,7,122,247,31,121,86,78,12,8,165,197,136,196,53,31,79,14,31,117,80,24,157,163,247,248,148,36,156,210,79,224,188,84,244,205,46,6,217,60,13,217,134,254,90,137,181,131,187,79,149,209,201,38,7,230,198,96,67,71,169,168,179,251,19,241,245,77,52,45,119,229,85,168,139,190,89,84,57,17,81,
+179,175,123,116,235,88,168,157,23,4,140,114,204,97,107,128,247,49,158,219,49,37,61,217,139,246,36,46,54,124,234,18,250,198,52,223,125,66,222,55,206,166,1,65,107,9,147,80,150,51,101,156,4,60,49,13,241,72,110,153,166,87,186,96,4,107,167,92,209,14,120,68,77,156,227,17,244,115,61,178,153,152,113,19,5,98,64,214,40,28,120,85,104,26,198,73,82,46,69,248,65,86,68,199,24,206,98,99,79,148,70,132,43,14,64,27,244,24,250,251,141,135,114,179,35,202,136,245,35,42,226,106,11,214,133,101,236,16,49,223,247,182,168,122,176,237,96,209,195,212,226,192,78,214,211,158,202,231,76,182,105,59,245,252,179,205,165,189,146,121,118,61,34,156,137,75,205,203,130,82,227,189,145,168,127,97,171,43,223,82,159,198,126,41,189,103,198,39,106,224,254,147,147,171,21,223,7,246,174,18,183,245,0,238,112,217,83,200,190,153,120,174,9,132,213,89,163,119,8,115,192,80,199,6,219,82,177,62,242,142,36,235,158,227,27,233,41,11,250,199,192,117,220,240,250,188,
+155,218,46,106,234,237,210,12,151,99,90,168,190,49,201,161,48,47,50,10,27,106,218,253,177,38,143,108,143,175,78,51,225,112,18,62,191,115,184,200,191,253,157,254,251,204,193,116,254,134,170,158,172,99,240,64,22,222,150,247,125,110,42,217,64,46,221,254,89,227,255,63,188,189,233,115,35,105,122,31,248,175,84,232,131,194,178,198,163,145,172,145,60,210,238,198,122,165,181,195,31,252,101,237,240,126,112,40,98,106,186,107,52,21,234,233,106,87,213,204,236,132,195,17,9,128,4,8,226,190,136,251,32,113,146,32,1,16,32,238,147,23,238,131,32,8,128,32,136,251,34,238,251,72,156,155,0,171,186,171,91,26,73,35,237,186,34,170,200,202,124,243,61,159,223,243,251,61,153,249,62,153,44,137,86,158,200,147,221,142,115,111,83,98,37,245,48,12,5,76,238,161,179,202,241,212,80,202,18,247,92,58,30,143,61,249,39,191,135,103,214,183,228,52,122,209,126,213,107,238,165,52,14,119,27,173,218,202,205,241,96,181,233,109,159,72,26,29,116,130,228,207,116,57,87,85,
+180,255,152,180,23,68,159,146,6,90,13,110,48,234,121,247,51,147,158,188,224,109,23,231,33,170,43,32,246,84,85,214,171,45,200,221,62,197,109,75,118,112,215,147,40,32,109,43,152,253,140,91,61,58,176,36,75,227,123,220,45,113,104,183,184,243,130,206,144,0,147,137,198,109,255,82,143,146,245,120,236,188,49,229,144,214,153,72,188,135,155,46,19,169,233,36,93,171,16,87,210,86,37,149,237,179,78,15,41,229,18,108,30,214,246,47,93,136,121,64,63,173,35,184,49,175,109,190,39,39,146,122,179,3,236,32,55,119,138,165,77,221,245,56,75,113,227,106,151,17,154,71,173,160,209,110,37,145,19,164,180,90,123,68,23,225,119,167,97,251,212,99,4,107,120,58,134,158,28,148,240,99,55,195,62,130,171,209,132,62,65,17,63,211,23,155,173,59,37,110,143,145,223,220,55,247,182,5,55,157,36,206,65,203,226,98,62,148,140,227,54,22,198,189,174,110,105,214,0,42,187,205,98,216,206,170,4,86,30,20,235,78,156,115,51,32,174,9,236,222,117,120,144,186,160,161,
+121,20,128,127,49,60,165,134,98,114,218,112,169,23,31,132,204,136,59,248,156,121,20,221,145,164,192,222,113,86,176,72,199,6,201,125,166,75,135,187,63,64,111,226,5,165,29,118,206,216,95,111,67,31,236,180,5,1,196,205,37,32,154,125,179,31,99,253,66,214,119,247,99,92,1,6,78,94,192,184,217,221,41,3,208,97,135,106,125,24,98,142,27,195,154,109,54,247,129,33,98,50,120,39,170,75,129,253,156,19,174,101,58,62,91,238,54,33,112,228,209,202,180,197,161,213,192,143,32,58,82,167,161,24,110,210,17,48,98,210,137,130,197,208,180,219,245,65,138,75,194,83,53,153,7,7,116,161,191,189,190,169,13,73,87,154,146,195,105,247,16,55,34,61,34,112,4,119,36,252,157,105,91,95,21,136,162,86,244,61,70,198,222,188,191,20,88,214,7,118,105,15,242,154,100,59,160,158,47,22,39,118,245,137,159,82,11,15,162,57,203,234,202,211,136,26,47,14,6,26,56,105,123,231,59,241,142,154,191,202,90,33,22,146,226,195,209,235,237,121,112,236,148,159,233,48,
+92,92,145,42,5,79,226,238,91,47,247,194,16,50,131,195,161,22,159,86,6,18,42,159,215,59,139,89,202,199,103,205,250,197,160,181,230,147,189,108,118,189,237,133,233,90,120,219,28,169,105,87,194,219,175,78,171,15,25,43,11,206,144,222,99,200,104,150,53,125,32,123,242,54,108,35,164,241,226,76,95,223,154,35,175,136,189,228,106,179,237,28,245,152,36,215,36,180,154,37,208,57,14,105,50,46,42,209,165,108,50,98,228,155,107,208,96,22,109,81,138,250,200,93,122,49,4,198,123,218,140,145,185,160,206,203,202,58,49,129,183,202,164,151,212,12,12,105,19,17,103,235,24,117,62,10,116,31,105,12,84,38,21,111,101,242,116,185,46,112,110,107,183,216,139,59,123,192,82,219,207,141,70,123,87,199,90,95,93,53,102,116,163,39,2,78,69,65,116,59,219,196,203,117,0,115,222,92,7,48,210,19,143,78,178,9,96,84,29,40,128,89,72,93,192,197,89,96,158,23,12,206,86,222,233,163,18,143,220,155,34,207,98,5,60,50,158,191,235,100,181,248,243,155,90,100,
+243,92,119,110,238,152,234,197,189,139,235,52,109,8,156,121,68,233,189,74,62,15,231,241,182,108,230,251,220,229,178,30,213,224,188,147,33,120,99,146,106,72,182,139,199,155,128,199,25,184,221,97,76,178,142,245,219,110,246,222,113,146,109,43,160,230,22,142,177,154,98,145,143,143,48,237,192,125,67,96,36,25,132,234,213,128,242,168,199,181,168,249,89,90,85,65,33,137,153,242,194,124,28,143,61,45,70,61,81,55,244,152,165,136,98,82,45,53,85,107,3,32,110,116,117,38,29,44,199,90,226,238,134,5,242,158,193,236,252,97,166,17,38,78,113,58,79,79,231,60,212,171,211,231,226,9,36,214,214,79,81,43,34,57,157,189,176,171,175,7,135,66,116,6,184,132,176,55,103,94,250,218,55,18,7,146,91,97,14,242,124,49,223,77,160,101,6,22,235,202,219,80,181,31,49,120,4,169,239,210,251,172,52,187,77,22,171,26,57,217,157,150,197,211,30,27,26,188,131,225,46,126,62,114,218,234,179,30,91,208,125,216,41,163,159,184,21,119,93,162,109,165,214,66,252,206,
+189,87,29,24,171,154,206,181,207,13,245,35,144,184,186,90,250,46,46,221,114,214,73,59,56,13,13,31,30,233,163,99,165,59,191,84,117,96,107,147,223,93,150,198,248,11,116,87,110,112,175,29,124,31,44,56,159,252,232,45,145,192,96,118,44,229,145,195,163,171,89,45,50,67,48,117,234,224,125,91,106,180,156,31,121,2,206,186,93,3,98,101,250,73,177,92,246,150,79,239,59,114,26,113,145,17,52,234,180,214,116,85,54,197,205,176,45,216,170,164,167,220,99,230,58,74,208,113,206,233,205,90,50,199,243,134,181,203,51,144,178,246,228,139,235,209,254,220,102,183,119,218,234,118,160,103,174,105,6,3,11,51,104,122,20,41,140,45,42,164,239,44,126,8,176,234,253,80,179,55,38,102,208,39,202,108,250,246,192,106,135,207,231,200,253,250,10,5,77,213,190,242,36,0,166,168,22,156,109,223,198,186,223,53,82,177,182,125,191,199,64,166,120,137,62,193,85,45,237,117,82,51,158,46,141,228,234,195,121,189,217,86,77,240,124,99,67,47,15,112,82,149,62,191,57,185,
+140,144,36,23,230,121,116,137,226,154,202,10,76,227,9,43,196,136,141,55,220,109,93,73,128,183,6,203,113,187,203,37,42,48,202,251,243,9,54,120,120,99,172,221,136,173,171,241,157,57,174,44,166,124,203,160,36,32,158,203,227,43,189,234,50,80,176,235,91,91,161,194,98,108,179,200,74,67,99,81,191,51,74,109,231,73,61,51,167,45,104,207,180,183,246,50,251,96,96,238,20,157,218,253,174,84,78,47,163,144,160,176,180,37,10,23,120,26,241,66,0,195,113,158,124,237,48,241,52,217,180,168,9,99,157,246,202,254,20,168,234,228,180,62,205,120,155,69,103,17,235,27,9,5,132,183,125,211,153,225,29,24,154,31,140,249,230,19,25,241,137,203,190,27,38,138,76,119,139,56,213,227,47,187,1,28,210,6,105,241,53,105,207,21,57,216,163,85,10,112,101,119,101,186,22,94,29,3,161,197,49,246,202,136,120,138,23,157,78,157,129,49,17,24,28,207,194,251,28,96,170,229,67,152,163,112,58,88,123,228,14,141,10,27,172,95,205,201,58,158,29,237,135,253,112,48,
+204,92,177,217,185,65,6,214,217,71,34,216,167,45,4,235,156,3,204,183,159,15,3,164,30,27,64,65,191,93,173,223,187,45,204,65,1,46,142,46,239,20,245,167,12,205,98,1,94,29,163,192,107,12,253,41,230,232,14,215,13,187,123,68,54,159,183,213,47,198,194,153,40,66,144,91,112,205,54,179,230,130,212,75,222,177,161,139,24,104,226,106,51,142,17,77,136,232,55,87,64,173,12,19,36,174,1,3,38,168,105,47,116,184,173,51,189,0,54,131,13,17,96,74,183,126,31,139,187,20,225,210,234,238,252,172,174,98,6,148,252,125,244,241,97,138,100,174,5,156,112,192,40,100,228,111,65,114,173,224,193,152,238,82,188,97,254,86,243,168,168,198,124,217,178,190,164,11,36,227,38,165,167,155,243,229,42,156,64,221,124,147,112,4,53,164,204,20,199,85,63,12,79,38,240,130,253,72,73,137,215,139,100,63,233,97,132,187,191,158,67,128,161,97,215,128,233,5,6,182,179,7,230,173,223,126,237,227,6,90,7,89,238,3,238,130,205,113,127,157,223,195,161,127,20,176,
+53,65,10,149,135,158,129,37,33,213,158,60,234,144,69,225,92,90,235,239,163,20,165,212,62,45,119,6,158,64,26,254,128,155,245,192,238,172,24,190,220,116,124,90,56,99,82,84,152,205,157,163,106,239,136,138,236,136,230,174,145,149,40,87,225,109,161,140,210,254,164,140,139,121,134,85,217,182,104,79,11,215,79,97,186,249,94,43,186,88,34,150,221,187,235,65,112,54,219,125,164,102,218,166,91,150,181,99,180,83,76,122,227,61,20,138,48,144,78,45,89,212,214,177,216,53,50,65,66,21,247,76,116,255,216,192,49,164,82,45,165,66,225,246,112,58,153,124,32,128,27,35,85,94,171,122,12,120,217,133,198,211,137,147,139,13,93,29,230,206,107,92,120,59,42,113,15,138,39,42,165,178,86,31,62,180,105,253,248,61,3,237,221,241,11,36,194,132,248,94,151,21,213,38,9,4,191,31,105,5,239,175,31,5,96,202,20,88,39,166,171,158,199,43,171,164,146,183,170,95,177,51,4,186,158,158,119,221,50,164,209,101,157,191,27,57,120,8,88,140,85,233,218,251,122,189,
+58,199,66,59,172,187,175,247,145,22,99,206,7,147,85,144,59,224,137,188,127,91,197,151,118,241,79,22,143,5,174,159,136,42,248,219,139,216,213,105,192,40,76,132,171,128,194,139,133,155,19,18,66,247,128,157,38,139,73,108,174,72,85,140,9,6,154,35,129,113,127,108,30,203,97,162,174,212,140,68,82,2,163,11,122,80,11,142,114,174,3,71,105,55,122,171,11,68,207,78,24,225,158,153,21,196,94,157,200,20,46,223,133,162,140,212,251,218,202,117,106,188,163,231,116,59,196,36,221,105,33,102,40,168,238,217,24,187,234,35,236,236,73,222,197,103,142,67,79,167,86,133,184,225,242,242,219,55,218,177,57,76,169,222,243,196,238,5,200,45,54,48,61,54,54,64,105,14,150,62,106,161,164,135,107,36,103,21,124,152,231,122,76,167,123,250,20,249,36,226,167,98,200,70,184,17,76,81,78,162,134,241,22,2,13,58,247,19,69,251,136,210,151,104,15,116,165,72,31,29,12,151,18,182,98,124,188,88,160,40,229,109,51,131,45,178,11,219,10,124,14,181,90,81,50,122,
+251,68,203,60,145,196,93,98,42,174,55,243,18,174,40,171,117,190,63,243,81,221,62,107,156,240,151,121,30,67,115,153,165,236,222,100,103,39,215,105,111,221,222,99,35,66,142,155,38,86,51,50,43,65,46,136,61,12,176,134,143,217,39,10,11,84,167,149,102,208,211,94,0,196,76,52,116,35,75,183,59,147,212,124,166,39,222,160,230,18,144,180,111,153,20,15,139,138,241,189,53,206,108,55,51,158,43,25,23,158,242,235,112,228,76,6,172,233,11,66,83,139,214,224,219,104,203,150,31,13,90,75,246,188,135,16,31,96,248,173,197,200,51,94,150,81,99,6,74,177,124,26,164,212,109,13,56,236,75,187,247,153,198,24,82,92,195,52,25,235,112,247,146,186,104,219,179,196,247,204,185,204,114,105,59,77,187,132,5,92,141,128,18,155,69,23,124,67,196,123,188,135,152,132,106,226,2,228,216,171,153,103,199,206,150,157,75,123,81,31,184,147,73,24,38,87,123,81,155,97,178,229,100,94,81,159,150,18,246,149,212,40,59,43,178,174,214,83,149,22,57,210,114,101,102,46,
+54,69,85,77,157,210,147,146,174,243,34,94,244,30,204,203,229,188,26,90,104,29,198,203,251,204,162,69,123,72,159,97,47,114,188,160,216,206,140,17,8,123,19,14,29,56,25,44,83,190,182,72,34,239,241,196,247,195,32,218,103,239,13,239,8,230,71,203,104,198,158,243,237,225,54,252,84,1,116,116,172,81,251,201,228,81,166,37,252,150,70,159,199,51,187,35,17,141,89,144,79,11,11,118,249,178,61,241,174,146,205,221,86,211,145,35,199,121,213,225,117,46,107,117,49,233,164,189,137,100,22,177,206,166,2,90,19,243,184,51,196,88,194,251,201,230,222,150,169,170,141,77,134,61,158,42,62,199,119,201,231,72,208,111,237,110,205,151,148,75,84,123,149,59,185,54,116,164,222,106,207,124,111,109,238,2,126,152,127,10,238,174,38,142,135,245,139,152,84,172,138,136,119,40,202,174,235,253,117,134,52,226,16,178,209,235,97,205,28,94,17,149,156,109,134,212,45,136,120,139,99,116,39,202,201,34,169,71,24,98,16,17,193,220,225,176,34,5,91,133,1,5,165,49,23,34,
+146,57,207,112,156,60,90,13,22,20,6,212,7,113,151,49,37,103,160,118,136,235,39,11,220,169,158,40,97,86,129,40,237,160,52,134,202,22,160,194,23,203,21,99,14,207,92,45,196,115,226,5,30,196,57,42,2,251,49,108,243,2,70,191,188,78,46,198,46,142,171,87,185,240,66,154,1,195,112,68,198,203,220,129,252,254,58,155,101,71,84,80,61,30,145,26,196,204,35,197,229,110,135,74,247,123,41,47,130,10,241,131,123,125,90,122,238,166,181,71,235,12,123,221,241,196,156,89,45,171,25,194,52,119,213,94,34,128,77,26,216,86,103,124,186,174,222,54,179,198,22,233,86,197,58,31,250,87,203,44,42,82,182,58,182,54,105,52,185,105,208,204,31,170,163,170,96,46,230,171,82,66,203,170,62,99,33,236,31,213,57,202,229,128,105,145,125,157,39,100,147,74,27,112,74,226,222,19,8,231,34,164,89,166,208,179,227,146,108,1,83,237,30,150,16,115,144,167,30,44,133,138,229,34,166,183,45,27,132,214,77,127,95,33,110,226,64,96,51,14,149,218,46,50,28,40,
+150,222,120,206,206,28,198,21,87,144,197,90,247,237,82,44,72,31,23,81,235,247,102,5,235,82,7,220,109,69,18,34,7,200,244,84,155,238,161,35,94,153,157,20,20,139,232,0,1,182,249,67,132,193,114,181,253,232,18,64,108,10,0,248,233,21,41,243,73,254,208,233,142,21,181,151,177,143,225,153,213,238,186,60,176,185,42,119,107,207,101,230,116,187,76,139,154,187,74,33,18,145,8,16,159,255,52,36,180,229,229,106,26,50,175,150,171,85,43,179,72,85,198,171,17,97,165,109,97,236,143,168,12,186,211,240,153,231,33,15,106,5,16,156,87,114,234,183,115,177,254,135,159,174,51,200,190,125,181,206,215,250,49,47,235,159,252,155,223,253,211,31,2,8,12,128,133,58,135,24,60,39,101,37,112,102,171,149,29,209,58,237,240,177,142,99,36,210,113,188,147,128,237,83,150,64,1,241,180,203,186,129,29,74,224,38,54,48,102,109,41,40,142,3,3,205,177,91,12,83,179,104,25,128,114,74,163,174,15,9,100,95,188,254,114,147,175,118,147,56,246,197,187,215,159,111,
+210,213,174,243,209,126,239,99,137,159,189,124,247,226,229,187,119,111,62,123,253,242,253,171,207,95,252,231,55,95,189,254,236,199,191,255,227,223,127,241,249,155,207,126,241,243,87,95,190,127,206,46,251,254,103,47,223,111,18,209,254,4,234,249,151,191,124,243,55,80,217,159,252,250,197,187,87,95,188,250,236,253,58,223,237,135,234,94,126,249,249,139,175,222,190,122,247,110,125,236,223,253,225,119,18,209,254,219,47,222,191,122,251,37,84,227,47,95,189,248,213,203,95,191,248,217,155,95,173,243,216,126,245,234,237,58,107,237,139,151,31,50,239,66,83,3,29,125,110,230,197,143,127,231,191,254,203,63,248,112,226,87,111,222,126,254,253,239,255,213,143,127,231,197,191,248,252,213,79,95,174,211,243,254,215,127,249,191,255,139,31,124,255,7,223,255,163,31,254,240,247,94,252,197,251,183,95,252,248,247,255,239,191,250,189,23,63,254,87,80,151,161,122,254,27,116,221,235,87,239,214,89,113,95,124,249,242,231,80,179,175,223,255,236,197,103,191,120,251,238,205,219,79,59,247,175,
+255,252,197,191,127,251,242,171,159,189,254,236,229,23,31,179,239,190,248,197,187,231,81,254,91,104,56,239,222,175,103,101,93,244,135,127,190,78,248,251,188,130,255,237,23,208,100,190,120,251,234,175,127,241,197,203,183,208,117,239,160,169,93,79,250,95,255,35,234,250,254,139,191,120,253,246,179,47,160,206,173,115,5,127,6,77,255,139,207,222,124,254,234,123,47,126,242,230,255,129,14,126,254,242,253,203,239,189,120,255,246,245,203,47,255,122,93,232,253,175,191,122,245,14,186,230,215,208,34,124,246,230,11,104,60,175,63,212,186,30,219,95,127,241,230,39,80,107,235,139,254,224,185,150,95,191,250,226,11,104,122,159,139,174,139,188,254,242,221,251,151,95,126,246,234,211,66,80,63,127,253,73,145,207,190,128,76,225,155,243,159,76,208,139,255,254,223,127,248,163,63,254,179,31,253,241,15,254,228,127,249,227,63,252,211,63,255,223,126,244,163,63,250,243,23,235,179,63,248,218,140,255,240,7,63,248,93,232,47,128,128,128,178,54,228,206,179,33,211,215,134,76,132,35,197,22,
+192,60,21,160,105,33,220,145,148,48,189,205,147,235,80,169,3,95,24,230,251,171,63,251,179,77,85,47,254,253,243,40,126,249,18,26,245,79,190,120,245,253,143,39,126,155,54,228,83,1,140,214,222,180,65,206,31,172,219,216,127,248,180,141,255,240,113,26,254,233,173,4,214,173,32,12,142,128,108,58,149,73,15,109,42,36,26,0,228,23,121,224,155,86,254,98,51,147,191,125,19,118,168,9,126,26,128,193,145,59,81,116,209,65,36,166,83,178,35,18,9,255,120,34,58,116,29,50,80,156,189,7,185,84,187,34,193,31,118,240,171,65,234,42,39,227,64,78,67,166,134,55,84,223,157,197,159,254,226,203,207,214,216,253,237,27,39,35,119,238,208,162,253,157,132,93,81,164,185,119,232,138,61,242,93,225,22,235,179,97,78,162,145,7,123,103,239,228,10,101,103,41,242,192,29,30,9,45,161,235,211,198,191,158,222,159,191,122,255,179,55,159,255,211,27,175,174,27,199,201,76,245,142,172,237,16,156,30,61,185,116,28,55,236,240,74,84,223,126,236,248,183,92,60,107,183,
+76,169,45,213,179,139,138,29,157,35,72,112,24,6,13,1,17,14,156,218,15,197,190,89,135,55,80,127,222,254,226,179,247,16,220,255,217,243,112,180,183,51,53,208,220,88,164,5,41,132,61,198,178,50,19,59,176,117,209,247,76,134,118,102,174,207,191,26,118,92,145,107,172,247,28,226,209,29,205,197,195,215,157,248,203,87,255,244,62,92,64,125,0,1,100,7,93,191,136,161,177,157,106,103,223,99,85,92,27,206,18,55,15,214,147,5,38,206,185,152,79,132,213,3,231,126,41,11,0,123,153,57,80,251,142,13,254,115,215,193,179,30,124,103,144,205,57,96,143,15,170,40,2,75,189,188,70,199,176,253,59,230,114,40,219,69,31,98,93,113,108,220,115,117,212,70,202,92,7,12,253,212,179,114,239,227,57,48,131,132,42,172,31,92,148,178,144,121,122,240,173,229,215,189,250,119,144,63,134,72,226,183,183,206,246,186,99,187,0,12,3,131,221,93,95,213,206,137,49,231,13,70,2,183,8,30,58,158,28,205,213,134,107,89,199,167,105,161,71,133,241,4,15,60,62,145,
+99,251,208,19,118,58,201,14,6,84,75,174,172,5,42,95,247,225,255,252,18,162,182,183,27,194,251,236,205,198,96,223,255,227,251,129,90,123,1,232,191,13,4,2,189,203,220,137,239,94,144,167,59,249,157,3,134,19,227,169,145,104,148,153,112,91,52,100,236,118,179,245,231,165,34,157,169,136,240,9,162,230,134,228,144,224,96,122,240,117,47,158,141,226,123,31,188,46,228,126,127,241,229,111,53,33,202,245,132,240,0,24,17,235,190,13,145,21,69,69,233,234,233,226,14,200,168,232,138,195,71,83,199,28,3,228,77,42,43,100,233,207,208,4,62,249,130,127,41,154,112,45,0,240,4,151,11,193,175,59,177,166,21,136,75,255,241,173,186,54,203,192,32,10,0,9,157,2,92,19,32,181,244,104,85,211,3,34,241,150,131,150,45,229,53,44,44,234,70,198,19,197,199,216,41,221,190,10,19,27,57,129,98,129,37,27,32,71,76,233,56,190,110,248,63,190,252,236,237,155,239,255,213,255,248,31,223,150,8,255,233,3,95,126,208,26,63,253,197,219,181,92,122,241,243,55,
+159,191,254,233,235,103,10,125,179,57,242,145,88,215,153,244,159,243,243,67,133,32,86,254,233,171,151,239,127,1,41,144,63,251,199,144,215,63,188,214,90,242,249,46,32,16,236,108,205,166,246,12,126,124,112,32,121,186,201,123,100,229,155,35,71,165,121,157,165,5,201,228,71,177,216,37,218,58,161,74,188,172,73,62,113,157,157,61,10,216,216,9,11,239,109,47,205,166,21,130,144,91,176,87,226,177,237,232,108,69,200,233,89,69,41,138,67,0,136,252,111,220,245,219,87,175,160,177,66,210,230,213,219,175,165,0,52,174,87,63,135,6,245,254,27,238,248,71,177,211,13,12,41,81,9,184,211,7,68,120,127,76,216,7,128,236,30,44,113,249,141,39,122,243,126,109,244,95,188,254,242,213,39,77,125,245,246,205,123,72,198,65,39,126,254,234,231,63,121,245,91,120,169,141,9,22,29,192,8,41,172,185,162,20,169,99,121,3,3,118,196,159,98,237,63,189,249,226,245,223,209,226,235,95,174,5,207,111,219,30,234,217,248,24,72,198,146,2,119,223,18,26,119,243,172,3,
+150,215,250,136,34,222,1,3,190,83,10,67,96,44,94,95,13,158,114,14,228,78,247,58,43,91,131,95,183,64,152,236,207,230,240,255,89,11,103,207,45,108,243,73,64,172,76,56,3,24,0,89,43,190,251,102,212,63,127,249,5,164,134,223,190,125,243,171,31,255,171,47,94,67,58,118,35,181,62,202,185,79,215,121,173,172,63,202,245,119,207,95,133,128,86,226,131,114,255,201,203,119,175,158,29,196,247,63,212,185,158,73,72,248,125,185,177,150,247,223,104,199,111,74,66,117,124,245,254,103,127,27,90,255,23,84,237,230,186,239,44,198,51,67,188,120,243,203,87,111,223,190,254,70,245,253,31,95,188,252,236,111,254,206,11,126,252,59,111,160,136,226,245,151,47,191,128,148,248,47,95,191,125,191,254,202,197,7,158,249,24,230,188,127,249,197,235,207,222,125,173,81,55,122,254,67,79,95,127,9,225,247,245,179,185,109,90,222,76,1,84,242,67,15,62,135,224,0,13,31,18,233,111,161,248,227,195,232,191,173,213,255,242,235,111,103,252,193,95,126,243,233,140,181,51,135,
+170,120,7,253,250,237,145,255,231,117,40,240,172,188,95,188,249,234,213,135,210,127,119,12,1,197,40,63,254,253,191,128,66,136,215,107,39,244,213,90,190,173,131,166,231,170,55,161,206,79,94,189,255,213,26,178,31,122,255,201,183,59,54,225,207,55,223,245,248,62,20,78,173,135,15,173,211,247,62,132,74,208,217,119,175,223,126,61,244,79,189,212,183,32,254,163,127,243,175,127,247,71,127,244,195,29,4,9,62,94,127,169,3,253,108,157,82,78,147,11,235,21,76,1,197,181,70,220,168,143,248,96,188,171,35,114,39,220,90,92,178,184,19,117,28,160,39,124,208,228,223,5,14,21,204,131,29,34,213,208,9,140,57,243,126,200,221,32,96,47,85,216,25,46,73,190,158,84,134,143,71,12,100,238,126,132,44,82,179,208,47,146,125,230,46,244,131,81,117,35,115,208,143,50,139,12,227,228,24,72,38,178,152,221,125,62,205,184,126,62,141,84,61,159,206,225,159,79,175,143,175,79,35,15,158,79,231,24,207,167,25,174,231,211,208,241,205,233,28,200,168,34,200,221,225,240,
+88,57,126,136,243,251,102,25,97,134,94,224,9,160,239,118,207,112,173,194,202,169,205,9,189,107,47,90,116,38,76,165,35,62,81,234,44,186,199,71,71,24,227,196,94,142,78,79,152,174,39,220,117,216,116,225,185,233,115,235,145,252,252,70,93,154,50,91,240,37,225,114,156,130,165,181,19,50,9,129,163,52,253,200,145,124,176,238,196,140,65,116,97,77,22,126,128,14,186,10,137,116,33,23,220,206,175,108,88,218,213,32,254,112,194,20,129,5,253,162,128,92,119,79,71,208,7,104,216,78,60,219,112,88,253,253,17,51,88,245,4,71,48,38,189,66,239,135,31,3,103,139,105,127,31,234,92,50,111,43,178,168,18,251,81,111,59,223,158,32,14,115,227,97,224,222,212,240,34,141,245,78,101,193,58,135,134,121,66,80,163,205,88,13,223,57,14,144,177,121,122,142,186,59,109,150,252,237,201,201,12,154,140,123,57,123,37,207,100,134,152,190,174,101,153,63,196,120,204,73,22,81,185,191,29,236,216,183,111,122,182,155,35,145,139,96,237,27,100,200,136,221,70,21,151,155,
+3,104,161,80,230,243,179,98,214,204,144,31,65,215,75,254,246,58,193,214,235,244,32,97,10,236,118,2,100,23,66,162,27,18,226,12,1,115,7,114,248,240,34,0,152,1,143,149,220,157,149,162,214,104,193,98,63,49,28,88,146,0,160,12,72,145,110,231,21,84,222,6,50,253,106,124,219,143,105,77,235,28,47,11,99,18,54,207,236,33,28,33,34,118,49,117,235,91,54,158,134,122,30,53,232,98,51,215,208,151,178,219,70,231,69,195,67,0,0,28,70,209,33,211,158,10,186,219,64,139,223,148,224,83,174,32,1,225,0,0,78,173,98,44,222,237,163,123,59,54,11,158,12,3,58,231,60,13,223,79,187,100,234,201,208,68,50,204,88,247,138,99,99,192,1,6,31,174,241,185,151,66,97,91,126,57,45,8,165,43,238,99,247,66,78,196,2,52,32,237,39,72,0,96,11,80,123,136,73,52,176,11,76,252,87,10,4,244,51,187,3,213,7,144,37,204,226,227,98,108,130,237,133,56,0,48,61,151,169,161,206,108,121,214,152,160,136,16,0,116,181,142,134,85,240,91,
+118,110,143,226,24,207,111,130,221,126,124,31,59,91,121,166,133,101,37,167,100,206,50,10,70,112,43,71,16,40,211,112,135,50,233,157,56,233,148,250,252,161,29,218,231,12,210,81,50,202,88,175,44,114,167,226,177,226,94,186,58,190,33,97,237,0,229,152,12,233,23,209,61,205,206,246,206,99,74,34,159,127,182,74,221,51,9,202,199,249,253,245,172,145,157,187,170,215,228,238,222,80,117,208,55,40,119,208,51,140,114,191,72,77,166,8,157,249,244,65,21,220,59,230,165,13,236,67,86,42,104,113,160,84,29,58,102,191,94,236,211,253,218,167,85,238,238,68,48,28,140,175,149,226,26,249,90,25,93,140,22,7,199,105,206,227,65,130,62,48,165,8,245,106,91,141,87,92,116,193,75,252,212,95,182,152,78,21,187,66,24,128,141,107,168,216,233,158,149,188,63,88,114,189,23,158,167,30,129,183,117,151,46,157,249,96,131,120,41,160,188,80,103,46,186,215,218,132,83,136,55,30,82,160,249,194,179,234,43,165,48,173,180,236,27,131,234,169,207,36,168,98,87,20,79,71,
+116,254,80,141,167,183,50,137,46,163,184,143,187,170,62,110,43,0,120,137,124,122,12,31,36,102,116,63,135,142,125,76,163,13,77,196,97,37,128,16,72,69,117,229,69,184,237,176,228,204,26,188,130,41,53,236,66,11,244,200,209,81,177,249,136,80,115,48,47,15,135,254,27,9,156,107,45,171,134,168,189,88,158,202,184,57,159,103,111,250,141,67,211,22,63,90,59,115,145,232,197,130,186,200,173,211,228,201,217,176,48,231,225,52,84,241,109,171,129,134,79,100,177,51,47,210,162,247,65,161,221,201,233,204,137,238,28,117,4,204,14,41,193,94,237,179,11,68,37,76,64,23,172,23,213,79,92,223,15,83,157,67,107,189,253,188,216,148,255,153,199,19,50,102,230,0,101,206,215,82,8,130,17,213,77,205,115,147,64,113,28,119,33,0,190,63,245,144,114,106,12,41,233,19,139,62,228,245,114,247,176,73,96,12,65,240,209,122,37,33,119,251,250,57,119,206,139,39,183,58,5,89,175,113,24,44,95,107,12,108,233,128,53,84,10,133,246,157,27,245,180,144,99,142,97,64,
+37,113,163,222,91,146,167,146,116,195,44,116,5,186,23,219,225,165,125,155,142,222,154,70,217,106,2,121,93,32,54,85,95,60,217,151,186,131,246,170,155,129,117,207,168,237,29,156,147,156,66,118,170,248,51,192,113,109,33,2,197,179,49,243,65,205,225,84,59,15,108,88,0,69,131,70,17,184,191,82,91,89,165,142,244,104,21,113,138,132,247,37,3,89,120,139,48,195,215,0,36,6,238,101,204,132,203,26,205,71,4,5,225,13,14,217,225,116,238,184,206,248,192,125,112,119,120,87,224,7,208,125,48,128,4,148,148,224,67,10,249,136,152,66,33,75,196,241,63,113,254,29,155,227,106,143,224,158,199,0,128,6,18,182,6,191,196,141,220,218,120,55,0,232,100,213,62,181,205,182,60,68,25,196,65,69,8,49,1,128,51,166,193,119,3,187,230,87,33,122,28,214,212,30,67,11,131,143,134,109,45,101,112,33,170,89,110,244,187,41,87,247,14,63,137,246,44,48,96,142,21,228,233,251,81,161,249,36,120,119,185,202,30,61,9,214,141,235,246,15,241,107,175,198,169,156,
+0,229,208,22,28,200,82,132,35,58,212,183,251,173,205,164,1,148,202,138,190,191,170,152,150,202,195,218,141,75,221,202,173,174,250,250,85,101,14,166,85,144,47,37,246,17,135,144,203,133,186,125,69,64,27,225,128,163,114,48,90,247,21,112,17,177,79,208,248,60,162,194,12,110,95,161,160,222,111,193,60,207,30,107,231,195,232,111,214,86,70,176,151,169,99,222,136,60,229,242,196,125,29,254,28,143,50,61,90,34,171,139,210,161,85,155,168,182,207,232,149,74,127,138,109,37,169,10,71,88,23,104,199,231,57,207,252,129,151,164,104,205,216,100,186,210,218,163,23,124,187,67,95,87,125,69,61,215,176,196,179,88,237,194,119,58,48,96,218,141,128,152,81,104,46,253,179,78,158,55,145,95,117,197,226,75,182,251,42,70,121,136,168,143,46,180,139,57,168,225,74,143,84,6,223,194,67,76,31,241,183,169,160,213,94,242,230,183,202,170,252,168,84,231,86,64,47,150,191,44,245,238,239,105,149,246,161,157,191,202,180,219,211,90,137,66,43,156,245,179,172,227,167,38,216,21,
+90,168,248,36,150,227,100,58,107,234,178,9,227,82,10,210,182,104,253,130,25,39,173,86,138,115,238,114,233,195,77,157,38,28,78,44,52,250,162,11,20,195,136,235,37,47,146,138,126,50,186,171,144,232,136,124,123,48,153,59,147,135,150,226,64,30,6,93,61,143,93,12,230,123,132,78,124,186,171,157,21,189,221,197,109,102,21,152,245,11,174,132,127,144,36,73,241,66,159,86,199,143,94,13,195,161,240,158,85,217,215,59,58,22,245,1,51,126,117,144,184,233,169,121,224,132,21,204,173,132,106,9,189,19,118,111,207,247,154,137,74,183,208,14,5,104,29,121,47,241,224,87,247,49,53,38,218,180,125,27,97,152,109,9,89,112,55,83,238,150,187,143,217,46,189,232,34,104,151,114,203,148,92,54,97,15,247,43,119,202,33,61,178,32,157,145,80,176,115,110,194,113,133,213,144,141,219,197,133,232,18,60,227,140,172,229,135,193,52,160,160,205,151,124,144,237,236,27,89,181,41,215,167,209,220,49,227,226,196,182,113,186,16,106,92,26,185,246,96,235,222,154,12,238,73,162,
+96,178,106,34,4,58,234,120,110,122,200,150,36,73,29,126,227,222,244,100,196,250,124,78,38,192,82,210,213,41,99,241,41,121,233,47,135,129,34,117,121,89,231,86,111,23,229,125,84,57,185,178,52,23,247,44,114,88,117,76,10,122,252,189,227,72,47,131,141,22,155,94,85,183,61,193,244,35,180,124,177,191,164,160,130,139,6,113,90,197,213,242,38,93,209,71,226,98,150,17,249,77,161,210,154,246,65,59,111,155,220,149,29,219,28,209,129,60,88,186,172,206,70,199,253,167,120,67,121,28,194,85,164,99,91,46,188,114,149,82,96,21,159,231,227,35,252,213,106,225,27,68,43,245,81,197,22,202,132,35,119,88,219,64,38,107,89,114,249,108,12,102,215,216,243,187,67,61,67,186,159,227,92,84,23,99,175,125,53,76,15,82,106,155,74,134,24,135,30,249,87,147,125,87,253,128,132,56,78,149,128,226,192,170,198,140,237,6,95,34,135,240,90,79,143,15,187,74,52,43,41,229,137,187,7,38,166,138,112,217,206,143,166,51,231,216,23,18,159,223,65,85,88,26,242,178,
+123,120,233,246,21,38,112,217,26,64,232,53,216,215,104,7,128,243,13,218,179,95,31,207,66,199,49,98,97,157,142,74,32,87,141,192,234,152,95,145,243,211,145,195,27,22,126,56,177,73,41,197,126,133,215,78,187,20,19,230,226,98,169,244,245,163,61,134,32,219,84,20,172,60,169,204,214,185,239,121,82,77,176,87,61,129,7,7,78,207,244,209,154,97,203,23,58,101,42,161,78,165,109,171,248,33,153,156,59,221,159,121,157,147,86,242,9,44,155,109,246,97,216,124,152,81,171,187,106,139,190,113,209,6,205,41,54,246,6,43,193,175,26,219,182,97,97,28,85,41,35,189,153,69,236,164,215,109,117,69,92,168,46,27,18,129,201,96,203,10,222,247,44,171,50,146,213,197,4,19,245,112,182,172,163,102,176,13,222,97,251,44,181,204,232,239,198,210,78,146,22,125,54,252,219,96,110,208,74,43,122,183,236,61,146,148,153,75,73,48,46,126,239,209,62,48,199,186,169,126,134,141,138,184,184,154,101,155,236,152,31,67,124,219,158,167,230,169,73,115,109,218,129,70,215,237,
+172,234,98,233,165,52,115,27,156,115,239,230,186,190,101,79,159,25,180,247,236,110,122,80,100,13,206,73,250,116,225,120,174,73,97,102,78,176,61,241,94,183,231,1,49,42,50,75,184,212,234,164,254,84,159,154,49,59,236,84,38,105,9,17,86,65,127,60,234,232,211,116,250,202,129,89,92,196,13,90,38,6,45,40,98,43,15,41,158,97,52,23,229,222,155,143,244,190,85,123,129,47,70,45,48,182,15,57,225,76,149,52,108,183,37,151,183,6,124,99,14,178,211,240,208,173,171,103,239,61,131,26,143,45,246,241,49,242,61,172,130,169,18,95,165,30,121,193,187,180,100,69,183,142,193,43,207,142,230,10,169,87,221,168,121,52,125,84,186,219,186,62,108,148,101,41,222,16,191,96,173,22,195,195,220,124,16,172,233,27,202,139,157,74,178,226,103,87,197,141,110,252,214,183,197,146,120,61,182,21,143,106,232,154,242,85,249,174,165,51,238,129,144,50,223,1,203,193,203,110,74,211,101,181,178,187,49,116,75,13,72,28,48,240,12,61,165,31,214,67,189,99,37,196,35,122,
+128,21,85,219,151,229,226,196,67,239,169,246,129,111,100,162,31,182,118,186,16,227,80,191,45,31,253,178,61,175,51,78,72,225,176,43,80,106,187,89,13,139,79,242,181,31,158,174,118,26,38,160,29,10,13,143,177,25,98,147,235,153,38,242,164,52,79,107,62,199,206,150,238,228,74,28,31,220,78,65,9,39,218,207,16,185,190,176,230,20,107,51,240,61,137,250,160,39,185,52,99,243,6,153,166,141,74,44,65,47,187,253,232,228,145,247,121,74,171,10,95,31,135,108,69,73,177,176,227,178,245,205,40,49,21,29,49,49,236,83,66,194,144,232,118,38,22,83,155,224,101,65,30,182,16,6,251,206,240,121,140,14,86,83,55,167,118,190,181,78,222,142,211,140,20,7,5,242,166,203,249,144,135,186,166,136,102,245,204,94,135,228,159,143,180,51,204,33,14,242,99,26,115,245,142,112,31,58,225,61,169,216,253,181,3,157,122,36,124,130,109,148,232,228,145,196,81,203,180,50,187,98,219,30,192,216,152,67,218,6,52,159,119,206,31,92,144,126,76,48,35,129,181,85,45,165,
+58,59,57,56,215,186,84,227,11,197,4,229,12,229,23,109,107,48,223,165,60,94,177,67,253,37,227,222,54,49,93,39,56,154,152,88,166,15,2,1,27,185,91,156,55,46,109,101,243,104,170,206,234,205,58,144,51,68,70,243,115,5,178,190,64,24,207,43,9,35,217,68,210,153,93,174,61,77,78,60,203,91,16,228,28,74,25,127,28,158,171,179,94,5,100,78,203,70,125,127,25,80,22,32,199,71,224,86,6,126,132,89,133,201,168,86,49,53,113,85,111,79,18,243,8,126,40,82,15,75,125,148,199,112,215,207,160,135,30,39,251,74,187,61,57,131,214,74,47,84,79,239,194,39,134,5,13,39,78,106,130,251,229,140,198,110,211,114,248,179,52,88,94,152,157,158,16,228,22,50,225,97,207,72,17,166,119,61,181,201,98,112,18,31,176,83,7,58,19,15,22,141,129,96,148,147,164,171,46,14,73,180,203,138,122,68,135,181,213,200,237,39,185,186,148,133,49,179,12,17,66,114,81,59,121,216,221,67,72,16,255,144,95,114,108,252,82,33,91,244,221,95,166,47,236,179,
+214,106,255,112,130,76,120,142,207,91,140,94,183,99,166,45,116,154,113,234,12,102,179,237,66,108,173,112,137,219,254,0,245,36,110,61,95,74,125,177,212,18,197,136,156,213,109,129,122,61,61,180,185,218,84,159,147,214,67,119,194,141,67,102,42,151,140,84,216,77,43,181,219,177,20,197,199,236,129,116,166,63,158,243,148,87,71,107,126,206,85,109,120,132,223,9,42,6,10,47,86,217,159,107,51,206,83,131,38,93,88,106,14,220,126,1,44,77,197,169,196,194,227,113,38,76,225,159,204,234,123,170,65,49,189,52,63,92,223,33,123,236,130,235,144,131,28,134,206,9,148,96,36,228,45,94,131,183,246,165,138,178,192,30,48,59,204,134,140,41,205,128,202,18,70,185,176,221,197,6,100,218,118,35,199,41,23,238,25,149,189,59,124,197,118,192,63,128,37,3,156,51,87,28,180,117,31,218,113,149,102,126,16,196,64,151,9,153,248,249,153,161,249,224,3,50,151,141,135,178,21,141,41,131,224,35,238,238,84,181,224,233,60,134,135,246,189,234,206,141,116,0,108,159,211,216,
+77,13,70,248,233,110,202,35,155,35,227,166,33,169,232,207,49,25,237,120,174,106,78,92,112,97,134,125,87,91,67,139,79,104,202,26,150,229,96,107,110,44,144,207,88,187,12,13,228,51,214,46,99,9,249,140,181,203,136,67,62,99,237,50,96,55,30,54,35,224,234,217,73,25,216,172,102,201,224,79,149,167,37,228,4,61,139,181,212,217,192,132,40,135,51,3,253,75,9,161,196,199,146,97,20,144,40,103,129,251,145,45,217,223,138,31,225,254,103,199,240,241,184,5,58,190,77,206,173,150,198,250,236,138,46,170,57,49,154,54,216,116,119,241,39,154,126,193,16,209,157,206,118,232,133,186,250,18,115,20,34,168,231,7,192,140,14,153,81,120,184,51,199,217,9,83,185,57,174,182,150,165,209,195,37,222,220,243,80,65,210,192,187,239,188,183,141,229,42,247,22,210,65,177,138,133,115,182,111,58,215,156,232,241,74,60,253,248,170,84,40,42,219,183,219,25,95,61,116,163,97,72,9,161,86,110,50,31,234,130,87,135,241,169,152,29,215,13,30,148,102,163,141,82,240,92,
+104,176,66,212,61,7,242,0,197,25,178,46,141,143,227,247,39,185,67,247,39,248,63,169,158,249,16,12,105,189,9,155,154,65,116,227,200,174,79,108,143,175,16,69,156,99,166,217,47,206,165,182,54,67,75,221,138,106,149,125,50,45,209,224,148,111,11,205,241,20,221,41,51,229,86,124,241,156,89,241,24,146,113,52,207,125,119,77,158,220,108,79,218,163,48,9,235,98,113,70,205,131,146,163,61,106,106,90,54,206,138,203,144,231,166,251,81,49,51,136,244,95,33,141,233,161,79,132,200,62,82,116,116,108,97,150,138,54,184,67,26,57,60,49,225,148,195,154,147,9,39,170,85,153,84,108,42,238,9,251,90,31,188,77,26,99,217,5,18,124,155,117,237,96,255,189,124,16,209,203,87,214,68,62,239,207,159,157,178,130,100,181,107,194,198,149,213,92,251,46,253,90,72,214,140,216,126,160,113,13,69,40,22,139,140,234,80,156,17,21,162,9,155,136,101,0,172,45,247,67,86,3,105,250,221,15,171,235,120,118,239,68,224,217,237,127,125,124,12,173,238,105,167,116,108,201,
+41,247,51,11,123,86,53,196,246,12,119,229,249,66,153,132,151,14,109,137,135,103,217,61,109,99,253,96,154,115,175,171,84,155,129,100,202,219,26,16,202,77,133,112,12,218,89,165,82,119,76,7,149,74,118,138,57,211,238,120,110,153,210,186,166,110,67,5,39,214,138,178,212,31,122,238,217,252,254,146,163,166,165,173,132,212,213,48,151,216,218,167,184,157,167,113,171,141,207,79,43,111,46,32,88,87,233,53,158,126,163,186,89,121,15,132,234,114,83,2,191,93,233,248,230,187,147,135,101,187,220,133,132,247,138,106,226,69,218,109,147,109,126,84,199,71,252,8,141,253,70,95,114,17,58,6,71,227,180,199,168,48,60,99,213,184,243,96,133,79,47,238,148,152,74,250,122,153,48,35,199,211,153,178,238,96,87,77,108,175,115,239,146,50,13,170,250,12,157,121,75,31,43,235,229,169,27,101,169,189,156,27,182,213,145,148,139,192,176,14,162,243,114,129,78,72,79,82,199,37,60,50,158,122,180,216,35,248,58,125,121,20,201,240,33,117,94,78,231,118,13,67,70,74,177,224,
+202,36,10,12,104,56,59,233,219,49,167,67,203,129,145,156,129,132,73,101,62,227,75,250,67,217,113,149,40,158,111,169,237,215,51,92,44,241,232,232,247,197,218,185,9,108,40,224,203,101,145,229,90,78,114,231,182,97,157,87,58,234,148,0,94,133,135,218,91,120,30,150,243,27,243,69,61,205,97,35,64,207,1,89,147,57,138,155,124,74,55,139,224,190,116,100,131,89,147,29,166,233,85,53,132,162,205,64,0,34,105,63,56,86,102,26,15,185,49,9,180,27,45,124,185,36,19,77,215,23,179,91,227,168,234,82,226,21,233,113,195,215,245,123,113,178,243,144,107,143,34,174,70,151,38,99,43,164,177,248,181,171,62,127,32,9,28,183,169,162,225,105,165,55,12,59,121,106,150,143,116,50,92,244,216,12,15,100,49,23,103,237,201,73,196,20,58,158,61,57,230,46,175,57,198,222,73,159,46,186,215,30,140,191,167,140,93,87,46,183,43,16,141,66,146,155,2,105,238,98,223,70,197,163,2,78,191,175,125,119,64,137,95,219,241,1,78,148,7,22,103,5,82,11,63,237,
+87,53,144,65,183,105,207,6,237,111,60,27,116,123,237,173,52,122,111,20,130,65,190,124,210,152,52,166,104,151,146,160,61,198,144,8,193,203,112,228,74,233,77,41,210,58,46,10,217,12,10,59,149,229,245,21,181,214,10,94,168,141,179,218,228,212,47,210,206,46,235,41,58,76,196,20,123,56,18,125,59,126,45,239,89,167,116,216,172,47,76,89,199,151,22,243,118,215,158,92,234,208,185,219,26,121,92,54,14,243,70,193,89,80,132,168,41,150,221,248,32,105,97,95,217,59,205,165,2,39,169,147,73,165,92,230,84,201,190,192,152,50,135,107,54,19,108,216,140,81,36,144,187,134,251,229,18,64,2,217,235,79,227,124,96,3,155,61,175,198,25,231,247,243,131,153,69,167,156,79,147,123,74,255,185,102,146,17,132,144,48,86,32,38,202,229,123,153,218,62,20,141,243,103,210,30,62,88,0,25,234,126,38,208,150,2,253,227,92,170,52,176,230,47,67,156,194,157,210,22,36,212,19,19,107,180,190,43,224,82,13,67,62,91,148,59,62,86,105,40,236,45,77,209,91,4,
+2,247,17,245,133,45,229,232,7,116,105,67,102,75,136,222,51,169,103,199,108,74,110,60,71,83,16,67,41,211,175,43,217,189,246,132,32,52,234,10,60,174,213,81,245,244,218,85,116,46,188,254,84,123,241,168,170,219,18,71,165,115,56,96,217,131,236,61,85,80,240,81,153,240,97,136,63,133,104,175,88,94,218,205,15,43,11,71,101,146,165,186,101,208,194,83,35,125,178,130,108,86,141,185,194,166,37,63,121,17,37,116,40,18,107,198,148,241,139,16,105,54,78,92,120,148,130,151,199,98,209,113,70,193,164,31,251,203,133,157,51,118,221,222,183,251,142,78,43,51,118,241,137,3,55,21,50,82,102,158,91,107,51,148,144,48,12,232,108,228,156,27,17,73,115,10,94,36,216,48,47,109,171,122,178,155,233,79,98,203,36,191,4,198,173,135,178,226,89,156,228,1,220,140,114,223,99,136,25,63,250,71,53,78,217,244,58,187,89,20,0,3,77,165,166,247,17,77,51,179,229,98,225,33,243,150,84,193,245,105,62,132,80,210,65,30,83,9,88,165,151,23,230,38,173,187,
+248,156,185,84,54,184,180,131,167,238,18,31,162,24,34,118,211,80,89,152,248,52,170,140,202,238,158,167,227,233,218,62,171,208,225,75,201,229,50,147,63,56,136,231,237,231,129,187,122,180,62,9,205,49,30,55,79,201,52,227,0,93,62,223,84,32,210,116,133,154,53,65,110,71,152,23,242,88,5,39,33,116,48,30,50,204,150,75,118,251,202,139,210,121,70,149,161,211,184,18,96,125,11,202,241,44,123,24,130,103,217,83,164,126,144,67,31,143,227,143,169,216,52,63,195,73,205,208,206,14,187,116,121,99,63,158,106,114,113,15,9,233,218,233,243,196,231,19,81,37,127,91,219,159,220,152,89,128,89,51,162,47,187,161,248,249,129,233,78,58,49,181,168,58,112,54,101,106,243,44,180,117,223,124,195,29,156,103,194,128,208,192,132,232,241,113,155,101,201,52,234,184,75,131,150,245,116,40,215,216,79,177,164,229,24,156,49,31,212,106,94,66,219,223,243,247,71,25,200,26,92,21,176,253,4,52,66,72,114,155,68,51,28,147,107,228,21,67,59,17,107,245,11,118,200,135,
+150,71,228,176,212,129,162,90,100,136,239,178,104,1,180,234,225,248,201,20,167,95,206,73,216,201,132,0,249,47,126,209,134,211,236,145,85,166,178,41,173,86,179,113,145,6,251,120,209,26,142,213,173,107,10,150,155,172,204,151,92,60,210,17,132,4,206,33,30,18,56,90,73,177,205,8,25,10,99,189,189,79,223,135,20,22,63,136,124,10,208,147,30,103,255,104,65,194,2,18,182,111,236,60,101,149,218,50,37,10,242,45,237,73,51,114,160,198,163,16,88,127,156,68,63,214,16,14,174,165,203,171,171,6,1,10,178,21,192,61,115,5,135,228,99,141,246,237,7,64,235,7,72,31,94,124,251,228,65,213,230,141,186,191,251,49,213,247,63,62,215,250,240,18,221,187,79,30,130,109,106,123,247,254,205,219,205,99,198,87,31,191,104,255,254,205,230,127,159,125,241,250,171,159,188,121,249,246,243,239,191,248,143,111,126,249,106,125,248,167,175,191,120,245,7,95,189,121,183,121,122,245,226,87,155,183,220,214,223,173,255,213,203,47,223,175,127,121,251,205,51,175,175,191,93,255,
+252,202,223,203,119,239,95,253,134,103,89,127,180,121,210,250,199,127,250,131,29,132,10,190,179,126,67,103,178,220,60,204,170,112,154,73,76,171,96,112,147,183,111,218,171,19,77,83,154,216,205,100,167,215,230,194,78,241,80,198,151,159,123,141,59,44,93,160,27,147,162,227,240,199,213,202,151,26,111,1,24,92,190,254,212,14,17,48,64,134,120,205,131,221,192,44,240,115,1,28,220,114,108,247,118,119,128,221,34,9,160,145,220,66,224,136,232,2,168,119,2,2,32,115,240,100,176,155,115,162,139,160,220,102,142,122,218,56,97,30,156,235,247,3,133,4,170,66,31,159,55,120,183,101,19,179,68,152,79,110,83,190,199,170,221,26,24,78,52,221,97,98,232,116,224,101,213,78,237,176,18,242,117,180,43,43,79,105,31,219,123,125,5,115,2,62,33,142,50,86,246,221,77,175,146,126,92,61,158,48,203,154,182,21,239,193,156,139,6,253,220,209,92,119,104,136,114,9,138,251,174,101,58,53,213,52,117,138,165,109,193,115,210,82,242,216,101,174,132,15,16,75,83,113,79,249,
+176,231,74,41,227,74,165,50,208,141,47,90,79,245,115,143,25,231,108,226,43,181,213,44,60,46,79,23,227,52,170,85,124,96,247,194,7,216,7,62,110,34,121,58,138,4,235,194,182,96,161,163,199,185,227,228,101,97,201,207,132,242,118,89,221,144,81,146,219,186,85,170,215,10,148,169,139,99,62,121,76,26,50,21,160,225,233,209,117,110,168,154,133,204,192,24,17,101,104,24,43,106,61,63,57,228,218,103,253,135,227,149,115,57,103,238,111,131,212,82,181,197,198,129,119,138,182,167,126,157,103,225,235,39,46,113,115,200,25,152,211,209,229,112,196,28,183,31,135,238,114,184,49,49,205,53,187,222,184,211,56,230,131,50,171,210,172,239,121,199,169,189,217,165,5,169,158,108,211,141,234,213,48,58,211,85,133,117,13,77,225,18,206,100,230,224,68,199,72,145,113,15,98,91,168,102,185,26,135,205,74,94,120,91,56,167,90,166,81,124,223,98,206,186,132,157,230,137,172,74,183,154,247,196,206,237,166,125,166,128,209,38,22,123,157,171,163,248,252,242,123,125,43,55,157,216,
+240,110,97,246,26,15,86,186,247,22,214,28,194,156,132,0,167,187,14,79,66,75,89,228,178,222,33,36,172,202,36,135,158,118,133,206,23,51,142,159,81,31,153,218,241,80,25,153,189,238,203,250,220,242,194,155,236,210,52,144,134,122,186,23,100,236,124,139,121,197,230,231,184,177,28,155,240,104,82,86,194,61,12,39,21,146,226,153,77,75,166,194,119,133,173,246,18,219,213,22,155,199,214,238,185,33,148,225,31,206,82,45,122,25,90,134,89,163,111,156,217,150,32,58,13,158,77,108,103,205,84,75,215,184,196,44,205,46,185,34,77,111,43,123,66,161,37,98,178,244,205,37,110,50,174,94,68,103,181,94,153,35,7,207,76,171,96,113,148,12,79,145,245,168,197,116,55,34,212,124,194,177,165,101,247,154,150,71,11,9,210,56,181,114,75,100,23,38,77,22,62,156,48,92,236,254,120,96,18,203,86,59,53,112,240,52,180,16,202,81,181,236,230,49,214,98,239,250,92,180,164,121,33,169,143,109,83,109,91,57,98,199,246,245,198,122,144,23,8,202,147,227,85,152,241,128,
+138,142,8,230,230,153,50,163,97,141,22,15,123,149,178,89,182,2,109,12,225,201,113,170,126,99,106,103,228,122,169,227,24,60,93,205,23,100,210,56,53,206,130,93,221,130,139,44,120,90,114,76,115,152,225,80,175,185,163,166,236,106,22,22,72,189,86,130,122,106,29,247,41,103,224,150,197,159,2,164,227,212,9,45,202,232,53,120,140,96,210,67,136,54,43,196,10,206,197,59,119,183,203,109,126,84,71,164,196,57,139,197,60,153,149,100,241,198,182,197,117,168,137,94,40,123,59,192,140,114,227,2,54,136,35,58,190,133,75,230,150,229,104,24,185,4,90,216,170,150,176,69,2,232,251,196,231,130,215,50,65,80,152,219,114,8,180,22,254,230,2,248,243,5,215,114,112,64,245,0,28,184,146,226,2,58,58,80,182,6,55,132,109,210,26,220,16,182,47,142,158,43,168,1,235,10,86,125,239,14,80,63,182,241,209,55,34,64,177,110,63,187,110,255,188,60,102,96,15,208,128,6,180,125,172,151,182,174,36,111,33,19,157,192,163,176,63,67,138,0,3,219,2,157,187,1,
+159,27,56,216,125,110,96,11,120,110,96,123,227,61,96,55,104,152,101,83,195,221,115,55,138,59,207,221,56,250,56,142,125,217,135,1,127,218,14,84,213,1,237,217,17,25,128,59,98,49,92,240,177,37,220,121,32,138,224,87,51,205,167,254,125,44,103,44,45,84,108,212,25,56,73,155,233,57,239,208,210,156,204,23,145,164,237,114,156,81,45,165,224,254,37,119,121,158,175,8,235,138,85,124,228,24,147,251,138,83,152,125,220,149,128,179,146,242,242,54,175,98,118,199,216,26,199,170,212,204,174,82,86,93,143,103,109,219,33,99,157,77,239,151,185,68,59,201,27,218,43,117,139,77,231,202,12,205,158,147,109,113,83,199,208,183,249,135,171,182,43,197,212,12,83,51,174,137,82,223,246,185,48,170,218,234,76,204,176,246,107,152,76,102,197,121,104,215,133,130,69,72,87,130,188,202,42,117,178,241,42,199,124,46,185,91,24,242,23,193,35,14,206,206,24,234,16,220,114,211,45,12,163,107,64,168,254,104,87,84,149,43,164,32,115,216,83,234,125,33,203,76,121,169,38,224,
+203,174,8,55,124,83,9,245,167,156,187,246,152,208,223,77,242,207,12,126,200,123,205,67,245,81,243,40,200,86,174,26,166,162,137,86,199,19,52,141,149,45,225,125,140,167,166,205,192,83,203,51,227,14,244,87,113,131,170,57,174,237,217,152,93,83,99,143,25,47,71,83,206,146,57,46,205,156,180,159,230,231,23,215,117,220,189,191,230,134,252,66,44,116,175,38,100,122,11,155,62,19,103,118,93,252,234,105,198,70,112,198,61,157,6,40,7,185,132,7,21,159,203,206,156,97,86,205,254,26,169,141,211,101,37,243,180,167,12,214,251,196,69,231,178,116,72,32,61,132,92,230,98,131,39,181,210,207,152,122,182,43,133,206,173,44,67,123,113,108,75,199,180,168,123,230,200,133,105,107,152,11,77,88,155,227,227,109,174,82,168,255,196,52,63,233,177,202,138,244,248,82,163,79,130,186,133,56,201,55,101,166,174,254,46,222,123,102,215,78,77,70,126,185,66,70,84,194,119,72,113,191,102,239,134,143,204,138,213,126,98,60,84,137,38,194,81,16,211,123,10,79,184,195,96,26,
+2,57,132,113,243,26,228,16,198,147,107,144,67,24,223,91,131,28,194,56,125,13,114,123,242,36,196,136,215,166,162,89,21,181,119,85,224,7,106,67,247,94,192,179,202,215,125,25,132,190,77,75,182,40,45,122,191,230,94,77,167,227,74,187,30,158,9,207,117,199,78,63,19,178,24,78,22,97,142,17,84,51,62,139,19,211,120,132,6,62,7,39,183,101,141,167,54,67,209,210,237,80,93,71,207,48,117,184,159,173,86,240,129,62,119,194,192,174,26,44,198,241,106,128,211,92,35,117,11,160,111,44,156,70,216,0,45,7,223,114,108,144,250,17,15,84,199,246,6,169,187,0,103,131,84,129,238,185,158,235,103,26,118,239,60,211,240,221,145,224,185,2,249,170,191,65,234,5,31,189,65,42,252,25,94,231,133,242,120,131,212,29,8,170,159,224,44,239,176,144,55,72,37,206,144,27,164,254,67,60,47,122,30,206,63,25,207,185,117,41,8,169,205,130,111,131,84,17,130,191,65,106,37,150,219,32,181,63,120,50,14,24,153,105,217,116,88,58,31,135,184,44,238,178,154,99,
+133,51,140,85,128,102,196,30,202,143,151,54,150,105,57,106,60,222,156,123,152,236,232,8,149,182,143,77,162,19,36,72,97,134,244,65,185,138,188,56,173,184,147,71,28,121,157,40,51,10,8,105,91,124,121,160,20,238,213,219,119,65,151,50,183,155,28,66,170,160,173,83,42,49,27,85,80,63,247,66,170,160,204,23,195,21,75,105,11,11,33,107,103,220,107,130,79,36,231,101,147,128,164,156,49,206,24,154,169,53,177,124,226,59,210,123,138,154,206,119,90,92,186,157,13,115,55,59,230,23,52,198,218,98,118,153,204,77,121,147,52,220,35,223,209,21,195,179,147,83,91,250,88,17,55,44,21,143,183,214,165,107,17,212,210,86,214,69,57,53,203,115,201,224,153,153,215,90,97,47,72,199,122,141,233,4,153,67,248,154,150,19,105,166,111,90,176,217,220,173,208,188,49,19,137,103,170,182,60,148,170,132,2,167,149,107,30,233,126,53,143,80,19,132,138,93,141,211,140,206,194,102,249,118,83,110,167,36,93,205,120,110,165,241,91,242,182,7,104,161,66,241,218,245,197,168,
+66,240,11,207,211,124,118,207,213,78,181,131,231,99,74,139,12,14,178,160,49,83,235,21,246,122,32,213,152,104,107,74,39,69,27,96,169,173,6,141,73,36,125,188,10,16,58,193,58,83,229,106,113,245,118,62,95,75,35,4,132,45,144,93,30,206,60,188,71,131,187,99,97,247,158,84,162,208,176,34,28,69,192,43,75,120,84,14,207,162,134,234,180,53,119,218,44,79,37,253,172,81,227,89,237,99,247,186,150,142,191,223,220,109,102,60,35,243,225,208,37,102,142,224,151,38,114,83,57,238,232,230,25,200,27,9,239,195,133,105,53,211,210,129,243,114,33,132,177,28,64,235,207,22,118,77,53,107,49,92,217,63,121,212,209,232,132,179,163,241,44,16,107,47,146,119,224,50,57,100,199,74,27,148,6,130,147,250,221,234,136,27,174,103,12,139,56,144,244,12,53,18,221,241,122,85,47,90,230,64,250,142,61,109,53,205,65,108,37,150,152,85,196,51,73,150,48,33,129,59,203,51,115,230,176,19,68,157,130,87,184,132,10,240,117,77,59,158,223,104,159,16,190,152,150,158,
+60,160,0,130,58,150,235,2,194,21,102,99,241,170,181,153,86,72,170,7,120,150,197,251,132,111,165,2,120,212,50,221,21,225,129,32,221,35,4,12,104,246,223,103,231,21,146,103,5,1,69,27,227,239,19,174,200,107,168,203,158,253,130,160,10,113,35,105,203,145,32,126,160,101,216,51,238,186,29,30,90,8,40,160,81,88,17,0,39,192,131,145,159,225,246,27,249,249,226,121,56,176,173,231,110,56,142,158,187,65,186,122,238,6,241,55,232,133,175,241,157,91,151,218,233,61,13,187,226,72,208,86,174,209,97,132,182,238,12,60,214,215,59,61,27,35,112,217,153,158,225,185,5,181,50,66,24,152,89,126,207,162,183,103,180,100,165,19,144,245,84,51,101,52,231,219,49,113,37,85,95,157,205,193,138,50,220,15,214,137,244,187,86,51,130,218,10,12,184,106,145,127,219,55,117,90,139,196,185,144,111,159,234,178,196,100,79,54,107,137,251,67,173,113,121,116,158,129,4,42,115,113,109,227,106,55,140,25,74,49,55,140,73,163,212,55,140,249,184,58,99,84,146,228,146,49,
+9,174,78,31,150,79,82,71,124,192,62,227,25,211,202,228,52,128,221,218,157,37,137,174,148,181,148,8,152,23,249,105,215,51,46,218,184,67,51,164,169,125,107,81,13,105,106,223,90,84,107,30,206,142,41,248,227,149,97,175,170,91,13,170,218,69,25,245,216,207,218,123,59,236,251,230,106,14,33,203,60,204,36,89,41,242,200,214,188,104,161,187,185,54,157,149,220,17,177,149,151,101,166,31,220,174,199,150,44,203,101,192,130,119,78,186,118,83,4,97,60,202,8,131,55,242,249,141,141,160,158,45,155,18,11,237,17,85,104,52,139,71,127,75,255,98,79,100,143,22,37,33,216,26,39,167,217,34,169,225,23,142,51,237,75,97,219,89,105,204,54,234,86,81,110,135,103,152,249,78,251,204,137,15,117,251,249,164,109,146,75,71,102,181,224,194,100,164,216,226,131,228,208,48,225,137,237,123,14,66,154,92,12,175,161,98,132,176,178,134,138,4,194,202,26,42,73,8,43,131,76,166,161,214,31,95,182,99,92,139,156,197,141,235,151,250,7,79,50,168,74,204,235,221,43,119,
+176,166,127,154,223,21,220,203,165,70,8,203,39,33,206,154,132,151,158,169,98,225,147,120,154,158,134,176,213,160,55,238,236,193,34,235,145,247,9,63,125,151,87,124,68,143,208,46,217,206,222,54,228,160,8,11,217,59,240,108,104,0,100,171,107,83,141,43,114,224,167,118,31,188,15,8,165,110,120,182,55,103,90,224,128,198,243,177,158,221,103,250,248,218,158,179,107,99,231,129,124,8,103,143,133,33,232,6,68,176,14,12,234,130,119,99,191,106,123,167,66,132,212,105,160,255,93,60,157,169,32,64,50,51,26,60,224,72,252,255,193,79,223,213,155,123,80,41,1,129,151,137,169,155,197,186,130,55,49,78,90,151,108,151,26,223,82,182,17,9,141,232,176,116,40,174,111,165,138,40,57,245,16,196,93,58,35,87,53,167,234,8,226,168,190,137,167,207,204,83,129,70,113,165,65,47,87,43,12,93,6,86,134,238,7,6,86,162,225,25,130,203,35,167,6,132,194,29,155,217,118,129,233,237,100,202,79,107,53,57,183,217,76,27,53,121,178,125,180,86,147,43,234,142,126,202,
+53,69,160,216,151,159,242,104,75,194,107,134,81,107,103,249,101,231,113,165,182,101,201,39,218,204,78,165,147,85,41,43,217,50,213,181,176,245,43,93,140,163,91,68,162,174,27,122,72,61,110,103,210,146,86,119,97,16,205,50,184,250,148,123,180,154,206,252,20,51,68,151,253,167,17,220,146,98,110,11,193,229,94,198,228,103,41,240,89,212,209,195,195,69,192,206,59,119,162,210,26,30,120,165,32,168,87,160,76,195,143,141,234,122,173,89,220,28,45,226,41,114,225,66,215,207,132,109,22,86,91,166,156,75,215,48,1,171,215,139,38,163,45,225,198,3,209,252,46,8,94,51,3,105,11,79,24,212,159,61,10,248,46,230,66,87,139,164,189,45,159,38,57,8,78,40,10,136,114,2,16,91,172,41,7,79,240,9,5,90,80,212,38,24,80,92,112,176,180,158,12,7,169,9,118,97,154,132,219,227,251,168,101,48,93,145,214,128,218,207,25,151,193,134,79,47,246,203,211,154,74,255,9,113,23,15,27,151,1,30,49,101,129,122,73,32,183,159,225,97,229,60,195,131,22,121,
+134,71,236,228,25,30,250,196,51,60,88,62,110,252,110,49,186,197,204,209,200,147,161,211,126,59,111,151,231,242,237,148,66,131,56,127,180,243,138,59,132,125,248,4,162,142,173,168,185,69,47,229,42,164,165,235,17,192,233,125,106,87,71,243,247,249,81,102,25,34,143,48,196,29,209,53,121,64,220,241,209,222,37,107,242,128,76,21,195,123,54,184,222,179,89,70,139,107,242,128,184,131,180,38,143,191,71,111,113,214,198,14,113,7,115,77,30,16,119,124,75,39,66,220,129,91,147,7,196,29,31,241,4,108,61,3,18,191,38,15,136,59,246,215,228,241,247,196,75,178,223,160,79,191,139,255,239,226,246,187,60,244,184,38,15,136,59,150,107,242,128,184,163,183,38,15,136,59,202,107,242,120,224,198,27,160,111,209,21,91,13,96,100,53,101,215,58,5,126,93,83,187,135,113,13,161,200,161,152,103,85,70,103,243,225,196,178,76,251,124,99,101,113,62,63,139,94,46,121,184,35,153,177,93,176,77,250,209,34,203,190,191,81,119,20,230,56,36,11,134,251,222,179,165,125,86,
+61,220,173,132,135,241,48,63,193,47,46,156,147,187,14,84,116,17,126,178,60,20,111,50,168,152,162,160,179,212,150,104,195,116,209,196,219,107,227,157,36,198,251,208,84,181,44,246,200,42,67,48,105,92,117,8,0,3,105,92,179,71,216,203,221,45,159,30,84,76,16,247,176,178,78,150,118,93,166,45,115,85,198,23,135,195,150,139,146,105,140,229,197,100,70,95,178,36,53,70,109,29,5,43,46,138,139,50,79,161,54,141,227,170,96,203,93,130,31,134,30,172,136,46,217,101,84,152,232,3,149,93,121,61,173,184,248,76,214,45,209,197,108,229,217,171,158,140,59,171,95,231,21,15,184,250,250,150,79,143,61,88,211,211,168,244,76,79,225,225,154,158,188,119,104,14,155,99,13,12,204,53,193,170,155,25,67,198,28,115,177,67,109,115,64,123,88,154,165,245,109,138,45,167,182,69,192,51,147,61,99,42,96,81,225,147,68,74,144,170,9,131,190,222,253,232,62,181,18,222,249,216,194,138,65,105,70,204,120,103,15,49,56,121,4,134,147,163,24,38,185,28,139,30,201,221,
+201,50,102,42,111,162,187,20,188,180,23,207,148,211,149,100,178,109,51,180,231,60,54,207,149,170,131,50,203,238,89,154,163,181,129,251,65,53,78,105,21,65,222,103,110,86,18,120,133,153,120,207,172,76,48,173,25,251,140,9,163,121,132,254,225,225,222,97,251,122,220,170,201,103,194,2,98,185,154,83,122,203,246,114,107,252,192,68,89,123,117,75,169,145,235,110,185,102,62,85,165,38,74,102,44,134,217,156,128,111,45,18,150,169,50,158,48,182,113,78,112,218,156,250,83,4,84,57,220,134,233,157,135,224,192,218,78,208,140,156,129,221,110,187,11,10,175,199,7,205,66,93,147,227,167,7,73,191,117,52,156,174,86,164,229,134,77,153,201,52,45,105,35,55,219,190,33,222,0,148,147,126,125,144,223,208,11,135,248,24,206,78,219,68,128,131,126,173,27,190,29,214,31,53,90,119,180,174,98,78,93,114,186,231,46,102,186,53,18,98,102,116,27,85,29,13,111,86,68,190,55,37,116,21,172,145,184,7,125,112,145,52,54,143,20,115,126,180,53,98,31,103,248,179,39,187,
+253,190,125,143,66,165,143,205,144,66,223,86,182,22,45,79,111,161,132,148,136,117,144,228,47,78,138,170,160,176,123,181,170,171,100,160,205,45,204,156,28,167,214,183,126,36,114,189,84,13,146,86,216,249,130,60,46,140,179,98,176,219,50,38,10,251,170,97,240,124,62,53,137,49,93,42,10,163,139,47,51,212,112,219,202,175,148,159,72,212,193,237,137,46,65,187,155,28,225,150,112,90,66,98,49,35,251,163,222,164,16,101,23,151,93,247,84,88,51,207,102,233,227,126,160,112,168,94,106,104,14,83,134,237,188,205,221,243,229,181,227,14,198,2,191,206,242,254,78,92,62,221,156,75,8,222,133,136,76,4,146,15,1,97,110,23,194,231,186,224,233,70,215,245,221,68,6,172,131,11,125,195,143,91,80,44,8,233,246,107,14,25,168,248,160,130,191,201,79,228,105,207,21,68,220,43,11,228,198,228,225,144,11,10,31,49,159,232,2,200,203,64,60,191,215,120,118,112,197,15,188,91,54,172,111,63,197,221,145,57,15,6,4,37,255,108,125,250,93,126,255,216,206,233,10,214,
+184,75,202,190,179,239,255,203,23,239,94,255,252,245,122,155,248,122,231,251,250,174,250,122,139,219,199,173,239,175,55,247,236,95,125,114,243,254,59,59,94,254,203,135,109,54,31,247,77,190,251,122,43,250,235,205,6,254,127,244,214,150,255,178,222,218,178,121,194,240,252,80,96,189,233,230,151,175,95,253,106,189,201,229,219,123,121,190,181,25,233,91,187,113,54,155,141,222,109,90,217,156,255,201,175,95,188,252,108,115,229,199,135,7,223,91,63,78,248,249,203,191,121,245,188,13,255,155,158,253,234,205,219,191,249,222,139,175,190,120,249,217,171,15,219,240,215,27,211,215,153,9,62,238,93,250,122,55,205,239,253,217,243,24,255,215,111,30,37,252,209,159,254,225,239,254,225,159,252,240,79,224,136,56,156,12,7,0,68,107,241,97,239,91,195,138,230,136,162,62,110,155,157,178,54,130,171,8,219,251,116,73,18,51,136,231,200,243,67,39,245,106,251,97,151,91,101,81,58,81,226,19,139,120,2,203,75,32,133,182,159,226,131,201,147,33,167,235,225,166,205,226,160,181,255,232,
+133,52,170,62,223,185,138,96,120,32,54,46,207,106,171,39,121,68,160,24,73,161,163,190,240,205,32,226,163,107,156,179,202,220,28,2,185,150,36,199,141,245,75,189,238,249,194,190,10,21,151,65,158,161,27,68,91,86,69,231,138,94,185,26,58,209,151,38,248,54,225,220,111,92,136,19,29,239,140,127,52,122,168,113,247,26,25,54,103,49,232,132,99,184,243,124,96,110,170,204,110,79,179,221,189,172,144,192,134,99,116,119,20,122,37,218,152,87,178,42,188,252,12,250,55,120,134,201,235,46,179,220,74,237,90,168,89,246,166,146,228,19,110,56,204,73,100,167,44,150,248,169,73,213,116,22,173,78,15,121,20,62,152,78,70,17,237,170,120,154,141,222,71,247,183,99,60,115,35,173,61,77,6,148,45,40,246,153,208,249,138,7,19,140,143,201,128,209,78,106,25,191,0,51,88,66,116,58,141,238,205,155,81,62,126,177,23,53,0,88,107,172,90,158,220,92,100,23,154,39,205,50,10,156,95,98,37,171,155,4,98,39,31,103,71,181,151,86,210,233,158,64,88,61,173,15,
+35,74,34,30,93,182,203,144,114,162,145,222,222,223,30,169,199,166,166,57,213,59,96,209,168,166,226,74,105,139,225,68,110,179,77,199,42,136,60,247,69,63,3,139,69,34,206,179,169,172,141,58,72,20,245,199,226,199,201,0,174,133,169,188,21,106,70,189,36,58,15,182,225,13,61,59,45,198,192,130,171,125,195,180,236,198,138,12,45,253,249,50,117,219,25,81,250,138,9,18,121,108,168,37,116,100,145,185,191,23,8,154,115,226,5,89,124,30,80,6,205,103,135,162,194,153,117,215,223,8,118,202,10,189,77,71,74,6,204,190,139,172,234,152,113,28,43,63,142,89,15,216,88,213,201,247,227,185,61,78,62,81,62,94,168,171,45,26,116,217,244,33,15,57,237,242,49,115,11,171,72,240,230,103,83,208,218,49,91,83,76,77,188,104,228,142,194,147,97,148,214,11,114,147,70,2,227,210,88,172,28,19,130,218,201,66,149,13,96,119,166,137,137,187,19,246,98,213,39,105,234,163,110,123,251,30,237,33,233,142,4,167,130,251,161,124,232,185,167,157,39,179,42,6,52,214,
+131,33,33,101,75,107,125,51,62,179,95,189,127,196,32,244,196,104,123,215,186,138,21,162,65,110,170,42,138,41,238,131,75,83,13,36,105,139,253,189,19,116,240,56,25,177,26,239,30,235,115,239,110,209,141,130,91,59,203,187,168,0,165,148,17,91,98,82,111,68,49,247,2,183,251,23,187,141,179,101,93,23,98,184,45,181,211,68,141,153,0,29,89,24,247,105,211,226,117,185,46,58,165,22,172,139,253,42,22,210,222,232,43,92,238,216,228,238,17,213,92,243,209,125,167,19,156,8,183,47,30,16,141,192,56,147,96,66,51,27,37,175,174,238,175,118,84,215,178,201,93,95,6,172,2,123,229,211,187,202,158,83,53,89,119,254,156,165,83,165,108,166,105,41,99,93,106,166,13,159,206,190,71,191,23,88,159,50,101,121,18,44,107,204,28,58,174,213,46,198,155,189,216,3,82,110,183,85,7,22,16,43,206,200,26,189,129,232,194,94,182,223,71,185,40,210,220,98,120,50,28,93,20,254,95,202,222,178,61,149,160,107,19,253,235,144,32,141,187,91,112,119,247,224,16,18,
+220,18,220,33,184,59,76,179,243,188,51,103,206,204,53,115,206,167,189,9,80,93,93,181,110,91,69,72,99,149,150,145,76,129,171,34,8,91,18,45,177,139,108,148,118,115,126,123,117,36,147,5,13,184,98,217,176,67,136,45,101,163,25,191,170,109,112,215,79,53,123,181,132,245,157,55,125,175,155,126,237,159,107,227,116,74,235,186,252,22,174,110,57,225,113,236,161,156,246,244,125,57,80,241,52,183,110,177,177,169,195,248,223,143,28,234,213,111,179,27,155,145,42,193,241,123,153,169,228,246,188,111,108,42,144,155,140,158,26,189,232,73,229,101,207,166,111,230,216,175,157,132,140,115,72,215,29,219,236,136,86,151,207,29,219,35,142,177,16,56,218,100,2,89,59,241,143,70,166,221,208,203,146,255,14,15,250,250,54,189,100,83,246,213,211,30,32,85,203,122,17,47,71,44,190,105,130,141,251,195,83,188,123,218,148,64,99,239,87,249,234,203,101,141,68,41,144,114,52,150,6,109,131,81,157,219,169,204,178,89,221,150,184,204,180,105,190,227,16,129,150,33,136,253,158,34,
+29,149,161,165,202,68,8,30,23,222,181,169,246,30,191,4,62,251,209,249,24,198,180,143,47,127,247,219,190,175,221,146,184,177,218,111,187,125,207,31,60,95,79,157,199,176,252,158,91,224,97,221,61,26,67,217,90,192,63,243,50,117,74,172,225,58,49,142,86,240,54,71,55,233,35,242,48,186,238,235,15,23,45,76,209,23,18,223,199,178,223,183,19,248,205,251,171,255,182,113,94,162,254,195,103,121,193,187,12,131,38,99,186,238,237,207,248,106,123,109,247,61,216,186,117,223,215,88,231,203,107,111,24,198,178,141,205,166,75,18,26,55,33,206,148,196,215,47,243,182,250,154,246,181,124,240,155,56,220,213,207,184,40,231,86,101,119,1,202,84,45,124,70,247,118,246,199,234,139,113,208,156,252,243,235,218,75,112,243,107,55,188,92,214,124,160,172,11,199,228,242,197,241,157,122,147,57,247,216,57,84,5,192,28,241,227,157,204,210,48,187,82,143,247,25,149,142,117,214,218,70,15,74,143,37,43,216,138,114,118,149,215,196,43,107,102,123,229,106,146,27,92,240,65,107,114,
+22,247,146,223,115,92,164,7,205,115,135,208,244,108,70,110,247,220,117,136,129,190,40,73,238,196,104,175,138,34,106,53,46,203,245,242,123,110,11,111,50,93,172,137,57,47,111,122,119,210,224,140,18,211,85,239,179,165,116,210,188,174,111,44,203,194,69,35,2,223,203,10,77,88,157,59,59,171,147,224,58,169,46,189,229,244,237,160,199,63,110,187,212,208,119,205,87,134,77,93,115,173,84,219,155,211,27,124,76,212,10,28,157,237,102,198,88,248,250,147,23,156,157,107,117,109,189,91,28,67,176,220,194,127,98,58,215,172,37,240,13,135,95,197,143,56,140,232,37,1,227,11,200,3,71,225,247,122,170,226,17,216,17,233,34,108,37,192,161,101,31,91,83,101,213,244,143,145,135,83,154,173,115,98,169,0,167,19,40,55,190,134,193,180,212,102,125,173,113,28,213,228,156,231,187,177,123,60,91,182,141,72,3,233,21,100,196,171,161,50,193,6,15,39,183,64,32,234,47,139,130,157,255,152,246,207,29,171,91,213,77,191,127,225,9,130,91,121,28,145,176,124,30,255,45,37,
+151,167,52,219,148,214,51,89,91,220,44,213,70,253,172,135,118,225,139,18,171,217,111,90,98,178,188,216,253,234,147,42,161,159,246,65,215,122,134,36,211,137,190,73,76,239,211,219,188,44,184,121,171,23,254,41,135,235,214,5,223,174,62,69,80,141,94,47,157,47,123,211,16,26,35,54,182,198,99,144,31,21,49,49,189,79,235,113,5,204,189,202,142,145,226,89,247,30,113,137,231,187,199,151,151,189,170,244,186,246,21,139,93,210,250,146,49,100,97,87,157,233,50,184,23,9,205,199,229,87,62,111,238,194,59,235,250,151,80,222,140,102,42,115,108,193,249,190,109,98,124,193,131,65,42,250,107,2,235,61,174,191,11,29,208,174,157,40,4,121,42,133,120,181,166,20,87,65,121,55,86,186,17,251,218,97,87,87,29,29,191,147,53,8,247,211,249,37,221,248,18,220,148,202,136,192,203,116,157,108,137,238,220,203,247,252,34,80,7,61,89,252,109,88,29,119,148,230,70,207,27,249,7,85,183,144,49,171,12,183,72,72,143,36,42,147,47,234,172,242,39,241,5,155,186,154,
+109,205,74,223,52,222,11,246,3,233,133,117,63,118,155,42,167,189,110,24,79,206,230,152,190,97,105,31,187,242,133,163,231,216,121,24,124,235,253,229,144,247,222,49,254,227,202,181,241,14,203,169,249,227,198,210,35,239,71,197,237,83,228,236,233,5,10,60,142,251,240,170,206,105,182,89,128,27,220,17,237,36,159,142,111,236,9,19,42,41,231,97,93,224,235,11,125,126,147,157,71,180,28,53,100,68,250,115,39,148,134,166,27,202,175,49,134,61,85,246,252,136,242,205,101,95,164,157,209,176,136,9,63,238,166,32,48,70,180,204,142,153,243,127,246,90,222,13,62,58,118,76,250,105,211,177,220,228,135,84,249,62,1,229,174,171,133,119,211,151,228,93,70,112,220,31,162,199,15,42,164,99,221,29,91,118,2,252,87,117,61,128,192,247,94,95,182,242,187,161,72,86,7,131,133,143,95,81,175,43,205,69,210,215,246,183,89,210,84,97,111,3,165,2,198,85,18,243,182,154,41,254,142,238,213,79,49,32,112,221,13,121,37,231,228,181,238,111,246,200,66,79,156,23,18,193,
+214,8,145,222,127,224,155,125,21,37,44,216,192,126,102,121,162,252,176,104,184,106,93,110,194,214,251,81,51,63,212,86,237,193,188,26,149,193,169,61,72,82,63,215,252,24,173,174,12,190,116,171,241,223,31,89,239,25,97,125,141,195,60,231,138,249,230,22,44,237,81,125,27,211,74,203,96,181,196,175,235,42,185,76,111,145,194,155,14,248,72,179,117,158,72,189,1,178,32,83,195,31,226,68,137,196,225,83,215,184,225,192,13,239,68,151,177,142,62,245,232,53,204,249,147,91,158,114,71,187,191,176,170,156,81,67,56,78,190,62,229,113,107,206,122,110,29,203,115,12,169,18,135,134,243,20,63,20,41,200,134,249,70,44,38,109,211,219,89,223,255,34,17,157,228,10,73,148,41,229,40,66,113,153,251,234,233,231,203,229,97,91,61,247,117,54,51,76,228,118,194,49,248,134,118,199,6,159,164,31,77,236,203,221,217,229,77,214,72,13,104,238,50,77,189,171,55,139,9,42,238,159,196,101,84,46,75,99,96,94,90,114,80,36,81,239,147,151,190,97,183,81,117,251,200,50,
+93,36,189,223,199,209,183,110,176,8,159,110,135,226,140,45,72,66,235,166,237,132,95,251,15,52,218,101,131,127,24,142,161,217,81,19,223,223,38,11,243,20,25,135,86,194,241,148,150,200,75,208,16,41,252,97,229,242,250,40,37,231,142,126,201,45,251,227,61,22,253,244,63,222,73,95,35,120,234,154,169,173,47,201,59,186,107,112,182,117,10,248,190,174,110,172,204,207,5,174,57,61,153,16,207,185,158,206,119,36,220,46,167,248,215,175,231,50,176,175,23,26,9,188,125,235,169,92,214,45,30,234,164,221,51,107,11,85,193,176,116,91,130,100,81,179,162,250,219,81,17,7,109,77,103,111,35,170,51,138,205,133,115,201,201,155,54,176,223,202,67,152,205,154,209,189,172,155,85,210,94,47,174,8,50,173,251,122,20,5,169,71,93,253,184,191,87,247,232,3,241,160,179,97,136,87,189,235,151,250,1,231,76,62,68,61,105,190,21,231,149,180,183,139,191,24,142,55,142,59,214,146,132,23,218,121,143,153,191,52,95,15,123,233,228,227,138,18,35,151,158,238,67,125,46,234,
+110,144,171,179,203,229,191,171,210,177,46,190,107,154,108,201,152,209,152,63,159,11,21,235,123,85,64,9,99,194,237,251,39,179,127,164,62,28,137,190,114,89,121,95,169,15,200,117,88,141,47,64,179,20,167,234,219,187,115,137,42,183,111,106,88,45,42,159,244,179,6,71,233,209,76,241,175,172,103,213,200,179,48,157,115,32,67,97,124,6,221,110,197,144,233,239,29,220,206,151,51,251,173,59,78,180,158,151,215,156,39,70,13,228,255,186,233,84,15,127,129,43,100,56,133,82,19,25,161,226,42,250,14,95,133,170,158,239,25,46,217,51,100,195,182,202,106,49,15,41,210,236,188,146,207,19,5,204,166,130,210,52,63,233,82,145,93,99,8,204,39,58,70,229,123,64,79,199,8,103,46,117,181,186,184,33,161,81,185,68,43,105,132,185,89,118,182,67,72,141,223,59,95,220,68,118,255,173,237,122,125,28,127,160,82,113,160,233,18,7,143,134,158,152,40,40,71,0,37,9,250,225,57,133,44,216,28,164,222,137,146,133,243,75,243,244,243,216,199,78,167,27,50,1,251,28,
+17,55,109,1,235,187,138,115,184,125,130,107,115,188,203,250,123,222,106,17,145,189,99,239,5,133,84,239,105,203,229,195,218,81,112,217,222,76,95,13,21,35,147,239,237,11,247,155,188,150,164,161,210,222,155,181,241,62,95,204,215,105,141,107,109,105,62,18,227,16,195,183,146,250,174,40,242,164,188,136,136,121,200,123,157,135,141,185,78,73,177,224,123,253,30,250,184,46,78,145,241,68,94,115,89,143,235,206,226,2,38,249,21,118,95,226,121,244,231,23,157,127,113,177,123,22,246,123,236,151,226,209,151,79,201,161,230,17,186,160,207,182,212,188,36,215,53,78,211,199,239,113,75,224,44,110,219,32,122,110,158,210,167,182,150,94,12,178,118,137,185,204,18,157,235,239,48,203,47,96,159,227,67,21,90,11,107,164,207,133,221,216,212,149,95,59,191,14,183,93,134,247,205,214,64,213,34,35,120,199,191,111,156,139,172,113,191,21,124,229,65,106,102,223,254,62,164,46,253,244,241,29,181,95,189,138,20,44,78,203,84,183,49,169,165,168,237,125,242,135,199,40,121,199,224,14,
+157,227,179,217,222,220,110,72,79,85,26,71,219,132,105,109,95,218,145,122,253,50,79,68,141,143,150,49,60,207,123,121,203,230,175,213,24,99,230,118,173,71,254,221,112,250,168,84,145,123,189,247,160,45,82,63,232,26,20,254,12,178,93,43,30,8,5,248,228,166,142,34,28,150,203,20,199,134,33,44,63,46,229,126,237,186,24,104,191,33,244,90,165,30,208,59,120,15,167,169,179,180,96,188,88,3,155,241,125,227,117,155,157,107,66,245,41,193,61,166,173,192,73,238,219,137,166,86,154,108,155,169,235,155,61,102,106,217,55,127,248,62,112,5,88,188,15,238,7,42,69,33,211,218,103,21,28,175,204,95,58,167,89,222,189,127,96,226,89,138,81,111,117,9,205,139,194,105,215,20,99,239,31,112,154,203,89,223,178,46,52,178,156,187,251,242,58,79,242,113,243,199,36,57,80,158,76,240,98,176,23,31,177,166,91,96,92,82,40,195,235,224,240,235,73,167,4,23,150,121,108,246,121,173,10,135,107,247,43,151,227,253,19,247,47,211,45,199,59,110,177,95,3,33,205,219,
+110,242,219,187,61,181,184,133,236,133,70,57,61,243,110,193,29,78,218,125,227,2,228,215,96,42,145,163,15,49,221,88,12,86,139,31,117,149,72,114,14,93,235,116,39,146,208,48,47,243,155,54,247,203,206,183,59,109,203,185,140,147,250,57,234,235,34,3,255,107,200,95,88,198,154,155,157,111,164,28,162,145,139,222,127,171,46,98,169,198,69,190,240,156,242,86,178,184,12,231,199,244,90,52,241,149,175,87,227,97,160,173,90,96,139,69,22,17,112,150,151,116,161,62,118,128,133,47,0,145,243,152,183,157,199,161,207,180,200,41,127,47,191,94,1,110,26,156,205,95,5,218,148,116,117,181,192,35,141,58,254,12,159,39,169,172,86,67,80,154,216,127,208,12,129,58,85,89,213,238,135,208,101,106,188,73,15,51,252,32,28,117,21,222,126,189,23,209,124,248,123,65,111,31,60,11,5,44,110,241,54,109,226,215,82,99,39,197,192,100,98,233,220,199,11,214,58,176,161,223,22,174,181,189,19,174,202,211,142,161,31,77,13,125,11,88,174,38,101,27,146,203,210,222,210,240,
+23,118,145,209,107,13,239,174,225,150,225,221,247,205,249,173,42,59,248,59,253,243,12,92,56,235,231,244,172,151,82,22,206,117,47,255,112,246,203,164,119,192,88,8,46,120,52,109,166,100,37,111,236,240,202,208,151,70,201,253,215,155,14,244,127,142,213,207,210,28,191,79,93,237,169,0,151,76,113,179,252,178,77,211,10,79,40,85,155,95,96,126,12,174,85,219,135,246,103,18,26,95,110,250,241,209,126,221,222,31,223,202,210,186,54,104,181,54,99,21,254,116,96,171,10,192,105,99,87,137,96,168,70,41,18,175,236,62,234,125,50,158,111,68,195,30,83,26,199,127,226,56,145,67,44,17,104,139,149,197,160,236,156,247,10,123,101,108,172,255,249,145,205,173,206,165,106,155,116,52,223,40,247,137,238,43,203,37,199,49,89,204,183,231,226,19,237,251,159,67,251,23,117,243,147,96,140,79,67,189,222,187,203,171,85,210,141,221,31,30,59,5,134,137,237,59,197,195,190,6,32,173,111,51,90,128,108,164,247,193,23,142,60,117,187,132,123,172,136,50,19,110,181,15,95,130,
+109,12,191,240,85,101,205,243,102,123,173,206,153,141,13,27,21,171,69,56,205,67,199,121,102,159,181,52,238,74,185,80,194,35,160,36,177,230,174,59,95,217,157,179,126,206,77,111,94,68,254,89,169,74,65,81,175,246,27,37,252,90,49,132,154,191,116,12,140,138,242,185,71,48,199,226,202,195,33,245,16,47,198,22,174,14,147,240,197,248,186,186,7,201,225,93,203,73,63,146,136,96,30,12,57,211,249,105,208,214,87,149,193,56,30,210,176,139,131,248,163,198,65,22,118,139,36,122,146,98,43,135,129,77,206,114,149,116,186,69,142,127,231,247,15,249,7,183,179,140,242,196,109,195,110,17,131,163,23,180,219,248,238,229,181,35,247,55,235,60,202,75,197,100,206,195,250,210,201,151,109,103,210,201,215,158,79,43,219,255,128,93,66,155,230,241,155,202,63,179,14,101,167,121,153,118,223,23,23,137,197,167,119,255,56,73,186,187,228,39,161,7,235,244,229,87,204,254,65,44,30,145,10,165,123,242,21,28,88,25,215,49,151,55,61,135,199,194,120,72,51,20,144,195,178,212,
+73,55,244,12,221,99,252,99,213,121,176,61,52,163,11,123,10,210,103,190,160,184,78,47,43,204,130,89,181,173,174,49,185,191,188,69,177,154,103,19,242,243,182,62,191,187,15,83,223,165,138,127,108,6,60,246,194,115,63,239,202,41,204,245,4,231,236,189,186,1,59,108,40,172,127,234,242,188,28,44,205,156,215,149,143,209,228,120,223,176,251,235,149,4,127,105,153,212,179,252,154,64,170,202,123,11,247,37,183,50,131,247,240,225,24,60,127,233,92,68,134,39,28,125,193,55,206,23,99,179,243,176,146,229,232,47,139,10,165,19,26,108,227,227,69,189,118,236,76,30,91,208,69,232,31,101,93,241,67,149,250,254,41,114,52,33,8,190,105,20,7,233,115,187,42,21,169,153,120,119,182,193,215,111,77,22,174,236,57,185,112,253,38,139,172,114,183,119,17,117,46,53,254,233,82,219,148,191,26,245,243,15,87,170,39,133,225,101,207,71,52,39,233,46,111,101,7,125,81,130,62,110,116,121,79,164,176,168,199,54,233,195,144,215,77,1,123,122,161,118,241,218,114,63,143,140,
+121,28,22,15,173,239,118,159,112,253,151,182,251,176,64,17,196,143,71,202,189,184,61,238,156,98,176,192,85,248,193,218,229,222,63,51,74,120,1,234,173,187,79,242,24,73,126,29,150,9,179,107,109,129,154,53,23,167,219,244,213,127,139,18,70,246,28,126,145,180,117,224,164,161,35,152,173,20,16,14,211,220,154,251,146,168,130,189,123,176,101,224,247,237,173,132,218,192,172,150,20,47,211,93,0,179,248,242,157,59,10,142,28,47,246,127,105,130,120,231,196,27,115,207,107,198,244,140,237,110,92,55,120,123,13,103,239,18,146,242,189,211,182,200,215,186,73,18,176,89,105,195,81,109,79,228,98,188,98,84,194,153,255,7,185,63,159,63,15,122,181,127,164,200,9,41,234,214,189,84,124,43,115,13,177,21,186,107,187,79,3,11,89,178,225,63,37,218,134,170,206,213,155,190,28,82,153,251,214,127,63,36,141,202,5,147,87,233,166,15,139,106,95,190,224,186,83,121,24,145,4,156,30,178,202,142,212,119,203,187,167,18,28,35,80,54,28,115,50,138,232,76,70,135,46,237,
+183,101,177,254,234,125,187,239,211,164,174,140,147,206,206,95,230,162,251,183,179,45,79,108,165,153,138,151,173,235,106,113,219,162,254,61,217,208,225,27,157,239,130,195,22,0,67,189,148,214,221,67,176,70,191,241,201,95,103,242,83,119,75,83,83,14,75,205,185,115,211,63,187,47,109,127,136,184,57,184,215,78,105,239,224,30,220,83,83,114,188,89,215,114,155,95,240,134,151,67,201,187,249,246,219,75,245,187,59,107,30,161,102,140,157,117,233,36,123,27,164,195,188,118,187,209,2,176,24,51,84,58,158,54,95,165,46,17,117,6,84,247,104,212,223,220,182,12,200,236,241,142,57,109,26,142,165,233,119,227,172,248,151,221,240,75,181,39,99,212,76,187,173,246,70,17,28,143,61,146,253,248,197,191,95,10,66,59,51,45,56,86,183,119,1,77,112,159,124,229,23,53,191,173,155,214,243,27,125,125,34,92,51,219,83,223,116,226,205,40,165,125,196,199,137,90,225,6,198,49,139,241,97,220,183,161,233,111,144,55,111,112,65,5,103,56,6,16,73,250,180,86,185,110,71,29,
+2,214,161,243,173,187,17,228,130,224,90,102,190,4,206,165,53,233,188,204,18,254,221,56,57,94,212,174,29,193,116,81,49,36,187,11,214,178,234,26,165,172,228,252,75,179,226,100,130,76,100,190,191,22,73,107,134,88,21,132,21,22,13,199,118,253,251,215,223,243,74,79,101,159,103,130,59,235,103,251,144,218,221,232,31,217,223,115,187,215,117,171,106,245,137,232,105,83,153,163,15,63,38,22,167,189,211,91,159,29,175,81,171,222,45,174,80,215,147,249,210,116,236,90,201,166,224,49,81,11,30,233,133,181,138,119,204,171,215,197,196,150,246,223,47,238,206,162,114,143,183,47,208,27,156,177,119,183,225,246,107,195,111,28,230,80,229,90,211,105,172,146,25,131,253,125,123,106,101,93,45,142,226,247,197,161,44,136,140,136,124,73,112,66,200,27,233,202,69,153,39,220,245,105,243,221,181,158,95,110,165,123,15,176,14,83,158,230,165,113,149,167,47,249,131,107,67,248,94,238,111,80,206,250,130,227,223,147,165,108,254,192,245,182,79,59,142,207,81,253,57,128,193,100,171,127,
+21,240,201,196,41,85,168,9,197,41,176,229,246,211,11,180,91,188,28,77,88,246,91,102,147,157,158,8,40,127,108,95,250,95,81,88,27,250,109,25,82,230,111,63,54,240,222,50,84,186,182,243,166,166,70,234,117,211,211,163,253,81,77,105,167,15,99,118,135,108,108,183,1,52,67,127,139,69,210,130,155,225,88,191,99,202,51,156,251,88,175,234,88,183,97,178,147,245,234,27,199,4,2,19,59,56,30,221,178,128,103,94,165,88,147,234,11,229,238,111,178,30,21,85,56,78,161,21,144,251,60,221,99,58,79,213,55,194,117,212,66,54,253,155,97,72,112,173,198,81,246,11,129,187,110,197,149,119,36,142,123,197,211,228,62,238,114,148,184,232,93,174,113,211,207,223,218,252,115,254,131,30,67,236,175,230,238,139,221,179,135,122,229,247,99,195,127,177,60,54,41,144,86,174,35,38,225,166,162,113,157,89,121,42,184,191,154,52,193,23,60,198,142,9,16,249,132,250,247,110,140,81,81,157,243,241,176,2,124,65,63,9,231,196,203,147,153,245,26,206,84,245,96,254,60,78,
+97,219,107,250,114,72,148,5,151,38,39,125,173,246,57,169,115,164,201,45,109,31,156,148,231,145,174,83,248,149,77,175,57,152,167,206,197,73,250,188,59,77,82,63,198,11,234,81,245,77,86,126,254,97,122,209,15,185,151,69,32,43,240,255,44,176,151,88,169,231,79,94,108,205,4,109,247,152,145,35,113,90,147,199,191,206,141,52,191,123,179,106,61,206,229,9,178,121,105,30,197,167,197,217,29,104,63,86,175,119,144,120,4,190,33,129,208,124,108,4,195,33,253,224,183,223,229,139,123,221,207,69,218,46,235,208,190,126,55,47,61,143,211,144,251,32,222,99,134,235,231,189,171,121,48,157,235,133,237,91,20,142,255,8,131,199,93,190,65,6,243,28,30,53,248,156,82,69,211,178,183,30,180,45,126,24,187,110,55,212,203,82,153,154,252,203,180,52,220,181,13,76,175,198,88,237,127,48,18,37,68,184,241,161,50,156,237,83,181,133,49,171,78,115,210,230,189,205,72,202,189,234,135,209,57,138,212,1,122,186,121,58,232,37,17,93,239,74,203,189,185,227,215,227,165,238,
+21,162,175,192,183,197,231,66,207,149,39,142,88,237,179,106,36,149,156,183,184,107,208,72,213,253,79,145,8,92,66,168,7,73,92,37,222,52,214,65,42,246,179,70,90,164,76,205,152,115,171,58,107,109,3,229,235,92,174,189,34,242,83,17,67,61,16,164,70,2,99,49,118,192,114,31,193,37,73,185,104,93,199,170,108,167,198,64,253,50,17,254,117,176,92,97,165,145,242,133,86,236,91,151,86,20,160,115,67,3,202,95,162,53,48,124,65,190,82,162,3,46,220,177,158,39,138,152,84,174,250,101,27,102,217,182,249,155,223,166,42,174,39,251,253,207,119,58,45,249,134,138,224,243,103,127,219,57,152,200,245,240,128,139,148,138,147,53,150,171,195,144,174,228,235,91,250,244,28,248,242,29,195,41,123,248,213,218,229,158,189,191,246,149,202,251,216,165,164,196,238,17,234,38,115,163,18,210,58,24,47,194,194,25,87,56,78,18,175,160,2,21,106,157,195,27,42,10,36,251,225,105,27,82,80,179,211,80,137,253,96,116,254,253,181,178,191,31,218,159,213,216,222,221,65,101,
+237,154,219,252,176,17,12,216,77,19,27,228,135,248,179,137,177,163,115,191,93,90,199,25,213,122,64,4,176,203,29,46,130,69,159,102,222,80,169,26,176,34,216,243,191,8,67,69,195,12,3,88,250,191,159,127,27,219,0,241,95,71,253,165,101,238,60,27,96,154,231,131,65,228,237,61,248,119,78,192,249,66,7,96,32,70,1,240,1,135,150,84,177,131,244,219,74,208,54,56,254,189,235,170,165,70,72,228,173,149,253,239,27,217,183,26,45,241,87,104,246,33,94,95,3,203,150,65,192,185,223,237,186,85,22,129,201,173,114,204,215,203,191,113,222,43,122,142,72,83,163,94,232,12,199,234,16,242,199,174,83,175,127,243,233,99,101,74,170,16,92,24,100,62,239,131,129,35,141,232,186,143,100,178,75,90,190,8,47,157,89,116,165,215,86,113,20,61,53,77,175,58,43,71,58,104,85,137,176,51,158,143,122,69,129,119,129,180,178,218,7,142,103,57,232,136,120,150,58,41,151,58,152,128,225,9,28,87,140,91,29,212,180,238,252,82,87,149,98,138,222,209,29,6,160,83,
+100,138,35,13,155,113,190,89,174,120,38,180,169,207,203,125,50,219,220,87,84,204,247,213,116,54,243,94,178,253,59,242,117,228,142,213,154,211,251,79,76,194,136,138,89,6,223,122,119,209,199,162,181,125,191,144,87,87,46,159,244,2,48,190,195,172,41,24,233,201,95,139,202,212,8,219,213,248,28,255,26,63,232,252,112,104,36,147,216,141,67,147,130,190,115,187,117,168,246,170,142,35,213,38,69,38,241,114,106,79,120,145,120,201,34,207,15,186,56,187,94,213,166,99,141,33,196,215,113,170,143,198,119,164,89,95,100,197,67,57,20,92,217,62,41,126,21,77,167,197,21,167,118,233,168,123,76,78,243,215,130,209,202,129,149,151,96,194,123,183,199,254,155,186,123,177,186,12,184,205,93,195,16,114,224,36,203,75,155,98,142,221,34,234,248,139,53,224,107,142,59,57,24,179,46,169,117,14,75,207,44,60,57,205,205,245,186,19,55,205,9,223,155,56,112,231,38,57,227,53,18,239,150,19,97,65,57,151,242,84,100,60,27,10,133,51,69,63,195,84,124,161,16,9,225,211,
+253,114,178,107,101,45,49,146,152,205,136,130,7,101,249,117,204,29,133,57,82,24,56,185,36,225,133,1,9,56,73,235,2,5,230,171,174,107,138,103,206,19,222,142,122,124,101,224,46,156,151,194,20,90,121,121,240,214,165,60,244,46,95,189,69,26,108,125,2,66,120,44,218,184,94,240,114,85,140,77,43,13,138,88,65,20,194,20,119,8,102,5,215,175,97,136,70,209,193,109,135,207,168,118,57,172,202,135,169,35,234,170,127,6,200,106,35,186,76,143,191,233,67,229,136,180,97,68,135,225,184,66,114,117,69,191,123,220,149,77,136,33,166,155,214,105,49,240,175,126,39,239,217,235,226,115,54,117,177,180,163,159,31,22,163,58,208,133,129,213,91,231,240,33,98,103,217,251,163,171,241,111,18,23,193,143,226,61,122,126,165,4,195,183,212,113,136,34,174,206,202,128,250,54,141,39,86,181,43,164,6,223,161,105,168,18,15,254,179,228,183,61,96,93,240,232,35,253,198,101,44,71,4,24,173,209,125,175,74,121,11,209,143,119,206,36,252,148,8,223,115,228,195,94,229,206,
+175,14,184,118,153,59,98,61,96,246,180,173,190,137,111,207,38,50,98,98,121,36,231,20,71,75,132,95,155,78,78,97,191,121,123,149,87,201,30,57,76,228,121,162,208,85,38,242,219,109,145,197,99,105,104,46,157,223,199,121,187,130,218,165,199,142,42,12,20,192,117,221,233,133,193,118,48,50,62,141,61,54,199,30,59,198,202,249,63,149,190,38,122,178,88,3,187,31,99,34,18,15,249,219,167,242,63,4,2,45,111,95,3,203,53,182,17,187,19,56,69,210,56,63,225,9,108,166,95,35,215,64,87,148,18,3,32,158,146,143,87,196,5,252,41,203,208,94,120,30,151,210,37,211,70,0,140,211,89,25,138,6,95,6,117,218,115,198,164,141,37,92,113,40,180,57,61,234,18,228,87,220,181,213,117,178,207,192,250,233,124,137,222,160,152,38,67,29,228,95,199,11,33,12,254,155,153,222,179,95,48,155,90,110,249,209,143,87,44,173,57,106,208,244,152,148,231,194,237,50,218,50,77,187,126,181,121,27,170,31,188,124,170,242,136,136,11,131,122,150,242,108,211,184,17,71,
+0,195,144,246,165,43,232,207,38,216,137,196,147,94,1,133,108,25,106,188,214,224,82,30,64,191,183,36,32,87,97,73,54,183,166,102,153,228,137,107,10,144,239,70,226,199,80,250,252,89,191,221,187,74,140,131,248,125,143,15,50,194,7,206,249,227,40,255,238,28,20,79,210,186,164,16,134,246,142,164,102,60,34,211,72,65,69,118,232,150,90,126,237,211,57,210,125,138,224,7,229,50,239,176,204,247,26,175,37,122,176,253,113,233,206,146,246,186,205,243,13,64,148,200,23,163,107,90,79,21,80,98,110,255,161,167,78,161,113,107,161,69,10,234,87,110,106,211,140,97,86,25,158,23,113,189,179,153,168,121,226,23,58,16,71,52,214,139,7,35,10,203,222,133,53,87,88,17,234,127,122,157,155,45,254,150,110,54,102,146,207,245,199,240,180,162,153,25,247,117,27,105,22,84,162,78,113,215,157,139,75,153,155,248,253,140,241,219,150,253,78,236,30,72,238,214,137,8,118,130,231,49,119,105,44,22,129,121,253,22,105,140,84,149,161,172,117,54,157,13,215,174,49,72,145,157,
+241,61,166,52,34,138,187,51,177,75,120,110,216,84,88,171,200,45,106,255,52,126,121,42,146,200,145,223,127,76,177,206,105,85,222,144,137,119,184,0,71,17,96,105,42,137,74,144,72,55,12,172,134,23,33,55,213,67,209,25,243,34,237,245,241,166,200,155,102,67,175,187,57,74,128,203,111,165,163,91,64,118,61,101,216,177,136,198,150,77,21,250,72,209,143,111,9,117,162,201,41,88,234,113,253,123,164,156,147,114,159,168,150,123,117,170,62,208,98,40,230,212,182,186,67,113,207,103,121,137,168,112,157,232,123,129,0,87,240,199,14,34,19,246,148,131,201,209,213,26,220,111,181,188,14,185,252,48,158,38,3,77,66,60,102,166,136,194,232,239,111,254,144,27,132,227,215,174,108,129,26,87,96,203,215,35,2,139,33,63,72,33,209,1,253,84,34,89,63,197,102,8,249,129,96,169,233,85,35,72,157,216,88,218,32,9,191,248,21,246,93,125,183,175,15,254,3,95,98,87,151,211,254,207,3,7,223,230,234,171,143,17,104,182,153,31,152,222,152,233,43,195,68,84,112,140,
+157,195,234,73,241,186,241,41,137,212,121,113,88,16,225,248,235,5,45,37,219,181,62,56,11,75,19,110,40,126,121,248,93,208,35,46,120,206,245,89,70,70,111,247,143,251,233,219,117,79,218,225,48,208,65,237,18,101,133,157,35,252,117,110,164,156,60,1,78,110,219,175,93,213,168,191,78,144,237,85,249,123,99,176,122,33,189,188,214,3,174,12,25,77,188,121,58,147,207,114,254,220,56,127,27,109,53,230,175,110,149,209,26,166,180,203,182,101,174,235,251,5,152,97,222,191,161,148,190,166,62,176,191,146,159,65,156,214,52,173,36,58,221,134,153,45,55,30,102,93,48,98,154,243,69,77,134,133,8,86,165,13,131,32,5,114,119,198,174,15,64,16,0,244,169,207,57,239,43,0,197,228,214,100,3,168,205,32,172,201,75,214,83,37,233,12,152,43,12,203,164,91,127,122,187,163,238,132,192,243,23,83,137,52,152,98,255,185,103,184,120,24,71,28,9,16,33,16,38,36,17,128,225,224,58,232,26,42,130,65,32,239,134,28,177,221,133,98,174,191,163,87,224,123,118,255,
+189,148,64,182,227,18,11,16,207,11,4,242,134,15,195,43,149,150,8,164,67,116,112,63,211,2,70,31,96,180,246,23,207,239,111,53,64,1,78,82,86,203,89,38,43,179,88,20,94,25,247,159,230,70,230,112,44,173,95,80,62,159,239,149,68,34,197,8,148,93,64,86,211,17,176,216,56,222,25,10,124,170,33,144,194,150,138,18,105,174,125,96,203,152,184,154,188,48,47,164,91,31,94,107,185,82,250,82,120,126,221,68,7,64,77,226,51,6,71,169,40,168,52,161,220,196,175,208,109,76,123,8,254,29,10,217,178,19,98,13,218,56,83,148,224,22,67,148,76,46,188,130,69,152,69,211,243,114,16,105,82,217,59,136,180,20,189,48,254,48,176,54,33,119,1,200,230,146,116,77,27,99,63,93,27,67,245,120,200,132,66,161,70,174,232,13,104,213,119,239,72,72,6,226,66,87,97,86,4,62,216,55,105,106,17,111,191,57,192,135,117,38,175,198,234,10,143,42,213,248,12,88,65,34,21,154,145,60,168,38,62,49,13,186,73,104,227,214,209,241,175,232,230,166,225,30,
+37,176,23,107,52,14,147,30,75,193,8,213,50,151,90,131,85,150,136,124,154,134,96,113,8,196,197,45,132,1,41,185,235,63,15,215,104,78,69,2,24,81,232,126,94,45,178,79,57,236,84,31,10,100,199,159,48,24,90,134,107,215,122,92,115,156,244,133,9,123,133,208,7,34,142,173,171,10,30,204,70,242,252,163,52,174,3,7,33,239,6,207,142,177,172,198,164,117,214,165,216,103,182,183,253,148,3,92,98,215,58,38,71,72,108,242,207,14,168,38,199,27,20,209,192,110,198,251,185,181,52,151,72,89,232,138,237,194,58,0,71,208,128,211,24,68,128,33,134,88,60,164,209,68,161,204,183,165,2,168,217,203,90,60,222,98,179,229,242,54,230,146,228,148,203,90,250,163,213,122,91,185,162,82,7,45,111,132,64,62,213,249,229,22,43,54,199,240,97,160,155,97,19,133,37,220,148,22,111,48,47,66,150,136,69,19,182,63,99,5,62,73,224,107,228,174,225,8,47,151,233,35,109,33,24,245,67,250,182,95,232,149,142,93,225,250,37,41,233,148,11,233,73,248,218,100,
+126,56,67,161,144,66,50,174,232,192,249,124,130,243,145,136,194,111,87,106,105,189,179,12,173,39,239,235,56,132,83,206,85,232,250,75,168,228,76,143,252,121,137,91,4,27,83,42,4,197,14,21,142,148,67,238,174,222,5,129,24,82,50,74,186,195,174,183,114,135,44,50,234,26,36,19,46,96,252,121,164,86,186,163,145,130,245,177,36,25,76,144,247,216,11,9,32,99,194,0,129,40,4,192,218,36,191,144,200,48,76,173,247,26,6,32,54,8,68,242,22,140,190,200,24,167,140,83,4,59,71,95,254,201,158,230,85,174,9,129,79,67,220,16,141,1,43,56,173,72,239,17,223,223,95,3,138,163,69,83,205,18,74,2,7,3,31,133,200,47,0,7,28,139,28,42,69,226,49,159,60,254,220,28,102,184,66,126,194,194,164,14,162,127,127,196,223,148,252,243,251,148,44,4,240,141,96,118,32,128,11,101,138,92,227,150,253,103,205,218,50,58,197,98,241,237,70,186,105,142,138,64,186,86,177,231,116,12,90,204,129,54,195,131,129,33,131,163,29,251,220,159,91,207,47,146,
+254,37,77,212,191,188,72,194,236,186,36,98,171,99,21,79,205,40,87,120,180,215,152,11,154,25,144,11,145,74,26,105,56,124,79,9,137,127,72,126,56,16,191,141,253,110,103,131,103,131,155,245,207,230,100,227,171,210,61,121,216,14,110,103,8,25,190,163,174,57,130,117,70,17,202,69,195,121,104,9,16,191,98,50,1,27,10,25,91,201,150,32,59,143,239,0,117,72,173,23,162,71,180,96,248,116,236,128,149,253,86,139,210,13,121,228,250,61,76,222,121,248,188,149,104,76,11,4,115,240,163,170,157,160,36,251,136,3,2,65,173,83,181,194,41,189,71,227,115,8,145,109,61,218,84,57,203,220,94,9,31,46,85,202,155,30,158,100,218,245,122,62,168,207,71,102,170,49,112,150,208,18,30,172,107,243,203,44,67,28,86,109,191,89,45,4,242,131,211,6,213,63,58,84,212,116,46,82,34,43,219,6,92,115,247,214,4,24,251,163,220,123,56,163,160,86,152,68,48,84,229,96,52,128,153,227,183,149,180,219,70,148,150,68,206,206,192,76,153,114,59,153,190,93,101,210,
+212,166,141,199,97,156,115,238,248,222,76,87,67,31,55,185,124,203,186,37,236,0,75,228,50,213,140,4,7,246,249,134,51,90,93,153,107,137,221,190,197,1,168,175,104,129,66,70,132,172,50,92,145,198,238,187,110,170,119,224,232,214,194,204,33,28,31,229,152,81,209,87,212,72,9,56,107,108,89,49,16,132,176,85,46,58,166,125,115,32,137,191,100,163,8,4,8,113,44,33,29,152,138,200,22,165,181,145,58,62,122,223,168,246,25,58,225,227,56,80,38,100,148,98,1,252,34,74,243,48,171,196,239,58,40,145,171,105,52,56,46,248,122,187,137,98,186,136,108,65,171,66,33,150,3,20,49,100,247,236,81,179,26,93,251,116,146,123,243,39,17,107,208,68,76,70,23,170,201,69,180,48,73,116,8,48,8,231,207,146,247,43,111,244,84,109,65,114,180,66,240,89,185,52,146,200,179,99,8,125,81,99,59,206,32,93,98,58,2,146,25,1,210,121,91,188,43,254,136,3,66,83,113,1,64,50,57,63,155,96,152,171,145,90,56,79,8,22,228,249,131,0,131,237,51,83,
+170,144,4,181,241,186,30,163,245,85,144,206,159,151,75,67,111,239,66,44,62,105,49,67,250,200,168,195,70,85,104,213,198,19,187,90,215,149,26,88,87,125,30,134,65,20,164,242,63,135,137,65,28,75,255,232,161,123,129,138,203,212,161,10,207,133,82,181,15,129,208,179,214,101,237,85,108,78,138,96,26,176,108,162,145,248,214,65,217,13,122,200,52,253,59,19,131,189,72,236,4,217,207,93,164,158,127,70,105,15,35,143,205,238,180,148,28,58,31,219,7,4,254,232,242,75,209,137,189,247,25,183,201,171,93,246,245,27,211,50,86,4,196,167,194,201,95,135,184,122,115,133,129,124,199,82,76,227,40,39,127,26,20,144,86,186,134,180,161,15,215,66,234,125,189,204,52,85,142,31,112,17,145,96,250,45,249,53,204,205,206,98,31,90,189,175,160,94,109,226,58,160,109,154,63,168,225,183,184,11,178,129,64,70,242,35,185,172,89,10,73,132,111,134,208,139,80,5,181,36,7,28,98,19,190,254,131,239,171,225,9,118,144,10,40,32,23,48,78,16,82,235,41,111,74,192,
+144,55,130,69,104,9,192,40,211,185,60,168,144,27,42,255,220,242,249,35,243,35,10,250,28,178,10,114,232,70,253,255,225,137,151,39,79,164,189,242,127,36,14,251,191,243,132,249,186,172,185,163,71,46,125,157,38,251,64,38,141,172,194,135,171,79,207,223,140,116,121,29,35,146,111,214,251,200,57,90,238,210,186,15,198,118,69,105,139,106,223,214,32,77,139,74,192,228,180,93,233,46,113,33,234,121,59,157,183,188,137,158,123,211,120,239,97,118,217,102,46,234,173,250,151,247,228,103,101,203,142,79,229,121,111,188,246,249,179,173,199,4,144,140,226,13,20,81,80,67,225,37,56,120,39,189,108,8,86,161,198,69,60,17,84,66,107,183,212,211,124,91,229,65,128,12,181,123,137,70,68,91,77,150,42,112,170,45,201,92,191,231,235,193,24,147,175,254,218,239,33,243,60,24,147,53,103,81,226,189,177,97,224,221,125,96,221,212,144,183,245,208,24,169,84,105,121,77,37,234,223,187,26,3,58,254,31,77,121,219,121,89,144,251,81,220,191,27,91,112,19,153,84,136,149,42,
+69,127,240,131,237,177,32,210,3,67,46,211,69,143,171,221,8,224,147,138,230,27,39,4,210,56,203,104,128,186,87,209,41,27,44,156,9,92,35,162,87,26,12,38,79,133,0,130,205,21,133,149,74,65,225,173,32,91,136,134,180,159,189,36,44,205,41,123,84,116,7,79,145,50,105,62,43,9,200,110,166,95,100,177,6,119,119,252,74,64,191,32,195,165,173,179,248,2,87,110,56,153,180,213,153,67,3,183,34,107,82,4,131,110,60,170,226,37,217,160,194,133,53,208,231,176,152,76,64,82,28,51,197,71,226,196,236,69,17,249,248,246,55,221,173,250,122,194,112,231,16,133,79,156,111,130,243,8,121,235,63,161,166,154,104,180,79,168,57,4,231,47,24,140,190,233,240,74,106,100,204,103,68,144,79,209,194,55,63,243,142,151,34,144,200,174,92,215,61,70,11,29,163,194,96,58,253,195,27,196,200,123,133,140,204,184,108,218,234,48,185,53,207,220,230,235,21,96,176,119,243,234,20,189,31,249,54,120,44,19,214,92,1,224,101,18,90,55,183,9,246,116,169,21,11,183,
+221,161,234,72,208,206,62,250,134,181,38,21,134,83,197,214,59,59,100,23,163,121,51,90,125,171,29,215,153,30,213,194,68,75,76,229,97,30,132,40,3,183,182,185,234,40,135,147,241,163,55,185,200,161,140,19,209,82,39,5,123,245,199,152,144,229,251,71,96,205,39,94,229,171,8,136,0,40,113,71,122,129,205,142,173,10,11,20,217,255,129,131,192,20,65,2,95,86,127,131,63,171,155,68,200,106,201,66,12,31,189,55,194,159,126,114,14,59,146,108,116,112,103,83,48,146,176,64,121,98,229,249,105,144,62,79,244,22,4,43,187,7,111,203,175,159,132,87,221,26,10,249,231,46,115,68,205,63,119,9,1,226,79,55,74,253,47,60,232,130,175,75,46,232,70,71,126,2,96,120,94,185,167,43,195,10,150,88,71,14,149,129,87,31,145,195,172,74,229,103,40,154,163,77,123,52,96,164,143,223,107,36,81,146,32,153,196,240,14,53,46,193,98,177,126,73,233,129,28,230,221,33,23,6,237,162,147,239,58,92,31,30,222,231,113,123,104,74,172,39,219,232,209,138,91,60,
+30,28,68,167,145,100,97,187,171,235,152,178,71,74,6,33,73,100,114,124,144,172,236,89,173,25,123,35,192,62,155,103,188,192,181,3,64,83,91,42,28,232,101,3,15,165,1,126,49,13,91,61,92,238,214,233,52,32,39,87,243,89,104,81,100,68,156,66,206,44,208,191,48,45,123,234,228,5,52,250,249,219,242,146,129,49,147,191,219,159,248,83,66,17,59,96,248,50,91,223,197,10,20,145,142,61,67,148,64,37,133,103,228,104,65,233,69,28,76,140,51,20,159,166,183,118,114,245,243,181,28,164,232,93,165,207,102,234,220,162,141,10,125,53,177,73,177,56,85,216,239,114,131,198,251,113,190,2,136,217,220,24,138,188,223,219,111,111,85,35,218,96,40,174,201,91,160,0,169,35,180,65,246,174,139,88,149,115,35,215,26,237,104,12,240,131,154,196,103,194,49,86,211,115,88,36,199,136,133,99,20,241,167,138,239,102,43,65,161,253,253,12,149,64,137,224,38,18,194,75,64,79,47,39,5,220,181,83,115,38,125,242,196,240,160,123,205,246,174,101,253,137,172,148,76,90,
+173,194,240,254,118,169,170,174,12,218,103,166,189,61,149,206,157,90,178,96,227,153,61,12,241,233,106,252,86,18,175,111,97,250,43,233,76,118,67,32,102,23,10,116,183,228,238,248,159,187,37,163,27,0,41,63,15,178,164,134,67,52,24,164,68,13,216,185,9,207,2,226,101,20,81,242,118,123,199,209,40,152,72,134,227,48,168,246,232,149,13,148,83,178,135,100,167,199,57,189,186,33,62,205,80,110,86,135,101,62,13,50,191,113,130,96,193,43,95,123,63,100,146,85,140,180,212,80,228,47,132,87,143,211,161,88,176,94,0,232,91,114,116,172,185,100,26,191,129,169,231,123,162,90,150,152,197,56,140,89,182,109,41,209,81,196,227,163,178,112,158,175,82,208,0,233,210,42,252,114,62,74,125,109,58,162,38,146,87,24,34,89,96,145,4,195,45,140,17,181,141,245,236,99,84,102,187,24,23,237,63,97,0,44,167,149,167,167,169,53,184,223,138,90,185,28,203,105,123,190,49,130,5,16,231,16,23,22,244,205,160,198,118,227,67,0,32,190,8,76,14,50,217,166,186,130,
+172,241,190,228,226,125,198,6,147,157,30,42,71,94,135,67,145,142,197,247,60,58,13,193,176,160,208,68,254,181,237,142,50,97,93,10,254,18,244,68,18,64,67,3,18,82,171,72,34,250,104,48,114,242,85,156,144,85,219,144,247,147,108,124,212,5,72,223,149,190,209,78,194,4,243,212,246,158,21,194,246,182,53,137,132,139,98,154,215,195,208,208,163,136,188,192,26,246,63,65,125,103,247,79,111,187,244,24,57,251,228,241,241,36,114,162,208,157,4,143,105,192,236,193,232,84,84,242,57,127,168,137,36,26,28,228,141,41,239,203,212,52,228,215,230,196,39,9,3,47,35,78,30,58,234,144,209,123,226,205,212,5,19,169,156,95,222,227,37,74,224,3,229,213,119,89,59,0,69,178,121,52,211,131,71,4,230,185,158,200,49,84,139,40,16,72,184,213,150,245,255,17,193,39,7,166,65,237,79,41,206,52,12,140,150,196,102,27,90,127,133,88,16,162,41,236,73,10,160,226,97,159,54,27,84,188,151,63,155,13,225,252,217,108,6,229,207,102,191,116,255,108,182,60,240,103,
+179,33,245,63,249,124,7,254,35,159,239,127,242,73,122,255,147,79,178,240,79,62,67,40,80,62,9,126,57,236,13,2,25,192,195,149,10,234,79,62,127,225,255,145,207,247,63,249,212,46,55,89,59,220,141,69,67,136,223,119,201,143,91,86,214,253,48,185,213,110,181,177,251,232,155,214,192,1,120,251,49,33,212,9,139,18,34,246,219,236,10,111,250,194,99,172,104,95,35,153,131,238,134,67,32,178,86,130,218,246,10,222,27,162,47,163,117,26,135,41,56,120,147,83,194,225,194,11,36,114,57,83,175,118,169,47,123,27,255,87,253,198,196,70,49,181,252,164,203,23,133,73,226,86,99,172,192,67,32,108,112,29,207,70,25,47,226,130,72,150,162,176,255,10,16,83,6,170,208,6,239,148,132,152,232,110,67,209,181,228,87,194,40,14,20,251,107,210,233,202,100,23,52,106,44,157,239,120,43,211,205,175,34,117,231,240,177,196,155,64,229,65,195,95,114,44,2,150,144,140,191,106,202,183,162,116,90,236,34,43,120,40,68,130,209,6,241,236,29,226,110,254,144,16,176,254,
+50,118,97,142,57,204,58,50,107,189,107,118,78,51,252,249,27,86,121,95,111,149,162,86,130,24,74,246,227,90,69,114,36,70,183,73,37,246,185,252,64,29,250,118,147,165,165,174,35,69,48,188,240,163,167,168,227,51,97,128,91,108,213,21,182,172,253,195,8,5,121,220,194,46,208,159,32,6,49,60,91,147,233,32,114,242,152,39,136,65,79,172,122,154,98,208,19,83,41,80,229,75,14,117,133,37,163,198,10,246,235,53,69,21,238,161,194,15,233,153,188,16,229,108,100,163,154,181,46,253,162,210,232,93,86,45,13,81,122,144,17,56,172,36,25,202,199,141,237,91,175,168,227,100,254,245,121,70,209,66,228,44,211,242,118,38,42,40,187,209,5,42,81,138,192,226,183,140,20,138,242,21,245,227,12,21,71,2,136,37,235,90,129,102,130,85,242,86,180,232,241,193,173,226,167,111,100,220,69,97,164,13,32,198,166,238,48,232,104,161,237,184,243,159,157,21,236,210,200,236,151,124,62,230,48,13,182,132,136,106,248,73,197,150,60,41,96,23,1,202,130,42,88,205,116,92,
+176,231,13,242,41,160,237,230,178,234,116,216,134,226,84,88,120,131,8,195,25,142,99,34,113,146,79,75,5,99,236,27,229,25,99,135,17,165,133,44,241,24,139,123,198,177,190,26,42,143,105,13,238,200,208,30,245,159,149,1,199,74,148,175,168,245,204,109,254,89,220,211,220,33,140,76,8,74,156,182,35,83,2,36,5,156,38,185,122,103,167,217,226,189,9,106,65,102,76,4,132,196,20,69,248,41,243,163,68,99,225,188,67,115,110,142,24,29,228,77,218,194,182,255,1,170,55,168,195,182,14,205,251,217,127,62,35,192,40,245,69,60,130,194,251,182,251,95,252,168,216,248,63,27,76,48,225,18,120,226,160,162,37,255,119,204,18,32,159,63,92,225,167,183,4,159,14,29,89,2,24,242,127,206,185,255,6,3,199,242,60,7,3,199,98,250,122,117,88,203,41,4,223,146,185,19,219,93,14,168,198,160,117,30,199,166,40,37,120,13,246,17,9,10,122,201,169,16,115,94,234,209,8,160,129,249,201,90,30,165,60,43,92,83,198,74,15,169,58,83,78,87,190,160,214,64,
+73,96,228,174,179,198,177,234,3,221,166,252,238,160,31,86,153,227,74,115,144,240,60,95,88,72,198,48,67,137,52,195,215,138,187,164,180,33,112,40,98,196,146,181,33,183,20,241,155,42,216,97,171,46,201,9,225,147,180,127,179,232,181,184,216,164,34,149,6,17,88,36,114,172,173,204,101,99,37,176,234,41,90,78,248,28,4,124,92,21,76,96,199,49,163,238,77,41,2,178,4,129,72,98,254,137,252,5,212,249,234,86,147,96,42,171,236,239,78,226,223,234,80,228,125,228,119,171,41,6,123,99,171,171,166,139,165,85,229,225,203,141,212,209,198,104,109,40,230,76,123,237,105,63,120,62,117,45,49,88,34,251,80,250,71,64,129,62,128,168,55,70,82,21,113,35,243,144,162,172,176,171,112,227,255,226,154,191,28,241,222,7,227,128,233,91,221,163,62,169,243,72,102,165,64,205,210,229,137,201,165,66,48,30,38,103,56,56,161,245,109,80,155,129,118,118,221,73,108,157,247,228,250,165,249,193,200,189,76,184,104,162,11,18,214,252,196,20,162,112,39,181,212,21,56,82,
+39,34,245,241,15,97,134,132,74,20,78,24,155,9,175,249,4,255,136,192,156,241,241,161,141,205,33,192,152,92,109,243,132,193,232,83,44,65,173,76,179,0,89,93,36,201,36,223,62,63,164,193,23,200,8,41,165,146,222,22,169,254,198,29,233,100,37,59,125,144,15,34,141,236,85,120,134,97,189,6,250,102,0,139,240,43,183,220,78,176,215,146,179,240,27,73,247,254,201,225,88,253,148,195,49,11,8,158,84,59,145,100,186,149,243,137,131,72,124,186,109,98,87,151,224,70,22,253,20,98,186,115,124,36,219,134,0,237,162,152,32,50,61,107,140,45,57,253,146,68,177,162,14,227,100,18,133,255,58,68,210,217,75,104,3,70,197,41,107,87,99,126,112,94,186,163,123,238,228,66,216,5,232,135,7,182,19,5,74,247,36,69,179,110,8,195,125,23,130,163,138,56,122,145,184,52,71,250,65,8,115,194,39,130,199,47,108,254,100,217,219,127,215,63,191,122,162,204,150,249,82,31,16,197,96,208,225,181,63,185,60,16,114,180,97,132,211,80,230,217,4,215,53,163,150,72,
+223,50,178,82,92,59,122,100,61,52,59,9,237,143,161,219,43,162,58,120,44,188,28,27,179,221,185,198,84,53,203,105,55,230,254,14,163,254,209,46,73,6,98,239,9,189,51,136,189,39,244,112,32,246,158,208,251,0,177,39,154,133,106,168,136,106,189,100,212,33,189,119,115,235,9,61,98,228,9,0,136,253,161,201,156,207,231,163,62,16,48,253,67,158,161,253,215,247,20,66,254,245,73,169,232,240,191,70,231,27,228,233,99,37,112,146,231,207,230,146,130,255,177,185,208,63,155,27,204,252,217,220,43,229,207,230,138,32,127,54,183,77,255,179,185,80,201,159,205,173,36,254,108,238,50,240,103,115,1,228,159,205,45,255,179,185,38,185,236,253,105,115,249,225,10,246,207,230,238,29,207,48,8,102,193,187,91,102,164,12,156,104,183,206,99,5,232,40,84,95,44,87,203,217,138,108,71,224,242,89,44,212,228,162,127,68,77,112,133,208,208,210,22,246,234,91,184,2,2,57,146,20,193,115,202,7,241,114,58,147,10,148,8,100,185,253,77,252,205,238,68,139,36,58,33,212,
+90,23,144,76,14,7,154,89,42,185,39,21,15,60,108,27,230,211,23,126,40,221,136,52,65,97,86,48,18,17,0,204,131,237,18,92,66,19,158,219,209,16,76,34,10,238,5,80,191,171,78,234,228,223,136,115,158,136,46,201,211,191,210,187,97,37,28,87,174,11,38,109,183,92,46,107,99,201,72,86,173,55,34,228,46,234,136,231,170,207,201,147,221,242,236,179,29,207,87,186,106,179,130,12,221,88,31,13,146,217,73,43,34,77,118,49,242,159,244,225,160,207,228,108,6,255,185,86,83,31,65,124,243,236,145,90,74,70,56,113,101,96,138,220,60,136,82,25,157,66,201,20,118,164,63,27,147,70,46,6,69,54,210,250,81,136,159,38,133,170,145,86,33,32,12,133,115,235,11,76,103,223,46,196,10,199,80,34,82,104,113,147,177,70,94,130,73,118,144,87,57,3,52,25,105,149,230,31,234,188,102,211,9,149,0,165,102,140,127,162,46,47,10,19,19,118,113,176,215,38,10,249,87,82,53,41,37,211,188,116,76,132,180,87,108,209,7,89,87,141,213,30,123,34,82,103,
+33,205,144,45,111,48,200,72,201,246,131,102,171,249,91,54,198,164,76,143,117,99,233,114,69,222,60,61,229,250,166,82,133,194,58,210,145,250,253,114,137,96,10,70,82,10,15,66,229,129,81,209,218,248,165,34,199,104,98,191,46,156,81,133,31,85,145,238,12,86,146,103,100,107,192,70,89,107,178,3,211,133,1,2,152,101,249,57,46,190,77,34,174,142,234,184,142,65,177,175,191,123,64,154,10,124,118,21,219,79,159,128,32,130,166,40,93,38,42,251,179,108,232,94,95,95,215,91,44,202,200,255,140,65,32,63,166,112,104,131,195,127,234,228,24,39,170,70,101,227,197,230,36,183,35,17,139,126,65,219,248,97,94,135,226,183,70,216,81,232,40,68,238,152,44,168,162,161,147,177,219,155,75,24,246,5,141,52,178,135,17,210,115,215,3,230,50,90,232,199,155,93,175,230,125,186,99,73,118,93,85,39,212,141,176,116,231,20,4,210,129,36,84,65,216,71,91,90,104,166,99,141,170,155,14,149,136,36,91,23,76,180,145,228,195,0,101,76,0,70,156,81,186,185,133,190,
+64,188,8,126,137,142,249,0,189,90,41,2,0,1,41,142,160,126,133,108,249,236,191,32,247,242,79,187,226,104,226,95,124,36,26,254,185,187,23,240,237,79,119,55,4,58,196,95,212,83,199,240,45,3,223,132,39,9,153,224,211,166,160,225,78,25,196,160,255,39,29,124,89,254,107,236,28,137,41,176,104,45,130,176,180,242,215,88,185,6,127,127,66,7,148,242,57,78,78,180,35,105,109,19,93,15,124,173,98,70,20,186,121,247,35,90,174,225,117,203,179,207,2,62,201,251,144,146,75,113,127,163,34,175,104,214,131,77,1,117,245,165,211,212,221,2,11,230,34,126,62,61,111,29,135,155,49,4,71,128,150,214,87,116,196,33,96,122,184,176,80,102,252,192,132,121,71,29,140,13,225,165,95,73,37,129,83,85,209,9,234,148,96,187,13,178,69,176,179,101,231,170,56,81,164,171,10,202,129,182,244,55,110,185,100,216,101,106,183,95,216,115,102,161,235,10,197,120,159,149,152,81,43,240,115,253,24,125,89,51,176,87,88,70,8,217,122,18,38,177,230,206,26,159,1,44,
+6,12,233,17,82,199,144,127,155,243,58,78,162,158,195,213,79,105,165,96,107,255,120,60,20,145,195,29,84,133,228,128,156,107,183,72,132,70,151,209,227,32,27,155,6,111,2,28,164,210,81,197,8,203,109,115,91,103,13,31,193,90,69,148,109,29,49,193,91,191,60,26,210,165,84,90,69,43,90,12,130,6,119,189,120,117,233,126,9,255,134,203,202,164,124,52,93,48,16,219,169,143,158,100,85,84,12,79,150,176,97,176,98,104,197,226,195,46,191,67,93,191,43,239,200,57,36,147,0,33,187,122,28,48,43,147,230,209,75,29,30,215,52,119,73,10,18,188,154,224,212,137,199,69,218,167,77,70,65,253,140,171,128,52,66,47,79,36,157,158,78,155,227,230,180,174,107,231,231,226,155,156,194,134,97,86,233,202,12,39,183,121,162,194,160,93,139,144,132,104,225,222,225,76,39,97,88,250,71,91,34,170,20,50,3,116,19,10,189,136,66,143,55,179,95,96,18,0,48,186,190,175,169,124,39,54,58,22,149,175,102,36,222,130,104,72,156,168,12,87,156,180,153,142,27,1,
+119,90,115,142,193,96,50,92,59,240,60,52,33,125,153,137,136,55,158,8,121,244,50,123,238,48,176,46,145,126,177,180,15,184,106,104,84,81,189,247,174,142,47,86,9,207,242,102,140,194,180,171,181,2,215,55,235,206,210,84,122,172,128,83,84,245,154,64,179,210,249,76,107,188,197,27,18,50,162,82,201,95,214,99,184,210,57,180,53,160,119,34,142,34,164,231,201,202,101,83,144,72,131,193,31,24,15,243,5,115,200,187,211,233,130,197,199,40,25,73,46,158,36,154,230,132,162,78,152,46,240,136,67,81,232,198,4,6,152,45,37,253,87,254,219,196,191,83,22,113,182,178,253,100,222,78,17,201,99,55,102,6,2,129,119,216,182,171,18,9,143,49,172,74,147,214,46,89,167,186,43,214,72,58,146,26,27,144,221,204,56,189,40,117,182,67,208,87,134,111,184,114,201,150,119,142,185,44,98,88,157,186,61,76,66,122,3,65,17,13,57,128,34,132,188,117,19,22,97,153,232,210,7,140,82,192,140,254,215,136,109,197,29,20,221,176,135,236,167,79,217,231,145,12,35,211,
+71,126,193,10,170,53,141,36,243,190,213,152,10,118,244,65,36,137,165,60,75,177,54,16,110,115,206,90,95,117,135,37,237,110,49,250,154,74,244,215,228,192,172,233,60,235,148,59,52,113,101,35,102,234,219,17,39,80,225,39,81,70,33,193,200,236,84,224,42,187,236,133,152,37,71,55,149,204,182,184,186,22,165,148,44,184,27,48,64,198,106,186,188,37,152,39,189,43,168,82,36,33,54,44,206,236,169,117,186,41,239,158,46,33,35,223,18,237,200,60,1,90,169,195,174,251,134,192,107,220,238,187,26,224,84,87,145,99,138,94,12,69,124,35,140,216,239,117,43,242,5,246,206,248,215,161,173,247,94,49,68,191,224,238,144,178,254,125,142,225,163,95,64,81,211,85,231,219,51,24,64,182,142,255,172,175,129,9,180,121,235,239,203,195,18,61,191,15,44,52,218,27,240,247,252,127,250,72,128,142,68,142,7,233,0,209,248,71,51,173,9,72,51,100,104,26,47,243,174,106,230,137,205,231,169,158,238,78,185,125,214,172,47,131,54,28,165,122,181,167,125,203,207,66,207,109,
+206,231,211,126,71,119,117,73,234,83,190,107,238,182,85,235,61,219,95,53,70,111,56,7,226,0,232,183,183,154,255,47,126,155,253,108,162,77,125,143,160,149,79,249,215,71,131,253,17,97,64,75,22,10,36,164,245,163,78,71,19,163,124,38,128,6,121,238,244,195,136,182,221,131,15,60,227,100,36,102,159,29,174,240,96,18,11,23,57,148,208,57,39,207,41,97,194,118,142,53,253,48,202,136,90,186,144,3,60,121,138,147,104,96,175,5,189,7,117,193,64,136,46,92,216,87,233,179,122,248,201,144,97,230,77,176,224,130,131,147,234,60,41,233,250,59,113,132,209,68,67,215,70,174,231,120,228,15,134,2,175,241,190,133,32,123,200,152,108,9,254,150,245,22,29,193,0,206,171,245,253,23,92,163,66,48,184,114,170,239,1,157,255,71,90,138,195,101,31,82,145,166,37,215,156,253,225,228,8,145,251,25,108,60,239,115,166,214,136,81,107,54,114,117,123,94,36,113,104,106,33,204,123,232,215,157,245,134,215,111,117,93,181,231,99,70,248,1,129,80,141,145,202,41,131,214,
+52,17,56,41,205,47,184,206,5,15,214,171,78,183,22,50,34,128,54,23,99,136,214,121,143,201,36,44,188,244,201,162,22,150,245,182,69,136,130,142,238,87,167,253,84,116,63,52,153,236,146,177,164,242,57,224,184,56,107,3,169,189,150,200,192,38,68,83,106,217,194,120,215,37,40,64,132,188,39,19,82,74,240,99,252,132,44,130,113,202,184,69,18,203,118,140,237,202,64,233,164,143,216,112,24,242,114,250,54,4,245,50,201,43,206,107,176,225,3,108,216,176,119,154,186,221,54,18,153,221,94,133,244,84,252,151,144,252,42,130,65,136,162,46,106,192,190,138,52,96,213,210,159,201,72,4,0,40,142,87,46,209,42,72,228,143,142,112,75,212,9,207,75,224,211,89,35,202,18,161,62,86,122,147,132,227,96,30,22,65,95,137,111,182,216,43,233,229,8,154,133,231,198,127,70,254,14,88,195,32,246,183,159,21,76,255,18,168,109,177,77,230,250,3,30,49,126,144,228,157,110,207,237,82,4,186,35,38,72,32,233,24,172,157,253,82,118,182,240,7,212,9,14,2,142,241,
+156,71,48,95,155,26,207,192,83,17,178,5,18,57,21,30,178,78,129,246,166,97,201,102,229,48,203,246,212,166,8,69,254,57,50,59,123,139,114,20,249,239,66,252,129,35,49,14,84,244,163,149,243,214,52,169,151,17,130,216,80,242,96,136,166,58,200,102,70,157,186,126,180,224,132,228,11,152,231,5,32,202,132,120,90,241,75,249,218,161,227,240,161,91,74,65,57,165,9,177,235,182,239,76,47,5,58,247,68,145,248,200,194,33,150,22,217,131,183,128,214,183,140,212,96,136,239,108,77,72,175,95,140,70,241,111,36,12,73,131,66,126,96,255,111,93,255,59,93,9,3,83,200,31,32,62,95,254,14,90,177,231,191,131,86,164,230,239,160,117,15,249,59,64,201,173,158,237,165,8,236,221,131,39,253,63,241,209,250,107,3,189,100,254,218,64,37,88,4,248,7,160,246,12,249,175,227,252,64,78,255,143,184,145,253,225,70,188,244,231,203,30,73,221,188,11,189,156,2,115,62,181,152,236,175,226,251,193,187,185,155,132,64,148,153,119,41,172,200,79,204,221,181,218,225,11,
+6,7,29,251,127,125,222,224,248,86,36,22,232,234,141,112,186,124,211,142,25,133,42,82,98,74,189,34,157,189,87,208,86,140,97,69,161,190,85,23,128,154,31,20,152,20,193,41,58,92,215,134,176,147,161,205,67,128,240,184,131,240,3,230,88,144,39,159,253,205,137,211,197,7,189,35,105,18,37,37,235,181,156,48,166,153,91,145,221,104,155,237,199,26,75,254,36,212,27,253,122,78,125,149,206,32,14,136,178,131,49,172,105,136,138,111,196,74,170,252,152,83,221,255,48,35,107,137,94,72,143,33,86,241,30,93,164,39,219,145,136,188,20,21,19,51,74,152,89,20,240,171,174,178,139,85,140,81,162,23,84,149,166,2,236,110,152,235,44,84,59,53,224,130,81,60,184,74,80,239,161,137,96,104,176,166,255,119,186,9,253,211,77,12,42,236,21,174,135,33,37,89,140,1,185,153,153,188,124,132,222,64,167,249,129,215,217,6,84,139,146,101,161,199,183,31,227,140,228,221,249,236,232,227,40,182,145,46,32,15,186,48,181,33,233,223,193,165,156,104,200,94,130,57,242,82,
+120,30,78,85,239,76,23,171,64,16,142,110,26,59,35,9,58,225,15,166,46,121,6,136,29,35,243,45,252,250,22,152,225,17,163,127,40,3,12,230,127,234,72,5,114,79,117,28,111,177,87,177,89,144,206,87,3,253,64,160,251,196,73,239,3,204,150,57,159,152,245,10,22,32,104,211,161,231,45,182,95,2,141,172,209,21,28,19,69,160,253,34,170,158,16,193,131,24,121,66,164,11,98,228,9,17,92,135,117,122,66,164,7,98,4,132,72,54,1,1,51,172,59,18,129,63,126,225,146,183,172,176,253,176,70,245,9,54,84,25,73,16,235,196,224,175,18,246,135,143,215,104,137,171,38,58,243,239,255,224,17,39,157,36,36,155,70,0,161,119,54,181,75,159,1,222,234,191,122,115,54,45,239,239,107,49,113,222,124,193,173,192,84,249,126,230,181,86,111,207,91,129,61,83,37,175,212,127,191,221,110,161,80,232,67,34,243,104,176,16,34,250,63,58,244,14,253,179,193,34,224,15,46,255,124,238,179,97,106,249,179,193,255,93,159,144,127,54,24,242,249,103,131,7,168,63,
+27,252,178,252,179,193,198,255,205,121,227,211,6,167,226,127,54,248,191,159,47,190,179,47,29,21,248,42,231,96,92,135,205,216,106,230,73,22,142,107,46,110,165,88,4,58,21,254,4,19,171,240,237,243,107,212,170,19,231,43,156,123,197,80,143,205,218,22,199,12,200,84,223,100,53,29,210,159,221,84,66,63,108,253,195,83,220,152,179,216,115,136,124,145,209,225,115,68,179,205,75,187,236,174,24,193,150,24,73,167,109,143,206,114,210,118,153,28,77,100,170,107,13,28,0,236,81,47,151,237,214,113,218,11,241,207,23,24,247,114,230,210,117,66,132,234,8,138,211,29,91,173,87,18,80,114,246,109,132,223,253,72,255,130,70,213,10,149,74,63,163,83,202,111,191,223,172,221,226,224,0,178,217,166,173,164,25,31,208,0,99,223,110,103,21,212,187,130,151,30,134,126,214,228,253,154,108,48,90,40,101,71,196,167,129,29,35,234,6,130,84,46,34,55,122,106,227,39,247,29,190,229,224,128,119,137,84,147,237,165,26,4,16,134,43,122,231,39,169,252,104,202,184,171,71,249,
+103,44,138,168,97,176,217,42,90,218,189,199,115,36,242,101,140,187,124,165,185,184,177,5,65,74,218,247,78,222,110,161,25,102,97,21,42,80,21,35,65,159,71,158,77,186,106,97,65,5,223,37,49,3,19,164,5,111,30,173,106,174,245,91,209,91,59,156,119,242,37,30,7,56,4,250,210,167,104,54,39,9,252,190,109,209,27,135,73,19,114,205,197,108,62,214,34,127,176,52,147,54,114,109,29,122,69,57,117,209,191,116,225,26,90,25,45,112,72,56,242,124,201,142,119,39,221,161,98,60,29,91,190,244,216,106,197,32,115,126,75,15,197,200,92,12,228,117,120,164,76,135,221,68,45,147,217,146,55,205,209,207,179,244,221,32,46,199,157,22,218,122,16,182,218,74,91,106,23,99,242,90,101,85,70,27,51,206,240,209,41,46,143,255,182,123,36,70,230,247,134,51,41,78,67,174,88,155,72,235,142,112,1,164,87,148,134,139,33,221,207,195,119,173,239,200,237,29,149,56,67,8,46,128,236,99,7,104,131,236,52,37,48,83,169,154,251,96,30,227,76,90,80,181,222,229,
+75,221,148,210,184,49,43,110,45,173,31,181,134,210,65,87,24,248,80,95,121,105,87,20,94,137,182,159,158,216,108,190,192,119,49,249,248,70,207,205,40,217,237,100,51,225,12,152,96,27,187,233,72,196,228,87,84,0,193,232,41,13,84,50,169,0,123,165,245,78,253,80,14,185,131,247,13,95,119,210,229,67,44,228,246,148,37,159,185,148,156,236,174,107,198,81,79,71,159,137,57,2,133,134,38,123,7,204,143,31,136,8,50,96,169,49,6,180,155,122,147,117,184,9,82,144,73,87,34,106,17,56,87,211,29,33,13,86,73,144,248,101,164,197,80,54,190,12,147,238,7,239,83,133,32,19,60,20,163,7,83,1,93,189,71,210,198,44,247,234,16,192,87,118,255,60,67,215,217,74,151,66,133,139,118,164,168,161,58,254,96,183,196,34,115,18,49,80,58,189,138,194,41,119,24,51,36,201,34,241,169,166,252,222,4,103,153,240,83,243,191,155,92,87,228,11,55,123,75,115,119,194,239,120,76,206,73,175,136,123,95,191,72,129,216,126,87,66,137,180,210,172,196,204,138,116,
+140,68,68,41,23,118,101,20,64,7,235,98,230,51,186,95,227,140,109,68,133,129,108,55,90,209,179,30,44,196,79,1,78,212,106,34,213,18,134,112,13,53,233,137,85,251,165,47,124,179,73,127,35,84,185,237,138,194,198,120,161,139,54,125,70,117,70,196,161,3,25,200,158,82,121,61,214,247,186,14,160,206,173,223,61,198,223,220,134,121,51,164,120,61,136,252,55,90,222,235,183,185,117,79,15,251,87,62,248,194,176,129,96,0,59,112,130,216,8,96,199,1,18,195,23,185,72,114,17,4,1,188,231,156,61,51,27,217,115,246,193,222,251,216,240,29,59,23,123,239,98,89,108,98,111,18,59,69,81,236,85,172,34,41,86,177,147,98,19,155,216,197,144,210,241,25,143,199,73,174,124,241,1,226,199,197,181,222,247,93,239,251,60,207,175,98,3,65,90,21,53,93,166,101,128,177,121,120,15,213,5,29,77,182,189,196,7,198,81,241,104,117,112,13,170,5,169,240,42,100,245,203,181,159,17,236,62,113,182,137,108,2,217,108,214,248,97,17,16,215,120,187,169,123,227,2,
+94,187,107,184,65,158,110,67,41,87,125,77,246,108,162,212,233,15,111,46,252,220,172,43,188,63,213,185,229,230,168,91,64,244,157,25,61,44,135,197,185,194,186,238,226,125,21,127,92,36,107,135,34,69,108,21,191,44,74,171,252,154,146,174,130,15,66,92,171,17,242,153,224,135,23,14,199,146,111,218,131,190,133,51,80,159,186,39,5,251,61,117,188,228,81,246,126,235,35,143,28,4,141,131,56,156,210,116,157,53,0,149,120,103,136,115,147,232,253,21,103,161,12,196,177,67,168,91,70,53,3,65,149,215,54,80,62,180,228,50,128,50,48,95,89,27,70,166,200,178,242,136,165,196,164,37,76,98,196,238,24,55,101,227,134,223,26,133,251,178,98,2,103,79,10,82,46,6,253,58,186,177,42,77,222,224,36,222,222,109,234,118,131,23,171,200,93,59,25,121,9,49,153,28,133,98,119,93,89,210,107,161,54,169,65,200,117,211,79,122,87,10,18,6,84,181,170,245,150,150,75,70,56,141,144,124,110,131,140,227,118,186,148,1,51,22,243,229,78,237,189,66,151,33,111,192,
+224,69,159,228,150,95,22,25,147,202,235,229,144,201,22,201,125,165,134,77,188,98,198,198,140,82,30,110,115,213,183,102,176,80,26,13,169,3,132,193,33,43,228,244,209,199,240,96,123,226,101,125,253,90,78,41,146,175,252,47,64,198,10,70,140,55,253,167,140,13,125,101,149,151,174,90,232,133,221,23,115,179,22,196,89,76,145,66,209,223,251,207,150,183,54,3,254,186,220,201,73,248,240,90,228,195,242,240,5,38,118,130,202,47,37,22,65,224,69,182,11,58,23,35,97,28,178,62,175,242,225,30,239,34,29,129,7,114,9,156,176,189,186,9,83,198,46,59,33,119,218,247,250,182,126,21,103,226,42,98,41,51,80,75,241,169,90,110,1,103,8,14,229,123,253,245,40,131,226,101,171,140,23,199,97,232,100,77,84,144,210,195,123,0,104,185,216,146,151,124,120,201,120,34,122,102,92,184,153,36,154,218,78,210,103,62,186,194,181,188,232,56,154,189,4,255,153,77,151,89,219,210,133,160,227,44,241,56,169,116,251,232,224,6,233,235,212,91,24,112,189,236,154,18,28,209,
+202,247,192,170,48,221,27,210,31,22,105,200,224,159,8,232,204,40,176,175,240,31,4,245,21,254,171,104,63,217,236,21,51,250,100,51,131,0,250,201,102,16,200,205,39,155,133,160,255,169,125,132,248,186,89,88,244,21,254,35,65,62,217,12,128,100,62,217,172,248,226,255,10,247,149,72,23,167,206,249,194,236,197,169,99,25,234,22,109,14,25,188,153,140,37,120,44,249,249,3,241,113,182,147,54,23,189,183,188,239,59,56,209,206,252,213,51,230,188,204,205,77,226,115,63,225,73,250,76,128,27,81,140,204,88,6,86,38,110,204,134,50,91,102,134,54,243,100,28,15,219,224,177,188,134,40,141,228,249,179,139,224,198,9,194,45,228,14,138,18,107,208,243,234,237,209,215,187,131,105,228,1,49,203,252,110,28,207,239,59,119,79,44,198,34,7,185,72,196,219,177,53,32,111,151,252,4,46,203,50,92,184,181,109,23,179,53,159,239,66,194,12,179,149,93,200,157,49,166,142,152,166,13,158,70,154,151,113,78,140,76,197,19,49,44,68,0,42,81,64,250,62,75,6,29,193,
+8,233,178,57,211,166,230,107,251,194,60,124,160,140,14,63,139,19,69,140,165,229,54,21,20,13,12,121,219,120,54,150,14,35,133,118,195,76,246,56,29,254,246,206,94,209,197,175,153,84,218,137,222,87,195,16,180,35,197,21,89,214,99,186,140,210,175,163,202,122,143,236,58,215,236,179,127,208,130,74,218,254,72,120,3,200,29,123,37,234,75,63,204,230,47,46,45,4,215,121,155,91,131,241,131,31,48,242,118,214,200,106,209,200,129,48,35,177,244,12,79,43,153,177,44,27,147,24,74,146,48,124,70,163,25,16,106,124,40,137,152,208,92,163,249,239,48,19,242,60,78,247,227,44,72,141,202,2,246,142,171,205,191,228,197,34,86,21,229,213,211,182,102,141,19,24,106,179,61,57,105,46,62,51,247,192,126,198,63,41,161,16,108,79,138,103,126,233,140,177,74,244,202,27,70,200,4,27,47,50,198,138,202,212,143,241,0,244,233,4,201,34,86,103,86,120,38,166,153,21,146,140,47,193,237,132,25,123,229,170,24,19,218,110,213,173,232,203,97,55,220,187,98,102,123,108,
+208,159,114,202,27,47,118,6,133,214,180,196,2,55,208,91,245,148,161,154,249,35,31,154,37,176,99,41,177,71,236,91,54,157,65,196,184,106,35,10,211,107,183,32,170,174,206,50,55,112,186,132,133,27,138,219,79,183,185,102,156,89,220,221,52,181,100,80,228,139,60,94,156,192,121,180,211,250,158,149,2,51,123,198,173,228,85,10,141,224,220,35,242,46,185,52,16,52,68,90,108,235,96,59,79,100,163,71,205,221,178,3,23,161,189,45,114,193,180,228,24,229,13,188,129,40,138,178,147,148,102,108,144,238,158,173,99,198,85,212,195,16,168,153,118,7,14,104,64,31,245,26,58,94,40,227,163,229,172,244,110,175,16,242,67,224,32,108,104,177,188,247,134,119,54,74,205,66,114,141,204,27,152,110,116,54,116,76,161,109,134,39,168,112,140,245,68,83,147,105,47,227,139,27,86,165,171,235,78,212,166,45,246,188,31,16,239,40,126,243,61,163,246,3,164,164,225,13,1,144,18,140,126,135,30,183,154,102,193,219,2,27,72,187,201,56,112,64,123,18,80,196,111,235,184,144,
+68,233,160,241,174,200,195,194,20,28,13,208,93,77,87,145,101,167,128,180,105,139,234,4,146,30,8,155,101,100,194,17,0,180,10,61,159,215,255,16,215,9,140,97,62,133,23,22,235,46,241,87,89,21,3,150,225,210,137,195,133,4,206,130,195,207,74,59,19,209,100,40,153,226,18,111,52,110,28,176,217,232,58,135,158,220,27,189,229,18,5,0,177,46,9,40,111,142,54,25,84,136,153,19,203,222,125,55,71,8,245,67,109,174,10,165,232,197,54,151,15,205,93,56,19,234,165,165,70,81,96,14,184,81,186,32,184,155,245,124,215,36,185,237,57,228,80,228,29,53,194,107,221,103,51,82,137,88,122,133,65,78,110,230,190,80,140,171,120,86,100,185,142,131,1,251,78,134,82,149,88,76,57,26,98,156,94,84,131,204,43,213,94,33,50,112,164,55,0,147,176,202,169,7,203,91,133,253,186,71,88,71,34,111,251,195,70,172,218,45,122,201,41,228,223,168,166,42,246,142,12,7,11,115,183,37,223,158,12,189,215,225,98,209,46,9,50,119,185,143,8,224,124,124,238,148,
+243,203,125,108,5,105,6,41,94,180,90,232,115,166,237,144,37,157,224,10,20,91,129,236,93,193,245,254,153,126,140,173,180,244,221,96,244,184,235,112,196,23,123,120,134,198,67,116,248,70,117,11,164,130,187,94,248,225,125,26,241,211,108,93,86,78,87,205,49,40,186,161,88,135,40,246,221,158,252,17,17,106,75,67,68,90,27,197,7,200,69,145,247,79,113,36,220,249,227,127,201,56,82,232,203,205,104,179,1,51,0,95,146,183,69,201,56,18,2,73,185,66,90,156,161,186,144,161,199,184,67,88,1,80,58,31,161,190,19,161,219,66,239,172,37,179,123,43,203,76,149,247,247,66,117,188,119,189,56,132,151,146,206,252,240,236,186,231,99,49,119,239,138,70,49,6,101,13,11,157,185,171,63,125,89,198,128,105,84,70,245,39,153,163,53,171,145,0,44,165,9,192,101,240,38,166,201,35,140,136,28,202,11,67,16,4,31,233,36,51,243,122,26,25,156,94,59,200,228,13,177,115,128,66,140,31,183,228,6,3,247,118,35,30,142,47,158,20,74,255,141,210,148,156,205,151,
+102,124,111,45,160,245,244,114,168,228,147,218,153,208,242,59,203,12,104,193,156,222,222,131,235,185,190,123,47,156,53,233,228,183,199,42,199,72,199,247,26,243,219,3,135,137,235,35,57,148,112,184,116,75,121,175,137,10,190,213,34,3,217,204,239,121,195,27,19,139,188,71,222,65,32,247,17,183,68,243,113,28,255,141,255,28,242,233,63,167,131,214,104,17,32,11,177,76,229,147,68,68,234,210,19,76,156,11,107,238,22,165,82,246,144,134,246,216,84,224,99,163,227,181,207,13,19,220,145,121,125,32,230,214,7,167,192,106,132,52,172,79,67,127,211,45,198,208,153,170,243,6,68,194,79,79,158,29,122,17,104,104,251,234,102,90,119,213,37,17,30,206,130,95,113,31,209,176,4,38,145,49,207,143,8,0,45,141,116,182,170,170,148,144,142,150,15,144,30,140,139,131,75,31,80,19,251,100,8,55,104,99,54,224,49,70,190,72,205,184,95,149,250,42,132,123,54,251,208,56,178,93,120,27,225,40,1,114,153,68,116,74,37,173,134,150,73,196,66,137,121,252,28,219,0,9,
+10,105,40,185,38,198,232,122,11,86,105,65,99,47,126,204,221,193,22,191,121,127,209,66,49,210,59,63,76,108,158,86,59,158,100,39,70,17,111,165,41,138,233,86,68,237,107,166,182,212,34,75,191,241,133,196,201,135,112,86,115,19,229,99,209,149,21,81,245,152,35,133,35,60,6,159,54,220,2,100,72,59,35,101,0,234,235,42,13,121,3,156,135,146,100,96,200,208,28,169,210,27,156,85,178,206,146,74,193,73,176,54,132,4,75,153,186,198,34,94,162,80,221,120,29,46,155,231,97,217,51,88,92,206,158,233,202,240,98,244,220,111,225,187,39,76,115,84,22,199,95,139,25,17,65,11,220,198,122,82,131,252,174,24,7,24,3,169,245,252,88,149,253,99,182,78,118,175,138,79,73,223,197,240,199,68,186,92,88,182,99,79,145,116,183,68,239,51,66,183,158,131,190,0,64,16,69,236,123,239,242,138,114,3,187,218,154,154,47,15,116,107,86,34,168,96,198,240,168,60,212,239,48,113,42,194,85,243,214,86,205,210,17,184,215,44,65,204,84,243,192,10,219,121,188,233,
+180,148,158,106,211,111,235,29,140,232,119,72,95,91,46,193,39,14,66,214,104,41,76,158,175,46,51,133,144,33,25,4,197,194,252,170,119,177,243,85,125,170,47,217,104,243,154,217,14,134,40,224,138,58,197,87,30,221,80,99,39,163,20,86,163,168,169,227,21,212,156,60,231,247,213,174,156,91,102,206,227,44,19,178,108,167,189,37,43,157,181,234,21,145,194,103,55,100,34,41,49,85,193,153,176,228,83,123,182,143,120,170,189,12,47,75,64,63,98,86,46,63,0,121,85,82,251,58,112,233,108,194,202,209,46,221,22,126,64,19,89,224,156,108,180,140,184,20,225,100,209,36,84,84,48,101,37,120,47,44,4,163,140,178,36,144,179,49,173,33,236,61,250,1,187,119,217,252,220,19,67,172,70,177,54,218,128,124,76,84,69,141,231,205,9,138,235,100,106,16,99,34,95,4,103,41,193,102,105,86,136,54,185,204,92,69,164,183,170,189,232,206,242,24,77,159,196,195,165,139,140,94,84,4,232,20,0,21,5,168,193,226,147,225,227,49,247,56,155,202,24,213,47,135,128,183,
+13,171,190,5,233,140,45,63,133,125,99,85,85,144,12,140,4,39,32,137,186,203,11,8,235,31,60,226,168,0,10,209,66,224,36,53,92,196,248,59,121,154,176,79,20,187,128,216,5,197,44,204,228,39,138,129,57,195,39,138,61,188,64,62,81,12,2,89,126,162,88,156,132,248,68,49,4,196,243,137,98,45,40,242,19,197,32,16,229,39,138,189,136,77,23,20,115,116,237,192,89,28,146,65,114,195,210,250,74,68,81,42,7,164,250,181,28,86,60,107,66,92,62,80,92,235,236,84,235,84,172,19,204,144,240,139,212,163,127,108,116,151,0,222,123,156,120,136,87,221,238,188,123,230,121,187,219,19,11,2,122,172,179,221,118,153,141,241,243,243,14,190,143,102,161,42,210,209,82,96,191,145,241,215,105,133,160,8,67,121,72,41,15,34,252,164,155,89,112,213,194,135,191,150,183,43,120,127,242,247,33,82,76,83,178,216,171,222,222,7,94,38,129,12,36,32,158,91,93,225,24,34,237,183,32,32,125,34,53,30,44,30,185,40,138,248,250,101,42,158,136,113,226,152,255,171,
+192,40,78,236,54,63,30,111,186,51,244,251,249,203,64,73,245,118,134,11,225,157,142,52,44,138,44,221,171,105,247,9,49,121,171,234,115,61,6,158,94,72,131,135,80,222,230,12,59,253,225,251,60,133,178,223,237,194,153,189,70,67,71,0,141,132,31,126,60,146,252,177,97,21,107,138,45,236,230,114,26,76,55,193,190,18,112,238,98,219,100,16,71,200,164,31,231,125,101,89,81,46,67,32,58,31,147,218,32,176,196,173,206,243,245,41,82,239,220,159,178,196,37,197,132,115,134,244,211,84,228,83,135,65,63,117,152,16,3,163,44,76,15,227,231,109,48,112,169,203,169,205,74,249,103,238,14,67,70,55,218,41,11,39,86,146,27,90,121,60,158,140,189,232,147,8,157,98,202,47,203,33,18,61,156,239,107,83,69,244,91,109,29,96,135,18,42,100,7,203,18,149,193,132,225,1,1,233,165,86,82,106,163,115,155,118,190,49,35,213,128,209,100,183,236,28,156,26,5,6,130,23,229,196,81,134,226,254,44,12,188,123,85,49,162,96,170,63,125,154,22,110,67,138,227,13,
+97,25,79,82,200,45,244,106,217,220,233,136,171,146,177,173,100,7,16,128,105,74,99,68,163,94,232,10,134,234,221,231,53,153,166,249,172,215,174,40,242,102,52,42,57,207,83,158,142,86,224,61,196,138,254,8,19,107,223,210,169,100,177,34,76,45,173,252,100,236,108,123,100,31,220,252,245,75,50,92,18,251,149,76,99,175,185,25,73,101,98,146,31,20,18,196,254,231,128,189,150,70,185,197,8,66,175,217,6,169,207,31,139,55,60,158,151,140,245,7,99,24,196,65,5,200,162,98,73,234,29,57,123,143,57,236,167,159,126,249,233,133,20,68,0,154,110,128,33,7,90,177,62,199,93,175,7,16,21,133,139,157,92,216,80,157,20,3,148,123,55,227,216,249,189,81,238,159,149,123,96,31,244,150,164,120,175,11,222,26,225,32,41,127,71,202,29,2,137,52,244,166,23,8,223,232,230,4,250,250,126,92,52,169,80,103,155,210,227,58,155,148,135,131,14,131,117,200,90,96,140,36,164,120,173,207,60,221,179,201,159,69,52,83,219,138,46,52,120,80,62,60,156,151,163,29,
+63,47,145,235,62,232,130,88,154,87,244,89,133,173,138,69,223,138,33,95,140,25,10,111,207,219,194,184,4,64,148,143,30,132,66,144,213,68,6,224,149,186,15,180,86,107,248,62,168,113,3,68,33,40,152,58,209,194,17,150,44,95,16,235,133,129,137,92,237,160,55,112,136,1,22,130,126,250,225,201,43,74,198,198,95,38,94,38,92,248,45,20,98,187,20,254,193,190,142,41,228,229,235,152,226,188,135,63,10,151,175,99,42,68,56,66,255,217,58,194,22,106,118,115,79,180,133,97,159,85,132,144,136,252,179,138,240,111,242,188,71,159,248,17,118,8,128,1,172,119,73,45,242,116,61,151,43,204,115,208,41,150,26,175,27,159,121,221,130,188,59,80,60,159,112,95,192,118,201,126,15,207,37,139,116,201,56,123,10,246,230,116,92,160,102,36,134,245,189,133,139,60,113,40,138,201,35,73,140,28,244,249,218,162,32,184,48,28,241,81,7,243,249,162,116,120,4,127,49,116,19,121,98,52,19,239,186,27,200,211,5,103,48,67,69,99,162,213,211,124,37,56,47,35,203,96,
+50,210,240,44,51,54,222,98,200,15,222,62,200,220,37,10,8,164,173,96,131,67,32,188,118,228,44,28,180,175,59,54,240,37,28,32,205,79,225,80,105,223,91,7,176,247,227,113,112,204,221,71,72,178,121,235,252,218,5,130,72,135,61,151,230,188,92,136,130,76,199,206,187,178,12,71,193,102,191,12,196,168,20,206,31,93,107,198,222,196,22,145,106,148,112,181,204,74,205,70,164,223,101,8,104,134,54,41,233,149,165,135,244,19,122,9,64,60,46,90,25,193,208,123,196,175,99,151,102,120,191,173,138,63,189,252,109,223,88,237,255,172,192,7,249,58,239,200,238,160,227,40,60,75,94,239,71,22,99,196,52,181,141,77,166,193,55,57,6,34,226,146,203,20,159,66,67,8,34,196,138,135,166,143,2,226,53,215,27,173,70,187,137,213,47,9,49,197,54,129,46,161,83,163,106,114,252,98,147,71,100,94,204,87,88,140,5,255,10,139,13,28,95,97,177,62,166,84,60,201,50,224,54,230,105,73,77,31,169,119,99,102,77,186,93,206,93,141,105,86,195,12,148,110,32,24,
+89,118,128,188,248,217,83,134,75,72,172,43,214,56,47,33,177,224,37,38,134,225,221,53,175,165,91,74,147,71,76,55,56,228,237,27,72,169,1,105,210,163,34,136,191,225,16,229,87,99,20,185,125,126,190,252,252,198,175,206,155,2,188,246,135,217,125,22,91,144,53,30,96,67,197,71,75,21,218,38,103,83,70,74,140,90,38,6,236,71,240,149,159,85,24,27,99,106,224,249,21,125,69,108,96,99,148,232,131,243,60,137,243,61,6,168,200,109,129,204,109,206,187,133,80,241,204,57,161,51,9,188,201,153,201,106,152,36,92,136,19,122,48,167,36,84,63,250,79,209,140,159,149,213,209,19,224,54,79,6,225,21,49,20,129,117,78,226,157,241,156,204,245,3,201,64,170,161,206,44,224,86,57,214,147,255,138,99,184,111,189,168,213,194,59,79,16,247,250,209,249,108,40,201,85,138,87,209,195,1,82,216,103,220,203,131,18,160,185,127,172,223,1,250,84,215,64,131,135,164,32,255,249,60,148,255,146,254,15,196,39,121,115,247,134,79,111,126,119,64,252,244,230,111,229,204,
+79,111,62,65,236,109,91,31,75,78,185,238,190,180,185,50,88,240,252,102,90,153,27,61,49,98,170,206,209,56,114,135,157,81,135,199,23,60,63,222,19,134,83,242,91,185,29,55,86,217,134,13,163,150,75,181,43,20,161,147,94,23,42,93,11,158,215,22,145,63,92,241,189,18,139,79,50,29,192,36,45,150,39,131,241,113,51,2,66,70,45,28,210,101,73,197,22,255,189,230,1,209,151,250,239,222,173,192,32,128,131,43,105,129,75,62,216,203,229,176,220,91,161,94,228,104,211,176,213,88,61,38,43,43,83,49,176,79,46,19,95,183,121,54,214,16,102,70,215,15,179,201,155,23,239,69,8,73,166,203,52,76,1,109,108,106,52,236,16,143,166,117,141,51,4,83,125,151,198,57,148,136,63,238,235,55,155,7,49,235,185,22,109,120,60,36,178,91,2,6,223,160,204,214,83,144,91,109,94,27,183,151,60,103,195,37,207,153,134,19,37,159,30,162,208,155,103,154,196,112,16,165,41,220,60,60,221,169,110,212,56,210,93,148,18,27,96,75,203,212,103,117,17,211,147,190,
+212,169,196,29,202,231,179,248,171,190,190,20,188,31,92,58,104,73,131,185,209,74,97,43,215,48,144,249,151,225,255,240,69,95,33,85,156,157,81,250,87,172,32,22,105,120,239,133,237,162,10,49,177,80,56,0,60,102,88,130,191,83,94,49,136,37,240,36,159,152,228,198,137,34,156,7,200,238,243,36,104,75,20,90,188,150,75,116,61,150,60,125,221,114,60,32,216,234,93,130,165,193,146,83,186,166,175,82,123,173,33,222,224,0,26,143,163,38,41,13,111,214,238,154,249,22,37,147,73,99,196,144,59,34,197,101,63,222,16,61,231,247,121,49,205,149,159,249,34,190,197,149,67,174,72,96,200,7,17,46,116,58,157,250,86,4,159,150,71,101,216,81,36,46,209,180,80,59,33,80,247,254,246,70,206,26,243,16,8,81,60,168,192,165,31,179,201,51,165,105,131,22,63,203,217,101,12,170,53,248,33,15,7,83,129,176,141,166,233,181,67,104,18,235,18,55,166,223,46,183,32,235,218,24,246,36,206,8,251,17,227,172,55,136,180,150,47,205,80,219,103,125,25,22,43,219,
+115,59,147,236,16,93,81,166,129,170,74,156,61,131,48,125,18,103,52,69,232,51,176,27,134,183,75,230,217,170,19,29,90,173,152,165,112,49,153,213,103,155,249,82,177,11,218,147,159,21,187,124,132,81,64,209,161,79,202,243,33,138,235,56,155,15,106,97,68,117,224,28,38,83,166,83,69,44,53,158,75,182,229,11,19,154,1,48,72,177,31,13,136,62,217,3,10,96,48,200,63,50,209,151,96,196,157,217,163,127,69,241,162,238,46,117,238,108,60,50,159,205,131,231,175,223,32,158,60,59,152,60,192,108,127,91,143,254,167,245,236,79,115,112,40,150,90,133,228,75,208,248,6,247,199,184,155,150,166,0,147,200,253,225,26,46,17,178,63,35,199,197,18,235,18,57,22,108,48,20,211,176,246,168,176,156,109,229,144,216,220,18,54,85,132,8,69,184,146,197,98,5,179,207,94,121,97,146,90,73,233,165,147,46,255,5,218,133,64,176,204,180,7,241,36,96,16,39,206,102,98,87,140,207,112,126,29,246,117,86,159,198,40,239,202,94,254,206,70,160,80,11,228,146,78,101,
+125,80,123,111,149,190,10,87,112,55,123,166,144,108,239,104,200,45,81,42,54,249,239,219,151,243,164,187,123,239,178,118,156,85,113,250,21,128,42,149,209,236,66,50,113,123,7,169,42,180,132,24,238,186,139,202,152,22,219,3,84,176,8,6,131,125,245,190,115,126,65,103,155,91,106,40,189,61,214,218,143,246,83,218,3,172,70,126,43,159,46,201,201,212,29,232,221,74,51,71,67,250,77,165,5,24,226,145,193,69,204,228,86,53,79,251,183,59,154,116,78,25,107,165,212,229,242,42,100,158,43,222,210,31,14,174,218,180,207,143,46,97,158,216,163,216,207,148,196,40,118,226,160,67,71,154,9,134,202,229,244,56,25,49,220,192,180,17,33,148,136,184,78,158,195,213,120,122,95,60,86,126,222,164,136,150,26,67,231,161,231,193,139,95,67,43,99,80,76,226,235,50,127,84,74,118,104,98,191,92,69,215,2,68,70,175,172,78,19,97,126,224,177,245,31,229,99,144,251,37,22,8,13,178,103,132,61,29,139,252,248,16,127,200,138,163,177,230,174,23,237,152,82,146,137,10,
+135,215,158,13,69,72,105,30,253,116,144,17,247,182,171,42,247,138,56,8,35,40,77,141,165,106,2,62,203,245,102,123,64,185,162,136,73,125,96,217,214,82,194,8,114,141,11,136,161,4,145,69,79,106,233,162,69,135,31,176,64,68,50,15,194,15,155,83,154,190,36,134,156,90,234,12,212,199,208,27,97,161,12,52,141,154,196,77,38,69,116,129,94,89,128,112,39,4,235,75,188,108,30,149,101,82,240,76,176,172,106,243,9,231,33,24,206,99,136,102,236,40,253,177,89,185,17,251,103,90,3,1,32,163,222,163,35,233,20,127,140,83,240,173,11,13,145,147,97,3,73,168,31,136,197,143,143,131,254,252,226,80,43,247,107,248,173,222,216,76,228,83,179,228,243,12,55,84,246,217,24,196,54,184,201,233,124,43,3,34,21,69,98,54,234,130,108,234,233,143,248,231,237,156,114,101,184,56,67,52,144,24,124,52,58,101,181,243,54,219,8,230,214,200,9,180,214,80,87,174,133,74,42,253,76,75,236,36,0,60,124,134,155,213,17,235,151,251,169,202,250,114,63,33,136,54,
+143,47,122,126,5,100,152,88,202,4,200,66,136,232,203,209,84,60,127,188,28,9,207,231,249,122,64,112,46,234,12,92,248,77,192,234,179,159,147,193,80,76,62,127,105,55,200,115,131,125,175,95,180,32,127,199,222,43,41,188,173,247,175,66,191,55,196,87,161,31,92,131,35,187,174,17,16,24,164,116,169,187,121,11,124,230,141,152,199,36,202,87,1,65,150,123,253,233,159,71,182,191,10,90,123,151,36,102,167,92,22,239,105,21,215,4,194,76,15,175,7,96,38,237,112,126,91,245,169,89,177,230,233,121,30,55,12,102,27,113,102,152,176,176,147,69,189,221,37,118,199,86,252,45,112,255,94,150,163,170,101,6,211,138,130,191,20,79,110,82,241,245,29,194,123,89,222,111,162,227,201,71,218,249,236,188,189,117,177,238,37,213,65,138,171,12,33,95,227,52,198,146,71,112,249,139,157,50,125,199,210,95,103,63,231,243,17,65,90,8,62,32,41,190,214,115,37,76,254,0,52,3,131,244,216,200,26,188,91,108,79,124,176,253,84,147,175,124,175,215,178,81,64,44,229,176,
+171,70,132,216,95,179,50,40,212,137,23,157,163,221,122,95,107,66,198,103,98,148,135,244,149,24,53,206,131,38,195,237,135,75,111,238,32,50,28,107,32,119,184,163,45,118,18,111,173,31,22,235,245,122,64,156,119,243,184,92,42,238,246,173,107,44,182,87,111,166,0,52,85,226,16,45,146,200,83,230,201,37,240,200,244,21,109,191,58,242,122,49,119,83,113,85,197,88,216,6,162,210,59,49,84,124,186,210,98,91,84,245,116,128,241,86,202,101,162,17,233,125,184,162,55,223,135,91,170,142,137,163,179,252,244,28,147,69,119,221,142,218,24,52,3,45,177,12,250,86,189,76,136,117,132,252,188,124,176,154,193,150,145,230,151,91,83,74,68,44,236,56,113,39,54,203,227,41,249,200,179,188,118,160,130,36,198,76,34,118,175,95,220,110,183,214,156,176,14,9,187,157,111,18,190,23,194,158,34,102,92,41,239,159,61,187,26,101,53,255,216,26,213,20,199,157,25,95,155,207,216,198,154,165,211,247,238,178,26,135,48,118,54,76,233,221,110,47,163,254,72,17,37,80,201,149,
+64,69,89,101,180,221,254,153,38,231,158,4,246,192,21,249,16,22,4,48,220,67,216,49,46,254,62,28,188,248,117,104,115,16,29,0,62,160,116,124,66,136,93,51,50,203,129,76,17,106,211,99,111,29,157,40,255,216,1,232,103,118,100,43,114,42,111,148,139,123,43,10,49,97,224,85,221,158,71,136,245,209,129,153,61,228,21,16,216,179,74,193,58,61,38,22,98,87,238,170,240,40,136,70,210,98,200,62,172,70,251,208,1,59,145,239,27,136,108,89,247,235,4,137,79,35,108,115,54,49,197,164,179,108,149,20,254,134,173,201,217,228,217,60,158,104,252,140,0,248,30,0,47,190,167,35,45,28,244,165,212,207,108,1,186,103,103,251,181,220,186,235,152,56,125,134,50,253,86,159,26,230,248,46,25,165,226,190,248,22,27,31,107,6,33,7,189,247,68,181,208,255,193,187,18,164,239,162,10,142,201,121,22,157,126,55,83,103,48,149,238,159,184,50,22,153,53,239,222,5,37,18,142,111,98,22,39,145,138,224,194,214,89,42,155,114,1,224,118,243,205,170,248,181,8,29,
+63,107,239,139,244,182,93,178,72,83,112,113,234,124,187,215,130,231,40,115,112,243,117,123,199,4,153,67,215,196,192,107,134,142,107,190,129,57,119,250,24,196,57,107,103,150,2,151,165,139,254,78,55,174,141,89,1,170,193,57,240,215,184,57,104,124,47,138,142,140,92,46,60,154,18,131,241,160,31,152,53,214,206,33,137,232,212,8,130,248,0,30,170,204,211,16,97,52,67,14,122,235,203,219,188,66,111,245,194,251,86,23,50,65,81,56,248,161,254,2,229,194,197,3,53,108,171,121,229,121,238,210,238,180,206,243,46,109,17,75,237,143,155,59,203,243,158,206,37,33,93,120,81,78,161,211,6,74,144,123,71,203,184,101,251,161,183,101,117,107,25,209,63,81,251,186,135,147,14,145,168,9,225,23,157,156,38,127,37,196,178,90,185,162,14,239,166,40,253,204,108,27,22,205,179,101,33,98,133,200,214,150,175,87,142,149,54,26,145,21,119,237,219,21,106,217,167,172,227,121,170,17,29,9,182,244,210,26,44,235,125,193,205,66,173,30,215,64,1,163,242,211,7,195,218,122,
+181,52,9,103,90,8,61,94,3,100,44,219,69,127,15,208,161,39,163,189,20,244,34,174,134,100,15,197,123,157,235,227,203,80,163,43,175,81,181,228,60,11,133,220,233,143,122,39,68,52,133,198,198,112,1,185,15,32,99,252,69,239,151,127,106,89,56,20,175,82,123,124,255,144,46,70,26,214,102,146,172,137,66,91,220,41,165,200,185,186,202,245,108,94,74,127,66,190,203,218,248,20,223,141,62,135,113,117,7,94,9,24,197,83,156,150,0,84,113,13,4,27,111,135,247,120,26,241,182,137,218,143,110,70,143,233,167,22,119,111,183,229,166,90,121,81,31,187,192,108,146,170,8,64,115,99,152,33,108,5,236,231,251,118,17,177,253,120,24,19,170,121,109,243,17,107,77,46,75,36,123,175,100,123,58,169,165,24,247,91,131,24,96,209,120,193,86,67,105,39,91,162,60,82,116,179,68,52,29,40,85,46,232,149,224,179,25,50,8,243,107,22,4,176,94,136,228,81,38,201,165,30,36,87,70,32,110,88,26,206,214,222,112,235,29,183,41,218,102,199,105,17,207,231,215,211,
+86,217,189,12,182,111,107,212,106,163,184,123,115,11,171,189,164,241,91,106,85,63,65,153,187,29,78,200,219,9,37,42,243,202,162,32,48,1,210,83,79,252,169,148,35,86,214,104,184,68,61,47,45,187,85,195,89,145,86,205,139,130,170,93,20,79,223,142,135,59,198,37,42,200,30,25,13,152,211,124,238,137,56,169,29,188,80,85,237,243,162,145,35,61,70,72,99,103,188,193,198,171,220,215,11,188,166,34,208,72,250,107,108,213,222,247,190,133,176,227,138,53,227,249,29,30,148,88,118,137,62,196,184,30,207,73,207,169,196,192,42,143,10,33,143,85,252,93,33,154,230,84,175,2,38,84,32,242,182,20,249,128,73,220,76,189,13,157,205,45,22,205,30,122,190,43,188,95,28,3,74,29,208,88,246,139,88,180,99,128,95,211,249,27,69,100,58,96,141,124,56,21,191,143,230,16,167,130,188,100,18,78,220,178,148,46,61,83,56,31,39,44,31,166,6,218,2,13,65,57,193,47,71,6,52,227,88,6,176,165,7,228,117,181,8,122,151,14,165,123,15,29,162,67,39,2,
+118,140,103,70,93,212,180,152,180,235,107,111,159,124,145,9,252,194,92,200,47,121,8,137,127,201,195,57,228,171,221,81,166,248,85,246,211,55,156,181,230,69,106,42,46,237,198,178,121,42,138,50,127,48,179,49,208,51,155,78,58,236,251,5,235,139,30,255,20,135,129,254,81,126,122,190,228,167,109,26,190,36,72,30,112,0,19,242,201,140,244,139,220,60,51,163,192,60,110,236,253,57,72,241,108,202,166,29,64,121,99,46,204,207,52,138,79,127,134,173,35,249,6,113,64,105,122,80,194,248,73,151,7,6,85,73,248,225,46,145,207,235,88,19,244,43,139,33,204,11,114,87,181,250,142,70,8,42,110,242,186,114,222,65,154,29,5,178,94,57,103,208,59,51,115,212,222,204,189,54,62,141,161,214,193,199,195,219,40,153,157,66,102,3,96,243,225,25,248,86,170,48,127,96,130,165,68,125,194,153,16,135,188,93,205,122,251,73,136,69,32,130,156,25,57,120,182,0,154,208,143,41,224,78,171,210,190,123,107,168,199,41,228,228,152,71,142,52,242,46,50,160,0,3,64,30,
+92,107,0,163,78,61,200,72,83,224,141,87,150,1,212,39,185,211,237,243,94,26,21,164,17,171,75,178,20,58,236,229,101,54,206,18,147,22,109,246,42,114,173,237,70,191,214,147,66,180,62,35,227,57,223,171,106,223,170,197,97,86,84,86,171,91,142,64,30,150,45,48,98,180,66,190,250,228,0,245,99,158,58,159,89,141,194,215,184,231,206,220,94,75,143,220,186,150,99,238,109,67,173,216,102,213,80,187,18,229,107,133,106,109,244,68,87,50,243,250,97,240,254,129,182,13,29,31,28,199,226,72,53,232,140,216,201,161,121,134,143,242,109,122,146,62,249,62,154,156,166,181,91,131,238,170,73,40,103,39,35,97,107,237,29,31,104,195,37,149,20,194,27,205,202,16,43,47,108,142,143,197,182,185,31,240,222,152,231,15,118,34,113,238,221,40,252,181,209,228,214,145,107,58,24,157,147,151,212,39,63,123,152,141,113,90,120,219,138,180,174,243,241,162,13,119,9,172,29,69,64,90,127,11,14,186,217,134,155,174,214,134,245,20,126,61,26,203,99,223,158,68,49,100,167,153,
+236,15,106,13,203,165,62,9,65,196,80,141,251,112,223,159,42,203,45,10,180,232,29,35,102,248,121,69,228,41,69,108,133,50,78,253,21,7,199,84,178,156,164,150,221,166,133,161,113,24,44,174,9,93,109,3,108,195,23,81,5,135,159,68,53,135,71,7,145,144,119,100,15,77,168,102,31,113,51,54,220,152,58,227,252,46,72,60,222,61,132,141,37,77,89,31,76,188,129,103,19,18,220,120,194,146,198,110,205,232,16,220,152,35,89,234,116,73,234,212,78,28,250,92,13,34,197,66,28,130,37,74,7,202,207,59,0,179,85,22,90,46,199,123,205,207,60,4,134,189,171,185,81,16,2,147,20,135,117,230,89,142,21,79,138,142,27,41,90,73,169,143,141,206,237,197,193,19,56,159,133,7,138,248,158,72,48,227,180,190,185,34,62,171,43,175,36,206,187,232,165,60,202,82,43,119,249,156,185,1,72,142,244,253,241,171,243,70,115,231,139,118,230,169,172,196,232,113,114,111,120,52,48,216,171,79,53,119,182,145,73,116,9,118,163,228,69,11,69,124,5,180,182,243,122,123,
+200,47,100,75,18,167,187,6,72,234,115,122,251,54,32,90,94,73,18,94,222,92,71,223,42,137,3,220,12,194,75,46,111,99,19,108,145,100,127,165,177,246,201,247,246,56,251,58,114,49,231,144,20,232,216,90,232,131,99,31,31,24,180,27,228,244,68,139,215,166,101,34,164,148,59,116,166,238,151,224,186,167,245,57,63,219,151,32,34,136,119,126,211,102,182,112,213,134,164,194,132,212,59,237,144,171,4,35,44,176,240,214,157,91,37,224,45,128,30,172,55,79,181,40,152,72,215,187,247,85,134,48,16,44,236,117,188,90,69,40,56,135,125,1,143,86,151,177,102,185,247,10,102,231,139,188,138,102,198,88,100,100,81,31,161,62,153,135,161,204,117,62,127,20,224,167,64,227,40,116,156,23,141,10,60,167,232,10,122,233,146,27,62,197,163,242,9,85,58,61,215,67,4,189,93,248,223,225,35,96,103,210,64,219,24,82,10,97,226,159,153,71,34,121,151,204,217,24,18,226,45,173,21,61,140,117,210,207,58,102,173,126,167,241,97,43,232,116,146,76,168,251,54,35,182,24,
+104,200,102,139,221,81,149,212,76,1,227,178,209,183,4,154,249,75,250,244,10,27,106,137,108,119,190,161,87,86,224,205,239,12,166,211,93,24,51,63,192,202,188,132,163,236,231,51,38,103,233,46,36,156,110,19,65,63,59,0,216,226,115,238,108,92,220,68,137,132,204,34,8,55,9,248,108,226,24,196,50,40,228,214,109,152,238,15,239,35,183,5,24,121,119,236,141,101,55,136,175,50,146,112,209,182,24,95,81,132,147,214,162,201,4,51,200,153,220,30,36,97,123,243,202,35,254,14,181,42,76,143,233,96,142,42,213,248,218,17,103,72,197,192,170,209,212,75,117,217,189,241,201,121,160,88,20,161,252,157,175,76,140,158,105,199,160,59,211,14,105,216,125,114,70,140,129,90,99,183,71,169,218,15,219,178,177,229,122,161,158,58,109,232,122,39,139,178,147,230,9,129,148,90,38,204,129,39,227,203,68,66,168,43,86,251,254,206,119,101,182,93,21,201,188,236,106,26,22,144,19,112,204,202,109,218,123,162,155,92,240,158,115,215,13,232,18,19,16,167,58,174,130,185,45,220,
+195,49,26,123,37,187,67,226,12,211,130,6,27,135,56,1,244,15,4,229,77,44,3,148,120,249,186,185,125,181,206,212,158,47,6,144,243,81,140,72,251,38,234,126,64,126,51,241,161,107,25,110,185,36,43,191,121,209,199,221,131,220,231,12,1,125,231,156,54,14,188,226,110,2,215,135,253,13,33,46,220,128,123,79,203,243,85,39,237,0,6,81,190,67,60,86,58,198,91,47,145,34,206,206,170,100,92,241,222,246,145,29,113,91,183,185,38,133,124,124,78,249,134,50,229,35,44,129,250,219,60,195,254,35,207,204,56,192,86,85,92,59,13,23,167,97,138,33,186,249,172,247,78,217,77,151,38,9,103,187,236,234,210,36,225,252,138,139,151,38,9,26,3,30,119,105,146,240,255,145,63,76,255,204,142,15,132,81,250,19,238,76,61,93,58,238,203,111,63,251,204,154,242,173,91,159,86,89,70,124,251,105,149,181,223,26,95,109,134,14,219,75,155,33,125,137,29,191,50,190,121,73,185,158,194,252,92,82,157,96,59,247,40,112,62,209,144,206,6,186,67,251,160,37,196,88,
+194,195,204,105,20,93,96,61,74,178,47,252,242,178,252,24,245,124,43,236,39,191,64,28,74,36,74,172,153,43,7,230,193,147,140,118,38,152,0,228,43,160,214,229,224,5,202,51,195,144,41,224,128,65,163,64,197,233,154,113,32,171,106,1,239,104,104,183,192,151,81,160,79,164,6,139,199,224,176,182,162,48,117,243,18,248,217,30,179,34,114,248,235,107,141,70,91,185,147,223,51,22,62,156,0,24,12,135,173,6,186,187,147,221,106,32,75,100,232,181,173,189,216,77,168,205,67,69,84,42,61,138,235,10,93,189,28,126,58,20,88,87,190,88,173,163,56,147,9,167,144,246,6,44,187,179,85,182,82,122,43,112,32,173,162,155,150,149,244,96,183,110,7,72,47,147,225,112,225,122,211,149,117,161,60,65,168,11,115,134,217,29,45,170,238,72,103,238,162,142,80,104,197,25,133,62,35,102,215,70,213,169,193,80,173,61,37,207,75,209,166,251,218,62,217,156,58,146,200,152,212,130,82,131,101,121,73,104,136,238,194,23,169,122,237,204,23,1,17,121,40,190,116,194,210,71,
+46,201,250,186,64,219,41,71,66,94,172,115,238,216,118,181,67,139,97,220,28,49,221,148,95,111,35,132,210,89,164,209,28,154,3,126,179,166,0,34,11,103,50,78,145,194,32,199,233,11,204,211,176,238,188,164,38,238,162,230,149,159,95,17,159,173,21,221,243,74,109,127,65,198,194,116,8,242,137,145,84,185,103,118,5,174,156,221,173,11,232,71,250,190,149,19,73,39,120,191,99,81,129,156,149,226,184,131,12,216,119,176,48,144,202,55,205,219,161,113,226,210,171,98,1,197,70,208,51,101,26,114,174,0,120,52,78,14,16,143,41,170,162,228,31,157,27,220,103,2,127,13,65,249,10,220,81,57,151,192,157,6,114,211,55,23,53,216,91,99,88,227,48,117,26,100,193,243,51,165,76,160,250,166,128,111,164,158,236,232,148,140,152,133,247,249,214,126,40,136,160,95,239,31,27,58,155,27,21,100,86,19,161,114,70,76,26,37,243,205,138,22,191,4,158,61,5,181,57,163,86,227,90,44,35,89,39,98,136,131,113,251,40,112,129,110,226,25,187,211,50,72,251,1,227,95,
+16,220,148,60,190,250,201,179,109,249,37,233,137,223,116,231,204,3,12,153,146,106,210,156,247,0,70,82,142,56,112,72,88,178,187,12,152,141,201,2,47,24,247,159,180,197,87,35,1,209,247,218,171,160,87,80,50,145,253,103,227,32,36,80,83,153,12,35,173,28,6,144,164,189,45,0,60,116,96,97,221,219,118,107,220,117,0,114,10,41,242,6,241,151,83,150,21,75,49,183,56,188,4,192,104,160,89,99,99,105,13,167,168,247,89,74,73,222,218,64,187,157,118,219,47,184,137,53,46,13,90,164,138,90,66,217,94,108,69,14,89,231,73,24,52,190,63,88,30,99,28,247,234,182,36,65,164,166,39,98,150,164,204,79,162,70,51,184,196,196,239,199,52,99,144,98,161,230,229,47,65,49,230,85,41,240,128,143,216,1,134,109,224,54,201,112,201,51,157,168,125,133,209,154,78,55,37,197,37,130,216,155,51,234,118,154,242,188,132,113,89,5,204,151,254,95,5,255,164,255,113,103,253,223,232,6,63,36,155,43,86,34,151,83,134,9,213,143,162,31,72,182,2,169,97,81,
+184,89,22,121,217,8,217,64,164,32,167,2,101,78,165,97,88,47,85,62,199,96,78,59,59,149,69,2,153,253,72,97,106,223,218,68,173,71,48,19,77,40,98,171,87,205,50,170,160,173,84,172,87,86,181,121,166,21,39,172,22,82,140,55,81,92,34,168,179,15,113,178,236,204,99,29,245,173,114,115,116,173,125,147,135,141,51,44,217,152,19,215,85,15,209,144,182,59,46,94,97,222,8,160,205,200,88,66,56,151,122,161,147,57,64,251,42,136,216,135,47,237,56,170,179,169,63,71,148,6,192,148,203,130,164,97,194,177,211,97,206,81,87,221,195,200,113,94,33,78,119,47,70,4,125,219,13,92,211,62,32,16,17,243,82,73,100,61,111,58,38,150,124,108,185,179,40,10,140,11,246,25,80,163,68,140,112,78,18,59,232,105,197,3,100,233,12,38,228,93,62,16,73,90,134,220,129,241,248,122,144,207,10,160,23,248,87,195,54,185,232,171,65,134,135,242,85,24,252,199,252,39,34,17,0,5,158,23,3,155,142,71,13,149,67,50,229,82,79,47,82,227,91,228,222,199,
+213,255,95,125,210,165,245,149,228,18,164,244,236,31,178,159,168,13,58,153,98,169,252,142,122,103,52,48,206,255,189,184,213,37,188,239,9,198,149,110,158,1,63,11,40,48,164,60,17,163,182,200,67,2,188,235,13,158,223,206,244,76,230,171,48,111,181,125,92,229,204,77,69,222,82,83,50,4,210,161,167,188,160,149,121,47,227,84,234,238,188,30,194,78,45,94,188,203,244,184,26,8,132,69,20,65,1,117,165,167,40,157,245,54,226,69,28,22,126,21,234,249,59,27,12,115,55,230,1,151,32,139,88,100,73,223,168,30,214,56,114,146,27,128,210,242,207,7,126,19,18,55,93,66,150,65,254,244,179,50,12,74,254,12,195,76,68,124,113,79,141,123,146,185,171,30,157,94,79,98,221,160,36,133,104,140,234,121,173,123,30,107,170,140,76,149,193,176,50,4,177,121,223,93,34,71,115,115,64,222,163,89,20,250,23,117,52,191,50,231,71,101,159,238,113,160,61,228,31,115,251,90,180,70,45,24,156,73,189,62,57,99,47,236,41,65,217,122,112,180,53,153,196,32,169,208,
+222,133,192,109,147,226,168,189,22,168,181,117,94,67,85,199,159,116,33,77,209,234,98,133,90,33,87,150,72,98,240,195,184,50,129,25,173,160,175,77,204,58,192,135,237,77,164,75,250,168,253,58,72,13,170,61,5,63,241,18,196,171,49,65,206,87,251,84,180,211,188,122,219,106,93,150,132,238,44,145,168,41,88,233,12,146,129,114,84,214,242,102,213,210,176,127,242,34,161,60,140,161,21,41,66,155,225,63,72,75,253,87,117,140,17,53,230,71,126,38,104,185,90,71,80,106,223,164,104,143,203,53,226,172,218,150,157,225,124,238,106,145,155,191,247,90,32,233,246,25,29,241,69,96,154,186,182,67,6,215,195,82,20,139,93,44,41,121,50,168,41,162,83,48,55,43,46,107,117,204,59,130,157,157,108,197,243,42,117,197,15,79,63,235,158,82,157,37,6,194,1,25,174,75,114,20,242,6,216,157,65,125,122,198,16,190,212,136,231,225,91,114,153,120,32,206,169,210,67,168,177,72,31,180,226,75,121,59,234,19,185,146,226,152,37,122,155,23,15,73,142,185,93,147,3,140,
+221,73,0,17,230,121,199,62,189,222,245,186,53,9,178,92,54,113,42,54,6,214,211,172,229,182,15,47,211,32,230,169,26,206,247,90,142,111,92,219,50,250,234,109,111,52,82,117,88,6,64,210,196,242,223,248,95,48,144,39,14,152,174,192,147,8,233,138,245,40,62,111,228,254,243,87,195,1,72,50,81,18,251,165,116,152,236,69,239,5,168,24,6,210,11,69,194,53,140,200,82,114,254,130,196,160,145,93,152,184,196,8,227,159,49,81,144,229,139,23,109,80,22,67,4,13,168,213,200,216,76,115,110,238,207,32,250,102,67,151,159,17,228,28,170,141,101,249,89,9,52,25,20,237,187,95,231,43,229,66,81,76,229,195,19,191,40,190,52,186,50,96,125,100,143,137,79,11,174,165,93,196,234,70,14,118,96,14,84,175,22,12,6,193,54,5,47,192,52,202,241,7,5,5,247,177,236,197,46,160,9,125,18,38,136,145,156,184,175,0,210,168,196,200,108,45,33,210,95,176,153,103,76,188,103,216,236,75,113,23,113,202,14,132,39,69,30,12,172,33,205,46,12,253,85,202,
+38,98,30,36,32,209,104,240,14,36,41,177,206,6,78,120,76,140,108,192,86,165,56,16,76,90,62,121,125,226,120,170,48,79,55,252,169,87,171,237,145,236,38,119,209,171,106,127,184,250,217,190,126,204,127,3,48,189,102,2,127,176,191,217,245,92,133,34,91,187,100,149,98,200,130,9,7,44,24,220,175,3,148,85,78,117,189,240,197,184,122,44,173,204,21,217,115,68,154,0,238,8,74,20,220,188,87,112,251,105,7,157,204,23,23,70,76,8,184,147,17,41,77,124,100,119,40,35,15,62,185,75,176,13,184,5,117,179,187,197,170,152,145,212,77,228,133,103,89,242,178,157,153,51,111,91,4,240,172,55,188,216,143,103,244,173,56,213,60,141,123,230,49,33,215,135,139,231,3,25,168,250,51,0,47,90,135,213,143,215,190,66,176,40,60,111,255,75,37,153,158,100,241,8,153,72,239,67,153,30,151,139,245,167,108,4,25,138,29,158,5,146,216,172,42,116,49,197,172,164,171,223,246,146,32,61,219,195,89,125,126,198,221,29,0,52,145,233,97,33,236,52,197,91,173,201,
+143,158,147,35,225,191,184,97,37,224,78,148,69,231,163,89,62,66,20,247,121,254,115,254,13,8,249,43,171,227,143,253,155,29,33,232,103,86,7,27,175,251,204,234,0,128,254,103,86,7,106,86,252,204,234,64,3,228,139,179,228,116,218,191,246,246,205,192,42,52,243,108,211,97,5,93,39,139,210,65,197,7,84,203,102,139,233,176,232,251,147,146,122,76,39,206,134,145,130,208,126,170,223,34,154,103,179,165,75,165,122,105,113,24,21,47,47,205,204,222,35,149,197,171,109,188,228,144,197,193,18,13,178,57,228,10,186,120,73,21,104,193,66,117,44,119,7,10,86,52,98,48,157,38,247,7,215,94,208,141,199,249,71,244,205,122,223,129,199,239,4,119,235,56,231,102,15,159,110,109,55,206,235,177,216,224,147,163,124,109,154,52,12,192,68,0,213,162,100,55,104,112,112,30,225,247,169,176,30,66,4,236,97,116,97,220,128,121,104,146,183,210,10,102,224,140,134,28,215,114,49,0,123,21,109,179,21,124,153,253,158,156,31,124,57,54,104,120,147,166,48,148,149,36,251,84,
+50,70,18,114,122,111,163,38,110,74,251,112,34,28,182,150,159,4,190,197,227,118,49,125,218,64,69,61,113,102,221,86,15,178,251,188,231,99,129,222,199,222,141,119,152,59,223,227,154,68,154,14,205,155,231,241,104,91,162,56,104,55,16,40,2,163,231,116,139,119,29,159,50,149,20,58,224,82,27,248,154,17,129,182,136,51,179,30,218,113,167,150,239,212,25,27,141,160,81,236,242,199,129,45,155,201,237,91,16,27,157,112,206,51,37,14,99,145,33,28,142,56,125,175,194,204,121,197,101,31,190,28,92,138,80,128,22,248,44,186,7,42,26,77,142,229,105,64,157,178,230,214,86,79,215,176,70,138,204,184,145,75,213,123,28,190,223,27,166,204,37,109,173,43,101,204,67,187,24,45,117,139,209,219,213,143,50,63,230,46,176,9,237,147,220,161,85,27,185,86,144,15,56,89,166,124,71,12,213,146,180,201,145,161,230,147,138,178,194,85,173,235,197,84,170,38,139,124,121,205,180,230,169,173,185,81,113,133,213,87,213,250,150,154,89,189,99,132,199,0,163,207,123,55,151,14,
+197,119,21,166,145,149,205,189,171,155,59,62,209,170,212,36,88,79,62,31,25,196,141,81,122,243,93,130,96,38,8,81,44,2,103,139,182,249,87,209,88,69,22,76,190,61,149,186,108,153,63,47,46,168,1,215,240,238,248,206,64,183,238,252,199,206,171,114,85,199,132,44,86,67,162,22,203,173,201,175,104,60,163,243,164,122,74,79,199,198,106,73,78,181,31,81,143,215,62,103,231,102,54,137,1,90,127,149,230,139,101,39,21,107,76,17,27,63,170,90,146,43,174,239,160,27,57,243,117,198,14,99,88,156,240,40,111,179,236,113,63,240,219,216,144,123,127,205,43,138,108,254,226,61,77,28,199,222,33,32,150,13,180,226,168,213,116,123,150,122,182,186,42,235,179,89,23,14,126,39,228,70,239,149,45,178,40,44,189,185,33,115,242,181,247,151,2,209,8,23,138,253,16,106,217,185,122,196,80,121,243,126,235,122,40,2,203,198,136,17,95,55,9,14,55,20,103,190,76,186,229,249,75,251,232,221,88,163,27,89,203,26,142,248,249,166,214,85,219,130,44,197,146,42,94,95,
+91,78,239,213,93,12,112,107,73,200,130,91,59,85,27,99,196,108,190,237,54,184,14,90,114,70,49,132,235,7,49,245,105,178,23,189,162,90,48,80,47,138,81,122,246,199,209,83,59,43,106,222,203,142,142,32,248,64,238,230,229,79,102,84,146,147,247,167,237,126,186,209,63,225,219,131,39,211,135,50,243,226,125,103,73,65,99,213,226,171,192,235,10,132,237,22,203,47,31,116,190,98,243,33,79,114,251,188,13,202,208,228,62,15,33,2,62,19,171,94,162,190,94,209,95,249,242,198,100,89,48,238,92,97,198,113,160,37,92,191,197,0,228,235,13,89,247,118,52,14,217,94,42,12,255,44,2,49,16,101,216,59,210,147,114,226,0,42,234,109,58,95,216,108,153,116,238,188,186,185,117,56,162,19,242,235,92,135,175,179,75,19,107,171,30,235,176,7,131,129,238,57,206,106,110,196,120,25,169,60,46,149,52,37,239,117,255,244,225,74,44,248,35,214,14,143,30,85,144,90,103,108,146,111,70,176,129,13,53,94,153,198,55,47,48,236,42,83,33,98,74,251,107,155,31,67,
+41,13,136,218,247,7,94,211,141,164,20,29,87,62,130,170,221,243,210,113,214,163,252,9,239,131,137,18,113,213,104,72,48,214,175,169,218,76,87,164,108,2,87,43,70,181,158,183,64,163,97,202,225,173,185,83,8,221,175,45,93,36,64,205,166,36,43,159,2,156,219,42,132,74,94,117,80,234,166,102,220,125,161,51,123,73,173,49,135,107,227,25,191,107,179,105,45,167,56,189,238,124,87,248,116,121,77,239,146,237,167,57,191,53,173,218,103,153,139,244,29,93,180,111,193,149,223,47,8,221,17,213,105,142,22,169,104,119,195,119,79,55,62,185,135,72,92,224,25,147,246,250,207,104,246,146,127,114,191,206,158,80,139,14,98,10,60,16,148,184,112,74,62,198,243,244,214,227,129,30,171,232,177,58,235,22,29,46,102,109,60,148,69,63,20,190,201,198,8,90,5,194,226,195,24,114,111,89,198,22,117,189,181,15,9,203,93,110,174,132,71,45,179,190,122,8,244,50,109,181,126,7,19,177,209,8,206,203,155,45,150,242,191,0,7,170,131,131,16,237,176,108,50,252,137,65,
+158,88,182,240,19,225,105,172,138,47,29,7,155,220,127,63,0,199,178,84,225,154,34,245,191,160,240,9,60,42,124,173,1,197,3,12,8,158,161,207,229,187,186,192,28,121,187,245,135,195,143,24,120,40,57,45,38,221,47,240,7,119,108,37,58,95,80,20,1,221,226,249,17,176,131,151,234,125,127,56,212,102,31,153,195,19,47,200,126,205,61,214,59,175,72,68,4,88,93,92,9,6,136,15,57,240,44,156,146,119,90,43,46,16,174,151,55,171,185,226,201,207,81,144,17,15,100,48,137,184,254,224,9,233,120,74,114,83,244,50,9,205,87,130,16,30,234,86,174,238,246,60,106,85,130,58,227,45,5,134,159,93,32,89,124,198,100,16,188,61,198,95,94,243,9,120,21,138,57,127,7,195,175,13,179,47,184,150,93,81,231,200,77,53,123,90,53,8,80,133,18,68,164,95,236,151,105,116,32,232,155,81,211,224,119,7,40,178,118,61,164,167,85,166,134,219,68,88,102,102,81,201,238,189,116,223,204,168,46,48,127,31,208,39,12,132,173,52,68,78,108,253,76,242,73,96,
+95,250,129,97,202,130,217,189,135,1,141,80,153,39,178,35,175,22,208,95,95,133,252,146,82,40,24,116,244,170,186,185,109,77,60,4,138,239,83,1,215,241,98,205,170,49,225,170,179,213,101,41,163,217,142,97,58,225,151,111,42,55,237,195,122,179,113,231,113,194,9,78,112,205,87,222,216,121,25,15,185,116,237,195,15,253,27,185,61,163,157,246,148,175,148,243,236,153,81,78,24,47,169,72,166,34,49,41,202,211,131,114,254,189,114,191,170,32,63,12,149,83,135,87,160,68,134,98,240,89,122,198,245,121,204,124,219,122,26,97,102,111,21,185,173,195,219,150,153,30,50,247,188,113,134,164,195,203,92,195,233,27,114,126,247,121,166,66,244,65,143,69,64,195,200,103,148,180,77,169,19,139,94,205,8,213,124,39,219,139,216,103,133,110,12,123,223,29,91,205,173,61,93,155,183,76,20,89,20,119,107,220,155,238,197,24,55,132,111,75,87,55,240,28,178,222,221,107,214,154,153,93,126,202,208,138,110,21,63,19,178,29,100,115,96,199,167,126,196,72,5,243,254,116,215,137,
+134,224,137,206,187,123,84,125,27,80,141,230,132,236,222,120,203,229,179,24,184,206,96,51,171,111,233,178,138,113,164,243,76,118,33,77,195,170,127,106,102,208,247,89,140,80,69,209,179,28,188,193,210,150,144,118,86,247,108,1,236,214,97,181,112,242,239,68,203,67,254,246,195,116,219,69,153,3,228,109,91,137,56,96,101,217,27,178,76,166,28,73,219,99,78,127,43,32,112,47,128,93,160,168,182,133,221,222,53,21,50,134,178,87,189,116,152,123,5,202,103,180,175,225,18,111,100,52,98,185,79,19,214,157,17,166,236,29,229,101,19,238,149,224,189,71,113,84,189,207,182,60,7,123,123,84,224,181,206,119,184,246,254,105,156,105,223,42,200,84,248,59,225,85,42,45,216,106,78,116,0,69,8,200,118,28,114,35,63,30,129,183,15,177,126,102,58,155,191,222,85,8,250,122,171,194,21,116,171,228,7,114,184,106,34,98,96,31,8,33,52,110,152,91,180,206,57,112,62,29,254,183,143,199,240,250,245,138,183,163,39,49,74,33,194,159,145,135,12,31,177,205,163,216,63,42,
+77,239,51,84,238,240,222,48,25,63,48,150,220,189,56,12,28,180,140,143,151,40,156,87,242,82,150,227,227,225,252,47,83,199,84,231,183,242,53,13,218,64,190,49,188,207,111,188,205,83,101,199,26,99,188,27,77,155,209,86,242,155,26,180,150,123,224,50,253,35,107,61,100,147,122,0,234,33,83,29,190,37,56,141,42,195,135,71,201,194,215,115,90,246,180,64,55,111,121,244,100,92,107,203,156,209,22,109,59,237,110,145,81,64,146,50,194,19,172,22,74,13,70,13,201,81,207,187,164,118,221,225,112,99,53,68,182,86,69,199,251,192,169,189,178,220,24,249,152,198,66,32,157,96,192,20,63,195,120,208,233,223,249,62,47,25,218,69,125,30,156,154,155,67,206,19,193,80,197,182,127,151,166,105,10,235,149,155,215,28,179,75,47,209,240,136,133,151,32,16,254,15,86,43,24,10,53,148,111,163,145,230,169,83,98,187,141,230,234,36,84,102,198,140,135,144,57,39,239,94,103,211,183,240,26,46,198,106,181,203,169,209,219,157,178,228,61,99,123,220,149,56,57,79,44,108,
+101,204,138,246,183,211,178,248,54,168,0,103,39,106,20,191,82,77,234,30,80,254,136,141,25,103,83,250,12,109,51,122,203,198,0,160,219,248,42,86,106,236,137,213,82,60,116,226,128,96,222,144,215,233,179,176,139,44,221,72,29,121,50,97,127,220,20,95,81,92,216,249,52,201,177,165,128,210,250,130,193,8,31,31,220,164,149,175,215,19,71,238,46,224,126,198,246,220,5,220,43,68,85,250,2,238,103,108,127,191,128,251,25,219,5,23,112,111,62,29,188,60,149,6,116,91,229,104,172,192,38,243,187,21,86,59,49,141,192,211,220,219,122,30,172,147,149,73,190,107,126,34,240,211,165,184,229,61,82,45,105,34,110,120,221,0,214,217,42,82,221,236,69,10,221,87,143,50,56,2,200,202,118,78,173,234,144,107,170,8,140,24,166,78,134,241,178,24,74,35,92,226,88,106,188,221,86,201,178,213,25,158,201,25,148,40,84,42,13,107,67,81,207,16,36,131,137,194,111,93,3,245,210,135,12,2,121,73,66,69,210,207,228,79,200,139,200,115,201,180,1,32,41,204,167,86,
+134,64,114,176,243,87,23,39,5,3,130,185,244,117,135,120,100,30,175,231,242,199,249,18,8,249,235,18,207,215,207,25,124,81,56,44,33,61,124,214,125,33,226,189,235,57,145,111,219,189,133,67,111,66,4,98,197,118,84,49,163,150,209,164,0,135,208,71,191,250,221,231,133,248,207,151,17,19,39,127,49,123,218,53,102,215,2,241,179,101,231,35,107,158,67,214,217,160,103,173,11,162,246,187,183,125,41,75,130,6,80,151,39,120,220,45,209,9,149,213,36,104,163,226,241,69,188,88,190,206,231,149,196,118,125,39,81,242,167,239,131,166,188,53,169,151,13,130,24,88,56,9,108,111,179,232,211,78,237,145,246,98,156,103,25,137,40,52,9,112,4,195,165,161,4,36,248,38,105,183,72,130,83,147,83,50,145,171,78,185,183,177,150,221,79,78,147,64,21,59,204,143,165,219,202,253,21,211,68,86,117,196,85,98,173,186,227,126,104,44,202,87,17,200,208,107,110,144,87,185,143,231,243,42,168,224,104,249,164,163,182,86,226,75,98,166,93,91,57,70,35,30,149,204,178,38,
+238,3,85,162,25,3,14,188,56,150,254,112,58,230,214,80,227,176,96,57,182,139,163,156,223,171,250,64,48,216,142,203,2,59,9,136,235,73,36,178,104,75,193,58,146,74,37,63,104,203,242,17,213,139,180,174,167,117,28,128,89,67,45,231,67,177,22,129,205,243,96,197,177,240,157,127,191,134,139,210,222,9,173,118,71,35,147,201,82,175,241,252,118,60,18,138,64,214,126,228,35,69,225,123,58,25,137,44,63,81,189,1,202,169,19,6,168,111,236,243,68,69,148,240,129,58,223,231,173,91,140,115,71,137,225,203,156,136,154,78,46,91,39,59,90,59,18,89,121,215,188,143,52,99,168,0,115,167,16,176,6,193,14,154,10,99,67,250,82,19,226,176,159,45,118,143,253,121,198,218,91,17,174,164,209,112,66,205,43,220,129,186,109,1,165,83,60,123,101,210,146,154,187,149,62,144,245,115,200,129,69,205,124,252,105,156,132,206,176,176,240,220,176,140,48,255,199,90,116,254,225,170,75,196,205,137,115,217,174,82,207,135,170,38,10,70,44,147,250,166,72,41,65,58,185,184,
+254,185,51,140,6,44,220,115,146,175,240,68,37,72,21,240,195,11,139,142,166,0,11,107,221,227,222,115,55,87,250,69,133,108,236,160,178,21,149,207,94,255,150,188,213,47,129,13,179,166,128,3,24,229,253,101,5,118,146,51,253,12,183,207,114,87,42,222,209,52,34,57,109,175,101,194,80,231,146,68,97,225,78,233,71,233,142,56,106,190,243,43,221,83,205,139,156,26,51,66,177,123,118,108,228,241,130,81,210,121,63,165,194,174,54,102,91,175,116,92,55,151,159,83,78,124,47,128,161,154,238,215,129,41,58,160,204,63,135,203,198,9,181,229,12,50,199,134,220,74,46,53,250,81,40,169,244,112,121,127,119,132,51,111,63,199,88,174,133,151,198,58,107,100,74,91,154,246,118,187,61,175,11,212,217,163,155,50,182,218,204,62,16,164,8,81,4,255,249,28,68,27,99,119,45,192,251,94,51,126,95,105,86,30,223,227,98,68,197,126,96,200,239,231,79,216,22,70,209,98,89,199,250,180,106,11,129,96,30,168,112,12,212,3,185,165,62,123,187,110,25,151,8,243,99,236,
+183,253,5,40,50,133,195,243,192,67,44,236,154,196,181,228,153,8,188,44,57,51,22,182,223,8,17,15,106,49,34,167,139,40,21,136,156,23,11,57,191,17,224,235,235,216,117,184,39,188,58,223,34,138,81,86,104,153,244,18,201,33,31,73,237,57,236,63,172,223,135,164,129,217,87,215,114,72,216,251,248,120,100,35,164,82,144,87,223,150,229,26,176,254,24,207,235,34,80,37,91,120,130,247,188,162,203,102,60,223,17,239,165,173,185,43,222,154,228,126,150,113,238,68,53,215,102,48,13,211,120,77,68,194,219,47,186,29,135,153,106,158,136,6,152,5,98,189,64,58,31,217,182,199,118,158,204,121,46,6,90,136,228,62,142,186,139,166,157,181,190,119,109,91,218,243,134,127,125,236,206,11,53,57,124,219,146,203,199,254,227,30,23,108,209,183,171,225,208,249,62,166,240,54,189,125,130,35,196,158,224,120,255,70,99,9,191,138,65,209,65,117,218,106,206,199,23,186,120,94,41,125,44,157,64,142,17,236,19,14,66,44,63,237,2,48,202,181,53,173,49,159,225,130,155,206,
+181,160,198,52,250,130,86,47,16,20,50,113,90,214,89,111,170,164,245,26,183,74,23,109,67,235,160,136,135,124,162,28,36,5,251,91,40,7,129,192,254,22,202,65,46,240,246,183,128,240,243,175,243,37,30,232,231,37,253,119,234,188,117,31,55,160,137,174,249,222,142,215,88,68,23,120,129,144,1,47,39,172,151,119,48,219,85,122,234,238,107,121,31,219,198,52,121,122,41,8,61,61,81,105,111,145,228,66,180,221,141,133,54,124,252,232,202,226,146,88,41,82,28,181,168,254,105,36,2,242,53,251,184,233,84,202,91,214,44,123,139,164,235,180,147,40,83,200,148,150,241,241,45,116,97,238,212,233,22,19,211,251,188,80,8,73,132,66,32,63,18,84,233,100,225,199,93,169,110,116,134,4,31,65,14,111,20,241,219,249,149,218,155,174,243,110,106,109,166,100,229,126,205,9,181,147,22,102,244,163,243,120,144,212,20,148,209,148,63,114,54,213,156,249,125,50,21,25,121,148,171,187,236,135,115,47,106,175,43,181,0,193,39,60,142,211,222,15,19,236,56,171,95,102,130,132,
+204,183,247,226,91,45,20,249,247,255,175,255,243,151,127,242,207,190,253,31,63,253,225,219,111,190,251,221,183,95,190,255,241,251,223,252,250,237,167,223,125,255,237,167,159,191,253,245,79,63,127,255,237,223,254,240,243,175,127,248,238,199,111,127,253,253,175,127,245,211,111,127,249,246,235,79,223,126,250,183,223,255,252,243,15,191,253,254,219,15,191,251,246,235,95,125,255,237,55,127,248,249,231,239,127,247,235,183,223,252,248,221,47,191,252,217,183,127,241,23,191,126,255,243,183,223,255,225,151,191,250,225,119,127,249,121,193,191,249,123,255,203,191,254,55,127,239,219,159,255,225,215,95,127,250,221,127,245,237,183,223,159,175,252,249,187,95,127,248,233,119,223,126,250,139,191,243,132,239,126,190,220,249,151,239,127,254,245,251,223,126,251,238,215,63,221,254,247,63,253,242,195,229,55,127,246,237,127,252,254,47,126,248,221,231,223,191,252,191,221,224,247,63,126,247,155,243,207,207,79,248,205,143,63,252,254,207,127,250,238,231,223,126,251,229,167,243,104,206,55,60,15,233,223,127,78,
+247,207,255,163,7,253,250,211,231,80,127,249,233,15,63,255,230,251,111,127,241,195,143,223,127,251,7,127,246,155,223,255,254,31,126,251,241,187,243,124,254,236,178,82,255,245,63,251,246,191,253,207,255,234,127,253,31,254,197,191,252,215,191,252,113,229,254,244,249,124,131,159,126,252,229,219,239,127,254,233,223,158,151,230,60,136,95,126,249,225,151,95,191,251,221,249,102,255,238,135,95,255,234,219,159,255,240,187,223,94,214,227,95,126,247,227,143,127,254,221,111,254,239,207,145,255,173,149,251,246,221,239,126,251,237,135,95,127,57,207,227,175,255,252,251,159,127,249,246,15,254,240,203,121,90,63,254,251,203,194,125,251,221,79,191,126,251,241,135,191,254,225,143,99,253,229,167,191,254,254,219,255,244,191,255,171,111,191,253,225,187,31,127,250,203,63,253,246,223,253,240,219,191,252,254,215,95,254,225,229,154,63,174,199,63,253,26,234,127,255,237,159,255,243,31,254,250,187,191,252,254,159,254,227,127,252,223,254,163,191,255,143,254,155,127,242,223,193,224,5,216,37,229,28,62,62,
+94,182,197,134,117,53,190,195,176,165,129,16,127,45,188,145,224,29,182,211,241,41,23,96,180,20,233,7,102,186,67,70,234,144,168,61,181,65,30,230,108,8,148,15,213,178,189,180,61,30,207,179,126,197,89,237,234,250,213,75,181,206,88,157,38,106,220,235,233,85,50,52,1,161,93,115,93,168,122,94,114,70,60,123,136,5,123,175,187,142,106,223,31,236,28,106,25,15,170,57,229,186,241,29,149,79,153,197,194,154,162,75,124,218,30,221,245,211,181,80,163,8,3,225,7,160,238,255,112,168,213,215,166,2,79,54,77,251,82,139,199,15,127,209,217,184,91,31,133,185,98,55,107,44,236,122,174,198,221,34,123,103,93,218,54,206,94,186,73,153,14,66,251,222,179,97,253,113,125,63,251,160,190,11,111,176,190,199,29,23,143,170,46,237,188,198,172,104,15,177,146,207,177,227,96,0,45,31,239,113,66,212,145,96,185,7,107,227,157,18,151,223,134,244,145,105,121,180,172,19,215,188,44,73,56,35,22,237,65,119,141,198,87,189,144,14,124,189,240,234,190,105,175,242,167,227,
+227,51,122,47,254,168,134,118,211,77,206,59,125,184,222,227,220,245,166,179,125,115,212,31,202,66,55,105,35,78,63,160,110,217,239,9,127,202,251,54,195,232,142,175,30,67,94,252,42,66,225,201,31,102,156,61,137,191,209,22,189,196,162,40,64,44,220,171,177,54,127,249,77,72,1,28,148,141,113,13,35,138,90,100,123,225,222,124,10,190,223,99,175,64,244,104,187,55,186,145,88,215,44,11,77,150,13,145,23,59,5,131,106,176,81,13,20,211,125,125,244,204,99,16,153,4,166,166,65,121,8,38,9,115,254,36,244,162,55,41,208,117,114,244,16,230,187,133,101,131,214,225,29,160,223,249,122,127,151,165,161,93,55,249,228,179,5,171,26,85,63,218,47,208,154,116,161,227,115,215,213,215,60,84,86,35,36,19,243,114,154,70,180,4,234,126,131,177,8,80,215,174,235,15,210,162,48,138,97,6,62,3,62,180,123,124,194,158,16,141,194,149,191,59,127,99,146,30,103,208,222,92,83,119,172,159,179,139,123,29,251,202,58,82,218,61,172,196,150,245,184,153,162,151,39,129,
+21,172,77,230,49,123,127,196,75,214,111,114,39,117,134,137,31,13,246,87,33,41,32,180,175,30,157,93,107,205,219,29,47,200,166,62,56,229,223,145,238,167,50,95,77,150,230,67,194,8,44,98,242,8,199,60,28,215,1,26,217,171,223,99,207,115,157,161,26,238,143,130,220,189,212,11,248,139,89,184,82,193,57,188,71,158,55,41,124,78,173,169,239,22,92,196,1,28,130,180,163,208,238,200,111,30,155,242,181,55,115,115,90,12,54,122,173,82,68,134,11,223,222,7,246,178,7,88,123,146,190,253,20,11,216,91,43,131,37,118,69,21,135,45,135,186,125,230,242,249,99,117,225,168,71,137,160,81,225,234,18,125,126,156,69,107,126,193,3,240,90,234,133,221,114,118,71,104,2,37,5,93,1,237,255,135,119,183,234,78,36,90,212,104,255,58,82,64,33,129,66,130,187,54,22,130,7,215,4,135,224,22,32,184,4,11,193,245,22,201,57,103,236,125,239,251,125,232,209,221,131,234,80,182,230,154,223,183,86,67,94,97,71,97,95,6,102,76,11,32,173,132,246,143,173,175,
+150,237,187,112,219,249,62,168,93,4,244,78,93,218,71,42,144,20,40,247,178,204,248,140,252,14,98,207,247,199,100,105,182,13,130,89,194,251,92,187,230,87,156,230,10,47,120,245,204,57,140,159,67,86,240,149,110,110,241,93,92,254,130,123,58,77,223,182,74,110,161,127,94,127,11,200,95,155,239,110,224,182,86,119,186,45,209,225,212,202,139,112,80,249,38,35,7,3,165,47,137,28,160,224,75,30,236,197,48,35,103,50,65,202,50,78,34,185,66,221,165,83,66,114,245,67,159,162,56,187,116,174,166,134,206,212,246,199,254,97,113,252,100,85,42,214,89,244,226,218,95,26,244,133,64,224,60,42,213,221,69,138,227,60,99,103,222,245,238,232,109,173,54,242,37,239,154,80,237,28,235,85,155,66,180,137,246,135,218,227,227,141,13,185,134,249,83,122,24,57,246,249,53,172,10,210,103,44,17,223,249,59,52,180,17,177,6,103,203,212,62,116,182,253,171,234,201,183,31,109,22,124,231,246,130,193,225,154,233,221,85,18,12,13,61,90,197,194,188,109,185,246,33,209,224,251,
+228,94,189,117,145,60,158,22,131,91,159,241,114,4,84,110,214,111,17,10,203,157,169,247,13,243,107,2,67,73,123,160,39,130,228,146,4,63,117,178,48,149,24,17,102,128,15,231,105,149,2,23,102,69,102,4,223,65,130,217,49,53,11,166,186,211,143,167,153,106,113,14,235,235,78,116,61,195,191,88,209,155,224,144,41,15,22,79,151,78,242,81,36,184,121,167,249,60,235,108,112,140,137,190,234,46,151,97,38,69,39,159,107,120,41,202,79,19,156,107,225,35,95,38,224,46,41,88,46,138,225,175,116,203,126,11,29,124,211,197,81,105,6,87,105,193,42,221,208,138,226,213,181,154,103,187,221,186,249,238,109,127,48,238,93,62,211,81,189,35,165,207,235,26,149,242,145,245,57,186,166,244,140,53,21,158,23,24,47,107,126,182,103,28,33,109,186,182,220,205,212,51,109,211,123,237,75,101,165,39,199,39,213,218,109,237,12,196,237,226,149,50,109,108,21,61,159,179,165,134,114,183,207,183,7,47,201,100,161,139,35,245,207,207,38,227,115,203,192,15,125,183,236,21,200,23,
+143,62,247,179,110,51,118,12,185,236,146,115,106,78,195,23,251,26,187,85,111,42,149,111,143,86,45,110,231,108,137,114,201,231,141,246,235,101,240,42,48,251,202,103,253,39,142,211,103,221,92,25,74,144,117,155,79,142,40,74,70,116,218,101,231,99,209,68,120,70,95,231,70,123,70,112,206,207,194,94,214,211,169,79,249,222,17,26,102,237,48,238,2,214,243,138,237,106,212,27,188,155,140,160,11,95,169,49,5,15,71,228,154,174,125,243,174,82,146,33,186,60,61,223,76,227,128,228,210,218,126,191,89,121,134,202,190,235,224,93,158,92,30,207,185,183,121,88,56,7,248,31,74,211,121,200,121,111,107,102,25,189,77,80,33,169,78,108,238,101,110,125,20,196,218,53,86,174,114,51,123,158,222,230,151,16,177,117,106,225,4,205,19,142,213,186,148,206,177,89,138,229,251,94,80,12,199,197,68,160,155,87,103,250,209,116,223,248,153,44,176,216,93,29,249,188,171,162,33,84,57,242,166,16,125,125,86,190,120,166,204,250,217,204,28,206,102,63,87,165,246,185,93,203,183,174,
+71,242,34,121,253,184,245,57,125,17,47,228,88,223,82,134,71,139,98,105,207,15,175,207,90,233,185,214,218,177,26,222,230,38,55,187,100,74,100,236,62,83,144,104,149,148,131,251,216,105,17,203,51,218,170,115,49,1,164,154,58,189,5,171,240,5,189,160,124,182,214,70,173,18,221,182,228,44,165,229,107,173,36,125,193,174,225,52,124,51,21,33,59,223,245,116,110,112,130,188,39,135,64,127,121,149,110,31,85,158,141,79,230,24,129,27,193,80,100,218,234,208,101,149,208,189,240,224,102,29,23,0,97,110,89,223,44,104,221,207,182,70,217,211,252,232,119,77,178,139,154,41,226,254,18,10,236,157,70,159,92,38,206,34,158,243,151,112,126,243,204,219,66,153,175,178,101,250,206,234,169,111,45,170,95,7,218,239,220,41,130,126,225,229,128,59,208,205,118,247,203,151,232,26,152,159,240,62,219,207,169,113,89,161,95,206,102,51,235,210,217,29,63,40,73,209,55,210,55,239,212,157,145,150,91,174,56,23,30,242,184,15,172,253,80,250,194,152,147,110,225,114,211,67,105,149,
+162,157,111,165,190,60,85,119,190,122,204,55,23,173,159,54,253,112,51,172,81,211,134,223,206,182,209,120,182,55,198,60,239,79,51,245,35,114,53,160,232,26,221,189,53,51,213,239,249,114,106,29,90,12,21,247,213,151,235,158,188,203,127,155,195,80,32,205,217,63,118,104,129,68,129,35,233,171,167,229,158,115,186,13,24,218,139,247,18,157,95,86,0,185,86,221,33,36,39,67,43,143,131,124,167,239,103,81,130,220,168,222,6,143,15,126,165,98,214,242,125,53,221,187,126,119,119,29,12,54,30,109,121,119,147,109,47,21,223,171,251,99,119,168,248,220,31,251,172,79,70,185,124,182,223,124,85,253,199,110,169,186,126,117,5,43,45,39,56,234,46,8,107,253,135,175,189,173,179,174,179,85,76,159,185,17,88,173,99,159,113,78,207,197,131,165,89,138,182,125,164,77,134,135,141,1,97,185,140,117,166,109,123,228,160,88,68,222,79,37,54,45,103,118,189,207,26,121,25,25,122,254,224,102,82,232,182,231,245,48,249,30,158,92,229,235,247,160,129,131,167,220,132,215,241,115,
+106,182,146,162,67,57,95,69,249,211,47,142,83,207,74,80,183,67,79,60,167,111,201,141,93,12,220,115,38,255,72,63,53,28,155,153,82,171,106,158,251,97,218,117,49,89,160,113,13,130,195,8,73,213,67,215,24,152,86,188,251,181,140,87,38,95,207,13,153,104,90,19,14,118,248,30,128,220,176,132,106,62,20,205,136,37,249,45,207,121,241,166,40,162,235,160,165,11,148,2,209,165,34,140,212,65,183,178,158,57,111,236,86,15,18,16,0,27,222,150,37,129,3,208,216,57,80,95,37,150,205,24,89,221,222,250,60,78,253,209,182,173,173,209,118,129,111,111,53,166,26,174,155,104,253,114,126,90,22,237,135,179,127,218,218,137,66,226,182,3,37,15,199,61,190,214,169,225,14,205,41,16,29,115,5,137,171,102,228,229,235,198,88,92,206,133,4,37,229,248,206,58,4,111,87,44,94,223,57,61,70,236,215,208,33,1,209,72,161,205,182,58,116,110,42,85,226,79,9,30,133,2,103,199,124,89,85,18,91,223,144,121,157,30,15,83,74,74,116,188,206,183,177,197,76,248,
+35,84,239,48,229,221,229,221,74,159,222,14,197,2,207,192,167,212,134,43,181,253,195,70,183,46,30,243,240,13,74,24,23,138,175,157,231,0,94,57,193,222,170,35,1,194,121,120,100,141,13,115,151,247,7,169,61,138,78,65,247,173,250,198,99,221,176,46,157,111,207,222,188,179,116,140,171,208,223,196,25,51,239,234,5,219,121,221,180,172,170,217,142,167,125,61,93,79,51,23,119,45,9,203,249,227,219,91,38,202,249,114,207,84,23,188,234,18,249,39,75,30,110,79,229,147,44,106,153,50,68,66,209,169,118,75,104,40,141,211,149,206,1,161,77,37,24,125,49,14,101,223,11,140,13,4,32,58,36,214,79,174,222,214,152,218,34,96,94,190,179,141,69,26,100,217,47,61,170,170,179,203,146,163,212,201,98,182,252,244,225,250,26,224,99,149,115,220,202,236,222,191,219,5,217,102,247,177,109,1,122,255,50,178,211,225,89,67,115,11,140,147,7,145,192,251,131,94,228,85,31,77,79,155,137,156,103,237,240,204,0,167,36,92,211,117,80,106,119,202,173,99,53,217,176,188,
+25,207,214,164,246,60,13,69,71,162,86,121,237,56,27,95,45,115,20,135,147,55,28,29,69,150,188,7,202,121,50,32,225,45,46,158,81,119,198,90,223,26,205,125,115,105,29,98,9,195,246,6,70,254,131,179,39,16,67,175,6,81,179,182,174,73,94,79,122,169,103,99,184,158,86,173,227,121,56,51,140,89,63,223,165,55,145,227,218,161,38,171,162,8,0,173,106,45,91,233,232,254,158,26,190,119,164,139,162,71,48,244,175,237,230,152,146,114,213,253,55,125,188,202,167,185,201,65,110,232,34,242,135,14,113,159,155,205,193,28,159,135,169,214,232,246,78,57,115,35,34,82,83,40,94,230,85,123,245,85,104,91,125,180,48,7,116,240,117,235,25,253,24,246,95,62,223,191,62,223,210,227,69,58,139,134,239,248,193,184,62,239,42,183,237,153,242,50,16,142,8,221,217,141,85,50,15,139,161,176,27,239,127,38,133,150,109,230,64,165,12,149,146,194,211,79,118,142,17,193,3,207,214,189,240,162,153,189,95,181,99,236,118,153,151,205,215,228,95,93,73,118,24,179,11,116,
+57,57,219,53,102,5,222,147,240,216,88,105,231,162,86,245,50,123,124,190,191,60,198,178,34,201,107,122,70,42,19,144,137,246,65,86,216,209,241,55,82,14,84,144,185,41,72,122,13,12,110,230,206,124,127,92,119,173,185,83,247,185,127,117,240,158,92,86,217,165,168,246,84,107,30,95,207,183,81,121,218,142,139,171,105,159,247,124,79,45,251,222,154,113,119,69,134,150,192,82,222,81,86,215,141,13,60,104,177,75,97,48,45,152,252,132,138,14,158,61,20,45,53,126,94,161,106,243,250,216,42,45,112,80,234,130,203,215,1,86,152,73,138,246,128,103,154,183,240,216,3,111,118,202,193,63,48,166,232,151,107,213,108,121,157,186,120,91,207,34,231,218,221,106,221,124,71,207,243,10,140,175,110,247,44,228,99,146,175,105,199,247,110,85,27,95,68,180,77,2,210,39,56,245,143,7,176,63,131,199,153,47,112,164,7,235,66,186,250,118,244,43,90,190,117,244,116,208,167,118,175,91,20,76,118,124,59,167,75,167,112,45,134,235,80,195,57,135,55,135,60,35,238,44,198,34,
+195,232,86,168,224,237,155,3,229,184,216,189,243,84,10,128,226,254,158,248,30,111,13,143,225,203,187,229,230,231,243,242,102,87,105,166,26,63,7,166,199,80,85,45,53,118,28,76,34,77,196,45,143,83,23,19,100,188,106,225,127,224,171,215,221,60,16,42,243,109,216,239,215,42,111,241,178,195,237,143,102,251,199,233,136,185,169,18,79,62,137,187,20,176,103,92,207,151,237,228,58,51,111,231,162,227,173,182,237,52,234,196,93,148,237,236,103,138,139,150,235,199,117,219,104,134,146,163,252,133,109,90,80,142,126,72,58,10,203,133,48,199,125,164,220,45,45,56,3,18,139,200,49,129,39,96,251,162,128,195,0,92,119,70,82,191,184,187,15,201,171,218,145,232,109,125,3,150,232,26,165,220,4,215,61,100,234,133,190,156,210,19,214,157,245,161,121,189,81,11,111,23,86,234,121,159,216,188,8,136,150,244,27,38,232,254,132,176,167,162,70,150,34,188,48,123,169,110,38,237,24,55,139,80,243,99,159,68,28,21,77,206,215,96,177,209,191,30,112,55,183,73,70,76,134,251,
+6,213,51,201,30,194,79,33,128,111,115,107,166,40,40,138,65,65,132,32,211,230,9,9,179,245,173,177,183,56,185,219,2,159,145,24,76,143,123,190,65,89,24,124,58,124,175,100,63,153,75,209,221,34,10,87,233,47,223,27,181,236,26,234,44,97,148,143,203,162,50,70,174,97,105,186,119,45,174,94,241,1,115,136,220,236,182,127,91,193,238,228,91,145,3,153,183,179,199,43,167,241,158,120,162,135,130,98,241,143,255,172,124,113,109,232,173,253,94,28,109,253,112,83,157,175,210,156,169,110,29,113,59,85,120,219,51,220,115,9,251,233,181,19,118,174,253,69,58,177,105,39,111,6,240,227,189,236,159,142,49,156,50,115,251,68,237,190,91,187,204,185,117,219,141,234,46,92,163,198,218,33,237,235,214,58,239,220,45,120,202,157,251,218,60,150,191,156,174,102,94,208,216,28,122,79,172,197,118,127,192,251,102,162,245,124,211,95,159,23,83,174,245,254,144,227,85,242,179,36,52,20,190,123,87,139,236,210,149,225,123,175,17,221,195,162,105,58,55,190,199,146,211,244,165,247,
+236,253,236,58,212,248,182,194,125,162,136,188,67,108,158,185,109,60,239,203,27,213,98,225,156,236,27,183,195,84,111,88,176,126,70,144,109,55,170,121,1,247,220,89,188,197,65,4,228,81,150,182,177,176,63,74,251,224,4,133,223,11,60,254,134,132,190,124,203,207,143,215,188,144,187,251,222,165,129,215,124,211,117,193,89,188,171,102,248,167,39,62,129,156,88,182,245,64,111,193,243,77,36,249,42,248,137,219,233,212,163,115,28,179,216,195,88,195,229,229,86,71,71,14,172,166,158,117,85,46,246,168,208,220,23,90,32,189,27,254,58,96,189,177,220,214,225,122,131,73,44,198,173,238,97,37,62,191,77,35,91,160,253,196,78,103,135,83,100,219,165,127,173,142,31,88,41,146,240,148,40,168,119,235,53,198,182,94,31,181,245,190,107,225,220,28,23,188,178,106,231,254,62,90,203,181,204,98,53,91,63,37,94,84,173,77,123,121,123,113,180,135,94,96,148,112,20,82,254,40,124,195,221,27,217,41,41,104,96,22,198,133,75,23,113,107,213,147,97,44,31,236,116,241,71,248,
+159,95,92,228,70,103,89,84,163,124,88,195,222,37,155,190,45,251,17,49,201,80,255,199,87,78,221,238,159,204,131,202,59,152,236,191,159,190,50,181,126,99,23,241,77,78,196,43,57,226,227,203,108,199,72,218,155,29,66,118,251,73,8,173,226,153,173,36,172,117,79,67,209,232,77,150,122,36,162,233,27,29,146,13,250,78,161,225,205,202,218,37,225,209,1,48,161,127,52,167,187,251,213,210,189,229,130,51,195,165,167,248,66,235,135,175,241,47,218,98,170,186,246,69,66,31,127,243,200,33,42,195,42,172,240,246,157,132,28,69,196,131,81,127,197,30,22,67,129,123,210,79,168,140,66,254,237,8,15,141,178,183,179,142,132,159,90,249,163,97,24,78,71,31,174,87,33,7,22,3,135,79,101,189,206,236,153,115,96,141,203,224,56,97,194,171,95,120,240,127,218,154,249,183,24,12,234,71,227,250,69,59,219,196,152,24,139,61,41,220,215,11,234,235,77,143,131,208,115,246,211,53,63,203,159,124,59,237,32,179,16,94,55,15,170,188,193,57,63,14,181,108,85,235,24,120,
+99,9,202,167,252,53,214,122,79,175,213,162,209,211,241,107,254,130,223,173,41,94,217,105,199,94,60,243,191,159,148,207,124,164,217,11,232,26,11,75,217,169,32,214,89,62,209,75,123,50,92,68,154,2,239,10,104,107,201,47,194,230,150,189,124,75,88,200,132,188,75,229,61,14,187,49,67,237,22,76,87,31,100,205,163,199,238,9,143,120,0,40,114,174,153,110,248,37,124,164,72,176,178,11,81,207,74,79,233,56,200,95,191,36,164,255,148,158,93,136,117,251,242,204,171,62,161,107,58,110,180,29,172,237,172,97,201,167,218,156,214,201,68,91,211,230,139,67,55,191,107,93,52,55,12,75,101,23,157,191,101,45,1,67,93,112,241,247,23,71,156,154,190,14,237,167,214,180,234,249,54,248,138,211,245,66,247,239,178,105,138,68,59,115,80,102,104,52,23,246,40,82,40,245,253,91,102,216,59,223,38,179,187,137,234,211,149,255,203,65,103,74,46,22,157,106,26,50,110,111,121,92,136,58,75,102,51,139,135,159,249,233,221,51,108,194,111,122,232,13,31,188,207,127,85,102,
+73,165,108,24,42,171,247,47,43,61,210,178,108,182,246,186,210,50,236,248,104,173,229,210,59,246,204,5,134,234,101,192,241,121,218,155,65,191,156,244,237,77,237,152,207,177,219,71,100,135,179,150,93,234,71,115,7,134,236,243,205,39,93,21,247,223,46,138,224,231,189,127,76,144,231,173,235,182,168,110,157,163,242,233,11,122,21,126,40,243,237,231,212,33,27,98,9,53,110,213,55,205,199,173,30,149,28,170,247,210,186,113,14,221,136,104,155,62,86,177,211,110,235,124,10,221,122,186,211,226,195,216,74,227,85,188,147,155,186,140,34,253,190,155,48,200,124,216,13,124,68,199,50,120,14,153,247,26,153,239,103,21,26,248,174,171,144,183,121,155,159,216,83,202,171,251,103,24,176,39,61,195,254,199,172,127,227,155,207,218,231,186,125,234,104,35,222,0,36,186,30,75,25,100,234,97,123,251,177,219,14,22,204,29,171,114,109,207,69,172,86,251,253,212,223,161,191,118,121,202,241,10,121,125,121,161,104,182,176,174,93,238,219,106,252,82,97,214,212,129,186,148,15,39,168,91,
+233,57,113,182,127,112,29,11,1,69,61,131,4,248,139,176,122,171,27,108,47,227,236,179,170,146,29,205,229,240,125,124,218,178,159,142,76,172,149,57,244,204,26,233,198,106,160,93,43,41,142,235,106,196,179,171,200,190,205,228,165,190,112,69,62,74,158,201,118,55,15,238,54,173,201,233,11,177,75,45,78,167,228,229,107,33,168,206,6,28,103,185,249,252,67,211,14,159,154,251,167,152,32,205,125,21,158,194,153,11,24,163,252,227,255,136,152,76,158,81,47,219,29,58,22,187,222,224,186,65,94,156,46,238,242,94,170,223,60,38,65,96,110,87,179,188,167,127,141,151,115,172,142,177,179,155,107,255,240,124,137,92,210,151,75,148,227,122,16,241,87,241,52,222,48,158,139,14,193,150,200,18,34,248,124,237,185,13,164,186,153,208,170,68,189,102,20,204,217,233,101,16,173,111,45,53,223,229,21,7,141,29,172,25,119,151,93,126,187,119,51,70,243,59,215,74,147,89,148,233,190,255,52,106,177,236,59,247,234,41,116,255,253,101,90,11,125,30,224,32,210,164,91,61,142,242,
+45,91,25,191,131,164,208,51,63,154,15,248,22,207,186,26,223,97,109,125,151,152,158,39,253,216,23,235,207,202,153,213,19,172,1,237,135,198,49,212,50,111,108,60,101,141,236,61,76,16,117,231,46,120,106,152,60,229,148,53,127,250,176,92,38,143,197,188,193,181,29,100,158,124,236,102,91,26,115,12,133,83,182,249,253,86,74,212,74,253,41,142,99,197,121,60,157,153,212,35,124,241,254,4,156,63,77,219,53,50,14,110,88,79,31,190,219,250,125,155,179,91,89,115,161,187,141,66,3,56,94,166,190,232,86,79,27,123,250,67,246,51,209,186,106,42,207,180,107,188,153,106,215,54,89,219,52,237,26,174,83,6,214,210,149,132,57,99,133,0,64,119,218,83,188,192,185,26,162,73,0,16,197,217,125,55,119,115,147,106,216,48,214,54,205,98,6,142,245,187,210,161,236,177,119,55,231,27,67,232,235,56,14,52,251,53,187,133,188,139,233,235,130,103,184,52,21,209,204,132,125,159,58,181,206,215,234,73,161,242,214,29,95,7,222,238,80,254,222,183,154,198,43,83,43,16,
+58,151,19,21,243,67,232,49,126,114,241,246,214,213,14,19,253,212,252,154,53,234,219,151,121,66,187,51,112,62,14,135,30,113,107,224,241,111,89,166,227,117,193,223,49,41,7,156,227,67,187,205,104,248,94,109,114,15,229,94,246,138,232,237,101,80,182,170,22,175,121,231,197,32,106,173,242,76,235,80,244,178,141,117,81,214,161,126,223,209,69,237,20,125,181,188,191,244,56,39,189,111,67,217,214,99,134,185,232,229,231,212,103,179,12,190,243,181,166,181,167,47,107,131,231,134,61,10,236,15,65,20,25,65,133,104,103,190,153,247,15,254,243,56,20,125,36,213,119,238,99,21,41,201,93,12,251,52,6,226,174,67,159,21,43,203,43,12,192,190,172,90,157,166,86,199,133,233,245,254,184,220,194,91,138,22,217,157,191,134,239,205,161,207,184,123,199,124,181,110,87,186,225,92,119,90,134,57,73,227,122,241,13,130,91,45,179,104,219,121,63,67,137,52,25,158,133,249,15,134,151,237,79,136,159,199,186,187,204,171,57,162,190,113,131,145,232,103,31,40,23,106,238,140,119,247,
+94,223,29,100,75,189,203,183,223,127,85,132,222,109,6,151,169,124,125,181,233,219,235,126,207,41,251,86,193,47,161,167,121,205,60,70,102,79,103,151,171,219,252,113,201,90,11,235,36,42,184,217,151,87,133,182,185,13,182,46,227,34,81,216,184,165,125,229,197,87,227,82,17,94,72,171,52,143,143,145,184,214,183,32,22,90,184,241,129,101,39,186,244,244,34,237,126,38,146,237,189,218,252,95,50,37,74,125,41,88,62,239,143,15,105,104,220,38,59,106,49,51,235,252,148,12,205,115,216,151,113,79,43,167,214,245,3,190,219,47,243,38,75,212,60,45,210,145,203,126,72,236,46,110,227,111,31,85,122,253,254,246,157,178,223,79,190,214,184,210,154,238,237,133,204,64,240,109,118,48,35,231,160,107,173,58,53,248,171,69,232,65,245,106,191,247,163,213,86,106,143,129,86,85,150,234,109,90,242,172,66,221,221,193,19,177,123,247,194,75,107,190,221,161,224,105,2,241,82,62,127,221,88,173,159,161,63,221,242,126,14,23,110,221,94,189,220,109,111,173,239,93,235,44,21,185,
+175,99,213,98,230,234,238,22,91,206,14,109,79,30,84,233,47,207,137,92,239,254,244,236,148,214,214,161,90,147,32,147,13,128,62,125,11,55,81,56,113,221,222,99,189,21,143,0,120,69,199,170,255,231,233,248,70,218,44,159,3,69,6,187,180,77,41,110,110,98,104,0,143,89,215,199,150,100,67,32,42,6,243,191,201,220,119,224,87,178,83,225,62,224,104,9,107,237,78,104,252,89,183,185,116,130,157,119,74,172,231,24,102,201,184,26,16,187,220,93,84,167,228,145,80,193,170,221,253,116,99,52,62,241,233,245,213,192,60,176,54,238,69,81,96,159,170,103,142,57,58,54,210,7,236,236,78,239,84,247,113,243,195,99,153,251,89,25,174,138,139,13,174,45,72,136,206,220,103,221,254,172,58,61,4,224,16,231,162,159,157,190,178,203,245,37,48,15,27,246,74,197,84,245,189,42,169,231,7,91,80,228,181,205,5,110,199,205,46,223,219,221,120,121,7,252,1,214,142,158,222,190,108,6,22,108,220,144,127,18,69,63,186,199,109,122,242,4,8,205,47,156,138,43,188,153,
+137,138,105,65,237,117,96,22,238,175,174,231,252,205,210,130,159,108,197,80,138,24,48,237,161,78,1,125,82,37,47,148,113,118,43,58,106,221,75,215,153,210,242,204,250,212,122,83,32,7,125,56,119,9,191,171,243,234,66,14,157,230,246,167,197,56,102,240,149,124,120,161,72,188,184,13,240,79,186,129,36,139,183,103,159,69,70,114,141,38,98,119,187,98,205,32,25,109,149,160,91,193,249,140,117,225,217,53,40,82,14,25,223,114,163,101,82,120,51,75,47,165,76,163,255,214,53,94,124,163,147,202,219,23,56,107,174,250,79,189,153,22,1,116,224,30,64,159,63,36,108,164,228,254,135,32,137,213,241,195,8,37,193,127,81,176,33,20,62,116,159,159,213,216,255,59,142,240,223,199,37,239,199,189,168,1,225,199,201,184,128,15,185,31,95,119,133,64,101,236,219,207,5,81,226,52,136,154,168,221,98,185,100,253,245,66,58,103,236,45,31,73,8,56,184,237,80,42,167,32,107,165,26,218,154,40,137,26,89,226,239,112,181,155,14,144,30,36,203,193,216,31,21,8,142,193,
+104,121,238,184,133,154,187,43,180,95,190,186,227,218,21,192,65,74,210,98,238,15,97,48,5,236,236,4,58,56,153,34,130,255,128,6,104,104,186,218,188,252,0,63,195,25,164,166,134,155,215,171,247,132,27,96,239,197,86,61,107,25,50,186,244,27,85,159,156,39,161,220,141,30,63,89,111,41,163,139,143,59,192,110,158,3,3,97,140,37,36,190,94,247,105,209,19,225,109,31,147,241,70,253,219,177,31,146,14,149,41,169,56,76,239,57,24,218,49,214,106,42,43,186,31,33,151,202,93,213,120,4,212,103,126,58,172,150,153,108,65,248,108,184,205,177,21,107,16,253,3,254,225,106,235,92,193,36,150,143,5,104,112,76,135,159,58,254,36,18,74,60,3,85,42,142,240,16,208,16,154,247,205,61,255,115,96,184,104,79,156,213,116,179,189,194,176,114,105,195,207,176,126,208,44,236,85,102,35,18,248,93,133,153,111,64,238,191,13,46,19,107,162,247,56,104,180,222,71,150,1,5,155,108,12,160,142,26,100,128,206,71,162,223,52,140,148,124,164,197,105,70,10,116,2,204,
+102,237,122,215,3,54,97,17,141,25,146,148,238,137,145,231,229,158,168,188,129,65,233,83,236,208,230,72,80,11,166,246,85,146,189,79,44,82,47,86,125,182,37,86,62,104,50,142,133,252,234,124,171,16,52,157,234,4,50,25,45,98,200,31,92,117,148,39,176,90,193,172,183,167,163,16,162,229,199,91,82,126,106,126,137,77,3,98,32,66,241,135,72,2,48,40,229,88,30,134,140,217,124,34,204,43,165,124,252,76,12,8,217,224,12,59,155,219,138,143,60,212,219,149,154,188,80,155,70,235,139,233,212,75,200,114,95,86,146,100,247,233,177,240,95,228,144,31,213,62,42,237,98,121,144,78,98,134,68,174,242,180,41,121,124,190,68,140,74,227,63,165,19,62,255,13,222,169,149,48,161,160,78,72,109,187,20,59,68,194,174,66,67,81,233,133,176,20,213,173,223,79,118,221,238,245,250,17,158,122,99,54,62,221,248,160,133,250,111,224,193,142,179,131,56,235,148,90,101,54,123,88,43,0,85,167,88,33,27,251,237,132,226,47,117,80,170,190,44,63,43,54,143,15,96,119,
+170,215,233,103,198,113,245,163,93,24,224,7,168,171,75,251,138,70,129,255,241,244,245,28,248,29,165,210,234,207,132,3,211,6,88,20,147,17,46,198,204,219,30,113,18,102,126,24,15,228,224,235,87,79,195,118,165,82,16,248,120,254,120,154,45,62,147,12,124,208,178,9,160,157,43,43,48,141,91,131,17,168,52,35,168,78,181,184,8,128,226,175,42,146,68,177,243,62,55,43,203,55,234,51,213,153,172,22,94,110,0,144,83,214,41,2,137,147,213,184,110,112,155,61,4,74,156,255,214,93,51,170,157,194,251,164,188,116,12,127,182,86,161,194,173,17,90,231,92,40,250,188,235,147,106,27,189,241,225,53,126,42,61,27,106,69,70,71,83,174,71,157,28,193,132,136,111,200,138,47,35,123,50,50,122,25,30,67,81,103,141,71,192,232,160,151,6,162,182,149,143,140,152,207,74,170,107,191,236,43,220,8,229,49,224,82,227,62,243,219,22,190,124,24,27,234,22,250,153,157,6,197,114,55,18,67,4,252,31,15,121,108,130,113,31,62,7,86,62,115,251,201,70,70,170,125,
+224,181,224,143,30,208,132,221,239,232,76,229,66,8,200,89,191,110,73,193,79,146,245,171,52,49,23,241,235,239,57,106,24,25,200,113,16,238,182,49,244,238,16,32,149,227,35,36,190,119,102,52,122,31,208,170,69,241,226,67,235,59,46,244,252,78,246,24,75,139,34,126,244,155,246,197,9,6,116,152,199,229,64,77,195,21,235,3,235,119,230,197,253,82,236,73,150,189,56,200,192,59,158,227,33,18,102,57,216,171,113,18,249,158,89,16,135,149,32,126,190,173,52,60,219,144,50,69,175,201,5,175,206,189,189,124,34,4,197,73,160,200,237,4,117,128,61,129,12,78,214,50,58,0,180,200,135,20,60,104,231,183,125,152,127,251,156,191,157,132,92,207,246,166,241,204,110,201,86,213,41,186,58,139,126,129,189,43,14,96,138,220,112,231,254,15,199,56,199,70,191,112,36,223,14,168,194,67,62,119,53,5,124,81,235,117,1,132,131,216,104,211,71,71,61,60,201,116,57,168,43,113,87,241,113,64,162,61,91,185,246,135,162,183,166,47,209,11,25,183,113,238,114,10,0,178,
+88,190,130,217,80,155,70,130,81,101,193,119,99,59,243,168,8,1,57,128,50,63,38,181,42,23,230,246,30,201,206,247,43,149,215,217,129,241,76,213,29,136,6,140,4,117,128,161,85,3,224,153,45,252,20,110,233,193,231,146,165,183,247,131,246,186,231,197,248,51,144,55,120,15,169,77,15,210,174,229,121,11,192,57,114,130,96,163,81,196,74,201,209,7,250,41,212,192,155,242,22,147,154,84,17,22,16,43,102,112,214,67,21,103,235,226,171,63,93,177,153,2,209,16,139,229,167,12,204,234,86,15,203,217,22,17,128,124,197,70,37,177,196,239,247,157,25,9,37,115,244,1,79,13,36,181,150,139,10,236,97,36,202,190,99,28,208,230,10,179,56,223,125,115,62,3,166,168,38,74,69,175,150,185,194,67,112,103,169,159,123,40,232,243,25,21,245,139,219,170,103,161,4,73,34,147,153,8,146,164,45,237,67,61,12,87,82,101,142,200,26,156,77,82,51,62,235,67,171,32,150,35,73,37,190,122,142,86,76,88,81,11,242,60,227,45,159,168,74,5,126,26,7,37,85,108,
+17,148,130,6,207,28,181,104,204,162,54,52,212,88,86,67,54,19,199,63,145,52,124,54,159,81,67,172,250,5,194,194,169,42,50,54,89,168,123,138,241,34,233,100,114,90,183,188,215,5,72,117,242,24,145,102,50,58,78,190,35,38,208,241,226,32,112,93,159,213,128,95,106,241,122,155,4,224,133,1,213,72,56,225,67,22,8,59,91,23,237,194,68,27,247,164,84,36,109,25,136,202,209,141,7,101,255,188,150,218,120,141,3,114,13,42,185,222,227,196,25,201,205,38,197,249,72,165,225,166,2,143,190,220,152,195,224,53,209,111,26,197,86,207,227,80,99,204,70,85,49,30,229,101,143,15,255,218,74,38,124,143,151,70,248,174,106,139,52,0,47,127,225,201,11,213,127,16,45,22,147,89,216,97,202,165,47,14,107,157,59,187,167,154,251,73,84,241,160,73,171,89,151,131,17,112,99,182,187,142,99,42,217,250,240,208,160,73,17,20,99,140,254,32,242,100,23,57,29,57,156,11,105,55,226,15,182,108,11,29,104,150,18,254,172,196,104,94,235,164,153,220,164,198,61,164,
+101,51,21,21,241,168,116,79,42,121,92,17,73,74,66,210,27,75,25,112,35,76,78,167,102,105,234,6,203,234,29,192,224,223,47,215,171,132,52,193,97,25,87,116,149,151,175,125,138,164,230,120,87,228,55,178,20,129,154,50,235,89,108,106,66,35,11,190,190,146,91,83,135,58,152,31,113,15,252,66,0,153,96,72,18,96,140,139,212,170,227,207,214,144,203,136,159,198,101,171,119,180,143,241,239,123,194,1,189,177,127,29,248,113,235,145,31,32,254,204,94,23,123,198,71,200,170,240,189,119,158,220,235,71,52,52,131,2,149,16,72,149,175,133,190,73,252,250,86,224,139,89,225,245,83,205,53,246,199,233,2,69,194,211,138,96,222,122,10,74,252,82,181,59,77,24,40,113,14,51,125,17,242,202,201,172,137,74,108,233,191,10,218,112,126,5,0,75,125,182,92,219,10,28,191,211,203,215,99,160,153,139,125,108,234,60,98,185,253,210,47,12,90,241,170,244,16,100,144,25,158,9,131,118,121,229,149,11,230,90,114,141,7,60,253,103,169,201,26,91,235,35,39,147,137,152,
+82,44,169,184,79,13,125,164,97,55,108,51,164,201,221,248,183,122,236,188,21,102,12,35,77,176,104,37,60,102,5,49,185,200,202,62,3,241,174,198,189,141,88,15,223,147,1,252,226,176,116,248,96,175,254,30,202,176,219,40,20,231,187,232,150,1,107,2,94,255,22,98,183,28,32,146,70,240,53,213,28,250,72,93,155,199,185,194,218,227,215,214,153,63,61,225,10,253,163,26,187,34,96,160,128,184,219,235,118,95,67,209,166,6,106,143,144,193,10,17,250,162,233,167,215,234,191,15,91,188,19,244,249,198,133,154,28,40,216,89,26,149,195,233,113,41,211,18,140,24,108,27,252,96,184,146,4,23,204,96,126,253,245,41,243,131,167,246,35,118,202,38,194,52,69,64,177,35,8,79,228,21,197,74,242,22,220,155,25,104,0,66,13,135,27,144,175,64,66,89,26,108,102,40,54,246,171,31,17,247,160,81,143,43,252,232,248,223,19,11,52,105,216,3,214,246,4,235,69,87,211,56,19,190,146,191,62,129,240,189,7,201,15,203,130,80,74,250,105,53,123,208,70,194,84,115,
+129,146,3,226,10,20,190,30,9,18,170,11,29,252,224,228,159,243,201,16,124,38,88,192,90,136,32,160,237,155,102,255,96,182,5,121,10,43,38,52,57,184,36,135,66,225,1,140,101,224,79,218,111,154,223,79,170,138,20,100,138,151,101,141,108,101,166,45,78,98,195,12,140,25,39,2,162,199,213,37,168,115,104,170,198,116,237,158,98,138,143,112,30,229,237,21,23,66,164,29,90,80,253,82,122,55,90,71,42,12,132,36,139,2,25,7,124,34,161,205,89,80,56,125,163,104,208,193,232,81,146,208,253,183,161,28,152,33,159,228,122,67,88,51,171,118,49,8,168,82,117,17,37,219,21,114,178,117,78,220,143,85,238,210,223,91,125,200,120,26,37,56,222,211,204,251,236,212,214,79,136,15,109,115,127,133,133,162,218,208,231,148,129,7,194,2,236,213,79,232,173,226,254,161,220,6,117,204,248,185,9,7,241,39,177,210,131,178,88,187,86,16,18,214,179,249,137,7,244,78,47,226,246,160,172,212,224,59,65,20,81,140,68,2,44,81,48,154,177,106,17,222,96,208,172,234,
+143,93,73,45,24,179,73,51,187,208,103,35,87,112,128,89,93,122,214,17,161,14,45,29,118,115,196,169,87,55,49,176,186,206,240,53,172,63,28,95,14,115,95,67,84,129,32,204,159,66,167,219,51,245,73,172,69,183,43,200,25,97,17,232,62,166,162,153,30,213,76,175,135,109,250,66,137,117,146,83,141,134,25,153,185,31,199,157,77,20,182,136,192,150,253,20,178,225,209,15,236,222,34,145,4,18,122,38,223,122,246,32,35,227,192,52,232,135,212,193,141,17,63,78,183,217,4,56,59,146,190,77,185,129,46,204,103,7,11,124,42,62,42,206,196,156,195,169,212,5,165,1,73,152,50,62,77,189,175,55,255,18,75,102,62,192,223,90,28,88,69,96,35,107,41,200,53,231,150,119,81,97,201,152,30,241,0,108,16,163,45,109,229,153,224,31,89,107,38,19,18,216,161,1,13,68,12,74,213,212,245,12,45,29,235,165,175,196,199,246,186,57,193,79,176,21,145,7,60,115,254,173,32,133,116,51,134,104,46,62,250,113,4,83,76,39,145,134,121,190,92,109,236,41,32,204,
+54,15,32,127,176,20,165,62,247,119,223,77,173,13,70,42,106,106,44,51,126,101,166,66,103,210,35,245,40,61,150,3,17,226,149,144,236,213,174,237,8,18,197,50,153,12,5,250,148,231,199,85,38,218,145,103,243,226,48,79,90,79,45,212,81,137,62,63,180,176,108,132,188,214,226,235,179,183,185,65,38,140,71,64,29,2,213,145,186,154,237,136,49,39,198,15,198,179,221,245,2,186,8,186,53,156,159,63,197,251,37,177,174,245,21,175,140,254,125,45,250,54,148,252,228,103,18,179,162,239,81,167,32,169,98,13,73,144,34,186,151,96,117,211,164,30,188,246,224,79,14,127,102,87,94,239,241,217,128,251,135,28,81,178,130,7,168,195,213,109,37,121,179,10,52,246,213,188,198,214,174,28,0,18,39,121,139,79,190,85,131,49,176,127,237,172,51,183,150,136,230,196,160,67,32,230,66,178,182,36,68,33,167,132,8,214,102,219,125,144,167,73,138,27,173,52,57,8,110,27,107,181,45,187,81,206,138,211,38,194,14,85,240,110,203,165,54,9,139,163,4,39,186,87,181,211,
+2,160,179,43,143,49,159,21,229,152,243,83,196,39,204,140,81,228,4,107,142,108,29,198,202,51,143,143,207,127,176,39,156,178,214,104,238,70,159,119,36,153,222,216,42,17,85,223,220,112,210,40,197,212,176,100,99,43,81,79,183,169,33,13,34,228,125,176,82,207,12,165,24,226,180,168,48,117,12,115,97,118,153,217,13,236,253,50,83,10,197,62,53,182,228,160,162,9,204,158,47,205,90,116,101,202,246,197,64,186,215,75,7,158,41,42,23,126,113,244,15,27,94,62,28,163,80,254,183,183,55,31,1,7,185,31,15,106,106,243,2,115,139,7,69,81,230,45,21,162,57,248,94,196,112,8,179,42,169,92,93,36,37,20,16,120,182,139,1,56,72,89,236,137,174,218,185,161,206,197,128,199,8,171,24,250,225,55,128,93,158,1,176,189,208,229,158,25,93,153,187,90,11,128,42,228,143,217,9,144,253,84,112,132,191,155,31,46,100,53,201,32,84,63,44,53,138,251,118,36,74,176,162,193,120,137,243,147,165,89,81,209,210,126,126,206,54,32,66,194,7,32,216,217,238,230,
+245,226,0,37,175,118,185,242,13,5,60,179,74,99,240,213,8,53,117,24,80,205,161,32,36,211,255,240,51,115,113,181,11,174,254,113,113,42,249,25,62,5,195,255,219,199,118,191,62,198,60,199,63,26,105,21,26,84,27,249,19,140,100,115,246,80,157,129,210,248,32,193,144,212,71,131,80,64,126,172,171,117,98,57,108,196,44,155,179,96,46,84,21,27,152,81,119,68,85,96,70,57,200,68,116,94,50,4,36,19,51,34,86,32,169,9,138,248,123,135,57,170,185,33,173,37,216,167,32,131,226,97,95,163,3,70,34,67,137,39,155,234,218,154,200,41,252,104,142,223,104,47,248,160,148,235,5,174,22,94,106,124,48,69,247,73,142,27,148,200,95,35,3,19,96,191,75,9,80,89,199,247,3,56,60,233,171,196,184,37,94,23,17,197,21,96,85,218,0,208,204,114,11,29,60,67,203,30,207,17,203,95,16,52,168,22,221,171,73,231,130,107,137,18,203,147,150,233,144,63,149,0,173,247,50,153,22,180,24,253,103,153,65,138,150,48,185,178,170,20,125,176,42,70,60,72,
+237,10,8,62,223,211,106,70,199,163,196,76,157,138,156,46,143,214,0,201,182,135,187,215,209,14,120,247,234,60,232,212,149,152,218,132,155,84,140,91,10,158,255,31,127,58,245,28,18,0,36,65,249,156,222,2,10,65,229,138,68,6,76,240,31,1,132,103,193,12,91,28,236,184,90,41,35,159,246,205,11,239,24,96,176,39,229,140,174,230,190,106,73,151,252,11,189,98,119,95,159,198,137,153,27,158,67,163,218,132,246,40,114,112,127,178,197,127,213,228,171,155,170,101,171,155,238,62,17,5,149,180,10,122,148,189,180,71,255,193,185,55,68,163,69,70,70,225,241,49,30,0,75,138,80,148,51,93,21,164,185,6,158,110,132,47,254,26,29,83,171,124,44,48,238,81,216,240,248,126,140,26,50,186,179,131,98,227,212,98,211,94,158,155,226,32,133,24,85,24,23,206,37,181,81,118,118,240,100,10,128,179,115,131,189,68,69,71,153,209,63,63,5,223,82,32,63,232,57,63,252,5,211,163,31,228,211,170,32,32,160,206,70,76,95,59,55,174,134,192,70,215,168,13,232,152,
+95,3,156,31,201,239,225,239,8,9,195,12,185,35,228,57,53,142,149,159,11,67,142,244,217,179,161,14,158,130,116,96,132,15,71,63,119,17,185,65,106,0,254,109,213,7,12,179,43,49,204,249,192,123,229,109,152,252,124,12,38,15,113,214,197,252,160,118,4,64,219,147,6,140,135,171,65,176,47,190,230,9,217,233,116,107,148,50,102,95,248,241,96,125,88,169,239,134,147,159,45,127,13,199,238,229,255,26,14,245,216,140,65,166,60,57,13,229,234,228,31,73,225,18,83,83,207,84,62,62,44,14,55,140,185,4,251,95,199,138,56,104,179,229,202,58,133,251,151,74,178,168,239,50,28,17,101,202,34,9,188,188,190,107,221,74,183,107,210,143,47,71,43,158,102,214,165,53,86,83,50,102,46,91,158,247,194,38,228,19,4,42,62,72,252,181,154,54,106,240,107,53,192,26,252,181,154,22,95,15,240,155,235,173,235,139,180,252,213,27,245,11,222,88,114,194,78,195,45,124,171,250,78,53,211,29,4,144,164,135,135,199,23,138,228,160,197,254,135,175,188,6,193,227,66,198,
+104,209,39,219,41,219,137,35,49,97,16,32,36,80,248,62,232,8,153,172,89,255,55,64,193,191,97,140,68,5,39,191,102,99,126,196,254,154,205,11,12,74,190,168,40,65,44,129,96,56,241,201,174,222,203,231,71,1,50,2,73,168,227,253,146,216,67,234,61,15,207,124,186,137,218,212,53,58,207,147,87,237,211,165,134,92,104,71,33,4,216,238,233,114,255,158,255,0,195,4,99,63,50,113,141,88,250,181,164,246,155,252,109,111,182,136,229,222,59,47,236,165,49,251,209,8,255,0,189,160,196,75,180,240,49,217,196,207,142,94,127,63,97,142,217,247,79,102,95,40,168,232,229,62,188,133,39,45,125,41,113,125,98,206,85,121,36,80,72,123,140,144,180,161,149,66,14,216,97,238,10,19,132,29,230,174,48,88,216,97,238,10,83,129,29,230,71,251,180,255,106,167,144,245,247,99,242,51,69,128,71,12,74,36,254,217,65,65,194,73,160,44,156,90,31,10,211,35,238,166,213,219,202,65,38,86,119,83,76,112,146,48,226,154,204,164,205,218,220,13,101,243,231,134,134,84,
+145,31,47,116,97,183,249,188,203,13,236,54,76,88,110,58,59,83,81,200,85,70,127,4,163,24,102,108,46,3,146,135,22,31,229,227,166,148,103,78,65,126,86,38,155,144,116,233,21,62,149,56,252,146,174,75,252,102,168,62,94,139,205,162,168,173,210,231,207,1,48,59,239,127,62,78,32,94,149,238,0,122,235,66,194,102,211,231,182,156,8,10,68,10,172,226,122,88,153,155,121,139,110,4,141,246,129,192,131,114,120,254,120,187,106,26,200,30,68,19,226,112,190,169,244,211,16,16,135,19,114,171,90,27,255,120,116,209,190,164,130,126,216,183,90,101,124,135,201,154,146,239,53,110,228,222,185,6,135,146,7,144,241,126,212,41,49,195,63,209,185,158,254,68,199,216,254,19,29,222,227,159,232,224,235,119,209,25,58,39,185,25,85,29,81,217,90,239,22,131,250,141,134,115,195,174,115,87,29,15,236,58,119,213,185,193,174,243,5,171,14,130,225,168,79,175,121,161,36,115,254,14,213,101,53,241,169,215,202,159,64,174,248,39,167,46,7,7,44,63,74,50,73,111,188,92,
+246,224,99,154,174,132,119,99,62,24,4,133,249,173,240,76,184,34,219,36,129,23,78,105,17,77,106,34,133,92,178,239,149,221,128,23,85,38,35,101,213,134,206,40,237,113,126,9,217,97,195,143,89,9,125,162,230,208,123,31,206,126,174,215,124,3,124,70,34,251,9,70,162,145,124,32,53,166,157,86,141,95,248,176,63,66,152,47,119,195,188,65,64,250,4,14,170,164,14,77,105,190,129,55,198,254,176,164,104,236,16,201,202,22,162,157,239,241,108,21,102,9,126,70,60,137,32,108,219,41,170,58,159,209,245,79,80,15,255,128,205,101,251,165,130,249,140,182,48,248,166,1,1,231,98,194,57,193,94,22,227,30,9,53,26,206,56,244,95,121,139,246,16,98,240,76,227,224,166,48,179,50,121,165,193,77,223,121,2,150,24,40,31,181,232,119,171,90,58,171,102,120,222,118,216,236,202,247,180,1,147,49,120,94,135,239,125,158,241,185,154,96,183,180,42,131,169,25,93,140,179,78,124,12,76,42,82,180,110,95,241,99,62,255,139,83,77,181,50,239,228,71,135,249,50,19,
+142,67,115,44,66,61,52,144,131,201,211,176,47,143,195,151,35,138,246,49,33,144,104,46,187,175,105,197,200,88,32,230,93,232,11,202,252,109,227,67,29,78,139,17,100,152,120,46,79,148,55,86,250,199,173,183,237,247,108,176,166,65,185,185,61,84,103,191,247,81,227,227,138,57,15,90,22,202,132,241,35,242,186,54,13,145,146,90,192,179,202,125,251,74,76,154,25,32,205,124,76,234,252,31,77,154,214,29,244,186,48,36,157,179,213,138,81,82,221,135,47,75,141,172,8,243,172,127,214,159,201,84,68,71,99,66,28,239,203,235,131,154,105,228,134,93,46,236,29,100,26,218,29,100,39,101,128,51,81,29,197,171,207,85,58,245,65,7,162,118,138,4,43,10,2,128,233,167,171,221,131,227,215,134,183,52,25,35,2,140,86,174,142,234,99,173,49,37,196,124,227,190,217,109,139,127,69,114,240,51,57,96,56,73,63,203,59,207,72,107,245,176,95,115,252,31,207,246,119,158,177,127,188,164,252,29,7,98,32,56,152,74,37,242,85,21,139,76,103,54,167,109,146,216,51,189,
+233,97,145,96,47,252,96,178,2,46,232,204,55,56,157,201,252,108,240,212,125,196,114,120,190,223,116,118,4,255,151,59,252,59,119,208,16,74,242,155,206,144,80,236,55,157,177,177,226,123,58,3,226,225,112,199,159,152,163,128,126,78,1,211,240,241,69,247,85,211,252,38,179,192,4,66,4,95,240,90,169,37,12,127,11,115,5,192,244,88,196,82,0,27,230,236,93,97,80,119,156,66,57,81,225,158,38,181,240,65,247,163,114,100,45,165,191,0,122,89,107,154,22,59,224,239,167,208,87,252,5,68,16,31,44,29,38,22,110,95,123,177,214,244,7,7,218,41,72,227,160,156,131,250,136,146,184,30,1,9,17,118,158,187,242,240,102,104,44,109,78,14,32,15,234,223,60,214,250,209,166,175,56,59,94,56,85,100,62,228,144,20,179,148,237,29,59,156,196,39,127,78,235,70,239,172,37,40,73,45,236,134,161,156,32,153,200,174,5,18,237,215,126,152,21,195,241,252,0,86,20,122,232,164,171,131,70,181,202,104,107,135,29,79,27,223,130,161,133,39,182,60,122,227,207,101,
+148,60,207,8,167,162,100,51,70,153,70,100,226,80,170,176,147,45,31,90,191,68,123,63,115,126,137,166,132,104,82,173,105,108,193,192,146,129,13,234,50,150,89,140,168,87,48,167,252,126,77,49,163,40,66,43,16,255,48,176,62,201,203,155,26,66,26,126,67,56,33,94,220,122,170,209,31,175,226,31,163,32,9,249,255,112,118,6,255,112,6,137,105,202,218,246,117,12,69,58,123,216,142,130,150,222,37,120,206,235,68,155,94,82,245,2,74,227,135,192,159,30,5,250,130,31,209,22,126,245,255,25,245,180,188,186,118,61,201,180,202,21,175,166,108,40,191,120,114,61,67,163,112,194,178,4,187,82,232,46,75,176,43,101,238,178,148,140,104,62,60,210,205,168,192,228,182,182,197,129,113,42,178,254,60,201,97,251,240,83,54,191,233,237,45,146,186,167,55,84,144,152,248,126,55,99,33,171,170,175,46,91,3,193,33,41,154,90,71,240,98,57,173,139,156,219,243,87,94,120,26,37,80,113,66,98,5,52,74,39,72,246,63,219,163,27,135,47,230,235,54,169,89,26,73,75,
+79,96,145,50,51,167,232,58,222,251,80,163,127,173,99,25,108,124,16,214,216,164,248,20,104,136,37,113,20,84,137,198,133,146,215,253,8,210,226,36,181,71,178,132,103,68,55,255,211,159,174,235,162,210,72,39,22,233,37,225,252,237,197,230,188,189,35,224,4,44,55,98,227,61,150,234,42,127,119,20,7,163,80,81,105,9,241,54,170,45,107,195,83,142,132,106,187,110,216,85,97,233,9,64,178,218,173,218,127,65,13,66,253,5,53,93,20,121,255,58,228,82,178,138,247,208,81,181,94,31,228,169,214,213,80,16,150,169,123,30,27,133,214,53,118,135,142,243,143,120,89,65,150,24,38,248,153,191,196,194,51,62,39,88,219,199,140,31,79,88,174,236,173,49,208,183,88,147,245,134,244,149,96,226,244,149,96,86,72,3,33,63,37,214,18,191,54,241,217,252,138,24,188,219,137,3,52,238,22,19,148,36,204,80,53,215,213,22,155,75,7,42,163,159,73,157,254,111,21,167,167,90,101,44,38,78,136,223,45,235,154,103,255,90,150,120,54,84,242,228,23,78,245,245,209,107,
+31,117,179,131,52,91,130,250,175,124,246,118,207,103,164,11,69,72,5,214,54,209,151,84,63,52,205,212,247,71,207,11,212,89,219,72,116,170,111,19,138,136,158,65,30,110,101,173,2,177,173,98,110,4,41,83,191,20,17,243,132,158,191,34,121,6,143,82,11,224,42,26,21,140,171,88,183,104,73,186,142,88,135,104,140,215,94,108,182,160,158,215,243,105,4,35,100,20,73,103,121,224,217,192,216,48,26,193,36,36,109,97,185,203,43,129,14,69,73,6,76,71,34,47,71,71,70,165,240,8,27,47,163,112,216,199,98,160,49,215,72,238,60,226,213,147,136,128,252,109,145,186,93,206,111,139,212,30,1,191,45,18,202,88,43,193,105,108,230,59,13,32,201,111,115,132,148,96,126,77,204,248,139,141,96,30,117,135,211,127,248,149,234,14,39,24,12,241,202,31,24,232,12,244,111,115,196,184,195,9,102,211,239,186,30,204,38,191,184,247,219,28,249,97,62,221,155,163,92,15,248,109,142,254,151,79,138,9,212,163,72,40,200,65,48,46,200,63,39,67,97,248,219,182,80,112,
+245,112,6,255,149,52,140,160,110,139,3,94,76,170,79,34,27,7,235,212,3,104,86,223,189,239,1,246,190,251,106,91,226,107,136,251,11,102,73,46,68,19,193,159,72,30,138,191,159,152,18,60,113,239,209,240,182,147,25,107,101,109,145,70,17,105,235,227,53,66,178,121,204,235,197,225,31,119,44,167,42,127,11,123,143,21,242,49,121,37,146,113,1,193,170,4,229,150,186,195,160,220,88,134,120,7,138,213,204,38,199,9,18,210,93,186,96,231,98,220,165,171,48,189,189,255,20,245,26,21,186,13,192,47,175,249,168,83,201,10,136,124,174,46,254,122,25,54,59,143,182,169,209,237,7,167,58,1,124,147,29,254,141,171,177,49,78,79,212,199,156,185,225,173,190,173,36,242,118,226,115,30,49,87,25,6,52,128,203,48,98,188,160,52,243,131,50,103,149,195,121,69,30,116,247,141,135,246,214,238,108,1,56,96,77,19,6,193,84,33,202,15,210,86,26,69,157,87,26,59,78,93,36,224,79,115,33,168,211,26,19,100,155,240,195,95,145,100,0,254,138,164,15,68,144,38,
+100,36,112,70,104,173,71,2,107,82,9,146,10,82,176,88,145,77,103,109,222,151,196,43,204,175,171,175,196,187,173,32,206,161,92,195,214,12,195,143,103,187,147,197,8,160,216,114,143,235,205,115,220,45,78,221,65,132,165,253,129,72,84,255,3,145,67,115,7,209,168,235,177,140,85,41,227,208,130,212,161,158,239,205,55,82,13,252,54,223,74,2,0,52,36,190,199,157,50,90,237,252,240,86,203,189,83,254,220,47,151,130,105,123,192,243,52,163,211,146,51,81,152,36,9,15,92,18,112,189,65,71,201,28,222,136,76,15,128,250,108,183,38,204,100,125,165,103,190,164,27,58,45,81,21,107,245,161,179,179,232,244,86,124,92,197,228,62,58,99,70,28,207,162,192,109,43,63,236,18,146,109,252,211,170,121,246,174,85,224,241,168,38,167,44,158,62,189,211,114,16,109,212,241,132,97,202,143,132,81,73,60,160,250,77,121,205,188,212,244,227,232,79,228,73,150,207,120,25,196,69,106,173,126,45,68,112,234,194,82,144,246,166,161,182,132,237,253,74,56,51,91,232,188,168,210,
+114,71,211,39,107,83,175,215,114,12,76,165,155,233,194,78,53,188,75,21,236,84,174,187,84,193,78,133,191,75,21,236,84,142,5,44,85,176,83,89,239,82,85,152,53,221,111,144,116,6,20,80,10,128,52,46,97,121,234,153,122,240,62,80,55,182,12,40,184,99,55,120,97,220,237,165,36,121,86,213,195,193,104,174,146,202,162,48,106,56,92,246,242,53,145,116,19,177,16,109,67,164,147,51,171,61,16,120,8,248,26,107,40,42,77,176,55,142,181,81,173,132,170,52,123,47,205,12,33,135,168,29,103,220,192,52,249,34,6,214,166,98,63,46,14,175,152,213,180,232,76,146,200,159,199,156,216,227,253,57,170,89,91,26,238,4,12,186,83,201,99,216,228,83,99,254,217,10,219,19,100,203,167,76,171,241,68,12,209,34,211,169,82,44,111,204,113,118,151,36,14,228,54,125,157,8,8,11,63,102,121,157,123,39,177,153,81,80,50,129,0,30,238,70,245,194,164,222,141,202,107,62,232,127,141,10,175,86,36,99,231,206,0,245,162,234,156,146,141,37,174,144,52,94,210,36,
+166,156,52,236,48,236,202,90,234,109,50,157,178,77,201,195,37,154,152,218,139,193,211,140,215,211,8,216,238,186,114,27,113,190,22,48,9,155,255,3,7,187,56,120,230,77,246,234,164,223,45,54,123,9,56,168,41,248,152,41,132,243,233,252,43,110,208,7,76,232,218,85,62,35,215,26,69,254,184,198,77,157,200,210,184,59,0,242,99,124,84,123,47,76,239,90,27,68,58,224,58,191,48,97,183,194,221,229,10,118,43,154,86,107,62,97,0,240,185,253,43,80,175,231,96,244,233,118,10,153,12,95,112,92,156,26,244,133,66,2,1,109,177,0,197,79,186,55,71,238,224,171,221,171,193,4,7,126,17,2,84,31,210,1,240,153,2,231,59,46,132,200,137,30,65,201,23,66,41,153,39,255,163,183,94,146,174,37,156,159,10,82,115,122,228,239,6,5,168,180,5,130,226,164,28,139,181,76,149,254,247,230,26,102,94,1,31,210,12,245,206,245,23,198,173,127,33,35,197,0,253,57,78,254,93,53,84,227,154,191,171,134,97,4,22,218,6,53,15,70,166,42,200,83,192,244,
+161,166,225,24,123,95,90,52,223,143,154,61,215,218,215,116,84,88,236,50,204,12,209,111,158,141,254,229,89,206,244,151,94,50,227,229,151,94,34,173,236,151,94,143,121,129,94,44,23,250,34,246,98,84,51,227,8,235,12,112,244,187,156,23,16,254,45,231,105,227,247,229,60,240,154,30,55,2,96,160,146,239,88,0,137,82,181,137,114,42,57,70,130,33,214,191,203,172,144,172,52,78,8,141,9,102,112,26,199,207,54,236,49,171,55,67,107,222,13,67,88,79,71,207,179,40,28,16,115,73,34,154,16,191,199,66,20,249,47,22,202,53,191,177,144,54,95,143,185,207,177,241,68,239,34,84,252,96,95,173,247,142,141,138,2,77,159,164,104,45,23,99,15,148,36,140,244,168,94,155,21,197,234,239,210,112,108,131,166,65,51,155,143,35,150,75,238,229,82,116,175,38,222,203,37,148,88,206,77,90,248,40,157,88,254,88,71,53,178,125,113,216,226,98,222,99,96,181,145,89,163,232,48,171,194,119,88,193,172,34,185,190,165,130,188,250,8,27,115,103,77,176,181,12,35,13,
+254,188,174,39,37,24,151,149,249,62,48,25,48,187,79,99,188,167,50,172,162,28,252,140,199,212,76,180,249,132,124,240,202,216,244,81,16,82,36,88,183,52,72,240,129,66,201,178,80,18,12,192,236,26,37,67,146,164,134,207,152,229,90,94,24,14,120,193,123,201,36,229,140,166,87,115,223,30,35,201,139,255,14,133,131,134,169,125,77,119,78,26,177,144,176,122,88,4,58,197,53,243,150,34,141,168,244,168,18,180,204,226,185,67,54,171,135,175,169,56,137,1,112,204,125,160,105,116,224,16,47,239,81,107,36,156,218,187,130,164,197,49,196,165,185,248,143,255,214,101,40,168,147,220,43,108,55,183,97,237,87,178,27,136,138,30,254,20,222,55,136,62,229,94,7,217,112,77,119,213,100,13,185,170,247,117,176,178,40,129,235,106,254,221,87,220,0,150,242,119,197,45,174,89,254,174,184,25,129,191,5,198,52,148,203,235,73,54,226,2,193,13,164,162,207,56,38,228,140,76,153,225,153,245,6,9,152,202,119,65,238,139,19,20,113,191,186,8,84,95,250,159,235,108,72,248,
+231,39,236,196,61,61,236,192,7,45,128,84,35,95,118,115,101,106,121,30,44,48,206,65,226,55,245,110,177,211,140,167,7,199,53,117,102,108,106,251,140,86,21,152,29,124,21,108,170,141,187,152,211,138,183,138,112,178,26,68,194,50,36,69,117,191,63,157,13,34,82,226,153,57,255,226,218,59,233,47,174,5,137,150,69,103,116,82,4,168,209,52,145,203,9,69,223,22,167,177,114,245,148,15,9,107,82,199,157,251,206,174,156,249,252,58,57,34,86,101,169,97,196,213,145,223,121,156,39,73,196,178,21,103,229,9,167,219,21,26,69,226,198,145,36,244,47,24,255,238,78,114,31,21,107,138,44,108,207,95,34,181,142,79,255,208,54,58,99,19,41,133,109,151,6,254,136,178,76,250,127,137,82,133,154,146,187,56,146,240,96,213,114,144,50,177,193,146,174,58,126,144,4,82,73,56,30,105,206,27,185,60,92,25,207,93,239,194,247,199,198,76,43,71,84,64,42,96,178,217,62,74,110,160,167,231,98,37,76,124,208,123,30,82,222,202,134,6,68,148,248,200,205,3,20,197,
+131,223,199,42,2,2,141,4,32,8,109,90,217,127,170,34,122,86,53,110,200,122,186,7,56,247,133,39,12,70,211,213,85,205,185,4,62,44,189,111,240,65,3,212,23,221,189,190,2,149,127,203,109,50,19,29,0,248,171,182,235,223,237,159,137,173,107,62,188,128,0,212,49,253,31,39,252,254,232,37,236,143,74,119,5,132,228,137,0,231,47,240,55,165,193,147,199,231,89,71,70,250,17,108,85,164,68,121,176,217,133,190,195,126,95,161,103,62,102,77,95,95,253,64,255,160,243,84,54,210,86,69,17,242,231,100,159,199,108,48,110,198,234,161,45,237,245,157,166,165,161,240,20,182,241,149,83,73,216,98,250,253,127,134,237,90,187,74,5,57,92,14,214,137,179,179,223,115,117,132,35,228,224,192,26,167,240,146,181,182,73,206,240,72,95,218,156,0,2,74,255,239,186,91,74,33,0,160,179,247,108,69,30,127,215,233,94,254,214,233,144,43,152,97,247,74,94,8,51,236,14,86,34,204,176,59,194,162,69,116,112,69,23,3,167,223,182,254,97,185,31,140,233,128,110,85,
+252,55,178,148,78,19,107,141,186,250,217,184,4,100,113,81,190,210,60,2,123,225,182,124,236,105,154,104,221,44,23,160,196,110,217,246,235,115,62,77,8,18,200,139,226,89,211,53,142,105,215,32,28,118,62,135,31,105,248,52,130,87,156,53,37,245,189,196,241,193,30,78,117,232,89,60,50,5,98,68,92,207,168,226,210,10,102,25,26,22,163,88,173,10,82,137,5,59,41,95,102,21,53,195,73,91,40,179,221,183,33,16,255,182,33,96,53,120,145,154,110,7,70,126,145,60,162,213,218,64,187,190,102,146,102,150,226,200,171,41,140,13,78,7,241,236,255,244,227,181,191,126,220,13,108,75,86,20,68,18,148,69,145,161,18,31,252,254,91,182,19,17,255,150,237,130,188,160,121,72,160,95,39,200,42,35,215,59,153,10,70,152,97,46,43,254,102,34,244,110,156,194,88,100,87,2,85,233,193,170,120,254,77,129,2,71,232,233,78,177,228,9,48,176,5,52,151,255,255,227,91,183,95,223,2,209,84,235,194,247,61,93,163,145,113,1,108,4,176,124,222,75,114,42,87,244,
+126,47,201,131,77,218,184,69,200,247,166,198,195,103,234,224,22,56,216,171,68,216,22,169,219,102,51,76,237,104,46,170,33,19,235,134,136,16,16,144,85,55,236,189,169,213,212,7,80,122,95,181,75,3,127,171,118,222,215,250,239,170,221,195,162,255,187,106,7,54,112,247,85,59,189,207,205,180,190,247,43,79,13,116,82,248,25,8,105,16,50,197,47,220,62,30,76,119,184,225,229,97,81,206,138,87,218,147,234,189,135,150,232,121,70,57,172,78,43,163,152,235,69,0,206,190,79,130,96,252,198,215,143,7,12,53,149,111,66,68,182,60,245,13,39,183,228,78,136,193,20,58,193,16,210,134,175,219,67,39,113,176,164,222,63,210,82,94,110,84,196,156,154,196,167,84,1,81,233,51,86,119,61,56,111,255,106,245,209,240,175,86,255,216,211,105,177,53,131,238,149,219,94,121,190,100,182,244,20,30,74,242,50,87,228,139,64,72,221,23,136,223,36,141,248,167,89,91,228,146,106,110,69,93,24,84,143,132,9,231,132,67,243,183,95,66,245,187,107,221,101,11,118,173,23,88,
+182,184,92,220,232,109,41,205,229,248,159,1,180,185,2,72,96,209,114,210,254,68,11,146,76,8,223,57,10,29,67,55,33,52,121,161,83,212,48,5,16,208,90,20,139,84,210,237,15,73,248,196,80,173,235,112,50,36,208,129,151,138,234,153,247,50,36,74,152,7,252,15,118,61,117,120,27,196,217,228,51,116,181,13,114,136,122,7,103,133,7,138,235,77,208,196,106,232,209,50,145,101,134,164,23,187,128,139,126,63,85,237,170,77,16,109,122,228,129,156,154,255,170,151,190,203,21,52,147,143,102,166,2,255,92,203,183,9,62,79,224,155,77,177,97,97,74,81,19,79,92,174,195,150,193,7,92,168,118,146,223,121,43,164,18,149,7,129,32,132,117,220,67,224,197,86,227,239,167,116,208,51,93,105,222,200,30,27,178,79,30,107,17,164,131,173,176,196,230,217,8,255,224,252,200,167,72,60,47,245,184,39,213,80,55,25,173,58,74,99,67,219,40,182,70,193,203,53,18,107,131,115,129,225,0,145,102,78,254,185,149,12,193,52,20,190,51,49,34,234,215,168,2,34,126,105,
+88,114,251,96,26,186,51,123,242,7,1,14,119,8,136,109,55,18,1,104,83,67,181,248,244,187,89,109,144,181,215,203,125,9,46,249,87,91,49,241,127,181,21,152,252,171,173,218,162,191,218,10,210,254,213,86,111,233,191,218,106,248,254,87,91,101,229,127,181,213,23,244,87,91,117,164,127,181,149,98,252,87,91,213,54,127,177,16,150,214,223,218,202,66,253,171,173,32,212,95,109,5,146,254,106,43,9,242,175,182,66,106,254,167,182,154,254,213,86,125,220,95,109,21,251,159,218,74,97,250,171,173,240,225,191,218,74,187,250,171,173,156,129,191,218,234,81,140,146,184,244,35,6,200,144,108,78,69,103,160,84,26,103,150,31,242,176,11,12,189,95,227,48,144,144,228,98,242,161,22,147,104,194,159,145,229,207,156,76,10,130,111,220,210,55,212,92,189,32,32,215,10,131,134,162,178,107,50,212,146,217,33,113,105,60,11,101,169,82,14,76,204,232,123,219,65,148,40,35,136,174,66,152,90,225,195,115,241,171,247,168,131,69,232,235,30,2,225,12,120,185,135,64,56,3,70,
+121,193,78,57,89,44,198,5,152,14,12,162,66,31,137,5,0,147,62,71,179,93,16,32,146,207,18,138,129,127,118,167,41,240,25,93,34,229,98,104,73,202,179,15,234,45,198,207,141,178,71,213,162,251,77,44,247,21,225,33,104,60,136,5,253,141,38,250,217,202,251,8,185,180,26,149,127,47,224,156,184,91,81,126,67,142,24,71,132,88,55,90,114,130,167,101,101,165,88,209,15,189,100,88,98,75,17,83,7,75,127,19,199,73,61,255,42,52,180,128,134,191,111,105,66,157,255,130,93,184,73,0,24,252,90,18,31,230,5,123,51,167,57,217,85,160,160,40,118,67,53,140,119,86,138,154,138,68,153,10,211,61,69,184,208,42,247,170,175,49,85,5,187,145,229,168,55,3,250,145,58,177,141,43,229,224,216,90,51,33,1,236,125,209,159,24,148,2,106,216,190,84,69,50,124,174,38,36,228,52,99,187,10,23,173,131,151,136,106,103,106,206,228,32,13,192,92,76,8,103,179,149,134,10,167,213,94,54,104,11,9,131,157,47,249,155,29,164,117,243,31,116,55,204,254,69,
+16,96,33,252,111,145,8,230,154,244,236,53,125,33,212,9,209,137,116,216,155,251,148,180,68,249,26,191,170,243,218,39,220,230,107,249,47,10,86,255,2,23,17,134,192,22,234,252,76,25,22,173,124,228,224,161,243,249,255,26,255,207,146,73,188,45,121,141,229,31,209,208,201,130,0,176,128,233,215,124,232,217,18,38,192,249,87,183,129,198,100,134,31,239,102,169,98,120,180,75,68,94,207,239,246,33,219,241,111,251,16,230,9,154,185,138,2,49,137,250,138,13,30,157,196,62,167,118,99,86,40,227,176,8,239,149,106,47,42,237,230,204,139,37,89,239,218,201,206,30,122,253,247,250,128,187,151,208,46,151,84,169,136,158,38,173,183,121,89,139,209,166,114,204,39,221,172,40,165,53,232,120,230,223,246,160,118,242,111,123,16,96,94,19,8,250,39,13,255,0,248,99,24,17,3,40,176,181,141,75,25,173,193,146,85,216,213,35,81,114,249,93,93,39,224,234,144,187,24,122,71,1,146,103,150,24,232,232,164,71,137,220,123,227,51,159,254,255,222,7,20,251,109,115,130,113,
+206,111,155,3,46,190,127,219,156,195,50,135,155,220,215,253,181,74,203,47,54,176,95,192,223,6,160,229,159,110,40,136,214,191,13,64,255,254,103,3,80,104,251,39,34,102,222,223,6,32,151,236,111,3,80,38,246,183,1,168,12,197,241,118,216,35,86,229,227,84,211,64,235,198,185,0,46,126,203,222,198,207,121,27,102,183,60,229,233,171,68,222,54,173,83,208,236,76,56,38,9,63,254,14,223,126,192,14,142,35,233,175,131,108,248,15,31,70,7,221,213,14,151,224,90,188,229,172,178,106,69,167,4,128,48,214,153,42,224,57,65,176,208,104,96,149,228,232,195,19,253,212,192,155,126,188,43,233,19,206,42,182,182,119,250,14,46,5,212,119,202,45,129,48,61,186,52,189,75,19,145,130,114,203,185,98,41,171,78,227,44,110,32,56,140,247,30,36,85,234,79,42,179,156,6,154,239,97,87,115,138,171,99,98,253,82,124,42,150,71,232,107,249,65,211,238,48,90,175,137,116,148,16,164,37,181,59,97,99,126,56,215,56,238,251,214,71,74,84,19,189,111,125,28,135,131,
+96,99,213,1,53,4,44,196,114,57,246,120,222,127,175,207,251,81,226,240,73,153,226,114,154,102,95,226,101,206,175,228,28,96,54,93,202,59,184,178,33,116,75,60,191,233,245,212,155,234,112,6,186,29,71,156,46,120,140,140,161,40,4,169,141,57,180,188,148,178,132,79,33,218,191,154,192,155,87,216,169,33,139,187,87,233,46,44,227,102,92,192,168,33,17,171,25,97,49,163,92,71,167,143,245,147,205,94,144,93,164,243,8,89,10,217,40,89,165,71,38,248,127,152,123,179,223,212,246,109,77,236,95,89,170,135,82,34,149,74,73,74,81,84,85,138,84,149,155,72,185,170,72,121,72,189,69,145,106,223,115,214,189,231,228,238,179,247,209,217,251,84,169,222,104,166,241,164,245,164,181,49,96,26,211,24,48,198,244,125,99,26,131,233,76,103,90,99,76,15,54,96,76,223,147,57,97,239,211,220,123,42,121,205,195,90,210,90,76,230,156,252,152,227,27,223,248,198,55,126,92,165,199,177,211,30,6,113,187,240,144,210,42,0,215,86,167,39,194,151,74,247,157,87,145,5,
+156,56,78,158,194,104,43,84,76,154,167,142,55,69,45,16,143,202,1,241,145,199,227,137,218,30,174,159,211,36,120,18,23,244,232,55,132,234,219,125,216,169,111,168,88,229,36,239,241,228,213,37,170,16,175,189,212,33,65,212,49,78,222,102,226,83,43,35,112,39,247,102,42,44,250,134,235,149,21,123,106,148,207,249,112,204,76,95,96,56,93,169,93,35,171,245,181,240,186,191,81,13,117,12,190,143,195,175,159,72,64,240,45,122,63,32,61,86,240,41,91,161,22,161,246,82,157,55,219,164,96,191,64,3,250,213,140,117,133,56,0,198,47,107,18,64,62,47,199,134,25,225,194,26,228,18,164,14,94,34,60,174,167,235,254,241,117,167,221,102,213,161,5,216,176,39,6,139,132,114,68,72,29,27,193,227,57,159,65,28,137,155,114,32,78,237,231,139,41,95,247,150,44,234,156,147,175,22,117,83,117,150,174,204,158,138,213,55,92,184,107,132,11,18,152,195,108,17,18,3,115,24,49,190,220,120,193,227,199,59,237,180,20,164,84,140,101,251,233,121,155,125,231,193,50,2,
+41,129,175,24,94,117,20,120,32,190,120,218,225,213,37,165,200,120,44,134,38,120,221,228,50,122,78,160,70,17,235,228,113,88,65,71,140,147,126,249,222,56,201,184,181,214,27,150,9,19,210,84,231,181,21,231,140,167,214,208,49,49,239,108,125,44,210,16,187,102,237,139,31,75,130,153,128,10,205,61,248,38,173,42,0,250,192,201,11,190,138,97,157,234,248,30,10,21,81,164,55,242,49,177,5,168,39,54,28,67,85,251,243,67,75,126,211,251,16,69,162,120,207,181,45,45,117,170,37,206,114,241,100,93,142,181,222,115,103,215,254,241,157,92,29,158,225,40,252,64,220,193,179,173,221,236,233,92,234,167,234,148,143,114,170,158,159,65,221,239,85,111,142,34,142,168,222,125,55,152,145,243,130,220,124,12,64,113,223,8,104,97,12,253,250,192,19,212,219,171,80,75,238,36,93,251,40,234,35,19,59,38,239,185,32,163,227,50,26,57,21,80,174,51,190,241,156,230,127,227,120,221,205,57,232,189,237,48,31,244,164,62,103,26,71,229,47,210,150,216,210,206,44,85,205,237,
+151,204,187,173,180,45,54,5,134,221,81,160,127,69,225,157,71,243,233,243,48,188,214,63,235,73,12,184,250,123,118,106,12,209,97,230,76,196,10,159,190,52,67,151,70,224,38,26,167,30,26,116,118,134,221,220,241,219,105,226,176,3,219,188,180,231,7,86,214,190,67,39,68,84,164,120,19,67,223,183,241,187,61,229,232,163,222,136,53,152,212,37,223,82,133,185,72,184,6,215,121,212,63,214,51,80,179,99,247,155,156,152,218,161,237,175,169,238,213,104,249,9,105,175,70,159,55,49,221,131,112,4,63,1,123,225,72,76,61,8,71,66,243,65,56,34,137,15,194,81,251,229,32,28,61,42,14,194,209,167,234,32,28,113,15,118,115,185,253,96,55,247,145,81,7,225,40,198,58,8,71,92,234,65,56,106,145,14,194,145,167,112,16,142,90,140,131,112,244,179,159,41,207,62,8,71,171,131,236,205,15,28,100,111,230,18,145,189,13,229,136,93,125,143,189,78,82,143,167,124,113,145,135,25,210,251,114,251,211,241,248,76,75,104,20,47,124,107,105,232,246,96,51,24,161,212,
+68,15,129,120,187,133,23,67,72,109,205,219,4,157,248,138,117,117,87,20,10,222,19,1,55,216,16,238,237,72,18,178,224,131,233,234,138,184,87,81,224,230,89,42,42,188,220,119,253,153,247,124,225,141,62,101,220,208,1,253,90,139,95,183,141,156,97,35,0,13,216,218,133,23,20,91,147,108,32,199,195,70,81,136,43,105,210,28,238,171,46,194,220,157,213,76,203,110,176,158,55,87,133,62,134,71,150,41,246,105,66,160,78,11,5,162,207,9,75,27,227,133,94,247,14,240,39,217,237,48,213,35,160,60,80,239,5,139,203,241,104,88,193,16,18,241,204,65,17,170,126,155,206,226,235,183,254,230,189,197,101,20,0,61,172,72,98,214,101,199,44,229,248,172,255,22,209,168,174,82,114,230,185,0,140,251,27,132,143,160,30,122,147,41,54,55,29,163,136,19,227,77,83,226,220,180,162,105,8,203,211,238,88,23,115,66,189,187,14,75,66,7,192,117,27,61,79,226,125,237,245,186,99,159,131,15,98,247,91,157,139,34,9,125,81,249,43,197,164,25,140,99,57,192,119,16,
+144,14,46,37,186,240,234,202,43,89,154,113,177,157,137,31,244,57,199,34,197,157,184,253,40,31,191,204,247,46,71,7,40,89,75,66,128,80,149,185,222,171,217,80,156,234,119,7,235,183,90,60,245,214,122,236,134,107,200,176,50,41,4,156,119,167,21,229,56,11,151,165,167,36,249,78,172,239,82,176,119,152,113,136,32,28,3,175,197,88,189,58,61,139,21,40,210,14,252,177,53,203,69,91,139,159,158,77,207,21,159,92,49,19,239,57,217,179,36,247,189,96,207,146,230,10,249,44,20,124,67,41,71,3,20,202,179,108,162,193,72,73,153,254,52,24,164,73,223,193,159,148,167,123,84,153,40,5,221,53,203,97,116,153,148,110,111,37,198,62,62,79,109,219,228,218,7,111,75,86,41,122,91,163,186,241,28,5,223,154,192,131,113,213,165,27,38,69,232,179,49,42,161,36,186,193,67,157,192,188,233,238,65,43,19,35,166,198,210,212,164,67,76,141,5,171,160,125,69,111,204,63,73,211,181,170,199,46,136,218,138,82,47,213,13,107,58,170,163,198,203,77,244,9,227,185,
+60,192,71,36,184,135,143,160,104,8,223,35,234,22,13,29,189,76,61,36,75,42,118,130,175,159,212,35,128,48,251,70,161,22,60,12,162,165,175,246,192,148,234,253,214,234,238,53,173,192,133,217,146,131,24,120,218,150,225,207,218,164,185,72,253,236,49,223,235,154,162,68,52,181,96,112,204,34,116,103,52,170,110,138,103,90,1,175,153,215,194,208,12,28,224,66,160,216,195,5,19,252,105,189,129,235,144,98,141,72,67,92,152,148,32,14,107,8,105,142,249,189,160,142,97,249,83,61,182,210,56,192,129,227,231,185,144,160,124,15,7,128,102,239,26,212,64,154,189,107,240,4,133,219,187,6,171,215,136,142,108,249,11,58,114,28,129,3,220,189,84,87,185,83,225,244,99,163,208,61,136,221,207,117,99,23,222,187,71,132,251,35,251,30,17,86,244,3,238,8,154,29,24,17,248,39,195,157,224,226,79,117,23,148,59,184,175,195,46,175,147,123,167,210,115,193,118,205,114,209,105,23,129,39,20,180,70,234,164,143,253,43,18,123,190,128,56,20,159,13,231,123,135,162,146,181,
+222,59,20,239,65,57,226,80,188,176,181,152,78,11,97,38,96,42,199,241,218,176,60,102,153,187,140,104,133,103,191,21,120,183,157,16,171,55,92,105,85,183,147,180,114,101,165,239,21,25,117,235,57,140,129,82,151,183,89,220,154,65,92,114,197,236,45,140,16,67,172,6,21,97,227,72,143,65,12,190,128,41,21,53,224,61,168,233,106,220,96,215,117,109,168,32,148,201,1,208,143,226,71,197,116,200,87,76,83,10,205,46,157,219,168,252,37,124,72,116,30,70,122,160,93,46,61,57,69,55,50,251,168,29,219,152,134,144,85,209,35,194,120,17,121,136,164,133,98,89,65,107,248,60,81,139,26,26,148,231,21,106,241,224,58,139,97,141,150,134,167,17,184,92,103,125,80,58,165,123,227,63,170,151,138,224,52,114,94,13,129,65,150,71,180,184,132,60,110,156,189,142,20,78,122,37,74,243,28,220,105,251,237,157,10,172,19,235,178,44,75,208,115,139,129,208,140,69,12,63,89,141,143,129,244,75,252,162,43,190,87,182,223,94,231,110,142,197,99,163,1,5,121,136,231,122,
+63,15,22,36,109,207,213,131,94,163,186,46,124,36,245,31,73,178,224,228,244,244,38,75,229,8,124,228,215,64,224,52,36,240,124,28,30,39,89,100,224,17,228,102,151,69,137,67,156,245,138,242,17,137,173,93,244,234,213,140,173,6,7,229,58,114,158,235,86,106,145,243,84,190,59,68,172,17,250,78,110,17,177,102,231,30,52,112,177,241,103,68,164,91,219,169,38,4,79,60,119,98,104,36,147,3,15,103,172,123,206,146,167,249,185,95,111,67,250,245,4,52,36,206,59,134,35,122,181,68,49,232,166,165,49,68,187,174,144,194,145,134,124,24,130,16,99,181,135,31,22,132,39,200,72,91,19,18,69,249,114,213,184,122,129,98,219,96,110,99,166,246,45,84,124,190,226,180,38,56,82,188,241,237,200,74,224,92,146,83,17,110,192,199,232,96,162,208,126,8,196,142,210,94,33,67,32,53,79,86,104,201,122,68,53,213,230,220,164,173,153,123,141,227,115,161,180,218,137,52,240,0,164,21,23,221,213,145,232,77,57,24,189,20,189,75,4,100,194,60,185,126,247,252,14,157,
+209,83,96,25,159,40,147,83,85,118,205,40,7,196,237,151,91,41,228,225,82,107,35,244,161,44,163,145,145,178,108,12,10,217,47,228,148,30,239,11,185,223,192,135,116,45,175,232,115,129,171,81,176,36,21,202,90,49,168,26,74,209,173,189,15,132,186,20,184,93,250,25,89,183,230,154,239,87,44,99,164,119,157,24,63,177,228,5,137,18,60,11,176,158,239,240,63,243,20,232,39,158,194,187,59,145,70,222,238,197,58,153,124,154,210,104,12,115,140,71,11,64,194,94,222,205,175,186,184,180,7,41,255,129,13,122,210,60,214,165,1,144,75,30,235,246,106,204,63,61,179,226,56,10,118,109,197,61,187,134,161,215,247,224,18,41,7,37,122,87,170,149,93,95,24,167,69,233,81,176,167,188,40,136,39,37,142,229,84,169,58,237,227,83,198,159,245,233,248,94,159,126,118,142,53,6,152,161,36,137,248,203,211,201,105,144,57,244,19,140,58,185,223,193,77,84,159,246,138,76,228,80,46,177,176,148,67,131,94,139,60,53,48,6,225,14,244,162,155,135,241,4,161,36,207,212,
+131,33,250,248,208,214,242,179,17,16,250,163,223,144,220,4,15,13,114,232,208,6,15,187,145,102,22,140,65,66,4,132,96,12,34,32,32,4,99,80,117,223,204,210,119,221,72,51,11,166,36,219,244,1,128,72,239,7,0,106,33,205,44,24,233,42,72,51,11,166,36,239,72,51,11,166,36,3,164,153,5,83,146,58,74,248,103,120,200,146,31,132,96,59,210,204,130,41,201,207,56,248,128,52,179,96,74,82,66,154,89,48,37,113,33,205,44,152,146,164,145,102,22,76,73,90,71,229,7,245,11,246,90,150,148,182,78,197,5,158,9,230,36,48,37,9,76,155,103,90,152,146,172,111,171,206,161,175,83,136,31,49,229,108,134,7,216,138,1,87,235,133,5,48,226,208,235,51,22,69,7,36,87,143,211,4,204,77,18,8,57,17,188,95,50,34,48,57,129,185,73,29,33,39,31,169,26,218,29,177,208,163,117,122,160,40,190,144,26,87,9,130,91,178,1,242,146,140,86,70,143,192,101,155,196,116,40,219,238,162,135,178,237,133,214,157,104,9,112,110,152,163,56,160,166,83,
+252,9,111,152,159,37,117,181,235,68,65,65,197,167,223,3,202,143,98,50,211,179,255,8,212,184,88,57,14,129,75,253,199,250,48,90,191,34,159,189,78,40,97,20,92,118,76,175,193,24,10,218,69,179,89,252,43,204,79,130,127,202,79,50,7,126,82,208,24,76,233,181,67,130,224,140,160,237,102,255,140,51,27,4,103,164,41,180,100,163,199,151,114,96,137,169,15,200,122,66,68,5,38,199,30,0,33,6,112,29,4,98,20,159,175,190,240,104,241,119,240,189,163,106,96,34,127,115,226,179,90,239,234,84,210,193,16,116,76,219,27,130,172,90,42,70,155,22,157,212,84,237,241,10,31,233,134,1,245,57,158,197,90,158,206,68,84,205,113,99,203,48,235,247,99,102,120,204,126,204,76,3,25,69,202,211,4,234,201,34,64,41,246,6,32,173,80,147,72,136,146,37,41,254,96,0,170,118,246,6,106,198,152,225,105,131,38,110,176,251,32,4,206,164,62,95,69,56,19,158,63,240,177,40,133,6,46,224,255,216,207,82,236,209,195,146,133,60,201,99,152,6,162,124,144,72,
+230,51,118,51,57,194,162,136,24,125,0,239,193,232,243,190,217,15,94,48,84,203,16,184,236,159,209,156,28,147,175,11,242,24,2,227,162,59,213,52,244,4,3,169,79,123,215,222,17,65,150,27,0,182,145,196,82,193,243,128,51,175,130,113,174,4,135,237,94,133,35,181,156,161,152,88,28,180,210,92,157,121,34,118,196,60,77,150,91,164,136,121,26,12,249,64,246,150,123,185,9,23,149,82,227,149,245,109,197,64,135,75,17,117,143,18,173,217,78,83,34,129,184,244,210,63,54,33,173,242,240,164,65,1,196,132,91,1,188,172,28,176,211,51,202,34,144,174,193,8,54,182,193,24,210,32,31,158,201,37,17,77,123,107,20,49,218,74,171,20,59,73,55,165,225,54,21,203,64,212,163,78,118,220,51,188,99,162,190,41,163,248,116,191,45,234,33,57,229,169,216,77,166,50,103,148,106,97,170,176,72,162,164,189,123,103,75,184,222,187,119,78,63,206,34,18,204,117,12,29,39,89,254,224,151,70,194,173,106,22,250,160,96,46,151,67,127,66,152,198,13,162,183,86,246,78,
+28,116,52,57,159,70,54,127,240,243,85,15,246,104,213,207,243,11,192,193,30,237,185,59,216,163,153,236,131,125,135,194,61,216,163,7,238,131,61,26,215,61,216,163,161,203,131,61,26,173,61,216,163,169,249,131,61,90,41,58,216,163,189,250,131,61,250,15,243,23,167,15,45,47,255,42,11,227,197,245,231,20,11,152,11,90,217,43,98,213,57,219,87,71,40,161,247,0,95,128,217,20,126,71,172,58,77,100,136,2,162,241,127,174,155,104,8,72,113,4,117,27,243,0,16,59,229,1,32,174,198,7,128,120,244,141,236,136,85,199,119,81,103,34,86,157,18,145,114,204,211,202,237,97,236,113,35,168,142,230,209,218,222,227,86,195,183,88,68,227,222,85,136,17,249,185,126,137,195,245,75,228,177,242,176,26,44,174,169,45,191,248,185,29,49,246,30,66,92,80,224,219,130,143,49,122,247,54,137,49,186,179,210,43,11,90,200,114,176,84,89,32,199,160,23,111,69,83,110,118,201,143,61,21,122,131,204,167,87,234,193,75,61,109,79,79,33,226,105,108,167,228,52,117,81,141,
+239,226,70,186,138,193,201,8,14,66,238,42,127,16,114,45,15,28,143,61,255,198,14,94,100,56,132,185,41,81,214,213,219,145,105,116,104,31,159,120,116,1,142,29,237,67,92,135,61,236,195,125,75,99,168,191,239,245,159,218,3,228,89,86,79,109,134,27,241,196,86,64,137,34,247,26,136,84,13,9,83,170,217,231,24,237,233,158,176,94,178,54,57,187,138,129,107,159,220,97,252,117,248,134,20,63,80,143,237,214,119,150,106,27,152,168,106,241,81,203,67,17,162,210,145,248,204,123,211,215,167,195,252,227,24,51,34,174,233,194,86,150,133,223,179,153,89,147,174,111,40,120,197,218,91,252,163,141,56,126,124,209,171,142,82,26,200,23,205,70,67,169,40,78,30,59,49,49,175,116,64,1,4,149,46,163,51,75,223,59,40,242,179,158,12,111,20,181,241,94,193,185,148,124,211,93,10,244,11,240,38,38,178,138,94,43,76,20,69,56,184,172,133,37,80,89,248,249,249,9,151,108,19,206,38,47,236,42,115,122,152,227,188,105,168,195,238,245,140,164,74,115,142,33,51,208,
+11,225,170,164,156,240,45,150,178,167,194,54,124,116,239,0,26,223,129,123,7,144,67,188,75,79,200,253,197,99,56,65,82,29,53,95,237,62,126,32,222,153,210,143,217,185,172,115,28,149,23,89,54,136,76,114,92,97,211,42,213,44,119,244,218,209,23,84,108,55,198,38,184,243,48,177,66,173,136,212,26,77,184,253,101,150,195,97,207,195,140,60,177,137,211,48,239,227,192,13,112,37,155,130,112,106,165,39,172,99,16,95,98,137,67,227,253,36,255,8,161,61,228,155,66,78,63,29,106,58,247,169,254,24,37,57,1,185,66,13,76,111,121,21,22,221,198,62,227,21,20,248,206,171,39,194,93,158,138,168,13,41,94,228,184,231,224,155,153,245,181,6,206,233,63,247,169,100,251,62,85,227,101,137,199,147,184,211,82,112,68,41,84,163,13,95,223,112,213,163,21,180,70,17,46,85,161,150,180,167,2,123,61,104,66,229,212,204,26,181,211,125,139,224,141,142,99,200,26,104,191,8,62,150,199,109,125,48,155,192,45,104,148,102,87,117,107,196,202,156,52,145,147,227,149,250,
+144,2,47,183,6,234,162,35,191,158,8,202,101,155,160,239,189,118,166,84,12,151,103,2,31,106,95,133,73,55,236,125,21,86,33,104,162,76,159,101,108,140,170,232,34,60,94,17,194,15,252,240,115,48,165,107,218,175,135,130,76,186,159,50,211,92,138,152,82,89,129,211,19,82,128,249,93,14,198,62,13,2,126,48,246,49,17,240,131,177,47,135,128,223,184,159,124,32,16,46,144,145,51,234,161,60,19,48,246,172,201,129,143,158,105,197,193,110,222,112,220,41,137,153,13,145,145,4,105,245,155,103,186,229,243,180,243,216,251,147,57,18,105,50,7,68,53,178,234,124,21,41,5,210,17,13,180,137,141,5,9,241,196,89,199,39,210,247,216,41,51,94,97,197,150,204,18,69,68,104,227,185,120,177,179,247,202,54,26,152,247,245,115,119,228,178,215,243,129,122,49,37,63,30,191,169,43,82,22,195,124,141,97,221,30,244,240,53,162,135,55,134,100,147,156,106,90,38,27,71,140,5,128,31,166,121,151,84,182,131,183,189,250,232,152,137,137,112,202,25,121,166,195,245,168,153,
+110,57,82,121,237,36,152,32,229,80,135,54,127,38,100,7,220,108,34,228,97,30,218,82,243,35,157,254,130,151,226,163,223,16,81,90,31,217,235,226,247,63,235,226,53,38,110,205,230,236,117,241,218,242,202,12,230,115,227,159,125,136,202,189,15,177,39,56,6,220,139,60,15,19,96,8,124,122,164,197,30,198,85,10,121,42,136,134,19,236,89,92,203,65,157,221,45,240,127,177,191,238,57,16,40,158,132,11,64,213,98,242,138,126,48,94,39,246,125,46,204,79,115,177,30,197,252,64,179,244,63,207,197,86,144,109,1,96,166,151,59,148,155,47,215,215,141,253,100,9,157,124,191,159,44,41,108,111,246,147,37,246,116,204,128,129,214,91,250,230,165,65,214,134,222,253,124,31,52,158,129,33,233,163,116,144,225,223,84,70,112,77,183,26,18,23,247,93,126,185,178,196,17,220,151,161,61,98,162,249,35,68,241,1,67,183,55,104,55,222,147,6,90,40,57,59,201,8,47,24,175,203,229,35,202,128,170,43,49,158,235,21,201,13,97,44,202,222,92,137,159,87,232,21,159,112,
+188,168,24,153,9,66,137,232,184,210,151,70,254,103,139,249,184,3,223,24,78,45,65,243,163,205,148,147,228,166,57,83,210,15,240,211,216,60,240,8,2,42,231,6,163,199,205,57,69,104,121,162,169,192,171,29,179,54,59,2,220,104,138,146,229,137,200,199,151,214,198,13,156,222,54,12,225,152,28,139,102,232,104,0,56,117,99,48,120,138,235,136,202,127,203,162,26,64,123,118,126,235,126,139,112,81,200,60,56,255,150,142,22,92,138,172,161,5,32,215,102,66,11,195,235,193,118,205,27,179,123,150,208,113,71,74,187,72,137,76,60,154,237,202,13,233,5,145,10,79,143,247,244,210,146,178,1,136,214,151,140,87,93,244,181,122,202,170,158,246,18,239,242,158,48,100,50,164,42,250,15,57,98,180,126,63,140,201,222,243,3,1,226,49,20,193,132,225,164,236,62,243,232,163,165,216,222,57,132,207,29,132,31,237,79,194,79,92,120,16,126,182,177,131,240,147,18,81,219,48,7,74,204,141,218,18,121,154,178,23,110,15,134,33,49,176,55,12,157,197,64,60,215,169,195,223,
+6,15,178,143,210,145,20,250,168,108,229,83,103,143,82,162,168,25,46,206,56,94,148,160,198,163,237,129,105,74,63,0,19,170,179,7,166,158,224,82,103,57,246,43,110,206,252,82,144,234,34,210,221,47,40,54,143,199,156,199,52,21,229,179,82,40,191,199,194,55,12,63,252,175,41,17,199,8,115,250,162,42,154,178,118,133,192,99,95,35,70,247,66,64,79,64,98,34,212,106,8,115,43,132,90,97,97,110,133,80,43,117,162,25,169,115,197,142,112,29,211,64,230,240,127,214,147,201,123,61,89,159,117,66,141,120,81,250,70,211,72,96,146,15,127,3,229,176,38,238,228,40,129,211,179,33,227,102,197,73,121,70,24,168,87,130,24,13,188,118,141,148,100,21,184,38,131,75,178,105,70,14,3,121,49,207,235,97,67,92,35,0,232,101,197,195,128,26,223,234,124,70,67,62,180,39,211,66,93,29,121,154,150,22,74,232,232,1,236,204,80,10,87,99,252,135,67,53,118,105,144,3,114,86,169,12,208,198,27,127,118,140,42,68,210,99,188,67,91,101,43,46,57,180,45,34,
+1,221,229,34,117,68,2,234,152,162,68,106,193,16,181,223,12,189,122,29,205,60,96,85,3,169,39,73,112,12,8,135,189,171,138,236,249,22,141,142,204,135,11,246,125,90,228,126,227,162,70,240,103,184,146,15,232,84,218,126,156,83,49,63,200,195,228,248,65,30,254,131,190,99,120,185,62,106,5,210,129,159,117,217,23,36,58,7,140,210,207,125,51,218,161,111,38,96,139,157,251,73,210,159,162,180,65,17,28,128,226,42,112,0,10,214,217,1,40,174,17,51,206,177,233,236,20,49,227,120,45,236,86,101,191,241,144,209,132,128,5,140,21,52,4,44,238,21,228,231,125,119,140,7,228,17,51,14,122,137,248,9,247,141,49,196,79,136,22,254,113,62,86,135,148,131,112,9,134,222,203,194,88,143,5,49,227,192,175,156,28,228,34,250,9,98,198,105,235,51,76,196,140,51,28,77,146,136,25,71,60,84,188,33,102,156,236,178,254,130,152,113,146,119,39,60,196,140,115,155,50,246,142,102,131,1,113,33,185,150,23,141,189,187,72,43,85,21,67,162,193,229,124,106,153,105,
+5,190,177,24,207,28,242,239,82,248,79,21,6,90,224,237,82,82,8,123,24,168,79,221,168,60,0,144,155,98,114,70,168,154,138,117,29,222,136,141,241,82,28,240,239,50,56,19,129,111,68,81,99,12,207,105,63,165,165,246,24,232,199,162,84,143,12,215,207,19,93,22,50,92,95,209,53,82,67,28,244,97,92,226,178,173,58,78,244,34,185,200,221,100,149,26,52,20,166,164,138,168,207,124,68,101,202,159,207,179,137,97,46,6,87,237,185,70,70,21,81,38,248,197,184,40,82,123,208,64,8,117,242,169,102,48,171,234,158,139,211,252,125,199,172,189,119,29,146,214,24,196,117,232,91,73,81,209,79,137,24,35,52,18,109,183,105,196,178,211,44,226,27,30,231,59,27,140,13,134,198,224,182,135,193,23,112,200,136,61,65,162,121,150,212,86,145,94,143,220,187,187,183,98,206,206,12,189,167,241,21,61,215,211,49,251,233,156,187,200,46,50,94,168,2,125,5,47,154,4,122,131,179,34,38,191,61,191,90,208,130,56,251,138,35,240,189,222,31,228,159,90,118,47,255,152,
+86,183,133,128,249,77,243,113,47,55,94,30,221,179,252,247,15,36,56,125,59,161,142,228,13,71,213,25,19,188,115,25,6,18,5,34,239,31,31,175,155,203,155,73,161,194,124,86,101,74,173,158,78,137,90,152,19,1,77,115,108,221,248,164,83,201,235,41,89,36,233,184,71,26,227,65,248,153,10,14,194,79,23,202,59,242,93,129,22,11,116,74,134,17,96,49,165,185,210,153,242,6,99,23,214,201,166,98,118,4,99,147,116,12,10,31,57,241,134,181,196,132,150,116,60,203,22,130,169,208,12,230,66,195,110,219,218,2,209,58,203,155,217,10,197,16,149,185,24,187,133,73,72,91,73,33,243,74,12,58,209,244,95,214,127,10,38,237,165,70,165,34,36,248,48,215,183,30,249,180,77,85,92,103,182,100,240,57,164,144,51,42,149,50,227,14,140,17,199,237,82,55,220,102,44,227,175,207,156,83,51,93,230,52,34,100,7,230,58,169,186,24,170,230,237,43,45,99,106,188,131,107,57,42,82,204,193,181,28,1,41,230,24,61,145,204,65,52,14,46,20,92,25,144,227,47,
+9,56,8,151,186,72,246,118,181,55,119,12,162,217,146,21,171,176,17,186,32,10,125,225,240,25,91,135,0,142,151,117,0,156,64,94,122,107,66,11,123,190,169,205,78,126,146,66,154,27,245,76,0,160,232,30,55,120,109,132,180,98,233,179,131,145,18,45,46,115,136,41,209,90,19,151,88,183,146,49,62,18,161,203,145,193,177,182,1,24,117,249,116,94,80,255,254,160,189,121,188,93,74,105,84,32,111,133,235,57,38,222,44,148,105,207,63,142,167,197,66,232,146,28,204,156,15,236,61,56,6,140,198,244,0,177,224,248,154,107,203,186,246,86,87,171,94,186,74,145,116,246,212,176,179,177,40,162,226,130,11,243,143,136,252,76,210,172,192,5,79,192,179,1,5,144,70,163,169,166,133,64,232,249,79,246,187,224,75,62,187,103,127,226,159,57,159,195,68,69,84,220,207,103,33,68,165,179,239,158,3,233,243,195,246,25,127,192,135,43,200,236,82,122,95,193,71,0,94,196,91,146,23,117,251,172,180,97,132,113,148,148,134,45,76,233,130,246,149,26,129,55,159,182,242,148,
+41,45,13,24,201,75,230,24,5,121,30,126,158,223,192,50,176,80,114,29,126,123,21,253,101,95,192,79,62,154,233,107,78,181,147,137,79,20,233,207,80,104,191,79,199,79,124,38,47,137,252,197,125,58,70,200,62,29,158,137,233,97,214,129,233,200,170,25,105,221,230,63,40,119,11,242,3,227,229,173,102,142,96,243,251,2,174,124,172,204,51,254,84,223,129,16,125,71,16,7,169,121,71,25,76,56,177,180,43,154,208,175,241,225,209,5,76,137,200,196,120,80,48,23,65,168,72,4,230,34,8,21,9,194,92,4,166,34,254,190,66,217,8,227,28,207,212,83,188,7,25,137,15,233,57,81,100,36,126,26,97,219,133,62,142,10,122,153,162,51,69,212,107,14,43,52,58,120,22,64,94,79,135,141,162,237,147,151,84,58,133,207,119,51,207,129,26,73,188,195,66,219,234,71,66,246,205,181,216,46,229,225,61,24,226,122,175,238,120,130,162,189,186,163,95,189,238,213,29,84,8,46,129,167,175,32,10,162,222,37,75,18,15,131,125,243,222,64,198,87,201,1,144,241,26,19,
+231,110,54,240,51,42,15,232,5,184,152,204,71,129,0,50,116,149,154,7,48,113,155,232,169,51,139,210,243,227,211,254,45,95,170,33,18,229,137,116,207,27,137,74,117,148,194,120,76,9,254,131,249,248,11,15,160,197,239,149,157,57,152,24,41,188,42,202,3,195,88,226,120,100,214,196,165,15,162,61,184,103,120,142,220,197,3,239,216,77,5,12,22,48,86,144,16,176,56,37,87,141,10,118,204,204,58,134,112,171,174,134,60,248,7,190,28,156,71,100,108,13,174,49,215,70,244,89,220,2,38,20,99,16,245,249,22,185,12,205,36,121,31,205,163,95,92,74,160,198,232,12,18,167,146,4,80,120,249,60,20,209,239,116,222,162,65,19,77,215,11,85,206,185,173,163,167,247,196,169,103,250,63,238,59,221,205,66,65,41,58,99,186,70,161,128,160,156,74,206,44,187,105,196,170,135,15,95,120,218,23,225,243,84,81,234,3,67,113,121,89,13,92,193,196,66,243,252,25,142,80,114,15,194,69,212,107,122,112,234,115,183,56,243,156,146,12,1,130,189,42,60,215,92,238,85,
+225,23,50,33,213,70,41,139,168,116,144,226,137,56,90,186,148,118,116,4,193,144,208,120,133,49,33,6,137,84,73,100,104,29,199,15,188,180,203,73,150,92,69,120,191,57,143,9,223,77,124,34,142,173,119,31,81,33,222,193,174,220,184,71,236,202,199,30,26,3,119,246,121,243,129,122,229,98,247,180,99,248,126,160,29,236,250,129,118,0,140,3,237,216,88,15,180,99,236,195,59,2,30,94,85,206,19,151,19,79,55,112,125,76,207,167,50,156,85,207,144,242,136,51,42,222,115,100,220,41,112,141,1,85,220,113,19,168,255,9,46,0,123,92,80,80,15,79,205,29,216,96,164,247,147,89,30,152,36,48,137,66,140,243,96,227,129,226,87,163,125,65,80,61,204,107,122,142,116,181,189,114,211,60,200,61,81,32,57,39,244,55,255,101,31,156,239,96,31,126,37,34,246,225,75,72,36,46,96,246,59,37,42,85,93,16,32,145,35,151,94,108,145,212,238,244,202,168,10,23,41,144,170,200,230,103,147,78,22,69,152,23,121,24,55,24,145,29,124,124,216,104,146,226,9,58,
+249,189,173,219,81,21,212,7,17,169,192,199,179,28,121,113,251,178,202,29,124,221,28,54,226,0,15,115,242,182,236,190,251,20,120,58,222,119,159,254,216,151,194,23,254,242,254,24,159,220,55,80,120,209,98,222,56,253,132,177,64,57,246,199,179,195,242,216,208,61,218,119,159,228,94,210,190,251,180,130,82,35,182,25,25,105,32,129,219,152,227,26,212,244,29,104,201,88,166,51,163,212,240,183,237,194,182,137,87,238,70,224,147,14,97,104,29,77,170,140,246,0,175,45,21,249,131,233,74,35,77,105,224,230,185,34,21,113,232,58,234,149,238,84,18,253,75,122,239,125,119,66,115,209,76,67,26,11,113,223,229,241,36,80,216,100,52,92,40,159,231,53,128,116,150,244,12,107,105,120,170,21,96,1,71,20,162,61,163,64,100,8,148,113,191,77,32,67,160,34,7,29,43,53,211,48,32,62,125,13,135,207,13,74,186,67,213,69,89,63,174,44,145,40,218,225,167,66,79,127,98,40,167,195,210,49,33,238,112,223,218,205,209,74,75,197,91,121,235,128,18,176,189,201,5,44,
+79,149,35,195,203,79,224,148,37,93,129,94,141,193,86,176,27,145,41,79,138,122,115,152,91,39,46,142,161,143,169,129,114,187,217,213,202,228,250,181,202,61,247,6,235,55,116,54,200,182,81,1,159,182,77,62,253,220,239,123,24,20,145,90,109,31,63,176,139,119,10,237,167,243,28,62,155,62,226,121,62,72,183,185,33,19,206,79,25,52,178,41,198,192,20,68,95,85,5,190,204,135,113,216,12,250,238,92,74,167,247,90,133,8,71,197,181,27,60,177,176,159,184,87,218,137,167,238,130,147,32,152,104,158,48,50,203,216,137,155,196,99,120,218,52,208,244,124,5,151,34,183,154,40,74,56,245,42,0,148,119,123,19,153,163,7,245,241,56,253,26,0,74,234,161,26,240,137,8,131,144,28,130,137,103,239,92,8,228,172,248,89,116,40,151,250,206,98,127,140,115,209,39,135,1,211,179,128,92,23,234,62,24,208,208,80,133,222,87,24,250,39,235,190,194,200,74,35,19,132,152,13,46,84,40,161,143,171,213,117,53,17,129,24,183,169,83,78,155,36,23,37,129,117,74,84,
+169,34,163,36,49,108,8,81,236,27,137,38,236,237,51,252,189,20,218,103,120,60,138,190,207,240,34,173,120,173,135,164,131,247,115,78,62,42,183,6,46,68,27,233,86,215,76,73,61,81,27,239,230,254,193,229,18,41,113,239,16,141,95,25,58,169,92,31,83,230,51,26,147,189,81,181,58,211,91,184,61,172,114,221,64,166,193,133,184,218,126,26,188,22,174,52,56,169,203,143,9,131,123,210,126,147,195,241,123,178,159,78,186,184,167,205,117,227,107,0,196,184,217,28,142,242,194,35,168,68,142,246,113,17,220,63,253,231,143,45,202,159,247,99,162,251,93,109,254,232,43,65,237,119,181,73,11,78,17,253,212,69,132,78,170,193,253,121,255,255,234,155,69,31,124,179,104,129,7,151,144,108,167,187,35,232,169,112,201,135,58,121,139,13,104,200,24,21,42,175,146,19,121,70,201,118,18,164,206,169,107,46,184,146,67,152,219,51,95,215,46,128,179,239,202,113,4,246,56,67,5,117,37,247,41,120,197,14,10,234,4,63,59,222,213,64,126,213,75,214,97,190,60,162,210,254,
+60,111,123,34,236,170,0,168,64,159,194,185,59,40,16,83,147,110,117,122,145,206,17,4,17,168,250,152,71,65,194,96,158,137,23,74,101,209,43,15,59,12,8,239,88,71,16,202,237,121,172,28,215,101,5,38,74,8,162,177,221,39,11,40,108,15,238,54,236,133,88,59,221,10,195,210,94,208,123,90,123,106,169,223,137,39,140,153,84,165,124,245,223,36,37,212,241,196,221,181,122,62,56,85,79,197,107,103,66,20,79,245,146,253,114,19,72,123,122,196,200,132,129,53,208,255,204,31,123,116,97,2,4,36,237,105,55,11,199,189,253,205,230,162,210,175,59,170,180,28,119,195,61,162,35,251,62,96,141,45,189,77,185,176,70,240,16,67,216,38,78,55,190,116,70,151,151,133,196,209,200,35,47,200,252,179,190,109,232,8,66,3,119,214,39,138,7,124,176,224,132,82,221,252,46,8,231,96,36,5,31,193,57,24,73,193,104,113,10,230,81,190,97,221,10,226,197,247,161,99,90,155,45,240,193,17,232,158,163,247,17,72,12,0,234,44,188,80,57,72,233,6,167,106,77,240,
+180,6,106,44,208,68,92,74,17,228,84,140,86,155,110,102,61,221,81,155,90,78,62,90,165,27,97,219,35,5,19,52,16,194,34,67,209,177,187,32,214,76,190,21,164,45,96,80,67,214,127,102,186,64,82,92,80,82,95,218,69,105,254,182,187,111,180,34,219,139,198,97,48,117,173,27,22,94,53,73,14,52,141,17,84,199,79,114,7,109,37,202,135,215,193,196,139,223,149,62,78,48,69,197,117,210,4,160,220,173,223,147,229,99,244,231,184,80,87,60,75,121,192,145,50,145,29,95,202,63,168,174,130,87,108,245,144,121,49,148,89,65,7,143,59,29,22,49,181,237,233,128,226,53,248,86,197,62,177,247,89,51,77,30,28,12,237,116,230,138,89,2,238,8,32,147,32,180,109,54,3,46,248,160,42,80,108,91,40,73,219,119,54,38,126,207,158,73,167,52,90,56,46,226,127,152,183,219,33,229,57,204,164,239,174,156,80,178,248,135,190,199,28,189,207,158,127,220,191,201,189,143,6,79,142,176,143,6,196,175,138,100,207,245,53,102,159,61,11,152,206,62,123,170,186,111,
+251,236,233,197,182,247,217,19,85,201,238,179,39,237,248,108,159,61,9,115,212,62,123,202,106,163,125,246,140,38,5,251,236,185,117,191,58,254,92,79,204,255,204,167,17,17,82,167,255,3,159,174,163,133,251,200,11,29,228,73,29,85,127,216,104,33,116,126,216,104,225,216,114,216,104,65,100,121,130,60,246,71,101,104,67,96,118,238,50,157,178,64,93,119,181,223,114,67,185,12,252,0,36,171,215,216,161,1,34,30,29,3,233,24,87,240,236,219,94,197,161,133,124,36,47,210,124,215,73,42,112,161,155,48,5,192,244,49,83,24,176,176,143,165,220,133,248,26,255,224,73,251,136,50,3,18,121,87,251,93,164,22,218,16,178,139,20,28,121,183,91,144,119,241,204,14,154,187,112,254,31,162,32,176,26,203,79,177,2,224,126,250,28,243,128,118,16,181,207,138,120,176,186,207,138,10,222,217,59,132,241,43,134,208,131,168,244,162,31,149,29,62,133,118,78,75,251,3,178,155,164,52,150,90,69,217,142,174,71,22,199,2,58,47,214,198,3,124,247,81,45,146,254,44,175,88,
+195,29,191,168,237,234,254,225,124,241,22,5,0,164,74,212,233,175,82,105,15,245,98,244,94,224,26,191,61,94,75,88,238,224,250,136,92,21,80,124,47,55,61,188,134,250,0,39,195,171,93,212,214,81,46,34,248,91,174,80,222,33,110,10,168,76,53,248,208,37,56,52,175,15,162,129,79,186,167,190,127,178,15,157,160,34,231,171,3,57,113,58,227,191,43,7,61,82,211,170,132,197,121,193,140,17,242,180,48,205,238,159,237,63,135,66,233,166,72,0,50,180,2,241,28,46,240,209,251,236,87,31,115,247,217,79,237,198,4,27,8,237,89,153,65,141,234,108,26,150,203,110,0,247,145,109,164,4,133,190,139,243,167,106,152,130,3,114,69,64,88,184,218,179,217,142,242,236,3,76,120,5,199,96,132,29,217,59,207,135,40,0,174,149,180,1,150,22,13,157,79,45,207,216,179,142,122,151,239,183,46,142,114,40,232,58,226,190,63,132,25,51,134,132,25,10,164,58,31,5,40,232,206,143,187,241,224,24,39,56,15,131,177,84,79,99,99,102,137,221,115,45,43,229,96,51,
+96,5,206,103,182,103,210,139,14,13,9,243,159,202,207,168,23,101,116,52,125,18,22,73,105,252,19,63,212,82,231,12,161,161,139,10,222,153,178,98,11,65,199,213,193,142,144,106,30,236,8,148,63,217,47,0,177,35,252,161,159,119,125,176,35,252,65,127,242,30,236,8,38,210,193,142,208,33,30,236,8,255,112,94,223,246,122,176,35,184,161,131,29,225,236,232,96,71,240,104,14,118,4,169,224,96,71,72,255,67,63,212,232,96,71,24,252,100,71,96,25,14,118,4,133,249,160,147,163,126,154,75,251,131,143,242,231,185,180,159,236,8,240,125,239,237,8,64,253,96,71,80,247,15,118,132,39,254,193,142,128,170,10,153,41,57,164,77,173,48,129,16,0,89,55,203,248,78,160,212,175,231,19,44,99,147,49,221,224,252,132,172,65,0,232,60,241,228,131,16,25,5,113,142,250,40,40,36,207,17,192,197,242,6,102,162,231,17,85,235,226,99,82,76,30,131,79,214,100,173,112,75,130,3,191,126,75,240,99,161,240,171,209,113,70,184,158,136,105,97,193,84,212,154,186,245,
+116,64,95,95,31,140,79,55,13,196,248,228,119,199,65,7,75,238,123,13,90,147,68,50,112,133,5,227,32,190,94,144,244,150,40,52,82,149,186,131,88,81,243,201,47,5,241,152,27,56,32,104,91,2,112,233,122,162,192,137,24,68,76,76,163,103,219,10,243,246,68,189,203,162,65,69,200,38,3,61,169,7,190,137,183,125,82,115,26,113,249,24,117,23,127,237,138,206,56,148,167,240,105,150,181,104,20,224,28,28,121,168,135,46,85,169,139,234,123,97,113,90,212,114,236,218,3,239,252,105,191,36,98,25,5,229,52,183,59,246,155,222,154,35,152,128,32,190,56,110,222,135,0,161,129,74,122,43,167,250,111,175,23,41,17,208,184,202,185,149,66,95,253,173,124,46,19,241,40,187,20,89,177,101,138,149,96,46,88,243,65,161,83,36,197,229,225,28,135,164,184,89,8,3,137,46,137,124,104,223,166,116,131,143,60,182,38,249,199,253,142,242,224,222,69,176,146,88,224,164,7,174,11,140,123,209,45,221,19,236,62,85,198,184,196,176,75,208,117,181,127,238,175,126,197,151,
+251,158,32,46,33,244,63,74,193,135,183,11,133,192,247,148,247,130,29,227,91,78,221,41,60,228,200,38,202,49,33,221,157,7,145,97,48,218,178,249,73,247,39,65,141,252,252,194,73,245,179,34,56,79,66,15,136,144,17,216,80,246,5,162,141,175,211,174,83,199,157,136,200,7,51,224,34,228,152,237,230,249,24,159,230,154,221,188,4,153,11,2,14,142,207,115,120,217,145,201,144,136,12,220,79,134,204,175,70,160,134,212,11,174,40,154,35,169,50,120,65,239,189,99,17,42,250,185,87,155,110,212,136,63,63,166,150,90,147,115,152,149,96,110,128,126,86,93,186,237,140,128,244,52,64,189,121,33,107,45,112,44,57,242,36,197,187,44,190,210,100,69,234,68,251,13,239,90,115,30,110,144,97,145,153,201,187,243,7,135,181,179,151,238,123,80,191,147,223,219,206,59,22,19,10,104,43,41,15,117,13,243,166,55,18,181,104,60,38,178,149,172,103,191,235,26,134,157,255,124,34,0,227,33,101,120,243,162,189,11,30,127,20,215,194,87,18,223,174,61,198,79,213,89,167,120,
+120,201,218,126,146,124,87,5,157,171,9,220,225,25,41,227,60,219,98,188,74,255,224,43,136,126,66,52,60,84,210,234,35,80,82,70,136,210,43,51,151,221,179,138,158,63,48,209,171,49,74,120,3,231,73,140,134,37,0,132,146,185,203,6,83,63,27,17,5,105,54,181,114,112,214,134,81,201,13,78,188,24,192,13,71,94,188,185,55,70,18,118,88,136,236,33,178,94,0,110,23,160,164,80,66,102,255,144,96,207,145,38,87,58,160,223,1,207,179,248,237,43,153,237,174,218,110,185,24,240,234,179,188,87,162,98,200,240,9,204,123,95,97,222,235,33,205,77,57,100,51,245,52,53,143,97,197,152,136,83,65,187,255,21,17,166,4,2,59,199,148,124,205,246,128,238,134,31,153,30,92,236,94,186,119,84,30,141,141,123,71,229,70,55,222,35,8,123,63,157,79,185,99,130,232,153,243,214,57,134,73,228,176,106,5,217,103,59,148,64,92,183,28,145,15,125,194,227,103,161,248,241,4,245,166,138,155,193,188,172,40,131,6,121,57,30,46,123,165,97,83,177,132,130,2,205,
+49,131,52,186,133,129,198,135,136,238,104,33,231,217,248,184,30,103,85,133,87,252,86,6,64,213,164,119,207,218,231,58,180,126,186,207,232,186,19,5,156,209,31,128,165,240,78,45,221,182,46,87,39,137,216,128,40,71,29,67,52,18,2,160,15,7,219,195,63,242,69,69,224,165,130,153,38,70,121,236,1,239,115,186,38,93,194,162,251,172,115,19,246,78,87,67,9,37,139,13,204,183,71,246,96,89,202,176,121,7,219,27,209,3,240,250,226,179,202,1,218,126,234,159,7,249,146,22,24,223,82,205,230,99,34,74,247,212,91,91,180,132,226,8,58,11,50,145,194,188,132,148,227,106,215,133,70,74,91,238,185,167,254,42,198,78,86,238,96,214,148,138,18,185,145,140,69,145,251,227,190,73,208,97,223,36,77,23,170,142,72,150,85,96,125,84,216,18,108,83,141,123,70,218,207,43,211,16,46,128,17,128,104,140,128,211,32,10,111,135,200,230,155,222,105,12,34,120,246,191,20,34,196,233,52,2,0,87,185,135,255,145,36,129,104,198,222,253,202,192,130,135,151,111,232,126,
+20,116,56,46,252,255,122,28,222,79,5,243,29,180,96,63,199,124,115,187,27,237,138,101,251,50,190,185,63,217,190,149,149,245,132,245,53,209,125,9,136,38,3,62,242,251,112,37,87,157,2,34,70,91,165,175,255,185,164,191,44,75,80,128,98,233,249,111,142,95,95,158,241,106,251,72,234,12,151,71,242,202,180,198,73,149,62,111,2,85,45,128,92,252,172,89,243,127,126,152,205,239,196,93,173,202,153,217,63,63,86,235,229,201,115,223,124,220,183,174,118,234,143,173,192,12,126,18,93,186,73,97,119,115,189,155,180,233,239,166,48,107,3,156,205,201,6,171,205,181,126,53,21,106,144,134,13,33,74,139,75,247,137,117,45,179,222,65,172,40,4,197,179,77,217,171,168,82,93,187,141,169,196,119,214,43,108,211,7,126,100,110,230,182,239,217,132,182,34,98,59,71,28,19,63,123,226,175,187,199,200,207,3,69,238,171,31,62,71,24,125,58,83,31,163,193,209,202,47,22,84,234,173,114,65,116,94,18,167,4,226,221,245,187,233,198,57,123,214,49,135,89,162,107,121,52,
+201,69,126,250,253,139,46,247,145,107,94,241,199,235,221,221,109,75,41,66,11,149,254,190,245,1,16,138,62,13,236,150,49,19,156,173,101,163,240,126,193,91,102,28,75,88,127,207,248,101,202,74,14,206,93,222,14,155,128,220,121,247,150,148,77,105,1,152,142,68,178,30,13,164,93,58,74,170,236,69,43,31,105,225,246,87,24,77,244,36,97,73,254,176,186,235,245,78,185,162,210,48,214,203,129,236,243,66,188,250,241,152,20,241,58,24,109,79,135,133,191,179,17,174,178,44,224,160,7,129,234,145,220,254,28,62,29,155,158,200,104,30,81,40,42,26,237,141,78,66,236,93,69,44,76,34,136,38,33,197,108,135,237,153,74,47,10,118,208,207,94,102,57,162,93,212,167,137,65,52,235,93,101,41,192,7,195,22,151,252,164,36,211,102,126,186,239,11,248,190,71,185,133,244,238,58,102,47,48,116,175,93,251,107,69,91,11,10,235,235,145,148,67,180,102,242,117,72,39,151,163,140,236,54,114,31,186,195,125,200,174,76,19,156,198,60,122,139,167,48,32,251,118,144,95,192,
+159,109,90,7,201,5,191,50,210,17,138,242,222,52,35,184,237,225,10,157,253,85,204,23,104,248,42,227,250,28,106,16,117,106,163,127,203,209,224,107,194,122,42,120,111,229,16,165,9,252,157,177,198,19,169,2,69,237,195,207,199,51,89,66,177,206,190,117,243,137,116,181,85,213,39,105,218,240,178,116,244,42,133,234,220,39,6,138,99,54,33,138,43,192,199,242,144,131,225,115,63,154,55,190,87,138,139,201,131,82,250,162,156,71,124,22,114,142,179,249,226,118,44,246,115,104,210,112,17,47,45,137,242,93,18,200,70,31,22,200,232,41,188,95,168,129,218,153,176,238,93,225,9,22,41,25,232,226,224,71,28,3,63,227,31,108,79,129,19,45,63,193,223,87,210,109,149,74,224,10,8,7,175,235,141,172,1,131,227,186,143,14,153,89,158,102,40,32,246,193,95,33,242,123,40,147,241,160,74,185,176,126,108,48,158,204,110,187,108,49,111,81,144,132,191,91,116,233,0,233,200,96,147,212,146,162,157,166,247,94,134,145,252,150,64,242,26,244,230,79,181,17,142,153,242,203,
+230,110,253,217,84,67,174,77,158,24,166,216,87,70,166,231,113,25,24,186,63,194,129,158,216,183,125,62,117,93,197,46,136,15,200,146,52,43,103,100,254,166,189,53,238,227,204,230,122,217,60,60,58,245,245,167,92,73,102,233,195,215,106,119,239,4,225,143,21,102,49,208,21,101,134,192,240,131,237,218,172,179,174,101,239,104,229,92,52,2,155,154,65,189,121,128,192,233,25,252,108,35,15,158,195,219,93,175,202,219,106,217,187,12,248,240,171,202,132,109,234,13,95,253,204,247,1,181,85,150,198,10,58,56,142,43,112,32,7,181,135,64,30,215,225,184,223,225,102,105,133,36,241,218,203,115,46,83,154,54,25,252,201,247,202,192,122,124,7,88,241,63,28,224,7,7,29,224,231,236,242,0,63,255,159,199,189,195,199,93,123,130,97,193,227,199,49,87,187,227,137,47,229,207,106,8,87,209,238,125,181,24,55,246,101,76,103,123,94,214,59,207,219,233,197,98,78,204,190,108,115,68,202,155,152,119,59,155,159,51,88,42,231,103,249,88,54,244,24,184,157,82,61,33,233,213,
+159,172,78,185,143,203,120,14,4,69,43,241,36,55,108,146,155,12,108,118,16,2,227,245,71,109,191,110,152,226,110,94,217,167,86,107,88,79,182,207,169,31,46,6,127,101,219,93,158,8,93,234,37,197,180,202,110,222,203,134,205,101,176,204,164,135,252,198,161,169,90,58,171,95,166,166,187,146,63,147,61,213,62,246,67,181,176,8,107,153,64,140,246,221,120,36,43,77,142,108,182,220,4,32,95,95,17,29,60,155,255,17,131,105,77,158,77,75,142,122,97,219,58,1,123,53,188,113,29,126,63,195,235,47,46,119,199,25,87,63,250,79,255,175,255,243,135,255,254,95,127,249,171,95,125,253,197,223,127,249,241,87,95,191,252,135,127,242,215,223,253,240,245,119,63,254,135,127,242,229,23,223,127,251,251,223,124,247,229,111,191,255,221,151,191,250,230,219,111,255,230,155,95,252,253,15,95,254,243,247,191,255,242,159,190,249,238,199,47,63,126,255,229,183,191,251,254,23,95,127,248,225,203,223,252,231,47,191,249,250,227,175,190,255,229,63,251,242,205,183,63,126,253,221,119,223,
+252,248,235,255,248,245,219,255,252,229,155,95,254,223,191,255,225,199,253,121,191,251,230,55,95,191,124,255,183,63,29,248,207,191,252,219,191,133,15,252,242,139,111,127,253,139,191,255,245,119,127,7,95,246,127,255,119,240,37,255,230,247,63,254,248,253,119,255,236,203,191,255,213,215,191,254,159,255,151,47,255,233,215,223,126,251,229,215,251,251,249,242,239,255,215,191,254,63,254,167,127,251,87,255,238,203,55,63,252,240,235,191,251,238,55,95,191,251,241,7,228,38,144,147,127,243,139,31,127,255,205,183,95,126,251,253,15,191,254,241,215,223,127,247,229,155,239,126,249,229,183,223,126,3,223,220,79,215,251,225,203,47,191,254,237,175,191,219,191,250,195,254,229,95,126,253,197,183,223,252,238,155,195,127,252,116,26,248,110,126,251,55,223,127,243,187,95,126,249,175,144,143,249,171,111,254,227,87,228,165,223,125,253,225,235,183,95,127,241,227,159,190,103,127,142,223,124,15,31,240,235,31,255,248,118,248,214,254,235,127,142,44,233,191,248,215,95,254,183,111,224,115,252,8,47,226,
+47,191,126,249,187,175,223,125,61,188,239,167,245,134,63,223,239,224,183,194,183,2,191,249,123,228,51,126,249,246,112,252,47,191,34,159,14,94,154,31,127,245,13,252,238,111,190,251,242,55,95,191,252,254,135,175,191,68,174,242,211,121,190,30,206,250,195,119,191,254,237,111,191,194,171,240,183,191,251,254,55,63,189,255,135,127,117,184,194,255,248,229,223,252,155,95,255,230,155,191,251,250,175,254,187,255,246,95,254,15,255,244,95,254,55,255,2,196,134,48,159,40,20,10,115,178,131,255,70,205,203,220,30,47,26,147,152,150,159,56,219,41,227,125,112,238,168,99,180,65,99,158,116,1,20,234,20,218,229,81,248,90,123,6,160,49,162,75,104,199,188,66,159,170,181,247,70,237,3,112,149,169,5,180,215,69,201,201,212,174,237,230,168,137,14,123,97,230,31,31,63,93,27,89,249,174,212,182,218,248,63,171,210,147,147,252,245,184,63,29,89,186,163,145,58,241,184,195,94,172,91,214,221,228,100,116,41,237,100,207,217,34,207,46,126,189,94,83,55,147,236,182,245,82,222,109,
+106,254,242,226,142,238,154,77,79,22,15,164,228,72,238,226,214,151,47,246,215,237,217,41,142,93,224,159,44,222,202,241,124,84,72,10,36,228,203,54,120,25,96,142,219,85,55,86,243,156,164,57,159,71,187,8,127,189,41,3,112,73,179,106,212,63,214,151,174,70,35,255,241,88,158,85,95,140,41,234,218,112,108,246,149,37,235,105,113,36,174,103,99,151,109,139,227,244,126,21,42,219,237,103,178,176,43,182,181,49,159,182,198,161,215,101,138,227,7,52,149,147,111,30,228,139,146,110,99,171,19,122,74,222,190,115,146,41,222,180,6,198,182,16,235,152,117,2,160,201,191,44,166,189,159,150,104,24,99,114,94,110,206,6,243,104,144,93,146,138,92,253,234,180,246,113,42,75,13,211,77,144,231,136,84,36,126,129,218,76,228,43,193,206,17,149,217,124,112,226,38,224,177,66,219,206,8,27,219,181,110,117,204,183,172,228,6,114,97,154,233,100,24,245,251,140,133,85,13,137,29,215,133,53,77,70,101,45,219,10,230,29,254,50,83,17,69,51,220,81,227,98,55,159,232,207,
+178,253,51,102,131,211,145,173,22,172,163,204,51,103,27,188,80,106,57,22,11,251,233,82,5,4,184,23,204,152,137,16,31,64,246,73,86,228,155,205,189,44,249,245,229,37,89,138,193,188,167,150,153,155,27,92,57,195,107,197,29,186,2,134,183,235,137,52,192,134,183,64,71,62,52,171,104,99,92,139,18,219,155,230,187,211,217,238,135,233,89,82,120,70,28,19,93,45,119,154,75,63,119,217,212,2,248,110,79,249,205,117,187,39,203,181,6,30,57,175,239,191,107,118,30,94,57,15,119,202,34,106,42,98,1,39,222,17,80,61,197,81,231,150,19,65,254,184,48,138,232,222,77,168,108,201,213,143,156,180,99,171,72,247,137,16,226,15,70,47,153,245,40,234,191,238,219,154,231,163,167,72,221,28,85,103,223,8,93,50,181,212,104,64,14,228,135,47,141,234,135,158,65,107,150,134,164,161,27,63,134,104,178,126,220,153,142,140,189,60,207,17,47,68,21,119,197,124,167,201,70,165,46,135,225,14,219,85,238,47,151,244,248,246,156,220,8,77,172,204,35,118,64,117,89,84,
+48,37,252,180,68,153,21,191,194,107,22,27,213,120,15,168,70,234,233,221,70,86,148,60,55,157,163,173,99,179,208,171,222,5,156,178,28,94,229,123,128,153,236,81,6,210,226,218,198,41,137,108,244,251,240,128,163,74,67,175,229,123,211,196,40,25,143,20,237,112,243,233,189,55,37,173,226,165,130,234,169,159,228,71,209,188,100,148,219,30,185,77,55,240,138,20,99,54,23,197,30,209,73,236,113,89,49,1,89,212,1,240,202,135,97,72,95,199,225,201,249,253,21,24,231,62,229,70,17,147,196,194,105,229,131,134,108,202,184,67,25,223,172,150,226,140,154,170,137,40,74,76,168,127,191,155,128,202,206,224,158,52,232,227,102,151,183,175,237,237,251,214,89,148,46,79,85,171,172,99,234,27,205,67,188,155,69,143,62,29,12,48,37,79,64,49,38,198,10,93,188,249,254,94,150,213,238,182,43,198,202,165,205,193,87,166,66,249,18,27,127,89,189,98,155,55,215,41,234,2,163,149,223,92,151,2,27,19,222,162,178,52,67,221,252,72,225,188,44,214,2,51,245,54,219,228,
+172,38,194,2,247,232,97,20,53,191,210,99,77,246,229,72,232,139,200,153,211,196,121,158,227,224,208,141,46,182,201,221,91,183,134,138,59,206,184,17,161,127,176,163,139,154,227,226,66,195,72,70,163,6,114,135,101,233,124,220,83,167,203,164,131,90,88,6,69,28,198,83,216,230,132,131,237,216,207,182,37,232,146,187,155,27,67,192,107,103,8,42,149,173,66,139,111,27,71,214,134,200,146,203,66,18,82,177,239,237,73,197,41,205,145,229,3,183,142,51,125,57,232,188,47,105,235,72,242,50,209,118,52,15,93,220,60,94,155,18,2,142,169,157,105,9,79,249,177,93,235,216,199,106,57,169,113,90,221,82,133,159,39,98,255,206,201,92,60,69,34,237,166,154,207,39,91,216,137,166,179,66,230,71,181,201,153,74,136,47,248,218,141,94,177,152,82,133,84,87,124,69,210,186,208,231,219,247,50,188,141,232,127,173,10,234,54,126,1,28,43,147,10,219,199,206,26,17,178,210,106,67,11,40,133,176,103,207,207,239,148,197,116,60,25,141,142,202,40,70,108,247,200,122,126,139,
+179,66,250,122,99,148,190,234,167,112,121,185,201,166,188,30,63,167,234,157,234,231,154,110,40,223,21,101,158,57,238,168,52,133,130,166,118,138,217,123,48,13,172,87,61,226,211,96,99,178,122,74,155,12,175,147,9,189,7,194,203,231,86,88,139,119,63,219,206,2,246,154,166,252,210,51,202,111,47,138,29,85,29,123,111,176,14,107,158,123,152,94,80,28,195,251,46,125,99,111,241,132,85,148,217,16,216,230,130,215,112,58,22,6,46,122,172,107,151,239,233,88,134,122,188,233,7,79,184,108,28,174,50,111,247,61,18,20,133,226,52,159,102,207,111,11,164,147,26,69,252,41,154,221,13,94,41,157,204,234,51,213,131,0,7,203,92,121,61,191,149,2,100,57,19,234,151,92,69,28,191,92,74,168,80,109,0,251,65,180,39,28,190,103,201,4,80,183,93,222,172,26,47,96,98,74,231,203,148,17,133,71,97,107,175,244,8,103,140,229,42,98,23,115,184,132,110,169,44,244,176,168,24,39,173,180,131,215,99,202,162,255,225,154,4,78,118,235,199,93,118,25,184,143,39,235,
+157,57,111,86,203,36,228,86,131,21,231,231,147,83,231,187,198,216,105,59,118,64,207,11,219,192,244,232,156,220,103,213,46,233,243,241,243,69,105,246,102,14,233,218,153,160,118,85,109,214,221,100,123,58,28,176,168,128,194,154,243,249,184,93,231,91,71,45,23,211,148,126,57,55,87,140,167,150,62,79,5,71,248,243,13,77,34,108,55,141,96,27,221,35,150,109,187,68,96,188,62,122,126,108,45,136,141,124,150,76,112,155,166,47,116,253,99,69,124,146,164,96,204,212,80,171,115,101,106,224,141,184,129,162,95,40,158,223,116,162,234,225,179,213,10,14,250,107,38,139,57,56,166,85,235,105,250,75,103,238,237,72,170,10,230,53,158,225,231,225,3,53,66,97,24,195,53,74,70,247,187,188,232,18,148,30,203,43,194,76,254,32,40,218,178,133,203,230,84,185,251,12,127,208,19,209,173,172,114,94,171,27,237,215,5,195,209,117,225,220,216,160,182,165,51,107,63,38,62,78,216,227,24,101,8,112,136,57,233,167,210,131,161,17,195,217,27,147,169,234,99,231,177,204,142,249,
+246,150,192,184,202,38,85,92,144,68,191,73,150,212,114,101,223,240,174,28,241,228,110,18,182,92,24,126,120,249,81,54,254,10,24,37,34,102,70,248,85,209,234,100,119,165,100,55,156,205,112,251,125,151,167,66,231,104,43,71,101,107,239,213,106,40,154,253,47,120,165,60,66,226,248,124,119,140,152,234,172,90,225,221,27,238,76,196,245,227,195,32,42,115,157,108,54,76,215,98,116,229,123,90,136,39,227,209,19,137,46,165,237,148,57,38,170,166,150,149,125,46,50,43,218,244,126,100,147,194,103,106,197,188,194,150,237,233,185,18,215,16,180,199,58,241,236,150,247,222,236,224,212,211,69,215,178,176,62,225,63,63,228,124,112,21,71,225,250,162,222,56,117,91,127,65,3,30,169,40,118,153,3,171,163,184,202,51,70,159,247,249,43,117,123,52,166,16,229,252,146,232,56,227,215,229,181,190,143,181,165,193,249,88,55,194,59,155,172,99,200,62,227,148,148,242,246,73,54,219,136,62,39,74,176,113,34,138,28,95,118,194,195,171,43,84,236,121,174,254,52,215,91,179,39,92,
+42,44,207,170,195,37,35,246,153,50,182,181,163,179,157,212,62,86,201,185,253,205,241,16,208,183,50,169,104,242,78,174,219,30,149,50,199,14,193,186,245,48,32,207,118,205,110,57,209,236,134,229,71,165,197,243,117,221,37,172,183,138,55,183,149,132,35,116,178,188,253,28,166,248,141,135,196,232,66,213,190,68,165,12,55,11,144,57,18,206,85,134,151,203,87,150,68,45,124,176,26,232,23,231,125,5,131,43,100,213,204,206,148,169,57,147,202,2,4,3,190,205,33,118,154,74,60,81,93,154,231,138,247,85,215,68,113,197,81,100,35,15,79,99,103,49,125,165,72,223,2,248,208,248,198,196,56,147,191,248,74,137,250,244,86,49,48,44,232,31,149,247,242,170,173,57,238,23,244,142,179,76,138,140,237,183,68,97,186,235,253,99,177,148,204,20,178,206,251,228,45,194,104,244,154,217,174,109,228,176,146,195,81,167,239,61,115,139,14,143,34,221,204,91,172,82,80,70,79,235,116,181,164,24,45,109,92,214,140,242,195,118,27,85,148,214,239,162,202,103,165,211,47,94,151,206,
+154,248,193,86,56,108,94,43,198,181,35,122,141,66,82,83,85,62,6,63,38,70,71,178,164,119,195,177,112,103,156,241,250,55,36,131,252,45,241,110,221,232,57,238,252,35,207,75,123,91,251,76,43,15,185,159,181,247,171,197,46,89,46,87,155,55,87,235,119,23,109,195,172,147,84,87,254,130,161,87,81,151,153,230,93,113,220,156,90,23,226,141,251,161,90,71,127,76,116,231,27,74,123,179,10,88,195,37,207,37,127,217,142,144,122,54,235,145,143,248,128,107,201,56,71,222,74,165,105,40,141,105,181,92,143,70,178,222,197,182,245,57,118,196,59,57,85,11,70,125,206,139,19,40,196,201,31,24,255,169,67,91,122,108,176,71,213,151,198,91,193,93,23,208,75,3,54,174,217,214,125,204,231,185,133,217,1,20,93,158,85,95,170,62,185,31,143,118,10,69,79,55,182,29,17,207,19,23,73,214,192,89,209,151,194,38,175,163,29,237,132,238,239,194,2,75,110,91,13,200,50,111,199,51,139,64,199,198,220,20,124,6,151,140,99,54,38,59,172,132,3,160,133,125,113,193,
+57,39,157,24,159,247,93,242,68,52,154,237,223,211,87,19,214,139,109,177,46,181,239,223,182,181,119,147,228,85,96,5,41,131,41,195,175,13,70,11,207,250,134,109,201,75,242,97,76,139,153,37,150,163,190,72,88,246,160,131,20,198,214,151,75,50,199,214,18,201,68,97,233,58,139,148,127,61,185,242,229,70,189,12,151,214,143,158,230,229,126,126,165,141,35,95,45,215,206,77,113,118,177,53,245,39,232,242,236,242,94,89,219,196,66,215,37,143,89,81,242,86,13,197,49,244,140,231,30,13,18,10,21,101,240,97,90,205,74,87,103,26,222,164,157,152,149,46,104,162,185,195,218,246,152,210,33,204,211,184,166,14,147,142,45,248,104,234,68,142,246,54,68,119,212,75,238,242,33,86,79,139,236,64,137,48,182,188,139,23,185,118,38,149,168,125,48,215,179,236,241,78,190,106,124,48,251,62,58,237,221,65,196,61,114,196,139,139,153,147,97,57,243,190,245,154,31,15,167,184,226,180,52,216,60,49,80,55,162,162,57,149,255,4,237,247,115,115,220,243,114,186,232,181,239,103,
+1,21,120,162,169,44,173,126,159,44,50,191,181,147,9,13,156,224,41,97,52,245,200,253,200,75,78,212,151,236,74,227,99,134,27,146,152,10,194,14,235,98,20,226,27,174,240,230,82,220,237,104,177,68,129,50,251,217,245,106,184,142,249,116,141,180,188,124,81,26,217,232,168,237,146,212,146,53,66,109,60,79,18,41,123,203,253,140,186,196,29,91,241,201,246,232,177,49,19,41,86,46,86,63,69,110,185,84,180,254,218,119,85,186,75,105,206,105,153,71,21,105,233,126,139,250,153,153,199,6,127,147,233,83,11,153,241,238,18,37,182,30,17,186,132,148,138,241,198,162,65,153,90,186,126,212,159,0,16,186,68,81,204,156,195,238,198,132,17,229,109,168,177,246,212,235,183,37,239,28,83,98,118,176,116,61,133,48,226,246,130,149,96,168,184,68,173,213,80,210,217,58,142,243,99,249,248,69,207,124,158,106,248,41,54,101,76,79,52,209,89,81,212,100,53,249,146,237,248,56,76,21,91,105,11,188,129,237,172,223,205,27,79,47,53,35,133,79,22,232,38,10,243,162,249,52,
+86,95,174,78,120,167,147,109,60,172,100,190,17,158,116,112,89,242,32,91,106,62,248,65,178,227,227,254,36,173,149,122,112,239,38,130,46,44,100,174,18,170,194,86,78,12,108,143,109,244,60,145,73,233,76,208,157,185,249,124,108,191,36,180,165,22,140,180,40,242,169,137,5,240,166,39,108,212,231,155,250,233,199,238,237,116,55,155,172,233,45,254,246,173,24,112,109,183,149,150,171,182,109,155,212,206,237,154,167,43,111,167,163,199,173,110,86,124,220,237,92,234,157,115,190,105,237,102,254,242,135,115,61,36,186,214,188,74,56,171,88,110,76,39,86,151,159,209,147,20,12,101,158,119,114,186,76,122,220,219,148,36,116,58,173,53,56,243,150,54,220,54,216,192,84,84,159,4,236,227,48,249,104,43,242,123,197,197,161,42,61,191,119,168,175,62,170,188,14,107,240,226,171,42,227,170,211,235,182,218,154,32,112,121,39,254,169,163,150,245,233,173,87,209,77,168,204,238,158,87,55,204,163,249,233,128,199,82,138,60,115,162,57,191,154,63,90,241,143,232,76,31,11,78,197,156,
+46,219,225,202,196,102,38,140,218,90,111,110,151,157,33,84,74,159,237,28,99,190,248,116,163,168,19,173,13,137,233,206,180,241,9,138,247,39,51,9,39,192,105,59,155,145,94,207,180,253,44,127,122,228,34,87,197,202,69,146,57,156,203,115,125,94,105,73,70,109,165,183,215,145,112,50,58,17,129,67,66,149,187,122,8,30,53,252,130,226,201,71,255,145,165,219,246,250,155,246,168,8,26,174,239,88,154,161,72,29,45,136,122,229,1,76,44,74,59,101,21,128,206,125,128,117,194,24,168,125,36,208,120,230,235,191,199,201,67,81,252,81,69,183,161,112,99,44,235,241,163,63,198,226,168,69,195,101,17,126,34,206,28,186,230,99,223,250,225,36,144,76,218,54,238,211,80,129,83,179,144,98,190,12,206,128,187,21,113,140,45,153,207,147,170,21,15,95,184,60,247,202,22,100,239,163,170,230,29,196,251,43,130,50,52,81,99,77,203,240,4,60,149,248,69,241,119,149,41,133,42,98,133,93,85,213,51,16,62,79,151,89,198,157,169,70,136,13,99,38,217,241,34,173,119,197,
+46,113,111,78,217,106,178,188,186,220,57,29,239,31,103,197,80,89,193,206,51,31,165,171,222,166,146,22,198,108,161,167,56,38,16,154,136,8,208,13,166,244,137,251,164,207,59,111,206,167,19,219,202,125,185,211,178,29,182,155,146,232,77,116,132,155,55,218,94,52,116,167,142,103,49,240,146,116,138,115,92,186,176,0,163,151,59,138,195,166,47,89,199,34,63,243,82,150,20,159,17,212,1,7,230,76,15,140,149,113,255,131,142,207,233,72,215,134,243,196,107,209,23,44,53,166,252,197,88,61,244,222,190,11,125,153,77,252,218,214,40,59,82,233,40,25,231,214,158,44,91,131,224,106,246,44,179,46,122,140,170,167,55,189,44,249,4,130,98,166,57,108,121,239,225,47,244,120,58,55,249,175,67,209,71,161,60,116,15,18,74,35,31,55,187,108,221,134,220,220,228,231,249,217,74,77,71,93,14,151,215,46,173,45,164,179,69,52,79,234,12,135,164,118,48,226,211,145,67,119,146,153,8,225,50,61,40,179,15,179,12,254,229,113,49,17,189,176,3,76,86,210,127,210,46,154,
+214,219,19,167,168,165,110,212,173,143,229,235,71,235,217,91,58,102,74,51,123,18,203,116,12,38,232,4,165,181,163,195,55,48,52,158,142,80,203,97,175,62,201,243,207,219,136,208,78,159,213,244,108,71,193,233,211,240,253,75,168,214,73,16,223,186,47,93,175,105,135,149,12,122,53,175,198,147,51,166,97,70,192,29,132,69,205,90,178,103,92,95,147,134,227,107,53,94,49,91,29,87,239,141,167,87,22,230,217,51,254,178,43,48,213,13,92,82,216,218,109,161,179,166,157,187,188,220,108,213,206,197,184,85,158,174,151,159,166,151,77,126,151,117,205,18,240,31,71,202,84,94,12,162,179,237,118,200,147,237,54,37,39,127,219,74,205,94,74,133,183,36,92,158,109,253,88,25,233,52,253,246,198,244,93,214,59,44,30,84,102,95,54,96,70,74,199,29,217,143,198,122,156,176,195,188,39,142,174,207,189,253,187,147,157,114,186,125,126,242,41,108,156,232,163,189,64,72,224,105,119,243,37,67,151,199,116,26,227,158,22,223,47,165,203,65,147,230,66,89,67,23,200,125,127,225,
+88,172,55,53,157,33,155,201,130,150,171,26,49,11,174,49,97,73,138,199,253,61,107,84,75,135,197,55,121,24,184,125,166,209,238,60,38,141,125,53,183,4,38,162,141,2,228,9,184,26,194,66,213,29,137,62,186,83,56,197,49,141,155,155,240,147,254,62,107,46,169,173,139,171,199,218,76,253,24,10,148,69,157,174,48,196,187,189,199,125,178,106,73,205,82,142,166,222,146,102,70,140,4,92,181,89,204,182,209,176,230,63,64,18,142,242,225,201,56,182,105,78,245,213,84,124,9,248,67,128,213,58,89,92,120,177,76,107,125,212,90,49,203,102,42,47,4,137,172,242,181,162,105,49,21,47,173,159,11,35,96,191,102,89,158,237,96,139,149,167,241,35,23,186,198,133,123,90,202,126,114,251,194,14,41,122,209,178,188,191,197,234,185,211,19,193,170,5,73,130,189,109,99,125,55,85,235,18,140,187,35,45,127,113,37,217,10,221,89,49,203,105,39,148,82,2,149,31,6,214,115,217,185,232,193,53,241,251,37,19,127,135,170,120,153,205,56,31,194,87,203,11,51,100,158,10,
+228,225,237,77,71,84,60,35,99,72,210,244,52,195,54,173,157,195,83,47,141,236,238,228,53,201,167,139,243,205,103,188,253,138,207,221,187,38,111,47,151,161,211,87,166,236,100,104,9,53,70,183,241,104,224,28,124,148,212,174,242,233,243,89,253,193,42,218,44,57,91,31,189,54,34,152,36,113,50,205,199,73,169,150,6,222,185,154,193,65,115,169,21,30,65,121,61,41,228,184,41,222,144,112,19,169,140,163,44,220,67,163,155,114,184,62,35,12,158,220,64,42,119,174,101,124,28,122,19,244,181,136,71,66,37,167,134,137,190,204,234,58,169,188,251,193,192,250,157,67,83,123,179,148,47,55,122,238,226,170,71,166,59,112,84,93,36,131,149,151,4,178,194,182,103,28,28,171,79,63,102,250,97,173,161,91,74,91,106,67,119,113,84,42,192,1,38,159,174,82,121,143,164,172,119,185,19,247,102,149,175,2,74,147,159,192,196,113,75,145,105,202,65,186,124,203,219,12,198,68,223,163,51,23,142,139,141,61,139,214,87,92,82,150,237,64,129,42,234,53,4,114,239,140,97,29,
+135,78,236,230,155,84,37,134,187,188,176,46,251,242,183,208,172,52,103,31,211,84,133,54,89,171,182,127,24,13,109,181,237,131,126,99,187,18,23,226,94,25,229,182,231,148,75,184,162,92,31,26,224,141,83,67,153,240,57,7,110,95,181,148,147,39,147,75,66,155,146,79,207,177,62,111,94,42,102,245,25,124,173,229,22,207,143,118,23,163,26,93,186,116,160,107,27,180,38,125,36,49,105,208,171,21,245,161,225,54,49,197,220,107,117,111,13,64,23,247,249,103,174,191,66,59,109,65,214,75,126,181,193,158,127,40,52,131,178,237,163,228,235,93,187,77,88,3,97,42,228,104,240,137,250,58,116,2,177,8,163,241,232,168,148,76,169,63,179,195,25,115,243,81,201,37,172,102,103,250,236,201,47,89,179,162,156,144,80,114,109,218,25,7,130,16,133,78,24,25,63,68,2,169,194,78,99,92,7,180,189,165,234,242,241,174,19,224,221,133,140,19,145,255,56,211,202,197,103,18,10,249,130,131,109,140,240,35,71,104,162,93,241,28,60,210,228,125,82,102,15,56,85,210,165,62,
+233,31,211,93,26,44,111,153,44,230,116,79,83,225,42,106,126,161,158,189,169,244,47,250,211,146,168,253,238,91,43,244,30,242,68,21,234,102,217,124,198,99,115,213,153,73,31,92,216,23,175,35,116,164,185,47,155,53,120,106,171,243,255,144,246,94,205,201,68,209,150,216,95,153,39,63,219,158,42,151,255,130,127,198,117,205,212,248,150,237,177,107,238,245,59,18,2,145,17,57,11,132,68,78,34,54,25,145,69,206,177,105,16,57,231,156,221,250,190,235,235,177,199,111,230,137,102,119,159,222,103,159,189,215,94,139,230,72,124,181,95,190,124,56,234,211,120,189,21,31,18,93,194,166,108,155,139,107,181,195,160,227,139,108,40,95,82,158,61,228,59,69,95,20,152,179,32,248,253,42,188,48,26,137,205,201,174,144,88,90,241,172,168,242,153,182,208,50,238,205,251,153,133,152,100,186,231,167,229,168,198,120,167,103,19,141,216,241,242,181,76,77,18,148,23,94,187,102,121,204,141,96,125,122,100,38,222,90,39,255,89,205,226,22,39,11,26,84,94,187,101,8,72,32,170,252,
+40,222,157,46,191,142,177,244,114,105,217,23,128,76,244,152,70,63,161,134,51,205,8,115,34,209,6,157,24,1,174,221,146,111,194,142,106,230,63,85,47,109,36,174,94,235,70,26,206,130,73,111,100,110,48,254,221,231,0,247,11,165,243,54,106,45,220,233,194,154,87,254,28,52,152,188,138,137,233,234,109,156,62,235,56,191,97,154,243,26,162,37,182,172,140,230,221,73,126,175,28,228,2,90,222,181,94,218,38,151,82,95,174,23,183,7,130,188,214,142,233,143,138,184,47,27,94,212,36,1,32,121,80,213,97,80,60,132,185,115,209,83,92,92,1,194,251,231,250,26,47,215,41,178,168,242,29,106,4,78,198,38,227,146,105,78,166,112,71,172,225,142,164,20,141,5,115,253,45,122,156,156,186,116,196,0,105,203,122,215,157,198,6,7,205,206,87,249,125,182,68,16,174,74,135,6,154,207,128,237,107,115,26,17,170,202,156,14,244,162,201,230,244,182,240,141,231,214,247,235,14,239,208,82,105,32,181,206,196,224,50,230,99,111,52,163,218,79,141,137,173,65,22,182,211,97,
+65,236,153,108,97,19,236,73,225,190,245,12,248,68,144,133,33,50,139,172,152,141,195,144,114,237,213,86,119,24,114,164,137,182,17,220,140,73,147,245,116,46,32,165,150,251,89,103,4,179,7,186,64,240,57,251,36,52,162,34,158,164,19,16,241,8,126,217,101,5,218,53,182,46,198,8,50,174,65,226,0,173,241,127,214,98,76,123,130,183,231,78,55,88,183,197,84,161,87,190,1,162,232,21,99,177,136,193,39,111,246,37,31,9,217,11,113,232,37,183,24,94,39,130,130,253,117,76,29,51,118,214,175,209,55,80,119,60,138,189,233,96,33,12,40,176,203,173,69,191,136,222,187,149,4,150,111,110,46,113,185,68,110,153,211,31,181,130,250,176,240,100,247,178,95,54,27,141,205,168,248,90,189,41,41,64,15,91,32,59,13,175,66,207,239,95,186,50,196,119,43,239,195,195,236,229,73,0,169,130,165,89,133,186,244,171,193,84,44,184,195,66,79,117,73,43,27,103,35,7,168,30,60,8,60,70,135,8,183,91,119,69,194,228,15,44,33,17,239,41,239,13,151,50,3,233,
+227,52,238,3,38,150,65,200,135,250,115,154,57,37,1,227,51,98,8,228,71,159,244,252,70,143,62,16,42,37,78,150,254,241,139,29,118,114,75,47,131,11,218,155,206,152,33,128,98,123,166,72,203,184,41,46,1,96,31,69,131,118,4,246,163,68,130,73,246,109,69,250,221,104,64,19,82,103,105,20,102,35,65,54,15,1,52,36,10,200,30,161,31,182,155,50,3,196,32,247,140,116,70,53,51,211,76,244,8,201,127,63,212,120,10,14,42,151,140,127,53,60,103,227,153,233,123,232,65,112,74,154,116,144,253,206,180,88,157,161,245,108,206,199,185,198,74,126,123,26,166,174,159,244,230,232,55,240,185,116,20,100,103,186,36,39,170,51,55,96,254,188,207,105,134,97,137,232,250,222,65,187,29,180,221,73,21,188,169,69,224,220,191,216,34,42,33,227,153,13,20,109,152,217,13,209,121,20,162,195,58,198,103,65,224,67,174,78,138,39,181,210,182,78,250,113,44,198,124,43,2,181,103,118,174,62,56,198,223,165,29,78,145,28,126,3,231,200,226,204,187,99,36,187,67,41,
+53,126,86,56,177,228,88,241,40,51,234,24,83,75,62,18,44,199,176,246,204,92,115,117,97,149,68,230,62,101,124,200,25,226,207,221,212,23,112,171,146,16,70,9,247,106,114,144,135,207,130,113,113,182,221,24,241,204,178,158,46,238,49,183,162,83,121,140,59,101,144,154,115,225,243,199,253,46,144,193,164,185,188,218,92,198,86,46,20,54,37,31,119,246,74,180,104,209,185,196,32,206,115,121,115,109,137,42,252,23,64,89,253,112,108,146,81,20,192,146,174,108,38,139,206,217,116,28,76,168,72,2,90,99,90,70,227,32,218,37,147,192,243,27,24,42,249,146,131,35,129,79,229,244,60,254,133,27,247,218,119,203,55,103,131,107,101,62,16,64,125,149,171,173,14,13,57,123,37,100,25,4,92,83,31,48,144,10,203,248,111,128,129,233,32,67,197,233,209,216,154,59,165,46,235,123,200,101,85,15,78,4,123,87,39,232,149,30,30,241,214,111,119,179,145,243,75,3,22,59,103,157,106,166,180,113,79,16,168,14,222,243,33,116,59,187,72,56,155,202,65,241,82,25,141,111,
+118,180,187,98,152,51,16,217,130,248,225,56,232,217,82,0,219,110,120,142,200,196,190,79,69,39,195,128,178,18,55,223,158,227,121,8,35,60,68,28,111,120,243,136,108,214,78,101,171,169,138,227,24,139,142,75,152,4,61,43,158,82,233,175,194,216,224,109,244,92,227,152,245,181,56,39,221,173,228,95,234,182,244,239,23,145,114,64,6,77,74,201,145,210,244,84,207,181,204,142,164,187,239,174,126,42,50,5,193,87,68,47,116,129,250,59,89,254,226,192,204,24,60,109,134,47,119,58,170,189,132,101,199,155,49,32,36,141,153,201,147,172,134,197,150,73,203,186,107,138,217,27,157,144,10,1,242,234,196,244,1,109,84,176,0,230,82,29,108,153,240,33,153,91,173,227,187,49,192,203,119,152,201,136,253,114,117,237,165,96,188,136,184,67,230,140,32,162,25,202,123,156,217,178,70,228,42,79,200,217,11,237,97,214,122,239,26,243,209,155,130,44,24,74,3,249,201,221,209,208,48,32,223,115,91,159,77,56,79,239,153,105,167,187,119,70,64,187,132,208,179,196,140,233,6,229,
+109,96,249,114,55,35,34,187,2,149,218,138,121,214,232,131,52,107,190,247,168,72,79,134,233,162,199,46,107,219,189,116,188,107,241,115,203,57,254,113,11,193,205,13,196,237,67,235,192,29,92,113,34,145,75,228,243,216,200,77,84,241,179,111,139,28,68,208,6,92,246,148,75,56,133,142,172,111,122,191,160,157,129,76,32,167,242,80,94,24,43,80,45,150,94,222,86,86,208,201,187,52,52,142,183,110,113,208,159,63,125,160,223,177,194,94,43,209,94,52,100,201,29,140,80,150,240,220,81,49,23,50,106,212,137,96,250,64,114,130,110,100,90,179,169,54,115,232,110,38,47,64,115,222,104,194,97,253,253,131,142,2,61,73,120,101,103,9,89,152,46,172,130,96,18,134,174,197,120,220,2,1,185,59,91,82,62,74,148,223,244,209,136,143,240,29,51,236,205,184,155,249,147,175,202,154,3,213,232,64,222,131,134,186,95,227,69,76,86,134,72,14,13,51,159,164,32,64,249,172,136,3,7,108,182,72,38,127,229,62,247,35,50,6,191,164,12,44,89,183,248,93,22,96,149,29,
+2,83,85,140,206,26,8,189,237,94,175,89,7,171,26,143,252,137,37,43,179,184,101,129,222,48,40,214,242,12,236,44,196,226,56,14,12,211,5,157,136,24,132,106,146,15,152,209,38,111,16,95,144,24,124,189,6,235,208,64,186,15,34,87,126,139,8,92,103,200,246,128,55,76,239,186,47,197,90,225,150,69,19,12,217,143,233,133,232,7,244,110,129,238,167,98,249,120,80,20,70,62,0,218,127,202,122,15,125,191,62,103,240,164,170,207,77,82,61,5,176,108,65,89,212,32,113,86,212,101,47,225,189,161,233,254,46,186,95,252,113,217,227,244,181,69,66,196,231,57,157,228,21,40,209,189,39,158,250,176,169,7,219,126,77,50,216,6,155,188,76,224,27,251,5,188,101,36,89,7,170,60,59,244,20,105,226,107,61,252,198,67,154,204,152,13,143,42,17,184,114,152,46,122,142,102,65,63,77,162,221,155,180,63,217,137,88,106,93,81,8,172,252,0,114,182,8,46,96,240,132,177,51,130,14,68,230,244,150,13,217,228,121,129,195,129,87,246,24,135,66,140,133,203,48,132,
+120,216,148,236,145,6,253,61,225,217,246,247,4,198,223,244,244,175,255,186,179,88,255,113,7,63,168,246,142,45,238,161,11,116,242,168,46,111,161,208,70,85,218,240,183,248,255,30,127,221,228,173,55,227,43,141,203,72,7,205,232,89,112,34,249,75,92,58,105,120,180,182,248,99,2,143,54,217,140,111,154,172,192,109,221,139,64,231,232,42,211,229,13,205,216,155,69,156,158,126,211,21,155,228,27,147,231,62,158,140,246,132,227,46,160,107,178,73,70,116,198,228,29,142,41,93,87,51,100,118,237,228,136,144,137,66,197,184,248,223,176,100,13,127,195,178,218,219,81,186,21,3,29,30,74,192,97,143,118,206,81,244,11,112,255,6,238,62,120,27,176,1,199,164,244,27,20,56,38,121,160,148,73,212,138,74,104,218,75,79,233,69,55,106,46,173,103,38,89,195,180,45,163,132,105,91,209,14,220,175,133,218,181,51,65,154,53,253,3,111,248,129,117,16,51,143,230,215,137,230,196,44,177,206,173,153,158,200,48,146,223,93,61,12,205,244,129,96,217,247,3,176,118,105,41,253,
+223,68,152,28,96,198,192,224,141,21,253,93,18,13,122,158,204,104,182,125,92,202,37,179,172,42,57,189,79,24,226,105,124,220,61,15,220,231,135,166,51,44,238,93,98,47,128,17,225,55,60,154,196,149,99,96,186,50,48,255,25,228,0,131,68,158,53,187,148,30,164,233,68,196,169,60,253,200,192,195,103,120,65,127,173,23,54,200,164,122,154,158,126,29,59,113,122,115,178,137,61,248,248,224,142,65,154,132,128,252,204,89,86,202,12,134,92,226,165,195,175,77,211,196,149,225,79,52,55,201,232,159,104,10,160,144,21,41,103,250,121,25,127,194,176,51,90,116,18,42,168,124,209,110,173,27,62,111,170,117,112,49,155,1,156,75,191,126,79,209,115,173,24,28,73,63,27,101,121,177,141,138,154,76,93,255,43,115,158,193,90,86,35,79,214,22,54,119,79,243,5,138,49,39,60,197,135,100,107,143,17,38,189,187,34,25,22,24,69,85,52,147,180,56,29,255,115,215,55,38,137,231,182,241,103,60,78,85,141,200,213,73,51,137,122,234,5,220,176,79,210,191,102,222,217,109,
+3,160,207,248,195,221,88,244,36,166,125,225,215,226,253,169,49,242,127,76,120,141,4,74,82,113,151,123,195,8,59,26,158,168,124,108,182,46,103,39,61,186,196,127,242,29,250,155,239,51,107,2,96,39,237,152,25,178,101,18,186,243,35,101,206,203,240,181,231,167,245,147,217,107,104,166,222,255,139,124,222,244,239,88,21,191,46,227,158,151,253,32,183,25,207,46,245,76,119,44,22,208,159,78,238,232,11,231,129,141,223,172,197,136,89,203,128,74,79,239,68,14,21,245,48,91,80,106,81,32,168,175,142,26,250,31,165,58,73,27,96,244,12,215,94,57,27,92,196,103,51,4,10,239,67,207,18,201,158,57,198,113,250,0,5,147,141,219,84,55,72,38,50,7,129,63,184,225,73,144,5,198,35,94,242,249,85,208,4,197,248,22,65,206,166,174,99,51,228,236,210,66,169,161,93,137,189,83,104,62,192,61,107,99,249,212,63,44,74,109,236,138,62,203,83,160,203,14,69,127,15,126,36,106,77,43,201,201,37,191,231,83,156,110,123,232,203,209,84,40,204,50,208,222,146,40,
+156,226,236,15,66,220,255,160,7,232,117,107,178,154,125,164,240,165,105,38,137,235,233,76,140,210,112,48,107,66,107,205,204,144,205,224,126,204,31,107,215,4,187,160,38,114,129,131,22,94,109,23,197,52,43,27,237,63,203,211,8,140,29,16,105,150,182,16,237,36,204,220,241,175,117,146,6,230,41,96,111,47,178,235,199,132,121,58,123,55,148,119,173,196,188,48,237,120,129,129,93,172,254,215,122,31,55,121,227,33,211,253,158,128,22,217,215,149,103,101,212,61,67,17,128,209,188,133,223,65,218,144,161,106,4,65,92,166,184,161,224,178,214,156,100,195,155,86,67,143,85,236,98,58,163,195,181,251,91,186,235,67,143,177,49,198,227,141,176,24,140,186,216,47,220,89,38,164,32,16,207,174,204,212,94,226,159,39,76,167,174,17,141,246,5,58,96,208,50,252,63,243,7,5,247,201,204,246,81,123,254,196,253,220,77,140,18,234,226,101,159,40,242,205,91,17,191,146,111,171,248,152,247,179,212,44,54,75,185,169,91,38,240,90,93,177,177,171,59,149,244,84,186,198,27,206,
+160,202,106,34,199,211,195,204,123,198,252,41,192,98,14,99,134,149,164,201,26,53,151,96,228,31,172,135,201,122,22,250,176,51,108,89,3,18,82,90,150,98,107,230,24,54,243,180,229,86,236,26,195,228,57,215,188,224,174,187,43,131,234,119,11,110,92,181,151,48,22,227,86,140,43,25,232,127,224,125,111,192,233,7,60,59,138,42,83,73,94,137,177,0,39,91,87,79,8,86,35,196,19,171,3,79,195,231,145,116,97,79,76,136,229,90,61,100,71,113,115,30,211,129,241,32,86,166,198,79,45,73,11,61,103,48,62,16,212,228,182,154,95,85,56,127,80,115,143,67,233,97,89,192,140,48,159,73,229,97,49,223,7,116,118,9,149,252,35,227,227,82,142,88,99,63,14,166,128,69,147,61,6,4,132,174,243,209,167,88,250,187,178,78,62,86,230,236,87,40,59,39,40,2,95,208,242,161,192,167,30,133,213,192,50,107,89,188,189,61,67,69,122,30,208,91,42,192,68,245,147,131,78,18,78,228,22,2,55,233,153,122,217,189,53,186,215,189,3,221,151,105,222,121,77,189,
+123,206,115,241,196,120,106,93,89,64,205,81,182,191,195,201,145,191,195,85,19,128,65,167,119,154,239,107,92,185,25,201,191,78,243,100,109,111,98,194,204,156,185,76,82,45,57,236,190,150,180,207,194,70,85,96,198,18,159,35,179,132,167,107,58,41,89,205,1,173,47,104,148,248,152,69,114,196,139,112,127,241,111,143,49,83,103,253,131,166,75,205,210,9,131,52,177,205,122,250,92,69,11,37,96,252,49,96,90,112,81,128,46,243,81,95,9,229,222,91,33,248,251,77,47,241,229,207,132,128,209,101,45,25,74,181,26,58,105,116,41,70,40,91,9,73,95,253,207,241,62,0,52,224,113,13,3,211,46,32,104,19,118,172,24,204,211,225,178,208,154,255,148,5,127,102,131,114,163,217,58,67,156,42,105,191,22,207,177,131,47,177,23,128,77,156,122,91,212,118,252,161,196,194,24,160,151,15,179,241,103,102,60,64,251,29,60,88,6,88,135,251,150,146,50,64,131,113,17,143,126,121,26,111,240,110,48,86,230,207,162,207,2,128,50,120,204,194,138,111,50,50,254,2,136,58,
+93,215,108,37,8,244,35,100,14,81,30,102,159,137,39,163,221,27,94,100,26,24,211,247,213,166,62,181,202,154,178,115,187,53,221,210,193,39,5,153,63,237,143,219,139,167,183,12,44,185,58,22,218,0,45,244,74,190,55,57,229,147,137,2,147,219,65,230,156,87,177,36,204,47,28,102,131,156,218,164,140,205,248,245,226,62,134,159,95,189,227,161,212,236,4,88,213,174,68,9,172,103,6,188,95,110,203,12,138,26,88,49,241,226,67,1,100,79,157,120,237,211,198,113,16,233,62,28,60,148,244,228,10,231,175,100,5,117,245,44,57,82,191,196,191,195,73,161,116,2,90,206,108,95,253,100,65,168,84,136,177,130,107,72,156,101,117,121,163,141,138,249,235,120,35,127,130,153,158,160,206,73,69,80,27,152,249,158,241,62,156,130,45,57,118,49,142,250,181,248,44,104,255,210,70,173,136,158,181,187,107,186,230,50,96,166,86,30,127,148,120,249,156,100,224,165,9,118,175,188,151,43,217,131,160,147,252,152,13,210,127,90,219,164,187,69,130,57,170,191,111,39,111,65,9,34,
+111,218,137,211,68,11,199,114,23,241,172,190,108,164,48,229,207,198,153,144,8,12,124,255,229,47,204,31,158,194,12,169,157,15,43,178,237,89,3,5,178,20,131,160,112,198,14,208,22,2,57,8,12,28,209,63,235,193,75,127,107,30,137,50,246,220,125,186,77,209,118,1,40,194,241,126,5,248,196,168,157,174,221,188,62,231,49,195,45,110,114,150,210,41,138,29,88,8,94,224,123,8,179,171,114,175,58,9,228,36,21,73,1,180,15,186,205,106,83,38,2,139,159,69,15,229,199,220,39,215,215,220,172,112,108,234,20,211,35,128,94,183,81,99,127,47,56,238,175,192,210,101,204,55,18,17,185,45,107,113,150,34,138,181,190,80,155,208,244,121,88,193,53,39,196,187,5,16,204,182,12,102,177,56,231,237,158,196,130,223,217,193,184,71,218,134,29,125,132,131,117,207,36,116,237,205,179,194,238,115,249,148,36,42,130,146,178,128,50,37,226,56,250,151,188,2,236,109,104,141,16,104,212,123,233,213,159,55,219,34,94,74,61,81,246,14,251,201,242,187,94,245,141,239,252,122,
+241,8,229,139,130,249,43,114,50,57,126,230,35,184,144,66,82,44,88,163,56,156,241,33,216,61,181,200,78,210,192,18,15,193,201,100,161,221,106,161,175,217,225,235,221,106,35,205,152,164,195,84,12,164,63,102,113,233,204,79,91,61,159,138,34,48,218,251,123,154,251,139,119,121,154,39,0,9,237,241,90,236,91,246,231,214,175,17,182,109,44,180,226,108,33,183,236,211,196,6,122,131,82,244,112,25,67,108,152,68,206,23,39,197,193,41,101,191,91,12,239,25,212,55,182,183,65,18,235,17,96,118,211,13,155,248,67,186,193,232,161,63,184,184,47,32,83,238,141,18,192,16,73,159,23,252,159,3,180,237,239,60,85,195,84,111,38,60,248,240,208,125,146,122,164,126,174,223,50,67,180,25,134,208,79,69,194,100,129,126,202,28,41,172,218,126,19,244,46,45,120,2,93,203,123,153,152,148,223,73,54,201,224,238,141,169,21,197,135,179,174,39,24,160,207,207,219,231,151,223,52,53,37,241,208,230,57,115,28,94,162,47,238,199,169,39,64,100,48,238,206,214,80,62,239,250,
+95,52,79,121,169,248,79,54,76,131,55,160,11,153,22,198,180,22,158,27,149,151,213,80,10,184,141,227,9,179,65,193,181,176,189,63,200,168,84,133,51,123,96,204,42,200,217,39,64,153,53,105,21,57,189,39,100,8,183,56,70,192,44,202,178,204,122,82,3,15,83,115,238,111,50,252,204,215,225,181,44,96,119,98,6,35,180,108,34,3,77,2,242,35,222,229,214,247,148,52,96,11,125,189,97,54,230,223,26,27,244,26,28,76,72,146,49,102,34,74,246,115,24,161,235,186,80,67,102,244,213,168,166,48,88,189,194,55,202,71,49,255,134,5,22,60,137,3,102,102,216,169,112,44,142,50,14,194,240,243,215,239,135,217,112,65,185,208,29,52,5,79,182,153,166,19,218,199,46,92,227,216,13,146,204,252,105,235,228,178,50,51,87,192,206,120,210,168,88,109,117,74,235,181,103,209,86,39,10,81,246,167,168,253,79,121,45,128,236,227,79,102,250,6,82,162,39,239,227,203,72,158,126,33,90,78,68,232,231,16,2,116,111,188,134,124,154,84,167,53,176,187,200,206,84,154,
+38,186,31,151,69,7,237,87,7,124,66,137,142,8,52,246,83,21,123,10,22,21,68,123,217,155,252,147,49,220,233,20,237,63,159,251,41,123,243,214,124,123,178,31,189,33,112,96,233,43,94,240,222,58,211,94,16,69,21,91,11,223,69,191,3,234,54,247,162,204,177,139,111,147,27,140,75,239,53,205,6,217,156,189,30,163,191,207,193,92,65,145,252,207,236,22,20,139,243,160,147,175,191,79,159,52,253,195,146,188,193,33,162,251,140,224,86,38,209,149,143,127,102,170,67,146,127,188,119,85,128,212,167,101,205,175,53,178,168,0,173,6,112,46,5,127,139,230,242,68,38,222,85,81,126,171,245,18,168,55,134,73,130,100,231,103,36,94,54,248,148,76,10,215,52,42,110,153,179,159,106,209,140,141,184,159,56,109,142,116,98,232,187,124,3,177,86,50,43,168,72,116,109,180,136,55,56,236,204,188,97,241,42,49,159,103,189,13,79,148,92,142,146,192,25,219,72,50,45,156,236,166,45,57,165,27,193,179,235,97,38,26,131,65,130,189,50,176,180,251,65,252,145,51,236,173,
+204,178,10,179,176,4,81,151,138,222,167,148,222,67,197,33,61,252,189,101,81,53,28,201,239,35,74,49,127,249,249,250,13,247,139,137,105,128,182,19,85,22,60,132,219,112,223,156,237,4,41,15,135,155,56,66,67,48,108,20,112,162,217,5,90,111,4,67,118,35,138,178,123,67,64,243,3,220,20,249,121,209,27,104,29,193,56,23,199,253,6,79,179,193,207,230,63,123,9,88,14,134,66,208,240,247,43,26,246,170,76,197,178,190,182,212,71,72,164,133,151,218,91,253,6,240,185,157,20,11,134,138,3,169,143,152,85,131,73,71,142,136,215,111,252,191,183,211,118,37,176,172,168,166,151,104,201,43,38,216,149,12,170,216,129,176,154,123,25,151,212,31,60,221,50,102,19,47,144,30,149,229,97,115,170,12,138,15,31,121,240,180,216,165,105,167,76,192,32,48,101,26,207,63,142,135,1,154,7,37,128,164,74,107,167,46,155,160,54,26,32,20,211,211,226,60,27,47,78,191,112,22,49,172,47,10,102,168,40,237,228,222,210,83,52,244,19,230,151,210,154,170,132,248,21,7,
+80,253,224,102,109,173,98,205,233,132,24,247,110,199,170,20,117,246,245,171,120,145,23,211,223,178,170,41,51,94,33,162,2,190,212,235,11,4,104,183,42,31,78,62,184,245,162,164,249,246,54,43,113,156,211,137,249,154,143,31,48,138,139,8,218,94,201,183,194,48,248,155,83,32,101,204,107,115,253,176,196,26,211,48,166,76,121,185,131,179,51,196,202,38,112,115,32,152,34,109,98,78,201,92,6,242,173,198,247,72,99,22,155,98,40,42,17,253,148,209,208,37,31,210,198,74,238,53,108,204,237,212,80,33,201,126,175,183,170,13,209,158,16,57,64,236,228,131,199,42,11,180,249,54,74,49,8,166,31,222,243,65,141,117,94,61,188,216,237,26,122,241,99,22,132,215,67,130,79,199,226,174,111,156,59,138,200,157,162,12,239,23,128,239,218,209,80,178,141,39,66,150,147,134,138,210,83,66,56,240,48,158,175,91,237,102,175,180,183,87,196,177,73,83,179,137,205,124,224,160,72,127,130,53,199,227,239,217,144,148,30,25,139,122,132,69,84,111,247,238,224,116,50,31,101,21,
+26,156,78,23,195,111,58,245,248,232,73,66,137,177,82,138,157,174,128,217,85,247,120,35,145,156,209,127,45,139,120,187,137,9,53,59,8,34,101,151,174,254,29,243,1,11,49,52,146,167,236,70,157,142,189,189,4,127,31,189,92,22,175,131,93,23,139,156,85,236,219,20,118,39,189,224,86,182,164,189,225,137,69,22,161,146,103,191,187,145,221,209,236,20,53,60,207,181,102,236,198,232,80,98,239,60,158,66,85,219,67,58,112,80,31,107,6,104,65,36,22,1,127,127,127,103,62,60,172,75,6,59,77,166,150,124,92,142,197,2,18,210,154,198,120,232,199,234,240,38,129,239,136,128,140,183,116,153,219,202,170,248,225,180,56,199,105,184,125,23,196,137,223,178,108,151,4,244,55,25,142,214,71,235,33,237,240,55,133,147,108,143,152,31,253,185,76,63,167,102,62,65,120,57,183,174,141,235,202,243,58,187,175,38,185,198,245,224,40,165,60,151,73,73,216,184,246,130,97,225,125,7,179,220,219,45,50,191,121,206,195,249,125,31,100,221,61,247,203,221,125,128,56,172,198,109,
+249,236,185,4,135,213,135,25,203,244,128,131,49,132,208,200,36,203,146,207,91,217,34,78,75,97,212,251,2,14,152,158,59,161,147,131,163,131,120,42,145,122,72,81,82,136,59,94,16,158,233,15,69,184,105,192,200,182,175,126,52,199,118,210,44,83,219,141,94,129,18,16,154,168,137,177,92,82,34,163,134,115,254,2,139,160,26,194,53,5,151,212,172,174,131,154,248,179,201,99,22,243,183,218,98,115,163,205,137,225,172,9,230,25,36,194,192,130,156,201,162,134,95,20,187,112,49,141,76,241,81,190,201,233,196,195,35,98,166,101,80,6,59,239,47,163,123,246,246,29,198,74,24,120,162,248,43,23,101,150,27,47,254,129,209,1,31,38,123,178,35,163,139,112,233,235,111,12,13,88,20,247,66,42,204,178,23,124,8,254,1,254,127,153,151,54,82,168,236,153,112,239,143,247,126,163,200,246,64,226,154,210,56,211,61,88,126,201,37,204,45,85,159,239,224,222,244,67,145,194,156,139,9,223,176,40,244,194,215,19,237,145,63,71,66,239,120,60,180,232,61,219,228,99,172,24,
+24,131,194,226,255,117,222,73,232,85,216,81,194,147,33,102,222,166,36,3,230,210,92,240,5,11,184,213,137,53,158,63,57,115,180,15,250,6,169,129,91,130,221,253,200,176,99,193,211,123,226,243,105,227,224,123,13,64,185,245,235,73,161,156,4,242,88,29,121,203,60,43,238,126,238,5,249,102,237,229,163,89,175,227,48,11,48,142,175,189,247,241,194,148,236,165,137,57,11,251,119,57,44,228,6,39,63,236,29,139,50,157,98,223,210,53,201,111,199,92,226,100,19,254,235,120,44,107,161,154,80,8,167,163,248,158,10,86,79,93,165,62,40,114,7,158,182,100,38,164,160,230,184,155,200,31,111,220,143,14,71,90,3,178,36,141,55,253,109,167,120,182,43,162,48,214,224,225,134,168,34,255,8,6,61,66,14,170,234,116,194,81,149,220,107,148,230,10,162,221,251,241,55,12,193,97,3,243,50,151,163,99,98,225,109,66,55,42,57,173,160,244,105,169,230,60,241,25,135,149,2,162,236,63,43,54,76,6,69,227,80,255,78,219,29,124,212,157,65,137,12,77,205,155,189,191,
+46,182,127,163,191,65,186,58,222,191,14,91,222,173,145,198,215,67,146,46,250,219,167,240,112,159,250,253,97,73,34,253,55,1,173,152,89,12,200,199,209,10,162,238,207,9,51,184,103,255,208,161,218,195,51,50,71,206,101,123,118,139,110,242,130,59,168,8,40,121,10,94,48,11,4,167,145,252,118,103,194,220,31,241,47,187,57,254,135,127,254,55,255,227,127,250,199,255,248,31,254,233,223,252,243,255,244,143,255,244,103,47,200,191,251,199,127,248,95,254,183,255,240,187,103,227,159,254,253,63,255,31,255,251,191,249,159,255,241,63,254,187,191,219,82,254,225,63,253,195,255,250,239,255,249,223,255,167,127,250,221,13,243,255,218,29,242,95,110,222,248,183,255,245,191,253,175,254,155,255,238,191,253,239,31,145,205,71,236,35,2,129,220,95,255,236,222,40,241,167,2,44,155,190,117,8,62,241,88,177,35,197,91,105,150,180,212,196,25,42,18,66,236,53,34,132,68,230,158,156,98,234,87,81,192,144,31,144,53,42,159,77,107,137,29,111,151,189,252,229,211,70,192,190,139,244,
+222,181,226,45,243,227,252,38,124,191,105,121,47,244,103,14,86,252,194,97,11,209,195,33,231,141,163,229,61,32,62,175,215,241,72,40,149,74,181,183,237,214,179,247,168,100,141,253,241,42,60,218,85,74,149,74,123,226,222,60,249,237,166,47,203,65,159,33,237,208,185,13,154,179,214,205,180,157,139,1,27,171,52,41,176,142,84,203,32,186,237,190,100,79,149,49,147,233,108,95,140,203,224,199,178,234,55,30,155,232,164,206,15,146,216,103,144,210,86,141,173,210,64,121,124,147,218,166,183,71,71,209,48,106,222,248,156,137,231,229,117,224,17,105,45,41,142,208,150,176,126,120,243,208,233,83,39,77,12,89,166,25,219,95,148,32,63,163,247,14,27,59,223,216,206,174,111,236,157,114,3,230,107,238,171,91,118,205,28,205,195,91,35,185,63,123,153,167,159,125,252,217,217,194,217,39,225,135,42,94,20,14,85,94,100,159,173,140,65,115,242,188,4,8,167,156,208,84,124,43,123,144,117,19,94,236,80,154,232,4,165,147,196,57,149,11,44,92,102,126,119,93,87,243,60,49,
+161,76,145,184,207,118,71,202,53,29,69,20,142,108,146,55,86,250,82,221,118,99,154,101,224,189,146,181,24,126,237,68,135,2,181,108,215,85,143,146,166,160,242,25,245,46,138,137,77,221,60,242,233,139,81,82,87,56,12,211,232,161,237,153,232,133,92,207,57,66,234,86,96,91,115,243,154,89,81,18,232,64,70,40,32,96,42,47,165,83,195,172,219,111,202,126,101,149,160,227,15,17,215,125,117,8,21,61,178,41,182,136,26,183,244,157,198,108,188,222,135,169,49,12,134,237,173,231,64,237,75,91,189,85,155,185,138,47,28,34,86,167,145,107,130,109,216,91,223,187,27,185,51,9,114,205,234,245,126,205,20,62,180,206,194,212,120,47,87,9,114,151,217,108,186,64,211,143,244,92,66,49,24,90,253,188,15,169,92,87,239,17,120,119,158,254,67,170,202,156,66,90,189,219,42,137,17,151,145,118,177,167,42,85,243,242,50,215,70,21,149,109,165,41,117,42,112,200,41,20,138,190,230,212,76,186,167,216,174,14,152,202,252,109,219,152,189,168,52,163,45,81,202,192,146,62,
+11,231,114,221,92,216,212,227,2,67,73,206,109,155,87,220,181,70,183,115,56,127,10,66,254,157,187,132,33,36,225,30,222,169,114,91,73,18,45,240,236,79,155,60,78,160,20,36,101,213,156,196,181,108,145,126,214,156,62,235,45,4,177,123,129,0,65,171,124,65,178,74,230,215,235,180,149,241,145,171,84,197,30,201,171,111,185,190,167,227,150,16,110,152,66,236,108,151,182,195,42,105,221,103,230,100,83,59,76,26,9,143,183,133,253,166,131,37,230,150,157,203,63,22,133,187,8,97,63,49,50,146,152,59,6,83,94,155,200,207,23,43,153,76,80,8,23,239,87,169,31,28,91,238,168,177,42,97,156,39,111,103,155,120,185,146,7,158,20,49,238,236,88,243,79,127,222,185,51,238,200,54,77,160,189,209,211,24,205,78,214,183,67,123,166,95,24,212,46,163,109,161,63,3,107,159,51,31,18,36,24,110,247,177,37,82,185,139,77,201,90,71,26,13,247,110,67,150,156,232,198,78,90,125,236,123,156,58,77,222,209,252,9,83,182,235,100,4,129,195,232,126,78,250,8,111,
+197,230,34,160,63,140,61,237,112,158,151,108,143,178,195,205,232,230,42,237,110,19,135,227,214,56,34,139,225,222,68,88,186,23,152,207,243,17,39,176,237,175,239,137,129,251,121,94,148,158,231,163,253,232,146,43,133,37,115,55,75,186,212,234,177,14,207,181,177,88,127,218,113,183,123,129,197,191,61,83,132,163,164,137,63,249,166,187,213,119,67,187,115,221,243,102,178,91,213,105,255,24,165,228,120,8,219,10,97,142,12,241,78,94,203,102,191,205,203,203,222,239,170,99,173,48,121,195,48,175,80,205,27,151,31,147,84,213,105,135,223,22,133,101,25,54,123,105,236,39,167,110,47,236,96,185,138,167,70,160,150,223,223,218,103,21,48,155,113,140,154,227,184,40,72,220,143,207,202,25,61,199,1,76,9,235,94,63,124,93,18,115,186,75,60,238,22,55,45,205,27,24,22,120,102,43,163,19,214,176,136,99,143,230,98,200,251,151,32,79,14,246,192,60,255,25,38,28,0,232,109,13,93,207,250,208,137,23,47,113,4,180,6,205,17,188,147,13,129,86,8,239,70,191,161,123,
+229,77,230,89,95,35,189,168,151,213,62,193,68,155,75,134,175,227,60,127,162,190,172,110,164,240,109,124,62,59,117,64,252,181,22,186,220,167,137,134,80,120,191,68,173,157,141,138,81,34,230,66,210,25,159,115,182,174,87,235,73,42,177,247,91,160,207,207,25,119,181,46,65,203,157,120,125,72,154,104,221,75,41,158,12,28,247,158,141,4,135,199,49,97,58,225,246,37,139,215,241,167,231,179,184,200,40,148,25,254,60,159,52,55,212,227,51,93,242,48,240,147,225,186,102,62,231,245,216,217,213,48,82,240,134,103,241,135,172,113,231,156,234,46,197,243,156,157,187,174,68,163,238,218,19,133,218,212,156,54,42,168,217,148,205,93,44,94,159,159,38,150,241,179,242,58,60,179,174,22,183,24,115,191,6,61,154,210,149,114,154,55,172,125,0,201,78,89,104,93,231,86,32,192,174,122,226,69,224,216,219,4,221,130,51,89,126,231,57,45,199,180,173,193,30,48,164,209,44,64,226,77,202,103,235,129,44,250,252,117,194,247,19,48,12,249,206,209,25,185,191,77,133,123,9,179,
+66,3,166,158,226,112,78,139,117,120,51,251,247,112,139,221,5,175,229,245,72,119,49,6,152,42,207,17,200,244,30,176,171,185,142,27,222,20,208,26,227,125,115,40,41,53,61,8,144,225,204,56,90,151,243,126,95,44,107,145,53,235,58,211,168,231,5,237,240,218,61,161,198,101,28,164,16,220,141,135,154,43,163,62,187,132,179,143,103,220,157,221,3,87,222,254,62,255,209,120,212,156,122,34,241,110,109,82,183,176,131,32,246,61,157,161,238,107,89,231,120,150,92,95,146,247,122,38,96,106,59,161,119,34,176,33,204,173,75,140,65,181,73,133,132,133,59,138,172,42,146,109,142,217,196,134,185,243,182,187,185,214,137,82,128,226,178,236,148,167,137,229,10,150,249,190,11,71,11,211,251,151,73,43,28,122,131,115,185,164,15,37,43,138,83,199,85,58,23,149,234,225,90,33,228,11,215,205,117,61,160,183,168,36,227,51,42,30,213,233,103,39,97,146,15,65,151,123,143,99,178,108,25,229,156,7,220,104,188,95,129,128,154,227,167,73,244,67,207,108,102,159,23,199,235,190,
+171,36,155,219,81,213,25,117,10,108,4,90,79,69,122,234,228,195,196,81,120,167,17,110,67,115,136,77,118,29,131,225,248,237,220,124,118,80,187,183,118,1,34,137,203,216,186,193,114,213,134,205,5,173,137,35,116,172,118,71,37,217,211,31,24,198,239,158,54,201,173,41,24,86,199,238,109,124,101,196,246,237,189,91,223,29,214,210,5,231,6,242,228,3,99,51,122,39,118,218,55,2,207,88,105,255,113,240,98,174,134,85,212,155,149,207,243,131,153,139,108,156,43,23,237,88,60,215,228,11,252,126,29,146,49,243,44,94,94,147,228,81,9,13,100,153,219,18,126,100,88,128,26,187,155,10,132,236,48,173,160,124,129,161,86,11,138,9,112,61,79,7,0,105,102,239,243,143,223,128,163,225,208,31,247,50,107,104,88,146,72,47,175,111,144,0,141,91,115,183,161,155,169,185,25,130,128,246,176,159,190,159,102,27,193,53,4,178,132,203,245,228,40,52,60,183,83,163,201,34,69,215,111,123,217,230,203,50,161,4,38,133,248,33,101,222,238,248,43,121,95,171,63,119,236,53,
+206,221,237,108,245,71,41,159,83,232,158,74,162,247,247,88,98,72,187,173,173,140,45,237,108,33,107,249,102,89,253,152,80,142,145,205,240,13,26,223,72,44,143,95,50,103,23,214,128,151,145,34,58,15,203,250,182,25,188,43,238,169,3,234,142,179,51,204,85,171,81,119,220,249,98,76,1,27,239,169,166,199,249,91,226,224,43,53,110,227,73,76,230,204,223,94,2,32,95,174,149,15,178,57,153,234,86,108,221,90,51,74,191,53,202,49,200,238,250,120,23,49,239,55,19,124,181,38,171,147,42,12,140,88,220,178,141,133,177,34,135,99,242,5,227,244,234,178,47,147,17,167,118,225,185,42,213,17,98,55,225,177,26,114,104,77,30,205,215,180,37,217,193,17,212,122,128,229,212,134,117,168,146,113,194,144,199,182,110,163,173,188,98,219,136,91,167,215,126,234,188,251,48,10,225,112,142,191,252,209,202,221,68,11,154,35,81,20,143,16,227,86,45,228,55,83,185,209,110,11,201,208,46,60,23,26,53,75,65,151,180,39,149,201,57,178,219,20,133,6,30,200,118,103,175,133,
+37,1,182,229,82,21,107,183,224,32,182,155,66,180,130,217,23,222,131,249,101,193,226,157,86,99,59,251,133,232,218,218,82,21,15,22,178,23,74,190,247,113,119,134,223,223,106,13,146,189,178,217,154,187,153,238,185,173,65,57,102,231,16,121,206,199,43,98,144,234,180,172,53,236,197,45,167,191,185,150,80,46,175,248,254,150,11,5,212,219,240,236,97,62,19,203,51,181,240,42,227,163,118,127,66,164,47,164,162,175,53,36,15,246,34,16,176,105,175,231,111,244,124,166,25,186,107,68,134,124,218,32,12,36,71,156,17,82,199,194,130,87,19,176,79,56,4,109,234,85,117,181,77,189,154,132,154,249,169,25,26,230,183,238,79,144,188,191,159,190,180,219,102,98,43,238,196,139,21,8,181,110,118,109,48,198,40,85,165,27,111,155,26,105,231,167,11,90,119,214,226,224,30,31,38,226,32,104,87,196,93,184,218,177,110,38,100,59,77,134,163,68,69,107,244,221,210,97,140,17,25,174,74,85,228,166,173,65,114,52,248,240,110,26,41,122,248,28,231,202,20,210,241,248,121,235,
+232,99,90,242,240,77,55,42,237,149,215,92,220,140,25,116,129,83,192,174,78,167,181,28,135,139,210,115,37,142,127,52,141,7,20,131,56,157,55,221,57,237,173,180,253,234,159,132,50,123,254,228,30,109,117,253,225,184,91,142,175,45,147,60,115,29,4,108,89,251,218,195,81,133,129,9,64,246,178,225,82,214,135,55,103,113,78,102,70,76,135,141,234,216,61,63,102,205,231,164,27,57,111,186,251,78,238,198,168,210,230,95,106,168,181,182,217,47,212,223,149,151,113,233,93,235,216,121,171,33,243,28,174,39,252,236,115,123,166,196,66,218,116,75,79,182,76,4,215,101,27,13,134,76,201,227,163,7,71,131,219,199,36,243,233,182,45,15,43,210,155,53,122,142,230,10,50,179,145,120,92,172,242,88,98,131,37,60,236,250,110,107,223,218,184,235,105,93,177,89,211,147,92,12,161,56,150,78,190,52,226,244,109,161,16,167,51,85,41,186,43,156,58,135,73,208,179,123,12,76,14,95,230,121,83,233,174,148,183,7,253,150,69,86,5,56,123,223,214,81,180,199,79,168,202,235,
+39,172,146,239,252,125,97,229,100,200,25,170,132,64,149,115,175,206,117,96,62,55,134,55,156,20,59,18,214,246,146,183,165,111,151,186,191,61,254,120,27,7,97,126,45,112,91,108,196,182,28,199,96,94,221,97,247,143,124,76,245,2,67,67,73,101,195,247,125,189,168,202,154,127,84,4,5,234,202,200,192,157,245,251,88,187,122,54,158,114,251,102,130,109,44,75,108,57,90,220,25,29,98,81,16,20,189,208,238,11,18,57,172,237,123,170,108,185,229,191,91,173,46,49,231,72,212,37,60,254,102,184,82,37,83,112,93,171,39,109,251,214,121,62,173,217,86,178,25,90,122,209,177,104,170,252,57,105,220,246,122,236,221,64,235,26,19,228,144,232,164,13,216,174,252,235,89,108,18,230,71,219,57,109,109,190,236,144,71,217,189,187,23,247,27,77,75,49,91,216,119,214,187,189,118,4,35,119,216,25,119,93,14,115,75,197,71,235,107,38,38,178,236,139,80,25,9,134,149,157,146,181,78,88,204,88,100,11,122,22,204,220,135,237,171,176,96,153,213,230,137,212,189,140,98,132,
+27,135,139,204,156,217,113,10,207,149,28,105,196,37,215,174,10,164,223,11,172,180,150,76,27,178,178,62,47,19,53,0,230,233,207,194,107,95,182,58,74,183,205,85,3,39,220,218,165,21,104,44,48,119,194,134,84,177,12,150,132,39,201,49,106,85,12,10,24,12,166,171,152,18,73,211,180,226,243,148,210,77,108,7,250,9,28,39,199,214,237,26,219,192,10,27,251,168,176,160,162,135,34,44,115,253,104,90,174,90,125,26,64,190,100,45,208,137,195,92,74,132,233,28,89,125,14,206,99,131,59,120,57,46,93,196,247,250,121,39,186,235,110,80,152,172,127,110,151,11,239,69,201,230,174,248,84,101,66,210,132,209,121,157,94,179,103,230,181,120,143,8,246,53,167,43,197,66,160,138,111,164,182,71,178,43,11,199,227,83,124,229,17,59,119,63,235,226,52,208,70,187,14,249,142,211,210,213,69,158,233,215,109,242,24,173,173,76,243,1,184,46,244,229,100,55,107,32,105,39,95,251,137,186,103,132,79,20,3,177,140,187,225,57,64,46,221,79,21,15,222,199,57,187,127,253,
+117,214,222,223,7,197,98,178,208,115,226,251,206,71,1,94,0,148,9,10,178,247,110,208,110,94,223,92,153,68,126,95,154,186,11,83,163,58,56,225,197,79,37,20,166,108,37,42,120,228,247,16,168,42,200,73,123,21,115,217,179,129,152,4,75,96,221,78,118,50,0,250,76,171,233,11,135,54,18,183,90,151,125,82,147,184,191,88,150,168,221,91,4,212,165,45,30,168,230,57,162,141,160,43,116,253,232,142,104,224,221,189,120,232,197,234,172,134,117,96,5,82,142,83,219,70,126,237,74,163,146,147,35,17,176,137,130,151,30,2,32,209,92,219,144,238,123,218,115,52,170,52,93,112,68,171,231,234,5,245,171,113,251,57,162,182,231,238,154,116,178,222,83,220,238,189,137,83,135,244,183,96,229,172,53,25,74,137,188,69,194,80,173,88,46,205,28,212,239,191,251,93,119,254,93,11,119,23,223,49,217,77,108,125,65,105,200,50,246,6,38,145,47,238,158,239,85,115,166,204,153,205,235,156,167,29,219,67,99,28,122,213,111,93,163,27,168,245,124,54,27,151,23,52,15,109,
+34,248,132,116,246,189,217,186,196,142,68,96,87,146,234,102,30,217,176,106,228,234,236,110,243,49,254,204,213,225,60,238,97,192,3,16,156,182,211,21,241,254,234,82,24,75,97,113,45,219,138,75,163,158,187,153,214,109,52,138,85,108,203,249,68,106,237,34,27,191,251,122,204,14,97,187,96,6,46,180,90,212,157,208,24,223,25,239,100,93,173,236,94,114,165,146,169,94,146,213,244,96,133,120,114,58,6,58,50,156,119,236,161,22,200,231,7,238,102,233,178,191,94,15,17,243,107,137,111,62,70,83,83,189,130,157,222,79,109,219,27,227,58,210,14,129,173,153,155,42,150,248,154,137,206,58,34,160,245,50,41,79,123,72,183,12,52,106,201,223,0,63,77,41,40,142,10,187,150,138,118,83,54,68,115,228,165,137,121,160,10,74,112,91,177,44,122,22,151,25,45,105,84,38,120,86,251,229,210,189,88,184,148,70,15,146,239,160,107,125,215,35,239,141,219,146,219,219,60,23,186,7,185,202,27,207,138,239,10,184,207,76,30,236,202,155,68,223,254,230,166,132,79,133,173,23,
+91,240,123,80,206,93,96,56,214,185,118,237,169,164,175,117,117,220,239,5,214,235,45,36,209,201,52,142,3,189,11,242,89,247,131,38,117,93,40,174,65,153,211,220,185,30,199,58,231,76,147,114,170,250,196,212,254,116,156,132,219,37,100,106,43,139,82,177,141,149,20,183,188,30,75,231,140,253,86,44,171,25,74,146,209,233,190,62,102,55,97,2,220,95,110,120,205,158,144,122,138,186,175,154,177,138,69,176,26,199,44,225,125,46,78,21,133,247,241,109,126,151,58,238,30,247,122,184,215,109,71,119,223,252,36,92,92,193,219,93,124,129,100,247,134,227,64,187,111,206,151,20,255,236,48,146,143,102,168,226,186,223,51,245,185,231,138,209,15,22,10,167,102,174,21,44,22,179,169,39,160,48,210,130,167,123,229,220,131,164,189,166,132,190,159,144,131,250,21,47,152,61,201,112,177,113,142,167,121,255,196,44,45,222,67,127,78,161,196,32,250,108,46,48,55,244,231,246,230,128,164,221,202,91,61,182,191,162,42,252,180,134,219,113,30,100,206,246,82,29,223,138,210,51,160,62,
+62,183,207,238,150,214,241,220,238,17,121,187,114,78,248,48,191,198,39,50,221,179,218,211,90,42,45,13,235,122,58,192,232,129,254,96,254,28,38,232,7,203,251,215,139,223,213,20,13,143,129,233,93,245,74,42,120,172,238,157,103,9,177,31,114,219,183,150,160,157,153,56,4,30,13,222,242,210,222,115,74,19,211,189,86,93,235,202,224,178,156,11,72,84,153,120,84,177,50,162,243,28,127,105,119,224,102,174,121,56,235,151,93,158,250,76,84,234,147,166,80,158,35,49,74,83,110,191,202,178,131,44,136,205,77,103,20,139,67,227,5,213,30,40,171,30,3,205,206,23,109,123,32,234,142,193,64,244,77,64,2,161,252,114,43,78,106,220,138,81,255,139,40,101,161,39,131,195,232,117,235,173,92,243,222,22,79,238,39,151,184,216,108,93,177,67,202,15,35,205,207,72,183,158,91,223,90,113,243,107,106,132,89,154,88,173,73,86,243,227,121,24,35,23,119,240,46,150,165,108,188,139,219,106,219,150,113,85,95,126,141,14,192,175,97,107,68,168,118,248,59,34,97,233,3,34,
+244,0,1,150,239,228,15,156,248,9,246,41,77,69,81,22,20,74,91,142,125,196,224,49,24,61,61,224,13,80,3,1,118,84,44,18,35,196,45,130,36,243,66,233,80,244,232,208,55,61,24,193,151,226,124,235,126,32,72,43,174,231,134,101,34,44,231,35,112,203,168,116,87,217,204,254,105,61,182,66,235,59,60,70,25,51,240,135,196,19,90,247,61,68,8,163,201,175,118,210,184,216,198,179,116,247,253,177,91,136,49,213,220,157,235,140,245,34,165,181,239,125,163,155,9,23,226,185,247,209,144,214,228,137,216,8,4,162,211,209,103,122,121,33,225,245,58,87,57,116,183,109,59,68,188,203,238,231,6,48,175,215,68,165,82,169,209,240,236,206,83,222,232,116,221,247,243,121,5,186,217,177,42,241,61,55,218,36,201,32,202,136,175,228,211,131,84,48,244,4,42,206,67,240,71,226,205,77,221,21,207,144,124,205,142,36,102,112,148,165,98,3,6,78,13,168,207,144,220,179,15,175,203,111,64,27,178,31,184,203,53,111,153,214,7,246,241,128,64,172,212,250,54,195,93,72,
+93,151,71,161,238,241,100,55,124,155,75,26,117,91,195,79,54,196,241,35,60,249,162,58,172,113,186,143,23,73,56,236,82,3,179,170,114,200,210,8,157,19,78,233,117,56,251,152,37,37,217,117,79,173,103,91,166,55,128,129,15,70,3,238,175,80,132,222,113,70,197,240,212,248,129,252,89,40,31,91,180,163,89,185,58,117,24,228,137,225,72,107,46,43,117,71,172,97,51,160,7,241,18,22,24,78,229,133,78,1,239,176,163,84,195,189,132,219,188,126,108,212,94,248,147,136,197,98,209,54,92,238,211,97,49,132,138,142,186,139,163,86,237,2,215,210,3,83,52,84,32,136,239,250,58,74,50,198,12,170,8,136,42,183,137,42,175,85,9,208,107,121,171,175,193,102,226,69,23,101,28,247,31,104,146,199,253,118,95,23,68,42,101,238,220,84,118,243,84,133,243,34,141,222,111,128,235,66,94,141,18,60,64,7,37,28,27,120,62,69,97,170,102,239,21,83,154,75,57,191,133,182,90,200,225,87,170,0,2,223,26,185,22,200,117,149,155,211,44,59,128,1,110,49,74,47,
+92,89,41,181,139,21,79,111,193,234,35,10,73,95,242,49,231,206,245,46,222,188,240,104,172,195,148,53,51,218,238,164,214,109,179,32,121,137,124,252,171,22,55,41,87,93,151,105,44,98,29,113,204,29,165,142,131,53,76,202,121,73,172,94,44,20,10,215,107,76,223,208,129,7,78,65,118,102,185,78,149,176,240,50,58,40,205,230,253,188,158,96,168,84,98,65,48,82,61,139,15,165,137,75,108,207,110,208,24,91,229,245,20,196,54,197,229,212,3,205,212,223,190,179,74,136,1,90,132,77,222,145,245,181,202,103,14,188,242,122,26,64,231,206,97,60,92,58,177,99,214,39,89,194,190,159,236,156,164,72,169,110,127,50,215,166,198,145,112,42,102,88,156,179,83,16,43,190,185,15,39,227,62,71,105,247,173,210,114,50,38,13,98,87,53,233,42,192,49,13,235,147,74,50,149,47,149,100,84,44,169,225,218,169,240,183,101,219,43,99,222,162,219,136,91,88,63,33,71,180,43,120,222,185,22,95,185,156,70,118,15,3,28,126,233,205,159,251,24,156,190,113,126,84,140,166,
+172,84,70,44,108,235,2,116,175,146,100,243,37,139,216,239,13,29,254,94,44,195,121,174,204,172,109,44,50,68,42,153,59,239,164,235,92,105,183,104,55,242,210,142,118,152,60,218,40,74,151,130,130,130,140,153,196,42,142,40,49,65,161,79,214,69,143,17,186,36,86,36,114,39,166,238,180,10,208,34,95,157,245,122,221,94,183,27,85,187,185,184,164,21,124,50,158,101,90,88,179,156,154,179,25,140,94,71,130,183,50,150,186,84,218,175,102,154,196,98,209,136,99,226,4,204,179,223,171,122,166,102,236,184,29,44,216,198,29,229,78,117,182,104,208,236,52,151,160,162,125,108,236,155,45,150,132,159,157,134,15,23,218,23,219,101,22,122,12,73,24,205,187,225,210,143,206,178,188,219,93,85,34,26,129,170,114,97,126,86,59,119,23,230,211,224,58,172,225,28,37,84,169,120,156,151,229,71,147,175,244,98,154,72,56,37,190,214,211,240,221,190,71,70,55,183,73,7,217,110,135,187,36,33,146,67,125,170,59,21,99,190,231,140,73,67,193,235,58,83,221,189,23,13,241,181,
+97,220,247,124,83,230,171,219,57,172,221,240,28,16,78,25,234,136,64,86,119,199,84,230,78,88,246,87,115,57,212,55,189,155,138,115,200,36,24,24,40,246,45,47,171,200,143,45,227,49,156,157,19,183,154,99,30,213,43,198,91,112,82,183,33,231,108,235,181,119,146,61,235,194,142,215,197,55,87,0,16,171,27,134,221,76,149,40,163,84,245,211,3,178,154,255,252,44,167,124,219,202,30,43,228,45,133,8,179,146,161,181,237,232,238,107,66,97,47,154,202,221,119,41,134,211,239,125,92,132,133,226,109,237,215,69,75,243,51,176,162,178,204,207,58,39,216,190,226,102,38,17,54,77,53,232,59,118,87,73,97,251,42,146,63,60,87,111,115,116,157,191,174,84,242,139,134,239,142,8,240,164,78,249,231,37,44,186,56,84,143,204,239,235,81,221,187,132,208,30,224,201,200,124,180,36,246,57,131,104,117,183,125,111,209,225,108,87,25,146,64,82,109,204,27,205,55,169,193,227,93,118,101,32,159,83,2,227,173,239,93,117,85,42,149,1,80,215,42,219,47,228,103,138,200,53,
+5,65,153,7,245,162,77,75,25,242,91,241,69,110,255,20,62,61,51,24,21,65,16,91,169,132,236,62,241,172,21,2,8,22,20,30,26,19,204,66,149,183,162,172,87,170,21,141,12,4,123,91,84,181,48,48,247,121,31,227,163,111,113,185,167,143,195,220,94,127,220,52,108,101,111,155,232,185,214,162,104,89,155,90,41,180,138,159,9,106,53,33,126,43,118,15,229,8,224,240,164,248,253,163,39,210,239,197,137,244,205,199,125,22,136,246,233,79,239,17,42,51,185,83,40,30,37,184,21,170,195,170,115,96,164,91,24,155,185,103,18,255,227,182,75,10,111,130,210,81,208,215,50,206,148,166,53,238,239,90,216,9,85,166,195,74,245,69,18,129,108,236,174,197,242,69,11,145,157,201,152,99,154,94,156,210,88,216,42,212,194,87,91,122,205,70,231,60,119,60,243,61,90,87,140,157,195,14,111,107,60,82,26,172,249,102,97,59,66,214,26,238,118,126,59,203,239,166,111,131,59,221,196,119,206,1,43,254,230,207,51,177,22,113,227,115,243,241,46,31,85,92,181,15,187,191,
+45,78,233,204,242,2,177,76,103,77,166,10,133,79,202,196,49,145,69,113,185,143,6,39,70,39,19,137,102,126,147,197,101,98,166,98,174,48,13,113,251,149,255,158,38,112,166,197,231,142,218,1,96,190,117,8,10,181,30,248,80,81,212,69,155,213,171,12,119,223,51,174,64,160,9,8,11,209,216,163,37,144,205,120,61,111,21,159,44,106,207,221,33,209,55,125,22,11,12,219,52,17,17,35,46,48,138,114,208,151,160,200,217,18,94,81,172,174,13,110,82,93,244,9,59,93,5,0,61,73,88,6,204,6,143,223,70,224,170,138,189,25,100,105,108,196,124,222,141,82,186,31,58,186,231,102,189,66,169,199,214,43,207,138,221,70,188,22,190,46,180,164,169,4,248,92,208,71,76,187,2,89,117,223,252,27,234,95,76,217,88,171,1,43,112,235,243,85,73,224,190,30,245,171,18,164,20,161,76,46,225,212,47,36,46,26,15,115,1,58,72,162,137,206,4,146,184,112,180,201,85,13,125,131,63,99,10,241,62,157,88,36,220,53,54,234,40,88,236,185,222,131,21,10,48,47,
+89,202,169,219,162,161,25,141,65,117,187,248,57,146,85,201,99,45,106,253,244,98,252,254,88,147,81,119,53,33,121,97,221,48,220,49,183,123,198,29,155,103,208,79,126,177,25,87,26,92,195,56,55,24,42,208,220,74,185,227,239,189,42,225,69,147,176,238,194,238,220,85,39,61,234,166,248,121,105,159,240,102,129,253,213,148,229,156,126,222,22,125,104,237,7,8,154,193,85,16,219,157,169,55,180,39,221,4,187,182,39,247,154,32,79,245,83,37,250,162,17,180,111,244,25,204,225,233,209,160,228,148,220,145,231,219,13,210,127,216,61,208,46,53,31,76,8,0,62,197,74,32,220,25,166,174,174,95,238,91,181,55,191,108,51,71,223,193,207,102,78,150,194,191,2,157,72,44,40,84,103,245,158,213,195,1,113,16,121,221,79,65,225,107,193,164,59,138,85,129,8,227,190,223,116,56,114,227,103,207,105,56,44,242,149,161,241,181,225,60,28,99,35,157,174,110,232,20,38,205,74,138,192,53,117,221,140,179,18,239,86,182,94,17,48,119,16,189,187,38,213,248,188,233,160,233,
+158,86,100,188,121,215,57,242,114,36,99,132,94,144,189,215,195,141,243,72,117,55,59,220,243,195,186,151,216,214,182,191,175,113,137,236,86,72,27,247,123,50,193,104,45,108,163,37,245,35,240,128,16,25,94,227,86,69,240,84,158,13,100,26,223,23,13,230,13,106,123,221,217,90,252,40,118,128,48,111,206,25,37,210,10,229,251,131,22,217,142,119,22,185,77,231,92,224,154,41,200,250,141,2,158,165,115,241,65,27,119,13,126,255,7,31,2,97,3,53,6,153,192,19,224,88,139,203,153,186,66,118,156,197,31,153,228,218,161,200,239,70,73,62,42,39,77,216,247,58,207,15,248,124,205,88,2,23,58,42,144,241,137,126,159,58,174,112,17,152,51,62,39,43,206,219,193,54,162,109,121,69,158,227,244,81,161,78,166,31,83,200,125,217,30,128,71,1,72,131,194,249,203,137,204,102,123,133,184,57,222,73,64,81,225,91,110,16,182,96,130,126,187,94,230,103,152,169,21,207,157,20,85,80,190,26,84,207,130,209,136,136,124,78,150,70,150,85,92,54,228,51,36,20,170,220,
+153,8,190,121,62,112,8,196,183,2,55,16,243,193,121,251,208,20,19,120,150,109,132,26,42,36,219,50,101,114,178,115,87,28,251,121,148,17,42,248,222,229,28,157,12,231,196,82,13,31,76,223,11,21,5,19,61,58,240,157,145,38,184,192,121,231,166,193,225,172,183,101,198,226,94,224,129,27,233,57,39,187,203,192,232,26,162,203,119,244,5,80,11,180,94,19,174,12,33,37,99,173,158,212,52,67,25,81,119,95,49,8,4,238,51,186,164,117,35,212,194,18,137,78,84,28,187,196,160,99,24,186,80,193,202,191,244,65,215,176,33,99,223,118,21,245,15,85,50,16,51,125,78,57,63,72,41,162,176,143,1,68,122,68,7,50,244,31,99,223,109,63,109,92,185,113,113,250,13,171,194,176,70,147,116,195,189,132,241,219,76,38,119,214,51,116,31,88,25,11,103,253,163,141,125,21,1,122,250,207,27,33,5,51,185,236,215,69,113,18,203,231,14,143,103,5,175,235,26,219,83,151,225,192,110,89,91,52,204,84,94,15,224,143,2,166,183,79,91,11,150,41,255,197,159,80,
+83,61,167,229,221,155,81,186,180,239,90,83,153,67,185,49,154,28,13,132,246,23,104,199,70,233,47,196,220,151,217,60,101,48,168,2,85,97,239,154,84,240,188,253,249,69,33,68,124,32,166,129,183,12,93,55,119,46,162,166,225,250,57,75,22,186,23,63,31,219,217,250,180,153,31,82,243,250,70,93,35,139,201,110,187,60,227,198,181,212,244,240,25,79,46,188,89,251,185,234,161,78,180,79,211,87,141,33,105,246,28,202,224,237,214,29,227,73,198,69,85,3,199,157,194,230,127,192,192,168,13,100,20,15,77,200,76,198,90,219,253,234,147,32,184,116,237,166,233,223,43,30,119,1,20,206,37,49,100,189,125,57,188,190,3,164,60,224,157,218,169,193,200,218,130,165,110,192,5,246,189,162,125,130,195,143,105,96,31,171,132,117,134,46,128,155,231,182,220,63,98,212,104,194,15,124,9,243,43,131,137,136,213,117,200,217,106,5,108,254,231,122,114,216,184,91,154,254,174,52,249,234,156,71,168,120,22,206,253,209,186,49,166,110,86,80,139,234,18,168,156,217,163,34,125,206,
+16,39,133,10,195,208,244,81,120,64,198,90,126,68,24,69,68,235,71,148,192,105,146,9,175,206,109,81,189,12,179,116,245,219,42,230,87,177,212,21,243,121,183,162,193,11,111,155,187,27,81,49,89,201,14,187,190,195,153,203,93,25,222,150,208,219,228,203,118,93,25,26,102,247,60,237,86,106,125,37,81,181,104,79,201,58,27,102,37,133,33,162,149,224,246,13,60,246,113,134,16,17,97,34,54,154,211,50,239,243,235,182,128,242,84,27,251,201,181,97,77,93,175,215,170,121,222,80,14,247,13,97,78,50,92,4,157,122,67,199,245,35,135,89,188,22,199,195,201,97,53,195,118,30,140,74,72,182,157,230,39,20,69,228,131,26,233,172,104,144,157,56,154,225,117,107,103,107,205,130,238,45,156,85,238,234,8,63,120,12,91,253,251,213,246,129,251,248,45,150,217,191,234,8,65,250,218,186,87,200,98,198,44,154,224,24,127,170,166,194,145,163,18,169,2,20,183,26,139,74,111,51,211,204,19,28,254,167,116,109,17,224,216,55,209,86,240,26,43,8,213,13,83,157,88,144,
+69,152,157,241,216,51,134,105,2,170,177,97,76,236,98,241,209,254,58,47,105,156,194,199,254,153,49,92,212,201,117,114,131,105,172,174,18,97,4,226,38,146,89,177,89,207,189,54,213,121,156,213,211,157,27,17,211,250,123,65,73,84,130,201,210,130,10,48,141,181,61,123,81,112,8,155,141,12,109,58,186,122,251,118,188,172,83,96,35,196,25,4,66,196,195,97,185,242,235,105,138,73,37,232,77,191,84,91,49,108,163,199,75,32,136,133,38,178,243,126,6,217,12,159,209,3,93,210,238,230,7,139,124,199,92,109,0,15,222,39,51,213,46,201,164,17,176,32,123,163,118,233,244,140,56,206,53,205,207,187,137,108,52,30,187,18,225,148,122,238,184,253,176,30,100,210,212,61,153,22,91,14,73,186,20,231,90,5,15,175,213,6,120,122,74,238,53,156,105,132,78,71,32,94,114,181,64,37,1,131,182,200,155,43,98,181,87,35,39,94,157,243,189,203,93,68,154,0,19,133,218,124,143,69,11,38,107,172,135,143,251,198,150,31,37,209,116,96,197,20,253,129,207,96,194,77,
+239,254,97,140,161,235,252,15,99,100,231,199,99,149,49,21,2,137,118,56,254,194,243,189,129,234,19,213,238,48,193,111,120,29,96,61,94,71,219,197,154,7,68,239,104,227,6,91,130,49,170,5,131,148,43,67,223,235,27,13,27,220,71,108,139,53,83,221,112,219,237,164,147,63,202,40,144,157,253,69,30,118,235,241,244,24,224,117,66,55,184,137,252,206,151,79,13,170,142,176,184,140,243,44,164,59,44,215,96,220,220,100,61,178,212,157,180,47,92,146,101,215,73,48,211,127,67,84,137,135,42,255,129,163,43,147,98,31,81,221,191,192,77,255,166,231,225,67,68,26,177,250,243,238,235,247,67,248,221,163,244,143,249,27,247,215,140,144,255,53,63,138,254,154,165,15,127,205,116,212,95,243,255,239,113,130,240,135,217,25,27,253,153,89,141,209,136,195,23,79,44,178,180,95,228,72,46,218,164,192,91,31,70,201,129,57,206,196,210,170,87,88,83,38,220,71,12,154,18,172,225,223,62,112,39,68,231,241,23,18,236,126,113,32,134,20,207,151,72,28,117,75,83,42,23,242,
+74,107,67,221,17,84,19,27,97,211,101,11,251,104,164,169,237,32,206,84,79,13,75,187,54,55,52,155,123,238,141,229,195,50,180,10,180,176,73,38,137,190,222,68,153,52,239,227,20,237,76,49,206,74,253,171,41,31,204,180,227,164,79,183,228,19,175,225,227,241,5,117,41,253,56,8,137,203,190,3,50,56,0,222,187,191,25,161,130,147,112,87,164,219,111,153,52,200,131,219,152,251,234,80,37,169,101,165,98,87,51,247,55,115,58,136,194,171,29,197,85,218,15,145,94,7,38,139,165,34,107,29,243,169,173,205,98,1,7,143,163,99,137,251,4,248,183,16,193,230,69,18,83,11,79,196,189,150,0,110,226,93,7,140,209,21,194,180,112,224,250,139,175,113,183,138,47,122,150,181,147,134,186,205,125,166,79,141,202,57,9,55,47,29,179,96,35,236,55,236,155,26,15,6,81,83,8,3,197,12,72,56,17,250,226,104,249,137,176,44,126,200,31,158,22,201,140,125,62,96,107,126,186,33,196,131,160,170,121,187,41,131,249,197,119,89,214,202,167,84,207,42,181,106,164,173,
+102,143,85,127,223,242,212,40,26,158,43,156,93,201,52,139,102,122,61,179,248,89,221,158,64,41,119,145,239,94,157,9,123,94,115,214,137,121,191,105,65,119,41,37,174,119,212,222,23,226,243,119,140,98,136,210,91,158,114,190,235,29,74,113,91,209,252,93,44,78,28,205,6,141,1,20,151,31,218,78,41,187,69,196,109,43,238,67,148,182,242,19,0,134,125,98,249,97,249,73,223,232,142,249,117,50,87,69,30,232,24,124,0,92,107,189,200,161,151,38,17,156,8,14,28,103,12,245,111,114,154,164,67,67,108,190,40,226,175,155,2,10,68,14,123,180,223,126,237,224,35,205,189,244,123,95,64,59,26,54,118,169,38,154,90,48,30,205,194,216,237,20,24,28,244,243,113,234,247,178,176,149,169,118,204,212,4,82,38,10,224,147,114,108,164,217,247,188,234,246,150,206,182,15,24,107,40,60,253,220,103,120,254,98,242,186,76,249,101,173,202,155,36,2,121,241,141,212,141,70,215,196,55,45,114,193,131,101,205,178,254,94,185,200,163,79,9,146,75,218,12,208,204,156,216,219,
+145,21,80,164,185,198,43,165,164,105,184,247,1,138,84,203,41,20,34,98,76,13,80,128,137,79,217,106,136,195,161,80,129,135,139,129,186,14,44,221,205,64,88,130,185,22,105,188,66,148,80,52,104,201,175,250,50,121,118,104,224,91,2,14,55,83,154,102,211,248,187,92,85,140,250,27,120,54,245,6,150,92,97,209,126,112,79,114,116,167,219,247,189,118,0,39,178,94,113,156,104,170,200,59,107,61,100,232,45,84,28,32,228,105,207,229,206,216,147,108,28,177,22,142,23,141,24,209,193,83,81,171,24,20,167,5,79,107,206,123,243,58,239,43,149,85,38,91,179,150,225,10,132,40,104,254,88,219,33,25,154,216,104,108,228,164,204,248,205,232,169,38,204,232,241,189,91,247,12,244,66,44,173,9,139,3,1,18,199,10,223,82,219,244,253,112,186,166,30,15,201,149,166,71,111,128,220,219,83,188,194,152,195,137,119,101,157,35,163,155,159,162,171,124,214,69,23,221,68,229,101,198,208,113,34,151,106,138,2,23,202,98,150,13,33,159,99,251,223,37,18,207,196,229,212,170,
+95,208,82,37,121,236,81,252,221,75,167,40,28,99,109,216,162,30,173,232,47,242,83,176,148,77,127,121,105,93,117,153,42,185,200,183,1,252,242,181,163,23,101,16,24,132,41,247,18,224,84,147,109,254,229,227,51,195,175,119,91,206,31,53,171,239,44,204,11,86,233,139,252,61,40,217,192,169,208,65,71,59,107,53,140,201,28,206,65,138,251,104,214,80,177,190,154,78,13,146,145,18,30,220,25,95,84,170,214,139,220,173,104,217,9,43,170,201,57,142,80,195,146,193,203,175,129,206,106,177,229,245,246,187,159,10,211,64,73,102,227,251,130,73,212,87,29,67,138,136,203,207,1,177,76,132,11,103,90,48,114,44,16,136,227,27,26,75,149,82,133,131,165,54,146,193,211,217,127,206,180,214,229,51,241,128,30,64,101,144,191,8,117,52,190,13,194,25,231,139,252,73,66,252,115,172,123,171,145,196,95,111,48,104,192,128,170,123,145,123,95,26,223,112,239,248,166,227,187,12,185,60,76,125,129,233,230,74,118,161,226,80,120,237,255,23,238,121,255,210,102,238,151,252,250,77,
+223,124,255,159,236,189,103,119,50,77,204,38,248,215,49,54,198,96,147,193,152,108,114,6,147,51,24,104,114,108,147,179,201,57,231,60,13,126,158,57,103,103,231,157,157,51,243,238,158,253,48,247,167,186,91,213,85,106,149,116,73,42,74,101,94,249,182,89,7,23,132,125,248,98,147,76,68,84,184,68,232,43,62,145,192,147,123,124,111,17,144,192,189,5,220,30,66,45,252,31,217,237,249,35,35,95,254,200,48,246,205,239,46,48,180,79,31,167,164,81,19,37,187,27,222,247,80,218,47,25,73,16,198,17,128,223,155,155,18,160,35,223,190,68,238,253,44,153,14,165,68,201,115,157,92,150,210,31,96,104,95,72,24,66,135,95,74,39,12,235,33,158,241,229,149,25,126,136,12,72,251,192,188,242,133,0,159,96,8,17,89,64,18,78,199,201,151,181,137,151,251,16,160,193,144,200,170,246,78,66,221,0,75,63,126,241,62,63,124,47,112,162,174,0,61,52,115,209,107,110,107,146,36,35,107,150,170,97,55,37,74,245,31,86,140,151,103,254,13,100,108,233,83,183,67,213,
+118,78,68,36,241,19,6,194,190,93,14,62,120,42,167,236,150,6,157,113,152,163,79,251,79,84,175,108,152,160,26,246,193,78,90,63,46,167,229,208,248,217,155,237,87,198,217,210,133,226,236,224,41,200,196,121,113,38,107,233,148,77,253,245,27,250,32,225,135,64,194,13,232,79,124,94,246,164,154,146,115,229,169,135,14,127,151,31,158,1,119,225,67,20,86,45,189,137,219,174,10,132,105,142,27,168,189,109,229,15,5,24,228,109,209,129,150,84,132,30,10,23,45,86,112,179,159,121,249,92,189,47,189,250,120,17,207,233,208,170,124,19,240,199,83,54,59,12,109,140,196,44,128,250,250,214,27,34,193,173,113,1,233,71,203,236,129,148,58,255,33,44,134,157,241,213,147,226,151,100,67,244,104,36,96,94,32,102,58,79,156,101,136,54,207,7,176,117,178,133,124,241,76,114,90,54,241,251,54,89,157,40,164,249,205,251,7,35,16,218,34,216,189,121,124,173,178,185,215,241,220,204,66,203,213,88,17,46,121,214,164,224,37,132,68,182,165,8,33,203,68,225,247,48,30,50,
+114,204,224,35,76,211,228,181,136,136,72,238,131,46,64,47,147,100,106,36,98,156,126,16,76,94,163,109,78,202,96,158,20,229,240,197,44,162,2,40,26,254,21,134,143,131,36,97,174,52,237,205,29,123,202,3,255,93,216,138,18,133,68,214,33,247,85,23,151,249,76,221,73,46,236,49,93,120,42,222,2,229,216,157,91,146,93,168,168,245,203,122,29,200,29,188,179,119,24,236,5,82,33,55,188,221,102,18,17,60,60,65,9,162,141,22,24,57,249,142,151,72,98,196,156,80,48,103,127,75,179,253,119,216,55,237,155,247,249,105,12,221,66,38,239,35,239,175,133,193,123,239,45,253,237,33,212,74,254,145,121,238,127,58,62,255,145,97,244,63,114,168,247,71,254,196,26,29,40,79,119,8,251,134,125,227,5,232,65,10,181,149,160,41,144,137,48,156,183,105,71,164,7,132,122,255,0,147,116,27,104,166,132,17,34,243,148,242,231,61,111,250,40,252,199,142,40,112,137,24,136,146,13,188,170,133,242,246,53,167,193,167,252,126,177,230,81,184,24,189,99,47,132,98,195,194,
+48,60,201,11,72,43,79,92,51,156,110,116,58,41,184,68,178,182,186,253,113,36,216,175,240,130,106,160,237,239,141,196,154,213,25,72,203,220,23,207,208,230,45,84,29,139,24,202,26,27,28,73,59,187,150,249,208,187,25,206,60,88,39,67,134,83,20,193,55,137,149,217,223,122,227,139,237,142,56,79,86,168,13,107,213,217,184,24,188,236,14,212,23,58,175,78,208,75,1,30,121,66,195,65,246,167,129,236,175,81,165,87,60,56,158,57,144,90,205,0,169,213,205,71,111,130,189,137,85,66,246,173,38,76,38,201,183,244,93,172,49,25,104,126,122,129,66,168,14,148,40,118,237,77,186,0,28,245,187,158,109,234,61,50,173,34,17,184,38,247,72,95,41,12,78,20,113,62,253,209,20,196,97,55,103,15,203,195,240,75,52,91,82,199,120,231,193,111,150,83,142,23,29,72,194,209,156,100,88,249,253,8,244,135,132,76,219,226,19,84,4,236,237,102,36,18,247,212,131,201,24,241,1,182,182,120,222,154,154,140,166,3,72,105,157,103,97,47,102,162,111,115,194,26,248,248,
+1,73,179,241,46,113,112,162,10,44,111,5,11,221,65,141,42,64,59,226,92,91,121,147,19,254,27,175,89,88,222,141,101,172,142,124,221,243,106,188,36,107,69,142,22,165,26,21,127,79,207,185,160,125,133,45,180,141,46,213,191,235,143,233,49,181,145,241,181,242,112,135,43,177,211,123,3,41,31,7,241,182,164,221,159,215,255,158,127,118,81,63,226,235,6,165,109,201,72,66,103,139,90,122,188,88,5,16,196,126,231,227,144,241,188,3,115,63,235,222,157,248,117,239,46,32,209,125,139,152,205,119,54,237,130,23,200,93,108,114,112,225,157,193,112,207,10,10,188,13,197,51,229,206,149,0,61,130,184,234,239,81,13,191,53,248,107,107,29,113,116,40,238,103,205,42,153,73,246,209,249,12,160,150,222,203,141,1,60,141,206,126,151,84,35,110,175,108,163,151,22,216,100,201,243,138,7,156,174,247,188,224,229,13,69,116,194,190,109,56,5,96,238,219,127,138,40,226,246,44,252,190,225,191,86,128,46,182,208,173,211,248,1,37,134,30,174,67,60,24,132,17,76,162,144,234,
+62,216,75,55,193,81,119,183,252,32,184,250,218,1,161,125,117,217,103,234,27,9,114,116,174,146,49,32,223,179,60,223,227,248,79,173,227,19,140,243,62,168,36,58,97,162,150,220,164,141,130,39,111,235,65,145,32,74,187,56,61,103,251,118,128,72,44,36,217,125,141,90,123,59,82,244,91,129,25,18,55,192,220,9,60,97,156,94,0,30,4,119,249,67,33,66,199,215,197,87,38,199,225,3,241,158,152,8,142,232,191,5,252,71,62,232,10,93,18,216,148,146,171,220,150,7,12,130,42,19,234,188,166,113,0,205,155,137,223,202,150,209,51,51,236,241,91,69,22,129,3,22,79,136,54,186,102,210,101,246,62,28,17,15,72,77,225,195,124,211,174,32,92,5,216,25,175,144,252,45,188,151,170,2,52,214,80,87,178,54,75,250,117,13,190,61,51,119,135,140,198,215,87,29,214,70,160,120,75,37,52,199,121,221,143,78,200,93,185,195,1,59,224,226,177,119,182,99,213,33,190,226,150,108,19,23,139,103,60,39,111,91,204,242,63,53,114,155,238,232,95,63,115,170,135,56,
+165,108,108,229,88,213,76,199,144,169,207,134,208,215,239,20,113,25,226,135,235,109,6,203,29,118,87,193,238,230,248,36,114,70,1,11,218,132,109,150,196,147,152,155,212,153,103,181,180,14,205,121,60,83,196,232,87,69,231,252,92,163,168,107,54,246,207,73,105,57,181,105,211,119,19,203,5,132,218,19,129,197,30,167,153,96,64,248,33,25,146,138,195,65,218,111,15,151,82,33,202,161,148,14,171,216,51,181,220,155,182,61,59,168,54,223,246,26,94,116,103,200,135,231,248,45,114,245,44,185,1,7,187,187,79,14,116,42,104,185,123,12,65,87,136,30,38,189,211,32,158,53,95,54,151,246,155,242,94,158,197,83,52,73,241,236,242,62,186,78,198,122,228,73,97,156,83,13,145,231,54,254,184,143,241,237,113,98,128,246,4,60,188,160,28,10,208,239,17,61,49,51,18,166,3,17,39,127,76,213,145,121,232,8,158,212,207,9,106,184,153,44,124,26,186,34,155,170,61,103,182,230,180,248,70,88,31,114,193,15,216,202,195,219,169,82,231,207,63,187,60,201,65,166,122,179,
+32,132,210,54,185,71,162,96,50,62,212,6,164,186,188,176,127,112,169,91,222,204,108,125,157,154,154,171,89,161,1,195,111,15,121,158,0,5,136,157,204,8,58,48,205,151,239,18,231,206,128,144,13,107,63,118,57,180,186,24,206,212,125,156,2,137,91,68,216,125,138,222,35,66,213,153,26,90,92,248,226,78,152,30,40,156,92,241,20,2,65,122,248,156,145,217,144,125,212,78,162,176,248,132,57,85,201,176,60,221,205,131,1,15,121,225,123,120,82,43,52,15,169,165,132,109,250,13,34,71,83,251,84,221,34,36,247,50,51,94,146,108,206,216,74,200,135,188,195,200,74,223,60,68,102,247,131,60,247,42,120,67,138,224,8,178,213,155,166,190,222,181,31,122,0,97,205,13,106,30,33,172,185,65,205,188,69,214,131,135,85,205,25,228,145,151,16,54,252,222,192,1,139,226,209,151,119,5,11,161,238,191,122,18,125,203,63,245,39,126,255,169,255,127,197,175,250,159,250,179,205,18,199,46,189,153,84,114,55,16,171,1,245,121,83,4,13,68,109,204,68,97,28,219,240,184,
+225,200,161,222,82,19,88,239,145,32,203,231,245,124,168,6,110,226,72,108,230,212,187,33,3,79,92,240,43,10,33,147,249,54,59,188,248,47,31,240,135,226,74,136,62,195,97,105,24,247,230,184,176,255,240,131,16,26,66,247,22,20,219,221,91,224,237,33,212,2,254,200,6,113,72,28,129,56,99,42,110,79,183,43,216,228,22,14,138,194,26,223,217,136,151,244,34,255,53,62,252,73,82,36,9,162,164,247,175,93,63,161,7,164,91,11,15,125,227,173,245,125,255,218,1,9,246,207,119,107,7,186,174,24,138,211,12,26,147,32,185,155,20,151,201,9,246,35,41,90,53,42,213,159,217,150,231,75,45,34,166,183,38,99,60,223,14,106,248,248,216,221,118,109,97,60,15,239,83,111,108,66,129,225,227,138,177,117,11,183,15,162,223,111,166,169,188,165,147,90,100,6,73,223,74,162,61,60,56,63,32,10,211,195,176,7,9,12,154,79,183,192,162,26,187,203,82,110,231,130,11,195,194,78,138,90,192,209,35,55,238,80,188,62,41,100,47,99,46,8,96,113,211,135,22,83,
+196,240,214,212,223,82,239,45,191,127,101,75,220,49,164,249,135,253,200,114,182,145,54,38,201,251,30,34,13,170,21,249,86,148,90,251,165,117,200,61,41,83,219,137,150,93,69,177,212,109,246,143,105,202,144,203,42,105,114,46,70,126,213,82,141,172,171,221,210,242,251,16,199,83,50,185,9,74,138,165,146,40,218,123,52,115,127,42,201,231,241,172,244,180,128,162,144,145,40,199,44,61,195,201,212,217,141,73,54,138,104,25,195,45,111,157,159,66,161,142,220,44,12,179,93,79,20,122,215,137,142,241,125,116,71,110,115,145,209,128,94,34,211,54,155,192,241,229,123,171,52,127,29,196,98,99,182,124,41,104,81,186,68,249,156,42,7,141,100,216,9,18,143,241,233,232,231,1,213,111,231,143,61,196,23,4,68,161,147,16,100,166,236,203,182,93,124,128,191,175,88,147,36,203,69,251,250,28,251,145,183,223,199,154,100,49,236,157,252,242,125,129,132,147,100,8,194,201,204,140,188,84,205,163,228,168,233,36,13,242,110,63,80,193,63,192,53,47,68,137,8,21,30,40,157,12,
+170,123,247,229,156,59,164,116,141,110,36,93,8,185,252,10,134,231,68,53,62,83,153,54,59,168,145,225,124,54,131,47,140,136,251,86,176,22,21,210,25,79,97,5,132,186,244,148,91,231,240,115,11,87,63,134,114,20,71,160,196,218,101,61,87,45,32,90,104,243,124,15,88,4,13,22,54,79,103,55,199,212,144,139,21,31,32,113,229,151,148,181,243,125,42,86,255,146,53,143,90,17,218,152,86,62,244,104,144,230,18,98,102,65,184,184,204,218,133,45,213,233,185,170,227,25,170,70,188,10,143,165,42,201,51,71,216,108,138,159,34,143,89,206,101,234,118,230,175,135,38,171,189,148,72,122,37,163,66,57,91,58,42,7,181,85,148,221,117,139,215,72,83,89,42,196,41,185,73,203,16,145,238,121,205,199,188,226,27,243,40,169,64,9,80,176,3,5,165,128,116,18,132,229,100,222,33,193,212,209,185,48,72,88,31,14,23,135,253,68,196,56,180,37,7,129,58,236,213,251,97,108,9,216,200,36,236,243,147,126,151,8,50,244,142,79,69,96,176,164,131,253,127,177,31,226,
+159,121,17,195,127,230,5,147,252,153,215,159,31,134,90,255,173,29,70,161,135,253,24,249,66,192,67,1,47,252,19,20,37,25,206,0,40,33,191,193,96,51,4,148,75,253,71,249,215,211,95,254,245,140,58,251,112,183,248,244,165,122,203,230,2,224,236,207,252,139,223,130,63,32,120,132,48,225,222,186,163,3,8,219,253,145,91,238,84,251,225,214,68,66,109,219,1,98,228,15,62,254,31,223,255,191,227,204,31,25,249,71,254,63,227,252,159,113,254,187,227,220,227,230,172,25,138,51,220,166,91,104,72,128,98,115,8,130,208,192,61,74,79,50,254,141,215,61,183,135,80,235,229,143,12,217,205,95,199,151,63,114,146,251,71,230,62,253,145,255,211,199,185,255,78,17,228,189,113,165,154,56,244,68,249,159,189,191,252,191,59,206,127,187,95,243,191,138,59,255,145,255,255,127,107,156,20,211,35,8,43,231,11,60,156,136,168,252,79,236,31,241,254,200,146,151,63,242,127,136,131,255,89,227,144,161,44,46,137,90,160,31,81,240,201,255,206,254,193,127,214,62,196,127,52,206,
+253,119,33,60,64,123,43,66,255,207,17,17,138,123,214,43,137,253,155,255,186,37,177,123,11,113,223,37,65,192,222,255,200,196,252,31,89,242,251,71,198,195,255,200,176,215,63,242,127,250,56,255,252,206,45,34,131,3,76,138,45,0,17,73,225,255,47,236,231,191,29,167,136,134,18,80,40,142,117,255,157,59,64,100,195,100,18,21,255,63,31,215,194,255,200,150,151,63,50,236,243,143,12,192,254,200,131,7,210,255,222,56,223,119,174,98,100,180,243,47,0,183,240,254,2,112,70,24,79,135,194,185,16,4,2,255,93,59,165,221,251,189,60,202,98,116,192,29,252,211,255,0,221,86,221,20,214,101,14,231,186,143,240,196,242,199,244,50,243,172,205,122,250,68,4,95,251,103,175,105,222,223,49,205,201,250,239,152,102,63,123,59,166,137,6,220,143,146,187,185,4,102,24,230,245,116,233,202,242,223,217,180,216,147,137,184,37,194,148,0,237,167,252,229,55,131,223,69,126,181,106,123,179,131,126,123,88,130,200,146,207,63,50,240,117,35,75,55,0,30,116,213,78,14,75,217,
+122,12,233,81,112,130,224,182,111,253,29,151,201,55,32,157,204,15,36,190,158,85,249,98,234,71,128,70,116,254,214,7,251,195,170,107,70,177,159,105,230,69,104,29,245,153,15,68,30,248,101,10,145,161,60,4,79,26,188,225,40,194,12,38,108,11,149,189,84,138,148,136,88,146,126,239,124,72,85,61,32,148,47,182,127,10,128,152,149,130,56,232,252,163,23,63,28,86,125,46,206,209,71,220,177,115,30,143,18,36,222,143,63,71,208,11,173,133,97,163,120,252,115,254,25,135,161,239,125,40,223,221,86,188,41,91,46,193,172,211,73,183,148,95,56,175,139,17,20,30,10,208,69,162,100,118,219,246,201,236,251,92,237,245,210,108,154,11,207,23,235,232,6,109,255,236,43,101,196,146,105,239,230,63,254,242,60,133,166,205,135,213,86,81,200,174,75,119,195,0,128,143,30,244,149,254,159,231,48,153,55,125,230,241,52,155,116,136,252,38,210,233,193,139,189,183,191,30,55,35,20,157,40,160,203,95,223,53,83,198,124,15,40,0,197,123,60,55,98,29,148,140,19,102,211,224,
+204,149,208,219,75,85,124,6,128,9,87,91,100,205,249,211,113,199,5,185,213,110,38,224,82,233,19,128,145,71,216,183,102,230,40,54,76,19,245,220,224,65,189,94,159,110,43,161,249,137,147,41,161,65,104,105,230,89,41,147,225,144,145,149,8,219,17,62,47,219,208,232,107,154,237,68,158,111,12,159,168,215,23,55,81,242,17,179,129,209,109,55,17,119,68,114,70,141,153,105,185,60,47,7,197,241,216,58,164,189,235,119,246,70,95,202,190,58,243,46,194,17,182,145,111,174,170,172,210,121,112,126,24,32,21,171,200,209,159,93,20,28,92,137,208,214,233,172,49,140,197,199,234,231,202,151,56,31,121,86,22,112,249,133,76,60,119,121,67,234,195,245,253,236,93,225,151,185,139,175,234,56,234,220,185,233,171,101,171,106,215,12,178,23,162,4,154,61,193,211,23,172,124,182,164,66,74,77,128,100,223,163,232,63,146,132,174,93,233,249,131,191,145,115,54,213,10,198,233,223,217,230,184,207,219,84,126,97,88,107,8,69,142,47,210,65,66,19,93,39,232,228,92,25,32,234,
+36,70,16,237,172,191,88,134,103,87,195,165,19,135,114,210,79,234,114,138,199,243,222,192,164,77,5,20,138,174,140,68,207,97,102,51,28,177,116,130,106,84,96,58,141,254,237,182,36,167,143,198,164,168,206,31,215,155,201,214,208,242,149,91,6,188,0,194,15,213,135,24,36,190,99,197,221,152,167,31,102,73,80,128,134,104,52,131,104,215,184,255,98,25,184,26,211,90,194,228,205,221,166,104,64,115,220,166,232,0,251,212,16,99,220,16,83,105,139,38,227,0,117,76,29,62,2,126,2,27,233,225,153,219,81,157,81,232,243,239,85,85,227,203,237,187,0,30,112,247,36,7,98,155,145,10,144,10,134,102,24,154,160,52,194,71,42,155,207,249,222,129,202,15,32,126,144,219,171,38,112,19,84,101,123,23,84,216,67,18,38,174,68,132,205,188,58,171,194,225,156,9,180,165,19,233,110,38,23,233,242,118,212,0,0,248,62,122,174,6,199,106,110,39,114,53,234,50,23,209,56,135,25,66,148,41,97,122,135,111,36,142,0,156,38,133,195,84,251,122,74,249,253,179,10,71,
+197,248,133,116,13,82,181,141,74,190,177,33,177,59,250,107,221,231,130,67,122,147,74,173,89,142,65,72,226,249,41,108,67,134,74,108,182,62,7,18,193,197,203,252,37,175,168,64,124,173,112,156,133,129,114,126,157,93,159,110,122,204,138,74,164,206,254,7,65,19,70,246,79,62,231,162,181,253,82,131,213,147,142,2,161,81,175,218,14,146,223,0,96,68,120,190,112,189,90,213,81,12,126,193,225,217,27,254,144,177,73,8,139,242,43,47,65,247,242,146,199,62,191,1,159,2,52,239,118,84,31,70,68,16,110,71,245,107,40,248,203,237,168,62,36,43,224,118,84,255,129,247,201,187,29,213,255,5,111,85,169,207,68,172,228,86,213,226,13,125,145,33,242,27,87,144,135,94,127,103,76,93,169,125,152,49,124,207,157,155,109,4,241,103,252,85,68,140,22,121,86,201,6,190,98,199,1,104,136,198,57,145,195,188,133,231,169,121,247,141,121,220,162,186,154,234,15,17,107,57,12,235,166,235,250,162,213,204,189,223,151,138,227,184,101,6,233,222,193,91,234,29,223,129,230,201,
+139,100,215,165,75,254,80,217,231,225,61,42,213,97,235,248,208,235,152,102,107,74,56,46,145,166,56,43,211,84,246,203,9,247,209,109,91,134,125,3,147,209,168,167,28,241,165,173,54,197,233,93,228,107,131,233,113,19,144,38,110,223,211,110,103,146,181,234,135,121,51,201,156,196,174,125,104,40,108,28,237,150,136,115,255,11,255,226,230,174,202,241,158,142,111,12,183,105,14,217,182,113,104,155,71,220,233,123,180,221,50,33,84,127,209,231,161,105,206,192,50,58,45,172,70,116,195,170,76,61,126,190,243,136,237,112,105,121,149,26,109,227,61,85,50,56,100,159,69,121,126,0,75,197,187,246,96,8,119,222,6,164,168,220,109,90,161,65,212,86,231,53,5,97,184,254,66,116,11,195,124,156,250,11,29,34,27,206,149,173,19,71,193,191,178,85,2,252,77,174,44,43,73,221,78,114,31,133,92,193,11,136,101,159,2,168,16,225,38,119,235,74,148,9,187,46,243,79,1,121,35,8,63,60,30,95,229,111,245,143,5,34,68,6,70,0,64,141,3,5,23,114,202,42,27,172,
+243,120,115,238,96,22,66,188,81,169,100,202,169,234,159,242,44,227,89,157,114,126,161,92,16,31,189,31,154,132,51,29,85,88,252,65,153,178,169,110,170,65,48,52,229,141,42,182,146,164,232,151,237,61,136,162,242,191,246,123,59,110,166,81,159,65,178,63,198,231,151,232,43,145,13,160,236,177,205,234,117,156,203,116,23,238,200,211,163,186,144,187,169,74,19,20,234,192,141,81,148,95,128,152,176,51,165,80,62,216,2,20,27,69,144,11,171,88,82,212,192,155,20,188,154,169,203,56,97,167,192,171,110,75,16,184,13,110,251,137,145,44,146,231,118,77,154,53,241,90,230,133,152,8,60,247,43,32,15,28,231,165,201,21,35,215,168,74,249,170,246,153,250,66,5,146,144,250,173,250,183,63,168,166,12,149,211,143,90,214,148,220,77,216,37,33,41,57,29,33,1,134,12,171,78,82,70,234,169,19,46,215,180,117,62,67,228,15,224,46,144,254,40,110,108,73,232,84,7,159,234,160,46,210,68,137,76,25,67,113,7,114,15,75,148,167,122,197,193,119,56,52,246,109,104,31,
+52,118,171,49,156,160,138,98,27,51,117,82,11,2,89,162,36,22,26,119,22,172,110,239,36,206,171,83,44,234,227,164,81,60,69,121,55,246,123,175,16,251,168,113,41,220,242,132,120,122,145,241,157,132,255,1,44,52,192,93,4,128,5,72,147,48,120,195,170,12,37,68,253,32,87,216,112,24,18,144,159,112,19,144,209,94,95,23,67,146,16,153,215,219,166,179,55,125,202,188,168,148,154,179,41,161,115,168,136,237,202,80,189,164,60,201,192,206,117,43,85,123,136,66,39,88,190,222,222,231,92,86,191,224,77,202,160,212,72,79,33,203,103,3,167,232,50,252,96,142,194,214,158,185,119,217,122,69,218,214,137,226,109,32,28,170,87,21,135,64,187,237,101,187,14,132,233,196,44,252,128,244,73,163,56,53,19,177,69,201,101,173,237,185,49,36,245,52,188,168,103,156,253,14,140,178,174,222,154,235,231,172,221,119,252,56,202,148,109,197,235,195,182,218,177,133,116,237,31,66,56,170,163,66,91,138,174,135,84,32,195,121,122,28,99,83,55,14,166,145,176,169,118,18,106,138,
+117,254,157,147,138,129,148,112,8,5,246,0,196,195,224,219,245,101,188,82,181,221,41,54,133,191,117,142,196,12,108,173,236,234,18,71,208,94,131,219,253,120,192,149,96,172,210,29,89,78,247,42,160,151,23,207,189,10,8,0,158,238,85,64,188,6,236,94,5,68,208,216,158,137,119,100,249,246,134,238,200,226,230,254,1,147,36,105,3,223,112,202,76,128,178,184,200,73,89,73,123,69,171,16,99,77,109,173,2,245,126,177,72,189,135,22,73,110,37,182,155,143,46,67,188,144,156,144,72,44,234,234,208,74,143,215,147,110,232,144,113,233,88,224,229,149,62,85,225,22,211,115,75,204,47,74,159,196,27,125,237,169,106,225,187,92,252,10,235,82,91,59,237,95,44,161,18,156,92,3,190,61,149,203,218,215,106,137,232,43,71,118,41,71,201,87,165,254,247,122,187,222,197,31,146,94,113,248,7,28,250,223,123,121,254,167,239,231,9,48,199,172,215,93,186,189,100,153,145,96,178,34,30,159,167,67,227,208,196,187,12,149,89,153,18,158,69,191,214,27,190,146,239,169,245,4,
+200,120,85,243,99,70,223,51,168,180,165,176,240,81,101,30,169,179,89,131,160,168,55,25,244,3,243,72,230,179,188,12,179,39,89,80,128,126,120,198,99,158,222,72,17,188,123,114,134,255,94,106,52,18,243,202,100,150,78,157,104,84,97,18,211,182,231,170,152,145,136,154,186,76,75,247,2,223,87,153,180,168,222,173,95,125,26,119,103,147,106,24,166,104,228,53,221,212,110,229,101,234,25,205,138,96,208,76,179,62,127,92,20,85,87,38,227,55,31,102,252,114,214,17,108,98,169,219,60,75,49,76,61,61,215,95,237,0,61,162,85,196,214,252,88,175,66,230,230,244,96,43,235,131,147,19,139,25,172,188,156,197,42,137,92,74,112,75,75,205,92,154,38,123,69,250,51,79,154,139,175,41,26,253,250,223,57,81,173,166,175,153,79,19,180,192,20,123,221,190,95,207,206,109,93,186,44,58,245,95,54,225,246,106,90,93,66,63,145,26,135,182,185,2,207,179,223,196,201,64,253,102,188,105,31,174,48,194,235,100,226,190,62,126,138,50,221,51,46,171,120,26,202,235,28,63,
+184,74,83,158,101,63,136,0,174,143,204,216,132,192,225,202,177,37,76,88,171,197,189,14,129,149,212,102,107,63,54,13,52,65,70,42,142,154,210,25,238,34,139,43,101,124,223,141,1,231,86,167,198,83,169,195,240,212,49,131,208,233,163,58,70,199,34,203,203,220,199,140,78,101,84,196,90,201,13,115,222,2,104,182,122,66,33,40,156,87,225,209,240,138,113,98,228,24,76,254,103,220,56,145,180,198,185,88,106,10,83,38,219,201,208,201,105,226,209,239,249,74,96,105,77,140,64,58,53,19,205,13,147,246,95,236,70,188,219,4,28,93,163,42,135,122,121,225,142,140,99,98,19,144,12,47,114,3,145,241,253,6,75,77,82,18,44,203,112,249,221,134,170,71,27,174,86,25,151,151,206,188,146,3,56,105,153,195,161,137,28,12,134,200,160,185,147,157,134,233,206,90,38,40,241,103,187,219,151,244,203,162,181,201,171,63,93,190,67,206,40,198,133,127,215,154,233,100,248,187,29,241,54,165,71,90,82,46,75,71,49,229,249,17,52,103,198,196,246,46,113,179,135,188,162,122,
+102,235,237,6,105,73,201,194,4,42,229,79,125,53,35,59,120,177,94,112,110,206,102,142,31,88,137,70,193,204,42,71,70,129,182,188,89,11,231,196,220,240,153,242,37,75,168,78,186,201,198,51,125,115,246,151,20,217,92,30,38,19,74,225,162,33,131,166,200,148,254,248,229,179,50,156,53,96,241,38,237,72,229,250,185,149,103,200,58,213,50,52,30,105,26,153,59,171,197,201,147,160,55,67,56,195,169,186,166,127,63,33,228,153,64,89,235,204,94,135,44,80,44,139,146,57,244,194,207,161,62,188,26,144,23,116,64,12,42,88,138,66,227,77,130,136,186,66,99,218,176,212,213,49,243,55,227,31,246,89,207,56,13,135,77,203,218,18,245,192,26,57,144,49,54,108,171,188,158,53,3,24,83,96,252,161,21,56,187,117,153,181,164,86,218,196,103,173,21,138,80,39,124,151,20,40,28,207,123,204,51,63,174,100,47,252,165,118,91,76,197,153,175,226,51,26,67,98,151,223,151,195,243,213,79,98,238,85,63,163,149,208,207,59,245,231,166,42,234,167,75,43,75,178,239,249,
+176,128,144,57,232,90,0,210,172,105,198,7,159,254,212,240,250,73,109,60,25,18,143,252,149,191,54,172,141,190,138,215,252,215,224,253,253,189,197,242,28,171,215,54,110,107,59,119,196,49,92,108,168,42,238,88,126,228,116,132,97,234,164,117,151,88,223,47,95,75,231,179,73,48,98,150,174,44,13,138,6,5,143,230,101,254,244,147,53,13,252,24,5,59,147,19,159,208,169,171,126,87,41,239,154,238,44,176,223,122,56,24,243,190,53,50,228,81,46,157,106,83,195,110,211,237,56,160,225,61,0,81,130,60,61,25,231,71,28,102,105,158,198,241,108,42,8,200,159,16,125,206,22,159,26,216,137,22,129,113,205,205,142,72,61,29,72,191,44,79,170,116,247,98,60,246,155,177,35,46,145,184,244,106,12,63,155,94,48,79,15,94,12,51,180,190,106,170,153,45,186,174,40,13,167,14,164,229,50,209,216,58,229,5,149,179,136,85,198,143,214,129,191,108,158,15,116,6,182,99,170,243,191,38,216,105,30,243,252,108,3,167,111,84,105,62,193,125,99,142,191,30,129,244,9,195,
+120,219,107,63,54,221,77,214,206,41,75,119,234,160,244,165,175,220,49,159,62,136,191,238,46,7,248,45,53,117,192,100,61,250,34,28,36,235,109,237,179,209,146,158,197,212,201,169,229,234,51,222,79,182,249,132,252,250,92,216,166,175,219,81,164,161,130,164,194,167,160,109,34,28,46,65,103,158,57,43,195,124,148,48,71,30,74,211,1,36,57,225,158,161,182,44,251,8,189,248,3,181,168,51,252,91,222,169,196,24,163,120,103,94,251,215,159,53,225,7,153,171,77,97,122,51,16,51,232,48,249,40,95,83,48,212,225,129,237,147,186,118,233,71,72,227,247,233,245,206,238,229,188,21,14,147,143,48,25,120,27,174,137,46,171,122,63,59,135,100,9,172,162,212,124,195,68,153,164,15,39,207,9,244,131,21,86,238,163,154,91,172,199,166,77,166,169,63,86,47,222,177,196,233,53,240,15,80,2,56,97,212,84,80,248,121,62,90,105,168,133,219,159,5,146,150,115,127,198,179,91,69,139,90,220,17,72,203,146,211,44,203,122,61,198,246,30,160,112,217,60,176,94,142,88,234,
+229,1,0,232,0,112,234,113,36,182,185,232,173,127,152,197,69,3,68,109,192,180,249,14,232,33,43,205,41,23,182,168,136,48,172,75,68,7,41,36,167,114,172,228,140,170,202,54,227,194,204,161,56,230,122,246,153,213,63,28,45,184,75,53,9,134,182,191,34,38,250,124,168,238,66,207,189,90,39,128,102,31,169,237,182,92,95,105,104,171,153,66,118,234,75,35,19,30,114,156,219,116,148,188,188,224,108,243,181,11,125,253,16,45,221,190,174,83,18,61,165,103,133,202,55,48,250,157,1,63,113,30,77,108,4,80,57,156,139,87,143,11,154,129,61,235,250,81,187,78,209,121,185,127,48,97,165,63,183,203,107,251,200,121,83,57,248,155,162,58,131,165,219,116,135,93,225,202,16,45,58,83,181,83,227,101,240,62,18,43,9,0,98,249,84,65,213,214,110,177,6,184,23,127,218,149,231,90,115,74,11,20,227,236,51,226,0,174,42,211,150,4,93,139,107,48,159,55,95,33,94,101,194,115,103,137,120,11,107,166,135,21,39,254,81,218,93,59,150,190,126,187,206,147,174,158,
+252,204,1,249,251,209,76,255,44,10,159,93,184,173,220,117,53,54,135,21,192,36,154,48,251,134,16,103,195,40,38,56,163,220,233,172,109,189,26,30,93,204,164,173,165,31,212,107,155,75,151,174,190,214,27,16,194,139,194,212,136,205,199,244,105,32,152,27,228,84,129,116,46,203,152,34,108,139,14,2,199,113,172,127,219,75,101,19,107,57,58,10,43,80,118,238,156,55,84,101,190,118,238,56,4,253,145,232,185,205,40,187,210,143,29,116,150,135,182,91,79,234,125,166,130,153,217,163,237,41,39,185,53,77,202,203,93,44,156,123,220,158,22,84,75,239,106,121,183,30,162,195,227,52,77,28,192,139,67,114,77,138,250,69,196,8,67,191,0,101,253,197,22,135,164,98,77,35,226,199,184,65,40,102,65,2,180,50,133,46,41,77,39,185,107,123,251,209,156,110,38,150,15,139,102,25,197,210,248,153,70,74,61,134,116,77,45,209,13,159,175,210,201,181,39,45,169,247,166,177,214,235,76,234,86,250,45,70,237,28,91,94,93,221,98,52,80,147,207,226,228,108,221,224,239,227,
+53,235,177,204,164,136,154,15,135,93,81,30,39,47,35,111,108,167,165,94,117,149,29,181,1,117,224,129,215,236,163,174,40,204,151,191,205,213,161,235,156,94,244,21,175,91,176,237,255,21,76,9,106,29,245,50,218,150,92,152,109,221,100,57,141,247,252,129,202,58,217,59,235,84,117,150,90,221,215,108,69,190,250,160,171,21,247,157,78,194,213,176,188,18,212,197,134,226,116,168,40,77,92,138,251,181,182,171,5,166,42,230,108,48,24,8,80,154,219,205,60,213,159,230,240,146,237,217,125,205,73,169,49,200,81,118,56,103,119,21,234,217,204,37,220,248,210,156,34,102,35,52,4,216,121,131,46,46,124,139,127,112,27,29,65,248,227,149,148,66,54,115,9,102,229,154,251,176,1,166,0,132,128,86,95,19,83,22,85,251,235,75,232,228,95,54,249,9,62,22,103,118,56,71,175,150,57,87,236,67,50,203,197,227,88,202,112,206,195,173,101,237,56,26,242,62,200,226,159,248,41,20,36,207,51,50,106,6,80,73,60,17,150,167,175,119,5,174,1,186,77,105,170,77,245,154,
+185,122,209,173,242,73,157,157,38,167,74,81,93,244,90,173,214,244,80,171,25,222,135,90,102,120,103,115,102,50,131,170,153,52,43,79,209,169,80,201,217,80,200,63,69,109,41,147,99,68,35,142,196,206,83,157,42,55,8,228,132,50,81,151,207,63,80,208,176,95,40,13,139,94,228,40,143,33,74,57,199,184,203,217,248,210,237,77,172,114,62,248,135,34,231,134,215,237,138,190,228,249,217,213,85,124,121,97,85,234,49,35,11,138,190,209,77,133,61,156,228,173,42,229,131,147,215,94,9,53,77,14,105,128,151,152,32,247,52,155,149,151,109,111,125,243,5,132,206,218,79,154,196,189,89,105,212,156,109,99,123,154,52,55,165,206,97,208,25,46,94,95,13,95,151,226,183,86,91,53,83,109,78,170,122,178,172,84,212,3,207,97,177,251,46,118,104,21,196,185,222,94,156,77,56,153,156,239,90,190,81,215,242,238,198,174,134,29,39,183,107,121,154,24,254,198,84,202,74,7,175,86,5,171,32,118,238,27,179,70,137,79,170,57,35,206,75,137,79,212,169,12,58,81,143,101,
+90,235,162,106,102,97,235,110,164,115,125,212,48,94,152,143,207,40,219,51,211,124,166,207,72,166,202,188,177,236,210,207,197,32,153,56,224,147,193,120,165,197,244,129,74,212,98,225,207,95,195,18,62,232,55,8,195,202,40,199,110,93,36,35,3,92,1,195,247,115,162,103,228,215,130,203,78,97,101,151,237,228,156,103,170,99,95,229,254,229,234,34,200,197,166,137,41,238,6,38,181,211,55,61,165,116,219,86,131,135,72,202,105,8,152,138,203,54,99,195,218,243,221,94,71,226,152,158,234,148,155,219,189,60,231,75,253,152,153,80,149,203,68,25,107,29,153,159,150,221,100,153,225,1,162,182,129,105,228,30,233,141,72,37,122,110,228,118,122,133,193,218,84,51,54,7,134,111,89,156,168,243,231,117,167,83,163,241,9,236,46,233,240,80,112,105,73,215,62,175,147,243,177,240,84,40,25,177,125,219,239,70,60,199,171,139,15,170,164,101,141,172,45,167,248,121,155,83,39,224,231,73,228,3,63,79,79,63,243,78,169,244,10,183,157,56,205,236,117,41,158,120,187,4,18,235,
+144,110,136,117,25,229,157,175,48,25,17,113,30,180,169,246,66,141,121,46,237,167,156,235,116,238,88,188,75,128,130,62,108,246,91,215,42,215,134,97,82,39,232,169,233,217,111,126,217,106,134,19,57,233,34,159,115,209,48,228,117,119,72,86,6,219,152,44,75,208,73,58,197,149,125,120,14,129,185,192,57,171,213,27,229,150,215,163,39,188,212,221,175,229,137,122,25,233,182,97,210,70,137,173,138,172,1,23,43,27,252,102,61,169,107,51,97,16,21,111,222,68,32,0,26,106,209,227,139,81,229,153,199,68,201,105,188,46,78,141,140,77,100,112,237,194,70,205,62,12,8,20,17,82,243,40,29,78,155,182,111,250,244,99,99,169,31,134,206,210,182,61,63,81,30,175,125,132,250,180,124,36,72,106,106,28,197,150,54,138,195,82,198,15,31,69,60,252,72,51,98,177,63,49,179,97,217,7,106,110,34,84,59,187,147,183,86,101,77,152,70,139,200,202,178,65,61,70,109,87,251,14,49,238,252,194,37,221,237,135,56,117,80,95,76,9,189,253,244,60,191,240,74,225,221,195,
+38,69,196,54,177,151,109,183,148,99,212,106,80,236,190,167,52,124,129,242,169,107,96,247,246,209,162,87,105,180,203,24,216,183,83,136,139,115,25,70,140,216,145,170,217,32,162,156,227,217,232,55,44,126,151,71,170,163,145,87,171,202,142,1,245,177,162,154,38,183,93,213,182,96,141,46,13,157,204,245,122,192,204,201,164,218,92,4,5,126,175,69,6,121,84,228,106,195,187,131,177,93,106,139,51,213,25,221,93,25,83,253,226,139,182,89,27,170,165,4,214,150,164,46,106,250,11,32,2,168,197,19,9,152,229,212,54,6,191,166,6,246,155,200,234,101,221,76,190,93,251,230,67,202,166,90,30,129,163,240,186,243,140,10,142,183,126,62,243,242,93,144,158,171,227,4,57,227,70,53,11,236,52,231,176,114,173,93,251,86,124,11,54,233,7,246,86,17,223,163,155,121,181,43,27,92,174,218,80,122,66,150,7,54,103,144,57,210,76,103,20,190,232,164,24,57,141,109,188,182,91,72,40,104,17,246,162,185,204,250,50,150,112,83,181,95,239,205,213,215,232,156,239,236,23,126,
+177,244,75,221,246,134,156,154,143,235,101,157,182,156,142,233,53,215,172,180,202,76,143,202,118,109,50,42,218,190,212,73,107,59,143,16,250,119,228,19,181,96,79,158,123,29,3,71,50,81,121,69,63,166,20,237,181,32,183,154,16,164,151,15,87,179,137,229,63,249,75,186,12,118,43,241,189,107,252,75,124,134,106,97,38,117,39,121,105,90,24,12,211,225,157,188,209,34,169,106,154,75,18,219,158,215,106,243,192,21,48,143,169,210,97,96,221,199,153,251,81,72,30,35,39,179,32,159,23,19,250,73,121,29,218,9,3,14,217,214,173,73,92,251,146,52,100,28,167,90,144,140,120,165,99,76,179,225,89,199,19,27,141,230,208,14,92,71,100,96,212,217,255,113,174,249,109,40,161,186,100,72,43,40,133,9,59,216,58,220,10,74,164,76,94,154,146,31,158,108,41,70,137,45,118,204,247,19,29,116,153,106,58,219,85,203,4,65,125,150,255,100,43,236,217,176,105,161,242,215,237,57,133,65,155,60,33,9,26,57,141,113,21,61,105,82,189,117,36,166,243,47,177,165,227,121,
+217,93,255,166,6,254,77,181,115,105,250,214,205,99,14,89,249,113,77,70,161,211,116,228,155,107,168,19,243,210,130,211,206,155,133,181,155,159,24,126,236,23,222,229,87,194,80,62,75,15,181,200,69,163,186,106,24,231,184,109,96,73,217,12,3,81,152,130,241,243,86,224,5,50,247,203,250,209,71,145,108,82,18,63,39,22,53,183,64,241,216,168,18,133,163,239,217,233,136,157,219,213,102,169,45,203,89,56,141,58,89,113,223,76,119,93,20,10,112,55,240,133,105,175,175,151,101,242,1,66,211,199,53,178,139,166,199,228,170,83,203,81,67,178,204,107,186,110,41,83,217,186,37,201,82,40,11,112,106,144,244,76,235,181,99,168,186,14,94,199,18,29,101,205,143,207,229,140,205,226,68,79,240,125,106,171,211,217,35,125,175,31,15,217,218,42,141,43,117,1,182,195,208,33,10,194,134,227,91,24,164,161,26,78,48,165,1,185,209,48,20,175,252,112,43,75,50,186,30,229,79,86,0,74,69,150,146,54,174,109,239,24,128,248,250,140,159,243,21,172,142,128,2,222,148,187,
+235,24,80,2,170,79,254,79,195,166,198,41,174,126,218,80,85,182,94,42,176,4,228,73,71,100,76,142,109,172,47,195,41,83,121,238,91,124,200,19,231,35,58,101,180,87,47,196,69,37,226,170,93,39,66,78,101,5,69,5,211,205,181,37,122,21,226,142,219,97,192,117,254,153,152,12,93,255,37,215,159,182,186,60,230,21,255,229,0,27,38,163,235,93,46,60,79,49,44,110,35,126,124,15,232,18,232,11,247,133,11,69,52,206,245,194,213,212,213,65,103,231,16,107,183,169,172,57,163,162,115,106,86,229,196,249,170,218,138,57,253,101,162,150,96,30,251,194,51,246,124,61,115,154,215,228,241,200,33,171,153,71,212,79,78,125,241,114,92,139,209,234,181,187,217,213,223,38,232,235,233,199,228,58,105,92,70,125,45,132,153,142,114,31,179,217,68,13,72,43,70,162,239,84,60,151,211,19,111,115,21,174,14,159,98,96,180,172,49,212,212,210,70,178,220,93,190,173,222,26,100,229,73,103,74,220,220,45,86,205,250,50,84,53,199,104,254,145,73,186,20,47,216,238,162,219,
+8,121,73,23,243,177,244,193,229,232,93,239,62,41,65,226,53,50,56,43,42,243,160,111,12,199,157,159,166,233,244,235,64,58,125,123,163,110,204,214,94,175,232,128,170,88,55,82,45,124,190,191,12,119,177,153,108,205,55,252,138,116,87,223,86,162,71,191,43,125,78,215,230,250,139,111,30,232,157,53,12,236,135,204,249,202,223,248,159,167,99,233,121,80,253,98,58,229,147,77,236,232,207,45,179,241,225,70,207,54,206,123,233,32,153,255,35,107,158,73,57,223,243,184,183,41,172,247,32,149,225,87,169,232,95,99,163,224,71,111,28,42,138,18,90,221,160,140,96,37,125,215,104,112,253,44,223,46,178,173,83,196,153,23,66,22,225,253,85,114,174,146,71,25,6,215,18,101,55,211,229,247,251,52,43,167,234,251,88,137,91,125,54,49,170,105,240,120,0,237,3,248,65,246,8,7,116,224,243,248,235,147,40,204,72,179,146,29,108,160,250,237,41,167,37,59,65,211,160,95,211,132,61,191,111,2,130,140,192,250,10,239,48,126,197,23,28,79,220,221,151,156,54,177,112,159,
+7,75,36,140,147,114,219,23,67,24,126,178,90,225,38,172,211,32,155,87,198,109,195,237,21,232,5,111,27,110,176,198,211,125,195,109,163,129,223,55,220,96,31,238,251,134,219,227,219,223,47,1,176,251,173,61,4,194,19,191,247,2,72,149,149,168,101,222,56,61,60,138,142,155,254,242,248,253,144,226,138,162,133,100,118,51,152,187,113,79,203,33,107,201,185,194,94,94,62,166,143,218,14,47,74,106,87,143,70,78,63,55,45,50,45,224,107,36,146,83,20,116,71,163,98,180,46,91,112,54,42,57,234,184,94,124,90,4,39,163,65,202,174,48,35,215,249,128,134,193,126,191,227,88,146,111,29,114,37,185,91,199,229,80,59,153,166,213,211,214,117,189,58,100,50,153,213,106,45,25,141,27,239,243,54,141,220,141,10,133,76,88,65,124,143,44,178,177,203,235,123,175,240,46,145,63,34,126,97,176,175,23,13,168,119,183,84,96,56,146,219,56,134,166,216,128,52,32,51,40,37,89,115,190,227,77,9,121,179,198,83,177,66,142,97,200,50,78,188,126,103,207,33,22,132,201,
+159,127,231,103,44,206,173,221,120,216,83,171,211,83,230,71,76,221,75,71,147,76,228,227,213,212,194,171,64,81,156,233,234,210,226,141,35,7,72,233,45,130,160,136,180,236,40,53,52,231,185,142,196,252,221,191,83,12,145,91,204,191,251,119,14,45,89,130,76,97,228,168,217,12,249,24,87,12,180,229,202,64,245,30,237,107,120,111,31,95,6,253,10,137,24,144,98,37,163,5,115,16,128,31,189,201,132,94,213,52,198,159,110,157,192,58,178,55,117,31,185,182,210,29,64,189,187,230,91,65,162,240,177,245,16,195,202,157,18,134,13,145,7,191,105,23,219,51,133,63,35,193,178,28,38,121,118,165,129,249,207,171,235,71,132,208,106,237,52,69,113,228,87,210,162,125,222,42,6,45,15,221,48,140,169,115,28,160,244,117,108,57,115,232,197,2,237,60,43,196,182,131,251,156,209,189,232,236,211,53,131,80,125,93,219,2,97,160,241,77,229,9,58,238,41,160,57,122,19,142,159,181,40,158,236,177,65,253,22,189,8,99,106,219,23,248,160,113,201,31,86,60,43,125,209,163,
+48,232,143,153,136,68,43,36,89,98,228,135,71,151,152,66,81,26,57,46,51,56,111,172,67,108,135,224,152,85,22,169,19,69,49,28,39,249,28,237,109,135,70,129,155,190,129,181,36,66,46,113,118,28,223,113,126,234,135,112,201,81,173,47,192,113,29,224,152,130,196,47,61,230,9,118,107,26,89,26,223,47,173,98,240,209,52,113,26,198,134,51,26,23,212,146,96,237,61,159,22,38,175,215,175,20,19,125,132,101,31,51,234,38,80,212,250,152,27,73,64,24,33,135,72,88,106,148,117,220,141,199,46,229,241,132,26,144,206,140,191,251,113,116,170,206,233,91,71,27,229,194,205,7,105,195,196,254,170,186,235,139,206,117,232,202,201,123,120,0,69,103,129,115,205,42,97,187,152,190,158,107,152,106,78,205,139,157,216,154,228,150,252,86,112,72,224,217,53,35,26,232,104,194,61,215,195,130,8,104,29,224,64,153,49,113,62,138,72,210,2,40,244,107,180,161,1,32,6,37,237,182,60,18,22,137,38,249,89,156,71,248,162,215,224,141,41,73,89,50,14,210,74,181,235,116,
+144,35,49,199,140,135,75,180,10,199,25,253,144,38,233,176,142,2,7,56,114,81,10,109,186,4,187,214,157,233,4,248,52,55,221,138,99,250,33,122,74,97,238,9,199,178,22,1,115,208,49,213,221,140,85,228,103,22,231,56,113,235,21,83,186,131,158,123,187,181,43,249,83,82,13,81,199,170,205,174,131,82,88,211,174,97,70,226,184,62,95,76,15,79,80,116,39,202,154,119,90,28,138,199,52,108,135,32,215,59,45,153,17,26,30,45,106,52,153,142,165,99,43,136,63,118,114,209,189,101,217,52,150,227,245,95,115,198,193,182,119,88,91,207,67,201,168,126,29,154,164,122,121,130,140,11,36,150,111,151,93,216,145,141,217,120,93,235,195,88,23,157,89,251,166,145,201,242,209,186,164,170,185,201,23,17,113,222,100,232,203,245,79,252,106,97,117,34,112,83,167,66,111,120,114,177,14,24,180,137,235,10,54,126,91,111,89,31,31,39,234,7,6,117,66,43,127,51,66,198,89,222,41,154,32,127,100,164,64,219,220,214,186,32,254,28,171,35,232,186,164,58,177,67,73,219,
+240,21,23,139,49,58,35,207,66,43,150,76,9,133,169,202,153,232,193,245,209,99,52,201,247,177,124,223,92,83,20,236,249,57,78,126,51,50,207,212,114,215,148,47,242,209,66,39,189,193,214,21,229,150,68,95,197,152,194,159,24,199,233,235,130,33,120,21,4,179,137,85,242,131,22,112,63,237,144,162,16,153,241,251,136,49,201,97,22,191,160,192,150,204,75,36,3,16,27,243,67,118,161,3,189,40,104,115,162,132,185,102,238,37,223,156,231,142,88,174,214,65,186,98,155,159,226,71,191,227,69,162,169,116,116,170,103,157,186,129,250,105,28,14,252,237,175,72,255,26,52,49,221,109,2,162,134,241,107,55,51,209,114,250,250,171,233,135,185,23,36,231,144,132,86,17,163,233,237,90,140,167,163,200,242,26,221,210,63,129,38,197,53,101,54,97,79,173,210,238,180,31,199,172,66,25,97,9,87,10,13,196,104,151,247,251,164,249,56,3,168,188,201,148,26,183,166,135,33,153,130,226,21,70,230,105,204,233,71,114,188,114,46,178,241,202,150,92,248,92,92,158,10,9,112,3,
+20,86,236,17,17,112,143,222,246,193,33,152,134,117,101,222,194,41,136,171,154,24,164,94,120,149,42,8,194,69,227,114,42,74,213,122,38,75,98,238,136,233,173,77,120,46,198,40,18,167,81,48,242,107,82,148,25,125,130,36,201,20,148,170,2,106,59,83,202,184,59,222,153,83,34,64,31,104,5,144,195,10,20,123,125,203,46,229,232,32,154,181,189,161,89,201,41,157,40,25,209,94,8,104,23,235,162,206,97,216,189,192,253,216,199,77,25,135,63,182,167,174,129,19,191,137,176,223,94,187,122,175,210,25,8,208,55,132,183,188,41,66,87,30,89,234,90,208,239,14,48,102,230,203,145,34,216,36,158,2,130,90,194,7,59,225,71,199,109,33,231,178,59,44,249,183,234,83,197,184,252,31,249,143,163,91,156,142,42,185,181,23,170,144,177,211,48,220,164,157,104,133,222,25,221,24,119,168,211,212,29,180,178,40,249,56,61,11,106,40,87,127,217,81,168,148,135,138,166,19,43,106,181,136,204,178,235,172,254,104,145,235,203,145,74,57,101,251,62,38,125,130,153,233,40,79,
+28,29,225,105,26,110,174,234,199,39,240,155,169,183,45,78,161,0,77,160,70,15,72,144,129,28,57,231,181,139,206,217,142,126,47,213,196,120,60,126,190,96,166,146,121,65,167,99,200,200,31,83,249,187,208,176,62,189,253,206,44,67,61,12,214,83,60,125,244,244,197,5,85,34,20,202,169,199,53,163,179,14,173,25,232,240,152,50,223,217,165,132,224,168,156,231,78,54,21,227,200,128,179,125,165,8,171,41,46,1,204,101,229,143,3,248,201,89,33,20,164,4,149,145,156,4,32,69,33,124,127,149,136,90,177,112,139,130,66,220,198,201,178,124,47,29,3,192,225,139,237,211,210,44,76,211,52,180,234,191,214,88,165,237,126,85,199,61,57,8,28,31,23,212,123,243,239,183,155,32,250,128,116,116,247,28,44,253,234,238,57,244,70,203,221,115,4,39,147,155,231,152,125,136,89,165,71,172,78,54,103,139,163,141,203,20,253,62,117,189,237,137,192,131,228,239,56,147,179,119,158,212,116,29,229,94,119,32,237,24,155,132,141,169,82,171,123,165,237,194,132,196,136,143,116,127,
+181,76,127,64,121,34,233,213,34,114,119,95,118,172,40,172,113,152,144,98,87,24,90,164,112,56,59,45,37,56,18,179,230,144,109,37,216,14,121,86,233,33,177,125,161,163,165,255,28,38,195,132,26,206,123,216,203,35,15,132,79,118,201,234,1,102,101,35,98,91,8,155,239,208,12,97,243,13,154,219,251,125,0,103,159,165,45,111,52,87,239,107,206,212,10,209,6,226,9,94,138,68,185,15,40,226,151,87,99,173,89,63,16,57,82,228,48,134,161,224,147,157,99,2,123,226,127,161,126,38,89,163,85,208,26,60,243,48,83,1,17,181,20,90,37,27,103,65,43,244,111,43,131,139,221,253,75,109,71,58,100,201,229,241,227,7,119,38,10,199,184,153,44,232,251,54,179,130,157,252,244,245,34,160,17,79,132,173,244,193,132,200,231,166,151,223,167,234,226,219,131,91,56,136,83,49,44,255,65,54,130,100,93,199,241,100,93,245,206,12,83,150,45,32,133,58,157,206,81,195,121,163,45,106,76,75,199,181,117,190,50,54,132,67,235,57,177,2,236,113,159,228,151,45,0,245,
+101,38,8,188,88,60,222,203,40,163,237,57,63,107,66,195,239,250,252,92,65,17,41,95,239,40,56,158,132,174,176,37,225,130,142,186,166,13,77,227,170,93,8,37,70,10,165,90,157,55,192,7,149,71,156,61,243,179,209,102,212,137,47,210,96,78,147,92,92,214,177,139,130,233,220,253,129,104,140,130,101,224,27,89,237,55,215,213,187,26,98,83,133,6,91,63,6,74,146,39,221,66,132,35,204,34,137,118,14,193,87,54,198,209,151,170,112,134,106,12,247,153,169,50,122,245,121,224,48,49,24,36,183,13,218,182,58,198,113,206,72,201,79,218,249,24,207,158,106,221,232,238,225,184,239,178,178,152,35,56,11,165,169,194,48,201,231,236,241,76,15,207,105,160,184,62,159,103,10,134,216,17,222,144,67,214,135,125,221,204,255,53,101,39,226,100,180,163,251,140,8,194,223,23,41,94,2,163,17,9,64,223,221,72,126,72,104,241,104,150,155,93,11,198,164,196,83,85,254,182,225,151,81,86,174,104,53,98,203,75,161,203,19,147,131,58,43,98,212,42,125,83,211,10,29,25,
+162,228,33,32,175,91,106,176,153,151,247,233,55,242,161,20,119,161,77,231,104,99,191,121,237,141,10,195,223,243,78,136,221,140,243,94,166,148,9,35,112,202,234,187,191,230,87,30,28,143,11,146,211,29,233,138,36,228,151,108,223,117,94,208,200,152,36,206,229,206,204,101,155,40,80,227,134,137,184,129,165,170,35,53,204,140,10,242,200,221,119,21,211,60,191,192,202,15,169,227,202,114,254,69,125,247,83,34,133,68,222,57,26,126,83,178,78,182,249,98,127,247,97,118,49,45,101,177,23,51,28,232,81,94,177,178,22,46,19,206,212,68,72,234,6,126,216,150,220,240,136,65,216,18,253,32,17,132,29,91,182,243,71,93,211,91,150,170,119,234,187,42,175,235,48,199,133,194,192,178,228,172,212,82,218,225,122,126,109,161,157,242,6,54,214,19,227,176,227,132,35,127,140,127,47,86,79,16,100,214,32,204,108,228,47,108,195,70,6,164,219,166,137,252,251,124,152,12,102,239,97,251,84,159,170,96,170,86,121,162,212,30,90,169,144,74,6,158,182,140,25,241,197,115,158,112,
+19,176,39,15,56,3,192,179,246,166,126,106,215,37,119,93,46,177,177,196,80,202,81,42,43,95,117,150,33,233,60,110,178,20,98,211,240,184,227,181,122,91,223,57,244,44,122,78,206,146,132,54,158,29,133,225,201,191,198,123,120,59,196,222,194,91,40,144,252,82,170,107,85,139,82,171,101,227,196,68,20,134,113,145,167,149,145,119,71,103,55,167,26,137,151,113,221,64,147,176,95,145,42,106,95,27,152,152,77,223,137,11,241,62,92,251,5,205,14,193,102,100,99,240,47,188,141,107,27,186,196,187,203,186,179,69,151,77,145,154,125,209,101,116,57,199,178,163,11,98,48,152,80,107,81,197,216,133,41,177,58,90,10,34,104,66,116,43,20,229,34,15,78,255,23,67,12,131,195,96,159,214,219,56,207,111,31,197,162,117,239,177,95,121,135,150,197,183,91,226,70,231,86,182,100,211,169,14,107,31,74,227,7,150,203,37,154,146,29,34,56,171,145,25,210,232,189,7,208,244,242,211,136,117,84,29,69,215,88,231,126,131,121,154,210,170,202,215,58,9,171,243,161,150,237,183,
+85,230,101,151,22,60,220,96,133,140,119,222,129,108,60,202,100,50,11,76,68,92,82,179,39,155,208,120,56,154,218,186,133,101,88,142,137,108,199,197,76,181,138,4,77,211,214,182,99,198,77,193,46,127,3,39,214,124,75,209,111,236,80,141,14,212,76,88,172,78,148,220,206,45,70,131,67,49,111,53,170,16,152,18,216,35,50,46,151,151,42,209,74,229,188,29,95,93,211,65,65,30,117,90,6,166,181,60,126,88,40,90,138,229,226,14,124,8,229,31,240,113,251,28,10,109,156,157,255,12,124,44,59,211,53,119,255,29,39,221,191,135,201,36,0,165,221,119,23,112,72,123,212,202,154,18,19,104,186,206,203,138,137,122,62,240,150,236,147,35,176,14,113,170,231,8,233,15,16,117,105,8,16,103,145,231,80,194,93,231,229,249,236,180,56,115,50,182,77,13,255,30,139,72,206,131,60,230,13,141,61,162,176,19,82,71,34,81,202,120,54,218,73,65,1,157,158,167,111,244,163,124,210,81,112,223,229,28,177,188,211,215,242,227,242,105,121,102,47,81,78,230,74,23,66,217,
+133,232,218,111,79,83,122,67,17,99,212,160,3,88,170,97,48,184,0,242,35,146,110,236,16,95,245,146,71,227,68,113,130,210,152,88,44,102,155,108,198,218,3,20,41,186,142,29,40,82,220,86,200,171,147,81,216,95,58,127,32,155,119,184,19,73,170,121,234,115,244,182,157,249,179,115,206,152,224,176,134,24,50,229,32,46,251,118,147,184,180,42,193,79,58,206,114,213,179,84,62,159,123,143,83,22,89,135,56,37,200,237,81,225,245,160,91,51,140,211,42,145,162,146,103,223,169,57,69,145,106,152,60,32,217,50,41,149,54,200,137,139,2,157,98,49,236,153,38,203,242,199,39,199,101,93,58,88,241,23,19,7,156,172,172,39,169,162,227,89,102,127,3,114,182,28,57,50,142,149,231,142,53,241,176,101,108,191,174,52,54,193,240,246,114,202,61,88,137,96,48,75,110,223,145,47,230,156,221,145,111,22,207,222,145,111,122,220,179,62,143,122,2,202,43,53,152,74,94,98,199,103,62,71,187,137,47,208,150,250,106,168,20,132,124,13,243,17,93,137,246,61,111,87,141,142,
+110,195,59,29,168,45,202,227,187,39,229,115,16,69,128,242,56,197,115,155,195,207,19,221,147,229,6,158,93,169,143,140,126,180,181,143,40,120,45,94,232,88,91,156,39,239,19,101,139,58,131,57,230,239,110,38,3,124,236,73,4,60,20,209,254,181,238,54,234,68,223,82,142,168,21,105,108,245,55,181,254,12,184,199,254,22,137,139,125,156,109,131,223,142,227,243,71,120,161,79,212,193,247,121,174,252,253,208,33,110,208,2,16,110,82,209,202,218,111,42,18,112,127,222,130,95,51,238,197,137,212,49,39,109,31,111,111,177,57,142,204,254,57,125,136,19,10,147,76,241,241,172,33,157,2,96,112,66,174,47,184,36,223,20,195,125,113,112,96,149,199,244,253,56,242,74,181,3,230,252,26,132,208,60,177,186,11,46,74,21,75,225,116,61,199,223,103,192,59,226,27,7,245,145,221,58,1,132,145,209,88,78,23,152,40,158,176,224,221,251,97,232,135,21,68,163,17,114,188,179,228,193,197,217,98,219,194,71,177,173,44,68,207,142,17,207,248,57,104,209,119,93,149,227,88,176,
+178,107,105,4,0,165,185,10,120,104,88,252,134,215,223,254,235,106,116,93,184,163,206,97,192,254,82,205,201,214,242,45,207,60,81,129,200,35,165,193,209,209,155,196,147,145,49,115,177,245,91,170,29,225,66,202,23,169,31,39,185,142,13,182,167,217,45,23,89,86,119,78,38,196,145,242,69,98,17,249,218,247,80,47,7,127,176,190,221,74,246,110,151,251,183,30,93,213,208,242,9,167,48,238,36,117,238,237,120,47,163,62,175,194,92,145,221,156,109,22,239,126,215,223,205,183,179,239,13,5,47,166,151,108,13,188,192,140,34,97,37,88,239,251,86,98,184,133,208,99,249,90,123,117,202,37,234,178,167,249,150,196,199,254,135,231,214,95,110,15,59,221,208,149,28,223,45,30,227,230,66,2,6,115,227,37,18,48,54,131,62,240,18,26,52,156,181,128,164,160,141,92,28,97,155,11,97,121,174,225,191,183,200,79,102,242,198,236,170,100,234,237,85,201,25,231,88,204,109,100,191,1,186,212,29,188,82,73,39,177,206,173,184,198,72,177,90,185,21,179,230,178,202,135,215,8,
+102,27,118,114,96,191,238,212,189,186,128,89,53,130,226,239,105,162,82,144,240,202,160,118,82,164,80,42,212,159,73,82,7,178,111,218,120,140,61,125,75,62,111,215,34,92,208,26,184,178,239,236,138,163,191,190,173,149,123,1,131,239,19,203,170,218,182,78,92,110,23,27,249,102,74,191,116,90,144,26,99,159,190,192,50,159,16,37,203,19,106,218,152,66,129,199,240,82,31,73,50,224,136,64,92,65,28,158,77,9,138,7,57,58,135,17,237,25,202,215,92,44,116,193,8,42,254,74,255,65,247,209,119,138,146,118,81,184,212,67,106,212,40,30,14,38,135,5,35,160,48,172,228,114,70,188,207,35,32,38,188,5,145,75,138,164,131,40,203,71,68,223,212,227,217,28,133,220,4,138,67,108,211,56,191,20,239,155,56,92,116,240,64,88,81,139,0,30,202,30,222,219,14,107,13,45,174,218,76,145,230,2,66,29,53,79,208,146,129,246,72,24,125,229,61,149,109,93,144,14,91,60,160,26,72,87,56,225,113,243,94,144,58,92,153,243,54,201,237,222,105,190,229,107,97,116,
+170,10,72,194,157,202,51,202,184,190,149,133,209,215,236,66,127,248,198,220,250,31,18,30,194,57,199,147,80,31,126,167,227,158,242,85,147,195,220,61,123,237,50,129,60,187,221,247,158,17,109,161,16,150,220,18,251,216,18,141,90,156,162,140,77,110,81,139,30,149,40,251,108,102,191,255,144,127,100,39,226,187,24,145,179,89,87,76,7,177,53,252,162,68,150,228,179,169,78,6,101,189,219,225,214,34,119,151,102,246,20,62,186,53,236,212,246,41,59,102,83,29,63,225,27,116,201,217,244,156,177,102,237,211,190,218,214,115,96,130,223,159,60,160,185,170,77,37,53,81,194,98,149,153,194,176,234,247,248,65,167,179,173,76,207,35,10,207,128,67,194,212,8,194,245,57,129,7,22,23,123,120,111,121,126,195,224,42,72,213,47,225,233,37,80,157,17,219,223,109,69,142,116,134,188,31,21,117,134,103,28,213,81,174,146,105,94,62,8,81,28,118,169,73,94,196,163,215,57,166,47,95,61,69,200,76,143,73,64,128,125,14,241,49,96,77,208,191,53,247,122,138,179,17,195,97,
+187,228,210,214,30,23,126,217,16,34,206,47,234,199,50,59,209,190,31,207,20,56,228,210,9,170,0,153,232,211,249,154,35,113,0,78,244,105,224,2,212,207,44,72,134,121,96,16,188,69,201,219,181,133,16,42,144,245,68,152,228,112,191,202,6,47,6,4,160,34,197,139,113,73,8,157,132,240,144,191,185,51,38,222,109,7,66,104,78,79,163,182,75,93,175,63,158,72,27,177,68,221,204,197,114,229,126,161,120,169,183,14,44,64,20,234,5,104,24,27,214,122,130,115,124,115,89,234,27,152,219,13,240,39,154,251,118,157,78,28,245,171,64,183,222,137,136,219,125,6,112,20,220,162,65,220,7,78,62,167,81,112,40,129,129,5,97,159,71,180,24,252,242,254,254,247,235,136,238,231,254,213,168,31,20,9,112,223,42,7,54,176,96,40,194,91,213,4,116,27,10,112,139,255,151,235,212,20,144,31,100,110,171,79,62,20,130,83,210,136,137,179,123,25,193,47,170,174,149,250,160,127,239,48,50,20,96,24,12,134,199,82,169,215,235,125,130,222,27,44,65,239,97,80,144,255,
+52,131,57,247,90,28,86,188,203,119,240,116,53,115,187,197,33,253,29,119,147,132,60,132,90,70,8,135,195,71,169,137,156,223,54,216,40,226,85,71,144,75,83,78,169,17,207,16,14,158,136,18,243,223,52,13,26,219,174,57,2,135,11,54,176,70,209,36,177,88,56,54,1,66,123,70,11,219,100,244,222,111,34,130,210,182,4,153,34,150,200,124,105,188,249,0,168,11,201,228,215,48,167,178,134,120,230,184,252,131,186,130,79,214,140,185,61,211,118,32,182,178,203,43,247,179,242,87,0,100,183,131,50,153,44,10,40,52,114,95,85,188,0,222,231,111,230,165,111,62,28,23,9,251,197,229,177,247,240,254,87,119,163,72,144,151,40,182,60,170,138,50,232,244,52,243,212,198,123,22,69,114,224,211,80,131,52,192,231,64,68,92,62,52,251,1,124,255,171,151,65,36,158,201,219,165,45,38,77,123,153,163,24,97,246,238,35,59,136,76,38,77,197,249,56,29,4,159,80,16,249,252,8,146,239,21,242,150,125,140,220,108,163,222,137,184,0,9,5,120,55,222,71,126,98,35,
+14,94,234,188,214,0,197,134,61,33,236,91,124,236,159,122,18,14,32,229,191,173,139,188,40,25,48,162,151,20,113,118,105,11,119,56,167,15,222,152,119,18,60,66,106,87,27,120,171,240,243,215,103,176,44,41,205,166,73,205,203,228,175,158,139,196,218,65,193,243,79,185,204,84,24,193,175,101,152,7,139,223,170,116,196,97,81,147,3,146,150,224,140,246,76,69,220,21,42,33,254,66,193,125,194,255,207,235,158,254,234,80,22,204,226,237,214,26,56,227,245,193,64,62,113,162,16,226,223,184,87,3,150,147,180,197,147,236,211,42,108,235,25,19,39,51,227,212,192,188,211,60,34,92,223,254,212,95,161,23,240,5,90,167,100,230,204,131,177,113,88,1,228,223,61,131,96,34,75,62,90,200,195,108,224,210,127,63,177,224,65,83,151,109,27,59,121,129,151,117,45,147,200,240,150,193,135,123,97,158,24,173,70,105,87,125,159,40,228,190,138,15,76,221,162,40,42,84,139,157,7,10,211,173,238,78,205,88,229,47,125,87,121,221,97,122,187,207,214,253,166,23,238,7,164,109,
+129,209,251,9,253,238,115,138,145,226,48,206,189,102,24,30,59,75,105,32,196,117,229,154,173,10,77,66,199,229,84,168,207,123,57,36,67,210,159,236,99,68,73,214,204,153,173,245,136,159,243,202,230,94,238,190,9,135,138,18,19,231,9,28,86,1,120,251,126,90,114,22,5,80,108,236,163,104,18,249,101,240,120,54,16,158,100,155,220,83,65,229,19,7,67,65,249,92,136,28,189,213,215,209,160,64,102,42,228,22,69,141,36,59,101,236,206,69,231,121,65,113,20,140,35,185,147,216,168,216,239,88,255,220,95,56,64,253,4,124,209,158,34,76,197,7,111,242,40,187,121,156,30,83,251,58,222,177,254,173,51,212,128,150,54,181,52,183,254,91,15,107,224,45,195,42,99,115,77,12,254,213,71,118,124,93,114,101,20,24,254,115,239,237,237,126,20,169,45,143,205,121,184,247,5,227,97,72,146,46,203,228,110,24,220,221,250,72,52,106,60,217,170,200,155,225,31,131,161,33,148,42,144,224,5,222,40,12,130,224,131,70,232,131,16,34,246,28,139,109,140,116,58,189,99,61,
+222,199,253,167,174,109,143,13,145,149,150,24,217,240,82,128,210,49,213,87,59,21,193,229,42,99,120,224,113,248,215,1,67,8,147,209,228,193,134,163,82,40,244,156,159,160,69,48,75,20,52,216,221,122,26,13,204,93,190,21,59,90,240,52,49,103,53,163,67,147,176,38,59,214,63,117,78,63,66,84,131,29,253,234,14,135,195,61,86,158,160,211,219,116,123,66,246,148,240,108,9,116,173,48,32,63,8,129,40,89,53,179,99,255,177,19,233,19,0,146,214,94,244,182,192,145,108,198,69,33,141,171,101,137,105,118,241,168,180,181,188,36,116,36,246,43,35,220,251,193,197,201,188,181,253,142,52,134,3,80,48,96,169,192,27,196,100,18,144,129,9,8,77,70,231,134,147,39,243,122,180,109,155,26,115,140,21,234,126,173,35,45,133,146,166,193,46,246,1,220,129,166,242,208,220,221,102,124,177,198,4,68,223,101,171,224,100,67,36,145,72,100,88,21,174,120,207,146,60,86,153,51,248,254,137,101,36,130,81,241,65,161,213,80,198,225,192,109,171,73,242,221,227,81,36,236,
+115,133,151,36,173,171,100,4,214,42,255,173,238,226,68,164,239,124,138,83,109,213,250,93,250,65,212,164,200,3,154,243,161,175,171,217,236,15,87,52,156,237,154,19,218,100,214,76,110,199,58,251,244,64,228,238,109,160,161,100,146,13,53,80,76,108,19,31,203,53,82,234,177,195,79,105,103,3,19,246,231,202,140,240,158,183,218,63,52,111,104,253,169,127,0,163,100,67,205,100,26,153,94,197,35,124,7,138,234,49,248,212,70,195,114,171,189,119,251,51,67,223,190,152,211,12,191,26,14,90,219,238,158,14,187,20,155,90,3,9,183,123,89,241,115,30,233,75,82,249,113,246,243,170,127,241,66,202,186,189,173,246,254,91,207,233,183,138,71,13,72,119,190,238,236,135,134,103,30,179,100,227,253,170,227,62,84,250,166,40,255,234,193,120,31,34,135,103,40,109,85,138,216,215,93,232,227,22,121,165,79,159,107,5,254,223,235,130,252,237,245,62,25,69,224,137,134,107,195,107,52,87,88,52,13,215,15,11,66,199,185,115,10,135,181,32,78,101,63,46,73,200,170,213,254,92,
+20,97,238,198,145,167,70,171,100,87,211,80,85,11,255,237,215,184,247,139,146,172,168,206,105,188,59,209,47,134,106,58,157,46,136,47,163,208,188,88,75,40,255,237,199,187,247,75,183,78,227,203,66,125,92,174,115,105,178,3,114,59,1,46,89,121,162,110,135,131,225,140,72,23,141,182,243,35,125,122,153,78,72,42,207,220,126,251,194,167,39,209,15,234,39,147,105,255,136,208,5,233,198,57,79,49,180,14,117,41,80,166,252,151,118,174,237,41,145,43,141,255,43,93,169,173,205,76,38,153,201,86,106,118,183,38,47,187,155,170,125,218,218,135,173,188,77,89,43,163,76,134,138,130,5,56,73,42,149,42,101,100,20,47,136,13,42,56,92,180,5,65,188,32,120,65,5,100,16,188,208,136,136,226,5,29,1,47,168,220,68,100,64,16,148,61,221,205,76,38,169,221,77,170,118,179,153,218,202,139,109,113,78,255,190,223,247,157,239,124,167,79,87,159,159,108,242,64,120,241,66,63,232,90,155,200,101,98,87,93,251,51,141,115,72,147,248,85,156,23,49,86,202,153,193,58,
+157,118,124,198,239,234,113,136,64,130,118,177,250,244,209,177,248,51,89,178,223,180,147,48,166,205,254,4,171,32,13,116,78,250,224,110,112,211,44,191,223,150,79,152,205,107,130,217,124,195,153,105,110,187,223,16,232,144,7,6,103,175,155,151,195,2,215,76,8,125,61,191,221,251,14,65,198,120,186,188,217,194,157,241,202,16,215,154,98,34,39,50,58,189,181,245,11,59,158,249,205,233,215,249,245,212,131,108,249,7,195,166,152,127,111,121,83,214,183,200,217,227,203,210,10,147,62,39,108,197,234,67,167,208,134,79,136,209,75,183,39,191,11,214,29,95,26,229,206,204,218,66,173,234,5,124,36,199,106,166,192,140,142,154,231,70,251,142,144,213,181,137,250,167,174,147,132,153,53,93,35,171,199,252,60,87,205,189,132,21,14,84,201,146,236,96,9,248,124,131,203,193,43,147,253,32,133,87,38,161,24,198,43,83,61,1,87,35,196,214,81,233,213,68,59,95,53,151,55,114,95,157,83,62,113,17,229,14,94,33,202,157,91,72,148,187,55,244,112,240,114,183,88,60,183,170,
+20,163,157,210,241,221,133,77,110,148,0,22,224,175,131,135,141,171,145,156,100,19,36,236,171,231,134,188,209,61,232,29,138,216,173,9,92,15,171,139,167,146,55,118,112,254,251,122,1,175,230,131,4,155,15,44,155,37,128,171,251,28,30,46,42,220,79,85,182,44,92,103,179,212,191,141,122,5,77,139,246,36,18,237,115,63,89,129,127,210,243,199,191,224,252,130,243,255,128,243,18,60,3,129,71,32,109,141,79,222,56,173,120,123,116,81,190,143,83,131,159,58,247,193,28,69,33,24,149,195,108,171,228,231,213,197,248,62,14,139,104,86,186,192,30,24,219,2,255,220,117,240,199,226,108,128,34,239,66,162,45,162,212,246,44,210,109,253,159,235,97,252,16,142,16,95,117,6,220,170,101,196,189,210,255,211,235,94,252,135,251,72,184,70,245,68,109,23,188,116,252,220,186,50,255,10,39,88,196,145,228,229,232,198,150,221,213,2,171,78,120,111,97,93,226,213,224,47,40,236,168,96,12,39,220,38,206,43,80,141,66,94,211,56,253,86,232,56,213,16,50,24,190,70,190,226,
+56,222,8,179,3,67,196,70,110,174,211,22,242,139,12,33,158,29,102,75,222,66,61,31,33,254,154,238,60,218,27,119,226,122,29,248,126,61,206,209,113,138,15,116,63,84,87,166,22,57,90,247,24,79,245,92,136,226,243,117,92,152,92,136,12,200,10,214,208,156,127,232,234,178,205,32,11,111,140,55,79,157,113,155,56,172,30,16,163,21,16,36,221,186,18,29,64,157,145,72,24,53,53,28,119,140,15,159,142,119,178,28,176,74,184,1,179,243,0,67,197,57,80,212,117,22,20,141,135,193,108,179,110,107,188,121,91,103,175,69,2,91,88,68,159,241,122,251,184,10,151,102,84,61,208,239,215,246,104,231,137,102,228,57,209,204,203,242,151,20,141,151,151,232,225,78,139,101,219,49,193,171,81,17,196,218,15,229,59,124,133,111,138,155,137,154,142,216,142,136,92,110,71,2,105,88,197,195,252,245,118,72,27,53,26,151,170,75,187,206,238,196,190,55,130,217,79,70,137,252,219,196,191,134,58,173,183,175,134,225,133,96,16,126,106,179,68,177,161,62,4,110,152,220,251,125,
+195,27,162,177,148,61,146,105,129,137,134,69,204,191,33,227,245,110,254,72,162,88,87,166,119,45,114,14,203,107,71,150,176,73,118,152,67,164,81,253,179,48,159,219,219,100,95,2,153,34,131,89,108,98,95,49,191,172,139,93,185,55,76,35,235,237,209,167,241,38,93,75,183,110,35,2,120,176,136,117,77,217,234,77,159,234,10,217,220,118,114,68,100,52,12,114,216,44,31,222,32,85,138,90,93,39,61,110,203,10,241,64,30,2,241,231,154,67,194,26,155,69,131,5,132,195,227,239,35,33,80,231,71,4,184,210,236,217,51,176,86,170,174,189,153,110,4,57,218,169,17,245,52,224,199,184,27,88,196,49,238,186,231,196,49,110,204,44,118,140,219,18,32,142,113,119,215,124,71,95,162,183,168,47,209,38,56,193,110,223,79,154,70,46,124,185,220,85,99,74,16,31,140,216,212,146,13,142,97,183,185,254,32,164,168,71,181,38,12,162,53,122,169,22,185,167,210,154,121,227,140,245,88,122,230,191,30,146,204,94,247,198,15,166,14,12,77,252,132,115,166,62,29,15,111,215,
+31,244,233,55,204,186,244,42,140,127,189,218,100,75,153,115,134,174,149,246,214,33,79,54,24,74,130,13,109,124,176,113,210,92,184,30,74,201,204,227,168,51,132,134,90,185,146,51,131,120,211,186,49,179,187,182,233,63,217,119,237,218,93,49,227,158,51,165,247,39,12,98,67,0,227,221,209,30,89,247,109,109,92,100,150,214,27,148,46,99,98,227,56,17,183,228,117,113,243,164,188,183,176,152,219,126,33,235,127,17,149,114,195,252,89,165,113,225,40,127,210,38,203,176,164,220,93,140,130,183,9,29,87,202,206,174,83,67,14,217,142,166,239,90,62,235,242,172,122,16,227,218,216,153,62,172,223,49,26,225,185,150,77,207,186,108,108,234,124,146,159,181,241,97,115,202,40,54,200,27,51,152,213,35,241,204,203,243,96,59,42,176,74,212,117,237,170,86,163,113,172,185,219,237,201,44,200,36,150,176,109,24,76,15,142,30,19,37,216,148,170,56,245,92,73,84,128,194,202,96,192,210,106,104,147,47,98,225,182,230,144,225,124,102,175,118,25,215,147,16,111,249,183,14,158,104,
+133,249,61,64,236,168,205,221,99,114,167,227,154,157,103,38,237,68,180,183,87,218,105,29,176,11,174,204,185,244,98,139,119,241,164,105,46,16,67,59,251,220,60,76,150,98,155,31,212,199,165,187,94,245,81,112,232,34,120,193,30,108,151,231,80,169,201,192,86,155,76,176,70,172,116,194,170,11,48,154,220,24,231,220,101,57,189,24,117,59,81,167,180,55,173,153,114,195,92,85,207,133,183,75,159,216,126,49,174,137,235,151,206,106,59,76,120,134,76,99,160,87,71,135,225,9,181,221,155,180,137,93,147,163,47,38,119,237,200,94,244,210,220,239,142,9,61,135,181,185,253,211,54,123,154,101,193,51,233,20,128,235,70,189,60,78,75,120,53,45,214,242,165,10,71,203,78,187,28,141,36,151,231,57,225,133,188,104,126,72,220,52,181,32,222,115,228,134,121,131,28,150,12,132,101,69,170,114,38,91,56,81,15,95,119,204,111,184,138,44,11,228,104,78,167,245,33,219,3,129,105,75,242,252,172,225,56,157,54,234,163,74,144,139,46,188,123,11,39,59,61,184,158,212,229,116,
+193,220,108,7,10,43,180,39,61,195,158,216,250,243,134,149,236,84,198,166,123,62,194,147,19,129,109,71,228,251,227,222,136,73,228,221,147,37,140,226,237,180,29,241,40,39,28,227,135,230,133,131,169,253,150,29,174,38,55,180,191,181,132,20,112,213,136,21,233,169,42,17,219,153,102,195,93,54,111,155,38,100,67,47,249,138,78,172,105,109,14,49,185,213,106,191,54,6,6,79,17,144,88,219,219,112,11,99,96,236,60,198,220,81,80,185,2,171,216,113,85,109,179,28,87,8,145,116,37,47,227,178,130,99,88,129,206,235,125,49,65,191,218,230,205,152,205,45,125,139,130,237,140,213,98,16,170,123,11,137,166,5,59,15,155,118,134,240,242,110,220,124,46,5,185,46,69,157,57,201,98,182,41,122,157,181,159,120,165,156,33,132,123,12,82,188,127,43,179,16,60,180,154,115,173,162,227,189,45,48,50,71,109,90,85,30,76,196,9,195,204,232,74,246,170,126,168,211,8,50,181,213,152,50,142,237,15,231,101,254,148,122,70,164,139,40,209,126,98,222,200,210,166,115,190,82,
+154,9,173,173,42,59,231,94,248,243,138,125,247,186,242,186,254,32,129,203,107,32,231,253,166,11,223,142,91,239,221,116,134,174,22,124,201,217,39,89,125,186,81,35,50,141,57,156,39,96,202,174,14,167,99,86,173,3,233,94,66,246,181,253,71,243,169,80,46,231,80,206,198,70,226,254,58,223,28,119,1,38,244,103,26,138,250,51,117,69,253,25,86,81,127,198,82,212,159,233,6,235,56,94,94,224,231,68,121,225,104,240,242,226,65,55,5,91,199,19,42,52,91,251,50,149,24,245,92,114,51,177,230,227,168,122,183,1,203,87,111,255,229,225,200,192,192,14,63,56,90,208,55,72,198,228,65,126,236,16,83,141,216,74,157,26,143,53,166,176,223,117,22,244,179,157,23,157,151,57,141,47,98,231,117,4,100,225,244,100,188,206,103,45,36,114,205,23,23,151,235,185,194,1,251,42,234,9,95,71,11,30,94,161,173,171,80,184,184,90,157,60,203,206,13,207,35,249,36,114,48,112,6,104,237,11,242,133,90,187,235,96,18,83,139,248,232,99,168,120,249,35,131,65,97,48,
+75,111,149,222,130,62,193,255,86,145,232,12,50,29,42,167,208,201,101,76,202,99,50,131,80,151,128,238,127,4,253,165,132,242,57,25,170,36,81,191,130,104,204,71,160,19,131,82,73,169,32,209,33,38,141,86,193,120,255,13,172,247,161,135,52,58,84,69,166,131,11,232,95,70,134,232,100,18,131,70,5,157,202,105,100,6,68,165,49,33,74,101,85,5,185,146,76,101,66,15,171,43,42,138,214,25,95,81,153,164,47,161,27,20,106,209,196,23,52,122,57,184,139,194,132,30,145,24,192,16,84,250,78,217,35,50,137,89,250,14,68,163,18,92,170,42,72,101,100,198,205,219,208,167,143,0,59,26,3,135,166,209,153,36,0,93,78,39,125,241,128,84,246,57,68,123,8,149,85,211,233,152,185,215,134,73,76,10,192,160,0,216,71,36,38,102,226,53,183,42,58,185,244,131,42,58,13,224,50,160,135,148,10,50,70,225,51,42,141,14,218,41,212,178,138,234,114,240,15,137,90,14,8,148,209,105,16,249,203,42,18,149,1,192,24,183,161,191,210,152,100,2,144,76,167,211,
+232,12,136,76,45,163,85,83,153,100,58,185,28,42,175,166,83,168,159,225,49,198,174,36,58,25,196,176,2,80,169,248,170,136,95,14,221,168,166,86,96,102,139,209,3,191,60,166,144,128,219,127,35,51,202,72,84,168,140,86,78,198,156,7,205,56,255,155,183,139,3,244,41,13,4,153,65,171,120,12,48,105,149,100,204,99,224,193,3,224,42,230,32,240,178,146,242,217,35,38,244,0,99,240,106,172,32,70,117,21,22,42,6,54,148,32,42,111,12,59,225,3,198,176,138,196,96,0,22,32,246,32,68,56,151,119,239,220,41,125,23,48,169,196,162,200,184,7,8,64,95,127,253,209,239,239,126,120,239,183,191,185,251,33,116,159,241,225,199,239,125,242,135,187,183,126,119,23,2,61,127,85,250,65,201,189,123,16,78,242,19,192,30,3,100,18,148,94,155,131,190,160,128,28,184,255,222,29,44,252,37,208,131,55,173,18,25,121,155,192,248,30,242,173,31,137,252,79,0,161,27,12,38,173,138,1,140,126,151,234,205,111,45,221,41,182,220,191,131,55,254,189,4,11,62,22,
+238,111,89,220,32,127,73,194,34,119,15,239,1,61,166,81,202,161,63,211,104,55,254,68,162,151,254,250,230,107,118,0,1,187,183,228,223,176,33,149,151,51,240,78,197,116,44,102,34,137,206,196,147,151,86,89,5,50,165,28,140,109,53,29,75,247,146,111,190,33,152,64,37,255,0,181,59,67,251,
+
diff --git a/uppsrc/ide/app.tpp/BSD$en-us.tpp b/uppsrc/ide/app.tpp/BSD$en-us.tpp
new file mode 100644
index 000000000..f18cd50bc
--- /dev/null
+++ b/uppsrc/ide/app.tpp/BSD$en-us.tpp
@@ -0,0 +1,9 @@
+TITLE("Copyright (C) 2005 Mirek Fidler, Tomas Rylek and various contributors (see AUTHORS)")
+COMPRESSED
+120,156,133,84,107,115,219,70,18,252,43,91,150,47,101,43,176,178,79,60,200,47,161,73,40,66,29,31,42,16,138,207,165,82,69,32,177,20,113,6,9,30,0,74,199,74,197,191,61,61,0,36,71,78,93,157,40,62,176,187,61,221,211,51,179,183,146,189,125,203,29,126,198,255,207,223,96,98,55,233,177,104,238,110,11,233,251,195,220,227,122,152,10,111,184,8,134,95,191,126,189,8,2,57,164,80,2,161,4,215,74,72,33,52,231,90,122,194,4,60,48,190,240,185,242,180,52,30,55,131,67,90,165,187,187,219,212,87,195,243,216,5,74,58,230,76,9,37,184,112,165,198,41,174,184,212,66,26,225,251,90,120,198,87,129,235,14,214,233,161,201,203,253,221,237,138,112,68,166,0,227,158,239,106,1,144,54,82,121,70,3,172,181,16,248,45,140,231,122,222,160,201,155,194,2,36,92,111,152,106,57,28,19,82,59,238,25,228,73,15,80,45,181,171,149,47,149,240,165,116,3,165,3,13,221,66,14,242,198,66,229,10,24,194,17,204,128,80,27,45,20,12,209,158,81,56,
+230,225,91,243,64,72,176,250,220,24,16,218,255,62,187,68,6,17,206,5,157,244,12,157,246,181,47,148,231,75,45,93,9,1,220,67,150,196,110,6,153,173,215,192,41,41,134,13,36,13,199,63,155,161,0,216,115,188,51,201,3,46,93,47,0,33,196,34,97,21,4,66,249,32,212,194,112,161,6,235,50,163,36,165,225,170,101,244,81,7,23,145,91,79,140,43,32,88,42,31,148,158,80,10,159,70,251,222,160,182,84,137,166,172,238,110,207,127,126,199,47,248,133,52,230,61,193,3,192,125,165,149,210,110,160,5,87,160,65,12,77,126,185,28,181,20,70,250,131,85,90,131,179,209,228,108,235,170,160,70,130,241,202,55,10,212,46,62,80,84,36,168,224,141,12,180,175,148,207,7,235,34,173,235,191,24,116,78,73,10,225,8,113,230,145,175,70,73,29,144,57,74,194,96,233,154,64,192,97,227,106,46,7,149,253,207,49,175,236,206,238,97,113,142,222,24,62,151,167,239,67,136,233,250,80,58,66,162,19,141,235,114,242,203,160,27,164,50,48,156,11,95,67,17,94,40,
+113,211,183,226,234,91,14,202,17,234,44,144,90,65,73,160,53,28,64,0,17,8,33,184,143,23,50,131,47,109,111,8,72,104,147,232,232,59,184,118,132,62,243,208,195,168,84,160,137,62,80,228,159,132,253,210,229,6,117,144,29,92,146,235,242,45,124,23,210,167,119,235,188,48,142,192,48,64,162,48,6,121,43,88,45,125,228,110,224,189,106,251,91,120,254,96,110,159,234,73,218,216,190,97,206,199,111,187,78,19,174,35,220,51,78,120,227,7,40,160,208,228,159,210,58,144,129,82,70,6,70,185,28,62,214,221,44,19,152,230,169,157,197,151,32,158,35,60,76,22,114,53,6,217,183,48,100,238,9,146,34,253,192,37,23,250,32,247,31,138,124,79,58,208,25,195,174,25,206,199,63,10,225,81,32,31,3,227,251,46,87,1,204,128,7,220,160,211,113,27,248,40,52,234,44,49,6,116,29,172,191,164,15,246,254,67,63,170,191,255,246,199,63,194,249,135,155,37,187,173,249,240,39,54,46,15,167,42,127,216,54,236,221,248,61,67,5,13,155,161,9,190,176,203,60,43,
+108,229,176,164,220,165,53,139,79,5,214,210,125,198,30,211,42,47,143,53,91,151,251,166,202,87,71,116,120,205,222,213,214,178,209,77,114,181,136,151,239,127,184,163,208,172,255,186,182,213,46,175,107,92,46,44,175,217,214,86,118,117,98,15,85,186,111,108,230,176,77,5,96,185,97,235,109,90,61,88,135,53,37,72,78,236,96,171,26,128,114,213,164,249,62,223,63,176,20,124,135,19,157,108,182,8,83,151,155,230,41,173,108,171,8,29,95,174,115,212,43,99,89,185,62,82,255,166,116,153,177,77,94,88,104,107,182,150,221,191,89,246,144,251,55,239,91,154,204,166,5,203,247,140,118,159,247,216,83,222,108,203,99,195,224,62,146,91,83,20,7,135,214,197,49,35,21,207,219,69,190,203,123,14,130,183,254,213,20,244,88,35,7,82,234,176,93,153,229,27,250,182,109,98,135,227,170,200,235,173,195,178,188,238,124,195,98,77,139,107,187,39,20,50,249,169,172,88,109,139,130,34,228,80,222,102,251,77,93,123,134,88,14,100,105,211,155,212,242,62,109,203,221,235,76,96,
+210,230,88,237,65,105,91,76,86,194,180,150,241,223,118,221,208,10,29,223,148,69,81,62,81,106,40,103,150,83,70,245,224,117,253,18,28,75,87,229,163,109,243,234,90,101,95,54,144,221,201,161,114,28,190,213,184,223,170,183,41,242,88,217,222,60,104,128,213,233,255,76,173,13,149,195,195,241,119,28,245,5,139,0,204,58,109,157,139,235,226,244,82,104,4,70,131,239,203,167,194,102,15,180,192,118,199,186,33,226,135,252,209,82,121,210,230,187,150,217,162,157,87,22,123,40,22,72,55,96,194,230,177,90,83,134,153,253,123,143,225,247,46,197,70,250,152,230,69,186,42,236,139,140,11,184,131,221,62,199,250,59,41,180,193,44,90,198,86,127,207,203,97,179,116,127,76,11,252,184,110,163,229,205,169,117,97,150,86,95,108,67,37,121,206,17,110,85,237,84,188,238,238,67,85,62,230,228,44,117,101,55,53,85,153,29,81,92,26,205,126,110,94,101,210,203,157,118,45,135,112,144,12,57,44,61,28,96,105,63,122,47,105,183,214,225,250,249,82,63,119,75,145,175,42,76,
+63,80,47,220,152,229,215,102,189,171,73,222,26,165,62,145,236,236,180,79,119,221,35,198,14,93,207,202,125,199,69,1,95,80,207,241,46,94,245,222,57,75,174,66,182,92,92,38,159,70,113,200,162,37,187,142,23,191,70,147,112,130,121,30,45,177,112,255,198,97,159,34,92,59,55,9,195,153,120,52,79,62,179,197,37,27,205,63,179,127,70,243,137,195,194,127,93,199,225,114,201,22,49,139,102,215,211,40,196,90,52,31,79,111,38,209,252,23,246,17,184,249,34,97,211,104,22,37,8,155,44,90,202,62,84,20,46,41,216,44,140,199,87,120,28,125,140,166,81,242,217,97,151,81,50,167,152,151,8,58,98,215,163,56,137,198,55,211,81,204,174,111,226,235,197,50,4,253,4,97,231,209,252,50,6,75,56,11,231,9,250,120,142,53,22,254,138,7,182,188,26,77,167,45,85,127,105,178,143,33,68,140,62,78,195,46,42,244,143,167,163,104,230,176,201,104,54,250,37,108,19,88,0,16,183,199,122,33,159,174,194,118,9,161,71,248,31,39,209,98,78,138,199,139,121,18,
+227,17,183,247,34,78,94,160,159,162,101,232,176,81,28,45,41,247,203,120,129,240,228,28,16,139,54,8,112,243,176,139,66,174,190,182,31,71,232,249,102,25,126,211,50,9,71,83,196,90,18,248,175,135,95,215,145,221,253,9,32,153,58,213,
diff --git a/uppsrc/ide/app.tpp/Blitz$en-us.tpp b/uppsrc/ide/app.tpp/Blitz$en-us.tpp
new file mode 100644
index 000000000..8d0b8c436
--- /dev/null
+++ b/uppsrc/ide/app.tpp/Blitz$en-us.tpp
@@ -0,0 +1,12 @@
+TITLE("What is BLITZ")
+COMPRESSED
+120,156,149,87,105,115,219,200,17,253,43,83,75,39,37,217,16,141,185,112,144,95,214,150,157,90,85,214,71,173,229,84,18,21,87,24,2,67,114,34,16,160,113,72,214,186,236,223,158,215,3,80,7,85,149,67,42,73,4,136,238,126,253,222,235,30,234,66,176,103,207,194,32,156,132,255,229,107,246,198,174,76,95,118,139,139,82,36,201,220,113,46,194,185,225,241,252,67,58,255,241,227,199,148,171,48,153,83,50,142,100,60,84,146,11,142,123,161,18,49,215,105,152,234,132,39,161,140,149,208,113,168,103,59,211,152,237,226,194,36,114,254,252,183,8,81,34,208,19,201,37,15,121,36,20,158,10,101,40,20,23,154,39,137,226,177,78,100,26,69,179,220,236,58,87,87,139,139,37,197,41,132,73,132,133,113,18,41,142,32,165,133,140,181,66,176,82,128,39,81,56,142,226,120,214,185,174,180,139,11,71,184,129,246,148,80,170,32,154,0,157,136,17,169,132,138,148,76,132,228,137,16,81,42,85,170,0,155,139,153,235,44,64,46,149,152,27,252,80,152,70,61,165,21,151,96,
+68,197,90,226,177,24,127,85,152,114,129,162,73,168,53,234,217,175,123,154,150,32,136,72,162,216,8,37,69,172,41,34,81,9,151,113,34,148,136,4,64,132,49,26,37,4,122,86,216,54,71,172,20,124,222,1,214,252,244,103,61,231,8,142,131,120,34,194,52,20,81,156,162,40,0,163,103,153,166,92,38,40,170,184,14,185,156,229,117,129,62,151,66,135,210,87,76,32,69,132,204,158,22,29,113,128,22,50,65,201,152,75,137,223,90,37,241,172,181,36,70,87,55,139,139,231,63,31,133,211,112,42,180,62,166,240,20,225,137,84,82,170,40,85,60,148,40,131,28,138,56,139,66,200,201,181,72,102,75,211,162,102,135,91,241,192,44,39,55,129,123,153,104,137,210,17,126,65,87,52,40,193,143,72,85,34,101,18,206,242,210,180,237,72,18,17,244,156,154,228,60,224,124,18,19,183,90,10,149,18,57,82,128,100,17,233,148,131,101,29,169,80,204,26,251,165,119,141,221,218,10,52,59,216,99,190,151,104,244,34,192,12,86,20,1,23,48,163,142,162,144,248,210,48,132,144,
+26,132,135,60,81,64,132,111,200,220,141,110,92,222,247,32,3,46,39,169,80,18,72,82,165,192,0,18,240,148,115,30,38,248,70,103,224,197,251,131,143,198,26,203,15,225,42,224,106,18,195,198,80,42,85,84,62,149,196,159,0,253,34,10,53,116,16,67,184,32,214,197,51,240,206,69,66,63,158,121,174,3,142,121,0,68,174,53,250,150,160,90,36,232,93,131,123,233,45,206,227,100,246,222,222,180,111,76,103,71,195,60,63,125,54,56,141,71,1,143,38,33,197,235,36,133,128,92,17,127,82,169,84,164,82,106,145,106,25,133,224,177,29,6,154,130,105,164,252,56,222,37,137,3,30,99,184,208,171,214,232,222,135,161,243,152,19,20,145,164,17,177,48,38,201,78,74,87,17,14,56,99,62,152,225,249,233,11,206,99,74,148,96,104,146,36,10,101,10,50,192,65,168,225,116,44,132,4,66,67,103,129,49,160,141,144,95,153,181,205,78,198,105,245,16,200,129,90,234,132,124,139,72,64,7,8,228,73,195,48,194,157,36,193,52,205,214,102,247,200,128,34,12,68,8,23,
+97,255,104,12,37,106,193,126,97,74,187,4,155,1,10,96,21,165,122,112,96,118,82,217,182,179,5,196,215,161,111,91,240,64,112,112,7,255,105,157,40,21,1,47,106,199,180,154,72,66,12,176,142,229,236,163,193,188,124,187,252,254,167,183,239,79,62,127,98,23,173,152,179,87,203,186,239,216,235,95,207,206,255,249,231,197,69,27,206,217,235,210,117,127,48,215,50,83,92,155,42,183,5,203,235,237,206,149,134,214,24,235,108,190,169,220,151,222,50,26,162,130,225,214,197,239,155,174,219,101,179,236,101,246,210,86,217,244,198,93,185,157,45,156,201,166,117,179,206,94,210,117,246,242,147,171,214,165,205,46,79,239,147,101,151,159,43,215,253,206,62,157,126,94,48,179,219,53,181,201,55,1,115,85,103,171,2,185,187,154,181,59,107,139,126,199,10,187,236,215,108,139,93,193,26,188,116,101,209,178,122,197,74,211,172,45,133,150,46,247,41,219,41,59,171,216,202,228,93,48,52,69,141,220,108,76,199,76,89,214,55,45,251,156,189,200,94,80,230,43,107,119,172,116,203,198,
+52,206,182,40,202,218,186,111,114,188,92,213,205,118,202,254,81,247,44,55,21,154,175,90,87,216,102,76,103,192,75,223,213,91,56,184,240,79,18,250,233,72,221,35,6,209,14,178,181,72,56,218,164,101,71,85,221,177,110,99,129,168,46,45,61,177,198,16,31,179,236,132,89,180,190,127,208,215,221,152,107,116,198,90,79,27,187,120,201,150,148,53,59,89,150,117,126,181,96,71,254,146,249,43,70,77,2,198,241,1,142,15,85,121,203,166,249,110,135,238,242,178,47,144,138,173,92,9,32,55,174,219,12,55,91,18,117,221,155,6,132,30,77,220,170,176,43,246,254,213,187,183,217,229,47,108,130,11,76,200,221,245,20,95,108,2,109,220,234,216,99,252,210,155,210,173,110,137,206,37,218,49,77,71,162,28,98,157,178,199,176,94,149,157,109,42,200,117,109,203,219,128,221,142,68,131,204,220,62,0,181,188,125,16,22,207,217,100,215,152,245,214,12,58,100,151,175,62,126,252,237,195,223,222,62,78,125,100,202,182,102,55,117,115,229,101,100,27,107,32,221,49,195,75,251,245,
+127,203,139,172,191,156,189,62,59,63,224,18,174,50,69,225,252,12,212,196,235,64,100,93,146,53,186,141,161,187,150,109,96,161,59,86,8,192,83,46,206,55,16,171,117,219,29,84,221,216,190,113,109,231,242,22,240,72,33,114,31,242,82,66,56,182,193,144,89,18,141,26,26,102,13,78,169,97,160,230,198,181,176,9,202,174,137,178,33,232,166,238,203,2,62,191,49,183,45,27,207,155,253,180,80,22,72,243,192,123,131,213,2,92,58,56,111,136,37,17,107,12,95,231,48,45,183,172,197,196,216,230,128,136,115,164,24,122,71,221,189,97,61,222,162,102,228,239,255,208,62,91,248,158,8,144,135,210,216,117,143,17,102,64,124,72,119,231,55,16,169,185,171,219,214,45,137,148,154,21,174,53,244,114,48,63,85,112,112,227,181,43,80,243,110,204,2,102,29,113,68,124,97,196,254,101,243,142,150,21,242,29,1,242,199,17,50,86,147,169,220,31,163,59,240,198,135,190,219,97,21,250,29,131,229,85,214,107,118,180,197,84,210,4,96,13,229,110,229,114,214,218,174,3,151,135,
+147,246,151,61,33,79,230,148,26,110,97,239,106,88,23,204,84,183,251,185,10,136,3,200,72,143,244,213,112,15,250,173,58,239,168,129,229,233,211,140,206,23,162,21,135,245,224,133,95,219,202,54,126,33,97,117,214,172,30,26,41,32,127,142,143,72,183,131,58,195,10,176,180,7,71,250,252,198,189,38,92,30,189,169,10,100,234,218,113,221,251,108,56,102,76,49,26,103,11,250,188,42,149,217,226,205,236,153,207,66,235,229,126,134,243,141,133,202,4,254,9,8,106,190,176,157,113,101,123,200,222,184,89,73,236,17,101,235,167,9,193,29,208,55,142,114,214,94,195,220,27,211,239,242,49,236,225,225,4,160,119,187,118,176,228,176,192,218,14,239,231,236,26,171,158,236,51,180,208,222,159,96,4,152,62,11,176,170,223,46,193,62,233,222,212,44,187,204,46,127,61,123,255,150,254,30,79,217,167,195,44,36,28,57,254,218,13,6,69,207,116,84,248,116,15,97,245,56,229,88,79,155,220,191,85,225,212,128,93,135,49,24,79,137,0,151,29,102,209,86,227,131,190,185,0,110,
+108,236,176,94,198,131,192,175,243,81,176,198,62,212,138,78,203,225,25,95,143,228,4,161,52,8,150,84,163,202,195,40,57,232,54,154,162,187,65,80,143,249,191,111,106,216,4,254,244,161,144,22,76,121,186,158,174,129,198,174,8,221,168,94,129,3,100,92,161,103,239,223,188,253,59,145,198,60,143,251,29,131,147,20,242,87,0,78,8,233,35,196,158,110,12,177,253,74,234,81,99,199,222,42,254,60,164,102,105,99,2,41,86,196,189,203,26,11,183,179,236,167,65,215,236,39,6,214,177,180,86,206,54,216,164,211,245,20,106,94,17,126,154,121,34,194,123,107,107,112,15,204,140,156,249,67,240,238,195,207,241,236,190,63,246,237,27,253,219,17,254,124,132,255,42,232,63,139,41,79,197,49,27,78,139,209,82,239,254,74,13,182,244,235,232,235,49,27,190,252,101,59,153,124,221,31,45,135,15,223,63,122,144,96,12,216,199,13,231,240,19,62,15,210,126,58,127,117,126,118,138,247,223,176,7,95,247,197,78,63,188,123,13,251,30,29,166,9,30,59,123,95,124,98,203,214,
+254,159,37,30,37,186,203,67,159,16,22,223,191,63,118,204,226,223,107,2,201,152,
+
diff --git a/uppsrc/ide/app.tpp/ChangeLog$en-us.tpp b/uppsrc/ide/app.tpp/ChangeLog$en-us.tpp
new file mode 100644
index 000000000..df083a4dc
--- /dev/null
+++ b/uppsrc/ide/app.tpp/ChangeLog$en-us.tpp
@@ -0,0 +1,11 @@
+TITLE("ChangeLog")
+COMPRESSED
+120,156,157,87,107,115,211,72,22,253,43,93,132,221,10,65,49,234,151,30,246,151,1,135,97,169,34,36,139,9,179,85,169,212,184,45,181,237,222,200,146,167,91,202,131,169,225,183,239,105,73,118,18,39,212,176,36,5,200,150,238,189,231,158,115,238,85,115,78,158,63,15,131,112,47,252,155,159,225,145,158,171,166,168,47,206,11,150,36,35,19,135,98,164,104,60,58,73,71,223,190,125,27,164,41,27,33,19,69,38,26,10,78,25,165,34,12,5,139,169,76,195,84,38,52,9,121,44,152,140,67,57,92,43,171,86,23,231,42,225,163,131,79,17,162,24,162,56,229,52,164,17,19,120,42,228,33,19,148,73,154,36,130,198,50,225,105,20,13,51,181,174,77,85,94,156,207,124,28,162,120,32,247,194,56,137,4,69,140,144,140,199,82,32,86,8,74,113,77,101,28,197,241,176,54,117,161,17,67,163,120,164,4,27,141,17,40,130,104,15,224,88,140,72,193,68,36,120,194,56,77,24,139,82,46,82,1,212,148,13,77,173,129,113,134,16,31,134,40,137,114,66,10,202,65,134,
+136,37,199,83,49,254,21,97,74,25,106,38,161,148,40,167,111,54,12,121,114,16,22,161,24,139,165,127,56,17,9,229,113,194,4,139,24,202,135,49,58,244,181,229,48,215,46,67,24,103,116,84,3,208,104,252,139,28,81,4,199,32,134,133,105,200,162,56,69,61,64,69,183,60,77,41,79,80,79,80,25,82,62,204,170,220,119,200,100,200,125,193,4,49,17,18,183,124,200,136,2,46,227,9,42,198,148,115,252,45,69,18,15,157,246,34,212,149,189,56,63,248,101,63,28,132,3,38,229,11,68,167,1,13,247,18,46,56,23,81,42,104,200,81,5,57,132,39,43,10,33,35,149,44,25,206,148,67,201,90,120,86,199,47,41,141,189,244,161,15,5,241,60,145,28,229,35,252,5,77,209,35,7,59,44,21,9,231,73,56,204,10,229,220,61,138,14,124,159,148,6,148,238,197,158,89,201,153,72,61,63,156,129,98,22,201,148,130,99,25,137,144,13,173,254,163,49,86,175,116,9,146,13,170,143,54,250,244,46,244,95,249,116,44,160,12,62,148,81,20,122,198,36,204,192,184,
+4,229,33,77,4,0,225,23,18,215,189,17,91,115,120,99,80,30,80,190,151,50,193,129,35,21,2,28,32,158,166,148,210,48,193,47,250,2,51,173,53,40,252,219,219,137,138,128,138,189,24,190,133,66,169,240,69,83,238,137,99,224,157,69,161,132,0,172,139,98,158,110,246,28,132,83,150,248,63,158,114,42,3,42,247,56,112,81,41,209,43,7,197,44,65,191,18,156,243,214,211,52,78,134,31,245,181,59,82,181,238,125,114,48,126,222,178,30,5,52,218,11,125,180,76,82,200,70,133,103,140,11,145,178,148,115,201,82,201,163,16,204,185,110,118,125,168,31,160,118,248,250,20,113,64,99,76,18,186,147,18,253,182,65,232,53,166,30,6,75,210,200,247,221,167,152,30,22,166,244,24,224,134,81,103,128,131,173,3,146,64,236,37,73,20,242,20,60,160,253,80,194,220,24,254,4,194,66,87,6,231,251,233,207,46,213,66,79,15,251,209,252,243,247,191,254,241,246,227,225,217,132,156,187,112,132,125,240,69,91,135,65,39,225,32,77,6,252,159,23,254,235,131,79,130,220,
+93,157,21,181,89,129,138,233,203,233,75,210,231,115,221,109,131,153,24,157,96,96,63,153,108,249,25,211,248,202,95,188,205,77,77,202,234,154,184,102,189,174,108,77,106,53,43,180,27,236,196,124,81,214,84,141,35,179,102,49,55,55,218,17,85,230,196,172,214,182,186,106,77,183,9,0,200,237,197,3,180,244,103,209,254,104,229,109,192,164,90,105,82,234,107,82,87,107,147,57,159,251,239,192,133,79,129,251,188,212,239,143,222,238,36,31,99,163,144,153,173,174,157,182,187,133,63,251,122,109,43,211,195,22,64,94,101,141,135,168,252,118,38,238,214,193,231,187,65,167,71,111,200,254,23,227,26,85,144,177,15,126,65,114,141,94,23,143,243,191,110,234,10,108,153,175,58,39,78,215,205,154,204,43,75,238,199,2,66,85,92,66,80,207,209,177,41,223,253,214,231,248,63,57,63,85,166,172,223,125,216,220,38,158,108,131,77,188,53,73,53,39,39,107,93,226,17,15,225,65,202,113,109,139,159,182,15,121,240,207,3,153,232,32,249,97,149,166,207,38,75,101,65,211,166,191,
+233,51,178,130,114,1,193,136,94,154,114,177,189,65,148,35,121,1,192,198,145,185,41,85,81,220,122,92,69,139,74,231,3,242,190,38,215,149,189,116,68,95,233,146,92,155,122,73,142,39,227,152,182,151,85,83,163,22,226,17,2,90,166,207,94,181,159,244,77,247,137,172,84,182,196,78,176,183,129,175,211,65,37,168,228,71,12,246,4,157,217,37,65,77,178,110,102,133,201,96,145,213,172,42,128,196,86,43,50,168,102,255,5,166,162,103,43,179,26,20,147,65,174,231,155,111,123,63,100,30,245,46,227,80,127,1,7,26,87,91,51,107,90,3,250,41,207,48,28,174,107,195,59,180,200,95,41,75,172,94,23,42,235,132,8,72,189,84,48,144,213,100,213,100,75,50,87,112,173,109,17,108,196,207,181,2,28,63,8,26,141,131,180,54,251,126,227,60,177,211,195,249,188,41,51,255,213,244,208,233,246,2,13,21,106,241,98,23,226,25,102,8,121,202,185,89,52,182,75,2,95,45,171,250,82,223,58,79,83,95,16,50,124,103,18,178,150,137,82,97,224,51,188,119,241,233,
+198,99,80,89,86,217,220,95,129,227,1,146,244,132,153,146,252,102,74,206,124,238,123,34,251,167,122,47,146,211,147,201,251,255,120,150,214,72,63,51,133,169,31,49,251,81,121,10,129,20,234,175,97,128,28,239,221,12,231,5,227,37,1,109,217,82,149,139,62,107,105,106,28,206,208,73,119,168,192,183,179,91,172,133,218,145,253,194,92,106,152,167,53,211,224,13,10,125,29,188,107,204,224,216,101,248,252,73,23,26,13,13,58,27,15,38,213,96,82,15,90,236,211,103,143,120,124,211,152,34,39,43,13,63,230,142,188,218,224,242,134,39,213,186,19,224,90,3,153,213,149,93,168,178,93,32,247,6,48,15,218,199,86,230,107,39,2,216,241,86,81,197,181,130,14,185,134,254,80,185,195,158,45,171,202,97,16,102,247,106,238,226,57,177,57,132,5,65,219,33,3,241,155,85,82,192,145,155,10,171,10,160,138,106,225,29,252,147,139,42,159,31,89,117,189,205,190,85,213,145,246,123,191,157,78,143,126,237,41,121,100,163,153,171,138,6,67,213,82,213,14,197,36,179,85,81,
+188,193,80,120,128,247,77,226,83,253,11,206,215,214,111,184,71,166,192,48,125,182,90,251,123,200,148,47,244,227,106,214,170,219,246,254,189,215,173,195,148,161,79,7,189,179,78,178,221,176,172,154,111,153,244,211,82,99,55,187,239,12,239,99,18,223,222,40,223,3,198,218,234,57,60,80,102,250,9,228,219,123,68,247,207,15,239,152,8,200,100,13,123,194,5,193,182,197,39,114,220,69,190,169,86,51,20,52,171,133,179,87,143,16,141,213,21,22,217,174,144,71,77,187,16,251,1,62,123,160,121,75,253,0,123,181,115,29,82,31,131,131,253,23,173,135,95,175,215,253,167,205,218,193,180,97,49,195,157,51,221,50,141,133,217,186,23,27,120,124,242,113,114,242,225,237,244,247,215,167,167,211,223,143,95,191,255,72,166,127,146,1,126,200,244,175,54,221,187,179,247,143,239,250,155,251,245,82,99,195,180,123,81,129,154,110,41,151,21,80,90,237,239,153,110,250,27,167,243,23,63,242,54,139,251,135,24,121,244,242,237,180,198,97,1,202,214,253,86,185,255,82,250,81,5,181,
+53,170,192,180,7,228,180,246,50,254,251,195,244,240,248,118,242,71,209,95,159,88,149,21,184,251,217,111,241,69,64,198,167,202,58,47,243,184,42,175,180,173,17,87,185,73,123,108,9,238,252,240,84,249,92,175,64,124,221,111,241,59,8,227,162,202,46,183,249,180,221,13,197,241,200,246,231,2,210,30,12,96,155,50,43,154,118,121,119,39,5,236,142,15,166,108,110,200,85,71,222,110,121,156,84,34,209,138,209,116,151,253,114,217,190,60,124,134,179,39,150,200,134,120,246,180,62,209,119,228,121,135,3,155,255,79,94,78,174,186,147,215,230,184,70,218,35,196,205,206,110,221,137,254,160,224,210,165,239,14,251,17,211,140,5,4,83,173,49,96,153,234,95,149,254,221,127,119,84,120,152,103,227,168,139,255,1,191,156,20,3,
+
diff --git a/uppsrc/ide/app.tpp/ConfiguringPackagesAssemblies$en-us.tpp b/uppsrc/ide/app.tpp/ConfiguringPackagesAssemblies$en-us.tpp
new file mode 100644
index 000000000..c786311d2
--- /dev/null
+++ b/uppsrc/ide/app.tpp/ConfiguringPackagesAssemblies$en-us.tpp
@@ -0,0 +1,409 @@
+TITLE("Configuring Packages and Assemblies")
+COMPRESSED
+120,156,132,187,233,115,42,125,154,37,246,175,220,152,25,79,216,227,158,246,187,86,213,116,199,68,140,237,25,135,253,197,118,184,199,159,42,58,220,53,211,239,244,84,184,186,186,99,170,59,28,14,135,35,36,22,73,32,33,36,4,66,236,32,9,16,36,144,98,95,19,132,88,36,118,4,74,82,128,72,36,16,107,178,136,29,146,205,137,84,239,219,237,254,96,235,222,136,43,146,231,183,157,231,60,231,57,63,164,251,203,47,255,228,159,124,245,7,95,253,227,175,254,127,190,254,232,95,255,240,31,126,245,183,191,249,155,63,253,229,191,252,119,95,127,251,237,31,255,179,255,229,123,98,228,215,127,240,205,63,254,254,171,159,127,251,205,207,127,241,221,119,95,127,245,205,183,223,126,247,179,111,191,255,246,171,111,190,254,23,223,127,253,139,111,191,251,246,235,239,127,254,71,255,253,15,191,250,243,95,255,246,47,190,254,211,95,254,234,235,159,255,241,63,251,87,255,249,215,63,255,234,15,191,251,230,15,191,250,47,136,25,190,249,131,111,255,241,119,68,228,247,223,126,243,221,
+119,63,251,238,155,239,190,249,230,23,223,127,255,213,247,223,127,247,213,207,191,249,234,43,98,134,175,191,255,113,134,111,254,244,151,223,16,67,190,221,12,249,134,88,238,187,175,191,249,238,23,223,127,243,139,111,191,250,238,187,95,252,236,219,239,190,254,23,95,125,255,47,190,253,217,87,63,251,197,55,127,244,223,252,213,159,255,159,196,138,255,215,255,246,127,255,103,255,230,127,252,231,255,235,159,124,249,229,239,190,254,227,47,255,237,95,253,246,63,252,250,47,254,246,63,17,147,125,249,159,127,245,239,255,247,95,253,197,15,191,251,242,103,255,244,203,127,253,187,223,253,240,151,255,238,55,191,254,225,119,255,244,79,127,249,187,111,255,248,191,252,250,235,159,127,249,7,223,126,243,199,95,254,167,191,254,225,183,155,161,191,250,242,215,159,131,63,67,190,252,219,191,250,242,87,196,91,127,247,252,15,190,252,205,127,252,225,203,47,255,171,47,127,242,195,223,252,217,63,255,203,95,253,250,183,127,246,207,127,255,214,159,18,161,127,243,235,191,250,237,23,226,239,38,232,191,
+251,245,111,126,248,242,151,63,252,246,111,191,252,250,183,95,254,237,127,252,225,127,248,215,255,230,203,175,127,247,229,111,127,247,195,159,255,225,151,205,131,47,127,246,143,254,228,135,223,252,240,239,255,230,203,102,158,31,87,248,179,127,244,229,207,127,253,171,223,252,213,95,124,249,63,126,253,155,223,124,249,213,95,255,245,15,191,250,79,127,184,217,207,87,127,252,229,243,159,127,249,229,95,253,171,95,255,37,17,251,71,223,124,243,243,111,254,233,215,223,126,243,179,45,242,136,212,221,222,218,34,31,175,182,136,175,41,34,108,139,104,103,108,56,13,89,5,12,193,44,42,226,222,151,118,17,173,110,121,213,219,39,219,182,47,212,231,64,203,160,190,63,63,150,74,165,183,254,194,67,245,1,68,176,131,137,99,224,63,171,151,134,120,160,197,49,211,104,17,118,64,120,68,5,175,246,4,231,90,236,122,126,125,152,134,86,228,189,209,18,0,148,93,133,162,41,76,43,129,57,224,72,72,112,40,193,233,242,136,111,28,5,29,172,196,93,5,56,118,46,241,213,3,165,151,59,
+77,123,71,123,121,137,47,53,149,234,77,51,186,211,113,71,15,158,216,54,141,75,172,151,133,241,124,53,245,222,46,221,198,74,6,245,220,111,227,15,130,182,42,118,160,243,29,221,100,119,206,165,217,74,212,76,122,59,20,77,174,211,184,148,175,171,202,111,23,206,107,117,127,121,113,190,36,119,20,71,145,157,78,124,168,181,30,248,172,81,39,92,157,73,138,57,255,12,56,56,52,159,194,249,2,156,92,1,113,119,220,202,95,143,49,43,175,220,49,31,74,58,93,246,34,124,53,51,15,30,150,50,163,156,201,103,217,215,250,142,134,190,39,99,181,41,187,28,210,181,34,253,78,62,85,165,166,108,230,101,164,51,46,162,151,81,129,229,48,203,186,165,165,90,214,65,222,208,2,206,223,150,96,126,34,168,23,125,157,66,183,26,247,141,145,245,157,185,237,51,137,71,30,30,171,21,82,48,45,148,22,22,200,54,246,164,123,36,41,125,119,56,172,6,102,136,225,242,104,20,108,100,19,135,156,148,163,155,171,154,202,141,125,86,106,53,118,135,75,243,161,206,207,60,77,63,
+237,248,19,235,216,129,54,66,61,120,74,87,195,34,121,191,7,103,128,203,220,114,81,147,79,36,208,46,69,32,176,117,138,171,193,193,146,62,18,172,114,212,204,138,1,92,23,204,197,7,114,8,132,79,188,71,151,96,202,196,155,137,72,111,168,0,187,215,47,42,161,74,36,44,224,205,199,2,185,97,190,110,48,230,9,114,54,91,45,25,122,179,213,178,100,24,22,245,163,173,161,53,109,232,229,21,220,178,229,108,173,122,123,60,109,87,213,6,78,50,24,37,208,196,53,15,14,170,37,0,146,61,225,231,180,69,38,63,81,179,78,90,152,6,102,189,105,207,16,117,197,191,96,103,66,220,56,91,68,28,112,207,148,18,218,75,251,188,208,211,168,173,128,59,86,119,104,167,180,210,214,135,242,44,239,129,195,59,178,106,79,14,158,222,170,245,96,184,44,240,98,39,228,12,95,88,76,24,60,90,127,199,2,97,62,127,141,27,109,88,199,75,100,193,30,190,56,74,49,197,161,47,231,99,197,222,240,101,164,5,222,2,22,254,72,24,167,223,29,73,85,222,35,138,40,116,
+119,47,214,61,41,172,163,39,99,86,26,227,51,204,229,25,251,45,108,247,175,225,243,97,64,241,70,207,24,212,21,101,162,50,238,12,23,197,65,254,86,33,132,114,61,21,172,225,200,232,25,100,79,105,227,102,178,44,55,177,223,32,171,108,18,165,245,163,221,135,28,93,59,159,21,17,21,103,59,39,29,223,174,90,239,199,124,11,151,221,227,41,68,240,195,56,53,238,59,4,24,121,162,237,119,243,144,54,195,154,116,98,18,241,52,88,178,53,169,10,148,185,60,149,203,145,190,2,109,203,29,34,77,142,179,2,29,112,68,235,111,74,98,23,123,164,69,11,3,247,206,121,219,152,159,252,96,78,75,102,42,52,175,239,58,238,218,2,197,74,221,123,244,136,148,59,197,227,230,26,131,88,253,87,70,8,181,102,148,9,167,238,68,140,68,171,125,60,186,3,40,237,177,186,237,53,188,115,97,190,235,118,199,112,16,62,41,62,166,157,199,38,219,176,111,180,143,18,10,243,203,136,249,140,12,242,254,99,53,118,7,199,207,158,155,122,179,71,190,72,81,205,21,100,168,243,
+44,92,98,64,112,55,186,78,141,19,161,6,239,192,214,46,199,94,78,50,99,123,191,2,239,117,242,8,120,238,211,242,59,230,33,62,204,191,42,158,214,239,243,243,65,39,82,45,164,56,243,145,165,135,193,236,43,249,195,78,222,112,210,204,211,149,144,201,29,176,20,245,108,234,130,179,43,189,143,166,166,245,165,180,148,228,21,6,12,79,23,127,135,11,160,103,133,117,230,18,140,235,120,157,196,140,98,226,79,251,53,168,98,90,250,241,21,104,228,174,213,134,222,45,185,26,92,212,46,154,172,121,218,215,181,136,7,15,207,111,51,235,101,207,137,22,214,81,91,44,175,100,204,153,113,157,111,220,77,46,110,193,236,75,249,116,102,237,172,171,222,177,40,177,194,243,229,137,39,19,243,200,198,238,108,181,218,225,103,6,181,71,43,223,126,162,130,173,207,126,116,25,161,24,173,7,3,21,127,16,170,104,100,39,108,122,131,203,73,184,116,235,242,149,14,152,139,153,3,252,38,173,110,78,74,181,56,154,64,59,176,10,152,241,178,179,166,3,148,5,89,42,14,102,196,139,
+88,185,120,10,120,169,209,253,91,170,135,118,219,163,155,168,18,224,248,28,141,200,70,219,123,190,126,132,223,127,41,151,215,249,147,229,84,48,239,172,123,233,137,54,97,142,205,158,219,81,51,147,117,36,80,240,22,147,11,42,197,214,96,186,121,61,79,75,56,240,23,155,83,168,186,83,48,30,55,71,233,190,38,203,27,41,159,221,51,229,18,43,158,143,111,187,71,67,139,195,116,208,121,124,182,231,42,119,251,204,246,243,251,124,106,241,60,123,42,178,102,30,19,159,249,84,80,113,194,231,59,21,112,209,160,167,150,194,99,75,136,201,110,10,130,72,209,83,81,244,199,239,225,192,65,206,75,36,54,103,170,190,106,96,114,124,218,27,70,36,103,12,22,170,186,140,32,18,221,46,122,108,86,164,222,245,124,149,131,253,150,147,236,217,46,69,15,39,235,227,115,102,124,61,171,77,68,9,83,97,238,92,42,120,204,51,123,223,179,224,43,143,230,43,95,212,121,239,76,251,170,60,94,210,102,181,191,232,102,12,59,247,182,198,47,212,76,253,161,32,187,46,93,198,36,162,
+185,167,253,136,213,23,12,11,102,198,241,135,241,101,166,157,72,20,241,121,93,52,242,184,44,227,165,152,199,230,231,65,77,200,61,187,133,71,229,232,113,84,156,157,197,174,195,72,192,180,205,73,239,156,25,184,12,213,73,162,232,178,234,230,193,136,67,203,15,14,75,36,163,115,55,67,199,206,205,73,128,21,146,210,221,153,139,0,247,54,139,145,143,119,47,141,139,114,231,81,187,110,241,231,9,147,234,22,16,55,249,189,233,205,69,37,10,49,12,23,157,48,195,29,139,34,69,1,11,2,141,233,197,114,236,203,26,239,183,170,85,71,188,117,101,119,40,95,77,13,103,66,252,124,186,154,74,39,66,156,1,104,189,85,40,19,19,115,221,21,89,222,226,50,136,144,33,230,2,248,158,202,250,202,92,106,192,66,151,30,70,14,174,206,44,189,179,212,170,82,236,71,108,243,148,133,217,118,207,172,209,172,243,116,77,200,178,69,141,101,175,88,12,211,69,124,222,186,15,129,139,137,71,8,32,172,9,57,214,229,228,61,154,168,229,78,51,50,222,106,179,251,172,224,59,7,
+247,204,167,34,88,63,153,225,224,2,200,187,169,102,85,71,146,175,173,56,44,73,249,145,187,202,248,247,77,237,238,76,247,126,177,140,203,110,219,50,232,102,189,239,126,86,4,76,128,18,114,115,201,25,122,103,186,202,43,64,141,246,221,82,199,139,116,145,170,91,127,17,99,235,156,14,61,119,153,31,89,158,227,238,82,137,226,33,122,126,160,125,209,52,179,198,178,4,230,217,175,180,143,37,207,11,25,238,221,143,61,126,171,62,139,235,56,237,136,55,227,143,78,188,213,139,225,99,218,143,201,242,202,148,214,148,121,32,119,239,99,184,102,217,224,54,210,209,144,103,216,228,207,37,12,246,177,104,192,15,145,151,29,131,99,224,21,246,165,188,142,28,49,9,199,35,159,234,46,29,19,186,160,89,184,56,124,83,165,177,132,251,245,252,188,236,139,147,73,6,238,197,73,144,28,195,157,90,161,222,214,113,103,199,35,207,130,42,50,41,246,220,185,38,156,208,229,101,236,83,204,99,228,22,13,47,244,81,107,98,136,96,142,118,110,200,5,110,153,58,42,120,202,240,84,202,
+190,247,180,71,240,172,177,35,70,132,167,31,226,212,103,146,30,205,163,170,76,3,74,121,78,81,213,62,165,99,24,133,65,104,214,29,47,223,103,135,99,13,217,125,210,61,220,39,215,227,184,67,163,83,152,75,57,75,213,202,224,204,88,30,147,198,49,204,62,164,223,203,46,143,211,113,39,75,206,141,44,185,54,37,184,235,116,103,110,244,80,86,95,36,174,242,175,173,139,163,201,51,166,30,95,175,184,175,90,206,148,230,239,142,218,162,27,44,102,125,32,137,240,26,182,12,58,60,139,178,210,118,187,15,174,53,92,80,234,41,200,75,226,196,178,108,44,76,232,111,28,152,0,114,226,159,208,166,177,84,129,161,128,230,157,233,120,126,153,217,53,54,245,244,76,27,244,251,230,93,231,80,24,86,106,199,23,41,220,185,180,78,162,131,172,248,14,136,174,141,145,90,177,96,162,105,135,252,251,252,165,249,213,110,30,228,239,247,163,2,43,179,243,182,66,114,183,50,100,190,236,247,35,224,42,190,27,246,65,158,194,42,230,208,14,161,11,31,88,233,23,142,71,47,91,167,
+109,227,155,124,186,16,231,50,89,140,149,149,11,110,159,79,223,153,131,69,114,50,58,148,89,195,55,38,55,144,233,26,171,25,218,42,215,211,169,115,70,89,139,106,164,34,238,147,194,72,178,223,216,90,90,194,97,181,224,108,127,56,189,24,248,93,120,28,241,158,218,31,220,28,33,172,71,153,149,138,83,5,229,36,235,161,222,124,191,183,92,166,157,222,162,188,150,242,185,11,6,44,120,129,168,226,237,2,25,14,26,6,8,199,192,121,219,181,238,243,142,44,227,179,214,197,64,50,210,4,212,186,160,114,215,61,50,180,207,141,121,37,203,228,236,207,124,226,65,162,155,75,243,199,73,199,172,150,210,110,155,104,203,110,40,62,47,60,61,190,178,215,29,190,235,125,93,150,79,206,120,87,248,93,243,70,171,66,159,172,151,42,57,162,72,204,133,240,205,108,6,135,6,39,10,101,194,22,142,6,122,233,19,101,60,34,94,185,160,149,63,84,217,61,99,228,238,219,239,124,147,247,237,197,106,155,26,11,158,171,179,148,181,170,107,212,170,53,237,36,170,114,187,26,183,125,
+114,96,156,26,50,34,69,141,228,17,16,46,22,141,234,67,205,50,212,204,98,186,226,40,190,7,84,124,135,160,0,247,149,130,175,202,181,101,138,248,185,9,123,244,189,145,134,29,54,13,136,248,196,69,48,94,246,59,202,239,109,235,91,236,46,21,0,189,65,199,245,78,251,106,158,99,31,136,172,252,238,141,142,237,153,51,202,86,115,242,222,214,47,139,159,59,185,107,148,97,106,163,153,90,71,191,127,26,214,53,155,29,130,85,222,188,46,151,151,97,247,154,204,224,117,191,139,84,250,151,42,119,4,234,197,83,118,213,19,142,225,153,247,42,8,243,69,67,133,172,60,159,88,89,226,9,47,82,204,180,44,29,126,119,103,17,65,113,244,157,49,54,192,97,102,134,157,46,136,138,116,123,139,241,110,225,100,140,98,79,207,130,69,85,9,51,226,110,13,243,218,147,182,32,186,39,46,223,91,179,142,185,252,214,36,151,60,178,159,89,246,88,115,84,2,249,202,196,141,213,115,41,154,23,203,147,123,103,236,128,39,104,10,39,3,117,109,20,10,51,38,216,73,161,106,78,
+246,227,118,199,236,118,248,22,208,35,60,59,222,52,180,35,112,72,18,3,214,177,44,167,178,123,56,196,4,112,86,202,153,90,238,251,163,167,15,69,87,102,104,240,64,41,88,111,131,146,188,25,123,235,87,102,231,206,52,255,212,173,210,207,158,39,59,181,217,62,150,223,15,239,72,242,98,203,123,221,224,45,88,208,195,101,182,70,94,141,225,176,125,151,223,199,71,203,163,30,48,247,33,20,93,4,28,63,220,130,119,119,222,72,120,229,188,235,110,235,10,146,152,161,24,14,149,2,172,152,132,153,13,36,226,214,198,49,66,118,91,72,15,76,49,149,175,180,230,100,70,149,163,93,95,15,3,84,83,206,134,158,234,227,150,22,199,200,148,60,142,92,99,154,25,233,63,123,82,99,187,187,133,29,123,183,162,85,67,202,202,240,43,236,135,44,241,60,152,131,199,149,155,117,158,69,58,109,184,118,186,234,108,44,181,138,8,73,87,176,41,52,230,117,223,203,200,242,161,13,69,95,35,46,245,51,243,97,203,223,37,116,0,224,147,77,162,126,84,105,16,221,118,149,219,25,
+65,208,139,231,239,135,213,116,167,203,155,136,56,89,50,96,237,129,185,137,246,230,0,66,120,50,43,109,172,186,130,148,78,51,123,41,100,173,61,218,182,1,75,158,142,61,117,243,179,149,244,54,206,211,28,206,59,70,133,49,169,29,200,115,136,62,174,230,69,154,227,189,230,27,23,174,222,194,141,110,182,160,105,134,155,180,133,32,100,142,191,208,14,185,186,254,149,237,138,140,141,158,235,118,70,185,19,97,172,87,149,242,116,30,3,71,228,67,27,16,224,245,239,138,234,162,54,36,182,10,120,141,213,210,144,23,26,73,202,68,92,236,49,206,156,209,3,118,69,153,78,39,239,18,145,49,15,45,250,43,253,138,140,28,203,194,61,254,37,171,184,163,138,31,58,189,38,212,202,212,121,172,56,174,175,174,141,14,123,111,1,11,245,101,142,241,46,201,63,133,220,229,73,4,205,157,26,185,119,59,84,144,91,92,8,15,42,3,169,164,35,22,47,134,138,125,231,66,127,39,141,0,53,81,233,253,120,24,150,115,47,215,73,69,239,114,118,241,80,109,77,140,177,98,197,112,
+61,132,248,245,12,96,124,118,21,182,219,188,11,75,255,213,83,115,182,225,233,11,176,12,70,162,25,202,73,78,223,158,83,201,170,238,185,108,60,111,41,135,193,215,199,194,246,192,237,23,28,195,46,51,164,89,77,149,194,193,113,141,107,211,160,154,233,68,105,53,35,149,247,40,119,61,221,159,247,112,186,209,13,41,33,220,172,119,240,70,71,207,198,165,9,31,239,86,21,133,109,126,66,60,211,166,43,0,226,236,236,155,5,252,235,122,214,241,208,111,27,30,187,247,123,25,179,103,37,106,148,17,21,240,84,235,69,11,126,215,44,152,113,108,237,10,187,180,86,255,120,210,120,145,66,142,217,238,59,172,29,83,113,230,217,205,249,137,102,167,75,181,120,53,251,228,157,50,67,112,96,60,238,131,147,200,214,18,184,239,112,141,199,227,182,38,154,202,228,119,144,93,9,126,107,168,20,195,150,118,31,25,169,123,134,147,153,5,243,128,243,208,82,130,189,49,141,114,69,137,114,133,196,201,193,168,9,215,218,240,123,31,125,222,233,110,153,52,120,219,188,120,234,61,67,226,
+34,148,99,55,18,25,203,26,111,193,25,236,122,184,112,191,54,224,217,43,16,51,46,214,189,252,85,53,31,120,171,250,116,4,67,250,133,61,62,69,84,115,211,199,179,227,209,182,198,76,69,27,153,80,137,57,195,158,119,213,24,155,126,98,221,91,82,82,206,154,130,207,211,58,34,167,29,241,116,106,141,64,224,218,215,83,222,142,205,142,81,87,17,104,59,135,121,247,78,36,81,194,169,35,205,125,161,181,12,183,224,235,86,226,221,149,47,21,229,26,238,62,39,89,196,58,26,66,196,43,78,175,250,58,11,250,230,249,134,40,11,46,27,135,214,67,119,127,30,236,44,50,12,48,152,119,92,154,123,133,179,92,197,210,146,192,57,201,254,117,154,24,181,92,234,78,96,110,163,82,221,123,171,118,85,147,174,109,108,184,28,200,48,48,181,147,115,76,154,22,2,226,44,109,90,104,248,39,87,176,172,109,114,239,77,116,225,29,237,147,83,166,37,215,149,35,6,45,122,13,241,220,156,169,190,120,252,112,213,205,21,162,45,255,228,189,59,221,175,88,246,121,246,61,75,198,
+197,30,89,156,23,26,53,135,99,171,52,114,195,101,228,182,74,179,250,99,241,165,27,85,239,89,139,147,37,18,30,51,76,41,25,199,131,101,172,190,107,103,138,139,98,92,245,209,234,208,3,4,234,188,168,197,165,133,7,55,167,70,168,19,30,59,107,104,52,52,72,221,197,158,226,162,37,131,119,161,123,137,139,236,23,163,199,131,122,225,46,166,115,77,207,111,50,248,200,124,47,119,95,51,82,162,32,217,130,14,238,132,240,40,118,221,44,217,185,153,162,85,209,220,206,17,124,103,88,141,195,242,123,0,94,142,51,43,56,11,25,173,150,243,221,82,234,4,8,10,145,190,126,88,55,146,153,87,211,179,197,91,246,232,194,141,184,234,87,72,194,246,4,92,15,241,96,211,130,222,237,158,242,184,211,208,177,183,193,68,179,184,121,170,198,11,165,248,24,89,136,249,243,228,62,103,232,170,60,97,28,119,250,74,174,124,66,248,117,87,247,169,141,39,128,164,90,118,60,178,251,36,137,150,51,22,188,227,175,207,199,212,244,149,84,9,165,59,73,235,52,35,194,175,10,71,
+163,124,28,31,11,92,54,64,100,150,188,115,6,58,179,22,238,79,46,107,173,128,92,60,85,246,210,5,183,253,194,44,114,122,124,11,8,205,180,39,235,104,214,147,234,69,61,115,93,170,155,151,9,20,144,27,32,85,242,224,147,2,221,109,23,161,116,202,219,232,130,192,99,55,87,22,207,197,142,12,5,49,96,119,34,115,46,193,226,86,240,187,44,17,174,109,167,160,83,250,152,124,133,184,76,115,115,222,119,56,241,47,117,125,50,117,90,55,92,222,206,19,120,202,9,36,26,49,38,84,50,228,203,2,34,227,181,44,31,140,174,204,104,213,118,120,181,85,187,112,207,201,217,220,149,189,224,181,200,243,61,6,71,99,94,155,163,197,188,118,40,136,78,12,87,237,108,82,98,41,46,206,177,220,98,90,27,249,95,73,119,249,113,117,112,37,76,61,203,56,93,124,4,250,110,242,39,23,221,144,187,208,239,50,46,58,141,61,225,106,66,55,76,209,174,122,221,86,237,215,248,99,251,36,243,104,21,196,236,194,126,185,105,195,248,32,211,145,137,190,26,211,129,221,194,137,
+163,21,244,245,95,79,212,204,166,231,41,115,61,10,119,146,247,235,122,226,169,71,126,220,125,112,191,12,224,170,225,184,128,3,10,166,6,15,220,207,212,24,168,90,5,174,184,234,172,79,197,49,238,174,148,197,245,238,3,255,141,202,66,128,160,8,49,219,23,87,225,202,145,79,205,222,149,88,102,201,215,162,104,12,181,18,74,201,27,245,9,39,20,59,177,72,251,30,129,217,41,125,78,62,85,38,10,152,113,208,184,13,175,167,205,134,249,46,112,29,107,88,91,62,61,209,246,243,146,192,17,2,100,30,211,50,217,155,117,75,7,218,176,179,59,39,223,127,30,199,219,186,115,148,40,108,167,206,146,154,189,66,230,129,174,98,166,5,90,160,54,203,185,92,228,223,11,250,135,243,139,70,65,254,180,91,132,68,229,66,83,87,92,188,94,121,212,245,236,108,28,46,153,37,115,112,0,31,219,41,163,173,245,218,98,99,33,249,90,196,40,89,111,11,153,250,9,105,94,137,134,209,42,60,113,63,12,158,107,198,34,215,28,31,117,10,251,194,100,211,201,53,100,25,46,94,
+80,216,236,62,45,172,136,129,196,54,198,43,246,98,213,102,44,166,174,243,99,173,148,106,44,232,150,226,151,188,249,140,67,50,99,11,199,108,187,187,111,111,141,53,12,241,125,82,131,213,78,15,10,7,242,81,238,78,255,98,195,99,186,121,30,165,206,230,88,206,61,143,45,116,56,15,64,82,102,31,173,83,172,197,95,136,163,155,211,100,237,176,233,177,195,252,109,104,100,117,238,138,36,238,92,81,88,65,215,165,56,64,211,67,213,69,135,246,144,127,70,103,239,112,59,163,230,101,145,71,112,177,53,113,85,121,99,68,27,180,174,230,236,98,143,107,221,3,110,220,70,195,136,146,136,65,174,136,42,155,109,242,149,42,43,169,187,239,6,148,85,231,222,139,232,77,240,170,132,66,85,83,10,111,213,157,231,183,19,172,58,89,51,150,235,88,148,127,83,40,86,220,111,158,227,139,197,105,216,173,70,3,207,6,192,167,233,46,206,229,136,59,92,175,194,220,10,44,74,224,190,213,222,1,75,9,48,232,227,123,86,94,15,122,207,16,48,156,88,173,139,2,184,189,163,246,
+96,30,110,94,30,29,20,239,133,131,236,186,198,189,179,222,102,192,139,163,119,171,229,201,184,35,145,241,32,85,209,14,40,3,225,74,237,74,156,27,8,78,20,150,161,219,110,215,190,197,211,234,139,78,200,205,112,230,163,47,78,126,113,94,228,53,57,241,70,78,164,50,86,249,246,202,93,38,88,238,52,93,77,19,110,220,69,243,79,51,74,166,92,227,49,118,139,106,116,180,198,181,178,241,213,148,145,162,117,201,143,197,221,135,151,43,17,219,177,214,55,74,39,97,176,46,44,204,70,71,166,167,187,230,99,156,127,250,236,78,174,209,65,104,130,106,248,120,138,255,156,235,199,94,153,143,231,92,245,157,24,94,65,195,164,218,43,138,44,118,135,171,230,45,121,29,206,245,215,209,157,57,59,41,199,91,166,17,30,157,112,171,89,160,49,186,239,195,138,65,8,188,224,235,71,248,108,41,160,133,218,216,249,187,203,68,171,42,1,95,134,250,234,124,127,93,135,84,64,117,25,193,82,122,23,118,31,121,141,247,194,146,214,100,152,201,175,101,131,26,219,99,46,168,19,187,
+233,39,188,248,30,104,237,187,22,249,138,10,173,77,64,159,35,182,12,53,75,78,29,107,204,226,130,92,228,189,237,205,84,57,10,136,103,191,152,155,226,39,1,236,197,25,172,181,194,166,169,123,209,28,86,75,211,93,73,183,118,148,117,36,172,38,60,235,62,154,101,241,41,87,215,12,15,13,214,113,170,17,45,200,158,30,74,80,132,223,150,221,45,206,157,185,227,65,58,130,2,111,118,230,149,183,234,126,124,99,116,29,188,77,222,114,105,241,147,176,161,194,176,179,198,245,203,254,92,246,74,45,190,233,116,15,243,201,185,229,162,121,245,102,111,86,120,160,113,121,125,14,187,202,13,86,145,206,218,207,87,220,119,204,70,185,88,136,29,162,149,40,160,149,11,43,241,128,112,164,114,105,167,62,236,132,167,159,17,215,22,172,229,212,23,107,143,215,166,126,1,87,116,213,144,78,182,14,183,67,178,65,202,215,189,14,51,66,181,23,215,227,131,199,153,230,42,6,29,140,200,107,183,117,41,212,25,172,61,91,158,191,178,225,233,139,202,17,198,143,51,197,133,167,6,238,
+75,49,239,16,73,114,174,239,188,54,57,5,194,73,111,89,238,71,20,70,71,184,124,170,12,40,41,58,16,192,145,184,48,53,139,77,146,151,101,167,47,52,169,21,175,248,227,87,152,157,27,0,74,9,47,151,19,244,215,104,232,218,236,187,101,170,196,195,247,153,71,28,7,18,235,215,98,60,108,191,105,93,215,70,37,42,41,166,120,37,148,39,221,28,41,153,2,92,94,118,42,80,76,107,229,59,112,168,111,157,52,223,37,145,218,117,172,101,173,224,214,128,42,91,244,56,159,39,149,172,59,95,68,113,159,85,5,106,163,174,142,75,59,113,236,123,158,59,53,207,176,179,80,61,96,106,99,171,237,198,118,118,56,181,227,224,100,201,221,235,101,166,239,221,80,239,88,96,114,57,34,133,222,10,50,79,117,70,202,240,236,173,171,50,18,149,120,54,166,117,57,247,135,67,230,4,83,71,109,221,213,122,54,56,240,208,17,111,127,146,176,1,86,72,19,237,204,6,119,3,38,116,157,83,118,102,233,211,211,147,194,19,249,254,78,220,125,176,74,96,93,186,18,141,60,9,
+170,226,171,194,41,58,12,204,90,110,166,25,202,209,36,86,77,84,244,144,176,230,56,167,75,163,135,137,144,0,243,108,109,46,98,158,136,222,157,166,21,58,83,243,116,73,49,202,50,117,163,114,249,234,182,22,44,86,110,252,202,237,20,47,45,139,113,120,149,185,54,26,103,130,29,77,181,38,90,33,53,31,195,164,24,199,27,158,183,241,69,193,108,61,61,180,78,15,151,158,129,246,168,125,48,166,230,79,95,230,249,126,85,213,202,87,97,171,233,208,136,11,90,180,169,147,25,95,62,244,104,51,39,230,6,78,147,97,137,80,191,66,120,70,190,142,230,210,207,30,218,218,252,188,89,57,48,188,182,25,71,133,78,219,81,82,24,19,235,137,67,33,41,164,87,211,151,199,157,46,83,101,104,34,198,165,33,212,204,189,39,69,213,30,244,50,57,12,174,38,151,248,51,192,107,218,19,81,166,83,151,126,228,27,189,234,139,171,250,187,79,114,17,14,206,36,89,247,236,150,14,216,116,205,169,167,194,127,119,246,151,86,64,215,108,204,171,97,49,124,146,144,222,93,174,178,
+253,145,110,228,141,15,204,228,213,99,86,57,191,1,241,197,26,76,41,205,70,13,148,170,143,133,153,12,32,10,242,73,184,214,12,250,243,157,162,252,181,19,54,89,149,235,118,118,221,132,230,177,200,52,46,207,141,141,158,153,185,148,57,179,220,177,246,52,218,91,253,46,170,68,99,206,88,87,50,113,137,94,138,52,154,19,155,28,46,48,237,117,115,121,34,132,222,228,138,25,240,192,171,218,17,135,127,114,108,46,210,199,17,244,86,167,152,4,116,47,226,183,213,106,2,197,114,103,197,115,14,183,126,148,189,205,203,75,202,140,178,46,194,181,246,97,97,183,39,238,185,185,206,81,37,53,64,150,183,65,132,150,235,244,215,201,181,232,132,31,68,78,31,151,202,236,5,234,178,222,185,42,251,79,109,48,175,214,117,248,61,159,142,21,41,114,122,196,157,217,240,122,236,206,26,19,203,148,114,46,68,192,83,82,187,60,116,59,12,53,54,153,235,57,46,162,33,122,230,224,116,21,90,83,174,11,252,215,7,238,129,168,188,84,147,199,243,242,56,244,216,190,111,58,73,237,
+253,55,125,112,231,73,157,63,157,97,163,118,31,85,236,75,38,123,147,250,73,215,178,208,236,161,119,168,36,220,125,112,58,244,183,143,0,64,241,70,64,195,53,95,152,183,10,74,166,12,150,94,35,128,6,15,77,214,173,7,187,150,25,1,205,91,39,241,144,54,251,2,183,234,185,177,35,15,46,49,139,64,97,62,200,143,224,194,41,116,168,49,128,227,3,101,33,92,147,89,134,121,149,37,154,79,160,96,45,188,50,30,176,192,137,60,118,0,177,253,236,250,50,161,89,118,98,213,26,123,201,80,224,105,129,100,22,92,37,36,152,115,245,234,148,191,32,69,64,101,92,231,24,205,148,96,199,56,240,56,14,159,26,81,200,177,228,117,49,235,9,79,16,221,183,8,242,110,165,113,15,32,29,175,104,198,26,122,55,120,124,66,211,104,211,160,46,116,242,7,3,233,4,194,228,49,77,213,106,14,155,22,60,190,7,59,66,223,89,164,228,252,88,240,150,123,185,176,132,158,229,115,172,46,73,71,49,161,201,163,28,116,88,217,93,175,184,39,118,207,187,107,222,204,62,94,
+27,85,222,100,127,95,190,110,94,117,95,22,181,76,234,92,51,102,190,113,23,179,114,72,36,190,90,102,207,154,61,100,79,210,199,78,247,144,96,182,104,198,237,38,182,150,57,242,204,206,29,7,171,212,252,242,8,37,124,125,27,197,79,71,79,192,171,232,80,146,123,207,96,238,221,210,150,152,222,199,102,111,158,49,148,115,222,185,239,139,175,15,117,235,248,194,205,121,99,88,129,39,203,158,250,82,163,88,69,246,7,170,103,79,243,254,209,138,6,223,84,171,114,124,156,240,207,221,195,108,174,123,80,5,75,52,147,228,65,101,220,241,168,169,25,207,224,172,16,82,198,177,250,170,237,91,82,173,180,97,110,52,166,6,79,106,22,209,28,115,166,95,173,188,89,104,180,136,121,206,178,143,61,58,178,99,225,62,182,39,171,113,137,48,96,23,94,247,210,170,152,63,243,207,135,21,7,113,9,232,168,135,211,177,177,86,20,159,103,236,111,124,19,83,55,226,226,67,212,212,122,140,149,125,142,147,87,194,216,23,232,133,113,204,55,239,102,82,241,6,108,151,215,42,18,142,
+156,173,14,213,16,122,162,21,86,241,38,165,116,251,172,156,222,71,159,138,198,213,192,241,112,135,68,134,107,111,128,42,242,172,28,198,182,132,89,76,24,175,135,97,25,36,46,88,176,149,205,95,45,189,219,178,165,23,209,204,219,203,229,64,157,149,69,220,158,10,115,145,124,41,92,122,218,224,58,30,21,70,111,105,212,131,72,195,56,64,157,116,162,30,79,44,7,67,225,123,111,91,14,246,223,116,60,244,218,230,187,187,26,101,124,99,199,1,132,70,43,60,140,46,79,130,201,101,46,188,50,97,237,199,32,246,80,35,193,165,192,51,167,62,83,1,183,126,81,156,94,205,241,179,204,241,218,137,45,61,173,167,253,200,115,204,20,203,215,120,230,176,104,135,189,142,233,45,194,76,176,97,160,86,5,99,33,72,113,18,164,240,213,185,72,8,36,191,36,166,18,165,104,172,46,196,146,125,108,174,135,77,130,118,0,19,173,99,103,167,199,173,164,1,57,93,138,120,18,172,65,91,56,131,139,163,145,213,239,50,16,119,141,65,251,148,60,157,34,237,93,221,83,96,158,234,
+82,140,249,179,25,65,1,61,245,109,16,242,233,111,168,249,217,200,132,132,221,14,141,238,169,213,86,168,232,142,126,158,211,9,166,242,26,220,219,146,247,53,23,238,180,199,119,61,170,70,20,229,39,252,37,225,95,148,31,29,209,183,220,220,212,171,201,145,132,57,137,223,173,167,172,66,65,33,184,59,241,138,6,109,95,3,28,133,82,88,154,45,142,90,47,19,118,253,44,243,28,171,58,80,161,99,150,173,6,195,92,1,159,201,116,233,123,71,246,234,10,53,1,141,121,154,159,247,199,91,79,93,127,69,48,72,13,215,105,134,198,107,25,213,86,211,242,141,142,42,8,158,182,196,243,248,122,70,73,245,35,105,222,126,242,162,116,107,231,156,8,226,231,143,135,221,156,153,55,126,11,143,228,133,230,81,80,156,53,14,143,140,83,66,92,11,243,121,69,46,111,123,92,75,15,178,205,196,202,22,91,29,105,87,41,167,195,92,223,61,87,33,235,185,63,3,72,176,71,115,161,5,29,240,172,22,229,5,98,15,242,21,198,28,11,6,246,87,199,126,21,66,2,15,170,70,
+129,133,247,230,107,104,19,21,28,239,74,42,202,76,218,97,59,178,101,57,216,109,103,23,240,159,150,130,71,182,183,25,142,237,83,204,121,193,179,146,31,11,112,114,20,201,65,33,142,63,61,181,149,207,122,164,92,75,143,133,171,209,44,222,49,198,216,81,141,27,180,43,8,217,175,166,226,139,192,146,91,108,61,156,11,237,115,68,134,12,77,67,254,107,245,70,133,51,218,202,78,174,107,176,136,104,222,10,109,200,92,239,81,81,169,22,129,59,181,229,139,0,221,213,62,11,134,183,248,171,167,40,190,110,14,25,220,177,49,108,84,191,149,229,114,193,155,206,206,73,89,154,254,80,255,184,16,61,128,12,169,82,82,198,89,58,121,170,198,232,101,54,107,91,19,98,168,168,244,36,92,245,105,244,252,2,137,92,199,46,17,172,244,142,65,193,220,142,217,253,216,182,95,73,93,53,9,2,150,150,190,115,217,230,228,86,240,64,20,19,174,199,192,209,108,118,37,6,119,249,88,6,159,61,118,172,91,160,211,152,120,57,190,124,118,235,11,142,114,30,163,244,189,94,68,241,
+174,206,90,86,243,91,10,67,196,215,161,239,245,43,198,221,176,144,201,84,158,21,229,64,176,123,41,116,118,210,45,253,73,248,48,92,219,163,208,42,187,40,234,181,219,166,183,1,101,143,227,169,159,229,189,13,155,163,191,55,191,0,242,7,170,72,98,56,107,221,203,186,57,54,206,176,122,83,128,57,61,125,8,40,53,54,231,36,77,31,28,46,47,39,232,131,100,136,245,67,158,187,114,116,8,141,43,30,74,217,221,158,179,43,112,91,114,225,174,15,174,120,194,125,230,170,79,138,23,37,236,213,86,191,98,23,141,60,182,242,92,34,206,248,170,18,165,2,117,76,162,247,105,208,199,207,53,210,196,117,38,14,41,130,35,194,100,52,69,62,75,77,160,207,107,179,119,28,195,171,34,191,143,202,28,238,64,214,136,32,220,238,2,0,138,141,197,209,18,34,115,42,213,221,91,121,6,220,3,183,34,111,49,65,149,221,204,239,75,103,131,56,98,14,234,157,28,190,97,196,12,113,176,177,86,252,30,74,145,19,235,202,242,14,226,138,31,107,156,182,100,50,219,239,39,129,
+174,213,49,154,41,211,220,34,149,45,25,103,135,205,23,137,156,77,198,93,137,188,108,146,26,67,220,82,114,236,89,135,4,3,47,87,129,107,28,253,251,78,94,162,65,195,109,10,134,74,71,99,199,136,150,221,105,23,117,139,121,55,119,34,134,26,55,84,101,113,89,151,179,200,104,189,129,151,141,74,145,73,218,193,148,220,244,76,254,166,218,93,219,219,55,225,226,99,2,122,233,42,135,211,117,132,214,142,10,175,215,243,226,97,119,16,214,211,12,212,154,56,59,159,41,93,105,9,234,125,192,130,238,60,152,41,70,187,1,229,153,82,207,224,133,114,121,189,199,40,92,189,101,14,56,216,64,107,44,94,238,107,158,36,97,246,34,134,63,55,222,27,193,67,8,42,58,165,111,179,40,127,45,246,92,151,147,96,78,93,200,30,217,188,181,187,55,66,212,151,143,239,76,136,113,116,121,253,240,2,143,146,227,38,218,231,190,60,11,98,238,100,86,110,238,220,180,41,197,23,220,41,77,181,149,230,248,178,0,64,235,18,105,199,186,184,137,116,218,206,183,26,240,154,64,11,
+184,200,149,237,9,245,74,8,20,14,36,53,193,88,98,48,158,168,211,230,241,248,169,120,234,30,239,88,160,25,182,176,237,177,164,212,245,249,197,85,170,165,154,122,247,217,193,215,96,219,194,20,227,43,167,34,180,40,130,23,91,19,185,46,38,15,90,49,190,76,112,193,143,14,198,73,12,28,249,226,215,56,81,79,249,152,39,179,190,24,239,106,117,182,225,81,147,63,46,159,15,3,229,115,68,217,198,193,103,15,200,228,249,183,224,204,118,238,0,197,228,250,97,251,162,241,42,171,240,14,34,79,143,253,60,29,162,47,164,123,44,201,176,176,119,41,205,238,190,89,143,6,228,247,97,14,139,191,251,40,170,118,124,134,25,38,126,176,126,8,223,174,157,139,117,187,218,130,121,146,28,223,178,74,73,222,194,149,71,12,76,68,33,69,157,129,69,78,121,0,105,135,231,116,151,189,20,90,245,8,123,247,29,205,76,184,247,232,134,246,126,109,114,173,216,15,120,245,93,230,145,152,186,150,234,11,207,156,119,28,228,172,242,106,202,76,218,252,226,136,151,203,170,123,140,15,
+229,216,73,233,138,203,18,173,168,52,232,156,120,124,127,181,189,141,30,83,188,71,151,156,225,13,184,249,253,139,58,11,127,27,58,176,21,11,57,114,81,230,66,111,245,232,242,234,228,6,180,63,44,18,121,169,79,195,164,160,251,80,112,107,107,75,101,144,114,161,211,197,115,42,31,209,76,87,19,20,95,109,163,229,45,120,36,188,41,39,3,122,18,62,133,181,219,195,38,255,241,209,45,185,99,236,109,121,129,167,125,93,134,92,55,71,51,55,160,58,144,2,125,186,222,56,196,39,147,223,222,245,101,254,252,33,160,197,183,161,32,189,14,131,230,123,12,158,229,249,150,41,163,42,227,118,118,252,130,57,47,162,50,31,224,128,217,240,90,130,1,239,96,252,84,208,72,1,46,138,216,46,206,201,120,136,193,9,104,17,124,59,89,131,81,118,40,5,210,105,152,230,142,63,53,118,173,12,191,107,54,32,17,151,249,89,18,59,84,106,138,124,102,83,8,85,19,15,129,109,80,150,231,136,125,155,207,115,56,7,246,186,57,179,55,202,233,43,71,232,160,106,173,155,79,224,
+39,140,205,64,7,143,141,108,249,56,95,4,85,183,186,106,206,2,112,52,123,15,160,109,17,163,244,113,6,231,0,58,213,13,99,194,21,123,168,54,188,160,39,98,3,25,172,221,28,35,19,99,34,117,102,223,159,238,183,61,81,71,25,205,76,229,46,136,126,158,31,20,158,201,194,114,170,187,165,59,109,49,120,114,221,144,51,151,148,160,27,209,160,178,64,84,98,197,13,168,63,31,66,138,70,170,25,49,157,10,151,23,205,19,85,143,147,99,146,236,192,76,82,209,193,146,131,91,206,35,198,218,221,205,60,9,234,226,121,190,194,21,232,168,12,153,44,228,226,28,100,234,26,163,93,186,8,89,0,239,243,187,159,252,140,199,44,251,151,51,39,101,118,118,63,241,232,111,212,104,48,48,49,108,15,249,64,95,138,24,120,189,217,40,202,86,185,211,154,168,188,164,64,122,53,229,192,5,237,84,110,205,51,234,76,30,39,21,181,59,167,101,203,19,200,96,21,90,206,46,85,30,206,142,156,67,254,86,189,101,206,80,0,100,187,149,153,194,103,242,104,197,232,97,25,164,
+252,82,200,91,0,131,226,81,88,16,13,136,38,144,220,78,47,12,96,91,252,190,14,43,237,251,133,183,145,248,142,240,243,42,164,250,122,51,119,158,159,145,137,196,186,10,245,209,190,63,240,218,213,239,179,113,14,6,59,105,87,122,15,239,68,83,217,225,58,154,111,240,149,180,55,209,63,39,175,42,54,139,118,213,130,21,251,133,253,247,49,220,41,92,212,111,159,23,126,253,46,206,64,57,50,12,6,238,197,201,117,229,96,15,50,140,12,77,211,193,51,45,122,239,108,77,223,226,247,85,204,40,143,247,231,182,177,54,253,86,24,105,235,121,86,63,34,91,249,172,83,1,217,39,27,246,50,102,114,164,14,79,56,165,195,161,141,15,16,182,255,192,17,173,132,207,206,15,42,42,238,249,158,11,229,106,178,143,6,144,97,158,166,52,115,128,58,150,1,110,171,155,58,223,65,100,232,237,99,117,63,222,68,169,188,177,156,150,185,183,4,77,90,117,245,194,138,128,89,250,72,47,131,186,179,221,119,242,160,231,21,68,131,156,64,36,32,36,184,84,121,243,130,249,254,170,
+74,189,190,1,179,90,152,189,162,141,47,246,50,55,2,242,236,232,176,156,235,157,31,175,30,252,67,253,206,205,156,72,59,125,61,81,107,30,135,48,112,34,84,133,234,219,171,84,113,46,109,32,79,178,12,182,203,194,192,253,28,24,168,101,174,95,112,42,190,165,71,14,231,31,101,5,247,181,73,172,229,125,2,44,80,189,244,36,179,162,212,125,189,205,38,204,191,159,245,158,230,82,228,233,216,241,4,2,167,30,154,223,196,238,122,94,220,136,45,178,53,67,205,31,248,109,143,240,177,32,209,186,56,14,228,193,179,110,12,14,170,56,52,110,20,152,168,161,36,166,217,227,106,16,22,175,43,59,206,127,188,11,95,55,13,46,86,53,253,68,229,211,115,94,229,12,237,165,233,49,10,65,253,36,8,144,122,227,253,234,220,207,1,111,91,105,31,196,63,13,45,64,226,106,172,200,19,171,111,67,234,199,179,143,117,121,229,128,81,253,240,30,69,212,93,55,82,228,236,11,42,196,34,87,99,72,221,48,42,102,25,204,114,66,222,206,237,243,23,62,253,1,112,166,121,120,
+170,122,47,102,172,22,114,193,230,104,146,196,32,98,12,183,71,15,28,17,120,230,110,64,122,144,216,82,185,11,195,87,198,131,193,155,63,121,137,107,131,179,91,148,39,239,237,224,12,55,39,249,177,35,89,117,62,58,165,63,171,67,79,65,237,48,23,29,164,161,62,174,142,223,128,5,253,173,6,25,203,129,174,49,5,24,43,224,106,34,164,234,154,227,11,221,115,165,208,126,63,101,153,84,13,181,138,62,157,83,119,7,144,131,94,225,115,179,197,204,251,27,210,112,223,35,212,9,72,191,1,187,122,146,22,185,32,213,245,48,76,88,159,251,244,51,45,173,64,3,140,195,51,120,150,136,105,138,108,224,3,141,209,169,4,231,155,174,70,77,63,144,14,100,225,3,41,82,173,76,180,231,68,109,179,111,85,144,65,80,210,77,117,157,231,197,65,243,142,241,1,175,52,182,51,211,218,196,21,119,25,223,126,168,186,17,202,110,229,121,114,40,38,226,91,231,207,144,227,232,12,113,228,25,72,241,40,13,196,192,24,194,103,7,92,200,146,52,35,4,182,74,159,195,98,2,
+22,191,120,50,14,15,46,100,236,86,229,5,194,233,192,75,40,117,128,128,241,119,69,69,186,59,13,173,219,219,123,104,57,176,2,15,5,136,22,14,1,137,0,72,69,111,171,116,64,208,109,120,94,110,29,182,45,189,16,217,16,234,220,159,128,114,14,211,209,125,250,44,123,247,156,110,132,187,198,114,212,194,96,186,103,57,12,104,185,150,36,8,10,110,31,64,57,178,46,118,200,121,109,154,83,101,62,251,25,15,55,57,136,225,112,180,197,221,37,152,181,33,5,145,1,120,3,3,131,124,198,235,194,27,30,110,235,33,53,193,132,183,246,174,27,33,29,181,224,19,58,45,184,134,85,205,107,107,17,24,111,36,47,116,141,122,47,217,77,183,8,105,1,84,195,244,86,128,35,204,51,102,211,104,142,151,221,72,123,27,109,149,169,67,181,130,202,231,117,205,26,41,178,245,194,248,120,90,166,14,136,167,51,65,23,30,234,122,240,36,20,153,237,94,89,21,88,15,161,105,6,75,23,166,186,38,19,39,229,53,3,148,31,113,186,17,129,77,86,98,134,86,18,194,128,171,
+93,104,87,129,82,137,243,194,161,3,209,121,247,93,205,57,254,113,191,199,129,115,148,215,45,82,187,185,134,104,116,155,61,99,228,174,90,11,208,69,119,195,228,217,33,62,58,247,120,118,114,152,185,94,157,247,71,218,157,107,41,114,166,32,184,30,122,173,205,99,21,248,197,44,61,75,165,43,12,213,217,96,41,73,221,94,203,136,229,7,48,68,23,235,44,55,160,74,79,36,148,175,57,22,157,33,29,39,123,162,169,141,220,20,42,216,60,103,42,174,7,144,161,123,205,238,214,204,54,163,8,109,166,73,253,106,186,174,84,33,91,133,214,173,171,108,90,98,225,161,62,186,210,233,130,238,189,189,186,57,152,185,34,4,149,90,188,147,147,58,100,142,234,62,179,0,119,106,239,38,146,99,44,124,42,70,229,253,232,179,47,54,108,250,51,233,64,223,76,174,195,130,200,199,168,12,37,166,67,124,3,214,137,75,39,230,89,43,197,107,62,236,105,13,44,69,236,80,138,155,115,197,155,151,25,148,206,238,90,217,55,164,144,235,244,141,192,35,167,140,78,194,0,37,137,169,
+52,87,77,136,175,189,59,109,136,110,22,160,158,114,50,128,154,76,162,149,68,206,9,43,106,73,131,140,232,36,130,86,103,120,138,195,102,155,9,198,161,103,36,201,16,17,215,133,31,237,84,246,248,10,209,59,206,200,219,200,165,238,104,175,188,148,225,84,79,41,131,99,233,190,173,76,245,129,53,109,172,41,92,13,15,241,10,71,17,105,114,102,225,200,2,156,232,176,249,172,110,102,236,188,180,96,241,176,167,218,52,92,195,253,180,119,148,189,243,108,211,189,243,192,235,25,105,223,151,211,109,186,201,162,9,191,245,159,182,80,98,19,54,126,228,122,67,41,31,184,81,199,19,78,165,54,103,228,139,111,140,26,41,49,201,29,13,159,90,244,208,38,189,53,231,190,239,134,149,172,205,21,140,30,91,153,41,191,54,221,180,186,27,65,169,171,74,49,48,72,63,232,227,14,225,135,128,45,213,161,250,0,162,223,129,176,102,15,158,158,37,116,231,252,46,7,97,32,58,79,194,223,124,39,253,158,151,178,4,52,81,219,98,64,11,10,147,251,238,112,75,237,215,47,143,0,
+34,20,62,77,57,93,167,103,137,99,111,231,245,162,158,54,74,31,144,167,135,35,168,185,70,207,195,34,98,249,202,35,163,174,171,182,5,110,214,197,37,166,226,245,196,214,189,80,109,1,146,250,7,232,190,187,189,107,107,5,167,12,12,223,243,130,35,253,249,26,135,71,84,215,137,78,150,152,240,235,28,70,161,222,204,228,117,126,139,10,60,162,72,19,17,130,61,17,170,246,126,191,14,231,239,243,66,60,71,205,145,9,70,214,149,3,40,108,211,79,122,112,106,180,67,50,156,39,152,3,168,31,166,198,236,229,46,29,34,244,37,122,100,49,147,137,146,45,21,160,29,193,81,220,137,206,250,97,74,247,36,192,88,157,105,188,207,147,6,125,119,111,179,203,195,14,45,122,123,81,183,169,174,30,183,13,111,51,55,50,27,29,14,96,230,228,250,117,162,61,56,37,234,151,196,28,9,124,24,235,142,50,121,4,186,211,184,235,245,193,5,168,168,69,46,232,122,161,210,73,87,181,121,148,81,0,73,40,153,5,191,213,8,152,247,143,28,217,219,214,29,140,60,4,234,48,
+226,219,195,25,99,66,78,224,170,14,188,66,151,130,99,213,176,237,10,247,206,207,186,156,153,49,236,3,216,207,227,246,173,250,114,121,228,60,231,23,186,176,2,227,65,216,253,178,50,203,155,108,160,177,174,57,20,116,113,10,39,187,12,108,17,124,204,157,195,64,55,160,187,114,75,211,123,214,67,107,242,225,154,20,216,38,148,232,64,134,19,4,120,198,134,130,99,162,243,220,231,19,89,192,42,204,122,21,151,199,51,200,128,72,175,180,55,9,252,238,8,90,251,82,158,123,196,249,44,45,16,201,223,247,53,73,124,90,163,68,104,103,247,188,7,109,93,220,118,117,207,59,186,243,52,32,155,48,237,98,128,20,189,32,29,245,230,216,105,67,176,50,215,205,31,76,189,28,246,54,76,149,94,251,223,123,182,157,250,178,222,59,59,75,98,209,45,7,10,83,6,80,240,8,137,126,54,88,243,22,10,251,43,51,244,202,235,103,35,11,208,150,189,33,109,17,76,214,39,81,125,57,46,187,106,169,23,32,45,94,171,72,93,169,190,176,11,231,211,59,180,6,184,191,179,181,
+219,10,110,17,188,244,166,18,88,206,255,154,240,130,69,170,156,16,142,91,112,65,149,37,136,212,158,190,178,40,187,155,144,232,166,249,134,86,213,5,145,60,19,26,108,231,21,46,173,51,124,145,205,113,245,178,225,12,133,170,68,173,157,173,68,145,157,103,224,221,2,233,110,202,159,245,66,74,39,38,234,108,118,66,25,239,246,41,238,34,224,58,66,201,67,29,238,216,34,108,134,102,179,101,159,119,134,206,46,174,141,143,212,163,45,33,193,12,160,1,207,201,72,39,39,78,62,219,235,216,214,13,249,115,30,42,92,155,83,209,11,197,29,109,134,46,71,106,91,131,67,69,7,100,34,63,58,194,109,189,112,194,46,91,163,79,168,174,93,173,168,175,83,153,119,55,162,175,155,155,196,73,57,247,56,44,33,116,234,109,236,5,163,92,243,11,39,165,211,157,158,244,61,197,8,128,181,15,38,222,250,244,35,12,126,97,13,133,178,5,109,6,144,140,216,156,123,87,220,101,111,17,44,158,217,9,158,37,239,1,98,196,216,83,4,100,38,237,192,198,96,38,252,168,83,42,
+4,250,18,98,88,161,195,54,68,2,114,183,40,136,189,51,79,165,180,225,130,15,60,62,0,94,251,173,45,138,21,187,215,69,54,118,240,48,119,35,47,155,94,237,83,65,85,91,62,86,126,63,89,233,53,20,79,3,36,18,183,214,188,167,49,196,59,188,11,59,73,151,217,61,200,84,186,117,156,145,244,200,234,195,143,105,145,67,194,27,192,47,75,83,204,183,64,98,115,160,115,161,13,98,197,57,124,219,3,63,5,175,177,95,14,216,240,209,45,119,40,29,247,163,162,103,181,240,80,102,179,105,160,223,227,75,153,108,72,66,112,36,7,125,62,208,93,74,6,80,21,22,33,117,103,253,234,133,144,197,122,102,177,33,10,112,53,162,147,142,241,69,4,28,167,208,19,73,253,9,62,222,200,205,78,141,82,92,67,119,158,93,22,137,0,91,138,152,217,180,165,27,241,25,111,143,118,4,118,125,52,120,199,61,28,16,50,62,87,238,220,88,171,231,117,41,57,244,25,70,59,31,18,30,43,158,48,188,112,135,167,59,226,155,237,3,208,30,159,52,193,58,235,29,13,219,
+49,35,51,195,228,25,145,110,122,240,114,72,19,138,81,41,210,250,224,215,229,128,176,73,71,204,251,104,248,181,180,227,189,222,36,16,70,147,47,35,69,218,169,33,9,162,121,247,238,57,109,168,38,108,25,71,153,4,248,126,125,17,216,239,218,73,117,206,69,141,207,126,179,21,129,65,150,226,165,13,198,58,162,163,66,244,11,63,81,192,169,143,221,224,132,223,66,48,148,78,130,116,165,183,131,61,130,104,13,51,215,52,21,191,21,142,79,61,15,163,215,2,229,9,231,124,212,11,29,205,79,168,232,190,15,124,36,118,146,27,100,242,55,89,108,21,234,185,165,200,220,123,17,134,12,33,68,136,115,8,167,42,228,104,32,29,25,221,215,197,9,57,231,47,100,106,235,22,202,99,110,11,97,98,45,196,219,222,142,28,138,228,217,156,192,166,223,66,63,20,125,151,80,217,38,40,183,1,250,10,212,212,248,175,158,248,34,2,16,245,172,142,94,113,33,190,144,172,246,191,179,111,104,191,223,175,119,1,70,245,148,143,142,120,249,1,167,55,49,39,212,100,113,233,25,239,
+220,124,22,132,52,122,207,245,93,143,137,70,239,176,17,87,222,166,133,68,228,249,0,218,210,214,41,196,106,54,27,69,232,35,108,205,144,116,70,196,70,39,124,223,246,199,43,28,102,156,44,136,101,105,11,138,200,156,4,182,28,50,104,115,25,128,147,88,206,187,71,244,171,231,45,18,122,177,131,83,111,148,219,139,213,224,12,215,30,232,30,136,209,23,73,12,126,188,1,183,136,185,11,155,230,52,105,94,219,86,93,229,235,84,52,126,172,137,208,19,59,157,119,193,176,157,50,71,96,61,124,56,164,111,17,190,248,176,201,146,16,149,93,178,142,232,172,108,221,108,164,26,73,71,20,98,98,131,146,56,78,40,177,152,129,37,45,78,248,188,115,3,168,56,34,67,36,72,122,66,100,244,173,70,118,35,91,184,217,198,205,239,66,102,25,210,218,102,163,219,73,90,29,142,85,250,198,34,118,13,209,181,0,45,188,125,86,231,100,182,68,4,155,47,135,179,25,113,151,6,94,4,231,17,183,150,76,180,98,233,199,41,79,174,32,194,52,139,97,124,101,144,135,178,197,85,
+233,58,6,30,237,109,19,115,157,111,38,187,46,98,169,131,237,143,153,133,112,108,83,142,148,228,230,208,126,60,176,213,61,228,210,9,108,73,159,240,225,143,240,9,161,196,55,96,110,235,19,216,61,219,39,176,215,164,79,96,127,140,19,19,90,151,152,208,157,149,154,164,206,33,246,150,35,54,119,78,248,194,66,162,45,67,22,100,200,65,250,56,160,255,144,224,44,224,215,36,225,186,121,189,65,116,76,249,104,247,147,149,58,41,183,185,39,15,73,10,38,118,28,57,147,215,68,114,54,21,193,95,109,220,255,92,244,208,92,178,75,140,189,186,134,243,121,240,140,103,0,225,17,249,232,156,31,84,144,172,73,192,79,132,75,2,143,39,224,34,58,105,106,119,81,246,254,222,38,17,215,217,33,46,110,140,26,117,174,249,122,211,41,187,44,251,48,119,67,108,249,253,3,166,100,237,114,110,126,123,166,65,167,134,163,143,109,163,49,248,146,62,67,25,43,35,151,66,173,57,209,187,132,12,217,219,250,255,192,237,104,131,27,145,82,50,225,193,244,68,130,47,63,94,109,163,
+236,242,199,250,27,127,76,216,170,191,139,163,122,55,110,15,167,250,63,94,169,166,68,95,146,110,128,152,212,41,18,180,39,240,73,168,178,151,1,180,115,195,127,103,240,117,220,109,124,239,115,152,138,51,93,128,219,91,169,129,148,242,57,209,189,249,225,205,141,212,100,39,152,101,224,69,211,83,37,230,204,109,199,137,131,125,230,159,195,33,96,227,0,152,74,205,131,110,53,164,159,158,7,24,213,121,165,80,213,201,207,103,99,250,148,88,183,253,145,86,122,148,59,9,59,25,196,101,68,254,73,223,230,252,252,158,240,231,249,228,21,198,254,32,254,252,35,106,18,78,59,69,112,218,69,191,9,83,63,3,137,10,140,19,213,154,183,71,7,111,40,205,184,13,64,225,109,136,200,245,70,159,174,136,134,183,231,231,81,55,133,134,18,201,164,149,60,141,20,147,88,132,24,58,220,44,114,62,165,156,15,147,31,43,252,126,31,216,21,199,191,121,59,238,248,120,59,240,74,57,250,24,78,204,171,166,17,182,67,246,154,252,36,198,231,171,36,112,246,73,19,189,53,62,9,147,
+207,185,63,225,28,84,5,137,242,187,1,97,214,79,117,75,21,117,205,15,76,92,201,115,105,109,251,125,106,4,7,166,25,230,173,241,115,194,208,199,109,163,162,126,204,62,223,230,51,245,246,97,137,135,235,169,63,229,169,213,95,128,37,15,222,100,197,38,108,214,168,188,63,100,125,194,148,154,63,17,36,31,53,73,133,153,63,155,97,106,127,226,109,137,152,141,49,30,135,21,64,212,178,106,109,163,244,207,50,166,247,157,69,32,1,146,242,33,87,133,225,70,123,99,111,147,244,177,227,250,102,145,5,200,10,227,156,108,38,27,115,95,174,92,31,68,211,19,131,216,146,46,135,253,9,203,13,68,240,73,50,100,254,132,131,134,166,184,220,39,112,120,250,120,69,27,82,248,159,5,41,37,146,253,76,244,194,127,136,215,239,227,136,251,219,230,213,150,99,188,217,44,33,225,218,18,201,128,255,148,7,89,130,58,81,187,247,31,183,240,251,79,56,67,102,31,97,160,238,186,10,163,189,105,228,250,137,91,221,239,245,144,112,28,51,194,87,170,184,97,74,109,178,53,147,83,
+164,195,143,245,77,196,250,46,162,239,118,147,192,171,94,205,230,147,118,63,117,226,243,113,216,181,178,69,211,0,225,8,225,7,242,134,46,73,132,16,191,87,55,2,106,110,24,171,44,96,60,124,219,227,254,164,35,132,191,10,224,124,115,119,112,112,144,80,163,131,173,13,16,41,2,124,22,190,0,5,46,99,238,98,4,23,189,219,193,94,207,214,148,110,125,202,252,137,154,40,0,106,104,112,240,35,159,209,212,187,100,184,155,31,132,153,159,15,134,205,212,59,173,33,69,224,197,231,250,105,128,184,121,19,165,216,252,60,150,250,82,65,245,216,14,250,204,31,199,95,108,62,30,32,74,58,244,153,246,119,222,12,61,209,172,207,4,124,81,180,70,203,59,41,217,79,249,128,131,27,249,176,107,175,187,199,15,192,84,101,96,165,46,134,31,83,86,55,77,240,33,49,121,13,107,94,221,116,168,106,96,124,14,144,192,151,132,223,228,107,204,16,14,204,176,65,110,248,162,187,111,209,173,171,155,222,214,7,47,90,4,246,121,162,18,135,233,56,72,15,68,194,118,246,153,70,
+31,214,68,83,209,173,15,29,114,193,177,141,175,31,213,226,130,19,148,10,159,233,106,54,87,102,33,145,63,42,62,15,50,251,184,206,115,26,123,207,23,17,136,30,207,209,100,200,108,147,137,9,73,142,140,104,62,89,22,33,165,175,8,255,10,142,100,136,139,168,92,209,167,76,67,0,97,247,106,177,80,83,252,80,135,71,99,233,225,143,184,60,43,136,134,216,108,123,105,110,153,45,207,65,78,124,214,104,62,89,173,156,145,225,225,71,223,148,17,100,121,32,18,73,61,170,253,212,127,23,151,235,3,213,167,108,194,210,216,181,172,64,104,104,248,179,30,164,42,228,140,180,73,128,132,88,245,165,244,254,83,220,229,70,108,255,46,174,159,178,20,1,141,230,240,167,250,82,110,108,135,240,228,22,0,155,91,155,241,186,3,232,180,100,221,221,119,39,136,55,250,91,168,23,222,254,192,47,73,184,31,194,177,145,129,193,60,18,191,157,203,162,53,115,245,4,231,110,111,43,6,187,63,238,119,19,208,241,149,16,242,204,10,165,129,218,72,79,180,100,233,238,143,58,251,97,
+248,112,181,117,65,181,202,5,164,180,247,19,247,41,28,187,37,12,240,189,37,11,162,145,48,225,15,108,255,47,127,240,214,85,32,26,62,201,187,245,99,255,142,111,162,95,236,199,156,9,15,120,2,109,243,10,209,203,54,4,224,127,242,155,65,243,216,225,10,120,40,16,31,214,250,113,182,119,235,71,191,194,60,217,164,55,204,72,125,148,195,17,86,49,67,195,156,148,94,210,41,151,50,228,253,39,124,232,247,132,111,174,155,159,165,55,191,231,255,197,121,18,216,148,144,229,179,93,94,177,117,135,100,34,124,59,144,252,108,100,151,216,103,35,235,125,188,2,24,199,56,118,118,74,8,66,235,3,221,94,92,59,225,227,13,227,144,190,183,117,21,220,8,224,0,157,161,5,37,252,74,183,92,89,127,210,141,94,124,178,14,167,129,183,18,202,135,93,77,124,35,252,186,13,125,216,221,69,1,140,66,253,140,223,165,183,77,42,83,236,98,247,71,29,18,111,6,241,235,12,200,120,220,43,69,107,172,52,200,20,111,144,203,108,100,39,224,36,238,37,7,3,25,162,72,78,
+137,112,111,10,115,12,62,110,101,84,185,99,90,155,115,216,138,197,121,140,192,33,121,112,51,35,138,208,69,52,74,191,174,244,241,160,127,243,249,160,221,143,75,120,230,0,160,81,186,11,25,230,143,62,137,50,136,16,246,112,131,96,236,3,141,85,234,72,130,51,54,144,10,62,225,81,236,95,146,81,31,161,247,148,79,189,167,71,32,210,6,174,100,255,3,221,82,233,254,250,83,144,70,91,159,23,207,31,253,2,15,190,236,14,32,210,72,245,65,11,11,90,102,110,161,251,81,180,250,56,167,126,16,19,253,176,117,109,55,29,145,30,254,132,27,225,173,7,57,134,77,240,102,238,222,171,223,44,165,156,235,145,38,58,230,110,82,110,219,36,175,94,157,59,204,211,210,198,58,2,132,119,52,146,238,79,127,212,23,197,165,131,96,139,155,190,35,31,53,11,201,231,147,199,251,143,242,73,26,137,162,181,22,129,99,252,30,220,169,149,174,173,44,197,144,79,216,196,45,236,227,124,142,217,14,202,144,226,68,189,210,216,27,151,248,119,235,184,205,134,7,194,62,70,208,40,
+227,86,107,223,250,201,167,161,80,17,176,38,97,175,11,200,20,247,125,174,91,54,113,183,219,40,161,22,252,104,248,215,138,42,250,113,98,30,1,207,227,44,180,126,168,155,187,155,60,186,40,155,143,159,168,232,245,126,252,85,121,185,31,87,101,110,62,244,154,79,228,103,35,161,225,79,91,4,234,136,105,2,175,71,214,31,121,174,248,112,233,82,228,230,147,190,81,218,228,179,145,93,125,184,217,205,62,207,23,113,150,181,66,155,66,249,191,255,60,62,226,80,174,60,213,8,97,225,45,127,223,79,154,195,78,222,104,53,210,133,110,93,50,142,43,66,37,161,70,234,223,175,247,128,30,133,204,51,229,37,195,109,14,36,246,40,55,230,79,121,83,128,155,234,157,143,249,153,140,108,202,219,222,250,201,111,26,137,34,37,215,225,249,92,148,69,64,82,248,230,179,30,95,26,139,81,161,180,167,148,33,240,237,166,27,217,197,118,200,32,120,133,41,40,76,254,176,65,201,1,129,165,163,8,96,244,206,33,119,87,14,144,73,197,207,3,211,63,118,111,182,25,215,93,248,253,
+22,83,131,111,13,78,118,15,204,122,111,200,31,194,163,33,116,191,182,0,223,85,146,243,15,97,17,108,62,151,93,132,214,4,29,143,55,51,236,109,206,191,136,223,167,118,33,53,137,128,212,20,255,4,248,71,223,201,248,132,123,239,31,246,47,209,86,124,111,148,219,198,133,218,163,38,225,215,151,240,238,199,133,229,154,51,194,167,233,36,246,42,220,128,147,4,165,25,31,40,35,255,200,95,138,187,56,0,166,157,45,41,146,252,81,159,227,177,115,113,215,44,91,142,203,171,40,171,102,152,210,76,86,205,79,188,186,170,205,213,156,58,108,240,27,168,108,233,103,195,109,16,237,58,176,0,73,207,198,36,207,169,99,213,41,230,79,159,48,252,56,198,36,108,116,97,115,69,196,213,201,28,64,85,210,143,254,144,149,152,229,80,104,82,1,89,62,149,82,246,65,244,238,231,118,128,30,136,182,69,17,27,156,127,33,52,46,70,253,41,79,233,225,230,214,53,16,199,106,6,112,98,136,28,48,51,74,135,205,32,164,255,168,63,151,33,119,109,78,165,111,85,54,147,149,32,
+203,61,152,101,64,167,148,69,136,232,81,155,163,177,104,59,104,4,113,172,94,83,18,226,246,119,118,164,214,237,124,224,191,79,224,79,76,177,245,204,38,238,141,252,233,40,68,151,238,145,216,136,244,10,161,246,70,251,36,233,193,94,234,113,27,229,108,39,241,192,17,229,65,149,84,1,231,31,63,240,149,58,168,56,76,169,115,234,222,35,191,242,6,164,27,182,54,63,24,174,179,63,243,72,241,134,143,68,164,77,6,105,196,124,231,233,103,92,22,216,92,192,234,156,171,77,188,9,227,176,60,141,226,11,17,200,246,30,137,206,85,200,165,144,169,154,122,183,164,123,39,36,10,135,71,76,165,34,73,247,88,48,81,55,20,239,17,133,6,37,13,192,230,231,209,20,241,118,157,67,60,240,222,42,8,248,55,63,160,222,150,237,110,118,230,141,28,37,201,155,29,152,164,247,245,94,195,188,36,33,159,129,238,62,67,133,12,50,138,173,195,53,159,8,244,139,142,23,163,89,42,225,193,115,182,210,76,144,163,164,44,187,22,122,94,0,144,219,84,244,152,242,160,126,55,69,
+31,20,81,183,53,63,191,182,139,156,177,84,95,42,191,232,186,250,59,178,25,204,41,90,21,99,215,203,188,108,132,146,0,141,36,13,83,227,148,186,179,37,215,44,95,210,49,176,2,83,87,246,247,231,177,10,184,154,117,125,9,119,99,42,111,21,210,87,137,39,244,78,130,215,188,61,64,162,205,153,220,87,147,65,95,226,89,45,215,22,205,105,22,109,207,185,215,155,77,169,52,79,208,74,33,66,146,79,121,95,125,219,24,21,227,195,0,50,60,244,89,167,249,105,164,179,236,135,152,163,229,61,216,93,207,11,19,13,36,71,81,219,16,196,54,199,79,201,94,3,214,129,53,52,68,141,143,137,11,241,162,111,53,37,31,118,238,172,195,35,145,210,202,58,163,183,105,239,41,41,228,190,94,103,123,220,113,80,182,150,33,20,139,151,77,55,47,82,247,50,51,114,113,234,90,59,183,245,157,83,109,46,129,239,22,172,221,60,227,22,31,47,135,199,212,82,155,177,242,173,195,245,209,48,45,81,134,47,95,192,48,101,232,53,237,65,139,78,22,134,242,130,251,230,168,43,
+67,33,190,63,5,82,19,93,246,213,28,73,129,205,162,34,11,225,35,190,219,132,33,96,209,212,240,165,171,213,102,179,73,248,20,34,89,52,104,113,99,49,155,155,39,33,40,209,65,11,151,222,203,17,63,247,30,167,57,214,3,232,17,160,153,213,106,117,9,128,20,44,26,194,144,38,89,29,140,96,96,92,61,126,23,132,229,230,125,218,37,42,224,167,249,236,205,98,93,54,10,221,43,100,67,240,18,205,33,74,153,94,87,112,194,153,89,51,199,9,74,15,17,112,180,225,93,135,162,223,45,190,249,116,205,103,214,125,153,184,63,37,98,55,199,143,152,58,251,126,212,97,29,10,169,58,190,227,213,173,186,68,201,200,68,101,173,249,98,91,80,176,50,12,47,98,175,205,148,114,148,106,218,225,153,91,209,114,154,117,186,151,67,34,49,151,236,167,181,175,171,195,69,118,255,57,159,82,144,219,45,60,150,141,133,183,159,96,73,189,84,159,243,38,162,138,92,231,144,17,91,219,190,114,152,60,16,79,90,25,233,208,229,42,37,121,100,135,74,218,80,121,4,112,244,229,
+187,67,5,170,181,86,236,126,226,238,88,0,138,183,217,78,190,142,159,221,247,189,33,62,85,242,254,126,116,233,38,182,172,196,69,249,1,13,234,79,218,158,56,11,219,97,196,48,153,183,253,124,174,226,34,184,200,121,27,198,193,88,150,58,246,69,29,33,251,29,177,26,126,82,153,28,25,173,5,170,107,206,143,54,63,0,65,27,151,112,35,131,13,211,136,224,104,20,54,49,46,187,130,82,117,137,96,65,235,209,78,224,200,245,26,16,175,38,173,34,191,31,169,87,176,117,133,195,218,83,207,186,53,86,168,11,117,158,245,102,77,18,227,15,232,162,245,197,94,150,192,102,168,88,40,35,243,177,115,243,95,224,36,13,123,29,158,65,175,235,249,37,129,202,161,191,147,147,4,1,68,44,14,249,113,206,243,232,180,47,59,229,76,175,185,208,249,106,143,101,125,242,117,45,109,237,200,78,65,111,163,184,96,92,240,94,68,249,51,59,129,78,222,10,203,168,156,220,12,149,253,63,132,188,231,111,163,105,182,39,246,175,20,6,198,238,29,99,110,240,26,182,239,122,13,3,
+139,5,214,88,24,187,94,192,48,252,193,152,69,87,119,215,76,151,111,119,213,160,171,230,246,142,63,145,34,41,74,162,24,68,138,57,73,162,72,74,98,206,153,20,131,72,81,204,162,152,195,203,156,115,206,244,75,169,170,167,123,102,238,238,39,82,207,251,132,19,127,231,188,212,121,78,217,199,198,177,61,68,183,233,102,191,233,163,54,188,98,251,68,125,102,198,15,186,79,128,219,36,207,60,224,148,113,250,163,227,38,230,56,110,206,60,131,35,4,106,155,68,100,105,254,193,94,15,171,61,192,179,227,246,64,55,170,167,165,109,18,90,58,214,94,74,80,149,91,102,12,165,115,62,74,252,41,205,19,156,56,44,99,116,8,191,37,228,120,92,74,160,203,240,18,39,56,213,100,136,115,211,181,249,18,60,3,152,155,162,142,167,167,56,80,26,232,59,42,226,254,117,76,34,37,170,75,146,24,213,86,57,158,139,69,135,177,99,107,24,87,43,96,45,99,213,36,2,178,161,22,167,176,126,139,113,33,87,193,224,32,27,121,19,179,75,44,103,82,196,194,190,94,204,185,142,
+165,53,174,148,221,223,210,102,187,15,234,1,85,187,5,83,151,21,254,130,176,246,197,7,205,82,152,70,206,34,26,222,236,157,68,125,173,104,179,17,186,51,137,10,8,115,102,7,248,76,43,175,225,153,244,23,228,160,39,58,94,199,110,250,164,101,214,175,55,225,23,34,145,248,64,47,83,30,122,13,254,193,32,198,12,130,184,152,142,26,158,82,229,61,241,164,52,185,2,213,17,28,3,231,53,98,90,223,78,117,213,181,209,131,33,63,22,220,4,35,132,233,158,48,29,15,6,105,26,222,30,233,108,14,122,91,52,150,236,248,185,163,135,113,70,164,242,48,36,211,236,5,93,140,28,28,95,102,237,194,149,211,74,58,82,235,199,167,247,13,149,195,39,187,241,48,182,38,122,45,115,154,174,108,225,29,192,173,49,85,170,26,228,80,114,33,191,34,88,159,80,166,200,42,74,234,62,242,240,167,11,209,108,177,143,119,67,77,164,149,201,238,205,233,76,251,247,123,176,238,99,112,190,57,183,75,14,46,58,73,144,171,194,112,255,40,109,163,35,6,45,245,105,252,114,156,
+196,141,81,143,59,190,192,149,92,202,170,161,138,15,56,37,195,60,195,57,192,111,177,160,177,56,199,64,189,5,98,130,24,88,34,72,251,160,155,90,13,92,118,99,227,171,141,123,92,251,14,223,64,77,196,0,225,198,1,34,206,222,120,76,102,55,112,110,149,137,100,12,95,116,128,147,29,188,115,11,232,115,75,153,168,2,132,201,53,207,183,153,185,128,35,255,120,7,176,60,19,82,188,152,101,64,60,51,48,183,64,224,80,163,121,192,172,81,96,124,184,112,60,213,102,34,230,188,56,91,178,55,230,1,231,174,155,44,157,184,88,134,220,242,49,53,211,159,183,215,246,245,86,200,19,212,9,222,229,118,126,60,91,22,201,65,75,16,12,61,15,174,114,24,75,202,206,237,139,213,131,29,187,89,184,141,252,173,34,55,7,136,230,113,205,184,239,204,82,3,154,245,190,124,26,224,128,241,161,107,238,94,35,125,21,203,178,198,65,29,149,244,163,236,67,135,152,216,223,129,61,8,41,11,199,245,46,0,61,164,6,18,48,66,12,25,118,127,134,87,199,233,37,211,115,153,
+70,166,130,237,73,218,232,192,196,38,57,80,236,93,145,104,188,154,67,112,27,60,72,50,120,205,148,212,180,184,77,103,107,144,151,240,135,13,191,132,191,243,219,151,240,135,227,190,132,191,179,13,24,254,26,227,179,252,3,145,148,79,1,105,250,126,196,203,219,61,143,194,235,236,73,243,26,165,99,44,76,82,128,198,70,97,210,189,219,59,96,203,150,84,27,66,188,182,235,205,76,206,249,81,126,213,89,166,62,142,19,188,134,220,119,63,88,203,51,89,55,119,161,110,112,68,131,21,71,151,130,241,41,88,142,82,56,221,132,44,248,12,49,73,109,197,92,186,20,83,226,47,66,179,135,201,170,200,203,88,249,11,245,131,170,215,196,90,29,197,230,169,77,133,213,49,123,79,234,44,191,60,36,30,122,243,39,252,198,216,125,53,169,58,83,27,53,61,177,28,77,14,87,247,158,3,240,111,70,109,90,153,62,29,134,165,23,209,7,188,131,93,216,150,157,155,235,146,165,8,198,185,67,125,88,98,217,48,231,228,222,142,109,92,111,32,218,66,235,240,17,239,83,59,172,79,
+31,255,246,237,247,31,62,254,234,213,135,151,230,85,175,223,189,122,253,210,101,235,15,187,78,87,187,214,87,223,190,249,205,199,87,223,188,126,247,245,171,223,189,126,247,210,51,235,221,231,233,239,223,189,121,245,254,55,207,211,62,47,251,226,159,127,248,220,253,234,195,231,45,190,127,251,219,111,126,178,199,223,188,122,245,111,190,125,251,213,63,188,250,63,254,247,87,187,177,221,148,151,13,223,124,253,121,237,75,195,172,47,223,60,183,236,2,135,255,216,118,235,135,183,31,191,121,94,242,121,230,187,215,223,129,235,191,121,255,195,187,159,204,122,253,187,223,129,71,188,126,238,225,245,195,219,119,95,191,255,225,213,199,183,31,191,125,243,234,203,215,223,127,234,216,245,121,253,199,111,94,239,136,251,0,158,6,114,246,249,188,15,175,190,127,243,155,55,223,127,15,126,255,248,30,228,238,165,87,216,127,251,179,246,94,191,126,38,255,165,171,215,135,87,191,217,73,242,71,169,189,5,191,131,162,249,81,20,47,4,130,39,125,150,233,23,127,189,19,200,23,127,253,225,237,215,
+207,66,124,33,252,111,126,174,157,127,247,238,39,210,249,147,30,101,159,90,139,253,234,213,219,23,13,124,241,139,215,160,200,62,31,248,197,47,94,125,245,205,155,175,254,225,203,247,255,249,185,83,217,187,231,191,222,124,253,73,129,127,65,45,47,34,223,209,9,234,21,212,255,143,164,127,18,208,63,254,145,255,175,62,117,104,123,150,239,175,65,121,126,241,139,127,255,103,227,32,5,207,34,252,176,19,224,11,23,31,63,190,125,247,219,79,27,126,253,230,227,155,239,191,123,11,158,187,59,241,199,166,108,59,98,191,252,253,219,111,63,130,187,254,199,63,167,224,221,251,127,130,136,87,95,189,126,247,197,63,255,184,51,153,231,229,175,190,252,195,238,208,239,64,209,253,227,155,221,150,207,146,255,195,110,218,110,206,174,115,219,110,202,123,112,240,251,63,178,250,201,28,127,156,246,167,214,247,39,234,217,153,209,238,180,175,127,78,12,104,11,239,191,255,75,6,243,234,215,159,246,5,189,229,237,111,119,59,255,254,195,174,85,221,167,62,116,255,254,167,234,253,226,175,255,132,
+193,159,119,164,251,143,223,191,255,127,159,219,205,189,121,247,251,157,168,64,67,125,243,155,183,187,45,255,2,65,159,214,130,252,125,15,218,251,235,239,127,251,6,148,198,31,126,247,230,213,95,189,249,207,111,190,250,253,199,215,95,130,158,1,146,252,245,183,223,254,242,87,63,243,157,15,31,255,0,62,250,171,255,237,255,250,119,187,231,239,64,173,254,53,248,253,151,159,4,245,253,155,215,95,191,250,238,253,215,111,190,125,245,87,59,70,190,5,169,126,25,5,233,0,231,127,247,251,111,63,190,253,227,208,47,95,60,239,195,155,31,233,249,163,17,60,27,8,232,219,160,153,130,206,242,251,29,9,47,174,183,123,240,213,251,239,126,247,246,91,80,81,187,99,191,125,251,238,31,62,125,125,126,246,205,251,183,95,61,123,208,183,111,191,124,182,181,47,223,188,204,249,250,5,43,126,248,108,239,127,193,194,94,168,249,167,101,245,39,24,240,79,152,222,51,10,128,179,63,124,124,255,253,139,181,252,68,247,47,115,127,13,90,255,87,47,219,255,230,103,196,60,107,237,237,243,
+147,223,236,154,12,254,213,219,191,1,1,114,55,227,127,249,209,16,118,8,247,55,160,72,254,215,231,41,191,252,19,35,252,215,127,142,100,255,180,151,252,21,248,232,143,84,253,72,212,39,146,119,135,188,156,177,115,128,119,239,127,234,78,111,190,122,13,58,205,110,218,247,207,34,4,55,122,251,14,180,243,239,94,164,246,124,246,135,215,127,248,0,202,123,135,114,63,49,50,208,16,94,204,232,237,199,221,194,55,31,191,2,37,255,239,254,171,160,245,95,135,190,63,1,182,159,163,214,15,223,188,253,234,155,255,18,108,253,24,98,158,161,25,36,233,255,254,230,167,221,33,119,155,191,64,250,87,160,245,238,66,19,72,254,243,146,207,64,244,231,123,130,212,124,251,230,195,135,159,198,197,31,117,243,230,187,223,125,11,110,243,163,121,253,240,250,165,127,36,232,57,111,118,114,120,62,229,103,125,43,65,105,124,249,230,219,247,63,252,169,194,255,237,206,179,64,75,219,121,207,235,183,223,126,70,132,247,223,255,246,245,187,183,255,223,235,207,86,246,89,18,191,250,28,155,223,
+126,2,184,119,111,62,124,4,71,255,159,255,244,241,253,239,222,126,245,197,255,252,197,223,126,241,183,96,16,250,226,111,65,199,255,226,111,63,131,238,31,187,109,254,235,119,95,255,135,221,146,47,254,155,55,160,10,126,255,225,63,189,218,81,252,241,155,183,31,126,253,211,94,150,255,226,95,125,238,208,249,135,29,212,255,254,119,63,210,251,253,251,239,158,41,252,63,255,75,186,252,20,32,191,124,255,143,159,26,115,254,24,46,118,96,250,211,196,228,19,134,126,5,70,174,223,238,228,183,123,12,50,245,195,79,102,188,104,236,151,59,132,127,142,114,32,152,238,50,142,157,120,63,73,235,199,185,207,233,195,78,44,47,150,182,155,242,197,47,222,124,13,42,251,199,148,230,23,207,103,124,241,139,159,158,241,197,47,126,249,79,55,242,252,251,255,233,159,253,119,127,247,247,255,242,8,54,128,182,33,16,200,30,97,251,199,70,158,167,167,99,14,211,133,58,56,214,74,172,9,223,253,138,118,23,131,165,114,39,72,236,41,227,234,238,68,122,123,22,187,226,222,159,95,49,172,
+240,251,226,177,193,173,76,200,3,220,42,141,188,150,57,103,226,75,129,220,60,131,11,136,206,90,218,97,37,234,74,35,45,146,142,100,112,180,203,133,24,3,165,230,165,21,237,98,187,221,104,168,17,213,120,213,4,92,163,64,36,182,178,116,135,237,202,120,219,4,182,156,173,190,25,222,94,215,235,37,63,47,117,71,149,201,80,158,123,17,92,222,34,79,138,179,142,146,227,57,197,244,203,15,38,89,185,17,219,219,182,228,166,40,213,159,228,164,233,65,94,140,43,165,19,2,138,115,76,168,116,134,180,98,100,178,6,173,68,89,40,196,107,184,78,187,79,168,90,92,148,203,71,77,225,154,62,58,208,68,228,23,143,84,90,161,24,68,79,52,214,7,58,50,122,163,33,93,142,131,52,11,83,60,100,41,22,180,33,137,209,90,19,150,37,205,214,170,173,185,215,165,50,10,63,223,82,135,222,173,111,112,171,56,166,239,85,169,26,115,238,240,68,2,25,160,172,176,35,145,205,157,11,80,115,123,219,34,236,158,123,179,81,222,237,185,181,166,203,234,222,67,58,83,236,28,
+226,13,2,188,37,90,157,12,230,186,216,181,234,114,36,30,238,209,7,44,211,157,42,162,146,1,61,37,44,189,73,221,73,228,184,146,46,121,102,3,165,31,197,221,69,117,73,67,218,191,90,143,189,101,129,13,145,52,36,211,247,55,233,71,71,86,179,34,192,229,249,43,249,133,84,81,139,117,150,105,35,53,115,126,156,74,149,133,78,230,185,87,127,123,206,180,79,233,177,167,246,70,75,159,103,231,121,119,231,1,133,135,91,124,150,200,147,109,3,35,79,102,37,248,169,104,60,247,65,110,5,147,154,124,122,122,47,218,206,56,78,149,155,233,94,215,229,124,81,243,56,154,236,40,232,6,95,173,166,151,139,220,186,238,193,0,211,109,84,47,57,35,205,40,35,111,231,104,238,177,170,197,39,158,70,120,146,147,76,240,80,102,126,164,90,141,190,235,43,31,0,221,156,11,176,241,171,244,82,93,222,191,62,44,111,104,193,206,108,96,64,82,179,217,61,53,113,255,82,206,185,135,130,124,161,177,79,81,5,47,54,166,102,83,148,241,3,218,186,121,212,217,207,143,66,167,
+1,187,158,80,57,22,84,143,197,156,136,254,148,116,99,247,36,70,128,49,98,129,224,31,161,75,178,160,42,202,71,97,221,233,182,37,72,172,21,233,172,146,38,19,116,42,129,225,154,67,125,178,225,18,200,56,179,237,57,180,222,155,26,16,72,2,105,186,92,211,58,132,155,138,125,163,22,103,183,198,250,234,92,193,222,200,151,103,17,244,131,117,159,55,194,179,116,125,81,236,81,211,217,46,25,166,238,157,173,209,186,209,19,20,248,155,91,43,112,172,136,40,42,27,72,18,6,129,220,222,101,26,99,62,41,175,96,11,106,117,129,68,180,172,32,91,42,11,147,52,187,188,146,54,252,249,85,133,233,232,180,22,109,25,178,115,112,157,153,162,248,131,193,45,203,127,151,137,241,168,211,180,47,145,47,115,237,126,17,32,239,232,237,6,207,83,197,172,2,220,128,199,172,204,78,37,15,92,207,144,26,145,108,236,222,70,75,22,22,8,120,177,251,134,241,100,33,41,94,48,171,129,8,192,188,21,159,209,204,192,173,248,118,203,110,32,117,247,141,147,75,98,103,178,190,112,
+97,76,155,165,192,222,93,85,114,158,155,64,84,180,8,181,195,178,33,5,85,141,173,86,226,138,175,56,37,68,44,88,179,100,225,10,83,45,69,26,37,222,155,70,140,137,144,99,53,153,22,194,241,142,72,208,208,148,107,254,187,46,86,203,203,166,44,52,245,2,177,245,172,150,27,21,255,84,65,146,94,27,16,116,61,38,148,242,49,231,244,84,106,188,92,142,146,222,252,211,196,114,31,164,0,88,80,160,57,78,79,5,37,75,5,119,5,226,53,157,88,26,107,104,236,128,118,53,65,73,209,30,192,60,3,2,204,152,101,73,208,87,73,23,56,85,192,156,86,244,42,147,113,160,130,243,182,7,22,166,255,105,235,57,61,105,184,248,81,31,219,19,112,84,143,143,77,82,237,106,85,216,226,243,228,173,160,159,236,202,80,245,146,106,44,136,209,69,126,177,91,215,36,55,194,77,109,217,174,91,45,204,150,75,62,91,87,42,44,34,220,124,175,204,239,89,115,152,179,61,255,97,58,120,123,45,43,13,209,165,98,195,181,207,199,5,176,162,236,104,155,155,179,99,235,193,
+73,36,185,101,219,159,140,125,94,110,108,241,251,86,189,213,69,113,51,187,65,186,38,184,126,130,83,80,32,169,10,129,194,161,76,9,102,124,236,149,97,169,199,251,78,214,228,108,143,164,192,47,182,5,16,114,178,36,172,0,118,12,53,28,157,105,185,61,23,148,79,153,10,89,20,139,122,147,120,96,199,44,83,109,120,225,177,248,244,234,117,113,136,220,143,28,34,8,4,44,18,139,10,136,47,11,216,125,12,58,51,165,135,116,173,250,109,217,65,199,138,251,11,69,40,244,36,185,32,93,109,61,253,88,139,94,25,151,229,208,181,87,196,243,11,166,41,207,35,251,20,117,27,32,141,237,16,220,99,1,136,37,157,203,107,145,196,36,94,47,209,173,37,18,83,39,82,48,141,113,200,149,74,62,52,49,126,165,146,57,200,64,239,33,16,253,129,172,207,36,71,4,149,211,168,73,69,150,116,200,150,51,238,2,59,116,70,86,109,145,143,219,140,242,86,230,227,62,26,56,171,12,221,176,27,118,199,220,169,61,76,103,116,4,135,45,186,162,44,233,17,114,81,146,141,206,
+12,201,134,230,244,82,180,113,215,31,169,2,141,146,205,191,48,97,24,245,186,106,85,176,199,133,98,179,105,88,61,22,144,12,2,92,41,66,50,45,71,153,172,48,170,135,88,45,76,136,13,2,229,84,199,15,69,108,210,210,20,250,61,163,198,88,224,18,88,100,198,120,168,221,200,163,12,182,108,115,172,216,100,50,136,25,134,150,221,224,115,108,120,8,2,201,201,226,166,153,185,88,243,217,18,173,74,114,17,168,128,134,80,125,226,5,162,101,135,217,178,128,197,71,86,217,117,1,65,36,116,106,171,25,50,115,252,104,73,103,101,221,134,252,40,180,246,56,55,233,93,245,129,156,206,244,171,100,11,141,165,164,139,149,246,73,210,237,157,151,22,243,235,253,9,166,124,73,7,54,249,121,43,103,23,118,31,239,52,117,214,248,38,30,222,30,34,56,2,3,147,5,233,80,133,176,1,201,246,176,151,74,153,22,252,240,13,219,98,103,175,87,163,199,66,214,53,227,141,5,170,194,86,221,44,151,160,232,100,4,185,0,200,209,211,44,120,114,193,118,100,243,60,104,157,219,
+234,242,190,43,172,90,234,140,73,180,26,163,71,16,209,42,25,184,41,21,208,141,59,74,164,17,15,8,219,105,130,214,106,93,54,116,155,70,32,50,238,107,98,202,112,7,59,182,140,225,29,190,39,21,125,44,179,213,130,192,93,25,88,199,159,178,228,236,86,80,233,185,177,106,149,179,198,190,122,186,79,93,103,112,147,203,212,147,33,115,199,203,92,241,186,237,76,40,27,205,172,89,146,201,130,153,35,170,79,85,84,90,52,151,45,183,131,149,136,101,69,137,157,209,27,139,220,49,31,227,210,213,230,23,2,77,244,41,195,21,232,122,244,39,9,250,178,50,67,67,130,39,90,90,8,210,244,167,76,131,7,190,47,130,245,151,186,201,222,170,245,80,176,58,110,2,243,226,129,115,204,190,233,225,181,217,20,241,100,181,231,242,20,166,25,199,19,128,89,85,31,108,40,15,189,171,47,185,122,158,40,115,100,73,165,27,79,242,232,213,248,122,175,24,222,138,70,74,25,13,128,134,54,18,203,106,113,55,94,17,156,54,242,244,42,42,105,75,44,215,138,104,251,92,162,54,
+158,164,34,161,178,232,1,171,46,163,1,167,90,36,160,53,44,177,126,115,124,216,72,55,188,55,66,31,186,176,112,209,252,51,138,160,39,32,16,230,236,204,116,171,158,10,138,93,207,85,41,131,118,61,81,241,89,141,81,96,232,15,87,76,20,27,214,17,195,100,142,209,163,168,205,191,100,47,206,197,51,2,68,10,73,131,118,54,179,155,56,180,216,74,226,135,80,209,130,152,195,153,230,25,228,139,169,90,105,216,59,225,36,215,222,155,102,37,58,158,200,114,205,135,4,70,78,36,213,74,244,228,57,154,175,34,231,245,190,200,117,204,144,154,177,5,154,43,155,96,27,87,150,232,119,147,236,26,80,73,150,150,124,38,114,165,20,35,120,131,139,146,75,37,49,38,34,140,9,81,47,193,182,47,204,167,151,97,9,75,208,200,144,162,4,83,6,217,10,70,170,235,62,142,104,160,87,221,208,76,26,17,57,95,105,32,55,42,234,180,74,210,11,196,158,187,170,105,98,150,132,18,133,178,88,159,213,241,48,246,71,98,77,31,73,209,196,137,53,206,130,135,198,33,3,138,
+40,194,159,92,5,140,70,222,194,106,106,71,44,12,202,172,196,178,222,204,139,212,225,81,81,160,216,103,74,60,87,55,20,109,150,142,5,134,101,214,42,205,237,135,200,114,210,81,0,69,102,1,50,160,177,199,4,12,185,187,250,184,42,23,0,150,148,38,221,224,8,226,136,254,137,57,24,72,48,129,141,63,95,104,88,10,221,241,200,221,153,101,17,116,109,53,50,143,150,26,196,148,125,221,121,40,219,50,88,178,97,82,34,118,106,49,185,89,159,190,190,105,203,182,3,148,49,111,120,18,84,216,165,64,22,193,150,166,176,39,194,155,50,247,105,209,10,156,211,35,134,180,184,171,68,77,58,216,144,123,169,152,74,102,25,195,163,65,114,187,246,109,230,230,26,207,106,189,211,31,225,87,228,241,50,220,108,205,204,251,27,131,90,124,34,189,89,149,91,199,177,16,181,47,39,135,179,62,148,99,204,189,112,163,147,252,32,253,28,114,230,210,154,252,5,62,65,95,88,89,96,179,169,235,114,35,53,99,251,247,153,136,229,234,225,196,203,246,60,249,68,45,82,114,169,41,
+45,149,107,171,241,34,52,170,23,90,66,132,35,114,53,20,28,13,3,34,198,188,227,63,239,86,55,245,100,247,82,52,245,147,155,235,237,131,176,228,95,88,250,154,101,244,232,82,29,148,248,182,201,106,87,9,179,164,162,23,155,35,81,76,170,234,18,97,151,146,59,225,170,30,147,77,145,152,9,61,122,235,37,38,147,143,3,195,227,102,52,200,248,68,43,187,118,195,222,26,174,185,170,70,38,123,91,166,135,203,12,119,222,95,211,164,83,0,114,238,235,136,125,135,230,4,204,209,2,248,92,163,27,213,5,68,79,233,236,166,190,53,247,151,128,196,232,189,83,78,169,137,243,184,255,70,0,223,60,177,144,103,4,220,134,103,120,154,100,233,73,83,61,227,1,34,225,205,44,83,17,233,23,225,135,50,41,218,96,75,249,166,52,95,213,88,116,171,201,196,90,9,60,18,151,24,161,32,226,5,212,213,121,203,46,92,86,149,201,137,251,54,92,161,85,54,83,187,155,165,183,83,125,6,218,92,179,186,49,143,30,243,248,76,9,57,46,239,161,213,74,43,235,158,42,12,
+187,42,62,177,247,80,182,23,58,57,215,39,253,132,132,197,16,91,63,220,137,45,199,128,185,188,104,227,196,213,130,38,98,64,201,232,106,216,3,228,222,116,68,123,170,153,142,197,150,230,81,28,150,155,62,153,148,55,229,97,171,31,25,58,149,162,109,250,222,4,208,163,43,156,136,18,10,42,245,67,150,134,82,33,122,110,92,128,48,104,90,48,28,249,196,82,150,175,182,245,107,47,201,82,221,114,136,2,216,212,67,137,72,146,238,104,187,81,26,15,61,167,123,233,199,202,248,34,28,181,228,177,107,168,203,174,208,209,85,241,59,74,136,107,138,87,84,19,122,214,59,162,82,6,179,124,225,38,226,168,153,144,237,8,79,214,149,244,102,15,166,241,54,52,105,164,83,226,172,143,117,134,184,137,81,21,233,245,24,153,20,48,205,173,124,135,230,97,1,120,117,84,105,185,40,232,81,125,73,69,63,2,80,181,88,225,88,37,71,199,69,103,77,123,38,45,92,104,152,93,68,167,211,138,97,174,149,174,108,10,83,107,121,103,218,163,1,229,52,226,193,57,211,143,58,213,
+153,217,210,244,223,232,56,55,172,40,43,115,57,159,122,194,195,164,133,87,1,88,20,111,127,56,94,107,148,18,182,127,101,194,59,178,138,238,162,213,56,169,58,247,5,227,236,186,105,49,13,15,35,212,167,171,227,155,170,184,96,209,159,38,214,41,170,165,18,229,27,236,97,14,249,52,252,192,103,197,53,39,230,236,163,156,147,212,16,137,139,170,1,33,89,118,59,50,254,88,84,232,19,186,235,141,188,121,156,138,178,69,1,35,189,196,63,22,0,179,225,250,176,190,151,37,179,226,81,113,117,197,97,242,35,229,77,114,229,150,109,124,190,81,154,14,181,88,67,71,190,216,68,172,46,229,183,194,226,133,97,137,175,39,228,58,75,29,179,50,212,197,1,198,126,197,219,189,104,161,7,158,27,249,137,100,216,13,77,54,77,114,76,48,70,136,92,138,245,99,198,40,34,82,79,106,60,247,72,66,77,186,101,174,66,102,97,161,99,194,134,214,5,93,5,129,48,157,112,225,228,122,230,57,175,70,6,94,237,249,100,219,238,15,18,64,51,77,215,245,182,143,202,9,204,33,
+76,105,41,88,140,208,188,93,76,47,230,4,98,35,90,153,96,1,33,117,51,190,137,26,204,250,102,206,98,28,13,239,176,151,75,210,99,175,81,206,221,57,27,202,179,90,53,26,200,180,221,143,215,204,195,6,219,137,13,115,212,211,101,109,134,101,234,248,217,44,78,92,146,146,243,21,198,181,79,88,184,33,52,116,243,107,30,221,106,76,83,163,201,101,33,190,117,90,121,130,245,70,164,60,228,140,233,237,203,76,251,80,77,148,237,147,39,174,104,159,248,100,149,50,143,231,145,54,34,222,139,45,30,4,1,99,72,8,52,52,55,51,42,202,116,126,68,117,197,85,226,144,190,222,176,91,56,193,3,237,18,147,42,232,253,57,200,45,70,154,176,155,58,173,53,79,181,240,176,100,163,169,91,35,90,167,20,145,214,185,94,16,243,179,77,32,144,114,235,116,168,112,9,116,199,120,45,131,188,180,108,61,241,181,205,177,151,217,184,175,77,129,212,168,178,95,164,22,237,99,218,227,221,3,191,114,183,145,137,56,147,19,158,188,22,96,107,88,55,38,205,19,143,180,50,46,
+60,101,252,99,32,180,204,174,208,171,82,219,26,93,207,195,121,191,24,171,198,119,1,201,53,103,44,106,220,60,74,38,204,217,24,75,79,47,48,128,77,211,88,51,42,75,50,57,120,20,29,175,185,123,201,74,102,60,212,175,195,217,252,82,2,176,115,176,243,1,139,144,104,204,206,207,55,114,27,25,160,197,215,201,208,184,79,32,73,134,249,22,218,163,50,108,108,40,247,38,254,4,48,165,17,37,232,148,215,229,201,117,213,224,232,38,209,132,145,237,116,86,231,223,138,173,99,22,211,108,229,79,54,214,170,132,136,213,233,7,3,136,17,191,140,24,67,34,98,26,80,138,231,103,13,39,42,119,67,213,68,76,113,198,237,101,199,34,91,36,7,150,139,202,0,72,30,62,145,53,146,149,161,189,29,78,244,135,228,104,122,30,83,205,206,178,134,78,77,178,225,123,244,114,1,214,105,112,8,55,69,209,146,4,92,142,136,148,163,178,209,193,52,224,217,242,5,208,72,137,83,126,74,111,69,222,228,185,85,70,37,202,194,50,46,6,36,198,184,165,219,198,23,123,222,161,
+175,27,114,75,234,135,247,138,14,64,20,83,123,157,108,224,98,157,169,50,246,46,6,60,238,2,45,239,92,87,71,140,32,53,177,164,109,39,146,60,125,64,230,69,5,169,8,202,140,147,79,231,135,107,181,53,212,27,52,18,177,204,148,64,117,205,166,250,129,56,235,157,120,238,123,190,164,118,192,204,86,108,231,54,219,120,234,61,71,107,183,199,237,241,109,114,94,231,82,37,106,63,58,232,128,115,139,112,38,186,236,116,43,112,118,111,177,169,95,63,105,182,138,150,131,91,14,23,135,2,126,230,148,62,74,226,12,146,187,39,168,161,127,173,185,227,79,248,213,27,222,200,227,213,227,183,87,230,42,158,214,175,54,99,199,102,186,108,213,28,71,166,43,187,240,108,105,242,55,13,98,173,210,83,77,54,148,105,190,160,154,144,148,163,219,73,37,178,110,172,206,253,224,251,6,93,239,237,122,232,219,199,85,100,145,229,240,149,189,235,65,7,133,175,87,202,242,131,213,161,164,178,236,174,120,177,142,155,66,48,138,153,51,156,178,38,98,245,103,57,8,100,115,113,180,101,
+250,251,153,181,101,98,184,203,13,167,104,227,10,185,141,119,55,137,81,123,156,48,197,100,71,3,79,170,227,151,88,150,141,139,240,197,85,183,149,230,130,17,179,234,114,177,152,22,183,66,83,236,197,138,26,73,137,152,137,143,155,211,58,209,146,189,148,10,176,60,227,131,195,15,230,155,250,92,50,197,68,49,19,241,245,36,133,213,241,239,9,141,99,4,31,29,37,35,80,38,101,205,142,26,159,202,171,57,187,156,150,167,185,48,162,30,95,15,209,49,145,157,241,12,74,160,209,45,211,249,62,125,201,234,106,203,12,223,52,173,146,206,227,92,58,50,67,125,160,44,250,164,60,249,182,205,92,64,67,242,210,181,145,105,247,231,211,27,84,197,111,53,77,79,87,97,116,124,30,150,48,99,142,109,185,169,202,152,235,109,129,80,55,95,153,34,233,165,133,163,210,203,235,130,3,125,186,42,152,176,46,135,201,113,7,192,101,79,76,169,107,83,143,195,139,236,3,5,113,34,228,163,3,167,20,53,98,17,19,8,35,208,3,101,35,89,89,87,186,52,108,39,157,26,100,153,
+100,75,255,46,25,35,103,135,99,238,220,7,204,12,128,134,26,211,174,138,117,75,214,243,216,17,6,182,252,169,120,190,185,233,87,5,129,153,199,24,49,1,245,20,172,31,157,107,44,233,104,121,190,189,123,120,164,7,36,25,145,121,94,145,96,233,9,149,201,171,210,111,19,237,5,109,201,231,60,93,152,6,178,246,196,223,8,240,196,14,13,18,67,207,23,53,149,230,74,106,23,63,145,129,17,57,139,72,45,143,140,113,202,44,39,116,241,41,23,246,197,241,70,206,224,64,152,240,240,86,103,106,155,215,113,47,249,184,214,229,142,240,179,245,33,138,106,209,167,215,79,246,109,69,175,247,55,16,215,65,137,221,187,93,215,42,25,182,55,97,57,25,80,76,249,72,82,239,13,217,133,48,243,58,54,199,13,39,240,205,4,146,59,189,141,176,21,183,231,132,84,162,7,115,89,248,234,158,230,78,40,152,42,5,4,204,163,172,230,12,113,228,60,140,108,77,0,130,84,187,64,208,183,183,248,192,195,72,48,52,107,99,231,138,160,158,176,164,46,253,141,173,149,110,72,203,
+184,205,83,220,254,114,114,121,154,209,30,121,116,45,15,254,158,191,105,196,230,20,51,96,37,110,73,84,200,89,19,114,44,130,233,246,117,19,5,252,14,166,209,158,174,67,142,139,80,143,150,154,216,121,93,140,30,45,57,47,179,97,19,105,39,205,244,108,102,100,189,21,52,175,60,47,202,54,82,19,51,19,119,18,105,243,122,222,163,99,149,185,226,194,145,134,61,36,171,132,203,164,111,49,248,59,62,124,91,117,64,158,150,185,129,56,147,90,86,24,48,19,10,59,137,196,90,251,16,8,1,199,185,130,77,111,200,88,163,104,180,9,196,153,56,8,228,2,34,196,64,110,33,161,189,40,18,2,113,92,65,5,48,200,237,169,29,18,129,66,206,30,174,142,162,93,196,110,192,210,177,131,47,81,85,85,48,206,4,87,88,39,10,161,248,234,33,167,128,153,33,16,255,126,188,241,112,178,212,54,117,142,40,54,60,140,67,32,183,40,181,55,74,78,171,234,58,135,175,114,252,60,50,65,117,132,29,61,36,246,72,108,168,221,157,43,49,247,186,25,156,28,235,109,50,65,
+159,182,132,78,160,43,136,238,104,170,210,135,98,121,253,67,116,95,153,185,12,5,175,4,50,115,67,22,87,151,25,248,122,180,104,165,128,244,148,174,204,209,46,213,226,202,140,121,99,89,4,177,24,213,106,227,169,175,62,65,154,102,80,200,137,61,218,168,244,150,212,86,215,192,32,201,210,161,105,196,209,64,120,238,66,89,167,115,164,185,64,72,18,16,8,46,197,214,74,245,37,124,188,151,134,58,164,156,246,17,96,10,81,132,19,60,149,124,9,129,148,46,88,34,48,231,23,164,50,210,100,72,96,132,144,79,239,205,183,208,56,198,109,236,67,32,179,3,11,75,114,251,164,233,104,46,35,92,98,24,197,58,199,35,6,22,73,60,211,46,39,49,106,87,216,46,130,90,148,224,43,241,254,158,44,2,163,96,71,185,35,8,132,21,20,177,176,100,75,106,98,146,70,175,4,85,139,11,38,128,45,32,16,36,37,18,80,232,148,11,36,250,156,147,237,201,33,144,179,1,220,122,210,128,64,32,171,189,232,37,168,131,157,10,28,160,14,112,169,117,150,19,246,64,33,16,
+248,209,57,54,26,216,21,4,160,207,15,133,152,179,3,188,74,125,218,53,173,10,75,35,209,127,110,194,75,245,137,189,179,251,153,141,216,198,159,38,5,135,2,206,129,97,15,46,41,85,3,83,10,123,116,180,91,32,198,251,113,108,75,106,124,119,123,13,141,103,66,167,232,22,3,134,241,35,189,165,75,185,235,129,108,53,90,47,244,101,120,159,54,232,14,23,204,177,223,189,143,141,168,182,201,174,254,73,158,209,213,125,214,78,84,208,158,177,248,4,153,40,62,213,236,91,104,15,106,2,251,164,159,229,173,235,54,148,104,50,149,221,183,195,230,108,202,142,187,223,39,172,140,29,23,19,163,143,90,143,17,73,70,210,196,231,51,35,101,199,137,146,52,68,200,108,210,232,212,40,59,73,61,152,143,47,111,233,190,132,59,27,171,149,151,247,66,140,220,129,201,158,185,79,35,177,142,164,26,178,6,30,138,186,35,142,48,210,189,142,44,132,93,181,74,63,43,41,7,75,88,31,30,35,105,227,124,143,182,167,32,158,230,236,178,70,231,34,65,163,48,207,12,25,168,188,
+13,164,55,89,60,65,197,220,39,171,29,234,235,112,127,33,97,200,181,180,28,252,64,136,159,221,7,154,234,72,166,25,100,11,156,62,6,243,32,145,81,238,121,129,169,62,213,225,225,185,208,186,251,202,111,94,67,173,93,7,79,117,115,214,9,33,110,84,221,232,116,125,239,44,59,15,207,242,7,115,233,124,236,182,33,39,167,61,117,135,171,127,108,232,15,40,129,124,166,94,139,24,59,227,84,99,164,17,137,79,143,125,33,135,92,243,32,237,250,18,180,20,15,141,41,28,52,89,109,0,19,94,209,228,43,215,65,3,175,150,10,186,162,71,196,73,72,159,39,240,151,182,168,38,137,107,8,40,169,108,13,34,72,97,2,170,12,184,88,218,139,139,50,113,171,218,101,69,77,161,234,189,136,37,203,223,19,214,146,210,107,248,161,218,8,106,81,237,24,249,122,124,133,44,205,77,61,53,199,253,235,226,125,12,201,227,169,76,169,118,192,145,167,102,220,254,75,65,28,54,108,40,112,241,140,125,82,118,247,114,107,118,76,190,58,177,226,164,240,192,106,213,175,60,48,71,
+253,99,21,169,209,143,53,46,220,249,107,206,144,164,19,129,111,174,152,213,121,105,38,17,239,231,138,183,66,255,205,172,105,106,165,50,237,217,67,181,112,7,44,253,231,136,200,73,250,80,49,94,240,92,90,149,62,188,157,10,12,132,115,153,185,84,50,56,55,8,88,200,77,164,164,38,230,19,203,197,62,175,157,78,89,61,237,101,20,177,71,58,230,228,240,94,64,154,19,156,104,60,154,92,231,65,95,177,223,185,224,214,61,236,60,58,143,56,7,252,123,203,8,88,179,7,44,97,68,201,188,27,24,241,215,149,73,210,21,154,55,202,151,60,82,171,185,206,21,50,186,85,195,2,175,195,195,90,39,78,85,170,18,233,252,7,6,158,16,157,22,104,155,185,34,195,33,228,16,227,214,37,193,79,181,134,159,164,2,233,221,146,73,194,107,35,229,71,89,84,21,200,202,77,210,160,255,216,184,4,87,59,245,248,124,124,153,59,154,106,189,92,254,206,252,31,227,135,246,205,70,57,83,156,133,115,227,93,229,201,134,231,1,16,167,106,189,181,109,160,239,58,31,49,111,57,
+99,42,122,237,128,177,19,7,160,71,62,21,102,50,61,232,145,105,220,51,42,94,65,251,207,168,8,137,72,119,168,120,219,128,156,65,112,92,101,20,128,61,143,139,57,115,136,186,177,67,198,193,25,235,25,32,225,80,16,83,119,144,250,217,159,71,224,106,16,14,98,183,18,125,52,118,202,237,81,100,112,243,61,67,123,224,128,64,0,247,186,194,137,161,35,42,96,83,3,50,103,2,234,76,112,22,14,71,29,153,145,17,22,145,179,20,74,169,123,98,192,206,206,221,227,60,4,39,220,180,68,98,3,189,69,10,136,131,73,19,7,185,206,21,177,89,81,182,127,140,84,220,218,17,16,28,168,66,105,77,165,50,73,58,134,156,138,203,67,55,104,83,249,164,156,220,155,202,204,178,166,85,138,102,181,105,152,132,50,108,53,28,70,102,14,152,146,166,217,247,222,194,145,30,237,226,41,12,69,33,219,35,236,125,141,38,95,28,48,202,104,107,80,2,185,61,40,91,162,18,141,246,161,30,205,94,156,211,24,185,212,86,88,234,236,157,80,58,202,72,151,199,75,245,181,88,
+154,161,116,11,231,70,173,5,98,32,92,185,196,3,62,26,38,88,167,148,234,124,44,36,87,138,52,228,226,9,30,29,209,73,239,20,202,214,162,185,70,176,19,13,53,49,147,200,168,42,90,143,215,186,84,156,193,33,65,246,66,32,168,182,139,202,196,212,174,182,182,159,98,133,198,216,45,58,65,233,73,84,74,110,25,85,71,201,84,94,56,136,124,10,118,150,82,221,197,18,12,98,163,171,40,73,179,246,58,177,139,81,87,70,62,155,98,20,250,80,251,126,196,229,69,201,88,6,198,5,157,119,1,171,25,23,69,158,241,131,237,21,25,63,231,247,31,242,140,114,180,233,41,98,242,234,101,98,220,86,177,14,78,53,2,113,93,159,204,186,58,114,125,187,208,217,118,48,252,118,94,206,84,105,103,52,49,230,56,130,58,55,200,238,3,108,72,245,86,166,90,172,151,192,58,234,243,52,125,167,23,28,84,41,27,205,196,60,6,198,56,90,137,69,79,69,247,86,131,161,19,247,31,138,58,227,160,23,89,247,26,16,214,219,22,150,60,140,56,218,174,218,226,94,26,39,
+46,24,176,14,181,80,136,32,32,183,206,198,147,56,229,156,199,18,214,153,29,123,11,57,16,137,39,113,151,185,204,72,50,29,120,99,7,2,71,69,233,141,91,160,167,133,225,246,133,39,171,145,4,2,193,214,148,160,181,65,112,122,174,35,202,158,142,6,51,208,40,207,109,156,8,130,176,235,219,85,219,75,128,88,191,7,23,221,9,151,88,203,44,139,8,211,106,146,203,157,193,23,240,230,222,157,1,49,137,62,216,26,224,204,124,22,53,159,15,51,72,38,80,120,106,240,186,49,164,53,2,90,253,10,59,39,128,110,133,100,92,52,215,227,212,125,3,181,150,163,244,23,87,9,221,62,51,148,188,59,59,241,10,110,74,97,39,206,79,31,12,167,47,97,33,98,87,177,41,57,253,19,127,93,22,23,36,133,99,182,9,158,75,145,213,193,198,106,74,134,61,117,154,38,167,42,28,186,56,192,227,45,56,118,172,125,21,182,170,171,2,89,16,213,141,170,200,50,86,68,215,189,145,249,39,225,40,62,70,156,47,204,120,1,172,165,191,229,196,153,86,27,101,192,31,38,
+219,42,189,54,139,58,46,223,108,146,25,33,11,41,171,29,155,31,61,208,99,193,99,120,120,148,94,52,110,172,243,73,185,122,192,213,37,82,249,154,71,221,162,203,105,252,246,34,153,141,169,210,152,179,115,218,209,124,238,83,55,152,169,70,162,145,118,28,234,134,17,209,165,36,235,81,31,24,250,225,189,24,41,140,30,207,53,250,102,23,117,162,78,250,18,230,4,252,200,186,135,158,131,216,62,177,33,163,119,78,17,220,60,20,160,178,137,218,253,61,38,122,36,207,196,147,102,210,34,126,42,146,149,215,141,171,125,109,39,52,97,169,238,238,78,69,250,187,39,220,101,124,7,232,168,199,23,64,63,93,130,128,158,104,8,230,7,93,195,24,47,51,168,122,241,103,36,207,88,81,207,72,222,150,234,247,74,139,251,64,134,221,58,172,231,248,102,247,14,196,155,99,217,66,92,66,147,78,213,226,141,11,138,116,52,212,11,166,106,173,131,71,78,46,221,49,16,167,102,67,110,28,163,79,161,17,201,21,84,181,120,172,25,5,176,71,15,201,67,122,120,234,109,98,227,132,
+90,223,39,138,253,21,213,227,157,98,23,231,111,188,13,58,35,80,52,68,8,36,84,183,125,41,16,208,197,57,145,152,22,219,253,110,25,213,244,30,205,145,243,51,132,67,80,165,117,136,199,241,253,70,73,45,138,51,175,246,139,186,186,246,4,126,88,185,44,85,35,116,15,83,133,71,11,12,71,183,151,40,30,61,77,113,9,35,154,110,27,41,13,81,16,204,189,209,0,84,101,103,118,53,60,18,118,76,235,43,28,143,166,184,197,249,175,88,19,4,111,38,9,171,247,52,250,179,132,186,227,130,139,48,103,247,112,27,53,11,11,27,237,215,121,132,90,15,218,103,21,3,204,231,225,130,207,15,237,239,236,205,70,109,81,54,100,252,206,62,17,120,67,191,51,6,115,36,208,154,81,96,170,121,4,41,145,164,32,226,222,58,14,159,1,116,15,254,2,160,247,47,240,43,208,190,192,47,148,242,2,191,144,91,28,55,7,46,63,216,195,239,86,57,14,113,207,171,28,37,131,80,188,177,208,213,151,208,94,8,10,185,69,114,142,139,227,182,166,180,111,78,230,134,9,138,
+219,136,67,134,246,39,56,40,68,255,112,168,142,198,234,55,140,147,168,156,73,4,143,10,212,224,160,55,246,78,51,245,61,22,16,37,233,135,87,103,205,168,1,69,244,152,84,41,116,115,44,200,159,31,209,148,204,75,47,36,232,67,98,33,16,102,121,223,32,72,137,114,162,248,72,148,176,42,19,97,110,12,97,157,93,166,78,71,202,171,78,40,40,60,203,49,32,16,253,62,32,162,116,146,46,249,30,103,59,75,18,245,42,253,170,117,95,114,34,208,48,200,158,149,171,136,103,200,99,193,89,199,215,49,24,168,33,129,21,100,42,87,63,222,139,106,116,123,149,88,78,220,234,218,192,145,30,161,208,49,73,117,205,113,192,221,108,152,25,80,65,40,180,7,38,211,189,245,211,102,44,176,245,219,212,193,145,211,195,213,91,41,109,76,48,72,158,173,10,132,40,131,5,85,165,165,181,36,4,114,207,58,153,231,129,71,16,49,198,222,105,99,121,106,190,104,54,14,121,135,171,248,238,63,255,222,147,20,115,39,238,206,207,242,253,219,243,29,216,128,88,131,220,129,13,56,
+77,114,110,115,54,16,23,211,125,245,99,199,13,198,201,227,75,37,116,167,74,182,141,84,48,33,129,21,74,98,187,86,198,240,209,156,11,7,63,4,180,23,80,166,109,201,205,143,225,27,48,198,34,86,171,57,189,3,243,239,22,36,65,229,15,134,85,67,16,163,229,226,4,130,35,58,158,89,12,158,103,224,24,188,213,184,75,61,21,117,229,185,69,2,36,198,221,83,126,52,64,144,86,245,19,78,206,139,108,52,149,233,187,85,132,209,167,112,58,173,229,35,41,153,106,119,10,184,228,218,68,208,236,159,221,83,236,155,74,86,195,241,35,153,117,183,211,38,50,167,50,206,244,44,90,54,11,180,169,220,75,122,185,148,191,164,151,103,202,16,8,16,237,9,237,128,153,150,56,7,196,45,90,36,86,31,197,71,206,6,112,205,117,18,175,175,165,58,132,88,21,57,91,109,151,131,33,158,33,108,63,72,149,92,181,47,129,238,135,71,166,110,132,39,243,208,56,71,120,44,97,79,126,54,0,233,76,68,117,34,187,73,116,76,215,98,206,53,250,184,40,186,236,39,38,252,
+206,195,77,240,240,33,84,8,39,35,184,204,180,22,161,173,162,169,135,62,237,38,89,171,164,246,143,6,46,146,21,231,42,129,171,197,238,90,16,208,223,107,137,181,123,193,97,179,48,142,166,168,222,126,11,215,39,139,233,242,71,149,218,203,188,195,197,102,38,253,64,133,162,97,32,89,182,137,229,132,91,175,29,249,40,144,228,114,202,156,145,157,231,159,8,253,29,149,60,18,197,1,250,201,37,42,220,177,21,15,198,69,68,138,133,144,12,224,201,163,232,218,214,112,30,224,155,231,150,173,220,204,229,193,216,51,231,96,77,108,73,34,119,124,133,197,104,197,63,234,123,87,203,30,152,44,70,111,213,106,9,249,25,161,20,96,176,235,138,159,172,147,42,1,196,107,101,68,54,189,94,103,135,51,214,41,69,16,184,7,161,103,12,98,207,14,122,52,32,246,128,208,131,47,69,93,184,52,86,177,152,240,92,179,206,248,242,206,100,51,212,31,26,60,20,111,38,112,142,185,122,63,90,69,52,42,187,145,43,103,205,250,80,47,64,105,39,234,156,126,144,34,193,23,92,61,
+148,146,37,93,59,115,173,251,209,253,193,94,224,30,185,50,54,138,58,91,88,158,31,187,78,24,228,46,8,64,51,171,176,19,121,1,32,61,226,5,128,122,157,23,0,10,173,95,0,40,232,127,1,160,86,248,5,128,48,157,23,0,82,216,94,0,232,40,255,2,64,102,204,11,0,21,161,47,0,116,37,220,146,31,205,101,227,45,24,118,112,151,154,130,61,179,123,241,178,33,46,200,160,27,64,238,69,193,103,84,193,75,33,207,168,18,103,30,239,146,185,129,231,250,100,7,71,39,208,31,243,57,198,11,28,65,142,95,224,8,119,246,2,71,120,235,11,28,149,137,164,245,94,151,179,15,161,129,239,156,127,9,175,164,47,105,98,35,48,102,73,245,1,248,134,112,184,56,225,244,144,202,41,50,174,90,143,163,232,123,118,59,190,181,150,206,144,245,224,101,239,138,193,92,29,85,198,79,83,146,205,218,216,200,176,0,170,38,5,114,227,121,237,148,175,224,249,183,131,91,10,226,182,154,209,152,246,78,143,157,219,150,149,45,122,112,156,76,25,77,243,177,253,188,183,189,
+202,141,1,104,164,180,62,22,138,177,162,114,230,190,232,240,72,214,218,206,232,206,73,20,76,171,27,165,103,163,172,79,183,48,197,209,147,147,209,53,208,43,157,32,152,99,54,27,115,161,190,86,149,197,30,158,28,205,232,105,151,188,178,156,74,245,221,219,6,197,188,31,37,35,55,110,5,159,123,125,189,38,198,74,234,59,24,96,94,103,23,18,214,2,77,186,30,157,121,123,253,171,251,186,117,101,217,174,189,138,192,86,239,28,4,111,27,102,24,76,176,164,196,51,172,199,40,117,125,227,23,140,6,254,124,16,75,183,156,11,162,22,69,13,77,123,122,44,234,34,117,73,146,203,238,31,7,179,243,178,6,239,70,238,69,167,204,120,166,235,186,109,12,122,68,81,39,173,99,11,89,74,232,124,117,152,88,207,171,164,166,94,173,111,143,11,51,75,255,94,58,18,145,115,129,241,25,36,2,242,200,18,99,163,13,23,231,228,188,27,237,54,155,232,227,141,88,200,34,91,12,197,165,72,124,117,196,25,48,88,183,42,61,254,200,31,214,240,16,78,253,102,41,51,106,96,
+2,15,71,181,8,166,154,77,120,175,51,222,70,73,164,251,220,109,3,131,224,242,183,40,119,9,58,22,214,73,81,13,154,32,20,131,140,187,154,213,49,137,84,60,185,53,132,35,88,102,19,115,44,77,46,32,53,17,171,37,97,212,218,135,178,244,68,66,108,11,246,234,231,117,247,189,31,185,155,62,158,86,42,188,131,92,166,97,242,249,208,121,184,63,200,231,27,102,205,113,39,14,101,214,35,75,138,103,196,65,52,120,109,85,49,58,12,155,192,252,149,51,104,153,143,5,38,239,82,165,229,210,163,26,188,113,6,151,88,148,180,94,110,108,155,43,163,221,134,177,81,144,36,9,142,212,149,96,93,236,242,193,188,63,190,152,57,174,147,84,125,60,153,49,147,249,134,82,170,223,40,192,154,221,135,89,63,61,146,88,177,206,168,212,43,208,210,246,235,89,76,212,119,20,74,152,234,201,160,56,162,139,180,153,48,54,122,153,32,58,207,8,82,189,49,41,96,155,82,143,57,206,200,40,55,101,4,162,88,164,143,232,82,162,150,69,73,202,121,196,42,164,198,38,71,156,
+36,79,66,141,189,102,50,194,86,220,212,107,170,219,32,203,151,230,96,237,61,215,33,36,26,40,28,121,249,37,103,115,204,65,35,87,138,61,150,39,10,242,228,11,235,179,96,128,239,82,20,17,205,117,136,9,197,183,207,35,190,112,195,223,196,238,163,4,41,147,226,40,148,179,23,247,226,116,108,42,211,84,20,199,83,159,93,154,241,48,157,130,163,84,70,189,72,104,142,171,69,51,111,73,237,210,236,164,82,1,180,116,101,60,106,89,213,32,64,144,68,112,223,4,151,10,122,118,166,209,79,169,71,21,152,88,212,29,95,141,184,253,70,134,140,244,157,71,244,119,221,152,38,2,190,205,25,199,76,240,21,125,159,87,222,207,159,204,5,40,74,167,233,41,137,196,157,153,136,252,172,112,216,194,10,27,111,172,129,135,75,129,173,3,103,47,129,199,124,166,129,196,60,205,221,246,225,137,132,39,56,107,37,107,17,159,89,18,23,109,18,153,43,3,39,189,191,126,186,110,103,247,232,50,42,198,91,148,194,169,38,148,84,165,87,139,209,187,95,181,52,36,222,168,143,224,
+17,64,59,90,66,245,52,203,89,21,207,139,156,79,170,106,208,160,198,176,177,106,32,61,108,197,187,143,206,120,66,89,13,106,57,73,107,144,172,38,38,212,11,147,93,99,98,131,48,236,139,77,42,18,107,220,139,228,221,235,19,153,93,127,57,68,69,187,0,30,169,107,218,54,122,120,172,185,131,70,82,229,80,210,36,86,231,143,200,35,175,226,230,73,211,165,70,251,152,169,32,198,141,241,74,121,190,193,81,208,89,4,225,43,128,119,112,108,206,66,15,25,228,96,22,77,154,11,60,180,51,106,20,41,175,137,178,165,48,115,122,178,144,83,183,217,8,169,217,152,237,249,193,181,209,39,221,158,176,146,55,10,68,37,20,198,66,165,237,237,251,154,228,100,161,152,204,40,153,227,137,195,167,227,198,236,132,134,249,147,221,55,110,30,182,33,22,108,147,180,101,152,91,131,104,220,25,211,28,222,235,112,146,74,67,205,219,99,54,31,204,118,59,81,116,79,207,140,151,162,141,16,84,173,47,208,65,135,143,137,34,130,66,249,228,118,151,158,70,136,39,214,45,34,50,92,
+32,66,13,180,238,64,216,41,230,198,71,160,93,99,99,27,234,17,212,152,50,221,68,73,5,42,99,85,41,94,63,182,170,50,97,135,35,213,3,88,104,100,199,250,164,5,136,119,126,36,128,90,164,243,3,33,235,234,236,242,34,199,129,90,128,51,221,94,180,1,180,220,89,198,110,135,94,156,204,99,67,35,208,26,163,85,19,153,57,165,76,114,231,212,183,0,165,183,130,131,239,131,10,107,52,162,110,5,90,75,70,94,211,74,19,161,247,141,24,106,211,244,197,162,18,195,65,12,190,177,149,56,100,137,121,113,33,196,220,22,249,123,79,81,233,70,134,2,182,88,66,190,52,155,14,200,18,172,190,202,127,16,11,253,200,130,175,223,156,128,155,174,74,186,18,57,139,51,158,222,68,248,246,185,223,9,129,92,106,83,154,205,40,135,37,209,78,44,179,134,170,74,66,154,250,171,161,103,72,219,36,185,132,199,42,248,74,167,113,244,213,197,14,198,114,7,130,99,133,24,99,109,12,32,124,13,104,172,221,243,50,246,142,127,15,72,48,16,92,41,22,155,68,34,50,211,
+165,81,158,228,61,74,26,39,0,132,196,43,201,138,190,19,228,33,227,104,110,223,253,30,129,163,130,248,127,173,74,159,117,173,190,71,74,77,239,39,98,236,127,246,59,197,46,155,219,5,30,196,193,75,224,57,61,172,140,205,187,111,16,7,124,23,130,16,23,47,137,246,231,223,57,66,207,235,131,162,173,152,97,162,58,54,104,147,172,223,153,24,13,13,120,57,216,105,129,171,174,112,164,251,122,76,228,205,166,214,222,114,75,132,209,28,223,241,187,179,187,66,86,183,106,202,176,219,153,38,206,244,90,123,178,107,81,162,168,138,179,216,108,76,141,90,204,177,55,76,19,220,188,241,249,171,225,172,16,158,153,119,112,236,205,65,85,145,169,86,35,228,102,203,169,179,20,163,168,109,197,211,226,67,32,62,200,125,111,155,37,37,33,177,159,84,178,254,247,255,234,229,118,206,79,107,101,191,255,126,119,69,227,229,238,202,155,119,95,239,170,139,223,188,254,234,155,87,207,101,178,187,98,237,215,223,126,251,254,135,15,175,254,240,254,247,207,5,248,224,244,93,169,248,75,241,
+254,111,222,127,251,245,155,239,95,253,240,205,251,15,187,114,232,143,223,60,79,251,225,245,187,143,207,85,245,95,127,253,233,62,206,23,191,248,241,70,207,115,181,241,47,94,189,253,248,230,187,87,223,189,254,195,174,200,250,227,174,216,250,249,62,193,239,190,125,217,230,199,219,26,31,222,188,84,223,191,249,221,235,239,159,11,181,159,203,254,63,188,249,238,237,87,239,191,125,255,238,195,159,148,79,127,42,243,254,89,193,240,219,15,159,107,134,127,245,169,106,123,183,255,115,77,251,110,235,31,175,107,60,151,234,131,204,254,225,87,207,227,95,189,255,221,238,150,194,111,118,5,206,207,245,230,111,254,113,119,51,225,243,174,187,18,239,31,47,54,125,249,230,55,187,154,237,221,238,63,59,122,55,233,211,217,63,47,40,254,92,84,253,111,254,172,48,252,243,237,147,247,159,22,126,226,230,211,211,31,47,115,253,172,204,249,243,165,132,191,253,203,85,216,191,254,92,134,253,124,59,232,185,88,250,243,37,134,255,240,230,135,95,239,238,207,124,124,255,238,147,166,192,77,158,137,
+218,93,77,120,243,195,159,239,241,92,37,255,114,45,234,231,178,255,73,141,244,255,248,47,255,238,159,253,139,191,255,31,254,238,0,150,129,225,192,108,112,175,183,122,174,145,38,51,90,25,52,131,25,113,230,167,125,250,213,97,208,141,53,71,110,176,81,56,230,98,239,224,12,126,162,130,80,230,232,179,115,25,238,96,207,113,102,188,194,237,65,224,243,147,83,142,36,185,105,138,120,216,228,36,36,127,88,62,89,68,220,155,203,7,213,209,227,225,217,21,199,186,135,183,158,29,158,31,151,52,134,68,75,125,219,201,78,208,177,185,191,85,106,241,20,195,108,197,107,73,83,117,213,244,122,93,176,108,3,230,105,128,57,210,13,59,45,249,148,157,215,45,167,116,133,37,139,164,204,199,103,7,52,78,73,67,11,111,13,249,83,98,249,2,77,96,31,15,187,131,163,144,55,153,162,32,51,161,89,47,86,204,98,2,163,42,28,165,86,43,42,99,181,57,29,214,142,249,26,99,223,63,97,80,35,174,131,80,53,97,179,30,232,135,26,156,237,233,216,109,193,30,175,43,186,153,
+234,97,58,171,142,88,229,19,122,134,163,113,32,189,28,78,56,166,242,215,106,71,28,48,68,78,224,249,34,191,213,98,140,107,77,94,150,232,86,170,99,10,219,21,218,111,188,220,122,30,35,146,110,223,222,91,144,217,135,10,160,186,103,213,136,49,188,237,53,101,189,194,90,79,37,112,170,97,129,205,99,22,52,245,93,104,31,142,43,31,111,175,38,7,212,106,125,110,209,6,108,105,204,170,203,53,54,202,125,182,30,46,58,232,180,28,6,194,73,57,218,45,148,37,135,149,184,128,178,186,189,33,29,217,0,109,88,103,186,32,116,212,163,57,201,29,51,95,176,213,199,244,188,25,56,48,115,30,242,41,139,145,3,189,224,58,221,24,188,141,113,112,14,199,61,114,26,157,248,105,9,25,50,160,56,226,220,93,91,132,161,224,188,27,138,74,175,13,169,124,4,234,168,236,185,32,163,21,106,21,102,53,186,119,137,140,149,45,77,81,210,211,21,49,159,246,234,40,112,217,119,43,66,14,253,93,122,158,191,245,199,198,230,179,163,66,145,70,126,156,154,245,184,195,14,24,
+35,139,214,154,83,169,181,247,111,98,188,140,73,127,201,5,207,43,176,15,237,100,139,237,32,196,91,48,144,248,177,248,106,116,199,166,74,115,8,166,120,225,223,84,231,107,3,160,156,148,109,115,24,122,168,214,170,205,198,65,53,145,34,223,33,57,156,170,197,80,167,13,213,136,237,209,9,68,71,119,1,107,18,135,119,193,151,52,25,211,120,180,216,104,48,85,189,197,109,151,206,222,44,92,149,196,88,41,110,161,111,46,244,87,200,144,237,232,202,61,152,73,226,143,12,148,186,135,179,237,56,190,41,14,78,124,121,113,141,110,238,89,157,76,127,155,168,62,4,58,253,232,66,250,56,212,187,56,139,236,105,40,193,204,87,68,68,234,76,90,28,23,75,145,188,42,229,44,76,79,14,252,200,25,11,73,91,110,36,18,33,2,185,190,48,198,36,79,182,132,192,73,168,201,246,251,58,134,143,155,210,78,47,89,198,18,181,23,162,151,200,92,120,45,172,245,128,199,149,48,181,189,245,181,3,29,108,172,217,41,20,48,89,144,249,177,6,244,2,126,196,24,167,107,197,134,
+157,115,194,164,5,149,214,147,216,122,216,28,57,101,91,130,121,169,141,135,81,197,203,155,156,86,123,161,62,200,226,141,44,137,172,114,37,196,219,158,192,237,102,196,76,69,56,1,86,88,186,65,19,50,81,148,86,239,89,101,117,61,180,89,186,153,242,244,216,47,133,250,235,89,65,217,43,238,231,21,4,248,102,227,19,135,157,71,158,124,9,105,99,205,130,181,0,29,153,102,69,109,88,205,10,121,67,154,92,223,54,243,105,4,161,45,213,87,75,174,232,232,248,26,9,239,71,60,182,251,27,107,159,187,6,63,66,61,34,214,150,164,161,182,155,141,189,209,33,75,230,85,103,111,14,208,104,67,91,12,166,232,48,140,117,226,62,244,164,40,161,107,79,54,4,24,91,91,81,222,187,178,42,218,52,147,37,177,203,65,196,26,185,137,40,183,236,33,219,176,234,226,85,216,77,95,64,129,241,241,135,1,128,175,215,229,81,76,193,210,60,51,251,186,124,127,87,215,32,248,23,8,133,94,98,22,187,47,155,123,69,131,185,52,88,197,230,236,3,121,179,195,224,112,70,172,
+126,85,28,242,154,71,237,227,26,44,22,72,85,231,173,148,157,157,234,95,213,246,71,121,254,113,35,79,239,182,142,80,121,129,37,19,247,13,151,121,100,152,157,85,214,147,122,210,254,157,36,116,179,237,235,140,185,162,29,99,157,23,37,117,231,190,207,80,6,226,7,231,100,248,140,18,157,66,109,11,199,222,153,182,195,70,174,45,43,215,112,219,227,204,171,150,105,170,231,218,174,230,179,124,204,230,221,86,27,193,59,128,165,239,89,186,54,198,148,123,62,191,7,142,21,211,238,126,96,59,75,231,132,1,248,28,155,187,128,114,204,230,158,59,94,78,77,13,213,76,247,188,186,210,47,195,40,119,57,64,49,91,181,140,77,47,92,104,178,150,26,175,164,187,1,67,253,100,66,103,55,83,171,62,122,206,6,40,21,210,220,148,214,100,210,134,154,237,228,17,205,54,118,237,252,234,22,49,159,165,89,130,64,35,110,233,145,238,167,43,37,118,194,220,62,37,117,33,164,200,146,183,24,248,27,118,210,212,159,135,4,125,4,210,114,21,179,245,128,114,165,196,181,205,77,240,
+208,225,49,126,29,40,34,70,109,180,33,171,138,102,204,189,244,64,32,131,199,180,12,146,101,136,47,56,90,201,12,242,160,126,220,61,21,163,204,198,145,106,197,182,108,209,108,115,47,140,232,154,183,118,13,82,32,217,56,41,130,77,104,115,10,106,102,19,192,65,15,174,6,100,33,102,184,236,0,24,223,122,149,27,212,217,232,225,3,26,166,115,101,44,61,22,34,21,199,26,187,153,166,95,171,247,120,195,27,248,5,201,238,111,156,106,22,93,253,162,54,156,154,213,229,73,169,107,92,74,128,248,168,77,164,47,204,51,213,125,211,25,200,132,150,158,85,14,173,201,94,226,73,118,109,32,115,38,207,47,134,61,77,218,48,93,19,249,178,195,145,68,203,109,114,84,174,177,119,29,224,240,163,236,89,102,106,18,51,108,193,39,219,73,8,181,133,14,172,141,243,115,209,189,221,195,158,31,246,213,162,187,14,12,174,116,38,211,189,196,214,116,181,72,21,168,93,203,54,108,65,3,145,113,192,142,218,152,189,114,215,182,83,99,213,90,233,45,179,50,10,28,179,24,139,33,
+165,142,218,247,59,178,167,102,146,112,240,20,113,33,121,233,204,118,86,47,167,176,250,92,134,101,227,175,141,9,148,135,126,213,91,138,210,189,118,98,126,129,51,79,69,119,1,251,170,232,91,111,151,145,161,51,32,198,213,215,163,51,151,102,85,200,6,84,242,161,61,61,95,44,4,66,63,177,206,178,152,150,192,198,157,71,121,46,170,126,182,170,195,184,110,6,42,218,85,40,140,209,175,77,7,38,186,4,129,166,240,85,56,92,161,62,87,164,37,231,126,94,100,13,17,224,156,247,40,67,91,1,192,216,171,88,254,14,128,31,9,210,92,128,106,134,109,81,246,139,161,69,35,86,46,73,86,42,251,136,52,180,141,97,174,52,129,85,121,32,174,187,153,171,54,45,69,177,139,187,108,198,42,177,61,39,119,116,228,153,77,172,97,14,166,42,57,137,164,206,79,146,227,248,176,92,167,155,7,117,183,111,107,185,106,193,181,26,64,62,66,2,24,138,121,181,13,68,134,75,190,152,146,49,109,247,239,175,99,174,64,77,223,165,88,79,198,213,64,66,51,5,76,169,206,250,
+228,190,138,98,216,245,85,239,102,209,157,156,99,125,198,217,210,28,206,94,138,16,4,182,250,0,224,51,214,133,226,117,31,171,216,168,92,28,164,175,87,57,233,179,79,211,195,131,60,214,117,82,234,119,69,94,227,58,51,177,8,172,24,51,249,66,99,55,142,58,155,196,42,126,184,168,150,228,38,15,155,65,39,177,153,121,114,246,162,62,127,216,1,48,101,122,241,224,57,166,35,239,201,155,246,172,200,33,155,198,226,213,35,168,204,184,233,114,176,240,237,68,192,156,173,41,96,66,64,90,139,188,249,216,168,198,94,236,24,222,199,232,102,143,80,187,152,201,155,185,184,41,236,230,222,55,173,161,194,222,218,60,93,201,223,193,83,205,124,29,132,145,133,217,34,213,117,187,22,117,95,129,234,237,111,151,91,229,250,86,38,95,58,143,242,135,249,19,191,65,47,132,87,3,237,186,177,216,107,79,87,52,105,50,151,122,52,232,87,1,67,169,30,206,246,45,241,227,182,170,119,224,50,217,29,170,30,36,53,6,84,189,138,172,160,190,218,106,207,175,17,158,152,57,125,102,
+185,5,36,212,27,205,66,161,155,185,213,229,170,128,5,200,239,83,238,197,253,202,157,88,183,129,139,198,188,176,227,239,194,85,232,138,78,23,236,242,108,126,67,234,24,166,106,87,223,20,85,245,36,220,14,70,194,102,205,107,231,51,5,182,58,133,99,23,249,75,146,147,112,144,10,79,51,83,32,13,35,240,182,152,205,125,251,154,196,113,50,123,69,96,27,195,90,54,185,206,114,51,209,229,199,211,163,20,51,163,77,77,76,139,205,141,69,65,231,180,171,131,105,146,185,137,121,202,45,109,40,189,220,168,203,168,115,248,24,39,229,227,31,23,7,182,170,147,96,214,73,183,38,65,30,97,168,109,143,45,129,165,45,72,101,163,89,138,166,211,74,176,232,120,179,180,11,233,224,101,133,170,158,195,182,57,153,30,103,213,189,137,7,137,65,24,47,189,41,9,75,203,170,109,110,173,228,142,9,91,179,137,77,254,4,205,68,18,251,224,36,85,48,106,202,31,143,11,206,169,247,142,63,202,202,45,171,199,141,141,46,73,246,214,22,35,20,72,27,56,212,110,118,171,16,163,
+48,205,149,126,218,208,43,48,53,159,165,235,198,248,103,211,56,248,34,104,86,13,163,82,107,51,96,154,201,168,151,200,245,118,189,228,54,147,249,209,133,252,154,180,207,29,75,198,71,131,83,166,234,50,169,5,229,90,243,67,237,1,203,229,141,235,190,227,18,82,181,67,226,19,5,232,5,2,171,178,42,21,104,171,203,226,7,151,229,38,56,73,14,46,162,164,117,53,218,223,66,101,36,203,149,237,0,168,207,198,236,179,75,153,233,46,192,220,114,207,81,100,164,14,128,207,38,85,164,159,185,245,82,168,168,253,64,108,229,200,201,98,152,131,133,87,215,200,245,16,235,194,5,50,173,238,229,184,74,88,87,119,233,165,75,54,172,248,22,15,213,248,36,192,66,141,29,153,250,123,11,61,137,199,63,229,16,169,132,163,246,19,161,99,151,32,232,29,237,214,30,185,64,217,45,18,147,161,82,205,215,97,216,44,161,80,219,183,100,166,254,211,229,166,52,182,177,129,236,66,87,20,49,195,64,122,165,43,110,85,138,236,100,141,12,103,39,176,169,233,68,22,23,121,213,86,
+29,198,64,3,189,149,2,176,110,140,221,13,63,44,169,4,55,238,122,147,115,68,163,72,134,110,187,61,117,182,15,156,104,244,139,236,246,72,173,27,119,160,165,219,233,165,120,221,210,142,79,199,156,164,57,123,219,26,176,1,174,166,61,19,159,123,235,225,195,102,27,213,149,164,39,2,171,76,166,26,196,43,186,162,201,113,4,28,57,43,219,226,48,167,188,232,56,56,5,241,229,12,200,208,46,250,215,157,140,110,115,55,179,121,233,138,16,229,186,86,32,51,251,183,133,76,17,253,152,80,5,141,143,179,56,181,162,64,33,207,212,40,126,143,200,63,95,24,153,166,170,253,206,175,62,135,195,131,245,103,193,62,14,11,217,237,120,155,14,136,177,96,80,179,87,55,140,243,21,189,215,74,237,95,222,85,178,218,89,1,45,135,185,86,23,222,211,166,18,137,177,232,189,214,152,25,99,28,15,160,107,146,249,248,104,85,230,194,186,25,150,69,186,229,166,166,42,75,111,77,231,33,185,74,159,230,156,226,102,4,163,45,14,171,119,73,18,171,193,104,64,23,51,233,219,77,
+143,218,244,183,117,149,69,103,33,168,162,70,120,137,193,176,41,108,250,211,226,98,54,217,62,118,131,211,117,205,114,50,230,87,87,101,61,181,219,153,89,130,27,44,219,184,101,234,186,115,251,153,0,81,32,151,106,39,0,99,186,8,205,60,145,14,137,34,86,147,246,37,156,64,70,170,160,157,84,40,177,195,84,108,83,201,102,248,38,225,114,165,145,76,53,221,204,182,143,204,240,210,220,213,22,227,64,7,76,148,116,43,54,162,63,237,3,243,246,29,41,163,12,85,101,9,170,122,136,56,217,234,20,77,93,13,54,100,244,219,158,197,168,143,54,120,115,139,27,221,5,235,250,42,229,114,83,109,174,141,99,128,247,168,142,45,189,129,183,12,52,21,58,186,71,27,53,73,186,89,93,190,48,43,92,7,212,206,104,211,54,219,147,196,69,179,146,116,113,14,104,20,241,39,173,24,238,22,232,23,100,59,202,62,97,59,108,222,131,115,135,15,206,141,86,108,62,184,85,165,146,90,150,114,234,218,98,22,144,199,171,212,54,192,204,20,249,230,8,152,66,26,28,23,66,104,
+55,101,174,56,150,168,98,114,214,208,34,55,53,250,97,49,47,138,157,154,5,210,197,176,218,27,106,238,14,1,188,177,110,162,242,150,206,167,131,230,105,117,165,20,141,16,240,204,197,195,116,43,91,56,77,109,108,192,68,64,27,14,72,120,116,122,25,52,2,131,105,134,151,21,4,58,235,70,140,205,16,73,245,153,20,143,185,138,235,27,149,89,82,139,45,47,252,130,116,158,185,53,209,30,90,23,155,99,178,208,223,32,250,24,253,233,209,44,25,77,147,28,164,208,162,193,193,114,200,201,226,221,88,16,59,59,154,12,156,56,172,120,166,190,33,165,246,21,253,102,6,214,7,86,219,69,27,184,67,1,59,115,191,171,132,186,205,89,191,132,146,24,40,138,100,99,164,187,223,44,135,252,65,69,59,65,193,213,130,14,113,235,100,227,59,25,189,80,45,153,28,170,15,65,52,117,93,108,89,210,172,66,186,125,242,166,246,3,171,116,60,143,117,176,249,25,249,149,220,105,87,106,3,104,214,208,234,150,186,178,150,222,172,174,202,99,204,139,30,164,36,64,2,171,59,138,
+105,36,161,167,171,214,156,121,130,82,183,151,249,69,12,178,237,121,69,94,223,21,206,41,231,159,166,174,120,166,99,48,1,158,142,210,230,126,99,95,16,72,247,0,31,152,125,249,211,22,88,79,41,69,85,70,0,111,80,64,173,77,253,176,97,133,162,27,12,1,227,88,187,156,64,51,138,108,154,81,113,102,51,138,73,160,206,208,117,9,236,180,96,138,153,90,204,7,141,102,222,16,187,106,230,133,41,127,111,0,164,209,71,242,228,213,150,63,152,36,57,218,235,126,20,120,58,230,19,238,132,178,42,71,238,115,251,229,169,19,203,225,96,191,72,206,218,173,215,121,139,183,115,125,227,18,115,195,172,67,103,199,180,236,94,113,186,229,156,48,19,224,165,153,52,157,89,63,45,43,245,196,125,102,155,127,233,194,115,10,86,245,217,80,12,24,22,42,223,232,233,161,159,79,243,108,11,52,38,171,46,229,67,35,207,60,143,208,107,182,242,84,133,54,161,70,100,237,45,61,133,87,80,2,29,167,209,38,37,152,215,76,128,199,26,184,106,75,178,76,125,168,136,93,242,175,
+200,109,41,99,152,66,45,56,192,193,130,48,171,109,245,84,23,131,74,96,179,24,10,191,27,248,163,252,83,44,41,198,32,220,46,116,124,164,127,219,202,81,227,91,149,178,170,176,243,123,235,74,176,228,244,193,40,252,245,162,23,191,203,155,178,91,123,46,207,62,56,26,222,143,97,200,180,66,161,236,70,242,19,253,224,177,39,17,236,79,147,65,143,37,134,104,2,203,199,19,147,53,142,138,16,246,91,28,139,59,104,60,143,11,157,178,252,36,198,53,24,3,22,225,242,177,110,98,176,13,166,234,141,66,61,91,181,252,1,34,255,48,37,180,172,156,183,176,237,152,185,40,176,180,93,204,156,165,67,142,24,106,201,244,126,65,93,138,216,178,102,76,31,158,44,10,240,152,105,211,204,72,208,133,92,242,255,231,229,61,155,19,137,122,117,209,191,222,216,38,152,140,13,77,206,152,156,115,134,105,108,114,206,52,201,128,9,6,147,49,193,164,211,216,111,237,179,239,169,123,107,127,57,117,171,102,106,198,244,66,75,90,75,122,244,72,173,25,86,211,232,29,41,162,29,29,
+253,156,37,10,84,89,219,74,181,144,142,210,59,183,6,157,163,17,207,240,251,166,245,193,207,40,218,79,206,119,103,158,232,201,140,185,173,11,220,203,87,147,225,240,135,76,131,125,19,226,244,190,109,118,240,185,11,93,68,118,151,238,91,240,125,220,117,123,44,118,152,88,224,84,148,109,74,53,233,26,121,164,150,202,228,149,239,62,9,153,16,65,89,63,182,233,115,199,27,9,125,61,71,13,44,38,76,105,130,199,32,169,54,148,30,142,221,37,182,204,149,83,154,171,175,171,144,50,183,37,121,7,47,172,180,123,167,149,76,104,25,178,122,45,61,178,79,119,193,71,112,98,195,43,53,248,9,87,21,251,167,209,184,19,52,11,109,145,140,211,176,157,238,249,223,219,119,193,124,50,161,116,138,37,146,74,19,9,26,88,130,197,177,71,105,25,200,42,116,215,53,73,241,82,248,185,142,119,78,96,32,145,123,197,162,172,177,182,133,140,100,113,216,48,174,73,141,182,127,154,20,2,151,227,46,135,75,241,62,82,84,108,63,199,209,232,186,220,150,174,167,111,253,163,15,77,
+68,150,84,110,171,117,86,175,171,93,154,84,55,240,207,166,139,212,155,221,113,177,158,252,101,61,114,102,132,194,209,143,156,67,105,57,154,163,254,118,135,178,177,50,67,140,215,48,91,153,222,133,74,45,254,237,85,99,106,39,189,251,200,88,232,84,210,103,135,42,31,28,254,195,32,133,246,210,210,45,35,201,137,185,19,94,153,143,40,182,3,61,93,228,144,100,156,57,39,89,99,182,131,200,223,20,222,55,75,41,251,167,247,238,113,51,209,174,15,140,248,158,175,23,194,59,216,56,103,123,199,163,12,58,116,140,235,71,215,243,193,119,53,76,94,143,175,94,247,99,234,45,58,120,232,114,223,248,15,107,59,14,199,229,43,133,63,199,74,132,220,38,95,107,73,26,228,60,222,159,161,2,86,208,224,112,2,29,242,233,103,232,83,50,83,124,231,53,226,57,211,176,243,67,11,83,224,238,154,198,9,201,103,41,108,191,220,135,140,130,98,63,159,41,242,171,97,33,134,164,30,110,68,79,122,154,116,46,153,135,10,193,251,166,107,12,115,70,13,13,15,59,135,86,208,78,
+73,215,57,23,148,77,154,226,27,213,104,143,187,147,71,223,47,229,188,64,182,190,95,68,211,173,159,186,208,156,75,160,249,205,122,89,46,128,93,48,43,211,110,185,247,233,225,155,164,86,239,197,19,91,82,183,150,200,34,104,103,185,172,211,65,190,235,163,174,202,242,21,231,17,201,75,25,121,187,22,29,111,157,76,129,235,176,66,178,74,212,219,141,227,218,241,243,84,150,118,184,169,214,142,185,89,161,86,156,193,53,16,203,105,246,185,111,215,122,82,195,29,155,149,192,197,37,58,172,76,106,195,101,62,137,141,182,243,139,177,88,243,91,79,130,235,149,187,97,57,24,56,63,251,114,62,74,170,230,106,13,35,127,160,26,135,83,169,84,214,167,101,58,199,54,195,57,29,219,206,72,177,51,126,31,164,144,18,158,195,230,185,158,62,29,20,190,96,95,120,55,73,15,140,107,10,41,55,172,50,242,42,42,17,223,251,93,187,19,179,66,121,244,118,134,28,113,165,237,178,70,214,47,231,235,118,134,105,74,41,1,7,110,34,254,217,64,166,39,151,184,26,190,24,59,240,
+231,209,192,245,59,108,199,167,231,114,155,238,95,159,25,22,204,147,105,254,79,176,127,87,248,2,107,202,212,53,58,115,89,122,111,119,113,225,7,216,142,172,53,212,170,205,155,213,69,124,226,73,55,204,189,183,220,117,27,10,5,183,20,133,119,16,234,49,71,100,35,219,223,251,118,86,9,237,93,201,8,150,240,148,16,236,52,141,99,15,57,29,177,229,111,145,46,233,15,227,179,60,226,130,96,231,21,205,215,139,126,90,178,26,89,250,181,97,243,124,241,237,104,220,188,36,2,223,94,214,161,226,17,250,156,167,110,182,93,219,229,95,45,118,92,158,242,108,147,182,38,159,155,103,67,196,214,147,207,181,164,183,251,68,57,192,179,207,169,141,28,157,253,194,79,180,159,134,143,145,87,144,111,22,150,201,157,193,194,212,13,12,79,225,231,171,50,49,93,117,252,206,153,147,228,175,125,108,97,82,210,134,195,191,248,27,223,53,139,187,183,159,226,40,243,11,237,240,37,171,60,239,251,66,74,84,147,220,207,180,229,239,119,117,206,33,223,49,60,63,73,203,199,238,11,206,
+57,123,254,138,3,65,125,161,85,17,209,44,106,130,10,251,140,163,208,17,124,85,72,21,2,104,235,223,213,105,51,194,145,226,155,189,223,103,132,240,242,65,121,116,108,70,75,161,0,190,98,118,29,159,129,178,14,24,62,216,151,20,35,100,112,115,157,215,204,112,155,244,234,7,31,93,193,24,42,176,102,72,34,139,57,200,62,254,166,247,110,229,98,184,20,151,43,73,115,144,152,248,218,19,194,92,137,139,103,191,111,58,79,91,2,228,145,123,81,157,37,46,254,234,53,72,174,144,139,88,193,190,150,121,137,80,30,14,35,26,87,127,26,58,162,239,134,157,151,90,116,236,119,83,159,34,48,27,156,151,134,159,85,148,28,56,119,234,10,76,14,167,163,187,204,235,136,206,208,152,63,210,144,11,81,159,254,253,200,158,241,195,177,254,19,91,124,88,238,204,236,176,188,117,121,26,185,110,253,176,69,206,232,32,173,67,218,159,75,162,25,50,200,218,58,234,118,206,102,100,166,219,141,65,247,138,137,113,104,211,167,116,191,55,96,210,143,58,14,155,236,192,105,114,241,201,
+222,78,46,97,192,194,36,78,171,176,56,38,94,114,125,24,142,126,46,107,242,162,50,155,183,36,225,58,168,75,91,61,187,6,102,96,193,200,114,242,55,127,162,241,253,218,103,15,111,255,145,241,1,21,38,233,203,197,202,227,240,155,189,31,8,210,215,6,39,107,1,255,5,189,121,104,136,226,222,240,72,246,239,254,209,150,181,117,138,132,236,84,41,247,14,15,52,209,251,151,142,215,58,140,28,72,141,120,127,245,93,10,23,107,81,215,112,206,153,212,127,199,25,197,206,26,181,182,67,55,40,216,199,27,85,64,58,216,87,27,134,109,17,250,244,117,212,154,168,148,191,24,18,220,152,208,4,144,172,154,137,173,36,170,150,164,221,247,171,190,211,99,32,110,5,240,2,31,125,64,27,254,225,172,250,159,154,108,220,195,50,207,235,44,61,216,30,113,203,119,52,196,98,233,60,95,255,254,232,239,186,173,189,24,91,233,118,253,63,39,243,238,226,14,26,126,230,95,198,60,106,119,217,23,45,8,101,50,181,223,142,111,159,95,231,177,223,173,57,149,125,88,132,249,145,148,
+250,36,199,119,222,88,255,169,245,166,149,193,14,167,185,120,111,17,58,188,14,210,153,246,197,4,211,32,7,152,140,238,37,62,73,59,184,210,224,150,185,87,49,196,84,15,219,135,186,126,56,143,33,164,52,198,8,123,192,235,247,132,50,246,163,51,215,83,98,239,17,31,149,36,203,117,87,57,215,85,71,70,128,109,60,105,27,243,147,184,90,147,63,248,168,143,29,52,154,137,179,126,30,94,45,21,193,122,237,240,245,46,87,186,134,242,67,241,181,138,4,202,238,184,201,254,35,96,218,173,85,104,193,213,83,214,125,247,4,211,62,31,22,167,153,240,179,221,39,10,110,115,237,55,160,144,116,161,231,25,139,181,101,134,68,209,165,144,131,248,109,238,189,152,193,30,8,115,5,246,237,107,251,188,195,100,210,19,114,203,146,232,21,119,90,207,16,95,30,97,38,204,244,143,255,186,166,156,3,151,218,79,129,64,174,95,115,166,201,62,224,46,201,134,208,206,138,20,97,70,90,107,61,38,195,206,157,238,126,39,63,13,209,182,235,200,179,155,164,124,10,159,251,56,28,53,
+5,222,46,243,122,247,51,73,255,43,18,222,246,175,186,211,60,188,192,94,96,138,31,215,168,177,104,45,230,165,247,17,213,121,147,91,232,145,25,144,101,198,237,87,77,139,198,22,108,190,19,207,250,243,139,34,89,146,74,37,18,246,20,159,116,158,24,52,229,69,18,174,245,187,226,38,126,112,233,236,84,1,54,231,204,95,194,230,216,176,189,123,221,133,13,1,121,115,251,84,251,214,126,123,190,248,231,249,8,243,28,16,90,234,177,0,215,58,15,22,86,247,166,210,166,18,209,43,116,116,154,3,74,65,135,178,155,207,229,93,188,63,207,63,175,185,41,77,145,122,107,137,189,93,189,101,248,74,249,34,216,179,84,199,70,26,151,113,129,250,137,190,196,45,187,243,105,38,204,98,144,191,252,254,207,83,202,141,149,82,65,225,124,192,170,157,220,130,94,102,50,123,20,90,191,148,184,38,158,63,77,66,184,71,189,142,154,167,192,184,161,57,16,232,77,234,23,230,54,227,215,170,174,231,202,119,198,183,37,191,143,109,247,146,200,101,124,122,63,87,72,222,97,255,199,136,
+61,119,23,239,95,25,226,227,215,245,156,117,251,43,36,95,103,108,60,24,106,206,147,98,141,221,108,93,129,171,162,54,25,41,146,252,131,233,158,209,74,237,139,199,235,105,186,222,156,61,105,161,119,230,249,218,125,167,184,240,119,169,21,29,240,107,190,249,236,220,92,183,164,230,11,161,17,250,73,251,171,31,129,16,251,184,19,248,51,154,185,214,241,224,58,216,46,92,242,181,160,87,121,4,222,165,158,63,115,190,211,33,103,71,85,15,27,86,44,36,193,30,80,70,12,120,121,147,46,117,201,98,83,205,219,247,9,248,159,180,211,39,181,45,198,198,119,43,97,39,235,183,199,117,88,26,131,171,171,212,155,172,176,252,90,100,50,241,247,124,61,28,200,45,2,151,175,13,63,215,39,212,64,3,5,9,113,171,138,183,220,108,199,53,66,230,235,123,187,198,94,226,31,107,207,112,126,169,140,250,117,114,192,155,252,208,36,28,105,127,119,226,57,232,137,235,108,196,62,43,92,77,83,201,177,225,114,77,73,149,205,220,36,170,39,53,250,153,112,115,169,219,249,126,175,203,
+36,141,89,76,47,167,169,244,69,155,97,85,32,198,252,224,251,22,82,234,19,85,97,68,110,172,97,143,80,128,93,235,109,67,129,96,160,72,127,216,134,201,153,51,214,227,75,248,107,242,88,195,241,93,89,181,227,38,32,92,97,102,207,91,28,121,221,208,184,253,198,79,246,244,184,251,57,35,84,163,221,52,152,96,130,52,59,80,142,59,27,201,106,89,133,89,182,208,136,171,198,72,19,232,142,254,146,174,233,209,131,65,148,131,207,152,65,251,201,180,28,185,173,129,213,112,83,201,169,120,135,97,162,50,162,239,225,11,3,49,184,137,19,55,51,222,205,123,192,171,216,237,179,133,249,156,183,222,248,133,179,6,243,202,35,223,167,155,154,245,10,92,187,183,220,202,209,53,143,110,5,149,67,36,188,118,191,181,2,134,159,35,101,93,9,252,124,233,103,180,102,26,190,42,28,10,131,208,104,177,152,10,83,211,121,112,209,234,123,232,126,90,57,22,179,214,11,135,208,187,232,236,118,179,229,2,219,218,71,215,203,163,127,213,189,80,62,121,251,32,235,185,101,30,158,94,
+207,151,43,228,119,75,16,134,116,92,126,58,231,196,245,215,68,232,108,253,80,34,10,63,252,113,125,220,77,183,123,207,213,241,177,195,166,247,253,127,14,210,220,119,21,26,193,137,0,14,200,193,217,114,249,246,161,251,226,249,122,244,35,65,58,193,60,51,97,175,80,143,125,172,80,175,12,190,177,47,204,218,11,72,149,66,152,159,22,204,90,90,175,203,237,184,39,140,180,253,179,231,98,45,30,104,254,195,59,241,149,45,21,194,112,186,223,23,253,133,137,234,107,236,13,222,62,124,54,184,199,199,116,133,23,216,216,10,130,203,101,88,152,61,29,38,211,229,110,106,154,206,178,190,116,85,189,26,22,248,179,67,201,122,124,221,58,132,91,66,147,18,184,54,187,166,221,227,215,169,216,56,63,147,221,129,229,135,223,119,76,122,39,52,70,33,131,59,196,133,183,129,159,253,82,119,206,248,53,166,147,34,34,220,11,79,243,107,105,138,245,15,126,142,207,237,35,63,116,185,120,147,98,131,239,108,140,251,252,129,39,97,242,162,178,8,5,63,106,154,176,239,235,237,132,66,
+243,100,67,161,112,88,131,32,31,115,61,149,31,3,251,68,160,183,221,205,45,75,138,143,210,56,149,82,28,248,236,180,235,209,57,161,84,29,80,184,189,95,213,64,17,38,75,27,151,60,157,54,242,80,10,143,136,21,155,23,26,253,105,127,36,237,96,255,83,113,235,131,215,211,89,228,250,179,59,198,174,46,55,36,5,155,51,251,36,246,40,156,206,230,7,168,145,73,4,242,211,27,1,23,123,244,141,147,100,212,196,236,24,156,143,241,101,240,98,202,32,149,218,233,49,210,138,132,204,9,116,136,121,165,20,202,95,77,226,243,12,247,19,219,64,205,193,76,192,94,251,208,42,216,249,213,107,246,54,223,29,195,232,141,108,89,173,117,25,1,165,253,96,94,191,213,113,225,231,242,171,211,240,234,154,251,211,114,211,121,138,138,234,174,59,151,152,60,87,124,207,45,210,215,210,208,122,18,42,196,250,193,144,55,12,93,165,221,12,214,21,234,100,12,222,137,160,222,75,254,11,215,66,246,206,43,201,117,238,124,27,2,163,204,40,204,43,136,28,142,244,65,127,178,48,220,
+142,203,0,42,230,31,109,198,47,204,132,91,216,11,103,188,93,244,161,215,99,206,173,186,36,130,212,140,156,60,89,229,191,224,76,147,105,85,48,252,118,145,7,219,8,185,158,139,188,250,30,168,80,20,229,224,25,65,170,132,172,84,127,22,108,215,48,185,222,105,58,127,100,5,199,240,238,94,19,14,120,127,142,62,9,109,57,164,51,58,137,150,167,187,169,136,9,93,110,55,147,187,99,216,18,11,103,4,161,144,121,53,177,183,82,38,173,255,124,172,253,241,149,252,64,125,106,74,174,253,7,170,107,244,140,19,255,20,247,134,178,225,167,191,203,121,104,237,246,34,42,11,85,124,130,203,63,139,39,125,64,152,215,28,127,123,163,136,163,154,47,121,231,103,98,210,139,150,72,231,64,129,80,237,37,138,16,132,195,32,236,110,201,29,139,37,200,159,16,174,246,250,160,147,221,254,34,54,75,197,96,153,142,110,127,239,81,75,141,42,243,206,156,94,15,25,228,201,93,148,251,130,187,27,119,128,196,184,99,9,180,158,136,182,66,25,194,0,128,114,250,234,245,160,139,208,
+195,88,108,30,77,58,84,209,77,8,89,94,109,4,30,149,104,29,206,134,206,26,110,219,137,247,151,151,31,187,251,234,207,92,127,62,159,174,14,47,125,172,157,49,234,89,66,68,133,54,70,144,189,227,212,110,69,146,86,154,213,63,253,185,219,13,106,10,117,28,139,185,11,115,161,169,4,204,19,58,17,149,26,156,213,158,200,90,57,92,92,25,208,15,212,31,8,183,87,35,162,78,87,166,110,46,232,115,83,73,90,29,167,227,107,29,232,156,195,67,198,102,37,132,115,183,68,96,26,156,148,200,204,163,235,183,247,248,91,247,123,164,226,170,53,189,67,62,98,71,115,164,118,90,189,92,140,19,250,59,91,150,160,10,160,253,22,53,90,66,197,224,19,160,13,52,144,253,115,28,88,29,27,30,63,17,219,195,83,137,194,175,94,14,155,129,73,42,61,248,241,78,10,210,101,19,100,148,32,40,69,89,192,56,71,173,4,29,176,235,16,237,37,17,110,115,82,2,151,165,223,126,190,189,191,38,214,101,99,66,7,227,148,60,135,99,24,178,93,6,170,13,98,177,28,83,
+216,213,102,163,92,203,108,235,12,56,31,1,210,51,151,189,147,128,17,187,230,11,102,149,254,65,251,7,56,138,19,203,218,47,143,137,86,230,90,255,122,126,153,61,228,186,203,30,88,132,250,161,194,52,161,153,192,113,62,233,158,173,162,245,167,69,93,48,188,171,175,76,121,66,61,24,219,234,146,151,94,135,100,238,119,166,47,9,184,127,177,161,16,255,115,158,82,141,237,229,216,249,206,74,150,220,100,19,84,253,115,131,131,86,204,82,161,67,161,196,216,12,14,128,173,171,111,40,181,222,108,50,144,172,169,217,140,153,159,48,196,208,236,26,100,176,111,44,181,159,113,228,63,51,58,208,78,130,221,70,98,228,108,177,73,208,77,186,3,58,218,151,224,247,254,173,243,210,210,183,171,223,98,103,108,89,249,25,209,67,29,70,88,7,193,126,5,122,157,72,100,239,249,121,76,196,54,55,138,171,253,124,235,154,119,149,208,107,83,34,65,133,29,221,233,171,244,187,2,113,39,227,99,124,121,36,220,179,25,77,109,197,22,110,84,54,4,194,3,60,98,18,253,48,11,209,
+132,109,193,239,26,8,142,66,48,138,246,138,20,190,233,201,118,34,62,140,197,46,193,73,117,148,186,222,107,21,20,212,168,16,44,66,51,197,102,228,47,234,105,156,254,246,26,58,85,191,146,103,29,95,160,222,75,163,75,1,71,214,161,175,8,157,197,137,49,110,30,16,90,57,35,55,165,179,158,146,125,37,154,29,145,64,160,157,61,22,139,31,64,106,192,252,121,156,187,90,181,237,145,49,112,30,189,245,52,254,229,192,220,232,38,20,219,205,133,69,136,15,95,250,207,220,84,224,217,37,134,116,178,32,248,147,170,16,234,62,150,30,0,138,146,161,230,152,67,72,242,71,251,205,189,6,245,221,150,243,57,90,206,17,38,177,41,159,244,12,227,0,228,87,127,145,50,93,186,173,156,173,6,143,142,74,244,197,36,6,239,128,211,106,115,119,41,66,99,241,87,150,74,64,1,23,49,248,243,64,31,139,219,230,73,199,184,241,148,232,12,159,137,123,25,96,185,61,120,246,194,158,164,239,212,124,30,21,200,162,199,226,8,77,111,187,223,51,238,108,217,187,178,168,81,50,
+13,81,159,69,8,88,16,108,84,33,21,126,210,162,87,10,122,177,229,79,248,124,1,109,180,129,46,76,121,46,177,206,59,124,219,76,30,244,128,83,133,129,157,220,171,141,74,165,189,218,178,96,54,249,129,121,225,197,20,165,68,145,116,200,46,82,30,183,155,1,0,141,125,177,164,227,185,221,203,127,242,121,158,240,24,11,223,157,108,70,215,44,208,157,205,0,247,165,118,37,132,162,183,13,133,54,7,149,10,231,187,37,72,119,216,14,68,135,180,90,153,37,160,130,200,121,81,161,113,34,161,7,213,247,215,78,1,49,205,28,69,14,217,246,114,176,181,140,84,206,211,234,73,34,247,42,61,83,203,125,135,96,201,179,203,143,192,162,245,140,40,4,119,245,159,104,0,176,130,182,236,85,106,61,41,22,52,239,125,174,4,1,0,239,245,73,183,81,18,14,58,197,160,181,244,129,118,78,65,58,238,223,3,43,41,72,253,161,143,59,103,1,236,176,29,38,129,207,36,23,109,170,188,95,117,15,0,131,232,40,66,20,72,215,212,182,139,203,85,248,235,157,129,40,6,248,
+197,34,240,247,11,175,142,127,71,33,35,51,32,197,108,84,224,93,58,22,199,35,8,238,101,232,94,70,219,123,72,182,178,132,40,178,88,130,172,5,187,54,170,32,79,204,137,23,130,83,183,208,170,250,202,80,147,162,50,157,12,9,204,42,197,159,157,222,220,135,222,35,176,143,188,169,96,214,137,219,91,23,95,212,21,217,11,207,228,126,177,25,215,62,225,202,58,85,150,67,225,97,225,211,171,220,39,4,243,68,140,43,159,136,103,198,74,17,163,95,116,105,0,208,103,121,108,198,82,146,67,155,127,182,172,62,249,36,35,238,51,36,69,134,216,12,194,207,232,57,42,128,221,12,72,41,93,113,219,131,246,207,226,107,156,62,150,198,150,205,1,106,236,91,215,51,20,90,142,255,202,7,222,229,145,177,248,168,135,222,122,177,9,150,20,215,224,87,239,227,87,135,139,185,10,198,72,117,95,235,62,101,203,158,138,145,58,85,31,127,153,79,146,97,252,23,99,44,95,125,139,86,175,76,201,251,89,243,99,34,197,146,194,29,116,30,68,7,186,47,226,134,193,215,152,236,
+239,47,94,12,201,241,76,255,206,168,4,129,181,32,63,18,108,112,64,48,53,171,64,250,226,57,209,208,212,136,189,245,172,239,111,36,122,94,88,87,180,189,38,123,213,195,43,221,123,20,78,59,143,82,206,59,61,132,187,68,77,26,116,188,30,247,222,177,63,84,232,237,58,2,166,39,25,31,64,4,67,136,144,35,37,225,81,161,237,154,149,4,236,201,71,122,118,159,60,241,206,52,19,108,74,212,62,67,240,254,248,29,251,234,141,80,189,185,162,240,97,41,65,193,171,160,79,202,36,123,174,129,150,111,35,82,129,83,183,169,75,234,115,228,132,45,235,250,71,246,148,160,164,38,160,211,104,209,246,196,26,84,194,251,64,163,197,136,55,202,24,105,148,75,63,218,160,172,203,56,22,3,162,242,166,85,130,142,211,15,152,203,38,44,28,224,184,27,254,56,234,142,56,51,125,45,215,52,245,240,168,230,130,176,143,119,187,182,64,58,249,120,229,103,15,20,67,10,217,121,125,137,208,21,176,177,203,42,246,155,229,116,205,29,202,101,81,192,108,37,3,199,126,53,219,165,
+136,213,95,139,25,223,0,174,142,152,87,13,26,213,124,17,23,93,184,25,151,91,119,31,208,95,88,159,6,211,209,245,78,124,119,71,81,108,72,74,78,36,224,179,80,100,86,132,82,189,246,116,89,98,88,14,220,15,145,74,255,162,222,141,239,225,21,235,227,144,184,115,225,211,116,37,122,181,36,17,228,49,210,30,66,78,212,126,173,211,28,39,240,249,2,0,20,158,26,45,59,5,117,201,55,243,115,181,245,37,111,200,207,110,10,93,185,223,121,189,246,249,26,150,222,194,98,44,190,133,197,90,6,174,199,130,26,220,122,229,157,226,62,155,145,61,174,190,95,250,162,19,237,32,166,151,14,5,1,226,243,119,198,150,51,79,136,249,8,182,44,198,102,84,157,96,197,42,68,25,146,108,178,191,112,136,132,84,10,80,18,163,123,233,109,223,38,138,196,3,238,63,241,32,251,141,54,91,45,188,241,122,105,71,116,209,138,68,231,92,137,22,160,209,8,106,35,7,205,14,26,108,69,168,169,72,24,100,32,88,34,60,222,181,111,64,231,133,136,58,153,204,142,132,224,3,
+160,151,130,79,249,250,179,18,9,116,102,142,16,127,84,233,16,36,1,132,9,37,250,161,8,142,233,98,32,216,71,24,3,146,57,111,145,105,102,221,112,3,13,227,246,192,130,125,67,136,5,132,4,183,51,73,35,35,53,151,208,16,137,66,140,95,249,93,86,90,247,245,205,6,226,139,48,242,124,255,102,19,32,207,153,7,220,39,232,151,92,16,122,2,248,110,90,62,208,5,72,237,0,4,35,69,40,10,197,41,183,13,140,136,177,226,23,44,76,199,1,11,154,205,216,72,47,164,185,149,228,31,108,87,129,54,163,155,175,190,226,83,155,112,24,55,190,218,29,108,221,130,183,170,144,49,181,188,194,180,174,224,86,219,153,222,50,167,129,64,86,31,153,116,6,161,151,141,98,185,230,125,211,195,79,142,84,17,18,200,251,124,157,22,84,195,1,253,221,58,193,173,191,237,148,9,18,175,173,64,29,168,155,55,160,180,246,121,193,25,203,18,159,57,195,58,89,63,44,7,185,113,126,214,63,162,95,87,35,39,244,130,132,199,191,132,69,54,180,107,131,159,193,69,163,47,
+233,51,150,44,230,156,149,155,42,163,245,211,224,188,254,224,7,237,117,248,178,5,68,70,214,117,210,89,37,246,224,216,242,241,62,222,174,22,145,195,234,144,46,226,132,43,209,131,236,169,70,16,51,124,50,201,149,165,253,81,175,236,108,79,194,145,232,15,122,2,203,91,173,56,222,120,148,145,111,95,70,185,176,186,177,18,74,194,233,77,39,116,223,26,204,29,48,56,192,132,239,188,16,166,67,253,22,6,47,29,219,165,236,167,38,13,143,4,29,89,19,64,89,63,233,135,93,166,68,125,237,23,108,201,246,23,187,113,233,29,221,253,181,131,153,152,88,191,88,147,211,20,200,18,183,26,244,119,124,218,133,89,46,102,174,211,26,139,77,73,151,182,66,232,215,17,202,148,240,24,216,253,134,206,170,105,84,23,111,201,93,7,55,153,116,58,223,28,50,32,206,64,138,135,44,173,138,152,131,247,214,80,8,9,16,20,118,89,8,204,171,214,136,83,83,62,98,219,71,4,57,207,110,247,90,160,217,184,251,110,191,47,173,179,44,164,248,59,224,233,80,39,88,238,28,137,
+58,97,26,239,17,18,71,204,82,98,175,4,9,247,165,97,52,78,70,203,102,9,161,122,151,97,147,177,61,15,118,213,35,244,103,24,55,90,233,80,89,2,155,214,191,230,189,144,153,49,38,38,95,163,251,180,172,99,0,148,77,204,177,8,133,217,21,130,189,80,79,172,57,149,224,56,202,67,50,64,191,187,220,220,5,91,130,50,148,79,133,119,146,201,76,97,185,180,117,115,182,55,161,171,61,49,60,207,79,248,231,64,255,1,137,156,182,115,220,81,137,19,180,31,227,205,79,247,56,152,24,141,126,222,60,212,120,122,69,34,96,147,13,222,178,16,167,98,187,167,34,20,22,89,178,219,71,85,240,126,113,255,16,144,202,124,79,89,2,15,121,172,18,131,233,57,199,11,153,193,203,41,164,184,198,162,71,153,8,184,209,133,66,71,39,110,120,118,186,7,248,30,48,72,238,1,68,102,240,33,30,185,237,196,198,193,56,58,25,198,225,111,110,76,85,242,31,255,242,90,135,253,160,152,208,145,103,23,228,115,132,35,225,181,138,242,154,231,101,72,169,204,223,64,184,92,
+75,80,24,87,196,174,78,239,227,68,113,250,65,102,172,188,171,98,60,116,111,198,220,162,146,114,122,86,161,87,154,194,121,180,41,224,24,199,88,33,238,200,32,232,94,21,129,81,68,157,143,139,174,8,216,76,33,93,113,246,156,170,64,9,31,49,211,70,211,67,172,28,98,163,204,191,10,128,97,122,5,79,96,24,46,101,152,128,81,61,24,255,33,138,14,247,81,38,204,202,149,60,129,162,29,83,71,79,220,98,52,117,139,96,193,3,32,60,148,8,210,3,145,208,106,249,204,129,135,72,242,6,16,194,3,80,37,244,236,115,97,218,215,44,251,103,60,94,138,212,162,69,9,8,159,106,47,104,21,155,17,72,240,20,125,129,39,71,28,91,255,194,186,91,171,3,24,132,62,236,94,6,242,196,252,163,212,68,111,244,29,20,139,34,230,27,140,46,246,9,52,22,154,88,146,180,143,89,233,68,51,126,252,204,117,169,41,108,36,77,12,80,62,209,139,18,253,102,71,249,137,28,45,218,253,175,177,226,210,223,118,34,140,223,71,150,215,57,41,209,201,197,60,96,250,234,
+164,244,8,42,18,149,153,250,88,114,255,19,62,188,211,21,234,177,120,159,151,201,124,15,79,31,37,168,175,72,6,91,207,9,18,71,143,94,178,29,132,98,51,116,145,115,56,98,185,138,219,137,15,104,22,171,173,105,115,37,234,119,169,227,184,170,5,223,143,77,146,80,244,118,208,39,222,238,130,47,67,4,220,131,199,168,246,25,237,110,49,219,202,5,219,149,116,233,185,129,245,147,96,141,249,46,67,253,159,179,141,103,50,248,49,243,20,190,4,221,81,248,222,21,78,132,48,216,224,243,39,18,152,69,198,35,219,21,196,252,232,187,53,117,154,190,134,147,202,250,236,164,151,214,191,132,147,75,208,181,77,53,114,151,80,43,137,102,249,151,24,220,51,1,208,33,142,215,138,87,16,133,69,26,191,183,74,25,114,10,94,190,56,165,209,42,65,78,180,220,111,41,86,237,254,230,235,144,89,15,192,65,0,50,76,168,96,228,174,0,224,179,4,194,231,234,253,233,213,55,9,106,232,171,163,45,123,192,149,203,51,136,27,170,241,124,246,47,120,180,166,234,40,122,210,100,
+142,28,191,235,222,114,5,81,78,104,9,247,148,30,101,71,53,239,239,238,138,40,162,103,114,153,38,230,126,77,227,77,176,235,223,159,50,204,104,162,54,24,119,68,159,226,21,177,253,182,198,117,178,187,98,221,165,200,155,92,140,160,133,206,178,206,7,135,78,117,42,24,140,87,31,66,44,187,62,2,63,4,18,71,18,3,232,62,46,86,93,177,165,103,158,222,182,254,53,142,148,42,184,239,102,105,53,221,255,144,121,15,149,52,13,66,135,204,132,253,239,0,224,241,94,117,232,193,149,155,240,84,89,122,206,200,255,58,97,235,3,178,93,190,153,140,71,47,159,78,142,200,48,136,187,152,51,181,203,191,87,43,172,20,150,35,137,59,225,178,230,3,141,29,233,81,59,4,26,224,12,5,11,176,114,222,27,9,18,3,67,16,115,44,20,24,177,83,246,160,231,86,222,234,95,253,2,102,122,162,208,148,105,198,44,247,216,255,193,225,16,199,143,2,55,199,31,92,230,87,88,46,102,167,129,125,95,247,181,18,109,109,111,217,139,154,51,238,232,19,88,128,117,11,77,142,
+116,55,17,175,66,125,127,147,94,151,246,108,217,175,11,253,165,2,53,31,217,102,215,131,205,104,28,127,220,252,217,95,134,50,73,247,211,196,12,107,48,99,241,57,132,88,22,180,236,180,219,198,135,132,122,195,3,132,194,44,138,173,161,230,52,86,111,86,187,62,177,95,134,66,120,132,116,83,196,20,212,208,167,55,35,250,140,126,245,137,27,74,40,121,228,190,164,73,68,98,169,143,131,153,34,211,243,152,142,138,46,179,48,48,103,34,246,243,56,109,135,6,161,162,64,41,226,231,158,82,199,56,133,93,181,107,39,226,211,129,118,9,36,223,22,76,29,189,51,157,14,52,94,197,44,40,132,45,235,129,32,103,62,109,6,131,65,155,32,2,132,174,22,33,194,85,245,11,143,25,67,235,147,38,7,237,170,249,87,191,111,203,246,175,213,85,122,51,31,69,75,21,40,79,166,136,53,206,23,193,93,16,64,240,106,131,183,213,140,62,250,165,191,91,153,209,157,189,197,21,82,10,12,210,79,61,192,30,240,144,156,23,148,23,108,207,97,243,33,203,94,171,175,21,21,183,
+176,192,33,76,46,117,18,125,96,217,138,97,124,101,186,3,10,26,37,58,45,6,237,88,11,183,189,234,22,38,119,66,21,28,171,87,29,154,92,223,107,95,203,149,19,38,85,12,213,210,239,173,152,119,149,173,17,45,142,79,43,207,36,116,55,87,33,250,196,116,74,163,130,86,85,186,4,45,101,49,37,2,174,209,171,205,24,118,233,79,217,138,133,131,174,53,253,244,193,154,118,212,198,150,9,210,186,204,130,14,137,196,108,106,145,222,123,107,3,93,242,72,117,2,35,151,98,44,166,101,5,102,36,29,245,164,42,11,8,251,221,121,134,30,132,191,26,39,157,172,40,120,91,149,6,247,238,190,64,31,130,157,176,26,23,172,33,213,227,102,244,221,210,89,191,24,177,39,117,254,67,103,109,15,93,173,158,109,93,229,126,105,212,96,132,18,176,178,77,166,134,2,112,222,195,105,28,61,125,11,137,141,138,27,75,224,220,245,235,10,27,111,62,247,254,205,171,99,73,163,234,242,184,80,51,84,60,245,69,97,243,93,195,86,68,79,89,142,203,163,128,238,172,18,103,83,
+119,0,89,2,94,192,231,67,223,135,49,48,174,222,55,167,166,170,203,190,146,226,174,225,169,27,7,172,26,132,166,60,95,175,9,123,59,177,226,168,131,99,125,31,99,243,117,122,142,167,10,140,159,178,170,239,237,170,241,64,251,98,251,187,110,33,176,165,13,46,183,8,171,156,198,3,174,155,81,59,199,27,126,56,106,129,75,247,127,176,12,203,9,169,54,78,54,239,166,246,1,255,236,19,190,8,201,162,143,25,88,33,196,82,76,240,163,164,218,125,230,83,47,149,74,255,129,63,160,173,65,54,5,101,142,255,230,19,175,67,135,94,217,49,254,15,231,69,98,111,112,213,201,202,224,62,190,171,105,91,175,3,3,215,62,186,226,138,193,111,253,134,162,175,188,134,130,68,4,230,23,14,26,2,52,126,252,139,104,254,252,97,179,134,216,67,163,22,157,18,20,253,16,8,103,74,33,93,242,241,155,74,149,34,177,0,253,102,163,139,82,170,37,172,142,27,47,104,136,83,36,27,88,233,33,230,236,88,17,8,134,157,183,36,25,141,192,40,86,173,178,106,134,39,178,146,
+206,122,29,161,39,254,206,128,252,70,38,36,107,127,233,206,192,68,199,39,95,232,118,211,95,154,233,121,226,6,92,174,34,5,104,95,252,129,93,122,35,111,242,177,24,70,194,18,169,96,14,8,200,125,236,69,63,253,129,203,197,246,102,6,168,0,189,183,218,186,251,236,208,44,207,183,174,161,38,39,22,61,177,226,207,12,153,12,150,28,218,7,241,75,8,243,155,145,109,200,37,236,165,95,196,7,250,227,252,86,145,230,17,86,237,70,195,85,140,224,247,96,115,16,129,15,233,190,40,197,19,244,71,248,249,221,216,51,117,27,13,254,234,31,86,193,16,206,138,189,101,110,117,228,230,85,69,168,133,44,67,210,192,231,223,189,228,8,119,61,155,175,237,41,17,245,176,159,5,26,68,248,63,187,198,202,123,180,199,222,36,88,174,78,253,70,53,54,160,15,59,138,242,84,43,191,104,45,50,250,153,144,41,95,36,169,199,219,113,231,192,146,109,113,175,225,206,15,63,101,149,205,104,111,11,109,157,75,9,90,85,142,213,143,47,182,45,187,200,121,154,241,54,113,162,68,
+221,182,67,34,127,70,202,136,221,237,178,252,243,244,178,116,211,154,243,218,147,165,205,179,122,173,244,142,143,29,73,242,76,156,185,202,171,63,41,181,210,12,119,245,116,48,254,11,235,26,228,219,70,21,154,194,150,173,5,233,235,105,194,251,164,132,105,166,212,157,150,194,175,97,98,83,74,231,90,221,68,206,37,159,62,185,150,243,164,178,6,60,98,237,104,181,223,211,179,107,174,104,246,189,59,149,124,134,89,85,161,59,141,48,204,3,149,232,51,197,224,67,53,107,34,114,43,159,84,213,47,175,153,142,218,132,251,212,196,19,71,165,238,74,199,156,160,169,155,121,93,229,94,53,9,239,112,193,82,159,167,85,160,7,61,16,145,235,250,149,187,204,26,9,58,135,133,110,237,162,176,250,6,1,193,88,235,182,209,20,217,140,155,191,243,227,25,108,232,127,8,223,53,199,237,253,150,134,167,26,141,143,226,21,117,75,121,17,20,17,158,250,234,72,160,128,165,240,70,123,252,119,8,218,98,122,237,220,187,141,200,25,87,7,254,251,248,148,132,150,151,112,60,110,47,182,
+30,145,63,100,123,173,42,36,139,88,24,187,146,0,123,200,85,191,5,142,38,17,53,110,200,193,194,137,136,32,26,238,6,235,111,186,77,91,184,114,181,150,119,239,195,226,138,7,39,215,127,231,157,35,36,114,157,158,142,200,171,137,159,164,9,37,66,244,128,127,55,146,167,242,234,144,242,243,158,240,117,184,235,168,131,191,158,254,168,130,149,2,235,227,231,11,229,225,102,193,92,241,203,47,68,32,112,119,99,141,15,113,99,228,143,159,134,127,89,35,176,176,35,197,207,184,8,44,77,184,219,79,52,102,198,150,29,12,213,30,141,77,96,27,250,240,148,97,63,47,253,61,137,107,195,128,6,3,150,80,181,54,211,87,83,37,91,150,244,123,222,228,91,51,175,237,1,127,30,94,102,238,118,96,24,152,62,118,224,15,47,134,86,41,138,82,93,122,196,180,57,189,130,220,215,123,246,163,2,157,146,32,241,42,57,125,124,234,190,148,250,153,120,252,195,154,169,147,2,90,200,58,160,189,127,197,185,214,6,113,149,78,236,35,31,78,188,24,45,89,73,126,183,133,105,90,
+112,48,123,158,200,240,149,202,216,15,194,2,24,62,136,109,89,85,209,251,251,212,3,30,228,31,105,129,134,251,34,148,167,180,104,23,88,64,202,237,223,150,14,141,242,235,214,199,126,5,90,247,12,47,92,92,127,54,24,13,82,2,181,27,41,43,102,255,236,236,201,63,203,45,116,168,55,103,190,151,183,12,213,212,209,61,237,244,210,12,37,186,132,148,60,54,222,171,3,64,8,180,247,118,42,71,155,49,205,58,194,202,78,182,246,104,219,24,96,142,220,84,205,104,230,108,87,154,123,126,179,134,227,71,92,50,24,49,17,213,25,2,103,241,250,123,13,4,42,236,20,88,107,160,242,129,155,254,237,248,33,159,111,144,4,207,127,255,109,71,169,197,175,96,90,2,194,202,134,18,220,235,170,255,138,144,31,49,71,173,70,23,154,194,241,23,223,3,226,163,138,20,4,75,81,54,58,226,166,92,36,239,144,178,127,64,65,68,188,45,143,252,254,184,149,229,119,47,210,32,248,123,177,90,42,199,246,206,67,62,249,248,117,163,228,73,163,42,234,53,195,212,161,77,233,246,
+216,155,104,39,12,143,62,219,171,151,144,181,103,58,101,119,16,214,63,38,158,109,239,219,117,122,112,121,56,220,37,212,13,40,244,18,156,253,19,211,44,178,76,63,112,238,20,102,188,211,251,105,17,24,128,114,191,121,191,67,31,161,20,218,227,82,219,231,185,100,9,218,254,20,113,44,65,194,69,177,204,37,20,107,35,57,21,18,50,235,71,188,167,49,238,113,6,23,75,245,35,164,73,46,70,151,9,126,255,175,185,132,89,135,146,249,240,82,146,31,132,157,166,29,111,127,102,201,83,231,166,167,68,82,6,78,28,230,84,234,197,247,165,230,198,171,72,144,244,234,70,79,178,148,174,120,6,63,50,7,252,204,146,8,160,182,202,175,109,242,172,123,218,153,173,87,116,58,45,61,201,157,241,80,95,175,237,164,78,76,5,215,184,230,95,227,247,241,163,60,253,120,154,161,6,117,119,137,3,10,181,135,160,234,81,87,207,60,205,118,197,230,27,38,141,59,45,54,171,41,76,20,105,145,50,174,175,101,102,66,149,96,191,88,98,75,49,159,41,233,191,118,213,224,6,9,
+185,180,252,243,128,35,70,76,167,143,193,191,199,91,130,183,182,139,205,130,171,255,206,210,175,72,209,134,118,189,138,185,227,239,235,74,94,117,161,189,100,198,166,107,123,15,42,76,177,12,118,48,91,37,13,56,204,119,189,46,60,28,45,31,23,58,125,40,208,175,219,115,102,34,192,59,145,238,224,130,36,53,238,12,236,174,106,120,245,173,27,76,196,145,190,152,33,204,19,248,220,39,13,40,31,113,160,194,248,80,20,228,72,96,72,127,0,101,215,81,224,64,234,196,82,69,40,201,173,199,254,245,21,161,157,85,186,206,14,82,152,227,227,250,226,198,159,167,42,221,36,24,15,169,150,54,47,126,244,184,213,163,85,6,246,243,112,60,80,125,74,72,92,70,53,105,50,236,154,113,41,253,98,38,166,160,184,22,109,215,189,65,43,163,54,181,197,132,94,241,107,155,244,144,224,126,92,109,108,41,58,46,96,174,178,174,52,110,21,155,187,252,63,53,94,244,242,170,181,29,84,118,97,84,49,40,196,153,74,81,137,128,196,22,71,120,84,177,155,218,181,37,201,201,14,247,
+8,46,188,132,238,182,211,242,253,192,122,38,68,162,24,169,66,161,50,229,65,14,179,236,4,7,12,221,122,16,161,79,144,80,196,87,247,90,87,141,71,88,159,109,31,19,58,63,251,68,174,64,162,12,166,109,190,66,67,87,215,125,208,222,217,140,244,176,100,236,194,140,59,231,85,221,215,151,181,52,38,112,212,241,174,45,221,132,221,212,168,236,68,253,149,86,43,28,12,194,118,13,222,37,187,210,7,47,242,114,93,227,153,90,46,193,53,154,226,94,107,251,254,124,155,155,74,18,146,71,208,189,113,124,83,154,131,32,33,142,29,128,187,35,240,242,178,64,128,184,156,241,220,97,12,9,183,193,248,136,49,44,221,159,164,246,23,241,123,98,173,17,103,145,137,14,113,55,225,219,157,81,137,184,91,254,136,190,58,39,246,61,174,100,95,140,173,78,27,171,219,131,223,197,8,117,150,64,32,25,155,186,144,62,224,132,178,0,59,65,78,239,42,180,249,251,151,29,205,50,72,235,228,236,233,227,130,10,32,137,156,15,252,211,125,41,166,13,194,8,5,76,137,240,8,247,
+6,77,197,62,61,193,74,101,255,226,99,154,244,203,54,163,71,72,38,186,69,106,79,84,68,232,96,16,23,65,137,255,2,23,115,107,14,32,144,0,33,225,252,148,255,137,71,212,104,204,156,103,59,221,203,164,146,54,14,0,242,35,164,14,17,176,185,216,134,8,99,115,178,132,138,202,215,160,167,90,142,255,137,59,71,142,8,16,121,27,173,34,244,65,65,243,45,135,22,101,150,159,205,222,157,26,9,252,180,19,84,65,138,9,207,40,111,119,78,243,192,46,140,208,250,48,171,61,74,180,94,150,150,6,217,90,193,124,21,164,110,97,89,113,34,169,126,188,40,62,32,114,175,3,160,92,208,158,42,221,201,193,110,125,24,115,58,231,179,28,3,87,79,215,134,30,141,82,239,171,232,222,68,32,150,196,99,117,22,134,177,198,252,226,47,30,169,95,176,187,143,22,75,35,136,105,102,140,3,66,216,238,150,42,207,235,184,157,252,183,74,113,38,203,149,127,224,71,104,224,0,43,106,212,137,94,99,147,109,229,253,128,135,47,197,160,194,159,146,158,42,90,207,16,252,82,
+184,214,184,84,88,30,6,195,87,12,183,102,19,101,5,197,203,40,64,114,2,64,28,137,215,148,40,223,207,151,153,220,114,183,87,192,18,143,159,242,100,222,206,78,134,148,4,3,126,150,99,11,239,250,140,55,51,47,214,124,44,90,103,115,253,161,175,175,81,118,143,209,147,71,68,49,230,145,67,197,217,34,27,132,205,246,245,104,48,27,81,149,189,244,84,248,60,160,198,37,79,19,231,163,91,71,34,69,119,242,183,84,42,179,168,239,112,19,115,185,161,69,141,203,156,222,225,49,206,144,79,158,58,197,99,225,30,101,0,36,247,128,186,28,210,85,26,165,12,92,101,105,228,213,101,180,145,28,83,159,185,156,201,63,12,182,14,212,117,86,175,114,220,137,141,143,132,254,12,164,56,173,197,60,247,37,108,17,57,202,2,228,250,170,249,190,109,241,221,75,181,9,27,7,8,150,188,68,33,33,214,48,85,151,223,156,250,88,13,118,146,156,235,32,105,43,230,43,13,191,192,102,180,93,23,40,8,160,34,9,201,34,60,214,24,153,17,82,215,113,71,238,184,169,219,169,
+78,136,43,234,106,223,234,81,56,148,167,73,210,94,51,19,250,216,82,153,99,241,99,83,66,115,82,106,189,19,114,133,217,144,229,129,12,56,195,103,152,21,248,151,80,76,194,227,70,205,168,225,244,250,173,23,207,101,52,120,136,171,232,47,230,132,99,62,208,228,124,33,106,178,219,83,6,86,68,218,116,80,76,141,46,221,236,170,247,53,72,185,147,135,13,54,125,218,184,217,12,58,57,112,34,3,185,119,169,97,44,150,198,24,218,216,195,43,226,179,217,155,211,90,41,182,55,106,21,115,203,176,32,13,185,245,34,212,253,255,242,247,81,81,247,0,135,142,37,11,52,242,121,64,46,67,126,36,198,28,88,246,240,221,66,177,23,3,54,207,214,180,85,252,139,63,43,196,131,226,76,165,89,24,213,168,91,27,88,180,185,234,212,104,29,223,203,182,72,21,234,218,128,71,154,124,42,214,17,199,147,163,194,184,95,97,220,148,103,169,45,123,153,2,239,6,231,88,156,117,131,69,168,121,128,192,206,83,69,52,119,15,228,94,28,216,240,180,140,253,103,102,78,187,156,180,
+87,70,139,248,51,136,33,241,51,151,215,120,176,105,30,98,128,140,173,209,71,146,100,183,17,194,85,230,66,161,232,212,160,89,210,19,33,193,83,145,19,24,205,88,141,180,161,214,57,91,83,99,118,185,239,99,150,125,135,101,115,130,155,231,132,22,189,138,56,197,59,196,181,172,85,20,114,44,43,245,195,180,163,49,30,174,72,77,124,78,72,78,228,148,109,220,67,157,9,124,229,162,154,39,240,52,246,131,178,135,94,189,15,238,233,87,130,184,54,87,121,126,44,45,77,133,196,189,50,234,107,222,195,96,44,238,100,199,192,187,103,135,84,220,205,246,181,239,244,166,6,43,12,67,125,194,253,8,189,203,177,18,253,45,69,248,13,230,251,156,58,213,176,142,118,222,56,147,174,45,233,100,126,44,136,55,112,132,117,169,123,162,16,49,128,183,187,71,92,176,85,147,249,137,137,118,38,111,17,74,72,25,173,42,29,146,109,83,60,162,185,32,72,107,35,201,58,199,44,188,91,153,86,208,70,50,204,47,224,187,207,175,246,45,8,145,24,148,106,121,145,139,22,83,8,15,
+253,77,25,115,44,230,157,6,73,110,237,26,174,37,175,14,188,169,45,240,205,90,125,16,211,180,48,174,241,42,37,254,124,119,4,20,94,29,26,53,248,78,28,87,250,80,129,247,214,169,229,23,218,102,41,102,58,128,22,239,171,72,254,211,202,249,220,235,16,164,92,120,39,107,248,163,25,238,183,156,120,219,196,234,167,173,138,236,251,41,181,124,227,231,101,16,207,234,15,86,251,158,182,221,4,227,41,78,195,181,245,42,58,91,209,149,176,16,27,204,46,61,175,240,228,85,214,199,168,8,105,4,164,63,41,176,210,123,73,184,12,43,125,210,160,24,98,124,155,194,203,108,84,21,72,108,125,84,175,61,182,211,119,121,93,169,56,72,175,167,77,113,28,3,91,206,143,166,235,54,186,137,124,10,38,1,135,217,56,111,239,63,222,84,110,244,141,64,97,116,147,62,1,179,45,212,138,8,21,96,96,219,19,241,178,243,47,71,152,24,208,132,120,230,109,21,66,48,173,91,132,66,68,251,145,204,208,163,217,30,208,243,162,159,37,126,198,226,20,139,52,185,32,121,25,8,
+3,234,247,189,142,168,149,31,153,222,84,205,102,148,250,173,249,166,142,110,96,107,251,2,72,222,85,197,135,137,134,250,144,62,238,97,101,64,105,46,243,146,174,209,133,222,23,188,172,14,191,124,182,113,53,160,81,99,180,177,216,115,122,207,99,131,75,40,29,13,138,233,153,32,107,119,49,204,155,207,45,233,108,134,73,51,84,20,155,46,8,240,201,230,70,225,170,92,160,245,253,147,208,217,179,76,202,41,169,199,191,25,72,11,58,153,49,250,27,110,173,34,14,138,124,148,101,34,136,245,71,235,71,55,222,155,64,182,186,222,202,195,173,18,173,48,22,97,120,116,232,138,124,0,112,107,125,132,126,163,83,38,250,237,35,245,138,186,46,18,157,4,132,239,188,218,166,135,41,2,186,230,37,249,183,161,252,247,94,132,170,124,225,51,145,106,3,160,239,199,29,130,237,20,115,211,250,132,81,5,145,95,71,138,75,21,90,195,141,157,116,10,140,240,129,127,250,17,107,243,138,128,119,248,204,69,0,70,181,74,248,209,67,169,177,248,175,73,128,163,132,40,0,212,232,248,
+73,167,245,82,220,64,205,171,233,36,32,88,86,153,92,14,243,102,85,184,210,73,120,180,38,116,95,227,48,241,99,86,17,65,110,196,176,65,211,174,43,146,52,19,201,108,206,45,162,35,239,95,150,186,108,230,150,165,48,75,147,104,197,61,156,227,47,149,218,92,207,21,131,118,46,120,12,136,48,25,119,20,8,218,91,227,142,26,255,243,137,97,8,57,122,119,113,240,51,40,217,82,135,181,120,69,250,80,163,31,49,75,122,239,162,123,120,69,132,35,247,183,201,181,235,202,185,156,199,124,115,152,230,249,171,46,249,226,145,133,162,161,55,163,69,224,42,210,11,48,188,192,1,65,19,82,240,179,232,77,146,198,2,170,147,199,202,160,67,92,15,48,240,83,10,87,33,212,115,132,223,122,201,22,48,198,52,232,184,143,40,189,143,187,214,186,216,128,241,0,87,97,228,124,142,183,226,17,13,126,83,50,139,174,185,99,191,2,237,87,123,166,123,24,161,184,75,122,232,175,31,142,48,227,81,224,197,145,61,76,87,238,229,116,93,196,164,242,61,140,150,68,188,143,99,95,
+188,26,247,129,234,254,30,219,197,198,215,156,138,111,163,198,145,106,117,55,233,60,230,56,167,176,126,249,216,156,170,102,239,197,46,124,79,76,233,62,172,247,64,3,17,170,157,238,226,195,178,38,73,235,91,217,9,133,6,205,59,1,64,65,161,68,131,158,242,146,88,111,173,202,217,21,218,250,79,51,24,119,222,174,53,34,0,68,63,138,58,58,57,195,121,176,70,238,198,50,228,212,29,136,127,160,68,62,235,237,197,125,112,196,184,33,107,226,1,102,101,137,40,64,207,70,176,255,165,247,246,241,215,119,24,92,120,254,127,71,207,202,158,69,59,193,252,35,10,208,177,111,109,152,51,113,92,105,82,40,179,193,87,244,35,80,72,175,32,174,16,240,55,45,187,178,153,12,216,10,132,73,83,9,124,1,143,8,31,108,174,133,242,14,243,158,190,130,181,171,212,104,176,35,184,218,102,226,50,38,7,87,206,199,59,36,131,121,96,149,146,91,41,191,133,90,142,120,125,41,83,105,174,36,140,6,133,145,170,13,250,85,184,231,158,210,41,234,184,95,201,113,41,143,247,192,
+128,175,99,98,44,138,163,131,7,0,239,228,234,184,35,42,65,193,177,62,199,142,164,26,226,134,22,247,93,151,133,147,145,59,202,134,210,184,104,237,84,15,7,211,65,98,164,133,92,94,207,102,204,202,219,137,39,71,129,204,13,218,45,237,82,65,160,212,29,96,150,43,165,39,41,55,22,110,120,10,190,70,117,95,79,183,86,129,228,118,250,241,14,248,42,155,15,32,93,17,252,105,173,101,43,178,27,189,252,196,144,60,225,251,65,4,253,239,183,111,117,65,242,33,95,131,78,25,147,221,53,196,97,147,80,174,223,130,111,21,243,130,112,57,208,36,72,19,60,203,90,192,149,252,84,156,179,254,148,23,63,203,135,122,180,59,34,233,53,114,167,71,218,246,191,250,43,225,251,243,14,84,183,187,124,235,225,179,32,7,229,26,69,126,42,170,203,58,214,108,173,69,212,164,78,66,214,191,106,89,193,171,40,103,189,128,242,24,53,138,127,211,237,199,165,161,227,101,198,6,42,29,5,230,127,55,214,73,64,55,194,75,85,127,120,97,43,190,65,49,108,142,64,80,247,21,
+208,226,103,249,249,183,95,169,76,48,9,213,89,194,219,179,156,44,158,210,110,115,43,132,5,169,96,163,142,40,127,176,165,68,147,131,159,255,143,250,147,126,171,63,201,66,93,208,32,211,181,131,211,255,210,187,150,10,164,224,69,79,210,42,112,107,39,237,103,34,143,142,122,202,27,123,235,205,251,60,248,17,165,210,31,141,189,125,153,199,43,105,183,245,182,136,238,193,154,157,117,3,25,213,209,103,21,108,41,146,195,39,91,151,17,173,26,232,224,186,100,187,169,108,141,8,74,208,122,190,25,39,46,159,206,45,83,163,83,178,200,202,6,48,163,236,138,47,111,123,163,128,159,107,38,147,13,145,64,102,109,159,138,130,166,241,204,157,237,146,107,170,11,45,237,244,182,144,238,97,6,236,149,169,177,88,28,130,250,124,171,48,231,98,1,135,93,255,103,42,23,33,139,29,163,181,242,49,153,48,103,10,51,29,198,74,116,220,90,26,252,96,4,241,207,224,90,22,51,26,103,217,229,244,112,76,116,220,135,231,245,128,174,20,217,249,90,204,10,102,237,98,24,26,38,135,
+71,10,22,213,244,190,250,11,3,6,219,46,219,96,106,39,36,239,61,179,227,130,43,8,188,57,202,36,80,143,142,151,90,125,23,166,121,111,178,183,159,82,81,125,161,187,103,205,185,160,45,187,88,215,172,31,53,23,163,79,68,188,150,190,172,19,212,72,222,102,48,61,48,61,79,32,240,211,198,33,73,255,82,35,102,9,133,237,88,131,182,123,28,103,87,13,3,208,95,166,147,128,56,37,154,137,182,158,78,185,76,168,175,108,217,153,247,177,47,158,134,235,7,12,82,56,243,79,69,222,53,212,77,209,235,242,247,97,182,245,84,188,204,169,24,0,120,65,92,247,245,253,108,139,87,230,116,59,243,156,204,48,93,227,154,184,243,212,23,147,184,229,154,190,237,85,54,196,145,213,104,16,170,250,147,107,111,56,228,138,105,209,52,246,213,145,23,114,14,248,172,191,34,120,117,220,217,1,224,137,105,203,22,170,41,63,159,185,255,154,1,69,211,98,108,98,168,36,91,155,177,82,161,99,81,12,161,58,2,0,89,182,4,44,71,248,112,245,251,231,11,237,50,19,213,15,
+182,91,147,93,247,48,0,138,72,53,193,135,102,153,200,139,183,172,225,17,236,27,215,25,14,78,157,248,182,142,174,144,220,250,95,99,36,29,209,103,127,120,164,21,106,208,40,57,244,98,88,137,199,51,172,122,66,34,185,53,212,149,8,0,172,113,4,164,68,124,122,225,230,141,86,170,141,67,85,226,110,175,96,81,239,8,121,201,210,198,69,196,103,110,99,91,249,223,254,81,91,201,70,7,223,110,75,217,1,36,28,240,191,243,12,23,4,202,24,180,223,250,11,210,5,31,212,191,111,108,105,104,24,87,124,128,113,121,96,145,32,217,22,149,105,76,163,68,179,176,202,71,228,187,129,98,153,64,173,20,8,166,116,238,127,252,190,250,119,26,75,137,251,125,15,139,168,36,66,116,186,169,196,64,116,186,169,148,66,116,186,169,20,187,201,69,84,250,135,207,254,78,128,225,16,153,55,145,40,68,230,77,36,17,145,121,19,153,123,184,57,24,193,22,71,100,222,68,2,127,102,138,213,127,102,74,62,255,204,68,39,255,204,12,16,255,204,68,189,254,169,121,147,123,83,243,
+225,253,79,77,52,238,79,77,160,244,167,166,237,225,79,205,236,127,212,44,198,255,212,4,194,191,106,110,108,80,118,115,27,227,124,101,255,251,19,76,124,188,13,218,253,199,46,241,3,21,21,184,233,155,191,132,117,95,83,210,174,109,13,41,251,109,7,78,252,224,178,246,17,2,251,76,30,213,99,186,87,231,107,73,116,147,114,65,195,15,184,226,107,145,192,212,5,241,115,109,219,255,211,203,216,235,80,221,50,196,244,28,76,61,201,81,53,159,95,150,19,29,41,122,170,28,72,12,77,232,159,201,95,179,86,186,111,29,18,209,196,106,226,182,177,48,163,241,178,141,207,52,242,20,241,213,131,139,109,238,127,231,52,39,74,116,52,248,150,180,25,159,74,88,23,78,121,90,198,8,62,187,35,216,106,229,152,57,242,91,143,126,159,43,116,159,185,111,232,188,213,41,254,208,47,221,110,136,86,202,169,165,71,41,147,95,124,115,17,49,210,227,27,84,116,255,67,52,236,169,109,183,83,133,97,30,203,230,83,38,94,230,32,246,31,25,195,74,90,89,172,111,111,174,145,47,
+165,179,122,116,174,31,206,57,54,79,247,9,240,139,133,34,238,114,228,39,8,23,102,27,110,231,157,163,32,196,50,17,49,80,182,152,199,201,119,119,107,94,245,59,211,92,233,142,182,134,236,251,37,107,4,65,239,27,245,122,35,133,221,111,45,31,217,252,254,246,96,120,86,216,179,228,39,22,132,251,149,32,96,228,202,208,75,98,39,111,72,9,179,136,65,142,139,24,120,132,21,235,204,13,137,89,95,83,62,223,77,255,54,92,194,208,104,205,28,121,48,207,158,200,41,7,122,139,223,177,81,159,209,239,139,110,247,177,228,220,28,100,170,215,17,245,185,55,91,246,116,240,212,202,18,13,122,245,175,203,37,164,60,175,252,251,110,187,232,32,135,89,125,243,248,73,210,82,211,177,245,51,227,145,10,5,163,4,132,150,168,37,26,29,122,89,120,126,156,25,8,102,166,151,239,211,0,53,217,79,205,197,249,26,125,93,19,184,213,174,88,102,64,74,54,254,40,229,236,204,175,107,220,69,73,31,80,239,115,231,2,217,136,156,1,59,34,6,89,119,140,229,104,8,134,69,
+115,40,198,8,244,69,191,243,198,188,177,88,150,165,97,199,157,211,157,121,51,184,169,185,20,241,110,106,98,199,15,55,39,234,210,198,65,228,167,166,238,235,155,230,70,64,68,10,222,73,24,127,1,6,232,254,2,76,186,255,11,176,34,238,47,192,70,209,129,142,56,83,224,233,93,139,111,121,164,24,166,218,241,177,216,26,52,227,223,59,120,70,6,148,106,33,178,40,106,130,231,85,153,215,194,208,160,21,224,113,60,238,116,66,0,82,206,191,33,50,49,93,61,122,165,248,250,18,51,57,143,69,102,153,3,61,170,150,135,221,1,51,252,72,98,208,202,190,14,139,94,137,117,59,44,32,45,34,105,189,248,154,205,18,184,189,151,93,190,124,12,20,155,113,144,113,136,137,87,2,174,139,80,16,167,40,192,226,217,70,245,41,163,45,13,58,182,236,245,177,118,134,102,62,179,168,240,163,195,191,108,30,96,148,158,129,44,127,220,64,236,51,235,145,90,199,161,81,163,15,2,158,17,137,161,91,132,159,112,69,153,64,131,6,125,58,243,250,187,59,152,68,184,174,46,82,
+95,6,199,231,155,31,14,52,66,52,74,13,189,232,197,232,241,223,60,75,142,140,205,91,232,142,178,190,25,180,202,234,148,213,63,27,0,32,9,29,149,193,127,232,110,136,56,6,109,127,136,248,240,255,30,215,131,63,248,65,19,111,176,150,37,236,42,124,239,29,140,91,226,162,55,152,73,148,108,47,139,123,9,120,33,192,17,220,242,151,207,168,255,96,130,122,247,39,142,166,252,19,7,189,252,137,107,91,254,196,1,102,224,15,96,255,51,207,250,63,222,223,19,238,15,32,131,226,63,13,213,134,63,128,228,0,127,0,249,59,39,134,136,188,71,253,1,36,77,252,7,144,127,104,166,254,171,119,16,145,146,226,31,64,50,254,212,252,191,150,7,254,39,28,175,1,237,91,253,163,226,223,146,196,255,69,185,255,127,229,135,135,63,53,85,12,7,40,223,202,90,119,192,237,253,252,127,59,215,187,226,107,131,192,149,230,255,121,148,216,251,212,163,12,199,190,3,226,111,255,59,143,32,188,167,40,123,101,210,8,42,68,42,231,255,184,167,206,219,199,255,121,143,88,20,126,
+113,63,6,0,201,95,90,2,31,254,115,145,125,200,16,184,255,111,121,233,184,32,120,108,84,234,246,233,119,12,144,22,65,252,77,220,19,23,161,11,0,252,78,10,102,193,241,239,164,32,14,130,198,132,6,225,19,245,8,0,187,44,225,17,173,210,169,224,168,2,113,123,39,26,142,70,167,191,253,213,70,248,214,95,181,255,246,87,255,198,15,127,243,57,51,247,187,62,118,91,143,1,156,152,219,250,92,231,79,46,245,38,23,217,186,243,110,254,157,64,20,221,142,151,109,51,146,43,175,107,231,206,242,156,222,65,20,11,242,37,66,146,6,87,89,29,75,134,5,139,232,138,201,241,114,80,162,101,236,69,194,52,7,0,253,218,13,254,43,11,199,226,79,249,239,251,220,68,67,133,230,114,195,101,105,49,42,197,252,115,145,78,243,177,197,22,154,174,189,36,211,38,52,137,121,227,227,152,27,221,252,166,88,215,175,126,88,135,193,74,26,78,151,152,125,48,228,181,69,104,139,124,253,164,66,175,38,97,110,145,17,118,17,54,103,93,178,1,244,69,166,243,207,23,38,165,
+201,127,167,231,133,68,159,212,175,115,212,39,153,108,241,103,159,171,68,96,57,98,211,87,51,168,78,204,25,216,126,192,50,180,153,132,73,47,62,133,79,147,18,233,70,117,103,104,166,92,197,166,28,4,179,220,95,187,253,142,34,20,174,198,73,133,138,39,122,223,42,66,77,80,202,48,160,228,225,205,110,93,231,133,154,83,204,189,140,190,181,206,10,223,35,93,242,34,199,207,245,88,158,81,134,6,101,134,145,104,29,27,244,153,199,9,174,219,123,153,69,29,60,2,207,39,88,207,15,105,92,226,45,170,144,85,180,57,132,165,77,108,217,193,161,158,93,19,119,241,192,253,74,200,94,87,41,214,129,224,237,130,198,232,46,4,98,85,91,91,37,197,207,242,194,167,174,232,123,190,14,116,98,182,148,225,50,125,45,85,87,5,139,179,53,92,251,47,39,124,156,184,118,100,46,234,102,5,188,141,25,153,108,116,234,66,184,179,25,127,228,250,108,83,115,101,29,226,184,181,55,30,226,146,173,35,39,254,208,88,45,166,110,90,232,100,31,102,165,131,36,87,64,51,37,187,
+83,155,209,165,100,42,209,251,173,186,166,82,152,168,25,205,117,228,212,124,75,94,251,3,123,226,9,107,252,166,20,46,196,120,168,47,27,80,41,195,178,113,135,164,7,113,82,72,32,237,245,205,31,210,176,85,114,165,251,181,60,31,30,174,10,226,83,22,67,122,253,38,20,116,220,32,223,207,211,162,227,203,189,6,151,25,103,91,142,181,250,165,169,119,223,90,168,207,228,58,239,197,86,27,167,119,137,80,204,242,33,48,39,185,235,145,83,119,60,202,100,193,177,1,237,118,47,155,207,166,212,122,159,29,160,148,70,214,228,60,38,169,180,159,246,194,247,224,57,132,237,159,239,158,142,132,164,215,237,77,127,52,73,221,97,193,168,230,186,151,9,221,90,224,110,56,175,92,84,49,67,131,199,209,232,30,87,176,101,191,86,189,208,122,63,174,221,55,178,83,51,150,160,245,32,69,244,120,86,250,206,69,159,2,30,215,88,220,56,121,230,162,85,208,221,42,213,136,245,10,212,151,183,49,94,2,240,142,115,222,188,251,109,2,135,71,181,137,185,222,94,243,109,198,121,188,
+127,36,149,215,246,143,177,248,84,95,74,225,145,95,210,183,190,3,188,127,183,17,222,181,245,164,83,196,239,196,77,238,171,131,224,154,213,158,132,240,160,23,202,147,22,26,7,179,184,198,14,136,145,143,204,25,249,10,33,6,214,65,164,134,81,9,63,128,151,181,12,12,235,79,16,5,247,121,255,108,53,130,152,159,10,212,42,244,72,166,21,153,243,29,153,130,116,202,72,94,77,77,27,239,157,97,171,83,246,37,15,233,132,244,73,83,121,142,242,213,223,126,109,115,154,124,225,80,112,31,173,210,32,183,154,226,62,157,71,247,90,34,124,121,27,244,129,241,123,250,235,119,236,151,83,122,91,193,213,21,195,231,238,150,249,86,78,194,69,151,40,158,45,68,4,2,204,56,122,223,91,129,26,61,38,17,159,108,253,240,30,244,66,71,115,233,71,29,118,72,178,52,19,135,183,184,30,221,23,161,190,72,123,67,200,202,45,143,213,126,243,152,225,182,224,55,143,181,110,60,164,255,59,103,28,110,232,30,226,79,26,48,207,162,160,0,61,242,17,167,31,59,218,168,3,28,
+130,14,120,4,207,9,191,120,110,187,225,249,47,64,77,110,120,126,147,76,1,42,55,201,120,180,247,153,61,64,22,223,97,111,171,43,183,60,113,19,223,167,253,137,215,221,61,196,127,129,149,77,130,113,116,180,112,72,39,1,11,14,178,84,78,184,117,225,223,109,0,2,235,55,201,165,224,228,87,242,13,87,42,55,92,121,176,254,187,65,44,112,117,229,9,143,108,202,255,132,123,253,191,177,235,4,229,111,236,90,140,255,27,187,30,255,225,173,121,76,252,27,187,6,188,127,99,215,191,249,192,73,132,163,15,209,233,175,100,86,248,111,160,59,139,28,3,114,189,120,207,48,206,17,208,39,174,7,188,216,253,223,247,99,255,226,80,131,80,228,62,174,6,177,127,161,217,96,137,93,13,30,138,84,222,47,222,232,115,21,232,112,239,2,199,119,28,209,106,133,23,127,14,166,191,131,225,7,99,137,224,136,189,81,16,72,246,226,111,26,117,205,204,73,167,167,253,152,128,69,168,219,83,162,95,111,98,235,132,84,168,68,134,163,167,164,217,11,202,175,137,231,83,214,184,243,
+8,76,84,71,46,54,155,184,196,179,24,251,29,107,14,72,0,192,50,247,42,209,185,103,252,204,169,63,24,154,254,34,148,201,195,175,54,99,41,207,202,59,242,142,62,133,212,252,208,165,214,117,107,200,28,44,220,91,40,130,113,255,201,62,193,34,144,37,241,216,140,42,155,83,245,162,193,203,183,214,121,162,225,146,233,240,102,48,124,229,24,208,113,164,54,188,71,187,35,183,185,86,177,1,57,247,53,186,197,139,120,73,20,4,153,80,186,179,206,250,69,4,56,11,210,206,70,77,71,215,39,82,131,208,75,192,229,127,12,91,246,240,100,36,122,71,2,42,114,190,208,244,102,227,84,213,217,28,17,102,201,222,17,82,37,75,255,91,77,121,148,213,237,136,221,39,83,39,170,107,236,209,66,136,154,199,124,78,117,201,163,151,63,129,6,21,54,114,83,246,200,3,96,229,83,111,255,126,100,120,39,25,129,103,29,81,219,62,212,109,13,78,97,170,60,120,144,146,250,204,99,63,96,205,141,201,85,142,2,0,29,162,102,94,48,131,255,254,161,12,135,97,74,80,45,136,
+95,3,239,72,161,64,125,42,148,188,13,154,231,225,247,125,222,16,241,84,13,126,180,15,212,150,95,22,125,177,70,232,87,214,207,77,222,51,240,206,31,155,197,84,137,187,117,159,185,243,63,107,144,88,0,80,86,212,184,99,137,31,208,120,131,73,145,117,197,147,98,119,203,172,176,247,243,183,91,203,98,26,66,4,22,43,70,115,187,84,85,79,30,43,23,129,106,89,32,68,74,108,154,158,63,71,69,28,3,252,231,239,50,88,101,7,203,20,184,10,190,42,34,199,111,225,79,47,169,18,238,206,171,80,31,247,247,156,167,99,162,255,85,213,79,156,220,251,165,119,90,113,67,142,121,42,225,145,205,184,195,104,238,82,247,175,100,107,44,78,21,98,147,101,148,72,156,146,56,93,54,20,97,209,200,246,218,151,121,222,231,107,228,88,234,113,159,37,56,12,235,205,40,225,228,157,32,249,185,128,111,33,33,168,176,101,91,69,39,171,222,249,56,50,96,233,0,102,185,128,196,252,95,242,155,229,136,242,132,150,170,127,75,121,115,172,214,158,39,254,252,210,62,26,40,207,
+187,96,113,74,254,192,151,160,229,119,153,142,2,102,107,23,136,241,230,43,38,196,196,35,191,255,239,144,73,30,240,175,69,85,51,183,209,88,107,218,109,220,149,166,216,162,217,200,198,219,214,207,163,105,249,236,62,151,223,253,241,184,105,240,165,128,208,134,132,107,89,29,51,15,217,37,172,188,28,137,42,13,193,181,13,48,152,204,137,137,248,28,144,244,206,93,154,190,248,216,77,43,219,47,144,174,136,220,53,42,50,17,247,86,246,20,169,48,211,59,120,145,20,204,58,40,197,95,6,53,226,120,79,100,254,220,223,86,73,220,143,226,85,227,198,159,120,163,123,127,5,234,86,172,4,18,214,152,145,122,135,214,14,206,206,23,85,77,40,237,164,51,206,119,217,250,136,78,88,95,66,230,141,247,120,173,211,52,90,244,184,227,116,191,0,31,128,193,217,38,48,122,199,24,51,50,209,162,49,244,144,34,50,37,119,253,233,159,1,42,89,80,237,246,37,65,66,144,53,206,247,206,79,179,164,215,92,19,22,112,227,70,153,208,34,146,179,70,200,209,102,63,56,210,255,34,
+238,77,159,27,203,178,252,176,127,165,98,62,216,51,214,180,58,44,59,20,146,252,69,138,177,67,49,97,73,214,23,135,194,161,152,112,101,87,103,119,167,93,93,89,174,101,90,253,237,1,32,8,144,0,177,16,32,0,18,59,64,2,32,177,3,196,190,18,196,66,18,59,65,236,251,14,98,223,247,197,15,64,102,117,85,119,141,213,211,51,17,102,100,6,238,123,239,220,115,207,242,59,231,220,251,30,30,110,215,81,66,60,69,202,59,4,248,14,5,240,34,226,202,158,120,158,250,74,8,134,31,183,93,239,176,78,2,125,148,11,251,132,188,234,190,186,226,150,225,131,164,203,45,138,64,179,0,137,58,242,210,120,91,87,10,10,51,29,103,124,52,45,63,76,0,192,15,102,98,48,21,111,51,241,224,154,15,166,149,67,54,9,13,206,27,203,15,226,203,131,146,113,55,243,101,236,211,212,118,62,188,77,83,15,206,22,72,73,154,42,105,131,162,232,2,139,1,150,221,131,221,11,102,200,166,24,221,92,115,253,178,145,11,1,104,129,4,101,27,124,108,210,205,164,170,49,
+230,40,122,122,203,216,167,44,87,200,190,195,4,199,152,215,107,50,146,3,108,223,200,4,249,245,132,164,139,195,179,83,106,73,175,7,21,147,209,182,223,231,87,107,155,25,84,185,35,190,237,176,143,189,12,58,144,131,238,235,105,47,193,18,116,60,96,120,244,168,14,124,98,42,153,164,35,77,2,201,34,38,60,103,60,169,237,44,78,171,170,28,10,22,121,10,153,142,135,176,232,218,16,74,197,164,200,11,142,227,240,152,27,17,197,67,193,32,93,222,54,100,50,153,122,130,221,51,249,34,182,251,172,219,117,61,161,92,106,14,111,45,224,18,124,8,152,0,110,74,10,231,224,178,227,225,240,214,72,58,86,84,229,188,9,150,168,234,179,123,114,201,6,184,128,234,177,62,254,1,160,9,234,66,168,40,26,7,207,116,71,245,240,163,27,110,55,113,75,9,1,89,252,240,68,96,62,116,237,105,91,250,73,253,32,166,33,216,187,172,94,241,113,196,104,201,169,147,46,187,88,183,180,237,131,213,170,189,234,135,109,122,234,25,204,43,111,214,243,110,18,197,79,59,218,63,
+15,86,76,234,108,193,129,3,228,231,19,52,51,3,99,60,133,226,38,31,45,13,68,31,165,126,138,206,251,229,94,154,212,63,33,123,76,165,222,189,145,232,118,168,119,239,219,80,192,110,249,11,85,99,113,74,151,205,37,54,74,206,43,126,33,217,238,207,36,122,157,229,245,176,76,101,235,50,100,117,83,100,56,160,189,186,183,30,191,148,12,248,36,94,118,162,165,101,47,155,141,6,97,4,239,54,144,84,33,60,91,73,94,223,129,83,115,239,44,166,31,5,80,174,74,126,87,55,116,158,16,234,140,30,192,193,207,101,27,59,65,21,88,227,77,177,40,170,44,214,232,95,231,249,250,89,182,208,3,179,175,246,153,196,198,237,212,125,17,103,155,237,54,38,155,59,157,52,15,96,220,139,107,120,111,76,62,84,10,233,70,197,221,145,148,67,24,251,28,10,210,243,182,212,159,246,182,98,228,78,229,150,49,109,100,203,227,19,229,176,13,252,55,48,94,217,103,135,236,215,235,174,15,9,210,227,47,225,18,210,51,26,2,248,234,61,25,233,216,55,109,54,148,254,74,196,
+150,70,109,140,250,228,19,25,235,149,194,42,109,254,50,30,245,206,108,178,178,113,104,43,239,205,162,56,123,170,231,67,39,154,89,121,108,192,191,150,47,235,214,173,242,96,101,229,144,244,184,58,251,90,175,219,85,107,231,204,38,46,193,83,207,213,146,125,194,9,129,227,180,51,148,42,136,107,253,253,108,251,154,36,184,50,186,223,85,115,192,106,219,85,115,212,238,190,222,118,5,3,83,129,147,9,112,46,97,222,199,137,244,28,92,109,253,88,61,7,231,35,187,202,205,75,238,95,208,34,162,246,47,104,37,1,55,237,26,46,89,10,124,37,219,13,70,133,3,235,198,214,147,132,23,16,175,49,121,221,126,7,250,84,175,215,71,48,173,104,50,233,22,95,222,155,17,187,21,211,96,161,10,16,109,12,134,129,1,74,81,238,152,67,146,97,244,50,233,247,33,59,245,182,18,212,81,0,108,29,44,161,44,217,199,249,122,88,72,232,145,143,23,206,7,149,12,39,231,172,106,225,92,189,1,123,57,41,179,84,56,214,203,110,125,92,246,183,95,108,53,78,254,37,115,84,
+140,98,138,190,88,49,26,141,166,197,183,198,144,70,4,162,160,245,97,190,17,66,29,56,216,77,58,123,98,243,229,7,21,111,95,156,138,94,234,107,124,108,231,148,61,207,112,239,116,148,139,42,126,114,226,122,78,198,156,232,68,199,39,110,42,63,216,155,127,67,146,196,149,188,248,17,149,219,185,65,159,37,81,240,51,3,175,45,168,70,52,237,171,101,64,243,0,133,193,46,91,219,9,90,84,235,161,39,40,203,172,177,183,196,203,164,82,191,154,104,19,115,137,170,238,138,240,34,120,186,129,247,93,237,138,15,52,233,249,199,184,178,138,95,198,182,59,162,109,182,198,99,34,54,15,217,125,232,5,147,160,251,217,166,222,19,44,95,196,59,36,50,114,167,91,36,14,103,32,78,13,107,33,220,56,155,220,102,233,183,94,229,30,222,161,83,20,161,35,59,202,26,86,24,125,190,139,180,169,98,178,209,181,95,182,24,196,164,28,33,150,170,163,156,233,154,207,12,144,165,29,228,153,19,19,233,212,110,188,202,244,134,81,136,179,226,19,185,42,110,144,169,229,145,105,118,
+86,154,221,247,78,96,231,6,194,213,120,119,187,64,81,3,163,217,66,56,191,229,173,246,3,177,118,179,72,54,201,186,155,69,94,94,222,237,102,145,18,174,108,55,171,131,3,156,221,44,242,90,188,123,46,228,190,185,145,195,67,81,205,152,71,122,56,85,240,254,62,239,243,237,222,147,2,129,136,124,216,3,81,150,218,3,17,135,218,3,209,243,188,7,162,32,184,7,226,199,245,63,138,36,32,29,103,30,144,80,246,129,118,203,243,30,100,250,128,100,219,131,229,192,142,112,119,159,89,130,72,116,183,107,250,23,27,70,135,233,150,130,28,210,166,116,205,58,192,217,246,113,226,16,167,212,70,17,77,215,82,255,254,121,34,156,22,136,153,141,242,178,123,80,140,36,169,248,217,32,70,21,70,15,39,78,187,253,164,39,149,13,42,238,59,75,1,103,67,190,22,5,187,225,142,19,114,109,45,168,125,78,26,84,9,172,227,4,175,133,8,36,25,90,134,68,15,232,110,237,249,215,103,210,102,228,0,249,63,59,217,172,173,253,136,42,217,153,153,65,185,64,215,243,230,225,
+74,198,229,202,75,248,199,154,165,57,138,162,1,80,236,22,56,55,46,176,85,87,105,20,119,18,164,138,182,140,28,207,254,20,14,15,151,173,157,237,251,43,55,56,15,160,80,200,103,242,112,86,210,68,178,15,110,39,2,56,31,148,123,40,70,39,90,76,193,65,208,253,88,96,222,79,195,165,218,2,133,39,75,153,116,172,107,251,30,63,14,92,89,92,110,46,213,232,136,109,10,55,20,107,170,66,109,113,216,227,226,131,40,174,16,238,15,90,2,181,126,97,248,204,35,70,54,98,214,1,6,247,60,102,131,178,142,147,207,96,0,155,106,37,195,33,89,138,77,178,212,15,195,65,253,52,235,164,81,240,69,241,58,113,135,70,178,47,91,247,226,75,255,165,186,180,22,243,131,8,212,195,50,117,177,253,125,9,213,182,108,182,242,143,81,84,200,114,143,19,128,214,186,214,190,216,4,96,82,2,113,134,195,216,144,238,45,127,91,146,147,160,0,64,78,118,185,7,70,23,185,7,70,62,177,3,134,232,241,48,161,61,2,25,241,30,126,152,143,44,123,24,144,4,251,219,
+53,182,135,253,237,154,156,76,241,163,124,208,184,196,30,96,185,61,156,213,172,61,156,73,148,61,156,129,224,30,206,251,251,52,32,103,246,62,141,150,217,251,52,138,179,237,211,168,234,14,190,191,17,132,216,205,54,14,128,251,221,108,163,197,6,246,203,173,75,216,126,185,37,97,239,150,63,133,4,53,22,147,140,58,114,213,130,146,18,169,80,249,251,179,195,96,189,251,84,212,113,124,147,152,8,49,96,32,4,231,92,178,65,2,172,110,143,183,225,112,218,50,38,4,13,116,165,162,35,53,2,102,119,42,89,175,11,229,94,154,224,60,67,120,46,229,251,12,36,49,129,180,26,64,153,88,117,119,69,236,9,235,28,233,92,134,84,210,146,196,222,202,99,35,247,136,37,158,76,28,204,122,91,131,156,209,165,170,156,166,49,204,43,93,112,128,196,234,110,197,49,10,225,52,111,230,66,56,84,36,208,74,254,101,44,120,76,187,70,130,12,165,59,251,185,229,9,1,214,112,11,46,251,103,44,21,44,106,227,249,31,90,136,87,14,9,186,189,83,153,197,37,56,34,184,90,
+10,147,68,82,40,241,34,77,200,55,70,101,211,56,69,110,214,188,52,84,2,201,101,153,118,6,52,156,171,100,107,196,235,244,69,140,118,174,13,185,202,227,105,83,77,210,132,20,140,77,115,140,210,24,83,112,57,44,78,131,3,52,237,238,110,194,131,101,196,226,181,249,250,100,95,137,184,66,31,94,240,46,5,157,38,133,204,127,161,203,76,1,213,125,217,121,87,36,121,70,164,105,83,76,49,225,182,175,199,60,80,30,90,189,150,43,174,209,40,41,207,76,164,34,66,10,179,125,176,112,151,56,5,182,95,135,199,37,28,207,12,48,115,158,136,15,195,168,188,21,8,112,246,243,49,213,238,123,28,167,63,130,7,43,144,138,196,197,203,27,88,111,255,67,7,119,135,127,156,127,243,251,229,237,110,29,186,85,188,191,95,78,11,16,251,229,52,0,223,47,167,247,247,3,64,228,28,238,151,211,127,48,79,133,238,203,175,243,31,235,253,232,196,105,216,118,62,69,92,73,141,244,132,211,163,41,119,235,129,73,96,128,120,226,93,197,165,39,64,14,46,216,253,14,131,57,
+97,160,212,95,123,39,165,214,117,250,4,150,86,95,247,8,233,96,235,16,37,70,131,56,135,111,73,40,87,97,84,89,93,145,244,211,231,112,143,14,210,38,197,14,31,91,24,31,213,121,0,140,193,112,191,156,169,47,27,236,101,95,120,167,144,111,191,97,169,186,219,6,115,82,33,133,146,158,38,225,23,212,200,227,242,167,121,160,121,229,90,219,86,51,193,189,69,35,139,20,196,196,86,86,205,49,104,175,151,193,237,226,183,72,80,109,182,160,159,145,8,142,169,147,208,209,93,7,16,141,173,226,117,246,13,40,101,20,43,56,50,57,51,13,247,82,211,132,42,249,203,179,160,238,126,38,191,219,189,112,78,0,141,177,166,169,254,192,206,18,176,31,49,33,88,32,207,47,0,128,23,142,29,162,38,60,18,88,147,100,169,63,173,206,124,188,207,252,251,247,131,115,123,152,224,238,247,48,209,178,247,48,249,35,235,229,255,231,60,109,199,25,187,135,201,246,190,52,250,143,185,143,253,143,117,63,231,247,230,127,97,74,24,101,145,93,36,30,74,15,55,63,202,223,234,126,
+65,57,164,151,7,93,156,141,134,6,57,7,65,161,47,15,112,5,70,255,35,94,193,194,67,190,255,32,247,17,251,254,64,75,219,26,48,191,47,215,229,143,245,51,168,157,246,180,138,126,153,128,73,210,233,39,226,100,255,2,95,43,205,250,221,211,204,238,113,230,51,35,179,227,231,56,21,211,116,3,215,195,50,145,4,11,107,36,121,79,63,22,120,152,82,250,229,246,249,239,19,168,235,6,132,147,4,110,50,77,242,8,20,9,174,225,10,81,144,96,60,169,40,73,135,10,182,150,30,60,217,62,159,100,151,225,187,121,193,99,212,86,38,184,239,177,142,44,234,148,70,134,193,90,82,158,11,150,180,159,4,116,15,219,223,71,34,146,65,65,239,182,101,216,113,132,22,90,228,50,61,69,219,204,197,167,134,246,234,209,125,127,244,180,125,78,124,25,52,238,20,224,226,85,50,201,52,168,33,140,142,19,218,225,107,173,85,197,96,130,29,58,218,229,224,78,200,2,68,114,85,12,195,112,182,7,42,136,155,253,192,26,65,46,61,78,214,132,157,7,112,37,85,230,74,43,
+60,63,147,57,118,8,242,235,107,196,246,151,141,101,207,219,40,83,199,44,171,148,173,118,86,126,129,244,66,219,199,203,236,251,171,221,99,10,185,229,6,62,168,34,146,205,251,248,169,9,52,228,65,158,120,177,195,101,62,219,223,62,166,47,35,119,98,5,197,57,52,0,116,79,255,116,156,250,65,163,151,58,186,163,224,26,194,235,184,152,117,210,33,97,211,63,75,66,109,64,0,189,29,240,9,204,37,148,250,234,26,74,117,28,66,128,218,105,103,255,51,46,112,23,164,110,203,21,69,247,120,18,0,220,130,5,220,8,106,45,130,247,115,206,74,143,187,125,132,52,221,165,133,7,213,133,108,180,58,236,89,60,7,3,113,201,81,2,172,235,179,157,159,75,106,3,190,104,163,232,243,168,65,251,52,211,129,2,51,129,173,172,234,94,59,249,153,44,135,116,122,138,78,88,88,135,214,77,167,19,88,103,47,117,53,35,230,200,15,99,231,173,56,29,241,146,245,152,101,97,57,143,16,88,30,102,214,219,125,136,130,60,167,100,231,158,185,76,26,242,209,244,80,42,50,231,
+86,31,215,229,188,83,160,204,68,93,55,12,177,112,109,56,251,105,249,36,126,116,185,32,11,22,71,11,46,181,129,163,220,185,203,163,232,107,67,3,161,63,181,194,163,209,72,50,9,107,204,233,193,252,164,199,243,188,12,253,19,101,199,83,50,39,77,74,204,201,249,57,252,57,86,161,177,129,93,67,91,217,55,186,177,125,35,247,188,111,220,193,247,13,216,249,190,225,218,81,23,253,175,54,211,134,153,119,73,113,158,166,169,231,58,135,212,180,246,10,155,24,17,144,149,178,226,140,52,89,120,248,73,122,90,116,64,129,66,148,129,99,97,147,52,140,96,37,139,83,98,89,121,97,64,104,204,201,145,196,239,120,158,99,162,116,228,1,139,189,165,24,174,73,18,67,166,202,118,229,197,153,86,107,60,126,212,137,0,133,28,117,149,150,61,123,109,12,126,187,102,65,105,24,112,160,52,243,216,174,69,48,6,252,60,141,213,80,225,128,146,149,35,61,229,189,107,110,159,223,80,103,26,71,6,152,255,121,67,154,227,206,79,114,1,10,40,104,190,99,97,241,22,83,151,63,
+201,110,142,101,163,82,248,137,128,157,16,32,20,156,61,46,128,143,160,27,186,119,244,104,48,1,8,175,90,68,180,233,33,74,220,29,0,43,128,28,207,33,224,88,21,176,1,234,189,107,28,230,247,13,244,211,190,65,33,237,27,178,202,190,145,43,237,27,214,125,183,191,163,63,73,246,140,234,220,162,174,146,231,65,240,72,93,16,25,97,11,116,92,16,86,162,212,144,7,15,40,130,162,137,218,55,98,138,125,67,110,219,55,138,196,125,195,41,218,55,78,60,251,6,117,223,237,15,250,75,111,188,54,110,49,44,37,60,86,218,77,198,33,0,113,110,13,21,174,30,229,35,110,191,232,128,245,10,128,6,8,251,108,126,110,82,108,166,36,59,34,163,40,251,98,44,100,14,236,192,97,25,164,204,142,116,26,153,95,36,162,152,78,77,177,13,6,224,105,227,91,203,67,60,213,252,192,231,4,98,175,4,176,191,202,105,194,195,1,25,17,116,32,219,13,50,85,42,3,140,99,97,21,75,107,26,41,49,3,99,109,57,1,22,149,71,80,154,126,163,37,250,7,233,117,177,
+28,145,72,150,123,217,162,76,62,151,44,26,126,101,0,38,43,110,1,103,137,41,101,99,155,51,36,111,143,199,64,229,73,196,37,218,158,84,40,170,95,74,125,30,52,1,79,56,109,21,25,139,25,178,55,101,123,197,87,178,164,200,17,35,213,73,8,97,86,52,163,232,181,133,164,244,81,122,16,17,17,111,202,174,115,184,88,10,235,218,62,226,188,186,195,57,193,163,180,85,252,36,16,104,241,91,5,234,74,166,240,36,65,171,170,200,16,43,9,20,234,169,207,82,244,129,221,5,79,206,6,40,148,96,227,206,179,111,192,100,251,6,226,106,223,192,160,246,13,154,114,223,160,236,168,49,195,3,18,163,48,58,204,33,244,91,101,32,62,27,18,240,33,183,241,48,186,23,137,76,238,71,125,64,51,98,198,213,38,62,35,51,113,132,125,97,211,100,161,238,16,0,60,37,15,74,119,94,201,247,69,211,147,8,41,239,34,100,174,52,18,87,68,163,90,102,2,173,114,68,57,73,108,152,0,218,37,34,42,109,79,70,20,249,100,81,30,215,249,157,149,106,163,16,53,205,
+139,205,228,168,108,157,110,253,233,41,43,187,194,5,42,106,170,94,143,160,122,204,5,28,3,92,111,227,6,2,198,177,223,226,167,190,210,72,227,172,55,182,186,99,85,216,214,67,80,198,122,196,35,74,77,161,188,94,4,20,236,218,100,76,164,148,15,84,236,147,230,210,252,146,158,131,21,123,190,213,35,166,236,138,88,149,176,211,69,130,16,40,199,32,80,206,100,9,148,107,81,133,213,76,62,119,96,117,0,60,82,216,224,32,143,235,210,1,26,72,252,209,121,232,177,146,111,221,146,177,99,99,47,70,174,28,88,75,208,74,158,30,156,100,100,168,43,7,111,26,143,45,216,213,87,215,181,153,5,240,84,21,17,206,88,36,61,133,43,74,35,42,201,204,94,142,94,121,1,181,30,188,82,238,130,216,190,58,135,39,215,245,245,248,181,226,22,179,16,16,173,8,148,249,53,98,4,173,185,26,216,46,164,219,124,112,199,216,130,206,37,74,93,76,92,185,22,164,8,156,98,48,59,61,150,40,196,236,46,95,233,169,71,82,181,217,208,107,211,201,24,107,9,180,36,85,
+68,137,107,253,179,228,178,154,105,20,29,105,44,133,11,235,34,193,243,73,145,188,154,47,77,34,33,48,252,17,94,17,113,101,59,166,192,139,166,65,250,132,156,54,14,112,192,221,253,54,221,208,107,69,44,13,232,218,40,127,103,222,69,236,211,53,27,3,252,105,121,251,31,171,255,5,0,206,171,109,6,51,0,230,52,141,18,5,185,122,104,138,226,211,141,251,210,53,97,170,80,87,245,223,231,103,127,142,169,226,211,161,219,62,204,174,128,46,85,121,16,56,222,101,10,29,8,114,55,236,225,187,188,9,236,211,229,140,134,59,7,60,160,221,220,162,186,232,246,8,242,176,218,38,6,48,151,169,31,45,67,8,203,39,114,129,201,164,243,71,228,191,127,104,254,252,135,246,71,110,137,68,57,82,57,51,147,198,5,105,79,108,171,180,188,146,199,94,147,49,109,93,145,116,248,20,222,229,5,53,152,5,198,12,120,94,82,236,215,98,151,100,76,213,122,187,141,203,210,209,132,84,49,183,129,131,38,136,110,89,68,41,171,207,177,169,193,90,151,56,161,143,26,152,151,108,
+45,202,208,22,77,34,195,98,18,108,69,210,115,103,163,2,88,243,219,68,20,127,90,160,168,155,116,230,214,140,55,48,157,98,113,71,131,81,74,13,177,42,206,166,201,156,83,113,57,69,101,203,190,29,151,107,83,131,73,86,49,152,95,169,49,198,53,63,37,168,146,198,224,250,246,30,172,81,79,249,147,105,231,38,63,40,43,113,128,137,187,117,123,94,217,157,32,96,94,119,188,254,252,4,161,236,42,58,123,204,229,211,45,133,96,129,209,212,62,47,116,179,117,189,113,119,210,185,89,152,230,183,88,236,212,194,247,0,133,109,207,199,131,205,157,23,83,25,15,192,188,166,5,251,53,34,106,101,32,13,214,109,220,118,28,111,133,20,128,202,220,96,248,145,88,113,164,181,2,54,238,72,251,6,148,184,111,192,217,251,198,46,175,8,148,50,246,152,138,52,96,48,189,202,157,219,41,85,166,242,86,242,37,102,97,130,196,174,73,219,122,52,22,89,68,38,89,59,39,32,15,94,170,7,116,105,226,64,6,16,182,102,241,201,31,68,77,147,118,32,226,12,55,108,43,69,
+25,64,31,11,7,22,113,115,229,105,78,132,202,9,179,185,96,192,169,210,152,58,122,129,0,232,219,4,40,62,175,230,25,245,205,83,86,182,68,64,189,132,91,182,249,120,151,255,250,145,74,92,155,51,193,15,13,203,36,232,63,25,17,117,150,69,249,45,189,206,58,85,244,27,71,48,122,252,37,69,43,56,91,19,99,126,203,193,9,163,194,25,246,67,100,113,73,226,189,30,49,55,81,255,196,50,105,21,212,30,62,171,112,72,212,240,139,53,2,105,181,206,90,150,134,158,127,253,42,89,48,202,148,59,190,207,50,132,235,17,150,126,249,25,222,40,118,204,163,66,53,223,71,140,17,88,3,166,61,226,106,46,189,72,220,163,40,238,9,200,57,199,25,189,191,235,70,73,141,154,25,246,44,174,44,240,136,26,123,105,132,74,248,187,107,87,170,232,224,137,230,133,5,185,154,213,77,19,47,195,44,100,49,31,61,135,237,89,227,106,41,71,161,140,237,148,37,178,66,40,33,157,184,246,112,147,2,248,120,143,13,189,218,44,232,89,9,239,165,20,45,78,172,199,212,80,
+74,16,241,104,76,131,23,172,121,253,26,151,158,81,187,117,255,249,138,189,26,53,178,134,241,104,206,46,87,163,14,182,13,4,182,70,41,155,223,59,18,148,187,213,193,36,188,239,103,212,156,41,187,160,62,149,105,185,208,216,208,241,49,23,115,117,169,13,166,107,89,50,10,196,85,10,5,14,39,78,6,16,133,244,68,36,50,195,215,206,126,209,217,188,105,139,208,160,179,217,212,30,73,151,105,145,218,6,22,198,162,63,81,118,231,35,203,153,159,7,118,59,151,229,80,202,161,162,154,103,98,55,67,126,188,68,130,6,100,176,74,254,208,87,209,139,140,227,86,58,94,178,146,160,187,51,125,95,69,180,156,108,178,233,199,184,60,165,54,161,110,65,190,104,10,252,60,159,152,145,34,155,163,97,252,32,90,20,78,34,190,178,109,146,153,45,146,55,51,203,225,12,161,156,88,224,196,150,191,0,242,72,192,12,43,87,199,204,157,199,181,45,67,75,30,94,232,158,176,229,53,87,146,155,98,13,155,167,161,101,30,44,139,150,22,77,150,155,184,41,4,70,70,253,75,206,
+96,172,130,18,78,207,99,43,77,98,234,169,52,84,124,101,242,2,142,133,169,239,57,66,77,222,53,202,245,167,180,72,231,197,210,52,185,228,51,153,103,92,218,44,216,26,95,199,166,217,76,43,155,227,182,42,220,227,61,143,236,81,21,172,225,139,207,21,110,177,36,137,7,101,14,160,69,115,227,32,49,152,188,122,72,149,60,171,149,83,163,146,150,227,50,14,151,92,45,13,237,96,51,197,72,153,252,237,65,107,188,225,62,197,167,17,42,175,51,148,198,66,43,255,66,125,49,243,194,210,157,19,229,82,85,45,135,193,58,8,6,174,163,167,244,75,87,67,157,99,18,214,237,164,131,169,123,77,145,200,162,240,18,162,42,134,208,24,91,178,133,11,197,216,0,234,150,89,14,78,54,173,172,188,195,155,51,69,227,66,100,1,138,21,217,40,110,22,96,170,246,88,11,211,197,121,148,177,9,55,210,135,97,166,175,249,74,194,100,19,57,16,4,117,241,164,15,203,204,101,35,177,147,235,181,105,72,209,5,38,42,186,198,104,194,170,186,63,53,151,205,156,125,209,1,157,
+172,146,40,113,175,192,185,192,178,218,148,52,113,97,58,108,9,74,97,94,219,29,117,68,82,155,45,53,175,11,73,110,221,77,72,106,75,248,80,247,12,202,146,50,174,175,124,27,199,69,125,176,28,101,234,76,216,42,91,101,230,193,236,89,201,245,50,75,209,82,92,11,49,55,3,77,24,85,46,227,225,211,184,54,1,91,22,77,241,190,203,65,106,48,55,243,22,163,146,54,193,189,177,193,201,104,107,33,215,60,236,78,134,209,55,217,138,48,12,19,46,150,157,57,77,81,164,171,25,64,31,156,78,2,202,64,102,189,88,247,116,66,135,22,154,10,27,141,55,115,74,41,79,194,68,204,150,112,43,185,154,229,203,101,172,196,130,9,189,96,37,39,137,72,65,63,56,233,15,182,76,71,79,142,68,75,104,206,37,141,218,200,92,183,236,140,14,26,46,159,185,77,111,47,28,189,173,156,172,229,152,187,226,86,37,228,51,3,85,54,238,7,109,34,154,65,76,175,230,57,253,152,173,59,187,123,93,15,47,12,252,107,134,136,126,53,63,145,205,36,171,206,139,206,134,146,
+166,214,35,245,185,105,103,110,83,92,48,125,13,235,14,177,154,73,62,139,149,122,108,193,235,68,149,196,107,21,69,38,227,178,55,81,62,138,4,7,185,195,167,78,214,242,188,156,23,226,186,35,161,12,65,174,228,167,80,189,183,166,246,217,220,155,105,62,221,84,108,33,32,118,44,148,93,108,184,221,110,217,146,24,145,199,246,218,133,143,2,45,26,156,110,217,204,224,96,64,105,193,240,65,21,179,201,193,84,89,221,36,233,217,102,146,98,97,97,192,32,84,118,55,153,101,184,57,85,236,129,68,80,210,140,179,181,109,210,96,148,75,47,112,85,251,252,28,129,189,173,103,57,32,4,42,121,33,89,50,89,87,162,126,31,207,85,97,44,120,219,144,174,37,167,190,210,129,152,164,156,129,201,197,122,179,73,30,9,192,2,24,226,51,152,115,71,200,111,153,172,218,85,229,107,214,210,155,157,248,151,237,124,91,122,143,130,131,221,218,194,86,39,226,200,8,205,71,12,13,179,47,18,77,27,114,221,17,168,88,160,117,154,170,32,94,6,82,60,89,229,99,46,150,40,108,
+123,125,85,19,102,55,9,42,23,107,126,238,197,39,34,156,105,28,211,160,188,252,169,3,193,188,214,247,206,86,137,9,19,19,71,222,90,43,134,85,163,99,46,115,227,218,123,42,121,118,9,9,47,220,118,49,57,205,216,20,250,14,148,99,42,50,130,153,205,208,198,45,114,135,171,194,0,203,32,83,187,9,67,231,76,52,218,16,45,74,215,166,107,191,121,212,131,243,21,101,130,95,48,167,181,235,74,171,110,57,61,185,214,78,117,84,77,190,48,206,78,113,24,64,25,236,153,202,126,17,241,242,241,217,214,223,125,136,61,151,182,199,211,75,177,199,118,1,126,164,111,116,168,186,101,42,37,71,220,93,63,198,111,52,87,53,217,107,221,229,227,41,134,83,72,17,214,67,126,56,62,109,173,55,235,14,150,182,214,165,45,203,186,109,97,158,204,10,12,122,122,211,215,153,207,162,157,128,97,227,237,248,76,198,73,104,163,96,55,55,132,241,166,56,160,221,85,139,135,84,220,99,94,143,238,158,245,106,205,108,0,182,4,175,165,31,101,179,77,138,183,57,20,148,166,86,
+207,154,160,228,109,60,148,18,182,231,239,55,100,155,51,74,193,201,91,134,6,46,230,140,250,24,52,101,245,58,84,219,50,76,115,23,190,20,185,222,236,161,8,147,241,137,133,103,89,87,219,190,78,251,145,186,140,52,23,181,158,209,96,103,218,50,170,104,30,176,56,149,139,186,106,69,126,193,181,102,143,8,217,67,104,77,235,12,24,243,123,217,75,117,32,29,50,113,132,236,230,206,109,230,241,44,71,71,23,194,37,106,78,193,150,209,128,126,48,192,145,164,203,248,212,210,241,217,54,75,63,150,186,57,3,45,180,120,108,119,248,145,151,225,15,247,36,223,238,170,253,243,175,222,127,249,233,79,126,254,254,55,95,124,242,249,187,175,247,251,170,127,254,230,103,111,63,127,251,243,79,62,249,244,207,246,59,110,127,242,238,139,79,255,236,247,182,91,255,176,221,247,251,47,222,110,55,102,255,254,174,223,159,254,183,95,239,55,83,255,228,207,247,187,176,127,253,23,32,3,176,203,110,179,242,15,59,157,239,247,92,255,250,87,239,191,253,124,187,75,249,119,155,145,239,247,
+250,222,110,241,254,233,79,190,47,203,167,127,246,31,63,238,211,254,230,215,111,255,64,154,183,95,124,243,246,171,253,54,231,224,229,143,18,125,111,127,114,144,241,95,255,226,7,99,191,251,122,183,107,252,219,79,62,127,255,217,110,3,247,119,219,13,218,191,254,246,103,159,254,228,195,230,241,223,113,1,237,178,63,245,151,251,157,202,191,207,102,55,222,7,61,222,125,241,217,231,223,254,124,191,221,250,247,25,109,105,254,252,235,191,248,184,45,249,219,127,250,75,80,156,223,201,243,205,175,64,246,123,233,191,219,184,125,55,40,40,226,95,253,171,159,254,251,223,254,155,47,191,220,239,59,255,221,30,246,63,216,123,125,199,127,107,162,255,244,246,103,160,101,246,90,125,216,122,253,187,254,63,253,143,95,189,255,191,64,222,255,253,79,255,234,243,119,160,185,62,104,180,87,104,203,119,111,66,208,206,63,164,251,233,158,233,159,111,183,183,127,255,237,126,127,247,255,231,219,247,223,188,221,121,117,119,248,193,51,159,254,100,103,139,173,239,182,48,250,225,38,236,159,252,31,224,
+16,159,189,249,226,147,207,126,245,254,253,215,111,191,143,155,111,222,254,250,203,207,183,40,123,255,229,55,239,222,127,1,106,250,217,103,239,191,250,249,118,243,121,80,149,29,197,111,191,220,81,127,212,119,43,238,155,175,62,128,6,164,3,173,249,159,62,170,241,1,151,111,190,99,187,243,217,39,95,189,251,229,175,190,249,228,87,91,35,126,249,230,139,157,199,64,244,236,17,249,139,119,159,191,253,122,191,127,252,239,144,184,179,247,111,126,245,230,155,79,62,123,15,90,230,139,157,230,191,221,83,253,234,205,223,126,0,212,247,70,220,142,242,233,159,129,131,126,243,219,173,19,190,63,250,222,76,239,191,248,252,183,187,177,62,12,251,113,192,55,223,126,243,254,215,160,30,159,129,144,254,237,119,195,111,225,249,61,152,253,252,237,47,222,125,241,110,107,159,29,139,223,51,46,232,170,207,254,239,189,191,247,1,251,179,111,191,249,6,36,253,205,71,171,108,37,222,123,120,171,25,56,238,30,216,159,189,253,250,235,55,95,253,22,116,36,8,192,173,12,96,159,173,222,223,31,
+249,199,236,242,254,203,183,95,236,35,6,140,214,191,254,159,255,151,31,138,243,127,238,98,248,175,190,249,234,243,127,247,238,103,159,188,249,242,75,80,186,61,239,45,136,62,249,245,155,119,219,214,23,96,210,249,206,76,223,203,72,255,249,167,31,148,0,241,244,246,55,159,254,228,131,28,127,243,201,219,255,242,6,36,6,77,241,238,205,231,239,127,185,203,84,111,126,246,254,111,63,250,114,43,243,127,254,239,254,168,97,255,102,75,248,113,232,191,249,46,232,118,201,7,180,251,7,211,127,135,203,223,101,187,119,191,248,3,236,109,115,198,55,160,77,222,124,245,243,79,254,237,255,254,215,223,31,23,228,183,69,253,23,111,65,83,125,151,163,222,236,51,198,199,128,255,171,79,255,201,167,255,228,147,207,62,7,147,39,120,12,162,237,171,183,95,126,245,246,107,144,118,47,196,247,164,254,175,39,239,223,37,203,127,247,6,148,243,27,16,135,191,124,247,183,111,247,156,192,120,7,51,230,86,98,48,4,223,129,158,255,232,180,255,240,30,236,184,37,255,250,195,137,127,11,58,
+247,171,173,226,251,211,59,192,125,184,244,239,191,231,187,95,189,249,250,3,197,223,113,241,127,251,95,127,10,70,252,103,111,63,255,161,228,31,194,102,151,199,64,179,236,113,181,19,241,111,223,125,253,237,155,207,183,197,226,237,87,191,120,243,217,222,74,32,237,87,223,129,17,52,208,207,223,126,253,238,151,96,68,189,3,173,248,231,239,254,41,24,136,223,126,189,213,106,143,196,191,248,93,66,251,144,148,63,184,238,45,136,129,93,126,251,49,237,64,67,189,223,94,251,113,245,62,253,179,125,176,255,221,215,183,144,1,173,10,186,237,67,188,111,29,249,237,23,59,25,127,243,49,254,191,143,72,144,30,68,205,87,32,232,254,18,68,4,168,247,187,159,109,243,194,158,243,46,226,64,234,183,111,190,250,93,217,250,126,239,45,162,118,213,107,199,227,147,143,169,249,15,24,253,57,168,212,207,223,131,254,255,226,61,120,245,243,223,188,249,237,215,31,204,190,45,53,91,24,254,176,195,95,252,229,239,172,247,189,92,253,119,217,236,247,146,208,247,62,254,217,255,244,177,40,128,
+153,232,29,232,4,48,135,254,226,221,47,191,253,106,39,255,215,223,131,240,231,111,127,1,86,250,93,94,254,125,52,191,255,152,93,64,77,223,127,254,179,55,95,253,32,105,255,8,223,157,23,190,253,234,43,48,120,192,68,250,253,168,6,81,6,14,241,203,61,202,126,76,162,239,226,17,76,12,187,144,251,46,235,124,251,245,190,23,152,150,182,23,190,203,71,159,254,228,135,99,255,205,190,122,109,165,222,213,196,125,21,253,228,215,111,191,248,246,123,121,242,147,79,254,205,231,32,184,191,0,251,252,237,219,207,127,251,151,96,228,111,51,247,214,131,31,138,233,55,111,255,203,55,219,4,243,230,99,121,252,125,179,236,178,196,239,82,222,31,42,252,99,10,126,152,87,125,64,240,199,104,250,161,13,64,24,127,72,173,223,7,224,15,157,251,175,255,245,187,95,131,61,255,213,63,251,231,255,252,95,252,55,255,242,127,248,31,1,88,4,38,132,0,0,44,188,6,192,191,169,139,214,162,31,13,95,70,92,182,86,26,120,40,24,58,173,141,74,205,16,113,152,254,180,62,156,
+195,56,113,61,8,17,121,232,181,90,73,119,112,60,254,70,133,50,71,235,201,234,194,152,49,55,138,166,155,81,167,18,186,174,30,17,113,122,102,222,201,41,63,62,223,233,198,38,43,233,188,105,109,159,158,226,224,178,77,214,66,207,150,124,222,84,249,185,125,250,88,153,173,178,233,153,207,231,161,27,38,147,117,155,126,57,113,211,15,175,46,120,112,79,237,94,160,25,81,213,14,193,73,49,35,54,148,252,15,52,129,177,245,98,30,99,253,215,212,148,200,50,166,38,226,60,175,36,220,190,142,240,120,164,58,153,167,214,190,74,104,248,150,17,138,212,137,105,89,40,18,239,4,24,218,4,243,201,249,96,89,205,163,108,199,29,10,182,206,193,123,42,109,249,162,198,86,63,240,133,146,85,45,138,26,189,194,158,16,183,84,13,28,234,168,44,84,36,40,49,31,109,108,238,46,110,117,94,254,122,125,211,45,102,95,25,147,241,48,199,153,65,60,155,91,116,105,125,29,232,204,92,105,17,121,216,89,59,114,65,29,140,227,172,245,219,33,152,128,215,219,92,35,237,30,143,
+216,114,173,152,88,209,82,95,253,46,18,72,224,251,182,224,200,244,92,161,227,240,130,178,228,250,68,96,13,174,211,124,233,217,241,178,97,22,222,32,90,114,66,193,199,133,230,253,179,72,116,152,187,122,216,160,133,208,64,157,193,68,110,255,232,193,10,145,252,178,12,31,210,40,70,41,255,222,19,240,120,110,179,103,189,138,0,85,247,81,212,252,184,224,196,103,224,141,178,21,34,235,98,236,182,220,210,160,173,197,139,185,29,122,130,39,252,48,196,21,231,112,225,113,75,90,114,126,240,150,141,24,15,42,140,1,204,198,154,197,151,42,222,19,170,212,47,72,93,126,158,215,124,226,61,66,34,107,133,59,77,156,143,151,219,102,61,46,155,224,30,159,221,50,147,30,103,59,116,49,159,120,4,175,114,241,77,178,69,76,180,50,245,22,131,154,139,30,133,11,245,218,253,19,145,203,230,71,106,149,172,131,40,47,179,249,73,172,131,152,175,217,90,3,117,43,17,145,172,109,118,75,28,184,215,188,78,106,180,99,131,46,102,144,74,94,34,172,154,245,58,67,135,97,234,154,
+99,246,185,205,39,180,217,193,191,41,101,186,129,183,95,250,232,118,200,173,247,223,156,241,235,29,27,37,122,105,56,119,50,159,47,233,195,151,115,115,219,199,144,37,199,119,18,245,101,116,163,65,8,123,21,12,126,19,93,185,185,163,140,136,156,203,22,165,195,164,3,130,73,60,145,159,137,16,39,226,176,190,20,232,69,242,222,29,245,126,110,172,52,237,118,22,213,141,199,227,185,194,54,84,234,96,16,142,121,39,150,84,91,90,59,30,146,129,87,63,163,174,203,145,9,36,85,208,111,193,223,172,109,76,19,93,223,165,187,45,195,201,70,79,140,179,242,246,209,107,200,126,129,238,123,239,8,222,226,138,148,62,222,122,228,169,245,172,165,146,141,186,181,102,229,120,118,46,83,131,126,117,157,153,219,137,163,130,203,69,244,122,198,9,191,229,190,70,157,11,53,157,117,114,53,201,92,58,197,180,88,54,209,157,200,194,108,87,250,156,188,90,247,218,86,165,6,173,215,204,107,140,86,136,169,91,129,152,8,19,58,167,23,254,91,20,185,6,159,42,215,134,49,188,166,20,
+147,172,220,185,39,31,165,137,151,75,74,33,210,170,22,105,4,187,253,190,136,160,93,224,175,250,175,55,118,248,173,106,90,60,69,30,40,110,42,166,245,144,110,145,68,204,11,62,87,106,41,165,205,29,114,217,239,9,70,86,117,231,107,135,63,35,155,103,76,89,137,172,153,144,150,125,69,91,74,119,146,253,38,67,109,220,192,4,44,69,95,150,152,165,14,156,195,180,162,102,48,150,239,165,67,178,106,117,112,220,77,249,135,227,205,34,35,85,101,80,163,107,97,156,106,192,162,69,36,171,169,87,122,61,167,219,180,42,145,177,215,111,28,18,206,34,99,135,221,94,26,202,219,174,24,104,231,151,205,89,246,174,107,75,67,4,214,231,172,79,56,79,13,159,194,167,81,236,100,233,87,158,249,55,55,150,165,78,103,83,240,153,129,107,80,174,199,14,175,112,52,194,44,11,55,178,199,82,150,127,102,84,155,111,106,190,7,246,166,34,179,100,87,154,50,214,210,238,36,113,168,205,60,140,21,15,201,235,35,168,177,153,52,169,128,17,25,121,33,243,3,62,201,153,137,143,
+58,147,90,136,210,59,116,194,210,106,44,60,157,20,193,127,203,226,241,122,150,199,4,135,119,209,179,248,82,28,30,139,179,242,28,7,250,194,89,147,86,179,84,185,131,42,125,253,170,209,149,55,211,219,230,68,57,129,95,89,214,172,82,118,200,35,111,150,198,54,77,28,116,96,209,184,121,149,132,30,249,41,28,139,65,33,162,245,7,121,251,90,48,155,100,77,173,216,149,4,12,36,49,57,55,18,102,65,39,73,27,215,167,86,187,68,213,118,37,227,118,187,178,141,72,216,47,14,94,158,1,199,192,153,138,24,55,238,99,50,211,255,50,232,100,153,70,179,168,24,74,59,85,142,1,222,69,182,40,158,44,220,126,178,182,200,225,58,153,72,242,0,78,152,159,97,164,150,117,172,142,61,128,95,20,231,36,244,163,241,214,95,127,106,221,75,147,137,162,20,187,130,84,36,225,152,133,151,88,55,52,189,53,55,222,199,102,74,11,143,139,49,119,203,227,64,64,1,101,206,133,250,161,112,83,108,50,225,106,3,191,43,78,101,164,21,50,52,91,220,32,199,148,140,121,61,
+59,154,59,9,61,35,243,49,58,45,217,234,81,185,169,127,151,74,190,240,74,205,131,131,13,90,143,123,157,42,51,82,226,66,126,191,98,200,97,20,49,187,109,128,224,241,103,221,179,3,11,7,64,85,42,231,100,139,210,176,196,90,24,194,197,202,163,247,54,84,37,188,113,156,190,201,181,22,39,17,211,4,200,188,172,65,233,83,171,81,75,30,238,184,207,49,98,74,42,34,235,247,239,185,29,105,140,145,126,6,162,148,54,234,44,7,119,167,136,199,221,12,95,213,63,106,185,45,217,232,224,212,95,17,88,177,106,205,195,43,70,106,212,103,138,144,139,64,199,233,99,106,229,235,83,67,100,54,229,167,244,62,75,27,246,218,116,172,81,231,89,134,185,85,125,108,59,35,117,251,12,93,153,174,166,205,180,249,240,102,161,127,184,232,92,230,143,28,38,246,83,86,164,230,198,179,85,137,242,232,188,62,167,82,55,131,118,80,107,180,44,145,72,202,124,78,17,90,239,188,9,41,71,114,220,5,237,139,78,142,146,105,0,21,137,186,105,87,196,233,205,179,179,73,209,28,
+203,44,156,184,79,145,53,54,93,210,32,162,97,100,194,150,125,47,251,37,52,223,152,215,134,136,173,160,5,8,253,169,92,48,234,4,9,248,113,225,97,81,181,152,141,43,171,225,2,148,198,134,117,120,43,133,193,208,119,193,160,60,120,77,176,9,173,135,201,54,73,70,167,60,233,31,201,157,12,29,162,192,94,35,57,156,194,113,67,116,109,221,220,222,93,249,13,222,64,118,49,161,190,214,175,54,122,221,248,190,158,234,30,72,102,47,154,81,70,157,189,20,217,122,209,171,200,114,150,215,110,34,51,99,84,182,228,64,105,207,238,190,51,165,54,45,220,167,87,26,218,107,8,184,180,100,216,22,105,106,179,161,174,117,1,110,127,36,11,35,80,221,176,239,144,85,212,157,195,34,79,80,10,241,130,224,200,107,197,140,42,217,229,135,60,50,217,218,32,173,68,88,209,150,57,81,189,240,8,15,163,57,148,130,57,152,81,243,212,45,140,184,240,52,81,56,43,179,25,90,95,57,55,164,24,40,202,6,197,127,188,17,117,106,17,242,51,213,147,35,55,168,35,143,101,105,
+94,186,94,83,104,230,157,157,216,63,224,156,234,169,105,1,17,30,43,246,133,215,87,254,12,191,187,89,53,109,189,102,176,161,106,68,207,57,93,66,212,118,180,170,123,170,155,71,115,236,25,183,90,223,189,6,6,40,133,244,193,237,154,61,98,242,150,89,7,127,168,76,156,177,150,244,35,214,61,164,45,54,231,61,162,122,79,65,87,108,46,73,109,129,134,215,182,8,186,218,85,173,114,190,89,245,83,199,151,183,138,153,247,228,76,229,196,78,173,171,3,249,149,185,87,130,14,54,66,194,32,145,113,192,110,228,7,51,53,15,119,185,132,80,107,167,3,163,71,82,12,64,253,210,227,141,225,129,191,44,165,79,46,207,57,55,247,104,79,236,38,250,114,229,159,154,158,123,158,138,72,109,89,30,100,83,2,232,115,64,24,177,216,61,78,84,219,238,245,100,50,143,21,197,75,62,141,160,98,169,147,164,125,12,77,79,90,86,104,232,176,88,50,167,241,202,228,43,159,18,117,212,202,153,152,50,211,168,246,146,142,218,106,74,79,97,43,14,69,59,25,231,48,87,100,120,
+214,231,60,122,238,101,151,189,120,42,77,137,79,189,78,183,199,82,192,17,238,195,90,102,30,79,136,63,146,160,34,218,176,248,120,88,44,142,252,243,217,18,243,220,75,245,192,252,224,57,106,68,196,50,12,102,234,45,59,156,229,139,51,164,123,53,161,243,69,180,213,88,10,143,87,43,89,231,232,206,199,38,139,12,252,246,16,104,65,142,175,157,48,232,70,215,30,118,25,48,129,139,140,132,222,78,24,173,51,215,227,48,104,93,216,65,59,34,55,133,208,41,52,27,118,138,125,217,215,13,173,189,124,132,101,56,93,201,19,105,69,9,95,109,172,94,66,121,90,136,99,135,167,155,217,192,211,27,69,212,131,168,64,3,90,227,73,39,79,99,123,83,53,38,159,246,154,15,27,105,212,83,157,182,56,73,138,85,18,107,41,152,117,242,168,252,195,123,26,73,84,81,95,60,86,61,230,229,69,47,139,174,175,153,231,241,28,175,217,174,17,220,157,251,9,187,233,76,179,70,145,163,148,95,19,121,141,184,236,109,243,193,164,117,172,53,84,206,174,107,141,149,131,137,47,246,
+85,99,9,150,224,202,231,71,75,75,237,14,72,19,67,153,121,182,83,190,226,54,15,230,83,136,107,124,17,58,108,146,7,168,155,57,145,64,222,152,165,144,53,194,107,183,123,242,38,211,25,107,147,207,171,100,217,13,169,87,186,137,11,85,30,77,129,163,129,146,151,143,164,136,31,74,21,192,181,28,109,221,4,152,133,37,206,141,176,172,156,150,249,138,118,42,48,24,173,185,35,111,254,8,74,69,83,35,99,202,11,155,68,116,80,228,57,97,207,56,92,231,195,163,62,207,181,10,195,196,46,63,95,1,211,47,175,47,166,23,107,125,142,20,125,240,201,25,245,84,249,122,19,19,151,219,156,190,39,147,86,147,171,200,222,37,79,198,85,52,84,35,52,24,207,137,38,92,155,66,157,31,112,178,18,221,101,133,224,213,22,68,203,113,209,93,70,204,144,120,187,81,89,83,25,74,197,33,233,129,74,234,9,167,245,230,173,188,103,233,73,122,27,200,61,166,127,229,148,69,55,33,95,219,112,222,190,87,113,2,14,140,95,64,162,201,153,86,193,34,178,140,61,96,197,88,
+252,98,28,103,182,3,100,68,140,114,179,94,93,14,220,19,88,203,231,184,149,184,94,167,242,248,18,235,236,28,117,4,200,165,137,107,113,217,215,209,168,112,148,192,150,161,39,152,73,160,198,61,49,47,44,24,36,50,118,116,129,210,119,151,35,176,114,9,86,231,6,117,169,90,68,229,152,244,228,237,226,178,189,242,52,55,48,24,245,169,138,58,41,70,67,231,217,132,101,172,216,8,80,171,177,174,90,175,48,203,254,186,217,144,155,234,12,237,91,99,53,174,226,31,157,159,220,54,198,49,114,206,71,133,172,109,230,220,145,85,206,5,52,205,225,35,234,88,186,44,71,55,155,8,192,148,7,105,130,50,132,108,150,235,205,22,227,82,236,11,156,6,59,112,53,156,231,137,233,177,137,244,147,215,80,52,204,158,156,94,21,211,109,176,215,204,109,183,159,182,60,151,34,92,190,151,35,222,35,83,182,246,249,6,206,227,162,122,88,148,49,16,47,212,122,240,121,50,63,73,74,171,75,63,83,171,139,118,97,136,10,28,101,68,30,100,59,93,41,243,85,113,98,175,188,62,
+138,213,165,135,54,47,82,244,164,234,162,168,238,160,236,140,100,189,212,107,14,118,145,171,52,42,94,61,54,172,13,95,30,87,104,25,2,170,129,198,199,221,112,103,90,131,199,134,224,45,198,56,43,73,246,224,118,143,92,82,79,14,50,115,249,40,113,174,230,186,229,244,140,103,124,143,91,21,167,135,61,250,149,137,71,73,11,45,51,211,80,235,104,110,116,179,138,66,94,219,156,168,208,36,52,30,47,87,54,117,132,174,0,99,130,115,23,243,41,243,34,177,84,6,29,73,108,38,221,87,202,29,15,160,22,168,74,57,234,150,172,140,133,105,98,225,42,43,10,114,50,9,219,53,186,98,183,75,15,71,215,84,162,16,116,93,131,26,56,223,24,234,8,72,36,14,244,111,115,87,76,121,13,46,120,238,206,77,143,9,86,182,123,144,59,215,171,37,169,82,214,232,95,223,203,39,54,97,99,146,157,141,220,156,185,186,116,82,119,121,87,8,12,149,88,237,216,225,248,205,134,176,86,152,115,136,53,14,32,187,169,81,134,252,106,86,71,71,210,237,231,73,211,212,27,157,
+132,93,116,147,51,103,78,53,36,41,37,25,78,53,142,250,190,81,49,66,190,162,250,207,216,71,58,242,146,158,192,154,57,93,79,67,101,89,60,117,99,18,234,43,253,6,59,139,48,184,199,28,222,178,146,210,164,220,102,85,203,151,163,123,87,134,4,86,79,234,32,45,37,99,171,233,153,116,14,6,195,130,47,129,245,75,110,196,246,14,82,85,14,183,6,74,4,245,130,54,217,148,221,157,216,154,236,212,180,33,22,63,14,47,143,211,172,65,201,137,150,152,107,193,245,82,52,44,20,154,153,166,35,64,37,36,233,151,164,156,197,196,6,235,22,89,18,244,173,36,97,34,228,112,224,167,246,75,217,187,121,0,165,178,23,203,171,209,170,55,27,74,71,146,6,41,220,181,61,223,5,174,93,61,93,139,182,145,222,222,132,9,135,98,55,86,236,58,192,135,56,143,190,156,170,158,78,57,189,185,85,126,116,194,47,29,19,82,229,178,202,228,170,206,202,98,137,155,49,17,227,87,243,250,96,156,110,86,22,4,57,39,121,183,210,98,195,227,8,242,72,20,156,16,67,55,
+198,14,45,234,138,60,71,58,103,238,100,126,148,89,79,167,4,213,83,107,97,211,180,232,177,116,117,21,188,179,71,236,232,243,226,13,218,225,233,241,55,18,48,23,167,179,153,97,183,155,91,132,79,110,46,76,156,241,106,252,84,20,188,44,70,252,137,35,164,168,71,15,178,37,84,74,83,239,61,214,106,131,167,190,79,224,107,143,90,212,231,197,68,204,207,172,112,179,141,125,40,158,111,24,25,160,218,122,118,248,33,199,80,227,130,58,33,157,9,201,57,10,105,12,53,106,230,101,73,64,247,136,11,2,202,140,158,81,241,1,113,172,116,163,92,23,111,102,51,183,106,129,120,118,85,169,88,116,238,117,66,111,142,88,52,116,64,140,166,156,142,14,143,132,120,165,103,170,28,202,110,174,135,145,155,17,90,128,47,202,110,238,55,200,72,35,10,183,140,152,194,74,150,98,49,12,135,217,90,240,53,173,26,53,212,77,70,125,68,58,192,99,192,41,194,162,224,43,122,22,23,177,162,83,152,176,153,51,107,75,4,175,197,162,192,168,65,135,124,179,102,191,103,146,103,176,
+11,121,228,53,186,200,74,98,22,177,195,173,57,110,209,143,139,10,38,218,197,47,40,28,217,243,100,175,211,129,192,51,4,129,205,180,226,119,35,72,57,37,219,63,66,82,96,46,250,189,189,174,129,193,41,154,33,84,104,123,140,175,17,29,129,233,66,101,172,225,105,9,114,200,0,52,162,235,103,159,177,24,41,188,106,72,179,212,164,149,190,232,86,159,33,199,72,145,87,103,154,151,98,175,230,59,126,219,162,155,49,179,150,37,49,38,15,82,113,82,87,78,113,166,155,67,214,53,120,216,4,56,192,255,110,125,105,125,52,33,29,132,214,151,173,204,177,162,78,104,85,184,205,65,246,160,95,183,110,172,20,60,88,172,194,71,220,62,34,105,227,116,4,196,193,152,250,236,20,238,204,37,92,57,209,28,158,61,108,218,56,216,189,90,39,102,58,171,192,6,232,136,156,162,85,9,15,55,46,172,205,131,74,145,147,205,180,118,178,22,21,76,229,198,4,76,97,237,89,185,220,38,185,125,82,100,231,138,27,110,41,230,27,188,218,121,202,111,215,50,157,14,217,204,212,72,
+162,55,139,192,213,73,210,209,38,23,137,182,16,154,116,122,45,137,132,27,229,172,190,85,239,56,146,87,162,206,204,208,97,246,253,147,35,97,242,216,114,145,212,147,4,217,27,125,33,236,187,71,61,174,37,50,51,220,254,80,66,71,80,17,38,238,24,101,17,101,46,36,217,144,100,218,143,102,234,158,151,108,84,77,88,146,26,136,132,137,15,174,45,91,61,218,58,67,106,7,172,202,99,103,59,221,48,116,34,27,24,111,18,17,157,88,102,73,191,97,28,42,32,58,193,155,21,107,243,184,138,34,185,141,53,99,125,172,104,71,29,208,103,118,86,170,223,172,12,134,197,38,180,32,144,199,167,161,219,228,19,234,118,13,207,67,141,157,139,168,12,128,249,181,136,248,192,79,187,233,99,17,26,63,238,210,123,189,172,205,23,83,71,159,159,82,100,111,162,162,128,60,185,57,182,82,12,22,121,95,126,10,93,13,148,188,91,228,181,23,145,109,132,147,215,115,124,66,98,49,231,15,32,107,169,248,176,131,87,10,40,136,97,82,78,12,55,157,235,0,34,151,188,195,204,249,
+42,247,228,32,90,137,70,39,23,209,182,162,83,154,63,248,85,193,235,187,27,84,243,90,123,77,86,22,205,153,100,186,83,88,46,26,53,186,59,190,104,152,154,201,6,58,18,23,115,218,81,125,106,177,18,156,142,196,109,44,97,132,57,76,230,29,37,139,72,16,99,174,67,94,255,66,136,57,190,190,10,227,81,147,148,44,88,77,173,78,170,82,219,230,152,95,28,91,59,41,198,157,221,110,23,97,116,193,146,105,126,174,69,15,32,145,78,154,231,192,186,84,13,139,244,130,40,151,113,0,55,47,235,204,76,202,167,186,251,21,66,95,198,195,5,5,63,205,153,203,74,109,112,45,251,54,182,57,214,82,54,109,19,47,114,142,37,115,228,147,138,248,214,36,30,165,10,119,9,90,87,199,100,162,33,13,189,223,24,47,4,120,204,188,227,244,213,211,161,196,107,4,114,137,146,55,181,94,216,109,172,234,86,63,77,72,19,190,228,81,96,73,36,147,199,67,166,86,100,49,204,67,183,112,19,159,70,24,16,39,68,253,73,126,22,45,227,157,43,152,184,83,125,140,48,21,
+142,113,107,179,78,44,220,113,222,242,130,44,185,218,140,54,245,155,134,189,105,166,248,2,129,72,87,64,46,103,164,90,110,37,38,93,67,134,119,35,133,254,21,156,149,214,189,117,23,58,233,128,207,176,229,103,133,34,162,109,61,170,4,134,172,62,9,221,92,222,186,210,18,252,85,223,102,121,144,79,83,238,23,19,226,81,235,143,214,175,25,107,126,171,158,91,227,96,79,62,114,241,129,154,245,129,43,31,177,196,240,12,205,137,18,18,153,105,177,32,211,102,105,8,1,18,39,145,187,188,116,186,38,236,119,217,156,137,234,186,201,199,5,57,158,187,192,37,188,55,212,105,89,19,238,26,41,60,230,143,9,50,124,236,214,192,103,231,124,27,111,148,73,242,26,224,226,90,66,236,192,150,24,71,168,142,193,92,122,106,102,243,175,118,247,147,179,204,204,106,234,193,226,93,155,94,46,250,196,166,98,127,177,134,156,27,164,45,203,76,131,210,163,202,53,23,12,91,135,79,87,231,82,112,217,194,174,66,80,254,91,118,121,46,196,194,56,240,216,42,113,143,61,215,156,56,
+67,27,206,100,142,51,205,21,171,72,111,182,84,173,124,189,91,221,252,133,88,60,100,40,97,233,72,133,238,161,24,125,150,208,133,78,176,42,101,216,81,45,203,111,148,4,134,27,118,128,18,31,223,180,218,68,101,229,126,226,4,162,97,118,245,10,177,76,30,15,230,189,65,147,227,42,164,157,44,9,101,114,54,156,248,169,207,175,183,99,212,237,227,153,179,41,113,23,124,212,192,242,201,130,77,158,24,168,157,83,204,173,227,182,87,154,43,201,175,131,6,61,149,55,156,31,30,72,238,195,29,250,64,246,104,36,28,138,72,81,111,116,114,162,239,208,199,170,204,76,79,110,61,81,204,156,251,54,66,119,136,109,160,142,230,178,87,37,250,232,118,69,226,80,96,238,113,108,212,181,136,18,84,220,101,144,239,196,205,3,252,62,17,49,89,88,176,222,8,138,88,117,140,68,30,176,218,175,99,160,197,77,170,87,47,178,86,33,122,87,198,71,8,117,67,89,131,57,116,25,60,135,15,9,237,174,215,215,79,203,168,195,254,102,83,162,186,150,4,41,129,228,173,151,146,198,
+188,34,255,24,19,160,158,92,204,244,197,96,163,111,227,58,228,212,122,237,55,139,24,6,73,157,108,110,218,218,108,112,189,248,194,35,231,42,9,19,26,216,24,227,2,235,172,11,13,144,114,88,176,104,207,189,175,196,25,159,40,13,147,199,177,71,101,127,61,199,234,32,56,229,125,214,185,212,28,232,128,226,104,45,116,55,215,120,0,44,153,8,210,129,122,182,224,182,32,131,153,80,235,196,98,91,253,168,153,122,100,204,39,137,172,44,243,105,233,127,138,231,87,73,22,87,79,216,78,145,100,183,156,0,13,24,167,152,19,211,74,67,159,229,6,49,7,194,181,30,6,164,20,97,223,153,17,27,150,60,101,167,237,89,26,116,82,28,9,173,179,107,86,117,104,154,166,92,221,171,125,147,108,239,166,221,98,102,71,105,34,105,178,74,78,196,150,240,122,206,56,1,197,151,21,231,7,226,99,40,209,15,213,72,46,173,231,144,57,196,87,243,54,85,141,3,129,53,93,213,121,35,208,33,214,122,30,171,75,172,190,164,27,154,244,98,55,214,7,225,218,182,9,114,55,125,
+173,20,139,107,29,215,227,65,203,106,214,70,7,23,41,127,37,56,144,62,111,214,176,9,49,25,157,148,210,250,222,102,5,69,34,31,227,151,34,235,38,79,160,26,218,198,105,113,196,111,111,140,175,104,175,134,169,124,154,117,225,84,68,86,48,54,212,150,98,152,63,169,215,215,104,121,53,164,58,107,209,166,135,109,49,127,214,186,232,214,125,162,206,242,104,146,198,201,7,23,166,78,211,164,72,102,165,240,32,41,59,29,151,32,82,198,156,166,3,84,71,247,97,231,171,117,198,147,73,163,158,195,7,12,141,218,212,11,107,196,13,93,62,36,156,142,105,57,112,221,238,58,94,134,251,142,166,27,146,67,61,171,193,25,246,171,52,224,73,17,71,197,235,140,93,29,214,184,85,145,21,124,212,206,70,115,11,247,189,212,130,92,176,2,120,124,16,127,50,144,2,161,172,64,167,104,76,220,46,77,118,217,190,58,207,166,251,229,9,185,122,189,206,5,179,204,122,6,54,131,93,173,252,233,139,234,208,228,217,172,55,79,179,206,177,69,91,32,98,99,18,255,102,115,154,209,
+103,200,147,105,141,211,238,44,232,82,177,174,215,84,96,232,84,190,37,240,26,149,3,51,39,228,73,106,58,225,189,188,214,249,176,198,131,141,46,160,143,108,137,70,49,207,19,246,61,253,209,50,239,57,177,52,101,227,1,41,219,14,185,42,146,114,106,61,186,62,71,217,239,185,198,89,217,233,59,111,103,176,47,246,85,174,223,36,79,148,237,37,79,14,83,78,229,107,41,255,22,76,210,37,121,57,125,203,54,241,25,204,117,226,120,196,130,77,133,62,79,124,83,44,251,243,225,252,93,20,226,36,230,198,236,185,90,31,216,68,173,250,56,123,131,225,164,147,105,92,49,17,126,48,29,158,248,168,6,47,250,5,173,117,151,91,105,100,77,213,206,119,164,247,158,219,226,218,25,58,162,76,125,205,192,114,163,183,71,123,163,126,147,11,81,129,19,124,45,179,168,47,216,40,23,45,154,221,91,19,26,115,90,54,231,153,58,126,217,220,176,192,224,21,13,159,165,40,27,18,250,194,149,249,55,238,132,32,173,214,37,71,173,164,30,251,18,62,52,52,241,99,183,239,172,30,
+208,205,230,130,10,241,224,137,118,198,52,139,206,52,0,135,195,153,247,2,140,28,199,121,51,111,10,238,231,126,87,75,151,0,88,232,184,56,115,43,29,142,244,86,84,255,120,154,232,240,165,237,209,194,182,193,228,98,41,92,214,209,137,95,144,114,45,234,8,138,54,59,89,65,136,250,233,252,112,120,50,243,78,236,118,151,176,95,69,225,79,12,12,54,135,78,159,14,248,186,141,48,213,53,89,95,251,209,142,161,85,193,15,113,114,196,205,211,132,197,233,110,239,26,9,71,89,62,159,174,124,48,140,44,192,181,117,123,155,220,1,185,4,240,224,95,24,66,128,110,143,95,0,239,49,14,60,14,2,170,61,1,44,188,39,112,134,67,38,160,106,89,228,24,160,2,28,30,32,86,195,41,249,0,64,135,204,176,195,237,131,157,59,28,210,78,202,69,36,254,72,181,37,128,83,38,190,193,25,18,73,73,146,111,69,203,147,108,7,121,115,32,216,196,182,28,149,34,22,128,63,195,67,1,144,247,253,49,46,104,197,111,207,222,94,34,193,179,114,212,113,0,17,186,213,118,
+120,28,206,237,92,142,71,225,184,71,7,5,244,73,30,82,39,161,208,175,189,172,7,236,51,228,184,33,137,141,9,110,168,49,248,17,23,228,10,195,67,202,111,213,112,104,205,112,188,174,224,241,42,130,131,15,69,79,189,5,198,136,188,168,46,43,229,106,13,74,185,55,40,14,0,176,88,14,245,45,87,173,231,7,217,160,149,108,53,188,182,72,198,104,190,91,115,98,141,209,120,253,69,122,123,56,73,26,117,45,68,16,99,72,134,92,175,107,169,253,37,12,206,25,67,202,201,248,249,80,103,69,102,81,62,66,112,38,183,219,155,79,201,76,16,80,91,110,91,33,178,123,145,110,69,219,201,52,208,210,27,66,101,126,58,207,230,201,228,98,43,3,137,126,141,140,230,34,129,117,71,62,73,96,2,122,254,4,58,60,211,114,146,201,228,106,82,196,222,223,123,242,134,254,33,141,165,194,166,215,35,89,151,193,192,203,27,222,50,14,58,156,154,217,105,253,68,67,103,180,76,184,126,40,44,17,90,199,43,196,200,229,103,113,10,209,215,11,36,188,86,62,87,159,134,18,
+250,75,242,130,205,229,25,123,215,214,228,64,7,248,8,69,51,10,151,193,135,229,226,14,188,125,212,132,54,93,58,171,244,116,50,209,26,237,68,245,177,4,204,126,175,28,14,145,51,62,111,173,140,86,54,185,234,75,175,53,139,230,209,67,210,144,68,188,240,205,134,100,102,156,192,9,237,196,219,67,120,172,167,156,177,239,237,104,105,139,186,98,178,150,25,167,199,250,188,247,83,12,244,83,16,180,137,77,49,25,142,33,253,8,142,142,151,247,64,136,140,207,130,114,192,95,231,76,119,48,146,139,121,112,48,41,214,13,168,195,110,113,238,7,241,3,224,229,143,173,44,100,13,235,61,238,158,207,160,61,207,201,149,72,6,92,0,151,148,254,17,27,64,62,204,244,125,189,21,68,210,131,92,96,5,28,114,22,0,1,172,0,20,56,8,28,28,227,0,48,64,182,103,145,51,61,228,194,146,245,83,10,73,186,203,200,95,216,60,19,183,188,112,171,116,119,85,41,68,177,247,216,230,222,12,227,84,167,125,18,60,128,0,118,248,49,206,26,195,23,146,128,58,95,28,18,
+211,106,141,206,159,37,96,132,12,114,187,124,185,150,220,171,77,143,229,54,64,100,1,151,60,34,75,12,112,236,50,128,174,112,243,138,240,154,249,254,197,86,24,42,6,8,84,64,85,52,86,70,186,91,14,26,176,26,65,145,136,156,59,21,20,173,189,36,227,224,72,0,7,158,184,35,178,33,40,25,174,53,186,90,209,95,128,200,153,88,143,190,127,229,117,224,93,202,168,2,0,18,196,3,20,84,192,119,99,77,34,49,253,139,80,113,118,167,229,103,147,40,89,206,59,19,209,38,189,57,58,162,231,143,158,1,0,55,100,5,0,224,56,112,125,93,5,66,60,128,43,209,17,160,7,192,11,0,61,0,187,75,166,210,110,203,170,187,226,140,201,139,231,130,41,213,106,4,76,85,79,81,254,106,202,164,149,227,243,54,0,104,173,56,8,84,96,227,175,25,126,86,104,96,243,133,56,102,137,93,27,94,120,36,179,226,48,142,36,43,201,228,200,153,190,201,93,156,63,109,7,3,199,26,3,199,185,12,240,186,148,249,65,227,158,177,0,15,132,120,103,6,58,79,209,240,
+220,227,31,67,111,93,140,72,241,133,10,0,2,3,104,32,206,101,151,5,129,2,214,36,123,75,199,78,195,5,237,253,115,196,199,250,221,98,235,157,103,44,244,138,6,59,8,192,142,1,240,104,235,170,130,99,239,64,0,186,119,160,21,216,59,240,114,6,73,172,125,138,17,159,1,12,248,54,195,134,30,235,191,24,180,157,142,229,229,142,66,46,42,158,207,38,119,122,172,103,252,74,104,223,31,2,181,11,65,14,236,212,149,90,41,179,101,84,203,175,41,76,161,199,162,237,54,186,145,79,242,90,85,107,86,117,160,37,238,177,214,33,153,176,249,0,132,37,103,3,162,157,30,74,140,168,86,85,233,64,127,198,121,33,84,192,125,106,28,163,121,48,120,140,7,177,197,163,15,16,168,21,138,179,130,6,131,214,225,0,165,251,32,221,1,108,123,226,190,48,38,177,220,238,166,72,170,188,30,152,79,27,98,223,181,91,195,241,142,175,50,42,39,65,5,112,125,232,8,16,24,109,61,133,15,60,194,41,193,160,111,56,152,119,52,124,195,173,142,11,192,24,126,219,236,86,
+122,139,13,86,111,51,0,200,243,20,84,28,105,197,235,71,180,92,117,76,100,185,203,147,163,118,9,214,8,61,165,43,151,20,80,220,107,54,0,41,17,217,135,112,74,119,188,177,233,198,35,170,251,186,107,145,86,225,201,91,43,87,48,152,54,19,216,9,92,99,118,160,1,156,20,183,179,94,11,98,61,76,101,89,228,209,241,177,60,61,150,75,66,77,114,180,134,105,29,58,68,126,151,105,40,18,142,226,199,206,137,226,18,228,93,184,219,162,245,206,116,8,204,152,44,0,120,194,221,109,245,189,135,92,87,234,171,140,111,12,197,222,238,29,28,4,246,14,182,118,247,14,6,229,218,57,216,210,222,59,184,80,95,28,203,6,149,168,6,204,230,133,99,152,13,155,114,1,200,52,11,238,7,47,30,18,89,28,26,231,25,64,34,107,15,57,8,231,134,3,198,124,104,119,150,227,116,24,1,111,71,41,231,233,99,85,185,255,85,113,176,25,136,35,26,121,76,82,246,149,79,124,92,180,190,48,230,179,103,113,86,72,43,107,78,224,33,158,35,153,10,174,112,109,152,18,
+157,78,164,44,88,188,28,122,119,185,173,8,137,2,164,221,10,65,18,60,7,220,141,213,169,98,139,84,101,124,30,122,229,145,5,186,180,250,110,124,37,145,194,208,122,61,166,141,64,37,169,169,182,15,194,33,112,8,219,241,245,54,82,46,222,146,88,177,237,56,37,238,132,122,134,65,218,99,144,250,232,174,83,111,175,129,228,45,83,143,87,188,6,163,245,85,238,60,162,2,21,248,40,127,205,156,28,199,72,172,9,68,115,56,186,202,144,31,182,252,80,91,126,60,28,56,175,200,209,41,163,216,81,112,130,12,65,197,25,130,9,155,125,141,240,13,101,67,243,194,213,179,87,196,86,129,146,203,185,96,128,220,142,99,143,240,28,37,168,240,13,212,170,12,8,154,166,217,201,111,227,245,210,116,217,218,242,8,172,252,187,105,246,122,68,214,153,136,172,5,6,233,176,171,174,64,77,225,242,144,31,194,235,67,92,122,169,187,92,64,248,143,33,9,12,207,43,28,17,206,183,133,25,243,4,128,242,21,208,40,25,53,148,116,71,19,137,128,185,245,228,80,75,228,116,18,
+60,22,129,171,95,93,65,85,199,98,79,215,201,8,67,146,1,242,44,179,183,76,229,106,184,134,242,58,63,85,9,66,67,163,228,110,73,8,121,84,173,152,185,39,108,57,229,58,79,47,126,225,206,120,250,231,167,242,87,223,164,161,72,31,76,76,21,243,99,125,186,90,176,11,28,220,227,214,32,11,8,140,55,106,13,32,28,142,173,208,127,218,158,121,184,135,48,88,128,65,0,27,221,50,12,39,120,2,144,5,139,56,88,195,145,219,226,0,14,57,144,111,179,3,18,201,223,101,135,197,49,11,183,157,29,156,94,108,227,1,0,172,42,171,96,155,227,129,48,100,155,30,0,224,5,2,3,243,28,0,4,20,39,124,168,199,159,186,223,230,25,0,184,188,68,249,54,103,152,221,37,224,193,11,246,161,108,59,129,125,182,92,94,246,125,128,192,201,142,41,200,85,96,149,1,123,130,220,142,235,253,53,20,152,217,107,96,19,14,188,192,255,144,26,204,81,123,118,0,242,199,217,125,55,158,108,55,222,230,40,176,21,139,117,129,191,133,79,9,224,50,136,8,176,182,148,
+199,31,228,21,28,178,192,122,176,37,96,17,183,23,128,186,45,176,253,0,110,172,119,123,2,235,225,158,224,248,194,7,127,224,219,96,219,131,109,221,121,216,81,7,128,221,200,55,119,16,220,158,29,28,183,103,71,196,237,217,5,216,123,118,119,127,223,241,172,23,123,130,131,250,158,0,114,179,39,128,8,246,4,16,214,158,224,8,216,19,64,129,61,1,20,216,19,64,129,61,193,41,176,39,56,0,246,4,7,192,158,224,0,216,19,92,238,213,216,218,115,71,128,220,171,129,252,160,198,255,111,122,34,4,135,87,0,182,182,98,237,113,247,2,57,220,227,13,216,59,219,10,168,246,23,96,225,61,32,161,63,138,6,0,32,1,97,164,200,42,50,91,241,23,219,225,28,16,246,15,241,251,199,242,187,180,170,104,199,178,147,157,1,129,135,224,182,190,237,144,102,221,179,131,1,123,118,39,255,181,120,249,56,94,78,37,130,79,173,141,129,85,189,179,3,14,110,251,135,249,249,6,180,113,140,152,139,3,59,106,235,141,245,254,79,195,83,16,168,131,235,1,175,238,3,159,
+250,159,202,231,163,188,207,192,77,254,218,10,75,64,227,131,235,173,69,224,0,241,240,239,19,215,184,45,1,104,121,8,125,119,242,65,27,108,30,203,252,201,63,57,142,63,202,207,170,107,207,114,137,10,99,239,47,214,213,234,8,68,73,138,180,1,142,93,123,125,46,121,45,49,56,115,198,217,237,30,136,137,204,146,237,150,79,12,16,239,219,70,253,217,2,108,203,236,205,35,11,178,61,190,225,173,225,219,99,193,197,129,19,156,39,113,110,57,218,29,249,29,116,60,92,50,89,224,149,1,146,50,223,86,92,196,182,19,216,167,201,225,225,13,19,81,124,165,127,45,59,71,76,78,47,134,45,116,100,220,196,189,134,187,93,122,216,167,165,32,205,5,39,84,245,198,116,199,158,202,68,141,254,112,92,20,196,90,22,93,212,204,177,54,185,84,141,155,120,176,21,11,230,182,85,174,160,208,22,70,161,167,160,202,22,85,101,51,242,82,156,23,54,9,49,55,175,207,150,21,118,81,181,136,72,121,238,180,89,55,182,21,220,72,187,25,187,232,8,143,38,85,75,233,132,10,
+95,63,107,164,150,120,222,192,21,60,108,7,45,245,138,233,185,127,113,66,17,246,133,29,175,198,18,78,89,24,198,69,175,195,152,25,36,141,97,145,51,160,141,17,196,7,203,148,31,179,41,187,75,247,70,209,22,0,219,101,167,60,78,204,228,67,139,250,181,155,212,109,157,30,17,59,34,228,92,201,1,152,212,137,228,40,70,133,32,160,68,205,162,188,120,186,96,235,102,231,94,77,86,221,22,128,245,101,215,45,95,86,214,195,119,65,192,203,246,242,95,34,196,156,27,144,74,122,82,107,47,148,35,220,170,196,241,233,5,205,13,225,141,192,154,8,46,102,9,137,1,68,77,83,169,110,68,46,104,83,208,172,89,23,80,227,245,113,180,161,100,130,149,182,102,247,44,189,240,88,160,18,144,42,24,40,153,121,182,214,110,205,141,28,63,138,117,64,3,27,157,92,131,189,68,66,161,204,171,87,121,81,45,104,119,183,76,190,140,60,165,128,145,74,149,230,21,42,54,163,188,192,144,168,105,167,32,157,88,39,34,221,123,23,108,181,27,130,137,185,155,224,132,98,235,127,
+158,170,2,189,22,233,34,105,213,49,11,37,55,213,25,12,185,159,68,174,201,1,108,56,122,226,120,146,159,72,162,6,100,199,65,39,131,242,32,237,158,58,40,79,250,41,28,135,31,95,244,46,108,181,84,201,224,175,54,86,114,64,40,196,56,237,143,57,181,62,83,202,49,150,186,2,39,68,83,43,225,142,122,236,25,180,229,1,94,126,173,34,231,194,131,114,94,18,120,65,134,24,246,65,84,18,45,66,88,17,134,137,70,112,84,158,231,76,47,137,62,226,180,22,138,19,33,35,90,182,166,119,14,184,22,129,157,130,220,114,218,192,18,224,249,71,138,193,157,190,66,137,152,72,57,23,254,190,44,15,54,175,7,147,56,167,162,166,215,42,183,212,201,104,22,53,217,182,117,22,180,192,197,65,52,5,32,132,79,119,6,107,144,235,35,120,159,178,134,12,22,254,255,82,246,102,207,201,165,233,157,224,191,146,225,142,152,113,69,148,221,49,211,49,211,115,51,23,238,110,123,166,47,236,238,176,61,51,49,23,29,83,89,153,159,237,156,206,202,172,200,172,234,182,251,10,
+9,33,118,16,98,23,7,16,155,216,65,236,59,72,128,216,5,98,19,32,118,16,32,246,125,223,230,128,190,47,43,203,85,238,232,185,200,47,4,156,243,190,207,251,172,191,231,225,252,200,133,209,100,213,222,180,24,205,77,158,72,111,135,244,68,249,221,92,91,31,100,82,235,211,201,222,253,246,46,231,61,184,229,242,58,51,164,138,90,238,102,151,59,36,118,173,76,121,30,180,77,98,91,98,158,178,84,141,220,205,170,120,94,247,10,14,131,136,225,193,122,20,242,34,106,241,16,248,250,212,35,54,206,171,55,79,109,20,126,169,137,116,60,163,186,67,109,65,23,33,53,134,74,107,168,169,190,203,154,22,22,209,33,162,104,235,196,21,250,150,47,186,229,4,181,142,120,147,69,187,80,69,82,56,127,245,100,52,123,220,221,222,208,28,172,151,57,102,218,43,204,206,59,239,251,148,143,251,44,71,177,228,115,245,196,179,5,150,200,235,227,58,104,112,157,167,226,194,55,168,129,74,201,121,233,86,196,209,61,252,26,208,61,240,245,94,2,149,193,195,104,243,146,161,240,254,
+182,156,105,130,204,59,27,79,173,3,94,190,179,49,8,144,67,127,28,106,213,108,105,217,54,107,224,66,108,134,237,154,28,64,157,198,129,121,17,157,67,223,146,239,138,230,113,214,188,129,182,229,169,131,107,181,221,175,201,179,199,231,55,135,119,191,161,38,185,251,224,160,233,176,106,74,157,18,49,12,19,205,18,169,72,177,147,86,55,117,118,233,34,32,125,102,10,168,144,18,251,104,200,103,100,14,204,8,80,7,150,38,220,228,53,125,71,216,208,207,83,11,57,238,252,102,188,107,159,248,28,48,122,196,42,3,99,89,9,6,51,107,223,140,236,250,246,229,232,18,166,140,139,155,217,190,77,50,26,70,102,222,40,120,132,8,216,2,244,152,109,148,104,179,126,72,191,98,119,94,235,60,25,79,206,238,154,105,161,59,9,40,165,118,146,154,247,162,226,137,16,199,48,136,1,104,47,227,10,15,191,190,208,95,172,239,245,251,116,244,156,144,6,163,244,226,16,119,209,195,72,137,6,94,118,24,41,29,134,76,73,16,218,94,31,134,78,143,60,72,91,23,55,160,17,155,
+251,157,207,209,185,211,90,2,167,102,209,204,75,230,114,69,96,184,0,220,189,98,81,36,75,238,226,133,120,201,113,245,50,223,5,97,204,133,217,225,242,172,137,134,149,59,235,78,159,225,42,118,196,144,125,231,117,20,9,171,80,95,132,28,246,227,137,123,175,170,224,193,150,26,28,40,212,119,214,168,174,214,183,250,34,60,209,113,142,24,123,118,131,104,220,243,111,78,43,142,184,149,87,52,86,177,54,0,178,95,92,237,200,4,35,40,23,121,184,135,162,117,114,20,251,183,31,109,254,147,223,60,22,253,249,55,239,132,153,95,124,251,221,225,225,239,207,191,57,210,149,126,255,99,213,127,250,249,23,127,247,217,215,95,125,243,145,113,245,213,247,159,30,162,254,226,219,239,190,251,240,253,47,191,253,230,253,81,253,195,10,191,252,252,187,95,125,245,197,175,191,254,252,187,127,234,25,237,111,63,251,252,203,47,63,178,187,14,139,254,244,248,252,249,47,190,61,252,251,78,97,122,127,96,252,240,188,252,71,98,195,207,254,224,240,164,54,248,250,187,111,255,243,145,169,0,
+46,114,228,96,129,98,127,248,251,175,190,63,146,84,222,215,250,39,87,56,242,237,142,44,135,111,126,195,150,250,248,88,254,23,223,126,253,235,95,124,243,217,31,254,221,135,207,191,60,114,75,222,31,116,255,252,235,143,76,188,159,252,64,23,248,244,193,215,255,240,251,184,46,159,255,234,119,206,255,137,112,115,188,234,71,15,157,127,34,150,253,255,33,7,124,226,128,125,254,131,106,127,241,139,195,141,7,62,207,129,56,245,137,226,247,126,215,79,127,67,174,249,17,31,240,112,231,175,126,151,126,246,223,248,136,253,231,223,31,31,203,255,230,147,244,255,72,100,80,192,63,3,21,241,145,197,116,160,125,252,142,191,125,254,217,191,249,211,127,245,127,252,111,31,87,63,72,15,106,240,219,111,126,246,71,63,122,251,55,140,144,247,55,255,230,235,207,255,246,163,6,191,122,39,122,124,228,15,189,243,25,255,235,46,247,137,173,242,190,203,151,31,126,254,235,191,253,120,217,183,95,128,167,6,53,242,15,7,230,217,231,191,254,250,32,254,95,125,245,139,175,192,133,14,180,133,
+175,222,69,248,243,191,254,189,59,127,92,244,64,203,249,250,195,207,254,232,87,127,247,221,187,239,252,35,6,204,187,186,127,179,197,241,196,31,87,62,80,169,254,201,163,253,32,54,120,152,239,191,253,250,35,65,240,247,173,254,199,191,75,154,58,172,247,145,107,245,219,222,246,103,199,237,62,186,251,129,226,245,249,215,191,252,187,207,127,246,71,223,252,250,23,31,190,251,234,139,207,190,255,213,119,224,129,64,35,127,0,149,122,116,39,80,244,239,65,35,126,248,254,157,94,113,184,5,252,239,251,111,65,129,65,73,143,148,189,3,149,243,55,27,30,44,253,243,15,135,152,254,242,179,63,60,210,64,15,231,124,55,228,255,245,111,255,226,95,252,143,160,70,127,242,25,232,68,31,254,211,129,108,250,41,176,62,70,211,55,255,240,113,173,195,251,7,26,20,184,217,251,42,255,254,47,255,221,207,254,159,255,243,79,255,242,175,254,237,191,251,139,159,124,246,131,35,30,233,113,239,178,29,34,229,221,178,191,252,238,219,3,237,239,61,222,64,195,124,113,100,97,29,133,126,103,
+156,124,255,73,71,127,248,253,175,193,220,6,174,118,228,181,129,182,57,10,250,147,79,12,65,240,186,207,255,230,111,62,81,31,191,255,207,95,253,234,11,240,205,207,62,252,234,139,143,218,253,238,227,73,127,96,64,129,49,249,203,175,190,62,48,107,191,59,100,164,255,120,56,212,119,135,196,249,159,190,253,143,31,190,252,227,163,195,127,253,253,39,162,240,215,95,253,252,251,31,22,249,148,105,63,146,98,14,182,250,40,229,241,142,159,127,0,215,62,188,248,236,159,189,171,253,103,255,253,151,159,253,249,159,252,235,191,252,119,239,254,243,59,218,7,109,254,253,183,191,254,238,192,49,123,103,127,30,205,247,225,176,197,223,124,90,251,224,69,160,29,255,230,171,191,63,28,226,192,33,252,217,31,28,62,252,217,31,124,246,206,225,61,188,0,117,243,211,227,31,71,229,188,255,249,87,127,253,111,126,48,7,40,248,255,254,225,155,47,62,252,96,204,119,62,232,59,167,248,187,143,122,252,141,52,95,124,251,229,135,247,189,254,217,87,127,3,30,229,160,42,240,175,207,62,58,
+211,31,30,150,255,139,63,249,243,63,253,201,63,42,94,160,45,191,253,45,126,243,247,191,49,194,151,160,163,124,113,72,95,223,30,124,253,135,87,71,61,128,46,252,59,153,240,112,207,123,108,30,5,249,129,44,246,251,40,87,159,127,255,59,247,255,244,147,3,127,246,213,145,194,252,203,111,191,127,39,153,129,110,6,198,47,24,69,71,126,238,15,38,60,188,127,136,221,127,248,148,111,127,75,152,35,107,22,148,18,52,196,23,31,142,89,249,171,143,114,125,254,217,151,96,74,248,195,63,254,201,129,220,245,29,232,199,31,62,210,229,126,188,246,187,9,193,59,223,207,250,126,207,15,215,127,12,159,207,254,248,79,255,226,95,255,229,255,253,239,255,250,39,159,216,186,160,230,62,221,14,202,242,225,221,205,143,162,252,224,204,191,37,229,111,249,210,145,30,250,238,234,95,130,5,252,155,175,15,225,6,238,252,225,80,166,15,249,241,71,37,231,195,223,31,146,214,87,7,123,124,82,236,33,81,126,127,40,235,95,124,241,225,151,135,234,125,96,187,255,56,145,255,236,15,192,
+67,128,249,7,124,255,221,36,63,28,247,80,99,126,19,25,63,56,192,199,212,249,79,106,225,61,8,63,29,243,224,150,63,255,246,163,225,127,219,49,190,121,39,15,255,99,79,3,45,2,58,211,247,191,39,217,254,94,150,222,143,200,198,71,30,228,183,223,189,7,228,143,248,119,239,119,28,168,185,95,188,179,234,126,155,187,255,95,103,67,255,72,5,191,55,131,125,74,4,95,126,248,213,123,53,255,180,247,63,255,236,7,114,223,183,223,253,237,231,223,124,245,95,62,124,247,31,126,204,55,254,249,71,100,115,4,7,127,247,225,23,159,238,252,217,31,28,220,2,180,199,123,245,248,129,72,252,254,123,0,223,255,88,105,255,200,52,63,42,214,255,4,55,241,71,101,240,251,35,144,248,233,209,158,255,239,175,191,255,213,239,86,153,223,169,6,160,40,255,234,31,62,50,100,127,156,219,191,250,173,95,49,248,209,121,63,30,247,167,63,18,231,83,197,248,168,182,47,192,157,191,253,5,120,237,151,71,87,57,230,204,223,135,135,254,27,104,161,223,127,248,213,193,193,63,18,
+66,255,249,193,2,127,246,221,183,191,248,84,176,126,249,35,18,229,79,63,161,213,255,240,187,50,255,246,86,255,235,111,88,138,255,226,127,254,95,254,187,255,225,95,254,203,255,233,20,58,59,53,158,66,32,80,223,246,48,213,89,80,129,46,19,109,204,37,79,203,34,195,19,98,224,8,175,179,47,171,38,217,154,178,203,149,87,90,251,221,73,9,122,34,56,91,62,200,238,111,33,168,235,228,19,51,42,53,216,102,250,194,214,177,179,217,108,5,229,237,170,24,91,59,156,93,134,132,227,185,247,92,58,175,11,222,56,66,171,36,114,46,188,183,124,147,127,57,104,220,157,34,207,27,246,203,118,216,220,96,234,214,125,165,109,246,178,158,117,138,222,171,253,126,167,12,25,50,154,89,53,156,209,160,199,154,70,36,68,155,205,46,66,197,145,59,3,157,59,75,33,120,150,53,197,63,105,27,61,164,130,118,135,178,155,0,217,21,81,188,103,13,31,94,111,223,110,184,139,215,244,160,233,22,174,157,2,77,65,203,102,168,232,246,243,244,173,50,205,242,118,88,81,120,161,24,
+134,87,198,124,94,215,179,111,224,31,243,52,58,221,124,189,3,174,212,123,119,113,224,25,100,135,156,248,182,154,94,175,232,68,195,253,186,191,221,12,159,172,41,142,171,78,147,226,148,97,83,111,73,221,251,139,11,203,222,212,109,239,38,214,141,203,224,50,237,103,114,96,237,112,17,29,221,228,172,176,111,173,119,134,61,81,4,64,210,198,146,124,173,171,216,228,27,123,1,74,139,44,88,50,12,212,181,101,188,90,124,124,51,153,195,37,229,71,201,16,149,69,36,16,67,81,155,52,102,228,118,113,197,77,226,204,199,224,57,206,6,165,112,170,112,193,235,37,95,173,45,101,22,149,12,47,199,197,136,228,244,212,43,137,28,190,54,214,105,165,40,167,100,47,26,184,30,88,41,66,153,195,39,17,167,236,26,32,106,213,84,136,70,110,109,181,223,26,223,252,37,210,122,148,44,159,177,55,169,18,60,103,187,135,225,217,67,85,109,87,30,36,121,177,187,168,197,43,183,79,18,125,93,4,81,71,218,55,216,77,52,5,115,46,51,193,141,244,38,128,30,85,158,84,197,85,
+57,60,141,167,121,96,15,45,100,13,85,48,234,5,67,152,155,146,106,78,223,238,2,124,253,168,241,22,150,147,40,45,197,182,182,2,80,239,34,183,19,25,59,200,210,148,24,223,23,70,103,11,96,184,10,212,240,143,107,123,83,186,85,210,212,131,243,209,170,38,87,61,44,28,101,123,73,187,62,93,14,44,13,116,99,71,41,65,137,150,70,94,75,217,0,43,231,51,238,13,104,158,88,102,151,157,162,84,127,230,95,214,78,192,115,250,220,66,71,188,181,126,144,239,120,10,154,117,20,127,38,58,103,25,59,21,75,208,231,141,106,185,143,170,106,194,92,221,72,158,183,177,86,238,195,37,25,211,209,213,192,146,126,23,247,166,95,176,137,23,77,188,218,93,62,19,110,181,91,129,92,4,160,89,172,231,36,26,72,154,226,187,29,19,153,73,186,165,172,174,1,31,213,160,84,132,240,224,154,91,161,163,32,72,136,168,122,67,185,213,96,159,52,113,117,128,174,229,246,26,103,125,135,129,102,112,47,95,8,6,110,231,44,239,24,87,39,48,252,174,222,94,111,227,72,24,
+143,128,73,60,174,81,180,235,100,49,161,243,101,235,153,66,254,48,182,36,36,225,81,26,140,231,221,87,106,139,241,190,90,225,79,205,157,52,140,189,70,231,3,94,182,53,169,31,247,67,45,225,35,227,249,92,249,82,44,40,128,212,46,2,36,140,46,143,51,154,220,243,96,143,233,196,218,11,243,154,95,60,204,184,83,223,185,104,133,225,105,146,176,182,239,114,245,9,180,119,142,180,46,235,111,141,226,206,177,26,185,247,86,238,166,19,68,123,149,153,222,237,200,132,71,192,149,240,197,211,160,97,183,110,12,25,113,108,75,101,113,189,249,245,112,30,90,223,143,179,115,217,162,26,142,251,138,166,197,189,101,191,36,62,217,184,163,151,37,175,128,110,36,165,47,221,113,166,189,191,178,78,224,93,53,187,209,181,143,38,111,227,178,150,225,161,96,90,247,128,244,166,33,84,180,78,173,79,164,190,198,237,246,118,196,100,135,139,83,71,107,182,220,68,97,200,153,97,92,207,6,199,42,232,112,236,219,94,199,220,49,99,175,25,142,226,254,81,187,119,44,169,232,236,110,190,
+109,33,29,235,156,123,8,38,12,96,95,13,18,61,251,69,52,187,223,67,135,233,41,155,157,223,48,21,131,215,22,30,87,132,238,118,54,116,228,202,218,173,234,12,143,251,181,79,249,26,143,123,7,133,209,203,220,58,120,81,54,154,3,248,128,242,232,99,17,130,129,241,254,85,124,167,25,40,131,244,34,93,178,105,239,221,132,113,102,169,185,38,87,158,165,123,150,51,24,226,188,49,232,15,229,93,104,147,33,227,139,155,197,30,39,219,51,188,187,124,191,168,183,79,133,107,203,190,101,46,191,178,247,179,97,165,157,194,239,133,118,41,172,27,94,226,83,118,132,87,185,79,44,82,29,5,203,54,219,148,125,3,93,3,191,175,107,57,65,116,113,219,207,244,55,100,239,124,19,94,119,227,93,238,224,140,59,216,229,85,121,18,174,2,39,59,140,89,78,93,55,18,74,84,110,96,70,9,47,82,11,197,101,119,28,100,216,247,203,183,253,74,179,221,51,167,65,98,209,232,49,166,134,66,54,115,143,71,19,61,246,205,48,219,86,206,128,109,101,233,36,72,171,13,124,110,
+251,188,78,22,164,229,90,191,56,111,102,252,107,251,46,188,142,204,118,241,209,220,70,114,94,221,107,193,211,145,43,34,240,116,18,103,168,236,105,148,49,249,245,174,141,201,238,115,43,118,177,221,111,60,94,74,119,211,177,79,30,233,22,110,103,249,230,67,181,104,45,189,182,88,48,103,57,194,82,109,176,25,56,108,173,48,45,133,197,135,254,114,180,117,84,144,115,133,181,217,119,198,77,22,229,98,189,109,24,172,53,184,144,125,145,214,26,199,253,150,35,30,176,239,150,36,99,48,180,177,36,73,59,238,168,220,8,186,56,94,118,81,181,152,106,55,188,213,218,214,202,122,198,3,128,253,248,28,45,204,23,111,251,49,220,198,94,114,86,13,221,85,90,186,11,86,168,202,221,189,124,19,188,32,16,208,193,161,149,96,27,120,148,245,204,237,94,73,233,239,51,202,189,118,137,109,179,198,47,234,251,103,47,7,187,111,223,188,212,67,122,234,108,123,157,215,83,1,107,99,94,237,111,70,121,252,186,6,17,166,10,234,121,106,99,232,217,247,221,121,75,78,19,3,243,124,
+214,250,76,9,183,169,22,234,52,220,105,89,199,78,182,86,225,72,111,203,34,152,157,181,175,51,36,251,110,45,149,156,102,205,179,9,244,145,220,199,112,185,21,227,137,153,132,43,149,242,54,41,15,54,126,93,237,71,177,148,153,28,238,43,38,77,118,210,84,43,204,98,141,102,238,54,81,152,238,18,101,196,57,29,123,225,167,238,170,195,84,63,107,180,108,238,118,11,180,205,14,199,45,221,172,76,164,206,236,168,7,133,21,246,161,181,207,78,147,44,23,139,158,190,101,20,47,185,233,43,43,94,229,87,164,41,66,86,213,163,176,86,215,160,59,25,34,182,229,36,146,194,21,29,111,79,21,91,187,193,107,184,186,58,87,10,208,111,196,75,211,90,177,74,221,159,144,31,53,75,77,221,11,218,119,233,42,140,139,218,6,219,106,200,25,74,143,142,171,77,95,202,133,241,138,75,193,72,10,240,20,233,226,30,230,96,108,111,70,143,85,251,36,254,66,14,143,83,20,155,202,216,160,71,91,236,238,234,86,224,205,178,236,153,13,202,120,206,131,34,206,165,251,115,103,191,
+227,161,59,233,123,226,62,232,117,204,154,51,199,168,104,122,237,12,97,112,93,175,32,124,8,7,182,46,42,107,243,228,88,105,244,171,101,1,166,204,91,226,251,228,154,106,237,69,138,38,199,124,172,217,247,213,222,254,118,73,133,241,250,9,161,207,105,26,36,54,232,86,197,125,210,112,204,45,245,139,93,127,93,247,163,132,115,140,125,189,96,208,155,170,138,250,234,162,32,6,250,251,96,124,228,244,146,225,204,224,206,106,174,250,83,251,199,106,101,75,123,233,60,237,26,238,5,100,88,238,187,39,75,171,164,114,75,19,213,167,47,38,124,237,161,94,244,223,195,104,141,104,150,123,46,246,99,137,193,121,230,82,26,148,35,132,133,17,241,218,144,43,246,95,33,220,225,168,122,166,67,111,207,43,194,60,202,221,145,144,159,192,100,51,171,38,202,142,206,58,177,246,56,70,189,225,154,89,42,110,19,254,244,148,138,47,172,79,82,131,146,71,215,50,181,199,25,127,116,186,44,189,136,216,184,125,71,231,220,158,55,246,150,45,186,96,235,79,84,169,252,254,185,189,233,45,
+231,65,39,223,121,75,136,219,111,167,88,60,151,170,119,56,77,198,133,200,58,98,225,100,64,187,184,43,18,71,94,33,75,109,148,161,26,222,244,24,75,104,100,25,251,213,93,188,48,213,219,55,147,77,222,180,232,47,202,213,240,217,238,246,77,6,16,156,251,209,200,54,199,27,240,136,212,166,4,165,93,143,92,62,227,171,42,77,134,141,195,46,23,252,193,234,173,50,173,1,190,119,243,194,241,23,237,237,37,201,231,103,10,118,93,124,111,233,88,26,236,14,175,93,48,164,100,203,185,155,215,61,81,177,170,109,32,233,210,56,182,40,90,71,34,25,204,189,49,56,123,66,110,137,91,241,155,73,97,223,11,155,53,30,132,147,4,124,67,6,109,247,232,246,109,31,139,132,141,89,240,228,139,109,188,134,50,27,222,178,200,105,234,183,146,213,174,179,185,23,155,118,181,201,106,210,96,101,237,111,115,115,253,133,57,10,111,216,204,169,152,50,49,14,240,221,11,168,125,203,76,89,106,186,53,28,31,98,153,218,246,190,194,196,15,237,173,155,201,120,63,159,224,179,15,144,
+242,221,57,44,95,161,109,2,73,52,8,68,146,217,87,97,232,177,231,16,141,60,171,156,193,58,29,10,164,60,110,181,146,201,228,164,59,242,204,129,234,93,86,147,170,243,235,165,85,73,202,74,247,66,89,81,91,92,72,41,5,213,50,21,87,221,222,235,78,156,170,254,43,5,150,41,209,232,60,235,32,255,182,12,82,210,125,24,222,30,202,246,22,105,12,229,98,47,73,250,16,24,107,197,107,78,72,166,83,166,174,29,232,158,51,250,60,88,238,48,25,143,173,146,176,241,208,226,181,63,47,10,139,41,155,182,31,143,192,196,182,114,191,165,42,227,108,65,83,122,237,74,52,236,188,227,134,213,48,177,152,0,125,233,30,100,61,138,197,214,103,178,41,123,150,146,155,0,203,42,115,235,176,148,181,176,188,73,123,75,40,53,228,164,134,217,214,87,5,160,31,207,245,17,62,1,14,25,152,209,94,47,41,152,95,139,167,19,75,173,176,223,116,239,202,156,231,113,158,160,242,50,173,30,91,127,20,11,51,12,251,237,153,170,177,231,166,141,226,153,117,54,233,122,1,77,
+39,152,123,98,119,179,145,102,34,98,143,23,58,150,251,93,6,71,220,205,31,13,202,243,25,131,34,115,160,155,17,83,251,126,27,85,122,35,91,206,139,18,129,23,86,235,219,144,34,32,125,128,164,45,47,246,24,251,113,52,221,171,11,61,225,93,138,194,76,100,111,206,26,81,233,155,114,86,143,241,186,217,138,131,28,109,102,28,35,182,253,193,56,67,233,238,193,128,34,230,225,13,220,51,98,112,153,111,143,76,101,79,246,68,138,64,164,79,226,240,33,214,29,143,21,192,130,169,92,110,54,42,135,121,48,236,4,217,108,16,60,212,171,41,150,18,216,58,253,167,174,121,158,176,156,45,172,218,65,48,237,76,25,240,204,189,164,252,102,162,43,105,249,1,106,219,240,58,42,39,154,194,176,125,97,217,73,19,48,30,158,88,181,54,107,150,129,27,222,66,32,27,152,8,51,126,71,199,40,94,148,99,97,93,20,196,187,41,178,46,75,84,147,250,188,123,250,46,54,148,15,250,251,139,214,34,195,239,108,252,190,135,156,189,94,181,100,199,232,174,214,158,74,237,247,96,
+193,127,233,43,214,184,100,236,114,90,53,86,82,175,243,190,85,166,143,228,65,125,78,58,194,45,218,167,22,116,93,73,234,184,131,13,89,123,121,67,239,193,179,185,18,69,196,43,213,76,174,42,162,124,40,117,53,123,169,125,48,62,13,75,230,250,235,90,102,194,153,250,134,225,156,110,112,28,78,175,121,126,218,237,189,238,14,59,82,206,42,49,68,84,227,105,238,73,130,209,159,217,54,52,141,50,240,50,119,225,221,78,186,65,99,92,50,188,147,50,144,82,226,99,133,77,138,9,211,16,157,134,251,90,4,24,46,71,156,45,114,248,50,223,68,22,70,141,1,24,39,27,247,60,69,135,26,118,175,79,112,84,204,100,200,196,69,30,241,15,73,40,238,217,177,5,124,167,131,150,1,226,143,82,49,190,54,70,30,220,213,35,56,70,131,237,206,242,34,230,7,255,72,166,196,219,51,250,152,219,161,87,71,141,158,7,187,96,118,136,232,84,144,164,115,176,237,42,115,99,245,96,195,231,24,57,122,243,104,55,52,104,55,61,26,239,179,61,196,99,79,222,130,213,178,161,
+227,241,187,178,105,17,239,142,239,223,42,227,115,92,222,246,108,43,51,149,230,241,76,37,109,48,167,47,183,235,130,68,248,220,221,150,54,206,20,150,13,95,143,84,48,37,211,30,111,11,240,187,55,193,222,174,157,23,81,205,123,241,203,26,26,159,105,209,141,141,14,175,197,151,17,206,194,178,102,235,118,8,176,169,102,112,51,184,25,213,243,34,41,43,198,190,192,167,76,245,102,70,105,78,55,112,64,248,100,28,206,236,121,123,17,43,231,216,206,153,22,104,144,133,144,110,206,247,91,135,108,63,219,60,226,3,193,249,102,131,31,250,116,93,193,190,131,74,121,227,99,65,164,19,44,230,135,29,159,53,133,12,198,183,110,223,52,119,89,3,171,37,3,171,33,215,178,123,142,93,208,10,199,31,40,62,113,113,93,187,47,219,184,220,44,143,25,105,103,46,19,89,130,172,88,111,145,250,5,189,125,59,210,35,40,51,233,234,177,159,23,232,221,181,135,243,247,4,47,163,218,144,233,183,135,184,35,198,90,42,179,134,183,106,193,151,100,211,183,206,145,137,87,180,206,47,
+102,49,133,196,53,151,3,150,232,202,85,77,217,251,155,113,188,191,106,185,58,13,101,25,225,163,27,231,53,93,181,225,120,93,132,168,118,199,100,87,92,12,179,98,60,149,8,197,227,224,183,108,90,203,27,206,206,116,122,116,99,110,207,43,80,192,176,106,25,220,212,24,5,80,89,154,8,27,183,172,197,87,196,138,215,84,14,45,19,73,77,164,218,227,98,119,234,5,160,181,239,186,208,136,84,168,4,27,88,63,135,16,98,56,177,22,54,149,202,221,193,17,184,221,235,206,2,230,227,194,139,161,151,49,41,139,82,138,149,59,126,244,187,228,153,89,44,210,47,121,153,234,85,216,153,43,171,120,246,130,99,237,184,87,86,218,88,105,157,177,124,224,225,81,114,2,63,158,24,99,58,105,185,128,2,100,94,116,188,237,46,216,49,56,141,161,4,77,12,175,115,213,219,39,221,91,183,104,89,197,138,76,79,31,86,3,243,224,25,76,2,141,128,56,102,47,70,9,249,121,33,219,107,156,115,231,216,253,234,214,197,75,109,39,165,252,80,163,12,51,205,237,217,90,37,181,
+167,103,26,97,18,179,95,225,207,34,91,123,103,70,190,18,62,111,122,251,138,172,8,108,7,75,52,203,90,3,97,112,255,209,123,166,30,156,9,25,29,166,28,72,89,111,23,73,99,92,137,240,91,119,4,252,108,232,92,58,69,227,33,155,117,107,77,57,205,192,106,252,52,88,82,227,68,188,183,232,83,8,140,243,84,121,72,126,122,46,26,1,110,49,58,205,187,137,112,188,233,109,223,192,169,220,2,54,206,158,218,154,177,139,22,59,39,93,159,230,112,91,155,167,141,213,132,28,24,109,201,67,245,200,187,253,193,75,147,146,238,193,134,244,217,181,216,31,36,26,11,3,87,245,240,16,136,44,89,10,54,176,22,116,99,176,197,173,107,227,4,199,146,239,209,108,171,137,175,236,11,41,86,237,56,52,40,172,65,92,140,62,154,50,15,211,29,29,47,6,227,2,136,59,115,214,56,214,120,95,148,209,71,171,253,84,48,242,56,220,60,52,174,17,214,69,188,214,214,203,208,56,87,219,150,32,30,221,245,88,143,46,167,113,120,111,135,70,76,37,135,193,199,207,246,114,
+202,76,81,34,56,152,194,185,91,91,230,236,245,179,230,218,24,40,26,23,81,233,194,224,96,152,40,234,206,228,105,99,156,59,173,204,215,253,134,10,141,0,10,45,187,108,157,143,232,126,147,104,107,171,120,84,69,208,166,112,249,200,102,247,43,138,35,218,213,3,42,119,33,28,178,12,253,53,214,170,183,235,156,125,229,190,61,22,103,47,39,207,82,119,95,104,15,173,245,164,42,138,91,237,26,84,185,133,244,66,101,58,127,164,58,224,233,187,90,139,169,85,34,64,131,178,111,22,205,167,101,63,59,119,53,253,220,145,135,202,110,172,39,133,34,96,29,87,103,81,105,132,97,27,69,160,60,54,83,8,172,97,147,181,71,233,240,27,61,195,38,227,70,185,235,86,226,237,222,225,39,109,183,243,226,164,133,196,111,164,43,31,28,183,30,228,113,222,226,234,156,231,202,220,26,157,81,99,159,222,97,237,123,197,137,52,177,86,66,151,235,108,99,23,218,145,113,33,6,111,55,48,103,56,171,97,141,166,180,217,110,27,230,70,99,131,175,193,244,41,155,114,71,37,161,124,
+166,30,47,62,87,70,129,201,88,213,24,246,47,88,142,121,125,22,225,224,209,51,230,242,49,141,118,14,203,70,188,204,196,222,18,26,50,249,248,73,177,207,21,4,55,1,53,27,54,166,232,18,183,193,97,117,40,236,119,246,29,163,193,252,106,2,83,41,115,63,114,72,51,201,150,247,17,225,150,157,79,217,97,155,201,86,120,144,119,117,92,158,87,145,19,44,234,4,170,27,191,210,141,135,160,155,220,186,40,18,126,30,85,85,119,227,86,140,48,237,246,100,251,80,227,240,249,186,226,194,46,21,27,150,42,138,18,230,131,222,194,60,187,174,219,28,189,55,39,8,166,123,203,254,128,187,116,81,11,143,166,55,18,225,161,63,97,102,38,189,242,155,176,19,190,178,188,202,157,195,171,136,181,87,113,166,194,125,96,173,214,55,182,245,253,2,190,127,28,88,121,27,246,194,75,48,88,119,91,196,172,12,108,95,39,215,101,32,122,104,125,234,212,112,191,23,135,241,42,236,59,194,114,28,210,193,35,33,211,204,92,175,219,198,117,79,211,105,82,216,128,217,80,102,179,199,
+105,120,27,69,145,37,236,12,187,117,92,186,242,111,197,241,168,106,91,14,10,206,237,214,68,3,236,124,38,4,6,95,2,192,11,169,109,219,97,236,146,241,115,96,235,201,55,246,59,71,15,214,79,143,145,243,161,62,111,156,71,188,13,45,110,187,233,58,109,232,101,81,187,185,111,191,176,34,235,0,65,83,212,143,146,4,170,193,214,125,112,21,133,225,204,152,197,51,228,247,187,1,94,137,188,241,161,189,30,156,8,88,26,37,201,70,217,231,107,218,169,225,100,36,100,87,219,167,249,241,208,169,242,58,193,147,6,22,213,9,122,2,182,115,163,172,41,201,136,74,229,247,78,89,113,179,195,33,210,41,20,216,28,44,39,38,57,187,176,173,214,231,214,197,152,41,86,22,103,229,84,247,202,50,158,102,195,155,45,39,171,41,88,22,245,246,92,207,30,74,202,54,225,35,123,177,111,42,251,235,44,135,106,29,156,80,139,61,71,63,5,195,91,231,123,227,122,95,74,233,29,253,45,130,109,19,47,238,117,235,66,70,1,140,113,192,140,20,70,239,3,202,34,80,186,204,
+140,7,175,69,2,48,203,222,112,153,26,158,205,93,11,49,46,55,59,161,33,191,77,23,242,101,232,8,160,12,90,85,45,125,173,199,27,138,27,129,109,94,79,80,185,220,77,254,18,196,125,231,122,49,190,188,233,89,224,105,246,186,52,96,59,54,125,79,223,182,124,8,22,25,59,134,131,182,206,26,12,236,73,182,91,220,101,155,193,200,106,136,23,110,28,209,220,33,237,23,123,252,141,208,192,220,19,31,13,172,117,213,192,140,51,102,88,239,246,21,235,221,111,222,116,247,96,39,221,27,141,26,89,251,188,75,240,130,168,1,47,1,246,75,229,198,87,17,67,221,38,184,208,226,53,143,125,10,201,146,18,118,155,82,143,163,69,68,105,155,109,136,107,48,172,152,222,114,36,175,223,86,252,107,83,138,53,239,65,189,155,225,172,100,106,43,27,20,84,137,250,188,91,105,185,131,10,219,52,125,30,70,207,83,155,214,216,96,45,91,119,15,110,44,225,121,156,224,246,113,246,198,157,183,179,52,18,156,153,91,37,117,155,175,80,177,97,83,113,93,246,116,241,74,74,70,
+223,246,46,67,132,20,196,77,102,88,199,43,71,174,66,148,111,182,48,196,44,35,223,20,160,180,252,42,200,238,245,109,149,98,13,141,55,56,200,13,174,83,8,141,88,201,185,201,94,170,175,56,157,208,46,140,167,26,21,151,247,203,98,161,122,159,113,116,246,49,169,50,41,44,184,49,79,164,176,101,52,59,27,191,234,225,194,174,165,226,122,132,122,89,5,189,177,237,228,52,9,232,89,0,58,27,207,181,174,183,156,237,36,94,184,213,174,51,18,164,226,193,237,30,89,171,36,124,101,76,178,169,28,149,114,223,214,109,172,165,141,59,216,184,110,157,150,85,77,182,227,150,7,112,85,59,219,210,155,157,91,213,218,237,52,49,98,24,212,15,17,26,186,161,237,42,187,78,58,10,72,154,20,158,26,68,223,178,234,105,188,10,145,188,118,84,150,80,235,169,138,62,27,116,118,28,135,238,222,78,221,182,106,217,186,117,92,102,82,115,227,180,10,205,158,101,54,84,135,243,252,165,124,181,64,16,8,170,72,9,107,31,93,27,107,101,78,41,105,128,43,119,253,8,193,217,
+172,119,216,162,107,20,10,14,126,254,16,45,47,220,23,90,71,29,138,112,222,187,221,29,83,133,20,238,189,157,6,169,176,252,93,249,154,203,149,88,243,40,225,8,235,78,240,214,194,129,196,241,136,52,19,176,207,187,210,157,107,66,244,240,7,155,91,165,7,37,220,164,32,39,119,112,220,28,111,181,106,117,103,56,148,151,33,6,32,48,209,69,159,189,92,188,85,37,103,143,120,199,142,121,190,47,48,146,170,84,218,30,40,35,132,249,192,92,110,221,93,56,79,32,40,199,112,71,128,195,111,2,222,11,211,37,248,249,219,32,103,188,23,210,119,111,16,82,216,20,51,66,158,204,156,130,99,52,120,74,172,144,220,228,110,202,241,26,212,87,186,193,196,81,157,222,188,113,6,1,130,115,5,174,113,88,34,14,174,113,33,31,69,44,80,124,93,119,225,84,61,179,210,200,16,38,87,83,27,121,91,190,71,48,24,65,174,157,87,67,95,188,31,111,16,122,236,171,4,153,152,191,201,152,115,205,228,35,65,62,154,67,229,28,25,101,135,17,22,52,12,194,189,223,66,25,
+122,252,65,183,246,234,197,104,115,236,186,228,89,138,51,120,130,180,124,28,24,209,237,125,139,186,18,74,150,242,141,139,127,36,48,46,87,231,232,80,74,210,82,20,55,113,175,54,224,89,207,123,13,221,96,60,232,192,158,171,25,166,8,112,242,19,3,112,99,148,4,104,214,237,161,7,180,119,148,174,2,40,47,226,141,156,177,236,236,132,100,15,23,47,191,173,131,252,13,166,13,35,106,163,106,222,85,36,29,103,205,253,235,242,51,127,123,201,115,164,189,43,241,234,240,203,35,187,166,77,4,64,174,98,150,123,167,127,149,24,46,173,158,22,157,213,227,226,145,80,156,230,117,251,134,170,16,252,132,55,29,247,54,252,164,194,249,94,72,67,171,217,128,120,54,141,237,195,126,126,137,86,68,152,177,202,182,124,134,124,188,92,105,114,45,117,53,22,187,221,251,101,48,226,132,170,142,133,162,108,108,165,90,1,81,122,176,83,64,193,251,215,231,19,237,160,130,127,150,244,240,41,143,138,66,241,106,248,25,181,93,43,19,144,113,182,100,197,24,12,215,138,89,159,91,122,
+218,49,206,67,226,138,39,214,162,115,101,250,65,194,186,171,100,218,151,172,19,50,54,98,207,247,154,219,160,72,48,232,220,87,150,237,105,125,225,22,149,35,43,119,25,146,184,40,48,217,112,98,115,127,163,177,145,10,181,43,65,219,69,52,193,226,136,174,51,99,215,73,44,12,45,147,58,213,161,183,100,137,186,193,79,117,129,161,170,71,244,115,25,22,155,4,240,122,227,140,197,203,106,46,228,61,13,64,67,40,139,2,7,106,147,126,115,34,47,22,108,54,251,41,2,27,71,52,247,101,132,164,195,71,14,79,252,176,113,206,182,183,235,78,88,126,137,45,60,168,112,222,192,62,147,180,191,10,158,18,111,102,78,49,12,250,228,18,1,230,141,119,80,169,98,85,212,120,4,166,185,237,22,81,57,178,193,211,182,160,88,141,66,184,116,198,16,63,0,30,70,194,232,199,211,160,38,148,119,72,11,47,95,75,225,178,129,228,108,157,136,56,83,37,176,144,238,43,199,3,240,227,45,34,255,17,207,22,132,252,87,111,25,153,33,3,194,96,105,102,86,48,242,115,73,151,
+19,201,126,107,220,205,53,20,220,80,77,101,77,3,155,225,125,206,230,158,244,250,190,178,29,212,198,101,196,53,60,223,88,81,86,0,134,27,131,246,15,62,195,111,196,62,172,223,28,96,211,46,216,23,51,61,102,88,97,189,42,78,247,138,36,111,243,82,219,82,56,50,243,21,21,183,104,185,61,52,37,105,68,247,216,90,148,183,185,248,224,23,8,108,68,219,107,242,88,248,213,163,237,78,27,48,63,214,215,234,86,218,56,228,154,206,205,196,43,92,153,134,19,151,119,5,222,146,198,5,229,183,153,207,227,221,37,20,183,62,31,60,97,19,232,23,101,172,187,234,25,165,56,88,188,171,88,195,232,57,123,231,252,2,82,5,131,15,102,103,122,93,254,84,202,170,157,182,79,103,107,177,62,207,110,38,21,104,225,51,22,139,140,141,192,196,176,164,29,244,113,136,80,241,83,226,16,161,53,101,92,47,171,139,0,95,52,137,9,17,46,205,186,53,1,140,114,201,96,215,63,70,121,122,18,31,84,185,41,181,164,46,65,105,168,184,23,177,76,15,12,217,131,250,4,95,
+27,86,173,3,110,166,186,137,221,175,104,137,33,53,81,156,17,104,183,235,198,172,190,172,122,195,155,139,135,69,116,35,221,147,226,217,7,124,5,179,86,92,73,181,30,207,132,1,131,98,32,201,242,150,135,199,199,30,177,188,84,249,108,52,57,123,165,27,226,84,215,115,201,127,41,168,81,195,207,197,253,188,143,56,153,111,115,83,139,113,243,180,29,205,37,46,127,69,77,235,113,111,208,65,112,37,140,34,80,78,20,135,208,25,65,117,126,72,108,105,23,209,211,145,12,156,114,20,186,65,97,23,68,111,231,155,126,115,238,174,213,178,125,75,134,140,51,218,101,55,136,38,120,127,163,106,71,199,140,8,196,3,98,7,186,215,61,198,209,180,34,109,28,107,21,95,126,118,18,188,165,132,129,235,246,186,61,232,242,253,104,42,210,237,6,109,253,106,88,53,216,119,108,75,34,246,58,246,85,245,207,21,179,81,230,225,63,114,20,207,28,207,110,25,108,176,241,202,104,200,177,97,168,209,59,115,239,25,37,58,100,231,140,153,154,10,67,206,101,64,233,230,124,48,105,50,
+209,6,14,85,185,234,97,247,121,150,189,67,216,94,227,180,252,83,16,127,82,85,5,86,81,138,196,83,167,92,97,211,23,31,230,26,84,37,100,252,80,143,102,69,74,224,9,20,18,129,85,235,231,32,136,171,164,209,112,239,130,135,186,52,229,107,76,60,144,48,142,248,141,202,98,161,220,55,199,201,138,151,238,31,149,112,116,128,27,1,15,80,63,151,105,44,253,178,11,13,23,142,168,247,4,2,1,39,85,89,156,200,49,117,23,142,169,152,50,106,237,246,132,66,191,29,213,132,148,229,10,187,65,6,114,210,182,93,52,47,79,181,48,241,32,96,223,51,33,78,200,117,75,77,14,147,78,206,136,67,0,237,117,4,156,151,90,244,206,212,228,94,99,204,254,27,218,210,164,242,179,108,4,95,92,128,147,107,44,61,14,28,11,139,47,235,28,179,196,59,127,13,24,160,132,182,255,122,113,231,83,165,110,186,206,230,67,33,40,96,43,17,196,170,45,209,146,189,80,151,138,126,34,37,102,94,134,249,209,34,159,149,206,68,111,199,250,97,80,213,81,100,69,13,193,32,
+124,17,36,128,149,76,160,150,0,88,168,65,145,115,168,18,163,105,188,242,82,82,121,112,122,74,88,5,25,207,211,168,70,169,84,41,249,73,234,225,217,40,74,22,235,84,234,50,197,189,123,123,228,187,111,167,22,212,101,128,192,119,54,53,143,86,122,64,228,160,139,37,186,241,237,3,115,196,139,95,153,42,196,12,11,94,237,204,228,36,198,13,214,99,88,217,18,36,92,73,31,6,11,41,89,253,58,112,155,17,243,158,17,209,88,188,61,25,67,161,103,106,42,80,150,231,96,247,113,191,113,29,14,119,180,34,20,69,9,131,238,2,62,176,172,198,64,65,2,228,224,195,157,140,161,238,100,200,85,183,239,185,56,115,70,177,218,112,45,227,56,233,76,175,7,139,251,96,69,48,139,27,61,6,230,115,208,102,186,240,122,75,187,229,180,60,38,195,96,188,29,147,117,149,123,180,116,99,10,26,207,11,153,199,141,105,151,134,124,21,126,189,15,45,120,248,205,36,141,156,57,85,125,44,101,59,34,49,151,221,148,109,13,91,236,25,46,13,24,113,222,141,165,174,108,159,
+245,54,15,41,47,245,70,68,80,192,160,88,226,169,243,222,193,31,196,198,93,251,32,214,24,245,179,212,115,172,78,51,240,152,200,220,62,127,229,126,62,37,192,136,54,30,188,101,191,235,57,145,115,140,29,34,216,241,173,187,133,245,186,201,175,224,228,176,234,166,211,175,162,235,98,165,133,159,157,87,249,211,171,42,149,109,150,77,5,4,97,144,174,183,78,137,178,33,227,138,78,116,248,17,12,178,148,26,110,201,171,149,24,217,16,211,217,200,126,195,128,59,39,45,175,222,134,175,45,83,164,249,36,186,87,162,188,246,144,29,115,169,98,211,81,194,102,16,142,137,104,67,170,158,212,67,56,17,75,177,24,58,186,17,106,221,152,123,12,235,214,80,82,139,130,169,22,95,113,165,122,157,102,157,166,234,88,244,4,43,60,190,170,111,147,15,101,198,27,181,86,8,109,180,103,97,227,184,150,60,87,187,166,248,171,58,208,119,164,244,17,255,234,102,24,131,187,148,195,242,173,93,246,52,229,86,236,68,148,151,176,200,229,58,101,126,55,127,185,61,193,213,74,236,135,224,
+14,157,219,145,123,93,7,220,187,103,151,113,143,152,233,45,168,14,237,35,159,78,104,197,95,242,20,74,120,34,220,53,139,157,160,110,141,220,15,133,247,121,31,149,174,100,120,183,89,198,185,19,73,84,110,6,50,188,139,178,143,152,146,254,43,36,45,226,153,144,194,155,194,133,22,70,23,103,201,142,34,157,74,237,141,164,3,107,245,70,158,7,214,114,143,204,125,111,27,60,119,175,40,168,32,141,64,37,181,2,82,222,157,19,25,71,121,213,12,152,83,12,196,80,194,187,102,212,239,224,214,99,157,152,113,38,122,19,232,244,238,24,9,128,17,205,84,25,195,233,223,146,77,122,69,78,53,80,23,66,100,183,186,123,248,49,62,117,214,132,18,238,28,228,107,100,49,72,118,215,213,79,118,170,247,60,136,94,97,29,254,177,167,193,153,94,145,200,36,92,149,136,234,115,45,30,167,95,66,66,250,112,29,250,91,230,197,66,133,85,173,65,35,85,138,171,141,98,207,25,106,155,181,90,191,213,147,136,145,64,186,103,133,87,114,180,165,83,95,89,129,135,216,197,186,55,
+236,182,197,240,211,112,147,57,22,216,80,204,118,234,161,45,108,94,21,182,47,107,159,157,47,247,10,119,25,246,82,46,193,87,81,107,159,27,208,214,37,192,115,3,45,115,204,144,132,76,215,50,204,182,94,120,26,3,16,136,222,27,83,155,165,223,213,1,64,141,172,17,94,51,126,94,145,9,87,141,220,85,63,103,119,245,110,144,17,237,179,27,204,27,44,130,112,237,68,22,195,128,28,160,234,38,228,205,164,13,93,113,138,47,79,33,158,124,191,175,176,49,184,52,199,182,46,72,30,60,206,242,25,41,188,189,142,13,158,240,98,128,213,220,237,72,231,214,251,85,26,106,233,83,82,103,195,75,92,216,141,12,145,151,20,72,248,145,132,18,26,72,45,220,138,3,139,95,207,60,84,107,78,200,125,22,172,36,64,232,60,111,163,166,3,14,208,119,231,104,109,220,8,3,17,48,27,3,38,121,17,9,143,168,90,52,196,186,18,56,129,158,156,8,226,103,26,229,75,220,159,186,73,184,171,33,77,63,86,102,174,21,75,26,238,138,174,236,222,188,162,54,206,152,145,209,
+87,217,153,96,2,71,82,222,146,198,113,221,254,186,24,202,177,234,254,77,196,79,227,232,91,16,193,224,217,166,204,157,35,16,105,55,217,34,7,136,113,180,183,230,29,245,176,9,216,246,34,41,129,64,32,55,177,203,81,249,14,203,25,64,184,144,59,135,8,184,30,156,65,192,63,2,10,224,188,32,144,112,72,56,72,12,178,240,34,97,68,241,235,213,18,132,181,173,68,233,28,5,135,64,54,188,57,224,140,42,131,86,250,116,249,6,220,238,78,60,221,85,105,190,83,217,197,116,96,54,58,57,148,98,200,94,164,26,220,56,200,195,200,250,69,210,115,56,134,74,198,240,250,122,144,56,172,47,17,3,167,183,130,129,44,30,67,139,189,181,230,181,171,12,185,130,64,246,19,243,160,194,98,207,169,19,93,34,236,42,90,233,116,224,141,77,73,1,87,119,30,1,141,213,232,27,168,6,17,112,248,223,249,226,47,81,96,143,156,175,188,164,98,228,226,32,95,25,222,14,217,193,148,250,98,61,178,66,163,224,222,224,214,142,216,96,66,28,154,149,128,101,81,59,184,241,
+128,231,0,15,9,110,189,145,72,128,91,61,140,136,159,56,233,222,39,35,164,2,41,177,5,160,167,118,145,70,130,137,155,109,154,119,62,65,219,186,93,98,115,30,248,97,169,245,254,109,90,62,83,205,37,177,166,176,50,89,246,252,67,167,98,44,33,195,124,80,8,100,23,13,151,159,48,24,140,140,206,165,73,150,244,128,93,45,184,89,93,25,228,205,1,46,56,47,83,249,169,171,74,252,140,217,152,208,64,149,237,64,157,1,78,164,181,196,210,129,105,122,95,115,187,177,71,129,74,142,128,8,96,6,77,16,195,19,24,48,16,200,227,194,235,135,65,117,103,170,227,57,174,7,60,200,251,129,76,166,193,130,44,57,127,66,24,33,71,137,37,97,126,235,181,233,225,156,136,227,12,16,177,67,120,3,252,8,229,117,200,186,227,122,157,55,116,46,172,240,43,120,189,223,214,230,100,114,92,144,139,144,92,35,14,171,47,188,89,36,76,179,69,238,95,134,169,152,96,87,97,7,39,36,30,165,108,114,121,30,214,92,238,65,158,213,193,56,23,78,241,53,225,253,250,174,
+18,237,157,160,8,195,74,91,60,218,41,201,67,190,78,86,13,70,41,84,233,45,166,58,121,88,50,175,77,239,215,5,64,39,89,130,17,27,107,139,213,27,195,194,106,30,96,106,220,20,98,27,167,139,203,213,12,45,18,189,62,170,63,224,86,2,91,55,16,44,191,242,153,101,63,138,182,56,115,131,185,17,212,15,11,212,15,23,76,73,92,180,119,97,146,105,7,8,160,200,227,129,183,92,64,174,14,254,231,128,0,85,43,65,168,78,165,98,120,155,241,156,200,62,9,171,128,131,39,190,94,61,42,209,66,140,109,72,5,3,202,59,180,205,18,98,88,149,253,102,199,135,46,156,7,5,79,239,208,1,49,112,114,242,49,156,226,182,99,56,45,100,105,127,156,219,37,76,40,111,225,13,199,83,51,135,48,44,135,251,149,78,194,241,15,135,49,193,136,233,165,173,53,3,128,56,36,152,120,82,131,71,180,67,22,240,29,191,254,38,246,25,250,43,24,12,170,5,205,207,97,135,245,207,152,156,121,244,16,27,246,66,84,190,241,25,163,162,144,194,170,30,104,192,234,217,
+209,110,23,155,37,47,103,170,178,202,48,206,125,245,158,161,202,191,230,164,240,41,41,44,142,89,160,196,30,119,112,197,197,193,14,158,196,65,179,130,207,138,180,228,244,170,158,47,5,193,130,123,225,153,101,140,214,64,242,218,117,176,238,0,191,28,230,110,88,165,115,248,203,121,170,199,208,74,61,80,4,1,76,192,96,133,27,105,171,23,9,49,246,246,104,6,184,140,5,12,251,87,114,226,108,156,244,221,174,203,111,212,243,99,149,10,211,30,247,119,213,11,151,173,118,233,44,131,113,191,127,51,193,52,10,192,241,182,194,44,239,197,55,147,188,17,31,103,47,132,91,121,210,198,138,108,160,160,230,94,15,214,74,24,100,39,5,245,77,197,35,81,56,131,83,241,3,37,76,35,203,7,152,248,181,72,244,46,85,82,62,152,119,88,100,9,31,57,201,81,234,82,32,237,45,111,5,224,42,171,70,11,223,166,78,216,211,204,57,79,137,200,80,16,168,139,99,218,112,73,167,0,65,140,98,208,173,17,58,139,101,25,112,139,106,185,98,43,39,199,231,93,180,247,38,189,
+62,119,62,248,79,142,10,201,114,204,181,228,77,89,80,14,48,182,149,40,140,167,100,35,136,202,1,198,64,118,47,46,132,44,219,69,245,24,157,251,39,25,170,193,238,37,10,19,109,72,172,29,56,185,40,181,112,103,166,194,136,228,143,251,109,119,135,162,2,214,20,236,218,10,44,150,70,255,139,176,226,174,163,58,66,232,154,174,39,133,159,69,111,199,115,76,233,91,15,195,208,191,101,172,43,26,108,227,180,186,218,222,196,87,72,163,169,32,55,177,18,58,224,132,200,24,188,167,189,179,72,95,112,169,244,200,233,18,46,237,24,241,15,130,27,79,99,104,181,170,120,231,79,70,19,103,160,61,232,205,188,234,201,135,185,226,203,245,184,30,95,129,78,228,186,243,63,61,29,3,215,19,133,234,103,46,251,50,14,81,30,52,8,241,83,123,206,147,171,203,132,177,1,162,231,173,8,86,245,96,61,199,1,73,34,194,131,105,224,41,241,230,10,13,131,34,16,34,89,135,26,182,122,79,137,156,56,26,180,250,72,139,63,90,157,132,123,229,114,185,106,176,185,199,190,195,
+145,176,147,6,26,122,123,187,189,139,159,146,112,224,103,175,234,117,57,4,22,48,203,76,151,64,178,23,212,241,136,174,23,56,233,158,195,207,94,4,20,40,33,34,36,6,168,226,39,210,189,53,11,202,115,87,201,21,140,42,252,58,184,98,189,72,72,125,129,90,49,208,168,11,143,229,154,124,21,74,163,133,35,30,108,142,192,5,108,166,209,227,229,157,219,44,114,248,53,121,105,217,227,68,110,12,66,35,184,1,221,158,61,201,45,146,252,166,12,250,120,119,10,162,80,95,153,11,162,80,114,56,220,87,119,125,73,35,168,82,55,140,130,219,66,210,215,167,199,250,233,78,236,3,78,255,254,145,177,76,160,133,157,102,153,111,227,44,96,30,17,48,113,209,142,104,119,240,204,57,4,5,24,19,213,67,80,120,244,234,30,21,87,61,164,106,22,216,62,204,92,58,32,98,104,158,59,209,222,77,14,41,41,26,84,120,249,121,183,44,242,154,182,1,91,45,75,214,138,201,253,52,180,194,9,56,9,123,26,14,143,85,228,245,205,66,10,67,168,186,100,176,25,209,115,128,
+251,8,54,177,154,175,128,113,118,105,4,209,224,8,242,70,220,16,224,126,153,187,154,44,211,118,66,169,97,29,104,196,42,216,114,28,174,89,35,134,140,214,109,185,129,128,137,14,0,183,80,127,7,184,61,47,8,112,203,51,39,132,78,163,165,213,15,183,176,177,154,188,169,5,30,181,90,251,248,198,22,35,17,216,44,199,153,59,152,48,245,158,140,111,240,89,213,99,180,21,228,121,148,16,173,197,138,55,207,215,250,70,56,236,164,167,80,86,40,161,69,204,230,73,97,252,235,84,148,25,143,124,114,194,213,133,101,80,177,169,120,17,21,139,142,15,109,66,32,204,3,229,150,84,139,156,106,21,67,148,18,111,104,66,184,170,234,51,250,53,55,189,215,150,108,196,53,60,44,226,234,100,222,227,174,139,169,97,2,136,129,15,16,24,7,98,96,195,96,194,61,159,11,10,142,181,203,44,182,137,128,245,237,218,199,113,111,102,99,140,183,230,128,107,59,126,74,77,24,131,33,107,209,30,227,2,222,12,215,118,227,152,161,128,81,237,90,176,177,87,87,143,114,80,12,95,
+173,80,150,34,14,158,218,157,134,170,124,111,147,79,128,175,88,62,21,128,118,139,129,160,76,39,6,148,139,206,178,151,203,169,78,162,125,11,186,225,14,38,175,8,98,187,224,161,188,89,4,236,78,213,6,223,224,215,246,34,30,220,174,93,94,63,156,118,235,201,169,36,4,35,178,163,70,234,102,49,89,112,105,212,66,173,8,161,52,89,212,106,53,92,83,2,235,115,20,231,185,120,128,172,57,16,179,30,32,107,162,21,64,167,196,86,65,85,235,244,191,36,98,120,56,130,30,74,24,21,107,188,120,205,234,24,109,226,151,168,186,167,217,178,26,164,209,186,107,160,175,185,139,85,169,81,238,104,178,76,53,216,3,133,27,87,194,96,28,195,139,7,183,206,0,28,7,86,56,175,107,255,232,158,24,230,101,129,17,152,251,152,241,45,178,204,127,64,108,163,126,147,107,68,194,5,251,39,54,149,184,197,134,107,118,219,182,194,114,19,113,101,90,116,96,192,11,254,38,206,2,135,56,227,143,206,154,23,53,138,58,64,168,206,136,251,14,254,129,34,60,133,192,182,96,199,
+50,78,58,2,201,128,232,180,170,161,81,154,145,103,97,150,249,204,40,142,137,20,114,183,8,89,51,5,94,102,64,106,199,210,245,24,85,170,222,98,55,173,195,181,2,7,110,163,13,39,88,198,247,68,156,37,119,137,251,10,41,139,225,147,112,167,253,238,221,141,163,51,109,92,141,115,89,124,250,218,178,43,72,92,86,24,241,185,104,180,137,210,37,23,7,140,165,210,33,152,102,219,124,170,210,132,17,221,190,69,232,69,226,154,199,30,110,246,210,160,7,185,90,44,90,190,245,105,23,138,97,164,169,153,40,15,188,225,9,191,142,26,173,105,168,63,253,148,44,191,170,67,157,180,145,0,34,88,123,145,18,152,229,43,126,178,232,242,134,132,219,221,111,95,42,173,171,46,227,190,172,184,126,246,190,236,198,55,117,46,69,185,184,75,51,139,204,91,139,51,26,113,103,84,96,227,161,174,150,35,198,72,172,166,230,81,133,12,180,96,160,47,110,75,22,46,183,66,148,139,16,3,39,74,104,79,163,102,141,105,160,6,230,28,251,163,246,204,137,188,28,208,184,225,87,197,
+162,134,26,10,189,105,48,240,92,74,12,162,87,95,103,152,61,130,77,123,150,18,59,31,211,107,49,136,224,46,97,133,32,121,117,26,234,100,203,153,176,9,217,103,193,214,57,15,89,119,133,194,193,183,23,96,162,172,113,155,48,205,237,237,237,107,13,85,170,215,36,203,0,154,116,69,99,11,66,107,91,59,190,41,225,87,170,93,177,204,87,68,213,92,140,199,5,162,236,152,49,8,166,82,249,128,171,12,123,31,89,196,234,10,89,151,116,204,192,40,196,58,237,131,201,180,178,149,97,249,131,83,109,191,44,10,60,87,95,2,25,29,183,90,164,196,141,230,232,179,204,207,162,76,155,47,35,44,233,166,221,177,229,163,35,172,63,97,36,56,174,47,107,220,33,101,141,107,38,1,131,125,83,117,207,131,88,109,159,54,108,146,5,197,100,244,161,90,230,139,187,9,191,153,132,219,226,240,126,173,139,6,23,186,31,39,14,41,167,178,12,194,170,62,251,232,105,158,223,22,148,42,6,57,57,191,144,193,136,251,232,136,133,96,55,239,139,49,227,16,151,173,100,16,213,243,
+77,212,248,152,92,59,253,83,27,197,109,215,234,97,0,180,22,179,56,135,251,237,36,108,150,92,56,253,73,109,121,168,27,37,98,49,146,134,18,142,221,91,177,137,242,112,232,15,222,18,194,111,185,68,139,115,37,14,230,149,234,187,160,19,3,244,113,193,209,69,59,221,235,22,5,167,106,49,46,82,214,94,178,59,76,161,193,109,223,160,188,125,154,134,28,110,237,170,244,251,122,12,204,40,117,115,9,158,185,185,162,210,204,122,176,125,12,155,161,131,17,245,238,230,197,79,247,108,65,188,225,75,196,216,182,100,153,82,96,194,227,250,82,217,157,34,104,99,112,106,87,213,73,111,48,49,124,255,81,37,30,92,206,103,108,223,109,21,38,27,187,46,103,140,106,172,147,107,15,51,101,162,62,130,93,84,91,143,195,156,204,87,225,129,40,111,198,151,109,89,225,73,141,110,72,104,216,88,162,199,241,52,51,78,106,152,194,205,147,252,81,5,248,220,84,56,195,147,240,6,23,213,29,254,134,108,198,76,196,64,183,74,146,105,50,248,50,62,205,184,7,59,136,53,136,180,
+97,196,149,43,214,105,104,21,225,133,180,122,98,16,52,105,149,184,172,124,61,8,79,148,64,115,23,217,196,237,160,79,115,144,123,219,190,0,167,191,161,100,64,176,182,118,103,23,144,80,80,165,36,74,157,77,162,101,73,150,216,237,133,148,83,149,107,141,231,251,246,157,204,65,54,146,195,190,114,2,81,25,161,133,181,85,218,16,121,100,53,79,196,85,25,126,216,82,48,40,236,48,207,183,141,203,186,86,160,26,213,61,144,195,49,69,10,44,146,105,67,96,88,189,36,48,106,7,188,218,127,161,15,116,137,122,159,32,64,133,138,226,11,54,29,208,170,48,54,15,229,149,141,132,81,195,193,137,6,193,20,147,49,116,194,42,131,171,9,134,247,43,143,123,125,78,79,229,151,183,121,114,94,214,181,37,232,226,96,248,42,90,171,206,49,174,156,240,166,151,180,204,228,1,91,18,241,216,87,1,135,114,107,100,128,229,182,89,148,43,242,253,162,39,72,64,123,136,72,79,198,137,35,76,155,206,198,21,143,61,146,23,176,160,163,243,7,19,8,113,152,3,3,80,149,14,
+249,72,222,142,255,10,107,235,139,65,23,39,50,200,69,222,109,52,102,84,130,151,41,6,206,211,5,218,187,71,105,49,152,138,149,62,99,159,23,238,206,84,96,17,6,107,48,155,76,6,224,196,9,119,3,134,171,15,198,15,230,151,55,167,56,193,192,221,75,130,193,252,168,77,117,97,239,133,180,129,32,174,10,146,185,147,175,98,185,252,182,91,40,148,163,3,209,55,228,202,29,48,29,3,52,240,250,30,160,212,192,49,64,71,229,251,157,201,183,200,146,110,135,220,37,17,108,24,73,135,38,71,56,224,110,149,135,192,140,175,137,175,215,141,24,8,224,79,15,77,3,216,33,17,131,38,3,204,137,142,241,232,239,141,4,0,246,168,177,18,76,124,61,127,71,162,180,34,26,158,251,216,199,130,31,141,192,254,245,52,4,98,46,231,177,91,10,243,37,199,110,73,28,47,49,222,175,23,29,187,165,113,157,113,236,150,224,87,45,33,129,119,38,211,92,220,37,81,71,164,215,231,137,156,244,241,101,187,114,24,194,4,201,11,36,114,239,65,117,47,81,124,239,253,17,64,
+167,39,41,35,254,85,6,176,111,87,206,230,195,41,163,130,58,194,214,104,170,237,68,110,115,197,24,61,21,163,219,169,18,53,45,159,15,175,140,12,157,213,110,143,217,239,22,51,120,125,15,211,131,224,116,115,68,147,78,100,1,180,37,104,74,125,166,79,137,72,72,183,156,214,96,130,238,17,171,14,219,197,46,200,184,112,158,44,32,16,182,127,136,125,181,150,231,48,30,27,81,213,139,129,69,205,235,28,138,217,2,237,20,3,115,53,15,210,192,125,194,140,230,56,134,84,49,18,35,242,107,229,69,69,189,49,58,145,237,140,241,114,75,51,112,64,209,68,16,59,119,236,49,142,167,94,155,203,5,245,64,67,250,138,217,248,140,11,242,163,198,33,177,135,17,202,15,176,184,216,155,50,202,147,70,225,140,132,3,251,236,5,98,161,200,38,77,21,49,130,54,133,182,228,150,10,134,70,215,233,7,206,99,102,158,13,47,11,193,36,122,172,31,84,52,105,207,132,252,177,255,88,60,41,136,145,1,184,67,160,109,120,124,33,87,221,15,190,205,239,179,255,164,178,107,199,
+95,43,180,218,5,45,252,154,247,64,3,130,130,235,168,87,139,15,4,107,138,140,153,84,78,97,49,26,106,152,198,103,215,35,126,191,40,131,82,48,120,197,75,193,117,240,221,126,76,249,192,3,27,83,243,11,165,82,148,36,229,96,65,94,117,33,226,123,185,144,129,231,177,7,94,210,58,118,39,82,131,3,131,164,17,80,193,88,122,27,224,28,82,238,206,221,140,164,104,102,248,251,156,224,41,255,60,242,130,8,39,112,149,241,213,202,116,24,180,118,121,20,35,242,118,15,211,112,147,101,13,177,110,136,199,197,128,131,227,59,120,157,48,97,8,202,94,180,178,196,146,103,142,240,7,155,115,231,73,8,180,207,19,216,131,8,14,77,72,136,51,240,30,222,4,223,83,60,29,208,67,91,1,181,152,28,120,248,213,201,193,6,16,59,199,254,24,95,84,103,204,89,215,196,110,110,58,57,184,200,15,120,142,59,98,34,147,185,45,97,17,187,129,254,209,193,61,66,243,186,55,68,121,175,217,199,243,34,155,96,247,104,1,79,112,199,59,40,26,2,195,86,217,195,67,163,
+16,237,184,196,64,36,157,179,102,14,243,247,173,24,10,171,210,15,192,31,87,65,59,135,56,20,156,116,248,242,181,188,128,59,14,93,68,154,59,56,177,86,85,96,134,224,134,184,163,27,213,92,86,215,228,43,16,200,211,252,233,198,184,35,36,140,100,246,173,220,61,153,44,213,12,78,186,74,136,74,28,254,43,141,20,220,149,71,186,195,233,243,7,72,46,151,12,22,207,231,215,131,241,109,243,56,177,114,193,92,134,190,211,87,62,47,141,5,131,139,168,24,64,55,106,40,1,183,196,124,198,234,59,40,85,133,245,10,202,65,58,69,231,132,136,211,192,188,219,65,185,44,98,96,52,123,81,85,95,184,68,211,250,122,68,225,202,192,150,117,144,122,42,189,116,137,179,7,31,205,100,7,53,235,182,169,6,29,188,103,228,213,179,184,170,203,46,172,154,47,202,147,186,33,90,60,30,155,219,74,192,217,127,177,231,136,42,118,18,134,226,237,242,154,169,115,222,216,113,219,188,120,194,199,121,74,24,199,225,151,123,78,89,123,133,130,51,122,55,160,244,70,59,27,48,185,
+238,101,143,32,212,102,129,88,251,0,181,21,36,92,234,85,4,44,164,145,183,248,41,125,210,126,229,17,137,30,110,253,41,20,51,122,102,56,51,178,136,73,8,219,41,115,79,233,26,18,134,88,68,136,161,205,109,39,72,69,214,125,89,84,215,208,210,61,217,197,153,57,65,128,186,233,211,137,18,43,65,34,110,202,81,222,54,74,46,57,162,107,247,198,87,151,0,85,92,211,138,43,1,54,114,141,173,223,40,52,205,23,190,5,63,175,21,8,90,143,61,19,157,117,61,29,243,170,172,201,169,150,9,145,243,166,51,202,128,214,177,122,232,219,80,181,186,31,93,133,148,52,184,32,236,14,105,27,177,50,141,253,136,158,201,0,254,84,160,72,60,47,228,193,23,76,16,225,197,251,109,119,110,124,199,41,3,8,242,166,135,207,88,145,40,176,170,46,163,64,123,71,139,254,178,8,207,251,162,35,20,28,61,213,62,195,136,197,108,181,10,197,182,39,152,203,196,100,29,15,174,82,113,161,62,181,131,187,58,176,21,188,124,112,104,146,42,205,59,196,17,5,86,174,234,192,
+116,25,227,154,46,119,238,16,95,48,0,98,85,94,218,233,207,55,140,181,151,16,90,139,241,171,66,145,23,136,155,13,235,28,166,192,89,146,23,151,34,229,140,128,107,124,239,212,81,112,193,177,212,174,218,160,36,64,65,13,184,84,138,162,106,224,184,236,57,16,44,241,254,99,31,254,18,2,163,193,217,52,211,205,246,161,178,169,74,44,244,221,141,104,209,218,123,213,188,250,109,188,172,53,143,138,55,126,20,99,161,139,244,188,167,29,180,33,60,185,204,192,106,158,197,40,157,239,53,55,207,67,97,194,85,76,58,192,24,162,31,130,136,221,12,101,202,90,166,93,119,194,176,43,138,47,16,68,224,20,239,160,162,192,245,127,240,215,16,108,103,48,22,140,233,202,211,116,91,85,193,160,55,143,196,195,215,54,18,29,16,122,1,27,90,70,27,6,243,149,75,85,62,228,224,188,172,139,89,184,1,138,7,175,149,61,29,251,122,118,248,121,207,155,64,249,58,154,49,158,72,83,10,23,216,151,115,184,36,220,85,62,68,71,86,193,176,121,69,41,45,64,32,66,125,200,
+197,68,135,246,30,107,19,141,1,73,159,248,122,226,20,29,146,128,72,50,48,224,152,235,11,88,252,233,228,244,26,33,6,35,153,58,64,43,80,141,68,244,218,104,16,144,195,56,129,211,181,148,21,103,80,152,241,80,61,8,85,83,90,53,81,28,150,188,127,72,28,46,31,0,151,40,97,68,48,128,196,32,119,96,230,179,83,57,135,236,162,228,12,238,87,185,67,157,178,82,249,66,24,143,101,230,9,35,194,161,56,45,39,149,14,105,24,9,139,115,26,177,131,68,130,167,36,57,124,11,221,145,181,181,74,77,80,146,130,122,1,63,247,11,96,90,98,147,246,220,73,135,79,98,183,178,220,113,62,105,229,143,156,81,33,83,136,115,57,5,199,58,26,4,251,164,103,106,167,38,188,62,31,210,206,40,138,67,6,43,104,99,201,178,251,134,175,63,199,16,226,60,80,66,28,100,112,201,162,132,165,203,114,238,42,236,18,227,239,142,117,192,175,12,163,133,228,65,128,216,135,11,36,200,195,91,233,133,31,9,131,78,41,255,88,126,37,223,232,204,220,151,181,165,232,241,
+37,95,50,63,28,71,69,184,56,138,207,182,21,36,192,162,145,189,99,150,144,71,117,160,109,5,166,235,228,230,118,131,204,96,143,41,149,182,139,142,202,110,60,211,121,87,59,78,88,46,142,213,190,117,158,185,65,248,153,47,119,101,210,161,168,144,226,198,228,10,4,153,229,80,250,1,236,248,81,194,248,62,47,42,123,134,179,246,186,4,188,15,118,198,110,39,242,85,227,179,242,232,118,224,60,72,145,229,85,6,100,77,61,180,34,109,101,17,96,252,56,23,212,193,136,2,176,45,170,161,96,241,107,227,251,220,115,123,152,143,122,94,197,99,43,50,79,164,7,141,14,29,225,126,116,186,235,195,99,214,97,198,199,132,17,222,97,129,147,94,198,188,249,156,200,58,104,206,241,202,155,243,35,24,192,242,65,194,210,195,197,48,151,201,68,16,165,143,85,13,96,151,199,236,89,202,184,66,142,140,121,42,216,88,173,45,116,15,9,119,230,60,193,28,134,137,145,6,227,237,188,151,7,75,114,13,15,221,62,232,42,161,225,16,70,140,25,167,39,78,218,113,218,184,228,57,
+142,211,70,206,253,201,113,218,152,147,18,225,53,17,224,37,14,17,220,241,131,94,163,139,158,139,128,220,65,81,221,18,187,98,234,212,80,77,48,87,31,82,181,10,204,213,175,207,78,100,175,218,23,196,34,238,38,124,148,175,144,194,156,167,183,163,25,42,38,119,200,122,143,197,99,21,132,188,190,153,194,16,120,219,49,57,124,119,119,119,105,23,159,210,169,226,87,169,54,222,226,14,179,151,184,118,63,61,126,152,60,249,124,155,238,137,195,174,188,62,214,77,199,107,121,138,216,167,58,204,91,105,221,115,158,223,182,161,33,13,163,57,30,33,176,87,151,119,191,61,143,4,14,243,200,87,5,112,206,4,1,223,19,153,180,56,194,138,22,37,153,204,122,220,33,223,195,170,38,182,11,64,92,196,191,122,31,100,234,68,189,227,23,115,27,193,227,171,250,194,57,132,48,142,246,116,182,164,239,131,70,131,149,206,10,151,23,216,242,123,253,53,235,143,83,197,0,3,179,229,194,170,6,18,14,172,223,139,179,103,227,58,60,17,142,110,170,40,216,253,225,77,240,61,198,217,
+202,10,76,179,115,97,230,113,187,52,62,33,158,222,203,240,116,77,127,31,20,98,215,26,44,135,240,100,212,130,234,33,218,118,5,136,228,13,245,62,191,119,43,29,89,224,234,244,244,184,97,249,194,250,86,53,128,5,141,119,156,7,95,15,134,27,94,225,80,169,101,135,97,31,29,109,121,66,31,190,128,119,8,48,3,43,244,80,207,69,157,168,177,112,95,190,126,229,114,245,34,16,11,220,13,46,8,132,44,232,2,96,173,14,85,221,238,149,59,172,157,225,30,172,23,135,113,221,138,133,154,122,29,160,75,141,120,112,24,2,167,0,19,201,197,90,198,13,212,12,205,215,186,14,220,245,204,41,189,191,9,30,190,9,198,144,113,96,130,60,124,143,124,76,139,234,243,193,162,254,8,102,164,211,142,29,132,11,146,90,176,44,203,169,18,103,33,175,249,158,146,87,121,48,62,80,14,86,172,84,54,158,221,63,45,237,216,109,250,141,137,130,51,217,42,202,205,97,154,134,195,123,142,211,180,20,134,72,168,186,80,94,47,240,10,38,83,72,111,67,224,195,151,50,119,176,
+124,134,186,178,165,117,47,29,228,179,197,97,71,245,218,136,153,95,114,4,118,35,51,199,178,143,78,9,183,226,214,171,175,188,64,196,97,208,71,131,120,208,9,89,186,42,74,206,136,160,211,94,27,101,140,244,225,177,224,155,34,193,146,250,212,30,145,194,214,198,68,47,30,238,107,184,253,30,53,137,249,220,192,21,186,234,85,23,233,248,206,91,117,205,183,203,118,242,33,45,29,120,85,240,151,249,130,222,99,84,248,110,189,219,36,189,127,78,222,219,94,47,214,146,130,81,106,104,98,252,201,130,47,57,121,62,84,201,7,10,238,116,75,219,242,43,118,77,139,140,27,194,59,38,221,22,59,4,111,91,56,55,242,60,161,89,136,62,26,152,104,11,99,134,95,53,202,239,5,58,125,243,94,160,25,30,176,64,243,225,99,78,149,55,216,164,91,110,142,123,67,73,26,61,170,238,204,246,172,26,92,234,89,214,184,205,101,27,168,221,93,40,183,49,163,132,161,8,138,150,23,219,6,28,32,12,186,146,193,170,138,37,77,183,97,11,194,58,240,24,155,103,201,192,30,155,
+207,18,216,230,131,161,252,150,125,94,22,209,69,149,176,5,211,180,226,182,219,39,55,198,122,157,48,198,95,64,164,66,122,34,25,253,232,192,138,160,202,18,117,18,32,161,187,33,245,66,120,148,183,182,238,92,216,110,53,131,89,230,174,11,250,77,124,4,182,189,24,56,218,16,95,103,197,1,25,176,2,92,102,191,121,138,216,253,80,127,71,233,165,113,71,108,18,247,193,206,222,65,91,45,114,182,130,19,177,12,173,150,183,70,63,81,78,133,134,109,21,94,30,148,72,222,9,189,80,205,146,120,203,95,225,73,247,107,206,44,144,216,106,176,134,94,241,185,76,141,104,103,12,187,0,172,185,61,36,187,89,202,213,105,23,28,68,126,237,155,199,78,78,157,247,211,163,187,93,246,211,20,56,12,52,45,85,124,172,182,64,232,241,156,132,195,63,25,211,246,73,123,240,200,64,164,87,196,7,168,179,215,57,3,179,27,158,134,110,140,161,121,3,15,116,249,104,26,5,231,123,156,25,219,221,136,126,24,32,9,110,7,119,21,25,16,192,3,26,174,153,209,175,205,47,221,
+147,24,216,218,193,24,135,197,193,181,157,2,24,20,236,216,24,56,176,60,33,2,40,248,5,137,4,86,254,75,148,77,120,211,47,245,154,117,87,226,85,207,157,137,97,33,40,202,235,84,237,46,35,214,90,181,150,69,178,31,176,253,132,177,191,89,10,61,200,30,163,89,188,141,84,99,151,122,253,180,219,92,238,240,180,8,213,89,25,230,176,177,70,100,219,22,134,204,232,161,181,90,119,142,186,77,65,135,189,95,217,212,96,143,103,111,147,157,39,176,117,217,141,218,107,249,39,85,57,95,148,111,231,236,91,191,95,139,30,230,110,193,254,204,157,91,183,38,178,39,111,186,106,204,247,216,130,61,95,44,95,143,77,82,41,111,249,204,161,128,50,15,81,5,82,248,121,191,157,118,162,229,215,151,219,197,243,85,158,93,81,135,189,234,202,227,139,17,54,153,217,95,13,72,190,122,184,56,141,182,32,58,85,51,116,250,154,244,111,89,197,148,52,134,26,69,46,139,37,142,183,24,126,45,84,235,34,222,140,247,255,209,246,158,191,237,101,105,154,216,191,210,152,15,198,12,
+118,7,59,99,99,109,24,254,180,238,5,236,1,102,225,133,119,141,133,97,12,208,213,221,213,51,5,119,119,13,170,170,103,119,191,81,129,65,140,34,197,36,49,39,145,98,20,197,156,37,70,49,231,156,196,156,115,22,147,47,73,253,126,85,213,221,51,11,216,235,79,162,206,61,247,196,247,60,231,121,223,123,238,125,128,17,208,119,241,129,106,198,231,149,135,48,243,226,219,134,232,192,67,249,18,118,103,42,94,37,218,8,215,83,208,78,144,141,117,140,180,134,115,241,20,89,90,200,164,206,52,29,190,79,227,136,21,196,216,43,223,93,9,168,204,3,11,192,155,180,102,12,255,217,122,37,99,223,181,120,210,236,77,70,123,49,127,193,7,76,42,162,27,61,90,160,114,195,176,194,172,225,155,46,92,123,185,15,143,148,34,158,114,218,64,166,219,70,223,233,23,136,10,46,10,229,237,30,235,215,19,111,9,196,238,21,15,241,155,117,5,107,172,149,55,160,245,195,80,39,125,156,17,185,179,120,134,225,228,132,107,197,62,168,251,224,160,219,220,70,101,18,109,189,34,69,
+76,24,56,63,174,35,101,54,253,101,4,221,51,191,0,46,104,194,5,180,136,6,6,246,219,167,109,121,179,121,190,175,165,72,233,65,212,42,199,76,141,110,117,10,102,18,81,197,107,148,202,91,226,74,185,51,89,188,15,190,89,247,210,240,6,107,248,104,142,104,107,76,128,124,101,2,24,183,155,152,175,123,238,110,56,173,146,114,54,223,238,47,43,19,177,105,166,39,238,154,242,1,175,125,159,229,41,136,232,138,163,42,122,160,82,183,132,245,5,135,172,0,136,59,23,101,35,248,248,192,176,158,35,174,248,181,119,166,215,3,30,112,156,62,152,216,181,123,121,188,45,182,54,20,164,149,82,79,105,221,29,185,40,87,160,90,160,190,106,81,206,128,222,40,147,90,73,17,220,69,204,138,171,1,110,190,138,73,124,74,201,132,223,147,74,179,196,101,58,80,189,64,89,168,89,128,191,191,231,217,245,232,13,96,63,140,22,210,227,215,184,24,173,92,119,27,237,247,121,179,105,90,110,185,111,133,111,252,207,86,11,119,248,12,80,155,215,203,123,161,197,245,198,41,241,134,
+237,49,133,98,128,160,154,55,120,180,64,187,134,0,184,89,47,26,3,110,231,65,131,185,104,133,76,221,192,112,57,207,172,216,245,65,88,243,252,134,119,92,57,35,16,132,69,15,9,11,151,151,32,1,2,184,17,36,160,54,245,192,70,245,44,16,80,67,33,109,8,52,5,54,54,224,135,129,201,28,50,91,92,226,48,112,125,153,151,178,215,76,30,222,26,212,112,238,193,26,236,193,229,14,45,181,196,64,117,155,39,102,175,156,233,110,246,141,218,62,133,59,81,188,99,184,211,153,237,87,111,155,218,158,243,197,241,208,129,114,115,112,215,227,72,51,76,159,87,196,216,17,111,106,41,140,88,224,213,156,142,155,235,182,197,198,96,166,103,14,88,64,239,74,5,237,136,177,145,4,61,183,116,25,106,146,190,86,38,35,184,155,4,177,172,45,229,73,232,81,5,66,118,57,53,151,58,62,104,209,5,223,180,50,154,71,49,171,122,169,218,118,3,53,177,148,255,232,91,219,0,71,249,57,12,224,170,251,221,194,48,89,1,140,161,16,139,156,7,111,130,231,239,164,223,70,
+46,185,17,172,189,81,25,135,240,86,239,149,97,46,208,5,216,173,189,6,34,22,188,78,57,54,206,47,206,116,60,34,202,27,128,201,189,155,11,218,94,39,193,174,80,20,84,8,245,10,140,81,59,164,197,10,58,10,137,203,156,218,114,206,70,89,60,131,170,148,57,151,217,71,177,171,134,70,98,230,253,88,86,203,34,110,239,91,73,121,80,174,28,56,171,188,209,110,243,40,77,152,17,250,32,2,167,164,146,138,129,13,14,129,234,92,54,113,240,234,97,81,1,107,138,127,88,84,192,154,154,101,43,233,71,82,227,197,205,109,92,175,101,220,25,114,100,112,201,16,83,113,18,92,49,83,184,210,151,78,13,211,89,201,159,130,215,169,123,189,212,51,214,69,90,114,183,38,87,99,12,130,202,106,172,244,96,169,223,130,0,254,198,124,125,92,32,249,79,225,157,22,55,184,37,51,222,10,30,89,191,118,253,48,68,70,59,72,175,59,143,115,65,47,251,112,190,215,35,162,106,214,227,158,69,72,99,129,10,30,147,144,186,157,93,16,41,215,197,215,42,145,64,66,221,15,
+153,230,144,71,203,20,112,135,98,146,163,119,83,185,120,146,184,52,102,95,129,128,174,212,91,90,227,212,96,108,129,146,52,174,213,13,191,92,152,138,189,132,41,195,27,118,35,36,156,190,189,176,50,220,166,185,88,1,48,201,16,3,176,14,124,60,161,101,77,42,79,96,82,80,151,99,168,197,24,126,240,65,209,217,83,58,84,173,38,138,213,237,217,17,19,223,70,5,182,191,93,38,14,16,102,57,123,188,1,156,31,179,199,244,130,194,222,26,116,46,208,20,126,117,92,110,252,75,165,41,116,27,101,93,189,86,234,118,98,101,159,18,33,101,74,51,202,137,106,121,51,218,62,229,205,60,136,196,192,32,44,201,10,7,240,185,60,185,149,93,102,239,239,165,234,86,144,253,122,71,46,122,219,196,64,61,179,186,153,199,72,227,30,66,204,127,122,113,34,129,185,72,220,186,206,249,85,200,113,193,113,145,126,87,74,155,183,80,91,196,181,146,178,110,249,76,219,185,204,157,137,93,86,21,207,24,160,39,43,192,155,61,187,162,75,233,88,35,212,234,246,211,90,253,237,44,
+5,25,94,209,164,136,6,246,237,18,238,118,221,104,129,165,199,95,0,107,207,237,204,150,102,164,11,7,192,68,173,160,148,182,140,1,248,155,181,11,56,136,175,90,200,219,129,253,189,148,64,167,115,0,12,128,7,63,31,9,235,117,16,152,189,83,156,146,47,160,94,159,206,115,0,43,154,249,122,34,152,32,96,255,59,240,72,198,242,242,112,220,224,21,1,112,164,3,147,244,153,15,167,13,144,185,217,225,180,129,215,85,231,193,58,14,50,220,85,249,224,165,183,68,141,149,102,232,223,210,155,119,74,186,18,27,117,220,170,198,100,112,69,132,39,31,200,236,229,82,42,204,158,2,121,132,139,99,32,207,13,148,123,140,88,230,204,44,186,151,40,51,60,150,150,205,97,79,237,174,29,175,150,150,231,240,19,97,238,34,14,167,249,58,151,175,121,213,211,129,80,30,207,165,48,66,240,97,35,167,5,120,220,184,117,30,241,179,134,27,72,248,148,158,207,63,189,123,201,176,219,7,148,86,28,231,135,180,187,200,41,158,38,184,59,209,116,94,0,160,233,0,220,76,152,115,
+8,63,162,165,63,187,79,225,54,48,243,20,110,211,40,78,225,182,227,249,3,126,76,35,230,157,194,109,65,218,41,220,6,170,159,194,109,253,200,41,220,182,225,156,194,109,161,228,41,220,102,8,66,130,54,214,208,120,254,209,30,70,251,240,112,13,109,128,212,130,202,123,32,217,170,61,36,55,219,235,219,7,1,21,195,28,130,238,128,106,244,239,253,209,57,220,197,57,12,37,111,120,117,140,180,93,28,130,94,192,216,169,65,224,143,72,155,253,24,105,27,167,114,199,72,27,106,251,112,140,180,105,1,172,61,68,218,66,167,215,28,74,155,37,244,24,105,3,3,92,241,16,105,123,4,88,205,33,210,22,16,215,143,145,182,202,194,142,104,160,193,209,247,225,145,182,3,121,143,180,125,13,59,209,246,250,248,68,219,95,8,39,218,78,144,6,22,69,192,141,85,30,232,55,5,224,56,97,152,39,173,5,111,38,144,123,112,20,128,238,238,139,254,72,223,75,181,19,125,215,115,78,244,189,203,61,209,247,75,234,137,190,55,119,44,176,173,128,104,66,243,79,67,187,229,251,
+248,108,117,176,4,156,38,172,203,202,187,50,238,40,251,170,174,122,46,10,167,180,78,211,34,252,132,32,106,23,237,14,162,28,56,75,61,9,19,192,109,29,117,160,201,10,20,167,219,42,252,142,121,27,209,154,173,165,55,108,116,38,163,34,76,66,45,213,46,78,255,19,241,53,238,41,190,246,168,235,200,169,149,62,233,253,230,205,49,210,160,145,94,196,29,93,105,24,193,217,20,253,233,220,38,251,116,110,211,113,91,90,250,229,192,208,231,234,140,43,114,144,10,102,87,210,97,137,66,47,174,240,9,243,198,40,135,12,115,37,47,118,195,31,198,207,104,0,61,95,238,215,119,126,190,203,105,8,218,125,79,13,115,69,235,188,114,155,12,229,251,124,202,52,4,69,248,236,114,194,128,16,52,236,222,195,35,234,26,207,1,212,148,176,210,71,123,70,241,245,101,185,174,176,214,21,36,236,22,39,22,14,197,235,82,107,0,142,70,250,79,132,189,175,140,165,8,0,71,226,81,141,66,56,124,175,8,188,71,117,188,211,124,5,190,81,10,184,140,46,86,209,138,202,169,49,
+40,5,4,155,27,16,13,10,35,127,240,52,120,120,18,218,53,124,28,34,196,98,234,26,41,245,182,96,179,164,118,180,194,202,247,55,128,107,33,46,234,243,94,41,3,90,209,220,238,204,163,224,206,114,251,48,119,229,123,146,75,114,112,13,192,110,102,52,230,233,192,163,214,232,234,61,78,144,228,22,231,149,115,44,33,28,62,18,113,73,241,68,196,189,135,224,87,63,94,140,103,158,47,153,137,144,249,140,4,63,50,96,193,193,203,219,104,180,215,192,62,223,5,108,228,149,45,60,60,231,229,110,142,214,117,239,133,47,16,28,118,196,200,180,117,3,1,109,86,139,153,94,242,115,128,63,118,118,37,63,60,189,53,176,97,7,242,13,48,8,162,152,26,23,145,88,108,16,192,205,1,104,114,159,201,34,192,10,82,98,63,225,20,120,121,9,190,192,193,161,100,192,233,62,183,158,93,189,128,79,192,231,2,157,128,15,203,60,1,31,11,116,2,62,59,232,4,124,215,161,19,240,61,163,79,192,7,186,58,21,8,7,157,10,124,132,158,10,60,191,58,21,136,41,157,10,
+228,48,78,5,90,65,167,2,5,199,184,188,94,194,162,222,0,171,147,249,255,185,124,12,128,25,49,42,234,193,78,101,28,207,231,153,249,213,104,26,114,150,21,38,165,41,253,38,141,242,184,225,71,224,101,86,78,192,43,185,61,1,111,136,126,2,94,133,227,4,188,167,231,33,151,203,152,244,4,188,194,217,9,120,137,238,19,240,106,65,39,224,45,25,78,192,235,113,159,128,23,124,130,101,115,138,117,2,94,236,229,9,120,63,246,145,208,27,252,4,188,209,241,9,120,63,225,159,225,3,120,41,15,39,224,229,238,78,192,251,255,54,62,114,191,101,179,134,129,188,251,170,180,188,56,92,106,155,89,132,128,57,255,160,49,182,200,86,32,255,167,231,25,72,76,99,155,200,207,81,94,6,212,86,2,134,54,116,74,142,58,143,143,57,80,12,110,203,119,72,190,0,102,195,28,142,47,34,215,0,46,29,158,160,233,64,193,233,44,95,198,191,160,93,199,153,130,220,56,15,39,163,224,103,46,215,241,96,20,110,93,122,179,161,240,232,107,0,95,25,119,49,45,72,135,134,
+179,216,108,246,89,194,126,64,90,44,116,123,115,4,101,219,158,123,136,144,132,99,22,93,148,44,239,183,93,139,144,71,3,193,202,163,172,113,127,4,202,200,161,228,197,250,2,52,69,97,193,23,33,198,57,19,102,186,65,240,199,21,83,138,113,229,37,229,159,139,12,194,58,189,242,223,165,81,172,60,188,161,1,77,233,246,145,236,126,248,40,5,19,46,182,82,33,181,176,209,119,46,150,93,201,6,66,102,191,203,192,23,206,135,8,181,59,169,149,166,35,190,159,130,185,228,23,236,242,18,51,33,0,46,84,31,142,23,196,227,19,12,191,96,79,48,28,22,106,97,179,39,18,152,147,35,166,86,61,171,84,82,183,149,30,57,37,176,199,113,140,162,160,164,163,83,60,173,34,64,136,169,243,189,93,218,2,220,63,172,129,54,114,186,250,100,122,243,129,42,124,230,144,68,9,132,36,86,114,69,146,47,59,68,86,47,60,34,49,36,208,60,34,49,24,126,215,42,104,95,144,94,93,225,105,177,183,91,106,188,97,168,25,41,165,112,11,80,89,162,27,94,63,207,0,48,
+202,61,140,113,78,97,176,91,19,82,193,107,200,227,132,61,111,193,53,224,155,193,237,214,147,223,236,39,55,187,1,111,196,135,94,62,50,156,214,160,124,131,66,66,231,211,138,69,246,71,227,42,186,248,237,162,229,217,23,244,41,237,123,73,92,120,98,222,199,87,156,120,52,187,117,16,208,222,29,6,54,151,206,5,195,174,173,107,229,200,209,135,71,32,125,134,166,150,80,59,117,9,182,173,140,208,24,51,133,70,38,170,79,135,211,184,217,54,33,163,26,212,87,24,120,60,101,151,34,200,89,192,157,227,26,72,125,246,253,93,197,87,225,66,12,204,81,154,99,22,231,102,236,196,11,27,238,10,104,157,187,228,66,76,53,113,37,65,37,95,71,98,7,238,123,207,152,174,184,116,122,252,241,110,194,39,130,1,91,233,165,139,147,107,116,8,215,120,27,123,91,89,222,94,243,225,91,195,160,39,137,151,58,220,190,238,129,18,69,88,172,97,141,100,108,33,225,136,82,0,205,213,40,228,17,205,61,42,62,47,238,5,54,138,235,182,213,30,243,138,169,92,159,131,183,133,
+17,50,162,145,213,157,175,180,157,211,43,193,48,167,134,82,218,133,227,169,34,97,103,24,23,218,167,26,161,85,87,34,7,252,254,105,225,65,248,132,224,155,93,67,29,174,79,123,103,237,86,59,109,71,211,127,162,84,192,147,225,152,128,94,223,45,216,134,213,17,226,247,143,15,208,105,79,162,187,156,61,118,26,37,110,217,175,204,161,245,87,24,220,180,56,137,104,30,91,243,124,91,232,19,33,48,22,241,102,0,6,139,246,131,251,145,179,103,232,214,111,151,190,138,203,218,226,85,114,186,107,121,220,172,50,159,161,136,195,91,103,45,103,206,77,98,160,116,173,189,126,184,62,240,131,166,243,96,136,134,221,117,127,4,135,202,203,15,77,170,210,83,122,99,136,46,225,252,155,195,1,23,30,23,176,15,154,121,5,191,145,91,29,249,183,5,108,78,5,70,203,14,171,98,17,177,195,121,114,183,153,134,149,91,36,66,226,16,221,19,3,11,145,235,225,62,12,19,178,28,6,2,75,49,230,89,237,19,63,215,60,196,99,94,131,37,52,41,72,75,76,32,16,192,203,212,
+37,25,185,171,237,131,214,144,156,153,81,48,130,222,184,126,74,30,8,22,119,72,189,67,129,47,128,253,135,52,215,213,72,232,93,46,106,26,243,167,200,215,18,232,240,120,110,246,64,37,116,39,192,112,243,188,26,226,171,2,156,129,33,214,137,192,104,192,120,238,85,111,158,194,14,56,63,236,11,105,5,148,140,214,180,45,152,60,233,109,53,128,98,84,68,218,197,114,32,108,129,57,227,250,123,56,178,20,246,166,142,56,17,217,119,19,172,15,33,248,13,63,172,37,162,169,93,214,45,57,221,221,144,107,228,225,102,83,195,140,183,121,145,183,148,218,111,230,195,116,68,243,140,110,205,212,230,55,173,28,43,17,58,75,182,199,177,87,68,229,180,56,26,133,59,138,78,210,111,173,114,226,21,56,18,189,194,7,56,15,220,243,33,50,233,144,146,247,110,36,70,45,133,121,163,143,5,173,123,223,143,165,229,184,157,239,46,23,221,174,153,148,236,75,160,101,66,213,240,104,186,230,226,34,119,49,46,227,30,146,18,44,49,133,224,239,158,18,163,13,149,94,41,113,233,201,
+54,7,205,106,69,99,119,211,181,29,195,27,222,209,80,235,146,175,183,89,70,147,124,114,67,238,211,128,49,163,91,196,186,170,73,130,57,131,228,251,114,205,136,32,189,73,210,77,81,220,173,114,205,243,202,120,39,214,88,181,85,110,124,232,144,114,37,69,51,117,233,211,92,122,53,70,107,200,189,123,17,178,158,207,233,75,125,202,230,52,139,123,56,205,200,251,238,76,145,249,239,98,112,180,41,104,83,99,146,54,25,237,133,188,122,25,230,29,203,140,54,181,198,185,20,151,252,70,42,83,43,105,154,183,240,184,40,66,42,168,151,248,24,64,139,216,25,149,26,203,163,35,220,66,83,169,195,163,71,108,121,27,47,160,10,116,183,240,6,177,223,149,235,187,155,161,50,97,151,250,35,102,105,83,92,244,150,184,91,9,87,178,183,251,246,158,71,42,11,132,83,191,60,85,192,145,220,131,55,144,207,95,180,199,18,141,100,54,112,6,245,200,90,102,92,154,218,11,60,156,173,43,35,70,28,81,222,174,62,113,194,161,214,51,119,24,108,175,80,25,211,222,70,14,126,184,
+145,83,105,8,126,162,5,66,215,184,219,21,1,59,115,144,40,202,37,65,106,59,227,230,225,170,21,103,59,123,240,106,54,125,245,244,106,222,243,190,223,136,108,231,146,153,175,210,148,140,47,123,38,91,143,234,171,172,117,118,60,58,15,108,238,128,159,169,155,82,25,140,169,196,107,212,167,174,220,224,155,119,87,23,115,115,254,50,50,57,117,105,137,247,113,112,45,165,123,189,202,23,44,143,75,149,88,102,117,237,0,87,92,156,11,197,220,225,19,202,156,165,78,134,2,170,121,200,186,182,94,5,113,160,123,163,141,39,225,183,112,72,98,151,5,230,44,50,146,202,219,26,141,223,63,132,107,239,109,244,173,158,65,90,35,111,33,142,93,130,226,84,25,118,214,199,157,210,187,177,91,90,131,12,52,54,5,126,172,17,20,46,181,232,37,172,169,65,226,128,199,30,110,240,28,87,137,204,119,17,151,148,219,27,6,93,73,140,114,193,111,186,186,148,186,214,209,100,47,151,114,126,125,89,65,151,210,247,230,185,96,189,187,177,80,149,83,78,58,209,204,221,160,110,146,122,
+164,247,189,87,117,155,88,41,243,166,115,81,82,151,30,100,249,217,133,24,176,210,146,2,21,190,77,166,180,166,2,15,254,94,52,143,206,186,169,38,157,93,52,62,112,135,25,31,62,112,56,31,72,162,88,95,204,36,107,56,66,214,74,224,252,82,72,203,23,116,92,154,193,19,6,84,233,175,147,128,23,79,124,114,90,177,139,145,221,98,223,41,5,214,91,69,120,193,130,67,153,86,228,45,176,207,135,52,211,56,91,59,1,60,182,130,29,92,2,197,206,0,10,65,124,6,230,111,120,1,31,66,1,190,229,90,9,206,1,66,16,178,0,198,2,2,209,86,111,218,18,233,45,65,16,17,51,1,84,18,155,132,203,241,232,203,231,222,129,79,77,159,170,133,195,235,107,13,252,178,25,90,134,156,62,200,225,253,53,60,250,217,106,58,94,182,59,57,165,227,27,107,110,49,229,248,198,26,249,21,104,6,61,164,109,130,64,250,241,164,0,81,65,79,7,224,161,78,24,22,184,205,244,114,188,237,251,231,75,101,39,4,72,222,50,31,15,201,74,235,237,152,4,108,147,38,
+35,243,58,22,5,120,133,222,118,11,112,143,166,160,159,190,53,213,124,118,100,44,199,33,182,143,23,158,108,167,11,168,147,155,234,151,29,216,210,153,64,65,62,240,56,116,66,11,226,68,8,106,197,74,65,52,209,14,201,120,227,33,185,77,140,55,40,16,130,112,48,189,2,242,61,211,128,182,24,15,181,166,249,134,23,130,134,118,40,184,170,63,21,44,10,218,210,150,25,41,79,54,99,160,204,0,0,106,64,127,218,0,145,191,235,31,137,60,132,5,148,9,20,25,120,10,23,189,179,110,142,6,3,202,3,3,204,104,8,210,231,247,154,37,234,250,80,62,224,175,86,65,83,36,180,215,133,144,143,189,28,130,164,32,61,48,17,2,202,205,209,71,165,70,236,90,144,170,60,106,148,158,153,236,178,249,129,10,186,204,188,0,126,36,145,125,6,76,143,72,64,181,131,237,86,238,16,212,6,147,0,207,51,5,84,242,254,44,73,249,110,157,176,22,204,1,128,114,12,206,113,28,14,130,51,59,212,195,160,96,99,90,48,129,49,112,216,197,69,240,145,37,61,80,17,160,
+247,67,129,66,116,188,52,148,160,64,254,10,20,168,55,230,177,186,90,125,138,230,88,223,225,125,254,63,124,158,52,236,134,129,150,113,83,91,235,213,57,243,18,202,12,198,84,120,197,109,77,90,133,97,189,97,34,122,249,184,56,197,31,192,0,13,166,50,34,218,49,104,198,233,148,82,140,65,244,116,236,35,171,239,164,75,215,110,88,122,22,38,160,151,11,255,54,113,117,120,227,28,243,236,11,115,108,128,137,212,119,83,193,144,234,106,44,162,10,160,65,239,41,124,90,91,241,96,53,145,203,109,217,155,209,78,2,110,246,16,36,228,70,75,249,87,254,244,53,250,30,170,186,1,92,205,91,18,5,115,65,59,124,173,219,25,26,191,54,149,19,141,145,183,233,55,184,88,163,190,126,2,99,215,252,130,150,47,210,28,159,28,121,227,211,132,17,32,196,184,91,234,240,6,24,75,56,84,47,166,50,19,6,170,155,132,84,104,244,94,36,179,37,39,214,50,106,157,109,235,200,99,124,26,246,250,158,119,163,131,241,226,2,82,128,70,113,129,201,194,46,155,4,150,192,251,
+80,166,83,75,66,143,48,105,245,51,224,225,37,177,109,143,66,162,72,220,24,38,40,151,189,144,78,167,180,156,76,4,249,58,27,62,72,128,94,57,99,113,227,240,60,128,20,169,174,197,10,243,122,193,65,200,169,166,25,235,125,218,22,50,230,216,181,221,52,60,189,213,71,198,62,29,222,234,67,88,207,192,2,249,45,156,175,82,111,225,18,106,12,236,146,21,159,124,5,4,22,44,21,10,84,37,24,213,142,251,116,110,163,138,126,70,141,0,158,19,21,192,46,125,3,184,11,139,139,187,57,6,223,195,237,194,47,228,130,115,9,103,242,205,166,101,223,197,201,150,19,193,79,160,14,4,31,20,211,65,164,8,126,124,245,68,245,68,82,118,217,204,2,34,86,139,203,170,68,90,22,193,131,98,96,211,30,5,232,140,86,241,209,35,100,172,176,235,151,173,162,117,120,104,84,74,14,109,135,231,216,207,189,230,139,102,208,99,18,174,195,247,101,77,209,235,40,129,94,98,16,128,207,135,211,142,222,2,17,5,44,164,114,118,176,39,161,181,229,174,30,236,17,243,182,19,
+81,237,118,4,251,122,56,111,240,1,203,229,183,161,71,15,149,105,96,151,247,158,18,136,191,60,147,127,230,39,17,45,8,178,187,158,10,9,160,231,216,30,112,18,151,103,224,216,5,232,240,122,217,50,114,120,173,4,248,229,57,36,2,191,170,209,88,137,106,32,89,207,207,4,128,247,10,122,102,240,69,199,15,143,97,71,192,206,196,68,135,158,1,167,68,127,12,196,133,142,191,206,209,167,95,176,67,34,240,139,121,186,204,0,157,46,163,207,62,50,94,158,46,131,174,79,151,255,171,149,115,76,124,183,177,193,156,19,208,134,168,39,160,149,150,142,64,43,37,23,231,54,92,57,35,71,0,254,160,64,130,71,247,1,120,242,81,74,129,115,218,2,137,65,221,97,48,25,88,171,156,209,137,159,51,90,192,59,4,169,162,135,247,202,66,88,204,203,165,40,41,38,156,41,112,253,199,218,225,185,62,23,88,195,239,192,208,205,65,77,152,203,90,243,50,1,55,228,46,103,232,93,28,222,2,118,70,180,1,208,236,224,137,134,68,88,240,241,228,213,133,85,122,119,11,140,
+123,3,248,5,36,135,63,249,167,55,39,255,20,84,107,35,15,195,205,65,233,107,51,162,28,171,16,68,70,105,97,144,53,244,128,78,23,44,28,125,13,237,231,88,81,4,37,214,107,133,67,47,14,224,8,116,181,158,41,33,95,227,41,159,171,234,159,78,129,25,121,57,37,11,223,178,128,193,39,132,198,151,48,31,168,117,6,185,61,214,10,111,120,25,167,3,120,248,225,169,224,10,147,99,62,88,46,55,63,95,25,1,40,27,159,96,56,72,84,22,180,91,104,222,140,138,146,143,53,49,65,250,141,140,0,98,48,143,197,231,119,96,141,22,24,95,140,224,250,48,190,149,23,10,216,240,177,177,1,255,247,229,36,52,140,157,40,31,60,206,157,28,58,178,174,36,19,163,171,90,245,173,82,85,136,57,235,61,234,80,139,67,88,205,32,207,151,146,2,136,192,102,169,241,72,115,219,141,107,177,113,103,160,12,79,99,216,190,230,232,8,148,40,51,152,244,119,140,174,113,198,77,151,248,13,42,221,222,98,240,103,246,158,98,6,78,221,89,116,139,84,191,27,12,72,233,
+251,96,122,247,90,121,221,111,202,162,52,43,115,111,226,196,198,164,109,171,206,7,238,24,248,232,200,194,211,189,118,196,24,100,193,19,28,3,12,7,176,170,230,87,144,32,158,249,189,84,188,237,216,131,130,188,71,173,90,204,139,220,141,170,190,223,106,114,248,98,123,62,223,236,246,216,72,175,189,35,168,215,188,90,246,253,34,152,182,116,123,43,74,6,156,220,14,223,162,40,141,58,156,117,230,150,171,69,86,3,158,100,53,202,189,67,11,244,105,250,186,199,192,246,172,52,239,15,191,122,255,89,187,224,243,71,213,191,248,245,175,191,254,143,39,169,132,143,111,158,31,190,7,255,197,79,126,251,187,223,252,252,160,135,113,248,54,252,81,92,228,164,168,241,241,181,246,207,5,253,232,59,236,39,65,143,159,252,236,79,254,195,15,191,57,255,169,138,95,124,253,219,239,190,249,250,248,185,249,207,82,5,95,125,247,253,167,234,79,26,64,63,84,246,249,234,219,147,116,202,81,100,227,67,0,232,168,28,242,189,86,205,241,27,247,127,254,87,63,16,240,248,251,79,159,239,
+255,184,245,36,201,240,191,252,244,167,223,231,57,84,241,47,254,234,15,242,28,117,99,190,250,197,55,95,127,251,245,175,190,251,201,159,254,155,127,247,211,255,225,47,255,236,243,93,63,254,148,251,87,127,249,47,255,226,127,250,223,254,2,24,213,47,190,249,219,47,191,59,126,236,255,39,64,203,190,249,230,171,95,30,196,14,254,213,169,207,223,254,253,151,191,248,234,87,159,180,95,78,3,251,189,240,208,65,150,225,32,87,244,229,127,250,242,23,191,251,238,139,159,255,250,67,18,229,179,236,204,39,165,135,31,142,248,81,77,225,247,26,241,175,126,249,203,175,62,164,143,126,253,213,207,191,249,226,155,175,142,202,47,255,88,35,78,197,29,132,42,126,123,250,60,255,33,241,235,159,31,191,104,127,236,200,73,224,228,160,195,244,119,95,28,36,16,62,23,122,146,7,56,10,180,252,28,48,152,223,125,12,223,135,60,198,73,57,229,247,27,247,211,31,79,205,135,149,124,123,82,243,248,238,203,255,244,221,103,253,154,63,94,248,215,159,37,90,142,178,73,71,69,171,79,250,
+71,159,230,230,83,145,159,110,254,226,151,191,252,190,89,63,186,243,255,250,23,128,37,127,119,80,79,248,211,47,78,250,48,7,133,170,175,127,245,103,191,167,3,115,106,235,79,254,246,203,223,126,249,89,82,231,244,241,255,207,149,125,202,243,161,53,115,144,82,248,145,218,198,207,191,60,172,150,239,245,54,62,139,35,124,247,119,95,3,183,255,234,160,39,240,3,101,137,79,51,252,55,223,203,148,124,82,102,57,136,108,1,185,78,139,237,168,186,240,55,159,180,110,126,168,185,241,155,47,127,1,44,159,175,190,253,205,79,254,244,219,47,143,93,253,183,159,20,9,142,183,254,236,207,127,164,131,112,40,228,176,154,254,236,71,250,39,39,137,155,31,104,181,252,160,163,223,124,249,121,197,124,247,245,239,207,243,95,3,179,255,255,195,28,127,24,213,127,173,25,254,80,247,249,167,230,247,199,176,249,127,126,204,193,81,205,7,128,200,67,205,159,22,219,31,152,203,175,62,132,108,254,225,171,95,254,238,139,31,155,195,247,16,246,179,63,249,65,17,159,180,87,126,1,172,46,
+96,10,143,18,98,159,166,253,180,112,15,170,40,39,101,177,95,125,24,214,73,163,227,135,165,31,64,226,123,21,151,175,63,235,124,252,230,203,47,128,86,125,136,86,28,135,238,23,127,247,229,47,254,239,79,34,73,223,55,227,163,224,175,143,210,35,223,252,230,48,142,0,72,3,217,190,249,189,138,190,253,187,175,127,7,24,33,48,3,223,124,249,143,9,89,125,82,136,57,116,232,40,224,246,231,7,137,146,143,109,224,36,150,241,129,68,39,99,251,3,217,152,147,176,200,209,220,142,5,125,249,161,57,246,97,45,71,105,160,131,126,206,201,72,63,9,172,253,177,181,244,89,111,235,159,127,186,252,163,69,244,1,134,127,32,50,244,247,95,124,251,237,201,188,254,152,170,204,103,141,148,159,253,201,65,170,232,208,236,63,20,43,250,231,223,171,101,157,122,247,199,122,117,148,188,249,92,202,143,148,133,190,250,213,113,214,191,23,129,249,227,163,250,105,39,57,106,38,125,63,32,255,243,15,198,241,51,208,252,168,155,63,210,224,249,193,12,124,94,96,223,99,251,97,12,126,
+88,254,183,192,220,255,237,23,223,252,242,40,31,116,218,206,143,150,242,143,183,247,147,253,254,72,45,232,123,50,114,104,195,209,142,254,226,179,28,203,199,159,195,206,6,128,232,191,254,108,219,31,136,246,33,204,114,18,85,250,84,208,65,234,231,39,95,31,155,242,169,165,255,252,147,110,210,151,255,249,39,191,57,96,239,207,63,214,223,177,175,31,240,113,18,161,249,126,240,126,164,134,119,200,240,191,126,9,216,238,127,248,250,155,95,255,242,123,133,164,79,157,252,200,120,232,229,193,104,126,243,243,147,128,213,9,57,127,250,221,55,191,254,235,175,126,254,249,174,147,189,127,94,223,95,126,46,231,163,148,255,130,210,207,39,109,156,111,190,252,135,175,190,254,221,183,159,68,136,62,88,195,239,87,246,163,86,252,244,160,24,121,88,68,255,59,208,130,127,127,64,228,79,67,244,113,247,63,93,243,199,226,61,180,252,187,147,20,36,48,70,223,124,249,155,3,25,251,3,249,168,19,119,248,207,63,6,206,95,127,210,99,251,250,155,95,126,121,148,182,59,13,198,239,27,239,
+183,223,171,124,1,45,251,63,126,44,50,9,236,96,71,141,200,207,163,127,232,227,113,229,252,246,147,72,220,127,161,35,7,136,251,250,8,31,71,130,4,128,221,111,129,205,240,31,190,4,102,237,135,187,237,207,254,228,176,141,252,242,115,171,254,6,168,228,243,58,250,183,63,80,255,249,161,217,126,111,189,63,61,42,17,125,172,194,127,247,221,151,127,255,201,94,63,46,124,136,12,29,46,156,134,246,211,200,126,130,124,0,59,62,233,191,157,20,197,126,176,110,128,201,251,242,183,223,30,53,206,142,24,116,28,171,163,72,230,143,12,247,247,119,145,35,223,254,237,63,124,253,67,50,250,131,82,63,140,23,152,154,3,164,252,224,191,99,43,62,80,230,123,122,252,87,7,181,169,223,0,56,4,108,158,192,242,252,172,122,245,215,95,252,246,111,127,119,212,142,252,180,55,254,233,191,249,171,127,253,215,127,118,44,21,248,241,121,51,252,180,175,2,16,249,219,15,161,189,147,177,254,236,159,253,236,159,125,127,247,71,247,127,241,251,227,118,192,199,67,15,255,227,87,223,254,
+221,73,90,244,231,71,241,171,223,253,253,169,148,99,254,207,188,231,52,210,159,4,164,62,140,241,143,230,249,96,34,127,48,197,127,76,196,233,191,253,151,127,241,223,252,229,127,255,63,254,119,231,23,161,115,250,65,196,169,124,18,113,114,81,123,180,171,13,190,102,120,217,147,174,163,101,48,146,45,132,194,152,231,244,231,23,35,220,249,2,198,131,56,231,87,46,237,249,25,216,138,149,158,195,133,75,75,252,189,174,146,12,178,179,78,79,210,220,106,226,65,120,38,147,104,19,84,98,89,92,14,162,178,199,118,56,55,93,213,64,175,201,21,13,11,180,222,223,111,110,238,189,253,110,183,187,245,153,13,148,234,122,219,221,88,86,93,243,196,199,86,4,141,6,67,80,182,80,36,109,232,34,177,24,95,94,50,44,165,117,42,95,154,32,51,145,238,84,168,102,85,236,11,56,39,179,136,235,230,76,206,236,225,186,226,49,115,56,161,245,54,43,86,188,98,75,160,185,239,97,234,155,136,32,154,123,218,120,44,47,99,207,87,100,249,153,111,209,101,221,95,159,53,188,209,69,
+144,81,137,209,60,69,117,24,172,210,80,85,154,160,61,159,193,133,87,232,98,105,5,47,67,198,154,199,208,3,163,80,213,214,20,208,193,212,238,92,238,90,166,177,13,117,43,169,143,227,234,194,238,201,182,53,152,17,59,97,106,34,207,22,107,193,37,110,215,138,121,223,51,154,166,219,241,82,109,224,7,43,41,215,216,6,219,237,225,183,33,196,129,52,141,246,78,230,18,66,222,192,132,81,19,120,174,193,123,140,218,60,23,75,185,100,59,148,153,183,169,213,142,118,69,26,227,179,7,27,23,85,143,190,228,217,93,101,49,150,184,120,239,51,236,126,201,88,62,93,230,194,92,244,206,107,17,38,237,152,248,254,217,122,56,14,148,130,211,86,249,248,94,122,71,97,197,58,232,54,50,132,95,131,119,139,184,128,249,144,174,67,75,29,30,31,108,64,187,9,232,151,25,41,165,167,218,246,21,50,69,210,121,205,71,197,162,148,168,73,78,10,133,79,46,48,130,71,39,122,59,246,216,249,72,172,77,151,117,247,65,65,129,184,87,89,69,51,72,38,213,78,99,130,18,82,
+50,14,84,5,127,163,72,222,207,228,163,243,24,198,61,179,38,27,237,73,188,158,86,249,21,73,180,138,92,76,179,69,94,113,218,135,169,56,117,155,138,167,87,124,168,149,169,253,188,219,103,155,5,168,162,240,14,142,187,114,32,103,50,59,12,87,202,12,232,21,181,140,230,94,203,218,19,167,64,130,126,184,135,182,253,130,169,111,140,16,165,109,92,116,156,87,94,95,134,210,66,61,215,116,27,135,28,206,56,173,35,105,30,252,214,225,119,62,33,238,130,11,4,161,180,104,7,164,33,234,155,92,28,189,188,138,199,108,35,120,5,3,167,160,210,181,6,89,23,92,5,249,47,115,98,8,171,238,167,48,213,230,230,30,167,134,132,55,222,180,112,236,108,171,232,250,45,27,74,212,99,219,185,80,65,150,208,162,100,177,135,10,99,124,205,188,241,106,216,108,72,12,97,191,2,197,155,88,188,128,31,224,193,163,58,43,40,138,34,179,243,176,129,40,93,122,45,228,248,176,16,133,93,135,5,247,60,89,223,25,218,11,24,110,235,21,86,163,188,120,130,188,70,216,66,1,
+35,230,102,12,59,138,187,243,107,172,22,27,158,224,20,69,184,102,33,44,50,252,171,137,222,17,48,236,136,201,204,125,162,145,117,17,138,184,39,186,59,157,236,48,208,217,134,49,124,55,113,94,221,44,179,139,17,189,82,238,152,51,111,222,105,35,71,108,192,169,60,215,86,109,33,175,241,134,154,61,55,228,101,124,67,53,21,95,151,245,51,189,199,198,186,67,188,104,223,56,35,141,128,231,185,185,198,184,6,212,153,167,160,237,98,222,65,43,78,81,51,104,222,98,109,178,58,62,177,179,50,212,67,37,151,149,31,164,94,124,151,170,206,14,6,189,98,190,99,56,106,211,118,45,245,91,214,4,219,196,189,32,22,13,202,165,198,211,101,139,234,250,181,41,24,238,222,182,244,221,5,81,228,242,197,173,253,152,2,152,23,237,18,190,152,148,167,155,18,248,198,59,14,6,253,6,126,109,247,76,138,13,136,187,182,244,173,40,54,181,47,38,113,198,184,55,161,231,70,206,242,204,87,76,248,151,249,219,133,239,162,96,232,143,22,176,65,190,165,219,38,10,65,191,168,77,
+53,114,196,129,14,41,46,44,56,110,242,233,70,160,182,120,104,185,32,1,131,182,114,62,208,53,93,173,71,73,63,120,137,186,179,173,225,129,189,220,106,122,175,151,30,158,174,192,233,10,117,162,26,92,215,27,133,59,75,99,61,223,220,106,68,245,174,159,34,190,51,140,50,85,125,84,166,211,222,7,105,230,82,94,195,67,27,253,79,29,40,140,234,73,161,67,19,39,143,33,112,43,42,98,40,149,86,140,157,245,239,7,125,179,248,17,63,16,92,89,253,132,140,168,253,42,22,202,124,218,237,150,141,36,22,203,59,102,206,105,247,85,43,166,94,167,100,244,173,38,67,135,95,132,112,90,114,248,245,24,182,94,110,165,148,240,96,142,202,220,47,109,208,178,181,67,34,160,115,45,129,150,105,24,62,159,247,207,75,241,9,92,122,119,81,233,26,68,197,229,202,231,236,99,166,54,18,239,142,222,124,28,103,17,174,194,78,221,126,184,104,95,180,205,140,65,205,27,183,208,223,27,169,232,128,190,46,118,49,241,133,49,102,218,86,117,142,149,69,122,167,89,139,132,233,61,
+71,123,83,33,197,111,45,33,159,105,63,24,216,93,198,138,112,47,92,54,238,130,18,214,98,9,17,139,7,58,162,100,112,215,98,232,188,54,116,114,215,181,183,30,27,213,43,130,171,176,142,143,194,22,227,118,233,112,5,225,12,45,95,208,184,146,148,57,147,60,198,63,139,202,110,121,211,188,198,214,157,21,33,101,83,11,124,230,229,19,197,183,162,233,77,192,162,216,215,37,80,37,31,153,82,27,27,235,10,71,58,34,210,68,6,142,57,188,175,12,11,161,77,97,53,178,104,177,37,115,34,10,22,190,155,177,157,153,132,51,147,49,155,8,51,4,183,216,215,177,230,11,228,122,115,222,28,220,26,27,38,36,73,183,23,10,77,253,135,78,151,163,232,143,44,18,253,100,119,177,8,173,115,26,73,52,65,85,218,103,54,118,146,62,75,131,173,103,8,248,94,74,147,145,241,53,35,249,125,190,179,248,140,37,11,3,105,164,183,116,121,101,20,67,181,140,179,138,204,224,157,219,224,229,84,175,47,88,204,211,46,62,219,231,138,104,211,18,115,151,117,237,167,221,93,82,
+200,32,89,0,115,188,197,210,117,66,197,78,227,17,40,217,174,250,13,60,186,239,23,8,244,10,109,47,88,151,155,80,147,70,50,222,231,30,185,198,32,210,104,152,64,247,76,227,109,116,95,69,201,117,101,200,218,197,18,115,6,198,164,122,208,119,216,44,91,99,149,228,94,35,246,242,92,74,52,77,149,23,192,144,105,49,245,43,66,76,174,199,69,155,25,85,126,182,8,188,191,68,70,214,198,60,216,220,164,53,52,143,165,94,114,189,154,247,250,185,112,195,123,193,106,46,217,198,65,238,9,107,60,243,47,28,218,160,12,182,115,170,215,9,219,242,118,226,228,180,226,136,220,66,58,239,97,50,21,115,143,135,123,85,246,115,226,101,94,157,233,60,27,147,241,52,88,99,221,41,224,239,254,233,57,124,237,91,20,204,166,232,254,233,97,101,165,223,100,39,250,160,175,247,180,203,188,241,195,134,12,127,79,23,53,120,122,206,171,111,208,185,217,123,69,56,231,240,102,64,91,55,85,109,102,77,22,107,88,120,218,90,99,47,124,178,235,151,82,153,67,201,120,119,153,30,
+196,218,54,170,81,189,123,168,205,136,37,201,98,57,133,72,100,84,173,192,248,58,168,23,26,6,243,180,23,164,72,13,124,4,247,126,84,141,243,61,140,85,81,176,108,120,225,116,191,158,168,103,144,43,122,205,138,51,116,232,203,17,229,254,220,81,185,12,172,56,10,234,196,37,148,41,96,192,226,195,105,122,161,151,213,213,197,2,217,55,244,69,239,129,251,137,211,176,246,91,116,123,214,214,162,223,236,7,217,245,92,173,51,14,6,235,248,58,144,89,40,6,70,232,92,109,136,13,130,148,245,66,75,140,15,218,170,54,166,226,80,75,93,109,171,43,151,199,86,81,93,144,115,187,203,188,76,53,5,5,221,57,241,82,53,232,5,165,97,164,143,49,235,4,161,255,120,0,239,170,126,190,56,43,199,211,210,157,162,154,75,250,4,248,249,221,180,48,108,225,249,143,107,42,183,161,185,10,72,91,150,149,21,113,249,176,34,221,162,13,211,151,166,169,209,199,164,175,39,17,115,198,194,36,39,92,251,216,154,84,204,180,85,50,97,9,93,41,220,196,21,251,176,128,231,219,
+139,133,51,44,99,64,142,195,109,201,213,4,2,236,34,74,229,248,204,201,99,87,4,232,148,57,118,171,124,28,223,129,61,181,109,163,182,160,109,29,216,125,65,144,211,155,147,85,247,218,67,207,112,6,151,40,104,35,222,203,97,202,121,35,107,184,122,207,150,202,177,198,70,110,69,109,116,182,73,3,73,184,173,251,105,120,210,174,2,118,240,7,240,9,31,217,120,165,93,79,153,179,59,137,44,250,110,81,9,58,251,87,35,118,170,27,183,112,132,153,43,98,159,148,76,165,123,151,181,135,230,229,179,84,132,70,147,2,40,75,237,105,180,54,84,76,163,68,109,16,145,216,86,244,137,254,73,83,216,153,13,3,119,87,100,207,199,93,121,138,213,20,157,186,48,251,57,93,104,102,205,204,217,248,118,202,213,190,83,246,43,23,164,99,169,73,137,134,104,126,114,49,243,59,237,77,152,165,14,205,34,61,115,44,86,174,233,215,141,163,42,92,7,113,92,16,9,168,66,34,51,173,148,23,207,221,5,89,53,33,172,131,227,34,81,110,203,175,245,222,101,177,133,183,246,111,
+224,151,161,252,61,62,71,78,132,114,186,248,232,124,4,166,233,92,6,3,198,107,96,206,107,197,180,109,71,155,176,35,249,174,232,30,47,175,98,222,73,198,228,246,230,42,35,162,40,118,233,158,123,204,225,110,73,75,169,51,247,166,107,191,172,246,178,116,0,100,12,95,155,228,247,218,134,123,20,220,11,35,211,166,122,225,133,20,85,230,6,2,211,185,169,57,97,142,91,27,158,171,149,207,66,125,251,25,161,205,216,59,36,33,249,14,74,203,141,146,116,242,126,18,79,86,2,53,84,71,185,16,8,87,156,133,158,145,55,142,226,103,91,6,163,155,218,190,36,215,102,67,74,238,90,137,180,217,235,7,236,98,209,221,13,38,29,233,190,91,220,106,6,18,195,78,201,25,64,222,248,115,125,68,221,174,99,81,61,104,231,124,49,20,173,23,241,57,67,198,167,237,50,35,7,189,82,203,23,82,65,75,166,160,148,117,22,194,173,51,131,172,101,187,79,126,67,22,197,74,166,88,236,242,35,138,169,25,192,132,150,253,227,144,57,136,109,198,82,117,62,22,43,104,155,156,
+26,9,238,122,163,121,22,139,43,46,125,28,243,15,85,144,251,169,255,93,146,212,44,7,205,18,71,160,29,79,146,193,65,55,185,10,199,120,162,226,141,102,50,233,120,51,200,244,219,100,180,22,50,246,55,5,100,205,56,138,88,242,1,76,102,211,183,155,204,163,22,100,120,209,230,212,51,74,5,56,191,68,17,216,119,186,4,154,34,208,201,24,173,6,161,101,46,185,71,40,40,2,33,205,166,148,111,36,243,90,168,131,111,21,147,60,41,184,88,80,219,57,92,1,215,111,235,229,161,208,178,148,41,129,31,248,210,137,139,36,68,139,116,93,101,129,139,222,4,154,236,1,114,107,108,104,234,51,75,84,24,24,216,24,131,137,111,175,194,169,53,79,59,141,190,50,18,110,111,86,149,177,142,110,158,77,76,91,18,126,65,91,19,138,53,229,152,35,185,243,92,84,198,118,84,99,150,24,2,176,72,88,116,187,70,114,45,67,40,237,87,227,155,247,87,121,201,178,221,248,178,99,62,127,219,240,155,205,227,168,197,146,128,162,48,133,128,127,164,51,46,186,197,139,202,237,
+251,222,116,63,200,90,84,125,28,89,19,75,70,49,211,137,83,158,185,56,215,65,18,227,72,99,253,178,139,121,222,243,103,111,70,8,107,199,79,24,66,219,100,247,146,204,206,22,246,47,201,196,195,218,190,154,123,16,188,224,110,183,207,226,95,24,169,141,208,89,75,22,48,149,121,22,153,37,139,51,48,163,153,101,104,15,236,115,241,117,248,213,186,12,190,147,101,147,130,52,52,118,170,16,8,200,178,78,42,26,152,205,187,233,202,177,109,24,192,158,142,3,213,234,123,249,90,202,101,158,111,208,251,196,67,252,60,48,161,49,218,233,246,99,97,100,28,129,173,52,23,105,126,199,31,15,156,59,5,100,131,157,208,179,164,12,243,78,83,23,237,158,218,137,27,143,193,169,185,175,11,86,156,94,152,31,127,232,24,57,125,255,12,109,202,114,168,202,145,79,49,116,243,134,158,10,152,110,70,24,73,254,245,4,166,39,5,102,83,254,93,67,87,222,173,8,28,197,68,70,39,144,53,243,220,34,56,149,220,242,20,27,211,186,93,194,41,101,65,39,102,203,118,89,214,227,
+123,148,112,106,121,26,140,74,250,156,156,84,171,160,245,202,133,79,118,49,175,200,82,186,119,184,166,185,223,140,46,87,149,203,109,112,145,91,190,59,55,29,210,2,210,64,245,202,20,200,184,184,105,201,206,242,84,249,142,121,103,82,118,119,109,196,198,155,48,238,10,102,3,179,239,245,143,132,157,221,181,70,181,152,238,46,161,74,9,216,194,238,75,199,12,211,3,145,7,167,100,214,92,37,65,137,33,48,174,193,236,151,221,200,224,91,95,104,183,29,10,198,216,22,178,135,126,132,201,133,12,98,51,16,226,162,47,139,39,177,231,107,97,150,21,115,15,103,26,91,237,44,252,148,137,4,123,168,71,214,211,197,68,37,199,25,250,251,4,233,238,77,30,9,211,61,164,176,56,21,74,73,216,113,246,67,197,4,112,39,42,126,85,193,181,28,201,112,80,22,200,48,151,51,121,46,186,170,220,27,22,123,200,58,210,130,231,249,12,173,129,107,184,36,249,50,99,154,229,37,206,242,11,36,70,77,124,86,88,114,177,58,42,45,106,30,236,44,83,47,181,168,143,191,67,28,
+171,229,125,141,208,107,233,10,45,139,236,206,181,211,142,91,248,48,174,243,14,211,212,94,6,176,171,181,201,54,136,83,167,42,77,227,109,236,216,121,223,77,36,217,120,234,155,19,224,122,146,120,88,208,115,138,209,206,203,74,150,158,130,73,232,72,249,50,146,123,235,21,94,41,187,27,67,167,63,173,41,164,162,23,62,73,26,148,165,238,208,66,241,166,204,233,181,181,218,66,140,153,151,230,120,251,196,46,111,2,175,106,28,153,155,50,105,177,228,134,247,173,226,41,105,192,107,114,77,4,65,99,199,184,175,51,3,107,48,90,52,7,148,106,84,133,63,47,134,66,154,53,111,32,187,195,172,49,156,124,188,218,232,85,175,163,186,76,15,229,218,173,111,102,22,201,242,237,162,17,218,227,110,247,238,4,175,57,244,43,58,216,162,97,90,15,209,84,224,188,6,129,167,217,117,116,163,227,194,188,210,8,125,111,120,150,193,195,208,53,46,221,52,120,211,245,242,54,195,75,84,173,90,191,5,146,83,68,109,239,221,13,130,33,82,23,222,216,108,246,29,217,111,116,134,179,
+76,89,98,101,163,233,30,121,99,5,230,92,29,216,17,24,150,27,139,166,63,190,94,85,156,249,132,71,175,45,103,91,131,125,17,88,24,90,253,206,13,245,223,169,232,197,165,142,50,200,32,243,185,178,250,189,55,40,209,224,84,195,78,145,245,202,215,179,176,203,184,68,207,100,225,121,31,97,7,108,102,187,218,38,7,102,133,162,183,154,237,81,210,135,247,36,216,63,147,165,8,132,36,79,200,107,243,96,47,124,47,5,126,145,192,249,183,152,247,21,42,147,31,101,91,134,236,182,107,23,128,48,213,226,121,70,212,187,137,20,251,2,149,34,170,135,243,94,8,49,205,18,166,30,79,188,118,86,42,17,27,210,46,10,96,154,104,103,217,101,69,68,216,238,65,196,51,152,71,224,59,189,72,229,151,88,209,249,40,52,72,222,135,150,136,44,12,70,246,80,53,158,91,125,64,212,39,197,199,150,184,17,39,106,16,114,5,149,70,91,236,178,75,112,194,173,195,212,192,231,93,119,172,212,246,61,76,242,62,192,73,92,210,140,138,143,77,11,118,199,228,222,140,167,113,184,
+104,235,4,31,69,239,154,175,251,241,184,32,181,228,139,143,92,225,56,199,41,184,49,15,220,146,109,67,224,85,24,137,176,57,181,177,183,7,138,208,26,15,149,141,145,126,99,86,190,31,15,6,28,94,193,75,18,41,158,45,26,112,161,159,46,208,95,210,4,83,157,48,213,7,39,83,35,118,103,43,209,202,35,105,237,38,39,2,71,16,36,191,48,245,212,44,200,215,200,73,1,22,172,56,192,25,252,208,184,127,109,81,99,197,219,76,60,171,155,71,28,242,252,150,90,209,55,238,167,203,206,60,64,31,228,146,238,1,191,142,234,204,91,13,25,64,75,61,96,248,244,117,54,150,19,52,68,203,224,81,178,34,239,147,117,26,10,87,115,245,59,156,133,171,53,169,96,165,47,158,217,198,171,20,113,7,171,237,36,232,149,67,237,249,72,130,179,80,211,87,240,188,96,166,66,156,151,83,144,238,122,91,116,184,69,119,73,81,28,135,125,86,101,144,217,187,71,98,115,237,217,247,69,248,65,71,52,152,175,253,62,134,35,41,171,91,82,11,53,129,52,30,183,213,154,30,
+156,103,136,234,121,165,121,77,21,114,233,103,27,149,49,149,240,38,204,73,245,10,186,223,136,30,12,56,101,36,113,182,214,87,17,149,103,9,155,93,22,76,118,212,216,46,28,195,153,39,68,207,123,80,100,106,23,162,45,194,196,251,94,187,90,45,195,27,71,183,92,184,1,166,165,99,170,58,119,110,82,11,78,227,19,202,83,106,100,220,215,151,25,233,27,120,144,158,218,20,230,194,117,215,48,206,210,81,105,156,66,109,239,221,135,168,112,168,88,76,237,204,64,252,94,120,96,199,50,226,254,165,82,61,16,109,98,134,122,105,64,11,97,150,131,60,103,25,13,110,11,103,11,97,65,199,137,100,215,142,56,166,134,243,208,164,94,83,158,200,94,27,170,201,185,91,236,212,14,208,193,77,187,224,16,108,207,238,53,61,144,121,242,34,176,50,184,132,157,148,210,124,119,95,90,53,188,10,24,140,112,46,3,230,61,127,48,53,50,90,230,168,150,181,40,45,209,116,235,57,94,10,174,236,245,85,84,127,220,27,118,165,123,243,220,200,32,150,53,49,47,117,187,103,149,170,
+40,172,209,94,26,66,55,25,4,197,193,86,235,98,234,137,113,190,165,4,74,99,231,83,67,35,178,174,56,230,177,79,42,37,154,103,138,177,135,154,196,103,113,221,214,228,45,52,113,223,105,140,113,87,219,112,239,120,10,186,45,253,165,174,190,203,19,31,116,231,103,224,222,96,41,91,38,36,21,3,118,177,122,190,202,150,12,247,217,114,253,190,136,92,215,87,226,105,228,202,194,185,40,168,11,119,229,243,187,193,13,146,221,99,115,194,192,206,25,122,36,177,7,75,243,50,52,163,192,208,164,164,229,154,81,90,45,37,215,43,142,126,197,168,132,250,122,111,157,106,74,234,244,155,178,65,105,100,5,124,81,15,187,157,133,81,212,151,252,77,194,104,146,175,82,40,165,164,78,212,221,19,69,160,128,89,108,140,229,52,232,91,201,118,155,108,187,161,143,252,96,83,207,67,216,139,90,125,37,185,45,25,72,197,149,95,38,202,90,201,225,124,103,171,142,58,229,107,209,101,167,39,46,157,135,45,193,234,36,172,124,177,219,67,117,99,154,186,122,121,47,121,235,180,184,153,
+221,25,90,86,208,206,58,104,200,13,164,236,138,22,112,3,90,193,116,153,103,245,62,121,245,190,247,88,215,200,81,86,166,181,200,132,79,39,210,9,230,157,118,203,141,204,111,222,60,187,105,114,71,97,189,102,39,133,135,78,136,106,57,91,251,37,198,109,225,60,232,177,21,176,138,200,51,35,94,16,221,242,199,37,39,7,240,147,171,166,133,36,81,133,154,146,146,93,216,56,222,9,11,162,173,240,61,39,169,162,16,44,18,176,123,68,226,58,139,225,41,138,180,42,92,231,155,118,212,28,10,221,147,241,26,116,62,46,219,219,230,61,48,34,218,190,233,58,219,47,184,17,29,181,238,168,110,204,13,197,226,30,161,192,153,40,109,11,134,81,222,46,253,201,140,20,147,76,33,16,174,41,45,192,72,175,12,89,195,218,68,153,170,35,111,111,253,156,235,237,194,83,104,86,86,146,241,214,86,69,213,250,6,252,53,123,236,68,95,238,141,172,72,116,253,194,226,224,249,73,227,2,93,155,200,41,153,234,187,134,226,159,106,239,99,250,133,106,131,41,198,36,56,48,165,152,
+104,231,250,249,12,254,54,179,179,175,93,150,203,118,47,90,151,93,63,243,26,62,33,48,133,250,40,5,158,69,166,232,69,225,189,65,188,163,9,213,109,192,112,58,5,176,139,5,184,2,75,73,69,100,208,67,98,87,134,43,165,2,0,210,77,177,55,167,8,177,111,126,96,19,79,236,112,132,65,107,80,108,11,22,158,34,84,182,83,237,107,122,141,11,15,38,37,161,219,233,181,188,99,188,17,61,182,238,38,190,122,220,229,118,201,110,11,43,229,130,202,73,250,50,134,204,162,16,22,213,33,194,185,27,199,115,189,95,29,236,161,58,111,209,146,105,40,152,166,192,100,22,212,81,53,135,116,200,230,81,244,70,176,125,37,24,174,120,189,190,176,187,212,77,179,129,1,90,136,67,193,21,67,89,154,240,224,22,9,7,169,158,27,190,74,25,230,88,222,64,197,53,150,105,179,199,69,205,110,43,100,59,166,150,147,53,152,97,226,87,50,99,46,26,95,155,219,94,100,226,129,63,69,36,99,175,179,76,38,94,122,169,9,117,209,124,175,191,183,179,240,77,20,157,26,23,
+77,101,156,180,110,128,62,79,57,30,192,8,215,251,166,96,190,45,175,54,12,176,110,50,144,248,244,110,213,182,243,62,128,188,15,138,137,107,172,205,52,183,38,107,77,192,57,213,119,245,164,26,213,146,75,7,90,234,161,192,43,175,94,227,118,58,105,134,95,69,77,156,123,192,58,70,73,183,157,226,240,116,216,10,143,214,128,90,141,141,47,22,163,101,16,10,18,44,26,209,106,189,4,209,164,69,66,220,216,19,97,53,177,39,71,59,36,153,36,242,131,114,74,46,27,191,136,242,46,187,123,111,220,27,179,239,90,153,102,105,23,149,220,210,81,114,237,175,213,76,251,62,118,1,80,144,196,158,109,91,5,43,114,231,141,53,188,123,206,242,103,12,110,115,17,103,4,99,78,21,174,104,177,52,195,146,244,190,151,111,211,215,11,146,154,26,17,235,61,202,203,113,11,114,161,237,65,247,77,11,177,137,179,116,243,121,149,158,45,189,130,25,12,136,142,218,203,50,102,159,230,55,78,165,129,16,122,21,244,218,137,206,195,122,156,129,53,23,51,255,56,117,69,158,70,67,
+148,120,187,68,90,23,2,237,254,195,43,119,87,95,235,43,148,164,161,3,46,168,10,229,114,134,244,0,193,98,43,237,64,54,26,111,248,196,29,61,103,47,110,116,159,188,10,79,96,183,202,90,67,243,91,250,68,57,233,114,104,138,189,55,112,203,90,114,90,168,90,47,234,205,4,181,189,136,208,17,47,55,147,125,157,140,32,66,193,163,137,129,166,69,72,202,30,182,198,25,175,17,136,211,75,97,140,112,85,169,94,52,129,85,216,164,205,175,11,139,166,13,126,193,24,235,11,139,16,97,232,129,198,133,239,249,98,190,71,104,140,131,99,176,72,24,172,230,115,241,93,191,118,91,108,129,37,144,68,161,40,213,198,223,206,74,249,113,140,95,100,88,58,137,6,214,104,16,89,100,251,219,189,99,178,90,131,39,144,140,48,112,219,189,155,209,188,161,245,126,208,244,154,230,140,109,216,52,206,157,79,178,217,189,102,233,179,168,166,157,90,116,2,25,106,135,253,109,161,185,234,149,123,5,65,164,96,184,125,12,75,187,234,120,190,139,124,127,153,0,85,213,3,68,53,185,
+215,54,139,158,82,155,158,202,149,31,95,38,118,32,201,211,56,91,243,89,18,70,175,60,141,167,58,92,62,135,106,80,164,9,164,225,85,168,209,65,231,93,25,244,74,51,16,12,29,102,198,57,169,223,86,8,13,226,199,225,192,235,95,121,246,9,21,13,213,137,50,224,153,148,114,170,28,218,238,204,81,106,146,14,56,112,34,225,122,169,97,204,165,82,61,214,20,183,56,34,122,85,89,214,13,128,149,108,34,185,185,22,142,65,153,146,104,39,226,199,6,133,199,121,211,94,108,162,226,232,253,64,132,90,40,223,83,218,43,172,37,131,76,213,207,140,14,187,29,89,83,182,38,206,222,133,217,100,236,150,32,52,163,188,71,94,133,22,239,5,65,193,100,182,73,6,7,187,95,79,160,224,42,138,141,52,139,76,12,169,136,194,97,153,151,178,199,1,82,251,194,182,35,84,99,228,178,154,220,22,200,113,129,209,79,102,91,157,190,32,162,238,147,189,98,36,245,100,88,153,90,230,82,237,176,243,42,158,240,6,33,169,68,249,74,182,154,99,172,236,122,90,101,117,37,220,
+114,214,157,145,104,46,19,246,45,182,209,184,139,210,212,0,203,139,222,110,93,176,126,84,4,187,10,248,230,37,115,38,54,108,65,34,23,25,166,32,169,217,169,39,79,205,97,94,204,223,100,66,150,173,193,79,22,14,226,4,240,122,28,108,24,172,50,226,238,169,198,122,108,122,36,201,44,62,138,200,220,239,185,210,153,125,112,48,236,173,170,178,127,235,48,208,146,98,209,46,217,39,218,228,46,22,223,215,16,141,115,171,46,31,13,235,226,177,50,71,21,176,13,104,94,137,76,108,120,101,110,219,234,66,172,40,70,197,215,140,103,66,167,194,211,139,213,174,167,249,162,216,194,160,182,106,135,4,45,96,26,107,187,241,140,145,13,136,217,48,131,195,174,76,200,89,147,75,181,127,82,48,143,18,187,178,163,129,132,67,251,10,207,186,30,39,7,129,61,225,73,168,247,27,30,154,143,134,114,215,247,226,80,40,132,153,224,3,178,169,99,137,29,158,112,84,193,50,76,118,69,158,45,195,212,98,22,1,89,90,219,222,213,152,53,130,70,35,29,35,45,69,197,182,187,147,
+13,213,241,130,159,213,49,186,49,130,130,119,9,90,60,95,196,173,51,115,71,40,51,88,244,254,142,208,49,73,198,24,123,149,64,223,235,122,136,198,27,4,165,56,190,194,181,49,120,8,97,178,94,60,219,244,140,187,69,188,112,166,124,97,143,241,226,219,208,90,188,24,212,26,131,24,169,154,79,92,171,148,221,183,192,211,227,48,129,162,72,111,47,46,251,173,173,8,17,145,77,118,27,167,215,191,48,32,248,197,246,218,92,17,55,174,213,197,66,190,56,14,146,52,178,43,47,197,138,213,244,197,187,136,121,38,234,207,240,234,156,75,80,174,249,249,44,213,138,195,236,194,114,179,112,59,141,177,38,188,253,160,218,188,134,58,106,111,51,158,21,171,187,244,63,17,183,204,152,2,90,183,121,117,241,94,116,174,190,163,76,23,51,211,89,143,7,221,134,223,219,172,125,19,92,107,69,40,30,246,142,197,80,222,14,77,243,152,244,92,254,26,195,131,197,51,222,197,78,74,132,8,149,133,121,53,153,137,164,37,161,88,52,17,201,154,166,69,135,101,251,184,80,206,226,119,
+254,244,195,20,110,176,223,35,23,158,197,187,205,35,136,207,211,150,248,67,66,33,178,15,227,190,158,35,27,189,222,42,140,218,196,205,164,157,244,196,222,109,177,22,45,204,126,146,142,131,218,89,69,71,24,139,194,241,155,172,93,105,191,136,239,253,143,87,152,187,73,227,78,193,79,156,207,169,137,85,184,94,115,107,116,4,82,53,46,44,204,131,194,46,49,30,134,204,208,101,199,68,40,83,144,43,216,57,181,162,163,55,212,252,173,207,83,210,100,91,244,68,139,32,97,222,199,148,148,104,174,171,107,106,116,150,133,0,149,134,223,204,92,87,4,211,99,253,193,34,221,87,106,19,130,123,177,198,13,230,70,56,180,88,89,141,60,181,32,74,132,135,230,58,171,222,126,64,120,76,10,189,194,190,72,36,205,73,165,203,62,174,173,104,36,59,42,106,58,109,84,49,197,233,113,111,49,160,182,203,195,189,159,134,65,183,223,102,2,201,195,160,141,233,77,20,184,73,35,118,23,144,167,110,71,149,134,51,128,178,158,183,46,224,252,248,156,164,191,159,141,249,190,217,2,99,
+10,141,170,12,157,52,27,244,5,251,251,85,79,229,47,182,242,76,95,107,56,117,228,121,30,52,86,131,51,39,199,183,78,71,86,101,196,14,251,35,78,60,114,71,123,52,143,60,122,163,60,151,164,52,112,239,149,221,212,73,55,188,55,80,218,5,196,140,149,135,201,19,210,13,67,18,245,4,233,145,157,120,231,92,129,21,94,153,137,30,47,240,18,136,39,162,232,146,214,32,32,12,4,191,112,160,21,89,151,220,64,29,252,122,215,123,130,225,179,65,137,177,18,81,59,20,177,39,87,147,157,116,133,0,59,75,45,162,69,134,54,204,80,169,161,74,111,140,179,173,51,252,166,247,93,184,67,34,26,81,57,46,89,41,48,218,91,163,85,220,75,88,7,119,92,99,50,40,188,156,228,73,137,156,86,251,244,110,83,151,215,58,130,68,208,72,40,25,227,152,188,125,159,148,55,47,128,29,82,222,129,40,230,133,196,188,182,111,154,139,24,11,244,253,249,178,131,9,220,173,4,90,86,235,205,206,141,217,110,100,184,122,160,9,165,48,50,222,81,119,129,104,52,17,180,197,
+52,100,48,74,182,59,191,4,99,40,164,54,235,56,218,130,154,77,99,53,148,106,204,128,25,89,102,250,248,61,93,8,113,160,56,77,221,146,140,89,32,79,155,170,112,88,120,68,83,83,195,155,89,144,50,26,248,98,54,228,218,13,193,134,181,152,246,172,210,8,202,250,59,13,107,41,118,59,26,177,192,67,75,203,75,169,192,23,67,161,32,108,108,220,123,70,233,168,23,108,153,221,69,50,82,147,114,182,170,226,74,222,43,158,223,23,245,82,120,120,93,159,229,51,52,124,219,194,112,64,164,55,111,70,76,91,51,15,149,210,135,76,87,7,159,43,68,209,51,58,121,23,90,166,149,54,19,89,49,94,199,50,18,14,103,81,190,13,148,248,72,72,3,218,2,55,252,51,43,60,27,144,106,57,146,22,51,237,145,86,82,201,90,62,90,32,241,55,245,184,42,89,176,95,100,251,178,174,98,229,68,83,6,61,243,178,211,51,169,209,149,166,10,192,72,71,169,69,234,81,194,147,245,240,142,110,165,217,244,91,5,184,91,118,100,13,91,131,151,107,211,184,27,87,22,194,
+118,148,29,72,13,149,237,90,229,223,201,100,21,168,159,162,23,173,42,185,116,173,181,226,216,100,27,197,4,82,105,111,215,26,67,76,68,149,60,97,192,142,123,180,133,20,157,218,34,206,28,35,164,124,72,14,53,215,216,90,106,113,22,175,120,19,239,129,96,177,87,124,247,105,122,131,76,58,47,173,37,111,31,138,158,171,236,67,63,210,163,120,159,68,51,79,191,36,210,225,77,13,100,58,91,190,138,245,75,19,195,66,163,50,84,100,149,148,116,242,30,49,167,199,221,176,217,44,106,143,157,185,226,59,66,221,123,232,40,70,182,217,58,91,48,44,230,51,83,3,181,126,172,60,98,100,151,141,252,238,5,90,122,101,204,200,230,194,50,144,124,196,100,49,235,88,106,215,79,89,50,57,51,203,27,15,5,193,146,254,138,163,76,75,40,212,11,75,177,79,31,191,36,242,188,45,155,54,123,7,10,86,198,232,187,121,182,56,208,12,38,208,93,47,153,87,79,250,20,119,195,36,215,48,57,101,85,67,66,33,133,74,146,76,49,160,151,52,100,73,37,201,188,86,199,13,
+150,124,186,46,107,110,179,15,243,214,72,147,244,82,76,219,219,74,190,238,207,35,230,125,218,154,210,225,176,198,206,23,9,110,32,216,103,125,226,232,99,76,58,141,37,120,232,90,60,58,160,197,139,121,51,150,169,95,183,85,88,97,55,212,30,144,175,214,194,32,187,12,180,194,49,181,199,168,19,246,160,173,184,163,46,130,117,227,186,205,110,200,118,116,217,130,31,228,175,3,126,218,64,147,172,26,227,138,246,66,18,223,14,164,115,159,57,206,82,167,198,253,17,246,241,122,163,30,18,233,215,109,9,108,30,211,48,213,65,159,248,110,109,93,45,95,226,200,59,177,142,101,221,57,189,248,167,104,193,146,193,94,107,156,85,0,155,48,162,157,120,211,35,93,239,117,117,225,128,217,187,197,198,19,124,156,73,105,238,196,130,220,101,71,43,155,149,240,218,125,29,70,27,77,43,123,243,212,46,181,84,118,200,231,233,196,159,145,215,30,241,251,104,86,68,24,148,200,185,210,13,185,58,243,73,35,248,103,205,125,76,152,20,198,16,150,54,202,63,114,209,38,28,140,96,31,
+231,101,174,41,234,115,228,43,197,51,171,106,155,175,133,174,150,218,235,40,178,26,21,163,115,223,36,235,188,170,116,158,188,21,162,229,80,130,54,245,164,214,4,98,54,196,76,19,119,68,236,118,188,114,184,124,177,95,70,26,190,29,199,74,37,106,30,122,209,93,32,78,222,48,60,148,69,44,79,27,11,61,42,251,134,166,204,86,70,206,252,204,66,97,243,118,5,202,43,73,191,90,84,212,18,79,65,128,234,82,51,237,80,92,194,116,9,226,139,44,86,206,18,196,48,93,251,165,252,54,83,62,127,24,129,146,22,85,48,183,221,120,192,89,113,22,147,139,62,172,135,42,202,213,218,155,51,92,47,177,88,44,135,93,65,19,159,92,111,38,52,125,176,209,234,55,56,227,25,236,2,6,123,226,14,152,236,54,155,221,117,83,96,176,23,152,32,171,88,85,220,103,149,1,135,205,102,59,73,92,176,177,212,160,88,200,32,16,136,249,80,226,223,15,236,219,182,207,54,174,228,59,178,199,38,12,70,67,21,2,115,253,133,213,82,128,141,64,46,19,101,2,131,9,226,64,
+202,230,194,122,76,241,155,40,199,148,201,33,19,144,162,57,100,2,82,250,135,76,23,17,45,99,2,177,149,96,107,6,245,28,98,100,13,192,236,20,251,206,91,8,209,174,3,130,58,234,173,37,143,56,174,158,218,55,29,171,255,34,166,119,189,61,99,102,142,193,125,172,192,100,179,227,242,176,143,18,214,239,89,174,5,157,53,176,215,110,158,81,235,215,194,179,61,210,109,222,191,21,94,47,219,103,87,254,194,112,89,74,90,98,22,187,38,112,85,41,82,41,237,217,133,149,5,114,220,39,145,89,222,155,225,162,255,216,100,189,95,119,119,151,214,184,221,206,177,147,91,247,131,75,189,230,108,93,68,211,195,62,5,125,50,243,34,53,34,226,172,12,75,23,96,2,35,70,37,106,171,153,168,139,243,151,132,181,39,232,70,189,245,117,51,100,229,62,31,138,129,172,108,54,237,221,200,15,48,208,25,175,52,113,10,86,142,139,205,166,57,158,63,54,109,105,45,246,246,2,151,151,24,177,200,23,52,100,123,14,67,50,72,138,222,157,179,235,245,217,174,231,6,59,17,146,
+123,131,94,168,133,148,249,35,226,133,129,13,97,229,145,202,173,198,250,76,116,102,44,133,21,135,47,81,118,40,60,8,233,113,227,51,75,157,47,206,11,17,39,219,188,199,130,189,73,165,229,173,142,190,120,10,189,112,186,139,87,138,8,6,27,37,125,5,152,89,101,33,83,199,98,127,84,198,170,223,228,157,236,103,51,83,191,226,172,24,81,78,71,36,127,165,232,11,54,238,90,75,238,70,197,62,104,87,73,36,156,205,49,170,11,226,24,226,118,203,173,118,123,234,174,149,156,161,64,227,188,206,59,202,232,44,111,179,251,219,169,166,139,110,60,183,157,246,21,39,118,63,77,226,199,11,201,115,187,240,246,222,132,176,203,231,205,113,156,48,9,213,234,117,87,199,31,237,112,130,20,30,223,94,132,141,139,119,33,54,158,0,33,145,101,244,118,223,198,130,228,223,28,143,134,188,90,247,166,71,32,249,144,192,219,27,172,79,31,174,46,176,242,62,196,175,164,240,74,129,183,23,213,133,77,26,193,149,157,136,154,74,64,188,113,197,38,47,16,110,197,210,242,100,244,236,
+162,22,10,75,225,107,213,174,204,192,172,162,28,228,30,150,115,141,149,59,31,94,211,133,197,243,235,59,37,147,96,47,35,87,164,23,144,171,30,186,198,166,228,133,177,58,73,187,22,217,131,20,148,19,253,236,180,219,239,153,141,117,30,114,38,167,106,212,131,13,147,1,44,4,185,120,142,25,59,161,251,37,13,43,56,254,55,118,62,69,230,13,50,182,83,184,220,179,250,219,103,187,221,145,30,171,49,244,235,49,206,137,132,26,129,20,188,221,126,76,241,92,143,143,41,161,67,38,32,37,6,100,74,213,81,23,144,56,27,87,192,89,206,65,163,75,54,91,13,230,180,245,217,206,77,178,28,124,43,207,33,118,103,97,40,90,177,12,92,8,135,214,83,211,210,44,199,28,148,117,153,48,192,50,200,78,67,141,117,232,134,246,82,140,56,89,72,99,233,186,45,71,186,34,90,42,153,188,210,226,246,88,246,224,145,9,148,166,51,99,125,70,102,216,79,185,191,57,207,166,16,36,72,233,190,250,150,223,59,129,28,207,236,193,33,135,77,95,40,194,232,1,220,93,201,42,
+174,55,158,173,117,29,74,237,54,112,40,26,176,47,167,125,156,96,57,28,118,178,131,179,143,33,48,118,57,26,210,14,82,3,45,168,24,242,11,140,177,210,216,135,106,115,119,151,28,7,176,122,186,112,48,78,115,14,229,74,87,119,182,133,30,231,150,243,67,64,241,229,115,111,65,12,163,95,107,139,197,71,199,36,69,222,228,112,251,51,236,169,226,154,155,242,2,152,183,81,89,122,68,150,92,233,229,32,117,225,61,224,136,140,76,190,11,82,140,197,94,108,92,8,57,131,111,164,45,149,37,108,154,225,80,125,239,50,175,145,243,152,199,187,253,123,159,153,119,213,161,168,199,43,136,159,178,0,176,161,126,28,149,192,124,245,114,2,16,202,199,56,105,2,115,160,30,208,106,198,193,122,177,48,88,234,28,95,237,50,140,204,249,197,24,146,162,1,83,234,57,204,34,196,14,31,235,223,64,160,144,182,196,236,50,64,43,142,115,248,124,121,14,82,130,181,89,31,244,185,0,147,83,207,30,65,32,255,89,96,126,118,102,215,14,180,84,52,226,10,193,238,21,235,209,240,
+89,203,45,208,158,159,129,70,119,231,114,115,150,114,219,208,113,3,253,18,22,31,210,80,119,151,120,138,216,92,126,162,61,162,200,131,43,207,38,200,6,175,128,166,48,31,152,149,238,64,92,71,19,182,123,83,45,83,173,162,46,144,37,163,70,225,44,113,217,47,74,87,26,127,219,183,147,198,32,8,232,57,202,44,172,146,182,76,91,254,236,43,72,155,52,165,119,83,128,45,103,61,214,18,50,2,251,17,33,91,89,75,147,36,184,49,8,242,14,158,77,160,254,159,226,190,245,41,209,44,205,243,95,177,59,54,98,51,123,178,42,99,103,63,108,196,244,196,68,84,87,244,135,142,157,158,158,232,154,137,137,233,218,138,209,50,201,74,163,76,205,85,179,186,43,102,54,226,69,16,1,65,65,5,145,55,85,46,222,69,69,69,240,130,130,128,136,10,34,38,10,162,128,220,20,65,64,65,80,4,116,207,121,95,64,52,179,122,123,183,47,251,161,210,132,231,156,243,60,231,57,207,245,152,245,59,137,46,157,81,235,58,71,144,32,61,216,27,137,229,134,198,145,244,154,32,
+177,45,216,82,111,222,162,35,219,17,225,220,173,81,202,217,64,157,254,0,115,230,188,107,194,232,210,73,247,197,157,233,45,125,75,156,34,128,236,172,46,234,251,222,222,203,161,233,237,59,110,83,179,227,240,188,243,216,44,21,218,155,153,238,70,85,128,121,196,215,163,84,246,68,199,233,251,227,197,238,198,113,3,10,85,34,38,133,81,226,149,169,51,78,145,244,102,199,181,70,181,114,44,153,106,217,84,210,226,122,68,24,226,199,122,52,183,174,237,8,37,141,144,16,228,204,59,19,99,94,107,148,103,237,161,196,194,96,66,175,212,80,38,67,83,19,177,224,158,188,111,71,161,145,7,206,89,205,45,145,254,0,92,217,111,34,102,210,226,57,93,227,173,75,26,213,141,90,132,102,116,185,99,178,139,103,106,139,12,19,153,201,93,162,33,254,158,216,35,142,93,35,136,90,70,245,134,83,35,192,204,245,17,67,86,11,156,230,116,73,150,232,231,160,182,243,211,85,7,226,76,105,38,194,131,244,145,59,96,109,29,161,70,45,87,24,67,16,25,185,137,225,154,12,73,187,
+155,155,248,194,70,122,242,96,38,165,242,44,107,117,12,221,122,90,59,104,121,215,220,49,215,63,71,2,130,108,131,61,206,216,20,252,193,78,63,147,167,117,33,84,160,94,150,162,209,208,102,84,90,168,96,37,3,176,18,3,74,180,19,141,168,55,169,211,233,218,116,82,199,58,10,255,105,38,50,8,25,209,193,182,225,126,168,136,0,141,83,16,164,21,49,80,148,68,4,105,68,166,33,25,105,194,201,8,25,39,35,205,56,25,89,193,201,72,35,78,22,104,112,178,65,139,147,167,5,56,249,140,136,147,81,15,78,166,8,113,178,112,27,39,27,212,56,57,126,142,147,149,219,24,121,106,139,140,70,176,153,146,35,180,71,121,145,88,166,175,217,108,235,152,156,172,241,255,15,242,78,49,183,208,113,200,255,26,129,2,177,149,109,110,11,19,146,24,136,133,244,23,212,23,131,150,208,99,51,69,136,93,63,25,59,75,48,46,115,77,112,72,43,98,105,252,11,202,161,105,11,48,157,126,38,4,153,147,210,110,93,65,253,148,11,126,63,188,226,193,126,238,179,212,10,240,
+67,45,247,179,152,16,57,144,153,86,3,255,66,252,90,151,20,39,43,4,56,153,73,197,201,36,1,78,70,120,56,25,97,225,100,132,140,147,225,103,72,6,250,198,200,72,16,144,245,105,113,82,131,96,2,218,169,171,64,27,67,152,112,234,78,176,135,78,4,55,108,22,130,27,202,59,4,55,20,50,130,43,232,79,109,247,35,250,185,152,108,221,177,138,239,31,13,182,4,152,57,168,31,58,66,21,193,159,141,248,54,0,63,108,27,32,124,98,219,64,200,216,46,17,132,136,147,17,50,78,70,72,56,89,173,193,201,44,4,39,251,53,56,121,159,136,147,229,66,156,204,68,112,178,207,242,78,225,104,179,155,112,61,163,127,188,158,169,56,249,15,150,223,234,247,1,9,250,35,2,17,166,38,211,214,101,92,111,18,197,148,162,13,76,238,160,102,229,247,202,175,253,83,217,15,4,64,147,123,226,122,77,20,183,15,45,249,143,139,75,44,156,28,27,198,201,168,0,39,83,230,112,50,145,138,147,255,104,187,99,34,103,146,0,83,167,107,213,233,168,12,89,76,112,13,154,
+21,7,91,73,4,197,2,117,122,32,38,176,138,240,134,166,3,22,15,113,138,40,43,18,109,112,1,251,102,156,92,236,119,104,56,89,116,139,147,65,63,132,145,69,73,156,76,157,8,158,45,216,220,84,107,91,159,249,196,221,152,38,5,65,173,193,228,164,87,88,108,154,151,3,38,218,65,143,212,207,87,232,102,152,177,84,212,190,28,232,203,29,51,99,225,81,46,135,70,15,141,250,153,240,255,23,103,24,102,99,212,75,137,208,104,191,177,11,218,47,54,23,219,140,12,169,100,62,18,120,151,233,29,110,189,140,78,196,123,199,79,79,173,105,45,211,69,165,206,83,121,206,93,229,84,206,178,121,195,150,147,209,229,249,195,219,97,119,32,33,182,217,78,111,207,222,111,177,185,10,242,90,120,116,227,204,12,236,193,22,104,223,214,146,35,60,145,200,75,26,221,51,161,168,98,89,213,24,60,140,179,229,89,225,242,117,188,123,168,227,253,222,238,232,186,214,225,162,242,132,27,29,137,99,179,209,117,36,4,229,233,229,172,178,219,146,62,58,22,102,109,26,147,105,202,233,
+190,77,91,247,45,43,113,151,148,119,177,150,156,188,25,86,228,4,45,227,86,106,112,239,142,200,217,158,37,57,194,172,163,110,26,168,148,47,146,43,102,84,100,184,94,226,116,106,34,242,221,24,125,85,58,219,13,58,3,114,175,100,212,192,155,100,29,158,157,12,235,68,7,239,21,205,68,108,239,97,10,199,207,108,238,13,4,214,226,222,62,197,101,152,55,185,1,198,216,131,236,81,53,11,40,50,194,103,81,21,27,155,135,68,143,150,221,73,69,15,93,212,91,148,163,203,186,206,221,75,196,104,27,196,133,19,7,165,130,216,92,75,162,201,228,56,27,115,113,228,18,208,141,166,119,244,231,170,28,237,29,56,157,84,114,215,140,206,111,41,102,98,155,200,232,176,53,218,98,219,157,200,185,182,92,195,52,119,54,222,24,165,115,227,54,74,58,140,46,204,106,151,150,237,160,213,165,122,18,187,113,125,220,177,97,238,149,71,14,147,166,65,231,120,223,77,116,94,216,177,247,254,96,29,29,16,170,232,23,162,131,96,246,32,27,54,140,12,12,78,155,206,119,210,219,185,
+37,144,56,168,105,106,208,20,201,44,91,23,98,151,55,64,179,110,250,109,122,255,206,125,114,32,94,76,165,217,242,105,155,81,53,38,75,231,220,212,43,80,155,202,118,151,205,251,74,193,157,194,128,174,31,158,142,145,84,230,172,65,219,191,43,58,179,166,219,52,142,219,229,196,26,213,219,183,156,1,226,240,72,226,89,119,184,99,223,123,109,52,237,14,199,186,56,45,168,85,106,209,36,153,58,208,111,48,182,217,10,209,173,19,114,167,82,15,217,221,161,70,202,212,109,227,56,75,1,193,240,114,242,227,184,190,125,205,205,210,99,22,214,210,154,214,58,154,58,97,60,10,242,63,22,143,230,16,127,7,73,233,57,151,206,245,39,151,47,20,189,157,155,254,216,169,82,63,125,144,58,136,204,173,25,135,57,189,138,195,165,246,21,223,112,15,51,220,118,251,62,109,112,173,181,244,6,142,183,71,123,152,228,117,52,164,96,118,82,186,236,119,228,142,145,19,158,212,46,206,100,248,252,115,231,164,126,214,116,201,117,12,251,134,150,215,227,41,209,236,158,144,63,189,51,223,
+62,45,85,9,73,78,241,152,48,101,104,157,226,205,15,233,46,24,254,227,133,113,159,111,39,75,17,117,142,42,102,100,130,12,219,145,164,156,116,155,152,171,239,216,235,230,105,93,122,201,183,26,87,242,78,209,248,190,116,38,124,112,26,58,95,165,77,133,14,218,50,122,132,154,220,155,138,202,37,107,237,173,244,237,19,205,38,75,124,170,236,212,251,56,228,20,143,153,241,30,14,141,208,51,254,195,147,205,77,31,105,145,157,82,27,25,43,148,156,68,197,226,238,209,118,82,51,86,226,209,157,164,67,78,147,229,72,75,9,186,119,234,84,105,189,94,229,49,22,231,103,156,244,244,77,111,247,213,126,124,103,245,40,74,238,97,205,136,141,236,17,63,115,216,155,206,158,207,206,79,244,68,28,87,135,11,233,19,214,108,43,127,213,170,145,181,210,23,163,230,41,105,88,111,77,180,128,63,195,198,224,109,34,121,100,153,118,47,119,179,146,226,133,33,212,173,136,208,117,23,246,153,187,236,193,180,50,60,189,214,191,51,155,74,115,87,173,205,131,227,113,201,204,59,133,76,
+231,242,43,103,22,86,214,21,116,141,245,132,187,205,12,113,208,150,93,133,115,149,18,20,74,59,143,51,3,156,158,230,158,41,170,67,230,246,153,230,154,210,155,76,118,112,106,111,121,204,108,150,118,237,26,101,199,105,35,111,85,30,99,247,198,60,99,173,3,241,238,237,235,36,201,227,77,234,167,19,91,83,25,247,114,116,254,98,222,48,126,28,228,157,182,155,167,215,73,33,83,100,255,248,100,242,134,114,39,12,122,186,105,33,119,111,234,52,72,164,249,78,246,135,67,92,238,187,213,203,9,233,222,216,12,201,196,159,207,216,237,253,142,228,200,84,187,126,244,108,80,63,206,244,123,123,105,254,220,222,213,48,123,139,76,226,182,217,125,222,59,125,164,253,70,71,137,108,59,250,119,102,196,158,238,222,0,149,56,96,242,239,31,207,44,199,120,167,243,1,237,224,141,85,216,109,108,19,94,200,210,2,235,142,243,224,88,114,19,142,207,31,77,207,186,81,84,58,111,48,54,157,241,84,141,150,1,17,219,35,75,15,50,50,203,244,249,141,83,97,136,121,48,111,80,161,
+146,105,121,119,247,78,127,234,164,127,100,77,66,100,156,4,59,205,107,158,125,207,62,87,126,161,79,8,36,226,24,185,191,249,104,164,113,172,249,110,214,125,144,73,52,123,173,87,206,184,218,115,26,73,12,218,20,107,238,1,253,197,160,108,34,120,148,182,244,247,80,101,3,23,193,30,90,178,111,109,221,207,108,97,174,57,132,163,235,1,166,143,206,237,162,172,58,64,10,139,201,90,204,211,250,110,133,232,70,122,41,162,51,104,221,138,99,99,175,73,194,24,236,137,46,77,43,45,134,3,134,217,219,189,189,101,208,7,250,141,188,83,61,115,35,201,233,146,75,102,132,43,226,85,63,51,97,26,112,184,78,143,192,166,115,155,166,132,62,183,207,157,84,122,184,45,142,43,157,1,29,84,196,248,70,148,221,170,215,246,91,6,142,156,76,210,68,72,63,134,186,87,179,129,30,74,151,66,210,214,207,54,173,169,28,97,202,228,233,108,226,140,119,234,118,8,119,116,139,29,148,43,225,226,78,132,207,144,90,197,236,189,227,158,69,177,135,57,223,27,224,58,20,114,153,207,
+210,27,144,171,250,188,178,185,217,19,202,225,121,83,231,18,121,161,141,28,21,235,7,109,204,160,34,169,56,231,101,21,215,97,125,68,142,158,177,87,208,21,78,182,145,178,146,221,162,132,212,118,93,146,209,219,227,27,27,52,42,151,61,139,254,181,233,14,225,77,248,68,55,47,73,170,21,173,23,219,73,94,250,50,217,214,44,85,58,167,231,125,123,173,204,169,205,140,223,227,60,106,94,150,89,67,199,87,142,235,195,43,205,172,132,115,16,76,114,162,107,154,136,160,105,216,73,141,238,95,143,172,172,245,69,24,122,171,244,189,152,79,58,217,239,95,124,103,79,57,215,148,125,1,218,98,34,135,90,52,142,225,203,217,70,73,79,196,50,202,127,183,202,245,222,82,245,157,185,254,72,71,215,140,103,82,179,131,44,140,114,40,130,165,86,218,181,49,46,89,73,172,233,109,168,219,181,141,248,188,41,181,66,208,126,194,157,229,187,13,242,53,106,179,100,229,178,93,52,186,234,91,188,70,117,196,86,201,72,71,73,220,226,243,137,66,151,116,47,23,97,241,65,139,147,216,
+215,255,177,117,207,53,36,7,3,204,182,92,235,68,190,238,228,255,5,235,206,66,221,22,180,249,153,254,92,107,212,191,13,201,64,132,63,87,253,255,56,15,24,16,172,240,236,216,254,51,247,29,255,167,122,248,72,45,191,73,251,84,226,166,240,24,166,161,38,42,247,207,161,231,63,208,78,110,210,68,49,138,205,36,138,40,127,81,254,8,70,94,72,183,248,142,31,244,65,183,96,240,44,200,252,139,160,72,96,179,143,153,2,88,73,46,182,43,164,48,249,195,115,1,31,59,199,193,185,128,50,42,176,233,82,243,192,231,253,118,5,139,135,147,117,100,156,204,102,225,100,29,3,39,179,25,56,89,199,211,201,82,206,240,164,46,54,106,62,73,196,136,202,59,88,100,232,233,217,150,35,42,121,138,142,175,43,222,49,161,90,175,254,106,81,113,230,238,153,190,77,232,175,146,28,79,139,174,41,201,89,82,78,78,185,45,145,93,80,215,131,58,59,52,122,204,108,98,15,144,187,55,251,208,57,89,52,125,66,236,38,78,12,14,141,191,75,152,59,20,77,91,206,93,151,120,
+32,200,148,199,174,221,34,75,231,134,113,34,56,205,98,159,179,217,201,221,132,62,181,49,30,94,181,179,162,215,169,120,70,152,237,50,183,181,30,14,101,102,76,139,171,251,46,86,239,228,200,232,148,133,173,104,116,117,77,237,249,28,228,222,208,184,147,215,232,153,65,97,209,127,172,235,24,77,251,18,250,192,85,51,243,96,66,67,97,77,146,205,203,137,203,184,208,177,49,123,106,223,68,249,196,153,132,125,221,225,122,239,2,181,22,245,29,245,128,74,61,182,198,245,39,109,196,238,230,184,115,118,182,123,237,50,151,14,156,172,134,154,54,211,218,163,5,219,170,73,184,18,219,97,206,205,73,219,83,227,200,0,145,101,106,146,121,165,222,243,78,49,37,179,154,85,235,6,117,214,93,85,140,42,152,241,36,173,244,217,249,221,145,165,177,206,93,111,183,98,111,163,81,163,238,15,159,42,163,155,138,233,238,65,70,139,43,233,145,82,217,108,59,123,151,20,167,104,219,208,248,180,248,194,132,114,39,247,118,156,220,104,192,144,73,80,86,54,129,170,105,195,97,181,107,120,
+252,66,211,76,102,90,68,103,135,157,105,49,178,125,192,188,189,89,90,61,106,1,244,228,112,55,75,113,216,148,102,105,34,81,80,103,163,252,43,23,117,145,190,50,127,4,206,148,61,37,185,149,164,197,182,211,212,113,207,217,54,167,201,17,241,56,204,179,102,88,193,14,182,186,229,82,150,130,49,177,176,17,140,58,143,195,35,89,96,206,103,224,108,21,195,99,92,69,251,251,61,254,173,252,244,100,34,38,183,157,222,88,19,102,102,247,166,204,1,202,229,169,139,181,52,187,157,213,71,179,240,157,150,235,241,35,83,179,205,157,82,177,71,125,11,205,232,251,113,86,182,139,61,199,102,239,206,198,50,59,147,42,75,120,253,164,247,118,12,40,47,119,215,19,81,68,28,39,171,118,131,171,47,39,217,62,190,2,185,113,166,181,227,218,110,234,144,66,67,53,13,231,70,250,210,43,183,81,182,194,7,120,83,238,250,210,73,214,250,216,170,125,56,46,239,157,205,230,142,23,108,234,209,203,73,29,25,117,243,231,157,71,97,50,83,39,211,233,58,66,42,219,160,123,90,119,
+193,31,221,118,7,39,71,185,35,30,113,191,117,196,233,150,6,213,135,203,153,38,80,97,35,157,254,180,120,103,151,31,140,9,103,65,67,227,85,50,58,147,43,90,222,29,183,145,22,135,247,62,34,208,239,233,15,22,148,150,100,35,108,210,64,239,39,220,153,139,73,210,217,136,26,250,81,139,190,147,162,144,44,249,177,184,100,234,134,253,229,6,194,91,99,146,39,199,185,7,119,51,93,119,209,243,163,89,173,132,147,180,110,52,46,99,141,175,142,214,200,151,147,51,173,220,253,206,119,35,182,201,68,63,239,80,178,59,198,86,32,106,208,191,238,232,122,175,125,251,45,119,93,23,94,159,49,50,16,86,112,115,151,109,156,140,120,242,176,47,218,59,146,61,57,110,188,139,202,82,183,210,145,59,146,201,145,238,203,38,115,93,7,178,171,187,89,95,203,112,247,9,7,20,229,115,222,41,203,164,69,96,53,163,209,173,222,117,196,130,192,123,43,171,114,59,222,175,156,56,115,217,85,119,205,252,179,153,108,42,174,87,119,5,186,209,203,241,227,247,220,241,52,243,116,207,
+168,94,234,154,38,229,182,248,167,194,212,181,196,200,16,172,15,130,252,38,176,108,199,145,89,3,186,192,145,41,45,75,93,198,179,0,243,104,68,55,104,93,211,152,244,11,170,153,246,168,121,154,119,200,83,156,153,25,97,221,69,115,27,35,115,150,62,61,191,81,104,90,169,221,22,41,169,45,208,44,114,132,137,135,136,218,120,110,70,195,43,10,238,64,224,142,43,233,80,42,61,106,251,186,52,35,218,31,61,91,176,108,56,208,99,155,45,74,113,211,165,42,11,41,41,222,152,88,62,182,49,65,228,26,68,144,65,109,118,50,182,70,214,248,141,254,91,145,79,214,177,43,10,237,103,187,66,180,119,10,134,77,209,46,176,54,117,56,233,22,154,25,245,40,224,99,106,23,34,189,77,145,29,114,184,205,109,187,99,148,78,131,34,11,11,208,248,168,190,191,141,184,110,84,70,233,66,202,230,214,214,148,101,31,100,34,131,88,159,182,41,26,169,65,17,145,100,82,178,229,28,93,96,51,206,188,241,165,118,88,251,43,162,48,219,220,207,149,244,45,111,30,204,118,12,93,
+19,17,65,171,238,246,102,156,162,154,50,162,122,142,68,50,73,151,145,216,242,229,222,113,165,48,19,83,97,113,218,171,245,218,111,151,87,67,225,17,118,74,223,72,61,206,82,56,136,130,193,135,23,12,239,212,157,180,220,201,123,9,197,109,84,204,108,234,47,134,156,71,3,114,119,111,112,88,148,22,207,181,177,163,76,219,17,25,222,115,6,105,91,106,151,244,122,121,116,50,145,22,39,119,38,196,25,247,36,95,73,226,41,140,103,43,155,164,33,249,149,111,125,203,97,151,206,232,215,86,156,114,123,167,156,174,177,39,103,23,60,7,46,185,202,166,95,236,24,229,6,198,15,53,147,151,139,44,110,168,121,252,172,17,217,70,12,162,16,88,162,77,105,6,241,53,157,238,215,202,133,242,147,105,180,145,54,183,150,10,170,157,253,77,32,135,174,88,111,207,84,3,237,74,79,59,175,201,116,195,140,105,83,193,56,171,7,164,98,74,211,73,42,35,21,109,157,185,197,42,173,106,53,72,143,59,167,100,198,152,118,195,192,130,247,52,219,115,219,26,49,145,218,174,202,92,
+208,98,34,30,121,71,178,187,175,165,164,197,235,237,33,114,68,168,220,111,68,144,14,141,40,179,162,181,247,225,121,76,180,18,243,19,119,68,75,205,45,158,171,158,145,165,243,203,243,22,225,180,56,205,9,52,249,56,129,9,243,234,148,205,255,222,17,88,186,145,44,152,149,199,188,147,107,211,174,144,214,49,59,100,238,221,94,177,225,23,91,141,105,252,2,73,133,206,249,153,148,76,188,77,101,106,51,1,62,65,153,201,219,167,48,170,44,102,41,81,53,24,202,26,115,239,105,51,107,41,214,174,109,157,36,244,154,134,206,16,132,137,242,78,152,187,200,252,234,17,157,54,161,59,149,142,163,119,94,77,139,177,121,196,104,76,29,239,237,201,102,214,244,57,249,170,82,54,135,122,154,117,57,99,144,183,191,70,13,53,218,93,195,8,210,191,60,3,130,46,133,220,67,158,22,211,153,30,27,115,207,228,146,170,22,82,138,235,46,74,154,201,151,160,150,241,248,148,106,98,10,20,97,64,43,3,83,9,74,219,122,183,45,171,59,29,90,26,211,89,167,211,187,29,193,249,
+24,111,178,119,212,180,41,237,50,49,14,82,215,155,185,97,250,62,9,17,68,216,108,247,85,140,28,234,223,37,109,160,203,99,153,169,78,42,136,68,205,130,78,137,124,50,118,61,41,58,138,35,136,108,208,155,137,166,237,212,219,38,121,247,153,66,114,231,142,40,13,228,108,179,100,54,58,212,36,235,150,76,115,211,26,47,117,38,166,27,104,131,87,143,136,172,71,233,57,108,94,137,139,12,139,172,83,133,207,178,129,46,116,181,98,247,110,44,212,15,138,97,249,250,98,228,246,12,51,211,61,151,218,198,162,47,102,252,194,20,232,69,248,12,164,137,110,235,146,92,14,157,245,172,128,48,165,22,15,142,122,211,62,206,76,90,27,95,95,205,46,206,248,59,109,115,76,87,40,17,160,81,76,93,64,217,131,156,211,173,57,148,6,76,104,59,196,162,93,184,182,167,206,167,221,82,49,213,55,64,116,204,116,69,105,221,19,221,109,239,146,146,156,59,150,118,182,73,36,99,187,180,131,214,184,221,105,113,174,94,217,194,199,87,134,69,116,148,183,9,38,11,78,135,13,105,
+220,48,201,40,110,152,84,39,102,152,135,226,56,101,221,43,15,207,50,151,153,251,66,80,216,131,58,135,207,5,174,111,128,70,112,161,254,147,213,151,219,128,60,29,215,135,53,68,172,240,26,182,15,133,210,160,132,106,109,158,152,108,199,234,118,1,239,163,247,209,26,252,62,154,213,196,211,241,225,69,10,194,30,15,46,199,4,240,126,208,209,245,255,112,63,72,198,201,34,246,134,92,16,147,173,139,224,239,53,69,222,206,221,129,184,62,190,188,166,176,245,24,224,168,225,117,11,54,42,167,202,28,204,123,50,220,36,104,28,151,219,188,239,116,193,70,50,163,13,166,116,146,101,208,123,195,57,150,40,115,103,219,115,129,158,102,251,177,60,208,241,126,111,75,49,127,66,211,156,68,71,155,98,150,59,161,40,38,232,4,114,90,179,107,147,139,26,202,185,182,235,160,109,50,176,232,205,189,63,191,152,16,227,23,132,17,54,118,65,152,85,53,83,161,184,193,150,247,38,212,221,39,139,206,207,83,209,139,222,243,142,166,198,161,190,244,194,124,100,104,96,206,163,210,249,153,
+215,32,29,162,116,165,69,130,95,7,174,43,231,210,241,64,87,31,103,85,188,2,170,70,29,99,96,34,228,98,205,156,93,216,231,110,179,160,94,100,193,127,255,196,22,79,112,251,21,161,214,30,109,156,34,3,187,98,204,42,45,12,167,179,9,214,149,231,186,238,80,90,27,78,142,235,118,154,181,108,223,184,138,207,134,114,12,35,218,241,216,245,232,88,255,228,233,185,86,181,237,226,234,198,97,85,170,235,156,17,114,21,163,27,155,254,236,112,188,41,234,68,226,203,100,124,188,29,140,239,236,234,161,141,44,136,172,100,167,255,238,125,82,123,119,58,220,78,162,203,35,216,196,174,78,48,177,181,119,132,196,92,16,161,188,73,250,202,48,235,48,184,109,162,224,247,142,221,33,81,218,119,126,122,97,229,104,87,212,215,22,117,147,115,64,179,189,235,55,184,212,239,0,79,48,115,67,219,226,180,216,200,36,223,220,42,145,35,91,116,108,74,135,136,87,164,13,241,132,0,30,134,133,226,152,114,13,79,140,50,22,68,44,30,88,28,172,45,119,43,248,74,102,92,47,178,
+97,7,185,218,60,171,244,164,230,3,195,87,162,198,168,51,73,137,210,119,238,52,164,208,116,63,252,125,185,104,99,123,243,24,157,104,84,174,223,168,218,91,189,238,160,82,102,165,209,238,60,214,1,236,252,0,21,109,186,75,55,179,224,70,5,195,96,163,115,137,86,117,158,49,223,225,154,155,187,91,44,174,35,64,51,87,145,213,56,229,18,234,121,87,201,238,14,95,222,205,248,90,14,91,22,83,105,40,73,163,215,202,73,139,231,35,129,192,9,154,138,30,196,25,180,229,228,97,66,59,72,28,31,132,43,232,51,182,200,193,158,121,254,36,74,243,116,152,149,185,248,213,166,121,34,147,107,26,188,59,117,204,154,91,164,236,197,165,155,125,15,168,180,136,152,117,137,68,102,199,229,98,15,74,143,223,94,181,40,217,239,228,211,170,132,218,56,120,198,90,239,193,170,182,94,14,241,166,141,13,37,245,89,150,129,189,222,89,186,50,234,147,14,31,139,117,41,223,48,224,254,224,198,20,116,135,187,11,117,5,119,23,81,244,140,148,208,167,125,61,162,144,63,152,179,177,
+155,86,56,20,208,97,176,115,89,142,199,183,209,150,75,180,235,51,236,204,214,250,162,121,59,186,229,60,97,56,149,129,149,53,83,102,124,56,182,192,190,118,157,173,251,221,57,46,227,194,181,31,34,245,207,18,79,89,107,134,97,201,98,119,152,56,149,202,170,229,46,173,221,43,94,212,239,11,90,123,100,55,126,181,28,89,27,215,147,40,177,147,253,158,244,80,236,206,126,28,188,99,139,15,178,225,13,87,240,82,46,30,63,24,155,93,190,9,233,199,141,217,221,209,169,51,63,205,198,227,251,182,28,104,58,107,143,110,222,32,202,246,208,170,189,79,207,165,112,85,114,253,229,185,239,108,154,97,22,50,5,205,204,197,129,142,41,217,84,175,86,236,61,215,101,76,243,23,75,23,177,78,165,229,162,73,24,152,4,187,19,201,216,119,170,30,142,122,231,33,176,221,47,30,2,117,97,200,137,207,30,64,121,97,136,106,165,160,77,53,37,80,77,181,47,203,170,94,84,151,189,170,248,142,240,81,56,35,28,12,11,199,65,170,47,123,13,199,54,212,22,225,9,193,148,87,
+132,138,23,121,56,38,28,12,175,172,225,251,55,132,60,52,231,247,216,247,121,36,175,218,183,13,111,222,22,36,121,0,112,136,97,37,126,192,186,134,128,195,188,125,77,120,132,224,246,43,108,161,242,79,240,149,242,96,99,96,88,101,5,132,200,202,163,10,22,80,198,234,9,31,192,7,230,113,215,32,74,21,144,9,170,224,5,220,11,166,156,58,2,196,165,106,40,64,176,85,213,20,68,198,54,247,162,22,236,15,7,24,124,241,8,96,240,23,47,243,231,80,208,108,85,17,225,20,194,4,214,151,149,255,248,77,29,161,252,19,8,244,88,254,227,123,252,183,146,65,5,184,72,48,19,135,94,133,232,99,117,85,16,227,170,246,17,68,214,3,4,202,63,132,117,109,125,67,129,247,61,235,143,49,196,48,42,177,181,171,106,190,201,159,220,219,55,111,234,235,42,203,126,85,77,120,14,49,219,158,127,94,81,93,249,16,206,237,49,7,8,220,249,13,60,52,136,106,91,246,105,109,229,239,224,57,227,76,192,186,121,157,129,49,245,223,213,253,215,191,46,123,94,95,246,188,
+178,172,252,63,61,249,213,63,255,211,63,254,243,63,61,45,255,31,149,128,5,156,246,49,20,199,135,48,190,121,163,168,252,97,100,173,82,48,97,66,77,3,176,74,160,193,82,68,199,250,90,220,73,62,110,135,208,143,74,128,7,243,64,145,24,52,27,225,83,160,34,136,32,86,91,67,40,5,45,187,7,224,196,206,14,243,174,122,2,24,0,237,44,175,117,28,149,243,5,48,166,111,112,192,219,218,154,242,79,240,143,24,243,250,71,6,246,16,121,240,1,162,43,132,190,43,156,71,137,166,30,142,129,27,252,154,80,93,91,243,205,131,241,69,248,193,7,200,165,247,160,131,165,32,157,21,13,13,132,215,111,48,231,192,245,83,130,66,249,81,46,37,75,61,131,232,146,181,117,152,240,121,10,230,86,69,171,197,129,72,243,236,30,198,47,66,17,168,241,193,150,48,64,184,143,33,55,230,77,162,154,240,18,152,36,134,220,92,0,226,203,47,143,5,42,136,255,151,31,249,113,108,190,18,52,56,8,185,247,161,174,225,116,66,21,6,236,248,123,16,254,242,24,117,24,202,
+37,174,202,154,23,181,191,133,254,128,67,75,99,208,129,80,45,5,24,69,40,43,68,165,6,19,10,184,214,31,219,127,222,57,75,22,193,96,225,32,234,245,119,85,47,160,168,191,173,125,128,0,91,129,155,14,54,249,25,14,37,248,139,154,122,66,93,17,32,17,248,75,29,176,237,218,124,220,126,82,255,20,226,11,66,101,149,14,174,168,41,37,223,195,52,226,228,242,79,0,61,31,155,191,42,192,94,63,132,105,252,186,14,124,192,194,50,182,84,109,53,76,32,13,69,48,198,143,236,177,100,245,162,134,139,178,62,102,246,77,45,216,123,213,235,60,8,32,240,210,130,185,225,140,42,234,235,107,43,171,176,212,83,132,215,190,55,247,47,74,13,44,239,249,224,92,234,223,126,125,207,17,2,78,63,196,94,45,81,28,134,180,91,186,177,10,12,130,249,25,240,152,134,178,170,6,24,107,193,80,16,2,32,54,37,230,111,223,18,8,24,56,224,235,123,3,192,23,45,104,166,14,56,65,33,187,97,0,179,175,43,96,50,6,139,17,42,234,171,112,221,97,136,151,181,48,
+242,188,249,254,193,34,133,248,94,28,89,176,204,143,135,23,12,26,178,4,118,52,15,211,10,20,241,243,47,62,7,140,43,235,106,31,1,16,231,35,193,189,212,216,120,124,104,17,121,253,235,186,74,96,73,117,132,151,132,58,66,77,229,125,185,242,164,0,178,94,164,20,192,74,159,2,109,84,86,191,125,145,199,10,5,186,0,38,4,5,203,47,252,80,122,236,75,192,231,139,87,85,111,0,35,152,165,202,255,10,124,0,1,224,175,254,165,172,252,223,243,195,62,249,143,207,171,9,21,117,159,3,143,168,5,6,252,244,167,197,239,43,65,37,240,164,252,199,197,237,255,236,215,159,127,250,233,167,229,63,46,25,82,245,242,201,143,48,58,24,7,8,79,139,132,226,236,159,215,213,129,35,248,186,116,141,7,43,16,170,33,132,231,191,127,56,17,138,253,230,7,216,150,48,206,163,63,66,57,127,253,249,243,122,108,175,208,145,31,73,243,72,158,250,210,197,31,45,253,161,68,15,85,1,145,224,171,234,95,193,180,247,182,18,98,233,191,124,91,93,253,253,227,85,160,136,
+101,79,126,244,115,188,134,0,115,63,7,86,8,184,253,252,30,64,30,164,254,15,164,124,36,39,52,221,188,152,37,208,243,63,250,128,23,148,249,227,235,60,156,9,23,204,35,5,215,16,64,44,172,251,246,209,82,229,255,171,248,161,248,215,226,95,74,242,40,142,237,143,155,24,158,7,223,188,1,86,84,192,228,252,37,70,192,66,111,85,49,129,85,64,176,217,66,68,130,88,246,47,138,214,153,119,10,92,191,133,18,44,191,22,112,239,186,60,94,120,17,3,26,174,142,87,4,249,2,165,174,14,130,218,62,64,77,198,161,130,177,98,29,67,104,255,58,191,120,9,172,58,140,2,249,185,32,38,226,177,22,175,169,139,248,241,24,106,49,168,67,202,96,150,255,62,143,141,94,192,174,174,124,249,77,217,87,24,186,117,1,131,186,161,184,139,151,111,107,176,34,60,95,214,222,207,248,234,190,242,198,165,127,0,164,141,85,61,13,165,187,42,149,236,35,123,40,85,93,1,10,181,192,27,170,16,83,220,127,43,213,86,169,171,60,12,81,165,186,44,65,72,46,100,220,255,
+43,129,242,150,127,47,75,190,156,206,63,96,81,128,147,47,28,54,252,175,142,208,240,182,174,166,30,7,213,254,237,227,138,252,85,69,61,86,68,86,3,237,61,238,52,0,195,58,12,89,29,171,96,42,202,254,190,2,112,125,117,207,27,71,208,126,144,113,171,241,33,48,43,97,101,108,101,169,240,143,231,191,128,249,19,158,203,111,43,64,138,41,0,121,23,36,195,27,178,162,108,224,195,75,8,225,140,111,7,111,25,30,192,253,230,13,251,95,176,162,7,88,79,117,69,3,152,240,26,79,100,149,5,208,246,183,121,147,202,11,90,24,253,243,223,189,169,6,171,227,121,235,13,208,81,5,134,66,95,247,208,248,75,113,224,239,19,113,1,161,55,47,55,136,95,175,160,87,230,149,136,111,26,134,170,191,121,158,231,246,156,144,231,6,131,85,217,243,154,103,207,9,207,0,245,151,223,127,6,218,159,231,121,115,251,47,37,49,164,36,68,20,147,35,204,238,96,139,249,42,247,77,222,70,139,41,1,246,156,127,243,241,23,59,190,174,173,173,198,45,251,201,211,178,178,242,
+79,62,230,243,133,245,176,189,125,196,66,49,181,60,244,122,204,213,158,21,205,173,161,238,45,4,114,47,132,243,31,150,33,239,192,127,152,40,223,84,65,180,228,63,29,247,66,162,131,43,254,182,254,77,229,179,178,123,113,74,228,41,97,91,68,50,255,19,139,83,200,105,121,51,130,1,38,47,67,209,197,43,242,252,74,60,235,15,101,241,93,109,213,139,130,41,126,200,1,119,6,140,3,136,162,21,149,48,13,151,48,41,195,159,164,169,1,198,246,22,98,223,191,173,169,41,182,214,15,57,60,44,122,64,175,0,62,226,167,9,83,85,37,78,248,216,68,44,175,190,6,114,3,213,226,150,128,95,226,192,23,28,176,47,239,95,186,192,214,248,129,154,178,170,6,94,5,213,17,242,142,90,108,249,234,31,14,255,217,47,254,225,179,95,255,107,249,191,253,242,179,47,254,251,147,215,223,3,87,198,138,155,159,124,90,254,19,224,117,15,199,130,94,6,131,40,207,87,234,175,43,26,42,95,97,14,86,60,252,250,111,11,194,125,253,136,63,126,39,133,61,68,241,53,1,246,
+230,96,62,140,97,32,108,97,79,7,84,87,125,75,40,10,243,217,175,127,253,217,191,62,131,87,4,176,13,172,171,171,192,111,15,190,7,209,190,252,39,249,204,142,201,138,229,215,58,194,195,198,2,28,87,93,237,155,58,12,141,252,254,233,34,224,174,160,92,104,0,150,8,143,16,242,134,79,244,96,253,26,188,35,168,174,38,84,227,172,64,145,15,51,61,92,190,252,223,170,9,53,223,52,188,42,255,178,28,127,100,165,242,21,40,65,202,127,146,39,98,106,128,180,199,149,49,140,78,15,22,200,111,226,85,45,244,32,252,171,98,59,83,242,70,8,30,77,43,26,42,242,47,240,224,79,22,148,149,178,203,175,148,111,85,65,108,175,173,130,232,235,88,143,12,58,223,218,242,79,240,212,143,169,164,240,208,202,163,198,246,49,71,168,208,250,178,39,133,245,97,112,175,203,151,41,21,245,149,160,103,194,94,130,194,160,250,241,92,253,69,195,139,191,7,135,246,183,95,96,235,255,221,79,241,101,224,51,66,248,252,251,40,9,83,218,183,132,55,13,207,10,175,221,16,74,
+89,98,71,118,111,153,79,63,253,168,109,126,153,55,136,178,242,255,40,195,13,181,252,43,220,84,203,191,124,6,55,67,248,93,249,87,207,202,254,22,46,12,215,253,187,178,242,47,127,246,155,191,134,195,127,243,139,127,44,255,234,145,21,231,27,204,66,246,171,120,219,80,11,44,25,248,55,40,178,225,4,104,146,112,122,65,214,242,47,235,193,233,231,83,46,240,195,194,187,87,176,117,252,125,198,254,129,73,212,151,122,33,48,195,215,240,194,6,123,162,2,124,2,146,195,242,185,190,10,107,209,48,155,46,32,243,151,68,159,98,91,241,164,14,116,218,240,120,65,135,139,141,131,29,112,125,3,216,3,54,240,105,233,172,250,159,22,175,118,176,187,51,216,201,194,151,92,112,86,249,18,27,187,114,206,135,120,44,219,63,206,57,249,55,134,106,10,131,42,240,235,206,138,106,208,214,190,184,23,172,152,162,176,5,127,246,155,170,55,249,245,10,132,146,94,225,9,118,75,84,91,95,95,5,203,192,250,218,215,31,62,67,243,244,135,149,156,127,228,231,91,172,41,207,23,30,
+249,61,149,170,12,23,228,109,13,76,86,112,40,238,13,48,18,96,246,93,114,105,91,44,99,30,155,33,56,163,178,151,224,64,222,214,65,55,193,26,158,154,87,21,160,113,198,2,74,241,245,165,162,14,26,8,149,175,106,170,254,231,219,66,139,128,23,41,79,49,215,120,65,0,199,14,14,174,162,224,96,5,153,63,236,211,161,69,130,65,144,223,147,34,245,57,248,248,244,83,236,203,252,99,96,165,155,197,159,153,194,4,1,51,159,84,53,224,245,106,9,83,124,206,119,21,117,216,163,33,223,86,193,59,81,96,100,184,171,21,194,206,211,103,101,133,10,190,192,165,184,185,7,181,236,63,212,54,228,127,215,81,188,17,198,173,6,132,214,122,44,39,191,120,139,245,51,165,21,6,30,212,240,183,89,74,133,127,130,213,216,63,196,12,90,2,24,0,15,16,255,93,4,136,225,47,138,15,213,129,115,1,161,166,2,218,81,195,253,175,61,138,39,250,52,159,122,240,23,139,106,202,255,51,126,251,10,108,10,179,88,96,140,175,177,187,162,26,216,200,129,5,176,148,212,80,
+76,86,85,88,249,139,223,249,129,131,191,191,237,124,249,22,26,69,225,221,143,175,254,55,50,197,164,26,
diff --git a/uppsrc/ide/app.tpp/Contact$en-us.tpp b/uppsrc/ide/app.tpp/Contact$en-us.tpp
new file mode 100644
index 000000000..d9b73416f
--- /dev/null
+++ b/uppsrc/ide/app.tpp/Contact$en-us.tpp
@@ -0,0 +1,7 @@
+TITLE("Contact")
+COMPRESSED
+120,156,165,83,93,111,227,84,20,252,43,150,82,16,164,78,122,207,215,253,176,95,42,117,121,93,36,208,62,69,41,118,179,110,215,34,95,196,174,64,98,183,191,157,185,110,186,180,8,137,7,98,197,182,146,59,51,231,204,153,179,42,46,46,92,233,102,238,63,62,213,187,238,190,125,220,142,235,213,150,99,172,251,224,180,110,41,212,63,166,250,233,233,105,153,18,215,96,34,48,145,83,33,38,82,231,148,3,89,114,201,34,69,39,65,217,130,179,234,216,158,218,221,122,213,70,169,231,63,121,160,184,180,153,144,144,35,207,138,83,78,28,43,177,81,140,74,193,162,36,239,171,77,123,28,251,195,126,189,186,203,56,160,4,40,23,162,87,2,70,141,37,152,2,171,74,132,119,178,224,67,168,198,126,220,118,192,144,15,117,171,92,223,0,168,37,201,12,213,113,0,84,89,189,74,100,161,200,236,147,104,82,148,77,92,245,99,135,34,239,128,201,56,192,12,122,106,74,2,55,52,152,224,84,192,83,93,34,134,104,116,102,208,235,254,120,177,40,187,3,152,47,253,140,131,229,
+195,81,35,73,136,172,236,25,242,46,160,197,172,109,213,199,110,216,0,38,76,245,136,130,234,155,107,171,9,224,80,134,25,187,228,216,135,4,61,148,138,118,37,37,146,8,61,37,115,36,213,230,240,49,183,200,230,36,11,70,204,192,131,120,50,196,60,161,92,150,8,197,64,34,184,155,198,80,13,93,158,194,120,56,173,87,243,235,239,220,210,45,217,236,123,160,19,208,81,84,68,125,82,114,2,17,80,104,246,202,59,140,145,140,99,117,215,14,80,28,53,187,122,115,73,20,242,232,115,138,224,187,68,19,136,123,220,48,82,116,40,240,134,147,70,145,232,170,205,182,29,134,87,6,205,115,151,68,37,209,44,100,95,77,88,83,118,71,24,6,179,183,68,112,216,188,58,174,78,221,111,143,253,169,219,117,123,88,220,67,188,126,153,206,57,132,249,167,76,199,37,49,98,104,222,187,236,151,33,11,44,6,195,29,69,69,65,184,48,224,241,156,195,41,27,57,23,36,57,24,137,85,80,71,82,133,5,192,83,34,34,23,113,161,47,24,51,5,131,16,223,115,154,8,113,210,
+89,64,108,49,159,164,89,52,73,246,141,225,58,123,103,176,159,159,81,156,205,230,11,216,77,28,243,55,27,78,86,18,226,143,186,200,12,189,10,28,230,136,126,13,150,203,20,105,10,177,122,223,253,62,188,107,199,238,156,146,249,205,197,100,186,47,201,207,92,70,91,76,152,26,105,118,76,84,19,39,17,227,100,226,29,156,27,158,87,55,67,243,254,76,187,119,166,8,37,5,44,18,186,51,67,191,19,8,189,6,202,101,112,76,62,247,125,166,104,22,219,126,159,107,64,24,234,231,249,207,191,6,32,98,65,98,244,78,18,124,64,251,206,16,109,236,126,196,96,49,87,70,238,243,242,111,126,109,31,186,102,113,222,204,63,127,249,242,205,15,239,23,31,126,46,86,131,203,83,36,204,168,190,221,181,253,118,60,52,213,227,241,216,92,239,199,237,182,191,107,150,135,211,195,109,177,186,189,45,62,108,199,126,7,51,154,203,230,178,24,187,118,87,116,25,80,21,139,207,235,87,136,12,248,118,253,134,247,211,56,30,155,170,185,106,174,182,253,48,14,205,114,56,60,158,54,
+221,61,78,118,205,114,223,141,47,127,76,143,126,127,127,104,174,50,227,2,252,251,127,17,207,178,253,254,161,200,167,39,249,9,253,154,53,147,62,115,126,165,252,155,241,109,117,111,169,63,29,118,93,113,132,87,213,226,243,234,255,22,142,215,127,22,181,46,138,245,95,200,18,150,43,
+
diff --git a/uppsrc/ide/app.tpp/CrossComp$en-gb.tpp b/uppsrc/ide/app.tpp/CrossComp$en-gb.tpp
new file mode 100644
index 000000000..7d900f37c
--- /dev/null
+++ b/uppsrc/ide/app.tpp/CrossComp$en-gb.tpp
@@ -0,0 +1,15 @@
+TITLE("Using theIDE as a Cross Development Tool")
+COMPRESSED
+120,156,133,88,139,146,219,182,21,253,21,140,215,237,38,142,86,38,192,183,148,102,178,93,59,237,206,52,78,39,78,234,233,236,236,84,16,9,73,204,82,132,74,80,43,107,92,231,219,123,46,0,74,148,118,147,248,109,137,247,117,238,185,7,23,188,19,236,229,203,96,20,92,4,127,240,99,242,70,45,228,182,238,238,239,106,145,101,211,138,115,17,76,37,79,167,63,228,211,95,127,253,117,204,163,32,155,146,51,14,103,60,136,66,46,56,62,11,34,145,242,56,15,242,56,227,89,16,166,145,136,211,32,158,108,100,43,215,247,119,50,11,167,175,126,76,96,37,70,241,69,200,67,30,240,68,68,120,42,8,3,17,113,17,243,44,139,120,26,103,97,158,36,147,66,110,186,74,55,247,119,115,178,139,96,22,194,44,72,179,36,226,48,138,98,17,166,113,4,227,40,66,122,33,2,167,73,154,78,186,170,171,213,253,93,69,121,35,219,27,202,50,26,37,23,200,78,164,176,140,68,148,68,97,38,66,158,9,145,228,97,148,71,72,155,139,73,213,41,36,57,143,196,84,226,55,
+153,197,136,23,197,17,15,129,72,148,198,33,30,75,241,119,20,228,92,32,104,22,196,49,226,169,143,61,76,115,0,68,32,145,109,130,144,34,141,201,34,139,50,30,166,153,136,68,34,144,68,144,162,80,202,32,158,148,202,20,176,13,5,159,118,72,107,122,243,109,60,229,48,78,71,233,133,8,242,64,36,105,142,160,72,24,53,135,121,206,195,12,65,35,30,7,60,156,20,186,68,157,115,17,7,161,141,152,161,21,9,60,91,88,226,132,35,105,17,102,8,153,242,48,196,159,113,148,165,19,163,168,25,157,110,239,239,94,125,251,69,48,14,198,34,142,191,36,243,28,230,89,24,133,97,148,228,17,15,66,132,129,143,136,48,75,2,180,147,199,34,155,204,165,65,204,14,31,165,14,89,78,108,2,246,97,22,135,8,157,224,15,244,21,5,134,192,71,228,81,22,134,89,48,41,106,105,140,7,137,0,122,69,69,114,62,226,252,34,37,108,227,80,68,57,129,19,10,128,44,146,56,231,64,57,78,162,64,76,90,245,223,109,213,170,181,106,0,115,5,122,76,251,22,121,46,
+34,25,71,69,49,226,2,100,140,147,36,32,188,98,16,66,132,49,0,15,120,22,33,35,252,68,155,59,207,198,249,177,134,112,196,195,139,92,68,33,50,201,163,8,8,192,1,207,57,231,65,134,159,168,12,184,88,126,112,79,44,31,222,153,71,35,30,93,164,160,49,58,149,71,20,62,15,9,63,1,248,69,18,196,232,131,112,230,130,80,23,47,129,59,23,25,253,182,200,243,120,196,49,15,72,145,199,49,234,14,1,181,200,80,123,12,236,67,75,113,158,102,147,119,106,103,222,200,78,121,194,188,186,121,233,152,198,147,17,79,46,2,178,143,179,28,13,228,17,225,23,70,81,46,242,48,140,69,30,135,73,0,28,141,27,104,50,166,145,178,227,120,112,146,142,120,138,225,66,173,113,140,234,173,25,42,79,57,165,34,178,60,33,20,188,147,217,85,93,53,148,7,152,49,117,100,120,117,243,21,231,41,57,202,48,52,89,150,4,97,14,48,128,65,16,131,233,16,132,12,141,70,159,5,198,128,20,161,120,144,75,53,187,242,211,106,83,32,6,198,97,156,17,111,97,137,
+212,145,4,252,228,65,144,224,147,44,195,52,77,150,114,115,66,64,17,140,68,0,22,65,127,98,12,37,98,129,126,65,78,90,2,101,64,7,32,69,121,236,24,56,187,106,148,233,84,137,230,199,129,45,91,240,145,224,192,14,252,139,227,44,138,18,228,139,216,41,73,19,181,16,3,28,167,225,228,159,18,243,242,233,63,159,255,244,246,221,213,207,239,217,157,9,166,175,66,246,179,169,154,37,235,86,234,246,205,91,38,13,147,236,166,213,198,176,55,234,81,213,122,67,140,101,63,105,93,255,249,158,12,66,214,255,253,215,61,235,182,109,67,198,122,177,96,107,217,236,241,15,114,196,22,74,226,43,101,252,255,201,113,213,177,66,54,108,174,216,214,168,210,197,41,108,156,114,16,167,67,28,182,91,85,197,138,30,51,108,211,2,220,82,45,208,167,146,65,161,84,219,200,26,161,30,240,81,173,204,152,177,159,86,149,97,248,165,204,70,21,149,172,235,61,89,46,182,228,70,53,108,173,31,41,65,185,217,212,85,33,73,136,173,211,199,74,111,13,30,245,177,225,124,219,148,
+170,101,26,217,182,12,249,206,46,13,146,241,201,143,207,75,255,176,146,29,91,232,186,214,59,27,92,50,146,192,182,178,74,79,69,175,244,142,204,145,73,95,255,174,234,86,204,108,81,216,211,50,236,151,122,219,177,149,180,217,194,82,149,0,204,62,126,44,84,181,10,54,123,194,208,229,185,147,123,11,177,44,86,149,178,150,214,162,147,230,1,57,53,37,129,238,13,54,64,186,154,215,202,102,213,85,117,229,50,67,50,149,233,200,178,208,107,224,2,200,76,245,168,216,124,91,213,229,51,109,68,30,127,215,59,128,214,90,107,89,173,145,132,69,106,93,53,213,250,224,117,177,208,109,71,102,133,110,240,176,33,88,42,32,211,18,200,120,122,169,58,128,246,40,235,170,180,145,171,218,246,230,9,208,183,0,1,200,32,23,212,208,104,144,30,254,129,189,37,153,197,159,114,223,85,117,205,116,131,126,238,116,251,224,160,246,81,135,20,92,180,122,205,146,64,224,209,157,108,203,33,123,230,170,144,212,44,0,230,133,26,0,150,232,1,92,160,83,166,3,154,48,97,117,53,111,
+101,187,103,139,109,83,56,50,33,41,86,173,55,181,85,118,164,135,42,123,126,29,114,56,43,11,51,199,49,99,0,23,8,54,76,173,55,221,158,121,41,177,201,195,199,122,15,202,154,115,56,222,119,178,237,14,163,138,6,23,222,11,107,212,174,119,129,178,222,216,137,177,40,125,221,200,181,250,166,31,204,62,10,217,26,85,171,162,163,12,102,151,54,135,217,229,192,197,237,122,13,14,194,57,80,29,90,174,36,161,133,201,114,161,1,137,150,165,245,103,41,123,12,57,222,110,54,150,188,4,201,32,147,18,224,22,56,185,105,78,143,194,67,17,23,22,76,89,195,113,185,39,20,13,73,2,218,96,205,73,171,205,164,71,130,32,97,159,62,209,118,16,124,141,179,101,250,13,86,148,100,202,220,183,107,89,53,96,222,162,90,30,158,167,31,179,23,248,249,23,250,115,122,255,249,243,57,184,55,181,54,14,153,86,65,18,154,97,217,61,85,58,8,175,57,82,208,151,212,99,227,5,110,161,33,38,214,209,217,131,3,72,12,130,20,122,217,84,86,12,241,40,225,74,79,22,
+186,37,124,152,217,55,157,252,136,184,31,188,54,208,151,221,78,59,28,152,156,235,199,129,182,128,255,132,29,186,94,158,164,253,132,120,226,64,60,128,4,253,117,233,96,90,159,169,231,137,234,209,92,61,83,182,5,203,233,167,79,232,132,150,54,194,174,183,37,245,107,172,30,108,77,49,30,143,217,45,68,107,185,4,174,46,161,49,125,236,209,182,117,205,29,143,7,217,238,172,18,66,234,237,23,126,228,221,147,165,110,168,87,125,141,155,77,171,55,45,177,216,217,27,199,69,184,182,142,122,102,162,252,117,63,33,234,163,164,105,38,146,67,93,6,18,113,96,43,123,251,254,134,121,181,199,39,181,108,150,91,71,145,119,16,40,251,196,236,242,237,71,85,108,59,133,145,250,77,237,112,36,176,98,83,14,226,88,29,147,143,18,146,56,119,195,115,144,178,129,118,13,36,121,208,166,126,34,236,24,120,200,102,47,190,199,57,115,61,123,193,174,177,242,124,117,205,102,159,156,5,187,250,159,207,242,139,217,139,98,242,26,10,190,220,189,158,87,141,251,87,40,102,87,116,66,
+141,213,71,20,116,117,195,74,60,98,85,233,53,70,171,107,113,80,207,174,22,79,63,125,77,70,178,150,128,20,45,154,189,248,114,234,195,205,252,196,29,242,186,209,155,253,63,170,185,233,83,11,158,73,141,81,110,27,155,195,49,146,42,219,78,27,224,249,26,191,85,153,97,99,28,203,103,50,25,4,63,169,117,243,123,190,194,63,244,53,251,124,80,15,63,27,116,56,131,82,109,79,98,70,3,82,130,6,14,250,203,94,25,170,230,81,63,224,139,249,222,211,196,181,4,15,60,168,189,65,156,7,58,108,91,250,190,192,190,242,208,51,238,232,148,4,129,246,154,222,147,93,171,234,218,105,71,143,217,129,114,61,213,220,250,192,236,149,65,117,180,57,184,83,198,141,194,128,143,118,26,182,152,165,141,196,188,82,64,55,185,21,84,239,96,109,172,94,72,58,184,215,36,93,164,72,195,13,11,51,68,121,184,184,255,214,91,175,79,138,14,111,205,72,153,219,141,110,105,40,247,122,139,157,107,215,156,184,50,118,57,28,140,46,69,179,79,62,221,23,85,243,88,181,186,161,
+127,143,159,118,196,137,164,159,104,42,175,215,185,235,127,253,248,140,179,94,207,62,220,190,195,3,253,72,250,109,201,97,99,39,131,253,237,230,198,111,45,128,146,210,118,235,152,183,71,242,181,182,91,137,151,188,147,113,114,254,186,253,89,186,94,58,164,61,143,213,71,194,210,46,111,110,67,60,158,186,253,46,124,56,93,134,143,31,143,214,195,243,150,136,190,253,16,69,67,50,226,80,160,181,181,181,71,10,22,41,122,228,59,226,175,63,237,73,196,173,19,252,162,222,207,46,91,173,59,240,244,24,98,118,233,38,4,31,162,151,43,43,254,242,228,208,28,60,108,119,113,119,188,185,70,211,198,238,216,74,161,223,227,44,108,74,31,251,153,114,80,5,141,130,187,182,153,94,182,15,232,208,209,119,92,157,49,103,180,138,192,241,41,196,215,181,209,182,118,163,65,107,47,247,142,34,179,203,225,5,97,234,189,184,115,220,13,170,220,118,154,18,30,207,37,193,96,195,218,25,57,182,127,192,69,172,140,143,18,228,37,1,167,14,24,74,79,185,142,24,172,190,118,19,181,72,
+245,171,226,83,54,14,50,26,156,14,84,234,70,186,221,218,13,171,31,222,243,243,160,63,242,89,200,126,220,54,77,175,36,246,106,7,53,119,236,125,58,50,232,42,105,13,74,68,18,91,70,183,125,55,190,72,71,73,135,93,87,17,126,190,7,244,212,92,182,126,210,233,182,97,75,5,130,197,239,236,83,182,15,180,46,234,222,113,63,154,78,69,41,4,92,98,39,131,10,82,172,99,94,142,249,222,93,127,126,14,20,146,124,182,91,168,89,7,7,208,87,186,107,117,184,211,184,139,161,181,130,13,188,66,114,71,238,224,249,254,176,22,20,210,168,17,171,22,148,219,249,204,245,210,235,246,102,85,14,148,121,174,177,176,246,59,72,207,107,127,143,181,31,15,253,123,237,118,244,27,168,166,85,135,133,44,156,60,48,246,182,109,117,123,92,130,202,202,108,106,185,119,87,12,178,157,235,174,211,212,157,166,180,139,202,53,238,223,202,217,248,227,166,214,133,93,209,207,143,147,90,45,160,45,154,224,152,111,225,164,233,187,105,205,189,158,155,163,128,53,216,143,100,221,47,119,
+232,101,59,188,173,29,152,22,141,217,53,238,76,8,242,157,189,213,82,167,222,163,225,56,49,78,137,118,252,218,184,175,251,132,177,235,31,235,243,81,119,116,129,61,43,160,173,150,171,179,10,250,85,206,223,167,9,19,230,151,111,91,174,169,202,195,208,99,121,67,95,157,42,194,195,202,223,104,45,210,150,189,13,104,105,140,46,42,215,153,147,229,245,201,27,136,51,20,98,246,3,145,253,59,187,96,2,77,251,191,183,86,144,124,225,31,164,125,107,114,38,79,183,76,174,177,69,27,92,184,41,207,29,137,187,207,104,67,46,108,18,118,142,94,123,125,99,199,151,7,191,157,221,135,126,84,170,134,46,245,29,38,201,94,238,49,73,3,13,102,246,229,13,57,119,62,233,100,216,110,74,203,30,163,143,247,152,2,18,191,36,106,123,82,250,83,240,176,191,150,90,57,141,242,83,237,132,212,90,18,243,15,199,192,147,84,221,134,109,29,225,206,239,175,71,184,130,54,101,127,229,167,125,255,164,110,202,113,215,86,29,238,19,80,32,12,52,214,5,221,186,21,3,3,118,178,
+59,157,83,53,97,183,135,53,196,189,155,56,188,236,57,237,202,7,247,18,9,161,30,26,189,67,165,75,53,124,169,101,236,199,205,111,188,104,25,174,58,79,95,253,244,179,94,161,22,251,45,70,206,173,30,46,29,58,119,15,155,220,233,11,153,195,235,32,194,96,173,168,43,149,89,219,247,48,254,86,239,142,164,195,146,98,205,13,205,202,240,18,246,168,252,164,152,195,229,228,100,85,163,151,117,40,97,187,25,116,184,31,22,251,214,107,177,165,116,0,188,254,5,65,123,144,239,255,15,183,208,82,180,
+
diff --git a/uppsrc/ide/app.tpp/Files$en-us.tpp b/uppsrc/ide/app.tpp/Files$en-us.tpp
new file mode 100644
index 000000000..ee483855f
--- /dev/null
+++ b/uppsrc/ide/app.tpp/Files$en-us.tpp
@@ -0,0 +1,11 @@
+TITLE("TheIDE and Ultimate++ File Types")
+COMPRESSED
+120,156,133,86,13,111,219,200,17,253,43,11,56,109,239,28,89,224,126,241,67,194,1,119,112,114,61,3,135,36,72,28,20,133,161,171,215,212,90,218,134,34,89,238,50,182,47,72,126,123,223,44,41,137,86,3,52,70,104,131,156,55,31,111,222,204,238,13,123,241,34,153,37,103,201,255,249,183,120,101,239,77,95,133,213,77,37,242,124,233,178,68,45,13,207,150,111,139,229,183,111,223,230,69,33,150,240,196,225,137,39,74,114,193,185,74,18,37,50,174,139,164,208,57,207,19,153,41,161,179,68,47,90,211,153,221,234,198,228,114,121,254,62,5,74,204,244,153,228,146,39,60,21,10,86,137,76,132,226,66,243,60,87,60,211,185,44,210,116,81,154,54,184,166,94,221,220,17,14,40,9,84,146,229,169,226,192,40,45,100,166,21,176,74,113,142,191,185,206,210,44,91,4,23,42,11,12,79,179,165,81,98,121,9,160,154,113,121,134,236,68,6,168,18,42,85,50,23,146,231,66,164,133,84,133,66,218,92,44,92,176,72,242,14,24,194,1,166,17,79,105,197,37,216,80,153,
+150,176,202,240,91,37,5,23,8,154,39,90,35,158,125,220,83,68,236,0,150,206,210,51,145,105,50,206,85,206,101,150,11,37,82,129,240,73,134,18,41,182,94,172,173,47,1,147,130,47,3,18,90,94,254,172,151,28,224,108,150,157,137,164,72,68,154,21,136,135,84,81,174,44,10,46,115,196,83,92,39,92,46,202,102,77,37,10,157,72,10,152,163,7,41,28,71,66,116,202,145,174,144,57,34,102,92,74,60,181,202,179,133,183,212,133,208,116,171,155,243,159,127,72,230,201,92,104,253,35,208,5,208,185,84,82,170,180,80,60,145,8,2,23,138,184,74,19,180,145,107,145,47,238,140,71,196,160,136,213,203,151,156,103,212,122,82,17,120,151,185,150,8,158,226,129,150,162,66,9,110,68,161,114,41,243,100,81,86,198,251,9,65,231,84,37,231,51,206,207,50,226,85,75,161,10,98,71,10,16,44,82,93,112,48,172,83,149,136,69,103,255,211,187,206,238,108,13,138,29,130,47,247,221,25,69,72,175,200,157,152,113,1,25,234,52,77,136,47,13,45,8,169,65,120,194,
+115,133,132,240,131,6,135,81,135,81,27,164,11,46,73,24,133,80,18,121,20,74,129,2,224,121,193,57,79,114,252,160,46,16,19,133,193,33,223,81,77,28,114,82,103,25,100,139,254,20,138,130,22,146,120,19,96,93,164,137,6,253,98,64,9,34,91,188,0,221,92,228,244,159,8,231,122,198,33,127,228,197,181,70,173,18,12,139,28,245,106,80,46,163,164,121,150,47,222,216,7,255,202,4,59,170,228,252,242,69,36,61,157,241,244,44,33,180,206,11,116,141,43,98,76,42,85,136,66,74,45,10,45,211,4,204,249,97,116,9,74,243,19,103,111,116,145,205,120,134,65,66,117,90,163,222,8,66,173,25,167,52,68,94,164,84,247,232,226,246,162,114,53,229,0,49,44,135,254,159,31,4,144,99,64,242,60,77,100,1,30,80,126,162,33,109,204,126,142,198,162,175,2,186,167,225,47,63,153,141,189,189,24,39,243,203,191,190,254,229,245,155,139,143,31,216,141,79,150,63,209,66,184,222,218,171,87,175,153,169,215,236,99,21,220,14,85,223,190,188,125,201,126,117,149,101,
+215,79,173,245,127,93,145,177,96,167,191,111,206,7,163,64,70,172,179,101,179,169,221,159,118,205,238,158,70,175,171,197,4,195,190,124,193,158,145,11,172,152,236,143,24,255,92,176,121,217,182,51,60,75,122,60,62,210,115,128,224,219,106,177,96,3,154,194,120,246,224,194,150,133,173,245,150,97,238,109,237,177,160,60,51,157,157,198,54,158,249,166,239,74,203,238,35,232,144,11,187,140,101,221,245,174,90,219,206,207,15,238,41,139,45,2,111,219,246,24,241,55,107,96,53,248,152,159,64,89,219,53,159,221,218,50,211,135,6,124,185,146,109,7,243,181,109,109,189,182,117,249,196,130,245,1,200,143,17,57,182,193,227,45,104,14,13,235,81,3,232,163,144,204,213,62,0,206,154,251,248,138,94,176,18,35,143,82,77,136,25,176,178,169,131,129,29,240,187,182,66,135,216,125,95,151,180,160,17,242,222,213,142,254,244,243,105,69,174,156,150,115,189,117,126,112,69,205,98,206,159,80,70,109,152,242,54,67,177,129,245,117,229,62,17,187,155,190,50,221,216,171,135,173,43,183,
+108,231,54,219,192,238,44,67,58,37,124,184,26,85,161,55,172,114,119,157,233,158,224,165,243,33,170,202,126,198,10,233,77,85,61,49,91,185,157,171,145,127,212,8,196,253,201,118,179,33,87,214,212,49,47,83,61,152,39,63,124,139,169,53,119,255,182,229,192,195,124,172,163,65,154,62,70,27,74,106,40,145,103,64,178,68,226,134,120,49,48,1,183,129,160,206,15,172,62,53,61,56,174,89,139,42,119,205,186,135,73,100,209,84,238,207,8,98,180,230,135,170,134,244,34,204,29,18,59,212,107,31,109,217,7,115,7,15,84,40,232,177,123,176,103,117,19,192,222,189,237,32,9,128,238,187,102,199,26,160,246,194,154,54,172,43,143,237,250,135,171,215,205,3,53,105,170,229,103,230,149,121,58,218,255,110,80,80,56,168,117,80,11,171,226,91,79,197,219,249,102,206,214,40,175,217,156,200,100,87,29,221,92,237,32,210,83,47,174,140,83,134,70,14,153,119,6,114,237,152,35,219,231,190,194,68,111,157,169,125,53,48,57,204,225,40,97,87,111,88,152,124,68,110,62,116,
+120,235,105,38,136,215,253,176,80,91,63,155,206,53,61,72,55,245,166,255,159,120,189,159,80,246,161,236,92,27,166,137,238,108,48,183,23,174,134,92,118,49,216,177,166,7,183,222,216,192,232,30,64,168,184,71,96,54,50,70,239,221,166,38,105,186,186,172,250,53,37,253,217,121,104,24,29,105,209,20,8,218,140,211,119,240,128,252,201,238,245,135,75,54,188,59,73,182,157,208,243,174,107,162,168,247,227,12,211,175,95,191,191,102,129,125,27,203,161,187,206,200,37,169,119,24,64,232,170,233,235,216,143,3,113,254,100,231,74,141,157,155,170,201,206,253,100,39,218,121,143,211,33,46,145,168,97,124,242,147,157,50,140,221,164,14,108,168,249,202,77,23,11,173,227,33,45,218,196,189,31,38,125,32,110,152,115,223,236,44,155,3,73,43,41,218,254,224,127,140,124,239,251,219,246,93,219,248,231,237,141,145,124,185,61,198,194,129,108,232,46,4,126,183,118,103,78,133,58,217,132,36,171,245,222,122,28,131,253,46,62,188,55,109,91,185,210,12,128,184,219,143,223,198,8,241,
+45,117,117,236,232,48,193,97,90,51,228,102,42,63,108,116,124,216,145,108,99,38,150,132,221,151,161,239,70,51,154,163,96,234,81,163,84,58,49,142,37,97,45,17,69,124,28,226,59,234,169,137,27,126,202,201,229,219,119,255,188,122,243,247,239,237,245,61,241,135,163,2,181,225,136,36,87,247,77,116,62,202,227,59,254,110,47,222,253,254,203,213,155,163,219,203,83,39,246,17,58,173,205,105,62,191,124,188,254,237,237,251,15,147,69,228,176,244,65,62,78,198,109,211,77,100,125,62,209,243,137,176,143,68,174,113,223,44,113,75,118,246,100,77,127,79,230,83,235,169,235,40,249,44,129,228,101,178,229,203,63,158,233,169,143,135,226,79,251,49,220,123,58,209,59,187,66,147,106,3,213,238,122,31,79,57,218,244,158,94,152,241,3,106,220,231,113,223,208,173,128,64,195,202,199,182,65,31,118,160,107,51,189,11,221,254,205,31,32,77,183,49,116,246,118,68,230,113,46,195,179,236,94,77,216,24,175,62,240,127,184,249,28,87,17,187,110,90,87,70,113,111,186,166,111,145,
+10,44,214,118,0,76,73,165,9,13,100,60,146,190,191,81,13,181,81,252,163,255,103,169,65,90,115,55,201,237,168,59,55,132,138,216,105,168,131,14,97,56,201,207,98,173,198,243,63,130,73,150,113,83,248,241,44,24,146,139,85,12,71,108,188,121,29,101,196,86,255,5,226,180,179,156,
+
diff --git a/uppsrc/ide/app.tpp/Flags$en-us.tpp b/uppsrc/ide/app.tpp/Flags$en-us.tpp
new file mode 100644
index 000000000..b3f28e708
--- /dev/null
+++ b/uppsrc/ide/app.tpp/Flags$en-us.tpp
@@ -0,0 +1,9 @@
+TITLE("Build flags")
+COMPRESSED
+120,156,141,86,13,111,26,71,16,253,43,43,225,84,182,131,233,206,126,220,238,129,42,213,193,56,65,2,219,50,118,82,21,209,112,192,26,159,114,220,209,251,200,71,163,228,183,247,45,224,64,93,18,199,200,96,150,121,111,230,189,153,89,60,20,236,224,128,215,121,141,63,241,211,60,115,119,81,149,148,163,97,34,172,109,197,134,171,86,68,166,117,25,182,190,126,253,218,8,67,209,242,84,4,42,226,74,146,32,82,156,43,97,72,135,60,212,150,44,151,70,9,109,184,110,46,163,60,90,140,134,145,149,173,227,235,0,40,81,215,53,73,146,56,5,66,33,138,75,46,20,9,77,214,42,50,218,202,48,8,154,211,104,89,198,89,58,26,78,60,206,39,147,128,113,99,3,69,0,41,45,164,209,10,96,165,136,240,55,105,19,24,211,44,227,50,113,0,81,96,90,145,18,173,182,71,170,122,80,67,121,194,0,170,132,10,148,180,66,146,21,34,8,165,10,21,234,38,209,140,75,135,42,39,192,120,156,135,105,36,84,90,145,132,33,202,104,137,48,131,87,197,67,18,200,106,
+185,214,72,232,62,62,184,228,13,242,184,0,233,132,209,62,218,42,75,210,88,161,68,32,80,0,55,80,233,179,235,230,204,21,83,224,164,160,86,137,146,90,237,223,117,139,0,54,117,83,19,60,228,34,48,33,18,162,88,8,150,97,72,210,34,161,34,205,73,54,167,217,204,139,20,154,203,85,70,139,62,4,96,94,121,162,3,66,193,66,90,164,52,36,37,158,181,178,166,89,56,223,137,50,203,71,195,227,223,15,121,131,55,132,214,71,30,30,2,110,165,146,82,5,161,34,46,145,6,28,202,251,21,112,244,146,180,176,205,73,84,32,103,169,188,179,43,87,201,15,18,140,151,86,75,164,14,240,132,166,66,160,132,55,34,84,86,74,203,155,211,36,42,138,29,131,142,189,72,162,58,81,205,120,95,181,20,42,244,230,72,1,131,69,160,67,130,195,58,80,92,52,115,247,119,21,231,110,225,82,88,28,99,54,90,15,237,217,204,33,138,89,207,161,168,147,192,36,234,32,224,222,47,141,105,16,82,195,112,78,86,161,34,60,208,226,114,51,138,147,173,6,89,39,89,11,
+133,146,168,36,84,10,14,128,128,66,34,226,22,15,40,131,47,171,217,32,148,176,18,177,78,191,134,171,58,169,154,193,12,163,83,161,242,233,67,233,253,19,176,95,4,92,163,15,98,13,23,222,117,113,0,223,73,88,255,187,114,158,116,157,176,12,40,145,180,134,110,9,171,133,133,118,13,239,229,106,190,201,216,230,133,251,80,156,69,165,219,12,204,113,251,96,61,105,20,212,41,168,113,143,215,54,68,3,73,121,255,164,82,161,8,165,212,34,212,50,224,240,177,88,239,178,7,251,125,90,237,226,55,18,83,39,131,205,130,86,173,161,126,5,131,114,67,190,20,97,195,192,187,176,33,25,159,36,113,234,235,192,100,180,214,195,112,220,126,78,100,60,145,197,194,88,27,112,25,194,12,120,192,53,38,29,183,129,69,163,209,103,129,53,240,215,193,244,93,52,119,227,147,205,170,126,126,251,229,89,231,226,228,118,192,134,133,104,177,246,248,249,248,57,123,81,197,201,140,221,37,209,188,248,101,52,44,100,139,245,163,56,101,211,44,189,139,231,21,166,24,87,195,246,99,222,
+98,120,97,159,63,35,65,216,52,218,16,243,135,199,108,248,140,243,19,206,89,255,102,52,106,54,87,135,27,234,5,180,196,168,225,62,119,209,204,205,88,180,92,38,241,116,197,219,120,8,221,226,95,222,118,31,19,224,232,9,208,89,175,183,5,221,68,249,220,149,44,46,88,99,150,36,191,54,138,172,49,250,242,101,91,252,195,11,148,94,86,229,178,42,217,194,149,247,217,108,175,72,69,16,169,195,191,30,39,236,188,184,125,233,83,254,246,56,103,153,177,137,99,232,220,59,72,253,16,151,247,108,230,38,213,156,189,119,121,225,157,204,238,240,225,36,143,242,216,21,94,201,94,230,241,219,126,247,162,219,63,237,237,164,232,199,105,188,136,146,13,93,156,222,101,249,98,221,156,241,9,14,151,46,157,21,12,239,162,105,89,33,108,226,173,115,121,157,85,5,222,38,159,88,92,178,226,62,171,224,231,50,207,222,199,179,85,145,142,165,213,98,130,210,254,67,8,13,171,44,115,151,255,160,196,243,219,222,110,125,231,85,178,91,220,62,224,224,213,233,117,231,108,7,115,149,
+187,59,151,179,217,167,52,90,196,211,173,49,236,195,189,75,87,38,198,233,124,47,211,229,14,75,15,113,44,205,210,241,201,194,79,238,102,234,11,22,21,80,28,229,232,195,150,248,240,97,38,142,26,172,187,192,76,225,108,93,214,190,52,47,122,221,155,63,119,50,221,22,142,77,146,184,252,103,109,239,222,202,6,29,177,131,232,166,69,153,87,211,178,192,66,45,150,113,2,181,112,183,2,143,15,100,135,241,194,119,3,69,156,95,177,165,203,87,61,72,167,174,142,4,37,52,161,103,213,114,153,229,37,68,160,49,203,28,203,124,133,59,58,174,22,138,181,175,110,139,163,239,206,246,85,18,149,158,110,255,238,6,126,119,213,163,218,223,116,47,164,216,46,210,155,56,149,98,207,182,245,186,23,183,127,108,195,96,127,245,113,79,216,249,117,167,243,98,112,182,13,60,207,157,195,193,158,208,193,101,239,244,186,59,216,134,14,178,4,253,42,190,43,238,220,107,194,180,149,46,95,96,47,210,57,43,239,221,195,204,179,67,111,26,90,59,99,147,79,223,14,215,75,126,244,83,
+70,244,7,109,67,219,106,250,241,52,207,138,236,174,100,175,99,191,77,155,155,211,52,232,255,82,0,181,79,34,109,131,239,185,249,218,237,45,16,111,182,19,131,161,142,253,172,78,177,195,11,252,63,194,14,165,96,89,206,2,117,180,239,6,109,183,119,187,248,152,73,138,241,201,100,67,180,7,221,121,221,30,191,61,189,238,239,211,128,129,104,119,54,18,16,178,162,133,205,249,247,104,250,221,171,193,83,60,62,230,73,162,193,43,249,20,15,66,126,130,70,61,77,163,126,68,211,189,184,233,236,124,213,116,211,210,109,122,186,51,170,163,127,1,214,167,76,35,
+
diff --git a/uppsrc/ide/app.tpp/GPL$en-us.tpp b/uppsrc/ide/app.tpp/GPL$en-us.tpp
new file mode 100644
index 000000000..440e2f79c
--- /dev/null
+++ b/uppsrc/ide/app.tpp/GPL$en-us.tpp
@@ -0,0 +1,32 @@
+TITLE("GPL")
+COMPRESSED
+120,156,205,92,251,115,219,200,145,254,87,166,214,123,183,146,3,203,4,248,150,146,84,100,175,156,85,202,107,187,36,57,41,151,75,21,129,228,72,68,12,2,12,6,144,204,186,187,252,237,247,117,247,204,96,192,135,189,169,251,229,178,217,181,37,206,163,167,159,95,247,244,240,179,250,241,199,94,212,123,214,251,206,255,78,127,214,247,105,147,215,183,159,243,100,50,57,203,198,189,193,89,26,143,207,222,79,207,254,245,175,127,157,76,167,201,25,86,138,177,82,220,27,244,227,36,142,7,189,222,32,25,199,195,105,111,58,156,196,147,94,127,60,72,134,227,222,240,116,157,86,233,234,246,115,58,233,159,61,191,26,97,86,130,89,253,184,31,247,226,81,50,192,168,94,191,151,12,226,100,24,79,38,131,120,60,156,244,167,163,209,233,60,93,215,89,89,220,126,158,209,60,204,234,71,195,103,189,241,100,52,136,49,103,48,76,250,227,225,0,115,7,131,56,198,223,227,225,120,52,30,159,214,89,157,107,204,137,71,227,179,116,144,156,189,198,196,65,52,122,6,226,146,49,102,14,
+146,193,104,208,159,36,253,120,146,36,163,105,127,48,29,128,234,56,57,205,106,13,26,103,152,66,211,48,107,136,237,6,195,65,220,7,51,6,227,97,31,163,198,248,115,208,155,198,9,246,156,244,134,67,108,167,191,58,14,17,115,48,109,132,205,146,241,144,6,79,6,147,184,63,158,36,131,100,148,96,251,222,24,39,164,189,135,167,11,109,230,152,214,79,226,179,26,4,157,189,254,211,240,44,198,228,49,24,147,244,166,189,100,52,158,98,63,144,138,211,246,167,211,184,63,193,126,131,120,216,139,251,167,243,114,65,39,76,134,189,62,109,56,193,156,17,22,102,126,12,71,49,200,77,250,19,236,56,142,251,125,252,119,56,152,140,79,141,38,33,212,101,117,251,249,249,159,142,122,39,189,147,100,56,60,198,236,105,20,247,158,77,250,131,126,127,48,154,14,226,94,31,187,96,141,1,49,107,212,131,24,227,97,50,57,157,165,6,91,214,3,226,234,235,223,197,241,152,68,223,163,169,96,124,127,50,236,99,251,17,254,3,153,226,140,125,112,39,153,14,38,253,254,164,119,58,
+207,83,99,2,22,61,167,115,198,113,20,199,207,198,196,217,97,63,25,76,137,63,253,4,44,78,70,195,105,12,30,15,71,131,94,114,90,233,127,54,89,165,87,186,0,147,51,236,126,230,228,99,181,144,126,69,203,37,81,156,64,15,135,163,81,143,56,54,132,50,36,253,33,88,222,139,39,3,16,132,127,32,226,218,42,34,43,7,41,70,220,143,226,254,179,105,50,232,131,142,233,96,0,30,96,126,60,141,227,184,55,193,63,56,23,56,195,170,17,67,127,173,58,197,131,40,30,60,27,67,111,33,161,233,128,54,157,246,137,113,9,248,158,140,122,67,8,32,145,89,9,177,59,249,17,12,143,147,9,253,75,44,143,135,81,60,124,214,7,93,241,112,136,179,246,193,226,100,130,243,14,193,243,62,235,116,60,158,156,190,211,79,230,231,180,214,86,79,158,191,254,145,185,62,138,226,209,179,30,205,30,78,166,16,91,60,32,142,245,7,131,105,50,237,247,135,201,116,216,31,245,192,57,35,182,75,83,201,128,216,248,236,18,227,40,30,195,146,112,186,225,16,231,229,73,56,
+235,56,38,50,146,201,116,68,231,182,75,220,189,200,179,130,104,128,54,156,137,2,60,247,26,48,137,6,207,38,147,81,175,63,5,31,112,252,222,16,202,13,227,159,64,176,144,107,2,205,39,235,159,127,73,31,244,221,11,107,154,255,245,247,255,249,143,139,119,47,62,94,171,207,166,119,246,135,231,87,191,131,173,168,63,191,251,168,254,124,241,238,226,234,252,173,250,240,241,213,219,203,215,10,255,94,188,187,190,248,207,91,30,247,82,253,85,87,6,14,65,37,145,250,75,83,104,21,195,46,228,67,37,127,188,84,175,203,245,166,202,30,150,181,58,122,125,140,1,147,105,196,195,212,155,74,107,117,93,222,215,79,105,165,213,155,178,41,22,41,121,151,72,93,22,243,19,55,125,56,85,55,122,181,206,181,250,144,167,115,29,169,235,6,82,84,253,126,47,82,175,74,83,211,248,95,207,149,234,193,219,197,119,47,224,26,198,74,125,188,62,151,249,196,102,117,241,168,171,77,9,234,50,163,214,186,90,101,117,173,23,170,46,213,28,164,169,180,88,168,69,102,234,42,155,53,
+88,24,99,103,32,99,69,31,102,218,168,242,94,213,75,76,204,179,185,46,140,86,139,114,222,144,242,71,10,195,213,124,153,22,15,89,241,160,178,154,86,47,202,90,165,121,94,62,233,133,61,192,31,216,83,190,188,26,168,15,149,78,87,179,92,7,132,221,44,181,91,215,168,251,178,82,43,28,72,25,199,18,250,23,94,41,123,40,132,220,58,253,130,95,62,165,27,181,41,155,74,221,131,127,139,114,69,159,152,37,143,199,73,152,32,156,180,62,81,234,213,6,135,40,234,42,53,160,182,198,94,44,80,93,232,42,205,213,135,102,134,173,213,91,123,44,16,159,21,181,46,22,178,213,67,3,179,196,207,250,251,91,209,103,158,230,187,23,208,169,82,173,136,82,211,96,32,109,235,15,132,77,120,52,29,21,108,2,149,70,53,6,42,4,98,111,136,201,7,136,75,215,235,156,100,65,43,19,135,88,38,250,160,2,221,253,100,2,38,22,124,160,180,216,168,18,147,42,181,174,202,7,184,28,245,180,44,105,233,166,94,150,149,1,163,86,208,11,26,217,24,145,39,104,58,186,
+46,87,218,78,59,180,89,231,116,243,18,234,3,14,206,54,158,223,111,179,89,149,86,155,131,124,47,76,173,211,197,201,177,82,159,202,70,205,211,130,79,187,81,66,12,115,223,82,108,32,196,178,60,9,244,231,111,75,93,168,39,48,120,173,211,47,196,149,142,44,34,250,136,8,171,244,189,174,42,58,21,86,180,162,140,88,87,215,21,200,192,65,223,99,151,253,4,154,29,45,12,101,155,214,68,161,90,166,143,34,233,64,79,2,147,106,45,169,67,159,58,178,90,84,61,136,74,176,157,65,29,30,177,181,202,238,121,233,167,204,44,143,163,118,171,74,207,117,246,72,139,52,213,156,150,94,64,64,21,243,237,65,215,108,134,118,34,212,23,63,6,83,105,140,213,217,142,86,98,58,148,80,129,198,185,80,73,139,20,170,208,79,66,175,99,255,153,232,146,91,238,75,81,62,249,117,23,37,173,105,104,101,240,217,132,66,186,41,105,133,90,207,107,145,38,251,66,195,194,41,116,192,82,248,118,48,108,78,58,101,100,23,240,100,150,45,72,117,201,121,17,79,117,193,182,111,
+247,146,149,136,126,82,112,243,69,62,42,73,56,21,89,114,197,231,148,81,39,228,108,204,246,46,176,113,147,35,158,177,51,212,85,157,226,220,24,177,198,135,217,44,203,179,58,179,142,137,86,182,140,221,43,216,144,161,17,81,100,7,175,202,69,118,79,202,28,114,228,13,62,215,95,83,114,234,209,55,87,53,205,124,169,82,39,0,176,108,169,217,22,241,83,157,241,193,217,147,168,123,141,133,120,187,6,222,225,33,179,218,8,93,201,176,84,1,30,145,183,105,153,209,213,220,19,49,61,158,187,165,220,152,178,97,171,139,188,226,5,202,38,135,246,122,136,117,206,161,32,158,14,179,132,130,96,204,202,169,6,66,15,57,38,94,85,212,7,127,203,156,70,116,12,91,239,211,25,24,67,189,84,245,19,36,92,235,181,57,85,71,241,49,199,48,9,175,93,25,144,174,30,37,199,96,35,140,223,42,77,16,198,158,150,25,120,75,172,50,252,97,174,31,96,251,28,29,13,71,116,27,30,163,80,50,88,243,37,71,41,22,106,184,95,72,252,121,110,192,47,146,140,78,73,126,
+236,97,201,39,219,35,209,234,68,29,14,38,102,192,166,234,204,192,169,33,243,95,187,200,221,144,58,155,26,211,140,151,140,184,220,162,196,252,138,130,213,166,117,34,29,63,3,185,92,118,53,148,230,241,33,50,241,213,6,110,158,118,209,185,145,128,177,6,62,198,71,132,45,28,125,20,171,2,133,2,185,86,130,32,230,201,233,138,120,66,11,4,104,199,18,162,201,138,52,143,68,238,24,70,129,8,140,0,16,88,113,200,173,202,69,51,23,50,56,208,144,148,161,172,180,0,252,118,78,42,64,210,8,214,114,49,235,238,39,140,88,55,53,135,161,142,250,188,161,97,249,38,226,205,66,31,70,164,213,75,0,17,68,122,236,9,116,64,60,173,17,110,152,11,150,59,107,250,152,92,6,233,33,57,96,246,47,143,101,182,96,58,22,228,66,43,57,13,130,157,83,15,138,162,176,217,180,187,33,31,38,43,22,217,99,182,104,136,40,85,206,88,190,178,137,135,63,17,185,92,13,93,157,179,17,114,176,90,182,203,224,79,196,42,93,35,146,18,86,32,151,10,221,32,181,129,
+184,89,72,204,249,85,186,32,236,163,230,185,78,171,128,223,178,23,91,229,204,67,174,133,232,168,85,49,82,80,166,156,98,1,126,79,2,240,3,83,134,117,39,91,208,109,77,250,224,13,155,131,89,137,147,138,111,165,181,201,128,112,146,192,134,156,238,139,246,205,5,65,220,151,4,25,195,213,67,236,120,53,252,62,16,191,82,55,23,87,191,94,171,243,119,63,171,215,239,223,253,124,121,115,249,254,221,181,122,243,254,10,63,126,248,116,249,238,207,145,250,249,242,250,230,234,242,213,71,250,136,7,254,250,254,231,203,55,151,175,207,233,23,178,78,134,108,136,9,64,42,167,62,63,255,29,114,91,213,187,61,121,241,223,12,206,246,160,49,171,204,44,34,156,87,144,210,83,89,125,177,254,133,224,39,132,13,230,16,63,41,172,175,9,196,123,128,212,58,175,101,153,83,192,50,233,198,162,233,21,96,46,100,213,122,159,133,56,1,158,39,28,119,208,124,63,114,97,76,169,213,221,15,31,132,192,187,31,0,217,53,24,29,9,32,242,7,224,40,19,156,130,232,23,255,153,
+98,54,159,134,114,237,133,179,67,191,158,90,105,196,79,165,51,62,118,240,17,173,66,43,131,220,236,17,50,134,102,242,50,114,128,246,208,121,250,116,42,156,207,29,231,95,138,214,102,76,29,184,1,66,100,174,101,165,51,140,112,39,181,46,43,86,36,198,46,145,35,200,103,50,116,38,138,28,161,210,25,231,204,61,6,88,144,55,34,142,136,20,115,88,121,131,28,145,96,240,47,240,181,112,41,247,96,123,228,39,208,134,156,53,204,243,134,178,6,218,162,108,200,104,0,164,237,199,133,151,22,56,25,110,127,247,3,33,222,11,138,15,214,200,216,109,166,139,5,224,7,91,156,193,12,4,38,12,220,226,144,58,71,8,121,20,104,82,90,206,19,178,251,109,182,70,254,141,76,187,131,212,91,229,62,19,55,206,176,176,169,77,198,238,4,65,27,171,59,133,74,231,156,128,84,77,177,35,12,235,248,29,198,210,139,200,66,70,94,13,174,26,30,166,92,109,79,113,164,148,5,193,254,123,222,144,164,205,113,134,93,116,86,115,244,85,7,117,81,29,193,197,234,53,129,190,
+130,169,131,55,36,226,102,26,9,2,59,69,156,115,15,197,199,39,148,67,56,38,138,218,85,13,225,125,90,203,208,46,46,182,249,173,22,165,118,193,102,203,95,12,85,76,206,130,193,84,186,249,237,217,117,107,82,156,184,181,192,62,53,29,204,79,186,157,21,108,89,43,196,157,6,136,16,102,139,192,162,3,88,78,12,91,103,243,166,108,76,46,219,195,95,113,244,128,142,227,55,107,114,18,8,105,56,26,195,19,75,101,56,42,176,80,235,181,236,41,230,121,154,173,192,43,80,237,48,199,153,250,162,245,154,76,135,244,194,193,76,153,102,92,140,36,4,70,249,123,199,139,74,94,74,163,211,153,209,5,118,161,232,137,179,181,75,211,24,70,179,109,246,26,64,144,46,239,160,30,124,20,231,20,253,62,121,9,153,11,114,108,71,239,24,149,23,154,164,99,140,169,45,158,130,211,94,110,12,12,40,119,186,207,46,192,229,148,169,197,137,169,195,190,88,37,181,184,181,92,91,191,68,28,240,48,45,192,129,20,244,191,186,66,130,195,242,135,180,43,9,181,203,130,80,222,
+70,14,94,237,87,42,231,140,183,156,100,189,108,56,72,175,228,12,7,77,43,178,129,125,87,151,57,110,116,125,170,141,30,251,34,213,181,61,113,12,113,195,224,247,169,110,10,224,12,205,214,162,71,114,10,163,3,80,17,6,139,12,193,217,115,39,61,182,140,33,132,51,79,27,35,9,144,199,184,247,89,46,1,123,14,25,176,0,112,108,114,21,78,81,13,121,108,246,13,206,140,88,38,226,187,100,182,243,100,11,178,16,171,170,50,234,228,16,89,179,93,178,88,193,137,69,126,167,128,163,96,159,53,79,155,182,103,228,127,202,156,63,97,204,88,213,45,166,160,223,25,137,177,116,196,109,207,234,196,78,115,56,91,40,239,41,149,235,0,192,148,144,137,236,144,18,51,156,250,83,28,100,83,206,170,5,175,64,106,117,8,126,56,188,113,136,11,115,112,193,38,32,94,32,14,110,20,80,64,70,197,192,228,11,169,66,113,142,67,181,184,42,165,64,71,62,235,137,234,60,112,223,65,146,43,220,36,69,230,15,33,191,138,66,184,243,241,100,75,172,159,193,66,140,108,109,
+72,150,50,90,181,64,84,175,200,227,112,150,75,229,32,10,31,21,201,4,64,77,252,98,81,148,13,188,19,213,60,109,176,103,139,249,13,30,211,131,190,195,25,219,17,33,112,100,93,145,67,126,94,45,172,121,144,124,236,224,227,182,254,194,69,67,118,3,65,2,162,59,25,131,151,86,199,130,108,64,214,121,238,34,33,45,165,56,83,47,213,99,166,159,14,248,81,130,65,23,95,231,154,29,218,41,133,233,78,20,175,141,206,239,93,17,213,241,155,10,196,20,45,25,20,120,73,11,147,165,180,209,101,111,36,222,236,112,148,247,248,130,175,96,22,173,200,182,22,58,57,222,118,239,174,248,227,239,110,140,45,51,218,16,228,21,147,55,111,205,66,114,231,140,96,5,62,79,145,181,42,163,109,245,136,57,68,217,47,79,177,184,234,144,57,90,55,10,66,103,68,71,106,202,2,171,113,129,154,80,86,197,240,179,133,48,52,216,222,143,9,118,54,86,115,87,96,244,35,165,139,53,169,125,40,33,217,129,192,19,155,103,68,53,57,174,199,183,231,164,130,175,39,159,237,102,
+203,1,113,181,38,53,91,91,83,41,189,169,15,77,128,230,174,130,101,49,155,93,14,167,194,226,90,36,23,202,204,183,195,12,251,214,16,187,218,48,38,107,184,220,181,44,14,123,160,200,214,180,219,42,142,164,161,22,208,91,156,141,132,229,43,21,250,157,232,73,180,149,221,198,225,213,134,131,133,148,111,240,11,206,145,229,88,149,126,72,171,5,226,1,239,142,73,234,137,162,121,91,225,11,117,174,161,180,190,14,235,33,124,199,80,123,194,45,215,56,50,17,182,10,74,154,140,128,77,183,254,133,97,146,92,86,116,133,83,88,210,165,122,129,113,103,10,50,91,114,142,210,110,37,153,148,254,170,43,201,213,93,17,80,10,92,84,127,201,247,178,62,200,221,152,154,156,74,49,46,147,51,123,101,184,195,129,203,130,50,154,76,46,181,86,228,254,210,135,7,226,160,219,196,37,91,124,42,226,209,94,179,223,6,111,236,53,249,151,223,80,168,99,250,57,85,143,101,222,172,36,94,35,72,148,21,50,58,235,224,219,211,10,152,110,93,213,172,114,206,49,160,174,141,126,156,
+12,29,136,126,59,152,173,255,189,140,96,251,92,219,71,162,16,39,123,59,4,149,28,147,47,40,103,255,160,90,145,187,0,128,128,231,77,205,14,138,64,221,55,16,152,33,8,6,26,18,1,98,135,112,24,188,7,149,4,173,17,74,137,6,108,249,38,4,59,159,35,128,175,9,117,64,235,189,212,232,119,185,230,32,89,73,113,157,35,232,10,214,5,16,118,247,130,66,191,120,214,54,245,137,172,211,112,102,255,157,50,200,129,163,177,6,88,233,206,177,82,185,74,171,12,230,210,184,226,87,91,16,165,176,37,104,238,12,236,140,190,133,232,118,79,153,122,139,100,164,31,169,199,52,207,100,7,176,52,135,183,175,185,236,168,213,70,167,21,223,99,181,121,77,11,178,54,145,205,1,44,10,43,232,186,79,74,241,133,3,250,114,251,231,18,18,10,167,186,114,40,222,242,47,212,237,136,195,185,229,255,46,199,219,72,191,45,157,142,44,4,53,254,127,145,193,252,160,166,101,5,177,66,188,75,144,56,51,206,181,222,94,82,177,237,251,185,3,39,39,208,195,165,191,52,7,
+105,133,120,67,254,145,175,184,165,98,113,207,197,210,130,160,43,249,88,100,137,59,21,24,87,217,232,208,20,130,181,239,219,51,159,209,129,38,171,101,84,11,0,31,42,169,61,169,235,102,230,226,201,76,152,191,23,7,117,42,12,247,173,199,145,98,158,80,197,23,166,34,159,149,143,195,52,136,47,233,165,60,221,205,252,192,81,190,50,126,195,105,71,72,190,148,19,189,18,134,187,203,150,174,104,176,67,23,126,143,77,26,74,190,178,54,239,65,230,152,55,134,77,39,53,166,156,103,174,118,7,67,72,73,253,245,125,86,100,82,88,166,196,205,142,23,207,93,101,107,185,115,95,132,241,143,136,203,108,73,143,65,20,93,11,228,121,26,194,144,246,68,56,229,47,16,255,35,137,128,145,162,89,107,150,187,118,248,56,218,57,79,104,59,124,235,73,113,198,150,14,233,40,124,109,234,107,80,30,43,135,211,142,168,86,32,149,77,187,50,120,52,147,4,134,228,116,220,218,193,42,253,7,199,236,21,116,154,177,238,145,156,144,40,254,2,69,214,185,0,29,67,62,254,216,157,
+16,81,173,146,44,216,108,76,13,32,200,213,47,242,194,221,243,83,146,101,40,40,49,10,98,154,253,86,46,19,72,173,125,114,157,188,203,189,29,144,112,191,131,61,130,189,8,190,5,150,65,23,87,182,156,199,70,192,169,216,124,206,132,216,126,22,70,222,169,189,178,103,221,88,75,227,12,35,102,63,139,82,1,184,105,6,219,221,5,118,116,209,65,121,6,186,188,24,62,104,56,135,48,123,33,107,199,121,210,61,13,97,239,230,97,185,149,80,183,181,216,213,26,25,89,208,147,19,44,178,85,191,10,152,113,8,114,12,66,200,33,235,83,125,74,10,70,72,52,249,150,64,240,114,136,132,186,80,68,116,153,14,168,191,174,169,38,205,153,155,69,10,206,251,119,210,195,115,50,72,4,193,21,166,49,110,122,98,188,89,30,220,254,27,187,99,97,186,110,19,45,229,43,180,180,161,200,81,219,160,71,65,39,35,225,118,224,241,62,178,188,165,58,166,19,100,231,187,50,239,136,165,106,198,204,112,189,9,44,114,242,214,187,75,182,215,147,174,235,35,171,218,38,38,79,24,
+27,23,139,142,210,41,190,97,177,4,32,255,164,251,63,252,255,190,201,197,247,228,89,138,204,245,144,60,135,78,158,78,95,194,252,151,116,119,93,111,165,65,38,163,114,170,239,76,161,57,182,127,133,125,180,231,9,161,111,182,5,186,247,125,160,34,131,20,156,187,215,224,182,210,120,88,90,84,136,170,205,246,109,143,52,53,81,218,157,186,212,176,226,136,183,204,102,89,45,87,15,121,250,228,27,32,108,182,186,123,30,89,7,49,169,164,123,253,153,43,125,18,225,29,36,191,117,25,113,100,11,96,135,51,4,41,39,209,229,236,220,171,146,236,159,218,114,116,71,240,53,131,98,186,219,231,226,142,237,223,250,119,46,63,133,226,150,252,45,38,110,101,86,62,165,220,209,136,17,105,4,95,30,213,217,74,91,88,241,173,156,226,59,108,168,195,102,145,45,83,179,102,66,113,206,217,173,119,136,254,70,94,62,145,70,156,157,174,137,110,199,132,163,11,126,128,61,89,237,59,135,246,48,210,181,166,88,71,150,33,202,216,26,234,125,83,217,251,128,160,159,199,30,172,189,35,
+184,251,169,205,124,173,111,182,190,130,181,29,188,88,242,213,222,137,234,218,151,237,0,18,240,133,52,27,255,157,147,192,90,99,181,23,103,129,55,223,186,224,56,36,187,49,201,238,242,222,66,7,42,255,192,154,253,245,7,5,150,170,86,255,104,22,15,92,112,20,24,20,100,204,246,42,31,72,151,162,152,118,131,238,173,148,221,37,9,213,151,212,145,220,225,175,50,219,238,233,230,26,211,104,115,28,133,10,203,248,155,185,203,234,65,26,117,228,186,141,102,27,75,21,144,38,99,30,164,240,126,99,239,233,143,29,18,160,134,75,88,84,109,147,10,191,197,78,177,134,111,26,173,217,35,220,80,117,150,246,245,218,117,120,174,84,229,108,239,25,87,221,130,91,137,210,162,125,67,61,82,80,58,147,173,154,28,22,173,229,70,76,238,101,16,131,30,44,114,221,227,226,217,190,219,134,73,13,1,51,184,9,166,89,56,177,35,196,77,160,174,7,44,210,54,83,168,157,62,176,116,171,41,4,54,219,228,2,21,165,109,87,85,229,6,169,200,230,238,5,119,106,4,54,31,128,
+15,183,13,196,38,200,186,228,118,167,210,95,35,218,91,162,5,66,200,156,90,95,248,110,193,255,132,60,149,161,10,14,226,139,140,90,50,24,219,121,75,218,0,178,28,127,103,224,18,225,115,169,156,133,129,146,135,205,216,113,194,123,87,20,245,124,197,138,165,252,13,242,247,193,196,173,91,172,78,5,13,127,93,234,156,160,187,228,222,212,212,88,136,225,106,6,146,34,102,119,35,146,205,155,60,133,143,206,170,121,179,50,236,239,197,13,206,210,188,117,254,58,92,62,108,15,150,154,170,187,17,114,131,130,219,148,189,227,41,203,99,141,10,183,53,187,39,237,84,12,215,77,197,78,111,79,201,16,82,107,172,202,241,79,226,18,130,142,31,211,54,165,208,85,5,244,120,99,139,127,92,109,116,173,147,174,212,200,156,203,234,141,187,221,98,216,34,35,207,186,155,47,83,155,80,209,89,3,10,221,205,166,141,109,196,130,135,202,174,88,47,183,122,165,187,226,151,156,35,106,139,197,25,217,5,185,25,129,10,107,105,110,113,166,177,230,75,6,98,159,82,191,242,137,117,73,
+77,242,109,27,212,3,117,197,192,230,197,37,217,109,124,29,224,137,238,86,42,190,119,165,70,203,29,146,56,65,175,44,104,135,197,218,148,136,251,67,109,4,40,11,169,222,27,182,89,238,10,154,7,41,163,159,116,102,107,192,205,218,95,120,115,3,219,203,69,89,136,0,22,8,88,11,110,249,229,160,170,204,146,53,136,144,166,237,90,238,56,56,75,171,163,175,245,84,150,72,185,123,242,125,37,214,71,218,224,41,94,122,89,102,243,221,84,236,102,203,162,66,21,230,230,68,34,155,246,164,139,11,110,49,123,178,25,235,12,76,209,143,50,114,166,119,3,155,132,101,83,239,120,242,3,81,114,34,81,114,183,50,109,187,118,154,54,160,7,57,67,219,120,66,130,114,157,148,156,171,85,228,242,108,250,60,235,216,199,108,211,222,222,133,133,4,113,241,45,198,217,233,213,34,159,202,217,160,233,208,177,39,158,112,75,192,98,33,133,17,82,19,40,196,131,166,225,235,37,247,21,116,142,24,52,16,33,44,218,251,70,113,227,254,40,109,63,101,103,106,231,129,135,84,157,10,
+198,16,171,146,209,139,99,132,56,151,198,216,13,244,130,34,106,97,13,62,149,224,28,208,143,116,162,132,141,211,141,144,156,53,32,17,158,0,122,235,234,159,246,122,117,86,46,118,111,16,15,136,122,42,13,118,135,159,51,48,251,92,219,74,165,31,51,190,185,22,61,160,38,245,71,121,131,227,251,30,14,188,52,16,92,65,120,153,172,16,127,226,204,215,116,224,206,26,156,221,65,131,129,26,50,138,16,56,144,89,103,85,230,128,42,21,199,12,217,187,157,33,207,96,136,66,32,92,42,45,98,194,66,67,239,114,246,251,210,207,197,91,248,166,87,185,220,129,118,22,187,190,159,65,189,93,154,164,73,85,98,42,160,146,148,161,6,13,88,64,218,224,70,20,205,106,166,171,182,193,215,131,107,170,72,221,115,141,97,107,236,78,86,35,254,54,232,105,180,161,252,238,7,242,43,212,24,87,185,37,168,131,176,243,220,193,183,183,180,247,3,65,77,120,43,39,178,198,231,124,163,35,171,172,92,184,233,236,229,4,222,246,74,30,82,143,221,211,251,139,28,97,195,230,187,76,
+136,60,108,131,99,116,25,134,155,66,169,242,191,65,141,211,242,81,175,219,25,214,187,61,113,160,213,181,20,7,102,197,160,100,167,115,135,27,18,197,181,119,94,98,216,123,206,142,233,111,129,121,209,70,190,84,39,219,212,221,208,227,30,76,80,218,208,38,251,22,146,250,0,227,67,113,232,31,191,115,254,173,237,14,13,59,227,103,59,229,74,147,33,26,9,46,190,124,106,124,35,187,125,154,67,241,145,101,225,172,19,134,176,104,105,161,23,1,15,101,154,27,129,32,154,159,208,88,85,20,196,1,95,213,72,119,54,230,183,117,10,254,149,123,223,213,125,50,37,96,102,85,122,44,67,239,190,164,241,99,1,39,100,227,143,159,242,32,62,39,223,236,147,127,247,37,28,119,21,191,123,175,254,118,126,117,117,254,238,230,147,157,144,12,71,110,194,28,26,51,135,202,196,183,159,231,234,68,221,190,210,109,75,83,208,200,222,182,113,19,245,160,70,174,141,56,108,29,122,27,224,23,136,252,245,247,87,134,47,109,216,160,188,65,176,12,193,230,60,125,58,249,187,146,206,15,
+233,0,104,107,123,196,86,9,181,36,115,199,168,237,56,201,142,224,243,60,81,47,111,91,52,106,115,102,215,228,18,158,236,238,135,207,47,57,170,152,219,187,31,124,87,173,63,135,117,22,95,0,126,125,167,175,45,81,106,134,253,132,27,51,106,61,245,205,58,226,163,187,201,176,189,35,151,177,110,117,219,60,183,146,107,168,58,229,39,64,130,243,239,179,186,32,79,46,23,38,65,10,97,209,47,152,116,211,54,19,84,153,249,18,92,58,253,179,73,253,66,246,190,46,76,50,2,153,114,157,23,62,2,203,93,47,57,127,10,7,16,187,248,130,67,174,226,197,109,165,72,231,87,218,178,94,16,22,105,121,65,175,185,12,93,14,200,139,50,230,67,165,215,105,86,73,4,170,42,1,122,39,135,21,48,97,5,188,5,18,43,72,151,228,197,129,173,251,251,34,228,142,190,48,224,160,26,193,66,156,156,215,14,41,228,22,155,29,21,137,84,167,124,193,119,161,12,175,130,70,199,80,137,14,54,61,165,33,254,177,125,134,220,239,198,180,201,123,66,22,225,34,93,165,15,242,
+234,162,237,232,218,56,51,142,220,149,14,127,206,221,63,192,19,18,183,5,213,214,124,207,39,139,192,223,102,252,102,146,244,212,138,212,62,162,0,112,180,58,196,15,43,187,196,210,113,142,110,91,2,118,149,84,229,165,244,153,192,105,166,92,236,164,63,103,154,70,203,11,55,54,191,116,62,111,56,136,96,4,205,160,126,198,198,16,246,21,241,208,161,197,161,6,229,42,105,54,5,78,161,199,94,91,138,72,81,135,47,131,180,189,223,222,126,60,106,136,246,227,91,123,185,145,217,151,106,22,23,119,172,124,195,185,34,247,97,167,11,129,110,110,51,80,154,89,238,184,183,110,150,163,123,158,130,60,191,26,168,139,119,63,171,247,111,246,62,245,232,188,185,182,127,60,127,73,149,110,58,204,57,167,223,82,140,190,97,108,130,95,126,34,199,255,14,192,204,70,91,35,179,18,247,112,59,113,225,122,129,67,230,229,154,218,249,4,198,181,253,92,193,67,75,155,249,216,195,61,240,27,35,88,163,156,50,23,141,112,16,146,129,169,173,55,208,32,42,172,112,45,127,73,73,148,
+64,19,233,219,225,192,152,213,91,1,74,2,179,127,28,70,93,101,29,147,8,94,39,135,109,128,12,203,78,252,241,252,95,110,218,194,118,93,167,246,190,175,69,116,190,153,187,12,149,132,96,23,167,126,38,189,167,51,16,253,126,246,202,13,230,190,76,190,210,163,79,236,149,22,93,203,250,183,204,242,230,73,250,60,97,94,143,122,99,195,18,204,194,88,116,217,237,8,231,165,120,13,35,46,146,241,104,208,104,65,143,94,188,139,65,12,161,111,11,176,73,241,186,228,252,142,59,169,56,74,242,81,27,185,209,225,103,183,228,226,193,180,109,54,189,78,20,253,239,247,196,111,94,207,181,112,4,44,161,246,253,130,238,8,101,175,25,82,45,238,29,76,165,85,44,101,53,225,231,3,127,236,44,218,253,134,128,223,83,143,200,31,177,21,47,69,222,156,33,91,59,165,51,151,83,246,32,128,116,20,229,204,191,207,237,168,135,32,252,246,37,99,103,193,172,222,223,232,251,205,215,243,228,119,3,132,220,89,240,219,48,176,125,171,35,223,163,224,54,123,219,94,81,118,86,59,
+234,182,214,31,239,102,14,39,191,141,81,97,165,199,102,173,75,234,235,170,173,156,28,212,132,221,66,63,162,206,90,228,169,255,118,121,243,203,251,143,55,240,67,159,60,148,59,243,112,197,94,250,238,32,12,114,117,157,165,126,189,184,122,253,11,230,158,191,186,124,123,121,243,137,156,231,155,203,155,119,23,215,242,122,237,92,125,56,191,186,185,124,253,241,237,249,149,250,240,241,234,195,251,235,11,202,91,53,43,94,103,165,111,136,71,190,90,129,223,177,83,102,106,14,176,136,238,64,66,147,106,219,103,58,141,66,135,55,234,172,214,185,184,110,121,127,70,225,2,198,246,173,68,161,179,206,246,23,99,68,255,199,175,196,240,167,110,29,32,189,216,229,2,77,216,64,68,101,78,9,31,220,121,34,79,145,41,156,106,234,132,172,202,2,231,150,183,178,8,149,112,212,89,190,199,181,94,238,32,188,160,65,58,242,238,221,190,142,74,137,253,149,239,33,207,179,47,54,24,48,240,198,56,118,167,70,30,1,117,90,173,97,200,250,180,115,44,167,21,5,146,152,71,201,158,156,
+145,141,166,209,150,207,33,151,163,84,215,225,28,92,102,94,82,202,198,130,61,127,117,253,254,237,199,155,139,183,159,194,140,230,76,32,150,232,154,170,55,176,170,187,59,126,13,254,116,247,211,201,174,85,110,187,173,54,182,114,176,211,57,237,40,183,8,29,47,214,89,201,190,45,244,53,63,151,13,159,117,8,152,223,253,20,18,183,109,8,20,12,201,17,108,214,132,96,248,10,180,125,147,208,158,65,10,36,237,138,214,104,220,131,247,206,203,128,78,98,127,240,165,230,251,123,190,99,179,215,98,237,158,220,131,96,43,136,51,138,244,220,38,194,137,51,23,130,130,7,128,7,201,179,111,250,228,214,134,29,211,140,20,6,203,222,189,152,131,140,47,12,6,87,186,104,20,125,63,144,161,239,48,161,104,197,133,15,211,100,210,20,224,177,223,30,45,15,28,7,247,142,210,151,3,240,20,178,210,114,131,101,142,220,183,82,248,246,122,187,26,114,173,99,37,95,176,128,205,168,252,146,203,93,88,33,79,50,168,111,129,223,161,182,57,67,251,16,13,177,125,39,173,37,239,226,
+82,31,234,117,176,169,112,74,221,59,112,25,103,210,203,199,115,72,223,205,30,171,249,84,110,202,197,166,208,206,223,16,80,152,109,252,190,210,177,214,210,195,118,72,16,200,134,17,75,74,176,224,221,93,96,63,144,207,145,109,110,133,245,27,121,107,111,148,237,162,162,38,45,115,236,235,169,216,246,47,68,165,250,37,157,127,209,213,94,199,253,123,105,116,178,56,254,102,3,219,46,139,63,70,42,6,238,173,178,156,191,114,40,24,110,7,68,244,133,60,38,115,15,38,255,10,85,220,103,12,135,191,148,198,87,217,236,221,100,91,205,34,197,12,53,70,234,88,193,19,118,159,70,248,139,220,42,116,145,41,53,7,84,37,53,76,144,19,228,239,143,9,74,116,246,197,4,63,146,166,160,38,17,154,47,184,133,18,224,51,238,80,12,119,12,174,103,76,219,77,101,23,119,37,68,241,69,79,174,15,218,125,47,195,2,200,216,37,111,191,253,43,109,14,212,191,213,237,255,2,178,226,101,221,
+
diff --git a/uppsrc/ide/app.tpp/GettingStarted$en-us.tpp b/uppsrc/ide/app.tpp/GettingStarted$en-us.tpp
new file mode 100644
index 000000000..9cfa43e1b
--- /dev/null
+++ b/uppsrc/ide/app.tpp/GettingStarted$en-us.tpp
@@ -0,0 +1,465 @@
+TITLE("Getting started with TheIDE")
+COMPRESSED
+120,156,220,187,249,111,107,219,149,38,246,175,92,148,43,149,238,170,103,227,106,184,211,123,8,80,141,234,70,208,1,210,93,72,167,17,4,134,17,95,219,215,246,77,61,191,231,188,123,29,183,145,78,65,51,69,81,18,37,142,162,56,73,20,7,113,22,73,113,158,36,138,243,40,206,51,41,138,243,120,56,207,228,201,161,244,92,237,202,128,164,250,199,72,144,196,117,180,215,244,173,111,173,179,247,15,251,199,203,47,254,252,207,95,126,241,242,7,47,255,95,190,190,252,151,31,126,249,254,119,95,127,254,201,143,191,94,126,251,246,171,143,111,94,174,126,245,126,233,205,87,255,246,221,87,127,255,247,127,255,163,119,239,150,191,90,152,90,130,76,45,189,92,93,89,90,94,90,90,125,249,114,117,249,205,210,171,119,47,223,189,122,187,244,246,229,202,155,213,229,87,111,94,190,250,242,183,239,191,123,255,155,159,252,248,253,219,149,175,254,242,191,123,13,105,45,127,241,234,7,43,75,43,75,47,151,94,47,175,66,171,94,174,188,92,94,93,90,126,181,244,246,237,234,210,155,
+87,111,87,222,189,126,253,229,207,223,255,246,243,199,111,191,249,201,143,127,182,208,91,56,91,129,212,94,190,121,251,122,117,9,82,90,125,181,188,242,230,213,42,164,188,186,186,180,4,125,94,122,245,230,245,155,55,95,126,254,248,249,235,15,144,210,210,235,55,95,189,95,93,254,234,111,22,154,171,95,188,254,1,20,222,242,27,72,117,117,121,245,245,234,202,219,229,149,165,183,203,203,175,223,173,172,190,91,133,226,94,90,254,242,227,231,15,80,148,63,131,116,22,122,11,181,87,144,195,213,87,171,75,43,16,32,171,111,94,173,64,203,222,64,127,87,95,190,91,90,134,188,190,125,249,234,21,228,240,195,127,248,35,74,11,128,22,122,175,33,119,203,111,94,45,86,191,93,125,187,180,242,230,237,242,234,242,235,101,40,128,151,111,160,44,23,222,95,125,249,139,15,159,126,14,233,173,44,47,125,245,25,10,233,171,191,249,235,87,95,45,65,202,111,190,120,243,131,229,151,239,94,46,191,126,243,14,114,8,5,11,37,188,242,238,221,210,202,91,200,225,234,210,171,151,75,
+43,95,254,252,219,95,44,146,92,126,245,114,229,201,227,91,168,14,175,33,203,79,152,188,122,189,4,5,188,188,242,22,114,249,102,105,101,5,250,253,106,245,237,155,47,63,125,88,84,226,243,183,223,253,228,199,127,249,215,255,236,229,143,94,254,104,249,213,171,127,190,80,127,7,169,191,93,89,93,89,89,125,253,110,117,233,229,10,228,6,178,177,186,192,235,245,75,168,150,75,175,150,223,126,249,179,247,159,32,159,159,87,23,200,62,161,186,180,32,18,4,252,202,219,87,43,144,235,215,208,47,168,168,80,130,43,16,54,203,239,86,223,174,172,188,125,249,229,207,191,126,255,233,211,159,0,244,151,139,36,151,150,190,88,90,250,193,155,5,174,175,86,150,87,223,45,192,89,89,134,0,94,126,253,234,221,18,132,240,171,215,171,47,151,191,252,238,195,255,242,187,143,223,125,248,205,135,111,32,136,63,66,220,248,234,143,229,249,158,135,80,48,207,60,92,254,98,105,25,98,226,171,215,175,95,46,240,122,5,177,97,121,229,21,4,248,203,165,183,171,80,68,208,55,84,226,
+207,223,83,241,103,255,41,135,149,47,150,86,126,240,110,121,117,5,138,228,221,234,42,132,0,100,96,233,221,210,210,210,203,183,208,55,148,25,132,203,19,55,150,160,16,158,146,120,118,255,172,190,250,197,210,234,15,222,64,28,134,42,245,110,117,225,254,221,202,2,191,101,8,254,229,215,47,95,65,117,88,126,86,95,94,160,190,252,231,16,238,75,203,111,23,63,79,200,47,189,250,98,9,106,6,40,196,165,87,175,160,188,87,32,168,151,223,66,185,191,130,176,95,121,226,247,210,155,183,95,254,155,15,191,255,244,47,223,127,254,240,61,97,254,242,111,254,252,153,105,75,175,191,88,122,253,131,151,11,253,87,111,223,65,5,92,90,93,224,183,178,186,250,110,249,221,202,202,171,229,119,175,86,94,191,132,112,252,244,220,203,11,229,69,63,61,245,226,63,24,121,243,197,210,27,168,179,160,92,95,189,130,178,127,82,131,50,127,179,180,8,101,249,237,187,215,11,20,190,55,242,211,31,126,253,241,155,69,28,16,51,190,122,38,195,95,254,205,95,45,45,189,89,24,122,11,
+53,204,219,183,175,95,174,188,131,192,128,48,120,249,10,98,58,52,13,222,66,133,134,234,188,12,181,193,98,28,252,252,239,222,255,234,195,79,127,248,125,171,126,189,4,13,147,143,16,175,191,250,183,223,15,149,119,95,44,189,131,136,181,12,85,97,249,53,148,26,4,203,75,136,142,208,131,55,75,80,89,151,151,94,190,123,247,242,203,223,126,251,241,137,22,79,154,239,158,52,151,95,126,177,12,81,114,101,233,29,148,198,155,213,119,16,3,32,28,87,32,154,67,157,242,238,221,234,27,168,172,43,203,95,126,250,252,225,183,63,249,241,255,246,63,253,239,255,197,191,250,55,63,252,247,255,238,197,143,63,45,127,245,226,191,254,240,249,243,199,111,126,245,226,211,231,247,223,125,254,240,139,23,191,255,248,249,215,47,254,251,95,127,248,215,255,242,95,253,197,79,126,252,233,213,87,47,126,246,135,23,255,205,251,111,94,252,15,31,191,254,205,251,111,62,125,255,112,241,103,229,171,23,75,63,122,241,47,126,249,249,195,119,47,62,126,3,25,248,250,235,247,139,217,245,197,
+179,177,23,159,127,253,225,197,191,255,250,243,199,223,64,21,252,233,95,253,244,175,94,64,54,127,244,189,226,50,164,248,233,211,135,223,252,236,235,63,188,120,255,205,47,94,252,237,51,58,79,230,95,62,155,95,126,185,88,182,244,195,255,248,239,62,124,253,225,231,207,230,62,252,135,143,159,158,194,125,255,71,229,159,254,217,127,251,135,127,241,219,223,126,250,233,159,65,11,222,127,126,94,241,105,17,244,47,158,71,249,23,139,207,63,255,250,227,207,255,110,161,247,237,55,47,62,126,134,126,255,252,195,139,127,6,37,245,15,102,62,126,122,241,254,197,167,15,208,191,126,249,226,251,74,125,250,226,197,231,111,127,245,1,114,251,221,194,247,31,94,252,230,253,223,125,120,241,187,223,66,11,127,255,235,111,191,254,240,226,183,223,125,251,43,168,175,254,249,143,158,131,126,162,198,139,231,207,255,213,179,240,215,127,13,37,255,171,15,95,66,165,94,253,139,37,104,136,175,109,158,110,8,214,215,214,54,125,243,53,232,107,104,33,213,201,136,41,38,127,161,29,200,207,182,234,
+150,48,18,27,10,35,19,251,91,27,180,141,109,163,233,74,113,54,216,218,72,108,24,157,103,9,204,196,37,216,184,62,195,6,198,60,121,7,166,145,166,198,49,54,160,16,114,42,82,74,255,146,42,51,141,67,253,128,166,64,75,29,49,25,57,10,175,233,17,171,215,215,103,155,160,196,35,38,244,139,247,5,249,168,47,177,245,139,147,217,84,119,53,169,205,156,18,79,199,89,235,200,147,132,36,125,253,134,96,31,154,231,36,113,3,111,50,74,42,220,139,108,159,29,200,25,40,197,246,60,233,169,111,83,106,168,158,25,176,147,218,158,62,129,88,148,161,60,251,226,236,110,198,92,103,146,207,248,123,114,152,13,225,10,177,31,203,4,248,12,78,29,177,104,148,75,95,110,170,54,201,232,138,123,76,226,8,128,221,162,68,219,148,99,248,182,57,119,59,140,60,114,49,72,222,96,63,69,30,54,111,108,244,250,6,199,21,8,178,98,192,238,116,179,58,51,11,192,171,102,216,148,93,215,33,183,199,67,13,250,164,73,63,238,70,168,4,194,148,151,13,140,247,232,38,115,
+94,129,70,22,40,91,212,36,125,110,132,235,67,21,177,28,140,245,246,68,35,42,225,152,189,97,36,121,251,101,155,238,120,143,229,129,101,56,244,178,84,226,12,248,42,248,178,40,32,101,229,93,55,254,203,50,146,120,204,218,72,244,140,73,163,128,179,30,50,24,118,207,93,252,45,241,132,27,161,114,216,157,203,234,182,212,70,60,54,24,170,119,140,13,137,61,116,136,10,96,89,116,202,97,25,75,89,239,225,217,101,202,57,56,112,90,7,125,103,138,40,6,214,140,160,228,225,104,239,132,209,163,183,129,42,150,101,20,226,41,80,30,194,61,43,43,32,158,86,113,156,237,74,48,210,207,151,149,215,71,222,42,202,112,234,245,101,113,20,38,95,92,121,32,114,202,49,87,144,195,174,35,60,215,167,3,77,15,52,112,66,157,67,134,115,189,63,46,4,135,13,68,126,174,214,26,40,33,140,205,169,75,160,9,176,3,21,200,160,75,52,5,156,131,128,177,50,49,195,157,241,172,96,243,176,37,54,117,4,169,149,215,185,14,95,31,94,108,16,196,136,128,194,100,186,66,
+220,237,163,138,12,91,161,64,190,96,108,29,249,140,157,201,237,201,69,231,144,238,100,3,27,16,28,143,211,13,221,38,63,98,45,120,93,198,26,154,131,30,16,9,71,83,150,205,102,109,237,219,214,68,58,155,92,31,193,107,177,9,240,184,72,11,227,14,176,221,89,122,24,90,171,137,71,128,139,103,216,19,145,125,104,19,182,247,32,66,224,73,226,144,136,194,217,191,142,96,142,13,183,167,105,35,238,220,251,104,223,69,155,248,194,10,31,147,49,151,239,18,231,132,180,38,142,214,73,152,180,20,234,120,55,167,22,6,73,188,253,145,186,165,21,48,97,196,19,184,104,215,187,69,227,94,10,7,249,248,93,140,71,178,236,158,231,0,231,181,146,95,154,35,21,72,12,121,108,46,35,174,189,110,107,72,204,111,108,48,60,164,146,68,58,28,153,68,231,122,23,93,195,24,121,112,24,50,15,52,50,144,245,170,228,170,212,58,214,81,79,199,165,86,96,226,145,215,119,92,42,249,212,231,102,110,203,100,86,209,193,227,177,213,214,124,84,223,49,138,67,163,230,42,68,227,
+243,10,38,161,181,60,242,2,94,27,73,39,1,203,98,18,205,175,229,166,47,41,179,19,189,171,3,211,237,79,102,23,9,249,16,38,232,29,234,149,113,117,73,122,188,206,229,31,36,36,215,118,223,36,208,10,14,212,28,149,71,172,241,1,183,169,6,72,9,88,101,34,118,206,224,210,37,224,187,118,119,77,235,81,54,75,21,241,196,93,192,243,156,188,20,169,233,189,6,187,25,210,57,122,91,142,20,146,164,86,171,239,42,123,70,7,43,67,169,153,57,112,59,74,51,138,132,214,17,216,102,176,195,90,148,111,16,5,216,180,90,59,170,222,177,164,221,19,29,4,255,129,31,86,86,199,15,118,165,23,240,12,34,127,224,103,247,59,246,234,158,196,163,33,175,137,243,196,38,126,219,119,78,95,183,117,175,137,135,244,227,65,191,10,250,226,51,35,209,66,29,85,245,195,77,61,71,87,101,1,65,7,149,159,26,98,198,224,28,61,87,130,13,60,181,119,162,159,120,193,243,16,114,230,167,118,93,85,69,122,208,49,3,15,8,181,102,134,15,36,116,250,139,179,193,190,
+222,218,107,26,107,28,120,42,140,26,218,15,117,186,190,53,164,99,29,206,219,132,59,161,70,51,124,104,169,237,84,69,44,53,79,27,196,46,68,199,33,115,243,147,250,99,110,119,214,47,39,163,76,6,151,137,19,82,239,193,235,102,193,16,221,236,20,196,147,198,233,104,4,108,154,251,2,142,222,219,193,213,125,29,32,35,19,101,27,240,168,208,41,118,120,49,234,253,22,201,150,60,224,243,227,234,56,28,212,130,206,71,252,150,103,120,73,159,47,210,162,179,143,149,211,20,122,94,36,167,117,115,3,224,209,88,166,246,214,129,48,40,84,141,207,199,81,164,113,27,8,118,230,119,205,91,18,218,50,147,80,91,69,45,144,35,118,215,128,132,54,169,203,84,53,97,161,48,89,210,113,31,212,23,105,209,113,61,235,135,71,114,117,94,6,45,118,117,14,145,186,105,77,84,23,146,138,115,15,12,169,83,102,144,55,23,92,59,53,17,106,244,211,6,223,164,8,23,220,219,27,4,191,170,145,42,148,79,121,143,88,116,112,15,135,228,106,102,145,193,156,87,29,32,203,115,
+147,93,154,150,114,142,137,99,171,145,137,159,243,221,20,230,35,254,86,93,157,183,30,146,110,78,47,91,167,21,197,23,214,51,250,53,113,26,163,103,252,228,115,215,214,117,198,170,209,212,201,233,41,109,205,146,86,143,116,229,106,207,94,228,54,241,250,228,204,162,159,212,37,249,54,40,7,49,162,201,12,45,159,152,27,131,238,97,180,148,144,161,84,213,189,117,46,103,204,159,240,75,34,214,3,205,123,17,63,80,106,152,216,156,6,115,73,196,8,8,76,18,69,41,206,183,238,244,218,88,247,225,24,155,71,242,120,130,201,156,204,24,28,22,241,60,55,39,42,210,50,134,81,35,109,59,27,68,224,14,69,141,153,235,129,146,184,202,222,164,2,169,185,218,210,139,244,147,17,147,153,17,174,203,104,177,154,175,78,84,187,156,88,79,2,227,202,233,243,26,52,251,24,22,217,58,218,65,161,58,69,17,220,8,238,58,169,232,198,128,207,7,163,61,51,127,103,251,8,167,137,106,33,30,233,67,155,115,219,96,36,14,55,90,7,137,34,89,156,137,169,31,76,65,48,111,
+23,131,225,94,50,22,188,44,218,130,128,201,50,14,186,249,53,69,67,203,149,185,120,88,227,52,161,153,92,163,98,68,12,239,164,209,109,218,122,48,106,74,115,201,105,1,83,137,183,39,230,112,115,209,28,45,184,77,216,30,236,243,72,99,41,253,97,188,182,193,27,205,125,41,229,76,58,149,58,117,19,230,96,94,43,76,61,225,157,238,181,156,101,211,235,138,9,254,126,38,81,159,82,157,130,243,56,157,93,140,24,209,24,23,220,194,166,23,148,15,220,168,102,36,225,5,166,28,199,200,73,212,12,26,96,240,220,142,22,231,29,115,176,165,66,86,212,212,250,56,239,218,162,38,144,134,246,161,227,180,62,56,64,248,171,153,1,249,126,66,106,169,212,149,56,170,195,225,74,118,162,161,195,30,118,168,10,37,183,232,117,142,13,190,47,213,96,253,64,219,133,177,32,149,181,146,187,18,82,15,75,7,133,189,106,161,237,99,219,119,243,183,148,88,131,43,165,57,102,149,78,212,213,23,204,171,106,153,83,106,76,95,245,13,236,109,119,158,32,219,140,167,15,29,84,45,
+89,182,175,56,173,223,216,77,126,63,81,197,138,149,232,245,91,155,5,188,228,212,71,23,48,26,142,26,228,40,8,125,203,60,94,228,236,238,237,199,204,218,176,46,239,9,165,9,154,240,217,201,36,210,235,42,229,167,145,26,30,187,31,155,20,213,101,236,165,49,110,5,162,65,128,17,212,118,113,193,94,34,87,151,206,172,147,30,109,143,34,215,225,131,187,55,2,148,213,40,134,111,133,124,85,244,230,163,137,0,163,196,230,234,135,99,117,158,99,76,200,148,151,40,239,182,164,17,66,97,115,158,122,17,87,47,122,42,82,192,23,172,83,243,145,168,49,89,230,160,136,86,155,235,22,160,224,29,219,112,82,32,218,97,244,101,240,72,196,232,60,178,39,1,28,23,87,131,219,101,101,85,191,158,32,154,193,90,243,56,205,226,234,211,248,214,134,202,161,190,67,86,165,30,251,241,72,200,106,106,101,45,60,82,19,234,55,4,142,112,189,157,61,9,17,58,190,84,88,46,214,214,210,154,81,160,158,39,33,40,200,163,203,25,39,95,181,173,99,248,34,185,28,47,144,52,
+250,214,70,42,115,231,182,112,239,194,162,44,255,225,182,208,203,142,193,135,250,201,126,79,38,215,31,145,164,22,222,216,217,79,63,86,118,72,82,208,114,2,58,249,226,171,57,219,35,114,93,48,144,234,131,233,78,253,102,23,159,63,151,151,245,52,70,150,27,119,177,229,96,87,145,44,178,184,204,116,102,106,12,78,2,32,187,237,28,22,173,57,85,85,78,153,13,178,195,189,178,13,89,165,224,230,61,25,40,53,50,182,173,2,62,18,104,91,133,252,164,28,207,78,105,115,195,0,195,189,9,92,159,150,253,55,166,90,25,163,238,55,110,214,172,228,182,193,38,215,10,140,254,137,91,186,159,0,146,67,76,166,183,62,2,189,228,217,85,21,12,193,166,232,70,143,113,16,5,136,125,188,60,53,99,12,84,249,96,186,31,127,212,86,142,229,147,211,13,0,219,209,106,113,145,241,68,192,41,137,228,150,171,59,133,126,139,23,246,49,67,118,90,140,126,141,93,180,135,139,24,173,64,243,40,187,19,214,74,59,246,112,158,88,197,159,187,9,33,133,68,251,176,30,235,245,
+56,4,208,180,57,223,162,140,208,147,57,18,231,205,74,137,170,147,1,182,155,206,42,178,246,72,178,152,32,158,200,8,204,147,154,112,120,190,127,138,198,110,205,155,143,101,45,178,115,102,188,242,220,95,86,11,54,54,203,111,47,229,60,121,102,101,18,244,212,146,230,224,204,148,19,103,177,78,172,72,163,107,143,104,165,28,49,32,15,83,123,123,154,9,54,201,163,164,38,147,64,67,223,218,142,2,218,24,170,129,190,103,147,250,128,136,7,22,114,85,208,236,63,63,141,143,115,245,29,18,170,189,149,74,226,242,180,138,148,56,5,4,19,84,49,159,205,100,147,166,98,15,172,146,165,9,183,96,224,207,159,185,128,112,32,29,52,84,66,173,171,139,222,142,28,218,211,25,240,56,75,67,178,211,32,82,57,195,35,230,35,195,205,85,30,200,2,70,138,89,89,221,105,236,91,53,197,67,199,93,96,66,153,250,167,110,224,162,64,185,185,223,146,80,213,29,207,44,161,176,72,103,179,115,16,51,153,101,99,242,177,57,89,39,138,71,102,245,3,67,158,110,19,56,41,135,
+38,137,31,229,213,188,102,74,150,142,83,122,235,3,251,54,54,28,77,165,134,182,200,61,49,124,130,181,222,225,237,185,73,244,222,110,14,69,233,169,238,93,205,119,208,57,48,128,97,167,48,170,51,29,4,44,183,251,235,61,206,192,86,66,233,251,226,169,100,95,48,66,11,166,83,79,2,43,76,55,109,7,76,151,32,153,5,208,240,244,200,204,231,196,16,104,58,25,135,113,105,164,50,80,132,11,199,114,103,45,99,53,46,182,119,236,7,254,78,135,165,79,151,167,37,1,222,65,153,132,89,87,49,6,162,112,158,119,18,100,233,76,61,100,239,49,28,134,57,185,159,62,46,117,208,38,171,128,110,236,39,192,164,135,59,17,212,180,116,144,83,247,227,120,164,64,245,178,24,220,35,115,174,232,178,181,22,34,105,2,47,219,152,30,25,219,36,179,43,65,85,33,55,26,230,5,201,171,62,110,108,207,90,200,178,48,46,121,212,159,98,58,134,17,167,77,112,54,189,56,156,188,201,7,18,25,181,60,22,66,233,107,214,3,39,129,49,216,196,250,144,125,94,177,161,14,
+48,7,40,89,60,25,185,80,149,182,21,15,93,124,37,63,210,161,227,125,14,88,189,158,24,56,20,41,41,150,215,68,171,122,58,187,114,221,232,196,240,123,251,188,202,230,153,163,210,190,15,224,175,115,100,22,78,117,157,40,73,61,20,142,132,165,227,144,241,174,28,202,51,203,36,18,161,206,233,229,110,64,219,99,251,221,215,112,218,196,145,28,211,133,234,138,180,0,177,192,146,95,191,167,119,114,211,70,66,16,196,246,142,128,194,197,197,156,128,36,82,79,61,85,157,71,62,79,165,47,13,7,169,243,193,4,198,155,180,250,241,124,93,105,80,77,76,62,32,143,152,245,240,130,118,82,118,31,87,244,188,166,176,210,132,151,35,103,23,61,166,56,116,68,67,38,57,199,197,187,83,238,113,21,189,191,17,21,95,158,140,178,208,43,59,155,69,196,171,69,28,207,107,231,164,68,202,146,173,56,188,33,96,220,26,26,190,137,115,32,204,201,24,255,168,21,157,199,85,115,156,136,89,37,134,211,36,227,85,157,38,240,140,167,176,212,21,188,100,218,179,28,225,118,132,78,
+123,117,30,196,135,79,92,60,42,73,190,21,55,98,236,87,212,19,146,114,106,44,197,26,246,91,6,143,155,62,236,231,19,253,11,53,2,72,15,216,2,75,58,130,227,86,237,46,73,180,191,45,77,235,47,49,121,24,72,25,196,27,62,86,142,236,185,216,129,233,74,210,10,120,206,143,19,132,235,14,64,91,14,231,229,169,142,13,28,116,169,156,188,163,128,168,105,31,135,92,115,86,216,62,164,39,124,18,255,136,237,74,182,129,105,141,177,198,225,77,110,131,2,222,128,216,51,31,92,164,207,246,78,228,182,61,215,65,233,174,79,175,10,117,241,217,176,111,68,232,231,118,232,13,71,111,199,5,91,233,238,56,164,158,115,28,44,62,108,206,159,118,6,67,189,180,81,235,82,187,67,98,47,91,212,130,248,16,24,90,27,144,118,252,177,211,124,55,107,210,21,212,142,102,1,134,177,82,166,121,188,184,217,98,49,44,98,255,46,140,155,155,59,189,200,205,240,110,67,96,25,108,41,205,90,141,26,127,119,151,169,218,141,172,19,143,109,51,16,200,53,12,189,57,47,203,
+37,216,58,248,180,126,124,249,72,199,96,56,8,165,182,128,149,248,129,161,84,58,1,197,42,62,83,194,226,117,24,158,77,192,134,39,197,170,37,95,59,154,56,60,212,104,24,128,249,32,51,62,27,1,51,181,0,221,228,91,247,100,162,164,171,76,62,163,245,161,17,27,173,241,135,217,65,20,143,187,83,15,172,218,46,161,51,166,35,247,221,61,7,151,194,76,21,213,189,219,59,29,163,13,208,39,251,212,75,61,169,135,4,172,99,71,250,166,151,154,87,53,26,109,120,164,226,55,147,3,153,51,92,134,11,59,211,199,116,236,209,126,173,12,154,240,169,233,142,139,87,125,110,247,40,246,222,190,1,222,27,113,230,61,177,64,24,149,137,116,221,32,159,193,149,216,43,161,84,76,51,69,181,124,146,125,132,153,32,164,158,211,226,19,156,171,17,162,92,103,196,180,125,183,137,66,32,119,44,172,217,104,175,19,35,134,83,165,64,24,69,201,18,154,61,87,60,15,79,16,161,45,126,108,159,120,137,117,234,106,135,15,232,181,3,87,129,138,69,15,153,68,125,223,103,153,
+185,200,8,230,172,15,91,204,79,135,152,170,140,176,24,21,190,78,180,85,60,28,159,29,77,137,22,63,211,83,245,53,40,106,180,140,155,195,80,2,219,219,117,193,44,30,106,92,196,59,248,226,65,164,209,75,114,114,192,236,36,239,129,234,153,76,184,149,8,6,147,1,173,240,29,135,70,141,137,171,103,209,186,224,233,158,242,104,47,122,39,119,214,231,126,86,133,204,206,75,212,25,172,40,222,191,213,78,90,2,70,246,94,0,62,202,43,225,171,122,161,119,64,144,184,44,181,125,255,131,74,154,190,103,220,51,37,73,170,20,49,188,50,84,68,228,153,54,22,86,75,237,101,129,130,163,25,100,68,202,43,140,56,84,145,194,230,180,172,70,96,4,253,161,135,211,180,78,212,96,41,16,243,17,75,57,132,111,109,214,47,204,10,77,21,60,205,36,182,172,73,48,112,91,145,35,93,67,68,146,30,23,108,50,97,86,222,57,114,168,72,28,110,77,74,131,90,88,66,190,220,53,106,123,66,255,24,51,151,248,118,231,55,180,154,123,228,51,239,176,0,20,135,37,74,15,
+220,163,27,121,189,7,155,59,161,55,102,167,49,200,215,250,7,115,169,14,40,153,211,7,196,212,116,214,232,247,98,85,176,42,139,81,101,190,180,59,179,45,188,19,167,97,112,83,144,92,192,164,175,92,99,143,152,95,103,172,243,31,194,26,18,52,8,78,238,184,240,249,54,47,10,88,169,62,121,201,27,209,162,212,44,12,143,20,139,140,139,5,219,158,205,244,224,144,108,20,125,168,168,136,159,243,197,90,195,67,175,137,64,222,51,247,134,206,118,14,150,78,116,214,101,94,219,205,212,115,163,49,221,49,241,96,57,65,132,239,186,84,128,12,115,49,151,217,120,82,27,111,15,209,244,184,72,58,69,217,160,181,176,68,243,65,107,175,126,123,201,119,242,65,110,43,60,9,36,2,227,206,208,125,115,98,142,159,156,151,177,231,172,162,117,47,213,43,210,57,18,153,87,141,137,11,244,234,248,16,107,153,87,147,32,218,199,27,93,59,26,106,212,158,179,206,149,243,111,177,156,192,228,194,124,176,78,4,221,103,219,50,34,212,87,141,120,90,55,56,145,179,131,193,68,230,
+250,228,24,150,186,212,220,203,36,238,94,20,26,207,117,183,93,82,202,8,46,152,143,170,96,62,49,113,37,241,106,236,152,193,14,235,232,13,195,133,45,94,206,182,137,41,90,230,84,144,247,173,159,174,221,73,199,2,175,171,194,141,87,195,25,15,89,159,21,50,13,132,76,214,101,219,233,32,46,106,163,97,119,184,231,237,38,202,247,234,75,215,5,101,148,217,116,99,69,172,126,207,205,61,217,183,37,29,155,200,122,127,39,231,108,119,206,123,205,40,10,69,32,113,11,206,240,129,62,174,158,163,47,61,152,171,209,122,218,168,58,190,157,205,189,196,169,246,78,54,242,1,189,228,64,237,13,87,55,245,113,140,10,140,157,130,12,110,121,134,231,15,210,215,10,116,197,16,101,128,226,10,28,214,178,71,130,52,164,241,105,106,115,109,33,77,129,80,74,192,82,167,160,35,184,56,34,159,165,196,41,141,79,252,168,107,183,218,240,130,50,124,37,22,38,249,164,62,165,192,37,163,66,170,12,42,140,218,71,236,89,18,93,117,240,30,145,174,116,132,55,102,198,157,93,43,
+175,251,228,91,237,222,97,6,13,7,116,249,136,145,114,218,149,177,133,94,168,94,117,140,250,16,54,101,57,170,227,91,91,114,160,42,172,145,229,115,237,252,254,146,111,103,135,78,58,199,202,75,120,36,43,120,208,202,38,34,102,163,114,197,13,57,180,137,126,52,161,112,112,218,106,246,233,65,114,112,77,239,156,250,243,178,36,238,222,99,39,214,234,192,21,129,202,16,198,186,120,119,149,28,114,9,227,89,183,20,89,235,39,83,81,1,93,26,239,184,55,9,59,173,93,3,162,174,38,74,91,15,4,68,187,144,17,166,16,102,139,234,214,182,94,27,141,74,51,142,6,39,4,131,87,76,103,169,42,78,12,54,91,115,135,84,122,167,118,80,197,201,68,84,156,135,63,240,253,197,153,101,63,67,24,178,168,71,99,151,196,81,238,248,176,120,38,123,83,63,102,236,183,88,162,124,66,127,159,140,157,228,29,155,5,47,253,116,90,58,76,25,207,93,117,98,116,0,199,231,217,194,204,38,84,187,170,119,223,179,9,51,106,247,221,180,77,127,175,145,79,143,43,28,239,96,
+104,25,3,253,237,90,73,234,29,165,235,179,30,163,58,237,227,133,253,180,194,144,118,206,189,193,145,196,225,105,19,230,172,145,157,141,2,90,131,145,185,209,63,136,199,114,68,149,109,144,61,101,166,123,196,105,129,145,105,215,74,140,71,180,19,151,21,31,201,101,213,91,77,127,236,221,240,154,28,54,11,94,72,124,144,157,185,115,153,123,212,72,142,43,186,249,19,119,56,186,101,66,56,44,201,136,130,3,206,40,183,69,125,180,42,36,173,137,225,70,193,125,200,73,180,154,246,50,232,80,59,27,179,176,141,204,206,233,153,171,95,139,136,26,202,93,86,63,132,87,193,213,121,156,44,53,52,84,105,36,26,209,74,153,8,179,54,228,124,100,151,204,38,195,216,105,118,61,54,243,216,194,186,233,193,233,188,83,152,213,140,231,118,173,31,169,157,29,240,206,148,199,249,94,40,42,120,160,224,236,109,7,216,17,243,166,220,222,189,51,169,188,171,93,241,234,136,45,150,172,21,69,112,48,121,232,72,221,141,29,115,44,99,227,176,15,179,212,184,242,65,125,67,57,178,7,
+196,244,59,11,215,100,174,3,218,104,89,173,220,167,143,37,46,78,148,209,227,240,89,98,184,255,33,118,33,91,219,47,143,134,131,154,90,91,13,232,149,27,202,179,17,44,18,138,40,89,62,226,137,113,71,11,136,31,215,56,51,57,129,91,155,80,59,8,12,124,18,4,113,66,232,0,67,156,3,51,246,14,215,111,118,98,30,139,251,45,69,160,117,144,220,191,83,95,179,2,231,236,253,204,217,80,185,59,230,132,56,190,201,94,52,161,225,128,131,14,90,252,96,166,156,53,153,7,147,72,109,88,41,22,97,57,118,66,38,215,100,83,6,124,22,231,184,35,136,170,229,211,138,76,118,122,168,38,31,158,198,35,130,130,250,30,115,60,169,248,88,189,171,33,241,234,140,227,62,117,236,4,195,13,122,61,55,117,171,92,60,77,99,20,212,223,75,83,68,128,61,209,90,74,140,240,96,150,60,147,7,6,177,240,12,108,134,194,224,132,0,38,14,70,193,180,157,83,86,151,232,195,104,230,222,118,50,159,204,46,128,222,65,196,149,35,138,163,242,38,218,4,196,68,182,58,
+163,125,5,149,191,189,142,46,135,19,173,136,156,230,159,35,174,171,123,197,67,126,76,215,148,40,7,143,219,23,71,118,220,62,91,153,125,136,151,19,85,135,100,66,176,229,243,89,93,82,51,237,36,132,59,243,170,139,235,138,157,98,247,85,143,187,164,59,56,3,152,244,100,17,66,252,49,81,216,227,84,140,2,177,241,48,35,223,84,85,116,119,34,160,99,228,35,175,99,211,24,74,40,30,110,25,37,64,128,26,27,163,227,96,168,192,37,165,130,44,112,88,16,97,91,27,233,1,46,162,42,204,58,202,74,202,221,104,28,131,246,117,143,220,76,24,30,98,14,193,90,107,11,35,136,206,100,254,171,61,223,37,208,167,95,169,89,181,128,92,164,15,130,219,4,79,200,41,183,231,210,133,74,161,92,204,119,241,169,52,203,225,187,58,197,167,100,58,167,134,57,237,84,185,113,59,45,106,189,154,90,56,25,31,82,27,181,196,237,119,234,7,27,63,100,190,25,6,231,96,159,139,169,93,100,136,113,125,59,172,239,109,161,205,167,116,192,157,205,187,238,59,234,74,227,88,
+121,144,70,78,118,163,33,64,224,124,168,123,84,233,16,201,147,108,29,7,184,169,171,82,168,132,242,113,178,17,133,54,212,56,52,95,50,156,212,83,181,67,199,201,171,168,117,181,180,35,105,107,37,148,224,118,226,177,98,34,156,51,230,4,179,68,61,13,14,250,92,123,58,62,234,28,71,53,117,128,139,191,147,227,189,46,190,242,210,199,202,220,233,57,215,98,228,145,180,141,169,219,171,228,88,41,208,72,130,248,125,162,72,72,76,201,145,186,172,27,102,150,101,101,208,225,9,58,59,33,119,194,101,2,127,79,166,76,29,156,110,70,235,219,218,222,85,231,120,83,202,87,232,181,21,47,236,118,178,247,136,21,228,33,202,78,138,148,147,4,111,125,107,110,52,23,105,60,59,119,13,31,58,136,68,165,221,44,89,235,26,215,120,13,80,124,174,202,170,42,64,86,32,208,1,229,94,148,47,15,75,9,49,95,165,218,164,110,236,184,104,252,115,163,189,196,144,28,78,102,226,125,199,180,195,68,240,251,30,141,234,193,188,54,63,222,27,204,64,20,138,252,56,186,219,43,
+30,176,243,186,11,109,174,1,250,130,209,153,163,208,189,244,104,43,180,252,28,76,249,230,178,177,134,70,116,207,213,21,149,76,175,164,5,105,55,81,35,77,86,78,183,27,211,253,172,139,44,144,77,61,145,77,51,76,61,190,37,110,129,178,44,156,28,114,232,142,175,147,99,192,55,116,232,139,40,21,185,18,136,99,89,65,35,239,18,213,27,208,176,81,85,204,163,10,8,194,161,134,82,157,235,54,136,243,58,133,131,185,38,204,215,71,24,235,72,237,160,224,34,189,74,136,130,186,216,62,44,38,53,254,242,54,187,138,129,157,111,23,15,64,67,66,155,148,115,195,162,33,78,197,151,215,65,89,66,132,96,232,89,56,250,209,186,183,81,50,79,215,253,156,29,155,182,224,151,85,177,176,193,109,140,207,219,205,38,6,221,153,116,58,235,8,16,29,113,99,156,186,231,243,116,213,222,240,96,55,61,110,92,135,10,162,29,61,180,123,176,78,178,195,80,212,228,206,102,161,87,68,124,236,194,58,201,196,171,54,143,71,72,81,207,9,71,59,236,108,216,41,63,189,109,121,
+109,245,244,156,102,84,49,247,55,236,117,32,199,171,8,66,147,141,205,130,90,25,224,157,247,81,109,84,236,66,101,63,73,197,160,3,23,150,22,31,96,197,167,222,174,36,145,119,34,144,245,202,137,123,49,245,207,123,68,187,250,22,11,17,174,131,57,65,198,145,35,141,51,25,187,202,151,61,114,214,233,81,54,165,203,71,61,217,4,122,96,168,11,194,19,190,146,41,50,155,69,69,181,159,171,118,75,115,243,188,253,128,203,245,37,195,67,127,120,184,147,82,231,181,25,254,96,220,171,166,116,131,201,56,85,7,0,149,59,61,226,131,249,199,224,28,16,10,231,209,144,1,36,70,131,252,26,19,207,162,195,244,135,6,44,218,110,180,73,246,183,7,40,165,124,206,2,112,181,240,12,218,231,57,209,250,243,43,181,182,25,210,140,51,125,104,191,71,28,236,137,133,66,74,84,94,203,141,61,190,184,26,231,115,149,19,178,204,163,114,120,197,38,207,249,134,174,66,150,78,249,43,7,141,93,182,153,145,229,84,5,27,30,35,115,166,187,174,33,219,66,234,137,76,36,60,
+117,98,92,49,129,226,188,203,241,134,142,54,47,245,181,109,128,105,102,22,210,81,108,42,133,223,21,238,117,11,100,63,179,149,242,30,247,133,30,42,71,211,19,214,201,102,167,4,196,167,205,163,78,75,64,203,42,248,37,76,188,128,33,117,229,186,71,36,7,118,36,48,35,72,215,109,126,142,171,195,210,50,34,1,38,192,36,85,174,102,214,129,36,142,156,3,25,111,53,137,35,85,229,221,8,213,198,192,206,112,193,132,214,67,163,89,200,216,36,160,231,213,52,180,246,99,222,23,172,227,195,100,181,190,201,233,245,243,220,248,33,125,44,110,107,55,247,213,83,162,136,109,212,220,68,57,157,217,8,60,9,157,231,6,137,1,232,30,167,170,58,103,181,221,168,227,179,248,40,11,168,80,103,20,191,208,237,169,121,21,73,101,53,179,229,54,101,35,2,193,105,82,87,138,12,148,219,155,190,206,88,238,24,119,39,148,176,96,112,23,136,24,225,166,26,109,187,209,37,151,209,12,140,167,183,190,171,186,18,137,123,149,128,194,149,216,246,97,55,178,49,122,74,93,73,235,
+27,93,132,112,202,207,53,84,121,146,98,102,72,3,246,131,193,122,88,87,56,113,201,146,50,170,155,156,4,175,147,193,120,22,25,167,111,233,81,54,180,198,227,30,149,27,23,233,25,190,202,216,146,211,109,32,179,212,100,55,162,19,125,44,45,6,80,206,89,191,44,207,15,200,34,61,43,238,212,8,36,253,180,158,66,166,226,200,105,246,142,26,68,69,77,248,66,1,47,165,70,167,169,110,152,38,97,97,169,82,198,165,34,63,213,21,141,69,15,217,2,202,203,104,87,204,190,143,32,69,89,8,221,33,121,60,44,52,212,242,137,60,173,44,161,60,146,29,214,76,204,169,178,58,23,170,153,88,236,16,24,188,120,80,37,174,15,70,187,238,244,190,34,135,56,63,199,207,71,254,137,16,244,121,38,237,29,137,190,168,232,243,60,19,214,20,169,132,21,131,68,53,49,136,117,242,84,119,204,122,131,42,141,25,37,218,70,164,131,238,109,251,250,45,83,235,158,21,105,116,162,88,14,61,3,227,30,163,176,249,25,252,36,119,8,84,227,115,128,40,39,243,198,131,32,205,
+172,200,91,253,136,211,235,113,2,80,43,143,183,245,189,122,108,18,230,77,2,72,55,121,74,80,3,72,240,110,251,2,46,3,139,70,53,126,127,14,178,102,187,131,24,50,60,189,27,93,204,135,141,250,46,185,184,63,212,39,165,77,100,236,48,234,29,35,155,135,152,91,234,112,199,51,23,117,134,3,93,52,209,177,202,130,194,220,92,137,72,229,209,35,207,68,131,4,149,85,253,206,160,10,230,131,197,70,117,22,172,135,39,137,102,59,77,5,52,137,201,70,125,166,143,235,67,242,89,117,70,118,131,146,129,18,72,206,103,238,184,54,166,141,10,47,234,196,100,92,63,99,154,236,213,164,38,222,168,215,18,208,137,171,67,229,232,10,15,104,141,159,217,171,164,123,18,248,45,130,136,225,156,178,46,121,218,44,155,166,11,194,225,21,24,83,37,56,231,139,225,119,250,162,211,218,241,16,89,163,180,117,74,105,117,242,157,163,156,202,32,67,53,235,61,238,72,39,118,165,72,250,150,233,138,96,153,197,115,147,34,168,16,111,166,176,36,13,155,83,238,118,28,38,2,149,
+184,165,140,208,47,134,131,112,165,58,223,122,172,35,77,30,56,167,164,5,34,174,125,181,228,68,121,174,179,228,239,14,186,222,153,151,158,201,166,111,47,90,142,71,189,6,117,247,136,219,162,38,3,116,29,161,149,80,232,46,110,129,22,65,47,16,199,249,190,14,215,35,113,53,1,35,78,204,221,231,154,247,123,194,216,149,164,21,188,44,38,142,179,233,222,38,111,116,107,179,26,106,145,199,93,134,103,56,209,181,238,116,54,130,142,27,36,237,94,152,211,158,61,230,9,227,194,98,26,118,98,24,26,57,43,12,192,36,181,17,152,20,219,155,120,27,252,216,112,154,54,23,212,199,56,2,33,110,81,181,73,233,140,210,44,156,14,176,244,112,225,62,117,218,131,201,131,102,172,85,111,223,212,201,124,160,199,21,23,22,125,250,158,55,129,201,84,209,25,104,146,4,224,123,166,238,94,61,224,220,51,59,123,124,34,42,138,59,237,237,28,225,8,40,140,175,141,182,72,44,163,89,1,219,35,11,16,83,189,173,46,31,24,76,14,88,60,95,160,240,226,214,187,221,243,45,
+35,193,115,80,202,82,214,39,218,50,70,56,137,233,119,92,187,226,243,173,107,94,100,235,200,110,216,157,95,193,207,183,124,71,51,99,22,93,215,219,231,20,35,245,230,236,230,182,116,108,136,77,13,5,175,234,178,254,216,145,75,216,55,135,4,65,147,72,95,87,121,215,214,68,204,169,92,128,72,49,123,51,17,214,70,55,246,183,8,218,163,181,210,168,20,203,81,81,138,11,51,156,184,118,19,19,159,1,232,45,240,126,219,159,219,116,173,157,141,200,187,37,180,68,4,151,37,214,215,118,183,180,46,95,179,163,33,167,125,34,120,244,212,148,165,52,43,217,245,235,139,218,198,218,189,240,252,10,46,91,95,187,103,221,80,100,94,127,73,83,56,26,45,30,95,151,119,174,137,39,105,107,127,36,46,225,34,212,24,46,110,118,240,160,13,100,251,246,154,185,118,164,49,38,152,230,243,195,171,100,115,92,194,60,194,6,82,17,124,173,121,243,88,38,17,183,60,146,142,12,207,12,85,143,135,11,51,251,187,176,144,203,0,88,148,8,211,93,222,127,180,120,100,231,65,129,
+245,103,186,236,97,138,233,78,237,14,182,201,2,255,35,92,190,75,130,162,200,209,91,53,39,74,23,143,235,186,40,244,110,144,124,28,174,169,202,183,79,14,67,107,76,248,62,180,196,74,63,227,223,48,93,77,138,21,191,80,184,243,239,51,225,96,150,231,210,216,34,91,107,168,45,50,132,196,245,3,122,205,186,67,187,22,186,206,104,145,45,195,26,106,189,134,2,174,174,224,107,244,77,151,131,105,115,181,80,102,200,36,125,223,120,109,171,80,181,183,17,35,12,138,203,150,93,187,112,169,50,232,72,102,13,66,143,176,136,219,41,148,16,144,119,15,120,67,232,10,2,0,101,225,157,231,238,152,219,244,133,219,179,130,204,12,39,100,54,251,50,248,173,194,96,29,89,109,218,189,254,113,115,225,131,178,217,186,130,215,165,38,254,176,183,213,27,27,121,51,185,64,17,49,230,197,48,6,123,125,97,89,191,91,149,194,165,247,125,104,115,173,151,193,21,213,205,173,69,185,8,37,194,84,157,20,73,225,131,178,106,109,237,116,3,62,203,97,116,52,87,130,35,102,107,39,
+56,226,45,156,61,90,228,183,206,156,226,14,50,56,81,254,17,93,130,114,188,178,105,110,141,80,46,251,215,121,226,246,245,254,83,138,36,149,172,44,25,10,233,134,199,39,49,130,218,34,174,173,149,208,157,115,162,181,126,236,160,129,112,217,54,244,228,70,204,88,115,65,11,214,116,213,214,149,237,134,182,123,116,1,147,113,90,209,243,237,199,167,255,222,159,172,201,90,177,221,180,62,71,229,30,161,118,81,21,159,109,81,7,8,179,152,77,189,147,44,239,129,27,114,154,209,128,75,132,248,146,164,210,182,67,92,59,186,17,63,0,232,91,101,156,114,24,63,229,185,78,183,17,150,69,0,200,141,150,216,118,141,56,231,199,217,120,215,233,241,253,213,209,34,170,131,50,218,228,63,147,9,118,133,200,181,8,42,101,67,239,203,12,11,88,231,50,209,46,31,174,64,156,29,245,149,183,143,216,35,169,177,114,199,96,82,23,245,57,189,113,214,31,41,55,116,230,246,150,240,168,133,102,222,83,22,79,111,46,234,81,99,93,176,174,130,239,20,184,76,18,244,232,24,122,150,
+38,210,51,235,79,233,171,100,60,91,55,78,132,69,182,26,16,122,187,178,12,176,77,44,109,44,0,151,92,201,109,99,1,203,79,74,212,80,91,146,75,153,125,225,95,84,71,157,147,252,151,139,18,239,172,17,141,68,200,30,214,182,112,12,127,84,36,15,71,145,53,150,97,24,218,77,91,100,116,248,31,121,178,230,50,224,54,112,23,215,136,26,187,41,81,212,41,71,165,113,248,6,170,21,136,90,87,196,140,123,243,27,255,186,122,160,168,7,81,221,155,167,74,249,221,82,155,147,178,167,56,136,209,85,13,230,90,173,187,200,66,162,240,35,131,107,40,230,166,108,189,12,133,65,115,85,38,19,73,83,64,221,183,228,104,236,120,175,230,56,221,125,226,247,58,140,232,205,13,85,230,185,67,199,134,55,38,157,53,226,26,230,70,188,230,122,60,144,137,161,152,23,33,91,23,176,172,201,224,40,249,147,66,109,11,226,254,2,137,237,8,61,181,104,140,211,39,214,48,215,90,80,49,51,104,161,136,1,63,124,90,136,178,16,187,149,51,87,205,10,222,107,167,48,20,89,
+54,159,222,151,149,35,119,71,255,244,111,179,73,100,235,50,142,65,239,158,93,178,185,96,200,250,189,177,134,114,101,36,180,237,39,190,116,157,53,212,21,218,138,56,49,244,68,11,119,45,139,4,62,202,192,6,170,141,13,72,63,166,18,217,228,182,51,231,197,193,36,129,209,209,53,35,183,62,250,100,118,24,193,209,183,154,82,116,69,96,51,45,224,121,64,27,134,79,253,176,59,47,161,3,186,105,151,134,194,61,39,158,37,230,204,89,244,8,127,100,92,140,129,220,218,45,17,202,102,109,118,117,255,52,190,96,196,179,103,17,126,249,44,62,28,61,139,50,204,98,184,65,157,196,157,247,31,13,172,74,225,254,248,137,55,70,44,53,101,100,66,166,49,139,33,1,181,136,163,180,249,212,16,118,221,147,88,98,60,139,186,252,179,184,233,123,22,35,190,231,126,242,110,48,167,60,13,228,11,190,187,43,131,224,92,187,29,63,160,33,203,103,70,228,147,56,62,123,22,145,180,103,17,138,231,73,148,29,63,139,232,69,157,206,60,70,34,178,41,105,66,97,156,25,104,125,
+25,129,46,139,154,54,22,142,110,48,255,159,244,33,95,187,11,17,170,228,238,124,124,12,69,102,220,88,123,6,230,251,185,14,251,167,224,4,137,232,221,103,113,125,239,89,92,219,122,22,215,182,159,197,53,195,179,120,191,1,251,255,167,159,204,179,104,209,222,50,149,20,168,53,110,23,160,34,190,199,25,170,9,253,25,118,230,214,179,184,129,122,22,215,54,158,197,53,248,179,184,38,31,71,226,116,50,53,229,133,6,244,90,111,237,159,28,167,117,109,70,139,209,177,196,221,133,158,245,255,84,239,127,66,28,127,228,229,38,114,211,213,214,146,211,219,134,5,235,207,236,255,84,60,19,11,80,188,76,242,179,222,46,238,177,6,141,209,181,238,237,198,194,220,13,181,38,122,22,153,183,207,226,70,228,89,140,156,61,139,46,222,179,184,117,15,137,19,226,190,125,251,246,41,142,241,127,86,28,80,109,224,20,119,124,161,138,90,219,69,45,66,193,61,155,95,219,125,242,182,182,134,120,22,111,140,207,98,247,217,223,13,245,251,184,161,237,42,186,191,104,237,253,53,163,1,
+74,235,63,27,151,239,231,139,15,63,169,61,121,80,222,144,39,68,122,49,130,154,75,246,22,5,192,172,29,223,252,223,197,133,161,214,80,71,196,8,117,23,101,176,58,118,101,229,211,28,145,222,159,109,174,225,110,166,55,76,232,253,56,52,236,218,118,182,34,91,193,197,156,218,58,242,13,214,2,49,186,193,99,104,176,52,100,215,101,100,139,114,132,218,130,155,153,112,134,78,20,222,183,13,51,59,140,173,35,179,251,90,6,237,51,143,12,137,77,23,15,218,134,150,96,196,35,163,97,215,139,148,157,111,109,28,209,168,53,195,238,185,211,8,13,244,35,195,110,100,110,168,161,98,120,98,236,200,183,129,46,1,174,80,53,211,26,242,102,45,235,117,39,86,107,137,230,228,254,227,33,43,139,171,13,13,86,196,161,166,63,152,74,61,1,224,241,170,159,53,249,107,32,91,206,47,185,80,218,155,3,99,225,88,1,205,108,212,89,229,32,196,177,122,234,253,86,79,108,219,96,249,199,23,39,170,199,42,122,11,217,222,168,29,34,100,231,116,184,150,86,224,27,54,18,5,
+12,30,79,164,107,234,7,197,210,46,223,133,74,201,214,35,36,124,205,96,69,29,208,251,33,123,185,223,170,75,109,143,196,112,250,112,172,136,208,91,46,196,173,172,5,119,51,137,23,103,242,27,128,69,163,179,205,231,174,152,105,91,233,18,220,11,100,182,97,252,244,62,112,28,95,216,19,157,40,5,222,120,142,23,62,236,215,34,235,174,221,50,82,204,38,72,247,58,167,52,18,65,149,160,152,133,215,13,25,220,52,11,1,59,241,104,95,16,210,246,16,18,120,127,51,43,197,152,99,22,134,78,214,26,133,5,27,104,151,193,179,201,106,26,118,24,76,236,17,28,69,247,74,66,173,140,192,189,121,193,20,86,239,210,228,24,13,137,112,117,73,92,100,121,123,116,53,85,156,135,200,208,126,109,46,221,204,162,198,193,29,87,98,215,230,14,184,99,224,89,169,89,169,251,6,247,30,150,172,148,173,160,147,235,246,187,113,70,23,64,120,68,245,11,174,235,52,18,126,136,48,83,88,203,181,16,238,247,24,228,78,38,62,211,184,97,110,209,233,190,74,136,195,30,91,54,
+43,23,66,69,39,93,221,160,199,66,91,154,188,186,221,158,101,31,209,228,70,36,36,115,198,30,200,50,181,185,107,12,49,15,26,87,236,201,249,110,217,100,85,37,4,48,193,186,133,161,66,167,121,168,48,49,2,136,55,119,240,42,236,150,208,171,0,242,201,116,159,28,222,210,167,224,240,244,163,160,136,62,138,178,31,85,130,3,226,22,127,118,203,196,122,73,76,104,195,66,110,48,227,168,29,18,94,113,30,165,39,104,48,114,125,254,168,174,93,195,165,70,190,109,195,187,203,163,111,113,207,143,112,164,72,148,46,152,22,90,36,155,117,47,116,112,194,164,121,98,7,91,143,104,87,65,221,163,211,221,50,145,118,171,49,91,107,169,154,7,122,129,11,27,100,134,26,59,64,219,115,159,217,48,228,185,146,19,122,142,28,183,195,203,185,12,4,103,185,149,186,223,177,164,152,161,124,135,117,46,77,196,80,115,160,115,247,248,148,159,81,166,211,248,85,124,57,171,14,241,226,52,241,48,138,223,161,69,198,217,13,69,58,85,24,253,76,247,168,211,55,18,21,120,133,84,
+24,77,143,13,114,6,139,158,103,180,106,143,169,214,165,4,30,159,248,78,54,100,94,0,180,90,30,199,85,116,41,225,189,66,105,161,164,134,17,227,172,216,14,95,219,172,240,122,155,177,227,214,110,93,107,92,151,81,46,111,8,108,14,47,132,71,44,88,129,40,54,179,138,189,126,245,177,130,38,87,238,136,128,111,163,224,18,68,212,143,85,7,250,228,58,18,43,197,101,120,60,255,244,222,197,28,86,209,104,188,161,9,83,103,212,157,168,157,77,113,73,232,25,225,192,240,232,192,159,70,185,57,64,34,65,16,93,168,164,108,7,215,53,166,152,240,70,156,83,59,116,4,100,209,227,115,248,205,29,136,211,181,142,10,237,233,45,74,89,137,134,56,194,145,42,211,234,43,238,31,246,46,144,136,146,235,52,3,136,128,93,229,83,55,68,72,8,124,169,246,216,14,62,186,76,99,197,93,75,229,193,102,229,30,139,100,96,16,161,206,249,149,144,129,121,237,58,59,148,149,173,105,70,155,65,103,88,92,49,35,204,174,111,244,161,134,181,25,226,161,181,195,136,52,70,207,
+212,17,174,150,9,122,53,208,111,99,129,36,15,123,13,199,200,213,107,80,155,66,231,125,137,148,60,119,217,34,49,188,141,133,108,157,34,248,125,239,115,255,194,109,148,219,222,185,208,133,54,75,198,27,174,197,17,118,49,60,160,217,113,185,24,30,208,236,184,89,12,15,163,62,131,146,41,31,124,199,40,123,175,194,207,123,205,151,91,55,71,6,171,216,18,240,17,171,200,16,145,164,174,196,129,145,191,79,238,116,224,225,226,65,20,157,215,144,55,219,23,123,53,174,247,146,128,73,250,58,23,238,178,147,72,72,206,47,106,131,221,99,35,25,115,2,156,170,250,51,248,252,70,126,87,239,156,195,211,27,174,248,99,16,63,57,164,115,136,134,49,9,83,29,140,230,99,93,177,124,29,188,10,219,182,133,68,253,163,137,106,197,197,182,35,5,135,48,0,239,9,212,102,149,93,148,6,48,23,232,14,103,175,42,218,137,211,92,150,154,7,118,9,99,133,244,240,209,131,81,227,224,243,203,166,83,107,210,162,202,137,244,183,143,96,193,104,202,6,18,21,94,162,237,162,101,
+208,128,6,152,150,28,139,65,153,3,119,55,67,222,189,230,159,92,38,88,122,247,213,139,255,241,219,223,189,248,249,251,111,94,252,252,187,15,239,63,127,120,241,254,197,55,31,126,255,159,110,0,252,236,15,47,190,251,248,171,95,127,254,233,15,255,244,178,192,226,210,193,63,44,249,250,227,167,207,79,183,21,126,254,235,111,191,253,180,88,241,211,63,251,83,27,63,253,179,31,189,248,215,191,124,241,7,200,207,167,231,59,11,144,183,255,235,149,133,159,125,248,229,183,223,125,128,76,127,92,92,49,128,28,252,226,227,119,208,226,111,191,251,195,226,6,194,98,237,167,23,191,252,238,219,223,252,63,220,120,248,253,199,175,191,134,108,188,248,221,167,15,191,248,135,171,7,127,114,151,228,251,16,126,250,95,66,62,254,231,223,65,17,255,234,31,95,241,248,226,197,215,31,222,255,175,207,254,33,171,139,251,16,139,15,139,180,190,253,6,90,248,187,15,207,8,61,57,253,227,101,136,63,117,244,39,183,51,150,127,248,31,255,246,187,15,159,62,61,133,250,4,198,79,255,236,
+197,207,126,247,249,51,4,221,194,226,226,241,207,190,133,196,223,44,46,86,44,164,223,127,252,230,23,223,254,254,197,231,111,255,113,25,254,246,31,185,249,227,45,138,127,184,64,177,188,242,242,229,95,44,189,125,183,178,177,249,176,145,218,88,91,219,164,205,158,46,80,200,73,245,36,252,132,212,43,174,23,91,123,199,27,208,120,231,154,163,39,202,173,173,125,218,198,29,109,99,231,104,179,189,3,191,109,110,173,239,222,40,232,71,27,91,10,184,156,6,227,221,13,103,245,161,147,119,41,81,151,174,116,18,53,135,226,0,220,60,185,64,34,145,236,95,8,118,47,54,152,119,2,171,202,79,62,58,164,55,103,91,91,227,180,60,141,101,250,216,92,172,125,0,86,64,0,44,118,166,51,202,156,195,229,166,4,193,202,53,91,24,180,236,40,119,100,254,211,158,3,206,99,233,49,252,235,206,224,118,228,30,231,114,29,220,8,239,6,105,221,117,129,222,55,165,60,230,183,16,158,48,166,32,20,204,206,102,172,110,163,50,53,42,251,66,160,198,114,25,82,231,254,194,45,144,
+18,70,1,5,119,94,237,118,244,195,7,15,63,68,214,147,216,65,201,148,54,25,26,195,253,74,83,41,9,225,116,238,146,29,79,182,166,45,117,155,71,159,113,149,185,151,48,7,145,139,183,29,31,51,212,201,152,188,92,180,33,208,0,101,156,69,34,11,241,65,246,14,64,206,186,247,1,207,129,75,63,67,156,151,169,46,121,47,43,236,144,123,219,59,87,92,193,3,174,118,58,213,247,79,183,175,14,65,185,234,49,52,149,82,69,38,26,5,147,150,197,40,232,3,162,208,177,95,139,246,24,181,174,9,49,162,57,129,25,203,69,149,218,178,230,28,172,19,42,182,196,140,59,108,149,153,156,248,198,125,91,155,86,155,181,18,211,40,67,51,147,16,227,184,188,93,100,151,184,178,78,103,109,42,172,174,227,30,177,66,28,193,171,201,176,188,185,187,81,148,112,7,137,101,111,202,235,35,70,153,201,222,163,236,206,23,37,218,45,26,205,184,223,187,136,182,133,229,61,210,76,200,80,114,237,45,150,94,150,185,69,71,13,118,188,46,200,171,98,89,112,196,132,149,234,77,
+115,33,30,163,154,34,41,214,114,151,241,150,106,18,109,235,36,10,47,73,233,95,15,10,93,49,113,219,118,38,145,84,179,104,193,80,106,227,69,176,84,154,137,180,134,65,206,77,76,30,102,60,135,109,123,92,9,66,68,222,186,85,193,241,197,46,222,157,78,143,111,170,77,7,148,143,240,240,128,212,185,245,95,168,7,143,245,185,88,93,108,156,30,31,11,247,243,197,156,154,151,205,151,35,105,124,65,195,35,143,40,104,158,71,87,152,137,187,235,22,185,162,62,247,148,105,65,147,137,155,195,250,120,0,118,190,227,72,159,38,233,109,26,142,7,177,72,66,71,246,111,165,35,193,180,189,105,216,174,246,21,64,207,47,155,78,252,158,20,86,3,52,6,86,113,243,50,214,31,163,71,5,158,135,36,203,244,125,62,155,227,162,3,180,248,160,163,58,197,177,96,51,218,117,117,18,238,40,8,125,201,116,198,143,82,73,243,136,213,200,65,49,18,236,11,245,188,54,99,98,61,154,46,130,61,21,99,189,57,92,189,27,34,18,162,19,71,167,125,81,49,237,5,114,85,139,
+99,187,221,134,97,30,194,91,182,208,69,244,80,53,86,92,103,215,143,243,190,22,42,111,147,201,83,60,73,251,177,4,218,192,88,129,117,75,197,132,131,28,250,72,25,221,222,163,74,114,132,116,139,136,168,12,197,80,244,162,196,161,155,90,210,229,244,218,40,113,22,160,238,200,124,125,128,95,83,197,199,71,250,235,97,219,34,129,81,177,106,130,228,209,226,199,165,169,237,40,165,33,141,131,147,35,53,37,221,218,205,48,197,132,177,103,116,68,2,155,3,198,172,225,152,120,115,124,48,46,244,168,28,149,190,77,105,227,136,177,244,226,144,117,56,145,29,114,209,237,142,178,176,206,21,76,175,47,162,39,220,228,28,25,224,109,39,219,213,81,208,161,78,107,10,67,7,81,56,12,60,36,148,224,213,213,36,180,142,30,3,13,125,97,60,207,158,54,106,250,246,233,212,34,72,144,1,114,184,155,143,168,135,222,244,28,63,8,214,123,41,9,44,161,210,79,51,105,161,71,160,38,169,96,4,9,237,154,5,32,209,69,106,100,156,59,101,9,163,179,12,98,60,16,80,212,
+21,111,173,49,117,184,107,170,230,137,160,139,164,132,123,243,227,40,42,68,153,24,101,216,162,75,39,73,151,97,66,106,90,11,250,178,131,113,73,218,189,163,140,114,25,158,207,219,86,176,199,57,234,4,200,231,219,167,72,12,244,158,27,207,43,251,48,94,95,161,83,121,218,27,70,182,138,158,96,227,5,179,104,183,48,117,81,115,42,118,49,97,1,253,178,138,4,49,38,207,173,146,243,93,217,245,117,119,150,158,215,167,78,57,101,130,152,1,186,129,8,148,181,168,42,125,76,49,68,64,123,161,121,163,137,242,236,183,83,93,42,204,3,6,58,15,83,207,161,123,34,201,172,75,244,178,171,226,197,124,19,80,51,192,203,42,119,204,74,234,230,233,142,53,76,153,54,244,125,97,113,118,87,34,229,134,220,138,50,122,27,154,143,199,141,162,174,77,40,130,253,185,144,50,247,89,40,211,114,183,87,109,196,52,133,240,225,54,23,80,231,122,78,62,190,151,234,206,129,177,171,51,17,18,195,18,98,206,25,68,20,187,66,227,52,29,222,182,240,169,125,117,253,28,221,159,
+169,173,81,216,64,56,154,231,212,35,244,38,168,148,121,54,219,194,173,160,110,36,110,130,61,239,133,105,15,96,78,162,221,170,127,79,8,148,2,179,83,183,5,4,128,8,111,164,154,151,42,217,208,116,145,175,122,23,23,188,221,240,236,207,231,153,121,81,215,29,72,61,224,180,234,73,78,253,30,51,35,29,27,230,75,233,66,79,212,186,165,70,139,189,86,134,5,243,80,39,198,7,141,122,199,237,82,119,30,114,113,216,33,168,61,7,175,76,213,1,93,15,230,137,158,97,138,217,79,122,149,214,16,43,43,105,235,162,179,248,134,160,168,31,111,247,6,51,176,92,6,167,45,41,213,162,29,217,60,130,104,103,36,226,134,211,162,171,193,40,180,29,165,241,230,205,248,182,86,78,10,79,234,35,77,48,76,14,105,75,157,156,0,9,85,90,211,186,163,232,202,160,80,27,238,28,140,110,197,58,27,21,215,179,17,193,145,95,74,205,153,218,129,187,139,178,158,46,155,120,46,166,215,220,12,12,157,239,103,152,88,189,135,15,18,192,233,160,193,236,143,208,135,41,125,247,
+132,64,96,72,60,181,227,89,77,79,182,2,180,71,127,122,216,144,145,133,53,205,24,65,196,147,102,243,172,9,108,53,13,115,28,26,84,13,205,86,11,204,173,157,61,132,98,252,25,43,137,2,69,233,194,101,117,204,18,150,221,234,220,94,15,150,80,248,218,97,52,120,20,190,85,94,146,114,125,59,205,67,27,11,181,106,46,186,104,105,204,186,126,112,20,31,160,169,138,177,139,140,72,132,192,220,99,138,88,84,14,18,18,97,145,35,185,10,37,71,149,129,33,170,76,34,60,118,253,99,103,116,235,229,122,200,186,105,203,9,37,56,90,155,136,15,147,82,189,245,28,41,45,114,199,57,253,228,20,217,179,213,137,220,162,109,70,70,143,141,78,39,175,114,231,160,68,61,147,82,240,198,5,246,178,252,1,188,144,108,149,139,242,20,172,105,187,29,81,137,26,228,236,112,61,74,165,40,192,204,206,252,66,88,166,78,231,193,116,6,33,161,117,74,196,190,41,29,112,72,39,135,186,90,114,29,111,239,213,91,109,36,119,210,161,183,207,226,211,195,16,178,178,169,73,176,
+180,97,128,44,235,75,228,252,153,109,202,143,146,246,117,205,137,190,211,193,57,171,74,125,187,219,216,150,168,5,41,221,121,117,122,1,145,89,50,203,107,238,36,29,166,124,250,64,228,22,220,238,217,180,187,9,206,236,194,245,244,137,206,50,211,169,71,89,106,193,115,73,226,183,154,115,137,158,165,247,28,167,3,25,29,59,93,220,175,117,61,224,216,207,105,31,5,116,164,17,65,93,60,213,41,39,147,217,149,167,62,60,87,55,132,74,156,78,94,31,7,201,29,48,139,200,165,193,160,234,161,159,41,15,93,87,85,201,253,128,19,229,58,74,148,74,49,173,186,26,54,17,68,253,245,148,110,145,153,168,177,161,155,122,184,77,105,77,30,112,44,201,9,112,50,4,80,60,247,108,140,84,138,129,7,199,108,114,168,226,1,55,142,228,24,169,226,129,100,60,153,175,111,110,38,47,202,109,47,112,22,175,161,43,225,69,218,92,156,203,61,111,11,76,158,249,99,238,174,218,72,4,116,205,70,147,228,172,169,64,109,63,74,226,41,58,71,237,214,136,235,86,151,90,126,48,
+213,170,70,123,99,58,119,56,118,135,88,81,37,52,213,230,209,156,36,20,47,128,101,103,117,166,132,102,203,33,123,252,232,206,138,196,26,175,108,70,204,221,142,104,57,228,109,20,100,58,85,32,86,13,38,163,179,244,200,197,106,20,231,249,45,52,40,61,208,131,210,84,143,223,115,164,38,243,251,145,254,90,22,170,67,123,108,40,229,214,144,47,146,72,90,34,109,45,147,223,34,142,241,206,185,0,216,219,6,161,179,242,220,2,243,168,58,204,166,155,191,201,74,94,87,154,181,222,76,34,104,68,244,221,86,154,154,72,129,96,223,49,30,232,175,1,144,143,239,82,175,174,144,224,141,35,68,109,122,39,225,6,11,188,108,143,194,104,251,102,77,228,225,236,33,219,109,106,87,168,240,101,122,100,68,71,88,5,19,170,179,193,206,40,127,238,24,36,135,181,240,232,90,18,162,204,74,76,69,72,153,231,115,11,164,171,236,52,176,9,106,39,107,49,64,51,25,76,207,96,41,61,42,108,141,83,98,242,218,8,221,166,146,84,138,41,40,7,208,118,94,153,157,44,60,142,
+238,244,173,102,69,225,109,140,251,146,113,173,66,157,71,60,65,177,37,3,151,128,248,41,185,206,146,131,189,195,50,108,58,137,235,231,4,60,121,48,118,90,244,104,174,108,150,210,84,194,234,19,245,220,177,216,138,108,243,172,8,132,78,58,212,123,89,29,97,141,212,185,11,63,16,168,100,77,30,134,91,39,200,15,73,51,74,29,236,114,39,200,168,54,49,184,207,207,38,233,65,8,196,57,38,3,37,153,14,218,25,51,32,238,87,204,235,212,218,216,191,201,171,232,216,84,250,132,40,181,221,138,229,33,106,63,23,98,234,202,218,17,122,35,21,23,216,211,41,222,196,237,121,148,216,111,245,226,118,162,76,124,204,69,251,241,144,51,86,52,105,107,108,71,81,83,79,119,61,243,184,60,61,99,150,143,117,163,240,69,111,210,200,185,247,166,240,163,76,74,193,158,205,209,102,207,49,53,215,18,39,88,85,108,39,77,209,11,7,101,51,48,71,68,15,21,93,110,71,168,152,78,70,194,78,80,24,105,113,27,115,214,252,166,41,57,31,41,245,209,114,155,144,71,228,53,
+0,223,61,157,11,101,228,198,108,20,107,99,17,99,232,220,219,211,233,160,141,224,38,212,9,162,246,88,33,13,79,77,190,162,92,226,55,197,37,248,96,154,37,145,135,180,8,211,41,223,121,24,207,201,138,29,245,156,75,220,235,72,0,188,37,213,114,142,42,153,187,153,184,237,112,15,193,174,228,64,64,33,187,45,110,91,195,208,151,136,85,119,210,161,197,229,228,5,217,121,228,46,16,245,81,228,128,96,189,163,19,29,14,83,150,14,80,212,90,160,121,225,111,144,79,120,163,14,232,149,247,61,66,189,12,60,98,204,96,141,84,16,12,113,199,131,68,242,186,89,112,236,244,85,209,136,62,47,238,249,19,130,152,52,206,163,66,220,10,114,15,81,218,24,54,119,22,141,115,145,98,250,36,47,211,24,220,147,148,7,144,118,218,84,159,80,57,215,80,24,157,144,34,217,27,15,242,172,253,84,93,80,13,200,251,218,16,152,198,178,244,163,124,175,54,163,12,65,76,186,71,186,206,199,97,117,153,139,237,217,99,221,31,14,171,19,141,71,124,111,115,143,53,231,213,161,
+13,61,85,83,203,108,93,134,206,67,2,232,83,64,67,24,21,11,185,141,158,137,138,41,160,25,211,35,77,102,166,117,152,231,38,42,62,156,214,148,73,8,189,174,3,250,168,245,105,193,147,40,206,54,167,58,193,180,228,220,100,185,102,246,254,99,197,49,168,171,166,253,80,158,215,20,75,168,195,222,4,109,106,217,97,174,80,53,183,23,4,170,122,2,57,61,30,192,7,57,22,110,62,68,38,163,173,138,86,56,52,83,133,14,247,120,90,233,128,71,218,158,84,0,12,194,100,119,3,93,161,179,211,151,218,90,164,79,196,37,79,64,75,186,141,7,39,192,105,210,82,168,130,133,187,254,56,159,5,181,60,53,168,75,3,211,66,65,61,215,225,239,156,96,88,55,110,165,28,110,85,3,204,177,18,44,74,199,35,13,131,72,232,133,239,112,83,231,131,152,156,69,5,243,83,79,31,188,219,11,59,65,107,138,59,72,196,98,172,115,80,39,146,16,249,249,0,18,6,227,55,212,61,249,225,186,68,135,179,216,194,253,246,181,186,157,190,98,202,58,119,155,150,244,117,172,
+105,60,152,193,18,113,29,248,128,90,159,9,78,145,145,162,125,93,43,164,106,35,85,239,77,10,33,171,215,102,94,78,50,37,55,68,169,1,10,125,34,117,61,183,65,110,59,192,66,0,143,81,37,11,184,162,112,61,245,100,160,29,130,10,55,22,76,117,213,224,163,191,157,230,251,250,101,103,155,212,85,82,123,15,131,242,164,55,240,68,89,147,62,37,217,145,12,98,45,123,74,47,152,165,83,233,113,88,176,62,186,45,240,248,46,80,213,205,177,49,179,6,215,236,154,231,160,45,247,84,131,220,13,149,209,102,61,87,143,102,217,183,171,246,98,49,7,222,100,202,181,12,75,174,53,53,251,254,64,144,171,47,63,138,64,152,248,206,153,198,122,26,147,156,144,50,234,212,140,92,191,103,191,166,232,17,193,168,169,49,191,181,118,196,148,109,155,191,33,80,237,213,46,184,161,89,26,13,164,192,161,181,213,7,167,194,30,180,223,84,21,201,29,52,160,210,15,171,196,81,215,95,165,112,27,253,74,242,14,199,34,38,138,5,134,86,136,193,59,253,135,184,228,3,107,19,
+204,23,176,126,240,94,211,195,226,145,121,112,87,62,3,10,153,118,171,42,212,1,229,62,181,107,237,196,105,233,73,75,38,145,116,69,56,45,201,169,214,0,201,144,101,236,81,116,30,58,78,240,74,49,112,223,182,252,58,213,213,164,191,126,132,214,139,155,78,254,38,17,80,142,30,142,136,48,212,161,106,254,160,175,238,72,6,186,113,115,192,221,65,245,245,237,135,129,105,150,84,167,21,149,30,107,190,67,23,110,140,97,132,211,252,188,69,49,195,108,169,90,108,118,164,241,180,193,209,118,186,101,190,110,56,198,133,222,180,180,79,225,130,158,218,236,62,65,225,14,221,241,158,169,118,14,189,220,157,73,97,241,90,59,15,147,197,19,78,84,61,18,106,70,131,52,229,74,63,145,167,71,227,233,153,207,194,187,36,139,52,128,13,61,3,137,122,16,213,233,217,82,200,162,23,229,233,217,18,230,153,248,218,196,182,238,241,216,115,154,172,248,184,189,105,106,131,99,249,104,115,100,71,58,236,23,38,159,200,133,108,136,177,194,208,56,223,160,122,192,249,221,40,172,114,227,
+33,118,22,88,92,97,34,61,81,85,246,92,41,123,120,212,77,114,83,160,35,221,70,246,210,179,124,250,150,131,191,75,27,36,196,252,157,76,229,10,14,96,178,118,37,26,206,9,67,96,215,159,23,14,61,85,164,88,82,77,105,135,138,43,183,126,238,240,235,216,9,249,53,233,250,160,49,7,235,150,168,147,150,102,68,137,206,88,162,31,153,52,161,247,211,161,90,36,7,49,241,29,241,165,98,48,115,175,251,37,215,138,70,182,105,140,239,28,106,107,245,7,51,127,19,80,53,242,15,103,68,216,64,77,207,52,129,42,44,221,69,246,30,4,8,216,32,41,12,200,29,35,45,216,8,22,60,29,206,229,224,72,82,11,50,33,88,99,130,217,145,178,106,103,233,226,68,242,240,113,6,0,136,241,67,139,43,208,51,220,92,52,133,235,78,75,139,195,64,123,51,228,217,152,19,76,112,252,56,220,139,83,68,3,128,36,239,81,157,41,105,149,158,4,199,3,167,32,77,30,3,142,246,38,41,25,31,3,78,244,136,166,201,150,83,1,22,48,77,164,88,81,45,119,68,229,
+217,244,102,92,103,62,86,165,65,241,113,219,197,186,51,117,216,254,124,103,16,105,38,100,90,187,93,57,177,140,6,227,46,169,211,250,63,216,123,179,231,86,178,244,62,240,95,185,209,15,182,20,110,245,140,44,143,199,246,76,76,196,132,198,30,107,102,108,61,120,28,243,90,165,174,219,82,133,170,111,85,84,85,91,234,8,63,128,43,192,5,0,1,16,0,177,38,137,133,32,136,141,216,137,45,65,18,251,154,196,78,236,36,246,29,196,190,38,114,18,196,189,213,173,182,58,164,136,81,72,122,152,136,123,47,144,153,223,249,125,235,249,206,57,137,239,220,147,80,71,106,104,124,79,105,10,90,12,192,95,101,102,42,69,228,106,218,112,199,208,185,125,78,233,89,92,3,242,202,194,145,144,49,13,119,180,8,84,129,206,74,10,198,81,98,146,238,82,76,32,119,70,169,96,3,222,1,63,212,150,91,21,169,153,4,120,173,85,187,139,73,167,171,162,208,179,99,43,145,234,146,154,231,32,148,24,211,17,63,242,122,245,136,140,169,158,5,172,86,82,77,29,153,180,166,169,
+163,179,134,155,86,239,225,197,235,96,85,50,17,249,164,128,93,64,6,216,117,62,70,74,106,108,246,82,117,155,15,176,242,75,137,237,185,147,56,238,244,129,216,115,201,55,207,45,184,185,174,132,176,240,228,78,246,240,132,190,151,179,83,87,119,128,179,89,250,110,174,212,227,205,85,221,22,198,214,101,73,209,113,180,209,28,161,211,111,6,139,128,88,237,253,100,36,62,9,2,33,184,126,32,97,200,111,203,49,234,64,231,114,120,30,138,115,154,185,42,154,240,2,86,171,186,49,15,118,44,162,110,184,132,142,10,124,151,101,28,53,97,45,13,1,164,234,115,148,133,8,208,90,80,210,47,96,146,98,181,198,81,187,182,146,249,231,173,152,53,111,102,139,28,116,224,180,61,116,28,81,204,116,16,144,93,157,30,204,233,213,69,155,135,79,130,182,165,202,5,48,151,197,148,194,71,55,79,98,68,100,241,144,181,174,46,114,38,146,108,249,156,54,51,231,112,98,80,197,131,253,101,149,72,95,38,170,93,32,245,26,206,78,144,171,11,147,218,244,218,195,21,185,156,228,74,
+3,5,197,144,252,17,236,100,37,180,184,172,15,83,33,189,222,88,200,90,253,86,74,118,20,1,22,216,68,199,186,58,104,249,91,195,252,17,60,218,177,65,176,217,154,174,221,56,2,62,121,128,150,21,118,80,207,232,21,133,157,71,179,34,176,156,13,42,13,17,55,11,156,149,3,165,137,245,17,152,52,172,83,189,217,129,191,68,179,58,239,225,178,107,129,115,173,107,89,230,185,167,86,251,26,201,34,246,129,91,109,223,14,123,112,94,153,152,88,187,182,4,107,149,31,171,193,153,194,253,124,202,210,119,102,3,155,19,65,2,206,68,43,107,152,54,124,243,213,110,45,7,5,93,68,171,104,20,122,62,23,101,141,186,105,65,134,230,125,221,229,235,176,189,227,202,232,176,175,114,41,148,3,221,200,56,222,216,97,91,46,166,26,61,162,67,122,69,198,36,211,27,95,100,233,115,78,4,174,47,188,93,2,28,123,40,46,228,22,172,177,90,224,207,21,115,87,130,57,195,182,189,167,89,74,78,223,184,77,32,166,14,206,58,15,166,39,12,47,81,53,96,152,29,156,67,
+59,99,172,14,192,70,149,68,132,20,130,175,90,182,223,252,122,62,37,115,33,7,212,45,245,194,184,89,176,18,142,41,130,203,140,89,99,227,209,85,195,192,211,112,169,11,111,203,233,234,182,186,148,133,155,72,113,226,88,32,14,78,81,17,52,151,68,166,125,238,60,43,205,234,44,119,198,188,153,172,214,103,39,22,233,180,224,82,117,76,247,250,0,82,32,184,174,150,10,211,192,151,95,46,205,166,42,4,70,38,77,225,98,49,32,134,50,121,69,235,117,43,54,176,174,110,250,79,217,210,33,213,32,89,162,19,136,102,110,208,227,0,176,252,106,155,223,138,193,157,165,28,119,180,83,208,37,44,173,248,42,159,244,181,42,229,252,109,78,181,84,26,245,6,205,34,239,16,210,229,171,195,158,53,137,240,77,83,113,89,102,232,68,102,22,146,23,124,164,84,172,233,213,98,164,128,129,123,111,28,146,181,112,73,215,121,8,237,70,149,226,179,240,252,40,119,211,236,37,249,244,7,249,64,103,46,190,32,121,116,186,73,48,92,244,87,0,251,213,231,212,251,50,230,30,145,
+165,3,243,61,38,94,97,40,20,205,18,235,147,190,200,176,176,77,236,17,229,5,172,7,70,231,212,107,98,191,211,31,8,103,51,253,50,253,180,152,192,133,232,68,122,101,158,204,105,87,176,245,104,1,204,208,149,197,216,21,219,230,39,178,102,126,181,202,179,45,20,103,58,214,60,179,19,247,47,124,185,241,234,25,49,78,70,244,3,69,125,213,149,32,242,73,141,144,95,53,9,67,62,76,150,53,41,182,110,162,100,21,182,75,205,169,73,226,85,115,253,86,187,167,114,11,141,159,94,43,153,0,68,39,82,173,126,122,57,50,16,37,172,158,83,153,239,180,69,145,95,77,197,233,208,117,242,146,200,69,162,130,122,30,200,206,16,4,182,154,123,249,99,161,99,230,48,148,225,163,114,186,119,11,88,11,125,34,84,170,118,204,46,168,170,110,82,171,157,224,112,10,39,13,166,128,97,250,210,227,221,206,37,171,224,44,225,149,36,44,170,66,249,90,97,118,72,226,65,54,29,217,113,245,10,141,177,202,106,81,152,144,241,89,249,206,45,103,117,243,15,182,174,194,42,14,
+116,218,193,92,162,231,81,244,23,215,102,97,178,108,69,241,53,138,68,14,134,101,71,52,200,212,41,2,135,71,116,107,98,208,30,170,119,80,243,83,111,81,243,43,21,83,196,107,81,199,105,150,59,51,255,197,143,143,200,189,8,216,131,77,138,14,171,87,105,35,199,77,44,225,22,144,35,217,196,4,24,59,109,136,134,133,37,152,79,123,175,94,252,206,34,11,90,111,211,228,251,132,204,150,155,186,208,241,194,28,56,239,98,35,137,192,89,92,185,228,235,249,253,19,182,180,31,12,32,244,85,59,185,200,221,44,227,167,160,40,120,102,236,179,39,157,73,0,8,141,86,199,20,249,204,133,46,80,39,137,201,210,22,231,232,101,131,42,123,103,1,49,85,250,249,177,37,14,37,219,237,145,71,209,180,116,136,89,99,165,53,77,79,58,244,87,25,124,89,194,26,156,51,155,59,114,149,4,58,126,88,100,134,86,211,242,125,31,56,133,184,37,56,31,86,189,206,14,232,22,228,69,36,225,2,195,102,236,40,38,83,213,83,8,253,16,63,244,144,47,96,146,44,167,33,32,
+137,39,139,83,50,241,60,89,45,124,96,57,22,138,116,122,243,84,78,44,147,6,10,79,190,4,24,172,75,206,149,201,71,38,32,187,38,191,95,122,85,134,42,117,116,206,63,25,112,147,86,100,7,90,121,30,170,178,252,108,102,180,201,159,228,250,209,225,40,162,200,116,17,130,4,93,247,93,212,71,17,80,243,162,144,168,116,173,113,57,95,114,200,97,5,40,232,134,247,150,172,241,244,78,45,76,74,37,222,200,160,58,114,237,149,207,203,162,23,174,65,216,210,90,173,227,73,121,44,234,34,93,17,236,177,20,7,121,195,82,106,67,104,16,199,184,244,139,9,16,123,70,160,14,136,189,154,17,246,38,216,22,216,8,229,100,11,187,199,154,117,129,198,166,219,131,247,17,243,47,9,116,22,62,79,129,66,18,40,54,147,133,77,74,161,105,146,176,38,30,210,149,67,239,163,173,95,80,39,129,89,41,173,50,211,125,130,58,213,206,160,163,154,163,11,88,190,71,111,30,238,148,21,150,212,82,92,29,212,41,10,184,222,141,91,74,208,153,185,237,227,180,17,220,49,113,
+180,236,182,40,106,117,40,53,137,204,21,29,43,210,243,116,11,200,50,48,0,242,11,243,142,228,146,189,176,175,146,85,25,226,51,64,173,140,9,113,228,6,137,214,210,128,56,88,193,110,46,83,94,77,74,131,184,101,82,97,119,18,92,75,163,69,173,74,153,175,222,67,36,220,179,230,154,167,136,51,214,161,180,205,238,213,131,192,191,167,24,90,71,217,130,34,175,71,118,176,199,208,234,217,173,183,76,23,153,28,49,200,238,63,83,252,48,215,252,34,35,86,3,153,73,66,212,130,209,49,101,177,170,76,245,85,184,114,150,93,45,114,136,199,202,232,49,243,32,125,65,181,206,18,104,119,25,189,238,34,240,93,189,218,236,38,37,86,183,152,11,179,70,158,18,20,135,199,158,58,123,84,22,61,60,30,86,67,227,212,176,148,25,9,165,51,165,59,73,118,246,80,145,164,102,101,182,77,191,114,54,198,244,73,23,237,130,229,130,162,28,93,201,60,254,188,95,250,36,68,202,207,221,11,87,188,141,84,160,101,30,142,230,45,157,219,14,96,89,77,1,243,139,117,218,181,
+172,110,187,129,14,184,194,82,160,105,104,213,36,34,61,9,17,65,234,18,2,146,12,186,2,240,82,196,71,140,189,193,21,16,188,109,84,133,82,254,202,156,16,231,23,249,87,146,72,213,236,44,4,247,242,89,31,9,137,44,244,165,18,169,231,193,236,208,74,76,35,221,124,117,213,88,16,86,217,4,34,2,87,146,72,238,117,16,219,201,35,121,141,135,149,63,211,205,88,145,188,126,193,217,201,195,217,73,215,220,88,237,140,87,193,215,45,19,92,69,14,38,49,235,232,65,159,15,27,13,93,203,66,54,75,96,131,138,217,210,184,15,171,22,230,140,200,225,43,232,25,114,188,149,20,214,135,199,98,135,124,122,241,100,103,249,144,71,83,161,67,211,67,150,179,61,19,1,153,88,158,252,45,141,174,88,18,34,238,195,151,163,124,54,148,18,46,196,116,181,185,89,78,100,227,59,203,203,158,141,64,39,84,172,130,221,97,103,96,10,2,3,115,201,218,126,106,236,36,165,240,197,17,133,147,111,91,87,234,174,85,220,144,80,146,146,1,98,157,238,76,243,231,242,85,40,
+141,173,111,47,77,21,145,92,250,164,87,153,99,222,69,30,156,50,56,222,242,100,167,87,238,130,250,163,217,132,131,208,22,234,203,102,104,138,240,43,248,73,103,62,152,85,235,175,80,43,93,178,130,229,22,94,248,162,222,247,86,137,21,31,55,232,111,251,128,3,113,45,71,19,121,77,163,100,55,236,129,74,138,35,61,145,102,125,17,52,98,176,133,44,242,246,195,199,216,190,215,5,222,190,220,98,111,198,183,96,190,46,112,113,14,3,103,22,205,83,93,29,236,155,139,21,233,217,78,178,14,181,140,217,214,203,20,56,80,169,213,227,198,228,161,175,126,165,199,76,15,210,125,64,232,146,19,3,136,225,165,165,206,33,57,18,17,111,158,231,96,122,130,77,177,176,87,151,53,208,6,160,203,226,194,228,16,1,110,36,164,164,17,238,183,118,102,64,237,88,228,53,132,27,242,236,237,29,216,47,75,228,153,26,173,127,8,13,212,195,103,253,189,180,133,127,65,157,211,91,180,143,0,69,62,217,190,247,96,205,93,157,143,39,154,112,77,227,86,187,225,242,251,253,22,191,
+81,21,62,104,122,167,46,115,60,181,144,8,177,30,32,44,170,84,42,43,218,195,240,128,193,96,108,237,233,224,2,122,13,95,4,0,13,184,88,109,45,232,237,69,167,86,131,220,174,188,191,197,86,68,26,221,25,28,30,3,71,167,79,57,21,113,218,222,3,134,115,231,214,77,163,211,64,184,9,81,58,124,42,74,47,142,122,53,40,203,7,235,195,246,246,57,68,112,233,201,224,129,250,20,50,7,59,36,112,43,134,115,211,216,178,252,173,9,237,121,64,141,114,22,168,83,48,184,83,88,181,223,119,168,226,58,39,44,15,47,70,124,154,62,230,166,19,94,219,22,48,174,176,28,186,146,178,176,232,9,67,18,207,5,205,242,69,56,174,27,195,225,156,115,36,72,138,70,51,246,75,150,7,111,159,144,120,15,144,49,33,111,151,231,52,59,96,247,1,24,123,170,36,128,140,180,120,251,104,156,238,42,44,3,83,121,226,105,39,150,215,193,128,216,18,90,166,2,132,97,102,198,150,129,145,254,145,36,160,48,196,224,240,8,236,204,134,51,232,42,212,15,216,20,34,119,
+236,84,104,121,147,87,139,115,135,68,18,227,106,63,111,72,231,227,163,21,81,4,34,2,246,206,104,4,213,163,59,1,69,172,114,133,111,232,160,172,36,156,224,212,250,79,180,5,32,8,29,168,140,101,21,51,26,81,71,133,16,166,196,11,15,61,208,164,27,241,153,224,1,181,155,2,65,8,136,182,105,78,228,254,177,230,55,38,174,47,151,97,126,135,16,107,207,142,157,88,105,155,82,57,162,198,198,232,138,126,60,175,13,188,98,243,221,24,154,237,30,208,193,45,220,177,59,6,100,114,144,75,49,23,204,6,92,153,249,178,23,18,64,41,131,144,153,54,207,41,85,40,245,152,145,192,225,216,5,94,18,156,220,154,28,243,221,219,115,158,3,24,202,231,10,169,185,21,235,51,78,169,116,177,85,204,6,235,89,238,161,108,226,161,1,37,107,93,1,57,123,179,19,10,172,74,13,15,238,252,246,198,66,144,17,239,205,188,106,211,98,196,241,158,14,152,101,251,160,169,213,24,131,20,80,108,153,135,40,87,141,225,83,187,238,161,92,228,243,12,225,252,117,119,205,64,
+218,201,205,164,84,109,72,164,224,30,215,39,46,93,142,224,73,87,87,224,116,17,62,17,173,29,86,10,228,33,190,76,26,3,25,93,165,70,227,178,108,13,227,158,54,69,244,226,7,118,91,208,28,133,224,87,224,240,162,38,57,82,154,161,7,174,203,213,246,24,80,223,9,106,20,209,227,2,64,189,89,138,42,22,130,162,254,66,140,119,160,113,226,46,193,100,116,126,145,157,15,61,181,12,152,81,113,208,123,157,171,83,29,23,84,246,94,149,104,24,72,93,250,80,46,5,23,138,133,249,116,247,252,105,110,39,115,174,80,219,209,64,101,137,33,130,48,219,66,72,218,76,162,141,158,235,148,89,16,4,83,227,204,73,26,200,111,225,118,193,122,174,5,104,122,131,136,134,46,26,15,226,0,102,215,235,3,134,102,200,8,111,139,79,118,81,100,186,17,230,65,188,184,183,218,107,193,248,149,226,156,152,177,222,221,12,15,192,3,102,106,124,144,212,22,146,105,116,96,195,212,118,195,187,162,88,94,116,67,99,213,77,252,46,0,138,141,222,82,155,202,2,26,230,83,240,
+164,10,171,250,245,197,134,238,241,88,20,43,63,58,221,187,218,39,238,188,180,112,131,242,11,147,137,166,3,192,198,22,46,136,129,195,78,69,184,69,241,14,174,115,49,217,34,219,155,61,177,143,225,7,121,35,149,202,201,102,201,91,175,122,116,176,188,27,110,183,41,94,197,98,20,93,213,69,13,118,185,66,151,47,21,101,250,244,66,16,200,186,92,253,81,91,97,77,205,46,175,23,71,49,88,27,58,72,205,124,137,172,164,193,78,201,38,228,115,84,47,132,2,200,162,80,239,18,94,110,159,112,148,29,10,103,36,66,205,1,68,65,146,118,54,210,88,95,219,91,140,161,57,212,0,128,57,43,230,230,235,227,160,65,106,9,77,206,240,132,78,108,194,62,1,236,234,28,228,230,118,242,116,9,112,72,233,207,80,79,106,140,161,161,71,152,82,227,245,211,23,163,144,210,82,3,81,152,203,239,111,183,169,34,167,6,218,127,104,200,41,15,168,165,76,221,134,178,239,5,140,222,2,170,195,221,144,87,211,82,46,233,221,254,210,211,206,54,247,242,162,0,66,50,51,29,
+110,10,101,36,98,137,28,96,189,124,25,29,197,199,7,134,121,236,178,72,245,117,94,99,134,11,148,151,113,107,236,57,162,148,106,209,179,128,92,192,238,2,154,121,173,117,176,106,121,102,195,246,104,16,181,204,37,213,221,101,252,156,59,241,64,197,128,7,245,59,143,242,0,40,164,178,201,2,186,126,56,226,245,3,1,69,126,49,121,193,205,75,87,245,9,236,138,115,35,181,229,245,40,18,144,231,22,132,107,78,144,113,93,99,63,151,119,128,147,230,156,219,6,175,80,231,115,238,230,2,32,128,207,22,139,52,34,41,109,238,242,200,240,131,14,76,46,106,235,201,12,166,86,163,244,226,34,129,12,44,42,59,115,193,222,226,76,167,66,219,156,209,97,85,112,46,16,187,132,178,11,84,2,30,154,141,210,34,142,21,143,243,180,221,104,136,63,88,128,225,248,133,220,246,135,208,139,123,224,73,149,140,136,48,247,97,17,109,208,66,59,35,26,89,24,161,105,29,208,240,97,193,19,68,195,209,23,64,105,214,36,112,99,10,104,166,11,237,142,95,7,219,86,43,236,211,
+57,249,98,232,137,195,61,154,172,6,181,171,178,59,52,222,227,231,112,152,81,39,238,20,217,224,214,2,231,123,154,120,4,98,17,81,243,36,106,103,200,169,154,3,94,193,28,12,241,73,211,211,195,62,248,94,85,53,161,25,32,191,53,169,197,13,40,199,43,14,218,125,86,243,221,218,185,241,2,77,153,147,83,125,167,232,44,159,211,108,89,84,174,225,67,231,136,66,218,33,228,162,26,149,241,180,195,200,71,68,58,76,40,36,226,47,228,99,233,221,58,176,237,202,39,180,3,244,196,75,64,219,153,81,171,26,195,245,67,86,159,188,61,3,31,208,184,30,194,225,25,179,97,240,92,231,162,163,198,42,59,96,2,23,157,246,158,44,188,110,88,180,163,13,161,99,77,61,36,10,16,110,140,121,18,169,121,225,71,109,195,19,57,209,129,100,139,134,93,8,168,213,231,150,153,23,64,111,138,26,160,188,222,157,81,104,11,123,87,114,204,90,183,39,219,19,162,102,19,158,92,55,179,20,109,94,92,239,14,71,28,99,23,53,22,255,26,31,71,69,7,135,15,93,138,78,
+164,84,75,207,80,11,17,192,123,101,207,186,118,237,246,235,92,96,122,209,57,47,80,227,246,14,4,144,238,89,186,30,145,118,235,97,17,7,33,99,240,194,110,25,168,52,71,7,236,59,243,240,64,120,3,99,208,92,0,23,196,126,42,42,134,144,3,134,174,238,197,208,250,43,227,16,100,80,53,181,33,247,36,75,126,88,243,203,160,252,174,245,241,228,234,214,25,147,140,32,165,194,88,109,23,243,250,195,102,113,138,134,176,60,178,133,90,151,29,229,212,58,167,44,89,94,213,217,54,169,122,58,84,32,132,126,178,16,140,151,169,251,124,77,153,130,195,19,40,155,188,101,160,18,207,125,110,88,165,219,219,37,190,46,15,180,104,128,5,79,232,119,139,82,187,8,31,214,22,51,138,150,85,65,68,222,84,143,124,215,67,121,175,89,91,181,163,48,15,77,214,105,106,94,146,190,178,217,237,158,198,155,134,35,30,148,122,106,66,158,221,167,195,245,181,71,38,131,174,185,33,165,221,115,9,97,10,100,55,32,45,41,2,206,225,124,87,122,206,219,26,122,68,214,195,227,
+227,193,90,222,230,124,247,180,70,193,220,54,119,51,34,170,117,39,98,152,91,26,229,7,25,219,99,152,70,218,123,76,78,194,138,79,129,82,215,83,42,190,166,218,205,221,136,70,80,151,127,109,163,104,19,23,197,168,168,216,153,204,236,168,97,111,7,53,138,179,218,160,244,174,237,107,171,57,193,137,24,14,251,203,18,106,88,212,88,237,137,66,128,226,116,71,160,242,51,135,21,31,69,113,18,179,136,125,227,7,116,168,93,21,219,77,238,133,39,118,221,217,15,22,214,26,110,219,186,148,75,252,77,180,187,82,90,198,254,11,166,243,174,22,61,29,65,154,58,159,82,193,182,86,47,206,102,85,211,127,189,156,24,233,104,206,51,81,165,235,60,71,95,231,57,196,213,159,81,140,68,107,30,111,228,117,46,26,208,156,77,69,179,244,94,250,37,44,74,155,43,205,238,46,175,188,86,183,120,17,22,185,228,178,118,47,214,61,27,121,40,53,241,165,57,116,15,214,45,206,235,6,42,77,176,201,141,223,3,154,7,84,133,104,153,61,244,100,93,13,57,109,113,17,186,111,
+112,233,162,208,172,152,18,165,165,102,215,27,129,214,46,124,5,197,115,35,33,200,31,72,130,137,108,81,234,224,235,231,25,5,222,248,218,158,165,205,171,30,159,149,89,168,89,25,250,84,102,241,182,179,62,241,218,217,168,175,217,170,78,52,119,223,67,202,116,27,31,245,12,47,12,233,118,224,112,111,254,132,10,135,58,198,165,68,122,105,214,36,34,114,99,72,104,212,26,225,227,151,103,246,218,161,177,144,72,112,135,202,69,70,217,162,102,83,181,56,122,163,254,218,191,24,222,130,111,142,17,103,68,177,42,118,250,168,15,139,89,167,207,88,222,195,235,90,93,210,232,210,131,25,122,164,195,131,233,93,166,208,162,24,173,249,166,180,195,98,162,147,138,78,239,154,16,175,197,16,52,69,196,107,112,92,13,11,27,233,37,190,65,145,101,162,68,105,218,17,91,187,209,8,138,83,243,40,55,181,124,177,8,67,35,86,166,121,149,27,48,162,150,62,127,71,115,49,89,165,173,169,193,64,85,219,91,43,118,75,108,82,82,85,9,147,195,191,166,30,215,134,149,71,127,32,
+164,233,175,210,221,9,229,154,175,181,246,52,141,181,81,203,236,145,220,195,55,37,199,128,166,100,92,241,171,230,148,169,171,13,16,47,33,29,199,190,70,177,195,42,165,67,49,110,45,18,147,54,19,72,38,38,5,161,96,29,190,125,224,56,31,91,172,194,94,181,47,164,208,205,35,89,155,86,62,101,123,125,173,222,117,26,159,235,182,219,221,174,185,54,130,196,22,162,198,195,91,55,152,2,89,123,71,210,73,221,174,74,183,67,246,26,122,127,157,45,209,158,214,162,87,36,107,131,5,142,61,128,255,41,158,90,13,154,115,65,17,185,237,202,240,139,117,130,96,238,162,9,98,117,115,99,10,174,163,186,70,33,135,207,223,0,17,116,220,155,113,82,190,220,113,108,81,193,43,231,149,80,70,71,52,29,234,155,130,198,35,191,95,210,93,18,195,94,170,137,187,181,30,199,228,104,134,181,100,93,47,178,246,137,146,216,160,40,77,75,150,203,72,64,238,117,69,253,227,91,126,225,129,245,240,240,18,60,64,111,73,208,123,235,91,247,78,80,140,245,148,25,78,77,157,118,
+153,191,184,78,194,248,186,140,173,214,44,103,172,232,170,162,73,13,249,26,131,55,150,21,115,22,164,171,69,174,105,61,221,30,17,31,23,164,166,127,165,78,129,202,64,110,236,24,44,114,19,123,77,25,94,103,3,37,228,107,112,107,195,105,106,180,122,77,214,138,143,181,7,19,62,88,47,63,107,147,138,112,13,131,231,114,210,160,103,123,76,120,172,141,117,29,31,190,94,230,234,20,200,115,212,50,227,63,188,249,189,7,138,181,115,96,217,174,83,100,99,174,122,52,81,58,38,192,83,237,222,18,34,49,1,206,149,133,147,94,21,197,169,219,234,17,16,110,39,69,27,7,169,143,227,182,198,145,235,56,123,13,49,243,138,182,193,175,108,179,209,0,191,218,37,135,208,113,252,145,176,135,166,224,105,144,5,235,195,53,25,58,191,163,173,186,254,120,46,82,233,142,123,154,183,248,189,200,136,108,218,252,206,213,12,48,68,187,61,37,186,156,210,86,187,189,169,54,76,151,47,130,177,133,162,103,153,165,71,84,29,133,120,62,118,107,93,181,33,150,106,156,192,233,142,255,
+128,175,215,206,167,58,43,182,114,245,150,7,97,51,164,83,87,136,238,216,219,106,193,1,48,163,97,81,145,10,110,41,113,62,116,244,236,33,64,38,238,132,209,76,179,111,71,211,62,154,111,31,79,72,112,225,192,15,156,97,236,37,233,162,84,61,129,11,47,235,241,201,94,106,205,75,245,58,113,127,49,60,216,211,254,138,206,141,62,2,158,120,145,26,58,15,14,137,104,110,37,138,181,134,194,172,39,7,40,137,227,224,173,53,96,71,105,214,36,4,148,102,77,178,179,97,119,114,181,129,193,8,54,48,162,225,6,102,120,182,129,81,221,109,96,14,120,27,152,39,222,6,70,228,218,192,12,183,54,48,164,211,13,140,157,80,106,45,74,33,184,96,127,27,85,75,210,173,121,9,66,85,8,144,62,54,15,109,154,211,138,155,230,232,252,99,35,232,225,166,185,253,0,216,8,202,9,109,4,253,77,187,252,93,233,43,125,51,111,88,131,218,247,126,221,34,186,182,47,3,84,242,31,47,215,211,40,104,44,37,173,187,95,13,71,241,149,214,11,8,31,58,201,95,167,76,
+42,14,84,218,81,18,21,74,179,38,113,161,52,107,18,52,95,242,214,36,82,148,102,77,66,218,192,72,77,27,24,138,125,3,51,47,111,96,112,135,27,24,94,114,3,131,225,111,96,214,227,225,27,167,248,6,230,210,189,129,33,101,215,48,199,35,96,175,101,30,161,42,92,60,188,153,183,53,55,150,196,160,18,149,185,180,33,171,19,40,27,129,148,243,141,64,73,198,70,32,158,253,239,87,175,130,42,14,171,234,41,62,138,255,112,246,15,104,55,206,6,198,87,216,192,216,85,27,24,112,111,3,163,202,162,98,14,162,174,161,237,96,239,102,29,65,113,101,157,194,87,131,6,114,2,120,122,68,35,200,184,233,14,7,199,155,238,0,159,111,186,131,255,31,58,158,41,78,16,226,198,80,190,15,255,176,253,232,239,42,111,144,55,48,255,104,237,253,255,235,253,247,163,247,16,165,57,153,11,66,124,150,223,57,177,205,119,207,206,201,156,46,37,136,8,48,238,35,180,227,62,40,92,11,187,52,18,17,141,223,86,177,173,33,251,109,21,43,52,221,189,173,98,11,30,222,
+219,42,22,120,82,171,54,11,221,42,109,179,208,69,249,191,45,116,81,254,111,11,93,166,111,179,208,117,220,51,89,96,50,158,98,218,208,25,5,122,109,218,192,30,16,54,176,107,63,172,97,131,161,13,236,223,122,253,204,217,192,220,97,55,48,168,31,222,96,128,218,6,38,210,218,192,180,12,27,24,33,102,3,83,112,108,96,128,202,6,38,28,220,192,220,236,108,96,78,240,82,52,65,49,124,62,222,162,65,57,130,231,187,230,205,235,39,48,186,121,253,36,242,111,94,63,37,169,155,215,79,190,194,120,254,246,134,138,143,210,172,73,202,40,205,154,68,138,210,172,73,208,28,234,91,147,112,55,48,91,215,27,24,168,178,129,169,31,110,96,198,189,13,12,57,180,129,81,170,54,48,80,124,3,83,199,109,96,158,230,197,172,136,130,78,81,48,198,191,157,62,87,27,179,96,52,27,179,252,157,249,245,111,242,163,120,13,131,186,254,24,245,125,145,139,202,185,5,253,163,148,243,175,198,155,243,186,2,141,163,34,218,252,239,153,239,223,62,206,83,39,235,0,229,211,73,
+104,120,34,127,135,113,69,220,192,224,168,27,24,140,122,3,67,113,108,96,126,235,123,88,201,199,247,176,246,143,225,233,218,192,208,188,27,152,237,169,86,7,171,164,154,42,221,50,183,111,3,255,232,228,140,131,232,58,49,136,206,161,222,248,198,159,70,120,15,119,82,163,28,45,255,161,237,150,220,192,96,120,27,152,31,242,208,112,45,37,186,180,117,137,137,168,152,131,249,9,218,184,24,22,169,21,52,218,216,140,206,169,212,207,255,176,241,249,155,121,56,186,78,3,77,48,185,154,53,248,168,153,217,211,181,153,207,70,30,218,63,206,120,248,193,254,60,237,122,126,205,4,133,202,187,245,165,246,246,18,238,151,194,97,46,127,130,118,188,229,63,190,113,129,135,142,11,38,40,38,170,208,106,111,137,236,66,0,85,164,178,246,140,67,4,223,52,248,255,106,151,99,144,193,167,242,18,179,104,222,8,123,140,129,107,117,103,61,93,216,6,141,12,19,88,31,2,109,17,171,49,246,176,0,209,201,197,213,225,250,149,96,94,132,183,14,70,158,102,20,86,121,137,250,162,130,
+48,117,203,211,34,73,226,80,122,212,65,129,195,203,182,121,183,78,145,53,32,138,156,234,227,165,40,21,176,62,109,55,23,29,184,70,89,191,137,87,38,186,20,33,73,86,7,130,195,85,69,59,153,12,159,14,238,134,67,207,211,68,238,153,120,209,7,30,14,48,92,234,180,240,132,180,126,157,173,211,5,243,135,214,54,118,232,105,198,225,176,86,195,211,54,97,74,48,175,211,117,9,67,84,202,224,248,54,146,152,239,249,144,52,177,142,80,208,244,233,5,94,77,120,35,228,236,16,90,229,216,214,232,224,78,112,152,3,147,41,96,255,44,188,20,201,38,158,107,185,48,42,147,155,188,148,68,250,241,246,129,213,12,139,210,138,1,225,56,14,71,69,94,12,233,122,94,106,90,61,233,87,55,208,114,0,213,37,232,192,91,251,58,222,252,69,105,124,136,128,161,228,74,95,212,16,228,175,232,226,39,54,244,196,131,43,253,203,9,88,55,12,161,185,17,201,23,84,62,73,212,162,94,174,102,55,146,203,88,87,102,188,11,240,143,244,170,75,88,5,227,39,130,142,76,102,
+180,4,100,57,151,204,98,186,95,255,62,194,135,85,49,106,62,0,164,10,0,165,117,1,57,101,80,131,145,79,45,60,253,34,60,148,208,59,81,32,154,43,166,82,241,250,144,216,24,112,249,16,198,41,225,233,160,107,46,213,10,151,35,120,174,12,8,139,56,190,26,197,171,173,118,122,237,7,116,154,231,212,235,142,61,139,104,142,4,111,39,78,182,121,144,23,1,12,249,28,212,206,143,109,137,185,160,12,214,179,163,213,211,145,79,30,46,249,37,41,125,156,27,97,119,152,253,23,90,66,0,57,145,38,33,154,75,25,171,49,77,95,145,54,155,230,119,168,120,49,56,204,106,92,81,187,49,81,90,237,133,152,2,23,13,200,7,155,249,232,61,88,23,134,157,41,147,11,192,28,107,18,14,32,10,203,114,167,12,209,154,176,61,25,122,26,49,162,22,52,121,21,229,83,72,12,179,155,18,186,194,242,42,57,92,27,121,234,106,72,32,233,60,66,235,22,45,109,172,192,97,226,67,215,24,94,68,15,29,218,159,196,242,199,9,226,196,106,81,31,195,225,193,147,198,222,
+140,139,56,96,251,161,157,231,172,223,255,203,120,144,110,220,93,92,144,97,30,84,64,23,196,123,184,104,72,212,156,115,217,237,242,92,128,71,29,208,43,178,220,204,161,199,227,234,166,211,19,23,128,195,216,171,2,104,14,188,61,231,160,207,219,235,231,35,143,71,180,121,206,198,216,69,53,138,104,113,11,108,0,250,245,13,0,249,35,192,203,250,231,139,69,198,19,89,209,58,240,188,36,209,162,127,65,221,150,127,4,96,30,123,66,153,40,3,165,90,148,171,216,200,233,113,73,234,233,190,100,238,65,3,118,96,247,215,253,206,222,188,116,212,60,27,230,91,146,222,60,239,184,6,241,91,103,213,33,176,254,209,222,161,130,31,215,63,218,95,4,0,209,25,131,145,68,39,204,143,232,37,45,213,88,136,74,35,209,136,126,160,58,170,195,205,84,122,229,159,174,119,69,234,232,14,131,231,222,42,111,81,18,1,104,217,210,86,205,43,211,245,196,50,63,228,3,195,122,87,200,167,107,213,205,22,205,174,228,167,179,189,227,114,187,189,200,187,196,186,78,53,13,208,158,150,
+96,90,55,104,103,114,151,0,109,12,26,210,57,80,0,196,218,72,175,109,130,172,60,29,226,26,76,204,249,96,109,53,229,249,167,147,244,235,139,161,85,189,8,111,89,165,237,25,133,106,134,198,179,74,93,11,45,246,39,93,159,168,170,171,118,218,147,244,68,55,238,40,97,61,220,125,173,46,144,195,244,44,107,210,34,47,6,125,160,157,239,66,141,241,234,84,151,95,232,38,192,195,56,103,29,195,38,71,251,120,222,77,47,186,180,246,108,167,141,43,76,74,101,50,39,56,141,208,7,224,204,182,79,31,208,81,149,43,250,251,22,178,35,121,205,98,186,191,177,233,252,253,135,245,241,120,63,236,163,126,247,225,243,159,191,255,241,187,159,125,253,237,102,255,245,251,191,252,252,231,223,124,245,254,221,95,188,255,236,159,126,245,213,187,239,127,249,205,122,31,245,207,63,255,242,195,103,63,250,213,70,237,245,189,143,219,165,215,15,126,109,195,248,15,251,183,215,136,31,190,254,139,183,93,215,223,252,218,150,236,63,124,107,246,171,93,217,31,247,180,255,117,155,178,127,242,
+73,230,13,219,255,251,61,42,217,154,229,255,140,126,249,254,151,255,203,39,22,159,246,104,191,123,247,123,255,245,221,167,131,0,255,224,39,239,254,240,235,15,63,251,242,79,127,241,237,70,224,79,250,174,229,249,252,139,47,222,253,236,203,175,222,127,247,147,223,56,222,239,15,126,242,251,239,254,221,151,223,126,247,253,143,223,125,249,179,141,65,208,63,191,252,250,23,223,190,91,155,224,7,144,223,249,114,179,171,254,139,175,63,124,246,79,191,127,247,231,107,69,255,98,125,218,223,231,127,149,110,189,161,254,109,203,251,231,223,125,247,139,159,191,95,155,230,143,254,211,187,127,243,187,159,182,227,127,246,163,255,240,235,228,63,253,40,241,219,169,133,168,137,126,216,116,255,217,143,254,159,175,191,253,243,239,80,186,181,229,126,254,254,195,47,126,242,73,228,79,178,255,218,222,244,127,254,175,126,255,159,252,143,255,242,95,29,238,164,182,199,24,12,102,251,16,249,116,182,95,246,96,24,45,19,179,174,30,107,151,92,3,136,160,76,3,166,146,91,135,82,222,181,176,103,187,
+188,193,73,189,184,93,33,230,110,119,251,106,139,73,53,107,174,227,194,145,150,107,34,22,250,132,184,142,135,27,146,12,237,244,41,253,90,26,79,156,195,218,120,44,125,13,182,84,70,18,241,196,207,196,103,119,15,230,51,160,202,125,169,4,89,126,142,79,199,168,226,160,60,50,99,27,38,220,166,193,55,232,150,58,48,82,14,114,24,243,249,205,185,170,15,250,24,106,143,244,198,217,62,113,118,143,73,30,137,250,178,163,237,8,122,172,61,112,196,82,21,77,225,171,227,51,253,180,120,92,223,50,220,192,167,73,113,236,78,117,189,71,46,68,183,0,183,147,100,82,60,190,114,26,83,7,31,215,29,44,239,183,160,87,230,93,6,175,43,69,207,104,252,44,249,236,100,2,215,85,112,9,85,135,86,158,159,9,31,220,115,115,200,198,16,142,56,92,105,23,185,135,132,92,98,34,156,239,183,224,138,122,52,97,88,165,192,212,124,138,135,37,245,125,122,49,124,203,199,120,220,47,93,154,236,209,183,144,236,224,132,226,121,55,182,183,53,208,157,209,24,220,135,131,199,11,
+58,238,152,180,114,29,144,64,247,177,159,200,231,187,21,141,99,12,142,39,158,228,216,238,219,137,224,44,98,63,22,100,233,62,30,101,59,51,206,236,144,130,167,119,77,62,6,83,243,217,101,161,188,50,23,187,120,160,112,20,143,23,247,2,166,88,54,137,157,220,136,135,181,139,146,84,74,57,22,219,176,199,247,120,145,231,120,202,178,42,251,94,252,1,222,20,57,188,222,45,230,180,120,30,217,147,218,230,251,235,71,196,163,101,33,195,139,208,227,97,197,213,75,173,215,212,93,111,197,206,86,171,137,231,152,252,120,166,194,96,156,94,67,81,144,56,217,141,2,34,99,6,47,41,90,200,225,165,217,164,173,61,165,150,182,58,198,129,13,87,56,202,202,9,87,211,57,200,5,77,149,171,206,126,170,18,219,207,249,21,52,61,79,104,61,84,13,105,196,26,233,178,21,59,179,233,152,73,121,118,95,67,30,48,122,190,17,119,127,15,44,198,49,110,239,37,143,114,165,98,108,217,207,1,106,86,69,61,231,160,209,212,126,108,35,177,112,235,250,52,73,53,136,213,219,219,
+230,237,33,124,157,240,78,118,113,103,218,11,127,70,82,166,30,144,197,6,121,81,227,203,213,15,26,185,179,107,158,59,162,5,152,116,243,37,255,218,29,199,246,67,36,231,225,101,135,160,220,37,171,33,202,238,114,250,188,163,142,246,114,120,182,139,185,117,143,17,80,49,24,13,126,138,99,145,182,239,249,176,171,116,104,80,236,154,99,174,188,221,200,213,198,3,43,248,90,10,159,64,199,140,22,94,117,136,59,225,173,150,72,249,241,14,15,64,110,40,100,119,243,47,67,184,93,94,218,142,107,180,109,218,61,26,40,57,190,218,197,96,130,181,74,146,73,104,122,136,230,62,223,162,104,117,6,96,113,129,203,198,160,60,101,90,115,209,186,157,101,183,39,79,85,59,129,78,210,150,61,208,227,39,16,91,26,189,242,3,130,83,8,12,235,153,79,86,169,158,216,236,219,245,1,138,2,29,215,7,190,140,104,124,198,200,1,190,105,104,146,229,151,39,215,12,231,124,21,26,203,241,183,237,8,142,81,187,147,94,216,233,75,191,65,161,144,98,207,170,13,19,70,80,0,165,
+152,210,11,63,88,219,241,248,150,103,54,188,147,116,154,153,193,74,215,72,125,52,150,217,167,29,4,64,146,38,253,176,119,93,237,74,150,153,194,125,153,63,216,33,246,252,120,243,82,130,108,169,25,43,236,33,60,161,94,76,189,151,11,122,105,70,172,228,91,220,145,45,217,89,197,47,73,150,21,153,31,201,71,102,210,83,231,153,124,5,85,78,6,200,178,145,121,101,154,89,150,243,139,145,189,196,36,205,250,54,33,65,77,241,203,207,91,53,233,177,117,139,50,224,160,113,137,23,192,154,167,29,59,79,49,191,242,19,9,167,146,171,194,101,132,116,199,119,44,18,160,121,250,28,11,167,242,114,139,124,181,186,191,22,249,52,215,128,85,253,90,91,98,17,116,30,113,126,96,110,104,210,8,114,140,88,46,247,114,123,20,179,163,232,203,232,241,233,244,107,123,64,11,193,57,75,31,157,94,61,144,72,78,57,114,155,24,50,73,244,211,39,30,116,124,186,31,29,63,46,162,163,235,6,153,186,63,211,87,90,121,78,104,197,64,20,39,71,99,62,97,255,237,223,103,9,
+231,244,78,234,61,102,123,142,5,135,136,37,226,32,0,73,253,50,201,204,91,192,240,40,154,165,18,169,183,216,149,209,133,80,30,102,121,203,30,136,114,94,77,8,19,63,212,243,179,1,89,222,196,24,217,38,142,225,86,25,117,80,80,117,217,189,110,202,79,156,245,82,10,42,51,103,166,23,43,51,140,115,139,110,244,173,3,248,229,122,122,24,58,203,43,26,7,130,62,15,255,164,56,167,38,18,143,41,46,43,180,186,61,191,127,88,86,47,33,109,3,195,222,115,46,30,120,37,119,103,111,120,141,159,14,105,193,171,213,106,171,241,74,231,210,66,165,218,126,215,234,163,145,183,243,156,83,138,101,48,200,14,156,123,198,106,238,73,217,126,246,58,238,49,161,85,45,11,53,203,51,198,226,114,204,201,27,199,253,4,118,44,35,213,75,76,217,133,102,47,188,160,250,249,214,167,142,98,224,57,151,245,41,110,45,111,239,192,129,141,184,220,70,89,126,162,16,167,84,124,55,180,104,196,239,224,149,191,76,86,159,8,119,193,196,224,26,191,28,166,230,173,72,66,185,11,
+182,121,90,22,49,206,38,24,47,16,70,195,110,189,112,84,18,105,103,230,82,208,167,104,75,61,27,23,150,245,159,204,133,139,78,106,48,105,228,117,119,233,103,37,215,221,185,198,238,94,136,72,221,94,39,70,89,29,93,115,141,146,190,146,92,24,240,213,247,87,170,164,215,50,192,225,120,101,22,69,161,74,251,68,25,131,178,250,96,149,25,66,187,117,59,135,69,170,219,183,52,199,7,171,195,105,152,254,202,75,110,91,221,124,66,193,47,162,181,27,122,177,48,42,60,17,37,216,39,36,25,71,190,200,218,87,76,210,86,41,170,79,58,142,52,170,23,223,57,159,85,85,80,6,133,88,19,72,40,7,148,249,132,191,165,148,37,23,79,195,190,228,110,87,111,29,221,23,47,11,62,92,235,36,17,16,13,237,44,108,22,236,170,253,38,89,146,237,102,113,154,186,22,81,59,115,64,246,235,236,36,230,237,108,19,218,233,51,204,137,203,65,168,219,35,26,213,235,168,182,156,237,7,160,67,211,114,66,103,222,219,44,133,197,217,194,57,118,68,51,77,38,207,253,228,243,
+2,131,57,13,111,93,54,185,157,124,66,209,100,123,183,249,244,206,161,73,95,80,92,146,122,247,14,159,38,26,150,57,165,217,72,228,104,101,212,54,22,65,111,109,71,100,63,186,21,92,167,94,201,58,126,202,11,158,151,41,199,2,134,101,117,34,19,84,40,98,234,105,37,27,70,74,90,30,5,35,214,183,227,50,30,43,107,87,224,175,28,163,154,117,204,78,134,205,142,64,106,174,115,250,69,211,208,150,137,1,175,138,166,135,72,136,156,82,62,216,136,46,68,49,150,161,67,3,206,212,100,122,14,124,124,241,10,91,157,1,96,44,157,203,153,2,250,103,178,155,97,189,190,36,182,112,135,60,131,197,55,144,203,155,80,59,70,155,212,171,183,69,57,92,52,30,149,188,76,195,92,4,51,61,15,18,58,125,181,11,29,15,75,22,51,20,184,128,144,231,188,222,42,211,37,176,240,133,105,199,37,165,60,78,28,204,222,204,134,70,153,170,211,84,114,133,89,237,181,229,138,60,112,111,41,78,119,36,86,99,170,63,184,10,30,75,179,203,213,104,146,150,148,39,247,240,
+126,164,120,132,148,99,154,219,138,169,113,112,246,42,9,29,218,174,179,25,130,125,49,4,12,179,27,252,83,84,158,92,80,207,184,250,97,107,245,68,57,122,129,67,188,249,64,220,188,229,159,81,27,209,200,1,57,184,19,202,170,179,53,105,86,220,74,232,115,225,56,195,68,200,170,8,39,150,176,148,118,102,30,189,88,211,84,54,61,49,237,176,198,252,35,145,169,61,159,232,29,135,71,220,107,252,243,132,112,162,117,59,169,214,24,152,79,117,238,22,58,49,139,128,121,28,159,85,159,221,253,101,229,146,68,10,22,157,163,213,226,168,116,139,173,210,2,175,212,211,167,41,61,56,204,128,186,32,104,206,20,21,61,98,178,25,82,86,176,84,67,131,222,229,36,154,233,218,93,174,155,91,188,92,225,213,87,17,62,156,167,214,43,118,59,121,203,84,86,12,96,47,133,79,109,164,143,138,106,110,50,15,152,117,250,190,95,177,10,117,156,169,25,5,49,164,26,39,86,174,209,92,70,46,46,119,60,210,29,142,209,42,202,79,152,116,123,177,170,75,75,82,129,121,248,248,
+81,160,226,250,101,97,27,213,226,178,204,178,1,69,226,104,107,4,24,34,78,42,213,185,36,43,13,43,78,15,138,31,108,149,145,89,234,5,140,190,96,161,35,49,163,251,148,18,94,58,51,67,172,173,48,237,233,36,66,30,28,107,180,135,68,176,247,210,184,66,112,106,81,94,21,228,26,69,162,204,4,154,53,42,213,154,149,39,202,155,102,169,39,203,210,84,146,133,116,72,146,129,156,234,89,250,41,151,217,88,65,250,226,113,48,127,177,79,147,43,14,91,220,246,3,48,77,55,113,41,26,179,209,59,232,142,159,18,194,57,28,10,4,83,250,163,51,157,186,77,30,237,166,95,234,143,131,28,75,219,221,9,173,128,180,172,116,115,123,185,59,78,11,3,51,111,117,52,28,83,99,171,129,87,150,95,233,60,124,174,184,62,152,69,35,149,225,236,33,91,34,250,69,234,246,139,162,134,185,165,224,21,103,135,34,136,234,214,132,87,175,178,110,176,183,34,111,139,87,139,195,229,4,162,246,228,103,231,214,157,182,56,119,165,62,156,94,102,242,29,198,83,154,50,81,198,
+69,122,137,72,159,158,77,158,58,233,110,103,85,193,198,170,62,180,91,38,124,181,161,187,27,115,138,242,34,91,24,55,191,96,209,146,218,163,184,247,72,241,234,56,21,203,210,116,174,21,150,75,84,157,58,85,212,167,56,136,22,29,120,11,247,235,115,179,77,33,178,32,90,163,123,143,64,243,88,104,103,17,66,170,75,224,106,43,175,222,219,184,133,102,139,203,98,246,238,84,187,0,27,192,44,105,60,203,169,58,53,123,214,159,93,61,46,236,168,252,57,190,211,109,93,54,136,237,125,121,132,120,168,179,9,110,225,103,131,204,114,127,213,63,104,151,240,22,14,195,18,105,29,51,107,174,160,118,106,107,134,195,1,221,81,251,172,81,3,69,23,226,109,162,51,165,202,55,141,169,110,106,92,18,207,89,118,226,81,89,127,73,72,181,76,76,2,227,168,233,209,199,198,39,68,177,231,172,70,245,145,2,44,201,188,190,131,209,60,36,103,88,230,147,234,96,120,187,123,10,121,251,203,198,173,107,146,16,228,179,44,10,60,41,47,104,65,215,107,142,148,6,114,160,126,153,
+3,15,178,150,226,179,105,49,48,37,142,235,6,51,92,170,234,229,102,38,164,97,237,120,75,204,163,186,50,203,69,19,107,68,144,166,241,211,194,72,197,189,18,107,84,131,231,17,44,41,35,157,6,50,233,108,23,38,246,182,80,177,83,70,130,60,124,169,113,140,60,195,186,25,17,25,68,23,72,86,57,56,42,236,219,194,50,23,83,180,47,243,8,150,79,215,79,115,182,210,166,77,151,92,126,81,134,174,27,164,121,134,43,103,239,89,150,184,234,50,50,72,34,84,35,155,12,51,115,96,238,62,201,69,174,183,143,13,80,161,121,224,41,140,32,131,3,34,52,89,74,74,245,85,174,93,129,58,73,93,127,115,75,27,154,22,217,45,172,253,138,58,73,172,228,87,88,142,158,136,169,220,51,231,56,247,24,207,120,40,89,207,9,91,11,215,56,91,1,219,183,147,113,64,201,195,78,105,193,33,70,126,214,229,134,97,71,54,217,120,46,145,118,86,151,158,44,60,163,207,250,45,197,43,17,124,118,61,42,6,249,224,146,24,234,60,28,39,37,59,30,43,157,237,231,231,
+145,61,63,63,82,144,251,249,212,235,67,63,174,169,223,11,30,157,202,247,161,39,250,220,26,119,187,52,189,71,122,221,174,49,31,107,89,150,36,91,30,100,193,84,3,91,165,109,186,165,47,18,92,239,210,46,191,225,234,211,201,69,238,72,137,104,137,92,65,198,126,25,235,118,79,174,118,172,171,18,191,105,166,200,40,249,101,151,52,112,45,164,233,161,221,79,142,132,22,194,1,55,30,79,207,210,242,104,170,54,238,37,95,96,126,60,107,32,248,2,103,196,145,150,131,115,54,95,244,17,209,162,125,8,76,37,53,113,178,137,104,207,8,171,121,208,123,218,199,42,182,48,129,107,10,215,99,191,56,151,134,68,9,199,139,174,154,107,4,114,38,231,188,235,103,170,137,77,116,165,13,95,58,18,139,110,123,234,31,6,206,187,15,200,217,192,148,229,27,219,230,23,19,81,162,152,210,106,202,142,108,136,186,157,21,118,99,137,237,123,13,121,153,184,186,58,115,216,131,105,127,137,15,129,34,44,119,246,226,176,26,115,82,136,194,193,105,194,202,188,196,87,176,74,35,202,
+231,220,97,163,235,119,159,168,170,103,143,179,169,170,226,96,235,246,85,233,163,149,66,225,221,153,5,36,44,227,120,21,111,120,242,193,43,198,117,212,169,53,215,132,153,199,138,141,40,163,71,100,75,223,228,64,20,95,22,57,119,230,114,255,142,45,116,116,72,186,200,45,94,71,1,145,185,176,245,122,71,202,250,162,37,247,109,203,208,61,179,179,69,103,234,202,203,163,71,11,73,210,123,192,97,122,254,60,98,53,132,171,190,111,184,242,190,100,214,86,50,55,211,37,161,114,91,114,146,210,161,75,41,96,114,70,108,55,26,135,99,37,79,119,52,108,54,244,177,73,244,117,144,130,88,186,219,39,55,166,241,48,210,15,189,162,254,210,180,133,73,17,234,110,90,229,210,99,149,226,170,252,59,46,202,84,20,207,21,193,209,85,53,151,13,84,94,95,131,192,75,140,53,225,119,131,231,200,133,44,145,160,229,66,39,53,183,19,73,152,150,108,144,179,3,90,230,170,161,152,225,180,191,62,110,9,38,205,29,116,37,82,164,24,187,145,93,62,110,36,213,185,32,0,230,19,
+134,75,206,62,86,30,169,77,73,252,132,138,22,151,45,78,35,43,77,181,103,202,99,100,176,107,37,47,14,137,171,195,40,3,15,244,3,202,75,10,238,69,18,123,200,25,93,43,99,177,62,102,90,205,15,69,166,126,236,88,132,245,99,28,237,85,148,0,104,248,11,198,69,158,60,125,246,136,153,195,8,91,177,168,46,13,121,248,124,34,85,115,86,240,177,217,45,159,15,8,200,233,3,28,162,88,231,16,196,31,209,208,241,85,142,244,110,207,188,254,136,207,18,138,52,12,243,58,246,142,110,55,243,231,103,176,229,49,105,209,123,99,254,37,13,209,155,105,146,128,211,41,55,205,38,101,156,72,212,50,9,58,205,238,196,147,99,194,4,109,6,223,214,147,207,50,248,32,67,121,123,57,94,120,154,139,11,61,57,74,143,18,108,64,71,76,65,14,10,28,147,89,200,84,44,149,6,118,126,215,125,236,187,160,57,91,26,76,224,121,203,111,220,18,8,169,190,85,112,119,143,178,173,192,155,196,253,243,81,249,228,200,53,38,116,19,74,248,252,6,39,112,129,39,137,81,
+124,122,180,63,59,234,12,21,65,207,56,107,188,179,226,36,146,27,75,183,124,127,13,133,86,67,132,134,29,118,140,9,181,160,72,184,108,166,172,35,207,181,63,200,231,143,61,26,213,249,107,120,133,77,213,56,76,65,159,47,242,230,196,228,161,159,47,118,184,194,21,51,144,64,208,161,172,183,207,43,234,26,134,199,104,136,18,10,211,231,46,48,43,144,195,29,10,99,71,31,119,143,89,113,17,113,118,186,83,159,201,163,5,18,165,177,171,124,190,105,97,84,68,132,35,95,221,83,131,141,59,230,224,66,185,148,166,85,9,201,150,38,227,233,87,218,88,228,106,207,121,170,175,171,155,60,105,69,226,36,193,190,57,91,54,239,115,29,229,61,199,4,150,58,227,116,219,12,199,95,153,148,128,68,62,59,180,73,70,92,146,135,71,111,4,243,178,135,21,91,77,106,202,59,99,241,180,158,149,202,15,210,163,152,80,41,15,166,31,253,99,201,129,167,24,136,93,76,59,68,36,199,101,101,25,186,170,86,179,77,236,143,184,12,152,38,198,187,78,172,210,160,227,188,105,81,
+239,159,39,143,121,198,203,243,36,131,36,60,243,40,74,72,63,129,40,164,9,81,34,231,97,80,35,36,249,128,94,49,85,43,47,166,35,236,236,80,49,88,158,230,154,28,82,153,213,31,27,16,175,226,78,80,233,108,153,143,118,248,86,71,19,88,181,39,227,5,167,157,184,4,147,38,97,232,212,233,140,123,53,100,254,76,185,158,230,215,94,46,73,163,130,93,72,194,106,210,86,79,126,138,198,222,197,49,87,181,56,141,69,203,153,69,216,171,133,68,212,40,86,90,123,108,187,19,0,195,89,128,91,170,188,30,46,5,46,186,70,73,151,140,109,26,184,200,9,54,4,233,102,12,59,41,95,228,138,14,2,166,211,251,178,233,82,241,138,39,236,11,210,43,137,77,114,16,221,221,198,104,46,95,116,12,59,219,48,142,230,22,29,186,205,72,207,19,234,131,242,46,208,166,123,172,170,150,55,86,150,204,24,101,138,122,18,204,118,18,220,124,194,162,108,211,77,10,86,213,191,55,224,178,140,179,125,78,241,129,203,14,233,206,71,3,27,241,56,177,56,83,225,73,199,6,
+193,206,129,155,175,104,112,152,175,26,222,182,225,192,207,31,16,125,148,37,255,168,41,32,27,107,60,77,129,237,102,218,252,25,126,128,115,35,54,102,151,72,63,41,49,69,89,114,149,252,154,226,67,194,97,49,52,202,24,165,185,182,207,162,54,158,94,84,141,8,71,154,53,89,109,89,43,85,71,60,4,39,46,195,12,79,176,228,30,77,57,232,50,180,58,220,127,193,168,163,195,243,94,148,20,133,199,3,0,191,243,106,108,159,45,67,206,23,78,86,79,104,104,123,81,91,23,207,95,116,152,49,66,113,224,238,164,157,195,64,86,87,224,181,109,144,37,15,10,34,186,214,96,164,207,39,122,233,88,219,171,67,167,89,139,124,81,175,109,154,28,151,164,96,11,74,71,112,202,246,57,110,54,183,115,46,60,138,93,144,198,240,120,31,170,53,95,193,65,186,148,113,46,218,166,219,158,178,234,102,205,49,218,10,75,229,217,233,173,30,200,99,113,38,157,242,51,67,202,39,226,11,154,236,143,48,143,78,245,19,88,86,79,28,182,166,54,173,183,168,205,208,51,160,48,85,
+99,72,119,1,210,102,57,175,180,107,146,181,144,220,181,52,120,161,168,142,230,252,129,73,33,89,0,131,177,181,139,200,12,60,91,3,172,231,37,11,129,204,32,40,91,241,92,231,117,211,20,243,174,192,94,231,8,219,146,133,221,12,134,51,218,62,74,73,119,200,102,79,255,240,246,212,115,106,10,94,241,234,122,132,18,24,37,13,156,196,22,249,100,53,217,205,110,61,251,79,199,142,121,179,150,138,143,35,32,192,92,52,119,70,1,41,23,26,29,24,32,78,237,208,218,121,182,141,248,164,97,93,160,127,88,237,119,221,209,238,99,205,151,196,183,25,216,200,33,97,215,141,43,21,140,220,48,219,195,29,78,163,142,151,187,254,75,120,53,50,162,107,238,243,4,246,217,181,75,76,250,69,15,0,63,4,116,245,156,62,85,57,186,18,132,247,251,68,86,145,136,165,117,98,152,250,114,85,60,240,131,51,9,151,51,192,92,13,85,130,7,59,211,74,218,18,248,221,185,103,231,113,250,76,181,140,52,188,56,207,153,37,226,241,156,140,196,206,28,227,88,70,158,149,47,40,
+19,221,241,182,36,158,103,239,99,52,197,176,91,117,206,240,0,138,38,190,55,49,248,133,110,180,187,185,193,242,171,190,243,152,189,16,93,209,112,61,211,43,93,243,92,53,213,170,117,59,230,150,42,73,218,116,248,227,244,213,44,226,190,57,57,99,216,149,52,230,189,202,165,247,227,112,2,209,136,78,16,40,47,78,207,147,142,158,226,36,15,171,151,175,106,237,144,145,104,131,214,91,29,198,182,170,143,158,69,152,83,204,221,195,217,206,152,149,204,38,152,28,238,5,126,253,242,83,230,230,99,112,152,59,69,24,135,193,216,30,143,52,219,24,204,176,192,91,63,178,176,233,17,247,181,213,178,139,1,49,143,198,70,179,217,46,71,220,174,179,186,253,60,126,117,200,187,58,108,88,30,201,91,124,21,190,100,234,29,203,21,38,17,233,242,97,53,51,59,66,209,244,240,106,140,57,141,53,98,89,178,70,133,229,93,53,106,82,201,219,141,123,97,46,46,243,240,83,56,69,111,11,99,47,96,15,113,26,35,202,87,115,123,96,186,59,143,105,231,151,204,3,144,231,200,110,
+19,208,37,58,219,201,27,19,49,162,24,217,34,88,120,19,26,70,207,205,23,9,218,91,24,117,162,56,17,99,8,11,107,60,169,20,171,38,14,86,47,165,217,10,95,12,232,245,93,12,211,47,32,157,199,132,170,44,222,14,88,142,65,161,34,57,141,176,48,231,142,156,58,140,179,129,242,120,131,27,94,70,199,64,221,117,115,27,9,22,178,154,136,237,236,142,231,224,227,189,183,214,220,181,76,193,176,63,201,204,108,140,64,134,84,132,36,156,179,22,189,37,89,30,40,99,94,0,203,41,105,56,24,178,231,200,103,32,97,173,171,220,112,15,67,206,60,132,113,226,246,178,208,118,176,140,183,158,33,150,135,208,119,95,201,151,47,117,1,73,81,208,166,13,152,187,254,99,140,234,100,167,153,198,3,169,13,139,177,251,174,53,189,7,6,25,227,81,4,2,34,210,248,206,109,198,75,186,209,91,77,45,47,61,193,156,248,212,96,87,208,138,23,181,89,110,120,238,173,217,95,237,203,32,11,231,100,95,42,57,207,68,220,113,54,200,114,170,84,173,201,229,179,233,105,182,
+136,98,95,47,107,78,194,137,52,203,126,246,139,241,67,6,190,203,84,194,213,173,109,12,153,93,223,173,141,238,100,126,126,1,131,9,54,116,45,204,86,60,209,66,103,234,161,83,71,232,84,22,75,197,204,26,114,114,180,12,237,206,81,23,202,116,49,221,194,168,36,222,149,176,238,144,76,156,158,209,169,245,93,222,149,154,162,30,223,198,165,48,231,18,189,74,61,29,120,194,252,56,69,33,106,107,152,99,104,188,196,145,130,57,19,5,23,226,1,194,194,213,97,88,200,195,154,60,60,13,45,140,115,56,246,196,228,19,103,107,199,89,148,70,73,146,4,91,103,13,93,100,117,123,188,171,240,181,209,206,236,69,111,227,167,202,252,13,150,26,150,162,180,98,50,224,60,110,177,88,167,78,166,90,69,169,42,197,135,188,150,215,119,73,210,251,66,166,10,127,32,191,99,94,92,77,111,99,228,75,82,205,4,4,88,7,182,179,83,199,60,164,19,134,113,137,193,197,222,51,220,77,104,113,50,1,233,240,48,194,17,131,117,65,174,99,36,93,134,132,36,57,218,172,1,107,
+80,50,104,176,215,82,152,241,184,48,94,176,191,38,19,86,153,116,49,241,80,24,228,155,176,122,23,147,136,6,170,209,126,160,41,76,58,52,177,52,100,215,226,4,36,219,154,172,205,20,67,68,227,190,125,86,194,214,199,79,240,249,213,225,97,255,138,228,220,6,179,135,194,212,30,99,178,23,198,209,54,226,183,162,208,156,173,195,107,42,123,225,56,170,126,72,198,147,146,156,215,176,233,84,178,81,19,199,69,233,152,76,167,81,200,190,200,235,201,33,238,86,22,245,3,53,203,163,226,163,179,137,227,129,89,188,184,186,141,21,35,238,202,51,61,84,158,169,35,110,20,36,202,8,225,61,51,33,218,31,29,90,213,156,228,68,187,90,212,203,192,75,214,215,253,185,182,192,12,173,154,73,27,6,115,30,56,199,227,214,189,20,237,191,53,180,255,98,53,133,215,227,131,124,59,187,143,193,56,219,251,89,209,210,135,231,203,5,36,12,230,228,156,180,254,56,167,215,113,187,24,76,205,193,220,66,219,161,200,24,140,3,147,123,123,194,160,219,152,47,11,39,230,22,115,183,
+253,132,236,119,173,244,200,114,95,49,238,156,238,96,48,186,29,205,246,41,154,19,214,41,97,251,141,27,230,174,240,150,45,30,143,78,222,178,69,223,191,205,55,173,239,159,139,114,173,136,59,17,198,157,96,48,238,19,148,100,31,179,73,40,142,225,38,161,220,189,181,86,132,159,214,173,125,23,248,221,82,105,45,198,157,34,147,20,146,194,155,118,103,127,139,118,251,67,119,198,195,220,194,228,48,189,202,180,93,21,156,175,181,156,8,72,187,111,90,238,162,114,174,181,196,96,120,111,90,98,114,161,141,254,214,208,203,209,155,38,159,236,246,155,121,143,183,97,231,62,127,99,7,118,215,239,199,107,101,138,147,185,127,164,81,177,53,219,40,41,25,53,7,230,112,99,14,204,214,198,28,10,229,198,28,26,220,198,28,124,222,50,143,222,192,153,62,221,191,218,222,24,112,119,195,22,99,223,176,125,188,248,200,150,180,97,203,63,193,108,4,250,109,250,159,109,224,126,171,63,30,55,112,127,75,253,194,184,227,13,220,111,213,231,183,201,253,178,129,83,9,124,124,161,147,254,
+55,251,251,147,220,254,117,35,15,63,185,253,102,31,55,251,111,226,67,69,125,93,58,113,98,142,49,119,203,95,143,215,55,39,163,62,62,95,59,25,245,241,233,218,201,232,147,237,141,251,49,194,90,153,238,244,226,229,219,10,202,58,188,10,161,147,183,48,16,224,54,221,96,247,99,55,192,216,55,221,0,83,216,192,210,119,97,102,221,187,198,196,28,60,252,122,252,252,182,254,243,130,201,233,234,165,155,163,243,181,210,228,253,191,209,207,189,55,171,180,194,251,110,113,104,100,88,75,138,17,236,255,53,241,250,137,223,237,91,252,157,56,31,140,107,5,238,150,162,164,136,36,71,117,90,199,73,1,189,117,184,81,27,115,255,209,32,152,55,148,185,193,42,32,29,251,57,235,39,152,147,174,174,46,104,167,71,141,133,179,21,177,225,70,114,180,169,239,88,43,198,71,35,167,142,39,116,84,112,92,48,129,155,55,35,224,255,27,249,159,238,20,106,252,211,42,255,136,42,113,103,222,139,108,187,253,93,43,154,19,246,112,122,84,175,243,217,227,89,53,153,76,100,39,231,162,
+14,37,69,106,6,239,80,246,2,98,239,164,28,134,217,254,199,228,37,137,100,169,186,100,135,43,124,100,241,52,8,174,237,38,192,83,157,67,192,43,43,230,26,175,45,86,212,121,237,245,165,205,235,126,125,206,96,212,237,210,108,40,181,111,16,144,12,109,216,247,212,192,90,138,93,84,135,187,240,141,82,64,74,176,42,103,206,208,112,162,80,74,128,177,205,12,120,249,140,164,192,142,106,88,169,48,123,241,232,109,234,6,171,225,245,44,221,131,52,124,83,5,225,27,95,13,237,176,119,219,24,247,62,190,110,79,183,15,129,166,40,37,181,226,117,182,222,243,169,179,91,208,109,203,180,213,56,55,133,18,115,52,219,207,24,55,19,133,49,98,178,61,30,237,101,161,127,156,159,175,216,97,247,242,49,126,195,77,43,132,18,2,48,54,175,35,105,236,177,145,157,32,142,146,127,238,69,43,114,38,238,100,170,9,178,35,110,201,129,226,57,163,207,249,226,100,107,107,38,66,125,44,34,239,51,156,75,174,98,86,176,75,31,198,242,67,38,182,151,150,83,109,204,84,125,68,
+213,232,210,137,171,16,222,46,29,217,111,89,202,203,6,53,70,92,40,115,30,212,218,130,251,40,19,37,56,214,110,15,219,170,3,174,235,66,104,218,147,124,228,140,241,216,186,204,122,81,198,111,243,137,46,163,45,136,215,128,245,179,151,118,44,149,118,93,224,95,111,96,180,121,219,175,81,160,131,25,129,162,196,77,210,166,208,78,175,120,242,232,76,193,123,124,86,172,126,51,240,73,147,90,47,228,124,73,67,40,214,174,148,17,118,55,209,121,43,180,184,13,250,153,245,109,255,184,150,243,29,37,62,201,95,93,203,191,157,203,26,122,69,120,114,159,58,211,40,131,75,227,243,137,83,81,48,110,199,157,233,209,254,228,236,154,170,63,170,183,118,49,39,126,102,24,119,214,157,176,42,167,206,97,125,34,123,89,75,124,177,22,217,99,243,95,242,169,96,182,125,102,3,153,161,156,126,87,182,218,121,139,2,140,128,139,15,227,198,160,176,69,31,217,184,19,52,146,134,231,245,179,186,192,107,125,145,224,7,110,126,106,33,162,221,160,86,201,121,150,107,171,92,132,113,195,
+219,148,118,38,32,221,200,170,89,1,9,29,211,94,215,65,17,84,169,212,242,69,146,108,243,223,16,104,27,43,221,121,108,19,163,123,168,164,116,46,70,162,183,252,40,251,107,242,163,42,226,192,245,94,156,36,119,240,136,245,28,98,8,138,25,76,89,125,166,231,96,48,207,152,218,54,201,33,159,46,211,87,120,54,178,191,52,20,72,245,153,120,203,158,74,229,164,7,237,18,93,105,247,190,90,89,179,83,179,20,26,22,152,134,192,140,166,119,241,16,46,235,5,62,21,196,121,192,246,74,126,144,37,31,228,37,148,71,143,58,186,157,7,67,7,43,170,96,229,208,215,30,8,25,141,255,146,180,211,181,8,186,104,15,101,106,102,72,235,222,239,251,84,169,240,169,154,227,223,191,255,246,253,230,76,130,63,251,250,23,95,125,177,62,99,224,173,200,225,167,95,255,252,155,47,191,122,255,237,199,106,146,47,255,203,251,143,165,23,223,124,251,245,159,126,251,249,207,223,125,120,255,254,139,239,126,242,3,206,191,123,171,89,121,255,87,42,46,126,252,6,252,243,183,146,139,
+239,215,117,35,232,151,239,190,121,255,211,47,127,246,229,251,47,222,125,246,163,255,253,63,255,209,103,63,122,135,54,252,236,71,127,248,199,255,241,63,253,241,255,245,111,209,203,239,191,126,247,253,251,117,177,203,175,11,241,86,206,241,231,95,126,248,98,93,147,242,73,130,55,113,222,158,252,112,94,192,167,131,8,254,224,127,248,116,226,193,31,252,79,239,254,227,215,223,191,127,43,79,217,20,178,124,183,62,27,225,219,239,254,205,167,195,24,214,245,39,159,100,249,51,212,26,155,83,23,190,251,254,243,15,95,124,254,237,23,239,126,138,234,243,223,161,146,252,226,251,245,199,251,111,191,221,28,177,240,225,235,239,215,199,44,252,244,235,15,31,80,243,160,234,160,50,124,254,225,151,223,255,217,151,31,254,244,39,239,126,231,187,175,223,189,255,47,239,63,188,251,88,154,242,118,184,194,166,242,229,163,240,63,84,147,160,58,254,28,101,245,213,151,31,54,126,248,1,253,187,247,235,250,152,95,162,214,248,203,239,63,251,61,148,255,55,191,248,254,119,127,168,194,249,63,222,
+172,250,38,250,175,108,247,177,6,231,199,111,117,53,191,94,30,244,245,55,235,34,150,207,191,122,43,48,66,9,223,106,118,222,253,14,74,190,169,64,250,238,235,159,191,127,19,253,221,207,223,127,254,1,253,252,217,47,190,218,212,33,189,25,249,235,191,248,240,238,219,247,63,67,141,243,225,167,239,127,37,195,230,112,135,63,254,63,63,149,252,252,222,127,253,248,237,163,101,209,246,127,250,22,78,95,126,135,90,224,253,55,155,120,248,233,87,95,127,183,145,235,63,127,245,253,151,63,95,215,31,253,179,207,254,217,187,63,250,223,254,237,155,216,27,83,125,137,42,247,167,104,40,253,248,191,181,201,155,68,235,83,33,62,21,234,172,15,222,64,29,240,139,15,95,188,255,246,163,190,255,225,151,255,235,55,223,124,135,42,250,195,185,24,191,248,240,213,90,216,55,1,254,236,253,79,255,124,237,175,207,126,244,57,138,251,17,102,77,253,39,95,255,37,234,187,63,121,255,211,207,209,16,121,247,245,7,180,221,91,177,213,239,125,162,121,247,249,183,63,240,251,147,95,190,251,
+226,253,207,62,255,197,87,223,255,238,39,3,252,170,114,233,159,255,112,158,200,91,217,213,167,18,167,53,215,181,8,63,116,144,223,44,245,250,241,27,237,230,212,139,117,139,143,229,94,63,249,233,55,223,124,236,27,191,170,158,250,228,134,183,131,73,222,142,37,249,84,191,245,213,215,127,241,254,219,207,126,239,171,247,63,251,30,37,70,205,249,177,146,235,147,141,223,78,40,89,99,255,209,7,180,43,124,255,131,37,127,85,57,182,230,253,59,223,253,238,186,204,236,215,170,206,62,138,241,6,241,198,111,29,89,239,215,197,81,95,110,24,188,137,252,197,215,168,162,107,111,189,157,78,242,227,181,47,63,157,74,178,233,165,95,252,214,131,60,254,197,191,248,215,255,228,247,255,245,127,255,47,113,59,152,189,10,58,234,111,51,151,111,213,82,116,118,43,123,160,17,142,58,47,207,72,90,186,237,161,134,148,100,229,156,46,124,185,58,231,49,29,133,109,230,201,142,148,247,180,155,60,116,156,83,79,43,216,173,33,149,30,29,31,133,236,252,131,3,53,159,73,241,8,157,106,
+198,153,242,192,80,170,84,50,228,10,123,41,130,102,196,74,166,64,115,237,221,140,246,79,175,31,169,221,81,113,140,140,242,250,145,68,158,72,203,210,139,9,152,80,204,39,179,38,7,154,101,18,250,6,56,105,198,155,147,249,42,32,158,235,39,153,73,98,145,163,183,124,169,9,83,15,32,133,52,150,184,128,38,110,74,78,189,44,40,187,4,226,2,121,157,141,145,155,72,119,233,34,157,22,59,79,226,69,189,255,204,66,181,184,164,30,37,189,2,107,132,24,43,84,50,129,3,181,110,252,218,75,16,129,190,3,82,247,247,23,112,43,32,214,67,109,67,71,110,103,91,159,23,153,85,158,109,85,122,243,201,27,114,244,149,237,187,227,31,174,30,139,123,39,235,106,31,140,146,134,235,171,196,143,130,98,145,82,39,63,245,105,58,131,49,196,90,50,41,167,173,20,219,234,65,58,163,58,1,138,179,245,237,215,185,64,115,59,78,247,16,194,130,48,235,179,239,148,247,86,6,162,170,60,152,138,186,133,212,58,9,56,172,139,99,135,204,92,141,13,12,7,150,220,100,32,
+189,197,158,68,210,139,188,218,15,118,237,99,75,165,186,232,129,99,116,66,127,104,84,47,171,24,181,190,75,141,91,45,53,168,162,135,133,207,85,219,129,203,28,83,152,219,167,148,204,82,84,78,115,85,171,78,96,111,50,80,98,51,175,119,115,26,171,147,30,118,33,17,204,41,173,255,119,231,197,108,183,139,39,76,1,254,96,133,183,114,7,229,251,185,15,36,79,186,207,153,80,154,220,204,25,234,1,222,158,41,117,75,120,105,221,28,85,133,19,7,185,105,19,77,82,86,125,255,229,117,125,142,203,48,235,232,32,67,62,75,15,183,244,41,98,103,26,235,182,229,214,98,118,208,204,235,58,72,129,85,205,77,247,19,134,98,238,118,194,74,112,8,102,164,65,170,102,101,160,108,124,236,211,115,6,125,102,27,203,158,216,90,124,185,177,205,202,91,189,214,220,120,238,145,207,211,53,203,66,110,106,6,56,134,137,12,121,181,88,209,233,91,101,177,154,164,32,83,174,127,45,75,0,136,114,22,214,178,226,128,235,182,183,164,119,150,163,171,30,43,63,99,41,77,73,8,
+94,181,8,106,96,87,219,79,169,59,104,152,184,3,46,224,85,27,153,16,166,47,19,171,114,149,135,245,237,86,126,7,89,248,106,206,140,213,58,114,113,72,142,67,174,240,53,20,62,148,83,243,212,116,98,176,77,210,54,49,115,108,55,99,66,87,35,199,124,172,77,191,108,185,176,122,100,126,143,32,122,98,23,172,90,59,83,216,229,31,103,102,47,28,58,146,120,25,143,128,204,234,30,177,166,87,222,124,26,204,118,38,122,0,54,13,82,85,176,186,58,157,4,21,214,233,220,64,55,175,186,157,87,31,106,11,131,116,2,22,51,72,102,248,210,133,170,55,158,33,165,126,207,152,200,13,35,93,101,74,174,237,116,167,47,109,151,117,202,183,34,147,241,255,203,222,155,63,165,178,53,107,131,255,58,110,7,182,34,160,162,160,32,160,50,41,163,136,80,64,1,229,22,17,17,1,1,25,11,40,153,103,138,177,10,40,170,86,23,114,246,189,111,127,183,35,238,219,95,127,17,253,203,53,206,176,98,229,26,114,101,62,153,249,100,29,227,108,100,222,162,6,139,39,180,139,
+51,248,25,137,128,106,5,46,249,24,179,188,107,201,46,181,153,129,130,78,186,77,22,132,26,133,237,205,129,111,124,250,24,145,32,243,170,129,101,208,232,5,23,244,119,24,29,3,137,20,214,246,254,128,203,229,50,131,140,9,104,117,28,27,13,127,101,221,137,176,42,169,154,107,70,114,164,99,150,75,197,39,171,225,129,137,115,201,153,126,27,249,28,91,79,146,105,238,178,15,162,202,49,207,60,14,24,172,74,210,245,109,156,209,36,229,153,213,52,120,22,1,215,230,140,92,194,80,204,109,41,6,158,8,48,41,33,116,143,140,34,202,165,121,33,241,245,49,38,219,109,176,0,82,210,92,207,56,10,168,192,115,179,218,111,218,66,32,4,220,193,60,30,200,67,131,37,181,139,44,145,23,46,14,143,84,72,115,94,37,3,96,216,240,176,206,149,194,216,164,31,40,226,206,121,23,93,154,15,69,115,51,116,9,144,153,123,226,240,13,168,94,36,35,119,183,19,139,181,179,173,144,146,162,47,113,79,237,8,105,172,210,136,60,50,174,57,98,13,138,108,59,219,223,229,195,
+201,245,234,79,113,14,155,30,241,239,203,200,57,92,7,132,98,164,251,102,97,74,75,36,85,107,24,80,62,65,90,24,93,117,254,64,96,21,180,167,148,185,81,155,75,4,61,13,172,143,73,154,163,14,142,35,180,124,242,96,65,239,65,98,54,185,177,184,152,169,117,194,107,149,16,178,102,71,5,164,115,197,248,99,200,164,28,215,49,204,151,220,86,60,87,11,176,63,33,108,180,143,247,232,98,184,138,143,233,178,146,254,46,101,192,144,160,74,96,6,138,184,123,106,134,124,157,70,87,150,233,187,136,69,207,148,145,251,22,7,114,73,223,61,87,71,36,86,164,54,13,76,13,165,244,176,233,10,150,136,134,244,24,155,183,175,33,31,73,197,85,222,253,48,121,85,198,47,104,207,10,48,66,1,243,46,173,250,244,210,102,127,9,63,135,36,224,21,132,150,80,201,120,2,220,54,96,211,237,172,38,180,129,217,226,88,220,71,30,213,221,83,175,29,208,204,59,112,19,75,78,149,68,1,52,85,141,129,183,37,36,60,29,102,13,79,69,95,119,231,173,50,125,180,17,235,
+59,7,131,243,110,83,48,243,116,208,137,229,144,23,157,161,101,9,78,53,210,108,194,24,133,104,174,182,120,63,26,89,232,231,51,79,159,86,107,240,140,52,117,169,30,96,118,75,73,49,195,197,134,40,159,98,190,35,113,174,89,104,175,146,84,134,201,180,70,33,123,19,119,85,30,61,17,137,165,56,151,138,204,14,223,248,28,142,185,132,227,168,77,41,179,0,228,123,162,116,87,15,155,179,210,50,111,99,22,181,156,223,55,171,85,9,5,6,248,20,25,7,23,216,20,255,126,193,141,196,31,252,251,26,112,67,171,234,192,227,189,236,101,239,7,229,47,164,189,27,11,248,186,138,164,173,22,97,122,239,96,209,144,91,219,82,144,207,120,35,153,21,146,105,250,124,116,137,251,197,184,227,158,220,126,245,163,143,207,11,219,118,97,41,117,89,123,10,59,130,79,194,252,12,95,101,60,31,207,131,186,21,38,202,13,62,41,48,159,59,203,205,82,157,146,217,114,229,106,97,192,114,240,45,222,202,86,102,205,98,89,145,67,65,198,124,249,232,165,190,73,226,114,130,162,142,
+24,118,239,21,96,146,85,17,2,178,204,203,232,17,38,95,206,88,19,145,57,135,174,248,208,191,39,194,13,5,17,42,36,5,22,23,184,207,224,239,112,194,206,156,36,4,6,248,162,166,129,94,42,178,184,204,82,164,98,148,5,241,52,105,139,151,42,146,18,109,215,242,130,243,8,214,62,80,117,238,69,171,31,170,68,157,188,84,45,31,209,24,189,68,104,75,49,143,128,88,83,177,23,99,26,223,187,16,42,108,24,9,252,30,171,35,148,2,144,75,252,112,87,135,132,61,78,106,18,191,64,131,209,108,33,249,41,193,153,161,1,155,57,187,74,29,29,108,152,100,95,139,221,32,98,136,136,61,145,26,65,132,6,126,18,200,181,34,117,85,166,131,20,147,33,229,192,93,125,46,201,180,106,193,145,252,107,112,34,19,65,43,117,169,156,97,250,52,34,41,201,176,217,132,17,50,253,72,30,103,180,74,31,105,193,133,176,164,55,121,11,118,72,77,79,4,156,74,11,161,172,234,16,123,51,14,162,8,109,213,159,32,57,215,60,62,112,209,190,233,130,100,3,237,41,192,
+31,12,159,101,13,51,227,207,199,161,210,156,130,211,118,47,78,229,240,60,67,190,163,13,108,172,93,220,87,49,132,156,166,38,178,152,111,140,90,138,14,3,249,21,110,8,92,45,203,32,196,162,209,59,239,14,238,195,3,100,250,11,227,83,200,148,199,163,243,112,78,61,146,106,68,81,214,10,90,94,204,185,223,149,75,132,102,138,233,162,187,168,5,149,104,177,193,235,68,88,156,151,232,56,233,91,229,224,74,151,172,233,176,209,251,181,16,242,246,238,65,137,178,180,116,10,8,248,128,95,232,90,124,158,195,85,61,121,142,41,98,223,25,111,65,132,166,16,145,122,58,188,68,108,109,108,58,186,213,142,242,54,117,8,111,228,76,2,26,21,75,230,68,208,199,0,217,65,212,217,221,77,14,76,164,151,20,163,120,145,218,254,141,132,124,145,202,2,234,13,52,216,11,215,35,156,85,195,116,19,86,240,41,197,240,79,157,62,61,229,112,174,44,39,83,26,101,107,33,242,189,173,34,121,226,216,2,39,146,8,230,162,107,221,38,198,157,190,46,170,37,136,172,214,82,147,
+96,193,213,111,180,37,17,249,56,84,152,137,204,82,234,121,233,154,109,179,255,126,15,144,123,72,61,37,83,82,137,128,15,36,67,239,49,234,85,43,122,129,222,181,161,204,20,79,67,72,167,59,155,73,14,125,190,193,229,135,41,163,80,12,152,166,215,21,28,28,96,246,24,233,174,170,117,5,43,33,186,66,163,139,119,8,147,44,79,145,101,169,74,66,4,142,44,154,223,25,28,57,37,240,200,197,113,151,141,55,43,176,133,75,65,144,143,47,72,97,144,57,59,154,48,71,60,139,206,61,136,41,157,11,123,247,182,238,35,103,242,54,23,147,4,148,85,244,97,84,144,207,23,197,144,231,88,119,45,49,30,25,43,31,164,41,119,237,27,201,246,1,201,148,184,140,85,90,108,38,224,252,132,215,62,177,148,166,225,193,33,24,204,11,133,113,166,177,82,57,23,3,133,60,19,95,30,198,196,190,151,80,150,126,11,4,181,46,11,121,164,98,212,204,35,94,186,168,37,85,66,160,84,205,147,181,43,13,165,60,47,204,234,50,229,135,31,58,32,175,138,54,202,247,20,218,
+226,67,38,44,207,244,96,156,223,12,239,201,119,246,9,5,11,181,223,159,151,191,131,69,27,232,179,69,72,73,50,146,126,211,139,79,137,20,165,99,19,92,13,138,64,72,43,50,9,122,70,177,193,91,38,34,31,69,218,133,114,38,226,93,140,71,46,93,201,13,12,18,239,7,82,174,184,182,205,65,23,184,226,57,144,70,76,141,196,26,37,226,36,153,96,34,218,125,252,244,235,99,156,144,111,75,138,140,239,160,48,17,228,151,19,183,45,136,143,87,123,147,137,163,48,33,26,6,119,20,157,230,66,174,69,212,225,235,133,100,160,107,218,39,125,211,12,94,128,168,29,20,116,175,112,139,183,118,133,48,209,106,254,85,228,41,227,4,193,197,39,62,151,179,92,53,177,70,71,56,151,69,204,151,217,37,251,35,198,34,76,27,97,203,177,103,246,158,203,0,250,72,85,4,106,23,189,195,99,184,245,80,16,84,190,250,6,136,30,70,238,176,152,208,44,40,145,25,182,212,183,108,200,169,101,245,46,70,48,185,177,144,66,39,60,72,232,27,89,148,3,178,162,124,133,124,
+67,187,80,150,228,203,194,209,227,243,226,9,50,152,196,132,148,108,254,138,208,244,78,215,211,231,99,231,114,144,226,97,179,51,201,101,108,52,154,191,6,113,207,216,5,177,238,169,37,75,115,144,68,67,45,167,79,120,231,199,30,109,53,61,192,133,128,244,200,16,156,158,58,100,144,199,123,254,213,151,138,124,139,112,15,14,2,221,181,119,105,240,209,57,187,50,71,53,175,132,72,25,57,164,204,199,76,24,246,29,13,86,135,153,15,239,167,230,11,191,244,106,242,74,122,17,32,59,98,140,122,66,98,21,20,25,27,17,136,209,89,250,7,146,12,35,71,165,114,46,231,50,171,216,226,28,253,222,46,127,186,50,3,42,7,55,234,177,101,236,150,169,10,171,58,31,91,168,10,72,7,191,64,26,145,73,204,139,12,6,191,89,79,154,137,200,234,79,38,130,8,203,7,139,32,230,0,205,39,205,132,91,90,62,89,183,36,61,230,139,39,161,18,246,222,201,60,89,72,171,85,12,91,163,125,217,248,67,168,128,232,138,140,181,131,217,148,182,58,117,32,233,123,27,70,19,
+146,81,120,235,29,155,195,136,45,58,141,112,102,32,114,183,2,109,85,223,221,237,222,71,116,114,79,219,122,170,235,229,169,121,164,208,21,58,171,181,109,4,166,43,219,96,153,81,154,237,31,10,64,151,72,55,55,216,211,183,176,178,175,13,94,211,151,136,9,189,251,126,148,18,30,66,107,104,247,189,81,239,236,212,42,3,223,17,23,34,115,150,121,168,104,39,236,122,245,113,139,71,151,206,143,104,58,90,138,66,133,139,230,29,56,185,196,6,247,102,184,60,8,153,219,121,161,251,58,39,154,151,125,37,100,161,153,191,10,87,140,19,33,203,202,119,161,249,82,166,155,34,162,125,151,124,254,220,5,206,211,130,179,88,240,24,136,122,17,200,195,7,164,88,142,50,78,210,134,76,176,73,90,233,195,99,136,70,249,213,87,116,17,153,201,50,156,52,228,42,209,69,132,71,6,194,202,9,52,164,170,222,213,216,84,84,217,92,44,37,251,29,233,206,112,149,15,115,235,51,129,230,113,81,241,161,118,30,244,109,80,48,24,189,82,56,166,28,102,208,146,9,181,66,123,251,
+24,225,22,67,223,135,20,199,200,121,123,217,26,206,235,11,52,186,236,22,218,184,87,138,76,138,104,108,110,200,16,73,204,133,16,25,255,106,31,151,131,114,119,54,9,122,23,204,111,61,20,69,250,252,9,151,193,96,250,201,0,225,3,144,90,49,153,15,156,1,109,7,29,195,86,154,55,17,40,127,201,235,251,162,67,73,73,224,134,223,67,30,181,66,221,190,8,157,132,162,62,157,24,99,173,62,245,67,197,49,72,136,51,10,95,189,163,176,65,62,226,208,148,1,114,247,98,108,247,107,158,171,225,11,46,238,154,161,79,17,29,155,217,250,41,134,141,63,128,43,201,123,128,121,186,199,170,94,72,64,23,190,17,204,161,236,129,216,182,106,144,142,68,129,99,181,251,141,120,211,177,0,225,252,94,250,172,6,103,20,21,211,37,133,167,194,76,9,91,211,103,213,59,109,165,9,0,222,41,32,207,182,204,159,19,216,64,191,102,92,117,215,217,131,76,220,138,194,198,195,121,240,224,202,160,70,229,243,212,118,47,52,79,227,40,81,230,87,6,69,214,149,121,145,135,228,
+3,159,215,68,229,108,150,5,60,175,22,174,217,48,81,3,242,125,201,72,170,103,81,112,247,93,88,102,36,190,41,73,61,227,187,152,28,69,13,206,146,65,145,31,20,114,53,73,48,118,35,32,7,115,66,199,242,168,219,139,148,252,137,37,165,127,154,218,110,137,104,166,174,220,108,174,115,86,220,142,121,103,217,15,122,71,200,160,6,197,130,241,101,51,15,55,48,177,174,235,131,29,202,57,177,168,186,48,31,152,162,13,128,209,203,133,206,187,160,146,127,50,125,100,56,67,63,148,212,140,8,98,46,29,29,151,12,168,47,3,9,173,100,146,226,169,195,131,14,214,97,162,214,141,78,220,161,40,83,62,48,250,70,20,238,157,225,85,131,16,93,229,66,203,209,98,224,234,60,70,78,50,62,99,223,109,146,248,20,242,194,124,81,160,63,209,24,50,236,222,9,99,197,7,34,46,195,198,177,22,238,25,198,1,53,250,0,182,15,138,28,185,176,243,75,215,39,210,52,15,34,94,48,33,36,36,39,73,178,101,248,225,151,124,223,107,81,228,38,234,242,2,52,112,29,36,
+39,220,12,16,20,93,115,18,110,102,246,51,207,157,162,70,38,142,202,20,40,136,232,139,229,121,217,180,68,74,10,117,199,119,202,5,106,6,171,196,142,157,13,244,36,220,45,21,20,103,56,93,64,112,223,10,50,200,160,149,211,235,27,133,181,253,80,53,77,143,180,40,225,91,194,184,104,86,217,13,249,51,151,19,105,108,48,105,209,74,5,89,90,148,19,213,209,137,205,87,90,126,149,152,161,127,145,80,93,48,102,172,58,229,75,124,190,209,52,92,101,249,208,52,184,130,167,0,89,89,44,170,228,203,232,58,195,241,254,97,43,249,237,232,247,213,229,244,207,118,16,3,112,255,5,250,144,123,58,215,74,93,104,158,159,229,80,33,147,20,96,222,229,128,170,154,139,204,45,100,112,224,100,200,17,36,47,161,153,68,64,113,131,115,179,158,181,107,176,189,10,201,26,216,148,152,177,77,18,205,46,171,198,50,177,7,103,125,203,170,6,56,220,190,130,229,25,185,183,125,35,130,14,49,102,220,48,68,67,70,242,59,28,176,20,198,163,114,28,181,100,103,140,55,70,202,
+199,231,38,11,65,127,189,74,250,100,177,39,241,84,146,49,106,183,82,54,3,108,69,182,148,207,189,221,238,37,100,132,14,255,84,118,63,67,118,75,172,253,236,181,128,208,115,199,18,6,39,186,33,48,127,187,191,131,237,62,221,91,148,133,43,191,80,38,210,231,129,78,168,21,240,170,104,238,172,51,32,98,106,103,185,253,152,89,119,123,161,196,43,197,76,112,135,146,142,98,117,218,9,141,151,213,125,2,63,23,102,230,239,72,193,115,132,149,168,93,96,250,172,97,39,103,196,162,62,14,30,144,52,35,251,64,34,14,190,114,228,236,13,175,167,62,46,83,238,12,175,1,73,119,148,75,77,87,77,137,141,14,127,102,31,139,8,138,5,240,60,210,141,130,115,34,19,100,38,25,194,179,72,162,57,111,72,208,241,52,87,215,66,10,75,141,149,243,107,145,238,226,116,52,123,104,68,182,10,147,186,75,166,243,206,239,209,115,213,37,121,197,225,236,59,91,71,10,80,218,142,249,58,99,148,135,221,147,21,12,250,56,35,113,20,114,40,167,13,185,16,25,80,65,75,1,
+174,74,204,88,150,185,159,161,204,168,220,51,9,93,141,242,215,86,255,67,235,170,162,227,193,241,204,20,68,24,65,72,130,80,213,93,75,65,48,141,243,146,124,8,99,86,43,49,79,144,27,83,210,38,238,101,233,145,184,68,62,78,23,69,139,101,161,137,4,189,61,88,23,3,129,24,50,187,182,251,123,64,97,55,128,236,68,242,132,47,139,223,150,128,53,150,66,132,222,96,237,224,216,107,81,230,130,103,59,93,182,111,164,174,85,96,214,93,81,228,202,231,37,227,177,195,210,115,173,173,105,174,86,177,252,100,208,126,40,191,28,204,101,233,8,165,21,22,190,78,154,223,195,178,186,55,72,10,86,111,126,193,210,83,32,118,167,191,139,43,33,25,43,205,49,229,28,105,85,75,72,76,132,84,165,242,123,121,132,184,118,207,51,34,236,113,146,209,46,171,193,136,120,64,221,101,65,52,189,168,165,44,170,111,190,202,126,113,13,151,182,202,99,222,147,174,64,171,92,93,150,169,234,233,183,9,227,144,155,86,11,172,53,191,125,237,46,50,70,164,186,39,15,211,200,170,
+27,171,4,249,187,202,184,127,251,247,86,254,117,242,71,184,197,230,246,216,214,176,101,83,206,151,150,0,42,240,44,81,94,219,98,136,101,252,22,204,48,82,67,108,71,53,19,192,76,223,14,43,24,124,33,224,250,150,104,201,216,28,228,170,187,224,40,132,165,220,161,125,92,225,131,25,150,111,249,234,24,195,118,149,66,166,171,89,77,48,55,152,163,219,80,230,227,193,217,245,149,196,216,60,131,173,166,174,190,133,90,202,155,138,194,133,110,88,0,151,52,84,106,53,120,194,226,170,94,182,202,176,201,84,60,224,41,224,89,138,139,17,179,193,53,169,164,213,138,249,130,0,163,38,73,202,231,195,8,178,248,204,225,30,138,205,247,227,177,66,21,18,80,24,220,92,146,53,106,207,226,140,130,200,2,125,53,95,102,176,73,69,238,58,17,212,101,36,214,37,114,148,75,90,54,154,190,107,39,237,138,215,188,88,24,59,69,194,175,160,46,226,60,70,78,239,214,94,21,58,123,177,96,27,19,196,203,232,128,117,12,76,90,19,216,129,237,158,153,98,45,221,170,21,155,145,
+141,85,250,205,194,19,224,124,214,126,209,243,247,254,19,98,222,49,22,189,243,227,86,144,91,46,143,108,147,198,229,8,69,194,12,48,62,173,78,79,52,35,1,117,56,160,103,133,86,50,159,137,105,224,83,250,202,93,219,157,210,250,58,101,48,209,141,241,19,117,89,28,7,219,19,121,171,153,222,226,164,122,145,37,7,206,241,182,203,146,216,170,251,205,210,80,239,228,129,232,199,224,37,26,183,216,101,240,114,54,137,1,54,217,77,74,247,228,165,173,219,16,128,234,170,172,199,11,204,231,12,21,14,230,126,34,88,176,209,74,137,185,48,226,73,112,25,70,165,80,194,217,215,77,164,170,32,94,244,92,136,66,123,150,236,177,76,38,111,192,29,9,14,55,219,87,104,12,52,228,174,166,7,175,186,85,108,75,52,110,241,187,10,36,221,46,78,28,38,42,106,104,76,4,216,56,90,118,163,49,119,203,156,20,2,103,247,52,88,152,157,28,96,249,101,193,50,240,84,150,56,142,116,133,200,212,55,143,180,78,252,85,132,161,179,81,18,89,114,71,69,21,228,243,130,54,
+170,144,124,232,104,152,204,104,84,134,203,170,231,43,18,157,55,170,144,108,246,68,249,28,213,177,242,117,50,41,34,177,95,14,127,192,1,199,220,56,45,12,181,42,77,219,96,32,123,24,223,222,200,76,202,112,119,142,172,114,227,138,206,25,112,112,158,154,238,55,225,240,27,58,133,158,207,252,49,23,9,38,140,120,254,102,0,211,174,4,5,173,156,164,72,190,80,117,210,59,25,83,74,98,17,160,99,72,135,185,245,99,20,248,99,161,117,223,28,131,98,206,230,6,148,128,167,168,63,221,192,209,102,74,216,27,93,28,40,249,233,146,213,201,29,219,84,134,70,211,58,11,125,23,99,34,222,45,142,80,151,92,0,178,119,52,190,104,95,131,37,212,177,20,151,175,182,65,9,238,254,70,217,39,100,251,77,223,132,176,41,223,153,224,5,119,224,233,147,87,124,221,229,125,91,211,21,230,166,21,70,38,96,205,240,138,101,155,142,88,115,48,154,97,178,213,162,46,226,242,104,138,202,183,129,32,234,196,167,19,56,196,219,191,236,98,76,101,165,165,101,39,79,145,125,157,
+151,110,98,115,67,162,31,218,137,186,251,192,19,226,43,153,244,53,22,99,62,91,167,211,237,226,89,51,139,132,210,74,30,88,22,252,65,46,231,53,45,139,98,234,109,56,167,137,32,243,220,117,55,58,40,226,208,128,238,73,47,32,197,252,0,22,48,110,146,216,142,193,125,69,168,89,98,94,102,36,115,233,28,8,130,22,24,169,90,45,133,233,237,108,34,35,96,124,226,143,225,185,233,167,4,47,117,69,211,72,55,234,171,14,173,43,68,57,28,131,183,25,69,190,135,78,152,34,51,197,99,76,59,192,53,175,234,46,138,174,67,3,5,149,170,10,86,157,34,79,176,236,240,4,204,162,179,31,91,230,121,138,201,124,38,18,172,94,71,64,8,210,35,33,157,94,241,148,179,62,86,192,157,104,16,89,161,49,202,214,130,24,218,98,65,26,213,245,31,6,55,12,45,84,130,108,2,225,225,123,224,204,3,101,150,7,102,167,216,19,75,13,140,223,195,49,220,46,233,56,40,143,112,131,18,173,204,48,163,90,165,26,130,10,242,162,114,101,140,189,158,219,30,11,174,233,
+117,222,135,76,91,250,182,14,0,79,89,229,31,232,39,101,164,206,225,164,133,188,25,51,103,186,24,140,23,143,108,200,244,94,178,114,65,152,123,192,19,122,36,204,4,89,173,154,74,253,162,208,36,97,134,23,163,228,195,64,240,18,92,144,66,152,209,98,78,59,3,6,84,65,162,24,143,63,34,148,239,91,235,177,91,230,137,239,5,240,129,167,144,146,238,144,56,206,135,228,204,201,108,9,125,104,104,152,217,91,113,153,97,223,66,23,5,35,238,106,145,84,18,174,170,141,105,139,98,171,139,154,78,0,234,49,207,164,122,12,41,124,152,142,17,96,184,69,177,248,93,139,33,213,50,160,166,12,54,255,72,18,244,148,127,45,92,76,175,41,6,109,132,186,76,39,180,45,149,9,221,223,3,156,25,204,104,188,128,246,48,56,110,225,40,39,219,118,127,119,32,203,57,143,61,193,204,210,21,223,213,1,111,35,222,144,43,109,248,112,203,187,148,180,122,60,225,171,25,131,247,56,28,37,231,34,219,188,225,90,192,50,235,72,64,94,189,249,66,54,160,115,158,20,88,127,
+239,55,130,225,206,54,165,132,17,39,181,162,122,184,173,153,6,93,46,165,83,168,151,237,217,82,184,250,198,85,3,16,157,225,82,59,100,241,184,232,234,183,241,216,158,180,56,117,130,178,55,186,0,241,203,231,81,208,137,252,34,221,67,159,220,84,90,133,28,181,175,97,252,89,81,130,206,56,28,142,98,159,207,92,168,103,108,47,86,106,118,134,196,106,244,150,187,104,126,240,153,189,253,239,90,117,92,173,53,209,183,103,132,239,185,23,15,203,68,24,87,186,52,163,32,124,169,228,251,210,62,82,161,161,169,175,153,105,4,4,2,230,93,248,157,181,152,93,131,90,101,88,33,247,116,253,71,164,25,130,122,86,130,74,142,130,113,85,48,234,117,154,236,206,58,81,171,30,221,228,202,195,132,156,243,234,181,79,184,242,39,236,246,176,180,243,217,28,25,218,86,209,32,100,57,148,236,92,78,38,235,63,191,88,50,252,37,11,226,165,179,44,248,144,219,134,86,151,207,224,26,121,240,193,84,54,39,201,210,111,232,14,238,99,85,68,74,224,149,158,112,151,82,40,161,126,
+112,4,167,183,178,145,111,53,178,191,181,212,77,186,74,37,39,153,125,85,246,143,70,224,213,228,249,228,33,241,34,182,203,249,143,159,251,159,127,158,141,92,85,108,181,115,83,30,6,179,11,9,235,6,142,244,226,0,181,76,232,172,101,247,149,192,191,219,111,6,177,90,137,222,69,115,142,194,117,192,255,101,65,150,132,163,173,136,127,164,28,74,165,149,171,95,76,222,219,243,167,240,114,37,157,224,254,3,229,42,74,206,119,56,156,124,28,209,144,210,41,254,18,150,157,159,220,218,181,239,174,156,247,185,213,212,186,127,37,9,20,55,10,190,223,61,185,211,212,184,6,99,49,206,3,231,214,74,3,199,28,10,160,234,194,171,162,55,210,187,252,110,111,241,238,27,116,29,189,135,144,62,175,151,70,151,16,227,151,114,40,114,153,226,112,92,87,34,67,1,137,88,174,74,114,24,140,236,23,209,210,101,238,6,76,50,88,193,145,85,74,155,210,153,220,68,59,233,220,7,82,232,247,46,93,92,131,187,232,154,146,122,5,195,23,105,250,138,183,81,89,148,202,84,180,52,
+186,252,115,53,14,191,147,99,233,55,125,203,20,223,73,53,175,241,122,40,92,13,22,52,173,148,245,36,170,64,187,250,139,243,116,104,122,222,158,32,124,157,177,216,159,166,45,38,221,146,198,114,61,127,198,59,199,231,186,195,131,173,123,199,64,123,229,77,167,82,169,229,45,152,197,110,67,34,211,93,242,250,204,245,98,82,222,250,167,73,109,172,86,87,132,123,89,75,238,5,123,167,246,137,102,239,88,89,126,99,233,55,231,34,47,176,48,17,197,160,237,12,149,69,84,152,154,220,92,96,50,217,120,197,26,124,222,162,213,170,142,224,60,57,189,112,8,253,149,183,213,151,55,39,69,93,186,75,204,237,63,229,182,122,217,142,41,9,210,30,123,170,17,214,130,135,136,130,152,165,222,77,130,149,154,19,172,166,185,91,28,142,167,209,186,88,66,211,250,195,48,162,173,226,38,176,116,21,135,141,134,150,173,163,23,151,33,169,206,55,106,251,31,133,254,196,81,224,46,244,29,218,30,74,97,203,87,167,133,237,97,221,171,165,38,137,228,246,33,214,216,119,143,140,126,239,
+99,161,251,197,102,36,144,29,203,129,201,13,77,59,229,73,100,153,66,16,147,204,192,236,67,243,99,173,157,178,59,64,247,125,240,200,123,170,191,63,131,58,123,10,80,93,101,166,159,166,26,112,20,230,53,23,161,157,186,98,241,26,75,115,159,14,219,23,88,162,232,5,41,34,117,106,22,234,59,213,4,223,242,213,102,154,74,242,182,151,56,83,182,35,190,93,137,226,232,78,24,31,17,139,129,225,19,225,246,95,21,183,211,167,148,215,30,171,103,185,203,237,44,210,110,60,6,125,29,131,244,136,245,87,60,239,53,175,56,156,143,247,14,142,237,20,130,167,230,182,115,82,152,84,41,201,133,114,146,125,218,161,156,191,232,74,141,195,49,42,108,109,140,44,92,200,67,20,212,248,58,69,35,33,131,128,114,146,206,243,218,199,247,241,148,55,137,214,242,250,139,68,115,126,107,72,219,195,39,228,111,169,194,218,22,148,227,31,81,218,220,181,29,148,6,42,11,216,226,224,173,194,148,134,53,41,225,66,159,93,96,28,14,198,41,126,124,222,158,203,57,160,205,249,151,31,
+237,175,217,58,144,56,156,79,14,65,21,193,205,131,186,124,190,183,254,107,201,254,109,124,105,173,56,59,143,63,11,231,172,94,6,54,75,200,163,164,223,182,157,26,156,219,1,100,106,208,232,144,127,169,228,112,94,6,40,237,190,37,123,110,176,242,78,181,199,212,118,158,92,48,59,87,100,223,118,222,1,105,227,191,172,19,178,235,230,191,152,239,212,116,242,130,249,42,192,77,120,147,240,226,77,30,155,164,86,182,138,29,143,160,157,111,246,46,3,25,217,59,136,35,169,44,37,177,84,251,37,11,47,241,78,145,1,108,17,233,158,7,110,29,89,158,101,166,181,208,47,42,3,83,234,51,54,67,3,150,203,142,132,49,24,57,104,182,224,109,206,52,60,65,238,198,90,183,40,161,210,231,153,160,118,248,28,94,90,255,132,240,203,193,234,124,9,220,45,7,45,147,7,77,229,15,27,216,143,175,42,122,26,126,15,154,166,252,215,113,138,167,167,84,208,66,93,68,138,169,223,214,188,114,162,69,12,164,118,97,142,165,65,135,28,26,172,33,200,148,51,64,127,190,253,47,
+16,106,90,125,74,199,58,244,160,212,42,33,38,32,14,171,162,159,3,29,10,188,216,57,186,40,183,240,128,66,35,197,193,212,198,121,120,194,79,253,150,6,94,245,202,65,42,141,152,179,10,216,127,186,8,35,192,185,200,34,203,234,133,191,218,139,156,41,151,70,95,157,173,218,204,227,220,70,31,81,91,98,143,152,104,51,250,15,96,30,71,143,117,233,87,120,112,87,205,168,129,44,154,152,229,146,197,51,213,204,106,241,130,220,177,41,99,212,146,216,60,217,67,135,77,40,251,17,134,40,209,48,153,80,246,76,55,15,54,111,255,190,216,236,245,239,154,194,216,9,45,19,95,116,191,131,76,248,235,16,184,180,6,208,42,95,133,146,64,76,116,205,101,25,18,187,175,225,242,87,155,148,243,52,184,98,52,239,60,17,35,167,110,116,50,59,98,39,211,253,167,78,195,7,100,240,169,255,181,148,82,68,135,3,210,199,165,138,248,37,253,129,45,211,26,232,164,62,10,70,164,174,25,174,87,170,6,98,120,210,88,242,151,40,148,83,183,171,98,224,56,175,13,138,43,145,
+195,105,52,127,72,154,12,82,250,136,212,52,178,12,31,174,51,170,252,242,60,99,161,141,111,169,238,242,49,44,147,244,30,198,132,193,248,232,209,2,151,227,227,184,9,38,112,122,136,188,6,247,37,12,205,133,123,250,238,73,176,152,162,87,178,200,241,83,242,18,220,203,141,233,78,170,81,85,111,59,228,229,236,28,190,244,146,25,117,140,199,73,167,133,214,81,158,237,189,173,52,220,192,63,150,197,103,57,134,108,255,97,66,187,243,242,151,103,57,201,49,114,163,34,60,152,63,254,250,190,63,247,92,200,252,120,244,2,246,75,17,74,84,66,151,189,41,126,219,145,141,120,253,252,60,63,241,178,105,118,120,162,153,142,120,224,48,161,137,105,12,103,30,133,25,109,120,104,129,193,151,92,18,65,139,114,229,80,205,204,86,75,27,235,17,130,52,2,22,47,227,182,25,249,197,74,39,11,15,250,1,90,6,144,139,115,123,249,30,63,5,105,247,82,5,165,22,57,35,151,197,90,242,119,120,47,35,39,95,195,105,100,6,6,224,176,139,241,71,131,161,229,189,217,61,126,
+210,220,75,254,104,170,55,140,41,166,160,228,183,192,128,252,2,51,11,199,11,157,199,122,203,174,117,250,120,217,84,83,76,113,117,21,120,15,95,145,114,65,244,75,143,44,95,154,187,55,13,169,133,101,221,98,23,91,199,162,116,94,249,180,77,253,49,219,60,26,255,66,137,249,132,44,117,199,53,30,215,25,83,183,241,186,178,41,238,15,37,130,160,184,112,251,122,201,247,215,12,146,82,145,184,40,113,209,1,173,47,79,58,51,93,163,10,1,98,248,237,20,79,127,183,219,104,154,214,177,79,20,106,70,148,198,194,175,158,205,16,113,151,48,77,126,193,216,103,56,182,5,105,220,111,240,20,74,40,253,83,62,163,54,239,225,39,207,167,145,161,43,234,192,36,60,168,11,245,191,252,136,38,195,23,238,205,132,180,140,143,221,137,156,216,66,54,208,62,159,11,208,46,246,167,177,234,209,96,129,233,57,145,232,145,151,142,223,215,130,191,146,179,39,206,180,144,194,136,102,27,91,240,117,23,15,81,208,181,204,165,212,236,53,211,176,135,124,84,18,160,179,152,38,64,221,
+156,126,140,119,38,96,114,141,97,72,40,40,189,72,108,243,46,187,62,7,72,181,141,32,131,158,219,179,65,45,30,220,171,171,92,103,134,56,112,200,212,116,183,208,51,160,229,209,238,106,80,254,2,214,80,209,139,214,246,42,170,102,233,116,150,233,39,34,29,254,56,216,173,150,146,231,154,187,58,28,7,130,135,204,185,207,98,194,140,181,5,53,81,86,183,229,32,51,31,248,211,129,19,183,210,209,11,88,50,68,73,45,60,168,8,171,205,236,124,53,30,37,251,203,5,82,188,231,206,132,62,167,191,191,39,157,161,142,69,17,239,159,196,157,128,7,93,168,62,126,233,84,140,174,129,42,129,220,216,199,240,68,68,70,226,132,68,10,36,43,172,141,113,190,150,131,251,131,37,180,240,193,222,178,33,157,144,16,28,151,68,159,35,159,11,239,34,39,227,250,152,230,240,202,199,148,100,70,174,123,227,30,30,205,156,213,170,150,29,197,225,193,157,17,125,7,196,236,197,212,119,212,147,164,200,37,129,74,237,241,26,176,201,147,233,72,2,118,26,12,162,37,197,158,165,169,
+117,94,7,81,93,11,107,234,189,210,105,104,18,23,45,207,99,75,6,202,9,207,41,205,247,8,137,58,72,254,35,97,171,195,181,108,146,217,238,247,22,11,172,162,107,136,191,122,106,116,249,49,81,193,209,60,189,122,189,0,153,28,127,149,104,30,44,26,108,223,59,185,234,225,254,154,71,246,125,52,32,179,75,99,81,138,104,108,153,88,233,193,48,65,92,161,61,131,136,196,71,47,195,151,36,174,218,229,24,146,163,38,94,151,198,109,161,19,55,111,246,254,122,239,3,20,207,18,210,71,9,193,138,222,58,82,244,229,45,215,254,199,152,33,139,60,223,228,112,161,41,106,130,18,231,96,133,55,118,87,15,17,96,14,125,87,14,47,102,146,120,23,75,249,138,21,49,234,94,80,119,229,169,240,157,40,139,24,103,223,25,90,58,183,63,62,3,130,131,192,5,106,66,58,37,61,220,209,233,65,212,83,107,6,14,166,99,28,174,250,136,21,222,140,234,238,231,213,35,58,233,253,222,227,219,39,129,69,140,113,136,11,81,137,17,175,140,153,200,224,253,37,97,117,21,11,
+9,123,11,175,35,65,130,191,247,136,28,170,62,128,86,39,5,104,78,78,163,34,20,137,8,51,29,23,232,161,34,100,41,225,48,208,59,195,71,178,185,28,93,239,48,15,97,207,61,215,144,121,4,93,243,252,68,1,126,125,143,122,248,197,64,249,252,238,139,154,127,15,156,113,240,10,27,110,230,43,52,99,26,36,178,3,46,33,7,197,165,252,23,248,53,65,206,38,77,113,236,10,100,22,191,25,180,103,142,96,225,131,58,242,228,210,68,150,16,191,204,166,77,243,98,100,131,167,175,196,23,6,11,8,131,116,215,110,147,0,146,53,98,67,53,123,179,226,115,122,162,61,247,237,5,176,166,137,249,211,117,219,86,54,130,62,151,190,85,201,49,35,111,128,95,80,163,122,48,195,125,195,246,44,54,170,201,34,210,200,217,197,183,127,68,16,180,195,128,33,237,110,58,34,140,63,200,1,87,62,101,219,247,204,159,11,137,25,103,212,156,239,200,236,13,188,226,114,132,137,171,38,200,118,154,214,162,30,3,19,59,225,241,21,92,184,244,219,128,24,181,203,162,115,58,46,
+74,34,50,113,131,245,113,201,124,152,187,4,17,178,166,163,224,233,30,13,99,239,193,219,128,99,101,121,45,169,152,190,35,180,20,58,219,125,169,44,197,123,238,138,161,66,22,192,141,70,40,170,188,77,146,75,220,80,245,25,105,153,38,61,112,172,72,250,187,25,121,193,95,144,224,131,151,219,237,5,59,200,93,163,241,137,196,175,183,68,246,135,176,48,181,29,129,24,35,134,131,244,12,111,215,98,142,226,244,166,122,153,156,49,80,67,126,191,122,224,58,86,43,252,57,160,219,166,121,156,120,67,107,105,61,78,184,187,71,37,5,149,41,84,186,143,127,78,50,193,112,38,187,159,99,34,193,6,9,36,219,135,251,37,168,209,40,149,78,60,17,10,154,234,77,21,67,168,60,109,2,70,162,148,50,253,250,239,52,218,27,152,64,194,242,30,2,142,75,53,93,240,86,148,219,5,111,91,41,140,86,158,151,139,142,216,42,142,162,43,167,158,219,146,214,42,38,230,121,137,197,217,226,197,200,224,37,15,142,183,176,0,189,68,199,73,235,74,55,42,38,38,62,127,65,157,
+58,171,163,8,30,17,70,45,169,218,118,222,90,22,194,79,239,134,29,41,72,240,135,223,1,11,24,60,8,193,20,204,227,95,68,138,33,207,247,179,123,65,198,193,38,50,71,142,105,200,39,220,97,187,166,173,129,251,23,11,7,230,118,107,169,112,215,134,92,24,67,141,28,18,111,40,157,30,105,52,129,228,138,193,124,10,9,99,149,51,203,224,245,157,196,115,134,76,76,220,4,182,230,86,33,220,252,68,12,171,151,158,137,96,233,202,93,102,180,161,11,73,115,81,28,191,1,168,124,54,9,1,126,174,247,76,91,17,251,3,45,163,208,187,84,109,175,14,131,115,116,85,234,87,32,184,146,26,237,71,31,252,122,124,128,165,71,178,51,185,12,68,246,122,115,228,89,196,163,81,247,212,194,241,125,121,213,23,45,123,4,110,216,63,22,13,158,1,60,182,177,202,120,15,246,124,73,17,91,7,107,205,70,227,86,58,232,233,12,248,151,93,102,95,173,177,248,23,88,177,243,130,185,142,181,123,118,26,93,97,39,102,229,224,227,149,120,65,43,137,62,170,156,216,246,75,
+6,230,89,121,232,225,197,212,159,72,4,120,78,45,216,2,59,80,182,94,146,129,207,199,137,209,215,98,201,184,95,204,69,116,211,68,125,143,150,169,83,5,191,39,238,22,84,14,238,208,194,67,36,115,47,231,16,194,64,38,64,105,84,157,73,130,116,1,233,180,210,44,48,167,222,87,188,203,240,181,191,115,165,186,51,47,58,123,244,50,197,136,170,76,70,71,75,249,163,177,139,237,151,94,51,49,39,101,141,28,90,49,31,19,1,68,181,191,122,168,19,87,215,19,43,112,36,253,77,52,95,35,181,121,107,234,70,89,68,0,252,12,231,150,179,14,209,195,65,99,166,120,75,225,99,243,199,215,33,231,41,59,3,109,141,14,204,160,85,221,21,105,243,60,117,38,130,166,76,21,64,248,194,143,83,135,113,138,55,225,71,19,138,134,152,200,35,15,240,139,84,51,59,253,213,115,251,146,220,85,19,124,27,56,156,172,15,38,65,247,166,96,235,86,118,188,50,107,248,152,174,16,125,175,229,250,176,180,50,10,178,17,202,33,117,250,10,28,206,126,145,154,197,155,3,186,
+247,173,49,53,112,92,155,242,224,134,45,87,117,155,115,148,245,98,81,73,191,20,19,164,19,227,14,51,200,179,91,190,217,61,156,35,233,222,45,190,56,128,69,150,249,211,22,231,234,9,138,50,138,180,117,47,222,61,182,255,98,98,44,145,255,38,27,227,106,133,237,241,223,221,202,133,160,244,16,204,70,111,177,107,134,237,175,161,225,215,58,129,95,124,217,60,227,34,247,251,234,85,149,64,56,156,35,53,83,1,13,41,169,221,237,89,79,159,195,195,26,124,34,248,243,20,84,131,173,57,231,234,77,195,18,203,193,115,2,25,129,19,6,225,75,94,148,29,44,167,149,47,162,7,247,189,227,45,182,198,113,126,39,102,109,32,16,143,201,163,23,4,143,162,254,63,123,124,173,76,139,99,186,99,149,146,70,139,191,89,92,157,114,118,238,216,194,219,132,11,200,203,18,130,143,255,108,246,153,9,192,3,217,143,232,124,32,111,72,154,142,133,61,139,81,157,213,232,88,200,204,231,168,25,33,32,103,212,103,117,209,65,96,152,254,153,239,130,37,82,84,34,223,156,96,93,
+50,82,219,212,144,217,83,65,158,123,222,173,79,164,24,224,191,1,182,35,62,242,31,208,84,178,161,166,87,112,182,135,245,198,189,129,118,52,255,210,129,154,189,1,22,136,11,29,201,18,175,134,151,145,76,215,25,62,52,30,212,25,132,28,45,71,7,109,239,22,219,212,21,215,71,20,216,51,94,9,156,112,75,56,221,37,212,32,182,11,207,153,210,168,60,238,255,114,202,188,118,116,239,230,9,16,246,27,154,55,228,112,254,116,210,136,127,217,94,66,174,249,130,135,41,169,83,38,34,95,220,153,253,247,159,199,109,108,190,126,93,22,3,50,211,114,247,187,160,181,119,33,145,44,116,22,93,26,33,170,6,179,182,253,181,54,46,107,219,116,21,3,46,138,247,148,209,224,192,227,0,64,52,23,250,206,177,44,217,44,177,109,50,89,131,69,145,167,239,245,210,236,143,31,168,36,39,2,245,179,231,33,14,21,60,233,42,146,187,114,17,78,12,214,42,253,98,117,98,85,210,67,108,123,177,251,9,51,122,137,115,56,178,37,47,147,139,141,66,87,63,230,182,2,216,166,
+103,154,146,139,255,152,127,250,153,167,129,236,193,24,244,117,143,14,95,166,47,108,25,228,252,10,159,78,241,76,224,164,242,215,46,108,56,28,177,51,254,227,205,243,57,45,246,46,2,47,211,86,203,251,107,176,252,128,250,248,52,154,98,29,125,206,97,29,205,86,204,81,254,122,161,106,213,251,114,209,253,30,211,239,188,28,255,156,250,216,166,129,22,48,248,152,248,29,58,247,175,143,42,111,212,238,81,216,188,122,204,200,139,127,239,83,179,247,173,127,1,149,63,148,108,79,95,111,40,78,134,8,141,85,108,137,34,22,237,67,13,74,152,217,126,222,252,170,6,107,252,191,217,92,32,141,38,175,219,49,177,164,91,27,72,225,85,239,242,46,224,205,69,216,27,118,236,27,195,4,165,204,10,183,58,186,144,228,180,209,159,212,237,233,112,135,44,219,249,180,240,71,107,14,167,176,211,118,197,128,88,242,101,236,2,55,232,30,106,229,199,235,112,185,26,152,130,56,112,120,152,188,139,106,79,234,124,73,198,200,92,3,88,122,28,250,145,154,146,52,2,190,134,180,229,32,
+15,117,50,183,192,84,93,49,27,67,220,91,54,134,24,224,238,182,150,159,242,231,16,240,40,98,119,106,165,155,115,177,51,2,207,198,227,206,253,94,250,199,14,127,54,118,32,68,22,235,195,122,226,121,163,118,130,101,158,63,7,254,89,43,185,19,2,47,132,157,117,131,42,81,254,137,90,26,205,164,54,6,59,255,181,113,208,141,127,227,160,243,245,102,86,162,220,184,133,115,201,106,19,96,117,40,212,233,194,173,67,178,39,90,59,101,77,120,56,191,78,187,216,46,122,95,117,98,30,86,193,8,188,81,144,185,98,21,220,203,11,21,118,90,118,137,70,16,145,86,183,156,132,195,144,212,104,198,10,142,14,91,236,185,63,39,180,126,220,42,154,136,144,192,210,36,198,219,41,148,181,97,106,144,50,23,115,23,20,171,234,97,102,147,96,128,186,29,3,142,65,174,88,208,230,206,77,121,100,165,159,81,231,79,75,104,215,112,252,147,9,188,9,150,180,68,74,169,166,93,173,37,100,132,133,101,155,175,60,86,212,90,195,243,129,102,164,56,29,8,107,208,122,9,50,34,
+167,238,142,226,175,157,159,214,102,105,187,74,65,224,98,72,166,107,110,1,69,26,26,138,12,188,43,234,199,80,213,77,122,171,163,115,54,21,83,83,18,185,205,180,215,154,223,108,96,254,213,236,97,237,96,164,124,80,196,166,63,128,250,254,137,202,112,220,132,188,174,221,37,77,110,220,213,86,98,230,31,28,91,127,182,169,65,17,150,46,33,86,247,225,90,249,19,166,111,238,108,240,56,92,111,103,37,246,31,148,48,187,203,245,102,118,239,95,123,19,172,181,30,0,99,17,3,226,214,201,42,248,55,255,86,10,64,75,195,175,181,102,147,55,195,71,45,108,119,125,24,123,150,143,141,122,248,154,168,186,35,64,43,151,165,7,207,43,213,52,148,18,52,145,65,196,44,150,233,166,138,16,242,163,87,124,19,95,162,216,4,209,20,243,201,63,118,255,40,243,150,49,98,195,101,38,146,180,228,175,165,27,117,56,35,206,85,4,48,144,254,168,22,166,28,6,231,120,70,166,103,227,72,187,186,82,252,171,61,119,163,85,32,54,223,13,178,195,248,10,31,41,154,128,191,187,
+191,209,135,121,11,147,20,98,178,248,128,121,105,42,87,252,216,105,52,41,249,23,92,55,76,65,10,137,45,152,207,140,221,246,232,58,112,191,88,54,128,188,90,163,57,47,0,34,144,105,61,252,203,187,111,42,64,106,176,253,39,78,124,44,166,83,255,146,207,143,215,73,231,255,64,60,124,110,174,7,109,242,213,91,252,254,79,251,154,223,92,12,31,199,30,31,6,135,145,111,26,173,73,54,110,252,167,238,193,215,11,162,26,1,175,117,217,241,187,41,132,152,242,166,239,98,9,153,16,116,97,228,176,135,211,229,79,228,160,184,81,244,226,168,49,102,205,26,29,135,101,143,18,93,96,60,55,17,93,81,222,228,198,13,218,59,88,254,159,56,231,38,88,82,218,29,219,27,148,2,122,164,184,118,179,87,38,179,77,21,218,46,154,54,226,195,255,212,107,254,102,32,24,168,99,214,73,13,146,110,7,42,7,214,89,233,52,168,126,250,193,167,13,216,104,140,157,19,120,17,128,222,75,121,147,47,76,51,237,124,148,166,45,222,70,125,206,138,5,241,148,137,205,22,56,72,
+121,226,67,26,178,236,165,76,133,154,126,191,149,250,191,197,133,136,141,11,244,176,116,42,239,246,184,255,137,163,175,30,31,139,238,49,246,116,175,178,137,147,199,252,251,18,122,250,23,63,35,237,77,64,252,35,87,139,1,255,115,125,241,249,26,254,153,223,253,255,153,255,159,249,255,153,255,159,249,255,191,230,255,169,239,167,124,18,111,82,28,195,135,117,157,164,57,110,223,92,210,60,47,30,70,145,173,25,231,191,254,92,101,161,42,19,8,94,61,150,192,247,1,187,123,90,125,158,32,160,123,94,62,124,219,66,192,14,91,66,222,161,37,212,5,188,215,251,223,233,193,207,13,40,203,5,214,55,111,120,3,123,243,239,254,255,204,255,27,243,161,95,167,61,64,48,181,126,206,251,130,249,228,120,107,155,195,249,124,121,163,147,232,204,124,238,85,134,228,80,172,137,5,56,156,203,39,209,22,137,219,44,199,116,176,21,97,125,248,250,36,108,97,236,104,93,223,215,163,202,122,146,29,253,198,126,196,79,170,141,248,215,234,71,220,142,12,58,138,20,98,11,213,242,6,176,
+178,9,209,201,164,165,33,77,221,82,231,150,45,198,173,99,26,62,54,184,81,190,200,72,146,3,187,98,37,245,190,31,245,81,123,42,226,55,70,48,107,156,173,144,159,81,213,18,242,235,11,2,199,171,44,229,177,201,87,60,169,87,218,97,247,26,191,197,44,105,49,12,235,206,249,214,128,104,36,204,49,155,236,116,112,86,236,219,26,147,196,62,47,254,156,177,165,6,177,119,225,71,104,80,175,8,160,28,100,208,159,77,146,226,189,60,62,24,117,149,243,118,195,154,97,143,231,48,118,121,31,8,36,141,172,40,165,75,25,78,163,232,225,4,79,237,164,98,125,83,111,112,218,104,210,254,210,227,133,41,244,158,226,86,111,166,231,209,199,152,145,231,251,12,172,237,183,179,124,1,81,60,43,55,147,129,221,92,28,107,165,83,182,179,129,130,250,45,73,236,106,80,77,120,220,236,126,245,94,71,49,153,166,151,162,123,118,238,13,15,242,116,184,97,97,70,146,178,202,207,88,42,245,197,241,222,0,29,100,20,10,224,229,67,119,158,113,90,207,194,146,47,139,171,220,246,
+84,33,220,217,156,87,133,241,145,185,208,32,93,245,89,204,195,204,117,177,203,117,221,87,52,227,72,82,230,16,192,199,86,195,227,126,44,164,187,236,65,177,108,177,5,101,64,246,172,43,240,183,93,42,104,81,177,45,159,111,36,237,31,11,179,28,202,91,158,21,206,228,50,115,113,75,26,25,47,187,226,129,66,134,132,158,125,167,131,148,61,22,105,43,14,13,238,89,239,68,26,18,62,181,203,125,167,42,150,109,55,159,193,175,203,31,255,165,186,87,117,2,79,201,119,218,121,66,219,64,235,148,224,207,250,241,236,219,243,81,89,111,20,71,239,93,250,202,176,247,209,206,26,180,220,22,20,14,143,36,47,226,153,139,117,80,103,237,93,158,169,253,143,159,121,42,211,70,31,254,122,146,29,129,214,241,19,5,77,170,175,49,203,143,64,122,188,17,252,119,251,236,107,208,120,83,185,231,167,80,169,142,56,48,176,72,45,14,245,202,103,227,125,202,22,125,9,203,146,107,94,245,169,90,222,147,75,219,221,85,174,81,248,26,56,244,33,93,127,84,73,221,74,238,67,186,
+88,64,159,90,59,94,201,200,21,76,255,179,173,122,90,163,233,234,205,10,162,22,211,213,180,210,174,246,68,103,140,180,40,87,79,215,136,233,58,197,248,169,46,98,74,215,221,139,54,67,48,92,210,150,251,99,193,177,105,239,101,56,58,28,166,250,21,241,154,8,79,127,87,25,121,201,218,80,61,132,135,135,7,222,92,225,218,196,92,191,70,49,119,248,92,228,93,250,233,156,183,217,97,187,91,252,171,240,50,248,243,19,48,44,207,109,167,228,81,211,184,120,46,79,25,206,204,151,152,27,168,105,152,152,60,235,99,25,211,254,242,6,162,162,185,20,114,183,227,57,94,19,111,175,157,69,75,6,67,82,106,195,35,98,208,127,13,6,163,144,154,37,178,208,149,190,184,152,141,25,9,203,175,91,111,236,27,188,90,160,115,49,174,16,75,154,83,136,179,80,16,220,239,116,149,147,230,108,52,99,213,60,74,32,119,73,25,69,79,218,154,250,167,93,118,154,49,227,0,179,194,167,232,133,190,20,196,171,11,172,213,142,166,34,185,221,120,0,32,13,135,188,113,61,179,172,
+214,143,99,250,240,107,123,105,104,160,185,76,114,231,7,134,113,10,177,61,124,120,93,9,215,184,25,111,159,197,76,70,109,219,121,196,242,252,91,206,26,216,215,246,235,31,173,111,192,238,181,253,103,116,182,158,252,139,123,118,244,185,17,95,63,111,196,55,7,27,49,71,191,17,255,151,115,84,58,136,58,253,28,27,27,105,198,85,83,66,13,58,30,198,59,171,183,238,223,60,34,242,94,156,126,194,33,45,156,215,51,245,116,172,130,73,117,74,212,209,209,75,67,240,60,208,194,56,239,63,171,188,244,1,108,104,154,216,92,8,113,234,42,160,147,136,239,63,151,199,184,99,255,61,129,68,6,9,119,42,101,120,119,113,35,253,210,16,175,39,184,111,69,238,229,4,245,107,99,215,76,206,124,70,234,157,207,17,79,222,30,156,236,34,245,135,209,198,237,76,89,94,74,237,191,238,14,140,134,126,162,160,14,180,165,186,226,170,247,94,85,102,110,138,143,145,129,158,72,227,17,21,116,17,4,195,95,28,14,191,141,181,203,169,157,239,81,185,189,8,164,91,39,78,83,241,
+33,191,162,81,187,63,162,24,48,93,198,180,248,212,191,92,184,175,127,250,188,224,20,159,118,40,232,181,179,219,32,3,252,19,35,177,27,5,209,233,105,175,49,99,32,198,144,136,156,101,78,214,158,136,42,216,132,208,85,112,122,252,109,71,168,23,161,16,40,116,135,222,222,60,17,77,244,187,138,186,22,110,255,215,37,116,166,6,83,246,204,245,145,74,22,135,13,183,133,218,201,225,41,109,202,16,252,170,91,101,76,126,85,39,19,220,219,187,207,165,238,235,115,245,192,87,22,219,23,182,214,3,155,10,50,201,195,141,191,99,8,204,77,97,229,164,188,87,142,56,216,28,112,187,134,155,89,89,118,174,190,109,226,153,53,157,158,236,158,149,22,30,145,79,151,93,216,210,8,107,111,54,8,37,249,228,221,38,28,37,218,124,242,103,116,177,158,100,71,245,141,24,57,229,252,179,112,35,94,126,108,196,159,15,27,241,255,122,14,121,180,60,184,205,178,247,255,230,252,36,96,109,99,247,113,124,161,41,104,227,58,240,243,66,8,159,78,241,251,169,197,243,227,29,121,105,
+149,127,10,241,255,60,191,165,74,232,234,17,14,181,95,211,17,168,239,4,221,32,124,251,99,103,223,218,40,250,131,7,163,62,92,45,164,93,103,152,94,107,194,28,141,201,44,225,54,44,90,82,147,246,118,147,80,182,150,228,210,126,157,43,140,206,225,54,154,68,34,85,136,127,192,47,217,217,18,192,77,35,162,248,63,239,32,151,212,140,245,231,115,22,14,73,113,217,217,172,59,81,190,165,144,255,200,107,176,183,129,243,93,133,12,210,197,110,206,180,63,10,91,216,235,95,75,160,208,90,30,143,35,90,215,217,107,215,17,49,221,153,141,66,151,193,41,170,198,94,85,34,213,207,186,209,20,7,119,150,104,187,245,15,222,95,43,123,163,81,169,243,46,221,63,203,52,89,44,50,235,231,238,166,167,243,13,44,119,171,233,13,64,133,235,73,118,132,108,196,255,196,243,110,250,47,126,131,27,241,116,251,55,19,17,252,250,80,11,169,126,114,65,90,57,37,150,13,240,151,100,217,186,87,254,120,124,192,124,91,114,32,97,41,66,228,120,83,222,255,109,30,112,184,17,71,
+172,27,49,246,178,17,11,255,158,163,88,79,94,156,215,224,215,49,109,61,9,237,6,51,157,31,191,68,215,126,25,239,62,190,172,254,168,65,70,246,55,95,232,248,58,176,173,97,23,208,63,104,214,47,17,104,122,211,42,156,60,182,218,97,155,190,83,215,43,83,7,182,179,232,231,10,107,37,228,189,149,176,169,234,108,128,145,89,135,211,18,130,226,247,122,36,220,188,139,58,114,121,196,46,76,12,111,184,210,94,244,238,111,190,209,65,249,56,16,199,82,233,72,86,116,22,141,154,63,128,76,60,216,215,176,22,42,109,224,4,83,19,36,213,253,42,216,243,21,26,117,27,78,255,214,41,120,215,123,103,1,10,56,22,120,60,164,209,201,175,188,32,247,221,88,27,22,172,183,237,23,118,115,239,17,177,86,217,192,99,122,165,163,161,30,71,8,123,74,3,31,201,77,135,13,121,103,93,215,34,235,67,86,105,95,251,48,239,185,89,201,246,218,155,176,67,190,146,210,215,160,229,227,241,41,209,206,45,127,145,55,169,8,12,252,89,108,121,181,41,195,207,191,186,155,130,
+188,15,158,127,70,234,245,36,59,58,218,136,187,127,235,245,206,70,188,60,217,136,57,111,27,241,127,57,71,7,162,47,87,182,132,230,217,6,42,154,201,129,57,144,242,255,248,43,198,214,171,250,65,107,97,212,167,128,153,77,0,159,63,219,162,22,221,35,103,138,255,254,207,120,43,209,160,97,230,69,37,242,154,207,36,85,207,35,171,217,40,82,72,101,92,190,136,222,252,30,53,23,100,8,247,107,77,236,2,63,209,98,167,205,104,94,54,51,124,121,122,47,109,32,160,127,239,217,169,36,226,210,252,197,169,188,244,235,133,70,11,217,229,158,203,49,199,219,151,26,225,139,181,14,210,94,213,193,95,252,10,229,37,53,45,179,27,38,17,125,186,184,197,152,246,49,107,98,253,146,211,31,237,30,223,116,58,132,89,228,40,104,78,70,23,189,198,105,226,111,30,73,107,15,50,247,205,119,219,120,30,153,140,80,107,146,39,102,121,78,167,170,172,120,105,39,33,188,187,105,109,210,9,14,15,212,1,94,8,106,199,255,9,188,19,88,83,94,77,15,210,127,198,134,236,255,
+73,127,252,228,51,45,119,139,209,158,208,68,123,5,127,158,179,215,85,94,233,0,60,244,223,107,165,57,5,174,140,34,188,45,142,157,163,157,90,30,181,224,235,71,61,203,99,124,147,70,166,175,235,73,118,36,13,254,136,183,58,27,177,246,118,35,182,168,54,226,32,127,35,230,156,173,31,119,247,167,49,158,50,246,74,42,241,79,254,130,154,60,255,30,31,22,188,173,22,170,220,110,204,33,17,9,66,59,169,68,245,225,35,153,50,218,8,180,38,231,85,78,136,191,249,36,114,80,37,131,205,162,235,73,122,88,129,96,189,160,108,230,52,94,206,94,158,245,147,219,189,126,32,198,43,178,9,92,30,209,41,217,124,195,225,175,193,156,131,133,145,64,101,40,24,207,173,71,160,251,208,188,56,120,251,206,214,5,129,208,77,180,168,6,186,125,236,13,56,89,176,89,90,216,151,211,193,172,191,220,215,176,242,222,110,247,26,122,132,58,88,225,44,158,139,117,194,146,166,164,166,155,81,178,183,20,45,243,158,75,93,80,62,213,215,218,110,160,77,156,231,166,120,231,243,59,
+209,124,79,104,118,79,139,217,94,44,151,168,187,52,41,210,188,119,203,172,240,209,171,124,68,180,45,203,232,133,14,249,249,142,86,194,227,200,221,35,72,138,142,17,190,137,4,75,27,232,236,47,161,105,209,124,44,141,193,107,230,165,94,167,133,228,246,199,169,189,110,1,130,76,215,49,162,39,227,75,192,215,165,167,77,32,139,186,158,239,54,4,165,2,108,227,253,75,97,60,162,23,249,64,138,78,245,196,184,147,89,24,151,124,18,176,213,144,243,84,17,177,141,235,253,27,88,216,130,17,134,86,221,6,43,24,48,209,25,67,170,194,199,65,234,165,29,198,135,233,221,225,8,221,223,227,233,214,249,45,176,246,79,52,33,149,229,198,197,1,113,250,169,162,53,63,239,243,178,94,187,64,234,95,179,84,187,254,6,136,139,191,121,66,247,41,253,25,41,227,200,207,136,94,79,178,163,233,70,252,153,148,254,173,227,155,133,190,141,120,253,125,252,103,244,191,158,35,139,35,174,209,159,243,195,123,199,41,238,103,77,37,253,145,186,76,154,37,121,63,101,49,3,21,251,1,
+76,34,141,53,194,153,152,190,152,16,252,221,175,112,245,151,80,35,217,168,154,31,89,15,59,124,191,134,107,226,185,243,188,13,180,15,186,29,232,116,140,103,46,253,52,124,34,58,176,195,17,16,21,253,245,3,194,250,97,247,203,244,245,123,114,24,166,32,202,196,76,7,137,86,37,144,152,219,13,177,71,117,39,185,95,100,41,173,88,34,246,225,146,104,154,85,49,191,209,199,134,45,105,172,194,191,21,93,191,166,194,218,188,171,163,155,36,114,132,80,147,250,66,151,12,4,53,218,147,181,179,217,59,30,215,151,176,27,130,73,192,224,131,178,117,38,64,73,182,211,11,212,83,68,230,182,155,64,84,26,156,176,19,14,226,111,94,17,68,34,29,18,76,120,223,225,109,7,73,37,152,78,255,65,6,215,37,103,11,31,62,17,77,16,205,105,50,130,172,127,97,37,251,19,183,141,25,70,33,174,93,51,80,164,206,42,86,214,38,32,203,242,189,25,235,65,234,131,133,141,212,11,26,169,212,187,200,116,183,116,79,201,79,12,209,24,248,95,198,117,3,122,164,144,210,178,
+36,91,120,68,154,115,66,246,247,188,198,71,254,15,18,102,148,179,56,45,213,30,180,161,235,255,62,158,237,27,241,127,155,23,14,126,178,218,248,104,250,125,147,91,167,148,16,155,83,56,218,193,87,25,225,65,135,213,155,99,229,79,246,57,103,235,67,235,249,255,169,62,252,239,214,153,239,141,56,26,175,157,55,102,179,217,199,61,93,171,11,96,102,87,193,66,241,19,177,185,130,123,185,139,140,15,17,125,5,63,148,95,15,136,92,6,226,7,91,44,50,34,107,55,219,92,123,254,220,93,218,135,192,88,96,235,251,167,33,124,95,115,254,170,211,72,190,197,10,129,120,123,134,134,114,147,151,192,44,49,136,117,51,31,166,88,20,85,246,158,32,73,141,91,121,218,16,15,10,187,184,244,23,112,112,42,144,76,108,46,111,97,223,115,235,134,159,29,225,196,164,91,67,34,230,88,204,116,81,220,154,46,8,95,53,181,252,56,248,139,119,155,75,200,234,197,107,142,69,85,127,224,65,110,78,143,242,195,118,46,223,115,187,4,103,39,117,151,125,2,239,30,21,109,12,221,
+8,140,254,225,55,26,246,154,242,140,223,48,7,89,252,150,203,198,76,255,222,1,120,177,107,122,122,28,52,199,140,173,191,124,193,181,86,222,28,159,174,202,163,208,253,205,111,46,194,102,51,185,169,115,172,252,89,133,113,244,155,174,166,106,116,26,187,108,91,6,171,63,249,225,14,4,71,127,209,64,220,52,248,42,165,209,94,98,118,113,70,31,109,120,81,211,121,3,165,136,100,79,197,136,241,119,147,8,181,154,18,178,92,238,93,215,217,127,240,217,174,255,95,224,227,127,23,103,187,248,135,160,156,206,96,120,176,16,76,89,32,229,71,149,132,23,127,74,214,27,213,213,207,130,240,116,189,128,104,88,206,98,177,218,113,82,103,56,235,197,154,224,81,42,80,64,5,157,61,104,209,82,151,93,225,56,117,44,57,95,72,94,89,91,150,126,120,225,165,159,40,95,87,211,115,94,86,222,23,60,162,205,86,155,60,210,178,4,123,18,192,117,185,33,199,136,29,39,227,155,130,94,35,181,193,97,246,88,73,185,186,51,155,178,97,246,86,77,230,11,175,97,26,148,23,28,
+113,173,94,164,144,183,136,147,158,150,219,51,145,198,19,141,38,246,74,39,170,133,229,142,94,227,19,39,61,60,154,247,155,195,161,175,65,115,252,113,56,65,164,238,194,97,198,82,35,134,163,101,177,56,61,40,77,205,61,72,42,206,124,52,99,131,135,130,177,192,58,202,65,153,172,29,58,122,38,76,64,143,143,191,39,49,239,60,11,231,165,46,77,208,130,132,70,202,241,55,91,192,254,105,75,205,213,115,185,107,190,103,245,89,63,46,7,31,197,91,191,201,83,144,74,154,97,87,255,105,224,144,206,224,68,102,182,154,112,111,201,91,112,214,81,204,218,163,128,25,97,108,46,231,127,196,203,126,237,92,96,232,62,194,3,109,31,171,104,93,58,247,167,45,20,89,202,13,88,36,86,185,126,243,242,74,33,225,36,91,69,104,221,159,141,33,66,203,31,67,20,75,245,246,115,2,238,44,29,80,81,223,113,232,131,81,163,220,54,65,218,57,158,151,47,182,120,163,175,216,224,166,158,216,118,197,253,199,119,238,95,118,76,202,75,199,2,107,8,155,177,31,179,151,75,179,
+7,141,4,23,24,168,24,16,103,140,82,215,133,51,58,114,44,93,48,147,241,148,156,78,52,39,165,120,92,219,244,247,87,84,222,44,44,33,177,89,17,85,54,190,255,163,207,22,185,184,119,15,202,134,210,74,41,50,109,126,79,154,178,29,72,50,119,209,52,210,140,53,245,4,50,255,56,160,12,169,203,45,125,245,82,141,130,61,110,240,191,239,19,254,191,246,27,228,207,179,190,178,121,187,110,117,85,8,186,227,154,127,193,173,187,79,135,196,218,174,216,140,143,159,111,219,62,157,240,209,192,163,117,63,223,35,158,215,193,53,62,180,53,146,169,151,94,4,8,176,226,69,69,245,209,1,47,237,200,223,239,56,107,115,5,44,23,107,218,139,235,95,205,177,162,249,117,234,254,117,79,103,221,103,134,208,223,188,80,95,175,202,1,237,125,198,40,148,88,120,209,237,129,62,95,90,102,6,202,124,185,114,22,75,37,131,214,147,159,202,35,100,73,111,200,122,153,174,79,241,244,189,200,164,177,134,195,208,157,220,209,8,234,163,224,101,55,0,230,155,227,46,78,214,105,230,
+182,17,252,112,20,121,235,37,176,212,209,89,47,89,175,89,47,201,108,244,106,120,36,76,242,130,23,158,252,110,82,235,95,31,184,83,251,222,173,32,156,105,222,236,110,8,237,217,58,201,156,211,34,160,47,39,68,142,92,125,164,193,243,246,143,213,3,155,231,138,237,113,249,90,13,186,233,38,187,246,244,31,60,243,92,23,97,252,29,49,93,21,75,32,51,218,213,10,187,182,194,191,211,95,42,55,226,255,182,79,229,78,55,141,168,66,189,105,68,61,156,77,35,90,45,111,26,209,95,190,77,35,122,19,249,247,250,203,127,23,55,158,141,89,47,195,126,107,248,249,24,33,199,95,19,85,186,224,9,133,202,114,234,114,98,248,8,174,186,55,107,196,136,131,63,137,108,208,212,87,78,158,212,91,23,62,69,173,150,76,112,76,30,175,47,23,177,29,163,195,130,171,120,13,55,178,102,75,228,3,49,47,37,195,77,24,215,136,243,70,52,179,87,64,172,46,157,175,208,74,150,187,54,128,28,161,138,194,82,1,143,35,241,52,194,174,123,122,103,215,173,206,27,126,253,52,
+153,216,9,19,54,94,216,114,238,51,155,11,181,78,101,208,6,206,51,97,199,13,69,114,178,92,213,70,76,46,202,207,47,77,65,121,36,202,91,69,13,209,66,27,224,198,255,5,231,229,196,71,151,182,201,207,76,94,251,21,36,97,252,31,51,196,227,127,214,120,52,134,45,93,172,124,166,29,70,22,79,13,210,55,247,60,164,13,18,69,76,248,32,169,184,155,130,192,82,213,185,190,58,35,241,52,55,254,23,183,166,245,105,149,221,250,39,242,122,102,18,155,234,160,92,185,136,124,221,87,4,203,98,225,35,30,232,149,8,38,120,231,12,7,194,170,99,175,6,61,44,209,53,222,41,69,99,5,222,158,134,235,114,150,233,99,16,5,231,44,5,244,253,180,115,33,235,237,165,217,139,194,14,96,225,117,107,132,9,10,249,70,134,91,192,18,249,147,244,250,127,80,51,126,60,51,3,158,168,131,113,118,56,87,154,117,224,29,115,207,232,76,42,215,30,223,73,204,22,185,75,104,167,81,143,212,19,42,207,238,220,250,248,54,99,202,92,120,66,130,199,185,239,231,191,155,
+47,159,65,56,90,59,215,38,249,97,251,88,79,201,140,129,72,76,159,14,149,206,234,9,185,165,81,79,93,77,133,86,195,179,147,250,212,11,144,64,150,225,139,247,38,220,212,142,203,213,28,159,255,124,31,101,85,132,228,251,149,47,191,134,110,75,124,173,148,86,211,109,212,240,131,3,9,25,61,24,130,166,97,42,156,192,65,79,163,105,112,152,232,104,210,30,205,210,23,145,84,249,107,157,120,181,108,243,132,165,203,118,87,140,126,52,248,111,255,169,143,56,110,159,78,161,140,236,226,242,249,245,223,251,206,249,239,126,47,61,90,27,39,104,206,133,4,193,92,25,209,221,205,197,84,182,224,104,92,5,248,180,54,66,52,2,13,1,239,135,230,79,214,228,106,207,117,23,57,8,139,171,241,244,216,41,12,141,157,39,199,171,94,94,122,175,161,206,139,30,143,204,21,56,75,158,141,30,186,105,249,65,97,231,119,81,126,177,190,225,215,79,53,60,156,56,155,14,18,97,34,222,209,116,120,237,225,70,244,239,8,228,113,121,137,58,34,109,202,96,131,127,39,153,222,212,
+223,23,182,236,220,163,53,141,76,41,46,21,100,197,108,107,102,199,137,60,86,158,86,206,197,209,115,248,248,23,115,233,19,134,147,143,35,185,139,82,81,198,160,115,224,43,252,110,85,6,168,100,176,136,236,68,4,199,196,131,252,146,189,120,135,179,73,184,118,110,216,114,16,117,116,44,143,211,4,86,48,242,95,108,153,149,128,151,153,36,27,3,125,209,53,127,54,63,74,196,129,54,234,197,254,36,118,219,2,190,228,90,113,108,214,118,218,57,48,238,13,52,176,92,54,114,56,203,41,96,94,253,173,139,237,159,186,120,222,214,36,203,218,157,176,193,52,64,223,253,1,113,88,222,173,69,250,39,212,105,194,18,228,139,211,164,67,249,22,222,38,18,186,172,125,113,255,104,226,253,145,245,42,31,132,167,55,32,245,78,65,113,244,44,101,138,193,242,246,207,7,57,199,38,15,12,149,237,69,208,74,163,5,189,14,194,93,145,3,180,22,168,231,178,210,147,120,247,157,192,137,223,53,69,52,218,126,215,196,212,208,227,243,224,89,76,195,31,47,235,98,247,47,117,227,123,
+63,61,75,231,223,53,182,48,207,22,76,209,232,221,165,73,239,65,82,61,132,130,152,68,69,175,235,161,51,227,205,30,141,210,131,55,243,211,159,255,248,206,168,221,13,222,203,59,89,113,197,9,253,95,236,189,217,111,43,105,150,39,246,175,164,199,128,209,3,76,77,219,176,219,99,119,55,218,128,103,108,216,79,54,48,6,230,181,122,170,178,187,19,157,149,89,200,197,131,182,219,64,80,27,41,81,36,37,81,220,69,82,18,87,5,87,145,12,238,155,54,82,36,197,157,65,138,193,77,18,55,113,223,119,50,194,65,50,171,186,102,241,242,224,39,35,31,46,160,251,69,196,137,223,119,206,249,206,249,157,19,247,234,84,208,140,193,236,115,192,86,139,237,40,181,251,154,114,100,131,247,53,129,167,88,43,38,29,31,237,213,161,33,93,141,185,195,173,246,67,239,132,73,123,37,29,9,215,106,6,98,107,53,95,155,225,231,110,237,80,74,67,32,171,175,134,11,136,45,114,100,5,43,175,70,174,160,209,64,57,207,198,188,38,37,98,175,8,201,133,7,22,120,24,152,84,
+202,82,26,245,255,211,58,211,20,117,249,238,128,195,210,161,107,101,197,212,7,64,18,224,154,163,152,58,59,214,30,31,122,198,25,153,104,208,249,0,128,203,195,63,252,254,179,254,105,203,175,200,170,232,246,243,208,202,179,189,252,255,250,59,18,188,165,215,236,119,134,210,231,26,163,163,171,214,82,56,46,254,67,188,174,227,110,43,80,118,234,180,0,55,223,174,11,239,163,91,26,59,132,215,86,175,37,114,119,227,78,138,198,63,255,61,255,214,226,103,37,46,73,185,212,178,128,158,229,169,38,21,129,28,108,207,45,13,89,91,24,174,88,20,183,227,192,228,106,200,98,147,126,183,255,99,252,84,62,81,249,234,131,60,118,161,124,17,24,38,41,94,154,44,211,251,144,172,21,174,249,225,6,165,212,62,87,115,84,249,137,56,55,19,222,163,191,239,91,93,227,199,204,52,80,99,25,189,142,198,93,25,108,117,223,42,151,150,88,56,97,50,47,213,124,64,156,183,122,43,149,16,251,169,111,142,187,124,179,251,106,70,103,236,218,67,225,227,129,101,106,166,76,46,11,167,
+49,55,13,243,194,139,37,31,13,104,54,125,46,205,176,83,89,59,115,22,147,14,2,10,99,51,231,74,167,56,141,197,186,126,38,169,111,79,255,128,7,17,139,120,157,162,90,117,110,92,239,177,129,203,98,235,135,175,184,54,133,57,188,146,85,162,177,19,117,206,232,71,230,25,119,127,26,171,104,28,27,243,199,241,248,19,189,0,39,237,147,180,55,40,88,102,243,234,178,212,159,135,173,205,126,175,146,205,141,22,210,136,245,253,152,22,104,159,133,241,99,129,97,54,241,132,167,168,190,159,244,244,89,13,154,231,91,95,106,193,75,117,250,227,133,84,24,27,198,151,167,52,237,133,73,245,2,235,24,236,136,182,58,227,40,149,183,158,225,177,250,24,49,206,239,67,87,170,140,91,87,185,119,103,15,222,119,232,159,84,69,68,158,113,126,26,252,129,99,238,125,214,32,159,164,62,186,146,5,105,210,183,72,170,213,234,5,179,101,180,21,187,221,149,186,179,236,151,106,171,246,130,237,156,8,253,68,108,78,2,216,87,243,201,187,43,176,164,99,7,113,43,71,154,34,174,
+247,113,234,187,198,88,201,27,199,131,186,241,78,224,132,176,29,4,112,147,162,174,46,18,93,147,150,227,147,149,159,44,219,240,9,227,102,117,168,73,108,86,201,178,216,102,149,20,165,108,86,113,191,219,172,6,49,195,206,86,128,8,217,10,184,93,217,10,194,226,249,254,8,171,206,193,37,135,179,55,87,173,27,90,111,169,189,207,194,108,118,76,35,230,91,159,232,253,187,121,176,48,146,225,203,135,137,136,95,160,117,135,181,2,94,127,175,1,231,173,206,7,142,137,171,177,117,132,83,219,139,179,15,218,86,156,244,73,103,193,125,95,255,99,180,183,189,207,209,90,74,213,14,99,199,66,146,96,126,251,254,202,241,86,236,194,21,124,213,36,87,151,181,49,252,32,27,178,7,121,116,135,45,242,98,174,56,118,212,155,239,85,213,83,97,119,95,40,95,155,95,20,194,15,69,160,106,94,236,36,227,152,124,238,17,119,67,46,221,232,125,40,111,93,244,224,132,70,38,184,95,206,37,131,252,8,12,210,110,23,23,116,33,103,133,206,63,108,193,20,145,184,68,54,8,88,
+219,125,84,87,133,122,200,200,159,39,151,241,2,63,122,28,199,158,42,195,57,60,64,89,115,139,203,80,52,20,115,210,238,124,95,175,230,244,116,165,177,69,63,159,236,73,39,235,207,65,238,70,129,136,242,89,225,238,152,160,10,73,175,170,88,109,9,202,100,227,226,164,51,235,181,205,213,93,254,50,252,32,156,78,15,157,156,253,20,125,131,183,189,193,59,141,69,105,210,106,200,138,201,44,33,172,166,62,11,246,196,215,19,79,48,127,139,141,195,181,187,80,255,125,116,221,217,232,255,60,186,209,127,74,86,94,9,133,121,43,83,130,234,209,193,43,139,26,31,185,52,171,207,91,193,219,4,76,23,38,33,69,229,108,105,164,219,61,10,103,103,121,92,40,6,188,157,81,193,18,182,231,7,180,29,235,230,181,235,254,57,139,99,18,246,242,221,58,43,238,50,84,39,11,186,171,238,57,77,155,10,171,243,246,244,136,150,116,45,38,230,69,241,194,216,51,221,92,11,6,153,125,23,117,77,196,217,204,171,57,107,134,209,71,147,29,215,49,202,199,35,37,0,104,239,135,
+154,129,186,237,169,46,173,82,140,189,177,98,193,124,223,90,19,29,207,154,47,199,215,165,247,252,109,207,48,233,12,49,118,140,17,162,109,226,113,180,7,39,209,149,245,70,63,67,118,176,204,244,24,0,46,142,17,84,8,33,79,52,231,46,80,114,75,86,141,22,121,19,175,253,243,20,242,193,92,227,102,12,201,26,72,181,150,124,13,214,10,141,204,80,51,5,128,68,204,149,52,222,174,209,201,197,24,69,213,218,36,82,174,15,67,50,56,19,118,2,151,103,40,100,124,186,90,187,55,46,82,218,218,240,13,63,11,151,185,22,153,199,101,174,69,158,224,50,215,34,239,51,107,61,39,98,52,92,230,90,100,3,151,185,22,137,239,51,178,22,217,219,176,235,51,148,140,203,92,139,212,109,97,238,91,183,48,153,189,45,76,205,254,22,38,120,186,133,9,44,183,48,63,95,183,48,85,7,91,152,62,202,22,38,80,216,194,196,78,182,48,91,241,45,204,57,121,11,19,208,108,97,178,72,91,152,153,247,45,76,151,119,11,83,14,109,97,2,159,91,152,215,211,45,76,104,
+127,11,83,194,217,194,4,114,91,152,171,233,22,38,116,191,133,89,35,109,97,2,206,45,204,130,114,11,179,245,176,133,137,121,182,48,47,53,91,152,59,207,91,152,228,218,22,102,234,105,11,147,193,218,194,4,30,183,48,135,221,45,204,100,113,11,83,204,221,194,4,12,91,152,216,114,11,211,120,191,133,185,122,217,194,4,212,91,152,100,251,22,166,234,106,11,179,176,183,133,153,16,110,97,226,121,120,107,160,171,45,76,164,184,133,121,198,218,194,252,217,143,126,246,163,159,253,232,103,63,250,217,143,126,246,163,159,253,232,103,63,250,217,143,126,246,163,159,253,232,103,63,250,255,157,31,13,113,153,134,97,103,231,194,181,107,247,227,23,204,192,57,242,233,34,235,185,25,182,106,234,154,3,78,192,173,104,30,67,66,110,214,136,166,105,213,37,45,166,235,213,136,29,36,102,116,246,180,206,102,60,53,213,81,170,180,206,188,19,124,15,78,171,30,47,219,164,226,93,56,106,102,159,174,105,118,54,205,213,212,107,57,224,132,154,253,55,105,124,194,19,102,180,157,210,103,
+206,99,60,14,78,181,89,115,238,131,66,22,200,178,214,105,217,196,139,179,168,45,196,94,138,123,63,110,41,197,34,143,133,40,45,35,95,44,227,101,49,243,186,97,45,88,180,7,218,115,138,68,40,232,163,150,82,51,126,38,17,241,152,212,48,180,236,19,123,210,195,1,19,27,211,204,15,175,31,193,98,181,191,154,243,59,139,199,204,35,86,43,91,170,185,217,180,5,0,192,233,32,222,100,173,118,211,232,251,209,53,217,211,225,99,157,92,186,147,27,117,192,64,167,102,27,106,237,150,202,245,71,173,147,202,13,155,123,165,154,154,55,31,164,75,34,94,64,154,29,15,71,168,217,60,39,192,10,108,103,120,47,164,118,14,10,109,196,49,71,125,94,234,148,214,145,186,2,111,31,122,159,45,103,108,9,6,86,158,26,153,61,49,6,152,165,123,239,75,137,92,166,165,91,76,38,238,22,150,175,150,218,61,99,162,234,47,11,194,130,246,67,32,102,40,218,249,30,234,152,4,88,133,193,93,223,54,11,23,208,240,44,208,193,208,220,36,59,16,12,90,109,107,39,123,88,
+21,176,108,248,95,219,246,170,116,153,73,7,92,179,204,180,147,30,20,99,25,84,206,199,13,54,170,72,58,216,176,33,92,189,31,183,105,40,124,54,194,250,125,69,202,110,42,183,82,250,229,224,184,179,234,154,248,68,125,216,62,21,50,245,75,14,177,179,106,193,227,14,218,16,46,179,166,54,218,245,16,11,23,67,203,170,152,191,168,44,6,221,197,167,97,53,154,82,41,252,129,7,161,81,29,67,243,99,153,66,203,107,53,163,183,164,195,59,14,229,144,193,48,40,168,142,161,182,83,55,153,232,23,185,137,221,86,13,137,108,208,196,169,175,78,244,244,177,148,214,17,100,123,195,86,59,23,206,222,214,66,161,28,145,152,202,217,4,133,188,165,213,165,242,137,113,83,219,108,232,85,26,166,43,126,134,214,122,29,31,76,23,201,93,219,88,144,91,143,36,202,16,109,46,65,30,106,68,212,185,122,184,208,171,234,77,29,196,108,46,122,175,84,25,49,181,149,65,187,153,174,11,14,173,50,196,248,152,116,44,213,20,44,89,167,186,135,182,76,52,214,133,65,111,175,190,
+13,186,115,240,173,161,90,180,157,179,135,130,172,51,175,119,227,245,183,135,120,195,53,74,140,14,120,194,172,11,245,197,194,42,236,99,37,19,86,205,61,122,65,152,213,22,219,189,145,16,91,22,207,27,2,91,59,88,108,48,146,118,107,37,40,18,22,108,243,43,133,122,254,57,242,43,92,58,243,71,223,172,41,160,181,93,22,90,253,36,144,53,243,183,107,6,3,211,245,159,86,10,140,89,112,44,249,182,188,99,96,107,228,177,182,45,138,81,214,167,210,232,26,91,10,139,254,132,217,46,76,40,3,231,32,215,211,155,150,213,131,222,232,38,28,230,132,56,33,59,189,193,197,178,221,170,64,180,172,219,52,130,249,164,209,149,238,98,166,233,12,93,97,11,191,96,41,156,156,246,30,135,216,74,87,214,132,7,44,141,115,25,155,39,232,26,151,112,158,159,192,14,133,122,81,106,89,51,227,130,78,92,150,221,162,171,247,253,206,204,62,214,237,209,154,233,129,179,212,225,135,219,28,59,209,92,165,138,22,99,33,37,61,88,196,233,183,182,182,184,30,122,120,40,181,103,
+217,217,167,119,252,144,89,153,248,89,227,170,155,116,180,30,132,237,130,189,60,186,174,155,94,12,117,39,45,200,155,20,140,189,18,189,192,60,36,26,155,150,107,243,204,122,97,209,150,171,222,171,22,189,51,46,24,199,25,130,138,55,233,148,56,121,147,224,34,95,184,52,46,107,186,190,169,105,225,155,177,65,119,47,222,111,11,230,174,168,139,142,30,218,59,210,59,171,108,238,188,109,23,70,13,129,61,59,89,21,27,73,103,126,188,178,122,147,57,76,246,137,220,9,29,214,241,36,40,212,164,7,16,141,153,91,64,13,205,172,212,239,6,189,66,244,19,126,165,21,86,79,15,169,85,239,46,229,236,207,118,89,161,66,255,77,194,114,104,171,245,251,133,75,251,216,113,45,92,93,103,89,88,104,160,106,91,126,20,58,152,79,92,229,32,165,99,14,246,10,87,143,188,84,245,184,170,153,241,244,73,172,181,96,172,62,188,40,74,77,56,102,15,216,196,207,57,144,205,30,252,29,21,203,218,156,237,99,175,192,12,168,116,108,125,139,94,223,241,103,92,203,96,161,157,89,
+228,76,133,5,255,226,166,179,248,28,184,134,208,104,176,91,112,14,53,14,252,252,44,35,5,117,109,170,167,229,13,227,69,219,187,152,80,104,46,115,241,51,156,207,14,177,137,177,58,143,97,171,8,11,163,206,243,129,118,240,186,191,144,229,171,188,21,76,47,242,103,59,156,49,124,134,14,159,43,57,237,96,226,240,93,47,208,129,188,42,156,45,201,157,105,54,139,41,173,141,125,139,227,238,125,160,57,150,93,140,136,216,163,98,113,250,7,211,249,214,243,5,55,3,0,191,253,238,139,95,125,251,219,191,219,14,43,252,234,155,159,38,17,126,243,229,191,249,250,239,126,55,213,111,51,253,239,79,255,224,225,127,246,103,95,252,241,31,127,241,203,95,252,242,23,191,27,111,184,253,203,118,78,36,126,245,23,127,255,31,127,245,205,175,190,254,241,215,95,126,241,231,95,125,251,253,15,184,156,223,252,197,239,175,253,254,7,252,117,155,57,140,127,244,143,127,249,191,255,251,87,127,241,247,191,250,155,191,252,238,139,95,255,248,155,223,252,221,159,253,193,234,247,63,252,250,
+151,127,250,167,155,137,157,127,254,231,95,252,242,31,253,15,95,126,253,245,183,255,228,139,223,126,253,151,63,252,213,183,223,253,230,63,194,151,214,23,182,183,125,249,205,175,191,254,15,60,252,213,55,95,252,197,95,252,187,162,127,249,127,252,223,108,238,223,209,221,79,147,48,255,102,61,138,243,87,223,126,243,87,95,253,245,143,223,225,154,218,204,176,252,253,116,211,223,126,247,229,255,250,213,183,63,126,255,245,223,253,52,33,243,47,191,217,78,137,220,204,215,252,239,255,100,51,223,116,123,243,31,140,200,252,195,105,162,95,109,231,62,254,250,203,127,253,227,95,255,245,151,223,253,211,47,254,8,55,218,122,156,231,122,128,232,215,95,254,176,158,241,249,87,223,126,189,158,11,185,25,92,185,157,250,185,153,202,136,239,252,15,69,253,110,150,229,47,254,254,139,47,254,189,31,127,218,47,14,103,59,250,244,135,175,190,249,17,23,248,223,252,91,227,28,183,83,48,255,236,191,248,226,95,126,251,155,47,113,221,224,10,255,234,155,13,150,127,189,30,162,186,126,215,255,242,
+55,95,254,143,255,226,191,219,184,202,127,254,103,95,252,171,245,8,215,205,136,208,111,215,186,249,55,235,33,172,255,150,204,255,114,125,207,151,223,224,254,245,221,247,63,124,241,227,247,107,97,255,32,102,51,96,114,173,178,45,166,191,250,233,250,183,155,97,161,63,172,101,127,143,43,0,95,251,254,139,175,191,250,219,205,100,215,31,190,250,213,31,127,143,59,205,90,25,63,126,245,245,175,241,139,255,4,71,250,229,175,126,252,225,203,95,254,2,23,184,117,74,124,171,155,65,170,95,125,243,183,235,113,154,95,252,246,47,127,248,155,239,127,247,170,245,160,92,92,237,191,249,241,235,31,190,90,27,31,223,230,175,190,252,254,139,63,90,79,244,252,234,155,245,248,216,95,125,185,150,244,197,191,250,246,187,191,253,254,183,248,197,95,254,226,47,254,231,159,6,109,254,79,223,253,245,95,126,243,213,255,246,229,119,155,59,254,229,151,63,252,248,91,252,234,127,187,198,242,197,122,18,235,183,191,254,126,243,106,220,84,155,65,155,235,29,253,52,219,243,87,63,126,247,29,110,
+190,45,240,159,110,254,157,253,215,135,228,123,252,52,226,186,250,163,31,190,253,237,239,198,126,254,180,244,213,151,255,116,61,232,246,159,255,243,47,254,197,218,79,126,249,143,254,241,239,230,112,126,241,123,127,253,15,129,253,246,119,96,255,244,255,106,108,231,159,252,179,255,234,63,249,207,254,235,63,249,79,129,93,203,238,250,191,94,237,158,172,126,26,219,217,114,144,207,197,222,202,187,148,39,186,162,116,243,130,5,194,12,18,118,23,123,79,15,192,177,227,216,247,18,255,120,124,32,17,168,130,203,20,176,119,127,118,79,35,40,5,58,157,103,215,67,27,205,86,203,87,134,214,226,85,218,26,39,182,73,251,41,112,219,217,73,19,40,249,166,195,216,92,8,198,243,22,116,107,254,36,189,187,115,241,135,99,154,84,97,3,23,254,29,224,234,157,121,117,211,73,2,94,120,156,120,44,37,26,37,209,181,30,116,97,31,75,89,56,89,42,137,108,160,78,231,162,62,123,217,23,97,137,181,27,88,92,171,173,142,43,43,198,59,23,169,205,131,23,137,183,115,29,232,28,229,
+227,228,176,186,22,112,45,242,46,3,63,167,103,56,164,194,88,206,1,113,205,243,123,30,195,11,32,126,7,224,105,149,64,130,155,23,101,77,176,184,119,47,32,97,242,68,46,214,120,114,192,54,142,15,206,88,54,137,142,165,246,106,90,148,231,233,129,71,179,16,245,89,159,109,175,198,44,10,145,234,6,3,189,208,199,242,51,158,208,58,75,125,8,23,243,148,72,48,181,245,204,113,231,73,103,177,154,98,5,23,57,60,127,35,41,86,24,250,72,70,181,108,122,154,112,185,111,70,241,50,33,240,210,114,57,138,128,85,139,145,99,231,153,152,43,125,252,82,231,62,60,154,207,206,8,182,222,103,139,38,53,50,91,11,181,45,30,167,46,114,201,213,71,205,235,104,229,29,179,206,220,124,195,65,144,122,173,195,59,37,101,194,153,229,157,250,208,226,75,116,239,215,230,97,158,136,228,167,143,171,27,74,224,208,56,244,237,250,125,71,26,152,21,211,197,196,115,84,210,116,212,174,246,62,59,254,197,181,126,194,75,221,94,179,86,183,214,210,167,115,56,67,4,13,154,36,
+241,216,177,100,206,62,51,194,94,103,218,238,153,28,228,147,231,204,48,64,227,15,177,193,197,37,145,238,66,106,87,23,39,251,50,39,107,240,238,48,209,26,59,83,192,205,123,29,24,137,118,2,66,202,78,37,228,165,239,244,172,105,233,17,10,69,53,134,246,76,89,20,91,142,38,109,75,187,96,139,66,133,195,188,62,60,152,64,5,95,158,58,14,168,109,213,23,248,1,139,22,196,37,247,216,124,90,53,220,248,204,31,14,212,58,81,68,209,182,58,7,230,166,146,79,136,200,156,88,164,66,199,123,160,91,207,92,55,207,78,141,175,101,45,151,167,140,249,31,70,19,220,27,1,67,143,108,162,122,237,232,235,64,144,234,8,39,86,85,96,47,122,179,74,181,169,247,102,237,173,180,167,245,229,202,19,138,185,244,124,223,17,144,109,209,253,92,180,37,33,212,24,59,135,178,35,71,85,40,242,98,117,78,169,86,69,71,159,77,254,117,157,165,161,68,155,67,21,195,120,235,234,242,243,185,216,189,41,235,0,69,162,249,149,59,144,222,153,227,74,61,101,179,15,40,6,
+221,195,163,84,103,172,71,117,231,181,202,33,91,45,177,191,81,63,177,150,187,120,22,14,28,171,222,47,101,46,163,96,26,101,69,188,169,85,69,142,28,173,164,85,209,153,120,199,174,59,31,114,203,124,137,27,88,163,86,42,106,213,5,27,201,142,125,209,87,186,218,214,175,208,198,86,211,129,235,217,122,162,127,85,116,208,206,59,61,68,204,159,26,86,152,169,47,209,235,209,198,208,202,118,221,32,116,244,85,90,87,59,20,160,100,46,101,43,17,172,58,230,175,110,72,190,64,102,6,32,79,197,185,126,255,147,161,27,169,129,75,72,236,218,11,180,168,30,214,177,189,69,152,216,172,94,180,195,50,82,209,149,21,181,209,154,185,252,180,231,225,21,146,7,139,21,121,209,89,250,244,29,100,112,150,212,56,67,182,247,79,5,138,62,198,203,97,115,191,23,183,173,170,14,116,28,16,206,158,84,182,206,115,179,85,178,215,98,176,160,203,18,229,125,139,211,194,177,96,37,188,137,6,112,170,55,17,9,212,117,17,135,238,231,51,143,50,13,211,132,76,214,112,218,115,189,
+132,126,14,0,136,187,69,244,7,0,43,123,212,17,228,220,28,51,232,80,93,81,23,197,119,98,126,165,162,97,216,157,9,155,22,114,198,65,160,35,88,184,53,198,142,107,194,207,184,86,138,135,100,199,49,107,152,102,121,237,52,12,237,78,236,89,253,180,172,152,155,96,87,125,192,103,53,179,196,110,63,63,210,152,251,147,183,151,76,97,254,232,138,155,187,28,94,134,118,140,102,96,1,58,145,130,10,138,213,15,75,161,6,203,40,102,251,74,150,62,165,111,176,228,4,225,198,190,172,218,82,241,128,209,89,116,113,74,191,100,214,95,93,217,157,196,253,107,248,44,65,125,100,81,19,173,66,195,164,198,198,50,180,214,205,247,2,14,44,149,89,28,8,151,80,209,149,159,12,198,29,231,170,97,49,117,216,75,69,131,46,200,100,230,163,20,13,149,148,71,187,147,28,52,187,138,151,121,166,124,98,161,47,90,38,185,209,133,77,172,158,214,101,24,42,235,122,89,167,98,144,121,178,144,35,97,108,165,6,219,146,254,120,199,230,161,157,136,159,209,97,109,151,244,118,158,
+9,36,130,142,235,215,247,97,116,23,130,85,132,113,81,178,30,128,184,4,212,57,118,223,64,118,164,188,77,57,242,150,187,72,73,207,198,170,140,43,223,157,184,48,85,177,131,226,102,239,100,205,163,52,175,195,93,214,161,85,178,96,5,177,56,131,199,237,184,134,197,3,178,201,223,54,191,37,36,243,220,152,140,27,181,241,172,144,8,102,222,167,42,169,106,112,205,197,245,176,179,168,218,75,64,241,125,240,224,4,127,89,100,175,9,47,26,133,97,186,187,219,121,228,160,159,166,179,240,226,41,223,194,138,137,254,32,9,175,76,5,103,239,33,243,228,48,57,12,147,150,158,156,44,44,146,115,120,21,14,250,59,139,165,12,162,9,94,39,211,126,85,183,28,49,194,216,48,109,147,189,194,45,153,83,59,173,87,109,11,106,20,174,138,88,5,8,25,82,83,160,36,37,202,174,10,249,7,225,146,216,113,232,209,1,205,0,237,37,146,53,143,233,216,23,129,92,216,220,63,105,59,59,119,163,185,203,7,78,189,237,187,9,189,94,192,43,157,174,180,127,227,182,157,158,9,
+165,114,164,66,97,9,173,139,142,141,234,192,88,42,19,86,245,36,228,99,129,189,181,204,67,154,23,212,222,250,84,8,56,76,143,208,209,172,210,10,227,236,160,224,192,143,137,110,186,107,136,66,226,210,126,211,102,154,155,63,170,59,139,184,226,224,6,92,69,70,34,172,122,43,115,97,195,64,33,253,114,16,94,240,85,34,41,72,105,182,82,19,139,36,110,148,86,93,221,103,239,138,55,159,232,68,18,159,189,101,180,53,140,99,103,205,149,112,70,164,107,133,145,116,89,184,85,156,179,218,43,198,152,34,66,195,216,168,177,122,75,169,125,42,229,96,50,31,44,52,25,151,20,45,235,39,142,22,131,20,182,204,125,28,175,250,99,53,79,105,156,197,56,20,94,100,159,97,193,66,85,125,126,17,140,23,9,72,129,128,117,86,91,89,199,205,242,144,128,169,21,172,216,245,153,38,244,214,251,3,177,227,236,49,178,5,142,73,229,104,203,239,117,245,67,168,169,226,223,63,172,132,21,134,88,32,58,0,9,184,155,156,103,64,48,103,86,212,119,143,10,182,118,151,215,97,
+143,86,171,84,99,209,49,47,175,71,250,145,34,140,116,70,6,178,112,56,188,191,144,93,56,166,62,175,90,55,67,92,185,33,238,5,179,124,209,11,142,149,99,91,11,196,195,207,169,181,220,50,220,220,128,227,242,61,175,227,123,62,232,232,103,73,151,171,111,160,229,165,15,57,85,47,151,107,59,49,184,227,170,85,180,139,113,162,53,109,187,232,86,141,141,205,144,97,222,240,170,213,121,34,26,179,12,24,47,159,11,171,207,129,110,249,68,116,242,151,199,147,69,209,135,213,5,10,108,97,192,67,51,66,115,88,181,252,227,64,35,148,196,154,206,110,155,78,43,200,200,229,132,175,118,70,72,95,191,171,78,122,76,49,185,255,146,181,142,185,190,64,120,217,154,12,206,184,245,217,252,20,228,63,212,175,48,46,0,88,1,119,236,212,168,202,77,94,89,247,198,254,109,42,235,192,186,106,133,135,53,158,57,23,163,21,79,131,33,246,90,159,98,114,230,239,7,196,188,36,92,235,56,250,135,13,214,106,104,155,63,133,205,13,70,120,128,34,251,97,52,94,253,180,87,82,
+112,233,1,169,115,176,145,184,126,168,71,36,251,154,22,190,117,105,139,38,164,207,115,142,140,77,85,79,225,133,245,28,47,214,15,176,48,118,63,204,136,194,179,66,191,173,187,133,232,161,197,91,133,19,70,35,177,169,164,166,17,44,30,25,133,101,17,198,150,152,110,233,116,96,195,79,177,16,221,45,244,210,154,21,178,192,132,21,243,0,115,13,169,30,33,186,124,46,230,87,241,0,214,48,152,88,24,186,210,145,196,220,139,165,205,168,17,100,6,254,135,54,54,98,116,100,15,225,129,163,169,175,242,39,81,107,233,141,140,13,62,69,241,208,60,96,129,41,216,238,220,72,166,46,237,156,43,243,211,5,215,229,25,30,226,213,233,32,103,201,32,233,247,21,214,227,233,154,89,245,4,234,204,19,193,89,103,214,40,221,37,59,156,0,23,169,139,227,42,1,138,10,157,157,178,89,200,131,209,140,0,97,58,99,33,5,77,130,9,232,103,179,64,88,188,170,238,86,192,122,227,90,197,118,41,175,160,206,45,32,7,46,181,44,1,175,146,74,40,204,40,60,152,235,240,56,
+210,29,40,136,51,215,16,198,248,154,124,125,233,45,139,120,239,206,112,121,153,136,27,243,171,201,144,18,8,23,204,165,215,67,30,126,40,123,61,172,72,115,126,24,52,46,253,210,224,90,37,69,30,19,104,116,241,248,144,213,221,126,181,229,30,101,88,53,127,14,230,44,99,67,248,19,233,136,251,253,190,211,214,113,181,158,119,39,222,194,36,82,12,97,216,34,95,93,86,30,77,217,15,44,80,112,117,39,43,35,77,66,182,213,134,52,246,132,72,243,251,101,246,85,99,16,101,76,46,166,181,161,107,254,152,22,178,234,69,215,112,241,201,47,220,12,136,147,230,20,97,45,232,183,184,166,205,105,165,191,210,161,187,46,212,177,70,120,127,66,37,11,211,115,97,153,31,77,84,115,203,160,61,46,157,220,91,156,97,25,93,214,76,250,167,61,150,151,49,102,66,78,5,71,131,126,244,36,85,236,201,58,104,212,83,242,120,123,86,126,135,26,186,235,186,232,73,56,30,141,59,148,189,78,104,97,246,116,102,5,153,62,121,2,103,232,163,50,1,16,3,111,239,150,110,71,
+29,161,103,2,212,149,87,83,50,15,138,44,117,19,131,63,24,171,137,179,222,45,147,137,115,83,206,56,43,24,201,69,124,27,23,194,188,171,105,8,166,236,249,246,224,195,171,42,12,59,102,141,107,216,19,206,44,51,161,240,6,73,123,59,34,61,237,56,209,58,108,22,132,16,40,1,199,179,169,205,131,50,229,136,137,112,8,230,22,124,71,58,181,74,241,51,50,151,107,186,146,57,75,52,97,101,230,95,132,151,113,19,174,172,209,41,35,55,154,9,176,105,169,152,103,185,192,103,181,207,62,182,205,111,116,218,30,179,212,153,98,25,203,144,84,197,132,38,113,87,211,102,143,242,54,231,156,37,147,178,158,164,147,228,76,232,24,152,82,29,214,152,21,138,139,131,186,67,11,102,137,152,160,29,163,46,201,201,236,164,30,172,225,129,249,42,223,211,219,92,131,183,254,180,47,158,210,111,43,96,4,113,49,1,160,92,92,248,23,0,18,82,107,167,43,155,101,88,24,249,53,194,154,163,39,225,117,180,171,167,235,218,138,167,118,20,150,94,137,237,96,156,94,161,150,110,
+119,210,153,242,179,61,228,237,204,123,59,214,160,195,206,142,215,137,21,159,104,115,253,42,128,121,159,225,188,129,148,205,79,83,207,73,84,109,183,197,32,225,210,36,34,193,129,60,158,142,51,243,57,130,95,31,174,186,9,189,88,198,159,29,142,233,154,156,181,231,201,29,246,233,106,171,136,31,82,240,24,103,222,192,105,209,17,158,142,137,143,194,213,82,196,153,238,23,230,153,150,65,123,51,35,73,136,173,225,97,7,129,30,194,147,2,154,43,157,57,100,23,152,152,47,59,178,98,204,209,85,236,48,254,62,178,150,149,122,147,250,192,232,105,37,187,46,116,80,98,163,225,69,158,72,23,238,198,147,143,25,184,21,60,120,171,29,230,119,1,192,162,122,60,53,150,34,152,162,116,47,211,20,244,216,77,81,165,201,44,51,138,185,177,128,250,212,178,92,161,251,129,142,194,66,59,247,125,114,20,81,5,4,70,189,249,51,234,24,132,7,206,193,190,107,158,22,106,86,87,183,160,228,98,101,31,166,96,193,116,196,31,195,153,90,147,33,96,190,93,12,207,97,91,219,67,
+38,210,176,6,45,180,52,101,118,207,50,104,229,42,123,243,230,234,122,105,210,152,110,172,248,72,60,143,176,134,107,176,255,105,237,124,96,31,66,193,178,83,157,163,39,199,205,35,191,66,104,108,163,99,44,148,88,212,75,169,252,248,29,195,208,203,139,210,28,91,64,132,97,31,91,86,62,41,130,117,84,185,177,40,23,88,37,89,58,155,76,177,15,123,88,92,201,205,38,14,101,245,230,236,60,253,104,171,238,248,210,171,2,234,90,9,105,203,108,103,1,151,253,245,36,135,157,73,61,240,146,86,37,42,179,215,91,66,86,231,50,160,190,110,192,16,100,198,179,14,80,126,175,143,246,19,175,212,99,107,23,161,10,39,245,168,66,216,202,45,30,200,166,124,223,219,79,248,141,184,115,103,48,38,107,84,24,142,29,111,148,48,226,172,84,149,147,86,107,71,184,30,8,73,195,138,77,172,23,79,11,45,61,113,189,218,197,26,165,114,44,25,210,47,27,57,216,166,117,185,234,171,108,207,80,44,152,176,176,55,231,82,112,10,55,226,22,94,168,248,62,188,216,112,120,85,
+95,96,216,210,102,90,62,125,126,92,123,241,184,184,52,27,27,166,194,32,112,245,32,34,118,66,249,177,73,208,182,174,238,177,254,125,186,130,89,20,245,206,28,125,11,160,88,233,241,195,53,92,22,195,80,193,89,158,134,169,178,7,172,162,199,38,133,190,133,112,177,52,209,177,198,226,246,172,148,165,18,209,46,161,4,242,39,203,233,73,211,229,192,12,61,135,140,63,58,69,74,2,223,149,95,37,212,90,64,217,172,128,233,77,245,228,57,35,81,150,30,44,63,200,52,164,218,206,168,61,61,77,58,38,131,33,170,215,83,138,41,101,10,80,117,136,231,170,199,179,220,228,210,173,56,21,134,198,111,231,150,28,84,181,214,30,77,133,233,231,202,166,94,89,240,196,220,244,55,91,54,108,85,93,138,194,54,52,27,108,56,11,134,153,116,181,50,177,237,147,110,142,147,73,45,132,183,43,152,126,214,239,116,86,46,83,219,209,100,123,141,249,233,115,199,62,89,236,133,237,101,243,237,12,148,136,193,113,182,165,136,82,186,94,254,165,119,37,34,211,40,33,106,6,141,66,
+143,113,170,235,93,72,40,22,230,187,61,253,44,17,164,241,167,33,162,147,62,206,47,35,249,201,165,195,126,205,49,47,6,101,81,62,202,90,189,63,214,244,158,93,175,240,179,109,156,101,30,100,246,82,71,25,154,223,19,61,229,112,97,26,233,165,242,171,236,19,133,22,176,136,119,69,11,169,69,97,21,89,248,139,217,77,105,250,88,165,214,164,214,30,198,42,185,163,244,182,189,15,107,176,1,95,169,212,248,236,85,48,83,88,60,42,208,27,236,134,243,50,56,149,217,209,2,95,118,112,177,123,49,204,32,114,245,228,208,229,152,69,146,47,16,252,172,74,70,214,238,53,178,14,165,12,165,2,76,106,1,224,213,127,221,16,178,119,62,109,55,174,156,195,90,151,91,134,75,161,57,223,127,167,119,172,31,5,254,188,33,76,217,42,88,167,131,172,28,141,80,158,110,174,204,120,41,123,181,54,24,85,199,133,197,176,115,167,16,218,71,79,69,142,73,61,123,73,238,187,236,198,169,207,245,217,114,13,222,27,46,44,43,20,72,156,85,113,157,149,51,189,181,95,3,56,
+203,47,172,40,9,156,166,94,128,21,4,17,75,225,214,35,131,39,208,78,145,189,116,30,93,6,123,236,73,211,118,54,169,162,51,141,235,122,57,89,209,28,13,86,200,43,29,86,92,220,209,69,10,173,141,41,143,11,53,152,38,190,140,42,192,122,2,77,229,229,61,128,190,20,67,213,229,243,157,121,32,156,124,94,203,208,193,64,135,205,166,238,112,66,56,27,233,105,23,175,200,164,4,47,218,115,248,61,204,119,116,61,157,190,78,54,81,207,150,158,167,12,45,61,77,251,120,213,28,218,237,92,56,188,130,250,34,155,66,203,67,95,87,230,41,194,116,35,147,37,231,54,1,126,18,234,214,26,34,216,246,78,160,228,66,97,158,80,7,223,4,91,13,139,121,150,58,16,160,159,178,84,153,136,126,76,94,31,240,131,65,30,203,91,245,154,80,117,111,127,120,211,19,35,55,31,43,26,126,98,223,163,203,102,171,216,38,58,135,174,190,44,63,206,210,59,82,91,245,22,143,92,181,151,130,19,243,225,127,90,67,60,31,249,76,66,23,246,168,177,15,13,54,56,100,27,
+53,170,142,49,187,161,65,19,169,194,20,235,167,198,216,115,74,200,154,60,107,28,141,211,66,104,230,17,96,61,207,48,126,83,117,161,184,102,203,121,151,4,47,120,4,18,176,30,109,76,194,240,45,189,213,144,229,167,43,93,238,181,45,48,233,203,195,25,114,55,153,75,59,5,193,52,27,150,240,73,12,95,151,33,44,102,171,111,84,60,158,180,158,154,137,195,213,192,235,92,132,115,169,14,54,96,217,71,124,26,86,33,62,233,81,70,51,190,64,151,244,234,2,125,148,9,122,197,15,253,11,221,181,170,248,48,189,174,227,117,45,142,133,24,170,23,46,174,194,171,81,211,39,116,20,31,195,33,231,104,26,118,148,195,81,161,253,230,44,140,45,211,99,215,106,22,20,90,237,166,7,152,42,6,165,28,76,128,229,28,34,15,63,216,152,208,246,131,58,204,242,248,54,53,161,110,230,163,90,223,60,221,253,60,184,26,9,149,184,198,104,4,142,245,241,109,88,30,221,29,166,150,157,32,182,255,238,28,88,31,39,198,155,3,154,84,48,190,87,88,92,250,145,154,43,173,
+247,89,26,111,74,73,19,46,76,106,187,241,109,218,176,116,248,250,152,241,156,136,141,179,114,186,178,91,42,213,47,129,113,108,81,62,127,6,160,200,34,76,203,93,82,213,40,250,185,168,22,44,245,193,82,70,213,165,176,193,176,60,241,124,138,119,137,109,33,68,211,251,92,253,203,114,172,19,241,178,86,141,97,138,202,14,134,67,241,72,162,101,46,53,188,215,43,211,211,33,238,149,225,64,219,69,110,219,79,163,251,19,191,106,156,205,50,30,89,23,98,14,39,39,241,122,179,33,52,213,214,138,87,102,179,29,0,12,123,44,193,51,225,83,116,104,206,177,11,183,43,97,134,146,55,219,30,208,195,170,146,82,40,59,187,59,74,31,42,80,65,214,15,203,132,42,156,173,110,132,41,1,137,147,135,225,208,170,255,12,187,199,77,21,195,168,208,209,238,73,6,167,238,202,61,182,157,186,46,1,227,173,147,120,169,122,233,177,36,207,66,165,68,3,172,94,232,172,137,115,208,138,154,84,249,65,140,240,240,225,106,98,123,76,182,153,74,116,103,214,125,25,247,195,213,97,
+126,220,25,142,17,238,16,145,93,211,177,66,37,14,145,148,181,179,14,192,135,241,172,250,74,18,102,65,230,132,187,127,182,99,246,77,134,230,106,228,25,194,253,97,255,67,250,0,150,33,194,153,178,207,182,249,15,150,112,40,180,167,123,132,215,13,173,231,61,33,172,88,73,238,2,71,56,125,245,210,102,144,246,5,76,46,102,40,94,199,206,210,59,43,77,103,81,234,102,142,65,227,141,153,244,4,207,27,57,191,240,177,127,131,56,100,209,249,233,253,243,149,210,171,119,178,240,237,61,183,130,158,56,252,82,115,248,166,48,167,127,5,34,30,245,60,69,44,199,161,186,45,52,19,237,157,204,170,168,101,236,104,210,119,37,24,0,222,20,72,46,64,114,85,31,20,253,240,188,158,163,148,206,211,36,240,18,23,151,75,83,87,2,205,162,212,239,185,248,149,21,9,84,153,65,112,222,26,83,65,113,75,184,135,88,64,15,233,106,180,44,111,4,5,216,50,75,119,66,21,244,213,241,43,144,147,187,70,248,135,150,55,129,255,182,106,211,162,106,49,56,50,205,169,210,79,
+7,92,151,87,57,160,209,45,52,91,147,153,200,152,86,15,140,232,162,8,170,172,36,42,137,114,227,10,17,64,196,7,165,228,228,30,225,121,31,156,41,98,107,146,128,249,206,68,8,92,30,7,135,240,160,137,6,167,29,63,200,122,147,89,99,80,197,94,101,166,112,15,45,207,114,10,73,58,3,156,47,64,104,79,135,178,108,92,240,201,152,80,215,105,3,182,74,90,79,218,174,117,19,222,172,16,82,154,46,44,74,201,171,226,36,113,15,30,22,11,153,84,152,106,184,79,35,112,240,211,218,148,166,208,152,245,113,144,87,138,137,237,129,248,88,226,61,12,60,33,41,56,161,121,29,153,244,18,46,220,186,136,75,36,246,182,126,239,221,0,82,184,198,84,34,70,11,41,208,137,130,155,81,4,34,110,55,60,120,78,37,247,41,202,251,137,142,57,199,74,247,164,27,109,122,145,31,114,39,98,70,40,169,242,215,43,129,112,52,205,80,178,230,41,238,133,217,228,92,228,206,135,39,42,102,63,41,169,39,159,116,201,236,109,195,234,189,174,162,20,23,89,1,150,163,238,
+67,248,229,93,144,254,168,115,199,201,238,204,164,49,9,22,45,22,25,60,189,79,114,217,202,149,70,70,93,238,246,242,14,131,69,52,72,162,214,250,188,73,191,46,103,23,111,156,81,185,151,148,183,168,181,194,83,53,103,195,105,101,241,141,84,241,120,217,23,12,220,11,12,103,3,119,21,44,43,159,30,186,8,108,124,159,55,156,230,68,112,206,231,176,22,186,126,251,0,45,231,157,217,166,232,98,5,86,208,113,49,86,109,128,51,37,249,36,86,113,190,78,28,168,124,113,141,169,180,160,195,16,206,50,151,99,159,14,93,188,61,53,208,216,5,35,168,0,144,167,66,128,226,163,158,102,245,97,141,176,64,28,201,145,15,38,160,188,137,235,42,187,105,23,249,166,82,207,172,96,161,95,206,227,138,30,23,243,229,216,64,134,29,43,75,218,203,210,95,4,145,96,244,147,76,13,250,213,229,211,251,28,114,209,112,166,132,13,44,20,119,184,70,55,34,202,13,242,238,152,168,225,207,56,157,183,40,121,229,39,211,116,162,85,177,4,180,251,9,21,219,204,113,245,227,160,
+241,117,116,167,122,173,39,223,5,179,253,242,123,78,245,42,187,89,142,103,229,74,7,125,9,246,137,175,22,145,86,97,59,74,233,43,55,212,203,250,94,226,68,149,92,105,92,1,72,92,71,100,116,72,207,157,156,43,135,106,200,194,238,118,90,234,27,113,103,234,85,212,184,32,231,224,5,112,202,193,113,83,219,170,63,48,193,242,202,64,89,97,111,2,9,245,80,173,28,143,203,21,97,192,4,235,198,103,40,88,201,181,173,203,20,225,36,70,67,216,139,124,246,60,18,128,236,146,65,28,154,184,180,52,80,178,128,37,215,81,200,46,83,6,19,15,16,34,76,28,81,197,29,176,204,127,44,192,7,141,16,61,170,247,43,219,100,21,69,85,171,81,225,22,185,149,44,141,101,246,14,40,13,37,17,54,84,218,33,59,58,87,123,231,221,151,25,172,159,168,169,222,156,178,138,218,250,96,29,73,170,115,113,88,151,29,175,168,57,221,72,246,193,79,139,91,189,137,156,236,35,216,82,135,129,182,25,22,5,56,103,54,114,71,184,242,45,43,237,87,64,101,0,131,121,211,
+125,246,89,197,153,56,39,121,150,121,210,162,20,100,166,60,120,8,150,235,251,113,102,162,117,234,81,112,107,130,254,153,198,87,141,126,140,145,151,220,19,51,26,44,22,171,89,70,243,122,79,120,242,116,100,233,180,156,51,148,184,63,246,161,190,94,134,108,140,65,171,92,248,243,156,86,142,65,45,7,91,208,93,157,222,36,24,146,58,153,100,219,191,239,61,127,108,34,64,153,30,144,186,53,108,23,31,172,209,53,205,71,5,89,85,91,153,76,170,20,17,66,82,4,224,146,149,15,104,59,193,157,85,159,119,65,26,128,92,171,82,236,80,9,216,72,255,44,1,147,133,70,5,146,195,179,27,190,123,95,171,105,11,143,125,100,214,82,2,50,125,7,198,90,141,92,124,55,215,135,86,234,41,36,26,248,121,48,37,1,0,151,148,243,24,180,251,42,169,139,221,17,40,187,166,235,184,151,231,94,226,57,143,160,114,108,143,202,162,82,216,95,220,65,242,126,34,30,130,73,192,107,123,9,183,158,224,195,4,244,121,93,143,211,202,54,250,163,241,246,225,16,6,143,193,3,
+0,16,105,179,231,73,104,84,202,67,68,240,41,78,75,67,135,81,200,191,11,18,240,120,171,52,149,19,170,155,113,20,106,73,192,228,219,123,100,29,185,203,94,105,215,82,79,203,20,225,27,250,99,136,26,81,1,206,155,147,4,5,0,174,223,44,55,203,125,249,220,171,227,46,42,252,36,249,81,255,68,61,127,134,193,163,228,98,80,197,243,109,217,45,14,205,10,16,131,197,96,132,66,215,62,90,85,222,28,190,144,27,189,40,131,233,77,200,234,204,247,131,248,61,233,106,47,177,207,122,183,16,3,190,112,155,39,52,49,153,167,218,224,77,18,174,163,166,189,189,61,74,198,126,37,126,229,156,241,67,249,221,17,65,0,199,153,164,43,232,42,195,80,32,4,203,169,14,38,189,243,100,123,123,228,65,246,93,188,107,161,118,196,18,152,98,16,15,34,52,8,9,11,247,72,192,93,198,14,236,61,192,80,117,36,34,46,221,48,243,67,42,231,186,111,95,43,83,194,37,27,4,71,201,125,155,243,60,5,89,221,86,222,217,76,193,205,134,2,186,147,98,110,4,112,223,
+125,47,120,228,125,173,148,229,79,51,198,249,52,200,70,20,26,255,98,255,147,73,2,193,150,114,178,178,202,165,117,174,192,215,64,143,12,177,174,58,214,175,93,214,129,167,207,43,208,33,81,212,92,70,139,83,188,7,60,127,224,121,229,40,71,9,201,138,76,235,56,209,18,175,20,250,118,90,97,20,48,5,70,203,232,9,81,58,64,96,239,218,7,80,35,35,98,211,192,175,208,40,100,82,166,0,103,177,131,203,58,89,223,103,18,184,59,96,61,197,115,236,130,124,159,1,238,247,65,163,115,95,13,245,73,17,142,201,61,18,200,20,92,219,2,74,17,86,146,208,32,17,52,226,81,180,8,159,53,248,135,0,247,230,178,94,167,237,221,39,15,211,233,85,141,157,236,38,198,88,185,54,120,104,195,253,84,34,255,116,106,241,103,47,128,151,229,35,12,161,158,187,115,40,52,76,68,25,55,8,118,12,194,23,7,114,174,229,166,132,64,202,93,178,221,157,43,229,42,170,204,10,26,157,113,24,171,42,171,57,8,128,218,100,218,168,40,186,164,73,14,160,117,51,147,112,
+227,53,118,237,129,175,69,28,26,240,14,185,94,252,11,14,51,245,152,166,29,193,7,137,248,60,89,139,66,150,27,14,210,157,203,90,206,139,160,252,131,233,137,10,47,197,106,174,164,158,118,177,140,45,247,237,7,213,98,113,229,3,47,133,155,234,130,189,7,152,64,144,98,92,165,98,103,172,27,177,111,246,48,183,130,108,80,117,32,63,148,10,8,220,96,131,213,9,93,83,30,15,12,201,90,172,204,143,84,111,251,108,184,193,6,211,183,56,211,220,77,236,227,65,247,37,195,81,128,193,249,5,35,0,235,240,122,245,197,18,204,182,208,231,36,240,244,28,131,18,175,7,165,196,189,63,17,116,36,211,65,85,189,55,20,93,93,88,252,252,46,41,253,148,20,87,186,139,179,38,197,89,223,167,249,245,52,101,29,128,222,48,120,48,242,49,101,56,133,41,27,114,78,236,218,66,92,177,42,21,124,223,147,61,59,144,150,131,70,184,64,31,92,89,97,242,42,129,243,245,130,28,225,24,198,113,248,192,111,123,124,185,245,17,234,87,26,144,66,167,180,239,27,135,86,24,
+74,134,221,74,31,216,212,242,181,172,170,243,5,9,75,236,157,231,172,207,219,37,238,111,36,229,114,133,209,213,217,0,38,232,66,201,184,236,150,216,184,110,10,94,204,15,254,213,203,81,229,66,21,55,158,95,217,85,192,37,187,121,58,104,191,192,250,36,80,2,132,210,68,75,91,127,125,144,164,0,80,166,32,149,115,132,186,168,166,127,131,85,201,199,219,148,225,177,69,2,15,34,199,198,230,140,174,63,109,177,175,128,210,148,235,86,39,224,169,13,79,31,87,90,176,160,82,42,159,27,231,98,131,66,242,28,10,27,180,38,187,194,96,199,207,146,65,7,68,206,94,43,4,246,37,59,6,247,67,49,212,13,27,212,161,220,192,155,60,206,135,207,164,215,164,24,140,243,167,251,103,100,112,134,83,132,79,253,199,145,76,90,178,194,224,1,210,194,134,120,128,176,43,21,251,180,212,83,162,135,159,190,125,231,60,113,21,139,174,227,198,155,227,178,222,58,94,214,7,79,176,119,205,243,238,143,233,175,240,39,208,122,46,63,62,194,253,220,222,206,221,186,221,189,39,5,
+162,96,109,46,213,220,144,118,122,70,68,132,135,156,62,0,60,93,30,131,55,169,135,88,92,106,122,37,251,32,47,227,68,123,42,39,113,113,246,121,125,18,161,193,30,147,27,22,16,22,117,235,190,58,253,38,37,48,94,247,53,125,103,12,56,146,189,172,159,247,175,159,23,192,228,126,14,52,58,24,101,201,228,193,150,245,31,128,146,235,83,249,70,66,62,194,0,91,185,137,236,174,170,119,235,113,7,131,102,159,35,179,136,161,108,241,193,134,198,98,26,238,104,66,210,117,228,115,224,98,148,32,223,234,207,192,201,243,199,56,205,9,80,164,1,217,71,50,4,65,145,38,99,36,15,115,109,152,193,241,123,92,121,33,156,160,195,96,12,34,170,34,213,44,132,71,200,53,29,254,116,66,185,27,4,63,97,60,2,97,189,95,229,14,65,154,8,14,74,80,80,194,55,156,17,215,9,230,196,234,46,239,225,129,25,4,180,164,151,12,252,225,43,30,69,70,37,8,123,85,184,139,153,160,85,55,64,252,47,135,9,212,184,155,141,127,172,227,46,233,237,142,36,170,43,20,
+76,5,159,255,72,23,68,88,233,26,135,153,124,199,243,15,213,189,86,180,149,73,208,130,82,168,239,106,9,76,204,232,194,71,169,240,55,175,126,195,223,157,8,82,22,132,165,225,76,185,3,239,94,226,100,125,111,71,193,37,213,158,215,175,7,32,45,105,109,49,247,251,134,149,19,220,4,208,67,252,124,184,222,242,247,167,203,255,71,59,233,85,52,240,114,64,253,221,243,0,180,137,90,125,210,89,100,161,234,234,173,190,131,218,142,66,139,191,55,178,126,111,61,10,145,241,124,22,143,167,243,123,31,141,242,239,229,105,100,18,141,183,113,31,6,130,83,251,222,103,219,11,121,61,151,182,76,201,206,59,79,238,154,149,164,245,254,155,111,167,39,222,6,86,4,22,4,56,19,61,11,126,58,118,12,92,181,208,223,197,79,137,130,141,84,88,108,123,121,109,234,62,110,149,75,90,170,113,142,215,20,151,96,4,162,224,74,245,195,65,149,161,103,72,159,226,26,137,172,173,209,159,230,60,153,206,252,18,140,67,78,51,0,50,38,28,201,41,85,155,8,102,180,31,68,222,
+217,85,29,223,10,70,56,245,54,40,35,117,155,118,125,2,206,4,74,150,212,178,151,252,16,85,4,105,240,192,200,57,53,94,194,113,190,210,3,3,114,0,224,186,95,225,249,91,78,248,136,194,100,202,82,225,134,233,240,82,115,4,80,90,172,195,79,137,163,210,175,225,103,219,77,216,234,103,38,179,231,155,252,68,237,5,187,102,144,175,65,163,142,160,187,174,178,131,115,247,78,89,86,69,216,89,152,131,8,222,229,220,52,241,100,237,71,114,254,140,110,111,119,46,206,135,77,167,207,123,116,13,74,71,234,17,94,134,123,30,82,64,240,52,155,196,69,214,180,164,79,176,130,112,221,214,36,206,22,160,54,121,16,127,214,226,26,235,226,166,95,107,172,112,87,225,30,213,107,117,210,107,20,129,159,113,195,110,210,251,147,155,15,214,99,201,210,109,46,171,58,151,35,186,199,75,237,122,211,100,192,126,156,239,140,82,203,147,225,41,160,14,172,29,196,138,251,231,115,113,52,62,195,96,98,244,169,188,47,235,115,119,216,85,5,4,236,108,234,190,189,184,103,195,83,207,
+189,86,13,50,125,157,35,156,18,179,113,59,138,238,31,149,242,155,147,103,217,152,195,123,80,86,56,73,96,155,160,216,179,239,36,80,114,118,114,221,224,73,81,125,131,254,216,216,184,161,182,73,18,123,27,217,145,2,137,66,211,3,48,77,188,129,112,58,143,8,95,47,69,91,192,204,75,63,94,98,86,66,13,65,15,79,136,180,206,199,75,227,83,85,187,189,114,87,17,168,5,93,144,155,218,42,244,120,10,223,236,114,171,23,235,95,152,15,176,123,130,181,163,68,130,27,71,41,68,249,143,60,227,190,42,164,252,132,201,178,92,168,42,58,160,166,85,61,48,38,131,184,133,131,171,189,147,238,189,46,246,138,159,101,30,172,75,4,101,167,77,158,20,172,237,39,103,136,144,247,134,156,128,9,10,105,61,226,219,103,129,105,228,28,40,157,61,249,216,240,224,133,10,206,80,81,110,19,95,62,230,209,105,22,82,210,97,75,194,103,208,116,59,192,41,63,109,142,191,35,103,151,107,231,197,57,211,112,77,154,116,200,203,218,63,238,149,3,127,118,185,12,95,100,111,179,
+15,120,242,199,69,7,118,41,210,186,204,2,183,34,229,242,147,19,115,112,39,67,192,191,142,215,151,204,92,109,0,218,119,78,206,215,0,60,74,185,70,97,150,241,248,253,170,130,6,214,114,124,27,185,170,226,168,222,197,47,210,71,201,100,29,177,221,247,207,3,221,75,39,25,127,151,213,235,134,244,254,203,25,253,90,134,192,138,135,89,240,228,204,216,28,60,236,157,188,249,198,102,34,58,144,138,193,211,3,241,75,31,14,216,174,112,94,117,185,229,85,129,236,251,69,222,146,95,88,133,133,40,84,126,182,159,39,84,175,179,51,0,58,189,55,210,128,187,8,44,84,153,242,240,231,208,26,169,188,207,96,209,174,193,112,117,7,3,71,119,198,199,205,213,150,30,74,193,181,151,107,6,139,29,135,130,225,18,180,175,187,13,37,27,21,85,253,86,215,103,246,149,54,42,219,173,239,201,185,51,68,212,185,136,96,119,119,104,200,91,217,153,30,238,190,28,243,96,120,206,35,198,119,172,241,168,151,145,132,216,35,220,153,112,95,242,222,142,229,59,103,82,185,22,103,113,
+21,35,8,51,108,239,225,115,49,23,27,123,151,123,132,10,5,172,212,119,131,144,207,203,188,28,54,45,48,175,176,19,73,205,246,62,169,153,55,183,213,243,62,223,63,187,108,238,38,114,148,12,49,205,11,63,92,239,128,208,251,123,20,80,221,193,144,234,6,69,252,125,29,195,112,57,123,13,123,97,105,189,127,11,38,7,98,176,28,182,114,242,23,137,96,131,11,198,172,52,229,8,200,215,197,0,200,201,64,128,177,169,186,85,52,36,76,164,97,48,94,45,246,77,47,80,16,81,27,205,28,225,8,15,226,17,56,219,90,104,193,83,65,60,0,223,239,128,76,142,47,59,221,147,163,231,242,129,74,98,84,174,36,150,152,176,153,132,30,64,88,5,234,206,95,20,149,36,161,33,103,233,84,245,211,119,165,61,45,82,74,144,68,187,190,175,20,102,8,18,65,73,37,198,12,64,196,195,184,1,25,13,164,167,75,65,12,73,52,33,202,187,69,181,126,206,103,168,18,94,181,186,96,181,50,188,129,2,156,52,200,28,155,30,46,82,0,151,168,62,51,185,56,149,231,232,
+17,238,36,156,36,36,28,194,131,229,158,225,198,224,47,48,141,87,163,149,206,107,15,220,102,133,112,192,140,24,128,115,113,87,68,36,28,148,113,122,148,134,130,5,248,66,244,82,151,151,42,92,69,61,105,137,179,31,128,209,105,10,182,94,100,102,121,33,144,156,156,141,2,253,151,187,171,131,122,91,242,202,50,12,210,81,156,55,24,96,21,246,218,179,94,128,79,114,16,113,28,138,234,15,22,242,48,0,36,2,90,248,148,119,211,113,98,123,150,172,103,134,22,206,3,240,238,244,116,103,189,158,137,211,123,58,174,245,176,100,60,201,88,221,193,249,232,209,21,76,64,56,107,224,232,6,125,0,145,239,107,119,19,23,144,1,157,239,84,142,245,89,223,133,36,146,61,42,58,244,168,96,158,36,112,26,199,192,13,227,196,3,127,20,143,184,235,44,169,84,184,181,176,68,95,240,200,145,211,218,94,28,2,36,197,163,80,198,46,216,5,164,238,43,184,133,31,161,252,104,245,0,38,119,154,195,11,188,248,208,50,146,196,46,188,43,247,236,103,236,167,105,251,62,112,121,
+22,179,193,82,122,71,96,50,114,114,159,158,29,73,31,142,6,70,252,91,247,253,131,124,237,230,120,166,5,234,195,154,8,122,74,60,129,117,156,6,145,56,72,28,79,242,14,20,44,121,184,103,117,88,53,126,195,172,235,128,206,160,198,64,35,22,25,130,19,208,120,114,51,128,69,145,245,105,190,35,41,247,234,8,47,111,134,174,248,241,245,106,29,72,172,87,47,235,220,34,94,67,28,125,92,168,104,201,243,25,158,14,129,35,60,58,148,28,175,94,90,125,87,98,135,131,252,204,186,88,192,107,133,246,186,88,240,17,52,128,96,29,103,73,97,79,127,25,28,45,53,87,96,189,152,121,3,105,64,38,104,223,87,99,224,213,206,236,233,122,29,33,125,120,76,7,145,142,131,213,216,149,251,225,143,196,174,170,178,201,155,75,60,11,128,198,116,131,3,14,165,81,255,19,170,133,245,29,218,89,143,148,143,164,232,226,23,142,231,212,19,191,243,169,73,137,55,202,38,97,128,131,100,193,44,175,189,158,237,83,25,251,137,214,147,15,52,140,72,145,79,235,242,114,114,214,
+186,52,62,190,236,209,141,103,38,60,246,175,251,252,123,98,144,114,111,76,197,12,225,184,247,238,8,92,187,83,112,181,97,219,153,224,94,20,63,80,134,29,248,109,119,123,227,65,107,148,74,36,194,113,153,247,200,159,80,141,19,103,144,106,15,86,128,59,238,109,26,17,19,192,22,45,9,197,194,218,56,249,137,81,5,203,41,190,82,186,46,0,116,67,32,185,102,50,218,117,222,246,245,76,212,212,202,14,50,121,41,242,154,12,227,92,56,237,47,239,227,244,3,118,111,210,107,64,49,72,41,207,35,16,131,113,192,72,139,64,135,226,238,120,60,151,238,239,151,118,187,62,5,61,202,7,111,34,26,194,250,183,230,60,2,18,129,82,226,104,45,89,121,110,244,179,34,76,140,84,47,184,129,173,133,18,17,79,6,247,205,119,110,175,69,230,255,62,238,223,194,36,17,229,112,157,168,136,218,44,94,173,241,19,218,77,88,191,218,165,14,175,118,215,60,203,174,52,113,65,126,105,213,78,19,236,210,75,79,250,188,30,220,79,1,59,128,29,112,199,73,94,22,67,55,20,
+197,157,21,81,189,80,215,14,13,62,85,114,231,163,21,221,23,191,60,210,183,97,251,158,141,135,237,172,35,237,37,169,215,81,44,53,51,238,201,87,76,115,111,40,126,200,50,155,143,167,168,186,144,53,60,90,25,197,215,164,234,5,2,147,147,91,219,149,248,243,181,114,168,190,186,59,107,118,251,2,155,82,17,133,112,110,197,107,179,42,150,74,51,93,164,107,39,112,220,2,198,24,108,222,21,153,109,124,157,221,63,107,159,249,161,204,59,191,10,204,133,133,206,0,228,166,229,172,158,157,20,73,21,17,56,221,120,194,225,125,158,242,208,180,62,200,33,130,240,7,138,138,221,192,107,197,188,169,155,85,194,29,71,233,225,22,79,168,151,103,219,132,138,209,224,27,29,146,84,230,185,210,39,229,5,172,135,160,109,30,40,109,242,128,202,68,204,227,101,14,28,15,215,147,129,24,52,68,56,116,199,133,30,14,42,197,187,189,37,28,108,203,210,178,231,219,182,21,8,150,138,82,208,98,108,54,152,201,66,133,248,198,135,57,112,129,229,242,3,158,171,9,136,120,230,41,
+98,29,207,63,227,40,52,164,222,227,238,52,194,29,125,254,129,151,239,28,120,41,239,189,10,93,26,64,34,126,195,139,110,188,230,190,194,139,238,100,95,141,40,146,190,122,93,12,38,134,159,126,233,8,240,164,1,102,149,255,84,218,193,249,76,133,15,197,222,169,109,137,150,100,134,131,43,113,7,175,155,0,75,68,140,231,172,73,68,162,143,30,38,243,110,60,192,156,111,104,120,214,212,104,68,196,65,112,47,233,229,198,21,119,158,26,181,8,250,52,1,190,130,121,244,218,0,18,207,4,248,50,62,249,124,40,42,146,19,211,152,195,115,65,84,230,168,134,220,67,233,50,139,226,7,223,212,135,192,116,207,189,41,184,21,231,235,130,123,31,62,89,71,165,80,208,74,77,236,172,27,34,131,189,218,65,12,118,82,162,84,104,32,23,195,131,139,83,6,80,191,234,24,59,222,28,24,60,154,153,80,182,82,54,12,71,150,54,10,170,160,67,82,64,139,186,148,96,242,86,98,63,4,131,178,188,163,163,138,169,252,244,132,106,121,255,150,37,212,5,230,44,202,145,182,228,
+212,57,48,106,158,198,96,229,32,48,135,8,165,160,75,241,104,229,9,149,133,107,139,18,24,147,0,112,157,42,139,231,165,50,88,235,107,201,2,42,40,173,215,135,102,60,202,73,110,193,202,46,127,215,114,28,97,181,221,240,128,23,242,193,188,201,140,222,75,64,28,209,161,14,109,44,15,8,59,11,186,164,126,163,245,201,3,251,229,117,195,229,46,213,86,84,186,170,15,239,92,10,204,123,174,122,58,237,128,53,71,160,69,106,221,7,102,34,16,73,94,99,65,34,6,103,38,153,98,1,137,238,93,41,140,220,23,94,5,68,34,7,53,22,219,98,113,171,130,37,24,186,242,118,68,249,100,240,226,253,37,205,17,232,47,210,206,234,171,228,98,80,142,157,33,46,140,15,36,175,64,100,140,217,96,226,7,40,181,166,207,13,252,139,86,13,166,128,111,190,55,30,17,120,51,190,220,32,111,48,113,199,129,51,0,14,126,226,14,140,23,170,241,162,198,184,221,182,123,8,47,107,183,229,243,148,156,121,4,167,117,73,104,84,171,209,51,202,167,26,71,116,84,55,177,146,
+209,7,11,40,217,5,84,4,82,75,0,236,92,193,42,66,71,252,4,183,150,228,122,182,124,122,25,199,75,77,56,123,189,44,200,231,98,214,11,76,194,67,2,47,118,81,146,35,117,234,28,38,87,229,220,185,14,214,246,174,234,119,9,213,221,120,155,8,48,198,189,183,113,11,242,111,234,49,104,240,8,201,249,131,211,75,155,177,210,202,191,199,209,182,30,178,53,107,18,42,55,82,81,92,111,202,226,157,83,191,123,91,95,182,215,245,101,85,193,37,66,84,105,55,93,175,246,248,131,198,31,228,17,205,65,189,238,171,207,224,160,93,145,224,5,178,59,222,167,7,238,134,47,19,73,9,113,189,231,131,5,3,19,104,9,16,96,247,58,140,158,239,200,137,220,170,175,222,166,15,184,231,49,194,17,30,152,222,0,165,98,0,67,137,65,50,177,169,76,4,253,156,242,1,33,212,207,235,60,22,99,67,61,129,192,3,27,206,52,211,233,90,83,204,29,102,54,180,243,132,118,125,191,198,233,22,15,142,55,52,179,186,171,74,207,93,4,120,151,141,175,250,236,112,235,94,
+72,107,116,196,101,39,48,95,103,153,75,54,9,175,50,247,51,85,195,233,158,174,224,192,17,158,3,39,199,150,27,228,69,196,229,111,22,166,0,190,224,6,153,183,48,193,191,35,123,73,237,210,54,141,0,145,8,216,22,152,101,18,94,96,198,255,65,63,73,15,156,120,199,109,38,88,27,77,116,244,76,123,222,230,203,15,60,236,238,37,160,94,66,213,101,120,129,80,78,188,147,226,149,42,187,188,211,157,148,180,236,156,111,242,216,37,123,36,239,35,205,24,52,9,112,232,229,71,217,122,253,114,179,62,72,6,160,231,103,143,200,45,243,72,111,145,39,36,184,106,7,142,36,47,41,26,248,182,65,3,128,20,213,182,1,69,13,178,188,245,68,186,21,106,112,181,167,31,55,131,135,117,18,199,45,178,194,179,235,88,80,83,84,214,118,193,249,151,63,164,224,114,17,129,8,169,151,99,21,133,23,126,94,163,143,134,224,87,42,3,134,94,189,176,42,102,121,148,35,240,13,113,176,21,0,175,89,128,64,166,48,221,208,229,177,171,67,78,158,127,201,16,227,0,182,125,
+145,98,254,118,157,220,240,220,134,39,55,107,154,200,98,92,39,216,27,253,125,174,245,167,5,141,97,157,46,150,246,25,106,84,2,131,47,168,189,171,29,65,119,204,255,7,250,252,157,189,238,84,156,96,213,121,7,155,214,23,241,107,221,237,246,110,124,62,171,139,178,23,226,16,52,91,98,225,246,188,193,34,138,239,247,127,71,15,192,100,8,87,245,201,182,157,179,119,153,132,172,110,222,153,110,111,99,85,224,100,117,12,128,210,26,199,30,92,39,185,122,240,247,207,117,61,108,56,78,148,200,206,131,237,91,166,77,8,123,220,149,243,53,240,238,250,33,252,25,100,219,22,136,80,94,50,111,30,127,38,27,1,58,181,119,255,114,116,183,41,159,180,117,238,166,238,171,81,154,189,65,146,105,148,186,207,82,194,229,186,128,124,5,220,111,120,249,224,121,90,117,244,2,130,53,131,5,13,220,211,86,250,178,62,229,87,75,41,161,226,222,185,129,37,80,3,160,241,90,204,157,71,246,62,13,57,167,237,240,234,230,168,178,31,207,92,68,233,116,213,199,117,189,177,183,238,
+7,224,249,35,6,0,86,146,166,94,191,243,213,37,112,80,117,139,26,35,167,74,210,33,72,28,37,109,78,156,49,61,226,110,66,197,207,176,207,220,135,21,217,10,83,108,195,159,230,53,114,123,194,77,157,26,97,19,9,155,78,206,51,44,94,62,42,3,176,42,98,20,146,18,240,156,148,219,222,240,26,33,194,55,136,111,65,108,15,241,74,215,145,102,170,82,65,171,225,108,112,116,51,68,231,222,151,196,245,38,221,172,216,20,168,191,233,207,68,19,119,22,184,49,7,189,136,223,239,175,202,162,239,98,98,98,77,89,252,163,87,191,66,36,5,245,107,62,118,107,192,78,60,81,107,18,63,175,111,0,48,194,153,176,65,184,110,214,37,63,143,202,138,155,251,8,20,79,18,18,209,77,69,158,145,239,226,6,242,176,228,198,88,252,241,17,62,168,241,26,96,45,37,98,92,146,55,231,148,122,191,163,224,214,158,31,15,238,64,95,70,79,222,7,47,215,155,34,202,145,110,67,4,183,20,174,202,211,238,166,157,84,215,2,112,163,37,6,91,167,147,212,234,4,183,195,
+39,224,230,95,214,85,193,163,87,248,0,47,229,19,207,27,105,17,104,149,244,128,200,237,29,232,166,109,94,47,199,235,45,21,228,115,250,143,178,188,163,181,62,242,39,2,187,128,41,208,204,163,208,19,109,36,48,61,180,55,65,135,16,56,117,188,9,78,253,113,202,209,3,156,120,176,40,119,56,27,71,120,174,138,113,178,225,40,237,150,187,17,200,130,111,27,168,236,111,252,75,117,144,128,242,56,33,80,188,95,213,33,211,194,189,183,109,95,105,153,97,241,166,63,191,131,131,92,55,2,113,251,1,51,29,238,180,249,20,145,0,222,25,46,55,176,216,178,157,24,108,92,16,97,171,132,254,89,198,151,106,59,219,199,195,196,245,71,91,170,223,154,49,138,139,251,5,198,229,174,246,177,155,94,255,219,40,247,179,1,214,183,130,6,190,98,153,80,185,41,122,219,243,125,233,57,104,93,243,193,251,107,184,165,209,90,164,215,115,174,245,34,89,82,32,121,125,106,223,178,223,238,19,225,221,245,88,96,26,12,139,3,42,223,174,1,145,247,203,114,132,224,77,158,122,238,
+61,221,183,27,252,217,23,171,217,46,170,103,86,111,144,240,49,4,43,86,144,120,34,63,194,61,161,9,0,9,66,2,106,237,162,32,174,201,134,226,109,171,206,221,135,91,144,146,92,157,204,18,112,48,25,142,230,239,239,174,47,55,13,145,138,245,100,253,25,175,158,195,237,133,28,185,97,249,218,104,110,193,109,176,77,195,15,240,222,79,118,221,239,204,212,112,30,142,89,110,158,53,124,198,165,231,209,136,83,59,103,27,191,55,125,25,205,195,6,66,80,17,81,66,87,30,93,66,218,162,78,122,56,17,29,222,63,31,38,98,160,84,75,109,80,38,21,67,100,79,148,94,43,10,96,5,197,103,3,184,130,28,112,140,201,19,28,129,26,0,158,118,168,145,228,238,182,193,201,244,162,38,55,180,48,194,71,253,150,132,197,48,208,223,54,125,143,219,183,227,218,190,234,190,183,47,127,91,255,231,14,10,22,232,30,189,89,78,66,11,240,228,244,158,116,37,182,112,58,243,156,82,52,22,238,73,235,135,58,88,181,220,103,61,239,37,216,198,217,189,238,89,43,182,93,60,
+88,68,197,155,122,233,166,24,217,133,236,188,179,43,50,247,214,184,37,178,172,208,134,200,122,202,165,153,246,60,173,35,89,248,68,250,99,26,76,190,45,52,170,63,228,173,215,56,111,157,193,113,36,86,187,55,31,220,136,229,7,92,247,201,58,229,15,174,215,213,82,99,215,255,0,135,144,73,149,105,193,211,144,81,71,103,55,171,25,67,41,6,61,59,103,44,198,179,153,35,168,186,175,223,146,80,107,207,69,56,123,25,177,238,105,232,201,229,76,14,26,111,233,249,209,93,10,26,156,25,97,27,236,197,83,213,170,86,235,61,70,206,88,187,114,228,126,111,157,38,173,176,74,215,230,167,87,190,51,197,74,210,181,125,238,190,94,74,19,170,212,238,186,121,82,121,183,244,97,114,105,151,55,52,16,122,221,11,9,89,7,167,130,178,59,202,29,249,98,101,231,95,70,135,185,227,94,240,157,202,209,146,166,62,5,2,227,39,70,149,125,130,161,96,254,142,113,21,18,35,179,50,200,164,216,18,193,85,191,98,161,112,226,21,113,29,73,209,79,147,179,146,106,55,50,21,
+237,39,130,89,48,30,103,37,251,131,197,228,165,230,29,164,43,9,106,122,159,171,175,154,72,17,178,12,92,251,187,116,152,146,138,168,224,101,253,84,118,122,43,227,20,19,190,170,18,60,73,198,177,179,208,27,206,254,203,252,51,226,129,177,184,239,61,250,100,239,224,228,195,10,55,86,162,139,12,246,114,43,88,4,252,136,53,76,163,222,21,46,221,185,87,88,5,20,3,62,188,44,184,190,128,85,92,57,50,156,221,40,67,101,230,167,40,82,132,220,55,221,125,121,152,255,238,81,220,120,162,194,247,75,117,61,1,121,53,206,98,69,167,99,182,245,49,95,50,179,139,83,197,93,16,121,27,168,36,179,50,199,207,181,123,100,34,57,24,133,214,21,254,30,28,144,193,148,160,74,69,139,66,111,135,162,122,48,105,89,119,38,162,142,189,36,180,254,237,197,85,88,151,231,3,47,12,146,18,14,236,7,61,170,125,101,8,254,16,194,129,167,234,137,168,78,121,190,213,47,64,203,120,100,161,142,21,149,18,0,157,76,192,163,200,76,142,188,37,153,16,146,4,234,247,112,
+7,82,161,92,26,227,34,163,96,142,214,125,9,123,157,196,101,75,24,209,0,228,62,188,172,63,72,84,172,234,250,193,136,232,205,89,79,103,160,90,50,152,228,58,93,84,111,88,167,108,20,45,25,213,117,168,37,116,186,51,145,11,184,101,115,225,247,143,55,95,103,202,214,88,154,40,173,225,47,202,116,13,59,192,187,221,244,52,155,153,79,208,125,109,43,178,37,172,194,123,208,168,211,93,135,169,40,221,200,184,180,57,22,241,251,108,8,16,195,218,179,4,229,141,132,159,37,183,59,1,219,140,175,225,245,199,27,156,234,139,29,157,224,167,117,112,104,1,147,129,44,200,60,62,2,12,123,198,25,64,114,224,241,208,78,47,193,75,8,178,26,78,159,14,239,158,147,208,250,195,234,137,65,86,78,80,148,237,163,11,48,185,112,241,241,250,19,8,248,223,151,119,4,24,225,173,143,100,226,82,43,231,246,104,160,123,157,53,217,9,10,97,74,220,196,87,235,49,232,89,226,149,44,94,71,239,29,192,34,116,231,110,195,195,226,52,62,168,186,174,7,132,238,77,250,208,
+202,143,214,15,227,207,178,215,15,255,159,148,189,217,115,59,219,118,30,246,175,220,71,59,174,200,214,149,172,114,228,60,56,165,184,82,169,114,146,7,87,37,149,7,87,164,72,87,209,173,146,117,85,186,215,113,92,46,87,53,102,146,152,1,2,36,102,144,32,166,198,68,98,36,6,98,224,0,16,243,216,152,39,146,24,27,19,137,145,152,211,13,156,163,35,59,114,162,60,157,243,67,239,189,122,237,181,214,254,214,250,246,222,205,141,244,149,162,157,145,190,164,205,129,6,227,85,104,103,164,111,30,233,140,3,153,251,171,35,220,251,112,208,201,30,5,174,28,224,149,194,207,30,21,128,162,125,61,97,193,188,75,14,146,193,163,90,196,250,81,173,111,224,168,22,69,116,84,11,144,30,213,242,29,246,25,16,201,68,230,254,32,153,138,241,29,36,163,251,227,168,100,172,231,144,71,234,190,241,170,56,46,251,33,224,56,108,41,124,123,186,93,74,212,47,152,216,23,15,201,108,137,75,203,1,227,161,78,201,179,122,69,50,5,193,226,60,116,116,215,145,132,128,148,2,218,
+147,140,174,114,176,1,128,69,50,227,135,13,193,10,4,105,69,192,209,14,31,215,80,111,134,36,198,34,201,121,28,183,21,73,131,173,145,52,148,105,179,116,101,41,60,192,210,14,117,201,229,86,13,111,169,56,22,205,161,235,230,49,160,197,137,57,170,103,6,208,228,34,210,36,48,150,249,97,164,171,19,74,198,226,107,241,123,232,98,125,254,39,125,136,117,45,168,24,68,197,78,17,244,136,246,63,214,75,117,132,155,14,208,117,122,21,173,120,84,32,130,247,163,116,9,210,147,208,86,42,254,45,218,202,15,90,193,252,204,135,168,67,243,29,213,81,159,193,129,67,254,38,255,48,186,57,150,173,42,234,87,136,28,193,65,78,3,175,8,73,144,20,78,191,3,249,43,22,250,189,6,223,75,1,45,70,202,211,19,4,87,101,143,27,36,198,242,56,208,66,188,85,28,62,92,201,152,124,80,241,242,10,84,161,217,84,42,133,177,186,200,97,235,226,53,143,100,9,110,235,228,80,215,106,79,84,39,69,178,201,92,193,156,161,121,32,42,107,25,163,88,164,112,128,9,195,
+175,197,33,106,151,214,38,146,92,139,124,237,25,164,89,63,156,156,242,153,7,156,191,113,162,57,0,121,157,61,66,251,91,214,169,151,68,213,107,27,79,231,194,139,178,8,61,61,198,6,48,240,129,29,170,64,157,117,55,101,208,85,197,101,216,244,12,73,103,183,190,40,206,123,155,129,122,73,221,98,139,248,81,44,185,178,129,193,193,13,217,104,207,86,72,82,222,125,21,65,205,155,112,31,166,79,118,152,79,28,190,195,117,31,247,253,65,180,241,21,72,124,208,41,47,16,162,213,243,93,37,53,56,96,168,16,35,88,142,66,121,185,117,5,102,199,148,137,98,10,128,1,124,239,22,67,162,228,159,145,64,159,159,16,65,88,240,128,11,161,155,249,99,196,160,77,94,204,7,165,156,54,239,13,1,62,181,208,206,188,212,243,30,96,177,153,251,131,188,176,169,186,101,71,118,201,124,59,187,195,237,16,182,13,251,32,207,97,183,62,54,133,50,73,85,49,108,210,86,139,80,68,134,203,70,175,180,184,132,65,30,135,166,166,176,209,111,127,137,91,139,129,7,105,111,179,
+109,236,166,104,71,36,70,96,81,41,97,185,30,155,34,75,130,202,33,185,138,59,244,29,139,197,31,0,180,43,4,62,237,167,96,115,48,41,232,62,146,52,201,11,4,182,98,111,140,154,196,171,83,129,143,214,124,57,28,172,42,120,44,5,61,209,85,101,122,58,68,225,26,164,53,79,110,73,24,248,186,8,67,154,144,188,21,211,41,55,155,37,6,139,87,178,194,80,234,141,157,36,207,147,22,110,251,114,239,190,133,33,81,54,18,196,232,225,43,2,232,47,241,93,222,202,97,223,252,106,130,129,122,75,226,68,156,181,92,165,114,166,201,120,12,20,63,53,124,139,207,148,210,8,249,2,235,206,30,76,204,101,159,203,240,254,165,204,200,26,205,220,211,124,68,34,178,146,250,192,9,14,68,234,164,60,36,65,226,168,253,170,75,159,73,103,218,172,213,71,175,97,180,230,52,136,183,230,103,168,228,53,81,197,55,139,95,138,188,22,66,88,8,126,232,197,242,129,67,187,232,16,173,116,112,16,80,121,195,135,136,104,188,34,241,115,10,102,229,197,134,154,143,4,220,248,
+145,207,70,43,85,113,202,82,220,119,145,90,9,200,103,105,109,58,72,202,22,255,95,113,5,159,176,28,16,11,253,206,6,69,44,204,113,94,101,112,212,35,144,78,79,142,64,10,96,142,64,74,216,29,129,84,128,130,33,34,217,140,130,33,34,249,243,80,197,121,165,103,40,24,34,146,25,40,24,34,146,165,71,152,229,19,142,48,203,160,28,97,22,221,63,61,74,62,194,13,241,252,8,179,64,255,8,179,210,196,17,102,17,122,121,128,89,64,115,132,89,190,247,8,179,239,192,17,102,111,57,71,152,5,110,143,48,75,58,236,87,159,68,170,194,120,152,22,86,21,123,63,200,87,88,238,12,123,153,37,111,7,245,50,88,71,5,137,137,3,122,192,189,155,35,143,154,123,127,192,231,236,177,44,199,144,193,35,96,105,17,108,66,39,206,20,5,71,4,154,164,168,180,150,22,198,61,232,209,186,118,113,123,28,247,171,2,42,29,246,65,77,215,28,50,138,180,135,253,81,4,105,77,58,207,87,34,117,39,63,65,176,17,133,198,219,195,91,20,112,91,161,83,127,16,192,
+236,143,252,129,204,4,145,136,77,39,165,15,209,67,203,31,245,217,33,181,183,46,40,51,157,20,85,135,254,137,195,175,25,11,9,77,247,136,2,245,197,81,1,215,43,84,26,26,86,82,108,226,8,192,25,196,8,40,181,201,187,143,192,239,253,1,248,103,121,36,105,35,144,138,117,254,224,127,22,20,134,36,136,156,201,81,142,248,121,137,192,147,53,11,64,233,26,122,80,150,198,62,9,128,115,149,227,147,128,96,13,145,8,146,161,7,63,186,129,128,185,35,65,189,183,8,132,94,39,13,180,176,32,198,114,251,132,122,68,85,247,121,81,0,77,130,71,0,197,195,71,0,101,0,71,0,197,118,156,88,116,235,175,201,247,71,154,4,29,197,1,65,103,229,17,129,241,141,192,230,36,204,16,164,102,102,11,82,246,46,234,43,38,203,220,159,224,175,142,219,123,147,58,17,234,77,132,32,87,186,120,186,110,248,158,172,183,241,147,83,174,253,201,158,118,77,40,137,248,201,214,226,75,33,254,121,207,254,167,231,166,148,199,115,83,69,11,10,122,58,210,64,136,46,143,33,
+165,178,19,201,127,40,208,249,30,14,203,183,175,147,195,242,237,243,149,3,110,41,68,22,102,142,100,249,154,200,176,249,225,52,3,149,242,163,21,128,24,197,133,12,176,248,29,215,67,225,235,134,63,24,31,145,164,242,136,186,90,52,104,146,221,105,164,255,152,65,16,166,213,61,7,32,186,34,251,70,163,217,208,131,8,0,3,79,129,14,68,173,232,64,136,26,130,124,85,147,16,7,202,23,192,115,144,140,30,119,2,158,249,234,4,6,30,250,187,195,125,62,82,195,88,98,207,130,120,68,66,243,180,100,0,1,81,127,103,56,160,102,38,9,29,80,179,8,113,34,50,114,54,186,154,102,113,42,230,59,216,170,148,50,38,87,84,232,210,72,158,247,164,167,209,73,157,203,188,3,139,1,46,50,127,95,41,147,42,6,142,137,57,229,29,55,26,104,36,37,82,253,153,13,124,237,202,11,165,9,130,148,173,24,163,198,240,62,146,174,142,5,107,104,137,22,172,94,37,85,134,194,211,253,62,6,153,98,62,33,81,165,33,131,153,104,177,150,156,21,138,8,68,26,185,55,
+39,0,85,142,96,229,59,10,150,8,86,14,81,176,132,105,79,103,207,250,39,150,221,238,61,215,101,84,48,45,56,6,162,213,58,11,200,159,108,16,251,193,134,165,52,160,41,238,134,83,16,44,101,175,41,109,45,252,84,163,152,100,58,54,66,174,177,37,72,251,240,189,244,237,73,119,123,66,241,244,220,46,145,72,104,86,82,30,232,160,25,107,161,202,29,210,219,85,36,174,1,178,236,157,96,18,48,0,197,240,57,152,64,88,36,250,224,236,224,86,8,23,69,147,36,66,32,43,240,193,173,38,0,210,241,128,206,105,159,57,65,48,71,13,47,207,149,72,94,23,104,161,199,195,41,160,9,22,153,223,86,26,82,98,10,138,236,134,201,176,230,220,158,92,13,130,198,39,123,83,232,65,81,3,156,50,89,50,24,207,0,138,62,232,85,223,128,44,22,179,60,91,84,113,219,147,232,243,221,32,219,200,90,8,14,127,43,154,222,7,187,133,209,153,182,87,94,128,173,42,177,145,231,201,74,202,117,9,180,159,228,2,102,66,187,231,33,201,121,166,70,224,249,132,239,207,
+80,27,33,61,100,154,129,25,46,25,61,169,183,30,219,118,205,162,252,25,27,142,23,245,5,99,51,2,65,155,150,165,252,5,250,79,146,8,2,222,148,213,90,184,64,24,150,33,211,162,97,207,232,6,44,40,100,153,166,88,130,72,31,136,22,251,33,245,110,100,164,191,124,147,132,144,236,134,43,133,111,46,115,9,203,158,163,12,127,8,17,98,181,88,155,36,197,30,56,243,22,247,137,94,75,180,56,253,184,202,182,44,83,131,199,144,250,24,35,141,115,33,201,135,166,53,114,154,22,176,133,246,196,249,88,12,239,53,252,134,67,113,95,61,159,23,86,136,38,218,210,77,30,34,127,246,223,178,250,116,136,159,184,179,207,38,73,154,163,96,10,173,132,15,172,148,21,17,241,153,59,171,97,248,150,48,95,39,133,197,236,54,199,205,189,180,230,83,65,86,70,25,134,34,206,219,253,12,252,136,158,154,172,119,189,49,249,147,50,219,147,78,222,69,243,139,78,175,247,224,118,74,120,147,26,99,122,101,84,241,131,28,111,18,108,89,13,248,140,229,141,21,86,134,133,18,
+65,107,214,152,169,122,246,184,208,90,190,2,95,120,165,196,236,14,154,100,124,208,217,9,2,243,254,177,124,150,231,72,11,206,45,239,139,125,113,159,177,107,154,253,226,42,219,104,4,223,243,203,154,37,144,205,159,246,192,102,17,255,209,179,240,87,231,235,73,76,51,50,23,104,173,2,181,118,206,232,34,0,199,210,76,226,15,6,190,229,42,172,187,101,56,233,182,33,193,33,240,115,115,22,173,237,37,200,181,112,192,162,222,115,6,154,78,122,217,65,49,205,179,191,15,3,147,189,109,106,174,189,100,71,175,123,65,66,235,143,159,153,65,59,170,182,56,123,233,125,45,87,210,103,216,230,102,254,189,100,25,59,135,56,145,194,248,211,103,87,254,140,193,186,85,32,210,170,25,29,129,26,76,89,26,6,0,48,2,17,28,154,159,188,71,88,7,105,71,26,0,36,142,52,0,186,61,210,0,230,211,145,6,96,136,199,116,141,174,75,28,50,223,15,117,118,2,123,76,215,127,103,222,243,120,76,215,236,81,46,205,250,48,34,249,230,88,14,96,104,193,126,120,255,170,155,
+183,143,89,242,184,94,140,148,220,79,171,228,19,154,50,8,199,114,26,235,146,65,58,91,117,230,227,160,69,55,130,233,175,135,180,41,232,125,163,235,131,217,225,15,121,154,167,25,22,13,7,66,1,136,142,121,249,199,245,41,194,97,125,234,167,60,201,130,122,135,243,63,198,96,224,12,77,76,71,254,35,83,119,249,221,30,156,191,210,120,138,87,157,115,250,21,76,24,28,182,39,25,124,228,109,184,168,133,67,135,210,153,187,191,145,239,46,243,80,180,200,119,57,112,26,2,42,254,175,249,79,252,128,54,104,193,122,180,199,3,146,43,7,59,144,14,28,90,89,128,24,210,138,2,13,110,5,240,129,254,100,188,7,109,83,208,21,13,93,150,250,137,255,100,20,73,75,121,134,212,96,214,163,28,108,228,220,99,130,162,15,185,243,39,214,27,88,28,96,52,120,116,39,149,86,133,52,182,2,9,127,226,179,202,25,232,10,144,0,131,56,188,104,97,161,68,11,64,222,135,240,85,192,143,69,69,2,128,153,155,161,230,209,195,60,119,247,122,60,64,0,94,148,86,189,122,
+70,0,0,194,227,23,182,128,81,77,113,140,199,123,244,184,203,61,70,236,70,106,58,194,43,163,244,80,103,25,93,167,70,136,173,27,66,50,242,185,149,113,249,8,6,199,105,71,69,104,218,129,220,69,44,135,103,20,101,231,74,22,146,236,117,67,206,13,185,206,180,34,45,78,55,55,106,17,74,39,218,143,207,98,82,88,62,209,79,182,120,7,240,74,160,215,64,200,205,74,108,242,245,58,0,250,32,203,108,141,164,199,91,85,81,253,128,148,86,99,228,167,150,252,214,7,100,176,32,13,126,152,233,233,132,12,39,234,138,71,183,100,64,71,189,54,128,167,237,39,108,189,153,95,136,242,161,92,25,84,84,111,178,65,167,145,56,41,69,242,171,228,85,245,144,41,121,171,68,4,210,134,3,72,244,240,95,49,80,250,12,230,127,84,102,117,245,240,75,197,63,151,204,92,116,254,152,172,217,152,210,164,220,153,238,2,110,132,212,135,221,78,229,71,138,123,13,3,225,40,38,66,75,204,164,45,154,172,10,15,158,31,124,157,210,244,73,46,8,52,65,127,221,79,142,122,
+33,75,148,90,245,113,208,37,35,171,28,84,204,0,112,203,148,1,9,195,75,70,119,167,235,139,98,165,172,57,200,76,135,83,110,237,106,33,224,226,202,32,151,203,239,9,158,87,169,226,176,63,116,117,231,173,236,34,84,230,218,57,179,45,209,203,43,105,5,183,25,90,5,68,249,172,90,100,235,170,100,33,177,70,161,185,16,204,252,124,43,177,158,112,78,82,22,11,33,51,184,175,16,20,162,113,15,132,153,184,85,80,243,8,103,163,143,219,46,119,211,147,119,107,218,229,183,91,27,118,76,181,133,214,217,0,234,123,19,8,204,162,135,138,83,144,153,211,132,193,150,67,8,248,50,47,24,72,16,147,172,115,58,145,149,152,14,16,67,22,130,78,254,32,85,131,51,120,175,146,82,84,132,76,148,189,209,65,95,89,173,132,207,106,229,183,102,215,5,199,50,213,134,206,90,252,144,163,239,141,36,56,232,177,226,156,251,120,172,56,90,191,19,89,232,144,102,235,154,0,192,249,35,216,2,196,119,162,232,0,150,153,136,197,249,91,150,68,192,200,253,208,164,95,52,229,
+80,41,146,96,234,233,173,232,217,228,21,198,207,140,142,99,141,166,91,87,58,184,35,240,14,206,119,105,203,85,146,162,136,193,111,173,183,88,81,57,23,209,177,161,186,1,46,124,10,188,60,40,204,55,157,218,177,8,130,129,93,94,158,159,57,65,136,203,213,214,34,1,115,72,159,11,14,96,62,53,130,100,110,179,152,77,62,218,249,65,65,214,210,252,104,41,76,90,43,134,98,178,209,78,211,124,173,101,107,237,232,38,132,148,35,59,227,242,90,229,119,139,29,88,158,7,32,116,34,122,145,152,162,2,220,147,139,71,80,17,189,142,14,29,34,142,181,18,23,10,173,92,26,79,64,41,6,50,93,174,194,16,197,232,68,228,180,174,110,234,22,44,23,77,81,91,95,128,35,136,185,54,111,221,75,125,202,226,3,233,42,62,211,59,78,251,33,32,181,111,217,124,17,89,146,115,71,44,119,180,32,40,26,10,180,43,70,24,122,78,79,57,247,192,45,227,190,10,233,230,16,238,5,51,165,18,165,172,27,176,25,22,61,7,160,147,43,114,18,169,5,144,82,192,120,205,
+248,234,67,178,151,235,123,69,59,122,239,33,172,230,57,227,29,51,221,22,206,24,239,232,68,222,191,57,241,64,231,138,52,49,147,32,65,15,127,13,63,5,37,228,189,69,188,239,68,171,177,58,59,118,198,245,66,32,186,243,254,144,16,98,213,69,218,123,104,26,121,187,126,81,129,167,220,203,226,25,63,163,83,105,176,144,230,26,93,191,240,78,188,16,159,27,242,105,138,167,8,190,126,156,161,56,28,189,82,222,129,173,73,138,235,136,91,171,236,123,176,172,5,18,208,224,186,181,140,211,138,225,89,183,9,85,79,158,37,231,170,34,199,119,138,224,36,255,73,13,209,156,202,158,12,14,245,66,137,128,208,234,159,220,86,120,1,174,107,166,137,95,185,50,3,227,109,23,119,90,25,52,216,141,252,23,129,22,127,74,242,160,222,237,0,197,203,22,99,252,12,57,104,145,39,188,72,183,12,84,119,200,164,119,149,184,169,144,184,9,101,237,247,2,169,112,124,213,149,188,245,160,52,197,171,19,205,55,217,86,80,23,137,199,65,248,172,114,22,167,134,2,86,16,123,118,
+24,5,186,129,138,148,181,198,157,72,46,45,24,223,66,132,39,132,82,115,44,43,83,216,221,214,123,167,206,146,168,163,103,191,57,11,36,120,215,5,117,72,153,243,225,25,68,166,113,45,43,212,206,152,139,200,176,207,152,135,97,191,249,82,80,180,34,142,27,217,214,114,147,198,154,85,10,76,18,249,249,210,200,124,9,58,7,29,90,62,23,209,56,198,133,102,65,7,155,77,97,62,123,146,150,249,9,40,136,154,73,52,0,65,189,178,37,115,27,213,4,75,208,245,215,42,174,146,171,248,148,37,187,203,60,44,241,221,241,159,24,80,175,225,136,228,116,177,79,146,100,93,55,6,236,160,129,1,34,204,56,222,89,172,176,231,15,133,158,117,34,3,79,101,240,20,208,247,18,145,131,117,188,208,99,99,227,244,42,103,10,201,106,166,37,240,91,157,201,204,4,174,193,98,100,246,18,141,55,96,17,87,121,122,171,46,242,123,162,233,215,7,185,217,252,158,22,180,146,138,80,7,223,81,174,187,170,98,138,136,242,178,14,141,10,89,150,89,127,35,236,63,7,35,234,109,
+240,238,173,233,195,97,65,93,19,113,65,28,104,1,160,69,247,120,253,4,153,227,100,45,108,131,89,2,110,64,25,8,28,202,0,51,233,177,14,250,93,178,150,218,196,239,118,45,86,208,194,215,209,226,244,111,210,81,174,170,152,30,94,11,193,214,235,43,71,213,239,11,37,226,47,122,16,137,185,132,48,97,121,83,188,72,5,242,71,101,61,23,60,56,90,134,190,5,91,80,153,153,238,135,16,98,50,51,34,27,17,221,28,19,196,76,107,33,177,242,58,156,34,247,195,90,75,144,136,131,232,74,98,83,106,151,194,81,242,107,54,97,225,4,27,183,214,88,139,58,75,203,150,184,175,131,86,126,112,88,92,154,154,162,244,170,39,164,122,148,195,50,239,123,194,17,131,220,243,123,253,32,218,78,79,202,88,173,173,103,17,44,75,165,162,37,27,167,55,168,96,3,85,11,171,226,71,198,225,83,154,189,79,157,47,219,27,108,144,159,184,201,63,24,96,72,14,182,32,178,105,160,203,41,69,237,130,125,201,82,124,8,182,211,215,42,18,19,124,100,46,156,128,179,241,244,
+1,151,57,39,190,206,95,34,33,147,238,85,19,156,128,221,79,147,137,31,199,94,107,7,211,66,20,50,169,39,141,46,253,51,33,180,4,52,82,217,77,111,129,40,87,44,166,249,102,109,255,160,192,209,46,88,85,154,79,217,147,84,79,16,93,235,224,200,133,52,78,230,78,30,112,44,35,26,113,176,247,189,166,131,221,80,182,205,52,101,162,84,153,7,180,187,239,108,80,13,236,81,64,203,141,74,138,196,248,68,165,132,101,164,235,244,136,170,134,91,197,43,248,114,232,51,137,138,175,220,53,79,94,184,51,25,149,182,109,32,131,181,244,62,249,119,123,232,33,12,74,236,160,170,232,15,31,227,115,120,140,79,151,53,245,102,184,206,222,43,13,11,45,91,3,69,29,47,66,191,20,150,191,111,169,199,225,2,209,227,112,69,167,26,110,123,81,44,146,47,76,231,79,149,161,74,155,77,176,228,240,91,9,34,105,123,221,252,82,2,201,101,56,243,0,9,236,119,100,246,3,16,251,75,52,66,42,172,228,154,110,141,190,24,87,76,153,161,150,18,218,45,137,178,144,19,
+191,214,90,162,73,76,53,19,93,113,43,26,9,102,150,44,201,169,80,233,99,117,196,25,201,29,152,45,158,128,25,146,206,114,183,91,221,140,190,15,209,2,128,101,36,38,63,124,169,236,73,214,135,16,30,14,65,10,161,1,231,203,248,168,223,126,52,176,124,202,99,96,5,90,199,192,234,168,142,129,37,69,7,155,209,117,29,204,87,255,233,103,23,74,176,144,96,66,98,233,25,9,38,175,53,132,167,197,13,172,31,198,121,9,126,21,48,207,237,103,107,255,211,226,99,70,238,221,15,72,9,123,126,104,13,71,23,228,219,160,95,153,46,188,109,51,11,183,27,31,69,18,182,50,48,254,105,62,157,189,71,3,51,171,3,82,27,243,111,175,254,247,238,139,147,124,217,90,100,236,251,198,234,153,175,61,105,97,148,129,51,60,162,115,189,67,195,100,116,161,165,152,146,200,47,205,178,192,221,89,20,122,107,221,192,180,228,138,1,136,108,2,91,183,208,120,210,194,3,230,53,252,76,69,98,36,138,6,73,81,153,75,152,188,81,246,73,63,158,214,70,86,17,150,93,7,
+23,162,174,174,70,83,142,57,72,90,171,243,69,109,48,210,48,38,153,162,41,126,154,153,57,28,78,33,151,47,116,25,131,134,74,95,172,218,24,150,172,99,100,255,120,208,140,202,155,103,21,184,252,108,249,165,0,12,161,234,116,110,17,117,162,126,15,78,150,185,130,179,119,233,243,142,190,151,45,70,180,44,111,75,183,208,190,150,84,222,174,130,112,29,129,194,251,116,174,107,122,164,177,4,46,118,60,52,123,147,176,6,130,0,82,88,191,220,31,252,115,155,79,131,10,14,172,123,24,118,10,77,251,105,219,46,19,62,111,233,217,183,50,115,206,3,185,86,181,157,237,153,117,213,79,67,250,11,180,174,167,31,219,215,145,11,40,65,210,32,154,96,145,112,67,53,241,2,71,195,184,151,122,62,29,228,116,199,80,218,175,59,3,95,182,105,145,84,230,153,211,106,175,70,144,107,121,167,209,28,170,34,139,128,158,131,236,208,208,13,127,37,36,66,34,179,147,16,102,223,238,98,206,151,164,199,146,191,181,220,221,190,224,230,225,179,241,246,164,101,13,86,131,202,230,234,
+19,255,76,234,92,35,37,114,29,233,215,132,6,231,19,122,52,99,225,169,166,119,81,7,197,112,166,213,159,188,197,154,144,61,14,205,39,17,159,149,173,94,68,74,218,71,53,204,207,250,217,249,141,7,223,140,46,100,218,69,79,84,158,79,213,203,110,225,60,121,126,94,132,34,113,250,249,201,113,30,243,53,59,88,71,69,34,36,31,164,157,155,5,112,177,236,174,92,79,200,8,66,17,151,71,220,188,70,98,144,25,254,170,223,171,51,3,244,228,226,249,17,239,92,115,25,131,202,122,75,107,176,55,104,214,154,120,53,72,238,197,244,207,79,152,146,170,28,205,19,62,254,83,53,30,158,231,216,170,98,25,105,154,250,92,28,243,100,59,127,177,167,149,251,125,157,62,105,177,35,54,12,220,28,22,232,162,98,31,88,68,169,81,252,36,5,90,189,74,255,54,199,193,128,76,7,238,234,160,133,26,94,160,229,242,53,30,188,27,184,234,101,123,128,187,126,228,50,209,6,79,71,53,213,120,244,208,133,228,57,105,133,74,15,105,77,45,26,41,127,148,168,249,173,17,192,
+71,231,88,72,54,59,236,15,117,104,31,216,195,62,204,11,244,169,75,13,161,90,225,244,100,165,201,77,94,223,182,214,107,111,228,92,0,118,65,166,138,175,118,170,248,223,200,160,208,131,176,52,167,42,197,123,214,92,116,145,58,114,102,158,97,36,31,34,17,9,104,173,30,68,201,235,29,85,68,159,135,83,10,139,134,167,180,68,154,156,82,187,222,105,58,53,251,141,28,3,210,17,221,81,205,86,164,227,134,206,11,77,215,205,39,243,144,92,184,21,21,145,84,147,231,152,162,111,198,150,60,29,125,6,187,217,113,64,131,165,44,64,250,186,179,21,112,15,227,246,29,134,21,133,242,145,82,58,112,54,6,69,104,52,126,12,33,74,154,12,101,117,123,40,152,246,47,185,206,208,121,233,162,117,214,121,106,157,238,142,221,192,196,209,92,184,37,194,233,80,74,215,70,242,90,23,9,197,180,103,233,244,70,29,42,60,255,10,34,34,166,184,237,208,178,16,219,170,56,91,20,225,43,213,164,112,133,121,239,125,188,133,151,170,130,47,123,213,54,116,206,235,144,12,119,174,
+29,94,30,220,38,133,220,232,97,15,156,234,17,130,204,155,81,246,109,240,14,80,169,11,163,210,56,130,133,74,208,222,98,156,37,11,225,248,181,94,243,42,165,162,52,54,193,21,222,128,131,69,110,171,98,200,135,24,167,85,164,39,68,213,92,227,80,175,74,246,240,160,31,166,117,15,241,231,7,27,232,215,32,13,164,102,171,110,23,227,186,218,196,83,241,11,207,72,68,172,128,168,15,61,40,242,5,210,31,211,150,109,37,221,201,148,38,106,62,111,199,59,142,83,133,142,243,25,26,15,160,0,132,126,186,244,163,189,239,72,42,132,214,219,253,84,41,124,51,68,56,44,176,61,5,0,170,210,63,129,90,8,59,204,136,217,87,87,240,204,192,188,170,225,25,229,160,6,30,207,98,194,214,109,18,11,146,153,197,15,144,15,0,27,173,80,85,20,98,65,54,179,104,66,255,242,0,200,149,44,53,197,229,58,191,106,68,53,162,149,18,210,53,144,116,241,58,120,231,33,124,10,32,211,227,30,80,77,87,220,146,112,186,59,55,83,58,106,37,98,157,172,23,58,57,205,
+163,231,161,228,82,122,1,156,9,47,73,167,2,173,239,165,88,187,111,155,62,110,180,212,105,1,108,165,62,95,1,84,142,159,87,212,35,84,21,160,16,174,197,237,38,129,6,64,38,139,214,122,174,183,199,18,206,192,231,52,52,27,210,114,44,100,200,93,199,7,100,41,219,166,239,8,111,77,125,16,9,197,97,54,121,10,118,9,239,221,114,186,107,49,113,207,89,241,30,15,244,23,213,72,221,141,238,136,141,175,110,102,193,249,3,73,60,81,0,96,243,33,23,141,6,160,200,91,220,183,12,23,159,29,96,246,13,98,160,111,255,82,189,23,171,15,232,247,44,181,71,230,186,250,228,140,103,129,25,69,53,173,171,227,174,54,248,194,203,114,175,161,75,249,152,230,123,42,64,39,95,207,58,216,194,148,168,200,0,146,140,110,161,195,70,232,123,16,84,164,119,45,81,118,72,75,228,19,214,116,224,118,179,242,40,77,252,226,195,91,17,11,34,54,124,71,141,200,7,126,224,187,87,144,70,103,65,95,204,179,183,114,22,230,150,145,216,216,67,154,186,106,100,42,140,192,
+91,112,67,51,45,185,93,140,52,170,2,233,214,187,234,12,3,145,133,12,212,107,111,87,99,164,174,25,190,112,105,133,179,133,117,100,118,105,22,238,184,187,215,50,182,210,119,79,90,83,219,174,171,115,0,173,45,141,12,172,7,79,29,34,211,109,137,2,50,227,72,12,44,231,148,9,200,183,84,202,17,145,32,166,99,113,188,197,103,36,250,85,64,229,176,219,6,138,176,135,221,54,111,226,210,146,90,19,151,144,142,35,238,59,224,43,196,207,254,76,219,108,8,247,94,110,12,16,92,152,69,144,201,132,48,165,103,141,32,232,236,4,132,219,172,47,95,28,198,78,0,41,251,26,44,238,63,234,161,105,219,1,171,72,160,40,105,30,113,32,205,141,10,228,171,31,158,92,160,226,60,42,19,119,40,217,203,251,184,181,59,51,172,82,167,58,107,38,35,183,174,138,97,200,241,101,102,243,157,97,99,236,154,19,41,27,204,109,97,37,45,15,211,109,92,193,232,28,144,126,188,160,27,115,66,208,62,191,203,232,138,82,152,125,131,14,164,216,31,76,71,124,66,49,44,16,
+21,24,74,187,208,106,35,235,48,122,113,214,50,9,41,104,193,242,172,165,143,85,245,106,34,155,109,82,197,156,153,134,85,177,0,56,0,37,3,9,250,79,122,249,141,33,29,100,63,57,165,211,204,18,50,105,221,247,128,10,241,68,115,192,107,101,44,26,140,239,89,158,137,106,120,69,43,191,147,225,220,198,158,89,81,158,163,169,24,199,233,2,154,110,251,9,0,193,232,205,97,7,143,146,36,135,85,197,235,157,192,217,116,94,0,215,253,82,22,49,242,156,242,208,128,162,51,21,207,68,15,24,93,160,61,36,12,199,82,185,91,150,67,222,6,250,186,92,13,11,116,70,135,221,189,201,149,242,22,148,83,167,112,122,175,240,47,250,157,252,200,83,124,75,127,115,171,216,179,5,143,223,75,88,82,70,196,11,153,168,150,151,112,174,117,150,39,102,168,198,155,223,69,105,66,83,34,117,1,91,123,93,147,28,10,157,233,28,163,12,177,40,210,206,110,61,159,85,0,120,51,35,72,211,65,160,70,11,127,176,12,167,2,234,180,127,13,95,242,108,111,130,175,242,44,214,
+227,122,209,47,34,27,102,233,147,75,36,189,75,190,93,118,131,89,87,148,121,209,21,13,136,166,246,90,158,53,183,217,238,204,116,151,109,101,118,228,88,203,201,113,186,116,234,173,239,4,129,141,70,8,122,36,106,220,231,105,11,132,73,103,179,217,198,91,155,160,124,50,127,164,45,129,106,48,43,147,25,21,148,40,167,229,154,54,139,151,0,148,26,33,234,175,229,196,240,2,129,177,43,23,13,64,15,254,204,137,253,91,248,233,11,154,4,231,51,56,184,243,42,219,91,76,191,144,126,177,222,180,87,171,78,233,193,215,68,39,67,75,195,15,92,186,209,163,98,45,209,25,122,78,227,60,75,182,152,131,81,145,4,186,49,245,98,25,139,233,38,15,89,2,219,79,166,138,133,100,167,2,232,63,169,95,53,174,82,121,200,44,166,37,146,53,17,15,38,145,78,181,172,64,116,98,203,220,148,33,100,230,109,222,163,92,16,218,213,164,114,192,75,182,11,61,0,18,219,214,254,64,11,244,237,6,205,45,121,194,83,243,69,82,252,55,241,88,143,190,65,57,93,36,234,48,
+63,146,182,160,90,118,175,5,24,55,27,223,129,17,155,47,33,178,146,43,15,221,241,187,239,152,247,33,75,53,120,252,27,248,141,85,107,248,148,85,172,116,143,211,196,51,103,17,189,218,6,160,201,246,112,174,13,169,139,32,106,4,162,120,161,215,138,15,154,34,194,112,96,214,76,57,65,230,179,40,67,13,29,203,83,50,120,124,140,158,27,64,31,159,16,143,143,129,43,169,29,159,182,12,220,100,135,152,206,131,223,240,28,244,165,200,59,45,9,33,250,97,77,91,23,203,30,8,21,100,109,81,81,17,172,163,186,234,115,200,137,126,238,214,251,188,131,194,161,178,181,37,156,196,233,83,30,193,253,182,0,146,18,25,212,216,136,139,135,4,194,60,228,87,62,52,215,197,172,150,30,78,238,106,181,184,185,193,110,144,25,31,134,7,158,163,195,131,83,150,72,192,121,57,81,39,231,0,41,220,140,94,106,226,61,202,53,68,101,196,165,151,135,170,159,11,249,211,31,6,184,149,46,245,34,126,219,204,39,81,157,243,175,196,168,42,53,254,19,22,228,23,210,106,132,195,
+234,96,252,183,247,88,127,132,239,174,224,66,91,125,5,7,241,231,232,178,70,2,47,228,171,224,47,255,100,194,147,225,166,10,48,137,199,132,14,235,210,74,160,149,136,32,152,215,26,102,153,179,2,198,164,244,81,195,103,39,193,139,147,3,13,48,103,151,80,81,128,14,228,227,88,255,48,60,32,151,147,8,92,181,28,1,52,241,73,97,51,170,222,37,200,228,197,143,6,255,145,15,64,228,191,155,63,80,62,132,96,188,29,223,245,7,132,138,226,95,219,191,128,146,98,132,19,211,224,99,225,102,136,94,33,204,103,151,133,197,180,174,169,85,197,111,197,165,131,125,147,7,181,0,208,168,144,92,72,103,17,33,226,167,214,36,191,125,247,126,211,30,179,200,251,48,140,75,212,32,172,236,225,244,171,16,124,203,126,213,197,138,50,253,179,151,147,40,228,22,138,215,46,118,54,117,182,139,83,142,123,14,250,219,108,206,177,44,3,58,8,123,148,195,107,167,32,169,150,8,212,176,241,101,39,146,210,160,73,231,60,155,61,133,34,66,145,6,129,202,106,239,212,203,57,14,
+3,40,241,159,222,213,252,172,138,207,191,40,125,26,97,199,167,195,155,180,164,138,210,206,193,127,0,216,69,115,99,0,42,23,116,176,187,153,109,94,209,96,252,51,90,209,90,216,39,215,240,50,6,153,200,166,181,78,71,88,74,157,72,191,199,242,15,235,68,0,116,202,86,239,77,180,30,233,190,211,239,148,34,225,51,149,208,20,64,210,126,242,28,73,251,10,164,206,83,245,6,135,64,250,113,29,97,134,216,12,53,217,241,189,151,160,145,121,116,140,234,72,235,96,48,122,116,76,23,58,58,134,103,254,219,253,246,140,190,190,14,165,95,197,66,111,4,105,114,117,152,45,72,68,32,179,37,166,52,149,146,238,201,169,234,177,69,253,209,143,88,164,249,37,20,118,225,7,174,27,87,1,222,72,226,52,218,86,47,114,139,168,35,154,160,172,31,130,199,112,39,174,16,45,31,85,197,251,247,198,123,75,246,32,80,157,21,253,209,188,81,146,58,75,24,199,19,89,194,82,79,29,11,120,60,195,11,101,226,165,66,181,192,36,136,68,180,164,156,22,133,132,242,108,224,58,
+96,135,116,3,111,88,81,83,16,10,242,153,95,116,12,67,160,136,140,150,1,218,215,43,135,165,161,230,127,248,120,189,130,72,218,50,61,196,182,102,93,245,111,232,143,254,93,98,20,241,240,18,40,12,218,184,131,100,172,44,25,62,202,138,60,232,111,216,1,105,115,170,195,77,167,182,56,201,168,2,253,175,151,63,196,185,65,41,255,112,246,212,144,243,101,189,53,98,95,178,254,71,46,125,98,196,106,105,137,56,140,150,177,200,124,85,29,236,126,103,168,236,69,247,249,66,229,194,152,177,24,109,189,219,234,38,91,215,105,41,239,70,60,246,113,140,158,28,190,239,208,82,80,150,46,102,142,125,231,144,229,251,157,150,6,111,160,177,210,140,93,92,116,216,215,63,217,193,37,61,238,219,4,207,19,22,222,107,80,149,123,162,89,177,166,48,12,81,143,134,239,163,110,204,88,168,107,148,182,152,65,38,196,59,18,139,195,250,199,165,166,104,59,108,231,180,36,158,99,57,139,233,28,202,118,193,3,116,248,107,30,99,140,8,100,166,176,136,253,66,135,58,120,255,241,36,
+189,249,8,59,178,82,46,140,55,75,145,0,53,123,39,137,76,212,108,57,155,105,145,114,179,235,251,177,78,175,14,142,7,141,205,232,233,111,164,233,219,129,158,221,130,2,190,217,98,79,103,201,239,4,196,110,100,44,200,56,242,132,18,115,107,145,32,33,240,74,36,31,215,87,168,234,195,31,40,194,223,29,155,97,132,200,111,232,145,98,60,122,170,251,74,119,114,196,253,27,144,34,18,104,87,210,132,197,251,88,68,255,206,139,180,108,191,1,185,26,55,72,244,191,166,80,168,187,236,208,146,187,72,198,242,57,163,211,1,242,137,218,15,91,12,44,0,248,38,124,36,44,171,18,238,228,242,10,122,89,7,217,143,155,147,130,246,18,156,127,124,93,12,94,75,165,117,136,58,48,82,90,20,244,131,108,160,249,234,26,180,3,123,39,8,123,54,59,83,145,94,253,250,38,85,115,238,213,201,69,165,64,36,119,132,79,242,215,108,63,227,179,43,133,107,58,71,41,171,218,106,195,102,248,123,55,37,63,4,161,123,95,203,178,31,202,109,223,48,119,95,13,237,70,125,186,
+162,104,27,147,55,223,19,112,81,210,216,167,41,183,102,47,44,201,148,123,202,149,99,246,33,131,214,225,140,228,89,185,235,147,128,146,18,103,25,247,236,77,184,52,73,195,242,234,150,99,88,234,32,231,116,107,148,84,116,114,213,100,22,72,141,75,26,14,63,236,177,172,212,35,131,141,234,237,185,59,154,154,166,166,171,132,161,125,120,31,253,238,212,239,36,34,53,179,24,223,52,166,23,192,61,186,139,21,216,211,9,215,167,66,233,143,183,43,252,112,243,197,63,255,63,127,241,87,255,238,55,127,134,222,0,129,94,57,113,184,28,227,167,203,50,126,184,248,225,183,254,205,95,254,229,225,250,149,31,175,124,248,203,227,221,13,191,245,131,144,255,245,135,91,69,254,205,175,127,113,184,89,228,87,255,246,47,126,246,247,126,245,87,63,251,197,255,245,203,95,163,87,99,252,253,159,46,35,249,245,191,253,229,111,254,248,207,126,241,107,244,6,141,31,47,103,249,147,95,254,233,159,254,226,112,235,196,65,145,95,255,12,189,228,226,167,31,15,87,81,252,250,160,218,111,253,
+199,215,118,252,243,227,205,40,191,254,253,191,190,104,226,112,113,203,207,254,253,191,255,237,223,254,249,207,127,255,231,191,243,123,191,251,251,191,247,143,127,251,119,255,235,159,255,147,127,242,79,255,236,183,255,233,63,251,123,63,255,71,191,251,247,127,134,182,253,47,14,119,126,252,171,223,255,253,31,254,245,223,252,201,159,252,242,55,191,252,213,95,252,209,159,255,236,207,127,249,191,255,213,31,253,213,47,127,241,235,191,126,250,15,127,246,7,191,250,215,255,26,209,5,249,229,159,253,252,240,219,207,254,135,127,249,7,63,62,255,217,191,252,111,255,197,143,255,255,15,127,246,235,227,189,36,191,249,171,63,250,65,210,191,67,199,138,222,242,129,254,23,25,254,159,253,236,127,254,131,63,252,7,127,248,15,254,218,40,127,45,231,63,145,249,135,255,219,111,126,243,167,63,9,254,169,217,127,255,63,254,119,255,203,95,255,235,95,35,38,251,183,191,243,243,255,207,118,136,192,223,250,147,63,255,243,159,218,29,58,254,228,153,63,251,35,196,237,127,249,139,63,254,37,98,130,
+63,253,197,31,253,230,223,32,145,240,163,226,127,242,203,191,250,197,31,255,230,207,15,35,65,133,28,130,225,215,255,249,23,29,52,255,143,223,246,175,254,195,127,248,201,121,71,15,253,35,196,67,255,228,31,255,254,239,253,238,127,245,143,255,14,30,250,131,31,21,253,213,95,162,142,250,187,123,231,31,254,79,191,249,73,141,63,250,201,207,127,252,31,11,60,68,221,209,51,191,245,255,84,246,31,253,14,170,236,239,161,225,244,219,127,7,101,255,197,225,82,151,255,223,170,254,225,127,249,23,191,250,243,95,253,31,191,250,207,68,211,223,148,137,94,100,243,23,63,141,1,153,179,127,155,238,135,91,87,254,214,11,96,254,179,183,173,252,252,247,208,219,86,126,231,183,177,184,44,22,70,111,91,225,254,141,219,86,204,74,232,113,219,46,69,201,84,30,155,83,14,190,186,248,24,19,238,140,191,161,80,13,117,188,64,34,85,37,66,194,18,163,113,133,197,39,191,175,249,109,74,16,79,81,104,194,201,155,222,203,125,202,148,108,68,245,218,92,46,244,224,55,194,218,246,40,
+38,122,230,133,89,118,159,189,192,52,132,54,137,125,180,219,85,172,93,142,55,39,128,145,96,48,123,137,110,175,78,67,51,248,98,180,213,84,70,149,245,110,239,238,153,98,171,253,164,119,215,203,65,85,75,203,179,95,121,98,198,61,91,124,227,157,86,109,214,189,104,31,61,239,8,71,209,168,125,33,158,233,243,159,236,202,166,54,181,190,236,59,48,167,63,82,244,190,105,207,185,17,189,106,157,178,42,150,253,174,14,50,158,202,59,134,55,40,126,6,62,105,154,44,70,24,149,109,154,229,111,221,195,247,237,71,119,183,112,113,222,44,164,112,143,158,82,246,123,233,88,233,66,244,32,189,87,110,111,247,14,163,72,178,155,99,58,150,197,179,82,192,145,41,217,116,131,172,186,197,233,108,238,225,87,223,16,223,125,213,182,145,229,124,20,17,47,70,107,147,206,99,43,173,154,163,150,114,59,142,89,241,123,79,219,178,111,220,156,151,144,202,14,239,39,83,110,185,178,5,25,208,221,192,79,81,188,116,223,3,222,245,20,65,240,229,154,38,159,157,201,134,59,215,154,195,
+232,244,106,234,149,251,235,185,180,80,174,190,38,207,81,250,96,89,103,239,187,44,59,94,248,253,37,182,171,73,174,58,157,134,97,159,5,253,95,215,64,7,0,34,162,233,115,252,70,229,142,62,95,59,13,31,204,83,95,204,113,247,45,54,179,73,194,136,42,21,176,150,199,207,161,233,82,47,75,118,73,35,226,243,222,176,38,117,176,15,73,204,139,211,86,217,223,202,173,171,197,150,167,166,246,141,187,26,221,86,27,231,45,240,77,146,36,206,111,190,122,90,249,90,184,139,230,149,45,186,241,52,240,32,216,7,117,54,189,225,20,161,138,70,193,112,199,170,120,45,70,46,143,250,181,47,124,139,239,186,138,64,141,118,191,75,70,109,187,86,125,50,163,15,28,115,28,41,105,161,7,70,165,237,122,221,124,234,166,103,69,117,206,125,27,131,130,133,205,200,209,76,225,122,254,81,237,38,157,210,23,118,23,162,37,61,105,37,116,159,136,227,170,237,218,166,27,184,35,144,38,233,12,206,219,86,214,234,213,111,47,251,41,145,182,2,34,133,236,187,43,36,32,101,159,248,
+133,98,162,119,42,239,187,14,92,192,181,181,238,67,155,180,244,194,192,142,219,167,93,81,70,119,110,212,187,71,49,194,250,54,101,29,212,78,98,21,206,229,158,111,222,127,118,7,160,196,176,89,77,205,59,67,100,246,113,238,17,47,227,81,106,227,93,212,187,60,191,185,89,48,102,59,67,243,237,169,193,174,109,43,251,13,239,122,14,220,51,95,119,0,112,123,205,81,83,88,61,227,87,163,185,93,15,191,51,59,121,67,172,52,241,237,111,236,53,135,182,25,216,174,7,11,83,108,38,227,208,207,107,251,239,254,10,151,219,62,201,54,107,3,17,23,84,167,10,129,77,200,225,157,183,229,151,26,242,44,230,2,80,142,173,8,236,198,54,217,247,228,3,251,240,149,36,32,18,27,33,227,199,66,39,220,84,232,163,254,254,213,162,25,121,98,211,165,98,16,182,185,134,95,95,142,156,193,61,209,104,95,122,177,215,194,226,9,234,170,215,134,117,183,39,36,215,140,237,245,36,118,81,253,140,140,170,155,173,145,52,178,175,137,116,201,128,102,221,85,202,118,56,182,51,36,
+39,31,246,40,198,213,142,79,137,198,168,202,194,40,59,206,222,61,119,198,249,182,204,161,198,135,204,26,27,243,73,10,186,226,152,251,167,185,7,230,123,163,227,172,67,145,149,8,172,134,72,203,180,110,44,60,211,122,123,87,170,175,247,243,145,248,219,249,81,179,127,175,61,115,75,253,99,228,252,44,217,22,195,189,78,48,223,251,63,157,89,207,38,10,147,168,134,234,214,162,201,14,95,30,250,203,237,133,182,210,254,86,188,244,106,166,246,44,149,118,47,231,166,125,47,62,169,26,167,245,100,103,134,91,102,247,34,167,45,16,223,180,166,102,131,51,34,25,58,39,39,54,245,57,181,49,188,228,117,237,13,241,184,130,121,98,147,13,213,111,153,127,166,188,1,0,6,111,123,130,153,37,140,251,243,64,213,114,73,90,155,182,175,212,198,114,63,170,236,183,241,189,60,249,244,37,241,124,74,138,30,241,102,156,163,239,38,67,29,105,215,126,88,211,246,107,63,180,223,110,27,224,213,218,51,174,192,58,207,102,13,147,12,121,143,187,121,45,23,196,106,195,77,155,183,168,
+124,133,214,206,248,118,39,241,76,225,139,212,172,77,28,63,38,61,57,106,99,199,100,86,222,169,12,205,162,237,214,48,153,219,221,205,250,100,17,122,179,85,204,35,215,7,101,151,186,240,134,59,194,15,42,16,234,224,168,74,32,228,152,157,23,216,118,145,77,105,57,129,232,187,170,216,17,192,217,246,146,221,118,191,179,209,118,31,239,91,146,123,149,222,61,212,54,57,216,227,88,21,154,184,156,182,60,14,126,141,215,134,178,227,203,37,146,11,226,34,143,97,210,28,244,230,149,89,81,92,8,87,231,139,165,50,16,53,124,23,203,222,234,210,51,179,99,54,169,154,196,111,101,100,130,213,201,34,186,162,75,20,15,215,123,9,47,141,197,223,16,83,131,13,163,191,153,220,22,41,107,169,140,110,4,128,44,144,32,146,47,172,157,167,192,124,59,161,241,94,239,66,186,11,185,100,243,185,24,171,107,175,179,143,128,117,177,139,110,66,186,92,77,235,90,188,203,5,54,177,193,221,235,191,244,170,18,219,40,148,158,87,190,54,176,99,203,244,172,222,31,170,97,219,208,253,
+45,111,239,191,91,23,187,47,243,250,3,177,206,153,51,39,166,54,236,95,101,239,238,237,171,55,81,218,183,67,230,210,246,158,154,4,109,146,173,149,243,222,206,93,44,230,251,134,105,191,160,71,140,184,224,171,188,177,125,91,223,247,54,219,156,76,168,46,52,247,227,146,199,227,222,51,3,144,200,232,142,142,240,126,194,162,120,162,1,128,83,50,70,168,85,76,232,84,162,113,211,78,207,113,146,117,205,183,139,111,96,12,189,122,110,211,60,242,119,66,211,119,33,218,75,111,243,235,66,32,60,238,174,13,171,164,115,72,174,110,232,37,78,21,23,28,98,110,136,44,74,108,57,40,218,230,134,97,97,93,239,113,52,133,237,153,103,102,166,43,92,190,54,174,22,149,236,7,205,81,206,66,52,94,48,22,22,9,51,62,251,136,165,157,139,145,189,235,185,105,200,27,26,201,164,236,225,235,102,150,244,180,181,249,234,135,233,6,237,230,134,182,125,171,100,207,16,123,214,139,39,68,227,116,187,46,172,145,136,90,10,196,134,253,106,5,237,151,223,51,189,128,156,19,217,195,
+223,243,193,90,191,127,113,188,109,191,39,147,121,181,245,57,22,147,107,223,244,135,82,124,247,174,161,149,28,54,70,109,215,34,174,231,82,59,166,124,111,237,246,176,152,103,4,1,151,21,81,112,62,237,92,108,148,93,230,104,83,175,60,9,170,226,115,158,71,52,121,121,129,65,201,4,103,143,109,150,159,176,96,17,42,154,31,120,61,203,170,197,151,152,181,174,82,17,147,65,114,177,55,233,141,21,74,117,169,198,179,27,204,96,36,38,119,11,156,56,167,119,141,88,101,123,23,141,162,183,109,62,190,19,62,180,31,122,163,197,156,61,47,127,134,107,85,247,254,98,255,14,197,31,46,5,175,225,81,82,208,125,37,172,219,146,198,125,228,221,2,157,110,18,85,227,102,240,36,217,61,210,109,233,128,115,94,147,184,239,163,212,27,1,231,52,240,178,187,175,189,207,61,55,198,91,133,228,21,189,188,117,155,222,84,132,28,73,248,92,209,190,73,187,167,91,123,192,104,239,178,148,217,77,103,183,89,178,107,28,118,35,188,89,25,246,182,115,157,192,253,154,115,212,92,201,
+199,243,253,60,144,214,135,102,81,139,99,82,177,73,54,171,199,15,185,15,194,0,192,227,141,231,156,61,174,134,134,87,19,106,244,123,173,201,121,190,159,94,54,100,131,100,181,78,35,49,170,173,141,191,102,169,117,213,85,186,124,169,146,37,182,111,46,82,54,56,247,23,243,193,62,219,217,34,238,115,182,197,178,169,60,231,222,86,188,19,99,73,170,220,95,216,211,152,27,112,12,63,76,200,251,107,167,7,51,150,214,214,205,57,143,165,169,57,103,132,15,241,140,20,120,122,88,147,94,236,246,205,254,155,129,143,12,222,199,123,220,75,64,178,211,216,231,192,38,52,218,209,167,245,238,215,42,102,253,210,185,37,246,222,178,180,51,199,214,27,109,111,238,30,89,180,30,73,47,46,38,189,219,30,154,185,236,35,85,185,111,197,38,134,109,217,176,170,211,63,42,47,156,154,201,118,54,86,42,61,179,247,180,178,58,109,78,183,62,155,219,194,215,175,183,119,134,248,172,171,243,104,230,251,86,111,183,137,239,61,23,58,141,14,218,114,232,46,166,251,187,86,219,174,36,158,
+175,168,92,176,222,65,53,185,134,190,109,215,26,87,105,255,40,134,176,54,246,251,35,78,160,225,213,88,60,193,43,103,105,40,47,71,4,141,173,233,158,205,16,4,113,213,246,186,240,200,217,217,189,56,27,35,183,242,130,184,144,219,220,159,221,247,182,75,95,249,212,202,7,202,188,118,176,111,85,109,146,245,119,197,38,250,150,95,220,122,102,67,169,114,144,143,122,168,227,242,189,99,158,95,216,46,95,155,189,253,252,190,85,36,157,225,214,229,128,123,101,153,126,109,76,156,81,223,190,223,155,242,188,215,105,243,137,224,108,125,75,191,239,5,217,182,39,44,249,178,189,116,237,93,18,121,179,245,52,232,99,196,14,139,249,119,135,95,91,53,212,120,146,56,183,73,50,75,158,124,113,21,250,234,186,135,92,246,183,123,251,93,177,60,182,37,61,247,70,163,40,234,228,90,183,216,125,63,160,126,239,89,21,151,80,47,32,196,192,44,27,33,217,39,231,250,109,231,150,64,223,4,3,193,135,11,161,241,97,170,105,235,54,176,156,139,228,192,254,44,103,216,85,236,205,235,
+166,192,182,140,91,91,205,84,91,239,42,79,223,199,2,122,105,91,221,149,221,19,250,218,54,44,4,182,75,185,199,101,179,49,210,139,8,85,210,40,212,68,53,92,80,65,109,240,22,129,18,55,216,34,142,187,87,56,251,71,235,54,38,252,218,202,198,234,158,241,51,212,166,215,28,221,228,211,227,103,197,78,167,209,87,185,93,66,59,146,181,2,118,14,121,18,63,23,78,202,1,72,147,194,207,200,108,104,86,154,4,148,59,88,230,156,205,93,151,238,221,166,134,117,11,221,250,44,11,184,146,94,232,247,120,111,87,75,91,191,46,210,169,171,209,216,109,115,213,191,68,174,182,206,211,142,170,215,78,4,228,17,140,215,171,92,90,113,110,20,22,211,92,203,39,82,214,96,231,126,205,176,109,109,127,191,40,190,219,227,235,106,79,34,89,73,172,59,195,4,143,91,14,182,147,211,165,242,235,17,69,87,58,212,38,178,220,34,193,107,23,19,241,156,17,141,75,129,31,161,253,74,1,165,121,115,91,105,200,186,31,87,155,225,83,119,69,235,34,243,229,171,250,200,180,156,
+155,151,149,254,59,142,174,219,189,234,33,230,133,174,86,153,190,237,185,238,135,248,126,189,63,71,52,22,179,21,177,141,231,21,7,0,94,157,117,245,234,224,187,135,246,209,205,54,167,26,149,86,11,193,197,200,191,155,32,25,233,94,107,150,216,220,187,230,42,23,55,184,63,62,23,111,243,93,237,115,10,77,36,142,221,119,236,110,225,106,73,30,247,205,23,143,197,198,16,228,116,126,229,232,161,191,147,198,119,67,62,70,107,120,248,48,41,36,130,51,15,110,220,90,108,26,166,236,126,210,232,15,42,151,30,4,246,54,223,122,92,105,130,76,142,247,116,219,176,121,251,88,190,47,183,113,150,197,16,119,173,246,125,89,188,69,247,108,107,244,54,249,1,133,234,136,228,226,34,168,142,101,196,238,93,162,221,150,112,123,219,215,128,103,190,221,47,231,249,226,24,137,209,40,187,255,242,158,141,244,6,10,114,60,235,126,102,149,244,2,247,247,131,103,19,146,4,132,139,211,180,206,176,27,151,232,109,66,27,167,103,233,78,145,218,161,195,205,113,94,31,26,41,183,228,230,
+230,227,99,104,139,11,111,23,227,156,214,77,254,152,133,71,187,180,30,22,132,109,238,183,102,101,105,40,45,115,93,205,136,246,189,196,104,106,211,188,251,49,182,45,52,77,187,237,106,173,220,155,12,174,125,93,101,199,220,24,153,215,193,87,245,126,155,247,14,98,37,158,135,96,82,192,146,37,149,170,93,236,157,245,160,103,153,18,79,155,128,123,213,220,187,155,34,174,82,255,157,86,138,171,223,159,129,238,212,176,9,62,121,68,238,245,103,122,253,182,190,18,84,103,157,86,193,179,200,59,176,202,217,199,122,117,223,52,236,104,187,93,147,95,9,123,206,245,122,118,90,216,89,133,55,111,241,81,136,28,137,157,45,155,105,247,164,161,233,238,45,162,239,174,228,75,55,202,232,219,116,143,221,101,91,175,190,246,219,98,119,55,19,91,102,22,167,37,68,222,172,134,74,126,234,197,209,250,142,159,119,123,167,64,194,158,180,64,116,220,125,64,113,77,207,140,24,44,205,78,237,184,223,184,223,119,241,156,123,50,112,147,107,174,17,88,72,167,78,151,111,181,253,71,219,190,
+43,239,91,227,201,204,80,218,229,172,156,236,66,232,88,13,212,107,157,193,177,244,114,226,193,154,114,255,189,119,108,247,247,130,125,171,107,9,108,152,35,78,96,183,92,6,116,17,106,67,72,106,19,119,99,24,179,28,177,116,77,15,217,100,115,140,234,79,27,182,178,71,28,63,175,103,244,161,251,235,238,221,85,18,7,132,159,167,58,158,114,63,11,235,226,253,0,194,101,212,129,218,38,58,152,134,202,193,234,142,68,152,45,158,135,59,227,171,124,189,121,142,198,21,239,125,119,227,74,228,147,148,198,10,167,73,25,240,108,59,147,73,83,50,83,47,223,141,246,151,83,69,64,31,16,207,108,93,76,97,120,37,48,216,61,130,239,238,185,109,95,106,85,100,142,216,22,158,79,85,3,70,77,51,204,233,160,170,161,206,109,239,131,110,142,24,0,196,39,250,61,246,205,219,29,235,10,19,198,108,169,89,228,246,27,241,118,18,115,32,106,175,31,244,27,232,29,42,113,109,134,130,245,123,214,13,243,115,30,184,11,231,244,113,207,246,156,163,169,221,143,86,89,246,188,54,
+142,220,109,47,92,219,189,221,35,119,174,178,158,82,121,254,213,88,212,86,207,23,98,142,179,91,241,198,220,183,126,27,67,183,71,176,200,88,115,105,108,140,62,241,251,181,37,21,212,38,108,166,108,184,236,35,3,247,11,103,59,101,122,188,205,189,6,21,35,247,204,42,139,173,105,166,149,146,136,158,53,183,118,30,110,210,150,147,117,117,105,90,108,197,203,178,126,34,217,159,123,12,171,11,167,97,59,234,138,109,238,126,92,190,42,45,202,214,153,59,44,174,186,22,41,246,133,33,226,238,126,97,219,122,145,114,63,149,219,196,206,105,161,21,55,136,239,154,241,83,117,96,211,171,61,239,101,187,126,103,40,109,123,244,72,237,147,241,26,23,222,55,43,255,85,113,85,216,144,18,116,199,242,43,35,246,182,202,43,60,44,93,27,241,192,189,191,83,73,240,128,122,81,197,50,194,211,61,187,246,157,158,232,70,174,89,222,25,255,86,251,43,109,209,119,206,14,42,43,179,216,100,228,152,173,237,53,87,187,80,171,58,214,207,206,218,231,227,110,81,253,164,140,92,187,181,
+186,182,29,220,213,10,208,220,84,219,66,119,53,199,114,153,118,207,88,209,203,253,100,60,37,228,60,5,83,95,26,216,13,147,41,239,181,70,18,27,225,190,27,139,71,26,130,197,113,35,169,236,216,229,158,9,55,18,153,228,14,0,92,64,231,116,62,184,20,44,118,29,38,201,189,142,62,236,55,217,201,190,79,232,123,68,158,70,219,115,107,154,181,221,251,80,124,159,220,201,61,23,146,113,191,115,17,183,207,13,214,221,126,98,112,53,148,251,116,148,188,135,53,6,199,234,94,163,148,204,56,237,145,109,7,79,172,219,151,201,232,250,27,138,187,62,7,84,39,194,227,158,28,184,116,129,45,120,157,47,38,21,11,61,202,171,81,150,54,159,131,212,64,16,43,238,71,96,236,89,174,201,76,230,8,204,91,252,192,222,201,1,234,143,253,202,119,6,94,181,147,244,137,107,28,176,109,72,164,72,219,98,58,119,237,158,78,36,174,105,163,36,118,87,54,118,6,11,211,175,85,109,251,218,253,133,193,32,185,219,125,168,16,10,172,31,185,119,87,179,150,117,207,154,228,21,
+130,208,13,133,227,158,118,135,0,41,198,219,126,52,1,80,22,92,144,1,66,198,170,215,110,55,219,181,161,144,115,127,213,86,178,206,88,242,21,15,74,202,43,92,167,242,40,209,238,163,226,70,181,252,189,237,108,72,109,253,222,100,111,123,140,59,77,90,246,28,244,182,88,47,70,101,113,222,158,182,196,21,65,108,213,98,142,154,151,108,209,58,238,87,4,7,100,30,66,49,91,209,235,177,175,58,211,187,107,163,207,15,202,251,126,124,79,0,0,158,105,1,136,239,3,155,90,157,207,15,183,121,228,201,190,41,96,27,7,140,118,191,188,255,88,21,159,26,233,148,39,167,28,92,78,224,135,222,221,158,166,216,50,118,81,233,246,169,39,109,87,45,44,27,195,114,26,124,120,30,134,173,94,225,102,249,120,122,6,208,88,150,17,64,86,230,241,245,155,7,171,115,221,207,33,163,32,167,77,205,166,83,178,74,171,112,129,154,67,83,216,75,233,232,87,28,134,231,11,229,136,18,219,108,166,184,254,232,77,138,174,48,221,94,94,162,212,24,160,208,137,232,5,165,204,39,
+153,224,117,179,223,248,137,138,112,223,42,120,8,98,32,227,42,137,189,165,188,177,30,130,81,191,231,108,81,167,201,119,153,174,89,202,228,181,82,105,219,215,105,79,49,160,220,75,38,234,169,194,118,69,103,119,180,176,199,120,199,112,220,122,86,126,63,125,94,86,59,79,145,199,226,83,251,236,240,88,107,70,30,155,25,149,198,208,17,140,21,51,122,158,181,44,122,205,127,25,108,65,251,233,86,216,72,174,247,204,7,12,165,74,241,37,89,221,138,201,238,96,246,238,88,213,44,119,49,124,98,241,178,163,49,123,21,187,15,94,207,101,148,103,175,7,174,152,194,163,212,252,148,220,220,67,221,193,119,175,212,151,195,47,96,227,94,110,24,116,49,41,195,52,181,166,63,190,221,76,242,8,80,214,176,148,251,230,40,85,27,13,233,15,87,155,180,214,173,201,44,108,116,246,173,108,46,107,250,137,169,254,45,88,106,49,253,131,123,182,92,47,192,228,37,131,36,245,121,208,99,113,53,61,136,176,199,11,167,70,171,249,254,86,250,49,146,90,86,197,79,193,45,195,152,84,
+109,79,58,151,184,96,251,77,42,198,213,49,24,149,237,65,48,14,192,26,174,97,120,202,217,61,98,163,171,66,190,84,45,191,6,69,22,224,158,137,235,210,137,143,123,163,106,171,162,98,206,85,68,3,229,153,89,20,12,78,28,119,223,182,228,3,184,144,109,249,121,161,207,77,193,83,56,118,140,214,89,17,176,186,172,40,124,243,33,149,211,154,181,90,208,156,203,189,129,112,193,37,137,18,242,211,158,85,250,32,194,93,21,50,187,90,134,141,49,119,107,197,114,139,62,55,239,133,39,162,85,126,171,137,89,162,165,59,245,224,142,227,39,217,171,102,245,54,218,110,105,213,58,3,213,65,214,100,175,130,236,106,54,203,109,15,163,39,86,133,164,138,169,79,164,176,7,156,13,207,174,144,220,39,128,185,217,76,119,182,254,216,19,211,253,245,253,169,9,62,247,192,75,61,101,94,15,128,144,167,207,183,103,38,215,163,181,180,104,151,123,53,159,123,98,170,24,9,153,115,102,178,230,42,8,161,82,47,22,173,89,131,122,127,127,215,116,78,111,139,50,198,138,172,166,120,
+206,68,154,225,190,207,178,203,125,241,128,247,53,196,181,72,102,13,233,156,189,13,183,206,50,239,231,101,28,243,204,130,168,90,226,128,112,50,226,109,188,89,78,130,134,222,250,226,100,193,13,10,2,221,208,109,156,248,94,124,24,114,10,70,223,190,31,10,246,63,215,14,226,35,98,67,153,106,171,76,174,7,181,250,229,43,206,97,102,176,172,79,86,123,42,104,209,53,173,41,159,247,186,34,224,26,56,154,94,155,101,212,219,24,28,145,177,178,171,210,158,51,221,149,137,241,16,82,195,189,231,216,250,251,40,70,149,31,225,186,5,207,45,227,134,56,29,175,165,198,245,139,170,167,142,135,233,13,117,145,91,82,175,238,64,221,105,128,155,194,194,83,34,5,255,138,40,70,18,102,231,175,230,229,3,3,179,244,53,247,119,51,219,192,18,47,76,3,22,193,82,67,56,107,154,187,221,205,229,9,26,152,226,133,155,170,25,12,56,219,55,205,56,143,23,40,102,124,13,13,141,240,160,20,145,145,91,188,70,130,26,219,140,176,89,42,217,116,118,43,185,78,14,221,210,192,
+167,64,229,174,183,246,81,202,148,39,183,122,101,11,10,171,161,221,95,73,190,155,163,241,149,36,96,9,180,136,39,91,161,196,124,90,164,95,15,200,244,228,151,228,197,187,121,215,23,13,197,123,7,51,57,185,134,136,105,69,74,48,41,227,221,49,100,96,79,175,41,175,182,166,5,92,178,72,135,207,203,206,223,166,14,32,99,60,173,190,53,20,119,196,199,236,181,111,46,19,224,174,210,17,46,50,247,62,22,167,143,137,190,105,213,230,169,92,23,33,64,88,144,173,165,174,70,49,232,216,80,122,46,5,64,137,230,47,158,144,162,239,108,128,195,125,1,70,20,38,238,99,170,15,92,82,25,8,25,34,190,151,86,109,169,114,51,106,117,48,81,21,50,39,88,244,67,172,143,105,127,32,101,14,47,174,205,196,22,22,51,189,164,224,191,1,64,168,164,98,84,162,133,121,28,80,52,67,143,244,140,81,35,97,11,24,117,4,125,234,247,219,185,224,100,53,37,98,166,94,9,5,143,54,237,53,157,183,112,109,134,121,174,75,31,3,190,91,198,181,213,135,126,152,254,85,
+39,222,50,222,48,51,53,62,161,189,67,145,202,13,208,210,59,182,202,218,167,183,136,182,174,153,204,237,238,89,69,164,233,59,210,22,169,5,82,131,118,48,99,215,249,223,90,159,184,131,98,38,202,110,45,229,144,45,88,1,22,135,246,207,2,180,167,209,245,138,87,183,18,89,156,148,189,209,63,209,89,99,126,2,225,105,16,230,53,109,111,48,240,44,144,25,236,171,193,80,144,193,199,8,3,223,181,215,21,9,227,146,110,1,247,66,168,127,153,127,37,153,253,196,201,69,72,69,124,81,251,166,198,42,125,92,110,183,200,105,187,55,33,22,224,120,219,125,20,255,132,99,233,41,207,91,45,108,215,4,184,225,23,55,75,1,124,108,85,219,179,104,167,140,182,25,20,86,233,61,46,125,125,162,196,169,43,169,236,200,101,236,141,36,151,195,23,215,133,146,219,2,195,189,129,173,233,240,84,236,183,68,151,198,76,134,169,209,109,137,240,170,134,232,102,77,154,160,126,68,226,18,112,92,220,135,135,210,192,112,84,193,96,190,113,242,45,166,51,18,94,234,133,97,133,38,
+80,81,63,6,151,21,110,207,238,104,62,94,20,139,180,157,146,76,92,61,117,162,240,227,233,242,102,34,229,80,35,37,132,88,83,25,49,2,91,38,203,208,249,72,34,94,190,226,222,66,95,31,167,112,232,93,94,128,149,60,252,51,213,71,34,166,28,253,192,88,174,157,190,136,114,86,175,249,98,17,38,132,233,225,124,255,124,30,40,54,54,25,82,68,13,115,122,166,201,238,102,144,42,102,213,69,69,184,125,61,124,109,223,226,238,150,125,227,146,188,121,191,107,201,232,158,110,250,154,139,57,87,148,179,213,80,35,156,108,174,145,66,155,165,16,25,141,133,252,244,193,230,122,45,132,56,192,254,246,142,225,73,61,59,182,175,138,125,29,226,202,181,79,109,172,50,217,45,123,91,161,232,61,197,167,195,119,31,177,175,232,124,55,50,150,119,119,183,47,223,144,204,173,29,44,153,230,37,79,241,145,73,143,47,34,22,130,149,209,9,122,27,107,192,192,25,112,99,132,52,182,143,59,197,115,137,172,0,96,14,231,83,51,122,90,131,121,108,6,50,218,57,174,7,239,32,
+125,63,205,24,95,87,197,246,71,98,241,133,68,100,93,150,100,169,173,201,198,145,15,105,219,24,97,152,32,97,206,229,215,21,111,74,105,158,100,239,24,24,234,141,231,30,119,235,125,238,34,49,203,72,188,191,226,146,32,190,67,52,82,134,151,39,43,224,250,164,62,70,126,247,12,186,31,108,21,140,187,244,93,225,69,183,5,17,94,251,21,240,34,213,212,9,14,211,137,215,137,239,162,73,94,76,192,212,165,67,128,6,96,0,115,128,92,168,225,124,222,91,70,3,104,35,81,91,76,211,175,48,64,184,46,173,42,140,171,17,47,198,140,49,138,247,68,108,66,76,169,223,48,110,25,134,224,202,33,187,139,167,166,30,25,70,29,16,35,34,131,39,38,36,204,32,138,57,36,245,121,93,178,106,207,71,55,189,95,80,240,94,183,58,35,198,98,190,67,200,124,252,14,80,48,90,176,105,123,49,126,112,234,66,41,16,147,206,207,41,204,231,28,139,242,236,124,127,165,52,116,234,186,118,232,171,200,217,31,82,100,50,93,33,15,145,103,222,57,49,181,50,85,252,141,22,
+111,45,143,134,243,213,145,124,8,115,228,54,121,97,26,134,47,78,57,39,56,245,182,239,115,86,199,237,244,54,117,97,199,84,250,37,198,105,229,150,241,82,210,166,130,84,76,217,24,24,168,47,79,12,55,65,29,245,121,157,175,26,229,172,215,229,40,59,39,104,231,247,231,57,93,182,89,196,169,133,134,7,51,67,32,127,33,240,242,60,220,124,121,118,233,28,222,203,236,108,62,246,158,94,76,35,163,173,5,29,38,134,109,166,110,106,211,143,151,222,87,211,59,170,234,23,66,117,245,141,134,141,13,156,177,63,46,40,207,179,252,5,228,237,59,197,23,137,70,70,112,9,219,155,203,243,25,249,153,111,96,113,190,106,28,169,5,126,143,251,188,27,121,55,154,240,134,114,55,179,175,175,106,87,141,127,159,69,43,154,107,107,99,48,75,101,212,238,249,157,29,251,200,77,19,30,7,160,116,104,211,111,247,84,144,114,115,239,146,131,247,36,71,99,26,49,217,24,242,117,218,44,197,53,173,26,90,201,203,54,71,83,121,237,248,233,77,100,174,159,8,45,74,78,131,104,
+108,246,30,46,213,39,241,155,45,130,253,68,208,172,33,19,175,251,148,88,213,54,60,159,97,68,108,65,94,91,26,135,148,235,157,134,255,42,222,80,66,95,195,72,26,87,40,22,28,54,217,141,100,249,53,189,196,221,45,202,142,142,224,209,35,101,103,196,120,163,141,193,190,101,208,95,131,72,178,122,103,53,167,99,101,36,20,193,25,203,243,96,56,213,80,207,33,77,190,24,190,11,21,87,143,120,216,54,242,128,100,204,185,223,236,165,52,234,179,101,59,182,51,147,63,217,31,18,234,77,254,51,126,70,213,25,109,221,146,225,74,142,145,74,18,156,103,248,104,8,206,94,124,114,171,97,227,72,106,75,228,150,248,238,208,39,230,185,165,245,249,242,235,181,152,194,21,60,46,200,244,234,88,200,213,119,170,5,241,157,85,29,128,50,80,104,54,49,166,184,134,227,249,224,80,227,205,118,115,161,200,158,128,85,135,73,26,179,169,43,217,214,217,156,248,100,208,19,83,245,239,105,106,143,25,80,111,156,10,83,173,67,109,52,149,145,190,72,130,81,209,45,138,183,162,65,
+142,65,245,208,253,168,7,123,176,240,134,210,209,92,251,229,253,252,89,56,108,210,102,144,18,230,134,229,32,249,162,89,96,224,43,223,92,110,66,2,6,148,105,54,121,217,95,84,46,29,253,158,201,48,194,8,89,249,194,21,123,221,145,186,198,244,148,62,149,247,90,18,244,14,226,134,250,92,234,102,225,247,2,21,102,87,121,252,216,177,103,10,157,26,35,44,87,174,110,217,235,182,20,155,62,179,141,19,17,239,166,231,100,214,177,7,13,240,242,211,148,55,98,243,66,27,169,223,155,125,47,120,9,10,88,250,104,202,62,84,129,12,72,232,14,241,111,95,142,190,20,246,143,71,251,219,25,50,149,38,200,92,98,221,96,190,137,81,10,70,229,121,54,152,149,95,94,239,80,21,170,43,45,248,79,137,69,25,169,35,10,32,243,214,201,20,101,85,47,247,68,199,187,26,90,142,177,161,75,76,68,132,168,39,157,28,158,38,103,235,1,62,145,218,189,134,223,31,8,59,124,29,87,4,210,104,160,223,50,148,0,141,177,62,219,158,68,189,68,180,185,219,135,52,7,68,
+87,139,179,243,21,19,160,194,113,38,106,53,4,33,206,29,143,67,245,84,6,184,5,199,249,109,66,242,237,20,95,78,47,250,235,228,128,64,113,79,211,212,203,213,182,16,149,126,37,215,103,196,119,205,201,41,2,31,204,113,188,119,215,13,20,62,231,231,197,39,181,176,110,246,100,211,201,93,248,142,26,86,9,161,253,192,192,156,206,206,244,120,89,122,167,193,45,132,138,29,141,176,86,93,62,16,112,95,28,60,174,136,233,156,216,149,153,57,70,182,73,104,118,79,74,205,94,205,24,128,21,90,127,160,35,129,197,89,78,126,22,168,17,141,155,33,146,10,249,69,241,217,130,113,124,109,80,235,196,217,163,215,121,178,2,143,77,164,193,182,226,141,80,243,71,73,70,237,213,168,225,121,110,193,207,15,176,23,169,12,84,53,235,36,155,173,57,117,167,89,222,73,115,136,200,56,65,133,32,50,176,168,144,30,110,169,62,187,220,133,153,143,190,89,71,205,153,144,87,76,42,181,195,35,53,226,209,184,39,36,206,83,7,47,101,155,51,19,128,181,233,12,22,59,166,135,
+115,187,179,154,32,181,13,59,155,220,194,254,253,124,89,185,28,165,207,68,163,150,32,221,206,164,175,80,63,81,80,63,77,223,164,105,197,174,51,105,118,19,128,51,114,193,152,221,205,88,203,25,203,156,140,157,185,104,215,211,243,144,125,105,204,133,170,161,182,205,39,27,43,31,61,41,146,206,48,96,41,48,113,81,179,195,55,19,248,212,40,22,38,94,174,204,115,76,72,122,118,113,193,200,246,55,85,91,73,168,16,211,8,31,107,213,193,114,119,55,54,156,218,45,53,193,179,96,235,225,169,147,57,165,218,204,246,216,25,77,124,16,255,130,83,168,97,82,212,3,78,29,148,244,247,13,223,94,190,162,121,113,184,59,168,166,19,117,192,155,46,183,8,46,11,222,254,194,234,25,227,152,241,52,137,244,232,222,30,253,189,79,209,49,13,73,134,191,198,99,34,122,18,86,240,127,147,247,102,191,237,101,217,185,216,191,82,240,67,98,7,142,3,36,112,144,60,223,123,19,4,8,18,32,184,111,65,128,46,183,235,198,157,219,238,50,92,213,177,253,18,156,35,14,226,76,
+138,226,76,113,158,231,121,38,69,138,226,36,142,226,60,147,34,69,74,156,37,81,28,36,82,36,115,14,89,213,221,118,28,224,226,102,122,200,239,161,234,232,236,105,237,181,191,181,214,183,246,57,60,91,138,241,201,230,179,183,85,44,154,245,35,183,66,153,247,70,97,114,38,68,187,23,161,190,146,12,152,213,31,171,177,144,78,47,48,158,37,105,157,149,146,216,101,116,30,238,52,147,127,222,158,7,143,61,242,62,226,185,11,144,230,59,147,30,40,177,38,66,229,94,229,186,207,182,97,35,75,36,246,230,205,203,43,92,24,86,252,101,152,22,236,237,148,186,49,39,217,185,148,145,33,143,192,183,75,44,175,67,204,116,68,236,187,11,53,231,252,238,163,64,234,79,87,22,193,101,190,240,9,105,218,114,68,49,117,177,120,22,134,207,93,148,10,137,139,217,21,51,187,212,173,104,218,183,163,205,174,183,107,172,94,2,169,226,221,117,87,123,137,55,36,37,171,222,118,85,163,242,100,117,166,2,111,200,164,170,134,179,90,169,93,112,246,82,178,62,83,85,195,223,32,54,
+95,73,205,202,211,225,78,211,249,195,31,234,67,5,210,22,146,155,138,143,50,93,155,170,225,203,66,53,149,177,229,1,95,77,8,43,154,173,250,116,180,231,189,221,128,184,104,90,164,206,171,140,193,180,159,200,241,74,223,23,188,72,82,79,134,9,42,55,217,114,128,74,204,42,173,26,171,157,146,93,32,220,81,104,202,230,119,60,109,123,63,240,248,139,128,170,44,104,94,61,49,79,19,202,45,54,119,133,101,94,69,245,249,240,18,109,107,28,212,1,164,139,77,188,143,108,0,177,123,8,250,77,8,182,15,254,115,170,0,243,82,140,191,76,112,109,141,230,165,22,67,139,131,79,139,253,121,62,58,8,66,218,4,133,183,83,237,49,58,234,136,142,30,73,253,90,68,5,98,20,168,19,168,15,202,253,201,126,6,30,196,197,108,239,252,42,200,85,235,128,144,140,188,225,231,92,76,192,92,120,57,206,58,120,88,70,80,176,97,222,131,100,96,2,55,17,117,53,71,75,239,205,51,34,1,88,17,98,79,97,156,192,65,10,37,61,126,208,31,63,51,222,192,14,252,198,
+32,101,97,2,209,216,63,246,63,110,219,37,165,142,99,251,216,14,249,195,104,249,236,136,134,251,51,149,100,189,2,84,239,0,136,12,66,8,81,244,14,113,75,162,15,8,20,59,19,105,213,142,177,134,141,160,110,51,62,156,19,165,154,108,210,105,134,136,170,57,48,28,189,164,239,157,228,70,94,235,199,56,35,24,118,71,216,49,81,32,99,251,20,150,172,19,255,103,6,85,33,92,233,117,231,118,198,109,17,175,219,212,247,226,241,35,119,179,85,149,179,153,60,61,113,219,185,166,251,80,13,128,3,64,19,204,149,121,96,146,180,43,191,245,38,247,137,136,99,138,251,201,95,80,207,245,58,255,170,126,105,110,81,18,205,201,163,213,70,243,210,102,249,106,30,168,10,193,163,66,87,68,169,82,80,197,48,66,159,177,125,251,58,133,80,56,83,247,165,47,203,45,122,167,77,155,117,66,161,225,96,244,166,14,13,189,163,228,183,230,25,75,195,44,125,209,70,153,116,21,212,231,204,238,74,249,120,104,220,250,98,139,3,172,73,137,131,34,129,232,168,59,6,145,144,137,
+108,241,176,231,74,15,106,194,67,121,100,148,53,115,214,215,186,202,146,68,200,3,150,162,168,122,15,76,1,93,186,148,51,7,101,8,83,90,101,185,108,78,222,57,202,141,155,54,147,172,105,20,96,16,89,68,130,139,196,215,148,133,57,72,121,20,78,44,235,199,57,34,27,187,85,54,22,165,172,165,87,177,55,105,127,163,175,227,155,58,23,163,218,119,70,161,188,44,101,41,188,199,19,232,174,223,178,195,177,49,95,28,183,151,134,130,59,3,6,232,32,12,14,38,90,76,110,237,98,215,207,29,78,184,22,71,164,187,111,204,249,237,54,208,52,177,65,66,175,56,45,5,212,26,172,74,23,229,213,135,194,71,198,182,190,118,212,5,30,121,154,140,218,198,124,94,20,192,129,18,133,248,101,46,171,200,226,169,226,240,56,234,26,178,35,149,100,136,173,224,176,99,220,101,182,250,177,64,218,209,192,156,55,210,53,62,191,86,234,243,185,221,83,189,99,12,71,95,247,206,76,63,148,1,1,52,100,8,89,234,162,39,100,111,105,209,136,141,113,91,159,15,214,116,167,123,
+211,79,188,187,114,13,246,118,195,197,73,28,170,222,144,109,67,186,167,188,68,52,106,237,26,28,158,234,147,117,185,230,43,27,10,179,2,8,4,16,71,220,109,210,97,243,23,215,240,105,38,128,179,133,124,124,247,198,113,242,187,80,248,98,34,140,67,21,112,207,36,244,33,16,167,15,116,223,248,163,187,89,68,234,64,230,104,141,204,237,29,255,12,88,65,114,100,168,175,130,33,224,62,235,243,207,238,207,33,4,8,143,240,190,207,155,129,13,0,7,48,36,68,146,49,27,92,128,37,56,5,104,40,168,222,100,192,1,226,12,182,14,15,2,140,1,220,136,191,132,248,88,156,67,138,197,162,64,137,210,223,9,99,178,79,216,197,216,6,28,30,132,136,107,106,5,206,120,77,129,202,177,131,24,156,174,26,89,24,16,182,35,40,17,70,18,208,71,203,115,2,0,9,1,233,213,112,6,98,8,251,179,135,89,237,158,59,136,222,243,145,57,127,156,216,195,163,111,186,76,44,58,183,236,219,8,24,19,222,135,221,143,66,181,232,52,154,181,155,155,89,44,11,115,254,186,
+78,89,93,115,210,34,229,77,155,77,112,203,165,116,87,216,35,193,143,13,174,156,212,95,73,53,101,248,38,116,79,15,223,132,238,29,224,155,208,189,81,244,84,209,241,129,235,219,44,11,185,131,231,237,61,48,109,224,208,78,127,239,75,75,170,230,36,53,218,54,245,139,172,4,84,63,140,162,97,135,68,148,230,116,175,46,20,235,227,246,89,185,165,54,176,71,253,193,130,161,121,166,48,159,89,136,153,168,164,154,164,100,242,153,198,218,51,17,164,138,240,116,180,205,14,227,251,247,66,79,42,165,40,119,13,12,164,213,248,88,254,134,40,167,9,72,39,251,60,222,234,21,252,156,249,173,167,182,239,153,41,211,65,158,154,134,229,89,126,196,33,121,230,241,86,213,45,211,182,122,37,85,203,127,49,11,215,105,119,44,95,137,169,154,201,158,10,78,85,156,168,191,170,34,7,249,42,119,180,156,75,166,139,14,206,24,224,14,120,137,58,89,76,16,32,7,103,32,242,54,17,71,96,105,158,129,61,156,92,164,24,10,12,158,101,97,152,214,228,78,252,110,138,177,211,125,
+170,26,107,24,127,50,44,104,219,25,239,33,248,156,131,102,148,66,14,36,240,196,188,101,104,98,115,89,242,209,39,118,119,133,53,245,117,105,38,239,211,47,41,247,83,245,54,223,220,75,181,54,198,148,214,101,215,100,119,108,199,59,125,155,61,43,153,216,232,32,33,59,220,94,64,11,74,47,123,146,113,141,194,40,205,127,160,187,239,60,154,225,42,131,140,65,122,129,232,219,69,234,160,214,198,81,209,180,108,26,101,97,178,230,8,252,63,67,97,208,178,232,12,91,70,121,107,53,17,66,251,48,231,60,5,13,6,141,117,126,73,4,105,245,137,194,223,188,65,193,77,104,80,27,184,137,4,106,211,178,188,143,67,9,126,94,219,185,43,170,125,53,166,82,151,90,20,101,186,210,205,53,20,81,27,46,108,86,110,118,44,239,226,194,169,88,222,66,72,87,23,249,172,126,17,208,231,253,234,82,128,71,181,133,92,146,25,10,97,196,158,39,16,67,114,92,207,54,58,80,215,24,83,146,210,229,101,183,249,231,119,31,121,31,66,147,107,38,50,100,103,38,215,211,117,4,
+109,117,205,170,76,8,159,20,85,104,150,202,240,214,18,200,126,66,138,27,229,14,94,82,196,39,7,107,42,167,187,31,188,205,229,14,99,37,63,214,224,134,29,14,173,250,217,191,242,145,140,84,209,32,85,131,0,77,193,19,164,148,194,59,241,93,70,10,196,116,132,86,108,192,235,77,222,131,114,34,179,187,133,41,234,197,113,155,166,51,55,34,92,28,196,27,30,121,220,118,57,199,218,67,186,80,244,192,64,188,221,144,145,199,59,63,243,217,51,168,50,236,9,0,35,5,0,94,89,132,27,200,44,241,8,182,79,68,5,0,10,41,190,166,64,165,126,147,149,130,200,103,92,212,32,70,132,225,69,120,116,168,1,207,228,160,152,174,233,105,12,70,36,165,60,8,111,206,178,137,192,234,50,136,9,138,118,82,238,216,72,201,189,42,199,194,219,175,153,16,50,210,160,36,18,168,156,221,250,202,242,18,40,130,63,65,122,8,177,188,177,7,229,115,173,160,182,89,209,226,253,153,210,9,106,230,119,159,244,232,189,119,92,212,240,171,65,95,116,202,225,70,9,128,240,1,
+52,161,169,80,94,185,177,219,112,151,32,139,31,26,157,71,227,9,182,166,217,199,115,103,161,128,91,165,131,4,253,131,254,174,70,108,204,16,229,71,163,205,1,28,0,228,165,157,72,224,56,242,190,212,33,129,172,86,60,166,186,86,250,52,82,239,118,123,89,46,90,221,175,134,167,139,213,84,49,173,137,232,117,211,180,204,47,198,170,53,5,19,5,0,53,16,99,162,4,238,51,120,155,170,88,57,144,66,124,94,27,165,168,81,145,101,235,92,184,171,125,224,218,253,32,195,163,106,202,72,37,122,109,98,166,158,97,128,188,8,30,10,13,207,178,243,78,62,11,241,42,67,225,124,104,80,51,88,87,81,31,247,81,216,82,82,70,202,86,201,119,175,111,229,176,151,56,79,149,133,217,201,166,20,66,104,155,172,181,41,144,246,209,144,154,206,146,71,53,101,19,222,192,4,253,20,87,212,232,72,29,135,161,236,11,137,244,185,152,55,171,238,151,150,120,13,106,104,194,156,1,175,151,44,4,118,68,88,54,184,53,148,172,14,86,8,107,70,198,182,44,112,72,26,133,210,
+65,21,66,209,4,177,21,218,108,234,234,7,243,130,114,6,176,112,176,38,241,35,23,164,201,40,65,42,85,53,30,85,186,98,121,142,203,173,108,249,222,184,248,142,66,234,24,56,106,209,161,140,225,83,50,78,125,54,231,106,64,192,16,160,132,138,104,51,66,141,120,195,194,35,69,80,126,44,164,216,93,224,2,143,158,67,73,2,67,116,236,144,160,68,2,192,230,247,235,124,17,208,219,55,83,16,8,92,61,26,41,66,163,131,194,130,63,29,245,242,32,12,119,238,199,124,140,8,201,161,228,218,86,9,21,230,77,44,248,115,178,184,168,248,136,171,202,240,69,24,246,60,143,102,218,60,245,86,67,116,111,151,221,54,183,136,82,184,194,42,223,148,99,175,96,242,54,78,249,166,254,224,227,230,75,31,82,238,138,27,146,171,236,108,177,85,92,227,186,41,193,90,232,213,163,238,8,175,115,185,77,160,247,230,42,229,175,221,143,46,60,67,83,230,116,217,245,40,75,224,209,125,69,50,10,237,13,206,236,142,223,121,244,250,250,228,6,183,2,131,177,67,150,77,138,67,
+110,100,49,198,9,231,141,12,33,180,43,241,154,242,13,163,238,192,176,63,61,213,251,50,234,203,174,87,232,193,216,24,193,145,23,102,23,8,81,176,23,27,68,101,132,16,181,188,49,82,242,225,122,108,59,53,52,1,71,211,45,50,52,42,86,214,189,163,152,195,60,214,220,67,101,59,153,233,115,106,47,250,132,71,239,30,215,56,75,142,93,13,241,23,66,127,83,224,23,215,157,56,161,105,159,102,147,235,171,76,33,165,218,142,221,220,207,90,10,67,198,203,238,174,108,34,100,1,183,42,176,131,144,157,150,183,194,51,75,255,172,149,28,130,9,238,91,208,227,250,84,138,114,179,102,51,91,41,53,250,68,91,162,78,171,188,206,155,249,225,42,172,126,235,19,30,133,171,103,55,80,74,40,233,51,72,151,106,60,253,105,200,188,167,216,31,131,49,40,132,21,32,153,203,27,59,229,147,221,9,81,158,107,132,150,71,38,186,137,4,172,40,174,158,36,175,133,47,40,163,241,80,72,223,142,76,156,129,186,81,185,168,189,132,211,201,243,108,235,74,227,102,172,164,118,250,
+227,211,65,95,60,75,157,151,239,159,14,169,119,212,18,85,197,206,135,72,10,58,91,61,234,47,89,136,5,38,79,69,27,197,165,152,203,131,41,242,136,83,138,53,125,150,105,204,98,237,166,138,140,180,193,171,56,75,88,32,19,77,5,124,220,151,112,171,197,31,99,64,74,238,211,42,161,81,33,183,239,219,51,65,185,117,167,134,232,213,243,134,206,29,183,63,221,78,116,183,122,215,205,63,85,32,54,118,86,47,100,138,214,230,244,211,196,244,26,209,245,11,53,22,164,36,205,61,24,70,93,64,163,35,246,86,3,103,49,113,110,171,22,43,134,33,175,168,142,23,156,41,145,246,9,45,158,52,231,221,182,149,110,228,49,226,215,211,187,113,154,198,90,121,74,86,186,141,26,220,151,85,54,29,87,84,201,187,105,83,182,0,251,92,166,235,70,253,146,53,31,23,112,243,122,49,84,146,146,246,143,253,155,53,83,98,143,69,104,1,32,4,228,93,212,243,1,195,172,107,6,211,139,249,136,75,9,198,112,5,241,239,252,98,86,131,3,246,64,11,1,34,17,137,139,117,
+0,130,55,146,238,152,42,105,220,24,35,79,48,82,12,1,232,22,27,233,164,66,183,166,209,58,10,252,184,19,180,195,40,21,196,143,93,94,75,78,89,47,251,179,194,79,131,222,203,99,251,37,23,217,226,36,13,186,195,126,165,93,21,12,58,252,4,200,140,202,16,242,196,208,50,214,56,24,47,78,95,222,212,214,218,181,237,102,190,140,55,71,118,201,89,171,16,15,235,80,197,94,21,73,201,141,173,42,88,120,77,147,19,198,120,203,22,68,246,229,218,101,85,241,251,37,157,39,21,93,40,109,142,221,192,72,9,98,36,89,210,213,17,254,29,161,142,110,8,224,51,248,199,213,186,239,193,6,131,242,118,24,169,102,160,31,243,225,82,106,219,221,168,203,170,251,125,189,182,44,54,239,52,99,97,42,93,125,155,87,216,56,200,124,25,239,217,147,1,13,54,228,158,156,107,43,22,77,69,79,175,79,203,123,181,83,80,166,211,104,248,184,186,90,43,90,125,186,184,103,117,189,102,86,251,26,234,150,42,25,200,138,224,10,124,103,16,51,236,170,107,89,44,20,7,111,
+174,137,189,39,211,70,29,123,159,18,164,214,251,218,134,133,89,229,195,166,34,161,23,149,215,106,156,24,179,207,231,200,57,56,71,88,54,111,107,194,105,189,138,47,116,65,19,189,126,59,53,199,242,57,152,148,214,141,22,115,202,173,130,115,120,211,140,32,84,158,245,124,58,21,105,166,85,31,1,9,225,37,112,92,79,42,12,54,8,107,175,48,216,32,172,245,32,176,213,208,185,7,4,9,215,160,161,131,152,16,91,115,236,241,157,206,64,155,235,31,123,32,124,29,110,70,60,187,161,156,48,10,207,11,193,192,244,201,102,161,116,198,7,198,86,172,3,134,198,135,194,44,209,42,55,173,234,175,70,114,60,18,140,16,229,48,180,202,136,159,253,81,43,29,64,223,13,232,66,216,239,173,97,1,222,186,26,61,23,138,84,82,47,164,61,131,132,151,133,193,3,97,231,17,6,15,132,29,24,60,240,131,96,242,12,56,94,121,1,224,120,245,10,223,132,174,110,78,197,179,243,83,49,192,63,21,163,99,240,77,33,43,70,204,214,95,160,16,127,38,132,163,253,250,158,141,
+141,65,206,90,198,194,64,110,218,137,64,83,73,148,35,123,70,160,3,84,210,241,10,128,111,66,87,103,167,98,22,230,84,76,21,158,138,17,192,169,24,0,127,42,254,127,171,31,52,116,243,65,88,79,147,171,80,214,132,252,119,215,195,199,169,24,74,177,79,21,255,125,245,249,127,181,159,253,169,88,6,101,58,120,0,0,22,92,212,93,128,212,218,144,221,232,238,229,200,85,178,11,33,172,137,122,198,137,216,72,177,228,16,46,222,25,226,141,204,133,214,140,2,176,240,112,138,4,28,31,199,161,17,199,205,64,104,41,37,231,39,226,134,4,78,196,13,125,55,185,198,195,95,40,54,18,190,168,54,138,54,70,148,138,145,148,224,70,68,118,31,61,148,244,69,40,217,169,240,148,65,48,198,186,9,156,137,153,12,112,34,135,42,220,109,238,236,165,7,97,199,125,95,14,160,63,27,23,86,248,227,152,4,16,73,71,111,244,41,221,25,162,1,141,181,135,40,16,15,226,64,16,5,26,220,19,165,99,93,248,124,180,205,231,162,132,2,10,197,45,22,151,197,225,104,104,
+55,87,231,203,178,186,184,248,200,104,22,30,233,174,107,246,241,77,0,64,184,135,184,9,76,77,190,106,97,25,72,211,74,252,11,225,135,149,1,14,110,152,67,11,199,222,114,136,200,162,143,208,133,186,49,143,24,227,0,144,198,174,142,108,203,166,50,22,23,93,161,28,107,143,161,115,85,45,132,87,176,15,63,240,36,220,105,32,217,96,209,20,186,224,83,147,85,164,52,27,38,74,206,99,255,236,182,151,60,193,146,222,21,230,63,75,253,97,173,102,44,206,210,190,24,189,8,232,120,178,165,38,88,188,176,121,138,235,50,68,109,71,23,143,66,80,196,167,141,243,154,215,84,32,137,120,148,51,150,90,123,49,87,225,21,199,157,218,152,94,43,11,173,205,249,59,209,182,82,155,103,203,53,146,8,8,25,16,97,42,177,142,252,38,161,207,136,107,132,56,143,133,197,220,119,138,201,9,1,148,246,108,65,217,148,160,12,45,165,159,247,5,115,145,146,102,208,212,234,43,113,126,219,68,0,202,240,207,242,190,232,130,123,143,113,117,219,209,15,227,9,196,133,67,57,48,
+83,182,16,133,171,196,250,182,73,130,38,199,172,187,66,250,121,106,43,10,169,215,240,144,198,19,221,181,191,219,112,105,130,116,190,162,159,53,180,195,207,248,72,202,142,245,31,154,137,0,169,87,28,54,2,201,45,233,217,175,87,65,114,246,224,70,111,54,240,118,18,8,124,5,125,229,29,68,30,167,47,96,12,119,9,5,103,106,47,190,76,140,163,249,124,201,198,219,214,213,94,111,32,87,190,7,226,8,153,79,138,149,187,203,37,69,206,203,187,89,244,250,151,245,53,8,233,8,86,209,51,164,35,72,69,15,20,71,22,4,132,254,46,134,32,53,22,222,167,35,33,29,54,203,69,244,231,121,153,116,226,230,100,81,59,67,3,64,20,162,255,157,208,139,16,254,236,112,155,119,19,8,138,74,190,19,223,243,15,162,72,152,111,64,49,6,137,17,145,66,144,47,212,195,206,48,128,91,107,50,133,170,92,118,94,110,112,150,227,176,223,174,145,66,65,39,191,169,217,158,166,38,249,200,170,71,120,236,1,187,66,251,118,135,118,76,49,169,252,196,242,46,155,135,202,37,
+215,110,110,70,34,185,83,37,82,2,229,250,144,62,13,134,178,141,191,226,37,154,62,99,195,87,138,85,174,53,171,199,199,196,104,177,88,198,57,90,165,134,230,61,60,142,220,41,121,65,71,113,161,131,177,196,32,74,131,229,113,219,40,243,79,253,51,90,124,77,250,152,229,125,9,93,157,192,245,242,38,74,205,25,151,206,204,151,3,189,101,234,42,175,118,64,212,196,44,63,209,11,205,100,199,194,12,221,6,223,214,206,156,1,220,25,69,88,214,79,106,73,229,200,60,12,153,166,77,171,225,93,174,152,19,167,14,25,178,89,110,218,166,196,212,25,183,168,31,214,34,59,189,58,163,246,188,246,245,9,238,106,32,247,144,70,229,167,194,206,198,75,77,11,242,137,93,83,254,148,139,61,233,32,87,136,28,196,162,71,98,230,251,56,55,231,245,145,218,88,103,92,221,197,85,242,234,48,248,160,38,48,131,246,133,122,172,108,182,228,1,38,99,204,137,91,12,165,128,46,234,27,88,110,123,109,78,204,50,201,44,117,108,198,189,186,209,10,20,158,13,247,140,167,79,206,
+168,106,239,73,145,20,111,205,121,12,139,215,196,215,222,19,235,162,231,98,148,203,83,113,182,194,194,216,87,249,207,246,165,24,195,181,217,172,148,184,207,118,159,178,210,245,19,40,163,236,62,63,221,42,95,210,129,102,194,183,9,186,86,216,231,154,238,126,241,49,101,175,202,252,117,31,161,44,50,159,44,6,153,106,142,185,144,72,147,16,15,129,247,113,228,35,161,61,107,81,159,231,117,126,214,167,250,89,221,88,8,245,14,176,208,244,228,73,214,185,166,84,152,118,190,226,27,137,211,171,97,128,149,117,193,242,86,234,245,109,113,50,210,93,48,83,108,219,61,146,2,45,39,188,15,110,104,163,84,169,182,0,7,198,16,251,190,231,169,86,190,214,131,149,125,201,252,97,101,131,21,60,249,193,94,180,76,203,214,109,107,130,50,220,148,178,200,184,125,32,88,146,31,44,246,96,140,63,85,70,145,71,64,176,103,60,119,242,137,89,103,243,154,227,219,156,54,151,69,200,131,199,72,189,239,140,143,145,26,49,52,194,145,122,125,144,135,172,22,185,78,89,164,211,86,9,
+221,180,57,195,132,57,242,65,230,35,148,244,250,71,69,141,195,35,230,229,92,174,120,254,170,241,121,133,154,82,169,242,249,9,7,236,19,13,4,129,19,13,84,123,79,52,112,161,56,209,192,66,248,68,3,77,164,19,13,4,14,39,26,184,142,157,104,224,148,172,132,247,143,208,65,136,199,133,46,32,253,113,224,85,255,208,39,221,111,140,225,93,135,30,161,55,55,210,175,122,176,21,104,126,184,45,135,168,68,161,169,92,157,45,113,247,214,105,30,53,46,182,159,34,157,5,157,210,101,159,250,129,38,220,191,56,55,212,50,91,146,170,175,175,232,91,170,250,180,25,185,231,198,85,74,132,13,88,93,218,233,227,170,139,32,66,38,141,148,117,96,80,10,244,92,252,26,27,179,201,136,82,75,177,214,49,27,94,203,111,5,58,223,20,1,82,130,212,43,236,10,98,53,95,88,25,25,161,250,2,91,202,175,218,149,71,211,78,5,40,12,187,78,94,176,105,173,87,92,251,172,198,220,229,243,46,244,170,158,139,194,36,174,137,48,209,252,253,154,78,77,191,236,149,152,233,
+11,17,82,249,79,120,160,173,116,203,114,195,60,208,10,241,64,203,45,48,120,182,232,226,156,17,211,177,87,25,251,238,145,158,158,42,229,4,37,27,37,129,192,21,125,235,24,70,244,21,130,173,27,252,160,198,219,104,179,133,229,203,20,93,12,73,229,173,247,105,51,81,166,242,119,63,234,140,199,134,83,148,59,40,71,129,83,148,4,45,190,51,208,92,46,119,124,110,210,94,137,249,64,39,136,81,69,60,234,16,180,46,230,44,194,180,100,23,33,123,142,115,49,56,135,79,57,22,46,117,235,180,94,183,179,233,28,204,97,40,128,228,92,138,131,49,2,20,169,90,88,63,62,207,185,166,35,118,23,231,187,120,202,102,0,190,116,136,225,107,52,44,215,171,111,216,42,125,87,246,2,153,83,14,183,130,169,223,151,76,6,46,147,246,86,51,163,80,238,18,3,69,134,6,170,220,21,82,205,153,210,62,197,142,217,70,219,90,57,102,27,211,59,255,88,205,101,144,185,195,121,115,154,255,148,200,113,95,195,12,210,109,92,81,94,169,193,24,3,154,41,188,103,185,69,176,
+229,97,73,25,128,253,231,79,250,115,90,39,66,57,115,142,164,200,131,94,2,188,48,242,175,112,43,16,49,168,225,223,162,146,33,106,68,213,183,17,16,115,164,202,11,39,92,198,142,89,116,84,220,61,194,111,248,88,244,24,195,176,131,117,150,33,7,43,123,153,153,11,122,189,151,158,48,97,118,186,240,150,199,136,130,246,122,53,157,49,77,75,97,165,110,23,158,48,196,33,59,150,109,170,101,175,96,119,193,64,139,155,100,212,209,177,214,154,198,70,179,133,180,166,111,21,42,43,137,40,237,247,87,253,249,6,119,71,120,28,127,82,27,123,197,69,2,34,27,80,158,122,7,171,165,142,184,200,62,111,158,132,50,147,169,91,250,156,18,122,172,233,58,222,95,208,18,205,27,90,0,243,102,131,24,181,28,246,70,132,144,245,171,50,56,247,119,133,18,220,206,86,191,82,106,161,80,2,57,211,107,163,247,122,153,191,102,241,25,252,166,213,1,154,236,154,204,103,142,127,176,217,231,65,203,8,173,173,115,220,116,252,84,85,118,212,171,183,38,145,15,26,152,180,50,23,
+78,9,242,149,208,210,28,168,120,180,106,65,166,81,176,158,216,218,72,49,47,215,56,138,251,234,109,188,95,52,105,125,12,44,193,214,236,118,23,65,151,124,164,180,88,3,249,201,19,214,102,208,83,42,67,142,125,121,161,181,161,78,196,188,11,233,114,199,141,105,187,35,214,216,59,167,19,234,65,40,57,134,114,99,160,13,37,199,16,240,90,103,244,115,113,14,25,241,212,244,247,164,225,199,56,160,145,107,39,213,203,196,226,189,195,233,250,165,247,0,255,228,23,254,41,254,168,56,199,231,189,107,211,252,64,176,39,30,122,95,169,178,76,112,229,244,69,244,242,171,67,12,233,16,162,91,233,203,113,63,1,242,6,59,125,114,184,1,10,132,16,63,48,181,179,202,87,145,34,85,199,84,50,70,158,47,72,245,244,2,213,58,102,51,236,85,93,197,213,156,19,56,7,70,146,12,164,220,72,58,5,60,122,158,215,246,112,40,180,16,13,163,214,187,106,100,174,13,175,45,77,150,146,39,230,205,152,86,11,135,141,49,230,150,137,221,69,68,107,75,247,108,251,81,104,186,
+147,156,183,103,125,151,60,181,172,27,180,77,211,124,113,145,178,243,47,167,111,198,197,180,92,159,20,80,182,81,20,113,220,169,57,230,231,144,239,211,192,206,175,166,170,59,234,250,213,76,59,165,178,130,49,5,12,217,103,8,179,19,97,80,35,156,63,91,74,83,197,178,67,131,28,28,100,202,7,216,221,249,64,2,165,85,132,72,24,159,0,72,175,142,59,141,192,57,225,116,5,188,30,175,0,202,233,10,56,21,159,3,255,184,248,119,87,167,125,202,243,255,127,244,163,37,134,40,45,248,115,234,26,163,235,72,143,237,38,10,252,13,118,4,10,1,96,65,56,77,0,48,167,52,129,16,56,165,9,111,55,244,127,126,127,23,113,74,19,140,192,41,77,32,246,78,105,2,153,114,74,19,94,168,167,52,33,184,56,165,9,140,196,41,77,216,72,79,105,194,61,239,148,38,0,181,83,154,128,198,157,210,4,112,118,74,19,2,164,83,154,64,84,66,105,66,77,37,203,204,25,69,113,93,118,131,123,89,161,214,214,184,233,73,192,43,251,203,65,16,64,69,100,199,29,217,
+58,188,203,25,8,32,179,225,30,135,108,216,17,214,9,91,124,98,41,219,202,106,16,18,255,57,244,193,58,109,232,18,212,70,138,27,255,40,36,0,192,42,4,221,35,31,119,121,209,198,60,37,199,117,124,182,151,108,30,15,98,255,249,79,204,145,253,23,103,7,189,83,17,230,56,84,92,190,157,147,90,157,1,55,129,183,46,76,97,1,136,195,210,119,7,146,77,106,69,203,221,162,82,222,3,172,226,125,109,130,186,156,106,132,133,70,197,222,170,184,27,68,247,22,9,2,15,78,136,131,219,79,188,127,70,126,1,89,51,62,77,192,227,182,38,26,7,126,34,176,235,73,15,106,9,214,134,22,50,85,229,134,85,28,246,24,150,196,208,92,104,128,223,154,252,221,254,103,86,178,246,24,237,232,220,147,101,92,187,104,232,209,187,41,123,158,234,239,134,163,8,31,227,101,2,0,9,184,228,18,123,229,133,183,134,238,30,119,80,57,56,5,65,186,163,188,88,92,250,29,10,201,113,156,87,152,113,68,125,109,160,156,186,61,35,28,187,237,152,175,41,157,38,50,231,65,
+44,233,3,124,238,252,41,62,82,213,170,181,243,90,14,85,168,177,237,229,161,80,16,156,203,31,229,186,18,81,119,104,250,32,28,137,174,78,137,24,155,91,67,249,177,110,86,231,3,1,32,99,4,80,141,60,37,122,0,130,13,204,218,64,224,209,24,58,106,188,14,105,55,23,142,24,0,29,20,104,8,104,106,144,182,130,51,84,228,205,130,7,1,114,212,236,193,81,39,184,193,35,143,108,1,133,24,65,127,118,99,86,73,225,228,31,164,184,143,117,146,215,175,205,213,31,178,172,163,245,53,126,177,184,95,173,78,153,34,215,204,51,198,234,200,163,208,61,192,79,222,227,156,166,96,145,39,85,172,97,192,158,215,102,172,233,116,50,38,56,70,190,75,131,213,74,249,156,55,155,227,97,219,212,64,37,160,236,140,72,152,230,215,214,175,137,95,148,72,217,204,154,210,158,190,181,148,60,84,92,90,94,80,3,28,145,116,7,71,192,34,188,201,133,241,150,31,44,136,108,59,234,80,41,248,253,210,52,210,74,111,236,133,34,72,76,168,26,99,225,220,45,87,209,131,245,
+80,0,195,54,215,88,39,94,76,208,133,22,188,114,171,158,160,58,2,169,117,76,195,188,63,178,29,107,87,195,130,217,78,62,127,56,178,29,189,198,63,227,216,209,114,226,72,197,180,234,36,215,244,103,122,177,233,156,51,83,219,160,53,207,59,95,190,143,50,123,78,90,190,186,156,99,186,89,145,124,68,9,222,140,34,199,157,31,110,110,236,163,176,231,166,116,217,80,15,246,219,124,115,151,35,35,200,131,172,47,197,68,99,70,215,250,206,41,110,226,210,171,172,244,109,183,56,71,155,40,170,237,123,83,35,163,225,62,29,14,74,17,133,228,53,205,46,22,146,242,148,117,157,104,213,116,34,180,220,98,132,25,27,240,69,172,91,113,92,196,48,59,115,31,52,149,139,103,149,157,129,206,185,20,109,57,86,30,68,241,84,79,197,73,242,139,213,79,133,85,99,85,52,163,84,212,161,220,187,108,27,82,92,43,180,88,139,255,253,190,41,69,115,105,163,112,171,203,6,49,164,247,170,94,243,18,132,27,157,91,191,36,159,60,57,109,37,111,67,249,222,53,228,135,185,182,
+86,65,119,243,153,72,253,226,142,201,100,220,6,48,195,174,228,180,225,70,109,157,136,211,6,113,34,78,38,195,23,196,10,181,189,236,219,208,130,48,9,110,54,83,245,115,77,191,242,86,43,248,22,66,135,161,139,78,234,255,153,103,152,191,60,214,171,62,162,150,76,204,196,77,78,81,29,39,21,96,22,133,22,83,143,44,138,110,92,29,89,212,56,93,167,177,86,240,150,173,135,26,220,195,91,182,69,81,37,15,111,217,106,176,207,101,120,203,182,106,205,199,185,121,190,248,62,77,194,139,164,180,159,248,241,22,65,99,203,143,204,42,29,107,31,241,101,129,195,148,55,41,125,65,82,132,80,192,20,247,166,248,227,3,96,98,133,27,27,20,81,192,10,120,129,50,216,155,126,111,11,231,179,103,184,127,138,115,36,140,243,221,23,211,39,119,38,172,189,215,120,82,242,165,186,153,47,59,142,97,242,139,71,212,119,165,239,184,130,42,104,75,45,232,140,107,122,206,58,123,131,154,209,127,159,175,158,187,142,108,189,175,87,31,217,122,51,178,61,178,117,27,16,130,176,179,
+248,131,125,208,143,25,49,196,31,179,65,141,114,125,85,43,100,230,207,99,198,211,163,187,80,235,120,216,44,56,117,184,31,156,18,198,149,145,18,103,62,132,21,130,176,201,51,111,34,59,193,78,190,27,44,38,110,137,166,225,88,190,51,249,134,244,241,192,175,155,186,203,35,125,209,70,169,41,80,90,167,108,161,199,64,124,227,253,216,67,15,202,57,161,148,147,104,168,141,42,234,166,121,238,195,13,25,246,0,123,214,3,116,122,37,4,209,40,132,81,24,162,91,189,123,44,179,21,20,20,29,49,84,65,67,248,174,69,143,248,38,231,28,96,82,27,201,236,151,122,34,72,35,4,83,48,93,42,181,31,6,120,58,99,18,54,98,64,40,183,132,82,203,153,61,222,191,46,227,174,238,11,239,4,36,204,180,176,71,214,122,105,99,82,220,14,173,181,238,24,54,17,23,37,170,61,199,203,5,70,51,94,163,238,218,142,202,122,77,83,50,130,171,71,255,143,207,7,20,167,231,3,53,62,58,247,0,111,217,194,251,104,240,150,237,207,184,170,229,91,68,118,145,93,67,63,
+197,157,37,109,84,119,211,120,42,89,16,23,118,245,12,90,1,28,139,164,79,244,237,189,101,49,229,79,68,83,86,253,106,72,180,154,106,67,75,16,19,30,138,142,11,112,75,95,161,205,201,136,193,11,64,11,127,45,225,137,96,90,253,86,13,156,125,100,83,24,209,77,152,226,57,197,205,160,80,82,166,3,128,247,245,28,129,61,103,190,128,66,40,62,99,161,53,148,194,114,64,178,115,142,187,235,113,214,11,100,188,111,77,86,247,167,231,90,175,94,58,57,81,68,41,230,51,151,220,32,27,248,111,45,221,216,74,147,24,170,60,114,29,198,70,207,200,155,243,100,12,9,1,212,59,71,84,207,192,143,240,21,4,158,104,180,150,81,192,224,169,232,103,56,127,110,120,158,206,15,63,120,156,88,98,26,239,251,22,180,203,104,252,186,128,75,116,180,154,236,154,254,51,47,147,192,15,181,132,243,134,45,67,144,90,95,139,234,178,159,8,18,44,77,23,254,138,223,117,121,88,152,51,209,245,209,81,9,174,115,231,32,43,130,52,228,83,239,93,167,146,183,239,188,195,219,
+255,97,38,82,253,132,79,212,29,204,41,126,56,28,222,108,43,151,172,177,103,174,157,138,222,202,99,141,65,59,203,196,204,50,85,93,197,39,109,58,33,182,58,95,181,250,130,49,0,26,152,4,123,43,40,7,116,201,185,190,162,198,183,210,28,119,51,228,217,76,209,58,140,79,139,37,172,113,254,201,53,101,61,145,93,99,202,96,94,198,157,166,226,45,79,198,235,94,89,18,202,207,228,171,21,219,83,219,148,124,81,79,4,156,128,94,220,216,41,213,162,177,60,255,232,169,217,40,34,152,28,56,120,7,155,10,71,185,175,39,46,149,94,154,138,46,55,150,86,168,249,89,50,218,174,155,58,29,69,130,83,112,51,71,234,240,20,133,165,152,3,191,195,91,16,118,118,144,175,27,67,206,142,123,78,215,240,202,54,202,13,148,11,77,73,238,132,252,117,74,19,80,101,21,173,120,70,114,34,68,189,28,52,143,214,113,30,77,86,57,183,80,177,48,94,96,89,155,232,157,132,26,33,139,176,203,141,179,85,191,59,47,80,123,151,198,198,168,209,95,44,9,28,187,86,163,
+5,64,74,55,125,121,74,203,116,87,196,158,253,173,56,190,22,30,159,30,200,185,238,75,91,222,138,64,173,238,143,104,156,185,244,134,121,69,193,144,241,51,142,92,40,14,46,88,203,105,137,241,88,179,238,36,193,26,93,147,105,79,136,143,166,187,3,110,219,17,168,9,43,128,53,138,225,48,67,3,12,208,243,183,19,64,121,134,128,174,160,155,150,145,91,71,105,165,224,145,144,103,162,25,188,207,214,58,110,75,96,12,171,103,94,170,98,227,149,2,217,185,250,202,17,108,220,157,210,252,48,246,31,101,147,255,247,239,231,191,158,138,211,152,192,42,12,191,120,112,243,70,134,119,178,27,0,8,217,9,116,117,6,52,142,87,112,3,248,74,120,126,44,6,129,83,49,0,158,138,145,63,21,159,83,78,197,136,192,169,248,255,131,126,110,94,132,138,7,161,156,127,252,129,141,39,4,145,226,135,161,112,254,0,255,88,175,9,130,27,228,217,70,111,35,130,80,168,193,176,181,172,88,16,115,124,109,41,192,58,189,182,36,236,157,94,91,50,0,167,215,150,8,103,167,215,
+150,32,1,142,175,45,157,177,225,94,111,31,132,183,112,101,168,46,1,174,44,77,17,247,210,26,11,202,44,1,87,29,26,40,123,19,120,248,146,13,59,194,96,94,128,78,37,197,20,52,151,18,172,1,128,28,143,6,79,221,1,179,99,119,57,4,25,164,181,56,170,107,93,216,215,151,52,115,30,77,216,42,114,93,77,179,18,96,45,6,128,1,128,246,65,245,155,7,84,22,44,155,119,164,208,174,33,181,130,211,69,231,46,244,169,112,47,19,119,123,18,117,175,4,129,0,122,127,67,247,65,217,66,104,39,11,239,243,62,74,49,217,135,146,200,210,75,207,198,233,157,179,71,126,54,5,3,197,44,62,68,49,1,244,22,161,74,209,8,137,144,181,103,217,10,131,152,21,10,162,1,68,72,175,87,65,222,155,145,178,104,223,109,172,20,126,11,133,50,233,250,234,115,196,2,4,88,184,17,6,225,129,165,181,129,210,115,119,134,137,35,39,5,12,73,246,26,37,153,197,144,202,232,61,11,226,175,132,203,101,8,78,101,2,195,17,252,51,73,30,94,66,114,102,217,120,
+22,2,195,60,106,50,238,68,184,187,144,138,69,63,169,173,13,245,9,235,83,5,235,211,162,148,32,73,39,69,95,1,64,90,72,114,178,110,49,240,139,99,200,128,104,192,35,2,5,171,196,132,119,243,224,103,43,110,40,107,194,148,245,89,44,146,178,166,178,34,130,167,227,176,225,66,4,221,91,1,75,246,110,22,58,7,238,227,143,54,194,184,224,247,203,82,104,18,246,57,75,126,16,82,238,31,133,183,23,239,28,47,226,57,166,115,93,247,132,6,207,29,237,246,115,33,185,171,126,90,151,213,101,40,11,247,114,61,227,210,107,136,130,236,201,246,113,155,185,168,207,27,44,215,32,242,66,184,103,165,37,84,65,136,133,209,118,70,78,196,124,11,184,67,172,167,24,92,33,25,147,245,81,87,81,63,198,52,161,84,110,11,144,12,86,96,137,53,81,248,146,168,163,87,241,206,195,221,230,129,111,86,84,107,143,108,189,199,213,123,175,108,22,229,25,46,233,120,178,153,160,100,12,110,145,135,197,134,90,240,248,18,168,133,7,145,193,210,14,239,172,179,96,239,243,170,
+63,88,216,92,158,251,244,19,1,12,112,134,114,187,208,113,110,219,182,9,243,145,164,111,243,227,47,213,53,198,229,163,80,233,139,206,238,32,199,133,120,94,17,17,80,142,16,238,120,73,115,171,145,66,125,58,201,43,132,228,53,46,5,164,160,231,34,37,146,180,28,180,196,35,163,79,230,190,61,2,171,235,121,130,196,213,114,98,119,26,84,190,116,199,52,209,197,186,146,238,142,154,74,205,151,231,12,207,193,68,73,75,86,49,218,136,124,189,17,167,158,199,85,179,175,50,193,88,206,85,252,40,18,129,229,127,229,185,148,58,162,22,126,65,42,82,70,149,244,102,138,78,150,191,236,69,75,79,165,142,4,54,164,198,51,245,81,189,238,20,252,119,193,110,208,82,102,82,184,92,220,10,111,43,169,140,196,222,180,102,219,98,178,207,89,167,106,174,237,36,104,116,126,69,91,213,136,73,181,121,208,201,53,125,160,207,198,172,26,208,184,230,91,121,177,194,227,230,117,247,150,173,146,236,74,91,232,245,194,164,211,52,71,77,167,155,189,105,96,210,8,235,26,94,161,106,
+33,16,215,137,231,66,239,5,90,149,11,202,187,177,84,221,164,19,23,238,24,126,228,187,242,138,246,137,43,65,132,225,177,254,57,159,23,161,238,233,207,110,19,148,54,71,11,232,109,111,117,31,44,108,123,114,146,134,167,215,170,86,142,187,238,147,54,145,101,208,234,213,122,205,70,221,120,26,152,227,8,189,249,228,237,174,208,1,121,247,210,73,157,208,79,72,198,30,85,154,211,241,14,112,138,48,95,118,37,28,61,49,85,162,248,85,10,148,190,242,47,9,210,15,32,57,13,204,200,65,230,74,179,148,199,139,142,161,143,90,243,93,148,115,179,84,194,154,189,182,18,66,146,42,132,191,213,109,192,170,213,161,76,154,155,207,5,45,141,243,38,158,42,42,59,20,234,83,249,79,109,210,72,121,48,217,192,165,203,71,123,253,12,163,50,222,166,91,214,17,166,191,34,179,59,19,10,100,177,106,193,59,145,205,220,160,141,184,50,20,82,37,119,35,84,13,153,57,181,173,98,95,249,40,139,74,192,50,44,217,159,224,166,245,165,118,132,170,5,126,180,45,69,131,19,92,
+218,25,130,172,135,12,173,89,27,94,52,107,166,72,108,245,70,53,123,2,23,228,154,13,209,250,228,113,152,75,134,97,189,146,126,210,235,171,109,94,53,39,133,15,135,183,251,60,85,159,126,4,41,175,246,98,151,128,44,150,140,54,208,229,139,33,155,147,24,147,105,199,159,141,241,116,245,67,254,128,178,33,63,221,16,30,99,48,30,77,232,174,22,213,228,69,69,157,201,165,250,132,67,37,132,195,87,160,250,76,171,49,100,62,52,43,38,49,64,163,236,191,162,182,151,183,123,106,90,34,8,64,54,186,238,8,47,168,34,137,39,34,179,99,118,142,89,141,134,0,9,70,42,23,202,100,157,151,61,2,178,198,197,84,40,4,222,104,64,143,35,216,239,62,15,24,32,169,50,166,8,43,102,140,149,167,87,121,200,44,9,203,103,170,208,138,153,178,198,52,58,144,135,188,3,11,97,196,162,143,72,37,7,172,24,87,4,116,218,35,103,32,146,172,34,74,98,83,240,161,22,106,64,158,246,74,2,65,130,27,133,173,23,48,246,116,93,125,22,32,93,32,31,132,55,143,
+35,196,92,186,5,88,12,83,89,105,6,162,49,120,101,194,240,236,129,36,30,11,141,1,60,74,89,215,177,87,24,174,124,158,80,47,17,12,94,141,145,102,222,9,13,131,98,12,23,144,85,63,24,81,112,253,64,179,235,220,95,140,41,172,218,251,48,105,195,5,76,200,86,29,7,34,207,84,196,216,114,10,142,168,239,92,229,197,238,28,1,178,160,76,230,133,215,129,34,214,239,252,76,58,134,159,216,99,141,101,88,32,63,246,123,115,95,127,102,197,88,44,38,60,168,80,111,138,163,115,226,63,248,93,218,37,58,56,208,89,8,82,66,224,136,195,123,230,7,11,49,188,112,129,19,121,157,2,201,3,220,161,69,139,18,27,77,69,159,252,9,61,215,84,128,197,161,196,19,176,56,67,172,24,94,138,62,55,91,157,66,168,167,26,112,9,247,132,216,129,87,68,240,3,165,226,19,99,83,17,114,196,123,27,45,138,193,179,28,181,2,247,91,8,48,40,76,230,124,174,211,165,239,8,112,239,162,197,101,137,61,18,66,68,162,123,130,91,93,130,152,80,107,16,70,179,
+137,151,46,65,26,126,50,163,205,139,23,220,138,27,117,86,181,44,104,198,24,90,240,56,99,225,3,164,236,45,165,153,8,182,2,102,84,60,241,52,110,223,171,82,236,43,139,239,36,23,194,12,181,139,220,249,17,243,161,9,125,102,84,17,140,148,65,49,80,120,71,221,235,229,156,216,144,125,254,217,188,186,163,60,10,55,58,42,39,54,154,167,37,87,222,44,93,17,97,233,49,1,105,32,32,124,137,33,46,228,37,51,101,138,32,94,96,47,30,133,58,31,84,109,223,231,133,241,57,68,149,67,125,20,154,129,203,51,4,168,98,65,217,37,46,75,101,33,246,176,214,180,19,218,29,246,52,47,209,81,107,114,251,8,210,90,85,111,21,128,37,10,65,170,250,146,215,66,30,198,75,16,201,255,44,4,72,218,9,5,107,133,171,131,96,64,170,64,83,39,95,146,16,223,211,180,50,238,34,113,198,152,46,79,166,111,187,65,72,9,57,132,203,137,117,223,202,35,1,64,14,160,208,103,77,118,44,129,246,58,19,217,79,130,137,73,137,152,38,73,22,230,50,128,164,108,
+198,4,8,191,8,88,141,183,201,59,190,213,180,38,115,241,228,139,36,15,210,189,145,147,71,88,108,110,54,0,41,3,5,233,66,248,34,124,184,93,41,59,49,120,131,242,78,184,0,74,4,41,5,194,0,11,6,129,105,38,188,64,178,167,220,39,14,74,247,64,147,103,21,145,128,227,236,230,8,248,152,241,4,120,236,197,9,240,177,249,9,240,61,229,9,240,56,211,9,240,151,248,19,224,191,88,39,192,187,249,39,192,155,30,222,33,212,5,172,143,27,104,157,140,172,154,230,8,203,183,154,83,32,218,69,11,252,71,21,220,57,132,57,224,36,206,172,1,137,195,106,35,134,44,63,11,3,79,241,113,156,124,16,214,237,173,54,196,6,144,144,61,160,96,123,128,214,199,98,174,139,77,126,44,78,107,84,33,91,53,14,159,54,173,99,210,78,30,194,116,130,21,2,85,144,69,2,53,41,157,76,8,251,60,189,46,225,30,249,144,195,248,150,232,23,16,9,66,221,76,207,78,221,152,207,28,148,29,222,108,66,87,206,224,142,220,183,179,64,48,0,79,156,118,140,186,
+140,187,0,177,55,124,187,145,71,88,208,90,160,32,219,250,128,141,11,154,95,146,31,87,182,163,202,189,9,133,68,12,153,133,128,137,1,3,157,81,18,93,177,96,51,11,34,78,102,150,12,192,102,38,75,202,15,32,72,219,196,148,183,150,15,228,241,151,144,173,188,181,29,72,61,133,161,165,12,72,161,149,12,16,16,199,149,52,213,111,177,4,41,149,149,60,154,79,137,129,159,165,148,195,232,181,207,20,57,9,240,250,124,18,128,221,128,4,144,103,55,118,166,252,3,77,116,247,172,195,18,87,85,83,232,121,152,123,2,104,141,141,158,132,154,132,231,125,110,9,182,79,2,77,32,244,234,9,82,41,14,41,207,32,48,230,7,70,205,89,162,77,243,76,20,6,158,37,177,231,56,204,211,226,225,141,54,151,58,2,26,20,129,129,50,90,60,8,101,134,118,151,187,247,198,144,169,148,121,181,188,250,234,138,250,140,148,21,155,139,143,197,211,108,200,64,65,22,141,133,33,60,10,165,118,13,100,62,220,145,208,41,19,153,32,159,115,169,2,175,224,159,24,198,224,193,
+161,177,135,32,49,68,65,182,80,104,145,92,138,158,191,46,137,231,73,2,8,36,113,175,4,36,218,72,9,205,218,151,202,96,112,149,183,18,50,205,87,10,132,95,254,69,34,2,87,8,96,8,72,183,137,162,84,75,35,1,142,92,125,73,200,111,73,176,159,70,160,79,142,142,124,244,174,238,27,169,231,235,35,254,255,32,190,13,120,86,166,3,56,163,148,38,194,181,25,147,8,96,72,113,244,160,110,32,223,253,200,136,41,201,224,68,188,42,45,67,201,170,133,146,233,10,247,162,139,127,55,30,139,192,24,254,189,248,47,220,110,5,37,10,1,192,72,96,197,132,149,51,86,236,193,159,186,197,148,142,79,137,141,198,87,19,252,72,194,20,192,156,30,31,0,224,233,241,129,49,112,122,61,60,4,148,169,199,55,146,8,232,211,27,73,4,0,56,255,131,247,206,141,3,168,178,215,72,201,6,200,18,0,88,160,218,96,132,136,124,33,72,197,46,36,197,188,83,158,158,175,93,179,99,3,17,124,42,46,125,43,160,138,47,137,189,132,138,53,197,148,149,207,27,92,232,
+3,158,148,70,42,153,38,103,248,94,121,110,62,7,175,32,18,123,240,184,209,93,193,200,197,23,223,67,94,26,120,80,179,137,160,118,6,135,166,52,252,82,207,248,50,156,115,12,39,12,251,203,149,161,26,12,251,33,19,132,229,45,87,29,20,214,14,239,114,52,87,245,234,219,240,248,220,194,14,101,105,180,232,218,142,126,244,185,103,67,28,218,10,245,198,102,131,218,47,157,190,215,176,51,186,183,52,218,113,195,92,218,24,15,71,95,209,192,3,252,250,186,133,210,55,132,81,87,117,146,204,25,52,157,94,40,95,212,146,143,219,161,142,221,252,122,219,151,173,1,21,136,12,125,50,35,205,108,74,217,130,224,7,56,29,113,55,168,109,114,223,9,117,209,103,8,234,17,7,191,12,117,239,63,127,19,95,235,177,8,35,64,170,97,134,121,161,125,244,0,5,13,0,208,83,91,236,88,60,231,115,185,42,251,94,59,152,146,71,156,199,221,120,55,117,220,185,14,157,163,197,45,164,255,2,3,47,205,89,249,142,208,91,126,62,179,210,89,255,28,107,66,95,193,111,11,
+233,123,44,28,66,85,148,65,118,165,5,94,233,201,192,202,32,120,73,222,45,37,78,147,232,36,110,141,104,125,193,191,234,9,0,18,40,152,103,66,141,199,129,79,46,31,31,105,172,193,233,53,173,251,207,107,69,119,227,85,14,207,47,149,216,46,77,62,140,118,46,149,0,176,167,144,216,49,144,206,51,67,252,25,30,104,70,193,223,104,133,144,75,1,156,13,153,133,130,208,120,132,189,227,227,149,247,155,166,8,94,57,169,95,66,232,83,144,32,114,138,218,232,21,49,72,227,80,213,120,65,129,117,162,169,4,120,253,242,85,18,180,240,231,133,39,27,37,171,33,16,223,176,129,192,19,146,18,244,118,227,111,56,3,55,86,161,216,100,83,139,59,8,127,38,118,112,65,68,66,242,2,66,50,100,154,21,0,96,241,27,1,82,180,133,131,145,29,160,5,66,117,134,248,242,250,17,127,252,147,2,192,240,7,140,94,224,248,21,29,2,249,225,248,21,157,91,132,233,88,252,250,0,156,138,89,194,83,241,68,43,124,60,200,157,67,225,205,215,75,21,66,54,101,17,71,
+84,83,242,43,22,120,152,145,33,83,233,126,61,10,183,171,217,25,246,18,74,247,3,172,208,229,71,230,173,29,185,166,183,114,234,139,79,130,217,68,161,135,119,158,7,241,131,176,2,80,228,67,217,203,36,97,114,116,172,104,243,72,208,92,60,93,68,133,30,47,162,10,96,161,182,226,0,171,135,54,207,1,100,195,95,13,215,199,194,186,164,93,120,249,186,246,142,33,0,79,235,0,22,147,27,10,29,85,233,244,12,45,105,39,1,96,228,187,128,152,194,90,204,117,52,156,37,78,108,176,244,140,161,202,116,80,235,214,19,18,251,235,138,209,85,31,25,53,111,212,93,224,241,81,152,185,120,143,2,188,53,52,115,163,235,3,135,54,239,167,3,119,208,161,39,66,87,203,91,183,143,252,242,40,76,220,225,241,18,106,169,181,189,170,84,180,154,148,77,63,241,215,157,26,181,237,70,150,11,32,215,82,27,186,44,222,105,11,207,101,242,246,235,229,161,172,137,212,249,188,157,78,223,33,51,159,129,71,72,238,141,143,61,64,59,244,54,180,25,183,105,186,253,228,151,231,
+150,112,77,138,213,156,45,94,181,75,76,168,138,123,208,254,90,46,142,110,185,36,196,157,92,131,206,105,189,198,67,227,179,162,224,145,114,158,26,174,150,206,76,184,28,66,132,206,111,92,240,207,42,243,74,192,205,246,209,219,222,240,116,35,104,236,35,182,86,160,102,47,59,53,183,217,226,78,248,193,69,84,171,238,53,63,148,139,115,229,207,42,244,53,157,105,210,149,26,68,115,65,104,255,90,150,20,42,251,103,59,223,63,87,72,76,96,239,229,166,224,230,96,188,166,126,241,246,67,199,64,152,218,146,107,86,25,249,122,213,8,184,81,126,7,223,95,20,44,196,203,199,218,88,56,213,44,27,88,91,156,235,6,47,88,161,160,103,128,151,137,105,76,149,78,203,148,103,105,6,131,215,189,215,250,10,38,138,248,188,39,16,159,169,250,194,108,103,143,192,108,10,158,132,78,36,170,125,228,195,116,68,109,84,55,85,157,86,153,117,223,180,5,107,27,102,9,171,243,134,228,234,97,98,104,116,13,228,56,214,40,102,16,56,166,38,19,15,179,1,28,88,18,55,38,136,
+174,35,239,138,44,25,225,240,132,17,195,173,229,205,127,57,162,207,64,240,82,169,166,76,9,15,152,187,112,191,119,161,84,33,169,247,16,6,220,232,156,251,139,130,199,246,159,3,231,86,4,205,184,191,155,230,115,95,159,132,105,141,94,170,95,40,6,227,182,139,43,182,119,101,157,186,50,211,150,239,229,238,129,96,52,210,52,199,247,149,100,54,24,120,8,246,208,185,117,231,94,194,195,110,156,140,1,115,83,107,242,76,111,197,184,71,200,88,137,199,86,194,80,151,142,8,111,93,224,85,187,35,212,188,37,60,60,81,243,34,183,64,44,25,43,220,208,196,31,234,141,4,239,235,91,19,87,139,189,22,108,148,37,117,207,34,72,43,209,88,138,76,109,6,74,4,76,173,240,198,40,209,227,100,148,38,193,85,63,212,198,21,171,68,78,183,141,95,71,99,205,36,104,222,135,130,188,222,173,238,234,245,46,206,115,240,156,157,182,26,108,72,131,1,53,35,168,44,249,169,237,123,238,133,252,227,69,120,145,230,95,22,176,89,158,65,169,219,64,58,215,106,210,56,167,124,
+44,28,53,201,215,45,130,212,124,21,50,178,56,246,122,188,111,28,171,5,85,171,216,235,158,8,55,203,177,161,124,243,36,196,217,42,111,92,53,152,116,157,117,8,210,25,198,155,215,131,180,54,181,82,27,133,173,166,91,110,108,239,239,243,30,169,47,30,111,222,100,13,188,177,191,24,246,26,201,219,123,83,165,200,166,176,191,166,38,38,155,205,140,88,45,136,235,216,219,38,139,11,106,179,254,136,57,126,99,77,149,82,61,85,141,170,41,23,114,165,228,211,249,52,97,31,25,242,133,105,237,92,44,157,119,92,34,208,25,137,47,98,1,247,78,164,165,236,110,56,203,245,38,95,50,82,34,116,253,215,231,70,235,125,181,179,115,31,251,162,17,178,198,9,178,137,53,247,94,64,90,84,98,238,54,150,194,124,9,175,26,44,177,51,138,213,60,13,91,27,140,209,253,121,77,47,19,13,202,86,81,17,226,123,205,108,65,127,152,34,34,231,169,66,236,48,45,246,47,21,214,152,24,56,199,162,173,20,41,73,38,37,35,176,218,244,151,164,74,3,9,61,65,32,78,50,
+97,22,236,166,233,250,242,54,18,152,57,148,56,200,109,63,26,129,217,92,42,170,204,17,143,195,85,233,171,119,253,22,227,47,223,242,117,35,197,153,86,55,174,148,77,38,174,163,67,123,92,67,68,30,100,20,56,152,215,181,66,194,202,26,228,54,61,218,51,74,124,13,62,189,103,81,3,58,208,36,113,95,98,21,200,187,52,156,211,18,228,108,151,227,175,244,181,151,8,127,168,225,10,188,68,29,136,120,192,221,161,66,14,200,128,28,113,189,147,2,228,128,34,80,157,162,17,221,165,56,32,199,138,196,162,193,238,153,142,40,109,242,2,114,34,228,97,65,106,250,88,155,235,173,29,107,47,199,50,168,246,68,88,35,51,207,168,119,253,69,2,68,3,129,64,104,140,54,163,32,170,250,100,224,74,30,96,246,240,192,33,24,62,213,6,60,109,221,7,197,234,226,167,128,143,80,66,126,250,192,170,11,29,181,72,121,87,53,182,127,242,227,164,255,51,63,14,156,252,56,218,120,44,190,228,166,99,139,133,39,135,253,124,118,225,25,102,114,117,238,98,32,136,152,214,7,
+5,174,30,64,169,246,6,239,192,15,197,151,124,245,32,118,119,44,227,198,126,63,184,161,52,90,24,86,71,243,249,101,36,84,5,119,232,232,97,213,113,248,203,31,172,70,11,121,67,168,207,31,31,253,218,91,61,255,240,120,238,163,34,146,237,164,178,23,98,47,228,221,220,7,45,121,182,48,189,92,59,14,175,4,127,138,205,141,101,14,79,251,0,19,26,232,33,176,199,29,130,10,103,255,167,19,58,254,219,239,191,255,183,223,252,242,219,191,253,238,223,252,246,215,191,254,135,111,190,253,241,120,124,200,15,223,253,248,227,241,160,15,248,76,143,63,61,30,25,2,31,31,242,203,191,253,238,219,31,191,251,167,39,127,252,124,96,193,207,135,126,252,227,195,65,126,62,0,225,135,159,207,34,249,87,223,254,242,175,126,106,242,205,223,253,234,215,191,62,29,101,242,205,175,126,252,197,127,248,195,239,7,254,213,111,190,249,246,155,63,251,139,191,62,30,100,241,167,167,67,78,160,191,254,248,15,71,252,147,211,41,23,223,64,210,255,193,121,40,191,248,223,254,147,63,131,
+170,255,234,47,191,251,230,251,223,124,243,55,223,255,240,171,191,255,230,135,127,248,225,199,239,254,26,170,249,155,223,29,153,242,221,223,127,247,139,255,248,111,190,253,241,175,224,35,83,254,245,95,125,247,223,252,203,127,5,215,255,187,95,253,230,47,191,255,187,223,9,251,211,129,37,240,37,84,231,155,191,248,254,239,225,241,78,74,250,241,251,191,249,249,184,149,159,90,65,74,250,245,175,33,41,126,241,71,255,242,187,191,248,237,255,252,205,95,127,15,31,158,242,221,191,249,246,183,191,254,241,23,127,116,28,253,23,127,244,63,124,247,235,239,190,253,225,187,127,90,248,151,223,127,243,63,254,71,223,252,119,255,253,191,254,159,32,149,253,230,199,111,127,18,243,231,195,36,190,253,229,143,191,253,22,94,161,223,254,0,13,0,171,24,46,253,229,111,255,246,247,235,240,103,223,252,49,116,239,31,142,234,248,205,247,63,194,19,253,14,90,133,95,254,120,58,137,2,90,196,191,253,230,111,254,246,187,31,126,248,230,191,250,243,63,249,51,120,62,144,20,112,101,184,167,159,
+4,249,230,127,253,246,215,191,133,166,248,187,81,126,243,221,223,65,141,190,255,95,160,110,126,248,211,127,36,209,63,43,195,17,38,127,113,4,208,55,127,241,15,223,252,242,215,191,250,229,191,133,143,174,249,254,55,255,76,221,159,64,240,211,76,255,26,154,242,15,16,194,32,81,255,248,15,84,251,211,173,95,125,247,103,144,238,254,235,127,241,47,190,57,170,246,23,127,244,39,191,95,162,211,197,239,79,200,248,207,254,252,191,248,243,255,224,191,252,79,255,115,12,34,119,198,129,48,127,246,116,56,30,144,81,190,154,242,182,148,171,112,105,23,125,110,93,197,212,132,92,97,127,147,190,249,184,241,55,87,184,203,46,6,196,220,98,115,44,92,82,104,60,227,178,101,84,29,146,110,136,218,211,31,133,238,213,51,14,242,237,95,52,209,45,93,247,134,139,36,251,92,130,49,133,59,92,117,238,42,204,88,186,40,212,118,64,57,120,211,36,32,35,25,9,153,178,177,10,69,210,187,204,106,70,120,121,241,203,159,87,171,198,246,105,179,213,100,166,135,229,106,1,253,75,34,
+86,207,155,213,106,61,120,217,147,46,198,107,124,82,224,254,188,127,217,223,126,53,23,31,65,236,129,38,88,190,26,222,162,140,208,115,250,203,114,39,216,105,58,236,175,126,42,164,208,18,225,99,130,104,12,80,211,104,113,57,126,196,13,189,224,248,200,167,213,222,56,246,226,17,155,220,21,190,206,177,219,217,251,19,22,120,5,128,251,136,248,189,204,201,190,101,197,26,59,73,174,229,200,9,122,62,251,209,57,155,226,108,15,247,243,242,218,140,62,172,40,102,76,81,156,33,55,174,250,239,72,84,154,126,126,13,80,225,95,105,200,164,27,247,216,175,252,16,227,139,229,252,56,44,56,16,131,166,215,114,29,205,176,135,136,177,165,130,115,143,220,235,196,70,141,228,22,143,93,75,181,53,44,0,92,3,52,202,192,249,34,23,116,37,165,237,34,129,173,233,214,178,238,120,33,96,48,220,24,179,213,216,121,120,184,6,128,130,32,131,125,1,108,242,161,207,30,110,94,106,153,75,180,63,255,113,119,55,87,94,30,190,54,209,203,79,98,77,47,170,162,225,25,50,109,217,
+13,207,148,197,84,50,185,118,112,40,39,230,25,225,119,187,189,67,111,17,125,46,206,22,170,242,1,77,79,185,76,127,93,133,23,173,13,136,183,207,238,85,97,221,67,73,18,57,176,150,3,210,174,230,177,242,157,174,75,237,57,216,135,60,178,210,34,144,109,64,75,107,145,77,80,117,227,48,113,24,78,206,63,83,139,43,34,145,56,147,149,30,153,214,162,38,203,41,124,18,28,41,3,158,219,136,14,247,204,46,231,246,62,172,225,31,94,56,79,229,115,246,232,66,243,46,29,235,235,182,132,89,175,179,81,31,103,141,184,208,49,170,197,153,217,51,82,174,83,64,235,106,246,171,219,177,132,236,243,16,73,21,132,236,9,226,226,118,226,39,162,152,173,26,102,17,193,21,164,247,156,182,98,96,232,28,214,135,29,231,112,109,248,76,63,220,61,215,26,54,95,103,86,40,69,75,169,89,251,176,14,146,178,151,254,254,181,31,135,109,127,222,243,104,13,251,194,98,101,189,127,20,178,107,79,33,88,126,158,98,201,2,111,111,100,219,57,158,90,85,5,163,115,22,163,39,
+103,158,0,126,118,245,25,37,143,152,185,94,56,49,59,204,30,114,6,102,53,239,217,47,244,119,41,182,111,121,179,189,141,240,15,253,86,109,210,207,229,15,22,235,246,185,201,93,211,177,110,203,66,195,207,27,94,122,41,4,160,3,56,65,237,122,223,51,73,67,249,79,211,149,33,138,127,225,56,84,211,113,160,127,33,40,182,68,37,224,241,85,86,157,55,74,124,102,153,243,78,156,90,163,187,7,92,219,83,170,44,244,175,159,242,105,78,101,76,89,36,207,59,150,79,220,199,37,167,124,65,205,203,95,69,112,124,62,97,50,209,88,72,213,90,94,165,131,150,51,67,106,74,18,58,135,8,105,105,9,10,102,62,75,240,149,238,118,110,22,243,195,139,215,229,80,46,174,188,203,45,202,35,119,8,6,13,113,179,190,126,210,33,175,115,13,43,47,71,246,12,57,181,79,10,241,69,11,36,30,38,109,233,132,38,196,122,162,135,241,75,82,79,22,133,204,213,33,87,97,41,63,179,177,42,149,47,129,43,77,59,248,65,176,201,111,170,21,42,181,127,67,10,122,176,5,
+251,235,160,157,49,202,20,233,61,235,233,90,70,236,100,50,62,226,43,184,161,45,57,99,150,168,30,122,14,126,233,178,53,160,149,107,80,198,242,138,91,239,59,164,121,56,139,213,174,186,52,219,30,248,80,150,115,102,107,221,187,12,145,131,169,106,107,243,63,34,124,150,223,155,30,60,63,156,173,209,79,187,151,158,81,52,31,25,122,254,195,232,147,108,89,12,223,240,14,254,188,243,216,188,171,236,106,117,4,147,233,143,235,15,105,247,42,49,28,62,183,163,150,242,242,240,196,233,219,163,149,116,105,211,195,239,23,105,126,152,124,31,226,180,103,225,39,141,91,82,82,62,37,238,167,251,174,197,47,215,97,159,5,237,180,166,121,103,151,103,91,203,181,222,230,255,152,225,56,206,3,185,47,181,186,11,153,247,2,122,49,201,241,103,27,124,77,71,188,178,188,188,112,55,227,246,203,14,53,253,140,52,51,83,126,195,94,23,184,38,15,84,230,51,157,160,56,248,95,195,214,244,238,177,204,231,251,134,249,186,227,203,225,194,109,150,235,53,148,55,89,165,8,171,136,59,
+171,167,46,9,100,239,138,42,59,60,217,202,55,156,235,249,35,185,228,219,54,24,156,151,145,180,158,120,4,49,24,77,13,171,180,96,151,45,210,56,221,238,26,91,90,155,146,223,127,184,153,61,93,15,174,11,164,84,53,147,127,67,148,39,163,187,46,151,182,184,118,78,82,219,201,197,67,223,180,201,153,237,132,187,30,42,108,109,191,25,22,214,243,106,35,199,83,153,130,42,69,115,122,247,150,168,36,6,79,175,2,191,65,134,117,180,90,30,249,252,233,178,219,81,241,31,166,30,118,14,65,58,72,226,245,183,199,145,74,111,16,55,54,59,95,114,124,88,8,192,11,139,128,191,110,236,111,124,100,111,252,163,97,255,24,38,172,129,109,175,180,187,147,154,77,117,204,211,225,163,39,179,158,163,198,114,146,241,77,241,89,218,207,18,177,73,177,95,43,169,182,162,39,203,2,119,233,107,217,232,43,55,160,43,213,65,77,203,95,201,216,233,182,103,112,167,188,204,54,120,194,116,240,106,57,177,110,47,185,190,177,235,218,20,189,94,133,38,175,157,86,100,203,202,250,86,
+235,173,249,53,213,244,120,125,35,84,175,113,184,222,188,236,183,175,146,250,44,203,48,74,195,206,141,85,246,165,2,156,226,188,189,86,193,214,140,54,45,80,31,59,13,47,221,178,219,228,72,53,174,108,220,226,96,72,86,38,94,198,159,173,109,163,45,240,236,246,138,197,91,225,125,63,36,86,95,62,50,2,17,7,165,111,184,207,13,181,182,101,181,140,108,119,121,125,78,163,180,36,61,242,245,20,197,202,172,207,212,117,134,92,112,200,244,200,131,36,239,35,196,228,106,24,132,175,62,87,110,134,253,222,116,255,138,26,180,27,232,165,190,166,111,238,110,85,144,220,47,157,238,149,235,77,240,56,112,91,144,96,120,51,198,14,119,124,214,245,107,89,133,178,200,172,161,45,85,166,61,228,244,74,29,35,179,116,135,172,68,57,27,47,88,109,200,216,225,162,215,231,174,236,89,146,255,211,97,207,247,2,207,88,247,130,87,124,225,172,245,201,217,102,43,144,203,237,222,232,212,30,126,70,67,22,158,33,208,69,236,201,229,187,255,250,35,4,205,172,145,126,45,183,156,22,
+61,63,236,9,122,198,139,180,162,63,189,227,251,63,250,79,31,220,217,22,253,148,244,182,45,100,185,109,218,94,207,14,119,52,202,166,106,237,64,97,229,126,201,41,89,182,133,197,220,102,121,147,202,222,181,23,217,49,149,164,240,168,239,44,209,25,199,29,96,95,119,0,58,173,189,101,53,63,174,51,41,252,123,160,239,63,8,28,68,25,94,80,205,152,129,97,77,11,57,205,96,165,153,173,79,117,254,202,48,19,138,212,45,150,237,237,67,211,255,217,86,39,175,46,21,13,51,147,81,201,250,223,152,41,242,215,28,124,214,79,31,81,145,140,185,170,215,215,118,221,243,198,164,233,14,59,223,84,163,247,210,219,218,60,78,225,220,143,30,45,97,204,85,106,236,95,89,116,105,249,92,0,22,170,157,116,248,112,46,104,250,23,213,131,10,167,235,248,226,239,100,177,127,195,207,95,55,173,253,122,234,233,166,148,203,237,192,91,65,147,99,123,119,131,74,98,214,182,189,57,240,68,37,110,211,206,39,45,176,150,29,191,173,25,69,252,27,204,188,194,20,83,209,179,248,0,
+255,192,126,3,243,155,189,96,214,22,15,61,130,218,251,33,149,247,84,144,253,65,235,134,171,215,60,5,155,217,125,97,58,77,40,6,15,175,2,135,188,161,224,121,4,95,198,170,38,116,246,182,208,200,21,228,214,106,55,106,158,11,124,189,5,205,178,13,227,62,157,214,27,136,32,4,167,41,199,200,53,88,85,159,180,100,175,63,30,255,218,51,219,207,67,117,215,118,143,14,77,186,196,235,68,235,1,47,31,217,83,87,43,197,33,93,24,63,174,87,185,150,172,216,215,125,190,51,109,239,217,242,212,29,115,36,214,183,49,19,2,196,80,54,82,178,87,105,74,141,155,236,213,211,34,229,65,224,49,43,133,182,150,120,126,125,161,30,148,195,167,102,35,138,222,209,248,107,129,71,25,115,126,236,68,56,85,124,87,81,240,211,145,7,193,123,201,24,186,127,150,203,117,168,240,66,94,160,147,82,69,82,178,154,56,119,31,54,11,72,195,196,114,74,112,129,123,213,8,6,11,149,78,85,138,93,112,56,247,140,115,219,231,34,139,191,83,88,237,154,146,248,189,228,23,244,
+14,244,236,125,171,235,178,130,119,244,156,97,114,199,223,119,146,228,49,213,9,133,29,25,211,209,39,183,55,226,151,250,253,64,69,126,221,73,82,133,15,40,144,131,143,41,79,245,218,198,107,88,188,214,7,7,175,105,153,142,137,109,74,227,86,26,202,61,94,122,178,159,98,215,135,123,175,123,145,223,134,30,230,155,251,119,51,247,105,215,124,66,190,111,193,151,222,252,169,113,199,12,78,177,238,230,60,239,122,229,182,16,19,42,235,177,89,128,58,197,53,54,217,104,131,119,231,217,17,223,54,119,165,60,61,170,139,190,131,31,44,197,254,241,230,213,54,110,63,143,238,220,251,89,227,163,102,202,103,80,215,6,246,222,77,211,127,222,111,38,186,98,230,37,248,214,112,67,196,134,54,13,109,116,158,106,101,23,210,125,185,163,157,181,110,16,179,92,51,158,228,183,175,139,76,255,227,38,169,29,147,245,15,204,75,139,190,201,109,128,95,31,151,214,25,58,26,172,165,122,45,214,98,222,92,72,52,87,23,14,82,160,249,182,199,170,73,11,90,118,115,87,151,111,223,91,
+163,253,48,30,127,204,57,188,31,153,174,249,122,53,68,117,102,169,212,155,61,221,75,167,223,208,133,183,93,218,10,0,61,224,225,172,254,242,144,163,151,207,245,147,125,225,94,48,71,229,222,91,221,182,203,23,20,92,146,101,134,109,173,106,125,88,122,170,20,235,125,159,178,190,6,31,160,249,58,82,227,212,174,21,210,49,191,226,45,240,138,136,96,74,165,144,7,88,223,93,138,18,114,12,218,176,67,93,203,159,250,210,198,27,71,225,254,146,47,87,177,7,148,56,33,220,227,1,128,46,115,25,238,65,78,174,227,115,149,184,206,165,18,65,68,115,244,52,182,87,216,132,73,219,8,205,197,222,0,77,145,167,5,255,245,79,254,25,225,255,8,147,49,90,219,151,154,127,60,102,197,75,53,106,62,9,182,86,215,54,251,108,165,84,172,155,252,218,147,141,176,253,188,118,206,148,138,221,227,123,11,125,189,190,94,51,190,0,96,67,30,218,218,81,217,178,129,239,113,2,10,124,77,185,54,47,3,99,102,73,163,70,108,45,54,139,108,248,249,50,69,62,1,11,12,14,
+242,19,67,113,66,38,227,68,189,171,74,230,186,11,148,198,170,107,22,32,156,179,34,179,2,95,240,56,167,132,61,210,90,66,213,204,52,184,82,107,69,97,117,77,23,157,233,123,210,243,66,29,94,190,68,11,201,188,201,173,12,109,106,36,234,220,96,37,78,228,196,209,219,75,214,30,162,42,141,207,97,217,215,118,40,225,147,130,87,117,29,57,171,186,141,108,29,192,235,125,198,123,136,189,206,248,91,182,170,229,99,23,173,110,44,83,195,153,14,243,165,201,54,211,51,91,228,230,221,56,33,110,112,115,215,203,106,249,98,63,153,140,68,137,193,66,105,177,41,108,207,104,252,4,105,126,40,164,183,174,219,173,31,228,136,100,252,194,133,249,34,177,49,109,134,137,8,58,43,217,141,171,58,189,166,164,21,48,122,91,106,77,173,106,233,166,255,59,43,111,214,155,78,248,165,137,125,149,191,114,17,229,102,164,76,231,34,138,230,59,36,95,97,70,153,76,102,164,214,244,168,211,163,190,181,13,54,182,177,217,23,179,27,40,192,236,102,223,193,6,99,40,246,125,135,50,
+96,150,98,223,247,162,82,246,175,187,255,147,219,104,46,172,82,213,123,234,173,115,158,122,206,121,159,3,175,241,90,111,116,174,217,75,132,247,179,86,150,225,82,127,27,205,249,86,209,196,214,53,52,22,171,114,127,157,244,168,243,60,167,115,138,157,88,181,110,237,166,141,84,58,71,167,41,6,126,80,238,4,201,149,47,150,101,145,125,196,201,181,37,43,187,195,65,32,141,186,55,145,228,22,55,165,173,41,107,72,213,38,106,104,210,27,226,198,149,11,182,39,49,214,117,79,246,213,103,90,144,146,160,247,233,104,39,112,20,161,184,140,68,40,76,107,211,82,45,23,174,124,144,73,7,89,62,94,157,187,193,82,33,206,160,31,73,236,15,124,37,120,61,97,189,12,117,224,88,121,250,234,105,163,38,129,126,146,224,73,235,91,191,83,188,34,231,114,183,147,120,34,195,110,108,41,140,199,117,91,115,187,146,54,228,116,75,104,85,0,57,212,73,47,6,86,186,227,99,48,56,30,216,104,202,0,167,92,113,103,229,178,152,151,175,203,44,101,210,175,105,171,233,125,132,93,
+17,115,101,232,233,227,60,184,113,65,230,130,247,217,10,139,102,125,33,200,160,205,209,25,98,200,220,54,235,182,227,42,152,16,194,115,17,249,10,94,78,84,45,146,153,96,79,176,213,254,25,124,120,76,181,94,104,253,110,80,112,157,27,170,28,250,55,237,106,156,155,214,241,108,199,166,100,171,231,124,225,215,84,214,51,89,47,147,236,65,248,163,47,8,234,171,95,239,88,174,48,248,79,252,229,138,252,240,243,65,78,30,31,152,19,217,245,107,4,211,247,231,252,219,172,218,155,92,223,29,47,46,222,216,79,107,69,52,213,179,227,153,95,178,78,59,122,121,193,252,252,16,76,61,54,229,203,136,48,89,54,220,207,84,233,128,114,171,34,56,99,135,239,73,218,222,164,137,166,79,27,177,211,127,252,166,95,93,80,120,181,188,154,135,179,255,116,81,158,171,167,192,240,238,114,253,182,190,111,178,81,143,13,119,124,35,196,190,106,218,187,22,79,173,28,69,2,106,129,214,158,157,154,130,21,87,117,58,213,227,52,165,207,86,126,58,38,94,194,29,85,219,216,40,55,224,
+11,111,233,101,91,150,120,71,169,120,177,75,97,222,194,166,175,195,36,17,199,109,182,70,233,90,2,181,212,212,173,189,80,252,124,104,142,32,245,26,136,203,26,155,30,177,112,64,124,156,202,61,85,15,44,29,147,15,119,218,36,140,243,15,154,88,211,38,116,238,24,189,53,55,94,172,122,66,65,131,247,235,204,55,33,245,226,247,59,224,206,205,71,150,70,56,45,179,5,145,120,168,73,188,38,90,44,194,18,175,29,223,107,180,163,146,184,173,122,109,200,192,54,221,194,215,246,2,122,252,53,201,67,222,238,39,18,44,25,245,115,183,14,90,107,78,55,59,62,78,54,116,178,230,26,226,253,167,81,182,124,136,252,252,86,104,35,77,216,34,209,132,161,40,233,228,231,140,10,142,202,80,232,196,66,149,183,98,98,10,90,161,250,74,229,177,8,171,57,33,95,65,48,78,188,193,129,226,186,182,37,141,2,80,249,138,244,202,251,70,93,178,160,39,98,8,150,15,242,136,221,190,210,185,107,46,226,183,89,56,217,178,110,163,68,31,143,191,22,132,12,126,68,145,37,225,
+203,33,235,9,157,48,205,133,199,61,47,88,88,93,150,120,221,150,231,46,87,167,51,123,229,193,195,224,141,211,59,100,138,195,143,132,14,171,71,208,204,224,61,135,22,225,13,202,112,233,13,47,142,28,35,163,208,20,23,225,207,249,151,77,158,207,53,25,228,146,86,161,254,248,112,6,86,3,248,89,59,22,120,97,3,23,92,202,88,154,138,170,168,155,220,55,166,34,201,164,30,204,104,62,66,140,249,60,31,20,188,177,162,130,240,158,99,208,184,121,97,39,63,116,176,154,139,116,110,183,148,72,56,159,108,228,233,240,89,156,176,171,54,29,207,75,107,76,156,92,103,180,108,161,49,87,245,176,38,30,158,120,24,163,78,71,233,164,235,10,64,120,207,54,169,118,221,154,202,62,101,238,204,240,43,18,117,230,214,174,237,107,3,67,162,249,86,181,38,35,79,9,122,179,52,242,88,104,119,170,237,16,38,6,239,47,69,22,245,178,160,58,14,166,144,211,179,104,5,60,144,235,22,183,190,149,120,253,187,245,224,230,168,114,28,147,171,8,251,84,154,67,83,87,224,169,
+109,36,125,222,25,41,244,114,186,170,108,27,85,86,125,95,217,241,173,56,7,34,225,117,42,62,21,136,21,118,84,23,131,244,237,210,29,122,28,90,172,57,103,184,76,23,30,12,247,6,161,47,171,33,121,164,214,120,255,241,113,14,43,235,167,116,40,39,140,195,184,165,167,172,34,8,46,109,19,225,250,251,137,188,226,174,205,34,230,45,71,181,142,37,17,75,239,22,49,223,101,162,252,126,233,179,83,173,239,9,199,45,117,84,104,215,35,244,58,187,124,16,172,35,85,151,85,94,34,212,58,209,42,222,172,185,37,39,96,97,182,83,26,71,76,187,183,169,25,176,70,204,236,135,81,89,23,175,222,209,114,217,4,230,44,149,109,165,72,52,61,151,143,44,91,11,89,225,247,190,25,220,184,199,80,157,29,43,152,68,187,138,49,80,115,172,192,66,59,74,102,113,119,157,88,148,46,61,14,47,11,234,106,12,144,206,88,69,37,245,94,220,151,140,111,99,128,105,200,81,55,137,145,145,211,211,200,193,74,43,88,103,181,72,205,70,29,152,146,11,196,143,33,79,224,240,
+210,155,251,73,187,212,206,157,32,36,246,65,225,183,121,229,92,91,166,187,137,107,210,148,200,225,17,122,20,240,158,158,250,228,35,250,200,42,217,26,42,76,217,92,45,159,70,101,231,33,214,33,245,84,5,227,73,208,59,135,4,218,92,237,180,65,192,85,168,174,111,219,94,122,160,58,99,251,108,55,241,160,103,159,227,4,85,95,230,183,183,67,254,209,121,53,173,94,46,84,1,215,237,116,185,53,9,149,52,161,222,227,242,43,189,11,217,73,35,97,70,135,129,173,176,23,122,21,42,243,229,101,77,17,240,184,194,219,66,219,236,16,20,181,217,152,132,127,179,229,247,93,253,55,161,239,89,150,88,231,92,181,176,131,101,157,123,217,23,126,13,214,24,82,187,146,151,9,219,244,184,102,20,150,215,217,21,213,180,190,9,27,218,35,164,173,109,90,171,73,79,70,206,49,214,7,161,167,93,76,231,202,146,190,57,195,71,91,122,16,222,155,18,7,149,242,97,8,221,20,134,107,237,109,82,251,126,230,48,192,130,122,159,162,238,142,119,133,162,125,192,137,154,38,117,141,
+66,251,17,139,105,190,61,202,39,88,9,31,169,30,149,165,75,154,231,37,250,194,114,164,163,237,183,136,71,200,130,20,206,229,107,227,148,21,101,190,75,149,141,64,234,90,83,75,18,249,45,171,176,212,196,198,217,199,246,120,246,193,127,184,251,242,120,211,251,104,40,93,32,114,165,99,181,48,170,187,35,100,217,36,245,90,195,54,103,233,218,80,111,147,9,61,33,31,69,194,177,44,169,42,63,236,176,83,143,124,2,140,179,117,101,125,246,12,139,195,19,167,247,52,156,112,6,185,226,197,144,169,114,247,111,221,237,161,218,43,201,192,134,64,252,240,52,144,101,72,240,132,5,88,196,55,8,60,168,220,177,98,209,248,192,85,111,44,106,63,72,234,146,14,225,179,61,140,136,130,9,55,197,138,40,50,38,29,91,173,119,173,91,252,247,37,43,228,45,39,3,78,63,168,22,45,213,173,200,203,87,44,238,178,90,196,174,14,85,225,104,16,25,213,195,64,114,140,198,75,178,248,11,82,37,50,187,235,30,230,81,193,209,176,10,182,196,168,96,254,20,97,152,138,237,113,
+151,154,173,112,191,60,180,139,144,241,106,122,12,250,1,119,187,159,85,12,149,121,102,216,94,77,54,98,4,225,244,9,78,86,23,101,46,46,178,45,44,135,3,93,38,52,156,135,238,28,222,33,89,115,181,48,166,31,219,173,173,204,203,229,199,211,23,63,249,76,226,142,118,193,73,158,25,88,123,27,195,218,120,98,246,203,59,84,245,218,41,39,174,2,7,183,89,68,169,216,4,5,66,114,59,218,244,19,245,67,69,53,204,45,21,147,137,174,200,169,88,74,122,218,123,168,253,5,143,121,178,143,108,25,231,93,27,132,149,187,221,135,222,171,87,104,67,216,162,172,45,212,249,176,57,144,6,12,207,86,191,241,104,223,178,193,243,222,233,1,15,218,90,23,90,87,251,53,135,143,40,107,68,98,94,19,185,61,201,11,218,42,183,241,243,51,115,153,218,89,94,167,162,70,237,214,249,212,185,99,206,24,176,167,117,78,57,185,109,219,135,100,237,116,145,10,213,135,115,53,185,21,121,59,252,225,157,201,187,26,63,190,54,64,28,9,124,155,78,160,23,177,119,73,234,103,
+217,67,37,243,28,206,237,82,189,87,97,173,253,83,30,76,15,205,75,210,246,112,91,32,54,242,195,14,226,110,228,4,235,90,210,72,46,19,248,111,13,166,19,87,30,28,251,133,131,146,16,19,83,105,141,114,50,190,29,53,105,133,125,176,76,54,175,116,187,174,179,37,231,165,94,199,162,70,255,33,166,92,15,152,21,200,70,149,145,109,73,113,119,8,223,171,211,133,225,113,75,60,19,13,68,163,110,216,96,212,129,248,161,94,125,27,107,66,22,225,209,226,49,241,134,156,27,201,201,181,81,231,89,72,253,84,96,168,239,45,54,115,179,178,170,31,139,145,66,148,199,207,28,205,145,232,216,179,205,92,119,15,169,106,249,209,125,55,100,58,248,208,194,117,98,50,134,26,246,73,121,154,26,208,190,220,144,60,246,60,74,43,63,102,122,14,29,163,217,109,181,40,219,215,167,202,212,236,36,169,223,73,220,223,35,76,205,69,155,241,149,110,239,137,136,43,201,227,29,253,77,37,55,89,11,168,6,187,205,18,170,191,29,130,99,3,52,94,59,133,161,55,67,238,56,66,
+169,155,68,210,87,188,173,63,136,73,178,140,100,78,253,58,192,213,139,230,1,111,233,112,95,154,124,92,175,35,110,244,162,158,45,65,167,99,244,52,215,18,87,75,173,28,118,222,207,84,235,227,133,107,237,173,210,7,158,237,90,230,110,187,149,148,166,94,110,84,178,201,95,204,73,159,126,161,243,75,37,237,183,242,39,37,247,156,241,119,46,181,66,181,9,154,92,191,229,110,156,183,75,65,170,19,176,184,244,207,15,95,169,28,122,203,212,146,69,23,103,223,214,45,218,126,225,200,171,76,121,72,125,208,117,8,129,149,136,249,162,221,184,134,205,212,198,220,67,54,100,244,242,70,105,92,95,221,126,20,185,26,54,61,242,198,73,107,21,130,119,164,187,189,108,189,110,158,203,61,228,215,130,104,95,223,118,217,178,139,101,68,173,171,12,177,165,243,178,140,93,191,139,27,196,201,249,55,113,176,87,77,219,231,210,187,106,58,240,92,165,109,223,117,18,93,168,167,116,135,22,148,180,23,239,45,117,141,224,172,128,46,234,200,60,120,1,250,191,60,232,251,160,223,244,220,
+220,64,83,79,231,209,171,231,39,10,196,5,209,42,124,126,21,250,204,207,107,155,240,166,117,246,109,76,91,235,165,38,28,44,100,201,112,118,31,81,179,77,17,245,105,212,222,244,82,33,41,105,231,89,77,79,200,80,228,29,29,36,172,115,255,82,102,86,188,153,124,21,36,102,24,132,136,14,247,13,107,71,229,233,181,52,246,205,213,82,211,83,135,31,53,33,242,219,83,173,215,8,146,241,69,110,254,64,247,191,182,135,115,72,78,89,6,119,249,190,123,255,17,160,219,121,168,76,166,12,247,253,151,42,183,202,91,160,9,58,225,130,180,3,95,94,122,205,148,47,15,244,78,25,244,60,164,207,222,234,69,26,150,229,15,45,222,234,200,26,150,51,185,139,213,202,26,146,227,36,35,171,102,120,115,129,61,203,27,126,41,4,236,245,248,86,33,222,14,112,188,245,99,107,162,9,233,166,94,169,105,0,150,146,131,189,26,10,160,207,239,131,33,201,67,213,224,28,18,75,211,45,202,166,110,149,83,104,200,105,148,232,5,131,5,40,95,213,3,15,95,93,143,248,23,249,
+205,205,229,154,146,104,34,86,251,149,31,244,16,178,207,167,118,242,72,86,236,190,39,253,44,217,243,202,144,200,187,208,145,153,76,51,232,248,66,96,165,14,87,158,10,116,88,201,30,176,184,13,50,183,79,173,80,135,241,88,236,21,82,125,79,249,167,143,253,72,37,148,39,87,141,17,247,194,52,220,223,211,132,235,143,211,9,4,98,77,228,89,112,113,166,29,30,191,99,186,125,124,187,155,209,24,80,101,233,37,160,111,184,119,252,216,115,113,69,128,18,222,177,225,199,161,199,75,204,161,139,219,39,223,41,67,9,9,183,30,234,137,192,197,23,112,207,172,175,167,245,137,28,16,203,111,48,16,110,53,132,194,27,182,84,122,175,10,119,75,230,207,240,151,55,55,116,212,22,223,240,208,174,202,255,12,24,222,14,23,248,7,76,234,178,168,210,117,135,127,27,155,224,10,63,166,47,152,173,177,66,70,72,13,189,77,154,121,186,164,99,126,94,13,47,41,238,215,207,225,92,47,96,41,46,215,247,196,82,178,248,68,41,145,47,46,148,27,170,142,237,97,205,241,1,77,
+13,232,190,226,147,49,125,188,88,120,174,219,84,242,203,63,55,214,40,175,215,177,181,102,147,110,178,178,75,32,168,36,238,149,107,149,86,185,20,252,56,241,227,3,62,182,93,122,242,6,207,134,143,173,253,75,237,189,99,99,101,104,191,60,111,208,251,23,22,184,124,94,92,122,44,10,69,1,12,212,200,84,44,210,25,230,223,97,238,21,150,219,204,196,92,121,244,154,219,137,253,143,231,254,223,40,15,171,49,120,29,114,149,115,120,145,231,2,169,7,6,215,244,63,112,188,61,190,245,181,33,20,74,126,242,118,223,126,241,229,240,238,79,88,175,205,221,167,17,194,124,253,248,115,186,51,108,224,159,211,251,214,239,233,171,176,167,191,88,159,174,47,215,41,12,115,44,236,55,210,63,185,125,243,128,77,140,17,243,237,215,205,155,66,125,201,124,21,234,159,177,59,46,46,113,216,253,126,204,248,7,34,232,2,156,131,215,186,16,142,207,156,141,164,152,237,159,184,62,97,99,67,42,184,234,222,196,175,241,191,30,50,8,111,152,135,182,238,1,49,151,200,241,246,206,42,
+21,21,192,125,133,233,203,47,6,78,57,95,245,207,239,53,243,246,198,48,22,179,130,128,236,144,24,154,45,33,203,183,61,43,49,116,7,242,235,63,227,198,183,183,149,175,24,29,127,25,96,102,186,41,95,180,228,239,249,244,233,85,24,196,124,195,92,203,250,164,14,161,61,204,104,235,230,124,233,250,181,24,184,251,190,253,141,244,214,115,128,146,231,114,6,114,177,236,18,164,165,52,41,133,131,159,41,23,63,224,189,173,90,128,48,113,60,238,89,106,61,223,80,190,208,21,29,117,245,159,120,119,63,147,18,147,67,92,89,155,35,247,214,34,246,239,85,225,133,14,187,58,237,26,118,214,199,72,251,7,79,201,31,120,63,159,126,209,190,191,154,255,129,87,111,250,3,239,197,203,31,120,15,132,63,240,62,224,254,192,251,254,245,7,222,165,238,207,227,132,79,127,224,45,53,255,192,123,225,131,147,189,245,236,242,250,194,242,107,237,9,99,216,34,19,22,219,172,239,129,206,196,219,193,57,248,67,180,216,47,219,219,133,115,40,4,21,137,113,136,111,234,238,97,252,236,
+28,235,144,127,121,255,138,177,231,158,51,132,41,227,206,28,226,111,152,78,51,30,42,227,214,167,238,245,111,186,77,46,123,7,57,90,62,215,31,195,128,242,249,220,33,211,11,127,18,235,240,117,120,45,102,187,47,93,245,205,70,125,252,43,206,10,215,118,189,128,154,15,215,223,197,205,143,103,169,95,54,179,183,179,217,102,111,35,202,110,172,78,36,34,252,111,240,117,44,15,183,108,12,139,155,63,207,59,9,109,196,95,230,5,126,79,75,73,103,241,79,28,79,88,28,63,208,92,120,254,16,105,131,97,243,3,141,255,249,15,243,48,94,255,50,79,136,97,115,137,221,255,207,252,31,254,41,7,203,143,63,229,224,128,91,30,15,183,150,191,242,177,142,129,118,103,158,161,248,9,11,47,195,28,190,248,115,121,40,240,24,134,82,228,104,31,231,167,146,194,153,40,191,151,65,13,83,169,81,113,21,105,89,63,230,160,252,143,191,126,106,247,32,151,113,206,163,215,176,182,109,228,202,132,31,107,216,114,62,144,255,165,254,64,78,209,80,118,62,92,41,54,61,124,6,101,
+133,179,90,83,215,231,33,252,75,30,38,16,76,72,176,202,58,97,178,112,84,108,255,154,255,182,217,118,221,194,173,51,158,222,129,164,211,196,147,174,233,251,47,14,187,11,124,140,60,105,154,21,80,92,34,231,79,187,213,187,248,141,166,150,156,10,254,12,95,60,227,99,224,25,210,211,46,133,42,235,95,241,7,32,102,252,106,40,62,176,240,239,63,78,69,90,158,216,197,159,186,119,129,157,98,118,255,82,239,14,175,40,153,244,193,112,254,203,86,135,255,253,239,254,225,63,253,159,63,251,2,254,221,63,252,229,63,253,195,95,254,227,191,251,127,254,242,15,255,248,119,127,249,183,255,195,127,249,175,127,251,183,255,246,95,253,251,191,251,199,255,252,179,157,225,239,255,254,239,254,241,159,54,5,252,237,255,245,31,254,225,47,127,247,159,127,190,248,255,219,159,173,2,191,23,255,219,111,249,255,152,253,253,127,250,191,255,227,63,219,253,147,209,255,103,75,192,191,253,87,191,187,34,254,167,127,255,187,125,226,239,254,195,95,254,254,207,102,137,63,95,246,255,207,255,230,
+159,183,99,252,235,255,237,223,252,229,255,248,175,255,240,95,254,235,63,252,110,163,248,167,193,63,135,191,238,3,248,155,191,249,215,255,203,255,248,55,127,243,55,255,235,5,110,114,53,187,186,184,192,81,144,223,141,0,108,254,216,115,71,145,245,252,123,249,177,82,141,10,163,175,211,167,114,237,149,198,126,45,81,47,179,87,248,86,216,92,2,240,172,92,251,89,251,238,119,61,7,47,252,207,210,87,225,180,253,124,228,147,110,70,152,24,236,118,175,12,33,105,221,47,31,93,50,173,246,167,156,203,244,105,184,236,205,151,187,138,4,239,191,112,46,242,227,201,186,88,168,95,201,46,89,133,168,211,38,50,25,25,76,38,122,62,66,251,229,145,29,235,237,239,108,170,197,169,151,148,141,93,80,117,42,204,18,122,124,110,194,102,112,148,167,209,106,2,93,72,60,32,207,75,29,212,142,72,97,253,238,5,131,91,86,188,97,125,117,12,28,211,163,163,83,9,208,213,35,82,162,97,117,59,90,131,47,231,44,72,119,174,110,95,253,235,213,133,223,146,89,149,239,253,86,21,
+234,83,149,79,209,158,63,230,35,194,201,37,171,200,226,98,127,52,222,80,234,233,9,158,248,38,138,106,86,14,79,117,138,118,207,203,231,186,15,19,229,219,153,245,28,170,205,194,5,123,85,228,58,179,229,190,229,92,159,241,44,109,114,52,137,212,97,43,196,169,76,142,182,108,214,71,219,12,142,190,248,122,64,14,220,69,228,207,223,74,25,135,77,49,118,60,237,244,119,205,120,84,16,141,39,162,2,48,239,172,234,187,247,143,15,208,43,92,46,215,82,240,41,97,69,30,253,28,105,168,182,127,189,107,166,165,147,243,108,120,12,139,146,221,110,243,176,72,19,50,178,253,33,235,195,217,196,64,201,196,36,188,80,253,183,226,25,3,72,20,229,173,184,134,98,226,245,238,202,111,157,200,141,133,104,51,81,98,76,153,174,45,209,218,220,172,126,98,1,7,232,38,171,80,201,79,52,142,91,58,113,191,73,234,26,158,142,211,20,184,147,219,106,34,165,19,204,75,161,229,88,122,152,238,223,105,90,250,182,230,217,124,107,179,31,229,204,98,97,18,197,88,198,241,123,187,
+113,220,45,24,114,43,239,142,226,23,12,123,209,56,89,250,173,212,36,154,198,151,200,66,149,205,178,120,231,217,199,26,218,248,22,159,33,146,123,18,124,215,22,79,199,197,250,28,160,219,180,136,251,36,18,127,119,15,97,11,89,164,25,222,231,87,61,35,106,92,166,14,81,63,216,10,75,162,164,88,226,48,30,124,31,79,159,52,33,180,149,129,213,205,164,159,84,117,192,42,185,171,36,114,191,97,185,57,127,125,148,109,229,4,198,208,57,35,252,4,252,181,82,147,242,185,162,176,177,80,143,197,82,157,251,233,69,135,216,146,178,168,114,195,213,233,212,119,225,24,123,10,177,7,87,200,157,117,58,122,18,241,93,34,239,219,240,5,165,167,105,82,157,30,61,130,217,73,88,215,94,229,124,137,105,28,162,173,90,245,161,10,127,134,133,138,225,161,76,184,183,50,200,141,25,234,180,40,158,160,219,124,234,61,136,167,12,162,96,138,181,54,179,184,33,95,231,205,177,22,121,236,246,67,114,157,57,18,0,29,58,59,122,49,216,100,224,198,239,202,62,197,175,204,105,148,
+12,89,189,179,138,239,51,10,233,213,0,172,91,101,14,114,41,136,31,101,226,238,34,147,228,136,46,182,63,63,168,40,93,20,122,236,160,130,199,30,45,146,194,118,3,165,118,22,162,154,13,221,217,160,196,118,198,214,151,207,211,80,66,198,219,104,26,232,242,243,122,8,217,102,164,142,137,173,243,154,210,151,92,117,34,108,70,181,122,55,184,158,19,183,227,29,218,56,13,69,231,14,113,3,29,226,199,137,247,92,198,29,21,213,179,252,81,144,200,158,151,223,142,229,0,166,121,135,73,21,205,184,18,27,193,229,74,211,192,247,23,149,94,139,21,182,117,250,103,62,71,140,227,68,170,2,49,175,227,215,219,197,185,232,126,169,215,4,251,44,1,44,234,219,138,232,22,7,157,134,223,83,100,152,60,199,207,56,209,78,27,240,29,171,75,130,119,39,12,248,54,243,246,59,228,58,127,169,245,110,164,195,214,55,122,251,160,186,112,62,27,61,157,42,100,92,9,137,124,214,244,196,185,30,54,226,158,105,79,9,121,123,4,14,58,221,235,27,110,197,10,89,3,200,39,250,
+17,55,173,66,231,245,194,195,112,101,120,213,169,91,209,90,119,128,184,201,152,137,198,220,73,189,199,60,50,236,242,93,69,162,251,102,185,240,223,174,117,211,182,143,158,174,69,208,200,187,3,29,55,81,150,244,176,167,9,79,150,161,183,183,86,146,61,246,237,93,130,112,174,19,10,190,69,37,74,64,143,133,128,111,186,158,224,124,243,118,100,233,115,235,238,178,56,95,247,52,142,232,107,142,69,241,28,101,77,28,253,185,90,190,100,55,230,5,100,202,246,156,38,75,209,118,11,179,79,187,3,33,93,2,64,104,102,235,210,222,229,168,95,235,21,123,144,193,23,139,199,49,250,56,201,46,42,169,239,28,38,219,130,89,159,38,231,181,84,109,113,230,113,130,36,217,212,199,73,127,84,116,201,164,100,19,79,68,69,76,160,25,57,234,227,103,227,138,103,67,39,72,15,221,20,73,232,206,131,16,206,75,57,206,119,88,38,152,232,60,191,56,186,117,85,111,135,38,219,170,32,251,174,189,39,218,166,66,158,183,113,140,171,119,228,218,252,224,181,185,139,171,201,50,201,113,
+141,79,74,236,5,158,166,217,6,128,128,190,122,56,243,10,84,33,100,123,96,63,112,100,143,92,116,156,254,22,199,232,128,214,91,102,40,17,95,182,179,204,132,166,62,214,79,134,188,198,216,186,201,125,90,176,35,100,60,84,32,106,75,212,204,7,42,84,67,76,125,61,96,56,212,93,105,244,232,92,12,59,81,222,212,187,155,127,10,136,142,169,187,215,28,20,133,54,251,105,133,99,123,36,43,14,186,35,138,202,190,201,178,218,32,66,167,252,198,230,249,50,41,68,79,25,57,12,111,245,10,120,179,236,102,0,228,206,231,141,152,214,15,174,236,150,51,147,223,9,71,7,109,5,20,173,2,239,73,36,62,222,154,108,42,228,48,69,143,19,211,249,124,238,107,98,244,78,211,121,174,158,155,79,180,149,222,215,91,212,143,162,115,238,88,107,62,227,43,3,63,190,62,80,71,83,113,76,147,173,178,164,128,232,148,100,54,201,104,109,49,50,155,209,225,164,242,224,109,254,56,7,24,156,104,77,171,143,135,182,208,202,229,247,176,61,125,181,75,240,0,196,133,116,57,104,
+227,62,184,187,99,186,17,101,107,60,239,176,145,185,2,192,41,186,51,248,244,208,210,163,245,33,162,193,185,175,244,57,182,14,84,95,71,181,83,164,20,176,160,125,57,204,149,199,146,167,64,147,224,59,134,82,167,136,207,98,13,159,9,232,73,188,239,116,21,234,97,36,50,175,221,233,209,10,58,189,196,83,204,254,9,32,135,91,107,109,143,127,122,228,101,217,242,53,218,89,171,125,179,85,94,200,37,22,133,150,205,172,179,193,177,133,86,35,85,58,61,76,206,196,65,162,188,109,18,189,78,180,205,72,186,23,248,245,3,128,156,217,54,143,66,20,167,175,252,150,58,20,178,46,46,125,8,192,177,238,39,50,212,185,118,172,68,190,133,64,157,60,104,175,9,52,30,186,18,121,38,206,67,68,182,238,173,229,69,29,139,233,141,113,143,229,136,53,212,70,209,197,150,43,88,28,6,167,228,212,238,140,127,210,31,213,87,40,89,227,191,205,136,217,42,57,188,231,213,105,171,14,91,87,222,23,153,54,133,15,66,247,251,197,81,7,74,151,111,78,166,98,250,209,39,245,
+152,99,223,148,115,220,186,15,71,232,58,137,18,150,81,17,218,211,159,42,220,71,64,239,82,56,65,253,182,36,242,186,93,27,188,221,188,31,112,58,137,116,188,135,174,251,91,55,197,250,226,112,244,166,72,213,153,60,198,172,124,74,103,208,255,89,77,45,59,246,123,126,165,102,110,132,104,132,69,87,112,192,164,207,119,138,108,141,239,167,161,219,60,210,53,248,40,124,153,244,242,167,189,156,151,92,19,157,98,214,83,116,225,42,152,28,34,52,26,157,126,15,229,196,32,105,189,228,92,3,76,133,81,138,167,112,159,23,189,161,188,167,237,237,185,159,138,14,83,95,217,163,157,38,204,91,249,102,157,197,80,203,214,214,23,243,214,209,213,48,215,99,254,107,48,89,223,45,77,100,126,27,165,19,54,238,182,55,103,243,29,135,61,239,177,158,132,206,185,53,16,247,9,89,194,133,40,11,172,226,146,53,115,11,160,111,22,57,226,63,188,28,105,159,239,238,237,98,90,234,87,208,245,138,227,19,89,245,138,109,195,100,168,173,106,106,207,30,110,158,198,221,56,218,34,130,
+126,185,232,28,154,126,67,37,212,110,184,127,229,215,99,62,230,163,111,205,158,30,92,141,141,47,193,18,205,125,227,73,79,136,192,230,101,109,139,44,163,188,109,226,52,51,65,9,197,41,123,66,189,219,158,130,238,185,38,35,243,3,201,43,61,95,155,13,88,13,24,163,61,12,149,118,25,250,122,68,7,137,209,194,171,232,110,118,103,81,107,40,101,111,217,98,252,141,88,75,36,79,11,7,198,200,18,207,68,27,222,83,115,66,44,78,144,97,36,125,212,85,207,211,42,155,211,88,166,15,200,131,13,113,139,201,233,160,205,155,248,154,183,122,154,198,76,250,16,20,40,180,147,221,241,112,182,9,78,107,145,213,177,79,66,155,111,179,27,76,66,150,179,217,124,187,79,28,78,211,105,4,201,68,139,222,167,45,183,68,176,202,224,74,17,70,186,152,190,120,53,184,83,74,80,143,190,80,136,116,216,71,213,52,98,172,141,112,215,221,146,26,155,21,103,233,94,56,94,30,125,117,207,100,186,232,104,187,211,6,79,43,58,210,189,34,7,218,12,221,211,145,140,192,51,90,
+130,247,21,94,187,119,38,159,130,239,153,175,115,238,86,140,239,222,188,8,200,147,23,10,170,192,242,15,97,243,167,206,157,169,167,69,107,27,89,116,138,68,35,73,100,92,243,118,36,50,158,125,27,179,153,220,75,135,39,202,22,184,87,114,186,133,181,225,207,190,78,244,188,247,156,184,19,33,96,128,158,1,60,109,136,107,3,146,167,195,129,111,214,129,25,5,228,41,123,199,34,57,156,80,208,86,219,1,161,75,214,133,226,25,106,17,65,199,196,229,5,250,90,63,174,109,241,100,134,231,245,81,199,197,221,185,39,61,55,54,227,76,75,53,185,47,40,88,107,178,171,25,96,182,187,187,69,218,212,43,86,210,218,220,51,239,129,114,31,8,178,189,15,41,250,248,123,9,219,104,50,223,105,186,56,46,147,90,119,123,180,150,109,61,74,48,213,121,173,234,26,135,228,53,111,116,121,168,111,70,205,185,121,234,179,47,64,80,77,97,187,199,251,80,150,213,73,32,17,91,99,251,93,244,149,54,40,0,30,20,220,99,230,21,73,159,170,92,192,119,62,194,180,111,185,45,
+11,120,24,65,107,95,66,70,231,233,111,122,215,225,242,113,190,251,61,73,17,133,96,218,25,77,76,209,100,91,56,151,30,131,64,220,111,53,118,243,38,52,146,117,115,206,158,99,148,77,108,51,235,209,96,156,47,242,197,229,154,241,139,185,193,173,185,115,48,57,44,203,160,87,63,255,95,133,12,151,14,161,252,253,21,171,221,92,145,125,112,108,61,78,187,53,231,62,30,157,122,191,190,164,159,211,83,125,97,92,99,105,116,252,60,238,182,152,172,201,49,151,62,145,123,118,211,158,238,31,215,62,180,70,68,95,38,241,76,81,23,75,148,124,62,42,0,210,179,230,22,88,108,128,13,98,218,247,205,174,146,189,199,227,227,214,183,67,244,200,62,48,127,137,110,68,243,236,186,189,157,28,71,103,66,73,20,167,245,74,38,95,99,22,139,147,39,142,149,124,103,20,100,19,199,254,150,245,58,132,215,137,41,86,123,194,237,97,242,242,168,223,159,37,39,221,112,127,70,156,99,242,89,228,116,253,188,8,112,103,218,224,109,101,68,67,62,143,53,194,7,8,157,209,229,249,
+37,179,151,211,97,146,106,9,243,238,117,7,180,39,40,147,50,31,66,168,154,14,161,213,131,206,51,211,109,17,175,189,179,199,137,34,10,76,240,79,207,121,163,163,220,126,55,78,224,45,198,59,227,141,68,125,31,89,174,198,61,233,29,237,185,116,236,29,232,152,36,170,248,215,85,200,182,11,36,191,93,98,199,170,61,100,79,89,187,241,194,149,44,97,77,69,148,84,95,251,31,87,175,158,109,136,157,56,215,155,83,254,60,233,221,90,179,33,0,228,226,187,13,150,92,113,94,127,210,124,66,27,223,107,118,177,80,41,104,138,126,131,93,196,228,157,165,216,94,99,156,63,110,146,244,158,205,61,42,220,84,231,138,243,193,126,12,53,217,200,124,214,38,159,76,72,230,102,146,68,235,91,43,109,181,151,139,106,11,67,200,184,230,129,42,121,132,181,61,142,60,190,253,254,46,169,212,3,75,146,119,172,223,210,230,2,209,241,253,32,26,160,71,87,240,57,49,253,36,170,123,170,4,21,97,249,230,101,164,28,183,146,17,184,229,148,154,198,231,161,117,194,62,111,74,95,
+135,7,34,111,179,138,19,69,16,221,61,141,15,63,69,232,65,244,77,255,166,250,155,195,69,92,250,116,91,86,19,115,33,91,229,122,216,129,120,53,110,245,198,239,243,118,149,219,110,125,39,193,21,249,66,8,15,219,208,131,79,246,141,137,128,114,180,232,57,111,96,65,149,13,157,3,247,204,97,194,179,11,250,149,4,221,177,96,60,87,235,232,226,248,110,59,187,194,173,33,233,248,9,107,66,232,198,129,65,51,60,220,76,229,224,225,126,19,128,183,38,141,207,233,112,161,139,70,115,165,47,155,134,32,23,105,174,180,225,45,146,77,23,249,13,239,102,47,10,55,80,191,123,211,217,142,144,162,70,90,133,208,157,170,122,47,170,30,210,62,254,22,202,16,232,115,173,222,195,109,35,215,25,158,40,89,21,122,132,107,57,26,254,152,200,163,251,157,224,24,122,32,203,209,47,36,104,235,209,223,99,160,25,40,178,179,249,164,71,42,58,65,21,207,75,235,217,12,243,71,62,215,62,182,97,250,84,186,227,136,232,155,115,68,1,239,190,111,154,163,161,205,5,184,163,222,
+23,33,168,34,240,191,0,165,184,238,248,32,150,75,35,237,181,54,153,85,232,178,250,131,1,233,121,134,71,111,212,42,176,159,196,76,98,113,12,217,15,129,163,63,143,213,211,117,49,18,84,55,188,171,206,84,25,101,251,190,58,90,78,210,187,3,179,228,198,118,150,251,190,131,35,101,14,58,106,30,211,16,90,6,169,232,153,175,29,74,64,174,91,27,167,173,216,85,8,203,126,250,182,211,1,185,62,113,156,70,95,61,85,207,20,55,46,225,233,122,200,138,72,214,106,34,166,21,140,71,145,113,63,92,213,167,229,148,186,48,219,211,14,54,33,31,211,106,105,149,49,41,160,239,156,189,142,111,161,156,150,21,35,7,186,95,163,187,116,114,90,223,207,105,200,20,129,189,2,118,117,131,73,107,100,42,220,167,207,2,133,166,102,59,141,174,137,66,239,14,62,103,217,208,238,212,50,151,125,238,89,183,128,4,245,246,150,218,231,217,207,87,38,5,76,19,162,185,25,87,14,210,186,122,112,50,73,100,52,49,211,204,198,21,44,151,210,114,52,234,128,31,184,160,42,72,
+128,37,110,48,218,142,221,50,59,245,206,173,216,245,30,125,200,6,143,34,219,49,147,116,79,19,197,17,31,237,113,146,174,225,118,68,159,30,2,166,169,234,16,88,78,156,189,114,14,163,140,201,183,72,32,224,214,119,6,244,158,249,25,134,142,117,186,207,119,230,182,125,86,36,132,122,207,145,182,119,99,156,74,189,139,150,22,69,136,12,80,160,63,28,28,58,144,140,142,91,180,68,87,7,237,92,240,38,54,93,61,241,188,80,34,75,170,22,69,178,136,161,66,114,239,34,236,1,213,223,191,21,247,84,39,206,246,120,32,123,78,111,69,223,246,36,74,156,27,162,83,61,71,78,122,118,161,169,173,180,1,146,130,67,91,32,58,204,233,221,132,39,127,54,41,132,104,175,106,59,239,123,141,83,0,173,206,37,162,195,137,72,86,35,53,101,232,52,217,143,66,231,179,163,122,30,117,203,116,71,209,131,164,34,190,218,26,9,137,52,180,72,6,217,211,186,190,41,217,221,125,207,193,244,113,54,84,88,154,179,113,37,185,235,92,212,209,111,190,202,213,29,237,53,254,41,
+107,129,22,233,248,212,244,213,2,215,67,195,105,205,229,60,44,166,53,116,135,250,204,90,176,53,128,164,69,180,129,11,249,208,189,248,209,71,103,209,10,171,80,5,77,215,209,16,161,62,132,54,102,135,226,32,62,17,113,38,61,197,117,240,251,74,139,172,177,12,94,250,230,93,167,8,63,234,32,117,228,229,91,183,159,150,24,100,26,154,114,119,211,235,237,144,209,21,93,238,135,91,249,156,125,182,229,141,175,75,148,10,94,147,53,104,108,199,90,212,119,90,112,159,134,98,104,119,43,79,14,222,76,10,177,140,73,235,173,30,44,168,212,139,4,18,96,121,59,118,28,59,209,144,219,155,63,248,138,190,162,185,19,58,201,215,43,232,82,113,201,67,243,197,220,210,71,99,163,207,203,199,159,190,106,185,223,136,191,213,43,200,219,191,245,44,11,167,131,254,173,74,27,163,254,222,100,210,240,237,185,24,97,237,128,47,9,49,7,204,225,86,131,214,39,70,10,120,138,45,76,70,48,89,118,170,227,25,203,107,188,186,52,103,202,248,220,190,120,242,223,99,165,103,168,114,
+226,53,150,107,177,147,56,48,240,76,83,98,205,123,156,78,10,236,201,57,189,136,147,249,174,101,18,55,120,63,254,252,216,45,235,91,9,114,92,10,197,14,29,44,78,83,10,240,141,213,240,20,142,250,231,200,251,235,49,201,233,158,219,162,103,224,99,232,20,28,166,57,188,63,117,33,1,77,50,223,151,66,113,97,4,233,148,53,112,43,142,80,1,206,163,17,208,30,45,236,215,18,45,156,193,83,36,180,103,51,29,107,38,54,21,5,101,253,169,2,239,41,31,180,15,90,87,2,134,86,32,141,65,60,110,251,20,9,72,245,59,185,192,6,134,201,161,136,249,36,80,56,26,131,167,225,164,254,222,245,114,128,238,107,142,21,90,220,51,228,140,203,207,40,58,204,90,117,68,106,28,232,28,37,241,120,6,183,116,98,143,144,82,116,93,176,226,112,127,46,141,29,149,201,214,73,121,64,181,41,189,88,95,70,110,11,207,224,81,70,2,51,193,235,125,29,248,82,250,195,108,144,171,92,25,193,184,66,188,55,26,246,174,50,217,197,113,84,213,250,48,109,243,65,219,3,
+81,226,210,177,24,102,249,173,103,204,205,140,39,159,167,113,113,178,226,121,43,43,226,137,56,25,255,24,93,18,179,221,132,215,186,125,193,26,105,160,107,17,189,176,200,13,247,234,174,78,197,250,17,79,243,78,158,255,222,82,129,217,173,184,94,71,4,185,112,205,138,114,77,69,117,217,88,170,4,31,114,188,54,216,21,170,101,30,167,110,120,142,77,45,166,164,242,176,30,55,100,218,18,213,33,237,120,205,0,168,200,116,130,71,19,179,245,102,22,41,126,16,153,215,220,138,49,11,144,17,194,66,135,30,249,40,206,235,128,54,78,159,48,201,147,12,157,10,172,63,179,52,224,231,167,36,58,151,72,129,15,96,55,136,157,254,68,6,246,233,232,116,243,226,93,36,143,83,41,55,96,134,12,128,23,135,25,188,77,131,251,139,168,20,192,32,40,138,123,96,229,112,143,85,77,218,225,148,80,233,195,40,46,98,55,94,43,249,105,30,0,39,1,208,153,118,87,217,63,241,179,243,205,30,184,126,200,207,11,25,86,100,201,100,44,53,252,26,63,183,52,43,20,73,122,97,
+18,226,203,52,53,181,189,228,232,184,251,73,26,64,96,109,155,240,239,139,220,153,72,210,216,41,148,182,11,65,218,106,22,209,213,191,126,159,42,4,170,161,178,12,6,238,167,153,94,186,1,192,118,195,229,9,29,252,12,33,233,239,227,233,251,163,74,28,209,87,47,24,47,184,225,78,71,252,161,2,169,247,148,31,166,68,108,180,220,209,240,252,22,148,209,36,120,85,144,214,181,45,144,213,109,235,237,24,148,74,240,87,12,240,62,140,145,216,66,253,239,127,52,125,106,32,253,23,242,5,116,85,71,246,52,224,106,233,241,45,12,152,207,59,165,166,67,58,92,201,186,219,17,202,156,66,40,162,182,221,165,57,144,36,9,141,220,43,169,232,19,70,159,63,95,48,13,231,237,227,35,38,249,14,45,52,104,239,122,93,154,203,173,197,168,190,59,147,73,3,242,68,236,243,12,192,43,253,24,125,205,126,103,231,174,125,206,154,191,21,181,7,213,140,22,50,94,129,116,7,56,233,38,27,65,250,245,44,73,20,187,74,76,5,108,168,110,176,151,222,127,160,181,204,36,41,
+81,216,58,201,230,154,136,254,145,171,103,21,172,94,145,5,117,216,1,179,7,36,26,184,162,40,87,40,215,38,213,139,218,27,39,45,127,54,187,169,32,208,31,13,84,96,92,204,24,89,91,250,40,144,140,11,47,187,201,232,82,202,235,238,243,93,231,202,23,59,80,217,93,179,175,85,198,75,104,88,124,117,57,137,110,102,124,52,41,0,108,248,36,38,115,217,42,191,216,89,20,72,52,134,173,204,41,220,62,206,98,128,146,203,91,40,222,96,129,87,97,9,185,63,1,229,126,100,62,30,129,137,162,215,89,122,77,93,219,117,234,57,72,147,92,80,35,247,89,211,164,16,209,46,90,121,137,141,169,239,105,55,198,125,40,13,24,98,204,39,203,86,183,241,40,205,14,87,100,249,49,222,27,111,131,0,237,192,120,76,237,135,34,217,213,19,147,22,58,32,139,120,55,42,80,231,57,21,229,238,58,201,3,180,235,72,35,19,135,175,171,48,125,20,147,132,121,254,254,29,86,56,210,246,124,204,193,113,15,87,252,65,109,47,80,192,146,147,192,233,20,98,160,25,238,128,
+82,176,93,152,59,170,209,175,120,252,161,155,80,187,252,68,30,48,222,55,88,180,222,37,69,117,15,4,63,94,88,101,5,198,191,59,25,86,68,90,84,48,120,159,122,194,24,124,255,28,196,88,217,188,199,238,127,97,81,129,219,235,136,146,198,16,151,62,104,128,132,33,255,177,100,96,220,248,177,188,162,222,255,90,98,166,191,150,170,219,235,95,75,140,180,191,150,233,159,73,49,75,204,205,64,106,193,163,61,62,150,89,251,190,143,110,89,139,167,200,213,41,50,154,67,88,82,216,234,133,0,237,144,89,60,113,222,161,237,189,180,185,30,151,134,11,237,17,15,172,223,94,78,206,110,33,47,18,99,34,143,6,14,202,143,156,128,12,245,60,206,189,233,161,152,15,167,50,65,81,41,241,129,220,138,174,72,119,19,164,162,6,253,104,253,170,3,221,18,22,159,241,6,113,65,200,76,206,198,73,42,35,42,233,99,31,138,221,42,182,11,206,225,58,224,137,200,46,23,162,123,41,223,249,176,163,37,181,35,72,170,22,244,83,81,208,25,136,206,144,150,137,46,106,101,117,
+134,118,80,241,72,203,213,28,215,89,113,55,26,55,123,148,213,221,92,129,131,57,174,129,117,8,138,149,180,113,180,109,157,88,213,189,88,45,122,102,118,169,190,6,151,79,131,50,130,172,224,41,201,228,143,131,243,174,60,78,178,76,108,90,190,198,101,206,41,106,86,211,28,126,66,42,229,108,67,226,39,38,93,139,72,102,84,115,22,198,243,130,209,132,52,99,226,69,93,0,155,8,221,237,219,134,249,109,82,172,120,81,0,25,43,20,180,108,77,171,139,245,34,126,133,215,78,123,233,167,50,245,128,188,166,80,122,5,170,207,228,177,17,253,216,205,159,96,5,200,245,124,155,151,65,113,96,245,130,204,197,102,197,204,165,144,87,117,21,204,13,31,78,125,65,98,9,6,142,242,182,213,87,38,71,221,86,118,67,61,48,128,248,188,149,206,98,203,197,10,62,155,66,108,88,64,232,18,176,78,174,236,140,242,13,42,5,251,243,222,23,103,42,215,184,87,114,161,50,237,195,91,107,168,22,21,19,131,218,120,167,56,141,52,232,11,158,236,49,167,75,228,157,106,243,4,
+86,196,76,69,37,255,89,240,58,194,56,69,48,47,221,141,174,174,74,203,173,136,129,109,87,37,220,120,237,40,40,254,52,103,78,222,14,157,33,138,184,140,229,219,117,205,59,94,235,105,233,72,151,55,210,170,221,196,157,121,78,99,177,23,245,128,213,94,16,60,105,175,116,245,188,163,117,136,52,202,134,133,60,222,0,142,56,51,84,108,136,101,157,179,237,248,49,40,182,218,207,14,42,82,43,91,168,113,213,248,115,68,6,203,34,247,178,190,1,228,31,213,134,219,86,156,216,144,214,87,90,220,141,101,250,39,2,120,159,12,117,153,89,239,38,115,7,153,24,170,221,28,198,18,104,92,94,86,250,149,226,103,82,156,249,230,144,180,90,193,139,221,156,185,49,145,221,153,249,139,121,200,34,165,243,113,179,118,53,163,234,149,3,65,38,214,121,210,175,30,217,221,18,169,244,36,204,120,197,139,126,52,25,101,14,173,10,67,189,24,201,76,106,101,221,253,167,244,238,158,100,81,176,113,93,23,152,57,13,132,199,100,12,147,99,217,196,124,43,17,11,50,31,119,39,14,
+211,141,133,8,81,192,248,49,161,21,84,92,229,140,105,154,65,26,117,56,53,215,140,249,42,112,26,220,246,99,197,13,97,156,138,48,199,93,21,49,244,60,173,157,67,166,253,120,36,164,57,164,173,183,175,142,210,137,61,79,244,46,171,59,104,8,51,53,237,170,156,230,21,123,226,128,222,33,112,14,199,75,167,202,190,1,156,198,220,244,59,49,89,117,75,219,225,83,49,0,145,120,2,184,12,138,77,228,248,91,215,193,9,140,107,145,1,156,130,187,69,195,77,30,150,91,149,14,109,193,174,142,139,203,252,152,32,182,174,210,185,147,253,210,166,195,232,202,211,124,254,144,21,227,42,239,135,172,227,6,163,122,250,157,248,232,57,187,149,57,25,253,170,223,141,178,167,42,82,236,176,226,195,178,204,125,215,218,88,65,128,44,144,42,177,186,66,147,44,160,184,227,65,76,206,189,80,249,78,202,109,70,115,34,51,221,54,245,34,161,172,227,45,2,3,162,220,166,142,142,40,140,165,138,159,234,138,239,96,146,118,154,25,229,87,47,157,239,186,88,32,243,26,56,119,201,
+16,25,195,110,219,202,148,53,151,75,19,171,58,196,213,244,94,45,15,128,248,208,181,81,239,52,142,166,165,203,254,8,18,208,96,11,40,151,187,220,198,104,163,152,22,179,232,107,66,136,117,248,232,202,189,193,71,69,27,43,215,67,89,82,217,185,51,175,58,90,156,250,163,217,127,32,89,4,250,179,52,176,128,244,23,29,69,223,87,222,246,197,63,233,80,17,146,62,189,65,133,147,142,131,86,161,239,107,182,104,225,123,248,242,167,74,124,174,84,219,157,50,117,165,14,250,254,254,33,57,113,189,222,211,41,66,187,121,254,16,47,27,228,203,61,163,149,114,72,194,25,159,95,33,45,97,98,202,126,106,4,99,239,183,165,213,29,56,200,20,189,71,252,73,186,198,223,96,85,79,35,1,223,168,247,89,172,62,26,154,183,88,125,140,253,212,199,160,4,171,143,175,52,108,109,96,16,195,25,58,222,207,248,177,188,248,41,186,152,229,141,223,240,107,169,198,138,238,143,37,40,126,253,181,140,97,69,247,199,242,226,103,82,204,242,233,103,82,204,82,243,51,41,102,41,251,
+153,212,114,3,68,145,245,85,131,220,197,35,161,228,157,51,243,74,95,152,55,4,195,166,173,120,251,24,231,212,160,226,115,142,74,204,161,213,188,203,11,149,251,184,114,96,115,157,163,199,78,148,232,209,2,78,172,62,246,103,85,251,234,59,71,164,219,5,57,102,81,85,206,122,210,167,176,117,142,164,139,44,63,150,77,2,159,115,23,53,7,104,113,247,211,86,45,123,173,200,234,52,103,193,174,252,228,197,68,118,102,203,182,87,224,160,26,20,120,15,20,141,183,150,50,201,231,36,56,245,212,217,226,85,236,50,191,124,38,192,193,87,142,59,77,17,142,184,219,100,79,200,59,123,5,158,72,138,158,27,158,108,118,112,215,209,111,164,203,247,251,119,49,75,25,242,117,9,242,124,152,120,122,170,183,228,68,221,135,168,21,202,11,102,52,251,225,68,153,195,177,246,195,178,44,137,16,204,39,173,104,179,24,76,206,38,177,232,75,199,40,130,189,91,86,81,89,207,115,149,149,201,171,89,81,104,179,5,212,178,101,30,232,9,187,201,142,129,153,52,21,168,239,54,251,185,
+126,125,64,169,178,37,215,161,59,67,246,39,178,32,103,98,22,212,21,246,139,250,243,92,87,219,93,229,113,160,118,202,42,7,170,142,218,197,238,222,61,17,153,10,59,219,116,29,163,155,221,80,135,77,150,172,70,193,44,162,89,207,212,59,51,33,66,179,236,111,143,170,107,250,163,51,146,89,174,84,226,30,155,160,46,42,93,219,76,62,80,116,116,34,168,41,53,213,186,213,19,226,187,205,125,174,4,11,211,68,180,118,123,190,178,48,54,230,165,216,170,79,155,55,29,158,79,10,78,7,155,29,101,155,187,119,158,7,34,224,253,144,123,191,198,189,8,164,222,252,38,155,19,39,5,39,213,134,215,207,146,68,244,136,66,35,27,3,156,0,113,119,222,239,24,92,54,41,110,250,140,34,124,95,135,26,47,56,245,28,197,75,221,44,19,240,140,113,99,10,9,66,254,32,244,22,76,247,236,136,251,67,192,194,73,116,206,125,162,194,237,80,73,224,201,206,120,164,228,38,133,129,137,34,108,124,192,6,245,241,169,137,173,71,209,92,87,60,1,95,25,214,129,30,148,173,
+219,48,156,138,46,35,128,126,56,22,121,77,107,39,143,31,236,220,199,249,242,202,118,55,158,36,220,164,27,94,150,154,72,57,171,23,78,146,69,147,159,91,56,209,185,237,117,177,138,202,59,129,218,94,57,80,171,200,128,197,135,252,252,235,219,232,253,67,145,233,94,174,198,217,158,239,254,193,165,191,126,60,196,51,109,228,162,234,92,117,193,70,132,252,21,219,232,198,159,137,233,166,75,26,103,113,151,17,136,197,101,236,153,152,28,67,24,218,109,52,247,188,100,208,58,62,136,176,134,222,198,162,214,123,34,154,46,122,100,202,181,49,18,29,148,248,70,71,155,64,21,21,42,233,189,205,187,94,170,237,203,76,166,244,146,204,180,199,67,154,57,172,205,62,149,11,238,224,184,56,73,115,65,169,251,196,177,69,201,221,122,148,160,247,221,68,0,147,145,92,240,189,39,198,36,168,226,90,153,51,7,195,83,72,39,122,246,170,202,157,221,189,79,198,220,187,180,105,30,193,238,99,101,114,76,132,86,16,150,133,123,9,83,209,21,142,149,171,73,228,174,34,122,208,123,153,
+164,130,243,198,105,139,151,85,90,115,75,105,147,13,150,148,109,113,119,207,139,39,248,34,254,96,231,234,208,62,21,173,86,128,229,155,89,125,196,218,85,122,20,154,190,237,45,60,119,40,37,17,159,131,161,244,136,44,241,202,84,31,129,68,38,22,36,46,196,83,130,201,223,86,188,124,212,225,23,172,47,115,252,73,215,15,252,216,124,3,4,251,79,0,119,131,165,191,62,44,201,252,17,82,212,95,117,22,4,110,127,213,89,240,165,240,171,206,148,180,63,234,76,194,184,147,255,255,211,113,154,64,97,193,163,63,190,183,127,213,153,131,177,220,158,223,39,128,157,28,6,30,203,96,219,118,57,21,155,156,27,4,96,93,35,111,180,27,76,147,217,111,48,81,70,3,196,128,122,217,103,220,196,85,124,144,235,152,193,79,37,188,12,148,50,73,2,156,67,13,192,223,126,69,251,254,139,9,60,22,236,171,198,131,134,6,80,137,162,45,233,50,159,160,155,119,119,146,185,23,75,149,13,207,168,36,145,21,228,248,53,30,61,55,148,124,231,219,77,225,24,206,156,42,69,176,
+217,204,134,203,227,146,14,84,63,222,5,198,94,178,114,98,104,166,12,199,215,202,154,214,202,178,212,4,124,242,253,59,175,99,129,182,66,44,227,229,115,46,3,81,191,184,253,85,181,36,129,113,128,189,115,228,78,181,25,252,85,118,229,233,171,163,16,4,31,4,152,64,207,100,230,218,143,154,142,95,171,156,147,157,93,140,26,113,149,214,163,28,183,45,212,35,137,52,147,69,36,90,19,129,160,184,253,182,237,43,111,69,63,106,233,116,63,21,72,143,230,2,173,162,55,75,190,161,72,49,135,144,114,13,190,163,147,73,222,230,150,135,138,137,76,118,148,157,153,41,153,255,125,159,37,160,138,160,194,129,165,39,118,199,100,75,227,62,86,96,105,6,184,110,118,118,38,130,234,82,205,86,228,72,42,215,171,133,28,51,146,58,250,15,14,242,186,114,102,168,145,121,255,41,37,168,12,116,132,40,103,199,16,249,163,182,190,119,44,5,153,143,212,200,180,228,202,137,108,28,152,91,169,26,124,23,95,8,100,103,172,86,100,2,235,240,190,144,123,217,65,69,74,235,76,242,
+166,168,192,236,9,172,55,87,147,47,13,12,213,199,54,197,124,31,33,0,80,35,215,78,81,159,93,102,106,142,140,173,230,74,239,246,58,145,70,42,32,148,2,213,227,42,191,204,93,181,39,239,124,198,103,252,252,190,236,198,218,134,242,44,225,149,228,223,186,64,121,224,100,19,72,148,186,75,44,59,191,242,239,146,251,185,114,69,156,100,63,93,250,137,147,146,179,157,167,219,86,247,197,216,76,69,12,175,220,253,150,223,124,203,158,156,55,5,48,35,86,105,139,141,250,209,243,165,202,218,87,216,187,78,2,11,214,92,137,247,171,6,102,240,126,214,127,186,42,61,186,65,170,87,64,195,97,196,48,71,248,196,1,242,68,193,41,73,18,237,61,240,152,221,173,94,1,9,70,28,104,248,253,58,187,139,251,40,64,165,25,217,78,47,92,0,69,248,252,223,133,239,49,140,239,11,192,99,77,164,105,133,131,83,127,36,78,167,139,125,28,186,101,7,37,159,216,210,70,245,12,242,244,241,146,78,63,77,135,116,128,25,61,76,98,209,120,43,139,191,247,14,126,79,99,236,
+223,83,103,76,151,89,202,59,245,204,119,134,127,159,74,99,156,186,217,103,23,58,216,232,221,4,95,124,128,246,164,87,95,101,234,50,237,183,239,201,160,244,59,14,225,12,237,116,159,58,150,21,48,86,17,104,133,14,33,146,151,171,167,117,4,218,220,149,147,75,223,237,35,104,218,52,251,166,114,205,59,242,6,95,60,171,97,62,134,173,38,174,19,147,64,96,53,190,83,123,206,232,189,157,10,65,177,135,175,37,142,67,26,83,0,89,165,254,149,189,96,173,132,46,128,201,86,31,44,19,158,54,250,149,21,223,62,190,149,60,50,24,166,136,104,146,220,167,142,158,131,202,214,121,31,30,176,9,54,201,123,20,193,18,134,141,31,68,222,105,44,104,139,42,221,106,159,82,83,146,237,233,116,73,51,90,40,99,131,120,174,122,62,5,130,88,195,207,11,255,30,192,10,126,187,39,104,133,115,194,183,246,131,230,124,89,188,214,131,210,201,243,117,56,35,105,68,93,28,157,122,88,152,134,87,141,239,38,49,5,172,179,223,80,119,224,160,230,79,3,224,58,28,207,52,162,
+188,213,194,247,57,245,109,240,164,117,225,202,191,9,202,65,30,91,199,17,73,88,90,128,109,224,0,227,114,163,207,135,156,197,171,145,187,224,98,205,250,250,106,234,172,199,205,239,127,102,58,197,85,68,81,98,36,70,144,21,152,97,117,30,211,136,248,231,211,177,65,193,34,14,41,79,115,34,212,29,249,216,187,32,205,249,164,52,122,243,215,201,30,207,74,57,31,4,0,220,132,131,199,241,118,220,56,107,245,154,198,80,39,115,175,227,4,214,25,159,118,193,212,81,141,109,201,122,8,194,167,98,222,17,144,50,219,6,65,165,156,216,119,3,175,229,83,250,161,222,82,101,68,244,43,198,56,10,96,201,123,136,23,40,111,138,119,176,76,3,19,163,46,239,200,139,182,186,166,6,191,114,183,221,1,245,218,83,177,243,169,22,151,119,178,64,188,99,10,138,133,60,189,135,223,85,40,161,197,117,39,43,107,133,159,64,238,109,114,99,154,41,27,223,9,250,103,78,255,249,196,119,102,111,164,13,250,10,110,122,223,138,103,101,137,191,250,170,166,70,50,169,146,78,248,184,
+25,38,243,40,56,80,202,90,239,123,243,9,96,61,190,99,181,35,167,151,44,32,176,114,72,76,172,94,34,91,72,138,40,160,35,61,14,233,51,92,26,228,8,117,218,86,194,245,179,239,195,10,14,184,150,2,74,211,53,120,253,139,76,112,83,20,145,180,158,131,25,109,71,205,104,149,112,51,74,230,191,104,247,43,190,55,78,136,202,215,241,151,120,174,187,186,28,232,69,145,175,172,39,60,190,6,234,249,61,141,251,46,155,88,91,137,151,241,192,111,171,30,113,47,157,116,42,162,96,177,21,94,14,125,181,159,55,98,178,155,99,183,141,49,106,238,20,219,198,71,159,47,220,162,51,8,58,254,53,69,4,180,87,176,89,5,74,212,117,167,33,99,49,131,10,242,105,159,187,18,57,6,193,4,125,5,8,121,116,115,110,172,227,171,234,143,37,167,43,119,209,221,124,50,2,186,60,144,97,139,51,97,224,1,168,119,203,21,129,218,23,111,189,126,161,96,229,62,13,139,68,69,103,179,186,180,128,79,128,64,155,84,12,148,244,44,12,132,183,172,110,61,192,78,202,102,
+202,73,227,219,75,207,113,96,81,84,156,153,87,109,129,107,131,156,22,80,135,228,238,38,0,99,45,81,112,38,11,101,184,48,40,190,234,62,36,142,216,82,212,220,212,30,229,32,147,19,192,109,97,3,69,75,87,154,93,174,251,221,10,150,200,48,112,23,61,112,172,210,15,187,139,81,170,210,37,212,85,119,8,13,237,222,172,69,64,212,101,93,175,123,169,172,22,153,217,205,172,163,238,102,14,53,234,212,163,57,78,139,110,122,45,159,215,242,174,85,28,168,174,72,134,207,129,117,29,57,28,135,231,56,147,96,48,49,44,244,6,150,85,195,183,230,206,244,160,56,248,126,71,13,136,145,125,74,49,239,243,196,157,186,211,237,202,53,6,180,150,125,146,162,107,89,138,12,253,106,239,150,194,97,196,105,184,90,231,36,61,181,67,65,158,217,225,212,130,14,32,74,91,201,223,181,192,249,184,19,161,216,127,62,48,116,214,235,206,21,209,212,55,97,116,183,60,76,237,122,191,66,128,75,226,50,204,7,80,5,137,240,235,213,35,93,26,232,141,206,148,100,182,72,178,184,
+85,107,50,89,2,5,121,64,116,103,46,206,224,212,253,155,1,148,102,86,36,237,235,201,17,108,49,81,131,168,9,92,143,136,252,220,156,246,9,156,238,43,54,14,165,241,77,51,119,246,101,143,40,160,111,81,167,15,85,64,201,147,28,125,150,155,70,80,218,176,133,61,153,70,103,72,203,203,76,13,162,123,68,5,72,217,239,178,63,49,107,124,251,155,68,172,10,127,83,243,88,109,213,99,165,85,70,249,105,79,188,63,250,196,207,194,164,196,229,238,167,10,151,129,7,229,31,75,235,247,79,21,214,79,56,116,134,56,231,112,38,185,25,124,170,55,80,129,10,129,155,201,251,122,88,133,158,0,111,242,250,235,181,187,162,1,183,98,159,113,4,102,240,148,227,95,251,164,71,166,2,46,100,193,76,22,127,245,51,253,19,147,59,130,2,216,19,57,215,127,26,162,203,251,63,13,209,107,246,79,67,212,199,122,167,178,66,185,13,144,151,207,230,92,185,123,148,198,99,211,222,85,106,146,146,217,245,5,90,161,119,64,77,23,95,1,149,111,141,178,115,158,135,164,234,242,
+16,216,194,117,96,187,94,94,150,122,15,189,86,108,232,239,48,104,45,246,72,11,198,8,214,104,33,3,49,103,31,187,68,218,172,203,125,138,201,34,190,53,156,113,134,40,130,120,219,145,117,166,56,215,136,198,14,94,121,164,166,89,254,16,201,64,235,126,79,48,231,195,245,151,135,87,127,210,59,102,1,86,162,142,92,196,76,85,233,236,126,110,36,8,75,109,95,232,19,193,252,131,185,246,151,221,83,130,193,137,172,26,252,4,18,41,210,72,251,152,50,214,139,6,65,190,115,246,213,216,125,2,240,241,138,220,60,252,92,12,194,53,151,226,71,192,176,203,222,104,158,59,178,231,76,193,164,249,51,187,172,113,78,163,61,69,70,185,167,187,29,171,249,155,251,145,111,87,40,189,143,157,28,159,95,188,17,89,183,112,81,14,170,106,57,70,183,237,238,237,229,135,119,194,94,50,32,169,219,144,238,146,214,167,7,216,221,104,68,57,49,18,234,10,229,34,150,77,99,13,145,119,44,80,25,119,102,79,18,100,103,132,9,115,44,187,124,202,114,248,78,243,108,42,76,239,
+77,23,25,59,40,170,120,191,118,230,121,135,57,131,9,222,177,5,164,168,161,207,23,82,152,236,147,153,89,198,78,34,58,169,23,197,25,234,96,156,26,36,136,229,56,159,171,68,53,186,143,69,100,221,38,210,29,63,149,133,85,163,199,25,211,123,160,5,98,162,164,30,84,32,227,211,160,139,173,61,194,144,106,97,80,123,173,140,181,214,100,112,106,215,237,58,20,124,36,185,166,41,250,188,198,49,93,174,114,33,199,125,86,87,229,95,210,2,138,252,46,150,57,159,42,95,175,115,229,118,99,26,184,237,130,163,25,34,247,128,140,180,176,215,60,129,56,230,176,35,237,28,244,248,68,164,62,42,171,26,190,17,71,122,169,87,119,44,186,12,120,233,123,233,167,152,88,221,88,98,107,11,119,123,228,203,204,118,82,178,56,87,186,189,227,102,246,76,203,133,167,97,216,61,105,111,189,197,193,103,209,25,79,120,129,123,210,56,34,78,63,242,71,166,86,206,153,11,103,110,49,185,48,20,60,132,25,90,98,178,199,26,43,150,34,236,205,103,52,225,142,250,56,24,221,88,
+166,119,154,163,145,106,125,26,43,72,143,173,24,111,199,86,44,251,239,157,250,204,122,239,195,66,198,181,232,243,6,231,84,105,192,10,29,84,215,146,250,94,178,218,204,50,11,188,31,145,250,118,57,48,145,133,123,75,132,23,185,193,9,115,209,164,178,99,147,10,157,29,39,70,137,67,172,191,103,63,250,195,153,125,36,132,23,181,178,118,73,194,49,153,59,177,23,44,4,66,19,151,226,196,153,218,23,203,167,131,131,153,125,169,88,240,194,91,103,129,199,119,26,163,159,242,0,66,146,158,6,197,131,120,245,246,58,0,21,83,76,229,92,42,148,199,231,168,180,215,227,214,243,43,17,73,80,230,199,196,119,132,226,166,220,15,131,178,251,100,0,147,105,229,40,70,202,202,51,216,251,60,161,174,60,129,155,180,112,50,156,9,209,180,37,142,69,241,92,37,184,157,244,65,220,6,28,120,82,220,201,189,151,102,146,13,140,117,22,6,69,161,20,207,92,244,89,94,90,141,113,225,148,85,129,250,102,147,69,185,56,26,125,101,33,40,164,210,69,179,41,55,114,50,243,77,
+225,234,91,30,224,249,20,2,59,174,252,254,134,143,188,168,87,205,44,109,101,6,227,170,45,105,53,139,50,183,243,51,101,45,99,5,153,101,94,12,61,8,113,195,239,107,60,51,221,15,252,228,1,156,219,5,27,3,210,135,140,10,192,81,255,165,135,198,85,192,198,213,50,224,123,212,210,41,21,204,141,151,184,198,213,21,46,88,64,119,135,27,113,162,141,112,138,83,190,246,158,42,217,101,38,7,143,124,190,56,116,135,102,166,165,119,202,42,35,139,161,96,15,226,100,124,204,214,24,207,10,222,189,58,192,120,56,35,246,95,116,24,225,76,143,27,13,210,88,103,140,226,112,1,90,148,139,242,156,12,191,115,137,59,243,112,6,199,166,176,105,88,69,88,151,0,129,119,94,53,90,119,102,25,117,234,19,167,134,48,0,58,129,211,134,142,151,41,206,200,229,19,210,137,68,179,126,156,224,233,122,117,222,169,6,164,50,159,66,55,139,244,101,97,2,6,200,137,33,151,188,240,95,69,94,240,71,33,144,221,23,97,107,178,36,228,61,0,32,211,138,198,138,216,50,189,
+68,252,185,104,11,47,2,30,131,71,25,181,244,172,103,1,47,15,254,7,176,34,253,56,234,193,227,35,96,4,153,168,34,119,22,156,66,217,53,168,220,18,70,165,76,180,245,193,5,8,93,83,238,229,89,15,12,127,205,7,72,152,221,54,61,2,32,81,138,78,159,247,179,56,122,129,126,65,28,120,207,149,140,105,86,117,2,0,31,43,73,226,154,180,23,191,188,119,24,146,68,6,198,189,249,220,106,84,22,161,250,218,132,64,38,106,234,161,200,37,210,1,58,21,216,12,86,52,118,195,173,2,174,41,35,141,240,9,171,129,111,116,51,131,107,249,13,127,152,250,9,127,25,229,193,99,117,214,49,106,48,109,77,100,158,207,25,237,241,166,2,102,108,249,143,192,133,74,74,25,209,72,47,201,118,56,227,32,234,207,99,171,254,97,75,208,208,212,22,77,34,12,58,37,238,48,241,78,37,125,19,208,156,217,47,250,170,117,25,186,85,155,198,69,126,149,150,147,253,80,224,45,125,43,6,123,13,245,76,106,238,94,211,128,198,113,120,145,10,47,132,128,212,171,147,240,
+77,33,230,90,112,241,67,19,177,34,78,203,77,5,252,247,148,45,130,121,216,160,235,86,67,165,43,156,225,143,15,41,12,110,10,96,34,137,121,50,12,27,199,43,56,32,21,185,28,226,215,241,6,14,220,169,246,82,202,14,83,196,243,219,183,14,227,42,158,161,223,68,9,3,155,199,47,218,69,126,3,205,73,240,34,18,83,37,125,77,239,128,71,2,54,87,39,242,130,189,174,192,165,124,194,120,54,222,191,203,195,176,119,226,197,127,123,111,37,128,150,109,125,25,203,62,186,238,5,177,203,143,122,114,214,236,231,45,243,53,125,235,6,231,240,78,137,89,99,121,8,195,158,136,41,177,122,49,30,4,217,249,97,103,142,128,60,171,92,70,150,189,164,31,126,62,237,75,134,34,88,56,183,6,48,174,87,67,202,175,194,178,33,89,70,199,252,138,3,169,220,253,6,242,65,224,1,187,213,87,138,195,188,126,194,100,146,62,30,120,19,139,3,29,70,11,19,226,29,175,249,82,196,188,121,192,38,112,130,146,232,176,80,217,117,55,206,217,203,22,11,251,34,72,99,136,
+72,56,149,20,192,194,77,216,124,177,92,142,107,128,130,53,245,181,46,192,212,198,230,253,27,215,203,143,7,78,94,80,33,189,192,248,57,229,1,1,156,151,241,188,250,113,27,158,61,199,126,208,187,2,7,149,135,63,128,246,128,63,128,190,250,111,65,103,239,232,74,159,48,21,112,9,40,13,91,231,51,195,232,86,216,148,122,245,109,40,54,127,14,42,48,100,15,179,251,190,9,88,87,9,61,105,234,17,75,163,75,224,98,125,131,252,112,143,31,206,132,126,46,125,127,138,75,64,190,177,144,42,200,73,171,52,190,181,161,188,75,236,241,198,171,31,212,188,2,114,56,247,99,96,49,116,183,47,200,166,118,96,200,127,6,177,177,75,229,157,87,160,202,125,198,47,1,75,237,120,236,247,3,63,108,162,85,6,177,9,197,153,190,138,156,94,240,60,32,18,178,5,227,69,252,40,86,196,164,246,57,91,209,172,36,31,217,246,175,233,255,219,218,183,61,165,150,229,105,254,43,62,204,195,76,68,117,86,247,116,117,76,68,229,83,79,63,116,244,195,204,60,244,68,116,76,
+76,117,199,57,85,125,170,242,68,101,230,57,113,242,100,87,247,60,129,128,32,42,151,13,168,8,136,200,230,46,168,200,69,80,185,122,219,32,130,27,20,229,162,120,1,4,4,17,17,145,155,179,214,94,158,236,204,170,172,185,196,204,19,199,125,89,123,173,223,229,251,125,223,111,113,216,235,200,253,190,24,152,100,132,188,116,58,179,151,249,103,255,241,177,122,213,102,239,239,40,124,49,37,12,4,61,86,0,230,163,27,213,177,90,24,155,149,226,165,234,70,95,99,168,249,67,19,209,139,152,64,101,229,222,209,180,96,150,211,137,109,76,181,141,31,22,194,34,188,126,13,80,136,213,206,83,94,242,233,98,208,75,32,209,162,164,155,187,2,206,49,193,73,96,46,207,156,98,4,172,172,142,63,43,82,27,34,213,42,247,190,97,37,239,98,77,45,223,53,213,202,155,3,74,61,122,124,83,8,98,3,134,6,211,65,176,217,192,114,75,32,92,163,228,185,63,71,197,59,150,152,148,54,85,0,48,231,104,132,34,8,15,217,89,2,172,185,255,248,56,218,86,139,173,195,4,
+73,191,125,240,233,175,158,162,117,242,44,41,228,73,47,171,220,125,224,230,230,249,73,172,64,148,157,188,125,233,28,114,176,189,140,28,28,21,32,7,231,199,3,75,132,113,35,239,184,45,236,141,76,46,246,228,252,243,98,140,141,37,154,112,210,91,186,203,21,122,8,90,88,219,223,112,219,34,229,201,152,138,141,81,235,113,216,253,186,32,43,164,79,10,112,197,141,127,164,227,64,105,8,56,180,127,4,250,37,3,239,42,176,151,25,26,126,33,106,182,28,25,52,209,251,41,79,63,43,116,217,239,207,34,11,123,117,37,74,64,45,176,59,27,64,200,105,27,155,57,50,217,212,107,253,176,71,51,113,205,27,28,182,78,125,120,83,21,2,139,230,204,19,119,172,210,52,136,135,101,237,131,225,233,97,77,145,87,60,144,198,22,207,188,78,30,90,210,87,112,69,27,32,119,96,234,232,65,238,192,212,57,144,158,185,206,11,26,83,52,98,183,216,252,221,235,93,24,12,130,91,172,97,188,55,233,114,113,159,31,56,245,64,87,210,44,175,220,200,221,217,94,81,44,46,201,
+86,204,217,177,9,202,58,227,115,147,32,169,151,192,19,171,32,59,18,109,191,46,179,74,186,184,77,146,63,213,184,224,63,45,62,37,141,37,252,196,32,91,176,143,140,160,188,74,163,188,106,122,229,248,218,48,40,209,197,199,46,76,251,113,99,32,71,164,156,109,91,77,14,174,227,136,108,162,187,173,114,24,68,102,25,96,78,10,24,216,175,2,73,2,120,192,169,235,236,236,156,31,219,61,230,226,196,70,146,174,98,8,242,27,68,63,187,197,92,45,240,76,110,186,49,169,142,177,131,50,141,161,116,230,94,101,0,108,210,91,185,184,97,229,58,152,160,210,193,61,242,9,175,148,134,230,164,87,186,146,246,165,78,159,158,115,225,151,117,183,177,29,152,4,32,166,230,0,6,22,121,213,242,102,92,67,229,71,15,156,155,201,197,85,177,0,44,144,167,206,153,35,38,149,121,22,220,192,48,75,84,178,35,8,170,32,66,110,158,143,211,61,177,195,214,201,60,61,85,47,180,141,182,255,254,33,108,62,153,82,164,26,133,99,152,169,40,141,19,56,12,14,187,57,153,41,
+109,135,253,33,97,220,100,46,156,95,167,87,108,62,3,5,7,243,185,93,178,231,6,54,155,135,85,236,180,191,127,111,234,93,212,78,200,149,53,137,41,81,75,14,2,187,143,33,42,50,184,109,17,136,140,113,163,65,45,184,196,128,207,220,83,123,174,86,90,89,146,111,119,69,36,136,65,240,156,83,144,136,73,183,101,250,254,198,201,143,198,20,62,42,255,4,33,39,96,238,131,202,25,217,146,72,39,181,154,12,116,66,128,6,20,6,5,143,2,140,130,199,76,60,52,99,200,104,174,52,247,146,45,77,41,175,236,61,28,229,187,146,244,202,162,125,39,191,183,12,231,57,188,75,130,245,208,19,155,16,150,20,179,77,22,204,62,0,245,44,54,59,11,23,50,13,216,4,204,147,121,128,117,15,227,89,253,28,114,163,107,17,185,145,123,131,220,40,160,35,55,174,6,144,27,213,21,228,198,51,27,114,163,85,140,220,56,106,68,110,172,197,145,27,13,139,148,27,37,206,181,7,105,229,228,86,179,49,214,68,19,128,113,217,6,151,40,192,53,163,27,193,98,215,50,191,
+231,83,213,84,98,170,252,140,122,98,16,44,1,86,142,102,194,93,56,108,30,12,123,180,239,211,137,106,42,56,110,169,127,23,60,41,236,216,34,153,232,105,37,92,200,149,28,135,106,105,87,56,89,41,74,220,53,163,154,30,146,235,153,179,32,141,214,229,168,60,54,108,71,119,155,114,219,114,157,174,137,86,183,141,143,101,31,227,135,126,44,3,63,26,187,75,254,162,221,18,57,197,189,201,140,241,129,97,223,166,73,26,7,28,39,152,170,79,69,101,173,193,170,242,54,36,249,181,86,119,216,48,97,91,2,177,192,1,131,92,128,154,102,28,228,141,161,86,189,212,230,64,28,20,217,242,164,221,29,12,39,45,217,86,215,144,17,231,133,243,148,113,212,75,125,26,72,150,32,13,226,61,96,86,70,47,67,55,189,40,149,36,151,171,197,169,228,12,247,84,254,232,154,194,138,174,163,42,46,0,78,222,194,246,195,119,37,14,180,228,190,22,20,55,16,3,91,227,32,17,221,235,215,250,109,148,48,19,12,42,204,241,45,195,229,245,54,85,39,2,216,254,211,128,23,120,
+102,6,142,230,136,178,97,131,199,97,45,220,18,99,229,138,49,176,124,159,17,30,140,130,9,122,228,174,212,2,209,63,242,75,185,77,53,132,99,130,174,240,83,241,26,199,18,203,240,80,253,128,227,32,52,206,158,41,34,55,108,232,98,133,225,41,64,54,192,5,78,96,77,8,117,13,138,46,205,28,227,107,205,130,209,241,216,162,241,40,123,14,251,162,164,168,231,78,232,249,32,219,68,137,147,240,152,215,196,71,254,91,26,193,15,143,200,202,109,153,241,93,189,107,41,183,206,102,141,73,103,65,103,207,63,152,147,110,90,73,96,51,70,185,223,175,167,156,4,74,196,35,181,116,87,46,119,237,40,34,187,203,9,73,145,123,13,142,131,85,235,90,151,0,173,54,167,1,175,212,20,18,245,139,82,120,221,118,193,30,36,28,11,153,5,123,83,63,46,111,80,104,121,17,167,211,161,163,246,200,139,188,199,229,159,81,186,158,238,10,106,210,163,109,74,84,144,135,56,9,182,228,169,192,236,205,120,244,96,220,50,110,182,101,213,54,213,100,210,189,158,153,181,76,186,27,
+123,244,115,8,166,32,16,200,37,170,156,151,26,205,251,138,85,35,12,213,14,247,158,182,70,37,233,158,225,100,129,52,119,184,201,66,36,68,154,248,91,129,54,4,102,188,4,235,2,164,150,169,27,108,132,211,92,243,207,96,20,48,51,195,179,56,125,56,218,29,158,128,213,198,237,152,226,187,39,97,26,110,31,130,152,167,43,221,180,44,184,70,128,223,123,100,222,160,82,37,144,236,110,97,157,69,70,64,21,62,237,98,29,55,183,190,231,147,39,155,195,96,174,243,124,182,35,76,122,31,152,245,145,31,205,231,93,63,197,23,187,102,231,132,120,91,246,220,223,194,111,127,192,39,152,136,78,118,43,236,253,204,22,72,206,97,4,15,145,177,122,41,166,162,226,10,5,110,153,202,106,241,156,141,202,234,70,173,211,186,223,82,73,195,33,117,185,19,40,85,10,173,86,89,146,26,52,244,115,76,43,114,156,128,143,28,103,168,106,165,75,171,250,227,249,227,147,92,201,239,62,161,185,46,168,204,27,22,207,83,153,23,70,178,33,201,103,116,54,200,232,125,163,92,242,174,
+218,76,250,113,110,96,29,208,76,246,72,158,162,153,146,167,168,196,116,253,104,228,73,176,35,241,118,19,204,136,164,252,106,188,239,153,146,7,183,91,186,83,58,170,131,165,88,86,246,108,247,172,59,232,207,89,21,140,232,97,68,95,20,49,68,95,20,229,163,254,198,86,143,208,171,87,185,174,231,114,59,28,244,58,109,241,148,144,45,110,177,168,2,29,212,181,155,144,243,88,1,201,111,3,67,162,248,83,204,254,177,60,17,80,188,191,247,172,98,123,3,42,147,0,47,61,156,178,153,129,201,71,43,254,240,32,57,159,118,201,44,215,76,176,68,229,13,175,58,137,15,42,185,212,56,140,126,200,75,247,97,58,143,39,0,87,157,6,135,92,20,61,33,211,213,65,97,95,126,179,237,145,139,251,207,22,112,5,48,5,72,120,110,148,181,195,144,192,148,180,68,110,54,22,246,90,28,26,74,183,104,14,165,27,53,206,11,127,160,24,209,36,170,119,229,237,129,39,45,95,214,85,46,212,18,217,178,215,159,21,230,36,58,25,176,95,195,136,4,5,157,170,166,81,210,27,
+31,145,108,203,75,177,180,172,170,79,223,50,59,5,138,197,11,113,85,187,57,14,153,200,163,40,177,190,167,48,78,174,136,29,113,23,249,164,161,213,80,194,251,1,248,245,220,75,250,7,232,70,227,158,115,197,53,26,12,50,66,250,91,192,98,66,61,153,236,164,109,179,129,153,36,50,132,59,62,18,202,174,211,202,98,94,98,251,156,102,132,222,165,75,14,244,32,216,116,173,219,171,178,222,108,53,91,167,108,207,194,11,142,167,255,137,159,113,113,182,226,34,46,4,83,52,131,40,245,220,121,207,34,40,125,102,31,240,62,35,26,164,135,102,193,114,161,37,227,20,235,111,243,145,159,56,42,12,58,5,248,68,12,157,2,124,98,134,78,1,62,113,64,167,0,159,4,161,83,128,79,204,208,41,192,39,93,138,246,237,207,237,241,145,126,152,153,166,252,196,244,202,112,81,228,88,121,80,92,154,212,125,226,65,128,226,50,252,148,55,86,134,71,237,105,6,76,144,18,52,103,33,23,167,45,251,40,133,174,166,178,217,223,180,94,151,250,188,120,100,159,134,19,233,0,32,
+188,164,20,10,254,10,166,237,60,231,90,128,218,55,65,110,197,74,177,121,198,168,214,15,169,249,245,44,213,206,107,241,167,240,45,153,40,122,86,214,30,77,195,37,159,66,144,107,55,5,48,54,151,241,210,220,167,241,233,122,87,17,54,248,203,212,186,175,131,203,58,188,164,1,53,54,2,230,119,167,216,105,55,154,2,112,199,234,105,235,110,211,180,205,96,134,72,253,184,14,192,88,46,3,143,98,205,80,98,77,58,194,1,215,46,44,19,32,242,57,177,125,88,46,155,218,243,227,233,186,22,150,234,121,152,20,197,225,232,38,155,6,195,95,225,67,225,143,25,80,248,31,172,194,240,119,119,29,181,1,115,68,231,195,18,185,174,66,192,61,57,21,85,18,201,67,230,101,97,149,53,47,2,128,217,95,221,176,157,96,29,51,99,229,224,26,21,174,25,55,42,92,128,54,80,133,11,232,219,6,54,115,251,40,50,201,87,36,167,238,227,178,171,38,132,235,158,213,51,149,96,221,120,19,60,52,39,178,53,142,69,229,7,5,39,168,190,135,226,15,84,248,88,115,29,156,
+57,198,110,18,51,155,42,6,13,92,191,41,193,201,57,160,87,104,192,144,110,252,41,98,62,105,106,47,50,204,186,231,49,2,166,110,148,178,118,97,1,195,249,32,1,178,216,209,176,229,56,195,232,58,13,40,159,230,35,12,50,196,234,205,216,19,195,16,63,129,244,203,249,161,59,119,98,66,36,7,31,104,72,14,238,242,144,28,220,14,168,38,113,179,139,199,222,229,65,126,154,196,130,32,165,128,130,234,148,9,114,67,36,234,118,174,214,75,154,67,157,204,48,144,223,46,142,0,136,143,33,217,161,96,95,196,15,64,164,4,70,246,73,58,52,41,176,123,93,4,4,243,31,123,142,91,197,196,21,247,125,69,117,0,202,249,255,155,157,11,88,217,97,95,234,5,7,215,32,134,96,29,189,2,117,244,81,141,18,64,58,199,127,209,87,40,1,30,153,82,60,254,20,76,241,59,197,148,219,24,86,6,169,184,83,93,241,112,144,152,128,97,118,32,89,37,117,174,49,70,167,231,28,237,235,235,96,210,35,2,232,151,105,40,43,69,230,132,220,182,142,183,88,200,190,23,
+209,37,128,22,211,168,191,225,206,222,172,133,2,252,73,75,237,238,26,207,80,60,173,201,213,71,41,160,115,39,8,83,49,252,216,97,143,80,179,103,236,62,147,161,39,114,227,84,181,64,117,71,118,137,99,247,97,100,7,68,244,26,212,117,74,60,126,220,115,243,192,137,245,61,194,157,87,140,7,233,10,128,94,128,96,245,22,220,98,10,65,55,221,56,85,199,112,64,170,120,163,127,152,239,169,151,124,95,131,69,23,212,220,56,44,186,160,230,94,195,162,11,106,238,24,44,186,160,230,234,97,209,5,53,119,19,22,93,80,115,125,112,89,29,130,92,132,155,180,187,164,21,241,219,57,194,135,228,45,235,150,131,217,250,123,249,254,226,83,72,235,238,136,84,115,40,206,194,117,146,130,237,192,200,28,32,167,99,43,78,217,113,149,125,246,162,167,114,184,61,51,55,236,153,96,2,7,178,48,119,122,13,220,67,245,253,122,51,28,14,234,47,120,205,158,13,161,119,78,99,171,184,154,113,247,149,57,163,102,53,173,66,94,149,255,9,215,253,16,215,3,251,228,14,105,189,
+138,229,11,132,55,43,17,69,242,82,167,95,134,18,248,172,46,178,217,198,163,236,121,174,228,96,186,133,25,181,233,21,105,236,105,101,25,205,127,58,40,197,140,212,17,195,10,202,115,241,28,33,241,223,23,100,7,47,141,139,240,69,220,7,28,115,183,167,45,13,230,99,89,246,186,81,212,89,41,138,61,34,49,40,196,203,58,131,207,163,24,135,113,114,132,71,136,29,238,163,180,161,214,220,201,216,51,107,61,125,117,71,30,215,38,172,102,231,18,92,255,86,27,194,233,176,100,238,128,227,34,100,242,125,102,87,249,0,251,6,98,48,251,40,57,162,147,178,162,151,76,192,189,244,115,196,218,186,188,42,121,209,181,218,16,0,177,27,176,142,20,106,31,180,55,81,251,224,150,134,218,7,100,27,181,15,184,45,212,62,136,221,160,246,193,31,237,15,145,160,88,166,158,44,158,51,233,116,124,239,145,221,137,12,163,198,13,13,201,193,237,220,57,78,204,12,55,85,23,208,58,135,216,200,48,141,162,91,35,222,73,92,35,61,63,190,199,145,220,243,135,180,37,177,114,155,
+3,116,195,181,157,112,182,68,103,56,80,41,99,99,146,105,158,221,27,55,239,93,207,28,135,78,96,10,217,160,238,219,210,49,214,64,173,100,202,113,77,180,113,119,33,47,41,216,163,251,153,71,110,176,15,121,25,88,127,207,61,137,81,225,158,234,61,197,173,230,11,207,197,238,110,41,91,42,42,95,234,99,15,79,154,215,71,163,108,182,100,24,210,36,147,46,61,239,182,53,22,87,19,139,48,175,79,113,179,92,49,30,189,100,129,92,40,42,112,210,228,37,203,27,18,145,216,238,102,121,24,40,173,200,233,158,123,28,60,161,121,69,184,237,109,231,176,53,214,41,101,251,230,154,106,129,210,155,56,225,113,131,73,130,57,158,50,81,163,173,132,232,111,253,143,245,97,206,199,81,163,109,126,13,53,218,46,13,168,209,86,211,161,70,155,239,14,53,218,196,117,212,104,219,46,162,70,27,13,71,141,182,85,49,106,180,233,169,56,151,120,44,113,109,212,118,102,146,74,69,195,15,73,205,31,242,33,119,164,211,210,71,246,28,5,64,2,249,148,31,115,68,121,248,37,174,
+143,177,125,75,122,90,111,9,86,106,17,37,2,18,108,15,232,225,9,1,196,65,32,95,148,7,131,90,221,80,37,173,174,202,164,235,164,111,233,59,25,244,65,25,67,249,54,76,217,127,150,122,96,153,159,50,147,180,21,69,57,187,162,144,17,88,80,67,99,232,41,61,100,103,233,97,199,146,110,53,66,129,63,147,228,123,201,189,139,221,146,121,248,222,107,86,164,158,18,6,13,153,228,129,169,62,33,25,57,39,64,50,242,140,121,150,156,57,155,41,61,209,205,38,42,33,31,0,86,38,164,139,139,41,83,100,113,34,23,223,201,80,50,50,209,48,141,69,178,147,14,249,211,90,114,47,11,137,253,28,36,79,112,253,144,60,1,238,100,210,201,206,4,134,137,93,141,105,207,116,115,97,57,220,5,228,108,170,177,20,82,31,237,145,225,199,9,57,137,100,228,157,134,146,145,125,220,91,154,37,70,157,119,138,205,29,205,11,30,182,49,30,255,255,31,30,210,168,170,245,137,255,208,113,38,20,33,224,80,4,240,55,162,144,57,218,194,117,63,208,31,115,20,74,77,61,
+208,234,168,66,72,65,212,179,183,234,116,122,22,13,180,93,68,3,113,112,52,16,168,55,97,82,170,76,217,120,147,84,220,241,54,103,0,61,104,199,44,82,150,64,148,120,174,177,69,165,133,197,240,232,4,234,167,51,149,65,72,30,128,45,43,2,81,179,208,110,91,124,11,148,219,88,99,160,218,22,86,95,116,129,27,87,140,207,36,215,151,125,202,80,34,6,9,2,172,67,32,169,14,56,38,49,241,116,120,45,64,125,108,224,103,12,51,66,162,18,122,46,14,159,43,198,65,98,124,226,39,98,138,159,52,219,47,245,177,30,131,205,22,0,156,28,72,154,128,135,167,169,238,231,114,147,133,232,41,49,138,232,169,42,132,232,41,115,18,209,83,73,26,209,83,152,71,144,158,226,71,136,158,34,94,15,136,174,22,185,103,186,74,185,167,41,121,194,117,15,2,92,114,91,30,29,159,250,62,95,178,33,190,100,147,123,104,84,159,233,83,31,20,214,203,77,12,103,76,208,168,124,184,11,105,74,52,152,202,116,128,1,68,170,163,120,34,50,188,163,212,75,191,210,70,220,
+177,75,117,120,153,166,81,42,165,227,218,237,199,67,204,80,233,176,61,98,58,234,135,120,104,10,28,68,228,46,129,205,180,215,148,47,245,107,29,60,232,78,24,0,232,40,198,39,179,73,237,229,119,199,171,171,52,95,150,42,140,10,192,217,108,87,59,247,27,204,228,196,5,0,168,69,64,219,218,77,95,140,75,153,209,216,195,246,35,61,29,163,153,28,185,70,6,221,168,67,194,113,224,91,162,226,133,238,71,125,215,186,104,28,112,38,10,64,16,93,243,215,17,93,155,160,120,22,160,76,21,192,153,32,101,26,1,156,9,82,166,83,192,153,32,101,178,0,206,4,41,211,53,224,76,144,50,141,1,206,4,249,209,33,108,170,0,156,59,128,77,21,64,153,118,33,141,2,80,113,26,82,230,28,207,25,217,148,141,69,26,247,7,91,159,252,236,129,70,5,54,125,6,32,30,138,72,239,159,43,150,11,159,174,169,10,64,251,121,9,73,68,182,82,76,102,89,202,86,135,9,61,56,201,16,165,131,112,234,33,22,128,141,145,97,9,121,192,177,16,99,99,91,207,83,140,
+198,20,109,79,122,86,152,28,171,204,152,90,52,230,75,127,10,202,171,117,253,184,21,22,129,167,164,168,114,207,215,98,78,201,161,52,18,185,51,87,132,16,199,6,32,145,132,115,62,138,134,172,92,22,187,131,253,178,69,163,89,107,23,108,242,178,16,230,255,0,59,58,61,219,212,65,89,38,216,194,87,19,107,192,92,60,48,111,58,184,167,0,200,154,3,104,67,246,150,10,254,57,82,20,225,109,91,75,63,126,1,176,223,45,57,37,22,98,153,211,30,91,30,89,126,156,100,155,156,49,182,9,245,239,220,35,80,46,248,98,210,60,11,9,101,193,11,175,21,207,34,161,60,76,32,161,172,101,33,161,172,146,32,161,28,120,70,66,153,196,145,80,206,63,34,161,236,112,33,161,124,172,68,66,217,158,67,66,57,138,228,157,222,48,142,132,242,253,48,37,148,67,167,107,29,252,105,50,93,167,177,144,16,206,65,176,6,88,237,6,118,50,102,228,174,254,217,96,107,242,190,250,82,199,218,68,18,30,4,199,162,240,160,12,141,151,106,120,54,62,241,53,108,77,122,203,
+7,0,99,131,228,140,188,8,120,239,242,115,189,203,244,74,223,156,117,205,91,89,150,147,57,84,16,41,221,202,134,186,199,69,72,188,222,132,146,55,173,149,133,246,157,122,103,190,230,74,95,7,175,70,41,131,95,48,40,213,26,216,87,146,33,25,198,199,147,149,153,244,242,196,162,107,109,62,77,193,159,160,3,157,2,124,50,6,156,50,190,68,152,24,143,172,224,6,72,153,193,182,12,151,116,3,186,225,89,21,85,159,51,165,205,51,158,107,126,145,55,243,244,3,222,131,1,144,50,122,85,254,212,201,81,242,166,219,152,66,60,249,64,183,5,232,7,143,3,113,253,6,224,122,39,118,9,238,186,226,41,76,83,247,125,165,5,120,10,237,107,169,248,17,229,254,126,102,197,85,26,105,97,54,24,106,171,121,177,149,159,96,225,204,42,194,235,74,167,94,202,226,102,73,254,146,51,17,233,86,226,220,29,212,128,234,155,238,149,13,185,13,251,228,47,96,128,188,203,48,252,71,113,31,234,246,115,215,20,224,133,104,99,113,142,98,83,127,184,175,246,251,122,75,53,129,
+248,77,56,114,182,36,95,156,42,174,239,170,37,166,46,11,141,179,140,67,126,185,14,27,4,24,46,153,12,137,194,71,44,179,252,142,3,70,132,221,243,16,89,82,225,54,169,114,27,112,128,115,142,155,8,39,29,18,38,207,190,56,232,251,149,156,16,218,208,2,247,67,228,63,29,224,118,151,245,161,22,58,154,71,129,189,176,1,213,241,156,149,228,94,2,54,89,211,244,40,183,31,99,36,200,214,49,112,62,227,36,116,229,238,228,158,70,56,40,39,25,157,216,218,48,18,26,64,127,64,161,177,180,77,164,48,193,194,201,240,167,125,63,102,41,92,47,109,198,164,116,150,74,83,90,189,77,201,244,104,95,130,30,12,3,58,111,128,60,144,137,31,122,115,71,74,149,16,150,2,27,106,31,225,39,15,93,243,249,184,203,50,129,218,71,60,203,68,241,48,75,83,201,94,240,127,252,247,247,139,15,22,137,206,141,142,72,213,6,218,179,179,145,23,252,182,192,253,38,216,198,235,107,138,165,81,231,211,30,57,168,56,98,35,240,214,37,253,248,42,209,77,7,230,101,72,
+40,218,49,36,20,197,47,66,17,163,80,239,104,176,208,234,186,79,242,36,91,181,17,246,154,146,7,143,7,170,104,37,83,118,152,118,249,211,148,210,96,163,253,152,192,44,80,129,80,105,204,20,136,142,68,20,54,49,82,189,192,53,240,231,181,159,34,178,36,205,74,109,127,158,63,28,19,198,27,243,145,54,188,247,52,1,83,202,52,30,152,198,18,39,169,9,51,0,79,153,207,185,132,182,9,11,142,120,161,55,2,98,169,9,131,5,64,213,181,143,234,179,247,182,37,179,110,222,161,54,87,143,45,66,221,47,130,251,33,35,96,38,181,6,86,184,82,111,173,157,237,9,201,213,137,160,102,46,171,151,221,198,203,14,161,137,154,232,128,143,161,62,18,172,30,35,186,120,69,105,118,175,249,84,27,127,160,51,234,115,132,236,108,44,181,23,188,45,7,224,22,14,108,126,249,113,131,135,152,80,128,97,2,216,70,249,108,137,31,219,149,112,119,81,62,108,64,50,180,49,89,167,111,163,134,172,29,144,161,86,91,222,220,110,255,56,175,189,166,120,109,181,206,228,43,233,
+128,110,196,106,82,212,80,199,217,20,177,56,26,182,236,140,193,235,221,112,90,161,124,91,138,220,43,94,32,202,167,227,194,78,12,226,223,166,24,47,228,35,211,47,251,218,176,108,211,90,197,124,209,110,242,250,171,51,138,151,253,119,68,139,0,63,157,22,37,102,198,131,45,53,139,218,89,164,147,87,48,236,182,173,176,203,189,145,246,159,116,164,28,24,249,171,7,211,62,96,162,243,156,143,218,96,54,23,211,181,210,34,17,113,78,186,115,177,93,16,65,244,101,40,132,198,19,147,219,170,41,60,235,241,58,92,165,22,79,100,107,8,79,6,75,130,151,126,226,1,24,192,119,30,164,42,244,40,41,147,52,238,242,60,140,55,33,252,190,253,39,32,30,128,202,128,246,101,62,225,209,31,226,193,255,105,94,72,40,244,209,251,115,20,250,196,216,28,212,62,25,71,252,113,62,148,38,91,43,253,129,99,110,156,202,227,38,33,1,240,13,165,193,233,21,214,114,178,28,72,71,157,251,136,177,212,217,100,202,231,12,29,83,225,39,69,251,100,128,186,205,33,25,159,123,16,
+37,58,54,103,83,50,48,108,17,26,101,40,121,178,148,24,232,215,117,223,237,75,254,126,30,60,106,159,20,70,201,90,80,163,26,0,235,157,235,56,165,146,20,126,67,67,163,94,186,193,15,29,218,74,246,134,15,61,101,213,143,171,8,137,153,112,56,187,212,62,90,142,171,142,146,197,150,92,77,178,173,112,37,83,128,245,192,45,135,147,59,109,169,180,104,14,233,246,12,231,155,247,195,12,33,42,35,93,104,87,8,122,114,96,115,50,61,46,46,223,78,106,211,107,54,91,126,236,84,5,151,204,13,32,129,13,251,149,80,96,223,242,46,195,201,212,75,189,238,225,213,171,58,217,182,109,235,199,21,1,26,150,184,211,84,230,209,215,13,150,20,211,32,235,150,131,249,107,244,117,131,234,225,197,179,127,46,65,210,183,113,36,232,250,128,108,164,111,68,137,199,91,59,115,5,80,169,0,106,63,217,206,130,69,160,19,107,47,252,105,229,90,31,124,217,167,26,161,54,118,133,11,154,82,87,186,226,204,77,121,158,151,130,47,113,147,133,129,167,130,124,81,138,207,154,157,
+177,120,222,217,207,81,234,90,142,143,152,157,180,168,34,152,103,2,247,122,90,137,81,31,106,139,145,194,1,248,3,248,24,167,246,47,74,162,232,153,68,121,121,228,185,235,101,59,201,141,167,131,91,105,72,242,116,184,171,249,142,247,118,233,72,103,215,242,132,42,180,119,127,203,53,96,105,77,182,201,65,253,152,64,148,1,220,6,17,10,4,3,68,168,72,168,177,197,131,6,172,32,124,154,97,228,185,10,216,191,197,97,120,156,45,7,127,191,15,114,3,220,195,215,134,246,8,195,185,187,43,89,99,34,252,95,214,209,12,168,17,98,190,66,141,144,172,84,173,185,147,242,236,220,147,101,184,252,31,240,55,8,77,69,93,252,56,179,225,178,250,56,104,98,24,4,39,128,77,65,38,181,1,21,97,155,46,60,201,155,145,23,251,136,112,41,197,214,2,28,46,97,124,246,123,2,234,233,228,28,81,222,224,113,236,112,211,175,252,152,18,6,164,247,153,131,209,152,21,110,250,165,206,239,25,32,251,96,68,59,168,40,87,49,233,84,148,7,157,212,247,136,56,152,237,185,
+191,39,189,220,24,184,81,31,48,208,164,248,14,72,152,205,233,43,44,85,243,123,205,39,46,170,80,110,78,215,193,223,116,165,24,112,88,216,234,24,115,206,134,176,154,79,25,163,240,91,252,114,92,67,68,163,114,165,188,221,13,103,112,251,89,199,210,227,181,210,79,185,86,41,114,127,167,201,231,11,197,239,250,161,91,183,20,139,102,202,215,112,13,229,33,233,61,223,132,249,195,143,244,7,58,101,8,253,204,170,173,116,53,69,220,164,82,219,240,11,27,22,125,243,60,94,199,18,252,147,25,23,45,216,167,248,11,251,104,70,25,200,194,198,213,84,125,194,176,8,241,193,179,171,33,76,208,143,213,241,64,45,198,232,62,170,143,57,120,21,4,78,27,182,237,234,6,217,2,110,238,63,108,74,93,13,123,166,88,11,201,227,71,104,121,187,164,2,126,219,117,91,69,211,32,7,246,97,83,190,195,83,99,37,137,51,44,50,43,202,110,137,34,203,110,170,140,240,98,133,187,157,2,23,215,0,144,187,120,76,35,224,64,209,185,181,231,253,114,244,204,66,171,160,141,230,
+77,135,220,189,116,171,230,43,162,68,213,175,91,14,172,83,143,191,196,79,237,139,220,32,160,4,240,123,87,174,224,212,164,171,102,54,222,62,145,237,252,18,48,252,37,27,232,57,176,78,55,225,30,43,118,169,142,138,93,26,156,154,186,141,216,236,134,121,239,163,197,137,19,20,141,62,42,182,60,213,43,87,169,62,157,190,164,190,48,51,93,231,217,35,169,245,240,54,93,165,240,232,128,20,125,64,219,3,186,99,180,61,32,233,192,89,91,109,107,183,250,204,172,230,14,179,37,52,104,3,225,50,168,219,128,41,106,17,157,43,232,181,57,254,0,242,141,171,216,222,45,94,152,123,4,137,228,128,95,150,1,83,50,223,18,20,98,34,29,150,81,25,217,83,143,105,253,60,46,172,222,142,85,129,160,100,80,214,215,16,86,202,250,227,1,89,45,22,12,175,221,108,58,49,7,19,34,129,141,219,111,219,230,159,89,100,220,165,46,45,105,154,135,208,234,199,245,107,122,200,34,115,237,147,189,113,72,230,193,8,23,19,197,238,99,184,102,169,216,221,46,47,152,57,151,178,
+119,167,205,203,79,77,100,116,165,210,5,133,170,234,24,139,29,13,18,100,190,98,183,59,142,71,193,2,53,224,50,121,170,114,239,174,30,104,12,86,123,170,44,187,97,66,65,225,128,147,199,108,24,234,35,94,205,26,12,99,4,236,117,64,30,7,206,172,143,16,252,172,99,141,168,86,246,120,2,163,105,75,181,186,117,162,53,60,198,253,181,107,1,137,53,187,189,199,43,60,125,131,37,110,51,135,76,223,210,178,173,17,222,147,14,162,195,185,227,81,91,148,100,10,2,28,191,20,254,206,6,71,229,115,252,223,125,210,168,79,253,85,202,222,46,175,205,233,103,131,99,183,183,71,215,91,37,90,198,177,1,48,55,128,3,13,75,60,158,37,166,110,166,67,120,86,166,99,63,61,30,39,189,219,184,192,16,0,103,22,136,88,95,71,84,27,139,220,192,226,108,184,53,207,110,49,110,71,247,193,109,156,224,150,105,157,152,226,221,16,163,187,33,172,227,117,48,182,117,106,15,24,240,26,222,22,192,246,5,59,184,157,232,43,79,213,43,113,161,82,141,137,27,42,230,240,
+209,44,62,214,97,23,212,24,134,159,122,249,230,187,18,135,47,28,38,184,130,0,189,162,238,17,83,133,180,169,109,25,75,93,228,242,13,89,105,22,178,143,53,227,150,58,139,238,183,162,251,195,229,177,123,179,228,198,216,40,106,93,177,211,16,230,24,246,230,246,19,149,10,126,12,230,180,101,10,96,162,211,52,89,57,57,184,155,94,73,235,179,105,178,60,138,57,214,115,181,195,202,249,37,78,93,145,0,179,158,186,173,26,108,87,113,137,115,101,183,194,247,246,231,197,120,181,199,247,109,221,93,44,23,199,186,154,21,125,68,120,100,76,60,184,47,46,197,120,137,62,10,239,99,25,21,88,179,192,12,37,236,244,162,30,254,160,10,231,120,226,184,134,217,106,214,141,118,132,188,72,11,22,196,241,134,85,138,137,85,59,204,109,245,58,145,156,236,180,156,9,171,33,36,59,47,4,186,6,34,213,222,161,69,252,55,39,74,225,166,227,176,114,69,144,204,134,128,155,180,136,108,193,192,82,85,13,12,188,50,122,194,129,150,96,28,129,69,178,167,90,206,153,228,157,100,
+255,34,87,186,216,239,42,192,253,132,128,62,197,54,69,183,78,100,38,127,9,254,207,1,174,120,17,254,186,217,163,103,147,196,18,143,203,118,166,71,113,183,12,92,205,9,232,115,121,162,115,93,127,74,194,51,93,225,178,157,58,147,131,81,144,19,226,243,42,14,190,197,81,181,21,18,93,233,92,146,21,182,9,32,71,118,142,218,188,230,230,14,60,83,84,209,36,154,82,67,182,183,238,22,226,240,119,221,2,49,188,193,45,98,244,146,198,63,56,159,243,208,182,41,123,44,244,207,136,227,73,213,108,152,161,189,167,2,141,174,154,124,249,116,252,47,63,171,42,71,72,212,108,36,226,107,216,82,159,220,26,179,158,204,214,250,247,170,212,212,204,250,157,31,4,122,253,186,25,186,104,178,158,143,171,27,132,178,87,20,73,69,181,116,188,26,93,120,108,234,210,21,99,148,193,117,45,23,31,58,235,15,25,211,73,55,215,237,77,15,246,215,55,102,59,213,229,164,91,114,19,223,72,90,71,146,19,133,228,206,49,91,23,95,153,111,85,110,39,194,207,68,243,188,244,60,
+109,209,150,248,125,127,71,4,226,80,16,152,104,62,115,24,126,181,117,237,123,191,194,13,95,44,255,246,235,223,162,119,156,163,227,95,254,197,207,126,246,249,219,63,251,139,63,253,252,191,252,217,231,67,127,73,189,247,253,245,199,183,191,26,122,245,39,159,254,245,229,219,95,126,120,253,225,237,203,27,221,223,127,120,243,235,55,31,62,188,249,199,207,126,108,128,191,253,226,53,124,223,59,184,229,27,106,132,239,254,252,177,17,134,126,249,45,122,101,251,251,15,239,126,243,225,245,87,240,77,243,239,95,255,234,183,175,127,3,174,164,222,65,255,203,55,224,222,175,127,11,46,69,115,249,209,103,82,147,166,30,244,147,161,95,190,251,248,197,203,123,228,63,190,249,240,245,235,47,191,255,236,175,255,241,127,251,180,95,189,251,234,253,91,248,174,120,120,241,167,71,83,99,127,255,209,212,251,231,255,245,13,244,175,63,252,230,205,199,161,119,255,4,22,245,246,199,12,251,231,159,15,253,183,119,223,82,239,96,255,230,253,155,95,189,253,245,191,12,189,30,250,72,221,245,234,
+79,190,124,247,171,215,240,205,237,223,189,184,253,195,155,111,190,253,242,35,124,59,251,47,223,126,253,250,195,191,12,125,241,230,195,155,159,192,215,182,127,122,25,252,219,143,223,205,247,119,31,222,82,151,126,124,55,244,111,225,0,111,254,249,245,87,239,191,124,243,243,127,247,50,137,255,240,167,63,251,252,175,134,254,234,231,175,126,241,237,251,247,175,126,241,238,219,143,175,126,241,234,223,188,60,251,23,255,233,111,254,243,95,255,221,103,255,241,203,183,31,255,199,103,212,251,219,63,67,254,251,236,111,223,125,246,119,111,191,254,243,127,255,234,23,191,126,247,238,179,55,255,252,195,159,114,31,250,175,95,188,253,102,232,215,192,78,67,224,243,245,208,239,222,125,248,45,252,85,120,202,176,111,190,249,230,39,67,111,127,13,223,107,63,244,197,235,127,122,51,244,205,183,191,1,22,254,215,151,211,191,253,248,147,161,247,212,207,199,15,189,127,247,13,21,0,95,125,122,17,253,127,255,135,47,62,126,124,255,234,231,175,126,250,234,167,191,251,221,239,94,125,6,45,241,213,
+235,143,111,192,228,63,123,247,225,55,175,126,10,70,248,246,171,87,63,253,135,33,234,31,127,255,233,7,232,255,254,127,2,149,61,43,24,
+
diff --git a/uppsrc/ide/app.tpp/IconDes$en-us.tpp b/uppsrc/ide/app.tpp/IconDes$en-us.tpp
new file mode 100644
index 000000000..b8a18a74c
--- /dev/null
+++ b/uppsrc/ide/app.tpp/IconDes$en-us.tpp
@@ -0,0 +1,46 @@
+TITLE("Iml designer")
+COMPRESSED
+120,156,237,122,217,111,162,89,150,231,191,98,245,244,228,67,47,165,90,186,171,170,107,52,82,63,204,180,84,210,204,104,52,165,121,42,149,166,162,50,35,43,67,29,25,145,138,136,156,156,82,169,37,48,152,29,131,1,3,54,187,205,110,99,140,141,177,205,190,99,204,102,54,155,197,102,243,130,193,198,96,3,54,59,115,239,247,69,100,101,86,118,79,61,76,63,204,195,132,194,132,207,61,203,61,203,239,220,123,174,29,191,156,249,243,63,255,254,95,125,255,223,124,255,79,252,249,217,127,120,254,233,179,47,95,190,251,213,47,127,255,63,254,233,223,254,199,255,242,215,255,253,23,51,191,124,251,253,127,247,227,153,159,127,254,114,230,147,231,111,95,252,246,213,243,55,51,31,253,10,46,254,179,255,252,197,204,63,124,249,234,147,103,159,63,127,245,238,217,203,153,143,95,191,122,247,230,245,203,183,128,55,243,251,223,255,232,111,126,252,195,159,253,248,111,127,244,211,25,84,242,191,189,248,237,103,239,102,62,127,253,229,219,231,51,191,249,242,221,187,215,175,126,245,179,159,
+33,188,153,255,250,226,227,127,124,59,243,241,151,111,222,0,67,192,204,203,215,111,190,247,129,249,23,51,191,248,236,197,167,239,126,253,151,255,233,249,167,255,130,250,63,188,124,253,250,147,153,79,95,188,124,249,93,45,96,244,237,235,55,51,255,248,252,119,111,191,150,255,207,175,255,231,243,153,183,207,95,62,255,248,221,139,215,175,102,94,124,58,243,236,213,239,254,106,230,237,199,192,249,151,51,47,62,127,246,219,231,51,175,223,125,246,252,205,87,47,222,62,255,222,175,254,233,159,254,79,25,248,203,31,252,224,39,51,191,248,242,139,231,111,222,62,251,252,139,151,47,94,253,22,56,249,201,243,15,249,121,47,252,203,191,152,249,251,191,71,44,255,236,7,63,248,233,71,224,11,131,99,99,216,152,175,255,244,108,194,97,251,193,47,88,88,192,45,243,249,165,91,2,102,83,154,224,225,101,84,22,43,69,141,51,194,43,198,155,11,39,211,117,158,98,175,215,239,247,165,88,15,78,40,61,195,239,176,154,167,171,15,106,86,61,240,144,172,44,200,113,247,106,231,156,158,
+39,38,180,100,218,181,193,44,215,124,141,197,80,111,108,199,165,95,129,253,103,126,245,2,20,104,230,237,87,47,222,125,252,217,243,183,127,168,239,187,215,51,191,254,179,183,223,140,224,215,127,134,196,240,61,128,3,152,139,23,111,65,110,158,189,124,254,201,204,143,102,222,189,248,28,232,254,230,119,51,111,158,127,241,252,217,59,24,238,23,47,254,215,243,151,111,103,94,188,154,121,247,25,16,133,154,63,251,118,248,255,254,15,209,255,228,135,127,251,209,79,126,244,3,12,174,131,233,126,35,122,162,176,145,113,213,61,6,35,19,31,159,230,132,171,212,147,86,77,116,107,229,43,86,124,165,155,139,157,158,215,199,85,50,249,139,216,7,174,125,35,124,213,175,20,159,218,39,212,0,245,225,102,62,117,156,247,246,11,139,166,145,72,222,60,104,208,119,34,156,102,195,192,91,206,31,171,118,210,166,248,48,183,101,215,232,76,100,69,66,176,206,0,107,219,112,17,172,21,225,34,88,11,49,24,183,217,238,120,26,233,223,44,132,238,140,156,179,92,93,80,0,182,238,110,89,
+161,220,134,37,238,61,170,175,53,6,249,240,88,49,12,113,199,212,73,169,248,120,218,86,239,164,41,38,91,163,111,238,23,11,119,25,211,249,178,71,83,213,153,106,96,219,136,126,119,253,156,106,222,216,183,112,80,67,67,145,85,207,107,68,175,196,121,37,216,176,97,24,242,238,116,55,204,208,227,211,189,18,56,222,49,233,47,111,46,196,15,89,251,110,1,81,224,82,218,217,81,40,113,117,115,12,246,128,91,80,204,253,251,165,173,188,39,166,65,55,216,26,155,214,7,38,66,98,148,111,36,243,92,61,251,98,237,178,115,75,87,152,24,57,229,174,239,244,54,59,148,32,102,47,183,111,46,14,251,143,220,90,124,173,81,201,135,47,37,71,58,75,12,68,178,98,59,173,134,162,236,92,221,38,80,219,92,131,76,149,24,138,78,108,174,124,163,192,134,214,214,46,217,89,135,234,26,232,136,243,97,31,183,27,108,196,119,34,205,188,61,186,177,207,169,54,151,76,57,229,208,228,59,125,204,110,181,79,228,128,56,28,155,198,183,86,36,147,239,211,187,147,69,211,171,209,
+163,233,101,252,113,29,232,112,81,133,41,225,117,142,65,232,160,52,3,255,124,221,24,63,254,187,191,249,8,126,96,112,73,108,18,251,7,112,156,8,27,167,46,138,60,96,100,249,226,57,221,113,60,150,191,78,155,188,238,147,142,151,173,194,185,197,253,156,133,64,144,224,148,151,195,26,143,121,213,114,216,179,52,131,175,61,220,158,90,198,140,233,36,172,119,112,112,50,235,226,28,163,172,150,81,36,110,247,136,28,156,18,167,147,29,82,217,165,83,143,72,212,120,175,195,228,86,98,61,63,191,40,54,156,226,54,153,115,82,70,25,145,212,27,17,146,113,132,146,29,141,176,26,46,103,238,92,133,12,201,77,4,12,38,144,203,221,185,50,122,148,100,168,203,178,65,116,91,217,90,89,127,146,174,123,203,30,49,42,167,91,64,201,76,12,33,109,85,210,82,114,143,59,100,114,87,87,90,50,200,240,103,72,144,92,89,64,73,32,39,110,211,52,194,16,211,6,189,251,32,23,178,29,160,228,74,28,146,177,190,223,196,153,191,20,227,231,212,204,17,202,16,172,32,228,232,
+131,220,66,213,122,78,9,60,48,12,110,55,199,14,24,7,80,238,129,225,230,163,228,40,5,200,182,216,48,55,123,190,79,132,33,190,151,187,118,161,164,123,15,37,247,139,49,190,219,112,58,156,23,22,139,197,233,144,40,54,149,75,250,236,172,123,186,61,143,117,53,92,206,98,100,27,63,55,21,226,112,140,220,44,214,113,69,206,217,238,108,1,167,212,84,202,163,98,243,89,84,108,251,10,21,203,5,16,177,65,116,11,228,106,253,73,124,126,94,226,117,168,132,201,114,88,161,30,85,249,252,148,151,75,27,237,132,142,122,193,152,97,83,173,227,247,196,55,92,233,101,161,77,219,164,213,161,152,66,137,138,113,43,168,88,76,142,138,221,4,184,82,36,98,247,67,115,159,48,9,238,154,74,255,58,126,38,16,63,237,1,94,75,244,168,193,171,248,246,30,207,36,109,5,154,183,122,206,100,168,30,221,71,242,212,185,169,61,119,39,160,23,11,189,19,126,79,130,178,245,143,40,59,175,132,108,128,140,26,106,166,69,21,61,234,112,170,239,202,93,161,102,232,17,212,12,
+143,129,178,57,22,148,77,77,162,102,148,29,212,140,200,135,154,249,142,92,27,53,83,188,66,205,152,2,40,123,114,134,178,231,52,168,153,214,0,53,243,120,170,179,4,174,86,169,214,189,80,254,168,119,190,251,148,239,94,54,39,249,147,213,33,80,107,214,67,197,167,209,174,222,31,178,221,231,243,67,166,128,177,209,234,109,52,92,101,70,177,16,75,243,28,253,102,145,46,114,75,28,182,53,253,84,213,46,218,151,109,213,165,20,132,183,228,188,119,23,29,206,75,206,219,241,171,185,130,2,180,218,125,51,111,25,60,236,78,27,103,107,113,184,77,183,129,110,115,185,91,232,53,198,164,72,96,196,67,19,59,65,118,29,237,142,245,126,184,77,186,138,110,35,110,35,93,97,139,117,12,35,213,56,16,51,8,250,215,179,205,4,151,83,157,244,26,103,227,190,224,105,250,152,134,17,62,161,219,172,101,227,15,205,209,163,221,75,133,193,129,216,118,145,93,47,155,22,184,43,136,109,138,110,163,175,251,65,51,129,94,82,23,0,108,118,195,251,4,130,184,202,229,76,246,15,
+9,87,235,35,222,81,79,116,201,231,111,183,138,206,237,144,237,129,22,238,11,87,112,177,54,149,226,16,30,224,218,220,9,21,244,17,88,205,246,244,210,56,218,111,122,161,16,231,56,175,242,123,89,49,200,39,212,133,202,101,222,185,191,20,117,79,177,186,39,242,161,97,179,218,166,89,131,49,144,21,160,107,134,202,173,144,97,180,89,45,59,48,226,246,18,18,230,3,141,55,2,233,43,245,239,174,92,64,25,232,26,167,216,185,226,60,118,63,71,157,206,25,79,215,2,39,78,97,204,208,178,238,6,160,50,208,125,114,96,220,250,128,83,8,112,50,11,11,124,11,112,98,58,47,17,179,61,33,46,6,176,143,117,136,160,199,246,35,202,212,2,67,179,143,140,167,121,96,175,11,119,225,74,91,251,187,112,151,88,96,92,110,2,43,115,146,24,3,61,135,66,182,6,191,39,114,4,146,206,246,186,11,240,166,144,201,112,23,113,64,151,234,144,232,182,225,46,209,42,127,171,39,6,29,220,224,55,65,182,218,241,94,190,7,157,170,174,86,73,72,90,154,150,117,194,36,
+0,29,166,129,166,205,3,158,4,48,91,96,207,39,184,41,216,68,201,231,183,247,65,238,165,100,212,193,224,104,196,153,60,210,194,119,217,94,255,122,63,198,223,5,167,144,32,224,100,144,239,129,148,202,234,106,151,25,208,97,199,178,120,206,1,93,105,76,7,70,40,176,134,164,165,76,118,82,64,27,131,128,21,93,128,10,80,34,70,239,100,21,150,168,12,156,129,37,202,130,26,137,91,248,57,37,162,61,29,36,56,147,61,152,23,220,77,28,10,180,197,246,128,179,141,87,169,107,136,118,239,36,0,64,3,67,18,23,209,196,180,65,79,208,64,141,14,65,250,220,108,206,196,136,104,223,196,135,189,115,8,24,253,85,0,10,132,251,29,144,126,182,88,218,138,35,218,69,134,205,45,129,249,157,114,108,72,27,174,135,158,252,134,150,101,50,127,142,173,146,99,160,3,11,136,118,160,188,143,134,39,86,234,128,0,64,204,38,205,26,235,205,186,37,12,68,219,70,41,161,225,117,199,48,57,32,55,98,16,123,179,183,79,48,192,228,128,220,108,32,218,115,142,36,26,158,
+209,6,147,3,114,51,7,147,3,114,147,65,180,213,163,14,26,222,234,251,251,162,249,1,191,55,48,57,32,55,114,168,13,114,99,70,195,123,40,193,228,128,220,176,97,114,64,110,198,136,118,43,112,141,134,39,102,163,125,74,186,64,175,161,22,9,185,189,72,212,45,148,148,165,144,219,139,51,79,71,175,171,15,114,151,4,148,124,47,87,181,202,145,219,203,237,166,161,215,21,137,133,220,94,110,14,1,37,169,105,228,246,58,223,159,236,206,99,167,170,108,117,29,45,167,131,141,198,203,169,161,229,188,193,162,229,180,199,208,114,126,29,239,251,114,22,63,224,124,31,45,231,185,2,45,231,94,14,141,183,103,67,203,25,216,70,203,41,28,160,229,252,16,175,91,140,150,211,118,136,150,243,233,18,45,39,214,128,150,19,233,7,80,78,134,16,45,167,142,141,150,147,150,65,203,25,32,162,229,156,182,208,114,94,219,209,114,10,98,104,57,197,124,180,156,165,19,180,156,243,53,180,156,167,5,180,156,173,89,180,156,184,117,180,156,247,3,52,188,15,125,39,140,162,229,20,
+239,160,229,220,103,161,229,36,136,208,114,54,91,104,57,219,65,180,156,97,59,90,78,67,7,45,231,251,243,232,158,118,130,158,71,110,57,27,109,148,60,76,14,200,205,46,12,15,8,40,97,114,64,110,24,48,57,32,194,6,76,14,200,205,42,12,15,228,134,12,147,3,70,161,62,152,113,224,40,228,101,234,144,201,200,138,146,204,21,112,119,192,171,131,134,160,100,221,187,4,229,192,100,228,71,73,68,14,86,202,13,193,5,48,243,65,78,134,146,31,228,98,57,228,52,23,227,93,115,232,124,119,11,193,5,176,37,69,73,40,135,32,221,139,160,201,142,151,161,114,15,21,148,156,59,66,200,182,152,2,193,5,70,33,47,156,254,32,3,204,66,112,50,170,188,39,63,244,29,21,153,18,203,178,14,148,3,51,227,28,74,82,150,225,208,8,102,198,75,56,52,130,16,169,68,148,241,144,67,72,226,123,185,129,2,133,141,244,2,153,254,72,110,54,28,26,65,102,30,80,146,72,134,67,35,200,12,213,65,55,248,249,201,237,197,233,44,175,213,246,254,209,19,243,231,224,
+109,247,157,103,232,95,205,252,238,245,151,51,31,63,123,53,243,201,155,103,95,129,55,223,187,103,47,224,67,14,62,213,225,91,251,221,103,207,222,205,124,5,94,206,51,191,125,254,110,230,237,231,175,193,187,23,188,134,223,189,120,246,242,197,179,183,64,240,217,23,224,153,247,230,217,171,143,159,207,124,245,217,243,87,224,217,247,254,41,248,201,235,175,94,205,60,251,237,179,23,175,254,229,199,222,15,126,252,211,191,251,8,126,96,112,9,108,226,219,19,253,25,156,232,59,232,68,47,147,55,174,119,20,174,164,77,76,242,57,131,180,245,105,232,170,201,175,48,230,151,147,28,85,113,54,236,154,158,223,132,248,73,99,177,216,44,78,199,205,162,163,138,147,20,225,76,159,86,51,202,2,173,216,109,234,142,210,99,73,191,221,60,114,146,98,190,180,39,195,32,104,137,155,244,105,154,219,164,213,150,242,86,82,55,127,212,101,154,100,245,3,217,173,7,144,121,51,74,202,90,183,30,253,147,223,72,231,52,196,248,134,122,64,218,65,229,26,135,40,249,94,142,103,81,158,231,
+252,38,134,219,196,73,217,16,6,59,127,4,201,212,33,74,230,3,71,33,145,161,113,46,80,19,81,127,228,80,238,90,64,228,160,100,106,0,201,203,40,95,98,50,68,112,155,244,175,253,102,24,17,146,145,66,201,206,222,67,53,156,207,92,185,36,25,36,128,116,6,200,229,174,92,239,227,73,131,23,134,96,176,191,173,108,172,220,182,165,183,158,180,231,189,92,35,142,146,153,38,66,218,78,15,151,146,38,83,127,120,47,185,185,105,78,199,219,2,41,142,177,84,56,234,14,193,137,149,79,75,24,90,71,145,138,205,106,39,189,169,17,204,174,216,172,189,74,198,18,105,122,245,192,102,227,243,117,117,70,128,145,110,250,156,183,233,41,199,138,108,119,235,104,23,188,78,125,131,179,130,76,220,221,102,169,82,138,36,55,91,39,214,117,87,218,65,198,238,112,35,112,110,198,55,16,185,101,101,73,0,39,106,237,148,109,197,221,44,195,33,90,73,214,78,34,180,245,218,45,5,206,239,215,151,197,40,31,100,34,31,240,56,99,151,100,66,129,80,141,171,7,93,90,88,118,
+128,199,233,61,215,169,113,7,92,53,71,179,88,158,176,108,204,93,233,206,75,206,121,5,191,183,228,95,101,215,79,12,155,68,22,109,199,74,91,141,119,111,248,101,190,7,170,199,167,48,185,192,226,124,30,140,7,37,50,65,12,214,160,197,213,176,12,177,152,72,141,17,139,109,44,15,177,136,57,47,33,22,163,254,85,196,98,138,69,67,44,206,221,240,17,139,83,66,28,177,232,48,68,44,62,103,83,52,182,150,74,59,75,179,218,128,195,231,12,205,167,167,4,142,118,194,197,233,247,129,221,228,181,224,137,122,14,92,45,108,182,114,235,97,87,186,88,41,41,60,68,237,148,146,158,82,243,96,93,59,209,116,122,104,93,207,252,149,146,138,14,4,179,57,84,144,160,64,5,119,169,168,160,196,8,247,11,205,183,244,252,94,67,41,173,175,55,13,45,150,39,237,144,204,105,145,157,19,160,36,176,34,169,198,109,123,214,81,185,33,103,70,135,216,167,26,229,82,107,111,217,137,133,81,224,202,49,182,166,198,165,211,241,188,181,31,153,14,47,250,215,2,94,79,114,178,
+107,232,115,192,168,204,185,0,60,200,234,2,94,95,61,112,246,135,194,94,91,48,125,100,180,81,0,47,2,233,69,139,47,80,230,77,165,201,163,46,150,142,141,237,95,204,95,168,107,90,251,102,75,195,59,237,99,105,190,188,213,233,220,104,198,227,151,146,3,206,1,176,87,74,110,236,211,112,75,20,45,131,54,42,31,42,158,164,158,120,40,142,116,3,175,183,151,101,88,21,206,85,170,214,202,212,168,7,105,198,163,205,236,196,129,60,70,79,198,71,96,38,103,122,53,192,191,204,184,180,169,153,19,159,149,176,97,147,43,189,54,185,142,207,61,136,15,64,171,213,137,52,100,213,165,143,194,38,109,20,74,171,187,5,13,221,166,208,128,166,123,202,106,118,100,195,250,89,85,149,34,152,230,251,88,64,211,109,59,10,13,194,105,238,200,16,78,132,80,184,163,213,4,121,171,181,231,114,198,6,58,47,65,124,6,12,91,105,165,82,73,59,229,166,91,12,61,159,191,87,151,60,128,168,128,132,115,4,242,125,13,242,94,46,207,225,112,39,227,237,125,245,0,46,167,53,
+211,117,164,17,184,183,237,101,67,139,58,241,80,177,129,221,229,116,81,66,195,98,215,38,196,163,237,110,4,218,153,134,49,13,32,176,217,234,229,105,86,51,64,224,209,21,141,118,218,117,96,206,180,77,63,48,51,157,224,80,160,234,34,107,46,167,190,103,134,47,13,0,119,242,29,193,180,62,56,83,15,90,44,218,109,182,107,57,114,155,244,120,92,190,16,200,59,219,66,186,86,239,162,58,185,105,7,53,93,164,206,98,117,107,19,222,224,18,233,202,118,52,230,113,50,186,102,16,84,21,84,179,189,185,57,184,76,7,100,245,152,103,27,200,75,230,76,253,165,106,185,20,186,225,247,166,226,42,92,118,46,193,101,173,131,225,196,229,143,199,0,73,44,196,140,31,188,192,3,3,17,120,35,96,240,105,199,50,224,121,199,118,237,196,72,48,229,215,7,35,99,68,64,79,99,117,122,248,70,56,151,214,3,231,165,144,118,28,11,164,25,126,39,215,4,14,19,152,225,43,144,98,13,191,103,136,22,192,24,113,235,79,207,199,92,208,99,142,51,237,152,131,91,217,143,128,
+21,224,251,37,180,98,90,173,103,85,37,96,69,66,209,107,37,72,68,28,53,122,206,212,218,179,134,214,185,109,126,27,76,194,224,56,114,94,195,116,168,100,245,14,206,176,121,153,150,224,119,76,125,44,63,243,96,54,195,249,95,90,199,13,208,101,237,60,195,11,246,155,178,14,81,51,237,14,48,67,181,207,99,151,80,51,52,35,106,230,131,188,105,25,53,67,16,161,102,12,54,212,12,131,136,154,249,144,223,71,208,175,72,98,196,236,13,105,253,169,82,90,13,105,29,226,180,131,151,129,65,221,95,11,202,187,60,88,38,167,165,141,95,3,167,39,191,153,217,2,167,103,186,73,244,65,59,214,175,237,184,43,37,222,232,95,193,206,33,180,195,197,49,38,243,118,154,22,156,225,42,128,190,94,106,92,216,131,48,11,172,54,22,10,5,26,13,8,140,25,168,64,12,139,10,180,10,168,192,18,207,2,111,178,230,129,158,48,57,6,88,119,92,151,66,112,191,59,0,94,184,95,192,7,81,106,205,73,174,26,224,187,166,97,218,66,5,78,249,168,0,163,137,10,124,200,
+243,53,122,237,16,84,200,45,212,150,118,80,82,155,71,110,161,165,228,3,184,133,224,69,123,45,67,25,251,40,41,51,162,100,129,141,118,231,159,188,159,183,26,133,235,81,219,241,116,40,234,241,92,18,103,58,194,240,167,61,188,163,110,3,156,217,173,57,99,68,41,160,79,36,141,18,21,20,27,116,93,111,182,6,208,171,21,219,49,87,239,219,159,227,28,181,169,19,50,141,99,85,244,182,180,118,38,63,205,112,128,3,203,203,72,123,24,43,141,130,84,74,56,150,244,14,91,151,164,212,88,170,21,79,56,194,180,132,164,37,74,124,167,122,244,224,57,45,208,70,235,0,187,172,190,123,17,164,155,54,2,120,10,172,214,159,104,149,18,172,100,99,187,253,88,129,141,182,2,30,32,115,160,174,61,164,174,200,125,138,84,242,155,118,102,255,47,236,8,223,219,33,73,65,253,112,49,114,21,84,153,225,77,123,170,140,149,58,14,164,162,187,10,206,83,18,54,61,75,20,179,70,75,105,137,10,137,34,77,124,90,169,151,3,241,144,136,4,143,229,221,185,169,229,118,91,
+220,219,245,84,183,226,93,112,204,183,52,179,169,49,56,22,71,20,113,163,173,148,250,68,35,39,5,52,110,154,33,121,112,167,99,174,180,71,245,255,230,124,195,52,173,2,140,64,70,53,67,64,144,21,71,201,204,135,115,63,5,176,4,161,132,202,229,173,117,148,148,185,32,9,114,153,4,201,132,163,94,106,128,50,52,50,116,16,252,32,247,190,95,24,113,16,35,28,245,194,80,14,76,126,106,148,28,136,1,9,51,179,114,46,64,50,179,128,202,93,199,81,210,125,141,146,151,77,112,232,247,77,254,14,47,226,160,70,206,4,223,250,177,247,79,126,240,195,143,192,23,6,247,128,121,248,246,111,68,132,134,208,154,107,157,227,111,232,110,141,166,164,141,110,202,9,10,28,22,143,90,82,201,201,215,150,182,248,216,205,29,176,169,163,157,254,22,207,49,139,91,154,163,111,63,85,65,39,75,120,84,207,229,246,69,59,179,119,243,120,16,191,93,208,8,35,87,237,182,248,169,43,104,22,49,109,185,244,216,176,60,183,156,118,47,116,49,109,240,61,30,18,9,83,56,181,
+198,32,165,215,253,88,117,24,253,198,128,181,102,251,242,185,26,107,71,226,200,232,142,167,83,221,227,108,232,146,157,230,85,171,188,116,87,84,182,47,174,25,214,41,234,106,230,80,237,99,153,120,156,141,112,77,103,95,93,175,184,119,184,192,220,36,217,174,223,221,149,187,143,143,172,114,122,90,218,77,110,232,91,131,65,161,110,232,205,25,30,114,87,172,202,162,4,81,87,73,8,135,202,78,180,150,222,90,83,156,212,4,65,82,122,119,221,191,117,120,232,111,42,115,34,177,61,31,185,154,211,31,143,137,143,171,77,143,41,123,91,235,118,119,138,166,67,135,50,96,98,83,152,107,25,250,101,218,251,96,235,31,9,120,20,219,41,237,64,217,185,42,38,235,231,208,202,186,63,130,88,201,209,183,29,115,119,119,119,58,177,85,82,92,39,108,44,141,36,75,137,91,163,91,123,140,93,205,44,198,99,118,161,205,145,13,114,10,178,155,11,101,81,105,180,232,54,207,41,105,245,113,48,107,108,181,30,21,100,54,174,54,237,245,210,245,139,11,137,9,12,186,119,79,38,171,
+213,50,52,229,38,254,82,123,203,119,14,83,64,4,65,152,195,243,202,93,104,101,141,165,137,219,146,27,98,224,154,242,114,145,19,161,38,181,204,246,166,194,114,35,94,196,250,181,199,231,217,197,56,46,198,217,132,75,100,176,6,151,122,89,197,101,210,109,60,124,180,46,172,108,19,155,205,148,228,56,253,132,79,175,11,252,91,218,21,177,166,44,184,34,115,130,167,246,9,243,244,41,144,241,213,215,147,107,242,219,28,255,248,124,163,25,50,55,35,126,79,112,189,2,50,190,208,237,132,201,129,188,110,88,192,95,88,189,112,39,33,98,214,108,93,68,170,170,11,243,214,60,56,160,207,81,29,176,23,3,192,192,1,143,55,93,191,107,158,216,143,199,9,243,217,116,214,150,218,151,232,117,90,189,208,78,54,80,210,153,99,150,47,181,173,224,132,131,102,193,150,118,41,47,234,114,121,18,252,55,246,175,218,170,161,181,80,104,39,157,119,24,55,186,227,122,37,64,196,213,55,128,238,42,84,6,186,117,160,92,19,109,45,75,70,101,169,153,26,115,147,17,63,19,166,83,
+93,24,241,68,88,231,100,254,224,159,53,91,239,227,107,151,88,176,117,90,205,132,223,132,64,29,152,170,53,198,202,166,206,10,33,235,157,219,66,190,49,46,207,61,92,92,46,208,61,247,193,41,43,212,74,255,209,43,248,23,224,117,10,31,191,95,126,1,158,177,31,94,169,47,127,251,250,205,139,119,159,125,254,118,230,217,155,231,51,95,60,123,241,6,60,96,95,0,198,204,87,207,126,135,190,129,95,188,157,121,249,250,237,219,95,255,245,203,231,111,223,206,124,250,250,205,204,151,175,158,189,124,247,28,74,126,241,236,205,187,183,51,175,63,69,127,53,252,189,153,159,35,226,240,23,196,207,129,32,48,8,20,95,252,230,229,115,248,155,212,231,159,188,120,247,7,133,103,47,223,60,127,246,201,239,190,241,48,7,230,208,95,170,126,5,28,122,253,37,144,125,243,26,168,126,254,246,123,127,242,151,204,63,7,79,246,55,95,188,126,249,12,254,214,250,219,98,223,98,253,225,249,253,195,191,253,8,124,97,112,28,12,231,219,191,105,158,14,250,195,5,48,70,108,111,26,
+55,55,21,206,96,101,103,54,253,20,36,164,229,215,202,180,119,54,188,254,20,60,141,103,210,121,167,240,81,170,59,163,223,211,55,204,221,146,133,38,168,136,66,60,99,120,160,244,215,165,117,197,229,157,104,201,30,97,210,181,147,186,66,182,177,148,158,16,203,222,12,213,56,141,196,154,194,132,156,171,26,94,28,178,45,149,97,113,221,209,226,200,183,102,241,115,234,136,15,175,35,44,59,56,58,205,234,134,110,79,182,189,239,116,236,159,89,140,179,27,123,251,198,113,34,211,60,225,116,118,216,107,247,216,252,188,113,52,46,54,49,177,72,182,220,191,10,43,67,194,152,124,170,218,145,206,139,45,141,195,19,223,217,70,238,100,190,88,151,174,5,183,217,171,74,78,149,158,234,200,149,97,250,19,177,120,33,237,68,176,252,173,96,217,162,203,221,88,197,164,156,101,99,229,186,80,106,79,158,138,254,56,107,162,110,142,143,165,153,49,35,198,220,75,130,241,135,201,50,20,10,197,132,161,55,61,188,47,86,132,21,122,215,117,175,178,38,24,116,75,76,40,57,24,113,238,
+154,162,163,189,238,88,190,29,212,197,67,79,166,141,133,229,98,184,158,112,71,217,92,239,141,176,64,194,204,199,90,202,6,68,194,179,153,79,191,124,133,254,95,2,4,75,240,127,34,0,124,188,121,246,234,45,64,2,252,49,11,248,124,246,22,41,57,250,191,27,222,206,124,12,86,222,1,48,252,230,119,31,126,234,242,226,91,53,4,224,121,245,250,213,175,255,250,155,86,190,249,139,246,231,136,205,159,125,19,31,31,126,252,130,16,95,99,224,167,223,255,241,71,240,3,131,147,97,101,223,248,17,140,74,216,200,151,231,215,77,4,214,92,60,119,112,188,233,164,158,7,87,47,3,219,193,53,57,139,149,198,134,101,123,103,27,35,67,49,109,159,116,206,141,69,220,29,189,72,200,82,150,100,242,249,93,65,72,178,193,196,75,124,154,235,73,229,65,26,198,187,206,140,146,245,166,119,159,129,151,170,221,151,206,94,67,138,119,45,12,102,85,147,131,190,0,239,154,247,168,149,67,129,148,116,71,97,69,151,156,71,44,102,231,168,29,91,100,226,135,62,50,147,37,138,40,
+122,199,126,210,236,64,125,237,129,198,128,173,32,52,6,108,145,160,49,96,139,9,140,109,45,137,204,29,82,142,85,55,139,184,234,21,25,169,46,21,109,15,177,82,69,77,122,37,38,105,101,36,10,91,38,95,182,8,66,58,26,19,111,235,198,227,99,223,165,19,88,53,215,28,25,80,125,49,201,117,132,63,100,223,231,156,164,217,149,139,163,45,75,135,105,148,167,157,29,139,206,231,102,166,156,46,115,117,214,21,74,204,186,34,182,180,155,201,145,170,220,7,143,38,94,174,183,4,246,89,93,25,6,168,33,44,19,223,77,70,39,155,214,170,149,57,107,147,146,22,207,119,176,76,57,222,119,112,241,120,45,13,95,7,181,181,199,28,69,7,162,199,117,162,248,226,44,87,142,91,30,106,239,1,29,197,51,111,189,183,27,59,91,96,31,78,192,247,196,227,225,100,81,82,93,57,46,245,99,206,62,76,147,54,208,186,193,129,0,152,17,71,94,54,188,113,76,215,44,211,177,103,194,56,90,63,26,60,204,142,240,117,115,240,178,41,33,133,181,215,134,173,10,35,140,97,
+48,253,139,56,117,70,43,74,45,156,38,47,77,228,176,86,127,221,10,4,148,206,192,28,9,164,243,41,63,156,239,148,47,123,249,28,153,206,137,222,81,123,15,179,243,35,60,229,78,191,65,220,84,46,44,38,101,211,147,152,161,90,245,31,94,180,55,30,175,213,124,202,217,241,241,237,225,105,134,172,44,60,198,52,124,202,189,148,31,13,42,183,187,235,91,197,11,251,1,251,88,47,17,142,110,217,26,101,190,61,60,173,172,180,27,56,163,37,3,220,48,145,189,190,11,169,150,123,72,220,33,155,243,49,132,97,208,84,98,81,192,152,144,130,243,14,125,250,112,145,239,106,60,25,178,213,110,111,97,185,27,72,141,86,140,132,100,156,93,24,92,113,251,235,199,10,13,165,103,115,48,182,131,87,141,251,163,184,97,33,161,201,40,56,125,126,132,237,184,118,106,149,110,243,98,178,7,158,159,236,218,72,31,153,118,155,151,15,197,28,231,136,123,85,140,108,107,143,155,91,226,169,147,19,81,218,110,155,108,74,141,253,176,230,147,219,213,246,149,202,30,115,49,164,0,137,
+151,105,133,238,84,88,130,199,172,153,70,226,168,220,125,113,240,56,106,230,116,52,198,153,119,171,76,212,76,24,184,164,117,195,174,173,63,236,231,91,169,91,28,231,56,101,144,107,150,35,92,178,149,30,240,217,15,150,38,139,33,193,74,214,139,147,175,24,133,91,90,101,203,121,54,190,96,52,109,39,243,142,114,200,209,74,230,42,125,220,178,166,96,88,244,63,42,182,29,35,237,163,220,53,80,86,18,188,145,211,147,162,45,71,83,225,185,36,4,210,188,236,65,251,232,58,212,101,90,3,96,28,192,160,151,148,72,115,75,150,90,101,72,169,72,166,253,155,7,190,67,116,56,190,216,209,136,39,208,33,129,246,162,14,29,162,81,140,253,67,109,38,113,43,186,114,115,161,71,234,41,95,69,163,92,70,10,126,153,23,183,178,56,100,225,161,83,103,187,23,253,155,59,27,181,115,77,88,36,20,183,236,190,181,199,196,118,214,168,25,178,149,214,74,42,156,116,82,130,238,179,19,122,220,160,125,148,202,227,134,252,245,77,86,35,15,0,134,181,226,241,168,174,77,11,238,
+173,242,249,180,90,191,188,85,158,221,46,250,236,249,64,125,83,225,217,229,56,168,53,86,225,132,190,184,243,116,231,181,37,13,79,241,132,111,135,117,213,100,110,241,154,40,237,247,45,62,0,186,226,186,95,232,65,133,184,161,58,119,99,150,13,251,199,153,237,80,191,185,210,243,169,70,69,174,109,72,60,34,63,170,194,62,105,12,231,92,83,118,207,118,189,190,71,163,131,151,38,83,178,174,235,198,158,150,208,167,112,78,110,123,160,140,238,91,88,159,176,142,86,62,51,222,251,12,93,179,74,90,78,245,120,73,171,172,47,208,194,148,92,167,104,117,249,129,143,181,12,221,184,104,236,149,180,132,157,196,147,239,129,130,184,177,192,106,203,14,206,110,7,193,162,131,169,179,116,79,159,120,27,238,109,181,161,18,88,90,86,56,214,68,99,67,194,111,80,47,16,142,195,117,143,89,205,151,187,37,154,24,127,95,117,40,243,250,46,165,126,10,112,225,214,42,114,195,242,72,150,216,160,60,228,69,223,133,58,74,223,221,139,176,73,122,180,32,62,74,82,94,9,178,45,6,
+209,122,95,48,79,113,153,238,235,27,153,130,247,174,164,18,115,100,99,202,169,195,167,148,88,13,93,90,63,152,60,247,141,152,183,2,242,89,52,43,89,92,220,197,85,58,55,62,121,52,47,166,184,6,198,132,15,27,134,168,208,18,78,124,26,67,197,83,109,26,153,43,248,139,192,180,114,146,58,204,68,178,107,20,221,17,79,125,191,161,236,151,31,124,186,42,216,8,239,186,167,164,214,107,21,246,46,91,209,244,196,13,29,117,244,12,64,51,115,210,0,56,144,199,22,28,150,76,135,189,203,107,246,108,158,34,8,165,111,150,101,217,22,209,150,163,183,166,37,248,106,39,148,173,160,200,186,136,235,212,120,10,202,210,16,244,196,5,192,22,240,144,112,30,43,200,188,176,71,167,62,245,162,65,144,137,198,241,21,152,112,177,181,191,194,221,166,7,86,125,210,61,159,150,107,156,26,242,65,214,110,89,109,229,115,84,119,0,128,151,183,143,32,221,9,213,18,146,110,65,126,53,198,180,238,28,135,25,142,160,56,211,224,140,179,204,184,65,29,117,28,135,121,245,11,13,
+95,30,91,59,78,135,193,9,5,130,172,28,9,151,65,47,186,30,231,101,224,100,29,141,244,126,29,237,204,75,25,172,164,14,232,187,218,243,51,218,192,67,169,76,78,55,30,76,101,53,63,117,176,23,92,12,45,103,26,23,158,32,204,126,93,126,2,209,15,246,238,129,90,203,228,150,140,160,115,179,101,18,203,232,220,250,58,95,194,178,13,27,196,163,199,192,129,79,74,240,15,118,42,9,213,116,19,244,33,75,198,72,173,161,219,87,164,71,171,59,199,0,106,101,128,53,176,61,227,46,8,182,239,108,79,246,61,149,213,11,205,253,134,66,217,127,216,77,165,30,78,208,237,23,34,20,69,164,32,187,8,150,209,237,239,154,176,249,64,239,245,86,228,238,5,144,243,60,219,33,19,236,122,2,66,168,110,168,76,24,7,222,108,62,202,118,108,150,1,170,129,11,24,224,3,116,65,0,124,128,46,28,152,226,134,3,144,248,19,177,112,197,3,206,232,89,209,244,60,177,118,78,80,25,50,61,87,221,154,30,158,133,233,17,208,66,129,149,199,222,188,104,113,216,147,42,
+210,183,253,108,126,47,106,106,18,231,41,227,50,115,75,107,186,124,52,89,217,12,202,17,155,211,153,229,9,38,160,253,183,188,150,142,56,115,123,186,24,94,94,187,34,94,71,227,209,199,68,191,101,139,27,54,210,160,248,65,209,40,42,169,9,201,42,173,73,170,141,27,192,133,203,230,145,41,186,67,250,34,123,109,137,8,221,16,221,79,45,201,181,115,79,170,51,225,89,100,174,155,1,141,180,83,208,30,231,76,85,171,108,197,52,36,70,49,236,197,225,142,34,29,158,212,41,38,118,240,246,104,208,95,169,232,149,52,202,142,38,18,7,91,21,188,214,184,225,36,233,247,69,57,27,107,140,240,21,81,31,77,50,41,103,147,188,67,144,120,200,105,83,25,140,193,225,109,139,231,101,68,81,211,7,77,45,141,115,6,13,91,18,29,153,171,21,50,197,182,92,84,243,85,240,158,220,23,30,164,110,211,169,204,157,97,33,200,5,39,37,3,244,34,56,41,37,77,165,96,71,41,81,79,122,121,109,47,184,156,122,226,141,90,174,75,143,64,75,169,111,63,93,131,189,229,
+11,3,123,37,209,110,113,73,75,225,121,145,74,139,81,186,25,39,225,134,152,51,47,19,53,147,236,197,99,182,140,184,166,108,5,219,158,32,184,166,43,169,249,130,1,57,191,187,28,182,172,231,27,216,45,135,139,7,213,60,141,141,89,20,68,113,224,140,26,157,197,192,128,226,37,151,41,116,149,150,171,194,249,128,111,35,81,220,48,46,115,244,252,131,83,126,225,0,57,38,54,48,185,165,162,203,195,21,212,100,211,120,49,119,247,212,231,210,155,106,117,164,128,147,81,217,139,130,216,62,119,145,189,108,202,94,108,169,45,157,251,149,202,185,70,35,171,212,147,74,128,218,59,21,164,201,203,68,223,38,240,248,140,3,234,18,53,231,38,79,188,49,119,71,163,20,8,18,137,123,161,58,163,98,27,60,139,74,209,118,16,175,208,30,7,83,235,97,33,113,39,24,177,236,197,199,134,232,224,169,170,108,93,165,237,243,36,89,54,91,58,173,95,142,44,93,93,151,224,90,167,251,53,106,21,64,105,72,177,144,37,15,234,172,190,182,24,56,84,110,123,120,135,43,219,55,
+157,180,252,1,232,204,119,238,84,26,249,86,168,85,140,172,20,47,111,14,188,112,120,1,179,75,172,166,52,110,99,92,205,156,66,180,13,71,42,159,84,185,223,39,186,154,82,197,183,230,160,71,207,57,97,25,239,210,25,229,232,120,38,197,163,227,25,158,132,142,103,36,51,58,158,173,164,208,241,12,107,67,199,51,45,30,29,207,44,17,116,60,235,138,209,241,140,180,138,142,103,237,22,58,158,221,147,209,241,12,230,13,142,103,29,41,58,158,185,164,232,120,230,194,162,227,153,138,137,186,181,52,66,199,51,234,42,58,158,77,170,232,120,38,21,163,227,25,158,133,142,103,215,87,232,120,134,63,70,199,179,217,38,58,158,225,247,208,241,236,118,5,29,207,2,20,116,60,35,169,208,241,172,47,69,199,179,155,30,50,158,5,111,27,71,174,35,86,42,217,112,25,57,100,215,17,177,134,21,146,241,186,32,113,71,246,148,2,180,144,228,7,53,1,37,193,139,165,106,6,28,184,174,137,192,106,100,232,82,61,136,219,48,50,66,106,254,132,0,2,176,203,216,89,25,78,
+170,8,128,169,170,166,97,205,206,73,231,19,251,108,82,46,203,154,175,223,1,250,94,186,7,110,231,237,125,92,234,16,36,70,178,24,63,43,158,206,131,89,178,41,120,196,93,218,170,88,53,19,239,83,11,245,116,25,156,182,65,141,75,68,144,157,200,110,82,154,144,227,93,34,121,251,66,9,210,39,74,157,58,147,10,112,133,172,224,51,23,213,182,102,113,97,118,95,106,215,154,29,123,194,35,96,117,183,65,12,173,12,163,48,178,35,231,126,65,0,43,208,1,61,60,15,102,215,200,242,157,74,113,64,154,197,155,15,170,97,0,144,168,89,13,46,76,210,236,126,5,220,26,209,171,4,102,109,21,239,26,167,58,155,211,251,125,144,238,59,81,142,193,125,18,18,221,28,38,71,246,96,53,49,5,179,82,164,35,153,32,59,59,103,209,208,253,2,40,15,51,186,68,0,179,63,28,253,179,96,246,135,163,127,0,204,254,112,244,151,128,217,255,159,123,71,96,208,119,196,150,12,130,11,96,43,0,193,5,106,158,147,162,56,13,64,112,193,0,32,184,0,182,106,16,92,
+0,91,219,16,92,0,91,120,8,46,128,45,49,4,23,192,22,22,130,11,96,107,14,130,11,96,11,15,193,5,176,197,129,224,2,216,194,64,112,1,108,185,33,184,192,62,14,8,46,128,173,14,4,23,192,214,45,4,23,192,214,42,4,23,192,86,5,109,159,218,45,4,23,192,214,0,130,11,96,139,14,193,5,176,165,199,51,83,35,122,41,142,209,185,103,190,253,223,92,255,165,23,153,68,216,56,139,172,157,85,55,22,3,247,85,198,189,30,204,80,37,175,247,136,233,52,199,241,68,110,103,101,161,103,138,231,100,58,191,249,48,181,98,199,72,213,197,89,141,154,156,33,24,22,103,125,212,6,61,210,16,45,43,77,132,140,82,147,245,153,106,137,11,101,164,116,211,246,220,221,221,69,234,33,222,218,118,117,51,218,218,222,171,58,44,14,219,98,244,201,224,239,123,79,87,151,199,54,162,105,55,98,213,208,60,29,145,62,141,109,183,118,64,213,162,21,51,207,121,116,152,216,95,198,207,38,88,81,5,115,141,195,26,213,139,154,233,158,10,239,162,178,163,138,43,38,
+135,213,217,192,74,87,57,242,54,25,175,144,99,9,229,65,76,116,38,218,91,253,54,255,252,61,255,120,165,93,153,3,166,150,128,45,200,97,96,165,8,103,78,33,71,52,75,103,34,68,243,143,249,121,133,28,209,188,66,188,224,176,172,208,40,224,112,160,81,160,137,129,155,2,205,42,220,244,27,252,91,200,7,154,203,115,168,255,109,212,29,78,28,117,135,128,65,221,93,21,162,238,126,205,55,160,252,149,27,212,221,104,24,117,7,27,64,221,81,204,162,238,158,249,69,231,7,23,219,132,122,41,178,194,112,30,39,246,103,189,23,253,188,155,213,143,98,182,192,118,43,177,70,158,197,58,192,49,23,91,157,141,133,126,129,203,164,121,197,152,245,212,69,1,103,37,89,155,161,131,149,12,162,229,189,112,34,90,152,173,109,68,43,207,18,32,90,157,13,33,162,229,21,87,49,235,222,205,112,83,195,94,93,59,23,46,45,75,202,219,170,147,245,83,213,116,32,222,106,137,38,59,39,65,119,119,48,88,162,158,180,107,193,51,238,70,178,104,124,202,238,69,167,153,70,191,
+108,182,61,205,206,229,175,236,147,204,61,245,164,214,191,221,7,159,15,218,225,220,77,103,108,158,203,187,38,211,73,139,213,207,92,250,229,162,208,1,205,75,128,89,146,251,43,94,77,176,202,98,173,26,238,57,192,89,43,51,179,183,37,87,62,108,210,131,38,51,143,201,39,43,228,89,68,58,193,114,33,210,26,178,191,204,47,36,3,39,129,181,12,110,89,210,84,29,211,128,115,103,195,245,211,51,85,113,28,5,190,101,31,61,192,45,91,177,1,220,181,79,28,115,107,121,229,112,55,179,23,189,101,76,138,238,110,206,64,77,186,27,211,152,189,115,238,117,119,205,253,67,119,174,107,110,197,193,183,115,166,187,178,185,113,155,187,220,139,238,54,243,123,141,156,227,146,64,239,11,231,49,65,176,45,248,75,2,95,73,5,107,117,221,192,186,17,101,198,107,196,110,243,214,5,214,232,219,215,225,106,43,188,130,49,128,32,192,223,58,75,176,177,192,39,47,152,50,77,47,159,80,51,95,119,59,93,154,77,125,127,44,59,238,213,86,26,249,91,221,169,42,54,77,187,105,
+221,65,113,168,59,21,221,214,71,177,187,81,216,45,238,230,44,192,193,193,126,119,7,228,173,179,52,160,238,26,29,165,227,147,130,238,52,49,153,29,158,184,220,13,7,134,190,220,54,46,136,132,32,33,7,2,240,69,243,114,42,24,25,220,213,165,221,220,106,114,130,52,239,149,36,206,103,92,151,188,21,12,234,182,60,171,100,82,201,192,161,14,153,229,217,180,169,230,3,27,243,6,226,142,93,163,122,188,221,110,133,218,213,41,243,106,56,232,57,137,23,192,47,198,248,212,125,213,29,28,192,194,30,168,236,141,178,121,252,72,163,2,226,105,122,29,4,245,125,8,80,79,30,106,39,119,192,193,69,17,76,115,252,156,155,185,171,77,168,182,118,118,209,173,139,52,13,130,93,147,238,244,17,119,36,53,20,36,113,23,25,184,72,135,110,30,132,101,78,46,204,15,91,190,188,210,246,47,120,15,110,231,185,244,62,105,62,42,199,160,110,250,111,43,20,3,40,248,66,156,47,53,208,146,195,250,249,117,157,63,60,58,103,135,180,247,205,181,94,105,205,55,151,95,46,166,
+37,35,137,26,0,202,16,203,217,246,162,18,115,222,221,125,50,15,161,135,188,174,189,92,54,159,61,73,99,128,157,44,230,246,58,81,203,244,162,92,232,63,56,234,16,136,78,161,11,124,70,216,220,234,70,242,176,6,241,121,152,6,159,245,101,11,144,111,155,230,242,237,171,241,238,132,214,39,97,128,79,208,159,18,116,11,184,20,5,62,241,165,139,75,149,93,10,88,216,22,247,233,6,36,50,211,1,82,128,3,76,88,134,68,134,103,163,141,138,57,19,157,51,234,163,196,157,205,17,3,120,27,116,112,176,144,190,59,199,128,6,118,218,215,63,128,25,187,184,31,112,43,187,131,43,46,96,41,167,222,27,149,99,183,117,41,154,180,135,192,163,248,189,10,32,186,250,164,5,152,213,11,13,173,184,168,224,168,151,205,34,133,165,4,226,179,94,100,193,103,209,216,18,29,153,118,65,197,158,34,16,23,2,128,139,221,154,136,1,253,201,163,110,161,121,191,82,28,251,166,135,99,203,144,73,158,46,100,54,201,244,126,7,27,13,32,241,97,42,127,192,245,54,235,156,95,
+84,222,164,226,105,195,163,67,234,15,196,67,68,157,251,84,37,178,128,29,234,68,251,57,216,210,49,76,131,104,30,152,115,170,155,142,77,2,98,152,56,6,75,32,32,234,122,3,100,191,57,45,69,0,88,250,160,241,147,53,205,52,7,78,4,188,29,248,43,50,87,116,0,55,59,21,208,90,162,9,168,150,121,43,119,85,54,235,116,217,61,143,194,195,56,218,185,14,99,85,79,246,21,0,225,15,253,179,9,255,17,44,102,68,227,53,164,195,46,252,21,143,210,116,149,52,90,36,176,173,248,121,50,242,15,89,7,190,34,135,180,242,57,127,3,30,7,153,123,112,28,4,2,197,45,83,75,36,30,23,220,221,135,65,199,0,210,121,162,182,128,116,54,242,58,229,169,138,248,4,114,154,206,75,118,90,249,234,168,118,73,134,133,209,134,11,61,216,254,61,199,22,136,198,47,224,54,55,146,100,54,8,41,168,128,248,232,166,117,32,236,61,0,173,252,25,248,228,94,142,179,196,44,146,223,6,154,102,175,29,124,185,189,245,34,86,51,173,50,64,32,0,147,83,254,220,
+31,213,225,96,61,76,167,149,81,79,3,240,224,10,240,66,5,67,75,84,24,158,217,220,104,227,63,32,167,106,77,111,140,229,246,26,131,124,210,206,189,19,77,55,206,184,23,160,191,186,252,225,244,238,188,204,189,58,73,79,69,243,185,61,69,255,201,51,20,58,174,193,138,99,42,61,207,17,230,110,140,59,6,136,127,115,99,13,58,185,54,250,122,255,170,183,208,206,128,239,132,7,97,38,37,44,240,117,64,126,179,49,63,159,136,156,18,114,191,20,193,129,146,201,69,78,9,50,107,140,156,18,27,243,204,251,139,250,136,180,99,63,188,98,136,119,193,65,17,46,18,30,18,160,135,102,107,197,16,23,248,36,168,89,123,78,144,184,171,222,1,248,28,105,97,223,249,13,176,254,61,152,216,169,123,150,68,229,1,252,4,119,186,32,172,241,217,14,60,110,67,238,110,195,220,13,185,117,237,137,31,179,120,176,106,150,212,48,167,110,196,131,15,231,64,169,146,64,46,2,2,40,239,0,227,21,83,227,253,3,120,65,124,192,199,17,114,140,172,16,156,239,239,83,245,252,
+142,189,120,172,207,52,246,162,170,88,102,79,49,237,159,157,244,238,229,254,90,236,126,103,146,164,55,21,171,108,216,80,201,204,26,247,110,233,41,32,187,57,222,0,23,214,201,49,87,119,234,190,241,200,14,214,170,44,2,132,82,153,215,217,168,49,201,11,217,76,39,8,151,6,96,141,71,9,83,233,60,194,66,6,220,73,171,224,82,138,154,121,198,109,18,56,188,204,242,182,57,136,3,89,85,134,150,193,26,92,106,155,145,107,115,85,180,118,158,146,249,3,197,51,80,229,60,61,54,108,111,87,65,22,118,99,9,176,107,53,154,219,99,43,250,158,72,85,159,1,247,12,239,4,156,237,171,163,202,221,72,162,43,6,119,91,84,61,221,194,6,247,28,29,192,72,64,217,168,157,38,164,172,85,134,161,198,130,75,114,176,182,177,184,196,187,214,3,182,145,76,230,91,227,231,144,161,134,194,64,246,30,10,3,217,15,250,215,27,200,49,122,221,173,243,85,81,122,44,161,161,71,32,222,73,195,13,16,191,162,79,87,101,165,254,221,16,206,116,1,142,17,75,199,227,182,
+131,227,123,181,63,209,250,136,4,178,21,179,34,247,183,131,16,31,74,188,211,204,163,129,35,209,88,161,200,225,210,5,88,115,250,174,124,236,16,96,55,211,21,206,10,3,67,170,157,110,213,247,64,22,53,204,168,89,129,99,3,36,205,198,193,26,92,234,104,152,8,162,218,224,222,49,68,158,202,2,43,94,254,80,221,169,121,18,251,23,97,48,136,52,186,193,139,216,77,66,126,220,14,242,229,15,152,155,34,251,64,114,34,15,86,53,44,67,240,2,123,172,82,44,56,244,193,228,66,191,118,191,165,36,91,157,131,43,68,59,177,191,137,104,119,131,121,68,187,29,236,34,218,236,131,93,68,155,101,208,34,218,11,142,154,62,200,134,14,60,1,76,47,204,74,125,179,128,73,58,12,154,13,232,184,137,215,204,38,18,11,253,251,89,146,75,131,112,188,65,116,16,85,236,195,65,212,179,89,68,186,97,97,150,42,245,125,151,15,52,101,247,179,136,38,19,26,5,28,46,52,10,52,63,244,209,6,220,244,187,252,196,28,220,20,104,186,80,119,120,25,212,157,217,78,2,
+189,167,45,168,187,223,225,115,80,119,93,120,212,221,224,135,185,57,129,186,107,107,162,238,74,231,124,223,229,67,77,38,234,46,233,189,59,135,33,212,93,143,29,117,119,129,135,186,251,71,252,196,130,27,117,183,42,69,221,113,174,163,238,36,6,168,187,27,103,168,187,223,225,83,80,119,53,127,156,247,26,234,238,255,175,203,159,168,203,250,230,89,117,90,119,117,48,248,95,253,111,218,75,116,102,
diff --git a/uppsrc/ide/app.tpp/IntroductionToUPP$en-us.tpp b/uppsrc/ide/app.tpp/IntroductionToUPP$en-us.tpp
new file mode 100644
index 000000000..44a5c80e0
--- /dev/null
+++ b/uppsrc/ide/app.tpp/IntroductionToUPP$en-us.tpp
@@ -0,0 +1,10 @@
+TITLE("Introduction to U++")
+COMPRESSED
+120,156,133,87,253,111,219,56,18,253,87,120,105,239,144,116,29,87,150,236,196,109,112,64,211,143,189,45,176,88,28,182,45,250,131,225,84,180,68,91,220,208,164,150,164,234,102,15,251,191,239,27,146,146,63,154,197,21,72,109,75,156,153,199,153,55,143,195,5,123,250,52,27,101,79,178,255,243,239,229,91,177,230,157,242,203,197,191,87,147,162,184,121,246,235,12,150,147,81,254,100,150,93,23,249,245,124,58,157,100,121,81,76,175,138,89,145,229,147,23,179,201,188,152,22,147,217,245,203,159,4,175,165,222,76,150,11,62,185,190,121,246,234,124,114,157,141,167,249,56,187,128,135,124,84,60,153,98,229,172,200,167,211,171,105,62,205,243,249,108,150,205,102,211,236,58,207,50,120,152,204,122,15,249,114,145,195,164,32,147,28,225,166,147,124,58,159,229,243,34,155,78,231,87,197,116,242,34,155,189,40,174,178,171,121,254,242,181,169,31,16,241,127,95,254,252,231,187,95,46,63,125,96,11,151,221,176,127,45,23,110,114,195,222,107,111,77,221,85,94,26,205,188,97,159,202,
+31,202,31,232,93,90,146,62,242,27,246,89,168,202,108,197,176,104,76,207,139,155,248,131,73,199,86,198,55,140,107,198,219,86,201,138,7,143,107,203,183,98,103,236,61,59,175,20,119,142,41,185,178,220,62,176,181,177,236,179,212,69,14,139,154,253,44,117,247,237,130,113,199,118,66,41,250,228,12,193,90,37,188,96,181,248,42,148,105,183,66,123,4,55,138,73,93,169,142,178,192,126,189,125,203,254,243,233,61,150,56,185,209,194,142,152,51,157,173,4,19,181,244,6,63,229,150,111,246,191,42,83,195,157,169,58,242,69,246,228,110,20,16,188,9,187,104,173,249,77,84,158,173,58,169,106,97,199,140,189,247,140,43,103,232,205,87,137,48,0,214,154,157,176,235,78,177,242,236,77,121,169,228,189,40,207,152,171,172,108,131,79,197,245,166,163,168,231,239,62,188,185,96,66,243,149,162,231,15,166,163,220,37,71,120,94,179,206,9,203,196,55,47,180,147,43,169,164,127,8,88,170,206,121,179,149,127,196,20,154,53,153,90,102,118,71,169,117,163,195,116,5,39,53,251,216,
+136,247,111,223,177,115,223,136,84,23,252,188,72,133,74,31,31,27,212,202,155,86,86,148,54,192,94,97,87,100,112,47,30,144,33,93,137,214,59,138,26,29,0,114,35,84,27,224,111,132,103,206,115,235,69,77,65,127,239,100,117,175,30,232,107,107,28,182,160,4,101,44,224,101,59,30,202,197,60,138,109,58,159,188,173,4,10,47,152,141,44,198,110,193,132,206,34,58,170,67,86,21,248,19,146,31,18,97,59,29,144,253,132,93,154,207,198,226,177,248,198,137,22,241,53,188,156,190,247,29,42,45,185,98,139,87,231,249,108,150,154,11,254,81,143,181,252,118,177,28,63,70,238,47,41,115,49,69,176,204,175,146,229,226,85,198,94,71,208,61,62,66,21,151,71,204,91,148,139,173,165,197,255,85,99,140,19,1,83,203,171,123,98,1,1,5,241,197,118,133,76,133,196,72,215,80,98,66,87,236,36,122,166,115,129,139,48,42,207,62,8,5,2,150,151,91,46,117,121,153,156,128,95,53,246,100,54,72,239,237,218,131,52,212,102,189,83,138,208,71,107,248,87,129,36,11,
+205,92,112,36,234,209,17,26,148,222,180,66,163,126,178,223,4,124,126,60,88,225,27,238,225,198,69,47,253,98,135,100,175,133,181,248,14,232,60,18,102,185,120,134,236,16,210,222,122,73,233,10,128,36,56,164,209,251,100,234,26,226,174,140,181,244,210,163,124,43,110,137,98,123,158,30,138,198,78,234,218,236,18,174,174,109,133,221,26,36,183,229,26,233,244,193,72,137,53,161,68,32,71,205,4,87,137,250,20,43,162,11,209,83,140,67,140,144,30,176,101,135,157,172,144,59,8,18,92,167,101,105,133,163,198,12,175,79,109,19,38,50,183,1,67,121,217,196,244,3,26,121,138,161,147,8,173,165,18,148,71,101,244,38,170,205,81,45,118,13,113,165,79,82,35,55,141,194,159,143,181,241,253,214,131,111,138,107,82,73,129,185,150,107,20,131,244,240,16,220,104,160,208,241,115,176,199,180,73,141,205,54,44,250,17,200,24,68,176,163,200,180,89,4,248,17,138,188,37,158,215,194,115,169,24,214,71,98,246,92,95,46,238,130,108,148,47,203,231,229,115,164,189,124,142,170,
+149,207,195,17,82,126,137,203,202,167,2,188,237,220,29,136,224,4,209,73,186,199,123,142,253,55,101,123,212,83,89,146,188,34,155,90,32,145,73,173,250,69,140,3,89,133,45,91,232,214,112,4,161,29,52,36,65,84,157,135,202,138,35,22,209,137,4,37,241,113,215,252,160,132,183,67,9,168,157,131,188,71,205,145,154,200,205,234,7,20,5,97,32,219,247,253,129,5,144,36,125,62,60,78,79,144,48,60,20,129,62,102,21,14,142,80,242,239,66,172,196,192,40,67,90,55,16,237,120,165,65,127,185,214,232,218,133,38,99,148,125,108,170,150,22,174,13,116,244,152,49,167,36,63,226,40,245,2,122,80,168,53,45,229,71,114,52,8,153,72,219,78,57,34,49,26,100,129,201,245,32,87,255,56,62,65,110,15,196,39,109,207,55,166,3,119,9,74,58,188,21,113,53,157,95,67,95,173,112,16,32,26,33,170,124,199,21,28,252,70,234,57,164,177,229,190,193,169,214,200,170,33,30,162,243,165,166,78,33,253,142,66,161,140,185,119,97,124,56,234,216,32,5,135,109,167,
+133,168,145,114,152,166,19,133,168,108,244,144,173,97,7,7,181,136,58,72,8,106,177,150,122,175,1,123,173,5,14,28,206,54,54,233,161,10,7,11,25,219,140,186,43,238,161,9,217,24,127,229,195,57,111,116,212,71,119,224,103,47,131,214,24,164,71,131,105,74,69,26,15,213,255,142,85,229,25,232,46,184,69,127,195,199,22,19,169,12,39,227,208,76,227,163,178,61,222,188,111,140,94,203,77,103,145,157,190,213,110,7,7,67,51,179,197,221,93,143,80,224,216,183,97,100,224,254,160,178,72,172,221,112,45,255,16,169,143,66,23,7,208,244,237,177,154,239,137,141,177,3,154,163,195,72,176,167,66,220,106,191,74,146,82,64,187,49,151,57,106,189,161,213,78,139,16,216,128,21,88,8,44,189,190,7,56,236,60,148,247,34,148,224,136,63,9,65,95,143,208,103,193,2,76,219,30,47,61,33,208,227,210,121,68,204,3,125,35,77,252,59,33,253,190,0,183,186,254,133,80,236,11,81,158,237,101,243,246,88,54,227,202,51,114,127,71,15,198,108,137,9,21,67,146,143,
+163,22,134,220,125,177,79,141,123,175,229,89,20,233,47,24,130,230,227,249,140,102,160,199,159,64,193,79,199,239,239,101,126,175,246,212,91,24,136,113,50,85,214,12,67,242,223,46,13,51,167,123,112,94,108,143,47,26,253,248,62,136,124,69,59,164,78,167,81,234,99,200,235,193,237,228,224,99,31,32,122,250,89,226,60,113,98,24,139,7,133,137,207,201,247,235,15,111,33,252,52,46,132,20,170,48,135,116,26,244,167,115,136,162,66,215,7,253,141,23,169,97,252,137,114,148,220,211,213,131,152,210,97,94,143,119,141,164,86,225,78,130,80,233,94,80,7,105,11,87,41,31,117,184,167,106,188,63,13,23,170,81,114,12,168,177,160,189,13,6,106,223,89,177,159,224,123,7,60,93,49,208,155,14,163,133,177,17,106,186,58,132,59,70,242,121,122,213,56,57,191,151,127,1,43,42,33,65,
+
diff --git a/uppsrc/ide/app.tpp/Keys$en-us.tpp b/uppsrc/ide/app.tpp/Keys$en-us.tpp
new file mode 100644
index 000000000..3b159afcd
--- /dev/null
+++ b/uppsrc/ide/app.tpp/Keys$en-us.tpp
@@ -0,0 +1,12 @@
+TITLE("Keys")
+COMPRESSED
+120,156,165,89,139,114,211,72,22,253,149,222,10,179,5,137,19,250,169,135,189,179,5,228,49,153,42,8,179,9,12,187,155,202,108,100,187,99,171,34,75,30,73,78,8,20,124,251,158,150,229,68,178,108,171,61,144,34,96,73,231,220,219,231,62,250,182,124,73,158,61,163,29,186,67,91,254,116,143,244,77,48,139,242,171,203,136,123,94,47,116,169,236,5,204,237,189,247,123,223,191,127,63,240,125,222,3,19,3,19,163,82,48,206,152,164,84,114,151,41,159,250,202,99,30,21,174,228,202,165,170,59,13,210,96,114,117,25,120,162,183,123,238,0,197,129,18,76,48,202,28,46,241,20,21,148,75,198,21,243,60,201,92,229,9,223,113,186,131,96,154,135,73,124,117,217,55,56,160,68,71,237,80,215,115,36,3,70,42,46,92,37,129,149,146,49,252,159,41,215,113,221,110,30,230,145,6,134,57,110,47,144,188,119,8,160,236,56,59,112,142,187,64,74,46,29,41,60,46,152,199,185,227,11,233,75,120,205,120,55,204,53,124,236,3,98,96,64,41,152,147,74,50,1,49,164,
+171,4,158,114,241,175,164,62,227,176,233,81,165,96,78,127,94,40,100,196,1,204,129,49,238,42,243,176,39,61,38,92,143,75,238,112,152,167,46,86,104,108,171,238,80,103,3,192,4,103,189,28,14,245,14,95,169,30,3,216,133,48,156,250,148,59,174,15,123,112,21,171,21,190,207,132,7,123,146,41,202,68,119,144,12,205,10,185,162,194,24,244,128,113,64,92,232,161,28,6,119,185,240,96,209,101,66,224,183,146,158,219,205,180,9,66,158,164,87,151,187,175,158,211,3,122,192,149,122,1,180,223,97,116,199,19,82,8,233,248,146,81,1,43,224,144,70,44,135,34,140,76,113,175,219,15,50,152,204,165,81,245,112,143,49,215,132,158,26,40,132,23,158,18,48,239,224,23,98,138,53,10,168,195,125,233,9,225,209,238,32,10,178,172,34,209,174,89,39,99,29,198,118,92,163,172,18,92,250,70,31,193,33,49,119,148,207,160,177,114,36,229,221,84,255,57,11,83,61,209,49,68,14,97,189,183,136,79,153,133,230,146,161,227,29,198,145,135,202,113,168,81,76,33,25,184,
+80,144,156,50,79,194,33,252,32,196,121,153,136,69,114,152,196,96,162,195,196,142,207,165,128,31,190,148,208,0,120,230,51,198,168,135,31,172,11,202,20,169,193,144,191,101,58,49,217,97,114,199,69,222,34,66,190,52,70,125,97,132,227,208,157,59,84,33,0,124,142,226,70,110,254,12,130,51,238,153,191,70,114,166,58,76,237,8,248,197,148,194,90,5,36,230,30,214,171,160,185,40,114,154,185,94,247,76,223,103,71,65,174,203,60,217,61,124,86,168,238,116,152,179,67,13,90,121,62,194,198,164,81,76,72,233,115,95,8,197,125,37,28,10,229,178,121,237,26,168,41,160,162,248,74,10,183,195,92,84,18,86,167,20,214,91,128,176,86,151,25,55,184,231,59,102,221,37,197,245,126,20,198,198,7,100,67,111,158,0,187,143,25,224,117,228,142,231,57,84,248,208,1,203,167,10,201,141,226,247,16,88,196,149,35,243,77,245,15,110,131,145,190,222,47,75,243,235,255,190,253,116,124,182,255,241,130,92,102,180,247,51,34,185,123,190,135,114,33,31,198,250,215,163,99,114,
+171,31,178,191,95,153,123,197,45,78,158,62,20,118,79,194,207,122,88,127,202,164,2,252,163,189,167,212,46,96,228,235,87,105,90,25,110,209,127,24,215,255,105,126,253,241,234,57,158,48,79,29,160,160,94,20,110,236,86,145,135,121,26,93,239,125,8,250,87,221,238,252,46,174,61,12,34,77,110,194,72,103,7,143,151,171,160,203,159,40,221,167,148,28,163,178,43,184,139,113,114,255,114,28,14,53,233,39,121,158,76,200,52,136,181,97,120,197,215,115,204,29,248,239,85,249,249,21,37,29,178,248,64,94,35,40,123,111,32,106,6,101,245,163,45,78,62,198,195,100,179,111,23,227,240,6,224,141,244,229,51,107,173,156,235,54,43,115,250,127,111,164,63,210,145,206,171,180,135,179,220,134,245,112,53,235,252,230,175,113,166,211,188,74,154,76,31,72,6,83,3,179,147,144,240,134,12,245,13,210,121,216,33,131,89,154,162,173,16,147,221,36,201,199,58,189,15,51,109,227,194,239,27,23,214,240,225,183,32,203,91,120,27,98,204,47,172,241,60,129,195,131,49,58,217,32,
+215,233,118,174,191,174,216,184,40,200,73,16,69,54,200,143,211,42,116,144,38,81,68,102,83,27,228,81,114,31,55,177,67,92,181,65,255,134,206,1,219,27,130,126,154,76,170,210,189,209,163,48,38,201,13,129,46,69,185,218,90,41,252,220,96,231,56,30,86,204,224,211,182,70,214,69,25,189,33,206,195,155,16,193,188,73,209,32,144,153,89,146,146,60,33,58,30,218,16,175,170,210,86,238,190,209,41,14,227,145,141,133,183,250,166,150,210,169,190,11,147,89,70,238,147,212,202,195,243,112,52,174,18,156,97,106,178,6,95,95,46,35,39,65,62,24,195,117,210,71,17,220,106,171,198,113,125,181,106,1,219,49,153,29,225,137,228,211,88,199,213,18,205,158,74,52,140,141,238,149,155,169,17,192,170,55,255,117,27,17,130,180,69,251,175,85,244,187,228,78,147,114,163,46,18,186,181,184,107,92,75,53,222,100,107,47,247,98,191,105,148,200,185,158,44,115,89,208,212,150,246,24,235,45,73,150,214,84,36,222,150,20,75,101,243,11,170,14,4,22,192,229,122,1,242,38,
+73,239,131,182,130,41,192,166,153,145,141,18,216,146,108,144,192,106,183,89,161,193,163,43,69,90,228,65,223,154,104,101,15,217,134,165,94,89,214,243,92,45,209,105,101,135,32,7,7,7,141,237,127,254,152,95,221,144,146,228,118,18,164,183,100,154,100,161,41,84,27,95,215,219,105,26,64,114,152,126,94,154,193,104,108,103,168,16,117,189,157,226,118,211,204,147,224,223,190,181,142,223,91,221,157,15,247,200,143,178,195,173,153,240,23,208,221,242,184,48,255,180,97,218,111,147,250,125,117,87,31,134,243,156,178,8,209,69,117,168,9,238,108,32,215,151,47,107,219,208,211,217,0,123,97,185,133,183,179,156,173,100,136,130,120,52,67,97,102,86,126,92,239,95,95,117,22,124,179,201,252,66,149,119,26,65,9,13,57,146,212,142,240,186,134,127,111,166,82,123,124,89,60,39,21,134,19,236,111,216,227,202,10,181,169,153,211,101,180,101,32,63,44,39,64,144,145,226,181,206,95,128,206,50,51,76,152,169,112,168,179,112,20,107,155,213,255,103,17,137,183,245,243,80,113,54,
+193,149,63,90,135,243,42,46,210,65,106,42,180,104,107,63,183,65,127,105,84,184,49,106,35,119,35,88,47,73,170,167,17,114,216,186,165,55,40,230,195,12,106,223,232,191,153,230,68,44,131,227,182,152,45,178,172,129,156,150,155,210,102,131,188,225,109,158,34,218,86,38,215,96,139,121,192,108,235,155,77,207,197,106,112,152,146,191,222,183,240,162,192,175,117,165,74,67,250,247,54,161,175,114,92,60,196,131,113,154,196,225,23,108,12,105,16,103,81,80,140,163,69,225,218,144,185,181,3,251,100,26,150,251,178,133,36,110,125,178,152,166,201,64,103,89,59,186,6,188,200,131,52,127,153,229,201,148,244,103,97,52,220,140,148,171,210,142,232,52,109,105,116,11,249,27,248,69,242,89,112,148,130,169,106,215,249,172,7,179,188,101,181,85,192,249,44,38,207,209,87,135,186,63,27,141,116,250,194,198,34,163,75,12,232,19,229,81,210,158,107,30,178,170,47,71,6,71,160,159,78,227,32,138,30,236,147,184,201,82,12,38,150,84,39,213,185,230,67,50,26,1,218,79,117,112,
+59,77,194,120,115,15,153,47,194,175,165,108,60,44,198,173,32,170,144,88,237,88,139,213,248,141,254,141,37,84,200,108,202,232,77,117,228,76,147,251,76,167,216,151,247,44,144,255,90,141,36,127,206,116,186,89,199,57,254,211,38,124,113,202,111,87,244,67,45,32,211,112,96,233,251,113,85,185,32,26,204,34,243,29,7,25,36,113,150,172,59,162,149,218,87,167,45,78,94,103,89,152,229,79,83,237,98,204,124,26,55,223,6,15,9,246,228,197,190,254,195,115,231,81,53,133,103,152,183,6,65,75,29,175,59,183,227,138,197,219,167,21,71,244,226,218,143,156,39,163,66,147,31,56,77,90,16,172,31,82,79,205,220,251,248,254,195,154,100,175,49,131,111,69,178,170,104,79,147,52,252,146,196,57,90,192,64,199,230,181,44,186,162,245,218,106,84,191,235,52,71,42,108,73,84,109,142,75,39,238,226,163,205,206,180,113,65,214,214,151,143,233,243,207,182,232,90,154,161,17,216,183,241,37,221,172,45,46,101,229,155,226,75,154,45,183,128,215,17,90,2,194,212,215,145,149,
+210,94,237,232,56,193,241,47,28,230,99,155,76,105,32,199,186,85,223,38,40,195,172,182,101,99,127,23,198,225,4,234,218,122,122,186,2,107,225,107,229,112,208,236,115,101,7,182,106,119,171,94,225,85,73,108,90,95,45,194,200,169,140,140,210,112,72,250,122,28,152,246,151,146,123,243,118,118,146,220,97,112,126,153,98,95,248,98,38,104,243,181,111,182,97,31,57,195,120,124,167,31,103,166,31,216,71,86,13,67,23,102,140,157,115,183,190,219,63,97,172,134,212,83,116,155,188,229,203,189,250,44,88,128,32,107,106,245,14,109,133,193,196,238,107,191,85,19,104,139,159,75,67,175,213,23,41,102,226,90,18,243,111,86,11,115,170,185,50,203,19,187,119,138,181,99,200,219,4,221,203,18,87,173,232,79,230,43,140,182,151,152,245,173,171,10,127,61,28,146,123,67,97,103,185,218,246,142,63,79,163,36,181,142,125,53,130,239,244,36,73,31,158,198,45,114,245,127,140,166,234,85,
+
diff --git a/uppsrc/ide/app.tpp/NewProject$en-us.tpp b/uppsrc/ide/app.tpp/NewProject$en-us.tpp
new file mode 100644
index 000000000..b5742f5d1
--- /dev/null
+++ b/uppsrc/ide/app.tpp/NewProject$en-us.tpp
@@ -0,0 +1,10 @@
+TITLE("NewProject")
+COMPRESSED
+120,156,133,86,107,111,219,70,16,252,43,135,40,125,57,180,122,79,242,40,125,105,224,164,104,80,52,45,154,6,253,96,8,21,69,158,37,34,20,79,37,79,81,140,182,249,237,157,229,67,166,220,166,245,67,182,204,219,221,153,217,217,61,223,178,167,79,121,196,103,252,127,62,22,47,220,93,118,172,194,234,182,146,214,46,203,132,235,101,38,146,229,143,233,242,227,199,143,243,52,149,75,100,18,200,36,184,86,66,10,161,57,215,50,17,38,229,169,177,194,114,149,104,105,18,110,22,135,172,201,246,171,219,204,170,229,213,207,49,162,36,162,148,80,130,139,88,106,156,226,138,75,45,164,17,214,106,145,24,171,210,56,94,228,217,33,148,190,94,221,110,40,14,81,42,50,51,158,216,88,11,196,104,35,85,98,52,98,181,22,2,191,11,147,196,73,178,8,101,168,28,98,68,156,44,51,45,151,55,8,212,81,60,3,56,153,32,82,75,29,107,101,165,18,86,202,56,85,58,213,64,45,228,162,12,14,24,55,8,161,48,68,25,148,211,70,11,5,49,116,98,20,78,37,248,169,
+121,42,36,106,90,110,12,202,185,15,163,66,36,14,194,98,20,147,137,161,195,86,91,161,18,43,181,140,37,202,243,4,12,169,182,89,20,174,205,17,166,164,88,6,0,90,222,124,99,150,2,193,9,132,145,60,229,50,78,82,212,3,84,176,85,105,42,148,69,61,45,12,23,106,145,251,130,24,74,195,21,21,180,136,137,145,184,211,195,196,2,112,165,178,168,152,8,165,240,106,180,77,22,173,163,38,4,223,172,110,175,190,249,146,207,249,92,26,243,21,162,211,72,240,153,85,90,41,29,167,90,112,133,42,200,161,73,172,152,163,141,194,72,187,216,100,45,74,6,77,170,222,60,19,34,161,214,115,10,133,240,202,26,133,242,49,94,208,83,112,84,80,71,166,218,42,101,249,34,175,178,182,157,72,116,69,60,133,136,132,152,37,164,172,81,82,167,164,143,146,144,88,198,38,21,208,216,196,154,203,69,227,126,63,150,141,219,187,26,34,151,168,190,28,251,51,184,144,254,68,233,100,36,36,124,104,226,152,147,98,6,102,144,202,64,114,46,172,6,32,124,162,197,97,48,98,
+103,14,50,134,80,145,80,179,84,106,5,28,169,214,208,0,241,34,21,66,112,139,79,240,130,50,157,53,4,252,59,216,73,232,72,232,89,2,223,162,67,169,166,162,169,34,225,36,116,151,49,55,104,128,236,163,36,201,45,159,66,112,33,45,125,147,228,194,68,194,204,20,112,9,99,192,85,65,98,105,193,215,64,115,213,121,90,36,118,241,218,157,218,23,89,112,131,79,174,110,158,118,170,199,145,136,103,156,162,141,77,209,54,161,73,49,165,117,42,83,165,140,76,141,138,57,148,107,251,217,165,80,26,160,110,248,134,20,73,36,18,76,18,216,25,3,190,93,16,184,38,130,96,72,155,198,196,123,72,177,190,174,202,154,48,192,13,203,222,0,87,103,7,216,72,207,172,141,185,74,161,3,232,115,3,115,99,248,45,26,139,190,74,56,159,166,63,127,151,109,221,250,122,24,205,63,126,251,235,179,151,175,175,223,190,97,183,45,6,237,166,113,89,40,235,45,203,88,237,78,44,59,28,170,50,207,104,242,217,151,181,15,236,216,210,195,33,9,131,166,135,10,162,124,245,249,
+234,182,229,75,118,253,231,171,154,133,93,217,50,247,33,195,35,199,78,248,42,171,138,229,148,215,33,107,91,118,127,95,63,249,206,85,149,103,39,223,84,197,250,201,69,161,211,174,204,119,44,247,117,200,202,186,101,225,228,199,130,109,196,242,172,170,92,193,110,175,216,15,120,186,98,89,221,189,121,27,202,106,53,63,195,120,187,126,182,126,198,6,195,34,197,46,11,4,165,197,200,57,230,143,13,107,241,146,59,118,87,86,120,124,172,11,215,0,91,227,193,176,64,68,142,115,247,99,169,140,242,215,174,13,171,57,251,101,231,186,95,39,167,122,122,61,88,230,195,14,153,198,135,229,185,52,157,217,249,170,192,91,119,81,187,79,57,13,24,82,161,112,89,119,199,255,173,222,198,229,126,239,206,125,152,198,103,45,49,29,244,38,170,19,105,63,41,144,175,113,246,174,59,62,74,205,130,71,153,158,253,158,184,13,15,160,194,175,67,83,91,7,50,59,223,132,234,30,236,78,20,113,238,243,52,228,161,236,155,144,53,129,40,191,122,241,114,206,158,3,120,86,249,109,159,13,
+56,93,214,176,206,151,93,79,223,184,10,172,30,23,127,206,170,18,130,0,45,142,96,153,185,253,166,34,222,171,62,158,184,116,178,85,238,46,204,217,207,229,118,23,88,14,1,222,49,255,30,189,233,30,13,9,38,209,100,163,182,175,135,180,175,201,250,253,195,251,137,171,254,7,239,243,33,2,137,194,241,0,168,223,150,77,27,34,182,45,223,187,174,238,152,146,134,43,67,251,134,6,223,149,142,156,241,207,60,116,168,99,188,245,190,96,249,206,151,176,77,217,246,174,160,4,224,208,229,125,232,112,52,76,207,121,238,224,225,113,216,214,79,30,168,188,198,77,25,177,67,227,223,151,5,181,107,148,228,194,108,36,204,39,48,254,52,56,143,206,183,195,96,220,17,221,137,83,247,71,188,221,244,212,39,254,5,178,172,14,157,89,134,169,121,196,97,253,69,59,14,199,171,59,118,239,143,168,226,10,212,69,200,177,117,15,14,237,198,185,96,174,106,221,9,115,231,162,238,240,201,31,1,117,164,54,106,213,142,98,117,136,251,177,156,212,223,71,108,184,148,105,191,77,5,118,
+25,228,156,142,95,216,209,26,115,251,114,125,157,251,106,58,84,152,139,130,224,135,51,195,194,119,235,16,201,125,135,13,211,66,224,124,141,238,62,70,56,14,224,35,37,134,109,65,176,231,236,141,31,27,242,168,7,108,213,117,40,98,225,254,64,219,53,95,124,253,143,158,83,143,104,153,246,75,170,59,63,244,23,158,26,156,157,103,53,181,140,134,167,167,138,179,37,54,90,255,223,39,57,155,4,66,103,94,126,40,195,208,217,46,112,115,223,79,217,40,31,240,253,248,253,138,109,142,33,76,37,122,30,250,114,109,0,242,136,245,107,168,95,143,217,251,113,109,21,255,182,247,46,56,209,10,170,177,113,206,78,234,215,206,244,170,248,239,155,130,221,244,43,225,44,38,70,126,68,75,9,219,110,81,13,207,110,250,236,116,33,142,27,119,53,208,166,164,231,249,62,95,139,99,71,215,79,168,52,174,183,249,176,243,134,189,73,201,35,50,195,105,122,155,14,72,177,201,250,202,193,31,250,70,12,206,45,202,22,183,237,253,133,223,166,34,236,179,119,110,66,247,98,113,70,116,
+101,100,52,61,104,91,183,66,240,242,128,23,21,187,105,133,39,139,99,222,223,27,0,185,117,225,226,250,184,92,167,245,165,182,15,235,243,135,73,97,26,178,187,114,123,108,186,12,43,230,155,201,193,95,125,243,174,197,65,183,254,243,211,49,243,249,124,5,136,141,63,110,59,59,50,252,3,122,100,155,172,153,108,51,168,80,185,64,227,50,56,97,162,41,53,28,154,2,97,86,20,68,63,248,199,146,159,119,252,234,111,23,116,54,155,
+
diff --git a/uppsrc/ide/app.tpp/PackageTemplates$en-us.tpp b/uppsrc/ide/app.tpp/PackageTemplates$en-us.tpp
new file mode 100644
index 000000000..24aeff2cf
--- /dev/null
+++ b/uppsrc/ide/app.tpp/PackageTemplates$en-us.tpp
@@ -0,0 +1,37 @@
+TITLE("Ultimate++ Project Templates")
+COMPRESSED
+120,156,237,93,11,119,227,182,149,254,43,136,157,221,181,83,90,230,83,162,228,52,137,227,113,154,217,78,198,62,99,79,178,57,179,62,22,37,209,54,59,148,168,146,212,120,220,205,246,183,239,119,47,0,18,124,200,243,200,164,155,237,217,166,141,109,16,184,184,184,184,111,92,160,175,92,241,249,231,182,101,239,218,239,248,207,228,73,124,19,109,210,242,234,85,234,134,225,81,226,56,174,125,20,57,163,163,179,241,209,223,255,254,247,129,227,219,225,17,1,115,0,204,177,125,207,113,29,180,217,190,59,114,130,177,61,14,66,39,180,189,145,239,6,35,59,152,172,163,60,90,94,189,138,66,239,232,139,23,67,140,114,173,96,215,115,60,199,118,134,174,143,94,182,103,187,190,227,6,78,24,250,206,40,8,189,241,112,56,153,71,235,50,201,86,87,175,102,52,206,199,48,15,195,236,81,56,244,29,12,242,3,215,27,5,62,6,251,62,208,243,48,241,104,56,26,77,202,164,76,227,171,87,9,225,13,108,79,8,75,223,26,238,2,59,119,132,145,190,235,15,125,47,116,61,39,
+116,221,225,216,243,199,62,208,118,220,73,82,198,64,114,230,187,71,17,254,71,195,2,204,231,7,190,227,129,34,254,40,240,208,109,132,159,190,61,118,92,76,26,218,65,128,249,226,183,154,76,51,16,136,136,68,99,135,152,210,29,5,52,34,244,67,199,27,133,174,239,14,93,32,97,143,176,80,194,32,152,44,226,98,142,177,158,235,28,149,64,235,232,228,155,224,200,193,224,145,53,218,117,237,177,237,14,71,99,76,10,132,177,102,111,60,118,188,16,147,250,78,96,59,222,100,158,45,176,206,153,27,216,30,207,24,98,43,134,128,204,100,9,134,14,144,118,189,16,83,142,28,207,195,191,3,63,28,77,138,152,54,163,204,242,171,87,95,124,179,103,15,236,129,27,4,251,52,124,140,225,161,231,123,158,63,28,251,142,237,97,26,192,240,137,102,67,27,219,233,4,110,56,153,69,5,230,44,209,52,146,148,117,136,155,64,123,47,12,60,76,61,196,191,176,175,88,160,7,250,184,99,63,244,188,208,158,204,211,168,40,20,145,136,64,95,208,34,29,199,114,156,221,17,209,54,
+240,92,127,76,196,241,92,16,217,29,6,99,7,84,14,134,190,237,78,242,248,175,155,36,143,151,241,10,100,78,192,30,71,122,139,20,47,2,25,201,138,174,229,184,96,198,96,56,180,137,94,1,24,194,245,2,16,220,118,66,31,24,225,31,108,115,169,184,113,86,175,193,179,28,111,119,236,250,30,48,25,251,62,40,0,0,206,216,113,28,59,196,63,88,25,232,194,252,225,40,198,82,211,203,225,190,229,248,187,35,176,49,118,106,236,211,244,99,143,232,231,130,252,238,208,14,176,15,174,28,238,18,213,221,207,65,119,199,13,233,127,76,121,39,176,28,200,3,80,116,130,0,235,246,64,106,55,196,218,3,208,222,99,22,119,70,225,228,121,124,95,60,137,202,88,49,204,23,39,159,75,78,115,134,150,51,220,181,105,124,16,142,177,129,142,79,244,243,124,127,236,142,61,47,112,199,129,55,180,65,199,66,10,52,13,38,145,98,113,172,128,140,44,103,4,225,194,90,131,0,171,231,97,88,249,200,33,84,220,112,60,36,42,40,32,211,131,52,89,17,30,224,140,35,201,12,
+95,156,252,193,113,70,4,40,132,208,132,225,208,246,198,32,6,104,96,7,224,116,40,132,16,27,141,125,118,33,6,164,17,230,175,163,219,120,122,160,164,149,81,32,14,12,188,32,36,190,197,72,160,14,36,0,103,108,219,67,180,132,33,164,105,114,27,173,27,12,232,218,150,107,131,139,160,127,2,8,37,230,2,251,217,99,210,37,208,12,216,1,168,162,113,32,57,112,122,176,138,139,50,94,96,243,3,155,151,237,58,150,235,128,118,224,191,32,8,125,127,8,124,49,247,136,84,19,109,33,4,56,24,121,147,243,8,242,178,94,148,174,55,132,6,35,85,228,186,150,235,66,167,160,23,68,203,31,219,80,38,80,34,62,216,13,92,224,13,221,208,25,121,246,228,167,159,166,215,188,196,233,181,109,3,196,29,131,120,193,83,123,150,235,237,66,68,64,23,12,244,176,111,96,19,204,7,141,104,67,37,133,99,23,48,27,16,72,130,48,188,1,197,183,92,127,151,68,8,76,59,130,32,5,96,61,40,44,136,48,233,55,32,24,96,69,38,20,176,112,234,143,220,38,148,192,
+114,193,129,158,11,46,134,70,118,88,238,161,245,64,83,210,117,222,104,4,89,24,153,80,192,201,60,156,71,15,45,119,184,75,58,0,54,0,219,139,205,246,60,27,84,0,251,59,196,75,248,225,56,60,186,152,231,113,188,82,235,48,230,31,89,46,115,159,3,196,161,57,156,225,16,123,225,13,33,83,67,48,131,77,212,241,198,12,97,158,173,74,185,8,26,157,183,224,132,150,27,238,66,98,32,237,176,40,33,97,77,56,129,29,0,216,166,95,195,145,162,41,212,118,11,206,153,107,130,26,91,238,120,23,250,139,180,45,248,42,132,108,67,146,189,49,180,49,169,73,24,4,95,17,54,77,10,9,106,151,9,219,194,201,179,45,15,124,13,170,184,100,123,28,119,4,189,46,217,155,84,188,61,244,108,40,12,3,39,87,109,144,1,194,177,60,7,6,129,108,22,240,128,126,15,200,188,122,24,10,45,1,118,135,145,181,71,6,121,8,196,200,30,155,32,92,203,115,65,25,176,23,88,11,186,213,27,143,160,42,177,40,178,110,176,12,0,20,250,6,8,79,97,209,165,140,
+231,89,158,183,139,81,35,55,132,137,31,129,229,72,227,66,230,194,33,236,57,64,142,48,135,65,25,189,32,13,133,229,214,243,45,15,140,11,193,182,73,107,66,107,219,228,1,224,47,180,64,103,56,35,80,198,83,8,45,136,227,166,215,51,147,50,18,74,96,121,193,174,67,202,157,76,6,100,206,25,122,196,177,238,136,197,106,72,130,229,152,80,20,101,234,77,146,112,134,150,7,123,237,141,65,98,143,236,60,28,5,168,226,113,64,123,4,58,193,165,9,29,19,142,71,187,221,207,57,222,200,242,192,204,144,65,96,1,54,6,251,56,67,56,43,99,111,4,140,200,118,143,160,32,76,38,228,149,237,182,249,38,180,188,112,215,135,38,128,62,0,74,80,103,208,12,35,168,249,145,29,66,57,192,74,2,148,1,6,234,161,189,170,177,229,141,119,225,60,4,112,55,72,52,109,103,140,193,112,212,2,103,12,21,7,222,1,31,26,171,178,77,201,148,158,147,109,249,224,94,240,23,154,192,62,208,46,216,36,40,245,32,36,183,34,132,207,5,188,12,16,77,49,104,16,198,
+119,44,223,217,29,195,149,0,239,193,204,134,94,200,40,128,119,70,33,45,148,169,110,74,2,19,230,191,174,255,251,95,78,159,31,188,188,16,175,10,215,61,18,47,211,50,89,194,14,78,255,48,253,131,56,151,134,68,92,198,203,117,138,198,226,95,175,100,47,254,233,29,9,123,112,240,203,9,56,26,238,67,161,219,248,231,232,72,56,248,118,158,103,105,118,187,137,117,155,139,182,39,112,203,242,132,189,79,221,236,161,249,69,28,45,30,96,178,178,233,193,166,104,77,233,57,212,199,57,248,229,236,77,156,191,73,226,251,186,209,61,248,229,219,168,72,230,226,164,204,211,103,201,76,68,235,117,154,204,35,13,94,246,242,24,205,34,75,99,243,187,216,91,101,226,37,173,116,191,238,234,83,215,60,22,115,213,127,157,103,127,137,231,101,221,33,64,135,238,92,226,62,41,239,196,50,74,232,183,213,34,51,80,28,30,252,114,241,228,153,6,212,59,233,72,118,97,24,60,187,50,225,154,64,62,8,164,41,34,190,75,128,214,179,232,33,219,84,88,249,68,156,211,183,216,135,
+194,88,183,79,212,185,192,156,104,43,234,70,175,106,20,103,249,34,206,235,47,88,251,69,242,183,106,214,0,179,94,60,172,202,232,173,238,18,208,60,39,217,114,169,55,92,54,98,154,159,238,224,130,137,11,224,29,215,237,158,222,156,23,155,212,104,246,137,9,210,100,137,17,185,132,226,114,51,1,159,238,76,191,193,63,59,102,179,75,205,95,127,173,26,25,68,64,203,93,195,97,42,170,181,113,103,70,176,53,167,250,224,106,224,175,14,197,13,72,184,138,150,144,168,184,130,114,101,78,202,184,211,164,232,188,181,139,79,93,190,156,136,193,96,32,38,95,53,191,5,242,219,215,162,9,0,253,184,251,151,147,65,123,196,240,93,35,14,123,198,50,49,120,228,249,241,201,159,143,255,116,106,194,28,18,49,90,226,166,191,128,26,47,11,197,97,18,202,200,132,114,125,121,246,242,252,252,244,133,9,110,180,21,220,168,7,92,216,11,238,250,228,248,252,194,4,26,110,5,26,246,0,29,31,252,242,61,244,68,156,139,103,240,145,235,190,227,173,80,198,114,223,75,37,60,230,
+212,99,185,199,32,247,115,176,194,85,243,19,239,45,137,243,116,199,18,211,157,98,51,107,126,15,58,184,57,54,13,169,56,203,232,237,216,91,209,195,39,151,62,221,36,171,164,243,197,235,206,193,18,146,44,26,208,157,237,208,157,173,208,157,62,232,76,170,140,129,52,102,112,183,207,224,110,157,193,237,155,129,41,94,196,41,244,79,99,6,111,251,12,222,214,25,188,190,25,124,185,221,111,155,240,253,237,240,253,173,240,253,62,248,180,241,171,5,117,143,23,226,77,148,39,209,44,85,134,17,42,115,104,42,234,39,73,4,235,103,168,106,234,49,98,19,184,78,179,7,82,162,186,53,68,235,233,58,105,24,203,227,245,58,94,45,146,183,19,1,217,145,90,191,214,198,212,65,91,220,142,165,213,86,56,60,18,103,55,48,10,218,246,20,226,46,122,19,139,242,46,22,5,120,84,80,194,193,170,255,44,202,124,51,47,55,57,218,162,213,66,28,138,44,23,241,27,12,79,22,64,21,134,46,133,93,202,1,37,187,17,228,143,12,196,217,42,22,247,209,131,40,51,17,189,201,
+146,133,216,172,86,241,28,154,43,202,209,248,176,78,86,183,4,164,128,174,79,163,92,220,103,249,107,113,127,7,136,136,84,96,54,241,53,18,171,248,190,178,141,105,242,154,208,139,74,75,36,5,65,37,87,32,18,156,84,136,97,45,96,156,22,66,203,242,64,175,81,255,60,94,53,221,23,101,68,171,1,98,239,229,249,229,62,65,46,54,243,187,237,112,197,211,146,58,97,238,5,225,192,184,198,34,195,90,177,150,165,97,158,217,142,20,88,81,2,112,243,104,37,102,177,136,23,48,107,11,113,179,201,65,215,124,32,46,241,239,88,127,228,193,88,223,138,161,1,155,158,53,44,4,216,133,7,168,137,37,137,208,153,62,228,16,158,155,207,196,101,38,160,102,192,121,220,25,72,46,50,192,77,10,73,55,108,40,123,34,235,77,190,206,64,65,236,23,125,68,167,249,134,184,110,32,26,211,122,253,142,153,193,69,199,60,61,32,68,162,88,199,115,240,53,47,93,58,44,145,24,108,214,229,244,32,214,254,7,249,78,37,230,167,253,37,73,100,110,202,55,68,170,154,156,209,
+98,193,242,6,80,212,167,67,136,159,136,77,138,18,252,70,96,64,197,167,79,78,137,254,224,194,148,90,166,59,44,17,135,226,34,46,213,106,229,166,12,6,164,178,137,6,112,207,98,8,40,58,75,151,76,20,119,217,61,173,97,186,243,28,20,85,222,237,116,71,72,149,135,125,87,116,146,127,51,163,176,170,138,23,150,198,32,205,178,215,133,184,1,34,160,72,193,43,35,83,77,254,16,205,185,20,64,36,18,20,154,13,128,25,13,102,25,88,169,77,64,135,104,83,102,96,81,18,167,244,161,66,9,64,200,177,85,189,152,186,123,197,126,77,47,75,96,39,139,100,134,33,203,108,145,220,36,224,177,217,131,194,180,48,150,26,149,181,64,67,22,192,205,76,73,200,113,254,128,197,161,7,109,35,152,54,90,241,186,166,59,39,60,1,200,112,159,131,117,37,251,40,116,136,145,19,181,111,139,164,120,205,235,165,239,166,208,2,94,78,206,59,117,2,143,147,144,99,28,232,217,102,178,119,185,249,21,199,249,61,238,62,53,106,128,13,41,167,93,186,75,176,254,133,100,71,
+38,95,150,166,217,61,45,182,72,222,242,78,77,26,200,140,143,196,59,226,6,217,229,221,65,131,238,215,31,49,168,175,239,25,46,200,222,219,99,133,250,123,127,160,48,62,58,187,174,22,72,191,194,159,4,125,203,7,120,139,98,25,71,171,98,66,122,98,149,149,82,175,174,30,58,42,178,185,103,254,251,68,88,230,198,92,146,244,144,170,152,109,146,116,1,65,90,129,95,229,134,108,86,139,72,242,42,88,60,18,127,122,249,212,4,52,81,92,21,47,176,141,201,106,158,110,22,49,56,46,39,249,121,163,108,20,13,161,116,245,155,8,46,86,201,50,40,93,180,189,125,146,120,205,154,42,165,189,144,56,136,155,52,186,29,136,159,161,37,43,219,167,133,6,252,122,27,175,226,92,42,217,59,233,88,178,94,219,99,2,107,60,110,55,81,190,128,48,242,12,25,105,46,6,131,201,55,96,196,242,142,184,63,134,79,102,206,216,165,227,123,197,160,189,196,148,26,160,232,39,36,182,13,76,116,194,162,48,239,194,31,136,83,178,224,76,93,120,117,7,68,196,155,104,158,164,
+80,190,49,131,104,8,19,204,14,177,7,196,152,172,159,182,94,81,30,175,166,255,86,50,199,40,226,117,244,53,99,91,89,218,121,182,4,116,32,6,91,7,205,192,54,159,44,213,95,54,69,201,170,135,8,137,40,39,205,146,82,169,214,30,146,61,18,139,63,198,117,189,116,234,161,141,50,220,88,169,193,169,239,65,165,237,236,84,89,236,79,203,76,226,184,50,150,192,82,187,7,82,60,120,116,69,119,64,212,19,145,135,166,86,72,48,37,89,176,47,75,154,153,142,24,176,173,183,236,14,208,70,17,42,76,163,82,252,8,168,89,254,229,69,73,246,228,171,129,216,59,79,99,56,138,164,55,164,115,38,141,36,254,75,172,82,25,27,216,148,249,93,148,79,191,32,184,111,166,175,166,87,150,90,217,58,3,252,56,46,200,210,222,40,148,192,82,202,144,177,23,67,56,105,196,177,52,195,57,40,24,13,49,61,80,96,109,13,119,29,145,239,129,113,20,110,105,187,153,195,1,165,238,224,148,91,248,118,131,253,46,83,125,64,254,166,195,100,69,28,47,11,101,231,216,203,
+202,10,214,165,55,155,148,25,80,174,45,141,30,182,48,225,116,103,150,220,130,12,45,237,39,25,234,22,142,140,50,183,166,3,69,112,200,77,101,231,25,80,200,9,20,217,253,170,129,61,159,192,72,186,104,114,72,92,42,95,242,46,131,39,104,112,110,68,104,34,46,129,97,88,109,208,255,38,38,58,79,176,167,234,3,192,69,74,63,166,186,47,97,71,205,6,157,166,7,236,17,222,192,64,52,59,97,103,100,199,233,193,99,61,181,10,102,223,101,5,10,157,253,121,186,67,187,205,227,225,157,68,171,121,156,82,211,183,155,178,36,90,125,151,72,57,40,89,55,145,55,179,210,30,91,67,163,195,129,91,146,109,35,103,76,78,197,48,205,206,31,169,202,31,205,232,245,106,38,141,213,22,190,184,72,32,191,20,48,146,68,255,128,16,34,162,168,17,10,100,15,243,236,247,235,117,104,205,166,238,54,20,86,91,141,31,83,220,6,54,202,150,205,245,247,234,171,14,149,216,47,164,38,10,6,75,114,129,215,150,162,126,196,241,76,30,171,208,134,169,184,36,252,141,205,214,
+250,241,31,98,50,30,205,164,182,231,126,151,205,248,152,109,49,85,181,213,180,40,219,118,139,136,40,163,185,223,231,86,121,143,39,160,77,183,189,155,136,110,138,3,22,90,69,137,76,98,218,2,94,202,146,182,121,70,162,200,209,228,14,71,99,145,252,118,23,81,136,4,99,1,37,69,203,50,96,228,68,222,152,162,30,16,92,36,165,54,75,156,183,160,13,74,64,44,21,199,75,165,42,39,237,176,78,39,89,110,34,126,92,227,9,248,75,108,128,216,172,165,205,33,130,34,52,130,254,130,38,40,212,248,158,104,131,56,65,109,93,170,114,151,245,7,157,71,18,139,42,15,85,52,123,240,220,221,175,149,195,143,185,158,74,19,104,76,194,200,38,8,27,87,183,86,21,86,82,35,155,11,25,68,70,36,115,112,169,147,133,52,194,183,43,112,199,162,35,171,79,41,137,132,53,38,36,16,219,80,102,30,147,60,20,165,48,1,105,121,151,109,110,239,212,182,176,32,115,8,44,77,211,50,122,77,204,47,73,155,198,111,19,237,8,148,119,155,2,240,211,13,193,239,209,26,
+74,164,48,162,0,31,204,217,218,145,107,218,162,145,129,64,65,121,179,121,21,115,71,55,48,80,141,233,89,152,102,144,230,77,25,163,199,134,226,254,162,128,52,222,148,160,37,70,89,170,103,210,12,27,216,92,171,196,129,178,70,48,6,93,68,100,83,65,250,228,193,208,206,82,168,23,61,204,216,119,72,211,22,37,205,109,125,146,36,19,2,164,78,155,241,112,70,192,38,109,154,58,175,166,112,180,174,38,253,108,138,14,46,58,172,22,186,67,239,222,195,102,39,55,181,174,209,1,195,68,108,101,95,192,245,0,55,175,224,182,123,137,61,19,98,239,180,251,29,70,237,149,2,162,183,202,140,204,226,219,68,58,137,70,174,133,253,203,90,243,206,213,17,23,233,23,226,172,123,62,221,42,232,116,11,61,63,84,150,120,179,90,8,129,173,150,240,99,74,153,198,137,176,151,203,100,158,165,237,172,137,218,233,158,149,235,221,239,2,219,190,200,158,209,82,20,57,207,86,72,171,185,39,187,231,69,185,47,244,105,220,64,252,216,183,229,114,176,100,174,190,89,40,131,21,169,
+248,77,233,225,66,154,84,74,249,89,192,18,11,190,101,47,55,227,241,123,160,37,166,37,48,189,116,216,182,138,94,26,196,216,2,181,122,45,27,61,130,102,158,121,182,229,11,237,109,8,188,177,156,62,102,211,190,89,206,72,63,168,212,3,13,160,53,171,49,90,75,44,170,116,30,115,113,146,151,27,214,67,155,149,60,4,93,116,204,109,243,228,213,52,176,157,19,88,19,233,159,149,179,47,189,0,108,42,220,153,124,81,37,7,20,79,239,77,119,14,17,165,209,81,226,244,139,67,70,30,45,135,211,157,125,98,224,77,1,228,160,209,120,199,244,74,30,227,63,124,127,192,78,202,160,162,32,15,141,51,166,109,16,219,182,78,13,39,239,175,70,81,169,173,38,1,7,226,28,17,128,204,253,98,1,112,210,57,108,125,23,126,114,125,88,169,57,96,27,54,169,140,148,225,72,197,9,40,39,43,242,138,14,219,244,29,121,155,27,209,92,186,41,250,154,85,30,193,24,114,129,216,136,34,48,5,35,162,156,234,130,117,145,226,56,139,92,160,60,106,232,165,69,22,23,172,
+116,231,112,99,187,249,244,247,219,13,230,110,157,116,175,210,169,248,154,233,164,1,0,196,17,73,125,11,66,149,7,160,68,191,116,137,217,157,215,179,214,71,218,176,151,103,245,226,140,246,142,170,149,199,108,210,57,87,33,163,142,243,99,242,89,41,55,168,88,227,146,242,18,202,190,170,84,167,9,73,154,67,153,248,54,154,251,249,172,187,219,157,66,134,237,155,189,157,178,15,242,48,68,42,77,101,147,216,228,176,251,98,16,162,194,118,179,154,35,24,186,229,148,232,251,33,218,41,173,168,16,13,122,75,44,168,153,15,55,237,163,74,217,195,51,202,95,23,93,51,18,181,215,198,185,69,125,170,0,127,184,204,212,49,147,198,128,86,169,87,216,18,4,242,137,122,100,192,146,92,206,199,15,25,188,192,246,140,26,87,253,243,91,176,68,133,55,159,79,73,243,91,163,192,137,189,62,211,31,49,30,164,166,36,214,115,202,113,113,216,96,114,8,226,53,34,37,187,120,213,68,164,198,117,238,139,40,32,205,165,40,239,51,78,129,193,211,196,16,189,104,185,90,86,115,121,
+172,206,138,164,47,44,83,183,213,233,151,185,174,106,170,27,240,128,52,182,52,161,92,12,7,67,213,2,73,89,80,154,69,126,217,107,175,115,191,201,91,141,153,52,83,52,10,108,76,150,56,214,14,180,252,108,112,134,58,141,34,19,152,166,20,59,202,60,84,31,155,88,202,255,231,176,179,201,232,124,20,106,44,166,67,135,167,101,203,157,173,117,98,135,25,177,67,160,145,213,52,215,239,29,236,52,169,207,171,253,237,249,137,167,249,71,112,147,218,61,138,120,48,130,142,132,105,25,9,133,200,217,154,211,111,58,5,218,228,22,113,65,78,4,231,230,82,138,179,147,82,65,73,96,165,217,30,32,246,149,155,211,228,44,191,191,74,171,169,142,122,170,181,26,220,87,116,246,50,230,176,80,57,121,39,231,80,146,100,12,117,146,83,159,106,201,61,131,169,140,115,174,90,128,78,73,179,91,254,245,196,100,63,229,221,195,237,152,145,235,168,24,152,66,84,139,242,79,57,29,154,182,56,150,52,26,121,154,101,169,29,123,53,13,7,172,42,153,67,64,30,214,148,203,88,100,
+27,8,9,28,232,246,150,156,154,102,143,210,49,177,202,112,169,156,157,193,234,143,88,149,14,88,237,1,70,105,33,139,39,100,165,67,115,9,239,237,218,41,77,195,151,149,228,250,248,212,173,206,56,85,131,101,182,86,158,150,87,173,150,12,8,57,99,82,115,30,214,136,253,234,96,254,252,244,199,211,23,226,229,197,169,56,126,46,78,255,227,252,197,233,197,197,211,179,231,226,242,76,92,156,94,138,203,239,79,197,147,211,239,142,95,62,187,20,63,30,63,123,121,42,206,190,19,199,226,187,167,207,78,159,31,255,112,138,182,23,79,143,191,125,134,230,23,4,224,233,147,170,229,51,241,243,217,203,23,226,228,236,135,243,151,151,152,226,233,133,120,246,244,207,167,207,126,38,208,39,47,142,47,190,23,199,23,226,226,12,115,225,39,247,189,60,253,225,252,217,241,229,41,245,189,56,125,118,122,114,121,250,164,71,113,190,119,77,225,71,88,89,130,164,248,75,150,230,112,128,150,44,57,99,199,57,138,136,83,19,134,123,198,144,119,212,113,19,159,10,221,145,15,91,233,16,
+83,133,200,243,39,68,72,69,237,229,81,236,213,211,91,9,142,82,110,124,254,128,129,156,22,169,214,44,57,37,37,5,73,137,31,218,110,112,94,174,142,139,164,250,103,161,132,227,170,10,72,72,253,72,96,196,166,134,138,28,168,136,23,189,147,242,161,38,9,207,179,136,215,140,180,114,56,207,46,58,124,116,217,74,118,82,21,146,172,92,34,197,187,42,116,124,155,26,169,72,41,130,172,69,227,183,17,5,168,197,190,145,61,202,40,5,81,213,254,64,91,200,116,47,132,52,110,73,177,182,138,147,6,86,254,81,226,4,54,101,242,104,235,191,156,168,170,200,201,87,131,249,122,173,122,84,31,27,156,164,37,233,10,125,239,218,125,27,61,21,237,175,6,229,219,82,79,222,96,213,71,234,89,155,236,201,166,98,129,61,90,112,105,83,204,139,143,42,13,44,85,148,78,92,145,129,214,58,89,39,209,117,170,201,52,35,79,43,183,157,84,9,129,201,55,113,43,143,82,129,108,247,189,129,54,83,157,169,14,45,175,199,192,248,204,17,225,74,85,140,191,239,178,116,81,88,
+170,104,205,76,29,165,28,71,68,179,76,157,217,178,233,106,157,178,201,165,111,51,158,50,7,173,68,45,190,185,129,162,27,136,111,43,201,173,75,79,216,120,51,130,198,209,70,53,81,36,250,118,129,98,114,233,11,176,149,165,80,142,93,130,98,115,3,215,42,254,140,50,49,6,223,160,99,30,19,196,162,62,9,149,233,55,50,103,244,219,170,161,219,7,226,167,132,120,185,212,133,111,188,252,45,67,169,154,103,9,58,45,100,42,172,9,135,195,44,25,95,117,92,181,149,20,78,114,72,42,219,66,38,35,35,79,167,179,98,189,245,44,214,154,82,50,149,153,166,213,215,130,66,129,121,188,168,78,66,183,209,181,38,125,47,125,23,25,135,198,84,109,181,157,100,95,78,132,34,177,128,188,117,214,119,211,15,218,96,255,12,61,136,177,209,218,222,47,181,35,6,198,205,165,200,58,176,46,90,164,166,53,153,62,22,37,150,31,69,242,237,8,200,216,185,202,34,48,169,54,235,238,156,191,205,54,215,106,227,215,108,243,147,179,143,222,98,173,39,251,138,250,155,10,242,203,
+9,9,42,27,92,222,90,160,7,63,177,84,250,105,158,102,228,190,41,125,172,42,43,26,254,87,149,0,168,156,89,105,242,12,229,72,103,159,208,109,88,254,131,42,107,35,225,165,9,170,64,164,232,236,204,177,170,149,176,106,44,176,226,191,110,178,82,186,182,236,112,192,89,78,98,58,240,132,161,155,151,124,138,78,117,13,60,176,86,19,213,160,66,185,41,210,132,27,121,220,200,80,10,186,108,178,242,6,73,87,206,98,90,131,172,147,182,56,92,144,108,34,181,182,92,217,64,156,145,138,190,79,72,189,67,223,233,242,68,218,195,237,190,173,116,215,99,195,191,111,230,144,22,106,57,100,8,6,183,131,166,162,26,30,129,7,72,135,179,167,59,189,118,196,215,66,213,139,95,59,216,204,73,245,151,75,219,187,5,7,210,205,116,219,85,52,88,165,199,116,224,43,243,136,242,143,129,21,157,53,72,22,98,78,165,162,155,156,178,89,153,12,179,226,60,39,71,131,74,168,111,65,218,227,122,140,84,35,234,24,77,215,125,169,141,235,99,228,247,191,129,98,178,55,155,81,
+229,43,137,120,185,145,226,58,221,129,20,237,53,1,237,19,152,35,85,101,111,44,250,167,70,126,205,12,53,128,206,116,66,147,22,181,154,145,241,48,89,210,242,62,150,133,106,75,226,54,234,48,161,95,214,121,182,216,204,227,222,188,157,148,24,173,203,122,169,240,49,183,106,126,13,61,68,12,93,251,251,166,140,223,127,103,168,25,154,247,221,29,106,170,193,106,176,46,57,7,37,244,189,8,121,97,224,38,145,97,132,145,233,163,204,58,171,63,109,139,12,51,2,144,170,26,85,94,160,193,90,214,92,36,4,125,37,139,150,139,228,118,213,74,215,104,108,205,187,66,205,253,139,21,156,132,179,137,101,204,39,114,103,156,197,73,215,119,145,14,223,235,84,11,213,68,79,175,229,189,159,67,93,89,138,166,255,84,185,154,104,62,143,215,74,107,107,111,72,6,58,58,15,161,195,35,54,65,148,159,227,227,71,177,200,41,95,173,139,45,34,29,98,67,180,37,17,101,47,153,188,168,227,176,61,168,129,219,129,5,221,76,69,84,197,254,64,104,100,146,102,64,88,230,64,4,
+241,249,146,21,63,91,254,195,30,165,244,147,114,233,43,27,201,25,90,197,55,143,238,65,219,79,100,53,77,137,152,134,85,109,199,104,181,3,215,60,176,239,183,224,10,143,234,192,78,188,136,111,8,217,172,74,74,112,48,211,59,184,185,84,48,129,148,107,19,55,180,232,143,181,44,60,114,243,173,41,20,125,55,224,250,133,162,134,242,143,144,14,171,187,247,155,245,58,206,57,5,153,198,165,228,106,83,132,234,138,133,123,250,87,167,55,204,55,160,233,76,163,206,80,170,211,136,190,152,155,106,76,11,236,14,229,135,216,17,50,247,186,233,29,112,90,245,62,78,211,233,1,76,40,154,146,226,46,166,107,20,92,161,17,215,101,76,53,86,205,226,89,98,18,10,135,193,133,123,131,187,233,193,190,42,195,232,154,223,254,237,144,41,220,55,81,146,50,62,28,186,53,106,179,242,152,43,94,11,65,218,62,151,89,234,233,206,208,30,79,15,22,241,27,175,197,105,154,55,182,169,160,167,242,66,76,78,233,21,150,202,74,115,90,253,40,70,233,61,85,144,42,183,183,104,73,
+106,67,10,223,131,57,222,33,21,213,196,91,197,227,157,55,57,155,66,210,119,163,243,29,66,162,96,253,94,69,101,219,254,1,255,233,181,222,52,153,136,251,235,166,214,111,136,103,26,112,85,140,163,42,62,86,157,121,229,125,35,126,65,72,246,209,102,72,91,144,55,36,29,8,53,138,104,32,190,147,247,203,56,35,197,122,94,6,238,240,10,231,205,193,93,23,216,62,58,17,63,60,156,131,161,14,233,135,164,212,244,224,43,241,195,207,211,235,243,227,203,239,167,215,242,55,94,229,255,93,89,55,184,234,55,145,248,240,83,73,188,70,244,127,71,238,229,244,91,165,191,123,229,186,41,238,125,87,175,219,14,88,163,246,73,75,116,179,246,78,222,201,180,120,29,114,229,85,248,79,238,23,165,91,111,51,186,167,73,177,104,243,224,59,216,122,207,187,141,135,249,93,188,142,31,184,172,194,64,168,89,232,35,81,170,195,219,106,192,239,161,156,76,35,195,167,163,43,206,201,62,18,245,247,112,111,239,237,247,78,228,163,52,178,121,197,162,34,144,186,200,161,106,21,148,227,
+86,237,26,87,221,87,108,42,239,24,202,107,131,213,181,203,5,223,143,30,84,135,188,239,88,131,78,12,51,50,191,174,178,181,77,138,109,183,253,91,12,84,84,116,215,181,111,138,252,239,194,221,130,83,44,11,212,212,237,235,121,182,238,16,180,215,173,154,238,200,91,164,141,43,174,116,87,83,222,104,109,232,10,117,40,55,221,57,78,83,221,181,80,149,212,173,123,173,243,187,120,254,154,18,51,58,11,167,151,95,97,163,149,102,30,235,11,174,117,25,202,71,109,114,7,7,170,110,97,44,12,36,152,242,125,56,200,88,227,227,231,239,38,203,42,62,86,119,179,103,25,229,11,53,25,100,204,199,232,244,165,93,87,113,194,65,148,161,19,232,212,182,91,124,80,80,238,147,242,108,143,177,95,240,72,240,250,65,117,163,166,186,175,136,196,66,190,146,66,46,166,175,152,145,166,191,64,185,205,232,7,255,169,126,167,31,188,254,171,163,174,33,232,123,223,162,105,10,122,223,185,104,186,126,245,240,170,184,203,112,234,170,204,104,37,45,92,184,127,151,113,198,171,74,131,139,
+151,5,39,10,203,170,134,155,154,23,124,245,94,133,170,170,36,225,215,133,255,146,7,6,239,27,246,243,181,3,51,242,231,82,166,190,160,191,19,210,119,153,162,239,97,144,54,107,104,230,235,212,20,178,134,124,111,213,196,149,14,145,50,186,244,0,29,15,29,136,39,25,91,53,157,161,213,197,144,124,195,125,213,76,84,86,40,152,172,95,217,43,157,184,45,226,210,60,37,126,20,169,168,208,133,7,122,187,163,214,250,160,245,74,200,198,214,42,127,206,171,206,75,171,206,168,209,13,58,125,186,220,45,122,248,32,225,170,142,52,88,184,228,59,139,224,19,252,174,65,79,175,89,228,32,112,211,63,202,94,106,61,211,157,171,182,124,233,29,247,250,244,64,237,185,245,64,239,122,109,173,76,249,58,202,141,3,152,234,189,18,153,144,134,89,161,39,64,22,58,85,163,78,32,180,23,47,135,39,133,94,127,83,29,52,158,162,105,41,130,190,39,105,154,138,128,6,126,184,10,208,231,20,191,169,2,208,249,190,235,182,224,247,72,105,207,3,59,255,47,165,191,27,41,77,22,
+159,82,62,155,79,38,105,142,255,20,242,153,44,126,165,100,54,82,251,221,103,156,90,210,217,247,156,83,83,58,245,224,15,151,208,89,150,33,146,94,201,195,190,173,130,170,156,192,89,246,86,244,21,15,106,52,255,41,101,75,121,142,211,29,155,238,195,211,47,14,231,105,182,35,40,111,57,150,77,113,51,74,175,249,200,169,81,28,201,167,10,234,216,255,119,41,153,85,168,242,94,210,249,10,218,248,202,38,15,213,153,190,66,47,22,209,126,33,117,63,194,136,242,225,160,188,88,65,79,108,138,137,249,183,219,22,226,199,224,240,122,164,145,34,72,234,60,217,104,115,185,173,15,222,215,253,234,163,194,228,138,14,154,63,116,168,156,246,163,134,214,244,64,183,195,102,155,251,43,144,105,66,172,233,210,3,113,155,186,108,21,159,126,10,149,217,121,151,174,165,50,251,222,167,107,170,76,61,120,187,202,36,241,41,228,19,103,124,70,72,142,135,186,52,254,20,97,195,45,148,130,172,33,182,90,87,112,108,75,250,33,42,35,77,218,214,84,163,133,150,112,3,137,166,186,125,
+146,103,235,103,73,85,70,111,213,207,67,212,105,131,66,199,193,250,201,171,42,237,44,95,52,235,211,208,61,79,243,181,53,180,6,174,19,60,20,177,55,170,155,105,71,87,37,229,86,138,193,111,165,211,171,87,178,20,200,199,116,60,116,237,109,242,134,218,86,153,230,52,121,187,220,250,120,253,223,71,137,70,170,159,223,101,41,26,119,24,30,244,213,73,202,125,174,100,153,80,195,71,147,133,238,84,70,249,97,182,67,221,47,147,23,0,76,190,171,138,7,232,148,143,12,20,115,154,146,249,236,102,122,77,21,194,248,77,233,238,3,225,116,66,227,182,85,146,124,8,74,234,42,114,77,81,195,61,231,91,99,92,185,201,39,10,149,88,91,234,149,149,7,93,70,164,214,82,85,33,223,82,100,109,192,214,219,84,23,137,105,63,35,150,143,75,200,2,42,101,64,63,133,29,59,36,101,167,38,217,171,220,166,107,71,166,17,245,159,46,253,9,189,70,85,156,87,204,123,210,134,181,212,164,86,123,80,69,100,245,216,222,241,37,205,95,76,123,212,187,15,91,140,161,247,17,
+198,112,250,71,204,141,246,191,197,121,54,189,102,141,170,167,154,94,39,171,69,252,214,40,158,97,149,253,110,152,95,125,114,128,159,30,199,47,63,57,192,79,143,227,103,31,11,178,109,73,213,69,141,79,148,23,104,154,210,214,3,172,45,67,218,247,16,107,211,144,202,161,31,28,121,64,167,228,179,164,204,233,229,209,95,153,38,32,243,82,167,10,142,233,134,80,85,141,67,7,154,143,228,3,122,30,147,253,103,136,89,254,73,242,1,124,255,246,19,102,4,252,223,44,35,192,152,126,74,169,124,228,217,98,243,97,77,222,179,77,183,35,237,118,239,70,9,174,56,32,231,145,159,209,131,53,134,168,44,7,226,57,221,157,3,150,244,140,10,23,59,116,96,114,149,48,250,107,31,134,238,108,16,227,219,157,215,16,222,241,168,178,241,78,237,165,121,14,68,231,56,211,131,218,247,149,167,235,178,208,158,171,70,54,121,46,207,102,42,151,23,46,118,188,156,201,155,180,84,181,32,148,128,77,119,54,235,117,145,207,201,223,81,93,122,223,167,168,11,220,249,204,42,203,25,40,
+165,25,103,177,34,92,229,189,240,131,9,75,121,45,92,141,178,122,78,183,238,19,160,65,79,195,65,101,102,105,58,139,232,242,232,133,124,197,64,61,63,161,31,133,171,103,167,18,140,119,61,51,209,122,90,164,104,61,25,195,15,197,240,131,14,43,165,8,59,120,27,158,26,187,105,203,232,65,158,140,3,227,153,58,178,27,136,127,231,107,85,171,52,202,111,229,225,167,60,186,28,240,221,109,121,95,92,110,105,245,36,9,173,152,224,52,87,141,168,168,189,106,131,61,137,67,23,49,23,222,111,95,171,126,100,87,29,158,170,58,244,66,92,30,127,219,200,255,130,75,150,180,136,205,58,79,110,239,74,65,140,30,81,25,118,33,125,103,121,245,46,91,199,213,157,132,250,98,190,126,20,78,189,155,203,135,198,6,108,117,173,162,126,105,163,205,236,61,239,131,55,25,188,126,133,184,243,184,143,124,17,50,203,147,184,122,162,88,226,209,120,240,199,27,145,143,249,195,195,49,88,186,254,123,163,174,151,141,26,111,74,93,108,102,38,80,118,246,233,106,105,65,231,93,61,15,
+151,116,222,49,111,224,110,60,65,29,105,237,45,15,232,25,219,222,130,156,102,40,60,221,25,58,118,163,38,167,245,246,15,113,40,244,204,130,195,163,37,4,136,44,127,29,73,112,241,60,189,31,189,161,39,187,230,20,81,148,15,107,122,43,114,13,231,194,130,54,227,167,46,243,120,157,229,234,177,42,165,109,155,143,183,101,249,102,41,246,238,202,114,61,57,60,188,191,191,31,128,19,73,135,12,160,133,15,65,202,67,238,113,184,223,135,98,129,88,164,186,234,192,101,149,41,201,29,189,147,110,60,47,89,125,104,35,5,234,111,69,169,111,186,178,151,236,176,195,124,183,44,225,186,185,230,212,230,183,106,246,2,194,253,65,83,235,237,127,252,25,123,197,31,30,6,156,210,179,34,250,65,98,121,221,78,255,101,24,124,249,186,164,89,148,98,84,98,204,140,199,237,163,110,233,74,245,108,59,130,77,245,54,187,241,150,92,82,200,199,231,214,250,200,63,172,113,83,156,165,30,225,107,172,190,245,150,103,161,107,0,206,213,69,222,44,95,178,26,190,139,218,23,36,229,5,
+213,198,155,113,213,156,227,35,126,151,86,255,94,189,89,122,164,91,244,79,154,164,238,165,238,132,34,4,29,208,255,115,162,213,243,197,109,127,161,203,10,109,168,84,5,48,207,86,55,201,109,221,15,214,116,71,176,107,68,75,38,120,105,196,169,59,114,104,166,59,12,3,78,199,213,255,0,155,254,93,210,
+
diff --git a/uppsrc/ide/app.tpp/PackagesAssembliesAndNests$en-us.tpp b/uppsrc/ide/app.tpp/PackagesAssembliesAndNests$en-us.tpp
new file mode 100644
index 000000000..bb5c7a863
--- /dev/null
+++ b/uppsrc/ide/app.tpp/PackagesAssembliesAndNests$en-us.tpp
@@ -0,0 +1,90 @@
+TITLE("Packages, Assemblies and Nests")
+COMPRESSED
+120,156,140,186,249,115,98,89,150,38,248,175,200,186,106,202,106,137,138,61,42,179,178,172,205,170,167,122,155,31,186,123,108,170,123,250,135,180,172,14,207,8,101,166,119,121,184,135,185,123,84,118,204,216,152,73,44,146,64,66,72,8,132,216,133,22,16,235,19,32,22,177,10,33,36,177,35,208,227,9,16,15,9,196,250,88,196,190,195,60,192,151,136,168,238,234,118,119,115,215,123,220,123,207,57,223,249,206,119,206,149,252,151,51,127,248,135,31,127,240,241,31,124,252,63,249,245,139,127,57,251,155,39,223,61,123,253,171,95,254,243,95,127,242,217,103,127,245,167,255,215,159,125,242,243,207,209,205,159,124,240,233,31,124,241,241,207,62,251,244,103,63,255,252,243,79,62,254,244,179,207,62,255,139,207,190,248,236,227,79,63,249,203,47,62,249,249,103,159,127,246,201,23,63,251,197,191,157,125,242,245,211,231,191,253,228,87,191,124,242,201,207,254,234,79,255,250,143,63,249,217,199,31,126,254,233,135,31,255,9,122,194,167,31,124,246,7,159,163,43,191,248,236,211,207,63,
+255,139,207,63,253,252,211,79,127,254,197,23,31,127,241,197,231,31,255,236,211,143,63,70,79,248,228,139,183,39,124,250,171,95,126,138,110,249,108,188,229,83,212,220,231,159,124,250,249,207,191,248,244,231,159,125,252,249,231,63,255,139,207,62,255,228,47,63,254,226,47,63,251,139,143,255,226,231,159,254,226,127,127,241,245,247,168,197,255,247,191,252,127,255,219,191,250,247,127,254,159,254,118,230,151,175,62,249,171,153,255,243,201,87,127,255,228,183,179,175,62,152,249,23,175,94,205,126,243,235,103,79,103,95,205,124,249,71,51,255,126,246,213,235,87,127,244,171,95,190,250,248,175,102,126,240,207,167,239,119,140,31,63,123,255,56,243,228,229,236,204,87,179,207,95,191,124,250,213,204,235,23,51,255,233,203,63,251,242,207,62,156,153,249,23,207,103,102,255,219,236,87,223,189,126,242,235,103,179,51,79,190,253,246,217,211,175,158,188,126,250,226,249,204,211,87,51,191,254,238,233,179,215,51,191,121,249,226,155,153,39,51,223,78,79,26,239,121,251,245,204,87,79,158,207,60,
+121,246,234,197,100,229,215,51,79,159,163,39,63,153,249,250,251,231,79,190,65,205,60,123,250,252,239,209,191,126,253,242,201,203,239,255,209,182,95,207,206,124,247,106,246,235,153,95,127,63,243,226,245,239,102,95,190,253,240,213,143,87,190,120,249,114,246,213,183,47,158,127,253,106,102,114,246,43,20,86,212,209,175,159,190,156,253,234,245,139,151,223,207,252,254,233,235,223,205,160,7,252,224,21,106,125,22,61,31,93,57,249,96,242,248,226,55,147,175,223,7,241,31,223,63,253,96,235,87,47,158,191,126,242,244,249,171,31,46,158,249,122,246,55,79,159,63,157,128,242,155,167,168,241,63,70,193,120,134,174,154,121,61,251,223,94,79,95,77,188,120,50,243,225,119,223,126,139,226,249,122,246,249,43,116,245,159,124,48,243,251,223,61,253,10,253,224,217,239,159,124,255,106,230,119,79,166,231,190,26,59,52,241,234,201,79,12,189,245,227,167,254,253,196,129,119,94,62,65,225,125,245,250,109,112,175,94,124,247,242,171,217,201,146,241,185,79,94,207,124,243,228,239,81,152,191,
+253,161,145,15,80,223,191,123,133,166,234,55,47,94,126,51,205,52,250,231,247,227,213,175,191,255,118,2,212,91,179,79,95,163,36,248,96,230,119,47,126,63,254,242,213,239,94,124,135,230,24,205,219,148,22,79,158,127,61,221,246,227,244,141,151,162,137,125,245,38,132,31,249,132,154,252,81,188,99,78,62,31,187,241,236,217,247,51,207,94,160,196,155,29,147,232,191,143,201,196,224,211,215,175,102,94,125,247,235,183,47,159,142,43,227,215,223,189,30,239,248,30,141,246,251,177,123,232,1,79,158,127,143,130,246,10,93,245,245,244,92,52,204,31,241,234,253,169,223,124,135,2,136,238,250,129,249,49,169,167,213,134,114,105,118,140,239,203,183,94,161,182,191,252,243,223,188,120,246,245,236,203,87,99,168,158,76,23,252,241,171,217,217,153,95,126,244,182,218,190,252,243,183,70,95,205,252,234,215,179,207,94,252,254,79,62,124,83,143,111,254,249,167,178,139,22,222,55,104,118,199,25,158,214,7,186,248,255,248,151,255,106,18,255,247,47,190,123,155,136,231,179,255,128,194,254,
+124,22,93,131,86,198,55,79,158,63,253,246,187,103,104,8,227,4,160,79,223,141,65,253,159,240,8,181,244,221,183,95,79,194,70,243,248,15,79,94,62,125,129,82,227,245,211,111,208,92,189,179,251,1,26,251,87,207,190,27,235,217,204,47,126,20,197,211,79,190,248,248,175,254,3,42,61,255,249,119,179,207,39,174,61,249,250,235,143,94,206,126,243,226,31,126,74,198,23,31,253,88,69,254,23,14,120,71,168,183,50,241,3,86,252,120,251,71,99,232,223,29,241,213,239,158,60,255,237,251,152,167,202,244,106,246,245,107,52,128,241,97,111,101,225,87,223,190,77,214,139,151,191,69,209,251,127,102,95,254,47,28,251,67,106,78,143,70,139,241,55,79,127,251,221,203,55,249,158,26,248,213,56,131,95,254,249,59,19,63,90,244,63,10,126,106,226,35,148,123,79,127,251,124,230,43,148,152,40,100,111,252,127,61,251,237,63,170,159,233,57,255,229,77,54,254,238,245,139,111,159,126,245,229,47,190,252,232,203,143,158,126,61,251,229,71,168,152,127,249,209,223,188,49,140,58,
+245,182,21,188,239,36,95,254,225,44,234,228,119,175,254,110,230,151,127,247,119,51,255,26,61,253,155,23,47,199,52,65,185,247,108,44,11,95,189,223,253,62,31,99,30,62,121,119,198,7,51,191,26,147,255,245,239,158,190,250,17,57,254,116,230,151,127,58,13,237,201,123,65,121,211,82,62,152,68,241,213,139,111,190,69,217,241,18,21,207,103,207,166,133,251,15,47,254,30,205,245,56,204,217,39,168,110,254,15,117,109,92,83,227,52,190,248,177,156,60,159,238,29,87,255,63,181,231,93,36,83,21,64,171,124,82,224,239,158,126,72,184,73,34,223,181,141,55,61,246,7,129,162,79,239,241,124,243,254,95,252,64,63,222,180,186,215,104,205,254,246,119,19,165,126,50,150,237,175,94,60,123,134,26,155,168,239,111,222,59,52,150,178,137,234,206,60,249,234,245,164,130,103,254,235,88,159,158,140,9,60,93,249,250,119,175,222,116,21,52,77,179,47,191,65,69,2,125,158,69,211,54,105,233,168,142,189,248,251,127,196,148,87,19,157,152,42,197,148,80,239,147,242,199,99,196,
+222,247,253,63,121,163,25,239,34,152,154,156,116,249,159,90,252,81,22,223,27,158,130,62,110,112,19,57,253,155,137,95,127,48,85,145,183,210,251,244,31,166,157,254,7,80,77,76,188,250,118,246,171,167,191,121,58,59,109,140,47,95,188,64,27,236,68,110,223,133,244,86,90,223,189,120,241,221,235,111,191,123,253,198,234,31,127,248,226,215,255,245,131,153,15,209,161,102,102,246,245,87,127,50,243,237,203,23,95,127,247,213,52,161,79,222,4,63,233,128,63,58,11,133,22,13,228,155,55,194,248,234,157,110,142,67,159,168,230,123,70,188,247,23,69,0,45,209,151,255,184,105,252,84,103,167,249,250,221,36,243,31,162,50,251,126,68,152,54,181,87,63,56,103,108,98,154,201,73,240,104,151,127,141,242,96,234,229,15,231,131,127,52,77,161,214,95,124,245,116,34,230,147,105,228,27,116,254,125,250,237,179,217,31,212,42,186,237,95,79,80,250,239,129,50,14,231,29,235,208,249,230,171,55,113,253,176,231,189,173,200,55,144,255,48,61,227,64,126,210,33,199,129,77,89,240,
+228,43,116,144,155,116,144,159,148,236,248,227,169,26,160,106,49,245,227,55,207,158,252,246,213,175,222,157,247,142,95,147,34,254,253,147,105,63,64,35,153,253,240,183,31,190,227,192,191,157,125,246,236,197,127,126,241,18,221,63,251,223,158,124,243,237,4,116,84,123,166,163,202,4,143,127,247,183,255,247,148,137,63,251,240,147,119,167,126,240,83,6,205,188,119,29,29,135,208,154,24,163,241,55,191,248,8,29,236,62,66,151,125,244,222,208,71,255,238,111,255,230,103,159,124,248,111,190,123,250,225,191,27,107,196,155,154,120,191,118,146,215,55,116,254,250,237,168,247,214,212,212,202,155,20,255,136,87,63,153,20,222,136,204,127,248,118,246,249,24,191,159,116,208,153,255,248,98,230,197,183,63,20,217,55,104,126,52,243,183,179,175,191,252,243,31,181,161,95,161,75,223,14,124,227,69,99,46,204,124,51,251,252,187,177,11,111,134,140,167,239,240,29,23,192,151,255,236,111,103,199,58,53,243,67,21,252,242,159,161,68,124,242,236,197,111,167,194,141,106,199,236,147,151,63,246,
+250,159,207,252,245,95,63,253,6,93,251,139,79,63,253,252,103,127,244,9,122,41,154,195,54,48,229,249,185,57,236,250,112,14,253,213,134,216,69,14,97,139,10,6,77,90,22,137,213,113,115,232,151,137,69,72,38,31,28,84,150,177,186,249,93,241,142,164,160,20,95,238,172,111,111,111,159,158,197,174,210,87,0,132,172,180,244,181,179,173,108,162,222,181,23,104,106,2,193,69,181,179,215,240,192,193,18,107,71,134,28,246,14,87,131,166,33,118,169,49,144,72,132,101,129,32,207,14,10,37,61,137,222,199,235,154,124,180,50,3,253,66,31,147,131,194,174,49,6,122,118,120,182,172,61,113,119,33,45,46,200,246,246,186,3,105,42,125,146,119,47,148,204,238,149,27,170,78,106,228,42,248,206,110,52,29,120,44,38,78,61,9,165,184,119,166,99,214,206,117,105,100,69,110,91,59,9,47,236,108,135,83,110,53,230,97,149,211,58,12,118,183,153,242,244,254,105,223,112,40,174,14,118,119,6,216,146,96,205,181,80,242,214,101,218,21,155,214,109,0,211,29,94,60,114,214,
+145,172,172,170,55,193,104,12,244,15,37,94,179,87,203,28,53,17,45,35,89,82,175,242,74,101,106,223,121,208,81,215,174,6,124,213,62,153,73,57,30,41,74,82,226,18,159,82,196,45,210,48,135,130,224,35,118,83,20,104,83,201,123,174,82,51,14,239,185,89,154,213,48,229,148,16,40,104,107,81,101,65,178,243,48,0,162,45,86,54,110,43,197,202,105,175,173,9,141,46,212,69,219,17,183,97,97,80,10,14,1,89,131,43,32,246,112,110,105,123,9,179,77,92,172,215,211,246,14,164,220,91,107,156,231,194,190,85,90,64,95,142,164,143,146,185,101,74,96,216,52,59,19,189,186,252,140,188,25,188,89,56,243,141,60,43,50,23,126,229,38,152,118,114,246,171,21,48,36,217,139,12,250,153,253,22,207,180,136,99,177,116,165,248,176,182,50,32,54,88,195,8,62,52,36,73,14,99,234,248,21,214,1,128,27,214,181,61,32,112,196,232,112,48,15,48,11,185,84,244,83,142,148,203,201,98,244,154,172,125,101,111,148,35,245,124,216,112,56,157,80,86,58,195,65,66,
+89,143,43,26,115,117,109,80,89,137,10,232,73,205,214,72,244,112,189,89,76,139,149,52,255,185,27,69,179,43,189,210,227,53,118,0,107,113,222,6,53,252,253,13,49,101,163,128,72,65,202,131,108,11,18,167,206,250,212,144,131,238,165,114,208,0,151,142,2,236,227,196,50,195,113,211,40,10,192,146,214,236,88,72,12,101,217,250,126,152,113,69,99,172,105,101,27,43,55,15,233,236,185,51,201,178,34,27,216,16,147,29,247,41,45,178,179,146,198,132,216,206,50,116,119,78,219,28,64,125,106,253,78,159,240,8,86,109,17,27,197,243,208,29,184,10,192,169,68,195,108,176,189,196,139,181,109,145,117,13,199,113,92,92,114,229,55,2,109,227,70,21,222,246,48,73,234,100,135,250,224,60,62,27,129,59,117,187,224,129,24,82,138,83,66,95,170,89,170,247,227,181,232,169,128,109,138,84,68,160,148,198,39,134,160,37,161,142,30,10,83,204,168,191,231,148,228,17,39,168,104,44,94,69,136,178,94,39,14,137,104,243,145,237,230,233,176,240,184,206,212,208,169,21,134,128,
+3,94,53,3,205,170,158,133,96,91,178,106,57,106,146,133,40,173,146,135,199,109,159,39,116,121,188,0,38,15,54,247,247,161,170,0,46,238,235,57,210,8,109,8,232,65,151,236,44,207,243,236,46,97,250,5,4,88,218,97,204,35,103,216,43,117,144,215,17,193,81,69,89,127,81,100,9,134,226,202,181,133,35,92,136,175,231,71,136,137,82,189,39,57,96,109,72,232,51,200,55,184,144,59,93,237,186,23,36,194,99,79,86,119,239,92,216,85,95,148,203,77,240,28,220,136,95,7,13,235,71,186,122,85,117,220,240,9,212,119,13,242,45,84,139,158,173,139,145,11,208,187,117,155,87,168,45,251,253,0,94,157,130,234,114,75,223,200,149,176,46,26,135,129,166,207,145,99,172,232,138,73,207,221,70,168,121,92,77,129,75,165,40,4,236,216,100,204,146,186,222,173,71,239,5,55,163,199,222,78,173,228,74,199,2,180,94,67,83,65,64,234,193,254,213,66,84,185,145,143,18,133,166,35,179,93,19,87,80,241,125,218,226,246,165,59,208,206,14,182,19,126,70,172,70,178,
+148,187,143,96,12,176,12,145,82,143,135,208,245,247,45,143,138,139,254,46,222,159,139,200,154,170,119,8,168,232,35,177,178,114,138,77,159,247,51,187,121,74,47,104,43,107,184,181,171,219,135,142,118,175,98,128,99,35,183,206,19,21,146,122,100,175,220,214,44,251,251,167,64,248,46,185,217,209,150,70,105,107,147,227,27,118,163,201,150,37,228,177,240,155,230,112,58,93,98,134,106,153,107,45,243,120,67,4,106,111,207,224,129,11,167,210,174,212,68,204,154,35,37,229,111,80,137,57,58,205,103,148,143,146,7,114,73,143,75,174,117,79,130,226,124,43,145,241,194,62,184,4,138,36,29,70,184,147,215,3,252,115,138,136,134,168,186,113,36,25,223,148,88,241,238,229,83,188,133,112,90,33,30,225,121,146,245,29,216,197,111,204,47,217,170,46,102,245,46,153,28,69,55,6,109,86,175,52,170,4,91,50,159,218,211,185,45,186,213,100,202,26,75,192,232,183,118,241,56,93,142,108,102,84,44,5,118,237,44,158,111,155,210,11,49,213,122,190,17,172,74,195,140,134,240,214,
+220,17,14,144,248,78,243,180,188,86,215,232,143,86,74,215,183,199,145,212,197,50,185,120,251,216,107,107,44,183,150,20,63,31,69,184,91,54,145,41,222,98,50,13,2,48,174,84,224,19,206,166,198,65,166,230,89,231,80,220,146,18,84,155,143,78,251,74,196,138,38,54,114,148,190,151,130,88,111,187,82,119,241,182,72,20,88,180,231,130,120,242,69,120,93,45,8,60,42,152,34,61,245,33,194,91,210,237,113,174,54,70,235,59,100,239,168,147,105,113,124,71,177,158,97,32,96,144,183,142,171,150,62,83,184,214,27,218,220,134,75,67,208,150,102,48,252,58,237,241,157,188,67,58,166,159,102,152,177,204,81,181,206,10,143,18,123,30,30,167,103,41,94,35,217,62,73,131,168,187,221,171,230,94,168,232,243,197,187,189,44,167,97,49,106,154,3,46,131,202,140,2,82,135,185,115,10,54,146,238,117,55,55,220,241,28,58,33,251,209,60,45,184,176,165,164,147,68,27,190,184,81,43,239,157,187,244,50,230,121,61,129,81,25,22,67,68,100,71,237,151,80,28,219,68,115,
+104,215,78,63,13,35,216,245,197,61,85,63,89,186,150,141,10,204,158,239,72,116,42,225,230,153,149,246,201,110,202,109,34,41,119,75,78,146,217,227,134,226,44,138,9,80,5,251,131,166,45,172,186,156,75,167,245,222,194,193,177,94,120,127,148,51,248,184,183,155,195,246,118,139,221,37,73,100,214,180,41,228,225,210,205,41,126,84,99,84,114,160,58,98,148,48,45,169,209,129,58,145,3,217,70,5,8,173,28,108,105,42,91,129,97,42,94,117,233,122,1,13,185,104,238,104,221,97,195,230,8,149,101,141,24,9,31,80,72,71,187,222,94,225,210,1,244,91,22,182,4,162,180,176,158,50,45,106,145,186,53,23,210,134,234,84,22,94,166,156,63,210,186,150,94,155,3,42,90,157,46,208,151,68,205,120,181,168,196,139,102,134,52,10,47,121,77,31,134,206,150,143,138,229,142,252,113,119,224,229,159,22,249,166,147,209,178,249,86,96,63,146,8,77,102,58,54,68,44,181,135,81,1,32,149,61,106,178,221,56,145,35,42,103,239,184,200,40,34,135,119,140,234,107,138,101,
+189,60,16,194,93,7,49,90,147,221,73,243,97,85,146,7,50,142,15,100,215,9,203,29,22,172,92,54,45,103,90,69,184,43,167,21,93,214,208,153,187,101,77,239,214,175,131,103,8,63,42,12,200,142,66,87,216,242,165,167,43,29,228,232,185,160,219,97,169,231,153,61,30,137,186,206,169,49,29,216,65,73,169,175,89,217,213,109,70,105,31,58,98,55,27,54,209,69,208,195,54,154,58,206,120,253,65,20,68,124,230,251,157,157,164,205,139,197,40,233,187,27,231,88,79,215,32,99,43,116,37,115,184,217,176,244,241,156,35,193,146,57,146,7,125,242,40,159,186,137,88,84,244,184,242,142,216,40,180,148,46,68,95,140,212,233,146,83,178,28,15,108,146,44,169,164,237,49,104,97,221,74,143,33,21,196,80,212,187,248,91,140,2,142,194,162,80,206,20,176,108,194,162,101,92,73,217,112,2,166,78,185,57,120,236,172,54,165,88,243,70,121,117,25,155,245,118,245,82,185,64,157,136,104,210,90,18,173,67,177,28,73,245,245,240,85,240,49,105,180,24,244,23,124,127,79,
+69,217,151,5,88,23,165,114,199,12,175,242,179,125,223,65,244,190,176,187,214,186,69,196,205,195,33,253,94,70,107,19,206,202,141,34,231,4,241,104,175,48,156,110,6,25,156,235,45,253,164,80,119,186,12,140,164,116,96,219,18,219,79,112,125,131,164,42,214,34,62,208,64,20,200,214,89,139,208,246,4,98,36,129,169,87,106,55,123,123,161,69,85,94,65,12,21,129,51,91,175,108,168,179,157,66,89,115,55,208,53,12,180,45,119,45,204,189,144,184,71,42,87,38,30,59,34,200,234,204,203,232,158,250,254,88,93,139,94,46,187,89,90,114,233,97,8,69,78,249,80,111,80,173,186,128,161,119,209,105,51,89,98,67,143,94,86,55,237,218,128,84,53,182,222,184,155,219,44,170,30,246,219,125,110,36,20,70,40,225,125,214,233,237,230,35,185,214,247,183,26,171,124,173,243,228,200,44,9,149,85,233,16,97,24,169,200,197,17,21,191,128,87,225,33,243,70,172,193,91,206,205,13,52,78,167,152,181,181,92,111,239,214,206,140,93,47,100,221,60,190,50,211,216,160,2,
+38,167,82,6,145,41,194,27,213,21,234,203,165,193,32,104,176,198,247,51,1,155,57,166,68,206,119,33,145,183,24,195,130,231,202,26,68,83,210,30,22,181,203,140,53,77,115,171,176,91,227,53,164,118,177,252,92,184,104,110,40,139,59,170,168,144,114,100,168,118,108,220,154,175,28,9,50,155,126,125,39,19,144,205,31,17,6,101,135,183,23,187,185,190,167,142,74,76,227,227,40,185,223,218,98,28,116,47,242,39,50,17,124,163,221,19,237,67,2,95,143,13,158,116,58,160,163,182,33,16,250,116,78,183,189,18,220,16,122,93,220,161,209,52,60,115,164,22,183,72,145,203,226,35,243,200,250,112,167,213,181,85,49,203,193,86,64,155,150,231,50,233,140,172,229,22,153,141,185,211,42,214,222,12,212,73,174,184,148,119,45,97,247,251,185,244,85,70,83,151,118,60,242,120,195,187,36,73,217,86,1,86,215,150,56,191,23,142,52,109,232,140,238,59,118,63,230,130,160,94,39,5,32,27,55,14,120,147,103,250,228,99,81,251,224,185,8,216,1,235,185,254,112,161,120,208,
+139,80,87,56,90,102,249,68,78,181,244,72,73,173,218,127,169,171,38,185,183,165,200,33,76,58,42,194,161,76,73,177,188,233,148,231,243,37,148,85,214,168,60,18,229,35,151,210,80,237,126,185,12,165,170,123,34,179,203,84,241,6,142,69,55,93,164,27,122,76,3,32,147,83,23,240,147,189,150,150,194,109,49,92,241,80,65,83,98,150,23,250,46,184,11,63,146,154,74,208,73,14,81,131,49,78,156,120,92,32,61,106,104,33,21,215,82,209,32,110,145,79,13,153,11,245,168,108,163,200,114,47,113,147,151,218,176,190,183,127,122,180,207,187,166,222,82,142,61,249,70,2,96,10,125,39,90,203,30,167,23,79,182,46,13,158,21,6,43,207,110,213,196,153,134,195,73,106,33,27,177,180,218,95,245,30,235,59,167,245,7,187,2,98,28,119,243,202,162,11,116,240,60,146,145,39,76,75,45,174,214,17,22,24,222,166,181,53,151,213,198,205,68,209,133,33,2,88,19,178,70,243,0,47,170,70,30,170,169,206,142,33,200,220,52,139,20,157,219,214,66,166,179,140,68,151,
+157,11,188,40,87,243,152,85,90,99,26,120,117,16,206,96,135,77,208,121,188,200,172,118,27,131,181,138,164,103,131,112,114,23,208,188,58,5,46,46,172,46,231,208,112,81,158,151,199,120,30,101,220,233,72,216,41,30,30,57,108,247,121,181,185,117,8,107,214,96,174,200,92,60,83,168,141,240,85,34,125,49,59,170,219,241,71,17,29,188,169,240,106,10,52,21,153,119,221,48,54,9,106,168,122,107,9,52,143,205,5,100,221,58,231,78,43,3,90,210,153,224,120,149,194,237,157,71,192,102,234,100,20,165,96,54,115,198,133,178,56,236,9,12,93,108,204,1,120,228,104,50,202,143,73,104,112,85,52,185,239,93,70,241,45,249,106,238,172,140,234,128,132,137,61,226,84,221,66,37,231,180,44,156,15,177,206,173,221,232,101,61,29,44,149,25,45,14,45,140,149,104,43,64,164,37,59,89,49,65,12,190,150,208,20,29,152,132,6,53,117,192,166,140,44,178,162,18,241,111,54,45,89,245,173,22,243,208,140,18,244,134,11,82,138,212,202,172,236,71,32,133,87,204,112,229,
+155,75,249,7,58,152,62,5,115,229,112,76,154,119,230,9,125,150,67,237,189,35,172,210,229,213,3,221,1,22,105,220,102,143,73,201,146,139,52,26,166,146,237,158,7,104,96,87,117,18,59,163,122,17,23,199,101,14,174,150,197,200,13,7,202,40,91,133,17,250,188,92,139,170,99,112,175,80,83,194,96,208,127,225,115,53,25,112,252,44,85,77,241,177,158,48,88,97,238,81,226,11,34,239,170,193,122,4,107,201,114,139,182,219,85,164,71,42,253,113,165,15,178,21,73,154,234,194,207,220,52,153,147,45,23,28,217,84,209,47,22,240,0,61,222,103,175,164,106,219,188,18,151,219,175,11,150,13,125,197,197,182,75,146,225,36,30,215,235,206,125,250,222,200,47,168,236,117,118,175,210,133,150,202,19,79,41,15,235,38,102,54,36,81,221,26,99,243,69,198,174,166,122,111,201,24,138,96,251,78,50,56,119,185,67,184,141,136,162,216,195,99,69,229,29,126,179,87,16,214,207,239,175,99,243,53,243,25,107,29,52,170,77,210,97,91,200,174,173,103,232,58,41,44,109,183,
+132,90,53,148,122,116,211,71,237,229,94,165,75,84,153,77,66,83,87,173,208,51,26,107,183,170,193,81,183,185,152,22,196,230,153,62,110,71,22,76,73,32,67,105,89,205,98,30,102,195,250,171,106,81,121,93,190,92,10,169,45,67,78,46,9,137,36,55,153,138,59,118,102,236,156,135,244,115,139,236,50,161,80,93,111,229,238,182,77,250,206,226,35,40,107,226,187,228,173,147,157,13,233,66,25,175,177,74,151,177,11,73,18,107,69,181,94,5,90,174,185,129,228,178,68,87,173,55,139,82,119,32,20,93,128,22,121,221,83,101,42,238,212,20,171,80,67,92,81,110,116,52,136,5,232,57,6,60,228,129,172,218,23,36,112,7,144,23,123,238,62,234,202,116,221,75,27,177,87,42,207,29,73,187,69,117,255,166,114,107,226,198,77,17,106,206,23,210,140,186,5,48,132,28,214,251,230,251,28,216,185,151,120,84,253,81,37,122,144,142,218,31,210,54,57,202,144,106,108,137,137,227,100,204,196,102,103,189,49,47,85,227,225,92,200,145,32,119,144,219,69,49,66,37,110,104,
+151,6,184,128,33,35,96,50,100,122,215,102,137,219,110,107,93,38,96,100,171,8,79,155,106,125,163,44,176,23,13,245,168,121,193,229,75,116,241,13,233,101,172,48,112,22,192,195,130,239,209,24,77,196,247,165,244,101,154,63,142,148,164,168,136,167,12,86,241,97,24,176,245,162,57,78,24,24,228,86,181,171,230,106,239,188,212,15,145,128,243,168,126,79,93,137,109,69,82,154,2,15,140,240,150,15,131,232,174,193,64,190,1,210,115,169,244,210,67,186,44,106,149,117,77,229,94,141,143,0,129,133,136,190,149,215,160,16,135,9,237,88,238,172,117,0,242,139,71,230,165,150,220,185,32,187,49,240,101,216,172,176,65,34,184,15,77,12,51,173,173,136,175,95,29,148,35,49,119,225,172,245,88,110,47,167,52,203,140,227,37,77,200,72,109,104,12,187,82,49,141,166,75,229,34,245,129,235,52,77,208,158,121,188,3,51,44,94,210,198,91,3,200,217,36,29,5,248,52,11,18,210,218,14,13,1,58,140,208,197,107,195,85,139,196,158,101,184,53,70,25,88,59,217,84,153,
+74,206,166,33,3,187,29,181,192,133,231,198,203,25,144,24,187,242,59,47,231,120,183,113,189,146,141,93,120,228,198,246,206,73,168,219,80,95,238,155,15,73,1,206,57,86,3,215,46,216,96,195,115,152,79,28,211,67,113,173,32,63,31,65,249,78,210,170,234,201,71,59,56,104,134,134,96,216,164,210,106,118,22,19,129,13,201,57,27,170,42,234,89,21,150,124,208,222,234,63,132,215,118,205,144,49,123,0,249,116,55,146,195,122,247,60,175,129,47,22,55,25,244,182,99,221,154,35,195,225,174,186,45,238,198,18,222,38,212,231,50,123,254,101,90,221,152,186,65,104,230,224,193,190,240,6,98,102,141,229,155,98,215,39,241,139,249,235,141,99,27,207,87,48,120,206,47,152,163,157,38,62,120,176,45,52,5,75,126,109,59,196,233,30,196,214,26,81,111,183,201,50,234,36,28,53,239,145,86,147,171,101,96,181,181,151,41,216,247,185,109,97,37,24,51,31,239,170,57,6,139,173,111,130,67,197,214,200,29,182,4,42,110,75,79,30,40,71,249,44,129,201,44,193,164,162,
+192,141,0,94,44,198,77,193,128,53,87,6,36,215,229,72,146,219,227,234,67,56,72,137,92,112,212,17,31,133,158,234,94,132,209,229,178,98,192,180,73,108,98,15,32,227,81,79,29,181,173,182,206,6,242,42,22,223,206,42,247,78,123,190,110,192,32,241,229,60,100,83,66,25,77,178,208,140,103,194,76,192,61,84,195,105,221,234,193,92,102,215,220,195,134,35,7,199,49,171,102,63,90,33,209,164,234,145,218,29,143,202,234,44,119,75,121,80,12,251,121,154,120,127,7,137,244,219,153,198,217,61,230,34,218,76,215,14,216,129,91,62,173,220,109,0,182,147,232,198,110,217,97,142,85,203,164,221,82,110,137,61,108,17,149,109,184,44,30,21,69,203,25,102,243,184,21,186,214,178,60,199,236,106,50,175,67,152,0,89,31,114,223,171,130,246,197,216,134,190,112,110,171,222,111,136,201,121,203,77,232,176,225,44,249,47,71,89,223,77,5,123,189,120,101,190,171,129,105,229,122,172,43,17,144,165,93,251,101,71,140,0,162,161,253,128,46,14,219,68,52,213,226,80,24,31,
+45,94,49,31,240,20,72,114,206,129,212,199,253,3,103,106,205,38,166,46,242,52,29,255,125,156,211,52,21,124,66,222,3,254,166,139,42,182,175,31,180,93,75,58,155,196,30,118,83,232,139,33,170,90,238,212,57,106,231,115,234,11,251,161,39,167,45,216,20,104,219,143,242,236,107,144,36,116,29,228,243,31,180,115,114,64,135,108,93,24,152,103,59,222,110,81,190,3,163,133,109,144,107,2,157,123,147,186,38,79,169,9,246,2,32,11,211,246,250,209,199,152,226,106,103,55,23,219,191,89,140,155,56,201,88,94,30,239,223,31,88,196,217,112,167,233,76,168,121,61,160,6,174,31,227,26,115,163,145,70,71,129,162,25,151,138,55,154,103,147,21,45,76,47,229,118,194,105,176,101,190,170,221,102,84,113,186,218,219,40,197,150,217,254,188,129,174,12,147,140,140,115,118,190,124,211,215,66,74,12,85,229,77,29,199,211,58,85,60,112,24,109,202,182,241,170,152,124,192,189,139,170,183,104,24,53,210,215,119,230,203,203,199,133,166,148,196,189,244,75,145,204,230,74,108,101,
+191,17,185,80,220,233,186,30,121,47,10,227,59,61,36,98,238,121,250,242,46,67,2,5,212,54,66,41,158,241,222,161,161,171,131,88,89,61,111,57,6,153,243,166,134,214,176,200,225,153,35,113,118,10,30,37,188,18,130,194,148,238,151,8,87,209,91,184,243,8,22,67,98,70,24,186,6,250,115,45,99,154,209,132,100,231,218,97,143,26,175,208,181,75,146,19,179,74,217,192,249,60,38,163,75,20,14,231,153,66,145,22,83,94,54,75,132,105,195,210,29,231,129,117,47,52,57,210,71,129,110,33,107,216,57,109,33,233,214,136,52,24,121,220,204,147,88,60,101,126,176,172,239,246,55,157,102,49,108,191,85,74,108,210,114,127,103,31,50,59,179,105,144,158,2,57,190,174,109,184,180,66,17,74,72,196,230,37,37,170,0,172,91,16,224,244,13,71,113,22,88,92,16,91,16,11,61,186,239,174,197,47,217,181,240,40,67,191,208,158,134,128,221,181,71,173,230,70,181,192,227,51,76,162,248,177,68,104,119,166,50,7,220,72,141,181,33,208,212,205,199,199,178,7,111,80,
+188,91,114,152,73,134,168,251,206,192,140,247,226,140,60,205,155,139,112,68,170,52,243,56,117,17,58,79,150,242,198,252,81,87,181,8,71,111,58,184,80,50,195,32,45,198,197,112,99,212,149,241,155,7,109,82,128,80,198,94,199,23,175,238,14,56,84,253,72,145,75,108,56,129,44,59,214,105,172,29,221,92,228,175,189,204,205,91,179,127,4,215,28,45,88,202,236,6,152,183,145,170,231,158,124,189,67,23,95,112,193,161,169,238,23,91,57,174,254,98,125,152,63,197,142,156,145,234,200,189,208,163,250,247,187,133,163,70,215,221,162,167,195,146,92,227,178,10,10,106,14,96,151,169,104,116,59,3,22,193,81,68,118,30,141,71,132,180,80,98,11,225,239,13,143,247,35,135,72,146,30,184,144,128,194,136,92,186,238,189,21,39,175,208,170,135,162,35,126,45,67,181,168,99,98,223,98,240,166,27,127,180,23,150,141,253,104,74,4,103,90,128,77,239,25,56,242,9,131,156,210,164,208,1,58,244,88,180,134,210,52,129,137,113,188,219,59,242,110,216,145,59,195,121,166,224,
+60,106,155,251,249,122,58,209,94,228,149,51,107,97,189,79,123,212,13,155,215,58,225,110,155,46,207,59,235,74,109,51,144,115,199,248,55,87,9,147,139,89,228,95,244,119,12,145,245,90,208,5,75,30,142,201,7,214,180,249,250,129,84,214,51,198,121,139,4,185,55,236,156,8,65,182,114,135,119,203,61,254,61,62,254,32,151,95,245,90,59,154,221,252,193,195,113,62,197,0,84,131,195,29,208,152,204,81,226,68,202,114,52,101,190,32,231,146,241,152,103,21,78,185,37,178,125,118,202,107,103,55,68,70,89,219,134,108,48,20,29,244,218,130,20,12,138,120,230,250,240,168,26,235,10,202,98,147,156,63,114,22,29,252,90,192,86,62,116,146,28,153,59,227,245,149,197,16,164,11,106,37,4,205,107,185,176,199,150,43,181,21,93,148,57,212,117,131,187,169,53,132,233,37,115,99,55,185,174,45,64,190,128,120,254,158,162,116,159,167,197,208,73,122,78,115,217,192,145,74,236,193,77,170,134,11,16,37,246,46,228,101,7,58,158,150,127,47,105,176,57,90,153,248,1,179,
+121,15,82,35,53,137,144,199,136,68,88,213,17,236,56,84,219,78,201,34,110,253,177,99,225,122,37,190,209,125,220,235,60,62,41,28,102,26,9,60,198,35,184,71,149,39,152,111,8,201,172,238,126,210,32,128,17,153,150,169,239,154,170,218,86,254,145,231,202,28,122,10,218,84,87,107,23,133,227,22,195,109,43,21,54,71,227,112,215,166,21,1,50,183,177,100,148,181,244,203,150,219,82,198,82,47,245,69,87,136,88,85,40,154,145,133,5,90,102,253,188,53,160,47,85,66,237,199,178,163,178,206,58,50,234,93,177,202,208,164,110,203,85,184,250,214,67,89,164,66,43,113,171,73,40,211,46,87,235,228,22,34,118,235,202,195,81,167,182,98,33,66,214,106,203,167,147,104,77,82,119,169,83,187,168,145,77,135,17,97,169,19,220,220,220,136,221,96,47,47,184,229,43,45,15,148,7,83,110,215,13,43,205,61,136,109,194,117,123,167,96,38,171,77,17,2,79,43,117,115,174,124,218,8,109,115,160,178,144,33,140,68,221,25,169,227,136,197,165,48,7,9,177,82,91,221,
+30,224,84,252,80,86,37,28,220,155,181,49,141,150,238,61,48,27,184,3,77,191,233,28,134,14,85,170,14,107,65,154,206,112,134,80,198,70,58,18,52,189,57,203,67,115,55,166,214,110,174,106,219,171,3,75,77,182,86,92,105,226,163,155,119,189,104,53,45,42,68,211,160,246,104,85,213,101,21,8,109,3,217,59,184,170,16,58,6,196,44,217,244,59,121,108,197,16,98,168,152,114,130,81,209,185,42,202,162,189,124,106,69,121,95,36,173,197,74,69,125,66,160,242,141,90,122,1,47,22,28,182,239,174,23,202,100,145,50,15,169,6,74,71,62,242,232,231,164,43,166,187,214,234,249,176,181,215,189,149,48,242,199,62,55,217,32,15,94,51,85,86,241,238,65,246,209,198,219,117,158,119,120,97,115,231,148,40,209,201,243,109,75,138,249,104,168,14,180,18,121,62,215,75,59,185,224,134,111,251,98,111,24,174,54,228,13,171,183,166,198,14,175,195,194,222,9,208,237,143,128,128,80,173,146,154,2,217,38,59,20,146,112,206,153,152,174,76,13,156,69,75,241,253,251,146,
+243,72,43,28,21,195,163,188,169,231,113,181,189,251,145,166,202,210,81,39,66,91,154,11,202,146,84,118,170,88,132,133,176,199,224,41,243,90,70,206,93,156,64,48,32,173,213,62,34,59,204,15,54,216,166,135,125,65,71,114,197,72,31,67,250,179,214,186,58,78,108,186,224,83,185,160,101,151,223,113,31,134,195,150,201,19,217,138,239,208,232,217,181,240,105,116,63,33,12,9,179,156,174,236,184,30,91,172,112,43,102,186,161,145,10,212,160,193,233,57,68,136,148,170,35,255,136,179,193,60,135,54,175,7,194,240,46,108,212,94,24,83,203,55,69,32,42,150,151,152,21,155,156,226,138,211,42,232,157,89,121,191,110,14,171,124,131,128,176,199,134,128,77,76,49,89,55,235,149,25,42,150,110,89,143,195,14,98,104,101,115,232,24,225,14,99,204,251,43,250,10,39,57,16,99,155,189,100,211,113,93,188,204,27,48,197,229,7,197,249,194,141,56,186,217,65,26,197,42,44,88,230,181,150,90,217,141,178,166,47,93,130,47,96,158,179,124,101,208,43,78,175,37,18,156,213,
+5,40,15,153,236,168,150,149,56,10,33,193,17,36,145,118,29,173,81,225,234,88,70,118,1,234,185,13,175,67,22,190,3,11,217,72,83,31,5,6,136,134,37,80,175,68,27,96,108,211,180,42,85,2,205,21,97,204,153,225,107,234,81,145,198,29,245,193,64,198,57,84,173,80,128,214,190,103,197,68,61,163,102,7,62,233,160,228,73,103,168,3,146,160,27,100,241,58,231,67,31,15,49,12,239,13,251,119,80,92,34,82,141,34,164,124,128,181,160,170,89,244,171,55,57,183,73,63,96,148,17,237,6,131,229,94,214,176,162,102,161,106,73,130,89,31,18,84,25,248,162,118,125,3,7,225,188,82,28,43,69,87,106,219,45,19,178,239,145,166,181,106,231,81,159,193,180,32,107,240,35,5,227,239,173,179,30,34,119,187,26,199,237,126,15,201,242,130,110,132,125,100,17,214,74,148,240,162,149,91,225,154,123,229,17,163,115,220,28,169,68,86,127,117,121,127,148,63,40,223,245,51,161,192,142,180,73,126,160,247,59,73,7,135,123,48,8,111,229,43,208,18,175,138,108,46,
+65,231,225,184,186,123,124,68,149,145,27,150,206,142,126,101,24,232,237,173,193,232,92,95,132,187,155,141,27,201,61,103,149,23,121,12,33,230,197,196,28,151,88,69,58,15,150,166,41,98,184,48,95,198,239,175,178,218,230,174,153,246,64,210,74,110,52,75,226,61,169,96,232,90,174,137,110,45,249,203,107,45,124,254,32,26,38,189,77,223,89,207,92,15,71,202,43,105,32,65,56,226,93,137,84,11,22,49,62,100,169,109,197,28,66,47,146,29,22,109,3,188,150,80,143,52,154,248,243,141,140,134,211,67,12,193,123,45,163,227,104,244,61,150,173,240,117,133,8,45,104,232,215,197,214,176,153,64,7,176,93,171,121,160,21,244,110,153,59,245,148,30,189,4,148,196,245,118,83,149,137,115,119,66,199,15,204,35,178,188,65,239,214,225,163,194,181,39,105,211,111,220,163,131,125,140,24,107,122,108,189,114,40,224,205,129,199,251,153,20,143,182,79,21,59,50,16,209,87,112,138,24,173,68,176,184,149,12,46,195,55,113,213,176,166,191,186,128,92,245,145,213,142,231,88,134,
+122,85,145,71,142,251,84,135,117,39,223,196,141,105,144,161,238,44,157,120,212,133,19,119,156,142,181,18,137,0,114,45,5,189,61,197,122,156,253,1,123,96,41,2,35,175,155,237,62,37,224,87,92,57,85,13,54,16,209,122,220,208,172,212,217,143,149,249,125,160,250,32,103,192,135,58,219,197,65,35,100,107,234,87,76,176,59,197,64,136,251,126,192,63,136,56,135,71,72,241,250,28,185,202,96,192,132,253,150,150,237,136,36,167,103,28,47,49,29,97,134,201,205,145,1,25,88,10,55,203,174,91,207,145,39,154,97,168,157,156,5,234,200,163,208,176,67,231,57,37,62,205,106,178,1,156,1,37,133,45,75,135,28,0,246,206,215,230,9,57,77,113,204,227,175,34,61,5,120,196,42,218,17,206,200,179,181,185,94,240,43,161,205,1,135,193,67,114,132,190,225,188,191,214,208,158,25,149,232,93,163,86,220,196,182,219,80,113,81,126,99,239,5,202,56,85,116,171,131,82,64,129,127,168,57,108,138,19,124,180,211,56,130,156,102,189,84,126,83,40,10,68,68,125,53,74,
+43,157,7,162,210,174,181,176,95,149,238,154,131,22,219,97,35,237,18,36,111,186,119,190,179,126,242,90,239,126,136,244,142,42,153,125,200,167,246,119,47,70,109,74,44,38,96,93,108,88,57,181,162,45,7,52,28,1,36,72,229,186,181,123,190,99,69,39,116,235,73,235,97,182,190,19,78,159,59,233,44,38,153,108,84,84,214,142,211,67,248,72,146,235,5,153,209,51,111,225,166,124,150,98,213,2,245,81,144,36,181,106,26,153,97,59,121,34,199,179,206,55,11,220,158,119,212,193,5,170,174,32,99,217,191,155,56,61,166,109,176,188,59,215,171,229,136,154,209,124,112,54,246,99,249,181,115,110,88,85,95,83,181,81,113,141,245,122,169,253,253,162,197,56,176,64,243,100,36,169,209,101,161,98,26,183,89,143,84,205,61,17,52,234,157,133,36,60,228,90,29,43,152,86,24,90,141,112,23,58,62,103,10,84,17,10,40,89,30,174,159,137,32,12,176,146,86,177,52,140,7,91,78,230,75,117,187,101,94,74,24,10,234,117,107,186,48,13,57,45,45,74,206,54,19,231,
+107,186,135,78,23,89,198,169,163,172,91,33,211,99,167,69,112,188,149,152,183,123,115,83,20,222,42,160,100,38,216,100,15,27,29,111,73,229,161,186,165,102,224,88,128,202,126,58,224,237,219,7,244,120,225,106,135,125,220,131,248,80,253,168,206,188,79,159,136,186,164,162,176,20,41,43,53,28,130,53,69,168,147,71,75,120,120,91,6,129,165,204,224,142,5,47,202,110,89,245,211,238,189,37,206,61,204,215,73,244,166,202,169,18,63,36,247,247,89,15,242,99,90,64,147,63,115,84,215,99,238,21,147,50,144,240,243,105,3,3,67,148,107,220,117,58,69,173,143,107,138,11,45,62,99,182,237,222,217,133,92,135,158,61,8,73,60,34,166,243,200,130,218,124,93,60,62,216,54,102,120,16,144,24,216,118,248,227,200,181,192,10,199,195,30,53,37,107,157,206,1,23,88,100,34,161,110,231,186,164,157,3,12,42,223,221,250,222,173,89,17,211,39,163,8,174,106,181,66,130,71,113,88,51,236,157,226,72,28,166,28,126,204,30,144,46,234,177,80,40,117,43,72,218,207,203,
+123,108,67,41,88,80,108,56,87,157,153,37,28,33,181,8,195,214,99,93,251,212,46,172,208,44,217,173,168,53,167,211,87,151,122,187,146,232,138,200,229,171,119,10,151,252,114,132,218,37,105,173,1,137,58,216,190,178,11,165,58,67,43,72,172,173,14,246,90,240,21,175,142,84,29,150,139,164,187,110,106,166,44,184,164,185,216,163,166,192,34,111,215,156,173,29,48,216,203,228,97,21,227,141,243,168,195,185,106,234,152,211,176,232,146,61,30,55,100,75,243,132,2,88,223,114,95,6,1,27,51,146,11,162,215,25,175,73,112,222,64,135,140,60,199,166,201,176,20,81,89,248,130,166,188,23,68,151,97,190,222,108,15,171,32,136,94,238,75,36,241,92,127,109,96,194,210,82,233,197,211,253,16,176,4,204,185,30,60,172,52,53,31,93,222,238,212,188,144,250,92,97,160,49,149,13,178,131,134,52,101,220,71,71,0,235,27,165,6,23,38,58,247,58,67,43,242,90,157,229,170,95,82,214,234,27,29,97,144,30,199,83,121,205,112,61,127,199,219,167,98,187,70,95,148,223,
+10,52,77,244,132,191,105,25,57,88,53,43,93,208,149,234,171,151,165,40,79,10,59,139,56,4,222,110,52,245,13,66,120,161,24,151,247,123,229,200,6,215,148,59,193,11,227,131,236,62,5,11,103,115,221,164,74,200,57,218,46,33,66,122,176,179,255,32,90,28,29,23,79,156,241,107,159,233,174,44,172,183,71,46,66,209,205,62,28,245,226,171,229,154,83,65,80,226,51,220,112,175,35,52,6,121,176,245,10,57,55,71,129,80,220,93,182,11,183,132,10,18,195,17,137,42,44,42,246,240,33,180,66,67,106,50,85,124,111,89,122,195,115,82,251,158,238,109,238,49,119,190,106,50,197,13,219,15,29,55,115,196,181,28,38,253,64,68,28,11,175,233,172,153,139,7,84,212,7,215,143,100,19,105,109,239,240,234,14,108,248,155,121,184,74,191,187,101,121,204,254,240,190,186,116,82,196,197,239,186,134,237,64,81,168,246,14,98,18,211,40,129,89,208,246,79,92,165,162,225,33,35,185,247,193,177,46,199,24,174,176,21,66,19,192,174,241,50,172,38,79,169,218,16,7,213,
+205,230,77,124,211,220,92,208,152,58,72,95,183,68,217,198,143,118,118,15,2,5,81,219,186,76,61,191,63,47,106,200,220,238,208,32,112,244,227,192,238,92,107,95,238,217,63,215,34,76,62,107,151,233,174,53,253,8,208,176,121,15,187,104,61,69,61,150,208,104,183,185,40,147,235,234,107,121,102,51,185,83,183,39,119,32,97,177,11,220,90,0,50,227,108,14,12,205,71,86,96,100,95,81,47,238,230,238,249,41,198,138,235,230,186,26,37,154,136,253,237,37,10,175,30,91,218,219,14,47,62,104,215,106,216,199,122,4,241,62,218,112,162,162,183,131,40,91,103,64,118,21,60,29,25,250,163,98,186,0,50,120,17,166,102,24,224,61,56,83,215,8,224,115,155,4,89,18,226,218,100,72,48,11,12,131,57,105,197,17,210,107,200,163,109,173,115,212,181,174,157,16,30,15,143,140,67,234,85,55,253,200,183,240,142,202,154,244,29,67,29,213,175,68,180,251,233,128,26,51,254,143,35,86,58,37,107,81,93,37,61,27,137,3,58,133,51,196,19,76,59,232,235,203,131,249,
+121,120,29,103,93,219,163,213,79,128,241,255,191,200,82,186,15,117,61,50,164,64,107,70,92,143,109,77,175,237,29,108,156,0,199,87,125,95,116,219,38,37,227,224,101,211,249,220,220,156,72,185,77,55,109,246,111,3,81,151,180,61,108,193,221,225,60,156,156,3,27,236,147,164,223,174,192,116,219,160,108,190,158,103,94,95,155,121,23,164,165,57,171,228,102,89,30,194,102,213,238,208,9,32,182,7,0,155,188,210,116,48,177,216,135,71,69,146,217,187,178,203,186,243,166,115,98,22,4,212,151,8,216,137,50,53,109,82,154,79,47,45,156,177,122,12,151,72,189,210,149,168,149,247,9,80,98,173,53,111,98,210,109,9,29,134,116,187,59,216,174,131,68,179,203,160,238,188,63,3,194,84,71,0,32,18,16,233,5,179,173,42,107,73,103,198,78,13,131,94,230,59,126,100,85,40,141,51,201,121,182,41,237,187,178,207,3,252,40,141,107,27,127,63,135,182,114,156,85,135,150,26,17,69,106,13,174,165,181,89,245,6,120,131,80,73,112,237,58,23,78,174,71,227,128,232,
+84,158,142,104,36,52,233,210,21,160,235,123,112,213,46,137,182,98,218,148,215,61,236,33,181,46,86,222,193,27,92,37,22,200,156,172,67,45,149,47,176,117,188,220,94,46,90,220,250,36,28,106,239,27,77,196,157,104,45,118,139,101,39,3,229,57,249,102,129,196,216,151,215,105,61,94,194,116,194,169,165,250,144,136,43,56,1,20,59,117,147,32,23,200,187,142,54,217,131,221,252,134,168,66,139,144,49,199,146,14,47,37,7,121,43,167,180,107,132,178,184,24,186,97,101,185,189,104,138,206,146,227,73,124,190,195,72,91,9,101,165,170,227,237,190,67,35,177,222,62,158,97,111,187,30,205,242,94,199,128,235,108,93,182,44,138,19,49,124,110,111,41,231,235,76,73,117,27,82,50,42,157,134,155,42,50,7,165,238,253,132,0,170,100,132,53,163,105,33,117,170,238,224,59,251,94,76,92,182,176,153,212,220,0,36,74,172,96,40,227,247,157,225,134,161,206,156,203,22,212,33,156,4,154,47,132,218,224,214,190,59,165,178,80,148,219,204,132,195,26,3,206,185,13,39,203,
+109,231,180,76,251,199,196,88,13,212,121,47,179,160,240,120,57,246,208,224,94,160,243,188,8,74,223,159,244,12,59,91,88,52,177,198,88,182,177,124,102,191,47,43,150,169,93,26,2,26,8,7,10,11,99,67,154,90,160,235,243,15,224,193,118,165,165,184,245,31,164,116,26,217,176,0,10,150,99,203,143,77,176,20,219,205,158,222,246,207,20,139,93,18,76,227,35,160,228,146,235,31,165,86,150,76,202,134,50,127,180,114,75,112,95,26,10,237,7,239,101,26,81,237,123,171,61,93,83,22,124,136,53,100,217,40,165,234,226,15,109,218,54,11,107,227,215,43,33,53,214,149,5,91,180,196,106,93,199,148,160,99,255,138,222,157,114,110,237,172,164,68,244,157,37,35,76,151,134,175,149,0,73,221,14,72,123,18,124,147,47,49,107,205,248,222,2,196,135,79,175,211,203,222,60,140,103,52,247,9,161,75,205,249,145,76,156,222,213,66,64,152,216,80,240,77,229,206,226,35,182,86,177,178,220,231,52,187,203,206,70,185,148,122,176,2,209,234,48,141,63,60,1,194,50,144,
+58,36,52,119,151,66,39,44,108,103,109,53,25,169,236,172,15,175,206,234,138,133,147,30,154,118,226,168,37,150,94,215,65,201,6,91,228,200,206,15,3,241,222,118,14,186,225,135,144,69,10,2,44,71,0,123,38,116,120,215,197,119,231,20,208,106,111,82,86,96,85,230,71,10,214,27,137,198,148,77,220,240,181,48,126,89,161,211,177,163,143,91,149,155,222,54,116,179,174,191,1,36,155,22,194,217,17,181,108,185,51,67,58,215,92,7,86,79,240,155,111,116,155,44,95,97,119,221,30,5,182,202,30,240,92,68,35,208,221,146,150,216,228,71,164,75,116,41,68,97,148,249,235,209,201,167,224,97,94,105,164,164,131,55,120,38,49,98,21,118,224,74,144,232,193,161,212,247,3,18,76,165,185,156,238,157,209,128,211,66,208,102,98,110,58,250,0,122,53,22,68,81,235,243,38,241,245,214,196,46,35,105,87,137,175,30,221,144,184,108,134,226,180,101,86,10,53,114,208,52,137,115,42,65,39,132,104,54,176,243,145,101,102,223,166,88,145,108,73,175,110,210,214,221,14,165,
+0,237,82,105,82,63,186,9,221,67,175,16,237,107,40,158,145,19,128,120,142,186,148,44,131,224,129,106,165,246,112,230,223,235,202,206,59,167,48,99,191,178,208,37,153,105,254,137,71,252,116,175,177,73,188,21,59,110,206,101,245,136,187,22,52,85,187,98,239,9,16,83,156,74,161,230,190,164,172,10,72,84,41,96,216,98,227,229,249,230,174,252,54,21,43,62,110,82,142,68,57,177,136,216,238,225,23,107,38,61,49,197,164,135,227,161,199,7,40,103,190,132,240,45,128,120,2,148,21,24,25,180,139,201,42,64,16,29,125,46,131,183,132,160,0,182,147,86,183,192,142,207,35,141,83,37,19,52,26,155,188,46,243,232,160,145,63,147,4,237,97,112,101,27,74,167,90,178,29,180,182,169,167,34,147,146,149,144,183,229,165,219,254,74,254,130,52,129,119,219,179,208,145,233,184,41,115,178,59,127,149,54,67,184,197,212,109,107,149,139,174,47,236,220,154,244,107,91,144,62,74,130,226,107,65,137,7,240,64,76,170,221,8,13,48,29,84,96,211,196,30,200,69,97,57,227,
+182,154,206,218,46,159,90,72,221,153,186,68,201,157,35,176,2,1,222,71,65,106,123,177,237,24,21,231,151,224,164,125,8,172,178,32,25,232,144,248,236,0,30,62,77,19,37,172,114,206,114,119,170,215,205,41,216,208,152,80,59,103,62,83,68,127,180,118,25,220,10,95,220,6,115,206,178,42,233,214,144,200,230,78,4,145,20,140,3,140,201,116,62,191,98,138,96,229,158,85,218,125,94,29,72,50,169,183,93,103,158,6,41,87,27,115,244,69,148,89,99,82,160,25,0,199,48,144,176,91,140,50,56,230,225,188,194,36,70,153,240,80,92,52,67,152,181,2,184,65,36,156,143,64,81,254,80,27,151,52,199,146,231,56,132,173,123,212,188,153,3,21,36,120,101,251,148,213,133,200,91,228,188,74,237,77,154,161,226,60,92,72,226,235,98,1,158,201,40,171,165,219,208,220,29,105,242,54,137,175,161,111,59,172,50,88,151,87,192,150,195,213,89,60,208,10,144,10,68,144,214,6,70,68,116,136,69,35,101,228,237,184,183,56,157,112,128,60,197,215,129,83,62,182,221,88,
+140,21,211,146,68,130,118,71,35,74,220,189,242,163,152,182,254,214,223,117,251,14,204,40,199,241,229,72,142,211,56,13,111,145,34,7,133,62,96,36,154,65,108,103,181,219,216,177,88,22,34,136,58,155,238,85,27,178,133,195,109,104,75,128,114,221,113,159,233,121,82,224,157,122,123,43,16,76,145,68,91,181,1,47,112,122,200,71,205,215,64,19,145,43,215,156,0,34,5,154,80,166,116,157,179,5,149,12,212,150,52,211,48,227,240,64,126,135,44,56,172,153,148,229,67,106,57,163,214,169,56,112,62,136,169,166,131,89,161,8,154,139,21,78,141,201,163,1,226,172,43,220,67,185,252,220,188,180,148,85,159,135,14,80,65,197,199,47,246,49,37,44,77,116,25,234,3,11,153,199,35,140,190,201,190,137,187,247,171,238,91,155,167,158,63,11,5,237,85,53,54,11,178,92,147,93,33,156,71,14,217,106,148,13,163,156,203,208,166,226,135,76,208,82,168,105,226,200,234,118,87,29,137,159,220,117,76,193,240,162,150,122,130,113,24,55,31,80,60,34,66,119,203,41,193,249,
+17,145,244,32,111,98,202,46,54,115,156,147,62,160,192,109,212,76,121,50,218,74,92,59,232,40,170,9,2,36,119,203,5,167,59,221,0,141,74,85,163,140,131,183,48,188,58,196,205,178,39,237,148,127,125,111,34,150,12,174,135,134,81,92,146,29,88,113,245,182,2,151,4,154,219,203,186,36,222,6,100,100,158,60,123,88,95,237,166,104,2,87,158,214,113,186,250,64,75,142,244,58,89,53,105,225,174,0,114,235,21,209,184,225,42,47,219,149,181,240,133,101,158,104,237,217,239,183,48,203,182,136,124,220,77,250,121,240,161,122,51,7,163,78,232,152,174,195,49,165,108,192,88,29,55,104,169,76,143,20,141,63,144,50,24,95,43,178,86,191,41,16,29,227,244,102,12,203,182,19,138,63,211,19,144,42,84,97,40,121,159,55,19,178,102,8,198,15,83,113,123,45,120,165,240,234,217,19,1,27,136,29,217,154,137,120,1,128,210,37,176,189,229,147,239,48,203,52,136,4,201,45,190,179,252,35,230,13,47,249,62,83,75,172,243,72,10,38,39,182,106,118,22,196,103,138,
+193,154,4,93,10,110,6,12,198,205,45,223,186,181,116,191,155,13,170,182,175,160,155,171,53,83,126,4,239,56,57,168,249,212,53,41,43,79,23,89,102,202,238,30,34,98,84,184,218,37,71,166,15,96,170,43,240,178,185,184,168,43,156,183,73,72,119,201,10,52,20,59,163,46,216,192,27,55,228,124,95,139,153,165,145,98,217,124,40,42,63,211,136,128,53,220,182,207,133,178,199,133,151,93,46,103,193,232,101,148,221,141,224,35,88,148,145,89,97,205,228,212,41,90,21,48,208,88,192,40,119,124,228,154,169,234,196,123,142,147,101,162,9,213,23,247,154,70,141,69,75,54,17,51,45,176,214,188,6,184,83,117,226,202,27,118,210,112,75,106,189,109,229,136,139,75,99,47,87,75,4,247,233,110,86,39,58,184,158,87,62,116,204,80,167,177,90,3,201,173,195,251,150,108,101,19,173,95,12,185,193,178,33,148,11,92,235,90,82,110,123,141,247,87,70,137,8,31,167,3,198,59,60,17,115,144,233,185,73,49,0,3,99,41,224,67,6,133,121,121,77,31,62,45,92,128,
+208,149,61,11,66,182,165,46,169,137,202,9,152,150,3,7,240,128,181,46,170,23,141,206,202,206,86,153,214,81,57,109,18,234,109,179,120,42,222,27,172,25,118,152,177,50,40,64,24,38,228,114,144,234,68,143,116,128,42,43,93,101,149,187,56,90,120,96,159,67,249,24,217,1,37,101,187,252,192,188,29,92,210,174,106,253,87,135,24,251,60,170,68,43,252,46,74,128,91,164,206,90,71,59,207,101,212,23,150,104,217,97,171,96,111,189,99,82,66,219,7,178,19,95,247,98,205,52,178,5,44,151,144,225,118,59,134,38,127,217,150,199,48,9,185,4,170,157,229,157,138,105,110,247,180,44,191,93,144,239,4,37,252,22,249,152,43,193,184,119,49,107,149,30,178,153,99,13,213,89,245,132,169,123,245,202,152,169,219,135,103,143,21,221,66,118,144,173,108,109,249,17,247,156,30,6,113,53,211,249,26,228,158,54,88,245,28,12,158,165,58,240,129,245,140,10,245,1,93,248,4,51,135,50,89,225,135,21,73,47,255,160,32,238,3,4,111,38,181,109,12,84,217,101,48,26,
+92,32,228,128,229,133,185,197,194,249,28,202,75,107,192,135,68,206,238,125,86,32,142,223,71,133,227,20,232,227,249,62,52,181,155,247,20,220,226,120,137,123,220,124,29,195,116,31,77,222,17,124,94,140,10,140,50,131,115,55,28,161,43,248,245,14,108,74,163,181,182,53,228,184,22,110,37,143,26,147,252,36,57,173,23,76,208,215,18,135,195,45,92,115,177,138,51,199,37,198,53,24,91,151,119,245,115,232,152,33,29,187,108,179,118,224,206,238,161,234,26,191,54,199,70,153,33,201,129,61,44,84,138,112,253,183,199,89,100,238,4,59,61,7,15,102,122,120,120,87,112,65,232,192,131,134,88,151,163,225,225,26,22,205,143,28,157,182,238,104,78,163,46,87,69,85,247,88,44,200,142,2,161,71,51,164,200,170,243,104,164,180,203,46,200,67,117,234,161,105,5,220,116,245,29,45,32,151,111,110,84,45,113,151,4,41,174,180,172,217,246,100,25,120,71,169,179,249,125,66,71,130,81,33,61,250,69,124,145,58,135,178,184,115,140,242,204,127,41,65,119,52,45,113,9,255,
+72,86,211,145,200,190,51,216,176,205,150,84,121,232,182,88,137,170,116,217,247,205,156,115,228,145,188,185,77,168,247,153,146,235,43,137,245,248,84,231,70,226,229,195,56,21,89,185,234,153,161,187,113,175,182,137,76,105,93,212,147,124,220,24,42,164,56,75,14,64,19,55,146,62,6,17,200,90,191,112,26,48,123,225,37,211,81,226,84,191,133,81,64,195,201,60,38,131,86,209,217,0,188,27,28,121,108,125,200,211,147,148,118,101,231,72,188,7,158,86,128,169,224,229,150,147,118,93,183,113,74,175,111,55,171,110,206,173,152,189,202,215,233,164,166,55,248,226,90,99,146,160,28,137,152,166,47,228,123,188,154,41,13,114,160,172,33,123,112,135,202,98,54,212,31,19,69,114,208,32,98,214,187,125,23,208,12,192,27,188,236,13,184,62,150,155,133,12,46,62,50,93,88,22,41,24,20,236,109,72,77,37,12,204,144,77,117,186,182,192,58,86,184,207,47,232,171,53,84,198,123,194,133,19,109,122,39,187,141,117,76,151,17,118,234,232,140,229,245,41,239,232,245,205,5,238,
+201,252,10,112,236,109,229,129,44,229,17,118,30,35,42,114,136,204,80,65,229,96,237,110,149,192,230,194,219,80,97,194,175,189,26,58,38,173,145,47,221,206,251,196,130,245,112,156,64,16,246,223,53,4,65,131,20,195,114,71,205,139,59,132,186,24,29,203,104,66,191,132,121,166,136,75,150,203,199,152,44,109,55,195,164,62,232,226,146,90,24,103,37,212,154,114,180,163,154,136,187,103,104,1,7,38,222,116,209,121,11,66,96,34,198,36,79,60,172,44,161,68,203,169,233,71,109,238,67,108,125,211,114,213,184,143,225,110,186,180,73,189,16,225,104,11,15,47,219,128,107,212,147,72,45,20,61,9,35,67,71,197,188,13,245,172,187,78,147,210,1,177,187,52,116,82,101,211,164,38,57,22,94,150,123,81,57,103,246,249,98,237,28,204,32,207,179,65,212,22,100,45,206,187,86,57,251,225,8,75,167,152,131,39,138,190,136,170,108,30,216,215,73,20,41,83,94,122,118,112,195,228,160,128,136,59,89,248,128,110,98,178,177,226,179,71,234,9,225,141,191,214,62,224,86,224,
+38,29,113,111,2,167,213,215,67,213,164,191,103,105,46,156,76,11,98,219,125,73,183,29,54,209,70,175,215,161,87,222,188,6,131,230,121,197,52,39,203,226,80,107,58,29,142,109,67,199,154,58,102,11,93,235,110,49,109,243,147,167,46,72,218,232,163,102,9,125,28,71,237,151,204,233,249,166,241,101,0,244,35,17,235,18,218,175,110,231,48,240,238,66,23,127,34,156,239,15,107,91,93,217,138,252,10,221,189,235,71,192,235,19,96,14,61,59,54,110,78,173,252,161,110,88,22,222,183,57,205,235,12,7,222,56,38,50,118,73,186,77,114,3,200,58,87,235,196,57,116,46,94,205,83,120,104,101,39,180,13,34,37,156,85,171,240,42,204,26,14,61,88,41,68,195,113,248,250,29,32,33,235,162,115,222,142,18,16,172,97,77,24,211,246,6,154,209,135,12,214,12,205,117,213,58,122,116,209,164,230,67,133,121,42,60,239,39,100,65,79,170,170,138,35,135,38,162,76,66,112,206,111,101,105,161,57,14,202,230,189,122,167,131,222,165,37,119,172,29,151,89,134,69,91,241,
+246,36,202,141,3,19,58,52,115,193,238,80,185,239,8,199,135,137,67,15,176,182,52,143,158,181,51,62,236,48,142,4,86,230,39,39,179,65,207,184,28,113,254,113,208,103,93,251,92,121,149,78,68,177,197,76,225,235,94,131,27,168,18,159,0,145,185,41,176,75,186,41,176,135,152,41,176,111,215,113,81,173,243,181,136,134,84,134,151,165,161,190,69,80,231,118,208,185,48,230,43,242,161,62,214,164,199,76,2,60,91,69,57,43,57,147,250,193,172,122,52,70,180,137,155,180,251,214,80,236,223,215,153,91,87,126,28,194,213,175,25,252,135,104,114,198,21,193,28,142,167,255,30,231,42,63,160,38,72,75,89,41,109,26,120,200,82,51,117,93,251,141,29,230,185,0,163,245,75,206,208,229,60,251,245,6,208,119,183,242,178,69,152,186,188,52,78,196,97,184,222,229,230,26,185,44,93,125,56,238,148,101,202,113,61,114,130,186,252,56,129,201,159,217,235,169,31,110,9,166,77,229,218,196,109,216,3,238,17,59,48,105,168,162,227,240,25,3,124,225,227,67,75,115,255,4,
+110,107,99,220,208,148,98,209,25,76,129,38,120,111,242,52,15,83,147,19,251,227,249,24,29,171,222,175,195,91,199,211,94,23,127,54,121,18,181,209,190,180,61,6,162,149,197,241,224,10,203,198,195,243,239,106,166,133,19,230,35,137,41,167,207,119,151,166,219,68,180,118,31,152,159,11,212,182,113,211,131,46,213,87,15,102,40,195,223,64,52,53,43,28,108,11,17,67,100,222,139,6,54,205,63,141,134,194,70,147,32,34,49,195,116,42,197,188,123,111,39,165,123,169,88,90,190,191,211,105,18,219,168,221,226,36,173,68,55,189,229,52,144,208,203,200,254,148,190,249,222,206,37,58,159,71,253,7,8,117,66,252,222,100,85,203,25,52,112,192,160,145,120,226,196,79,23,162,21,232,69,171,53,122,236,174,61,192,4,213,188,196,228,156,55,161,185,30,235,211,1,218,240,150,206,24,248,113,161,193,104,50,9,9,75,46,64,70,141,160,91,235,99,35,59,109,220,78,221,63,177,240,198,15,228,128,118,54,254,216,171,159,124,108,191,199,173,77,182,163,231,138,9,232,216,193,
+191,247,79,137,49,125,242,75,182,166,52,81,104,189,45,39,118,135,254,14,231,115,209,57,90,126,39,0,72,121,87,183,120,78,89,125,69,238,10,25,70,153,110,185,138,119,117,37,237,16,249,84,53,61,208,49,185,109,164,196,215,225,219,211,104,40,91,92,77,48,186,10,252,187,60,21,170,125,32,97,233,230,41,158,22,149,210,72,46,215,41,83,152,2,189,27,148,228,141,60,38,214,57,11,135,200,178,119,188,77,160,167,145,154,77,167,64,226,214,12,11,243,48,113,90,198,196,170,33,46,241,1,152,168,195,152,34,153,225,74,211,154,199,76,60,206,142,141,244,1,138,179,75,11,135,194,30,243,222,208,56,33,154,2,221,68,229,149,105,212,41,44,39,38,148,79,188,58,249,29,14,82,130,96,111,25,197,225,102,242,68,168,227,152,211,130,220,70,147,125,139,246,194,159,226,245,102,29,122,127,27,63,205,233,155,99,103,81,9,151,37,48,202,238,187,60,240,125,248,150,216,188,124,61,215,189,156,194,233,80,219,208,1,234,162,44,80,29,231,85,244,51,244,86,247,70,
+15,209,137,163,131,206,149,34,186,19,151,105,205,117,246,113,219,245,137,253,35,212,190,17,237,187,101,191,228,94,33,166,50,49,139,83,157,152,190,118,26,135,58,119,80,130,78,132,224,21,118,76,23,63,132,138,223,189,25,2,164,39,164,97,88,162,90,125,88,162,191,211,17,116,190,178,119,153,234,114,109,101,197,39,134,107,115,99,32,2,40,248,148,110,31,96,25,85,145,221,6,24,183,206,159,87,42,186,252,246,220,84,230,55,196,104,1,224,29,181,149,183,124,134,3,143,188,250,98,180,230,36,79,95,212,243,129,71,66,110,27,2,251,83,251,65,9,122,243,70,75,49,63,13,75,188,39,192,91,116,43,85,242,219,253,187,227,111,15,160,37,237,152,166,253,145,209,129,55,164,163,45,22,147,227,206,16,162,6,92,120,42,31,224,249,88,62,142,101,135,229,245,43,73,91,164,164,4,118,235,147,35,211,227,38,120,229,107,221,59,165,247,102,162,41,173,36,77,55,240,192,61,116,222,100,74,213,166,174,164,131,212,34,245,59,249,101,129,168,29,158,84,230,38,188,40,
+160,216,71,209,74,172,7,189,0,209,238,114,30,83,183,164,10,167,212,29,112,207,77,116,200,8,122,198,115,125,35,227,101,109,192,120,112,75,158,209,25,67,125,222,254,181,96,26,72,103,114,157,167,229,150,110,119,93,38,162,55,66,224,67,157,113,38,90,152,125,168,65,176,241,195,16,38,120,128,206,175,64,131,15,25,209,202,229,76,101,218,36,65,199,189,140,199,145,231,94,101,193,70,115,123,245,45,46,183,2,180,33,230,139,86,130,153,175,139,210,160,13,155,214,29,245,167,83,91,88,176,62,233,155,124,148,44,87,104,34,241,107,153,119,253,183,191,55,90,17,77,101,19,220,246,28,242,99,168,134,58,167,245,176,45,130,182,48,227,4,240,80,171,119,137,199,119,235,246,198,98,251,126,93,53,160,137,75,164,210,213,119,245,37,28,143,29,236,141,83,9,144,159,27,239,151,175,152,54,19,218,197,101,179,15,253,160,58,7,91,193,249,9,126,126,116,250,65,39,54,172,164,214,115,121,79,123,124,119,70,157,222,232,210,231,231,5,181,197,183,254,142,23,148,108,9,
+8,219,209,154,130,146,76,67,129,182,228,237,197,183,58,59,25,248,186,98,109,31,175,221,103,97,130,214,41,238,109,208,115,138,14,192,151,154,48,0,187,156,232,124,160,251,209,124,240,80,22,64,82,38,198,58,247,182,127,123,199,171,239,142,215,105,45,134,228,6,208,245,82,104,47,27,19,128,57,229,55,137,96,57,6,83,192,42,139,187,154,169,122,169,214,185,183,243,10,121,99,156,94,39,41,48,41,135,53,36,165,54,213,35,219,196,132,92,56,224,67,143,239,240,33,94,162,115,115,86,125,187,125,242,134,255,187,59,126,201,184,132,52,211,118,121,64,149,175,98,209,229,243,118,255,180,145,237,33,211,70,86,153,60,73,72,235,93,100,107,19,21,132,194,4,221,138,87,214,98,118,115,170,58,113,105,238,224,124,44,128,53,184,3,199,132,224,61,81,115,160,125,167,27,21,111,107,228,12,74,30,18,48,19,52,230,187,99,225,151,143,233,67,45,247,99,128,219,84,13,157,25,21,186,86,170,141,236,46,190,213,33,238,120,19,51,75,50,169,214,43,9,119,134,18,4,
+200,220,49,114,161,177,236,216,13,232,189,100,165,198,135,4,254,54,186,220,26,64,244,181,201,173,12,191,175,111,103,122,52,170,160,191,227,65,113,240,175,156,116,208,34,52,162,141,242,76,158,152,188,168,158,76,95,20,171,94,30,67,109,151,72,133,230,88,136,252,118,78,194,213,92,232,120,56,70,208,51,65,99,24,88,227,117,73,99,72,89,83,120,4,203,123,88,216,134,234,61,110,170,247,68,151,9,51,134,203,95,157,160,155,72,92,30,78,5,169,49,55,189,120,190,157,23,24,224,94,185,102,194,52,68,19,90,104,224,36,121,14,94,118,195,233,235,30,126,66,76,120,50,214,21,205,68,104,123,245,29,110,232,108,93,139,144,116,172,7,117,249,82,252,160,73,68,140,215,4,206,58,125,156,114,221,56,121,217,116,79,175,110,39,198,163,163,4,157,29,85,152,203,205,183,250,34,216,211,163,108,49,19,23,246,27,249,152,255,118,227,250,114,82,62,126,21,90,180,218,184,100,189,123,9,44,100,18,135,90,138,160,206,68,199,196,57,100,18,159,190,179,0,147,182,187,
+104,189,18,168,227,41,241,189,29,179,90,121,133,142,143,46,216,77,58,149,29,207,189,155,211,96,83,92,162,245,131,86,163,36,20,95,182,25,79,169,232,221,110,172,132,50,96,210,240,15,5,105,120,18,49,3,133,231,186,227,24,93,101,213,229,113,30,141,184,241,183,159,240,240,225,178,247,94,184,183,236,21,133,78,38,122,205,68,243,51,150,80,231,116,44,2,228,232,49,246,251,53,237,91,158,11,38,83,250,54,116,50,165,175,155,208,154,54,178,131,201,52,59,246,115,167,239,165,104,83,132,182,41,250,195,247,222,6,13,119,96,73,187,208,17,94,243,195,121,82,237,52,48,26,195,134,220,113,106,228,211,140,46,60,6,86,225,127,88,239,118,5,108,82,119,132,123,36,179,218,238,91,194,157,168,167,242,38,0,198,213,219,107,50,67,33,126,155,49,63,247,110,222,84,161,69,138,205,130,189,30,39,12,1,24,231,201,180,30,239,114,253,70,44,177,36,228,67,224,233,184,27,29,115,143,77,74,214,61,136,131,65,236,100,12,242,215,80,44,245,113,9,66,44,173,210,
+23,247,37,88,76,124,26,48,113,226,189,90,167,26,149,193,199,83,68,12,60,228,104,225,37,32,108,61,193,78,132,71,138,234,126,166,15,60,138,120,59,19,97,97,141,191,47,219,119,140,80,58,174,143,79,88,26,199,223,247,94,6,22,77,98,12,10,233,145,119,10,240,219,185,147,52,133,123,233,167,253,139,51,231,93,106,68,230,187,108,217,90,30,157,215,7,224,226,228,194,114,72,107,116,219,65,63,114,207,30,131,227,7,182,67,54,128,143,125,203,95,156,57,94,147,180,75,115,219,144,255,173,62,123,61,59,220,178,154,63,104,38,135,110,74,70,217,38,28,105,165,239,120,117,144,233,137,105,89,80,121,166,196,83,183,167,13,55,135,182,107,123,31,192,220,170,252,12,131,156,146,197,169,167,115,66,125,18,70,203,169,50,34,61,129,203,88,10,173,152,210,152,183,243,33,197,215,137,192,166,86,10,160,216,68,66,254,132,232,229,169,59,146,10,0,23,57,46,29,24,189,67,53,206,131,127,151,167,96,125,124,235,170,113,61,25,37,208,82,186,86,200,33,161,94,167,
+100,19,223,234,207,158,195,156,233,225,137,115,169,241,97,9,147,230,18,8,147,76,155,184,190,3,237,81,227,208,40,132,5,216,5,233,135,247,1,30,122,251,219,90,19,203,23,38,248,47,163,248,163,71,204,221,82,209,123,35,179,221,112,16,183,151,48,84,104,251,0,194,87,26,203,152,237,149,165,192,245,60,76,155,247,119,237,107,184,43,145,95,36,217,153,252,192,119,91,143,239,130,184,44,45,107,93,59,19,158,0,68,229,220,248,7,195,89,234,52,143,56,171,115,141,131,25,103,144,128,158,183,19,188,237,242,237,227,11,88,150,118,48,94,127,132,208,40,150,92,252,14,93,72,181,174,113,118,68,208,30,155,44,106,91,231,182,151,54,48,56,26,3,61,74,132,217,94,162,128,104,221,224,172,107,56,130,201,175,148,140,127,30,141,227,206,103,105,232,11,235,169,0,133,127,252,3,234,121,254,226,216,179,255,191,180,107,125,138,234,202,246,255,74,23,243,33,58,165,50,38,115,63,37,149,170,196,59,153,177,110,170,146,154,36,53,53,55,215,26,90,186,145,190,129,110,
+210,167,145,248,45,42,32,248,68,20,140,32,2,242,80,158,237,3,104,1,27,68,16,5,121,201,171,145,134,110,65,81,30,66,147,150,230,209,60,250,238,181,95,103,159,211,7,77,238,124,178,232,115,206,222,107,175,189,222,123,251,91,45,79,50,250,142,3,5,53,5,143,167,127,157,169,221,60,230,34,47,54,249,207,148,185,222,14,151,254,124,54,148,131,94,108,203,59,191,17,88,235,239,109,14,142,222,157,92,203,29,77,238,175,59,81,119,210,157,91,113,124,62,197,115,62,249,105,249,98,77,215,211,210,174,38,135,123,253,102,125,94,99,119,191,191,160,164,200,119,207,159,90,184,54,148,229,117,148,46,223,123,190,254,226,142,179,175,34,253,88,65,103,74,79,242,116,227,155,146,202,205,231,3,221,246,169,161,148,173,250,197,177,229,178,138,27,107,190,214,222,166,153,213,146,55,227,3,55,122,71,60,143,242,131,175,91,126,173,200,175,26,173,105,186,177,242,214,159,223,188,181,25,170,171,204,126,230,153,95,191,116,19,136,42,171,28,113,110,149,230,185,250,70,220,173,
+211,71,239,116,93,13,46,61,116,45,157,109,117,172,186,87,159,44,108,250,59,206,5,54,31,219,125,161,245,241,149,74,103,137,199,115,119,201,62,7,203,239,47,156,120,232,120,235,232,88,242,220,25,236,45,186,186,225,119,212,244,61,77,125,228,88,202,200,187,238,200,252,229,228,124,250,98,127,129,179,233,102,232,217,175,151,150,219,11,67,133,174,228,186,150,139,39,107,55,250,31,23,214,186,138,178,239,133,26,143,222,90,200,174,26,237,13,158,24,119,248,220,103,30,4,151,55,151,206,167,76,206,159,217,106,13,117,78,7,150,6,242,175,119,22,63,183,119,38,47,181,212,164,57,55,22,158,13,57,221,185,143,103,3,190,66,143,51,167,173,223,158,210,235,187,120,99,221,213,111,159,245,150,62,115,6,3,57,77,53,115,46,187,183,102,166,117,224,213,171,217,217,89,20,167,160,205,74,119,110,220,175,171,173,157,189,208,225,236,93,240,140,23,183,20,7,114,70,23,123,210,27,66,111,157,131,21,233,181,229,229,229,147,21,206,210,204,116,215,153,130,190,204,133,57,36,
+129,61,229,203,139,185,157,37,181,167,210,139,61,185,57,3,57,23,97,50,223,69,143,243,113,105,225,146,189,216,51,234,186,94,120,171,122,188,113,104,120,109,118,52,171,189,224,172,203,30,0,185,91,72,190,117,194,251,178,181,122,118,44,243,241,11,148,63,245,118,223,63,63,56,87,254,108,49,99,33,243,236,149,148,234,156,134,137,166,178,98,207,113,215,74,153,227,117,107,247,207,206,246,169,165,206,141,238,137,217,254,235,129,254,217,250,161,181,166,210,55,141,181,213,213,207,207,162,141,41,190,56,18,106,245,85,7,243,234,219,174,229,36,143,151,212,215,93,206,188,155,25,156,31,25,202,159,158,156,94,191,188,146,55,85,82,221,80,136,72,59,122,163,161,166,217,121,185,96,42,80,237,217,220,234,207,31,188,216,49,89,213,241,34,80,145,117,235,197,163,179,165,158,42,199,84,125,27,202,29,199,43,188,15,158,45,184,167,131,191,60,246,183,116,228,164,228,47,46,102,20,55,33,146,175,7,243,220,111,211,157,254,149,249,230,158,204,185,212,51,221,115,133,45,243,99,
+215,202,46,185,130,121,141,15,58,131,246,238,103,41,203,173,93,13,29,245,143,208,108,193,11,83,43,25,119,28,227,41,247,214,115,186,102,49,67,60,51,197,67,51,195,115,75,3,174,220,140,64,103,205,153,98,95,238,228,171,77,215,92,187,35,35,245,97,198,189,137,135,87,183,86,222,120,115,252,79,166,167,230,66,83,89,153,105,229,107,190,215,153,29,62,231,194,216,173,218,202,190,185,156,183,39,243,66,69,105,207,16,111,150,74,55,174,63,89,95,110,132,255,2,151,63,83,63,61,180,230,156,8,173,23,35,174,156,109,91,24,205,111,175,112,93,189,218,209,22,204,26,11,100,251,11,179,179,86,111,94,114,94,219,74,203,116,140,180,250,234,230,171,2,245,201,158,7,93,193,220,229,241,150,162,174,156,181,122,196,29,183,99,168,48,37,107,116,205,83,56,213,157,159,145,255,36,171,195,89,158,58,215,125,121,182,171,186,117,185,174,160,41,211,239,27,244,118,56,111,143,119,102,212,140,228,246,183,149,187,218,78,207,173,62,241,159,76,57,21,26,77,241,228,244,248,
+143,45,158,187,155,150,153,63,210,218,235,27,110,200,25,123,96,207,25,115,205,175,219,79,189,186,159,231,58,85,223,222,111,239,113,59,6,147,179,222,78,157,173,79,233,105,126,218,214,191,110,63,186,62,176,158,81,113,209,49,158,181,230,44,107,42,70,115,120,215,156,195,109,131,131,35,222,151,254,134,133,218,172,212,50,151,253,102,86,221,75,187,235,242,131,87,167,215,170,171,210,93,167,91,6,50,166,39,207,53,7,106,151,135,208,50,234,170,221,231,122,154,239,5,111,215,30,79,70,203,152,112,230,249,178,166,198,221,89,147,169,13,213,69,101,174,49,199,35,119,107,207,155,187,30,95,103,157,255,242,221,16,10,93,54,50,175,93,216,236,30,241,207,189,28,200,185,228,73,153,237,242,60,180,215,149,221,153,207,79,169,47,176,215,122,7,138,86,211,50,199,223,76,56,74,157,13,215,46,245,61,25,14,108,186,202,127,205,94,247,244,52,56,51,131,85,85,213,105,13,183,106,210,187,26,123,252,126,87,94,31,178,139,99,195,141,131,238,169,99,213,203,47,151,111,160,
+237,232,11,120,11,167,179,198,26,230,221,190,186,233,165,206,198,137,64,69,121,223,208,133,149,99,149,99,35,125,125,57,142,210,99,217,5,107,72,219,134,93,163,11,61,37,75,157,129,241,170,218,39,87,236,43,158,107,185,213,39,252,167,139,61,173,149,27,237,45,217,39,235,26,2,23,31,207,214,182,117,223,42,127,114,37,228,204,157,30,191,56,246,42,148,188,224,237,112,56,95,189,118,156,120,107,191,118,251,198,133,150,193,83,206,161,141,225,108,95,127,105,230,197,96,213,106,48,53,179,227,168,51,123,195,217,218,245,188,222,153,250,248,216,113,95,127,223,218,86,97,171,61,237,218,194,40,90,213,228,219,212,147,99,15,114,83,252,111,234,46,142,20,7,70,51,2,167,250,97,93,232,203,146,95,54,102,107,71,252,69,47,27,215,198,139,210,50,67,231,144,176,180,7,188,51,111,144,77,168,246,174,167,100,167,34,53,109,105,44,201,159,221,234,158,14,44,150,180,130,125,67,59,225,242,86,110,181,33,139,115,44,16,184,148,63,155,209,81,235,204,190,55,112,109,193,
+123,30,204,123,201,228,153,194,230,169,172,90,111,229,232,102,105,247,214,234,35,239,201,158,0,24,216,82,231,137,234,224,234,56,178,103,141,121,33,111,111,186,195,209,121,118,243,20,242,15,215,218,6,167,87,171,242,214,94,172,174,231,111,53,249,139,30,250,70,95,158,127,116,181,241,249,122,191,123,181,161,112,126,179,117,51,84,89,90,49,115,161,107,61,180,118,122,117,253,197,165,190,230,62,228,122,58,31,77,13,156,203,246,172,181,6,55,58,91,207,109,5,59,238,93,15,221,121,190,230,205,106,10,76,223,75,109,247,92,238,117,108,166,222,94,233,45,66,254,193,215,228,43,59,209,253,170,121,125,186,232,212,201,151,13,75,158,206,133,172,103,169,96,236,145,73,9,182,149,129,3,234,116,251,237,200,67,188,189,210,218,51,94,58,147,209,96,95,41,188,229,184,85,123,252,152,125,254,76,239,242,3,123,218,157,99,55,178,115,74,167,219,42,238,247,165,141,94,41,157,115,223,116,6,239,143,121,166,127,38,238,239,220,0,113,127,133,247,137,251,203,40,33,238,175,96,
+11,185,191,217,64,193,68,103,86,246,132,219,59,150,155,58,212,85,10,207,135,147,103,242,151,231,202,78,213,95,9,58,111,122,115,242,79,157,29,91,188,255,208,27,202,183,191,158,173,204,188,235,235,26,95,46,188,62,124,253,117,251,212,229,254,192,179,210,217,219,221,143,253,155,183,199,61,29,37,193,186,217,162,42,255,70,81,189,251,248,245,95,206,21,213,84,174,108,61,109,206,28,207,26,189,252,198,245,168,222,157,103,239,121,113,212,147,62,250,186,170,235,202,70,207,228,76,218,235,46,231,213,141,147,174,53,247,214,171,171,11,77,93,231,103,174,246,220,126,90,253,182,107,226,252,245,217,64,199,141,229,215,237,238,173,186,220,103,235,75,203,233,27,143,159,164,161,191,175,76,175,188,90,25,76,31,184,121,109,184,51,179,45,127,50,52,213,190,85,246,178,249,5,242,115,233,13,3,246,230,173,188,181,75,139,176,236,140,69,127,85,232,232,76,242,82,169,18,52,235,11,147,85,178,233,36,130,93,37,34,179,81,172,173,56,99,140,77,23,11,16,99,9,122,51,129,
+204,50,179,215,45,102,142,22,203,62,139,250,64,18,240,77,201,16,86,19,224,249,241,49,246,232,116,251,226,76,209,63,232,190,250,47,25,10,13,15,104,52,112,180,51,6,116,8,136,93,4,93,141,162,110,113,16,91,17,23,13,128,62,147,204,194,91,34,58,111,146,201,108,176,36,233,108,38,91,156,81,119,80,111,85,33,125,98,176,52,0,156,59,104,68,43,99,243,73,58,171,49,198,104,181,18,32,64,138,72,246,253,31,21,232,94,7,40,206,42,197,245,146,116,49,152,151,140,113,20,110,150,115,131,208,168,183,113,182,70,237,6,158,68,237,150,76,6,204,71,66,59,144,103,225,27,162,51,152,98,16,29,70,179,45,108,246,223,2,95,134,161,68,149,0,102,2,162,48,128,220,105,32,89,90,141,122,27,6,80,51,27,126,27,172,229,247,255,22,160,38,195,196,60,160,130,115,219,111,230,176,170,122,14,32,26,31,15,147,227,191,36,17,201,205,108,81,72,47,135,186,21,145,6,41,34,163,36,64,50,82,172,71,197,202,24,250,34,65,73,4,172,63,192,107,36,
+96,155,84,118,62,199,212,200,16,113,84,234,48,89,104,43,128,205,20,200,152,82,170,37,61,116,44,250,17,19,71,58,168,136,251,44,35,81,154,143,168,208,153,41,96,39,16,249,27,16,58,195,228,215,180,7,105,163,214,168,6,147,148,16,167,63,18,142,49,140,165,90,144,97,162,214,97,18,252,21,249,234,107,171,229,127,49,38,158,2,57,143,11,174,222,32,47,28,137,51,250,37,28,104,150,40,25,122,244,46,152,88,38,239,18,86,252,35,12,58,113,27,142,195,60,132,176,168,221,198,159,18,44,86,219,246,112,127,228,57,217,64,113,44,162,3,200,70,189,103,51,136,64,105,238,134,56,220,46,108,101,208,70,80,180,67,130,113,107,177,72,70,165,82,252,139,129,28,114,84,115,244,136,98,96,26,127,76,68,211,80,34,100,156,84,180,49,148,151,20,117,28,96,152,9,116,56,6,100,214,64,80,13,3,249,38,112,138,28,88,85,9,12,109,162,122,35,226,200,170,240,74,9,46,40,188,134,136,65,235,3,172,105,106,30,49,53,186,29,24,63,116,39,247,7,156,
+124,74,0,19,68,196,16,250,5,96,114,43,95,85,121,34,165,153,151,194,64,63,69,95,135,241,73,153,11,209,112,89,108,108,108,108,227,176,224,168,236,45,131,121,4,239,168,48,59,216,61,33,30,199,162,17,227,96,84,89,167,148,174,149,210,139,247,132,160,169,202,136,152,42,208,84,25,75,94,182,16,176,57,72,159,48,148,170,62,142,27,49,50,18,195,254,100,88,158,104,174,111,8,12,247,126,242,30,172,4,189,24,181,27,59,36,6,64,27,181,91,70,160,61,128,81,129,147,240,80,130,195,208,0,235,150,201,20,132,7,105,10,229,33,197,222,37,88,247,66,172,0,0,219,9,146,53,154,203,128,8,70,47,108,30,23,90,96,0,249,68,27,7,244,91,62,25,197,57,149,56,105,191,151,90,62,192,14,41,17,64,234,37,1,69,117,231,46,25,188,53,42,130,189,25,21,193,65,200,97,183,192,199,153,120,104,32,105,201,16,21,33,180,53,251,73,60,98,75,162,186,186,43,124,220,168,8,178,242,168,8,217,216,254,3,199,57,18,0,210,218,64,59,118,81,245,
+64,178,78,49,189,185,28,16,21,162,75,12,227,142,46,30,75,63,137,106,96,177,200,40,197,193,200,12,211,156,2,183,178,15,63,166,127,19,146,148,123,193,144,94,163,254,7,240,254,77,210,239,0,237,69,196,152,162,45,113,22,224,94,130,30,25,122,163,20,182,34,73,70,192,198,114,129,183,148,47,8,255,36,119,0,216,118,87,21,238,31,158,83,73,124,207,247,209,160,6,106,65,86,201,34,196,87,224,65,244,7,77,113,38,27,138,75,190,255,227,191,120,151,140,189,255,241,167,157,176,128,36,189,21,153,207,56,189,20,75,194,68,218,60,0,171,54,168,62,154,152,44,154,24,4,138,151,127,64,135,120,18,75,224,126,81,176,128,230,71,161,36,25,4,219,18,166,35,56,22,198,200,242,154,200,210,154,186,179,95,97,62,128,45,26,159,10,90,36,88,45,134,1,29,6,244,252,126,8,110,173,36,130,152,69,137,147,2,208,203,120,85,6,10,210,109,195,224,187,162,189,195,190,5,41,138,210,234,113,244,106,5,222,249,97,147,158,142,16,181,123,63,250,6,32,190,
+193,145,30,214,199,161,152,123,167,140,169,204,66,207,56,88,2,137,22,212,200,202,225,138,164,63,104,57,76,97,134,209,240,202,49,152,78,238,128,207,255,186,111,223,78,93,18,219,120,202,88,244,137,74,211,132,159,180,148,13,239,121,188,81,111,166,65,0,215,22,176,78,18,151,39,141,173,148,193,199,21,220,33,81,232,33,147,89,78,187,152,85,214,211,80,37,82,145,71,81,5,143,71,203,39,16,216,234,6,17,140,103,212,18,106,128,81,199,194,79,123,162,145,181,192,32,211,96,65,113,50,136,76,40,93,38,167,255,147,125,54,107,220,151,166,131,145,244,223,61,177,159,42,25,66,127,103,100,201,180,107,58,33,70,148,160,253,56,142,129,46,42,232,197,232,31,140,54,77,245,212,96,40,9,4,254,32,183,131,248,46,156,185,7,141,209,122,52,6,206,125,80,64,106,60,140,4,78,82,2,121,227,244,13,116,4,134,160,212,69,39,90,113,58,40,7,105,24,200,159,69,142,196,17,97,30,71,69,208,245,99,47,129,99,125,18,249,32,110,82,122,208,82,145,113,50,
+26,248,148,18,145,86,189,114,209,76,166,64,106,245,86,100,108,153,200,211,133,27,200,94,97,81,145,196,20,61,44,140,97,170,192,57,133,40,251,135,138,87,66,39,2,80,119,34,76,220,93,225,150,48,116,177,160,173,98,159,145,157,44,83,199,228,24,44,172,129,5,219,32,90,190,48,88,18,161,133,207,143,137,22,155,150,193,149,108,70,189,129,8,175,200,5,149,165,68,94,215,108,65,238,91,237,118,17,7,133,173,160,221,132,244,18,176,206,44,153,176,112,32,243,69,220,192,159,247,114,55,64,122,25,32,166,32,27,97,52,99,219,198,84,24,119,246,65,89,20,30,133,229,149,132,218,3,84,157,152,160,131,117,129,84,56,26,253,141,164,91,69,50,141,249,62,139,67,166,216,172,7,82,196,88,15,118,11,146,87,232,173,97,146,226,21,17,159,34,178,228,237,112,180,125,199,215,44,85,100,141,93,88,175,7,174,103,148,63,6,11,248,104,11,68,59,136,41,54,139,186,183,12,250,41,1,5,201,135,141,113,196,191,144,207,72,128,68,27,216,40,94,87,161,239,235,
+197,175,116,166,24,214,230,134,86,61,168,189,217,5,14,30,242,87,34,208,36,212,1,185,145,245,75,178,89,19,81,134,100,85,229,98,56,7,219,27,249,245,15,135,246,42,127,32,185,37,126,242,161,246,147,125,200,33,155,109,240,194,71,219,188,128,59,44,40,167,195,25,167,186,223,142,34,188,179,196,40,3,52,60,232,187,162,51,160,29,196,78,213,80,72,230,59,30,65,102,60,172,72,227,125,70,182,122,7,240,215,232,51,106,108,176,233,48,42,2,169,109,154,4,225,46,61,63,153,226,19,227,209,166,37,160,21,98,115,202,12,33,8,228,54,225,214,103,162,137,5,242,128,197,216,141,113,27,173,215,120,229,67,221,14,72,249,63,220,19,187,19,91,175,48,71,163,216,211,72,250,46,115,54,255,169,48,39,98,229,102,91,91,2,5,136,195,38,3,179,79,152,74,181,86,208,192,19,17,204,249,75,55,226,255,177,102,210,176,1,220,9,244,133,130,76,151,153,80,88,204,71,108,225,58,163,9,66,74,245,250,163,34,232,91,81,17,244,145,37,236,157,79,180,164,59,
+146,126,247,169,58,80,225,85,9,125,88,103,23,49,218,228,85,83,8,164,64,112,192,210,42,68,142,46,35,220,122,152,105,192,1,203,130,22,19,184,101,16,41,107,242,122,23,159,102,15,115,198,130,108,130,106,17,19,46,132,64,108,94,98,133,72,36,74,168,18,85,19,242,113,244,58,114,148,7,141,182,36,168,43,203,101,92,228,232,77,18,174,85,161,121,248,50,112,229,229,224,17,153,74,101,17,65,173,234,42,17,8,111,30,132,139,184,136,19,114,19,167,125,248,151,168,221,102,99,146,58,231,100,153,162,80,80,199,189,190,216,214,74,150,120,26,72,138,189,208,76,138,154,33,78,130,161,8,43,88,15,186,55,192,56,44,199,36,162,82,196,204,10,197,146,139,107,114,220,172,160,10,202,181,18,221,107,196,75,92,72,66,30,95,49,8,53,239,96,218,52,70,160,218,41,124,140,57,143,13,161,28,144,41,86,245,14,87,164,82,68,65,2,192,63,49,5,230,237,101,104,213,81,138,20,142,39,36,168,215,98,26,224,52,133,190,1,210,133,185,107,37,157,223,194,70,
+80,103,87,54,214,24,139,53,57,83,56,53,186,152,72,26,177,99,91,64,235,82,82,34,84,114,164,104,171,233,32,84,38,193,225,191,211,171,135,141,193,188,251,126,27,105,136,66,10,137,102,99,180,81,146,32,182,230,81,12,81,37,170,91,204,228,227,62,84,66,184,71,74,14,97,110,72,224,185,164,206,42,14,26,105,48,181,247,35,30,76,37,154,77,63,38,66,143,30,171,69,146,120,153,118,251,241,200,228,116,196,3,232,115,68,17,202,100,19,201,46,65,209,137,135,114,248,88,200,104,142,230,186,165,199,177,115,28,74,111,53,146,116,150,136,11,73,153,73,73,62,55,116,170,204,131,134,170,184,17,14,206,242,133,154,141,64,44,81,84,209,93,200,245,80,43,95,34,61,227,58,108,148,35,104,214,84,145,190,18,41,23,226,180,146,32,172,179,223,106,38,108,172,204,162,55,107,82,129,173,38,97,31,171,157,209,96,117,151,238,239,166,232,216,191,160,192,18,72,37,17,143,168,131,18,145,125,133,236,80,170,222,83,116,249,27,236,143,230,135,138,38,95,212,144,232,
+15,91,76,16,111,227,24,3,23,221,97,91,201,151,49,50,19,101,14,241,204,228,253,193,42,51,146,239,221,110,196,227,191,131,100,177,138,6,125,196,70,17,155,93,41,74,102,88,228,152,49,141,73,68,146,206,10,235,202,21,71,138,57,9,43,53,255,14,230,112,73,161,95,49,155,46,31,89,176,252,95,209,199,73,111,86,84,162,217,234,120,130,203,186,65,234,197,148,228,125,25,137,186,67,228,254,24,165,239,35,148,27,16,31,144,85,75,180,145,181,96,37,66,185,25,88,89,148,65,97,43,2,107,163,42,12,117,51,241,112,131,172,146,12,70,182,25,8,143,39,91,205,252,26,57,142,160,5,254,56,211,15,70,226,250,33,250,35,6,8,171,141,34,194,223,247,223,123,191,177,196,224,224,8,98,8,57,180,15,175,109,8,111,226,48,106,175,28,70,209,103,184,12,78,8,224,167,216,122,100,161,244,18,202,212,32,36,5,198,69,227,146,7,233,241,74,200,18,182,159,217,99,236,255,232,178,88,147,52,243,17,216,226,67,92,37,73,134,170,246,241,162,176,163,101,236,
+161,175,252,30,41,8,223,78,69,157,4,52,141,54,89,227,231,104,60,156,224,97,44,102,53,73,87,112,244,176,83,48,160,100,51,5,169,14,247,15,225,30,65,80,90,234,15,108,208,57,149,20,32,113,14,174,143,6,39,199,206,147,72,228,252,110,119,0,134,142,24,68,139,214,211,29,16,101,226,6,120,56,213,199,243,9,84,179,211,3,161,0,66,203,29,202,218,201,78,18,99,105,7,241,123,33,136,151,139,218,154,132,104,124,186,103,143,34,245,65,67,152,164,247,184,190,223,152,68,225,129,176,128,188,127,44,166,74,40,209,194,52,1,25,36,240,13,227,37,241,184,81,17,9,122,28,117,19,126,193,251,80,6,75,76,192,118,0,75,176,102,180,35,148,72,228,5,224,89,100,107,164,93,254,222,246,208,78,209,193,151,157,218,33,219,106,182,153,98,200,129,176,92,113,128,186,150,252,151,205,106,52,238,164,101,115,249,96,148,104,105,140,37,17,151,5,12,187,64,22,140,63,225,110,203,160,117,66,229,57,130,76,139,22,31,111,68,185,16,78,71,133,114,91,44,202,
+80,141,172,21,165,137,186,55,126,144,41,60,165,166,206,124,216,18,119,216,168,181,105,100,190,67,136,105,102,158,61,133,21,5,229,34,44,50,34,81,187,195,173,8,214,228,119,213,120,225,2,209,118,133,221,109,198,84,218,48,85,249,66,116,195,74,105,248,92,145,17,188,119,123,127,247,153,4,24,46,18,69,66,77,20,61,138,220,143,236,22,59,52,228,197,97,46,115,248,150,128,193,160,56,122,167,211,133,77,182,75,7,21,101,18,128,128,159,18,191,49,88,204,81,31,8,21,6,179,16,74,233,116,255,20,242,8,171,145,214,242,121,28,47,84,128,185,48,146,99,28,122,84,165,174,233,104,103,178,244,22,17,36,208,120,104,88,52,36,77,108,98,236,156,105,136,173,136,60,120,244,245,206,248,110,7,185,85,164,108,53,77,141,192,110,252,213,1,180,18,210,86,150,248,11,234,21,241,253,4,70,54,236,202,14,178,45,226,97,9,148,205,227,76,242,86,243,205,52,9,93,203,89,23,75,113,188,237,236,132,130,69,228,16,210,36,137,55,150,4,198,147,1,185,126,106,
+52,149,229,186,67,174,98,80,89,198,106,133,11,254,18,57,85,193,249,0,11,102,118,65,205,240,27,148,231,127,65,255,196,108,22,186,167,139,118,0,222,251,27,254,123,79,44,149,23,124,37,1,73,166,60,4,99,142,70,17,3,66,37,157,208,6,249,157,231,201,31,43,8,11,187,34,134,86,98,85,198,11,76,125,204,150,36,93,146,213,100,11,63,54,18,233,103,33,85,120,65,43,42,66,124,143,87,190,84,231,65,56,58,225,119,5,133,244,229,8,118,65,226,206,81,75,104,50,107,137,128,226,80,68,82,28,237,82,1,97,225,153,124,79,225,29,39,29,148,88,182,249,95,43,202,141,74,139,79,70,23,54,142,78,132,203,97,202,197,170,79,181,88,150,2,3,237,2,227,138,79,234,32,254,139,215,219,108,114,250,19,62,56,151,44,133,41,219,62,77,165,51,41,187,217,83,102,43,4,4,219,119,189,20,214,43,86,33,126,97,134,158,139,48,190,84,34,113,211,161,117,31,77,190,101,106,99,77,152,143,108,123,245,70,184,114,166,117,181,141,148,14,65,98,209,88,
+184,40,37,142,68,106,136,70,150,209,36,232,37,73,195,232,224,243,25,124,69,128,216,190,93,248,23,22,13,169,234,1,194,3,213,125,45,122,97,64,36,8,20,90,143,37,147,86,51,153,45,20,23,174,140,237,249,113,61,167,253,16,185,152,164,65,184,226,56,28,146,192,24,27,48,133,25,94,62,130,250,122,128,96,70,217,101,89,36,211,112,197,87,101,139,89,151,244,36,82,30,85,148,201,37,246,38,138,156,108,137,86,126,245,15,209,113,216,104,61,136,140,36,191,20,200,52,196,104,67,113,163,242,42,163,96,253,64,106,212,157,153,177,3,133,52,52,154,94,70,149,247,150,211,169,218,100,52,180,49,38,134,220,174,70,75,77,162,133,61,43,174,217,51,25,250,64,10,79,145,72,134,199,22,197,229,238,223,186,154,171,45,179,114,205,155,202,9,147,133,240,53,41,4,78,225,142,148,241,246,151,250,35,22,214,86,154,23,229,249,249,70,156,240,84,112,73,164,110,153,192,14,16,128,193,127,253,110,63,34,218,74,186,199,179,106,41,137,249,225,49,29,8,61,76,50,
+25,14,129,69,51,218,162,89,121,11,94,248,204,96,64,27,38,125,142,124,41,191,144,64,183,63,252,118,7,218,113,32,67,164,142,93,32,18,198,145,175,50,196,178,195,105,126,198,8,87,188,64,250,213,92,249,3,185,68,163,251,242,179,127,126,245,221,183,95,236,255,242,47,186,79,132,33,35,197,225,209,244,159,134,121,56,136,143,247,89,172,198,72,244,84,243,244,133,205,0,27,36,204,66,207,194,53,76,63,59,89,86,158,157,195,175,184,2,137,165,66,62,110,210,72,200,176,113,151,108,122,184,77,75,174,33,132,159,20,240,19,192,61,100,207,144,71,161,20,193,212,72,59,192,159,219,64,153,165,237,57,21,21,161,98,15,119,221,98,129,95,201,33,178,65,120,67,77,54,197,77,41,65,108,240,59,59,120,45,222,102,66,81,164,246,121,161,76,13,60,249,211,199,186,3,255,7,64,231,118,146,
+
diff --git a/uppsrc/ide/app.tpp/Sponsor$en-us.tpp b/uppsrc/ide/app.tpp/Sponsor$en-us.tpp
new file mode 100644
index 000000000..a46725446
--- /dev/null
+++ b/uppsrc/ide/app.tpp/Sponsor$en-us.tpp
@@ -0,0 +1,25 @@
+TITLE("This release was sponsored by ")
+COMPRESSED
+120,156,133,88,105,111,98,9,118,253,43,37,85,103,148,244,84,247,176,218,184,74,145,90,234,201,215,73,148,104,62,181,122,82,213,221,206,164,146,222,210,85,163,206,162,140,188,129,23,192,216,96,99,48,54,96,48,96,118,204,190,99,140,13,198,24,48,102,199,108,6,204,190,99,192,128,49,121,84,213,76,148,79,121,79,15,30,79,156,123,207,61,247,220,139,196,23,144,39,31,125,4,122,6,122,10,250,127,142,231,191,158,254,167,87,127,248,246,237,151,95,124,11,65,32,94,188,6,131,33,160,23,175,192,147,47,254,118,234,197,31,255,248,199,79,193,48,16,226,197,56,24,24,8,6,6,193,160,96,8,24,120,6,130,65,38,193,240,41,208,20,28,1,70,128,160,147,48,8,124,18,4,127,254,227,171,159,94,125,247,229,23,175,16,208,23,31,255,253,4,128,130,60,131,63,133,130,161,96,16,120,2,2,3,190,5,130,130,32,48,48,4,14,70,32,96,224,73,56,2,58,53,49,241,252,235,87,63,190,125,253,195,247,95,126,241,213,24,7,3,96,80,0,6,154,68,
+76,192,192,0,8,6,135,64,39,225,48,0,12,131,1,244,160,64,226,201,137,201,201,231,111,95,191,253,118,250,203,47,94,143,121,3,108,63,31,179,132,61,155,120,10,176,131,76,2,72,24,4,54,1,131,34,32,80,48,2,2,153,152,130,194,166,96,0,109,48,228,249,235,183,211,0,201,175,96,144,23,175,128,107,12,131,3,249,96,112,24,24,10,40,2,155,132,67,129,175,77,2,239,48,208,20,24,2,36,69,128,224,112,32,223,244,191,255,73,166,175,0,129,198,34,141,177,19,64,74,200,36,124,140,64,192,16,96,232,36,2,2,131,76,64,0,18,160,73,160,208,49,3,248,243,111,166,223,124,13,96,161,16,240,139,183,0,173,23,159,127,6,127,1,6,192,147,207,38,159,66,64,83,32,200,196,228,20,144,20,32,12,212,12,157,154,2,67,17,64,82,24,24,14,2,67,159,127,253,195,55,64,157,95,65,224,32,232,187,140,8,160,21,19,64,228,119,178,192,39,192,0,105,8,20,1,164,156,4,67,161,192,43,28,134,152,124,254,102,122,220,140,183,63,252,244,
+229,23,31,127,246,151,160,79,65,159,66,224,240,191,26,195,167,0,56,2,10,131,66,97,19,83,48,48,8,10,164,1,98,192,198,154,77,128,128,118,130,225,16,196,243,175,94,189,1,114,190,5,30,77,190,87,22,60,118,19,160,61,20,1,135,2,169,39,128,23,160,175,64,129,80,64,31,200,20,12,1,133,34,64,207,191,254,246,213,155,55,31,68,26,11,244,241,184,72,48,248,25,24,252,116,114,172,45,28,10,129,77,141,197,129,66,0,145,33,19,240,41,48,160,50,124,2,6,130,60,255,105,250,223,254,240,250,167,233,239,166,191,7,100,126,13,216,227,197,159,90,244,193,139,0,153,247,86,132,60,3,67,0,51,194,39,38,64,99,189,224,128,33,32,80,56,32,56,8,140,128,1,140,128,19,104,243,219,15,110,252,234,127,107,128,62,3,67,159,78,65,96,80,128,201,20,12,6,40,0,4,0,79,129,193,96,16,2,56,129,202,0,93,222,249,3,252,193,88,31,210,191,135,195,158,129,97,79,39,1,27,3,157,154,130,141,211,79,65,199,250,65,0,249,33,19,
+32,56,208,7,200,123,56,100,172,58,228,35,64,119,48,4,49,190,222,41,15,134,63,3,3,243,0,80,4,195,225,64,221,80,64,106,8,2,168,29,14,104,15,125,103,113,240,36,226,249,111,166,127,126,243,235,87,111,167,63,24,230,227,207,63,122,239,52,240,196,51,240,196,83,208,24,15,71,76,1,13,4,195,198,250,65,97,176,41,200,20,20,10,135,76,193,161,19,32,64,199,55,239,7,122,12,30,143,212,187,113,252,115,144,201,103,224,73,96,184,128,90,225,112,160,250,119,48,160,242,73,240,152,10,4,49,53,49,86,225,67,144,151,159,124,251,250,251,49,15,192,25,47,222,155,225,227,207,127,9,6,79,142,3,33,128,161,65,32,38,64,208,41,64,12,64,3,16,28,112,58,176,16,16,64,163,129,62,67,128,49,24,111,132,175,255,245,213,239,167,95,126,242,97,90,223,81,24,59,16,14,133,35,198,190,5,144,0,117,128,4,16,103,10,4,154,0,158,32,16,192,52,61,255,253,171,31,255,143,1,33,160,103,16,16,224,34,96,255,192,129,161,4,114,1,246,
+3,77,141,119,9,176,25,128,14,0,171,104,10,254,222,129,47,63,249,126,250,205,219,233,111,128,230,195,65,239,202,134,128,159,65,192,128,118,128,255,224,112,4,12,54,1,240,5,114,79,142,87,211,184,133,192,0,195,39,161,207,255,238,21,48,47,255,245,143,255,253,23,127,243,155,79,126,251,15,79,190,120,3,122,241,45,224,128,177,17,159,252,246,219,183,175,191,3,218,242,242,151,47,127,249,228,199,159,126,248,151,233,175,223,62,121,253,230,201,155,31,127,248,254,205,15,63,77,127,243,228,171,255,248,197,151,99,200,95,255,238,159,223,190,253,241,229,243,151,191,122,249,171,159,127,254,249,229,167,95,3,158,254,233,15,223,1,55,255,249,187,39,159,125,6,132,249,253,244,115,192,181,240,95,0,155,99,110,254,97,70,48,243,231,227,126,107,167,178,99,90,202,5,227,155,182,235,211,202,190,68,135,13,9,45,146,77,238,17,114,80,58,229,87,228,116,12,163,128,20,170,60,66,179,72,66,39,154,25,100,167,18,61,135,84,43,103,217,117,159,128,120,76,191,116,108,
+43,150,164,103,43,13,201,158,132,154,181,12,74,245,221,86,109,208,162,172,182,83,101,107,87,131,49,152,122,166,65,85,55,170,25,115,209,154,33,167,239,38,194,225,120,71,186,149,54,148,111,197,131,176,195,56,254,0,220,27,197,52,103,179,156,118,239,174,141,30,74,22,206,168,63,226,233,135,117,38,94,161,125,244,238,70,29,113,190,72,182,193,67,23,89,68,102,86,19,151,50,71,171,98,218,236,28,86,156,196,152,30,71,52,206,168,87,26,121,104,241,97,43,168,31,81,89,162,160,202,31,93,220,60,186,79,220,37,196,93,233,22,127,243,242,177,219,119,37,86,174,196,137,206,168,228,167,61,136,236,149,173,81,147,227,49,14,41,73,177,105,120,90,91,33,140,102,70,182,199,120,124,115,229,234,97,1,29,187,140,155,250,89,92,237,177,116,138,29,136,13,101,122,226,210,250,24,19,215,75,61,73,173,127,4,208,14,116,103,85,91,21,83,203,63,26,168,76,77,102,186,214,120,144,86,6,179,38,17,118,131,225,83,157,21,78,232,49,51,247,10,89,108,93,14,253,
+74,218,252,200,43,182,244,125,232,197,7,252,174,242,12,215,57,115,118,79,234,226,214,92,91,124,84,75,244,175,186,43,110,164,53,195,154,137,145,80,149,67,22,154,229,231,236,27,19,190,77,173,107,149,254,248,136,238,180,53,70,97,32,113,30,49,149,209,34,124,193,219,242,159,224,122,201,156,65,181,217,125,28,241,155,158,98,223,121,60,154,103,86,77,81,228,185,119,230,60,161,70,86,206,102,117,234,100,116,228,152,217,122,224,167,7,184,35,19,41,88,158,49,145,196,35,126,152,130,167,80,19,254,149,165,21,241,198,177,155,116,108,111,238,233,69,68,204,104,120,109,13,26,123,149,173,64,41,147,94,164,217,120,17,37,45,241,16,246,139,211,221,199,213,222,150,80,66,47,145,26,220,164,163,200,223,61,214,88,177,243,197,189,161,73,100,108,182,105,56,197,166,35,105,82,68,253,185,17,219,214,237,121,210,167,60,172,205,237,79,11,122,105,59,54,58,235,11,109,163,47,104,195,122,171,180,161,94,44,106,21,197,42,166,107,171,162,3,146,60,90,33,184,205,152,107,
+243,145,250,16,189,200,45,42,194,75,106,206,186,54,68,122,112,51,246,125,109,45,223,20,48,208,155,115,98,117,251,58,138,69,47,108,101,46,185,168,149,224,60,178,133,241,147,67,232,150,179,175,61,54,240,210,202,24,55,61,68,7,50,10,230,105,137,120,144,204,152,197,168,123,180,59,59,187,87,237,23,82,93,218,234,85,80,227,231,175,73,43,249,234,195,186,32,24,73,88,204,163,91,74,144,39,73,176,233,71,152,185,235,189,65,212,131,219,148,182,150,2,187,222,154,36,253,112,212,156,71,47,138,214,109,30,217,28,245,136,153,24,149,20,45,206,34,113,196,20,104,91,27,237,123,253,181,185,95,108,147,106,51,184,58,42,227,163,151,174,109,24,44,110,46,75,113,111,147,197,84,23,67,182,216,213,123,232,187,29,52,46,219,92,184,89,58,95,225,175,23,219,72,121,63,29,194,94,220,122,55,107,178,219,125,137,48,141,237,151,252,171,228,149,0,129,86,81,107,22,239,220,204,132,62,222,79,50,90,71,198,160,72,27,189,198,183,142,110,111,220,53,43,245,8,153,
+43,200,137,187,4,27,95,204,163,220,17,173,186,28,214,29,104,223,237,87,249,231,46,11,73,38,65,243,178,107,152,178,244,170,161,197,207,16,177,251,242,66,73,112,45,155,187,24,236,244,173,178,240,93,183,61,136,212,10,67,33,55,217,162,242,50,193,246,177,242,66,200,38,119,48,39,131,168,70,57,79,189,241,22,174,197,84,36,231,56,120,81,161,105,81,236,227,12,137,101,206,173,107,54,133,234,234,210,242,105,231,188,205,158,13,148,47,103,3,88,43,181,72,233,29,27,78,91,28,3,218,37,222,86,138,132,181,174,50,179,34,39,56,216,77,71,198,198,196,97,203,238,128,197,32,58,239,20,152,237,176,196,218,174,105,229,18,157,85,179,226,75,167,139,229,97,182,195,43,174,23,229,92,44,223,104,58,198,108,92,221,202,202,94,205,54,43,124,134,2,186,162,219,245,9,5,15,254,88,72,229,246,172,86,128,96,86,99,61,34,236,103,75,220,54,121,200,72,100,9,135,117,122,193,157,42,241,14,5,119,84,106,14,231,207,83,180,167,12,134,111,62,173,232,207,21,
+125,201,145,181,151,108,228,79,182,116,177,136,34,112,115,161,73,138,151,75,165,67,199,97,158,124,222,109,7,206,178,233,235,34,81,75,35,177,93,212,235,37,231,118,186,55,55,91,38,222,101,195,71,237,128,56,44,74,114,121,179,123,74,244,129,52,236,66,174,55,181,178,163,118,191,24,184,10,30,36,206,143,143,154,181,109,174,211,176,114,193,18,201,9,138,219,29,172,169,36,43,51,175,42,54,81,35,78,179,120,188,242,43,7,202,198,247,239,83,23,121,123,121,137,205,172,13,245,227,193,226,89,223,176,173,139,140,110,74,139,222,226,76,216,79,98,118,22,184,200,194,69,175,65,89,233,95,39,164,194,176,192,207,231,162,245,141,101,158,49,39,216,41,221,120,29,34,157,225,228,48,142,209,6,230,150,103,98,138,42,197,123,27,39,114,54,12,26,188,74,48,119,146,165,46,232,79,80,206,84,70,222,77,215,27,153,157,25,20,213,121,110,97,204,115,244,140,203,68,115,54,89,187,116,221,15,145,229,158,156,199,169,6,100,198,249,22,55,117,203,226,70,157,184,107,194,
+236,252,142,168,93,67,161,34,55,53,41,65,57,139,44,242,100,128,38,38,108,154,100,217,152,187,82,151,183,48,231,212,65,176,109,18,81,210,138,181,197,18,26,83,45,17,207,168,37,12,137,51,147,207,75,152,72,223,122,167,174,205,216,21,202,244,140,13,103,77,223,176,169,232,4,150,179,175,72,19,73,72,229,134,35,163,218,216,122,96,136,228,248,251,179,136,214,33,55,206,162,60,246,84,94,19,89,113,205,21,104,246,11,103,169,182,192,208,39,142,181,251,186,153,25,241,97,198,88,222,226,90,213,30,66,152,205,176,104,73,85,69,113,243,66,70,40,178,230,102,83,51,122,226,80,43,218,240,97,44,126,194,165,65,152,169,243,210,30,218,133,106,207,64,69,142,78,60,13,251,227,226,137,141,51,8,228,3,158,195,115,70,254,209,175,243,132,22,23,214,128,31,158,219,134,219,47,164,28,49,142,172,86,84,239,178,234,183,114,139,22,190,130,224,152,9,92,221,135,242,216,133,84,119,21,35,64,155,237,148,100,184,139,50,59,14,238,118,213,11,55,18,115,142,30,43,
+243,132,246,62,243,140,205,48,53,162,107,43,89,130,205,181,60,135,197,197,153,202,69,30,126,64,221,138,200,29,146,8,69,87,96,166,137,28,201,25,94,199,176,29,132,15,134,167,65,242,5,187,74,139,106,36,173,35,107,48,123,193,48,136,82,15,179,164,148,223,146,40,137,238,30,8,247,25,12,121,121,97,49,190,103,42,199,215,40,154,205,91,76,156,59,88,170,161,175,120,92,47,117,111,43,80,222,196,74,15,15,249,163,52,155,58,88,91,99,183,181,205,35,78,22,71,213,92,72,243,86,254,245,18,10,45,75,222,4,22,246,82,170,75,210,220,65,221,156,118,53,110,109,172,83,87,0,45,202,112,36,44,220,137,123,35,84,79,243,90,142,27,100,244,54,36,243,220,226,93,55,253,69,235,172,194,122,131,93,246,140,232,216,166,8,91,81,158,144,213,122,157,143,110,188,183,212,42,39,3,166,236,146,206,163,100,108,71,233,72,149,227,84,39,101,51,182,238,17,227,24,79,137,158,109,72,175,231,31,143,67,231,76,95,160,76,179,83,237,25,55,254,162,99,97,177,
+49,78,9,109,232,83,168,247,135,146,81,254,146,159,190,82,108,107,23,90,59,234,109,82,144,228,93,116,222,8,78,91,30,219,242,94,237,102,103,105,227,1,93,63,236,201,169,133,86,152,36,167,248,237,238,237,173,166,188,212,180,57,168,161,86,232,97,39,116,117,166,58,12,134,18,243,134,250,149,124,190,88,161,225,91,246,89,107,180,178,122,26,28,42,34,106,50,102,73,111,216,51,24,103,107,100,126,67,155,45,179,240,88,231,106,73,59,244,209,45,76,235,233,173,46,110,13,29,81,237,131,251,176,80,99,202,69,15,103,56,7,10,195,226,99,74,99,244,167,131,116,167,175,130,13,96,171,187,210,96,56,189,124,135,221,22,58,227,92,63,151,47,110,111,40,26,124,245,193,121,28,99,219,230,99,110,103,60,78,117,64,37,77,148,245,153,6,85,99,71,186,125,225,115,44,55,167,17,97,235,27,15,249,56,103,181,201,20,216,9,23,51,57,237,22,135,78,109,174,113,15,57,11,75,146,11,174,127,78,134,220,238,186,140,188,245,200,106,79,122,226,211,27,57,233,171,
+50,106,55,201,243,14,70,229,62,121,95,133,66,25,150,157,27,3,170,37,22,93,101,243,204,222,43,191,217,40,68,29,238,161,210,199,39,213,174,59,215,107,42,179,170,165,86,35,105,156,247,237,229,2,209,253,29,11,166,218,212,234,162,220,126,150,218,80,170,15,23,20,65,211,69,237,188,252,160,71,238,207,225,194,168,172,243,97,37,86,184,184,185,105,36,188,27,87,145,120,159,71,66,226,114,54,129,219,114,37,169,161,37,24,165,30,119,64,172,219,203,44,82,183,205,167,108,172,233,178,74,150,118,127,163,160,48,95,40,111,14,235,155,148,76,47,181,112,96,200,177,157,65,9,199,236,119,148,52,123,219,246,80,83,195,178,135,22,136,186,199,80,199,233,191,108,168,12,26,167,46,81,82,22,45,146,17,247,142,37,223,18,180,244,149,210,252,35,222,178,191,147,76,81,173,37,217,54,115,99,198,205,106,227,66,118,75,198,37,93,236,68,216,81,244,60,9,107,86,114,86,43,156,180,57,210,201,232,240,205,77,126,102,135,143,59,97,171,246,45,189,131,254,188,188,198,
+140,32,183,245,46,178,79,184,190,89,166,239,29,122,72,74,22,189,76,196,12,85,118,243,108,75,122,218,76,11,34,137,90,99,159,222,54,158,92,9,100,23,205,71,133,117,63,165,176,63,4,90,18,214,173,94,64,238,137,45,190,178,18,37,233,207,168,108,225,227,48,190,99,179,149,109,184,163,152,90,198,12,52,66,59,5,234,50,105,151,166,29,158,232,57,106,174,247,52,106,84,4,15,46,118,147,49,156,200,170,147,61,204,40,111,243,26,164,142,73,73,42,240,33,57,27,123,218,84,157,99,208,242,97,49,78,168,215,201,92,97,245,248,56,118,47,240,53,155,145,162,50,198,62,57,61,138,116,76,138,102,212,94,14,116,214,179,6,86,169,102,241,75,137,22,186,143,105,56,45,197,28,153,84,122,190,148,210,158,234,58,154,163,136,196,144,56,61,88,37,109,43,84,88,91,203,211,196,19,2,135,178,6,185,160,92,39,213,138,212,205,245,22,79,173,204,87,133,7,108,221,46,242,222,101,234,164,90,46,60,49,72,211,208,188,122,6,239,12,153,173,231,27,82,182,83,
+181,31,53,107,247,124,3,183,124,254,254,106,1,185,205,168,182,87,91,150,7,85,125,70,115,57,199,162,118,242,78,199,188,155,121,52,147,137,146,30,10,164,68,144,69,220,49,249,9,225,228,110,138,232,221,148,165,205,61,175,34,131,217,234,242,172,219,30,6,23,117,234,102,59,123,75,131,48,37,105,125,88,43,43,148,253,166,124,33,182,234,114,63,244,67,251,132,211,61,195,186,146,166,105,23,204,21,26,201,38,60,209,206,155,8,152,135,136,224,72,83,11,184,78,3,2,246,124,119,67,96,139,217,100,52,188,219,60,76,45,180,30,55,238,106,156,173,210,9,187,104,63,203,109,71,144,15,254,188,96,91,25,19,33,23,250,241,243,109,53,199,97,237,10,172,204,48,165,30,77,84,57,251,17,170,131,71,163,172,219,156,183,198,84,135,206,84,40,121,86,223,77,134,106,43,151,230,91,123,124,179,214,19,235,19,119,221,172,115,28,63,211,151,163,182,90,59,228,195,236,133,122,145,61,208,57,253,113,249,246,177,231,82,148,76,146,5,53,185,94,75,66,22,84,72,131,
+172,53,104,216,23,243,55,130,187,71,75,120,227,78,187,185,31,235,159,88,119,10,250,77,217,242,109,116,75,73,9,93,238,178,89,114,123,230,76,125,111,229,12,171,158,84,232,200,220,21,33,245,90,127,107,181,94,176,99,10,59,18,81,56,84,224,215,226,179,119,164,242,26,69,185,148,188,145,224,61,202,165,198,74,104,219,61,75,58,43,251,66,10,238,89,39,234,103,174,133,46,40,229,235,20,219,139,245,221,114,136,134,139,60,83,149,203,216,179,49,159,116,159,102,38,121,109,204,86,62,142,170,70,100,12,139,63,186,155,89,198,114,205,119,216,147,19,105,206,123,145,61,189,101,155,42,154,189,129,118,72,149,132,215,123,204,20,65,180,156,89,51,196,69,221,20,193,78,206,240,109,199,205,53,105,217,121,238,68,18,68,94,239,58,251,102,53,146,148,197,217,121,162,10,195,63,14,73,81,247,241,252,85,90,41,159,105,172,238,196,52,11,92,33,183,128,119,169,229,206,92,178,191,67,105,28,146,135,93,174,164,154,188,116,29,243,218,46,146,53,238,37,44,81,21,177,
+7,155,66,30,183,247,100,185,109,158,71,61,242,222,18,162,235,109,116,230,0,195,21,22,107,173,179,43,12,151,217,137,171,244,188,6,174,166,88,228,26,175,232,78,21,213,67,29,240,177,244,156,43,178,109,207,22,131,216,155,250,29,74,159,117,165,98,104,57,109,251,130,182,64,38,10,125,51,184,51,50,101,115,165,179,100,45,105,230,186,68,76,60,64,235,49,209,213,188,206,225,143,248,75,185,88,233,158,162,160,242,147,45,133,31,15,56,7,211,146,199,89,74,101,125,224,96,100,117,206,205,146,15,229,22,173,166,207,196,206,86,234,177,119,142,66,186,133,103,205,246,185,45,99,196,115,54,59,229,133,109,250,73,203,168,91,77,5,188,25,254,126,217,119,82,146,70,216,225,149,253,17,57,198,174,138,22,217,137,68,28,207,110,153,73,100,121,57,119,165,194,108,138,82,13,199,98,108,71,54,215,69,37,162,82,209,162,219,37,184,161,110,14,185,43,164,165,139,206,133,237,66,75,52,168,231,212,151,85,206,26,61,57,228,142,39,199,78,231,34,173,93,183,165,85,80,
+30,250,56,133,176,15,203,37,31,10,136,81,99,60,114,221,27,104,230,48,250,152,5,133,95,189,46,121,13,213,1,89,42,94,83,174,83,227,55,236,170,176,181,145,74,122,110,122,11,165,221,214,250,165,242,114,143,151,75,154,4,100,204,169,164,230,35,41,154,215,11,98,151,191,202,92,118,170,253,26,141,240,192,172,13,251,215,60,92,91,34,214,44,120,183,70,179,206,19,253,229,241,238,30,58,252,224,109,173,175,88,88,129,179,57,149,75,250,120,162,150,216,215,22,27,134,97,192,67,170,105,183,41,231,221,77,94,150,123,188,183,231,18,179,215,177,88,139,242,130,17,216,87,228,147,242,166,35,50,131,214,72,180,113,198,122,91,37,145,154,88,242,66,102,143,54,20,173,70,213,216,109,107,99,150,65,46,169,136,42,43,157,146,159,9,163,195,183,151,163,131,99,35,210,101,99,198,244,201,57,151,149,58,171,197,229,87,200,3,18,3,75,100,101,83,183,155,20,114,237,204,85,59,98,239,219,88,197,164,182,210,20,34,185,231,28,81,99,153,169,115,160,244,88,34,77,
+201,113,84,194,11,244,77,255,14,67,170,98,248,243,53,30,217,121,120,206,28,114,163,22,253,158,159,64,100,169,102,105,34,77,252,8,239,138,147,227,119,172,173,150,126,53,131,106,161,240,52,175,162,232,216,89,220,186,44,29,58,59,106,105,195,93,176,97,83,122,139,113,150,40,16,246,233,117,228,105,53,25,219,59,188,55,242,218,126,123,147,193,96,228,51,245,115,175,109,203,149,214,173,54,202,189,66,133,107,216,213,97,144,130,221,219,8,127,224,154,73,121,7,234,76,5,187,216,219,85,239,36,11,205,148,79,70,8,16,184,151,242,200,40,27,202,156,172,50,108,11,40,157,201,83,193,68,179,236,157,85,70,69,128,164,238,226,220,94,90,222,92,75,160,101,195,157,84,157,173,42,235,197,195,29,43,253,216,167,197,201,248,194,27,231,89,191,228,222,10,230,84,182,179,45,181,60,28,243,8,201,186,142,61,19,143,93,178,195,152,146,184,147,90,94,224,56,112,55,55,52,81,237,206,181,75,203,113,26,169,121,215,102,89,116,125,94,192,239,119,14,180,77,171,245,16,
+137,181,239,103,241,108,119,227,158,34,154,191,147,72,98,216,149,81,92,234,137,20,154,202,94,121,143,192,159,191,187,58,173,22,170,205,20,101,167,198,46,85,25,173,96,58,232,84,161,196,155,216,1,93,198,48,37,174,137,123,94,149,223,174,89,222,160,211,176,221,60,150,237,164,248,10,88,170,200,68,93,115,97,179,148,116,135,189,46,110,221,167,106,236,222,35,235,46,242,104,165,180,35,91,137,50,78,77,54,14,77,209,36,91,226,214,56,89,126,234,53,141,118,119,31,232,241,99,138,237,21,158,54,167,40,80,194,55,13,70,138,162,143,63,110,36,109,76,5,97,15,47,71,38,188,29,173,46,239,78,59,114,9,194,138,119,157,85,13,231,174,20,164,6,89,36,246,225,138,89,140,160,190,119,87,120,44,200,238,71,26,148,34,127,77,184,61,217,210,176,43,198,235,81,205,188,200,105,164,241,91,39,171,45,97,205,171,176,27,30,203,163,125,235,38,123,245,38,242,120,51,255,208,183,55,130,58,182,2,183,131,59,44,9,3,115,4,47,74,189,124,80,161,87,220,215,
+247,168,12,77,188,50,191,178,96,57,32,207,221,9,71,78,165,156,81,185,14,214,240,235,84,93,52,114,79,86,232,135,131,206,60,237,190,113,239,22,177,34,179,241,225,53,105,54,119,221,245,142,204,205,29,99,104,20,26,150,6,97,71,188,227,126,247,47,142,56,136,143,63,206,215,239,172,248,47,255,7,168,39,54,51,
+
diff --git a/uppsrc/ide/app.tpp/Topic$en-us.tpp b/uppsrc/ide/app.tpp/Topic$en-us.tpp
new file mode 100644
index 000000000..8ab9a573a
--- /dev/null
+++ b/uppsrc/ide/app.tpp/Topic$en-us.tpp
@@ -0,0 +1,191 @@
+TITLE("Topic++")
+COMPRESSED
+120,156,132,187,233,111,98,105,154,47,248,175,132,186,122,174,110,119,103,149,194,91,44,153,26,169,165,190,243,97,62,204,157,209,157,190,159,74,165,169,168,204,232,170,208,100,101,228,100,68,118,117,207,104,90,118,120,7,3,6,27,48,187,217,140,217,13,24,48,235,177,177,217,13,152,125,7,155,157,195,190,28,246,101,14,145,217,219,29,141,198,150,33,224,188,207,251,60,207,239,249,61,203,123,142,226,215,203,207,254,252,207,159,127,241,252,23,207,255,127,126,190,252,79,111,255,238,205,143,223,126,252,205,175,191,93,126,245,234,171,119,75,75,203,207,191,122,179,244,242,171,255,249,245,87,255,244,79,255,244,171,165,213,231,175,190,90,108,182,4,111,182,244,124,117,101,105,121,9,254,238,249,234,242,203,165,181,215,207,95,175,189,90,122,245,124,229,229,234,242,218,203,231,107,95,126,255,230,135,55,127,252,205,175,223,188,90,249,234,47,255,203,11,88,106,249,139,181,95,172,44,173,44,61,95,122,177,188,10,175,122,190,242,124,121,117,105,121,109,233,213,171,213,165,151,107,
+175,86,94,191,120,241,229,215,111,190,255,248,238,253,119,191,249,245,239,22,114,171,176,216,10,44,246,252,229,171,23,171,75,176,208,234,218,242,202,203,181,85,88,120,117,21,54,111,5,86,252,242,197,203,151,95,126,124,247,241,219,183,191,249,245,187,133,221,176,181,127,179,176,114,245,139,23,191,128,173,91,126,9,75,174,46,175,190,88,93,121,181,188,178,244,106,121,249,197,235,149,213,215,171,176,217,75,203,95,190,251,248,22,54,242,119,171,203,95,189,129,255,22,98,107,176,190,213,181,213,165,21,24,145,213,151,107,43,240,178,151,240,251,234,243,215,75,203,176,210,87,207,215,214,96,125,111,255,225,159,97,250,29,12,208,2,164,133,236,11,88,229,242,203,181,133,196,171,213,87,75,43,47,95,45,175,46,191,88,134,141,120,254,18,118,116,97,193,218,151,223,188,253,240,53,44,187,178,188,244,213,71,216,172,175,254,230,175,215,190,90,130,133,95,126,241,242,23,203,207,95,63,95,126,241,242,53,172,20,54,24,246,121,229,245,235,165,149,87,176,210,213,165,181,231,75,
+43,95,126,253,254,27,216,207,223,45,175,61,95,249,172,241,21,28,138,23,240,206,159,97,89,123,177,4,27,189,188,242,10,86,249,114,105,101,5,126,93,91,125,245,242,203,15,111,23,193,248,248,254,135,223,252,250,47,255,250,63,62,255,213,243,95,45,175,173,253,197,66,252,53,44,254,106,101,117,101,101,245,197,235,213,165,231,43,176,26,120,143,213,5,102,47,158,195,225,92,90,91,126,245,229,239,222,124,128,117,126,132,191,122,249,19,178,75,11,54,193,216,175,188,90,91,129,85,191,128,95,224,184,194,14,174,192,248,44,191,94,125,181,178,242,234,249,151,95,127,251,230,195,135,159,65,90,0,244,151,11,39,151,150,190,88,90,250,197,203,5,182,107,43,203,171,175,23,224,172,44,195,32,47,191,88,123,189,4,163,188,246,98,245,249,242,151,63,188,253,63,126,124,247,195,219,63,190,253,14,134,249,29,76,143,175,254,57,68,63,115,17,54,230,39,42,46,127,177,180,12,147,113,237,197,139,231,11,188,214,96,66,44,175,172,193,128,63,95,122,181,10,91,4,255,194,
+97,254,248,51,27,127,247,175,62,172,124,177,180,242,139,215,203,171,43,176,37,175,87,87,97,4,224,13,150,94,47,45,45,61,127,5,255,194,158,193,184,124,230,199,210,207,196,250,89,253,79,226,171,95,44,173,254,226,37,76,99,56,82,175,87,23,234,95,175,44,240,91,134,225,95,126,241,124,13,142,195,242,79,226,203,11,212,151,255,28,198,125,105,249,213,226,239,51,242,75,107,95,44,193,249,0,155,184,180,182,6,251,189,2,67,189,252,10,246,125,13,198,126,229,51,197,151,94,190,250,242,63,191,253,211,135,255,244,230,227,219,159,9,243,151,127,243,231,63,49,109,233,197,23,75,47,126,241,124,33,191,246,234,53,28,192,165,213,5,126,43,171,171,175,151,95,175,172,172,45,191,94,91,121,241,28,198,241,195,79,9,189,16,94,164,212,231,116,252,151,77,94,126,177,244,18,78,46,216,215,181,53,216,251,207,98,176,231,47,151,22,166,44,191,122,253,98,129,194,207,155,252,246,151,223,190,251,110,97,7,204,140,175,126,34,195,95,254,205,95,45,45,189,92,108,244,
+10,78,154,87,175,94,60,95,121,13,131,1,99,240,124,13,102,58,92,16,94,193,129,134,227,188,12,167,193,162,34,124,253,191,191,249,253,219,223,254,242,231,108,253,108,194,130,129,107,43,107,175,22,188,133,37,97,211,97,35,224,125,94,63,127,254,2,254,230,213,43,56,155,190,252,253,155,239,255,29,1,151,159,127,177,252,28,102,17,92,127,214,224,164,132,117,193,244,123,254,122,81,75,224,202,0,71,0,46,69,175,215,126,98,224,111,127,249,221,219,15,31,223,126,3,7,127,237,249,103,183,151,151,190,88,94,130,177,131,249,183,182,246,106,117,245,5,108,47,172,251,229,162,52,45,66,8,39,240,218,203,149,47,255,151,55,112,190,252,95,255,219,255,253,223,253,15,255,249,151,255,245,127,125,246,235,15,203,95,61,251,219,247,223,191,251,250,183,127,245,219,191,250,15,191,249,245,135,231,255,230,243,179,119,31,158,189,121,246,241,253,251,111,159,253,221,251,31,158,125,243,246,13,140,214,239,159,253,233,221,199,63,60,123,243,253,247,223,190,251,250,205,162,174,61,251,
+225,237,183,112,52,191,121,246,205,251,175,127,92,176,251,195,175,158,253,143,31,159,125,253,230,187,103,191,123,251,236,199,15,240,149,143,239,159,125,255,195,251,191,127,247,205,219,103,255,229,221,215,127,248,91,184,210,192,82,31,222,255,248,195,215,111,63,124,222,252,223,236,247,225,217,127,124,247,221,215,223,254,248,205,66,217,31,222,126,251,253,95,124,241,211,6,139,140,127,11,191,191,251,110,161,237,143,111,190,251,241,205,183,176,133,223,125,243,12,126,127,191,88,243,207,22,60,91,148,148,95,61,251,159,222,127,248,248,175,86,61,251,199,247,63,62,251,195,155,191,127,251,236,237,119,95,191,255,17,222,228,7,120,155,63,253,225,237,119,255,222,181,255,250,217,247,63,193,87,159,125,253,195,219,207,158,45,116,192,250,224,64,127,3,59,180,88,249,175,32,253,27,99,63,254,225,45,44,247,187,15,112,134,252,197,175,126,70,243,255,5,234,199,197,191,96,179,23,174,188,249,1,54,235,253,223,61,251,153,69,48,112,127,251,135,183,255,248,249,218,183,239,127,15,227,241,
+237,183,255,248,236,155,119,11,224,190,121,246,238,187,103,31,222,254,253,219,31,222,124,251,236,247,63,188,255,241,251,15,207,126,251,203,103,31,222,255,241,237,79,31,159,125,247,230,143,111,127,218,247,195,71,216,224,55,63,124,243,238,255,124,251,225,139,103,191,253,179,15,63,124,253,219,63,123,246,225,15,239,127,252,246,27,24,154,239,62,190,129,247,90,64,244,219,95,254,240,246,239,96,71,191,251,250,237,207,235,96,180,224,165,239,126,10,202,123,216,161,31,254,101,225,127,19,228,133,0,28,53,120,245,66,229,191,32,255,255,29,214,255,6,145,159,96,254,246,221,239,126,120,243,195,63,46,52,194,109,242,205,239,190,125,187,192,227,223,64,250,19,90,112,200,225,0,191,249,225,247,111,63,62,123,251,15,111,191,254,241,227,231,165,139,184,188,253,135,239,191,125,255,238,227,207,248,255,113,1,19,204,185,31,126,166,192,223,190,135,65,123,251,236,15,239,255,4,95,253,172,228,51,43,191,121,255,29,236,241,226,202,111,255,236,167,208,252,217,179,127,129,2,222,242,205,
+31,191,255,246,237,191,53,120,229,171,103,255,9,238,113,63,188,251,220,202,23,54,254,107,68,255,244,238,187,111,222,255,233,223,121,247,223,63,251,235,191,126,247,71,56,164,95,194,3,193,210,127,88,122,249,98,249,211,166,117,243,242,211,250,250,230,253,116,29,254,25,16,169,85,218,190,158,102,222,220,144,234,78,183,138,179,141,209,93,97,162,101,237,221,33,88,159,178,235,248,27,202,94,213,118,101,35,108,109,110,92,156,51,171,55,132,218,190,243,184,162,98,101,154,227,186,194,65,37,241,54,216,10,18,214,106,46,250,78,80,165,73,233,110,215,126,190,161,206,56,57,227,139,79,196,61,123,221,176,225,221,152,65,245,100,0,28,132,130,225,6,79,232,193,12,141,233,121,191,83,15,51,64,80,27,156,142,4,19,181,143,167,67,243,18,135,174,177,153,227,39,12,247,238,120,51,227,209,17,183,193,240,148,133,44,197,105,216,210,72,30,185,34,87,210,185,91,59,184,41,205,45,150,146,184,194,238,68,212,61,58,21,48,20,79,245,119,123,251,167,152,67,180,137,236,209,
+80,246,152,42,148,117,210,164,14,90,198,161,246,62,230,246,148,145,21,43,93,68,27,159,174,207,104,113,121,13,234,142,77,100,247,221,166,91,186,93,209,57,61,131,11,109,7,52,94,109,148,125,58,71,74,5,181,33,79,173,209,162,15,164,198,136,125,224,52,226,128,234,81,11,58,142,103,248,12,36,166,53,232,242,252,115,213,17,151,109,100,156,68,215,15,55,124,85,125,195,103,178,49,194,190,1,127,253,80,158,13,142,238,143,157,28,127,69,192,176,151,175,154,119,205,61,53,1,43,208,87,6,65,15,66,138,62,155,112,137,181,128,46,121,225,53,157,64,238,176,65,53,236,236,240,204,246,124,112,60,154,136,142,152,33,233,64,23,64,239,89,9,94,226,33,206,180,199,220,58,196,25,3,91,119,142,18,224,160,171,9,108,171,15,10,42,239,76,211,112,249,86,144,241,225,204,103,233,206,177,222,214,117,19,74,54,90,234,54,228,245,206,105,52,190,74,160,237,96,142,36,39,83,27,71,91,125,34,129,204,136,206,67,79,13,185,100,222,86,193,26,6,40,202,14,36,
+219,155,136,82,51,193,118,123,35,113,229,175,40,61,30,99,93,223,229,192,218,124,69,18,189,27,244,111,29,22,216,253,244,190,47,198,149,59,232,247,218,204,62,77,50,205,76,138,209,120,223,216,221,144,217,137,40,43,177,62,70,167,180,189,142,222,181,155,9,183,184,68,131,188,72,239,236,106,1,51,14,85,198,160,61,20,172,51,115,231,142,209,104,227,138,165,4,202,105,62,67,77,78,244,198,25,17,44,137,93,97,59,85,142,27,194,37,40,246,99,171,91,93,25,29,239,242,105,186,178,189,207,238,154,76,253,251,248,142,86,51,96,158,216,137,192,149,127,155,178,110,214,166,113,250,98,178,206,243,135,209,214,136,252,246,158,36,212,105,106,219,125,27,103,35,239,181,59,15,181,105,85,32,109,56,86,89,166,177,49,171,56,159,26,178,129,221,201,85,135,40,58,4,21,243,11,122,223,37,196,199,48,197,54,215,165,99,17,82,189,230,152,119,80,111,195,14,222,42,176,135,176,74,218,197,94,81,197,154,70,219,210,66,45,166,79,210,131,118,142,25,185,77,208,128,73,
+99,9,204,180,246,216,39,4,137,184,77,76,147,115,243,102,119,222,151,12,240,216,211,160,96,199,214,71,18,246,62,181,229,167,10,254,165,202,25,228,109,29,46,54,187,115,74,26,247,73,93,167,65,143,141,251,77,6,78,66,195,110,117,35,78,81,92,133,243,212,13,151,206,104,54,235,97,240,196,177,252,1,94,33,0,12,179,218,195,204,81,48,142,174,37,86,116,185,209,61,158,131,145,238,198,164,111,25,167,83,88,80,77,156,33,157,130,240,213,148,27,219,191,44,248,42,98,171,68,174,158,125,114,111,10,177,29,147,205,239,221,152,55,204,123,229,139,54,226,240,224,80,110,80,0,83,93,43,26,227,73,24,60,117,141,21,183,240,230,247,131,220,227,148,205,51,168,138,131,19,202,46,102,60,14,55,41,146,70,206,118,85,209,105,186,2,49,203,41,213,102,42,27,141,180,83,219,223,198,208,123,81,41,98,60,75,23,100,117,183,18,79,133,41,36,6,179,1,143,40,209,123,152,241,36,233,65,10,25,218,75,235,166,73,252,102,37,85,164,95,22,50,217,16,79,95,
+187,82,18,141,55,170,28,52,180,34,68,218,202,248,193,237,158,4,17,208,198,38,129,6,244,113,3,5,102,220,157,141,183,114,225,254,65,204,1,25,129,116,165,212,85,164,137,18,195,188,66,75,243,36,254,84,121,224,23,232,98,90,81,62,202,135,204,24,111,61,114,149,205,52,181,168,17,133,211,82,156,48,177,48,247,109,100,194,201,131,201,228,164,90,213,179,206,84,229,153,118,90,30,98,178,53,176,22,26,99,93,49,221,160,76,135,53,175,194,168,208,118,252,108,12,113,34,245,34,27,36,12,173,181,239,133,35,128,211,140,217,108,222,180,25,205,185,58,187,152,81,241,169,201,12,215,103,246,33,95,152,134,102,158,48,154,56,229,147,29,150,179,113,126,207,177,99,28,102,217,245,244,48,112,54,31,38,98,236,142,177,253,192,75,103,135,143,214,34,48,216,136,68,41,13,178,166,85,191,228,82,82,211,167,157,190,212,19,105,186,59,225,244,172,223,211,70,121,98,26,27,58,83,18,105,202,12,115,196,116,186,7,246,185,232,126,28,140,237,50,78,4,12,190,177,84,
+84,5,244,253,51,68,233,54,160,104,170,208,35,59,181,237,221,24,172,211,152,57,45,59,29,220,218,194,158,109,239,40,14,31,88,129,158,207,51,69,205,102,58,140,71,7,116,246,49,201,222,96,220,48,94,214,180,195,184,36,57,139,51,239,226,146,233,48,77,227,26,7,71,236,1,113,50,233,38,48,104,41,181,197,196,250,83,192,172,93,165,62,133,221,169,217,228,122,91,56,111,111,81,26,251,144,144,127,103,43,66,151,232,64,67,95,142,250,92,233,241,36,171,54,123,198,57,134,81,213,213,149,251,250,238,126,133,190,59,177,5,41,192,69,37,123,59,150,226,83,134,86,217,64,108,156,116,110,118,112,20,119,178,239,34,85,52,210,171,188,43,142,78,130,195,122,165,161,27,174,163,226,232,169,211,205,53,41,5,230,173,0,48,40,250,116,156,88,169,231,237,251,81,105,149,151,186,161,10,166,57,178,172,187,149,171,220,95,5,226,236,32,106,31,185,181,200,231,189,230,190,210,100,245,12,41,19,236,147,137,49,177,100,175,212,211,124,92,169,174,207,117,25,69,60,53,
+3,154,150,226,222,238,140,226,109,41,140,87,237,209,163,173,127,169,185,229,121,106,247,180,252,21,72,187,181,38,48,106,232,66,168,98,12,230,45,176,200,184,60,101,31,201,241,1,249,69,204,225,132,118,40,110,172,118,58,46,17,129,97,51,157,146,118,31,172,210,105,243,54,18,174,78,210,113,181,158,94,177,140,42,158,228,220,229,138,86,36,198,105,173,37,42,87,138,180,4,233,242,176,237,245,10,61,64,42,99,142,238,38,251,14,96,67,13,20,134,52,199,99,170,147,230,249,4,125,59,96,8,10,252,22,65,11,11,226,114,1,10,122,125,145,216,55,230,73,202,194,104,221,96,251,243,33,163,214,1,18,216,167,164,211,104,168,177,60,7,24,250,24,235,85,0,23,18,121,51,133,61,42,28,136,24,211,105,19,11,27,97,152,168,30,30,197,187,228,132,18,114,224,227,233,12,52,204,238,38,229,133,144,153,55,185,38,130,6,53,46,32,37,144,241,213,52,17,132,194,84,89,151,89,238,99,166,61,201,197,28,244,154,231,106,69,46,175,133,73,54,45,196,74,81,56,
+231,102,38,178,15,137,73,77,83,88,97,203,99,72,136,210,242,199,2,69,120,230,25,62,222,27,195,211,81,96,211,216,34,222,33,19,190,105,24,184,45,29,36,25,195,116,145,228,96,22,37,213,75,40,118,47,232,107,79,217,193,166,189,118,228,169,93,137,218,105,121,96,62,79,121,59,187,106,125,185,95,12,63,206,180,34,193,208,189,93,50,115,18,1,126,200,224,46,70,179,46,58,206,50,113,218,192,115,125,16,145,13,231,135,229,252,72,12,97,235,124,233,110,226,138,234,237,30,87,115,210,201,104,46,140,25,61,248,202,109,190,109,165,211,176,40,150,166,183,137,81,166,120,243,173,67,163,187,188,117,40,218,199,50,188,155,13,6,145,4,39,105,227,132,82,79,25,115,132,90,113,58,118,193,30,177,77,231,35,15,85,209,182,84,182,46,188,24,70,15,10,133,141,73,13,244,232,84,211,83,221,97,243,134,136,1,194,237,182,107,215,80,171,113,175,48,58,129,29,15,246,21,184,154,207,80,71,116,54,118,141,218,49,19,195,3,178,55,152,36,19,129,194,144,160,253,
+138,100,98,102,95,128,193,34,227,44,78,144,106,179,143,187,238,157,65,30,54,215,39,182,243,230,123,124,130,51,117,114,213,211,24,21,161,190,217,189,94,172,63,176,131,132,12,126,155,160,13,244,13,250,216,49,81,166,143,133,85,79,164,113,170,74,77,229,220,163,220,109,102,152,197,135,231,106,109,13,211,209,184,221,38,198,29,194,179,203,104,185,128,241,140,182,123,6,116,27,100,253,39,79,76,122,115,105,191,51,27,115,195,200,89,88,25,49,237,17,211,106,89,185,198,197,215,213,137,97,169,169,86,75,227,115,158,0,208,114,207,18,3,188,139,152,158,155,11,94,239,46,209,88,80,100,144,72,2,67,76,116,230,211,9,94,44,217,172,121,59,60,70,65,49,175,244,141,23,126,83,107,158,172,56,65,240,208,14,243,142,195,99,183,141,103,158,65,191,41,26,122,186,185,129,111,110,232,213,44,86,75,186,205,44,122,225,228,111,183,117,90,43,122,90,108,6,42,216,221,180,98,92,73,167,83,154,9,194,185,139,185,242,85,7,121,197,46,134,154,80,78,30,242,20,140,
+158,158,115,209,121,9,124,5,199,14,142,184,124,95,141,28,146,39,5,225,212,104,108,178,96,238,193,251,145,106,48,231,82,10,247,15,138,124,56,49,169,146,145,206,51,137,177,168,212,29,52,70,1,162,88,91,187,214,226,121,140,110,101,99,147,7,180,180,6,29,158,122,62,155,91,153,105,99,110,106,178,41,113,160,223,122,158,106,88,5,58,117,166,210,197,4,26,147,155,67,142,195,106,74,166,196,7,82,127,201,83,76,92,185,181,34,160,242,212,166,165,239,230,225,20,141,41,164,162,187,62,3,204,51,59,71,202,44,115,139,152,67,188,153,195,151,36,26,219,7,218,161,218,0,4,159,120,234,0,182,72,157,49,130,71,152,193,56,248,56,29,203,74,243,178,47,83,100,72,164,3,158,54,238,91,183,122,22,19,146,129,64,42,223,18,147,242,209,147,157,167,59,2,220,227,205,82,41,202,160,26,32,79,221,182,15,23,238,17,114,231,137,45,161,25,171,158,94,104,83,74,53,62,22,219,79,196,148,74,223,176,222,63,77,37,148,217,80,33,114,73,231,113,50,113,203,
+173,224,198,130,172,153,29,10,176,232,74,33,9,82,221,10,212,250,34,107,128,234,72,203,19,253,83,67,15,41,60,62,137,46,59,154,176,123,39,208,117,201,25,118,197,251,193,235,195,153,208,61,30,54,220,179,225,16,48,212,183,179,116,223,20,28,39,125,83,98,76,128,198,56,159,64,130,75,112,100,17,240,28,16,244,80,164,151,226,187,126,17,48,111,20,61,59,245,124,101,206,33,21,54,189,125,209,216,196,233,220,118,186,50,81,124,126,119,82,223,155,110,78,130,132,137,208,212,183,90,44,61,45,194,121,151,85,62,72,217,247,118,193,145,76,16,173,158,86,0,218,116,224,244,35,51,27,165,166,49,140,102,219,243,234,89,30,89,117,106,6,195,234,46,29,202,7,30,245,91,211,74,251,19,151,167,242,213,109,85,90,114,176,65,39,156,80,220,65,154,8,216,42,230,227,244,124,111,12,21,114,60,177,75,83,76,154,169,49,49,209,138,142,240,51,87,15,88,105,218,191,33,192,179,138,119,126,39,99,48,139,244,52,162,94,99,238,43,203,188,162,176,236,209,80,61,
+202,202,34,146,82,153,51,41,187,241,206,254,241,231,121,113,140,173,50,122,82,160,94,209,232,25,52,205,99,150,77,164,79,68,29,131,73,1,28,92,180,193,177,213,61,241,120,154,222,6,217,152,241,236,60,221,74,40,112,75,36,63,17,147,202,9,174,41,180,164,38,67,155,81,170,216,233,235,38,157,89,156,40,26,223,92,50,64,28,131,63,226,102,194,30,248,37,170,192,109,4,221,172,204,13,136,76,1,157,167,157,142,142,56,184,154,183,62,65,97,154,174,190,77,86,132,83,67,80,95,195,42,121,64,213,69,145,164,229,163,99,162,148,62,141,244,243,148,254,184,22,183,143,167,29,165,116,47,137,15,56,111,192,205,70,173,106,83,94,84,100,77,210,150,50,123,27,192,244,106,137,193,253,121,223,88,74,203,142,177,32,146,94,41,222,53,193,14,125,100,226,126,114,103,165,243,180,199,223,213,28,102,134,6,103,135,81,186,175,70,26,157,177,60,98,5,130,195,91,222,147,94,61,79,206,4,109,39,34,237,209,87,173,106,157,97,224,151,227,162,3,70,98,210,238,74,
+247,124,187,157,122,90,66,60,50,251,5,147,188,60,164,36,206,247,211,147,164,61,29,193,97,102,77,191,242,72,154,210,79,44,243,20,75,79,159,87,25,4,36,30,134,184,215,72,119,188,36,93,95,219,34,218,149,129,19,233,77,137,153,42,180,197,141,4,39,60,141,20,128,89,234,188,103,214,141,180,105,211,52,3,144,55,157,52,113,171,30,56,150,29,250,79,9,243,17,115,187,133,147,7,234,34,181,134,213,111,111,196,168,227,113,72,227,101,231,211,64,84,173,32,142,154,10,99,15,186,107,165,171,85,172,144,33,26,89,176,105,152,145,19,124,43,177,159,183,54,166,15,152,187,90,38,26,206,2,147,18,27,131,232,165,18,206,112,3,235,199,64,89,121,86,246,88,43,31,78,101,129,214,92,48,44,1,147,140,61,86,108,249,38,66,66,197,142,146,151,71,151,246,61,102,101,43,130,101,116,165,180,190,1,234,98,14,244,249,28,155,198,38,0,158,193,217,117,177,46,230,25,251,200,92,169,143,161,106,138,194,193,5,101,7,163,173,203,115,243,138,165,103,24,201,115,
+82,161,181,103,204,196,114,12,161,170,218,177,135,181,69,67,249,83,160,162,192,239,165,13,248,189,226,141,203,225,158,219,220,247,199,169,105,189,2,119,192,249,104,167,146,146,63,141,98,112,59,28,19,32,133,218,83,74,124,42,200,143,136,217,154,104,234,188,169,84,60,137,121,173,60,150,140,104,145,74,237,58,37,44,184,147,197,126,35,86,236,80,164,179,20,15,199,167,56,89,108,2,26,19,34,53,230,227,75,43,239,44,102,131,122,108,180,36,97,212,151,89,79,112,232,71,252,96,118,223,29,79,136,237,26,204,158,45,122,168,222,185,232,80,234,161,42,192,233,4,114,83,227,233,128,197,96,140,159,92,173,121,100,47,227,182,78,212,202,65,16,127,12,212,187,71,25,131,133,139,209,107,251,114,231,113,163,100,174,154,80,209,69,184,203,73,23,198,102,133,107,22,201,154,167,208,143,145,125,220,16,234,155,73,73,140,127,84,44,82,101,167,124,196,78,150,107,59,145,14,231,86,173,117,210,31,104,245,89,101,197,76,21,183,61,170,187,84,137,72,56,152,97,46,209,192,
+150,172,126,230,18,39,34,245,187,193,197,254,176,226,140,41,44,61,153,46,175,235,217,236,186,190,208,128,11,12,229,109,120,36,182,62,18,165,164,4,7,97,155,97,135,211,58,9,152,221,96,172,197,126,185,139,49,28,230,207,30,188,152,141,249,238,9,71,103,27,204,187,5,45,214,59,240,118,242,6,187,8,62,102,117,83,119,188,86,18,158,135,105,61,99,246,73,97,188,108,247,118,229,86,222,188,212,61,192,12,209,7,7,104,106,215,104,192,102,11,104,253,204,160,98,239,26,42,185,71,202,153,181,7,204,186,140,74,193,218,215,23,114,30,161,202,218,211,103,42,116,162,89,58,174,219,1,92,229,94,43,220,183,74,118,112,218,192,254,32,36,226,176,145,65,218,141,56,88,164,169,229,189,118,185,146,110,141,67,240,56,150,106,162,121,229,138,84,147,77,6,5,155,173,187,144,39,61,119,77,73,99,145,14,242,216,160,205,177,196,152,247,48,210,180,139,162,26,61,221,169,243,112,236,176,217,234,148,148,108,144,115,22,150,147,248,4,159,161,63,53,209,252,240,251,84,
+23,11,192,141,223,77,196,128,28,84,192,233,4,247,187,159,4,172,73,55,36,67,82,213,195,93,230,253,36,87,45,38,24,232,225,89,61,233,75,149,20,253,201,209,137,162,61,39,37,130,39,174,147,24,35,226,46,34,80,22,231,3,146,18,247,132,213,184,75,40,171,33,242,42,1,11,48,79,171,138,166,235,120,106,216,41,203,234,62,117,49,122,62,73,206,73,196,199,168,2,35,56,81,228,29,126,140,126,216,40,86,206,129,200,84,30,130,54,21,29,134,175,83,46,148,157,25,124,45,153,154,148,247,165,25,90,117,23,24,72,105,10,119,122,118,125,171,99,168,125,87,124,220,156,183,143,59,25,93,235,83,69,90,188,65,144,150,238,245,195,88,58,73,49,103,57,108,253,105,14,238,99,49,70,103,168,58,52,117,247,48,154,94,248,62,49,74,232,118,218,30,67,249,238,164,73,186,96,144,53,201,65,115,183,107,241,104,203,185,8,69,101,57,51,206,115,193,206,149,21,61,243,148,102,157,158,165,175,121,234,110,135,135,104,227,188,87,234,72,251,145,145,30,25,158,99,
+18,71,186,172,214,237,184,163,72,233,142,59,69,129,139,247,51,144,238,52,135,14,137,38,29,97,72,95,219,191,130,194,116,65,119,20,157,42,139,18,202,84,43,105,175,67,68,55,30,227,165,211,103,213,219,232,56,81,189,170,109,87,118,233,115,160,144,43,206,103,39,200,98,82,150,159,119,5,87,154,209,109,215,130,167,37,165,179,188,28,29,152,223,228,139,90,159,120,86,163,195,1,244,157,235,124,234,105,207,218,215,118,91,172,49,71,75,87,128,131,163,106,65,170,243,140,76,174,99,172,55,24,187,67,73,16,8,171,131,144,243,167,44,198,94,7,29,53,32,235,28,105,148,27,228,226,70,7,153,168,35,39,114,157,209,43,168,176,93,112,115,51,216,151,219,227,68,142,103,63,216,173,39,83,174,122,117,95,230,13,14,168,36,222,204,55,108,203,221,245,192,94,11,135,8,220,18,46,139,65,89,209,201,238,27,158,34,52,59,82,67,56,96,12,200,30,183,63,53,15,121,138,243,121,72,77,19,79,50,29,100,248,14,71,115,207,179,62,45,50,90,99,120,114,90,213,
+78,78,27,69,212,186,227,94,76,152,74,14,141,192,237,45,69,181,111,133,12,221,28,233,96,78,115,46,242,100,235,184,101,247,171,211,220,248,89,10,32,66,156,62,154,161,189,106,227,116,87,131,122,105,38,109,164,122,25,13,91,10,93,205,186,195,240,65,189,222,26,134,138,137,139,39,143,7,61,198,14,4,252,13,156,31,184,144,215,154,234,220,29,197,130,214,148,199,57,72,141,210,23,206,46,189,193,69,130,220,25,109,80,215,122,183,137,207,250,123,113,67,22,140,181,156,238,88,63,200,175,60,73,140,46,229,227,84,20,203,134,210,163,17,138,8,84,175,70,86,139,63,197,184,120,58,46,138,53,45,53,102,140,25,185,213,152,206,76,17,113,40,109,216,125,97,111,145,31,234,204,89,16,211,179,152,184,44,47,210,147,115,9,160,33,199,235,228,167,32,129,143,183,29,22,42,9,66,217,222,29,209,48,219,102,152,122,22,138,142,24,212,201,74,173,60,50,211,50,92,207,39,142,59,253,131,166,211,133,171,196,109,170,205,38,49,238,181,83,110,202,237,203,89,164,208,
+164,92,51,48,70,27,231,157,102,156,192,3,70,73,192,190,157,31,201,68,121,57,65,238,199,4,159,100,205,202,35,48,247,17,220,130,155,201,96,223,45,70,154,90,178,200,86,54,216,38,141,155,179,132,244,140,56,159,238,1,98,21,65,23,207,196,170,93,228,60,74,138,104,143,219,124,162,205,26,13,8,212,4,138,206,162,39,91,166,220,156,88,92,246,120,64,115,238,38,115,105,74,92,50,233,148,30,129,163,210,13,241,105,122,87,218,179,112,220,64,47,75,162,225,137,243,2,211,187,211,38,134,167,30,101,42,24,152,216,92,180,221,76,146,87,221,76,145,162,104,112,99,122,136,143,170,90,14,126,212,164,241,70,171,149,49,64,74,243,91,39,244,157,112,224,8,62,136,202,109,24,243,196,87,131,210,55,132,240,125,106,116,223,65,221,54,70,13,52,124,176,167,109,166,213,218,116,97,172,170,41,139,241,185,88,63,139,215,195,24,163,165,82,8,1,64,127,186,45,177,98,80,114,94,192,210,110,143,173,158,209,28,105,107,169,81,84,195,21,174,157,115,177,165,4,95,
+220,96,192,181,68,81,187,94,19,103,149,105,115,66,125,254,56,48,132,104,29,136,172,36,82,21,61,121,74,205,23,75,41,208,68,61,114,162,83,243,30,251,64,157,104,131,187,69,42,91,68,104,232,135,125,168,102,53,84,250,214,217,80,169,78,203,42,60,220,145,145,81,27,40,186,224,237,104,166,191,21,240,196,13,245,253,52,98,108,177,21,249,153,190,178,127,43,192,139,224,176,210,39,46,191,74,231,65,247,181,153,242,6,214,30,214,51,113,73,226,232,120,239,161,178,13,152,227,231,14,105,90,39,24,84,111,68,250,226,6,47,5,15,9,55,118,41,69,206,131,226,185,190,80,199,145,118,134,155,152,70,187,145,235,119,113,242,198,12,50,181,159,4,114,58,113,139,209,18,158,179,9,100,140,89,126,108,247,221,207,3,34,4,242,108,63,189,13,58,106,64,77,39,191,8,42,22,141,139,219,243,135,138,211,10,62,49,104,200,134,180,225,193,40,180,155,223,41,76,251,183,69,218,176,82,183,249,112,217,6,187,51,171,109,180,6,222,66,163,129,199,119,209,186,243,114,
+58,90,22,83,24,83,124,220,137,74,42,230,211,78,22,60,7,88,241,170,82,211,23,37,239,193,250,176,134,180,64,217,145,75,15,122,113,28,55,117,62,168,248,91,119,1,79,150,40,77,9,194,12,69,7,111,13,236,22,225,124,61,216,211,230,137,140,135,32,210,44,11,58,89,71,253,173,6,208,49,51,54,165,108,222,62,179,230,113,119,189,112,152,13,25,207,109,125,88,172,15,243,29,145,216,154,208,65,39,57,77,157,111,108,214,85,58,162,177,24,71,22,170,141,177,179,162,54,140,5,177,154,103,18,15,37,221,112,106,251,189,0,66,87,240,209,148,56,154,2,55,237,48,48,238,218,149,99,198,72,15,38,120,30,112,214,134,134,214,61,41,93,58,107,1,72,110,69,34,50,244,146,92,171,116,220,24,7,32,34,213,248,84,102,221,170,232,243,199,205,108,209,24,128,207,254,158,136,116,113,211,165,146,150,14,238,211,64,129,216,200,27,170,60,56,81,247,212,135,224,45,163,154,248,148,40,76,70,86,65,41,134,190,165,237,167,179,62,49,132,26,21,133,243,28,128,
+118,13,37,97,163,152,101,215,199,114,190,160,7,57,179,221,16,162,181,71,105,119,79,29,169,165,61,142,99,175,85,211,108,111,164,141,199,94,100,173,219,123,42,69,239,245,33,167,163,234,110,39,146,166,96,110,227,134,38,157,68,36,151,8,125,158,127,196,61,153,69,16,199,4,113,24,169,171,156,92,164,76,190,80,223,64,153,232,218,79,18,255,28,119,74,60,87,31,81,112,59,219,84,33,156,150,213,195,64,72,2,18,48,189,166,177,18,245,229,233,40,21,89,87,128,75,172,229,147,146,125,93,27,33,13,128,249,128,0,116,17,248,116,209,216,1,114,189,188,62,120,179,229,64,16,56,8,200,152,96,89,149,169,227,154,87,20,169,158,92,184,89,224,113,197,109,204,73,43,130,19,144,235,133,194,2,19,56,198,29,250,138,5,219,211,153,105,15,49,31,216,198,72,133,186,58,233,219,139,179,172,84,215,235,85,2,148,29,94,234,248,162,157,211,237,166,251,206,108,179,82,60,96,180,27,18,236,102,74,169,77,91,169,94,67,131,58,189,153,65,108,157,39,213,43,242,
+21,112,163,43,85,220,5,184,91,93,66,85,83,155,134,15,176,238,39,147,185,251,52,212,14,207,205,46,68,121,44,214,87,28,21,176,147,82,23,44,129,71,37,209,157,84,100,109,124,165,34,165,238,89,42,154,112,178,105,27,117,208,141,88,147,48,85,209,149,253,62,92,84,47,90,185,104,82,77,237,23,43,103,197,122,91,119,219,31,21,116,179,35,45,158,42,207,183,39,23,240,168,120,60,199,131,54,40,61,117,216,189,74,227,189,152,51,10,19,42,244,19,56,253,124,26,58,47,221,15,228,40,29,122,72,33,9,134,205,253,44,201,192,70,49,238,48,38,76,251,188,30,74,181,171,108,110,197,105,244,146,183,129,241,232,73,236,25,27,70,52,248,40,71,138,207,19,195,197,64,93,143,49,229,102,45,243,108,223,136,42,2,139,251,100,204,218,125,49,49,184,140,239,246,245,13,239,102,202,170,42,75,139,53,109,87,231,176,162,117,160,140,127,25,174,209,219,80,33,236,78,41,134,215,253,106,42,218,160,197,123,198,130,147,142,148,164,180,86,124,124,200,80,118,42,57,
+164,170,95,237,134,92,222,107,193,110,105,207,61,159,135,125,211,125,114,221,56,87,122,166,240,121,189,174,153,28,35,54,103,3,75,26,184,184,157,62,224,27,154,170,121,216,229,11,221,116,121,187,86,13,75,200,179,71,178,92,209,143,119,98,169,138,222,51,188,137,29,245,34,169,113,85,17,210,63,181,199,136,219,190,182,47,101,151,227,41,28,202,169,236,94,130,204,96,123,100,189,187,229,19,82,98,158,179,17,26,5,143,76,2,157,134,84,231,199,5,211,148,107,56,241,210,131,46,7,210,87,187,204,213,162,106,173,212,74,229,1,131,184,207,166,177,103,163,183,30,143,98,140,217,213,109,170,165,249,121,38,171,19,222,79,213,56,178,197,67,217,58,164,155,246,104,74,140,30,18,94,31,236,246,6,157,77,180,148,58,187,54,54,146,106,101,122,40,236,3,143,74,179,211,147,30,226,72,82,97,143,36,3,165,164,161,48,53,120,138,21,93,170,136,206,186,93,161,79,117,169,88,145,174,168,147,122,69,49,165,11,10,74,248,65,186,49,5,231,130,39,190,36,106,47,94,
+141,149,44,94,216,56,9,72,13,169,238,117,230,182,31,209,77,118,136,51,240,106,122,60,131,50,51,64,219,162,205,211,180,166,143,203,235,27,115,169,163,158,166,113,52,48,204,198,19,228,92,53,190,239,204,250,22,67,98,166,131,162,192,56,89,85,204,199,96,49,49,158,10,236,243,254,117,169,162,134,139,174,223,94,142,119,121,54,136,206,120,224,158,104,181,13,43,21,212,168,82,134,10,30,67,1,37,211,228,32,2,225,188,18,181,81,17,195,121,114,157,205,145,64,170,242,226,0,101,62,82,130,131,30,50,76,116,32,206,210,32,184,182,206,123,48,33,224,249,67,236,204,207,175,156,242,28,6,67,107,246,144,73,143,22,4,122,128,186,46,41,210,129,71,105,31,61,79,117,48,227,84,136,110,157,63,98,142,234,133,145,187,5,76,66,45,9,114,94,29,48,26,189,112,34,169,163,27,154,197,22,155,224,214,130,245,146,210,198,168,79,193,254,172,7,205,111,51,201,54,126,126,63,201,92,28,131,164,168,26,13,180,117,220,185,118,150,216,152,183,17,197,52,124,182,77,
+2,198,124,89,147,214,229,164,198,94,88,80,76,205,108,244,116,247,42,135,153,83,218,212,66,3,0,163,125,125,91,232,49,142,155,245,180,81,222,12,55,24,23,157,254,125,90,85,78,167,200,201,254,108,100,96,76,92,82,81,97,214,147,109,241,83,21,38,39,54,163,2,194,75,103,209,54,170,92,197,12,206,4,196,185,119,135,195,51,59,122,66,106,31,115,41,135,190,42,153,161,188,178,194,3,87,36,154,103,20,24,91,33,139,38,202,30,55,253,25,177,172,62,140,58,234,73,185,211,60,102,211,156,123,112,115,104,74,20,150,226,44,73,96,39,240,7,6,254,193,168,76,84,55,232,23,188,88,250,16,220,8,122,163,194,26,187,19,66,229,173,98,61,190,111,236,202,90,93,206,86,60,191,63,52,99,234,6,111,132,11,88,140,204,234,253,94,89,239,154,199,205,176,226,238,112,221,120,232,107,21,221,148,86,188,138,96,208,156,9,134,93,193,29,57,109,93,247,164,196,203,220,116,197,180,45,89,113,232,55,62,104,6,83,127,215,193,166,49,52,237,168,114,63,182,199,
+220,14,210,164,41,172,43,41,162,210,198,66,187,85,220,143,150,7,110,214,81,3,73,36,93,94,220,159,105,15,106,102,171,193,19,87,238,211,21,225,250,64,196,206,211,185,139,219,225,247,235,251,194,61,38,202,122,222,175,95,110,169,179,50,39,196,82,163,243,96,79,79,123,194,100,1,99,107,60,205,225,90,157,61,46,109,64,157,205,139,69,97,3,219,208,31,2,219,38,29,143,59,138,164,33,206,104,247,94,136,143,233,216,200,157,46,203,81,17,226,76,38,50,102,162,59,50,145,159,92,28,147,109,157,223,122,172,73,26,126,137,116,198,110,125,74,187,140,85,12,224,209,101,176,201,51,41,139,17,27,0,204,173,195,199,197,109,69,184,125,214,233,72,244,228,246,210,195,14,179,12,245,27,193,254,167,207,119,235,249,135,183,28,242,226,142,247,150,243,16,7,127,203,220,122,92,124,75,226,144,155,135,63,61,143,20,219,185,65,239,29,117,91,29,240,36,196,173,80,162,154,197,112,12,231,30,132,11,95,85,11,80,144,198,158,254,252,28,111,239,216,145,226,187,249,46,
+225,224,193,242,160,107,236,38,183,212,195,113,203,71,1,247,241,96,128,10,95,215,50,57,19,211,49,184,131,28,49,53,124,119,109,243,208,231,250,188,127,110,32,192,130,217,209,22,101,68,74,70,38,74,10,57,46,11,123,213,145,234,236,211,190,1,97,208,112,46,118,2,74,232,174,116,237,157,66,220,154,173,142,81,40,214,139,118,89,157,181,177,80,202,28,33,120,30,126,136,72,198,160,208,248,251,192,193,101,199,237,143,33,230,246,141,157,156,43,153,120,66,141,70,190,16,63,72,63,139,106,105,155,6,228,5,8,75,236,110,29,182,249,128,47,25,21,7,40,128,202,41,64,35,235,159,114,196,74,85,109,155,177,207,32,41,69,159,197,23,113,184,26,239,230,243,254,54,165,1,216,224,83,42,103,1,81,49,145,84,56,8,220,159,244,114,26,130,79,199,96,209,38,154,123,219,183,167,62,218,148,61,119,43,39,180,199,198,198,122,162,230,142,193,43,134,240,58,4,23,87,233,6,120,174,115,91,37,88,155,145,113,42,29,103,24,101,38,207,198,33,67,237,161,21,170,
+3,248,62,146,219,139,209,1,214,196,176,113,216,199,23,159,76,123,172,197,109,54,145,161,59,178,154,99,249,11,103,225,118,191,244,249,201,176,248,242,60,202,213,34,50,110,93,240,242,38,216,217,96,58,144,168,135,98,178,222,216,38,84,210,37,25,246,161,247,57,94,190,147,199,81,121,17,210,131,197,39,75,198,182,13,41,176,11,191,189,176,61,237,51,118,16,231,135,143,240,35,156,111,239,51,252,38,27,74,118,26,92,184,20,98,110,29,223,227,2,158,240,44,2,96,113,234,158,99,35,52,56,130,151,60,28,154,64,151,32,96,21,173,15,79,104,167,65,23,83,141,92,95,95,63,149,148,228,14,40,187,89,102,234,242,189,185,65,89,78,174,19,37,54,37,124,165,220,165,112,185,163,12,45,133,31,151,88,14,155,210,180,203,33,195,95,143,100,168,79,190,218,222,229,128,222,123,50,109,103,138,105,126,84,233,171,109,240,119,46,225,139,51,246,73,64,45,12,6,179,79,65,7,247,162,198,151,232,79,105,66,17,131,29,164,31,130,123,240,245,146,26,225,28,67,131,
+164,18,133,5,175,175,200,84,234,189,252,41,242,136,34,241,37,4,160,25,176,166,2,27,28,7,114,234,9,201,29,32,82,230,124,176,115,197,103,208,200,112,49,104,101,202,254,44,207,89,96,140,74,204,67,36,65,84,210,154,215,109,235,135,44,188,13,210,199,166,235,100,254,206,9,95,40,185,148,25,172,186,17,231,250,68,57,61,72,244,72,241,154,75,45,236,55,211,70,103,193,77,27,135,109,201,190,50,9,27,25,154,228,240,32,47,27,17,116,4,108,34,16,71,166,81,166,30,216,243,163,202,149,75,31,205,209,43,231,24,110,0,225,208,146,5,181,131,98,229,6,242,237,72,98,193,182,198,98,208,118,10,247,195,138,75,205,79,139,102,201,126,122,42,163,212,130,210,167,99,208,105,23,69,21,170,90,140,25,232,110,110,172,203,125,159,174,5,68,240,238,200,218,18,236,238,238,154,55,57,154,27,48,203,156,9,39,97,234,229,93,42,53,56,188,0,49,65,59,68,213,72,58,119,155,240,62,73,52,31,101,64,12,28,199,148,11,228,80,133,203,227,79,230,200,109,
+39,81,26,238,250,63,221,109,182,132,178,35,199,167,109,228,214,200,110,218,240,243,14,78,240,136,50,15,109,232,62,104,154,192,85,22,237,175,180,170,234,228,252,56,165,73,238,184,100,251,195,88,80,22,21,81,64,191,137,146,199,9,179,92,146,212,121,25,74,167,183,82,3,189,225,49,39,42,0,17,143,157,19,83,197,197,247,58,72,102,37,120,61,209,17,93,238,58,202,5,112,241,186,230,150,91,222,249,180,158,227,138,79,2,149,54,21,67,162,40,143,65,232,216,63,13,178,5,28,237,225,105,240,146,14,231,55,87,132,179,228,129,145,192,55,160,98,204,56,21,174,133,159,159,35,25,195,28,150,219,132,63,8,35,231,210,12,126,17,46,157,105,76,6,55,6,65,126,220,19,152,10,248,237,224,206,16,19,70,12,248,116,36,31,133,247,216,177,17,26,159,225,113,135,185,51,170,205,34,38,25,118,3,178,241,212,124,134,239,94,70,207,71,233,81,39,37,142,27,14,4,169,43,224,36,103,5,33,99,76,94,246,159,89,117,117,173,83,156,214,222,119,203,155,174,205,
+117,27,199,189,193,15,89,196,119,8,109,200,34,224,98,125,138,164,53,192,10,154,32,63,247,76,144,151,135,177,219,152,188,108,27,73,184,154,84,132,42,4,176,205,34,215,176,103,215,150,131,13,108,112,86,124,50,152,166,77,51,119,208,106,71,104,178,57,127,51,170,185,188,67,68,53,245,170,79,218,8,27,160,80,137,197,114,36,0,66,238,68,44,147,84,132,128,36,24,27,10,179,222,163,225,248,148,143,213,88,82,54,193,131,191,64,207,134,207,129,64,187,214,77,90,103,180,27,42,24,65,216,181,59,248,176,135,198,0,0,236,206,198,186,58,199,21,104,130,217,180,42,16,56,183,11,104,74,31,59,120,227,221,15,8,251,27,233,72,222,220,150,241,70,152,177,166,83,24,16,244,188,107,193,140,224,216,64,250,197,199,24,86,173,103,218,246,206,134,34,248,188,229,118,100,17,156,88,238,196,137,57,115,15,31,114,187,101,148,134,215,58,41,112,144,51,239,166,215,93,14,145,165,126,9,137,171,218,157,160,238,99,4,111,245,9,164,28,133,238,175,10,208,126,137,59,
+108,114,238,220,164,79,9,14,237,118,64,81,215,143,157,69,183,147,22,183,221,174,175,183,9,190,25,200,24,217,32,93,74,56,63,247,243,107,227,170,69,96,105,91,54,245,129,241,249,4,137,176,103,28,103,122,43,9,235,55,31,33,69,190,32,114,234,245,104,133,158,228,72,114,7,161,186,159,124,124,20,147,116,96,114,213,130,221,80,221,219,169,164,232,205,171,75,185,115,59,26,79,160,171,149,86,228,137,173,198,110,120,195,110,112,230,145,197,248,235,235,76,44,71,17,212,185,162,32,22,172,107,166,183,116,127,141,228,28,99,185,219,225,59,193,237,38,171,226,19,99,77,189,78,199,165,118,206,29,149,254,65,167,16,51,167,135,166,79,236,160,69,65,55,59,252,234,212,44,185,49,166,14,152,222,185,232,240,126,222,186,39,41,138,173,98,198,76,199,22,230,82,7,190,119,77,64,248,227,52,106,254,62,177,41,7,35,26,36,77,96,206,186,179,116,222,250,250,39,206,137,60,80,185,63,225,167,208,5,95,210,211,117,9,242,237,108,49,23,155,131,124,167,112,16,63,
+201,187,149,194,145,36,97,209,4,219,142,152,188,37,86,121,58,7,190,120,93,154,136,102,10,151,45,15,34,42,166,166,14,89,119,113,141,217,19,148,194,138,122,8,218,85,77,213,67,141,200,32,70,34,118,26,113,74,158,185,167,60,190,158,130,185,245,17,98,253,244,26,97,51,43,173,23,148,126,146,115,169,221,210,158,5,45,248,182,137,117,16,158,219,174,194,48,249,192,146,15,235,24,65,152,108,187,211,54,203,166,208,62,132,71,75,219,17,188,208,105,177,179,248,120,105,162,183,71,158,110,42,37,104,22,198,78,165,36,159,134,202,123,204,232,74,90,41,74,31,252,190,2,123,150,181,64,4,41,172,86,206,215,198,161,107,14,223,25,164,130,184,168,162,160,244,93,172,3,235,250,227,99,208,136,74,249,106,76,138,31,248,180,109,112,43,15,85,26,113,232,102,143,58,99,170,216,151,38,136,150,243,158,32,120,168,152,36,129,186,116,84,142,186,9,94,204,133,192,97,105,236,221,78,94,42,34,137,251,147,216,213,174,11,103,217,156,226,71,49,133,40,44,181,170,58,
+117,76,146,46,70,5,194,206,186,143,40,16,206,239,41,110,181,116,65,235,156,131,203,14,108,110,248,106,8,166,46,208,231,216,194,246,188,225,225,202,148,207,202,218,97,141,102,107,204,36,239,108,251,5,68,81,244,65,126,113,113,74,236,208,30,193,245,18,146,203,213,238,53,172,141,67,16,99,203,65,105,3,177,106,194,178,192,113,10,240,114,59,228,234,169,222,61,223,123,88,111,26,12,235,37,236,182,159,19,35,148,135,73,51,197,40,175,112,98,155,62,102,18,211,216,192,60,217,246,32,189,42,110,77,222,233,189,41,134,222,180,115,243,56,212,91,12,149,144,8,231,162,168,148,201,235,245,202,186,232,248,8,28,203,24,250,209,238,108,241,60,33,168,201,251,123,27,28,110,30,245,41,48,46,117,80,252,157,245,42,7,245,176,157,134,194,73,151,26,21,89,63,101,108,115,99,73,104,194,13,89,5,234,52,102,98,214,32,162,183,238,131,161,69,16,255,228,67,45,250,213,212,194,245,61,210,226,253,64,87,130,19,107,15,249,117,212,33,120,254,185,143,181,29,68,229,
+116,222,149,85,220,118,101,167,20,187,198,251,175,24,87,200,138,121,114,132,179,105,119,224,80,216,247,23,67,216,161,105,116,121,53,228,142,152,59,178,83,159,225,234,234,188,241,88,163,123,5,52,140,252,160,250,168,174,7,109,202,93,124,84,194,63,131,23,210,247,202,187,57,28,120,59,166,227,31,133,188,67,240,120,182,243,249,123,135,45,125,166,11,8,217,167,33,22,173,2,183,125,34,71,203,88,12,120,46,120,70,80,243,53,60,227,8,206,218,104,33,64,160,224,14,2,253,19,27,71,249,89,173,138,177,45,157,49,49,1,94,59,57,101,187,7,100,102,199,47,169,105,212,196,48,145,249,73,115,45,48,156,28,248,196,35,4,60,47,128,76,142,7,231,20,228,189,93,204,216,173,236,212,31,173,158,182,206,71,59,248,196,12,186,212,187,112,42,173,159,142,79,124,134,225,166,99,74,106,248,141,79,6,142,246,4,155,211,222,144,4,134,139,233,230,161,169,180,199,156,82,90,252,84,78,152,20,64,250,206,249,193,152,178,8,155,139,186,24,75,140,46,25,146,95,143,
+127,142,251,194,174,76,174,238,217,78,107,59,186,180,107,79,167,11,139,88,161,170,66,223,226,132,15,193,4,226,116,49,37,152,246,56,204,59,204,97,22,139,138,86,194,245,168,156,63,206,22,249,231,162,16,182,226,83,205,112,182,222,197,52,194,38,194,168,113,248,245,250,164,192,156,226,56,220,254,32,139,98,43,120,234,58,205,66,57,138,153,4,38,211,125,182,113,244,105,83,3,107,193,143,18,246,170,63,40,58,15,53,226,220,212,249,145,5,3,196,68,118,73,80,101,115,186,26,130,30,62,201,14,134,232,56,244,112,28,249,212,119,180,168,205,210,220,130,37,213,236,144,95,44,151,151,157,187,132,114,103,203,58,72,181,216,100,209,37,153,25,62,81,162,35,222,138,40,165,48,120,119,84,10,42,187,109,87,78,35,210,36,57,97,180,106,4,82,146,32,49,218,22,110,162,250,29,78,236,150,225,208,64,134,121,164,187,61,119,164,241,92,86,110,186,109,204,114,180,186,227,132,206,148,140,176,241,116,128,211,172,120,25,115,148,250,14,19,85,77,132,7,100,96,10,141,
+168,158,179,179,214,182,34,186,209,15,217,107,180,82,144,95,15,118,2,153,20,63,164,158,239,67,12,44,184,69,1,78,156,155,172,251,190,187,75,64,90,54,62,171,81,210,113,143,129,146,42,49,116,61,157,240,235,18,110,255,210,77,236,217,182,173,152,167,178,187,91,65,185,132,108,161,124,26,189,37,141,238,200,0,5,63,40,150,243,177,139,171,100,245,110,179,121,227,106,239,28,109,243,8,97,174,54,236,241,230,163,28,173,91,199,206,248,60,17,165,174,112,42,142,165,214,249,189,7,134,111,90,233,140,25,118,92,217,174,87,226,209,112,21,247,201,219,141,174,85,32,212,30,204,108,125,191,194,87,27,28,88,133,124,213,46,127,93,129,14,169,103,42,97,165,233,246,197,78,93,209,244,220,127,182,203,141,53,134,146,178,162,176,215,189,190,211,8,216,1,43,65,118,82,113,67,4,111,33,152,187,159,31,6,34,210,180,35,2,31,92,145,167,65,31,93,238,132,124,27,89,35,103,60,171,205,210,121,70,198,53,83,164,49,249,198,126,55,71,70,88,183,231,156,88,7,
+237,84,234,187,24,190,166,63,57,170,108,103,4,238,42,12,228,137,196,239,224,216,138,15,102,38,185,26,116,168,216,163,8,165,34,208,215,123,182,254,211,238,48,29,126,26,141,228,147,184,115,184,195,113,76,173,249,73,31,30,79,138,92,59,116,170,58,6,107,0,11,170,96,10,78,101,178,236,19,59,195,12,54,121,2,228,8,29,112,27,46,242,194,120,252,216,169,59,225,209,237,134,145,41,187,1,92,36,185,247,159,205,164,39,224,168,119,100,46,137,195,80,209,192,124,213,39,163,196,105,143,41,194,62,209,171,82,34,239,176,90,217,62,2,209,66,60,72,231,104,163,178,13,127,59,222,40,141,239,102,91,82,93,238,62,244,212,58,226,60,216,236,238,120,46,123,222,127,64,244,98,209,74,235,86,157,72,123,184,237,147,44,183,125,237,139,8,142,214,11,126,12,247,32,84,28,217,65,6,103,20,119,112,252,103,246,160,47,61,117,108,167,162,218,128,144,40,112,143,248,219,142,116,70,143,113,42,21,105,78,216,75,4,172,202,222,204,14,31,9,118,244,194,155,144,205,
+3,69,5,16,162,46,12,83,97,107,17,118,157,114,90,177,240,112,136,110,63,42,152,143,40,40,129,60,163,63,165,199,157,16,135,23,223,174,42,113,247,8,30,247,36,64,44,129,66,78,12,91,1,172,208,208,42,240,19,195,201,154,233,192,120,124,30,196,215,74,45,153,82,30,98,67,106,13,20,246,128,244,115,249,54,128,238,132,206,80,93,231,153,73,117,165,243,107,46,194,60,104,248,84,148,192,135,171,48,228,214,59,104,124,244,17,74,155,175,151,249,189,25,43,218,99,32,13,130,160,227,188,134,183,89,99,54,37,135,233,244,37,155,105,194,58,18,166,215,126,128,50,151,112,163,24,218,238,250,236,160,122,194,243,199,176,13,117,143,49,25,109,238,233,67,152,61,91,186,198,245,89,143,130,138,209,198,84,92,228,152,232,1,110,80,160,72,203,187,3,198,81,133,13,88,81,118,136,68,56,44,180,56,183,50,4,101,16,38,121,144,224,49,72,12,4,161,224,129,171,152,42,239,51,239,188,119,62,122,122,187,224,131,134,16,42,199,242,128,71,5,127,140,98,72,218,
+169,96,113,52,190,51,226,135,97,199,104,70,16,54,221,142,243,25,10,235,60,207,210,9,35,176,200,35,79,73,145,27,161,175,118,8,23,92,175,165,61,21,143,195,99,105,9,37,242,244,139,38,138,39,206,129,80,15,248,58,92,133,218,190,90,148,150,236,13,57,166,164,110,118,146,145,249,77,201,126,86,114,228,45,6,178,178,248,65,55,167,187,240,222,159,69,35,12,248,196,52,97,55,56,179,117,72,145,189,220,228,133,103,24,164,67,14,145,208,210,168,233,0,35,207,157,193,244,133,170,112,199,242,146,57,177,70,71,168,195,57,240,87,130,51,190,170,87,125,162,105,147,167,115,28,174,69,185,214,210,227,77,137,44,228,82,230,207,238,117,66,228,163,234,110,223,66,235,95,14,2,58,192,91,245,220,21,233,199,96,132,198,205,240,210,178,77,55,131,239,214,105,71,86,106,103,221,3,10,68,82,251,172,25,22,193,61,155,137,227,171,80,232,141,98,189,103,196,143,212,79,51,56,197,178,143,220,74,224,32,24,98,88,113,116,106,32,146,174,103,68,85,251,212,87,43,
+243,155,198,207,134,86,237,144,61,37,137,154,66,34,50,231,130,112,124,158,230,61,238,18,149,117,139,39,118,96,137,75,57,227,13,208,203,20,171,133,34,167,224,14,20,233,238,249,147,94,146,18,171,74,70,193,66,160,130,57,232,144,231,6,2,128,195,53,68,147,64,237,112,238,101,116,175,170,48,113,189,71,35,214,156,0,19,23,159,8,248,196,188,121,164,35,120,162,117,128,17,142,19,27,221,42,225,243,34,175,234,82,100,2,212,128,116,66,202,131,6,144,250,40,218,37,210,171,162,170,232,190,32,160,30,103,124,98,118,191,207,84,80,116,105,217,120,227,8,102,237,182,36,59,243,86,145,138,1,206,94,14,15,81,206,180,176,241,217,76,66,236,150,69,189,170,92,208,227,179,36,150,63,205,31,71,76,154,80,242,145,120,92,47,158,87,161,43,225,125,240,36,44,216,158,17,173,245,177,228,90,231,214,92,92,135,116,206,135,29,182,193,167,163,141,252,2,90,50,34,14,106,4,252,99,163,43,61,220,194,130,181,203,139,118,86,139,132,145,156,184,130,64,213,234,221,
+225,199,66,240,185,117,43,48,143,150,136,66,212,94,231,83,203,240,48,106,111,152,218,2,78,118,114,138,176,14,93,28,109,185,195,53,9,124,138,163,74,216,162,225,42,180,184,25,12,167,40,127,150,139,123,55,146,14,84,37,48,11,42,66,39,57,46,134,138,206,63,232,93,54,110,80,3,158,8,122,153,145,21,141,77,73,80,249,222,173,131,227,96,83,227,220,205,25,46,171,220,14,42,121,49,131,91,203,40,71,129,51,227,17,82,161,87,84,107,15,148,99,193,16,165,133,83,78,101,29,61,12,74,194,33,90,4,10,162,220,152,117,176,222,129,42,188,75,140,207,3,71,191,18,160,56,107,181,14,187,85,205,249,198,101,9,237,8,38,0,242,214,44,148,223,141,218,97,216,102,61,108,114,6,97,85,218,160,251,110,20,147,107,215,28,87,0,57,64,4,116,132,234,211,249,78,84,158,23,16,43,186,178,240,120,222,148,135,202,158,200,211,177,75,112,164,16,32,228,78,37,79,86,86,225,136,229,13,174,255,58,132,202,107,123,231,155,116,111,177,6,226,242,1,133,64,
+235,134,168,19,217,118,110,94,129,251,143,70,172,100,58,38,233,137,193,39,10,142,250,101,118,208,131,167,178,201,14,25,159,251,121,76,152,14,141,86,243,118,63,193,224,238,103,21,90,144,79,237,156,89,205,117,31,220,115,118,139,104,68,144,6,184,215,145,130,106,212,174,60,222,156,76,4,1,79,78,3,92,200,36,128,192,198,205,46,80,147,30,137,202,119,92,255,21,160,168,242,50,85,67,45,209,101,27,203,144,108,215,92,12,8,250,164,79,13,17,79,53,179,209,208,190,29,126,150,65,39,128,35,183,23,85,216,225,187,183,225,128,246,0,238,136,215,79,80,180,220,108,216,46,228,53,163,240,52,69,196,141,121,17,157,47,25,108,221,198,92,120,16,165,141,108,176,71,92,250,168,173,210,180,184,159,251,52,78,181,111,67,223,39,51,24,231,4,242,208,217,39,51,172,5,249,185,47,67,91,112,251,231,108,95,41,203,139,230,15,247,126,222,162,249,195,189,255,2,238,89,79,103,247,123,9,16,195,195,133,83,204,92,160,193,144,138,173,29,201,174,152,161,217,21,82,
+76,159,219,244,240,82,202,100,124,110,204,196,109,224,252,4,51,117,166,100,61,55,166,102,56,108,194,32,157,7,159,214,201,129,221,251,62,87,43,13,213,134,215,44,122,0,194,18,205,133,167,186,143,20,48,108,24,251,147,115,190,106,214,182,243,170,123,112,14,36,36,184,190,36,48,46,114,197,197,115,125,24,166,8,93,24,63,138,79,251,231,24,231,80,85,227,54,153,235,129,113,211,102,82,150,77,122,94,202,71,24,152,210,108,212,252,132,142,197,145,45,233,179,109,50,235,242,201,73,112,121,174,245,198,196,105,198,12,100,2,253,32,25,152,200,173,156,166,43,157,153,114,44,218,167,130,212,141,241,156,154,175,180,226,27,129,129,120,153,63,225,193,19,168,78,123,164,3,58,65,20,170,18,70,163,171,130,67,157,140,21,49,180,136,215,68,57,239,32,96,45,247,229,129,3,121,34,100,193,32,124,73,214,98,238,19,49,239,60,73,36,192,141,177,186,3,88,95,244,2,240,152,159,100,136,68,88,13,11,201,121,108,219,98,120,168,184,149,210,52,11,181,81,97,79,106,
+18,50,171,70,116,187,56,62,207,246,145,237,16,60,196,216,62,79,152,179,187,189,22,45,61,20,248,155,187,9,172,240,49,192,23,59,123,252,212,249,19,243,32,128,65,163,29,58,255,73,209,151,153,182,124,224,29,54,192,119,139,173,97,141,215,180,24,61,63,223,84,220,234,214,2,112,127,103,122,28,23,220,160,31,111,131,122,228,52,21,138,220,134,241,238,28,19,118,238,52,184,21,129,103,230,114,60,71,60,6,243,1,7,39,91,139,115,98,195,91,151,133,115,174,117,26,182,225,37,250,19,31,173,15,104,247,218,139,49,60,70,193,205,58,2,43,112,94,34,107,226,212,34,37,128,173,248,71,187,160,189,55,58,241,207,188,202,3,126,93,251,168,89,252,55,158,36,59,222,12,2,93,44,232,73,6,1,170,92,12,228,155,81,28,207,166,4,102,46,14,55,58,98,111,115,204,177,77,63,0,91,40,129,199,126,59,55,216,142,143,118,13,188,152,166,159,100,159,77,178,17,104,211,22,24,95,47,142,28,133,197,177,96,66,105,119,247,217,193,253,91,111,144,143,203,83,
+117,245,159,241,17,35,137,134,49,107,235,80,128,75,146,62,79,235,99,202,130,174,184,128,122,102,107,248,77,35,189,189,184,62,175,59,111,246,152,120,134,229,16,76,202,237,80,54,13,31,159,108,163,42,179,16,249,84,58,196,4,100,78,202,57,81,72,160,92,157,31,153,246,176,232,0,9,120,138,118,89,82,182,61,24,189,94,0,116,176,190,145,193,130,45,211,190,83,105,17,179,67,199,102,161,26,78,10,219,211,250,157,132,220,192,151,33,62,194,174,244,3,242,78,212,74,235,159,163,113,24,102,165,20,60,61,13,174,187,55,50,68,80,174,236,79,41,1,103,35,235,108,220,20,212,190,219,225,230,157,138,9,73,46,208,69,122,176,126,56,29,56,7,85,61,42,118,220,104,134,104,100,200,13,232,38,82,102,94,23,136,179,196,128,16,27,9,247,146,143,138,18,124,36,132,7,157,187,236,186,54,134,223,179,41,175,149,235,185,99,208,99,181,26,124,246,212,33,120,160,68,28,143,247,42,49,148,61,226,53,138,176,232,39,36,114,215,106,232,86,114,248,190,240,102,104,
+106,135,78,111,27,55,159,148,87,206,2,94,192,220,186,139,213,68,148,46,205,87,141,236,1,91,153,254,30,177,4,184,31,146,102,111,149,65,222,157,85,138,130,251,16,233,108,62,145,4,42,124,65,44,196,12,51,146,22,138,53,106,8,209,249,42,134,176,14,231,88,255,92,237,105,248,220,2,156,234,73,10,49,249,109,7,228,227,246,156,40,226,41,33,16,16,170,44,55,2,84,213,67,188,126,64,23,75,187,39,113,190,132,211,27,247,207,111,42,38,138,137,2,226,154,96,17,101,63,78,227,161,214,29,91,165,189,236,159,200,35,1,1,42,221,113,67,198,210,61,102,222,84,222,50,102,143,197,98,4,4,132,24,99,169,202,31,182,138,206,158,38,182,57,116,167,133,252,232,32,0,245,194,244,176,32,232,42,45,146,84,59,44,248,164,244,116,13,135,200,241,130,152,81,151,219,40,206,31,38,195,78,30,253,144,98,4,2,11,83,186,40,223,49,153,191,35,185,127,104,115,98,254,14,174,27,208,85,248,61,38,161,168,22,4,212,201,109,84,130,100,18,168,137,34,41,
+210,184,121,100,53,27,114,135,93,211,28,99,35,210,175,130,188,199,13,107,196,127,26,213,62,68,187,79,201,107,106,77,93,44,98,198,68,134,75,121,11,169,33,30,169,127,229,173,249,176,204,147,54,66,192,12,182,54,118,116,130,209,12,82,25,149,225,182,30,58,230,161,164,1,39,77,119,113,1,15,165,72,70,59,60,242,147,67,122,155,242,6,236,242,198,126,212,150,113,189,131,5,29,242,18,121,38,240,158,238,68,33,51,120,222,116,64,41,114,215,0,158,160,61,32,162,72,124,82,195,211,213,152,56,235,5,242,82,115,132,133,40,30,90,170,134,135,106,227,22,171,55,136,250,83,11,175,157,217,16,0,39,157,115,147,237,184,118,130,236,109,249,102,28,173,131,126,239,144,104,138,83,229,24,204,123,206,131,110,198,69,177,29,136,55,34,69,233,232,106,115,42,54,184,232,35,23,46,212,13,60,224,53,59,198,77,130,40,202,138,27,89,0,227,220,40,59,79,19,194,222,5,94,62,20,181,129,88,151,220,30,81,193,132,114,160,188,101,74,82,145,177,35,244,80,153,
+109,7,130,120,188,117,239,225,138,162,203,157,98,5,245,115,32,52,199,59,243,242,129,82,79,15,32,3,202,137,18,231,10,89,26,116,89,159,58,47,68,234,58,147,95,101,163,100,133,79,195,104,225,244,64,164,222,86,17,143,37,33,123,247,178,87,185,133,252,178,110,189,0,151,47,166,10,123,94,247,75,26,143,116,81,84,46,98,75,49,188,161,160,157,179,95,76,69,202,78,152,45,208,21,64,8,46,10,157,162,27,159,148,150,252,103,110,179,16,117,231,25,10,35,41,127,165,67,222,230,171,46,48,232,201,122,253,214,6,77,181,252,230,60,19,56,12,200,111,169,122,159,56,172,161,70,50,28,45,26,56,199,30,219,40,90,49,209,198,154,214,110,179,22,177,84,122,160,30,11,38,79,67,116,90,206,59,82,132,148,132,210,148,164,56,209,51,119,56,252,184,120,222,59,75,139,176,32,135,109,102,157,83,160,33,159,78,61,119,193,53,51,232,167,143,131,40,197,121,3,103,139,111,64,39,180,19,30,114,104,86,230,230,7,109,193,229,45,51,106,216,241,213,214,155,129,
+219,189,11,158,22,103,182,112,246,173,123,218,24,149,162,188,75,97,65,51,46,184,19,13,30,83,71,87,136,220,164,70,71,139,231,115,92,167,78,188,201,65,88,80,195,14,108,114,240,5,115,200,166,140,60,14,171,174,121,152,11,77,182,7,251,14,99,30,63,243,242,172,71,187,135,53,86,16,180,8,118,213,20,37,94,112,177,184,33,236,237,171,57,177,25,155,239,110,222,11,30,246,225,73,72,162,137,222,158,28,250,178,163,211,224,206,12,3,193,211,215,238,244,19,59,8,69,184,135,180,26,138,156,25,143,138,129,112,139,71,56,51,150,200,129,83,103,101,220,239,131,41,34,53,198,189,37,57,225,3,89,224,182,2,113,148,210,54,170,27,160,20,15,53,156,245,195,176,14,138,205,7,226,27,85,92,65,23,56,46,170,52,229,49,197,47,182,72,175,161,252,40,230,78,79,216,78,193,17,97,80,153,202,194,151,21,62,161,74,99,220,140,242,252,218,168,223,254,20,180,41,55,230,228,100,180,91,57,77,63,222,185,33,9,217,198,150,89,240,238,107,9,201,118,96,176,
+31,244,20,209,98,160,74,113,10,112,160,1,151,189,169,41,174,125,134,152,117,24,70,117,24,67,46,41,38,243,137,71,142,57,134,10,196,147,105,74,64,193,227,103,26,61,155,178,234,51,132,6,238,131,155,38,216,71,153,165,51,230,20,19,40,26,70,187,51,193,53,116,77,141,194,125,73,168,21,10,14,15,124,250,90,154,30,59,235,75,124,17,84,128,50,192,172,219,207,126,2,162,199,153,12,172,2,232,134,20,68,88,5,149,153,247,164,93,85,141,157,106,194,61,185,161,54,209,116,151,142,233,78,79,180,223,36,60,212,47,201,15,86,155,114,147,163,15,20,39,2,103,69,169,10,88,179,125,81,4,43,179,224,146,202,92,25,142,215,52,251,64,70,248,197,210,106,77,62,179,236,184,40,106,105,80,16,50,147,180,241,120,254,144,3,110,78,72,166,117,77,37,136,191,180,144,48,227,99,239,109,138,156,57,232,168,5,187,38,10,95,34,32,43,13,231,183,172,142,61,6,89,166,57,60,152,150,219,148,198,20,173,15,177,204,74,59,68,16,144,147,124,21,120,16,180,
+65,142,222,164,177,75,63,101,207,2,206,212,33,145,167,98,151,131,200,16,124,6,78,79,59,198,245,195,39,142,78,107,220,98,177,13,177,210,45,174,21,236,8,116,242,121,174,43,222,36,152,61,66,195,145,154,130,172,158,97,133,188,91,6,159,62,115,140,37,172,244,249,174,184,109,131,238,232,39,215,58,146,191,173,179,181,73,248,203,146,151,21,21,219,247,211,150,64,250,233,152,203,23,214,31,143,96,238,56,166,131,157,141,117,59,30,15,242,24,19,214,117,102,131,163,125,164,213,146,168,201,45,73,50,102,250,7,94,73,3,62,136,72,18,193,93,110,223,102,226,66,61,132,155,239,30,41,206,177,147,244,125,126,134,16,178,206,130,83,39,129,31,106,132,93,241,171,22,91,33,91,143,72,144,221,200,54,69,136,5,55,3,234,66,114,81,245,174,165,112,131,87,85,71,153,214,83,243,19,86,200,10,110,93,58,88,237,192,195,64,49,58,101,218,32,137,99,214,208,151,27,89,44,56,187,231,195,229,57,101,242,241,38,118,237,60,61,164,73,183,234,17,160,221,205,249,
+117,27,123,120,51,136,154,223,108,97,77,182,43,25,39,48,146,251,1,253,105,80,79,215,51,146,83,146,252,118,190,125,103,35,182,251,121,83,99,127,207,144,146,187,185,214,218,249,221,147,140,134,72,44,38,174,189,16,243,137,195,14,250,137,1,235,152,235,84,138,125,188,182,14,49,205,135,109,6,229,46,135,124,24,50,3,63,141,89,87,60,69,30,17,217,102,159,105,182,14,217,26,56,229,104,250,230,88,108,39,198,32,120,190,28,123,213,216,83,240,167,193,204,103,26,169,134,220,88,50,248,249,126,171,34,81,153,112,213,122,50,191,119,179,30,56,90,60,136,189,106,248,45,130,44,171,127,24,168,74,225,163,245,173,71,208,153,237,202,63,63,183,180,141,143,188,130,120,173,17,49,75,52,193,216,12,25,2,64,46,124,2,55,96,76,143,61,206,137,150,116,43,160,212,209,23,240,20,117,221,183,73,142,130,22,67,62,215,134,100,148,246,112,183,3,103,69,173,100,239,81,30,115,62,126,226,24,222,247,236,116,254,211,115,95,238,145,83,128,26,134,26,249,216,57,67,
+112,26,180,220,159,247,125,158,235,107,193,129,225,167,231,168,206,197,144,7,207,120,190,197,144,199,137,225,44,97,65,173,33,103,5,241,181,237,207,247,101,103,182,244,89,142,10,182,206,165,130,194,137,191,54,97,82,167,79,240,28,67,7,112,28,109,43,110,199,254,63,212,189,215,143,107,91,154,31,246,175,220,7,67,24,3,30,141,102,108,1,198,188,201,150,100,25,240,171,159,12,11,211,51,211,158,105,168,213,61,238,219,13,121,0,61,176,2,43,49,179,138,100,49,231,156,138,100,49,167,42,178,152,139,121,111,230,80,204,197,92,204,153,219,155,228,61,183,167,91,150,44,216,146,44,31,224,224,28,114,175,253,173,47,252,214,23,214,218,220,223,131,235,70,106,195,160,208,37,46,87,120,72,237,250,112,110,7,58,181,254,234,60,177,32,193,245,192,3,40,96,214,250,181,219,23,4,34,135,73,132,111,226,204,194,177,18,190,154,200,142,149,176,251,176,139,138,65,196,74,137,193,202,45,82,111,249,27,153,130,32,172,205,101,65,61,237,117,178,207,153,56,174,109,61,106,
+210,129,207,143,82,97,67,247,73,231,141,176,61,176,153,166,60,186,140,82,246,83,66,217,167,97,7,1,124,231,5,86,63,226,37,68,144,27,24,66,94,157,33,74,130,87,79,207,42,139,44,2,142,30,223,77,80,120,79,111,36,230,23,196,62,243,129,39,27,50,1,43,113,150,235,145,157,97,101,152,157,70,99,104,245,141,115,162,34,89,108,46,150,250,43,141,223,60,134,20,122,208,194,90,1,118,204,250,120,234,187,190,209,219,158,139,22,68,138,175,2,86,173,133,147,167,229,245,189,12,194,238,54,216,32,2,121,254,144,249,58,51,202,122,57,155,7,36,69,181,210,154,32,151,107,61,239,117,117,62,41,120,47,99,187,75,58,80,216,75,46,52,186,43,232,46,184,110,176,220,211,181,169,144,147,243,99,29,58,198,108,220,44,19,99,155,186,45,120,199,152,235,214,199,4,176,80,30,54,126,101,180,206,133,244,74,66,178,114,131,206,205,14,79,72,75,83,94,23,14,144,39,115,2,96,8,97,83,224,114,27,175,174,105,24,34,68,234,218,144,13,208,140,9,209,197,
+88,87,41,162,188,22,205,178,108,56,174,87,53,24,11,88,55,3,201,81,14,241,228,35,200,236,122,122,216,47,43,74,231,246,126,165,99,54,138,145,87,254,238,219,253,19,210,26,194,120,130,38,38,155,249,190,114,94,249,47,103,170,195,54,182,254,12,184,78,96,98,114,87,152,116,216,247,179,38,220,242,153,176,157,96,6,22,139,174,233,50,228,203,159,169,155,177,119,189,156,154,151,26,72,22,1,16,122,72,119,208,64,8,157,93,212,230,172,240,103,181,19,221,74,231,132,214,44,207,124,209,97,213,107,148,120,178,82,250,124,96,45,195,210,55,123,237,75,147,13,146,26,22,72,135,179,160,191,166,38,157,99,4,208,131,211,122,174,99,253,5,244,46,98,225,75,25,212,158,26,233,125,191,52,85,166,212,241,29,211,185,148,56,104,251,103,182,162,84,33,220,75,201,13,6,153,43,86,71,115,197,244,135,175,21,1,141,21,49,171,99,114,191,66,160,186,252,158,116,19,215,6,57,104,182,92,81,36,175,37,202,179,55,109,197,233,110,19,66,123,190,169,150,121,107,124,
+136,94,83,168,183,115,201,0,117,80,51,205,221,225,67,17,45,2,243,204,1,86,98,103,233,163,224,11,234,29,111,82,208,173,130,156,52,93,167,219,129,168,119,159,221,21,1,232,184,185,125,169,170,71,7,35,102,80,27,154,164,2,250,181,190,228,120,119,88,5,225,207,47,28,145,223,34,150,32,161,5,8,249,82,211,170,66,205,13,18,165,169,93,42,33,11,213,250,16,241,17,167,245,61,191,174,146,122,197,200,226,239,250,103,218,79,15,173,28,228,129,243,218,236,185,59,222,176,26,178,122,76,189,163,241,224,250,76,212,145,224,74,22,12,194,114,121,19,107,88,135,197,199,214,129,33,65,64,35,163,116,96,117,12,177,61,56,87,37,165,147,235,28,15,103,173,202,83,101,105,178,97,207,65,51,63,206,237,211,133,102,165,27,109,224,188,39,104,207,12,116,187,107,89,205,204,90,50,172,200,17,81,190,2,159,129,18,13,45,156,19,46,20,122,19,38,103,23,68,108,153,113,80,191,110,225,222,214,254,217,56,220,43,219,156,6,130,32,183,132,87,227,140,48,61,35,
+100,46,90,36,4,30,239,147,109,107,194,46,112,73,246,135,216,218,117,146,42,20,230,216,64,81,9,0,116,37,165,212,47,122,84,173,8,75,156,184,159,50,153,157,236,211,171,139,79,2,87,33,73,155,25,92,60,110,184,126,98,71,208,31,123,225,116,192,191,15,154,102,200,142,183,168,104,93,113,19,9,251,3,244,14,97,174,130,129,25,67,93,193,222,237,139,5,11,247,136,58,224,154,115,68,29,137,194,220,143,245,119,137,54,97,188,51,251,89,82,172,149,204,7,199,173,177,236,158,208,140,160,178,113,29,32,246,232,103,232,235,251,41,203,39,187,86,168,47,215,83,153,244,105,102,31,11,174,137,36,28,128,107,67,237,199,122,79,214,82,228,121,230,65,177,231,19,144,49,33,56,255,197,105,55,130,200,236,161,255,153,147,100,122,78,44,236,15,164,238,57,2,112,239,56,96,2,161,231,1,43,159,19,155,145,242,208,185,178,100,116,63,138,204,18,130,78,29,104,143,124,210,103,180,116,111,90,145,70,82,214,46,55,0,152,103,141,254,212,57,83,171,226,50,127,157,
+63,190,152,69,32,191,31,12,80,12,165,132,204,2,226,168,56,93,154,227,191,239,66,192,35,46,72,157,86,58,154,94,162,143,13,83,58,28,56,181,157,193,185,173,71,54,67,190,118,98,209,181,236,25,255,131,216,119,177,163,216,144,73,180,68,222,57,18,74,245,29,37,176,156,225,118,9,56,225,13,117,194,133,187,79,115,66,25,80,129,29,189,107,81,163,188,201,253,43,89,67,55,141,183,85,84,12,208,82,11,80,249,176,186,46,200,61,230,177,10,84,184,20,243,216,51,12,12,242,174,65,236,184,173,199,115,182,96,136,55,251,184,136,193,136,215,11,104,29,126,61,121,94,120,193,197,168,251,81,20,179,203,194,117,172,244,98,154,32,10,226,114,130,177,212,17,230,150,188,42,163,36,2,131,212,46,93,154,38,23,111,128,124,144,49,19,18,107,217,188,100,18,72,61,61,216,0,57,95,146,226,49,125,247,37,117,8,196,2,215,183,137,190,234,224,37,95,100,103,137,142,112,18,176,111,6,234,48,17,109,148,82,188,83,187,195,153,75,230,136,79,210,167,132,253,245,
+134,24,244,202,66,70,25,19,119,43,104,112,35,219,176,109,140,155,245,237,44,137,227,137,184,89,117,54,125,209,13,38,60,237,41,250,79,73,114,6,167,77,197,56,235,76,192,12,122,55,158,148,26,188,114,229,67,61,179,216,117,33,133,109,38,57,24,13,161,31,115,163,108,195,109,62,66,196,199,181,17,71,197,42,188,214,217,244,29,189,85,125,47,165,140,207,240,76,111,224,225,41,81,236,105,7,78,254,152,4,60,207,4,119,23,209,70,115,44,95,167,42,69,121,146,30,223,251,212,23,104,61,192,3,133,154,25,172,110,129,37,217,238,176,71,174,153,44,140,17,178,14,83,93,28,241,113,185,127,104,34,62,141,219,4,179,55,190,82,202,33,252,216,166,193,226,128,134,131,89,170,135,249,17,83,213,75,116,27,183,24,86,112,204,11,232,29,69,89,202,27,133,109,108,199,36,250,187,87,62,120,249,128,38,242,59,222,188,235,134,208,174,22,234,55,183,74,179,64,144,107,185,252,179,50,90,192,227,130,44,147,143,40,57,70,235,251,31,247,43,46,142,167,139,55,220,
+214,241,116,81,58,56,63,158,46,234,185,183,199,83,79,255,236,252,228,166,185,129,227,231,119,104,229,71,38,250,175,248,142,219,235,124,115,195,164,108,105,221,46,136,115,236,221,57,100,194,133,117,108,49,111,181,136,173,160,104,247,109,160,32,154,92,162,134,119,163,140,241,161,118,217,66,53,103,50,24,23,247,89,50,92,255,242,16,119,136,79,61,89,85,180,124,62,61,225,205,248,16,69,160,200,38,166,23,220,40,48,10,204,18,208,76,230,196,248,58,169,250,220,62,9,50,235,148,161,128,168,11,203,172,240,196,210,33,72,221,91,5,84,47,18,146,95,195,169,140,233,42,187,116,15,87,14,45,90,224,220,168,173,244,97,73,220,54,190,89,128,33,147,4,194,213,122,185,154,59,86,235,234,200,85,48,136,0,174,67,84,185,212,208,189,135,68,250,219,189,225,240,152,93,164,30,177,85,62,219,145,52,80,222,152,85,81,151,225,21,206,209,138,203,72,205,222,23,236,200,166,103,96,231,163,14,36,159,10,193,18,237,159,61,61,60,116,132,200,123,130,15,168,13,191,14,
+89,214,89,157,222,42,47,137,218,206,38,235,16,58,151,220,88,27,90,236,131,45,8,202,179,59,134,18,144,24,222,78,84,126,253,174,44,215,116,45,17,125,197,54,31,143,46,117,139,176,64,115,71,87,57,153,242,165,177,162,70,167,208,130,156,155,153,240,21,151,20,236,13,247,146,113,73,156,133,223,80,3,229,178,80,195,112,149,161,135,88,66,137,194,105,18,99,229,214,151,197,107,200,183,35,83,64,102,23,98,62,242,115,178,33,245,94,149,127,121,94,100,246,119,149,74,6,38,228,125,254,224,108,141,60,67,188,188,0,126,173,233,106,23,56,147,226,201,107,121,242,30,160,187,199,138,203,188,29,188,150,0,155,78,8,36,21,169,14,4,108,13,109,226,76,185,209,123,49,8,196,187,33,34,197,22,158,65,129,235,134,92,77,216,139,169,105,210,110,137,72,65,99,80,114,60,105,10,235,47,165,131,86,66,168,202,177,186,219,18,38,254,112,129,64,220,11,104,119,245,100,111,237,155,171,177,73,249,99,210,190,247,120,52,151,124,51,8,235,94,4,39,167,73,132,116,
+16,186,27,39,138,102,206,197,187,153,154,187,158,114,196,227,110,203,170,98,24,218,45,220,69,231,101,99,141,188,39,83,11,58,165,41,94,10,251,198,119,3,114,114,141,245,107,175,233,237,60,115,222,188,204,26,62,121,173,181,71,194,167,96,158,203,74,25,166,233,130,50,42,99,198,16,163,145,139,19,25,70,202,78,200,229,58,82,39,115,43,91,46,118,10,221,20,174,160,229,107,40,227,51,197,221,243,119,98,205,172,65,49,250,142,64,233,82,60,118,113,204,224,225,129,43,81,153,244,102,154,199,235,230,135,16,221,5,189,47,216,208,34,255,148,245,230,134,187,91,65,106,102,238,87,230,218,92,98,158,140,62,135,211,250,176,121,194,140,130,157,32,217,158,241,231,181,37,35,127,51,60,47,48,61,6,184,142,89,225,35,102,154,30,134,210,152,221,154,122,114,228,133,177,76,237,25,46,65,3,130,174,39,135,100,51,148,42,234,147,53,142,79,0,172,39,3,95,197,17,212,107,83,165,48,7,156,197,9,215,128,47,117,77,201,120,19,10,34,51,42,220,13,87,41,37,
+89,160,15,51,86,79,56,163,65,174,36,196,33,125,132,100,118,176,223,186,101,15,235,106,233,101,1,113,98,45,80,33,71,228,54,161,67,120,143,163,139,33,154,224,105,230,103,247,188,121,155,242,182,25,26,198,20,202,145,241,83,57,11,40,149,163,94,47,182,185,157,196,20,154,152,240,182,63,97,244,148,62,103,79,144,86,103,181,211,55,80,59,109,39,86,226,73,43,239,115,53,174,17,249,78,23,53,52,134,198,161,158,46,223,43,138,103,17,97,209,172,243,80,159,22,159,59,101,60,32,215,131,9,65,151,182,175,248,167,161,58,26,16,51,151,57,29,93,1,41,62,85,101,141,35,216,199,119,44,56,187,24,220,223,191,216,117,137,254,226,122,16,74,235,179,136,203,139,126,221,195,23,235,251,129,214,18,53,232,85,197,79,2,61,91,159,34,47,243,77,133,56,80,50,120,177,6,133,23,35,87,8,75,35,61,22,183,145,149,110,86,233,202,8,122,55,110,158,132,89,70,175,104,111,85,6,242,130,185,145,107,58,81,13,203,100,238,239,223,58,24,130,145,181,100,47,
+248,198,33,180,144,106,245,175,154,42,137,65,120,101,110,42,0,57,133,181,172,88,73,236,180,207,44,92,187,72,23,226,170,52,91,227,140,64,150,54,168,63,211,60,6,107,236,243,192,198,32,111,63,227,105,64,203,50,99,47,202,19,218,250,51,56,50,40,73,235,60,113,206,81,101,173,74,17,25,253,24,98,180,230,209,238,174,219,189,173,165,47,163,117,102,84,222,233,220,58,69,125,189,131,112,231,96,232,212,104,179,51,107,157,251,155,33,91,54,82,208,238,235,1,226,217,217,153,32,97,28,22,23,69,80,75,19,238,147,170,184,39,188,97,102,109,155,80,82,246,100,201,85,21,35,70,252,162,86,47,22,124,33,209,187,130,106,237,123,230,210,18,43,161,18,139,81,134,150,79,94,35,38,138,198,14,92,219,4,67,250,93,125,222,189,43,136,207,6,241,154,41,96,40,10,110,249,123,115,77,209,179,93,180,153,116,12,87,236,238,137,159,5,225,85,46,175,159,104,151,238,228,240,6,104,24,244,137,225,202,42,129,232,118,138,16,198,119,167,12,23,214,74,99,65,202,
+115,4,223,106,154,250,36,41,10,115,159,149,33,244,50,151,232,249,220,156,46,83,100,160,133,100,247,145,43,213,189,205,226,149,185,39,23,192,70,2,49,207,58,203,158,43,206,73,99,192,201,254,182,175,104,71,238,54,23,121,179,40,22,217,109,139,96,15,229,150,83,58,166,199,200,132,241,28,175,24,148,237,180,42,99,84,135,242,140,144,69,147,53,68,147,51,23,70,111,80,214,136,57,145,177,252,146,37,138,74,55,210,71,204,68,37,213,99,130,14,101,103,210,121,108,179,103,171,87,153,253,193,198,143,84,21,69,169,13,175,54,93,193,5,37,185,10,36,81,227,82,241,22,200,51,14,155,204,153,244,188,130,129,217,81,128,222,243,10,46,13,187,148,151,47,170,173,19,247,202,229,86,24,123,232,124,232,90,133,50,150,105,91,238,12,194,141,77,93,8,9,156,35,143,241,8,241,134,64,92,190,48,19,240,250,238,17,59,129,235,58,221,190,10,41,112,128,216,88,222,10,81,187,84,56,14,15,107,8,214,21,204,60,196,233,190,213,202,129,52,70,86,69,124,218,182,
+152,103,92,19,73,125,121,203,251,39,159,44,101,47,47,111,174,0,94,83,250,88,42,189,203,106,232,5,11,80,20,235,22,84,34,14,251,130,91,105,132,7,98,249,206,247,183,179,24,126,73,255,100,133,81,58,246,153,17,223,140,219,114,197,76,58,220,213,230,222,154,43,65,110,144,232,209,224,154,53,243,188,6,161,118,74,210,84,127,166,155,33,133,141,0,179,128,164,11,45,158,118,64,135,203,135,249,171,93,204,69,211,250,38,159,220,176,92,253,62,138,72,89,203,60,117,123,203,7,47,46,46,34,87,129,39,11,73,108,127,146,220,209,231,253,66,130,115,136,149,98,0,197,170,242,15,213,115,187,194,126,131,29,42,190,37,244,101,58,210,243,68,31,253,22,178,10,45,109,129,173,181,41,96,1,113,237,33,214,57,156,123,144,227,73,36,225,120,146,114,172,178,195,144,33,148,26,59,253,90,85,145,100,242,119,97,200,201,212,132,142,23,186,190,198,155,14,47,141,160,216,100,243,241,194,53,44,174,152,43,245,218,43,246,232,120,16,90,102,219,194,117,248,141,90,38,
+66,11,210,170,26,136,65,25,18,125,46,86,38,85,217,42,8,4,11,17,139,214,73,157,74,49,196,11,145,247,219,112,37,40,140,120,40,33,207,68,167,205,148,164,88,165,94,14,125,242,65,105,218,10,249,29,59,183,83,32,218,92,3,151,112,109,27,151,30,0,128,8,140,229,224,98,223,130,83,80,42,100,170,251,217,241,177,247,65,33,2,59,119,50,200,235,215,195,190,178,190,114,61,125,194,73,9,226,80,173,35,16,103,118,98,90,134,28,42,179,45,115,93,85,182,127,226,10,146,201,38,227,9,84,27,219,132,82,87,17,88,196,22,66,189,211,149,51,46,78,245,61,226,11,113,150,120,145,121,162,52,246,118,204,103,181,117,241,230,99,8,8,152,196,50,160,187,108,198,23,134,187,99,53,134,64,160,17,231,2,9,48,140,73,8,94,37,95,173,120,163,203,54,228,3,9,196,113,214,196,187,94,70,217,86,237,104,237,67,135,170,103,72,85,23,119,199,250,28,129,208,32,16,82,17,88,46,155,109,145,55,243,243,40,195,191,108,179,27,112,4,62,135,179,68,4,
+2,207,145,121,132,107,101,51,222,181,52,166,66,164,48,71,182,28,30,190,115,104,187,71,254,138,164,56,58,110,35,61,12,189,158,158,90,21,235,167,18,173,71,46,126,57,225,120,190,28,10,228,187,210,88,90,23,11,112,25,96,159,124,14,185,215,17,134,121,66,144,248,88,109,75,177,146,32,191,203,156,139,40,141,192,174,68,199,103,119,185,196,222,43,235,31,50,36,204,220,14,103,72,80,205,34,34,245,230,74,12,80,128,235,91,57,143,248,202,146,67,103,25,192,215,97,241,243,74,65,212,205,161,127,53,95,81,31,153,187,209,61,18,69,238,57,54,129,65,160,37,48,79,154,222,231,226,203,139,84,6,78,228,59,169,20,236,52,19,106,141,35,193,252,154,164,40,244,241,240,189,89,214,231,14,10,179,200,20,50,130,109,204,190,9,195,249,148,65,91,12,174,57,182,203,243,33,235,249,230,30,43,68,100,109,203,81,160,19,184,85,207,19,189,156,5,116,174,27,236,29,56,42,139,215,70,233,98,222,130,29,73,31,174,189,12,141,242,99,216,161,63,35,192,203,119,
+6,2,117,222,178,225,196,211,215,38,127,191,110,37,77,87,151,55,83,221,138,196,250,232,146,140,152,224,253,146,235,44,177,123,214,161,35,203,140,132,92,118,250,160,109,251,122,176,242,171,188,13,68,89,215,44,252,170,86,11,72,231,251,135,204,68,45,227,215,113,51,189,0,195,146,120,215,201,117,229,190,38,158,144,90,162,142,10,121,200,222,211,193,93,9,103,178,53,94,175,58,142,105,82,59,249,204,27,95,42,75,28,38,63,152,89,195,101,62,60,193,198,250,208,26,37,241,253,17,85,215,50,20,51,31,13,63,12,80,245,150,220,184,249,106,234,229,148,79,218,128,207,35,163,90,141,128,230,60,97,143,241,105,47,166,211,131,135,47,31,172,108,162,111,195,138,136,130,92,82,75,147,152,235,222,74,203,208,185,160,28,167,189,75,32,139,187,79,183,211,63,107,14,221,35,54,45,41,46,69,211,11,127,216,88,238,42,88,185,167,143,179,138,48,143,49,232,222,199,65,163,126,218,57,28,236,198,184,251,0,33,26,228,191,171,68,199,7,143,166,169,40,8,103,236,57,
+61,113,175,196,193,216,249,76,20,229,36,255,172,42,246,160,192,246,170,188,227,47,102,80,222,86,35,15,27,148,216,76,29,185,217,208,60,68,141,237,37,164,232,125,89,145,249,234,27,118,170,255,44,185,113,246,53,160,84,57,89,236,117,171,172,157,147,135,214,126,208,176,235,238,171,184,187,43,97,35,223,43,216,95,162,83,129,179,169,8,135,29,158,0,200,188,169,173,38,48,234,214,70,84,250,78,82,224,183,77,198,38,74,114,231,246,75,62,208,0,66,212,119,196,135,188,225,98,234,226,57,61,34,129,167,70,52,244,157,91,242,234,93,18,124,187,216,204,199,138,76,183,3,54,46,215,40,249,60,181,87,164,27,253,137,226,161,103,214,241,94,246,154,20,169,229,125,92,13,98,27,103,45,192,205,175,162,143,190,90,116,220,8,205,90,186,129,90,237,16,34,128,86,48,204,72,202,72,112,97,216,194,234,9,157,0,112,169,0,22,147,15,56,132,56,56,160,158,184,184,108,135,41,198,125,55,182,123,243,11,118,6,225,32,206,32,36,236,101,215,34,93,98,55,73,169,
+231,226,185,178,55,226,209,196,208,58,111,190,105,233,238,240,146,32,23,122,51,200,164,133,102,157,219,100,97,1,72,204,100,4,207,34,210,175,153,151,62,178,216,212,178,118,88,173,172,8,215,129,93,223,79,216,243,157,164,105,176,220,9,108,252,253,220,199,234,153,166,118,182,31,93,4,121,104,65,116,50,205,147,182,206,129,236,90,87,100,155,218,70,116,42,120,168,231,66,162,231,244,135,137,243,235,173,78,172,191,204,119,58,212,209,203,157,212,72,233,223,171,195,203,124,42,19,60,91,111,232,130,194,124,244,178,175,202,144,77,0,7,197,53,149,71,167,183,45,83,164,2,126,37,53,63,238,81,62,159,207,143,235,42,149,31,179,158,48,227,8,127,153,106,45,197,181,149,177,32,73,141,232,74,222,176,151,110,210,114,131,18,25,111,10,144,246,183,90,161,16,242,238,82,28,150,82,31,107,186,185,161,105,73,92,138,72,231,179,11,69,94,29,106,123,188,4,97,8,114,174,18,99,38,180,119,140,167,226,189,2,234,231,91,227,40,3,42,175,225,146,169,34,194,10,137,
+213,251,77,200,96,83,181,53,229,68,90,191,7,24,227,129,221,193,10,184,76,12,68,214,34,100,223,142,131,178,154,80,83,45,39,53,181,34,91,26,177,200,215,215,187,15,79,192,82,239,63,96,181,33,61,68,207,168,142,254,241,178,40,247,222,154,135,43,138,179,221,158,76,180,3,95,124,9,196,216,248,106,188,48,216,10,26,118,251,192,168,47,218,148,154,64,78,181,141,55,157,141,109,55,147,188,216,246,231,232,50,43,27,14,129,78,169,6,41,47,23,125,143,49,76,231,245,225,57,109,124,150,5,28,76,52,63,108,54,62,127,174,242,224,139,33,41,65,203,201,42,231,176,42,26,179,66,194,77,161,20,13,144,41,89,53,239,214,80,200,27,233,229,46,33,42,168,48,220,5,208,28,21,189,72,201,73,39,179,103,6,35,102,246,8,25,175,212,171,221,217,245,113,159,183,40,151,222,180,198,208,234,179,71,222,240,158,77,27,121,53,162,135,60,179,97,252,201,215,223,73,219,228,241,156,179,88,2,126,235,217,147,212,218,111,246,111,49,187,50,211,219,217,11,150,82,
+214,158,142,137,38,250,241,204,87,249,122,156,201,239,221,138,215,15,219,123,193,46,238,208,56,87,239,253,114,138,167,79,12,64,178,44,247,96,39,213,102,82,119,177,191,125,118,228,27,81,154,222,208,197,243,221,235,28,35,0,113,218,67,126,252,211,139,217,192,5,80,79,69,235,165,229,198,188,25,155,145,205,41,118,62,79,19,138,77,128,150,6,8,113,162,246,135,222,170,162,220,85,209,11,111,174,206,87,10,178,146,121,173,43,237,83,197,115,8,63,122,232,122,232,8,97,174,101,134,171,119,87,188,97,163,148,24,75,92,252,235,197,124,120,40,64,79,92,167,68,11,138,113,171,12,53,211,158,93,254,153,165,188,254,210,74,194,125,227,80,17,66,247,232,218,204,61,203,246,70,4,230,116,164,54,225,180,180,208,156,53,53,215,67,151,179,180,38,3,61,111,211,177,119,241,60,216,217,163,211,13,40,44,173,62,162,39,203,152,210,145,161,238,187,137,138,76,4,120,20,18,103,177,244,249,160,153,189,195,9,218,50,5,97,49,138,221,123,131,242,68,111,61,72,168,195,
+140,44,213,98,5,91,6,219,215,94,179,127,46,189,23,85,197,254,108,177,67,223,187,231,102,22,139,114,31,19,228,124,80,172,61,123,58,2,124,159,26,59,218,232,241,220,35,181,234,93,208,217,166,239,246,48,2,242,21,226,237,179,99,93,229,171,248,151,103,181,112,168,169,241,119,243,133,116,203,206,177,122,6,58,187,57,15,179,90,220,189,4,15,42,7,57,49,152,64,59,27,196,179,125,203,214,22,193,73,153,103,228,100,212,178,128,106,33,177,59,19,86,185,83,127,37,195,10,93,59,59,235,45,64,110,201,10,22,40,248,232,51,24,187,11,232,26,27,231,12,88,13,141,6,155,87,137,40,185,55,63,156,117,115,192,57,11,223,201,141,216,1,85,50,148,135,232,143,185,5,215,137,208,200,164,247,168,69,176,119,214,51,14,183,33,52,26,103,16,104,146,97,96,133,244,122,251,28,102,107,43,161,95,180,71,44,3,29,194,213,215,41,92,85,224,88,36,65,12,172,62,86,180,15,93,16,17,230,33,162,248,34,137,191,217,171,18,61,41,93,76,10,36,110,43,80,
+222,227,112,192,32,88,164,189,85,106,82,153,35,170,228,213,67,204,122,86,109,223,119,83,217,188,190,188,222,20,237,181,50,67,71,13,115,94,101,220,34,135,2,234,171,206,123,138,164,83,118,188,116,72,114,198,170,12,41,202,99,154,65,150,231,8,61,119,240,210,109,74,125,73,81,38,201,245,72,178,121,16,51,194,51,46,75,54,86,15,45,209,121,111,203,209,231,56,245,30,99,203,207,140,86,210,108,6,198,95,202,162,221,38,41,173,239,242,130,68,61,68,90,45,66,43,113,63,85,212,89,230,143,87,51,61,255,206,126,149,176,96,250,231,82,21,73,145,131,19,200,70,136,114,243,168,43,152,101,47,66,19,29,246,58,26,242,131,36,220,83,83,133,172,40,245,166,26,37,241,235,125,176,164,247,106,54,73,191,172,27,220,67,120,64,26,209,46,111,93,27,190,52,172,233,184,206,32,106,47,42,32,45,87,251,160,193,118,167,178,148,131,67,227,132,7,9,122,66,82,13,41,90,171,18,183,68,1,237,53,135,132,151,229,42,138,115,75,225,233,98,143,161,69,83,231,
+183,14,10,24,96,30,122,22,164,43,50,40,160,152,45,131,15,213,141,236,81,216,149,203,44,26,236,142,125,165,99,81,91,36,194,189,106,43,17,107,160,228,155,130,170,91,183,34,125,99,145,188,112,162,238,164,106,57,246,156,185,215,102,217,65,87,34,193,110,246,65,178,22,169,92,132,2,253,57,183,181,22,92,197,135,112,124,231,60,30,182,157,158,81,86,216,215,142,89,215,201,100,136,162,254,208,125,188,166,206,71,129,198,99,160,100,14,121,245,250,34,81,121,43,109,71,244,197,40,184,159,200,152,108,151,89,85,13,60,46,140,160,213,146,117,45,139,200,110,96,157,185,80,182,83,114,141,2,82,170,24,162,175,30,170,1,180,186,146,88,89,67,169,247,216,218,135,246,202,77,221,37,246,145,89,241,203,126,159,79,39,34,51,166,115,60,123,150,48,159,177,42,240,178,142,73,20,199,236,189,110,117,54,110,188,161,4,4,139,55,173,13,52,244,125,99,61,116,151,43,238,248,51,44,125,30,91,110,118,105,232,73,213,74,144,215,233,64,64,197,85,117,162,224,24,163,
+237,66,125,23,99,38,234,220,222,183,202,2,71,222,87,62,91,99,133,65,181,51,149,20,53,26,243,80,7,187,17,108,65,103,176,218,183,5,38,229,156,60,151,110,62,223,54,133,57,227,19,223,117,119,41,85,145,41,16,213,246,178,210,34,23,151,142,187,137,117,41,160,221,179,27,17,243,118,85,207,211,93,243,137,254,45,233,117,12,190,200,21,149,14,160,124,64,184,192,227,7,81,189,237,87,242,212,33,134,155,3,66,1,210,176,215,145,205,1,170,156,41,151,162,161,230,147,151,102,213,21,252,197,71,108,72,47,110,109,210,81,229,206,185,61,112,68,132,40,79,18,67,195,107,233,154,97,166,102,178,190,255,214,229,61,203,109,188,206,71,110,157,77,175,95,186,165,17,63,152,176,175,238,241,66,191,94,42,240,151,102,250,101,180,142,12,82,41,210,143,50,233,29,19,247,223,132,158,189,29,226,202,155,120,35,69,210,113,51,112,224,238,214,94,187,79,66,62,79,252,163,11,96,188,57,101,165,183,182,106,61,141,193,185,120,53,72,80,172,142,12,41,102,9,233,210,
+45,64,91,90,39,28,186,225,131,148,33,66,75,88,139,247,238,163,102,13,98,81,52,148,43,169,150,168,44,201,254,190,219,50,214,183,242,77,107,35,38,158,199,153,190,117,162,228,192,217,135,111,2,173,210,152,86,232,202,43,128,73,242,164,80,197,125,92,227,98,5,246,125,71,40,221,205,141,116,206,179,64,131,226,215,223,42,183,126,56,201,100,5,38,1,178,58,249,178,242,148,35,2,162,106,12,188,200,130,221,226,224,76,165,125,58,191,230,217,5,197,160,60,182,193,196,175,146,58,86,75,15,77,44,183,226,175,173,49,146,112,132,246,150,30,175,251,21,211,133,138,79,80,217,147,239,111,51,62,181,103,209,99,34,183,175,192,66,225,185,189,48,36,205,2,203,38,20,26,56,40,81,210,151,78,81,114,148,163,153,100,94,107,124,123,7,111,128,214,165,116,45,226,34,97,115,2,104,221,170,52,22,162,234,181,237,167,244,203,104,17,181,12,116,163,48,114,25,152,228,161,215,94,205,188,247,144,226,137,73,124,208,122,140,109,59,116,29,122,46,1,199,175,46,213,253,
+104,142,143,238,243,222,199,243,133,156,174,131,136,102,232,57,106,211,112,221,3,244,86,108,12,230,213,146,49,239,28,195,8,197,185,33,173,134,210,94,5,118,196,149,184,120,11,215,246,123,147,101,45,162,200,187,152,221,189,87,153,48,214,181,16,42,40,180,140,212,54,51,193,112,37,85,225,20,180,214,248,224,63,240,111,226,149,243,133,172,203,135,68,6,216,99,69,46,37,202,141,106,74,17,134,173,186,103,99,103,123,19,85,179,10,196,82,19,98,151,68,164,40,174,79,147,78,161,175,172,58,108,194,47,206,119,246,184,27,139,38,14,223,133,240,255,74,147,234,251,210,176,65,55,218,235,187,233,42,115,119,247,194,138,8,243,165,166,211,230,183,45,20,209,132,146,53,155,162,33,69,85,7,106,156,155,156,88,136,65,132,102,69,53,122,253,48,129,215,183,150,21,208,113,41,234,50,135,181,97,3,129,149,230,179,56,246,188,170,93,145,187,178,81,239,150,246,201,221,0,145,215,161,242,52,107,159,206,86,72,12,84,183,193,14,95,189,238,147,60,23,81,166,32,160,53,
+100,167,156,207,11,244,94,163,220,186,111,82,238,4,9,145,119,169,182,23,252,154,82,181,163,108,179,247,206,206,162,151,116,46,176,35,104,118,117,166,22,13,164,180,59,96,52,85,204,90,2,188,189,49,24,221,238,120,248,129,18,116,190,138,162,108,149,211,248,74,208,228,171,178,141,74,20,188,213,175,75,24,238,156,198,245,207,106,201,237,141,43,212,135,104,237,107,178,126,119,155,192,196,66,172,30,59,139,216,231,20,27,5,178,48,182,87,144,13,245,21,174,200,127,151,74,89,239,162,81,205,131,146,209,145,210,43,73,116,229,183,156,245,121,118,95,39,113,161,92,148,105,110,217,99,99,48,44,72,29,10,65,70,202,50,181,118,10,219,142,151,58,252,254,73,64,227,216,250,36,174,232,6,51,103,133,194,193,137,222,209,222,17,111,99,145,30,68,178,115,235,231,32,177,19,69,232,93,50,236,172,86,66,1,70,164,9,230,129,53,191,195,83,47,189,27,156,240,42,223,101,117,115,177,213,208,126,115,142,33,210,0,49,230,60,22,186,122,74,96,252,55,250,151,85,78,
+238,194,7,105,125,59,153,214,51,107,71,105,23,110,174,175,62,114,234,174,251,142,128,252,169,42,60,226,2,250,109,58,107,90,240,192,240,25,3,184,120,16,219,121,151,11,110,188,84,147,102,225,236,185,236,40,152,234,168,142,183,120,113,41,2,35,249,126,135,15,106,66,50,42,72,248,220,118,178,196,243,241,113,95,231,197,117,156,133,214,79,216,201,174,207,85,223,120,91,52,236,214,211,26,49,169,183,113,88,58,71,46,232,71,36,236,95,188,209,232,209,211,98,72,201,145,141,130,62,73,16,241,23,55,135,231,53,207,16,8,63,231,229,252,161,67,111,132,18,82,62,232,159,69,95,47,128,195,182,18,98,123,41,1,35,132,142,6,18,23,40,64,136,23,67,195,215,16,240,37,1,124,13,190,116,5,5,37,181,81,8,241,152,167,0,110,217,230,78,128,56,252,58,251,92,240,194,148,26,188,18,82,72,76,14,204,240,221,245,117,249,14,232,129,248,14,2,1,32,110,240,94,193,218,168,149,46,90,84,105,170,104,200,85,30,58,121,77,146,78,185,100,28,82,80,206,
+105,31,193,206,148,238,47,240,29,117,139,122,120,248,225,10,104,233,204,43,84,162,232,230,188,158,182,11,184,143,129,25,17,131,82,37,16,204,155,227,239,196,63,46,253,177,68,24,223,57,7,14,179,32,110,144,120,60,108,81,171,31,113,184,120,121,147,72,97,250,188,177,116,0,34,250,51,88,90,78,236,12,223,249,164,28,30,73,56,94,133,47,158,159,54,90,188,135,172,2,128,5,75,136,9,7,66,79,18,220,225,170,236,86,74,86,97,96,185,159,16,47,32,7,140,169,136,50,66,167,13,200,16,31,240,24,33,124,15,162,8,56,14,251,40,18,68,140,37,160,229,60,200,198,228,160,86,196,36,120,1,184,173,31,77,132,250,200,183,255,14,142,169,135,125,148,12,226,252,82,122,53,63,227,156,212,204,65,193,52,15,156,51,96,253,92,9,214,210,135,4,198,115,48,204,13,130,243,114,96,21,225,63,9,2,127,223,63,176,170,133,63,29,88,253,182,127,242,224,63,17,126,66,156,8,107,227,183,128,47,240,217,104,111,245,15,249,193,74,175,191,3,137,49,221,102,
+68,153,235,101,50,42,106,192,69,222,194,122,62,7,82,110,171,100,43,176,4,30,227,242,105,154,56,245,221,203,186,25,20,76,63,143,216,159,29,248,99,0,124,240,181,71,61,204,199,60,200,93,180,40,192,8,149,59,87,228,2,30,198,172,153,155,133,84,181,225,163,134,156,21,107,70,227,41,110,117,158,217,2,129,156,188,173,190,213,177,4,90,214,57,71,72,135,249,139,233,53,7,33,138,15,29,46,206,191,105,150,55,24,185,185,158,147,98,38,67,171,71,102,30,105,124,181,199,36,201,40,101,1,84,117,196,20,239,97,252,224,13,108,13,14,218,175,15,61,163,174,196,80,253,97,219,193,53,210,65,240,137,10,96,26,207,169,130,16,117,159,146,233,72,181,192,253,217,48,205,131,85,16,139,25,143,26,120,179,48,164,145,29,210,124,37,186,19,96,187,148,207,171,23,114,14,102,64,38,58,72,67,224,0,108,159,67,154,190,146,164,196,58,178,179,98,8,232,9,98,103,100,157,50,163,248,150,151,45,110,71,42,240,18,204,103,140,85,250,244,9,91,69,9,11,204,
+82,185,30,58,245,170,99,106,87,25,82,149,43,243,77,39,2,245,182,134,54,73,97,162,0,173,157,65,16,186,32,6,97,6,62,16,39,6,56,243,192,140,25,69,234,192,29,95,250,165,89,107,175,156,116,205,89,252,153,251,8,51,161,63,7,220,89,235,77,76,102,133,102,124,92,15,121,87,222,241,191,106,129,86,101,39,237,149,228,185,14,93,179,202,34,142,234,98,251,201,48,45,132,208,18,81,178,152,125,181,110,147,75,172,169,138,90,60,43,35,97,228,196,78,139,184,195,152,91,138,204,99,96,46,78,245,40,253,244,132,135,135,42,240,141,150,23,254,1,190,42,16,1,243,143,104,192,0,185,44,158,0,242,201,57,170,199,194,146,161,135,163,217,203,1,39,180,3,78,94,207,78,0,108,30,140,11,99,186,100,103,45,180,128,122,244,114,0,111,253,90,138,132,49,112,24,145,131,49,122,128,232,203,113,117,225,5,231,52,56,49,133,241,46,56,128,200,109,125,121,61,160,29,134,42,226,180,172,16,156,211,178,58,39,156,150,213,235,253,33,89,135,57,249,56,44,
+2,152,19,56,28,210,204,240,165,60,98,252,59,116,47,44,152,55,213,213,213,213,176,25,166,27,71,53,239,153,40,159,86,195,4,57,199,117,90,244,238,24,9,37,96,49,218,149,22,151,148,108,193,0,31,7,238,87,248,142,193,80,37,116,94,109,171,251,9,109,240,129,1,132,74,176,102,207,172,208,63,94,23,25,120,219,108,217,244,169,140,243,90,99,22,159,72,144,146,139,18,97,238,234,240,251,90,142,192,63,123,160,7,136,45,129,133,127,182,62,46,180,151,249,129,102,245,161,197,182,14,44,168,54,155,122,17,111,29,212,128,64,62,92,75,7,252,109,252,154,64,119,30,198,1,49,14,216,127,227,131,121,99,97,28,18,133,233,210,195,244,71,149,31,4,157,209,139,35,216,200,198,107,249,25,225,36,160,79,96,193,8,118,220,209,12,107,29,196,106,32,134,248,172,64,29,134,191,156,134,143,176,133,6,191,165,70,36,72,183,64,203,210,59,59,216,41,241,42,203,251,73,68,179,28,133,64,163,223,209,207,137,39,85,236,246,28,144,203,1,202,13,172,127,4,2,
+78,147,189,179,237,68,134,156,180,162,228,161,5,51,131,45,38,57,122,21,176,143,21,204,80,119,246,237,217,57,254,248,222,140,115,216,57,12,248,1,203,161,156,82,172,38,173,5,243,41,238,123,63,249,19,206,191,203,159,124,195,9,153,115,114,84,177,163,181,104,57,4,242,180,223,44,61,162,64,118,134,71,156,28,22,130,114,114,88,146,155,147,195,170,35,78,14,235,27,30,37,39,60,210,14,254,243,48,193,249,9,102,47,202,19,204,58,156,19,28,104,103,39,152,33,18,39,152,201,56,39,152,117,16,39,152,33,98,39,152,73,253,39,152,201,110,79,48,67,196,78,48,19,188,208,78,19,252,191,197,177,15,214,1,177,47,78,75,146,48,237,59,124,39,118,184,252,76,17,244,104,8,206,53,44,151,2,158,54,86,194,119,96,61,178,174,224,177,220,51,192,189,129,137,73,16,235,71,88,77,200,131,223,134,19,18,4,242,179,114,140,60,193,195,205,240,189,225,235,99,25,11,10,99,37,30,250,185,232,133,227,209,81,101,44,88,103,243,115,224,130,135,152,62,29,4,
+65,194,68,80,48,163,249,152,251,200,255,99,231,83,253,254,239,166,119,8,39,44,242,129,25,152,151,203,3,51,48,47,30,193,81,224,126,226,192,12,124,47,167,115,18,36,43,56,9,242,127,167,63,237,11,98,26,151,81,124,104,181,11,22,250,104,130,163,134,60,253,83,0,125,71,188,254,176,210,143,11,64,143,60,133,59,132,226,20,238,128,216,41,220,129,200,83,184,67,60,28,81,132,252,33,238,159,3,119,71,20,193,52,79,97,239,199,248,125,119,10,123,8,234,41,236,113,206,192,127,191,120,42,57,193,20,249,114,130,233,249,195,9,166,191,31,87,253,244,133,96,221,209,126,170,49,2,90,16,86,59,226,25,113,2,202,217,41,157,192,35,79,122,67,248,17,39,160,156,191,156,128,242,111,203,35,68,63,168,225,229,164,134,231,243,147,26,206,201,39,53,92,124,158,212,16,59,63,169,225,230,238,164,6,12,254,164,6,55,242,164,6,206,249,203,15,19,252,123,234,217,114,46,32,72,89,104,224,210,29,255,207,73,191,255,214,188,133,139,9,233,185,171,11,0,113,
+32,251,249,44,191,0,45,76,66,130,227,199,31,111,123,81,121,96,106,129,207,87,217,33,30,113,46,199,89,216,223,132,93,240,66,56,60,103,203,197,135,84,204,96,96,54,254,244,148,101,46,89,64,15,67,156,115,26,230,81,54,18,197,101,186,228,63,167,159,18,89,201,231,179,10,156,217,159,144,159,39,189,188,193,108,91,94,6,144,48,157,167,15,92,166,111,242,158,177,130,51,14,69,86,90,146,252,199,23,1,192,242,193,2,62,9,45,129,59,126,11,223,121,145,125,28,173,238,122,8,117,104,94,25,159,219,20,121,216,125,17,92,63,156,157,204,43,56,127,151,70,58,47,59,254,61,24,159,119,100,78,202,183,115,51,60,124,45,35,45,125,174,9,105,17,152,16,206,124,236,240,249,33,245,62,209,59,39,49,58,226,136,120,250,218,244,214,158,179,143,144,161,94,203,154,109,179,98,222,162,196,40,59,114,177,29,255,224,60,17,250,64,28,9,69,56,142,68,127,57,236,209,12,253,121,119,218,211,142,246,155,162,96,205,68,222,211,114,68,228,33,143,126,57,154,131,
+168,120,6,172,1,57,72,240,238,122,52,130,225,90,223,199,146,238,83,99,27,137,18,7,219,183,135,163,185,155,35,90,111,83,215,178,16,14,46,91,56,40,49,214,239,83,9,35,239,57,185,222,5,27,233,156,117,194,167,29,255,33,204,153,109,162,157,52,178,110,171,195,217,59,132,8,2,48,9,12,231,52,13,16,181,122,37,69,35,36,157,215,215,215,165,119,243,219,187,243,178,15,180,189,50,79,23,113,196,235,35,60,135,76,41,140,199,137,64,218,67,205,198,248,224,81,252,179,167,163,58,41,157,243,6,48,11,205,76,28,36,120,154,144,124,131,87,5,103,37,140,184,44,178,193,121,24,235,245,135,117,120,135,16,210,14,21,207,9,183,254,27,87,66,105,37,18,94,101,151,246,111,113,229,44,168,135,214,190,235,154,23,46,211,80,223,244,32,186,1,124,163,58,250,176,128,79,55,246,31,19,69,192,175,183,144,13,112,106,42,197,254,104,63,222,209,126,112,201,174,12,233,214,61,160,7,167,76,175,223,234,150,15,225,154,251,236,41,232,128,252,121,95,8,189,201,
+232,215,210,171,183,147,250,100,32,211,36,204,57,41,230,144,61,150,124,215,221,245,245,241,182,149,168,143,101,233,183,35,83,200,100,76,120,78,199,160,8,211,97,176,14,7,56,172,69,80,234,219,11,51,1,146,136,244,60,203,97,203,56,110,202,63,211,124,147,83,4,171,59,48,151,26,210,94,225,125,61,99,230,148,250,233,161,34,85,214,53,196,149,125,165,35,200,33,112,167,5,215,129,117,79,161,74,35,93,235,91,13,240,174,208,245,137,109,27,213,236,248,8,244,73,80,162,255,41,209,191,159,6,228,246,113,162,79,105,10,242,210,136,3,243,198,178,18,155,107,95,229,16,70,17,71,193,114,77,22,31,123,63,216,19,201,207,40,119,230,51,91,149,80,252,178,90,33,164,107,158,204,24,122,69,156,22,254,243,165,28,180,36,36,118,89,162,191,0,84,20,245,21,251,116,128,140,63,104,217,1,200,87,124,21,31,140,196,123,188,143,139,163,125,191,78,203,165,195,21,13,146,44,63,60,33,238,196,151,202,15,59,92,76,72,11,7,174,227,15,26,79,126,140,123,168,
+151,231,255,33,252,202,255,87,249,11,245,20,30,55,133,29,85,122,69,252,255,93,28,252,81,159,60,248,83,251,77,182,184,114,203,184,18,248,218,199,97,209,164,133,112,2,81,134,3,191,224,63,26,63,203,35,63,100,237,126,220,8,194,249,105,116,69,211,203,239,120,103,103,237,179,252,192,220,136,243,252,158,176,81,70,255,109,130,141,165,155,107,88,43,143,34,118,169,40,135,71,33,81,221,206,33,179,65,4,14,252,228,125,135,135,102,201,170,98,110,122,67,239,94,30,190,95,29,191,247,136,12,97,250,131,45,74,55,14,134,53,47,102,188,34,126,8,67,112,213,81,31,235,205,147,150,33,239,207,157,255,144,8,110,240,157,57,247,74,138,148,196,233,81,101,193,60,206,167,20,89,30,66,219,247,176,142,228,16,219,35,185,130,57,49,17,2,40,228,192,114,165,12,35,126,204,51,251,174,176,126,247,105,225,98,126,107,111,18,172,46,47,76,58,115,148,115,126,118,9,215,215,7,81,114,28,140,127,86,151,46,174,248,160,231,35,162,255,113,31,100,33,101,89,20,185,
+110,232,209,63,11,152,214,215,63,226,67,111,68,213,44,96,53,157,54,51,186,64,235,135,252,183,3,251,193,188,175,195,36,109,54,136,230,205,81,179,57,120,172,145,32,80,227,89,143,143,25,109,61,64,73,42,229,135,68,17,127,132,237,64,250,46,79,171,24,78,200,145,100,140,185,251,210,56,196,83,162,200,202,142,37,238,41,34,254,115,202,231,158,69,188,195,11,188,238,224,188,70,115,156,103,126,131,31,4,103,20,56,79,151,220,254,63,169,67,57,63,212,161,63,248,253,75,212,41,45,251,79,158,247,145,14,187,97,227,131,223,123,56,2,74,9,47,59,22,224,172,136,142,191,102,134,199,17,255,211,228,141,255,161,237,249,195,62,29,134,232,159,13,146,135,215,85,157,224,120,86,76,216,143,136,142,119,67,254,131,200,255,177,235,182,223,183,187,243,11,202,91,217,100,73,184,106,194,214,54,55,231,115,206,205,141,138,139,227,92,68,152,68,139,103,122,99,230,77,162,124,159,118,42,138,143,63,94,93,95,156,5,137,250,193,229,105,251,108,50,1,249,60,247,173,181,
+216,121,94,124,29,118,110,67,186,157,119,55,152,91,214,163,87,114,246,108,126,107,200,110,146,175,92,14,49,30,254,36,192,230,87,189,240,104,113,158,236,236,30,78,53,245,124,15,224,191,64,156,221,118,188,168,138,228,10,113,78,4,209,47,228,56,6,113,9,72,101,170,117,173,169,54,202,47,100,129,32,44,231,25,4,222,116,244,32,82,200,246,100,87,230,249,40,116,17,21,77,222,244,97,60,23,166,249,2,242,45,59,112,156,243,97,40,197,161,50,66,128,244,76,108,88,220,66,37,177,222,25,229,82,210,44,223,118,16,6,14,71,22,183,63,155,242,116,218,74,56,153,124,33,19,230,246,123,60,60,39,240,104,136,27,73,7,80,71,163,122,107,158,217,250,26,46,174,212,204,251,72,226,1,172,139,97,221,141,16,157,183,217,218,98,195,236,107,95,65,221,194,243,166,207,194,212,56,156,153,37,190,179,247,83,118,202,198,115,49,110,16,226,136,176,251,77,143,192,199,242,118,201,126,221,204,119,244,173,106,123,164,217,243,113,60,218,213,13,124,195,138,179,142,239,234,
+179,244,245,179,150,135,179,69,238,207,192,231,183,131,92,56,16,211,233,87,27,161,221,144,50,27,214,120,52,254,113,52,103,77,142,239,150,160,177,144,189,0,118,215,30,61,134,80,57,200,57,227,175,29,33,104,126,183,198,253,93,186,78,241,122,181,78,139,95,39,19,89,251,70,115,208,163,108,65,127,39,149,109,249,71,155,19,27,39,28,199,109,14,226,27,44,120,39,153,102,182,130,237,161,144,62,110,47,215,6,19,35,12,220,51,225,123,238,206,101,52,208,147,86,59,148,145,72,84,143,203,159,175,13,146,206,143,250,241,2,170,116,78,37,17,201,21,8,216,60,79,227,43,31,73,159,5,153,55,29,93,79,167,211,65,245,107,190,115,189,101,246,121,242,168,179,92,10,232,75,236,42,167,9,255,49,168,66,159,158,93,67,232,148,69,173,165,229,215,96,208,210,113,140,198,72,17,98,119,197,74,105,216,22,82,207,65,180,145,212,78,27,38,170,126,102,24,32,132,166,251,182,185,212,47,121,215,103,115,236,114,118,86,78,144,34,56,38,110,120,91,186,166,13,45,226,
+221,6,183,218,229,104,86,11,26,50,139,222,182,70,223,82,24,105,216,237,234,121,142,130,164,228,239,113,155,248,238,108,20,239,142,215,67,93,99,131,227,245,69,229,171,203,189,242,218,64,24,158,9,212,202,52,6,255,37,76,55,108,148,166,86,89,69,94,27,211,118,252,240,44,58,60,227,66,122,253,154,23,184,93,110,112,187,28,180,55,202,81,70,68,89,21,189,130,164,236,219,240,104,49,182,216,77,83,142,133,2,82,114,118,117,243,229,32,87,106,225,188,66,188,61,207,209,223,218,192,254,208,21,246,31,253,225,191,254,159,126,246,253,175,127,183,215,239,63,249,201,95,252,245,183,143,223,253,245,79,190,255,238,103,191,254,254,255,162,145,238,183,54,180,255,221,111,105,28,187,226,254,208,5,248,239,127,247,143,127,236,112,124,236,196,251,99,187,224,95,255,242,219,144,31,40,252,247,191,71,225,208,87,247,187,191,248,205,175,126,117,152,239,56,244,219,200,127,252,135,255,250,216,223,246,187,99,91,235,67,91,226,223,246,206,61,118,116,62,182,77,62,181,66,254,55,
+56,254,70,228,159,252,225,191,254,103,127,251,55,63,253,213,207,127,246,139,127,241,99,75,232,195,135,67,171,230,83,111,225,31,216,248,229,225,127,223,253,244,255,248,245,79,127,245,139,159,252,252,187,111,29,132,255,224,175,127,253,235,191,249,211,63,250,163,239,254,62,252,231,199,142,202,255,20,150,226,39,127,254,211,159,31,218,31,31,154,252,254,182,113,239,15,124,254,111,63,251,233,169,207,241,47,126,250,23,7,165,252,197,175,127,3,19,61,116,75,255,171,95,253,228,111,254,250,212,229,249,216,56,249,52,209,137,202,79,127,126,108,205,254,109,150,255,1,214,192,129,216,207,96,58,191,223,203,250,103,191,248,254,167,191,250,245,239,220,246,173,69,241,65,158,111,36,254,217,143,74,132,37,251,225,203,255,250,91,55,225,255,249,247,218,72,195,55,159,186,77,255,158,76,135,225,255,240,247,154,114,255,229,207,126,5,75,246,243,191,253,38,227,193,30,7,153,254,151,127,126,156,255,207,254,244,207,254,232,207,254,8,6,193,159,253,209,161,65,243,31,253,163,239,191,135,
+173,254,103,255,197,79,127,241,103,127,248,155,239,255,249,119,63,124,134,137,253,175,223,125,255,183,223,255,250,167,255,242,239,204,126,104,169,252,173,87,247,55,203,254,228,91,207,227,223,145,248,71,0,127,211,235,143,192,252,65,93,191,199,221,47,127,241,187,154,254,1,62,135,166,217,191,165,241,243,163,101,255,224,159,30,144,249,251,29,150,191,251,203,223,118,96,254,47,127,176,245,105,252,15,61,173,191,255,238,55,191,248,217,255,254,155,223,155,230,251,159,253,213,47,126,242,235,223,192,75,3,6,204,177,9,244,191,250,201,223,254,222,180,191,203,241,137,223,223,252,226,39,255,242,207,127,246,87,191,249,229,111,190,255,55,17,114,52,201,111,161,127,160,246,119,199,252,87,135,118,229,223,127,255,99,23,232,63,254,7,255,224,239,193,127,17,23,248,67,30,137,184,248,130,14,49,118,57,100,108,32,54,11,113,118,115,246,74,228,63,82,49,52,243,68,51,53,124,184,131,166,240,121,176,170,63,203,9,102,25,79,188,94,81,122,121,186,91,13,251,17,61,122,134,136,125,
+108,74,50,42,220,200,215,91,196,21,66,206,94,228,78,24,253,3,120,17,253,245,207,126,253,221,255,120,2,231,191,248,233,223,30,116,244,119,84,248,243,159,127,247,231,191,250,166,241,35,179,127,254,171,95,254,171,67,171,236,191,252,217,79,126,254,203,191,250,211,147,92,191,109,93,253,39,127,252,39,255,240,239,253,241,159,252,183,255,205,221,133,228,156,14,103,11,231,141,253,145,237,52,163,207,188,125,120,0,243,220,5,253,166,58,126,127,164,184,170,83,51,242,97,98,148,16,4,3,147,38,44,189,209,202,36,28,94,73,193,59,175,158,191,242,157,241,55,147,135,242,38,220,58,182,183,113,202,4,118,204,143,90,251,125,67,90,234,84,67,129,177,221,71,194,244,58,181,135,134,225,246,42,252,33,106,189,4,34,144,177,25,121,240,128,144,221,40,147,83,100,42,246,102,195,132,168,201,221,102,83,202,27,45,226,110,33,61,179,90,45,177,76,20,83,120,76,175,139,83,179,200,63,152,150,153,5,243,114,190,240,170,131,225,72,142,105,181,113,141,252,171,236,190,63,3,
+187,3,167,215,82,104,132,205,109,113,151,129,108,219,205,61,180,157,11,6,69,46,89,136,37,85,194,229,196,158,205,204,15,172,214,91,45,5,19,41,107,194,69,84,0,83,68,85,155,233,128,239,81,111,142,99,34,111,225,243,137,46,43,101,131,21,154,117,227,121,189,0,242,59,214,36,191,86,229,204,89,40,80,97,15,102,180,241,114,135,228,179,164,99,244,126,93,249,170,33,41,73,103,163,158,185,143,84,34,251,4,61,123,134,247,202,222,190,32,191,223,156,38,46,33,179,70,252,170,135,236,210,226,66,173,218,96,69,11,92,204,120,19,125,90,177,210,144,0,176,179,233,219,107,206,116,179,140,150,197,130,242,102,189,84,238,134,171,107,73,187,47,131,94,46,34,151,59,145,115,17,46,18,174,207,92,218,146,235,240,210,35,232,13,245,165,64,47,68,247,128,209,118,77,177,204,167,252,59,187,81,168,45,170,252,56,212,180,104,74,22,4,139,172,161,64,181,210,34,219,73,107,31,29,68,183,52,248,171,77,152,81,82,19,233,214,184,247,153,113,49,205,198,74,45,77,
+5,59,18,224,173,43,94,139,237,65,18,204,10,223,222,130,28,191,146,7,157,85,210,185,86,117,84,31,129,27,46,213,175,238,86,160,87,63,137,7,101,61,130,140,16,108,172,195,249,114,124,51,159,59,38,236,220,250,189,148,232,54,247,155,65,80,105,14,89,245,251,146,6,44,244,84,20,170,89,106,77,26,76,54,200,19,120,72,13,140,219,155,183,91,127,93,111,110,84,160,8,38,111,14,181,55,181,82,168,184,223,211,85,239,159,145,112,78,172,196,157,93,238,26,140,218,20,17,102,108,60,248,66,237,189,116,124,167,186,135,56,158,93,137,211,202,209,16,182,230,176,221,29,188,49,162,64,49,85,127,170,7,107,139,203,88,131,39,82,206,181,123,146,159,175,214,200,39,20,213,244,202,65,111,237,129,168,191,6,61,164,39,215,91,127,154,176,199,167,25,27,100,127,33,182,231,153,184,245,186,184,89,180,114,74,235,174,74,142,20,63,129,209,19,171,135,79,8,21,124,241,37,190,247,246,89,164,12,165,75,68,106,243,94,26,213,22,198,196,212,53,238,241,90,106,63,
+70,222,133,176,120,71,204,238,23,39,217,237,146,105,1,49,54,209,175,174,109,232,109,37,214,226,55,0,207,238,161,216,21,170,206,70,227,30,94,81,223,145,109,10,204,146,169,149,239,210,141,169,189,100,131,182,157,197,63,98,207,106,183,19,167,86,151,107,137,193,253,202,30,17,169,168,147,207,80,205,126,149,217,21,160,61,11,223,154,82,161,47,54,99,23,103,111,186,5,66,168,195,24,178,71,23,164,69,147,254,80,90,20,135,241,231,221,36,109,220,208,22,119,58,135,21,122,241,123,42,181,200,23,33,97,246,199,39,138,170,175,105,51,108,7,141,90,132,206,238,68,25,171,25,86,90,14,79,112,118,57,180,39,206,95,39,131,46,123,180,217,44,179,198,69,11,77,103,172,24,211,29,221,127,59,129,242,88,135,168,255,212,54,210,175,35,69,125,21,130,140,119,205,70,187,53,114,164,196,236,17,118,186,216,41,74,230,125,133,158,102,22,53,186,149,72,26,238,78,124,134,136,217,89,145,203,38,52,21,43,254,165,105,100,181,93,49,147,203,214,54,137,247,140,119,139,
+106,4,102,248,105,172,173,214,11,7,220,70,167,125,239,146,148,9,142,233,94,254,210,98,214,160,109,136,106,190,216,215,11,140,212,46,189,129,225,141,205,118,133,229,226,166,12,90,138,242,47,239,224,158,56,64,142,18,85,117,194,117,35,144,214,136,6,130,180,57,123,107,143,251,229,246,118,214,140,26,157,123,118,126,56,220,44,34,121,103,82,109,254,8,68,86,184,121,254,125,213,244,41,160,129,207,52,238,70,154,182,194,64,51,59,219,10,23,13,200,87,166,59,63,34,243,138,110,216,103,143,139,169,150,91,172,180,143,114,195,188,231,118,149,93,83,157,25,145,113,79,250,108,185,105,124,99,127,191,55,58,157,203,215,26,157,101,25,238,118,124,163,161,228,228,108,102,172,85,119,192,210,213,6,145,172,178,108,211,126,201,117,185,1,51,103,75,127,18,69,200,26,189,69,43,198,158,38,61,48,153,191,178,153,59,95,101,76,211,172,209,204,124,139,21,119,63,130,238,214,229,85,208,247,178,209,58,107,204,225,179,13,189,45,156,109,7,159,175,170,219,93,163,224,216,87,
+91,136,55,150,0,63,184,172,186,97,9,61,210,230,101,171,5,233,106,181,64,185,7,117,210,79,86,214,118,176,33,182,36,22,138,29,92,185,239,29,174,44,83,231,172,72,68,249,186,204,103,17,57,119,128,102,182,223,190,169,145,117,181,69,238,220,142,2,27,41,202,192,218,53,144,185,40,110,93,122,86,251,243,78,123,169,188,88,152,123,184,253,178,78,110,20,162,253,245,224,130,238,40,234,235,59,55,42,55,4,173,149,162,125,146,27,236,104,74,96,88,199,202,241,57,114,116,104,110,116,216,73,215,45,102,162,238,236,76,235,101,71,42,86,12,77,95,159,173,200,250,25,74,226,190,28,55,95,123,90,11,122,232,236,212,116,212,235,70,176,18,12,46,5,71,238,165,205,192,165,68,189,201,149,30,39,107,2,123,232,220,108,204,76,163,178,207,128,50,152,150,30,42,104,220,55,171,117,151,121,63,12,163,198,239,203,241,254,157,217,159,83,74,237,247,28,234,94,62,77,82,244,24,251,190,219,213,164,149,246,143,109,177,81,26,82,96,25,110,23,249,129,249,253,17,106,
+77,116,184,222,182,58,216,205,112,69,96,77,90,233,186,142,105,56,212,215,21,105,67,86,206,246,165,173,250,147,152,123,90,11,35,107,51,22,92,221,202,137,155,244,244,201,72,121,86,11,196,72,20,166,181,167,172,95,60,151,216,219,235,118,43,9,141,171,182,42,196,182,181,18,86,108,33,131,50,55,44,118,54,131,208,138,22,46,225,53,202,243,23,110,226,17,155,113,1,121,134,179,210,74,177,231,119,205,229,14,99,21,249,242,1,27,139,168,88,185,103,111,124,123,160,122,62,39,76,134,3,231,110,94,201,75,81,151,162,252,236,170,80,54,44,45,134,249,189,186,56,46,40,174,150,110,213,58,62,82,200,212,236,88,244,67,186,166,190,90,83,111,138,103,53,99,98,170,228,203,133,175,76,131,233,90,51,103,80,191,255,160,160,229,182,110,65,220,187,170,209,85,212,70,168,30,156,164,75,35,75,68,82,54,108,197,93,209,23,58,171,107,124,109,238,89,176,191,54,213,246,91,238,154,27,113,138,213,95,29,158,29,170,107,125,27,31,52,229,77,4,95,94,242,93,203,
+138,168,74,60,123,180,41,180,177,139,175,135,140,225,112,173,170,12,216,37,10,29,191,156,248,208,55,220,70,224,178,26,47,95,58,189,37,82,249,171,89,111,97,138,173,79,93,200,81,90,33,77,118,104,63,190,198,239,63,61,171,237,132,172,71,49,28,79,174,221,39,166,47,46,165,83,243,173,190,239,43,230,35,123,248,95,113,193,154,158,153,228,116,235,78,201,236,136,129,205,221,126,61,177,149,159,161,222,122,19,164,40,160,79,239,72,4,13,83,67,226,254,243,106,45,143,18,8,9,138,98,71,253,42,208,110,125,78,178,115,116,233,196,129,43,67,153,53,164,219,213,116,85,69,2,131,242,67,190,34,45,207,74,80,82,121,46,167,59,223,247,206,23,237,141,70,28,160,223,0,22,157,171,204,119,100,28,171,97,220,151,210,57,227,3,115,237,21,27,114,38,74,154,189,106,139,44,191,147,113,78,253,46,19,142,108,35,165,216,124,213,205,101,156,139,254,38,62,201,47,112,180,228,190,103,155,47,106,170,226,186,167,184,162,94,168,215,129,238,110,56,119,114,75,233,105,
+178,230,220,121,179,252,84,81,23,141,82,75,206,238,60,180,170,82,7,247,87,242,171,152,241,157,45,210,134,214,15,20,182,189,89,136,119,73,94,182,181,227,26,65,104,214,166,135,139,90,51,220,238,46,62,142,164,23,51,72,172,158,237,3,98,167,193,52,217,242,2,195,194,197,210,62,148,64,233,229,240,214,220,81,75,22,227,70,107,195,156,135,235,151,11,228,161,225,29,101,209,238,82,203,195,199,153,254,70,231,134,60,59,230,245,253,176,255,184,104,237,175,167,253,213,100,216,118,114,119,34,177,155,242,204,180,65,197,77,60,109,96,91,52,198,221,7,99,254,186,159,228,113,84,227,236,81,35,167,99,105,201,70,151,1,58,171,34,46,123,148,87,243,216,184,69,158,60,123,239,153,39,228,201,2,73,150,211,40,239,115,79,223,57,207,169,116,59,253,157,107,93,195,101,116,77,245,7,77,115,145,194,56,71,77,53,133,57,185,79,2,216,241,218,60,235,251,202,99,159,205,156,183,57,249,221,221,109,145,62,88,150,203,230,23,245,106,235,156,68,167,152,1,163,118,121,
+199,154,109,236,106,242,158,189,220,204,49,121,7,177,135,82,219,64,205,135,101,217,140,155,182,172,153,122,162,42,168,130,111,84,171,66,65,88,81,40,185,122,202,173,249,216,109,27,183,77,155,111,129,229,140,160,47,12,28,158,179,168,47,40,68,69,229,68,37,118,158,189,143,249,166,215,204,80,244,35,108,17,59,7,11,213,246,83,216,111,149,132,165,253,90,25,185,82,197,58,206,65,5,150,92,99,100,59,156,80,182,171,156,92,180,244,56,203,156,223,229,100,195,215,216,85,45,11,27,15,22,61,11,203,14,139,94,97,238,52,216,69,58,226,44,235,26,100,105,68,60,143,12,233,37,219,103,39,105,119,5,48,105,204,36,224,49,87,130,35,204,61,150,213,49,45,191,244,148,29,107,222,207,156,201,213,172,201,52,141,186,222,77,31,246,23,86,59,132,52,130,225,18,219,233,53,87,40,107,241,134,53,236,70,22,243,197,98,127,213,170,66,228,98,103,177,116,130,170,45,219,220,17,139,153,80,22,157,89,142,22,24,187,218,171,42,152,250,226,140,115,255,142,31,58,230,
+77,103,109,155,167,160,136,208,211,138,171,14,54,139,249,253,162,242,48,68,33,197,140,61,48,220,114,94,162,246,137,92,181,138,127,154,119,234,41,179,102,180,48,117,161,253,225,29,242,90,180,87,210,124,64,246,239,239,7,129,242,154,205,223,145,70,139,170,61,2,46,230,222,50,193,185,64,173,122,58,178,17,133,182,11,67,59,147,103,197,167,52,231,215,37,188,115,106,217,146,43,147,201,69,115,72,239,60,201,219,16,74,176,40,145,118,55,244,171,253,91,215,126,183,247,62,135,38,252,157,62,25,109,59,42,94,87,136,23,202,15,88,152,220,54,41,12,163,68,61,75,122,72,181,230,72,231,251,26,201,77,87,219,237,170,81,130,128,169,93,203,12,88,251,243,168,87,161,117,189,152,101,30,121,129,221,175,145,187,197,170,220,101,141,225,68,195,183,137,87,17,47,15,216,206,231,218,146,29,246,247,125,22,155,74,95,191,23,136,227,182,195,57,65,221,179,215,91,117,222,25,218,176,26,182,18,37,29,106,56,124,123,167,93,235,49,151,62,144,109,62,164,55,182,251,210,
+242,107,116,110,238,146,50,43,1,71,118,219,208,140,158,218,147,61,238,53,4,217,194,27,198,66,92,242,240,203,139,89,196,95,213,88,111,92,126,47,145,55,26,70,51,106,222,196,17,140,6,69,67,92,158,138,181,238,152,131,228,126,228,116,148,161,74,209,6,121,179,198,233,36,109,113,182,7,148,177,67,109,47,135,72,5,82,4,119,222,148,169,242,130,106,92,183,166,173,94,48,244,110,186,79,35,135,156,219,161,178,202,206,218,67,161,210,181,147,250,217,101,245,24,120,151,228,70,58,188,172,94,21,102,105,67,51,212,191,119,70,137,206,186,156,153,116,216,19,154,81,105,155,81,27,91,81,40,177,183,89,43,147,150,106,164,157,206,161,237,200,216,192,217,204,174,218,75,152,121,173,126,55,177,183,238,253,199,170,111,187,46,131,211,192,4,106,215,150,41,48,202,237,78,187,59,203,254,205,126,215,219,175,109,206,230,24,15,122,187,190,231,178,201,92,91,137,66,185,1,35,97,183,125,241,186,65,81,182,212,10,34,153,253,60,221,35,102,100,109,163,151,228,208,116,65,
+247,178,96,63,197,187,128,12,157,15,118,158,57,13,136,217,186,84,183,30,201,52,150,208,215,206,105,110,109,92,155,235,145,242,11,123,117,185,16,131,211,165,51,180,222,169,160,32,12,214,198,98,105,122,67,26,35,67,168,148,47,145,228,134,65,66,231,216,155,211,111,250,201,208,177,112,136,159,70,23,17,181,166,199,26,110,106,221,47,222,189,2,198,93,48,223,212,246,223,88,55,158,229,118,16,201,223,228,243,20,95,145,73,17,165,130,217,47,212,162,137,43,39,84,163,122,21,123,102,156,222,48,166,73,223,25,202,178,199,62,150,13,16,41,60,131,90,211,161,213,166,102,14,90,231,95,123,59,243,186,85,102,178,247,139,125,59,83,140,20,96,193,145,119,123,81,143,64,64,233,229,234,125,193,13,242,225,44,144,46,70,151,109,235,47,162,21,221,52,187,207,232,45,220,253,40,148,123,17,225,62,169,80,108,82,201,92,208,84,182,143,33,212,234,67,236,11,8,71,73,70,205,74,243,36,53,182,118,156,21,97,109,39,136,58,59,203,114,97,154,183,149,101,194,225,18,
+242,209,250,246,214,16,199,154,13,67,109,138,69,149,247,36,91,37,108,220,247,246,213,133,8,233,176,165,177,167,236,199,149,157,51,243,164,10,25,250,17,84,146,191,241,56,167,142,230,194,236,75,151,24,19,123,36,51,66,115,134,51,61,229,110,132,195,23,136,213,9,223,130,51,220,114,5,239,85,194,29,245,185,155,127,42,211,243,17,39,127,87,88,80,192,146,115,53,192,46,106,195,158,105,140,98,234,217,197,194,232,35,204,12,111,212,189,79,168,159,87,137,69,198,158,174,106,52,99,91,250,29,218,42,46,57,155,161,85,124,209,114,71,173,86,168,153,46,12,14,32,216,191,141,82,110,202,34,141,161,62,59,230,222,39,175,185,101,28,20,157,221,218,54,156,110,96,7,172,69,105,210,251,210,121,114,77,102,143,28,87,211,161,143,144,103,179,55,162,7,208,60,203,198,45,87,163,205,116,83,102,189,49,102,214,18,69,76,217,99,23,121,166,20,9,72,119,26,223,108,89,134,80,15,112,214,204,74,51,224,154,112,152,43,63,239,9,129,112,193,209,125,160,21,116,182,
+213,136,57,246,173,96,31,194,218,140,151,181,13,123,139,55,45,148,115,113,215,163,65,72,200,133,108,102,244,222,14,33,23,166,254,170,60,161,186,141,202,252,161,128,2,31,228,46,245,117,164,204,154,143,207,13,112,45,176,112,126,96,231,194,133,147,193,217,238,132,216,215,208,210,130,43,22,86,84,250,222,186,41,198,52,101,6,104,216,137,13,195,213,224,107,88,180,123,218,62,20,149,199,30,109,99,250,33,229,107,239,119,167,11,115,213,216,173,152,208,90,165,69,108,111,45,163,136,34,89,55,58,164,25,181,171,242,192,28,78,51,184,9,153,182,139,82,234,176,148,126,131,25,130,134,48,107,236,236,162,226,20,17,162,155,221,14,189,131,246,72,179,157,185,247,14,231,207,15,106,208,89,39,21,251,37,118,178,247,62,94,232,222,191,172,173,209,100,238,91,218,134,193,242,218,121,61,116,49,119,228,135,181,49,10,93,251,213,43,43,240,54,214,45,238,110,54,252,208,237,26,118,53,133,197,62,131,28,6,26,142,130,207,14,110,198,179,177,176,100,143,172,26,67,247,27,
+139,136,220,96,150,128,76,57,53,80,70,249,245,39,10,70,129,43,16,22,111,111,50,247,92,235,69,69,52,176,86,74,249,118,201,168,103,26,77,59,96,65,156,19,66,99,247,176,230,103,111,90,251,12,69,55,22,207,27,126,138,165,140,181,235,14,173,225,118,215,138,193,118,26,102,206,217,78,199,100,40,207,59,231,38,129,121,145,45,170,91,237,70,167,149,155,71,8,154,175,146,249,90,161,100,125,185,114,109,177,181,219,97,219,101,163,136,127,40,202,186,233,77,118,126,48,13,63,53,179,226,187,238,243,59,67,59,200,105,72,202,36,238,147,185,245,119,187,166,168,218,10,213,32,76,171,183,91,220,47,172,203,108,220,110,181,171,19,60,27,212,145,79,102,114,214,96,181,215,155,53,215,93,38,142,55,93,149,155,65,103,116,198,166,169,41,73,107,43,12,225,9,164,14,165,61,219,57,223,8,117,13,130,123,89,151,250,198,232,171,12,145,27,4,162,69,109,63,166,104,149,58,43,113,17,48,244,54,228,121,197,88,143,154,216,250,221,115,62,23,205,218,11,142,250,220,
+230,31,197,141,11,116,174,48,202,124,245,153,215,170,206,167,209,195,153,148,87,204,205,251,186,215,181,75,165,233,39,72,21,173,80,228,108,150,184,118,189,214,57,245,157,225,59,7,188,191,86,219,211,213,231,43,170,155,166,178,48,82,79,53,180,151,10,138,245,17,147,176,189,78,225,9,77,57,182,107,118,76,99,150,192,181,146,30,132,56,166,236,144,170,33,15,221,79,246,253,60,177,25,178,89,217,80,187,181,227,245,139,226,173,107,179,184,128,62,150,16,187,148,250,178,15,237,89,74,9,89,158,84,176,163,132,122,179,43,45,226,17,135,145,178,117,211,7,67,181,76,49,109,189,170,4,123,139,235,208,209,175,250,118,227,27,215,106,70,214,214,3,53,249,234,253,199,100,242,238,48,181,45,74,55,28,41,180,203,181,242,98,184,203,172,93,46,165,175,196,252,172,199,48,121,108,30,94,14,47,244,220,58,90,29,230,135,145,124,153,26,200,175,203,251,215,65,15,162,21,218,145,97,139,188,147,179,91,75,46,28,225,134,236,241,8,98,238,19,95,59,143,207,105,28,213,
+38,195,168,185,13,10,191,220,233,48,213,214,33,214,94,229,106,115,37,252,128,168,121,104,34,76,231,241,13,202,212,60,215,134,255,147,178,55,235,77,230,251,210,197,190,202,95,125,17,229,42,234,40,71,249,18,185,136,162,163,220,119,78,235,31,157,86,206,57,29,157,238,86,212,119,216,216,198,204,54,163,49,6,140,153,103,131,205,60,148,1,219,216,96,230,121,44,6,51,15,197,92,64,81,69,10,251,215,157,110,37,74,114,44,217,5,85,187,246,222,107,173,103,61,251,89,245,242,110,196,84,16,152,109,48,122,215,188,170,174,6,144,221,55,150,32,147,105,197,14,131,138,221,57,220,246,28,192,73,141,63,224,67,21,43,180,69,67,1,36,102,225,141,105,59,80,143,197,2,218,171,87,248,250,12,190,162,41,102,233,152,204,215,245,128,135,38,204,4,110,231,24,33,146,167,29,110,109,187,143,190,142,193,188,177,237,166,130,225,133,255,171,176,232,229,25,174,149,101,118,16,208,81,149,199,142,238,41,239,94,83,109,184,43,124,43,107,45,119,238,251,29,219,62,206,202,
+135,246,14,88,98,223,94,143,191,245,46,50,85,247,211,101,85,131,14,99,74,87,143,126,77,172,221,24,189,61,122,50,228,51,183,6,151,246,144,4,203,249,213,39,186,119,177,118,142,228,175,73,232,202,131,22,15,235,216,1,96,32,238,13,24,43,35,38,112,177,41,148,85,235,29,148,104,45,0,215,226,81,213,151,144,199,238,45,112,64,131,53,168,107,44,172,202,152,207,51,4,23,152,114,13,160,252,85,156,32,233,201,37,155,167,247,75,76,122,246,26,169,168,22,98,200,231,110,247,34,24,104,7,139,192,192,222,92,41,226,140,10,166,185,118,198,15,243,215,5,26,210,249,10,135,76,68,114,19,218,90,62,48,217,193,61,140,127,228,215,183,51,183,205,27,71,199,146,167,3,80,30,142,192,118,108,131,224,182,197,129,217,122,253,158,244,232,209,175,109,52,191,238,163,206,72,217,104,71,199,81,144,225,24,239,72,146,50,84,36,11,80,236,121,195,6,238,220,115,141,68,188,249,108,119,130,187,195,230,3,7,26,13,59,251,136,199,43,69,8,136,23,186,252,16,12,
+173,22,45,120,191,109,36,81,108,150,49,73,82,119,215,229,117,167,97,184,60,108,91,177,86,249,185,93,3,219,56,82,198,43,223,61,115,209,4,115,163,241,65,48,4,88,125,108,81,37,249,63,232,220,239,197,249,89,70,74,6,122,220,143,203,207,194,250,102,177,144,78,39,189,16,196,38,94,178,23,201,196,243,212,20,4,34,56,250,164,218,32,102,170,51,5,35,209,66,92,225,169,36,5,186,132,220,135,102,51,73,174,138,151,235,219,3,58,42,117,225,205,119,188,216,223,25,43,249,238,154,202,155,56,66,132,201,26,254,136,227,213,224,112,247,245,120,200,135,64,178,198,24,99,29,150,38,243,61,137,124,144,176,221,150,113,222,189,56,40,177,24,94,87,130,205,72,245,54,126,81,205,53,94,245,95,253,201,34,86,105,131,206,250,109,39,64,114,82,109,238,201,161,237,157,8,119,62,38,206,171,234,67,118,162,46,84,39,27,161,247,29,241,20,17,57,187,114,206,131,34,203,91,119,74,121,102,199,184,139,205,35,230,136,194,74,67,205,170,7,211,43,247,201,217,21,
+139,40,162,149,222,62,172,15,55,122,207,251,226,128,151,170,138,197,98,251,16,220,77,230,57,119,213,30,239,251,201,250,235,67,252,16,146,125,106,32,24,228,129,40,102,100,62,122,82,136,59,8,78,61,160,2,139,231,177,240,7,37,86,137,239,196,23,103,25,213,92,12,240,174,40,74,190,212,153,13,159,31,216,237,85,108,215,238,110,153,123,153,27,74,192,176,4,232,91,77,154,149,48,231,253,253,42,34,154,2,182,99,188,138,0,234,92,84,247,143,249,195,112,35,81,95,5,46,63,215,83,223,241,171,26,155,241,169,47,240,115,28,77,137,216,41,233,240,243,85,139,5,33,213,43,105,17,2,36,194,241,31,216,147,16,145,64,40,16,107,106,252,237,35,201,195,188,39,16,234,204,236,2,3,140,212,87,5,19,30,222,50,102,16,123,190,218,94,150,179,139,103,2,193,252,174,78,34,78,102,167,143,169,140,72,175,22,31,95,198,4,146,113,29,226,150,74,215,91,133,107,208,129,175,55,163,156,136,164,70,104,162,80,95,91,200,50,63,119,53,192,236,58,9,19,212,
+74,5,2,80,162,149,97,12,225,238,158,105,58,149,181,167,51,68,250,162,210,254,82,219,64,133,167,221,43,53,39,70,168,17,180,23,69,4,9,181,86,62,136,117,191,84,194,118,167,113,190,196,100,35,4,116,186,115,19,187,11,117,195,32,89,140,244,242,137,19,95,174,118,75,14,119,95,243,175,78,15,214,142,95,52,184,142,207,72,199,159,223,73,45,153,155,140,47,17,94,93,132,22,70,125,75,44,109,152,136,141,217,25,225,131,72,233,31,69,181,251,91,16,72,121,36,250,76,110,225,172,149,51,101,92,181,20,243,171,26,5,70,17,195,161,110,189,191,228,80,21,254,92,56,43,124,103,39,221,175,246,155,234,13,231,110,253,164,87,132,153,201,108,47,119,19,225,12,105,229,148,97,126,38,245,182,18,40,225,195,160,64,192,215,183,162,122,9,107,224,119,173,215,116,247,206,129,104,58,51,244,78,223,165,214,198,155,118,33,76,225,188,15,201,142,7,98,205,109,124,131,158,82,204,107,200,73,79,230,186,107,141,80,187,224,76,162,178,76,210,63,106,49,8,9,107,
+88,187,242,73,158,23,203,244,219,188,9,209,119,64,166,181,34,111,128,166,174,112,167,163,24,243,137,248,210,179,92,235,206,96,25,64,123,53,123,32,163,112,63,23,65,211,135,2,211,233,41,19,8,203,43,214,54,132,61,76,172,27,32,124,103,126,161,193,176,78,154,180,166,114,28,87,133,99,49,115,91,234,245,189,66,102,173,229,115,106,69,217,239,97,18,172,81,129,247,13,74,3,175,121,67,13,242,94,96,94,123,100,66,69,79,187,22,123,56,136,66,129,71,169,201,96,33,159,110,223,252,254,219,210,106,155,211,10,157,38,146,173,46,169,97,218,245,213,64,240,206,118,185,130,155,218,42,200,152,215,213,118,102,53,47,117,158,18,94,226,167,156,30,90,162,229,23,99,141,116,144,148,90,111,28,29,28,87,22,108,97,140,43,102,79,45,116,170,79,150,111,13,134,36,239,148,112,62,245,49,9,71,184,109,36,4,66,244,69,60,90,250,112,176,94,53,199,163,133,79,218,192,151,179,239,125,13,100,13,167,238,141,228,42,16,190,252,28,76,241,235,31,63,168,254,191,
+142,5,252,72,89,97,205,75,73,88,206,165,198,159,113,220,127,43,219,75,204,157,2,95,207,40,143,247,164,58,42,15,157,17,8,239,102,63,146,187,110,149,32,21,1,246,43,121,40,51,148,146,147,8,137,162,110,234,203,126,116,7,110,67,164,182,27,164,129,231,215,175,19,50,242,38,242,140,152,188,83,88,186,168,51,80,221,85,138,191,133,141,217,244,69,180,156,93,221,216,32,46,28,30,108,212,146,17,17,10,118,62,169,82,56,178,229,62,97,235,147,40,109,115,251,234,100,122,18,187,8,52,121,68,186,43,174,137,124,171,8,32,146,238,217,128,234,177,48,5,42,63,132,96,38,179,61,209,186,36,106,114,251,21,151,75,185,37,174,199,31,170,207,187,36,96,93,190,235,156,171,149,78,247,125,120,151,158,65,240,171,87,84,82,81,239,207,179,117,244,195,243,185,3,106,250,246,91,206,44,128,71,253,221,108,181,170,209,242,2,115,33,159,66,207,36,87,119,112,100,254,117,225,103,26,116,175,213,106,85,112,121,45,171,8,153,30,211,244,229,229,132,216,14,159,171,
+190,4,41,16,4,163,206,236,240,61,65,241,191,145,194,188,215,237,229,129,138,189,16,129,91,199,244,166,104,84,205,67,154,116,223,150,109,151,237,217,236,202,155,82,142,67,200,213,110,251,128,0,80,221,94,105,33,160,59,178,226,187,137,72,3,220,250,32,37,108,168,64,33,13,177,98,20,67,118,199,117,74,200,159,241,120,19,84,19,70,5,55,241,136,192,107,4,47,24,148,98,114,209,136,123,85,43,19,143,127,99,2,141,188,55,243,139,140,27,74,204,243,13,197,46,156,243,193,119,25,239,71,97,82,244,85,244,135,55,173,182,108,100,62,133,171,105,110,141,164,103,79,52,104,80,215,67,131,30,19,224,36,27,203,30,200,251,142,222,242,128,156,190,223,10,131,239,6,147,111,6,191,113,5,176,210,178,244,52,201,238,139,186,22,238,126,9,100,145,183,211,160,189,244,89,221,64,148,56,128,238,86,108,21,116,26,104,206,139,142,106,38,118,213,133,230,203,26,47,132,139,144,118,176,177,207,214,109,131,156,119,51,115,53,237,246,162,84,127,111,26,70,184,174,113,251,
+218,112,14,21,124,102,135,62,148,150,56,73,146,1,20,241,134,93,23,170,183,249,172,249,169,34,31,108,234,136,205,59,137,221,245,187,84,151,120,204,183,231,245,119,53,61,134,233,65,224,116,246,117,207,20,126,159,59,138,135,113,222,230,30,3,135,194,211,120,174,44,84,69,21,153,176,190,163,238,206,113,148,104,24,176,132,123,19,135,137,161,243,110,248,54,44,35,37,26,61,95,212,148,177,146,29,110,23,108,160,226,41,3,152,150,50,53,120,47,142,181,157,206,87,55,13,76,29,46,135,41,83,173,125,237,93,225,225,206,5,216,21,161,109,60,55,80,83,86,42,37,176,155,15,170,53,195,12,227,107,15,182,86,84,199,67,169,140,251,54,52,127,155,83,94,150,226,234,37,171,104,243,237,168,230,251,238,130,27,28,217,60,31,147,160,252,73,230,180,191,22,85,203,147,67,254,51,207,117,228,71,108,139,197,241,81,200,129,60,188,204,64,211,74,248,156,242,226,43,222,135,191,167,229,100,40,199,94,108,77,150,177,82,60,238,238,175,36,247,174,254,26,235,109,202,85,
+230,125,176,133,42,223,153,61,97,219,163,120,38,239,192,124,83,92,114,238,194,123,46,183,74,114,101,213,156,103,211,109,140,223,156,88,174,204,142,160,18,142,91,232,81,74,169,101,117,235,87,166,179,201,179,152,240,125,122,67,26,251,238,107,82,78,12,241,97,75,108,197,115,71,194,15,1,13,34,93,194,4,242,11,226,50,141,134,5,57,68,155,250,190,197,223,146,238,150,155,61,141,217,85,249,12,247,229,10,238,43,119,88,246,226,90,186,233,58,235,239,6,205,27,98,244,247,73,90,176,139,70,90,206,61,39,166,109,78,80,19,159,232,237,117,90,91,25,2,198,16,42,200,222,85,38,233,211,206,216,16,33,194,171,197,222,157,244,154,84,232,219,231,214,11,149,94,18,82,227,119,204,115,28,39,179,222,1,117,103,104,86,85,210,38,67,26,122,202,63,48,225,252,45,251,30,118,115,41,179,120,79,246,241,25,118,179,192,48,157,45,27,135,115,23,197,136,38,14,223,251,248,198,234,237,119,26,53,154,150,217,73,209,50,82,92,135,152,243,10,241,226,161,91,247,0,
+143,141,214,138,105,133,147,134,172,247,35,236,146,50,177,13,154,82,132,227,171,11,65,103,219,14,194,197,55,219,28,60,189,82,60,52,237,102,253,142,17,91,152,220,195,55,132,144,252,220,77,197,18,109,252,66,124,128,160,67,103,5,127,193,100,20,69,69,75,153,87,13,168,133,129,137,197,149,202,101,120,14,34,153,110,76,194,13,87,91,23,108,91,116,19,232,19,168,97,168,252,182,29,133,57,85,66,163,7,35,123,103,39,75,226,123,101,243,114,217,5,230,22,217,233,39,221,207,106,47,208,243,200,11,113,100,59,248,15,86,2,223,229,75,65,88,49,23,115,148,80,177,4,23,68,168,171,109,10,73,170,182,9,127,181,231,58,95,195,135,156,73,226,209,123,18,52,205,205,212,119,246,45,246,64,92,225,14,48,230,225,144,189,102,102,168,214,171,221,188,145,121,28,150,253,244,56,65,144,245,48,5,36,168,252,6,93,136,135,11,170,129,58,122,218,181,23,234,240,155,213,91,145,0,186,58,90,127,218,72,44,204,154,157,66,217,126,205,144,61,129,229,58,186,157,179,
+131,1,142,166,174,188,142,18,123,98,119,144,178,145,100,70,167,71,58,93,155,16,196,103,71,189,7,101,80,216,211,114,172,53,91,149,93,215,158,234,24,186,117,107,220,44,51,230,222,39,10,68,164,170,250,88,107,232,22,230,76,149,174,103,134,50,109,134,26,98,113,54,202,60,165,13,53,24,198,229,92,183,188,180,175,191,129,66,205,201,88,133,214,107,38,188,20,239,151,73,134,200,13,228,89,134,169,15,215,59,7,210,23,91,59,92,191,114,116,38,109,236,49,192,105,64,161,126,150,7,9,239,73,160,107,35,121,161,117,107,164,175,116,25,4,99,249,181,94,207,158,209,147,23,141,87,129,118,59,69,59,231,85,144,114,10,243,78,190,142,204,92,140,162,85,241,124,7,56,88,131,106,61,188,196,166,152,161,173,8,215,112,100,116,8,28,17,238,27,154,42,187,216,187,200,183,203,129,150,121,247,96,74,222,62,210,154,195,144,143,32,191,180,105,238,112,157,149,141,63,165,68,35,166,181,118,138,15,200,238,64,50,146,205,170,118,55,111,73,196,115,39,225,141,238,246,
+58,184,23,68,182,126,183,2,135,251,64,134,186,122,121,67,181,45,79,184,131,169,158,105,153,108,214,169,228,167,217,103,38,126,158,71,241,155,243,147,25,187,36,99,58,54,243,137,44,205,28,72,12,77,244,227,193,163,65,15,96,241,245,163,152,46,62,12,197,174,168,228,25,164,249,110,20,170,112,148,164,219,128,149,66,211,104,103,170,92,79,90,186,15,79,227,203,44,178,240,185,231,175,89,166,2,62,9,199,6,94,240,34,225,61,17,123,218,212,85,206,172,79,22,153,147,221,119,197,46,79,248,57,164,55,36,60,214,203,178,248,250,25,219,189,105,0,250,82,147,67,67,26,137,222,213,150,78,82,91,28,37,13,175,6,91,15,85,121,232,132,36,190,2,12,12,25,15,47,253,156,198,164,212,231,171,97,143,231,18,253,204,11,251,184,193,78,0,75,223,243,55,91,103,3,20,213,189,220,29,82,89,214,96,76,251,196,64,210,238,240,45,23,172,126,83,142,11,49,73,62,117,121,19,206,129,61,134,248,3,34,96,201,221,233,212,12,53,13,72,210,243,249,124,119,108,
+205,237,183,243,168,208,182,237,242,206,123,212,42,240,222,211,29,166,33,195,172,148,91,20,39,198,133,129,255,85,75,245,67,81,103,252,151,237,84,235,246,43,104,214,135,79,203,167,101,30,253,121,52,127,179,251,145,171,45,174,5,236,242,34,114,206,37,83,4,183,100,129,2,216,91,57,168,183,23,246,120,73,194,56,159,30,105,222,212,15,179,230,219,4,154,108,85,218,62,46,32,147,154,161,41,177,8,12,123,161,62,124,121,102,55,215,90,123,37,201,116,231,229,187,200,96,38,223,21,19,206,34,118,59,69,88,113,78,63,124,63,137,164,185,195,163,145,78,60,207,74,99,117,171,231,9,212,66,124,246,30,103,120,110,119,225,131,58,75,136,31,156,59,182,33,177,103,120,11,154,55,230,189,23,175,139,77,3,94,184,139,190,129,81,15,51,177,158,162,190,172,188,130,156,19,158,46,56,107,27,103,232,66,102,220,155,206,150,107,112,209,66,100,188,159,183,219,45,16,96,215,218,248,157,251,26,156,180,236,199,206,71,31,173,144,203,206,191,197,146,123,171,60,97,69,146,
+163,4,217,102,59,75,136,32,254,186,223,150,241,103,50,159,213,63,0,147,81,110,68,147,151,107,245,25,212,24,47,134,131,206,145,248,105,19,217,9,87,67,21,15,39,60,203,109,107,129,214,220,56,107,127,169,246,97,3,195,52,115,124,166,247,213,145,9,24,162,85,42,49,40,211,142,148,249,75,15,19,16,132,2,96,155,92,43,24,144,76,20,97,45,22,108,238,86,187,123,91,175,51,215,10,195,27,114,149,194,117,197,193,244,181,47,24,227,201,172,37,196,157,121,153,69,214,3,131,86,25,203,142,9,208,140,160,79,185,14,99,107,163,44,33,18,24,212,247,10,29,37,117,215,15,41,250,250,213,234,180,123,235,59,144,207,235,95,6,19,219,241,37,22,202,115,136,115,67,144,181,15,252,244,73,22,199,136,124,136,130,217,161,107,147,207,191,230,97,131,209,0,1,210,145,183,82,118,222,34,130,65,150,85,130,136,242,51,15,15,215,97,174,90,158,229,91,234,226,213,11,25,218,171,138,22,206,121,86,234,32,145,139,15,180,26,255,218,29,10,88,4,56,56,100,4,
+174,42,90,99,86,198,195,137,255,209,232,25,50,97,114,82,145,204,47,213,47,111,159,99,4,121,113,89,73,195,247,62,213,11,43,218,43,223,93,236,229,115,111,138,126,108,217,219,222,144,115,223,148,231,170,200,57,170,130,246,222,137,6,156,49,83,233,71,248,225,131,9,210,79,224,2,153,28,197,105,128,16,162,176,241,213,34,35,105,12,54,64,87,62,243,114,92,210,142,124,119,123,222,87,59,54,160,86,219,33,161,167,24,188,93,186,129,114,221,124,98,92,52,195,112,203,14,58,186,96,0,133,175,233,113,7,230,189,161,8,154,184,64,175,106,42,93,121,248,115,249,104,165,36,102,56,126,227,184,83,124,243,237,19,171,194,38,102,111,186,245,43,173,44,242,185,180,82,70,63,87,51,148,5,204,223,198,14,252,177,30,187,169,99,116,223,76,82,215,65,195,144,225,238,203,185,191,241,104,120,158,251,213,5,195,243,245,138,228,240,224,194,32,170,252,170,250,102,207,233,56,235,60,130,15,31,202,108,224,102,18,241,61,29,84,162,10,171,246,246,81,96,177,80,250,105,
+230,142,179,187,3,242,129,208,32,220,159,150,121,44,9,65,144,25,237,192,162,16,14,128,54,251,22,122,114,27,231,201,199,215,48,248,81,218,61,148,180,96,110,211,27,98,17,207,10,114,181,222,109,93,0,161,131,150,43,157,87,125,47,55,101,76,174,97,152,37,151,40,228,125,220,23,106,71,210,203,140,67,243,222,59,171,13,78,253,59,242,85,7,250,116,143,81,10,216,121,142,120,164,175,249,238,180,88,181,75,165,43,92,95,162,155,153,172,125,70,176,60,147,82,233,207,65,155,252,156,16,5,48,190,202,215,131,123,231,94,144,55,215,54,135,175,38,158,140,244,176,136,147,111,65,22,214,130,220,94,125,196,12,191,181,229,135,32,88,62,85,192,79,120,212,101,132,29,23,135,71,124,140,185,188,187,186,212,254,90,222,250,145,181,158,163,52,146,24,166,74,158,53,226,122,71,175,206,90,129,104,15,44,219,227,161,120,221,15,225,254,246,167,77,84,112,136,214,213,30,197,197,227,22,107,163,109,75,37,182,193,29,181,87,144,223,169,84,142,162,189,53,216,78,228,188,
+111,47,244,228,171,78,77,70,92,217,14,170,229,27,204,128,212,133,50,189,253,89,254,154,202,14,81,187,93,212,245,186,179,28,133,107,231,159,121,7,190,188,74,111,170,12,214,76,129,71,49,215,157,156,46,186,241,72,165,204,148,191,114,176,0,241,3,123,210,220,118,97,77,58,161,202,181,163,162,61,55,210,198,203,213,113,185,70,247,235,72,13,158,54,244,210,220,92,53,19,86,136,39,84,7,48,183,107,248,33,45,70,251,166,103,130,235,25,95,100,240,53,70,10,215,11,121,174,71,178,85,100,57,16,137,33,159,168,195,67,52,163,8,247,73,60,121,80,3,81,29,140,251,177,124,141,107,144,96,223,34,101,56,43,57,143,248,65,27,18,122,242,91,194,171,135,197,17,123,33,54,235,19,159,201,13,241,227,73,179,194,252,215,171,9,54,125,119,23,60,161,162,113,24,173,124,18,112,85,48,225,162,196,239,200,25,222,242,214,210,242,228,8,169,200,233,194,191,191,218,101,112,30,243,248,164,82,205,50,114,245,124,95,156,98,167,117,148,19,72,221,132,1,218,137,130,
+117,14,149,207,107,42,154,252,153,236,123,63,209,198,24,184,118,208,34,32,25,157,6,154,200,60,16,125,80,37,243,120,14,74,200,19,244,118,83,21,223,60,166,173,16,188,231,229,102,249,246,238,17,208,40,184,242,31,228,12,26,53,240,88,231,171,41,91,192,238,62,191,116,128,165,124,142,212,203,232,66,72,173,21,242,20,74,32,231,76,136,132,197,165,205,210,7,219,231,175,161,211,253,167,167,45,222,13,75,44,54,3,120,31,103,95,35,237,81,179,170,193,38,212,48,178,121,213,25,217,165,156,215,33,133,110,23,15,158,12,23,217,176,35,55,71,184,112,71,170,34,196,47,48,96,38,85,161,244,74,6,230,217,118,225,12,192,243,48,115,219,84,74,27,177,149,79,81,163,188,219,31,194,95,192,173,121,120,115,33,233,232,176,208,165,214,155,29,115,63,142,52,64,241,164,69,80,55,60,227,246,54,109,180,90,57,49,17,13,22,59,84,142,48,214,82,109,29,215,127,81,250,32,175,245,195,12,241,197,179,213,100,47,138,61,253,40,108,146,31,74,154,43,149,129,90,
+41,198,251,20,115,213,186,39,49,60,44,60,103,211,123,174,42,2,164,141,18,181,139,223,138,52,151,155,98,254,187,79,244,48,174,21,126,110,124,160,215,150,215,11,17,179,238,189,8,61,46,171,203,48,94,15,127,123,53,61,228,110,25,140,85,70,138,206,175,223,206,63,119,96,164,1,195,110,161,80,237,206,114,117,207,36,182,254,78,47,240,214,6,31,136,139,85,121,137,98,147,119,166,208,64,255,146,125,143,75,224,109,37,43,58,187,90,196,124,81,100,187,252,222,68,125,36,192,103,123,45,15,140,110,207,100,191,118,131,83,67,145,122,162,31,222,238,175,46,91,211,200,233,196,176,238,150,101,252,155,93,172,79,71,197,122,25,66,217,119,153,226,198,236,114,173,244,35,146,143,56,78,38,75,156,77,50,209,5,210,245,64,111,137,167,130,16,182,24,76,114,18,156,142,127,163,247,23,203,90,154,32,72,191,111,138,189,82,196,135,232,99,222,42,52,218,36,111,35,118,86,93,231,245,13,92,226,74,59,217,240,205,238,154,88,109,240,210,175,84,115,61,155,180,10,67,
+211,143,11,236,148,54,164,251,28,29,195,248,98,226,110,204,168,41,202,161,121,164,197,132,111,150,26,161,9,155,19,241,194,244,97,0,233,103,246,7,64,95,99,186,118,154,158,136,104,120,64,88,186,12,60,103,129,119,40,41,131,87,45,194,153,212,3,25,205,128,45,153,230,205,124,47,165,143,113,11,65,146,30,241,27,34,115,221,110,128,113,205,94,45,68,251,232,125,130,211,149,12,217,144,61,46,218,121,163,158,56,52,14,81,30,227,146,42,58,247,123,141,207,46,88,230,112,240,93,38,234,160,45,234,198,123,233,51,248,100,192,175,102,118,192,253,65,46,6,77,246,251,34,113,76,228,71,137,193,75,134,10,241,101,66,200,164,86,27,22,247,106,4,185,191,231,176,141,25,65,24,246,250,250,112,112,55,225,135,43,19,232,129,220,58,105,23,106,75,201,144,58,241,193,186,27,127,25,135,109,227,53,66,47,139,247,119,28,40,120,153,140,91,178,102,240,164,241,73,199,28,14,109,217,176,231,165,111,94,31,142,224,85,249,183,22,76,237,203,46,124,49,70,247,21,169,
+203,125,23,10,91,233,135,7,191,185,71,85,207,245,190,199,191,52,100,114,201,65,242,254,164,35,131,138,167,163,39,254,209,147,255,18,127,179,236,57,48,106,166,213,148,131,231,243,209,161,95,137,89,192,123,232,89,17,175,36,130,118,135,223,20,36,247,201,124,96,180,175,151,62,2,33,243,64,198,205,60,166,35,120,168,192,89,166,133,242,32,187,248,46,71,4,200,87,130,188,145,16,94,230,172,254,10,43,134,91,250,7,54,231,98,35,129,136,4,67,198,152,157,97,198,47,9,8,50,11,6,248,20,240,231,137,19,37,116,118,15,20,84,97,85,159,212,192,219,20,98,150,26,195,254,181,32,185,170,197,86,168,11,182,85,254,176,60,201,251,34,82,141,46,153,168,142,18,8,145,79,111,214,3,196,17,255,66,51,174,151,219,156,147,121,141,235,10,210,46,169,126,249,74,192,75,83,107,164,11,194,227,221,51,2,132,119,229,106,223,87,76,134,181,177,47,106,120,213,64,191,9,4,181,33,133,96,9,236,181,173,131,232,99,234,217,2,245,48,9,117,165,234,200,122,7,
+178,207,181,16,110,252,26,140,23,36,133,207,219,200,9,232,111,244,115,55,157,233,30,55,183,141,107,214,43,239,91,82,23,136,146,123,63,230,77,125,205,236,207,124,200,246,9,234,11,166,122,232,153,154,114,236,206,41,110,212,76,33,164,120,234,255,177,135,226,141,75,48,13,98,193,174,54,166,53,48,123,39,192,245,19,130,94,229,135,186,187,181,234,170,33,68,92,84,230,82,56,224,91,229,125,176,164,77,118,95,233,68,195,235,13,94,70,17,162,47,59,214,209,133,24,238,67,206,133,217,75,1,223,185,13,124,68,205,101,104,229,145,236,121,137,189,95,97,2,53,143,224,100,184,150,86,119,113,141,6,23,184,147,93,44,98,36,174,30,150,169,119,41,221,48,163,225,53,90,238,56,253,33,42,9,38,79,15,171,232,178,170,219,85,186,185,217,163,36,29,60,221,214,59,74,179,220,110,91,223,44,235,104,230,232,92,220,183,226,248,185,127,81,169,151,223,218,197,167,57,215,181,112,188,87,46,141,145,199,10,147,71,199,235,91,66,130,177,198,243,76,61,94,17,85,219,
+14,160,117,155,229,38,117,62,251,14,9,137,183,71,127,168,249,51,188,76,1,30,44,220,5,124,177,78,37,23,232,199,124,172,175,145,240,206,45,236,18,196,207,64,238,14,18,230,136,16,109,69,141,36,232,175,34,66,170,241,254,226,180,39,50,39,254,151,164,80,8,209,190,92,203,184,72,122,238,121,101,18,174,164,169,77,53,36,126,184,124,112,79,175,145,120,6,230,121,151,217,79,21,166,17,155,170,175,17,239,3,3,239,247,3,19,39,189,64,190,110,199,193,101,144,41,76,115,120,162,85,210,133,118,237,106,56,170,105,39,220,108,114,234,35,188,188,171,59,76,120,131,71,73,77,105,207,158,201,139,173,116,5,242,193,202,52,37,52,248,76,62,223,228,45,95,142,243,128,220,62,80,77,239,169,43,122,28,40,77,159,246,186,225,97,129,87,49,135,253,80,148,207,123,190,149,131,38,110,32,45,116,2,27,2,190,104,211,75,243,101,144,213,74,199,254,62,188,159,224,177,158,127,95,114,118,18,13,178,8,55,124,209,0,18,174,81,140,176,155,121,53,237,225,195,219,
+62,18,8,213,89,213,156,161,11,208,147,151,60,180,86,62,199,22,148,120,14,176,191,190,60,118,202,214,195,109,170,150,57,55,221,52,122,251,35,190,180,173,33,106,217,43,170,121,238,23,116,241,178,95,97,145,100,227,231,2,75,183,242,53,196,192,50,204,112,248,111,125,231,85,157,76,248,123,97,159,178,198,33,188,246,88,169,239,11,218,12,18,166,137,71,23,11,188,111,122,228,243,9,14,150,223,44,0,72,34,119,17,2,70,224,177,75,48,44,16,118,77,103,119,248,188,63,10,199,234,80,221,217,47,80,151,88,240,13,199,205,39,195,53,129,80,184,139,46,33,213,2,222,94,223,171,109,83,81,141,48,33,184,241,133,198,44,117,118,225,237,89,238,77,240,228,157,111,57,237,102,173,137,241,73,132,123,118,125,130,234,174,226,28,32,120,79,37,212,13,184,242,85,254,134,145,57,199,195,56,136,33,157,119,102,127,118,237,123,106,98,253,82,97,55,81,174,30,117,118,104,127,32,70,23,58,251,104,82,176,41,102,154,241,48,130,216,86,249,237,154,46,218,50,109,123,
+120,82,53,123,209,96,66,36,146,160,207,173,46,59,198,252,214,225,25,230,188,18,176,150,190,201,174,131,74,13,180,241,204,23,16,252,164,221,103,101,7,188,19,100,96,246,157,116,250,147,152,7,13,3,166,162,152,15,152,207,61,29,193,137,154,10,162,164,99,203,166,243,115,7,44,141,181,203,68,179,167,171,136,56,78,28,31,132,149,124,160,19,3,106,72,88,186,16,48,41,47,167,240,9,129,166,87,233,106,166,129,156,180,38,192,199,148,37,137,32,136,159,101,233,89,93,49,72,194,129,7,61,222,221,78,177,147,56,117,197,37,31,251,189,112,102,183,94,223,7,249,227,135,31,2,30,241,129,55,197,158,54,64,243,233,103,58,126,58,146,59,57,118,196,34,29,101,17,137,112,192,239,95,248,182,50,253,110,127,21,167,213,240,97,30,239,206,188,38,183,180,83,235,233,130,101,150,201,43,217,18,113,74,249,56,26,135,219,86,38,68,177,16,210,153,142,142,124,132,175,37,179,55,236,0,108,198,136,42,5,0,80,97,189,238,15,199,109,95,145,90,239,253,176,100,14,
+137,74,23,171,11,86,176,236,78,4,105,85,51,105,59,185,149,42,233,38,63,82,33,224,0,208,110,49,226,131,7,234,9,61,218,230,35,205,111,103,214,135,198,144,51,117,75,132,136,9,156,181,114,94,112,244,248,65,99,159,155,221,209,132,244,199,160,84,107,139,97,73,133,127,30,239,45,246,82,157,197,20,127,238,188,224,124,192,227,165,105,240,16,129,183,200,87,117,7,165,12,153,27,24,50,28,253,183,211,227,250,155,196,33,72,143,70,227,54,167,142,70,63,222,121,238,33,238,79,135,84,188,138,57,122,6,136,124,210,224,244,126,150,117,179,66,185,247,104,112,123,236,148,125,15,43,136,249,188,249,32,48,30,158,237,167,131,197,182,141,61,108,138,88,47,72,189,129,189,39,65,62,191,73,36,254,132,165,8,67,36,30,127,136,62,244,111,57,111,158,228,155,186,107,66,40,205,226,11,178,63,118,19,131,160,30,18,95,113,65,53,252,109,35,231,200,185,156,85,108,129,101,163,156,61,35,172,186,2,36,249,190,208,226,80,236,35,204,252,207,126,251,240,189,93,84,
+187,181,92,102,37,116,93,149,226,234,226,245,138,200,72,217,118,242,82,0,210,242,60,76,7,30,15,92,177,51,249,43,223,220,225,207,63,217,155,167,78,201,194,69,105,158,64,33,143,111,182,226,107,244,247,200,125,216,19,74,243,127,2,223,214,24,32,225,238,114,34,64,111,186,176,159,213,46,4,23,208,69,242,125,230,244,65,134,217,203,111,62,198,96,56,234,162,71,173,145,9,170,182,15,41,41,91,115,246,197,125,13,50,54,120,15,37,124,86,82,152,234,70,36,217,11,62,177,11,24,106,139,113,125,107,159,235,165,14,208,168,75,102,57,234,205,153,184,148,237,229,84,190,144,212,33,245,71,47,204,63,113,1,216,130,225,154,67,101,205,222,74,35,166,194,100,156,171,143,64,111,215,55,232,103,49,166,172,26,57,218,140,115,137,159,130,241,115,168,238,5,241,224,247,16,97,195,31,235,214,133,39,6,58,53,115,109,60,112,150,63,249,73,176,160,102,87,21,183,69,237,39,139,49,150,28,210,83,166,39,181,56,205,172,145,58,120,80,51,85,123,200,85,81,225,114,
+43,213,96,123,196,195,83,252,142,77,221,217,71,48,223,4,17,66,231,89,123,221,219,106,39,135,23,164,206,240,210,239,164,45,110,135,231,254,159,94,53,251,82,85,92,183,158,190,91,30,195,195,144,126,198,21,102,25,207,28,133,85,141,90,78,143,120,17,103,220,209,69,104,233,155,247,122,254,110,183,58,59,151,210,23,55,104,6,95,32,231,56,134,112,94,113,193,139,89,239,232,216,88,2,34,173,211,186,63,226,88,70,188,136,153,39,139,47,248,149,236,141,185,91,58,133,18,71,179,162,91,128,127,47,232,50,121,72,36,194,137,202,214,146,209,105,8,102,87,41,4,194,229,40,122,97,44,19,147,254,31,252,225,142,8,156,30,29,193,168,157,219,127,215,245,48,206,105,71,15,2,109,121,5,201,30,24,167,213,49,214,49,81,54,242,35,152,7,61,216,177,93,42,58,98,234,192,117,227,45,209,241,4,152,226,224,204,230,199,100,94,74,85,200,189,237,238,210,80,235,135,233,97,45,206,35,75,144,195,103,110,68,187,246,106,69,91,130,139,252,106,40,86,144,39,223,
+214,147,26,169,134,251,147,115,48,50,117,206,74,254,193,253,112,73,243,202,19,171,81,173,117,241,147,85,122,213,123,118,177,127,219,2,75,239,141,63,207,53,42,39,189,210,139,83,145,144,213,11,71,187,53,85,40,141,215,132,207,100,115,240,177,94,88,209,79,254,152,7,62,228,173,35,14,102,6,205,141,30,116,118,112,119,16,111,112,119,104,61,160,186,184,197,137,63,124,206,84,37,184,162,215,162,108,242,249,101,61,59,122,222,125,199,1,237,170,20,39,210,158,149,248,216,9,244,136,123,131,89,51,37,232,237,229,207,68,12,161,57,84,190,168,145,40,199,164,198,115,250,249,87,22,101,147,191,50,109,219,130,230,234,50,23,224,182,19,244,159,196,215,227,32,81,205,13,47,193,95,51,208,32,8,218,15,99,9,229,244,199,207,177,168,97,111,100,26,207,40,231,191,58,80,219,113,111,103,152,194,143,16,106,191,176,132,166,63,167,107,32,63,132,112,47,240,54,95,63,211,191,68,182,86,17,36,74,217,171,150,192,15,190,167,162,170,88,119,76,0,211,239,109,196,194,
+49,136,120,12,239,143,65,196,99,184,253,105,86,24,61,162,84,224,238,18,62,25,225,147,81,30,248,161,85,62,156,255,92,206,191,94,37,228,31,11,88,159,217,21,66,25,115,225,36,146,36,17,224,217,207,58,254,121,128,81,152,14,68,100,11,159,96,242,64,240,75,136,143,225,165,248,243,216,37,181,125,182,5,124,240,199,247,238,192,87,241,95,18,42,121,33,246,68,174,145,98,184,237,131,13,72,118,109,111,189,46,61,145,59,227,132,78,55,0,1,126,62,122,129,93,203,95,172,169,48,21,103,196,42,174,247,68,93,166,97,157,123,128,157,32,124,226,255,113,83,182,246,101,226,108,221,158,48,206,213,46,50,42,39,216,233,139,175,31,15,14,112,205,143,157,125,62,134,138,209,159,249,50,205,97,196,183,37,80,211,254,35,128,91,220,115,248,228,7,192,63,58,31,183,29,115,22,215,190,246,211,206,226,255,113,128,92,135,160,40,72,26,201,206,109,148,245,85,137,45,191,252,165,249,213,16,47,197,13,52,81,93,138,222,255,156,193,151,50,64,159,5,34,150,116,226,
+96,7,19,89,246,40,164,37,226,35,186,126,216,82,202,63,79,153,249,156,231,208,181,234,34,50,63,67,30,41,141,159,108,201,206,242,62,214,253,1,15,225,194,255,155,80,231,134,223,64,3,120,12,143,33,252,35,206,158,51,80,141,193,219,7,204,99,187,47,60,225,26,95,126,68,207,84,44,81,104,153,63,184,241,123,126,23,12,222,252,119,193,152,224,107,233,113,41,125,60,186,167,92,51,113,243,164,173,101,209,127,145,254,202,0,108,119,0,241,170,234,210,16,61,245,158,229,244,188,224,234,252,76,102,207,87,105,15,150,15,138,168,95,71,247,71,209,142,107,118,119,14,7,220,54,112,122,115,141,168,147,8,247,15,222,91,225,188,23,134,225,149,194,239,175,5,134,23,171,202,200,170,166,61,209,107,130,19,111,21,92,168,41,6,73,128,248,59,16,99,7,118,211,117,235,226,251,211,223,26,86,203,137,142,210,143,209,173,68,93,131,186,161,213,111,228,22,35,41,168,165,158,67,196,205,15,154,183,58,201,8,189,148,165,172,204,23,111,143,108,124,117,102,54,102,104,
+68,30,132,144,187,31,239,4,67,83,110,171,126,129,83,152,101,100,4,213,81,108,243,253,27,14,236,14,187,237,108,35,150,71,127,16,57,121,163,167,186,15,48,62,62,97,246,225,230,194,184,98,52,107,106,194,157,50,202,181,114,137,236,239,235,170,164,109,243,249,154,52,175,145,11,177,170,210,97,210,102,224,253,242,44,57,38,90,4,87,254,255,151,188,40,254,192,226,187,236,71,20,24,197,136,252,193,163,107,132,137,248,152,175,161,17,151,59,146,62,119,240,5,246,230,238,253,72,43,4,143,94,245,133,172,156,65,149,216,60,128,183,95,32,26,210,153,23,175,126,4,175,179,120,105,17,52,4,125,2,163,190,239,205,7,24,98,148,4,189,155,108,130,125,115,223,83,63,88,215,185,157,125,168,35,22,127,162,251,237,69,32,246,234,241,214,41,103,222,207,172,198,113,143,221,9,30,58,141,155,129,42,240,75,187,154,195,109,215,132,47,217,52,78,216,46,185,210,231,216,50,213,254,7,151,236,169,111,155,73,170,30,206,31,150,98,7,126,166,248,227,45,172,164,194,189,
+133,37,174,29,191,58,44,213,238,162,167,88,11,241,93,248,141,123,25,134,99,12,124,114,46,234,52,244,241,194,227,248,242,0,4,2,34,191,59,235,110,165,187,217,175,76,67,222,127,101,154,138,57,170,229,171,145,20,235,199,127,79,27,176,101,59,54,16,250,113,141,122,126,132,202,250,203,1,51,13,28,152,181,112,167,223,173,231,8,83,151,160,124,233,162,221,31,63,70,229,195,8,58,80,59,92,239,239,125,220,231,87,152,182,165,69,77,236,106,91,161,94,162,221,246,220,143,14,91,181,182,123,193,180,205,217,185,12,253,179,248,234,244,120,142,31,124,81,56,127,234,203,14,107,197,244,197,109,254,65,248,122,46,100,220,45,209,51,198,151,106,77,222,62,42,207,91,199,32,218,216,218,210,22,83,107,179,134,155,19,166,36,92,76,38,73,97,109,255,39,97,26,2,218,207,231,76,228,58,138,168,246,168,87,135,206,127,111,176,107,97,88,215,64,83,119,57,142,139,134,91,40,188,183,125,112,97,123,111,233,115,168,134,106,97,87,15,71,78,171,23,194,215,14,236,117,
+102,167,138,190,133,118,236,77,112,246,212,221,126,62,224,93,124,17,108,68,120,76,173,221,29,207,90,16,137,34,69,251,87,249,153,193,137,226,144,11,123,218,18,197,15,146,194,242,30,10,182,167,97,175,35,89,171,133,203,11,146,225,87,176,205,139,80,190,39,155,250,2,140,95,162,136,204,124,169,215,176,12,193,98,135,246,41,146,247,54,34,246,183,171,81,91,7,106,60,145,60,64,255,103,93,182,242,109,177,186,245,94,198,229,82,253,185,78,86,71,69,236,63,194,132,113,84,99,249,157,83,187,49,205,253,251,253,85,85,223,41,11,124,103,208,253,175,140,145,188,153,179,189,219,49,225,159,215,15,216,164,196,249,53,132,168,113,156,178,180,16,127,242,44,113,167,173,153,168,110,225,86,184,218,11,60,115,127,237,34,26,203,173,163,97,134,151,95,226,169,16,126,137,167,241,99,197,23,114,196,190,228,13,17,4,78,254,181,78,184,39,239,128,13,87,52,199,174,81,4,177,157,192,247,63,42,21,202,107,113,163,189,184,205,133,31,118,196,200,67,16,132,15,59,147,233,
+73,231,193,39,167,132,0,231,253,206,2,24,31,31,144,223,5,84,151,67,124,229,11,157,166,101,50,183,28,243,196,170,214,242,229,197,219,19,207,148,249,43,64,183,204,222,119,251,116,187,113,251,43,170,90,8,33,228,8,188,43,92,130,194,49,199,241,29,129,7,178,241,128,227,252,251,244,195,191,108,109,17,226,107,247,110,79,39,209,34,131,76,193,217,143,63,24,249,241,12,175,103,103,248,210,118,97,194,73,209,107,25,163,103,194,216,154,250,99,247,46,224,61,124,60,113,108,27,144,245,47,116,162,254,216,91,3,234,158,98,41,223,5,222,142,140,215,164,75,108,2,235,155,208,169,145,228,145,4,206,126,31,228,88,107,166,124,174,231,99,41,11,70,236,137,88,35,77,126,214,65,224,21,134,32,247,193,11,190,86,236,149,187,16,139,217,61,15,17,126,110,32,89,106,176,211,85,136,190,110,233,18,53,245,60,246,6,255,62,96,217,29,31,74,164,16,63,11,153,97,163,127,49,143,31,125,143,155,40,250,149,9,132,8,254,14,226,55,209,165,49,254,72,150,12,211,
+193,223,52,118,45,96,132,129,185,109,198,207,50,241,103,229,75,183,207,54,135,66,56,14,66,179,6,122,75,250,209,53,71,34,148,86,23,221,15,60,150,31,132,239,75,28,210,243,131,96,23,179,240,125,59,52,99,122,91,40,168,142,88,62,115,28,166,184,35,226,245,27,199,247,209,117,235,110,109,163,154,86,104,124,218,234,28,249,28,49,136,95,21,200,252,81,136,100,202,231,141,15,203,229,176,107,199,94,211,98,121,172,125,158,3,177,219,5,209,105,50,109,162,164,204,235,79,67,203,79,30,60,56,86,213,18,228,142,111,58,116,131,201,155,28,196,208,49,74,217,2,201,151,35,62,5,15,174,154,73,55,112,121,253,80,147,20,131,118,177,182,12,27,186,193,74,153,182,202,221,29,38,233,101,115,56,252,18,244,125,129,163,222,41,22,31,138,16,162,252,126,89,229,232,98,166,58,210,246,42,164,161,83,215,226,3,13,70,131,215,17,131,187,62,195,168,31,55,130,60,181,125,42,180,159,65,61,34,225,155,149,137,46,20,72,248,52,116,238,27,80,252,17,33,227,44,
+16,193,150,17,193,18,155,231,225,219,243,102,251,213,66,123,179,31,3,250,205,234,103,118,128,235,32,91,186,137,176,2,31,58,208,169,178,47,117,59,208,194,186,60,62,133,145,107,212,251,3,104,175,100,60,185,3,141,213,204,151,169,235,13,46,46,91,3,31,35,180,171,182,113,156,104,239,217,175,48,198,61,60,49,77,87,91,49,88,78,165,139,137,98,200,144,220,25,132,121,85,57,197,217,182,124,209,56,80,170,155,222,185,62,251,21,68,204,224,99,94,214,76,65,54,52,243,135,167,155,131,211,96,175,166,64,195,153,244,103,54,30,104,195,21,238,124,192,65,232,206,131,79,36,8,34,94,254,156,229,10,177,221,239,7,28,24,102,210,112,117,66,248,14,252,156,221,25,87,113,211,179,49,214,227,178,227,50,53,31,158,163,207,24,129,128,43,169,161,25,14,238,204,87,113,14,17,8,145,8,117,3,121,131,167,175,87,52,127,208,32,174,151,199,82,49,47,16,149,126,158,100,124,122,142,15,164,28,224,57,41,113,124,162,212,81,170,77,240,103,46,200,238,69,47,165,
+130,79,167,199,17,63,126,144,179,68,87,212,84,103,87,129,17,249,159,142,237,63,142,194,56,130,146,234,104,64,125,41,149,63,205,60,7,123,46,92,145,198,155,232,244,248,21,178,184,72,234,31,191,153,206,251,79,71,114,35,142,2,135,54,12,121,209,117,170,42,193,116,23,155,135,11,253,133,104,35,251,192,199,243,127,143,84,135,91,69,244,51,101,115,24,53,57,228,193,126,45,176,80,33,55,26,120,32,250,47,106,89,182,192,182,157,217,134,19,84,238,156,193,34,198,158,68,6,94,60,100,233,171,144,54,206,176,159,158,157,197,18,15,226,83,86,62,199,213,21,19,60,253,128,48,176,172,163,9,75,44,223,233,204,177,31,222,230,81,44,11,8,47,67,254,239,160,72,212,37,3,239,199,91,203,248,189,213,232,118,128,10,248,124,116,105,229,111,64,204,212,222,206,226,181,218,33,6,160,239,206,132,83,128,12,42,156,97,25,117,1,40,223,49,191,185,102,6,82,229,252,221,57,184,107,206,102,156,12,251,114,85,94,157,93,165,200,78,124,242,90,123,104,242,113,232,
+171,64,19,119,237,89,214,77,144,247,96,23,212,59,223,35,205,76,201,14,34,36,154,55,44,190,219,142,42,219,36,221,212,238,171,0,195,197,248,126,115,135,59,234,250,187,249,115,247,93,223,69,149,40,71,192,199,229,24,2,246,31,204,83,97,156,109,86,189,71,61,16,153,202,0,246,211,16,125,222,46,30,244,111,200,153,255,138,163,108,185,179,206,189,211,4,236,197,83,172,18,178,158,78,49,54,51,96,72,111,129,167,56,253,32,44,212,64,159,247,73,117,113,10,147,165,253,175,213,251,90,91,131,160,194,194,236,85,178,6,232,235,68,50,158,239,140,54,88,238,118,205,173,28,79,252,230,242,179,219,28,103,22,69,103,69,227,126,101,9,57,194,99,123,120,61,95,103,94,3,94,137,195,29,160,236,124,148,21,38,233,65,115,7,51,136,28,16,219,3,107,40,45,244,47,218,100,28,10,242,143,167,107,88,235,100,206,207,58,248,237,65,213,53,3,97,52,209,61,82,54,244,103,246,82,249,161,226,102,136,18,80,136,93,173,11,208,124,38,127,237,193,192,47,104,230,
+100,6,53,182,113,249,33,68,43,210,157,21,43,14,163,15,181,139,221,86,221,86,198,45,158,67,102,125,102,22,244,11,14,100,31,151,83,187,230,107,253,52,226,63,175,176,216,3,212,226,121,204,112,119,190,230,198,104,163,194,246,73,241,206,220,92,188,132,89,144,211,61,186,23,43,207,135,218,97,168,68,59,206,234,73,58,114,103,219,147,152,61,254,144,153,188,161,220,83,247,99,22,18,181,209,158,91,156,53,193,212,82,132,31,28,50,154,134,250,135,218,9,183,152,133,61,237,213,119,200,81,74,133,240,150,116,32,70,133,15,239,180,239,66,177,105,176,115,28,58,92,111,200,72,16,219,23,72,9,18,34,237,92,13,243,219,192,160,144,125,217,233,66,35,214,76,197,28,172,176,78,84,24,142,146,111,200,150,215,157,148,255,26,243,146,87,216,136,93,124,155,130,28,138,130,126,116,182,125,60,106,208,111,204,245,54,217,174,168,24,102,172,145,78,127,78,99,121,226,184,239,245,1,88,27,246,138,203,131,155,74,119,183,54,92,148,59,46,165,98,148,241,146,106,160,163,
+81,213,92,143,100,73,222,199,9,191,32,114,218,165,53,166,193,173,169,46,190,121,37,53,133,21,89,86,71,16,212,11,140,201,63,29,247,237,158,194,195,72,167,59,227,221,254,203,126,39,77,211,192,40,156,12,110,49,190,149,72,111,162,43,190,33,170,120,165,189,22,133,77,180,204,59,219,1,105,219,40,16,85,237,191,110,130,217,194,3,212,68,204,192,170,218,90,94,154,125,36,62,241,188,195,170,3,186,158,31,57,187,90,178,148,225,88,214,174,202,136,38,37,25,72,75,21,170,163,88,118,136,174,162,247,116,197,59,77,233,184,115,84,212,102,124,130,42,192,93,80,82,31,2,41,253,158,95,70,12,209,33,155,74,113,183,165,250,101,57,66,180,19,81,142,251,108,112,253,51,191,230,195,36,131,34,145,58,203,151,54,216,71,73,52,225,78,181,217,118,121,13,59,118,219,121,207,150,21,33,145,216,254,234,188,187,115,31,187,117,75,131,11,206,115,201,172,221,233,223,96,179,23,204,56,113,49,250,90,111,89,7,122,179,243,24,113,206,147,98,146,97,135,57,92,200,
+110,68,1,37,11,198,177,254,3,117,220,253,50,64,238,212,211,205,98,209,198,240,154,156,250,164,114,17,185,170,211,240,134,135,98,237,149,61,195,16,221,161,196,190,197,131,214,100,174,183,119,40,62,111,50,144,254,126,59,135,216,120,204,143,60,225,173,29,144,174,201,148,59,38,196,98,35,171,214,192,183,5,31,187,125,95,225,237,74,111,109,4,68,248,158,123,220,168,134,197,150,6,185,194,69,75,226,4,24,67,160,185,202,15,30,14,1,132,185,95,0,67,137,71,34,192,19,154,102,133,152,194,125,25,2,233,104,164,25,207,36,183,238,209,167,42,238,92,50,252,71,175,148,45,182,90,26,239,64,116,64,22,244,171,62,189,237,35,137,124,146,202,29,205,107,125,159,184,112,249,146,129,96,96,85,138,228,43,59,232,242,195,46,222,236,251,144,10,240,142,0,158,242,221,211,252,8,121,46,23,18,104,99,251,32,185,93,114,214,129,206,14,92,218,107,130,178,198,37,92,64,101,52,238,193,137,69,220,219,140,138,97,89,108,121,56,95,114,133,56,199,120,223,163,102,220,
+60,80,140,229,51,83,198,230,174,253,154,76,156,4,77,90,54,249,82,38,153,221,47,175,191,129,171,207,189,53,246,125,41,173,225,76,119,43,249,161,233,77,90,166,135,223,94,161,230,11,249,33,145,190,60,145,161,142,192,135,139,109,22,13,204,60,155,42,82,110,42,217,23,240,241,255,211,166,226,178,35,124,2,151,49,239,127,217,241,198,75,222,29,216,108,33,95,177,67,106,149,210,40,125,87,59,46,72,172,85,233,178,47,57,88,242,121,4,161,99,48,155,205,4,193,238,41,236,91,147,38,229,55,37,156,67,165,201,107,226,199,56,166,157,248,130,3,106,60,107,139,171,55,230,183,205,89,170,184,7,18,34,115,182,207,184,190,156,73,120,166,62,136,118,105,139,76,166,203,227,138,12,36,195,160,101,140,64,152,109,192,92,236,183,160,115,103,22,205,149,157,137,131,191,32,97,76,112,134,97,192,12,99,222,196,63,159,188,212,172,253,227,201,156,226,154,69,167,41,110,102,92,55,139,243,221,129,94,17,147,77,119,163,187,12,116,120,42,148,67,78,45,121,171,189,140,
+155,31,6,114,173,251,68,165,167,27,92,68,93,78,103,121,102,171,107,226,89,146,102,226,49,118,249,80,25,145,148,6,123,197,217,51,110,235,249,246,96,63,187,123,8,255,177,73,209,255,252,119,127,254,217,239,231,175,254,226,127,250,135,63,255,231,127,252,171,191,248,211,191,251,135,191,255,251,191,253,79,199,29,159,254,238,207,127,255,15,255,251,207,213,191,251,243,127,248,243,95,255,63,110,242,244,167,127,252,219,127,248,217,86,236,111,254,211,223,255,249,63,255,249,239,254,254,103,103,177,255,230,79,255,246,231,142,127,221,236,255,248,95,142,59,33,253,139,93,145,254,221,63,254,233,175,255,195,223,252,245,255,118,220,116,232,56,228,191,255,243,127,252,211,127,125,108,121,220,110,233,119,204,63,253,199,191,253,207,199,25,226,39,142,251,67,253,110,9,245,111,255,253,223,252,175,191,59,24,253,177,29,213,113,43,165,191,250,139,255,241,127,248,171,191,248,191,109,82,244,223,253,229,127,255,151,255,213,127,251,111,254,205,95,18,136,223,167,199,189,238,137,117,236,143,189,
+149,198,213,200,228,187,148,41,145,166,187,115,236,188,225,9,212,164,79,239,2,158,229,235,170,175,20,60,178,46,159,188,242,160,193,124,82,24,136,164,203,171,102,238,138,156,198,133,223,216,76,112,52,101,182,171,82,178,185,190,10,61,151,60,171,147,98,117,104,47,207,226,237,133,86,155,229,187,63,48,0,213,174,43,62,157,190,61,71,36,238,10,194,85,110,219,48,86,31,51,129,253,90,165,200,116,79,7,8,124,152,119,93,135,93,8,216,76,250,81,93,248,73,46,136,215,60,155,213,179,69,50,74,183,232,250,76,88,163,8,176,89,92,252,144,169,76,103,185,9,98,51,114,60,169,176,193,212,212,143,120,4,66,190,66,204,134,31,52,138,157,66,199,77,241,194,26,199,183,34,21,174,107,184,249,70,78,57,123,197,239,202,229,84,113,217,189,34,179,205,229,208,125,139,67,72,179,184,22,140,85,79,237,167,166,67,4,38,29,214,18,5,215,171,28,241,4,92,161,137,246,126,168,72,197,98,219,98,107,238,219,198,143,250,204,89,65,119,119,170,224,142,149,163,142,101,
+190,40,157,127,166,45,227,236,96,155,177,235,220,192,228,138,195,113,62,144,136,22,86,93,192,77,157,98,213,184,4,44,239,68,160,55,158,237,136,210,185,76,110,61,127,154,85,187,81,122,226,11,17,228,124,19,1,55,235,143,235,22,142,181,132,228,102,175,108,86,125,37,167,197,4,177,42,133,16,247,21,183,246,195,92,154,127,116,154,17,25,81,63,178,243,121,79,22,52,189,127,119,134,21,18,56,162,224,199,35,155,18,114,214,62,164,151,15,200,240,166,138,158,90,242,164,216,91,97,178,254,58,177,204,11,216,188,116,17,113,39,40,77,29,119,98,139,74,115,212,193,35,135,53,133,176,173,248,64,226,182,44,238,142,218,168,179,111,213,200,130,100,107,55,226,170,10,179,173,242,154,238,148,45,241,160,40,64,74,110,211,23,105,213,88,21,215,80,26,130,4,92,43,184,157,189,40,36,170,232,183,226,113,163,215,156,224,161,1,239,25,186,110,27,254,226,237,138,197,204,71,248,92,172,205,43,21,42,35,115,2,12,2,250,145,72,197,172,132,214,146,241,197,188,92,54,
+213,210,222,186,56,86,206,138,230,207,237,244,83,146,102,131,150,159,254,133,33,220,53,149,139,132,185,7,239,110,32,193,186,31,5,167,206,221,122,127,250,158,63,77,23,137,117,218,215,15,57,246,143,224,182,217,134,174,92,30,245,196,148,123,212,192,186,133,114,234,77,228,24,101,80,248,56,122,70,223,23,106,59,144,239,105,137,235,145,167,217,209,154,211,85,70,217,252,216,237,158,132,21,103,208,30,203,31,188,250,187,22,183,106,78,23,183,70,154,172,219,238,68,114,235,80,8,186,131,193,220,242,4,105,113,13,235,103,5,4,51,35,27,95,129,20,103,212,148,70,132,110,91,203,197,202,139,230,87,245,163,251,86,62,71,182,124,10,51,137,207,82,115,130,28,230,146,131,206,192,89,48,183,230,60,172,9,144,244,35,95,163,104,215,125,35,134,248,172,40,230,142,189,93,162,42,220,156,119,131,133,174,110,17,92,159,122,76,119,89,157,142,250,212,45,109,223,130,171,11,32,66,30,75,184,179,202,156,208,78,157,250,16,82,246,48,210,69,63,51,85,96,166,177,125,134,
+59,14,75,81,32,137,88,230,233,226,221,216,86,221,37,90,253,160,108,60,194,122,21,250,106,119,7,235,152,156,87,137,219,212,91,59,62,134,225,162,49,18,174,63,239,113,120,13,160,131,151,108,176,169,221,178,5,87,225,3,183,10,53,146,111,53,180,223,109,100,101,165,185,61,66,238,56,129,237,93,244,253,188,64,143,44,189,37,235,246,38,87,142,103,66,78,123,119,240,142,76,94,166,239,53,143,76,206,230,40,11,159,139,221,157,206,208,159,159,184,168,189,196,131,162,14,122,246,251,114,185,186,8,79,54,177,204,57,236,199,200,225,216,222,83,26,62,201,102,133,109,59,39,230,70,23,39,218,65,187,61,121,183,223,11,152,51,58,143,192,118,238,150,244,53,73,18,94,107,63,194,48,84,107,187,158,52,119,60,205,124,181,205,175,191,13,250,81,53,84,78,127,181,219,194,115,7,147,132,163,75,152,220,231,78,245,5,85,156,6,237,167,67,150,118,207,200,186,239,56,0,0,23,25,159,186,150,36,191,30,82,7,158,57,148,123,219,189,71,185,92,2,53,11,155,32,
+218,50,208,60,60,190,13,58,237,12,183,211,94,245,182,109,191,206,174,25,181,21,47,231,133,38,8,124,15,222,219,193,206,71,211,239,204,230,180,10,92,160,20,69,158,21,47,213,210,109,173,65,13,254,222,149,248,12,43,56,169,27,173,177,168,225,164,194,159,111,71,118,8,107,96,71,83,239,217,34,177,187,35,155,124,14,109,114,29,21,242,94,16,168,74,243,45,87,5,108,189,189,207,115,176,62,157,219,58,120,31,174,206,103,248,83,115,139,105,146,169,182,16,74,170,21,156,82,14,250,12,107,194,197,237,196,108,45,129,34,61,39,245,50,240,103,189,186,56,182,100,140,12,20,203,252,251,126,156,14,107,86,95,174,209,107,110,178,169,245,183,252,162,7,211,53,156,234,211,120,85,77,136,125,229,130,235,231,153,70,125,242,49,232,60,205,215,239,9,238,89,187,189,112,26,207,21,27,130,161,40,88,97,190,64,119,202,7,248,141,229,144,201,51,122,67,213,70,161,22,226,149,172,13,226,130,228,45,228,128,220,146,99,137,90,215,78,239,160,31,224,183,165,36,10,139,
+90,213,135,153,223,237,39,106,97,27,10,233,51,176,245,32,97,84,40,181,131,233,123,178,73,154,169,143,157,91,106,180,66,138,23,189,183,53,165,38,247,142,202,61,11,25,93,92,37,63,132,36,174,160,194,93,244,27,196,34,156,26,192,27,175,232,176,199,168,125,134,29,234,153,30,72,37,172,255,54,243,94,203,16,230,187,78,212,245,216,16,248,121,154,119,239,99,135,91,126,108,24,18,78,182,202,199,71,40,156,135,45,29,145,75,5,0,136,75,156,14,46,76,155,203,189,62,231,174,229,201,1,226,87,21,190,69,243,187,175,3,95,179,99,228,89,220,83,144,68,197,90,149,220,36,199,27,29,84,224,200,168,104,9,167,247,149,165,14,139,196,163,88,239,61,145,115,94,194,164,8,6,16,37,89,6,188,72,175,210,124,31,239,150,27,92,41,197,207,161,50,195,228,246,181,162,168,35,30,246,197,221,45,58,163,56,48,55,138,141,220,122,217,185,20,0,74,137,75,179,222,8,37,18,13,79,204,93,202,90,177,214,83,168,133,8,189,173,118,130,94,137,28,174,172,195,
+23,131,169,228,240,57,119,145,229,52,36,190,0,198,198,101,8,20,238,179,186,77,169,237,118,142,55,108,210,48,237,191,203,95,20,157,163,56,191,57,242,108,227,197,79,125,194,248,129,145,26,79,123,142,132,210,250,140,165,233,184,255,138,95,197,138,137,121,59,253,158,61,131,217,46,100,11,89,107,202,158,23,0,5,121,239,41,33,46,99,28,16,38,22,149,128,103,13,35,71,34,145,223,57,55,138,34,126,57,119,199,141,6,192,184,178,126,136,4,144,76,225,107,57,24,132,222,150,17,157,60,36,107,173,31,213,241,220,196,119,166,96,158,67,196,199,166,187,219,62,51,169,223,20,132,161,226,67,119,114,111,139,231,58,190,233,168,168,239,153,230,192,190,233,86,177,237,254,33,176,28,190,85,211,166,65,59,91,66,172,120,142,83,138,78,197,62,119,111,124,50,61,175,98,181,139,16,154,50,113,225,40,80,228,101,135,227,124,47,207,193,211,86,145,41,193,22,26,90,170,24,172,67,213,206,170,47,13,129,247,168,59,199,226,246,141,10,46,39,53,104,234,228,186,210,9,
+33,199,197,51,35,216,127,194,179,36,107,230,49,56,92,247,215,106,78,164,110,154,20,66,44,166,204,137,93,92,194,157,251,181,184,29,228,8,211,201,1,247,53,114,86,61,57,88,230,179,217,108,48,216,107,77,251,221,110,135,133,48,223,78,75,112,40,209,65,177,136,228,224,228,250,81,123,147,192,165,222,70,163,70,192,175,171,38,98,153,104,181,110,108,20,204,24,8,14,112,245,52,154,63,109,90,86,82,172,17,70,239,30,116,160,199,183,101,243,182,243,121,138,2,155,73,237,210,243,203,86,223,204,241,66,77,65,248,78,192,188,190,142,124,89,69,10,155,160,126,195,32,138,184,222,52,40,117,111,92,69,136,167,105,191,46,134,183,165,192,35,175,10,89,90,248,52,10,38,168,97,141,218,33,208,230,75,43,79,150,173,76,224,144,98,66,32,0,56,163,206,207,96,223,76,135,77,74,167,219,29,97,230,151,249,252,216,45,175,126,154,88,42,149,234,89,137,206,22,207,113,103,185,147,188,233,16,43,22,87,177,120,121,99,86,176,199,23,80,7,102,196,184,38,109,62,
+47,79,190,136,140,109,146,225,126,20,182,88,84,101,71,252,214,233,186,226,236,134,91,202,68,184,244,83,62,74,154,187,150,114,5,177,172,37,173,78,180,59,245,241,135,9,120,77,211,250,200,178,192,23,69,37,24,249,220,180,183,205,109,30,105,1,185,199,119,77,81,154,214,124,239,180,111,224,43,98,20,92,204,111,215,220,152,113,17,72,165,53,152,4,255,17,250,199,28,251,246,116,207,114,220,121,197,131,114,36,18,201,220,30,34,182,213,72,78,168,14,151,137,56,237,139,20,140,249,164,5,71,113,37,212,143,232,52,227,108,112,178,222,27,158,187,160,142,137,58,250,119,79,107,254,116,142,32,101,11,79,115,104,124,183,66,204,190,220,111,69,232,185,220,233,136,89,79,72,76,119,222,75,2,216,201,197,188,214,187,58,32,172,41,138,69,183,240,172,156,173,117,76,108,245,30,61,115,188,88,230,76,157,190,210,189,29,249,168,134,33,122,39,7,249,52,17,174,27,42,161,162,47,215,201,42,216,233,101,109,45,8,201,79,68,150,184,101,108,210,159,25,115,253,34,214,
+249,166,61,89,156,143,222,244,83,215,164,161,221,160,128,5,70,6,76,174,254,43,56,126,6,190,1,160,91,30,168,44,93,139,247,196,22,23,128,239,226,49,182,187,215,157,24,168,171,4,82,87,197,137,137,142,201,41,54,232,138,170,247,137,110,135,62,62,167,169,125,236,91,62,174,78,167,27,12,195,28,66,245,60,103,77,127,124,2,132,65,151,91,109,141,29,143,17,79,113,154,16,17,0,97,220,102,237,56,102,30,193,107,215,57,144,16,77,119,165,143,70,206,214,22,65,202,104,215,100,199,127,198,232,99,48,151,87,56,190,186,142,109,248,205,143,58,221,35,38,193,186,42,236,96,21,36,235,124,12,90,246,11,194,147,90,161,11,133,36,128,249,148,112,103,40,58,239,182,108,214,59,97,106,251,110,63,164,247,98,29,129,255,217,249,35,15,78,35,177,48,65,45,213,17,78,238,149,120,170,42,9,186,223,23,4,229,239,11,194,239,233,255,207,235,247,199,63,221,237,162,145,32,240,99,185,24,171,193,253,61,158,252,28,47,230,148,112,56,76,160,170,116,18,149,252,
+146,195,37,60,155,45,243,0,35,108,35,88,29,223,150,57,133,115,118,113,207,230,158,20,201,47,143,50,221,73,157,161,63,131,9,55,250,51,252,119,114,246,251,162,170,255,125,225,254,61,253,95,124,125,133,255,41,172,244,149,230,104,96,101,16,98,132,127,106,207,40,188,233,191,52,26,157,252,164,32,40,21,5,15,31,169,220,233,99,56,107,185,183,144,218,101,194,163,50,152,141,227,19,106,107,27,0,72,38,232,90,238,227,23,65,252,255,241,207,110,29,43,58,139,29,97,150,96,147,136,30,4,35,246,123,196,188,140,33,253,206,103,208,119,216,239,59,186,193,160,241,244,185,90,54,81,116,127,56,4,222,223,94,204,6,165,14,190,193,124,200,102,214,170,86,85,213,108,54,235,99,84,81,149,236,101,177,136,70,191,163,183,133,117,50,47,217,157,199,39,202,113,98,110,107,81,220,182,193,222,157,204,186,58,233,248,250,201,255,101,211,159,183,99,159,144,77,108,59,0,44,249,204,217,233,122,202,134,87,239,155,171,139,203,115,6,116,0,106,192,225,208,25,70,133,165,
+45,55,110,61,244,244,21,219,117,23,252,148,25,139,69,206,243,8,152,69,133,28,38,176,13,108,139,139,55,103,23,190,129,152,119,233,243,110,27,140,153,202,229,50,231,214,177,253,186,117,0,0,64,120,205,197,162,247,186,56,56,97,61,89,246,118,123,40,64,19,42,116,197,7,78,248,0,204,247,135,34,244,185,209,140,212,95,162,237,228,155,155,30,79,38,168,17,254,156,141,203,118,226,152,220,184,221,236,118,230,129,207,189,138,21,202,146,143,222,224,130,111,71,26,195,48,192,232,246,215,98,111,27,137,70,163,183,183,49,166,115,89,38,167,176,80,170,133,123,160,85,109,181,124,177,74,140,157,87,48,228,230,177,162,199,242,180,25,213,225,106,193,31,104,38,235,222,90,90,173,209,149,226,113,204,54,44,83,222,221,182,50,182,67,93,185,212,40,217,30,125,69,211,66,76,194,251,142,123,87,75,20,157,242,119,131,97,176,123,58,66,144,145,9,154,164,90,27,59,78,152,229,91,80,88,171,236,71,147,81,203,27,217,222,248,120,238,184,17,190,55,106,15,236,225,252,
+59,36,246,134,163,12,55,57,196,148,148,182,47,229,164,56,239,59,203,243,114,243,230,114,25,108,146,136,250,187,29,105,186,172,26,251,223,143,197,34,100,161,205,41,238,123,111,145,34,9,57,218,176,8,177,121,181,221,246,180,56,233,212,200,74,114,183,212,224,101,3,23,124,221,168,84,81,141,52,237,179,225,93,85,92,39,107,232,105,78,119,219,238,161,229,98,81,171,237,42,244,237,222,160,6,17,171,141,75,62,13,156,12,154,253,243,189,65,234,107,36,228,149,145,232,73,162,76,187,162,117,215,216,187,51,211,71,162,211,115,37,46,94,206,170,94,114,121,238,74,177,75,139,207,230,243,85,217,225,113,127,209,34,31,113,101,7,0,190,0,187,105,97,7,132,31,101,199,157,120,208,216,109,69,141,229,105,209,184,194,148,181,181,134,37,67,63,109,72,126,27,203,22,182,214,13,168,205,142,88,209,243,101,136,127,22,78,48,71,147,121,235,205,251,37,7,221,209,56,122,216,126,144,132,12,190,169,251,108,201,54,206,20,212,19,202,139,81,170,67,136,193,237,135,235,219,
+30,72,17,172,232,231,205,157,172,205,118,220,77,136,235,175,240,222,112,245,76,2,117,168,163,130,229,221,207,156,146,223,69,108,54,58,83,225,212,125,121,165,31,231,24,197,98,211,18,101,32,121,143,245,218,62,200,62,217,77,220,166,73,62,207,241,190,202,4,201,37,143,165,159,218,196,186,86,131,213,62,163,135,132,55,247,223,230,196,137,91,63,250,244,115,226,2,2,162,234,165,119,116,53,241,51,236,241,236,232,235,203,1,217,253,157,255,204,205,47,236,39,144,213,216,104,188,186,61,86,119,52,182,70,242,182,136,88,236,181,1,143,233,0,229,214,11,33,20,142,105,89,62,236,79,211,167,52,97,56,228,77,22,79,219,203,51,247,34,149,15,57,78,7,112,213,191,102,126,6,53,118,62,205,73,4,137,209,254,135,117,87,203,121,93,109,91,218,176,161,71,27,21,129,59,250,232,50,238,171,140,229,192,99,249,174,166,27,193,237,170,79,149,63,93,71,60,74,186,222,161,19,170,148,154,120,184,14,198,181,55,220,118,85,247,37,9,223,23,219,49,149,46,95,246,125,
+132,25,157,213,178,40,136,92,79,55,155,141,99,111,178,68,149,203,252,168,179,66,46,251,183,240,113,153,246,247,12,98,247,248,225,2,236,63,90,133,142,224,202,10,229,169,235,154,80,84,45,125,230,114,157,134,237,118,65,116,19,245,52,87,78,232,96,244,178,163,77,169,88,244,250,210,227,199,46,199,196,253,158,70,25,239,146,64,185,170,31,65,76,244,128,115,202,56,26,237,141,245,94,182,240,161,180,11,106,156,193,189,111,190,190,33,248,220,74,49,176,31,180,22,111,251,50,41,34,16,165,208,244,35,60,233,52,117,138,2,220,159,141,237,22,47,236,85,157,118,90,101,164,30,226,23,208,234,199,103,57,218,152,34,172,207,212,166,255,84,21,82,38,89,92,146,118,191,46,39,223,159,193,78,87,207,200,232,138,65,50,165,236,193,238,241,2,171,99,198,210,65,195,62,201,210,144,21,171,40,92,10,207,141,163,80,60,220,185,74,56,253,233,52,123,165,212,91,42,80,194,85,82,221,125,124,169,114,219,202,124,17,112,98,41,227,18,56,129,110,20,105,151,141,144,242,
+60,247,141,181,177,165,184,186,181,75,46,148,161,103,240,107,18,213,157,23,139,226,209,118,27,78,158,243,50,157,246,36,239,99,9,255,207,206,206,173,41,141,36,138,227,95,133,202,235,94,94,246,19,108,109,85,170,246,67,108,149,38,146,213,138,43,22,104,82,121,107,137,34,235,5,68,35,198,229,34,202,130,27,135,136,138,138,138,100,208,90,131,51,114,11,224,40,10,136,92,139,139,65,65,65,25,144,237,102,36,21,227,195,154,60,76,211,211,103,122,186,231,116,23,255,174,211,85,253,19,200,252,193,94,83,38,152,117,45,77,42,138,96,83,154,20,68,172,214,197,8,78,19,153,20,159,136,227,39,71,153,15,61,255,238,24,49,119,206,2,125,146,122,103,141,93,75,85,231,248,101,161,80,176,206,87,148,201,143,23,51,158,165,127,38,22,181,217,147,227,178,124,226,227,138,189,103,174,255,204,69,69,53,189,225,125,235,142,35,179,46,151,249,136,193,174,21,255,188,193,36,238,74,188,167,248,22,27,5,80,2,47,64,49,25,96,99,50,128,41,190,183,61,84,187,115,
+28,116,103,28,1,62,112,144,34,168,141,72,26,235,191,46,168,145,72,34,47,161,70,34,137,252,19,106,36,146,72,12,106,36,146,72,3,212,72,36,145,0,106,36,146,72,147,232,219,116,144,177,235,206,122,43,145,8,252,11,20,87,100,246,153,233,116,58,145,166,105,143,81,8,34,9,201,168,193,237,138,191,146,103,176,173,216,114,63,161,54,100,230,198,64,194,226,166,28,165,114,94,27,147,68,178,193,96,193,183,29,22,249,14,236,252,208,107,65,52,166,155,153,159,198,194,93,210,29,74,160,156,149,232,233,189,35,211,88,104,242,48,81,189,42,142,41,139,248,234,90,234,136,42,87,11,241,120,132,46,110,232,54,11,166,161,126,11,161,222,38,45,199,148,136,82,247,237,92,46,248,136,3,124,149,191,89,218,38,125,206,141,152,167,236,93,83,132,228,138,89,191,80,55,240,206,172,184,128,93,138,19,134,5,165,50,32,212,85,6,152,130,96,52,230,246,157,90,71,74,198,165,65,7,172,88,242,45,228,146,110,129,17,63,17,171,2,142,229,229,227,180,26,75,236,218,
+72,216,238,126,209,233,60,170,6,253,43,230,132,42,231,153,52,29,202,69,118,251,222,26,1,59,80,153,147,94,217,188,167,82,124,239,245,2,141,101,226,134,8,149,18,39,39,204,206,64,85,185,36,146,12,235,164,171,186,1,175,141,140,231,181,254,184,30,144,226,172,43,155,173,150,233,194,138,239,189,103,34,77,173,105,29,171,134,130,46,111,139,244,164,176,180,230,27,214,77,247,181,123,97,50,173,57,214,171,162,26,112,126,49,114,70,238,211,137,88,220,163,151,188,5,167,125,11,195,32,28,70,73,239,78,150,148,15,195,156,70,96,114,153,205,111,166,98,221,26,128,121,53,88,126,211,181,220,3,210,238,202,217,250,48,160,180,225,196,41,22,131,150,232,189,215,51,95,103,167,204,94,204,40,43,13,190,4,192,160,170,63,79,205,99,121,82,2,231,56,165,165,40,189,22,45,3,117,238,49,184,158,222,240,73,193,160,142,184,200,147,96,63,49,158,202,238,241,45,228,252,229,44,31,8,9,50,142,18,120,217,72,38,51,78,48,25,3,83,252,213,246,36,74,118,157,
+36,102,215,6,35,32,52,48,190,205,24,42,66,56,89,160,235,68,208,119,116,149,95,124,57,50,116,151,193,80,59,99,159,199,226,61,101,183,178,59,56,109,60,214,19,14,247,83,220,27,133,176,31,55,115,120,236,182,47,98,233,40,152,253,168,165,173,137,199,132,194,17,47,162,126,20,255,179,150,198,47,41,8,188,31,89,63,183,182,214,34,235,205,141,207,216,76,100,157,213,198,121,142,16,16,240,230,9,58,209,191,165,22,86,255,156,140,128,66,248,183,90,68,175,253,131,221,193,230,242,234,228,130,95,225,67,220,166,26,126,3,214,236,64,97,248,118,46,231,17,172,196,99,208,7,183,192,15,223,179,234,33,251,78,180,153,240,28,81,46,56,168,119,181,29,133,26,66,228,46,76,160,78,84,184,217,99,128,237,180,240,218,91,27,95,176,58,219,234,47,103,55,125,134,146,104,120,240,176,5,121,135,203,121,10,221,246,137,126,193,107,120,192,226,180,179,185,12,129,162,225,135,255,3,42,244,202,21,67,93,125,96,82,37,236,174,148,112,189,74,150,19,228,138,162,195,
+191,255,114,91,183,50,149,15,153,236,104,242,237,238,148,115,81,31,197,233,105,217,232,168,209,137,145,217,170,154,158,204,203,223,16,134,169,242,152,45,176,226,238,15,193,197,247,241,120,236,240,60,224,151,226,248,192,48,46,117,158,93,191,202,237,185,175,183,244,234,117,241,18,240,11,186,213,87,136,90,242,75,7,183,181,225,187,135,63,161,174,193,111,109,228,62,110,102,163,209,229,114,58,127,111,190,141,86,185,97,99,160,17,97,124,142,70,231,69,253,139,111,67,63,106,96,150,59,211,225,6,43,242,219,127,63,166,69,139,
+
diff --git a/uppsrc/ide/app.tpp/all.i b/uppsrc/ide/app.tpp/all.i
new file mode 100644
index 000000000..88efee97d
--- /dev/null
+++ b/uppsrc/ide/app.tpp/all.i
@@ -0,0 +1,99 @@
+TOPIC("Contact$en-us")
+#include "Contact$en-us.tpp"
+END_TOPIC
+
+TOPIC("Files$en-us")
+#include "Files$en-us.tpp"
+END_TOPIC
+
+TOPIC("GettingStarted$en-us")
+#include "GettingStarted$en-us.tpp"
+END_TOPIC
+
+TOPIC("Keys$en-us")
+#include "Keys$en-us.tpp"
+END_TOPIC
+
+TOPIC("index$en-us")
+#include "index$en-us.tpp"
+END_TOPIC
+
+TOPIC("ChangeLog$en-us")
+#include "ChangeLog$en-us.tpp"
+END_TOPIC
+
+TOPIC("NewProject$en-us")
+#include "NewProject$en-us.tpp"
+END_TOPIC
+
+TOPIC("GPL$en-us")
+#include "GPL$en-us.tpp"
+END_TOPIC
+
+TOPIC("IconDes$en-us")
+#include "IconDes$en-us.tpp"
+END_TOPIC
+
+TOPIC("install$en-us")
+#include "install$en-us.tpp"
+END_TOPIC
+
+TOPIC("About$en-us")
+#include "About$en-us.tpp"
+END_TOPIC
+
+TOPIC("BSD$en-us")
+#include "BSD$en-us.tpp"
+END_TOPIC
+
+TOPIC("Flags$en-us")
+#include "Flags$en-us.tpp"
+END_TOPIC
+
+TOPIC("macros$en-us")
+#include "macros$en-us.tpp"
+END_TOPIC
+
+TOPIC("Topic$en-us")
+#include "Topic$en-us.tpp"
+END_TOPIC
+
+TOPIC("Sponsor$en-us")
+#include "Sponsor$en-us.tpp"
+END_TOPIC
+
+TOPIC("IntroductionToUPP$en-us")
+#include "IntroductionToUPP$en-us.tpp"
+END_TOPIC
+
+TOPIC("ConfiguringPackagesAssemblies$en-us")
+#include "ConfiguringPackagesAssemblies$en-us.tpp"
+END_TOPIC
+
+TOPIC("PackagesAssembliesAndNests$en-us")
+#include "PackagesAssembliesAndNests$en-us.tpp"
+END_TOPIC
+
+TOPIC("cmdline$en-us")
+#include "cmdline$en-us.tpp"
+END_TOPIC
+
+TOPIC("CrossComp$en-gb")
+#include "CrossComp$en-gb.tpp"
+END_TOPIC
+
+TOPIC("Assist$en-us")
+#include "Assist$en-us.tpp"
+END_TOPIC
+
+TOPIC("esc$en-us")
+#include "esc$en-us.tpp"
+END_TOPIC
+
+TOPIC("PackageTemplates$en-us")
+#include "PackageTemplates$en-us.tpp"
+END_TOPIC
+
+TOPIC("Blitz$en-us")
+#include "Blitz$en-us.tpp"
+END_TOPIC
diff --git a/uppsrc/ide/app.tpp/cmdline$en-us.tpp b/uppsrc/ide/app.tpp/cmdline$en-us.tpp
new file mode 100644
index 000000000..0f82946e3
--- /dev/null
+++ b/uppsrc/ide/app.tpp/cmdline$en-us.tpp
@@ -0,0 +1,9 @@
+TITLE("TheIDE command-line & umk")
+COMPRESSED
+120,156,133,86,13,111,211,72,16,253,43,43,210,67,80,220,104,103,63,188,107,71,66,133,150,67,149,248,18,5,113,186,156,133,55,201,150,90,181,227,156,237,148,114,8,126,251,189,181,19,218,166,2,26,101,29,59,243,241,230,205,155,73,167,130,237,237,241,136,143,248,111,254,210,99,127,230,214,101,151,77,75,97,237,164,32,18,124,226,200,76,94,39,147,239,223,191,143,73,113,59,9,193,8,193,136,43,73,130,240,140,43,97,72,39,60,209,150,44,151,70,9,109,184,78,87,174,113,85,54,117,86,78,246,223,198,240,18,145,30,73,146,196,41,22,10,86,92,114,161,72,104,178,86,145,209,86,38,113,156,206,221,170,43,234,101,54,157,5,63,5,55,9,55,110,108,172,8,78,74,11,105,180,130,179,82,128,39,145,216,196,198,164,93,209,149,62,155,22,1,55,208,30,5,148,42,138,71,64,39,12,60,149,80,177,146,86,72,178,66,196,137,84,137,2,108,18,105,209,121,128,156,41,49,113,120,7,55,141,124,74,43,146,96,68,25,45,97,102,112,85,60,33,129,164,150,
+107,141,124,254,106,75,211,12,4,5,146,130,111,140,148,194,232,224,97,149,37,105,172,80,34,22,0,193,13,10,13,8,116,186,240,237,28,190,82,208,164,3,172,201,209,161,158,16,156,77,100,70,130,39,92,196,38,65,82,0,70,205,50,73,72,90,36,85,164,57,201,116,94,47,80,231,76,104,46,251,140,22,173,136,17,185,167,69,199,4,208,66,90,164,52,36,37,78,173,172,73,91,31,154,209,213,77,54,221,63,124,192,199,124,44,180,126,24,220,19,184,91,169,164,84,113,162,136,75,164,65,12,21,56,139,57,218,73,90,216,116,230,90,228,236,240,200,12,204,82,80,19,184,151,86,75,164,142,113,160,175,40,80,130,31,145,40,43,165,229,233,188,116,109,187,33,41,16,180,31,138,36,138,136,70,38,112,171,165,80,73,32,71,10,144,44,98,157,16,88,214,177,226,34,109,252,191,235,162,241,149,95,130,230,2,242,152,108,91,180,209,34,192,12,82,20,17,9,136,81,199,49,15,124,105,8,66,72,13,194,57,89,5,68,120,161,205,221,70,141,179,235,26,100,68,114,
+148,8,37,129,36,81,10,12,32,0,37,68,196,45,94,168,12,188,244,250,160,141,176,54,233,7,119,21,145,26,25,200,24,157,74,84,72,159,200,192,159,0,253,34,230,26,125,16,131,187,8,172,139,61,240,78,194,134,119,207,60,233,136,48,15,128,72,90,163,110,9,170,133,69,237,26,220,203,94,226,100,108,250,202,127,110,143,93,231,55,130,217,63,218,27,148,70,113,68,241,136,7,127,109,19,52,144,84,224,79,42,149,136,68,74,45,18,45,99,14,30,219,97,160,131,115,24,169,126,28,127,4,49,17,25,12,23,106,213,26,213,247,110,168,220,80,128,34,108,18,7,22,54,65,242,131,178,88,6,28,80,198,100,16,195,254,209,35,34,19,2,89,12,141,181,49,151,9,200,0,7,92,67,233,88,8,22,141,70,159,5,198,32,108,132,249,133,251,228,243,131,205,180,246,16,130,2,181,212,54,232,22,158,128,14,16,136,147,112,30,227,137,181,152,166,244,147,91,221,18,160,224,145,224,80,17,246,143,198,80,34,23,228,199,147,176,75,176,25,208,1,172,162,68,15,10,
+204,15,150,190,237,252,2,205,215,188,47,91,80,36,8,220,65,127,90,91,165,98,224,69,110,19,86,83,104,33,6,88,27,153,190,113,152,151,175,31,191,253,241,236,213,193,251,83,54,109,197,228,17,52,197,222,157,251,147,227,103,108,94,87,149,91,46,6,90,88,126,159,173,171,139,251,217,180,229,19,249,195,196,45,89,187,242,243,226,236,11,3,18,95,205,74,124,88,46,216,134,9,86,44,111,135,217,250,15,215,253,163,67,133,155,233,33,103,221,185,47,22,158,101,219,40,211,67,205,88,182,9,115,219,11,217,107,54,91,23,229,130,181,117,229,127,228,90,183,197,242,211,14,234,117,11,228,247,0,60,191,199,214,93,81,22,221,151,244,118,180,2,173,11,162,191,129,5,230,63,1,50,164,205,63,86,190,59,175,23,44,159,230,7,249,212,229,89,62,157,133,195,135,163,9,71,27,142,211,112,92,226,200,96,249,248,207,23,79,158,231,211,168,191,100,227,241,184,127,90,175,187,60,219,45,239,243,185,111,60,195,76,41,134,239,89,86,180,129,158,240,121,133,219,5,214,
+198,28,171,238,11,171,27,118,86,148,62,16,126,35,4,251,250,21,3,158,164,22,147,126,78,147,67,98,195,87,175,135,223,157,52,221,220,31,99,75,55,197,246,225,161,96,55,58,226,174,205,222,250,129,106,87,150,227,237,211,141,213,236,218,234,61,120,126,250,226,228,221,223,187,54,254,218,230,228,108,160,47,116,233,204,21,101,27,177,182,171,87,236,115,209,157,179,202,183,109,79,112,125,181,27,162,188,14,113,138,114,151,29,171,240,27,177,107,85,93,91,29,53,30,11,133,57,86,185,85,207,208,174,109,115,179,188,210,99,251,247,33,89,126,208,179,84,185,59,165,210,207,61,78,139,255,238,36,16,191,48,95,121,191,216,181,111,111,51,217,158,187,198,47,88,89,204,26,215,20,190,221,53,63,253,181,121,63,129,155,174,181,191,13,118,121,29,236,169,103,151,190,153,213,237,157,130,94,222,97,183,114,23,190,87,223,131,174,30,100,184,21,108,246,112,156,125,251,182,43,234,87,117,231,211,126,180,176,19,206,220,188,195,245,178,190,0,218,205,46,65,152,149,111,206,234,
+166,98,248,118,237,202,161,132,136,21,48,109,217,18,180,161,12,88,97,91,215,229,165,103,31,138,165,20,108,213,212,179,210,87,237,32,163,62,102,16,216,243,247,39,204,173,86,101,49,119,65,225,195,34,90,194,113,232,196,152,61,41,219,58,234,157,194,140,33,214,95,111,250,84,165,91,47,231,231,128,181,249,159,194,111,253,198,187,21,61,187,114,213,170,244,233,157,157,166,113,19,10,245,131,65,203,158,44,22,0,221,62,173,235,11,246,178,88,62,255,0,220,249,129,155,177,199,128,25,189,124,199,230,105,254,143,155,141,253,149,223,6,217,134,99,217,255,2,104,252,229,
+
diff --git a/uppsrc/ide/app.tpp/esc$en-us.tpp b/uppsrc/ide/app.tpp/esc$en-us.tpp
new file mode 100644
index 000000000..9ae980bbc
--- /dev/null
+++ b/uppsrc/ide/app.tpp/esc$en-us.tpp
@@ -0,0 +1,23 @@
+TITLE("Esc scripting language")
+COMPRESSED
+120,156,173,59,139,146,218,70,182,191,210,153,108,98,176,129,65,192,188,192,201,58,59,113,238,78,85,226,164,226,36,187,85,148,54,18,162,1,173,133,68,212,210,12,115,237,220,111,191,231,209,221,106,73,48,158,241,174,147,170,209,163,207,163,207,251,156,22,115,241,151,191,12,123,195,207,135,31,249,55,253,86,174,194,50,41,252,249,226,114,60,123,254,194,59,27,2,164,135,144,23,151,231,19,111,114,49,153,156,141,198,23,103,147,201,104,56,153,120,30,92,123,103,23,231,23,23,211,34,46,18,9,112,222,120,60,11,25,216,187,0,224,17,0,143,189,177,55,244,206,71,0,62,26,142,135,163,137,55,58,243,46,47,39,222,197,217,229,248,234,252,124,170,202,133,134,79,198,35,111,86,140,38,231,179,235,87,103,51,15,16,140,123,227,207,71,195,171,225,232,252,226,106,50,242,38,231,240,159,55,190,186,242,198,151,151,195,179,9,176,232,141,167,81,182,4,224,247,191,255,249,197,235,55,253,95,223,138,185,26,206,158,255,124,41,94,171,72,168,40,143,119,69,156,174,69,
+18,166,235,50,92,203,47,125,124,47,244,31,92,19,43,161,226,237,46,145,7,86,139,56,45,100,186,148,75,177,202,114,33,183,11,185,92,226,251,56,21,191,38,69,188,13,11,25,188,8,94,136,112,183,75,226,40,44,226,44,85,131,58,137,155,2,41,20,247,59,153,72,165,122,226,54,76,74,41,178,60,150,128,122,89,81,186,139,139,141,97,4,169,230,171,48,66,82,244,252,26,169,156,254,74,180,112,191,3,141,246,86,230,247,6,232,94,22,226,143,50,46,36,172,192,7,112,97,144,187,44,121,51,241,27,177,128,44,41,124,50,154,137,219,44,94,42,189,232,155,36,1,38,243,56,92,0,195,98,19,222,74,122,173,25,95,72,144,132,20,161,82,241,58,5,254,195,244,94,100,197,70,230,252,126,32,126,195,181,136,27,64,81,178,233,26,120,163,119,14,19,99,38,89,151,84,152,46,133,220,239,114,16,19,200,81,68,97,10,212,68,33,85,161,229,143,32,41,188,21,37,162,21,243,87,29,111,116,57,24,14,70,103,103,93,144,70,240,59,46,240,197,170,76,35,212,
+196,64,111,46,45,65,111,185,217,222,27,186,67,225,173,146,44,36,109,239,50,16,184,94,38,58,81,150,3,11,187,44,37,77,23,153,184,230,237,44,179,18,36,210,29,136,215,251,16,229,171,68,182,50,64,9,136,61,15,19,53,173,239,209,51,127,7,224,45,238,181,12,250,87,231,252,224,213,4,54,114,38,134,123,120,220,255,208,255,224,159,158,138,141,220,135,75,25,129,125,37,245,69,176,70,152,69,89,84,52,95,47,192,213,134,248,191,89,179,136,211,48,191,175,45,10,158,237,131,103,248,158,87,68,155,48,15,35,224,158,236,170,237,29,170,220,237,178,188,80,104,84,91,208,202,117,208,79,226,119,96,192,59,216,48,217,59,169,70,203,129,244,172,140,224,195,60,15,239,173,89,209,13,60,67,227,95,202,28,116,154,131,198,179,173,8,163,8,149,170,228,31,165,76,35,150,43,155,20,50,192,40,69,39,101,59,96,156,224,33,81,82,130,95,130,58,8,177,89,134,232,213,14,68,183,138,97,241,33,59,9,230,129,239,139,5,108,250,157,44,26,10,51,34,130,37,
+44,33,150,145,220,238,138,123,166,172,149,24,204,133,215,19,163,158,24,247,196,164,39,0,196,111,96,192,247,193,28,87,4,62,172,17,140,17,177,17,30,16,103,90,132,49,72,207,221,87,29,199,201,223,101,146,100,193,137,195,8,248,55,108,20,34,7,218,37,176,249,236,239,193,51,160,243,76,242,159,164,246,39,11,158,29,100,11,153,18,193,115,17,38,171,144,248,34,212,214,241,148,241,188,82,33,95,74,220,1,27,117,195,208,62,4,122,130,160,182,5,118,80,33,2,84,102,54,199,8,114,89,64,152,187,5,44,11,136,82,5,104,59,204,151,214,61,65,4,101,90,52,162,229,55,100,11,168,53,139,25,168,24,165,43,177,203,179,219,120,169,49,150,11,142,216,45,13,11,84,49,91,104,150,55,124,50,12,230,67,35,22,188,241,2,95,4,95,137,113,157,143,239,226,92,21,134,7,203,130,168,98,131,66,13,196,144,26,246,45,234,128,222,111,108,235,141,92,131,179,220,74,134,208,118,26,130,118,239,40,132,46,197,82,98,60,133,116,82,237,123,149,131,111,160,76,
+33,1,89,14,166,109,107,238,123,184,91,144,77,18,30,96,185,119,0,96,132,0,180,122,81,194,202,20,72,20,209,160,37,38,194,92,223,7,80,169,217,96,11,134,116,218,9,129,78,95,180,160,255,177,145,169,150,89,172,216,188,48,118,224,30,243,160,207,249,165,67,118,130,6,144,177,69,229,241,122,83,64,30,89,74,220,83,99,51,95,249,221,94,133,17,226,9,36,210,104,35,193,181,151,3,241,29,224,78,52,94,88,5,193,58,75,131,126,90,83,69,37,120,101,69,183,67,201,32,105,160,103,109,186,167,45,0,37,176,223,133,84,19,80,106,174,114,35,153,68,148,75,212,98,177,137,45,194,134,45,4,39,175,49,158,4,39,71,204,7,149,115,140,43,82,26,218,139,235,162,64,53,92,46,43,195,129,123,203,118,195,248,247,136,30,205,29,242,213,246,41,170,221,27,213,238,187,199,16,252,76,210,175,98,2,134,132,90,56,200,22,24,241,128,97,208,11,164,29,88,109,34,180,130,226,73,54,147,39,193,6,243,93,6,69,19,209,110,154,147,35,36,166,67,104,200,
+74,78,25,194,175,132,2,102,149,23,182,158,130,5,128,215,63,164,33,222,44,45,159,130,231,61,137,40,122,42,24,62,1,63,68,91,47,104,24,198,79,97,206,225,142,197,97,197,182,221,130,176,151,71,133,99,57,204,242,214,203,233,19,29,216,2,138,169,208,174,140,143,186,77,52,96,130,7,33,123,117,69,53,57,154,30,212,227,163,120,26,30,49,2,138,41,90,96,24,84,77,210,170,28,191,94,207,237,64,200,53,199,166,192,33,119,73,24,201,101,195,2,21,26,122,112,2,69,215,36,56,153,213,50,169,130,196,49,21,20,33,121,209,254,159,123,88,195,185,148,50,85,154,221,33,44,60,7,224,58,207,111,33,39,66,181,104,51,148,85,53,181,17,218,163,221,218,201,21,133,39,176,223,192,171,81,29,43,84,20,208,129,72,182,205,226,206,160,232,29,192,129,217,159,43,54,253,84,151,111,88,20,152,58,164,66,12,210,129,152,102,236,93,47,133,230,71,170,102,206,96,220,47,64,32,204,234,147,245,44,12,168,221,100,3,7,212,216,7,225,94,190,52,210,49,87,
+35,123,53,254,111,176,81,73,221,94,53,240,98,177,74,41,93,161,139,115,43,162,155,189,67,153,204,150,129,90,105,88,17,57,221,15,132,17,136,159,170,140,54,96,28,74,66,12,52,214,66,125,85,154,9,185,90,201,168,48,181,246,54,220,25,107,249,1,46,77,125,41,222,201,123,147,90,119,33,20,53,232,27,176,111,168,203,212,64,188,201,114,104,49,170,66,74,29,76,70,214,173,208,44,185,86,7,106,6,75,195,103,224,77,48,71,162,228,23,205,190,79,183,151,26,20,119,136,152,138,77,88,16,149,52,43,170,206,18,61,53,142,202,36,204,57,113,59,77,104,163,41,29,136,95,48,221,222,129,60,25,26,29,157,94,235,84,136,68,128,39,227,102,32,27,212,66,206,145,34,151,91,168,41,177,226,4,174,238,171,178,11,128,30,220,90,171,127,165,196,140,237,170,131,12,212,181,144,150,157,131,244,17,2,13,2,25,68,245,99,15,164,37,163,101,123,109,56,136,87,29,211,230,118,42,110,186,160,168,247,98,48,24,136,224,207,134,172,21,237,132,26,34,208,179,220,
+71,114,135,134,214,19,119,24,54,67,183,177,135,216,35,67,176,15,211,224,167,54,132,30,50,10,168,167,104,0,97,242,184,22,52,119,74,21,231,54,163,26,137,205,4,196,71,42,214,140,252,56,223,214,45,166,90,133,81,180,174,8,99,224,92,65,171,204,154,166,174,188,112,248,1,137,2,74,234,176,8,33,211,230,101,84,148,57,90,251,47,25,160,122,167,107,179,127,103,11,33,67,21,203,188,103,229,3,110,59,128,190,49,1,199,85,247,224,62,196,129,110,128,91,201,97,207,75,43,158,159,88,78,5,39,4,31,156,184,251,110,237,211,84,150,104,57,180,219,69,187,191,13,222,7,127,82,67,219,114,70,122,99,27,88,45,71,122,14,169,9,219,191,224,100,234,65,102,13,78,22,178,192,155,17,220,140,134,211,224,100,50,132,250,148,205,137,215,143,40,57,64,89,0,57,109,200,47,17,243,182,206,162,137,58,78,55,169,227,83,18,110,23,203,208,132,168,239,249,14,83,11,89,60,244,45,123,25,149,5,206,156,40,144,242,144,139,151,185,189,125,12,110,149,45,203,
+232,88,115,255,202,175,38,26,77,97,188,130,226,21,183,2,109,105,153,167,188,163,253,236,128,211,152,16,146,56,228,209,194,204,84,172,165,92,168,10,87,49,129,132,182,189,61,56,89,152,174,178,140,234,133,163,188,232,18,130,16,194,158,215,73,182,0,203,180,61,51,192,215,185,189,89,25,54,195,124,93,114,221,141,109,178,4,17,153,22,165,33,163,47,29,25,145,31,59,53,109,156,238,202,34,232,103,101,1,127,43,148,29,158,199,152,123,163,139,29,181,143,201,125,183,81,201,206,159,215,40,98,104,242,195,194,109,102,185,252,210,216,147,24,187,26,78,157,86,198,169,157,49,84,84,11,178,127,109,50,3,113,147,114,234,192,4,217,195,30,40,70,25,129,184,32,117,132,91,9,219,99,70,161,117,194,24,1,118,57,199,241,203,250,214,175,200,32,47,56,221,163,116,220,168,103,166,170,220,106,109,193,22,72,95,84,18,194,10,136,145,157,152,59,156,245,109,23,31,115,213,179,190,13,230,113,224,183,173,234,167,138,37,116,20,202,96,75,158,184,27,251,86,18,249,46,
+120,184,209,106,116,27,214,60,93,64,94,212,150,68,60,29,77,2,38,236,37,241,74,218,144,23,38,192,74,202,141,48,236,101,139,114,176,70,198,214,76,151,96,75,225,109,24,39,40,171,6,7,159,163,49,63,228,82,222,44,246,206,134,179,31,175,112,226,108,230,201,212,188,66,148,144,251,66,213,249,252,205,106,30,4,69,181,1,6,130,85,134,118,33,174,65,235,113,26,197,52,119,237,160,82,81,233,32,50,200,164,184,137,30,247,84,108,239,97,178,219,132,16,209,226,200,25,111,66,38,110,200,244,119,223,182,210,38,110,29,130,84,173,17,138,6,212,115,229,166,241,35,215,203,152,170,128,50,86,27,44,198,55,185,212,243,118,148,115,53,92,55,130,48,177,172,225,54,76,166,241,116,234,120,239,225,241,37,224,55,3,195,36,139,26,51,226,129,243,54,78,113,216,18,201,122,136,114,22,112,244,169,111,239,123,68,233,236,193,153,184,70,232,160,198,138,122,38,118,53,150,2,239,88,247,108,51,140,150,73,21,218,20,250,51,243,227,128,84,45,136,206,19,78,194,233,
+64,209,160,156,201,217,109,205,128,186,40,106,92,125,183,201,148,172,199,242,24,205,235,54,123,39,151,61,26,70,112,89,6,126,80,229,21,158,156,55,52,255,153,143,207,151,199,70,139,192,192,128,157,113,230,60,121,3,26,214,158,202,62,186,199,99,28,138,245,77,181,209,218,78,119,86,77,124,25,165,46,132,60,135,144,87,167,212,194,241,25,45,154,57,120,60,7,209,225,8,177,203,179,53,68,169,173,204,131,103,170,30,47,104,72,104,202,71,221,167,146,253,70,16,70,80,94,218,148,177,111,185,227,49,31,200,215,73,162,84,86,39,53,219,33,235,214,175,137,177,194,132,118,116,254,184,232,89,3,165,149,218,156,172,207,116,104,228,12,128,116,156,208,37,235,194,182,194,206,172,27,218,193,18,7,194,149,190,51,91,167,62,4,204,118,45,11,203,42,198,67,102,21,242,5,130,57,249,98,133,131,225,30,230,175,20,56,192,153,98,5,6,85,103,151,55,106,25,215,8,132,95,219,52,132,87,48,253,123,66,0,129,2,188,192,162,209,8,244,102,13,253,129,248,113,133,
+243,143,28,19,221,163,195,4,152,53,99,119,38,133,149,187,104,65,30,174,83,180,176,220,83,16,144,71,98,11,18,218,148,188,69,69,175,180,172,192,145,236,182,233,53,215,33,168,79,135,132,7,1,178,94,28,90,59,60,197,237,210,60,199,61,140,168,13,117,178,117,204,22,132,1,160,71,61,68,79,252,175,204,51,83,46,160,36,208,233,179,92,55,216,148,16,104,133,29,199,85,193,196,95,65,77,45,129,106,207,61,195,100,154,62,116,14,230,224,244,212,86,91,169,78,72,116,52,136,250,68,83,136,163,119,224,45,88,174,45,227,91,106,239,237,96,135,200,83,15,6,49,9,115,88,150,199,197,125,79,63,207,118,219,12,74,31,156,165,210,73,43,97,133,197,155,120,189,193,174,208,172,119,116,36,222,191,159,76,206,47,167,103,103,227,209,198,155,189,234,140,188,243,46,157,121,139,31,53,85,127,58,229,7,215,217,150,118,12,15,254,245,106,196,7,227,215,96,40,84,182,251,193,28,175,32,134,250,208,207,25,16,219,114,8,168,171,230,252,122,96,222,158,94,35,32,
+66,13,124,238,147,12,216,91,220,93,72,131,15,70,29,156,192,37,175,193,14,199,162,208,244,73,55,154,3,154,130,187,60,240,129,158,153,34,3,31,187,76,113,53,50,55,171,31,194,199,195,213,30,61,231,41,112,11,55,207,108,237,88,150,183,170,135,178,7,199,199,31,167,55,197,75,40,110,143,17,115,207,202,12,49,40,215,8,132,14,75,142,80,232,185,219,96,51,104,172,152,30,220,168,163,17,179,16,122,187,121,181,210,84,45,31,223,217,17,186,142,172,31,166,91,201,182,57,84,30,52,169,115,12,244,59,76,103,173,252,174,69,124,67,9,155,16,235,85,142,115,201,66,235,141,128,6,78,87,68,29,188,57,39,212,141,7,152,104,143,162,196,66,70,25,215,154,58,110,225,188,198,33,192,77,41,90,94,135,7,95,49,70,240,219,56,4,102,193,7,96,37,150,26,62,213,150,207,129,139,100,229,119,93,111,97,60,184,153,142,143,156,225,21,84,17,194,55,4,31,216,93,143,11,17,120,96,217,243,81,176,53,94,245,38,255,35,62,65,244,244,164,98,133,9,224,
+130,98,60,62,245,206,204,118,144,125,172,93,252,36,232,87,227,227,234,85,63,232,87,175,28,124,81,206,134,127,186,148,230,210,126,56,161,103,76,68,108,216,164,213,247,27,184,126,165,162,108,27,167,165,114,229,76,139,255,175,185,248,111,49,116,178,119,177,50,31,196,208,73,79,3,234,51,159,200,91,152,239,117,134,129,98,100,0,245,22,149,50,28,15,109,214,80,130,178,70,79,12,57,105,32,133,102,124,168,164,128,66,169,185,143,243,10,69,105,8,255,4,137,32,232,199,70,86,130,14,168,224,137,21,153,251,181,137,43,180,154,134,200,177,144,10,54,98,126,67,71,124,107,223,178,123,26,250,63,83,7,231,248,45,173,243,121,246,15,217,23,109,136,217,214,163,255,166,194,26,216,27,186,248,1,250,220,216,126,35,229,106,193,129,59,109,129,125,11,249,84,29,7,248,162,77,39,91,150,73,246,160,96,94,52,183,126,237,30,156,216,253,63,188,195,23,45,202,223,232,241,195,17,86,33,196,55,33,222,150,139,2,251,56,13,84,103,24,116,92,241,252,242,229,163,120,
+134,154,37,163,8,162,97,33,134,220,99,10,166,222,178,122,12,184,170,243,49,176,107,5,186,121,104,179,72,189,201,250,38,94,65,189,44,87,197,145,237,126,253,245,17,24,58,4,105,111,215,37,247,144,225,126,253,208,203,151,208,16,61,4,91,189,118,75,164,29,84,230,10,66,39,39,16,253,190,173,125,71,27,90,25,150,70,245,234,235,227,175,136,185,163,112,246,229,113,206,92,179,172,201,142,244,200,70,246,21,226,169,71,180,215,127,148,97,2,53,100,107,67,21,216,103,109,168,155,84,186,112,199,116,21,124,217,146,232,223,184,113,134,66,252,152,39,252,235,24,204,62,203,143,193,124,56,6,83,7,113,68,241,37,242,118,56,184,35,111,88,34,80,47,87,141,4,116,88,87,80,20,164,203,234,49,246,165,18,239,48,14,246,196,191,75,128,81,239,226,221,78,46,143,144,254,128,236,30,38,13,236,30,160,140,173,198,127,70,152,82,203,95,125,231,102,170,111,220,144,97,7,164,85,131,5,157,101,10,157,104,42,177,108,64,129,54,123,47,203,65,173,176,209,209,67,
+91,93,115,183,60,66,55,249,182,102,117,181,184,70,67,211,134,221,219,2,178,90,139,20,170,107,125,250,234,55,248,169,69,231,3,158,94,199,107,14,188,191,114,111,94,24,239,127,0,117,255,211,80,247,31,129,250,249,167,161,126,254,113,212,167,159,132,249,244,227,136,191,248,36,196,95,84,136,255,108,12,171,245,136,224,109,1,22,71,133,98,189,243,61,27,66,231,59,185,106,118,190,118,249,71,90,223,89,21,21,233,68,76,25,184,102,253,86,57,129,239,192,56,78,115,83,224,196,72,29,240,14,192,16,188,23,186,57,210,92,205,244,96,190,22,220,233,144,178,205,129,46,76,227,85,199,143,140,199,114,223,224,171,3,219,172,124,250,211,80,213,42,120,9,1,240,209,100,184,253,106,208,186,219,196,137,124,12,231,223,103,217,110,80,41,142,134,69,50,199,209,155,25,245,96,99,206,231,215,212,181,106,132,190,137,151,205,93,46,179,214,174,64,21,204,15,119,200,6,67,247,113,76,100,102,240,72,179,62,254,74,136,107,225,39,177,7,76,224,97,17,79,58,226,106,48,
+97,0,248,222,22,254,126,183,166,145,254,135,3,178,211,30,102,62,14,152,107,204,51,243,64,111,186,182,103,48,74,243,186,255,97,94,51,206,218,243,138,17,251,188,178,91,103,47,38,3,248,116,172,102,199,2,79,231,158,16,186,248,248,128,173,246,232,165,158,27,216,42,168,107,153,195,127,238,90,108,170,28,38,234,60,180,71,30,71,183,131,99,172,71,108,230,6,191,251,47,248,140,39,43,215,27,51,1,235,57,95,162,208,49,133,59,255,33,199,105,126,211,162,191,160,112,247,226,218,208,34,151,225,187,42,22,93,135,165,194,143,67,247,113,97,38,206,169,204,105,154,152,128,81,99,167,175,128,76,180,57,30,22,248,125,199,183,137,252,160,159,254,16,194,34,238,49,180,128,240,43,160,36,209,231,111,54,78,227,92,2,71,159,122,15,21,162,30,13,154,161,99,199,185,42,159,1,19,104,125,50,170,191,213,3,182,233,185,57,25,229,1,187,253,10,10,247,171,10,165,191,152,214,75,148,115,32,12,203,101,76,147,220,45,242,77,7,19,8,231,2,48,142,30,4,12,
+73,53,22,174,114,37,77,0,40,15,93,211,84,134,203,2,197,247,238,122,141,183,90,167,127,72,101,20,208,92,255,57,226,166,121,140,51,230,170,14,111,205,74,80,210,55,54,151,86,35,28,62,72,154,183,225,102,46,137,193,167,208,24,60,145,200,244,83,136,76,31,67,164,86,21,120,179,49,134,104,254,241,64,18,47,114,253,139,22,91,21,140,38,23,87,211,139,179,145,215,168,10,190,211,39,139,31,41,10,240,139,42,174,71,104,27,123,39,63,152,161,136,135,134,56,199,119,116,32,174,203,151,163,19,32,196,72,113,234,209,8,245,39,230,15,224,131,160,242,104,108,52,223,124,0,23,125,63,246,56,100,124,194,114,12,23,134,228,231,182,76,108,227,210,193,192,12,142,114,44,121,232,24,234,14,116,169,232,88,198,197,87,100,193,239,170,200,193,31,143,112,167,249,10,205,183,168,118,38,71,31,145,19,100,245,172,62,105,210,232,143,40,26,10,156,91,153,83,100,209,168,59,140,174,107,226,50,3,214,226,4,167,164,6,166,27,22,158,240,173,240,114,45,140,161,153,
+184,195,146,125,221,142,204,18,175,181,36,53,166,97,150,84,159,197,184,63,144,161,115,208,218,39,44,14,6,50,135,3,240,213,71,152,4,78,103,229,7,50,83,237,240,3,115,89,199,230,199,150,194,89,118,252,49,163,50,7,240,29,58,160,165,159,77,170,42,226,135,252,195,177,249,115,77,197,119,190,28,176,214,70,191,19,73,237,7,111,181,161,53,131,61,134,25,125,170,247,72,118,144,245,39,51,131,63,101,235,180,89,208,191,112,211,66,7,73,243,79,84,134,131,193,120,116,113,126,81,195,128,31,133,43,217,113,106,169,54,58,94,179,172,198,65,181,41,126,150,23,15,130,43,250,142,241,48,48,9,229,163,208,188,236,208,15,191,14,34,189,81,223,66,25,240,128,138,40,216,160,82,236,207,225,130,147,101,120,31,156,224,55,137,91,120,182,9,78,40,121,7,39,247,50,204,225,6,181,115,52,32,221,168,95,226,237,83,233,241,216,69,147,132,58,165,144,124,189,201,202,156,175,30,230,104,43,233,51,160,163,76,253,143,44,222,222,51,99,109,134,162,50,207,233,27,
+194,152,109,208,58,225,127,141,175,118,143,237,255,63,157,39,25,44,
+
diff --git a/uppsrc/ide/app.tpp/index$en-us.tpp b/uppsrc/ide/app.tpp/index$en-us.tpp
new file mode 100644
index 000000000..6fa00a9c8
--- /dev/null
+++ b/uppsrc/ide/app.tpp/index$en-us.tpp
@@ -0,0 +1,27 @@
+TITLE("TheIde help index")
+COMPRESSED
+120,156,149,120,249,83,162,105,182,230,191,194,68,214,237,152,169,182,170,88,21,51,227,70,244,212,210,125,251,222,233,154,142,94,226,70,76,69,213,164,149,73,87,58,109,106,142,154,93,183,234,198,237,112,3,23,192,5,21,65,20,16,4,100,71,217,119,21,5,81,1,145,69,65,54,1,17,4,65,64,69,65,100,62,50,179,171,178,102,126,200,30,8,248,190,247,245,60,231,57,231,57,231,188,159,193,23,160,247,222,3,55,128,31,128,223,241,122,248,41,234,79,45,47,219,186,191,252,162,13,138,68,62,106,109,2,195,31,181,64,154,30,253,247,230,71,127,253,235,95,63,108,110,134,62,2,60,65,0,79,16,48,28,6,129,66,32,112,48,24,14,109,130,32,154,193,205,8,36,4,9,134,53,193,161,136,38,48,226,225,139,150,206,150,231,95,126,209,130,132,61,122,255,119,141,0,10,10,160,96,16,24,4,12,105,132,194,1,43,48,12,12,133,67,160,8,8,18,9,135,52,33,144,176,230,198,198,135,79,90,94,116,183,118,180,127,249,197,215,117,28,128,130,53,32,30,
+128,155,144,141,112,8,128,129,35,160,176,38,4,28,192,194,225,16,8,112,15,65,52,53,54,53,61,236,110,237,110,67,1,24,72,99,211,163,22,56,244,209,39,0,16,222,208,248,0,8,14,218,4,32,225,80,120,35,28,134,132,194,32,72,40,180,177,25,6,111,134,3,81,67,160,15,91,187,81,64,140,95,3,144,58,12,64,33,0,58,56,2,14,129,1,98,192,155,16,48,192,170,9,184,194,193,205,16,40,192,137,4,35,16,0,29,234,223,254,166,80,93,28,0,214,8,144,65,155,16,117,99,36,28,9,129,53,33,161,112,104,35,20,160,7,55,1,25,214,185,17,15,159,162,186,158,0,48,24,20,242,168,27,8,232,209,39,191,64,60,130,0,224,38,64,24,40,184,25,12,109,108,106,6,248,128,80,129,108,97,205,205,16,24,18,224,131,67,16,96,8,236,225,147,142,167,245,12,161,8,48,172,78,136,4,48,141,128,227,87,122,32,26,33,64,184,80,24,18,96,108,130,192,96,192,55,2,142,108,122,216,133,170,23,161,187,163,243,203,47,222,255,197,127,6,127,
+8,254,16,138,64,252,23,0,221,220,0,1,63,64,194,224,48,24,188,177,25,14,1,195,0,22,192,7,188,46,86,35,24,40,35,4,1,69,62,252,186,165,11,160,236,134,215,85,253,228,231,16,72,83,189,244,224,58,20,16,30,134,68,192,0,250,70,224,11,168,41,144,35,12,80,7,218,12,71,194,96,72,240,195,39,109,45,93,93,111,73,244,126,61,79,8,164,1,2,121,208,84,87,22,1,131,194,155,235,250,192,160,128,196,208,70,68,51,4,208,24,209,8,7,67,31,118,162,254,247,203,214,78,212,115,84,59,32,114,43,192,254,232,111,245,121,211,133,245,173,186,59,104,3,4,10,244,33,162,177,17,92,87,12,1,52,3,20,134,0,36,7,67,144,112,32,32,224,13,148,184,251,77,35,190,106,142,122,99,64,96,13,16,216,131,102,40,28,6,196,209,12,135,3,26,0,120,72,51,4,2,1,35,129,55,144,23,160,204,171,214,128,0,253,251,166,157,32,240,6,8,252,65,19,208,183,64,133,154,225,117,210,102,88,93,56,40,160,59,180,17,140,0,10,0,125,
+141,130,214,229,134,190,7,8,14,129,34,235,159,186,228,16,68,3,4,241,0,6,196,5,65,32,128,92,97,128,196,80,36,144,47,2,208,28,246,170,167,33,77,200,135,159,163,190,237,250,180,165,27,245,166,79,222,255,228,189,87,170,55,54,64,26,31,128,235,104,4,178,25,40,27,4,94,87,12,6,135,55,67,155,97,48,4,180,25,1,107,4,3,202,117,189,158,221,58,180,62,64,175,134,239,141,139,166,6,72,19,48,73,64,118,8,4,144,239,43,16,144,107,19,164,30,6,20,217,220,88,207,251,141,139,199,31,180,181,182,215,99,0,186,225,209,235,6,120,255,135,14,64,54,192,31,32,145,141,96,88,51,160,3,144,62,24,1,52,55,48,252,72,160,176,64,93,161,64,231,215,167,255,201,159,91,190,65,61,254,224,205,104,254,251,255,252,143,127,248,236,243,15,254,248,123,208,23,93,224,71,255,248,254,71,192,145,240,135,103,168,95,63,69,129,158,161,218,94,252,236,203,250,54,232,245,165,13,112,241,232,171,238,142,23,173,79,30,63,124,252,209,227,143,90,159,
+162,30,127,212,242,226,197,227,143,126,133,234,238,110,109,255,230,247,221,45,157,221,168,167,143,223,67,181,63,254,224,101,215,87,160,55,251,160,174,215,127,0,125,219,218,253,236,149,255,79,63,123,167,207,223,190,14,181,235,191,118,117,161,158,127,221,214,10,220,181,63,253,28,213,213,221,245,163,255,191,217,52,128,126,180,2,181,180,63,5,189,178,123,39,197,39,29,237,127,106,253,230,101,39,16,226,255,203,246,35,203,91,102,63,48,190,98,249,209,248,157,84,31,183,181,118,127,255,163,203,143,255,219,175,255,240,63,222,9,250,101,107,219,219,113,212,151,160,238,239,94,252,29,116,255,130,250,238,45,96,125,245,110,178,182,150,111,222,194,124,252,178,181,237,41,232,79,245,205,119,66,255,240,106,243,7,232,235,229,207,31,255,252,157,64,64,192,214,174,238,31,145,111,214,127,15,244,121,203,147,206,142,183,226,253,205,171,245,223,219,85,127,64,61,127,209,6,204,243,91,14,254,216,214,221,250,28,216,170,179,131,126,219,217,241,191,80,79,186,65,63,216,189,211,241,147,
+231,79,235,195,249,150,10,175,218,28,244,164,227,249,115,160,87,94,143,46,232,241,207,64,47,159,255,249,157,206,126,253,164,163,253,211,183,131,251,245,243,54,16,240,156,106,253,166,29,213,249,255,31,202,187,7,1,144,174,235,147,142,231,47,94,99,190,249,26,144,163,171,222,238,111,146,104,1,250,29,244,202,8,244,41,234,47,168,182,142,23,245,199,0,80,232,142,182,159,28,17,111,46,239,195,127,170,230,211,142,246,142,206,55,18,126,4,1,156,182,180,255,25,244,93,199,203,255,244,83,240,23,255,0,6,127,0,6,191,255,213,179,238,238,23,175,67,252,246,219,111,31,127,248,23,212,55,45,79,158,161,186,186,30,127,8,168,249,21,232,135,245,151,111,16,160,6,208,167,45,237,173,168,54,208,63,163,186,76,154,46,208,111,77,220,78,212,247,64,15,119,126,211,1,28,14,223,161,58,158,61,3,174,191,105,233,238,6,125,246,61,170,173,173,1,244,79,168,206,175,81,157,221,117,96,27,170,179,1,244,171,150,206,206,239,64,159,253,5,213,217,210,249,180,1,244,
+207,45,223,129,254,165,243,149,229,243,142,175,129,193,123,246,178,189,187,110,247,155,214,39,207,90,0,166,143,191,127,10,132,209,0,250,29,234,251,22,208,47,91,186,91,158,181,182,181,60,3,253,254,89,203,179,6,96,224,234,7,221,191,182,182,181,181,2,180,31,119,182,182,180,131,126,7,0,129,115,170,13,245,111,160,207,91,159,116,180,117,117,180,3,52,168,22,64,239,95,118,182,180,155,56,29,173,93,160,95,253,241,147,127,250,236,243,223,215,243,233,252,174,13,244,175,64,44,168,206,47,127,34,19,244,167,218,190,120,211,169,0,184,235,69,71,123,87,71,39,112,206,126,253,221,107,219,127,252,191,165,124,2,148,173,243,229,115,224,230,251,175,64,191,248,5,224,230,27,212,67,224,1,141,248,25,240,111,82,95,255,93,143,160,231,135,215,205,204,220,249,156,113,232,244,32,52,109,57,218,60,95,148,104,241,135,66,147,100,154,187,138,174,164,55,249,231,50,58,142,145,66,11,149,78,225,154,72,66,39,174,49,200,54,5,182,15,173,82,244,178,47,220,2,226,58,
+125,111,103,86,62,180,178,53,146,151,44,72,168,9,83,37,125,49,95,204,85,138,148,209,171,104,198,92,82,227,244,198,91,99,37,171,173,229,12,167,129,156,254,84,87,10,251,124,161,235,149,153,152,62,115,34,174,248,118,12,245,5,112,111,16,211,108,133,76,204,49,63,94,187,75,155,56,181,114,141,167,171,94,48,9,114,205,189,107,62,176,19,226,139,164,83,60,236,25,139,200,76,168,67,43,204,218,168,152,214,219,135,23,71,112,198,251,26,141,83,187,77,215,156,180,80,181,120,160,171,81,89,162,3,165,39,48,56,189,122,19,190,12,139,75,43,51,252,233,189,251,82,217,30,30,217,23,135,175,107,105,15,237,78,100,61,159,169,21,56,78,67,149,18,17,27,171,155,185,145,201,90,79,205,114,31,10,77,143,236,223,13,96,131,123,33,99,57,49,150,187,79,111,226,43,98,125,134,30,222,51,223,7,197,23,233,91,73,174,188,10,132,237,45,245,42,103,206,141,69,79,173,162,52,22,152,177,92,254,110,229,188,210,107,20,225,167,24,110,229,86,106,131,30,92,227,
+238,163,207,138,123,85,143,130,214,95,115,137,77,101,55,118,240,142,48,175,216,26,187,222,178,149,54,46,196,197,190,43,241,106,46,92,222,47,141,56,208,230,56,171,39,72,194,156,47,179,176,44,15,103,209,16,118,79,107,236,163,244,251,123,236,245,149,218,32,244,134,183,253,198,12,86,68,72,185,138,158,141,177,219,200,169,94,57,93,186,175,241,11,206,179,178,109,189,214,207,204,26,3,232,109,87,207,118,88,133,62,223,234,213,170,34,129,218,78,207,204,29,63,86,25,91,53,146,14,50,61,70,146,184,198,247,81,8,20,106,216,51,50,52,34,158,90,119,144,214,173,133,5,157,136,136,171,85,143,204,7,134,219,243,25,111,58,30,27,164,89,120,126,5,45,124,231,243,136,99,165,251,209,219,25,161,132,158,38,229,185,145,157,51,254,252,186,218,140,239,63,91,168,26,69,134,194,21,109,76,62,189,19,49,202,3,158,211,26,219,82,186,117,198,54,121,120,139,195,19,19,220,198,172,248,64,175,251,112,22,187,75,171,94,20,211,83,170,193,51,141,252,44,139,43,89,
+178,88,175,36,137,149,11,78,226,107,185,126,255,69,21,59,200,61,147,251,134,84,156,9,205,33,233,206,193,88,116,95,105,248,70,175,158,94,232,19,171,174,142,2,120,236,192,76,124,143,139,25,57,232,71,23,113,30,242,33,182,104,43,107,214,245,188,152,34,200,141,85,177,222,184,156,185,153,38,46,69,226,107,98,204,13,214,145,232,93,200,150,83,209,18,109,116,255,64,237,225,143,175,156,39,179,119,19,130,3,127,216,180,86,59,161,28,240,36,97,54,125,21,215,119,180,80,9,56,199,166,87,138,67,222,121,87,78,18,187,91,45,244,99,7,69,19,22,167,180,143,186,202,12,215,210,242,34,103,144,88,99,10,52,197,169,171,27,221,209,90,249,236,138,148,235,25,187,192,196,221,244,244,145,5,135,31,235,75,80,28,179,100,49,213,206,144,14,150,116,78,250,252,53,118,44,81,24,56,30,218,30,225,79,156,93,161,101,229,216,33,126,247,196,53,157,147,158,44,74,132,49,124,57,237,25,37,143,120,39,105,231,42,245,224,165,131,25,214,133,202,17,70,113,213,112,
+32,210,4,142,8,197,213,147,99,71,206,76,93,69,159,166,100,196,249,73,11,95,204,163,92,18,205,218,83,188,195,123,117,185,152,229,111,219,77,36,169,4,203,75,140,227,50,43,251,121,13,161,135,136,95,148,165,210,130,35,105,223,110,101,174,108,150,250,46,75,87,21,127,46,85,21,114,35,69,42,47,126,112,181,174,216,21,178,201,215,184,141,74,64,173,232,167,30,187,82,71,98,42,154,179,126,176,123,78,211,96,216,235,113,18,107,237,116,66,61,45,84,101,135,134,55,175,183,175,216,189,222,204,94,175,23,111,166,158,81,110,215,245,155,69,142,30,107,23,207,42,68,194,92,73,17,31,145,77,238,176,11,59,113,11,115,12,159,113,120,77,122,209,246,117,138,121,229,147,152,175,114,26,153,68,107,86,143,184,99,177,179,76,53,113,205,59,155,56,147,113,241,124,131,113,29,55,181,127,34,205,184,212,179,44,223,22,6,168,138,118,222,45,20,220,121,130,135,74,135,115,244,28,112,102,54,92,248,133,229,68,154,123,69,174,50,194,137,201,229,11,122,202,17,77,243,
+150,5,151,84,234,233,152,39,73,209,108,50,24,238,254,152,188,220,119,230,142,212,204,183,145,124,114,99,70,27,244,203,189,199,187,234,136,120,56,157,94,222,89,78,146,183,75,87,222,173,68,236,232,140,168,161,145,216,118,234,209,144,109,54,118,219,215,155,33,94,38,124,171,87,94,177,79,20,225,242,122,23,20,216,165,21,159,29,61,81,208,72,87,175,202,103,222,253,131,165,240,246,250,106,33,55,203,181,233,71,118,89,34,217,164,252,100,14,111,76,75,51,204,253,115,139,40,31,162,153,156,46,217,254,14,198,194,247,44,82,7,121,11,73,137,101,77,115,88,14,29,156,109,149,245,179,90,127,237,56,61,232,58,235,241,121,72,204,235,1,46,58,181,123,155,167,140,148,143,194,43,66,159,192,195,231,98,117,249,97,158,225,84,48,151,62,118,237,136,180,250,141,229,16,78,227,237,27,238,9,202,179,20,215,73,136,200,153,210,171,9,74,65,223,70,130,58,160,219,192,216,162,113,89,41,118,145,143,207,245,96,168,182,109,19,163,159,163,99,236,133,11,189,145,220,158,
+253,166,138,206,220,202,120,156,172,87,106,232,47,114,163,39,44,110,192,54,118,52,217,219,63,39,186,202,97,48,254,227,220,202,164,162,23,125,198,147,2,154,24,241,49,146,105,170,111,95,149,153,193,109,83,43,7,87,70,17,37,38,31,31,76,99,113,217,52,113,139,154,198,145,56,61,201,164,132,137,118,79,92,95,104,226,86,185,34,214,99,25,51,199,142,217,84,108,24,207,89,148,199,136,36,180,98,106,39,174,156,154,185,99,136,100,132,155,45,191,102,71,102,232,197,56,173,209,164,218,63,98,239,75,209,172,187,182,116,110,128,161,11,175,107,22,181,61,61,226,229,184,33,51,195,53,171,156,147,62,54,195,164,33,101,229,103,211,187,210,201,51,86,95,111,180,71,71,172,106,68,83,110,156,201,51,185,167,23,198,47,120,49,39,109,87,185,160,167,162,107,27,206,188,245,126,112,195,194,169,120,147,94,231,242,54,35,121,239,209,58,15,7,7,198,129,7,207,73,222,225,17,82,86,25,171,102,51,230,118,47,235,49,115,207,76,124,249,228,78,143,119,255,230,48,137,
+31,136,150,70,113,2,236,154,149,18,241,149,48,107,59,75,151,243,170,129,99,201,218,41,61,152,225,9,173,101,230,22,155,97,204,7,198,71,18,147,22,251,112,31,126,44,196,84,12,242,8,21,234,140,95,182,35,241,83,180,41,102,140,200,145,108,17,180,12,203,146,111,169,186,121,64,222,101,103,105,1,181,164,184,106,62,72,236,50,244,162,232,93,47,41,234,49,133,211,162,203,187,201,155,56,142,60,60,48,24,90,48,102,66,227,20,245,244,9,46,196,173,12,229,176,251,60,174,139,186,48,227,205,76,227,87,150,151,249,181,24,155,90,25,31,103,95,105,10,171,156,196,24,85,189,187,146,52,243,143,134,48,88,105,228,216,59,176,16,85,238,145,250,150,46,214,98,246,252,137,133,181,105,247,98,69,113,142,132,53,182,225,152,58,188,136,241,138,59,199,232,192,201,161,212,121,66,176,31,151,7,205,189,114,243,49,126,216,89,163,227,11,34,252,185,98,131,172,210,105,221,116,195,141,41,119,190,81,97,74,247,232,60,74,220,178,26,243,103,57,54,85,68,218,99,41,
+173,50,214,9,148,192,214,212,202,81,255,253,250,225,54,211,237,205,208,172,84,107,220,65,216,189,54,177,216,56,155,132,86,117,203,85,139,85,73,45,185,199,143,237,203,103,53,3,197,57,213,44,233,128,228,26,180,29,11,54,139,78,203,240,66,238,120,110,104,234,14,123,177,124,43,163,166,138,62,146,140,226,177,58,102,103,10,178,116,193,178,67,61,44,30,222,205,29,238,111,41,151,15,14,195,253,250,139,125,89,255,217,57,141,80,180,246,154,3,231,163,155,7,85,185,95,69,198,13,233,244,11,122,67,111,142,204,207,107,18,25,22,1,111,27,77,107,170,110,186,137,105,222,60,209,134,204,135,171,84,107,229,198,39,84,27,79,3,203,61,156,37,185,126,240,62,170,54,120,98,7,116,155,251,28,239,197,103,231,87,14,124,177,225,75,252,172,208,22,226,122,184,124,241,213,148,60,207,87,45,109,135,112,150,89,62,238,164,199,105,83,121,149,43,225,140,46,158,167,170,173,104,135,219,183,141,231,158,170,69,248,139,169,187,100,136,51,90,96,10,172,147,187,61,167,154,
+25,14,157,90,24,231,46,115,6,134,36,187,92,79,159,20,61,91,178,27,120,19,254,209,219,149,13,183,206,192,137,237,103,48,243,17,158,171,82,203,148,201,139,74,12,70,63,108,155,170,80,77,193,192,40,155,183,230,218,247,172,25,132,152,229,5,76,108,125,35,91,114,156,222,22,20,9,229,80,49,31,49,244,187,23,78,189,129,197,57,19,46,91,208,104,3,220,114,130,154,87,168,150,7,228,7,198,221,220,118,230,78,135,94,236,27,243,97,18,182,187,145,96,106,247,248,56,31,118,77,237,251,67,101,30,9,61,118,106,17,56,76,251,146,28,86,130,83,232,198,150,136,23,214,12,139,84,186,226,83,166,198,181,9,5,75,179,56,149,146,175,237,42,142,151,47,166,41,241,219,232,192,146,254,148,109,59,144,112,214,60,59,105,245,194,172,245,176,160,102,89,15,7,136,218,251,195,107,155,103,47,175,212,171,109,218,112,90,113,102,146,212,184,151,44,217,140,160,168,59,79,247,223,19,76,139,115,145,40,213,156,150,206,50,167,122,28,172,171,177,67,171,41,110,95,25,
+188,246,179,3,216,126,18,126,77,193,25,61,231,196,214,252,215,113,45,161,48,205,143,207,241,199,54,216,202,69,211,237,82,185,95,150,99,250,209,179,58,59,217,45,156,152,206,208,23,150,157,36,5,139,158,33,226,170,74,235,90,111,113,101,179,16,19,248,195,185,252,34,253,202,176,177,47,144,238,22,238,229,230,197,168,220,122,231,45,74,88,39,58,1,249,86,108,114,103,20,24,73,185,71,105,241,173,251,8,215,22,75,198,50,182,26,84,73,153,222,252,225,92,138,58,76,154,167,105,170,27,58,142,138,235,218,12,24,228,7,75,187,243,145,224,152,200,172,149,222,245,40,78,146,106,180,150,73,137,200,9,135,50,54,126,179,160,220,198,97,101,213,179,208,228,197,5,153,43,204,174,175,7,111,4,238,66,193,127,166,8,178,55,54,87,253,215,70,121,33,96,205,120,175,39,18,122,86,58,103,242,172,16,77,116,55,83,191,153,14,238,196,163,177,254,116,84,179,169,189,86,175,250,37,250,240,230,210,40,105,86,174,196,91,138,206,2,97,210,187,44,205,147,83,138,9,
+82,238,140,58,61,81,228,169,20,201,172,112,137,173,157,71,223,216,141,215,209,162,157,64,60,160,169,105,46,29,131,183,133,78,92,36,243,43,108,155,114,49,176,166,89,112,87,28,178,254,155,253,1,244,44,35,123,53,90,52,221,41,47,122,212,123,125,44,234,117,210,182,211,239,96,174,246,196,3,164,187,20,41,124,192,34,206,25,61,147,190,200,124,148,232,154,150,198,214,110,93,242,56,110,166,196,51,207,58,25,92,204,166,131,109,187,29,170,248,40,17,243,221,120,70,174,40,23,100,3,193,81,187,227,174,124,184,56,185,185,160,159,80,208,212,87,169,181,115,26,201,34,220,208,244,27,39,113,119,126,193,170,58,231,181,111,122,5,236,254,210,148,192,18,180,72,105,4,199,90,53,58,80,188,159,186,204,113,102,210,27,236,51,235,214,233,172,31,125,231,73,10,102,21,65,17,122,160,28,218,158,85,113,118,204,37,129,153,233,163,92,4,194,89,206,162,159,186,195,163,81,38,44,182,19,67,244,154,206,148,43,120,102,247,113,156,106,201,164,251,139,11,252,53,141,51,
+88,38,206,59,88,219,99,252,120,89,134,153,41,206,145,151,19,187,170,65,118,69,107,243,132,100,179,235,206,61,81,36,66,22,228,100,58,13,9,157,82,162,245,210,98,37,111,29,76,30,11,46,239,77,190,169,75,205,244,98,176,188,97,158,75,233,166,165,195,39,129,25,5,229,112,111,158,205,146,89,227,91,170,27,51,167,154,117,70,15,87,215,74,34,180,78,227,41,142,94,164,172,184,212,156,68,228,59,76,241,115,161,222,75,82,102,156,162,24,138,28,75,8,78,197,80,126,228,112,214,209,75,218,202,184,15,229,220,173,235,128,135,57,126,184,75,201,28,69,217,46,188,251,132,67,212,239,38,153,202,211,184,53,17,116,175,44,210,214,72,46,11,179,152,12,97,178,126,41,195,228,9,204,199,135,241,220,181,75,252,198,198,202,169,107,55,177,121,194,54,158,171,23,42,154,42,85,226,155,184,101,70,39,69,195,241,113,125,72,84,138,78,90,201,113,190,101,189,48,190,146,177,109,219,208,147,34,151,107,130,125,60,234,143,72,67,236,36,81,137,227,175,31,174,96,110,
+66,201,253,152,66,214,147,31,157,11,170,7,184,66,110,138,96,87,201,108,167,145,242,28,37,191,76,174,150,184,146,108,100,207,190,206,187,178,147,204,33,215,228,16,85,30,188,179,200,101,33,235,173,244,116,150,231,84,213,92,39,147,129,137,43,108,124,9,199,21,158,229,138,91,251,56,46,243,58,164,212,241,242,99,57,249,32,215,176,79,183,41,169,78,106,133,143,167,159,218,253,179,214,196,217,1,254,248,226,18,163,75,216,163,65,172,140,54,187,75,27,32,19,133,238,158,177,45,50,101,122,228,122,200,156,86,247,149,136,184,144,151,118,203,196,102,147,218,29,143,223,147,62,13,166,111,40,114,42,63,82,148,123,8,64,231,224,138,178,16,75,161,184,168,236,48,18,90,219,116,218,141,113,136,70,99,91,98,91,49,122,127,187,141,65,59,132,91,133,171,109,75,220,64,224,76,95,103,6,102,233,27,69,131,118,52,234,117,197,249,139,25,247,70,122,197,207,246,141,44,214,200,65,118,86,52,200,14,135,67,4,118,113,141,68,150,101,78,247,149,184,105,81,52,191,51,
+24,156,147,246,149,48,225,192,138,104,208,97,23,28,83,167,171,220,17,210,208,238,245,174,101,87,67,212,171,250,84,123,89,206,56,61,82,229,214,39,199,74,231,162,205,37,135,169,152,82,44,187,57,41,159,27,207,37,47,11,136,1,67,200,127,116,91,81,247,225,116,65,19,134,48,122,148,118,233,179,21,242,138,120,92,49,65,13,29,179,179,194,226,84,52,226,60,190,29,72,207,23,39,246,20,123,11,188,211,136,81,64,198,109,74,114,110,146,188,112,52,32,182,123,178,204,97,155,202,163,86,11,151,214,52,62,207,184,147,107,9,7,11,41,215,76,173,215,182,161,219,91,159,95,192,250,238,92,197,137,17,19,203,187,213,167,180,175,220,111,168,36,214,241,193,188,190,234,117,146,114,154,89,202,118,105,154,151,224,174,47,44,216,197,236,9,60,222,164,216,101,120,23,229,201,136,172,176,227,239,193,170,37,154,16,99,226,74,41,89,49,178,100,169,248,2,173,42,26,13,168,240,179,230,124,47,131,156,86,18,149,102,58,37,217,227,195,250,78,246,106,75,235,6,180,221,
+194,12,234,34,125,118,51,181,87,51,150,28,33,87,72,12,60,145,149,136,158,76,83,200,185,45,123,110,149,189,104,97,157,69,52,231,5,33,154,187,205,17,229,135,153,218,29,140,14,79,164,41,56,59,231,190,1,250,180,103,142,177,162,100,120,146,57,30,217,182,188,205,172,114,3,38,221,130,103,146,200,82,246,210,68,234,208,42,193,30,34,135,46,89,51,69,221,104,28,83,196,16,104,46,249,217,206,220,224,204,94,122,217,118,173,90,201,59,82,22,124,84,103,50,244,18,5,194,50,253,2,189,153,141,4,23,150,111,12,188,43,143,181,192,96,48,146,241,139,109,151,101,198,30,211,142,230,51,183,169,115,174,126,94,139,67,11,230,79,252,252,138,189,39,234,170,168,226,231,248,193,219,121,213,92,36,85,136,186,165,147,222,73,238,158,204,95,75,28,198,55,70,25,150,1,140,214,232,60,199,5,18,236,185,81,198,185,0,77,157,31,115,184,104,201,181,92,24,43,173,206,69,47,216,202,140,78,92,157,51,211,215,221,154,49,41,95,120,108,219,42,167,29,51,7,167,
+74,203,214,140,74,230,11,58,133,100,237,181,53,30,10,238,177,125,184,180,248,58,58,60,192,217,25,59,62,166,137,114,151,246,121,218,41,39,31,237,183,79,103,68,71,219,41,194,226,245,146,166,96,54,47,163,241,214,197,4,129,237,200,223,80,68,253,151,18,73,16,63,82,11,173,56,253,169,130,226,54,179,48,201,239,191,220,223,204,166,178,133,40,101,46,199,78,103,25,197,131,216,129,77,137,17,79,227,43,116,41,195,24,62,34,46,184,148,30,171,122,120,138,78,195,151,146,120,182,141,226,78,225,169,34,35,117,220,142,79,80,98,215,236,9,113,241,38,154,99,223,222,179,46,253,247,102,202,149,127,38,156,25,83,145,13,85,99,32,194,150,56,212,54,150,135,122,68,163,93,222,120,111,249,65,249,236,8,79,115,42,79,81,124,199,121,70,148,162,11,221,79,69,44,76,249,228,2,65,134,14,187,174,53,218,164,35,182,115,26,158,28,113,77,176,178,190,211,125,57,41,79,22,137,221,99,103,9,156,224,98,225,50,117,159,146,222,212,212,24,121,242,104,242,100,99,
+70,205,62,55,28,213,114,107,131,156,124,140,48,179,49,90,20,230,92,114,171,254,62,83,91,52,79,179,71,143,253,247,199,253,119,101,107,254,64,203,150,143,205,141,45,167,133,222,190,73,23,70,53,188,116,78,63,119,28,221,96,226,52,241,72,255,200,128,105,137,220,119,41,172,217,20,50,198,249,209,65,142,48,65,213,6,252,55,100,185,174,90,185,238,167,221,228,111,28,34,150,191,55,84,61,34,245,158,30,149,92,181,181,194,156,225,176,118,88,77,87,124,59,161,107,199,171,95,113,196,7,132,208,125,255,197,165,153,240,229,255,1,92,49,248,73,
+
diff --git a/uppsrc/ide/app.tpp/install$en-us.tpp b/uppsrc/ide/app.tpp/install$en-us.tpp
new file mode 100644
index 000000000..16df65e91
--- /dev/null
+++ b/uppsrc/ide/app.tpp/install$en-us.tpp
@@ -0,0 +1,191 @@
+TITLE("Ultimate++ installation guide")
+COMPRESSED
+120,156,172,186,249,115,226,105,154,39,246,175,40,182,199,27,51,61,221,213,41,41,207,170,152,240,216,51,27,246,134,189,51,142,221,25,175,29,29,189,174,172,42,85,119,198,100,101,150,43,179,166,166,195,225,13,33,4,8,196,141,36,4,8,144,196,13,18,167,184,47,33,110,113,73,220,135,0,113,8,196,125,139,27,252,149,50,171,143,153,9,251,23,191,138,132,111,194,251,92,159,231,243,60,239,243,42,244,203,165,133,63,249,147,71,63,123,244,147,71,255,31,235,211,191,94,249,250,229,247,175,223,255,234,151,175,151,158,63,255,236,213,179,71,143,63,123,185,248,236,179,191,125,241,217,127,253,175,255,245,147,23,47,150,62,187,87,181,8,168,90,124,244,120,121,113,105,113,241,241,163,71,143,151,158,45,62,121,241,232,197,147,231,139,207,31,45,63,123,188,244,228,217,163,39,159,126,251,242,187,151,223,252,234,151,47,159,47,127,246,211,255,248,20,144,90,250,217,147,159,44,47,46,47,62,90,124,186,244,24,216,245,104,249,209,210,227,197,165,39,139,207,159,63,94,124,
+246,228,249,242,139,167,79,63,253,242,229,183,239,95,189,125,243,171,95,126,113,47,119,111,108,25,16,123,244,236,249,211,199,139,128,208,227,39,75,203,207,158,60,6,132,31,63,94,92,4,158,23,159,60,123,250,236,217,167,239,95,189,127,189,2,8,45,62,125,246,217,203,199,75,159,253,213,189,228,227,159,61,253,9,224,222,210,51,64,244,241,210,227,167,143,151,159,47,45,47,62,95,90,122,250,98,249,241,139,199,128,223,139,75,159,190,122,191,2,120,249,5,32,115,47,119,47,246,4,48,248,248,201,227,197,101,0,144,199,207,158,44,3,219,158,1,239,143,31,189,88,92,2,172,62,127,244,228,9,96,112,229,159,126,68,233,30,160,123,185,167,128,185,165,103,79,238,119,63,127,252,124,113,249,217,243,165,199,75,79,151,0,7,30,61,3,162,188,183,254,228,211,175,86,222,125,9,200,45,47,45,126,246,30,112,233,179,191,250,203,39,159,45,2,194,207,126,246,236,39,75,143,94,60,90,122,250,236,5,96,16,112,22,8,120,249,197,139,197,229,231,128,193,199,139,79,
+30,45,46,127,250,229,219,175,238,131,92,122,242,104,249,193,226,115,32,15,79,1,205,15,152,60,121,186,8,56,188,180,252,28,48,249,108,113,121,25,120,125,242,248,249,179,79,223,173,220,103,226,253,219,239,126,245,203,159,254,229,159,62,250,228,209,39,75,79,158,252,217,189,248,11,64,252,249,242,227,229,229,199,79,95,60,94,124,180,12,152,1,116,60,190,199,235,233,35,32,151,139,79,150,158,127,250,197,203,119,128,205,247,143,239,145,125,64,117,241,158,72,0,240,203,207,159,44,3,166,159,2,47,64,82,129,0,151,1,108,150,94,60,126,190,188,252,252,209,167,95,190,126,249,238,221,31,0,244,211,251,32,23,23,127,182,184,248,147,103,247,184,62,89,94,122,252,226,30,156,229,37,0,224,165,167,79,94,44,2,8,63,121,250,248,209,210,167,223,173,252,159,223,191,250,110,229,155,149,55,0,196,175,0,110,124,246,99,122,62,242,16,112,230,3,15,151,126,182,184,4,48,241,201,211,167,143,238,241,122,2,176,97,105,249,9,0,248,163,197,231,143,1,143,128,31,
+32,197,239,63,82,241,139,223,199,176,252,179,197,229,159,188,88,122,188,12,120,242,226,241,99,0,1,64,193,226,139,197,197,197,71,207,129,31,32,50,0,151,7,110,44,2,46,60,4,241,193,252,7,241,199,63,91,124,252,147,103,0,135,129,76,189,120,124,111,254,197,242,61,126,75,0,252,75,79,31,61,1,242,176,244,65,124,233,30,245,165,63,1,112,95,92,122,126,255,239,1,249,197,39,63,91,4,138,1,112,113,241,201,19,32,238,101,0,234,165,231,64,236,79,0,236,151,31,248,189,248,236,249,167,127,179,242,195,187,191,126,249,126,229,35,97,126,250,87,127,242,129,105,139,79,127,182,248,244,39,143,238,229,159,60,127,1,36,112,241,241,61,126,203,143,31,191,88,122,177,188,252,100,233,197,147,229,167,143,0,28,223,125,168,229,123,225,251,122,122,168,197,223,41,121,246,179,197,103,64,101,1,177,62,121,2,68,255,32,6,68,254,108,241,222,149,165,231,47,158,222,163,240,81,201,231,63,127,253,234,205,189,31,0,51,62,251,64,134,159,254,213,159,47,46,62,
+187,87,244,28,40,152,231,207,159,62,90,126,1,128,1,96,240,232,9,192,116,160,27,60,7,18,13,228,121,9,40,131,251,118,240,229,63,188,252,245,202,231,63,255,88,170,255,215,255,241,127,255,55,255,238,111,126,254,247,255,105,225,151,239,30,125,246,23,63,253,115,32,99,11,127,255,250,253,171,111,128,128,63,255,243,207,255,124,225,63,191,122,179,188,180,240,234,205,187,247,47,95,191,126,121,223,21,22,126,253,253,171,175,86,254,237,175,238,37,150,23,62,188,47,252,239,111,191,95,248,242,229,155,133,239,223,173,252,177,252,15,175,222,255,102,97,5,120,89,249,110,225,63,188,122,243,63,252,231,133,47,223,126,243,237,171,215,192,127,223,253,246,29,144,155,133,183,223,125,216,244,31,94,125,249,221,219,119,111,191,126,255,203,159,126,254,231,207,158,44,156,9,127,181,240,87,15,58,126,39,241,242,205,87,11,255,233,175,255,167,133,63,253,72,206,119,11,31,235,106,101,225,171,183,63,188,121,253,246,229,87,127,246,201,71,143,62,190,253,251,175,23,126,11,248,246,
+195,203,55,239,23,254,238,55,43,255,254,175,255,221,194,251,183,11,223,174,124,247,245,219,239,190,89,120,249,253,251,183,128,171,175,190,4,20,189,255,254,219,133,183,95,47,124,241,253,171,215,95,45,124,179,242,254,55,111,191,122,183,0,236,90,0,124,7,162,250,209,137,119,63,123,80,248,238,55,111,191,7,246,125,4,230,126,207,55,11,95,172,0,219,239,119,190,121,255,234,205,247,175,222,252,26,248,248,213,187,133,175,94,189,124,253,246,215,11,127,250,234,131,43,223,2,126,191,91,88,249,167,87,239,23,222,188,253,225,103,255,194,135,31,94,1,250,190,88,249,209,199,149,175,22,222,0,109,110,1,192,116,229,65,254,245,203,239,223,124,249,155,143,193,252,179,112,127,250,192,134,7,156,255,85,24,126,243,242,31,127,15,21,160,249,251,111,191,253,252,231,223,0,158,254,176,240,221,202,235,21,160,203,220,99,11,132,10,148,253,253,247,175,254,0,61,0,182,251,236,62,236,254,179,15,32,124,245,22,8,225,253,7,173,192,215,63,42,254,197,71,84,126,241,17,51,
+32,111,191,5,144,120,243,107,32,216,119,0,38,47,223,255,206,218,203,215,223,173,188,252,234,183,247,232,2,217,124,224,193,189,208,235,149,247,31,45,253,115,10,188,122,243,229,235,239,191,186,199,246,237,247,223,45,0,245,240,15,43,223,253,235,41,255,87,98,125,48,240,246,251,247,31,85,255,233,202,39,191,254,228,247,123,31,94,126,116,232,195,142,143,129,0,210,247,44,253,136,194,143,58,23,128,12,254,200,191,215,191,5,32,249,200,175,143,212,248,10,136,225,203,247,31,73,255,21,192,214,47,129,246,255,219,7,14,255,200,154,251,231,15,73,127,249,237,183,223,189,253,246,187,87,247,84,254,67,6,254,179,208,254,168,180,94,190,126,247,246,129,108,47,1,125,11,223,220,83,111,229,235,175,1,51,175,254,241,71,240,62,224,243,96,231,245,171,47,190,123,9,24,120,3,96,255,237,235,151,95,62,116,246,119,11,127,250,250,171,79,86,254,105,229,97,203,203,239,30,30,191,6,128,126,7,248,248,65,199,47,190,0,158,126,231,254,159,125,242,187,82,255,49,185,15,
+212,7,64,252,238,221,202,235,175,23,62,255,249,253,7,31,18,122,175,3,64,253,221,119,95,2,76,248,250,235,95,220,163,114,111,231,15,63,123,249,221,194,199,166,244,238,147,133,255,30,120,2,192,248,224,251,219,239,94,253,250,213,27,32,200,7,153,111,129,172,189,89,249,225,71,171,95,253,113,20,64,86,254,200,205,127,6,219,223,188,125,191,242,233,194,127,92,249,18,216,252,250,183,11,63,124,204,245,202,155,47,223,126,255,230,253,202,119,128,58,0,254,47,94,175,124,243,145,131,31,60,248,245,87,95,44,124,253,221,219,111,0,91,191,254,254,53,224,233,31,85,10,224,239,223,221,83,25,168,240,31,126,243,123,165,128,43,191,171,32,160,96,126,100,234,31,84,218,199,120,239,209,249,242,190,6,254,213,10,123,224,8,192,196,251,150,244,47,154,220,191,94,244,63,182,207,207,129,214,185,240,43,160,113,3,219,223,221,247,203,63,6,227,119,27,239,99,254,71,160,149,3,0,3,97,174,172,60,180,214,223,215,215,135,194,123,255,246,237,235,47,127,3,48,236,161,
+21,126,181,242,143,43,175,223,126,123,255,245,155,151,15,60,251,209,12,64,224,215,175,190,124,56,32,222,253,145,189,255,242,155,247,239,191,253,252,211,207,127,241,249,47,126,248,225,135,207,63,249,230,71,243,159,127,2,160,244,249,47,126,140,233,29,240,184,2,80,249,245,187,207,63,121,249,238,219,127,250,252,191,253,250,229,55,175,94,255,246,213,87,159,255,197,215,95,3,147,216,179,149,167,159,255,252,201,23,95,188,252,252,231,143,191,248,250,201,231,63,255,226,201,211,165,207,127,254,98,241,197,139,47,86,128,201,244,171,165,23,159,255,219,175,94,189,3,104,241,219,215,47,223,252,250,243,191,88,121,179,240,95,22,23,238,237,127,250,139,123,227,191,183,125,111,250,247,150,127,52,252,96,247,255,15,179,255,34,242,111,222,125,245,230,95,134,254,195,7,236,254,241,21,208,13,254,8,8,32,49,95,125,255,229,123,224,233,215,43,239,129,114,250,98,229,126,195,231,63,249,8,255,223,60,64,255,183,111,94,255,246,191,3,42,233,191,252,33,203,63,116,215,135,99,231,
+62,155,191,59,39,63,249,155,127,247,119,64,146,95,126,179,242,195,219,239,254,97,97,233,147,71,15,53,179,242,135,29,238,205,67,21,63,84,216,247,64,81,124,178,240,247,15,12,248,157,142,183,128,193,7,170,188,252,242,97,14,0,152,249,246,225,158,240,238,159,235,250,244,143,24,240,10,152,155,63,123,185,188,252,217,223,46,125,246,59,190,252,175,247,65,47,252,143,0,195,129,35,21,208,250,63,191,250,2,104,70,31,15,20,192,199,251,78,249,197,125,171,254,252,223,60,108,253,252,223,44,0,35,196,202,135,254,2,68,247,163,229,223,245,63,64,241,139,231,191,0,134,206,71,191,248,223,254,23,96,239,7,197,0,125,127,60,34,255,200,141,127,122,254,244,35,193,255,234,227,201,242,255,226,235,61,146,127,255,254,213,235,87,239,95,173,124,24,9,30,166,162,63,10,242,47,22,254,242,47,129,214,252,235,149,79,151,150,159,46,253,91,96,66,91,94,3,119,215,64,107,171,63,174,1,108,175,74,133,157,110,217,193,105,155,207,147,117,207,67,40,50,74,207,222,37,
+212,54,162,135,54,225,93,138,174,141,106,215,14,163,88,44,207,31,60,197,177,173,17,68,55,53,110,56,26,25,125,103,175,111,111,212,48,231,245,126,58,113,229,27,161,55,142,71,36,119,103,205,208,184,185,187,187,43,184,239,26,190,161,68,166,165,128,115,162,13,133,225,6,124,1,237,138,107,61,218,118,166,55,212,167,252,94,117,34,101,74,216,247,157,48,169,195,103,178,151,111,139,248,208,201,244,40,14,26,148,15,155,215,164,126,112,227,144,49,95,173,159,218,230,179,83,29,17,133,156,164,65,234,190,81,35,154,21,180,186,237,238,118,75,109,162,177,54,130,240,53,241,25,111,35,150,118,38,172,23,251,72,80,150,96,181,244,69,252,131,99,167,101,76,198,193,79,232,123,101,74,129,111,158,135,209,243,153,95,145,225,149,7,162,254,105,171,117,124,117,69,159,179,93,176,230,33,248,204,117,142,28,203,73,171,164,161,203,220,94,85,158,72,219,168,185,207,216,79,163,164,206,118,37,218,85,176,47,27,107,163,170,111,29,161,219,191,61,221,18,99,93,28,86,113,8,
+236,107,169,252,151,98,210,68,76,62,165,21,154,195,194,65,68,124,229,112,102,60,249,241,122,11,212,156,141,7,87,171,119,26,38,132,129,195,225,140,184,251,53,150,193,197,235,165,140,7,127,9,118,24,182,240,106,174,89,192,108,178,225,172,45,167,42,12,194,108,23,192,165,139,113,188,180,73,235,95,107,47,118,88,126,197,69,41,150,216,132,81,185,144,192,142,55,68,128,122,73,135,188,144,193,66,6,159,152,59,90,55,253,16,12,118,222,138,39,126,92,126,21,201,152,228,241,138,32,155,179,207,146,2,171,109,100,21,77,69,73,62,143,33,184,242,83,215,25,216,73,70,51,97,212,27,164,65,126,169,207,119,19,88,66,194,3,70,43,3,104,121,231,226,14,110,232,43,79,247,10,62,119,6,74,163,131,184,12,195,65,161,232,33,249,174,119,44,171,253,96,207,207,148,222,110,34,232,125,153,103,180,21,55,72,19,197,157,252,37,58,76,232,237,129,215,205,228,235,61,228,204,93,133,240,47,13,243,75,228,195,130,33,145,19,165,33,108,247,12,28,181,125,134,28,124,
+132,9,131,225,67,221,56,176,187,222,15,247,118,247,35,144,238,29,226,44,113,46,51,129,21,59,129,240,182,129,208,1,241,74,166,213,19,69,135,112,203,160,194,3,98,18,201,89,133,40,110,98,169,104,238,64,119,80,216,224,216,139,113,26,5,135,208,133,124,76,28,180,203,7,130,242,133,28,70,7,176,230,42,144,35,57,138,173,74,232,13,43,95,199,139,36,67,118,83,173,17,110,206,53,188,250,229,172,229,223,138,31,238,231,215,170,171,165,83,134,139,222,93,223,97,225,125,97,91,207,172,216,26,183,46,144,56,48,220,1,99,67,153,144,178,27,79,148,174,74,63,44,252,13,31,102,83,153,11,134,77,170,130,53,97,162,47,55,3,151,87,130,161,122,60,42,100,194,44,170,123,91,70,17,120,133,153,61,114,204,171,82,172,181,110,209,18,85,251,116,77,60,61,142,28,157,37,138,91,141,155,189,184,174,157,29,221,53,98,168,33,137,211,216,234,95,90,114,27,187,164,130,208,55,142,65,174,41,244,64,109,148,165,64,197,9,41,183,199,0,249,197,235,97,31,68,
+150,218,39,243,29,116,56,105,104,150,244,156,155,102,219,236,194,125,215,242,49,24,243,13,118,125,43,3,138,34,227,14,119,31,207,211,206,229,151,35,69,134,64,157,129,225,113,84,109,26,35,107,253,114,251,57,71,176,237,11,187,78,232,55,105,149,197,112,48,119,238,36,93,248,152,213,188,21,247,247,70,199,57,81,19,223,166,202,2,145,182,167,149,48,50,248,108,179,22,86,155,109,48,185,227,130,32,113,114,233,181,248,10,135,121,147,96,44,195,163,46,15,58,39,228,221,51,219,201,38,247,240,112,237,226,154,114,33,226,227,216,251,210,252,253,154,195,188,13,253,240,204,54,59,65,17,100,55,183,107,171,60,234,58,5,81,227,111,95,251,78,212,100,133,118,119,118,178,155,20,4,112,130,72,104,139,119,169,189,56,46,76,200,199,205,181,38,27,192,13,119,39,7,87,39,130,49,201,159,224,123,85,245,235,61,2,55,170,221,82,118,146,65,78,140,81,130,195,21,167,10,163,221,188,41,69,73,182,237,42,107,192,134,223,173,174,17,152,85,51,131,7,31,171,149,137,
+13,180,89,223,55,246,79,113,184,180,185,161,207,80,1,39,66,198,254,173,13,65,26,134,146,102,178,236,76,200,57,230,32,27,76,147,65,10,227,178,19,151,237,153,30,148,61,30,219,88,228,109,89,72,25,65,203,68,46,169,176,193,188,113,54,174,83,209,120,180,55,154,134,74,61,75,152,27,202,176,182,97,179,67,126,90,174,237,152,79,112,68,163,157,176,37,85,246,224,215,20,103,203,23,187,134,222,22,157,5,159,43,13,203,244,219,213,144,89,16,140,18,156,138,83,153,229,196,132,65,121,156,60,106,122,70,233,167,206,14,78,25,15,107,46,154,119,195,124,226,105,33,159,99,101,138,85,51,126,59,21,230,116,24,94,95,129,118,202,150,169,17,27,115,92,204,165,17,235,203,199,93,155,173,21,66,154,143,93,252,254,60,164,238,43,104,22,37,84,235,239,143,17,196,26,29,39,47,213,251,17,163,141,176,213,86,21,11,152,196,164,122,198,17,123,250,7,235,181,163,154,131,73,219,89,99,175,129,14,33,85,51,202,10,242,25,187,221,132,14,76,161,207,162,236,35,
+40,140,151,229,80,111,204,236,102,108,67,128,28,59,3,46,65,37,183,154,158,249,215,139,147,174,82,209,154,31,84,130,85,92,10,77,50,247,156,87,4,173,115,183,124,213,70,101,51,162,109,105,49,95,222,56,75,156,148,33,183,24,146,202,60,143,207,225,23,55,243,6,208,247,108,210,118,122,32,144,182,215,97,21,124,57,149,167,136,10,49,148,188,207,44,79,228,194,48,119,143,21,71,102,65,209,163,194,94,252,22,113,109,78,203,1,42,112,26,99,70,53,209,205,29,161,14,171,230,187,4,127,53,113,234,246,155,58,201,172,118,131,231,18,185,79,118,118,110,135,70,212,42,179,186,191,150,165,100,47,33,221,98,197,18,181,116,105,167,231,73,24,21,90,107,30,237,39,230,25,177,124,199,108,19,59,227,39,38,5,131,130,75,140,75,91,116,48,113,50,197,23,37,180,234,149,94,57,19,129,105,39,30,108,103,47,9,130,8,250,113,165,188,63,242,65,252,188,172,129,114,60,110,87,246,244,237,115,54,196,182,131,110,202,247,105,196,179,139,125,165,162,125,48,210,117,
+149,2,163,71,92,53,86,198,138,203,235,150,155,13,37,143,56,194,241,120,60,45,99,129,142,28,193,205,33,52,108,141,15,245,30,241,195,6,15,50,111,229,237,93,167,9,76,188,24,218,178,172,181,154,119,151,55,52,35,29,236,145,179,211,183,9,246,118,163,52,213,87,114,39,145,161,62,55,138,22,34,93,34,105,84,227,42,98,113,107,189,23,193,222,158,221,37,218,150,46,75,106,194,130,79,123,215,89,100,69,52,46,137,51,50,102,36,128,104,239,73,117,94,39,143,69,139,12,152,39,17,78,182,128,206,199,76,155,99,126,180,106,62,179,38,228,219,230,206,117,47,102,14,179,28,167,20,212,209,225,213,85,116,71,126,136,146,7,118,220,205,108,223,226,221,168,142,52,5,118,156,221,39,25,51,167,44,194,117,139,237,54,84,47,6,190,171,59,88,127,28,218,7,8,232,103,204,43,199,110,69,37,154,190,166,40,174,50,138,228,228,50,219,57,159,237,152,130,104,68,129,143,153,224,122,123,85,197,204,145,230,205,193,211,156,239,38,49,155,121,82,77,65,98,50,149,
+172,11,220,206,6,5,93,83,92,192,225,178,49,42,22,196,160,86,171,77,126,124,190,118,54,180,41,52,189,19,189,156,192,44,207,51,88,110,180,141,41,114,70,176,98,115,4,153,167,169,140,254,101,246,150,95,175,91,4,248,126,248,26,108,137,122,34,57,10,180,9,114,40,204,10,16,242,28,70,176,227,192,66,31,153,124,65,222,108,122,219,110,194,154,152,20,182,233,204,121,152,14,97,24,67,16,153,198,14,170,32,69,65,242,140,61,117,73,218,41,87,96,200,140,35,147,37,56,60,237,81,128,147,189,242,230,39,117,179,229,20,47,216,66,195,161,71,62,255,132,132,180,10,60,219,96,127,197,143,196,178,59,55,208,138,95,80,108,50,137,178,158,168,27,107,225,144,240,136,33,66,52,133,194,137,11,235,201,69,4,108,124,56,141,38,254,24,123,212,8,203,184,103,213,131,213,194,245,217,221,182,93,111,49,95,68,48,210,120,254,78,202,82,70,168,190,68,80,96,202,86,167,50,136,100,120,126,3,117,170,183,41,115,110,116,18,152,123,53,244,171,34,186,116,148,161,
+72,43,5,178,177,101,82,172,170,59,109,248,108,219,124,176,69,181,248,241,72,31,27,19,88,191,230,154,215,29,241,131,113,121,135,139,163,48,19,23,3,85,32,236,89,181,112,2,1,207,181,76,10,178,66,60,46,210,241,197,26,58,126,235,71,148,104,202,13,95,237,108,94,111,38,245,129,24,77,151,111,66,39,27,105,229,198,237,154,71,80,86,182,176,200,115,81,205,14,66,14,169,1,7,19,68,51,71,216,77,113,70,128,95,239,122,240,215,220,54,85,212,188,39,78,32,42,147,56,186,46,60,133,138,172,42,170,53,135,116,212,57,79,156,144,41,100,58,124,237,92,16,223,119,239,218,16,17,76,124,79,1,42,29,144,110,203,108,238,232,166,167,16,28,24,19,201,110,106,79,79,71,58,189,29,245,17,201,22,78,20,207,101,71,17,211,25,49,158,93,21,7,233,170,171,218,241,197,201,85,68,95,61,203,31,52,167,77,16,220,113,201,217,228,168,125,103,170,245,67,89,187,236,172,156,90,105,16,94,255,10,193,129,232,167,83,249,97,168,49,106,78,82,243,170,195,
+119,127,12,227,26,199,135,211,75,139,18,109,82,216,198,69,169,176,122,227,26,86,11,233,148,75,115,82,163,240,228,168,1,56,93,225,133,182,162,193,218,12,165,47,143,125,161,196,76,192,141,171,14,202,57,139,111,196,118,170,43,28,45,206,71,178,158,186,210,144,166,62,169,52,106,47,12,144,208,4,84,91,223,244,54,225,154,218,40,10,221,189,202,49,110,79,77,16,6,55,216,60,217,37,19,14,59,209,66,83,182,171,160,27,162,23,8,5,199,116,104,62,164,84,17,206,213,125,194,217,90,140,126,33,85,140,87,33,100,75,49,99,186,162,32,156,77,78,192,195,62,48,72,168,140,156,209,17,223,245,178,134,52,53,250,4,109,65,250,10,227,172,92,209,30,175,173,233,189,65,149,4,2,230,185,78,99,201,188,7,90,227,117,6,93,187,217,129,58,26,129,111,120,99,217,97,246,224,54,143,179,203,207,199,170,144,111,64,208,40,78,189,162,155,46,251,160,34,237,142,110,66,105,168,222,75,132,112,51,200,34,8,177,79,86,185,169,194,106,68,169,175,94,147,34,27,
+32,162,165,123,168,216,56,144,81,215,221,14,254,221,4,183,111,36,35,232,144,200,196,232,64,108,205,12,100,195,170,8,242,48,119,172,183,27,141,234,172,126,64,63,3,133,215,13,185,2,61,68,234,29,109,106,163,219,196,59,137,168,158,119,234,26,57,90,122,195,200,37,134,189,244,88,130,45,59,83,162,114,245,189,136,218,157,185,170,243,91,52,153,26,74,168,202,246,247,174,67,20,158,218,98,68,137,19,30,139,59,126,152,93,99,214,128,33,156,130,207,152,28,171,56,222,62,5,207,172,53,117,176,49,116,239,160,180,74,168,116,235,140,217,36,186,123,27,222,64,116,143,97,220,253,139,53,143,7,36,142,5,103,135,245,163,243,195,139,14,180,181,77,55,31,226,204,182,18,151,170,198,123,52,242,64,88,46,242,133,96,18,113,63,3,189,74,12,89,151,27,119,99,139,252,84,5,51,121,83,221,253,26,82,208,95,61,196,83,12,113,154,72,124,133,216,91,203,32,171,85,69,72,67,14,51,171,195,227,211,141,91,18,171,7,34,37,230,36,196,38,63,16,174,236,165,
+75,126,172,21,182,57,14,137,180,187,230,83,163,194,80,157,141,72,4,92,21,90,196,131,203,110,251,22,254,160,51,155,156,211,85,52,128,99,178,70,124,28,7,198,104,199,181,145,179,199,22,159,172,179,129,66,205,237,37,228,38,157,18,206,133,178,18,122,42,79,222,83,251,37,123,81,11,84,124,87,192,220,161,157,213,227,92,76,69,177,203,194,40,111,2,97,56,119,77,42,107,158,204,78,24,59,144,233,119,235,215,20,156,102,61,113,218,102,155,20,114,11,48,198,31,236,148,221,136,44,5,78,35,169,44,27,219,222,24,218,118,169,221,176,58,197,144,129,25,239,205,11,174,168,249,210,133,10,67,17,28,117,152,154,226,165,192,155,13,219,207,45,109,214,90,155,111,218,219,119,247,246,208,27,246,62,98,189,221,90,21,135,178,132,125,198,58,212,192,195,27,99,187,235,107,60,88,85,196,177,71,59,215,196,117,167,102,3,174,129,81,108,149,141,72,32,119,152,84,58,101,244,210,172,106,177,154,21,56,122,201,162,20,103,171,147,181,185,26,94,116,132,18,152,168,222,
+219,103,137,54,235,189,176,254,124,20,114,225,104,97,147,142,101,232,247,122,4,110,74,164,199,246,13,70,191,179,63,12,237,35,155,84,195,22,161,57,71,63,244,59,180,117,114,152,57,173,248,13,174,25,231,220,105,13,113,172,97,177,175,145,77,69,77,237,189,170,87,84,164,198,163,14,195,104,162,230,193,203,199,185,40,197,38,185,10,207,41,198,60,197,231,48,26,24,251,55,36,74,67,177,58,219,171,177,243,126,68,212,38,158,245,184,219,44,159,226,160,101,219,77,245,184,77,108,96,239,52,69,105,238,231,214,75,176,138,214,201,99,91,48,38,244,81,223,204,182,48,18,42,111,227,144,108,76,202,47,197,68,183,124,3,188,46,60,62,132,219,34,119,97,235,126,83,119,119,237,243,210,136,181,141,85,131,115,13,13,156,223,215,78,11,71,46,119,178,15,138,216,211,14,60,51,220,181,96,73,200,213,109,108,137,103,230,173,150,182,119,215,11,220,102,131,203,224,102,247,165,18,189,190,24,44,228,32,153,254,89,136,210,133,4,130,151,126,20,9,29,11,78,112,74,18,
+127,216,116,156,58,215,202,102,104,126,122,202,65,213,124,50,166,48,113,126,108,66,118,152,110,197,241,109,123,172,59,202,199,252,4,179,91,68,179,250,72,25,209,52,230,172,140,51,217,184,74,178,165,210,131,241,124,117,76,19,67,212,73,245,30,107,131,83,197,244,66,27,97,24,137,180,75,34,145,212,74,204,6,138,116,184,71,173,93,223,182,61,231,97,239,126,99,216,34,180,186,195,16,79,238,223,178,137,125,162,60,149,28,183,105,12,171,211,174,194,139,202,211,125,173,130,50,57,223,21,24,220,137,72,83,93,108,208,177,23,131,181,93,115,214,227,118,160,138,85,25,205,138,116,228,169,101,144,241,26,18,187,128,26,140,106,31,152,16,215,129,55,161,135,235,152,168,15,94,72,93,220,130,33,190,236,181,169,168,190,118,198,225,134,129,243,200,40,227,216,175,61,231,249,10,82,239,153,136,233,93,103,105,0,50,206,115,198,249,134,88,37,133,236,78,5,220,98,31,110,79,12,165,25,135,39,25,97,95,66,240,210,52,253,144,88,106,119,156,138,93,133,117,27,46,196,
+195,213,134,206,85,198,26,201,116,104,94,7,131,150,195,174,222,178,7,225,83,148,152,201,118,129,220,218,139,22,139,157,60,187,28,6,123,2,129,121,139,10,163,100,176,190,185,98,7,118,156,10,195,214,243,163,32,100,107,86,131,98,69,215,217,75,155,247,12,26,176,147,180,35,120,172,198,23,214,243,18,177,211,107,222,190,115,84,177,250,163,213,51,126,179,68,138,122,110,8,49,151,104,14,156,195,40,28,252,72,39,216,71,18,66,80,127,211,68,200,112,205,119,161,59,77,5,132,51,144,129,107,68,191,42,137,103,104,210,54,172,0,92,75,6,162,125,111,138,44,140,211,14,225,71,73,141,70,147,173,116,207,193,71,115,80,234,196,62,194,111,92,119,206,214,134,89,82,162,51,56,12,95,14,171,55,102,153,0,227,22,196,32,99,134,165,15,141,134,251,162,33,191,92,18,235,144,70,227,221,224,70,12,146,30,11,40,112,5,41,226,53,235,76,162,162,27,33,246,38,210,46,119,115,232,196,213,28,98,18,223,3,158,231,241,208,89,230,100,11,49,191,67,170,182,208,
+98,90,151,6,38,236,129,221,52,77,132,48,176,140,174,154,140,245,12,225,22,221,42,142,252,99,83,94,69,113,159,102,154,156,121,84,109,98,159,92,156,181,242,55,5,11,109,19,204,219,242,211,107,124,134,45,112,103,151,109,52,103,59,184,20,50,100,171,143,6,83,13,132,52,139,138,216,249,181,139,140,25,25,59,47,230,200,114,30,146,135,99,112,93,35,194,13,110,26,166,128,28,67,151,65,146,190,225,176,115,233,194,6,116,66,219,135,186,9,124,104,72,164,44,82,214,78,176,156,245,109,95,11,60,164,142,162,73,103,198,56,185,105,92,201,79,195,149,248,153,156,234,92,221,219,191,141,97,24,205,251,49,207,232,50,17,230,222,67,198,156,155,99,175,218,79,85,23,254,214,246,209,222,165,97,198,209,35,168,217,237,113,81,182,202,36,74,208,199,89,7,90,200,197,239,165,89,234,12,113,216,100,87,230,13,89,53,105,12,53,118,163,67,253,141,187,167,153,75,130,145,137,55,218,109,213,57,71,166,186,17,83,206,180,40,33,249,122,98,195,206,196,85,59,83,178,
+85,81,180,84,183,24,212,96,5,89,49,224,10,23,215,178,114,16,106,236,34,194,21,211,141,2,107,180,64,27,99,73,176,99,236,211,39,99,163,115,43,161,235,147,79,247,31,238,65,198,156,122,204,220,187,45,181,15,138,179,16,83,34,204,195,204,65,127,45,123,163,21,22,183,27,180,164,33,208,211,77,136,3,171,176,68,236,82,3,187,137,121,246,188,74,138,202,51,238,208,54,185,33,96,26,242,71,251,180,184,161,209,132,238,162,60,37,196,117,111,66,9,198,225,58,144,226,192,110,98,2,151,16,124,3,234,219,43,172,58,189,148,179,188,116,130,175,141,72,150,16,205,208,130,14,107,164,112,22,184,142,17,230,74,88,122,140,161,2,53,220,25,26,115,151,58,30,63,93,228,28,81,201,186,6,49,145,183,230,2,97,119,215,155,152,6,226,101,58,53,16,158,238,26,70,231,62,27,223,73,18,112,242,158,163,61,138,108,18,172,31,248,27,157,157,233,182,118,111,30,245,238,97,164,5,40,18,65,182,117,82,170,144,68,153,152,8,120,238,130,226,100,122,204,76,96,
+43,1,48,92,167,78,36,77,148,102,126,52,106,143,20,96,74,127,102,157,77,71,182,156,225,254,87,19,155,142,57,185,175,86,245,56,126,177,252,64,153,236,39,173,65,109,218,208,37,169,91,198,98,43,131,150,5,237,42,239,110,93,218,49,36,34,164,180,6,62,239,229,212,57,151,168,68,55,14,39,45,94,241,196,23,215,113,208,173,225,13,150,146,192,156,16,33,132,74,69,26,240,150,229,125,235,72,113,179,149,192,210,243,107,148,225,58,85,85,211,227,214,205,113,177,104,87,87,202,239,69,130,121,170,243,214,64,207,231,49,174,198,217,252,22,64,129,52,44,27,179,196,194,118,223,45,229,206,6,115,187,211,94,62,62,244,105,145,71,124,154,38,229,132,121,232,141,104,125,104,72,179,137,137,114,245,136,25,6,165,205,252,173,221,1,156,94,19,107,36,218,129,3,94,160,33,8,123,102,146,217,64,153,176,170,220,166,44,54,30,59,28,244,189,244,56,55,3,59,28,162,114,127,102,18,152,108,51,43,216,6,221,43,244,116,20,171,97,182,106,208,130,21,28,194,64,
+188,126,167,184,84,40,66,189,9,30,116,158,160,56,110,41,100,184,175,221,72,67,195,52,52,57,85,87,91,21,235,169,173,192,14,159,21,96,250,161,199,14,40,93,135,23,215,146,134,82,201,68,217,116,6,20,195,45,194,198,9,36,149,211,215,182,125,102,38,36,114,122,108,183,1,107,198,41,234,248,123,164,33,184,32,147,228,251,70,165,208,98,145,72,170,202,193,101,84,38,18,86,99,87,35,156,59,143,156,204,66,167,27,131,212,204,39,245,99,121,171,190,125,146,33,102,59,60,68,93,83,64,169,139,198,122,128,227,92,95,231,129,186,103,48,160,142,154,23,236,198,12,0,204,81,4,99,113,198,211,57,152,107,68,180,61,16,83,231,194,111,46,18,209,154,68,177,89,242,226,133,74,138,207,220,184,61,149,32,237,32,211,100,111,92,160,149,132,52,162,43,215,28,94,93,208,38,103,241,115,44,216,215,26,52,172,23,4,126,251,92,164,113,192,214,215,233,235,192,234,54,240,23,53,211,65,77,202,168,173,39,142,17,53,241,140,104,180,153,19,90,173,152,232,177,48,
+60,197,14,196,97,13,48,50,91,103,91,221,30,155,45,57,15,78,89,107,115,12,17,11,135,195,199,165,52,167,202,178,242,14,28,25,138,224,166,14,204,248,162,150,125,210,54,102,165,125,97,33,126,85,131,102,119,244,19,180,195,193,108,112,47,41,209,173,90,82,211,218,51,151,202,246,184,150,167,213,69,80,243,85,225,44,114,207,195,51,71,195,7,86,178,38,125,104,156,204,129,150,4,213,130,117,218,236,185,243,205,6,126,78,166,181,59,162,230,9,207,28,224,160,102,62,234,204,200,44,165,111,44,158,49,255,230,38,168,41,195,236,186,176,173,79,185,84,28,76,149,172,17,27,188,41,69,225,92,243,161,118,213,220,85,53,135,113,221,192,216,19,224,134,80,92,11,238,151,28,34,17,188,116,185,4,216,171,2,180,96,131,226,184,201,168,216,9,90,3,57,171,109,70,80,213,7,237,203,124,35,48,159,41,166,125,101,134,36,51,120,104,42,217,97,49,181,113,5,193,51,218,59,112,93,222,34,11,79,26,136,187,13,165,212,174,186,158,212,181,183,141,12,118,38,192,
+235,65,214,52,40,177,65,244,96,83,155,116,179,93,43,209,9,42,36,8,101,23,182,135,41,151,101,120,192,30,211,225,104,248,193,39,12,6,139,124,14,15,216,89,87,158,93,90,59,208,92,219,40,23,102,20,125,195,2,78,101,113,128,17,196,97,4,197,141,203,14,7,233,228,70,182,103,225,172,55,54,195,232,125,58,41,105,219,41,181,132,113,21,51,48,231,91,26,215,125,243,133,98,245,36,95,178,52,202,40,27,136,6,226,103,92,173,196,112,130,70,54,14,108,173,54,27,131,177,11,187,181,102,58,123,233,104,222,131,43,58,152,93,147,113,41,87,142,183,71,14,182,69,105,150,151,74,165,73,114,137,189,161,101,123,238,206,32,214,242,231,124,37,134,155,54,28,102,143,251,27,163,20,174,59,221,182,20,173,180,102,159,213,196,8,131,64,97,138,199,120,18,106,216,16,202,241,230,145,200,217,133,206,176,202,156,127,215,6,233,218,112,66,240,254,105,181,13,204,60,48,103,110,77,50,16,156,176,33,0,165,110,186,179,80,154,225,223,185,38,39,6,205,105,252,132,
+254,0,103,76,229,60,188,134,92,90,3,10,18,106,159,100,59,192,133,224,118,123,144,74,187,236,117,235,150,208,208,84,36,133,113,71,29,130,107,175,225,8,69,34,118,98,244,10,232,72,57,50,247,42,50,109,251,3,200,82,245,108,62,65,48,21,94,40,113,167,154,212,64,202,13,17,113,114,227,206,74,248,2,172,32,45,85,50,49,46,200,161,178,169,189,166,24,250,116,215,205,93,7,222,234,135,139,157,154,227,28,91,149,31,154,10,177,52,26,116,221,226,50,129,229,99,246,57,51,50,78,97,119,82,171,86,99,222,3,26,41,26,56,201,90,8,163,33,221,238,101,246,72,226,203,222,221,122,199,239,160,23,228,184,35,10,35,166,65,48,162,136,180,100,43,105,200,57,49,252,48,9,239,234,203,4,124,7,42,226,84,31,19,21,23,30,97,113,71,23,152,104,111,155,195,194,148,134,177,151,166,219,106,88,194,35,20,237,157,220,69,176,170,147,62,131,145,93,99,204,67,136,201,29,92,222,191,171,37,122,202,122,242,208,204,231,103,248,237,118,27,203,21,165,69,48,
+71,82,219,55,15,82,137,68,98,198,79,82,194,225,187,126,61,25,43,196,98,145,154,14,55,91,79,187,0,212,149,57,188,63,127,69,54,117,179,109,52,186,3,84,146,93,174,25,76,188,200,221,129,61,224,201,153,163,226,214,158,77,156,86,249,70,135,23,7,192,210,203,122,178,200,134,152,118,229,142,171,7,83,225,170,167,140,195,177,18,246,96,157,126,169,232,173,237,147,195,158,203,122,245,166,17,237,27,4,165,48,57,121,172,215,140,124,7,215,157,89,223,109,38,83,187,187,243,38,179,51,150,137,143,71,153,142,124,98,46,164,59,244,131,106,80,98,14,23,194,177,156,75,93,68,18,211,242,228,228,48,119,210,19,23,202,238,94,187,83,112,121,232,97,70,111,124,69,50,22,82,169,97,14,91,247,219,25,77,88,87,67,157,41,214,216,155,119,205,230,170,225,148,39,16,8,248,124,124,103,107,107,253,162,84,46,171,206,189,222,176,223,143,216,133,195,73,170,154,185,218,232,52,118,110,81,19,175,169,128,199,172,30,79,142,192,20,115,133,208,68,147,77,168,51,96,
+141,230,149,178,12,82,18,58,15,188,233,20,81,123,187,117,121,154,3,95,119,154,150,144,136,132,115,11,214,67,193,211,10,86,23,200,137,217,106,91,222,141,138,237,146,105,157,172,236,174,197,44,228,154,84,168,66,38,115,243,98,146,140,40,86,69,248,24,14,171,6,136,139,188,102,13,233,44,117,85,13,158,60,161,181,202,18,227,46,211,16,245,142,179,80,74,208,18,230,122,211,225,110,14,51,148,174,39,58,213,72,52,91,225,120,144,215,98,135,2,28,140,162,163,220,253,253,235,76,70,156,201,229,58,157,130,103,213,106,181,6,2,1,243,169,217,236,241,120,20,20,85,173,120,191,250,243,70,74,47,50,206,70,102,101,122,70,32,18,97,131,102,46,199,216,219,187,146,172,195,9,5,15,89,222,46,7,185,215,20,139,133,97,161,106,251,94,138,194,91,43,184,73,202,250,85,106,48,25,180,88,46,226,173,106,15,157,239,100,45,118,56,26,141,158,78,167,3,20,69,225,112,185,230,157,182,75,116,177,142,193,20,49,192,117,42,159,173,85,106,211,58,185,196,140,84,
+176,247,232,21,18,77,93,164,79,84,50,119,233,56,252,22,125,47,186,139,201,211,175,51,248,240,85,242,116,171,154,201,173,39,110,155,16,80,176,1,94,39,2,221,223,16,42,110,18,252,215,153,176,206,165,139,166,179,22,103,1,215,237,79,45,65,114,33,132,155,87,19,12,126,3,35,60,26,158,144,87,73,21,73,71,126,151,43,83,109,193,170,134,64,239,237,4,248,116,6,146,76,46,203,248,198,35,42,161,31,183,53,220,35,188,214,198,44,243,52,64,0,199,251,164,117,86,74,133,112,198,16,212,170,114,39,33,98,40,106,62,90,148,156,200,186,110,210,28,159,113,100,63,191,217,87,71,220,152,33,76,227,20,71,143,50,136,85,225,156,11,44,30,47,9,210,244,92,201,36,117,195,87,172,39,181,171,180,51,119,181,115,115,190,237,24,130,155,25,243,41,145,193,192,51,78,15,104,152,72,108,61,6,223,88,171,130,37,155,17,97,18,188,94,42,161,75,231,231,231,171,10,242,30,153,108,50,153,10,5,102,33,34,74,65,240,173,61,128,124,91,88,248,197,42,150,
+41,16,10,195,161,187,80,82,63,86,178,88,55,55,198,180,133,161,103,7,129,174,106,72,185,144,168,94,151,214,29,81,81,242,43,90,158,173,230,131,136,116,88,70,151,77,158,80,214,32,187,27,115,108,3,194,197,145,248,64,162,53,17,108,114,111,7,75,36,211,233,244,206,9,243,144,199,62,145,74,143,78,149,137,72,74,83,199,165,246,27,124,50,44,53,109,4,61,28,200,218,145,100,205,87,135,168,123,252,163,112,231,210,79,65,211,43,208,230,65,166,5,9,116,55,36,172,163,186,233,82,52,217,5,167,189,24,10,112,158,90,75,198,35,67,2,123,23,96,80,32,21,251,142,40,200,160,65,179,123,123,38,235,22,213,25,38,133,166,123,215,93,148,100,181,188,199,177,7,213,243,116,81,159,83,120,27,213,228,105,212,0,204,202,242,187,74,121,143,48,145,33,192,96,217,117,99,80,112,104,56,245,144,194,21,47,15,187,212,145,179,219,214,139,135,100,31,40,123,78,203,70,106,208,226,158,12,171,205,114,47,21,246,68,53,64,149,12,183,207,45,17,207,12,134,219,
+244,76,234,156,2,251,90,169,84,110,70,174,103,224,233,248,148,28,14,135,79,119,118,118,176,170,81,119,206,53,24,12,114,185,60,197,77,220,150,74,160,97,254,116,180,79,188,117,113,155,18,94,163,209,176,99,46,232,230,53,40,24,180,123,182,78,26,12,135,181,216,92,106,141,70,163,177,24,122,8,164,15,10,133,142,47,162,166,217,124,156,238,207,189,84,109,36,26,197,238,226,241,107,110,115,239,132,126,48,53,110,221,162,186,186,213,196,181,15,11,69,106,174,154,55,107,195,110,240,174,19,151,32,227,234,94,41,166,152,232,142,37,16,129,216,120,196,146,104,55,88,18,229,172,116,231,63,245,183,234,52,237,49,56,136,219,218,169,53,240,125,207,109,75,108,3,139,80,189,113,170,127,162,15,53,216,67,30,119,204,23,12,242,73,213,65,113,144,190,115,12,195,187,151,99,176,106,243,236,230,46,51,224,208,119,42,197,182,102,181,188,154,228,173,251,224,29,245,21,112,134,86,178,185,218,233,64,113,37,132,153,75,236,237,2,173,223,7,230,151,221,251,99,148,105,72,
+208,176,97,179,0,200,12,136,88,163,94,14,111,215,181,157,172,99,39,203,45,231,142,47,229,182,245,104,144,167,158,165,139,50,133,97,208,172,78,111,163,163,13,159,164,135,179,20,147,147,76,175,96,43,13,248,7,35,179,123,102,172,230,104,82,18,236,202,223,143,114,130,53,176,78,130,78,241,195,132,81,49,57,39,41,9,87,150,124,213,226,213,111,237,104,185,28,69,50,80,175,30,35,162,210,97,169,57,150,239,24,90,97,126,159,207,47,135,64,71,71,253,35,23,81,228,114,58,79,183,183,183,89,28,78,99,28,147,193,154,236,253,253,222,190,81,1,106,131,60,70,175,215,59,153,76,114,46,59,26,148,208,141,186,153,13,55,150,78,23,177,173,108,232,85,246,246,118,64,178,18,211,167,66,142,175,67,67,238,74,178,89,235,193,102,48,134,5,211,27,151,90,170,109,52,6,6,26,16,236,154,226,207,247,209,40,104,175,149,213,123,11,74,162,53,91,44,230,221,44,38,139,205,44,22,82,121,98,62,127,41,184,173,245,172,86,249,229,165,250,168,94,151,132,195,7,
+108,165,109,54,130,26,226,152,157,233,73,125,156,12,245,69,218,227,91,238,36,144,194,180,160,224,137,28,54,84,177,124,67,249,133,192,191,122,71,62,15,251,8,82,154,160,20,162,82,183,68,135,32,33,150,42,183,104,77,83,177,169,129,134,21,17,160,228,134,166,62,208,33,133,193,205,128,71,55,62,133,100,104,24,125,4,226,187,31,87,21,172,56,126,114,98,31,248,125,71,42,94,220,136,191,61,81,103,229,107,195,41,115,92,63,239,135,160,140,202,145,125,30,212,32,121,157,169,97,100,216,61,37,67,85,18,38,10,158,35,227,237,242,57,100,26,223,234,168,142,27,199,60,102,92,43,109,118,227,205,212,112,94,37,228,83,36,24,168,81,197,31,43,226,150,99,9,242,106,56,217,31,40,248,152,168,20,197,33,17,105,27,84,183,124,43,49,61,173,50,4,154,104,249,134,4,147,231,34,177,1,73,70,114,239,167,122,183,181,154,254,206,88,139,247,42,17,245,149,113,64,164,115,14,15,215,208,153,141,6,166,70,38,79,200,245,43,85,107,88,44,210,125,64,131,55,
+173,237,67,86,197,171,103,48,140,144,14,221,229,5,56,229,65,165,98,62,223,223,223,183,48,236,104,149,74,181,14,134,193,92,231,231,100,202,128,98,190,6,42,134,129,183,161,52,179,201,192,117,238,114,25,147,66,134,126,168,6,26,21,200,206,4,57,204,192,201,208,27,172,198,98,177,112,187,156,90,181,21,234,97,239,101,102,213,217,243,36,19,118,37,65,175,211,232,213,251,204,187,163,84,76,239,136,135,233,99,9,111,204,176,11,101,26,141,48,78,70,151,55,249,225,178,178,214,16,120,163,174,180,248,34,124,210,158,239,19,174,175,177,204,35,122,144,73,143,207,197,196,29,30,151,192,154,105,19,81,147,198,19,58,54,215,46,121,102,175,194,236,133,106,98,73,57,67,188,47,233,149,38,7,155,73,55,97,234,229,18,68,82,182,212,198,22,211,96,183,103,173,108,83,43,57,170,36,231,147,40,14,139,197,206,176,12,124,205,80,118,111,109,35,148,104,81,210,226,94,61,40,156,195,53,53,90,14,41,148,176,216,209,224,254,112,154,166,75,21,7,116,242,62,217,182,
+213,242,236,144,114,100,169,93,174,154,248,26,8,249,161,76,54,9,156,163,14,55,133,48,5,209,129,29,228,72,45,158,67,125,67,244,156,217,72,129,93,248,125,63,235,204,178,8,160,113,33,75,4,118,118,220,179,42,46,83,4,109,94,28,245,53,205,18,137,220,32,105,105,168,199,214,16,128,209,117,58,157,142,68,34,97,115,248,174,126,110,25,105,11,0,197,97,52,66,118,223,24,232,247,149,22,230,30,135,67,220,2,174,55,170,187,112,36,114,147,223,226,216,109,108,24,196,166,62,208,66,163,177,241,110,252,66,69,33,169,202,6,241,84,61,247,149,133,26,200,156,143,128,224,165,36,190,81,35,167,9,97,240,154,147,155,28,104,26,194,64,4,147,186,142,199,170,46,252,173,44,219,242,84,90,9,240,25,26,98,135,151,235,229,76,42,197,2,153,214,173,169,25,132,150,82,139,104,180,146,97,22,51,132,12,234,122,157,84,23,178,72,138,176,143,90,205,213,245,87,57,240,26,94,90,147,241,99,110,118,230,156,215,25,174,23,55,82,213,208,4,131,176,49,46,233,
+23,15,127,79,0,233,237,149,181,131,189,122,89,79,143,29,162,210,196,26,165,121,57,236,174,119,206,185,135,100,121,11,133,225,156,132,73,19,127,190,217,97,84,134,76,168,177,133,106,249,114,100,191,77,126,131,226,87,206,193,152,6,82,127,28,8,239,81,227,249,29,42,158,213,63,233,134,187,198,86,175,121,230,90,85,238,206,98,156,171,0,70,117,194,172,41,39,154,48,55,85,110,129,177,49,126,74,147,141,236,89,188,100,48,38,180,81,187,192,107,111,48,98,183,109,110,138,13,241,164,94,177,71,207,74,49,36,181,90,141,66,137,32,227,182,209,0,177,238,170,118,119,39,163,18,231,36,4,242,210,116,67,182,90,115,160,23,193,83,167,91,55,9,100,165,226,70,148,65,154,3,227,116,50,209,96,53,90,127,64,122,149,92,157,86,171,87,110,79,173,137,164,235,135,131,211,42,29,180,51,76,106,119,226,174,114,184,140,40,96,128,30,191,27,131,68,97,28,229,152,73,132,18,67,22,173,148,146,35,199,179,26,167,54,55,156,92,8,11,157,128,179,95,202,196,130,
+178,150,167,44,78,226,133,146,33,135,212,223,50,131,149,211,115,60,65,64,99,151,197,4,124,140,215,234,98,44,150,243,129,101,228,118,236,233,153,39,39,92,213,62,48,110,136,78,152,226,178,238,72,117,170,140,120,20,188,164,85,237,180,9,25,113,143,222,32,103,157,74,47,36,245,50,190,179,73,40,246,220,162,142,128,102,83,197,128,46,176,55,39,198,39,29,169,124,42,184,134,60,12,218,200,248,72,78,221,147,94,217,100,242,228,77,194,40,48,160,38,201,90,139,30,83,134,20,50,247,9,255,76,215,17,4,240,229,211,153,151,221,211,68,200,66,119,41,239,39,37,183,36,10,158,163,121,213,9,99,106,200,180,125,175,94,63,193,143,231,23,85,1,252,70,153,59,61,111,88,183,147,155,158,144,113,23,219,137,11,114,61,113,231,92,88,25,160,10,236,75,87,239,172,200,47,142,189,216,14,94,219,212,89,196,140,65,6,57,189,232,19,41,154,43,34,21,152,133,224,41,67,181,126,91,55,220,156,111,197,55,79,52,147,129,24,108,26,76,67,80,156,235,166,124,123,
+112,139,36,73,215,163,133,52,48,102,38,20,181,64,194,239,31,29,179,183,75,91,122,224,126,193,62,230,11,216,168,185,159,3,28,193,62,46,116,207,139,204,204,175,175,47,194,59,97,49,136,171,50,51,100,224,218,161,25,60,30,65,251,200,141,110,239,232,228,88,71,19,14,237,36,91,62,81,68,134,70,219,225,117,41,5,119,24,215,224,213,81,50,7,205,185,142,74,209,172,97,118,192,196,52,210,78,100,191,113,19,85,182,143,176,149,33,91,174,2,81,196,129,158,200,175,190,161,116,174,233,233,212,213,46,177,144,166,19,3,105,124,66,139,165,36,169,116,31,155,173,232,80,58,237,74,219,216,142,14,33,33,53,54,237,224,121,189,2,135,219,188,63,134,110,147,116,8,134,250,248,150,184,179,197,220,139,234,117,141,161,66,180,129,89,109,108,214,82,190,91,17,252,120,163,136,197,18,177,41,18,144,146,164,93,130,238,181,43,252,19,196,205,38,33,11,52,81,82,169,171,217,180,150,111,47,110,111,43,149,202,22,183,69,13,222,12,101,41,43,148,61,117,122,82,89,
+42,108,136,246,212,228,214,170,189,127,114,62,230,117,123,250,245,246,77,20,79,193,233,33,145,181,142,119,92,184,165,118,60,137,10,81,197,179,30,221,177,102,131,180,178,63,177,54,212,136,36,232,132,77,131,26,51,82,161,207,52,82,53,84,227,141,90,173,38,210,156,242,176,192,245,142,233,70,82,144,138,170,123,87,66,96,211,220,131,81,69,4,67,77,200,221,230,181,169,221,110,181,35,53,44,1,143,215,41,170,209,102,203,78,199,186,92,174,77,123,71,53,223,3,174,59,192,104,127,30,241,96,75,83,103,183,11,165,237,214,184,48,230,220,177,139,68,186,253,210,62,162,202,116,3,103,6,31,115,52,109,12,57,229,134,237,162,193,9,87,10,250,96,124,75,25,141,220,193,180,242,235,84,109,112,170,35,210,188,102,198,96,112,180,71,199,100,50,146,171,139,84,80,169,100,18,58,225,138,53,73,25,160,229,78,29,167,106,104,109,179,219,17,176,96,184,115,165,27,86,119,241,228,196,229,185,76,196,47,21,164,137,50,136,31,143,133,142,143,108,87,29,185,0,236,188,
+229,129,120,181,210,109,181,84,75,214,234,71,69,22,75,230,211,39,119,53,26,53,66,134,80,183,35,1,12,29,121,98,84,53,240,151,190,155,44,143,111,176,152,86,201,226,212,102,131,149,29,29,215,182,147,85,153,210,80,234,144,84,40,46,189,235,32,50,70,142,10,49,120,150,190,188,239,104,83,182,243,100,120,45,37,65,170,16,200,144,213,229,112,101,19,202,29,92,170,128,111,42,175,252,141,245,27,35,28,121,60,194,59,125,89,191,92,126,215,113,134,25,83,153,88,144,116,97,9,168,249,137,62,202,209,68,164,199,178,115,193,113,187,94,247,67,206,3,126,8,151,116,88,57,24,250,103,234,46,7,98,246,39,104,22,248,241,112,75,226,16,52,181,59,135,176,214,73,208,73,35,72,128,251,106,213,92,232,130,168,22,34,204,159,190,188,28,22,40,141,107,48,93,186,73,20,94,4,214,90,131,201,172,215,235,117,129,235,68,69,236,97,172,217,49,80,12,77,87,225,133,143,48,152,251,195,81,169,80,64,253,104,58,219,56,227,147,14,245,162,251,230,118,88,53,19,
+116,35,187,71,198,24,52,199,230,51,79,48,24,29,101,186,165,118,201,4,97,153,121,242,54,55,201,34,30,51,226,208,180,192,222,107,239,170,90,168,52,123,231,166,24,117,245,75,22,29,51,222,154,163,117,42,2,26,83,179,153,213,131,219,9,135,118,1,29,42,50,80,154,103,55,160,47,4,54,193,20,89,203,222,117,155,180,136,8,50,155,34,174,99,90,98,143,232,40,127,121,179,29,146,69,61,199,151,199,58,3,166,216,28,208,38,72,76,102,226,77,69,35,225,20,10,86,188,241,155,107,89,22,235,132,4,118,149,138,94,163,126,72,211,20,206,32,3,51,172,238,38,250,174,4,220,124,35,221,77,108,220,33,187,163,242,45,172,78,40,137,72,105,219,201,236,38,7,213,112,71,30,233,52,33,59,181,222,95,187,73,189,147,178,182,45,40,7,171,71,132,59,254,184,161,165,199,187,23,204,236,94,109,47,180,151,240,235,231,39,230,218,70,53,177,190,214,112,211,253,215,107,231,27,254,187,20,84,43,145,116,212,132,30,115,39,97,47,164,206,147,252,17,214,123,225,
+56,128,8,88,91,60,27,49,29,198,120,140,91,64,103,203,203,204,126,201,16,118,163,15,244,160,184,205,6,108,219,231,191,219,210,86,93,116,29,99,176,119,41,77,112,231,122,5,229,56,62,187,229,9,4,132,235,14,84,213,169,114,75,192,204,132,130,206,167,189,72,179,137,19,55,117,89,10,198,187,125,168,20,115,19,77,43,50,181,233,46,118,32,130,213,36,30,139,219,219,77,29,6,2,213,74,129,133,77,89,136,190,155,180,240,140,84,223,105,201,93,146,233,108,39,178,103,149,240,10,26,117,48,35,68,169,138,6,89,61,128,24,203,51,149,217,177,46,189,227,150,109,192,251,149,51,42,101,85,90,29,236,84,175,184,8,221,60,234,141,112,79,183,110,207,98,82,229,33,178,171,194,19,8,231,140,67,151,146,113,216,33,100,93,178,76,128,191,137,32,119,58,153,184,78,207,239,201,3,27,161,122,209,153,114,169,39,67,126,189,171,230,6,140,28,2,139,137,103,9,29,54,87,26,169,111,71,103,85,43,114,58,168,72,35,158,83,221,65,220,233,23,166,211,142,249,
+92,97,50,12,192,192,128,203,199,7,235,170,67,105,169,216,213,155,195,252,145,80,71,175,168,74,151,183,166,142,67,210,185,107,41,147,132,19,197,154,31,121,40,173,225,47,16,19,169,203,188,121,139,108,177,144,121,68,24,157,214,26,216,114,176,224,150,210,233,79,203,188,194,252,50,40,136,177,169,123,59,91,252,0,130,103,160,133,185,77,222,126,95,157,216,173,90,65,9,55,84,161,190,205,106,205,231,101,197,90,175,86,23,137,181,100,50,154,124,121,183,153,167,168,119,213,234,50,132,167,220,58,207,82,230,40,96,228,228,128,98,208,137,92,178,234,174,142,216,87,235,80,168,77,30,148,15,213,35,129,85,197,116,21,186,130,130,36,91,134,36,251,174,65,126,132,164,93,110,71,144,78,120,44,156,187,235,169,170,1,112,221,191,129,53,207,250,199,69,77,184,67,149,87,154,176,145,91,131,230,42,139,57,91,72,229,213,64,132,177,53,30,49,235,62,151,244,164,101,95,111,151,206,212,161,14,96,80,241,14,12,178,51,28,111,183,97,131,173,209,120,103,215,145,216,186,
+50,236,206,71,222,124,21,210,41,249,253,57,167,95,202,243,19,15,175,243,121,188,232,220,78,187,214,18,187,38,77,246,22,113,217,9,201,208,27,51,43,120,42,58,147,175,38,132,23,25,80,204,188,85,83,167,118,218,93,229,16,115,182,189,190,1,131,195,75,214,109,230,85,51,10,45,10,235,154,156,210,237,233,135,33,98,148,233,22,36,83,58,58,138,245,196,21,129,95,160,76,240,181,93,82,19,121,23,165,233,85,26,61,92,183,99,174,133,239,172,134,190,39,107,190,184,131,221,12,104,51,74,86,19,147,216,49,137,35,214,168,92,91,43,8,198,62,67,52,111,40,118,60,70,57,229,168,17,188,112,105,53,65,141,37,33,194,215,132,135,105,163,80,115,21,114,81,47,218,16,8,228,56,217,215,108,141,180,93,6,70,108,88,11,31,104,193,171,32,20,77,55,56,29,91,119,166,45,43,145,40,74,39,235,33,44,112,205,174,130,227,250,113,63,18,33,206,182,157,185,150,99,64,69,106,251,120,10,143,199,27,82,20,181,67,233,168,106,151,249,208,84,45,123,82,223,
+218,5,110,236,22,209,90,66,137,46,211,240,248,160,180,28,228,70,175,228,71,229,109,53,209,203,113,237,58,157,151,48,12,69,137,245,218,237,48,61,39,118,30,61,84,54,87,171,224,19,125,226,218,47,78,129,10,233,38,156,195,98,109,143,118,36,135,147,156,252,200,102,102,226,19,141,66,134,120,62,164,246,17,106,12,114,181,113,187,123,0,86,146,111,178,59,33,85,8,117,5,180,164,68,40,187,126,82,105,86,200,87,135,208,125,217,77,6,200,39,141,76,53,166,161,2,98,70,171,220,108,13,57,199,68,98,131,117,21,217,132,99,86,143,17,24,17,28,206,75,65,207,90,29,79,167,119,236,158,113,41,119,245,43,81,208,234,186,148,74,125,113,145,139,237,116,48,169,26,109,99,158,221,74,66,132,188,72,167,152,100,138,46,160,52,109,89,122,54,97,174,198,2,134,57,101,110,117,41,6,174,125,19,221,73,7,211,199,231,0,187,210,169,254,42,112,132,116,129,51,196,169,202,92,104,123,222,40,175,42,119,135,66,69,72,248,212,54,245,96,167,108,92,177,150,165,
+8,181,236,100,203,37,187,219,112,73,103,228,6,206,146,194,227,35,184,164,59,234,224,230,216,151,49,18,113,59,36,63,174,37,67,52,90,114,91,56,17,102,125,19,174,156,33,223,55,137,237,231,64,71,106,133,107,90,110,233,226,234,176,63,181,73,50,92,77,199,38,2,247,103,113,190,209,157,73,94,1,83,28,155,107,228,114,129,235,155,241,224,156,131,175,65,209,84,62,248,240,80,122,42,139,92,78,46,91,192,164,101,2,27,96,155,109,167,3,199,160,55,146,218,62,191,42,171,23,220,247,247,63,255,234,186,47,7,39,6,99,91,49,248,9,184,133,199,67,241,103,34,81,189,86,107,132,2,1,48,162,154,84,107,137,10,42,149,106,77,119,214,245,192,188,198,56,65,31,196,238,127,111,40,166,209,104,65,15,168,182,230,8,30,20,73,240,138,192,129,61,16,247,175,139,178,252,60,112,127,181,193,94,83,240,5,154,135,211,47,180,134,87,170,180,192,41,168,224,105,5,59,236,188,112,107,188,83,17,19,170,166,124,147,232,170,132,3,231,141,240,113,182,178,3,207,
+106,182,119,103,172,58,197,114,234,217,221,229,17,110,101,197,76,193,109,80,35,247,171,22,11,146,47,137,59,246,67,136,244,241,153,187,65,108,221,108,54,99,119,22,244,150,183,174,79,52,36,38,211,16,135,27,194,76,38,245,12,20,187,198,71,124,200,41,56,207,195,240,84,46,105,139,152,183,172,121,169,29,93,207,38,155,181,183,137,172,68,42,214,63,57,19,166,155,219,1,252,157,234,46,56,128,40,7,166,217,108,55,168,39,172,246,141,254,128,32,117,185,43,176,96,26,13,17,177,41,57,44,173,111,110,147,81,253,88,98,118,62,4,235,215,44,50,211,217,25,254,108,148,184,60,182,133,20,30,130,46,116,37,77,128,105,174,224,36,124,11,141,87,47,54,99,29,85,118,123,203,83,13,17,45,161,90,58,72,189,112,111,70,103,58,98,48,187,122,213,158,111,28,158,171,252,124,203,105,187,96,157,6,136,176,180,249,184,83,231,74,111,177,215,241,22,249,80,82,223,244,37,166,7,166,82,109,181,114,19,140,236,132,182,120,59,192,60,81,17,84,246,43,149,216,209,
+14,37,20,177,122,81,85,55,208,25,79,238,36,1,104,112,20,28,105,154,171,147,202,93,164,196,161,167,116,3,9,213,215,18,160,209,104,150,138,197,114,116,122,145,244,40,173,31,201,133,66,180,8,137,129,195,99,234,54,130,101,1,179,162,177,216,64,174,80,236,108,109,97,225,226,147,74,248,168,82,25,86,240,7,64,57,95,34,214,245,146,124,97,56,44,170,21,10,197,190,157,13,245,80,214,139,71,48,8,13,50,157,141,27,39,160,125,41,143,207,247,183,46,247,46,47,177,197,45,94,96,223,237,118,139,65,137,211,166,20,184,213,74,69,251,99,129,96,19,49,190,101,228,48,80,20,229,46,239,56,199,181,177,248,154,13,67,166,233,111,47,15,33,155,232,157,83,210,217,141,211,67,243,160,144,200,117,7,23,61,106,101,173,55,55,55,224,221,235,140,196,110,183,239,168,38,155,34,131,234,78,91,141,86,64,167,198,11,207,67,123,48,31,245,86,79,13,122,168,61,135,195,250,18,224,230,250,250,185,133,195,220,214,143,242,58,38,193,107,216,5,165,49,222,156,235,
+166,211,216,70,102,203,214,93,27,252,174,103,68,6,120,246,238,237,193,46,136,58,14,194,41,235,88,144,193,64,29,71,19,94,99,218,22,224,90,5,193,205,214,205,217,36,188,1,186,59,134,205,37,96,135,182,17,22,118,25,126,144,89,175,215,73,141,76,25,243,194,40,142,216,69,9,187,135,145,62,221,111,89,241,93,139,154,215,47,29,10,238,148,219,201,122,185,56,42,221,90,41,20,102,149,68,97,165,252,109,131,119,224,236,220,226,114,112,60,105,77,194,195,65,52,173,57,228,236,100,109,125,29,222,165,89,229,100,133,137,65,162,108,233,137,201,230,93,154,95,101,29,100,140,220,48,103,0,107,13,36,50,193,174,203,219,66,164,112,206,184,137,100,187,84,143,238,224,16,26,137,101,186,28,110,95,90,183,65,36,59,203,90,133,214,41,250,41,195,192,61,78,169,229,70,175,228,216,118,116,236,175,48,192,153,243,210,249,53,178,175,108,171,169,147,84,138,136,9,152,106,213,188,240,132,168,44,106,195,99,99,141,43,27,73,172,165,137,191,82,70,9,21,160,73,42,
+208,233,150,2,242,112,37,130,159,139,60,180,148,46,22,141,170,34,105,35,132,70,75,21,233,115,3,186,54,171,37,148,227,20,149,178,189,45,47,250,206,104,228,107,133,148,212,25,183,59,181,171,171,43,27,14,232,238,64,39,15,157,134,66,124,252,110,233,150,112,113,144,158,13,89,204,54,91,123,235,136,37,18,2,130,94,56,213,107,66,170,120,124,116,223,104,134,96,104,45,165,35,33,219,7,49,104,246,186,202,77,225,148,192,4,235,34,234,132,166,73,251,198,5,186,43,113,205,7,32,173,118,164,181,128,155,147,90,179,116,53,183,220,167,218,146,243,251,232,171,115,91,85,97,137,250,148,82,160,159,153,44,142,28,180,79,113,150,152,94,117,213,157,85,16,251,199,24,237,118,5,147,132,158,241,206,26,190,237,44,153,181,170,182,48,162,132,48,15,26,230,138,76,141,173,102,104,115,40,80,110,138,89,147,137,205,45,20,82,80,174,98,123,234,205,231,56,199,130,60,68,100,209,168,138,86,11,133,184,14,221,30,194,182,26,163,81,65,59,44,148,224,21,86,90,135,
+109,166,148,241,54,218,182,138,115,114,200,67,130,187,179,233,110,7,100,58,189,30,40,55,68,138,120,51,69,239,97,21,113,161,77,140,162,123,26,99,131,7,118,108,193,42,128,91,67,227,50,152,20,100,234,116,185,55,85,238,100,122,74,22,130,150,118,53,6,199,126,116,220,127,180,235,157,120,133,245,99,77,2,79,78,147,189,248,91,246,176,42,204,181,89,7,152,107,79,10,146,30,148,47,37,50,3,56,227,137,95,9,147,241,74,132,233,207,37,252,185,80,124,62,85,109,247,196,168,3,248,85,234,78,120,60,247,205,18,5,114,56,8,169,249,75,217,100,204,216,244,7,217,61,187,183,140,216,227,71,139,114,193,209,236,224,114,211,74,172,219,173,161,121,42,37,220,223,111,182,146,118,58,97,93,54,155,218,71,22,139,165,77,12,237,149,58,245,43,181,33,130,244,173,182,65,96,80,97,99,13,12,150,68,50,20,211,41,146,68,34,169,238,138,0,57,130,76,177,71,207,116,18,10,62,58,198,5,87,214,147,231,104,214,53,168,2,16,229,130,6,245,40,74,62,160,
+215,175,157,152,214,41,237,2,174,229,84,48,108,72,44,193,78,96,248,1,11,200,201,158,186,61,110,24,35,176,139,139,219,222,32,24,60,8,70,210,83,224,186,49,137,129,183,218,105,220,109,24,53,81,86,193,155,26,105,125,48,17,18,19,158,33,218,175,71,121,156,78,205,77,44,6,189,18,123,208,218,214,73,206,162,17,26,169,38,156,51,127,94,48,119,110,218,18,200,254,222,213,161,91,142,21,133,45,150,200,241,89,16,49,224,7,32,187,231,56,97,208,161,55,134,78,181,36,24,48,234,101,93,249,38,203,63,109,202,120,58,70,108,128,135,107,227,106,82,180,50,167,4,29,92,188,248,148,131,95,61,157,24,231,186,182,143,126,213,233,228,55,37,197,169,48,117,18,82,234,55,148,50,135,122,46,70,159,183,20,141,155,88,113,132,242,136,89,9,154,180,22,217,80,224,176,4,139,2,174,24,18,239,18,251,220,251,223,170,216,113,158,168,205,149,224,104,60,19,24,222,229,221,204,39,119,90,174,241,81,160,135,187,56,65,68,69,68,93,130,153,152,172,135,144,200,
+128,238,102,173,40,181,157,142,24,130,230,17,71,50,68,59,85,86,160,154,135,85,40,26,77,140,88,197,37,30,65,27,242,231,98,254,26,248,242,92,81,202,25,170,151,2,127,163,120,85,21,5,176,101,174,241,42,164,113,29,107,163,107,1,213,38,152,48,150,113,110,252,253,74,158,233,53,194,183,235,243,78,39,139,172,84,42,163,52,251,216,229,112,68,157,134,169,22,174,52,78,49,93,2,139,197,178,132,55,34,145,180,110,128,203,34,45,156,41,190,221,108,170,129,123,93,22,168,235,240,172,83,240,84,183,233,18,130,84,169,132,57,166,140,241,29,232,42,179,6,170,240,210,179,113,45,161,64,215,50,153,204,170,34,48,229,120,229,18,9,104,64,196,227,241,1,142,23,117,69,55,76,108,40,202,25,14,102,222,68,172,230,27,216,6,70,126,101,152,168,143,176,155,121,197,93,45,206,148,42,241,181,85,66,123,189,221,230,154,215,214,214,144,251,109,211,26,4,114,120,221,238,118,215,177,163,66,146,210,96,50,153,169,130,173,61,173,176,70,224,190,164,55,163,240,99,
+29,39,216,218,4,93,155,13,181,144,39,27,180,90,183,84,113,141,85,64,129,82,49,87,85,245,22,130,238,45,176,168,158,28,80,174,34,93,49,43,141,69,123,87,204,189,253,98,129,54,15,187,105,108,58,134,183,218,108,229,175,149,109,120,157,170,19,168,117,155,36,93,167,207,211,17,156,19,134,51,17,157,157,76,176,185,26,46,84,105,21,48,1,6,230,16,1,94,219,92,3,11,59,147,137,116,58,217,212,84,107,82,161,99,144,170,104,242,205,185,137,57,233,30,247,121,46,118,68,184,62,230,10,70,198,193,110,145,197,172,142,173,225,10,41,122,73,128,147,96,16,120,104,172,52,246,152,76,26,147,57,71,56,216,140,186,92,84,222,178,93,79,86,55,209,243,228,93,138,91,41,26,44,49,87,86,104,79,243,97,166,4,18,174,21,82,100,10,203,17,37,126,211,216,242,172,118,193,53,241,81,103,87,39,136,22,117,87,124,13,141,115,60,23,120,149,40,94,224,124,87,122,123,83,58,145,200,67,137,93,126,109,187,93,19,118,75,232,118,142,122,83,209,106,93,225,
+54,98,230,202,22,124,185,188,183,94,68,211,131,219,82,137,249,116,140,208,230,139,45,40,100,236,146,162,120,12,198,29,163,141,59,220,135,56,230,14,199,209,209,81,82,91,237,207,239,98,197,51,25,45,189,126,211,104,24,43,227,240,81,198,12,197,9,198,48,35,62,1,76,130,32,36,77,79,70,156,59,215,156,166,117,159,3,69,218,147,230,231,179,233,196,144,78,159,159,151,129,147,182,187,122,11,26,56,202,196,141,244,44,6,76,10,234,93,61,148,128,132,92,238,214,194,46,125,180,144,212,156,247,206,88,248,170,108,85,138,77,92,220,255,121,137,47,6,77,251,114,246,173,235,129,46,117,221,212,40,105,62,40,251,128,158,191,222,52,167,152,19,199,225,93,244,4,98,36,156,25,137,174,51,226,185,93,120,147,61,146,198,6,219,71,107,157,157,188,108,40,189,62,58,20,251,53,84,45,221,166,77,16,206,181,52,36,21,141,178,163,109,217,49,126,128,24,235,99,156,6,155,140,214,185,145,112,222,38,82,204,67,34,185,119,29,193,188,217,242,41,229,174,29,229,118,
+79,123,84,97,14,29,70,183,51,102,247,36,199,21,69,91,44,229,219,93,219,2,175,52,146,204,175,213,71,52,99,225,72,98,43,26,247,207,54,234,88,35,22,139,77,177,29,236,142,249,76,219,67,33,115,234,43,217,93,135,69,221,105,166,122,201,182,139,80,149,107,98,2,138,46,160,194,76,154,132,219,206,157,47,32,210,224,7,12,28,246,70,72,33,223,236,236,108,35,19,151,1,19,162,122,44,211,38,194,61,206,241,249,248,248,248,156,133,58,184,96,123,141,241,84,107,70,226,68,143,138,91,162,194,22,14,209,106,207,242,76,95,186,140,38,7,75,70,9,47,150,139,135,2,30,62,30,58,13,69,178,80,3,247,128,206,208,140,122,252,169,83,33,230,9,133,41,111,49,11,120,182,79,210,71,114,148,106,181,170,31,141,239,38,147,150,157,115,230,165,150,107,181,105,147,112,109,194,24,39,215,183,150,219,13,109,181,86,3,249,59,14,158,50,159,167,240,168,192,133,75,148,105,77,250,253,249,164,227,115,246,212,39,171,33,131,193,48,207,7,178,249,221,160,43,45,
+246,52,51,102,214,136,126,89,240,80,50,91,41,72,169,61,77,0,133,87,51,66,19,171,107,211,156,197,204,64,116,123,107,119,183,99,89,223,150,25,103,231,3,124,107,194,128,71,33,45,102,53,136,152,41,28,168,93,168,118,149,73,144,123,97,187,255,15,207,102,217,156,76,211,109,225,191,14,193,2,4,15,16,130,7,119,8,238,16,220,93,7,119,27,220,109,14,247,243,86,29,62,164,138,145,102,232,222,123,173,117,13,147,23,168,121,43,76,52,63,237,207,72,155,29,25,213,32,194,126,137,7,46,143,151,216,230,106,8,43,66,119,181,91,156,93,123,209,227,217,44,10,207,200,107,118,237,89,89,58,112,38,164,181,174,0,30,1,28,29,230,158,3,83,11,32,0,185,92,138,142,198,236,13,215,132,7,109,126,135,41,128,151,168,12,27,131,21,28,16,184,234,158,49,127,195,70,45,230,154,228,75,41,208,98,113,133,33,61,239,11,193,170,230,16,66,97,88,118,25,56,230,50,247,187,102,99,13,252,12,204,186,59,113,133,195,192,217,181,125,224,200,66,242,13,68,
+164,11,75,59,164,179,177,117,178,124,72,28,136,96,108,168,159,57,39,35,57,24,26,3,42,29,101,31,13,48,167,58,91,150,211,122,42,69,247,236,216,80,211,190,45,112,140,245,4,55,222,110,159,35,177,52,51,35,210,246,245,179,58,221,177,103,52,56,235,73,169,209,60,74,167,173,218,240,245,97,28,103,222,102,8,159,76,79,128,69,140,109,98,236,31,10,235,182,219,109,85,245,75,96,99,2,112,42,252,28,91,198,98,31,31,31,2,166,163,164,42,15,199,227,190,238,109,163,120,113,212,219,122,90,44,149,88,223,223,157,55,167,223,44,240,40,230,10,236,189,122,15,160,243,132,226,15,69,220,226,125,130,101,109,227,18,103,206,7,94,69,142,125,62,248,171,210,31,147,65,170,5,26,131,174,94,92,136,129,210,117,186,28,125,242,60,147,231,83,86,245,35,41,247,236,207,243,83,127,252,82,99,255,245,75,130,21,78,139,55,68,201,70,76,146,108,72,210,29,105,47,237,221,250,134,102,142,125,7,115,85,116,116,33,15,137,33,119,101,252,108,134,126,52,128,194,
+96,160,73,132,66,187,7,206,114,120,158,246,150,231,98,137,89,88,86,237,173,69,198,255,186,132,99,165,102,40,214,220,74,225,92,46,2,206,253,95,148,216,239,27,159,58,78,177,121,178,204,241,91,243,165,153,88,167,136,113,243,241,239,198,104,47,170,147,77,116,184,41,211,204,92,98,82,238,89,226,48,222,176,47,99,80,49,110,139,29,203,247,218,209,106,117,75,150,87,29,88,36,214,5,124,71,162,37,238,101,95,240,102,193,109,152,156,254,234,34,134,135,24,69,56,98,95,145,1,22,38,111,165,179,217,107,173,231,143,251,62,241,68,46,254,244,111,179,25,146,0,142,68,121,135,59,51,54,184,144,253,226,157,172,127,145,162,92,151,38,119,60,100,38,39,169,95,62,107,227,153,223,155,228,12,87,228,83,169,84,69,161,107,203,106,232,236,155,91,128,250,203,231,243,15,152,199,55,232,116,244,123,104,146,29,38,152,145,32,33,216,209,61,91,189,237,35,78,128,225,148,202,153,62,194,127,236,59,62,120,253,151,119,207,165,172,237,250,221,184,159,230,135,9,136,129,
+197,227,111,215,171,254,239,62,26,141,44,32,23,240,188,250,203,56,62,164,223,199,8,142,72,51,214,60,94,185,197,124,149,45,140,25,105,242,11,214,44,61,75,137,109,155,118,153,16,146,134,148,172,87,68,233,50,22,20,106,184,203,81,66,140,107,87,70,231,15,180,196,73,157,221,196,129,88,159,37,180,235,157,130,157,91,207,240,96,108,206,158,234,143,17,227,155,140,33,215,83,0,95,156,4,60,163,142,104,45,90,25,0,11,177,194,42,254,44,225,181,5,189,49,86,144,199,4,114,91,62,223,182,39,197,167,170,69,78,126,124,40,223,63,116,69,28,49,73,216,106,214,222,125,204,108,204,184,46,177,66,32,94,143,199,98,178,113,154,219,17,245,207,212,66,193,68,43,152,30,57,68,240,130,178,2,184,92,75,150,249,214,145,93,116,230,215,106,156,66,137,171,255,30,54,171,208,76,51,166,16,27,186,13,27,209,113,172,158,246,244,14,135,113,12,184,140,23,16,228,24,152,214,223,64,175,248,106,209,162,75,178,12,82,206,198,150,119,224,116,108,206,112,99,180,95,
+206,26,42,96,239,199,152,112,56,190,149,14,229,222,225,76,28,79,12,112,161,116,2,185,146,195,172,26,184,250,167,205,247,242,103,120,227,252,93,56,111,211,70,193,197,183,177,104,239,250,21,246,235,37,139,194,0,7,188,227,119,186,82,23,49,198,239,126,208,45,57,22,215,152,186,42,131,184,52,30,103,104,128,168,193,165,72,234,121,35,125,119,21,240,92,103,42,31,9,217,90,45,53,90,45,90,219,128,127,22,57,244,74,99,200,222,30,254,160,123,104,131,233,16,178,152,67,80,109,63,46,170,184,117,121,20,124,167,56,79,171,134,84,68,163,209,42,58,98,235,177,137,240,19,113,100,28,55,166,125,126,154,150,215,253,196,59,100,239,53,251,61,76,226,71,188,212,40,26,125,247,56,195,134,225,182,125,184,47,219,87,245,191,46,172,74,231,70,149,51,168,123,96,235,211,125,233,21,189,91,28,144,234,63,127,235,23,130,7,18,10,32,45,118,37,21,96,160,86,36,244,172,143,236,191,103,222,107,141,111,148,243,204,254,49,124,28,186,213,25,121,49,212,147,161,105,
+231,116,135,229,158,106,254,157,48,146,64,91,130,236,217,66,9,63,41,195,167,240,2,247,148,47,175,238,59,18,167,129,237,86,251,251,107,185,182,175,155,209,104,26,14,187,177,210,112,140,148,250,53,190,194,35,253,179,65,151,126,186,137,124,200,116,119,72,115,171,192,88,240,212,179,255,45,156,85,97,154,232,120,103,137,198,211,120,121,124,135,86,195,60,213,99,158,149,45,235,236,93,145,88,232,46,165,217,171,255,26,82,187,27,210,93,76,28,90,86,22,206,208,43,195,123,19,108,113,180,67,30,25,72,254,77,162,165,85,170,93,220,54,77,127,29,236,242,7,146,112,126,80,156,63,59,155,243,199,106,188,181,237,48,187,151,76,122,120,233,152,125,245,156,89,156,216,172,246,200,233,169,63,195,189,152,58,221,4,65,31,124,254,46,87,169,16,84,103,195,125,179,42,20,227,150,31,243,254,254,62,76,228,24,112,122,146,239,105,6,106,53,22,237,3,17,195,196,98,57,100,66,44,239,200,229,89,81,99,179,193,108,6,248,13,67,219,232,124,81,169,127,225,99,132,108,
+145,74,165,8,12,73,207,51,142,62,46,107,179,191,131,169,245,230,115,149,138,193,96,44,222,62,224,53,65,239,151,85,20,106,73,90,237,192,196,23,176,34,179,67,232,112,56,204,116,179,217,96,14,135,143,13,209,168,252,241,247,194,106,157,145,249,165,69,235,20,58,93,106,205,232,209,145,170,178,190,170,86,122,244,66,33,60,141,12,218,227,226,133,198,64,104,235,217,237,151,78,164,133,181,73,83,181,151,236,10,127,100,193,125,67,182,184,190,64,218,251,72,247,225,47,183,209,221,249,31,159,245,103,233,86,29,235,103,253,61,179,156,173,151,102,97,243,71,245,184,36,222,214,181,130,255,204,129,158,104,190,249,200,77,31,156,3,124,239,83,43,69,161,7,24,26,138,113,197,48,174,232,244,231,249,50,114,58,36,89,149,220,222,244,244,84,160,138,125,58,111,148,20,94,46,223,143,196,28,215,157,193,90,186,15,6,160,175,84,124,100,56,144,105,209,179,108,56,159,124,188,176,138,198,98,177,83,16,82,170,216,34,144,172,87,166,211,195,156,57,194,165,197,181,179,17,
+124,9,199,24,176,177,169,221,110,231,95,46,151,154,29,5,31,24,88,149,212,31,179,229,216,66,137,16,158,243,28,244,41,223,47,236,206,154,106,195,86,83,207,41,156,229,233,164,18,158,121,195,76,57,247,105,176,77,24,100,83,97,113,154,218,145,131,150,46,205,241,64,126,117,250,86,79,234,222,200,208,31,247,187,173,63,91,114,255,30,216,59,65,191,147,163,73,124,173,66,225,139,109,114,221,174,48,235,8,241,21,227,36,11,49,249,244,15,171,124,0,41,194,96,2,226,67,145,244,247,10,37,131,65,112,9,253,154,76,247,137,136,164,21,108,125,112,68,166,101,175,103,222,181,49,97,224,128,153,188,97,242,168,182,199,222,239,118,55,165,10,175,125,80,134,169,146,196,92,240,7,37,44,95,176,156,52,153,74,221,92,204,214,202,251,176,84,250,163,7,52,196,182,124,58,63,207,210,124,123,248,133,53,66,11,142,170,159,16,98,136,87,76,239,253,207,61,161,175,89,143,117,111,152,219,150,137,238,38,222,244,239,67,255,29,43,72,254,212,223,153,239,67,45,113,120,
+80,99,7,218,67,63,229,221,246,211,219,190,154,56,94,80,247,43,87,223,103,117,253,112,79,143,81,1,113,73,40,208,164,221,159,254,7,223,123,113,192,155,14,215,120,236,238,238,221,185,217,52,174,26,135,79,146,123,36,144,49,199,179,200,183,86,66,191,0,165,123,197,239,239,75,93,180,21,238,59,193,189,121,34,39,210,140,182,64,132,197,16,249,95,144,212,206,32,54,176,231,246,249,182,117,228,85,191,50,177,24,54,24,14,75,197,162,169,99,181,22,220,194,102,211,223,36,16,8,106,70,98,218,144,93,154,160,142,219,175,195,159,49,148,134,96,251,32,6,216,236,147,236,108,61,253,118,57,49,14,176,136,33,243,226,116,239,75,76,53,98,156,34,233,249,128,74,45,246,188,44,184,252,219,87,97,85,83,251,251,67,183,173,22,62,9,93,235,26,246,41,253,186,22,29,207,199,53,136,253,166,41,152,39,2,199,126,206,199,227,74,129,64,112,175,196,229,108,179,249,208,254,247,80,103,76,198,23,102,145,248,97,250,75,111,243,167,82,26,137,36,180,124,169,47,141,
+150,77,163,12,253,200,11,233,174,185,33,153,193,176,116,252,231,55,249,100,221,241,27,255,198,153,227,233,36,235,103,3,127,127,175,68,98,255,91,212,94,46,220,236,110,246,32,8,90,44,150,8,25,64,225,153,95,31,72,102,75,195,97,179,241,83,177,105,63,201,202,99,27,102,251,121,25,37,89,252,116,58,253,18,128,40,76,173,209,164,136,150,208,103,40,228,151,94,62,47,46,29,220,232,63,200,182,130,47,211,132,60,248,237,249,67,184,110,52,64,117,135,224,109,4,120,182,109,32,30,251,243,35,223,201,158,169,143,3,191,20,166,59,189,206,173,204,185,27,235,175,253,221,195,112,241,196,170,119,239,243,14,165,145,111,237,22,21,186,119,197,48,8,238,61,105,249,117,75,128,13,37,152,192,150,209,120,56,4,71,244,18,196,214,155,139,210,28,133,85,110,55,87,199,148,68,76,219,253,126,73,110,70,25,82,124,22,248,212,229,121,78,91,173,203,114,189,100,57,28,207,138,214,98,151,183,136,14,17,131,175,22,116,212,242,9,244,204,132,250,60,134,238,215,139,123,
+41,111,160,43,34,146,24,233,122,170,24,197,79,92,250,160,61,26,245,69,163,43,245,68,87,21,44,142,47,64,214,97,222,239,65,20,97,5,54,161,71,161,120,87,223,127,33,52,14,70,220,115,57,224,89,193,65,198,144,253,160,108,195,163,114,205,77,98,142,230,8,72,15,40,79,102,177,231,102,187,158,157,167,185,185,179,15,103,71,217,184,209,160,251,223,66,245,168,24,148,231,18,27,227,43,80,222,31,143,84,76,70,122,150,239,240,84,107,25,127,18,33,240,173,223,190,150,87,103,237,3,234,253,215,31,48,75,227,121,98,242,87,207,153,102,179,75,230,10,203,143,150,132,233,45,25,98,96,164,178,168,84,158,201,61,201,99,99,103,26,32,91,180,44,152,11,8,135,183,128,191,149,240,86,102,128,102,181,144,79,234,177,235,129,182,2,9,71,54,153,145,5,192,209,32,116,80,25,172,43,241,92,49,25,157,47,12,100,72,54,64,99,232,97,116,69,134,68,209,145,232,17,250,113,30,223,206,35,187,253,56,154,76,209,77,170,53,64,103,238,178,185,99,238,84,62,
+230,158,29,141,212,61,216,62,127,98,181,2,137,148,225,25,108,207,63,199,169,150,236,185,131,28,194,71,162,68,104,32,240,89,236,63,89,75,237,111,74,2,30,19,152,46,66,139,69,186,48,35,242,98,121,138,75,161,42,118,126,200,29,86,207,141,74,55,189,88,110,171,143,85,14,54,223,237,165,211,3,242,99,231,114,164,95,39,32,194,102,23,167,50,245,248,100,178,184,206,108,46,33,234,245,122,185,92,14,45,66,168,63,40,184,195,104,246,186,127,207,101,127,63,23,133,208,216,210,131,45,201,77,94,186,134,190,90,20,145,149,236,49,200,58,188,49,214,173,198,242,102,66,172,29,158,61,126,217,246,137,164,173,86,101,202,187,67,102,209,113,160,165,68,61,36,98,30,216,86,74,152,107,126,170,100,127,125,43,72,176,201,167,130,217,146,194,250,252,6,243,67,246,112,193,233,109,45,182,90,203,19,72,137,68,145,132,204,43,208,203,71,122,91,86,39,168,132,244,146,102,198,219,121,34,206,76,174,187,130,113,240,28,167,87,90,18,107,72,37,142,201,115,246,7,47,
+39,52,123,228,150,21,100,35,158,238,251,249,57,11,32,224,144,155,214,99,139,77,255,92,188,50,55,235,13,247,165,117,167,104,57,13,154,170,27,56,19,5,186,183,145,67,208,81,114,124,223,183,13,104,65,86,74,38,22,181,105,214,88,174,253,239,67,164,244,77,206,40,14,13,14,23,132,200,108,246,124,52,146,34,228,242,201,108,86,175,127,215,175,101,192,125,82,238,182,205,199,188,172,22,234,10,211,149,83,11,161,125,135,211,105,62,159,175,240,53,99,100,79,177,119,189,255,170,104,199,249,100,240,231,131,147,15,10,164,3,191,154,84,97,217,224,19,46,161,159,141,243,150,191,187,220,208,39,13,10,178,111,233,129,44,249,247,78,242,82,82,57,220,244,248,123,250,113,126,141,91,1,26,201,251,20,247,42,16,49,171,97,191,49,181,158,117,83,159,202,215,149,17,135,0,198,99,1,147,220,176,217,153,243,167,207,188,152,117,166,206,54,56,144,158,66,139,18,22,182,37,194,19,205,113,134,26,66,31,126,156,134,146,177,149,133,103,200,136,211,216,179,253,107,19,78,
+4,186,212,188,55,233,77,123,61,207,99,134,244,227,166,152,221,59,74,120,206,68,132,127,100,64,240,239,150,27,211,222,18,27,148,93,227,124,247,88,13,129,199,95,232,248,85,81,158,169,202,75,106,123,103,219,5,186,75,248,220,192,119,109,104,158,172,159,208,132,71,238,192,55,121,116,18,187,211,144,78,175,215,219,237,23,216,106,199,104,33,27,85,177,40,66,116,189,50,224,121,177,80,219,151,131,219,7,189,199,102,230,14,135,189,57,165,183,200,39,218,202,171,184,94,8,231,191,181,50,94,200,165,86,243,213,18,9,138,51,52,133,103,69,57,252,247,211,141,130,183,199,118,197,178,226,176,234,216,79,246,119,88,97,221,69,93,183,4,20,82,62,155,157,221,139,95,250,45,221,242,124,140,158,90,67,249,49,208,185,82,97,222,31,89,224,92,11,40,214,8,204,143,248,84,14,173,106,44,199,208,25,88,141,184,126,224,132,108,129,192,72,172,225,82,16,172,80,58,174,124,124,195,218,60,46,64,33,55,100,147,1,103,52,165,247,168,175,226,235,144,7,221,11,101,52,
+227,9,126,70,203,205,113,209,239,99,62,164,3,177,134,78,7,15,229,67,83,147,116,167,184,83,240,131,133,67,19,45,102,159,229,109,236,187,112,250,203,221,147,253,225,142,172,73,255,250,143,112,8,160,9,149,74,133,201,46,133,212,169,88,148,96,235,50,103,38,111,115,229,252,89,4,114,53,180,232,151,193,123,124,117,221,26,21,188,168,151,153,45,42,163,79,100,52,210,190,58,29,0,229,85,28,34,150,79,140,231,190,77,72,36,18,245,54,135,56,73,130,150,100,67,203,76,141,72,28,80,234,181,192,157,221,163,21,4,244,243,170,190,59,230,241,120,228,192,111,202,33,227,223,127,100,50,153,155,67,245,12,95,100,28,156,21,246,232,167,198,210,239,90,104,133,198,249,192,51,115,137,196,203,183,21,114,65,121,97,102,23,6,73,193,205,50,104,189,153,67,230,171,109,60,157,160,93,116,58,193,249,112,64,247,32,165,138,192,252,125,136,37,34,34,231,126,117,159,39,159,131,141,60,48,199,240,121,77,190,64,132,166,80,168,201,76,76,1,224,9,170,119,162,146,64,
+250,80,127,188,203,73,132,167,234,184,77,154,205,233,184,222,26,117,66,222,5,124,16,11,40,20,253,161,111,200,126,32,78,137,57,12,134,223,101,240,52,18,50,32,75,200,204,21,130,174,201,77,115,30,174,133,164,108,225,156,151,243,11,172,77,232,253,139,218,146,87,151,2,211,209,25,233,226,221,89,68,13,183,123,135,183,178,89,50,147,196,100,178,217,64,181,250,243,14,62,95,62,153,120,255,33,72,112,160,182,129,178,101,55,201,233,116,122,126,209,227,188,172,185,157,94,156,24,253,171,185,174,23,227,90,117,34,30,206,237,17,251,204,232,54,172,222,219,210,121,150,162,149,233,154,12,128,105,93,179,231,253,171,231,125,236,239,133,46,181,187,187,252,241,104,245,174,133,229,56,32,102,100,97,128,231,58,223,125,33,220,171,115,3,114,139,203,35,158,246,215,187,47,117,56,177,91,220,24,241,13,147,63,250,142,160,74,18,89,209,14,200,8,237,50,209,254,112,250,23,128,181,28,85,111,224,233,244,146,48,159,230,199,168,126,134,31,183,63,44,237,254,194,142,44,140,
+249,37,158,131,255,60,7,191,8,191,91,152,245,116,45,62,147,221,2,242,173,90,229,255,188,175,183,107,125,24,22,205,78,179,29,191,175,236,19,202,50,57,154,42,91,53,155,85,143,72,250,203,114,244,48,202,203,204,67,221,72,37,185,201,228,218,165,6,93,4,190,237,58,151,219,87,53,137,109,208,67,111,90,189,143,10,226,224,90,78,146,56,236,253,191,234,99,124,39,156,86,5,14,92,182,154,46,133,131,233,239,112,108,94,232,249,202,29,166,185,255,138,247,21,87,30,22,250,171,199,174,12,217,7,95,199,87,252,238,12,95,57,147,200,253,238,84,183,29,54,31,186,111,248,231,14,155,51,46,85,76,202,209,160,28,150,124,214,118,192,96,50,23,43,90,8,220,203,127,149,58,126,118,211,118,58,170,94,243,206,101,210,91,101,141,152,197,208,140,43,11,189,24,161,12,162,138,137,252,148,148,103,230,197,131,188,110,209,74,51,41,49,38,213,137,179,157,67,32,177,60,22,212,104,231,177,245,19,234,100,57,239,242,251,123,123,77,37,11,126,125,144,152,10,121,127,
+218,237,55,234,138,255,25,25,11,84,48,246,171,104,78,42,21,172,2,0,214,200,141,20,197,36,78,96,196,194,12,100,166,188,234,14,76,93,238,180,10,169,57,236,23,125,70,110,49,69,6,214,255,169,150,189,21,209,179,110,50,147,30,248,238,188,121,239,49,10,1,189,77,161,78,13,119,94,241,14,182,94,1,232,158,125,198,98,216,139,244,71,148,98,91,73,247,197,28,52,18,142,175,16,49,200,10,221,252,47,210,71,137,86,49,99,48,163,72,152,195,180,152,203,227,129,65,195,105,252,154,15,125,238,133,187,253,205,79,8,4,42,225,69,67,31,241,235,98,26,51,168,110,46,148,229,128,195,3,22,75,185,253,211,40,201,172,75,105,67,46,23,183,62,19,228,185,151,114,157,95,169,119,77,10,166,193,8,191,73,253,63,93,227,152,117,13,109,131,33,111,9,178,190,97,159,141,47,106,253,147,108,123,239,20,38,35,202,2,187,130,45,250,35,76,180,208,239,116,231,243,233,222,30,77,231,150,27,158,91,61,163,238,136,28,224,58,174,69,125,26,187,138,188,72,184,
+12,33,201,28,227,23,25,20,255,200,212,104,21,90,167,253,167,208,252,208,0,157,55,51,157,86,214,0,17,34,128,133,147,46,102,147,233,139,173,101,227,241,248,64,194,137,158,230,197,92,231,49,219,197,11,144,72,228,162,14,153,19,47,146,203,12,97,230,64,32,208,213,153,110,162,226,98,60,24,12,232,238,219,41,205,115,177,160,223,43,104,109,47,91,53,183,202,21,144,121,45,142,174,161,234,112,56,118,253,87,246,116,95,247,95,46,67,255,121,238,147,216,159,214,229,254,154,104,199,131,113,220,167,68,167,203,216,6,191,66,55,26,141,142,13,188,47,5,151,207,35,251,105,193,71,44,198,251,175,28,97,52,26,31,253,219,63,123,180,90,13,214,219,229,146,226,185,27,236,252,115,95,200,20,79,161,238,230,204,98,177,238,170,178,250,252,188,173,104,17,34,23,207,148,252,22,127,243,123,100,109,113,84,149,84,21,89,138,141,62,96,50,28,219,166,227,207,32,254,50,10,63,225,196,6,129,211,36,43,76,216,18,9,121,180,86,187,188,188,184,70,222,54,108,190,13,
+57,67,164,111,236,167,198,253,126,151,95,208,72,2,59,74,145,96,177,12,108,21,137,124,80,94,241,192,242,66,87,190,165,177,248,234,196,127,66,248,231,85,178,152,76,96,106,50,145,99,131,181,165,141,253,248,61,112,58,13,153,157,54,241,219,52,9,127,244,88,78,164,227,178,21,79,39,4,117,220,146,89,105,65,78,160,79,43,236,99,88,102,162,223,224,233,136,136,241,206,233,176,123,190,91,83,236,38,180,6,219,64,253,251,53,95,243,234,140,237,172,3,48,228,253,223,155,89,45,185,86,142,66,118,145,250,167,42,119,153,18,126,79,141,0,56,129,134,41,211,132,105,114,41,77,58,165,169,230,74,154,41,113,54,250,1,37,3,148,132,31,201,75,187,150,99,45,110,45,53,72,171,188,123,127,111,251,155,0,209,113,133,159,136,68,197,211,131,106,77,224,33,94,107,122,36,194,252,71,226,242,37,62,211,209,40,173,140,51,168,41,103,169,242,60,116,87,71,41,235,118,74,22,10,14,124,39,169,192,245,130,112,18,225,58,231,83,169,101,106,30,200,241,83,249,204,
+173,148,208,19,222,201,33,88,35,45,48,24,40,164,143,205,241,200,160,209,184,115,243,230,76,203,120,134,246,253,148,10,131,9,155,66,161,73,153,205,58,32,155,109,31,87,234,245,204,117,213,208,71,96,72,65,207,166,135,148,86,213,119,220,47,38,232,254,253,134,57,79,203,106,245,235,130,122,151,3,190,194,112,8,27,134,82,24,42,67,48,198,188,184,173,196,33,77,73,164,148,30,29,164,217,100,153,231,125,19,105,177,176,112,151,64,57,136,243,163,247,251,101,231,163,188,37,24,106,248,47,37,173,68,19,60,3,216,26,198,94,23,84,24,138,40,130,195,5,208,250,198,122,45,213,31,168,227,56,76,123,186,94,175,131,239,70,227,167,97,203,182,31,7,122,187,211,56,130,192,77,98,65,254,193,19,193,238,154,220,235,245,130,25,226,118,219,50,207,74,252,54,229,91,15,192,170,31,124,111,158,167,116,119,255,144,221,201,80,29,165,236,176,112,193,189,14,0,112,109,112,157,128,195,181,47,197,63,62,246,128,107,222,242,23,245,30,82,166,35,231,31,38,31,221,254,
+219,146,114,18,159,123,2,168,136,91,199,195,15,132,209,172,97,186,53,154,177,54,17,129,141,43,187,196,60,149,242,104,240,41,181,92,46,255,80,40,82,73,229,110,111,75,238,119,137,237,86,113,191,15,62,229,10,150,28,146,208,149,26,154,82,116,160,93,79,203,143,95,28,0,137,34,20,34,113,234,14,75,13,202,184,133,228,46,170,147,4,206,96,229,158,200,155,166,66,14,199,55,154,176,167,117,114,43,222,96,205,166,83,37,223,181,218,110,65,176,244,71,55,58,203,205,66,214,32,124,199,103,86,211,25,213,188,254,240,125,144,50,152,246,164,215,201,92,65,50,255,63,94,110,32,116,190,192,45,159,248,37,156,76,137,245,233,113,106,159,161,140,22,223,153,76,62,109,195,248,231,119,135,46,147,173,215,235,164,222,35,123,123,21,38,57,193,132,181,239,240,90,40,24,20,171,235,166,119,42,199,241,118,80,86,202,196,87,100,240,33,94,46,73,83,52,21,10,178,79,20,33,205,38,111,79,236,110,156,222,80,176,176,105,48,20,82,11,183,9,134,38,27,118,245,31,
+6,194,139,120,81,88,14,158,169,75,103,124,25,153,168,223,239,195,253,82,1,239,123,63,107,229,213,49,75,246,18,163,17,165,143,127,255,177,184,19,36,245,45,132,25,57,51,103,145,243,46,101,5,254,72,107,232,52,252,12,39,195,16,74,52,197,108,230,153,7,228,70,165,13,153,220,183,227,162,234,236,80,252,111,182,90,84,104,63,218,89,201,238,75,131,126,138,167,98,60,30,143,156,249,15,100,236,121,223,249,50,219,107,126,56,28,138,94,250,39,100,145,75,95,155,141,225,248,1,10,120,4,206,193,218,126,206,63,59,29,24,86,240,158,150,112,6,174,151,17,195,177,91,204,27,220,184,61,120,14,168,47,232,177,130,222,95,229,169,103,49,153,124,38,141,86,24,159,130,27,67,234,37,140,58,111,238,25,127,43,241,21,168,67,13,29,197,252,162,84,56,184,236,67,146,136,197,224,33,28,146,172,186,34,126,72,81,139,207,220,12,250,96,50,29,138,50,61,159,229,98,141,249,61,164,197,40,117,186,229,114,54,69,175,86,163,237,229,21,222,100,34,17,126,150,109,
+223,42,201,145,113,178,255,93,245,122,91,234,214,193,70,207,93,152,200,40,152,4,12,230,212,143,176,171,36,80,54,87,81,36,134,118,160,177,82,18,109,53,101,161,39,211,171,211,54,150,187,44,9,183,100,117,61,102,106,14,185,10,153,226,116,236,245,75,172,109,77,121,158,96,204,125,96,207,49,223,105,102,122,166,61,176,116,230,131,253,227,23,174,94,238,215,247,93,129,182,51,182,190,59,44,173,6,189,179,53,150,93,59,204,242,245,195,121,249,198,65,108,45,195,214,107,15,98,79,93,244,231,115,231,219,101,59,136,74,69,162,111,132,107,243,184,30,222,161,85,205,40,115,185,56,174,56,66,99,100,48,24,194,32,223,190,69,230,39,235,249,60,112,62,45,155,148,191,196,109,103,111,80,123,35,34,207,141,99,47,73,203,101,86,252,71,35,157,179,194,6,7,131,137,64,147,156,72,216,100,50,241,204,72,176,42,125,65,211,187,15,85,237,84,180,212,102,49,223,16,199,19,210,68,134,99,71,96,173,223,139,170,47,76,94,32,24,111,229,153,89,76,231,154,184,4,
+19,26,102,234,153,67,184,5,11,200,34,97,110,239,171,64,139,191,50,57,68,87,85,162,201,202,40,197,150,53,8,84,21,153,236,251,249,180,119,124,215,227,209,82,252,200,158,222,147,100,42,194,15,51,40,255,252,175,252,130,73,188,22,63,218,18,117,69,178,204,235,252,168,113,131,154,255,105,104,27,229,97,7,194,170,98,137,196,20,227,204,86,75,171,94,5,144,13,58,71,123,84,146,159,61,114,0,86,26,118,130,227,168,140,79,114,82,18,144,74,117,25,240,6,131,95,165,114,62,35,126,191,94,117,192,41,0,0,216,194,1,212,179,78,54,251,123,54,155,219,85,95,165,225,48,20,154,133,94,127,36,112,56,38,214,106,213,176,49,186,164,229,169,49,24,177,140,95,157,87,107,10,26,205,249,119,177,40,148,86,103,73,35,119,218,110,210,134,31,67,38,159,39,186,238,152,176,15,80,248,178,163,234,9,4,17,186,140,152,158,79,209,10,212,186,51,83,142,197,57,57,210,110,136,95,42,151,247,35,177,232,137,6,104,106,118,168,137,241,233,132,114,79,166,67,249,
+15,244,233,106,211,26,216,183,246,223,141,197,43,221,252,67,168,143,226,122,221,13,180,50,177,197,98,33,120,46,189,13,251,243,249,36,241,215,94,158,99,63,209,121,225,207,217,235,114,37,209,69,58,221,50,77,11,235,64,55,64,255,252,236,20,156,141,6,103,219,112,158,162,43,0,96,175,61,217,53,186,86,175,83,157,250,56,243,223,175,60,22,184,135,246,106,186,194,184,113,101,194,88,48,201,166,207,140,208,82,166,152,69,84,126,225,221,97,94,214,101,62,179,191,180,126,18,255,201,212,161,245,33,139,47,234,231,16,49,113,244,121,141,52,133,136,133,134,215,6,181,109,24,14,135,195,244,209,95,87,217,200,7,243,212,217,7,147,70,5,253,10,218,195,248,41,104,167,55,155,141,126,94,87,152,166,62,152,24,184,7,246,185,8,158,169,93,44,75,146,159,159,159,95,203,58,157,78,15,146,170,95,50,193,190,68,125,254,104,227,218,86,59,110,237,177,7,88,132,129,16,222,183,244,251,220,98,119,210,158,214,249,222,82,226,198,165,188,90,173,70,163,81,205,223,38,
+242,213,114,54,91,112,38,11,185,66,49,252,125,135,47,148,120,56,136,227,37,118,91,92,143,182,163,222,93,70,106,47,209,79,247,241,28,110,161,201,81,23,154,205,60,135,67,77,54,221,5,211,225,173,212,42,186,56,220,45,33,165,205,107,19,118,78,237,36,1,138,237,214,68,152,96,170,21,6,243,116,122,237,172,59,193,16,10,145,168,62,60,129,47,37,143,143,126,17,14,253,35,177,129,95,93,230,127,249,76,39,174,20,124,96,225,246,200,189,196,216,108,62,96,145,88,154,128,82,41,242,138,200,35,119,241,21,235,196,227,179,103,174,213,2,91,208,243,34,19,224,11,56,28,206,20,31,103,198,60,212,167,44,195,19,111,182,6,131,1,254,69,119,169,42,82,153,140,70,147,174,4,116,239,166,23,12,233,238,157,213,253,87,18,126,217,108,171,163,172,22,26,158,199,141,95,34,64,88,236,229,37,247,194,105,215,179,29,188,31,63,62,192,81,134,71,168,74,186,223,54,155,237,235,136,19,97,177,18,177,152,188,168,34,58,190,195,37,139,99,18,137,232,1,204,80,
+107,212,106,127,27,159,126,128,40,177,205,115,6,12,241,17,139,23,100,153,21,227,151,18,179,120,239,107,68,115,224,75,89,95,89,192,146,215,189,69,45,112,124,253,93,150,9,187,148,192,237,190,130,160,87,196,188,136,176,60,18,149,76,166,79,140,67,175,223,98,219,228,140,63,95,132,63,59,191,120,173,19,143,6,45,141,152,147,72,134,73,134,255,171,132,240,21,42,33,171,86,171,238,229,89,201,15,105,99,189,253,13,119,97,221,216,179,213,77,167,191,114,163,178,80,53,239,249,26,141,86,250,184,209,91,32,37,169,242,75,90,1,111,252,182,139,4,205,44,1,55,236,118,186,115,178,156,29,159,21,73,112,227,55,215,56,81,146,205,131,62,15,92,255,101,167,184,209,106,173,74,69,203,16,210,227,81,127,64,34,40,106,185,64,18,213,219,140,223,103,93,14,213,247,12,212,218,118,42,149,154,151,67,49,132,53,181,10,93,117,49,203,171,179,17,123,52,225,141,209,8,4,64,196,128,13,63,140,146,62,214,164,252,194,232,14,87,14,2,22,74,160,194,39,16,8,
+131,6,125,235,242,225,96,112,14,205,232,134,5,107,82,173,54,77,110,54,31,48,11,220,181,131,221,225,188,87,2,145,96,176,41,9,250,147,122,79,37,127,83,58,239,179,50,91,173,50,41,73,43,246,202,213,186,129,24,96,39,57,118,99,37,80,93,65,149,150,19,22,163,64,205,195,55,10,174,15,136,225,93,163,235,39,217,147,211,144,126,61,37,24,38,235,63,201,72,29,170,231,74,173,221,231,122,229,70,189,128,111,191,122,0,237,65,84,224,224,186,222,160,16,40,60,87,117,222,230,151,209,134,213,167,91,255,254,45,186,161,187,225,239,135,57,172,43,127,72,75,15,106,253,17,93,50,28,136,146,102,25,115,127,167,68,164,162,49,127,82,181,189,37,157,114,214,160,93,14,202,124,237,146,190,140,43,49,181,186,64,175,121,139,186,103,46,71,63,108,47,3,123,141,180,59,40,30,241,100,89,215,190,106,110,237,222,210,168,215,175,157,151,12,196,91,18,225,94,235,197,179,186,121,182,41,251,253,37,8,30,120,123,7,120,31,64,47,54,31,217,82,146,124,115,96,
+168,20,79,207,66,143,55,106,61,102,170,147,119,31,67,5,198,153,198,243,66,10,39,116,158,107,255,8,29,71,32,160,107,58,194,230,91,125,190,24,183,175,131,196,72,219,230,120,188,219,237,112,51,53,36,178,133,126,191,194,123,206,118,127,151,157,209,168,75,59,15,39,130,119,223,203,86,50,83,10,45,130,225,151,207,63,99,190,103,223,123,240,249,94,61,180,233,130,222,203,122,141,105,237,194,109,104,226,133,122,107,102,195,150,130,128,254,10,218,180,175,159,214,203,166,52,113,210,227,246,25,179,161,114,2,247,136,69,187,170,126,170,136,216,13,254,226,169,28,103,24,5,187,119,169,32,96,62,139,176,18,145,50,200,83,155,2,237,133,118,222,54,0,60,250,203,157,197,234,38,64,4,52,68,123,243,62,34,128,183,185,129,44,247,38,194,123,70,172,206,145,165,211,115,14,233,150,182,187,151,250,180,243,111,118,27,134,119,238,100,133,129,189,243,96,189,20,216,173,64,16,189,45,185,249,183,66,53,114,252,113,16,118,111,4,169,92,179,103,151,231,8,165,115,245,60,
+57,147,53,227,55,104,113,46,191,51,206,218,208,101,128,250,208,9,226,203,89,130,46,112,38,149,78,22,150,242,111,97,187,118,156,232,182,33,84,234,77,161,185,14,186,121,111,229,76,98,194,28,183,60,207,221,232,66,168,44,93,199,109,18,72,124,204,43,218,150,19,186,198,247,197,67,44,134,103,25,18,133,87,0,3,136,196,214,116,246,189,132,121,60,23,112,182,28,200,6,219,41,19,77,228,140,151,183,153,40,226,89,183,237,34,18,132,63,116,32,95,8,3,29,95,229,248,148,97,32,43,52,124,4,218,143,191,231,16,85,164,159,68,165,209,239,82,90,76,50,192,149,209,130,89,44,62,85,165,200,25,84,58,231,105,81,233,86,115,119,184,74,155,215,77,239,54,3,221,14,12,198,37,191,239,171,69,234,190,217,24,65,207,135,119,127,15,120,247,220,246,133,11,241,175,69,89,245,221,231,109,162,21,161,253,222,244,108,94,142,199,35,211,155,184,15,27,143,185,226,89,55,23,248,119,63,127,253,108,87,246,167,19,116,237,235,32,7,251,14,109,61,58,136,170,141,
+172,44,152,151,182,52,132,197,229,196,232,114,221,85,222,173,69,165,174,123,95,131,7,26,185,29,123,36,101,78,116,237,101,22,92,54,249,206,72,16,214,148,62,231,147,63,67,199,242,49,148,12,135,210,252,34,6,0,255,110,231,87,156,156,111,100,83,122,255,198,31,69,135,121,251,118,108,183,91,80,127,45,164,36,152,52,169,182,193,245,62,251,252,107,61,121,80,85,218,36,30,143,103,119,109,64,216,253,126,221,47,102,19,219,224,218,153,204,46,248,37,13,186,234,116,15,224,224,173,97,136,132,103,225,46,146,121,206,109,226,243,177,235,143,121,151,211,198,25,241,120,214,10,146,187,253,0,188,246,149,219,75,187,10,51,208,140,47,213,69,180,118,25,250,211,58,121,65,20,44,54,49,104,20,18,164,131,112,99,166,110,153,231,32,179,93,14,99,47,219,46,87,215,194,241,195,75,175,67,125,58,201,29,94,116,79,144,240,116,138,132,195,213,236,45,29,222,175,200,114,167,231,180,122,166,218,119,66,198,202,245,117,211,240,123,111,25,8,119,159,112,49,243,228,94,61,
+36,249,216,83,221,120,41,209,163,205,124,133,217,115,196,201,243,60,207,93,174,3,208,119,219,157,39,85,110,215,39,244,62,55,88,129,14,231,202,233,62,182,98,199,79,203,11,195,161,231,10,128,210,75,104,144,121,250,197,231,56,203,59,106,92,71,17,183,189,199,110,71,238,35,206,45,61,181,156,172,238,161,180,137,54,164,236,185,71,217,154,126,54,188,252,75,189,237,62,139,6,66,200,187,19,174,92,251,253,224,58,52,204,25,52,166,76,71,106,115,55,206,243,97,112,158,189,223,15,143,206,223,30,181,251,40,140,51,25,215,238,140,223,111,86,123,207,110,221,222,175,187,9,210,3,172,44,218,139,199,54,115,60,222,187,21,104,24,240,26,47,75,210,99,211,133,106,246,251,52,252,120,164,40,68,103,170,24,62,208,56,48,152,192,156,237,23,150,9,65,19,125,249,203,64,208,61,51,110,136,232,28,254,99,159,243,41,249,187,75,52,242,55,95,205,31,243,219,201,217,78,101,126,191,2,202,46,181,207,127,27,92,54,249,36,154,8,227,185,162,69,170,13,205,226,208,
+71,253,237,9,66,157,78,120,154,7,0,210,64,251,62,178,214,186,167,147,107,236,190,39,195,96,3,244,244,157,158,254,30,193,63,251,4,107,214,222,56,254,66,25,44,110,221,107,62,219,211,42,248,60,54,68,190,42,104,245,122,31,32,255,28,148,209,222,151,95,59,54,183,210,19,92,88,196,154,202,245,225,206,216,82,1,146,251,54,208,168,60,176,126,50,1,44,22,70,47,0,148,231,204,136,236,185,108,235,68,80,101,5,117,69,233,87,161,141,249,215,81,139,13,109,239,57,209,120,221,114,153,239,218,211,214,201,98,106,189,251,191,115,36,131,103,182,109,27,69,101,30,245,21,50,141,243,179,110,56,25,249,211,235,229,223,164,157,90,16,184,94,221,183,237,71,120,160,123,76,68,252,43,112,125,169,225,243,58,63,165,23,39,129,44,62,4,60,110,155,179,247,36,163,207,48,152,47,33,136,72,225,12,65,11,115,191,94,189,14,153,108,220,197,240,143,207,14,28,227,1,129,132,135,224,222,139,188,91,151,168,13,93,43,238,151,228,88,173,222,147,61,179,50,96,206,
+149,216,51,225,137,145,72,36,104,195,167,65,27,153,247,18,91,221,177,108,164,103,75,215,173,6,141,221,194,128,63,31,140,222,155,17,42,179,218,151,123,93,247,248,174,68,209,82,97,107,107,25,41,159,125,118,187,35,221,84,230,101,13,215,15,86,189,217,59,9,58,147,236,154,83,117,250,178,192,107,127,156,2,26,141,251,95,153,233,241,165,124,108,145,213,189,3,238,153,211,29,155,137,120,175,185,21,45,43,18,137,26,192,179,219,96,62,187,135,74,187,125,141,253,129,203,134,61,176,171,211,118,153,239,147,228,67,247,136,93,106,224,163,75,122,25,242,99,141,16,240,7,168,99,207,78,144,236,200,79,58,91,85,248,112,0,102,209,154,93,174,62,143,71,134,162,153,254,117,195,133,43,216,196,194,74,34,160,171,12,114,208,172,183,109,177,135,183,1,68,160,200,221,209,119,27,149,13,92,104,73,196,19,17,58,69,120,119,188,23,186,237,188,59,190,39,117,131,238,47,153,90,23,249,252,235,186,59,231,159,174,65,26,116,96,66,252,59,150,4,66,58,104,190,105,67,
+99,8,74,122,48,207,0,2,186,120,29,247,235,3,154,71,158,243,93,197,115,135,60,208,75,94,95,160,43,35,58,143,173,235,37,125,100,184,43,95,227,253,223,253,3,17,88,230,114,107,54,108,2,155,72,242,66,133,121,114,94,138,80,4,191,183,116,186,121,101,188,119,230,119,45,216,134,14,237,221,99,135,93,151,173,158,82,109,245,50,9,251,198,163,121,237,103,186,247,52,156,119,67,75,230,223,74,27,131,100,5,221,0,201,39,0,173,110,109,167,245,205,106,21,57,117,134,221,55,236,153,98,69,79,143,71,229,244,152,242,159,138,73,197,123,98,243,95,243,201,31,153,177,40,104,193,141,60,63,248,138,179,172,140,181,214,54,58,249,102,111,244,238,140,121,244,67,118,126,45,211,135,181,166,110,181,90,214,21,191,178,195,142,204,204,251,103,226,111,216,122,162,111,63,95,74,16,183,12,48,182,180,170,224,38,215,217,201,185,15,240,200,185,240,71,130,17,48,252,21,37,74,92,47,1,140,199,185,206,213,230,131,212,178,111,7,177,61,116,63,207,249,151,243,9,58,
+141,33,253,233,228,109,159,114,109,136,196,103,66,129,211,171,239,95,242,179,138,120,95,19,181,186,119,68,164,231,37,22,102,242,86,183,225,213,194,217,175,66,90,91,196,98,183,71,28,155,149,240,120,157,121,49,218,79,171,53,240,189,78,163,94,90,224,199,239,163,51,77,222,170,186,28,87,208,241,216,222,221,225,8,76,213,55,91,167,60,200,14,52,133,30,5,239,163,0,180,142,22,11,132,243,94,69,94,254,117,34,34,93,51,119,175,181,207,123,89,26,255,242,144,223,62,107,239,251,41,70,94,209,54,46,29,31,198,251,53,65,204,75,162,100,242,67,39,112,151,117,163,235,245,218,127,245,241,81,106,117,199,188,101,40,243,92,252,251,165,30,117,83,157,158,9,151,45,107,251,178,93,185,154,253,179,242,245,14,44,108,24,154,99,199,167,223,186,219,211,240,209,145,81,129,5,96,99,34,135,52,229,134,208,24,69,184,54,199,49,181,168,166,185,238,126,38,65,153,88,92,31,222,102,126,255,187,44,212,106,138,211,82,109,175,228,27,131,52,147,165,180,209,52,116,126,
+252,56,42,151,235,211,206,227,209,239,15,205,38,239,175,195,98,113,88,238,176,213,116,211,237,130,67,200,96,178,68,121,109,144,169,225,42,119,2,90,193,173,155,133,220,90,155,115,206,15,66,223,195,93,130,106,173,126,123,207,112,88,28,150,117,137,3,249,250,85,65,143,255,123,52,193,153,207,231,17,7,189,255,60,7,193,151,77,58,31,79,21,108,174,55,155,165,135,113,154,251,28,42,250,20,223,75,39,181,95,58,125,42,147,177,86,235,198,20,218,160,217,104,15,216,150,224,14,137,243,244,54,225,196,101,158,223,136,177,3,208,27,247,48,195,210,239,238,235,104,207,43,117,203,207,42,53,206,74,64,137,199,41,244,248,91,184,181,78,127,159,211,126,165,51,247,108,85,2,183,205,146,219,212,104,98,233,246,171,249,179,145,95,146,96,171,111,168,255,6,131,101,222,9,112,56,22,41,160,144,224,24,228,171,15,167,233,83,62,29,146,114,32,227,140,158,0,210,172,234,248,168,76,179,214,202,63,201,169,97,50,231,106,225,77,74,147,223,64,236,118,159,163,64,55,183,
+163,217,172,177,18,46,78,112,15,225,137,231,114,185,191,63,59,49,183,156,49,247,248,206,57,184,232,152,204,72,24,44,27,175,187,171,182,195,207,154,93,125,215,213,59,57,48,94,74,109,254,190,63,95,6,236,192,200,203,164,50,247,189,33,237,89,122,248,234,158,141,107,221,40,82,19,119,32,53,204,240,175,253,232,9,247,208,41,97,125,96,143,33,242,192,134,237,24,168,178,51,93,29,166,58,233,235,191,118,155,130,170,55,140,42,141,92,210,216,134,13,74,189,97,175,103,231,217,152,159,135,220,132,212,77,194,220,221,216,158,214,207,235,205,45,193,30,113,161,21,120,156,121,9,214,152,133,244,58,245,23,54,225,4,173,44,8,214,199,249,201,72,63,57,45,150,192,1,193,251,27,71,240,78,149,248,64,114,246,181,13,25,203,119,196,150,247,183,215,230,1,76,177,102,255,219,164,244,255,126,218,8,111,130,159,215,230,26,174,129,38,255,119,182,26,69,93,34,94,135,9,162,40,198,155,245,223,166,47,178,56,241,111,64,251,219,255,6,20,144,255,55,96,172,243,191,
+1,97,131,255,13,88,68,254,111,192,129,224,191,1,199,73,203,234,191,235,104,188,78,123,14,158,23,198,117,201,205,252,255,245,132,59,166,127,167,115,105,141,176,182,178,181,8,162,198,54,237,29,168,26,206,35,186,162,231,162,3,107,213,4,182,255,198,227,173,74,103,9,140,14,233,252,191,140,51,247,88,196,123,31,86,162,161,121,214,108,117,42,146,65,147,58,206,92,111,56,171,223,33,212,236,59,108,152,239,218,213,254,169,158,173,150,186,225,202,141,88,156,186,195,106,201,185,118,155,126,136,66,40,24,3,18,90,96,30,193,124,38,34,55,43,177,33,55,113,29,222,227,227,200,112,169,46,253,18,59,158,9,9,171,34,48,191,164,81,23,168,212,76,51,114,226,14,150,183,127,35,227,191,172,57,138,238,243,240,181,133,80,137,95,60,10,62,214,193,184,176,19,187,42,181,88,87,139,134,219,236,222,93,70,195,188,10,40,225,141,116,202,188,52,247,79,103,80,241,114,191,14,36,39,215,246,47,26,57,198,224,165,242,118,63,198,109,141,33,71,29,119,40,124,194,37,
+79,103,207,158,229,87,181,223,251,247,164,90,24,199,44,221,235,101,69,102,86,254,26,128,47,214,181,98,182,82,196,218,190,223,69,192,141,52,47,208,75,190,94,101,191,189,48,190,92,46,76,55,240,137,63,222,218,171,43,115,171,116,179,216,236,217,62,14,35,99,109,192,250,35,13,26,12,172,111,187,166,113,181,199,53,35,106,71,185,125,254,108,159,132,6,133,93,96,170,116,157,143,213,9,152,171,7,53,124,160,242,154,78,231,131,69,98,75,5,137,51,10,252,59,200,31,149,97,60,30,172,35,189,166,223,190,216,127,140,243,81,192,85,192,37,39,1,249,186,219,8,75,44,126,171,1,131,75,187,8,175,100,204,176,253,4,108,70,199,197,115,91,121,108,143,73,150,116,150,231,102,101,24,214,220,0,211,205,86,199,200,176,4,42,202,228,172,26,186,202,226,201,105,154,144,45,94,90,95,181,167,159,186,29,129,196,83,90,142,243,162,6,199,191,228,35,63,113,16,154,236,125,1,246,212,225,22,137,130,11,247,225,36,24,50,197,27,242,99,137,216,255,233,87,24,209,
+155,147,32,180,192,225,214,238,105,222,78,24,236,152,77,190,218,104,236,163,60,185,174,196,96,204,213,137,168,43,243,3,81,41,208,22,130,79,255,166,121,80,249,6,18,211,236,251,193,241,53,227,102,121,189,181,213,254,216,20,46,73,222,44,252,224,205,126,153,201,109,203,123,85,23,188,223,203,110,60,214,253,245,222,18,127,205,145,162,16,97,190,102,163,219,246,99,147,17,3,60,155,17,52,44,65,210,19,249,135,188,47,221,45,170,28,44,230,106,178,53,91,76,123,139,94,216,244,36,48,49,72,177,105,224,252,90,2,182,71,106,37,130,159,34,213,59,129,59,178,4,149,250,28,63,142,18,130,36,185,43,254,206,123,114,125,84,204,210,162,35,46,62,242,109,213,71,91,147,170,135,245,134,110,183,183,107,96,75,108,198,210,130,73,43,62,84,94,84,143,149,156,185,172,216,18,149,187,101,105,14,236,31,238,154,221,66,118,255,91,248,165,198,84,93,255,110,233,216,139,53,123,42,172,71,127,171,61,57,37,173,89,141,27,70,52,114,247,29,57,8,188,164,37,169,231,
+2,99,203,44,52,21,97,203,203,188,243,175,62,114,144,121,100,220,137,77,11,24,230,201,41,90,166,84,143,121,213,53,135,173,152,46,83,39,242,75,71,30,247,136,200,150,114,173,110,242,207,77,44,109,181,97,200,203,91,98,251,198,70,34,103,133,146,66,147,49,101,71,173,46,69,89,26,253,156,18,177,142,74,249,72,252,212,210,220,199,207,50,136,68,198,90,250,149,232,242,183,99,211,171,85,228,13,168,30,220,49,103,174,193,96,3,159,192,249,236,179,82,170,146,172,207,165,228,202,93,10,250,3,12,23,52,63,127,245,164,89,105,207,190,55,64,34,105,197,112,233,126,206,233,15,17,243,113,221,45,108,119,237,54,202,178,10,27,210,191,27,220,43,136,206,17,255,230,183,1,190,27,156,134,210,50,16,119,246,248,52,21,170,89,14,207,194,111,150,191,216,155,68,146,48,43,22,240,137,15,113,193,253,104,68,74,130,124,169,207,62,179,22,21,110,232,7,191,225,39,246,216,122,171,100,50,13,72,9,225,154,203,215,37,76,218,5,182,40,0,68,154,189,190,143,239,
+117,148,183,44,146,115,199,87,173,217,2,228,116,234,24,180,164,135,112,123,244,154,226,106,11,103,85,224,9,55,95,254,19,58,24,10,108,112,46,242,78,173,57,205,207,24,34,155,214,105,95,153,124,100,111,66,134,143,220,156,173,76,10,186,241,199,92,98,80,117,44,41,216,201,153,234,226,231,238,62,68,223,209,136,45,189,87,61,150,41,147,160,67,71,173,56,194,92,119,23,202,146,72,32,127,170,171,253,190,170,227,253,205,100,113,190,116,164,107,39,196,147,139,5,11,176,13,191,48,249,193,174,236,129,86,143,223,85,33,212,114,102,78,241,113,181,201,5,113,26,209,218,216,12,71,76,130,201,42,7,90,245,113,164,104,41,154,190,130,231,190,191,182,94,142,139,235,106,138,79,43,22,105,226,192,89,14,108,71,63,201,83,99,116,62,15,163,18,40,46,164,108,253,126,80,20,120,112,173,43,132,192,21,157,247,237,41,182,49,235,88,209,216,75,11,50,82,173,230,47,236,49,67,133,198,166,210,246,102,106,198,149,90,25,78,66,255,39,57,149,63,111,125,62,165,141,
+192,23,6,22,101,5,37,0,127,138,224,123,214,67,125,228,52,120,235,62,134,92,90,50,123,134,213,129,225,238,246,92,22,90,197,247,20,187,151,141,215,149,12,142,170,146,45,161,50,185,144,75,207,99,185,51,95,95,94,250,127,23,132,105,55,9,171,17,114,214,251,22,144,184,35,51,234,139,69,14,84,183,19,233,241,87,181,138,26,118,40,237,221,142,182,143,20,9,69,112,209,133,153,143,34,134,80,41,193,195,18,42,210,225,53,213,137,18,186,72,66,151,63,138,117,108,19,157,58,190,21,207,175,239,237,24,31,188,231,108,57,70,249,221,145,136,30,10,88,16,1,31,178,8,183,77,58,17,240,76,62,187,222,235,237,184,122,168,111,223,169,142,99,204,131,241,229,39,151,157,82,212,178,240,220,89,2,57,173,108,232,28,91,226,155,160,148,127,210,234,168,130,223,19,95,107,65,77,126,17,39,246,220,200,30,71,110,140,204,135,154,179,231,84,135,93,43,105,223,100,86,29,215,10,241,4,215,120,78,203,225,245,56,231,210,93,85,99,109,235,39,57,145,126,135,248,
+107,106,141,81,165,90,173,79,35,79,23,100,151,171,7,7,171,243,71,150,177,78,152,153,50,60,231,37,131,168,106,111,255,29,154,124,29,107,133,195,130,16,204,30,255,219,206,10,29,183,149,111,119,61,236,61,153,140,231,208,63,59,145,103,130,255,188,47,86,170,126,95,189,176,100,198,103,98,210,179,109,36,239,178,56,186,8,214,155,88,61,204,135,139,50,1,216,22,150,199,239,232,165,225,227,98,102,148,66,249,58,228,62,228,243,225,240,172,93,30,213,203,229,176,61,231,170,105,87,134,162,74,8,56,157,67,158,141,16,133,9,120,211,45,59,105,6,96,228,86,61,11,126,111,127,219,125,60,202,103,190,145,111,172,88,213,47,133,231,251,206,250,111,83,71,83,205,105,90,43,188,5,19,51,197,13,105,222,224,159,239,13,10,0,169,37,114,241,133,82,109,186,64,46,106,254,147,16,35,234,179,92,85,93,222,223,71,105,126,90,236,186,176,50,140,253,108,217,163,147,230,243,108,12,86,221,23,163,56,1,126,219,243,5,183,73,244,117,142,193,55,151,15,42,44,70,
+233,184,140,132,167,108,224,180,167,40,226,240,55,143,82,90,126,247,127,9,66,31,104,203,130,191,43,132,117,10,18,94,110,194,80,29,70,251,209,72,92,153,183,134,22,75,232,103,167,237,252,205,90,18,107,90,8,212,13,149,32,12,86,77,109,136,236,233,231,219,190,23,252,190,71,203,78,194,190,165,15,213,125,33,193,232,43,187,12,124,150,15,81,71,141,179,180,27,116,197,20,145,236,148,22,120,211,24,166,135,158,77,169,248,72,7,164,55,189,185,175,37,6,111,155,23,73,33,208,206,222,67,56,205,207,205,231,55,253,230,161,221,223,115,41,59,33,76,148,253,39,47,129,220,219,83,34,112,103,49,85,145,205,176,88,233,216,89,80,167,183,116,230,39,176,198,31,87,195,38,83,103,136,229,138,85,38,26,134,45,136,95,250,59,35,221,45,120,148,55,56,20,170,178,7,154,109,229,219,8,12,49,184,252,175,132,48,100,29,88,247,43,148,172,84,141,229,239,226,32,203,20,143,193,134,50,246,185,177,22,22,249,119,183,181,120,152,91,202,13,51,238,147,251,104,209,
+59,173,252,202,56,194,103,3,237,68,174,173,190,210,9,83,242,235,58,22,8,27,64,238,209,214,236,204,88,253,119,159,43,70,72,125,122,38,35,104,117,181,151,233,33,100,148,163,94,244,252,54,33,164,229,32,209,215,251,218,177,175,66,145,77,159,76,36,200,110,171,185,221,204,83,162,127,37,94,22,213,235,22,17,134,76,121,239,157,25,23,251,163,194,228,14,166,233,21,62,179,228,108,170,157,162,217,20,65,202,223,202,62,135,243,205,76,105,198,133,22,237,50,51,85,169,222,221,154,230,42,207,80,82,31,244,91,250,149,99,191,21,179,100,222,228,53,3,174,138,243,25,139,176,73,184,110,226,160,234,14,91,127,248,212,186,21,222,136,170,123,109,6,156,9,9,125,103,168,105,192,226,212,185,149,210,131,110,77,120,48,241,59,203,186,249,94,22,248,137,222,218,7,251,164,85,176,33,7,245,74,65,36,62,80,155,240,213,243,163,251,78,101,27,103,111,240,22,28,42,221,42,113,109,251,83,74,157,127,139,16,205,179,63,176,54,182,196,194,173,4,228,146,58,237,58,
+179,118,44,70,101,88,28,189,57,9,236,194,87,52,33,209,175,86,194,80,152,209,10,81,161,128,23,238,224,191,205,86,61,58,39,203,36,97,0,91,240,118,12,189,5,171,219,169,68,153,130,103,23,202,164,131,192,61,26,58,201,15,100,206,171,149,208,231,51,98,67,121,253,3,231,76,64,100,63,42,188,12,249,183,176,128,62,7,192,92,251,171,158,244,214,75,88,151,210,62,125,60,48,123,139,228,114,71,11,61,241,0,240,53,53,87,248,29,109,130,81,180,225,82,146,188,182,60,239,62,172,42,58,72,56,148,196,47,190,166,178,217,235,48,219,169,181,94,172,226,118,181,42,198,43,61,75,236,93,87,223,28,125,233,110,144,142,0,196,140,130,90,131,17,40,76,253,175,214,122,138,145,205,184,93,31,84,52,147,145,101,138,204,131,8,166,162,137,40,108,142,55,249,212,106,112,142,53,225,149,26,28,48,197,21,1,129,33,207,149,6,76,228,229,87,110,99,155,58,3,120,148,69,73,168,69,166,15,233,131,231,12,61,2,58,121,253,122,232,132,5,117,104,27,254,4,
+162,251,138,90,24,14,159,222,195,226,144,178,161,30,245,69,131,17,97,184,126,60,192,203,116,169,193,178,43,125,219,43,72,33,44,117,176,122,169,44,180,91,179,30,232,14,142,225,192,167,97,168,251,248,217,192,246,246,166,64,161,43,242,97,251,105,96,119,74,14,191,92,27,191,172,0,189,3,174,208,39,240,73,141,191,226,191,109,3,130,31,154,49,38,53,189,59,254,21,0,65,179,206,176,29,85,27,38,185,169,182,153,70,55,118,187,223,89,139,83,4,149,243,142,2,162,168,120,227,205,71,82,193,128,47,228,234,114,202,198,130,91,246,220,142,59,45,173,83,139,74,133,197,39,18,59,60,126,135,221,157,86,237,75,255,88,57,210,167,115,90,185,216,185,176,235,255,172,209,245,242,198,127,214,56,121,121,227,63,107,244,190,188,241,159,53,246,75,150,55,190,226,138,203,252,56,52,83,75,240,100,22,90,5,92,24,0,43,195,146,100,156,245,2,66,163,253,65,145,83,108,252,112,85,159,41,213,29,236,132,154,91,244,144,245,114,255,190,188,101,223,146,133,89,146,110,
+143,182,59,167,79,5,204,148,48,236,165,251,182,130,227,183,189,106,153,16,192,57,17,130,155,97,19,250,154,13,139,193,88,249,174,165,95,54,37,30,50,210,145,119,142,204,146,88,89,237,74,172,67,243,197,169,144,107,250,209,175,192,179,103,39,16,191,59,187,212,82,22,182,206,193,83,163,49,152,64,69,194,62,33,224,192,140,26,208,210,67,245,192,222,21,239,112,226,96,35,86,206,179,20,237,142,147,225,93,83,136,18,194,45,153,94,243,24,76,90,145,10,77,89,143,178,231,49,73,122,122,25,31,18,236,20,249,29,92,89,98,220,102,91,90,63,136,23,227,71,210,66,172,14,118,105,214,144,30,60,46,141,199,146,89,241,133,141,162,21,245,35,251,107,229,255,180,51,9,163,209,27,100,149,4,126,167,82,97,153,167,8,200,148,241,111,29,203,81,114,176,54,75,61,92,249,27,15,94,139,80,218,74,186,241,151,199,19,219,43,51,232,236,100,140,84,91,209,250,94,206,21,225,96,61,186,90,199,34,96,187,125,96,82,13,188,18,167,4,80,6,150,180,190,65,164,
+185,48,126,199,150,156,16,88,160,95,70,146,123,81,41,226,215,223,59,141,173,148,231,67,105,12,5,1,121,33,92,167,138,206,58,227,94,149,223,116,130,165,112,137,238,158,138,178,12,164,229,211,97,31,110,150,98,70,28,80,51,141,204,247,210,36,21,20,129,138,189,106,15,244,204,11,31,183,41,52,34,210,37,250,187,245,80,254,184,228,96,138,158,86,143,82,143,179,245,250,136,172,133,91,13,142,21,2,22,109,126,190,68,88,85,184,215,238,201,35,118,191,20,215,123,4,53,182,248,103,152,176,114,214,207,14,74,233,146,244,184,74,64,41,108,84,175,34,10,79,122,254,248,8,43,113,90,5,88,101,55,51,147,81,207,155,113,245,221,179,247,194,207,116,30,67,218,82,42,139,250,205,39,203,21,173,88,199,29,25,103,78,212,116,164,92,228,102,31,6,159,35,111,43,148,243,213,169,86,185,232,35,205,148,36,228,69,209,104,129,11,185,57,29,124,214,249,217,10,161,204,178,195,77,233,81,76,130,137,61,207,111,72,177,243,50,115,88,251,94,220,210,29,187,69,136,
+71,194,20,231,89,183,207,228,43,52,186,251,57,27,222,16,160,97,29,180,113,103,193,60,135,74,137,99,30,210,93,215,36,19,125,35,148,151,18,123,244,34,149,18,22,18,197,192,110,129,131,75,204,65,110,6,132,43,55,36,73,190,240,104,93,84,60,92,19,14,31,82,12,167,144,216,138,93,32,181,121,93,192,26,41,30,223,172,216,56,59,3,156,131,158,111,60,127,82,165,21,55,101,152,137,113,255,147,73,32,231,109,41,42,23,188,74,158,161,250,102,89,210,58,70,121,205,79,122,80,177,182,212,36,18,237,153,124,142,165,88,200,124,3,196,239,35,77,69,247,15,31,163,58,215,220,147,0,113,161,177,107,28,65,185,226,43,78,64,149,17,53,218,112,216,145,34,189,44,251,21,111,98,26,202,84,166,84,174,25,18,243,187,65,28,197,82,239,37,208,76,159,82,25,25,94,217,210,58,181,234,37,63,71,119,122,65,195,61,85,180,117,190,227,134,243,57,226,31,220,144,149,207,174,18,148,127,189,140,16,59,154,44,77,166,122,96,131,21,212,181,75,237,102,131,142,
+86,62,151,100,142,143,29,100,188,151,36,158,168,163,33,125,140,193,239,137,1,235,32,148,246,246,17,136,91,134,148,65,35,166,203,228,183,157,58,242,210,203,41,234,194,176,91,178,224,137,192,100,76,91,116,53,158,86,153,19,253,14,54,41,228,135,22,216,139,30,217,127,139,55,198,178,207,17,178,32,77,41,196,9,199,30,200,232,106,40,169,255,245,214,159,221,40,47,207,102,174,102,110,27,161,91,202,15,97,216,32,98,89,176,173,217,103,216,254,21,163,76,16,197,69,208,88,252,23,246,131,212,203,217,139,54,213,232,31,189,5,130,225,97,249,200,206,190,133,196,152,2,149,162,68,250,80,155,198,191,133,12,55,6,163,239,157,229,249,101,221,100,123,253,132,46,26,195,119,219,190,102,198,127,109,8,211,36,249,206,210,75,88,249,123,243,154,77,254,182,37,75,95,142,160,82,216,22,242,185,48,216,96,142,157,90,86,51,2,128,49,65,255,62,209,34,236,90,142,205,213,118,137,142,26,12,116,239,252,67,174,166,172,222,81,239,51,220,129,129,16,144,118,244,211,241,
+116,236,13,123,4,40,222,41,150,237,6,130,136,135,79,183,56,53,155,192,220,232,217,13,166,231,99,240,55,205,94,204,243,155,213,186,24,91,247,70,242,154,253,168,223,136,169,244,96,126,38,79,173,201,133,75,148,170,198,29,141,177,52,213,93,6,222,9,57,205,145,93,110,209,217,131,134,102,113,252,250,177,118,144,247,176,90,164,157,15,189,120,3,60,133,114,38,9,52,54,251,116,212,86,90,45,251,221,184,157,62,232,202,68,136,21,143,106,204,202,68,103,111,62,65,255,110,90,28,99,240,70,169,252,187,202,31,122,9,17,226,153,147,226,55,41,143,190,140,206,238,235,104,129,103,211,175,208,229,25,169,253,16,86,229,74,63,234,178,200,227,23,102,96,172,86,177,119,251,40,242,171,31,60,105,2,76,66,105,32,120,78,184,80,209,151,92,118,45,7,3,103,67,250,234,121,181,35,219,149,118,220,91,207,12,87,86,99,8,52,208,213,92,75,186,50,144,225,182,28,192,225,171,15,25,134,238,38,139,47,86,237,1,159,62,92,32,69,38,245,188,201,84,70,194,241,
+136,10,157,144,97,56,214,11,116,159,124,205,68,129,117,120,158,175,98,182,34,223,39,248,118,8,130,220,214,186,248,179,102,39,129,234,88,107,253,183,98,13,48,172,8,124,74,249,86,213,246,114,163,61,216,218,254,177,245,40,123,34,75,28,149,109,236,88,200,108,51,89,208,0,121,171,118,214,235,205,109,246,163,223,197,253,249,219,27,252,228,19,115,233,205,181,29,152,170,219,253,249,54,129,13,195,150,96,85,252,112,86,185,206,118,172,7,4,27,188,138,195,33,127,244,16,248,123,194,12,136,52,177,75,131,156,192,1,244,101,156,255,35,206,21,75,39,94,201,249,190,100,238,173,202,176,50,232,109,43,75,25,113,2,251,231,200,252,120,70,9,9,87,194,22,238,143,41,153,59,79,13,50,8,6,241,158,73,229,42,41,120,10,161,88,10,3,43,119,244,21,165,235,55,232,244,10,162,213,188,237,31,172,189,88,77,242,15,214,94,172,6,254,131,181,23,171,153,160,155,232,74,121,63,145,176,67,101,137,125,105,222,225,130,191,230,40,152,237,95,125,197,225,90,89,191,
+123,75,75,182,252,151,35,229,234,120,172,151,68,255,182,213,28,190,150,195,169,106,79,36,77,141,210,252,9,223,179,165,199,87,226,236,125,150,230,74,92,237,225,244,146,37,171,223,234,28,196,22,169,114,81,77,73,253,129,7,193,71,143,177,7,38,241,201,44,80,184,73,190,99,211,209,36,98,146,5,218,69,131,133,145,56,125,87,241,207,88,83,245,175,173,236,201,5,48,49,24,66,86,3,82,237,228,247,123,125,58,235,45,114,207,164,82,179,191,116,147,156,40,174,200,115,159,170,114,39,71,99,189,119,0,14,203,154,140,108,224,29,129,83,110,123,21,225,62,37,47,43,44,182,72,61,127,96,78,18,137,9,187,232,80,237,149,27,250,243,61,122,18,107,12,238,202,65,153,187,191,91,112,32,115,134,191,226,73,155,31,170,69,185,247,54,144,179,108,59,227,200,220,157,254,255,4,37,15,254,52,51,241,99,90,186,232,191,167,60,171,198,123,203,63,88,121,26,224,7,110,128,182,28,216,215,62,54,205,40,129,239,245,40,111,115,17,119,163,165,223,162,161,148,83,73,
+230,245,185,24,188,210,201,72,243,49,97,14,61,80,231,108,46,6,208,29,124,87,1,160,180,16,155,123,152,145,121,13,143,208,31,178,27,84,248,240,237,233,93,246,15,152,24,47,110,208,194,101,246,91,222,246,1,98,135,19,212,222,144,21,48,194,7,118,207,250,37,94,179,185,148,114,73,151,42,49,166,195,115,78,241,222,74,228,154,225,23,171,200,94,69,240,23,99,102,0,211,197,69,128,193,26,2,191,213,48,15,124,165,173,228,11,243,124,146,188,89,131,116,243,28,207,157,179,131,111,207,248,4,237,196,130,185,38,227,152,251,186,58,247,2,49,219,215,113,41,25,5,194,187,240,224,204,121,169,211,50,54,255,28,30,69,77,108,158,194,32,63,42,205,44,56,146,155,44,190,254,68,38,77,170,105,255,242,226,249,95,94,196,90,177,40,16,125,76,118,118,65,80,86,4,73,65,71,163,136,126,241,32,245,192,38,85,131,79,211,75,231,76,173,34,24,118,52,208,138,157,229,69,128,54,66,46,170,60,231,204,236,41,108,251,239,70,234,148,150,123,193,235,128,183,183,
+19,83,47,19,10,122,210,17,28,255,237,43,242,7,135,167,97,75,4,76,31,208,189,166,39,213,109,109,33,73,58,153,252,216,255,31,103,223,217,150,202,182,173,249,215,1,149,32,34,146,51,136,4,201,65,114,70,162,72,206,161,8,2,146,41,114,144,220,85,112,246,233,211,253,220,167,111,119,239,79,107,47,203,89,53,199,28,225,125,71,152,139,157,252,113,84,165,165,85,194,249,85,253,82,174,66,182,152,206,57,254,198,35,196,156,7,243,130,227,77,234,3,254,168,153,24,31,18,227,138,138,159,19,53,233,85,144,50,109,209,250,150,73,44,104,117,167,131,47,1,236,164,33,143,121,132,147,141,143,9,167,59,254,233,122,162,246,117,219,227,199,207,97,27,4,53,97,76,230,43,57,250,140,101,7,195,29,24,232,135,90,224,216,108,87,23,13,218,71,119,224,65,86,48,46,25,144,96,26,58,70,156,140,19,213,86,35,104,125,156,35,158,123,12,174,1,62,157,61,231,124,91,46,212,46,184,249,116,212,208,47,28,4,96,13,246,52,221,70,84,143,241,206,51,30,211,
+124,39,23,153,117,76,103,89,79,21,229,245,103,27,50,239,211,65,20,149,143,42,42,234,171,138,42,251,153,155,54,238,55,129,153,147,80,125,8,77,98,224,27,168,145,212,127,42,100,118,217,56,168,74,213,16,192,101,85,10,182,248,178,11,242,107,35,222,229,87,20,14,38,117,157,61,77,55,21,146,130,82,235,180,157,86,205,236,12,228,118,29,210,239,120,173,123,61,228,249,228,232,146,100,232,151,191,54,140,167,214,251,227,247,236,110,53,186,183,139,29,211,63,145,41,121,33,123,69,241,86,13,216,182,94,21,251,140,203,137,101,15,208,164,135,137,43,19,5,23,251,175,5,163,80,149,157,255,52,100,139,120,168,85,140,25,1,211,156,45,178,29,150,193,181,107,63,200,255,136,92,166,64,94,81,91,72,38,2,160,100,81,36,23,164,201,35,239,125,195,28,178,35,144,136,137,113,169,158,68,143,54,235,116,24,197,187,10,210,79,204,229,110,237,121,104,125,147,89,200,163,54,154,47,145,231,180,19,6,53,141,142,188,139,129,67,166,171,61,14,213,222,71,187,69,151,
+87,126,115,228,75,183,135,70,39,153,89,26,76,242,158,108,5,254,76,120,126,52,224,200,248,236,121,74,58,31,170,20,27,33,83,197,105,71,219,227,153,110,142,151,31,108,196,113,226,192,200,154,4,251,12,209,113,58,202,183,87,150,165,186,242,88,43,121,241,5,5,201,103,7,115,38,149,147,3,103,16,44,143,83,63,87,154,145,23,47,74,136,159,208,190,55,217,208,126,232,180,164,113,32,33,110,37,212,138,156,178,147,3,234,245,113,27,133,128,185,80,144,121,148,251,33,0,32,191,41,21,136,60,155,243,10,133,56,31,204,113,238,8,63,94,50,216,39,9,103,118,92,90,37,115,127,231,68,234,7,122,137,33,243,123,190,37,57,173,90,225,125,213,189,187,182,226,104,206,241,229,49,9,101,52,101,69,112,30,8,2,37,163,241,196,200,248,132,90,180,87,52,206,31,158,52,97,167,186,62,84,43,72,10,80,158,174,200,39,193,117,85,76,35,65,236,124,249,243,188,52,232,211,11,67,232,99,234,118,155,157,171,109,129,19,87,234,171,144,74,177,1,208,172,114,42,
+205,29,91,165,4,130,199,169,249,33,78,20,197,137,212,209,192,1,152,190,95,197,239,43,243,223,231,39,53,45,204,135,114,125,252,180,133,177,199,21,173,128,227,115,51,102,131,230,58,152,234,162,50,158,115,110,148,145,2,66,75,80,155,222,41,140,186,64,30,241,54,3,197,210,180,227,203,36,36,127,209,14,209,192,118,238,236,19,216,241,87,70,95,58,145,148,181,138,129,191,60,175,255,172,204,43,126,126,52,126,209,88,6,195,147,51,46,55,114,129,120,147,48,106,143,109,13,217,58,241,95,231,57,61,34,207,105,250,224,197,239,243,235,10,97,245,98,68,204,18,175,169,204,30,96,86,163,121,180,44,158,223,75,83,186,206,57,83,210,208,32,54,29,250,153,60,45,143,186,156,167,220,125,110,249,207,155,120,161,76,74,36,114,135,176,242,223,241,121,4,199,231,2,104,245,78,40,149,215,247,35,243,65,201,167,21,248,149,15,70,157,28,18,208,204,121,158,41,224,33,177,29,98,205,144,51,160,135,107,239,77,194,184,210,83,178,227,13,236,233,45,51,174,57,255,220,
+161,147,102,160,126,167,61,220,228,220,48,124,124,88,141,70,207,92,167,179,92,182,27,158,206,210,237,53,88,110,243,113,16,228,89,132,193,16,131,110,35,100,209,242,120,213,61,237,44,183,80,204,54,215,198,174,131,234,40,120,174,229,203,26,235,99,79,25,58,121,245,113,140,194,199,248,178,200,92,188,173,189,230,85,100,42,253,175,199,165,91,12,255,139,237,90,189,45,133,141,111,246,156,249,142,225,126,19,23,4,93,197,26,199,96,46,134,184,85,16,242,179,95,96,68,9,29,175,147,175,174,75,24,247,102,135,110,197,32,113,50,229,40,125,197,99,31,158,250,232,207,244,98,94,155,43,21,63,116,178,67,189,34,226,74,14,219,202,102,237,137,183,29,137,163,248,238,52,246,226,171,66,22,10,81,91,41,228,97,181,53,46,210,237,54,217,77,238,153,187,51,246,253,74,220,250,184,178,103,188,228,158,44,110,97,32,68,79,0,214,166,193,24,27,47,18,3,251,100,168,115,233,171,3,29,183,247,29,158,3,28,72,127,220,179,133,164,161,96,179,137,15,26,210,196,152,
+222,115,206,75,69,65,89,172,182,250,254,22,93,97,2,34,99,205,107,50,150,153,100,187,204,131,220,244,99,98,129,179,163,57,225,131,28,244,78,135,249,102,25,234,67,199,73,231,223,6,178,189,132,51,210,201,44,143,64,207,33,56,60,15,97,156,241,86,3,74,116,94,82,175,95,235,31,63,69,238,94,119,35,29,200,57,114,160,244,224,67,128,97,149,63,39,142,50,232,5,254,208,204,104,61,42,8,114,62,33,175,98,154,200,118,2,219,5,222,207,17,128,120,85,241,191,74,126,118,224,189,29,58,182,131,160,33,181,92,217,107,204,236,185,178,215,14,205,13,177,87,127,94,234,253,238,246,95,160,144,98,12,114,161,7,209,205,97,188,245,248,52,52,158,216,135,247,233,221,235,9,9,168,16,16,145,215,88,244,222,165,75,142,240,26,16,101,224,246,23,84,228,53,60,33,242,222,39,136,141,170,226,18,224,87,174,69,244,17,56,104,49,166,176,54,65,64,156,81,11,241,118,61,130,5,121,121,139,115,175,123,216,113,74,129,201,57,250,43,210,255,225,158,81,115,39,
+173,15,1,245,5,2,193,106,217,226,235,97,193,70,208,213,44,54,111,166,215,237,134,246,157,207,121,109,146,85,217,123,98,151,230,55,191,111,115,81,103,205,233,132,65,180,200,119,183,23,124,76,238,118,28,160,103,102,43,254,107,222,114,156,120,200,194,249,178,157,110,62,29,20,149,94,242,211,11,34,16,221,47,6,8,32,28,19,243,125,41,116,95,13,217,252,31,23,123,229,209,246,68,217,227,14,47,209,168,233,33,248,147,144,147,78,76,155,75,43,109,90,34,56,227,199,64,99,232,91,40,214,242,162,59,66,94,119,126,214,88,62,157,4,208,254,117,163,45,68,247,141,182,88,178,16,109,89,7,165,186,95,113,221,48,120,34,122,114,160,99,79,9,108,56,200,13,242,26,151,15,80,76,47,105,128,212,223,141,182,52,31,174,180,101,45,92,37,158,65,115,203,137,241,90,89,111,106,175,138,113,46,188,85,184,70,185,34,20,191,223,40,67,119,226,216,195,106,115,55,84,174,28,231,244,148,108,29,48,191,56,113,46,36,118,239,2,22,59,132,171,43,110,200,25,67,
+190,152,7,59,99,39,39,211,29,143,117,209,225,99,80,34,22,73,75,94,83,53,95,125,211,87,243,185,188,66,218,63,7,71,136,196,185,105,247,236,9,12,243,176,92,17,157,52,253,105,92,31,64,192,27,147,64,103,138,220,212,192,9,86,127,173,244,184,28,45,184,210,243,188,23,89,56,111,79,181,25,142,201,175,32,152,75,255,247,232,133,94,104,212,222,243,252,251,237,157,94,83,115,157,152,180,209,88,31,48,32,110,138,49,181,68,234,206,248,147,135,5,23,229,244,180,73,41,203,224,108,17,242,115,103,212,146,90,210,207,231,20,29,147,242,100,80,72,45,32,244,43,75,234,213,3,62,0,172,66,195,57,179,153,67,190,20,40,235,138,39,229,120,145,133,171,49,97,32,34,171,101,193,100,51,116,21,188,9,254,62,243,72,93,132,140,227,195,50,255,174,235,36,145,158,250,120,118,213,127,27,82,188,107,235,17,208,146,122,135,2,44,153,222,16,1,102,66,149,99,218,117,232,208,252,180,51,71,240,225,17,91,177,229,151,14,66,163,47,197,63,15,168,79,118,231,
+188,249,99,70,32,12,226,168,15,252,176,76,41,119,19,62,164,19,112,37,70,115,69,247,9,155,252,138,238,233,14,14,140,238,191,206,135,67,22,139,232,63,13,90,168,133,124,125,95,241,141,56,232,196,23,15,203,252,162,23,159,44,2,49,109,184,49,171,72,144,56,245,221,155,56,95,42,183,207,53,78,33,91,134,77,89,13,217,50,108,202,239,144,45,75,253,239,147,222,81,70,15,179,179,193,196,99,16,88,65,72,248,206,184,14,13,243,134,214,209,232,173,156,82,167,215,32,20,142,255,6,205,147,185,16,4,250,40,47,168,187,106,47,240,19,174,135,158,231,46,57,208,181,25,8,34,243,206,249,183,220,61,144,92,135,39,106,13,84,236,218,210,190,239,114,219,216,60,10,122,99,76,187,213,135,18,217,227,130,249,158,224,254,69,2,171,143,153,145,3,25,28,196,219,69,76,75,196,49,227,36,188,232,171,122,218,229,85,24,136,66,12,12,250,101,99,203,60,117,156,229,131,24,16,144,190,70,79,72,47,198,74,120,68,92,13,29,17,243,238,175,231,81,131,206,35,
+146,169,98,180,182,182,248,79,142,141,203,120,184,7,196,227,191,159,251,217,57,38,75,24,130,94,32,12,10,67,208,95,8,131,194,16,180,13,97,80,157,243,155,70,101,32,176,24,232,157,138,31,244,202,70,232,130,245,177,0,144,5,164,253,170,185,144,102,89,228,86,10,131,68,230,161,27,244,250,17,174,103,127,161,139,33,162,96,72,17,233,166,1,74,219,20,241,87,50,72,216,10,158,6,86,232,93,69,8,59,22,97,240,8,97,71,44,12,30,33,236,104,133,193,35,132,29,141,16,120,20,228,89,211,48,69,242,48,17,185,28,78,237,156,81,122,89,253,146,60,51,14,17,90,162,227,189,25,82,18,54,206,22,133,187,180,204,101,116,30,30,65,112,236,219,165,68,186,216,31,163,162,45,19,71,250,19,191,247,42,222,205,27,103,30,39,142,2,226,81,16,68,92,51,18,195,213,213,111,9,123,112,250,91,73,241,123,174,233,239,21,217,197,226,27,1,236,146,41,15,220,127,189,250,242,139,49,156,254,142,112,20,135,202,253,51,193,74,48,250,219,184,149,218,48,179,
+84,118,238,203,233,24,8,94,210,156,200,98,23,121,60,80,112,223,90,206,100,126,249,38,165,191,211,77,16,41,186,131,188,168,247,232,128,206,140,105,209,159,200,183,244,54,167,125,75,111,151,180,165,95,238,221,74,69,140,173,239,104,153,175,209,171,128,161,100,43,42,1,217,244,222,219,135,0,90,135,30,178,211,89,144,74,168,96,101,7,17,181,31,56,91,51,54,1,2,221,66,83,250,29,54,69,22,127,42,110,194,118,196,99,208,34,44,136,241,190,151,246,185,79,176,215,176,57,181,254,199,204,42,136,217,196,171,160,79,144,148,198,113,32,64,132,147,7,116,14,16,129,147,7,115,34,211,15,39,15,246,148,14,174,63,157,143,159,251,201,175,204,68,84,224,254,97,173,125,224,201,66,162,227,180,160,42,113,142,136,71,72,214,127,250,65,75,170,10,39,3,66,114,191,11,78,6,44,118,7,19,156,12,216,212,79,71,56,25,160,48,211,250,217,88,231,94,241,56,60,111,250,143,194,182,227,251,136,108,57,8,10,132,98,161,101,231,37,37,83,140,140,184,197,1,243,
+132,34,129,2,203,236,100,185,5,108,159,245,22,176,215,131,91,192,254,25,192,1,123,3,52,57,155,25,103,106,179,110,10,98,243,128,206,208,240,74,98,75,122,92,233,254,227,183,192,155,185,150,182,55,115,77,22,110,230,234,206,222,204,245,40,130,204,117,193,209,251,130,115,179,43,152,119,128,54,235,68,4,98,21,137,191,125,131,4,226,138,38,73,236,246,65,129,26,28,152,28,33,224,22,110,159,5,183,112,27,88,194,201,98,147,60,134,38,54,16,87,166,166,243,139,38,75,58,102,32,213,77,41,207,76,251,131,245,102,168,156,253,205,80,251,51,216,80,91,86,121,92,107,176,236,222,36,21,120,89,227,157,229,97,240,123,53,112,17,124,154,136,193,195,207,205,124,171,25,244,141,48,82,9,55,3,100,34,110,134,170,132,131,245,224,135,173,137,61,212,48,36,219,118,187,124,56,108,151,137,70,235,143,118,135,88,33,128,241,45,156,227,4,132,75,165,172,192,199,145,62,16,209,87,204,56,149,155,155,32,244,27,14,199,143,249,76,137,255,164,139,137,137,33,147,249,
+51,166,217,192,19,217,251,240,143,223,144,154,119,71,164,18,29,119,51,25,148,25,199,19,253,176,219,237,143,65,2,190,115,57,223,53,214,42,57,21,111,162,58,169,150,197,3,74,194,93,39,164,123,62,240,171,31,227,32,245,199,78,238,172,128,158,203,172,8,152,138,39,110,34,127,120,255,62,81,234,121,186,161,157,55,180,207,29,250,4,79,107,251,61,52,138,191,51,17,154,82,28,232,125,216,232,193,225,136,47,93,109,193,81,185,146,49,205,85,15,153,43,21,222,3,51,124,120,177,111,68,104,35,187,47,67,223,191,111,254,114,196,146,105,234,208,115,173,239,174,3,205,29,33,243,19,230,134,71,110,55,6,40,10,118,85,86,69,123,193,87,200,159,246,47,150,38,150,77,25,216,168,93,29,235,120,144,201,1,171,36,254,29,173,59,9,91,78,20,213,177,18,65,154,85,80,90,173,86,179,1,247,123,186,9,101,193,49,193,171,124,36,217,169,21,254,81,243,154,48,246,169,140,50,132,162,60,111,19,31,99,194,140,190,35,17,51,241,213,191,66,198,65,251,182,85,
+212,15,181,188,38,103,182,20,138,162,184,45,46,244,246,106,191,173,73,187,142,114,8,222,59,93,80,181,115,212,157,7,8,71,96,66,140,236,239,131,47,31,84,105,167,57,51,206,92,182,219,94,124,174,155,31,255,244,129,102,243,247,164,112,46,21,138,69,58,99,98,168,219,119,166,150,147,208,25,152,157,177,83,93,74,84,42,163,244,147,48,127,49,176,237,37,163,7,104,6,234,26,73,217,130,252,204,172,94,97,21,50,194,31,35,201,44,254,38,22,139,134,160,239,56,142,58,57,207,19,3,228,127,233,52,123,146,21,49,126,78,118,235,11,115,194,164,120,43,33,79,74,21,110,188,250,95,104,100,89,113,248,100,28,232,27,43,110,232,147,14,155,8,30,46,231,148,203,229,223,106,133,221,40,49,33,162,114,56,36,56,6,131,77,27,107,112,140,111,231,212,123,222,193,124,92,112,40,108,73,169,0,98,229,147,243,75,206,175,113,16,109,47,139,103,114,197,208,123,34,206,185,212,21,78,31,97,83,158,95,203,214,80,98,241,22,23,118,216,13,183,113,37,205,254,247,
+245,162,183,184,61,158,190,60,80,32,142,73,40,133,60,62,148,218,135,20,183,15,175,98,121,147,88,223,221,215,164,223,57,251,106,79,27,100,173,43,204,39,26,82,252,58,34,150,98,2,49,206,126,206,209,143,36,238,236,15,230,144,116,174,187,129,50,69,229,10,123,214,230,228,97,32,11,71,230,202,191,249,243,137,140,35,128,0,199,50,120,225,34,230,30,217,74,152,90,180,192,216,0,57,64,251,148,226,228,65,146,101,124,129,82,170,229,241,227,30,242,248,133,31,244,102,203,249,77,108,166,20,207,37,45,171,60,155,196,92,124,132,182,177,214,0,133,128,189,36,127,98,80,32,2,196,86,153,112,112,128,158,12,188,220,89,9,125,255,207,11,124,154,94,240,227,17,87,69,27,133,51,206,35,164,38,240,9,251,12,87,96,138,16,0,216,128,187,98,69,32,111,222,225,78,120,141,46,86,66,11,50,231,25,135,84,58,45,205,142,103,187,162,38,217,60,71,21,123,162,84,14,84,16,25,84,21,45,131,159,138,163,116,245,53,11,66,44,246,58,117,112,71,177,227,159,
+17,72,249,221,117,157,120,53,36,70,238,56,182,40,240,151,196,141,255,234,25,233,16,153,85,187,188,84,69,13,179,53,53,71,218,53,231,151,102,44,227,59,19,115,24,19,61,81,100,29,169,25,206,243,22,105,157,113,192,180,117,70,125,153,147,124,49,22,7,142,99,235,113,209,207,103,209,144,50,180,80,150,223,200,75,87,173,208,71,42,140,37,210,162,87,69,163,142,179,212,51,163,249,109,182,33,141,56,245,229,169,246,162,58,83,3,253,113,75,154,215,40,245,70,25,61,59,60,214,124,102,104,45,243,202,7,69,148,223,215,131,23,180,70,184,119,167,18,132,191,94,56,114,122,156,145,4,31,215,216,90,19,127,162,56,160,136,56,170,111,90,182,116,219,86,177,158,138,130,194,218,30,127,90,115,236,54,83,128,147,29,175,106,33,206,50,253,11,251,55,23,228,119,155,50,77,162,78,91,63,114,171,67,38,24,185,15,72,55,166,121,122,145,113,55,12,212,201,175,249,33,58,231,3,10,119,77,234,124,127,199,36,59,237,63,131,133,96,39,0,67,116,169,68,92,217,
+212,86,225,222,60,76,137,205,191,119,154,64,133,31,170,154,195,57,185,194,92,239,185,51,13,219,170,1,202,100,73,129,30,35,134,226,240,168,96,50,145,103,84,206,245,224,184,180,174,14,182,240,53,207,231,142,148,193,239,206,236,208,62,153,20,192,108,86,102,104,12,142,128,116,234,12,104,211,145,36,240,93,90,110,158,118,28,158,53,157,239,149,8,246,170,222,224,155,135,131,154,192,19,183,39,33,228,192,168,197,64,84,12,219,160,146,120,225,23,171,182,64,62,191,175,165,170,178,134,129,88,202,201,96,205,48,119,17,192,140,233,31,159,199,212,170,74,79,156,95,214,107,19,68,101,45,95,147,58,24,0,55,241,101,169,170,205,26,168,154,178,70,3,108,30,114,241,199,225,176,37,90,112,128,137,30,93,241,49,107,95,44,171,74,195,160,147,4,34,9,198,55,0,51,252,24,73,153,201,163,233,143,166,212,137,90,0,126,220,108,241,158,86,17,49,147,35,74,215,103,239,158,164,146,225,53,142,33,81,19,127,243,57,171,80,111,48,104,15,167,24,42,113,23,231,18,
+53,209,232,78,94,23,218,183,227,95,141,32,13,123,15,235,249,235,251,61,240,135,121,205,147,57,142,230,156,165,201,86,6,76,62,75,210,233,187,73,88,206,35,149,50,73,27,76,143,171,218,160,96,210,111,243,253,93,156,71,65,181,179,129,158,159,65,70,153,238,205,38,40,206,124,223,196,217,253,210,41,149,112,9,250,15,143,95,142,41,199,4,236,91,96,215,210,48,190,37,128,177,189,90,4,78,167,153,46,118,46,159,231,153,227,187,233,136,126,149,99,106,27,129,80,222,225,138,77,189,36,95,63,152,103,54,202,90,8,187,46,142,249,171,70,132,23,142,235,157,10,135,253,99,59,176,231,59,184,161,219,196,200,130,164,141,146,37,143,143,38,200,47,19,37,149,108,139,33,3,20,195,86,105,141,53,81,117,135,237,116,26,174,168,195,35,226,244,148,172,75,134,28,195,62,116,72,62,154,90,230,35,198,220,106,179,126,43,113,66,21,201,115,216,163,39,17,211,21,253,197,141,118,130,55,182,242,189,252,119,2,131,204,93,57,127,90,153,129,159,188,59,147,247,175,148,
+198,92,56,205,9,76,145,113,17,123,192,110,65,34,37,67,50,133,69,170,50,116,93,185,237,254,167,49,197,189,39,184,127,100,129,164,247,103,73,108,60,100,94,26,28,98,28,182,93,214,244,161,215,3,201,21,56,94,235,120,0,225,126,168,84,132,253,152,192,137,55,196,125,67,26,99,103,149,215,123,153,194,172,204,184,223,42,254,49,247,50,144,74,226,34,142,56,81,22,42,222,237,113,130,239,241,230,56,142,132,119,225,18,200,105,207,239,29,15,57,167,1,16,193,234,18,185,82,253,163,191,111,97,189,214,134,64,188,34,228,48,252,129,190,79,1,97,151,31,51,126,20,114,32,97,181,195,177,17,22,18,68,116,17,174,184,151,107,217,181,150,90,14,242,222,78,64,189,126,125,25,80,112,255,148,15,177,188,122,180,0,24,128,164,104,188,35,7,186,112,123,20,2,158,151,132,92,25,228,249,106,97,127,158,200,114,124,31,158,153,223,109,107,65,158,178,205,44,59,247,6,70,187,15,56,194,247,111,189,11,215,115,152,215,122,142,215,56,178,224,230,212,61,42,92,51,
+91,112,98,118,152,155,1,95,35,192,184,20,96,50,242,34,7,181,100,33,213,253,188,135,170,244,211,245,183,246,158,170,242,101,231,242,27,156,113,82,242,22,196,227,237,83,81,91,99,206,100,215,247,230,96,229,226,11,159,142,211,72,234,79,200,147,180,203,92,217,42,194,177,199,197,104,243,87,50,26,16,144,34,201,181,108,21,75,108,2,178,172,51,18,53,230,193,61,185,209,130,2,28,246,213,168,155,138,160,143,102,50,90,95,171,234,41,115,33,159,48,198,211,197,213,5,185,222,112,89,201,225,81,202,100,158,5,247,52,12,145,42,228,144,5,119,169,145,85,9,32,5,70,137,43,89,211,28,120,8,11,193,116,89,57,124,160,17,156,185,180,23,36,147,197,2,237,76,130,171,42,48,220,247,31,51,189,227,220,21,67,191,12,106,139,111,45,82,90,243,90,6,241,189,119,201,231,212,137,58,131,80,43,226,251,100,61,219,98,86,31,9,150,210,224,35,18,7,102,129,198,231,215,101,181,155,202,244,117,85,128,245,134,176,62,212,31,232,20,109,49,175,55,173,26,40,
+224,13,88,105,64,221,170,39,99,247,63,183,225,188,147,119,234,190,214,94,134,201,225,106,64,42,145,7,233,124,225,199,175,124,58,105,196,142,130,50,147,253,204,73,107,228,213,107,37,127,183,102,39,165,229,240,230,126,226,119,71,250,206,0,21,24,119,236,127,87,224,36,241,221,128,147,158,120,5,78,95,65,237,157,102,79,49,233,62,136,191,47,83,189,151,172,29,216,133,180,112,101,213,54,52,178,131,29,32,253,166,166,193,68,178,192,197,198,114,251,154,248,99,218,107,95,238,139,46,206,138,96,111,69,82,96,4,227,166,182,76,98,5,189,196,118,25,17,174,183,18,238,33,141,126,115,172,240,34,164,250,203,24,235,93,134,152,231,68,224,156,2,93,146,20,57,223,123,77,243,166,60,66,168,175,77,255,36,83,161,251,2,189,130,51,117,71,142,56,228,250,18,185,34,225,113,227,146,163,142,164,11,81,178,230,236,222,3,187,8,199,210,84,77,178,186,234,232,1,216,153,240,233,53,132,208,250,3,238,116,35,69,3,251,251,186,28,185,149,174,112,162,215,25,67,150,
+28,87,106,85,161,80,123,177,63,35,244,180,234,36,135,175,230,79,66,6,102,130,170,202,34,91,139,127,128,195,0,247,238,15,127,35,154,101,3,111,67,138,91,129,206,210,74,221,57,176,98,76,177,234,190,249,115,57,44,6,74,164,9,83,17,224,203,133,32,101,68,153,155,157,51,191,199,16,248,166,75,128,244,101,253,64,157,232,83,188,86,158,100,178,11,223,154,230,205,82,146,150,94,253,201,183,130,182,48,85,240,142,143,154,124,60,85,105,67,3,87,65,42,88,147,28,32,225,176,142,29,249,108,134,69,223,5,227,59,206,61,96,118,162,39,209,70,54,22,224,124,218,171,251,197,71,225,8,98,232,66,51,190,239,137,4,165,100,179,227,190,148,14,104,240,157,156,119,250,251,26,116,166,129,191,40,42,137,63,53,168,15,5,233,174,255,164,25,226,20,1,84,125,33,121,219,6,10,45,227,39,227,253,97,175,204,16,178,187,188,72,50,124,84,208,255,48,147,192,80,53,244,215,21,70,210,74,25,245,180,20,121,247,83,238,173,97,127,218,175,243,93,47,136,130,190,
+21,6,152,167,194,13,96,246,38,55,128,249,77,184,1,76,129,244,6,48,235,249,43,192,156,156,205,173,17,229,92,98,164,10,190,113,197,52,65,124,125,61,24,129,144,145,86,43,9,3,143,123,73,176,232,150,109,208,179,62,13,15,164,182,131,117,62,42,92,9,226,191,126,197,25,124,152,96,75,223,31,60,37,65,255,86,211,217,19,152,147,25,119,136,93,34,254,177,58,60,252,125,59,25,105,12,133,155,250,230,118,242,86,64,101,35,34,254,19,127,88,189,205,178,93,97,2,167,4,145,147,217,69,157,172,7,1,77,50,48,187,158,81,117,45,254,46,205,107,217,38,83,240,71,168,104,34,186,205,233,238,213,41,55,146,105,194,78,31,117,81,168,101,246,215,161,212,165,208,182,22,94,194,215,215,193,191,20,172,62,212,229,125,226,123,79,125,152,244,191,27,156,149,242,251,226,87,188,142,178,121,37,152,68,13,59,226,189,43,187,224,188,109,19,79,19,89,119,227,72,64,250,153,199,123,165,237,113,114,31,73,255,164,7,174,140,68,113,234,249,236,234,20,91,100,155,
+204,6,74,177,35,202,235,225,222,182,206,161,240,233,84,204,143,54,136,201,14,250,108,56,69,78,48,26,61,112,138,28,179,221,240,224,20,185,136,229,54,15,130,167,4,73,177,209,81,59,102,83,34,170,87,85,72,153,255,50,142,113,91,107,185,87,45,117,179,215,54,253,19,110,176,236,187,66,140,191,20,24,124,151,103,0,80,168,204,184,164,116,96,254,177,117,97,95,84,192,8,177,106,45,64,148,69,43,166,198,166,116,43,161,131,177,197,70,150,119,237,99,146,144,32,16,171,172,129,67,183,147,79,99,195,12,11,244,208,210,224,99,252,172,101,254,17,199,129,231,143,136,169,242,217,249,104,155,91,2,250,60,133,41,2,125,43,193,85,205,251,126,126,48,16,47,11,205,235,210,63,143,226,235,184,229,35,97,252,241,164,42,107,215,60,119,233,144,109,201,13,239,252,223,1,223,118,86,27,106,201,112,206,149,120,4,8,203,190,158,18,27,143,27,206,184,46,243,50,105,31,198,65,5,23,133,203,11,185,97,134,74,44,191,179,15,149,130,76,71,104,145,240,168,58,124,
+127,226,171,48,187,140,241,253,149,49,15,224,176,24,233,30,205,230,221,129,65,80,212,18,254,111,27,51,215,44,38,77,146,133,245,165,23,85,35,206,70,122,160,138,94,125,190,136,89,17,49,0,252,125,174,189,134,199,42,70,106,242,130,47,247,131,32,240,91,7,189,5,164,18,48,210,225,185,25,13,200,137,57,8,93,40,132,245,209,240,0,12,174,98,158,113,168,224,195,5,177,65,58,226,56,97,99,141,148,127,255,228,76,232,139,162,106,73,119,108,94,71,221,101,168,119,7,72,119,201,230,174,218,108,31,213,9,191,98,104,154,201,88,20,243,9,10,165,137,151,59,186,53,174,97,100,70,187,158,20,245,10,46,4,214,248,200,242,49,218,202,148,21,112,170,83,1,111,219,254,135,250,225,53,53,39,175,56,151,249,118,122,126,200,144,213,151,24,240,180,212,3,191,221,247,143,149,229,245,107,73,222,237,44,131,37,211,30,155,236,186,9,222,212,136,196,149,5,65,12,34,20,41,240,65,177,101,64,198,110,52,120,148,140,12,61,100,59,64,96,29,194,234,119,56,8,
+53,26,190,146,233,61,38,103,140,128,78,135,163,238,187,80,159,47,60,97,9,231,97,174,222,144,216,250,27,29,11,38,3,63,145,215,223,159,154,253,204,215,159,132,96,78,222,253,182,107,95,196,203,8,195,9,119,1,0,185,199,22,69,219,189,155,180,191,203,244,237,41,126,134,252,18,122,153,87,240,27,211,7,37,86,89,192,253,126,108,68,123,217,208,142,123,105,45,148,230,106,136,232,53,76,252,78,106,229,238,97,37,180,119,243,96,166,154,124,25,9,25,253,194,130,98,37,77,241,129,196,199,231,75,226,171,91,147,102,130,75,51,82,223,44,107,86,243,170,180,84,164,1,230,148,71,239,47,26,229,93,240,157,78,105,13,109,109,36,170,109,189,76,62,251,47,218,181,112,160,47,167,204,70,55,237,30,137,7,250,63,49,16,117,183,182,172,196,116,60,206,50,56,237,85,181,254,43,2,84,152,223,248,41,75,186,44,15,175,56,50,224,126,23,123,133,95,19,31,53,151,230,88,140,25,217,220,96,253,66,118,131,245,230,143,27,172,175,53,110,176,190,253,1,193,122,
+133,133,180,255,137,254,112,139,106,198,155,117,192,179,175,3,192,55,238,167,221,48,165,42,175,185,213,174,47,21,131,163,55,238,211,233,221,52,229,132,181,65,12,74,57,124,38,158,21,4,180,57,169,138,74,61,234,248,126,129,122,0,2,149,214,79,241,181,255,213,147,46,39,217,141,126,105,14,186,71,190,142,187,203,40,81,25,127,166,150,125,176,227,140,234,5,11,215,146,102,241,130,243,39,143,78,165,84,136,177,76,181,159,145,170,218,155,123,105,6,21,208,96,237,133,101,191,222,161,117,47,52,122,105,200,87,132,243,188,160,145,33,171,120,61,76,234,26,96,175,239,39,209,64,31,239,122,39,137,31,41,240,169,47,81,149,137,97,20,234,158,89,109,182,100,181,94,151,63,80,90,241,176,144,101,112,88,45,135,124,128,85,241,64,121,222,111,47,113,20,178,145,141,69,122,76,1,143,105,83,42,143,31,32,79,131,197,137,204,123,98,85,218,222,187,104,16,133,252,96,247,31,243,65,241,54,40,225,144,233,162,97,194,45,175,162,251,236,85,72,210,79,204,166,81,251,
+187,134,36,22,65,111,212,99,109,83,74,91,107,120,73,239,138,105,247,113,146,77,136,174,137,128,188,109,10,162,218,31,67,13,185,246,84,146,213,90,162,254,67,14,72,15,108,171,196,166,255,136,228,32,87,123,7,31,172,236,156,129,160,154,29,111,146,176,153,186,52,2,107,218,238,232,155,23,155,245,201,244,128,185,235,44,182,68,10,161,229,81,55,49,17,215,251,248,227,128,149,247,94,119,114,215,97,35,123,166,20,30,159,210,155,204,68,132,36,191,236,223,3,107,142,53,30,76,215,158,135,230,156,61,62,244,254,152,193,166,161,118,255,137,138,56,181,128,241,50,5,143,147,180,255,242,35,162,15,84,171,181,169,69,88,181,236,218,128,15,178,111,208,41,227,5,29,14,200,222,39,60,126,204,17,231,80,222,180,185,231,237,66,58,74,253,182,218,150,50,232,172,1,124,228,162,181,208,191,37,236,177,140,186,56,238,9,165,192,139,18,61,161,115,173,4,130,229,243,165,40,38,80,32,193,95,232,59,206,254,65,124,44,114,200,149,181,3,59,210,136,197,248,152,152,244,
+99,150,98,81,70,240,99,106,142,33,238,17,128,24,85,29,163,63,95,204,241,110,173,40,141,247,64,196,238,231,219,140,67,64,203,136,31,65,104,25,36,194,248,125,119,35,208,105,202,141,64,107,126,111,4,154,225,188,17,104,156,248,70,160,49,121,52,240,138,109,233,202,172,45,39,6,32,82,216,39,242,156,83,216,162,30,17,47,168,255,204,7,92,0,44,220,152,50,149,253,200,20,219,162,78,101,114,164,116,157,94,231,78,232,21,207,56,180,63,19,149,129,136,160,44,17,222,41,6,104,114,44,22,11,96,169,151,239,207,203,143,77,203,115,157,68,27,52,166,215,73,52,37,135,179,250,70,164,126,95,32,247,116,247,254,53,108,220,203,212,111,209,17,127,165,251,182,87,157,64,119,237,120,70,4,32,252,251,175,190,184,79,193,181,203,131,176,44,113,186,215,137,178,63,251,238,58,81,198,235,247,197,189,201,157,162,70,94,112,198,224,240,77,22,70,122,210,23,234,172,192,225,129,168,151,225,207,179,89,126,7,15,134,237,145,150,185,38,234,245,148,233,173,231,182,56,
+229,176,157,115,112,30,190,212,122,209,126,209,30,79,13,173,32,225,97,197,215,72,2,5,208,55,205,123,163,58,9,138,147,235,62,89,211,10,249,61,180,55,190,132,166,198,94,214,195,244,203,58,190,119,172,210,121,114,20,210,187,47,244,236,204,33,109,4,22,97,240,235,214,182,81,97,236,216,117,171,57,59,206,229,198,253,176,228,33,48,234,40,90,66,2,54,199,114,118,47,104,63,184,34,247,67,219,76,189,54,165,43,133,26,178,253,177,214,48,156,201,178,245,11,65,73,156,195,120,221,65,166,34,198,8,72,126,187,107,157,10,55,218,71,230,211,215,201,251,171,222,254,70,123,159,53,85,63,231,86,180,40,252,54,70,170,224,194,145,86,83,95,232,216,26,223,142,27,172,1,59,166,123,164,51,49,155,123,239,146,93,74,183,142,108,148,233,11,143,147,3,25,53,174,66,164,198,237,204,185,236,226,73,145,160,152,112,240,130,129,120,229,82,71,211,57,28,155,187,32,133,11,116,253,204,120,156,1,197,109,23,170,196,148,189,212,39,50,209,131,209,162,89,19,24,246,
+168,130,38,201,71,54,163,84,245,142,21,16,31,128,84,52,224,80,96,250,171,149,207,36,54,211,21,198,12,115,174,169,162,255,224,180,94,238,179,150,70,191,112,224,214,134,129,83,105,134,91,27,134,186,0,137,197,116,7,139,15,153,202,202,44,201,115,16,41,20,201,172,161,105,200,3,48,69,91,71,101,155,15,112,100,102,19,135,193,90,33,183,15,208,213,247,244,236,56,216,223,248,144,95,204,25,135,68,137,44,205,250,243,199,84,136,15,134,10,214,120,109,124,170,222,73,255,180,120,86,185,222,231,158,212,108,237,215,221,118,29,240,47,177,63,68,200,209,245,109,128,13,235,248,52,180,203,82,255,103,131,140,169,255,100,154,12,110,58,182,47,122,10,173,31,205,57,110,19,20,60,1,101,184,58,205,180,104,184,112,62,223,185,127,103,200,172,106,196,7,82,88,149,174,225,22,253,0,7,232,154,19,44,233,25,210,114,90,178,193,57,140,129,149,126,59,49,236,22,182,13,163,196,29,206,218,206,148,215,78,87,136,204,94,242,64,255,22,17,10,97,71,100,170,146,242,
+142,1,114,176,200,183,34,111,17,222,215,50,81,172,21,21,39,96,0,124,61,188,170,33,113,255,119,125,122,95,169,243,129,50,120,45,170,143,95,218,164,19,72,37,76,89,136,173,101,28,233,71,68,6,162,151,107,221,228,58,200,80,11,57,62,198,199,103,28,33,127,143,229,207,93,22,75,164,30,171,165,238,220,24,23,229,109,37,108,213,2,169,28,24,180,87,179,32,118,70,243,111,159,171,161,208,204,196,64,32,164,8,96,138,133,12,41,110,28,37,34,229,4,11,228,234,167,145,30,47,170,196,142,45,53,140,50,158,246,198,16,228,107,29,228,206,80,149,138,126,134,173,71,63,92,109,215,39,26,157,34,204,26,145,14,65,124,121,26,245,222,21,156,231,122,140,158,76,22,210,92,152,96,173,136,244,226,243,83,225,249,121,26,19,192,221,245,215,58,56,105,176,220,113,196,63,124,107,252,205,11,50,97,167,1,253,224,95,117,8,100,96,34,66,237,56,8,246,27,242,154,15,40,253,78,12,148,67,143,94,163,162,17,169,167,127,242,30,129,202,81,82,151,46,230,153,
+35,53,29,176,146,31,141,108,235,47,225,154,112,204,109,63,157,157,111,30,139,165,96,13,76,159,91,91,220,163,239,115,73,214,151,226,114,64,88,254,88,67,180,23,6,162,255,98,37,32,230,215,244,228,70,192,128,108,83,218,55,23,182,215,234,29,131,20,184,86,239,142,211,30,228,59,16,100,113,79,184,186,187,86,52,120,63,55,71,145,51,67,142,34,81,139,25,60,87,71,113,70,15,91,139,12,216,212,103,254,62,90,196,60,238,158,131,51,60,102,123,92,105,60,180,31,12,142,148,112,249,183,48,182,198,39,255,228,81,3,224,205,174,126,56,78,66,88,223,175,222,43,171,121,78,120,243,40,228,183,252,164,231,132,194,98,121,197,44,190,18,34,133,53,100,52,25,17,221,2,150,124,63,105,67,200,22,11,201,30,62,103,254,109,96,69,121,161,220,6,86,36,43,50,235,156,163,152,37,45,191,176,229,167,14,70,54,224,171,183,12,60,16,50,40,97,212,111,17,114,65,96,243,143,124,73,131,203,46,5,143,69,248,192,241,197,94,255,173,221,227,8,118,94,13,12,
+52,1,186,142,234,235,41,21,33,163,53,227,93,142,238,89,95,84,252,203,155,111,170,4,16,66,103,25,46,153,4,174,175,159,89,232,194,64,168,224,32,40,241,211,199,184,134,190,113,20,158,242,175,170,186,4,125,158,230,135,194,232,137,248,67,102,191,84,94,51,133,180,196,231,115,60,13,109,168,115,228,218,225,183,130,126,63,20,248,117,38,226,79,30,216,117,125,234,105,19,184,196,174,70,200,207,112,137,221,219,12,95,162,152,142,60,20,76,249,45,106,62,59,229,63,246,89,118,111,52,88,11,85,113,51,142,53,69,64,188,206,161,51,176,249,175,243,162,31,107,203,252,27,46,165,131,234,227,25,46,165,31,240,174,45,92,74,183,56,2,221,156,223,242,71,98,104,34,42,170,166,24,160,137,216,236,138,215,100,165,181,39,162,172,248,233,214,135,129,156,72,69,153,110,113,223,154,152,253,88,130,154,103,153,31,187,3,102,233,151,155,109,215,114,205,125,219,150,117,91,19,212,231,150,197,66,185,119,221,211,125,224,27,205,6,5,111,214,253,228,229,238,118,16,85,221,
+205,224,182,161,155,193,97,243,55,131,83,69,98,181,223,99,137,125,177,147,1,130,194,151,194,130,166,169,181,8,6,105,87,171,163,249,255,182,9,140,253,255,1,207,39,16,8,43,172,240,246,75,253,58,200,113,232,221,6,57,174,197,185,205,196,159,204,75,91,233,116,55,147,178,94,213,244,7,97,230,33,179,140,226,143,38,247,62,16,37,27,152,183,156,23,124,67,90,144,45,120,211,208,158,77,75,243,235,9,1,4,16,168,107,29,140,43,176,236,36,35,219,182,67,42,67,225,59,142,248,215,254,66,247,194,37,156,29,179,18,124,87,179,130,226,251,53,235,111,240,150,192,0,60,158,103,172,223,198,243,158,30,201,125,216,44,17,25,72,185,201,247,187,104,147,102,55,24,12,25,165,98,61,93,112,90,105,91,169,56,19,106,51,156,94,248,5,212,141,222,16,47,62,250,109,157,63,104,29,22,100,123,11,216,248,32,219,243,65,198,247,7,217,222,190,161,187,198,109,62,226,213,245,143,222,70,94,38,102,224,190,4,119,190,40,135,186,203,181,243,5,220,71,238,224,206,
+23,124,240,103,112,239,202,245,228,1,130,154,181,122,71,34,83,215,2,223,29,161,26,18,147,118,156,74,119,140,90,154,249,193,55,239,114,55,41,78,185,192,68,142,198,18,120,29,31,173,108,43,119,158,16,58,31,241,150,119,92,196,81,215,19,61,193,195,96,144,105,121,224,97,176,22,141,171,149,27,83,69,195,130,207,88,48,132,218,251,123,210,23,10,7,231,17,153,86,88,154,95,78,2,86,109,54,195,45,249,31,211,197,228,75,175,231,140,103,156,193,80,33,65,114,234,136,123,228,127,124,127,241,190,84,26,90,154,157,122,77,31,201,251,38,20,223,139,65,99,95,248,28,89,130,130,137,32,32,44,129,171,86,138,124,242,30,216,58,118,234,190,45,60,20,197,177,151,112,240,80,84,131,97,224,185,132,196,243,179,66,93,100,7,127,204,175,59,175,238,138,182,0,177,1,219,51,43,244,250,78,119,210,166,54,191,41,73,55,176,59,186,34,238,184,152,1,137,81,41,104,143,183,121,128,92,193,36,130,78,2,168,155,113,82,62,231,77,254,76,72,254,59,23,65,189,
+135,135,153,66,44,201,61,60,204,148,216,102,181,240,48,83,162,109,173,194,195,76,245,47,9,54,152,99,91,9,125,129,200,122,107,168,111,208,89,37,157,231,68,217,228,233,6,74,190,62,63,62,70,183,146,111,61,201,179,208,55,23,17,97,254,229,86,239,20,241,39,203,238,147,61,62,126,103,194,253,243,248,201,172,93,222,184,195,129,208,81,113,79,252,227,115,56,11,177,116,98,172,133,234,25,23,75,180,199,175,248,253,112,133,143,64,35,1,234,53,173,75,210,247,183,46,57,96,51,16,158,224,102,145,229,238,1,3,55,139,52,192,71,170,251,142,13,247,95,228,224,242,17,254,223,125,95,1,198,224,192,134,66,134,145,124,43,251,207,158,57,164,210,210,204,66,80,39,183,231,197,112,81,10,250,129,236,102,38,102,223,27,207,57,189,243,46,179,136,91,34,249,254,42,255,59,196,47,172,253,226,141,147,18,247,239,197,64,5,241,0,23,171,32,5,233,192,197,170,41,171,150,38,252,225,160,149,250,190,210,127,234,49,201,30,38,92,238,207,234,21,103,12,119,29,54,
+4,178,111,117,185,248,190,139,127,48,218,102,197,14,212,19,255,85,23,139,199,81,144,26,107,205,227,173,16,1,148,232,249,124,51,159,87,85,84,135,109,65,240,167,136,10,75,42,162,228,71,242,162,165,170,34,205,167,243,225,222,199,113,49,30,45,184,180,22,253,13,100,254,12,119,38,25,126,226,3,225,55,183,224,96,66,102,89,190,113,88,194,93,227,62,251,182,228,180,106,197,146,111,121,9,60,55,210,108,11,142,87,74,112,179,12,198,254,17,9,166,219,114,170,148,74,160,17,204,38,87,184,38,253,28,26,16,213,212,237,115,80,228,153,165,217,245,77,238,183,1,169,212,216,145,32,212,0,85,229,92,118,155,7,165,23,191,93,173,102,50,56,63,25,202,130,98,84,84,156,21,32,113,175,247,243,93,223,181,90,228,243,4,253,66,239,139,251,235,15,133,175,237,167,233,91,248,54,202,212,194,150,99,97,109,33,157,68,229,247,184,172,102,121,170,162,153,215,106,224,151,104,183,52,31,11,15,209,216,135,70,47,215,206,163,59,78,118,105,46,56,121,211,67,61,84,
+32,122,20,36,118,206,112,124,234,164,45,92,177,143,241,84,33,95,74,200,61,32,116,36,42,149,174,30,109,63,164,183,35,98,98,17,127,12,78,144,156,251,171,125,35,171,210,79,212,68,228,242,244,1,7,0,1,53,98,212,253,162,40,199,107,63,99,242,150,115,23,21,217,52,178,235,66,175,251,88,145,133,210,11,69,111,228,147,59,71,123,47,154,252,56,205,65,32,249,2,38,100,88,33,16,48,12,112,79,41,196,182,118,161,148,9,206,120,203,128,52,59,215,184,191,95,79,22,220,171,38,163,116,118,244,161,190,125,171,36,24,117,58,74,31,252,25,76,190,242,56,87,205,21,216,90,141,79,198,217,185,127,136,123,107,221,29,230,188,94,82,104,225,41,90,26,237,189,43,19,82,182,194,53,177,135,149,97,107,72,25,198,88,136,207,115,152,30,205,145,192,135,24,187,213,81,223,45,181,86,222,121,10,71,230,30,65,97,118,39,182,98,113,160,219,247,109,251,26,70,147,124,87,96,158,201,208,37,10,164,74,46,52,253,174,118,79,250,138,65,206,154,87,250,7,244,
+223,222,7,236,105,223,74,146,50,78,46,240,115,207,140,131,82,50,148,166,79,148,25,206,98,211,27,221,186,252,132,197,85,108,146,180,195,135,84,161,234,133,149,189,104,40,170,170,49,148,97,27,70,249,142,137,214,252,129,145,25,238,152,98,244,75,87,96,117,94,60,57,226,34,143,101,94,115,16,46,72,66,73,250,174,47,228,177,188,41,42,251,128,203,231,238,218,227,52,116,38,84,249,150,100,53,7,114,111,134,81,174,197,201,12,150,162,184,153,144,119,112,221,74,55,213,84,129,94,110,177,153,215,142,157,115,186,11,120,223,191,35,200,188,118,172,185,68,73,231,76,211,157,223,246,18,234,88,82,99,120,39,135,19,181,72,49,108,196,32,94,227,144,223,82,66,126,43,177,34,196,234,227,177,184,22,34,66,187,235,43,20,36,99,102,178,224,233,153,204,143,160,103,131,217,96,39,242,146,204,219,3,132,52,69,170,99,42,59,57,237,139,172,105,215,170,165,110,69,246,239,124,167,179,236,42,233,198,136,253,32,152,156,8,68,218,244,133,248,140,240,222,125,64,118,49,
+115,201,55,114,197,92,191,177,150,189,210,59,141,14,189,164,97,30,58,249,240,115,220,83,93,253,28,63,195,218,233,223,233,88,141,189,11,152,211,191,49,18,23,230,115,120,172,70,25,118,5,193,22,20,44,21,185,37,253,110,53,14,60,61,126,222,97,188,213,206,122,119,102,17,58,107,189,113,51,189,184,140,70,189,222,110,34,218,204,38,83,90,51,93,210,163,128,42,63,220,60,36,18,44,8,166,33,58,88,204,213,127,160,226,155,212,137,230,59,230,130,100,173,47,133,251,199,95,35,190,17,55,160,139,69,222,128,238,3,251,6,116,113,55,183,245,175,186,226,155,94,221,3,23,15,62,119,106,186,10,186,56,218,170,39,200,209,62,246,152,232,87,169,255,230,176,154,80,84,145,234,12,142,188,45,27,118,8,5,85,47,122,165,130,93,91,11,254,109,66,12,96,124,213,66,151,143,86,129,47,45,23,50,191,213,216,253,36,45,216,76,0,14,134,108,175,73,204,204,127,112,204,39,101,177,67,21,217,71,61,85,43,133,203,61,59,254,173,220,99,37,222,202,61,223,199,
+189,75,238,245,10,237,17,165,225,181,187,161,216,153,78,185,79,73,51,71,2,99,166,62,85,1,150,168,125,46,199,222,41,68,115,90,100,24,198,141,124,255,218,231,204,193,191,13,46,8,130,215,193,5,156,93,88,237,102,131,135,132,73,81,42,210,204,41,79,81,239,127,223,171,118,128,31,215,9,236,121,51,121,15,35,155,144,239,31,119,221,60,178,84,125,187,47,36,228,207,106,155,174,137,47,111,83,138,84,185,38,36,117,214,245,119,125,35,26,23,18,224,74,126,108,131,176,52,117,4,156,49,85,125,52,48,207,46,42,45,7,114,201,29,201,180,88,71,59,226,159,11,238,93,216,252,88,29,239,247,223,251,63,227,179,229,144,45,190,2,178,201,253,35,162,225,6,176,151,31,10,16,249,198,189,28,178,70,214,247,47,4,48,109,43,98,228,136,247,59,164,19,234,131,59,62,245,183,214,173,209,20,215,17,131,133,134,52,173,40,144,29,241,139,151,115,117,59,85,60,250,127,157,43,160,132,246,67,163,69,78,157,254,169,240,85,176,170,116,247,186,203,156,147,96,226,
+79,195,76,75,90,192,50,250,49,97,102,52,248,65,20,18,132,163,167,28,63,43,123,172,235,51,254,204,115,147,221,39,149,146,253,114,145,93,133,71,14,84,10,133,56,184,226,163,4,249,231,204,88,170,118,126,199,235,132,171,74,60,233,107,221,26,107,213,224,16,8,100,142,137,254,79,29,61,48,129,126,62,245,219,255,8,218,172,192,50,24,182,135,31,157,198,87,94,165,151,106,204,10,139,158,214,110,191,242,230,79,235,70,32,79,96,167,49,217,19,157,244,162,41,84,240,192,196,60,25,229,228,26,9,46,139,104,49,134,155,184,91,5,223,126,146,122,102,31,158,141,248,129,243,65,18,168,75,0,78,229,231,31,125,188,127,94,50,51,3,155,110,123,172,89,205,33,250,50,234,151,174,32,190,221,236,135,131,3,123,156,136,120,223,142,90,94,172,133,228,197,124,239,127,8,42,6,169,16,209,166,77,159,203,231,251,156,170,252,188,228,4,223,92,108,98,4,143,185,108,176,37,87,235,49,179,156,40,135,162,13,77,61,152,97,80,111,91,210,55,61,48,148,174,112,197,
+127,226,35,225,132,177,197,190,191,91,153,75,230,232,243,85,143,53,30,176,173,51,121,167,78,113,95,17,211,214,14,185,163,242,153,162,2,57,85,59,248,49,12,127,205,239,6,98,254,166,124,186,167,38,150,47,57,190,235,32,54,133,35,229,80,21,205,175,198,76,225,142,12,156,165,24,47,142,168,150,57,24,9,83,146,140,122,56,222,215,245,137,60,86,107,35,104,199,101,74,84,164,206,202,151,212,23,71,176,87,146,227,169,27,45,202,34,70,222,10,222,238,231,101,37,62,24,101,37,162,108,251,174,24,210,80,99,245,107,101,125,126,72,6,87,156,183,139,24,47,61,223,113,244,177,208,66,253,108,179,99,232,52,101,161,200,253,122,3,169,81,83,32,170,164,41,17,56,94,83,228,162,78,33,34,61,141,42,201,133,162,178,114,159,120,88,109,63,214,252,239,253,72,168,230,230,214,148,9,106,123,247,115,83,43,244,192,207,237,198,246,242,233,251,234,179,78,73,242,108,229,185,56,154,156,79,121,17,240,108,31,206,51,213,199,33,215,47,248,109,181,219,135,46,72,22,
+214,251,111,227,40,90,69,28,248,152,45,39,45,218,31,71,79,149,63,125,92,209,81,52,208,242,97,14,82,170,15,215,219,52,186,165,13,157,180,86,80,70,75,129,184,212,248,93,143,49,90,190,63,167,215,62,236,31,232,108,19,31,61,203,123,164,225,233,231,64,246,36,147,8,138,31,29,154,130,154,22,14,134,62,49,100,212,141,39,61,137,200,7,54,30,129,32,163,110,10,241,175,58,60,226,254,202,102,117,83,230,157,215,240,111,126,169,111,155,169,58,89,106,0,197,58,39,236,5,176,94,187,247,90,207,64,32,80,176,95,2,221,211,215,172,3,165,84,109,139,52,157,234,154,25,124,184,220,193,153,65,132,9,94,85,126,183,243,71,175,4,194,208,93,79,114,243,196,211,120,184,133,88,196,249,114,192,129,190,186,196,178,92,166,41,9,22,130,253,84,213,221,212,229,139,120,72,194,253,175,171,58,71,217,143,1,58,75,166,137,22,217,159,12,74,15,197,178,157,224,1,98,5,147,47,255,144,21,130,97,200,233,126,180,96,125,121,220,216,8,110,213,255,224,159,161,
+252,103,226,199,198,189,224,129,171,244,204,180,18,38,201,111,149,91,223,227,93,3,149,49,196,227,215,18,41,42,48,0,65,87,58,4,188,87,164,66,215,29,85,51,207,212,246,147,254,148,149,226,137,178,214,185,254,108,46,69,94,205,222,95,17,24,124,22,111,20,18,143,249,42,168,227,236,150,248,251,103,94,75,91,185,37,254,82,79,36,14,0,128,111,28,242,88,166,178,225,210,57,221,216,52,149,85,100,243,169,57,16,197,250,8,143,63,25,240,205,140,152,252,64,106,17,225,90,118,197,206,168,188,225,152,49,136,29,30,98,26,243,32,59,113,38,228,78,212,220,182,232,106,245,237,132,161,13,93,42,29,139,252,18,78,182,4,26,178,156,255,219,144,198,159,120,111,155,156,175,215,251,178,200,106,5,33,251,68,80,135,223,123,68,69,141,182,238,97,125,196,207,127,250,182,174,153,83,153,217,124,50,205,53,22,46,220,148,91,106,106,18,159,79,21,5,74,79,103,142,10,95,70,110,93,243,109,230,51,87,121,66,65,61,136,138,125,233,3,231,93,126,78,77,246,28,
+108,62,39,47,196,198,220,57,89,120,211,11,1,156,220,251,143,185,37,2,156,220,211,229,252,66,207,74,12,30,191,164,205,33,85,64,224,241,130,179,121,181,26,29,191,38,118,245,87,182,170,113,150,173,28,223,30,144,189,206,122,76,184,81,229,209,165,96,212,100,127,47,144,47,112,194,167,139,141,236,108,28,230,133,5,81,136,88,91,89,133,92,219,132,139,204,30,139,193,216,212,226,123,62,23,6,200,213,66,76,176,252,226,163,18,116,71,252,96,194,140,90,63,51,162,51,80,148,101,249,63,188,77,246,225,174,47,220,88,50,109,31,201,45,35,173,8,66,104,239,214,27,109,122,110,38,193,220,255,105,174,23,77,230,100,89,191,121,127,189,55,238,156,213,95,211,195,99,156,194,192,7,3,50,245,183,32,35,112,139,226,131,128,216,167,200,157,134,113,197,249,162,200,16,148,195,41,119,46,252,119,223,219,70,116,113,193,227,218,171,100,253,118,81,196,108,121,187,40,34,216,185,94,20,49,108,55,234,47,238,23,171,82,100,224,50,101,34,214,93,54,237,244,34,121,244,
+140,128,131,47,250,188,116,209,140,246,188,18,27,61,122,210,168,152,127,211,240,43,62,127,223,15,219,17,251,102,38,120,21,180,120,31,10,216,233,222,50,54,86,249,102,83,236,212,102,139,196,229,42,78,11,231,182,201,66,231,221,69,20,24,182,68,120,97,123,240,26,75,188,70,140,89,123,158,124,18,111,182,207,231,231,244,88,251,156,216,74,148,152,199,175,157,67,90,80,26,194,78,63,230,198,103,114,96,160,2,167,26,254,247,62,96,207,117,236,6,129,20,222,30,3,87,118,20,124,109,145,172,2,95,254,224,134,226,128,248,134,75,112,183,244,30,226,62,243,248,95,225,26,230,131,5,249,202,210,21,155,180,33,89,126,180,187,237,47,8,4,8,51,172,213,15,186,171,24,79,193,109,240,59,200,161,125,202,145,234,101,27,34,63,150,123,120,120,221,84,181,103,244,198,243,81,183,50,158,47,237,175,135,140,112,249,49,42,78,167,122,178,229,185,238,194,193,184,15,245,116,243,47,205,54,31,157,159,157,187,110,252,26,120,168,52,211,150,221,173,208,9,190,206,173,128,
+78,111,59,238,122,189,33,200,139,230,44,74,70,93,94,231,226,229,79,85,229,115,162,152,60,188,127,67,192,221,69,105,211,24,33,115,242,57,169,250,32,139,138,98,1,90,173,158,220,35,94,31,154,94,48,131,201,50,202,152,26,150,241,243,211,169,200,107,49,4,106,102,97,221,113,43,173,150,193,4,140,108,171,5,13,136,123,55,185,206,49,208,57,90,239,69,230,119,109,161,206,212,214,39,230,66,41,194,32,98,52,45,209,29,226,37,125,119,5,222,197,63,10,11,50,107,129,165,65,114,192,204,17,13,241,126,95,18,91,252,33,237,140,228,253,196,61,96,53,3,230,202,248,196,201,29,40,215,155,240,202,63,134,235,77,120,212,97,233,122,19,158,47,65,184,222,132,247,125,254,188,221,132,151,16,143,160,245,83,111,82,248,67,61,207,101,107,110,188,8,30,189,78,80,21,29,14,135,10,46,93,77,63,29,136,199,108,94,146,82,21,50,179,96,235,168,239,224,122,51,156,40,233,84,26,134,81,54,228,187,3,184,221,26,149,80,42,65,113,90,218,93,245,250,212,137,
+211,83,199,21,82,95,89,117,77,20,129,62,163,81,93,109,221,24,246,220,131,97,87,84,75,157,100,192,215,148,185,92,141,193,163,170,162,64,190,125,205,18,240,30,17,8,38,20,24,50,8,35,220,29,73,63,83,73,49,184,61,178,118,127,107,143,12,162,174,237,145,243,196,87,77,117,164,208,218,171,75,241,19,138,19,156,23,229,115,84,209,72,153,82,234,6,136,165,191,60,112,26,159,76,160,159,19,169,147,116,71,28,47,226,248,59,69,133,191,168,156,158,48,162,228,98,199,145,154,35,177,97,169,68,62,223,109,29,113,36,165,61,216,71,250,8,132,17,55,227,88,114,159,61,144,201,210,229,41,16,49,198,103,223,166,78,106,178,168,122,112,216,97,80,8,97,194,166,115,150,76,18,5,161,207,121,119,202,94,113,242,117,130,94,247,231,113,234,53,169,158,217,157,254,253,205,77,252,219,55,99,69,63,245,8,15,247,26,85,101,115,245,159,152,137,82,164,216,10,29,143,125,10,211,195,132,239,195,59,140,98,61,102,104,198,189,103,105,13,92,142,252,48,137,114,203,
+28,97,111,251,108,62,16,125,144,135,61,207,161,109,25,79,206,73,156,148,180,207,88,229,123,137,185,35,57,219,166,245,125,61,196,182,180,99,28,160,255,68,101,139,6,97,113,135,77,35,171,223,45,12,60,161,72,72,7,242,119,235,61,89,62,203,229,207,33,69,35,31,215,143,209,251,158,242,81,166,152,119,38,203,163,46,224,209,98,22,35,194,150,19,17,36,174,249,150,158,176,14,15,194,96,49,233,170,116,125,95,237,22,195,79,241,211,135,41,58,8,15,111,128,176,173,186,1,194,116,222,239,113,13,77,214,151,106,37,100,95,144,29,170,111,251,51,126,36,135,208,235,91,194,254,185,7,61,68,187,104,5,72,203,58,79,58,242,83,76,39,21,4,125,250,226,155,152,195,201,173,214,17,14,218,46,115,106,215,93,122,162,10,137,207,83,193,154,136,68,195,23,39,184,237,136,35,66,15,109,148,201,157,90,112,115,6,11,123,212,195,36,26,226,208,66,152,68,99,155,230,101,43,69,31,232,240,118,232,189,210,85,95,252,42,70,111,243,253,68,209,175,50,150,222,79,
+171,38,98,10,137,55,199,180,223,149,87,240,149,52,138,109,144,190,180,216,142,77,23,121,235,92,156,63,232,201,225,216,30,138,58,49,24,173,153,184,98,140,173,132,25,226,85,51,227,228,72,51,45,117,203,155,128,231,215,179,181,36,189,92,172,93,249,57,203,62,191,228,120,112,243,246,203,226,217,2,55,111,19,87,86,179,220,145,159,136,236,74,175,57,89,213,208,41,22,163,236,132,125,65,164,208,79,163,130,210,230,207,17,162,47,244,136,249,60,79,138,240,52,202,193,95,209,17,38,230,36,191,230,57,185,210,54,90,188,60,31,158,166,1,73,145,231,26,32,221,85,155,187,110,91,224,228,139,190,248,56,155,225,14,51,15,220,173,113,129,56,61,214,184,163,225,248,168,9,92,242,101,209,35,51,252,61,241,126,52,25,170,182,68,234,74,254,243,69,44,4,150,40,196,195,170,242,53,213,212,191,240,119,192,83,206,154,154,147,190,30,73,80,44,125,118,15,139,221,134,166,182,229,57,226,6,151,100,210,106,246,184,167,94,232,27,249,174,205,151,234,92,237,194,160,183,
+109,34,44,163,202,246,75,19,240,74,246,215,35,31,62,111,226,0,58,239,95,188,201,191,229,113,7,108,86,169,164,4,123,230,58,152,151,5,167,23,106,169,118,164,210,153,42,137,169,119,239,35,59,36,89,117,58,188,223,246,250,211,151,248,121,152,91,53,236,246,244,60,15,242,133,27,230,106,84,13,129,252,73,217,229,54,58,215,11,241,152,43,154,186,127,15,185,175,66,36,189,237,109,253,53,127,167,55,69,155,153,37,238,184,225,254,155,28,31,9,13,50,245,14,238,162,38,13,212,151,91,1,218,92,188,21,160,247,26,132,249,222,17,55,49,202,241,246,41,250,142,254,43,36,158,85,11,29,240,22,222,71,85,181,211,72,137,57,20,4,14,203,71,215,229,72,124,243,199,172,183,88,49,12,167,2,150,215,176,225,173,90,186,227,142,45,238,195,56,146,181,86,103,158,70,14,17,88,36,68,164,227,194,30,136,248,146,199,242,123,58,189,40,152,216,118,201,175,230,32,233,178,173,139,41,228,28,179,109,156,239,86,16,36,22,8,122,190,166,101,231,94,254,44,162,164,
+94,183,91,52,255,24,161,48,245,103,252,6,163,165,119,58,234,149,71,67,48,5,84,120,32,201,248,84,233,152,33,190,190,22,111,62,136,33,153,114,129,72,61,31,193,254,250,242,208,201,231,59,187,39,148,36,4,48,33,9,207,110,115,46,33,173,155,98,119,149,108,127,56,209,135,213,180,158,140,5,162,94,43,4,57,164,246,59,58,170,122,71,23,120,68,34,253,121,51,229,54,109,41,251,234,12,238,109,160,186,240,23,82,90,78,174,124,73,4,217,14,193,208,154,251,10,22,86,182,144,251,211,87,29,198,189,97,190,249,200,107,227,11,251,59,127,255,155,90,41,43,139,99,136,220,86,103,158,174,99,56,210,44,224,92,94,218,19,191,213,77,155,214,203,182,189,251,208,91,196,191,37,197,166,130,209,83,136,138,138,3,20,4,238,178,249,179,69,190,216,69,122,227,250,80,251,52,22,172,146,110,153,123,223,9,1,146,139,237,227,120,126,243,105,95,127,185,162,99,197,28,106,9,121,117,247,240,105,251,12,130,49,39,111,188,110,111,78,209,241,250,144,66,54,230,166,
+124,240,73,18,66,92,119,171,243,187,241,53,244,201,17,118,103,104,239,93,40,50,106,70,31,196,192,102,247,165,221,60,143,159,2,237,196,251,180,53,192,211,24,104,11,207,161,238,61,122,181,207,111,181,117,161,41,224,140,79,99,38,87,17,194,27,194,246,72,128,199,141,111,43,207,96,204,14,189,232,158,114,151,216,85,248,71,249,113,49,0,235,161,55,213,9,111,216,78,227,158,175,206,180,9,67,2,217,147,122,197,89,50,44,209,63,207,97,44,112,157,201,158,143,109,135,149,21,141,243,124,104,87,244,101,34,217,104,214,113,61,218,147,190,71,171,244,59,71,238,204,200,235,110,39,243,35,24,222,91,106,21,22,133,126,146,79,72,201,242,124,124,58,30,93,70,234,82,143,157,54,167,167,168,137,26,218,211,209,0,130,142,136,165,124,22,219,169,62,207,178,2,252,249,57,82,107,223,33,27,99,251,45,15,54,214,126,224,47,63,199,97,174,163,221,88,122,45,244,225,245,2,114,84,124,129,106,149,138,231,218,221,76,223,105,29,161,66,4,100,93,191,165,236,90,75,
+78,171,145,218,140,122,149,77,239,21,7,237,45,9,154,205,178,130,129,62,87,143,47,79,140,104,195,119,187,231,171,210,55,107,159,247,99,221,101,139,214,78,222,247,68,226,137,191,224,166,182,30,78,249,15,211,166,65,81,202,92,69,79,166,217,250,129,50,227,168,139,113,211,147,100,70,239,22,154,23,230,223,180,51,255,85,223,20,64,248,48,89,182,250,188,19,147,249,156,168,93,116,78,132,161,222,181,153,51,248,135,203,120,204,95,184,131,229,173,96,93,69,159,232,209,143,11,37,153,200,37,117,73,43,131,244,204,194,37,69,184,19,80,188,115,177,179,246,56,199,100,80,155,14,134,84,194,188,63,105,45,229,202,87,233,56,141,53,249,231,115,7,215,231,16,182,176,120,16,248,171,120,220,165,248,226,204,250,57,49,221,243,254,146,243,62,190,184,177,194,222,234,103,178,28,178,172,198,133,186,226,168,191,15,120,178,63,129,56,45,200,142,206,223,80,144,249,110,133,188,211,220,36,91,153,128,177,232,249,201,216,163,168,19,151,104,172,26,151,86,235,177,82,201,227,231,
+79,27,68,172,120,52,50,109,235,221,105,83,148,245,3,97,12,149,177,166,192,47,101,127,226,137,181,238,236,97,109,190,255,251,107,176,170,23,233,153,189,144,140,140,177,229,31,185,127,248,186,68,54,158,21,19,180,18,170,82,87,112,251,62,48,3,44,60,242,143,238,118,204,47,207,236,194,245,88,17,35,248,187,119,155,49,113,63,192,39,100,179,205,212,89,113,28,60,238,182,178,77,19,49,20,152,208,224,27,131,177,16,183,197,233,121,96,168,217,102,159,234,193,112,43,249,222,254,69,37,135,86,181,250,193,193,207,173,250,140,163,251,225,49,121,218,142,179,25,232,58,178,31,158,173,105,249,221,122,32,142,202,107,206,201,11,148,46,83,220,234,159,243,144,64,231,17,155,202,15,187,146,237,46,196,210,47,228,131,40,141,206,168,77,27,195,242,123,75,31,77,56,47,71,140,106,97,184,211,0,152,100,99,203,17,57,25,223,227,187,85,233,11,216,125,245,59,127,179,152,96,188,79,40,119,205,56,129,192,240,187,252,14,74,127,250,14,156,102,130,101,111,120,90,81,40,
+249,161,111,19,122,59,225,29,97,159,237,185,152,135,76,35,0,195,101,200,52,34,239,135,2,145,8,242,82,92,185,163,231,101,150,197,110,211,199,122,97,60,170,90,171,67,105,102,27,105,173,199,106,138,126,200,241,157,37,207,188,186,235,157,11,130,75,189,155,218,5,76,5,50,205,106,119,54,65,94,154,102,10,199,138,161,157,235,83,197,156,116,121,21,214,159,163,60,52,36,121,203,186,75,224,162,235,244,134,108,162,212,194,56,31,154,48,162,231,24,83,160,38,62,225,147,166,128,91,175,91,44,18,63,52,76,173,107,203,196,26,173,193,176,209,190,132,151,31,194,230,126,195,51,210,220,37,67,228,92,39,122,92,29,42,183,226,162,219,117,21,151,145,174,21,143,215,20,104,151,140,187,235,46,167,239,104,128,231,217,11,118,147,145,180,163,128,124,27,46,126,59,190,216,67,74,97,177,29,118,9,142,135,132,73,214,42,213,164,53,239,228,33,188,203,243,159,125,107,218,209,8,14,186,242,171,133,155,211,13,215,167,83,138,166,165,92,170,159,236,61,176,43,194,188,123,
+182,191,242,156,31,19,18,84,47,130,93,22,18,207,233,120,225,98,106,157,93,12,233,131,116,71,203,97,151,170,24,81,180,90,29,55,194,146,17,81,192,243,191,76,114,191,37,155,242,40,121,231,184,2,127,120,63,152,130,231,231,2,96,157,114,244,230,198,150,207,151,31,248,254,240,1,229,247,251,60,216,79,106,73,47,220,156,9,223,40,78,14,221,46,36,71,162,110,23,146,203,94,110,23,146,227,80,183,11,201,63,171,232,235,13,231,95,170,135,235,13,231,212,215,175,235,13,231,240,122,240,13,231,215,123,203,177,100,9,242,95,11,74,34,153,235,130,40,236,109,193,212,231,109,65,50,225,182,32,234,241,182,32,233,229,182,160,28,117,91,208,251,114,93,112,46,170,118,213,196,152,31,68,220,62,239,64,175,90,202,196,127,222,199,249,191,126,95,218,11,142,17,240,127,119,57,212,238,63,239,89,15,220,182,85,125,189,109,75,37,190,109,235,245,241,182,173,123,221,109,91,175,139,219,107,254,167,156,110,175,193,238,160,215,240,1,231,142,242,126,251,255,17,74,236,182,
+53,220,124,212,161,71,249,183,252,72,255,191,242,179,11,191,167,177,184,115,211,254,101,116,99,63,202,34,230,201,240,187,255,157,46,91,160,235,97,221,203,51,48,165,181,167,52,173,184,49,115,237,209,156,92,226,45,159,85,232,84,239,117,200,214,118,19,199,95,78,180,247,197,121,188,229,127,159,90,189,176,129,36,248,155,190,187,61,43,219,73,235,49,159,66,228,254,52,23,120,184,19,34,25,104,205,170,103,149,82,218,189,217,113,40,70,195,159,149,193,157,155,151,203,7,114,106,217,243,143,161,100,255,137,87,162,73,39,206,196,126,181,105,120,22,83,228,101,36,98,149,98,241,231,250,78,208,238,100,42,188,241,175,98,222,204,23,68,5,173,96,191,59,205,183,231,77,247,55,145,200,148,136,1,100,207,98,132,229,160,127,73,96,57,135,210,197,180,210,18,170,141,8,149,147,103,132,52,250,179,250,82,181,13,167,227,148,247,21,95,38,115,248,5,17,88,208,66,43,52,23,139,253,230,205,237,17,34,113,240,229,247,43,223,100,157,120,234,158,231,237,252,121,248,16,148,
+112,145,212,247,40,48,26,41,85,13,220,150,62,249,115,56,102,16,73,129,13,78,87,56,167,147,211,237,159,60,117,56,186,12,208,159,56,204,44,111,190,35,16,210,176,220,197,20,223,242,172,237,181,3,102,255,125,161,240,81,174,0,229,115,197,233,223,155,140,127,197,71,143,129,215,55,31,231,59,215,121,14,6,36,105,83,193,163,197,185,60,129,119,13,45,81,85,225,34,201,105,31,62,97,242,43,239,197,189,1,39,216,201,120,162,233,137,56,110,142,36,223,9,62,56,14,150,166,185,190,60,28,61,179,97,154,148,167,123,172,166,136,203,147,36,90,223,107,215,235,251,95,195,153,153,126,122,58,197,245,241,161,67,204,136,154,92,31,123,185,241,195,185,106,108,39,35,173,15,116,38,123,219,89,234,49,26,29,9,202,1,126,127,115,164,219,107,250,2,244,194,14,164,13,198,181,165,185,191,11,127,183,34,187,84,161,33,33,169,233,223,81,86,52,186,157,184,207,134,74,217,178,235,202,223,240,201,139,230,252,168,222,114,220,189,3,131,239,210,141,7,127,187,113,134,18,
+231,35,27,61,173,202,181,108,210,228,36,203,46,122,55,251,131,149,63,38,157,252,154,199,95,179,16,33,100,243,163,85,249,154,215,191,99,155,2,241,74,37,115,200,184,44,147,152,43,179,121,178,232,65,192,49,66,214,158,107,233,202,199,39,174,135,91,115,46,142,203,101,42,119,75,196,252,236,90,76,214,86,54,199,143,226,68,23,152,115,26,246,60,255,80,60,67,246,196,125,253,50,251,195,238,41,43,7,209,5,193,126,30,23,254,1,28,36,86,213,136,50,254,240,193,126,104,59,28,186,14,120,173,231,127,20,119,117,77,105,92,97,248,175,236,85,167,157,76,51,153,206,244,170,211,171,38,23,157,94,246,235,162,147,153,80,161,35,51,70,24,192,73,115,167,69,81,66,16,67,20,5,20,146,200,135,38,40,26,20,228,59,66,148,40,34,141,242,101,128,93,89,190,130,192,2,46,194,2,203,110,23,105,167,211,95,208,171,51,115,206,123,158,121,222,115,206,251,188,239,185,57,231,99,205,222,178,164,30,193,39,66,97,222,144,104,225,123,126,126,67,186,242,172,221,149,
+142,81,14,201,39,62,240,157,162,77,117,4,222,46,200,212,167,225,211,151,93,167,178,210,234,230,206,230,246,42,141,117,79,121,102,148,114,163,32,173,41,189,171,225,25,47,120,158,152,121,236,208,36,99,46,164,156,94,21,235,109,248,248,218,216,152,179,166,130,181,37,43,188,237,120,195,23,132,79,165,150,231,42,35,188,85,40,227,171,130,126,60,215,177,88,254,64,172,216,244,236,175,4,100,62,103,156,72,61,41,146,85,153,207,127,120,8,171,97,79,162,104,65,182,146,222,50,126,1,23,132,210,121,210,18,73,196,15,109,109,8,108,133,87,228,199,136,137,172,59,252,175,39,130,198,154,70,26,124,21,173,57,138,110,119,112,209,0,98,112,221,145,16,236,80,81,254,68,135,152,83,205,88,36,58,159,214,102,92,31,14,212,143,18,58,209,252,138,236,34,159,205,58,82,181,84,163,104,1,35,136,42,142,153,54,9,131,85,78,30,29,105,160,112,14,67,205,10,247,121,71,152,50,75,150,108,168,51,104,76,136,187,25,29,137,109,9,34,6,20,39,9,116,213,78,13,
+120,68,215,223,74,104,164,7,111,203,83,222,66,230,229,204,99,103,99,59,92,150,29,186,160,57,17,186,29,213,38,161,131,247,72,58,106,81,196,224,211,146,37,39,12,75,23,144,211,41,190,203,115,173,96,37,27,94,66,169,253,23,83,251,255,38,41,129,95,61,39,145,103,153,144,160,110,48,6,141,71,144,194,209,41,83,53,242,108,163,76,134,98,164,104,113,148,15,78,65,86,45,188,157,84,32,232,71,161,93,146,84,97,203,187,250,240,85,120,246,73,80,81,51,248,142,58,151,45,52,94,183,123,248,125,94,129,84,26,58,124,244,84,41,217,203,102,39,30,103,10,120,129,32,144,181,184,73,42,180,7,10,205,230,254,40,161,23,226,207,231,86,34,58,217,124,36,22,178,28,183,50,173,168,218,122,73,180,253,106,133,70,5,105,141,14,210,38,250,119,29,39,183,201,41,170,240,219,207,152,204,153,108,161,128,204,227,201,40,18,4,43,162,253,86,249,173,230,133,62,27,104,40,141,106,21,117,107,72,197,133,46,126,96,145,144,22,242,243,205,201,147,107,149,125,231,
+61,163,206,100,232,221,27,196,153,236,164,145,165,179,120,203,8,22,247,29,226,217,189,70,83,73,238,212,59,33,245,52,120,209,58,125,234,14,161,126,27,10,77,235,147,127,92,199,109,144,138,219,224,210,54,146,201,44,55,101,144,27,141,182,3,81,112,169,225,171,184,148,196,113,163,116,37,209,184,170,165,162,97,45,67,94,72,219,196,18,50,31,74,244,94,226,182,255,163,55,164,207,213,178,91,42,160,210,185,247,186,146,105,180,37,94,91,85,176,108,142,170,32,185,181,116,228,91,107,186,40,249,243,217,2,254,188,186,43,214,154,130,46,99,101,26,195,5,130,147,190,12,203,193,238,89,123,172,73,180,157,90,17,223,8,46,224,250,108,214,111,129,84,231,31,44,39,202,8,161,140,166,125,235,73,185,171,1,119,68,6,232,149,223,210,181,46,101,167,55,118,170,23,114,127,88,115,182,161,122,34,64,188,106,104,157,47,15,138,122,168,8,127,182,135,106,189,66,221,91,213,102,7,66,163,77,178,110,156,84,171,29,139,152,171,44,223,193,16,23,92,47,165,210,62,34,
+158,118,227,5,47,132,57,246,11,229,117,183,233,105,46,157,215,233,38,43,142,64,237,210,63,161,217,221,196,82,78,184,251,66,13,213,213,100,37,15,117,206,3,114,119,231,8,206,121,176,182,166,39,219,215,121,172,238,1,119,26,93,121,183,187,129,213,163,146,238,177,215,10,225,56,102,246,16,203,164,168,106,84,197,226,118,211,102,215,181,240,159,60,100,214,141,199,234,231,168,95,51,217,95,128,246,217,14,122,5,122,196,100,56,107,189,58,241,236,147,109,103,224,74,27,16,255,169,203,117,58,206,86,109,180,252,49,91,68,179,40,152,110,129,30,255,26,100,245,98,68,60,223,186,154,76,228,150,122,121,167,247,207,202,107,233,255,86,191,140,29,196,251,128,124,109,31,240,114,252,224,196,97,57,112,18,233,217,66,128,172,142,217,226,137,42,136,187,236,146,154,180,35,206,142,239,98,61,163,200,184,80,25,32,113,91,206,236,78,84,55,154,235,93,68,85,92,129,54,22,245,176,206,54,183,214,213,215,22,42,138,139,82,254,45,46,83,58,90,114,7,42,92,40,8,119,
+253,206,134,9,118,232,196,78,43,92,9,225,221,35,18,211,172,172,174,202,138,107,103,117,143,62,216,46,122,218,109,227,177,88,77,214,138,211,113,28,210,191,111,137,122,204,84,83,82,33,78,118,198,70,225,229,79,238,254,194,189,245,213,215,64,191,5,126,24,100,124,123,251,14,192,29,100,141,12,209,1,58,131,199,24,224,1,180,161,33,96,152,49,192,224,114,105,156,135,0,157,201,161,58,89,28,38,131,11,208,134,233,0,151,193,27,97,3,52,54,155,195,98,115,152,52,30,3,248,117,132,73,77,190,207,224,13,178,232,220,155,192,143,247,110,220,187,1,12,208,134,41,32,46,11,24,225,50,128,1,214,125,54,115,136,193,233,35,124,127,251,59,128,59,194,102,15,49,25,116,224,1,147,55,8,252,196,228,142,208,134,128,111,174,103,126,113,235,214,151,192,167,180,225,135,0,131,206,228,49,89,195,192,189,207,129,135,172,17,138,19,101,207,99,1,116,214,131,225,33,22,173,71,133,77,227,244,24,252,204,28,166,58,185,215,200,191,177,56,192,157,223,217,28,138,254,
+63,0,159,221,252,219,221,187,127,1,227,115,231,63,
+
diff --git a/uppsrc/ide/app.tpp/macros$en-us.tpp b/uppsrc/ide/app.tpp/macros$en-us.tpp
new file mode 100644
index 000000000..3f53895ff
--- /dev/null
+++ b/uppsrc/ide/app.tpp/macros$en-us.tpp
@@ -0,0 +1,13 @@
+TITLE("TheIDE macros")
+COMPRESSED
+120,156,149,88,107,115,219,184,21,253,43,24,59,237,72,89,90,38,0,62,165,237,140,103,29,111,155,105,146,205,196,217,238,7,85,9,41,18,178,184,166,72,149,160,226,168,105,242,219,123,46,72,73,148,44,57,187,241,196,38,113,223,231,62,0,112,44,216,179,103,182,101,159,219,223,249,55,124,161,102,241,42,175,39,227,92,4,193,40,243,109,103,20,115,127,244,75,56,250,246,237,219,32,12,197,136,84,113,168,226,182,35,185,224,220,177,109,71,248,220,13,237,208,13,120,96,75,223,17,174,111,187,195,101,92,197,139,201,56,14,228,232,249,59,15,82,194,114,207,37,151,220,230,158,112,192,101,75,91,56,92,184,60,8,28,238,187,129,12,61,111,152,196,203,58,43,139,201,120,74,114,100,76,66,204,246,3,207,225,16,114,92,33,125,215,129,176,227,112,142,103,238,250,158,239,15,235,172,206,213,100,156,145,215,83,238,249,163,216,17,228,245,53,105,112,44,239,28,110,10,31,42,28,225,120,142,12,132,228,129,16,94,40,157,208,129,255,92,12,179,90,193,219,41,196,72,
+148,196,92,24,118,92,135,75,0,227,248,174,4,155,143,191,142,29,114,1,235,129,237,186,48,172,62,111,208,34,160,72,206,131,57,225,187,196,29,56,1,151,126,32,28,225,9,56,96,251,136,150,172,187,195,84,233,4,114,82,240,81,13,151,70,215,87,238,136,67,216,183,252,115,97,135,182,240,252,16,6,225,44,2,151,97,200,101,0,131,14,119,109,46,135,73,153,34,216,169,112,109,105,44,6,200,135,7,205,6,27,215,227,112,88,200,0,38,125,46,37,126,187,78,224,15,181,162,140,212,101,53,25,63,191,234,217,3,123,32,92,183,79,226,33,196,3,233,72,233,120,161,195,109,9,51,208,225,16,94,158,141,156,114,87,4,195,105,172,97,179,118,8,92,131,42,167,130,66,2,100,224,74,152,246,240,11,201,69,128,18,216,136,208,9,164,12,236,97,146,199,90,119,0,122,78,65,114,110,113,126,238,19,174,174,20,78,72,224,72,1,128,133,231,134,28,8,187,158,99,139,97,165,254,179,202,42,181,80,5,32,206,80,35,163,77,122,218,122,132,51,77,61,10,139,11,
+84,164,235,121,54,225,229,162,42,132,116,1,184,205,3,7,30,225,7,41,174,219,146,156,238,98,144,22,151,231,161,112,36,60,9,29,7,8,64,1,15,57,231,118,128,31,68,6,92,76,109,240,182,186,186,133,197,29,139,59,231,62,106,25,153,10,29,50,31,74,194,79,0,126,225,217,46,242,32,26,113,65,168,139,103,192,157,139,128,254,27,228,185,107,113,52,5,92,228,174,139,184,37,160,22,1,98,119,129,189,52,117,206,253,96,248,70,61,232,23,113,173,218,130,121,126,253,172,169,52,238,89,220,59,183,73,222,13,66,36,144,59,132,159,116,156,80,132,82,186,34,116,165,103,3,71,221,244,52,9,83,95,153,158,220,42,241,45,238,163,195,16,171,235,34,122,35,134,200,125,78,174,136,32,244,8,133,86,73,116,145,103,5,249,129,202,24,53,197,240,252,250,7,206,125,82,20,160,97,130,192,179,101,8,48,128,129,237,162,210,49,21,2,36,26,121,22,104,3,26,11,201,125,124,167,162,139,182,101,191,124,252,250,151,155,55,23,191,222,178,177,22,35,246,126,174,
+94,190,184,97,139,56,169,74,253,215,201,88,219,7,107,44,174,20,123,168,178,186,86,5,203,10,54,254,80,151,203,44,137,134,209,101,116,153,165,42,186,140,151,203,232,18,237,21,61,83,69,116,177,210,31,216,141,78,152,78,170,12,163,165,184,99,121,92,220,173,224,194,132,197,69,202,150,121,156,168,148,52,13,86,96,155,101,185,210,131,206,51,75,226,130,77,21,83,89,61,87,21,67,9,213,172,156,177,74,221,173,242,152,222,77,56,154,149,149,241,108,167,238,186,92,44,202,130,214,95,149,73,156,179,20,165,156,160,253,214,131,54,172,246,207,107,10,139,165,106,150,21,25,141,190,61,87,152,174,97,80,179,7,88,103,115,21,167,112,1,244,89,89,45,58,90,144,132,203,43,135,141,47,175,220,6,37,20,27,61,179,137,81,30,125,68,11,173,12,117,184,89,161,154,220,48,253,83,173,247,93,122,64,164,138,141,141,210,142,134,6,176,189,101,51,53,77,224,52,8,89,142,247,42,206,53,235,25,135,175,153,94,23,117,252,185,223,17,132,177,9,203,52,187,87,107,
+70,67,208,100,5,81,235,108,145,17,160,117,201,234,121,169,17,249,188,124,48,96,144,105,164,228,136,59,198,200,120,55,204,16,222,161,165,54,123,229,130,10,38,29,180,104,111,144,212,64,50,207,203,7,100,108,186,222,47,37,212,76,116,169,171,36,45,147,230,165,91,77,19,54,45,211,195,68,222,124,142,23,75,84,204,112,47,51,77,66,88,116,246,38,254,148,221,197,20,107,116,54,140,206,126,206,224,104,65,160,69,255,142,206,222,151,203,223,176,80,62,208,75,116,198,174,235,42,143,126,120,207,162,47,173,150,139,255,13,72,162,215,101,61,235,143,90,106,244,181,125,56,176,249,178,208,10,245,154,172,170,10,67,148,165,152,33,80,222,81,170,89,244,55,22,141,163,201,104,187,84,47,104,237,239,170,190,93,235,247,217,66,245,250,163,14,251,143,63,34,67,209,71,93,87,104,165,94,189,24,172,85,92,245,105,25,126,95,64,249,35,6,52,65,61,127,146,35,141,215,29,27,131,198,233,158,62,136,110,7,244,207,168,254,56,207,215,22,155,85,229,194,116,247,82,85,
+122,137,246,202,62,41,171,141,30,201,141,97,114,161,80,78,41,204,162,105,85,154,161,1,89,116,193,32,190,121,75,208,167,40,154,71,131,165,35,90,148,181,73,28,235,153,118,164,33,98,74,47,45,235,254,97,55,151,186,238,152,106,84,52,186,151,85,249,9,3,202,12,135,250,161,100,200,101,249,73,85,121,137,90,132,149,190,233,106,77,222,101,168,163,44,201,106,116,66,92,179,135,178,186,111,39,0,18,169,105,208,160,116,180,202,41,222,102,194,168,207,173,128,225,186,3,10,5,91,150,218,204,19,125,224,225,173,58,226,96,167,102,217,151,47,210,243,252,161,39,165,156,243,209,85,15,103,173,62,107,130,51,204,147,225,176,121,125,177,107,95,172,125,184,18,102,25,251,129,239,82,253,188,82,197,93,61,239,245,183,252,205,2,25,167,97,49,216,172,239,4,176,181,92,151,171,162,238,200,188,89,45,166,232,84,200,208,198,163,13,118,39,133,223,150,186,135,222,55,172,147,157,142,183,45,18,172,87,206,102,26,225,155,178,193,56,199,100,184,203,138,130,242,73,78,97,
+129,102,110,127,247,82,33,153,201,28,167,134,164,110,156,24,183,202,31,219,191,54,169,233,120,222,44,176,198,228,113,127,141,179,155,60,117,28,38,26,85,67,155,201,113,135,233,136,225,50,95,45,138,83,170,182,177,3,184,252,207,168,189,85,249,79,132,78,39,162,219,186,221,252,182,181,119,84,236,116,10,183,80,154,60,238,180,176,151,51,246,95,85,149,214,190,97,106,97,28,1,177,119,98,83,232,64,124,96,245,118,75,57,129,1,24,244,166,117,160,233,187,209,223,26,39,26,223,246,117,90,180,181,96,98,32,192,67,253,187,126,220,159,17,93,59,219,149,70,67,7,143,3,15,174,115,76,213,157,15,157,162,138,139,68,229,250,169,12,252,1,143,47,201,135,119,170,94,85,5,141,166,42,94,83,118,38,134,11,148,142,95,214,46,26,76,162,201,70,237,247,172,118,176,137,23,138,197,218,176,108,200,22,227,135,57,124,167,22,152,133,127,220,117,226,214,71,61,126,202,207,142,149,71,57,108,253,108,89,58,213,102,237,18,214,167,225,92,181,198,143,165,145,140,183,133,
+246,180,11,79,25,222,53,128,181,223,81,123,230,79,85,64,187,123,30,65,210,92,85,247,129,108,152,59,53,208,9,101,66,252,132,109,92,155,105,120,10,212,142,193,125,11,219,208,90,142,67,76,27,110,179,223,181,110,108,22,191,15,163,57,11,109,77,54,241,225,72,180,9,245,97,94,230,42,250,136,157,51,109,87,178,187,162,172,176,148,208,53,182,101,202,242,52,137,171,84,119,92,38,189,59,63,44,182,210,84,250,52,49,88,185,108,118,83,246,75,243,112,112,180,108,226,104,118,108,50,66,74,140,71,52,197,18,240,99,235,175,192,86,87,43,101,54,112,92,168,204,48,109,245,178,25,206,205,202,140,66,115,148,54,103,211,85,145,226,144,179,42,154,193,82,181,29,203,45,86,210,101,228,33,131,25,251,81,129,153,43,200,33,56,85,179,12,76,48,130,254,28,74,143,64,250,41,47,147,251,141,198,46,70,197,49,144,158,194,8,81,172,205,217,168,3,80,139,195,102,60,21,219,221,163,57,48,234,141,225,244,32,240,215,104,139,87,106,86,247,6,131,65,191,57,206,
+236,8,239,178,187,249,113,202,111,136,254,164,24,17,79,139,254,186,60,186,252,2,89,63,74,248,71,137,211,244,49,194,13,138,249,216,250,91,220,44,79,24,33,210,73,67,239,145,247,102,132,156,162,158,178,104,144,160,180,99,188,76,78,160,120,146,188,133,242,73,142,239,40,65,188,39,105,38,224,147,84,3,239,73,234,77,59,48,142,18,91,160,159,164,63,109,124,7,249,147,44,228,5,136,187,94,122,109,134,121,59,236,208,27,77,27,53,223,10,204,209,232,95,113,149,197,69,189,61,58,144,106,220,112,238,187,91,0,235,229,217,189,162,107,123,129,78,194,93,79,47,203,34,165,174,164,189,130,190,159,129,70,95,19,150,32,153,110,189,157,103,179,154,238,224,56,100,205,182,106,49,115,248,163,233,190,92,53,217,202,227,41,120,44,54,160,186,217,205,120,186,171,40,120,14,54,184,29,231,229,221,128,189,109,110,58,154,134,63,238,86,235,150,108,230,218,44,83,121,106,40,89,183,185,205,167,57,101,54,30,186,200,101,179,117,243,169,102,74,167,29,58,179,98,84,104,
+213,74,155,41,185,194,158,129,253,170,44,53,12,53,231,34,107,59,34,63,149,89,218,157,146,155,117,10,222,124,85,161,81,66,161,215,230,83,7,92,249,125,69,227,24,7,100,186,24,53,118,154,111,58,237,206,184,153,62,228,203,98,149,215,25,133,189,227,61,60,193,221,124,86,201,170,110,207,26,139,244,224,70,210,82,245,134,100,49,250,238,189,50,78,209,94,91,174,106,3,88,105,222,104,56,98,82,31,88,120,21,99,95,152,159,48,208,16,97,128,228,227,37,221,14,227,35,219,168,57,103,94,55,234,187,167,76,90,238,58,178,245,224,235,215,201,255,1,59,119,129,148,
+
diff --git a/uppsrc/ide/ide.cpp b/uppsrc/ide/ide.cpp
new file mode 100644
index 000000000..993558baf
--- /dev/null
+++ b/uppsrc/ide/ide.cpp
@@ -0,0 +1,861 @@
+#include "ide.h"
+
+void Ide::MakeTitle()
+{
+	String title;
+	if(!main.IsEmpty())
+		title << main;
+	if(mainconfigname == mainconfigparam)
+		title << " - " << mainconfigname;
+	else
+	if(!mainconfigname.IsEmpty()) {
+		title << " - " << mainconfigname;
+		title << " ( " << mainconfigparam << " )";
+	}
+	title << " - TheIDE";
+	if(designer) {
+		title << " - [" << designer->GetFileName();
+		int cs = designer->GetCharset();
+		if(cs >= 0)
+			title << " " << CharsetName(cs);
+		title << "]";
+	}
+	else
+	if(!editfile.IsEmpty()) {
+		title << " - [" << editfile;
+		title << " " << CharsetName(editor.GetCharset());
+		if(editor.IsReadOnly())
+			title << " (Read Only)";
+		if(editor.IsDirty())
+			title << " *";
+		title << "]";
+	}
+	if(!IsNull(editfile))
+		for(int i = 0; i < 10; i++)
+			if(NormalizePath(editfile) == NormalizePath(bookmark[i].file))
+				title << Format(" <%d>", i);
+	title << " { " << GetVarsName() << " }";
+	Title(title.ToWString());
+}
+
+void Ide::MakeIcon() {
+#ifdef PLATFORM_WIN32
+	String mp = main;
+	Image li = IdeImg::PackageLarge();
+	if(!IsNull(mp))
+	{
+		Size isz = li.GetSize();
+		ImageDraw idraw(isz);
+		Draw& mdraw = idraw.Alpha();
+		idraw.DrawImage(0, 0, li);
+		mdraw.DrawImage(0, 0, li, White);
+		Font font = StdFont(9);
+		Size sz = GetTextSize(mp, font);
+		sz.cx = min(sz.cx + 4, isz.cx);
+		sz.cy += 2;
+		int x = (isz.cx - sz.cx) / 2;
+		int y = isz.cy - sz.cy;
+		idraw.DrawRect(x, y, sz.cx, sz.cy, White);
+		mdraw.DrawRect(x, y, sz.cx, sz.cy, White);
+		idraw.DrawText(x + 2, y + 1, mp, font, Black);
+		DrawFrame(idraw, x, y, sz.cx, sz.cy, LtBlue);
+		li = idraw;
+	}
+	LargeIcon(li);
+#endif
+}
+
+bool Ide::CanToggleReadOnly()
+{
+	FindFile ff(editfile);
+	if(ff && ff.IsReadOnly()) return false;
+	return NormalizePath(SourcePath(GetActivePackage(), GetActiveFileName())) ==
+		   NormalizePath(editfile);
+}
+
+void Ide::ToggleReadOnly()
+{
+	if(CanToggleReadOnly() && IsActiveFile()) {
+		editor.SetEditable(editor.IsReadOnly());
+		ActiveFile().readonly = editor.IsReadOnly();
+		SavePackage();
+		MakeTitle();
+		SetBar();
+	}
+}
+
+void Ide::AdjustMainConfig()
+{
+	const Workspace& wspc = IdeWorkspace();
+	if(!wspc.GetCount())
+		return;
+	const Array<Package::Config>& f = wspc.GetPackage(0).config;
+	for(int i = 0; i < f.GetCount(); i++)
+		if(f[i].param == mainconfigparam)
+			return;
+	if(f.GetCount()) {
+		mainconfigparam = f[0].param;
+		mainconfigname = f[0].name;
+		SetMainConfigList();
+	}
+}
+
+String Ide::GetFirstFile()
+{
+	const Workspace& wspc = IdeWorkspace();
+	for(int i = 0; i < wspc.GetCount(); i++) {
+		const Package& p = wspc.GetPackage(i);
+		for(int j = 0; j < p.GetCount(); j++)
+			if(!p[j].separator)
+				return SourcePath(wspc[i], p[j]);
+	}
+	return Null;
+}
+
+void Ide::SetMain(const String& package)
+{
+	FlushFile();
+	SaveWorkspace();
+	transferfilecache.Clear();
+	main = package;
+	mainconfigname.Clear();
+	mainconfigparam.Clear();
+	ScanWorkspace();
+	SyncWorkspace();
+	LoadFromFile(THISBACK(SerializeWorkspace), WorkspaceFile());
+	editorsplit.Zoom(0);
+	UpdateFormat();
+	String e = editfile;
+	editfile.Clear();
+	MakeTitle();
+	MakeIcon();
+	SyncMainConfigList();
+	AdjustMainConfig();
+	SyncBuildMode();
+	SetHdependDirs();
+	SetBar();
+	HideBottom();
+	if(IsNull(e))
+		e = GetFirstFile();
+	SyncRefs();
+	EditFile(e);
+}
+
+void Ide::Exit()
+{
+	if(debugger)
+		debugger->Stop();
+	SaveFile();
+	SaveWorkspace();
+	FlushFile();
+	console.Kill();
+	Break(IDOK);
+}
+
+bool Ide::OpenMainPackage()
+{
+	String tt = "Select main package";
+//	tt << " (IDE " << IDE_VER_MAJOR << "." << IDE_VER_MINOR << ".r" << IDE_VER_BUILD
+//	<< ", " << ::AsString(IDE_VER_DATE) << ")";
+#ifdef bmYEAR
+	tt << " (TheIDE " << IDE_VERSION
+	   << Format(" %d-%02d-%02d %d:%02d)", bmYEAR , bmMONTH, bmDAY, bmHOUR, bmMINUTE);
+#else
+	tt << " (TheIDE " << IDE_VERSION << ')';
+#endif
+	String p = SelectPackage(tt, main, true, true);
+	if(p.IsEmpty()) return false;
+	main.Clear();
+	if(!IsOpen())
+		Open();
+	SetMain(p);
+	if(editor.auto_assist)
+		StartBrowserBase();
+	return true;
+}
+
+void Ide::NewMainPackage()
+{
+	SaveBrowserBase();
+	OpenMainPackage();
+}
+
+void Ide::PackageCursor()
+{
+	WorkspaceWork::PackageCursor();
+	String p = GetActivePackage();
+	if(p.IsEmpty()) return;
+	String ef = ToLower(NormalizePath(editfile));
+	for(int i = 0; i < filelist.GetCount(); i++)
+		if(ToLower(NormalizePath(SourcePath(p, filelist[i]))) == ef) {
+			filelist.SetCursor(i);
+			break;
+		}
+	SetBar();
+}
+
+void Ide::EditWorkspace()
+{
+	EditPackages(main, GetActivePackage(), pocfg);
+	ScanWorkspace();
+	SyncWorkspace();
+}
+
+String Ide::WorkspaceFile()
+{
+	String nm;
+	for(const char *s = main; *s; s++)
+		nm.Cat(*s == '\\' || *s == '/' ? '$' : *s);
+	String cfg = ConfigFile("cfg");
+	RealizeDirectory(cfg);
+	return AppendFileName(cfg, ForceExt(nm + '@' + GetVarsName(), ".cfg"));
+}
+
+void Ide::SaveWorkspace()
+{
+	if(console.console) return;
+	if(main.IsEmpty()) return;
+	StoreToFile(THISBACK(SerializeWorkspace), WorkspaceFile());
+}
+
+void Ide::SyncMainConfigList()
+{
+	mainconfiglist.Clear();
+	const Workspace& wspc = IdeWorkspace();
+	if(wspc.GetCount() <= 0) return;
+	const Array<Package::Config>& f = wspc.GetPackage(0).config;
+	for(int i = 0; i < f.GetCount(); i++)
+		mainconfiglist.Add(f[i].param, Nvl(f[i].name, f[i].param));
+	SetMainConfigList();
+}
+
+void Ide::SetMainConfigList()
+{
+	mainconfiglist <<= mainconfigparam;
+	mainconfigname = mainconfiglist.GetValue();
+	mainconfiglist.Tip("Main configuration: " + mainconfigparam);
+}
+
+void Ide::OnMainConfigList()
+{
+	mainconfigparam = ~mainconfiglist;
+	SetMainConfigList();
+	MakeTitle();
+}
+
+void Ide::UscFile(const String& file)
+{
+	try {
+		ParseUscFile(file);
+	}
+	catch(CParser::Error& e) {
+		ShowConsole();
+		console << e << "\n";
+	}
+}
+
+void Ide::UscProcessDir(const String& dir)
+{
+	for(FindFile ff(AppendFileName(dir, "*.usc")); ff; ff.Next())
+		UscFile(AppendFileName(dir, ff.GetName()));
+}
+
+void Ide::SyncUsc()
+{
+	CleanUsc();
+	::Workspace wspc;
+	wspc.Scan(main);
+	int i;
+	for(i = 0; i < wspc.GetCount(); i++) {
+		const Package& p = wspc.GetPackage(i);
+		for(int j = 0; j < p.file.GetCount(); j++) {
+			String file = SourcePath(wspc[i], p.file[j]);
+			if(ToLower(GetFileExt(file)) == ".usc")
+				UscFile(file);
+		}
+	}
+	UscProcessDir(GetCommonDir());
+	UscProcessDir(GetLocalDir());
+	UscProcessDir(GetFileFolder(ConfigFile("x")));
+}
+
+void Ide::SyncWorkspace()
+{
+	SyncUsc();
+	SyncBrowserBase();
+}
+
+bool IsTextFile(const String& file) {
+	byte buffer[16384];
+	FileIn fi(file);
+	if(!fi.IsOpen())
+		return false;
+	int count = fi.Get(buffer, sizeof(buffer) - 1);
+	buffer[count] = 0;
+	const byte *end = buffer + count;
+	const byte *q = buffer;
+	const byte *x = q;
+	while(q < end) {
+		if(*q < 32) {
+			int c = *q;
+			if(c == '\n') {
+				if(q - x > 2000) return false;
+				x = q;
+			}
+			else
+			if(c != '\r' && c != '\t' && c != '\v' && c != '\f' && c != 0x1a)
+				return false;
+		}
+		q++;
+	}
+	return true;
+}
+
+bool Ide::FindLineError(int l, Host& host) {
+	String file;
+	int lineno;
+	int error;
+	if (FindLineError(console.GetUtf8Line(l), host, file, lineno, error)) {
+		file = NormalizePath(file);
+		editastext.FindAdd(file);
+		EditFile(file);
+		editor.SetCursor(editor.GetPos(editor.GetLineNo(lineno - 1)));
+		editor.CenterCursor();
+		editor.SetFocus();
+		Sync();
+		console.SetSelection(console.GetPos(l), console.GetPos(l + 1));
+		ShowConsole();
+		return true;
+	}
+	return false;
+}
+
+bool Ide::FindLineError(String ln, Host& host, String& file, int& lineno, int& error) {
+	Vector<String> wspc_paths;
+	VectorMap<String, String> bm = GetMethodVars(method);
+	bool is_java = (bm.Get("BUILDER", Null) == "JDK");
+	const char *s = ln;
+	error = ln.Find("error", 0) > 0 ? 1 : (ln.Find("warning", 0) > 0 ? 2 : 3);
+	while(*s == ' ' || *s == '\t')
+		s++;
+	for(; *s; s++) {
+		if(*s != '\"' && (byte)*s >= 32 && *s != '(' && (file.GetLength() < 3 || *s != ':'))
+			file.Cat(*s);
+		else {
+			if(*s == '\"') {
+				file = Null;
+				s++;
+				while(*s && *s != '\"')
+					file.Cat(*s++);
+				if(*s)
+					s++;
+			}
+			int e = file.GetLength();
+			while(e > 0 && file[e - 1] == ' ')
+				e--;
+			file.Trim(e);
+			file = TrimLeft(file);
+			String upp = GetUppDir();
+			file = host.GetLocalPath(file);
+		#ifdef PLATFORM_WIN32
+			if(file[0] == '\\' || file[0] == '/')
+				file = String(upp[0], 1) + ':' + file;
+		#endif
+			if(!IsFullPath(file) && *file != '\\' && *file != '/') {
+				if(wspc_paths.IsEmpty()) {
+					::Workspace  wspc;
+					wspc.Scan(main);
+					for(int i = 0; i < wspc.GetCount(); i++)
+						wspc_paths.Add(GetFileDirectory(PackagePath(wspc[i])));
+				}
+				for(int i = 0; i < wspc_paths.GetCount(); i++) {
+					String path = AppendFileName(wspc_paths[i], file);
+					FindFile ff;
+					if(ff.Search(path) && ff.IsFile()) {
+						file = path;
+						break;
+					}
+				}
+			}
+			file = FollowCygwinSymlink(file);
+			if(IsFullPath(file) && FileExists(file) && IsTextFile(file)) {
+				while(*s && !IsDigit(*s))
+					s++;
+				lineno = 0;
+				if(IsDigit(*s))
+					lineno = stou(s);
+				Vector<String> conf = SplitFlags(mainconfigparam, true);
+				String uppout = GetVar("OUTPUT");
+				int upplen = uppout.GetLength();
+				if(is_java && file.GetLength() > upplen
+				&& !MemICmp(file, uppout, upplen) && file[upplen] == DIR_SEP) { // check for preprocessed file
+					FileIn fi(file);
+					if(fi.IsOpen())
+					{
+						String fake_file = file;
+						int fake_line = 1;
+						int file_line = 1;
+						while(!fi.IsEof())
+						{
+							String line = fi.GetLine();
+							const char *p = line;
+							if(p[0] == '/' && p[1] == '/' && p[2] == '#')
+							{
+								p += 3;
+								if(p[0] == 'l' && p[1] == 'i' && p[2] == 'n' && p[3] == 'e')
+									p += 4;
+								while(*p == ' ' || *p == '\t')
+									p++;
+								if(IsDigit(*p))
+								{
+									fake_line = stou(p, &p);
+									while(*p == ' ' || *p == '\t')
+										p++;
+									if(*p == '\"')
+										p++;
+									fake_file.Clear();
+									while(*p && *p != '\"')
+										if(*p == '/')
+										{
+											fake_file.Cat('/');
+											if(p[1] == '/')
+												p++;
+											p++;
+										}
+										else
+											fake_file.Cat(*p++);
+								}
+								file_line++;
+								continue;
+							}
+							if(lineno <= file_line) {
+								file = fake_file;
+								lineno = fake_line;
+								break;
+							}
+							file_line++;
+							fake_line++;
+						}
+					}
+				}
+				if(lineno > 0)
+					return true;
+			}
+			file.Clear();
+		}
+	}
+	return false;
+}
+
+void Ide::FindError() {
+	int l = console.GetLine(console.GetCursor());
+	One<Host> host = CreateHost(false);
+	FindLineError(l, *host);
+}
+
+void Ide::FindNextError() {
+	int ln = console.GetLine(console.GetCursor());
+	int l = ln;
+	One<Host> host = CreateHost(false);
+	for(l = ln; l < console.GetLineCount(); l++)
+		if(FindLineError(l, *host)) return;
+	for(l = 0; l < ln; l++)
+		if(FindLineError(l, *host)) return;
+}
+
+void Ide::FindPrevError() {
+	int ln = console.GetLine(console.GetCursor());
+	int l = ln;
+	One<Host> host = CreateHost(false);
+	for(l = ln - 2; l >= 0; l--)
+		if(FindLineError(l, *host)) return;
+	for(l = console.GetLineCount() - 1; l > ln; l--)
+		if(FindLineError(l, *host)) return;
+}
+
+void Ide::ClearErrorEditor()
+{
+	if(!mark_lines)
+		return;
+
+	for(int i = 0; i < filedata.GetCount(); i++) {
+		ClearErrorEditor(filedata.GetKey(i));
+	}
+}
+
+void Ide::ClearErrorEditor(String file)
+{
+	if(!mark_lines)
+		return;
+	if(file == editfile)
+		editor.ClearErrors();
+	else {
+		FileData& fd = Filedata(file);
+		ClearErrors(fd.lineinfo);
+	}
+}
+
+void Ide::SetErrorEditor()
+{
+	if(!mark_lines)
+		return;
+
+	bool refresh = false;
+	String file;
+	int lineno;
+	int error;
+	One<Host> host = CreateHost(false);
+	String    hfile;
+	EditorBar hbar;
+	for(int i = 0; i < console.GetLineCount(); i++) {
+		if(FindLineError(console.GetUtf8Line(i), *host, file, lineno, error)) {
+			if(editfile == file) {
+				editor.SetError(lineno - 1, error);
+				refresh = true;
+			}
+			else {
+				if(hfile != file) {
+					if(hfile.GetCount())
+						Filedata(hfile).lineinfo = hbar.GetLineInfo();
+					hbar.SetLineInfo(Filedata(file).lineinfo, -1);
+					hfile = file;
+				}
+				hbar.SetError(lineno - 1, error);
+			}
+		}
+	}
+	if(hfile.GetCount())
+		Filedata(hfile).lineinfo = hbar.GetLineInfo();
+	if(refresh)
+		editor.RefreshFrame();
+}
+
+void Ide::Renumber() {
+	for(int i = 0; i < filedata.GetCount(); i++)
+		::Renumber(filedata[i].lineinfo);
+	editor.Renumber();
+}
+
+void Ide::CycleFiles()
+{
+	if(++tabi >= tablru.GetCount())
+		tabi = 0;
+	if(tabi < tablru.GetCount()) {
+		blocktabs = true;
+		EditFile(tablru[tabi]);
+	}
+}
+
+bool Ide::Key(dword key, int count) {
+	dword *k = IdeKeys::AK_DELLINE().key;
+	if(key == k[0] || key == k[1]) {
+		editor.DeleteLine();
+		return true;
+	}
+	k = IdeKeys::AK_CUTLINE().key;
+	if(key == k[0] || key == k[1]) {
+		editor.CutLine();
+		return true;
+	}
+	switch(key) {
+	case K_SHIFT_CTRL_UP:
+	case K_SHIFT_CTRL_DOWN:
+	case K_ALT_DELETE:
+		return filelist.Key(key, count);
+	case K_ALT_UP:
+		return filelist.Key(K_UP, 0);
+	case K_ALT_DOWN:
+		return filelist.Key(K_DOWN, 0);
+	case K_ALT_PAGEUP:
+		return package.Key(K_UP, 0);
+	case K_ALT_PAGEDOWN:
+		return package.Key(K_DOWN, 0);
+	case K_CTRL|K_ALT_LEFT:
+		TabsLR(-1);
+		return true;
+	case K_CTRL|K_ALT_RIGHT:
+		TabsLR(1);
+		return true;
+	case K_SHIFT|K_CTRL_O:
+		AddFile(WorkspaceWork::ANY_FILE);
+		return true;
+	case K_CTRL_KEY|K_KEYUP:
+		if(tabi) {
+			tabi = 0;
+			AddLru();
+		}
+		return true;
+	case K_CTRL_TAB:
+		CycleFiles();
+		return true;
+	case K_ALT_RIGHT:
+	default:
+		if(key >= K_SHIFT_CTRL_0 && key <= K_SHIFT_CTRL_9) {
+			Bookmark& b = bookmark[key - K_SHIFT_CTRL_0];
+			b.file = editfile;
+			b.pos = editor.GetEditPos();
+			MakeTitle();
+			return true;
+		}
+		if(key >= K_CTRL_0 && key <= K_CTRL_9) {
+			GotoBookmark(bookmark[key - K_CTRL_0]);
+			return true;
+		}
+	}
+	return TopWindow::Key(key, count);
+}
+
+void Ide::GotoBookmark(const Bookmark& b)
+{
+	if(b.file.IsEmpty()) return;
+	EditFile(b.file);
+	if(bookmark_pos)
+		editor.SetEditPos(b.pos);
+}
+
+bool Ide::IsHistDiff(int i)
+{
+	Bookmark& b = history[i];
+	return b.file != editfile || abs(editor.GetCursor() - b.pos.cursor) > 200;
+}
+
+void Ide::AddHistory()
+{
+	if(history.GetCount() && histi - 1 >= 0 && histi <= history.GetCount()) {
+		if(IsHistDiff(histi - 1))
+			++histi;
+	}
+	else
+		histi = 1;
+	history.SetCount(histi);
+	Bookmark& b = history.Top();
+	b.file = editfile;
+	b.pos = editor.GetEditPos();
+}
+
+void Ide::HistoryBk()
+{
+	while(histi > 0 && --histi < history.GetCount())
+		if(IsHistDiff(histi)) {
+			GotoBookmark(history[histi]);
+			break;
+		}
+}
+
+void Ide::HistoryFw()
+{
+	if(histi < history.GetCount() - 1 && ++histi >= 0)
+		GotoBookmark(history[histi]);
+}
+
+void Ide::BookKey(int key) {
+	Key(key, 1);
+}
+
+void Ide::Display() {
+	Point p = editor.GetColumnLine(editor.GetCursor());
+	display.SetLabel(Format("Ln %d, Col %d", p.y + 1, p.x + 1));
+}
+
+void Ide::ExportProject() {
+	FlushFile();
+	FileSel fsel;
+	if(!fsel.ExecuteSelectDir("Export folder"))
+		return;
+	String outpath = ~fsel;
+	::Workspace wspc;
+	wspc.Scan(main);
+	console.Clear();
+	int p;
+	int total = wspc.GetCount();
+	for(p = 0; p < wspc.GetCount(); p++)
+		total += wspc.GetPackage(p).file.GetCount();
+	Progress progress("Exporting file %d", total);
+	for(p = 0; p < wspc.GetCount(); p++)
+	{
+		if(progress.StepCanceled())
+		{
+			console << "(canceled)\n";
+			break;
+		}
+		String packname = NativePath(wspc[p]);
+		String packupp = AppendFileName(packname, AppendExt(GetFileNamePos(packname), ".upp"));
+		const Package& pkg = wspc.GetPackage(p);
+		String packout = AppendFileName(outpath, packupp);
+		console << NFormat("%s, %d file(s)\n", packname, pkg.file.GetCount());
+		RealizePath(packout);
+		if(!pkg.Save(packout))
+		{
+			console << NFormat("Error saving UPP file '%s' into '%s'\n", packname, packout);
+			return;
+		}
+		for(int f = 0; f < pkg.file.GetCount(); f++)
+		{
+			if(progress.StepCanceled())
+			{
+				console << "(canceled)\n";
+				return;
+			}
+			if(!pkg.file[f].separator)
+			{
+				String pkgfile = AppendFileName(packname, pkg.file[f]);
+				String srcfile = SourcePath(packname, pkg.file[f]);
+				String dstfile = AppendFileName(outpath, pkgfile);
+				RealizePath(dstfile);
+				if(!FileExists(srcfile))
+					console << NFormat("%s: file not found\n", srcfile);
+				else if(!FileCopy(srcfile, dstfile))
+				{
+					console << NFormat("%s: error saving '%s'\n", srcfile, dstfile);
+					return;
+				}
+			}
+		}
+	}
+	console << "Done\n";
+}
+
+void Ide::SerializeWorkspace(Stream& s) {
+	int i;
+	int version = 7;
+	s / version;
+	s.Magic(0x12345);
+	if(s.IsStoring()) {
+		for(i = 0; i < filedata.GetCount(); i++) {
+			String fn = filedata.GetKey(i);
+			if(!fn.IsEmpty() && FileExists(fn)) {
+				s % fn;
+				s % filedata[i].editpos;
+				if(version >= 1)
+					s % filedata[i].columnline;
+			}
+		}
+		String h;
+		s % h;
+	}
+	else {
+		String fn;
+		filedata.Clear();
+		for(;;) {
+			s % fn;
+			if(fn.IsEmpty()) break;
+			FileData& fd = filedata.GetAdd(fn);
+			fd.Clear();
+			s % fd.editpos;
+			if(version >= 1)
+				s % fd.columnline;
+		}
+	}
+	String pk = GetActivePackage();
+	s % pk;
+	package.FindSetCursor(pk);
+	s % tablru;
+	s % mainconfigname;
+	s % mainconfigparam;
+	s % console.verbosebuild;
+	s % stoponerrors;
+	byte dummy;
+	s % dummy;
+	s % runarg;
+	s % recent_runarg;
+	s % rundir;
+	s % stdout_file % recent_stdout_file / runmode;
+	if(version >= 1)
+		s % runexternal;
+	s % editfile;
+	for(i = 0; i < 10; i++)
+		s % bookmark[i];
+	editor.Serialize(s);
+	if(version >= 5)
+		s % editorsplit;
+	if(version == 6) {
+		String n;
+		int v;
+		s / v;
+		for(int i = 0; i < 10; i++) {
+			s % n;
+			s / v;
+		}
+	}
+	SerializeFindInFiles(s);
+	String om;
+	s % om;
+	s % recentoutput;
+	s % recentflags;
+	s / editortabsize / indent_amount % indent_spaces;
+	for(int j = 0; j < GetIdeModuleCount(); j++)
+		GetIdeModule(j).Serialize(s); // -> Workspace
+	SerializeWorkspaceConfigs(s);
+	SerializeOutputMode(s);
+	SerializeClosed(s);
+	browser.SerializeWspc(s);
+}
+
+void Ide::SetIdeState(int newstate) {
+	if(newstate != idestate)
+	{
+		if(newstate == BUILDING)
+			build_start_time = GetSysTime();
+		else
+		{
+			if(idestate == BUILDING && !IsNull(build_start_time))
+				stat_build_time += int(GetSysTime() - build_start_time);
+			build_start_time = Null;
+		}
+	}
+	idestate = newstate;
+	MakeTitle();
+	SetBar();
+}
+
+void Ide::SetIcon()
+{
+	int new_state_icon = 0;
+	if((bool)debugger && !IdeIsDebugLock()) {
+		new_state_icon = 1;
+
+		return;
+	}
+	else
+	if((GetTimeClick() / 800) & 1)
+		if(debugger)
+			new_state_icon = 2;
+		else
+		if(idestate == BUILDING)
+			new_state_icon = 3;
+	if(state_icon == new_state_icon)
+		return;
+	state_icon = new_state_icon;
+	switch(state_icon) {
+	case 1:  Icon(IdeImg::IconDebugging()); break;
+	case 2:  Icon(IdeImg::IconRunning()); break;
+	case 3:  Icon(IdeImg::IconBuilding()); break;
+	default: Icon(IdeImg::Package());
+	}
+}
+
+void Ide::Periodic()
+{
+	CheckFileUpdate();
+	SetIcon();
+	if(debugger && debugger->IsFinished() && !IdeIsDebugLock())
+		IdeEndDebug();
+}
+
+const Workspace& Ide::IdeWorkspace() const
+{
+	static Workspace wspc;
+	static String _main;
+	if(main != _main || wspc.GetCount() == 0) {
+		wspc.Scan(main);
+		_main = main;
+	}
+	else {
+		for(int i = 0; i < wspc.GetCount(); i++)
+			if(wspc.GetPackage(i).time != FileGetTime(PackagePath(wspc[i]))) {
+				wspc.Scan(main);
+				break;
+			}
+	}
+	return wspc;
+}
diff --git a/uppsrc/ide/ide.h b/uppsrc/ide/ide.h
new file mode 100644
index 000000000..0a5815f32
--- /dev/null
+++ b/uppsrc/ide/ide.h
@@ -0,0 +1,1047 @@
+#ifndef IDE_H
+#define IDE_H
+
+#include <ide/Common/Common.h>
+
+#include <RichEdit/RichEdit.h>
+
+#define LAYOUTFILE <ide/ide.lay>
+#include <CtrlCore/lay.h>
+
+#define IMAGECLASS IdeImg
+#define IMAGEFILE  <ide/ide.iml>
+#include <Draw/iml_header.h>
+
+#define KEYGROUPNAME "Ide"
+#define KEYNAMESPACE IdeKeys
+#define KEYFILE      <ide/ide.key>
+#include             <CtrlLib/key_header.h>
+
+#include <Web/Web.h>
+
+#include <ide/Browser/Browser.h>
+#include <ide/QuickTabs/QuickTabs.h>
+#include <CodeEditor/CodeEditor.h>
+
+#include "UppDlg.h"
+
+#include "version.h"
+
+#include <plugin/astyle/astyle.h>
+
+enum { REMOTE_TIMEOUT = 2000 };
+
+const char *FindTag(const char *txt, const char *tag);
+const char *FindAfter(const char *txt, const char *tag);
+int         IdeLocateLine(String old_file, int old_line, String new_file);
+
+class FileSelButton : public FileSel
+{
+public:
+	typedef FileSelButton CLASSNAME;
+	enum MODE { MODE_OPEN, MODE_SAVE, MODE_DIR };
+	FileSelButton(MODE mode = MODE_OPEN, const char *title = NULL);
+
+	void               Attach(Ctrl& parent) { parent.AddFrame(button); }
+	void               Title(String t)      { title = t; }
+	String             GetTitle() const     { return title; }
+
+private:
+	void               OnAction();
+
+private:
+	FrameRight<Button> button;
+	String             title;
+	MODE               mode;
+};
+
+struct OpenFileButton  : FileSelButton { OpenFileButton(const char *title = NULL) : FileSelButton(MODE_OPEN, title) {} };
+struct SaveFileButton  : FileSelButton { SaveFileButton(const char *title = NULL) : FileSelButton(MODE_SAVE, title) {} };
+struct SelectDirButton : FileSelButton { SelectDirButton(const char *title = NULL) : FileSelButton(MODE_DIR,  title) {} };
+
+void Puts(const char *s);
+
+class Console : public LineEdit {
+public:
+	virtual bool Key(dword key, int count);
+	virtual void LeftDouble(Point p, dword);
+	virtual void RightDown(Point p, dword);
+	virtual void Append(const String& s);
+
+protected:
+	struct Slot {
+		Slot() : outfile(NULL), quiet(true), exitcode(Null) {}
+
+		One<SlaveProcess> process;
+		String            cmdline;
+		String            output;
+		String            key;
+		String            group;
+		Stream            *outfile;
+		bool              quiet;
+		int               exitcode;
+		int               last_msecs;
+	};
+
+	struct Group {
+		Group() : count(0), start_time(::msecs()), finished(false), msecs(0), raw_msecs(0) {}
+
+		int               count;
+		int               start_time;
+		bool              finished;
+		int               msecs;
+		int               raw_msecs;
+	};
+
+	Array<Slot> processes;
+	ArrayMap<String, Group> groups;
+	Vector<String> error_keys;
+	String current_group;
+	String spooled_output;
+	int console_lock;
+	bool wrap_text;
+	FrameBottom<EditString> input;
+
+	void CheckEndGroup();
+	void FlushConsole();
+
+public:
+	Callback WhenSelect;
+	Callback1<Bar&> WhenBar;
+	bool console;
+	bool verbosebuild;
+
+	int  Execute(const char *cmdline, Stream *out = NULL, const char *envptr = NULL, bool quiet = false);
+	int  Execute(One<SlaveProcess> process, const char *cmdline, Stream *out = NULL, bool quiet = false);
+	int  GetSlotCount() const { return processes.GetCount(); }
+	int  AllocSlot();
+	bool Run(const char *cmdline, Stream *out = NULL, const char *endptr = NULL, bool quiet = false, int slot = 0, String key = Null, int blitz_count = 1);
+	bool Run(One<SlaveProcess> process, const char *cmdline, Stream *out = NULL, bool quiet = false, int slot = 0, String key = Null, int blitz_count = 1);
+	void BeginGroup(String group);
+	void EndGroup();
+
+	Console& operator<<(const String& s)      { Append(s); return *this; }
+
+	bool IsRunning();
+	bool IsRunning(int slot);
+	int  Flush();
+	void Kill(int slot);
+	void Kill();
+	void ClearError()                         { error_keys.Clear(); }
+	Vector<String> PickErrors()               { Vector<String> e = error_keys; error_keys.Clear(); return e; }
+	void Wait(int slot);
+	bool Wait();
+
+	void WrapText(bool w)                     { wrap_text = w; }
+
+	void SetSlots(int s);
+
+	void Input(bool b);
+
+	Console();
+};
+
+extern String LinuxHostConsole;
+
+struct LocalHost : Host {
+	Vector<String> exedirs;
+	String         environment;
+
+	String        *cmdout;
+	void    DoDir(const String& s);
+
+	virtual String             GetEnvironment();
+	virtual String             GetHostPath(const String& path);
+	virtual String             GetLocalPath(const String& path);
+	virtual String             NormalizePath(const String& path);
+	virtual Vector<FileInfo>   GetFileInfo(const Vector<String>& path);
+	virtual void               DeleteFile(const Vector<String>& path);
+	virtual void               DeleteFolderDeep(const String& dir);
+	virtual void               ChDir(const String& path);
+	virtual void               RealizeDir(const String& path);
+	virtual void               SaveFile(const String& path, const String& data);
+	virtual String             LoadFile(const String& path);
+	virtual int                Execute(const char *cmdline);
+	virtual int                ExecuteWithInput(const char *cmdline);
+	virtual int                Execute(const char *cmdline, Stream& out);
+	virtual int                AllocSlot();
+	virtual bool               Run(const char *cmdline, int slot, String key, int blitz_count);
+	virtual bool               Run(const char *cmdline, Stream& out, int slot, String key, int blitz_count);
+	virtual bool               Wait();
+	virtual One<SlaveProcess>  StartProcess(const char *cmdline);
+	virtual void               Launch(const char *cmdline, bool console);
+	virtual void               AddFlags(Index<String>& cfg);
+};
+
+struct RemoteHost : Host {
+	String         host;
+	int            port;
+	String         os_type;
+//	bool           transfer_files;
+	Vector<String> path_map_local;
+	Vector<String> path_map_remote;
+	String         chdir_path;
+	String         environment;
+
+	static Time                TimeBase() { return Time(2000, 1, 1); }
+
+	virtual String             GetEnvironment();
+	virtual String             GetHostPath(const String& path);
+	virtual String             GetLocalPath(const String& path);
+	virtual String             NormalizePath(const String& path);
+	virtual Vector<FileInfo>   GetFileInfo(const Vector<String>& path);
+	virtual void               DeleteFile(const Vector<String>& path);
+	virtual void               DeleteFolderDeep(const String& dir);
+	virtual void               ChDir(const String& path);
+	virtual void               RealizeDir(const String& path);
+	virtual void               SaveFile(const String& path, const String& data);
+	virtual String             LoadFile(const String& path);
+	virtual int                Execute(const char *cmdline);
+	virtual int                ExecuteWithInput(const char *cmdline);
+	virtual int                Execute(const char *cmdline, Stream& out);
+	virtual int                AllocSlot();
+	virtual bool               Run(const char *cmdline, int slot, String key, int blitz_count);
+	virtual bool               Run(const char *cmdline, Stream& out, int slot, String key, int blitz_count);
+	virtual bool               Wait();
+	virtual One<SlaveProcess>  StartProcess(const char *cmdline);
+	virtual void               Launch(const char *cmdline, bool console);
+	virtual void               AddFlags(Index<String>& cfg);
+
+	String                     RemoteExec(String cmd);
+};
+
+VectorMap<String, Builder *(*)()>& BuilderMap();
+
+String SelectAnyPackage();
+
+String FindInDirs(const Vector<String>& dir, const String& file);
+String FindCommand(const Vector<String>& exedir, const String& cmdline);
+
+void DlCharset(DropList& d);
+void DlCharsetD(DropList& d);
+
+void                      SetupBuildMethods();
+VectorMap<String, String> GetMethodVars(const String& method);
+String                    GetDefaultMethod();
+
+struct PackageMode : Moveable<PackageMode> {
+	int debug;
+	int blitz;
+
+	void Serialize(Stream& s) { s / debug / blitz / blitz; }
+
+	PackageMode() { debug = blitz = Null; }
+};
+
+struct TargetMode {
+	bool        target_override;
+	String      target;
+	int         linkmode;
+	bool        createmap;
+	String      version;
+	PackageMode def;
+	VectorMap<String, PackageMode> package;
+
+	void        Serialize(Stream& s);
+
+	TargetMode() { def.debug = def.blitz = 0; target_override = false; linkmode = 0; createmap = false; }
+};
+
+bool CheckLicense();
+bool Install();
+
+#define HELPNAME "Help Topics"
+
+class TopicCtrl : public HelpWindow {
+public:
+	virtual Topic AcquireTopic(const String& topic);
+	virtual void  BarEx(Bar& bar);
+	virtual bool  Key(dword key, int count);
+	virtual void  FinishText(RichText& text);
+
+private:
+	void OpenTopic();
+	void Search();
+	void ShowWords();
+	void All();
+	void Lang();
+
+	Label    search_label;
+	WithDropChoice<EditString> search;
+	DropList lang;
+	bool     internal;
+	bool     showwords, issearch, all;
+
+
+public:
+	Callback WhenTopic;
+
+	void SyncDocTree();
+	void SearchWord(const String& s);
+	void Serialize(Stream& s);
+
+	typedef TopicCtrl CLASSNAME;
+
+	TopicCtrl();
+};
+
+struct IdeCalc : CodeEditor {
+	virtual bool Key(dword key, int count);
+	virtual void LeftDouble(Point p, dword flags);
+
+	ArrayMap<String, EscValue> vars;
+
+	void    Execute();
+
+	IdeCalc();
+};
+
+void AutoSetup();
+
+extern bool splash_screen;
+void HideSplash();
+void ShowSplash();
+bool IsSplashOpen();
+
+class RightTabs : public FrameCtrl<Ctrl> {
+public:
+	virtual void Paint(Draw& w);
+	virtual void LeftDown(Point p, dword);
+	virtual void MouseMove(Point p, dword);
+	virtual void MouseLeave();
+	virtual void CancelMode();
+	virtual void FramePaint(Draw& w, const Rect& r);
+	virtual void FrameLayout(Rect& r);
+	virtual void FrameAddSize(Size& sz);
+
+private:
+	enum       { SPACE = 7 };
+
+	struct Tab {
+		int    y;
+		Image  img;
+		String tip;
+
+		int    GetHeight() const { return img.GetSize().cy + SPACE; }
+		int    GetRight() const  { return y + GetHeight(); }
+	};
+
+	Array<Tab> tab;
+	int        cx;
+	int        hl;
+	int        cursor;
+
+	void Repos();
+	void PaintTab(Draw& w, int x, int y, int cx, int cy, Color paper, const Image& img, Color hl);
+	int  GetPos(Point p);
+
+public:
+	void Clear();
+	void Add(const Image& img, const String& tip);
+	void SetCursor(int i);
+	int  GetCursor() const                                       { return cursor; }
+
+	RightTabs();
+};
+
+int  memcmp_i(const char *s, const char *t, int n);
+void SubstituteTpars(Vector<String>& type, const String& tname);
+int  CharFilterMacro(int c);
+
+struct AssistEditor : CodeEditor {
+	virtual bool Key(dword key, int count);
+	virtual void LostFocus();
+	virtual void MouseWheel(Point p, int zdelta, dword keyflags);
+	virtual void LeftDown(Point p, dword keyflags);
+	virtual void SelectionChanged();
+
+	SplitterFrame  indexframe;
+	EditString     searchindex;
+	ArrayCtrl      index;
+	StaticRect     indexpane;
+	bool           showindex;
+	struct IndexItem : Moveable<IndexItem> {
+		String text;
+		Color  ink;
+		int    line;
+	};
+	Vector<IndexItem> indexitem;
+
+	Splitter       popup;
+	ArrayCtrl      assist;
+	ArrayCtrl      type;
+	Index<String>                 assist_type;
+	ArrayMap<String, CppItemInfo> assist_item;
+	int            assist_cursor;
+	bool           auto_assist;
+	bool           assist_active;
+	bool           commentdp;
+	bool           inbody;
+	Ide           *theide;
+
+	void           PopUpAssist(bool auto_insert = false);
+	void           CloseAssist();
+	void           Assist();
+	String         ReadIdBack(int q);
+	void           SyncAssist();
+	void           AssistInsert();
+	bool           InCode();
+
+	void           Complete();
+
+	void           Context(Parser& parser, int pos);
+	bool           NestId(const CppNest& n, const String& id, Vector<String>& type, bool& code, String& t);
+	void           TypeOf(const String& id, Vector<String>& r, bool& code);
+	Vector<String> Operator(const char *oper, const Vector<String>& type);
+	Vector<String> TypeOf(const Vector<String>& xp, const String& tp);
+	String         RemoveDefPar(const char *s);
+	String         MakeDefinition(const String& cls, const String& _n);
+	void           DCopy();
+	void           Virtuals();
+	void           Thisbacks();
+	void           GatherItems(const String& type, bool nom, Index<String>& in_types, bool tp);
+
+	void           SelParam();
+	int            Ch(int q);
+	int            ParsBack(int q);
+	Vector<String> ReadBack(int q, String& type);
+	void           SkipSpcBack(int& q);
+	String         IdBack(int& qq);
+
+	void           SwapSContext(Parser& p);
+	
+	void           CreateIndex();
+
+	void           SyncIndex();
+	void           IndexSync();
+	void           SearchIndex();
+	void           IndexClick();
+	void           SyncIndexCursor();
+	bool           IndexKey(dword key);
+	bool           IsIndex();
+	void           ShowIndex(bool b);
+	
+	void           SerializeIndex(Stream& s);
+
+	typedef AssistEditor CLASSNAME;
+
+	AssistEditor();
+};
+
+struct Ide : public TopWindow, public WorkspaceWork, public IdeContext {
+public:
+	virtual   void   Paint(Draw& w);
+	virtual   bool   Key(dword key, int count);
+	virtual   bool   HotKey(dword key);
+	virtual   void   FileCursor();
+	virtual   void   PackageCursor();
+	virtual   void   SyncWorkspace();
+	virtual   void   BuildFileMenu(Bar& menu);
+	virtual   void   FilePropertiesMenu(Bar& menu);
+	virtual   String GetOutputDir();
+	virtual   void   FileSelected();
+	virtual   void   Serialize(Stream& s);
+	virtual   void   FileRename(const String& nm);
+	virtual   void   DragAndDrop(Point p, PasteClip& d);
+
+	virtual   void      PutConsole(const char *s);
+	virtual   void      PutVerbose(const char *s);
+
+	virtual   const Workspace& IdeWorkspace() const;
+	virtual   bool             IdeIsBuilding() const;
+	virtual   String           IdeGetOneFile() const;
+	virtual   int              IdeConsoleExecute(const char *cmdline, Stream *out = NULL, const char *envptr = NULL, bool quiet = false);
+	virtual   int              IdeConsoleExecute(One<SlaveProcess> process, const char *cmdline, Stream *out = NULL, bool quiet = false);
+	virtual   int              IdeConsoleExecuteWithInput(const char *cmdline, Stream *out, const char *envptr, bool quiet);
+	virtual   int              IdeConsoleAllocSlot();
+	virtual   bool             IdeConsoleRun(const char *cmdline, Stream *out = NULL, const char *envptr = NULL, bool quiet = false, int slot = 0, String key = Null, int blitz_count = 1);
+	virtual   bool             IdeConsoleRun(One<SlaveProcess> process, const char *cmdline, Stream *out = NULL, bool quiet = false, int slot = 0, String key = Null, int blitz_count = 1);
+	virtual   void             IdeConsoleFlush();
+	virtual   void             IdeConsoleBeginGroup(String group);
+	virtual   void             IdeConsoleEndGroup();
+	virtual   bool             IdeConsoleWait();
+
+	virtual   bool      IdeIsDebug() const;
+	virtual   void      IdeEndDebug();
+	virtual   void      IdeSetBottom(Ctrl& ctrl);
+	virtual   void      IdeActivateBottom();
+	virtual   void      IdeRemoveBottom(Ctrl& ctrl);
+	virtual   void      IdeSetRight(Ctrl& ctrl);
+	virtual   void      IdeRemoveRight(Ctrl& ctrl);
+
+	virtual   String    IdeGetFileName() const;
+	virtual   int       IdeGetFileLine();
+	virtual   String    IdeGetLine(int i) const;
+
+	virtual   void      IdeSetDebugPos(const String& fn, int line, const Image& img, int i);
+	virtual   void      IdeHidePtr();
+	virtual   bool      IdeDebugLock();
+	virtual   bool      IdeDebugUnLock();
+	virtual   bool      IdeIsDebugLock() const;
+
+	virtual   void      IdeSetBar();
+
+	enum {
+		EDITING, BUILDING, RUNNING, DEBUGGING,
+	};
+
+	String     pocfg;
+
+	MenuBar    menubar;
+	ToolBar    toolbar;
+	StatusBar  statusbar;
+	StaticRect editpane;
+
+	int        idestate;
+	int        debuglock;
+	int        hydra1_threads;
+
+	int        chstyle;
+
+	One<IdeDesigner> designer;
+	AssistEditor     editor;
+	CodeEditor       editor2;
+	QuickTabs        tabs, tabs2;
+	EscValue         macro_api;
+
+	RightTabs   btabs;
+	StaticRect  bottom;
+	Splitter    editor_bottom;
+	Console     console;
+	IdeCalc     calc;
+	Browser     browser;
+	Ptr<Ctrl>   bottomctrl;
+
+	enum Bottoms { BCLOSE, BCONSOLE, BBROWSER, BCALC, BDEBUG };
+
+	FileOut    stdout_fout;
+
+	Splitter   editorsplit;
+	Splitter   pfsplit;
+	Splitter   wesplit;
+
+	Splitter   right_split;
+	StaticRect right;
+
+	String    editfile;
+	FileTime  edittime;
+
+	String    editfile2;
+
+	Vector<String> tablru;
+	int            tabi;
+	bool           blocktabs;
+
+	struct Bookmark : Moveable<Bookmark> {
+		String            file;
+		LineEdit::EditPos pos;
+
+		void Serialize(Stream& s)        { s % file % pos; }
+	}
+	bookmark[10];
+
+	struct FileData {
+		Time               filetime;
+		LineEdit::EditPos  editpos;
+		Point              columnline;
+		LineEdit::UndoData undodata;
+		LineInfo           lineinfo;
+		LineInfoRem        lineinforem;
+
+		void Clear()  {
+			filetime = Null; editpos.Clear(); undodata.Clear();
+			columnline = Null; lineinfo.Clear(); lineinforem.Clear();
+		}
+	};
+
+	struct TransferFileInfo
+	{
+		String sourcepath;
+		int    filetime;
+		int    filesize;
+	};
+
+	String posfile[2];
+	int    posline[2];
+	Image  posimg[2];
+
+	Vector<Bookmark> history;
+	int              histi;
+
+	ArrayMap<String, FileData> filedata;
+	ArrayMap<String, TransferFileInfo> transferfilecache;
+	Index<String> editastext;
+
+	DropList   mainconfiglist;
+	String     mainconfigname;
+	String     mainconfigparam;
+
+	String       method;
+	int          targetmode;
+	TargetMode   debug;
+	TargetMode   release;
+
+	String       onefile;
+	int          build_time;
+	String       target;
+	String       cmdout;
+
+	bool         stoponerrors;
+
+	MultiButton               buildmode;
+	PopUpTable                methodlist;
+	PopUpTable                modelist;
+	VectorMap<String, String> recent_buildmode;
+
+	Vector<String> recentoutput;
+	Vector<String> recentflags;
+
+	String    runarg;
+	String    recent_runarg;
+	String    rundir;
+	enum      { RUN_WINDOW, RUN_CONSOLE, RUN_FILE, RUN_FILE_CONSOLE };
+	int       runmode;
+	bool      runexternal;
+	String    stdout_file;
+	String    recent_stdout_file;
+
+// ------------------------------------
+
+	One<Debugger> debugger;
+
+	Time      start_time;
+	Time      build_start_time;
+	int       stat_build_time;
+
+	Font      editorfont;
+	Font      veditorfont;
+	Font      consolefont;
+	Font      font1;
+	Font      font2;
+	Font      tfont;
+	int       editortabsize;
+	int       indent_amount;
+	byte      default_charset;
+	bool      indent_spaces;
+	bool      show_status_bar;
+	bool      toolbar_in_row;
+	bool      show_tabs;
+	bool      tabs_icons;
+	bool      tabs_crosses;
+	bool      tabs_grouping;
+	bool      no_parenthesis_indent;
+	bool      hilite_if_endif;
+	bool      wrap_console_text;
+	bool      mute_sounds;
+	bool      line_numbers;
+	bool      header_guards;
+	bool      filetabs;
+	bool      auto_enclose;
+	bool      mark_lines;
+	int       insert_include;
+	int       bordercolumn;
+	Color     bordercolor;
+
+	/*
+		astyle code formatter control vars
+		added 2008.01.27 by Massimo Del Fedele
+	*/
+	bool	astyle_BracketIndent;
+	bool	astyle_NamespaceIndent;
+	bool	astyle_BlockIndent;
+	bool	astyle_CaseIndent;
+	bool	astyle_ClassIndent;
+	bool	astyle_LabelIndent;
+	bool	astyle_SwitchIndent;
+	bool	astyle_PreprocessorIndent;
+	int		astyle_MinInStatementIndentLength;
+	int		astyle_MaxInStatementIndentLength;
+	bool	astyle_BreakClosingHeaderBracketsMode;
+	bool	astyle_BreakElseIfsMode;
+	bool	astyle_BreakOneLineBlocksMode;
+	bool	astyle_SingleStatementsMode;
+	bool	astyle_BreakBlocksMode;
+	bool	astyle_BreakClosingHeaderBlocksMode;
+	int		astyle_BracketFormatMode;
+	int		astyle_ParensPaddingMode;
+	bool	astyle_ParensUnPaddingMode;
+	bool	astyle_OperatorPaddingMode;
+	bool	astyle_EmptyLineFill;
+	bool	astyle_TabSpaceConversionMode;
+	WString	astyle_TestBox;
+
+	// Formats a string of code with a given formatter
+	WString FormatCodeString(WString const &Src, astyle::ASFormatter &Formatter);
+
+	// Formats editor's code with Ide format parameters
+	void FormatCode();
+
+	bool      use_target;
+
+	bool      browser_closeesc;
+	bool      bookmark_pos;
+
+	FrameTop<StaticBarArea> bararea;
+	Label                   display;
+
+
+	byte      hilite_scope;
+	int       hilite_bracket;
+	int       hilite_ifdef;
+
+	enum { STYLE_NO_REPLACE, STYLE_CONFIRM_REPLACE, STYLE_AUTO_REPLACE };
+
+	struct FindInFiles : WithFindInFilesLayout<TopWindow> {
+		WString itext;
+		virtual bool Key(dword key, int count);
+	} ff;
+	int                              iwc;
+
+	int           doc_serial;
+	TopicCtrl     doc;
+
+	int             state_icon;
+
+// ------------------------------------
+
+	void      BeepMuteExclamation() { if(!mute_sounds) BeepExclamation(); }
+	void      BeepMuteInformation() { if(!mute_sounds) BeepInformation(); }
+
+	void      BookKey(int key);
+	void      AddHistory();
+	void      GotoBookmark(const Bookmark& b);
+	void      HistoryFw();
+	void      HistoryBk();
+	bool      IsHistDiff(int i);
+
+	bool      HasFileData(const String& file);
+	FileData& Filedata(const String& file);
+
+	void      BTabs();
+	void      SyncBottom();
+	void      HideBottom();
+	void      SetBottom(int i);
+	void      ToggleBottom(int i);
+	void      ShowConsole()                      { SetBottom(1); }
+	void      ToggleConsole()                    { ToggleBottom(1); }
+	void      SwapBottom();
+	bool      IsBottomShown() const;
+
+	void      SetHdependDirs();
+	void      MakeTitle();
+	void      MakeIcon();
+	void      AdjustMainConfig();
+	String    GetFirstFile();
+	void      SetMain(const String& package);
+	void      ChangeFileCharset(const String& name, Package& p, byte charset);
+	void      ChangeCharset();
+	void      FlushFile();
+	void      EditFile0(const String& path, byte charset = CHARSET_DEFAULT, bool astext = false,
+	                    const String& header = Null);
+	void      EditFile(const String& path);
+	void      ReloadFile();
+	void      AddLru();
+	bool      CanToggleReadOnly();
+	void      ToggleReadOnly();
+	void      PosSync();
+
+	void      PackageMenu(Bar& menu);
+
+	void      UscFile(const String& file);
+	void      UscProcessDir(const String& dir);
+	void      SyncUsc();
+
+	void      RefreshBrowser();
+
+	void      SetupOutputMode();
+	void      SyncBuildMode();
+	void      SetupDefaultMethod();
+	void      SetupBuildMethods();
+	void      DropMethodList();
+	void      SelectMethod();
+	void      DropModeList();
+	void      SelectMode();
+	void      SerializeOutputMode(Stream& s);
+
+	void      GotoPos(String path, int line);
+	void      GotoCpp(const CppPos& pos);
+
+	void      File(Bar& menu);
+		void   EditWorkspace();
+		void   EditAnyFile();
+		bool   IsProjectFile(const String& f) const;
+		void   SaveFile(bool always = false);
+		void   DoSaveFile()    { SaveFile(); }
+		void   ExportProject();
+		void   FileBookmark	(Bar& menu);
+		void   SwapPackagesFiles();
+		void   Times();
+		void   Statistics();
+		void   Exit();
+		String GetOpposite();
+		void   GoOpposite();
+
+
+	void      Edit(Bar& menu);
+		void  EditAsText();
+		void  EditUsingDesigner();
+		void  EditFindReplace()  { editor.FindReplace(false); }
+		void  EditFindReplacePickText() { editor.FindReplace(true); }
+		void  EditFindNext()     { editor.Find(false); }
+		void  EditFindPrevious() { editor.Find(true); }
+		void  EditPaste()        { editor.Paste(); }
+		void  EditMakeTabs()     { editor.MakeTabsOrSpaces(true); }
+		void  EditMakeSpaces()   { editor.MakeTabsOrSpaces(false); }
+		void  FindInFiles();
+		void  FindFileName();
+		void  FindString(bool back);
+		void  FindNextError();
+		void  FindPrevError();
+		void  ClearEditedFile();
+		void  ClearEditedAll();
+
+	void      EditSpecial(Bar& menu);
+		void  TranslateString();
+		void  SwapChars()        { editor.SwapChars(); }
+		void  CopyWord()         { editor.CopyWord(); }
+
+	void      MacroMenu(Bar& menu);
+		bool  HasMacros();
+		void  EditMacroMenu(Bar& menu, const Vector<int>& items);
+		void  EditMacro(int i);
+
+	void      Project(Bar& menu);
+		void  SyncT(int kind);
+		void  ConvertST();
+
+	void      BuildMenu(Bar& menu);
+		void BuildPackageMenu(Bar& menu);
+
+		Index<String> PackageConfig(const ::Workspace& wspc, int package,
+		                            const VectorMap<String, String>& bm, String mainparam,
+		                            Host& host, Builder& b, String *target = NULL);
+		const TargetMode& GetTargetMode();
+		One<Host>     CreateHost(bool sync_files);
+		bool          SyncHostFiles(RemoteHost& host);
+		String        OutDir(const Index<String>& cfg, const String& package, const VectorMap<String, String>& bm,
+		                     bool use_target = false);
+		One<Builder>  CreateBuilder(Host *host);
+		bool  BuildPackage(const ::Workspace& wspc, int pkindex, int pknumber, int pktotal,
+		                   String mainparam, String outfile, Vector<String>& linkfile, String& linkopt,
+		                   bool link = false);
+		static Vector<String> GetAllUses(const ::Workspace& wspc, int index);
+		Vector<String> GetAllLibraries(const ::Workspace& wspc, int index,
+			                           const VectorMap<String, String>& bm, String mainparam,
+			                           Host& host, Builder& builder);
+		bool  Build(const Workspace& workspace, String mainparam, String outfile = Null, bool clear_console = true);
+		bool  Build();
+		void  DoBuild();
+		void  PackageBuild();
+		void  BeginBuilding(bool sync_files = true, bool clear_console = true);
+		void  EndBuilding(bool ok);
+		void  StopBuild();
+		void  Clean();
+		void  CleanPackage(const ::Workspace& wspc, int package);
+		void  PackageClean();
+		void  RebuildAll();
+		void  CreateMakefile();
+		void  SaveMakeFile(const String& file);
+		void  CleanUppOut();
+		void  SwitchHeader();
+		void  FileCompile();
+		void  Preprocess();
+		void  ToggleStopOnErrors();
+		One<Host> CreateHostRunDir();
+		void  OpenOutputFolder();
+
+	void      DebugMenu(Bar& menu);
+		void  RunArgs();
+		void  BuildAndExecute();
+		void  BuildAndDebug0(const String& srcfile);
+		void  BuildAndDebug(bool runto);
+		void  BuildAndExtDebug();
+		void  BuildAndExtDebugFile();
+		bool  IsValgrind();
+		void  Valgrind();
+
+		void  StartDebug();
+		void  StopDebug();
+		void  DebugToggleBreak();
+		void  ConditionalBreak();
+		void  DebugClearBreakpoints();
+		void  OnBreakpoint(int i);
+
+		String GetLogPath();
+		void  OpenLog();
+
+	void      Setup(Bar& menu);
+		void  SetupFormat();
+		void  ToggleVerboseBuild();
+		void  AutoSetup();
+
+	void      BrowseMenu(Bar& menu);
+		void  Query();
+		void  QueryWord();
+		void  DppIgnoreList();
+		void  RescanCode();
+		void  QueryId();
+		void  About();
+		void  OpenATopic();
+		void  ToggleIndex();
+		void  SearchIndex();
+		void  Goto();
+		void  GotoGlobal();
+		void  ScanFile();
+		void  SwapS();
+		void  JumpS();
+		void  InsertColor();
+
+
+	void      ConsoleMenu(Bar& menu);
+		void  ConsoleClear();
+		void  ConsoleCopy();
+		void  ConsolePaste();
+
+	void      MainMenu(Bar& menu);
+	void      MainTool(Bar& bar);
+
+	void      SaveWorkspace();
+	String    WorkspaceFile();
+	void      SerializeWorkspace(Stream& s);
+
+//	void      PrintTime(dword time);
+	void      SetIdeState(int newstate);
+
+	void      MainConfig();
+	void      SyncMainConfigList();
+	void      OnMainConfigList();
+	void      SetMainConfigList();
+
+	void      FileProperties();
+
+	void      CustomSteps();
+
+	void      CycleFiles();
+
+	void      Renumber();
+
+	bool      FindLineError(int l, Host& host);
+	bool      FindLineError(String ln, Host& host, String& file, int& lineno, int& error);
+	void      FindError();
+	void	  ClearErrorEditor();
+	void	  ClearErrorEditor(String file);
+	void	  SetErrorEditor();
+
+	void      FindWildcard();
+	void      FindFolder();
+	void      FindSetStdDir(String n);
+	void      FindStdDir();
+	void      InsertWildcard(int c);
+	void      SerializeFf(Stream& s);
+	bool      SearchInFile(const String& fn, const String& pattern,
+		                   bool wholeword, bool ignorecase, int& n);
+	void      ConstructFindInFiles();
+	void      SerializeFindInFiles(Stream& s);
+
+	void      SetupEditor(int font, String highlight, String fn);
+	void      SetupEditor();
+
+	void      Display();
+
+	void      SetIcon();
+	void      CheckFileUpdate();
+	void      Periodic();
+
+	void      PassEditor();
+	void      SyncEditorSplit();
+	void      SplitEditor(bool horz);
+	void      CloseSplit();
+	void      KeySplit(bool horz);
+	void      SwapEditors();
+	void      TabFile();
+	void      TabFile2();
+	void      ClearTab();
+	void      ClearTabs();
+	void      CloseRest(QuickTabs *tabs);
+	void      TabsLR(int d);
+
+	void      RefreshFrame(bool auto_disasm);
+	void      RefreshLine(int frame, bool auto_disasm);
+
+	void      ResolveUvsConflict();
+
+	void      SetBar();
+
+	void      UpdateFormat(CodeEditor& editor, QuickTabs& tabs);
+	void      UpdateFormat();
+	void      ReadHlStyles(ArrayCtrl& hlstyle);
+
+	bool      OpenMainPackage();
+	void      NewMainPackage();
+
+	void      SearchTopics();
+	void      ShowTopics();
+	void      ShowTopic(String topic);
+
+	void      TopicBack();
+
+	void      SetupBars();
+
+	void      SyncCh();
+
+	EscValue  MacroEditor();
+		void  MacroGetLength(EscEscape& e);
+		void  MacroGetLineCount(EscEscape& e);
+		void  MacroGetLinePos(EscEscape& e);
+		void  MacroGetCursor(EscEscape& e);
+		void  MacroGetLine(EscEscape& e);
+		void  MacroGetColumn(EscEscape& e);
+		void  MacroGetSelBegin(EscEscape& e);
+		void  MacroGetSelEnd(EscEscape& e);
+		void  MacroGetSelCount(EscEscape& e);
+		void  MacroSetCursor(EscEscape& e);
+		void  MacroSetSelection(EscEscape& e);
+		void  MacroClearSelection(EscEscape& e);
+		void  MacroGet(EscEscape& e);
+		void  MacroRemove(EscEscape& e);
+		void  MacroInsert(EscEscape& e);
+		void  MacroFind(EscEscape& e);
+		void  MacroReplace(EscEscape& e);
+		void  MacroFindMatchingBrace(EscEscape& e);
+		void  MacroFindClosingBrace(EscEscape& e);
+		void  MacroFindOpeningBrace(EscEscape& e);
+		void  MacroMoveLeft(EscEscape& e);
+		void  MacroMoveRight(EscEscape& e);
+		void  MacroMoveWordLeft(EscEscape& e);
+		void  MacroMoveWordRight(EscEscape& e);
+		void  MacroMoveUp(EscEscape& e);
+		void  MacroMoveDown(EscEscape& e);
+		void  MacroMoveHome(EscEscape& e);
+		void  MacroMoveEnd(EscEscape& e);
+		void  MacroMovePageUp(EscEscape& e);
+		void  MacroMovePageDown(EscEscape& e);
+		void  MacroMoveTextBegin(EscEscape& e);
+		void  MacroMoveTextEnd(EscEscape& e);
+		void  MacroInput(EscEscape& e);
+		void  MacroBuild(EscEscape& e);
+		void  MacroBuildProject(EscEscape& e);
+		void  MacroExecute(EscEscape& e);
+		void  MacroLaunch(EscEscape& e);
+		void  MacroClearConsole(EscEscape& e);
+		void  MacroEditFile(EscEscape& e);
+		void  MacroSaveCurrentFile(EscEscape& e);
+		void  MacroProjectDir(EscEscape& e);
+		void  MacroFileName(EscEscape& e);
+
+	typedef   Ide CLASSNAME;
+
+	enum {
+		TIMEID_PERIODIC = TopWindow::TIMEID_COUNT,
+		TIMEID_COUNT,
+	};
+
+	Ide();
+	~Ide();
+};
+
+#endif
diff --git a/uppsrc/ide/ide.ico b/uppsrc/ide/ide.ico
new file mode 100644
index 000000000..53ebe6358
Binary files /dev/null and b/uppsrc/ide/ide.ico differ
diff --git a/uppsrc/ide/ide.iml b/uppsrc/ide/ide.iml
new file mode 100644
index 000000000..d3d250156
--- /dev/null
+++ b/uppsrc/ide/ide.iml
@@ -0,0 +1,3847 @@
+PREMULTIPLIED
+IMAGE_ID(Package)
+IMAGE_ID(IconBuilding)
+IMAGE_ID(IconRunning)
+IMAGE_ID(IconDebugging)
+IMAGE_ID(PackageLarge)
+IMAGE_ID(TempAux)
+IMAGE_ID(Common)
+IMAGE_ID(PrjAux)
+IMAGE_ID(IdeAux)
+IMAGE_ID(Header)
+IMAGE_ID(Source)
+IMAGE_ID(Script)
+IMAGE_ID(Images)
+IMAGE_ID(Language)
+IMAGE_ID(Separator)
+IMAGE_ID(SeparatorOpen)
+IMAGE_ID(SeparatorClose)
+IMAGE_ID(ErrorLinePtr)
+IMAGE_ID(IpLinePtr)
+IMAGE_ID(FrameLinePtr)
+IMAGE_ID(read_only)
+IMAGE_ID(package_organizer)
+IMAGE_ID(package_add)
+IMAGE_ID(main_package)
+IMAGE_ID(CreatePackage)
+IMAGE_ID(swap_console)
+IMAGE_ID(debug_run)
+IMAGE_ID(debug_step_into)
+IMAGE_ID(debug_step_over)
+IMAGE_ID(debug_run_to_cursor)
+IMAGE_ID(debug_quick_watch)
+IMAGE_ID(build_make)
+IMAGE_ID(build_stop)
+IMAGE_ID(build_compile)
+IMAGE_ID(build_rebuild_all)
+IMAGE_ID(build_batch_build)
+IMAGE_ID(sort_asc)
+IMAGE_ID(debug_output)
+IMAGE_ID(clean_package)
+IMAGE_ID(help)
+IMAGE_ID(browse)
+IMAGE_ID(doc)
+IMAGE_ID(logo)
+IMAGE_ID(split)
+IMAGE_ID(vsplit)
+IMAGE_ID(closesplit)
+IMAGE_ID(work)
+IMAGE_ID(calc)
+IMAGE_ID(close)
+IMAGE_ID(console)
+IMAGE_ID(browser)
+IMAGE_ID(debug)
+IMAGE_ID(miniclose)
+IMAGE_ID(miniclose1)
+IMAGE_ID(GUI)
+IMAGE_ID(CONSOLE)
+IMAGE_ID(MT)
+IMAGE_ID(Navigator)
+IMAGE_ID(opposite)
+IMAGE_ID(ShowWords)
+IMAGE_ID(HelpSearch)
+IMAGE_ID(HelpAll)
+IMAGE_ID(sponsor)
+IMAGE_ID(index)
+
+IMAGE_BEGIN_DATA
+IMAGE_DATA(120,156,237,153,77,178,155,48,12,199,125,129,206,188,93,103,186,234,117,122,43,159,168,103,200,57,114,132,46,219,101,23)
+IMAGE_DATA(122,49,65,32,91,146,45,219,129,224,7,98,52,144,152,159,254,254,148,33,113,31,238,195,237,96,32,120,213,253,183,219)
+IMAGE_DATA(109,114,176,197,2,106,200,7,22,249,96,225,187,60,239,38,119,51,55,57,126,126,156,189,247,117,60,152,120,169,125,43)
+IMAGE_DATA(11,114,57,229,177,175,208,145,119,132,79,203,75,252,122,64,7,15,38,94,244,133,133,82,251,197,254,95,89,48,141,95)
+IMAGE_DATA(168,87,40,95,239,121,178,88,223,184,140,243,220,33,109,175,117,45,104,125,242,122,11,201,0,182,9,77,237,180,201,192)
+IMAGE_DATA(116,228,218,174,47,254,180,124,225,163,133,70,248,104,113,52,242,244,188,149,190,214,126,163,62,239,255,178,62,27,63,76)
+IMAGE_DATA(6,198,254,103,124,84,94,55,254,146,93,201,128,250,149,12,178,147,209,180,24,159,237,128,102,30,183,231,112,189,236,140)
+IMAGE_DATA(70,30,57,122,214,248,92,251,105,29,148,250,243,254,47,183,159,141,223,149,12,182,179,211,38,3,83,66,40,245,85,110)
+IMAGE_DATA(66,22,22,35,75,8,80,151,12,68,30,178,139,81,231,151,30,33,49,74,201,32,109,127,89,95,238,255,124,251,217,248)
+IMAGE_DATA(69,175,9,229,254,103,60,187,103,132,100,240,243,113,92,214,108,249,93,99,203,129,219,71,223,20,63,93,252,52,233,118)
+IMAGE_DATA(214,235,16,250,154,165,250,168,155,234,163,9,191,25,12,166,31,167,243,165,60,245,180,28,214,205,147,108,160,95,79,95)
+IMAGE_DATA(43,31,79,223,154,87,162,248,236,225,199,30,227,144,250,105,94,17,127,11,117,130,110,162,95,226,71,215,231,71,252,192)
+IMAGE_DATA(118,30,125,225,97,119,96,125,179,51,93,244,190,245,247,70,253,168,30,165,252,203,117,99,253,173,243,255,214,250,56,95)
+IMAGE_DATA(144,231,113,98,221,116,126,233,220,24,250,101,143,117,133,245,85,59,239,142,162,255,162,250,109,102,239,214,255,90,182,211)
+IMAGE_DATA(47,131,163,89,207,70,82,220,196,133,5,203,120,111,60,107,252,165,223,172,239,92,223,248,143,107,7,77,6,53,131,33)
+IMAGE_DATA(14,166,197,114,147,193,98,197,191,9,28,123,84,35,111,241,6,254,210,239,211,239,224,165,39,81,201,53,190,210,143,97)
+IMAGE_DATA(7,77,6,239,182,206,68,100,119,33,198,244,189,55,158,53,254,210,111,214,119,110,196,133,252,10,187,146,129,104,93,201)
+IMAGE_DATA(160,106,58,10,147,57,124,239,141,103,141,191,244,155,245,157,59,115,50,56,174,133,193,242,160,127,62,42,79,159,136,61)
+IMAGE_DATA(232,159,53,243,96,243,173,234,223,203,159,189,253,175,226,119,182,65,158,12,154,178,49,190,211,45,54,207,66,75,156,192)
+IMAGE_DATA(166,92,234,115,124,181,206,148,197,119,76,202,103,234,16,177,243,111,27,75,189,188,123,62,38,103,121,91,29,245,186,11)
+IMAGE_DATA(218,45,188,84,127,192,157,61,63,6,44,70,112,97,28,77,124,195,248,185,57,62,227,92,89,91,140,211,192,237,107,131)
+IMAGE_DATA(38,131,154,206,133,236,81,152,80,194,189,53,250,53,90,182,186,215,78,194,250,54,239,19,163,183,47,74,253,46,121,235)
+IMAGE_DATA(184,215,215,189,103,190,190,207,104,50,128,239,223,32,56,45,255,243,11,32,56,126,134,127,63,32,184,16,10,74,124,142)
+IMAGE_DATA(117,188,179,166,235,153,93,120,145,253,251,155,113,235,166,238,150,179,227,3,241,100,87,30,114,60,137,19,179,132,167,90)
+IMAGE_DATA(25,62,230,4,125,149,147,234,76,174,239,247,251,228,105,172,232,123,3,175,121,169,254,120,223,255,199,162,161,158,240,106)
+IMAGE_DATA(255,33,27,174,145,197,107,169,93,26,47,57,107,127,65,159,186,170,175,244,179,161,253,154,137,227,160,204,223,98,156,26)
+IMAGE_DATA(238,19,103,116,127,124,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0)
+IMAGE_END_DATA(864, 13)
+
+IMAGE_BEGIN_DATA
+IMAGE_DATA(120,156,237,155,75,114,219,48,12,64,217,125,23,185,87,47,212,165,111,208,243,100,178,241,76,14,144,117,123,134,222,129)
+IMAGE_DATA(181,36,83,2,64,124,73,75,166,58,134,7,177,29,226,1,224,15,162,229,36,189,165,183,148,115,42,146,157,42,73,190)
+IMAGE_DATA(249,202,63,126,230,237,57,37,164,22,63,49,80,169,236,29,159,216,69,199,2,229,185,245,1,231,84,148,229,65,124,142)
+IMAGE_DATA(129,239,57,30,42,101,169,15,107,44,72,156,134,177,216,226,112,115,105,204,235,154,43,30,75,63,15,85,91,83,158,117)
+IMAGE_DATA(133,120,178,166,34,235,154,99,189,188,196,122,120,151,146,98,48,130,88,29,83,217,235,245,58,107,163,159,133,189,141,123)
+IMAGE_DATA(163,159,149,47,26,244,83,241,65,63,34,239,244,99,242,69,47,151,203,172,196,143,201,11,156,25,223,224,68,222,201,85)
+IMAGE_DATA(124,144,91,249,70,14,249,104,228,250,229,85,12,106,62,119,22,3,40,45,197,0,92,174,162,126,68,222,233,103,225,185)
+IMAGE_DATA(171,15,225,181,98,160,229,239,41,6,144,119,114,21,31,228,16,223,192,173,252,171,24,60,86,158,94,12,94,39,131,219)
+IMAGE_DATA(149,113,90,216,64,95,39,3,151,156,187,24,124,191,61,6,43,6,157,194,93,216,46,74,15,75,187,164,97,123,50,153)
+IMAGE_DATA(146,189,52,233,168,173,103,81,29,47,3,44,166,232,96,221,79,32,42,131,38,226,126,102,81,43,18,150,173,54,9,140)
+IMAGE_DATA(88,59,65,213,70,246,165,162,47,199,32,213,150,201,95,181,173,216,128,45,140,213,47,79,88,76,61,139,199,53,152,247)
+IMAGE_DATA(165,179,60,108,14,219,219,28,107,175,92,254,145,189,227,184,225,249,108,129,236,131,199,169,253,42,157,113,230,149,74,174)
+IMAGE_DATA(235,252,224,84,139,245,248,151,218,44,25,145,247,142,27,55,142,249,207,239,191,77,90,252,236,209,78,115,61,27,127,96)
+IMAGE_DATA(187,56,135,142,220,123,214,208,34,206,98,16,149,153,251,186,63,2,126,16,71,31,14,63,200,174,226,244,163,74,74,36)
+IMAGE_DATA(54,226,234,43,14,91,4,42,158,97,63,63,243,172,140,159,58,111,134,163,42,249,129,10,237,42,238,91,117,236,155,223)
+IMAGE_DATA(231,247,247,89,85,174,40,136,85,56,170,40,39,200,2,30,218,81,46,75,188,16,27,114,153,227,153,113,163,124,150,120)
+IMAGE_DATA(97,254,105,222,2,107,9,223,231,184,196,184,157,239,134,233,149,200,224,26,138,66,197,193,184,14,63,21,147,63,62,86)
+IMAGE_DATA(53,252,36,137,163,42,228,152,44,206,195,107,241,105,254,204,156,84,182,240,117,53,62,184,200,177,249,39,178,25,148,34)
+IMAGE_DATA(249,8,126,29,3,137,71,185,235,235,81,91,183,173,155,115,108,57,240,214,120,95,117,243,127,134,228,185,192,103,74,149)
+IMAGE_DATA(179,253,228,252,139,44,58,141,251,170,175,202,19,95,84,236,255,196,21,85,248,202,15,228,162,60,199,14,200,115,62,140)
+IMAGE_DATA(190,139,235,64,228,163,235,16,207,117,251,62,216,83,158,240,61,89,104,64,152,239,29,232,93,198,204,217,67,37,140,244)
+IMAGE_DATA(122,229,161,76,239,203,13,158,98,75,159,105,124,120,71,148,203,157,220,41,21,226,227,56,150,78,118,92,223,35,241,75)
+IMAGE_DATA(95,161,206,188,208,111,110,236,88,222,57,254,86,252,116,191,17,89,24,122,215,86,236,127,233,113,202,107,62,100,124,244)
+IMAGE_DATA(249,203,219,105,159,25,219,106,189,194,47,221,23,155,133,165,191,151,248,218,166,254,35,0,137,247,249,19,100,224,47,205)
+IMAGE_DATA(163,186,242,81,145,120,175,47,141,247,248,208,242,247,248,216,43,126,111,255,189,50,26,223,185,254,206,43,3,22,131,189)
+IMAGE_DATA(164,183,151,189,147,158,185,147,132,35,94,117,85,119,250,88,237,165,147,68,15,239,240,209,29,191,179,255,108,62,141,44)
+IMAGE_DATA(204,167,85,198,223,101,184,24,76,71,8,94,61,71,18,93,30,227,35,8,144,9,68,188,185,152,235,246,42,190,230,227)
+IMAGE_DATA(129,60,55,39,209,248,21,171,241,194,239,217,241,15,250,112,219,156,157,127,132,255,99,5,22,131,101,179,250,148,223,216)
+IMAGE_DATA(145,205,186,123,113,128,131,29,89,220,146,189,103,115,31,196,139,197,33,16,63,196,42,62,90,242,55,229,236,60,181,31)
+IMAGE_DATA(111,227,115,242,255,126,76,104,217,32,148,143,94,129,165,226,217,114,133,104,61,1,64,222,178,49,219,60,237,189,62,158)
+IMAGE_DATA(125,5,63,130,151,236,198,42,18,39,40,6,61,217,101,242,28,137,65,55,83,36,6,55,233,86,92,111,174,98,12,250)
+IMAGE_DATA(205,1,176,163,175,165,83,217,118,83,77,185,49,199,180,33,155,233,39,243,247,217,90,219,214,167,210,206,221,216,147,219)
+IMAGE_DATA(86,27,248,95,83,148,87,218,112,14,242,38,181,10,251,169,229,31,221,17,64,177,0,0,0,0,0,0,0,0,0,0)
+IMAGE_END_DATA(1056, 18)
+
+IMAGE_BEGIN_DATA
+IMAGE_DATA(120,156,236,189,7,148,92,215,117,174,9,64,154,53,107,108,137,162,100,175,25,251,89,207,150,104,175,89,35,63,251,201)
+IMAGE_DATA(10,86,164,108,145,148,230,249,45,251,73,182,146,159,45,63,123,36,6,37,203,178,34,169,100,81,162,72,130,32,72,228)
+IMAGE_DATA(156,19,129,70,206,169,17,59,231,156,115,206,93,157,115,87,237,57,255,62,119,223,58,117,235,86,117,53,208,0,27,224)
+IMAGE_DATA(249,185,54,111,165,123,235,86,117,161,190,250,247,217,103,159,37,15,46,121,112,9,209,146,5,212,179,116,123,215,239,246)
+IMAGE_DATA(126,177,142,227,189,47,214,229,8,221,226,57,186,251,81,248,126,111,196,187,221,187,191,247,177,222,231,142,186,61,98,127)
+IMAGE_DATA(34,50,158,47,124,61,214,237,230,254,222,199,38,184,245,238,63,239,173,185,255,124,181,152,158,255,54,226,246,117,43,95)
+IMAGE_DATA(6,207,170,39,231,120,54,222,63,164,185,247,141,183,191,251,56,227,121,18,221,215,61,6,30,103,30,103,30,251,198,60)
+IMAGE_DATA(198,60,95,179,223,57,204,107,127,207,121,207,231,24,222,125,189,183,251,236,18,241,1,123,54,242,53,71,221,231,185,141)
+IMAGE_DATA(247,55,37,251,222,234,63,70,217,215,123,187,223,214,239,249,111,229,31,99,162,207,119,167,158,255,54,226,246,149,216,151)
+IMAGE_DATA(65,20,133,230,251,245,193,251,155,31,140,121,28,195,37,89,156,55,209,119,191,240,135,201,127,255,24,199,48,254,200,126)
+IMAGE_DATA(36,142,123,30,62,247,197,222,119,137,255,123,25,243,24,222,253,230,58,255,24,231,153,208,249,123,47,199,217,47,230,249)
+IMAGE_DATA(207,181,95,172,231,79,244,252,227,61,127,188,243,136,177,159,239,49,230,185,95,220,247,33,193,253,34,142,113,139,251,221)
+IMAGE_DATA(154,22,222,38,36,164,219,121,145,20,227,242,124,247,157,239,49,98,61,46,222,237,113,63,8,36,31,182,57,190,16,98)
+IMAGE_DATA(29,67,221,195,251,98,235,221,215,231,249,99,30,99,30,251,206,235,31,209,235,177,127,130,17,79,183,179,239,92,199,152)
+IMAGE_DATA(143,110,103,223,91,83,140,47,131,136,111,107,159,203,241,78,144,10,157,255,112,153,46,93,226,192,229,212,84,138,8,159)
+IMAGE_DATA(99,184,251,201,190,62,207,25,142,165,81,199,152,243,185,221,253,36,226,236,31,247,121,253,247,247,59,70,244,123,27,123)
+IMAGE_DATA(223,240,99,252,223,231,91,253,96,250,93,102,157,93,189,132,16,183,178,191,236,59,199,49,110,103,255,88,183,69,188,7)
+IMAGE_DATA(183,184,239,92,138,245,190,199,58,118,34,251,199,59,183,185,142,49,223,125,189,207,61,247,235,254,223,151,252,70,172,95)
+IMAGE_DATA(6,137,126,64,94,143,251,230,250,230,158,235,91,121,206,47,180,136,107,137,252,124,242,249,77,155,144,228,241,55,110,220)
+IMAGE_DATA(136,136,68,142,99,238,231,121,81,17,199,137,183,239,146,216,111,132,123,28,239,253,158,125,151,68,37,37,140,235,222,199)
+IMAGE_DATA(198,186,205,187,127,172,199,250,237,235,247,188,177,206,55,214,185,199,138,120,251,251,189,102,191,247,34,222,243,207,181,255)
+IMAGE_DATA(92,239,193,92,231,159,232,251,31,235,253,139,245,88,185,61,214,231,212,252,92,251,253,173,228,97,222,207,187,247,223,195)
+IMAGE_DATA(146,196,254,177,70,253,251,241,236,147,200,183,225,92,207,165,111,127,157,188,148,149,149,213,98,83,2,95,6,241,126,166)
+IMAGE_DATA(204,185,31,105,223,31,21,115,28,39,214,99,163,142,233,115,140,168,251,125,126,217,196,59,70,220,125,253,142,97,236,31)
+IMAGE_DATA(243,185,221,115,143,127,14,241,222,167,68,94,67,220,247,59,214,190,115,237,63,215,190,137,62,255,93,184,63,234,111,48)
+IMAGE_DATA(143,215,238,251,249,185,133,253,99,30,35,193,125,221,99,36,242,126,196,216,55,234,56,62,17,173,59,253,101,16,243,191)
+IMAGE_DATA(185,126,30,249,63,54,250,152,62,127,8,239,253,94,205,113,140,184,251,250,30,195,252,201,22,227,185,229,220,231,56,135)
+IMAGE_DATA(120,239,83,34,175,33,238,251,29,115,223,185,246,159,107,223,4,159,255,46,220,31,253,55,72,252,181,251,127,126,230,191)
+IMAGE_DATA(127,204,99,36,184,111,248,24,183,254,239,39,250,56,139,225,203,128,110,237,155,45,230,126,49,142,227,187,239,156,158,115)
+IMAGE_DATA(14,50,176,199,140,241,212,49,246,143,120,80,162,207,111,190,31,222,253,99,105,62,251,251,229,108,94,207,231,191,157,215)
+IMAGE_DATA(175,111,91,18,107,255,168,191,159,223,190,222,253,227,253,253,111,225,243,115,187,159,223,133,248,247,19,117,28,159,136,86)
+IMAGE_DATA(197,210,31,46,149,47,131,152,127,121,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43)
+IMAGE_DATA(43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43)
+IMAGE_DATA(43,43,43,43,171,121,43,68,65,252,143,66,33,185,37,72,33,125,199,34,83,144,255,31,10,205,239,196,204,199,251,239)
+IMAGE_DATA(27,116,143,205,175,89,34,209,99,39,248,120,121,238,249,158,191,62,197,88,231,109,101,101,101,101,181,216,228,101,40,190)
+IMAGE_DATA(247,23,11,87,67,161,217,24,183,227,228,110,141,43,94,174,233,231,208,191,37,240,255,144,115,121,54,129,227,135,200,228)
+IMAGE_DATA(229,236,156,231,52,95,182,226,92,130,193,232,99,222,10,154,173,172,172,172,172,172,188,186,37,175,151,224,49,220,155,93)
+IMAGE_DATA(255,185,176,126,240,118,207,221,221,63,158,63,14,121,194,202,202,202,202,234,174,202,244,131,184,28,242,189,252,122,127,65)
+IMAGE_DATA(7,61,177,144,231,100,176,51,228,205,25,39,176,187,240,43,42,79,27,212,249,245,133,80,20,35,35,223,11,43,43,43)
+IMAGE_DATA(43,171,197,165,48,75,130,78,94,83,95,158,141,186,255,86,228,101,98,52,35,227,105,214,61,134,115,46,81,199,158,159)
+IMAGE_DATA(34,94,75,148,39,213,231,228,230,118,19,26,51,149,220,175,103,63,79,94,221,251,220,177,222,83,201,249,154,127,147,136)
+IMAGE_DATA(227,59,129,191,78,34,150,116,46,251,106,109,173,149,149,149,213,157,19,24,97,218,174,230,158,17,202,171,31,162,156,218)
+IMAGE_DATA(1,202,173,27,116,3,183,185,151,235,70,226,135,122,108,188,200,111,24,142,27,223,248,246,51,180,100,233,155,156,5,20)
+IMAGE_DATA(150,169,203,122,49,133,63,126,207,123,233,207,63,244,113,250,224,135,31,142,27,127,254,81,29,31,252,200,199,57,228,242)
+IMAGE_DATA(239,188,243,15,212,177,222,204,199,90,202,199,95,70,111,125,224,65,58,112,244,44,213,116,140,82,117,199,56,213,118,78)
+IMAGE_DATA(168,24,115,163,174,107,156,163,161,115,156,26,187,38,56,154,122,212,229,238,49,142,230,222,49,218,186,39,137,126,227,129)
+IMAGE_DATA(183,209,146,101,75,245,249,58,241,209,143,126,156,62,246,177,135,221,248,248,199,63,225,137,143,211,195,15,63,204,91,125)
+IMAGE_DATA(78,75,195,175,89,197,211,207,252,140,250,6,167,168,127,104,150,183,3,35,179,20,24,14,82,96,100,138,99,96,116,154)
+IMAGE_DATA(99,112,108,198,141,161,241,89,26,30,155,118,99,100,124,134,99,116,98,214,141,177,169,200,24,159,14,210,228,84,56,166)
+IMAGE_DATA(166,67,78,204,210,244,76,48,42,102,102,67,28,179,10,253,136,96,80,255,54,144,224,177,122,79,88,89,89,89,189,97)
+IMAGE_DATA(36,195,119,206,119,31,248,146,81,53,72,105,21,129,215,45,222,251,161,135,153,165,75,153,49,111,166,165,111,90,22,94)
+IMAGE_DATA(168,104,105,204,5,140,162,2,156,18,86,133,153,133,203,75,34,142,247,245,239,252,152,10,234,7,169,176,105,152,74,26)
+IMAGE_DATA(135,169,168,105,144,163,180,105,136,163,172,121,88,197,16,149,183,12,115,84,168,168,108,29,161,170,182,81,170,105,29,166)
+IMAGE_DATA(71,255,223,207,234,231,90,34,231,28,255,156,252,46,251,197,127,250,253,119,83,71,255,24,117,12,76,82,231,224,4,117)
+IMAGE_DATA(6,198,169,107,104,154,186,7,195,209,51,52,229,176,119,218,13,63,238,130,183,67,227,211,17,225,101,238,216,100,144,3)
+IMAGE_DATA(156,53,99,98,38,228,178,118,122,134,162,248,26,205,89,127,198,90,89,89,89,221,223,114,114,161,193,112,238,17,151,170)
+IMAGE_DATA(218,199,41,189,122,136,82,20,223,238,84,204,197,213,191,250,236,63,176,247,91,234,122,183,37,14,179,150,185,215,111,63)
+IMAGE_DATA(194,199,249,225,79,95,164,194,6,229,163,21,67,193,211,226,166,17,55,74,90,134,153,171,229,45,35,110,84,180,142,48)
+IMAGE_DATA(95,43,219,198,152,173,27,182,239,55,120,127,251,231,39,108,126,252,169,111,41,150,42,166,14,204,50,91,59,6,132,171)
+IMAGE_DATA(147,28,96,42,162,119,120,218,137,73,234,3,83,135,103,124,253,172,215,195,70,113,213,227,97,37,194,254,85,123,216,48)
+IMAGE_DATA(95,41,138,175,177,184,106,101,101,101,117,191,43,214,55,29,252,106,102,245,0,243,205,143,131,137,112,49,30,63,211,43)
+IMAGE_DATA(7,124,3,30,89,34,57,175,137,126,182,124,35,61,241,175,79,211,223,252,237,151,233,131,127,254,49,122,203,3,191,233)
+IMAGE_DATA(120,216,101,46,119,150,186,185,98,47,211,150,185,94,84,123,211,55,211,155,156,199,252,206,239,189,139,62,240,145,135,233)
+IMAGE_DATA(51,159,255,7,250,198,191,63,67,191,90,185,145,202,155,7,216,151,106,110,142,41,110,142,186,252,172,84,220,68,84,183)
+IMAGE_DATA(143,25,49,194,57,98,188,87,58,87,60,74,167,175,100,208,166,221,73,244,175,63,252,25,253,251,15,127,74,255,237,175)
+IMAGE_DATA(254,134,126,247,63,191,203,245,221,75,37,159,109,240,247,77,114,174,234,55,196,31,255,151,247,210,127,251,235,207,208,247)
+IMAGE_DATA(127,244,83,250,222,211,63,167,163,103,146,169,107,96,130,61,169,120,84,102,231,64,52,79,251,70,102,162,60,170,201,83)
+IMAGE_DATA(241,170,94,166,154,30,213,100,170,228,131,35,125,170,153,11,166,40,175,26,102,42,185,60,197,79,182,160,51,71,218,178)
+IMAGE_DATA(213,202,202,234,126,215,98,230,106,166,242,203,153,149,131,124,30,233,53,253,148,85,51,76,217,149,67,180,101,239,25,250)
+IMAGE_DATA(63,127,239,15,124,61,103,52,103,151,209,178,165,225,124,235,31,189,231,189,180,227,224,25,42,105,84,126,180,1,249,221)
+IMAGE_DATA(17,206,249,178,39,109,30,85,158,116,212,215,151,74,192,151,74,8,95,107,156,241,88,188,103,24,127,173,239,28,161,134)
+IMAGE_DATA(174,97,230,108,99,231,40,53,119,143,211,150,221,135,232,173,15,188,35,252,91,192,200,67,227,242,123,254,228,125,148,89)
+IMAGE_DATA(80,70,221,253,83,212,214,55,65,157,106,139,124,47,2,158,20,62,181,91,249,79,157,247,13,51,213,114,213,202,202,202)
+IMAGE_DATA(106,113,105,49,115,53,173,58,64,89,85,67,204,215,244,154,1,62,31,176,53,167,102,136,246,157,188,73,191,241,192,219)
+IMAGE_DATA(99,228,92,195,62,117,137,248,90,117,249,119,255,211,239,83,90,81,19,21,54,141,82,129,138,34,197,211,194,198,1,42)
+IMAGE_DATA(110,30,114,195,47,223,203,99,169,9,112,53,28,78,189,147,226,105,125,247,148,91,227,148,116,252,172,83,211,20,153,231)
+IMAGE_DATA(125,231,127,254,3,170,168,111,165,246,192,4,181,247,79,83,91,96,146,218,7,166,156,241,212,240,22,161,199,82,103,44)
+IMAGE_DATA(87,173,172,172,172,22,169,22,51,87,153,163,213,253,58,170,6,116,212,4,212,237,253,138,173,35,244,55,127,251,15,81)
+IMAGE_DATA(181,63,209,219,55,185,227,179,207,189,180,129,10,234,135,153,171,133,141,1,246,171,197,13,3,236,93,165,54,9,92,69)
+IMAGE_DATA(148,182,38,226,87,71,56,36,15,108,214,14,99,219,160,252,106,83,23,234,133,71,152,171,205,221,163,244,127,255,241,159)
+IMAGE_DATA(70,230,129,213,246,171,95,251,54,181,246,141,81,91,255,184,226,170,246,166,240,169,38,79,217,175,26,117,74,224,168,229)
+IMAGE_DATA(170,149,149,149,213,226,211,98,230,42,179,181,50,64,217,204,210,1,246,174,240,171,89,53,131,236,89,95,217,176,55,110)
+IMAGE_DATA(61,237,50,79,205,112,42,188,170,98,105,81,227,40,149,54,140,50,95,165,46,9,117,74,194,212,146,150,196,242,192,85)
+IMAGE_DATA(202,171,86,117,132,185,234,229,43,124,42,242,194,77,61,163,218,179,42,47,251,248,83,223,54,88,175,35,233,228,101,106)
+IMAGE_DATA(117,242,191,29,125,202,171,246,234,60,112,108,174,218,60,176,149,149,149,213,98,213,98,230,106,102,213,48,179,52,187,90)
+IMAGE_DATA(93,175,236,165,220,26,241,172,131,148,93,59,68,155,246,157,137,174,159,245,153,127,35,115,95,10,26,71,152,171,136,226)
+IMAGE_DATA(166,49,197,213,193,136,60,112,120,46,77,100,46,56,46,87,157,60,48,222,175,250,14,229,85,219,157,49,214,14,237,87)
+IMAGE_DATA(235,187,39,220,57,174,96,235,43,107,55,107,230,47,9,255,22,40,175,239,162,102,135,171,204,214,192,20,251,86,228,133)
+IMAGE_DATA(117,253,175,102,106,215,192,148,229,170,149,149,149,213,34,215,98,230,170,14,237,85,51,235,134,194,185,97,112,85,121,216)
+IMAGE_DATA(245,251,206,71,230,124,193,169,101,75,125,253,235,91,222,242,128,226,233,136,19,67,204,212,226,122,93,179,132,90,37,108)
+IMAGE_DATA(81,3,236,101,234,92,92,245,214,45,153,185,96,212,46,113,15,9,197,84,246,172,106,123,232,196,133,8,246,195,83,183)
+IMAGE_DATA(246,142,83,51,198,86,157,104,195,214,225,105,196,248,106,96,210,157,171,106,185,106,101,101,101,181,56,181,184,185,26,112)
+IMAGE_DATA(234,129,135,248,50,88,10,239,42,121,96,248,87,147,161,236,1,61,189,30,100,174,43,250,44,21,52,4,184,86,201,27)
+IMAGE_DATA(156,11,54,234,150,188,185,224,219,25,95,69,221,82,83,247,52,115,21,99,172,135,143,95,138,170,91,134,71,101,174,246)
+IMAGE_DATA(58,121,96,140,177,6,162,243,192,102,47,8,203,85,43,43,43,171,197,169,197,205,213,65,206,251,178,95,85,193,76,117)
+IMAGE_DATA(242,192,224,42,174,39,218,99,225,3,31,250,132,155,3,246,114,213,236,167,20,171,255,67,124,174,142,251,142,175,130,171)
+IMAGE_DATA(97,191,170,123,30,30,60,113,57,170,118,89,242,191,8,206,255,58,181,75,38,87,195,57,224,91,207,3,107,182,70,246)
+IMAGE_DATA(88,178,92,181,178,178,178,90,88,89,174,222,29,174,74,156,191,150,29,145,187,254,227,255,242,167,204,83,228,130,133,169)
+IMAGE_DATA(230,216,170,229,170,149,149,149,213,189,37,203,213,59,203,85,233,211,47,126,181,165,103,44,34,119,253,145,143,126,156,153)
+IMAGE_DATA(234,229,170,245,171,86,86,86,86,247,166,44,87,239,28,87,193,81,158,103,211,61,233,230,130,49,135,213,173,81,86,1)
+IMAGE_DATA(174,122,115,192,150,171,86,86,86,86,247,174,44,87,239,142,95,13,115,117,60,226,188,62,250,177,135,93,191,106,199,87)
+IMAGE_DATA(173,172,172,172,238,125,89,174,222,65,174,58,94,149,195,201,3,163,255,146,217,19,74,242,192,182,110,201,202,202,202,234)
+IMAGE_DATA(254,144,229,234,29,204,3,59,235,159,155,227,171,173,189,147,49,253,42,230,214,8,91,45,87,173,172,172,172,238,77,89)
+IMAGE_DATA(174,222,89,191,202,76,53,198,87,91,122,38,34,206,203,28,95,149,94,75,188,181,92,181,178,178,178,186,39,181,184,185)
+IMAGE_DATA(26,224,254,192,194,213,112,239,253,65,102,234,98,231,106,157,51,207,6,60,117,243,192,61,222,241,213,191,136,156,191,26)
+IMAGE_DATA(176,126,213,202,202,202,234,94,150,229,170,229,170,229,170,149,149,149,213,194,201,114,213,114,213,114,213,202,202,202,106,225)
+IMAGE_DATA(100,185,106,185,106,185,106,101,101,101,181,112,178,92,181,92,181,92,181,178,178,178,90,56,89,174,90,174,90,174,90,89)
+IMAGE_DATA(89,89,45,156,44,87,45,87,45,87,173,172,172,172,22,78,150,171,150,171,150,171,86,86,86,86,11,167,197,205,213,232)
+IMAGE_DATA(190,16,178,174,249,253,194,213,143,124,244,19,212,218,31,94,39,174,173,95,111,59,3,14,91,3,154,169,93,3,19,212)
+IMAGE_DATA(53,52,201,92,173,105,232,164,159,63,251,60,61,248,224,131,148,87,92,201,76,237,31,210,108,237,87,28,157,107,93,115)
+IMAGE_DATA(239,218,230,177,184,58,49,169,217,58,62,173,217,138,0,75,167,166,103,93,182,250,49,117,214,97,170,229,234,253,33,251)
+IMAGE_DATA(55,179,178,154,159,44,87,95,127,191,218,210,103,244,220,23,191,218,31,189,254,106,117,83,23,253,244,217,23,232,193,183)
+IMAGE_DATA(255,150,187,255,209,83,23,92,174,194,175,246,27,60,21,166,202,214,228,106,34,126,85,184,42,76,197,101,176,244,181,131)
+IMAGE_DATA(73,244,190,247,127,144,176,38,251,35,143,126,138,178,115,242,248,118,240,52,236,87,45,87,239,85,249,253,141,204,219,110)
+IMAGE_DATA(245,111,40,251,217,207,128,213,253,46,203,213,215,159,171,240,171,222,60,48,251,85,229,85,43,27,58,104,229,170,245,244)
+IMAGE_DATA(153,207,126,158,57,230,125,93,94,174,246,14,79,70,240,20,1,158,222,10,87,153,169,138,173,226,87,225,83,47,92,188)
+IMAGE_DATA(28,113,30,88,59,224,237,111,127,59,245,244,246,71,248,213,153,224,172,229,234,61,172,64,32,64,201,201,201,28,166,110)
+IMAGE_DATA(133,141,56,214,229,203,151,163,142,101,101,117,191,202,114,245,245,231,170,159,95,205,44,168,162,255,241,153,207,209,146,101)
+IMAGE_DATA(225,181,111,92,150,113,44,227,219,188,92,237,115,198,87,77,174,122,243,192,195,19,51,9,229,129,205,28,176,30,95,157)
+IMAGE_DATA(165,207,127,254,139,190,239,239,11,47,44,119,185,106,122,86,203,213,123,75,242,247,1,3,229,111,107,222,126,43,199,147)
+IMAGE_DATA(99,225,243,106,255,254,86,111,4,89,174,46,94,174,254,193,187,30,162,37,75,229,177,203,92,159,104,50,182,111,104,130)
+IMAGE_DATA(185,26,24,158,113,106,151,34,235,150,76,166,98,11,166,14,142,77,37,236,87,193,85,132,112,213,207,51,35,30,123,236)
+IMAGE_DATA(211,190,99,172,150,171,139,91,222,191,71,44,174,222,142,224,85,23,234,88,86,86,247,130,44,87,95,127,174,198,204,3)
+IMAGE_DATA(171,219,107,155,58,232,127,125,229,9,230,217,82,199,171,242,190,14,111,251,135,39,53,79,7,167,92,191,234,55,182,186)
+IMAGE_DATA(80,126,245,29,239,248,237,136,28,176,92,254,226,23,255,158,153,138,113,86,48,212,114,245,222,145,223,223,196,244,152,183)
+IMAGE_DATA(123,236,133,242,190,86,86,247,138,44,87,95,127,174,198,172,91,10,76,113,84,53,118,42,142,190,217,240,174,97,174,153)
+IMAGE_DATA(126,85,234,150,250,157,49,214,232,57,54,179,236,85,19,173,7,6,87,185,126,73,113,85,123,214,89,122,252,241,39,35)
+IMAGE_DATA(120,42,231,177,113,227,102,159,185,54,150,171,247,138,240,119,49,199,78,23,218,175,202,103,198,202,234,141,32,203,213,197)
+IMAGE_DATA(59,207,6,140,69,45,112,207,192,24,125,226,145,79,185,99,171,230,254,224,42,243,212,51,190,234,87,11,44,243,87,139)
+IMAGE_DATA(43,106,168,164,188,38,225,249,171,226,89,39,167,102,168,187,167,143,222,255,254,15,70,176,245,201,39,159,164,217,24,115)
+IMAGE_DATA(109,44,87,239,77,197,227,170,201,224,68,116,229,202,21,247,88,246,239,111,245,70,208,226,230,106,224,190,231,106,220,190)
+IMAGE_DATA(16,206,220,85,176,245,47,63,249,168,239,235,66,143,8,93,7,236,140,173,42,223,10,191,202,76,29,153,141,234,9,209)
+IMAGE_DATA(210,222,67,111,123,240,183,233,145,71,30,139,57,198,10,142,154,245,192,146,7,150,121,54,136,141,155,182,208,243,47,172)
+IMAGE_DATA(224,250,96,169,85,178,117,75,247,143,110,213,175,250,253,125,77,174,90,89,189,17,100,185,122,111,115,21,60,149,158,75)
+IMAGE_DATA(194,213,1,159,57,172,60,182,58,58,69,255,242,248,83,60,86,251,232,163,143,242,56,171,48,117,116,114,134,67,188,42)
+IMAGE_DATA(216,26,171,223,82,184,47,4,69,229,126,109,191,165,216,138,245,218,23,98,110,232,173,200,156,75,35,243,96,36,150,47)
+IMAGE_DATA(95,238,126,198,192,69,220,38,91,51,188,199,194,99,112,44,108,229,241,230,177,188,251,155,207,107,101,117,191,200,114,245)
+IMAGE_DATA(222,230,170,159,95,133,79,141,226,234,232,12,157,62,115,129,164,158,151,185,58,54,205,76,141,240,171,62,92,149,122,96)
+IMAGE_DATA(111,175,37,225,170,244,132,144,173,229,106,164,18,229,166,220,247,197,47,134,231,50,225,242,92,251,221,170,76,79,234,55)
+IMAGE_DATA(102,158,200,191,43,57,55,243,88,222,152,235,88,118,236,213,234,126,147,229,234,189,203,85,124,31,73,143,96,119,108,85)
+IMAGE_DATA(113,85,60,171,140,175,194,171,54,181,118,209,187,223,253,135,238,248,236,39,31,121,76,177,52,164,152,170,115,191,194,213)
+IMAGE_DATA(113,229,97,133,167,102,30,24,151,77,191,170,249,26,195,175,134,130,150,171,9,202,251,126,192,247,153,127,227,47,125,233)
+IMAGE_DATA(75,119,236,185,193,66,63,230,37,122,155,201,66,63,174,38,202,102,155,35,182,186,223,100,185,122,239,114,21,33,76,53)
+IMAGE_DATA(253,170,89,183,164,217,58,169,56,250,105,253,93,231,236,135,254,131,240,171,38,83,205,154,37,63,191,106,142,175,138,95)
+IMAGE_DATA(149,30,193,17,126,213,114,117,94,50,223,147,45,91,182,184,76,66,108,222,188,57,234,49,119,250,61,92,232,94,14,194)
+IMAGE_DATA(111,243,88,177,250,54,217,207,135,213,253,32,203,213,123,159,171,225,245,108,34,199,87,7,71,16,147,122,76,213,51,71)
+IMAGE_DATA(7,156,5,79,125,115,193,147,209,117,75,226,87,37,15,108,250,85,147,173,210,195,208,214,45,133,149,72,238,87,244,212)
+IMAGE_DATA(83,79,69,252,157,234,235,235,231,60,198,66,201,172,243,245,246,114,240,227,122,162,76,140,53,127,213,246,11,182,186,95)
+IMAGE_DATA(101,185,122,127,112,181,111,36,24,81,15,12,143,122,35,45,147,254,236,125,31,160,37,78,207,67,51,55,247,238,119,191)
+IMAGE_DATA(155,218,59,122,105,76,241,116,92,241,20,193,92,245,204,179,1,75,195,253,150,188,92,13,114,255,194,135,30,250,163,200)
+IMAGE_DATA(121,171,100,235,129,161,249,240,84,132,191,139,251,153,253,192,7,238,26,79,189,91,51,71,60,159,115,240,99,173,201,213)
+IMAGE_DATA(55,210,223,223,234,141,43,203,213,251,131,171,189,195,179,46,87,155,218,123,233,223,190,255,180,235,81,35,250,52,197,232)
+IMAGE_DATA(67,232,198,82,29,25,89,153,81,121,96,111,61,240,19,79,132,189,85,196,56,107,40,104,185,234,40,47,47,143,235,97)
+IMAGE_DATA(225,67,177,245,202,124,63,240,88,115,76,242,233,167,159,142,122,204,66,43,150,119,156,107,254,234,124,100,251,66,88,189)
+IMAGE_DATA(209,180,216,185,186,112,235,154,127,156,10,234,7,29,182,142,220,55,92,117,215,93,29,114,184,58,50,65,127,251,119,95)
+IMAGE_DATA(100,54,234,239,178,101,180,108,169,195,213,165,137,189,87,232,245,127,246,252,185,136,181,108,204,94,134,232,13,241,200,99)
+IMAGE_DATA(145,231,51,235,233,9,225,229,106,200,135,171,24,75,124,232,161,135,120,255,23,95,124,209,255,243,233,60,30,245,60,96)
+IMAGE_DATA(211,59,222,241,14,126,252,167,62,245,41,190,45,214,227,77,33,151,10,70,253,225,31,254,33,239,139,231,244,99,220,124)
+IMAGE_DATA(133,231,199,113,80,179,43,175,3,107,251,160,214,8,140,132,204,218,94,60,38,214,57,66,230,124,20,196,225,195,135,231)
+IMAGE_DATA(60,7,243,88,249,249,249,252,58,241,222,224,60,228,57,241,190,205,119,30,203,66,244,49,52,25,109,185,106,245,70,210)
+IMAGE_DATA(253,206,85,249,247,12,174,134,253,234,104,132,111,189,87,185,138,215,214,59,32,243,108,102,121,141,56,212,44,237,218,123)
+IMAGE_DATA(144,158,253,229,243,42,158,163,79,62,246,87,145,94,212,185,140,239,221,239,41,79,251,171,231,94,164,231,126,253,130,218)
+IMAGE_DATA(62,207,219,207,125,254,139,244,213,199,191,22,81,15,44,94,21,253,150,94,120,241,37,94,79,221,123,46,126,92,149,241)
+IMAGE_DATA(58,246,171,65,205,85,168,191,191,63,130,55,146,243,140,37,48,74,120,106,198,99,143,61,230,255,153,54,88,3,94,227)
+IMAGE_DATA(181,250,213,166,130,235,137,204,41,245,94,175,171,171,163,175,125,237,107,238,113,192,45,28,11,252,56,114,228,136,251,218)
+IMAGE_DATA(76,54,201,227,228,56,96,253,23,190,240,5,102,160,4,114,192,230,121,154,247,33,62,253,233,79,251,242,17,252,149,223)
+IMAGE_DATA(12,230,185,224,118,243,125,198,125,222,215,19,235,245,99,238,169,151,133,183,226,155,177,143,237,11,97,245,70,211,253,204)
+IMAGE_DATA(85,115,76,81,252,42,2,92,189,95,252,170,244,133,208,243,108,116,240,58,113,35,147,220,7,2,151,221,239,234,101,225)
+IMAGE_DATA(239,108,204,95,117,123,66,56,1,134,162,55,132,217,111,9,81,89,85,67,207,63,255,162,235,129,252,34,81,191,10,166)
+IMAGE_DATA(130,161,126,199,224,207,163,231,251,30,76,141,247,188,82,215,227,149,248,91,188,118,252,14,16,238,36,194,242,120,252,128)
+IMAGE_DATA(167,52,61,179,248,82,239,121,123,235,143,132,227,34,169,251,245,251,188,122,47,203,117,188,15,120,189,38,155,113,14,242)
+IMAGE_DATA(90,26,26,26,34,94,131,223,124,88,248,217,185,214,45,135,98,249,213,91,97,171,93,39,206,234,141,166,251,153,171,17)
+IMAGE_DATA(223,161,138,171,96,168,203,213,166,193,123,158,171,220,119,223,89,199,70,247,7,158,114,123,240,187,53,193,163,65,223,239)
+IMAGE_DATA(110,238,99,168,56,138,158,75,82,7,44,125,151,100,109,56,112,246,192,107,135,149,207,125,83,92,6,204,197,85,233,19)
+IMAGE_DATA(209,223,63,192,223,255,146,155,148,125,151,45,91,230,235,139,132,169,31,252,224,7,93,126,121,115,165,73,73,73,17,251)
+IMAGE_DATA(64,96,234,251,223,255,126,222,87,242,189,184,255,165,151,94,138,58,127,239,190,177,190,247,113,76,248,69,63,239,231,39)
+IMAGE_DATA(48,206,251,92,177,126,3,64,200,225,154,175,75,198,86,99,9,99,150,242,123,67,206,197,207,131,226,50,222,59,243,92)
+IMAGE_DATA(228,189,244,190,230,185,152,103,153,104,101,149,152,222,40,92,253,224,135,31,142,28,95,189,15,184,138,0,87,195,235,217)
+IMAGE_DATA(76,185,126,213,157,195,234,112,149,107,151,150,134,235,151,30,125,244,83,154,171,206,60,27,230,170,211,199,208,244,171,224)
+IMAGE_DATA(234,187,208,79,194,135,173,137,112,149,35,36,76,253,115,246,78,240,172,144,201,102,25,123,20,129,99,240,152,224,176,57)
+IMAGE_DATA(142,138,203,50,23,18,251,121,199,73,241,221,15,254,129,57,94,126,64,126,30,89,246,139,165,220,220,220,8,143,141,117)
+IMAGE_DATA(6,124,255,45,121,120,102,50,213,251,250,188,66,190,218,60,47,201,247,250,157,23,188,174,28,87,250,70,204,149,207,54)
+IMAGE_DATA(143,141,223,23,241,116,39,248,249,122,245,106,180,178,122,61,244,70,225,170,119,124,245,126,201,3,11,87,117,253,210,164)
+IMAGE_DATA(203,85,204,179,17,207,202,28,18,111,184,100,105,152,171,78,30,216,204,7,155,125,33,198,167,66,174,111,237,234,238,165)
+IMAGE_DATA(175,62,254,228,188,185,10,225,242,83,79,125,157,185,42,76,133,132,59,8,228,51,77,223,4,254,194,115,14,12,12,68)
+IMAGE_DATA(125,54,205,231,5,87,205,239,105,140,123,34,239,107,50,213,204,137,70,124,38,18,200,3,123,243,208,194,212,185,216,0)
+IMAGE_DATA(111,106,142,67,196,98,177,28,75,242,185,38,239,253,158,3,125,34,228,49,248,221,97,190,159,126,231,47,215,205,99,227)
+IMAGE_DATA(185,252,30,63,23,155,111,117,124,53,214,121,89,89,221,175,122,163,112,245,131,31,209,92,45,104,8,220,87,245,192,38)
+IMAGE_DATA(87,197,175,122,251,238,155,143,23,142,129,171,194,84,179,231,18,182,226,87,133,171,232,255,0,239,10,182,154,115,97,231)
+IMAGE_DATA(226,42,143,173,42,182,30,74,58,162,216,244,91,202,107,14,186,172,245,246,208,51,125,39,252,152,159,223,196,241,188,249)
+IMAGE_DATA(85,169,35,198,125,168,211,49,189,158,220,46,50,243,161,8,233,189,235,251,239,66,237,7,111,108,50,85,120,148,8,31)
+IMAGE_DATA(204,241,83,156,167,140,173,198,218,215,124,47,224,183,253,30,11,223,108,214,111,225,117,198,170,175,50,111,7,227,227,113)
+IMAGE_DATA(213,111,63,203,64,43,171,91,215,27,129,171,252,157,181,244,205,186,110,73,113,245,126,245,171,46,87,141,190,251,222,241)
+IMAGE_DATA(85,121,63,48,79,38,194,167,58,125,150,204,92,176,233,89,165,38,24,107,175,206,199,175,246,245,245,209,131,138,169,151)
+IMAGE_DATA(46,37,71,204,179,145,113,82,225,137,204,41,17,150,153,53,62,166,188,125,104,133,45,178,95,188,57,162,222,90,33,239)
+IMAGE_DATA(220,30,147,41,56,158,153,251,197,177,253,230,245,152,251,153,242,214,59,155,53,69,94,153,189,141,76,15,238,29,51,150)
+IMAGE_DATA(185,60,136,185,198,119,77,109,221,186,53,226,248,243,217,87,180,16,156,181,172,182,122,163,232,158,230,106,237,80,212,58)
+IMAGE_DATA(223,28,75,151,248,222,94,80,63,76,133,141,3,119,149,171,13,42,192,210,134,158,73,197,213,17,42,173,237,136,56,183)
+IMAGE_DATA(15,125,236,227,188,166,121,91,96,218,101,42,175,103,222,63,117,203,125,12,101,108,21,209,239,241,171,18,194,213,248,235)
+IMAGE_DATA(154,135,162,250,66,60,246,216,167,125,143,23,139,171,63,250,209,143,232,201,167,190,30,209,23,66,242,188,230,254,194,44)
+IMAGE_DATA(228,75,189,62,210,228,157,183,246,72,106,129,176,159,153,75,246,147,57,55,6,1,255,231,125,14,17,206,219,124,44,230)
+IMAGE_DATA(138,36,202,5,204,195,49,253,39,242,181,177,158,7,66,141,146,249,154,204,243,18,153,117,94,200,115,199,171,129,242,74)
+IMAGE_DATA(222,107,57,167,88,191,89,172,172,172,22,70,247,60,87,253,214,204,88,42,117,58,145,247,113,30,184,126,144,238,86,191)
+IMAGE_DATA(165,218,206,17,230,42,124,170,230,234,24,29,60,113,57,130,171,31,121,248,19,236,83,91,250,38,169,173,127,156,89,122)
+IMAGE_DATA(191,112,117,118,118,150,189,87,95,255,0,115,149,63,111,14,87,204,57,176,50,206,9,223,134,60,167,233,11,189,28,194)
+IMAGE_DATA(156,85,217,79,106,129,192,60,153,131,226,251,25,247,60,167,204,89,241,59,62,36,249,228,68,252,157,223,248,161,119,142)
+IMAGE_DATA(13,152,31,107,156,17,151,189,190,216,251,56,175,71,247,59,159,88,204,151,188,185,249,111,33,150,239,182,178,178,90,24)
+IMAGE_DATA(221,211,92,85,241,150,183,250,204,109,92,22,205,90,124,175,20,213,7,124,123,25,222,41,174,214,131,167,157,58,7,92)
+IMAGE_DATA(215,165,183,135,78,92,138,168,103,249,208,199,62,193,60,109,233,27,231,220,47,231,130,225,89,251,111,189,239,254,98,225)
+IMAGE_DATA(170,140,175,154,125,12,113,221,59,239,67,230,84,98,62,77,60,47,229,173,191,129,255,132,224,83,189,245,75,94,249,245)
+IMAGE_DATA(104,240,19,234,164,204,30,189,224,156,89,59,53,151,103,245,174,243,102,250,67,111,110,87,242,205,230,121,153,94,93,30)
+IMAGE_DATA(43,191,37,18,153,175,227,149,55,47,16,107,254,170,149,149,213,194,233,94,230,106,78,237,0,189,239,67,15,251,126,207)
+IMAGE_DATA(123,127,163,195,195,30,58,155,114,87,253,42,88,138,241,85,248,212,230,158,41,230,106,210,177,243,17,231,248,225,143,253)
+IMAGE_DATA(37,115,181,181,127,34,236,87,29,166,222,235,92,133,95,101,150,144,112,86,127,182,252,230,148,128,61,241,234,105,32,244)
+IMAGE_DATA(50,242,242,74,122,33,198,218,71,46,155,185,86,132,217,35,208,124,188,119,126,172,119,78,74,188,158,10,216,62,243,204)
+IMAGE_DATA(51,81,239,141,151,131,241,94,147,119,204,215,91,223,21,175,214,202,123,124,239,184,42,234,171,173,87,181,178,186,243,186)
+IMAGE_DATA(151,185,154,93,19,160,255,254,185,47,71,113,52,86,110,120,199,193,83,92,11,92,216,116,119,184,10,175,42,117,75,194)
+IMAGE_DATA(215,103,159,91,17,113,94,159,255,159,255,76,173,125,99,17,62,21,151,111,103,157,184,197,194,85,241,103,60,214,106,248)
+IMAGE_DATA(85,175,135,130,192,70,111,143,62,111,109,170,48,75,106,154,193,43,236,23,139,145,166,76,15,106,230,66,205,231,64,206)
+IMAGE_DATA(212,172,255,149,90,165,88,53,178,222,235,56,31,111,111,39,147,249,126,231,134,28,177,249,185,245,50,216,251,94,201,122)
+IMAGE_DATA(172,115,201,91,23,38,243,128,173,87,181,178,186,243,186,215,185,250,157,159,190,20,147,165,222,219,190,246,111,63,162,162)
+IMAGE_DATA(186,97,197,213,193,187,198,213,250,110,205,83,230,107,247,36,125,245,169,111,68,156,223,191,255,224,231,145,245,192,146,3)
+IMAGE_DATA(190,15,184,42,253,150,240,25,147,30,193,144,249,183,145,28,174,119,254,170,251,249,52,46,155,227,144,224,85,34,30,23)
+IMAGE_DATA(151,189,189,140,196,243,121,159,79,24,103,246,156,152,207,188,19,228,150,189,190,216,175,39,175,41,97,48,158,19,236,55)
+IMAGE_DATA(37,61,48,204,227,33,39,29,143,239,248,109,96,142,65,35,80,131,229,157,7,108,249,106,101,117,231,116,175,115,117,211)
+IMAGE_DATA(254,115,36,107,159,133,191,131,150,249,174,221,242,153,207,255,3,149,52,140,82,1,215,4,223,121,174,130,165,245,206,220)
+IMAGE_DATA(26,14,197,213,15,127,228,225,136,239,202,109,123,143,114,61,48,2,28,101,175,218,119,127,113,21,76,157,117,152,106,174)
+IMAGE_DATA(25,134,128,7,133,47,52,251,11,249,125,231,123,199,45,49,182,234,231,113,229,24,166,188,172,243,27,195,245,206,85,53)
+IMAGE_DATA(243,183,177,206,201,20,206,67,230,7,249,61,151,223,254,50,175,212,59,230,27,107,94,144,204,107,245,123,173,222,30,251)
+IMAGE_DATA(114,188,249,140,197,90,89,89,45,140,238,105,174,214,14,81,110,77,63,253,230,91,30,136,236,89,238,225,234,50,231,242)
+IMAGE_DATA(239,252,222,187,168,8,189,12,239,170,95,29,115,231,173,22,85,119,145,185,254,41,206,57,51,191,218,245,170,24,99,229)
+IMAGE_DATA(241,213,222,251,35,15,28,209,31,216,201,3,123,199,86,193,130,68,230,83,122,199,33,177,143,159,87,245,147,183,207,191)
+IMAGE_DATA(223,24,163,55,111,234,245,180,238,191,151,24,124,197,115,224,24,222,249,57,241,184,230,229,38,198,67,77,225,28,252,122)
+IMAGE_DATA(103,224,252,193,113,89,163,78,126,15,72,223,42,220,110,121,106,101,245,250,233,94,230,106,78,205,144,98,235,0,253,245)
+IMAGE_DATA(231,254,39,115,244,77,194,44,99,254,234,82,241,175,14,111,15,157,73,215,92,21,182,170,109,113,243,80,4,91,153,175)
+IMAGE_DATA(205,163,9,113,21,239,147,31,87,193,84,204,177,225,173,51,190,186,109,215,161,8,174,254,238,239,63,68,109,189,99,204)
+IMAGE_DATA(83,212,3,183,5,194,185,96,225,42,152,122,55,184,106,246,49,148,158,16,11,195,85,114,235,129,33,124,239,155,172,16)
+IMAGE_DATA(175,58,151,31,244,122,78,212,224,36,50,214,152,72,175,33,200,236,185,16,203,211,242,191,23,31,206,130,99,50,142,106)
+IMAGE_DATA(50,60,222,218,119,144,119,94,169,151,247,222,115,242,254,62,192,117,28,3,181,85,152,107,52,215,121,90,89,89,221,29)
+IMAGE_DATA(221,219,92,29,161,220,218,97,122,121,211,190,40,31,232,247,221,143,219,255,241,43,223,160,194,134,49,199,171,234,254,16)
+IMAGE_DATA(197,77,35,28,165,45,99,236,87,17,165,173,115,251,85,188,71,96,107,109,231,132,195,215,48,87,235,59,156,57,54,93)
+IMAGE_DATA(206,216,106,207,40,125,234,191,127,54,226,124,190,250,181,111,83,171,186,189,181,127,138,217,234,246,133,184,75,92,141,234)
+IMAGE_DATA(13,236,233,183,180,16,92,13,138,87,37,189,70,156,119,191,185,60,167,240,192,203,20,191,53,194,253,216,225,173,239,245)
+IMAGE_DATA(235,199,228,237,111,24,203,211,250,9,220,150,223,6,222,57,51,178,38,77,44,198,153,121,103,63,6,123,63,187,56,119)
+IMAGE_DATA(228,209,49,134,26,43,55,61,87,189,178,149,149,213,157,215,189,205,85,229,87,171,135,41,183,110,144,254,175,223,123,103)
+IMAGE_DATA(212,188,26,243,59,137,251,205,171,219,126,243,173,111,161,180,226,182,136,158,75,240,169,194,87,97,107,121,203,112,194,126)
+IMAGE_DATA(181,186,125,140,34,251,65,56,126,181,83,247,46,68,164,230,86,120,198,124,151,209,197,235,217,60,174,138,158,16,50,207)
+IMAGE_DATA(70,234,129,193,210,59,201,213,79,62,250,72,84,14,216,187,78,220,66,204,179,129,100,124,213,219,111,1,145,72,45,111)
+IMAGE_DATA(188,57,161,126,251,197,170,117,138,149,151,245,230,166,177,222,120,188,243,49,159,7,99,158,146,199,54,95,31,62,115,200)
+IMAGE_DATA(93,123,31,47,199,20,150,123,25,44,143,51,215,2,151,240,123,125,137,156,163,149,149,213,221,213,189,204,213,172,154,0)
+IMAGE_DATA(229,41,191,138,121,172,191,120,121,147,231,123,104,89,68,29,211,82,131,181,95,255,206,211,92,191,196,253,33,154,6,153)
+IMAGE_DATA(171,37,141,131,110,254,87,114,193,137,248,213,170,182,97,246,171,96,169,246,174,122,222,42,251,213,174,81,30,95,109,238)
+IMAGE_DATA(154,164,47,252,253,63,69,124,231,190,231,143,255,132,90,122,198,20,87,39,93,191,106,114,85,230,175,222,9,174,226,249)
+IMAGE_DATA(193,85,241,169,210,123,95,252,234,66,113,149,199,86,103,67,174,95,197,216,163,223,218,112,241,122,190,227,178,151,199,137)
+IMAGE_DATA(246,234,245,230,128,197,19,122,143,239,205,77,199,235,49,108,238,139,252,43,230,213,200,185,128,141,241,250,26,153,191,33)
+IMAGE_DATA(188,62,218,188,15,242,246,12,158,107,77,240,185,88,107,249,106,101,117,247,116,47,115,21,117,75,57,181,253,148,91,51)
+IMAGE_DATA(192,222,245,253,31,254,132,79,95,224,48,95,101,13,209,183,60,240,86,186,144,90,76,5,141,218,167,150,184,181,75,131)
+IMAGE_DATA(14,79,199,18,226,170,89,183,132,45,120,138,247,77,184,90,215,163,25,123,248,248,37,247,92,196,75,175,92,183,141,125)
+IMAGE_DATA(106,115,175,174,87,226,30,193,224,170,209,35,248,118,185,58,56,54,19,197,85,119,93,243,24,125,247,23,186,47,4,36)
+IMAGE_DATA(117,75,24,19,53,207,193,175,71,146,31,191,188,189,22,164,207,146,247,113,222,219,188,117,65,126,243,102,112,155,153,143)
+IMAGE_DATA(197,185,249,213,24,123,159,11,61,124,189,60,20,111,140,99,120,25,46,235,198,137,204,53,210,113,59,114,228,230,241,189)
+IMAGE_DATA(231,110,250,213,88,175,61,17,118,90,190,90,89,221,121,221,203,92,205,170,25,230,186,165,188,186,17,197,214,33,58,112)
+IMAGE_DATA(58,149,222,242,214,183,69,228,129,195,235,113,135,61,43,182,15,189,231,189,148,86,220,162,153,218,56,230,212,44,13,113)
+IMAGE_DATA(14,152,235,152,18,24,95,53,185,26,30,107,13,251,85,108,83,243,202,157,115,210,53,202,200,71,127,228,163,31,167,150)
+IMAGE_DATA(222,105,135,169,83,209,235,217,4,38,22,108,124,53,160,216,234,29,111,150,245,108,188,227,171,236,91,239,64,221,18,46)
+IMAGE_DATA(163,71,176,247,60,188,189,25,220,207,164,231,58,24,101,238,139,28,234,92,251,224,58,214,252,54,159,207,219,207,30,115)
+IMAGE_DATA(58,205,158,193,242,184,185,252,30,214,232,65,31,99,179,142,217,235,141,189,99,171,120,172,185,6,171,249,88,115,140,89)
+IMAGE_DATA(114,197,222,245,88,253,252,175,119,31,191,247,65,158,59,145,124,187,149,149,213,194,232,94,230,170,174,7,30,225,60,112)
+IMAGE_DATA(126,221,16,111,159,93,177,145,215,132,243,251,238,119,125,171,195,215,135,222,243,62,202,42,110,82,76,213,117,75,224,41)
+IMAGE_DATA(56,58,223,186,37,169,7,22,166,74,221,82,113,117,27,253,63,127,242,167,17,207,15,198,102,228,85,81,147,242,170,218)
+IMAGE_DATA(175,142,105,175,106,246,91,82,190,181,51,176,240,117,75,38,59,222,245,208,187,35,214,53,191,115,243,108,180,87,221,188)
+IMAGE_DATA(101,91,196,57,224,187,62,17,191,229,237,141,224,237,89,104,238,231,221,223,236,99,228,183,31,198,81,205,190,12,177,124)
+IMAGE_DATA(161,87,232,99,140,30,14,38,231,188,61,3,77,142,73,111,98,25,219,245,246,209,247,230,157,49,182,106,214,2,203,185)
+IMAGE_DATA(197,242,209,241,132,243,48,251,77,88,166,90,89,221,121,221,203,92,69,228,214,5,152,175,168,93,194,101,120,215,95,45)
+IMAGE_DATA(223,24,149,11,22,15,43,243,110,132,173,127,164,124,235,197,180,50,102,42,243,180,105,40,225,60,176,201,85,111,61,240)
+IMAGE_DATA(254,99,87,232,173,15,60,72,102,143,10,204,243,121,101,205,86,106,84,62,21,99,171,224,42,182,97,191,58,21,206,1)
+IMAGE_DATA(247,221,217,122,96,156,83,107,71,175,111,61,176,172,107,190,144,92,197,90,113,38,187,146,146,146,194,159,65,159,177,65)
+IMAGE_DATA(179,223,1,30,191,108,153,254,27,98,76,51,145,113,70,47,187,144,75,54,125,29,142,139,252,47,206,195,219,255,50,158)
+IMAGE_DATA(240,123,0,30,87,214,92,55,253,168,121,12,97,174,244,155,48,251,12,123,199,86,205,121,70,200,7,227,241,168,121,242)
+IMAGE_DATA(122,86,191,223,34,241,222,3,156,99,162,243,152,172,172,172,22,70,225,239,48,98,192,154,255,242,234,218,71,153,95,105)
+IMAGE_DATA(21,125,243,226,101,34,145,24,83,29,174,58,76,53,67,188,170,68,94,173,238,193,31,102,107,31,253,124,185,248,135,101)
+IMAGE_DATA(100,206,193,137,200,17,59,215,127,227,129,183,211,215,191,251,12,101,150,54,51,79,225,93,75,60,245,192,149,138,163,178)
+IMAGE_DATA(213,57,224,49,39,15,60,198,117,75,213,96,171,218,22,86,183,210,223,125,233,31,35,158,71,247,165,88,70,47,175,221)
+IMAGE_DATA(202,253,33,208,131,95,122,44,201,248,42,207,95,117,122,45,233,60,176,94,223,166,115,96,154,122,212,245,191,248,203,71)
+IMAGE_DATA(162,95,143,58,110,223,208,132,98,234,44,115,149,243,190,96,43,115,117,146,175,15,141,78,209,39,31,241,178,80,31,227)
+IMAGE_DATA(151,207,47,119,230,176,42,158,78,105,150,78,76,78,83,69,101,53,125,238,243,95,164,202,170,58,230,234,196,52,209,196)
+IMAGE_DATA(140,102,236,163,190,92,93,198,76,157,49,216,138,173,219,199,80,133,217,159,23,57,212,68,191,231,189,243,86,227,245,59)
+IMAGE_DATA(48,185,25,143,93,200,7,131,55,96,171,183,62,72,242,204,126,18,118,154,243,102,229,152,102,79,96,115,206,12,216,8)
+IMAGE_DATA(239,105,246,17,244,242,210,20,238,147,252,178,247,53,120,215,214,49,159,223,251,126,10,83,197,11,91,174,90,89,189,14)
+IMAGE_DATA(138,201,85,205,193,180,114,39,230,225,87,231,195,213,104,166,106,174,154,108,133,87,21,159,170,231,216,12,242,252,85,246)
+IMAGE_DATA(171,106,203,161,216,138,156,112,65,109,128,182,190,118,150,254,143,7,140,222,116,188,126,220,50,90,182,228,127,139,240,177)
+IMAGE_DATA(203,28,31,139,190,77,95,254,234,55,233,200,133,84,230,106,133,138,74,246,169,163,14,95,71,21,87,199,34,198,87,171)
+IMAGE_DATA(218,117,63,136,141,187,14,209,23,190,248,143,122,221,87,211,19,171,128,111,5,83,177,174,57,188,42,230,178,114,29,112)
+IMAGE_DATA(47,252,234,4,111,221,177,85,206,5,79,115,72,77,112,119,96,148,222,246,224,59,34,56,38,126,251,106,74,22,123,214)
+IMAGE_DATA(158,17,237,87,251,92,175,58,233,122,214,127,255,238,15,121,156,217,59,190,137,99,158,57,123,209,205,5,119,118,245,209)
+IMAGE_DATA(175,158,123,158,222,254,142,223,166,7,223,254,91,124,29,44,69,104,191,58,27,238,237,227,97,81,78,78,30,77,207,4)
+IMAGE_DATA(93,166,154,253,150,176,206,183,249,216,39,158,120,34,225,143,165,140,173,250,213,2,185,31,93,31,102,152,236,50,107,145)
+IMAGE_DATA(224,31,145,199,53,215,75,243,114,21,117,81,230,49,177,143,28,47,86,15,68,115,127,112,20,183,73,47,36,47,167,189)
+IMAGE_DATA(253,18,197,219,130,167,210,31,31,242,142,217,34,18,89,207,70,120,156,72,31,43,43,43,171,59,167,240,247,72,144,3)
+IMAGE_DATA(185,205,88,121,224,148,219,140,84,197,209,84,230,105,127,68,8,71,163,120,90,51,104,68,128,35,219,217,138,79,197,54)
+IMAGE_DATA(7,126,181,126,200,101,43,46,95,47,104,230,94,16,203,150,201,184,234,155,35,250,49,185,124,69,125,19,135,190,254,192)
+IMAGE_DATA(91,222,70,31,252,232,95,42,206,126,157,190,245,189,159,209,143,159,93,65,251,146,206,209,198,29,7,233,155,223,253,49)
+IMAGE_DATA(253,235,247,127,170,124,233,63,209,71,62,250,9,135,213,154,217,186,78,42,204,84,172,3,119,246,106,134,94,43,78,49)
+IMAGE_DATA(85,199,152,27,96,169,158,195,234,244,91,146,58,224,192,56,117,247,143,83,118,81,21,253,211,87,158,212,231,188,212,224)
+IMAGE_DATA(42,88,163,46,255,215,247,126,128,174,165,102,83,255,240,164,206,1,59,1,174,246,59,53,193,55,82,179,220,223,16,126)
+IMAGE_DATA(53,76,127,240,174,135,28,31,170,115,214,96,106,70,102,54,141,79,133,220,26,38,120,215,199,159,120,42,236,151,61,253)
+IMAGE_DATA(151,223,247,190,247,41,182,230,112,13,112,48,162,47,68,48,162,182,21,207,135,235,137,248,39,47,175,204,57,158,115,125)
+IMAGE_DATA(150,189,189,138,192,24,140,129,190,235,93,239,138,226,166,119,142,171,244,96,144,94,129,194,193,109,219,182,249,62,159,153)
+IMAGE_DATA(115,246,190,191,126,28,246,62,6,156,199,249,194,199,123,25,108,122,86,115,173,2,63,79,45,107,230,205,231,189,178,178)
+IMAGE_DATA(178,90,88,241,119,75,212,215,91,152,171,240,140,177,188,233,237,248,213,196,61,107,116,30,216,100,44,252,42,114,192,18)
+IMAGE_DATA(96,41,230,179,230,215,141,240,101,172,93,83,220,48,196,151,207,222,44,163,255,241,133,127,164,183,190,245,173,198,92,214)
+IMAGE_DATA(101,20,57,207,53,204,46,237,145,162,115,167,17,223,157,62,235,167,75,188,243,157,239,164,21,107,182,80,99,231,40,247)
+IMAGE_DATA(219,71,207,37,120,211,166,174,17,106,238,214,28,213,53,193,163,186,55,48,60,107,64,123,213,78,197,217,207,124,246,239)
+IMAGE_DATA(60,207,29,253,189,189,212,115,253,207,222,247,1,42,40,173,84,158,21,243,107,102,93,174,14,142,77,209,63,127,245,241)
+IMAGE_DATA(168,243,93,234,61,166,122,189,239,126,232,143,152,169,122,124,117,134,30,127,252,73,197,149,223,138,201,13,191,248,192,7)
+IMAGE_DATA(254,156,106,235,26,92,191,42,249,83,9,140,33,38,34,140,125,154,251,121,231,120,70,124,142,61,151,189,92,149,64,141)
+IMAGE_DATA(176,87,126,115,90,188,156,5,147,253,124,178,244,49,52,223,27,108,49,6,27,171,119,133,217,207,87,158,3,76,149,122)
+IMAGE_DATA(101,239,243,96,126,146,223,251,142,215,8,198,154,222,92,242,219,177,206,213,239,248,86,86,86,11,175,144,226,104,40,124)
+IMAGE_DATA(133,47,215,182,141,232,252,239,2,48,244,78,69,74,197,0,159,219,205,242,126,119,11,31,44,151,145,183,78,45,83,143)
+IMAGE_DATA(85,140,102,110,87,14,209,229,156,102,250,233,139,27,232,225,199,254,90,49,246,109,145,223,85,203,150,58,190,48,92,55)
+IMAGE_DATA(28,143,35,222,251,30,120,224,65,250,236,231,254,158,214,41,79,139,126,77,200,25,151,183,143,234,49,217,246,113,30,139)
+IMAGE_DATA(149,250,166,26,167,151,4,114,195,210,71,88,60,109,105,117,59,189,245,237,191,237,50,245,79,255,235,159,241,248,234,39)
+IMAGE_DATA(254,226,81,181,125,140,30,254,228,99,124,29,151,121,220,213,245,178,203,232,232,137,179,212,171,188,171,212,51,245,13,234)
+IMAGE_DATA(188,112,99,75,167,51,206,106,142,55,47,139,136,239,125,255,105,106,239,232,113,107,153,58,58,187,21,31,222,225,62,30)
+IMAGE_DATA(223,227,143,62,250,40,175,67,134,239,114,212,48,133,47,63,102,188,39,203,232,226,165,100,230,42,252,171,249,189,111,174)
+IMAGE_DATA(7,55,151,80,235,99,242,66,120,156,72,223,3,239,218,46,8,169,93,242,147,159,103,69,192,75,198,26,111,21,121,251)
+IMAGE_DATA(53,249,213,53,153,207,11,191,108,62,15,222,215,120,207,33,57,229,185,126,207,224,184,200,185,123,223,23,219,39,194,202)
+IMAGE_DATA(234,238,41,20,210,243,246,67,20,140,184,29,245,155,232,91,91,80,63,172,199,42,213,246,78,4,250,29,205,39,204,53)
+IMAGE_DATA(104,16,88,163,60,124,121,136,235,141,184,31,97,243,16,7,122,41,185,253,126,157,190,250,186,22,73,247,41,172,108,25)
+IMAGE_DATA(165,147,151,178,232,249,87,55,209,191,60,241,77,250,208,135,31,166,143,126,228,47,72,242,184,146,211,245,251,14,3,147)
+IMAGE_DATA(63,242,209,191,160,207,127,233,203,244,157,31,252,132,14,158,188,196,92,108,232,153,228,173,174,247,29,119,235,125,185,183)
+IMAGE_DATA(82,191,211,3,162,95,247,128,224,26,37,245,152,206,254,41,174,79,226,57,171,42,186,2,211,212,171,182,221,131,211,212)
+IMAGE_DATA(53,164,182,195,83,122,12,213,8,48,19,249,94,25,83,229,220,239,200,44,199,208,248,44,251,212,225,177,105,21,179,78)
+IMAGE_DATA(76,211,216,248,52,173,223,176,133,62,247,119,95,162,119,191,251,15,153,153,143,60,242,24,61,247,235,23,168,178,170,134)
+IMAGE_DATA(38,38,103,57,164,30,216,172,3,198,216,42,198,79,195,65,92,3,172,99,214,205,249,206,204,204,232,26,96,99,93,243)
+IMAGE_DATA(218,218,90,174,15,66,36,234,85,33,60,22,251,96,222,73,162,253,122,205,90,88,169,149,2,147,204,117,232,252,30,143)
+IMAGE_DATA(122,32,140,251,162,254,8,12,199,62,126,125,253,253,122,67,161,95,47,216,136,128,119,157,107,173,83,248,82,201,251,98)
+IMAGE_DATA(78,171,249,218,226,245,201,192,107,192,121,153,94,92,214,175,145,158,193,230,126,150,157,86,86,175,159,148,171,208,23,240)
+IMAGE_DATA(125,232,56,215,160,239,63,201,160,19,139,71,81,223,29,62,231,109,62,68,126,75,196,218,63,100,68,228,99,130,158,136)
+IMAGE_DATA(220,223,255,59,44,24,245,252,17,247,69,156,87,40,252,120,121,126,239,253,230,31,37,238,223,39,232,230,29,188,175,199)
+IMAGE_DATA(28,71,55,207,217,200,88,208,108,40,24,115,254,149,159,188,57,198,185,252,209,66,127,223,39,82,199,52,215,115,198,251)
+IMAGE_DATA(59,222,238,125,183,242,156,177,142,19,143,187,137,202,242,214,202,234,206,139,255,149,5,245,255,248,59,216,248,142,95,220)
+IMAGE_DATA(210,12,193,239,130,144,203,176,104,246,132,220,199,198,151,126,237,179,9,61,54,230,49,204,239,64,35,188,231,236,187,31)
+IMAGE_DATA(191,237,33,207,227,124,30,27,117,76,50,94,107,208,184,63,30,215,231,58,255,96,140,219,19,217,119,126,251,37,114,188)
+IMAGE_DATA(133,98,65,34,115,95,19,125,62,63,239,122,167,20,207,127,198,122,223,231,243,120,43,43,43,43,171,197,37,251,93,237)
+IMAGE_DATA(175,249,190,47,183,195,104,251,55,176,178,178,178,178,178,178,178,178,178,178,178,178,178,178,178,178,178,178,178,178,178,178)
+IMAGE_DATA(178,178,178,178,178,178,178,178,178,178,178,178,178,178,178,178,178,178,178,178,178,178,178,178,178,178,178,178,178,178,178,178)
+IMAGE_DATA(178,178,178,178,178,178,178,178,178,178,178,178,178,178,178,178,178,178,178,178,178,178,178,178,178,178,178,178,178,178,178,178)
+IMAGE_DATA(178,178,178,178,178,178,178,178,178,178,178,178,178,178,178,178,178,178,178,178,178,178,178,178,186,95,149,232,122,212,119,98)
+IMAGE_DATA(157,105,43,43,43,43,43,171,251,81,254,156,12,58,97,101,101,101,101,101,101,149,136,98,249,206,185,252,232,220,126,213)
+IMAGE_DATA(242,216,202,202,202,202,234,141,169,249,231,116,173,143,181,178,178,178,178,178,178,178,178,178,178,178,178,186,187,10,42,235)
+IMAGE_DATA(58,50,58,78,163,147,51,52,51,51,67,193,160,191,47,213,30,215,122,86,43,43,43,43,43,171,88,154,85,152,236,31)
+IMAGE_DATA(26,165,186,230,118,234,25,24,161,238,190,33,234,234,29,164,238,254,65,190,125,120,100,130,198,198,39,105,122,38,200,252)
+IMAGE_DATA(13,82,136,64,87,91,25,108,101,101,101,101,101,21,169,137,201,105,10,12,143,81,223,208,24,85,55,117,80,81,101,61)
+IMAGE_DATA(117,244,143,80,91,239,16,181,246,12,82,135,218,182,117,15,68,68,95,255,16,13,170,199,131,181,147,83,240,182,225,227)
+IMAGE_DATA(217,121,56,86,86,86,86,86,111,84,77,207,16,13,141,78,81,191,226,42,124,106,173,226,106,113,69,13,85,213,183,50)
+IMAGE_DATA(79,219,21,87,37,90,187,2,212,210,217,207,91,137,118,135,187,240,183,189,129,17,234,31,28,163,193,145,73,102,245,212)
+IMAGE_DATA(244,44,121,17,123,87,114,200,22,235,86,86,86,86,86,175,147,166,166,67,204,193,190,161,81,234,14,12,83,77,99,59)
+IMAGE_DATA(21,148,86,82,9,60,171,226,165,120,85,97,170,4,174,227,118,225,42,162,179,103,64,231,142,251,134,220,232,87,199,28)
+IMAGE_DATA(24,28,165,145,209,73,26,159,152,225,231,155,157,23,86,131,158,240,243,195,182,70,217,202,202,202,202,106,113,8,158,18)
+IMAGE_DATA(126,85,184,10,191,10,174,230,151,84,49,51,193,78,112,180,185,163,47,34,76,175,218,217,55,236,176,85,113,181,127,136)
+IMAGE_DATA(143,211,51,48,198,209,27,24,163,190,129,113,229,99,39,40,48,48,74,125,253,195,138,181,35,204,90,228,145,71,225,109)
+IMAGE_DATA(199,103,104,90,157,71,140,50,41,131,163,145,124,141,188,111,225,100,243,216,86,86,86,86,86,183,42,112,117,112,116,130)
+IMAGE_DATA(122,7,71,152,137,224,42,152,42,92,53,153,106,122,85,63,174,226,122,103,223,32,115,181,59,48,202,209,211,63,202,108)
+IMAGE_DATA(13,4,198,221,24,28,152,160,254,254,49,142,190,190,81,234,231,24,102,230,130,189,154,183,83,154,183,51,193,5,239,171)
+IMAGE_DATA(104,169,105,101,101,101,101,117,167,132,154,163,254,225,113,234,82,92,69,141,18,242,192,249,37,21,148,87,92,201,12,109)
+IMAGE_DATA(106,239,141,226,169,212,46,9,83,195,126,53,242,122,103,15,114,193,35,204,78,230,167,226,104,64,197,0,248,10,174,246)
+IMAGE_DATA(142,83,95,143,222,6,250,38,56,192,216,222,222,17,234,81,199,239,234,26,116,163,187,123,72,237,51,194,117,201,200,39)
+IMAGE_DATA(207,4,167,21,79,103,95,239,183,207,202,202,202,202,202,74,203,49,109,99,83,211,202,171,142,114,253,111,179,226,87,101)
+IMAGE_DATA(67,7,115,53,167,176,60,194,167,154,227,169,166,79,237,234,215,62,87,194,100,108,71,183,98,98,239,176,203,86,246,168)
+IMAGE_DATA(96,172,226,230,64,183,142,64,151,242,168,93,163,28,253,96,172,138,222,174,17,234,108,87,199,105,27,162,182,182,128,27)
+IMAGE_DATA(173,173,138,239,45,234,156,154,123,169,161,161,135,183,157,157,67,124,236,33,245,219,96,124,98,74,241,118,54,142,31,141)
+IMAGE_DATA(206,35,91,89,89,89,89,89,45,136,28,248,160,7,68,103,96,148,90,20,255,26,58,7,169,188,174,77,121,213,114,230)
+IMAGE_DATA(42,188,170,201,86,157,231,29,118,35,60,150,58,162,231,188,6,244,237,46,123,13,174,34,31,220,231,48,181,183,103,152)
+IMAGE_DATA(250,186,135,169,95,49,17,161,217,58,236,112,118,148,122,58,21,83,91,6,169,165,169,159,26,235,123,84,168,243,104,84)
+IMAGE_DATA(222,185,161,143,121,90,95,223,237,110,235,235,122,168,174,182,155,106,234,186,169,86,93,175,83,183,55,52,245,81,71,103)
+IMAGE_DATA(31,245,246,13,177,191,69,173,148,119,174,173,29,67,181,178,178,178,178,90,80,133,52,91,70,38,166,169,181,71,51,181)
+IMAGE_DATA(182,173,95,113,53,236,87,27,90,187,153,169,224,43,252,42,60,40,252,41,143,155,42,142,194,231,34,132,169,224,44,106)
+IMAGE_DATA(151,152,191,61,218,175,98,139,188,174,27,234,185,16,156,3,238,214,30,53,236,91,181,119,237,109,87,207,163,184,218,10)
+IMAGE_DATA(150,42,110,54,213,41,127,170,182,181,213,157,84,93,217,78,149,21,109,84,89,222,74,21,42,202,203,90,120,139,219,42)
+IMAGE_DATA(170,212,125,213,29,28,85,53,234,177,181,93,84,85,215,69,213,245,93,84,223,164,94,139,122,125,200,39,15,12,76,208)
+IMAGE_DATA(196,196,4,205,206,250,231,145,45,115,173,172,172,172,172,230,45,70,71,144,70,199,166,169,65,177,172,166,165,159,170,148)
+IMAGE_DATA(63,44,173,195,60,155,106,202,45,170,160,250,150,46,106,108,235,113,199,88,205,122,95,244,144,64,96,108,22,108,53,243)
+IMAGE_DATA(192,96,105,56,70,120,219,3,158,42,174,246,57,209,175,110,239,237,26,226,237,64,247,152,206,3,119,170,251,58,134,153)
+IMAGE_DATA(171,157,173,67,212,214,20,160,22,229,81,225,83,193,212,42,197,206,170,114,197,205,178,118,170,40,109,163,178,226,22,42)
+IMAGE_DATA(45,106,166,162,66,29,133,5,77,58,138,90,168,164,180,157,163,188,178,131,42,170,187,56,42,107,21,107,149,167,173,109)
+IMAGE_DATA(236,117,163,65,189,238,150,246,0,159,99,96,104,156,231,221,98,30,144,144,213,203,216,91,97,46,246,153,223,126,70,173)
+IMAGE_DATA(86,40,222,115,6,35,31,107,204,67,186,213,223,6,216,15,181,217,35,195,19,52,16,24,161,158,206,0,93,203,168,166)
+IMAGE_DATA(226,170,46,158,159,60,62,29,126,115,124,235,201,162,98,158,121,247,4,154,120,217,159,61,86,86,86,139,85,248,122,194)
+IMAGE_DATA(28,155,170,150,0,85,54,247,82,69,67,47,21,87,183,81,158,195,85,248,85,179,102,169,189,39,224,214,251,162,255,195)
+IMAGE_DATA(128,250,238,197,220,87,97,43,215,1,247,141,112,192,171,138,95,117,199,87,141,60,48,114,189,221,29,67,28,184,12,166)
+IMAGE_DATA(154,92,69,30,88,184,10,175,90,83,213,17,197,84,225,106,177,226,40,2,76,45,200,111,164,124,181,69,228,25,151,243)
+IMAGE_DATA(213,227,10,212,227,139,213,254,165,21,157,84,81,211,238,120,217,110,142,138,154,14,42,175,110,119,61,47,242,201,173,29)
+IMAGE_DATA(3,156,199,70,125,50,120,43,156,8,197,226,132,9,148,184,10,122,30,22,125,60,239,33,194,207,27,116,235,181,110,149)
+IMAGE_DATA(249,120,28,188,250,228,228,36,141,142,162,62,123,148,235,196,218,91,3,212,220,216,71,245,202,231,215,41,191,95,171,222)
+IMAGE_DATA(135,26,245,123,102,219,107,41,180,243,104,38,157,190,90,76,103,111,150,209,205,252,122,42,168,106,161,218,150,62,206,239)
+IMAGE_DATA(79,77,205,68,189,190,40,192,198,59,31,242,231,176,93,23,216,202,202,234,94,19,190,181,192,197,210,186,94,42,83,28)
+IMAGE_DATA(193,182,80,177,37,183,164,134,185,10,175,106,246,46,20,174,34,239,11,166,130,201,216,31,129,235,125,3,163,236,105,192)
+IMAGE_DATA(81,240,72,152,42,115,106,2,82,183,212,29,230,106,87,251,32,7,174,163,94,137,57,219,54,200,126,181,189,121,128,154)
+IMAGE_DATA(235,123,169,94,121,77,206,255,42,38,150,151,180,186,60,69,148,20,54,69,249,85,240,180,48,191,69,241,52,28,121,133)
+IMAGE_DATA(45,148,91,208,76,185,234,246,156,188,102,190,156,95,212,74,133,37,237,84,84,138,220,119,59,229,151,182,82,65,89,27)
+IMAGE_DATA(21,150,107,246,150,40,142,23,170,231,3,147,243,139,26,169,168,172,73,121,222,14,106,84,252,233,85,239,3,214,40,152)
+IMAGE_DATA(153,13,205,127,222,206,237,250,45,39,215,16,173,112,93,22,152,52,53,53,69,227,227,147,52,172,124,248,64,96,84,255)
+IMAGE_DATA(158,81,239,113,23,222,247,174,97,234,232,24,164,246,246,1,234,104,27,160,214,230,62,197,212,30,30,207,110,192,88,53)
+IMAGE_DATA(114,233,21,205,234,125,111,163,53,219,47,210,171,219,146,105,103,82,58,237,63,145,75,71,206,21,209,201,228,98,197,217)
+IMAGE_DATA(82,58,119,163,130,46,165,85,81,134,250,59,20,170,199,86,53,118,83,107,231,160,254,29,18,135,243,17,247,121,46,198)
+IMAGE_DATA(218,203,230,231,173,172,172,22,187,224,128,192,196,162,234,30,42,174,233,86,17,230,42,230,217,192,175,134,235,127,7,92)
+IMAGE_DATA(175,138,124,233,192,200,56,13,141,77,114,12,143,107,190,194,195,106,182,142,177,143,145,122,37,102,106,96,156,231,215,12)
+IMAGE_DATA(244,141,57,57,224,145,8,182,226,178,92,7,87,187,29,174,98,108,181,174,170,147,106,42,218,169,90,113,14,94,85,120)
+IMAGE_DATA(202,76,205,215,30,85,152,10,190,22,56,140,5,79,11,10,91,57,132,173,225,104,98,182,102,231,53,82,86,78,35,165)
+IMAGE_DATA(101,215,83,74,102,61,221,204,168,227,192,245,140,220,6,142,180,156,26,74,207,173,165,76,229,211,178,213,62,57,106,127)
+IMAGE_DATA(120,95,68,97,137,226,123,101,43,85,215,118,82,75,123,31,191,126,140,89,179,165,244,246,112,36,195,119,198,241,115,124)
+IMAGE_DATA(211,156,243,115,131,156,15,13,170,231,25,31,155,166,161,193,113,254,205,210,217,17,96,62,214,213,116,41,143,223,78,117)
+IMAGE_DATA(202,147,55,53,245,49,55,219,90,250,21,75,213,111,163,206,129,8,174,162,214,26,181,213,141,138,137,13,117,157,106,223)
+IMAGE_DATA(118,230,42,162,184,168,137,94,92,123,146,94,216,112,158,86,109,191,66,235,246,222,164,13,123,83,104,203,107,25,180,227)
+IMAGE_DATA(72,22,237,57,145,67,251,78,229,209,145,11,197,116,252,114,137,226,109,161,98,109,153,138,18,186,146,85,69,217,234,253)
+IMAGE_DATA(169,80,231,208,220,30,160,33,245,219,203,31,141,65,243,13,114,127,55,152,243,168,44,83,173,172,172,22,191,244,119,217)
+IMAGE_DATA(176,226,97,65,101,23,229,43,127,150,87,133,173,30,95,69,95,8,140,175,202,156,26,25,87,5,59,225,83,133,169,96)
+IMAGE_DATA(8,2,151,225,89,193,92,60,6,108,229,94,75,206,220,213,1,15,87,101,60,213,204,7,131,175,157,202,59,161,102,73)
+IMAGE_DATA(242,192,224,170,212,43,85,25,92,45,202,111,224,40,84,92,4,87,133,173,194,213,2,229,73,243,242,155,153,167,133,69)
+IMAGE_DATA(109,46,95,113,89,95,111,163,188,130,86,246,174,224,106,70,22,184,90,171,152,90,67,55,210,171,233,122,90,13,93,185)
+IMAGE_DATA(81,77,151,174,87,170,168,166,139,215,42,232,252,149,50,117,185,156,174,166,85,210,245,140,106,74,201,174,165,244,188,58)
+IMAGE_DATA(202,80,188,205,42,104,160,236,194,70,55,242,74,154,168,76,177,173,30,60,83,254,13,253,46,166,38,13,126,36,144,207)
+IMAGE_DATA(140,234,173,108,92,158,156,8,186,190,18,1,142,34,112,27,242,230,146,199,69,205,52,152,137,57,74,224,39,230,37,161)
+IMAGE_DATA(118,171,171,59,192,53,211,237,237,152,187,212,163,216,219,195,92,5,83,107,170,212,239,132,106,21,149,45,234,189,169,166)
+IMAGE_DATA(95,188,114,72,113,245,52,189,178,61,153,94,221,113,133,86,237,188,74,171,118,95,163,181,123,110,112,128,181,235,15,164)
+IMAGE_DATA(210,166,67,105,180,37,41,149,182,31,78,167,61,71,179,232,181,211,121,148,116,46,159,142,93,44,160,19,151,139,232,212)
+IMAGE_DATA(165,60,186,146,94,65,57,200,227,215,192,247,247,241,239,51,157,21,143,49,7,42,24,114,222,139,240,24,178,157,183,108)
+IMAGE_DATA(101,101,181,56,165,191,191,70,199,166,52,83,203,58,41,167,162,131,253,133,244,91,2,87,101,46,42,184,138,252,47,247)
+IMAGE_DATA(213,31,157,96,143,138,0,83,209,167,1,151,153,181,24,115,133,159,29,152,224,128,87,69,189,82,192,201,3,7,122,117)
+IMAGE_DATA(13,176,112,85,198,84,193,85,48,21,30,85,198,85,145,3,110,172,21,239,213,193,117,75,194,213,226,130,70,21,205,236)
+IMAGE_DATA(87,37,15,44,145,239,120,213,220,188,38,102,171,248,85,108,139,138,219,169,184,164,141,183,224,171,120,214,204,236,6,74)
+IMAGE_DATA(207,84,62,53,163,158,82,211,235,232,234,205,26,74,190,94,69,151,21,71,47,92,45,165,179,202,139,157,186,80,232,68)
+IMAGE_DATA(177,187,61,125,177,132,121,11,238,94,190,81,225,48,183,138,82,115,234,20,115,27,56,216,243,102,215,177,231,205,81,254)
+IMAGE_DATA(175,176,188,149,234,154,116,46,0,239,217,148,239,156,219,248,220,29,83,191,109,144,163,197,251,2,22,214,215,106,158,202)
+IMAGE_DATA(188,164,250,90,48,181,147,121,217,218,218,203,252,132,87,109,239,26,112,199,190,17,184,142,186,45,61,39,88,189,207,53)
+IMAGE_DATA(109,204,211,234,170,38,170,44,83,62,62,181,156,158,125,57,137,126,189,230,20,173,220,162,184,186,237,42,189,178,85,197)
+IMAGE_DATA(142,235,42,174,209,171,187,146,105,245,238,203,180,106,199,101,125,223,246,171,244,242,174,203,244,202,206,43,180,102,247,117)
+IMAGE_DATA(90,191,239,6,109,122,45,149,182,28,76,81,254,54,131,89,123,232,108,30,29,189,144,79,167,174,148,112,46,249,194,245)
+IMAGE_DATA(10,74,83,239,81,145,250,251,162,142,12,125,47,37,191,30,61,63,138,110,63,143,110,101,101,101,117,71,20,230,42,252)
+IMAGE_DATA(67,86,105,59,101,42,222,100,42,102,229,22,86,113,30,184,174,185,211,233,251,160,231,209,32,199,9,63,42,92,5,79)
+IMAGE_DATA(39,38,103,105,114,42,200,151,113,44,248,95,176,117,100,24,227,122,83,220,179,80,152,10,175,170,185,58,226,204,93,29)
+IMAGE_DATA(113,3,190,85,198,84,193,84,240,180,161,166,155,121,1,191,10,126,240,220,26,183,14,184,149,74,10,91,56,80,179,4)
+IMAGE_DATA(158,202,214,205,251,230,55,187,92,21,159,170,185,218,225,176,181,149,199,88,153,173,185,77,138,173,77,156,11,190,158,90)
+IMAGE_DATA(71,87,110,86,82,178,226,228,229,107,149,138,171,229,116,46,185,148,206,92,2,71,149,239,82,76,56,113,182,152,78,156)
+IMAGE_DATA(43,164,227,103,11,232,216,153,124,58,162,120,129,56,124,42,151,146,78,230,208,209,179,185,116,242,98,33,157,190,92,72)
+IMAGE_DATA(103,146,139,232,252,181,82,186,156,162,188,110,70,37,93,203,172,162,27,153,213,28,215,210,171,216,39,131,183,168,87,110)
+IMAGE_DATA(237,232,231,49,234,145,137,201,216,99,183,88,127,94,189,191,213,234,247,80,109,85,55,215,25,9,83,27,234,219,213,182)
+IMAGE_DATA(75,71,163,246,170,218,167,234,254,85,82,75,134,245,17,16,184,220,214,25,160,38,229,29,193,97,225,106,101,89,61,85)
+IMAGE_DATA(151,54,210,149,228,124,197,213,131,244,220,218,83,180,124,211,69,122,121,243,69,122,105,243,5,222,190,188,245,18,123,88)
+IMAGE_DATA(176,20,241,210,230,115,180,114,219,101,122,121,203,21,181,189,162,238,79,230,192,125,226,115,215,236,190,170,252,237,117,218)
+IMAGE_DATA(240,90,10,109,62,152,198,172,221,115,34,91,241,54,135,14,159,207,99,95,139,250,168,203,55,203,56,31,80,92,217,206)
+IMAGE_DATA(191,65,240,249,155,152,153,141,248,236,90,89,89,89,45,46,133,185,154,161,184,146,86,168,35,19,99,143,69,58,15,12)
+IMAGE_DATA(174,234,185,170,99,92,239,43,76,133,199,26,27,159,102,166,50,87,39,167,105,114,98,150,111,27,31,155,81,94,106,154)
+IMAGE_DATA(251,251,34,70,134,49,246,55,73,131,253,227,46,87,49,95,21,181,75,152,175,10,166,242,124,213,118,157,251,21,174,242)
+IMAGE_DATA(156,213,154,110,215,171,34,15,92,81,214,226,214,1,151,21,183,185,108,21,158,74,232,156,111,179,91,19,108,114,85,216)
+IMAGE_DATA(42,151,193,85,241,171,24,83,69,30,248,106,74,149,203,213,75,215,202,152,169,8,120,86,248,83,248,212,227,202,115,29)
+IMAGE_DATA(59,147,75,71,93,150,42,31,118,34,151,14,30,207,161,253,199,179,233,192,209,108,117,57,151,183,251,143,100,209,190,195)
+IMAGE_DATA(25,180,55,41,93,221,150,165,153,123,190,64,29,171,128,206,94,41,166,139,55,74,153,183,55,178,107,216,231,166,229,214)
+IMAGE_DATA(179,207,69,62,25,30,174,166,161,155,199,110,193,91,244,157,4,107,71,70,198,28,175,218,197,99,162,248,253,1,159,10)
+IMAGE_DATA(158,54,53,244,242,24,171,246,170,253,60,142,10,166,106,158,74,159,142,97,14,225,106,115,27,198,87,213,113,20,151,107)
+IMAGE_DATA(107,20,87,43,155,213,111,152,6,58,125,38,157,126,250,194,94,250,213,170,19,244,226,250,243,244,146,226,235,139,235,142)
+IMAGE_DATA(209,138,117,103,105,195,230,131,180,111,207,81,218,176,241,8,173,220,112,158,94,216,116,142,150,111,57,71,43,182,92,86)
+IMAGE_DATA(113,209,13,176,21,156,213,124,189,198,161,121,172,243,202,171,119,93,211,227,182,251,111,210,214,67,169,92,123,188,239,116)
+IMAGE_DATA(166,206,33,171,223,50,231,175,149,171,223,31,149,92,195,237,51,108,109,101,101,101,181,56,228,124,57,161,110,51,37,71)
+IMAGE_DATA(241,36,187,142,110,230,41,207,166,88,148,91,88,195,99,172,13,205,93,156,247,229,58,37,103,78,141,48,85,2,92,197)
+IMAGE_DATA(184,33,184,42,129,126,249,19,99,138,181,99,234,242,232,12,141,143,76,211,200,224,4,115,117,168,119,204,232,97,56,234)
+IMAGE_DATA(114,181,187,117,128,58,90,3,156,3,70,63,136,230,250,62,205,213,170,78,55,255,43,181,192,82,15,92,162,252,166,151)
+IMAGE_DATA(169,50,231,70,60,171,89,187,100,178,149,239,135,87,205,111,113,199,87,211,50,106,121,92,85,184,138,64,126,55,146,171)
+IMAGE_DATA(69,156,3,6,23,217,167,42,166,34,146,20,67,15,29,203,161,215,142,129,169,89,138,165,153,238,22,60,221,125,80,241)
+IMAGE_DATA(226,192,77,218,241,90,42,199,206,3,41,234,182,52,218,115,40,157,153,203,188,85,199,59,125,89,115,228,146,242,107,152)
+IMAGE_DATA(55,138,191,11,120,11,143,123,53,173,130,61,46,254,70,197,101,173,84,94,217,198,117,73,24,83,213,92,237,225,121,50)
+IMAGE_DATA(45,77,189,28,152,55,35,117,74,24,83,197,186,125,194,83,221,199,99,132,235,209,120,46,149,226,118,99,11,250,88,117)
+IMAGE_DATA(240,248,42,184,10,207,122,244,120,42,253,228,249,61,244,236,171,71,232,185,53,199,105,249,171,135,104,249,202,36,218,240)
+IMAGE_DATA(202,118,245,183,253,133,250,4,157,83,31,165,82,26,232,201,161,130,220,43,116,233,204,25,74,218,123,154,182,110,59,65)
+IMAGE_DATA(107,54,158,81,190,86,49,118,155,242,183,219,47,106,174,110,75,230,250,39,92,134,183,69,128,171,171,119,221,80,126,246)
+IMAGE_DATA(58,251,89,140,217,110,216,119,141,54,239,75,85,156,77,167,189,202,255,159,86,191,111,42,20,243,205,207,174,149,149,149)
+IMAGE_DATA(213,98,20,214,179,185,158,89,163,35,71,121,182,252,6,205,213,226,42,135,171,19,78,140,113,126,23,121,222,145,209,169)
+IMAGE_DATA(48,87,21,67,77,166,130,177,83,216,58,49,173,216,58,169,184,58,62,52,73,195,125,227,204,213,193,158,209,168,62,16)
+IMAGE_DATA(92,179,100,244,130,64,30,24,243,107,106,43,245,184,170,201,84,215,175,150,232,48,231,174,98,126,77,81,65,52,67,253)
+IMAGE_DATA(2,117,193,168,91,98,175,170,152,154,146,166,185,122,45,181,218,101,43,234,150,204,60,176,48,245,4,188,212,25,29,240)
+IMAGE_DATA(172,38,87,193,82,241,167,123,14,165,209,174,215,82,220,112,185,170,152,186,75,49,3,33,151,177,149,251,16,123,149,111)
+IMAGE_DATA(75,58,163,124,241,5,61,175,229,220,213,18,186,112,189,132,243,201,87,82,43,84,40,254,166,148,210,249,148,34,229,119)
+IMAGE_DATA(203,41,75,249,219,178,42,197,218,134,94,30,83,237,236,234,143,88,19,87,214,238,67,14,34,188,62,2,230,80,245,115)
+IMAGE_DATA(254,25,92,173,107,84,30,184,174,141,170,170,148,103,173,104,160,253,73,87,233,103,207,239,165,95,174,60,68,207,43,182)
+IMAGE_DATA(174,88,121,128,94,122,97,15,157,216,181,154,70,58,158,165,217,153,53,234,83,148,73,20,44,81,219,106,21,77,78,212)
+IMAGE_DATA(210,228,120,17,53,84,167,83,214,245,27,116,254,248,37,218,187,251,28,109,220,113,65,177,244,34,173,220,161,243,195,107)
+IMAGE_DATA(118,162,254,41,133,214,236,85,108,221,115,149,199,100,215,238,214,249,98,92,94,183,231,26,237,56,146,78,199,47,22,115)
+IMAGE_DATA(157,147,149,149,149,213,98,23,250,212,95,77,175,98,111,4,174,166,228,214,81,118,126,181,226,106,13,213,55,117,50,83)
+IMAGE_DATA(7,145,199,69,14,88,5,143,157,42,174,162,79,19,242,189,200,251,78,140,107,143,58,137,117,221,20,87,131,147,33,154)
+IMAGE_DATA(157,8,210,140,186,125,74,249,213,137,97,245,248,129,241,40,174,130,169,152,83,211,211,166,188,83,155,238,9,44,189,11)
+IMAGE_DATA(35,184,90,222,193,92,149,57,171,204,213,210,118,102,42,182,240,173,156,255,69,206,55,47,122,76,85,188,169,215,195,98)
+IMAGE_DATA(92,21,94,21,245,74,96,42,226,70,122,152,173,151,111,84,69,112,85,188,42,242,192,24,91,5,83,145,3,62,124,66)
+IMAGE_DATA(115,85,216,234,245,168,8,48,149,175,59,204,220,121,40,213,101,41,71,82,38,199,142,67,25,58,20,95,183,171,199,239)
+IMAGE_DATA(80,92,118,195,96,242,94,229,111,95,59,153,203,99,186,39,206,23,113,237,84,50,114,215,224,109,122,5,143,219,194,219)
+IMAGE_DATA(162,78,185,184,178,149,106,27,123,184,183,135,244,197,234,64,31,44,238,229,28,96,246,194,179,130,171,248,155,35,23,204)
+IMAGE_DATA(158,85,113,117,251,158,11,244,147,95,239,162,231,94,61,76,47,173,62,74,43,87,236,166,151,127,185,149,46,236,123,153)
+IMAGE_DATA(58,203,158,167,222,198,151,149,125,220,164,62,73,251,148,143,60,170,46,95,82,151,111,170,200,83,81,65,193,80,131,218)
+IMAGE_DATA(42,159,25,130,215,108,166,208,76,21,245,118,20,81,89,110,26,37,159,187,68,135,95,187,64,251,212,115,108,83,28,93)
+IMAGE_DATA(191,87,177,116,87,10,243,20,177,122,143,226,234,190,171,180,75,253,70,57,113,169,132,235,188,32,107,87,173,172,172,22)
+IMAGE_DATA(179,208,119,135,189,15,234,88,21,87,83,115,27,40,167,160,134,185,90,219,208,233,206,61,5,91,225,85,197,175,162,110)
+IMAGE_DATA(6,227,167,194,86,108,145,243,5,75,189,76,133,87,29,13,168,253,250,39,92,174,114,173,146,98,106,87,75,128,121,42)
+IMAGE_DATA(99,171,38,87,145,3,54,231,215,152,94,85,120,234,245,172,24,79,149,122,37,179,39,132,4,88,154,147,223,228,214,42)
+IMAGE_DATA(153,57,96,212,1,11,87,197,171,34,15,12,174,130,91,231,46,73,30,184,152,235,149,142,56,53,74,24,91,5,83,15)
+IMAGE_DATA(30,203,164,215,142,232,220,47,124,42,56,10,158,10,87,77,47,42,225,245,174,136,221,106,127,176,4,1,182,110,123,45)
+IMAGE_DATA(77,109,211,105,43,230,178,236,189,193,177,1,243,92,148,231,91,179,253,50,173,219,121,133,54,42,175,183,227,96,10,237)
+IMAGE_DATA(59,150,65,135,78,231,242,156,22,120,91,112,22,99,147,8,240,86,34,191,180,209,93,183,222,93,187,190,173,151,185,90)
+IMAGE_DATA(91,219,202,245,192,232,11,177,105,215,121,250,201,11,187,233,215,171,142,208,75,202,175,190,186,124,55,173,254,229,102,74)
+IMAGE_DATA(57,254,50,181,151,191,72,189,181,171,213,167,104,185,138,87,148,103,93,175,56,186,89,129,111,175,138,35,234,242,73,10)
+IMAGE_DATA(133,174,169,203,233,234,254,108,21,197,4,31,75,164,89,27,36,140,151,54,41,78,214,210,80,95,30,213,20,167,80,218)
+IMAGE_DATA(141,235,180,99,215,89,126,77,107,212,235,92,179,39,153,118,41,191,138,252,56,198,246,33,203,85,43,43,171,197,172,96)
+IMAGE_DATA(48,168,191,115,21,87,175,161,55,66,78,61,251,213,194,194,106,170,169,105,209,61,125,251,70,153,171,236,83,71,52,83)
+IMAGE_DATA(81,143,132,122,223,225,161,9,151,177,24,71,5,75,17,146,251,53,153,42,126,21,245,74,240,170,152,87,131,49,85,97)
+IMAGE_DATA(106,120,108,181,151,235,150,252,250,44,129,169,229,37,240,170,45,78,180,69,140,179,74,173,18,230,216,72,8,71,133,169)
+IMAGE_DATA(168,83,146,126,16,8,228,129,193,214,212,44,205,85,120,85,147,171,38,91,49,198,122,82,249,67,112,245,176,98,234,161)
+IMAGE_DATA(19,217,154,171,106,11,174,238,87,12,144,252,175,108,133,175,226,55,217,139,30,72,225,240,230,133,119,99,238,231,145,12)
+IMAGE_DATA(218,123,36,135,246,30,203,101,159,186,101,255,13,21,41,188,221,180,247,154,98,234,21,230,14,230,182,172,222,113,149,235)
+IMAGE_DATA(108,81,3,132,235,96,237,250,93,87,105,221,238,27,180,113,255,77,238,145,180,239,88,22,29,56,145,197,188,197,92,210)
+IMAGE_DATA(227,151,242,233,102,78,53,175,183,43,107,234,98,125,133,198,22,245,190,55,117,81,93,93,135,203,213,181,219,207,209,127)
+IMAGE_DATA(188,116,128,199,86,193,213,213,43,246,210,250,95,109,166,188,211,175,80,71,217,74,26,110,93,171,64,167,120,26,220,162)
+IMAGE_DATA(126,164,237,212,76,13,238,87,113,136,217,202,65,199,212,246,140,98,236,69,181,189,170,30,123,85,221,127,131,192,218,16)
+IMAGE_DATA(21,144,230,109,149,186,140,252,241,180,122,76,31,109,221,121,65,143,181,170,192,239,12,212,8,163,102,75,230,179,90,89)
+IMAGE_DATA(89,89,45,86,97,190,125,74,118,29,115,245,170,226,10,184,154,169,190,115,11,10,170,168,178,178,145,251,229,115,95,135)
+IMAGE_DATA(129,9,174,235,69,95,31,176,84,230,208,12,58,183,15,15,32,198,185,62,105,76,98,96,138,153,106,214,42,13,246,140)
+IMAGE_DATA(115,14,24,243,85,193,84,240,84,124,170,68,75,131,174,91,66,45,14,207,175,81,92,13,247,46,108,213,117,192,197,205)
+IMAGE_DATA(17,94,213,237,7,81,168,125,106,78,110,35,71,182,195,206,44,229,195,133,165,194,81,228,127,17,184,204,243,87,225,215)
+IMAGE_DATA(227,176,85,106,152,196,175,130,171,168,55,66,29,112,146,195,88,212,42,129,167,18,224,170,176,85,252,233,54,197,59,225)
+IMAGE_DATA(170,201,87,48,16,12,65,48,91,143,102,50,103,113,223,230,125,55,149,39,189,206,193,94,117,119,50,51,103,221,206,107)
+IMAGE_DATA(202,179,94,137,8,176,22,183,227,113,96,44,98,237,14,204,59,189,76,43,183,92,226,186,161,211,151,243,169,205,89,35)
+IMAGE_DATA(23,99,171,168,91,66,253,48,230,233,212,214,162,223,82,27,85,87,183,211,75,27,78,208,127,172,212,243,108,86,172,58)
+IMAGE_DATA(74,107,21,87,183,60,183,153,74,147,145,7,94,77,195,237,27,213,167,104,43,133,130,123,20,87,15,112,46,152,130,39)
+IMAGE_DATA(85,156,86,159,173,243,14,75,147,213,99,46,241,117,10,170,8,157,37,102,45,30,23,58,225,108,143,171,99,40,222,42)
+IMAGE_DATA(190,206,82,39,29,216,127,158,214,236,186,66,235,247,220,84,239,71,54,93,78,169,52,250,71,88,89,89,89,45,94,69)
+IMAGE_DATA(115,21,12,170,97,174,150,149,213,113,29,41,250,227,73,111,95,108,101,78,106,191,211,75,31,117,190,102,128,163,240,166)
+IMAGE_DATA(226,81,193,83,169,81,114,215,171,105,139,228,169,244,129,0,79,17,186,183,65,36,87,205,249,170,18,210,23,216,59,111)
+IMAGE_DATA(21,76,205,202,214,188,20,142,74,128,165,200,249,202,120,42,230,143,242,237,57,13,110,63,67,169,11,198,92,155,139,215)
+IMAGE_DATA(202,156,208,61,151,48,215,70,242,192,218,179,230,114,72,45,48,2,117,75,82,187,132,48,107,148,188,76,69,224,246,61)
+IMAGE_DATA(135,51,149,79,205,226,237,190,163,217,238,101,236,135,28,176,48,21,129,122,30,174,239,65,221,15,115,84,241,116,103,178)
+IMAGE_DATA(142,29,218,231,49,119,213,227,192,167,87,183,95,162,149,91,47,112,172,216,124,142,231,211,242,122,126,157,3,204,213,166)
+IMAGE_DATA(214,30,158,191,90,95,215,198,92,69,175,137,170,170,54,250,213,234,35,244,220,171,71,233,215,235,78,211,10,229,87,215)
+IMAGE_DATA(188,180,155,118,45,223,74,213,105,171,168,179,116,61,141,245,42,174,134,20,83,103,224,81,143,208,108,240,24,179,19,60)
+IMAGE_DATA(101,78,134,110,170,109,58,7,242,193,188,165,84,117,249,26,129,181,154,193,135,244,49,232,160,138,235,4,31,187,119,215)
+IMAGE_DATA(105,90,189,75,247,77,196,88,50,234,161,245,7,22,255,179,108,181,178,178,90,220,74,85,30,245,82,90,5,37,103,41)
+IMAGE_DATA(206,100,133,253,106,121,105,3,247,104,239,81,108,229,181,200,141,53,222,186,187,6,57,176,214,27,175,81,142,245,222,140)
+IMAGE_DATA(190,15,240,164,240,166,88,3,78,152,10,150,74,159,194,200,190,74,58,100,206,170,204,91,53,251,23,234,60,176,158,179)
+IMAGE_DATA(106,242,84,106,128,17,224,41,231,125,29,175,154,161,120,9,134,10,87,245,24,106,13,51,85,184,138,94,192,186,47,112)
+IMAGE_DATA(13,243,21,126,213,228,42,60,43,250,40,161,127,161,235,87,47,21,133,235,150,28,174,98,222,170,112,149,243,174,206,28)
+IMAGE_DATA(27,176,21,91,147,171,102,30,88,188,42,238,3,67,225,83,117,30,56,203,101,43,238,195,24,171,140,171,174,223,171,107)
+IMAGE_DATA(102,197,151,174,223,117,93,231,126,119,94,230,219,113,191,233,109,193,90,120,85,204,37,69,79,135,23,55,158,163,11,215)
+IMAGE_DATA(203,148,87,13,80,71,123,63,53,55,235,122,37,228,127,193,85,240,21,108,45,46,109,162,95,188,114,152,126,189,234,24)
+IMAGE_DATA(45,223,112,142,94,94,117,152,214,173,216,69,123,87,108,165,150,236,117,212,89,178,142,166,2,219,21,234,246,82,104,230)
+IMAGE_DATA(48,5,103,142,107,127,58,125,69,241,51,141,66,179,217,10,129,57,42,138,20,15,139,212,125,57,42,80,207,148,175,174)
+IMAGE_DATA(103,169,219,83,28,79,123,86,61,254,8,123,86,220,6,238,238,216,118,138,251,57,161,135,196,129,83,153,148,85,84,79)
+IMAGE_DATA(98,87,109,38,216,202,202,106,177,11,61,110,177,38,201,149,180,106,246,172,153,57,181,148,159,87,70,165,197,117,212,217)
+IMAGE_DATA(62,232,174,229,38,189,242,221,113,81,39,204,190,249,88,171,28,143,3,111,117,232,125,184,239,131,51,63,21,209,110,140)
+IMAGE_DATA(163,202,186,229,194,82,238,175,84,217,197,253,132,162,215,91,13,115,85,250,2,163,6,56,63,183,41,236,81,249,53,212)
+IMAGE_DATA(235,48,152,154,162,94,31,226,102,106,141,138,42,14,244,2,6,83,117,95,224,90,55,204,185,54,201,14,91,77,191,202)
+IMAGE_DATA(53,193,231,139,184,30,23,249,95,48,21,1,190,154,140,149,45,242,185,168,1,22,166,74,62,24,219,221,73,25,97,158)
+IMAGE_DATA(30,213,158,21,108,198,101,102,173,10,212,47,109,222,119,221,101,171,228,127,193,76,211,155,130,165,82,219,132,220,49,120)
+IMAGE_DATA(139,113,87,230,234,38,197,212,245,103,185,191,195,245,140,10,221,211,80,113,21,249,95,212,168,113,239,67,167,255,33,252)
+IMAGE_DATA(106,110,126,29,253,199,202,36,122,126,237,89,122,121,227,89,90,185,246,40,173,95,177,143,146,94,221,68,173,249,107,168)
+IMAGE_DATA(183,100,43,77,15,233,26,165,208,204,81,162,217,115,20,156,85,76,157,77,101,158,134,130,197,106,91,161,238,175,226,8)
+IMAGE_DATA(57,65,161,18,21,5,20,12,102,171,235,55,212,227,46,171,199,129,169,103,212,167,49,151,70,134,110,210,198,173,231,104)
+IMAGE_DATA(229,246,171,60,7,103,223,233,108,42,170,106,117,154,26,122,122,62,198,236,107,24,246,180,186,183,176,245,184,86,86,86)
+IMAGE_DATA(119,79,153,5,13,46,87,175,192,227,101,85,83,94,78,57,21,21,84,187,236,100,159,169,216,216,222,210,79,173,77,189)
+IMAGE_DATA(156,187,109,67,79,121,39,112,187,60,70,56,44,107,192,9,135,221,117,202,21,67,193,212,6,244,10,114,252,169,240,84)
+IMAGE_DATA(122,22,130,167,38,83,185,47,176,49,150,202,189,31,28,174,130,169,217,57,13,154,167,78,96,60,21,225,214,36,165,107)
+IMAGE_DATA(150,222,72,169,84,81,237,92,174,102,126,154,60,53,185,42,108,245,114,245,236,229,50,167,71,112,49,29,195,56,235,169)
+IMAGE_DATA(92,55,23,44,92,53,3,108,5,35,225,59,133,171,96,42,188,43,152,42,92,101,166,170,216,127,44,199,189,12,166,226)
+IMAGE_DATA(126,112,85,215,45,221,112,198,75,147,35,114,191,96,170,248,84,60,70,252,42,30,139,251,49,174,10,207,9,166,130,147)
+IMAGE_DATA(169,217,213,220,131,191,189,77,143,171,214,53,118,49,75,57,234,244,250,171,153,217,85,236,87,95,88,119,134,185,250,202)
+IMAGE_DATA(26,229,87,95,218,75,199,215,109,165,174,210,245,212,83,182,141,102,70,148,87,13,30,166,208,244,73,162,153,100,133,189)
+IMAGE_DATA(155,106,155,171,24,91,168,80,86,169,152,86,167,192,134,122,36,112,177,133,35,20,170,81,219,114,253,152,80,134,174,97)
+IMAGE_DATA(154,85,76,85,76,6,111,187,91,213,121,111,185,192,125,18,241,186,14,156,202,166,170,134,158,121,26,85,159,53,109,61)
+IMAGE_DATA(235,191,91,89,89,89,221,9,225,187,38,187,168,137,185,154,156,81,167,162,134,82,51,42,41,55,187,76,249,192,74,102)
+IMAGE_DATA(38,115,20,253,123,20,59,91,26,53,19,193,71,115,92,20,91,112,19,181,189,232,239,128,144,58,95,25,71,53,251,19)
+IMAGE_DATA(74,160,230,23,243,105,132,167,200,251,122,125,42,247,90,42,139,228,170,187,222,42,214,89,197,124,25,229,83,17,204,87)
+IMAGE_DATA(143,87,245,50,21,97,246,84,194,101,225,168,55,112,159,201,84,221,123,169,60,220,207,16,249,96,140,181,162,55,196,201)
+IMAGE_DATA(60,230,168,151,177,38,87,101,124,213,228,170,120,82,25,95,229,113,85,39,23,44,92,69,77,19,214,23,23,15,10,166)
+IMAGE_DATA(10,95,133,171,146,247,53,153,42,236,69,63,95,241,170,207,175,63,71,57,249,13,220,223,16,107,199,201,26,113,122,61)
+IMAGE_DATA(243,118,103,125,156,78,186,153,86,78,191,92,117,148,185,250,210,250,211,180,74,113,117,211,138,253,116,110,243,86,234,173)
+IMAGE_DATA(216,68,125,21,59,40,56,254,154,194,212,81,197,85,197,197,153,107,138,141,233,202,187,22,169,173,98,106,176,89,125,190)
+IMAGE_DATA(58,212,167,172,95,125,208,134,20,22,135,212,118,128,120,62,107,80,241,118,86,121,217,96,30,231,140,137,61,107,138,122)
+IMAGE_DATA(76,57,53,149,95,167,53,220,91,248,18,143,13,239,59,145,78,117,173,189,92,183,52,203,76,156,241,124,134,189,159,106)
+IMAGE_DATA(245,200,96,228,245,248,107,165,91,89,89,89,45,156,240,61,147,91,210,66,151,50,224,85,235,217,175,130,171,57,89,165)
+IMAGE_DATA(202,179,86,70,172,45,35,94,179,177,182,155,183,18,184,142,48,249,42,227,167,230,220,25,183,151,190,211,239,129,121,90)
+IMAGE_DATA(217,193,60,149,0,83,37,132,173,60,207,166,44,60,103,85,130,251,42,229,59,61,30,242,154,34,152,42,115,104,116,207)
+IMAGE_DATA(135,234,112,222,23,30,245,134,238,253,203,57,222,235,85,58,176,22,141,98,168,132,112,245,74,74,184,55,132,120,213,243)
+IMAGE_DATA(87,42,156,190,134,101,116,210,201,7,139,111,5,91,15,159,114,250,69,168,173,212,51,113,109,175,226,35,216,42,92,53)
+IMAGE_DATA(231,215,152,76,197,227,196,171,154,108,213,158,53,197,241,163,87,93,110,10,99,17,194,85,153,223,138,122,37,4,184,202)
+IMAGE_DATA(126,117,227,5,90,190,233,60,21,149,52,115,239,96,244,59,228,245,204,27,187,157,53,205,59,185,47,34,184,122,233,74)
+IMAGE_DATA(33,253,135,227,87,87,172,59,169,185,250,210,62,186,184,125,51,245,150,111,161,64,229,30,162,201,67,138,143,39,136,166)
+IMAGE_DATA(49,174,154,162,46,103,170,40,85,81,175,80,214,165,89,74,19,234,131,54,173,46,79,59,151,7,180,119,13,214,176,103)
+IMAGE_DATA(13,5,213,62,51,87,116,125,19,85,82,117,238,53,238,197,180,98,219,37,229,193,175,208,254,147,89,148,116,54,135,206)
+IMAGE_DATA(95,45,164,107,233,229,84,80,210,64,45,173,93,212,31,24,166,233,105,207,154,113,158,69,112,220,53,229,48,63,199,34)
+IMAGE_DATA(213,202,202,234,46,8,92,205,43,109,117,185,154,140,26,158,76,112,181,92,121,214,10,230,164,238,43,168,217,169,115,183)
+IMAGE_DATA(58,234,149,199,52,3,183,9,115,197,159,134,215,123,235,142,224,104,117,121,155,94,171,188,178,221,173,77,66,152,76,197)
+IMAGE_DATA(86,198,89,43,202,53,91,133,175,165,197,29,204,85,233,89,40,115,107,152,169,152,83,131,220,176,10,94,87,213,25,87)
+IMAGE_DATA(69,128,171,96,40,130,185,121,163,154,215,172,17,206,74,191,125,241,177,201,55,171,221,126,75,152,187,138,184,112,53,204)
+IMAGE_DATA(89,220,126,210,201,7,195,179,30,61,83,200,1,174,162,223,47,56,43,181,76,82,131,36,158,85,106,152,220,49,214,195)
+IMAGE_DATA(225,188,175,185,149,154,96,112,117,235,129,155,204,86,140,181,74,109,176,30,111,189,226,114,85,114,191,188,118,155,195,85)
+IMAGE_DATA(228,129,49,190,250,210,198,243,28,120,31,193,83,244,19,214,91,125,25,61,251,193,87,120,215,83,231,115,232,231,175,28)
+IMAGE_DATA(100,159,187,114,195,105,90,183,250,24,109,94,190,143,174,237,221,68,129,138,173,52,80,163,184,58,157,164,226,184,10,229)
+IMAGE_DATA(55,167,82,21,62,115,20,35,203,153,171,161,96,175,250,124,141,123,62,113,88,63,117,84,125,240,186,213,99,234,152,193)
+IMAGE_DATA(161,89,228,141,175,50,147,193,213,146,27,88,251,38,153,94,80,231,188,233,192,117,58,120,38,151,182,38,221,160,61,199)
+IMAGE_DATA(111,210,129,147,41,244,218,169,116,218,119,50,213,189,126,234,114,46,221,84,159,213,146,138,102,238,111,129,245,129,241,185)
+IMAGE_DATA(150,53,228,131,22,168,86,86,86,119,89,5,138,117,151,51,107,116,30,56,19,253,17,106,153,171,8,241,164,96,102,157)
+IMAGE_DATA(226,161,201,209,26,172,181,162,162,86,113,81,2,236,132,39,53,253,44,194,236,245,43,44,149,156,175,55,188,140,5,91)
+IMAGE_DATA(17,85,149,157,84,89,209,193,33,125,12,75,157,245,222,184,223,111,126,184,239,131,204,83,53,235,149,16,50,47,21,204)
+IMAGE_DATA(228,126,133,41,181,174,95,197,90,171,88,191,230,210,85,205,93,233,99,104,174,17,167,185,90,30,193,213,51,151,74,185)
+IMAGE_DATA(62,24,28,61,202,107,198,105,198,106,15,155,175,231,180,58,245,72,102,77,176,121,89,188,171,140,183,202,125,230,117,244)
+IMAGE_DATA(136,144,113,214,200,26,166,43,17,97,250,84,176,85,175,141,170,107,130,121,157,183,77,103,185,70,172,181,185,47,162,79)
+IMAGE_DATA(191,94,7,167,143,185,138,92,240,145,83,153,244,139,87,143,48,87,95,217,120,70,113,245,8,109,93,190,151,50,143,108)
+IMAGE_DATA(84,92,221,76,131,117,187,20,79,149,95,157,60,65,161,169,75,106,171,252,234,76,158,98,171,226,234,76,131,66,104,64)
+IMAGE_DATA(241,115,202,243,105,67,62,118,130,123,63,80,176,65,115,21,44,158,189,174,107,135,67,229,148,117,81,247,230,95,177,53)
+IMAGE_DATA(153,182,31,186,193,61,45,190,251,203,189,244,195,23,246,235,53,214,215,159,160,151,55,158,166,213,219,207,211,230,253,87)
+IMAGE_DATA(104,231,97,205,220,61,71,111,208,206,164,171,42,146,233,208,177,84,58,159,92,64,233,185,149,188,182,60,214,140,144,231)
+IMAGE_DATA(183,148,181,178,178,186,83,146,177,166,34,197,60,248,213,203,14,87,83,20,99,153,171,25,101,174,79,5,71,77,126,34)
+IMAGE_DATA(170,203,91,169,214,136,170,178,22,230,44,24,138,0,95,145,251,149,158,132,240,167,224,42,135,81,151,132,173,89,255,203)
+IMAGE_DATA(81,169,61,42,24,90,93,165,184,90,221,237,114,181,170,178,91,249,45,205,86,206,13,171,16,182,74,223,66,189,158,106)
+IMAGE_DATA(152,171,200,1,179,95,77,215,108,5,83,37,220,121,170,88,99,251,106,185,219,3,34,220,27,184,156,217,9,182,154,92)
+IMAGE_DATA(5,83,133,173,24,111,5,71,133,173,184,172,61,108,1,231,130,225,87,49,111,70,188,167,57,239,198,100,171,248,83,140)
+IMAGE_DATA(167,154,253,14,189,92,149,218,36,25,99,149,58,38,233,109,8,166,190,178,237,162,203,87,174,29,222,166,56,187,245,34)
+IMAGE_DATA(115,22,185,94,241,168,24,99,21,198,130,173,200,1,131,171,251,143,166,210,179,171,142,178,207,125,85,177,120,195,154,195)
+IMAGE_DATA(180,237,165,61,84,114,110,19,245,149,108,82,92,221,161,185,58,113,210,224,106,129,138,10,205,85,176,19,12,141,168,19)
+IMAGE_DATA(114,252,106,176,75,115,117,70,113,117,38,203,201,33,231,243,218,56,201,199,47,186,107,222,96,221,56,140,43,127,243,39)
+IMAGE_DATA(219,233,169,31,111,165,175,255,104,11,125,227,233,237,244,228,51,91,232,137,167,55,211,183,126,186,157,126,240,220,126,250)
+IMAGE_DATA(217,203,135,121,174,45,250,88,172,222,122,134,214,239,62,79,91,94,187,68,135,206,164,211,137,243,25,84,88,90,231,240)
+IMAGE_DATA(212,214,44,89,89,89,221,57,9,87,75,20,247,192,85,48,245,74,86,131,230,170,98,106,118,122,169,235,83,193,75,112)
+IMAGE_DATA(179,178,180,153,183,204,80,39,170,113,91,73,19,85,168,192,237,226,91,197,187,114,189,175,227,85,177,54,185,244,37,148)
+IMAGE_DATA(144,49,84,9,158,175,90,214,230,114,21,60,13,71,183,186,173,203,229,42,182,8,172,83,238,230,131,243,155,162,184,138)
+IMAGE_DATA(224,203,153,122,206,170,244,214,55,215,89,189,112,165,196,229,42,120,41,125,11,49,142,170,163,196,101,169,60,206,28,119)
+IMAGE_DATA(229,126,17,70,29,147,94,231,92,143,177,30,56,145,195,117,190,102,174,87,234,131,77,182,114,47,195,36,221,27,216,228)
+IMAGE_DATA(175,48,24,140,1,87,55,236,187,225,246,134,144,177,85,212,248,32,255,203,76,69,111,165,173,23,152,173,96,41,88,203)
+IMAGE_DATA(76,85,129,94,136,24,247,22,174,194,171,130,171,45,77,253,70,30,184,155,118,31,188,73,191,92,125,140,185,186,114,227)
+IMAGE_DATA(41,218,184,250,16,237,88,177,147,202,47,173,167,222,162,45,52,210,184,87,231,129,199,79,81,112,242,34,115,53,56,149)
+IMAGE_DATA(167,61,232,12,114,188,221,234,51,54,172,199,86,49,63,6,99,157,240,175,161,33,117,95,171,138,90,135,195,105,234,56)
+IMAGE_DATA(169,60,214,26,84,92,61,125,16,107,202,105,175,189,37,41,133,86,237,186,68,223,80,76,5,75,191,246,244,54,197,214)
+IMAGE_DATA(109,244,212,143,54,211,147,63,220,196,91,196,19,63,216,72,95,253,222,122,250,255,254,125,45,61,254,221,245,244,212,15)
+IMAGE_DATA(55,210,247,126,185,147,94,220,112,146,182,236,185,72,165,149,173,206,167,222,78,128,181,178,178,138,167,240,119,196,92,95)
+IMAGE_DATA(21,145,247,7,221,192,237,229,234,123,52,57,167,145,46,101,213,243,24,235,53,197,156,140,180,98,21,37,236,59,225,51)
+IMAGE_DATA(43,75,21,83,139,27,169,162,168,129,3,151,193,216,10,135,167,229,184,175,4,204,109,229,177,83,169,75,146,58,37,220)
+IMAGE_DATA(134,251,192,81,239,90,170,18,225,218,95,48,179,213,225,106,151,218,118,242,109,216,74,8,87,225,85,75,213,101,108,11)
+IMAGE_DATA(139,116,159,125,233,3,44,117,75,186,15,68,13,115,85,66,122,235,35,247,139,241,213,139,87,202,221,117,86,193,74,248)
+IMAGE_DATA(83,112,82,182,226,83,133,183,102,111,195,11,201,101,28,82,39,124,236,108,17,251,84,238,27,236,212,49,241,56,235,9)
+IMAGE_DATA(189,230,57,188,43,215,248,26,94,212,100,44,124,169,121,187,244,12,198,109,24,95,69,14,216,172,247,21,174,74,207,96)
+IMAGE_DATA(158,175,170,120,186,98,147,230,43,56,187,26,121,224,109,88,99,252,2,237,74,74,227,181,89,117,254,87,123,85,225,170)
+IMAGE_DATA(176,21,243,137,183,29,188,170,184,116,154,251,73,172,90,127,154,214,191,122,136,118,191,178,155,234,174,174,161,174,252,205)
+IMAGE_DATA(52,210,180,157,253,106,104,252,184,178,165,231,41,52,113,131,66,147,89,10,157,133,10,165,149,138,151,77,204,86,10,14)
+IMAGE_DATA(170,15,224,176,14,228,134,113,27,234,154,102,28,174,194,231,78,222,228,57,54,68,133,116,112,239,69,94,75,14,125,47)
+IMAGE_DATA(118,29,73,165,23,55,158,81,60,213,62,21,219,167,126,180,213,229,41,216,10,166,34,30,255,254,38,250,151,239,172,163)
+IMAGE_DATA(47,127,107,21,125,249,27,175,210,19,223,219,64,63,254,213,46,218,158,116,133,122,186,3,11,142,83,252,44,245,171,69)
+IMAGE_DATA(94,20,158,56,222,139,189,139,191,43,194,115,135,165,30,123,62,251,145,241,86,6,245,152,121,196,254,114,204,89,90,20)
+IMAGE_DATA(239,185,213,125,34,99,238,187,243,185,75,72,158,135,85,52,116,211,213,188,70,186,150,219,192,158,245,170,242,113,233,169)
+IMAGE_DATA(69,148,150,82,228,230,111,193,204,242,194,122,42,43,168,163,138,194,70,197,209,38,205,90,21,184,79,66,184,138,192,190)
+IMAGE_DATA(50,174,138,199,9,75,197,167,202,186,111,178,246,155,123,123,73,155,203,77,89,11,206,188,108,50,213,140,98,30,107,109)
+IMAGE_DATA(215,121,224,188,240,58,53,105,25,245,110,31,96,108,197,175,138,87,5,87,193,69,89,183,92,214,172,1,35,53,91,139)
+IMAGE_DATA(93,159,42,30,213,204,23,11,107,81,39,12,14,195,179,130,171,186,46,56,223,229,42,214,117,67,128,173,230,88,171,55)
+IMAGE_DATA(76,198,130,129,194,84,174,35,86,126,21,108,245,230,128,133,171,50,182,250,242,150,243,180,114,75,50,123,86,205,213,112)
+IMAGE_DATA(94,248,192,209,12,221,71,178,37,60,7,89,230,82,153,235,30,108,220,123,153,150,43,166,193,59,174,217,120,150,214,189)
+IMAGE_DATA(114,128,246,190,178,147,90,82,215,83,87,206,70,26,107,86,92,157,82,92,29,61,74,161,177,211,202,183,94,85,108,85)
+IMAGE_DATA(190,115,50,71,177,181,216,97,107,3,133,102,219,157,188,111,135,246,169,200,17,207,148,243,99,104,42,83,177,248,154,230)
+IMAGE_DATA(42,21,211,228,88,30,237,218,174,215,104,133,31,223,123,60,131,158,91,123,130,25,250,181,31,110,117,88,186,133,249,170)
+IMAGE_DATA(25,107,250,213,141,204,213,127,250,215,213,138,171,43,233,235,79,111,166,95,172,120,141,78,94,202,162,201,201,105,93,38)
+IMAGE_DATA(124,159,204,179,9,205,17,183,117,236,69,241,30,69,126,159,69,190,174,32,69,176,154,34,95,115,200,50,214,234,22,229)
+IMAGE_DATA(253,236,184,243,9,110,65,53,234,251,245,134,242,119,87,179,27,57,15,12,174,166,165,20,82,234,205,66,93,179,171,24)
+IMAGE_DATA(9,102,150,22,54,80,73,65,125,76,174,202,117,211,175,34,188,235,146,71,250,213,182,8,166,154,245,72,114,89,230,213)
+IMAGE_DATA(184,227,169,152,99,131,53,108,156,154,37,185,172,163,131,61,171,233,85,193,85,233,13,140,235,110,191,7,169,85,186,170)
+IMAGE_DATA(216,120,57,188,110,57,214,44,199,154,53,154,171,69,17,227,170,145,28,45,51,230,180,202,88,107,57,239,11,207,106,214)
+IMAGE_DATA(6,163,47,255,193,83,121,28,194,86,240,210,237,21,113,80,135,185,198,185,112,21,1,166,194,167,34,204,241,85,97,105)
+IMAGE_DATA(184,191,126,50,51,244,213,45,23,180,87,221,18,230,42,114,192,96,43,122,47,130,169,28,152,15,37,253,61,140,57,85)
+IMAGE_DATA(77,106,187,126,151,230,50,175,147,163,248,186,97,213,65,58,176,106,27,181,165,175,162,142,172,245,52,222,178,77,121,213)
+IMAGE_DATA(125,202,134,130,173,199,136,198,46,48,91,105,76,249,207,137,108,197,74,229,63,167,192,207,106,229,107,235,84,212,168,235)
+IMAGE_DATA(138,181,211,101,106,91,168,34,91,123,213,9,228,144,175,19,188,234,64,119,54,109,218,166,126,19,108,187,204,61,12,193)
+IMAGE_DATA(85,140,157,106,118,106,126,10,75,153,181,14,95,113,251,87,190,187,129,185,250,191,190,189,134,254,225,27,47,211,247,158)
+IMAGE_DATA(221,65,207,173,57,74,249,197,117,252,197,235,126,247,46,8,54,130,158,203,139,236,187,220,15,178,198,109,119,131,157,254)
+IMAGE_DATA(207,49,207,247,138,237,174,193,215,132,122,103,45,178,191,133,213,189,165,88,255,110,18,250,236,134,231,215,215,54,247,107)
+IMAGE_DATA(158,102,55,211,181,156,38,186,145,89,227,250,85,158,3,163,60,168,240,179,172,72,51,85,182,236,99,121,219,202,99,167)
+IMAGE_DATA(82,239,139,185,52,220,223,23,115,100,12,142,186,235,146,75,56,172,68,222,215,157,67,99,176,84,194,228,44,242,189,24)
+IMAGE_DATA(75,133,55,69,8,83,193,87,220,142,186,96,225,42,247,213,79,171,117,243,192,184,238,246,39,116,188,42,114,192,224,166)
+IMAGE_DATA(230,170,94,179,28,125,245,17,39,207,23,68,212,1,135,199,92,195,97,142,185,74,237,240,73,103,78,107,184,70,56,60)
+IMAGE_DATA(222,42,57,97,153,211,234,93,187,220,244,174,219,15,165,56,107,176,166,240,184,168,183,159,146,57,215,198,156,207,10,142)
+IMAGE_DATA(162,246,151,249,234,248,84,48,18,62,246,168,58,15,115,110,177,206,5,7,34,198,87,241,247,19,14,131,171,107,54,156)
+IMAGE_DATA(100,191,122,104,205,22,234,204,126,133,218,50,214,210,84,235,102,197,211,29,68,131,251,136,134,143,168,56,165,174,159,87)
+IMAGE_DATA(92,85,108,29,79,15,179,117,162,72,177,181,84,93,46,213,215,39,243,212,109,89,202,219,42,143,58,158,172,182,103,212)
+IMAGE_DATA(245,43,4,174,214,151,220,160,53,219,47,114,79,136,181,142,95,253,254,175,246,184,222,244,241,31,109,114,243,191,166,103)
+IMAGE_DATA(125,252,251,27,92,174,254,243,191,173,85,108,93,69,63,126,113,63,61,191,238,24,117,247,12,240,119,243,93,173,4,94)
+IMAGE_DATA(12,150,239,117,148,137,212,219,99,184,153,67,158,245,61,30,214,186,116,199,196,222,224,239,187,213,237,42,232,252,142,211)
+IMAGE_DATA(159,57,115,89,202,185,243,32,193,136,173,112,245,74,86,19,231,129,175,51,87,139,93,174,130,151,21,92,171,212,234,178)
+IMAGE_DATA(85,130,25,139,241,213,210,102,151,171,204,86,103,142,76,68,207,36,195,179,202,154,111,38,51,165,6,73,60,169,172,89)
+IMAGE_DATA(35,254,213,93,107,213,169,81,18,182,150,148,118,58,227,171,186,110,9,57,96,212,44,193,155,74,125,18,2,125,129,177)
+IMAGE_DATA(149,58,37,174,255,77,54,215,43,47,100,30,74,79,125,240,7,222,21,107,106,159,189,82,234,206,97,149,185,53,60,247)
+IMAGE_DATA(230,114,177,59,38,27,158,119,99,240,217,169,99,18,198,234,126,17,186,31,147,172,3,199,254,52,41,60,231,198,172,15)
+IMAGE_DATA(150,188,175,140,169,250,133,151,169,8,225,40,231,127,157,26,38,172,99,243,202,230,243,116,230,66,145,147,235,237,113,215)
+IMAGE_DATA(60,96,159,234,206,95,237,85,127,135,22,158,143,131,124,44,175,157,190,233,52,173,93,249,26,29,89,187,81,113,245,101)
+IMAGE_DATA(246,172,51,109,235,41,56,188,133,104,96,151,98,235,1,162,161,195,42,78,42,255,122,142,104,84,113,114,236,134,226,102)
+IMAGE_DATA(170,98,102,6,115,148,89,58,158,169,111,27,87,247,141,41,159,58,122,150,130,99,199,52,139,21,87,211,46,157,227,181)
+IMAGE_DATA(100,49,166,187,118,239,21,230,234,183,127,182,131,190,241,227,109,28,95,127,102,107,132,87,53,107,150,190,242,221,117,92)
+IMAGE_DATA(183,4,182,226,242,207,95,62,164,206,255,52,77,76,76,69,250,213,121,104,81,164,68,111,65,183,206,178,133,242,222,146)
+IMAGE_DATA(163,13,122,44,103,162,199,14,127,71,249,189,22,243,59,78,231,247,229,177,183,116,178,86,86,142,194,159,171,222,254,105)
+IMAGE_DATA(106,106,30,167,198,166,81,106,110,158,162,198,230,73,170,175,159,160,134,134,113,181,29,163,186,186,113,170,169,195,118,84)
+IMAGE_DATA(63,166,101,148,90,90,2,234,114,187,186,191,145,114,139,235,217,167,194,175,130,175,215,148,175,67,205,18,184,42,53,188)
+IMAGE_DATA(194,75,240,149,185,88,220,200,1,166,10,87,113,31,215,251,150,135,107,147,36,188,215,145,255,53,153,106,134,233,87,133)
+IMAGE_DATA(173,110,143,37,246,164,45,46,87,77,223,138,203,168,89,146,58,96,115,14,13,242,189,17,181,191,24,79,189,88,204,140)
+IMAGE_DATA(209,60,45,112,125,42,152,138,192,101,220,38,227,172,96,165,230,105,41,157,194,117,21,39,249,182,98,55,23,44,243,92)
+IMAGE_DATA(229,241,188,6,186,195,214,72,174,102,243,58,55,224,170,57,95,213,244,171,200,253,234,62,16,186,191,18,24,138,62,134)
+IMAGE_DATA(50,111,213,92,95,213,172,95,50,231,175,130,171,232,9,33,53,194,240,175,103,47,21,58,189,149,186,153,161,200,249,138)
+IMAGE_DATA(79,213,209,75,69,133,141,60,182,250,42,175,149,174,188,227,198,83,180,110,197,65,58,190,126,29,117,100,173,160,150,212)
+IMAGE_DATA(149,52,211,190,138,130,129,117,20,234,219,76,20,216,237,178,53,52,120,66,179,117,228,130,230,43,199,53,55,66,35,201)
+IMAGE_DATA(206,125,167,213,86,49,117,36,137,125,43,81,1,93,56,122,154,251,44,193,175,110,220,127,157,118,29,73,167,111,62,179)
+IMAGE_DATA(205,229,42,2,60,149,90,96,147,169,194,85,196,83,63,216,196,243,110,54,237,189,200,159,113,68,77,109,61,213,34,234)
+IMAGE_DATA(26,212,191,133,6,247,246,134,134,38,106,108,108,142,136,166,166,22,14,243,122,115,115,43,71,75,75,27,181,181,245,57)
+IMAGE_DATA(17,224,104,111,31,162,142,246,17,55,58,59,70,169,173,99,68,197,24,71,107,219,184,27,45,173,99,42,38,56,218,59)
+IMAGE_DATA(38,57,112,185,185,101,220,249,119,60,198,91,137,230,150,137,136,235,136,202,170,248,81,85,61,70,213,53,234,223,125,237)
+IMAGE_DATA(4,111,229,114,204,80,223,15,213,181,163,84,85,51,18,17,184,205,47,240,120,51,106,235,199,85,140,186,129,239,28,124)
+IMAGE_DATA(7,225,251,167,182,110,136,26,26,71,105,120,120,150,41,155,8,243,39,166,137,95,119,189,218,175,9,175,191,105,210,125)
+IMAGE_DATA(95,26,91,198,140,247,6,91,253,254,10,187,131,193,153,248,7,183,178,154,67,248,44,225,243,150,155,63,162,152,50,68)
+IMAGE_DATA(121,5,99,148,149,51,66,105,153,195,148,145,61,76,233,89,67,148,154,49,68,41,233,195,106,59,160,188,220,0,21,20)
+IMAGE_DATA(246,82,126,97,3,229,228,148,80,70,122,14,221,204,44,229,154,37,248,85,206,3,103,213,82,102,122,169,235,87,189,61)
+IMAGE_DATA(27,188,140,52,217,25,185,246,76,115,212,237,174,111,53,248,105,122,81,97,167,48,85,122,236,135,153,218,198,243,84,77)
+IMAGE_DATA(174,202,188,85,246,170,185,77,206,184,106,216,155,178,47,189,82,194,91,196,249,100,61,94,42,99,169,199,207,230,41,142)
+IMAGE_DATA(230,178,63,197,154,170,8,237,85,11,57,196,195,34,132,149,224,233,41,135,157,194,91,204,181,17,174,226,216,178,213,207)
+IMAGE_DATA(161,243,202,194,86,89,3,7,108,53,231,221,48,95,141,117,111,208,239,80,247,129,184,233,50,213,173,89,218,173,231,214)
+IMAGE_DATA(120,123,66,32,127,203,76,221,169,47,35,31,204,117,76,88,127,117,211,57,186,122,189,204,229,40,182,145,76,213,183,229)
+IMAGE_DATA(230,212,113,45,240,202,237,231,105,221,118,112,245,4,115,245,204,230,85,212,145,249,2,53,223,92,78,193,246,151,41,216)
+IMAGE_DATA(183,154,168,103,189,250,113,183,149,66,253,59,148,119,221,171,248,170,216,58,112,84,109,79,40,206,42,118,14,157,85,113)
+IMAGE_DATA(222,137,179,124,91,104,240,20,209,240,81,205,226,225,253,20,26,85,156,165,76,58,186,255,132,242,170,231,249,55,192,150)
+IMAGE_DATA(131,55,105,235,107,55,120,206,42,124,234,55,127,178,141,190,245,211,29,46,87,117,13,240,134,8,174,74,124,231,63,118)
+IMAGE_DATA(113,14,120,119,210,101,74,207,200,82,145,67,25,216,166,103,82,106,90,6,7,110,207,200,204,166,204,172,28,202,206,201)
+IMAGE_DATA(139,136,156,220,252,136,200,205,43,160,188,252,98,245,25,43,81,159,195,114,94,67,175,184,180,133,115,39,186,38,189,139)
+IMAGE_DATA(202,43,122,169,162,178,143,163,188,50,192,81,86,49,64,101,229,67,234,254,97,142,146,210,33,142,194,18,29,101,149,227)
+IMAGE_DATA(84,94,61,78,197,101,35,234,250,8,229,21,14,170,24,166,252,162,17,142,130,226,81,117,251,24,111,205,40,42,141,31)
+IMAGE_DATA(165,234,120,101,229,163,234,156,16,99,110,84,224,249,212,109,21,149,99,110,8,139,113,59,206,177,172,124,68,93,30,246)
+IMAGE_DATA(141,138,202,17,142,202,170,81,55,192,112,14,131,195,96,45,179,221,185,12,238,118,247,78,208,196,212,36,205,204,204,112)
+IMAGE_DATA(238,54,30,95,39,38,103,249,123,173,190,113,156,3,30,129,153,218,56,193,92,133,119,64,48,115,91,166,152,187,56,246)
+IMAGE_DATA(244,244,52,205,206,78,207,121,124,43,43,95,25,243,107,26,154,38,152,167,252,111,174,104,156,50,115,135,212,119,198,176)
+IMAGE_DATA(242,109,145,92,197,109,185,185,253,138,169,29,42,176,238,75,62,127,175,220,200,40,113,230,174,106,174,166,160,23,96,70)
+IMAGE_DATA(25,231,130,107,171,186,57,252,214,109,243,178,82,230,162,114,207,65,117,185,164,176,41,106,126,42,238,67,248,113,85,174)
+IMAGE_DATA(115,45,146,244,214,119,214,86,245,99,169,220,198,115,107,242,116,159,37,233,7,124,53,69,123,84,230,232,101,205,82,230)
+IMAGE_DATA(169,242,106,103,46,22,24,121,223,2,230,234,209,211,57,46,83,197,175,138,103,245,6,223,14,206,130,175,231,195,181,195)
+IMAGE_DATA(50,39,71,179,182,48,226,57,116,20,57,181,194,121,186,142,233,120,142,238,197,100,246,87,114,214,147,19,198,178,103,221)
+IMAGE_DATA(119,131,215,53,7,87,197,163,130,167,8,174,41,242,244,132,192,152,168,174,55,210,243,85,95,85,126,21,60,69,14,24)
+IMAGE_DATA(235,210,100,100,215,81,91,67,15,7,214,235,107,67,79,231,186,94,106,173,237,226,104,83,62,54,229,70,57,247,53,2)
+IMAGE_DATA(87,215,171,231,88,183,225,40,173,126,113,47,157,221,138,28,240,175,169,37,229,69,10,181,191,68,161,222,87,136,186,215)
+IMAGE_DATA(168,216,72,193,222,45,138,179,219,137,250,247,40,255,250,154,138,67,138,179,194,216,99,78,28,81,76,77,98,95,27,28)
+IMAGE_DATA(216,207,57,228,208,192,78,157,19,14,41,239,190,253,8,255,14,16,174,174,223,125,153,231,215,160,47,196,183,20,87,177)
+IMAGE_DATA(5,103,193,85,240,212,12,48,22,1,222,254,100,249,1,229,121,79,209,145,51,55,152,169,105,233,217,148,166,88,154,150)
+IMAGE_DATA(154,69,41,169,96,171,195,218,204,92,245,239,0,44,45,224,200,202,206,231,109,78,110,97,68,128,169,136,130,194,50,197)
+IMAGE_DATA(197,42,167,6,189,83,49,172,131,138,74,58,169,164,172,91,49,180,223,225,105,159,19,145,92,117,153,90,58,168,62,227)
+IMAGE_DATA(131,234,179,59,192,236,43,171,26,99,174,22,20,15,51,83,243,10,70,29,190,14,242,109,224,45,182,230,229,185,184,90)
+IMAGE_DATA(28,193,213,209,8,174,226,249,252,185,10,246,15,242,249,74,36,194,85,151,173,17,62,119,88,251,95,199,7,35,224,233)
+IMAGE_DATA(135,135,135,105,114,124,202,101,107,44,49,87,27,39,52,83,21,95,241,29,215,200,219,41,151,169,240,170,136,70,135,183)
+IMAGE_DATA(131,131,1,26,27,25,165,169,9,176,117,54,238,241,173,172,226,9,191,201,240,59,14,255,222,228,223,102,78,222,176,246)
+IMAGE_DATA(171,57,131,138,171,35,142,87,85,172,205,12,40,143,218,167,189,93,126,181,250,14,41,96,191,154,226,112,21,113,45,167)
+IMAGE_DATA(133,185,154,157,89,166,231,175,214,234,53,198,209,243,72,250,29,49,27,29,158,234,122,222,182,216,190,180,88,207,153,145)
+IMAGE_DATA(254,131,102,31,66,175,87,229,156,111,97,27,135,185,70,57,46,227,156,133,169,114,89,122,43,73,238,87,234,148,36,247)
+IMAGE_DATA(235,142,161,42,175,138,49,84,228,125,79,159,87,156,59,155,79,39,206,228,185,113,252,180,98,232,169,176,87,117,189,37)
+IMAGE_DATA(250,253,162,31,161,211,63,73,215,29,229,58,125,128,53,91,143,59,126,86,184,202,125,248,47,20,48,115,133,175,96,170)
+IMAGE_DATA(112,22,143,61,234,172,125,35,117,193,50,151,213,237,1,145,164,249,138,173,233,93,55,99,45,184,93,88,111,53,217,101)
+IMAGE_DATA(42,242,188,96,169,132,204,93,133,63,93,181,53,204,88,244,118,224,216,112,78,189,223,45,212,94,223,167,162,135,25,218)
+IMAGE_DATA(90,223,77,205,210,83,203,137,243,234,61,123,97,253,113,229,121,47,177,95,93,179,238,48,173,248,245,118,58,191,237,5)
+IMAGE_DATA(106,186,249,75,106,77,251,53,133,58,87,16,117,188,164,98,37,81,167,98,107,231,58,229,93,55,105,239,218,171,88,217)
+IMAGE_DATA(183,91,49,118,159,14,230,44,98,191,115,155,98,111,159,242,183,189,235,181,207,157,188,76,52,170,188,248,166,163,180,124)
+IMAGE_DATA(203,5,174,7,222,145,116,147,231,174,162,39,196,55,159,217,193,91,248,214,39,159,222,70,95,249,193,6,158,87,131,192)
+IMAGE_DATA(188,85,147,169,79,254,112,35,175,195,179,106,199,5,58,119,249,6,127,198,153,171,42,110,166,167,197,229,106,152,173,121)
+IMAGE_DATA(14,83,77,175,90,196,94,181,172,172,73,241,177,75,121,213,78,42,46,238,118,185,90,94,57,232,250,84,211,175,130,85)
+IMAGE_DATA(224,106,113,201,32,135,248,85,248,81,253,239,118,76,177,112,156,127,23,139,95,245,122,86,29,195,17,124,69,196,243,171)
+IMAGE_DATA(94,166,122,125,170,31,87,53,79,195,126,53,22,91,77,158,154,92,245,203,23,131,177,240,171,13,234,119,92,119,119,55)
+IMAGE_DATA(13,13,13,209,196,196,4,179,47,150,198,199,166,153,165,154,171,19,154,171,240,170,204,84,205,210,38,217,182,142,243,237)
+IMAGE_DATA(109,109,109,212,219,219,75,35,35,35,52,53,53,245,58,115,53,24,99,123,107,138,152,115,100,125,248,29,23,62,59,248)
+IMAGE_DATA(29,135,127,107,165,21,19,234,223,232,132,203,85,246,173,224,106,218,168,98,235,32,115,53,59,187,87,125,63,180,82,94)
+IMAGE_DATA(94,21,115,53,51,35,215,229,170,246,171,224,106,35,115,21,185,96,140,181,213,215,244,178,103,149,58,164,72,118,182,115)
+IMAGE_DATA(200,124,25,169,235,53,123,228,35,208,203,65,184,44,183,203,216,41,231,123,11,194,185,92,97,42,214,167,145,181,223,112)
+IMAGE_DATA(221,188,31,91,248,85,244,127,64,175,125,89,15,78,106,125,197,171,186,92,189,92,196,99,169,96,234,241,211,138,141,39)
+IMAGE_DATA(178,140,200,225,192,252,19,241,171,102,78,248,152,83,211,43,99,163,82,219,43,124,197,253,110,190,216,241,164,39,156,220)
+IMAGE_DATA(177,212,19,135,189,177,230,181,172,35,135,30,17,152,111,35,28,21,166,74,152,227,174,240,173,24,103,69,254,87,152,170)
+IMAGE_DATA(123,40,93,214,158,212,233,175,36,117,191,43,55,233,90,37,132,94,123,245,44,115,21,239,127,61,214,145,87,44,173,173)
+IMAGE_DATA(65,143,200,78,245,187,73,253,94,170,82,127,203,74,108,59,213,185,230,209,242,141,167,20,191,149,31,70,237,210,154,36)
+IMAGE_DATA(90,241,171,173,116,105,231,115,212,124,253,89,106,79,125,78,249,213,229,68,173,207,19,181,44,167,80,155,242,173,237,171)
+IMAGE_DATA(21,99,215,42,190,110,32,234,218,172,24,187,69,197,54,10,114,236,224,8,245,110,231,235,184,47,164,60,110,168,123,53)
+IMAGE_DATA(223,22,154,186,64,99,93,234,247,194,218,227,244,194,134,179,236,87,119,30,78,161,95,174,62,193,156,68,143,37,169,255)
+IMAGE_DATA(197,252,85,153,87,131,8,247,133,208,108,197,227,49,191,102,237,206,243,116,237,102,6,115,213,245,172,233,153,81,92,21)
+IMAGE_DATA(143,154,8,87,139,75,42,213,103,183,57,130,171,133,197,29,138,171,189,30,174,14,114,120,253,170,151,171,194,86,185,108)
+IMAGE_DATA(50,85,182,247,50,87,117,12,235,188,112,85,27,53,53,53,49,251,70,71,71,217,179,198,98,68,162,92,69,30,24,121)
+IMAGE_DATA(97,60,174,166,166,134,90,91,91,41,16,8,204,201,237,59,175,88,28,245,175,11,75,4,149,186,47,134,101,234,221,144)
+IMAGE_DATA(112,85,255,251,212,185,224,236,220,97,30,99,205,202,27,102,174,222,76,85,145,54,64,105,25,3,148,149,213,67,185,249)
+IMAGE_DATA(109,236,87,179,115,10,249,123,37,37,163,152,46,103,160,39,68,35,215,46,93,7,207,50,52,87,27,106,251,34,184,170)
+IMAGE_DATA(243,192,157,78,46,55,114,190,105,100,93,111,116,111,7,237,85,117,15,66,158,47,227,172,159,106,230,114,37,192,83,89)
+IMAGE_DATA(163,92,184,138,96,230,22,132,67,250,63,232,241,212,202,8,166,114,95,66,39,144,255,61,117,174,192,101,234,225,19,233)
+IMAGE_DATA(116,248,120,38,37,29,203,80,161,174,43,223,152,116,34,219,229,168,57,206,122,212,241,169,24,19,69,254,86,214,170,241)
+IMAGE_DATA(6,60,173,120,216,227,238,216,108,152,171,122,28,55,223,229,42,198,87,165,39,63,207,101,117,152,202,227,173,135,195,61)
+IMAGE_DATA(152,100,156,21,92,197,248,170,158,71,147,204,44,149,53,106,196,143,202,56,42,182,47,227,118,135,171,120,12,216,138,92)
+IMAGE_DATA(48,114,15,213,255,63,123,239,225,29,215,121,157,123,255,9,223,250,214,250,114,83,156,196,137,157,56,201,141,99,167,186)
+IMAGE_DATA(37,182,227,196,142,227,94,226,42,91,149,146,168,70,137,85,36,197,94,197,222,123,239,0,8,128,0,27,72,130,21,68)
+IMAGE_DATA(239,3,96,102,208,123,7,209,216,169,194,217,223,126,246,123,246,123,222,51,0,37,58,177,44,250,94,204,90,123,157,51)
+IMAGE_DATA(133,32,8,98,230,119,158,93,158,93,223,195,159,131,124,157,83,219,99,3,60,5,87,107,234,122,41,233,120,158,244,45)
+IMAGE_DATA(65,175,174,219,193,127,110,245,97,90,54,127,27,101,29,92,64,245,231,102,83,119,206,124,102,233,34,162,214,5,68,45)
+IMAGE_DATA(204,214,214,55,41,214,190,130,238,183,175,226,199,215,26,198,122,26,54,214,195,58,182,119,83,32,132,167,189,120,205,10)
+IMAGE_DATA(225,42,189,123,142,58,171,79,209,202,245,199,105,241,198,19,242,111,216,151,146,67,179,86,36,73,206,215,247,90,50,190)
+IMAGE_DATA(16,58,87,3,189,234,214,89,113,124,97,198,118,201,97,111,217,127,134,114,10,138,29,174,230,11,91,179,175,154,99,60)
+IMAGE_DATA(87,113,212,208,26,171,97,106,185,151,3,174,162,170,170,122,249,221,54,61,232,221,172,85,123,37,42,195,3,134,57,53)
+IMAGE_DATA(215,13,79,157,92,170,234,213,7,113,181,52,116,61,160,79,93,174,186,108,141,207,7,255,182,112,181,174,225,166,112,21)
+IMAGE_DATA(58,31,236,235,238,238,150,124,48,106,161,255,83,174,182,182,223,19,189,138,215,85,85,241,231,85,83,19,245,247,247,211)
+IMAGE_DATA(237,219,183,31,41,174,250,255,76,175,167,234,125,240,24,255,115,137,57,253,212,99,108,253,224,110,250,179,5,87,209,107)
+IMAGE_DATA(135,247,31,122,151,160,85,193,213,162,146,155,114,132,110,205,202,185,46,1,174,230,21,246,241,115,237,252,90,159,171,89)
+IMAGE_DATA(185,33,58,147,93,79,103,115,26,132,173,151,10,155,41,55,167,146,35,44,126,247,8,249,44,230,48,121,224,238,17,53)
+IMAGE_DATA(82,229,169,242,213,229,106,124,223,175,236,39,47,239,176,250,83,251,142,148,157,178,239,173,160,81,162,160,176,137,239,183)
+IMAGE_DATA(216,61,53,56,138,79,97,73,171,221,177,170,187,224,92,255,124,229,170,214,84,79,156,49,185,95,209,167,96,233,177,28)
+IMAGE_DATA(143,169,134,171,96,42,66,53,171,203,85,176,20,76,245,185,90,106,217,170,51,52,241,76,61,150,81,234,249,75,148,5)
+IMAGE_DATA(180,170,50,91,245,170,238,102,85,174,74,238,215,211,167,202,83,13,211,23,124,217,235,77,202,244,119,170,178,14,197,81)
+IMAGE_DATA(185,10,118,174,146,154,170,151,251,221,102,158,195,107,144,43,174,175,235,179,122,21,161,255,191,154,79,192,57,60,247,241)
+IMAGE_DATA(117,193,213,181,219,79,209,170,85,135,104,249,188,173,148,127,100,22,85,159,122,131,250,242,102,179,86,157,79,212,140,88)
+IMAGE_DATA(104,216,218,178,148,249,186,156,245,43,179,181,221,4,177,142,53,90,118,141,137,46,102,110,55,71,215,10,147,71,238,92)
+IMAGE_DATA(42,154,150,98,23,41,154,151,66,139,61,174,174,217,117,134,246,167,230,138,167,190,153,169,9,122,2,171,191,146,230,126)
+IMAGE_DATA(181,198,138,243,215,230,237,163,149,91,143,211,190,196,243,65,174,230,229,26,174,178,86,253,85,185,138,126,165,178,242,10)
+IMAGE_DATA(230,85,173,204,32,129,169,232,85,170,168,234,99,189,138,99,191,229,145,219,167,132,199,220,218,170,230,130,193,85,213,161)
+IMAGE_DATA(163,113,213,13,95,179,254,118,234,85,229,106,69,69,35,69,163,81,234,236,236,148,92,48,114,181,163,206,208,240,99,183)
+IMAGE_DATA(111,189,53,42,87,229,24,167,87,149,171,229,229,229,194,109,228,154,161,135,63,92,174,250,255,150,224,253,119,71,32,213)
+IMAGE_DATA(232,208,209,191,215,248,252,239,152,103,227,7,123,115,185,218,216,116,83,122,29,164,39,88,216,106,248,90,80,116,221,214)
+IMAGE_DATA(87,165,111,41,127,152,242,139,174,241,107,186,248,245,245,204,169,42,169,45,129,171,167,174,212,208,233,172,90,97,235,133)
+IMAGE_DATA(188,102,202,201,174,226,235,250,74,235,119,175,92,245,115,185,65,45,10,214,186,126,248,46,67,71,204,159,134,218,108,223)
+IMAGE_DATA(145,230,117,53,172,86,101,158,42,55,117,151,170,61,247,230,83,213,151,80,253,30,160,85,213,63,95,217,138,252,47,116)
+IMAGE_DATA(42,152,154,146,94,72,41,172,81,143,166,228,142,224,42,120,138,80,190,42,83,147,61,175,36,195,84,223,215,65,247,192)
+IMAGE_DATA(185,243,169,150,169,56,207,240,117,172,219,11,156,108,181,175,207,85,205,5,131,169,241,250,20,44,213,89,27,213,170,96)
+IMAGE_DATA(170,234,84,176,15,123,199,113,196,125,112,21,179,52,224,170,244,41,49,123,85,179,34,7,188,121,223,5,201,253,54,97)
+IMAGE_DATA(39,110,83,191,28,85,183,154,99,151,196,174,35,151,229,235,202,28,236,150,227,180,124,229,1,90,62,103,61,21,38,78)
+IMAGE_DATA(163,200,241,233,212,159,63,147,98,45,115,136,26,230,114,48,91,27,89,187,54,45,166,88,51,243,181,121,153,9,48,214)
+IMAGE_DATA(9,232,89,234,88,105,66,114,199,111,242,113,161,225,42,101,81,238,217,4,102,106,186,228,129,81,67,222,159,154,79,175)
+IMAGE_DATA(206,217,99,61,129,125,189,26,236,5,118,251,150,158,157,186,153,166,47,61,44,59,228,146,143,103,81,118,126,65,32,7)
+IMAGE_DATA(156,195,140,5,87,227,235,171,62,79,131,189,75,62,87,67,194,85,201,3,179,238,130,39,181,203,213,242,80,63,115,211)
+IMAGE_DATA(229,167,9,151,169,174,94,5,27,227,245,234,131,34,152,11,190,245,91,195,213,58,219,179,100,242,192,161,80,3,69,34)
+IMAGE_DATA(17,169,131,126,16,92,45,43,43,123,228,184,26,159,247,197,252,70,111,239,109,234,237,185,195,186,250,14,221,185,251,238)
+IMAGE_DATA(3,102,123,223,203,207,107,140,171,31,244,205,234,213,50,63,138,75,13,99,193,85,232,85,195,213,97,230,208,117,102,210)
+IMAGE_DATA(0,191,166,155,63,43,88,251,149,212,136,102,205,206,175,162,147,151,107,133,173,208,173,231,115,155,232,202,213,10,202,186)
+IMAGE_DATA(18,18,93,10,158,66,227,168,118,53,108,237,9,248,224,99,207,140,238,111,27,173,207,215,245,74,26,141,165,208,168,8)
+IMAGE_DATA(228,124,37,152,157,178,71,181,184,201,238,82,85,214,6,153,218,40,126,74,152,169,113,107,170,240,80,18,31,165,179,21)
+IMAGE_DATA(82,83,77,61,94,36,121,95,4,52,107,34,179,53,33,57,199,4,127,126,39,30,43,8,104,85,237,7,214,154,106,188)
+IMAGE_DATA(215,47,248,168,28,85,221,170,181,85,101,168,207,227,34,135,201,69,193,25,27,230,169,214,87,3,179,53,7,46,123,254)
+IMAGE_DATA(74,23,229,8,166,202,190,114,207,71,73,243,186,224,169,134,106,86,201,3,243,107,208,3,44,189,181,219,50,44,87,193)
+IMAGE_DATA(104,104,84,48,181,165,121,64,184,138,156,176,225,42,235,214,250,62,57,110,222,127,222,236,51,199,215,218,124,140,150,46)
+IMAGE_DATA(219,79,111,206,90,78,229,71,167,80,69,202,52,26,200,127,157,98,77,204,214,186,55,40,86,59,151,98,245,243,152,175)
+IMAGE_DATA(11,13,95,27,153,173,141,139,77,52,45,33,97,45,107,89,123,132,174,149,88,196,231,204,228,158,93,4,174,158,74,62)
+IMAGE_DATA(68,139,54,165,211,146,77,39,105,211,129,11,194,213,151,102,26,158,190,48,99,151,245,132,112,107,169,65,166,110,145,61)
+IMAGE_DATA(54,240,61,4,87,79,158,185,42,253,238,202,85,204,214,24,174,230,141,208,172,202,86,173,177,26,166,134,188,62,96,159)
+IMAGE_DATA(171,232,91,170,170,106,14,112,181,44,212,43,179,107,58,59,83,86,97,244,40,122,126,149,181,170,83,53,226,185,234,235)
+IMAGE_DATA(212,225,64,46,216,237,93,242,235,177,183,31,154,171,224,230,163,162,87,31,150,171,184,61,44,87,181,111,169,161,233,54)
+IMAGE_DATA(149,150,150,62,114,92,141,215,151,215,175,191,67,253,215,222,18,207,129,254,193,251,124,124,151,25,123,143,250,250,238,240)
+IMAGE_DATA(247,140,30,102,215,147,54,232,131,60,118,251,205,220,240,59,233,114,21,44,197,177,180,252,118,28,87,135,37,242,11,135)
+IMAGE_DATA(13,87,75,123,13,219,88,179,150,148,132,41,183,48,66,39,46,213,8,91,79,94,101,205,122,181,158,46,94,10,209,133)
+IMAGE_DATA(139,229,194,67,151,171,38,23,220,19,224,42,206,227,119,184,85,89,191,94,223,195,87,153,26,224,103,81,147,189,143,254)
+IMAGE_DATA(35,48,83,53,169,106,84,151,163,26,208,168,168,169,42,83,221,252,175,114,21,222,15,232,85,82,173,170,76,197,57,52)
+IMAGE_DATA(106,98,74,190,48,85,185,170,58,53,57,189,212,234,85,245,246,53,187,202,221,240,185,170,90,85,123,149,142,201,62,115)
+IMAGE_DATA(213,185,166,142,138,80,125,138,154,170,50,213,173,163,170,70,53,117,84,195,84,245,122,176,126,15,172,67,133,169,91,51)
+IMAGE_DATA(2,76,141,103,171,104,215,45,167,228,92,242,194,96,44,63,6,159,5,112,21,76,69,128,175,200,9,67,195,42,87,17)
+IMAGE_DATA(235,247,154,60,50,242,177,171,54,166,210,194,197,187,105,217,236,165,20,78,153,68,101,71,39,210,245,252,41,204,210,105)
+IMAGE_DATA(68,213,51,136,162,111,16,213,204,34,2,95,57,168,110,30,199,2,195,217,248,0,119,155,189,99,195,108,230,46,107,222)
+IMAGE_DATA(238,189,146,7,62,176,243,0,45,92,111,184,186,133,245,242,238,164,108,235,3,241,226,116,79,175,78,221,26,200,251,198)
+IMAGE_DATA(207,215,128,171,216,197,190,118,231,73,58,127,41,87,152,41,108,205,241,242,191,217,5,150,171,241,186,21,92,85,158,250)
+IMAGE_DATA(76,173,176,115,171,202,85,213,171,90,95,45,45,239,225,231,6,188,28,237,176,115,28,22,205,10,182,26,253,58,236,232)
+IMAGE_DATA(213,225,17,92,141,103,236,175,139,171,102,102,245,183,139,171,183,110,222,251,149,184,250,48,122,245,195,169,75,170,7,163)
+IMAGE_DATA(249,187,123,186,239,10,83,53,250,7,113,124,139,6,249,56,208,255,54,245,245,222,21,45,59,60,124,143,222,189,175,27)
+IMAGE_DATA(199,220,175,53,198,216,223,196,13,92,109,104,244,222,131,224,169,120,67,220,146,60,48,124,33,114,242,135,101,198,6,124)
+IMAGE_DATA(5,103,139,75,208,15,220,103,122,130,203,26,249,26,47,66,121,69,81,74,187,88,45,92,61,145,85,67,25,87,234,41)
+IMAGE_DATA(243,98,153,112,21,60,4,43,53,7,44,154,52,110,119,155,59,63,163,108,197,231,142,178,180,172,28,253,187,45,18,226)
+IMAGE_DATA(221,91,216,200,159,99,245,166,47,9,189,188,133,102,215,140,171,71,81,63,213,26,170,50,21,190,132,240,34,84,191,95)
+IMAGE_DATA(245,37,68,93,213,237,85,66,238,87,102,86,225,165,127,38,100,251,149,48,163,138,56,154,238,245,41,129,173,199,252,0)
+IMAGE_DATA(87,229,60,181,200,220,247,180,37,120,104,52,170,207,213,209,122,150,212,59,34,213,203,247,170,78,149,26,106,178,223,159)
+IMAGE_DATA(164,71,225,42,252,129,189,94,223,237,7,178,104,219,126,102,234,190,203,194,84,228,108,197,71,127,207,121,59,155,186,202)
+IMAGE_DATA(227,42,114,165,224,15,114,181,136,37,27,78,216,124,48,216,234,115,213,120,240,131,171,224,228,65,254,247,128,163,152,121)
+IMAGE_DATA(104,105,233,151,104,108,238,231,235,253,107,18,245,141,125,210,191,180,102,87,134,244,26,111,220,147,73,43,54,36,209,252)
+IMAGE_DATA(133,59,105,197,156,197,20,62,250,42,149,30,153,64,55,243,39,50,67,39,17,133,153,173,97,214,174,209,233,194,215,88)
+IMAGE_DATA(181,9,170,153,227,112,118,129,23,243,108,196,234,241,60,51,185,145,217,218,189,159,232,221,51,180,105,221,30,90,184,246)
+IMAGE_DATA(184,252,219,182,38,92,161,13,123,206,218,220,175,122,67,140,159,182,109,68,255,175,222,71,126,24,59,108,22,111,72,163)
+IMAGE_DATA(45,251,206,137,6,5,47,225,255,96,120,26,228,170,246,5,67,183,198,115,85,107,170,26,232,89,42,15,85,50,19,171)
+IMAGE_DATA(41,26,109,51,90,53,220,45,117,85,112,181,168,236,154,104,205,226,178,33,111,238,116,52,174,250,249,96,151,171,170,81)
+IMAGE_DATA(125,174,94,15,48,53,158,171,218,195,244,219,192,85,119,206,198,229,42,250,150,126,29,92,117,251,129,193,213,250,250,122)
+IMAGE_DATA(214,126,125,143,0,87,29,159,69,245,26,224,147,190,222,119,168,111,224,14,13,48,75,17,215,6,222,114,24,251,142,112)
+IMAGE_DATA(22,49,56,240,14,93,235,187,199,215,8,55,233,237,119,238,7,124,46,254,39,59,86,198,110,15,119,19,174,54,248,181)
+IMAGE_DATA(85,173,175,162,23,24,190,16,121,249,55,165,198,138,89,86,104,85,121,255,151,194,111,73,231,63,153,101,37,208,170,213)
+IMAGE_DATA(54,78,93,169,163,179,231,203,132,173,224,34,24,25,142,248,122,84,153,106,184,234,247,249,106,46,24,129,215,87,56,121)
+IMAGE_DATA(95,237,229,133,46,205,243,244,166,134,122,226,235,206,25,229,171,238,38,87,255,36,248,18,94,206,169,241,194,223,75,46)
+IMAGE_DATA(59,105,46,133,133,163,58,167,234,206,171,202,204,106,70,153,120,42,185,117,83,173,169,30,77,43,17,166,66,183,30,73)
+IMAGE_DATA(201,163,195,172,233,142,224,156,3,218,18,92,132,238,196,142,26,157,99,213,90,233,8,190,122,253,190,154,47,182,222,15)
+IMAGE_DATA(78,111,146,234,84,241,128,192,174,242,67,89,1,127,66,245,82,194,185,122,232,203,44,170,215,171,164,61,72,134,167,167)
+IMAGE_DATA(36,22,175,63,73,139,214,157,48,124,101,46,193,219,87,249,170,243,54,184,143,239,175,190,177,87,242,191,90,99,133,167)
+IMAGE_DATA(101,107,203,160,209,174,205,215,152,23,157,252,250,19,180,97,103,166,120,224,47,95,159,40,92,93,53,103,62,85,29,125)
+IMAGE_DATA(137,74,14,189,72,119,11,94,37,138,76,162,88,197,20,162,202,169,38,194,51,132,177,20,153,238,235,88,68,245,44,143)
+IMAGE_DATA(181,208,180,179,253,99,237,84,195,217,222,35,68,55,79,209,234,149,251,104,193,134,116,249,222,183,39,94,166,229,252,61)
+IMAGE_DATA(251,94,192,254,238,26,213,172,168,165,142,155,178,73,246,220,104,221,245,149,89,187,104,249,230,84,218,113,248,140,225,170)
+IMAGE_DATA(204,103,251,158,16,89,185,121,204,211,92,9,213,171,202,85,245,93,66,191,82,105,73,5,149,133,202,133,167,134,169,97)
+IMAGE_DATA(230,66,13,115,161,145,170,107,59,153,45,189,94,109,181,79,234,42,133,165,125,1,63,7,120,62,132,42,124,125,234,107)
+IMAGE_DATA(85,51,207,170,179,53,110,253,244,65,60,133,215,139,91,99,45,175,184,43,154,21,51,175,8,204,191,154,25,216,91,246)
+IMAGE_DATA(92,235,170,96,170,241,114,24,157,165,198,243,240,174,132,239,11,113,243,129,190,16,62,91,29,158,122,158,137,193,184,231)
+IMAGE_DATA(213,85,111,138,79,34,188,12,113,13,95,21,169,148,190,165,225,27,239,93,95,125,251,109,211,231,11,159,37,120,65,192)
+IMAGE_DATA(27,162,181,245,29,159,169,240,88,106,55,199,214,142,187,226,121,88,92,90,194,122,181,225,17,201,3,7,235,161,240,51)
+IMAGE_DATA(190,113,35,38,57,224,190,254,183,68,155,198,7,52,171,6,216,58,52,100,114,198,119,238,220,161,123,247,238,57,94,26)
+IMAGE_DATA(99,154,245,131,190,185,92,213,30,96,232,82,132,206,219,128,175,210,35,92,58,108,152,10,189,90,222,197,159,23,204,214)
+IMAGE_DATA(16,118,128,55,121,245,213,58,169,177,226,120,38,179,148,206,93,40,21,173,169,187,195,35,81,63,7,28,14,228,128,123)
+IMAGE_DATA(45,115,149,187,120,61,184,138,222,36,173,159,22,22,153,62,223,60,143,147,70,115,214,216,64,79,175,238,73,85,182,250)
+IMAGE_DATA(90,181,206,241,208,175,14,48,213,213,169,202,83,232,84,229,42,244,170,241,255,245,231,76,117,142,84,123,149,160,79,193)
+IMAGE_DATA(212,67,71,115,36,14,30,101,93,153,148,43,249,90,176,17,156,84,157,170,189,71,58,203,234,122,233,227,181,26,224,169)
+IMAGE_DATA(246,36,41,83,225,243,96,247,191,37,250,92,117,253,243,221,0,87,161,83,117,166,198,173,169,130,161,202,83,232,60,229)
+IMAGE_DATA(170,251,60,52,45,234,170,152,153,1,135,241,51,168,175,239,54,76,101,134,34,23,220,218,106,114,194,96,107,19,235,215)
+IMAGE_DATA(146,242,22,241,42,18,159,137,29,25,180,98,221,81,154,51,111,11,173,155,251,6,133,147,158,163,210,131,47,210,91,121)
+IMAGE_DATA(47,81,44,244,42,221,47,127,141,168,156,181,107,104,50,51,118,170,199,217,105,38,192,88,225,236,76,9,104,90,13,240)
+IMAGE_DATA(246,126,148,255,108,13,107,218,222,68,186,223,151,70,111,46,223,35,243,170,224,234,174,196,43,180,112,253,49,187,183,230)
+IMAGE_DATA(121,111,143,141,240,115,138,175,85,69,175,78,246,253,32,166,46,58,64,171,183,159,164,3,201,23,76,14,216,225,42,230)
+IMAGE_DATA(107,148,169,8,245,138,208,58,171,250,67,64,179,26,191,194,40,85,86,54,72,224,28,51,54,117,117,93,38,87,94,103)
+IMAGE_DATA(124,149,66,21,3,242,126,130,78,69,174,168,184,108,192,225,229,245,17,161,181,87,211,171,228,122,64,92,183,76,214,58)
+IMAGE_DATA(107,124,148,50,171,53,84,255,198,135,169,231,222,160,80,248,186,245,50,52,156,116,195,127,76,123,155,192,73,211,187,28)
+IMAGE_DATA(228,234,123,178,181,230,58,95,99,12,75,24,159,165,235,129,168,99,150,170,239,82,125,61,190,102,31,255,185,62,106,168)
+IMAGE_DATA(27,166,166,230,155,226,149,164,62,201,136,246,142,123,214,63,25,90,180,174,233,45,230,241,48,255,172,135,168,166,126,144)
+IMAGE_DATA(170,171,135,228,92,254,78,62,175,169,29,52,207,213,14,80,109,77,159,212,192,31,29,174,6,111,247,233,93,211,171,228)
+IMAGE_DATA(213,86,31,134,171,208,172,157,157,67,50,239,43,62,85,30,91,199,230,108,62,248,155,114,85,251,127,81,67,85,142,234)
+IMAGE_DATA(220,13,30,7,115,241,190,47,45,235,151,207,1,244,89,72,191,69,168,147,175,179,219,233,228,165,186,0,87,207,93,40)
+IMAGE_DATA(103,205,90,194,76,108,18,62,170,102,13,71,59,45,55,171,188,60,176,171,81,195,222,115,102,207,120,151,229,106,129,87)
+IMAGE_DATA(35,85,141,10,134,130,165,151,179,162,116,229,106,181,4,238,131,159,110,29,85,107,169,200,253,42,87,213,79,95,251,127)
+IMAGE_DATA(49,75,35,76,69,254,247,60,188,122,203,101,182,69,189,122,149,169,102,230,165,194,247,195,135,246,244,116,43,180,170,240)
+IMAGE_DATA(52,41,155,153,202,154,50,49,135,246,37,100,11,91,53,15,108,216,90,18,232,99,194,227,8,48,21,28,213,0,79,101)
+IMAGE_DATA(22,213,99,170,236,38,79,204,30,117,103,13,122,125,85,155,106,184,251,105,192,55,48,213,103,233,113,27,139,214,165,211)
+IMAGE_DATA(130,53,38,12,91,211,229,113,125,221,162,13,199,13,103,55,155,60,241,105,254,249,52,52,244,4,184,138,92,48,180,42)
+IMAGE_DATA(184,218,194,218,21,215,89,216,3,99,252,133,51,104,249,218,4,122,99,246,70,218,52,127,26,133,19,198,81,249,193,231)
+IMAGE_DATA(233,126,254,120,162,210,151,136,74,94,36,42,126,153,143,19,137,202,38,113,128,179,147,37,192,90,2,103,43,12,103,3)
+IMAGE_DATA(218,22,247,171,38,176,150,157,71,177,254,20,186,221,116,148,22,44,59,64,243,214,164,138,198,222,153,112,153,102,188,121)
+IMAGE_DATA(68,120,41,249,95,235,9,177,85,116,170,241,4,246,230,87,29,174,206,89,121,68,122,150,142,157,186,26,168,171,102,67)
+IMAGE_DATA(159,94,53,222,192,57,94,30,24,44,213,208,222,165,162,194,50,42,41,14,137,70,173,20,95,165,78,62,182,75,77,53)
+IMAGE_DATA(18,105,101,173,223,207,215,30,67,172,193,134,152,43,67,102,102,38,52,232,228,128,7,45,43,13,103,175,203,245,172,245)
+IMAGE_DATA(239,246,244,169,225,112,124,12,200,177,168,20,255,7,253,35,162,184,188,79,2,239,95,232,228,248,8,85,94,179,81,86)
+IMAGE_DATA(57,96,25,30,31,161,170,27,246,8,254,226,8,6,155,222,229,33,209,215,102,230,214,15,151,179,194,90,207,3,35,90)
+IMAGE_DATA(51,32,81,205,140,211,168,145,184,38,215,30,224,97,109,3,115,175,97,200,48,86,245,236,3,189,251,77,192,179,191,190)
+IMAGE_DATA(233,58,181,117,180,51,67,171,37,119,80,92,92,74,121,121,57,148,159,159,207,159,37,185,18,234,241,140,255,179,138,138)
+IMAGE_DATA(114,254,115,141,194,161,15,127,126,53,120,3,9,209,159,100,244,234,189,135,230,106,125,67,43,95,247,182,74,110,27,62)
+IMAGE_DATA(82,239,53,243,59,118,251,245,221,148,171,133,197,134,169,232,249,117,185,234,207,181,154,247,117,25,191,239,131,92,237,22)
+IMAGE_DATA(237,26,175,87,193,85,232,213,162,226,70,187,55,92,117,171,50,179,210,155,89,85,221,170,172,53,90,181,203,250,248,150)
+IMAGE_DATA(148,250,123,198,53,239,11,134,42,79,93,174,170,110,85,61,139,184,146,91,107,235,168,8,61,183,92,205,172,242,181,169)
+IMAGE_DATA(231,23,168,59,83,213,179,55,221,241,242,69,232,44,169,106,86,155,3,78,49,58,117,239,145,171,194,85,240,21,156,116)
+IMAGE_DATA(107,172,70,167,150,89,174,106,111,18,114,189,26,240,118,16,191,223,36,39,231,155,24,183,3,206,155,75,213,29,112,234)
+IMAGE_DATA(241,171,1,158,74,255,239,118,211,251,11,86,130,155,136,133,107,211,236,113,193,154,99,94,248,124,93,184,222,231,170,214)
+IMAGE_DATA(95,113,63,243,114,149,112,21,53,214,198,70,175,47,184,165,223,239,99,98,237,154,95,84,79,107,118,152,89,151,245,59)
+IMAGE_DATA(153,201,43,15,209,235,51,214,211,206,5,19,169,234,224,211,84,121,224,25,162,130,103,41,86,240,60,81,225,120,47,94)
+IMAGE_DATA(33,42,122,197,50,54,86,194,204,44,125,213,240,214,227,172,229,46,2,140,45,127,145,181,235,60,162,193,99,212,89,118)
+IMAGE_DATA(136,230,44,59,68,115,87,167,200,191,117,103,66,150,204,216,128,159,193,157,112,155,133,173,174,47,196,115,252,152,201,3)
+IMAGE_DATA(195,103,41,153,214,239,62,195,191,19,185,226,177,175,126,192,154,247,205,241,30,243,89,90,100,189,247,11,10,139,69,175)
+IMAGE_DATA(150,149,86,50,119,106,189,126,223,30,57,226,119,29,215,148,13,141,67,124,237,113,157,26,155,140,151,18,114,189,101,149)
+IMAGE_DATA(170,35,175,203,177,188,252,122,144,171,37,198,91,84,239,155,231,12,63,131,76,53,97,30,31,176,156,69,148,242,185,125)
+IMAGE_DATA(207,150,251,252,140,231,41,234,189,202,213,32,79,181,30,123,99,68,192,255,84,34,114,195,122,88,60,136,167,1,13,203)
+IMAGE_DATA(92,173,6,83,29,174,214,120,1,166,66,75,34,160,57,193,87,104,88,237,99,18,13,219,120,199,235,105,186,25,216,133)
+IMAGE_DATA(35,209,112,79,88,220,220,218,66,53,53,53,124,109,83,37,243,169,229,229,165,20,10,85,114,132,2,81,89,89,249,72)
+IMAGE_DATA(249,45,249,236,51,57,219,219,183,239,251,57,224,129,135,203,3,67,223,162,166,95,91,91,107,114,231,195,195,143,128,63)
+IMAGE_DATA(227,255,29,55,252,140,145,99,81,173,234,114,21,239,95,241,28,45,187,229,121,69,220,144,235,233,145,92,237,25,193,85)
+IMAGE_DATA(212,87,17,121,133,117,252,89,209,46,81,86,209,230,247,245,134,218,3,123,197,149,183,134,185,190,143,175,204,209,120,92)
+IMAGE_DATA(85,189,170,90,53,158,169,87,174,214,218,93,169,26,168,165,186,76,5,75,77,68,44,87,145,251,21,143,66,207,219,94)
+IMAGE_DATA(188,122,207,87,210,9,111,159,155,120,246,58,30,131,169,142,135,190,91,107,69,46,216,248,224,231,90,166,34,144,19,70)
+IMAGE_DATA(62,24,236,244,231,109,138,71,212,80,69,151,30,245,153,138,153,25,209,166,137,78,120,143,171,159,62,152,234,246,254,42)
+IMAGE_DATA(83,193,83,237,253,213,25,85,163,77,143,9,55,205,209,48,117,254,234,84,137,121,171,142,217,88,176,238,184,245,88,80)
+IMAGE_DATA(190,226,120,41,59,106,253,32,132,171,172,89,145,7,214,250,42,122,151,240,26,229,234,186,29,204,228,229,7,132,171,251)
+IMAGE_DATA(151,76,160,242,253,207,81,228,48,115,52,159,153,154,195,145,247,28,197,56,40,159,181,107,254,11,204,215,23,13,99,11)
+IMAGE_DATA(94,166,88,225,203,134,181,37,175,10,103,77,188,44,65,165,120,252,121,230,234,2,217,43,87,126,97,23,205,90,150,72)
+IMAGE_DATA(115,86,37,75,30,88,246,216,76,223,38,236,244,125,127,183,122,245,84,183,103,201,240,212,228,136,177,27,238,168,248,67)
+IMAGE_DATA(93,184,156,55,170,207,190,232,155,92,119,182,166,216,227,169,217,99,131,158,37,228,124,205,117,228,144,112,74,60,245,35)
+IMAGE_DATA(189,82,83,173,174,233,151,207,251,198,166,27,162,87,67,21,102,63,20,216,42,51,54,124,12,133,110,88,253,106,245,106)
+IMAGE_DATA(153,207,90,213,179,70,151,14,142,162,89,7,2,92,45,45,245,185,106,122,14,251,100,94,86,3,185,104,27,202,219,170)
+IMAGE_DATA(193,135,226,170,50,213,101,169,214,128,223,159,171,195,150,171,53,113,92,173,65,126,214,227,106,93,253,176,68,112,166,85)
+IMAGE_DATA(185,26,175,85,111,137,78,104,104,98,222,54,14,75,31,18,184,130,35,184,217,216,88,207,207,53,138,46,245,163,158,127)
+IMAGE_DATA(143,27,169,163,163,203,246,44,61,10,252,177,253,74,204,86,213,170,232,83,194,241,253,184,138,192,251,179,164,164,68,188)
+IMAGE_DATA(52,130,61,212,31,234,63,235,255,138,27,126,119,234,234,110,56,92,29,18,174,66,159,218,156,83,169,169,187,66,211,74)
+IMAGE_DATA(174,42,228,93,251,122,108,197,251,20,158,16,167,179,234,237,49,243,98,72,184,154,147,95,39,254,70,240,183,71,8,95)
+IMAGE_DATA(225,233,80,209,225,49,181,43,16,216,239,129,231,164,87,9,62,131,222,172,140,203,85,179,27,181,70,118,206,128,143,224)
+IMAGE_DATA(165,230,118,149,161,152,155,65,248,28,173,182,108,53,17,149,35,184,170,186,84,3,251,218,192,84,132,203,210,84,235,205)
+IMAGE_DATA(224,123,36,233,60,140,250,20,234,12,140,214,87,37,156,254,93,176,213,228,132,139,71,48,85,235,165,174,175,3,66,245)
+IMAGE_DATA(169,91,79,117,103,84,209,247,235,114,85,153,106,107,164,158,78,53,252,76,243,34,85,152,58,111,85,10,205,89,113,148)
+IMAGE_DATA(35,133,102,47,79,150,192,249,156,213,134,187,208,173,96,172,232,86,230,234,149,220,26,170,169,238,20,79,96,237,9,6)
+IMAGE_DATA(91,145,23,174,107,232,165,90,126,47,159,206,44,99,174,158,16,174,194,107,105,225,178,125,52,101,198,26,58,188,116,60)
+IMAGE_DATA(21,237,126,158,106,18,94,97,150,178,214,204,98,142,94,101,174,102,63,39,71,202,30,39,172,141,229,141,183,225,179,214)
+IMAGE_DATA(13,126,188,136,31,47,122,150,40,188,132,98,183,211,233,92,226,54,154,185,34,81,102,79,87,242,223,185,245,224,69,26)
+IMAGE_DATA(55,105,19,61,53,209,223,1,103,88,186,201,178,214,247,135,48,172,69,207,18,118,5,192,191,208,176,116,244,57,213,194)
+IMAGE_DATA(130,210,56,239,135,144,173,167,86,85,53,82,117,117,59,85,69,250,133,143,200,241,194,251,23,185,78,228,126,197,251,55)
+IMAGE_DATA(122,75,106,124,208,89,168,49,130,103,120,157,104,196,42,63,39,172,249,95,87,171,142,198,213,247,99,107,169,23,1,174)
+IMAGE_DATA(62,32,255,107,131,191,39,183,238,250,32,174,154,156,175,207,85,147,7,126,111,174,218,26,235,123,232,213,26,175,38,42)
+IMAGE_DATA(121,96,214,174,248,217,9,99,235,110,141,202,85,204,159,218,221,173,77,216,21,125,143,117,42,179,184,186,142,26,234,26)
+IMAGE_DATA(169,173,173,141,122,186,122,133,155,215,174,245,74,174,87,163,191,191,143,57,212,47,122,14,185,82,212,33,161,85,63,204)
+IMAGE_DATA(124,169,223,187,27,147,28,112,119,215,61,97,42,114,192,15,197,213,129,119,88,147,84,10,87,161,215,213,163,106,44,15)
+IMAGE_DATA(252,155,185,197,235,85,132,169,167,222,8,112,85,61,152,252,26,208,160,153,185,227,247,42,56,11,159,165,140,171,126,152)
+IMAGE_DATA(250,170,225,42,230,93,192,71,112,82,185,106,244,43,235,210,202,78,9,156,11,79,249,113,240,87,255,140,242,84,153,170)
+IMAGE_DATA(185,93,245,242,85,118,106,31,146,62,134,94,36,48,19,129,222,164,120,206,234,235,207,92,140,80,198,5,214,172,231,35)
+IMAGE_DATA(150,165,39,3,92,173,100,150,150,219,249,24,215,223,1,253,189,120,14,121,92,227,83,232,123,32,185,108,197,81,230,99)
+IMAGE_DATA(156,62,38,169,167,166,21,201,62,26,112,87,119,210,40,47,221,192,99,238,190,114,101,46,246,211,128,169,152,101,113,123)
+IMAGE_DATA(148,86,123,254,132,110,222,23,28,157,187,50,89,180,232,220,149,122,158,34,71,176,116,214,178,163,244,198,155,73,114,148)
+IMAGE_DATA(88,153,34,207,131,193,168,89,130,173,224,106,78,81,29,133,163,237,226,173,228,114,21,243,171,226,9,193,145,122,178,144)
+IMAGE_DATA(53,227,113,217,51,183,106,243,9,154,191,116,15,77,153,182,130,82,151,143,167,194,29,175,80,211,209,73,204,208,137,68)
+IMAGE_DATA(151,89,119,94,102,70,94,97,70,94,102,166,94,121,210,240,85,25,171,204,205,29,111,180,109,238,179,162,111,77,140,51)
+IMAGE_DATA(17,94,78,116,55,141,14,110,219,68,51,151,37,208,172,21,201,180,138,245,38,230,103,159,126,109,3,61,249,218,70,122)
+IMAGE_DATA(226,213,117,114,4,91,145,23,6,107,81,83,213,220,175,106,215,73,243,247,210,138,45,233,252,179,62,227,228,125,11,101)
+IMAGE_DATA(183,132,235,251,224,122,62,40,79,195,225,6,102,100,135,204,240,10,3,234,111,216,29,52,240,254,133,110,213,94,28,157)
+IMAGE_DATA(67,209,254,28,232,54,95,183,14,72,62,24,76,197,117,108,124,14,88,231,224,140,142,13,114,213,205,255,226,253,25,224)
+IMAGE_DATA(107,121,191,189,22,126,79,189,170,154,85,185,90,113,51,160,87,109,93,85,35,236,114,213,103,171,239,107,60,74,109,213)
+IMAGE_DATA(211,170,239,203,85,143,173,248,121,202,207,180,214,228,129,227,235,171,174,86,117,3,215,50,225,112,165,120,254,118,247,246)
+IMAGE_DATA(208,208,208,16,221,188,125,75,250,99,239,220,185,199,113,203,59,222,145,184,123,247,45,209,115,239,190,251,104,249,211,223)
+IMAGE_DATA(184,137,122,106,140,122,175,221,51,51,53,125,239,95,95,197,107,144,91,193,236,80,67,67,176,23,235,81,250,183,253,159)
+IMAGE_DATA(122,115,185,106,98,216,228,128,203,110,249,94,104,50,207,234,114,213,219,237,232,177,21,239,219,115,185,141,35,184,154,113)
+IMAGE_DATA(174,132,178,114,170,125,63,193,146,102,95,179,50,67,93,13,171,161,94,248,174,71,146,250,226,27,31,7,175,95,201,211)
+IMAGE_DATA(167,151,179,76,32,7,140,227,133,75,17,202,188,224,249,37,121,125,190,46,91,93,246,102,94,170,166,179,151,152,193,151)
+IMAGE_DATA(106,232,244,133,168,112,20,57,95,132,230,128,193,78,151,167,218,103,148,112,220,236,105,211,199,221,94,94,173,151,130,161)
+IMAGE_DATA(170,89,13,103,243,101,87,234,161,100,211,151,164,161,76,53,185,221,171,102,6,53,224,149,116,201,230,126,181,174,170,115)
+IMAGE_DATA(170,110,191,146,233,191,205,148,185,152,248,220,175,50,20,76,53,186,52,201,222,87,166,206,92,154,40,49,227,205,68,203)
+IMAGE_DATA(85,60,15,61,59,151,245,235,34,254,58,185,197,245,172,197,58,196,95,95,252,12,153,173,224,42,242,194,224,106,180,161)
+IMAGE_DATA(143,142,28,203,150,62,167,117,59,207,208,138,77,105,52,119,241,14,154,60,101,25,157,92,241,18,115,117,34,181,38,49)
+IMAGE_DATA(83,175,78,38,186,248,10,7,51,243,210,11,20,59,255,20,159,63,78,177,203,207,112,240,249,149,167,109,196,174,62,99)
+IMAGE_DATA(67,120,155,253,180,23,227,40,22,94,65,116,59,149,54,172,89,203,255,6,230,42,127,191,152,157,93,181,227,20,61,51)
+IMAGE_DATA(113,163,48,20,92,197,17,108,125,106,226,6,179,195,102,242,86,209,171,207,189,190,201,250,68,188,190,228,144,228,175,19)
+IMAGE_DATA(211,46,123,222,74,166,215,183,32,191,36,208,235,235,251,60,96,126,38,98,188,244,89,163,202,254,1,254,44,143,68,134)
+IMAGE_DATA(164,103,6,179,146,224,8,216,133,247,10,120,210,208,124,67,180,170,48,38,138,222,212,27,94,255,210,160,104,214,210,10)
+IMAGE_DATA(195,200,194,146,33,121,47,154,247,163,230,130,189,158,225,210,155,113,253,73,46,95,149,171,195,65,182,50,87,75,66,215)
+IMAGE_DATA(44,91,3,58,53,46,7,140,107,0,124,63,190,78,125,152,60,176,171,89,223,187,111,201,213,171,126,223,210,176,207,86)
+IMAGE_DATA(232,76,175,190,42,185,224,6,143,177,114,93,114,59,48,219,234,179,53,200,84,228,130,241,53,43,42,42,248,119,180,133)
+IMAGE_DATA(117,30,118,224,24,175,254,251,239,188,43,236,196,254,242,224,17,126,69,143,78,191,172,249,62,238,179,142,126,155,122,186)
+IMAGE_DATA(111,75,109,21,241,48,122,181,169,113,128,63,59,243,164,110,140,29,64,3,3,3,124,221,112,251,67,207,109,255,159,126)
+IMAGE_DATA(147,255,179,152,159,7,150,153,26,233,253,29,246,123,127,117,238,92,189,131,37,7,53,232,93,91,15,6,216,154,153,211)
+IMAGE_DATA(44,60,61,149,109,250,130,209,91,123,42,163,152,46,101,133,3,30,189,178,163,205,99,168,114,85,124,240,225,135,239,213)
+IMAGE_DATA(81,225,45,232,246,243,74,159,82,30,51,53,191,222,171,151,86,203,17,253,72,202,87,205,253,234,44,42,188,146,52,192)
+IMAGE_DATA(216,115,23,205,115,246,121,79,167,10,87,47,215,90,174,130,165,166,166,90,37,1,61,170,189,69,110,143,81,194,177,98)
+IMAGE_DATA(58,148,202,218,52,205,48,86,115,186,38,207,235,235,80,119,214,212,222,79,10,134,187,127,92,53,42,152,170,129,26,170)
+IMAGE_DATA(248,252,122,121,97,112,213,228,127,47,89,158,174,223,229,251,254,234,44,141,114,21,154,83,249,8,158,162,14,169,26,85)
+IMAGE_DATA(153,170,1,166,78,95,154,192,218,143,95,183,60,133,102,51,95,161,1,223,224,192,78,210,188,146,6,230,106,155,233,235)
+IMAGE_DATA(174,241,242,193,222,28,43,234,57,96,235,254,164,43,180,114,139,241,190,95,177,158,255,158,5,219,233,181,137,11,41,115)
+IMAGE_DATA(213,11,148,187,241,85,234,74,126,145,238,95,122,141,40,115,2,7,107,208,204,231,232,126,38,115,50,243,23,68,231,30)
+IMAGE_DATA(55,199,243,191,164,216,133,95,50,107,159,100,238,26,230,210,165,39,88,215,154,136,93,122,140,40,235,41,138,69,215,19)
+IMAGE_DATA(13,36,209,146,197,27,68,175,206,93,155,44,126,16,240,118,120,122,226,122,225,232,147,175,173,55,154,117,194,58,143,173)
+IMAGE_DATA(204,216,73,58,187,186,217,203,5,111,165,217,43,18,104,245,158,19,116,250,76,182,241,130,200,205,183,253,190,46,87,101)
+IMAGE_DATA(47,77,101,141,232,84,204,165,194,75,31,185,95,179,43,175,155,162,213,215,248,190,63,39,82,17,25,54,249,221,208,128)
+IMAGE_DATA(55,83,114,221,242,7,51,45,194,94,126,30,58,85,106,46,204,212,252,226,97,155,63,82,174,170,118,181,231,56,142,200)
+IMAGE_DATA(5,27,173,90,86,54,236,245,24,246,75,125,21,231,96,169,214,110,222,59,15,220,107,114,211,113,181,85,163,85,111,5)
+IMAGE_DATA(185,26,49,154,213,244,45,49,67,35,131,129,60,240,3,53,43,71,52,58,82,175,154,185,151,160,94,85,174,234,204,13)
+IMAGE_DATA(244,234,131,123,129,53,15,124,75,190,46,122,124,117,71,141,244,34,197,70,219,177,22,207,209,247,103,207,123,163,247,215)
+IMAGE_DATA(199,46,124,111,224,254,237,187,119,168,183,111,72,242,67,237,109,55,152,175,239,120,126,16,190,55,132,241,133,48,222,16)
+IMAGE_DATA(229,101,85,210,255,28,141,214,60,148,63,213,216,237,215,120,139,185,122,117,88,184,138,247,176,106,85,127,95,134,187,115)
+IMAGE_DATA(202,248,150,130,173,8,204,175,227,61,11,174,158,201,110,164,83,162,87,153,173,231,203,232,120,70,17,93,184,92,25,224)
+IMAGE_DATA(170,214,90,221,124,175,230,124,17,224,40,102,98,212,23,9,1,79,252,172,60,126,60,191,81,142,38,234,108,111,146,246)
+IMAGE_DATA(35,41,87,101,15,141,231,151,20,207,86,221,85,126,250,124,149,212,85,193,211,140,139,213,18,200,255,26,174,134,133,169)
+IMAGE_DATA(199,78,87,140,200,253,198,251,221,131,173,194,87,214,174,8,163,89,11,132,171,120,222,173,173,74,190,247,104,110,160,167)
+IMAGE_DATA(55,224,145,239,228,126,85,167,34,192,85,137,253,151,36,204,243,87,2,92,21,223,135,56,207,7,244,25,153,190,164,52)
+IMAGE_DATA(201,255,130,171,96,42,116,157,232,210,37,9,54,92,174,42,91,103,44,229,199,150,31,21,174,66,191,46,221,116,156,138)
+IMAGE_DATA(66,45,252,121,218,230,105,214,14,241,216,135,86,5,91,209,35,140,60,240,206,35,23,100,6,20,122,117,249,154,20,154)
+IMAGE_DATA(62,103,43,77,122,237,13,186,188,234,105,202,89,247,34,13,37,179,78,205,228,56,243,28,81,6,107,212,12,214,164,25)
+IMAGE_DATA(172,71,207,254,156,31,51,33,231,231,30,51,140,141,139,251,231,31,163,88,230,79,153,171,207,82,44,178,145,98,157,7)
+IMAGE_DATA(105,246,156,181,242,125,207,103,246,195,155,120,246,202,68,122,242,213,181,94,30,120,3,253,242,149,53,18,143,79,88,111)
+IMAGE_DATA(117,171,233,9,222,96,107,175,11,214,30,165,213,187,142,139,127,161,59,67,131,208,28,48,180,42,188,8,43,43,170,133)
+IMAGE_DATA(169,198,247,183,202,248,233,71,234,248,223,223,38,57,114,240,193,232,177,235,194,26,112,10,215,159,96,156,169,65,154,28)
+IMAGE_DATA(177,121,31,13,72,191,18,230,90,112,237,106,122,243,135,164,215,193,204,145,251,121,36,205,27,41,83,181,166,170,90,213)
+IMAGE_DATA(212,81,7,109,173,6,44,183,26,214,235,5,22,189,234,228,129,3,185,96,171,97,135,44,87,145,11,214,124,48,184,170)
+IMAGE_DATA(51,174,149,182,190,122,99,132,94,173,140,142,222,175,36,249,225,234,209,244,234,224,136,120,32,87,31,56,99,227,215,87)
+IMAGE_DATA(37,15,204,220,54,122,245,193,92,253,239,239,251,254,96,189,119,221,239,5,58,26,121,106,244,41,163,191,57,28,141,136)
+IMAGE_DATA(39,38,106,15,173,45,195,212,215,235,245,8,15,220,165,129,225,183,36,95,156,199,215,133,165,165,229,54,7,140,186,49)
+IMAGE_DATA(102,87,199,110,191,153,91,144,171,215,45,87,93,175,51,215,227,91,118,97,132,12,83,145,43,82,182,142,198,213,244,211)
+IMAGE_DATA(133,252,25,85,65,121,216,219,86,98,184,169,28,133,54,117,107,168,185,69,77,18,224,165,238,150,209,62,36,227,147,84)
+IMAGE_DATA(103,217,154,93,208,36,175,113,231,102,148,171,58,55,3,150,198,179,85,31,67,255,175,153,165,49,61,191,167,206,71,36)
+IMAGE_DATA(252,186,106,68,184,138,28,176,250,57,32,84,147,130,153,218,159,4,127,193,131,41,124,159,245,43,116,43,106,166,58,127)
+IMAGE_DATA(42,51,51,142,255,96,188,151,175,219,155,164,245,82,151,155,126,92,178,190,132,26,174,15,4,250,148,86,59,94,250,110)
+IMAGE_DATA(109,85,123,149,92,174,206,92,122,68,88,58,125,241,17,122,125,209,97,57,74,14,120,153,175,87,95,95,114,68,184,138)
+IMAGE_DATA(199,192,86,4,114,187,133,124,93,84,94,217,74,21,204,214,202,104,155,183,111,181,91,188,247,193,87,112,117,235,254,76)
+IMAGE_DATA(233,29,90,187,147,249,190,250,40,77,153,179,141,94,159,58,143,242,214,63,71,87,215,140,167,155,73,207,16,157,26,71)
+IMAGE_DATA(116,226,73,14,102,231,201,39,41,118,146,53,233,41,102,233,201,31,243,241,167,126,100,252,204,178,150,206,252,140,121,107)
+IMAGE_DATA(130,78,255,144,117,43,115,185,102,43,221,175,219,71,83,223,88,39,223,55,114,213,155,14,102,210,180,197,7,233,241,151)
+IMAGE_DATA(13,71,17,96,234,47,94,94,205,231,107,189,188,240,122,26,55,9,249,95,83,115,29,255,250,86,153,177,217,184,247,180)
+IMAGE_DATA(173,165,226,232,122,255,22,151,84,136,70,69,184,222,191,186,95,21,188,173,171,107,147,26,107,36,122,77,60,130,106,132)
+IMAGE_DATA(175,195,86,47,130,123,37,165,253,194,59,228,124,245,253,99,122,149,76,79,18,124,205,10,138,7,133,173,154,11,118,207)
+IMAGE_DATA(93,157,234,246,43,153,158,7,95,171,106,46,201,176,118,192,232,213,56,173,58,82,179,246,122,122,117,40,208,15,252,32)
+IMAGE_DATA(174,138,86,141,220,176,61,193,58,191,26,175,77,35,113,57,224,40,135,122,51,136,94,197,121,205,112,160,190,106,53,172)
+IMAGE_DATA(204,174,14,219,57,27,223,51,248,230,168,115,54,134,171,119,70,112,245,222,157,187,38,15,250,16,187,75,241,146,247,138)
+IMAGE_DATA(15,254,230,243,26,57,106,112,21,125,85,221,221,157,210,191,12,63,71,104,241,146,18,227,241,133,90,68,123,219,48,13)
+IMAGE_DATA(244,191,43,115,92,133,133,197,146,3,110,110,110,246,114,192,119,109,14,120,76,179,126,240,55,229,106,160,71,162,212,103)
+IMAGE_DATA(168,97,234,117,171,85,125,95,150,33,155,243,193,117,247,249,220,22,58,155,211,68,167,153,173,216,105,115,250,2,118,150)
+IMAGE_DATA(22,139,94,85,174,34,192,82,61,71,224,185,156,194,70,201,241,130,169,202,80,183,14,170,252,196,227,224,169,134,235,69)
+IMAGE_DATA(168,189,74,46,75,71,248,18,74,223,111,133,204,168,170,111,18,250,125,81,79,61,238,49,86,185,10,173,170,26,213,101)
+IMAGE_DATA(170,246,26,217,190,164,100,163,89,193,85,228,132,221,252,175,230,124,241,26,235,151,228,105,85,183,63,201,229,234,214,125)
+IMAGE_DATA(23,61,142,94,182,236,84,126,26,191,135,243,194,85,189,175,253,191,186,75,85,253,126,161,85,209,207,139,26,169,223,171)
+IMAGE_DATA(148,42,121,96,232,85,229,170,13,102,146,242,20,161,122,85,248,202,172,5,87,225,101,152,87,220,36,126,74,152,153,170)
+IMAGE_DATA(128,223,65,180,83,116,43,114,194,208,174,85,124,31,179,53,240,16,68,255,208,130,213,9,244,26,115,117,186,112,245,69)
+IMAGE_DATA(186,178,118,60,221,59,250,20,189,123,140,57,153,202,250,243,216,47,137,210,88,127,166,63,78,148,206,143,29,99,94,166)
+IMAGE_DATA(253,132,232,248,143,41,198,65,39,126,34,17,59,245,99,9,58,237,157,159,252,46,197,46,60,79,212,176,139,134,139,182)
+IMAGE_DATA(211,164,89,91,232,117,254,158,151,240,181,196,150,195,23,104,194,236,221,158,70,93,103,227,177,151,12,91,13,87,55,208)
+IMAGE_DATA(83,175,110,180,190,251,152,117,93,182,37,157,246,28,57,231,121,17,150,91,182,42,103,81,75,133,38,197,209,240,180,210)
+IMAGE_DATA(241,216,175,116,246,150,183,137,175,1,122,109,164,86,88,111,122,151,160,11,49,147,134,40,40,238,23,126,66,163,66,227)
+IMAGE_DATA(129,99,174,255,131,50,84,153,170,57,97,156,23,149,221,36,119,126,85,107,169,224,180,68,200,97,172,195,213,178,209,244)
+IMAGE_DATA(42,152,26,175,85,189,154,171,95,91,13,122,66,136,23,68,216,63,87,174,154,199,135,188,94,166,7,207,216,184,190,16)
+IMAGE_DATA(152,59,66,212,184,61,75,174,94,181,179,54,67,118,95,220,251,121,66,52,52,221,125,95,174,62,234,108,137,215,209,168)
+IMAGE_DATA(11,223,190,125,151,53,235,48,245,244,244,201,156,109,67,67,19,255,126,213,73,174,23,255,78,236,36,52,190,153,97,153)
+IMAGE_DATA(213,197,124,209,88,14,248,195,185,185,125,75,202,86,229,106,252,94,12,48,86,123,18,208,115,129,192,60,1,2,187,225)
+IMAGE_DATA(160,87,13,87,27,41,227,98,136,78,158,45,177,122,53,175,184,85,142,174,54,5,79,85,123,42,79,221,89,83,213,159)
+IMAGE_DATA(8,237,57,114,25,171,175,215,215,129,165,202,80,132,114,21,28,85,191,7,245,73,58,230,236,19,215,29,109,218,179,20)
+IMAGE_DATA(223,3,172,222,247,210,103,148,98,60,240,49,99,170,204,4,83,17,242,156,151,235,85,109,138,208,26,170,246,243,26,174)
+IMAGE_DATA(102,143,202,85,163,71,131,222,73,58,147,170,62,74,120,222,245,125,128,191,253,202,184,30,224,37,158,231,131,246,1,203)
+IMAGE_DATA(236,140,55,75,99,52,107,162,101,170,106,212,105,139,15,75,88,206,46,241,242,193,94,110,24,123,109,178,11,107,153,7)
+IMAGE_DATA(141,194,86,228,131,193,86,68,149,212,91,187,169,164,178,141,86,108,57,38,122,21,175,95,176,34,129,38,204,218,76,179)
+IMAGE_DATA(38,205,164,188,213,207,176,94,125,158,98,201,47,82,44,133,89,154,196,204,60,250,152,156,11,95,83,89,159,166,124,151)
+IMAGE_DATA(40,249,7,124,255,191,76,164,255,200,139,255,10,68,44,237,155,68,231,39,16,181,236,165,198,204,13,52,101,238,46,154)
+IMAGE_DATA(190,236,8,45,217,152,78,91,15,158,151,158,36,151,169,224,41,184,10,214,130,171,200,13,163,95,88,119,197,77,89,184)
+IMAGE_DATA(159,86,111,63,78,137,199,46,216,58,170,214,84,53,76,239,111,196,227,105,133,101,47,158,43,46,10,73,61,11,159,109)
+IMAGE_DATA(96,111,93,195,53,106,105,189,45,61,172,145,8,235,177,186,1,225,8,222,43,216,7,149,87,216,47,154,20,252,51,187)
+IMAGE_DATA(87,135,140,86,245,106,169,126,31,225,117,201,7,155,185,114,79,175,58,61,194,178,159,166,252,186,104,94,153,213,41,31)
+IMAGE_DATA(176,189,15,190,150,245,60,14,109,223,210,128,176,87,114,207,113,81,94,53,44,97,184,122,219,169,173,222,126,160,79,191)
+IMAGE_DATA(239,47,236,235,85,97,173,23,186,159,189,50,234,68,228,150,227,101,120,195,6,252,12,245,88,91,123,83,230,106,208,255)
+IMAGE_DATA(33,189,192,226,35,252,150,120,7,195,51,88,226,1,92,109,108,188,237,213,87,223,95,175,186,51,45,226,197,251,144,190)
+IMAGE_DATA(244,102,79,248,127,55,143,252,240,55,124,63,232,167,130,231,49,116,39,114,186,152,11,194,188,80,119,119,183,204,16,225)
+IMAGE_DATA(223,8,142,66,199,134,195,97,241,152,66,191,146,122,71,129,203,99,183,223,220,205,157,95,213,247,180,169,173,170,63,169)
+IMAGE_DATA(238,191,48,190,220,50,35,192,215,154,209,232,176,199,213,62,126,223,244,210,249,60,147,255,61,157,83,79,25,89,202,213)
+IMAGE_DATA(98,153,99,5,79,115,139,90,132,161,50,43,195,71,173,149,186,249,92,183,78,170,181,82,119,119,155,203,87,87,207,162)
+IMAGE_DATA(110,170,123,221,148,169,208,165,208,167,8,240,212,104,212,82,187,23,21,126,130,234,123,239,238,62,53,199,10,225,42,2)
+IMAGE_DATA(122,21,117,83,171,71,211,152,159,172,91,193,80,176,85,245,42,238,235,99,202,80,173,161,186,181,84,95,171,102,25,109)
+IMAGE_DATA(202,161,108,69,13,213,173,153,186,236,212,251,174,71,161,235,167,36,59,106,60,157,170,92,85,207,7,51,163,234,207,167)
+IMAGE_DATA(106,175,146,106,86,55,247,43,250,116,137,199,216,69,71,104,42,56,187,196,112,21,243,60,224,170,236,15,42,105,160,162)
+IMAGE_DATA(80,147,248,67,35,66,85,29,252,89,217,193,255,207,141,50,171,130,190,90,236,192,153,191,226,48,189,52,99,35,45,154)
+IMAGE_DATA(50,149,242,86,62,77,185,171,158,38,74,122,145,131,57,122,132,181,233,17,102,107,34,235,212,36,142,68,230,105,226,183)
+IMAGE_DATA(56,190,199,188,253,190,9,48,22,145,242,125,19,169,124,158,202,207,39,255,39,209,133,73,68,173,251,41,63,105,45,77)
+IMAGE_DATA(91,120,64,250,150,150,110,74,163,45,7,50,69,143,26,158,174,101,158,174,18,174,226,220,228,133,215,202,243,207,78,217)
+IMAGE_DATA(224,213,87,55,208,27,203,14,202,110,184,19,25,89,194,75,120,231,43,95,31,20,120,222,120,45,177,158,205,47,245,216)
+IMAGE_DATA(27,162,198,166,118,170,111,24,20,255,90,236,30,105,109,191,33,187,24,241,249,31,142,14,8,119,100,135,69,169,199,191)
+IMAGE_DATA(146,107,166,79,161,194,236,182,208,25,26,213,164,249,69,3,204,213,65,225,176,254,153,50,143,199,21,21,189,84,81,217)
+IMAGE_DATA(205,28,52,254,100,54,112,191,162,71,124,91,66,33,204,213,116,242,253,22,137,178,80,51,107,210,214,81,163,162,170,197)
+IMAGE_DATA(132,236,104,212,125,175,131,246,168,243,169,241,115,170,114,173,29,238,23,255,11,228,192,221,136,86,247,143,8,104,84,212)
+IMAGE_DATA(16,160,237,163,145,118,27,213,209,14,57,162,191,90,122,172,249,126,77,77,7,69,106,90,153,167,253,166,198,218,48,36)
+IMAGE_DATA(57,118,55,26,26,253,128,231,6,2,127,199,168,92,53,159,124,1,46,222,187,123,159,58,218,175,81,123,107,63,107,193)
+IMAGE_DATA(129,64,116,116,12,142,136,174,206,62,122,247,29,255,51,212,249,68,165,15,162,230,170,108,69,15,19,248,122,239,222,219)
+IMAGE_DATA(194,75,248,254,14,13,13,120,140,237,20,198,182,181,117,136,78,69,93,21,90,85,231,113,199,110,191,185,91,124,30,216)
+IMAGE_DATA(94,3,107,95,125,232,134,189,38,53,215,152,183,76,14,39,50,36,239,35,112,21,199,139,5,70,175,102,228,52,73,62)
+IMAGE_DATA(248,12,235,84,229,42,242,189,224,170,223,115,212,48,106,31,175,246,234,198,179,20,125,72,26,202,86,251,103,46,249,51)
+IMAGE_DATA(168,18,154,251,245,114,190,26,208,169,202,212,99,167,124,255,251,212,56,221,106,60,32,66,54,146,78,150,81,194,9,63)
+IMAGE_DATA(14,159,12,209,161,19,229,116,240,120,153,240,245,0,252,7,83,11,173,142,213,153,25,229,168,6,88,234,246,40,105,206)
+IMAGE_DATA(87,106,170,218,151,116,48,203,112,117,215,121,175,199,215,15,87,179,170,134,21,63,253,93,134,171,232,255,85,166,202,17)
+IMAGE_DATA(126,74,30,83,117,158,198,213,172,118,166,102,73,130,205,1,187,185,224,105,11,15,211,84,142,105,200,9,123,186,21,53)
+IMAGE_DATA(222,172,252,106,190,38,170,227,107,163,122,97,107,65,89,19,21,150,55,75,63,19,114,195,23,115,162,180,124,115,154,212)
+IMAGE_DATA(86,177,211,102,238,138,3,52,126,250,122,90,54,101,34,229,45,123,154,10,87,61,201,188,124,142,232,208,207,41,118,128)
+IMAGE_DATA(249,120,144,245,231,33,214,169,135,88,131,30,96,166,30,226,56,242,109,162,195,223,49,145,192,250,53,209,137,164,111,75)
+IMAGE_DATA(196,18,254,131,245,234,235,68,237,7,232,248,206,213,166,127,121,69,18,45,223,122,66,250,129,193,80,132,209,171,107,44)
+IMAGE_DATA(87,113,31,122,213,159,101,93,47,53,214,185,171,18,196,203,226,114,150,209,165,208,157,200,239,42,63,139,138,205,188,170)
+IMAGE_DATA(222,215,252,176,223,219,100,106,176,200,193,161,71,26,61,154,152,229,199,190,105,244,147,244,244,221,21,79,120,212,255,144)
+IMAGE_DATA(7,133,94,4,67,113,237,170,245,72,104,187,18,79,107,66,47,34,119,140,156,44,118,72,153,188,177,153,21,135,158,196)
+IMAGE_DATA(238,86,240,175,50,210,68,149,149,117,204,143,90,27,184,143,30,101,228,164,77,52,74,255,50,234,113,8,227,219,23,140)
+IMAGE_DATA(170,170,10,19,225,114,47,106,140,247,89,85,143,231,131,214,45,123,138,42,35,102,31,187,241,242,246,61,189,177,83,3)
+IMAGE_DATA(28,172,169,105,177,81,91,219,250,192,168,175,111,167,50,190,6,185,122,245,42,101,103,103,81,110,110,46,229,228,92,181)
+IMAGE_DATA(254,189,57,121,240,239,205,151,254,27,60,135,115,241,87,110,24,150,92,0,124,150,53,26,154,6,108,52,54,15,218,64)
+IMAGE_DATA(46,222,237,7,70,141,242,65,253,192,96,148,48,169,163,93,162,163,163,45,16,157,157,237,129,232,234,234,145,121,80,153)
+IMAGE_DATA(219,185,31,191,135,237,131,254,204,214,62,225,119,229,239,7,55,241,253,67,199,162,6,139,254,38,204,234,130,185,208,183)
+IMAGE_DATA(99,94,251,191,185,155,254,156,241,127,99,230,108,174,219,218,142,114,213,246,38,224,200,76,173,242,118,48,134,165,71,126)
+IMAGE_DATA(216,92,143,70,48,123,61,72,151,10,155,29,174,54,208,217,203,149,194,85,204,177,154,26,106,115,128,167,231,61,15,65)
+IMAGE_DATA(213,153,18,204,77,157,57,141,239,53,114,239,75,127,47,152,123,209,104,85,227,235,80,101,181,169,228,130,189,251,240,79)
+IMAGE_DATA(82,63,95,120,14,26,182,22,91,223,36,237,247,133,54,5,71,145,3,198,17,124,77,62,29,146,56,202,250,245,200,169)
+IMAGE_DATA(114,97,170,114,117,127,122,41,29,224,56,120,188,196,240,213,203,13,107,174,87,231,102,30,212,159,4,141,170,125,74,218)
+IMAGE_DATA(151,164,245,212,141,187,46,74,110,87,3,154,84,195,245,254,197,115,171,118,152,29,110,46,87,177,151,6,92,93,224,49)
+IMAGE_DATA(213,245,83,194,209,157,87,149,126,224,184,60,176,132,199,213,41,139,14,25,190,242,99,200,81,95,204,174,18,207,37,176)
+IMAGE_DATA(245,106,65,13,255,191,26,237,154,95,210,204,191,59,252,59,112,41,68,203,54,166,201,247,6,111,136,55,150,238,161,231)
+IMAGE_DATA(166,172,161,229,19,95,164,220,197,79,80,217,202,167,40,118,152,53,235,94,230,232,110,102,228,94,214,172,251,126,68,180)
+IMAGE_DATA(255,155,124,206,26,116,255,183,232,254,129,111,16,49,99,45,103,189,136,29,6,115,191,201,199,111,80,236,200,215,136,46)
+IMAGE_DATA(206,164,88,231,97,218,179,122,9,205,92,126,84,102,130,86,239,204,144,186,174,233,85,90,231,245,0,175,117,194,204,220)
+IMAGE_DATA(60,46,51,56,155,60,190,110,148,94,96,92,11,96,255,82,168,170,70,122,145,192,79,176,18,121,95,212,84,75,203,170)
+IMAGE_DATA(108,238,23,189,76,57,185,69,18,234,111,152,95,88,32,121,98,244,113,193,119,238,46,107,138,27,55,222,102,205,240,14)
+IMAGE_DATA(199,91,212,209,117,155,154,177,175,172,195,248,219,162,55,24,90,20,185,33,213,134,218,31,92,89,217,39,254,135,240,106)
+IMAGE_DATA(194,99,197,197,172,111,139,251,76,255,81,104,80,120,87,33,121,248,122,97,105,40,84,39,81,81,81,47,81,94,89,207)
+IMAGE_DATA(76,6,115,155,152,169,45,230,49,248,226,86,86,72,84,84,134,3,81,89,21,49,17,174,146,168,136,212,120,236,230,239)
+IMAGE_DATA(67,216,106,246,197,86,70,122,204,247,197,71,185,166,182,209,235,105,75,229,42,235,208,90,63,170,235,218,109,212,214,182)
+IMAGE_DATA(75,223,52,106,129,96,102,65,65,1,255,251,138,249,231,81,234,121,248,26,31,95,19,230,58,0,207,65,183,26,125,58)
+IMAGE_DATA(40,225,242,20,243,154,205,77,131,54,154,90,6,100,230,75,185,138,222,157,7,113,21,55,48,82,153,138,64,253,18,154)
+IMAGE_DATA(79,3,126,69,26,93,93,93,124,236,230,175,57,36,44,251,112,216,229,235,98,48,29,159,227,168,161,34,224,111,129,239)
+IMAGE_DATA(9,231,254,110,184,177,219,111,242,134,31,57,106,23,210,15,225,121,44,25,141,170,62,101,126,125,196,48,213,236,130,2)
+IMAGE_DATA(79,161,91,181,199,47,171,160,77,188,33,206,229,54,75,128,171,167,153,171,216,23,119,181,160,201,207,249,102,213,153,89)
+IMAGE_DATA(24,39,103,123,234,92,185,221,37,174,245,81,213,157,122,30,223,227,107,103,79,189,192,125,201,251,242,159,87,174,226,49)
+IMAGE_DATA(211,167,20,244,201,79,30,177,79,198,223,227,118,148,249,137,144,250,42,51,246,232,217,42,74,204,168,162,4,230,43,226)
+IMAGE_DATA(48,235,215,35,167,42,68,175,30,240,226,112,58,31,147,139,152,167,121,1,31,66,101,43,66,31,83,158,6,123,124,47)
+IMAGE_DATA(5,118,188,233,206,84,236,19,71,40,83,193,42,213,174,184,143,60,43,118,143,251,187,84,253,30,224,121,113,76,13,104)
+IMAGE_DATA(85,175,239,87,250,147,156,222,165,105,11,15,209,148,133,7,37,166,122,92,157,188,224,0,77,158,183,159,38,206,223,207)
+IMAGE_DATA(122,250,28,157,187,82,69,231,175,134,197,3,56,171,192,176,53,187,200,176,21,158,17,169,103,203,104,217,166,99,50,99)
+IMAGE_DATA(243,230,198,100,154,190,96,7,115,107,21,109,158,56,158,178,22,142,163,232,10,214,169,123,126,64,247,183,51,35,119,126)
+IMAGE_DATA(223,196,14,214,173,59,89,127,238,250,42,209,110,4,243,117,207,215,13,103,17,251,190,97,98,63,120,203,252,221,247,85)
+IMAGE_DATA(57,143,93,156,197,122,53,129,86,47,90,236,205,174,166,210,198,189,231,104,233,250,84,203,85,176,20,243,171,58,195,138)
+IMAGE_DATA(186,42,194,240,117,45,61,49,105,189,248,8,47,218,152,66,219,14,93,16,118,21,149,117,11,163,192,214,226,242,144,236)
+IMAGE_DATA(77,69,128,3,70,171,150,138,95,68,182,183,235,70,246,175,230,22,203,46,27,188,166,161,161,139,63,203,239,201,60,255)
+IMAGE_DATA(157,187,239,178,126,184,71,221,61,111,83,103,247,45,209,172,216,139,249,214,219,239,74,253,181,176,240,154,228,123,181,215)
+IMAGE_DATA(71,174,83,249,122,213,104,193,94,235,221,47,190,102,165,253,50,143,138,94,35,195,188,102,225,166,97,105,173,195,213,70)
+IMAGE_DATA(57,86,10,87,27,188,215,212,10,87,53,12,79,163,150,171,85,85,17,39,152,171,172,119,133,165,30,83,241,247,129,167)
+IMAGE_DATA(114,63,220,43,181,31,249,254,162,38,100,135,155,232,213,182,17,1,142,198,71,93,93,135,204,41,21,22,22,10,59,81)
+IMAGE_DATA(23,84,31,95,204,134,104,232,125,120,251,98,70,24,122,213,114,181,113,104,132,78,197,57,184,138,243,186,218,94,97,50)
+IMAGE_DATA(60,128,85,175,62,168,39,246,230,205,219,204,210,78,106,109,111,243,244,106,135,248,5,155,80,174,118,75,128,171,29,157)
+IMAGE_DATA(166,174,169,59,216,62,108,63,97,205,105,35,84,63,171,134,142,175,3,143,221,62,200,155,127,173,163,122,85,235,170,152)
+IMAGE_DATA(69,19,125,234,249,168,152,125,139,218,195,55,108,246,23,71,6,109,239,18,34,171,176,133,50,243,90,232,124,126,43,31)
+IMAGE_DATA(155,40,243,74,84,184,122,10,158,75,249,141,166,199,151,117,106,230,149,26,209,163,186,227,212,13,245,191,215,221,167,150)
+IMAGE_DATA(145,30,95,133,177,23,140,167,195,185,203,198,43,41,144,3,246,66,181,170,230,130,117,31,77,96,103,170,231,155,228,238)
+IMAGE_DATA(105,19,207,135,116,51,47,35,220,69,79,48,115,53,233,76,152,217,90,33,92,133,110,5,87,69,183,114,28,100,237,10)
+IMAGE_DATA(221,186,247,104,129,229,170,50,85,115,193,174,86,85,174,186,190,15,118,23,249,110,63,255,171,28,5,87,227,53,171,50)
+IMAGE_DATA(23,92,117,61,128,117,94,213,244,0,167,4,122,129,149,171,208,170,218,139,164,181,84,169,167,130,169,243,15,8,71,133)
+IMAGE_DATA(173,11,14,49,79,15,208,196,121,251,104,226,156,189,244,26,31,183,31,202,148,62,111,104,210,11,89,204,214,220,106,147)
+IMAGE_DATA(23,46,172,23,166,162,246,122,228,120,62,243,52,85,246,195,45,221,144,66,175,207,222,68,79,190,188,136,118,76,120,140)
+IMAGE_DATA(46,204,248,1,85,47,254,46,51,148,153,186,149,143,219,190,67,177,109,255,193,241,85,186,191,245,223,248,248,239,68,219)
+IMAGE_DATA(191,70,177,29,8,102,231,78,214,164,187,255,195,4,115,54,6,214,226,184,235,43,194,217,251,23,231,80,172,121,47,45)
+IMAGE_DATA(152,183,88,250,149,23,174,79,23,95,96,204,176,42,75,17,210,251,235,5,238,75,221,213,171,179,130,177,175,204,218,65)
+IMAGE_DATA(75,54,37,83,210,241,60,217,227,137,247,67,117,164,79,234,141,168,85,134,202,27,109,175,18,184,10,125,234,239,52,207)
+IMAGE_DATA(23,237,138,60,49,106,178,224,42,234,134,168,239,117,247,222,161,235,55,238,242,103,250,61,201,3,119,245,220,166,161,27)
+IMAGE_DATA(239,208,173,219,111,211,181,193,187,50,103,136,30,29,244,52,192,115,169,90,102,57,187,197,39,82,106,143,213,102,183,34)
+IMAGE_DATA(56,38,94,248,33,175,166,90,213,239,241,182,89,184,169,92,141,231,235,7,194,213,112,247,175,141,171,208,246,208,161,240)
+IMAGE_DATA(133,71,143,13,120,101,252,123,175,141,8,212,10,177,187,86,242,192,245,3,255,99,174,198,223,126,85,174,182,243,227,96)
+IMAGE_DATA(61,216,106,181,240,88,13,115,236,230,221,100,79,92,163,239,63,106,234,61,204,205,234,91,142,239,216,45,103,142,123,200)
+IMAGE_DATA(238,50,150,249,110,104,214,232,0,93,45,106,13,112,245,236,149,8,29,207,40,20,111,136,43,172,85,47,102,215,10,83)
+IMAGE_DATA(69,91,178,222,84,126,98,55,155,70,252,99,114,126,54,20,168,147,42,87,93,166,130,163,170,79,227,115,194,50,163,10)
+IMAGE_DATA(175,7,244,249,158,46,183,92,85,142,6,246,159,166,21,217,16,15,37,204,175,158,141,72,36,157,169,140,99,171,225,43)
+IMAGE_DATA(184,186,47,173,132,246,164,20,10,87,247,57,251,102,2,123,103,156,217,84,196,104,59,200,85,135,106,159,82,188,102,213)
+IMAGE_DATA(122,42,114,191,232,181,213,93,53,118,87,106,192,7,56,56,95,227,230,127,193,81,119,158,70,181,170,104,83,47,38,177)
+IMAGE_DATA(62,157,52,119,191,225,42,130,239,239,78,188,36,115,201,103,46,132,40,243,114,37,235,214,136,228,132,161,91,193,84,120)
+IMAGE_DATA(7,239,79,185,42,60,197,94,243,197,107,89,239,78,95,77,191,120,106,10,29,24,255,13,58,55,241,107,212,188,144,217)
+IMAGE_DATA(184,133,53,232,6,62,110,96,142,110,252,87,47,152,149,155,152,165,155,254,141,159,231,176,156,253,234,200,216,250,37,102)
+IMAGE_DATA(44,127,141,203,11,137,162,219,104,230,172,101,226,93,177,116,243,9,217,99,51,99,249,97,167,126,106,88,170,222,251,208)
+IMAGE_DATA(172,200,13,63,54,97,141,248,67,128,173,147,231,239,22,141,125,238,74,72,242,181,240,129,235,236,129,95,82,143,248,95)
+IMAGE_DATA(160,102,90,92,138,89,155,50,91,83,117,189,248,145,23,46,42,41,54,222,75,145,86,169,53,226,125,211,210,126,199,232)
+IMAGE_DATA(171,250,219,116,243,206,125,97,118,152,223,91,216,179,130,156,16,180,113,75,199,176,236,94,145,94,158,104,135,240,16,121)
+IMAGE_DATA(104,212,77,195,81,227,107,229,179,213,204,158,34,55,44,251,20,81,55,229,48,236,172,139,227,107,80,183,62,138,92,197)
+IMAGE_DATA(223,15,238,65,143,246,244,24,255,94,228,99,81,43,68,184,231,200,183,214,215,119,255,218,244,106,252,77,185,42,57,224)
+IMAGE_DATA(206,142,135,210,171,248,57,65,79,235,14,156,49,223,133,177,155,230,5,240,123,214,216,116,211,238,160,82,174,34,223,171)
+IMAGE_DATA(30,166,102,150,59,158,179,126,31,83,180,250,38,229,150,116,25,157,202,108,21,175,224,75,85,226,11,145,118,170,128,46)
+IMAGE_DATA(177,86,69,61,213,230,107,61,173,10,118,166,159,42,181,113,252,116,153,132,158,155,61,226,229,114,212,125,168,46,63,93)
+IMAGE_DATA(166,186,26,21,251,104,80,87,213,157,169,50,167,202,76,149,61,228,94,31,112,146,199,86,235,245,155,230,135,176,21,62)
+IMAGE_DATA(15,39,202,36,7,12,189,170,92,85,182,26,190,154,124,240,254,116,102,43,191,94,230,106,156,157,227,174,143,18,122,148)
+IMAGE_DATA(182,236,189,32,225,206,210,184,253,190,163,157,187,53,86,48,117,245,78,83,83,213,254,95,119,55,170,59,87,227,207,171)
+IMAGE_DATA(6,253,10,181,95,41,126,190,102,234,34,147,3,6,79,145,247,197,113,162,195,213,87,231,238,165,125,201,89,116,50,179)
+IMAGE_DATA(212,211,172,21,146,19,190,8,182,230,215,74,160,23,24,236,93,188,238,168,244,15,45,88,121,136,38,76,94,70,143,253)
+IMAGE_DATA(252,69,74,28,247,5,202,120,233,243,212,57,239,139,68,107,191,72,177,149,95,160,251,171,255,153,104,205,151,248,254,151)
+IMAGE_DATA(57,152,171,235,56,214,51,99,55,124,89,56,27,219,244,175,134,179,155,191,98,98,139,199,220,141,159,39,218,203,122,55)
+IMAGE_DATA(107,41,221,47,92,71,147,103,172,17,189,10,174,238,78,184,74,147,23,237,181,115,169,241,92,181,57,225,215,86,211,227)
+IMAGE_DATA(175,24,206,206,88,114,88,122,152,49,35,4,239,85,124,38,235,110,55,112,18,61,76,5,69,133,172,85,203,37,7,140)
+IMAGE_DATA(30,37,127,79,156,233,105,18,15,38,236,46,143,246,201,181,39,102,61,209,127,36,51,35,53,183,196,215,176,169,217,236)
+IMAGE_DATA(47,70,205,5,126,134,205,109,183,101,38,4,125,195,168,7,86,177,254,20,223,137,80,141,241,111,10,55,8,91,49,31)
+IMAGE_DATA(12,142,134,208,247,203,33,44,99,222,107,79,146,225,106,131,195,211,122,79,179,54,90,190,226,107,254,58,184,170,245,213)
+IMAGE_DATA(95,23,87,93,255,90,112,15,108,130,238,211,192,231,19,30,67,127,206,7,201,213,27,55,110,253,74,92,133,94,69,254)
+IMAGE_DATA(26,187,98,112,77,128,92,240,24,87,199,110,122,115,185,170,121,96,227,251,224,214,84,93,158,26,142,202,60,26,242,195)
+IMAGE_DATA(225,59,124,255,14,229,149,118,155,126,37,175,31,248,244,197,74,97,234,177,147,249,172,85,235,153,171,181,150,171,234,213)
+IMAGE_DATA(160,92,77,59,89,50,34,44,91,79,161,127,183,68,248,170,220,140,231,168,175,79,141,46,213,188,175,245,126,240,152,170)
+IMAGE_DATA(243,53,232,89,74,242,114,193,96,106,66,122,169,13,97,171,55,87,3,174,130,157,9,167,43,109,141,21,58,85,143,182)
+IMAGE_DATA(55,216,203,5,203,76,171,211,11,236,234,84,112,117,243,158,224,156,76,252,12,170,59,79,227,246,2,187,249,95,112,85)
+IMAGE_DATA(251,148,92,157,170,59,202,221,29,53,8,151,165,174,119,161,60,190,44,73,184,10,166,186,92,157,52,119,159,209,172,243)
+IMAGE_DATA(14,72,254,87,24,203,113,56,61,79,152,10,205,170,108,133,110,69,15,48,184,138,30,166,45,251,206,209,194,117,201,226)
+IMAGE_DATA(121,56,123,233,94,26,63,97,17,253,242,103,207,83,250,184,207,210,169,231,63,67,125,115,62,71,180,146,227,205,207,83)
+IMAGE_DATA(108,249,23,136,86,48,91,87,253,139,141,216,234,47,74,128,183,49,230,47,173,251,178,23,95,50,177,254,203,252,248,103)
+IMAGE_DATA(136,246,252,23,81,206,42,26,60,183,154,38,207,222,74,115,86,165,210,138,29,167,100,110,120,194,220,93,158,71,225,198)
+IMAGE_DATA(64,14,216,120,238,155,199,236,142,155,137,171,105,238,170,35,180,106,235,73,202,45,132,151,238,77,233,125,135,183,94,45)
+IMAGE_DATA(127,142,163,175,22,60,53,115,170,229,194,81,163,81,139,133,177,56,71,63,83,184,170,93,230,58,192,28,176,19,115,153)
+IMAGE_DATA(152,193,68,111,66,91,231,45,234,234,246,124,92,135,238,201,123,7,158,72,184,143,92,48,242,69,29,208,173,141,173,252)
+IMAGE_DATA(120,84,118,162,67,127,130,171,145,72,179,209,173,145,110,97,153,246,226,194,163,25,223,155,175,83,125,158,250,61,76,15)
+IMAGE_DATA(199,213,202,0,83,13,87,171,28,174,234,223,107,251,149,126,141,92,197,223,213,218,218,42,90,21,125,173,15,170,3,130)
+IMAGE_DATA(177,13,13,61,255,109,174,34,151,252,94,185,218,255,14,87,145,195,198,156,40,102,72,161,167,199,242,192,99,55,191,190)
+IMAGE_DATA(250,142,204,124,201,254,99,214,170,101,226,253,59,108,114,193,85,183,77,132,77,190,23,159,21,90,95,149,26,43,107,86)
+IMAGE_DATA(112,21,245,215,220,146,30,241,89,146,158,224,171,13,178,23,28,76,77,61,145,71,23,174,214,141,224,170,59,83,122,236)
+IMAGE_DATA(68,177,141,212,227,69,246,92,158,99,166,130,137,224,165,59,147,234,214,79,221,58,42,94,231,122,63,40,87,117,119,170)
+IMAGE_DATA(134,238,63,149,122,106,28,87,15,123,158,250,152,85,5,55,181,15,248,240,233,114,171,83,15,157,50,51,55,90,107,149)
+IMAGE_DATA(158,224,20,179,175,198,245,208,87,166,66,167,110,218,125,33,176,123,198,229,165,203,85,101,174,30,221,58,107,188,255,131)
+IMAGE_DATA(236,72,245,246,147,235,188,170,155,243,181,222,15,142,191,18,248,10,125,167,92,149,185,26,79,179,218,28,48,116,235,124)
+IMAGE_DATA(230,172,87,111,197,28,235,209,211,133,102,46,153,185,42,108,229,107,167,179,151,43,232,66,118,148,46,231,153,254,165,141)
+IMAGE_DATA(123,207,208,162,245,41,18,51,23,239,160,167,94,158,71,79,254,248,9,202,0,87,199,125,134,134,103,49,19,151,126,150)
+IMAGE_DATA(104,17,107,206,37,204,213,165,159,23,198,210,178,47,72,88,214,186,188,5,103,87,255,139,141,216,138,127,98,174,254,148)
+IMAGE_DATA(168,116,19,229,239,91,196,223,251,126,217,103,142,61,54,123,147,179,233,249,153,219,71,212,84,71,212,90,95,53,247,177)
+IMAGE_DATA(47,14,215,1,152,205,65,143,65,110,254,160,120,240,162,151,175,187,135,217,90,215,76,133,133,21,1,15,38,176,21,253)
+IMAGE_DATA(191,56,34,247,219,216,212,38,92,68,191,111,123,167,217,169,61,60,116,155,238,222,123,87,252,223,209,247,11,221,138,94)
+IMAGE_DATA(214,142,246,219,210,199,212,212,138,153,214,155,226,161,142,90,108,111,255,77,106,110,238,21,6,130,171,170,67,113,68,31)
+IMAGE_DATA(108,117,77,159,228,138,193,47,236,71,15,114,181,214,230,127,69,235,58,156,13,228,129,43,66,35,184,170,125,192,35,185)
+IMAGE_DATA(170,253,192,31,46,87,221,185,5,213,171,15,91,95,173,175,235,251,192,184,138,60,112,60,87,199,230,89,198,110,110,223)
+IMAGE_DATA(18,222,239,234,7,161,190,250,198,235,243,186,244,254,75,159,162,87,71,69,109,71,123,128,77,13,214,104,215,252,178,30)
+IMAGE_DATA(241,133,16,166,102,53,80,90,38,188,117,115,40,41,45,87,234,170,90,91,197,158,83,245,18,68,126,23,220,196,220,11)
+IMAGE_DATA(66,185,138,72,57,81,100,217,8,46,26,174,154,157,227,46,79,125,190,86,5,250,147,116,78,213,157,77,85,166,66,179)
+IMAGE_DATA(234,30,114,245,251,13,228,129,193,213,99,102,46,245,80,90,169,176,85,2,28,101,237,170,26,21,247,161,101,143,28,47)
+IMAGE_DATA(13,236,81,221,117,56,71,246,184,153,93,110,134,169,174,111,82,252,172,76,124,190,215,157,87,149,125,170,172,81,49,163)
+IMAGE_DATA(10,79,253,149,91,50,104,185,55,83,163,44,85,158,170,23,176,114,85,251,145,220,126,95,225,170,227,3,28,239,9,1)
+IMAGE_DATA(190,90,221,202,122,117,50,152,202,188,157,241,230,17,74,59,83,98,244,170,23,202,213,204,171,17,211,195,84,80,47,179)
+IMAGE_DATA(42,216,37,179,112,93,42,77,91,176,147,30,127,113,30,61,253,195,159,210,185,167,255,129,50,158,249,71,186,243,198,63)
+IMAGE_DATA(18,45,224,152,199,49,159,249,186,240,115,20,227,16,206,10,107,63,103,35,182,244,115,62,115,87,120,177,156,239,47,253)
+IMAGE_DATA(7,230,234,227,68,225,157,148,176,114,30,205,93,157,66,243,215,30,19,166,111,75,184,68,79,76,10,178,212,13,163,83)
+IMAGE_DATA(215,203,14,185,39,39,111,160,87,102,238,148,122,240,222,163,87,168,166,214,120,247,52,182,220,148,94,163,235,55,111,240)
+IMAGE_DATA(103,116,59,149,179,134,52,94,16,33,79,167,26,95,67,228,106,91,90,187,168,183,175,159,174,223,184,67,189,189,55,101)
+IMAGE_DATA(151,72,63,107,82,248,160,223,185,251,22,13,223,188,39,126,181,240,126,192,215,199,94,234,155,183,222,162,174,190,59,146)
+IMAGE_DATA(255,197,60,14,180,236,240,205,183,197,111,64,25,169,181,211,112,24,62,58,157,50,51,98,118,208,13,120,124,197,60,169)
+IMAGE_DATA(121,222,188,182,222,203,5,215,218,188,176,31,65,174,134,42,170,126,37,174,86,42,87,35,61,31,170,94,253,85,184,218)
+IMAGE_DATA(212,50,244,161,112,117,236,54,118,195,13,92,197,181,185,187,231,17,57,42,204,208,137,127,103,173,183,251,41,60,96,61)
+IMAGE_DATA(11,213,103,5,59,43,192,87,233,105,172,236,53,126,75,89,245,116,252,114,157,112,21,76,77,72,205,166,51,151,77,143)
+IMAGE_DATA(17,152,42,59,216,50,12,43,141,255,81,177,48,20,33,231,233,133,204,215,210,0,83,181,70,170,61,72,18,153,21,162)
+IMAGE_DATA(137,141,78,13,5,120,42,179,52,233,222,209,243,126,192,60,170,50,85,118,144,31,43,144,189,51,234,79,136,154,170,171)
+IMAGE_DATA(85,197,179,16,190,74,199,74,164,134,10,93,10,166,30,118,122,129,245,92,250,156,142,193,107,95,251,129,179,61,63,165)
+IMAGE_DATA(203,162,81,149,143,46,43,215,239,58,43,179,40,218,147,164,154,84,117,169,6,152,42,53,213,237,231,164,166,10,166,46)
+IMAGE_DATA(219,120,50,80,75,69,238,215,240,53,221,243,215,247,185,10,95,125,55,212,163,80,57,170,44,141,231,42,116,43,234,171)
+IMAGE_DATA(208,171,120,12,158,11,39,50,77,14,56,158,171,231,164,55,184,134,46,230,84,75,47,240,194,245,204,249,53,73,52,113)
+IMAGE_DATA(246,38,122,108,252,27,244,236,247,127,72,23,158,250,52,157,121,226,239,233,157,25,255,72,247,231,48,83,103,255,61,209)
+IMAGE_DATA(156,127,162,216,220,207,114,176,254,156,247,25,138,205,7,115,249,124,129,199,219,69,252,216,226,207,74,136,198,69,44,193)
+IMAGE_DATA(115,127,75,180,111,28,221,15,239,162,173,11,23,152,127,255,134,116,241,219,223,120,0,251,204,55,121,123,87,55,140,224)
+IMAGE_DATA(169,153,181,89,39,30,75,79,77,217,68,83,230,239,19,31,139,227,231,74,236,110,75,244,234,14,13,221,165,107,125,67)
+IMAGE_DATA(226,9,128,207,101,244,3,231,123,249,96,212,87,49,207,218,216,216,73,125,215,134,233,214,237,183,204,238,233,129,219,252)
+IMAGE_DATA(153,123,67,52,107,71,207,45,201,241,98,214,70,244,105,203,109,185,70,149,93,230,53,102,78,21,92,192,107,240,122,104)
+IMAGE_DATA(87,104,222,104,117,61,149,151,215,74,157,85,125,29,144,11,134,255,50,118,146,194,159,94,122,7,35,184,198,109,21,191)
+IMAGE_DATA(34,248,37,72,190,216,50,214,215,186,38,154,69,215,234,236,234,111,59,87,31,38,15,60,198,213,177,219,135,113,139,145)
+IMAGE_DATA(249,29,144,249,213,250,97,202,43,50,59,31,177,251,17,253,75,168,17,153,25,154,107,18,194,211,240,128,163,89,123,165)
+IMAGE_DATA(239,81,60,179,235,122,169,160,180,133,117,42,152,90,75,39,47,53,80,42,243,14,76,61,196,58,192,104,212,42,209,168)
+IMAGE_DATA(194,56,47,183,107,24,88,52,106,128,177,224,46,116,170,230,118,17,166,126,26,178,30,249,224,52,188,7,83,28,111,194)
+IMAGE_DATA(212,147,190,87,62,116,169,214,84,241,152,238,121,211,125,52,26,224,43,248,168,126,132,8,245,211,63,140,58,172,245,91)
+IMAGE_DATA(42,51,53,86,230,182,228,138,161,117,189,29,113,56,135,94,213,57,85,209,169,187,206,7,242,189,15,154,163,113,185,138)
+IMAGE_DATA(94,95,236,167,65,206,23,58,85,107,170,241,61,74,58,75,179,208,211,170,230,177,99,102,95,234,242,163,129,157,53,83)
+IMAGE_DATA(23,28,20,189,42,231,172,63,149,165,114,92,4,61,203,172,93,236,215,90,133,171,243,246,73,46,24,247,193,111,176,231)
+IMAGE_DATA(228,185,114,233,93,50,92,13,217,254,37,204,180,158,186,92,69,11,86,37,210,2,214,170,11,87,38,210,196,89,107,233)
+IMAGE_DATA(251,79,204,160,137,223,255,26,101,253,242,83,148,249,196,167,137,166,49,79,167,255,29,197,102,252,29,209,76,62,127,131)
+IMAGE_DATA(181,231,44,47,102,255,163,9,230,45,205,253,7,163,103,69,219,126,198,232,91,48,119,62,255,217,121,127,79,177,253,207)
+IMAGE_DATA(18,85,236,164,229,115,22,152,157,235,235,140,47,48,60,33,224,167,111,102,84,215,218,249,85,173,169,10,83,225,11,60)
+IMAGE_DATA(105,147,228,128,231,172,60,44,158,139,23,46,85,203,94,79,195,194,123,178,235,178,189,253,26,117,180,247,82,27,127,222)
+IMAGE_DATA(98,47,23,234,169,168,177,98,222,38,28,169,149,252,47,250,109,164,175,230,173,24,221,190,243,14,127,126,223,166,206,142)
+IMAGE_DATA(91,50,155,138,62,96,104,85,204,219,244,245,222,165,150,166,155,146,27,66,127,2,250,152,134,110,220,21,47,166,230,230)
+IMAGE_DATA(187,210,35,140,157,64,96,99,69,40,74,101,21,53,30,27,235,229,49,201,3,71,7,229,90,23,251,91,224,77,95,81)
+IMAGE_DATA(217,197,239,197,118,147,19,102,182,34,48,123,131,215,27,198,54,219,16,174,130,167,28,174,47,132,245,131,112,67,125,33)
+IMAGE_DATA(224,77,81,217,47,61,192,226,15,17,54,239,125,225,108,213,53,9,249,44,136,14,136,231,26,230,130,162,81,254,94,171)
+IMAGE_DATA(91,3,49,26,103,235,106,218,249,223,25,121,15,174,186,253,69,239,240,207,248,62,115,178,199,211,171,67,150,173,202,89)
+IMAGE_DATA(97,172,23,141,77,195,210,51,2,157,15,125,142,253,47,253,253,125,182,111,73,255,6,235,143,196,241,246,219,239,138,23)
+IMAGE_DATA(132,114,21,231,15,242,134,0,87,17,101,101,101,99,92,29,187,141,188,197,72,252,38,241,123,42,122,181,196,120,111,27)
+IMAGE_DATA(63,208,65,153,147,67,184,123,18,35,53,215,204,53,42,191,87,165,191,2,62,106,145,6,202,43,172,19,166,166,95,170)
+IMAGE_DATA(165,212,243,81,74,102,254,129,169,251,19,46,90,46,106,157,211,228,125,75,3,250,50,24,204,213,211,37,150,163,241,145)
+IMAGE_DATA(238,245,38,153,253,227,21,198,27,201,99,170,114,53,232,249,80,108,125,149,92,166,98,31,141,236,164,73,202,53,247,29)
+IMAGE_DATA(95,125,101,42,248,153,200,122,213,246,52,121,123,204,205,158,85,157,215,41,52,92,230,175,139,190,25,244,45,201,44,205)
+IMAGE_DATA(158,243,35,250,122,221,188,239,131,116,42,206,145,243,133,62,21,239,223,173,167,236,158,114,48,85,123,149,130,249,223,84)
+IMAGE_DATA(209,171,232,1,134,86,69,174,87,251,126,193,82,48,85,67,185,170,161,44,21,63,96,167,198,10,189,10,174,66,191,34)
+IMAGE_DATA(175,43,92,245,250,129,193,84,13,176,245,204,149,10,74,57,83,74,243,86,28,145,249,209,37,204,215,73,211,87,211,119)
+IMAGE_DATA(126,57,137,22,124,231,203,116,225,177,191,161,156,95,124,146,104,202,167,36,98,83,88,115,78,101,182,190,206,108,125,253)
+IMAGE_DATA(111,37,192,90,203,219,89,127,103,88,59,231,239,253,35,98,246,167,204,241,224,75,68,37,59,104,206,140,121,114,109,177)
+IMAGE_DATA(120,99,58,109,57,116,73,114,208,96,169,122,23,250,62,251,235,108,95,48,152,250,220,212,205,52,254,245,205,252,250,20)
+IMAGE_DATA(90,191,251,180,120,48,86,215,220,18,175,247,70,254,156,134,47,108,103,87,31,53,183,116,120,189,75,101,86,171,194,207)
+IMAGE_DATA(176,166,182,137,159,235,228,207,235,65,225,193,91,111,189,67,55,111,221,161,225,235,240,68,71,142,247,22,191,175,76,79)
+IMAGE_DATA(2,114,59,208,171,232,7,198,227,93,172,101,219,218,13,111,59,187,111,138,214,171,169,197,251,171,67,120,136,222,98,83)
+IMAGE_DATA(39,173,149,92,115,36,210,104,119,207,225,26,23,187,94,208,119,28,170,104,55,251,250,88,183,162,23,25,97,152,218,224)
+IMAGE_DATA(251,23,122,33,115,173,30,87,253,250,234,3,216,26,134,94,141,74,47,150,132,124,109,229,55,235,227,112,135,61,215,29)
+IMAGE_DATA(247,232,79,22,77,93,107,246,187,67,143,142,22,245,245,157,54,160,137,241,247,96,86,5,158,182,221,221,189,212,215,7)
+IMAGE_DATA(63,249,1,201,173,247,245,14,74,206,160,175,255,26,223,31,52,127,174,177,143,163,87,162,161,169,207,70,99,243,181,64)
+IMAGE_DATA(160,191,186,177,177,91,254,159,26,234,91,169,165,185,155,218,219,250,248,154,135,163,235,154,28,187,113,244,162,189,173,91)
+IMAGE_DATA(190,135,230,102,120,44,54,10,47,225,95,47,218,221,11,220,215,128,143,5,184,10,47,11,244,3,143,205,217,140,221,220)
+IMAGE_DATA(27,250,150,208,55,33,59,145,43,250,229,186,20,126,221,200,255,96,22,221,212,87,111,200,53,41,250,37,48,179,142,235)
+IMAGE_DATA(98,217,235,81,86,42,62,227,136,188,162,168,112,53,237,98,141,112,245,40,51,113,127,194,101,218,123,248,162,225,169,231)
+IMAGE_DATA(205,155,226,240,84,143,174,15,82,138,147,183,181,59,102,60,190,154,93,51,102,183,219,113,231,220,229,170,203,83,201,247)
+IMAGE_DATA(122,115,170,26,96,161,242,212,229,42,142,186,79,85,119,170,218,252,112,186,63,235,170,95,223,255,154,133,54,159,44,123)
+IMAGE_DATA(87,249,235,236,58,98,60,245,221,153,212,64,110,151,245,168,235,163,164,92,53,225,237,82,101,150,66,163,234,60,141,234)
+IMAGE_DATA(84,55,52,23,172,179,170,8,157,171,65,221,212,229,170,178,21,186,117,138,87,51,141,215,173,234,179,36,158,16,94,63)
+IMAGE_DATA(48,184,138,115,236,137,81,174,162,111,233,164,147,15,150,184,88,70,135,210,114,105,214,242,67,194,213,121,203,15,208,75)
+IMAGE_DATA(147,223,164,111,255,252,21,90,254,173,207,208,217,31,127,138,242,127,254,151,68,19,63,73,177,215,254,134,143,204,199,73)
+IMAGE_DATA(159,246,99,242,223,250,172,229,136,77,251,180,199,218,79,91,125,43,231,211,254,183,225,236,161,73,68,217,27,104,234,235)
+IMAGE_DATA(75,104,238,170,36,153,177,217,118,228,138,236,150,5,67,125,175,253,213,214,203,80,185,10,166,194,99,233,197,153,27,233)
+IMAGE_DATA(205,205,105,180,113,119,6,245,244,223,166,254,225,119,169,163,243,174,244,22,53,52,93,19,127,159,202,170,26,241,9,198)
+IMAGE_DATA(172,42,180,42,242,191,213,53,141,204,199,14,26,232,191,206,26,232,30,93,31,70,254,119,144,117,87,47,117,116,15,82)
+IMAGE_DATA(79,223,29,234,233,190,45,126,251,50,115,83,101,246,183,161,94,130,107,88,104,42,228,139,113,140,214,154,124,15,88,164)
+IMAGE_DATA(127,31,122,161,240,247,32,144,43,141,68,235,133,89,154,139,149,235,218,112,151,241,49,244,124,242,3,76,133,55,176,231)
+IMAGE_DATA(15,44,94,193,124,4,159,133,167,163,112,117,4,91,195,134,35,17,254,26,216,161,29,142,84,139,62,199,121,132,207,241)
+IMAGE_DATA(120,36,90,195,81,231,29,205,121,125,67,43,115,169,155,154,154,122,164,7,107,180,104,105,233,147,104,102,246,137,223,33)
+IMAGE_DATA(115,15,189,97,216,91,139,192,215,168,171,111,145,192,185,6,118,25,32,239,222,216,210,205,209,41,127,79,75,75,143,31)
+IMAGE_DATA(173,93,252,127,210,237,68,23,63,214,41,71,220,247,159,239,226,107,26,102,104,43,56,219,35,143,181,119,240,255,91,123)
+IMAGE_DATA(143,236,96,131,46,5,43,145,63,134,183,34,252,160,226,3,190,139,200,1,227,103,132,28,179,206,175,142,245,3,143,221)
+IMAGE_DATA(52,23,2,191,204,186,134,235,194,85,188,255,117,254,220,204,202,93,179,187,25,145,7,70,222,23,239,95,188,71,67,222)
+IMAGE_DATA(172,188,217,249,87,65,133,165,53,172,85,77,28,187,80,45,92,5,83,119,29,200,52,126,187,78,239,144,48,245,100,92)
+IMAGE_DATA(61,84,162,204,238,151,1,43,149,173,86,239,58,59,103,210,227,184,170,121,94,151,171,73,113,190,74,202,85,225,167,199)
+IMAGE_DATA(210,0,95,177,55,245,168,9,233,237,229,64,110,87,181,233,81,143,251,224,63,52,171,245,104,242,152,138,215,99,134,21)
+IMAGE_DATA(121,96,120,253,198,207,209,196,231,123,93,141,42,121,95,102,232,138,205,134,165,96,42,2,189,191,208,170,111,198,113,53)
+IMAGE_DATA(168,87,211,172,247,131,122,0,203,46,114,199,3,216,213,172,194,79,228,133,177,171,38,174,31,88,188,11,61,141,10,190)
+IMAGE_DATA(170,175,33,246,196,164,157,41,162,19,204,214,19,200,3,123,108,117,249,10,79,136,153,111,30,162,217,43,143,210,172,37)
+IMAGE_DATA(123,232,217,215,150,208,119,126,252,2,173,253,198,167,41,227,123,159,164,162,159,125,130,104,2,51,245,101,47,94,97,182)
+IMAGE_DATA(190,194,26,246,213,191,145,176,188,229,136,77,250,164,199,217,79,123,250,150,31,159,134,231,255,130,232,141,207,82,236,200)
+IMAGE_DATA(235,68,231,86,211,171,83,87,208,172,21,9,244,230,150,147,180,227,200,37,249,94,127,249,218,186,128,102,117,217,138,124)
+IMAGE_DATA(240,243,211,182,200,30,243,215,102,239,146,185,213,125,137,23,153,135,119,36,119,216,214,121,135,250,7,223,161,182,142,235)
+IMAGE_DATA(146,147,65,238,23,253,74,165,165,17,209,125,29,157,125,52,192,159,191,216,19,130,220,31,246,138,192,75,2,51,32,82)
+IMAGE_DATA(239,140,154,92,101,87,215,176,112,21,189,9,136,146,80,175,120,252,162,23,16,58,22,121,92,237,65,146,252,111,212,236)
+IMAGE_DATA(115,1,15,193,57,209,172,28,208,116,209,234,6,153,97,21,127,8,229,42,235,67,189,198,245,251,151,234,45,83,43,171)
+IMAGE_DATA(170,133,209,18,232,25,102,62,163,111,41,228,245,3,251,53,214,7,112,21,76,5,75,133,169,117,94,48,79,195,117,38)
+IMAGE_DATA(192,84,214,209,96,190,229,106,125,167,240,178,137,245,35,216,170,49,26,91,113,20,15,126,48,181,222,247,232,87,166,34)
+IMAGE_DATA(26,26,61,206,54,118,72,128,165,134,219,93,246,92,67,217,138,35,174,111,192,75,228,26,92,190,10,79,219,13,119,69)
+IMAGE_DATA(159,122,247,219,59,122,164,182,138,28,111,91,91,139,228,141,71,211,171,110,192,35,10,126,22,200,21,195,231,30,222,21)
+IMAGE_DATA(99,92,29,187,89,174,222,39,153,179,65,61,21,185,95,228,151,100,55,69,212,236,127,67,239,130,230,122,240,24,142,120)
+IMAGE_DATA(175,150,150,84,72,62,76,119,82,230,23,135,133,169,170,89,225,85,180,251,240,5,218,125,240,188,229,170,178,207,232,214)
+IMAGE_DATA(242,64,111,174,239,125,95,230,213,67,205,243,194,85,47,223,171,28,213,199,220,199,117,183,155,171,39,53,79,171,92,85)
+IMAGE_DATA(62,74,175,146,163,83,133,161,186,83,213,219,157,138,58,41,142,120,14,175,199,215,209,90,173,244,18,159,48,251,227,244)
+IMAGE_DATA(107,106,63,48,250,150,182,31,186,98,185,234,242,52,224,241,96,235,168,38,180,207,23,12,149,254,36,47,247,171,92,93)
+IMAGE_DATA(230,248,255,186,90,85,251,149,92,166,90,207,66,173,179,178,118,117,231,104,224,251,0,207,66,213,171,170,93,101,134,117)
+IMAGE_DATA(129,9,156,163,222,170,58,118,197,230,227,116,44,163,144,127,222,69,162,91,79,196,105,87,176,118,119,194,21,154,190,228)
+IMAGE_DATA(128,112,110,250,194,61,52,238,229,133,244,173,31,62,67,219,190,254,73,74,251,214,95,80,213,79,254,146,98,47,252,21)
+IMAGE_DATA(209,243,255,91,34,246,194,95,75,208,139,204,208,151,248,177,151,255,218,4,179,54,54,225,147,30,99,161,111,255,90,142)
+IMAGE_DATA(52,17,175,249,56,235,213,127,38,74,158,77,183,143,46,162,87,103,172,167,55,86,38,201,207,8,127,255,132,217,59,133)
+IMAGE_DATA(171,198,175,112,141,229,169,158,99,127,141,234,213,25,139,176,115,53,141,175,147,10,165,87,23,53,207,214,246,123,252,89)
+IMAGE_DATA(107,250,140,224,159,143,223,113,232,85,120,232,181,183,15,81,79,239,160,232,27,228,14,145,155,236,234,190,198,26,135,53)
+IMAGE_DATA(103,61,118,179,53,74,190,20,245,190,150,182,235,212,220,58,76,221,189,240,218,191,101,119,151,139,191,126,149,201,11,137)
+IMAGE_DATA(95,61,95,167,194,35,191,60,212,38,239,53,153,77,101,126,163,111,9,186,21,60,195,142,52,232,85,188,47,193,84,121)
+IMAGE_DATA(111,70,76,46,54,92,221,34,124,83,246,249,92,85,158,86,123,181,213,200,123,114,53,222,123,31,60,23,142,70,107,2)
+IMAGE_DATA(92,149,239,71,244,106,157,199,212,122,239,220,231,106,67,115,79,128,171,141,45,189,242,88,144,171,221,194,84,213,171,35)
+IMAGE_DATA(184,202,218,213,231,42,159,55,116,56,60,237,245,88,218,231,132,199,83,47,236,99,86,171,58,209,218,27,96,106,27,107)
+IMAGE_DATA(85,232,213,198,198,102,254,186,205,226,83,129,64,221,247,65,1,93,139,26,43,252,38,112,125,245,97,251,3,143,221,30)
+IMAGE_DATA(165,219,125,201,3,163,150,36,158,164,225,54,254,108,105,246,250,11,90,36,47,21,141,182,80,184,166,94,222,191,218,171)
+IMAGE_DATA(132,247,151,201,255,86,122,59,181,66,116,53,175,92,106,171,38,15,108,184,186,235,208,121,209,171,202,75,163,87,203,165)
+IMAGE_DATA(87,215,176,180,216,155,35,45,178,57,86,213,172,194,223,83,65,134,34,180,87,73,3,207,7,190,182,163,89,93,191,95)
+IMAGE_DATA(241,122,72,43,178,28,212,156,237,254,228,60,155,251,117,185,170,123,203,241,60,242,193,250,117,18,79,20,75,224,123,54)
+IMAGE_DATA(249,223,124,57,38,120,243,171,123,147,114,100,118,21,92,141,247,207,15,230,122,51,196,51,31,60,117,153,10,142,34,150)
+IMAGE_DATA(123,245,212,7,229,128,149,173,198,15,216,207,255,6,216,186,42,85,216,170,158,74,224,35,122,145,224,251,160,58,212,13)
+IMAGE_DATA(157,173,1,87,37,63,140,62,38,239,207,173,220,122,156,249,147,207,63,231,124,225,235,9,143,173,8,112,54,253,108,49)
+IMAGE_DATA(237,56,116,145,102,44,61,200,122,53,145,117,239,110,122,234,133,121,244,159,223,125,140,118,127,245,19,148,252,141,63,163)
+IMAGE_DATA(234,31,125,130,238,63,251,151,68,79,179,230,28,199,140,125,214,4,61,231,179,150,198,43,107,125,206,198,94,230,215,188)
+IMAGE_DATA(242,87,38,158,255,24,197,102,255,43,209,241,5,84,191,109,22,77,158,179,157,102,174,72,164,101,172,87,193,213,113,83)
+IMAGE_DATA(55,200,174,26,217,89,227,245,45,185,231,79,91,174,110,146,90,48,114,192,23,174,212,10,71,177,47,49,90,127,93,118)
+IMAGE_DATA(206,96,103,118,36,130,157,219,93,242,249,222,210,54,36,158,249,208,160,200,229,202,158,208,168,217,221,2,173,136,30,131)
+IMAGE_DATA(170,104,179,212,72,81,223,131,63,97,115,203,13,233,99,194,92,13,24,139,93,169,200,3,149,201,14,212,70,42,13,213)
+IMAGE_DATA(10,183,37,231,11,239,134,170,54,169,181,68,133,173,38,119,139,62,32,240,29,187,209,162,181,125,222,123,176,79,122,132)
+IMAGE_DATA(196,223,201,99,170,225,96,157,63,211,202,127,86,235,179,163,113,53,158,169,1,182,98,167,77,85,196,227,104,173,229,170)
+IMAGE_DATA(240,19,90,21,185,96,62,71,239,114,60,87,27,227,184,138,115,229,42,142,202,85,60,103,243,192,202,84,47,23,108,162)
+IMAGE_DATA(35,144,7,30,157,171,61,129,8,112,213,201,11,139,142,117,52,107,188,94,5,87,113,191,166,166,78,52,168,238,46,69)
+IMAGE_DATA(79,26,250,169,30,20,200,89,64,167,234,126,211,177,217,213,177,155,222,192,85,212,235,35,213,94,206,3,253,10,242,62)
+IMAGE_DATA(170,118,106,40,245,242,25,18,133,167,26,191,143,241,158,67,238,87,246,125,148,152,126,14,112,245,248,229,6,201,1,167)
+IMAGE_DATA(100,70,40,145,25,7,174,170,94,85,29,42,218,241,152,214,58,11,108,95,145,106,74,101,107,234,9,147,7,78,247,234)
+IMAGE_DATA(170,96,232,73,248,19,122,30,133,90,111,213,28,112,138,213,192,229,182,23,88,254,142,227,37,54,148,171,38,119,139,124)
+IMAGE_DATA(48,216,154,47,236,212,0,75,197,143,48,49,215,238,45,119,115,194,202,87,229,115,130,55,175,131,220,50,120,44,115,54)
+IMAGE_DATA(71,174,90,189,234,214,80,193,210,85,91,207,72,32,223,187,34,142,159,218,155,4,142,34,239,11,141,170,94,74,26,202)
+IMAGE_DATA(88,215,103,223,236,173,73,9,176,85,242,194,204,85,213,171,200,245,42,59,161,85,229,232,205,211,168,15,132,212,83,61)
+IMAGE_DATA(31,8,188,94,106,173,139,13,103,87,109,59,65,137,199,114,248,103,155,75,201,39,243,152,173,197,146,23,6,79,113,4)
+IMAGE_DATA(107,193,40,112,117,206,170,36,254,51,59,233,23,207,207,166,111,127,251,39,116,248,223,62,70,73,95,251,56,53,252,240)
+IMAGE_DATA(207,40,246,228,159,83,236,137,63,35,122,146,89,249,4,243,245,41,143,179,30,107,37,158,253,43,137,152,229,45,63,54)
+IMAGE_DATA(222,139,167,255,132,104,238,215,137,50,150,211,133,85,51,104,234,130,253,252,239,77,162,149,219,79,209,166,125,153,178,163)
+IMAGE_DATA(38,184,23,110,173,237,91,146,94,96,143,171,200,5,47,221,112,148,54,239,59,69,57,5,237,50,47,22,173,102,205,90)
+IMAGE_DATA(127,143,63,91,239,240,181,164,153,33,195,57,248,216,214,113,83,118,167,162,215,0,253,243,152,39,5,71,192,174,130,130)
+IMAGE_DATA(74,42,42,170,164,146,242,168,204,187,72,93,147,57,219,216,200,159,255,77,195,252,254,26,20,54,163,199,183,164,60,44)
+IMAGE_DATA(126,195,152,219,65,189,182,164,36,44,253,197,69,101,172,139,203,170,152,157,45,50,47,2,158,99,167,90,93,67,175,236)
+IMAGE_DATA(243,150,190,166,90,205,37,245,8,107,241,126,212,122,42,244,169,30,133,169,202,85,47,68,255,62,4,87,133,173,30,87)
+IMAGE_DATA(85,179,186,97,242,192,181,150,165,255,93,174,130,139,96,170,213,171,146,15,214,104,145,253,172,8,213,172,56,198,231,127)
+IMAGE_DATA(149,167,122,62,26,87,13,83,77,128,159,136,81,243,192,124,31,158,138,53,53,81,217,175,10,110,42,51,31,20,186,135)
+IMAGE_DATA(109,140,169,99,55,189,217,110,246,251,36,117,8,147,3,170,246,184,106,250,20,42,195,21,134,175,145,86,195,212,106,126)
+IMAGE_DATA(46,90,37,175,195,222,14,241,159,41,42,148,89,249,171,185,101,148,126,190,150,163,154,82,153,123,170,87,119,238,63,231)
+IMAGE_DATA(237,57,85,47,6,14,102,26,194,48,174,48,192,84,13,245,74,82,174,66,167,158,20,79,136,112,192,175,208,213,172,90)
+IMAGE_DATA(163,53,154,181,44,192,84,213,171,194,198,84,212,76,249,62,102,105,146,11,252,220,239,81,195,83,176,81,242,192,208,171)
+IMAGE_DATA(30,119,193,85,87,235,234,215,210,252,47,116,170,236,136,75,200,166,237,135,174,138,255,175,235,253,224,207,208,156,181,250)
+IMAGE_DATA(20,220,116,235,166,218,239,11,126,46,197,125,199,163,208,173,171,154,243,147,1,175,165,248,189,229,226,97,136,26,171,227)
+IMAGE_DATA(171,164,94,133,168,173,218,158,95,248,255,206,53,76,85,174,34,166,46,50,60,157,188,200,244,4,99,63,13,184,10,175)
+IMAGE_DATA(143,132,19,121,116,244,68,190,240,53,245,116,129,68,202,169,66,90,179,237,184,201,3,175,74,52,179,171,207,204,164,239)
+IMAGE_DATA(124,253,191,40,237,223,254,148,18,191,242,49,106,255,254,159,19,61,198,92,253,5,115,245,151,222,241,241,79,72,196,112)
+IMAGE_DATA(4,103,153,187,244,212,39,36,98,207,40,107,63,225,105,91,60,254,81,230,234,55,41,118,110,45,29,154,63,85,174,25)
+IMAGE_DATA(230,46,79,160,85,187,78,138,223,210,147,19,214,73,104,238,87,251,149,92,174,62,59,101,147,212,87,225,7,177,110,199)
+IMAGE_DATA(73,42,44,237,147,157,136,216,221,132,221,226,200,7,135,107,110,74,207,17,114,194,157,93,198,31,9,156,133,7,74,99)
+IMAGE_DATA(203,117,234,232,186,33,117,79,212,94,243,242,75,204,174,184,124,227,109,152,95,80,100,253,13,161,69,193,206,188,34,126)
+IMAGE_DATA(188,184,68,88,90,88,192,215,162,252,26,227,51,97,246,206,9,151,153,181,216,85,138,93,221,224,118,99,179,217,217,141)
+IMAGE_DATA(62,96,212,85,195,213,61,178,171,27,204,197,44,39,122,111,193,85,91,71,245,152,106,217,234,233,85,203,85,228,127,31)
+IMAGE_DATA(130,171,21,85,149,222,103,65,109,28,87,189,254,37,254,59,165,230,107,217,106,250,151,160,51,81,91,125,56,174,246,218)
+IMAGE_DATA(93,173,86,163,106,191,18,243,84,251,150,180,206,10,189,138,254,94,213,170,239,203,85,173,183,122,58,213,112,181,219,230)
+IMAGE_DATA(130,209,183,164,156,149,104,237,146,61,235,240,251,69,126,215,221,253,230,238,90,243,119,151,143,124,108,236,54,118,211,27)
+IMAGE_DATA(126,111,208,91,30,152,17,151,220,145,185,110,149,247,18,114,192,232,171,224,247,82,85,36,44,117,31,92,119,35,255,139)
+IMAGE_DATA(158,57,201,3,231,150,208,177,115,213,148,124,62,76,201,231,194,50,227,185,243,96,38,109,223,127,214,209,143,166,7,232)
+IMAGE_DATA(72,114,129,199,54,83,235,68,216,253,167,199,77,205,21,245,210,244,51,85,129,252,175,59,179,138,163,246,47,225,190,246)
+IMAGE_DATA(57,105,141,213,237,255,197,215,151,89,83,207,239,65,180,39,102,105,52,247,155,20,212,169,8,205,5,187,125,76,250,103)
+IMAGE_DATA(245,92,239,11,143,147,204,30,155,109,7,47,115,100,201,236,234,250,93,23,100,246,116,205,246,211,180,118,155,233,81,18)
+IMAGE_DATA(173,186,137,99,163,233,69,18,221,185,33,205,120,20,121,156,92,178,238,24,31,77,158,215,101,170,63,187,234,135,114,215)
+IMAGE_DATA(238,92,93,125,204,211,169,190,87,225,140,37,137,18,154,15,214,94,95,240,244,181,57,251,36,44,91,231,251,94,251,240)
+IMAGE_DATA(132,16,47,67,126,108,235,222,12,58,114,44,91,34,33,237,42,31,179,228,152,152,158,47,140,61,202,58,118,233,166,99)
+IMAGE_DATA(244,198,146,131,210,187,244,218,140,205,244,147,113,175,211,15,190,246,13,58,243,165,63,165,163,28,125,223,251,40,197,126)
+IMAGE_DATA(250,49,162,159,124,156,227,99,230,252,103,31,55,241,24,51,246,23,127,110,226,151,136,143,251,156,69,224,252,9,126,236)
+IMAGE_DATA(151,31,37,90,248,35,162,204,117,180,122,218,52,154,206,92,69,159,20,114,2,203,152,235,143,79,88,99,103,87,209,175)
+IMAGE_DATA(164,122,21,108,149,190,165,87,13,87,95,158,177,141,127,230,169,210,183,29,10,15,137,135,24,188,242,43,163,55,133,159)
+IMAGE_DATA(178,15,53,50,40,179,48,240,241,109,235,188,39,122,21,30,73,216,119,211,63,112,93,222,7,58,123,99,118,155,23,217)
+IMAGE_DATA(29,55,96,173,225,109,17,93,205,46,144,93,173,250,24,94,163,158,253,114,44,8,137,102,133,142,197,251,12,179,170,152)
+IMAGE_DATA(167,209,94,7,221,195,138,218,171,204,136,214,116,136,183,33,114,196,54,247,27,167,83,193,209,178,10,223,107,216,236,142)
+IMAGE_DATA(97,166,150,87,200,247,61,90,125,53,190,127,201,175,177,214,5,114,194,38,7,220,64,241,53,86,240,112,52,189,170,49)
+IMAGE_DATA(66,175,122,92,85,189,234,214,87,85,175,142,158,7,238,126,223,60,176,106,86,55,180,55,120,164,94,237,149,251,224,170)
+IMAGE_DATA(206,163,62,10,62,250,163,241,122,140,225,191,29,55,229,42,174,79,113,205,25,173,174,165,40,191,119,192,85,204,167,99)
+IMAGE_DATA(118,27,253,245,168,165,160,246,42,61,75,222,108,13,126,15,113,141,141,218,77,33,127,46,128,167,201,103,107,248,24,21)
+IMAGE_DATA(31,221,29,251,207,211,182,189,231,108,207,144,246,205,42,87,245,62,114,168,96,160,106,77,237,91,114,185,42,90,245,124)
+IMAGE_DATA(68,2,231,170,83,221,92,177,241,135,240,185,10,45,41,249,93,135,143,202,72,28,3,28,245,216,234,106,84,125,60,80)
+IMAGE_DATA(119,77,206,179,71,176,84,153,138,153,213,29,135,179,68,171,110,61,112,133,54,240,231,245,6,97,234,57,90,181,253,188)
+IMAGE_DATA(248,37,97,95,170,228,126,55,24,189,41,254,190,235,77,47,210,146,53,169,180,200,235,65,90,180,58,93,142,208,161,202)
+IMAGE_DATA(86,205,1,155,222,165,19,129,231,92,127,224,121,107,82,197,43,23,172,209,28,176,248,67,48,83,85,183,74,157,117,238)
+IMAGE_DATA(254,0,87,149,173,175,205,221,75,19,102,239,150,163,120,238,123,172,5,87,15,167,94,149,56,152,124,137,227,138,28,15)
+IMAGE_DATA(165,40,107,115,104,225,58,230,248,226,3,194,213,9,211,55,208,15,159,158,74,63,253,202,87,153,171,31,165,228,127,249)
+IMAGE_DATA(19,26,250,206,71,137,126,244,39,68,255,245,113,138,253,16,199,63,37,250,49,243,245,71,56,254,169,112,214,101,173,232)
+IMAGE_DATA(217,199,62,102,56,203,220,141,253,156,255,252,99,252,231,22,63,198,92,221,72,179,95,158,36,255,62,228,157,55,237,61)
+IMAGE_DATA(79,11,214,39,123,121,224,245,1,189,170,108,5,83,159,153,180,129,198,77,222,40,189,192,43,183,166,241,191,39,71,230)
+IMAGE_DATA(179,35,145,33,241,196,134,135,39,122,139,208,183,91,91,127,139,89,122,135,117,210,109,106,106,28,18,111,7,233,81,170)
+IMAGE_DATA(109,20,54,233,206,56,127,183,141,241,225,55,156,45,182,76,205,186,154,111,217,138,192,227,248,115,224,42,230,98,213,35)
+IMAGE_DATA(17,218,22,58,180,185,117,64,244,170,248,0,135,187,164,87,80,250,150,170,219,229,26,23,154,22,126,11,96,28,222,183)
+IMAGE_DATA(202,83,217,133,35,186,52,98,185,106,124,13,189,126,96,71,175,90,174,86,61,120,230,102,100,30,88,235,172,245,228,207)
+IMAGE_DATA(216,212,57,121,96,151,171,125,70,187,198,205,150,198,115,213,173,173,142,224,234,3,235,171,58,203,19,100,172,213,169,252)
+IMAGE_DATA(245,125,174,118,198,113,181,235,129,245,213,210,210,114,225,170,234,213,15,147,171,99,252,252,237,190,225,255,175,165,165,77)
+IMAGE_DATA(222,159,96,39,62,51,170,81,79,173,54,239,157,112,56,42,51,208,168,233,215,214,52,202,253,138,138,10,121,159,74,31)
+IMAGE_DATA(58,252,206,88,215,150,132,170,100,79,41,184,138,93,224,240,37,2,83,183,236,62,19,152,69,81,127,35,201,165,58,254)
+IMAGE_DATA(12,174,102,53,189,75,229,162,89,211,50,42,3,57,96,120,55,225,168,181,85,151,171,8,212,114,241,117,172,150,76,50)
+IMAGE_DATA(222,130,8,229,164,178,84,31,119,159,83,61,170,252,116,181,172,188,54,49,91,206,119,39,101,11,75,117,39,156,97,234)
+IMAGE_DATA(21,209,170,146,3,222,117,153,214,238,206,180,61,192,226,239,235,213,83,151,109,100,237,185,46,69,102,66,69,139,66,167)
+IMAGE_DATA(174,74,19,174,46,244,116,167,223,235,123,204,50,84,53,43,246,119,187,44,85,190,234,220,13,252,114,93,239,125,245,3)
+IMAGE_DATA(86,47,96,228,131,193,203,87,103,239,149,80,174,226,124,194,172,61,194,85,28,237,243,204,216,109,251,206,120,44,189,66)
+IMAGE_DATA(7,142,94,166,253,73,151,56,46,112,152,199,14,165,100,209,220,85,9,162,87,81,99,125,121,218,26,250,222,19,147,232)
+IMAGE_DATA(201,47,126,137,50,191,248,71,148,250,133,143,210,157,111,252,49,209,119,255,152,98,223,251,19,138,125,247,143,136,190,199)
+IMAGE_DATA(247,127,240,81,19,204,89,203,90,4,243,215,104,219,143,89,222,198,126,252,135,70,215,46,123,130,98,39,214,209,196,23)
+IMAGE_DATA(166,75,29,120,238,234,163,124,29,147,41,94,139,218,247,235,134,228,130,153,183,226,179,196,76,29,55,121,189,228,171,215)
+IMAGE_DATA(237,58,33,253,205,208,129,213,209,46,241,9,68,142,23,158,13,216,67,126,253,214,125,241,109,192,103,62,126,207,241,126)
+IMAGE_DATA(0,79,115,10,138,45,15,85,163,250,92,53,26,213,101,170,203,85,28,241,92,113,113,149,212,99,43,194,245,162,41,161)
+IMAGE_DATA(87,113,205,42,51,176,93,55,168,165,109,80,122,165,224,199,135,61,176,145,26,190,166,245,180,169,214,112,13,75,35,1)
+IMAGE_DATA(166,34,172,110,245,180,171,233,91,138,74,79,132,122,4,99,142,85,114,82,149,149,94,132,157,208,60,176,246,2,143,210)
+IMAGE_DATA(191,244,0,174,130,165,245,77,221,35,242,192,26,241,121,224,17,61,75,58,183,250,158,92,125,255,190,37,191,198,218,53)
+IMAGE_DATA(74,79,176,207,85,104,85,151,171,110,30,248,195,214,171,184,61,12,95,31,180,171,96,236,246,225,220,240,243,135,94,5)
+IMAGE_DATA(87,197,171,211,94,159,214,121,189,122,204,216,186,102,170,174,237,17,207,111,92,75,87,51,95,161,95,213,227,19,175,67)
+IMAGE_DATA(221,181,172,50,66,41,103,170,101,79,41,246,149,130,171,96,234,230,93,25,129,249,22,151,165,202,87,245,17,116,189,23)
+IMAGE_DATA(180,7,9,156,132,110,117,243,191,39,189,115,119,198,213,247,135,40,51,126,132,169,126,142,87,56,120,36,59,16,202,67)
+IMAGE_DATA(151,173,194,85,228,134,227,152,234,126,13,228,122,229,152,224,135,207,212,203,210,175,164,123,224,176,47,85,242,191,28,43)
+IMAGE_DATA(183,101,26,223,252,77,166,71,9,123,212,228,184,62,77,180,170,230,116,23,174,78,182,57,93,119,62,85,159,95,176,46)
+IMAGE_DATA(77,66,251,129,227,53,171,122,27,202,12,43,51,85,194,169,177,106,30,24,218,84,185,169,60,141,191,143,120,229,141,221)
+IMAGE_DATA(244,10,115,118,203,254,51,50,231,137,48,76,189,196,231,231,57,46,219,251,51,223,60,64,179,150,194,183,105,31,141,159)
+IMAGE_DATA(180,130,190,245,216,4,122,230,243,159,165,243,95,248,8,29,255,220,31,209,187,95,103,46,126,235,15,233,254,55,63,74)
+IMAGE_DATA(244,77,230,234,183,152,171,208,176,18,30,103,191,255,81,63,132,177,127,98,52,46,226,251,191,79,177,199,254,130,104,229)
+IMAGE_DATA(243,68,73,75,105,252,11,179,141,199,34,115,117,203,129,11,146,187,126,236,165,53,35,60,33,160,97,159,122,205,175,173)
+IMAGE_DATA(62,63,101,35,205,91,157,64,235,153,171,103,47,23,74,78,19,215,140,248,157,134,31,4,244,105,67,235,109,233,255,197)
+IMAGE_DATA(115,90,55,205,206,51,199,66,111,166,213,244,30,149,89,157,10,182,42,83,149,161,174,78,5,115,81,115,149,247,76,77)
+IMAGE_DATA(171,248,57,200,172,13,102,215,34,77,194,163,206,158,1,142,33,97,43,60,133,240,186,112,181,241,123,208,221,53,178,243)
+IMAGE_DATA(173,188,90,190,22,114,199,56,199,126,57,217,49,23,138,216,253,173,15,207,85,159,169,234,17,236,114,53,152,15,142,239)
+IMAGE_DATA(87,114,243,192,35,231,87,31,148,7,182,253,192,30,91,69,175,122,179,172,82,87,245,60,34,70,114,181,151,70,171,177)
+IMAGE_DATA(186,122,53,152,7,126,63,189,218,99,125,33,74,74,202,30,25,189,58,118,251,237,190,41,87,221,156,15,62,75,208,31)
+IMAGE_DATA(97,122,36,6,165,238,84,84,114,67,230,239,100,14,0,181,157,186,46,153,233,131,247,12,250,238,113,29,159,156,17,166)
+IMAGE_DATA(68,230,91,18,235,70,236,120,1,83,17,174,183,2,120,231,250,50,40,91,165,31,40,205,132,246,26,97,70,212,157,183)
+IMAGE_DATA(209,90,170,155,247,61,118,218,159,225,81,255,95,201,255,122,121,94,101,38,120,8,191,6,229,98,60,95,17,218,3,44)
+IMAGE_DATA(26,55,49,219,234,88,253,58,238,159,67,207,175,132,231,5,44,187,203,15,92,113,246,149,159,117,122,129,141,135,18,242)
+IMAGE_DATA(192,111,110,62,65,139,55,101,208,2,228,129,55,156,244,242,193,222,92,234,218,84,47,151,235,123,255,130,169,38,39,156)
+IMAGE_DATA(46,231,216,219,2,174,198,247,9,251,76,61,22,216,103,46,126,134,158,94,181,61,193,216,171,234,234,83,47,92,174,190)
+IMAGE_DATA(60,115,23,189,56,125,7,189,52,99,39,189,58,103,143,228,129,119,31,206,164,189,9,23,60,190,94,182,71,48,21,143)
+IMAGE_DATA(79,91,178,87,180,234,212,133,123,105,220,107,111,210,215,127,242,34,189,240,153,79,211,249,127,250,3,202,248,204,71,40)
+IMAGE_DATA(246,213,143,16,125,253,35,116,255,63,254,144,98,124,68,208,127,242,249,55,254,208,112,150,35,246,237,63,150,176,156,149)
+IMAGE_DATA(248,35,19,223,252,29,162,95,124,138,104,253,171,20,219,55,151,198,189,56,79,250,171,22,172,77,97,174,102,74,47,210)
+IMAGE_DATA(207,95,92,77,63,123,97,5,31,87,10,95,117,102,21,76,69,14,24,92,125,97,218,102,90,178,241,24,109,218,121,154)
+IMAGE_DATA(114,242,203,36,31,131,48,185,207,168,112,14,191,235,240,9,68,207,123,94,65,190,104,210,236,124,147,243,45,44,8,9)
+IMAGE_DATA(95,205,78,243,114,233,47,0,95,77,94,184,216,219,123,94,98,249,138,35,238,163,103,9,124,19,141,214,208,42,243,167)
+IMAGE_DATA(161,10,236,43,111,150,57,27,252,189,232,89,50,51,53,109,226,69,161,126,196,232,125,42,41,137,202,99,202,80,229,106)
+IMAGE_DATA(128,169,206,94,116,237,101,114,253,150,144,255,85,63,195,160,70,13,114,53,62,7,236,234,82,228,178,240,25,225,31,205)
+IMAGE_DATA(57,216,215,210,210,47,108,117,3,143,185,209,218,58,32,252,115,245,169,246,253,234,185,244,41,193,99,201,243,89,82,173)
+IMAGE_DATA(234,115,20,185,222,107,54,218,218,250,227,162,207,250,43,105,77,213,205,251,118,8,79,77,192,235,3,247,213,71,255,81)
+IMAGE_DATA(227,106,188,254,124,84,190,175,177,219,131,111,82,95,109,105,179,239,31,123,109,90,13,45,122,67,118,60,195,135,191,160)
+IMAGE_DATA(116,128,74,67,67,82,119,194,62,27,248,158,194,39,166,166,22,30,107,213,82,167,73,57,27,242,119,126,179,238,4,83)
+IMAGE_DATA(241,217,5,150,138,94,245,122,114,205,236,168,233,29,18,189,234,245,213,106,47,144,250,216,235,76,75,18,107,223,100,254)
+IMAGE_DATA(186,136,148,12,230,232,153,144,195,212,144,132,203,84,124,13,87,95,234,46,84,28,193,65,137,35,202,217,156,17,250,85)
+IMAGE_DATA(255,156,27,202,93,101,180,114,90,191,182,236,90,21,189,106,252,11,215,236,60,47,60,53,222,249,167,104,245,22,204,209)
+IMAGE_DATA(100,208,226,141,167,104,13,179,117,195,182,19,180,126,243,49,209,171,243,54,24,13,107,184,154,46,218,212,236,81,61,42)
+IMAGE_DATA(140,84,143,66,4,184,234,230,129,85,179,162,174,58,123,101,74,160,39,88,125,33,148,171,208,170,46,83,69,139,190,225)
+IMAGE_DATA(231,124,173,62,229,120,113,230,78,26,63,125,187,112,213,228,129,79,211,206,131,103,105,215,161,115,180,231,200,121,97,234)
+IMAGE_DATA(222,4,112,214,104,213,237,135,50,105,242,194,93,146,95,157,178,96,23,61,245,202,98,250,234,15,158,165,41,255,240,87)
+IMAGE_DATA(116,230,239,126,143,46,252,211,239,81,236,43,172,55,255,253,15,36,8,140,69,124,237,15,77,124,221,48,23,156,85,214)
+IMAGE_DATA(222,255,214,31,121,188,253,136,232,92,250,218,255,71,244,248,63,18,109,121,157,174,111,156,73,207,190,250,166,204,1,193)
+IMAGE_DATA(187,24,51,54,224,231,207,94,88,69,63,29,191,92,184,138,0,87,159,100,173,10,166,138,39,240,212,77,124,205,176,133)
+IMAGE_DATA(86,108,73,161,29,251,50,164,175,93,106,142,204,40,120,157,20,151,22,137,254,130,47,60,30,211,126,93,211,139,228,69)
+IMAGE_DATA(145,97,170,217,117,94,38,92,197,28,42,24,235,239,62,247,181,171,134,178,21,44,196,251,11,30,182,240,48,196,44,107)
+IMAGE_DATA(113,105,29,95,187,214,114,212,80,65,81,116,244,175,145,195,220,206,45,165,252,252,242,64,109,86,184,91,106,102,201,241)
+IMAGE_DATA(125,152,115,143,185,78,152,121,115,175,55,162,188,42,176,231,220,68,216,158,155,250,107,212,134,241,111,242,195,120,251,6)
+IMAGE_DATA(3,51,51,208,172,193,57,212,54,191,7,73,103,103,26,58,228,24,172,215,250,161,172,198,53,187,134,206,185,6,190,174)
+IMAGE_DATA(171,103,27,219,252,224,175,143,35,246,34,52,53,183,7,2,179,15,136,150,230,14,79,203,122,193,159,129,37,37,37,143)
+IMAGE_DATA(36,87,113,3,91,225,69,221,213,213,67,61,61,125,118,182,71,251,149,199,110,143,214,13,255,47,77,94,63,48,122,22)
+IMAGE_DATA(240,158,194,123,14,215,238,198,227,229,154,244,69,194,219,84,119,198,97,30,161,50,106,188,77,37,106,134,248,241,62,74)
+IMAGE_DATA(57,95,105,246,169,29,247,185,186,113,199,41,209,128,186,47,70,246,195,164,153,217,81,241,225,77,45,176,44,212,62,91)
+IMAGE_DATA(225,175,183,3,85,245,43,216,170,1,190,186,76,69,190,88,247,201,104,254,23,252,3,243,176,87,220,112,47,203,178,85)
+IMAGE_DATA(30,63,152,37,143,129,141,46,79,193,91,228,117,119,28,188,42,251,222,148,197,162,93,181,63,73,30,203,182,95,83,191)
+IMAGE_DATA(46,114,193,91,15,24,189,186,106,231,89,59,171,186,218,219,69,190,116,243,41,254,153,156,165,35,7,78,210,225,253,39)
+IMAGE_DATA(40,113,255,73,218,185,243,164,183,247,205,153,169,241,188,148,192,85,48,82,103,81,193,85,151,165,90,75,5,83,209,7)
+IMAGE_DATA(172,12,5,79,193,88,28,221,252,47,114,166,200,255,186,252,140,15,213,169,96,42,2,231,202,213,29,7,206,72,8,91)
+IMAGE_DATA(147,46,218,60,48,24,187,153,25,53,121,193,30,122,125,49,250,161,182,211,19,47,206,161,175,124,251,9,154,255,169,143)
+IMAGE_DATA(209,137,79,253,46,229,252,195,239,17,125,241,119,137,190,204,76,253,242,239,153,248,215,223,151,0,111,233,223,248,241,127)
+IMAGE_DATA(255,72,144,183,255,241,7,254,17,204,253,202,255,75,244,212,231,137,118,205,161,240,210,201,244,220,148,53,150,171,235,119)
+IMAGE_DATA(159,17,142,130,169,208,171,208,170,86,175,50,87,37,255,59,109,139,104,213,137,115,119,202,76,208,129,132,243,194,24,211)
+IMAGE_DATA(55,100,122,135,138,139,75,69,227,161,222,129,247,3,248,132,25,109,227,133,109,222,27,165,229,101,214,135,73,153,42,143)
+IMAGE_DATA(243,243,58,59,115,149,57,120,37,187,128,46,95,205,167,75,89,121,18,184,47,185,100,102,43,116,39,122,234,67,85,117)
+IMAGE_DATA(226,157,84,86,222,74,69,165,204,83,254,243,168,223,94,205,206,183,185,228,43,248,179,18,185,114,52,185,229,130,64,191)
+IMAGE_DATA(148,9,115,95,181,52,184,171,121,106,191,63,202,132,225,239,200,80,54,151,150,133,156,199,66,146,67,86,31,24,252,91)
+IMAGE_DATA(77,84,120,124,14,203,57,120,235,250,50,141,166,117,85,239,226,121,240,223,253,123,253,107,1,47,191,45,30,201,97,171)
+IMAGE_DATA(195,125,13,30,228,250,136,25,91,47,63,141,58,86,93,125,163,51,23,219,200,12,102,246,55,180,80,131,204,239,52,123)
+IMAGE_DATA(97,188,246,193,85,212,87,31,149,126,96,220,238,222,189,43,251,8,220,157,4,8,120,39,98,134,22,223,163,59,11,52)
+IMAGE_DATA(118,123,52,110,102,175,121,147,247,251,93,110,125,148,240,187,141,207,21,204,213,84,215,52,80,99,67,159,248,179,129,161)
+IMAGE_DATA(152,69,128,142,197,140,124,85,244,54,159,223,164,242,202,219,148,122,49,42,123,190,19,78,132,152,171,101,162,85,55,108)
+IMAGE_DATA(63,41,58,239,176,231,99,175,243,46,50,243,146,226,243,84,125,25,132,173,222,92,169,236,148,113,114,195,96,42,114,195)
+IMAGE_DATA(136,164,147,254,125,245,124,144,175,197,127,110,79,146,231,207,224,229,104,177,95,220,48,208,231,160,238,28,7,119,193,68)
+IMAGE_DATA(209,160,78,189,84,185,169,207,237,78,184,42,185,97,229,42,158,115,191,134,153,175,49,122,85,124,150,182,123,253,74,96)
+IMAGE_DATA(234,214,179,194,212,157,187,79,81,202,225,51,116,112,207,9,218,183,135,175,55,118,157,160,164,125,39,105,251,246,227,70)
+IMAGE_DATA(167,174,63,33,154,213,48,51,205,238,82,21,29,186,42,85,248,170,181,86,237,89,146,30,165,85,201,210,179,163,186,20)
+IMAGE_DATA(199,248,185,85,204,203,104,255,111,160,118,138,152,181,203,242,244,133,215,183,155,152,193,231,51,88,175,206,220,65,19,231)
+IMAGE_DATA(33,15,124,202,114,85,116,107,194,121,203,85,228,128,55,242,191,103,202,194,189,162,87,95,157,189,133,30,123,110,58,125)
+IMAGE_DATA(241,27,63,167,229,127,245,17,74,249,235,223,161,130,191,251,95,68,255,252,123,126,124,225,119,41,246,47,96,237,239,75)
+IMAGE_DATA(196,190,244,187,150,181,202,89,209,181,56,126,133,95,251,239,172,119,191,196,92,125,250,139,68,251,22,210,249,153,19,248)
+IMAGE_DATA(123,219,198,215,11,198,187,248,205,205,233,134,167,47,176,78,125,101,85,96,151,141,106,213,231,38,155,218,42,216,191,97)
+IMAGE_DATA(247,73,74,77,207,146,223,119,232,61,97,39,191,7,160,93,145,15,197,124,153,124,110,139,239,80,157,241,197,198,190,9)
+IMAGE_DATA(47,103,139,235,80,101,169,153,91,49,12,0,179,180,22,171,92,213,200,2,39,115,77,62,89,250,136,243,202,204,140,107)
+IMAGE_DATA(121,181,228,121,193,100,232,209,171,94,254,88,185,234,246,62,129,183,89,185,166,247,73,121,233,71,137,119,44,119,56,90)
+IMAGE_DATA(234,232,218,144,61,198,179,212,101,166,57,186,28,173,176,12,85,158,250,218,54,108,207,173,151,177,83,119,117,243,196,208)
+IMAGE_DATA(157,166,198,212,36,247,253,175,87,101,191,142,254,28,77,63,86,80,47,187,12,125,144,198,245,181,110,131,124,174,25,174)
+IMAGE_DATA(42,79,155,44,75,27,69,227,242,177,169,69,162,174,174,225,145,226,234,240,240,176,248,21,131,165,26,224,41,142,208,173)
+IMAGE_DATA(120,14,223,35,118,223,189,253,246,219,99,76,125,196,110,102,175,121,189,188,71,205,103,75,185,243,94,49,125,247,168,57)
+IMAGE_DATA(73,238,165,225,26,255,142,122,51,0,216,173,92,205,250,181,250,22,127,222,12,138,255,41,188,150,18,51,188,189,223,105)
+IMAGE_DATA(197,180,126,219,41,90,183,245,56,237,97,78,185,123,98,14,120,249,95,151,169,238,140,11,142,129,253,167,222,78,153,128)
+IMAGE_DATA(111,146,87,127,85,157,138,199,240,117,181,30,186,251,72,174,228,120,93,205,106,56,107,246,141,111,217,107,116,37,234,161)
+IMAGE_DATA(208,174,59,14,67,171,194,215,33,87,206,241,152,104,90,214,160,162,95,189,128,158,213,254,36,48,20,115,170,155,247,93)
+IMAGE_DATA(160,77,7,46,114,92,150,249,154,117,59,207,203,220,234,250,157,151,164,15,248,205,45,103,56,78,211,225,67,25,116,244)
+IMAGE_DATA(224,73,218,179,231,44,237,97,78,237,229,207,246,253,187,210,153,179,167,104,229,38,195,214,37,107,80,67,77,183,92,5)
+IMAGE_DATA(75,131,145,108,123,133,101,94,149,31,179,253,73,111,38,201,76,13,142,174,159,62,152,234,230,126,181,231,55,94,167,142)
+IMAGE_DATA(159,182,141,158,155,182,85,116,170,101,43,31,167,206,219,203,28,58,46,61,193,219,247,103,8,87,181,214,170,177,150,117)
+IMAGE_DATA(247,180,69,123,164,190,250,218,172,205,244,163,113,111,208,151,190,242,125,218,240,23,191,67,9,127,254,59,20,250,212,239)
+IMAGE_DATA(80,236,179,204,214,207,240,241,115,38,232,243,255,203,4,51,214,6,51,23,188,181,156,21,125,251,7,70,235,126,225,255)
+IMAGE_DATA(33,122,254,235,20,59,184,152,246,190,250,146,232,232,233,203,142,208,170,45,199,101,118,22,61,75,143,191,188,134,30,155)
+IMAGE_DATA(224,247,1,171,86,213,120,110,202,58,154,183,242,48,109,218,123,154,78,156,203,246,60,18,76,223,29,206,193,83,233,215)
+IMAGE_DATA(227,207,101,156,227,24,173,233,150,60,77,121,104,144,202,66,198,251,30,236,112,25,128,0,31,192,180,248,218,170,127,44)
+IMAGE_DATA(16,255,8,28,179,114,140,110,5,211,53,231,139,186,172,59,135,131,48,175,47,12,204,232,152,99,161,188,103,85,127,42)
+IMAGE_DATA(91,93,77,234,62,167,60,117,53,246,104,92,117,245,168,255,88,200,97,107,133,157,129,117,153,138,163,233,153,174,119,180)
+IMAGE_DATA(169,50,175,222,214,98,77,78,183,209,225,106,120,4,87,77,95,243,123,115,53,190,55,217,253,59,148,171,208,168,202,83)
+IMAGE_DATA(171,83,173,70,109,14,112,213,213,171,186,247,237,55,225,163,239,242,16,231,224,38,114,189,189,189,215,100,87,94,175,195)
+IMAGE_DATA(213,62,112,85,244,234,53,241,37,6,91,225,11,5,182,226,26,96,140,173,143,206,13,92,197,181,154,121,239,25,182,186)
+IMAGE_DATA(215,224,198,99,165,58,112,141,248,255,179,119,30,224,85,157,87,186,150,28,247,216,113,75,247,36,113,234,56,101,82,157)
+IMAGE_DATA(100,38,201,76,38,55,101,50,177,227,196,184,96,108,48,189,247,46,64,32,154,186,4,234,18,168,208,123,239,221,116,9)
+IMAGE_DATA(245,46,84,17,32,9,68,199,128,75,18,91,235,174,111,253,123,237,243,159,141,48,56,55,137,125,29,157,231,89,207,174)
+IMAGE_DATA(231,72,136,179,247,187,191,85,43,240,189,173,109,146,156,38,104,85,204,108,133,118,93,187,187,70,226,171,208,172,224,234)
+IMAGE_DATA(172,180,77,52,43,121,29,165,47,217,231,155,189,182,58,215,173,35,189,174,23,131,149,127,107,115,85,231,135,219,61,142)
+IMAGE_DATA(108,230,170,78,117,115,142,68,171,250,251,105,221,220,34,135,169,201,89,38,14,10,3,91,145,115,164,44,197,58,234,80)
+IMAGE_DATA(141,237,115,217,170,57,191,240,245,186,92,181,76,231,194,201,124,154,185,59,105,86,42,250,22,110,162,136,228,109,210,71)
+IMAGE_DATA(127,49,107,189,101,14,79,231,167,175,163,121,233,27,41,51,99,45,45,89,184,133,255,78,27,36,95,105,26,107,214,233)
+IMAGE_DATA(179,55,250,105,86,255,89,53,43,133,173,240,251,66,199,194,180,78,85,89,42,61,8,181,199,190,211,3,66,117,42,248)
+IMAGE_DATA(105,231,40,217,58,181,223,152,84,215,255,139,117,97,44,179,118,252,244,249,194,85,228,46,129,171,174,102,93,188,67,12)
+IMAGE_DATA(140,157,53,119,35,141,15,95,96,106,87,39,36,210,243,61,198,209,47,126,241,123,202,252,242,199,105,209,87,30,161,154)
+IMAGE_DATA(111,62,66,244,131,143,19,125,255,17,99,79,240,250,15,63,225,90,219,143,120,251,199,188,254,239,237,179,150,254,157,143)
+IMAGE_DATA(255,228,65,106,27,244,52,209,226,72,138,233,219,79,254,109,65,252,243,226,50,182,210,212,184,149,204,210,56,234,58,56)
+IMAGE_DATA(198,175,190,6,249,74,166,182,198,24,184,58,51,110,165,248,173,247,30,44,144,103,70,220,151,213,167,136,123,51,242,82)
+IMAGE_DATA(225,7,70,44,4,199,80,183,45,189,81,228,126,93,75,213,181,53,46,87,149,173,234,23,86,189,104,234,88,77,158,147)
+IMAGE_DATA(241,209,250,179,83,25,169,126,94,232,81,31,83,77,222,147,233,221,84,232,190,79,107,98,113,158,169,127,189,222,191,235)
+IMAGE_DATA(229,169,205,219,91,229,234,245,230,225,106,81,249,135,146,171,200,91,178,231,169,254,35,231,211,160,31,49,116,50,120,138)
+IMAGE_DATA(248,233,205,184,10,67,255,127,252,174,232,83,220,209,247,255,131,245,194,255,69,61,127,231,236,235,205,112,213,228,46,224)
+IMAGE_DATA(222,34,189,90,228,251,110,190,255,248,142,87,215,157,148,25,30,136,171,22,151,92,146,122,250,213,59,85,175,22,209,34)
+IMAGE_DATA(214,147,179,231,176,14,75,94,79,115,22,189,74,243,87,229,248,113,213,175,38,212,170,31,117,205,153,133,170,239,81,189)
+IMAGE_DATA(171,49,89,239,62,187,207,131,196,86,89,115,130,143,224,40,252,181,198,103,235,171,129,129,233,58,88,8,182,130,149,88)
+IMAGE_DATA(170,201,251,23,26,150,250,51,117,143,236,191,17,87,181,47,48,242,149,100,46,121,138,137,175,46,96,141,180,106,225,38)
+IMAGE_DATA(225,106,86,198,6,202,76,95,79,75,178,140,94,141,72,52,58,85,226,171,9,190,248,169,230,248,218,92,53,125,31,76)
+IMAGE_DATA(252,84,205,158,89,163,115,105,188,189,31,124,117,51,89,174,110,69,94,146,232,212,209,41,215,113,181,247,232,100,89,98)
+IMAGE_DATA(238,75,28,63,7,36,101,108,114,253,193,115,22,111,119,25,11,174,162,199,66,80,216,2,154,24,177,132,6,143,143,167)
+IMAGE_DATA(78,221,71,209,255,249,217,111,105,201,23,31,166,5,95,122,136,26,191,206,44,253,238,195,212,246,237,135,137,190,243,8)
+IMAGE_DATA(189,243,221,135,168,237,123,15,251,115,214,182,31,58,140,253,177,163,109,159,120,136,121,203,251,135,119,38,154,31,65,227)
+IMAGE_DATA(123,13,20,29,62,41,114,41,205,206,220,70,65,145,75,68,175,130,171,118,47,136,158,35,19,196,15,172,6,174,74,255)
+IMAGE_DATA(194,244,13,148,87,88,230,114,21,247,92,228,140,30,59,217,34,249,162,200,67,85,205,170,189,18,176,142,190,41,53,213)
+IMAGE_DATA(199,228,61,166,39,131,153,59,99,115,72,115,152,124,113,79,195,199,195,78,157,142,114,178,189,26,87,173,203,81,190,234)
+IMAGE_DATA(121,154,183,164,134,253,55,226,170,191,111,248,230,92,189,145,102,245,223,246,249,129,63,236,92,5,227,254,209,92,53,76)
+IMAGE_DATA(61,35,76,5,67,111,174,87,47,10,83,49,119,7,219,29,115,234,62,88,47,112,21,223,43,111,124,195,255,218,42,119)
+IMAGE_DATA(159,91,113,28,253,211,208,239,69,190,187,13,205,84,83,127,137,159,241,223,16,189,186,100,83,33,45,222,88,204,86,72)
+IMAGE_DATA(9,89,219,133,173,208,137,90,27,234,234,202,85,215,107,86,183,207,61,122,246,242,241,121,43,179,221,125,182,159,88,252)
+IMAGE_DATA(189,43,13,123,245,60,95,254,175,209,170,218,159,33,41,115,183,104,83,88,98,198,46,151,123,94,83,206,122,77,121,171)
+IMAGE_DATA(6,174,194,239,171,92,77,92,96,252,192,240,7,67,7,235,251,208,23,56,150,127,94,204,92,228,45,109,166,240,212,237)
+IMAGE_DATA(20,63,119,23,107,211,109,226,11,94,188,96,35,45,157,183,142,86,44,220,76,241,204,164,201,113,27,68,167,106,223,66)
+IMAGE_DATA(111,77,170,198,88,101,182,105,212,10,89,55,219,190,252,36,155,171,234,251,85,158,218,53,53,131,39,249,124,191,208,169)
+IMAGE_DATA(96,106,159,81,134,161,88,87,235,51,38,197,229,234,172,57,107,40,97,238,6,74,206,220,40,60,77,91,228,139,181,130)
+IMAGE_DATA(171,17,73,171,165,126,21,54,104,92,28,61,221,109,4,253,230,71,191,160,213,143,61,64,11,190,240,0,157,122,156,25)
+IMAGE_DATA(250,173,135,232,157,111,178,230,228,37,253,219,195,198,152,177,106,224,172,26,125,239,19,194,215,119,190,207,219,63,224,237)
+IMAGE_DATA(111,223,207,156,253,20,181,141,238,74,148,17,74,131,186,15,21,29,62,57,122,57,197,207,219,65,195,66,50,233,229,193)
+IMAGE_DATA(179,61,115,204,227,36,71,88,123,44,193,6,140,75,20,174,194,167,93,234,196,81,143,214,29,163,19,199,91,232,212,233)
+IMAGE_DATA(243,212,216,116,202,55,107,155,239,203,184,87,235,61,94,53,173,125,31,199,182,250,128,237,92,38,229,155,183,87,68,123)
+IMAGE_DATA(58,20,251,17,123,85,59,96,213,192,138,29,204,119,115,129,109,174,154,26,156,146,235,236,221,216,218,94,222,82,123,26)
+IMAGE_DATA(213,246,5,219,113,208,15,59,87,107,107,107,255,225,92,133,255,22,63,11,108,5,63,111,69,175,106,156,21,243,119,224)
+IMAGE_DATA(15,86,205,218,225,11,254,96,188,52,31,88,125,90,48,157,253,166,215,35,98,64,202,85,169,53,47,231,251,77,165,201)
+IMAGE_DATA(179,171,107,60,201,92,109,146,26,246,13,123,42,13,83,55,152,24,43,122,203,37,100,108,147,184,166,242,211,141,161,130)
+IMAGE_DATA(171,171,125,156,181,153,42,251,86,27,118,42,51,109,61,43,12,93,126,200,53,141,137,250,114,137,246,186,154,52,33,125)
+IMAGE_DATA(39,243,108,135,201,35,74,219,38,58,18,204,211,121,227,222,117,101,172,173,105,109,190,250,235,84,254,57,11,140,182,5)
+IMAGE_DATA(83,145,195,164,241,214,196,172,87,165,143,161,240,53,125,171,244,49,140,74,219,69,179,211,183,80,38,107,190,133,243,183)
+IMAGE_DATA(80,70,214,38,102,170,211,111,41,97,179,244,217,159,30,191,150,185,186,217,159,171,78,190,175,233,253,187,74,76,227,173)
+IMAGE_DATA(198,23,140,28,37,95,206,175,198,84,85,171,186,49,85,139,171,110,60,213,97,42,204,187,14,63,112,223,209,152,83,58)
+IMAGE_DATA(143,98,147,87,211,236,212,213,194,214,196,44,195,86,245,1,195,194,227,153,247,145,139,133,171,3,199,198,210,31,153,171)
+IMAGE_DATA(79,125,255,167,180,225,115,15,208,146,71,31,164,11,95,99,150,62,254,0,209,191,62,72,244,117,94,255,58,175,127,227)
+IMAGE_DATA(65,177,182,111,26,35,47,111,89,211,210,119,30,18,157,75,95,191,151,232,39,159,35,10,234,69,109,201,33,212,163,251)
+IMAGE_DATA(72,137,175,162,199,83,226,194,29,82,187,10,189,10,182,118,25,18,75,175,12,49,92,237,105,113,181,207,232,4,201,85)
+IMAGE_DATA(142,74,90,67,139,86,238,49,253,175,81,175,90,141,30,157,53,84,205,247,227,178,170,163,84,38,247,117,157,65,234,203)
+IMAGE_DATA(107,197,182,234,83,93,218,236,145,30,251,172,129,237,186,28,219,119,235,223,199,48,223,175,134,6,121,78,168,165,61,152)
+IMAGE_DATA(93,40,118,192,217,231,179,66,235,152,143,171,94,29,250,183,224,170,151,163,29,92,253,251,190,192,66,196,71,49,159,206)
+IMAGE_DATA(101,234,77,253,192,23,156,186,155,83,50,51,22,51,237,16,103,237,208,172,31,140,151,234,85,251,249,84,243,8,49,151)
+IMAGE_DATA(3,6,158,34,167,238,196,201,102,51,103,169,249,130,244,47,193,245,161,250,22,61,205,214,237,44,113,153,138,122,155,164)
+IMAGE_DATA(204,157,148,148,190,77,116,164,214,190,168,110,85,173,169,190,94,205,17,182,181,40,150,134,155,190,30,13,118,61,12,226)
+IMAGE_DATA(159,224,169,230,25,129,109,26,59,85,255,46,184,10,166,170,233,92,113,237,47,232,155,51,179,85,150,216,167,124,85,158)
+IMAGE_DATA(218,75,31,99,247,184,126,98,245,31,11,87,109,191,240,252,157,210,31,34,54,99,135,252,30,248,108,196,89,67,147,182)
+IMAGE_DATA(80,120,194,122,154,145,176,65,124,191,225,241,155,221,222,75,218,175,80,103,192,137,47,120,214,58,183,159,190,48,53,214)
+IMAGE_DATA(158,9,183,194,225,234,10,55,182,58,118,198,82,63,189,106,247,80,2,99,7,77,204,112,227,169,46,67,45,166,170,193)
+IMAGE_DATA(15,220,107,68,178,112,53,42,97,5,179,117,37,197,207,89,47,185,180,240,7,163,246,70,217,58,115,214,50,10,142,90)
+IMAGE_DATA(70,147,194,22,210,128,209,145,244,244,203,195,232,15,223,121,130,182,126,246,99,180,244,179,247,211,181,47,51,71,191,106)
+IMAGE_DATA(172,237,107,62,19,206,62,254,144,143,181,14,111,223,81,206,126,243,33,179,252,234,61,212,246,179,47,18,77,234,79,20)
+IMAGE_DATA(57,129,186,246,28,47,92,13,142,89,202,127,231,237,212,123,68,130,244,132,0,91,193,85,228,47,201,108,155,97,179,93)
+IMAGE_DATA(31,48,250,23,130,251,179,231,108,164,85,27,246,154,184,33,106,61,74,76,175,132,226,162,114,39,15,222,104,211,50,233)
+IMAGE_DATA(175,107,122,40,224,56,238,213,168,125,196,117,0,94,152,231,77,195,83,153,245,230,204,182,81,127,46,124,187,190,26,25)
+IMAGE_DATA(127,67,221,141,47,71,184,64,152,122,248,72,177,197,86,112,182,192,207,124,251,138,220,90,88,59,207,215,206,81,186,85)
+IMAGE_DATA(174,190,155,86,189,33,87,63,164,121,75,255,104,174,218,179,113,192,85,104,78,112,245,214,226,171,134,171,170,89,161,117)
+IMAGE_DATA(49,95,29,185,193,29,113,214,247,255,37,241,85,254,126,249,106,202,75,221,235,16,223,111,124,55,143,159,104,162,19,77)
+IMAGE_DATA(39,101,137,239,32,244,45,106,172,241,125,70,45,31,238,79,184,38,86,111,43,20,255,239,162,13,69,70,175,50,87,19)
+IMAGE_DATA(231,178,174,89,186,223,141,127,138,94,93,157,231,234,81,236,215,28,164,69,152,13,190,38,215,101,42,234,101,236,126,129)
+IMAGE_DATA(200,215,133,25,109,234,139,155,122,99,167,113,204,114,248,124,85,167,170,86,133,33,151,40,54,101,139,44,37,175,40,121)
+IMAGE_DATA(179,152,153,49,190,89,248,170,236,85,182,186,218,215,241,25,99,159,151,171,134,183,187,197,79,140,252,227,228,69,38,63)
+IMAGE_DATA(24,127,3,248,195,193,106,244,138,64,174,48,226,173,161,232,103,24,103,122,46,129,169,96,44,122,70,192,194,220,153,229)
+IMAGE_DATA(38,47,88,243,150,140,102,53,250,20,60,197,204,26,248,132,181,199,190,228,45,97,22,249,244,37,210,43,31,220,65,175)
+IMAGE_DATA(36,155,175,194,213,160,116,215,231,107,235,212,222,35,147,124,76,229,117,137,77,50,87,39,134,46,160,200,248,229,20,157)
+IMAGE_DATA(184,156,53,235,90,254,251,172,21,127,112,10,235,109,248,129,209,39,98,250,172,229,172,29,249,119,9,95,68,253,71,69)
+IMAGE_DATA(208,147,47,14,164,23,191,241,45,218,250,233,251,105,229,167,63,74,127,122,140,57,250,165,251,168,237,139,31,35,250,210)
+IMAGE_DATA(3,198,190,242,160,99,31,243,231,172,106,90,230,109,219,227,31,51,246,229,187,168,237,191,31,39,154,58,130,94,15,25)
+IMAGE_DATA(77,93,251,77,147,250,31,248,129,225,3,232,210,63,138,58,15,138,54,253,150,6,199,208,203,3,99,168,235,32,214,173)
+IMAGE_DATA(67,77,253,106,15,233,13,17,39,250,22,177,213,109,187,178,157,231,65,190,39,215,28,147,56,171,246,84,48,207,151,190)
+IMAGE_DATA(92,3,169,103,61,218,68,141,199,46,82,75,243,53,214,21,23,169,132,247,169,150,148,154,83,230,28,88,185,123,239,33)
+IMAGE_DATA(89,238,217,119,88,214,109,211,125,88,194,76,77,107,158,228,6,195,192,83,48,83,217,170,235,94,3,127,165,159,98,158)
+IMAGE_DATA(83,115,235,241,59,75,239,167,252,191,143,94,245,245,238,239,224,234,223,242,5,174,130,139,77,77,45,239,73,175,98,9)
+IMAGE_DATA(157,123,242,228,73,169,105,69,189,107,7,87,223,255,151,114,85,99,67,90,127,135,188,96,124,127,241,124,142,94,95,248)
+IMAGE_DATA(206,98,182,141,60,195,151,85,80,126,113,153,212,203,25,61,107,102,178,174,217,94,68,243,80,151,202,92,133,94,133,126)
+IMAGE_DATA(3,87,37,111,73,125,184,43,161,85,115,93,255,175,232,85,244,55,116,152,170,75,28,83,173,138,165,169,111,241,205,139)
+IMAGE_DATA(193,103,75,78,111,230,110,97,40,214,77,190,208,54,153,21,170,12,189,142,159,204,51,24,216,10,195,122,84,226,70,138)
+IMAGE_DATA(76,218,72,81,201,155,196,144,107,164,58,86,181,107,92,214,46,211,71,159,45,222,241,245,130,167,96,186,198,85,13,107)
+IMAGE_DATA(153,171,11,247,80,186,214,181,242,241,164,121,240,75,51,87,179,28,141,60,119,51,69,164,152,249,229,224,104,68,156,153)
+IMAGE_DATA(197,170,51,205,77,95,194,245,174,175,87,123,40,73,110,176,195,85,229,169,177,213,46,87,101,22,249,52,147,11,108,115)
+IMAGE_DATA(213,171,89,213,7,108,51,21,214,107,68,162,24,122,212,43,87,131,35,22,10,87,163,18,150,25,127,48,115,53,41,99)
+IMAGE_DATA(131,175,87,196,146,29,194,213,144,88,230,123,216,124,234,61,108,58,61,217,185,63,245,252,234,191,210,150,79,221,71,27)
+IMAGE_DATA(63,121,47,189,243,121,102,230,231,239,51,246,57,182,47,220,79,109,108,244,216,199,124,6,214,126,249,126,225,172,225,45)
+IMAGE_DATA(115,245,107,216,230,243,255,229,35,68,191,252,55,106,139,152,72,53,99,251,209,43,67,34,165,191,195,212,89,171,248,255)
+IMAGE_DATA(110,61,117,234,19,65,207,246,11,19,190,138,110,29,96,250,45,117,99,237,10,205,218,93,122,4,207,18,174,198,166,173)
+IMAGE_DATA(165,93,251,178,133,135,50,155,141,239,195,240,5,227,26,56,226,244,40,60,12,22,21,148,75,126,94,235,185,203,212,124)
+IMAGE_DATA(250,188,172,23,149,212,83,78,94,185,235,143,221,123,32,151,249,120,68,108,247,222,108,177,61,251,114,196,236,117,219,112)
+IMAGE_DATA(174,93,215,170,182,207,234,37,12,206,130,185,202,93,252,44,219,23,172,189,31,236,254,15,182,253,45,184,122,61,99,75)
+IMAGE_DATA(59,184,250,119,122,225,103,129,137,45,45,167,111,153,171,62,205,122,94,52,171,254,222,31,132,126,22,255,236,47,237,11)
+IMAGE_DATA(1,166,234,117,149,91,88,34,190,49,24,214,245,58,84,77,43,49,88,102,172,196,145,178,77,61,61,102,109,108,217,83)
+IMAGE_DATA(65,25,224,37,234,97,54,22,83,42,107,182,248,244,173,110,62,176,198,84,117,169,38,28,117,214,81,159,35,154,117,197)
+IMAGE_DATA(17,183,158,212,196,79,247,187,57,67,201,204,56,159,30,221,42,38,235,78,63,94,97,151,163,75,99,146,55,138,197,38)
+IMAGE_DATA(109,160,168,248,181,20,225,24,88,170,134,249,50,48,176,21,154,21,115,103,180,79,18,122,17,170,207,88,99,176,222,28)
+IMAGE_DATA(39,48,19,177,100,195,90,229,233,171,110,221,44,98,174,56,199,244,12,214,57,172,91,124,115,204,69,171,250,230,212,248)
+IMAGE_DATA(102,149,175,114,107,105,92,31,112,244,42,103,191,97,171,230,48,33,119,201,237,171,63,213,204,45,71,31,122,187,15,132)
+IMAGE_DATA(214,217,216,253,148,192,85,151,163,142,97,86,169,248,80,135,243,254,145,137,20,18,185,208,248,129,19,87,241,239,189,74)
+IMAGE_DATA(124,193,208,170,134,171,91,248,255,101,171,212,132,78,143,93,65,19,66,231,81,143,193,33,244,235,78,189,105,240,99,159)
+IMAGE_DATA(163,141,143,220,79,219,63,193,92,252,204,189,244,246,163,119,17,125,150,57,249,217,143,50,39,239,51,246,185,251,13,107)
+IMAGE_DATA(193,88,139,179,109,240,27,127,241,1,89,127,135,117,46,125,246,54,162,223,254,136,218,98,39,211,238,193,131,168,223,216)
+IMAGE_DATA(36,26,57,37,139,102,196,175,150,249,112,207,246,14,103,11,165,23,250,69,89,253,129,163,37,143,233,165,161,177,50,59)
+IMAGE_DATA(14,108,133,223,56,54,117,61,237,220,121,136,118,189,202,154,241,64,62,235,213,86,233,39,120,224,80,137,228,4,225,187)
+IMAGE_DATA(140,26,237,211,103,175,210,217,11,87,132,169,165,21,13,194,179,189,7,141,198,68,46,17,88,167,108,53,188,204,118,116)
+IMAGE_DATA(232,17,218,183,207,212,207,152,243,143,152,115,15,48,35,247,231,202,18,251,96,94,205,106,24,237,235,207,36,185,78,217)
+IMAGE_DATA(69,194,123,163,77,75,69,167,250,106,113,204,76,117,205,29,214,218,30,123,105,207,178,83,77,155,143,156,167,118,172,0)
+IMAGE_DATA(243,4,96,168,183,43,44,150,89,144,186,132,21,59,245,171,126,235,142,25,254,57,61,137,111,208,15,73,57,136,253,234)
+IMAGE_DATA(59,55,125,57,236,254,78,229,110,174,164,233,191,104,248,139,185,208,149,21,237,247,114,242,113,213,24,102,114,129,173,96)
+IMAGE_DATA(56,122,173,194,106,106,143,137,105,255,37,176,180,174,182,81,120,139,250,41,212,175,190,31,126,96,93,71,222,17,124,193)
+IMAGE_DATA(208,159,224,170,242,84,215,181,47,196,57,135,173,200,7,6,79,49,59,1,253,23,237,252,165,14,205,250,254,190,240,221)
+IMAGE_DATA(145,124,224,242,42,249,158,226,187,88,89,83,47,235,120,110,212,222,163,200,87,146,57,55,252,61,133,31,24,239,145,250)
+IMAGE_DATA(249,163,141,178,44,63,90,75,27,118,20,81,38,226,163,171,11,152,173,5,148,188,128,117,222,220,45,146,183,4,29,170)
+IMAGE_DATA(61,150,108,166,42,87,149,173,186,132,174,85,166,130,175,208,169,38,142,233,48,138,57,58,43,213,244,221,133,97,93,53)
+IMAGE_DATA(166,196,73,29,191,47,52,106,84,226,122,97,106,100,220,26,10,155,189,90,44,130,25,6,173,10,150,34,214,169,102,248)
+IMAGE_DATA(186,217,229,170,244,34,100,182,202,108,154,204,157,110,158,147,234,88,152,217,222,238,178,21,220,7,75,161,169,53,151,73)
+IMAGE_DATA(252,193,153,218,135,127,155,204,182,9,79,218,236,106,84,48,85,122,234,59,51,88,101,38,141,83,79,163,121,191,96,169)
+IMAGE_DATA(114,21,199,116,118,185,221,175,80,106,87,29,63,176,114,213,235,3,86,174,246,27,151,38,90,85,53,170,242,85,152,202)
+IMAGE_DATA(134,249,224,61,70,36,248,184,154,188,210,205,11,86,189,58,103,193,102,233,177,0,174,206,152,181,146,130,102,102,80,207)
+IMAGE_DATA(129,83,232,151,127,232,78,163,31,253,12,173,123,240,94,218,251,113,230,226,167,238,161,182,79,223,205,75,102,234,167,239)
+IMAGE_DATA(21,206,138,49,99,219,30,53,230,178,246,243,14,111,85,215,126,14,239,185,157,222,121,250,63,137,226,67,105,65,159,222)
+IMAGE_DATA(210,107,105,84,200,60,10,139,95,67,65,172,167,255,216,99,38,117,234,53,147,158,99,221,170,189,12,181,71,112,231,65)
+IMAGE_DATA(81,146,207,132,248,106,72,236,114,74,76,223,40,254,216,195,252,92,120,40,183,88,250,242,162,87,239,233,211,175,137,38)
+IMAGE_DATA(45,40,174,150,62,17,168,195,57,146,95,198,252,61,40,188,84,223,44,248,231,243,229,30,113,215,193,71,232,78,147,115)
+IMAGE_DATA(84,104,248,107,105,76,55,7,9,154,212,249,44,55,15,201,137,173,34,222,10,159,114,118,110,137,252,236,124,240,133,159)
+IMAGE_DATA(97,11,75,43,204,179,46,243,5,191,23,230,29,227,24,126,79,88,73,197,81,49,156,7,83,189,135,125,184,182,245,60)
+IMAGE_DATA(239,249,94,43,173,172,118,173,24,189,250,61,6,255,119,123,231,99,189,170,182,129,106,143,153,153,2,53,13,199,197,192)
+IMAGE_DATA(44,53,244,11,132,161,111,47,182,253,123,36,213,185,247,30,248,229,177,4,3,117,166,22,214,229,217,31,140,191,174,6)
+IMAGE_DATA(200,223,87,109,124,247,71,221,222,191,232,189,175,235,232,187,143,109,179,108,118,102,197,181,202,122,81,81,209,63,140,171)
+IMAGE_DATA(94,166,226,5,22,226,231,54,53,53,185,44,197,210,159,167,240,251,158,146,25,157,135,15,31,230,231,192,67,162,179,49)
+IMAGE_DATA(55,2,239,67,159,38,244,55,236,224,234,251,251,146,121,54,252,125,43,229,231,64,51,91,170,74,158,215,229,59,206,207)
+IMAGE_DATA(124,120,246,196,247,94,175,13,196,88,225,155,56,125,198,124,23,207,158,187,68,151,46,95,17,205,187,106,83,54,101,49)
+IMAGE_DATA(55,51,87,230,209,252,181,249,194,63,229,42,116,168,246,120,0,91,225,11,54,150,227,177,92,215,87,156,181,34,199,151)
+IMAGE_DATA(235,235,112,213,237,189,32,204,52,90,20,189,138,100,61,117,139,24,98,164,26,87,133,102,197,28,241,48,102,22,230,177)
+IMAGE_DATA(169,217,92,85,189,170,108,149,57,169,41,91,133,125,50,219,13,124,5,91,209,75,223,137,145,74,188,52,195,199,91,95)
+IMAGE_DATA(205,206,14,249,119,43,91,149,169,137,25,62,166,226,247,195,231,219,92,133,239,87,115,148,236,250,25,53,195,215,85,214)
+IMAGE_DATA(204,242,229,55,236,89,168,51,107,180,126,85,243,130,165,174,38,104,174,127,141,170,227,255,85,83,174,34,159,86,102,129)
+IMAGE_DATA(51,87,167,70,45,226,191,207,10,154,149,178,74,124,192,146,19,156,174,154,117,147,244,48,4,87,103,206,94,69,65,211)
+IMAGE_DATA(211,169,91,223,32,250,197,239,186,80,200,39,31,161,21,31,187,135,114,31,190,151,218,62,193,90,245,147,204,213,79,220)
+IMAGE_DATA(107,216,170,75,230,173,107,159,185,1,111,63,5,30,223,73,244,236,175,137,226,66,41,166,123,31,26,26,156,46,115,115)
+IMAGE_DATA(80,247,59,124,242,92,225,42,244,42,184,250,124,223,112,183,255,190,233,193,207,26,182,95,36,13,28,151,34,61,33,86)
+IMAGE_DATA(110,56,68,57,185,149,14,207,10,69,107,230,230,150,74,79,177,194,146,163,226,191,221,182,115,47,109,221,241,42,109,223)
+IMAGE_DATA(117,64,142,171,79,22,102,252,184,185,174,239,119,207,62,248,109,11,133,141,69,165,213,78,15,137,99,50,51,21,140,62)
+IMAGE_DATA(146,95,193,28,172,20,78,98,230,106,81,105,45,51,209,108,195,215,12,203,201,43,101,158,150,136,143,25,134,185,172,146)
+IMAGE_DATA(103,127,172,137,106,27,78,10,171,36,14,204,215,36,174,85,92,163,48,240,167,254,120,19,53,157,62,75,39,91,206,82)
+IMAGE_DATA(195,241,22,57,31,251,26,49,119,180,169,85,150,248,28,153,249,200,86,93,199,207,196,204,55,181,26,230,156,109,181,141)
+IMAGE_DATA(124,110,253,73,42,175,62,38,86,81,211,232,183,174,86,89,123,220,177,99,98,199,152,81,45,103,206,203,239,98,91,115)
+IMAGE_DATA(235,57,119,169,134,243,240,251,54,157,58,103,204,62,255,244,121,255,115,91,47,200,242,224,161,108,214,250,7,88,159,231)
+IMAGE_DATA(176,134,207,166,156,156,156,27,26,52,249,249,11,175,209,153,11,151,233,244,185,139,178,14,59,119,254,178,216,217,139,216)
+IMAGE_DATA(190,68,23,46,94,145,245,115,231,47,82,73,89,233,251,86,191,170,247,98,104,77,244,80,210,126,192,54,87,143,33,191)
+IMAGE_DATA(180,168,196,252,13,152,167,248,27,228,231,231,203,60,236,186,186,58,201,93,130,94,5,87,59,234,109,222,223,23,30,107)
+IMAGE_DATA(240,44,168,249,134,176,236,92,211,183,84,57,139,92,95,248,81,160,97,53,206,129,250,120,248,78,142,29,111,164,214,51)
+IMAGE_DATA(230,251,191,118,107,46,101,172,60,204,108,205,145,56,43,24,131,158,75,208,108,208,161,110,79,224,91,224,170,201,89,58)
+IMAGE_DATA(236,230,41,105,159,7,112,85,124,189,14,87,193,84,229,170,157,123,36,62,96,102,44,182,133,157,204,209,240,184,117,194)
+IMAGE_DATA(87,44,177,141,252,219,240,132,141,18,219,196,18,249,66,88,130,171,96,158,178,21,92,181,25,59,123,238,78,233,83,136)
+IMAGE_DATA(218,84,152,234,88,255,92,167,157,174,37,101,26,61,171,76,85,173,106,115,85,231,169,66,179,130,171,218,67,9,166,154)
+IMAGE_DATA(84,227,169,70,167,154,254,74,48,187,215,146,204,44,119,122,44,41,79,53,174,138,60,96,157,83,163,185,192,118,92,21)
+IMAGE_DATA(76,237,49,44,222,209,170,134,169,189,70,37,81,72,212,124,254,219,44,163,232,196,149,252,247,92,41,185,75,9,115,215)
+IMAGE_DATA(137,102,69,94,48,242,128,166,68,45,22,189,58,118,218,28,122,169,215,88,250,175,223,60,75,81,15,222,79,75,238,191)
+IMAGE_DATA(155,74,31,100,102,62,124,55,181,61,124,151,89,126,156,183,213,192,87,219,132,181,208,167,247,209,59,159,101,30,127,26)
+IMAGE_DATA(231,128,201,188,124,225,41,162,217,51,105,98,151,62,52,120,98,186,204,121,141,78,221,32,51,106,158,233,62,93,244,234)
+IMAGE_DATA(243,125,35,233,133,126,17,226,15,198,18,186,21,246,66,159,112,137,199,162,118,117,211,142,92,233,113,47,121,68,251,14)
+IMAGE_DATA(138,118,5,63,55,111,123,149,118,236,222,79,175,30,128,14,205,19,94,130,169,59,247,28,146,99,56,103,231,158,3,226)
+IMAGE_DATA(63,134,127,23,90,19,90,18,215,2,174,15,60,135,30,59,209,42,154,13,61,83,170,106,142,139,255,24,63,11,172,4)
+IMAGE_DATA(71,193,79,172,131,165,186,13,109,10,253,137,24,239,241,230,22,102,75,171,171,247,192,83,240,25,188,7,147,193,235,163)
+IMAGE_DATA(181,216,215,32,124,4,67,213,112,46,150,96,168,104,70,221,62,222,44,188,172,96,237,7,3,3,149,177,182,9,111,235)
+IMAGE_DATA(204,207,172,170,107,164,178,163,13,215,25,216,170,75,229,171,50,23,76,7,23,79,180,180,182,107,39,79,157,241,51,101)
+IMAGE_DATA(190,240,191,217,178,38,115,62,214,101,217,114,70,214,15,28,58,40,204,4,75,160,45,75,74,74,132,41,237,25,234,146)
+IMAGE_DATA(79,157,61,199,118,65,184,138,101,235,153,11,70,19,156,59,47,251,36,118,201,186,160,245,60,236,2,21,23,23,255,195)
+IMAGE_DATA(251,24,250,223,139,223,145,216,40,126,246,9,214,47,234,7,150,126,120,185,168,99,62,40,60,213,191,1,254,253,229,229)
+IMAGE_DATA(229,194,84,248,142,225,27,198,123,59,250,5,191,255,47,112,21,218,212,237,9,142,24,13,234,214,209,187,27,117,4,165)
+IMAGE_DATA(21,114,189,195,199,3,31,144,94,223,184,246,154,249,251,174,185,196,120,255,186,109,121,148,190,34,155,50,87,101,11,87)
+IMAGE_DATA(193,148,216,212,141,194,87,176,114,225,170,60,95,111,36,97,103,142,240,211,175,191,131,171,85,15,187,90,181,61,174,10)
+IMAGE_DATA(163,172,248,169,50,20,166,186,85,243,144,218,211,164,50,79,60,110,173,176,84,185,170,140,141,116,152,103,107,86,172,71)
+IMAGE_DATA(56,58,22,190,97,228,54,73,207,7,230,235,172,12,95,108,215,238,53,129,88,42,120,42,207,23,115,182,201,239,132,58)
+IMAGE_DATA(27,176,52,194,97,183,50,85,235,85,109,174,130,147,224,37,234,105,176,173,60,181,231,169,34,158,170,6,157,58,10,90)
+IMAGE_DATA(213,226,170,230,41,129,167,202,85,83,151,154,226,167,83,193,80,48,85,185,138,109,196,86,209,175,30,92,157,49,107,49)
+IMAGE_DATA(69,196,45,19,221,170,185,75,208,172,200,11,142,73,93,67,147,34,23,73,78,208,136,224,36,122,161,231,104,250,233,47)
+IMAGE_DATA(126,79,137,247,221,67,11,239,191,135,106,62,198,92,124,224,78,106,123,128,117,231,131,119,25,190,62,196,246,200,221,62)
+IMAGE_DATA(115,56,219,102,177,182,141,245,45,140,30,186,157,218,16,151,237,214,137,222,137,152,66,3,187,244,147,124,44,244,34,142)
+IMAGE_DATA(157,179,137,122,12,141,165,78,61,102,184,126,224,231,250,132,137,102,21,174,246,139,116,117,43,244,237,140,217,43,104,213)
+IMAGE_DATA(134,61,180,99,23,120,153,45,140,220,189,63,135,246,30,202,163,253,217,5,162,59,247,29,44,16,214,238,216,125,144,182)
+IMAGE_DATA(239,52,245,48,82,215,202,250,16,58,18,12,170,168,58,41,189,60,207,156,135,38,186,40,249,36,184,111,159,104,62,195)
+IMAGE_DATA(250,235,2,243,236,60,21,20,213,186,126,94,147,119,148,79,7,114,248,217,21,113,78,230,106,126,209,81,49,204,134,195)
+IMAGE_DATA(92,115,188,239,194,229,215,233,210,213,55,232,181,43,215,232,116,235,121,97,171,248,65,235,13,75,145,99,5,246,29,195)
+IMAGE_DATA(172,110,135,67,13,39,154,29,150,27,38,98,29,60,85,94,98,31,142,73,126,150,195,86,104,95,216,141,216,138,117,104)
+IMAGE_DATA(227,114,167,111,169,79,175,154,247,151,163,23,149,197,85,240,30,92,133,6,85,30,130,157,222,165,109,202,84,155,171,194)
+IMAGE_DATA(209,38,139,197,252,121,39,78,157,149,126,29,71,142,28,17,159,39,124,160,208,149,13,13,13,172,225,142,181,107,184,47)
+IMAGE_DATA(225,121,95,153,10,59,115,86,89,122,65,88,106,242,128,12,87,177,223,230,42,114,115,223,143,252,31,176,21,117,168,208)
+IMAGE_DATA(169,141,141,39,36,110,138,103,8,176,20,108,69,12,24,207,13,240,251,130,167,218,203,16,245,171,90,103,211,209,43,248)
+IMAGE_DATA(253,126,189,227,250,129,213,175,164,241,24,97,41,95,119,152,99,133,123,0,98,63,7,14,23,137,175,10,235,120,206,206)
+IMAGE_DATA(43,172,16,223,23,238,67,240,139,173,220,120,152,230,44,103,22,46,203,145,56,43,226,141,184,239,129,47,96,40,152,169)
+IMAGE_DATA(189,30,176,157,185,220,212,210,192,236,253,122,76,253,191,218,179,87,107,72,181,7,175,234,63,152,97,169,153,203,22,13)
+IMAGE_DATA(30,58,60,85,179,25,171,92,53,140,53,44,21,182,58,60,133,129,123,182,121,143,129,143,202,86,205,107,82,195,239,131)
+IMAGE_DATA(99,48,253,253,176,30,149,102,222,39,58,149,53,182,173,83,149,171,102,142,234,74,63,189,170,179,201,109,127,47,24,170)
+IMAGE_DATA(253,10,81,175,170,253,128,193,212,17,83,23,248,245,3,86,158,194,224,7,70,31,37,175,86,21,174,90,6,157,10,174)
+IMAGE_DATA(162,223,2,184,58,45,102,33,133,205,90,194,127,175,229,20,147,180,138,255,77,134,173,232,27,28,153,188,138,38,70,44)
+IMAGE_DATA(162,224,168,37,52,116,66,60,61,215,99,4,253,252,103,255,67,153,247,220,69,11,239,189,135,78,220,123,7,209,125,204)
+IMAGE_DATA(81,240,245,126,48,246,110,89,7,103,213,8,154,214,209,181,134,181,172,89,31,190,147,89,203,231,127,52,128,218,30,123)
+IMAGE_DATA(132,168,247,75,68,83,38,80,247,174,195,133,171,232,67,17,155,190,69,114,127,193,212,78,189,194,220,252,37,229,106,231)
+IMAGE_DATA(190,62,205,58,62,116,62,133,39,174,162,35,133,229,194,43,176,160,176,180,158,191,227,167,40,191,228,20,229,22,157,228)
+IMAGE_DATA(245,147,84,90,121,92,52,34,120,2,255,48,242,10,94,127,243,26,93,125,253,26,243,238,13,186,246,198,107,116,250,236)
+IMAGE_DATA(37,185,87,11,67,235,207,241,57,167,101,174,98,121,229,9,42,40,108,228,235,163,134,178,243,42,105,223,225,124,177,131)
+IMAGE_DATA(124,221,236,231,235,7,203,236,60,196,76,107,168,168,172,129,141,245,95,101,51,243,139,223,127,244,140,228,75,213,53,156)
+IMAGE_DATA(53,115,190,27,79,10,79,160,95,97,45,103,140,47,85,25,100,248,116,218,229,22,246,225,124,244,98,180,89,11,83,31)
+IMAGE_DATA(50,254,77,224,179,250,110,161,75,109,59,138,28,30,196,62,69,175,214,57,118,189,102,53,92,53,124,213,117,176,94,56)
+IMAGE_DATA(120,139,122,213,101,106,83,171,31,87,241,108,162,231,227,24,252,196,248,119,229,229,21,80,69,89,185,240,212,204,122,57)
+IMAGE_DATA(43,185,176,218,135,94,13,219,205,45,167,249,185,228,172,203,85,44,85,175,26,205,122,209,229,42,124,197,54,87,181,22)
+IMAGE_DATA(244,31,205,85,157,245,6,54,226,231,195,31,141,127,43,158,35,192,82,104,83,112,22,207,13,38,6,123,70,106,107,48)
+IMAGE_DATA(215,6,185,196,202,212,142,215,251,253,242,113,213,244,210,111,148,158,110,200,65,194,53,136,123,11,158,207,17,11,2,71)
+IMAGE_DATA(15,102,23,203,115,55,98,76,120,198,223,249,42,219,222,195,180,103,111,62,237,218,123,132,150,175,63,72,201,139,247,83)
+IMAGE_DATA(218,18,102,43,243,21,122,53,38,109,163,212,189,128,147,54,87,177,109,184,154,227,174,171,217,185,74,202,85,141,173,42)
+IMAGE_DATA(87,53,239,215,199,213,109,142,109,113,114,122,55,137,63,23,6,206,70,171,206,76,49,76,51,57,74,155,92,173,26,97)
+IMAGE_DATA(105,72,245,207,218,6,6,194,84,107,186,126,97,171,38,71,242,124,153,179,202,79,141,161,170,246,213,207,199,82,153,170)
+IMAGE_DATA(92,85,67,29,141,242,211,158,73,174,254,96,44,197,215,27,98,52,41,114,127,71,171,70,117,152,106,231,1,131,169,232)
+IMAGE_DATA(175,164,76,133,15,216,174,81,117,253,191,14,79,193,82,48,85,185,58,48,104,14,77,141,152,71,211,163,22,208,204,152)
+IMAGE_DATA(69,126,254,96,228,6,131,173,97,204,90,244,91,0,231,6,143,143,165,231,186,13,163,95,60,241,159,180,228,174,219,105)
+IMAGE_DATA(193,93,119,208,217,123,152,171,247,222,37,214,246,81,44,193,89,102,231,125,119,26,187,223,225,237,199,28,115,89,235,48)
+IMAGE_DATA(248,238,219,168,237,43,143,82,219,224,62,212,54,113,28,117,235,57,81,106,136,144,131,4,174,194,199,139,248,42,236,153)
+IMAGE_DATA(158,161,162,87,193,87,137,181,246,54,62,97,212,219,4,71,45,150,231,128,230,214,51,116,237,173,55,133,147,215,94,127)
+IMAGE_DATA(147,90,207,93,161,250,198,203,204,69,204,25,191,196,247,242,43,116,170,245,117,214,162,87,249,190,123,89,226,112,231,46)
+IMAGE_DATA(156,151,251,248,149,43,151,233,207,127,185,42,185,194,56,126,234,204,101,137,255,225,254,15,191,47,226,171,38,118,90,225)
+IMAGE_DATA(244,123,112,114,146,142,148,178,149,211,225,220,10,58,194,250,180,162,186,137,175,181,83,252,28,219,40,243,231,202,88,255)
+IMAGE_DATA(130,179,21,213,39,152,79,103,165,63,40,174,65,240,17,12,192,239,172,124,194,207,66,124,18,58,11,75,48,7,231,169)
+IMAGE_DATA(129,171,186,79,180,171,147,75,36,122,87,245,170,135,167,94,174,194,74,209,3,217,225,170,234,213,27,113,21,246,183,228)
+IMAGE_DATA(170,62,55,8,99,97,39,79,73,142,50,184,7,159,231,197,139,151,233,218,181,55,152,39,127,186,206,222,120,227,45,97)
+IMAGE_DATA(166,234,84,53,195,213,139,226,7,190,145,94,5,183,222,47,174,234,75,107,110,16,103,69,63,37,244,0,6,95,209,87)
+IMAGE_DATA(9,207,19,224,41,142,193,231,139,88,42,98,178,58,231,188,67,167,126,48,94,26,95,69,172,7,122,21,207,182,184,254)
+IMAGE_DATA(140,95,232,132,44,225,3,46,171,170,145,124,64,101,44,242,40,15,231,241,179,119,190,209,176,120,22,223,176,163,128,146)
+IMAGE_DATA(23,237,163,148,197,123,93,174,34,254,133,254,184,96,165,97,107,182,196,96,149,159,54,91,53,150,138,101,218,210,131,126)
+IMAGE_DATA(243,101,148,171,168,113,65,60,19,190,87,95,158,210,118,43,127,215,241,1,59,220,83,182,234,113,137,149,166,25,127,110)
+IMAGE_DATA(152,195,85,91,175,218,28,85,238,217,134,253,17,169,91,93,31,177,253,179,81,147,19,237,204,48,199,207,212,207,209,122)
+IMAGE_DATA(26,152,253,217,218,11,88,251,42,153,121,170,190,249,228,182,105,12,85,252,189,211,22,187,51,106,224,235,29,198,140,25)
+IMAGE_DATA(206,44,85,166,218,115,86,7,77,76,103,174,250,226,170,168,91,181,123,66,104,174,146,248,128,45,173,10,131,174,69,126)
+IMAGE_DATA(208,212,136,76,225,234,140,232,133,52,115,246,34,138,140,95,202,186,31,186,117,133,240,117,90,236,18,151,171,3,198,68)
+IMAGE_DATA(209,51,47,13,166,95,127,247,63,104,213,157,183,209,162,59,110,167,43,204,87,98,190,210,221,119,210,59,247,220,45,203)
+IMAGE_DATA(182,123,238,116,89,235,179,59,44,214,222,67,111,223,111,150,244,145,0,162,199,191,76,109,99,135,83,203,176,1,252,251)
+IMAGE_DATA(198,136,54,159,30,183,138,159,95,54,208,179,61,195,132,167,127,96,131,102,133,118,197,186,48,182,87,184,236,67,31,195)
+IMAGE_DATA(169,49,139,105,241,234,189,162,61,47,94,186,42,247,166,63,189,117,149,239,75,188,252,243,53,186,116,245,26,53,159,185)
+IMAGE_DATA(196,218,240,50,179,233,28,29,173,105,165,230,211,23,233,141,191,188,73,151,95,187,106,252,136,231,206,138,207,237,84,171)
+IMAGE_DATA(201,39,109,57,197,140,59,125,74,246,67,31,97,253,220,133,179,18,219,171,63,126,66,216,0,189,5,54,136,102,98,78)
+IMAGE_DATA(35,31,41,175,168,134,13,249,187,181,84,88,86,45,150,91,84,33,86,92,81,203,86,45,92,83,189,137,107,19,215,95)
+IMAGE_DATA(81,41,242,10,77,222,172,233,33,122,194,245,231,106,108,213,230,107,61,47,97,181,124,174,106,212,155,197,87,237,159,169)
+IMAGE_DATA(190,96,59,182,10,131,214,87,83,109,47,92,61,101,152,120,92,226,162,239,45,190,234,158,219,124,198,239,61,216,70,222)
+IMAGE_DATA(46,114,118,144,175,171,126,90,237,45,228,53,48,230,194,197,203,126,62,96,172,171,33,150,106,235,85,101,108,81,201,7)
+IMAGE_DATA(131,171,170,89,209,75,31,223,81,213,224,248,222,33,47,9,251,117,166,57,254,173,29,185,191,31,188,151,204,95,229,107)
+IMAGE_DATA(10,215,56,174,105,92,223,184,78,145,211,8,95,21,174,251,2,94,30,41,96,158,242,51,56,124,88,176,195,185,101,206)
+IMAGE_DATA(51,120,169,172,231,151,84,209,230,87,243,40,97,225,110,74,89,116,144,82,151,28,160,184,44,230,76,202,70,49,233,57)
+IMAGE_DATA(200,172,149,248,43,250,61,172,204,113,235,104,212,231,171,125,31,192,212,148,197,251,221,94,247,202,87,248,129,161,85,145)
+IMAGE_DATA(147,139,220,33,213,168,224,153,50,19,121,187,152,209,6,211,124,35,151,189,158,99,182,159,247,58,125,26,183,222,79,71)
+IMAGE_DATA(42,3,193,68,229,47,216,170,134,62,15,162,81,83,77,207,135,153,241,198,102,196,109,148,121,229,168,163,153,22,231,243)
+IMAGE_DATA(247,186,253,127,227,76,76,21,60,69,46,48,122,63,160,71,161,230,42,153,184,170,165,83,153,157,194,84,87,147,206,167)
+IMAGE_DATA(65,193,243,101,70,205,48,214,165,210,11,98,10,239,159,60,207,177,44,201,241,113,103,193,161,182,134,121,137,30,133,48)
+IMAGE_DATA(104,82,169,87,101,83,173,138,253,226,43,30,147,70,35,131,211,104,90,228,124,225,234,180,152,249,162,89,17,107,13,141)
+IMAGE_DATA(91,106,122,69,36,175,146,92,96,48,117,114,228,34,233,97,248,135,23,7,210,83,95,255,46,173,187,227,14,90,241,145)
+IMAGE_DATA(59,232,79,204,214,182,59,62,66,116,231,237,62,3,103,29,214,42,103,253,12,186,246,158,187,132,177,109,1,204,213,127)
+IMAGE_DATA(251,58,209,228,32,218,214,107,32,107,232,100,254,91,44,164,200,100,244,85,94,77,207,245,142,50,44,237,53,131,89,58)
+IMAGE_DATA(67,56,138,165,97,235,12,250,35,111,15,14,74,147,222,21,219,246,228,178,198,195,61,251,148,48,240,84,107,11,181,158)
+IMAGE_DATA(61,77,167,207,128,141,173,146,219,126,154,245,39,114,70,207,95,48,235,96,176,248,128,175,94,230,115,153,147,205,62,142)
+IMAGE_DATA(226,222,143,251,52,124,180,208,65,96,243,149,171,175,11,135,113,111,151,58,126,104,221,243,231,232,226,229,75,70,35,179)
+IMAGE_DATA(206,128,159,82,52,229,241,22,225,20,174,31,92,103,178,44,61,42,215,163,94,115,185,133,85,98,216,151,87,92,41,215)
+IMAGE_DATA(105,126,113,53,21,151,215,11,131,193,59,240,20,159,167,190,96,229,170,173,93,197,31,92,215,216,174,255,215,171,85,193)
+IMAGE_DATA(89,219,7,92,94,101,88,138,165,234,85,44,13,83,141,143,89,226,171,14,87,111,73,175,242,239,165,191,179,250,177,93)
+IMAGE_DATA(221,106,177,85,245,42,122,96,161,94,19,126,131,119,155,223,2,46,93,186,124,205,143,169,170,85,141,94,245,25,184,170)
+IMAGE_DATA(253,22,80,131,91,85,125,244,3,49,215,92,115,152,192,79,252,91,97,136,187,66,155,106,252,180,67,155,126,240,94,109)
+IMAGE_DATA(100,158,113,240,168,83,223,120,138,114,10,107,232,80,193,81,58,112,164,138,246,30,46,165,221,7,138,104,207,193,98,63)
+IMAGE_DATA(123,245,80,9,237,203,46,163,87,179,75,105,127,78,57,237,203,41,165,3,206,250,193,220,74,90,177,33,155,226,231,239)
+IMAGE_DATA(165,228,133,7,132,139,241,243,118,242,125,119,131,152,248,116,151,29,114,13,124,53,140,53,58,213,141,161,46,50,150,182)
+IMAGE_DATA(232,160,171,83,213,208,183,40,33,19,179,98,118,187,44,53,125,27,118,154,109,135,153,48,48,84,56,154,190,221,55,15)
+IMAGE_DATA(21,60,198,123,49,119,220,97,171,178,87,125,180,170,45,37,214,25,179,218,213,145,54,87,213,212,167,219,158,206,213,30)
+IMAGE_DATA(132,176,105,113,27,28,91,231,199,106,163,79,87,251,205,166,1,83,209,99,9,253,30,76,159,66,83,103,131,28,37,233)
+IMAGE_DATA(245,0,125,26,204,236,116,103,190,101,138,30,29,194,54,116,98,134,51,167,124,158,225,44,243,21,90,22,199,164,31,132)
+IMAGE_DATA(230,2,143,51,243,203,149,171,215,243,212,233,185,63,118,14,141,158,50,87,184,58,53,218,112,53,52,118,177,112,117,230)
+IMAGE_DATA(236,37,18,111,5,95,193,83,196,86,209,151,105,192,136,80,250,253,11,253,233,185,47,125,147,214,222,126,59,173,187,237)
+IMAGE_DATA(118,122,231,35,204,81,230,107,219,237,119,248,150,54,99,29,107,179,120,43,122,86,152,203,60,14,12,36,122,226,219,68)
+IMAGE_DATA(83,39,211,162,174,189,164,127,97,80,248,82,137,221,79,140,90,76,207,246,138,20,223,239,31,123,207,116,152,26,202,26)
+IMAGE_DATA(22,126,97,147,35,252,76,159,80,126,30,201,164,153,113,203,233,80,126,37,223,211,145,183,122,74,252,163,224,17,238,241)
+IMAGE_DATA(208,151,38,126,121,134,90,47,156,225,229,105,230,37,107,132,215,46,211,149,107,175,9,83,207,95,60,199,102,238,193,231)
+IMAGE_DATA(95,3,111,95,51,241,57,190,87,131,147,48,19,11,61,107,234,72,28,198,72,29,39,235,69,97,221,137,83,46,127,26)
+IMAGE_DATA(152,21,168,83,41,171,106,164,194,138,122,202,41,170,166,236,194,163,238,18,118,164,184,70,182,97,249,101,252,140,91,94)
+IMAGE_DATA(39,6,214,105,141,139,230,248,214,29,111,242,227,42,12,245,54,186,148,124,164,122,255,26,27,63,150,122,185,138,156,139)
+IMAGE_DATA(91,228,42,244,170,254,187,110,228,7,182,217,138,191,145,112,245,228,105,151,173,55,212,172,45,103,69,175,130,171,200,213)
+IMAGE_DATA(185,53,174,94,113,227,168,154,179,164,255,87,120,14,50,57,192,151,156,253,230,255,20,61,89,85,175,190,223,92,197,191)
+IMAGE_DATA(65,181,183,234,82,213,166,29,76,253,224,190,244,127,229,237,183,219,196,47,133,235,246,16,63,19,103,23,213,208,65,126)
+IMAGE_DATA(78,62,152,207,207,205,229,13,84,92,117,140,74,42,235,228,185,24,215,126,30,63,35,31,46,52,207,202,184,174,113,125)
+IMAGE_DATA(225,58,207,46,168,166,181,91,243,105,118,214,46,74,98,205,154,196,108,156,157,185,93,122,204,129,171,226,215,93,106,116)
+IMAGE_DATA(44,150,96,43,244,43,150,216,7,150,98,54,140,244,212,93,104,216,156,180,96,63,37,206,223,71,241,89,175,186,6,46)
+IMAGE_DATA(198,58,28,85,83,29,170,188,212,117,173,45,133,185,251,212,50,118,184,231,199,56,254,91,141,135,66,103,42,23,161,31)
+IMAGE_DATA(193,86,112,213,54,156,19,150,184,197,237,237,43,189,146,160,73,221,190,14,102,102,42,120,137,222,250,208,162,194,216,89)
+IMAGE_DATA(166,71,33,242,147,236,57,170,234,235,197,210,236,91,33,51,106,116,63,252,191,208,169,218,223,161,255,196,185,194,83,104)
+IMAGE_DATA(209,193,65,233,166,54,149,183,7,77,54,190,95,195,213,121,98,67,133,189,153,110,124,213,141,179,90,186,85,205,230,42)
+IMAGE_DATA(206,25,19,146,46,241,85,229,170,232,213,232,133,98,161,177,11,133,171,224,169,204,178,9,157,71,189,7,79,165,39,59)
+IMAGE_DATA(245,162,174,143,126,145,86,223,254,17,218,114,27,115,242,182,59,133,167,239,124,4,235,183,187,75,236,243,154,48,247,142)
+IMAGE_DATA(59,125,154,246,182,219,132,171,239,252,228,71,68,161,51,41,166,75,47,126,198,96,109,28,179,66,250,46,131,151,154,3)
+IMAGE_DATA(140,152,42,184,42,61,34,156,252,96,241,11,247,13,165,177,252,187,133,39,174,160,146,163,141,78,45,203,89,39,206,198)
+IMAGE_DATA(247,92,214,147,176,115,151,76,236,77,239,241,200,17,194,61,89,252,144,78,173,165,209,57,231,169,153,245,79,99,243,89)
+IMAGE_DATA(230,213,25,241,25,159,60,125,129,237,28,239,83,126,180,240,121,198,31,12,142,224,124,112,180,182,17,190,89,102,9,127)
+IMAGE_DATA(126,83,171,57,95,235,69,193,175,146,138,6,225,108,85,29,234,74,155,101,137,99,213,13,77,198,234,78,10,203,160,47)
+IMAGE_DATA(237,250,83,209,155,232,29,196,207,9,245,141,205,102,121,220,103,146,31,108,229,36,221,144,167,142,105,254,176,230,250,170)
+IMAGE_DATA(217,92,149,26,214,234,70,215,15,236,205,7,190,37,189,122,163,188,37,143,94,181,185,122,230,204,233,91,226,42,252,9)
+IMAGE_DATA(215,251,128,47,185,117,54,186,141,218,85,228,14,195,15,92,85,85,197,92,109,185,41,87,219,235,235,208,241,234,120,233)
+IMAGE_DATA(11,223,137,227,77,103,169,188,182,153,239,57,39,168,184,242,4,149,32,135,162,226,184,88,237,9,190,111,180,156,163,250)
+IMAGE_DATA(166,51,84,115,188,149,202,106,154,168,178,238,52,63,235,159,166,122,60,27,227,190,192,247,137,146,154,147,180,233,213,18)
+IMAGE_DATA(214,171,123,196,23,156,200,108,156,149,177,77,184,10,63,176,50,85,205,187,45,92,157,111,76,121,170,76,5,75,109,155)
+IMAGE_DATA(37,125,25,118,75,127,6,229,36,246,199,177,150,117,45,107,151,107,18,143,213,158,14,206,113,141,209,218,108,85,174,134)
+IMAGE_DATA(38,108,22,255,173,242,17,54,125,246,6,49,236,195,210,231,231,53,156,133,175,23,154,20,12,133,233,252,25,223,124,55)
+IMAGE_DATA(163,71,161,69,133,185,49,190,158,15,118,110,146,201,87,90,238,87,163,170,49,85,123,230,219,128,177,105,18,43,133,111)
+IMAGE_DATA(87,106,104,152,173,70,171,102,154,122,85,199,7,108,108,158,228,47,41,83,53,135,73,117,171,151,175,126,92,157,58,151)
+IMAGE_DATA(166,132,101,210,148,72,176,213,228,47,169,41,87,39,133,47,144,124,224,113,211,51,232,149,126,147,232,215,79,117,165,190)
+IMAGE_DATA(31,255,44,45,103,38,238,4,63,3,13,83,255,194,124,125,219,225,170,207,110,247,51,112,213,181,59,140,86,21,63,240)
+IMAGE_DATA(207,127,70,109,51,66,41,248,229,126,20,20,186,132,255,198,171,41,101,225,78,126,174,152,67,157,251,71,75,254,47,248)
+IMAGE_DATA(170,92,133,61,221,115,58,61,211,35,156,186,14,141,150,223,47,117,225,118,249,30,67,51,30,61,118,138,170,27,79,243)
+IMAGE_DATA(247,158,121,86,103,190,251,96,46,246,85,212,181,8,3,17,31,52,172,60,43,140,59,206,215,193,41,214,60,205,172,151)
+IMAGE_DATA(26,154,47,242,245,112,150,207,63,67,149,13,173,84,94,215,74,21,245,167,169,238,100,43,181,156,59,67,103,47,242,253)
+IMAGE_DATA(250,210,101,169,193,129,225,94,14,61,124,234,252,121,177,243,151,47,137,193,39,13,254,226,92,61,7,90,87,13,250,89)
+IMAGE_DATA(63,3,235,48,228,0,159,128,22,230,223,239,24,216,212,108,56,173,126,85,176,170,254,68,139,244,105,192,191,195,240,188)
+IMAGE_DATA(201,101,234,141,184,106,235,88,112,85,53,169,151,173,166,190,166,193,229,170,240,214,201,91,210,88,242,173,228,46,181,199)
+IMAGE_DATA(85,245,1,123,107,109,222,171,94,133,31,222,174,179,177,151,62,190,94,180,116,235,121,241,3,67,175,34,126,251,215,234)
+IMAGE_DATA(213,14,198,118,188,240,122,251,237,63,211,133,43,175,83,243,133,43,212,114,241,42,157,60,119,133,237,178,216,241,51,23)
+IMAGE_DATA(233,24,63,103,31,59,115,137,26,90,47,178,157,167,19,103,47,81,35,127,95,235,249,187,94,135,186,50,212,89,157,189)
+IMAGE_DATA(72,245,252,188,190,191,176,65,244,106,2,216,202,22,51,119,139,244,195,1,91,197,207,11,134,46,62,228,139,151,74,142)
+IMAGE_DATA(211,126,137,199,66,159,130,163,9,243,28,127,47,155,173,79,149,125,202,70,245,7,43,79,85,207,226,125,242,57,252,243)
+IMAGE_DATA(209,31,95,77,88,234,156,155,96,113,21,126,98,237,241,160,254,96,232,80,204,153,81,141,169,186,85,153,138,109,229,172)
+IMAGE_DATA(207,175,187,193,209,161,235,220,88,169,205,84,141,149,194,207,171,241,83,111,190,175,230,38,153,245,165,110,175,7,228,251)
+IMAGE_DATA(218,117,51,136,149,14,155,102,252,187,253,71,207,97,166,154,124,95,209,175,240,7,51,71,165,127,225,20,39,190,234,228)
+IMAGE_DATA(3,219,90,85,151,202,85,155,173,50,207,156,153,171,92,157,28,154,65,193,225,153,52,57,34,67,180,235,148,200,76,169)
+IMAGE_DATA(187,129,79,24,249,193,232,181,143,188,165,209,33,115,168,75,207,49,244,223,191,125,158,134,62,244,113,90,194,90,117,95)
+IMAGE_DATA(32,107,207,219,238,18,166,254,153,249,250,23,102,103,123,230,229,109,219,237,119,82,91,224,71,12,83,121,73,191,250,37)
+IMAGE_DATA(209,212,105,52,162,203,64,169,91,69,95,224,180,197,187,169,223,216,20,233,85,168,189,32,12,91,153,169,78,95,67,248)
+IMAGE_DATA(132,251,141,77,160,169,179,150,211,138,205,217,252,61,61,71,117,124,223,198,247,183,190,133,217,120,226,60,29,61,113,86)
+IMAGE_DATA(172,170,177,85,142,53,156,102,246,158,62,207,203,86,106,134,223,247,218,85,58,113,142,245,230,41,159,213,54,99,121,142)
+IMAGE_DATA(90,192,206,43,175,81,19,223,163,107,155,240,153,231,205,245,195,215,204,113,190,38,142,163,46,134,237,4,51,242,212,197)
+IMAGE_DATA(203,98,39,249,30,222,120,202,24,246,227,248,73,232,98,94,7,247,27,192,241,147,103,248,247,105,230,229,105,115,173,49)
+IMAGE_DATA(175,109,3,43,241,76,11,118,194,80,227,41,117,158,205,173,46,75,213,112,28,156,189,33,67,219,233,187,36,122,181,198)
+IMAGE_DATA(151,7,108,124,190,13,110,159,37,241,61,87,55,72,14,180,244,29,172,110,240,227,170,87,155,218,254,95,233,13,229,248)
+IMAGE_DATA(200,189,61,33,148,163,205,45,103,125,117,175,200,49,230,127,7,184,7,174,34,135,231,102,92,69,158,55,88,169,57,74)
+IMAGE_DATA(54,75,53,119,73,253,193,82,103,195,207,45,152,53,242,94,227,171,246,172,183,142,87,199,75,95,111,183,253,133,46,191)
+IMAGE_DATA(241,6,157,133,253,233,13,58,247,103,254,62,190,117,149,206,189,249,58,47,217,222,124,147,78,191,249,6,157,122,227,117)
+IMAGE_DATA(106,229,115,90,223,188,198,231,94,227,253,111,137,157,126,253,13,177,214,107,215,168,184,190,69,102,182,168,78,84,174,134)
+IMAGE_DATA(39,172,53,44,93,114,88,24,106,226,165,251,69,151,170,37,56,44,21,46,130,167,153,254,113,82,55,7,9,241,84,75)
+IMAGE_DATA(187,42,83,149,229,48,248,147,97,186,173,121,196,224,176,177,157,62,174,90,204,214,159,33,190,224,196,205,162,63,149,151)
+IMAGE_DATA(234,195,85,174,250,124,186,198,79,172,236,117,117,41,243,212,219,139,80,217,106,231,247,122,123,38,201,108,114,54,237,249)
+IMAGE_DATA(160,185,74,238,236,84,214,165,200,229,157,188,120,11,141,138,89,66,125,70,38,209,192,177,232,249,144,37,236,28,226,196)
+IMAGE_DATA(90,81,223,137,220,96,137,175,6,103,249,233,85,153,191,26,52,215,47,214,106,179,85,185,218,111,92,170,112,53,120,230)
+IMAGE_DATA(28,154,24,154,78,147,194,230,82,72,120,150,112,21,126,97,173,187,153,224,232,213,145,147,83,169,115,247,81,244,159,191)
+IMAGE_DATA(238,68,227,238,123,144,230,51,83,179,153,167,239,220,118,15,115,245,110,230,234,93,244,167,143,220,41,6,198,10,103,249)
+IMAGE_DATA(184,215,222,102,173,250,246,71,238,18,214,254,229,182,0,217,166,39,159,34,154,56,137,250,118,25,42,92,13,79,94,47)
+IMAGE_DATA(92,69,47,125,237,251,0,3,95,161,93,193,84,83,199,26,73,35,67,230,82,88,242,106,218,147,91,73,173,111,189,37)
+IMAGE_DATA(118,250,117,243,221,198,119,30,223,115,93,194,112,13,156,229,115,204,190,171,252,125,191,66,167,223,184,74,167,248,59,222)
+IMAGE_DATA(130,156,97,190,231,158,190,122,85,190,243,98,204,213,214,107,87,204,250,213,215,229,88,203,53,221,119,133,78,93,185,44)
+IMAGE_DATA(199,90,94,123,77,236,20,191,191,233,53,99,39,47,51,147,157,253,39,47,94,164,227,172,115,27,249,30,127,226,60,175)
+IMAGE_DATA(51,203,27,209,191,142,159,93,27,90,207,202,178,158,153,95,215,194,58,20,90,21,49,218,22,248,141,78,81,93,83,139)
+IMAGE_DATA(107,216,6,71,209,103,73,13,172,188,153,94,245,198,87,237,26,26,233,41,225,24,182,181,71,133,97,171,225,106,189,19)
+IMAGE_DATA(223,5,95,93,237,236,49,155,161,118,94,149,247,28,233,233,107,177,22,251,209,247,13,115,160,209,75,21,121,216,240,243)
+IMAGE_DATA(106,61,170,215,68,247,243,57,200,49,59,217,212,34,239,65,126,118,227,241,147,206,156,75,99,216,198,49,44,209,63,14)
+IMAGE_DATA(253,88,113,62,62,27,254,97,228,158,181,103,151,47,95,185,97,156,179,131,177,29,47,112,181,153,159,147,241,156,94,131)
+IMAGE_DATA(235,146,151,181,252,93,196,115,114,109,83,43,213,52,251,172,154,159,123,213,106,112,14,124,192,56,7,231,242,246,254,252)
+IMAGE_DATA(163,18,83,213,30,68,202,85,244,70,23,189,202,90,85,226,166,168,65,85,93,233,232,82,213,154,88,130,149,118,62,175)
+IMAGE_DATA(157,95,132,165,215,167,107,115,85,121,170,108,245,205,156,217,237,246,26,212,152,171,29,143,85,83,205,138,249,168,152,49)
+IMAGE_DATA(99,114,152,252,249,170,190,97,93,119,231,185,197,248,76,253,187,118,79,7,229,170,178,84,231,144,219,235,96,234,104,102)
+IMAGE_DATA(41,120,170,61,148,192,71,137,145,78,200,112,245,234,128,73,240,255,206,149,250,210,65,19,230,74,76,85,150,136,181,58)
+IMAGE_DATA(121,193,194,85,230,43,184,138,125,54,87,237,28,38,47,91,77,206,18,44,133,185,154,102,113,53,131,53,107,22,133,68)
+IMAGE_DATA(101,49,83,23,24,155,109,242,149,144,183,52,34,56,133,158,235,58,156,126,252,243,223,81,200,157,31,165,244,128,59,41)
+IMAGE_DATA(143,89,74,129,247,208,155,1,119,211,155,204,87,181,183,120,223,91,172,99,189,246,167,143,220,237,178,215,104,220,0,250)
+IMAGE_DATA(203,189,15,18,189,208,153,222,30,53,138,186,247,24,43,90,30,117,209,201,11,182,201,156,85,211,103,63,210,244,216,23)
+IMAGE_DATA(182,134,59,102,122,240,143,157,145,69,145,201,107,232,80,81,53,213,177,22,57,198,247,204,70,214,76,199,248,190,11,77)
+IMAGE_DATA(138,109,209,167,172,181,176,46,75,209,171,103,204,49,199,204,246,25,121,15,214,213,234,79,49,219,90,249,90,56,197,124)
+IMAGE_DATA(107,57,101,142,243,103,192,234,249,103,168,225,26,105,176,184,136,56,10,172,246,36,115,15,181,48,204,152,106,102,211,209)
+IMAGE_DATA(198,147,178,196,190,42,244,118,64,206,17,91,101,195,113,177,170,99,62,205,105,199,76,213,236,122,26,209,149,53,102,14)
+IMAGE_DATA(30,204,238,161,100,155,244,138,240,152,93,103,227,53,225,171,245,57,168,121,71,30,24,216,138,28,45,152,29,223,181,77)
+IMAGE_DATA(115,170,244,28,187,246,86,13,243,41,181,191,133,230,54,163,95,191,108,31,111,113,153,108,215,235,106,79,12,99,77,194)
+IMAGE_DATA(63,204,51,149,158,69,37,197,148,147,123,132,178,115,114,41,135,45,251,136,175,151,48,214,243,242,11,133,193,167,248,255)
+IMAGE_DATA(199,216,57,49,244,188,242,26,114,139,113,206,159,255,252,182,155,79,212,193,210,142,151,251,106,51,249,220,248,62,150,86)
+IMAGE_DATA(213,139,73,109,28,122,123,87,213,58,125,219,106,28,171,115,234,234,28,43,171,145,37,250,49,33,215,162,144,215,119,28)
+IMAGE_DATA(40,165,216,76,211,219,47,38,29,117,162,155,132,169,232,109,132,92,36,104,85,209,166,243,247,184,218,84,57,170,108,197)
+IMAGE_DATA(58,120,7,253,168,53,168,210,207,33,217,167,87,53,7,201,126,15,124,189,239,166,85,117,46,185,176,53,107,151,171,85)
+IMAGE_DATA(85,167,234,231,186,190,224,228,205,194,86,237,137,175,92,85,223,174,248,122,29,166,34,63,201,171,77,237,26,84,111,127)
+IMAGE_DATA(124,209,162,51,150,186,44,245,235,69,136,190,73,232,165,52,221,204,123,147,122,84,229,227,68,195,86,153,73,51,22,181)
+IMAGE_DATA(51,190,62,74,114,108,162,209,171,82,207,234,204,94,5,143,149,171,198,87,156,233,114,85,153,218,111,220,220,118,152,10)
+IMAGE_DATA(206,38,183,203,85,232,213,25,209,243,37,190,138,220,96,229,42,122,45,117,122,121,8,61,241,147,223,80,216,29,247,82)
+IMAGE_DATA(90,224,221,84,136,156,37,102,232,27,188,126,133,237,26,115,246,13,222,126,61,224,46,217,231,111,119,90,124,101,182,50)
+IMAGE_DATA(151,223,10,96,174,62,252,73,162,30,189,232,218,160,1,212,163,255,52,249,59,198,101,108,149,126,255,47,13,138,17,166)
+IMAGE_DATA(194,176,142,249,171,186,173,51,227,38,133,45,164,168,164,53,82,51,42,250,170,234,152,248,47,237,30,242,146,243,122,244)
+IMAGE_DATA(184,235,227,180,235,58,81,35,234,237,241,39,249,68,206,62,237,187,128,122,111,124,150,230,16,41,159,116,62,11,122,174)
+IMAGE_DATA(40,247,108,29,40,185,64,142,161,159,97,105,229,49,247,218,195,245,104,246,215,251,241,204,175,119,146,199,76,157,156,115)
+IMAGE_DATA(172,166,222,53,225,170,211,243,229,166,92,173,169,119,123,176,181,199,211,235,214,249,179,149,171,237,49,212,54,244,161,177)
+IMAGE_DATA(115,149,109,118,10,35,143,155,115,108,61,43,181,184,56,159,153,138,188,172,246,222,103,159,15,13,10,205,137,121,223,245)
+IMAGE_DATA(181,117,84,89,89,46,253,138,208,183,8,115,213,188,253,132,203,42,202,37,159,27,26,215,48,245,140,171,137,109,67,204)
+IMAGE_DATA(22,134,227,87,174,92,19,127,52,106,77,255,209,189,132,59,94,31,236,151,112,149,191,199,232,253,91,84,94,35,166,220)
+IMAGE_DATA(68,239,24,240,84,174,113,230,44,242,130,181,134,29,215,188,206,214,64,189,58,106,238,246,31,46,21,141,26,147,97,122)
+IMAGE_DATA(246,69,164,108,16,31,48,12,177,84,111,126,175,157,103,164,219,146,151,100,49,207,112,206,24,242,138,148,129,118,158,146)
+IMAGE_DATA(232,207,140,221,238,204,113,141,173,106,159,94,213,172,110,172,213,225,106,180,85,243,106,107,98,233,7,236,244,27,212,26)
+IMAGE_DATA(84,191,124,164,168,213,110,220,212,142,157,218,44,69,79,95,219,215,171,253,146,132,171,51,121,95,168,229,247,117,102,208)
+IMAGE_DATA(72,127,223,105,11,93,166,74,173,234,212,121,178,212,156,37,237,75,232,51,95,92,21,219,200,89,210,217,112,26,147,117)
+IMAGE_DATA(107,113,120,57,116,178,217,246,229,45,205,113,204,167,81,193,83,97,44,47,199,78,77,162,9,51,211,216,76,156,53,36)
+IMAGE_DATA(220,212,221,128,171,211,99,231,73,156,53,56,124,145,176,117,80,80,2,61,243,226,32,250,225,15,127,65,179,153,137,201)
+IMAGE_DATA(172,81,43,153,159,109,1,247,50,83,239,21,174,94,189,237,163,116,141,247,195,94,7,95,29,179,249,10,61,251,250,109)
+IMAGE_DATA(119,11,95,95,103,174,254,249,209,199,168,109,200,80,42,239,51,152,122,143,140,166,73,145,75,41,105,254,118,10,75,90)
+IMAGE_DATA(75,93,7,197,138,102,125,105,160,153,11,247,242,16,204,132,139,113,231,154,247,28,49,155,166,69,47,165,228,249,91,153)
+IMAGE_DATA(157,181,46,227,212,119,169,179,97,204,247,188,94,114,112,228,217,210,98,20,76,120,202,92,172,174,111,20,19,182,58,199)
+IMAGE_DATA(180,135,17,234,61,181,31,62,206,65,63,21,97,105,109,131,112,199,101,43,111,195,228,247,168,109,112,251,58,224,189,166)
+IMAGE_DATA(207,89,131,31,243,220,243,219,97,168,251,123,214,54,248,125,174,237,167,213,117,101,36,150,250,251,188,155,41,87,111,166)
+IMAGE_DATA(91,117,46,60,234,137,132,167,141,205,183,196,215,155,157,227,229,165,123,206,241,150,235,206,179,181,42,124,200,226,71,62)
+IMAGE_DATA(126,92,12,125,138,110,212,71,216,54,232,85,196,126,253,245,170,225,41,246,25,173,106,184,10,230,34,191,9,125,4,81)
+IMAGE_DATA(87,170,61,42,58,94,29,47,188,240,156,133,153,136,152,235,136,154,116,24,106,207,209,95,31,108,149,121,139,96,110,169)
+IMAGE_DATA(169,87,135,225,28,48,87,143,97,166,7,106,213,247,30,44,54,44,77,221,32,189,2,195,146,214,185,92,133,94,181,125)
+IMAGE_DATA(190,118,62,146,50,210,235,151,85,206,217,253,23,148,131,246,220,54,156,171,76,86,182,42,111,253,250,224,91,249,193,170)
+IMAGE_DATA(77,237,121,53,242,217,115,183,185,189,125,77,191,193,205,46,87,81,127,170,115,220,124,51,81,87,187,76,85,190,106,79)
+IMAGE_DATA(124,213,162,88,170,102,245,30,115,231,186,49,59,193,84,101,171,244,41,116,246,141,180,250,253,218,218,19,28,29,18,156)
+IMAGE_DATA(233,26,246,131,171,210,111,201,209,184,174,110,117,204,240,55,221,245,3,171,255,23,75,195,89,31,87,209,151,105,236,212)
+IMAGE_DATA(20,26,63,61,133,130,102,204,97,221,154,78,83,194,180,175,33,152,154,37,189,131,165,215,82,248,2,234,55,54,134,158)
+IMAGE_DATA(126,190,63,61,241,189,159,81,34,115,51,137,121,89,29,240,81,250,11,115,245,50,47,47,7,220,35,203,215,120,105,56)
+IMAGE_DATA(107,236,90,192,189,46,107,149,183,111,220,118,175,104,218,107,204,213,183,190,248,56,209,168,49,180,187,123,127,126,174,72)
+IMAGE_DATA(162,224,200,21,148,56,111,27,77,157,181,66,230,217,9,91,7,153,57,230,200,253,69,204,245,149,161,179,168,43,243,21)
+IMAGE_DATA(61,36,34,18,214,208,130,21,187,249,121,241,168,112,84,124,162,71,235,93,94,42,99,141,22,61,225,212,142,52,248,180)
+IMAGE_DATA(169,195,42,112,67,180,169,211,11,95,153,165,140,245,219,246,48,85,181,34,250,150,233,182,28,227,223,67,125,66,184,150)
+IMAGE_DATA(240,140,170,207,172,94,166,221,136,113,54,219,92,94,90,92,213,227,246,123,63,236,92,133,222,69,111,38,244,255,67,47)
+IMAGE_DATA(93,48,208,219,71,216,54,228,24,155,250,227,179,150,102,189,49,87,113,46,88,140,190,130,152,121,138,190,131,29,92,237)
+IMAGE_DATA(120,233,11,223,5,196,45,48,163,6,61,10,209,75,31,140,4,103,133,181,69,229,98,216,143,227,56,15,235,186,173,199)
+IMAGE_DATA(209,203,124,207,254,66,97,105,104,226,90,154,153,96,150,96,42,150,208,144,182,54,157,149,190,135,57,230,203,241,181,115)
+IMAGE_DATA(148,212,108,166,106,95,36,223,140,153,29,126,53,169,222,90,28,151,217,78,44,21,60,181,181,170,151,215,194,236,57,190)
+IMAGE_DATA(254,248,88,106,175,67,155,171,118,13,141,221,199,215,155,147,52,198,137,145,66,123,106,12,213,206,249,245,227,170,211,151)
+IMAGE_DATA(16,26,85,122,63,56,189,8,141,94,93,224,114,85,106,87,131,179,156,60,164,116,167,78,85,185,106,120,11,67,62,176)
+IMAGE_DATA(201,87,202,244,113,117,82,150,95,159,96,187,206,198,23,91,77,22,211,188,96,244,220,31,19,146,76,227,166,37,51,91)
+IMAGE_DATA(211,132,171,193,225,134,171,211,34,179,152,173,153,52,57,114,129,204,21,159,200,214,111,84,148,112,245,39,255,246,35,154)
+IMAGE_DATA(203,172,4,91,107,3,239,163,55,3,238,167,11,129,247,211,69,94,94,102,187,24,248,81,135,179,62,3,107,213,148,181)
+IMAGE_DATA(87,177,29,24,64,111,60,254,125,162,160,96,154,255,98,111,254,27,241,207,140,94,78,201,11,118,80,80,216,2,97,167)
+IMAGE_DATA(240,148,151,93,135,196,82,183,33,134,171,48,176,118,244,180,12,154,157,178,158,214,108,62,100,152,6,70,28,173,189,142)
+IMAGE_DATA(65,170,25,253,116,34,122,102,87,155,249,218,152,61,92,91,103,230,107,131,151,53,158,30,128,202,176,163,224,113,205,49)
+IMAGE_DATA(151,197,248,153,152,101,129,165,114,85,12,51,46,156,231,82,211,159,176,90,174,45,24,158,105,241,28,171,166,243,196,237)
+IMAGE_DATA(249,226,202,94,155,183,250,172,32,62,223,163,215,155,31,15,45,174,222,136,177,255,191,115,21,253,234,117,46,169,246,211)
+IMAGE_DATA(133,182,180,77,251,24,105,15,44,169,89,190,69,189,138,153,50,96,43,184,140,207,232,240,5,119,188,244,165,92,85,166)
+IMAGE_DATA(130,165,208,159,202,85,93,87,126,218,156,53,86,38,243,228,48,243,102,239,193,34,230,233,26,169,129,152,30,103,150,161)
+IMAGE_DATA(113,171,121,185,214,175,214,197,176,112,15,179,115,151,107,224,100,100,202,118,89,26,159,239,118,49,187,199,160,233,111,132)
+IMAGE_DATA(124,221,173,114,204,238,75,104,243,85,227,179,122,220,230,42,214,149,217,218,11,66,251,232,219,219,190,90,86,211,131,16)
+IMAGE_DATA(189,6,181,191,131,234,213,246,106,100,148,161,154,115,36,92,157,105,124,193,118,143,7,244,54,112,231,165,90,51,200,181)
+IMAGE_DATA(62,70,99,164,98,202,212,137,153,110,31,125,19,39,77,119,253,193,218,79,73,99,168,62,223,112,186,27,147,85,158,218)
+IMAGE_DATA(121,192,190,188,37,228,2,39,249,213,177,162,134,101,244,148,4,241,5,67,179,34,206,10,174,134,132,103,136,77,139,204)
+IMAGE_DATA(160,224,8,214,171,145,139,36,39,184,239,240,8,250,253,115,253,232,191,191,250,109,154,31,112,159,112,181,49,240,65,102)
+IMAGE_DATA(228,131,116,46,224,1,58,23,248,49,186,16,240,49,58,31,128,229,125,174,41,111,93,198,50,139,177,52,92,189,157,174)
+IMAGE_DATA(125,255,167,212,54,105,26,69,118,238,77,99,167,47,164,144,216,149,148,186,104,151,204,83,237,34,254,95,227,251,237,230)
+IMAGE_DATA(112,245,149,193,177,194,89,108,131,247,224,234,150,93,57,194,179,202,170,90,215,48,79,24,134,245,42,135,163,200,45,56)
+IMAGE_DATA(234,240,17,38,28,117,216,234,53,215,151,235,104,85,156,103,91,21,252,194,252,217,152,87,140,185,197,250,179,100,233,248)
+IMAGE_DATA(160,181,231,175,206,95,84,63,145,242,211,230,170,215,252,244,167,149,155,171,241,213,155,113,213,182,15,35,87,49,159,20)
+IMAGE_DATA(154,21,125,234,237,126,194,218,183,200,54,244,7,132,31,248,86,185,10,6,163,79,255,173,212,211,118,188,254,249,94,248)
+IMAGE_DATA(78,193,15,12,62,130,159,246,245,172,215,180,185,238,125,124,245,113,182,82,142,225,189,216,198,92,44,195,212,85,194,85)
+IMAGE_DATA(44,149,177,222,156,36,187,190,197,104,199,237,194,75,211,195,104,139,172,195,180,47,160,246,175,215,227,96,95,123,62,97)
+IMAGE_DATA(101,171,250,145,229,152,167,239,146,95,28,213,163,89,205,252,153,173,146,11,172,125,148,84,167,106,77,170,237,251,85,78)
+IMAGE_DATA(170,62,181,103,161,130,169,200,79,210,28,37,91,167,186,231,89,61,244,161,41,97,174,223,54,56,211,221,167,51,84,213)
+IMAGE_DATA(255,171,181,50,62,67,29,141,175,70,117,64,208,28,191,220,36,213,165,222,109,59,166,106,115,21,125,13,251,142,73,164)
+IMAGE_DATA(17,147,102,179,102,77,20,205,58,105,70,26,77,10,75,163,41,97,233,194,85,244,227,71,92,21,189,4,131,194,230,83)
+IMAGE_DATA(223,161,51,233,169,103,251,210,147,159,251,87,90,200,28,77,101,46,54,5,60,196,140,124,144,206,4,62,32,118,30,124)
+IMAGE_DATA(13,120,64,216,106,219,69,222,167,140,85,187,204,92,190,28,120,23,93,251,217,111,168,45,120,38,77,124,161,143,252,205)
+IMAGE_DATA(166,198,25,174,226,247,51,51,224,76,206,146,178,180,27,175,35,230,42,51,108,248,247,195,188,88,204,103,51,122,181,70)
+IMAGE_DATA(120,231,227,169,143,163,202,214,10,39,103,8,140,197,113,88,117,77,131,232,85,240,82,125,186,202,35,55,118,234,176,84)
+IMAGE_DATA(185,106,243,27,108,213,159,137,117,127,173,106,174,53,125,150,213,235,174,61,243,114,213,230,158,242,77,53,184,29,91,253)
+IMAGE_DATA(103,227,42,114,70,48,183,84,185,122,179,57,229,168,85,85,63,240,173,114,21,179,96,245,243,59,184,218,241,178,95,54)
+IMAGE_DATA(87,193,198,34,235,218,214,107,29,76,181,175,123,152,114,88,142,59,26,22,61,248,17,243,130,158,128,97,29,108,157,54)
+IMAGE_DATA(123,181,159,111,214,219,59,80,53,34,120,137,120,38,204,94,119,251,215,59,125,142,12,115,55,187,241,86,219,188,113,87)
+IMAGE_DATA(123,221,246,45,187,51,225,82,182,136,153,252,223,45,238,207,179,123,250,218,76,245,214,208,216,218,84,205,230,41,184,9)
+IMAGE_DATA(255,238,88,171,38,85,205,246,1,107,94,146,246,83,210,117,59,71,201,158,245,230,203,229,213,124,222,52,199,82,220,250)
+IMAGE_DATA(83,173,71,237,53,42,69,204,191,167,82,114,59,62,224,20,235,61,73,212,103,116,2,13,13,154,197,108,141,167,145,193)
+IMAGE_DATA(113,52,110,74,50,5,205,72,21,221,10,182,194,16,87,197,76,243,177,51,50,169,199,128,16,250,223,63,116,167,23,63)
+IMAGE_DATA(249,24,101,49,43,51,89,115,158,14,120,152,57,250,8,47,31,148,245,86,94,182,10,103,31,18,59,231,112,214,53,214)
+IMAGE_DATA(180,231,111,83,238,222,37,254,227,171,191,126,154,88,40,211,224,23,250,75,191,253,105,179,87,82,194,130,237,146,155,100)
+IMAGE_DATA(102,152,135,73,61,141,178,21,6,174,118,31,22,75,211,98,151,81,124,198,122,249,254,194,31,11,166,249,107,213,58,225)
+IMAGE_DATA(40,12,235,186,173,49,79,163,95,235,133,171,120,31,216,172,58,85,153,84,90,89,109,226,165,14,175,161,77,221,124,62)
+IMAGE_DATA(231,250,177,243,20,244,25,85,215,213,244,92,155,161,248,108,252,76,44,197,220,252,252,26,127,86,90,190,109,225,164,135)
+IMAGE_DATA(169,246,185,154,183,228,229,170,151,177,255,63,115,21,122,245,239,201,85,248,129,223,203,231,119,188,254,185,94,198,15,124)
+IMAGE_DATA(220,92,231,142,21,131,163,188,44,193,115,179,117,221,219,90,85,153,10,31,112,161,248,133,203,232,64,118,49,77,137,92)
+IMAGE_DATA(66,83,98,86,72,12,12,243,49,161,87,193,85,176,45,122,238,14,191,252,91,223,60,153,109,126,28,181,121,170,166,117)
+IMAGE_DATA(46,224,43,184,170,92,84,221,169,57,195,248,92,187,87,176,114,213,231,227,229,159,149,188,213,87,159,154,104,122,64,160)
+IMAGE_DATA(191,146,183,23,161,154,173,83,219,99,170,50,18,177,81,153,135,58,205,196,85,97,202,85,63,238,58,113,87,137,167,162)
+IMAGE_DATA(150,102,202,2,183,151,18,124,184,18,67,245,228,254,218,76,53,61,243,83,45,150,166,9,55,123,142,76,246,245,208,199)
+IMAGE_DATA(252,183,145,201,214,126,95,143,125,115,78,98,59,125,246,13,99,117,246,106,159,145,241,52,104,108,52,13,25,55,91,248)
+IMAGE_DATA(58,122,82,130,228,49,77,156,158,42,218,117,98,232,28,233,181,132,190,251,163,166,206,165,46,125,130,232,151,255,219,133)
+IMAGE_DATA(122,62,240,40,165,49,35,161,89,91,3,63,193,60,253,4,181,4,62,76,45,1,31,119,13,140,85,107,101,3,99,109)
+IMAGE_DATA(222,158,101,174,158,101,189,123,238,174,143,211,181,63,118,33,26,63,141,186,191,60,132,255,198,89,102,62,92,218,58,234)
+IMAGE_DATA(212,195,204,130,235,212,107,134,212,170,34,255,23,108,69,110,48,98,174,125,70,199,209,140,217,43,104,206,226,173,70,3)
+IMAGE_DATA(150,152,239,182,44,203,171,196,148,27,202,65,151,103,202,46,48,165,162,198,245,233,42,127,68,183,86,214,184,76,214,243)
+IMAGE_DATA(240,153,224,183,50,211,190,86,244,217,85,159,83,245,186,178,159,95,189,218,244,70,92,213,252,39,175,110,118,215,219,241)
+IMAGE_DATA(1,123,243,129,111,100,31,6,174,182,167,87,223,173,127,146,205,213,91,205,91,234,224,106,199,235,70,47,112,21,61,70)
+IMAGE_DATA(84,171,22,58,75,229,107,73,169,185,15,21,150,250,231,49,249,61,95,59,247,15,248,129,81,43,8,166,194,166,196,44)
+IMAGE_DATA(19,166,78,157,181,202,229,170,171,23,83,89,115,166,108,115,227,165,237,251,127,55,185,188,83,3,111,53,238,41,179,80)
+IMAGE_DATA(45,46,171,127,88,231,216,120,117,49,206,131,38,181,63,83,57,170,250,212,112,116,141,95,31,66,177,152,117,172,203,86)
+IMAGE_DATA(251,213,211,104,143,65,225,169,230,240,122,76,217,169,231,140,114,230,143,219,231,12,119,250,34,105,220,20,92,85,206,162)
+IMAGE_DATA(143,146,250,124,209,255,8,134,190,192,125,71,155,26,25,213,150,224,160,61,155,188,231,240,36,94,247,103,171,153,173,10)
+IMAGE_DATA(174,38,136,217,115,204,149,177,88,226,125,221,135,199,49,155,103,201,220,183,129,163,99,104,200,248,104,26,53,49,158,70)
+IMAGE_DATA(79,73,98,221,154,72,227,67,146,68,187,162,215,62,124,173,35,166,164,209,11,61,199,210,127,253,234,57,234,119,223,39)
+IMAGE_DATA(41,129,153,186,76,120,249,41,230,232,167,168,137,53,107,19,243,244,36,91,179,216,35,22,99,61,156,13,124,132,153,202)
+IMAGE_DATA(186,54,240,163,116,142,25,253,230,75,125,169,109,212,36,122,185,199,24,26,51,51,75,114,226,102,196,175,98,174,134,11)
+IMAGE_DATA(87,49,11,78,102,152,247,53,189,32,80,195,218,101,80,4,63,155,36,83,88,194,106,154,191,122,183,124,175,11,139,202)
+IMAGE_DATA(168,128,217,134,231,197,210,178,42,249,110,151,50,191,202,192,47,112,12,154,214,49,97,23,52,38,175,151,87,216,62,99)
+IMAGE_DATA(211,3,193,248,115,107,92,157,139,115,203,28,191,46,184,10,38,230,59,207,155,246,82,89,235,213,168,182,143,168,200,249)
+IMAGE_DATA(249,146,35,140,28,102,135,169,37,78,62,179,248,128,45,174,218,57,198,54,87,189,117,166,255,204,92,189,153,159,22,199)
+IMAGE_DATA(180,206,230,86,184,170,122,181,166,166,198,141,223,118,112,181,227,165,47,112,21,189,193,10,10,75,197,112,239,81,51,92)
+IMAGE_DATA(173,114,244,43,243,182,76,239,5,85,114,31,146,231,106,71,219,42,115,225,19,156,24,177,68,106,12,131,163,12,87,167)
+IMAGE_DATA(68,175,146,220,36,228,255,34,47,73,184,153,180,69,184,170,190,87,205,69,210,188,37,236,23,29,25,183,81,76,231,199)
+IMAGE_DATA(168,142,85,198,42,79,93,157,203,239,139,76,219,230,106,99,53,112,28,250,84,89,106,251,119,37,15,41,218,244,244,181)
+IMAGE_DATA(247,105,29,141,55,166,42,90,53,116,185,79,147,106,237,169,195,80,245,235,170,97,222,184,204,75,21,91,96,230,183,5)
+IMAGE_DATA(251,234,76,145,255,59,220,233,55,168,108,29,60,105,158,159,15,216,206,223,69,28,213,102,170,240,113,184,99,35,13,23)
+IMAGE_DATA(253,24,107,49,23,134,89,171,221,134,206,166,87,134,197,177,97,59,209,245,19,235,185,216,215,103,120,52,245,31,21,33)
+IMAGE_DATA(179,202,161,91,109,159,240,168,201,137,52,134,181,235,184,153,243,36,182,58,116,82,50,61,219,99,52,253,248,231,79,209)
+IMAGE_DATA(200,59,30,166,104,214,156,107,224,255,189,237,51,204,210,207,210,49,214,172,141,129,159,230,117,216,39,45,251,184,240,22)
+IMAGE_DATA(214,204,218,182,57,240,227,150,174,253,40,157,253,212,227,212,214,115,8,157,31,52,134,186,246,14,161,209,51,205,220,213)
+IMAGE_DATA(73,252,221,234,132,190,250,206,252,114,157,9,7,191,176,209,174,81,172,173,179,40,34,113,5,173,219,178,159,138,10,13)
+IMAGE_DATA(219,240,61,54,186,213,24,120,139,239,184,205,86,155,177,240,233,194,119,172,166,124,213,109,61,142,247,219,186,85,159,77)
+IMAGE_DATA(193,241,2,249,185,21,14,219,29,179,124,64,154,179,132,223,207,214,202,110,221,141,197,84,91,71,219,177,92,141,3,171)
+IMAGE_DATA(207,218,219,239,193,222,150,101,77,189,95,205,171,214,209,234,186,59,39,238,6,125,33,218,251,124,244,79,242,206,126,109)
+IMAGE_DATA(175,103,131,221,27,201,191,71,210,245,61,13,97,232,185,175,125,15,189,159,221,94,127,68,177,19,77,210,167,191,166,174)
+IMAGE_DATA(86,102,230,98,238,237,95,222,190,113,79,36,28,83,158,222,168,199,146,154,204,154,99,182,22,20,22,51,183,235,223,147)
+IMAGE_DATA(94,237,232,203,244,225,127,233,140,63,248,129,243,11,74,156,231,121,195,86,225,104,177,250,205,42,125,247,161,18,167,182)
+IMAGE_DATA(213,241,95,185,218,214,137,37,77,142,94,202,204,89,40,134,62,174,208,170,152,99,106,98,155,204,204,212,237,70,163,166)
+IMAGE_DATA(24,127,44,76,243,127,113,92,185,138,253,170,43,193,81,101,166,250,108,213,188,243,195,177,15,241,82,112,84,107,114,176)
+IMAGE_DATA(132,223,23,199,189,126,93,245,237,234,58,204,238,247,96,247,81,194,186,221,47,73,243,145,220,188,37,199,239,235,230,245)
+IMAGE_DATA(78,54,253,7,135,58,253,24,80,255,34,122,212,154,59,227,158,55,217,87,67,163,124,181,185,234,173,53,85,166,138,86)
+IMAGE_DATA(101,158,118,31,26,39,166,26,213,203,82,31,47,227,133,167,186,4,95,97,216,182,207,239,202,188,5,87,251,141,12,167)
+IMAGE_DATA(126,96,43,235,214,193,227,98,104,216,132,217,98,195,39,198,209,72,102,43,234,88,130,88,67,162,39,196,31,95,30,78)
+IMAGE_DATA(63,250,201,111,104,252,109,15,83,36,235,206,13,204,210,211,129,143,50,83,63,75,245,1,159,17,59,38,246,41,106,116)
+IMAGE_DATA(237,19,116,60,208,159,179,46,107,3,239,163,51,143,125,159,218,6,141,163,146,94,67,233,149,129,161,252,183,94,64,49)
+IMAGE_DATA(41,27,248,57,102,1,61,211,125,186,204,173,249,67,247,25,244,244,43,83,121,57,205,237,11,220,185,127,132,248,78,162)
+IMAGE_DATA(147,215,210,171,7,10,169,184,168,194,241,201,148,187,218,21,154,21,12,245,154,126,231,241,189,6,55,37,94,90,102,52)
+IMAGE_DATA(46,174,1,123,31,52,47,62,83,217,172,239,197,182,205,209,252,130,82,49,221,6,67,213,142,228,151,73,62,189,250,130)
+IMAGE_DATA(212,111,140,107,170,208,186,246,108,223,177,106,110,47,247,109,211,99,170,119,213,71,141,165,237,95,118,107,127,60,166,186)
+IMAGE_DATA(91,77,152,94,233,243,77,187,122,214,201,7,67,142,52,114,53,80,147,164,181,190,88,199,62,53,233,69,232,24,242,192)
+IMAGE_DATA(112,220,182,246,206,83,211,99,248,92,239,177,99,141,77,166,247,161,181,172,58,90,195,231,55,178,126,109,54,125,28,152)
+IMAGE_DATA(133,103,216,206,158,61,47,118,198,217,62,119,238,130,28,211,62,194,56,95,123,6,235,182,215,112,172,162,242,40,235,213)
+IMAGE_DATA(58,58,201,219,167,78,157,114,106,100,47,184,159,15,211,237,243,231,47,10,123,245,190,219,241,250,112,190,244,255,214,228)
+IMAGE_DATA(45,53,182,203,85,179,52,108,181,239,55,224,106,137,115,141,107,28,22,251,112,143,64,255,245,209,211,178,196,198,76,159)
+IMAGE_DATA(39,177,86,232,85,104,70,176,212,181,164,205,110,238,81,212,156,237,174,65,107,34,135,200,230,167,104,90,199,116,159,47)
+IMAGE_DATA(175,104,131,203,75,245,231,234,185,202,107,104,97,188,199,174,61,245,246,72,210,26,84,155,161,246,28,55,61,39,40,204)
+IMAGE_DATA(244,75,210,222,14,126,185,72,78,158,146,59,123,28,189,141,116,70,170,211,219,119,144,51,43,85,185,42,51,221,156,218)
+IMAGE_DATA(82,155,171,118,92,213,238,229,235,206,157,25,105,249,126,135,197,11,83,209,35,65,249,104,115,84,247,169,78,85,235,58)
+IMAGE_DATA(100,22,189,60,56,86,76,245,171,158,255,242,208,120,234,53,52,146,217,26,74,125,70,68,80,223,17,97,52,112,100,4)
+IMAGE_DATA(13,26,19,43,124,133,118,29,62,41,145,255,173,102,246,121,191,49,179,232,233,23,6,211,19,79,252,55,77,13,124,152)
+IMAGE_DATA(102,6,62,66,91,153,161,45,1,159,163,90,177,71,93,171,11,4,103,189,172,245,241,246,184,104,218,143,243,242,126,106)
+IMAGE_DATA(249,198,79,137,70,207,160,53,47,247,167,190,163,227,248,111,111,184,138,249,112,127,232,54,149,121,58,157,126,223,109,26)
+IMAGE_DATA(91,136,31,91,225,19,134,127,122,118,234,90,202,206,247,49,13,223,111,243,125,54,76,244,249,99,124,207,144,250,93,55)
+IMAGE_DATA(156,53,44,85,174,250,252,199,85,238,53,35,204,115,244,168,106,83,44,241,51,177,60,146,91,68,121,249,37,134,167,188)
+IMAGE_DATA(180,247,195,242,243,121,127,158,217,86,254,170,206,197,58,174,69,252,222,120,175,238,55,159,87,230,119,205,218,62,39,93)
+IMAGE_DATA(183,45,47,191,216,53,252,238,237,157,99,251,171,108,51,207,217,62,179,53,191,154,151,241,154,27,102,155,157,35,109,255)
+IMAGE_DATA(77,245,89,229,70,239,215,247,169,46,183,181,186,106,116,53,173,131,82,78,35,206,165,76,62,214,192,154,186,209,44,193)
+IMAGE_DATA(94,244,222,135,174,0,39,47,92,186,72,167,90,79,75,237,12,106,104,242,242,242,40,59,59,155,14,31,62,236,103,216)
+IMAGE_DATA(151,159,95,40,60,109,70,95,127,103,217,130,250,87,103,169,118,26,57,80,204,116,93,215,158,135,58,159,188,227,245,225)
+IMAGE_DATA(124,105,124,21,215,14,174,183,235,175,163,10,151,157,234,35,19,182,242,61,162,216,98,109,113,177,121,182,134,95,112,100)
+IMAGE_DATA(72,134,212,22,106,13,63,252,193,38,166,106,177,213,137,163,74,190,17,52,108,42,152,106,244,44,180,170,114,21,75,195)
+IMAGE_DATA(73,95,172,85,25,233,205,45,82,63,174,158,131,247,234,204,55,240,86,253,187,194,212,8,255,62,14,222,254,14,94,230)
+IMAGE_DATA(106,158,146,244,31,12,93,238,214,158,138,15,152,89,10,166,66,175,186,53,51,232,213,224,204,150,209,57,52,202,86,59)
+IMAGE_DATA(239,183,61,166,250,124,193,153,237,206,158,177,107,97,140,255,55,137,217,154,232,248,117,125,26,212,187,13,142,218,6,158)
+IMAGE_DATA(74,79,93,39,223,199,203,91,232,195,158,67,166,83,159,97,225,212,123,216,76,234,61,52,76,214,225,27,30,56,38,74)
+IMAGE_DATA(250,1,15,159,60,151,70,6,167,81,175,17,81,244,212,115,3,233,135,223,249,15,10,103,13,26,18,240,8,237,98,134)
+IMAGE_DATA(158,12,252,34,85,5,124,158,142,6,126,206,181,26,139,177,181,204,83,31,103,109,214,126,138,237,33,106,249,254,175,137)
+IMAGE_DATA(38,68,81,114,231,126,52,104,124,170,244,208,143,78,221,64,189,71,37,210,211,93,67,232,169,174,83,197,108,174,34,222)
+IMAGE_DATA(138,30,76,83,162,22,83,98,250,70,42,40,41,119,88,84,44,236,48,223,105,223,115,163,124,151,45,158,218,185,123,202)
+IMAGE_DATA(81,173,63,213,124,3,93,26,95,114,153,251,25,54,91,193,68,101,106,110,94,49,229,28,41,148,125,88,215,253,106,216)
+IMAGE_DATA(103,24,90,33,219,56,142,207,209,207,83,166,234,231,98,91,175,209,155,49,81,143,131,165,106,55,58,223,203,207,119,227)
+IMAGE_DATA(168,254,29,244,57,163,130,53,109,37,98,209,21,254,44,180,205,230,162,205,210,235,248,235,124,78,21,252,221,149,181,126)
+IMAGE_DATA(241,237,246,120,218,94,125,49,120,9,205,128,165,26,152,42,102,105,91,104,82,240,21,254,92,244,19,6,87,209,243,1)
+IMAGE_DATA(125,131,17,67,109,207,112,236,56,179,24,125,253,145,195,4,173,219,100,49,21,44,85,158,98,9,166,130,185,208,172,232)
+IMAGE_DATA(205,132,60,169,142,254,76,31,222,151,234,85,92,83,184,222,244,58,181,175,53,59,159,163,196,241,253,218,241,85,229,42)
+IMAGE_DATA(142,225,190,135,123,237,176,224,57,194,86,48,21,38,254,88,230,166,114,85,243,119,213,31,44,251,28,238,130,163,110,204)
+IMAGE_DATA(212,97,170,250,128,189,57,187,202,83,175,169,142,181,181,44,246,187,58,52,114,53,77,8,247,231,166,246,240,181,107,83)
+IMAGE_DATA(237,254,131,90,43,163,126,96,55,215,215,89,106,127,7,233,227,224,104,85,173,153,81,158,186,92,149,126,189,89,215,153)
+IMAGE_DATA(178,212,203,85,95,45,77,138,63,87,69,151,38,57,185,70,198,183,171,92,84,126,42,59,149,159,134,167,179,196,186,12)
+IMAGE_DATA(140,149,26,80,233,173,107,113,22,251,186,246,157,46,181,51,61,7,207,164,30,131,167,81,143,65,51,168,199,144,153,212)
+IMAGE_DATA(139,25,11,255,240,224,241,179,249,223,151,38,246,202,144,48,250,93,167,190,244,163,111,60,65,209,204,196,41,204,214,87)
+IMAGE_DATA(153,167,13,1,95,166,242,128,199,196,42,121,187,42,240,11,194,217,170,128,127,113,24,107,56,235,101,109,45,107,214,134)
+IMAGE_DATA(128,79,210,233,159,253,129,104,114,44,77,127,182,175,104,212,49,211,51,41,42,101,189,212,216,60,249,242,100,135,171,83)
+IMAGE_DATA(196,192,86,248,132,17,107,237,57,34,158,66,162,151,80,198,162,173,148,87,84,236,104,191,18,231,249,177,196,225,107,185)
+IMAGE_DATA(21,231,168,188,78,183,234,115,164,79,219,26,126,152,115,124,166,251,52,231,79,117,41,88,169,166,218,212,222,182,121,171)
+IMAGE_DATA(220,84,61,171,60,181,117,175,250,147,245,92,47,59,149,139,94,206,254,45,184,122,35,190,234,223,5,230,227,227,245,60)
+IMAGE_DATA(189,25,87,109,141,42,231,85,214,250,49,245,189,114,21,62,102,220,215,188,92,61,230,112,213,158,19,7,83,230,162,159)
+IMAGE_DATA(48,122,40,213,215,215,11,95,111,100,56,126,226,196,9,225,170,50,85,242,137,49,19,199,226,169,109,224,48,122,41,190)
+IMAGE_DATA(246,218,107,244,214,91,111,117,228,57,125,136,95,248,191,69,222,146,50,213,126,6,86,31,23,238,45,246,115,189,230,73)
+IMAGE_DATA(230,59,57,31,226,7,46,52,207,234,232,21,59,100,98,170,220,107,193,86,228,47,77,138,88,110,242,118,29,110,74,76)
+IMAGE_DATA(213,210,167,118,172,85,152,154,108,242,131,109,255,175,205,85,111,253,11,52,168,189,68,238,174,247,28,229,173,230,35,65)
+IMAGE_DATA(175,218,92,245,50,212,238,157,100,199,83,149,173,96,169,205,83,201,63,66,239,65,39,7,24,189,7,149,177,202,86,151)
+IMAGE_DATA(177,147,124,189,7,53,174,106,207,153,241,239,171,239,155,61,99,207,29,87,190,218,113,84,229,170,248,118,7,198,136,102)
+IMAGE_DATA(179,57,169,252,52,22,235,114,213,152,57,167,115,255,104,177,23,251,69,210,75,125,66,168,91,223,96,122,185,95,48,117)
+IMAGE_DATA(237,63,153,94,25,48,141,94,25,52,157,186,51,99,161,93,7,140,153,197,207,9,41,98,221,6,78,163,255,249,67,47)
+IMAGE_DATA(250,201,87,190,75,49,172,59,67,2,63,73,7,2,31,163,234,128,175,82,9,51,181,52,224,75,204,214,47,58,6,198)
+IMAGE_DATA(170,125,222,240,22,154,54,224,11,126,154,182,38,240,51,116,242,151,157,137,255,227,104,216,51,189,105,192,132,84,225,42)
+IMAGE_DATA(242,150,58,245,152,65,191,125,113,34,253,111,151,201,194,215,223,189,20,204,203,16,241,9,67,179,66,219,78,155,189,130)
+IMAGE_DATA(86,174,223,199,236,42,112,180,94,185,171,45,117,29,251,189,241,80,245,209,192,164,150,85,184,89,46,12,240,213,160,85)
+IMAGE_DATA(58,254,95,195,26,229,30,142,41,51,113,46,184,153,157,83,224,50,212,102,107,123,122,213,246,3,219,199,109,255,175,250)
+IMAGE_DATA(148,109,158,222,72,163,218,199,255,150,92,181,121,106,115,213,248,120,255,223,184,42,189,59,42,107,175,211,188,239,157,171)
+IMAGE_DATA(204,78,139,169,38,14,219,62,87,177,94,85,85,45,188,108,58,113,82,226,165,208,175,232,165,4,22,98,233,53,48,184)
+IMAGE_DATA(201,97,170,154,250,129,109,158,66,171,194,234,248,62,11,22,227,189,208,173,240,9,119,188,62,156,47,91,175,170,47,88)
+IMAGE_DATA(99,80,122,223,208,251,141,253,252,46,247,16,39,87,67,216,90,82,45,247,148,137,50,215,36,153,6,241,189,22,108,69)
+IMAGE_DATA(110,240,196,240,101,18,51,181,227,171,96,170,151,171,202,84,155,179,222,250,82,91,131,218,51,101,220,121,226,209,107,40)
+IMAGE_DATA(36,198,191,70,70,143,183,215,215,193,219,139,16,172,69,252,84,123,39,97,221,205,81,114,214,165,246,116,250,98,99,78)
+IMAGE_DATA(253,169,114,117,196,212,133,146,255,59,114,218,34,49,108,107,31,66,152,91,71,195,60,85,211,120,170,214,168,42,91,237)
+IMAGE_DATA(216,170,250,127,53,111,201,87,179,122,61,87,187,13,158,37,6,182,42,71,189,92,85,189,10,51,60,141,52,117,42,125)
+IMAGE_DATA(194,153,169,209,38,167,182,111,8,117,233,51,145,94,236,61,65,236,229,190,83,168,91,255,169,212,109,192,20,234,62,112)
+IMAGE_DATA(58,245,27,21,67,3,199,39,201,255,55,142,253,230,247,61,232,231,95,248,22,115,245,81,154,202,154,243,80,32,180,234)
+IMAGE_DATA(191,82,33,107,214,162,128,175,49,95,191,194,246,37,49,112,182,140,247,151,5,126,81,76,121,171,86,193,239,175,186,253)
+IMAGE_DATA(139,116,226,233,158,172,87,103,211,43,204,85,212,24,33,206,16,153,184,150,158,236,18,76,191,126,126,60,253,79,231,73)
+IMAGE_DATA(204,214,73,194,87,216,239,94,154,34,254,96,248,76,166,199,173,164,45,59,14,59,207,140,21,86,156,211,63,206,161,172)
+IMAGE_DATA(44,180,158,19,237,248,135,57,86,230,176,180,210,121,182,60,234,94,47,186,31,186,19,124,212,207,83,126,130,171,170,87)
+IMAGE_DATA(15,103,231,187,250,212,214,173,122,92,125,189,122,220,214,172,202,100,95,252,181,212,101,164,239,57,225,250,248,170,110,255)
+IMAGE_DATA(35,244,170,198,78,171,110,192,214,191,23,87,189,108,189,49,87,155,28,166,26,31,176,61,231,28,190,93,212,229,52,55)
+IMAGE_DATA(55,211,133,11,23,232,202,149,43,82,159,211,158,225,216,137,19,77,194,209,102,103,118,186,55,182,106,115,21,203,163,71)
+IMAGE_DATA(107,164,46,7,189,250,161,89,209,59,177,35,198,250,225,124,217,117,54,234,39,211,251,141,174,107,236,201,119,191,41,247)
+IMAGE_DATA(139,179,10,111,75,77,109,193,248,208,121,114,159,29,192,247,91,232,152,9,225,139,105,66,216,82,63,141,234,101,170,205)
+IMAGE_DATA(81,123,93,89,107,251,127,125,53,166,235,252,114,120,181,14,102,18,235,80,24,244,40,124,189,168,159,177,243,124,131,163)
+IMAGE_DATA(214,240,239,211,126,95,95,101,167,240,19,90,53,116,185,203,81,93,74,94,210,212,133,46,55,237,222,190,90,139,10,19)
+IMAGE_DATA(158,134,24,206,186,49,87,43,231,215,155,255,107,207,169,81,179,251,64,216,254,95,179,158,42,121,191,118,254,146,114,245)
+IMAGE_DATA(149,33,241,146,195,164,92,149,94,9,30,95,176,79,175,70,187,76,69,30,237,179,61,103,210,243,189,195,100,187,115,239)
+IMAGE_DATA(201,194,211,206,189,130,232,133,158,227,233,165,158,147,168,75,111,214,174,125,38,81,215,126,33,50,179,109,208,216,68,26)
+IMAGE_DATA(48,46,158,94,234,53,129,126,249,187,174,244,139,71,191,65,177,129,255,66,211,3,254,133,14,7,126,149,249,249,13,42)
+IMAGE_DATA(96,205,154,199,92,197,18,140,197,178,136,25,91,100,113,86,89,91,42,218,246,49,102,238,103,168,242,238,175,81,243,11)
+IMAGE_DATA(67,168,109,28,63,15,60,211,143,127,206,28,121,78,155,57,107,25,253,230,133,32,225,170,207,38,8,99,127,251,98,176)
+IMAGE_DATA(104,214,145,33,115,105,234,172,229,180,239,80,177,251,29,86,78,217,218,77,243,150,108,189,169,75,173,109,85,125,171,126)
+IMAGE_DATA(27,163,113,43,220,207,209,156,34,124,190,190,15,236,84,157,138,245,67,135,243,92,134,42,103,189,126,96,101,167,157,183)
+IMAGE_DATA(100,107,89,91,231,106,14,86,123,140,108,47,31,201,61,55,223,177,191,34,190,250,110,92,45,229,191,161,29,95,253,107)
+IMAGE_DATA(184,106,247,79,150,247,87,252,191,114,181,209,195,213,227,110,158,146,225,171,143,173,208,176,136,155,98,6,58,180,42,184)
+IMAGE_DATA(169,190,218,246,236,79,127,250,139,112,181,201,225,169,109,94,174,42,91,43,43,143,74,220,22,243,117,48,7,0,159,223)
+IMAGE_DATA(193,213,15,219,203,196,204,17,58,175,175,63,230,106,84,125,126,207,47,44,144,103,241,226,226,26,97,166,30,211,251,75)
+IMAGE_DATA(89,89,189,159,15,13,218,181,162,162,94,230,134,161,111,107,255,113,137,194,87,112,53,40,116,137,176,81,117,106,212,156)
+IMAGE_DATA(157,254,57,76,86,108,213,203,85,188,207,102,169,235,203,117,108,162,163,61,133,169,145,198,191,11,211,88,169,196,83,29)
+IMAGE_DATA(190,226,220,32,228,31,133,47,119,243,143,188,220,148,245,208,101,110,222,175,171,79,29,127,175,221,235,193,237,237,224,204)
+IMAGE_DATA(156,17,237,170,60,157,130,227,139,29,253,234,240,118,138,47,255,119,200,196,121,238,220,55,47,103,189,58,213,174,175,241)
+IMAGE_DATA(229,45,165,58,61,31,146,156,94,14,9,194,84,228,48,245,26,145,236,243,7,59,230,243,255,70,187,179,73,59,15,98)
+IMAGE_DATA(93,58,48,138,25,26,73,207,245,10,23,166,194,164,86,165,215,12,122,238,149,241,244,98,143,241,244,124,247,137,244,92)
+IMAGE_DATA(143,113,194,215,23,123,77,18,13,251,82,159,201,212,119,88,172,228,232,246,29,61,139,158,235,62,150,254,251,127,95,162)
+IMAGE_DATA(39,63,241,85,10,103,46,134,177,102,205,9,248,38,229,221,246,117,58,18,248,56,29,97,221,154,23,240,56,229,242,58)
+IMAGE_DATA(24,107,56,107,88,107,56,251,53,199,190,34,186,182,152,185,92,241,208,247,168,181,251,104,122,109,68,24,61,211,121,184)
+IMAGE_DATA(196,23,48,63,29,177,134,223,118,14,162,255,121,158,217,250,236,56,250,85,167,177,244,171,231,130,232,55,207,7,11,87)
+IMAGE_DATA(161,87,71,132,100,81,88,220,10,58,148,91,32,61,193,74,240,189,46,50,44,200,43,242,229,253,248,226,29,149,110,13)
+IMAGE_DATA(171,97,103,169,235,239,197,186,214,209,40,139,81,163,170,220,3,11,149,197,202,209,35,185,133,178,52,235,70,167,42,51)
+IMAGE_DATA(115,142,20,184,218,86,121,137,124,224,130,130,10,63,93,170,49,86,229,169,215,79,108,199,88,219,243,251,182,199,85,181)
+IMAGE_DATA(119,203,251,53,12,45,189,165,220,165,27,199,87,235,222,133,169,245,14,87,125,117,191,254,122,181,246,61,115,245,70,126)
+IMAGE_DATA(224,6,15,87,85,159,54,30,107,114,242,151,124,126,224,194,194,98,170,174,174,150,249,55,232,243,240,110,253,153,222,126)
+IMAGE_DATA(187,77,226,165,94,158,186,75,103,70,122,139,197,86,112,21,179,213,225,63,238,224,234,135,251,5,174,226,251,165,207,223)
+IMAGE_DATA(230,26,52,207,225,200,69,210,154,60,245,53,149,150,214,81,73,73,173,147,167,84,233,250,128,81,215,94,84,84,69,211)
+IMAGE_DATA(99,23,73,95,217,126,99,19,88,95,36,154,58,86,139,171,94,126,122,227,172,110,175,8,173,171,137,103,174,206,222,200)
+IMAGE_DATA(218,99,131,24,98,167,83,98,252,123,245,130,163,193,204,206,96,39,23,41,200,210,163,118,253,140,221,135,208,59,171,205)
+IMAGE_DATA(237,215,43,230,235,239,107,115,213,213,159,162,85,151,248,235,86,199,76,223,135,133,126,199,134,78,117,122,65,76,153,239)
+IMAGE_DATA(171,97,109,71,179,218,185,74,3,199,207,149,190,74,152,129,234,181,190,163,83,252,234,87,237,126,75,218,63,9,218,181)
+IMAGE_DATA(235,144,56,215,236,60,37,89,87,182,178,86,133,239,23,26,245,217,30,51,164,38,20,177,203,103,122,76,163,103,187,49)
+IMAGE_DATA(75,187,143,99,190,78,16,174,66,187,130,167,224,42,76,234,91,199,196,179,110,141,161,231,186,142,166,255,252,77,103,122)
+IMAGE_DATA(250,161,47,83,104,192,23,40,50,224,243,204,210,111,51,83,191,69,135,153,175,135,3,191,206,156,85,251,87,62,246,117)
+IMAGE_DATA(135,181,95,243,51,229,108,126,192,231,168,252,83,255,78,23,251,5,83,253,128,201,244,236,75,99,104,200,164,185,210,195)
+IMAGE_DATA(107,88,112,170,232,213,223,188,48,145,126,249,236,120,182,177,162,89,177,13,159,112,167,190,161,82,87,155,60,103,35,51)
+IMAGE_DATA(42,159,121,90,78,57,249,69,148,3,191,43,116,161,147,39,160,49,85,212,185,32,63,0,223,99,237,129,34,241,13,39)
+IMAGE_DATA(182,161,117,52,90,19,162,207,147,202,64,245,217,168,150,212,220,34,229,169,198,68,149,177,202,91,101,173,92,111,252,59)
+IMAGE_DATA(28,57,226,171,193,209,247,40,71,109,14,219,126,224,155,177,244,175,225,170,177,235,185,122,171,126,224,246,152,218,158,94)
+IMAGE_DATA(149,218,218,178,42,135,169,85,98,174,239,183,226,250,124,98,157,127,112,171,92,69,157,131,151,171,110,92,213,98,170,212)
+IMAGE_DATA(169,178,161,143,254,173,114,21,199,108,189,170,76,109,118,242,150,148,171,167,218,225,42,98,172,29,92,253,112,190,244,191)
+IMAGE_DATA(19,62,13,248,74,76,172,168,208,185,230,202,229,158,34,252,20,95,175,94,115,21,194,85,97,171,230,121,56,247,35,212)
+IMAGE_DATA(175,98,125,106,244,2,234,61,42,158,53,107,188,112,21,245,134,240,3,35,62,170,126,94,233,181,148,188,221,229,172,241)
+IMAGE_DATA(11,111,115,122,27,154,62,248,237,245,27,180,243,148,220,252,35,39,151,215,174,53,13,82,61,234,204,60,245,214,167,234)
+IMAGE_DATA(113,91,143,122,205,203,84,95,207,65,195,86,205,3,22,211,222,191,142,143,24,231,72,222,146,219,103,105,129,203,80,123)
+IMAGE_DATA(105,56,155,101,205,37,207,112,249,218,215,233,169,4,67,46,176,154,27,103,29,149,44,124,85,166,42,79,213,186,141,96)
+IMAGE_DATA(174,14,143,243,171,155,177,125,193,26,115,69,28,21,62,223,231,122,133,154,62,11,175,152,58,149,78,221,67,232,143,47)
+IMAGE_DATA(141,22,94,130,175,240,3,187,92,237,29,76,47,245,157,196,191,67,172,252,31,247,26,17,77,157,94,26,73,255,241,127)
+IMAGE_DATA(158,161,231,63,250,37,154,198,92,141,9,248,50,101,7,124,143,14,6,252,27,237,119,236,96,192,183,120,249,45,94,126)
+IMAGE_DATA(195,176,246,58,222,26,214,194,178,3,63,71,101,95,254,21,93,27,17,78,251,123,140,161,46,189,66,104,200,228,116,154)
+IMAGE_DATA(49,107,37,13,159,156,74,93,250,207,164,110,131,162,232,229,1,17,244,202,144,72,225,59,12,62,146,224,152,165,20,150)
+IMAGE_DATA(176,156,230,47,219,41,124,44,47,175,51,189,4,225,83,101,62,21,59,49,76,237,233,160,49,82,155,45,162,93,157,216)
+IMAGE_DATA(134,234,42,245,7,171,158,84,254,105,44,214,206,235,197,57,234,239,85,95,175,154,198,85,113,220,221,102,166,102,103,23)
+IMAGE_DATA(249,229,5,183,167,91,213,127,172,108,244,114,242,102,92,189,145,239,248,86,184,122,235,122,245,230,53,54,202,213,119,211)
+IMAGE_DATA(171,237,213,173,190,215,124,96,95,173,141,137,173,218,108,245,203,91,226,253,234,7,190,21,174,34,126,230,214,217,180,227)
+IMAGE_DATA(3,246,50,245,148,51,175,21,92,69,45,79,7,87,63,220,47,201,91,226,231,58,173,23,119,251,167,58,190,95,176,82)
+IMAGE_DATA(159,207,141,86,229,107,161,204,240,22,250,212,248,137,235,100,29,231,206,136,158,47,122,85,185,58,118,198,124,225,42,252)
+IMAGE_DATA(184,90,139,170,218,213,112,117,171,219,31,9,102,230,202,108,186,174,175,146,93,131,42,189,146,162,76,172,20,62,94,53)
+IMAGE_DATA(232,214,241,225,43,140,57,126,94,104,87,93,170,143,88,53,173,237,7,86,70,218,76,213,90,26,191,250,153,96,211,35)
+IMAGE_DATA(73,181,40,114,151,70,106,207,223,105,182,31,120,129,187,62,116,50,250,68,24,27,62,121,161,108,219,57,75,118,253,170)
+IMAGE_DATA(198,88,237,249,168,240,7,187,245,171,208,170,78,207,124,187,214,70,183,177,110,247,78,66,63,66,232,213,110,67,227,197)
+IMAGE_DATA(76,158,82,140,228,252,190,208,207,241,1,247,9,51,26,213,209,170,226,7,126,101,34,253,161,203,40,122,166,203,8,122)
+IMAGE_DATA(238,229,177,226,231,125,161,199,4,234,220,115,162,248,130,145,167,212,111,204,108,201,91,2,87,159,233,50,140,158,248,175)
+IMAGE_DATA(223,81,183,187,190,68,65,172,85,227,88,123,30,14,252,1,237,99,182,190,26,240,93,182,111,211,94,182,125,1,223,161)
+IMAGE_DATA(125,129,254,172,133,29,226,125,54,107,15,5,126,145,138,30,127,138,222,26,55,139,150,191,52,130,186,15,137,161,225,83)
+IMAGE_DATA(210,41,52,126,21,77,139,94,76,83,34,49,91,125,62,77,139,88,200,223,57,182,216,165,226,247,141,76,92,77,177,105)
+IMAGE_DATA(107,41,46,99,35,37,205,223,78,25,203,118,208,218,45,57,180,103,111,62,229,231,49,127,10,76,127,4,248,105,177,52)
+IMAGE_DATA(207,138,53,18,195,0,127,37,222,234,48,216,142,185,66,131,185,125,35,248,124,213,141,216,86,70,106,126,159,157,151,164)
+IMAGE_DATA(236,84,157,170,60,134,191,7,190,95,249,57,5,21,174,97,95,110,174,175,143,5,206,135,174,85,190,170,22,206,205,43)
+IMAGE_DATA(106,55,39,233,86,253,192,127,13,87,111,189,206,166,125,174,122,249,120,179,188,165,246,222,171,44,125,47,122,21,252,212)
+IMAGE_DATA(30,78,62,158,106,253,234,73,55,190,10,189,138,188,34,196,87,111,214,239,23,199,52,111,169,233,36,107,213,166,214,235)
+IMAGE_DATA(250,66,120,185,90,85,85,213,225,7,254,39,121,225,255,181,182,190,206,248,125,157,58,84,19,99,114,174,165,34,147,171)
+IMAGE_DATA(4,158,10,63,237,222,134,124,110,81,81,181,163,97,107,228,186,143,73,90,38,115,68,192,85,248,130,209,115,105,252,204)
+IMAGE_DATA(197,194,66,233,213,144,176,197,229,171,55,79,73,89,107,247,132,176,215,149,173,194,85,199,239,59,89,249,234,244,115,112)
+IMAGE_DATA(115,145,66,125,121,73,90,47,163,57,74,178,14,95,113,152,137,181,142,227,237,49,58,51,213,202,3,86,173,234,99,170)
+IMAGE_DATA(143,141,170,91,53,118,106,231,0,107,15,96,175,78,53,251,84,163,94,223,3,66,125,192,215,207,129,75,243,235,9,33)
+IMAGE_DATA(49,85,176,149,173,215,200,4,215,80,179,249,202,208,89,206,172,180,40,49,232,185,46,253,194,92,123,190,215,116,122,166)
+IMAGE_DATA(71,8,61,211,53,136,254,248,242,120,177,63,188,52,142,126,255,226,24,250,125,151,209,244,199,174,227,232,153,110,227,101)
+IMAGE_DATA(9,174,254,241,229,145,212,137,247,119,234,58,150,158,239,30,228,199,213,254,99,227,68,31,246,28,30,201,239,31,66,223)
+IMAGE_DATA(251,143,95,81,239,59,30,163,81,129,95,160,196,192,199,233,96,224,15,105,87,224,247,105,87,192,247,105,119,0,150,223)
+IMAGE_DATA(113,25,171,156,53,172,253,150,135,179,223,160,3,172,119,75,190,255,60,181,5,167,80,194,115,131,169,215,240,217,210,103)
+IMAGE_DATA(4,220,4,79,131,195,211,133,173,147,35,178,100,137,248,67,232,236,229,20,30,191,146,98,82,215,80,76,250,122,138,207)
+IMAGE_DATA(220,68,201,243,55,82,202,130,109,52,119,201,14,202,90,177,135,86,111,201,166,93,251,89,55,242,247,93,123,225,227,187)
+IMAGE_DATA(140,120,169,183,78,91,115,154,180,102,70,115,150,52,135,15,251,245,60,155,195,96,233,193,67,185,126,254,94,228,45,41)
+IMAGE_DATA(111,117,169,57,192,170,65,53,103,202,91,131,227,173,199,241,229,54,249,216,167,241,27,95,221,235,187,251,129,255,190,245)
+IMAGE_DATA(171,55,215,172,50,115,207,237,173,124,125,238,146,230,63,233,123,110,164,89,111,37,190,10,45,138,254,74,54,87,189,53)
+IMAGE_DATA(54,96,36,122,40,217,92,125,247,248,234,219,166,198,134,173,165,249,140,112,245,58,205,106,245,132,128,41,87,59,252,192)
+IMAGE_DATA(31,254,23,226,171,218,111,201,248,126,141,191,203,244,94,50,113,35,60,199,171,79,204,112,215,196,82,253,98,173,136,69)
+IMAGE_DATA(21,150,83,218,130,141,226,143,83,174,66,175,142,11,93,44,126,91,241,233,198,109,242,245,66,242,214,172,38,109,163,208)
+IMAGE_DATA(68,179,156,9,63,176,195,85,91,187,78,227,207,152,50,203,196,88,85,175,78,140,50,54,33,210,232,213,113,97,203,253)
+IMAGE_DATA(150,234,243,133,185,235,122,140,13,239,11,138,240,213,215,168,95,23,190,92,187,70,198,238,231,11,102,218,108,213,120,170)
+IMAGE_DATA(209,175,206,123,167,204,147,190,75,232,17,129,222,250,35,167,206,147,124,154,97,147,51,248,51,210,36,78,168,125,21,144)
+IMAGE_DATA(59,13,70,65,255,245,71,108,122,204,44,234,63,58,86,106,89,96,125,70,68,81,175,97,17,212,115,104,56,117,31,28)
+IMAGE_DATA(42,117,46,82,243,226,216,75,253,166,208,139,125,130,169,115,239,73,98,207,247,68,76,52,136,158,237,62,158,58,189,50)
+IMAGE_DATA(206,181,63,118,29,67,79,191,52,138,158,122,97,36,253,238,185,225,244,100,167,33,244,212,179,67,233,201,231,135,241,190)
+IMAGE_DATA(225,244,244,139,35,133,167,186,132,47,88,185,138,207,195,103,195,15,220,109,224,12,254,93,19,36,151,8,191,215,147,47)
+IMAGE_DATA(12,160,239,253,240,23,52,48,240,75,52,132,185,154,34,156,252,49,109,11,124,130,182,7,192,190,79,59,29,219,109,153)
+IMAGE_DATA(225,236,119,253,52,237,94,102,235,190,128,175,83,201,79,186,81,27,98,170,157,6,242,119,41,137,198,132,100,210,236,57)
+IMAGE_DATA(252,255,31,150,73,19,67,211,105,114,248,124,154,18,177,64,114,229,166,197,44,52,92,77,100,205,154,188,138,102,205,89)
+IMAGE_DATA(39,231,38,100,108,161,148,249,59,100,86,220,220,101,219,133,173,75,214,28,160,101,107,114,104,197,250,131,180,109,87,142)
+IMAGE_DATA(196,93,181,215,24,190,239,149,149,13,242,157,215,37,190,235,154,3,12,157,152,115,36,175,221,218,28,229,154,201,105,42)
+IMAGE_DATA(117,117,170,250,112,149,177,202,89,240,215,191,6,199,236,179,185,170,26,85,207,211,124,37,173,189,209,158,132,90,151,107)
+IMAGE_DATA(247,145,240,217,187,113,213,91,119,244,222,250,44,93,207,85,255,89,182,58,43,222,54,157,33,47,190,2,196,185,157,101)
+IMAGE_DATA(105,137,175,255,70,25,124,102,37,38,207,184,204,153,127,96,231,254,122,243,128,193,81,175,85,243,207,64,255,94,24,250)
+IMAGE_DATA(227,235,18,245,15,88,162,158,20,235,53,56,198,86,81,81,69,213,213,181,162,93,193,68,237,29,172,134,30,191,246,58)
+IMAGE_DATA(88,124,204,233,39,33,121,199,154,127,236,44,213,244,56,152,90,81,81,209,225,7,254,39,120,105,253,170,196,136,28,109)
+IMAGE_DATA(106,174,189,34,241,75,9,71,153,159,240,253,202,243,123,177,169,175,145,109,55,254,90,110,180,107,97,37,165,206,219,40)
+IMAGE_DATA(92,80,174,34,111,9,92,69,44,84,114,122,99,215,75,30,146,173,71,189,186,212,91,99,99,115,21,92,198,251,101,110)
+IMAGE_DATA(155,147,223,59,193,234,57,168,57,73,234,231,149,222,15,142,225,124,141,205,98,22,220,212,217,171,249,243,214,48,203,215)
+IMAGE_DATA(139,205,136,95,107,230,239,196,172,144,30,81,210,211,66,108,177,24,102,10,96,166,44,108,106,212,34,241,71,78,143,89)
+IMAGE_DATA(34,134,117,236,11,137,92,40,54,57,114,1,77,12,203,162,160,153,25,52,110,122,26,5,205,152,67,19,102,206,149,245)
+IMAGE_DATA(209,33,201,204,8,99,163,130,147,105,196,196,68,26,22,20,79,67,199,199,73,239,221,129,99,163,153,169,145,98,232,121)
+IMAGE_DATA(223,119,100,56,245,30,30,206,252,10,99,174,134,74,207,163,238,131,103,72,143,6,24,122,50,120,185,10,159,45,242,121)
+IMAGE_DATA(93,235,62,150,158,125,101,12,61,243,242,24,97,229,239,59,143,16,150,62,249,236,32,250,223,231,6,209,83,157,135,178)
+IMAGE_DATA(94,29,206,218,117,132,240,84,151,56,247,153,174,163,36,198,10,174,190,208,203,228,44,129,237,152,195,54,116,82,138,176)
+IMAGE_DATA(30,92,253,193,247,254,139,134,177,206,28,196,108,77,99,109,186,39,224,39,180,137,217,186,69,236,135,180,53,240,71,180)
+IMAGE_DATA(45,224,71,22,107,253,121,187,51,224,123,204,218,239,210,238,192,111,203,178,240,151,125,88,175,102,209,160,167,251,74,142)
+IMAGE_DATA(249,168,144,121,210,19,2,12,133,223,23,127,119,213,168,51,227,150,139,143,56,58,117,29,205,154,203,60,101,173,154,144)
+IMAGE_DATA(181,153,146,230,239,164,180,133,187,40,109,209,54,74,91,188,147,230,44,218,77,233,139,118,82,230,138,189,180,114,227,97)
+IMAGE_DATA(218,180,227,48,21,151,213,93,215,39,24,49,13,232,82,176,21,223,117,236,7,47,177,15,108,5,231,52,247,73,245,38)
+IMAGE_DATA(24,134,253,190,58,28,163,61,241,254,170,170,99,174,207,24,252,4,251,180,159,138,228,77,57,62,100,187,190,6,251,133)
+IMAGE_DATA(233,142,127,88,183,165,103,104,161,79,63,27,70,250,222,111,127,142,151,173,152,193,130,107,219,167,81,75,218,225,105,169)
+IMAGE_DATA(197,79,91,191,87,90,253,76,181,175,111,181,95,94,111,123,28,181,121,10,171,198,220,28,62,247,192,129,67,108,7,232)
+IMAGE_DATA(208,161,67,78,223,221,35,210,123,215,244,228,205,177,182,143,80,110,110,190,232,211,218,186,227,204,192,70,89,170,213,213)
+IMAGE_DATA(159,112,173,190,225,164,88,29,159,131,207,223,191,255,160,124,182,249,25,252,12,149,147,227,254,12,247,103,229,100,83,110)
+IMAGE_DATA(126,158,155,191,132,126,191,96,38,150,246,186,234,83,233,177,196,219,151,46,189,70,173,173,103,165,255,18,106,95,181,159)
+IMAGE_DATA(112,78,78,174,252,76,251,103,29,57,114,68,252,204,136,223,162,62,182,163,126,245,195,253,2,87,17,103,240,245,29,45)
+IMAGE_DATA(22,127,8,174,61,201,217,40,59,38,38,122,181,168,202,141,41,225,94,129,125,122,205,98,189,156,247,129,171,253,28,166)
+IMAGE_DATA(42,87,199,206,92,36,76,67,62,47,152,8,77,138,24,42,98,169,152,231,22,147,190,83,150,241,243,118,83,234,146,3)
+IMAGE_DATA(148,180,112,47,165,44,222,75,25,43,15,83,250,138,131,52,103,217,126,202,90,157,77,243,214,28,225,237,67,198,120,95)
+IMAGE_DATA(234,146,189,148,182,116,159,156,147,201,150,177,252,0,101,173,60,68,243,86,29,230,229,1,222,183,223,93,226,62,58,127)
+IMAGE_DATA(245,1,177,121,171,204,118,198,242,87,105,238,82,190,207,46,219,67,115,150,236,162,212,69,59,40,113,222,22,154,157,190)
+IMAGE_DATA(129,98,83,215,83,20,235,30,204,25,83,139,76,90,233,238,11,141,95,38,54,51,110,169,187,156,62,139,217,202,247,124)
+IMAGE_DATA(24,116,212,164,176,12,209,85,224,41,184,58,158,153,58,110,90,42,141,181,108,116,72,42,141,8,78,162,97,19,19,164)
+IMAGE_DATA(223,238,224,241,177,52,136,217,10,190,162,199,253,128,81,209,212,119,120,132,244,55,130,245,26,18,42,125,5,97,208,172)
+IMAGE_DATA(232,47,216,125,144,233,213,128,190,72,200,43,130,193,95,171,76,85,205,250,76,183,177,126,76,253,221,115,67,69,171,130)
+IMAGE_DATA(171,191,123,126,48,115,117,164,112,87,253,191,208,182,120,15,120,172,92,133,14,70,189,13,250,1,163,70,20,92,237,49)
+IMAGE_DATA(36,140,249,220,143,126,240,173,159,209,168,128,175,209,160,128,175,208,28,102,231,158,128,159,210,250,192,127,167,141,1,255)
+IMAGE_DATA(193,124,253,119,97,172,26,56,43,172,13,248,129,152,173,107,183,7,126,143,118,222,246,4,21,63,61,148,185,58,159,186)
+IMAGE_DATA(255,190,175,232,85,204,47,8,14,95,68,51,102,47,227,103,155,101,252,156,179,132,159,127,22,139,225,185,71,122,144,68)
+IMAGE_DATA(44,113,158,137,120,31,63,235,96,158,28,114,136,167,196,44,165,201,120,15,219,148,216,197,204,231,53,148,190,116,39,237)
+IMAGE_DATA(207,65,142,102,35,85,148,215,72,92,53,63,207,124,255,77,190,111,137,235,175,209,28,189,202,202,70,159,239,198,121,166)
+IMAGE_DATA(84,191,175,214,195,24,61,106,182,181,167,62,98,166,194,71,230,165,28,227,109,195,219,227,82,179,166,204,196,103,75,110)
+IMAGE_DATA(131,195,78,53,228,49,232,62,124,142,230,61,168,158,245,213,230,58,76,69,205,78,126,185,31,87,141,78,45,22,243,231)
+IMAGE_DATA(170,55,150,122,35,174,90,243,105,219,153,3,116,51,157,106,179,21,92,61,116,40,91,216,3,30,21,20,240,115,10,126)
+IMAGE_DATA(110,113,177,107,69,69,5,98,37,37,37,114,204,248,120,27,89,119,158,240,99,171,151,171,178,228,253,7,15,30,118,63)
+IMAGE_DATA(31,76,51,159,233,223,231,87,127,86,73,89,169,53,195,166,197,143,171,182,105,158,18,124,185,231,207,159,151,30,15,13)
+IMAGE_DATA(13,13,226,227,45,43,43,243,251,253,221,207,230,223,31,134,188,37,156,139,185,55,168,143,69,191,165,14,174,126,184,94)
+IMAGE_DATA(109,109,38,38,47,92,229,239,162,244,121,41,170,118,235,205,75,225,19,46,53,51,171,124,241,36,124,55,235,40,175,168)
+IMAGE_DATA(134,14,28,169,224,123,82,37,29,204,229,245,220,58,58,152,87,79,7,242,26,104,237,142,66,154,183,114,31,45,219,148)
+IMAGE_DATA(43,182,102,71,177,216,134,61,229,98,155,247,86,210,142,67,181,180,245,112,53,237,200,62,74,175,102,215,208,158,35,245)
+IMAGE_DATA(180,235,72,13,237,205,175,163,67,133,199,104,79,94,29,237,206,105,160,87,115,27,248,88,45,31,171,227,115,107,104,219)
+IMAGE_DATA(161,163,180,105,95,57,173,219,85,78,107,183,151,210,154,237,69,180,122,91,33,173,216,156,71,43,183,228,211,170,173,5)
+IMAGE_DATA(178,190,116,67,14,45,94,159,45,182,112,237,33,90,176,230,32,45,90,119,88,182,177,148,125,204,215,44,102,43,44,115)
+IMAGE_DATA(217,62,209,49,169,11,118,82,82,214,54,138,155,187,137,98,231,108,160,152,52,102,107,202,90,138,72,90,45,190,69,137)
+IMAGE_DATA(219,177,69,167,172,230,125,43,37,231,20,185,50,48,232,38,244,43,152,22,187,132,66,162,23,137,143,114,82,120,38,107)
+IMAGE_DATA(214,12,154,192,108,85,166,130,175,182,129,173,163,166,36,49,91,19,100,182,233,144,113,179,105,72,80,156,244,222,29,56)
+IMAGE_DATA(54,150,53,43,115,117,100,36,235,213,80,233,203,219,115,40,122,244,78,103,174,130,177,225,46,99,85,179,170,65,83,62)
+IMAGE_DATA(239,212,198,128,187,48,244,34,196,178,255,48,103,62,205,152,40,225,247,16,102,57,52,243,216,144,52,154,48,35,131,166)
+IMAGE_DATA(68,45,100,126,101,138,46,12,227,103,6,88,76,218,90,214,130,107,68,15,226,111,50,49,106,177,196,206,135,76,74,163)
+IMAGE_DATA(174,3,166,210,147,157,250,208,143,191,246,35,26,21,248,45,26,16,240,85,202,2,75,3,127,78,107,3,254,147,237,167)
+IMAGE_DATA(98,235,216,54,240,254,117,108,27,152,173,106,96,238,22,75,215,110,102,173,187,237,158,159,81,201,11,147,232,234,196,76)
+IMAGE_DATA(122,254,217,1,212,111,124,50,63,103,164,82,255,137,105,52,56,104,46,13,24,159,66,131,38,164,81,255,113,201,78,158)
+IMAGE_DATA(92,162,172,247,31,151,74,3,131,230,240,177,185,206,220,131,185,98,67,131,211,141,255,125,74,166,204,133,64,143,67,248)
+IMAGE_DATA(135,115,11,42,157,248,164,97,77,113,105,3,85,86,212,75,30,147,169,107,49,177,85,157,55,163,252,192,18,231,155,222)
+IMAGE_DATA(193,85,142,159,183,192,241,203,150,50,51,10,36,191,87,107,113,246,31,200,161,3,7,115,76,175,136,60,195,58,176,21)
+IMAGE_DATA(121,192,154,135,164,179,109,96,110,206,96,129,191,30,214,124,38,253,125,148,167,237,213,182,94,175,93,75,29,174,250,199)
+IMAGE_DATA(86,13,87,75,111,224,255,173,252,171,184,122,35,190,42,87,113,12,204,3,79,225,31,69,125,139,246,221,109,207,208,171)
+IMAGE_DATA(8,58,87,153,218,158,102,85,166,194,176,15,159,159,159,159,47,188,131,78,68,47,165,27,247,251,61,38,90,213,157,13)
+IMAGE_DATA(231,216,73,107,54,156,173,87,141,174,61,41,124,213,158,194,218,87,184,61,3,79,113,46,98,183,23,47,94,164,55,222)
+IMAGE_DATA(120,67,226,183,29,92,253,112,190,222,121,231,47,166,206,166,160,214,185,190,11,76,253,65,89,157,60,35,227,89,26,113)
+IMAGE_DATA(143,34,190,46,37,15,152,159,153,179,150,109,119,57,185,233,213,10,218,178,207,103,96,223,118,230,38,56,8,115,153,200)
+IMAGE_DATA(182,133,143,201,113,48,213,57,103,103,78,181,176,115,31,159,183,55,239,24,237,47,56,70,135,139,26,29,166,214,139,97)
+IMAGE_DATA(125,103,14,179,248,96,21,109,222,87,69,155,246,30,165,245,187,203,152,175,165,194,236,213,224,171,99,43,153,173,75,55)
+IMAGE_DATA(30,161,37,204,80,24,24,171,182,140,247,195,176,190,104,253,65,209,174,89,252,12,0,221,10,189,154,178,112,187,232,85)
+IMAGE_DATA(228,146,194,151,56,107,238,122,230,235,58,97,138,154,110,71,57,108,13,103,182,134,178,86,157,57,123,137,216,180,216,69)
+IMAGE_DATA(204,213,5,162,87,97,193,97,243,104,226,204,76,10,154,158,78,227,166,206,17,3,187,160,99,109,13,43,62,225,201,137)
+IMAGE_DATA(52,146,249,58,154,57,139,99,56,71,77,57,135,159,133,159,25,147,186,234,255,178,247,30,208,113,158,215,153,255,32,217)
+IMAGE_DATA(179,155,253,239,102,147,236,63,137,19,199,177,19,39,177,236,56,46,178,29,91,146,101,89,205,150,68,81,18,41,137,69)
+IMAGE_DATA(162,72,177,55,177,247,222,123,239,36,216,123,239,189,162,144,68,31,0,3,96,208,123,103,151,100,41,62,73,108,249,238)
+IMAGE_DATA(251,60,239,119,191,121,103,0,74,84,98,111,228,44,230,156,171,111,26,6,0,133,153,223,247,220,242,92,163,159,247,203)
+IMAGE_DATA(178,120,112,254,32,111,175,222,122,82,86,110,62,46,235,119,158,101,222,115,237,246,211,178,209,252,94,248,61,119,28,181)
+IMAGE_DATA(26,125,147,209,231,241,200,135,154,88,111,126,95,4,126,239,181,59,206,121,113,193,232,246,75,236,165,93,185,229,12,99)
+IMAGE_DATA(249,166,83,12,236,145,89,176,230,168,204,90,138,89,166,221,50,118,214,78,250,85,130,227,207,191,210,75,126,240,229,239)
+IMAGE_DATA(202,152,192,55,140,94,253,170,108,131,86,13,60,37,7,3,79,200,97,19,71,226,126,100,142,143,147,179,71,226,148,179)
+IMAGE_DATA(150,177,39,3,143,57,140,197,241,97,57,255,135,207,72,81,143,89,210,48,118,157,188,254,198,112,50,19,188,236,59,118)
+IMAGE_DATA(181,244,69,255,51,103,185,214,178,119,11,253,90,56,226,118,127,243,124,4,184,11,159,126,203,211,141,100,170,114,21,59)
+IMAGE_DATA(12,231,173,58,44,219,246,93,52,231,136,217,100,13,250,3,10,195,117,18,46,170,51,159,241,13,82,92,212,96,123,13)
+IMAGE_DATA(178,213,207,211,234,61,240,12,247,107,13,21,125,197,154,47,86,111,137,226,226,106,178,17,249,94,104,83,221,99,131,175)
+IMAGE_DATA(135,150,101,142,217,104,82,188,223,146,146,83,201,220,107,215,178,34,92,12,134,163,250,155,172,62,45,246,53,40,190,30)
+IMAGE_DATA(28,214,217,55,213,210,204,41,7,85,151,70,184,26,221,203,244,217,224,42,174,67,71,130,121,224,14,114,163,240,227,133)
+IMAGE_DATA(23,111,108,192,79,23,53,74,178,180,172,238,129,185,138,215,71,126,150,158,191,245,245,212,137,173,249,252,34,208,95,84)
+IMAGE_DATA(235,238,92,125,0,174,162,199,9,44,197,107,99,54,71,189,132,239,23,240,70,124,239,189,247,232,131,8,173,218,182,207)
+IMAGE_DATA(230,63,235,229,35,246,45,149,148,154,115,199,140,84,190,111,243,66,85,146,159,87,47,89,161,6,201,203,109,32,91,131)
+IMAGE_DATA(193,28,219,151,20,50,231,244,121,97,25,61,117,157,172,220,126,142,92,61,153,152,47,39,18,242,12,235,10,229,108,114)
+IMAGE_DATA(49,3,204,188,152,82,206,32,63,113,52,1,46,158,185,90,200,56,119,181,68,206,95,51,156,77,43,150,203,70,243,38)
+IMAGE_DATA(27,141,10,189,123,53,183,70,50,242,107,229,122,176,218,231,42,120,75,174,154,175,57,99,94,31,129,239,119,210,48,29)
+IMAGE_DATA(108,213,0,99,15,25,253,234,179,21,44,53,154,121,191,209,176,7,78,167,51,246,159,2,95,141,150,61,97,117,44,114)
+IMAGE_DATA(194,177,92,93,233,213,230,192,87,228,132,153,23,54,60,197,252,6,251,97,12,111,17,184,238,6,238,91,97,158,187,18)
+IMAGE_DATA(51,30,219,78,145,107,26,224,220,230,221,23,100,243,62,195,185,67,137,178,243,72,162,236,58,154,100,24,127,205,104,237)
+IMAGE_DATA(52,163,181,51,141,246,206,242,143,184,79,227,192,233,84,255,231,222,123,34,197,156,47,92,231,17,247,225,250,174,163,134)
+IMAGE_DATA(155,135,147,168,189,145,43,216,188,55,81,54,238,190,66,70,130,139,43,54,159,246,184,120,140,92,156,191,250,8,143,115)
+IMAGE_DATA(86,28,100,192,71,119,54,230,87,140,134,155,181,226,16,99,198,178,3,94,254,52,18,154,107,213,220,62,2,253,86,232)
+IMAGE_DATA(15,254,201,203,111,203,163,95,248,142,209,171,223,50,92,253,154,225,234,147,114,40,240,172,236,53,71,196,1,195,216,3)
+IMAGE_DATA(70,191,30,12,252,152,172,181,188,125,60,194,90,195,86,234,218,184,71,205,125,223,145,243,159,123,81,42,251,47,145,228)
+IMAGE_DATA(254,115,217,39,5,78,194,43,99,224,120,163,81,225,61,229,49,20,199,190,163,215,48,112,27,122,213,106,214,245,173,114)
+IMAGE_DATA(117,228,180,173,50,97,222,46,158,35,236,51,255,254,145,253,229,37,230,115,178,81,242,194,150,143,224,106,145,97,172,157)
+IMAGE_DATA(41,11,243,136,115,76,232,81,232,82,219,167,148,71,118,234,28,26,142,58,247,170,61,79,118,6,199,122,67,104,14,217)
+IMAGE_DATA(206,205,70,242,200,234,181,4,237,105,243,192,149,230,253,86,97,115,199,158,103,4,53,44,251,3,203,36,39,167,204,206)
+IMAGE_DATA(229,56,186,84,103,104,91,178,52,223,209,179,182,111,34,214,23,226,63,138,171,208,170,208,145,224,18,152,131,30,92,232)
+IMAGE_DATA(56,55,176,83,13,71,244,17,185,57,224,7,225,42,94,31,249,89,188,62,114,182,120,253,214,188,126,241,250,168,149,126)
+IMAGE_DATA(26,189,138,199,112,78,0,173,171,26,244,126,175,175,223,3,191,11,122,149,148,169,109,90,245,63,235,229,35,246,139,87)
+IMAGE_DATA(86,52,240,253,154,159,87,45,225,112,13,217,154,87,80,103,103,224,211,67,146,155,83,37,89,57,197,182,55,201,188,167)
+IMAGE_DATA(22,173,58,192,28,228,161,51,57,70,175,230,203,201,43,121,204,239,130,117,208,147,224,230,249,107,165,150,169,215,75,168)
+IMAGE_DATA(75,161,81,161,85,99,217,10,222,94,204,52,122,53,88,193,28,240,245,80,13,35,45,84,107,56,91,77,166,38,102,86)
+IMAGE_DATA(200,229,180,114,57,103,94,147,108,189,106,25,126,198,124,47,124,223,147,208,206,151,243,253,227,177,139,161,40,198,34,87)
+IMAGE_DATA(140,252,244,177,139,57,60,30,57,31,52,1,126,101,24,142,165,27,118,101,144,185,224,22,88,133,176,172,75,103,224,185)
+IMAGE_DATA(71,47,100,153,175,15,154,215,207,49,223,39,87,206,37,229,201,249,228,124,185,120,45,204,192,245,51,9,217,114,250,74)
+IMAGE_DATA(144,199,83,9,33,62,15,207,199,215,226,123,225,117,52,236,247,141,124,31,253,254,187,143,25,29,125,36,137,58,26,117)
+IMAGE_DATA(95,212,127,193,252,13,187,47,27,238,95,164,142,4,47,17,184,174,177,114,203,57,163,175,79,27,254,159,146,69,27,172)
+IMAGE_DATA(182,92,184,6,189,88,135,13,47,15,178,215,10,125,87,240,1,68,95,22,246,226,162,39,75,251,179,112,4,51,121,125)
+IMAGE_DATA(225,1,214,37,39,153,235,19,81,179,244,142,136,241,243,246,176,15,109,204,108,203,214,33,227,215,50,223,252,244,139,111)
+IMAGE_DATA(202,19,127,246,176,140,8,124,91,134,24,182,110,143,123,86,246,5,126,42,187,2,207,200,110,115,125,79,224,105,198,94)
+IMAGE_DATA(134,229,236,126,195,86,101,237,1,195,86,242,54,238,113,115,223,63,202,249,191,238,44,77,195,215,203,150,110,227,185,95)
+IMAGE_DATA(125,192,132,117,244,7,30,104,52,235,192,177,107,45,95,13,63,85,159,146,167,120,206,196,245,12,229,170,213,168,155,216)
+IMAGE_DATA(135,13,166,98,86,7,255,6,56,255,57,123,37,205,255,155,7,3,217,107,228,113,132,121,154,188,114,254,205,135,11,106)
+IMAGE_DATA(249,254,128,70,213,29,115,224,136,234,85,176,22,250,17,95,15,134,94,189,150,206,188,143,187,199,28,53,150,162,194,70)
+IMAGE_DATA(41,47,187,197,215,70,45,21,239,45,213,174,156,159,13,151,122,179,107,69,172,249,226,103,67,221,69,123,148,216,51,200)
+IMAGE_DATA(58,107,57,67,235,54,46,67,91,219,47,23,185,253,217,226,42,106,158,200,205,66,235,161,222,136,62,158,251,249,241,162)
+IMAGE_DATA(55,247,211,228,129,17,168,159,66,83,226,245,181,79,232,126,175,255,193,7,255,244,169,243,192,168,157,62,232,207,175,187)
+IMAGE_DATA(204,149,167,109,76,253,207,125,129,94,5,87,153,99,202,14,250,239,153,32,123,6,67,146,95,104,24,107,56,23,204,129)
+IMAGE_DATA(159,103,179,132,242,171,100,211,246,83,210,103,216,34,25,59,51,158,154,17,53,79,214,78,153,163,181,108,5,255,192,65)
+IMAGE_DATA(55,192,80,28,85,115,42,123,47,165,150,73,98,176,146,60,77,53,122,53,53,167,86,50,66,117,146,146,109,24,27,172)
+IMAGE_DATA(149,107,89,85,212,178,201,25,85,146,148,142,99,133,213,183,89,21,146,148,97,190,54,221,234,221,203,41,69,228,27,238)
+IMAGE_DATA(75,202,40,97,36,164,21,241,152,146,83,41,105,185,21,230,181,81,11,46,147,107,65,124,125,25,159,139,175,187,112,181)
+IMAGE_DATA(64,206,38,134,12,19,115,25,184,238,198,169,203,217,114,226,98,150,28,63,175,97,56,125,46,72,70,91,125,153,97,185)
+IMAGE_DATA(124,60,69,14,156,136,232,74,196,78,163,139,81,207,197,17,177,253,144,237,167,218,188,63,201,134,209,151,155,246,36,176)
+IMAGE_DATA(198,11,126,186,12,93,185,237,130,44,55,204,92,190,233,140,207,205,165,155,206,202,18,115,125,177,185,174,177,208,112,116)
+IMAGE_DATA(254,90,163,71,215,29,55,97,175,207,131,38,93,117,164,85,253,169,251,230,245,56,101,241,126,242,115,178,183,47,119,178)
+IMAGE_DATA(23,184,15,129,188,175,198,120,163,247,192,214,113,70,183,190,51,110,149,188,250,246,40,121,178,93,103,121,230,127,127,75)
+IMAGE_DATA(134,4,30,150,225,113,223,145,29,113,47,200,206,184,231,100,187,97,43,98,135,209,174,8,48,22,172,221,19,104,201,90)
+IMAGE_DATA(27,79,152,251,30,145,243,95,239,41,119,198,239,144,217,157,134,27,125,186,198,234,213,9,150,171,168,171,162,126,26,209)
+IMAGE_DATA(166,241,100,168,214,82,113,93,235,171,224,234,136,233,155,101,212,204,173,204,255,34,102,44,217,203,188,68,74,70,216,104)
+IMAGE_DATA(200,90,195,210,82,175,207,61,108,251,101,51,67,212,167,197,197,181,81,222,193,202,90,203,167,60,203,65,238,177,9,146)
+IMAGE_DATA(167,122,188,118,61,157,249,94,28,49,31,162,185,91,171,75,45,95,193,57,155,31,14,217,62,91,112,59,191,198,60,175)
+IMAGE_DATA(212,250,41,210,55,194,48,44,183,146,250,85,125,206,210,210,188,25,28,79,227,178,135,223,235,25,102,190,152,125,76,161)
+IMAGE_DATA(251,212,91,243,108,159,255,103,32,15,140,199,192,61,232,61,228,79,161,233,238,231,195,0,6,97,182,69,185,122,191,158)
+IMAGE_DATA(224,88,189,138,215,7,247,144,95,198,94,182,143,243,121,248,249,207,255,217,231,42,226,147,184,138,57,29,245,145,120,144)
+IMAGE_DATA(215,111,187,252,63,114,225,233,146,61,119,42,175,44,179,253,25,57,200,1,215,218,247,14,114,99,230,124,57,39,175,132)
+IMAGE_DATA(189,120,124,127,23,212,144,171,27,183,157,164,199,78,191,145,139,57,187,112,58,209,48,41,185,208,63,90,253,106,227,108)
+IMAGE_DATA(114,1,181,155,234,60,196,217,132,60,57,151,152,111,216,155,79,158,93,190,86,40,151,211,13,7,131,101,228,94,122,110)
+IMAGE_DATA(181,100,230,87,50,178,204,247,12,134,171,25,184,158,145,87,229,61,86,45,233,161,74,222,198,17,204,68,164,100,151,49)
+IMAGE_DATA(148,155,137,233,197,100,235,149,84,243,61,82,194,114,233,122,1,217,171,1,102,158,188,104,244,236,89,163,39,207,164,203)
+IMAGE_DATA(225,211,105,12,112,82,117,44,244,43,56,185,251,88,138,236,58,122,157,71,4,234,183,122,220,229,245,66,129,153,110,104)
+IMAGE_DATA(158,25,189,81,91,247,39,147,163,155,246,37,26,13,122,133,117,76,48,20,215,149,165,122,31,142,208,164,171,183,157,243)
+IMAGE_DATA(114,185,103,35,108,53,199,251,51,245,184,189,189,254,184,204,53,247,65,175,186,92,133,102,133,94,157,190,244,160,119,180)
+IMAGE_DATA(115,67,240,254,67,47,146,178,116,242,226,61,81,60,141,244,217,238,229,117,104,87,220,63,120,220,10,233,216,99,164,252)
+IMAGE_DATA(232,185,215,228,167,191,255,77,25,16,247,176,140,12,124,223,48,180,189,108,14,188,224,197,115,178,205,196,150,128,203,217)
+IMAGE_DATA(8,107,119,5,158,245,117,237,46,163,99,119,6,126,40,23,190,55,72,222,157,118,80,70,118,28,36,3,140,54,29,52)
+IMAGE_DATA(206,112,117,226,70,159,159,96,43,52,41,2,183,53,207,139,188,111,164,87,105,75,132,171,51,108,93,21,251,91,103,47)
+IMAGE_DATA(63,32,27,118,93,96,14,38,28,174,146,80,65,153,229,39,252,176,13,79,179,189,158,247,130,130,74,219,231,30,182,61)
+IMAGE_DATA(124,197,197,245,212,149,204,237,120,179,51,218,179,228,250,50,128,167,152,79,77,190,154,202,215,65,254,23,76,182,51,54)
+IMAGE_DATA(233,230,241,84,243,120,26,217,107,119,222,88,223,253,236,160,97,79,97,189,157,165,113,246,206,225,251,217,40,241,247,242)
+IMAGE_DATA(216,200,17,221,15,192,28,112,48,220,66,179,182,150,7,254,109,231,234,131,230,129,63,137,171,174,102,116,185,250,32,122)
+IMAGE_DATA(21,179,176,170,87,63,233,231,111,187,252,191,118,177,245,213,202,202,70,243,94,105,50,28,125,159,252,68,109,135,159,47)
+IMAGE_DATA(57,249,204,115,101,7,243,253,121,85,196,230,93,103,165,239,168,229,210,111,196,18,89,180,230,8,245,219,133,164,144,92)
+IMAGE_DATA(50,156,188,114,61,108,35,37,95,46,93,11,69,110,123,129,231,92,76,206,227,17,140,3,235,160,23,17,96,31,180,229)
+IMAGE_DATA(181,172,18,50,49,18,21,86,99,122,113,61,203,235,63,206,40,247,35,57,189,140,145,152,90,98,190,79,17,95,27,129)
+IMAGE_DATA(28,45,248,125,42,209,48,61,33,135,124,71,62,247,248,165,92,6,244,166,106,77,13,155,11,78,137,170,103,34,63,139)
+IMAGE_DATA(58,166,178,21,215,209,251,196,240,122,140,117,142,71,249,186,205,11,228,116,209,51,164,179,61,54,191,155,224,107,83,13)
+IMAGE_DATA(176,52,18,168,143,94,226,252,229,234,109,23,24,43,85,183,198,159,241,143,75,55,156,54,76,61,238,7,180,170,229,44)
+IMAGE_DATA(102,114,143,114,38,23,51,186,200,5,107,254,119,198,178,67,126,96,94,23,1,206,70,105,84,111,102,101,162,195,84,124)
+IMAGE_DATA(173,229,178,125,222,196,133,187,200,213,14,221,134,202,99,79,117,148,118,255,223,183,164,79,220,247,100,92,224,113,195,208)
+IMAGE_DATA(87,100,67,224,69,63,54,25,190,198,199,181,147,77,113,47,248,188,5,103,183,198,61,79,230,42,111,183,25,190,110,55)
+IMAGE_DATA(186,245,194,143,71,201,123,179,142,73,223,14,131,60,141,186,145,254,201,168,149,66,135,130,175,202,88,203,206,173,12,244)
+IMAGE_DATA(37,185,61,74,200,253,142,244,184,138,24,59,219,246,44,109,61,112,201,235,209,43,146,210,242,27,172,135,114,78,219,156)
+IMAGE_DATA(75,34,39,140,218,170,245,90,202,101,79,46,125,128,12,31,217,143,139,121,27,48,195,227,42,244,38,222,39,96,36,184)
+IMAGE_DATA(75,207,131,156,18,178,18,125,193,218,35,12,173,137,121,28,244,50,129,169,200,233,66,159,34,31,172,158,17,90,83,197)
+IMAGE_DATA(81,217,201,94,227,52,27,120,77,125,109,245,9,102,63,149,250,244,99,182,198,211,173,110,184,122,245,179,146,7,86,238)
+IMAGE_DATA(61,40,87,63,77,125,85,243,192,255,22,189,250,32,92,133,94,5,87,245,188,160,77,175,182,93,236,197,246,162,253,242)
+IMAGE_DATA(87,31,73,85,213,45,243,158,171,229,249,59,125,244,61,95,182,180,244,107,134,163,249,254,172,42,102,176,242,141,54,220)
+IMAGE_DATA(117,240,34,61,215,225,3,132,94,213,248,29,167,229,240,169,107,114,242,66,134,156,186,152,201,124,233,201,11,89,114,226)
+IMAGE_DATA(124,166,185,29,228,117,104,194,211,151,115,125,174,157,184,152,33,167,47,134,108,61,212,220,143,199,206,121,58,246,220,213)
+IMAGE_DATA(176,156,55,12,190,144,82,232,7,184,11,221,9,253,9,118,38,165,21,27,158,150,26,150,150,248,129,251,18,83,13,83)
+IMAGE_DATA(175,66,151,22,50,168,73,205,235,226,245,143,95,178,117,86,228,109,35,245,213,204,40,93,218,90,216,186,103,68,171,218)
+IMAGE_DATA(124,110,178,127,159,230,119,153,235,61,156,194,216,238,241,84,3,60,181,97,115,191,208,175,96,171,234,86,132,234,86,213)
+IMAGE_DATA(172,110,62,120,213,214,179,140,101,91,140,94,221,124,202,235,209,181,186,21,44,181,185,223,227,204,253,66,179,226,58,114)
+IMAGE_DATA(192,115,87,28,150,57,203,99,243,192,7,200,84,229,45,2,143,99,182,19,58,85,115,193,232,239,193,78,122,212,91,149)
+IMAGE_DATA(171,170,121,113,27,251,218,6,141,93,46,237,187,188,35,223,127,188,189,188,248,223,190,41,61,2,223,147,9,129,39,12)
+IMAGE_DATA(71,59,200,218,184,87,76,188,36,107,140,118,221,16,120,73,214,199,89,198,110,52,76,221,8,214,26,198,42,103,149,177)
+IMAGE_DATA(56,110,137,123,90,46,253,116,146,220,154,113,84,186,25,189,10,166,14,242,231,102,54,80,135,234,236,140,6,52,233,232)
+IMAGE_DATA(25,219,233,29,49,98,234,22,214,84,17,202,84,28,17,216,3,129,186,243,190,99,87,141,54,180,53,202,130,66,163,111)
+IMAGE_DATA(74,111,90,190,134,235,36,24,202,37,67,11,195,13,252,219,7,239,174,94,75,177,185,90,122,8,23,146,141,208,159,200)
+IMAGE_DATA(243,130,73,118,159,92,62,89,171,236,128,190,45,42,108,230,107,226,117,192,87,244,57,161,255,23,122,21,239,49,232,101)
+IMAGE_DATA(188,38,152,4,30,98,54,135,189,189,57,145,221,81,174,143,176,229,106,145,215,191,84,194,62,97,237,5,142,236,222,137)
+IMAGE_DATA(248,67,124,86,251,129,85,175,126,26,174,254,38,242,192,170,89,255,45,121,96,112,21,189,198,232,245,109,211,171,109,23)
+IMAGE_DATA(123,137,236,95,173,170,168,148,172,140,160,191,27,14,239,207,212,76,228,160,42,36,148,95,45,249,225,122,234,88,212,19)
+IMAGE_DATA(48,207,186,239,112,34,185,138,192,108,230,250,237,39,100,247,161,43,134,173,41,204,161,30,58,157,66,47,27,4,110,35)
+IMAGE_DATA(191,122,236,92,38,117,173,246,236,32,239,170,247,129,185,167,46,229,200,153,43,33,63,71,124,38,201,242,21,1,205,169)
+IMAGE_DATA(92,85,134,94,229,220,108,169,175,97,149,177,224,106,66,74,49,159,79,174,38,217,60,52,152,106,185,170,63,67,166,159)
+IMAGE_DATA(235,85,174,234,117,203,82,112,54,195,207,1,187,154,21,189,183,59,60,93,234,214,77,119,168,239,196,97,219,151,171,76)
+IMAGE_DATA(85,157,202,124,176,9,206,204,30,176,57,97,244,37,33,151,142,80,206,42,83,149,185,145,254,164,139,204,7,107,104,94)
+IMAGE_DATA(120,201,134,147,178,104,29,124,44,236,28,12,244,24,180,42,184,26,155,7,70,48,247,187,252,128,204,92,25,233,253,181)
+IMAGE_DATA(249,224,131,50,21,94,83,172,185,66,175,238,162,118,197,237,169,177,189,78,139,14,144,187,152,173,125,169,211,64,249,222)
+IMAGE_DATA(35,207,202,171,191,251,109,233,106,244,234,196,192,79,100,93,92,39,89,101,216,186,210,232,214,85,113,29,100,117,64,227)
+IMAGE_DATA(101,195,217,151,201,220,245,134,181,202,219,248,184,246,134,177,237,204,125,207,200,166,223,109,47,9,175,204,146,154,41,71)
+IMAGE_DATA(165,115,231,97,50,104,210,6,25,60,217,232,211,41,134,165,147,54,251,122,212,13,104,83,48,21,185,94,101,40,175,207)
+IMAGE_DATA(216,230,107,86,60,7,92,197,108,242,169,179,41,82,84,210,40,165,37,77,236,17,66,142,181,172,172,129,53,85,176,206)
+IMAGE_DATA(206,206,84,179,254,10,102,162,118,10,237,136,247,134,122,244,171,191,160,229,74,88,74,74,234,204,231,108,19,125,84,200)
+IMAGE_DATA(16,243,90,184,14,189,137,156,50,111,23,20,123,117,218,74,199,63,169,212,247,216,206,202,178,204,246,123,146,178,139,153)
+IMAGE_DATA(63,82,118,177,39,153,156,205,229,115,212,99,145,92,205,137,236,152,138,248,22,230,221,167,111,41,18,17,174,230,69,49)
+IMAGE_DATA(214,247,1,15,21,198,248,23,70,252,6,213,119,73,185,138,223,27,218,191,53,182,250,231,27,208,171,69,248,217,67,212)
+IMAGE_DATA(123,247,227,146,50,15,199,15,63,252,185,245,37,44,169,242,188,11,163,185,234,250,67,84,148,227,60,169,138,175,255,160)
+IMAGE_DATA(122,245,23,191,248,136,115,168,181,142,86,141,245,134,112,185,138,249,26,232,12,204,165,126,210,207,31,123,189,237,242,159)
+IMAGE_DATA(247,162,255,155,185,215,188,202,188,167,11,242,165,32,175,73,114,115,42,172,102,205,53,159,1,161,27,212,177,240,121,211)
+IMAGE_DATA(153,0,244,3,239,57,124,150,187,76,176,119,115,194,156,141,244,88,218,121,224,146,207,81,112,245,208,169,84,222,198,17)
+IMAGE_DATA(92,5,63,193,81,237,135,197,117,229,42,152,10,61,169,92,69,128,171,136,179,204,23,23,26,166,150,80,171,186,44,85)
+IMAGE_DATA(158,42,83,173,94,45,145,43,169,197,145,30,221,43,182,47,23,76,133,78,118,185,170,179,55,26,96,170,242,214,114,53)
+IMAGE_DATA(173,5,87,161,83,109,92,243,185,10,109,170,124,197,236,14,102,69,153,7,118,184,26,155,7,214,58,171,189,30,201,13)
+IMAGE_DATA(131,165,184,31,215,221,58,172,246,0,175,218,106,123,127,87,198,244,50,45,94,119,146,58,108,254,170,163,86,163,26,166)
+IMAGE_DATA(106,207,146,246,3,43,83,193,81,101,170,171,87,181,230,74,142,130,161,78,255,210,20,237,103,242,184,106,245,236,14,122)
+IMAGE_DATA(65,193,107,233,225,239,62,41,29,226,30,150,46,129,127,148,41,70,127,174,142,235,44,203,3,175,155,120,85,86,196,117)
+IMAGE_DATA(52,199,14,140,149,129,150,140,213,88,23,104,39,107,226,158,147,77,255,253,85,73,236,178,72,194,227,247,74,215,55,71)
+IMAGE_DATA(250,185,94,106,211,73,155,163,114,191,224,38,120,170,121,94,91,67,141,220,86,166,142,152,102,125,33,144,211,134,214,79)
+IMAGE_DATA(184,106,24,153,87,70,110,162,166,9,254,225,122,113,81,19,117,102,73,113,179,231,95,88,192,28,48,102,90,117,79,28)
+IMAGE_DATA(122,152,192,52,112,17,12,193,231,60,238,3,123,145,15,70,255,48,122,140,225,163,2,14,130,155,232,17,70,30,23,254)
+IMAGE_DATA(241,101,101,77,212,177,200,57,227,124,53,55,187,206,188,239,106,164,32,191,129,140,231,172,42,89,89,202,239,3,174,230)
+IMAGE_DATA(100,87,242,189,105,223,159,165,204,77,235,252,170,250,143,90,206,150,69,233,87,245,103,82,174,42,111,63,201,103,159,58)
+IMAGE_DATA(213,243,11,103,184,58,53,175,52,194,249,2,187,223,10,199,143,243,3,86,255,66,13,220,206,207,43,166,239,18,24,8)
+IMAGE_DATA(207,55,248,28,213,213,218,253,48,181,117,246,168,183,43,13,47,169,85,203,140,38,45,175,247,143,110,84,84,52,248,1)
+IMAGE_DATA(190,162,175,172,212,124,31,236,48,175,171,199,238,182,91,210,124,227,142,220,104,142,142,155,55,238,74,83,35,102,100,171)
+IMAGE_DATA(233,15,81,238,249,7,195,43,216,13,245,26,70,192,231,23,179,177,224,43,102,120,48,71,211,54,143,218,118,209,190,165)
+IMAGE_DATA(143,126,245,47,82,89,115,211,188,55,110,241,253,67,79,49,122,64,84,216,157,148,185,65,246,75,134,114,171,217,175,152)
+IMAGE_DATA(27,170,147,131,199,147,164,223,232,101,228,42,122,130,215,108,62,38,59,246,95,148,3,39,174,219,190,159,51,169,150,175)
+IMAGE_DATA(167,236,81,249,201,222,160,24,174,158,184,16,36,87,53,148,173,236,123,74,10,69,113,21,236,212,250,170,173,177,150,249)
+IMAGE_DATA(250,213,234,212,66,50,85,251,123,49,11,3,94,235,188,139,203,85,228,130,99,185,138,0,87,149,185,90,95,213,112,185)
+IMAGE_DATA(234,234,85,101,234,46,207,219,105,135,106,215,152,250,170,245,77,180,188,244,245,171,195,91,60,166,143,235,115,112,212,124)
+IMAGE_DATA(176,206,214,40,91,125,189,186,254,20,181,42,184,186,96,245,49,153,183,210,234,84,87,171,250,190,198,96,170,199,82,151)
+IMAGE_DATA(169,246,126,91,103,101,143,176,114,21,51,54,243,119,243,232,247,14,123,247,163,86,217,123,232,108,121,161,99,95,249,214)
+IMAGE_DATA(55,31,151,215,3,223,151,78,129,71,101,170,97,228,242,192,155,178,56,208,89,22,5,58,201,18,115,92,28,120,141,177)
+IMAGE_DATA(204,176,118,153,97,45,66,57,139,88,21,232,72,206,174,8,60,47,27,255,87,23,185,214,107,141,164,142,216,34,111,246)
+IMAGE_DATA(156,16,213,143,52,12,59,245,166,110,34,39,149,161,163,157,94,95,247,62,242,116,234,22,62,119,184,199,85,252,14,152)
+IMAGE_DATA(79,206,51,12,67,175,59,125,242,13,203,192,86,237,195,5,19,81,95,69,30,184,164,248,38,181,166,245,15,14,83,111)
+IMAGE_DATA(130,43,232,251,77,77,79,243,115,175,224,43,158,131,156,49,181,109,70,30,181,32,180,111,117,245,109,50,1,28,69,47)
+IMAGE_DATA(176,213,192,245,82,80,88,71,182,231,133,203,253,190,6,124,79,122,82,20,84,72,86,182,225,104,94,21,123,7,179,115)
+IMAGE_DATA(240,222,107,52,239,71,228,144,106,249,126,140,240,180,136,76,85,127,67,112,220,50,214,141,162,40,255,96,237,117,138,214)
+IMAGE_DATA(164,145,208,253,85,209,97,125,98,220,192,191,141,13,91,111,86,102,194,27,35,150,167,90,23,85,127,135,146,146,26,254)
+IMAGE_DATA(187,224,49,106,78,120,62,40,59,43,236,81,117,40,174,35,23,80,94,222,200,35,2,125,33,145,104,54,140,187,97,162)
+IMAGE_DATA(137,81,93,221,204,251,171,170,27,24,213,53,141,140,26,195,105,30,107,110,24,118,27,126,215,222,228,125,117,181,205,156)
+IMAGE_DATA(97,133,63,4,52,46,114,188,248,44,132,103,83,108,168,215,47,124,9,225,161,132,217,85,204,166,126,58,174,126,220,252)
+IMAGE_DATA(234,199,191,78,155,246,253,140,95,62,178,115,84,53,213,119,57,71,131,62,14,122,148,132,138,124,31,81,156,147,230,230)
+IMAGE_DATA(217,247,52,206,167,241,62,63,123,41,151,59,194,192,86,248,219,174,140,63,44,219,15,92,244,245,42,184,10,141,138,112)
+IMAGE_DATA(243,189,202,85,212,53,93,174,34,15,172,161,218,21,76,61,147,28,153,17,5,43,221,252,47,35,179,216,134,167,87,145)
+IMAGE_DATA(255,5,131,193,84,124,29,242,201,90,211,85,189,138,136,204,143,102,180,168,173,170,110,85,174,90,182,90,191,38,91,91)
+IMAGE_DATA(77,110,161,91,149,169,187,188,222,165,29,222,125,26,234,71,172,154,84,153,25,171,97,221,199,183,120,57,99,235,93,124)
+IMAGE_DATA(165,5,87,145,7,110,161,85,189,222,165,121,107,142,57,57,96,235,251,160,236,116,67,89,235,50,87,231,92,253,190,96)
+IMAGE_DATA(47,108,109,53,146,11,70,140,158,185,89,222,30,60,77,94,232,208,71,190,253,181,31,26,166,254,208,176,245,135,50,205)
+IMAGE_DATA(176,115,81,92,119,153,23,120,195,68,23,89,24,232,42,11,141,126,69,44,242,88,139,0,103,151,196,189,30,97,109,92)
+IMAGE_DATA(7,195,224,151,100,195,31,119,151,148,1,155,228,244,160,53,210,173,223,12,242,208,230,128,109,30,120,232,52,155,231,85)
+IMAGE_DATA(126,186,58,85,111,131,167,204,7,27,189,58,108,50,106,176,241,204,3,227,119,140,223,125,94,138,225,1,145,87,233,247)
+IMAGE_DATA(242,232,30,26,156,59,106,63,46,242,189,208,169,58,139,138,207,116,188,31,80,235,84,191,8,235,151,148,74,158,225,241)
+IMAGE_DATA(242,242,102,230,125,209,19,108,251,145,130,220,127,3,238,176,255,201,112,54,108,180,42,56,153,3,223,149,188,26,191,71)
+IMAGE_DATA(208,238,54,174,226,207,144,135,220,180,97,43,230,200,209,247,144,30,52,159,243,217,69,188,63,152,99,189,33,192,86,250)
+IMAGE_DATA(182,160,94,202,58,107,196,63,184,37,87,29,182,58,243,57,118,38,182,56,154,169,208,166,81,92,141,204,249,220,159,171)
+IMAGE_DATA(149,49,181,229,106,114,243,126,92,37,79,149,171,222,81,67,121,234,243,213,92,135,6,69,158,222,101,43,88,234,114,213)
+IMAGE_DATA(101,43,153,234,49,86,57,171,71,112,20,92,141,226,171,9,248,49,193,67,162,162,162,172,133,223,175,122,252,34,160,83)
+IMAGE_DATA(161,87,81,91,133,39,4,102,99,225,247,160,92,117,243,215,247,253,232,253,165,24,157,124,79,110,223,122,87,254,229,95)
+IMAGE_DATA(126,33,31,135,202,54,142,254,54,93,188,190,165,95,254,43,243,48,216,193,144,150,145,110,247,101,101,103,251,62,105,152)
+IMAGE_DATA(187,193,123,27,231,200,248,28,200,14,213,203,217,139,5,220,17,6,182,142,155,181,81,86,111,61,46,59,15,93,38,83)
+IMAGE_DATA(117,94,69,153,170,1,134,198,234,85,157,5,109,141,173,232,223,5,87,193,72,206,226,196,112,53,57,163,200,231,170,234)
+IMAGE_DATA(86,212,95,193,96,122,54,36,21,216,58,173,209,191,120,61,188,174,91,99,5,219,213,223,40,86,155,198,246,45,233,60)
+IMAGE_DATA(141,237,83,186,234,7,184,26,221,35,28,209,171,110,63,147,235,151,168,90,20,60,141,173,189,42,95,201,91,220,6,107)
+IMAGE_DATA(247,94,246,185,10,166,162,47,24,92,133,86,37,83,215,159,96,196,246,4,107,125,117,206,170,195,158,151,146,155,239,181)
+IMAGE_DATA(61,193,83,189,124,47,52,170,205,1,239,243,251,146,38,122,253,192,46,83,93,174,226,49,248,238,247,232,63,89,158,123)
+IMAGE_DATA(185,167,60,252,183,143,72,231,192,143,228,53,195,213,233,224,105,92,15,153,29,232,46,179,227,186,201,92,115,91,3,156)
+IMAGE_DATA(69,44,48,92,93,72,190,70,88,11,206,46,8,188,34,27,191,216,95,114,134,236,145,45,111,47,144,238,239,204,179,115)
+IMAGE_DATA(51,83,182,120,121,224,141,212,158,154,231,213,158,36,247,58,88,74,157,234,5,184,138,62,98,228,141,103,45,219,207,94)
+IMAGE_DATA(96,228,122,185,91,155,253,68,217,146,25,204,162,78,69,255,18,188,33,138,138,75,249,25,143,26,107,122,134,245,75,2)
+IMAGE_DATA(59,240,121,174,181,85,112,9,251,64,241,24,250,145,108,79,112,134,245,25,204,200,35,83,241,92,244,4,131,179,186,63)
+IMAGE_DATA(53,39,84,65,31,98,48,181,184,240,54,117,42,185,84,104,247,95,128,95,5,133,246,28,22,53,152,108,120,114,103,135)
+IMAGE_DATA(37,35,88,192,89,55,220,167,189,75,182,127,169,200,203,215,150,121,62,18,197,126,189,85,181,172,239,215,239,213,95,85)
+IMAGE_DATA(235,182,170,85,125,174,150,182,208,172,177,92,85,182,226,72,174,26,158,218,218,114,181,31,224,166,155,3,166,94,45,173)
+IMAGE_DATA(142,102,45,152,90,98,89,234,235,84,228,123,85,175,122,183,173,86,181,185,222,104,189,26,205,81,134,167,85,25,202,87)
+IMAGE_DATA(87,179,214,54,249,122,149,247,85,87,83,127,86,85,85,248,126,191,247,11,245,250,133,79,20,106,171,240,132,120,80,189)
+IMAGE_DATA(10,78,254,236,131,127,150,155,134,169,55,111,190,207,104,106,190,35,119,110,191,103,248,28,237,111,216,86,163,253,237,187)
+IMAGE_DATA(224,255,18,250,129,203,43,138,37,200,93,143,117,146,29,188,205,247,102,94,168,78,10,242,154,121,174,154,147,91,111,185)
+IMAGE_DATA(154,87,70,182,158,188,144,76,174,190,51,113,141,140,159,187,77,214,237,56,35,123,142,38,90,150,94,200,242,25,26,203)
+IMAGE_DATA(85,134,167,25,149,165,56,42,91,245,62,112,16,115,165,208,156,96,106,164,111,201,214,80,221,94,96,189,141,64,14,24)
+IMAGE_DATA(122,149,249,223,196,60,246,43,65,175,186,121,230,72,62,216,250,46,185,92,85,127,64,157,181,81,189,170,181,85,237,91)
+IMAGE_DATA(114,89,138,251,34,61,77,215,57,111,179,211,99,172,219,207,20,225,170,245,80,194,117,119,175,142,122,16,110,117,152,170)
+IMAGE_DATA(1,207,8,236,58,195,44,171,230,128,181,111,9,61,75,182,255,247,152,63,195,138,163,114,117,238,234,35,190,231,146,203)
+IMAGE_DATA(85,173,165,186,204,116,217,233,230,124,245,182,134,230,134,177,67,182,91,159,9,242,147,246,61,228,123,127,249,3,163,87)
+IMAGE_DATA(159,50,122,245,73,153,26,232,33,51,3,111,203,12,195,85,196,204,192,91,126,204,10,188,105,248,218,205,99,172,101,237)
+IMAGE_DATA(2,143,183,243,141,158,157,107,216,186,233,161,97,146,63,202,104,238,206,147,185,111,16,51,170,131,39,217,60,174,234,80)
+IMAGE_DATA(106,210,152,126,223,225,83,34,61,76,156,187,241,184,138,251,161,87,225,13,1,15,199,35,103,211,168,77,195,69,133,82)
+IMAGE_DATA(90,124,199,234,195,252,34,222,87,86,218,204,126,166,252,130,66,230,118,161,57,161,103,145,255,197,57,39,52,42,110,171)
+IMAGE_DATA(183,33,152,80,95,127,151,181,69,235,137,111,119,173,98,126,85,125,9,193,59,188,46,184,237,239,135,243,118,28,67,111)
+IMAGE_DATA(114,111,122,174,237,89,226,156,41,61,11,237,204,15,123,130,49,59,14,127,81,250,52,149,217,247,36,242,190,94,191,18)
+IMAGE_DATA(106,174,248,30,186,175,145,245,88,159,169,69,94,94,56,178,31,214,122,30,23,70,113,85,247,228,185,253,191,45,185,90)
+IMAGE_DATA(234,251,57,218,99,89,203,60,176,167,81,169,83,193,83,55,92,182,150,84,69,221,46,131,78,109,69,175,82,171,86,106)
+IMAGE_DATA(45,181,209,211,170,173,115,53,150,173,247,213,172,78,78,24,92,133,86,133,110,69,13,21,26,20,126,250,240,80,66,63)
+IMAGE_DATA(18,106,167,177,1,150,34,247,11,157,170,76,69,207,210,39,249,40,185,143,55,53,221,147,91,183,126,198,0,95,111,223)
+IMAGE_DATA(121,95,110,25,174,146,177,230,49,48,246,95,255,245,151,236,127,105,195,233,111,223,229,151,232,7,174,70,79,70,61,153)
+IMAGE_DATA(154,149,93,106,249,26,178,187,176,236,142,213,176,239,237,150,91,80,36,23,174,164,26,166,174,230,254,205,177,179,183,208)
+IMAGE_DATA(239,125,239,177,36,171,67,61,102,106,29,211,61,34,92,118,170,142,84,166,42,95,99,123,131,193,86,240,82,103,92,209)
+IMAGE_DATA(191,164,44,69,93,85,3,143,83,175,154,175,81,31,65,63,175,236,241,213,114,53,199,159,183,113,125,31,148,171,246,186)
+IMAGE_DATA(245,20,116,107,171,202,84,235,163,164,26,246,90,84,175,240,206,99,87,163,102,89,183,59,94,17,174,62,245,117,169,195)
+IMAGE_DATA(85,125,222,150,253,151,125,166,42,103,225,247,171,243,54,96,170,246,46,33,23,28,235,11,225,114,85,243,193,150,171,135)
+IMAGE_DATA(169,83,109,15,147,163,63,189,222,36,245,139,112,25,234,106,88,183,182,10,174,98,71,92,151,183,199,201,147,47,116,149)
+IMAGE_DATA(239,124,238,251,210,49,240,180,209,172,207,26,174,246,53,209,91,166,4,122,154,232,65,206,34,166,51,192,87,195,219,56)
+IMAGE_DATA(48,86,89,251,22,117,237,236,184,55,204,237,78,178,229,59,19,164,104,194,89,25,214,113,4,253,31,172,135,190,213,156)
+IMAGE_DATA(110,127,146,246,253,106,175,175,214,96,113,4,75,193,93,214,86,61,174,194,31,10,187,136,46,36,102,115,126,140,220,9)
+IMAGE_DATA(85,74,97,113,61,243,183,228,66,209,109,106,53,187,147,220,234,79,60,15,53,81,236,232,4,43,57,55,83,80,236,239)
+IMAGE_DATA(104,179,51,171,229,17,15,224,124,171,5,161,81,47,39,92,33,207,144,79,46,45,173,103,45,151,179,58,158,206,164,191)
+IMAGE_DATA(83,86,129,167,121,237,252,42,244,109,74,138,245,71,4,215,51,50,10,252,28,49,174,115,191,77,102,152,215,217,191,228)
+IMAGE_DATA(107,211,18,199,235,176,212,211,175,165,126,189,213,157,185,209,250,106,235,154,53,124,31,174,150,59,92,117,245,170,189,31)
+IMAGE_DATA(231,33,190,94,213,252,111,43,76,181,92,141,102,238,253,184,234,106,85,183,182,250,32,154,181,85,13,91,213,20,165,87)
+IMAGE_DATA(193,83,61,230,231,135,217,175,132,221,111,247,243,43,118,125,139,145,251,197,78,26,101,234,3,127,230,254,242,87,114,227)
+IMAGE_DATA(230,61,95,175,130,173,183,111,127,224,31,25,134,179,136,166,230,219,114,239,238,207,168,99,241,45,218,122,163,62,227,151)
+IMAGE_DATA(143,240,119,96,253,42,203,43,239,152,207,139,155,146,25,180,190,108,161,156,6,203,214,220,160,239,177,198,252,20,124,131)
+IMAGE_DATA(141,142,77,190,26,54,159,169,107,169,87,199,204,218,76,174,238,58,150,232,115,149,181,84,143,163,202,48,151,171,136,88)
+IMAGE_DATA(29,201,60,173,147,19,118,251,131,93,221,10,77,202,57,214,212,18,6,106,170,96,170,106,85,246,43,121,92,165,199,147)
+IMAGE_DATA(147,91,214,92,48,126,38,245,131,208,126,165,88,118,106,94,215,229,102,116,168,231,210,245,232,190,166,99,118,119,12,195)
+IMAGE_DATA(203,1,251,186,213,132,203,86,229,170,234,84,28,225,201,191,237,96,130,159,11,198,253,224,43,246,210,96,143,157,59,207)
+IMAGE_DATA(10,190,46,229,252,106,132,167,152,95,69,88,79,136,195,78,79,112,196,255,65,103,88,167,56,62,133,147,61,47,67,55)
+IMAGE_DATA(39,236,214,94,193,85,204,221,104,63,48,188,247,7,79,88,37,175,191,53,90,158,120,174,179,124,247,143,191,47,29,226)
+IMAGE_DATA(158,145,46,129,23,100,82,160,159,137,62,50,209,176,117,82,92,111,115,124,219,99,108,79,159,177,136,25,230,254,105,113)
+IMAGE_DATA(221,125,206,34,127,60,35,238,77,217,241,216,76,41,153,118,89,122,189,60,132,94,75,239,76,216,224,205,215,108,244,244)
+IMAGE_DATA(233,166,168,62,37,214,80,29,191,37,114,213,60,215,13,112,21,243,182,216,141,144,101,244,30,118,5,227,243,63,191,160)
+IMAGE_DATA(81,74,202,154,108,207,30,117,99,185,63,55,130,191,121,228,136,193,61,240,16,58,213,50,177,130,121,95,204,213,112,78)
+IMAGE_DATA(7,122,23,53,200,124,219,195,4,38,195,163,137,57,89,120,136,165,217,25,182,210,146,27,236,81,0,139,176,139,142,94)
+IMAGE_DATA(78,70,235,225,53,168,79,243,109,127,50,216,7,166,167,165,65,187,22,91,63,167,96,216,122,67,133,236,204,170,214,75)
+IMAGE_DATA(213,107,95,117,170,245,13,182,249,96,189,237,230,134,149,173,31,223,183,244,113,92,109,173,190,90,238,251,79,181,214,175)
+IMAGE_DATA(212,26,87,203,188,186,170,171,95,203,148,169,202,213,216,253,170,158,94,141,212,87,27,91,169,175,70,51,180,178,170,222)
+IMAGE_DATA(239,91,210,156,48,57,90,109,53,171,155,7,198,92,14,246,213,105,205,84,117,168,250,250,186,254,190,159,214,235,215,125)
+IMAGE_DATA(206,123,239,121,58,213,48,21,12,5,95,161,85,85,179,250,108,117,248,10,253,138,58,172,122,13,183,93,62,155,151,95)
+IMAGE_DATA(137,214,216,127,41,213,85,119,204,123,172,150,125,17,153,89,53,230,28,254,166,121,47,222,38,95,115,205,121,61,114,192)
+IMAGE_DATA(168,245,96,151,77,118,110,149,92,77,41,145,225,134,171,136,241,179,55,113,119,11,242,192,71,207,165,251,53,76,229,152)
+IMAGE_DATA(134,242,212,237,1,86,118,34,216,95,228,228,130,79,95,201,161,79,175,250,33,98,230,198,213,173,232,253,69,176,15,56)
+IMAGE_DATA(173,40,226,241,235,121,64,104,104,13,215,213,204,8,228,127,99,189,31,172,151,111,178,55,159,154,20,85,63,141,132,245)
+IMAGE_DATA(88,82,190,106,222,216,238,149,137,238,7,214,126,38,215,63,2,247,187,249,94,183,206,138,251,53,252,57,29,143,171,168)
+IMAGE_DATA(179,34,160,91,125,239,224,45,103,188,125,118,17,205,10,158,198,106,85,237,9,142,204,176,70,215,73,93,63,37,237,95)
+IMAGE_DATA(154,182,108,127,212,115,49,207,202,93,225,158,7,255,132,217,59,100,224,184,21,242,202,155,195,228,135,207,116,144,127,252)
+IMAGE_DATA(131,71,164,125,220,179,210,37,174,189,225,232,96,25,99,216,138,24,103,248,58,222,232,215,241,134,175,19,2,26,189,204)
+IMAGE_DATA(115,122,25,230,246,48,172,237,205,227,84,195,220,201,129,55,101,218,239,244,148,157,207,45,145,124,195,213,78,175,12,240)
+IMAGE_DATA(124,10,55,176,15,120,232,180,141,190,119,254,248,89,219,101,236,236,237,190,110,29,238,247,252,110,228,243,85,183,14,153)
+IMAGE_DATA(180,222,206,190,154,227,212,5,187,185,91,8,231,137,152,37,133,70,165,223,81,70,150,92,189,158,76,118,149,20,55,114)
+IMAGE_DATA(102,4,179,22,133,225,82,246,44,193,55,162,184,228,142,167,79,115,252,30,96,112,135,143,131,45,225,82,175,183,245,182)
+IMAGE_DATA(121,31,217,153,22,206,177,22,214,123,179,51,133,82,132,253,115,165,55,120,29,223,147,30,195,230,107,193,115,244,35,149)
+IMAGE_DATA(148,221,52,218,185,193,48,173,145,53,213,220,124,219,71,197,249,214,80,141,245,225,207,171,177,117,25,244,15,99,70,7)
+IMAGE_DATA(253,79,152,197,193,142,28,111,206,198,70,145,127,219,178,54,210,179,164,121,224,216,92,240,39,247,3,199,178,181,42,170)
+IMAGE_DATA(111,201,206,28,85,181,152,85,109,173,198,138,250,170,222,31,85,99,45,141,238,3,214,29,229,21,81,122,245,193,242,192)
+IMAGE_DATA(46,87,221,158,96,95,171,214,70,184,90,91,211,196,190,18,236,121,109,110,190,233,239,29,183,159,145,15,162,69,63,185)
+IMAGE_DATA(103,137,12,22,228,128,223,243,117,42,195,48,83,185,106,25,106,194,104,212,59,119,62,228,145,124,189,123,135,63,19,116)
+IMAGE_DATA(235,47,126,241,224,181,220,182,203,127,196,229,35,230,36,74,203,42,36,53,43,77,130,121,217,156,87,205,206,109,242,206)
+IMAGE_DATA(215,107,217,183,200,125,147,121,77,204,153,5,67,5,146,150,26,150,81,83,214,202,200,169,235,101,194,156,205,62,87,143)
+IMAGE_DATA(157,207,240,61,128,85,143,234,209,229,107,172,15,132,114,213,213,175,240,185,231,215,33,151,107,180,39,184,26,165,91,175)
+IMAGE_DATA(135,253,252,111,107,92,117,53,176,187,143,38,118,126,213,221,191,134,80,223,7,229,107,164,239,55,217,215,175,216,49,23)
+IMAGE_DATA(157,51,118,216,169,108,117,184,26,91,107,117,153,185,85,185,234,245,255,110,241,115,194,145,188,112,44,95,81,107,5,91)
+IMAGE_DATA(93,239,224,69,27,78,122,92,61,194,126,96,215,23,194,221,105,163,249,95,205,231,186,243,168,83,22,237,139,201,251,238)
+IMAGE_DATA(137,202,253,210,39,130,59,109,118,177,247,182,223,232,165,242,82,215,33,242,200,19,237,229,251,255,227,17,121,62,240,172)
+IMAGE_DATA(116,141,235,96,88,58,76,70,6,6,202,200,184,1,50,58,128,232,231,115,118,108,92,95,203,89,178,182,23,53,173,114)
+IMAGE_DATA(118,188,225,234,244,223,235,47,123,95,89,35,153,147,206,73,167,215,222,225,110,26,236,120,85,189,138,89,85,124,111,248)
+IMAGE_DATA(59,32,112,93,231,83,85,151,210,123,223,156,243,225,235,6,79,88,43,3,198,110,96,62,25,126,251,155,119,95,226,231)
+IMAGE_DATA(126,93,221,45,169,175,251,144,26,11,62,12,240,236,197,124,11,250,73,175,165,92,103,189,52,228,105,58,48,181,164,172)
+IMAGE_DATA(153,115,172,220,79,1,255,96,175,135,214,215,185,240,1,14,215,177,239,41,92,92,35,233,153,25,230,188,212,214,82,80)
+IMAGE_DATA(83,65,254,135,243,169,134,191,182,15,176,154,115,174,232,15,188,158,154,226,251,230,211,227,63,175,158,156,229,252,77,168)
+IMAGE_DATA(194,50,46,84,101,243,188,156,97,173,242,217,169,122,84,107,168,154,7,118,235,171,100,106,118,97,212,44,171,255,220,251)
+IMAGE_DATA(245,45,221,71,175,70,184,90,230,231,128,109,88,174,198,206,216,184,92,141,154,179,41,173,110,145,35,86,166,170,167,146)
+IMAGE_DATA(95,95,45,143,214,171,156,79,141,234,9,110,150,232,126,224,27,173,230,127,221,126,96,61,146,171,232,9,174,105,162,63)
+IMAGE_DATA(83,113,113,161,191,159,6,57,222,95,199,197,101,44,234,110,55,110,60,24,87,245,118,125,195,77,214,124,225,75,245,179)
+IMAGE_DATA(159,125,104,120,255,207,109,92,253,76,95,108,46,163,184,212,206,180,131,155,185,161,6,201,12,54,146,167,153,217,85,18)
+IMAGE_DATA(52,250,52,151,57,174,102,243,158,108,226,185,50,222,159,99,166,173,55,92,93,43,99,102,108,144,229,27,143,146,171,240)
+IMAGE_DATA(47,36,3,29,13,234,214,55,221,80,94,250,117,80,231,186,214,69,201,225,203,182,55,88,247,202,40,91,161,91,81,107)
+IMAGE_DATA(85,205,234,214,86,35,158,133,150,165,186,163,77,181,170,235,183,164,90,83,35,226,167,100,115,178,122,180,59,83,45,91)
+IMAGE_DATA(237,206,244,235,49,51,173,215,162,123,130,213,39,194,153,111,117,61,36,162,184,26,211,171,100,217,122,133,177,227,64,130)
+IMAGE_DATA(236,58,148,196,35,231,110,208,31,188,235,114,11,79,254,37,158,102,69,14,216,246,48,29,247,115,193,202,85,212,86,99)
+IMAGE_DATA(103,101,92,166,210,103,105,137,231,175,20,83,79,85,93,203,125,230,134,103,35,141,102,236,61,98,145,180,127,125,144,124)
+IMAGE_DATA(239,177,231,229,145,223,123,92,126,18,248,137,116,142,235,44,163,2,35,101,104,224,29,19,131,100,184,31,3,124,214,42)
+IMAGE_DATA(111,199,196,245,247,88,219,223,48,181,191,185,175,187,76,251,131,161,114,240,141,205,146,48,230,152,188,222,117,36,189,150)
+IMAGE_DATA(168,89,39,198,83,143,234,60,13,180,42,2,62,250,218,195,100,185,186,201,243,229,247,118,199,141,177,59,111,112,31,252)
+IMAGE_DATA(246,119,29,190,194,61,171,213,213,55,249,89,118,227,198,207,152,231,77,76,78,34,31,240,24,142,152,35,5,131,80,35)
+IMAGE_DATA(101,190,182,176,206,171,171,150,48,71,155,152,116,213,62,175,176,90,50,185,99,53,131,26,53,92,80,79,141,153,69,143)
+IMAGE_DATA(165,106,206,212,64,239,114,94,38,171,222,246,17,27,214,170,183,33,158,3,86,69,188,149,202,60,159,255,122,230,142,108)
+IMAGE_DATA(223,112,37,181,161,205,255,90,222,169,214,100,100,151,147,181,90,75,85,63,9,119,142,53,106,14,199,169,175,126,242,252)
+IMAGE_DATA(106,165,195,84,251,115,196,230,128,149,171,86,167,86,68,230,109,98,123,130,29,142,42,87,93,191,95,213,172,126,46,184)
+IMAGE_DATA(204,241,37,164,15,68,163,148,85,126,58,189,26,213,19,220,66,179,54,70,177,21,251,90,109,30,248,198,39,114,245,223)
+IMAGE_DATA(210,155,139,175,185,123,239,131,7,226,170,127,221,104,86,120,137,224,231,194,12,16,250,165,80,215,109,203,5,127,150,47)
+IMAGE_DATA(150,171,248,123,131,223,67,70,218,29,201,204,172,35,87,211,211,111,49,47,156,157,135,254,198,27,146,149,221,96,115,83)
+IMAGE_DATA(161,70,246,54,129,171,152,93,29,59,115,189,44,139,63,194,190,165,227,23,50,125,173,234,114,85,57,27,165,77,61,142)
+IMAGE_DATA(106,104,255,174,219,111,196,175,77,176,187,78,53,92,205,234,215,91,189,185,85,157,177,193,247,208,189,167,145,153,154,200)
+IMAGE_DATA(236,172,250,66,104,46,216,213,157,202,85,173,115,198,178,85,25,169,121,96,246,41,197,204,171,238,136,209,166,136,214,244)
+IMAGE_DATA(170,198,86,167,150,26,185,126,133,253,75,136,157,7,237,207,162,117,86,236,95,183,222,75,103,185,179,124,153,183,51,78)
+IMAGE_DATA(53,171,6,184,234,250,66,216,158,165,131,209,44,101,236,241,253,244,35,251,227,246,70,106,176,206,254,26,244,254,140,49)
+IMAGE_DATA(60,131,31,111,159,225,243,165,221,171,253,228,91,63,120,90,30,251,47,79,200,211,129,231,164,75,220,91,50,44,48,90)
+IMAGE_DATA(6,27,205,58,56,48,68,222,97,12,150,33,113,239,196,176,118,128,140,136,27,108,57,107,120,59,218,196,176,192,219,50)
+IMAGE_DATA(253,79,71,203,177,222,123,229,248,144,61,242,122,143,137,204,225,106,78,215,237,255,5,79,225,75,129,192,28,45,115,193)
+IMAGE_DATA(83,237,140,43,180,169,221,21,103,152,60,126,141,225,234,90,230,143,225,241,120,49,177,128,60,131,63,47,122,66,154,111)
+IMAGE_DATA(220,165,199,3,152,88,24,110,98,30,184,178,226,14,103,186,209,143,132,243,77,236,79,4,79,81,223,100,254,55,223,250)
+IMAGE_DATA(63,112,111,42,252,248,139,236,238,86,240,182,40,124,147,12,202,200,200,32,151,11,188,215,196,215,102,100,21,75,184,200)
+IMAGE_DATA(112,55,207,250,24,102,6,45,139,185,3,22,254,75,5,205,60,143,205,8,86,243,252,21,154,21,117,23,156,227,98,102)
+IMAGE_DATA(21,26,23,122,213,246,24,71,116,43,56,10,61,107,25,109,123,133,45,107,43,236,209,203,3,183,182,7,253,190,108,205)
+IMAGE_DATA(45,254,132,218,106,149,23,101,62,91,149,171,177,245,213,88,175,37,151,171,202,89,215,47,194,245,213,143,212,86,109,30)
+IMAGE_DATA(184,180,162,101,79,112,44,99,239,87,95,141,245,134,168,174,105,136,226,42,234,171,216,179,174,121,224,7,211,171,159,164)
+IMAGE_DATA(27,163,243,195,13,13,119,252,218,234,39,115,213,242,23,158,2,5,5,133,156,3,66,63,114,155,23,241,103,249,242,145)
+IMAGE_DATA(248,92,173,186,197,243,241,236,236,155,100,106,168,160,201,156,91,155,247,120,70,3,207,189,225,25,129,154,145,250,129,194)
+IMAGE_DATA(63,116,244,212,117,228,234,248,217,241,228,234,190,227,201,114,244,98,166,239,109,228,242,20,65,63,125,47,192,87,236,150)
+IMAGE_DATA(209,25,85,120,42,225,8,47,8,220,135,80,54,131,147,58,195,218,90,104,189,21,76,85,143,37,238,126,51,63,135,230)
+IMAGE_DATA(125,85,163,198,6,24,139,189,226,238,156,13,184,170,76,85,174,106,216,251,44,11,213,35,120,123,140,239,146,31,94,207)
+IMAGE_DATA(146,238,180,209,222,96,157,183,217,26,83,79,117,111,107,62,56,162,95,45,95,55,114,191,249,69,199,211,208,114,117,169)
+IMAGE_DATA(199,212,69,206,204,141,246,46,185,62,134,218,143,164,249,221,200,44,77,52,87,167,47,218,31,197,85,221,185,10,157,10)
+IMAGE_DATA(166,146,171,134,113,61,135,204,145,231,94,233,45,95,127,248,71,242,232,239,62,37,79,196,253,84,186,4,122,25,142,142)
+IMAGE_DATA(145,254,134,171,3,24,67,101,96,220,176,24,206,90,214,14,53,143,129,177,67,12,83,113,124,39,208,91,102,126,113,162)
+IMAGE_DATA(156,25,124,76,182,244,141,151,55,251,205,36,83,117,126,102,24,188,29,156,222,37,176,21,1,174,234,172,13,102,85,161)
+IMAGE_DATA(109,209,63,204,227,4,171,119,161,109,151,110,56,42,87,146,131,204,243,194,99,23,188,67,64,175,194,191,176,170,242,46)
+IMAGE_DATA(245,42,216,135,30,97,220,199,26,8,115,156,181,158,86,44,151,242,178,27,124,207,208,231,55,63,204,207,242,162,162,26)
+IMAGE_DATA(214,59,209,155,84,84,90,71,86,131,173,248,172,134,111,3,230,192,233,53,81,88,102,226,150,132,243,155,233,233,132,250)
+IMAGE_DATA(44,152,93,16,190,193,115,218,96,46,206,107,235,201,80,228,129,225,9,85,96,88,141,154,76,126,184,134,71,188,31,169)
+IMAGE_DATA(77,225,193,228,237,55,87,143,97,178,212,175,177,150,121,245,213,82,175,191,41,207,15,151,171,17,182,134,37,226,3,28)
+IMAGE_DATA(241,134,136,204,178,150,250,59,56,34,222,75,101,17,189,234,233,84,61,70,245,3,199,228,124,93,174,170,143,190,159,7)
+IMAGE_DATA(142,221,87,227,120,22,70,124,33,26,162,226,126,181,85,183,190,26,197,87,245,135,168,141,212,90,113,254,100,243,192,141)
+IMAGE_DATA(15,160,87,221,207,209,7,187,192,131,24,249,17,157,89,125,16,174,98,198,8,127,71,5,5,5,228,170,122,59,181,113)
+IMAGE_DATA(245,179,123,209,190,182,242,138,123,230,243,161,137,249,170,236,236,102,201,129,183,18,57,139,220,239,13,190,207,144,67,98)
+IMAGE_DATA(79,147,121,95,227,220,120,226,108,243,89,54,109,29,243,192,75,55,28,150,61,39,34,92,213,190,37,213,167,254,188,76)
+IMAGE_DATA(114,216,250,53,120,236,83,102,42,19,233,145,164,218,52,49,223,215,167,120,92,245,168,242,84,117,171,126,189,62,174,190)
+IMAGE_DATA(192,202,119,237,65,142,236,35,207,138,242,163,0,95,53,31,236,250,234,131,163,154,139,85,198,34,252,126,35,199,135,112)
+IMAGE_DATA(171,215,103,228,250,5,199,178,52,214,91,105,75,204,204,170,155,23,222,76,143,165,75,12,112,20,199,141,244,135,136,112)
+IMAGE_DATA(213,206,178,158,245,122,151,78,251,92,69,46,24,108,117,123,130,163,235,171,145,153,153,214,184,58,99,241,1,153,185,228)
+IMAGE_DATA(160,255,28,205,253,130,165,152,255,180,177,93,134,78,222,32,111,13,156,38,207,182,127,91,190,254,141,199,229,209,192,79)
+IMAGE_DATA(228,49,195,213,174,134,145,3,2,227,164,119,96,164,244,49,209,55,48,130,209,159,17,205,218,65,230,8,198,14,246,98)
+IMAGE_DATA(96,160,175,204,254,202,116,185,48,234,188,204,239,190,88,250,14,95,106,231,101,224,237,0,95,7,111,110,102,132,231,169)
+IMAGE_DATA(111,253,149,162,247,213,144,193,240,129,152,178,142,28,38,95,39,173,103,255,242,242,248,147,212,140,200,193,226,179,25,58)
+IMAGE_DATA(211,238,83,45,33,67,75,43,234,141,230,186,201,125,172,236,203,69,127,81,90,144,253,77,168,155,162,207,23,250,20,57)
+IMAGE_DATA(228,138,242,155,212,116,168,203,130,205,232,253,67,190,46,41,57,133,57,95,212,88,185,87,198,104,214,244,244,84,178,13)
+IMAGE_DATA(185,101,120,39,65,195,22,20,85,211,131,24,44,65,61,144,123,45,130,101,146,111,222,123,212,160,232,225,69,77,22,94)
+IMAGE_DATA(135,185,181,158,126,173,179,125,75,161,106,155,7,118,60,147,180,71,152,181,214,156,10,191,230,234,251,41,49,39,172,59)
+IMAGE_DATA(112,98,188,127,157,80,102,146,209,94,14,154,117,32,63,7,92,69,31,40,213,172,121,225,74,155,239,14,91,223,40,228)
+IMAGE_DATA(176,195,5,165,214,187,234,99,162,48,108,103,127,149,173,177,61,75,120,44,58,7,92,111,191,14,94,254,97,207,219,63)
+IMAGE_DATA(38,192,115,247,122,84,157,55,38,23,141,153,39,119,158,7,223,155,117,0,243,125,193,221,230,166,219,244,66,186,107,248)
+IMAGE_DATA(166,129,158,92,189,254,222,187,31,122,189,192,15,206,55,248,16,131,163,15,154,7,70,141,53,200,61,70,153,244,76,68)
+IMAGE_DATA(30,248,221,119,223,253,84,30,20,109,151,255,152,203,47,127,245,11,246,48,166,165,55,115,111,13,248,154,153,217,192,247)
+IMAGE_DATA(46,116,107,122,70,163,57,167,174,102,30,24,249,224,180,204,155,230,124,185,89,166,204,219,198,190,37,212,88,23,173,61)
+IMAGE_DATA(96,231,87,47,100,68,105,85,87,163,130,167,228,106,114,126,171,249,92,151,145,46,103,213,19,66,247,211,184,143,185,71)
+IMAGE_DATA(213,173,58,107,131,252,177,246,62,185,125,76,238,92,15,142,208,180,240,52,180,190,74,17,127,7,176,85,185,26,97,107)
+IMAGE_DATA(18,117,227,166,189,23,169,29,193,58,157,67,141,237,49,98,127,111,140,63,176,122,21,186,179,171,202,82,213,169,126,111)
+IMAGE_DATA(146,183,227,6,57,95,68,228,182,237,87,178,190,75,118,119,28,124,228,117,191,185,229,234,9,223,207,208,157,181,81,174)
+IMAGE_DATA(186,189,73,110,29,53,118,94,85,153,202,62,37,143,171,240,185,7,231,144,95,237,218,119,146,60,221,174,187,124,237,43)
+IMAGE_DATA(143,202,143,2,47,203,163,113,237,12,87,135,73,159,184,73,242,182,209,172,136,94,129,209,140,222,12,195,218,184,81,134)
+IMAGE_DATA(179,163,162,89,27,55,156,199,62,70,195,206,127,120,145,36,78,188,42,99,186,26,173,58,126,109,132,165,211,162,243,192)
+IMAGE_DATA(174,191,126,236,115,34,108,141,103,31,19,206,1,240,251,108,216,126,142,62,16,232,185,197,103,45,242,189,118,70,166,220)
+IMAGE_DATA(251,44,174,163,31,62,250,151,208,199,155,150,145,106,116,102,169,209,177,118,166,21,140,69,47,83,200,112,42,53,53,68)
+IMAGE_DATA(141,138,25,24,236,118,179,222,17,133,100,23,250,160,208,143,84,92,218,100,190,207,45,214,78,49,251,26,204,174,102,143)
+IMAGE_DATA(2,124,247,193,75,244,217,67,87,113,206,198,176,48,92,104,25,8,143,253,16,234,169,236,119,170,39,199,224,11,28,204)
+IMAGE_DATA(169,228,251,18,175,131,159,217,246,35,185,125,74,37,254,220,42,158,79,54,135,74,125,214,194,247,208,134,231,51,145,87)
+IMAGE_DATA(221,106,224,223,132,57,103,248,151,230,213,120,243,0,246,104,163,218,250,62,121,247,229,135,107,249,53,220,167,119,245,170)
+IMAGE_DATA(92,191,126,221,252,155,164,182,234,173,235,135,121,46,254,31,68,249,4,123,71,215,107,73,175,67,227,98,87,95,242,213)
+IMAGE_DATA(235,146,146,146,246,201,175,239,71,10,3,207,119,3,143,69,94,199,252,255,202,200,178,30,17,38,234,235,111,183,8,228)
+IMAGE_DATA(111,221,104,108,184,69,223,6,248,213,217,121,155,143,251,148,181,12,108,110,186,99,231,86,31,64,175,130,169,240,135,72)
+IMAGE_DATA(77,77,247,247,167,99,47,207,175,179,159,170,237,242,155,187,192,111,169,162,250,134,249,28,104,226,123,158,53,157,156,26)
+IMAGE_DATA(230,132,241,30,163,55,105,102,61,243,195,96,46,248,154,150,222,36,147,231,110,151,209,211,227,169,89,23,172,222,71,174)
+IMAGE_DATA(162,111,73,25,198,185,83,195,82,229,41,35,70,103,186,28,117,57,235,242,211,246,254,22,121,17,246,246,160,135,91,104)
+IMAGE_DATA(87,101,176,155,11,6,87,49,175,227,214,123,25,87,34,253,198,118,230,38,221,209,172,58,19,147,236,233,211,43,209,222)
+IMAGE_DATA(71,100,234,5,137,247,56,167,90,82,251,141,252,231,122,90,54,214,163,80,247,215,196,238,141,115,251,125,57,171,234,237)
+IMAGE_DATA(100,181,57,223,115,62,95,233,101,184,37,226,11,161,185,224,37,155,34,90,213,245,9,118,253,247,93,143,253,89,75,163)
+IMAGE_DATA(125,151,252,254,164,69,187,237,14,214,197,182,166,138,122,170,230,127,71,207,178,59,215,192,173,254,99,87,73,231,222,19)
+IMAGE_DATA(228,169,231,186,203,67,95,250,190,225,234,171,134,171,237,13,87,71,202,219,113,83,165,91,96,188,116,103,140,149,30,38)
+IMAGE_DATA(34,156,29,227,115,22,140,237,237,105,218,222,129,225,38,134,202,146,71,87,202,213,105,25,50,240,245,137,126,206,119,152)
+IMAGE_DATA(55,131,74,175,253,105,145,29,112,46,87,117,78,21,44,213,224,109,122,73,108,228,239,191,251,240,53,178,176,176,164,150)
+IMAGE_DATA(218,18,249,87,112,9,51,47,208,91,224,41,242,131,244,240,53,183,11,13,231,48,231,10,205,137,122,108,106,74,38,251)
+IMAGE_DATA(145,114,115,194,228,23,60,244,193,133,236,220,28,111,31,107,182,231,123,152,205,253,229,156,247,70,30,213,48,50,55,92)
+IMAGE_DATA(66,157,90,88,116,131,243,54,232,111,42,54,215,53,15,141,231,96,23,0,118,51,102,5,107,34,59,99,60,47,6,122)
+IMAGE_DATA(25,35,151,107,184,29,204,174,243,125,247,149,171,214,103,34,146,247,181,92,173,240,249,26,204,41,139,186,47,162,69,171)
+IMAGE_DATA(200,73,27,85,78,68,184,234,134,114,213,178,181,206,15,176,21,30,22,224,84,86,166,245,165,71,127,173,250,233,186,65)
+IMAGE_DATA(159,93,243,187,184,121,98,229,106,148,39,132,183,183,134,81,90,205,252,61,24,153,149,149,113,223,215,110,241,125,156,80)
+IMAGE_DATA(175,223,136,231,175,245,255,197,107,33,207,90,83,117,147,222,89,232,21,103,191,120,43,108,109,108,188,107,217,106,110,127)
+IMAGE_DATA(240,193,63,201,207,127,254,33,231,113,48,87,113,255,94,166,95,240,177,127,250,240,95,13,87,239,242,181,30,132,171,240)
+IMAGE_DATA(67,134,199,63,124,138,181,182,218,182,55,231,183,225,98,206,179,126,41,220,231,203,61,112,168,213,228,162,47,49,139,159)
+IMAGE_DATA(9,185,185,230,239,51,63,155,231,201,153,89,183,204,237,102,206,214,101,102,53,203,244,197,59,204,231,108,188,140,152,190)
+IMAGE_DATA(78,230,175,60,232,115,21,125,71,220,245,230,245,238,222,143,155,202,199,75,215,35,108,213,176,59,201,11,162,2,207,69)
+IMAGE_DATA(255,47,226,242,181,2,95,151,234,107,42,91,85,15,227,251,115,254,21,92,245,2,183,253,251,208,147,124,49,219,247,225)
+IMAGE_DATA(71,157,85,53,171,59,99,3,29,169,179,163,96,234,230,221,23,100,211,174,243,178,30,26,114,151,229,43,25,107,174,175)
+IMAGE_DATA(55,1,198,110,244,60,125,53,151,27,203,210,173,206,220,140,242,152,158,74,228,233,5,47,46,57,218,52,18,202,81,104)
+IMAGE_DATA(84,228,128,181,31,88,253,130,225,107,168,251,88,213,195,48,150,171,179,150,70,51,214,250,62,236,183,253,73,70,159,106)
+IMAGE_DATA(96,191,42,242,167,156,19,157,5,182,238,164,94,197,124,40,118,25,189,214,125,156,252,232,133,55,228,107,127,246,184,60)
+IMAGE_DATA(30,232,42,143,6,94,145,206,70,171,118,51,92,237,26,152,36,111,4,38,48,186,5,38,146,179,209,172,53,108,141,27)
+IMAGE_DATA(43,111,253,206,24,50,182,135,209,176,189,12,99,151,60,187,65,174,79,207,149,238,175,142,146,49,211,141,62,157,105,235)
+IMAGE_DATA(171,202,72,221,79,51,102,250,22,25,59,99,43,67,243,196,195,56,99,179,193,238,62,159,186,222,231,43,206,7,22,172)
+IMAGE_DATA(57,40,39,206,165,249,59,191,179,178,178,88,67,180,218,172,138,185,26,230,133,13,107,161,93,216,123,100,24,154,145,158)
+IMAGE_DATA(109,189,179,77,208,127,33,100,231,97,42,202,239,242,188,19,76,174,172,188,201,26,37,244,45,115,145,197,168,207,54,177)
+IMAGE_DATA(159,232,74,98,2,89,87,93,117,143,57,103,248,41,129,223,220,197,26,178,51,168,208,148,244,50,11,161,55,240,6,115)
+IMAGE_DATA(190,208,164,232,37,164,110,69,127,47,246,196,121,188,228,44,92,78,29,181,43,123,9,145,7,134,63,90,168,210,122,15)
+IMAGE_DATA(231,150,250,243,55,190,55,132,183,99,78,239,255,56,189,170,65,127,226,188,42,111,118,86,53,171,125,76,53,171,141,58)
+IMAGE_DATA(30,49,111,196,189,29,134,105,232,255,129,198,194,126,210,88,111,93,220,135,93,107,254,252,141,227,185,239,206,216,248,251)
+IMAGE_DATA(224,42,172,23,19,52,166,238,145,41,45,45,165,231,224,39,249,248,234,247,67,224,249,173,5,118,192,226,121,200,239,183)
+IMAGE_DATA(198,211,214,244,42,238,131,79,63,234,157,232,35,2,91,63,142,119,224,42,158,3,191,9,204,241,148,121,53,230,58,163)
+IMAGE_DATA(143,111,169,231,210,157,247,163,216,138,62,115,252,157,226,247,133,7,20,190,22,175,209,230,19,252,217,190,252,202,235,91)
+IMAGE_DATA(194,110,195,80,94,1,243,77,232,239,207,227,12,91,129,119,238,92,197,57,59,244,49,165,26,221,154,145,221,196,243,229)
+IMAGE_DATA(217,43,118,201,136,25,235,25,179,151,91,189,138,249,85,238,77,141,233,55,138,229,38,122,120,57,35,147,102,125,9,45)
+IMAGE_DATA(71,11,163,106,164,23,175,229,71,56,234,107,212,124,63,220,60,113,172,78,85,166,186,161,108,213,186,174,203,85,244,47)
+IMAGE_DATA(29,56,157,234,215,88,117,206,6,65,239,35,250,10,94,162,78,221,176,235,156,196,239,56,75,174,34,214,25,45,169,71)
+IMAGE_DATA(94,55,76,212,124,45,180,166,203,218,77,142,142,37,71,189,251,212,51,88,243,190,90,63,141,229,40,142,122,29,53,85)
+IMAGE_DATA(176,84,119,197,233,110,27,151,171,232,95,210,28,176,6,247,193,45,217,31,197,85,132,122,19,198,50,85,103,68,149,171)
+IMAGE_DATA(168,173,130,97,216,105,223,241,173,81,242,195,103,59,201,87,255,255,199,228,177,64,23,249,65,224,53,121,61,48,69,58)
+IMAGE_DATA(7,166,154,152,204,0,95,53,192,216,55,227,38,250,156,5,99,223,140,27,79,61,251,166,225,106,207,223,29,39,203,218)
+IMAGE_DATA(109,145,132,105,65,121,227,213,145,118,46,117,134,157,89,181,92,181,249,93,122,254,122,158,134,154,251,85,174,162,31,24)
+IMAGE_DATA(189,74,131,199,27,174,98,246,117,188,141,201,243,118,202,153,75,70,83,166,103,154,207,171,52,242,17,117,211,154,154,59)
+IMAGE_DATA(236,35,130,239,18,60,124,193,217,82,122,219,214,177,118,10,182,102,7,243,57,99,10,126,85,87,189,231,239,98,43,44)
+IMAGE_DATA(42,161,230,133,119,190,157,193,177,189,63,96,30,234,180,216,153,3,22,131,181,208,201,216,193,154,124,237,42,245,41,252)
+IMAGE_DATA(154,144,63,134,38,45,40,170,100,173,53,39,231,6,223,91,172,165,26,237,154,149,93,102,247,197,153,247,32,122,127,209)
+IMAGE_DATA(195,20,204,45,98,223,146,173,185,214,70,207,215,228,86,177,255,215,213,174,234,11,17,27,214,59,237,227,217,250,105,185)
+IMAGE_DATA(106,231,122,115,201,60,204,91,130,59,234,167,139,163,235,183,219,208,208,212,162,182,250,73,92,181,125,177,5,100,36,56)
+IMAGE_DATA(131,121,206,214,252,123,91,11,124,239,143,11,228,88,107,107,111,63,48,87,145,47,6,139,241,115,188,247,222,123,81,251)
+IMAGE_DATA(108,90,253,172,245,184,10,111,68,252,220,208,159,224,165,213,245,33,50,86,61,131,225,3,113,163,249,46,207,229,160,165)
+IMAGE_DATA(193,125,252,124,202,239,182,203,103,255,130,250,42,206,183,115,179,189,60,111,86,189,249,127,105,189,217,210,131,55,37,37)
+IMAGE_DATA(253,38,243,77,120,143,167,101,53,240,190,96,102,157,204,93,181,71,134,77,95,45,195,141,94,157,185,116,15,251,129,225)
+IMAGE_DATA(103,142,121,25,205,249,186,76,117,217,169,76,85,174,170,110,117,217,234,214,75,221,251,91,171,173,106,112,198,166,21,158)
+IMAGE_DATA(186,92,213,185,29,221,115,163,121,96,157,183,113,185,234,246,1,219,126,92,203,85,151,165,107,183,159,141,14,220,103,2)
+IMAGE_DATA(249,90,4,184,170,186,213,101,235,102,135,171,218,143,164,121,95,173,155,90,45,122,154,158,74,75,227,79,248,12,213,254)
+IMAGE_DATA(36,240,19,44,117,99,201,134,227,178,120,253,49,238,184,33,91,239,163,89,99,125,248,209,187,164,122,21,76,69,216,249)
+IMAGE_DATA(208,109,62,87,193,212,17,94,94,182,223,136,37,242,242,27,195,229,7,79,190,34,15,253,225,19,242,125,163,87,31,9)
+IMAGE_DATA(188,33,175,198,205,146,215,2,179,228,213,192,52,47,166,144,181,150,183,147,163,162,171,137,55,226,38,147,181,157,12,91)
+IMAGE_DATA(123,254,247,41,178,234,181,221,114,102,66,170,116,238,60,130,51,178,35,189,221,228,35,166,197,251,115,52,168,151,14,159)
+IMAGE_DATA(100,52,233,132,53,244,168,134,159,38,252,31,176,11,162,255,152,101,244,171,232,107,142,3,70,45,147,254,35,151,203,208)
+IMAGE_DATA(137,171,101,230,226,221,146,137,189,49,133,54,143,137,62,37,246,46,153,219,152,175,65,254,150,251,155,242,203,216,87,130)
+IMAGE_DATA(62,36,250,48,93,75,161,31,175,245,172,207,103,47,176,245,254,77,165,199,33,251,100,194,13,236,121,65,175,60,56,12)
+IMAGE_DATA(237,11,166,150,87,222,178,59,87,139,108,157,16,207,69,143,15,246,202,93,73,72,98,221,21,61,246,224,44,122,128,180)
+IMAGE_DATA(151,23,253,75,156,21,135,254,204,43,243,106,152,118,150,21,250,20,63,191,205,231,86,121,61,193,94,127,146,167,71,217)
+IMAGE_DATA(115,228,248,25,186,122,149,30,77,14,87,163,216,234,207,206,84,125,34,87,35,76,141,112,213,238,109,182,57,75,176,3)
+IMAGE_DATA(188,1,11,90,243,215,189,123,247,221,79,228,106,148,167,161,185,31,243,165,208,193,13,13,13,212,137,31,126,248,225,125)
+IMAGE_DATA(253,123,63,109,128,119,53,53,183,30,184,190,138,231,129,139,238,94,243,143,235,209,5,87,241,56,122,121,241,239,130,158)
+IMAGE_DATA(227,154,154,26,158,131,224,117,144,167,14,162,70,159,87,100,254,246,48,155,101,206,167,204,223,23,246,209,225,121,56,55)
+IMAGE_DATA(249,244,59,94,219,46,255,183,47,191,242,254,243,209,71,191,48,231,131,239,75,70,86,29,63,23,50,131,229,146,146,1)
+IMAGE_DATA(255,135,219,236,11,206,202,106,52,159,43,85,204,81,225,60,154,179,237,70,187,206,91,189,219,124,206,174,51,159,123,235)
+IMAGE_DATA(101,198,146,221,190,223,18,114,192,218,71,164,249,94,151,141,234,157,175,60,117,175,187,57,223,232,231,23,71,105,217,216)
+IMAGE_DATA(186,170,203,215,88,173,170,57,95,215,163,66,239,135,94,117,61,13,91,155,97,213,190,224,136,94,189,224,107,85,4,88)
+IMAGE_DATA(186,102,219,25,134,94,95,141,219,219,207,83,179,98,39,121,108,79,175,171,81,17,170,81,93,127,66,221,89,179,12,158)
+IMAGE_DATA(15,155,78,250,154,116,177,227,7,140,208,94,165,197,30,103,237,222,184,99,254,254,184,133,240,227,95,115,148,97,119,198)
+IMAGE_DATA(29,110,161,95,181,159,9,53,86,112,117,188,87,83,85,174,106,15,48,114,192,240,102,64,158,181,231,176,133,210,174,211)
+IMAGE_DATA(32,249,222,15,95,148,135,254,231,83,242,157,64,39,163,87,123,200,203,113,115,165,67,96,182,188,18,152,225,197,116,115)
+IMAGE_DATA(123,186,116,52,215,59,198,77,107,193,91,50,54,110,146,116,136,27,39,125,254,112,142,108,232,113,72,14,141,78,144,55)
+IMAGE_DATA(122,140,97,254,22,117,84,230,115,39,90,110,14,28,183,218,176,115,37,119,255,14,24,187,138,12,5,63,135,27,174,78)
+IMAGE_DATA(156,187,73,102,47,219,73,159,146,109,187,207,203,217,11,233,146,97,52,84,161,209,159,233,105,133,204,181,86,148,53,218)
+IMAGE_DATA(25,18,248,29,21,222,164,31,62,102,68,160,181,208,239,11,93,106,125,116,243,253,89,19,221,191,202,221,137,217,118,255)
+IMAGE_DATA(42,118,170,162,247,6,126,16,186,207,155,222,42,134,185,165,70,7,163,134,139,189,56,152,167,193,110,116,176,21,218,20)
+IMAGE_DATA(154,24,185,89,122,244,230,149,113,239,13,94,199,246,40,21,176,118,139,218,41,114,189,200,39,115,223,106,46,222,151,37)
+IMAGE_DATA(30,227,170,200,225,172,156,66,127,7,171,221,23,87,226,237,177,41,105,169,79,29,166,106,184,92,117,123,125,31,148,171)
+IMAGE_DATA(145,26,107,141,237,119,244,184,10,14,64,171,162,111,85,231,65,98,253,117,113,31,60,114,145,7,110,117,255,106,121,77)
+IMAGE_DATA(100,191,57,230,107,60,189,10,237,134,220,50,116,48,152,170,185,215,7,9,245,213,189,95,160,199,22,92,253,52,122,21)
+IMAGE_DATA(218,28,90,18,231,16,15,50,83,138,159,3,63,51,24,252,254,251,31,24,30,223,99,78,184,174,174,198,104,155,114,122)
+IMAGE_DATA(63,232,206,87,104,88,92,199,239,235,250,21,183,93,126,11,46,222,126,132,210,178,119,201,85,188,39,225,171,148,154,217)
+IMAGE_DATA(200,94,37,188,95,184,115,57,251,38,115,91,121,5,118,158,28,239,167,149,155,143,202,132,185,27,204,103,237,90,106,1)
+IMAGE_DATA(229,170,246,250,130,131,174,30,213,158,94,229,170,206,156,42,55,93,174,226,113,87,231,234,115,221,153,155,88,174,106,180)
+IMAGE_DATA(154,3,142,241,72,100,14,248,82,48,106,206,198,229,170,122,40,185,243,54,224,170,246,1,131,173,26,170,89,93,174,242)
+IMAGE_DATA(250,142,11,62,83,53,55,28,171,91,149,179,186,175,92,67,61,245,89,51,197,46,56,199,247,65,125,128,221,176,51,53)
+IMAGE_DATA(71,200,78,112,20,58,85,243,193,46,91,245,121,202,84,87,175,170,111,161,114,85,231,84,233,191,59,195,238,93,179,59)
+IMAGE_DATA(99,226,101,144,97,24,246,162,62,255,218,0,121,248,145,231,229,161,255,246,83,249,70,224,53,163,87,251,73,251,192,124)
+IMAGE_DATA(121,209,112,245,197,192,76,198,75,70,187,190,100,152,250,82,12,103,59,4,166,50,94,55,140,237,104,216,218,62,110,188)
+IMAGE_DATA(244,253,220,98,217,214,255,140,108,31,118,78,122,244,159,106,125,31,102,108,54,122,116,157,12,26,179,194,48,116,133,244)
+IMAGE_DATA(28,186,84,186,15,89,40,221,6,205,99,191,48,250,231,246,29,185,98,117,40,230,63,242,138,165,190,246,142,225,216,61)
+IMAGE_DATA(9,229,212,147,165,152,71,173,168,186,205,235,96,101,81,97,57,251,113,117,62,21,253,48,214,27,34,135,122,20,247,37)
+IMAGE_DATA(36,93,97,61,180,178,226,30,53,37,56,106,61,149,236,94,85,204,20,162,63,24,154,22,90,17,175,141,188,46,246,220)
+IMAGE_DATA(192,187,0,121,101,212,88,145,247,161,39,125,97,51,107,171,232,11,70,254,185,188,236,22,185,171,158,13,214,235,204,238)
+IMAGE_DATA(184,96,45,198,48,152,53,216,60,171,163,211,210,114,125,6,98,246,22,187,88,233,123,232,207,211,56,251,107,60,134,226)
+IMAGE_DATA(249,214,67,184,34,166,31,184,250,55,194,85,156,23,64,123,65,79,42,7,238,87,11,132,31,95,107,123,205,117,126,213)
+IMAGE_DATA(247,91,114,184,250,105,57,246,105,46,120,45,205,3,223,175,103,41,150,171,200,225,186,156,255,164,159,71,231,26,209,207)
+IMAGE_DATA(139,127,27,252,14,232,239,197,57,8,114,209,224,39,180,41,126,71,188,46,106,191,152,173,209,29,175,248,186,182,218,234)
+IMAGE_DATA(103,253,98,243,9,191,248,232,95,205,249,97,37,103,83,179,50,239,152,247,119,51,181,105,70,70,61,119,173,218,154,81)
+IMAGE_DATA(161,55,75,158,231,239,105,92,187,245,152,76,154,27,47,99,102,172,147,169,243,183,251,245,85,229,157,106,213,136,22,45)
+IMAGE_DATA(116,184,90,220,162,239,200,125,220,205,255,182,54,179,170,247,199,246,42,197,230,129,85,171,234,60,141,235,235,127,252,114)
+IMAGE_DATA(208,239,89,138,221,109,238,106,86,183,190,170,125,70,96,171,246,42,105,93,213,205,5,175,243,114,193,202,82,157,145,113)
+IMAGE_DATA(117,171,230,127,181,63,73,217,234,122,40,113,111,121,124,100,134,198,101,169,235,255,160,62,192,243,86,26,182,174,54,92)
+IMAGE_DATA(93,27,209,176,96,44,152,138,124,48,152,10,205,58,107,197,65,159,171,58,83,99,61,245,119,115,231,11,114,192,218,7)
+IMAGE_DATA(172,190,246,168,109,210,119,119,82,60,53,99,183,65,115,228,249,14,253,228,27,223,125,74,190,250,95,218,203,223,163,31)
+IMAGE_DATA(56,48,84,218,197,45,147,231,141,102,213,120,33,128,152,237,177,118,182,225,231,44,178,182,189,97,110,68,211,206,48,207)
+IMAGE_DATA(157,44,253,255,114,133,236,24,146,32,43,6,28,144,62,131,231,176,38,58,195,176,190,247,240,229,210,181,255,108,121,189)
+IMAGE_DATA(215,76,233,216,211,198,203,61,166,115,255,235,244,197,187,36,41,37,131,127,147,200,71,150,151,97,111,112,53,119,71,64)
+IMAGE_DATA(143,22,150,216,217,74,235,151,87,37,21,149,230,115,220,112,22,245,77,4,52,42,230,67,224,231,11,110,130,77,208,167)
+IMAGE_DATA(120,12,60,179,253,75,57,244,51,76,203,72,247,159,151,145,158,67,255,95,188,47,112,63,120,137,215,66,30,24,175,81)
+IMAGE_DATA(84,124,91,74,75,110,113,151,13,122,137,113,29,63,7,158,199,220,107,168,145,58,20,204,10,161,78,10,159,36,243,222)
+IMAGE_DATA(202,201,182,253,248,244,96,49,143,161,95,9,57,106,122,80,132,172,167,40,234,170,240,60,3,87,221,153,85,237,253,69)
+IMAGE_DATA(63,19,88,169,254,75,244,24,118,248,74,207,166,223,64,30,248,223,194,213,22,90,213,225,170,122,65,80,191,150,212,248)
+IMAGE_DATA(122,245,215,201,85,253,249,240,90,218,183,244,32,92,197,115,98,245,243,131,254,60,150,175,118,55,13,102,117,224,165,143)
+IMAGE_DATA(223,7,255,102,96,40,126,63,188,166,214,167,145,163,110,155,89,253,237,184,232,223,211,71,230,79,1,57,136,96,86,185)
+IMAGE_DATA(57,15,190,35,153,193,90,122,21,102,103,219,190,95,244,36,230,230,89,207,24,203,218,122,206,246,197,111,63,41,19,102)
+IMAGE_DATA(175,183,92,93,176,85,14,156,188,198,125,54,240,77,138,212,70,35,57,93,213,159,238,28,170,155,195,109,109,78,53,182)
+IMAGE_DATA(166,234,206,211,216,222,165,188,22,61,192,154,243,117,231,87,93,191,125,28,225,9,113,236,82,196,135,9,158,134,174,102)
+IMAGE_DATA(85,189,170,181,213,150,179,54,151,125,182,186,253,75,202,87,222,231,213,85,53,215,139,219,238,28,42,180,172,214,83,193)
+IMAGE_DATA(83,215,239,215,214,83,79,57,121,221,8,31,35,254,191,199,60,78,26,94,174,56,44,115,150,31,98,204,95,117,148,108)
+IMAGE_DATA(117,181,172,234,84,155,7,62,196,208,28,176,50,213,122,234,239,242,184,186,131,92,133,110,5,87,135,115,71,140,23,19)
+IMAGE_DATA(227,101,192,152,53,134,115,51,229,39,47,245,150,175,126,243,9,121,40,208,81,190,98,244,234,163,129,209,242,124,96,133)
+IMAGE_DATA(60,107,52,171,198,79,25,115,229,57,19,207,7,230,57,172,157,75,206,130,185,237,3,115,228,39,129,41,50,232,161,181)
+IMAGE_DATA(178,119,84,154,76,123,123,147,12,28,179,76,102,46,221,39,171,204,191,67,143,119,22,75,151,190,243,228,213,94,179,44)
+IMAGE_DATA(83,223,154,206,235,232,23,158,179,124,151,164,100,4,233,69,16,54,250,16,26,19,236,9,229,223,54,76,189,77,205,119)
+IMAGE_DATA(253,90,58,115,173,118,38,255,67,41,44,184,193,186,41,180,29,88,7,78,98,54,6,252,228,60,42,119,146,7,169,97)
+IMAGE_DATA(161,83,175,95,191,202,199,193,0,244,41,113,111,27,206,51,179,11,108,95,83,118,33,191,150,61,81,230,235,176,55,21)
+IMAGE_DATA(108,66,239,19,114,196,232,231,197,190,84,120,252,129,19,232,169,199,247,205,12,102,121,124,108,176,187,164,130,165,156,99)
+IMAGE_DATA(203,204,170,182,247,103,215,145,103,232,27,4,123,209,35,156,149,237,245,3,231,86,249,222,191,156,95,53,122,151,243,113)
+IMAGE_DATA(94,221,85,117,168,245,237,191,63,87,255,61,125,75,238,188,13,230,108,62,45,87,31,164,31,56,54,15,252,155,212,171)
+IMAGE_DATA(154,7,126,80,189,170,92,69,79,209,167,225,170,123,81,13,139,57,29,48,22,185,243,15,63,252,25,89,138,192,235,42)
+IMAGE_DATA(83,193,226,182,203,103,253,98,207,125,240,255,170,182,250,22,125,149,48,195,154,109,52,42,106,170,89,230,54,230,84,51)
+IMAGE_DATA(210,111,217,58,14,123,12,111,209,187,20,121,181,45,59,207,200,132,25,171,101,244,180,53,50,101,254,22,217,127,226,42)
+IMAGE_DATA(253,150,224,73,24,173,63,195,247,237,61,250,56,127,136,143,171,161,242,122,82,72,46,130,225,87,163,123,129,185,111,238)
+IMAGE_DATA(178,237,81,66,174,215,157,165,113,247,218,68,239,182,73,111,85,175,70,250,150,34,158,13,174,199,32,248,234,246,47,249)
+IMAGE_DATA(71,115,159,214,81,53,215,171,92,181,181,212,115,100,42,216,218,90,239,47,184,106,251,143,78,68,213,73,85,115,170,247)
+IMAGE_DATA(47,61,31,60,158,106,204,53,204,156,103,248,105,247,218,68,120,58,215,209,171,224,170,171,85,109,207,82,132,171,227,231)
+IMAGE_DATA(110,247,235,171,212,170,152,95,153,24,239,251,2,130,171,111,244,157,65,174,126,229,31,30,55,92,237,36,127,27,215,201)
+IMAGE_DATA(112,117,188,97,233,106,121,58,176,200,139,5,230,246,66,47,148,177,150,179,63,245,116,44,142,96,237,211,129,105,50,244)
+IMAGE_DATA(91,27,101,255,132,28,25,217,117,185,140,152,178,142,125,230,235,182,158,146,174,3,230,201,235,125,230,200,107,189,103,203)
+IMAGE_DATA(43,70,167,182,127,115,170,116,49,250,117,226,156,157,230,223,251,164,84,84,220,144,242,146,90,73,78,73,103,143,64,109)
+IMAGE_DATA(253,187,82,92,120,87,74,139,239,154,207,227,219,204,213,162,246,87,111,238,71,255,47,2,159,157,168,173,162,86,154,149)
+IMAGE_DATA(85,104,117,166,209,139,240,42,176,92,181,190,249,185,57,69,156,181,1,51,81,35,197,124,13,222,15,224,46,230,32,192)
+IMAGE_DATA(80,244,61,209,255,215,124,159,194,130,42,206,242,128,201,169,233,105,236,139,66,175,47,252,12,144,191,173,172,190,205,252)
+IMAGE_DATA(47,102,109,224,57,4,205,10,239,135,236,32,250,126,107,249,254,3,55,225,105,136,254,193,220,124,163,151,179,67,212,160)
+IMAGE_DATA(244,48,52,143,229,228,217,158,97,59,67,99,189,248,193,83,220,71,223,8,244,43,57,12,213,156,176,223,183,228,113,245)
+IMAGE_DATA(223,59,103,19,233,9,254,244,122,21,179,159,90,95,109,145,11,246,234,171,177,253,192,255,183,184,250,160,245,213,95,7)
+IMAGE_DATA(87,245,162,123,92,109,158,216,214,97,17,209,123,211,219,244,234,111,203,197,214,87,239,80,155,194,71,9,231,210,56,127)
+IMAGE_DATA(198,121,51,207,163,13,107,193,87,156,11,227,115,6,53,172,220,252,70,217,108,216,48,124,154,221,21,7,79,67,245,221)
+IMAGE_DATA(143,157,67,109,45,167,235,106,204,214,230,78,221,189,53,177,252,181,247,133,162,238,211,35,189,32,162,246,151,7,163,60)
+IMAGE_DATA(130,193,125,198,133,104,173,234,250,3,71,60,151,34,123,109,212,3,223,61,170,159,161,122,35,249,220,244,122,133,149,171)
+IMAGE_DATA(202,84,219,39,124,33,170,79,88,245,170,234,84,68,107,115,168,81,154,115,245,65,153,183,246,176,97,231,65,153,179,34)
+IMAGE_DATA(18,86,131,218,252,174,246,38,105,31,48,244,44,116,44,120,75,54,67,179,46,59,40,83,151,58,92,157,191,79,38,206)
+IMAGE_DATA(219,107,88,186,133,125,74,232,191,37,79,177,191,116,194,90,175,87,104,5,143,125,71,45,151,174,125,167,208,195,240,161)
+IMAGE_DATA(175,130,171,221,229,111,57,103,51,93,158,12,172,146,31,7,150,154,88,98,174,35,22,49,148,181,207,196,89,206,234,241)
+IMAGE_DATA(57,79,215,62,101,24,59,242,177,237,114,108,106,145,244,235,60,147,179,53,248,29,151,172,57,36,175,245,157,37,157,123)
+IMAGE_DATA(205,148,215,122,206,146,118,221,167,201,243,221,166,200,219,195,150,202,212,133,187,228,200,153,171,210,216,248,62,107,153,73)
+IMAGE_DATA(70,151,226,243,185,161,254,125,243,183,122,215,196,109,122,235,34,191,130,249,250,130,252,98,169,173,185,199,58,218,189,123)
+IMAGE_DATA(63,151,162,226,114,163,91,211,164,40,124,199,122,22,26,118,162,231,52,229,122,6,89,12,45,8,29,10,189,8,207,3)
+IMAGE_DATA(48,187,166,234,3,230,95,233,213,99,116,46,184,12,127,90,176,18,207,133,215,0,188,35,48,35,129,126,78,212,69,225)
+IMAGE_DATA(227,20,46,178,254,9,101,21,183,217,135,140,250,46,234,146,156,55,205,179,61,186,86,163,214,122,250,181,134,156,13,229)
+IMAGE_DATA(214,122,61,78,69,100,27,216,9,190,129,99,234,21,140,159,93,119,200,105,46,88,251,129,115,60,198,186,189,74,228,173)
+IMAGE_DATA(199,204,251,249,66,176,63,57,175,170,149,231,69,158,175,222,76,220,105,103,126,55,120,238,21,22,22,60,16,87,255,197)
+IMAGE_DATA(104,51,221,13,215,90,46,56,202,111,223,231,106,232,55,199,85,131,172,186,250,27,158,94,189,243,177,92,133,55,68,83)
+IMAGE_DATA(227,109,243,239,174,62,72,205,255,110,174,198,94,148,179,15,186,55,189,237,242,217,185,216,243,35,145,242,202,59,244,250)
+IMAGE_DATA(70,175,47,207,157,179,27,169,95,209,171,4,191,37,204,216,224,252,153,187,50,114,243,120,63,184,58,108,234,26,234,138)
+IMAGE_DATA(73,115,182,112,206,70,235,171,173,245,28,185,60,141,213,162,174,143,131,191,251,198,99,171,246,34,233,220,169,203,226,216)
+IMAGE_DATA(235,202,85,212,80,117,135,77,107,59,226,112,159,187,47,206,205,255,106,196,238,181,137,245,52,116,119,188,97,102,70,249)
+IMAGE_DATA(169,126,17,154,255,213,185,84,59,123,115,214,215,166,107,189,89,87,176,88,185,138,185,84,204,211,232,252,140,219,115,4)
+IMAGE_DATA(46,106,160,142,138,252,47,52,167,203,207,72,142,55,122,150,102,230,242,3,14,119,205,99,203,247,202,180,133,232,81,194)
+IMAGE_DATA(14,211,173,50,126,182,245,175,31,57,101,131,12,155,180,138,179,43,131,39,172,226,252,138,157,93,89,110,88,186,68,122)
+IMAGE_DATA(143,88,44,3,198,174,224,236,42,184,250,204,139,61,228,161,191,251,145,252,93,160,167,225,106,87,249,199,192,44,121,34)
+IMAGE_DATA(176,70,126,20,88,102,98,9,67,25,171,225,178,246,153,192,98,178,245,199,134,171,79,26,109,59,246,169,189,114,98,70)
+IMAGE_DATA(133,116,127,117,18,253,30,22,174,61,196,25,174,87,222,158,41,175,190,109,243,191,47,246,152,38,237,13,87,7,140,91)
+IMAGE_DATA(45,147,13,87,47,37,231,210,235,30,156,129,158,180,30,234,77,82,110,206,21,49,67,10,143,78,238,149,8,151,146,63)
+IMAGE_DATA(240,183,207,205,189,73,45,139,190,37,236,147,1,107,172,143,111,200,235,79,178,90,243,234,245,107,236,83,194,103,61,252)
+IMAGE_DATA(143,224,41,11,127,36,204,168,130,153,120,62,180,34,234,159,220,163,152,91,194,124,51,188,151,130,89,230,235,138,27,88)
+IMAGE_DATA(163,133,126,133,207,18,250,21,168,95,75,26,216,215,68,110,230,155,215,206,53,239,183,172,74,201,202,205,247,231,83,179)
+IMAGE_DATA(114,106,109,47,19,102,111,66,246,124,22,44,195,107,48,7,156,107,189,33,224,217,98,61,247,117,134,181,194,203,7,151)
+IMAGE_DATA(59,81,97,95,203,176,145,249,226,220,10,207,79,169,53,118,70,252,150,208,63,213,34,224,183,148,103,189,138,49,99,203)
+IMAGE_DATA(64,30,184,160,145,218,25,30,85,216,67,222,96,24,5,63,92,245,212,189,119,247,103,12,245,215,109,108,186,97,189,249)
+IMAGE_DATA(99,252,150,162,114,193,206,14,214,223,52,87,161,17,235,27,110,208,27,24,94,247,234,175,216,98,199,157,23,69,133,101)
+IMAGE_DATA(244,205,249,77,253,60,109,151,223,238,11,244,42,118,68,224,189,12,31,96,212,80,49,59,7,157,10,166,230,132,178,57)
+IMAGE_DATA(151,158,153,113,195,219,191,26,38,95,119,26,45,6,189,170,92,69,125,21,122,181,53,31,8,173,165,182,212,157,209,253)
+IMAGE_DATA(70,234,47,136,235,46,71,149,185,122,95,108,175,146,235,5,161,92,181,222,132,105,60,42,71,85,195,70,239,179,201,240)
+IMAGE_DATA(243,191,202,83,132,219,15,28,217,109,19,189,223,205,221,69,163,218,84,253,151,52,212,67,9,76,117,185,186,102,59,88)
+IMAGE_DATA(123,137,1,175,95,173,171,34,255,171,129,121,25,232,85,176,21,90,19,193,26,43,114,185,171,14,144,151,179,60,173,106)
+IMAGE_DATA(195,230,133,225,81,136,218,228,244,197,123,168,233,166,44,216,41,211,22,237,230,245,201,134,165,224,40,250,108,135,79,143)
+IMAGE_DATA(247,230,66,55,112,95,41,248,57,120,220,18,25,52,118,185,137,165,60,14,192,44,232,136,5,140,222,195,22,24,206,174)
+IMAGE_DATA(228,108,75,215,222,147,229,153,118,221,229,203,95,122,194,112,181,175,124,57,208,77,190,103,24,249,88,96,189,60,26,88)
+IMAGE_DATA(41,143,197,173,96,252,208,48,214,13,151,183,79,120,156,253,161,209,174,79,254,206,98,25,255,194,97,57,60,189,74,58)
+IMAGE_DATA(189,62,70,198,205,220,34,243,215,29,97,78,186,253,91,51,228,101,163,83,95,234,62,93,94,238,49,67,94,122,107,170)
+IMAGE_DATA(97,255,26,230,172,47,39,100,73,200,252,237,22,151,222,144,166,166,247,216,83,89,85,93,75,93,129,190,165,112,24,124)
+IMAGE_DATA(189,35,37,69,183,89,27,197,223,121,40,100,30,11,191,199,125,229,224,42,57,154,22,100,111,144,246,48,161,55,24,181)
+IMAGE_DATA(15,48,16,156,68,45,20,243,56,236,89,50,186,20,159,169,224,56,102,88,179,50,75,216,51,15,237,137,231,81,235,194)
+IMAGE_DATA(15,162,208,246,248,210,83,130,185,215,58,126,63,176,24,189,202,185,217,245,214,7,223,176,55,55,187,142,245,83,232,82)
+IMAGE_DATA(112,15,253,249,217,161,98,207,31,170,142,189,132,232,121,6,87,213,135,159,187,144,177,71,46,215,246,253,226,251,51,240)
+IMAGE_DATA(120,40,226,67,168,30,18,214,159,201,238,157,139,246,39,108,169,75,193,203,80,94,147,23,141,209,215,11,154,56,235,238)
+IMAGE_DATA(71,184,153,121,1,252,251,232,222,60,244,92,199,70,113,81,133,127,228,158,214,226,138,40,127,252,40,142,57,187,206,237)
+IMAGE_DATA(30,244,218,223,24,199,52,255,138,249,151,219,183,239,74,101,101,53,253,39,208,239,139,60,71,172,231,176,221,1,152,99)
+IMAGE_DATA(254,94,194,244,168,64,47,111,27,87,219,46,238,5,245,85,236,88,194,185,54,251,37,178,154,205,123,186,193,124,182,84)
+IMAGE_DATA(179,143,34,211,156,71,195,123,159,254,251,65,243,190,41,174,226,204,192,65,195,160,49,179,55,112,159,205,228,185,182,111)
+IMAGE_DATA(73,245,170,187,163,38,214,71,63,182,118,234,114,209,229,167,155,15,142,218,115,227,113,213,221,137,227,126,173,238,51,183)
+IMAGE_DATA(190,132,41,244,81,194,117,101,171,171,89,149,171,208,171,174,102,117,185,170,61,193,219,188,157,53,17,182,38,56,58,54)
+IMAGE_DATA(178,151,92,117,171,122,28,110,216,121,201,159,75,213,176,92,61,255,49,117,85,195,211,248,227,190,94,245,53,43,106,166)
+IMAGE_DATA(171,44,59,177,163,27,236,116,99,198,146,189,100,231,196,185,219,12,59,55,201,132,57,155,77,108,149,113,179,54,91,142)
+IMAGE_DATA(130,159,19,236,252,103,159,81,203,165,219,144,69,210,165,255,124,121,189,247,92,233,208,115,150,116,234,59,219,112,117,153)
+IMAGE_DATA(23,75,100,224,152,37,134,171,11,205,113,17,163,239,136,69,70,195,174,38,87,187,244,154,100,184,250,150,252,213,231,159)
+IMAGE_DATA(52,92,29,36,127,29,232,110,184,186,66,126,16,136,151,239,7,86,217,136,91,105,110,71,66,89,203,32,87,151,155,227)
+IMAGE_DATA(98,249,65,156,209,174,255,117,165,76,234,120,66,118,78,44,148,14,157,71,48,23,141,115,138,81,83,55,201,139,221,166)
+IMAGE_DATA(202,11,111,77,49,92,53,90,245,173,105,212,173,224,42,114,216,151,175,92,229,103,92,65,225,45,169,169,178,190,230,205)
+IMAGE_DATA(205,239,242,115,30,28,128,151,18,242,193,224,7,124,124,161,23,49,67,10,255,125,228,243,130,57,217,114,13,222,15,134)
+IMAGE_DATA(171,217,156,161,201,100,45,20,140,168,44,127,143,51,49,236,67,42,176,140,131,31,4,231,109,50,67,252,252,15,102,231)
+IMAGE_DATA(178,62,155,95,112,131,239,33,48,21,117,90,220,143,121,28,4,122,158,216,175,156,95,100,123,164,204,247,64,61,22,254)
+IMAGE_DATA(251,120,109,48,28,126,77,168,167,34,47,4,29,203,57,241,236,82,235,155,136,220,112,182,237,13,66,31,33,116,42,125)
+IMAGE_DATA(12,185,59,206,106,72,171,81,171,60,109,106,61,16,53,148,171,124,78,78,77,11,238,106,94,215,114,213,187,143,250,244)
+IMAGE_DATA(254,92,197,209,229,42,126,127,252,78,240,93,198,46,60,238,157,129,47,164,115,157,28,117,194,221,123,14,174,170,102,117)
+IMAGE_DATA(247,177,250,123,207,61,174,254,186,251,129,35,159,131,31,177,103,8,51,47,200,99,131,223,168,21,99,134,212,13,245,30)
+IMAGE_DATA(198,156,46,158,131,231,234,172,110,91,191,110,219,197,221,191,138,157,87,220,181,97,222,187,89,217,77,244,216,15,154,243)
+IMAGE_DATA(105,248,65,64,167,162,190,154,149,93,199,247,16,223,131,161,18,57,122,42,85,38,204,223,104,62,183,55,122,253,192,209)
+IMAGE_DATA(121,224,216,158,222,214,230,101,92,255,65,215,247,208,101,103,108,157,53,86,195,70,233,221,203,185,190,47,33,88,186,239)
+IMAGE_DATA(228,117,159,173,8,213,174,110,168,174,181,62,134,215,91,204,175,186,222,75,202,86,236,39,119,231,111,220,94,166,120,111)
+IMAGE_DATA(239,248,58,246,4,95,242,119,165,170,239,67,164,7,248,108,212,92,141,122,41,105,109,21,76,137,204,200,160,31,233,0)
+IMAGE_DATA(251,120,224,193,49,121,254,54,153,52,111,179,225,231,22,198,132,249,91,101,210,194,237,60,194,99,126,232,228,181,210,127)
+IMAGE_DATA(236,26,233,55,102,181,244,26,177,82,222,28,180,72,58,247,95,32,175,247,157,103,98,129,23,115,253,219,29,123,206,151)
+IMAGE_DATA(87,122,204,149,206,253,230,201,144,9,43,100,232,196,149,242,206,120,232,213,197,12,92,87,29,59,28,175,61,102,153,116)
+IMAGE_DATA(238,53,94,158,126,161,155,124,241,79,158,150,191,49,92,253,114,160,143,124,39,176,86,190,27,183,193,240,117,117,84,248)
+IMAGE_DATA(156,53,241,3,134,97,172,57,170,174,253,78,96,129,252,244,127,174,147,121,61,18,100,233,59,137,242,122,183,177,50,214)
+IMAGE_DATA(156,27,44,89,119,66,6,142,94,73,150,182,235,62,213,240,213,176,181,219,12,233,212,103,30,207,19,150,172,63,194,221)
+IMAGE_DATA(41,185,168,63,134,110,210,127,1,121,95,228,92,241,183,10,78,65,175,230,231,223,98,158,22,58,17,159,207,55,12,119)
+IMAGE_DATA(193,95,244,7,35,55,124,237,218,53,246,241,98,119,8,230,107,144,147,193,206,27,4,53,88,184,130,53,220,146,82,204)
+IMAGE_DATA(142,22,145,157,168,175,210,15,162,164,142,250,22,156,65,77,18,58,85,119,130,163,246,138,215,67,143,19,125,183,49,135)
+IMAGE_DATA(154,145,206,239,9,166,130,39,120,47,33,95,132,93,113,168,185,178,47,41,215,230,86,217,171,148,93,233,179,16,188,3)
+IMAGE_DATA(91,161,37,161,95,241,61,11,10,27,248,117,220,33,231,48,84,253,240,117,23,13,152,203,90,172,215,47,204,215,246,217)
+IMAGE_DATA(234,234,213,200,222,26,253,30,45,162,133,94,109,228,191,47,247,21,20,150,70,177,52,150,167,122,159,191,167,213,217,229)
+IMAGE_DATA(214,218,158,243,214,184,170,158,126,191,110,189,138,62,33,212,73,49,219,130,188,71,109,109,45,189,163,90,11,120,95,192)
+IMAGE_DATA(195,16,90,181,109,14,166,237,162,23,45,133,179,190,90,118,199,188,231,236,92,77,90,122,3,123,129,81,99,197,12,30)
+IMAGE_DATA(222,91,233,233,232,187,104,52,231,248,239,178,119,2,30,54,135,79,92,151,241,243,226,249,249,14,174,30,58,121,149,92)
+IMAGE_DATA(141,237,91,106,109,7,92,107,243,50,26,145,219,5,81,181,85,55,7,28,155,255,213,57,85,221,183,170,172,4,83,93)
+IMAGE_DATA(174,186,186,53,182,31,88,57,236,246,45,129,173,26,154,15,198,209,245,139,176,59,199,163,247,187,233,222,25,237,73,82)
+IMAGE_DATA(239,37,101,43,57,187,205,220,183,253,2,119,211,96,47,40,116,234,162,117,150,161,202,209,89,203,246,114,62,115,218,162)
+IMAGE_DATA(157,70,135,238,96,76,154,183,157,236,132,231,17,106,140,189,71,174,96,15,207,219,195,140,254,124,199,232,200,1,11,13)
+IMAGE_DATA(67,45,71,17,157,250,205,143,138,215,250,204,149,87,123,207,241,143,29,123,205,101,253,18,241,198,192,249,172,175,14,155)
+IMAGE_DATA(176,210,28,193,215,229,134,179,203,200,85,27,43,153,247,7,95,59,247,26,43,79,61,215,69,190,248,71,63,149,47,5)
+IMAGE_DATA(6,202,95,153,248,86,96,163,124,203,112,245,219,129,117,242,112,96,61,3,172,213,248,30,195,101,237,26,249,71,195,214)
+IMAGE_DATA(111,199,45,149,118,127,186,89,150,14,76,151,169,125,14,75,151,62,147,13,87,183,82,191,119,31,182,72,94,232,50,73)
+IMAGE_DATA(94,122,115,42,115,193,47,188,53,85,122,12,93,194,127,135,248,237,167,228,122,74,18,181,96,73,233,61,114,181,162,234)
+IMAGE_DATA(174,229,76,94,41,251,59,177,11,14,81,82,118,147,94,128,220,111,93,117,75,26,155,140,190,173,190,203,158,38,228,128)
+IMAGE_DATA(145,255,229,44,89,102,142,245,9,54,175,129,94,36,228,109,225,99,200,186,91,69,19,235,171,240,108,0,139,225,93,136)
+IMAGE_DATA(93,160,214,15,222,238,64,133,135,45,248,93,144,223,64,205,138,215,67,173,22,44,69,30,152,59,206,61,159,8,212,83)
+IMAGE_DATA(144,103,174,172,184,69,47,81,112,9,187,110,202,42,110,178,23,200,250,13,70,244,41,152,7,142,151,150,91,6,131,105)
+IMAGE_DATA(214,175,197,246,64,185,26,213,229,163,159,255,205,213,125,115,229,30,87,43,91,207,1,123,59,224,240,222,111,141,173,60)
+IMAGE_DATA(191,190,143,94,85,174,198,178,181,85,205,234,113,21,215,193,82,55,7,204,189,231,222,190,27,229,106,54,124,116,127,77)
+IMAGE_DATA(253,183,173,93,212,175,1,175,141,190,43,120,37,98,158,180,181,192,99,120,14,158,11,111,96,245,149,106,187,180,93,244)
+IMAGE_DATA(60,13,61,138,200,243,166,166,53,154,207,23,115,254,157,209,204,92,84,126,65,51,119,155,227,58,222,255,240,227,71,45)
+IMAGE_DATA(9,123,88,15,159,72,49,92,221,100,62,223,182,202,100,195,86,112,245,196,249,244,22,117,213,214,188,247,221,251,46,95)
+IMAGE_DATA(179,251,105,16,152,155,177,179,51,249,62,127,221,220,112,107,57,97,60,134,121,26,212,85,145,3,142,212,77,211,162,152)
+IMAGE_DATA(170,122,85,123,152,116,215,249,209,179,25,247,229,106,44,91,221,154,171,235,27,172,122,117,147,63,167,122,145,243,54,96)
+IMAGE_DATA(230,170,205,103,24,43,183,192,55,255,164,23,167,101,197,166,19,178,44,254,152,44,94,135,186,233,126,163,69,247,24,142)
+IMAGE_DATA(238,150,25,203,109,160,167,104,212,140,77,70,123,174,227,174,211,222,195,87,202,91,131,151,74,215,254,139,165,75,191,69)
+IMAGE_DATA(134,145,11,169,53,113,236,50,96,177,116,29,184,136,1,174,226,118,231,190,11,141,174,51,108,237,59,223,231,43,244,169)
+IMAGE_DATA(242,180,67,207,57,100,41,142,29,122,88,174,190,57,104,30,121,58,28,49,121,37,131,124,157,180,212,246,51,77,88,229)
+IMAGE_DATA(113,117,169,116,234,57,74,126,252,147,78,242,151,127,208,78,190,16,24,32,95,140,27,46,223,12,108,151,127,8,108,146)
+IMAGE_DATA(111,4,226,25,223,52,92,117,67,121,251,29,135,183,96,237,63,24,182,182,255,210,118,89,55,42,44,35,122,108,52,191)
+IMAGE_DATA(231,92,25,51,103,139,44,217,116,92,222,158,188,90,58,152,219,237,186,78,150,118,93,38,178,31,24,222,191,83,22,237)
+IMAGE_DATA(150,61,135,46,200,197,139,23,201,172,230,155,255,100,116,196,109,238,249,42,175,168,97,221,18,125,191,119,238,221,230,110)
+IMAGE_DATA(46,104,88,212,96,111,221,185,45,55,111,189,203,251,48,131,3,191,6,236,49,199,126,238,226,98,187,211,6,236,164,238)
+IMAGE_DATA(13,55,48,47,12,63,38,244,235,161,63,10,189,191,232,81,13,6,109,78,87,119,221,100,6,211,248,28,244,2,163,7)
+IMAGE_DATA(10,249,102,214,110,211,211,88,191,197,76,12,24,68,222,21,148,240,92,0,51,172,240,119,194,156,14,190,55,180,49,230)
+IMAGE_DATA(120,42,107,44,87,49,27,132,252,48,180,32,250,9,161,77,209,75,140,115,1,156,35,128,109,216,41,167,61,69,208,181)
+IMAGE_DATA(170,83,169,111,67,209,71,213,169,246,88,121,95,174,250,59,226,162,184,26,201,3,127,18,87,99,243,191,254,238,241,24)
+IMAGE_DATA(182,106,14,152,92,117,251,130,60,174,34,92,189,10,174,194,79,87,185,250,239,217,67,122,191,30,91,213,173,96,37,114)
+IMAGE_DATA(187,247,11,212,98,241,28,157,133,105,235,219,109,187,184,23,206,217,148,223,34,75,211,51,110,208,191,16,243,54,240,134)
+IMAGE_DATA(64,157,53,37,165,217,188,191,111,242,115,0,222,165,120,239,166,7,155,229,200,169,12,25,55,119,35,107,120,232,91,58)
+IMAGE_DATA(120,34,217,227,106,190,191,251,45,214,79,169,181,125,112,150,171,222,238,55,195,83,13,87,179,222,111,22,199,239,85,186)
+IMAGE_DATA(156,29,53,167,234,230,119,181,119,73,115,192,218,179,116,236,92,38,153,122,228,76,58,227,240,105,203,85,212,88,93,111)
+IMAGE_DATA(8,68,108,159,176,171,95,237,158,115,27,168,169,250,181,210,120,248,30,29,98,44,88,125,64,230,173,220,199,152,111,24)
+IMAGE_DATA(186,112,205,65,178,20,57,93,244,19,161,55,7,94,242,152,11,237,51,106,181,116,127,103,153,209,158,203,25,111,14,94)
+IMAGE_DATA(226,243,18,199,78,134,153,136,215,250,91,78,130,153,86,163,46,104,17,54,207,59,47,138,167,86,159,206,150,151,186,207)
+IMAGE_DATA(148,118,111,161,7,104,182,188,220,99,22,239,123,235,157,69,134,155,171,56,147,60,114,234,106,114,117,228,180,149,50,106)
+IMAGE_DATA(234,74,222,55,100,220,74,206,85,161,254,218,165,231,72,249,209,51,175,201,95,252,254,139,242,249,64,127,163,89,199,202)
+IMAGE_DATA(223,7,118,202,223,199,109,145,175,7,54,155,216,200,80,198,90,206,186,172,93,103,180,45,52,237,58,249,106,220,42,233)
+IMAGE_DATA(240,208,62,217,56,190,92,250,191,177,92,250,140,92,38,19,102,111,51,26,254,168,116,158,178,92,58,205,88,45,29,7)
+IMAGE_DATA(47,144,231,58,143,167,118,197,220,15,184,122,244,212,5,195,180,60,234,72,248,19,97,95,37,52,43,118,129,160,159,61)
+IMAGE_DATA(51,179,65,110,221,126,215,230,99,130,77,220,59,131,28,48,188,89,155,154,239,176,79,9,51,48,208,175,212,180,197,141)
+IMAGE_DATA(172,119,34,135,91,81,126,155,243,29,186,123,38,35,61,100,103,110,12,47,234,106,223,101,110,56,53,51,155,143,163,94)
+IMAGE_DATA(138,124,46,188,201,80,167,197,28,43,110,131,175,244,17,78,183,26,22,236,67,110,58,39,191,146,115,169,232,91,2,35)
+IMAGE_DATA(209,223,0,125,13,246,128,179,101,165,55,217,99,197,121,218,162,6,238,109,5,27,45,87,155,173,207,127,216,178,13,188)
+IMAGE_DATA(196,253,124,109,47,255,27,93,111,173,178,92,13,85,139,187,127,213,101,170,230,138,53,39,108,217,122,255,60,48,230,236)
+IMAGE_DATA(220,60,112,168,0,121,235,27,220,183,163,92,109,173,190,218,66,179,186,121,96,183,239,54,134,171,58,207,250,235,228,170)
+IMAGE_DATA(94,98,89,104,119,148,255,170,85,95,227,214,162,109,22,166,237,210,218,5,169,11,156,35,67,147,226,115,8,231,197,212)
+IMAGE_DATA(169,230,200,254,165,12,124,214,220,148,52,212,90,131,141,214,51,184,160,81,142,158,14,202,164,233,155,233,17,60,117,238)
+IMAGE_DATA(102,217,115,36,73,142,159,75,147,203,87,115,184,127,220,106,206,252,40,255,164,8,99,11,236,142,114,79,167,34,236,215)
+IMAGE_DATA(56,189,78,201,5,12,220,23,235,37,161,113,42,209,104,213,132,28,191,87,201,237,75,82,29,138,192,117,50,212,99,174)
+IMAGE_DATA(30,173,142,181,187,108,244,24,233,95,74,33,63,193,209,61,199,175,154,251,192,213,100,191,143,105,227,190,139,178,126,55)
+IMAGE_DATA(102,85,225,9,124,74,86,110,62,46,75,214,31,50,204,220,207,61,239,96,41,245,231,18,203,77,120,22,177,231,118,236)
+IMAGE_DATA(26,233,59,122,149,116,31,106,153,137,99,143,97,43,120,212,64,62,247,173,33,203,24,184,174,90,244,141,65,139,61,198)
+IMAGE_DATA(46,246,121,234,70,108,222,55,194,210,217,126,174,23,129,190,90,244,216,34,192,215,23,123,76,39,87,123,13,95,196,61)
+IMAGE_DATA(245,163,167,175,37,71,17,99,204,245,113,51,215,242,8,205,58,114,234,90,121,103,220,18,233,212,99,184,60,254,228,139)
+IMAGE_DATA(242,103,255,181,171,252,121,160,159,124,49,48,77,190,22,216,45,95,137,219,102,142,155,13,43,109,224,250,215,12,95,53)
+IMAGE_DATA(160,103,255,33,206,114,22,199,127,8,108,144,135,12,87,95,255,246,81,217,60,185,94,186,119,154,39,131,198,161,199,124)
+IMAGE_DATA(155,204,92,179,71,94,25,185,72,94,25,189,80,94,155,180,88,218,247,153,45,207,118,28,35,221,135,44,166,95,69,226)
+IMAGE_DATA(181,32,117,29,244,29,56,87,91,115,67,110,27,45,122,235,222,93,230,131,161,159,208,43,4,61,24,10,89,118,114,230)
+IMAGE_DATA(166,160,156,245,77,250,27,86,52,74,105,37,62,183,27,253,253,229,224,42,238,199,62,26,204,208,104,159,18,248,8,239)
+IMAGE_DATA(164,234,218,123,204,5,163,39,137,30,159,185,202,204,34,235,197,15,95,137,244,108,234,87,250,48,101,100,113,94,7,220)
+IMAGE_DATA(67,95,18,158,139,247,17,250,4,241,158,179,57,220,48,127,94,228,132,193,82,228,139,145,39,46,228,254,29,143,141,185)
+IMAGE_DATA(118,174,5,190,44,216,169,110,239,171,247,120,87,239,107,85,191,7,216,171,161,170,167,4,88,139,185,28,213,173,177,253)
+IMAGE_DATA(192,174,135,146,205,39,55,50,34,122,53,58,23,108,163,153,245,214,136,94,45,107,193,86,87,175,182,96,170,19,174,102)
+IMAGE_DATA(45,45,169,138,170,175,130,173,240,97,176,92,109,254,181,113,181,237,210,118,249,117,94,124,95,204,95,125,100,206,15,239)
+IMAGE_DATA(82,167,106,93,21,253,75,193,220,58,250,47,161,222,154,154,134,163,237,19,206,230,123,187,89,78,95,200,150,113,179,54)
+IMAGE_DATA(50,198,207,220,44,59,143,38,144,171,23,175,230,210,255,55,33,165,208,15,232,209,136,102,245,120,235,240,84,181,170,91)
+IMAGE_DATA(99,117,235,174,254,222,213,228,60,250,44,157,55,60,85,253,10,189,170,181,82,104,80,55,192,78,28,145,239,165,119,161)
+IMAGE_DATA(106,212,243,65,207,99,41,213,211,168,215,124,173,74,93,122,56,57,102,255,234,69,217,188,239,130,209,164,231,101,227,30)
+IMAGE_DATA(248,21,158,162,207,207,234,173,199,201,83,204,89,162,23,23,62,241,240,81,128,238,236,61,114,21,243,182,96,161,230,102)
+IMAGE_DATA(85,107,118,30,184,132,247,129,171,202,208,183,135,175,148,158,35,86,145,177,8,220,7,198,226,136,231,33,34,92,93,200)
+IMAGE_DATA(235,110,224,62,213,165,110,128,169,152,77,209,80,158,34,94,236,54,221,99,235,116,106,86,229,234,216,153,235,13,75,215)
+IMAGE_DATA(203,216,25,235,24,224,42,98,196,148,53,124,124,208,24,163,155,223,26,38,63,248,225,115,242,39,191,211,77,254,52,208)
+IMAGE_DATA(215,112,117,150,60,20,216,39,127,27,216,46,127,23,216,194,248,74,220,86,249,106,192,139,24,206,126,157,156,53,215,227)
+IMAGE_DATA(54,200,87,140,102,125,243,145,227,178,101,234,13,121,189,35,102,83,215,242,92,100,130,57,39,121,113,196,98,105,55,108)
+IMAGE_DATA(129,180,27,49,87,158,31,48,81,126,220,97,152,252,248,229,225,210,243,157,133,114,235,214,29,246,205,94,73,170,149,91)
+IMAGE_DATA(55,223,149,123,247,238,112,214,230,222,157,119,165,161,254,3,206,182,92,78,184,68,13,10,175,165,186,218,247,89,175,196)
+IMAGE_DATA(220,11,122,140,154,26,63,160,39,108,85,229,109,163,101,107,216,23,12,31,96,228,99,225,139,95,86,114,151,61,76,96)
+IMAGE_DATA(45,242,187,232,107,194,60,75,105,137,237,227,5,111,185,139,85,25,148,91,202,61,212,152,205,0,3,114,115,172,207,33)
+IMAGE_DATA(242,192,41,248,218,80,133,228,135,154,252,190,35,246,253,102,219,253,170,232,37,6,239,139,139,110,88,79,6,175,247,9)
+IMAGE_DATA(58,22,187,110,184,243,220,219,101,110,243,179,182,142,106,251,145,44,43,117,182,84,123,156,220,26,106,164,198,106,235,172)
+IMAGE_DATA(209,115,54,53,81,245,88,63,60,109,138,136,104,213,122,134,63,187,74,189,234,229,130,11,171,156,218,234,199,213,87,237)
+IMAGE_DATA(81,251,149,252,190,37,111,182,70,245,170,114,149,122,213,92,207,249,13,232,213,182,75,219,229,215,125,97,190,227,87,191)
+IMAGE_DATA(48,127,179,247,200,80,112,19,129,222,95,188,151,160,79,211,179,170,76,84,48,79,12,239,8,60,15,179,55,9,201,233)
+IMAGE_DATA(50,106,230,6,122,180,142,157,185,73,182,30,188,40,135,207,164,146,145,216,99,147,152,90,36,73,105,197,30,87,45,55)
+IMAGE_DATA(221,92,111,20,47,91,99,232,53,104,211,220,168,62,225,168,62,226,164,124,234,89,112,245,196,197,104,173,74,189,122,49)
+IMAGE_DATA(18,71,46,100,112,182,22,1,174,178,255,247,196,117,217,119,236,170,236,58,148,32,219,247,95,49,113,73,182,238,189,32)
+IMAGE_DATA(155,141,6,141,223,121,202,232,208,211,100,104,252,110,163,71,119,156,148,229,155,177,123,205,250,29,77,93,188,71,70,207)
+IMAGE_DATA(216,206,93,160,253,199,174,99,207,45,24,248,198,16,163,45,7,47,99,188,137,227,192,37,12,213,151,110,157,19,189,69)
+IMAGE_DATA(120,236,141,65,75,201,76,176,20,108,181,218,117,89,148,94,125,16,174,50,71,28,211,151,132,80,125,10,93,26,27,17)
+IMAGE_DATA(198,98,118,101,38,253,30,48,55,53,110,214,6,153,48,59,94,198,155,227,216,25,107,24,227,103,65,199,26,222,206,136)
+IMAGE_DATA(55,92,93,32,175,189,57,68,190,243,189,103,228,143,2,61,229,143,3,125,228,11,129,5,134,169,7,229,111,2,59,229)
+IMAGE_DATA(111,226,182,147,175,54,182,26,198,186,177,197,103,237,67,228,239,38,70,143,167,79,73,252,148,27,210,238,165,97,212,244)
+IMAGE_DATA(83,230,239,146,97,179,182,200,83,125,22,200,51,125,231,203,179,3,102,203,115,131,103,200,43,61,38,203,59,99,86,202)
+IMAGE_DATA(201,243,169,114,231,214,109,122,59,224,239,180,172,178,73,238,220,125,159,57,90,236,180,97,141,179,216,60,150,157,79,182)
+IMAGE_DATA(193,111,159,60,203,189,201,25,83,248,44,96,254,38,92,80,47,141,245,247,232,47,204,249,68,163,73,49,39,10,190,65)
+IMAGE_DATA(207,162,182,138,57,25,104,83,120,10,219,124,110,145,245,216,199,46,27,163,51,145,223,41,42,105,246,188,134,179,188,253)
+IMAGE_DATA(222,197,254,238,27,212,79,240,60,104,92,122,214,231,89,63,95,112,21,61,68,105,233,101,60,151,197,247,165,135,81,65)
+IMAGE_DATA(53,251,158,232,37,8,159,66,120,50,133,172,31,4,25,155,83,229,251,46,217,62,164,50,191,207,215,159,163,137,213,171)
+IMAGE_DATA(49,225,106,212,214,123,151,234,98,116,234,253,231,87,153,7,14,55,58,122,181,44,102,118,181,210,11,111,118,181,168,101)
+IMAGE_DATA(239,146,155,3,118,251,129,213,23,2,215,209,15,220,198,213,182,203,103,251,242,145,191,127,21,62,134,224,41,62,159,144)
+IMAGE_DATA(151,178,239,225,6,175,55,184,150,28,197,172,13,114,194,105,169,224,111,153,121,78,62,115,157,99,102,108,228,172,228,142)
+IMAGE_DATA(3,151,229,240,169,107,100,221,149,180,130,40,174,42,75,85,163,226,122,172,247,82,44,55,241,58,96,39,226,124,162,230)
+IMAGE_DATA(126,115,233,97,136,208,121,28,245,146,0,91,53,224,255,127,244,108,150,28,62,157,33,135,78,165,202,193,147,41,156,175)
+IMAGE_DATA(133,215,226,238,35,9,178,237,208,37,217,178,247,156,108,218,125,134,1,118,174,219,113,134,61,69,11,215,30,145,89,203)
+IMAGE_DATA(246,211,139,126,220,156,29,220,169,61,120,226,70,25,48,118,131,12,26,191,81,6,142,139,151,254,99,226,121,187,239,152)
+IMAGE_DATA(117,210,123,212,26,79,103,174,98,61,20,156,68,88,166,46,242,243,179,172,115,246,158,235,245,18,217,158,93,240,22,76)
+IMAGE_DATA(4,59,221,136,229,104,108,104,222,55,246,62,229,246,171,189,231,249,249,95,204,165,130,173,208,163,154,247,197,117,229,42)
+IMAGE_DATA(52,43,230,67,95,234,54,141,94,74,212,170,30,87,113,4,79,17,216,177,0,174,142,153,102,244,248,240,57,210,161,203)
+IMAGE_DATA(0,249,198,55,159,150,255,29,24,104,184,218,75,254,34,176,84,254,58,238,168,124,41,176,75,254,202,143,29,242,101,19)
+IMAGE_DATA(202,218,88,222,34,103,252,215,200,25,255,238,118,233,215,238,146,172,153,88,39,47,116,24,66,189,10,47,165,190,83,118)
+IMAGE_DATA(202,211,253,55,74,167,177,155,100,218,202,19,178,251,120,58,251,114,161,35,225,255,139,121,83,244,210,225,239,55,191,176)
+IMAGE_DATA(201,48,199,243,243,203,171,228,103,59,249,88,122,67,42,74,239,208,11,16,121,87,244,225,193,195,23,125,120,216,127,10)
+IMAGE_DATA(173,90,89,85,79,158,90,77,89,198,222,98,104,79,250,238,167,229,178,119,8,156,198,46,26,228,103,45,51,115,232,119)
+IMAGE_DATA(8,205,26,46,174,145,138,234,27,204,223,114,167,184,209,201,5,249,117,236,109,74,73,75,101,142,26,121,102,250,52,5)
+IMAGE_DATA(67,124,29,104,98,48,9,179,108,41,169,158,159,25,188,24,176,235,46,28,241,127,192,239,130,254,92,250,139,162,143,23)
+IMAGE_DATA(251,164,242,75,189,125,111,222,142,114,60,39,47,226,205,228,115,213,153,83,141,101,45,250,250,221,136,221,111,163,122,53)
+IMAGE_DATA(18,159,148,7,182,231,21,240,60,102,124,202,60,112,84,14,88,123,149,220,57,27,234,213,182,60,112,219,229,183,227,2)
+IMAGE_DATA(174,194,119,6,204,196,30,115,244,119,176,182,234,249,2,163,182,106,123,154,236,78,86,244,12,99,38,7,185,176,19,167)
+IMAGE_DATA(211,100,204,236,141,212,171,155,119,95,144,35,103,146,200,70,228,118,193,83,176,85,245,170,27,202,213,214,252,129,35,172)
+IMAGE_DATA(205,139,234,9,142,245,89,58,157,148,35,39,19,130,236,5,166,14,61,103,251,143,14,25,134,238,54,26,116,199,254,139)
+IMAGE_DATA(178,253,192,69,217,113,240,18,181,40,114,185,216,75,142,221,168,56,31,176,187,92,246,203,132,185,123,100,196,244,237,100)
+IMAGE_DATA(38,56,217,111,236,122,30,251,142,217,32,125,70,175,229,237,254,227,108,244,27,187,206,123,108,157,121,108,141,57,174,229)
+IMAGE_DATA(177,215,200,85,126,141,244,205,129,139,109,207,238,128,197,81,172,179,57,218,249,126,15,175,237,227,93,232,215,77,35,12)
+IMAGE_DATA(141,104,92,230,142,251,205,247,181,110,108,45,213,237,89,210,231,169,102,5,83,17,224,43,66,123,149,192,84,203,213,233)
+IMAGE_DATA(30,83,167,83,175,226,54,60,31,198,67,167,122,90,85,249,58,113,142,61,142,154,182,65,70,78,54,191,239,160,105,210)
+IMAGE_DATA(254,181,62,242,149,175,254,216,112,117,152,137,62,242,249,192,90,249,98,192,114,245,75,129,221,94,184,140,141,112,214,198)
+IMAGE_DATA(54,249,187,184,29,230,107,182,202,215,127,111,183,188,243,90,178,44,29,83,42,47,188,54,76,6,143,95,47,147,23,239)
+IMAGE_DATA(230,44,239,185,196,160,20,20,53,114,46,133,251,198,179,75,13,79,111,211,191,26,159,255,248,188,182,57,212,74,246,250)
+IMAGE_DATA(160,15,8,243,53,213,213,205,228,17,230,107,42,176,83,53,175,128,252,202,203,187,41,183,111,189,39,77,55,154,153,171)
+IMAGE_DATA(132,102,5,19,160,73,161,77,225,85,8,205,139,89,211,43,137,9,228,36,106,156,234,113,200,188,175,97,46,216,152,193)
+IMAGE_DATA(29,115,233,212,196,152,143,41,46,109,98,253,22,58,25,129,219,156,93,53,26,23,61,81,232,187,73,247,122,154,240,254)
+IMAGE_DATA(193,124,108,70,70,173,164,166,86,49,23,140,28,46,244,98,126,94,189,231,167,84,235,123,218,187,53,83,176,151,186,213)
+IMAGE_DATA(219,15,167,59,107,172,223,82,165,223,171,228,206,220,232,12,171,239,207,20,213,171,20,155,7,118,251,150,90,209,171,230)
+IMAGE_DATA(24,241,49,212,126,96,119,126,181,244,99,114,192,21,159,152,3,118,125,150,116,206,70,235,171,174,31,111,27,87,219,46)
+IMAGE_DATA(159,181,139,183,37,206,219,191,122,151,126,16,200,231,224,60,25,154,21,44,77,77,171,247,234,171,245,54,31,76,174,214)
+IMAGE_DATA(147,171,240,53,135,31,249,228,249,91,232,231,179,113,239,89,217,127,34,73,206,36,229,123,243,51,209,181,83,237,99,114)
+IMAGE_DATA(189,32,220,29,228,177,30,192,103,175,154,235,215,172,70,61,117,57,203,240,51,211,104,81,228,115,141,22,61,151,42,71)
+IMAGE_DATA(78,95,167,62,134,31,197,190,227,137,178,235,216,21,217,113,228,138,108,222,143,185,209,19,156,125,132,63,253,12,163,61)
+IMAGE_DATA(177,167,101,212,204,237,212,157,253,70,131,137,96,164,209,157,227,54,146,155,202,78,189,142,232,99,110,247,50,220,236,61)
+IMAGE_DATA(202,62,31,1,109,106,99,53,239,239,53,114,45,163,231,136,53,204,225,190,61,124,53,53,107,132,141,11,163,244,42,120)
+IMAGE_DATA(167,253,185,46,39,45,35,23,221,39,162,231,80,221,235,250,122,177,175,229,214,89,85,183,106,216,249,154,217,94,110,120)
+IMAGE_DATA(186,223,183,132,235,195,167,174,167,207,199,120,234,212,13,228,235,68,115,27,1,173,10,79,8,204,218,96,231,248,243,29)
+IMAGE_DATA(123,202,151,255,230,105,249,163,192,40,19,253,229,207,141,238,252,139,192,17,249,66,96,15,227,47,188,227,23,12,79,17)
+IMAGE_DATA(127,25,23,97,237,151,28,206,126,222,240,245,91,191,127,64,198,118,207,146,153,67,50,228,165,55,70,50,191,14,95,227)
+IMAGE_DATA(132,235,249,212,149,232,59,202,9,214,25,125,86,44,25,193,114,203,84,248,33,20,88,174,102,102,135,169,145,234,106,155)
+IMAGE_DATA(200,55,104,67,104,39,124,206,195,23,184,204,48,12,158,14,121,225,114,238,147,129,111,45,106,179,168,161,98,46,27,253)
+IMAGE_DATA(73,89,57,230,60,48,233,58,61,236,176,195,172,212,124,214,39,38,93,165,62,5,11,147,175,166,210,207,144,154,16,251)
+IMAGE_DATA(99,12,119,177,207,6,185,96,244,11,163,127,10,51,56,85,85,77,100,38,88,136,92,50,158,139,90,172,221,37,23,164)
+IMAGE_DATA(94,197,12,42,188,88,208,143,12,198,193,63,20,92,197,222,24,101,165,50,81,239,179,254,132,245,222,142,184,114,158,75)
+IMAGE_DATA(224,190,8,43,35,94,192,234,31,236,251,68,120,26,21,117,88,183,111,41,218,27,34,186,190,250,113,243,171,209,253,192)
+IMAGE_DATA(205,49,245,213,210,168,25,214,214,102,89,91,155,97,141,245,47,116,231,86,181,55,184,173,190,218,118,249,172,95,180,43)
+IMAGE_DATA(28,253,228,232,245,192,185,53,254,182,145,79,202,204,40,149,212,244,98,243,57,82,108,62,51,74,236,49,45,204,243,253)
+IMAGE_DATA(52,115,27,187,36,179,131,85,252,172,136,223,113,148,189,75,241,123,206,200,161,211,41,244,103,208,60,109,68,119,70,207)
+IMAGE_DATA(205,248,59,221,188,93,110,90,251,68,14,23,71,248,75,28,63,151,33,39,208,183,123,42,69,246,29,77,146,189,199,18)
+IMAGE_DATA(200,79,176,123,207,81,195,208,3,9,212,200,171,182,156,162,239,31,62,135,199,205,221,45,195,167,109,147,119,38,111,145)
+IMAGE_DATA(33,83,182,242,56,96,210,38,233,15,158,78,136,151,222,70,111,190,13,22,142,182,218,179,255,184,13,158,246,244,116,233)
+IMAGE_DATA(152,72,224,62,4,56,218,107,228,106,63,215,219,99,168,97,232,176,181,242,246,208,21,140,158,195,86,74,175,225,171,120)
+IMAGE_DATA(4,87,223,26,178,194,207,7,171,230,124,99,192,18,206,156,42,231,148,133,170,91,161,97,161,101,221,219,202,212,88,205)
+IMAGE_DATA(27,153,155,153,207,153,25,188,30,30,83,221,139,231,187,207,117,235,173,184,173,189,193,232,97,178,253,193,182,175,9,51)
+IMAGE_DATA(172,240,13,198,44,242,4,229,233,220,77,54,204,117,50,117,252,106,250,5,195,107,233,39,237,123,200,95,126,225,89,249)
+IMAGE_DATA(131,192,88,249,195,192,59,242,57,195,205,63,11,28,54,60,221,39,159,143,139,4,110,255,133,199,217,104,214,218,227,159)
+IMAGE_DATA(6,182,203,119,255,244,176,76,29,80,36,35,123,159,146,142,111,79,228,30,157,249,43,15,74,98,114,14,115,169,89,89)
+IMAGE_DATA(197,114,237,122,145,164,167,4,37,37,37,151,127,131,89,25,69,244,107,192,125,152,129,65,45,19,251,106,240,183,137,235)
+IMAGE_DATA(232,195,133,247,61,250,115,177,235,205,250,29,133,12,103,75,232,13,95,82,82,70,230,5,61,127,36,212,75,19,18,146)
+IMAGE_DATA(232,81,87,93,93,203,215,74,76,184,198,221,173,232,103,74,74,74,226,49,45,173,192,176,52,143,61,191,244,103,74,73)
+IMAGE_DATA(147,164,228,107,244,86,194,156,13,60,99,173,135,127,62,127,110,246,45,165,166,50,240,92,252,60,200,93,23,228,151,144)
+IMAGE_DATA(183,120,173,140,12,195,220,244,34,115,44,96,127,20,35,171,144,95,143,223,7,252,6,143,241,111,193,231,226,107,204,115)
+IMAGE_DATA(176,119,142,143,51,242,189,215,42,160,39,20,255,29,188,215,176,199,66,231,185,97,127,215,141,191,243,198,219,129,163,145)
+IMAGE_DATA(147,93,206,29,235,8,212,115,115,225,41,172,179,59,158,31,162,123,31,117,116,168,132,243,78,168,63,231,133,52,10,253)
+IMAGE_DATA(200,231,78,158,98,6,254,125,109,148,248,129,26,55,238,11,23,148,240,255,19,142,220,171,91,96,175,135,66,209,190,16)
+IMAGE_DATA(109,92,109,187,124,246,46,182,190,138,3,102,156,225,31,2,111,46,124,230,228,230,230,210,91,26,125,141,233,233,169,156)
+IMAGE_DATA(207,179,254,211,41,222,125,214,139,26,181,165,132,164,68,163,101,226,89,159,60,120,234,170,156,189,146,237,247,27,197,250)
+IMAGE_DATA(249,130,163,96,231,145,179,105,114,232,92,26,57,140,189,173,123,142,38,50,80,255,212,235,136,109,7,47,243,117,151,111)
+IMAGE_DATA(58,33,11,215,159,144,89,43,143,202,148,197,7,101,244,236,221,50,198,139,81,179,118,201,136,25,59,100,248,244,237,50)
+IMAGE_DATA(204,48,117,232,84,27,35,166,237,224,113,240,164,205,50,112,194,70,63,127,107,245,234,90,234,85,132,234,80,229,168,178)
+IMAGE_DATA(84,3,183,193,84,219,83,180,138,220,124,107,248,10,121,115,232,50,134,59,31,131,231,116,31,186,146,92,237,50,120,177)
+IMAGE_DATA(116,30,180,40,74,143,42,51,53,52,47,140,163,94,7,251,220,89,153,216,126,167,8,43,231,121,92,141,232,95,173,179)
+IMAGE_DATA(186,207,213,215,113,191,86,243,196,168,189,66,191,226,58,188,1,225,201,15,239,44,4,118,234,90,175,196,77,212,173,208)
+IMAGE_DATA(169,3,199,173,164,71,240,171,221,71,203,147,207,189,33,159,255,156,229,234,255,10,140,148,207,5,246,27,70,30,50,186)
+IMAGE_DATA(21,199,3,188,141,248,115,198,222,86,56,139,227,46,249,19,19,143,252,245,113,153,61,188,70,250,117,219,105,126,254,153)
+IMAGE_DATA(134,171,235,101,206,138,253,114,254,66,130,92,78,184,32,137,87,18,228,74,194,85,195,189,4,243,247,118,137,183,121,95)
+IMAGE_DATA(98,130,189,47,225,178,36,36,38,75,194,229,43,188,205,199,174,152,231,225,62,195,74,62,142,251,253,219,73,222,237,68)
+IMAGE_DATA(185,114,57,153,143,39,34,174,36,240,177,43,137,222,243,241,189,204,115,146,140,110,5,87,113,61,49,241,10,191,151,189)
+IMAGE_DATA(158,200,231,241,177,228,36,255,121,136,171,87,175,74,114,114,178,137,107,222,109,112,57,217,246,28,51,174,25,206,26,110)
+IMAGE_DATA(95,79,101,127,114,74,74,10,253,37,236,81,67,125,39,34,158,239,224,51,142,233,169,105,45,252,224,99,159,243,127,218)
+IMAGE_DATA(59,19,232,186,170,43,77,75,169,4,130,77,128,144,174,164,146,172,238,170,181,186,171,186,82,221,181,86,85,37,85,213)
+IMAGE_DATA(13,36,132,20,102,52,158,240,60,201,178,101,203,150,53,121,214,96,201,146,108,107,176,37,75,150,45,91,158,231,1,15)
+IMAGE_DATA(24,48,193,54,49,16,108,12,4,2,102,176,53,99,27,232,170,16,167,186,154,208,43,78,170,23,201,238,179,247,121,251)
+IMAGE_DATA(222,115,143,238,189,239,190,39,25,201,120,255,107,109,158,244,36,61,9,27,206,167,127,79,39,56,126,230,251,218,222,56)
+IMAGE_DATA(99,124,252,76,192,247,48,158,199,251,10,232,172,120,213,57,47,18,141,160,159,21,63,166,247,220,191,229,236,185,23,174)
+IMAGE_DATA(138,250,163,120,206,6,103,155,113,119,23,238,228,250,197,47,126,65,255,221,182,180,180,56,251,165,131,2,235,85,239,188)
+IMAGE_DATA(125,150,126,15,109,218,114,128,102,78,48,39,251,212,179,175,208,60,41,205,182,224,206,192,31,159,129,195,184,67,80,49)
+IMAGE_DATA(119,223,147,207,193,174,67,207,17,47,185,238,185,97,247,113,218,77,132,247,185,212,172,127,10,150,212,29,128,69,203,118)
+IMAGE_DATA(43,118,238,81,172,220,65,145,95,182,19,230,148,239,162,199,185,101,187,220,176,152,154,91,186,157,2,153,138,207,99,221)
+IMAGE_DATA(52,167,120,43,100,46,218,96,213,77,215,59,156,197,124,46,230,113,49,208,151,106,111,186,186,155,95,69,47,202,53,84)
+IMAGE_DATA(179,79,151,231,100,204,57,84,254,24,114,142,243,185,200,84,238,85,210,44,53,231,97,170,60,108,213,252,117,185,136,143)
+IMAGE_DATA(186,78,90,233,240,84,199,82,199,255,250,49,152,159,115,114,196,25,85,196,79,12,237,93,241,123,47,163,239,57,54,179)
+IMAGE_DATA(26,150,172,220,1,21,117,59,160,188,22,239,191,217,78,57,254,162,152,95,197,221,133,184,175,63,45,167,10,30,25,155)
+IMAGE_DATA(11,119,254,104,4,252,241,237,15,194,45,169,139,20,87,11,225,63,164,28,129,219,83,14,16,91,191,166,184,250,117,122)
+IMAGE_DATA(219,136,212,253,14,107,117,40,214,226,231,166,238,130,31,124,231,25,168,89,248,75,24,63,90,253,57,231,84,211,172,47)
+IMAGE_DATA(206,2,35,123,94,58,117,154,238,107,195,183,57,112,39,176,249,126,148,192,175,73,52,144,113,97,193,62,212,12,147,9)
+IMAGE_DATA(38,51,240,247,84,14,220,117,136,243,56,120,215,43,6,222,155,130,181,67,154,205,81,191,211,162,47,139,247,255,95,127)
+IMAGE_DATA(15,123,95,125,208,254,250,168,129,123,238,209,171,126,248,225,135,228,1,112,231,145,220,31,35,234,175,66,190,226,46,46)
+IMAGE_DATA(220,99,141,255,189,34,91,209,183,94,184,112,33,78,92,130,139,23,186,232,237,19,63,125,141,102,83,246,62,254,34,236)
+IMAGE_DATA(63,242,34,121,205,221,79,60,31,171,121,254,132,118,211,227,30,63,220,123,139,119,153,149,174,60,8,69,53,202,119,42)
+IMAGE_DATA(46,230,149,108,119,216,137,143,217,200,194,50,237,53,49,143,139,143,200,74,252,24,178,117,126,197,30,237,83,21,87,93)
+IMAGE_DATA(158,162,71,221,234,126,46,190,166,122,14,3,185,138,158,213,101,107,115,172,94,218,20,235,229,93,75,62,84,215,71,245)
+IMAGE_DATA(12,169,233,87,153,181,238,12,12,115,115,85,108,78,102,37,113,149,231,78,109,238,154,108,229,240,250,210,154,110,158,85)
+IMAGE_DATA(231,131,171,60,76,117,123,123,117,141,148,125,38,231,119,205,218,171,89,115,117,251,135,171,189,108,117,60,172,206,19,79)
+IMAGE_DATA(156,93,171,60,226,94,226,106,69,221,46,40,83,140,93,162,216,138,190,21,253,106,230,2,189,7,105,114,214,50,120,224)
+IMAGE_DATA(209,76,248,199,31,12,129,219,111,121,24,6,166,44,132,155,83,74,21,75,159,84,140,60,172,30,15,169,56,224,9,100)
+IMAGE_DATA(173,201,216,111,168,248,147,212,131,202,171,238,83,44,222,13,247,127,247,56,172,42,254,63,240,232,176,229,180,111,10,239)
+IMAGE_DATA(86,199,223,211,144,61,24,56,23,195,111,247,118,48,219,252,2,121,231,23,204,64,51,144,135,28,200,69,147,141,204,18)
+IMAGE_DATA(188,123,12,3,25,129,119,165,224,239,175,24,173,173,152,151,110,163,218,33,178,3,239,73,233,234,234,162,223,113,227,255)
+IMAGE_DATA(127,216,63,35,104,95,61,71,162,175,119,233,210,37,217,115,47,186,102,196,59,187,240,191,83,204,7,127,242,201,39,116)
+IMAGE_DATA(239,81,208,190,105,207,238,233,255,253,43,245,248,43,248,240,23,151,225,249,51,103,225,240,209,23,225,228,233,55,224,103)
+IMAGE_DATA(111,181,192,178,85,251,244,142,248,210,102,218,159,131,231,37,70,222,146,93,177,216,238,228,108,49,176,30,106,190,143,44)
+IMAGE_DATA(156,85,184,201,169,149,146,15,141,249,214,57,229,59,201,143,34,75,179,23,111,241,124,157,14,245,249,177,64,174,226,107)
+IMAGE_DATA(224,107,97,61,149,122,146,230,53,197,122,142,92,94,114,248,113,21,159,227,192,207,65,102,242,60,141,237,89,77,191,170)
+IMAGE_DATA(63,111,165,195,83,61,199,186,194,225,158,95,110,152,125,173,221,219,203,243,50,92,19,197,247,109,191,106,231,143,221,28)
+IMAGE_DATA(116,85,140,171,49,63,27,243,171,248,113,244,171,248,26,147,103,175,132,229,171,247,193,242,134,221,221,184,138,187,42,167)
+IMAGE_DATA(205,89,9,233,121,234,223,41,179,28,238,29,58,13,190,123,231,3,112,219,128,17,48,48,117,62,220,156,186,76,241,241)
+IMAGE_DATA(25,248,106,202,227,234,17,227,144,39,52,95,31,139,133,102,237,31,171,183,111,79,213,239,15,189,235,89,168,43,254,53)
+IMAGE_DATA(12,126,164,24,50,230,173,165,221,200,219,246,159,112,56,116,53,2,217,22,20,38,251,252,130,121,104,6,178,145,249,104)
+IMAGE_DATA(50,146,195,102,37,178,5,89,129,119,166,224,239,177,232,195,240,206,49,100,7,254,110,251,209,71,31,209,125,104,120,183)
+IMAGE_DATA(202,181,24,241,206,142,68,95,207,111,207,189,236,14,20,245,103,225,239,125,248,223,41,223,231,16,111,231,180,25,252,185)
+IMAGE_DATA(87,126,247,91,248,205,149,223,193,149,223,254,187,122,255,55,176,184,122,43,237,104,199,59,203,240,222,149,105,115,87,67)
+IMAGE_DATA(250,220,85,142,175,204,42,218,68,236,204,94,188,221,137,156,146,29,244,56,171,80,115,16,235,162,204,86,246,162,58,216)
+IMAGE_DATA(159,110,37,230,50,147,221,183,183,82,14,24,253,42,178,21,191,30,95,139,185,170,121,201,189,188,141,177,186,104,125,55)
+IMAGE_DATA(174,50,83,217,203,50,131,245,156,105,125,44,220,185,83,147,171,204,90,222,67,104,206,155,242,254,37,230,44,243,149,67)
+IMAGE_DATA(191,239,221,147,207,193,124,53,231,104,240,115,76,158,142,157,97,207,226,48,83,253,250,137,181,223,205,152,91,15,85,107)
+IMAGE_DATA(30,115,184,74,76,197,58,107,245,118,154,79,198,252,108,90,206,10,24,55,125,9,252,211,195,83,224,111,254,225,94,184)
+IMAGE_DATA(249,198,9,112,83,234,28,197,213,90,184,53,229,24,220,146,114,4,110,83,129,124,253,106,202,19,250,49,149,249,106,48)
+IMAGE_DATA(55,198,211,175,40,207,250,181,47,28,128,81,247,190,4,181,165,31,195,131,131,23,168,191,163,6,186,143,253,224,209,159)
+IMAGE_DATA(58,140,186,26,129,220,11,11,147,137,54,31,205,64,86,154,97,122,76,102,167,205,79,100,39,6,222,69,134,252,196,62)
+IMAGE_DATA(28,102,40,50,7,127,175,69,134,224,239,184,152,71,194,223,119,175,181,136,119,110,36,243,122,188,231,94,152,42,186,86)
+IMAGE_DATA(196,187,163,163,236,154,118,2,208,235,170,175,251,244,247,10,206,127,160,89,88,218,69,253,41,208,110,92,156,135,156,165)
+IMAGE_DATA(130,119,226,162,95,229,62,93,100,42,7,123,82,12,253,254,102,15,87,77,223,202,95,107,126,141,249,122,248,118,110,140)
+IMAGE_DATA(167,236,87,189,121,224,117,177,220,110,147,135,155,188,239,8,223,231,220,47,239,124,48,61,45,179,210,230,42,239,71,178)
+IMAGE_DATA(131,63,198,57,97,119,207,111,173,179,59,66,231,138,189,117,81,187,207,200,158,155,9,242,171,196,210,12,219,183,234,176)
+IMAGE_DATA(119,7,155,175,159,185,160,17,170,215,30,80,92,221,75,92,45,173,217,70,76,69,175,138,92,157,156,93,9,83,114,21)
+IMAGE_DATA(171,167,22,193,61,15,78,132,255,246,183,119,195,77,95,72,135,47,167,228,41,207,218,164,152,122,28,190,162,88,250,21)
+IMAGE_DATA(197,85,230,171,25,154,179,49,214,198,226,166,148,131,240,237,1,79,65,218,200,215,160,178,228,35,184,247,225,153,144,85)
+IMAGE_DATA(216,12,229,181,251,225,248,201,87,186,49,173,189,211,159,117,81,248,23,47,108,62,50,35,253,34,44,231,201,12,101,142)
+IMAGE_DATA(218,94,212,102,41,230,53,217,143,125,252,241,199,196,83,204,115,34,79,145,37,248,123,46,254,190,155,208,255,151,159,227)
+IMAGE_DATA(144,29,247,162,235,73,244,223,59,184,243,59,120,7,247,204,133,200,212,70,186,95,27,253,42,222,21,170,25,168,188,106)
+IMAGE_DATA(193,22,79,204,46,222,214,141,153,252,62,242,213,12,100,36,243,150,121,234,229,239,22,98,179,201,85,246,171,188,35,201)
+IMAGE_DATA(244,170,156,227,101,158,154,92,245,171,173,234,123,102,244,157,51,54,67,93,159,90,239,201,15,115,78,24,131,119,41,217)
+IMAGE_DATA(251,125,187,239,144,240,114,213,158,157,49,231,103,76,30,155,207,217,209,189,63,120,25,69,118,81,147,206,3,215,239,135)
+IMAGE_DATA(114,228,42,245,45,109,163,123,0,113,142,10,239,177,65,207,138,119,163,34,87,255,235,95,127,31,110,76,201,132,27,82)
+IMAGE_DATA(114,97,64,234,102,24,168,252,234,205,138,159,3,83,159,160,199,91,20,67,117,28,113,88,139,113,107,202,147,42,142,194)
+IMAGE_DATA(109,169,79,171,231,159,130,111,126,249,4,12,190,231,77,200,74,187,8,247,13,205,87,191,139,173,131,202,134,131,112,234)
+IMAGE_DATA(204,207,187,177,175,163,171,61,97,94,38,195,211,100,185,202,222,212,244,167,65,57,222,48,143,138,185,78,243,30,50,241)
+IMAGE_DATA(103,34,209,245,37,239,255,239,191,39,207,170,156,43,157,209,184,23,111,250,252,213,196,85,100,234,148,188,85,138,113,91)
+IMAGE_DATA(105,166,148,57,136,57,223,153,5,46,59,221,220,112,247,186,168,25,248,28,242,21,131,89,203,95,143,220,198,175,229,232)
+IMAGE_DATA(206,213,117,158,252,46,51,213,172,171,6,247,44,105,166,98,109,21,223,54,251,148,220,61,132,122,63,176,201,92,222,77)
+IMAGE_DATA(232,214,94,221,183,205,189,191,174,151,228,89,156,229,158,222,36,211,111,218,204,245,246,14,119,15,147,165,35,145,167,83)
+IMAGE_DATA(151,194,224,9,139,225,193,177,139,96,250,188,58,242,171,88,23,71,174,226,125,234,154,171,155,169,31,24,119,106,77,153)
+IMAGE_DATA(173,190,119,90,1,220,125,255,120,248,47,223,185,139,152,138,241,229,148,29,48,64,113,117,128,226,229,64,197,202,1,138)
+IMAGE_DATA(157,248,246,128,24,103,7,166,32,67,143,169,56,161,216,250,52,241,245,230,148,173,234,99,149,138,201,21,240,213,47,62)
+IMAGE_DATA(3,127,245,173,51,240,208,232,124,200,43,105,166,159,3,103,80,61,94,21,243,179,157,109,234,237,174,200,158,181,167,158)
+IMAGE_DATA(54,42,111,195,124,107,20,207,202,126,149,217,26,228,87,175,39,201,239,17,34,81,76,134,97,197,90,157,203,213,213,144)
+IMAGE_DATA(158,95,71,92,37,78,22,186,28,180,153,200,28,100,222,226,199,92,143,233,250,72,100,43,190,22,126,28,121,201,156,181)
+IMAGE_DATA(243,199,28,252,125,40,23,60,119,125,183,126,36,147,173,230,140,141,153,7,230,217,84,14,154,101,245,201,251,114,79,19)
+IMAGE_DATA(123,83,211,159,186,30,86,7,251,216,96,174,186,253,189,230,28,141,153,23,54,63,238,119,79,28,135,190,219,6,119,23)
+IMAGE_DATA(46,134,7,198,20,192,125,163,22,18,83,49,22,85,110,161,59,97,93,191,186,147,242,192,188,23,34,187,160,1,210,102)
+IMAGE_DATA(171,215,155,184,0,238,186,119,12,252,217,159,223,169,152,154,167,60,107,190,226,234,30,197,200,227,196,207,1,202,135,18)
+IMAGE_DATA(87,83,159,81,143,39,212,115,39,53,115,83,15,193,77,41,27,224,203,169,203,213,231,47,130,47,165,230,171,231,231,193)
+IMAGE_DATA(77,169,69,240,71,41,75,225,47,255,58,3,38,102,85,65,126,105,51,212,54,63,65,251,5,156,90,103,91,59,237,113)
+IMAGE_DATA(104,235,104,85,111,119,170,231,90,227,214,71,163,214,75,147,225,110,84,198,250,213,86,253,124,43,230,130,169,15,48,150)
+IMAGE_DATA(11,54,235,170,236,89,57,7,42,18,137,174,95,213,174,63,76,53,213,233,115,27,169,39,38,61,191,158,184,202,30,148)
+IMAGE_DATA(153,201,12,52,243,185,153,139,116,240,158,65,174,137,18,255,114,21,91,243,214,210,172,12,243,148,247,250,186,62,118,147)
+IMAGE_DATA(135,217,94,95,219,76,187,150,152,157,238,204,170,203,86,253,177,181,206,199,117,109,181,209,225,42,243,180,251,190,252,85)
+IMAGE_DATA(206,206,125,115,79,131,222,175,95,231,112,117,114,110,61,237,106,194,251,203,41,178,241,107,221,92,48,222,89,206,179,54)
+IMAGE_DATA(35,166,87,58,125,73,92,55,181,243,195,180,187,48,83,135,61,159,67,60,157,82,14,15,143,47,132,135,198,40,134,142)
+IMAGE_DATA(46,128,7,70,23,194,160,145,243,168,94,90,215,116,8,26,183,232,59,216,171,27,15,18,91,43,234,119,82,223,82,73)
+IMAGE_DATA(213,118,202,3,23,45,223,64,119,221,76,154,181,20,134,78,152,3,119,253,211,40,248,79,127,250,125,248,82,74,1,220)
+IMAGE_DATA(152,154,167,56,121,88,241,17,253,234,113,98,232,192,148,159,16,87,177,126,138,44,189,49,101,153,138,249,196,96,252,154)
+IMAGE_DATA(47,165,148,42,38,207,129,1,55,140,135,111,126,235,62,248,187,59,134,195,200,41,69,144,150,85,173,56,190,5,214,108)
+IMAGE_DATA(63,154,48,55,123,43,18,101,109,16,99,109,255,106,179,21,61,171,221,247,27,230,89,37,23,44,18,137,86,109,56,226)
+IMAGE_DATA(225,42,50,213,203,85,151,121,204,85,157,171,221,72,92,212,187,144,52,251,216,175,114,222,22,185,138,245,81,158,67,229)
+IMAGE_DATA(207,209,143,205,244,181,54,107,241,145,25,142,108,53,251,152,152,159,38,87,77,150,243,30,37,205,211,6,167,118,202,62)
+IMAGE_DATA(83,243,178,222,153,105,53,247,250,50,87,241,121,190,199,60,45,79,113,58,187,158,34,45,87,199,196,236,58,207,30,66)
+IMAGE_DATA(234,11,206,208,129,115,49,188,175,112,212,244,74,234,235,37,63,59,117,57,140,153,94,237,204,163,210,247,204,84,172,205)
+IMAGE_DATA(40,163,251,105,30,26,87,0,15,143,45,80,143,69,240,208,248,197,116,199,218,220,146,213,176,121,231,227,116,127,89,71)
+IMAGE_DATA(251,5,216,178,247,199,176,114,221,33,168,92,127,80,231,129,27,246,171,56,0,101,184,27,162,122,7,121,86,156,181,65)
+IMAGE_DATA(6,79,152,81,1,131,199,230,194,29,247,60,10,223,254,246,61,112,67,106,161,98,101,1,229,120,7,166,60,79,117,213)
+IMAGE_DATA(155,82,119,170,88,171,158,47,39,79,138,44,189,49,165,88,113,182,20,190,152,50,3,110,25,56,2,190,245,205,65,240)
+IMAGE_DATA(231,127,245,125,248,251,187,134,194,253,67,51,96,216,196,249,234,223,187,76,253,29,215,146,79,222,182,247,196,85,237,5)
+IMAGE_DATA(142,210,15,28,198,91,167,222,107,113,214,230,171,237,93,237,158,96,102,171,233,89,131,234,172,215,99,46,88,36,18,121)
+IMAGE_DATA(133,247,125,79,83,60,205,152,179,154,246,9,104,174,54,120,184,234,205,221,110,118,60,170,230,234,122,207,110,193,238,121)
+IMAGE_DATA(91,222,145,228,238,198,231,71,190,139,134,119,42,49,99,205,220,51,115,221,156,105,229,215,230,250,170,185,235,193,188,191)
+IMAGE_DATA(141,243,186,236,47,153,155,122,39,112,141,39,23,203,31,231,59,225,232,14,115,197,209,201,57,250,17,239,110,197,63,23)
+IMAGE_DATA(205,214,85,206,235,62,58,35,150,255,205,48,246,70,204,112,95,119,164,57,251,138,247,207,101,44,87,190,116,9,12,153)
+IMAGE_DATA(180,24,30,153,88,12,131,199,21,18,83,199,206,88,10,101,213,91,224,200,209,147,250,252,239,208,53,202,174,182,86,245)
+IMAGE_DATA(216,70,61,182,120,79,123,245,218,199,149,87,61,0,213,245,177,89,155,85,187,157,92,48,238,53,156,152,181,28,198,41)
+IMAGE_DATA(94,63,52,106,54,252,143,187,135,195,215,191,49,72,121,213,18,229,61,23,194,192,212,237,202,179,174,81,129,236,204,83)
+IMAGE_DATA(207,205,87,62,181,84,189,95,8,55,124,97,26,220,122,235,80,248,230,127,252,33,124,231,111,126,4,255,243,135,143,194)
+IMAGE_DATA(15,31,152,4,131,30,201,128,251,70,204,132,33,19,23,194,248,233,229,202,179,215,192,180,249,141,48,191,98,11,108,223)
+IMAGE_DATA(247,236,85,231,106,111,204,225,4,241,214,143,175,204,214,160,90,171,233,89,205,190,96,187,127,73,36,18,93,191,90,183)
+IMAGE_DATA(245,40,76,85,60,157,154,87,239,212,86,145,31,156,235,53,185,138,76,69,158,114,176,151,100,63,233,238,26,116,119,51)
+IMAGE_DATA(184,123,28,188,108,53,253,43,127,189,95,191,147,217,247,228,238,138,88,227,233,85,178,119,39,153,117,82,115,6,213,141)
+IMAGE_DATA(88,30,55,182,155,208,222,37,232,228,129,179,235,169,182,138,44,101,166,50,87,157,239,49,83,207,160,34,63,135,99,46)
+IMAGE_DATA(120,70,165,246,170,25,85,177,251,91,171,96,88,250,18,197,208,66,135,165,195,38,149,192,176,9,133,144,181,176,1,214)
+IMAGE_DATA(109,62,0,47,190,244,58,116,182,119,16,75,59,59,223,163,59,90,218,219,117,125,178,77,61,182,118,181,81,221,18,239)
+IMAGE_DATA(108,193,188,61,238,186,199,126,51,187,119,9,103,110,198,207,92,10,163,167,46,134,251,134,103,194,247,238,124,24,110,255)
+IMAGE_DATA(218,96,197,205,165,202,139,102,83,46,248,139,169,11,213,99,49,220,144,50,15,110,252,163,116,184,237,182,33,240,167,255)
+IMAGE_DATA(249,7,240,223,191,119,15,220,249,163,145,112,207,224,41,48,72,125,237,131,138,203,67,198,207,135,225,105,69,234,223,161)
+IMAGE_DATA(12,38,204,170,164,252,47,238,165,152,148,189,146,246,79,224,221,184,188,103,33,217,248,172,88,27,148,43,246,155,103,53)
+IMAGE_DATA(61,171,31,87,109,207,202,185,96,225,170,72,36,66,109,220,121,204,225,234,148,188,90,229,207,106,137,29,102,254,215,237)
+IMAGE_DATA(55,218,228,48,149,217,199,62,82,231,105,215,19,59,205,57,83,246,145,186,159,119,45,113,149,115,186,204,85,251,117,248)
+IMAGE_DATA(181,77,238,50,83,237,30,96,190,167,156,57,199,92,117,119,59,116,223,235,224,157,57,237,126,143,27,115,149,106,170,57)
+IMAGE_DATA(58,247,203,129,156,245,48,124,166,233,135,107,104,215,3,122,210,17,233,101,48,116,74,41,12,158,80,64,189,188,143,76)
+IMAGE_DATA(44,81,140,90,12,249,197,171,161,121,251,65,120,245,231,103,233,188,199,30,159,182,142,118,226,40,245,208,182,233,254,31)
+IMAGE_DATA(205,131,24,91,145,23,29,237,244,120,236,249,151,161,186,105,63,44,109,220,71,119,235,149,213,238,134,178,21,187,28,191)
+IMAGE_DATA(138,57,224,81,233,197,48,104,88,6,124,247,142,135,224,214,175,14,142,213,78,43,168,127,105,192,13,19,224,235,95,123)
+IMAGE_DATA(0,254,226,47,239,161,157,17,119,13,26,77,251,35,30,28,158,1,15,143,206,134,225,147,22,169,223,7,74,201,63,143)
+IMAGE_DATA(203,92,6,19,178,170,168,79,9,185,58,97,214,50,186,47,167,190,249,49,120,254,197,151,61,251,139,174,118,244,6,99)
+IMAGE_DATA(131,106,176,126,158,213,47,23,28,143,171,88,99,229,222,37,145,72,116,253,106,203,158,227,212,235,162,107,171,154,171,152)
+IMAGE_DATA(251,52,115,175,38,235,204,48,189,170,102,222,58,103,222,212,244,172,188,151,23,217,138,76,116,239,28,111,114,242,190,222)
+IMAGE_DATA(157,251,110,45,213,238,251,229,224,122,42,214,81,185,215,200,12,147,169,230,142,36,125,111,219,82,99,158,165,218,233,55)
+IMAGE_DATA(50,247,65,152,125,78,230,60,43,177,53,187,142,230,111,198,42,175,202,119,225,208,206,193,105,203,96,232,228,18,226,233)
+IMAGE_DATA(35,147,23,147,63,29,59,163,28,22,87,109,130,189,135,143,193,217,119,207,17,39,59,176,79,182,181,45,214,51,219,73)
+IMAGE_DATA(94,148,207,254,214,246,54,104,105,211,125,180,154,13,29,244,185,248,118,43,190,221,214,2,251,31,63,169,252,234,99,80)
+IMAGE_DATA(222,176,71,249,213,61,176,164,102,39,245,46,149,44,223,72,185,218,49,211,74,224,254,17,51,225,239,239,26,2,127,241)
+IMAGE_DATA(157,59,224,214,155,135,195,55,254,228,1,154,101,253,222,247,7,195,15,7,79,132,251,135,165,195,131,35,179,96,200,216)
+IMAGE_DATA(57,138,165,11,96,212,212,10,229,189,145,159,75,137,163,24,227,212,219,227,103,85,211,78,255,173,123,142,192,233,87,94)
+IMAGE_DATA(163,59,198,137,115,173,231,63,51,166,246,132,183,97,222,213,47,31,236,199,85,179,127,201,175,198,106,115,85,252,170,72)
+IMAGE_DATA(116,125,107,199,99,39,137,171,211,231,53,208,78,8,228,42,238,118,119,115,178,27,168,14,170,125,106,115,183,188,172,153)
+IMAGE_DATA(199,181,239,112,35,191,154,93,239,185,71,198,102,37,115,213,228,180,159,47,181,119,64,104,94,187,119,168,50,75,205,222)
+IMAGE_DATA(94,246,167,238,61,52,238,30,36,188,111,198,220,161,207,125,193,246,204,13,123,81,252,24,113,117,182,142,241,138,167,163)
+IMAGE_DATA(167,47,35,134,98,159,209,112,229,17,241,113,88,90,41,76,203,171,129,149,107,247,192,143,79,190,20,243,156,218,139,218)
+IMAGE_DATA(231,187,135,1,138,83,24,250,249,142,16,86,116,144,159,93,191,237,25,218,233,177,180,110,47,113,21,115,192,216,15,60)
+IMAGE_DATA(46,179,130,216,138,57,92,172,143,222,113,247,8,184,243,71,163,224,238,251,21,75,135,206,80,158,52,11,134,141,95,0)
+IMAGE_DATA(99,149,39,29,159,181,12,210,178,42,97,242,172,42,229,205,43,233,253,241,152,239,205,89,1,229,53,219,97,223,227,199)
+IMAGE_DATA(225,236,219,111,209,247,212,222,84,179,180,165,181,93,199,249,142,62,231,106,50,108,13,218,7,28,86,99,21,174,138,68)
+IMAGE_DATA(162,168,218,119,228,148,98,234,42,226,42,246,5,79,202,173,37,63,230,206,189,120,103,105,204,253,14,182,119,117,123,125)
+IMAGE_DATA(117,95,48,237,225,157,221,224,204,188,96,175,46,222,227,198,181,86,190,7,206,245,189,77,177,88,215,173,150,106,122,96)
+IMAGE_DATA(243,254,84,222,51,104,246,33,57,123,124,167,185,247,207,216,59,5,241,57,125,39,42,239,213,175,242,240,83,239,225,175)
+IMAGE_DATA(246,60,143,57,222,209,211,209,151,86,192,163,83,203,137,161,67,210,138,213,219,75,168,86,186,178,113,55,188,112,234,103)
+IMAGE_DATA(177,179,188,213,211,55,163,253,41,51,147,185,217,226,156,253,154,15,29,193,156,96,166,181,33,75,218,225,236,217,183,169)
+IMAGE_DATA(47,184,98,213,94,168,168,221,67,243,54,197,149,27,169,190,138,94,19,125,242,240,9,243,225,161,209,217,180,199,1,123)
+IMAGE_DATA(121,177,238,58,102,122,153,250,59,89,14,233,217,181,48,37,119,165,250,253,164,154,152,58,99,78,29,84,174,218,5,135)
+IMAGE_DATA(159,126,22,206,181,176,23,109,39,127,204,111,183,158,87,63,111,235,187,244,51,232,159,163,239,61,107,212,92,176,243,247)
+IMAGE_DATA(144,4,87,237,29,17,194,85,145,72,20,166,67,71,79,211,206,89,12,188,183,19,115,192,24,230,158,37,12,230,40,207)
+IMAGE_DATA(192,48,75,205,26,172,219,191,164,185,169,103,73,221,253,12,200,66,12,206,9,155,222,214,238,99,226,250,170,233,89,205)
+IMAGE_DATA(220,50,190,14,207,161,114,174,151,251,113,249,254,83,190,75,156,239,66,197,251,101,244,93,166,238,61,170,220,187,203,44)
+IMAGE_DATA(230,93,192,250,14,25,237,111,135,166,149,81,78,23,115,188,195,212,219,216,207,139,220,194,29,71,251,15,62,5,175,159)
+IMAGE_DATA(125,135,250,139,204,179,187,39,125,55,241,89,130,254,177,13,94,120,254,52,229,131,177,127,9,103,89,241,158,56,172,131)
+IMAGE_DATA(166,227,159,111,78,181,242,213,213,84,19,197,192,62,225,73,234,125,236,231,157,64,245,210,101,144,85,208,8,141,205,123)
+IMAGE_DATA(225,196,201,51,112,190,69,115,30,89,25,229,103,232,79,209,19,175,26,229,254,26,191,187,107,204,221,16,50,103,35,18)
+IMAGE_DATA(137,76,61,121,252,85,152,181,104,45,221,101,131,92,197,190,87,158,95,229,125,74,122,167,82,247,221,75,166,95,229,143)
+IMAGE_DATA(153,247,208,160,47,213,125,63,13,158,96,174,218,249,93,123,230,38,232,14,56,179,7,216,189,59,85,239,61,98,134,226)
+IMAGE_DATA(189,167,46,95,151,233,187,101,210,42,96,196,20,125,215,56,221,23,142,253,69,211,43,141,251,105,244,222,123,188,59,6)
+IMAGE_DATA(247,29,97,175,209,224,113,197,240,240,184,197,48,120,98,41,140,153,177,20,150,55,236,132,163,199,126,170,115,187,202,147)
+IMAGE_DATA(182,182,117,65,123,71,87,236,124,111,113,206,114,243,177,103,12,237,254,57,152,147,101,182,30,126,242,57,154,101,93,186)
+IMAGE_DATA(250,32,44,42,223,168,124,232,10,170,149,227,204,20,245,119,163,39,85,44,29,55,163,82,239,73,42,90,3,77,155,15)
+IMAGE_DATA(193,201,23,94,166,215,58,215,214,233,120,207,182,150,152,47,117,162,239,153,217,83,191,26,37,7,28,196,85,123,239,146)
+IMAGE_DATA(189,207,208,220,185,36,123,33,68,34,17,235,233,159,188,174,124,75,19,204,68,182,42,207,138,115,154,184,115,137,231,108)
+IMAGE_DATA(204,93,249,126,187,145,204,29,73,236,99,185,135,9,3,243,190,230,174,6,147,171,252,200,253,76,54,87,121,151,146,125)
+IMAGE_DATA(23,156,57,191,131,108,101,127,137,158,19,57,170,239,19,215,247,180,141,152,178,20,134,77,46,119,238,24,231,224,250,234)
+IMAGE_DATA(200,169,202,179,166,227,115,229,186,223,104,98,177,158,43,157,176,152,98,106,78,13,172,90,247,24,60,251,220,75,116,142)
+IMAGE_DATA(227,121,76,53,206,142,14,231,220,102,166,58,189,187,49,22,250,113,181,55,56,226,97,107,219,121,216,188,251,73,154,105)
+IMAGE_DATA(205,47,106,162,156,238,228,188,149,144,150,91,71,117,83,172,149,82,223,209,238,167,224,204,203,175,59,63,171,206,225,234)
+IMAGE_DATA(104,105,57,71,76,197,92,181,201,83,124,190,175,185,153,44,79,163,244,44,133,49,53,168,23,216,222,191,239,215,11,44)
+IMAGE_DATA(92,21,137,174,111,157,120,225,13,242,171,200,85,124,116,247,238,111,238,118,7,141,189,127,201,228,41,51,215,221,223,176)
+IMAGE_DATA(222,240,172,94,174,242,253,167,60,127,195,222,149,253,169,230,107,147,179,199,48,104,183,62,115,149,239,115,67,174,114,30)
+IMAGE_DATA(24,235,168,116,183,248,36,237,81,137,175,138,181,200,212,33,49,182,14,153,136,123,3,245,110,134,71,198,23,169,88,12)
+IMAGE_DATA(67,149,47,205,41,92,3,205,219,15,195,203,175,191,25,155,131,105,53,250,137,204,250,168,247,12,231,190,34,243,115,122)
+IMAGE_DATA(139,163,65,207,161,215,124,243,236,57,168,169,223,71,59,249,39,206,172,128,41,179,107,160,108,229,22,216,119,240,105,234)
+IMAGE_DATA(59,58,223,26,54,15,211,30,171,235,182,59,115,51,200,106,140,190,102,103,111,241,52,222,78,8,123,223,82,88,191,82)
+IMAGE_DATA(88,14,88,102,108,68,34,17,234,185,211,111,43,158,54,106,174,42,223,138,61,193,232,117,248,46,55,147,173,102,254,215)
+IMAGE_DATA(204,9,219,31,211,117,214,230,216,44,171,235,87,57,119,203,253,193,204,85,237,91,215,56,59,37,244,44,78,147,122,45)
+IMAGE_DATA(220,189,239,173,191,250,221,7,103,214,88,185,255,151,253,42,198,96,172,143,166,87,192,144,201,101,180,43,16,119,239,98)
+IMAGE_DATA(208,222,192,9,133,234,53,150,83,207,207,142,125,71,225,220,121,61,63,74,179,48,237,236,225,90,13,118,182,4,240,212)
+IMAGE_DATA(101,42,230,103,123,139,35,218,151,186,63,131,239,231,157,111,129,231,79,191,2,213,171,119,194,254,67,199,224,220,185,119)
+IMAGE_DATA(192,233,51,106,209,61,83,109,134,63,245,50,213,251,154,109,102,159,82,75,103,159,115,180,39,60,13,155,169,177,125,170)
+IMAGE_DATA(121,191,141,185,15,194,174,171,6,121,85,190,207,70,188,170,72,36,58,245,234,57,152,93,184,22,178,10,215,17,87,209)
+IMAGE_DATA(175,34,87,145,147,246,61,230,54,87,205,61,252,204,94,51,15,204,189,75,110,184,62,211,100,163,102,173,183,238,170,251)
+IMAGE_DATA(151,214,117,187,123,206,100,43,247,68,233,126,96,61,87,195,243,168,180,203,94,121,212,71,38,149,194,131,99,11,225,254)
+IMAGE_DATA(145,11,225,190,145,139,96,208,168,69,180,203,126,242,204,114,234,223,197,58,99,91,251,123,116,46,227,190,64,226,140,199)
+IMAGE_DATA(147,118,232,57,83,197,38,98,92,135,158,49,165,115,28,153,219,222,215,61,62,237,49,254,182,57,12,70,150,234,90,105)
+IMAGE_DATA(119,54,81,47,111,204,151,234,207,9,243,165,125,95,99,141,218,235,21,111,95,112,20,159,26,180,99,201,238,1,22,175)
+IMAGE_DATA(42,18,137,194,244,234,207,219,232,174,108,47,87,87,134,114,213,204,255,218,158,150,251,150,120,150,134,125,40,62,114,77)
+IMAGE_DATA(148,115,191,200,90,115,63,190,187,151,169,209,217,31,161,57,190,158,2,57,139,62,214,228,42,247,45,57,187,9,211,113)
+IMAGE_DATA(55,195,18,170,141,178,55,29,244,232,66,197,210,5,116,127,90,253,186,189,112,234,212,107,186,239,200,179,219,72,51,132)
+IMAGE_DATA(159,211,190,148,107,152,188,19,73,123,63,242,127,45,222,90,42,123,75,135,95,189,184,139,200,124,221,110,31,111,123,87)
+IMAGE_DATA(243,148,89,26,219,43,129,188,60,215,30,47,151,123,62,228,231,180,189,109,255,99,105,188,156,111,148,93,192,97,76,13)
+IMAGE_DATA(202,255,6,205,214,136,87,21,137,68,168,215,207,118,66,78,241,58,200,46,110,134,217,69,138,95,11,214,210,94,67,251)
+IMAGE_DATA(78,56,187,31,216,188,55,206,111,55,190,187,123,73,51,150,253,170,215,167,54,120,242,195,38,115,217,179,234,224,251,224)
+IMAGE_DATA(176,254,186,198,216,11,225,222,69,142,30,149,250,119,21,79,177,102,138,119,196,12,158,80,4,11,74,26,169,103,231,149)
+IMAGE_DATA(215,244,222,64,39,191,219,217,161,189,102,187,155,195,213,251,142,90,168,182,72,207,181,118,185,121,95,226,86,204,27,182)
+IMAGE_DATA(197,103,224,213,240,123,254,57,225,118,205,71,172,137,198,190,31,237,152,104,105,247,124,94,50,181,222,176,127,207,190,102)
+IMAGE_DATA(106,84,127,234,55,159,106,123,212,48,166,202,125,230,34,145,40,81,189,117,238,61,200,43,217,72,92,205,91,178,1,114)
+IMAGE_DATA(10,214,209,253,230,179,139,144,153,155,60,28,245,171,167,154,61,194,246,94,67,218,179,159,223,228,248,85,237,89,27,99)
+IMAGE_DATA(51,172,141,70,47,211,42,152,144,91,79,97,230,130,169,174,58,71,249,86,100,170,226,233,212,252,53,49,255,219,72,251)
+IMAGE_DATA(4,113,183,61,238,103,120,116,170,238,249,197,59,215,38,204,88,6,85,245,187,225,199,39,78,193,187,231,90,124,207,222)
+IMAGE_DATA(68,252,80,95,248,181,235,49,162,112,52,94,13,181,39,247,193,37,194,84,59,255,43,94,85,36,18,153,58,215,246,190)
+IMAGE_DATA(226,106,51,228,151,110,128,188,210,77,144,173,60,43,114,53,167,216,205,255,218,28,53,251,127,237,89,86,119,87,240,218)
+IMAGE_DATA(152,103,141,249,203,57,171,233,62,83,119,78,166,209,169,181,178,127,157,132,220,205,225,28,114,236,158,213,249,234,253,121)
+IMAGE_DATA(248,26,141,116,167,248,216,76,189,239,8,119,219,35,79,135,167,87,64,230,130,122,88,221,188,31,78,190,120,6,58,186)
+IMAGE_DATA(58,133,163,215,72,68,249,187,136,210,147,148,40,79,131,152,202,61,74,65,185,95,191,154,42,50,85,188,170,72,36,50)
+IMAGE_DATA(117,225,253,143,20,83,149,87,45,89,15,115,150,108,134,172,130,53,52,199,154,93,180,5,114,74,182,81,248,213,86,131)
+IMAGE_DATA(246,67,216,247,184,233,153,83,215,171,58,12,229,57,25,244,173,121,46,91,113,159,48,122,84,103,15,68,78,29,76,202)
+IMAGE_DATA(90,161,120,186,12,70,103,46,165,251,192,71,101,44,133,185,37,107,104,110,243,181,215,223,136,237,224,109,247,204,148,38)
+IMAGE_DATA(187,243,168,175,89,115,61,68,50,245,83,191,123,84,19,225,105,20,143,106,51,213,238,253,21,159,42,18,137,162,232,242)
+IMAGE_DATA(175,62,38,191,58,103,201,6,202,7,99,239,210,244,185,138,171,197,155,33,183,116,59,121,86,246,167,182,79,197,247,187)
+IMAGE_DATA(223,193,234,221,225,96,251,83,55,86,123,194,221,243,128,115,51,43,96,204,204,74,24,59,107,57,237,226,155,56,171,6)
+IMAGE_DATA(50,231,54,64,205,234,189,176,239,224,51,240,198,155,239,56,187,236,245,142,134,174,238,254,52,182,231,64,56,218,63,162)
+IMAGE_DATA(39,189,72,189,197,211,168,76,69,158,154,185,223,32,159,42,76,21,137,68,126,194,147,161,96,217,86,157,7,86,124,197)
+IMAGE_DATA(28,48,214,51,145,171,249,75,144,171,184,199,48,214,251,91,184,217,195,88,243,222,115,102,170,185,19,137,251,138,188,17)
+IMAGE_DATA(219,229,128,252,204,174,133,137,89,117,48,33,107,37,140,153,81,69,129,121,222,177,211,151,211,221,159,121,69,235,160,97)
+IMAGE_DATA(253,99,112,226,185,151,137,163,116,247,119,123,151,230,105,135,238,49,226,123,73,61,251,143,176,23,201,152,135,17,158,94)
+IMAGE_DATA(27,60,141,210,143,20,175,199,215,230,105,84,143,106,223,171,106,246,253,10,83,69,34,81,34,194,211,97,203,174,19,212)
+IMAGE_DATA(11,140,249,224,204,133,77,49,174,110,132,220,146,173,144,87,186,13,114,20,91,145,179,179,139,221,221,75,238,254,224,77)
+IMAGE_DATA(30,175,106,222,185,138,179,51,14,75,103,235,62,37,228,233,216,217,184,195,65,239,68,194,190,35,204,235,142,205,172,166)
+IMAGE_DATA(29,182,139,150,110,130,237,251,142,193,43,175,189,173,207,208,246,14,154,43,213,193,123,237,245,254,2,125,206,182,1,239)
+IMAGE_DATA(50,96,150,242,76,169,237,87,251,154,49,215,75,244,6,71,147,173,159,6,241,52,136,169,204,83,51,239,203,243,169,220)
+IMAGE_DATA(247,43,76,21,137,68,137,234,244,43,239,16,87,209,175,206,92,160,119,46,205,42,88,79,76,69,207,138,143,200,88,244)
+IMAGE_DATA(174,60,123,195,92,197,60,176,121,23,57,114,149,247,32,225,125,51,230,221,224,200,210,97,233,75,232,126,181,17,105,229)
+IMAGE_DATA(48,114,50,222,165,189,28,202,86,238,128,125,135,79,192,91,111,159,87,231,102,59,177,18,207,77,226,40,229,120,59,157)
+IMAGE_DATA(32,127,106,204,146,242,142,163,246,214,14,15,71,205,250,106,95,115,230,122,136,100,106,217,201,228,122,19,205,247,70,245)
+IMAGE_DATA(168,118,222,215,156,165,177,123,148,132,171,34,145,40,76,120,70,252,246,119,159,194,156,242,77,48,183,68,121,209,249,122)
+IMAGE_DATA(126,21,125,43,246,4,179,103,117,185,218,125,87,176,185,11,9,115,192,60,83,138,59,144,104,175,253,212,165,48,34,29)
+IMAGE_DATA(239,87,43,87,60,173,128,140,188,58,88,177,110,47,28,57,254,2,116,116,190,167,207,203,14,117,118,42,166,242,57,234)
+IMAGE_DATA(122,81,119,127,32,223,105,106,238,223,117,247,222,11,79,251,59,79,163,212,77,147,229,169,233,79,163,230,124,109,143,106)
+IMAGE_DATA(230,125,205,249,84,241,169,34,145,40,17,253,33,246,143,77,251,142,193,156,197,27,97,218,252,6,152,154,95,7,211,23)
+IMAGE_DATA(174,133,28,197,82,100,43,230,129,137,173,139,183,145,79,213,251,10,99,119,175,46,112,239,93,69,175,138,222,20,239,89)
+IMAGE_DATA(195,249,23,188,35,6,31,49,215,59,123,254,106,168,95,183,31,158,59,245,42,116,93,192,243,209,61,51,93,142,186,145)
+IMAGE_DATA(236,172,76,95,115,230,243,30,87,163,94,106,179,212,47,215,27,197,159,250,241,212,143,169,204,83,246,168,102,222,151,107)
+IMAGE_DATA(169,246,206,7,97,170,72,36,74,84,207,157,121,11,102,23,174,131,140,121,138,171,121,141,48,67,121,79,244,168,24,249)
+IMAGE_DATA(165,59,136,169,228,89,139,148,103,45,216,2,51,23,42,166,22,232,220,239,228,220,122,24,55,179,10,70,227,93,166,211)
+IMAGE_DATA(42,149,55,173,128,209,25,229,84,43,221,179,239,105,120,227,173,86,184,112,233,34,177,244,226,123,23,224,189,78,140,46)
+IMAGE_DATA(202,249,122,253,105,119,166,38,114,134,247,53,115,250,99,244,116,159,98,50,249,221,171,233,77,163,240,52,158,71,53,121)
+IMAGE_DATA(234,231,81,37,239,43,18,137,122,164,63,96,46,248,83,248,215,143,255,47,100,21,54,19,87,241,158,184,25,243,235,105)
+IMAGE_DATA(118,21,103,109,176,198,74,76,45,198,57,214,13,180,167,119,234,156,70,152,148,85,11,227,103,85,195,232,25,85,20,88)
+IMAGE_DATA(43,93,178,98,43,60,113,236,69,232,236,226,220,220,135,206,185,136,143,124,110,210,185,218,213,222,99,143,218,215,220,250)
+IMAGE_DATA(60,70,111,113,52,89,150,6,237,114,176,115,189,81,253,169,153,243,245,171,163,218,30,85,242,190,34,145,168,103,138,237)
+IMAGE_DATA(138,81,71,200,220,178,141,180,203,16,239,179,201,152,215,168,184,186,131,242,192,89,133,27,97,102,225,122,234,103,154,156)
+IMAGE_DATA(83,11,147,178,107,96,252,236,26,154,51,205,42,104,132,53,155,30,135,23,78,255,156,206,188,127,254,231,15,233,241,210)
+IMAGE_DATA(7,24,23,181,79,189,112,73,157,155,23,232,188,228,188,175,246,168,93,194,212,126,18,189,233,75,227,245,243,198,203,243)
+IMAGE_DATA(70,169,157,38,203,211,48,143,42,121,95,145,72,212,27,194,211,131,142,16,133,215,237,251,78,64,97,213,14,72,207,93)
+IMAGE_DATA(5,233,249,171,97,6,249,210,85,196,217,180,220,122,229,99,27,20,83,87,194,194,138,205,176,231,208,73,120,231,124,7)
+IMAGE_DATA(92,254,232,151,116,150,225,185,134,103,28,158,117,31,190,255,129,246,169,23,223,135,139,23,186,224,194,123,157,177,122,106)
+IMAGE_DATA(71,44,247,219,238,201,253,38,202,212,190,102,208,181,30,87,43,183,27,101,54,38,10,75,49,56,207,235,151,235,181,251)
+IMAGE_DATA(145,18,225,169,223,252,140,120,84,145,72,212,155,250,3,67,85,197,217,119,187,96,241,138,221,228,73,211,242,21,79,243)
+IMAGE_DATA(107,105,143,96,246,162,38,168,107,126,28,78,158,122,19,62,248,151,95,170,179,74,159,89,120,142,97,224,185,198,103,221)
+IMAGE_DATA(251,31,126,64,94,149,60,235,69,60,55,245,57,218,213,121,137,162,83,249,86,188,75,166,189,179,141,206,91,97,106,255)
+IMAGE_DATA(228,104,152,15,13,202,239,134,177,212,239,222,83,191,186,105,188,92,111,79,121,106,230,124,197,163,138,68,162,171,163,223)
+IMAGE_DATA(199,154,130,1,126,253,201,21,168,108,120,140,88,58,167,100,61,52,239,58,6,175,188,126,14,62,185,242,91,117,30,125)
+IMAGE_DATA(2,159,252,90,159,83,255,246,111,31,211,25,118,249,242,191,170,179,77,157,115,31,41,159,250,47,250,236,67,159,250,193)
+IMAGE_DATA(7,255,11,46,190,127,73,5,158,157,151,98,249,223,142,216,108,170,222,59,72,123,147,218,18,227,106,95,243,233,90,136)
+IMAGE_DATA(68,249,105,126,77,79,57,26,230,75,195,122,144,252,88,202,190,52,204,155,246,132,167,232,79,145,167,226,81,69,34,209)
+IMAGE_DATA(213,147,250,125,253,211,223,195,179,63,125,19,142,156,56,3,191,185,162,206,157,127,255,127,116,6,93,185,242,59,117,54)
+IMAGE_DATA(253,134,206,41,60,179,240,236,194,51,236,242,229,143,212,25,119,217,201,1,163,175,192,51,17,207,72,238,83,226,51,213)
+IMAGE_DATA(60,123,221,188,97,107,40,83,205,51,191,175,121,213,95,35,217,156,110,162,189,70,65,28,13,98,169,237,77,131,250,121)
+IMAGE_DATA(195,234,166,118,237,212,100,105,16,79,253,122,146,236,156,47,243,84,238,161,17,137,68,159,165,240,204,193,223,233,53,87)
+IMAGE_DATA(175,208,25,197,92,197,115,76,251,213,203,158,218,170,31,87,153,173,222,126,165,158,205,212,48,83,122,58,67,114,45,68)
+IMAGE_DATA(79,184,233,199,208,40,117,210,68,60,105,212,122,105,24,75,253,188,169,217,135,20,148,235,141,231,79,237,158,36,246,168)
+IMAGE_DATA(146,243,21,137,68,125,161,120,92,197,179,45,140,171,120,142,154,158,53,10,87,19,157,87,189,214,125,108,111,49,179,55)
+IMAGE_DATA(106,163,126,62,52,10,71,163,214,75,131,124,105,148,186,105,60,111,26,133,167,50,139,42,18,137,250,90,97,92,197,115)
+IMAGE_DATA(141,185,202,125,75,201,114,53,136,175,201,114,182,191,113,183,175,216,25,197,135,70,201,235,246,132,163,81,89,106,207,200)
+IMAGE_DATA(216,222,52,94,237,212,236,239,21,158,138,68,162,254,42,155,171,232,3,240,28,211,125,75,221,185,138,103,35,205,216,196)
+IMAGE_DATA(216,202,92,181,217,106,242,245,179,102,236,181,24,81,249,153,44,71,131,122,118,131,56,154,168,39,141,82,51,181,243,188)
+IMAGE_DATA(182,55,13,203,245,250,245,247,10,79,69,34,81,127,20,158,73,88,139,194,115,10,207,44,230,170,93,99,229,115,49,94)
+IMAGE_DATA(46,56,140,173,65,251,129,195,24,251,121,97,110,111,115,51,94,94,55,30,67,237,94,35,155,163,241,124,169,223,156,105)
+IMAGE_DATA(188,154,105,148,186,41,135,221,139,100,207,203,8,79,69,34,81,127,21,158,75,120,70,49,87,241,28,11,170,177,6,121)
+IMAGE_DATA(214,32,182,154,124,141,194,216,168,126,182,47,24,220,211,159,37,89,110,38,202,207,120,12,141,231,71,253,60,105,212,252)
+IMAGE_DATA(110,60,150,198,243,166,236,75,131,188,169,205,83,97,170,72,36,234,175,138,146,11,54,251,130,185,206,26,196,86,63,190)
+IMAGE_DATA(218,140,245,227,108,20,214,246,38,119,175,70,36,202,203,40,253,68,137,240,51,222,28,169,205,208,168,185,221,120,44,13)
+IMAGE_DATA(154,141,241,235,65,50,189,169,223,156,76,24,79,69,34,145,232,90,144,157,11,54,61,43,179,149,235,97,118,62,216,102)
+IMAGE_DATA(107,16,95,109,198,70,229,108,50,188,237,143,145,12,55,163,48,52,204,131,70,245,162,54,75,227,113,52,168,247,40,138)
+IMAGE_DATA(47,13,99,169,185,15,95,114,189,34,145,232,90,23,158,97,126,158,53,40,31,28,228,91,77,239,106,242,53,200,195,6)
+IMAGE_DATA(113,214,102,77,60,46,125,150,28,78,244,103,137,194,205,68,252,103,162,12,141,199,82,123,174,52,94,126,55,168,247,40)
+IMAGE_DATA(108,214,212,102,105,20,111,42,60,21,137,68,215,178,130,60,171,153,15,14,98,171,159,119,141,199,88,63,63,27,149,185)
+IMAGE_DATA(81,34,25,246,245,54,39,19,97,102,80,13,52,74,30,55,172,191,8,223,246,227,167,201,208,168,28,53,89,138,97,115)
+IMAGE_DATA(52,204,151,70,205,243,10,75,69,34,209,231,69,220,191,132,231,156,201,86,179,214,106,250,86,51,39,108,178,213,228,171)
+IMAGE_DATA(31,99,77,206,70,101,109,24,111,237,125,122,201,48,248,106,48,50,42,51,195,188,103,88,45,52,145,124,174,223,142,163)
+IMAGE_DATA(68,57,26,148,223,13,243,165,97,44,21,158,138,68,162,235,65,120,182,153,61,76,126,190,213,220,23,193,189,76,81,248)
+IMAGE_DATA(106,231,137,237,176,249,17,196,153,120,124,138,202,225,158,68,212,159,33,232,223,33,209,252,173,31,63,205,57,151,160,92)
+IMAGE_DATA(174,205,81,187,62,26,149,163,126,158,212,111,103,67,80,255,145,120,83,145,72,116,61,203,244,173,126,108,181,119,242,7)
+IMAGE_DATA(241,213,102,44,115,214,143,181,118,223,83,16,107,163,178,55,25,30,71,173,95,38,203,202,48,102,218,252,180,125,126,144)
+IMAGE_DATA(7,53,255,108,19,97,104,84,142,134,229,119,227,213,75,133,165,34,145,72,228,42,136,173,102,47,147,233,93,131,248,106)
+IMAGE_DATA(122,88,155,177,38,103,131,124,173,95,14,57,138,215,237,139,136,194,203,32,207,25,52,215,18,133,159,65,12,141,87,27)
+IMAGE_DATA(77,134,163,81,123,143,132,165,34,145,72,212,93,38,91,49,240,236,228,62,97,211,187,134,241,213,143,177,166,151,77,132)
+IMAGE_DATA(181,97,204,77,148,195,126,92,142,250,185,81,191,127,16,51,253,184,233,199,206,48,255,25,196,79,147,161,246,12,105,80)
+IMAGE_DATA(207,110,20,63,106,115,84,88,42,18,137,68,201,137,217,202,125,194,60,131,195,222,149,103,92,131,248,234,199,88,147,179)
+IMAGE_DATA(54,107,163,242,54,30,123,163,68,162,44,180,185,24,143,147,65,172,76,150,157,241,248,25,212,95,228,55,71,26,198,81)
+IMAGE_DATA(191,158,35,190,211,148,231,75,205,252,174,176,84,36,18,137,18,19,239,139,195,243,211,236,21,54,249,202,231,178,31,95)
+IMAGE_DATA(57,152,177,38,103,131,88,27,198,91,51,108,62,249,113,43,136,121,137,70,20,70,250,229,104,131,152,25,198,78,254,115)
+IMAGE_DATA(49,255,156,48,204,63,195,48,31,26,212,99,20,149,163,188,163,193,244,164,82,43,21,137,68,162,222,19,179,149,189,171)
+IMAGE_DATA(89,119,181,253,43,243,213,100,44,115,214,100,173,233,103,109,214,154,188,245,99,174,31,119,163,112,184,55,34,222,247,13)
+IMAGE_DATA(226,165,159,231,140,234,61,195,248,153,44,67,253,56,106,246,27,217,28,21,150,138,68,34,81,239,139,231,112,236,220,176)
+IMAGE_DATA(205,215,32,198,154,156,13,99,173,201,91,63,230,218,220,141,199,224,171,21,65,63,131,223,207,107,51,51,158,239,12,98)
+IMAGE_DATA(167,201,207,40,12,229,186,168,95,109,212,102,168,112,84,36,18,137,250,70,126,124,13,99,172,157,43,54,57,235,231,105)
+IMAGE_DATA(237,28,114,24,115,237,8,98,218,213,138,120,172,12,98,166,205,77,155,157,241,252,103,34,12,141,226,69,237,123,98,132)
+IMAGE_DATA(167,34,145,72,244,217,138,207,94,147,175,92,127,101,190,154,140,229,96,47,203,126,214,100,109,16,111,109,230,6,177,215)
+IMAGE_DATA(143,193,189,21,126,179,41,65,225,247,179,6,49,211,143,157,126,179,45,65,121,220,168,12,245,243,162,226,71,69,34,145)
+IMAGE_DATA(168,255,42,140,177,54,103,253,114,198,102,216,125,80,126,204,181,185,107,135,31,219,122,35,194,190,167,31,47,163,112,51)
+IMAGE_DATA(140,157,97,252,140,199,80,191,156,174,112,84,36,18,137,174,61,217,140,53,57,107,179,150,89,225,199,219,48,230,154,97)
+IMAGE_DATA(51,43,200,255,246,36,194,190,71,16,43,237,60,109,24,51,237,61,11,126,236,140,202,79,97,168,72,36,18,125,126,197)
+IMAGE_DATA(140,101,206,154,126,54,136,181,182,183,245,203,37,135,177,55,30,135,147,137,176,239,17,143,151,248,190,253,251,67,16,59)
+IMAGE_DATA(249,207,195,100,39,243,19,31,237,122,104,212,154,168,48,86,36,18,137,62,159,242,171,203,154,158,214,230,173,205,93,191)
+IMAGE_DATA(156,178,95,216,62,176,55,35,236,251,134,121,205,120,220,52,195,102,167,72,36,18,137,68,137,200,228,173,31,115,163,176)
+IMAGE_DATA(215,230,175,159,7,78,54,252,94,215,230,164,205,202,120,204,76,212,115,138,68,34,145,72,148,172,76,206,152,188,53,243)
+IMAGE_DATA(201,102,196,99,112,111,132,223,247,240,251,89,226,113,83,216,41,18,137,68,162,254,174,48,14,247,102,216,223,71,24,41)
+IMAGE_DATA(18,137,68,34,145,72,36,18,137,68,34,145,72,36,18,137,68,34,145,72,36,18,137,68,34,145,72,36,18,137,68,34)
+IMAGE_DATA(145,72,36,18,137,68,34,145,72,36,18,137,68,34,145,72,36,18,137,68,34,145,72,36,18,137,68,162,207,90,255,31)
+IMAGE_DATA(210,72,162,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0)
+IMAGE_END_DATA(113376, 12)
+
+IMAGE_BEGIN_DATA
+IMAGE_DATA(120,156,237,156,59,168,164,89,17,199,59,116,28,3,17,193,68,204,68,68,19,13,5,115,99,69,35,77,52,20,17,83)
+IMAGE_DATA(65,185,209,38,42,152,13,12,168,193,98,96,178,137,32,24,136,99,162,129,47,12,132,69,80,54,241,129,32,139,108,176)
+IMAGE_DATA(184,12,124,78,221,217,223,157,127,255,187,234,156,243,245,215,221,115,239,236,169,75,209,183,187,79,157,58,143,122,157,58)
+IMAGE_DATA(245,245,238,254,238,222,110,89,118,10,203,224,235,90,232,209,29,211,239,178,2,143,233,123,203,247,61,186,246,235,189,221)
+IMAGE_DATA(125,223,152,30,243,99,54,110,228,179,222,251,187,214,207,182,245,185,87,107,76,139,97,38,133,254,121,239,125,70,215,146)
+IMAGE_DATA(238,53,223,159,107,124,187,228,251,221,222,231,239,121,242,215,144,244,11,193,213,242,20,79,221,150,246,58,195,30,45,253)
+IMAGE_DATA(47,75,159,215,213,114,136,35,109,71,198,124,142,182,1,203,202,245,91,1,239,125,242,119,70,97,218,226,99,150,171,171)
+IMAGE_DATA(171,38,118,250,184,110,83,193,165,232,183,142,255,209,163,71,215,200,255,250,58,249,95,134,191,191,94,136,255,110,119,250)
+IMAGE_DATA(24,173,13,149,49,40,181,192,160,162,187,138,197,24,64,239,103,13,173,246,145,209,182,250,202,218,234,103,123,138,95,140)
+IMAGE_DATA(57,107,63,218,174,199,63,107,63,50,166,214,26,143,180,57,53,253,150,241,103,237,171,62,70,219,173,221,191,53,242,179)
+IMAGE_DATA(85,126,161,95,211,7,176,51,40,23,222,96,143,232,196,145,65,207,146,117,241,88,80,122,172,183,254,175,216,163,63,21)
+IMAGE_DATA(255,222,56,116,44,151,152,127,53,182,83,243,215,126,122,188,121,117,254,107,199,210,227,239,99,240,255,79,53,255,141,248)
+IMAGE_DATA(124,161,48,6,173,1,246,38,147,45,210,30,253,147,79,15,112,215,216,12,235,227,54,211,111,157,127,107,253,151,228,187)
+IMAGE_DATA(81,97,186,22,250,78,155,22,108,161,223,83,200,35,250,216,66,159,26,224,21,125,108,161,47,29,192,96,31,151,55,30)
+IMAGE_DATA(103,202,25,12,47,88,167,221,98,175,213,103,35,60,134,21,71,255,191,186,122,218,62,94,245,255,98,76,7,60,161,115)
+IMAGE_DATA(28,29,203,32,255,114,190,206,175,224,95,246,117,7,249,239,141,97,144,191,211,30,140,33,217,187,22,77,57,158,129,182)
+IMAGE_DATA(207,15,60,189,255,224,193,131,37,80,219,232,103,250,93,245,89,70,159,189,247,207,123,237,71,223,247,248,180,230,215,154)
+IMAGE_DATA(87,107,126,55,159,21,247,37,149,181,184,254,63,113,23,254,217,129,91,41,220,204,168,27,90,245,125,143,79,209,223,200)
+IMAGE_DATA(188,250,235,99,247,37,149,105,111,224,213,32,30,215,126,20,180,125,239,208,232,237,111,91,255,1,154,10,205,222,111,109)
+IMAGE_DATA(63,58,158,85,184,93,152,214,225,49,131,189,141,52,151,108,187,118,179,79,38,28,27,133,233,88,240,30,230,251,203,189)
+IMAGE_DATA(215,13,29,121,127,12,191,49,24,56,149,101,82,56,2,7,154,150,104,73,73,123,168,85,135,57,188,162,143,66,43,243)
+IMAGE_DATA(28,96,210,199,22,250,6,237,50,210,199,233,233,227,198,144,91,195,183,255,95,203,191,245,254,196,244,205,62,182,236,223)
+IMAGE_DATA(10,250,84,254,170,185,36,180,55,125,104,123,255,191,67,123,208,143,225,121,224,204,101,29,25,108,153,84,101,1,183,204)
+IMAGE_DATA(32,179,186,163,227,59,180,226,250,151,111,100,171,239,101,232,239,146,244,237,57,244,231,127,53,128,25,253,122,218,103,244)
+IMAGE_DATA(187,131,239,71,104,119,205,182,125,218,103,244,227,235,117,187,224,212,198,160,87,215,34,245,45,37,125,79,152,123,244,91)
+IMAGE_DATA(249,247,96,132,126,247,182,39,207,14,201,107,232,143,229,191,159,49,121,54,150,81,250,125,15,184,63,150,93,67,168,51)
+IMAGE_DATA(254,158,189,49,254,75,70,175,124,157,247,8,189,206,27,122,234,170,70,249,251,154,251,69,95,182,6,25,189,210,46,185)
+IMAGE_DATA(252,46,74,127,164,252,110,215,226,231,80,240,121,44,221,154,126,218,222,175,77,127,238,254,95,116,250,209,254,71,232,183)
+IMAGE_DATA(122,215,115,122,232,219,212,199,105,224,92,198,96,70,8,109,15,185,214,67,199,117,193,49,252,131,238,169,151,220,127,93)
+IMAGE_DATA(195,95,175,44,158,7,255,108,254,163,251,87,173,123,225,161,75,254,202,183,225,225,155,244,3,17,194,30,253,22,249,61)
+IMAGE_DATA(10,30,239,62,126,243,127,58,251,9,19,38,76,152,48,97,194,132,9,19,38,76,152,48,97,194,132,9,19,38,220,73)
+IMAGE_DATA(248,223,91,143,111,240,159,255,121,99,249,219,63,94,223,195,215,223,120,243,26,227,251,9,19,38,220,93,8,61,14,29)
+IMAGE_DATA(15,172,244,157,239,3,167,222,79,152,112,183,0,127,29,186,252,231,215,254,189,60,250,227,107,203,79,127,253,151,229,229)
+IMAGE_DATA(159,253,161,196,248,62,218,69,123,108,0,190,127,194,132,9,183,15,208,243,223,189,250,247,107,29,254,198,75,63,89,62)
+IMAGE_DATA(249,205,95,166,248,169,239,254,190,196,47,61,252,211,242,189,31,254,252,90,255,209,253,169,247,19,38,220,14,136,248,27)
+IMAGE_DATA(191,28,58,254,145,47,124,103,249,240,23,31,44,31,251,234,43,169,110,143,234,125,124,31,186,175,126,127,194,132,9,207)
+IMAGE_DATA(15,56,159,135,63,255,192,103,94,90,238,127,250,219,203,71,191,252,163,3,127,30,186,31,159,135,45,136,118,96,216,133)
+IMAGE_DATA(248,28,219,224,54,32,222,71,155,240,247,248,250,9,227,160,185,210,64,98,48,205,145,130,19,38,180,128,51,122,232,250)
+IMAGE_DATA(187,62,241,181,107,253,13,189,85,12,93,14,125,69,207,195,30,4,70,251,192,248,63,62,143,239,137,11,84,255,67,231)
+IMAGE_DATA(227,125,180,11,62,225,231,223,233,178,169,122,235,247,30,113,150,2,255,245,215,223,236,225,171,191,250,113,137,241,125,172)
+IMAGE_DATA(237,180,167,19,50,32,134,207,116,61,244,19,61,7,67,151,67,103,227,53,124,117,224,231,191,254,240,70,255,209,119,69)
+IMAGE_DATA(116,31,125,143,207,130,103,224,59,5,208,235,208,67,206,52,172,65,96,232,117,124,23,58,251,223,7,159,93,30,255,226)
+IMAGE_DATA(131,93,124,235,225,251,110,48,104,126,251,242,247,175,233,35,103,58,245,125,66,6,200,26,62,187,165,235,129,209,38,244)
+IMAGE_DATA(27,223,67,46,46,244,62,190,123,255,231,126,80,210,6,18,255,135,76,6,253,139,10,122,47,169,254,154,251,141,88,175)
+IMAGE_DATA(200,105,196,90,234,90,196,122,134,238,190,249,173,119,119,245,27,29,215,187,145,216,207,121,23,58,33,3,124,77,200,92)
+IMAGE_DATA(248,118,244,52,211,213,248,140,120,61,104,66,182,184,123,3,227,187,208,119,63,11,40,198,247,209,79,200,103,200,248,139)
+IMAGE_DATA(40,151,196,76,177,62,232,117,160,231,65,56,3,197,218,161,239,65,139,206,171,126,171,15,119,29,15,90,238,60,231,25)
+IMAGE_DATA(126,66,6,26,199,87,126,89,99,113,124,59,122,170,190,132,123,187,144,221,232,231,67,95,121,165,196,248,158,126,66,174)
+IMAGE_DATA(71,125,209,93,202,71,133,29,141,53,193,254,101,247,24,161,239,97,99,195,214,18,99,17,47,69,76,30,254,29,84,63)
+IMAGE_DATA(142,141,157,250,125,123,224,46,200,166,250,118,114,241,149,174,227,219,227,53,228,204,227,70,61,255,99,59,52,119,175,200)
+IMAGE_DATA(249,157,152,192,239,227,53,255,140,76,163,63,160,215,241,140,218,11,173,17,172,144,115,182,211,121,253,96,107,127,201,125)
+IMAGE_DATA(114,111,129,158,227,215,177,123,228,64,200,193,17,199,171,142,199,231,232,57,190,92,107,153,124,156,138,1,254,89,15,171)
+IMAGE_DATA(190,122,52,107,215,56,27,247,104,125,166,230,54,47,93,211,153,141,87,101,147,92,169,98,175,175,222,122,141,162,239,135)
+IMAGE_DATA(2,241,102,230,219,209,117,207,179,133,108,226,131,152,71,140,153,121,114,46,109,213,223,197,247,216,139,232,199,231,206,89)
+IMAGE_DATA(215,107,249,144,119,208,107,249,88,183,10,208,17,250,118,204,246,44,250,244,186,66,248,147,103,115,158,216,191,168,95,208)
+IMAGE_DATA(123,202,88,99,98,159,208,251,248,62,244,153,184,61,243,229,94,183,168,227,35,38,96,12,58,78,230,227,249,192,22,210)
+IMAGE_DATA(134,253,244,59,130,22,178,246,90,135,201,24,124,141,179,218,75,205,107,232,57,145,239,1,228,153,177,102,52,244,125,74)
+IMAGE_DATA(189,87,29,207,234,76,91,178,201,60,50,59,215,147,201,81,116,185,200,124,40,50,169,231,246,202,183,227,175,61,142,7)
+IMAGE_DATA(84,54,70,199,168,57,100,228,37,62,107,213,242,85,245,61,113,54,230,142,47,155,47,251,20,125,211,62,195,136,117,162)
+IMAGE_DATA(13,54,59,108,147,143,71,249,6,79,158,29,80,94,65,75,220,196,25,39,252,122,244,21,125,182,244,156,51,63,118,161)
+IMAGE_DATA(26,47,121,190,128,24,71,188,39,126,136,253,99,61,24,75,107,222,177,199,216,114,230,206,188,43,26,230,131,189,65,54)
+IMAGE_DATA(130,87,69,195,184,177,17,216,255,106,125,25,19,246,135,184,169,71,131,28,156,66,231,213,7,101,242,48,34,155,94,99)
+IMAGE_DATA(170,114,210,91,231,81,140,62,152,187,251,32,61,95,102,177,188,251,246,144,89,206,153,232,169,175,165,222,29,247,252,9)
+IMAGE_DATA(58,169,182,154,122,62,116,195,235,123,56,11,232,247,186,174,200,159,250,28,183,71,208,103,53,128,122,158,142,117,131,167)
+IMAGE_DATA(234,157,98,124,158,229,29,57,239,112,63,153,249,242,202,159,227,31,200,159,86,53,141,244,29,50,196,189,72,96,140,9)
+IMAGE_DATA(27,131,45,226,156,21,223,101,243,142,207,227,251,24,35,254,49,94,57,127,181,104,208,93,181,17,173,113,179,135,232,13)
+IMAGE_DATA(251,157,173,49,243,140,118,196,28,61,154,192,248,142,113,109,189,239,197,15,33,15,202,87,229,147,121,113,151,157,205,37)
+IMAGE_DATA(16,27,140,158,196,58,183,100,114,20,117,15,217,15,213,79,228,64,99,249,74,215,53,150,39,118,168,206,73,85,237,87)
+IMAGE_DATA(117,222,67,215,177,59,158,219,98,45,169,11,136,118,252,79,237,159,239,117,180,65,231,25,163,230,37,51,186,120,143,126)
+IMAGE_DATA(83,63,20,232,182,39,203,175,123,45,1,119,147,209,223,136,158,115,254,209,184,155,216,32,120,120,221,50,124,177,75,228)
+IMAGE_DATA(76,216,67,244,16,127,194,185,66,231,173,175,122,63,74,236,21,253,122,238,193,235,36,53,231,234,227,174,244,157,90,45)
+IMAGE_DATA(173,209,202,106,56,65,226,74,230,160,52,217,190,32,251,154,87,62,214,199,227,215,131,183,251,25,246,129,117,192,31,162)
+IMAGE_DATA(247,89,13,186,143,139,28,55,241,117,175,38,189,85,171,206,58,233,57,136,121,99,43,145,21,205,191,187,190,235,253,25)
+IMAGE_DATA(49,248,169,158,117,35,14,64,215,99,61,188,158,143,61,198,247,48,110,214,216,107,248,240,209,106,231,208,119,246,77,237)
+IMAGE_DATA(152,34,182,4,93,66,54,91,235,131,13,194,151,196,218,198,188,200,189,233,93,154,230,219,67,207,99,60,156,255,184,139)
+IMAGE_DATA(35,126,66,7,171,113,234,24,145,47,93,47,141,131,153,71,214,151,214,83,232,89,139,181,114,187,175,241,158,230,92,145)
+IMAGE_DATA(13,206,46,21,47,198,23,180,216,134,248,63,107,239,50,128,29,131,119,69,131,94,225,159,142,169,59,226,188,157,233,58)
+IMAGE_DATA(242,201,218,177,14,154,163,213,53,80,153,102,236,156,77,136,227,178,58,21,149,237,22,106,252,173,185,53,244,221,207,151)
+IMAGE_DATA(173,88,158,49,246,98,249,181,160,231,105,236,91,86,231,163,186,171,245,36,217,58,209,135,238,129,158,45,43,185,215,58)
+IMAGE_DATA(162,104,195,28,217,59,246,168,138,123,240,239,200,188,230,216,93,207,227,59,124,63,58,22,52,216,207,232,7,123,134,76)
+IMAGE_DATA(251,190,232,115,11,216,39,236,31,177,15,177,188,218,142,170,246,73,237,41,136,108,100,52,106,111,52,95,211,243,31,202)
+IMAGE_DATA(139,88,134,253,175,98,75,143,87,84,7,117,79,60,215,164,250,190,54,119,135,108,106,253,88,86,87,206,186,106,238,78)
+IMAGE_DATA(245,138,252,172,34,107,128,28,107,44,233,168,114,87,217,54,252,177,234,137,199,223,156,27,92,254,91,177,60,125,185,237)
+IMAGE_DATA(56,22,208,15,95,79,231,27,72,30,72,243,175,149,60,98,235,180,134,5,250,158,14,169,140,192,47,123,22,200,243,9)
+IMAGE_DATA(177,54,113,159,230,122,158,197,238,156,57,148,23,113,1,118,41,155,155,214,37,243,30,93,199,87,98,3,53,150,247,88)
+IMAGE_DATA(200,235,156,153,31,113,121,160,218,57,231,15,250,249,142,113,187,238,234,152,213,54,194,15,125,247,249,169,141,32,79,193)
+IMAGE_DATA(254,99,87,178,246,74,3,143,181,250,78,174,135,245,169,234,77,57,103,224,7,93,54,171,181,102,62,228,5,20,201,231)
+IMAGE_DATA(114,126,113,59,237,254,158,88,70,253,177,199,223,217,61,92,229,219,209,59,175,213,220,2,238,219,179,245,140,87,173,69)
+IMAGE_DATA(225,124,232,62,43,139,111,84,223,253,12,80,197,76,216,82,189,83,169,236,59,182,154,243,121,166,231,174,235,154,239,201)
+IMAGE_DATA(206,71,200,153,218,97,215,179,204,191,234,29,157,250,90,206,23,149,236,209,95,22,151,163,79,250,236,147,211,248,121,95)
+IMAGE_DATA(243,123,213,184,177,141,204,27,157,82,125,207,104,136,35,224,231,54,34,163,97,78,107,227,81,238,173,84,94,50,127,232)
+IMAGE_DATA(123,168,119,163,122,31,89,97,213,134,243,32,182,51,243,53,42,135,216,93,244,34,243,199,217,217,61,243,239,122,118,103)
+IMAGE_DATA(189,221,86,250,51,154,35,24,227,81,249,200,116,157,255,179,123,10,114,76,213,217,70,117,23,217,111,197,3,216,52,141)
+IMAGE_DATA(175,245,12,171,121,5,244,149,60,156,198,234,149,79,39,159,162,182,5,59,22,124,52,150,39,167,232,122,163,99,102,172)
+IMAGE_DATA(236,177,223,255,170,252,232,179,77,61,125,210,88,190,165,79,154,179,208,152,160,101,35,24,135,223,149,183,104,136,229,169)
+IMAGE_DATA(215,96,47,71,231,164,119,223,163,250,62,114,214,245,61,196,166,232,93,147,198,136,25,122,13,130,198,161,154,147,86,25)
+IMAGE_DATA(205,124,26,121,94,141,101,178,59,126,61,55,181,98,121,205,3,184,173,172,158,243,202,80,219,16,199,84,245,250,250,153)
+IMAGE_DATA(214,224,58,102,241,156,234,174,202,190,230,191,188,61,50,66,124,170,186,130,111,103,12,209,47,249,246,17,159,174,246,199)
+IMAGE_DATA(121,233,89,203,99,30,213,19,61,195,185,95,209,218,121,100,135,124,172,231,31,42,29,212,121,35,111,61,125,210,179,162)
+IMAGE_DATA(222,195,141,216,8,143,203,125,124,30,151,171,142,16,151,86,52,106,35,244,46,105,20,52,126,212,59,143,108,13,148,135)
+IMAGE_DATA(231,195,179,223,118,244,223,121,212,218,84,61,123,249,89,69,245,29,222,241,30,187,226,186,238,182,77,227,133,158,190,249)
+IMAGE_DATA(222,106,174,19,126,189,250,10,173,179,192,159,85,252,61,151,171,103,30,214,66,115,84,154,171,210,28,150,238,69,21,203)
+IMAGE_DATA(123,12,163,53,81,154,103,85,159,94,233,185,234,58,185,119,108,82,22,139,35,195,26,203,171,239,202,100,44,243,43,216)
+IMAGE_DATA(79,173,237,85,155,222,210,219,44,46,87,63,93,229,13,212,79,175,245,185,200,140,158,247,123,113,185,210,232,217,221,105)
+IMAGE_DATA(52,119,163,235,219,243,237,250,61,177,252,200,26,84,247,85,163,113,46,252,184,243,83,158,85,94,130,188,28,118,9,123)
+IMAGE_DATA(223,170,239,70,223,91,119,83,170,239,154,87,210,154,108,149,169,222,29,33,99,69,62,89,179,74,215,177,51,94,163,152)
+IMAGE_DATA(213,46,102,136,31,241,88,62,179,107,248,253,236,12,203,29,120,203,167,187,174,19,191,171,31,117,25,214,56,144,61,241)
+IMAGE_DATA(60,153,203,114,207,175,0,30,147,182,124,187,199,242,189,248,34,243,211,241,154,233,135,199,229,107,109,132,223,27,244,230)
+IMAGE_DATA(228,177,188,242,234,161,214,36,143,230,7,52,230,93,11,156,211,221,238,185,239,141,207,240,119,248,177,44,126,111,61,103)
+IMAGE_DATA(160,250,158,229,197,43,125,87,91,169,254,168,87,27,164,119,226,200,162,223,47,187,254,97,163,61,55,79,28,212,123,94)
+IMAGE_DATA(64,125,22,107,214,139,97,92,174,24,179,158,211,93,207,209,245,176,5,177,7,244,167,251,229,177,166,214,18,96,147,213)
+IMAGE_DATA(175,184,157,208,123,38,207,165,100,177,42,117,201,90,251,145,233,187,222,225,248,121,63,163,209,179,210,90,159,235,57,246)
+IMAGE_DATA(145,243,190,219,8,61,151,173,177,17,61,223,0,143,76,255,50,204,238,190,136,211,71,206,179,252,175,103,167,44,206,70)
+IMAGE_DATA(110,25,11,99,212,26,167,145,220,132,238,145,223,43,102,250,206,157,3,242,137,78,225,219,123,245,0,186,223,217,221,88)
+IMAGE_DATA(198,19,27,205,157,38,57,62,245,243,217,243,36,122,22,229,12,235,247,112,126,30,202,98,249,104,175,241,123,166,231,170)
+IMAGE_DATA(235,65,23,103,150,86,76,166,50,172,247,112,177,150,154,39,203,206,29,85,142,40,219,107,143,73,91,103,99,157,183,158)
+IMAGE_DATA(141,51,223,206,157,137,198,23,90,11,145,241,169,108,68,203,135,106,28,145,221,195,101,115,82,187,162,119,139,42,163,89)
+IMAGE_DATA(253,30,117,168,228,184,91,249,74,213,119,114,136,248,25,114,175,173,248,19,30,177,103,90,3,157,233,185,234,58,107,199)
+IMAGE_DATA(239,34,232,157,204,200,115,2,172,59,119,77,90,51,228,186,175,185,110,229,161,103,98,183,21,126,103,160,245,94,204,93)
+IMAGE_DATA(105,157,175,203,7,49,9,231,0,175,185,205,246,142,28,86,85,39,166,227,99,126,106,79,214,232,58,246,38,203,129,186)
+IMAGE_DATA(221,214,122,19,214,211,115,68,89,158,134,58,162,94,44,79,172,160,50,91,157,5,137,21,170,156,155,143,131,88,86,99)
+IMAGE_DATA(121,228,72,99,108,159,183,218,8,141,229,91,188,178,152,43,179,17,110,15,117,47,137,87,70,234,249,225,225,118,215,243)
+IMAGE_DATA(187,90,47,19,168,207,203,169,62,57,18,143,171,156,120,124,235,118,133,249,240,44,24,207,221,232,115,166,216,144,214,239)
+IMAGE_DATA(61,235,57,37,198,145,213,133,171,254,49,7,149,107,189,151,86,153,116,253,99,223,136,49,241,107,228,194,50,158,122,70)
+IMAGE_DATA(84,157,208,59,196,234,204,128,79,200,106,73,149,7,60,201,185,171,92,5,246,116,157,223,154,81,123,158,213,10,250,90)
+IMAGE_DATA(18,103,176,135,129,1,26,19,103,118,147,181,212,251,222,44,150,175,238,147,220,214,105,92,163,107,235,182,209,247,69,239)
+IMAGE_DATA(17,213,231,122,172,230,53,167,234,167,253,188,239,52,106,35,178,243,126,102,15,61,46,212,156,171,175,131,214,200,169,255)
+IMAGE_DATA(244,28,70,230,203,212,191,235,157,59,54,34,218,103,207,12,96,231,53,70,81,61,247,120,14,222,254,188,141,251,54,246)
+IMAGE_DATA(163,23,215,51,78,214,176,122,30,4,221,80,190,220,145,185,254,248,115,14,153,174,115,118,169,108,13,253,83,187,164,114)
+IMAGE_DATA(133,141,200,236,10,50,231,119,194,200,84,53,191,232,79,107,234,98,124,170,235,254,155,113,250,158,103,87,57,247,105,253)
+IMAGE_DATA(80,111,45,177,79,177,95,1,42,47,217,154,18,135,104,13,85,182,191,174,239,173,115,150,202,62,186,158,217,69,125,70)
+IMAGE_DATA(199,253,116,54,110,165,67,174,53,127,170,119,177,25,157,62,251,225,103,13,234,156,156,198,107,230,61,254,175,114,222,26)
+IMAGE_DATA(123,232,51,245,156,107,178,53,243,218,172,44,223,166,49,7,223,113,47,229,119,69,153,109,117,189,203,158,87,210,177,247)
+IMAGE_DATA(244,29,185,136,182,216,96,127,206,207,159,59,202,158,211,170,116,53,250,164,22,64,117,93,127,27,3,91,83,157,173,244)
+IMAGE_DATA(25,174,232,207,235,220,224,165,245,132,158,99,103,207,42,187,18,253,170,76,241,59,82,189,223,132,197,183,235,156,240,91)
+IMAGE_DATA(85,76,151,217,40,250,104,157,83,208,155,145,154,102,125,110,52,250,175,246,148,245,227,126,19,254,149,189,65,159,84,7)
+IMAGE_DATA(53,239,90,209,121,92,174,53,127,45,27,225,49,23,231,199,150,141,240,88,190,138,113,52,246,80,187,162,119,230,106,43)
+IMAGE_DATA(42,123,201,58,102,181,29,248,59,108,58,253,122,158,186,138,5,43,251,172,118,68,207,86,35,121,59,234,122,240,183,196)
+IMAGE_DATA(190,213,239,207,169,158,249,239,209,105,141,169,254,6,78,118,111,128,173,81,63,164,191,253,146,241,202,158,59,64,46,220)
+IMAGE_DATA(174,104,223,232,95,134,94,183,16,175,161,239,173,24,222,125,59,49,181,202,9,231,217,108,29,225,141,142,241,92,14,254)
+IMAGE_DATA(181,26,171,230,170,123,53,36,204,159,24,215,199,193,220,177,147,252,86,6,242,93,173,149,198,23,154,99,175,198,173,103)
+IMAGE_DATA(86,213,67,125,30,196,249,121,253,132,159,247,181,214,194,215,71,109,4,62,90,249,56,178,7,126,55,170,245,47,232,149)
+IMAGE_DATA(242,11,125,110,201,164,230,51,208,133,216,47,108,136,214,143,84,99,243,190,28,53,150,31,241,239,90,35,135,221,197,39)
+IMAGE_DATA(70,63,156,219,125,46,138,204,157,223,132,209,231,122,189,246,203,239,8,149,47,57,1,236,99,197,143,120,137,231,190,233)
+IMAGE_DATA(95,237,10,249,19,114,117,60,71,18,255,43,242,185,142,153,60,57,207,178,182,48,218,68,91,215,51,114,111,240,240,124)
+IMAGE_DATA(15,227,103,189,2,208,183,108,156,244,163,53,22,189,231,145,213,158,234,186,130,202,159,59,76,229,195,88,116,76,190,86)
+IMAGE_DATA(236,177,183,117,26,29,183,158,1,90,52,94,47,239,123,89,161,230,229,241,239,35,52,85,45,153,235,4,254,176,210,67)
+IMAGE_DATA(252,182,234,130,230,211,117,159,79,129,186,166,35,254,93,127,155,66,207,189,58,78,207,5,130,110,179,253,158,19,217,111)
+IMAGE_DATA(213,253,160,95,202,179,186,115,243,56,146,118,206,79,159,51,235,253,198,142,202,45,58,196,90,180,238,253,212,207,250,179)
+IMAGE_DATA(4,200,136,206,199,17,190,126,183,210,66,237,119,100,111,89,219,214,56,116,77,71,214,74,115,7,163,52,180,213,62,70)
+IMAGE_DATA(248,48,110,205,137,141,238,165,222,21,174,153,147,250,36,223,203,76,39,90,242,169,178,73,63,250,220,215,169,112,196,254)
+IMAGE_DATA(87,122,239,191,121,168,231,218,76,78,28,153,147,215,7,183,120,106,157,81,171,239,140,23,251,149,197,15,254,187,151,58)
+IMAGE_DATA(118,151,123,114,221,78,223,170,129,206,230,167,235,216,155,143,142,95,229,187,53,206,42,86,106,233,188,239,167,219,200,138)
+IMAGE_DATA(127,53,22,114,193,172,207,200,179,96,216,40,165,105,241,243,185,86,123,153,33,227,27,229,163,52,213,94,182,214,112,68)
+IMAGE_DATA(23,116,14,186,94,218,182,133,170,135,222,126,141,60,84,250,231,191,53,90,217,36,173,23,114,29,88,243,252,161,242,116)
+IMAGE_DATA(190,89,157,18,188,122,252,188,223,86,61,222,154,49,143,206,167,101,51,124,252,163,191,225,188,101,109,91,252,143,93,43)
+IMAGE_DATA(255,93,230,30,221,49,251,114,41,154,172,150,161,165,19,170,23,163,186,48,186,215,35,232,243,221,42,179,46,187,21,250)
+IMAGE_DATA(51,0,231,228,153,61,115,48,218,103,239,217,133,83,194,26,222,231,28,231,104,159,199,140,225,216,113,159,147,230,152,249)
+IMAGE_DATA(140,172,235,169,228,243,54,200,196,40,92,138,207,132,9,19,38,76,152,48,97,194,132,9,19,114,248,63,14,29,61,54)
+IMAGE_END_DATA(5088, 20)
+
+IMAGE_BEGIN_DATA
+IMAGE_DATA(120,156,99,16,96,16,96,160,38,40,236,92,246,159,28,140,172,255,255,127,6,20,188,106,213,170,255,248,0,86,253,207)
+IMAGE_DATA(129,184,3,136,11,17,250,235,235,235,225,24,198,199,170,31,164,55,18,136,181,80,245,147,100,63,200,110,71,76,253,216)
+IMAGE_DATA(220,128,213,126,144,221,11,200,244,127,7,84,63,200,29,231,201,240,191,22,3,2,47,32,195,126,71,136,189,96,253,207)
+IMAGE_DATA(49,245,163,187,3,67,255,121,164,240,35,55,254,29,161,102,252,39,51,254,181,160,126,32,199,254,5,72,225,143,197,126)
+IMAGE_DATA(244,112,64,215,79,73,254,161,4,0,0,124,78,86,154,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0)
+IMAGE_END_DATA(160, 1)
diff --git a/uppsrc/ide/ide.key b/uppsrc/ide/ide.key
new file mode 100644
index 000000000..355a0afe9
--- /dev/null
+++ b/uppsrc/ide/ide.key
@@ -0,0 +1,93 @@
+KEY(SETMAIN, "Set main package..", 0)
+KEY(EDITFILE, "Edit file", K_CTRL_O)
+KEY(OPPOSITE, "Opposite file", K_ALT_O)
+KEY(SAVEFILE, "Save", K_CTRL_S)
+KEY(READONLY, "Read only", 0)
+KEY(PACKAGESFILES, "Show/hide workspace", K_CTRL_SLASH)
+KEY(LANGUAGES, "Show/hide languages", K_CTRL_N)
+KEY(STATISTICS, "Statistics..", 0)
+KEY(EXIT, "Exit", 0)
+KEY(SPLIT, "Split editor vertical", K_CTRL_MINUS)
+KEY(VSPLIT, "Split editor horizontal", K_CTRL_BACKSLASH)
+KEY(SWAP, "Other editor", K_CTRL_GRAVE)
+KEY(CLOSETAB, "Close file tab", K_CTRL_U)
+KEY(CLOSETABS, "Close all file tabs", K_SHIFT|K_CTRL_U)
+
+KEY(FINDINFILES, "Find in files..", K_CTRL_F|K_SHIFT)
+KEY(FINDFILE, "Find file", K_CTRL_H)
+KEY(EDITASTEXT, "Edit as text", K_CTRL_T)
+KEY(DESIGNER, "Edit using the designer", K_CTRL_T)
+KEY2(CUTLINE, "Cut line", K_CTRL_Y, K_CTRL_L)
+KEY(DELLINE, "Delete line", 0)
+KEY(FIND, "Find / replace", K_CTRL_F)
+KEY(FINDSEL, "Find selected text", 0)
+KEY(FINDNEXT, "Find next", K_F3)
+KEY(FINDPREV, "Find previous", K_SHIFT_F3)
+KEY(GOTO, "Navigate in the file..", K_CTRL_G)
+KEY(GOTOGLOBAL, "Navigate..", K_CTRL_J)
+KEY(FINDSTRING, "Find string", K_F2)
+KEY(FINDSTRINGBACK, "Find string backwards", K_SHIFT_F2)
+KEY(TRANSLATESTRING, "Mark selection with t_", K_ALT_F2)
+KEY(SPACESTOTABS, "Spaces to tabs", 0)
+KEY(TABSTOSPACES, "Tabs to spaces", 0)
+
+KEY(FORMATCODE, "Format code in editor", 0)
+
+KEY(ORGANIZER, "Package organizer..", 0)
+KEY(CUSTOM, "Custom build steps..", 0)
+KEY(MAINCONFIG, "Main package configuration..", 0)
+KEY(SYNCT, "Synchronize translation files", K_CTRL_F2)
+KEY(TRIMPORT, "Import runtime translation file (*.tr)..", 0)
+KEY(TREXPORT, "Export runtime translation file (*.tr)..", 0)
+
+KEY(FILEPROPERTIES, "File properties..", 0)
+KEY(SAVEENCODING, "Convert to encoding..", 0)
+
+KEY(COMPILEFILE, "Compile file", K_CTRL_F7)
+KEY(PREPROCESSFILE, "Preprocess file", K_ALT_F7)
+
+KEY(OUTPUTMODE, "Output mode..", 0)
+KEY(BUILD, "Start/stop build", K_F7)
+KEY(CLEAN, "Clean", 0)
+KEY(REBUILDALL, "Rebuild All", 0)
+KEY(CREATEMAKEFILE, "Create makefile", 0)
+KEY(CLEANUPPOUT, "Clean UPPOUT", 0)
+KEY(BUILDPACKAGE, "Build package", 0)
+KEY(CLEANPACKAGE, "Clean package", 0)
+KEY(FINDNEXTERROR, "Find next error", K_F4)
+KEY(FINDPREVERROR, "Find previous error", K_SHIFT_F4)
+
+KEY(SWAPCHARS, "Transpose characters", K_SHIFT|K_CTRL_T)
+KEY(COPYWORD, "Copy word", K_CTRL_K)
+
+KEY(RUNOPTIONS, "Run options..", 0)
+KEY(EXECUTE, "Execute", K_CTRL_F5)
+KEY(DEBUG, "Run (in debugger)", K_F5)
+KEY(DEBUGTO, "Run to cursor (in debugger)", K_CTRL_F10)
+KEY(DEBUGEXT, "Debug externally", K_ALT_F5)
+KEY(DEBUGFILEEXT, "Debug file externally", K_SHIFT|K_ALT_F5)
+KEY(VALGRIND, "Test in Valgrind", 0)
+KEY(BREAKPOINT, "Toggle breakpoint", K_F9)
+KEY(CONDBREAKPOINT, "Conditional breakpoint..", K_ALT_F9)
+KEY(CLEARBREAKPOINTS, "Clear all breakpoints", K_CTRL_F9|K_SHIFT)
+KEY(OPENLOG, "View the logfile", K_ALT_L)
+
+KEY(TOGGLEBROWSER, "Show Browser++", K_CTRL_B)
+KEY(QUERY, "Query..", K_CTRL_Q)
+KEY(QUERYWORD, "Query word", K_CTRL_W)
+KEY(HELPITEM, "Show documentation for current C++ item...", K_F1);
+KEY(SEARCHTOPICS, "Search word in Help & Topics", K_CTRL_F1)
+KEY(BROWSETOPICS, "Help & Topics", K_F1)
+KEY(CALC, "Calculator", K_CTRL_E)
+KEY(ASSIST, "Assist", ' '|K_CTRL)
+KEY(COMPLETE, "Complete identifier", K_CTRL_COMMA)
+KEY(DCOPY, "Copy as definition/declaration", K_ALT_C)
+KEY(VIRTUALS, "Virtual methods..", K_ALT_V)
+KEY(THISBACKS, "THISBACKs..", K_ALT_T)
+KEY(SWAPS, "Go to definition/declaration", K_ALT_I)
+KEY(JUMPS, "Go to symbol definition", K_ALT_J)
+//KEY(INSERTCOLOR, "Insert choosen color value..");
+KEY(CLEARMARKERSFILE, "Remove change markers in file", K_ALT_R)
+KEY(CLEARMARKERSALL, "Remove all change markers", K_SHIFT|K_ALT_R)
+KEY(TOGGLEINDEX, "File index", K_CTRL_F12)
+KEY(SEARCHINDEX, "File index search", K_F12)
diff --git a/uppsrc/ide/ide.lay b/uppsrc/ide/ide.lay
new file mode 100644
index 000000000..607f942cd
--- /dev/null
+++ b/uppsrc/ide/ide.lay
@@ -0,0 +1,536 @@
+LAYOUT(ListLayout, 604, 432)
+	ITEM(Splitter, splitter, HSizePosZ(4, 4).VSizePosZ(4, 60))
+	ITEM(Option, all, SetLabel(t_("&All packages")).LeftPosZ(4, 80).BottomPosZ(9, 19))
+	ITEM(EditString, search, LeftPosZ(152, 124).BottomPosZ(9, 19))
+	ITEM(Option, brief, SetLabel(t_("Brief list")).HSizePosZ(296, 240).BottomPosZ(8, 20))
+	ITEM(ProgressIndicator, progress, HSizePosZ(4, 254).BottomPosZ(12, 15))
+	ITEM(Button, newu, SetLabel(t_("&New package")).RightPosZ(140, 90).BottomPosZ(8, 22))
+	ITEM(Button, ok, SetLabel(t_("OK")).RightPosZ(72, 64).BottomPosZ(8, 22))
+	ITEM(Button, cancel, SetLabel(t_("Cancel")).RightPosZ(4, 64).BottomPosZ(8, 22))
+	ITEM(DataPusher, description, HSizePosZ(4, 6).BottomPosZ(37, 19))
+END_LAYOUT
+
+LAYOUT(ConfigLayout, 724, 214)
+	ITEM(ArrayCtrl, list, AutoHideSb(true).HSizePosZ(4, 4).VSizePosZ(6, 32))
+	ITEM(Button, ok, SetLabel(t_("OK")).RightPosZ(88, 80).BottomPosZ(4, 22))
+	ITEM(Button, cancel, SetLabel(t_("Cancel")).RightPosZ(4, 80).BottomPosZ(4, 22))
+END_LAYOUT
+
+LAYOUT(BaseSetupLayout, 420, 164)
+	ITEM(Label, dv___0, SetLabel(t_("&Package nests:")).LeftPosZ(4, 190).TopPosZ(4, 15))
+	ITEM(EditString, upp, LeftPosZ(4, 408).TopPosZ(20, 19))
+	ITEM(Label, dv___2, SetLabel(t_("&Output and intermediate directory root:")).LeftPosZ(4, 192).TopPosZ(44, 15))
+	ITEM(EditString, output, LeftPosZ(4, 408).TopPosZ(60, 19))
+	ITEM(Label, dv___4, SetLabel(t_("&Common files root:")).LeftPosZ(4, 192).TopPosZ(84, 15))
+	ITEM(EditString, common, LeftPosZ(4, 408).TopPosZ(100, 19))
+	ITEM(Label, dv___6, SetLabel(t_("&Assembly name:")).LeftPosZ(4, 84).TopPosZ(132, 20))
+	ITEM(EditString, base, NotNull(true).LeftPosZ(92, 96).TopPosZ(132, 19))
+	ITEM(Button, ok, SetLabel(t_("OK")).LeftPosZ(272, 64).TopPosZ(132, 24))
+	ITEM(Button, cancel, SetLabel(t_("Cancel")).LeftPosZ(348, 64).TopPosZ(132, 24))
+END_LAYOUT
+
+LAYOUT(ConfLayout, 344, 120)
+	ITEM(LabelBox, dv___0, SetLabel(t_("Target")).LeftPosZ(8, 104).TopPosZ(0, 52))
+	ITEM(Switch, dll, SetLabel(t_("Executable\nDynamic library")).LeftPosZ(16, 96).TopPosZ(16, 34))
+	ITEM(LabelBox, dv___2, SetLabel(t_("App style")).LeftPosZ(116, 82).TopPosZ(0, 52))
+	ITEM(Switch, gui, SetLabel(t_("Console\nGUI")).LeftPosZ(124, 70).TopPosZ(16, 34))
+	ITEM(LabelBox, dv___4, SetLabel(t_("Thread model")).LeftPosZ(204, 130).TopPosZ(0, 52))
+	ITEM(Switch, mt, SetLabel(t_("Singlethreaded\nMultithreaded")).LeftPosZ(212, 118).TopPosZ(16, 34))
+	ITEM(Label, dv___6, SetLabel(t_("&Other flags:")).LeftPosZ(8, 58).TopPosZ(60, 19))
+	ITEM(EditString, other, LeftPosZ(68, 268).TopPosZ(60, 19))
+	ITEM(Button, ok, SetLabel(t_("OK")).LeftPosZ(204, 64).TopPosZ(88, 24))
+	ITEM(Button, cancel, SetLabel(t_("Cancel")).LeftPosZ(272, 64).TopPosZ(88, 24))
+END_LAYOUT
+
+LAYOUT(CustomLayout, 608, 410)
+	ITEM(ArrayCtrl, list, AutoHideSb(true).HSizePosZ(4, 4).VSizePosZ(4, 218))
+	ITEM(Label, dv___1, SetLabel(t_("Commands:")).LeftPosZ(4, 70).BottomPosZ(194, 16))
+	UNTYPED(command, HSizePosZ(4, 4).BottomPosZ(102, 92))
+	ITEM(Button, commandmenu, RightPosZ(4, 16).BottomPosZ(195, 15))
+	ITEM(Label, dv___4, SetLabel(t_("Output file(s):")).LeftPosZ(4, 92).BottomPosZ(78, 16))
+	UNTYPED(output, HSizePosZ(2, 4).BottomPosZ(34, 44))
+	ITEM(Button, outputmenu, RightPosZ(4, 16).BottomPosZ(79, 15))
+	ITEM(Button, exit, SetLabel(t_("Close")).RightPosZ(4, 80).BottomPosZ(4, 22))
+END_LAYOUT
+
+LAYOUT(RunLayout, 410, 144)
+	ITEM(Label, dv___0, SetLabel(t_("&Working directory:")).LeftPosZ(4, 100).TopPosZ(4, 19))
+	ITEM(EditString, dir, HSizePosZ(106, 4).TopPosZ(4, 19))
+	ITEM(Label, dv___2, SetLabel(t_("&Program arguments:")).LeftPosZ(4, 100).TopPosZ(26, 19))
+	ITEM(WithDropChoice<EditString>, arg, HSizePosZ(106, 4).TopPosZ(26, 19))
+	ITEM(Label, dv___4, SetLabel(t_("STDOUT file:")).LeftPosZ(4, 100).TopPosZ(48, 19))
+	ITEM(WithDropChoice<EditString>, stdout_file, HSizePosZ(106, 4).TopPosZ(48, 19))
+	ITEM(Label, dv___6, SetLabel(t_("Standard output:")).LeftPosZ(4, 100).TopPosZ(70, 19))
+	ITEM(Switch, runmode, SetLabel(t_("&Standalone\n&Console\n&File")).LeftPosZ(106, 196).TopPosZ(72, 19))
+	ITEM(Option, external, SetLabel(t_("&External application")).LeftPosZ(106, 122).TopPosZ(94, 15))
+	ITEM(Button, ok, SetLabel(t_("OK")).RightPosZ(90, 80).BottomPosZ(4, 22))
+	ITEM(Button, cancel, SetLabel(t_("Cancel")).RightPosZ(4, 80).BottomPosZ(4, 22))
+END_LAYOUT
+
+LAYOUT(FindInFilesLayout, 420, 176)
+	ITEM(Label, dv___0, SetLabel(t_("&Find:")).LeftPosZ(4, 48).TopPosZ(4, 19))
+	ITEM(WithDropChoice<EditString>, find, LeftPosZ(52, 364).TopPosZ(4, 19))
+	ITEM(Label, dv___2, SetLabel(t_("In fil&es:")).LeftPosZ(4, 48).TopPosZ(28, 19))
+	ITEM(WithDropChoice<EditString>, files, LeftPosZ(52, 364).TopPosZ(28, 19))
+	ITEM(Label, dv___4, SetLabel(t_("In f&older:")).LeftPosZ(4, 48).TopPosZ(52, 19))
+	ITEM(WithDropChoice<EditString>, folder, LeftPosZ(52, 364).TopPosZ(52, 19))
+	ITEM(Label, dv___6, SetLabel(t_("&Replace:")).LeftPosZ(4, 48).TopPosZ(74, 19))
+	ITEM(WithDropChoice<EditString>, replace, LeftPosZ(52, 364).TopPosZ(74, 19))
+	ITEM(Option, wholeword, SetLabel(t_("&Whole word")).LeftPosZ(54, 80).TopPosZ(100, 18))
+	ITEM(Option, ignorecase, SetLabel(t_("&Ignore case")).LeftPosZ(140, 80).TopPosZ(100, 18))
+	ITEM(Option, wildcards, SetLabel(t_("Wild&cards")).LeftPosZ(226, 72).TopPosZ(100, 18))
+	ITEM(Label, dv___11, SetLabel(t_("Replace:")).LeftPosZ(4, 50).TopPosZ(124, 19))
+	ITEM(Switch, style, SetLabel(t_("&None\nCo&nfirm\n&Auto")).LeftPosZ(54, 164).TopPosZ(126, 15))
+	ITEM(Button, ok, SetLabel(t_("OK")).RightPosZ(76, 64).BottomPosZ(6, 22))
+	ITEM(Button, cancel, SetLabel(t_("Cancel")).RightPosZ(8, 64).BottomPosZ(6, 22))
+END_LAYOUT
+
+LAYOUT(BatchBuildLayout, 276, 276)
+	ITEM(ArrayCtrl, list, AutoHideSb(true).HSizePosZ(4, 4).VSizePosZ(4, 32))
+	ITEM(Option, rebuild_all, SetLabel(t_("&Rebuild all")).LeftPosZ(4, 92).BottomPosZ(5, 19))
+	ITEM(Button, ok, SetLabel(t_("OK")).RightPosZ(88, 80).BottomPosZ(4, 22))
+	ITEM(Button, cancel, SetLabel(t_("Cancel")).RightPosZ(4, 80).BottomPosZ(4, 22))
+END_LAYOUT
+
+LAYOUT(FindFileLayout, 450, 280)
+	ITEM(Label, dv___0, SetLabel(t_("&File name:")).LeftPosZ(4, 56).TopPosZ(4, 19))
+	ITEM(EditField, mask, HSizePosZ(62, 4).TopPosZ(4, 19))
+	ITEM(ArrayCtrl, list, AutoHideSb(true).HSizePosZ(4, 4).VSizePosZ(28, 34))
+	ITEM(Button, ok, SetLabel(t_("OK")).RightPosZ(88, 80).BottomPosZ(4, 22))
+	ITEM(Button, cancel, SetLabel(t_("Cancel")).RightPosZ(4, 80).BottomPosZ(4, 22))
+END_LAYOUT
+
+LAYOUT(UppLayout, 800, 576)
+	UNTYPED(package, LeftPosZ(4, 240).TopPosZ(4, 376))
+	ITEM(Label, dv___1, SetLabel(t_("Description")).LeftPosZ(248, 56).TopPosZ(4, 19))
+	ITEM(DataPusher, description, HSizePosZ(304, 4).TopPosZ(4, 20))
+	ITEM(Option, optimize_speed, SetLabel(t_("Optimize for speed")).LeftPosZ(248, 120).TopPosZ(28, 20))
+	ITEM(Label, dv___4, SetLabel(t_("&Accepts")).LeftPosZ(368, 40).TopPosZ(28, 19))
+	ITEM(EditString, accepts, HSizePosZ(408, 260).TopPosZ(28, 19))
+	ITEM(Label, dv___6, SetLabel(t_("Encoding")).RightPosZ(204, 48).TopPosZ(28, 19))
+	ITEM(DropList, charset, RightPosZ(92, 112).TopPosZ(28, 19))
+	ITEM(Option, noblitz, SetLabel(t_("No BLITZ")).RightPosZ(6, 76).TopPosZ(28, 20))
+	ITEM(ArrayCtrl, option, HSizePosZ(248, 4).VSizePosZ(52, 128))
+	UNTYPED(filelist, LeftPosZ(4, 240).VSizePosZ(384, 4))
+	ITEM(ArrayCtrl, fileoption, HSizePosZ(248, 4).BottomPosZ(32, 92))
+	ITEM(Option, optimize_speed_file, SetLabel(t_("Optimize the file for speed")).LeftPosZ(248, 152).BottomPosZ(9, 19))
+	ITEM(Button, ok, SetLabel(t_("OK")).RightPosZ(76, 64).BottomPosZ(6, 22))
+	ITEM(Button, cancel, SetLabel(t_("Cancel")).RightPosZ(8, 64).BottomPosZ(6, 22))
+END_LAYOUT
+
+LAYOUT(NewPackageLayout, 728, 560)
+	ITEM(Label, dv___0, SetLabel(t_("Package name")).LeftPosZ(8, 80).TopPosZ(4, 19))
+	ITEM(EditString, package, LeftPosZ(88, 156).TopPosZ(4, 19))
+	ITEM(Label, dv___2, SetLabel(t_("Create in")).LeftPosZ(8, 84).TopPosZ(28, 19))
+	ITEM(DropList, nest, LeftPosZ(88, 156).TopPosZ(28, 19))
+	ITEM(ArrayCtrl, templist, AutoHideSb(true).LeftPosZ(8, 236).TopPosZ(52, 272))
+	ITEM(Label, dv___5, SetLabel(t_("Package description")).LeftPosZ(248, 108).TopPosZ(4, 20))
+	ITEM(EditString, description, HSizePosZ(356, 8).TopPosZ(4, 19))
+	ITEM(Button, cancel, SetLabel(t_("Cancel")).LeftPosZ(176, 64).BottomPosZ(4, 24))
+	ITEM(Button, ok, SetLabel(t_("Create")).LeftPosZ(108, 64).BottomPosZ(4, 24))
+	UNTYPED(preview, HSizePosZ(248, 8).VSizePosZ(28, 4))
+END_LAYOUT
+
+LAYOUT(FileFormatLayout, 348, 92)
+	ITEM(Label, dv___0, SetLabel(t_("&Encoding")).LeftPosZ(8, 49).TopPosZ(8, 20))
+	ITEM(DropList, charset, LeftPosZ(60, 120).TopPosZ(8, 19))
+	ITEM(Label, dv___2, SetLabel(t_("&Font")).LeftPosZ(8, 49).TopPosZ(32, 20))
+	ITEM(DropList, font, LeftPosZ(60, 120).TopPosZ(32, 19))
+	ITEM(Label, dv___4, SetLabel(t_("T&ab size")).LeftPosZ(200, 48).TopPosZ(8, 19))
+	ITEM(EditIntSpin, tabsize, LeftPosZ(264, 50).TopPosZ(8, 19))
+	ITEM(Label, dv___6, SetLabel(t_("&Highlighting")).LeftPosZ(200, 63).TopPosZ(32, 19))
+	ITEM(DropList, highlight, LeftPosZ(264, 76).TopPosZ(32, 19))
+	ITEM(Button, ok, SetLabel(t_("OK")).LeftPosZ(204, 64).TopPosZ(60, 22))
+	ITEM(Button, cancel, SetLabel(t_("Cancel")).LeftPosZ(276, 64).TopPosZ(60, 22))
+END_LAYOUT
+
+LAYOUT(CharsetLayout, 180, 60)
+	ITEM(DropList, charset, LeftPosZ(60, 112).TopPosZ(4, 19))
+	ITEM(Label, dv___1, SetLabel(t_("Encoding")).LeftPosZ(4, 52).TopPosZ(4, 19))
+	ITEM(Button, ok, SetLabel(t_("OK")).LeftPosZ(36, 64).TopPosZ(32, 22))
+	ITEM(Button, cancel, SetLabel(t_("Cancel")).LeftPosZ(108, 64).TopPosZ(32, 22))
+END_LAYOUT
+
+LAYOUT(StatisticsLayout, 242, 94)
+	ITEM(Label, dv___0, SetLabel(t_("Session time:")).LeftPosZ(4, 80).TopPosZ(4, 19))
+	ITEM(EditField, session_time, LeftPosZ(88, 150).TopPosZ(4, 19))
+	ITEM(Label, dv___2, SetLabel(t_("Editing time:")).LeftPosZ(4, 80).TopPosZ(26, 19))
+	ITEM(EditField, edit_time, LeftPosZ(88, 150).TopPosZ(26, 19))
+	ITEM(Label, dv___4, SetLabel(t_("Building time:")).LeftPosZ(4, 80).TopPosZ(48, 19))
+	ITEM(EditField, build_time, LeftPosZ(88, 150).TopPosZ(48, 19))
+	ITEM(Label, dv___6, SetLabel(t_("Idle time:")).LeftPosZ(4, 80).TopPosZ(70, 19))
+	ITEM(EditField, idle_time, LeftPosZ(88, 150).TopPosZ(70, 19))
+END_LAYOUT
+
+LAYOUT(BuildMethodsLayout, 724, 560)
+	ITEM(ArrayCtrl, method, AutoHideSb(true).LeftPosZ(4, 150).VSizePosZ(4, 180))
+	ITEM(Label, dv___1, SetLabel(t_("&Builder:")).LeftPosZ(164, 42).TopPosZ(4, 19))
+	ITEM(DropList, builder, LeftPosZ(208, 100).TopPosZ(4, 19))
+	ITEM(Label, dv___3, SetLabel(t_("&Compiler name:")).HSizePosZ(320, 324).TopPosZ(4, 19))
+	ITEM(EditString, compiler, RightPosZ(232, 88).TopPosZ(4, 19))
+	ITEM(LabelBox, dv___5, SetLabel(t_("Debug mode defaults")).HSizePosZ(164, 284).TopPosZ(32, 76))
+	ITEM(Label, dv___6, SetLabel(t_("Default debug info level:")).LeftPosZ(172, 132).TopPosZ(48, 19))
+	ITEM(DropList, debug_info, HSizePosZ(308, 308).TopPosZ(48, 19))
+	UNTYPED(debug_blitz, SwitchImage(false).SetLabel(t_("Use BLIT&Z")).LeftPosZ(172, 240).TopPosZ(72, 15))
+	UNTYPED(debug_linkmode, SetLabel(t_("All static\nShared libs\nAll shared")).HSizePosZ(172, 308).TopPosZ(88, 15))
+	ITEM(Label, dv___10, SetLabel(t_("&Debug options:")).LeftPosZ(164, 100).TopPosZ(112, 19))
+	ITEM(EditString, debug_options, HSizePosZ(264, 284).TopPosZ(112, 19))
+	ITEM(Label, dv___12, SetLabel(t_("&External debugger:")).RightPosZ(116, 96).TopPosZ(4, 19))
+	ITEM(EditString, debugger, RightPosZ(4, 112).TopPosZ(4, 20))
+	ITEM(LabelBox, dv___14, SetLabel(t_("Release mode defaults")).RightPosZ(4, 272).TopPosZ(32, 56))
+	UNTYPED(release_blitz, SwitchImage(false).SetLabel(t_("&Use BLITZ")).RightPosZ(12, 256).TopPosZ(48, 15))
+	UNTYPED(release_linkmode, SetLabel(t_("All static\nShared libs\nAll shared")).RightPosZ(12, 256).TopPosZ(64, 15))
+	ITEM(Label, dv___17, SetLabel(t_("Optimize for speed:")).RightPosZ(176, 100).TopPosZ(92, 19))
+	ITEM(EditString, speed_options, RightPosZ(4, 172).TopPosZ(92, 19))
+	ITEM(Label, dv___19, SetLabel(t_("Optimize for size:")).RightPosZ(176, 100).TopPosZ(112, 19))
+	ITEM(EditString, size_options, RightPosZ(4, 172).TopPosZ(112, 19))
+	ITEM(Label, dv___21, SetLabel(t_("Debug fixed flags:")).LeftPosZ(164, 100).TopPosZ(132, 19))
+	ITEM(EditString, debug_flags, HSizePosZ(264, 284).TopPosZ(132, 19))
+	ITEM(Label, dv___23, SetLabel(t_("Release fixed flags:")).RightPosZ(176, 100).TopPosZ(132, 19))
+	ITEM(EditString, release_flags, RightPosZ(4, 172).TopPosZ(132, 19))
+	UNTYPED(path, LeftPosZ(160, 184).VSizePosZ(156, 140))
+	UNTYPED(include, HSizePosZ(348, 192).VSizePosZ(156, 140))
+	UNTYPED(lib, RightPosZ(4, 184).VSizePosZ(156, 140))
+	ITEM(LabelBox, dv___28, SetLabel(t_("Remote host")).HSizePosZ(164, 4).BottomPosZ(40, 96))
+	ITEM(Label, dv___29, SetLabel(t_("&Remote host[:port]:")).LeftPosZ(174, 96).BottomPosZ(98, 19))
+	ITEM(EditField, remote_host, HSizePosZ(272, 328).BottomPosZ(99, 19))
+	ITEM(Label, dv___31, SetLabel(t_("&OS type:")).LeftPosZ(174, 80).BottomPosZ(74, 19))
+	ITEM(DropList, remote_os, HSizePosZ(272, 326).BottomPosZ(75, 19))
+	ITEM(Label, dv___33, SetLabel(t_("File &access:")).LeftPosZ(174, 78).BottomPosZ(51, 19))
+	ITEM(DropList, remote_file_access, HSizePosZ(272, 326).BottomPosZ(53, 19))
+	UNTYPED(remote_path_map, RightPosZ(12, 308).BottomPosZ(49, 71))
+	ITEM(Button, setdefault, SetLabel(t_("&Set as default")).LeftPosZ(4, 152).BottomPosZ(40, 22))
+	ITEM(Button, ok, SetLabel(t_("OK")).RightPosZ(76, 64).BottomPosZ(6, 22))
+	ITEM(Button, cancel, SetLabel(t_("Cancel")).RightPosZ(8, 64).BottomPosZ(6, 22))
+	ITEM(Option, use_target, SetLabel(t_("Store all target files\nin the same directory")).LeftPosZ(4, 148).BottomPosZ(74, 28))
+	ITEM(Label, dv___40, SetLabel(t_("Script file:")).LeftPosZ(4, 54).BottomPosZ(133, 19))
+	ITEM(EditField, scriptfile, LeftPosZ(4, 152).BottomPosZ(113, 19))
+	UNTYPED(linkmode_lock, LeftPosZ(4, 148).TopPosZ(384, 20))
+END_LAYOUT
+
+LAYOUT(ModePaneLayout, 288, 460)
+	ITEM(Option, target_override, SetLabel(t_("Target file override")).LeftPosZ(0, 112).TopPosZ(0, 19))
+	ITEM(WithDropChoice<EditString>, target, LeftPosZ(116, 172).TopPosZ(0, 19))
+	ITEM(Option, map, SetLabel(t_("Create a map")).LeftPosZ(192, 92).TopPosZ(48, 20))
+	ITEM(EditString, version, LeftPosZ(124, 60).TopPosZ(48, 19))
+	ITEM(LabelBox, dv___4, SetLabel(t_("Default")).LeftPosZ(0, 287).TopPosZ(72, 38))
+	ITEM(Label, dv___5, SetLabel(t_("Debug i&nfo level")).HSizePosZ(8, 196).TopPosZ(84, 19))
+	ITEM(DropList, debug, HSizePosZ(92, 120).TopPosZ(84, 19))
+	ITEM(Option, blitz, SetLabel(t_("BLITZ")).HSizePosZ(188, 46).TopPosZ(86, 15))
+	ITEM(ArrayCtrl, package, AutoHideSb(true).HSizePosZ(0, 0).VSizePosZ(120, 0))
+	ITEM(Switch, linkmode, SetLabel(t_("All static\nUse shared libs\nAll shared")).LeftPosZ(56, 228).TopPosZ(28, 16))
+	ITEM(Label, dv___10, SetLabel(t_("Shared packages postfix")).LeftPosZ(0, 124).TopPosZ(48, 19))
+	ITEM(Label, dv___11, SetLabel(t_("Link mode")).LeftPosZ(0, 52).TopPosZ(28, 16))
+END_LAYOUT
+
+LAYOUT(LicenseLayout, 700, 536)
+	ITEM(Label, dv___0, SetLabel(t_("Please read the following license agreement")).HSizePosZ(8, 176).TopPosZ(8, 19))
+	ITEM(RichTextView, license, HSizePosZ(8, 8).VSizePosZ(31, 68))
+	ITEM(Label, dv___2, SetLabel(t_("Do you accept all the terms of the preceding license agreement?")).HSizePosZ(8, 164).BottomPosZ(36, 28))
+	ITEM(Button, cancel, SetLabel(t_("No")).LeftPosZ(8, 64).BottomPosZ(8, 24))
+	ITEM(Button, ok, SetLabel(t_("Yes")).RightPosZ(8, 64).BottomPosZ(8, 24))
+END_LAYOUT
+
+LAYOUT(OutputModeLayout, 632, 552)
+	ITEM(Label, dv___0, SetLabel(t_("&Build method:")).LeftPosZ(10, 70).TopPosZ(4, 19))
+	ITEM(DropList, method, LeftPosZ(82, 184).TopPosZ(4, 19))
+	ITEM(Switch, mode, SetLabel(t_("Debug         \nOptimal\nOptimize speed\nOptimize size")).LeftPosZ(244, 356).TopPosZ(32, 18))
+	ITEM(LabelBox, dv___3, LeftPosZ(304, 4).TopPosZ(28, 484))
+	UNTYPED(debug, LeftPosZ(8, 288).VSizePosZ(56, 36))
+	UNTYPED(release, LeftPosZ(320, 288).VSizePosZ(56, 36))
+	ITEM(Button, ok, SetLabel(t_("OK")).RightPosZ(76, 64).BottomPosZ(6, 22))
+	ITEM(Button, cancel, SetLabel(t_("Cancel")).RightPosZ(8, 64).BottomPosZ(6, 22))
+	ITEM(LabelBox, dv___8, SetLabel(t_("Release")).LeftPosZ(320, 288).TopPosZ(16, 36))
+END_LAYOUT
+
+LAYOUT(InstallLayout, 312, 112)
+	ITEM(Label, dv___0, SetLabel(t_("MyApps directory")).LeftPosZ(8, 84).TopPosZ(4, 19))
+	ITEM(EditString, myapps, LeftPosZ(8, 296).TopPosZ(24, 19))
+	ITEM(Option, icon, SetLabel(t_("Create desktop icon")).LeftPosZ(8, 184).TopPosZ(48, 20))
+	ITEM(Button, ok, SetLabel(t_("OK")).LeftPosZ(168, 64).TopPosZ(76, 24))
+	ITEM(Button, cancel, SetLabel(t_("Cancel")).LeftPosZ(236, 64).TopPosZ(76, 24))
+END_LAYOUT
+
+LAYOUT(InfoLayout, 732, 556)
+	ITEM(RichTextView, info, HSizePosZ(8, 8).VSizePosZ(8, 40))
+	ITEM(Button, cancel, SetLabel(t_("Exit")).LeftPosZ(8, 64).BottomPosZ(8, 24))
+	ITEM(Button, ok, SetLabel(t_("Continue")).RightPosZ(8, 64).BottomPosZ(8, 24))
+END_LAYOUT
+
+LAYOUT(AutoSetupLayout, 612, 444)
+	ITEM(LabelBox, dv___0, SetLabel(t_("MinGW")).LeftPosZ(308, 292).TopPosZ(4, 88))
+	ITEM(Option, domingw, SetLabel(t_("Create MinGW build method")).LeftPosZ(316, 172).TopPosZ(22, 15))
+	ITEM(EditString, mingwmethod, LeftPosZ(520, 72).TopPosZ(20, 19))
+	ITEM(Label, dv___3, SetLabel(t_("MinGW compiler system directory")).LeftPosZ(316, 172).TopPosZ(44, 19))
+	ITEM(EditString, mingw, LeftPosZ(316, 276).TopPosZ(64, 19))
+	ITEM(Label, dv___5, SetLabel(t_("SDL directory")).LeftPosZ(308, 96).TopPosZ(100, 19))
+	ITEM(EditString, sdl, LeftPosZ(308, 292).TopPosZ(120, 19))
+	ITEM(Label, dv___7, SetLabel(t_("MySql directory")).LeftPosZ(308, 96).TopPosZ(144, 19))
+	ITEM(EditString, mysql, LeftPosZ(308, 292).TopPosZ(164, 19))
+	ITEM(LabelBox, dv___9, SetLabel(t_("Visual C++")).LeftPosZ(4, 292).TopPosZ(4, 432))
+	ITEM(Label, dv___10, SetLabel(t_("Win32 SDK for Visual C++ 7.1 directory")).LeftPosZ(12, 172).TopPosZ(88, 19))
+	ITEM(EditString, sdk71, LeftPosZ(12, 276).TopPosZ(108, 19))
+	ITEM(Label, dv___12, SetLabel(t_("Win32 SDK for Visual C++ 8.0 directory")).LeftPosZ(12, 216).TopPosZ(240, 19))
+	ITEM(EditString, sdk8, LeftPosZ(12, 276).TopPosZ(260, 19))
+	ITEM(Label, dv___14, SetLabel(t_("Win32 SDK for Visual C++ 9.0 directory")).LeftPosZ(12, 216).TopPosZ(388, 19))
+	ITEM(EditString, sdk9, LeftPosZ(12, 276).TopPosZ(408, 19))
+	ITEM(Option, dovisualcpp71, SetLabel(t_("Create Visual C++ 7.1 build method")).LeftPosZ(12, 200).TopPosZ(24, 15))
+	ITEM(EditString, visualcppmethod71, LeftPosZ(216, 72).TopPosZ(22, 19))
+	ITEM(Label, dv___18, SetLabel(t_("Visual C++ 7.1 directory")).LeftPosZ(12, 172).TopPosZ(44, 19))
+	ITEM(EditString, visualcpp71, LeftPosZ(12, 276).TopPosZ(64, 19))
+	ITEM(Option, dovisualcpp8, SetLabel(t_("Create Visual C++ 8.0 build method")).LeftPosZ(12, 200).TopPosZ(152, 15))
+	ITEM(EditString, visualcppmethod8, LeftPosZ(216, 72).TopPosZ(150, 19))
+	ITEM(Option, dovisualcpp8x64, SetLabel(t_("Create VC++ 8.0 x64 build method")).LeftPosZ(12, 200).TopPosZ(176, 15))
+	ITEM(EditString, visualcppmethod8x64, LeftPosZ(216, 72).TopPosZ(174, 19))
+	ITEM(Label, dv___24, SetLabel(t_("Visual C++ 8.0 directory")).LeftPosZ(12, 216).TopPosZ(196, 19))
+	ITEM(EditString, visualcpp8, LeftPosZ(12, 276).TopPosZ(216, 19))
+	ITEM(Option, dovisualcpp9, SetLabel(t_("Create Visual C++ 9.0 build method")).LeftPosZ(12, 200).TopPosZ(300, 15))
+	ITEM(EditString, visualcppmethod9, LeftPosZ(216, 72).TopPosZ(298, 19))
+	ITEM(Option, dovisualcpp9x64, SetLabel(t_("Create VC++ 9.0 x64 build method")).LeftPosZ(12, 200).TopPosZ(324, 15))
+	ITEM(EditString, visualcppmethod9x64, LeftPosZ(216, 72).TopPosZ(322, 19))
+	ITEM(Label, dv___30, SetLabel(t_("Visual C++ 9.0 directory")).LeftPosZ(12, 216).TopPosZ(344, 19))
+	ITEM(EditString, visualcpp9, LeftPosZ(12, 276).TopPosZ(364, 19))
+	ITEM(Button, ok, SetLabel(t_("OK")).LeftPosZ(472, 64).TopPosZ(412, 24))
+	ITEM(Button, cancel, SetLabel(t_("Cancel")).LeftPosZ(540, 64).TopPosZ(412, 24))
+	ITEM(LabelBox, dv___34, LeftPosZ(8, 284).TopPosZ(136, 8))
+	ITEM(LabelBox, dv___35, LeftPosZ(8, 284).TopPosZ(284, 8))
+END_LAYOUT
+
+LAYOUT(LangLayout, 716, 480)
+	ITEM(ArrayCtrl, file, LeftPosZ(8, 192).VSizePosZ(4, 40))
+	ITEM(ArrayCtrl, lang, LeftPosZ(204, 80).VSizePosZ(4, 40))
+	ITEM(ArrayCtrl, text, HSizePosZ(288, 172).VSizePosZ(4, 40))
+	ITEM(ArrayCtrl, source, RightPosZ(4, 164).VSizePosZ(4, 40))
+	ITEM(Option, remove, SetLabel(t_("Remove obsolete items")).LeftPosZ(8, 184).BottomPosZ(13, 15))
+	ITEM(Button, ok, SetLabel(t_("OK")).RightPosZ(76, 64).BottomPosZ(8, 24))
+	ITEM(Button, cancel, SetLabel(t_("Cancel")).RightPosZ(8, 64).BottomPosZ(8, 24))
+END_LAYOUT
+
+LAYOUT(ExportTrLayout, 328, 92)
+	ITEM(Label, dv___0, SetLabel(t_("Language")).LeftPosZ(4, 52).TopPosZ(8, 19))
+	ITEM(LNGCtrl, lang, LeftPosZ(56, 104).TopPosZ(8, 20))
+	ITEM(Label, dv___2, SetLabel(t_("&Encoding")).LeftPosZ(164, 49).TopPosZ(8, 20))
+	ITEM(DropList, charset, LeftPosZ(212, 108).TopPosZ(8, 19))
+	ITEM(Label, dv___4, SetLabel(t_("Directory")).LeftPosZ(4, 52).TopPosZ(32, 19))
+	ITEM(EditString, folder, LeftPosZ(56, 264).TopPosZ(32, 19))
+	ITEM(Button, ok, SetLabel(t_("OK")).LeftPosZ(188, 64).TopPosZ(60, 24))
+	ITEM(Button, cancel, SetLabel(t_("Cancel")).LeftPosZ(256, 64).TopPosZ(60, 24))
+END_LAYOUT
+
+LAYOUT(AddLangLayout, 148, 68)
+	ITEM(LNGCtrl, lang, LeftPosZ(8, 128).TopPosZ(8, 20))
+	ITEM(Button, ok, SetLabel(t_("OK")).LeftPosZ(8, 64).TopPosZ(36, 24))
+	ITEM(Button, cancel, SetLabel(t_("Cancel")).LeftPosZ(76, 64).TopPosZ(36, 24))
+END_LAYOUT
+
+LAYOUT(XInstallLayout, 336, 176)
+	ITEM(Option, uppsrc, SetLabel(t_("Create user copy of uppsrc package (Ultimate++)")).LeftPosZ(8, 320).TopPosZ(8, 17))
+	ITEM(Option, reference, SetLabel(t_("Create user copy of reference package (reference examples)")).LeftPosZ(8, 320).TopPosZ(28, 17))
+	ITEM(Option, tutorial, SetLabel(t_("Create user copy of tutorials package")).LeftPosZ(8, 320).TopPosZ(68, 17))
+	ITEM(Option, examples, SetLabel(t_("Create user copy of examples package")).LeftPosZ(8, 320).TopPosZ(48, 17))
+	ITEM(Button, ok, SetLabel(t_("OK")).LeftPosZ(196, 64).TopPosZ(144, 24))
+	ITEM(Button, cancel, SetLabel(t_("Cancel")).LeftPosZ(264, 64).TopPosZ(144, 24))
+	ITEM(EditField, path, LeftPosZ(84, 244).TopPosZ(116, 17))
+	ITEM(Label, out, SetLabel(t_("Output Folder:")).LeftPosZ(4, 76).TopPosZ(116, 17))
+	ITEM(Option, bazaar, SetLabel(t_("Create user copy of bazaar package")).LeftPosZ(8, 320).TopPosZ(88, 16))
+END_LAYOUT
+
+LAYOUT(StatLayout, 732, 552)
+	ITEM(RichTextView, stat, HSizePosZ(8, 8).VSizePosZ(8, 40))
+	ITEM(Button, ok, SetLabel(t_("OK")).RightPosZ(8, 64).BottomPosZ(8, 24))
+END_LAYOUT
+
+LAYOUT(SetupFontLayout, 532, 172)
+	ITEM(Label, dv___0, SetLabel(t_("Normal")).LeftPosZ(12, 48).TopPosZ(12, 19))
+	ITEM(DropList, face, LeftPosZ(60, 208).TopPosZ(12, 19))
+	ITEM(DropList, height, LeftPosZ(276, 50).TopPosZ(12, 19))
+	ITEM(Option, bold, SetLabel(t_("Bold")).LeftPosZ(330, 44).TopPosZ(12, 18))
+	ITEM(Option, italic, SetLabel(t_("Italic")).LeftPosZ(378, 44).TopPosZ(12, 18))
+	ITEM(Option, naa, SetLabel(t_("NonAntiAliased")).LeftPosZ(428, 100).TopPosZ(12, 18))
+	ITEM(Label, dv___6, SetLabel(t_("V. split")).LeftPosZ(12, 48).TopPosZ(36, 19))
+	ITEM(DropList, vface, LeftPosZ(60, 208).TopPosZ(36, 19))
+	ITEM(DropList, vheight, LeftPosZ(276, 50).TopPosZ(36, 19))
+	ITEM(Option, vbold, SetLabel(t_("Bold")).LeftPosZ(330, 44).TopPosZ(36, 18))
+	ITEM(Option, vitalic, SetLabel(t_("Italic")).LeftPosZ(378, 44).TopPosZ(36, 18))
+	ITEM(Option, vnaa, SetLabel(t_("NonAntiAliased")).LeftPosZ(428, 100).TopPosZ(36, 18))
+	ITEM(Label, dv___12, SetLabel(t_("Small")).LeftPosZ(12, 52).TopPosZ(60, 19))
+	ITEM(DropList, face1, LeftPosZ(60, 208).TopPosZ(60, 19))
+	ITEM(DropList, height1, LeftPosZ(276, 50).TopPosZ(60, 19))
+	ITEM(Option, bold1, SetLabel(t_("Bold")).LeftPosZ(330, 44).TopPosZ(60, 18))
+	ITEM(Option, italic1, SetLabel(t_("Italic")).LeftPosZ(378, 44).TopPosZ(60, 18))
+	ITEM(Option, naa1, SetLabel(t_("NonAntiAliased")).LeftPosZ(428, 100).TopPosZ(60, 18))
+	ITEM(Label, dv___18, SetLabel(t_("Special")).LeftPosZ(12, 48).TopPosZ(84, 19))
+	ITEM(DropList, face2, LeftPosZ(60, 208).TopPosZ(84, 19))
+	ITEM(DropList, height2, LeftPosZ(276, 50).TopPosZ(84, 19))
+	ITEM(Option, bold2, SetLabel(t_("Bold")).LeftPosZ(330, 44).TopPosZ(84, 18))
+	ITEM(Option, italic2, SetLabel(t_("Italic")).LeftPosZ(378, 44).TopPosZ(84, 18))
+	ITEM(Option, naa2, SetLabel(t_("NonAntiAliased")).LeftPosZ(428, 100).TopPosZ(84, 18))
+	ITEM(Label, dv___24, SetLabel(t_("Console")).LeftPosZ(12, 48).TopPosZ(108, 19))
+	ITEM(DropList, cface, LeftPosZ(60, 208).TopPosZ(108, 19))
+	ITEM(DropList, cheight, LeftPosZ(276, 50).TopPosZ(108, 19))
+	ITEM(Option, cbold, SetLabel(t_("Bold")).LeftPosZ(330, 44).TopPosZ(108, 18))
+	ITEM(Option, citalic, SetLabel(t_("Italic")).LeftPosZ(378, 44).TopPosZ(108, 18))
+	ITEM(Option, cnaa, SetLabel(t_("NonAntiAliased")).LeftPosZ(428, 100).TopPosZ(108, 18))
+	ITEM(Label, dv___30, SetLabel(t_(".t file")).LeftPosZ(12, 48).TopPosZ(132, 19))
+	ITEM(DropList, tface, LeftPosZ(60, 208).TopPosZ(132, 19))
+	ITEM(DropList, theight, LeftPosZ(276, 50).TopPosZ(132, 19))
+	ITEM(Option, tbold, SetLabel(t_("Bold")).LeftPosZ(330, 44).TopPosZ(132, 18))
+	ITEM(Option, titalic, SetLabel(t_("Italic")).LeftPosZ(378, 44).TopPosZ(132, 18))
+	ITEM(Option, tnaa, SetLabel(t_("NonAntiAliased")).LeftPosZ(428, 100).TopPosZ(132, 18))
+END_LAYOUT
+
+LAYOUT(SetupHlLayout, 544, 280)
+	ITEM(ArrayCtrl, hlstyle, LeftPosZ(8, 372).TopPosZ(8, 264))
+	ITEM(Label, dv___1, SetLabel(t_("Scope highlighting")).LeftPosZ(392, 98).TopPosZ(8, 16))
+	ITEM(Switch, hilite_scope, SetLabel(t_("None\n2 colors\n5 colors")).LeftPosZ(392, 64).TopPosZ(24, 50))
+	ITEM(Label, dv___3, SetLabel(t_("Matching bracket highlighting")).LeftPosZ(392, 148).TopPosZ(80, 16))
+	ITEM(Switch, hilite_bracket, SetLabel(t_("None\nNormal\nFlashing")).LeftPosZ(392, 64).TopPosZ(96, 50))
+	ITEM(Label, dv___5, SetLabel(t_("#else/#elif/#endif info")).LeftPosZ(392, 148).TopPosZ(152, 16))
+	ITEM(Switch, hilite_ifdef, SetLabel(t_("None\nNormal\nWith line number")).LeftPosZ(392, 148).TopPosZ(168, 50))
+	ITEM(Option, hilite_if_endif, SetLabel(t_("#if/#endif tracing")).LeftPosZ(392, 128).TopPosZ(228, 18))
+	ITEM(Button, hl_restore, SetLabel(t_("Restore default colors")).LeftPosZ(392, 144).TopPosZ(248, 24))
+END_LAYOUT
+
+LAYOUT(SetupEditorLayout, 488, 280)
+	ITEM(Label, dv___0, SetLabel(t_("Tab size")).LeftPosZ(12, 44).TopPosZ(12, 19))
+	ITEM(EditIntSpin, tabsize, LeftPosZ(112, 52).TopPosZ(12, 19))
+	ITEM(Label, dv___2, SetLabel(t_("Indent")).LeftPosZ(12, 36).TopPosZ(36, 19))
+	ITEM(EditIntSpin, indent_amount, LeftPosZ(112, 52).TopPosZ(36, 19))
+	ITEM(Label, dv___4, SetLabel(t_("Paint line at column")).LeftPosZ(12, 96).TopPosZ(60, 19))
+	ITEM(EditIntSpin, bordercolumn, Min(0).LeftPosZ(112, 48).TopPosZ(60, 19))
+	ITEM(ColorPusher, bordercolor, LeftPosZ(164, 52).TopPosZ(60, 20))
+	ITEM(Label, dv___7, SetLabel(t_("Default charset")).LeftPosZ(12, 76).TopPosZ(84, 20))
+	ITEM(DropList, charset, LeftPosZ(112, 104).TopPosZ(84, 19))
+	ITEM(Option, showtabs, SetLabel(t_("Show tabs")).LeftPosZ(12, 72).TopPosZ(116, 18))
+	ITEM(Option, indent_spaces, SetLabel(t_("Indent using spaces")).LeftPosZ(12, 118).TopPosZ(136, 18))
+	ITEM(Option, no_parenthesis_indent, SetLabel(t_("No indent after parenthesis")).LeftPosZ(12, 148).TopPosZ(156, 18))
+	ITEM(Option, numbers, SetLabel(t_("Show line numbers")).LeftPosZ(12, 112).TopPosZ(176, 18))
+	ITEM(Option, bookmark_pos, SetLabel(t_("Bookmarks restore position")).LeftPosZ(12, 152).TopPosZ(196, 18))
+	ITEM(Option, filetabs, SetLabel(t_("File tabs")).LeftPosZ(12, 64).TopPosZ(216, 18))
+	ITEM(Option, tabs_icons, SetLabel(t_("Icons")).LeftPosZ(80, 48).TopPosZ(216, 18))
+	ITEM(Option, tabs_crosses, SetLabel(t_("Crosses")).LeftPosZ(132, 60).TopPosZ(216, 18))
+	ITEM(Option, tabs_grouping, SetLabel(t_("Grouping")).LeftPosZ(196, 64).TopPosZ(216, 18))
+	ITEM(Switch, insert_include, SetLabel(t_("No #include in new sources\n#include first\n#include previous")).LeftPosZ(316, 156).TopPosZ(32, 56))
+	ITEM(Option, header_guards, SetLabel(t_("Insert guards to new headers")).LeftPosZ(316, 164).TopPosZ(12, 15))
+	ITEM(Option, auto_enclose, SetLabel(t_("[ { ( \" / * enclose selection")).LeftPosZ(12, 168).TopPosZ(236, 15))
+	ITEM(Option, mark_lines, SetLabel(t_("Mark lines with errors, warning and changes")).LeftPosZ(12, 256).TopPosZ(256, 15))
+END_LAYOUT
+
+LAYOUT(SetupIdeLayout, 520, 264)
+	ITEM(Option, mute_sounds, SetLabel(t_("Mute sounds")).LeftPosZ(8, 80).TopPosZ(8, 18))
+	ITEM(Option, wrap_console_text, SetLabel(t_("Wrap console text")).LeftPosZ(8, 110).TopPosZ(28, 18))
+	ITEM(Option, show_status_bar, SetLabel(t_("Show status bar")).LeftPosZ(8, 96).TopPosZ(128, 18))
+	ITEM(Option, toolbar_in_row, SetLabel(t_("Menu and toolbar in a row")).LeftPosZ(8, 144).TopPosZ(148, 18))
+	ITEM(Option, splash_screen, SetLabel(t_("Show splash screen")).LeftPosZ(8, 144).TopPosZ(168, 18))
+	ITEM(Option, assist, SetLabel(t_("Automatic assist")).LeftPosZ(8, 144).TopPosZ(68, 18))
+	ITEM(Option, commentdp, SetLabel(t_("Comment out default parameters when converting declaration to definition instead of removing them")).LeftPosZ(8, 512).TopPosZ(88, 18))
+	ITEM(Option, browser_clickpos, SetLabel(t_("Browse code on single click")).LeftPosZ(8, 152).TopPosZ(48, 18))
+	ITEM(Option, browser_closeesc, SetLabel(t_("Esc closes browser")).LeftPosZ(8, 112).TopPosZ(108, 18))
+	ITEM(Label, dv___9, SetLabel(t_("HYDRA1 threads:")).LeftPosZ(8, 92).TopPosZ(188, 19))
+	ITEM(EditIntSpin, hydra1_threads, Min(1).Max(10).LeftPosZ(112, 48).TopPosZ(188, 19))
+	ITEM(Label, dv___11, SetLabel(t_("GUI theme")).LeftPosZ(8, 92).TopPosZ(212, 19))
+	ITEM(DropList, chstyle, LeftPosZ(112, 228).TopPosZ(212, 19))
+	ITEM(Label, console_txt, SetLabel(t_("Use console in Linux")).LeftPosZ(8, 104).TopPosZ(240, 19))
+	ITEM(EditString, console, LeftPosZ(112, 148).TopPosZ(240, 19))
+	ITEM(Button, xterm, SetLabel(t_("xterm")).LeftPosZ(264, 52).TopPosZ(240, 20))
+	ITEM(Button, gnome, SetLabel(t_("Gnome")).LeftPosZ(320, 52).TopPosZ(240, 20))
+	ITEM(Button, kde, SetLabel(t_("KDE")).LeftPosZ(376, 52).TopPosZ(240, 20))
+END_LAYOUT
+
+LAYOUT(SetupAstyleLayout, 544, 280)
+	ITEM(LabelBox, dv___0, SetLabel(t_("Indents")).LeftPosZ(4, 180).TopPosZ(4, 140))
+	ITEM(Option, BracketIndent, SetLabel(t_("Brackets")).LeftPosZ(12, 64).TopPosZ(20, 16))
+	ITEM(Option, NamespaceIndent, SetLabel(t_("Namespaces")).HSizePosZ(84, 368).TopPosZ(20, 16))
+	ITEM(Option, BlockIndent, SetLabel(t_("Blocks")).LeftPosZ(12, 64).TopPosZ(40, 16))
+	ITEM(Option, CaseIndent, SetLabel(t_("Case")).LeftPosZ(84, 92).VSizePosZ(40, 224))
+	ITEM(Option, ClassIndent, SetLabel(t_("Class")).LeftPosZ(12, 64).TopPosZ(60, 16))
+	ITEM(Option, LabelIndent, SetLabel(t_("Labels")).LeftPosZ(84, 92).TopPosZ(60, 16))
+	ITEM(Option, SwitchIndent, SetLabel(t_("Switch")).LeftPosZ(12, 64).TopPosZ(80, 16))
+	ITEM(Option, PreprocessorIndent, SetLabel(t_("Preprocessor")).LeftPosZ(84, 92).TopPosZ(80, 16))
+	ITEM(Label, dv___9, SetLabel(t_("Multiline statement indent")).LeftPosZ(12, 132).TopPosZ(100, 16))
+	ITEM(Label, dv___10, SetLabel(t_("Min")).LeftPosZ(12, 20).TopPosZ(120, 19))
+	ITEM(EditInt, MinInStatementIndentLength, LeftPosZ(36, 32).TopPosZ(120, 19))
+	ITEM(Label, dv___12, SetLabel(t_("Max")).LeftPosZ(88, 20).TopPosZ(120, 19))
+	ITEM(EditInt, MaxInStatementIndentLength, LeftPosZ(112, 32).TopPosZ(120, 19))
+	ITEM(LabelBox, dv___14, SetLabel(t_("Breaks")).LeftPosZ(188, 152).TopPosZ(4, 140))
+	ITEM(Option, BreakClosingHeaderBracketsMode, SetLabel(t_("Closing header brackets")).LeftPosZ(196, 136).TopPosZ(20, 18))
+	ITEM(Option, BreakElseIfsMode, SetLabel(t_("Else if statements")).LeftPosZ(196, 136).TopPosZ(40, 18))
+	ITEM(Option, BreakOneLineBlocksMode, SetLabel(t_("Single line blocks")).LeftPosZ(196, 136).TopPosZ(60, 18))
+	ITEM(Option, SingleStatementsMode, SetLabel(t_("Multiple statements")).LeftPosZ(196, 136).TopPosZ(80, 18))
+	ITEM(Option, BreakBlocksMode, SetLabel(t_("Unrelated blocks")).LeftPosZ(196, 136).TopPosZ(100, 18))
+	ITEM(Option, BreakClosingHeaderBlocksMode, SetLabel(t_("Closing header blocks")).LeftPosZ(196, 136).TopPosZ(120, 18))
+	ITEM(Label, dv___21, SetLabel(t_("Bracket format")).LeftPosZ(12, 112).TopPosZ(148, 19))
+	ITEM(DropList, BracketFormatMode, LeftPosZ(128, 212).TopPosZ(148, 19))
+	ITEM(Label, dv___23, SetLabel(t_("Parenthesis padding")).LeftPosZ(12, 108).TopPosZ(172, 19))
+	ITEM(DropList, ParensPaddingMode, LeftPosZ(128, 212).TopPosZ(172, 19))
+	ITEM(Option, ParensUnPaddingMode, SetLabel(t_("Remove spaces around parenthesis")).LeftPosZ(12, 196).TopPosZ(196, 18))
+	ITEM(Option, OperatorPaddingMode, SetLabel(t_("Pad operators with spaces")).LeftPosZ(12, 144).TopPosZ(216, 18))
+	ITEM(Option, EmptyLineFill, SetLabel(t_("Fill empty lines")).LeftPosZ(12, 108).TopPosZ(236, 16))
+	ITEM(Option, TabSpaceConversionMode, SetLabel(t_("Convert tabs to spaces")).HSizePosZ(12, 400).TopPosZ(256, 18))
+	ITEM(Button, Test, SetLabel(t_("Test")).LeftPosZ(284, 56).TopPosZ(252, 23))
+	ITEM(LabelBox, dv___30, SetLabel(t_("Test box")).LeftPosZ(344, 196).TopPosZ(4, 272))
+	ITEM(LineEdit, TestBox, SetFont(ScreenFixedZ(11)).LeftPosZ(348, 188).TopPosZ(20, 252))
+	ITEM(Button, Defaults, SetLabel(t_("Upp defaults")).LeftPosZ(176, 72).TopPosZ(252, 23))
+END_LAYOUT
+
+LAYOUT(GotoLayout, 796, 524)
+	ITEM(Label, dv___0, SetLabel(t_("Go to")).LeftPosZ(188, 40).TopPosZ(12, 19))
+	ITEM(EditString, target, HSizePosZ(228, 296).TopPosZ(12, 19))
+	ITEM(ArrayCtrl, list, HSizePosZ(8, 8).VSizePosZ(40, 8))
+	ITEM(Button, ok, SetLabel(t_("OK")).RightPosZ(80, 64).TopPosZ(8, 24))
+	ITEM(Button, cancel, SetLabel(t_("Cancel")).RightPosZ(12, 64).TopPosZ(8, 24))
+END_LAYOUT
+
+LAYOUT(VirtualsLayout, 712, 496)
+	ITEM(ArrayCtrl, list, HSizePosZ(8, 8).VSizePosZ(8, 40))
+	ITEM(Button, ok, SetLabel(t_("OK")).RightPosZ(80, 64).BottomPosZ(8, 24))
+	ITEM(Button, cancel, SetLabel(t_("Cancel")).RightPosZ(12, 64).BottomPosZ(8, 24))
+	ITEM(Label, dv___3, SetLabel(t_("Find")).LeftPosZ(8, 28).BottomPosZ(9, 19))
+	ITEM(EditString, find, LeftPosZ(36, 124).BottomPosZ(9, 19))
+END_LAYOUT
+
+LAYOUT(UppOptDlg, 520, 68)
+	ITEM(Label, dv___0, SetLabel(t_("When")).LeftPosZ(4, 36).TopPosZ(8, 19))
+	ITEM(EditString, when, LeftPosZ(40, 128).TopPosZ(8, 19))
+	ITEM(Label, dv___2, SetLabel(t_(":")).LeftPosZ(172, 8).TopPosZ(8, 19))
+	ITEM(EditString, text, LeftPosZ(184, 328).TopPosZ(8, 19))
+	ITEM(Button, ok, SetLabel(t_("OK")).LeftPosZ(380, 64).TopPosZ(36, 24))
+	ITEM(Button, cancel, SetLabel(t_("Cancel")).LeftPosZ(448, 64).TopPosZ(36, 24))
+END_LAYOUT
+
+LAYOUT(UppOptPushDlg, 336, 68)
+	ITEM(Label, dv___0, SetLabel(t_("When")).LeftPosZ(4, 36).TopPosZ(8, 19))
+	ITEM(EditString, when, LeftPosZ(40, 128).TopPosZ(8, 19))
+	ITEM(Label, dv___2, SetLabel(t_(":")).LeftPosZ(172, 8).TopPosZ(8, 19))
+	ITEM(DataPusher, text, LeftPosZ(180, 148).TopPosZ(8, 24))
+	ITEM(Button, ok, SetLabel(t_("OK")).LeftPosZ(196, 64).TopPosZ(36, 24))
+	ITEM(Button, cancel, SetLabel(t_("Cancel")).LeftPosZ(264, 64).TopPosZ(36, 24))
+END_LAYOUT
+
+LAYOUT(ThisbacksLayout, 712, 496)
+	ITEM(ArrayCtrl, list, HSizePosZ(8, 8).VSizePosZ(8, 40))
+	ITEM(Button, ok, SetLabel(t_("OK")).RightPosZ(80, 64).BottomPosZ(8, 24))
+	ITEM(Button, cancel, SetLabel(t_("Cancel")).RightPosZ(12, 64).BottomPosZ(8, 24))
+END_LAYOUT
+
+LAYOUT(SimpleListLayout, 408, 212)
+	ITEM(ArrayCtrl, list, LeftPosZ(8, 392).TopPosZ(8, 164))
+	ITEM(Button, ok, SetLabel(t_("OK")).LeftPosZ(268, 64).TopPosZ(180, 24))
+	ITEM(Button, cancel, SetLabel(t_("Cancel")).LeftPosZ(336, 64).TopPosZ(180, 24))
+END_LAYOUT
+
+LAYOUT(DescriptionLayout, 400, 64)
+	ITEM(EditString, text, LeftPosZ(4, 392).TopPosZ(4, 19))
+	ITEM(Button, ok, SetLabel(t_("OK")).LeftPosZ(264, 64).TopPosZ(32, 24))
+	ITEM(Button, cancel, SetLabel(t_("Cancel")).LeftPosZ(332, 64).TopPosZ(32, 24))
+END_LAYOUT
+
+LAYOUT(TppLayout, 148, 284)
+	ITEM(ArrayCtrl, group, LeftPosZ(8, 132).TopPosZ(4, 212))
+	ITEM(Label, name_lbl, SetLabel(t_("Other:")).LeftPosZ(8, 36).TopPosZ(224, 19))
+	ITEM(EditString, name, LeftPosZ(44, 68).TopPosZ(224, 19))
+	ITEM(Label, name_tpp, SetLabel(t_(".tpp")).LeftPosZ(116, 25).TopPosZ(224, 19))
+	ITEM(Button, ok, SetLabel(t_("OK")).LeftPosZ(8, 64).TopPosZ(252, 24))
+	ITEM(Button, cancel, SetLabel(t_("Cancel")).LeftPosZ(76, 64).TopPosZ(252, 24))
+END_LAYOUT
+
diff --git a/uppsrc/ide/ide.png b/uppsrc/ide/ide.png
new file mode 100644
index 000000000..97e0b63d3
--- /dev/null
+++ b/uppsrc/ide/ide.png
@@ -0,0 +1,2 @@
+�PNG
+
diff --git a/uppsrc/ide/ide.rc b/uppsrc/ide/ide.rc
new file mode 100644
index 000000000..3436cfc2c
--- /dev/null
+++ b/uppsrc/ide/ide.rc
@@ -0,0 +1,2 @@
+5555 ICON DISCARDABLE "ide.ico"
+6666 ICON DISCARDABLE "xide.ico"
diff --git a/uppsrc/ide/ide.upp b/uppsrc/ide/ide.upp
new file mode 100644
index 000000000..d8c944124
--- /dev/null
+++ b/uppsrc/ide/ide.upp
@@ -0,0 +1,82 @@
+description "TheIDE main package";
+
+uses
+	ide\Common,
+	ide\LayDes,
+	ide\IconDes,
+	ide\Builders,
+	ide\Debuggers,
+	ide\Browser,
+	ide\QuickTabs,
+	CodeEditor,
+	CtrlLib,
+	Web,
+	plugin\bz2,
+	HexView,
+	art\BlueBar,
+	plugin/astyle;
+
+link(WIN32 MSC) /MAP;
+
+file
+	IDE readonly separator,
+	ide.h,
+	version.h,
+	UppDlg.h,
+	SelectPkg.cpp,
+	UppWspc.cpp,
+	UppDlg.cpp,
+	Template.cpp,
+	ide.key,
+	FindInFiles.cpp optimize_speed,
+	Console.cpp,
+	ide.cpp,
+	idefile.cpp charset "iso8859-1",
+	QuickTabs.cpp,
+	Bottom.cpp,
+	t.cpp,
+	Assist.cpp,
+	Index.cpp,
+	Virtuals.cpp,
+	Thisbacks.cpp,
+	Goto.cpp,
+	Setup.cpp,
+	Custom.cpp,
+	idetool.cpp,
+	Install.cpp,
+	idebar.cpp,
+	idewin.cpp,
+	Help.cpp,
+	Util.cpp,
+	Macro.cpp,
+	Calc.cpp,
+	FormatCode.cpp,
+	Compile readonly separator,
+	Methods.cpp,
+	AutoSetup.cpp,
+	OutputMode.cpp,
+	Host.cpp,
+	Build.cpp,
+	Debug.cpp,
+	Valgrind.cpp,
+	Resources readonly separator,
+	ide.iml,
+	ide.lay,
+	app.tpp,
+	ide.rc,
+	Makefile,
+	Info readonly separator,
+	COPYING,
+	COPYING-PLAIN,
+	AUTHORS;
+
+mainconfig
+	"" = "GUI",
+	"" = "GUI .USEMALLOC",
+	"" = ".NOGTK GUI",
+	"" = "GUI HEAPDBG CHECKINIT";
+
+custom() "",
+	"",
+	"$(OUTDIR)/$(FILE).obj";
+
diff --git a/uppsrc/ide/idebar.cpp b/uppsrc/ide/idebar.cpp
new file mode 100644
index 000000000..b5a9fcd16
--- /dev/null
+++ b/uppsrc/ide/idebar.cpp
@@ -0,0 +1,513 @@
+#include "ide.h"
+
+#define KEYGROUPNAME "Ide"
+#define KEYNAMESPACE IdeKeys
+#define KEYFILE      <ide/ide.key>
+#include             <CtrlLib/key_source.h>
+
+using namespace IdeKeys;
+
+void Ide::PackageMenu(Bar& menu) {
+	Project(menu);
+}
+
+void Ide::FileBookmark(Bar& menu) {
+	int i;
+	for(i = 0; i < 10; i++) {
+		const Bookmark& b = bookmark[i];
+		String txt = Format("Goto bookmark &%d", i);
+		if(!b.file.IsEmpty())
+			txt << " (" << bookmark[i].file << ')';
+		menu.Add(!b.file.IsEmpty(), txt, THISBACK1(BookKey, K_CTRL_0 + i))
+			.Key(K_CTRL_0 + i);
+	}
+	menu.MenuBreak();
+	for(i = 0; i < 10; i++)
+		menu.Add("Set", THISBACK1(BookKey, K_SHIFT_CTRL_0 + i))
+		    .Key(K_SHIFT_CTRL_0 + i);
+}
+
+void Ide::File(Bar& menu) {
+	menu.Add(AK_SETMAIN, THISBACK(NewMainPackage))
+		.Help("Select global configuration (var), select / add main project package");
+
+	menu.AddMenu(AK_EDITFILE, CtrlImg::open(), THISBACK(EditAnyFile))
+		.Help("Select any file in file selector and open it in editor");
+	menu.AddMenu(!IsNull(GetOpposite()), AK_OPPOSITE, IdeImg::opposite(), THISBACK(GoOpposite))
+		.Help("Switch between source and header file");
+	menu.AddMenu(AK_SAVEFILE, CtrlImg::save(), THISBACK(DoSaveFile))
+		.Help("Save current file");
+	if(!designer)
+		menu.AddMenu(CanToggleReadOnly(), AK_READONLY, IdeImg::read_only(), THISBACK(ToggleReadOnly))
+			.Check(editor.IsReadOnly())
+			.Help("Set / clear read-only flag for current file");
+
+//	menu.Add("Export project", THISBACK(ExportProject))
+//		.Help("Copy all project files into given directory");
+
+	if(menu.IsMenuBar())
+	{
+		menu.Separator();
+		menu.Add(AK_CLOSETAB, THISBACK(ClearTab))
+		    .Help("Close the current file tab");
+		menu.Add(AK_CLOSETABS, THISBACK(ClearTabs))
+		    .Help("Close all file tabs");
+		if(!designer) {
+			menu.Add("Go back", THISBACK(HistoryBk))
+			    .Key(K_ALT_LEFT);
+			menu.Add("Go forward", THISBACK(HistoryFw))
+			    .Key(K_ALT_RIGHT);
+			menu.Add("Bookmarks", THISBACK(FileBookmark))
+				.Help("Set one of available bookmarks (1..9, 0) on current file");
+			menu.MenuSeparator();
+		}
+		menu.Add("Show/hide bottom pane", THISBACK(SwapBottom))
+			.Check(IsBottomShown())
+			.Key(K_ESCAPE)
+			.Help("Show / hide bottom pane (with console, calc and browser tabs)");
+	}
+
+	menu.Add(AK_PACKAGESFILES, THISBACK(SwapPackagesFiles));
+
+	menu.MenuSeparator();
+
+	bool split = editorsplit.GetZoom() < 0;
+	menu.Add(AK_SPLIT, THISBACK1(KeySplit, false))
+	    .Check(split && editorsplit.IsVert());
+	menu.Add(AK_VSPLIT, THISBACK1(KeySplit, true))
+	    .Check(split && editorsplit.IsHorz());
+	menu.Add(split, AK_SWAP, THISBACK(SwapEditors));
+
+	menu.MenuSeparator();
+
+	menu.Add(AK_STATISTICS, THISBACK(Statistics))
+		.Help("Display various statistics");
+
+	menu.Add("Elapsed times..", THISBACK(Times));
+
+	menu.Add(AK_EXIT, THISBACK(Exit));
+}
+
+void Ide::EditSpecial(Bar& menu)
+{
+	menu.Add(AK_TRANSLATESTRING, THISBACK(TranslateString))
+		.Help("Mark the current selection as translated string");
+	menu.Add(AK_SWAPCHARS, THISBACK(SwapChars))
+	    .Help("Transpose characters");
+	menu.Add(AK_COPYWORD, THISBACK(CopyWord))
+	    .Help("Copy the current identifier to the clipboard");
+	menu.Add(AK_FORMATCODE, THISBACK(FormatCode))
+		.Help("Reformat code in editor");
+}
+
+void Ide::Edit(Bar& menu) {
+	if(designer) {
+		menu.Add(AK_EDITASTEXT, THISBACK(EditAsText))
+		    .Help("Edit as text file (do not use a designer)");
+		menu.MenuSeparator();
+		if(menu.IsMenuBar())
+			designer->EditMenu(menu);
+	}
+	else {
+		if(editastext.Find(editfile) >= 0) {
+			menu.Add(AK_DESIGNER, THISBACK(EditUsingDesigner))
+			    .Help("Edit using the designer (not as text)");
+			menu.MenuSeparator();
+		}
+		Bar::Item& (Bar::*add)(const char *s, const Image& m, Callback cb) = &Bar::Add;
+		if(toolbar_in_row) add = &MenuBar::AddMenu;
+		(menu.*add)("Undo", CtrlImg::undo(), callback(&editor, &LineEdit::Undo))
+			.Key(K_CTRL_Z)
+			.Help("Undo changes to text");
+		(menu.*add)("Redo", CtrlImg::redo(), callback(&editor, &LineEdit::Redo))
+			.Key(K_SHIFT|K_CTRL_Z)
+			.Help("Redo undone changes");
+		if(!toolbar_in_row || menu.IsMenuBar())
+			menu.Separator();
+		(menu.*add)("Cut", CtrlImg::cut(), callback(&editor, &LineEdit::Cut))
+			.Key(K_CTRL_X)
+			.Help("Cut selection and place it on the system clipboard");
+		(menu.*add)("Copy", CtrlImg::copy(), callback(&editor, &LineEdit::Copy))
+			.Key(K_CTRL_C)
+			.Help("Copy current selection on the system clipboard");
+		(menu.*add)("Paste", CtrlImg::paste(), THISBACK(EditPaste))
+			.Key(K_CTRL_V)
+			.Help("Insert text from clipboard at cursor location");
+
+		menu.MenuSeparator();
+
+		menu.Add(AK_SPACESTOTABS, THISBACK(EditMakeTabs))
+			.Help("Convert leading blanks on each line to tabs");
+		menu.Add(AK_TABSTOSPACES, THISBACK(EditMakeSpaces))
+			.Help("Convert all tabs to spaces");
+	}
+
+	if(editor.GetLineCount() && editor.GetUtf8Line(0) == "$uvs: PENDING CONFLICT") {
+		menu.MenuSeparator();
+		menu.Add("Resolve pending uvs conflict", THISBACK(ResolveUvsConflict))
+		.Help("Merge $uvs: pending conflicts generated by UVS series of versioning software");
+	}
+
+	menu.MenuSeparator();
+
+	menu.Add(AK_FINDINFILES, THISBACK(FindInFiles))
+		.Help("Find text / regular expression in subtree of given path");
+	menu.Add(AK_FINDFILE, THISBACK(FindFileName))
+		.Help("Locate file by filename (use *, ? when you're not sure)");
+
+	if(!designer) {
+		menu.MenuSeparator();
+
+		menu.Add(AK_FIND, THISBACK(EditFindReplace))
+			.Help("Show find / replace dialog");
+		menu.Add(AK_FINDSEL, THISBACK(EditFindReplacePickText))
+			.Help("Show find / replace dialog & set active text as the 'find' text");
+		menu.Add(AK_FINDNEXT, THISBACK(EditFindNext))
+			.Help("Find next occurrence");
+		menu.Add(AK_FINDPREV, THISBACK(EditFindPrevious))
+			.Help("Find previous occurrence");
+
+		menu.MenuSeparator();
+
+		menu.Add(AK_FINDSTRING, THISBACK1(FindString, false))
+			.Help("Find any ordinary string constant (\"\" - delimited)");
+		menu.Add(AK_FINDSTRINGBACK, THISBACK1(FindString, true))
+			.Help("Find any ordinary string constant (\"\" - delimited) backwards");
+		if(mark_lines && menu.IsMenuBar()) {
+			menu.Separator();
+			menu.Add(AK_CLEARMARKERSFILE, THISBACK(ClearEditedFile))
+				.Help("Remove change markers in current file");
+			menu.Add(AK_CLEARMARKERSALL, THISBACK(ClearEditedAll))
+				.Help("Remove change markers in all files");
+			menu.Separator();
+		}
+		if(menu.IsMenuBar())
+			menu.Add("Special", THISBACK(EditSpecial));
+	}
+}
+
+bool Ide::HasMacros()
+{
+	const Array<IdeMacro>& mlist = UscMacros();
+	if(!mlist.IsEmpty())
+		for(int i = 0; i < mlist.GetCount(); i++) {
+			const IdeMacro& m = mlist[i];
+			if(!IsNull(m.menu))
+				return true;
+		}
+	return false;
+}
+
+void Ide::MacroMenu(Bar& menu)
+{
+	const Array<IdeMacro>& mlist = UscMacros();
+	if(!mlist.IsEmpty() && menu.IsMenuBar()) {
+		VectorMap< String, Vector<int> > submenu_map;
+		for(int i = 0; i < mlist.GetCount(); i++) {
+			const IdeMacro& m = mlist[i];
+			if(!IsNull(m.menu))
+				if(IsNull(m.submenu))
+					submenu_map.GetAdd(Null).Add(i);
+				else
+					submenu_map.GetAdd(m.menu).Add(i);
+		}
+		if(!submenu_map.IsEmpty()) {
+			Vector<int> order = GetSortOrder(submenu_map.GetKeys());
+			for(int o = 0; o < order.GetCount(); o++) {
+				String m = submenu_map.GetKey(order[o]);
+				Vector<int>& mx = submenu_map[order[o]];
+				if(!IsNull(m))
+					menu.Add(m, THISBACK1(EditMacroMenu, mx));
+				else
+					EditMacroMenu(menu, mx);
+			}
+		}
+	}
+}
+
+void Ide::EditMacroMenu(Bar& menu, const Vector<int>& mx)
+{
+	const Array<IdeMacro>& mlist = UscMacros();
+	Vector<String> names;
+	Vector<int> index;
+	names.Reserve(mx.GetCount());
+	for(int i = 0; i < mx.GetCount(); i++)
+		if(mx[i] >= 0 && mx[i] < mlist.GetCount()) {
+			const IdeMacro& m = mlist[mx[i]];
+			names.Add(Nvl(m.submenu, m.menu));
+			index.Add(mx[i]);
+		}
+	IndexSort(names, index);
+	for(int i = 0; i < index.GetCount(); i++)
+		menu.Add(names[i], THISBACK1(EditMacro, index[i]))
+			.Key(mlist[index[i]].hotkey);
+}
+
+void Ide::EditMacro(int i)
+{
+	const Array<IdeMacro>& mlist = UscMacros();
+	if(i >= 0 && i < mlist.GetCount()) {
+		const IdeMacro& m = mlist[i];
+		try {
+			Vector<EscValue> arg;
+			::Execute(UscGlobal(), &macro_api, m.code, arg, 1000000);
+		}
+		catch(Exc e) {
+			PutConsole(e);
+		}
+	}
+}
+
+void Ide::Setup(Bar& menu) {
+	menu.Add("Be verbose", THISBACK(ToggleVerboseBuild))
+		.Check(console.verbosebuild)
+		.Help("Log detailed description of build and debug");
+	menu.Add("Environment..", THISBACK(SetupFormat))
+		.Help("Fonts, tabs, indentation, status bar");
+	menu.Add("Keyboard shortcuts..", callback(EditKeys))
+		.Help("Edit key bindings");
+	menu.Add("Build methods..", THISBACK(SetupBuildMethods))
+	    .Help("Setup build methods");
+#ifdef PLATFORM_WIN32
+	menu.Add("Automatic setup..", THISBACK(AutoSetup))
+	    .Help("Automatic setup of build methods..");
+#endif
+}
+
+void Ide::Project(Bar& menu) {
+	if(menu.IsToolBar() && !debugger)
+	{
+		mainconfiglist.Enable(idestate == EDITING);
+		buildmode.Enable(idestate == EDITING);
+		menu.Add(mainconfiglist, 120);
+		menu.Gap(4);
+		menu.Add(buildmode, 120);
+		menu.Separator();
+	}
+	WorkspaceWork::PackageMenu(menu);
+	menu.MenuSeparator();
+	menu.Add(AK_ORGANIZER, IdeImg::package_organizer(), THISBACK(EditWorkspace))
+		.Help("Package dependencies, compiler & linker options, output path override");
+	menu.Add(AK_CUSTOM, THISBACK(CustomSteps))
+		.Help("Building intermediate files using custom commands / applications");
+	if(menu.IsMenuBar())
+		menu.Add(AK_MAINCONFIG, IdeImg::main_package(), THISBACK(MainConfig))
+			.Help("Configuring compiler, operating system, output application parameters, custom flags");
+	menu.Separator();
+	menu.Add(AK_SYNCT, IdeImg::Language(), THISBACK1(SyncT, 0))
+	    .Help("Synchronize all language translation files of current workspace");
+	menu.AddMenu(AK_TRIMPORT, IdeImg::Language(), THISBACK1(SyncT, 1))
+	    .Help("Import runtime translation file");
+	menu.AddMenu(AK_TREXPORT, IdeImg::Language(), THISBACK1(SyncT, 2))
+	    .Help("Export runtime translation file");
+	if(OldLang())
+		menu.Add("Convert s_ -> t_", THISBACK(ConvertST));
+	FilePropertiesMenu(menu);
+}
+
+void Ide::FilePropertiesMenu(Bar& menu)
+{
+	menu.Separator();
+	menu.Add(IsActiveFile(), AK_FILEPROPERTIES, THISBACK(FileProperties))
+		.Help("File properties stored in package");
+	menu.Add(IsActiveFile(), AK_SAVEENCODING, THISBACK(ChangeCharset))
+	    .Help("Convert actual file to different encoding");
+}
+
+void Ide::BuildFileMenu(Bar& menu)
+{
+	bool b = idestate == EDITING && !IdeIsDebugLock();
+	menu.Add(b, "Compile " + GetFileName(editfile), IdeImg::Source(), THISBACK(FileCompile))
+		.Key(AK_COMPILEFILE)
+		.Help("Compile current file");
+	menu.Add(b, "Preprocess " + GetFileName(editfile), IdeImg::Header(), THISBACK(Preprocess))
+		.Key(AK_PREPROCESSFILE)
+		.Help("Preprocess current file into temporary file & open in editor");
+}
+
+void Ide::BuildPackageMenu(Bar& menu)
+{
+	int pi = package.GetCursor();
+	bool b = !IdeIsDebugLock() && idestate == EDITING && pi >= 0 && pi < IdeWorkspace().GetCount();
+	menu.Add(b, AK_BUILDPACKAGE, THISBACK(PackageBuild))
+		.Help("Build current package");
+	menu.Add(b, AK_CLEANPACKAGE, THISBACK(PackageClean))
+		.Help("Remove all intermediate files of the current package");
+}
+
+void Ide::BuildMenu(Bar& menu) {
+	bool b = !IdeIsDebugLock();
+	menu.Add(AK_OUTPUTMODE, THISBACK(SetupOutputMode))
+	    .Help("Setup how to build the target");
+	if(idestate == BUILDING)
+		menu.Add(b, "Stop build", IdeImg::build_stop(), THISBACK(StopBuild))
+			.Key(AK_BUILD)
+			.Help("Stop building");
+	else
+		menu.Add(b, "Build", IdeImg::build_make(), THISBACK(DoBuild))
+			.Key(AK_BUILD)
+			.Help("Perform minimal application rebuild");
+	b = b && idestate == EDITING;
+	menu.Add(b, AK_CLEAN, THISBACK(Clean))
+		.Help("Remove all intermediate files");
+	menu.Add(b, AK_REBUILDALL, IdeImg::build_rebuild_all(), THISBACK(RebuildAll))
+		.Help("Remove all intermediate files & build");
+	menu.Add(b, AK_CLEANUPPOUT, THISBACK(CleanUppOut))
+		.Help("Remove all files and subdirectories in the output & intermediate directory (see Base setup)");
+
+	menu.MenuSeparator();
+
+	menu.Add(b, AK_CREATEMAKEFILE, THISBACK(CreateMakefile))
+		.Help("Create makefile enabling IDE-independent project building");
+
+	menu.MenuSeparator();
+
+	if(menu.IsMenuBar()) {
+		BuildPackageMenu(menu);
+		menu.MenuSeparator();
+	}
+
+	BuildFileMenu(menu);
+
+	menu.MenuSeparator();
+
+	menu.Add("Stop on errors", THISBACK(ToggleStopOnErrors))
+		.Check(stoponerrors)
+		.Help("Stop build after package when the package has errors");
+
+	menu.MenuSeparator();
+
+	menu.Add(console.GetLineCount(), AK_FINDNEXTERROR, THISBACK(FindNextError))
+		.Help("Find next error line according to error output in the console window");
+	menu.Add(console.GetLineCount(), AK_FINDPREVERROR, THISBACK(FindPrevError))
+		.Help("Find previous error line according to error output in the console window");
+
+#ifdef PLATFORM_WIN32
+	menu.Separator();
+	menu.Add(!IsNull(target), "Open output directory", THISBACK(OpenOutputFolder));
+#endif
+}
+
+void Ide::DebugMenu(Bar& menu)
+{
+	bool b = idestate == EDITING && !IdeIsDebugLock();
+	if(debugger) {
+		debugger->DebugBar(menu);
+		menu.Separator();
+	}
+	else {
+		if(console.IsRunning())
+			menu.Add("Stop !", THISBACK(StopDebug))
+			    .Help("Stop controlled process");
+		menu.Add(AK_RUNOPTIONS, THISBACK(RunArgs))
+			.Help("Current directory, command line, stdout redirection");
+		menu.Add(b, AK_EXECUTE, IdeImg::debug_run(), THISBACK(BuildAndExecute))
+			.Help("Build and execute the application");
+		menu.Add(b, AK_DEBUG, THISBACK1(BuildAndDebug, false))
+			.Help("Build application & run debugger");
+		menu.Add(b, AK_DEBUGTO, THISBACK1(BuildAndDebug, true))
+			.Help("Build application & run to cursor in debugger");
+		menu.Add(b, AK_DEBUGEXT, THISBACK(BuildAndExtDebug))
+			.Help("Build application & run external debugger (see Base setup, default \"msdev.exe\")");
+		menu.Add(b, AK_DEBUGFILEEXT, THISBACK(BuildAndExtDebugFile))
+			.Help("Build application & run external debugger, trying to start with current file");
+	#ifdef PLATFORM_POSIX
+		if(IsValgrind())
+			menu.Add(b, AK_VALGRIND, THISBACK(Valgrind))
+				.Help("Build application & run in valgring");
+	#endif
+
+		menu.Separator();
+	}
+	menu.Add(!editfile.IsEmpty() /*&& !debuglock*/, AK_BREAKPOINT, THISBACK(DebugToggleBreak))
+		.Help("Set / clear breakpoint on current line");
+//	menu.Add(!editfile.IsEmpty(), AK_CONDBREAKPOINT, THISBACK(ConditionalBreak))
+//		.Help("Edit conditional breakpoint");
+	menu.Add(!editfile.IsEmpty() /*&& !debuglock*/, AK_CLEARBREAKPOINTS, THISBACK(DebugClearBreakpoints))
+		.Help("Clear all breakpoints");
+	menu.Separator();
+	menu.Add(target.GetCount() && FileExists(GetLogPath()), AK_OPENLOG, THISBACK(OpenLog));
+}
+
+void Ide::BrowseMenu(Bar& menu) {
+	menu.AddMenu(AK_TOGGLEBROWSER, IdeImg::browser(), THISBACK1(ToggleBottom, BBROWSER))
+	     .Check(IsBottomShown() && btabs.GetCursor() == BBROWSER);
+	menu.AddMenu(AK_TOGGLEINDEX, IdeImg::index(), THISBACK(ToggleIndex))
+	     .Check(editor.IsIndex());
+	menu.Add(AK_SEARCHINDEX, THISBACK(SearchIndex));
+	menu.Add(!designer, AK_GOTO, THISBACK(Goto));
+	menu.Add(AK_GOTOGLOBAL, THISBACK(GotoGlobal));
+	menu.Add(AK_QUERY, BrowserImg::Query(), THISBACK(Query));
+	menu.Add(AK_QUERYWORD, THISBACK(QueryWord));
+	menu.Add(btabs.GetCursor() == BBROWSER && browser.item.IsCursor(), AK_HELPITEM,
+	         callback(&browser, &Browser::ShowHelp));
+	menu.Add(AK_JUMPS, THISBACK(JumpS));
+	menu.Add(AK_SWAPS, THISBACK(SwapS));
+	menu.Add(!designer, AK_ASSIST, callback(&editor, &AssistEditor::Assist));
+	menu.Add(AK_DCOPY, callback(&editor, &AssistEditor::DCopy));
+	menu.Add(AK_VIRTUALS, callback(&editor, &AssistEditor::Virtuals));
+	menu.Add(AK_THISBACKS, callback(&editor, &AssistEditor::Thisbacks));
+	menu.Add(!designer, AK_COMPLETE, callback(&editor, &AssistEditor::Complete));
+//	menu.Add(AK_INSERTCOLOR, THISBACK(InsertColor));
+	menu.Separator();
+	menu.Add("Rescan code", THISBACK(RescanCode));
+	menu.Add("Edit ignore list", THISBACK(DppIgnoreList));
+	menu.MenuSeparator();
+	menu.AddMenu(AK_CALC, IdeImg::calc(), THISBACK1(ToggleBottom, BCALC))
+	     .Check(IsBottomShown() && btabs.GetCursor() == BCALC);
+	menu.MenuSeparator();
+	menu.Add(AK_BROWSETOPICS, IdeImg::help(), THISBACK(ShowTopics));
+	menu.Add(AK_SEARCHTOPICS, THISBACK(SearchTopics));
+	menu.Add("About..", THISBACK(About));
+}
+
+void Ide::MainMenu(Bar& menu) {
+	menu.Add("File", THISBACK(File))
+		.Help("Package & file functions, exports, bookmarks");
+	menu.Add("Edit", THISBACK(Edit))
+		.Help("Clipboard, find & replace, spaces / tabs conversion, scope highlighting");
+	if(HasMacros())
+		menu.Add("Macro", THISBACK(MacroMenu))
+			.Help("Editor & IDE macros");
+	menu.Add("Project", THISBACK(Project))
+		.Help("Package organizer, custom steps, configuration manager");
+	menu.Add("Build", THISBACK(BuildMenu))
+		.Help("Building & debugging, minor build options, showing errors");
+	menu.Add("Debug", THISBACK(DebugMenu))
+		.Help("Debugger commands (currently supports gdb-connection only)");
+	menu.Add("Assist", THISBACK(BrowseMenu))
+		.Help("Informations, code browsing and assistance");
+	menu.Add("Setup", THISBACK(Setup))
+		.Help("Paths, editor settings, connection to remote host");
+}
+
+void Ide::MainTool(Bar& bar)
+{
+	Edit(bar);
+	if(debugger)
+		DebugMenu(bar);
+	else
+	if(!designer)
+		bar.Separator();
+	Project(bar);
+	BuildMenu(bar);
+	BrowseMenu(bar);
+}
+
+void Ide::ConsoleMenu(Bar& menu)
+{
+	menu.Add("Clear", THISBACK(ConsoleClear))
+		.Help("Empty system console");
+	menu.Add("Copy", THISBACK(ConsoleCopy))
+		.Key(K_CTRL_C)
+		.Help("Copy selection on system clipboard");
+	menu.Add("Paste", THISBACK(ConsolePaste))
+		.Key(K_CTRL_V)
+		.Help("Append selection to system console");
+}
+
+void Ide::SetBar()
+{
+	menubar.Set(THISBACK(MainMenu));
+	toolbar.Set(THISBACK(MainTool));
+}
diff --git a/uppsrc/ide/idefile.cpp b/uppsrc/ide/idefile.cpp
new file mode 100644
index 000000000..7df6bd557
--- /dev/null
+++ b/uppsrc/ide/idefile.cpp
@@ -0,0 +1,719 @@
+#include "ide.h"
+
+void Ide::SetupEditor(int f, String hl, String fn)
+{
+	String ext = ToLower(GetFileExt(fn));
+	switch(f) {
+	case 1:  editor.SetFont(font1); break;
+	case 2:  editor.SetFont(font2); break;
+	case 3:  editor.SetFont(consolefont); break;
+	default: editor.SetFont(editorsplit.GetZoom() < 0 && editorsplit.IsHorz() ? veditorfont :
+	                        ext == ".t" ? tfont : editorfont); break;
+	}
+	if(IsNull(hl)) {
+		if(ext == ".c" || ext == ".cpp" || ext == ".cc" || ext == ".cxx" ||
+		   ext == ".h" || ext == ".hpp" || ext == ".hh" || ext == ".hxx" || ext == ".icpp")
+			editor.Highlight(CodeEditor::HIGHLIGHT_CPP);
+		else
+		if(ext == ".usc")
+			editor.Highlight(CodeEditor::HIGHLIGHT_USC);
+		else
+		if(ext == ".java")
+			editor.Highlight(CodeEditor::HIGHLIGHT_JAVA);
+		else
+		if(ext == ".t" || ext == ".jt")
+			editor.Highlight(CodeEditor::HIGHLIGHT_T);
+		else
+			editor.Highlight(CodeEditor::HIGHLIGHT_NONE);
+	}
+	else {
+		if(hl == "cpp")
+			editor.Highlight(CodeEditor::HIGHLIGHT_CPP);
+		else
+		if(hl == "esc")
+			editor.Highlight(CodeEditor::HIGHLIGHT_USC);
+		else
+		if(hl == "java")
+			editor.Highlight(CodeEditor::HIGHLIGHT_JAVA);
+		else
+			editor.Highlight(CodeEditor::HIGHLIGHT_NONE);
+	}
+}
+
+void Ide::SetupEditor()
+{
+	if(!IsActiveFile())
+		return;
+	Package::File& f = ActiveFile();
+	SetupEditor(f.font, f.highlight, GetFileExt(GetActiveFileName()));
+}
+
+void Ide::FileCursor()
+{
+	WorkspaceWork::FileCursor();
+	if(IsActiveFile() && !filelist[filelist.GetCursor()].isdir) {
+		const Package::File& f = ActiveFile();
+		editor.SetEditable(!f.readonly);
+		editor.TabSize(f.tabsize > 0 ? f.tabsize : editortabsize);
+		SetupEditor();
+		String headername;
+		if(insert_include)
+			for(int i = insert_include == 1 ? 0 : filelist.GetCursor();
+			    i >= 0 && i < filelist.GetCount();
+			    i += insert_include == 1 ? 1 : -1) {
+					String nm = FileName(i);
+					if(!IsSeparator(i) && GetFileExt(nm) == ".h") {
+						headername = nm;
+						break;
+					}
+			}
+		String p = GetActiveFileName();
+		if(p != HELPNAME)
+			p = SourcePath(GetActivePackage(), GetActiveFileName());
+		EditFile0(p, f.charset ? f.charset : actual.charset ? actual.charset : default_charset,
+		          false, headername);
+	}
+}
+
+bool Ide::HasFileData(const String& file)
+{
+	return filedata.Find(NormalizePath(file)) >= 0;
+}
+
+Ide::FileData& Ide::Filedata(const String& file) {
+	return filedata.GetAdd(NormalizePath(file));
+}
+
+void DlCharsetD(DropList& d)
+{
+	d.Add(0, "Default");
+	DlCharset(d);
+}
+
+void Ide::ChangeFileCharset(const String& name, Package& p, byte charset)
+{
+	if(IsNull(name))
+		return;
+	bool sv = false;
+	for(int i = 0; i < p.file.GetCount(); i++)
+		if(SourcePath(name, p.file[i]) == editfile && p.file[i].charset != charset) {
+			p.file[i].charset = charset;
+			sv = true;
+		}
+	if(sv) {
+		String pp = PackagePathA(name);
+		RealizePath(pp);
+		p.Save(pp);
+	}
+}
+
+void Ide::FileProperties()
+{
+	if(!IsActiveFile()) return;
+	WithFileFormatLayout<TopWindow> d;
+	CtrlLayoutOKCancel(d, "File properties");
+	Package::File& f = ActiveFile();
+	DlCharsetD(d.charset);
+	d.font.Add(0, "Normal");
+	d.font.Add(1, "Small");
+	d.font.Add(2, "Special");
+	d.font.Add(3, "Console");
+	d.highlight.Add(Null, "Default");
+	d.highlight.Add("cpp", "C++");
+	d.highlight.Add("java", "Java");
+	d.highlight.Add("esc", "Esc");
+	d.tabsize <<= f.tabsize > 0 ? f.tabsize : Null;
+	d.tabsize <<= d.Breaker(111);
+	d.tabsize.MinMax(1, 100);
+	d.charset <<= (int)f.charset;
+	d.font <<= f.font;
+	d.font <<= d.Breaker(111);
+	d.highlight <<= f.highlight;
+	d.highlight <<= d.Breaker(111);
+	for(;;) {
+		switch(d.Run()) {
+		case IDCANCEL:
+			FlushFile();
+			FileCursor();
+			return;
+		case IDOK:
+			int c = filelist.GetCursor();
+			FlushFile();
+			f.charset = (byte)(int)~d.charset;
+			f.tabsize = Nvl((int)~d.tabsize);
+			f.font = Nvl((int)~d.font);
+			f.highlight = ~d.highlight;
+			SavePackage();
+			PackageCursor();
+			filelist.SetCursor(c);
+			editor.ClearUndo();
+			return;
+		}
+		if(!IsNull(editfile)) {
+			int ts = Nvl((int)~d.tabsize);
+			editor.TabSize(ts ? ts : editortabsize);
+			SetupEditor(Nvl((int)~d.font), ~d.highlight, editfile);
+		}
+	}
+}
+
+void Ide::ChangeCharset()
+{
+	if(!IsActiveFile()) return;
+	Package::File& f = ActiveFile();
+	SaveFile();
+	WithCharsetLayout<TopWindow> dlg;
+	CtrlLayoutOKCancel(dlg, "Save file with enconding");
+	DlCharsetD(dlg.charset);
+	dlg.charset <<= editor.GetCharset();
+	dlg.ActiveFocus(dlg.charset);
+	byte cs;
+	for(;;) {
+		if(dlg.Run() != IDOK)
+			return;
+		cs = (byte)(int)~dlg.charset;
+		int q = editor.GetInvalidCharPos(cs);
+		if(q >= 0) {
+			if(PromptYesNo("File contains characters that cannot be saved using selected encoding.&"
+			               "Save anyway? (If you choose Yes, they will be replaced with question marks.)"))
+								break;
+			editor.SetCursor(q);
+			return;
+		}
+		else
+			break;
+	}
+	f.charset = cs;
+	SavePackage();
+	editor.SetCharset(f.charset);
+	SaveFile(true);
+	FlushFile();
+	FileCursor();
+	editor.ClearUndo();
+}
+
+void Ide::PosSync()
+{
+	if(designer || editfile.IsEmpty())
+		return;
+	for(int i = 0; i < 2; i++)
+		if(PathIsEqual(posfile[i], editfile))
+			editor.SetPtr(posline[i], posimg[i], i);
+		else
+			editor.SetPtr(-1, Image(), i);
+}
+
+bool Ide::IsProjectFile(const String& f) const
+{
+	const Workspace& wspc = IdeWorkspace();
+	for(int i = 0; i < wspc.GetCount(); i++) {
+		const Package& pk = wspc.GetPackage(i);
+		String n = wspc[i];
+		for(int i = 0; i < pk.file.GetCount(); i++) {
+			String fn = pk.file[i];
+			String path = SourcePath(n, fn);
+			if(f == path)
+				return true;
+		}
+	}
+	return false;
+}
+
+void Ide::ScanFile()
+{
+	if(!editor.assist_active)
+		return;
+	String s = ~editor;
+	StringStream ss(s);
+	BrowserBaseScan(ss, editfile);
+}
+
+void Ide::SaveFile(bool always)
+{
+	if(designer) {
+		String fn = designer->GetFileName();
+		designer->Save();
+		if(IsProjectFile(fn) && ToUpper(GetFileExt(fn)) == ".LAY")
+			BrowserBaseScanLay(fn);
+		return;
+	}
+
+	if(editfile.IsEmpty())
+		return;
+
+	FileData& fd = Filedata(editfile);
+	fd.lineinfo = editor.GetLineInfo();
+	fd.lineinforem = editor.GetLineInfoRem();
+	fd.editpos = editor.GetEditPos();
+	fd.columnline = editor.GetColumnLine(fd.editpos.cursor);
+	fd.filetime = edittime;
+	if(!editor.IsDirty() && !always)
+		return;
+
+	String tmpfile = editfile + ".$tmp", outfile = editfile;
+	{
+		FileOut out(tmpfile);
+		if(!out.IsOpen()) {
+			Exclamation(NFormat("Error creating temporary file [* \1%s\1].", tmpfile));
+			return;
+		}
+		if(designer)
+			designer->Save();
+		else
+			editor.Save(out, editor.GetCharset());
+		out.Close();
+		if(out.IsError()) {
+			Exclamation(NFormat("Error writing temporary file [* \1%s\1].", tmpfile));
+			return;
+		}
+	}
+
+	Progress progress;
+	int time = msecs();
+	for(;;) {
+		progress.SetTotal(10000);
+		progress.SetText(NFormat("Saving '%s'", GetFileName(outfile)));
+		if(editfile != outfile || !FileExists(tmpfile))
+			return;
+		FileDelete(outfile);
+		if(FileMove(tmpfile, outfile))
+			break;
+		console.Flush();
+		Sleep(200);
+		if(progress.SetPosCanceled(msecs(time) % progress.GetTotal()))
+		{
+			int art = Prompt(Ctrl::GetAppName(), CtrlImg::exclamation(),
+				"Unable to save current file.&"
+				"Retry save, ignore it or save file to another location?",
+				"Save as...", "Retry", "Ignore");
+			if(art < 0)
+				break;
+			if(art && AnySourceFs().ExecuteSaveAs()) {
+				outfile = editfile = AnySourceFs();
+				MakeTitle();
+				PosSync();
+				break;
+			}
+			progress.Reset();
+		}
+	}
+
+	if(!designer) {
+		FindFile ff(editfile);
+		fd.filetime = edittime = ff.GetLastWriteTime();
+	}
+
+	if(editor.IsDirty())
+		ScanFile();
+
+	editor.ClearDirty();
+
+	if(ToLower(GetFileExt(editfile)) == ".usc")
+		SyncUsc();
+
+	MakeTitle();
+}
+
+void Ide::FlushFile() {
+	editor.CloseAssist();
+	SaveFile();
+	editor.assist_active = false;
+	if(designer) {
+		designer->SaveEditPos();
+		designer->DesignerCtrl().SetFrame(NullFrame());
+		if(dynamic_cast<TopicEditor *>(&designer->DesignerCtrl()))
+			RefreshBrowser();
+	}
+	else
+	if(!editfile.IsEmpty())
+		Filedata(editfile).undodata = editor.PickUndoData();
+	editfile.Clear();
+	editor.Clear();
+	editor.Disable();
+	editorsplit.Ctrl::Remove();
+	editor.SetFrame(NullFrame());
+	designer.Clear();
+	SetBar();
+}
+
+int CharFilterMacro(int c)
+{
+	return iscid(c) ? c : '_';
+}
+
+void Ide::FileRename(const String& nm)
+{
+	tabs.RenameFile(editfile, nm);
+}
+
+void Ide::EditFile0(const String& path, byte charset, bool astext, const String& headername) {
+	editor.CheckEdited(false);
+	editor.CloseAssist();
+	if(path.IsEmpty()) return;
+	FlushFile();
+
+	editfile = path;
+	editor.SetCharset(charset);
+	AddLru();
+
+	if(!astext && !debugger && editastext.Find(path) < 0) {
+		for(int i = 0; i < GetIdeModuleCount() && !designer; i++)
+			designer = GetIdeModule(i).CreateDesigner(this, path, charset);
+		if(designer) {
+			editpane.Add(designer->DesignerCtrl().SizePos());
+			designer->SetFocus();
+			if(filetabs) {
+				designer->DesignerCtrl().SetFrame(tabs);
+				tabs.SetAddFile(editfile);
+			}
+			MakeTitle();
+			SetBar();
+			return;
+		}
+	}
+
+	if(filetabs)
+		editor.SetFrame(tabs);
+	else
+		editor.SetFrame(ViewFrame());
+	tabs.SetAddFile(editfile);
+	editor.Enable();
+	editpane.Add(editorsplit);
+	editor.HiliteScope(hilite_scope);
+	editor.OverWriteMode(false);
+	ActiveFocus(editor);
+	FileData& fd = Filedata(editfile);
+	FindFile ff(editfile);
+	if(ff) {
+		edittime = ff.GetLastWriteTime();
+		if(edittime != fd.filetime || IsNull(fd.filetime))
+			fd.undodata.Clear();
+		FileIn in(editfile);
+		if(in)
+			editor.Load(in, charset);
+		editor.SetEditPos(fd.editpos);
+		if(!IsNull(fd.columnline) && fd.columnline.y >= 0 && fd.columnline.y < editor.GetLineCount())
+			editor.SetCursor(editor.GetColumnLinePos(fd.columnline));
+		editor.SetPickUndoData(fd.undodata);
+		editor.SetLineInfo(fd.lineinfo);
+		editor.SetLineInfoRem(fd.lineinforem);
+		if(ff.IsReadOnly())
+			editor.SetReadOnly();
+	}
+	else {
+		RealizePath(editfile);
+		if(GetFileExt(editfile) == ".h") {
+			String n = '_' + Filter(String().Cat() << GetActivePackage() << '_' << GetFileTitle(editfile) << "_h_",
+			                        CharFilterMacro);
+			String s;
+			s << "#ifndef " << n << "\r\n";
+			s << "#define " << n << "\r\n";
+			s << "\r\n";
+			s << "#endif\r\n";
+			editor <<= s;
+			editor.SetCursor(editor.GetPos(2));
+		}
+		if(IsCSourceFile(editfile) && !IsNull(headername)) {
+			editor <<= "#include \"" + headername + "\"\r\n";
+			editor.SetCursor(editor.GetPos(1));
+		}
+		editor.SetCharset(charset);
+		MakeTitle();
+		SetBar();
+		editor.CheckEdited(true);
+		return;
+	}
+	fd.undodata.Clear();
+	MakeTitle();
+	editor.SetFocus();
+	PosSync();
+	SetBar();
+	editor.assist_active = IsProjectFile(editfile) && (IsCSourceFile(editfile) || IsCHeaderFile(editfile));
+	editor.CheckEdited(true);
+	editor.CreateIndex();
+}
+
+void Ide::EditAsText()
+{
+	String path = editfile;
+	editastext.FindPut(editfile);
+	byte cs = editor.GetCharset();
+	FlushFile();
+	EditFile0(path, cs);
+}
+
+void Ide::EditUsingDesigner()
+{
+	String path = editfile;
+	editastext.RemoveKey(editfile);
+	byte cs = editor.GetCharset();
+	FlushFile();
+	EditFile0(path, cs);
+}
+
+void Ide::EditFile(const String& p)
+{
+	if(p.IsEmpty()) {
+		FlushFile();
+		return;
+	}
+	if(p == HELPNAME) {
+		if(designer && designer->GetFileName() == p)
+			return;
+		package.SetCursor(package.GetCount() - 2);
+		for(int i = 0; i < actual.file.GetCount(); i++)
+			if(actual.file[i] == p) {
+				ShowFile(i);
+				filelist.SetCursor(i);
+				return;
+			}
+		actual.file.Insert(0, p);
+		SaveLoadPackage();
+		ShowFile(0);
+		filelist.SetCursor(0);
+		return;
+	}
+	String path = NormalizePath(p);
+	if(designer ? path == designer->GetFileName() : path == editfile)
+		return;
+
+	FlushFile();
+	if(path.IsEmpty())
+		return;
+
+	for(int i = 0; i < package.GetCount(); i++) {
+		String pkg = package[i].name;
+		Package p;
+		p.Load(PackagePathA(pkg));
+		for(int i = 0; i < p.file.GetCount(); i++)
+			if(PathIsEqual(SourcePath(pkg, p.file[i]), path)) {
+				package.FindSetCursor(pkg);
+				ShowFile(i);
+				filelist.FindSetCursor(p.file[i]);
+				return;
+			}
+	}
+	filelist.KillCursor();
+	package.KillCursor();
+	package.SetCursor(package.GetCount() - 1);
+	actual.file.Add(path);
+	SaveLoadPackage();
+	ShowFile(package.GetCount() - 1);
+	filelist.SetCursor(filelist.GetCount() - 1);
+}
+
+void Ide::CheckFileUpdate()
+{
+	if(editfile.IsEmpty() || !IsForeground() || designer) return;
+	FindFile ff(editfile);
+	if(!ff) return;
+	FileTime tm = ff.GetLastWriteTime();
+	if(tm == edittime) return;
+	edittime = tm;
+	if(editor.IsDirty() && !Prompt(Ctrl::GetAppName(), CtrlImg::exclamation(),
+		"Current file was changed outside the IDE, but was also edited inside it.&"
+		"Would you like to reload the file or to keep changes made in the IDE ?",
+		"Reload", "Keep")) return;
+	ReloadFile();
+}
+
+
+void Ide::ReloadFile()
+{
+	if(editfile.IsEmpty())
+		return;
+	String fn = editfile;
+	String data = ~editor;
+	int ln = editor.GetCursorLine();
+	editfile.Clear();
+	int sc = filelist.GetSbPos();
+	EditFile0(fn, editor.GetCharset());
+	filelist.SetSbPos(sc);
+	int l = LocateLine(data, ln, ~editor);
+	editor.SetCursor(editor.GetPos(l));
+}
+
+void Ide::EditAnyFile() {
+	FileSel& fs = AnySourceFs();
+	fs.Multi(false);
+	if(!fs.ExecuteOpen()) return;
+	EditFile(fs);
+	FileSelected();
+}
+
+void Ide::DragAndDrop(Point, PasteClip& d)
+{
+	if(AcceptFiles(d)) {
+		Vector<String> f = GetFiles(d);
+		for(int i = 0; i < f.GetCount(); i++)
+			if(FileExists(f[i])) {
+				EditFile(f[i]);
+				FileSelected();
+				editor.SetFocus();
+			}
+	}
+}
+
+void Ide::AddLru()
+{
+	if(editfile.IsEmpty() || tabi) return;
+	LruAdd(tablru, editfile, 200);
+}
+
+static String sExFiles(const char *fn, const char **ext, int cnt)
+{
+	for(int i = 0; i < cnt; i++) {
+		String f = ForceExt(fn, ext[i]);
+		if(FileExists(f))
+			return f;
+	}
+	return Null;
+}
+
+String Ide::GetOpposite()
+{
+	static const char *cpp[] = { ".c", ".cpp", ".cc", ".cxx" };
+	static const char *hdr[] = { ".h", ".hpp", ".hh", ".hxx" };
+	if(IsNull(editfile) || designer)
+		return Null;
+	String ext = GetFileExt(editfile);
+	for(int i = 0; i < __countof(cpp); i++)
+		if(ext == cpp[i])
+			return sExFiles(editfile, hdr, __countof(hdr));
+	for(int i = 0; i < __countof(hdr); i++)
+		if(ext == hdr[i])
+			return sExFiles(editfile, cpp, __countof(cpp));
+	return Null;
+}
+
+void Ide::GoOpposite()
+{
+	String fn = GetOpposite();
+	if(!IsNull(fn))
+		EditFile(fn);
+}
+
+void Ide::PassEditor()
+{
+	editorsplit.NoZoom();
+	SyncEditorSplit();
+	SetupEditor();
+	editfile2 = editfile;
+	editor2.SetFont(editor.GetFont());
+	editor2.Highlight(editor.GetHighlight());
+	editor2.LoadHlStyles(editor.StoreHlStyles());
+	byte charset = editor.GetCharset();
+	editor2.CheckEdited(false);
+	editor2.Set(editor.Get(charset), charset);
+	editor2.SetEditPosSb(editor.GetEditPos());
+	editor2.CheckEdited();
+	QuickTabs h;
+	h.Set(tabs);
+	tabs.Set(tabs2);
+	tabs2.Set(h);
+	editor.SetFocus();
+	editor.ScrollIntoCursor();
+}
+
+void Ide::ClearEditedFile()
+{
+	editor.ClearEdited();
+}
+
+void Ide::ClearEditedAll()
+{
+	ClearEditedFile();
+	for(int i = 0; i < filedata.GetCount(); i++) {
+		LineInfo li = editor.GetLineInfo();
+		LineInfoRem lir = editor.GetLineInfoRem();
+		FileData& fd = Filedata(filedata.GetKey(i));
+		editor.SetLineInfo(fd.lineinfo);
+		editor.SetLineInfoRem(fd.lineinforem);
+		ClearEditedFile();
+		fd.lineinfo = editor.GetLineInfo();
+		fd.lineinforem = editor.GetLineInfoRem();
+		editor.SetLineInfo(li);
+	}
+}
+
+void Ide::SplitEditor(bool horz)
+{
+	if(editorsplit.GetZoom() < 0)
+		CloseSplit();
+	else
+		tabs2.Set(tabs);
+	if(horz)
+		editorsplit.Horz(editor2, editor);
+	else
+		editorsplit.Vert(editor2, editor);
+	PassEditor();
+}
+
+void Ide::SwapEditors()
+{
+	String f = editfile2;
+	CodeEditor::EditPos p = editor2.GetEditPos();
+	if(editorsplit.GetFirstChild() == &editor)
+		if(editorsplit.IsVert())
+			editorsplit.Vert(editor2, editor);
+		else
+			editorsplit.Horz(editor2, editor);
+	else
+		if(editorsplit.IsVert())
+			editorsplit.Vert(editor, editor2);
+		else
+			editorsplit.Horz(editor, editor2);
+	PassEditor();
+	EditFile(f);
+	editor.SetEditPos(p);
+}
+
+void Ide::CloseSplit()
+{
+	editorsplit.Vert(editor, editor2);
+	editorsplit.Zoom(0);
+	SyncEditorSplit();
+	editor.SetFocus();
+	SetupEditor();
+}
+
+void Ide::KeySplit(bool horz)
+{
+	if(editorsplit.GetZoom() >= 0)
+		SplitEditor(horz);
+	else
+		CloseSplit();
+}
+
+void Ide::SyncEditorSplit()
+{
+	editor.topsbbutton.ScrollStyle().SetMonoImage(IdeImg::split()).Tip("Split (Ctrl+[-])");
+	editor.topsbbutton <<= THISBACK1(SplitEditor, false);
+	editor.topsbbutton1.ScrollStyle().SetMonoImage(IdeImg::vsplit()).Tip("Split (Ctrl+[\\])");
+	editor.topsbbutton1 <<= THISBACK1(SplitEditor, true);
+	editor2.topsbbutton.ScrollStyle().SetMonoImage(IdeImg::split()).Tip("Split (Ctrl+[-])");
+	editor2.topsbbutton <<= THISBACK1(SplitEditor, false);
+	editor2.topsbbutton1.ScrollStyle().SetMonoImage(IdeImg::vsplit()).Tip("Split (Ctrl+[\\])");
+	editor2.topsbbutton1 <<= THISBACK1(SplitEditor, true);
+	if(editorsplit.GetZoom() >= 0)
+		return;
+	if(editorsplit.IsVert()) {
+		editor.topsbbutton.ScrollStyle().SetMonoImage(IdeImg::closesplit()).Tip("Close (Ctrl+[-])");
+		editor.topsbbutton <<= THISBACK(CloseSplit);
+		editor2.topsbbutton.ScrollStyle().SetMonoImage(IdeImg::closesplit()).Tip("Close (Ctrl+[-])");
+		editor2.topsbbutton <<= THISBACK(CloseSplit);
+	}
+	else {
+		editor.topsbbutton1.ScrollStyle().SetMonoImage(IdeImg::closesplit()).Tip("Close (Ctrl+[\\])");
+		editor.topsbbutton1 <<= THISBACK(CloseSplit);
+		editor2.topsbbutton1.ScrollStyle().SetMonoImage(IdeImg::closesplit()).Tip("Close (Ctrl+[\\])");
+		editor2.topsbbutton1 <<= THISBACK(CloseSplit);
+	}
+}
+
+bool Ide::HotKey(dword key)
+{
+	if(designer && designer->DesignerCtrl().HotKey(key))
+		return true;
+	return TopWindow::HotKey(key);
+}
diff --git a/uppsrc/ide/idetool.cpp b/uppsrc/ide/idetool.cpp
new file mode 100644
index 000000000..3d72a7fb8
--- /dev/null
+++ b/uppsrc/ide/idetool.cpp
@@ -0,0 +1,253 @@
+#include "ide.h"
+
+void Ide::ResolveUvsConflict() {
+	String result;
+	editor.NextUndo();
+	bool copy = true;
+	for(int i = 0; i < editor.GetLineCount(); i++) {
+		String ln = editor.GetUtf8Line(i);
+		if(strncmp(ln, "$uvs: ", 6) == 0) {
+			ln = ln.Mid(6);
+			if(ln == "YOUR DELETE")
+				copy = false;
+			else
+			if(ln == "END YOUR DELETE")
+				copy = true;
+			else
+			if(ln == "REPOSITORY DELETE")
+				copy = false;
+			else
+			if(ln == "END REPOSITORY DELETE")
+				copy = true;
+			else
+			if(ln != "REPOSITORY INSERT" &&
+			   ln != "YOUR INSERT" &&
+			   ln != "END YOUR INSERT" &&
+			   ln != "END REPOSITORY INSERT" &&
+			   ln != "PENDING CONFLICT") {
+				Exclamation("Cannot resolve uvs conflict -&conflicting modifications found");
+				editor.SetCursor(editor.GetPos(i));
+				return;
+			}
+		}
+		else
+		if(copy)
+			result << ln << "\r\n";
+	}
+	editor.SelectAll();
+	editor.Paste(result.ToWString());
+}
+
+void Ide::GotoPos(String path, int line)
+{
+	AddHistory();
+	editastext.FindAdd(path);
+	EditFile(path);
+	editor.SetCursor(editor.GetPos(editor.GetLineNo(line - 1)));
+	editor.CenterCursor();
+	editor.SetFocus();
+	AddHistory();
+}
+
+void Ide::GotoCpp(const CppPos& pos)
+{
+	GotoPos(pos.GetFile(), pos.line);
+}
+
+void Ide::RescanCode()
+{
+/*
+	TimeStop tm;
+	for(int i = 0; i < 10; i++)
+		ReQualifyBrowserBase();
+	LOG(tm);
+	PutConsole(AsString(tm));
+//*/
+//*
+	SaveFile();
+	TimeStop t;
+	console.Clear();
+	RescanBrowserBase();
+	SyncRefs();
+	SetBottom(BBROWSER);
+//*/
+}
+
+void Ide::Query()
+{
+	if(browser.DoQuery())
+		SetBottom(BBROWSER);
+}
+
+void  Ide::QueryWord()
+{
+	browser.QueryWord(editor.GetWord());
+	SetBottom(BBROWSER);
+	SetBar();
+}
+
+void Ide::OpenATopic()
+{
+	String t = doc.GetCurrent();
+	if(!t.StartsWith("topic:"))
+		return;
+	TopicLink tl = ParseTopicLink(t);
+	if(tl) {
+		EditFile(AppendFileName(PackageDirectory(tl.package), tl.group + ".tpp"));
+		if(designer) {
+			TopicEditor *te = dynamic_cast<TopicEditor *>(&designer->DesignerCtrl());
+			if(te)
+				te->GoTo(tl.topic, doc.GetCurrentLabel());
+		}
+	}
+}
+
+void Ide::DppIgnoreList()
+{
+	EditFile(CommonPath("dppignore.txt"));
+}
+
+void Ide::InsertColor()
+{
+	TopWindow test;
+	ColorPopUp h;
+	test.Add(h.SizePos());
+	test.Run();
+}
+
+struct FileStat {
+	int  count;
+	int  len;
+	int  lines;
+	int  oldest;
+	int  newest;
+	int  days;
+
+	void Add(const FileStat& a) {
+		count += a.count;
+		len += a.len;
+		lines += a.lines;
+		oldest = max(a.oldest, oldest);
+		newest = min(a.newest, newest);
+		days += a.days;
+	}
+
+	FileStat() { count = 0; len = lines = 0; oldest = 0; newest = INT_MAX; days = 0; }
+};
+
+String StatLen(int len)
+{
+	return Format("%d.%d KB", len >> 10, (len & 1023) / 103);
+}
+
+String StatDate(int d)
+{
+	return String().Cat() << d << " days";
+}
+
+void Put(const String& name, String& qtf, const FileStat& fs)
+{
+	qtf << "::@W " << DeQtf(Nvl(name, ".<none>"))
+	    << ":: [> " << fs.count
+	    << ":: " << fs.lines
+	    << ":: " << (fs.count ? fs.lines / fs.count : 0)
+	    << ":: " << StatLen(fs.len)
+	    << ":: " << StatLen(fs.len ? fs.len / fs.count : 0)
+	    << ":: " << StatDate(fs.oldest)
+	    << ":: " << StatDate(fs.newest)
+	    << ":: " << (fs.count ? fs.days / fs.count : 0) << " days]";
+}
+
+void Put(String& qtf, ArrayMap<String, FileStat>& pfs, ArrayMap<String, FileStat>& all) {
+	FileStat pall;
+	for(int i = 0; i < pfs.GetCount(); i++) {
+		FileStat& fs = pfs[i];
+		Put(pfs.GetKey(i), qtf, fs);
+		pall.Add(fs);
+		all.GetAdd(pfs.GetKey(i)).Add(fs);
+	}
+	Put("All files", qtf, pall);
+	qtf << "}}&&";
+}
+
+
+void Ide::Statistics()
+{
+	Vector< ArrayMap<String, FileStat> > stat;
+	Progress pi;
+	const Workspace& wspc = IdeWorkspace();
+	pi.SetTotal(wspc.GetCount());
+	Date now = GetSysDate();
+	for(int i = 0; i < wspc.GetCount(); i++) {
+		const Package& pk = wspc.GetPackage(i);
+		String n = wspc[i];
+		pi.SetText(n);
+		if(pi.StepCanceled()) return;
+		ArrayMap<String, FileStat>& pfs = stat.Add();
+		for(int i = 0; i < pk.GetCount(); i++)
+			if(!pk[i].separator) {
+				String file = SourcePath(n, pk[i]);
+				if(FileExists(file)) {
+					FileStat& fs = pfs.GetAdd(GetFileExt(file));
+					int d = minmax(now - FileGetTime(file), 0, 9999);
+					fs.oldest = max(d, fs.oldest);
+					fs.newest = min(d, fs.newest);
+					String data = LoadFile(file);
+					for(const char *s = data; *s; s++)
+						if(*s == '\n')
+							fs.lines++;
+					fs.len += data.GetCount();
+					fs.days += d;
+					fs.count++;
+				}
+			}
+	}
+	String qtf = "[1 ";
+	ArrayMap<String, FileStat> all;
+	String tab = "{{45:20:25:20:35:30:30:30:30@L [* ";
+	String hdr = "]:: [= Files:: Lines:: - avg.:: Length:: - avg.:: Oldest:: Newest:: Avg. age]";
+	for(int i = 0; i < wspc.GetCount(); i++) {
+		qtf << tab << DeQtf(wspc[i]) << hdr;
+		Put(qtf, stat[i], all);
+	}
+
+	qtf << tab << "All packages" << hdr;
+	Put(qtf, all, all);
+
+	WithStatLayout<TopWindow> dlg;
+	CtrlLayoutOK(dlg, "Statistics");
+	dlg.stat = qtf;
+	dlg.Sizeable().Zoomable();
+	dlg.Run();
+}
+
+String FormatElapsedTime(double run)
+{
+	String rtime;
+	double hrs = floor(run / 3600);
+	if(hrs > 0)
+		rtime << NFormat("%0n hours, ", hrs);
+	int minsec = fround(run - 3600 * hrs);
+	int min = minsec / 60, sec = minsec % 60;
+	if(min || hrs)
+		rtime << NFormat("%d min, ", min);
+	rtime << NFormat("%d sec", sec);
+	return rtime;
+}
+
+void Ide::Times()
+{
+	WithStatisticsLayout<TopWindow> statdlg;
+	CtrlLayout(statdlg, "Elapsed times");
+	statdlg.SetTimeCallback(-1000, statdlg.Breaker(IDRETRY), 50);
+	do
+	{
+		int session_time = int(GetSysTime() - start_time);
+		int idle_time = int(session_time - editor.GetStatEditTime() - stat_build_time);
+		statdlg.session_time <<= FormatElapsedTime(session_time);
+		statdlg.edit_time    <<= FormatElapsedTime(editor.GetStatEditTime());
+		statdlg.build_time   <<= FormatElapsedTime(stat_build_time);
+		statdlg.idle_time    <<= FormatElapsedTime(idle_time);
+	}
+	while(statdlg.Run() == IDRETRY);
+}
diff --git a/uppsrc/ide/idewin.cpp b/uppsrc/ide/idewin.cpp
new file mode 100644
index 000000000..89c7928cb
--- /dev/null
+++ b/uppsrc/ide/idewin.cpp
@@ -0,0 +1,955 @@
+#include "ide.h"
+
+#define IMAGECLASS IdeImg
+#define IMAGEFILE  <ide/ide.iml>
+#include <Draw/iml_source.h>
+
+#include <art/BlueBar/BlueBar.h>
+
+void ChStdSkinBlue()
+{
+	ChStdSkin();
+	InstallBlueBar();
+}
+
+void ChHostSkinBlue()
+{
+	ChHostSkin();
+	InstallBlueBar();
+}
+
+void ChClassicSkinBlue()
+{
+	ChClassicSkin();
+	InstallBlueBar();
+}
+
+void Ide::SyncCh()
+{
+	switch(chstyle) {
+	case 0:
+		SetSkin(ChHostSkin);
+		break;
+	case 1:
+		SetSkin(ChStdSkin);
+		break;
+	case 2:
+		SetSkin(ChClassicSkin);
+		break;
+	case 3:
+		SetSkin(ChHostSkinBlue);
+		break;
+	case 4:
+		SetSkin(ChStdSkinBlue);
+		break;
+	}
+}
+
+void Ide::ToggleVerboseBuild() {
+	console.verbosebuild = !console.verbosebuild;
+}
+
+void Ide::ToggleStopOnErrors() {
+	stoponerrors = !stoponerrors;
+}
+
+void Ide::SwapPackagesFiles()
+{
+	wesplit.Zoom(wesplit.GetZoom() == 1 ? -1 : 1);
+}
+
+void Ide::ConsoleClear()
+{
+	console <<= Null;
+}
+
+void Ide::ConsoleCopy()
+{
+	console.Copy();
+}
+
+void Ide::ConsolePaste()
+{
+	String s = ReadClipboardText();
+	if(!IsNull(s)) {
+		s.Insert(0, '\n');
+		int len = console.GetLength();
+		console.Insert(len, s.ToWString());
+		console.SetCursor(len + 1);
+	}
+}
+
+void Ide::Serialize(Stream& s) {
+	int version = 9;
+	s.Magic(0x12346);
+	s / version;
+	s % main;
+	SerializePlacement(s);
+	s % AnySourceFs();
+	s % BasedSourceFs();
+	s % AnyPackageFs();
+	s % pfsplit;
+	s % wesplit;
+	s % browser;
+	s % package;
+	s % filelist;
+	s % editorfont;
+	if(version >= 6)
+		s % tfont;
+	s % veditorfont;
+	s % consolefont;
+	s % font1;
+	s % font2;
+	s % show_status_bar;
+	s % toolbar_in_row;
+	s % filetabs;
+	s % auto_enclose;
+	s % show_tabs;
+	s % tabs_icons;
+	s % tabs_crosses;
+	s % no_parenthesis_indent;
+	s % hilite_scope;
+	s % hilite_if_endif;
+	s % hilite_bracket;
+	s % hilite_ifdef;
+	s % wrap_console_text;
+	s % mute_sounds;
+	s % line_numbers;
+	s % browser.clickpos;
+	s % browser_closeesc;
+	s % bookmark_pos;
+	s % use_target;
+	s % default_charset;
+	s % header_guards;
+	s % insert_include;
+	String varsname = GetVarsName();
+	s % varsname;
+	s % pocfg;
+	if(s.IsLoading())
+		LoadVars(varsname);
+	SerializeGlobalConfigs(s);
+	doc.Serialize(s);
+	s % right_split;
+	s % splash_screen;
+	s % editor.auto_assist;
+	if(version >= 1)
+		s % editor.commentdp;
+	if(version >= 2) {
+		s % bordercolumn;
+		s % bordercolor;
+	}
+	if(version >= 3) {
+		s % hydra1_threads;
+		if(s.IsLoading())
+			console.SetSlots(hydra1_threads);
+	}
+	if(version >= 4) {
+		s % doc;
+	}
+	if(version >= 5) {
+		s % chstyle;
+	}
+	if(version >= 7)
+	{
+		s % astyle_BracketIndent;
+		s % astyle_NamespaceIndent;
+		s % astyle_BlockIndent;
+		s % astyle_CaseIndent;
+		s % astyle_ClassIndent;
+		s % astyle_LabelIndent;
+		s % astyle_SwitchIndent;
+		s % astyle_PreprocessorIndent;
+		s % astyle_MinInStatementIndentLength;
+		s % astyle_MaxInStatementIndentLength;
+		s % astyle_BreakClosingHeaderBracketsMode;
+		s % astyle_BreakElseIfsMode;
+		s % astyle_BreakOneLineBlocksMode;
+		s % astyle_SingleStatementsMode;
+		s % astyle_BreakBlocksMode;
+		s % astyle_BreakClosingHeaderBlocksMode;
+		s % astyle_BracketFormatMode;
+		s % astyle_ParensPaddingMode;
+		s % astyle_ParensUnPaddingMode;
+		s % astyle_OperatorPaddingMode;
+		s % astyle_EmptyLineFill;
+		s % astyle_TabSpaceConversionMode;
+		s % astyle_TestBox;
+	}
+	if(version >= 8)
+		s % LinuxHostConsole;
+	if(version >= 9)
+		editor.SerializeIndex(s);
+	s.Magic();
+}
+
+void Ide::PutConsole(const char *s)
+{
+	ShowConsole();
+	console << s << "\n";
+}
+
+void Ide::PutVerbose(const char *s)
+{
+	if(console.verbosebuild) {
+		PutConsole(s);
+		console.Sync();
+	}
+}
+
+bool Ide::IdeIsBuilding() const
+{
+	return idestate == Ide::BUILDING;
+}
+
+String Ide::IdeGetOneFile() const
+{
+	return onefile;
+}
+
+int Ide::IdeConsoleExecute(const char *cmdline, Stream *out, const char *envptr, bool quiet)
+{
+	return console.Execute(cmdline, out, envptr, quiet);
+}
+
+int Ide::IdeConsoleExecuteWithInput(const char *cmdline, Stream *out, const char *envptr, bool quiet)
+{
+	ShowConsole();
+	console.Input(true);
+	int r = console.Execute(cmdline, out, envptr, quiet);
+	console.Input(false);
+	return r;
+}
+
+int Ide::IdeConsoleExecute(One<SlaveProcess> process, const char *cmdline, Stream *out, bool quiet)
+{
+	return console.Execute(process, cmdline, out, quiet);
+}
+
+int Ide::IdeConsoleAllocSlot()
+{
+	return console.AllocSlot();
+}
+
+bool Ide::IdeConsoleRun(const char *cmdline, Stream *out, const char *envptr, bool quiet, int slot, String key, int blitz_count)
+{
+	return console.Run(cmdline, out, envptr, quiet, slot, key, blitz_count);
+}
+
+bool Ide::IdeConsoleRun(One<SlaveProcess> process, const char *cmdline, Stream *out, bool quiet, int slot, String key, int blitz_count)
+{
+	return console.Run(process, cmdline, out, quiet, slot, key, blitz_count);
+}
+
+void Ide::IdeConsoleFlush()
+{
+	console.Flush();
+}
+
+void Ide::IdeConsoleBeginGroup(String group)
+{
+	console.BeginGroup(group);
+}
+
+void Ide::IdeConsoleEndGroup()
+{
+	console.EndGroup();
+}
+
+bool Ide::IdeConsoleWait()
+{
+	return console.Wait();
+}
+
+void Ide::IdeSetRight(Ctrl& ctrl)
+{
+	right.Add(ctrl.SizePos());
+	right_split.Zoom(-1);
+}
+
+void Ide::IdeRemoveRight(Ctrl& ctrl)
+{
+	ctrl.Remove();
+	if(!right.GetFirstChild())
+		right_split.Zoom(0);
+}
+
+bool Ide::IdeIsDebug() const
+{
+	return debugger;
+}
+
+void Ide::IdeEndDebug()
+{
+	console.Kill();
+	debugger.Clear();
+	debuglock = 0;
+	MakeTitle();
+	editor.EnableBreakpointing();
+	SetBar();
+	editor.HidePtr();
+	for(int i = 0; i < 2; i++)
+		posfile[i].Clear();
+	PosSync();
+	const Workspace& wspc = IdeWorkspace();
+	for(int i = 0; i < wspc.GetCount(); i++) {
+		const Package& pk = wspc.GetPackage(i);
+		String n = wspc[i];
+		for(int i = 0; i < pk.file.GetCount(); i++) {
+			String file = SourcePath(n, pk.file[i]);
+			ValidateBreakpoints(Filedata(file).lineinfo);
+		}
+	}
+	editor.ValidateBreakpoints();
+}
+
+void Ide::IdeSetDebugPos(const String& file, int line, const Image& img, int i)
+{
+	posfile[i] = file;
+	posline[i] = line;
+	posimg[i] = img;
+	EditFile(file);
+	editor.GotoLine(line);
+	PosSync();
+	Size sz = editor.GetPageSize();
+	Point p = editor.GetScrollPos();
+	int l = editor.GetCursorLine();
+	if(sz.cy > 8 && l - p.y > sz.cy - 4)
+		editor.SetScrollPos(Point(p.x, max(0, l - 4)));
+	SetForeground();
+	editor.SetFocus();
+}
+
+void Ide::IdeHidePtr()
+{
+	editor.HidePtr();
+}
+
+bool Ide::IdeDebugLock()
+{
+	if(debuglock == 0) {
+		editor.DisableBreakpointing();
+		MakeTitle();
+		SetBar();
+		Sync();
+		debuglock = 1;
+		return true;
+	}
+	debuglock++;
+	return false;
+}
+
+bool Ide::IdeDebugUnLock()
+{
+	debuglock--;
+	ASSERT(debuglock >= 0);
+	if(debuglock == 0) {
+		MakeTitle();
+		editor.EnableBreakpointing();
+		SetBar();
+		return true;
+	}
+	return false;
+}
+
+bool Ide::IdeIsDebugLock() const
+{
+	return debuglock;
+}
+
+String Ide::IdeGetFileName() const
+{
+	return !designer ? editfile : Null;
+}
+
+int Ide::IdeGetFileLine()
+{
+	return !designer ? editor.GetNoLine(editor.GetCursorLine()) : 0;
+}
+
+String Ide::IdeGetLine(int i) const
+{
+	if(i >= 0 && i < editor.GetLineCount())
+		return editor.GetUtf8Line(i);
+	else
+		return Null;
+}
+
+void Ide::IdeSetBar()
+{
+	SetBar();
+}
+
+void Ide::SetupBars()
+{
+	ClearFrames();
+	int r = HorzLayoutZoom(100);
+	int l = HorzLayoutZoom(320);
+	menubar.Transparent();
+	if(toolbar_in_row) {
+		toolbar.SetFrame(NullFrame());
+		bararea.Add(menubar.LeftPos(0, l).VCenterPos(menubar.GetStdHeight()));
+		bararea.Add(toolbar.HSizePos(l, r).VCenterPos(toolbar.GetStdHeight()));
+		bararea.Add(display.RightPos(4, r).VSizePos(2, 3));
+		bararea.Height(max(menubar.GetStdHeight(), toolbar.GetStdHeight()));
+		AddFrame(bararea);
+		toolbar.Transparent();
+	}
+	else {
+		bararea.Add(menubar.LeftPos(0, l).VCenterPos(menubar.GetStdHeight()));
+		bararea.Add(display.RightPos(4, r).VSizePos(2, 3));
+		bararea.Height(menubar.GetStdHeight());
+		AddFrame(bararea);
+		AddFrame(TopSeparatorFrame());
+		AddFrame(toolbar);
+		toolbar.NoTransparent();
+	}
+	AddFrame(statusbar);
+	SetBar();
+}
+
+Ide::Ide()
+{
+	start_time = GetSysTime();
+	stat_build_time = 0;
+	build_start_time = Null;
+	hydra1_threads = CPU_Cores();
+
+	chstyle = 0;
+
+	Sizeable().Zoomable();
+
+	display.SetFrame(ThinInsetFrame());
+	display.SetAlign(ALIGN_CENTER);
+
+	filelist.Columns(2);
+	package.Columns(2);
+
+	filetabs = true;
+	auto_enclose = false;
+	mark_lines = true;
+
+	idestate = EDITING;
+	debuglock = 0;
+
+	menubar.WhenHelp = statusbar;
+	menubar.AreaLook(1);
+	toolbar.WhenHelp = statusbar;
+	toolbar.AreaLook(1);
+	toolbar_in_row = false;
+	SetupBars();
+	SetBar();
+	WhenClose = THISBACK(Exit);
+
+	editorsplit.Vert(editor, editor2);
+	editorsplit.Zoom(0);
+	SyncEditorSplit();
+
+	right_split.Horz(editpane, right);
+	right_split.SetPos(7000);
+	right_split.Zoom(0);
+
+	editor_bottom.Vert(right_split, bottom);
+	console.WhenBar = THISBACK(ConsoleMenu);
+	editor_bottom.SetPos(8000);
+	bottom.SetFrame(btabs);
+	bottom.Add(console.SizePos().SetFrame(NullFrame()));
+	bottom.Add(browser.SizePos());
+	bottom.Add(calc.SizePos().SetFrame(NullFrame()));
+	btabs <<= THISBACK(SyncBottom);
+	BTabs();
+	browser.WhenPos = THISBACK(GotoPos);
+
+	pfsplit.SetPos(2000);
+	pfsplit.Vert(package, filelist);
+	wesplit.Horz(pfsplit, editor_bottom);
+	wesplit.SetPos(2000);
+	Add(wesplit);
+
+	editor.topsbbutton.ScrollStyle().NoWantFocus().Show();
+	editor.topsbbutton1.ScrollStyle().NoWantFocus().Show();
+	tabs <<= THISBACK(TabFile);
+	tabs.WhenCloseRest = THISBACK1(CloseRest, &tabs);
+	editor2.SetFrame(tabs2);
+	tabs2 <<= THISBACK(TabFile2);
+	tabs2.WhenCloseRest = THISBACK1(CloseRest, &tabs2);
+	editor2.topsbbutton.ScrollStyle().NoWantFocus().Show();
+	editor2.topsbbutton1.ScrollStyle().NoWantFocus().Show();
+	editor2.WhenLeftDown = THISBACK(SwapEditors);
+	editor.WhenAction = THISBACK(AddHistory);
+
+	macro_api = MacroEditor();
+
+	mainconfiglist.WhenClick = THISBACK(MainConfig);
+	mainconfiglist <<= THISBACK(OnMainConfigList);
+	mainconfiglist.NoDropFocus();
+
+	buildmode.WhenClick = THISBACK(SetupOutputMode);
+	buildmode.NoWantFocus();
+	buildmode.Tip("Output mode");
+	buildmode.AddButton().Tip("Build method").Left() <<= THISBACK(DropMethodList);
+	buildmode.AddButton().Tip("Build mode") <<= THISBACK(DropModeList);
+	methodlist.Normal();
+	methodlist.WhenSelect = THISBACK(SelectMethod);
+	modelist.Normal();
+	modelist.WhenSelect = THISBACK(SelectMode);
+	modelist.Add("Debug");
+	modelist.Add("Optimal");
+	modelist.Add("Speed");
+	modelist.Add("Size");
+
+	tabi = 0;
+	blocktabs = false;
+
+	package.WhenBar = THISBACK(PackageMenu);
+	editor.WhenState = THISBACK(MakeTitle);
+
+	package.NoWantFocus();
+	filelist.NoWantFocus();
+	filelist.WhenLeftDouble = THISBACK(Group);
+
+	Icon(IdeImg::Package(), IdeImg::Package());
+
+	tfont = editorfont = font2 = Courier(13);
+	veditorfont = consolefont = font1 = Courier(11);
+	editortabsize = 4;
+	indent_amount = 4;
+	indent_spaces = false;
+	show_status_bar = false;
+	show_tabs = false;
+	tabs_icons = false;
+	tabs_crosses = true;
+	tabs_grouping = true;
+	no_parenthesis_indent = false;
+
+	/*
+		astyle code formatter control vars
+		added 2008.01.27 by Massimo Del Fedele
+	*/
+	astyle_BracketIndent = false;
+	astyle_NamespaceIndent = true;
+	astyle_BlockIndent = false;
+	astyle_CaseIndent = true;
+	astyle_ClassIndent = true;
+	astyle_LabelIndent = true;
+	astyle_SwitchIndent = true;
+	astyle_PreprocessorIndent = false;
+	astyle_MinInStatementIndentLength = 2;
+	astyle_MaxInStatementIndentLength = 20;
+	astyle_BreakClosingHeaderBracketsMode = true;
+	astyle_BreakElseIfsMode = true;
+	astyle_BreakOneLineBlocksMode = true;
+	astyle_SingleStatementsMode = true;
+	astyle_BreakBlocksMode = true;
+	astyle_BreakClosingHeaderBlocksMode = true;
+	astyle_BracketFormatMode = astyle::BREAK_MODE;
+	astyle_ParensPaddingMode = astyle::PAD_BOTH;
+	astyle_ParensUnPaddingMode = true;
+	astyle_OperatorPaddingMode = true;
+	astyle_EmptyLineFill = false;
+	astyle_TabSpaceConversionMode = false;
+	astyle_TestBox = "#include <stdio.h>\n#ifndef __abcd_h\n#include <abcd.h>\n#endif\n\nvoid test(int a, int b)\n{\n  /* this is a switch */\n  switch(a)\n\n  {\n    case 1:\n      b = 2;\n      break;\n    case 2:\n      b = 4;\n      break;\n    default:\n    break;\n  }\n\n  /* this are more statements on one line */\n  a = 2*a;b=-5;a=2*(b+2)*(a+3)/4;\n\n  /* single line blocks */\n  {int z;z = 2*a+b;}\n\n  /* loop */\n  for(int i = 0;i< 10;i++) { a = b+2*i;}\n\n}\n";
+
+	console.WhenSelect = THISBACK(FindError);
+	console.SetSlots(hydra1_threads);
+
+	editor.WhenSelection = THISBACK(Display);
+	stoponerrors = true;
+	hilite_scope = 1;
+	hilite_bracket = 1;
+	hilite_ifdef = 1;
+	hilite_if_endif = false;
+	wrap_console_text = true;
+	mute_sounds = false;
+	line_numbers = false;
+
+	use_target = true;
+
+	runmode = RUN_WINDOW;
+	runexternal = false;
+
+	browser_closeesc = true;
+
+	bookmark_pos = true;
+
+	header_guards = true;
+	insert_include = 1;
+
+	SetTimeCallback(-20, THISBACK(Periodic), TIMEID_PERIODIC);
+
+	editor.WhenBreakpoint = THISBACK(OnBreakpoint);
+
+	ConstructFindInFiles();
+
+	ff.style <<= STYLE_NO_REPLACE;
+
+	default_charset = CHARSET_WIN1252;
+
+	HideBottom();
+	TheIde(this);
+
+	targetmode = 0;
+
+	browser.WhenShowTopic = THISBACK(ShowTopic);
+	doc.WhenTopic = THISBACK(OpenATopic);
+
+	editor.NoCutLine();
+
+	bordercolumn = 96;
+	bordercolor = SColorFace();
+
+	state_icon = -1;
+
+	editor.theide = this;
+
+	histi = 0;
+
+	doc_serial = -1;
+}
+
+Ide::~Ide()
+{
+	TheIde(NULL);
+}
+
+void DelTemps() {
+	FindFile ff(ConfigFile("*.tmp"));
+	while(ff) {
+		DeleteFile(ConfigFile(ff.GetName()));
+		ff.Next();
+	}
+}
+
+#ifdef PLATFORM_WIN32
+#include <mmsystem.h>
+#pragma comment( lib, "winmm.lib" )
+#endif
+
+void Ide::Paint(Draw&) {}
+
+extern int MemoryProbeFlags;
+
+void Uninstall();
+
+bool SilentMode;
+
+#ifdef PLATFORM_WIN32
+#include <Wincon.h>
+
+void Puts(const char *s)
+{
+	dword dummy;
+	if(!SilentMode)
+		WriteFile(GetStdHandle(STD_OUTPUT_HANDLE), s, (int)strlen(s), &dummy, NULL);
+}
+#endif
+
+
+#ifdef PLATFORM_POSIX
+void Puts(const char *s)
+{
+	if(!SilentMode)
+		puts(s);
+}
+#endif
+
+bool splash_screen;
+
+int CommaSpace(int c)
+{
+	return c == ',' ? ' ' : c;
+}
+
+#ifdef flagMAIN
+GUI_APP_MAIN
+#else
+void AppMain___()
+#endif
+{
+#ifdef PLATFORM_WIN32
+	InstallCrashDump();
+#endif
+
+	SetLanguage(LNG_ENGLISH);
+	SetDefaultCharset(CHARSET_UTF8);
+
+	const Vector<String>& arg = CommandLine();
+
+	bool firstinstall = false;
+
+#ifdef PLATFORM_POSIX
+	String home = Environment().Get("UPP_HOME", Null);
+	if(!IsNull(home))
+		SetHomeDirectory(home);
+	if(LoadFile(ConfigFile("version")) != IDE_VERSION && !FileExists(ConfigFile("noinstall"))) {
+		if(!Install())
+			return;
+		SaveFile(ConfigFile("version"), IDE_VERSION);
+		firstinstall = true;
+	}
+#endif
+
+#ifdef _DEBUG
+//	Ctrl::ShowRepaint(50);
+#endif
+
+#ifdef PLATFORM_WIN32
+	if(!CheckLicense())
+		return;
+	firstinstall = !IsNull(LoadFile(GetExeDirFile("install.upp")));
+	if(firstinstall)
+		if(!Install())
+			return;
+#endif
+
+	for(int i = 0; i < arg.GetCount(); i++) {
+		if(arg[i] == "-uninstall") {
+			Uninstall();
+			return;
+		}
+		if(!firstinstall && arg[i] == "-install" && !Install()) return;
+
+	#ifdef PLATFORM_WIN32
+		if(arg[i] == "!") {
+			String cmdline;
+			for(++i; i < arg.GetCount(); i++) {
+				if(!IsNull(cmdline))
+					cmdline << ' ';
+				cmdline << arg[i];
+			}
+			int n = cmdline.GetLength() + 1;
+			Buffer<char> cmd(n);
+			memcpy(cmd, cmdline, n);
+			SECURITY_ATTRIBUTES sa;
+			sa.nLength = sizeof(SECURITY_ATTRIBUTES);
+			sa.lpSecurityDescriptor = NULL;
+			sa.bInheritHandle = TRUE;
+			PROCESS_INFORMATION pi;
+			STARTUPINFO si;
+			ZeroMemory(&si, sizeof(STARTUPINFO));
+			si.cb = sizeof(STARTUPINFO);
+			AllocConsole();
+			SetConsoleTitle(cmdline);
+			int time = msecs();
+			if(CreateProcess(NULL, cmd, &sa, &sa, TRUE,
+				             NORMAL_PRIORITY_CLASS,
+			                 NULL, NULL, &si, &pi)) {
+				WaitForSingleObject(pi.hProcess, INFINITE);
+				dword exitcode = 255;
+				GetExitCodeProcess(pi.hProcess, &exitcode);
+				CloseHandle(pi.hProcess);
+				CloseHandle(pi.hThread);
+				Puts("<--- Finished in " + GetPrintTime(time) + ", exitcode: " + AsString(exitcode) + " --->");
+			}
+			else
+				Puts("Unable to launch " + cmdline);
+			char h[1];
+			dword dummy;
+			ReadFile(GetStdHandle(STD_INPUT_HANDLE), h, 1, &dummy, NULL);
+			return;
+		}
+	#endif
+	}
+
+#ifndef _DEBUG
+	SetVppLogSizeLimit(0);
+#endif
+
+	try {
+		void RegisterLayDes(); RegisterLayDes();
+		void RegisterIconDes(); RegisterIconDes();
+	//	void RegisterIdeVectorDes(); RegisterIdeVectorDes();
+		void RegisterGccBuilder(); RegisterGccBuilder();
+		void RegisterMscBuilder(); RegisterMscBuilder();
+		void RegisterJavaBuilder(); RegisterJavaBuilder();
+		void RegisterScriptBuilder(); RegisterScriptBuilder();
+
+		splash_screen = true;
+
+		Ide ide;
+		ide.Maximize();
+		bool clset = false;
+		if(arg.GetCount() >= 2 && IsAlpha(arg[0][0]) && IsAlpha(arg[1][0])) {
+			bool build = arg.GetCount() >= 3 && IsAlpha(arg[2][0]);
+		#ifdef PLATFORM_WIN32
+			if(build) {
+				HMODULE hDLL = LoadLibrary ("kernel32");
+				bool attach = false;
+				if(hDLL) {
+					typedef BOOL (WINAPI *AttachConsoleType)(DWORD dwProcessId);
+					AttachConsoleType AttachConsole;
+					AttachConsole = (AttachConsoleType) GetProcAddress(hDLL, "AttachConsole");
+					if(AttachConsole)
+						attach = AttachConsole((DWORD)-1);
+				}
+				if(!attach)
+					AllocConsole();
+			}
+		#endif
+			for(int i = 3; i < arg.GetCount(); i++)
+				if(arg[i][0] == '-') {
+					String x = arg[i];
+					for(int i = 1; i < x.GetCount(); i++)
+						if(x[i] == 'l')
+							SilentMode = true;
+				}
+			if(!LoadVars(arg[0])) {
+				if(build)
+					Puts("TheIDE: Invalid assembly\n");
+				else
+					Exclamation("Invalid assembly!");
+				SetExitCode(2);
+				return;
+			}
+			if(!FileExists(SourcePath(arg[1], GetFileTitle(arg[1]) + ".upp"))) {
+				if(build)
+					Puts("TheIDE: Package does not exist\n");
+				else
+					Exclamation("Package does not exist!");
+				SetExitCode(2);
+				return;
+			}
+			ide.SetMain(arg[1]);
+			clset = true;
+			bool stoponerror = false;
+			if(build) {
+				const Workspace& wspc = ide.IdeWorkspace();
+				if(!wspc.GetCount())
+					return;
+				const Array<Package::Config>& f = wspc.GetPackage(0).config;
+				if(f.GetCount())
+					ide.mainconfigparam = f[0].param;
+				String m = arg[2];
+				if(!FileExists(ConfigFile((String)m + ".bm"))) {
+					SilentMode = false;
+					Puts("TheIDE: Invalid build method\n");
+					SetExitCode(3);
+					return;
+				}
+				ide.method <<= m;
+				ide.debug.def.blitz = ide.release.def.blitz = 0;
+				ide.debug.def.debug = 2;
+				ide.release.def.debug = 0;
+				ide.debug.package.Clear();
+				ide.release.package.Clear();
+				ide.debug.linkmode = ide.release.linkmode = 0;
+				ide.release.createmap = ide.debug.createmap = false;
+				ide.targetmode = 0;
+				ide.console.console = true;
+				bool clean = false;
+				bool makefile = false;
+				String mkf;
+				for(int i = 3; i < arg.GetCount(); i++)
+					if(arg[i][0] == '>')
+						ide.mainconfigparam = Filter(~arg[i] + 1, CommaSpace);
+					else
+					if(arg[i][0] == '-') {
+						String x = arg[i];
+						for(int i = 1; i < x.GetCount(); i++)
+							switch(x[i]) {
+							case 'a':
+								clean = true;
+								break;
+							case 'r':
+								ide.targetmode = 1;
+								break;
+							case '1':
+								ide.targetmode = 2;
+								break;
+							case '2':
+								ide.targetmode = 3;
+								break;
+							case 'm':
+								ide.release.createmap = ide.debug.createmap = true;
+								break;
+							case 'b':
+								ide.release.def.blitz = ide.debug.def.blitz = 1;
+								break;
+							case 's':
+								ide.debug.linkmode = ide.release.linkmode = 1;
+								break;
+							case 'S':
+								ide.debug.linkmode = ide.release.linkmode = 2;
+								break;
+							case 'e':
+								stoponerror = true;
+								break;
+							case 'M':
+								makefile = true;
+								break;
+							case 'v':
+								ide.console.verbosebuild = true;
+								break;
+							case 'l':
+								break;
+							default:
+								SilentMode = false;
+								Puts("Invalid build option(s)");
+								SetExitCode(3);
+								return;
+							}
+					}
+					else {
+						ide.debug.target_override = ide.release.target_override = true;
+						ide.debug.target = ide.release.target = mkf = arg[i];
+					}
+				if(clean)
+					ide.Clean();
+				if(makefile) {
+					ide.SaveMakeFile(IsNull(mkf) ? "Makefile" : mkf);
+					SetExitCode(0);
+				}
+				else
+				if(ide.Build())
+					SetExitCode(0);
+				else {
+					if(stoponerror)
+						PromptOK("TheIDE: Error while building " + DeQtf(arg[1]) + "!");
+					SetExitCode(1);
+				}
+				return;
+			}
+		}
+
+		LoadFromFile(ide);
+
+		ide.SyncCh();
+
+		DelTemps();
+		if(splash_screen) {
+			ShowSplash();
+			Ctrl::ProcessEvents();
+		}
+
+		ide.editor_bottom.Zoom(0);
+		ide.right_split.Zoom(0);
+		ide.UpdateFormat();
+		RestoreKeys(LoadFile(ConfigFile("ide.key")));
+		ide.editor.LoadHlStyles(LoadFile(ConfigFile("ide.colors")));
+		ActivateUsrLog();
+		if(clset || ide.OpenMainPackage()) {
+			StoreToFile(ide);
+			SyncRefs();
+			ide.FileSelected();
+			ide.Run();
+		}
+		StoreToFile(ide);
+		SaveBrowserBase();
+		SaveFile(ConfigFile("ide.key"), StoreKeys());
+		SaveFile(ConfigFile("ide.colors"), ide.editor.StoreHlStyles());
+		DelTemps();
+	}
+	catch(const CParser::Error& e) {
+		Exclamation("Parser error " + e);
+		LOG("!!!!! Parser error " + e);
+	}
+	catch(const Exc& e) {
+		Exclamation("Exception " + e);
+		LOG("!!!!! Exception " << e);
+	}
+#ifdef PLATFORM_POSIX
+	catch(...) {
+		Exclamation("Unknown exception !");
+		LOG("!!!!! Uknown exception");
+	}
+#endif
+}
diff --git a/uppsrc/ide/init b/uppsrc/ide/init
new file mode 100644
index 000000000..13fe20e56
--- /dev/null
+++ b/uppsrc/ide/init
@@ -0,0 +1,17 @@
+#ifndef _ide_icpp_init_stub
+#define _ide_icpp_init_stub
+#include "ide\Common/init"
+#include "ide\LayDes/init"
+#include "ide\IconDes/init"
+#include "ide\Builders/init"
+#include "ide\Debuggers/init"
+#include "ide\Browser/init"
+#include "ide\QuickTabs/init"
+#include "CodeEditor/init"
+#include "CtrlLib/init"
+#include "Web/init"
+#include "plugin\bz2/init"
+#include "HexView/init"
+#include "art\BlueBar/init"
+#include "plugin/astyle/init"
+#endif
diff --git a/uppsrc/ide/t.cpp b/uppsrc/ide/t.cpp
new file mode 100644
index 000000000..c99866db4
--- /dev/null
+++ b/uppsrc/ide/t.cpp
@@ -0,0 +1,675 @@
+#include "ide.h"
+
+struct FileLine : Moveable<FileLine> {
+	String file;
+	int    line;
+};
+
+struct LngEntry : Moveable<LngEntry, DeepCopyOption<LngEntry> > {
+	bool                   added;
+	VectorMap<int, String> text;
+	Vector<FileLine>       fileline;
+
+	LngEntry(const LngEntry& e, int) { added = e.added; text <<= e.text; fileline <<= e.fileline; }
+	LngEntry() {}
+
+	void AddFileLine(CParser& p) {
+		FileLine& fl = fileline.Add();
+		fl.file = p.GetFileName();
+		fl.line = p.GetLine();
+	}
+};
+
+struct TFile : Moveable<TFile> {
+	bool                        dirty;
+	bool                        java;
+	String                      package, file;
+	VectorMap<String, LngEntry> map;
+	Vector<int>                 ls;
+
+	void MakeLS() {
+		Index<int> lngset;
+		lngset.Add(LNG_enUS);
+		for(int i = 0; i < map.GetCount(); i++)
+			for(int j = 0; j < map[i].text.GetCount(); j++)
+				lngset.FindAdd(map[i].text.GetKey(j));
+		ls = lngset.PickKeys();
+		Sort(ls);
+	}
+
+	TFile() { dirty = false; }
+};
+
+void t_error(CParser& p)
+{
+	PutConsole(p.GetFileName() + Format("(%d): t_/tt_ works only with plain text literals", p.GetLine()));
+}
+
+void LngParseCFile(const String& fn, VectorMap<String, LngEntry>& lng)
+{
+	String data = LoadFile(fn);
+	CParser p(data, fn);
+	while(!p.IsEof()) {
+		if((p.Id("t_") || p.Id("tt_")) && p.Char('('))
+			if(p.IsString()) {
+				String tid = p.ReadString();
+				LngEntry& le = lng.GetAdd(tid);
+				le.text.GetAdd(LNG_enUS) = GetENUS(tid);
+				le.AddFileLine(p);
+				le.added = true;
+				if(!p.Char(')'))
+					t_error(p);
+			}
+			else
+				t_error(p);
+		else
+			p.SkipTerm();
+	}
+}
+
+const Index<int>& LngIndex()
+{
+	static Index<int> l;
+	if(l.GetCount() == 0) {
+		const int *x = GetAllLanguages();
+		while(*x)
+			l.Add(*x++);
+	}
+	return l;
+}
+
+bool LngParseTFile(const String& fn, VectorMap<String, LngEntry>& lng)
+{
+	String data = LoadFile(fn);
+	CParser p(data, fn);
+	try {
+		if(p.Char('#'))
+			while(!p.IsEof())
+				if(p.IsChar2('T', '_'))
+					break;
+				else
+					p.SkipTerm();
+		String id;
+		while(!p.IsEof()) {
+			if(p.Id("T_")) {
+				p.PassChar('(');
+				id = Null;
+				do
+					id.Cat(p.ReadString());
+				while(p.Char('+'));
+				p.PassChar(')');
+				lng.GetAdd(id).added = false;
+			}
+			else {
+				if(IsNull(id))
+					p.ThrowError("missing T_");
+				String lngs = p.ReadId();
+				p.PassChar('(');
+				if(lngs.GetLength() == 4) {
+					int lang = LNG_(ToUpper(lngs[0]), ToUpper(lngs[1]), ToUpper(lngs[2]), ToUpper(lngs[3]));
+					if(LngIndex().Find(lang) >= 0) {
+						String lt;
+						do
+							lt.Cat(p.ReadString());
+						while(p.Char('+'));
+						lng.GetAdd(id).text.GetAdd(lang) = lt;
+						p.PassChar(')');
+						continue;
+					}
+				}
+				p.ThrowError("invalid language");
+			}
+		}
+	}
+	catch(CParser::Error& e) {
+		PutConsole(e);
+		return false;
+	}
+	return true;
+}
+
+String CreateTFile(const VectorMap<String, LngEntry>& map, const Vector<int>& lngset, bool rep, bool obsolete, bool java)
+{
+	String out;
+	String cfile;
+	out << "#ifdef _MSC_VER\r\n#pragma setlocale(\"C\")\r\n#endif";
+	for(int i = 0; i < map.GetCount(); i++) {
+		if(i) out << "\r\n";
+		const LngEntry& e = map[i];
+		String nc;
+		if(e.fileline.GetCount())
+			nc = e.fileline[0].file;
+		if(nc != cfile) {
+			cfile = nc;
+			if(!IsNull(cfile) && !rep)
+				out << "\r\n// " << GetFileName(cfile) << "\r\n\r\n";
+			if(IsNull(cfile) && obsolete)
+				out << "\r\n// Obsolete\r\n\r\n";
+		}
+		if(!IsNull(cfile) || rep || obsolete) {
+			String id = map.GetKey(i);
+			out << "T_(" << AsCString(id, 70, java ? "   + " : "     ", ASCSTRING_SMART)
+			    << ")\r\n";
+			for(int j = 0; j < lngset.GetCount(); j++) {
+				int lang = lngset[j];
+				if(rep || lang != LNG_enUS) {
+					int q = e.text.Find(lang);
+					if(!rep || q >= 0 && !IsNull(e.text[q])) {
+						int c = (lang >> 15) & 31;
+						if(c) {
+							out.Cat(c + 'a' - 1);
+							c = (lang >> 10) & 31;
+							if(c) {
+								out.Cat(c + 'a' - 1);
+								c = (lang >> 5) & 31;
+								if(c) {
+									out.Cat(c + 'A' - 1);
+									c = lang & 31;
+									if(c) out.Cat(c + 'A' - 1);
+								}
+							}
+						}
+						out << '(' << AsCString(q >= 0 ? e.text[q] : String(), 70, java ? "   + "
+						                               : "     ", ASCSTRING_SMART) << ")\r\n";
+					}
+				}
+			}
+		}
+	}
+	return out;
+}
+
+struct LangDlg : WithLangLayout<TopWindow> {
+	void Serialize(Stream& s);
+
+	Vector<TFile>& tfile;
+
+	void AddLang();
+	void RemoveLang();
+
+	void AddLangAll();
+	void RemoveLangAll();
+
+	void EnterFile();
+	void EnterText();
+	void ToggleWork();
+
+	void LangMenu(Bar& bar);
+
+	bool ShouldWrite(int i)        { return file.Get(i, 1); }
+
+	typedef LangDlg CLASSNAME;
+
+	LangDlg(Vector<TFile>& map);
+};
+
+void LangDlg::Serialize(Stream& s)
+{
+	SerializePlacement(s);
+	String f = file.GetKey();
+	int l = lang.GetKey();
+	String t = text.GetKey();
+	s % f % l % t;
+	file.FindSetCursor(f);
+	lang.FindSetCursor(l);
+	text.FindSetCursor(t);
+}
+
+void LangDlg::AddLang()
+{
+	if(!file.IsCursor())
+		return;
+	WithAddLangLayout<TopWindow> dlg;
+	CtrlLayoutOKCancel(dlg, "Add language");
+	dlg.lang <<= dlg.Breaker(999);
+	TFile& tf = tfile[file.GetCursor()];
+	Vector<int>& ls = tf.ls;
+	for(;;) {
+		int l = ~dlg.lang;
+		dlg.ok.Enable((l & 31) && FindIndex(ls, l) < 0);
+		switch(dlg.Run()) {
+		case IDOK:
+			l = ~dlg.lang;
+			if(FindIndex(ls, l) < 0) {
+				ls.Add(l);
+				tf.dirty = true;
+				Sort(ls);
+				EnterFile();
+				lang.FindSetCursor(l);
+				return;
+			}
+			break;
+		case IDCANCEL:
+			return;
+		}
+	}
+}
+
+void LangDlg::AddLangAll()
+{
+	WithAddLangLayout<TopWindow> dlg;
+	CtrlLayoutOKCancel(dlg, "Add to all");
+	if(dlg.Run() != IDOK)
+		return;
+	int l = ~dlg.lang;
+	for(int i = 0; i < tfile.GetCount(); i++) {
+		TFile& tf = tfile[i];
+		Vector<int>& ls = tf.ls;
+		if(FindIndex(ls, l) < 0) {
+			ls.Add(l);
+			tf.dirty = true;
+			Sort(ls);
+		}
+	}
+	EnterFile();
+	lang.FindSetCursor(l);
+}
+
+void LangDlg::RemoveLang()
+{
+	if(file.IsCursor() && lang.IsCursor() && (int)lang.GetKey() != LNG_enUS
+	   && PromptOKCancel("Remove selected language version?")) {
+		TFile& tf = tfile[file.GetCursor()];
+		tf.ls.Remove(lang.GetCursor());
+		tf.dirty = true;
+		EnterFile();
+	}
+}
+
+void LangDlg::RemoveLangAll()
+{
+	WithAddLangLayout<TopWindow> dlg;
+	CtrlLayoutOKCancel(dlg, "Remove from all");
+	if(file.IsCursor() && lang.IsCursor())
+		dlg.lang <<= tfile[file.GetCursor()].ls[lang.GetCursor()];
+	if(dlg.Run() != IDOK)
+		return;
+	int l = ~dlg.lang;
+	for(int i = 0; i < tfile.GetCount(); i++) {
+		TFile& tf = tfile[i];
+		Vector<int>& ls = tf.ls;
+		int q = FindIndex(ls, l);
+		if(q >= 0) {
+			ls.Remove(q);
+			tf.dirty = true;
+			Sort(ls);
+		}
+	}
+	EnterFile();
+	lang.FindSetCursor(l);
+}
+
+void LangDlg::LangMenu(Bar& bar)
+{
+	bar.Add(file.IsCursor(), "Add..", THISBACK(AddLang));
+	bar.Add(lang.IsCursor(), "Remove", THISBACK(RemoveLang));
+	bar.Separator();
+	bar.Add(file.IsCursor(), "Add to all..", THISBACK(AddLangAll));
+	bar.Add(lang.IsCursor(), "Remove from all..", THISBACK(RemoveLangAll));
+}
+
+struct FontAndColorDisplay : Display {
+	Font  font;
+	Color color;
+
+	void Paint(Draw& w, const Rect& r, const Value& q,
+						Color ink, Color paper, dword s) const {
+		w.DrawRect(r, paper);
+		String vt = q;
+		const char *txt = GetENUS(vt);
+		int x = r.left;
+		if(txt != ~vt) {
+			String id(~vt, txt - 1);
+			w.DrawText(x, r.top, id, font, txt[-1] == '\a' ? LtRed : Magenta);
+			x += GetTextSize(id, font).cx + 6;
+		}
+		w.DrawText(x, r.top, AsCString(txt), font, ink);
+	}
+
+	FontAndColorDisplay(Font f, Color c) : font(f), color(c) {}
+};
+
+void LangDlg::EnterFile()
+{
+	TFile& tf = tfile[file.GetCursor()];
+	Sort(tf.ls);
+
+	lang.Clear();
+	for(int i = 0; i < tf.ls.GetCount(); i++)
+		lang.Add(tf.ls[i], LNGAsText(tf.ls[i]));
+	lang.GoBegin();
+
+	static FontAndColorDisplay normal(Arial(11)(), Null);
+	static FontAndColorDisplay added(Arial(11)().Bold(), Null);
+	static FontAndColorDisplay obsolete(Arial(11)().Italic(), Null);
+
+	text.Clear();
+	for(int i = 0; i < tf.map.GetCount(); i++) {
+		text.Add(tf.map.GetKey(i));
+		LngEntry& e = tf.map[i];
+		Display *d;
+		if(e.fileline.GetCount() == 0)
+			d = &obsolete;
+		else
+		if(e.added)
+			d = &added;
+		else
+			d = &normal;
+		text.SetDisplay(text.GetCount() - 1, 0, *d);
+	}
+	text.GoBegin();
+}
+
+void LangDlg::EnterText()
+{
+	source.Clear();
+	VectorMap<String, LngEntry>& map = tfile[file.GetCursor()].map;
+	int q = text.GetCursor();
+	if(q < 0 || q >= map.GetCount())
+		return;
+	LngEntry& e = map[q];
+	for(int i = 0; i < e.fileline.GetCount(); i++) {
+		FileLine& f = e.fileline[i];
+		source.Add(f.file, f.line, GetFileName(f.file) + " (" + AsString(f.line) + ")");
+	}
+}
+
+void LangDlg::ToggleWork()
+{
+	if(file.GetCount()) {
+		bool q = !(int)file.Get(0, 1);
+		for(int i = 0; i < file.GetCount(); i++)
+			file.Set(i, 1, q);
+	}
+}
+
+LangDlg::LangDlg(Vector<TFile>& tfile)
+:	tfile(tfile)
+{
+	CtrlLayoutOKCancel(*this, "Translation files");
+	file.AddColumn("File");
+	HeaderCtrl::Column& m = file.AddColumn().Ctrls<Option>().HeaderTab();
+	m.SetImage(IdeImg::work());
+	m.WhenAction = THISBACK(ToggleWork);
+	file.WhenEnterRow = THISBACK(EnterFile);
+	file.ColumnWidths("144 27");
+
+	lang.AddIndex();
+	lang.AddColumn("Versions");
+	lang.WhenBar = THISBACK(LangMenu);
+
+	text.AddColumn("Text");
+	text.WhenEnterRow = THISBACK(EnterText);
+
+	source.AddIndex();
+	source.AddIndex();
+	source.AddColumn("Source");
+	source.WhenLeftDouble = Breaker(IDYES);
+
+	for(int i = 0; i < tfile.GetCount(); i++)
+		file.Add(tfile[i].package + '/' + tfile[i].file, 1);
+	file.GoBegin();
+
+	Icon(IdeImg::Language());
+	Sizeable().Zoomable();
+}
+
+class ExportTrDlg : public WithExportTrLayout<TopWindow> {
+	SelectDirButton of;
+	typedef ExportTrDlg CLASSNAME;
+
+public:
+	ExportTrDlg();
+};
+
+ExportTrDlg::ExportTrDlg()
+{
+	CtrlLayoutOKCancel(*this, "Export .tr file");
+
+	DlCharsetD(charset);
+	of.Attach(folder);
+
+	charset <<= CHARSET_UTF8;
+	lang <<= LNG_ENGLISH;
+}
+
+String ExportTr(const Vector<TFile>& tfile, int& cs)
+{
+	ExportTrDlg dlg;
+	LoadFromGlobal(dlg, "tr-export");
+	int c = dlg.Run();
+	StoreToGlobal(dlg, "tr-export");
+	if(c != IDOK)
+		return Null;
+	int lng = ~dlg.lang;
+	cs = ~dlg.charset;
+	String fn = AppendFileName(~dlg.folder, LNGAsText(lng) + "." + CharsetName(cs) + ".tr");
+	FileOut out(fn);
+	if(!out) {
+		Exclamation("Unable to open the output file:&[* \1" + fn);
+		return Null;
+	}
+	out << "LANGUAGE " << AsCString(LNGAsText(SetLNGCharset(lng, cs))) << ";\r\n";
+	for(int i = 0; i < tfile.GetCount(); i++) {
+		const TFile& m = tfile[i];
+		out << "// " << m.package << "/" << m.file << "\r\n";
+		for(int j = 0; j < m.map.GetCount(); j++)
+			out << AsCString(m.map.GetKey(j), 70) << ",\r\n"
+			    << "\t" << AsCString(ToCharset(cs, m.map[j].text.Get(lng, ""), CHARSET_UTF8),
+			                         60, "\t", ASCSTRING_SMART)
+			    << ";\r\n\r\n";
+	}
+	return fn;
+}
+
+void Ide::SyncT(int kind)
+{
+	console.Clear();
+	String filepath = SourcePath(GetActivePackage(), GetActiveFileName());
+	SaveFile();
+
+	TFile repository;
+	LngParseTFile(ConfigFile("repository.t"), repository.map);
+
+	if(kind == 1) {
+		FileSel fs;
+		fs.ActiveDir(AnySourceFs().GetActiveDir());
+		fs.Type("Runtime translation file (*.tr)", "*.tr");
+		fs.AllFilesType();
+		LoadFromGlobal(fs, "fs-tr");
+		bool b = fs.ExecuteOpen("Import translation file");
+		StoreToGlobal(fs, "fs-tr");
+		if(!b) return;
+		String tr = LoadFile(~fs);
+		CParser p(tr);
+		try {
+			while(!p.IsEof()) {
+				p.PassId("LANGUAGE");
+				int lang = LNGFromText(p.ReadString());
+				if(!lang) {
+					PutConsole("Invalid language");
+					break;
+				}
+				p.PassChar(';');
+				byte cs = GetLNGCharset(lang);
+				lang &= LNGC_(255, 255, 255, 255, 0);
+				while(p.IsString()) {
+					String id = p.ReadString();
+					p.PassChar(',');
+					repository.map.GetAdd(id).text.GetAdd(lang) = ToCharset(CHARSET_UTF8, p.ReadString(), cs);
+					p.PassChar(';');
+				}
+			}
+		}
+		catch(CParser::Error& e) {
+			PutConsole(e);
+		}
+	}
+
+	Vector<TFile> tfile;
+
+	Progress pi;
+	const Workspace& wspc = IdeWorkspace();
+	pi.SetTotal(wspc.GetCount());
+	for(int i = 0; i < wspc.GetCount(); i++) {
+		const Package& pk = wspc.GetPackage(i);
+		String n = wspc[i];
+		pi.SetText("Scanning " + n);
+		if(pi.StepCanceled()) return;
+		VectorMap<String, LngEntry> pmap;
+		for(int i = 0; i < pk.file.GetCount(); i++) {
+			String file = SourcePath(n, pk.file[i]);
+			LngParseCFile(SourcePath(GetActivePackage(), file), pmap);
+		}
+		for(int i = 0; i < pk.file.GetCount(); i++) {
+			String file = SourcePath(n, pk.file[i]);
+			String ext = GetFileExt(file);
+			VectorMap<String, LngEntry> tmap(pmap, 0);
+			if(ext == ".t" || ext == ".jt")
+				if(LngParseTFile(file, tmap)) {
+					TFile& tf = tfile.Add();
+					tf.java = (ext == ".jt");
+					tf.package = n;
+					tf.file = pk.file[i];
+					tf.map = tmap;
+					tf.MakeLS();
+				}
+		}
+	}
+
+	for(int i = 0; i < tfile.GetCount(); i++) {
+		TFile& tf = tfile[i];
+		for(int ii = 0; ii < tf.map.GetCount(); ii++) {
+			LngEntry& tle = tf.map[ii];
+			LngEntry& rle = repository.map.GetAdd(tf.map.GetKey(ii));
+			for(int l = 0; l < tle.text.GetCount(); l++)
+				if(!IsNull(tle.text[l]))
+					rle.text.GetAdd(tle.text.GetKey(l)) = tle.text[l];
+		}
+	}
+
+	if(kind == 2) {
+		int cs;
+		String fn = ExportTr(tfile, cs);
+		if(!IsNull(fn)) {
+			EditFile(fn);
+			int c = filelist.GetCursor();
+			FlushFile();
+			ActiveFile().charset = (byte)cs;
+			SavePackage();
+			PackageCursor();
+			if(c >= 0)
+				filelist.SetCursor(c);
+			editor.ClearUndo();
+		}
+		return;
+	}
+
+	LangDlg dlg(tfile);
+	LoadFromWorkspace(dlg, "Tdlg");
+	switch(dlg.Execute()) {
+	case IDCANCEL:
+		return;
+	case IDYES:
+		if(dlg.source.IsCursor()) {
+			EditFile(dlg.source.Get(0));
+			editor.SetCursor(editor.GetPos(editor.GetLineNo((int)dlg.source.Get(1) - 1)));
+			editor.CenterCursor();
+			editor.SetFocus();
+			StoreToWorkspace(dlg, "Tdlg");
+			return;
+		}
+	}
+	StoreToWorkspace(dlg, "Tdlg");
+
+	FlushFile();
+
+	for(int i = 0; i < tfile.GetCount(); i++) {
+		TFile& tf = tfile[i];
+		for(int ii = 0; ii < tf.map.GetCount(); ii++) {
+			int q = repository.map.Find(tf.map.GetKey(ii));
+			if(q >= 0) {
+				LngEntry& tle = tf.map[ii];
+				LngEntry& rle = repository.map[q];
+				for(int l = 0; l < tf.ls.GetCount(); l++) {
+					q = tle.text.Find(tf.ls[l]);
+					if(q < 0 || IsNull(tle.text[q])) {
+						q = rle.text.Find(tf.ls[l]);
+						if(q >= 0)
+							tle.text.GetAdd(tf.ls[l]) = rle.text[q];
+					}
+				}
+			}
+		}
+	}
+
+	pi.SetTotal(tfile.GetCount());
+	for(int i = 0; i < tfile.GetCount(); i++) {
+		TFile& tf = tfile[i];
+		String td = CreateTFile(tf.map, tf.ls, false, !dlg.remove, tf.java);
+		String fp = SourcePath(tf.package, tf.file);
+		pi.SetText("Storing " + tf.package + '/' + tf.file);
+		if(pi.StepCanceled())
+			break;
+		if(dlg.ShouldWrite(i) && LoadFile(fp) != td)
+			::SaveFile(fp, td);
+	}
+
+	repository.MakeLS();
+	::SaveFile(ConfigFile("repository.t"), CreateTFile(repository.map, repository.ls, true, false, false));
+	FileCursor();
+}
+
+void Ide::ConvertST()
+{
+	if(!PromptYesNo("Convert project to t_ translations?"))
+		return;
+
+	FlushFile();
+
+	TFile repository;
+	LngParseTFile(ConfigFile("repository.t"), repository.map);
+
+	Progress pi;
+	const Workspace& wspc = IdeWorkspace();
+	pi.SetTotal(wspc.GetCount());
+	for(int i = 0; i < wspc.GetCount(); i++) {
+		const Package& pk = wspc.GetPackage(i);
+		String n = wspc[i];
+		pi.SetText("Converting " + n);
+		if(pi.StepCanceled()) return;
+		VectorMap<String, LngEntry> pmap;
+		for(int i = 0; i < pk.file.GetCount(); i++) {
+			String file = SourcePath(n, pk.file[i]);
+			String data = LoadFile(file);
+			CParser p(data);
+			String r;
+			const char *b = data;
+			while(!p.IsEof()) {
+				p.Spaces();
+				const char *w = p.GetPtr();
+				if(p.Id("s_") && p.Char('(') && p.IsId()) {
+					String id = p.ReadId();
+					int q = repository.map.Find(id);
+					if(q >= 0) {
+						LngEntry& e = repository.map[q];
+						q = e.text.Find(LNG_enUS);
+						if(q >= 0) {
+							r.Cat(b, w);
+							r.Cat("t_(");
+							r.Cat(AsCString(e.text[q]));
+							b = p.GetPtr();
+						}
+					}
+				}
+				else
+					p.SkipTerm();
+			}
+			r.Cat(b);
+			if(r != data)
+				::SaveFile(file, r);
+		}
+	}
+
+	FileCursor();
+}
diff --git a/uppsrc/ide/theide-48.png b/uppsrc/ide/theide-48.png
new file mode 100644
index 000000000..f1ad7558e
--- /dev/null
+++ b/uppsrc/ide/theide-48.png
@@ -0,0 +1 @@
+�PNG
diff --git a/uppsrc/ide/theide.desktop b/uppsrc/ide/theide.desktop
new file mode 100644
index 000000000..0340af663
--- /dev/null
+++ b/uppsrc/ide/theide.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=TheIDE
+GenericName=TheIDE
+Comment=IDE for cross-platform C++ development 
+MimeType=application/x-upp
+Exec=theide
+Icon=theide.png
+Terminal=false
+Type=Application
+Categories=Application;Development;C++
+StartupNotify=false
diff --git a/uppsrc/ide/valgrind.supp b/uppsrc/ide/valgrind.supp
new file mode 100644
index 000000000..18c552534
--- /dev/null
+++ b/uppsrc/ide/valgrind.supp
@@ -0,0 +1,179 @@
+{
+    <insert a suppression name here>
+        Memcheck:Value8
+        fun:XftFontOpenInfo
+        fun:XftFontOpenPattern
+        fun:XftFontOpen
+}
+{
+    <insert a suppression name here>
+        Memcheck:Cond
+        fun:XftFontInfoEqual
+        fun:XftFontOpenInfo
+        fun:XftFontOpenPattern
+}
+
+{
+    <insert a suppression name here>
+        Memcheck:Value8
+        obj:/usr/lib/libXft.so.2.1.2
+}
+
+{
+    <insert a suppression name here>
+        Memcheck:Cond
+        fun:XftFontOpenInfo
+        fun:XftFontOpenPattern
+}
+
+{
+    <insert a suppression name here>
+        Memcheck:Addr8
+        obj:/lib/ld-2.6.1.so
+}
+
+{
+    <insert a suppression name here>
+        Memcheck:Addr8
+        obj:/lib/ld-2.7.so
+}
+
+{
+    <insert a suppression name here>
+        Memcheck:Param
+        write(buf)
+        fun:__write_nocancel
+}
+
+{
+    <insert a suppression name here>
+        Memcheck:Leak
+        fun:realloc
+        fun:add_codeset
+        fun:initialize
+        fun:_XlcCreateLC
+        fun:_XlcDefaultLoader
+        fun:_XOpenLC
+        fun:_XrmInitParseInfo
+        fun:NewDatabase
+        fun:XrmGetStringDatabase
+        fun:XGetDefault
+        obj:/usr/lib/libXft.so.2.1.2
+}
+
+{
+    <insert a suppression name here>
+        Memcheck:Leak
+        fun:malloc
+        obj:/usr/lib/libfontconfig.so.1.2.0
+}
+
+{
+    <insert a suppression name here>
+        Memcheck:Leak
+        fun:malloc
+        obj:/usr/lib/libfontconfig.so.1.3.0
+}
+
+{
+   <insert a suppression name here>
+   Memcheck:Addr8
+   obj:/lib/ld-2.7.so
+}
+
+{
+   <insert a suppression name here>
+   Memcheck:Cond
+   fun:XftFontInfoEqual
+   fun:XftFontOpenInfo
+   fun:XftFontOpenPattern
+   fun:XftFontOpen
+}
+
+{
+   <insert a suppression name here>
+   Memcheck:Value8
+   obj:/usr/lib/libXft.so.2.1.2
+   fun:_ZN3Upp14sCheckComposedEPKc
+   fun:_ZN3Upp4Draw17InitPlatformFontsEv
+}
+
+{
+   <insert a suppression name here>
+   Memcheck:Value8
+   obj:/usr/lib/libXft.so.2.1.2
+   fun:_ZN3Upp8FontInfo4DataD1Ev
+}
+
+{
+   <insert a suppression name here>
+   Memcheck:Cond
+   fun:XftFontInfoEqual
+   fun:XftFontOpenInfo
+   fun:XftFontOpenPattern
+   fun:XftFontOpen
+}
+
+{
+   <insert a suppression name here>
+   Memcheck:Cond
+   fun:XftFontOpenInfo
+}
+
+{
+   <insert a suppression name here>
+   Memcheck:Value8
+   obj:/usr/lib/libXft.so.2.1.2
+   fun:_ZN3Upp14sCheckComposedEPKc
+   fun:_ZN3Upp4Draw17InitPlatformFontsEv
+}
+
+{
+   <insert a suppression name here>
+   Memcheck:Value8
+   obj:/usr/lib/libXft.so.2.1.2
+   fun:_ZN3Upp8FontInfo4DataD1Ev
+}
+
+{
+    <insert a suppression name here>
+        Memcheck:Leak
+        fun:calloc
+        fun:g_malloc0
+        obj:/usr/lib/libgobject-2.0.so.0.1400.1
+        obj:/usr/lib/libgobject-2.0.so.0.1400.1
+        fun:g_type_register_fundamental
+        obj:/usr/lib/libgobject-2.0.so.0.1400.1
+        fun:g_type_init_with_debug_flags
+}
+
+{
+    <insert a suppression name here>
+        Memcheck:Leak
+        fun:realloc
+        obj:/usr/lib/libfontconfig.so.1.2.0
+        obj:/usr/lib/libfontconfig.so.1.2.0
+        fun:FcFontRenderPrepare
+}
+
+{
+    <insert a suppression name here>
+        Memcheck:Leak
+        fun:memalign
+        fun:posix_memalign
+        obj:/usr/lib/libglib-2.0.so.0.1400.1
+        fun:g_slice_alloc
+        fun:g_slice_alloc0
+}
+
+{
+    <insert a suppression name here>
+        Memcheck:Leak
+        fun:malloc
+        fun:g_malloc
+        fun:g_strdup
+        obj:/usr/lib/libgobject-2.0.so.0.1400.1
+        fun:g_object_get_valist
+        fun:g_object_get
+}
+
diff --git a/uppsrc/ide/version.h b/uppsrc/ide/version.h
new file mode 100644
index 000000000..4a55088ed
--- /dev/null
+++ b/uppsrc/ide/version.h
@@ -0,0 +1 @@
+#define IDE_VERSION    "806.r122"
diff --git a/uppsrc/ide/xide.ico b/uppsrc/ide/xide.ico
new file mode 100644
index 000000000..1ab4dc932
Binary files /dev/null and b/uppsrc/ide/xide.ico differ
diff --git a/uppsrc/install.upp b/uppsrc/install.upp
new file mode 100644
index 000000000..9632604f7
--- /dev/null
+++ b/uppsrc/install.upp
@@ -0,0 +1,5 @@
+uppsrc.var|#\uppsrc|#\common|#\out
+reference.var|#\reference;#\uppsrc|#\common|#\out
+examples.var|#\examples;#\uppsrc|#\common|#\out
+tutorial.var|#\tutorial;#\uppsrc|#\common|#\out
+MyApps.var|@;#\uppsrc|#\common|#\out
diff --git a/uppsrc/macosx/macosx.upp b/uppsrc/macosx/macosx.upp
new file mode 100644
index 000000000..5872304d3
--- /dev/null
+++ b/uppsrc/macosx/macosx.upp
@@ -0,0 +1,9 @@
+uses
+	CtrlLib;
+
+file
+	main.cpp;
+
+mainconfig
+	"" = "GUI";
+
diff --git a/uppsrc/macosx/main.cpp b/uppsrc/macosx/main.cpp
new file mode 100644
index 000000000..c13afc82e
--- /dev/null
+++ b/uppsrc/macosx/main.cpp
@@ -0,0 +1,6 @@
+#include <CtrlLib/CtrlLib.h>
+
+GUI_APP_MAIN
+{
+}
+
diff --git a/uppsrc/numbers.txt b/uppsrc/numbers.txt
new file mode 100644
index 000000000..b55961887
--- /dev/null
+++ b/uppsrc/numbers.txt
@@ -0,0 +1,719 @@
+================================================================
+TheIDE String histrograms
+-----------------------
+name = Dest
+  0  2019143  34.70%  < 0.00%  >65.30%
+  1   556878   9.57%  <34.70%  >55.72%
+  2   233921   4.02%  <44.28%  >51.70%
+  3   222671   3.83%  <48.30%  >47.88%
+  4   251397   4.32%  <52.12%  >43.55%
+  5   282915   4.86%  <56.45%  >38.69%
+  6   205141   3.53%  <61.31%  >35.17%
+  7   185713   3.19%  <64.83%  >31.97%
+  8   166263   2.86%  <68.03%  >29.12%
+  9   173057   2.97%  <70.88%  >26.14%
+ 10   124624   2.14%  <73.86%  >24.00%
+ 11   104467   1.80%  <76.00%  >22.20%
+ 12   129868   2.23%  <77.80%  >19.97%
+ 13    99487   1.71%  <80.03%  >18.26%
+ 14    73304   1.26%  <81.74%  >17.00%
+ 15    54341   0.93%  <83.00%  >16.07%
+ 16    59307   1.02%  <83.93%  >15.05%
+ 17    48508   0.83%  <84.95%  >14.21%
+ 18    42583   0.73%  <85.79%  >13.48%
+ 19    43111   0.74%  <86.52%  >12.74%
+ 20    59832   1.03%  <87.26%  >11.71%
+ 21    39133   0.67%  <88.29%  >11.04%
+ 22    30435   0.52%  <88.96%  >10.52%
+ 23    37915   0.65%  <89.48%  > 9.87%
+ 24    24436   0.42%  <90.13%  > 9.45%
+ 25   118560   2.04%  <90.55%  > 7.41%
+ 26    21802   0.37%  <92.59%  > 7.03%
+ 27    23236   0.40%  <92.97%  > 6.63%
+ 28    19079   0.33%  <93.37%  > 6.31%
+ 29    29684   0.51%  <93.69%  > 5.80%
+ 30    19241   0.33%  <94.20%  > 5.47%
+ 31    23357   0.40%  <94.53%  > 5.06%
+ 32    18513   0.32%  <94.94%  > 4.75%
+ 33    18224   0.31%  <95.25%  > 4.43%
+ 34     9560   0.16%  <95.57%  > 4.27%
+ 35    14026   0.24%  <95.73%  > 4.03%
+ 36     9118   0.16%  <95.97%  > 3.87%
+ 37    11223   0.19%  <96.13%  > 3.68%
+ 38     7825   0.13%  <96.32%  > 3.54%
+ 39    11201   0.19%  <96.46%  > 3.35%
+ 40     8579   0.15%  <96.65%  > 3.20%
+ 41     6584   0.11%  <96.80%  > 3.09%
+ 42     8836   0.15%  <96.91%  > 2.94%
+ 43    10112   0.17%  <97.06%  > 2.76%
+ 44     7006   0.12%  <97.24%  > 2.64%
+ 45    10865   0.19%  <97.36%  > 2.46%
+ 46     8272   0.14%  <97.54%  > 2.31%
+ 47     4888   0.08%  <97.69%  > 2.23%
+ 48     6266   0.11%  <97.77%  > 2.12%
+ 49     5208   0.09%  <97.88%  > 2.03%
+ 50     9706   0.17%  <97.97%  > 1.87%
+ 51     5686   0.10%  <98.13%  > 1.77%
+ 52     3632   0.06%  <98.23%  > 1.71%
+ 53     4911   0.08%  <98.29%  > 1.62%
+ 54     3398   0.06%  <98.38%  > 1.56%
+ 55     4169   0.07%  <98.44%  > 1.49%
+ 56     1887   0.03%  <98.51%  > 1.46%
+ 57     3989   0.07%  <98.54%  > 1.39%
+ 58     6423   0.11%  <98.61%  > 1.28%
+ 59     4172   0.07%  <98.72%  > 1.21%
+ 60     4928   0.08%  <98.79%  > 1.12%
+ 61     1524   0.03%  <98.88%  > 1.10%
+ 62     6174   0.11%  <98.90%  > 0.99%
+ 63     4641   0.08%  <99.01%  > 0.91%
+ 64     2359   0.04%  <99.09%  > 0.87%
+ 65     2940   0.05%  <99.13%  > 0.82%
+ 66     1596   0.03%  <99.18%  > 0.79%
+ 67     1574   0.03%  <99.21%  > 0.77%
+ 68     1103   0.02%  <99.23%  > 0.75%
+ 69     4132   0.07%  <99.25%  > 0.68%
+ 70     1490   0.03%  <99.32%  > 0.65%
+ 71     1821   0.03%  <99.35%  > 0.62%
+ 72     6387   0.11%  <99.38%  > 0.51%
+ 73     1116   0.02%  <99.49%  > 0.49%
+ 74     1064   0.02%  <99.51%  > 0.47%
+ 75      944   0.02%  <99.53%  > 0.46%
+ 76     2417   0.04%  <99.54%  > 0.41%
+ 77      882   0.02%  <99.59%  > 0.40%
+ 78     1025   0.02%  <99.60%  > 0.38%
+ 79      923   0.02%  <99.62%  > 0.37%
+ 80      660   0.01%  <99.63%  > 0.35%
+ 81      671   0.01%  <99.65%  > 0.34%
+ 82      543   0.01%  <99.66%  > 0.33%
+ 83      572   0.01%  <99.67%  > 0.32%
+ 84      473   0.01%  <99.68%  > 0.32%
+ 85      445   0.01%  <99.68%  > 0.31%
+ 86      429   0.01%  <99.69%  > 0.30%
+ 87      450   0.01%  <99.70%  > 0.29%
+ 88      397   0.01%  <99.71%  > 0.29%
+ 89      928   0.02%  <99.71%  > 0.27%
+ 90      370   0.01%  <99.73%  > 0.26%
+ 91     1822   0.03%  <99.74%  > 0.23%
+ 92      320   0.01%  <99.77%  > 0.23%
+ 93      290   0.00%  <99.77%  > 0.22%
+ 94      348   0.01%  <99.78%  > 0.22%
+ 95     1656   0.03%  <99.78%  > 0.19%
+ 96      224   0.00%  <99.81%  > 0.18%
+ 97      222   0.00%  <99.82%  > 0.18%
+ 98      192   0.00%  <99.82%  > 0.18%
+ 99      209   0.00%  <99.82%  > 0.17%
+100      199   0.00%  <99.83%  > 0.17%
+101      234   0.00%  <99.83%  > 0.17%
+102      198   0.00%  <99.83%  > 0.16%
+103      155   0.00%  <99.84%  > 0.16%
+104      108   0.00%  <99.84%  > 0.16%
+105     1619   0.03%  <99.84%  > 0.13%
+106      113   0.00%  <99.87%  > 0.13%
+107      175   0.00%  <99.87%  > 0.12%
+108      112   0.00%  <99.88%  > 0.12%
+109      116   0.00%  <99.88%  > 0.12%
+110       76   0.00%  <99.88%  > 0.12%
+111      114   0.00%  <99.88%  > 0.12%
+112       91   0.00%  <99.88%  > 0.12%
+113       72   0.00%  <99.88%  > 0.11%
+114       73   0.00%  <99.89%  > 0.11%
+115       64   0.00%  <99.89%  > 0.11%
+116      109   0.00%  <99.89%  > 0.11%
+117       95   0.00%  <99.89%  > 0.11%
+118       88   0.00%  <99.89%  > 0.11%
+119       72   0.00%  <99.89%  > 0.11%
+120       55   0.00%  <99.89%  > 0.11%
+121      103   0.00%  <99.89%  > 0.10%
+122       36   0.00%  <99.90%  > 0.10%
+123       54   0.00%  <99.90%  > 0.10%
+124       51   0.00%  <99.90%  > 0.10%
+125       36   0.00%  <99.90%  > 0.10%
+126       35   0.00%  <99.90%  > 0.10%
+127       68   0.00%  <99.90%  > 0.10%
+128       47   0.00%  <99.90%  > 0.10%
+129       19   0.00%  <99.90%  > 0.10%
+130       41   0.00%  <99.90%  > 0.10%
+131       10   0.00%  <99.90%  > 0.10%
+132       21   0.00%  <99.90%  > 0.10%
+133       57   0.00%  <99.90%  > 0.10%
+134       25   0.00%  <99.90%  > 0.10%
+135       24   0.00%  <99.90%  > 0.09%
+136       32   0.00%  <99.91%  > 0.09%
+137       39   0.00%  <99.91%  > 0.09%
+138       20   0.00%  <99.91%  > 0.09%
+139       29   0.00%  <99.91%  > 0.09%
+140       21   0.00%  <99.91%  > 0.09%
+141        6   0.00%  <99.91%  > 0.09%
+142       25   0.00%  <99.91%  > 0.09%
+143       13   0.00%  <99.91%  > 0.09%
+144       22   0.00%  <99.91%  > 0.09%
+145       26   0.00%  <99.91%  > 0.09%
+146       28   0.00%  <99.91%  > 0.09%
+147       24   0.00%  <99.91%  > 0.09%
+148        5   0.00%  <99.91%  > 0.09%
+149       14   0.00%  <99.91%  > 0.09%
+150       19   0.00%  <99.91%  > 0.09%
+151       19   0.00%  <99.91%  > 0.09%
+152       13   0.00%  <99.91%  > 0.09%
+153       14   0.00%  <99.91%  > 0.09%
+154       23   0.00%  <99.91%  > 0.09%
+155       21   0.00%  <99.91%  > 0.09%
+156        7   0.00%  <99.91%  > 0.09%
+157        4   0.00%  <99.91%  > 0.09%
+158        3   0.00%  <99.91%  > 0.09%
+159       17   0.00%  <99.91%  > 0.09%
+160       22   0.00%  <99.91%  > 0.09%
+161       10   0.00%  <99.91%  > 0.09%
+162       13   0.00%  <99.91%  > 0.09%
+163        3   0.00%  <99.91%  > 0.09%
+164       15   0.00%  <99.91%  > 0.09%
+165       10   0.00%  <99.91%  > 0.09%
+166        2   0.00%  <99.91%  > 0.09%
+167        3   0.00%  <99.91%  > 0.09%
+168        8   0.00%  <99.91%  > 0.09%
+169       15   0.00%  <99.91%  > 0.09%
+170        1   0.00%  <99.91%  > 0.09%
+172       11   0.00%  <99.91%  > 0.09%
+173        6   0.00%  <99.91%  > 0.08%
+174        5   0.00%  <99.92%  > 0.08%
+175        4   0.00%  <99.92%  > 0.08%
+176        4   0.00%  <99.92%  > 0.08%
+177       10   0.00%  <99.92%  > 0.08%
+178        8   0.00%  <99.92%  > 0.08%
+179        4   0.00%  <99.92%  > 0.08%
+180        4   0.00%  <99.92%  > 0.08%
+181        3   0.00%  <99.92%  > 0.08%
+182       13   0.00%  <99.92%  > 0.08%
+183        2   0.00%  <99.92%  > 0.08%
+184        7   0.00%  <99.92%  > 0.08%
+185        5   0.00%  <99.92%  > 0.08%
+186       11   0.00%  <99.92%  > 0.08%
+187       13   0.00%  <99.92%  > 0.08%
+188        8   0.00%  <99.92%  > 0.08%
+189        7   0.00%  <99.92%  > 0.08%
+191        3   0.00%  <99.92%  > 0.08%
+192       18   0.00%  <99.92%  > 0.08%
+193        2   0.00%  <99.92%  > 0.08%
+194        7   0.00%  <99.92%  > 0.08%
+195        8   0.00%  <99.92%  > 0.08%
+197        3   0.00%  <99.92%  > 0.08%
+199        7   0.00%  <99.92%  > 0.08%
+200        3   0.00%  <99.92%  > 0.08%
+203        4   0.00%  <99.92%  > 0.08%
+204        9   0.00%  <99.92%  > 0.08%
+205        1   0.00%  <99.92%  > 0.08%
+206        3   0.00%  <99.92%  > 0.08%
+207        5   0.00%  <99.92%  > 0.08%
+208        8   0.00%  <99.92%  > 0.08%
+209        9   0.00%  <99.92%  > 0.08%
+210        1   0.00%  <99.92%  > 0.08%
+211        1   0.00%  <99.92%  > 0.08%
+212        8   0.00%  <99.92%  > 0.08%
+213        5   0.00%  <99.92%  > 0.08%
+214        2   0.00%  <99.92%  > 0.08%
+215       22   0.00%  <99.92%  > 0.08%
+216       11   0.00%  <99.92%  > 0.08%
+217        5   0.00%  <99.92%  > 0.08%
+219        2   0.00%  <99.92%  > 0.08%
+220       22   0.00%  <99.92%  > 0.08%
+221        3   0.00%  <99.92%  > 0.08%
+222       17   0.00%  <99.92%  > 0.08%
+223        4   0.00%  <99.92%  > 0.08%
+224        3   0.00%  <99.92%  > 0.08%
+225        4   0.00%  <99.92%  > 0.08%
+227        5   0.00%  <99.92%  > 0.08%
+228        9   0.00%  <99.92%  > 0.08%
+230        6   0.00%  <99.92%  > 0.08%
+232        1   0.00%  <99.92%  > 0.08%
+233        1   0.00%  <99.92%  > 0.08%
+234        3   0.00%  <99.92%  > 0.08%
+235        1   0.00%  <99.92%  > 0.08%
+237        6   0.00%  <99.92%  > 0.08%
+238        6   0.00%  <99.92%  > 0.08%
+239        6   0.00%  <99.92%  > 0.08%
+240        7   0.00%  <99.92%  > 0.08%
+242        3   0.00%  <99.92%  > 0.08%
+244        1   0.00%  <99.92%  > 0.08%
+245        3   0.00%  <99.92%  > 0.08%
+254        1   0.00%  <99.92%  > 0.08%
+255     4855   0.08%  <99.92%  >-0.00%
+-----------------------
+name = Hash
+  0     1338   0.15%  < 0.00%  >99.85%
+  1   107094  12.38%  < 0.15%  >87.46%
+  2    49193   5.69%  <12.54%  >81.77%
+  3    63695   7.36%  <18.23%  >74.41%
+  4    90981  10.52%  <25.59%  >63.89%
+  5   103625  11.98%  <36.11%  >51.91%
+  6    76401   8.83%  <48.09%  >43.07%
+  7    44848   5.19%  <56.93%  >37.89%
+  8    47510   5.49%  <62.11%  >32.39%
+  9    35233   4.07%  <67.61%  >28.32%
+ 10    31314   3.62%  <71.68%  >24.70%
+ 11    22956   2.65%  <75.30%  >22.05%
+ 12    18834   2.18%  <77.95%  >19.87%
+ 13    14790   1.71%  <80.13%  >18.16%
+ 14    12900   1.49%  <81.84%  >16.67%
+ 15    10799   1.25%  <83.33%  >15.42%
+ 16     9737   1.13%  <84.58%  >14.29%
+ 17     8758   1.01%  <85.71%  >13.28%
+ 18     7569   0.88%  <86.72%  >12.40%
+ 19     6927   0.80%  <87.60%  >11.60%
+ 20     7574   0.88%  <88.40%  >10.73%
+ 21    10014   1.16%  <89.27%  > 9.57%
+ 22     8659   1.00%  <90.43%  > 8.57%
+ 23     8886   1.03%  <91.43%  > 7.54%
+ 24     5980   0.69%  <92.46%  > 6.85%
+ 25     5678   0.66%  <93.15%  > 6.19%
+ 26     5584   0.65%  <93.81%  > 5.55%
+ 27     6032   0.70%  <94.45%  > 4.85%
+ 28     6615   0.76%  <95.15%  > 4.08%
+ 29     9300   1.08%  <95.92%  > 3.01%
+ 30     5043   0.58%  <96.99%  > 2.43%
+ 31     3638   0.42%  <97.57%  > 2.01%
+ 32     3909   0.45%  <97.99%  > 1.55%
+ 33     1820   0.21%  <98.45%  > 1.34%
+ 34     1449   0.17%  <98.66%  > 1.18%
+ 35     1147   0.13%  <98.82%  > 1.04%
+ 36     1505   0.17%  <98.96%  > 0.87%
+ 37      589   0.07%  <99.13%  > 0.80%
+ 38      647   0.07%  <99.20%  > 0.73%
+ 39      451   0.05%  <99.27%  > 0.67%
+ 40      456   0.05%  <99.33%  > 0.62%
+ 41      405   0.05%  <99.38%  > 0.57%
+ 42      461   0.05%  <99.43%  > 0.52%
+ 43      378   0.04%  <99.48%  > 0.48%
+ 44      342   0.04%  <99.52%  > 0.44%
+ 45      270   0.03%  <99.56%  > 0.41%
+ 46      328   0.04%  <99.59%  > 0.37%
+ 47      230   0.03%  <99.63%  > 0.34%
+ 48      278   0.03%  <99.66%  > 0.31%
+ 49      200   0.02%  <99.69%  > 0.29%
+ 50      215   0.02%  <99.71%  > 0.26%
+ 51      192   0.02%  <99.74%  > 0.24%
+ 52      173   0.02%  <99.76%  > 0.22%
+ 53      168   0.02%  <99.78%  > 0.20%
+ 54      111   0.01%  <99.80%  > 0.19%
+ 55      128   0.01%  <99.81%  > 0.17%
+ 56      103   0.01%  <99.83%  > 0.16%
+ 57       64   0.01%  <99.84%  > 0.15%
+ 58       93   0.01%  <99.85%  > 0.14%
+ 59       95   0.01%  <99.86%  > 0.13%
+ 60      139   0.02%  <99.87%  > 0.12%
+ 61       34   0.00%  <99.88%  > 0.11%
+ 62       70   0.01%  <99.89%  > 0.10%
+ 63       86   0.01%  <99.90%  > 0.09%
+ 64       58   0.01%  <99.91%  > 0.09%
+ 65       51   0.01%  <99.91%  > 0.08%
+ 66       39   0.00%  <99.92%  > 0.08%
+ 67       75   0.01%  <99.92%  > 0.07%
+ 68       14   0.00%  <99.93%  > 0.07%
+ 69       29   0.00%  <99.93%  > 0.06%
+ 70      115   0.01%  <99.94%  > 0.05%
+ 71        3   0.00%  <99.95%  > 0.05%
+ 72       32   0.00%  <99.95%  > 0.05%
+ 73       29   0.00%  <99.95%  > 0.04%
+ 74       10   0.00%  <99.96%  > 0.04%
+ 75       34   0.00%  <99.96%  > 0.04%
+ 76       13   0.00%  <99.96%  > 0.04%
+ 77       10   0.00%  <99.96%  > 0.03%
+ 78        4   0.00%  <99.97%  > 0.03%
+ 79        6   0.00%  <99.97%  > 0.03%
+ 80       19   0.00%  <99.97%  > 0.03%
+ 81       32   0.00%  <99.97%  > 0.03%
+ 82       11   0.00%  <99.97%  > 0.03%
+ 83        6   0.00%  <99.97%  > 0.03%
+ 84       16   0.00%  <99.97%  > 0.02%
+ 85       13   0.00%  <99.98%  > 0.02%
+ 86        9   0.00%  <99.98%  > 0.02%
+ 88        3   0.00%  <99.98%  > 0.02%
+ 89        8   0.00%  <99.98%  > 0.02%
+ 90        8   0.00%  <99.98%  > 0.02%
+ 91        2   0.00%  <99.98%  > 0.02%
+ 94       10   0.00%  <99.98%  > 0.02%
+ 95        4   0.00%  <99.98%  > 0.02%
+ 96        2   0.00%  <99.98%  > 0.02%
+ 97        8   0.00%  <99.98%  > 0.02%
+ 98       10   0.00%  <99.98%  > 0.01%
+ 99        3   0.00%  <99.99%  > 0.01%
+100        4   0.00%  <99.99%  > 0.01%
+101        7   0.00%  <99.99%  > 0.01%
+102        3   0.00%  <99.99%  > 0.01%
+103        2   0.00%  <99.99%  > 0.01%
+105        4   0.00%  <99.99%  > 0.01%
+106        1   0.00%  <99.99%  > 0.01%
+107       31   0.00%  <99.99%  > 0.01%
+108       10   0.00%  <99.99%  > 0.01%
+109       10   0.00%  <99.99%  > 0.01%
+111       10   0.00%  <99.99%  > 0.00%
+113        1   0.00%  <100.00%  > 0.00%
+114        3   0.00%  <100.00%  > 0.00%
+117        3   0.00%  <100.00%  > 0.00%
+118        5   0.00%  <100.00%  > 0.00%
+120        5   0.00%  <100.00%  > 0.00%
+121       13   0.00%  <100.00%  > 0.00%
+132        2   0.00%  <100.00%  > 0.00%
+133        7   0.00%  <100.00%  > 0.00%
+139        5   0.00%  <100.00%  >-0.00%
+142        4   0.00%  <100.00%  >-0.00%
+185        1   0.00%  <100.00%  >-0.00%
+=================================================
+Odpady
+-----------------------
+name = Dest
+  0   311210  14.63%  < 0.00%  >85.37%
+  1   230893  10.86%  <14.63%  >74.51%
+  2    62496   2.94%  <25.49%  >71.57%
+  3   112700   5.30%  <28.43%  >66.27%
+  4   130500   6.14%  <33.73%  >60.13%
+  5   122505   5.76%  <39.87%  >54.37%
+  6    58129   2.73%  <45.63%  >51.64%
+  7   108148   5.09%  <48.36%  >46.55%
+  8    70533   3.32%  <53.45%  >43.23%
+  9   199104   9.36%  <56.77%  >33.87%
+ 10   132089   6.21%  <66.13%  >27.66%
+ 11    28380   1.33%  <72.34%  >26.33%
+ 12    65562   3.08%  <73.67%  >23.24%
+ 13    64272   3.02%  <76.76%  >20.22%
+ 14   236274  11.11%  <79.78%  > 9.11%
+ 15    27626   1.30%  <90.89%  > 7.81%
+ 16    23281   1.09%  <92.19%  > 6.72%
+ 17    20631   0.97%  <93.28%  > 5.75%
+ 18    16701   0.79%  <94.25%  > 4.96%
+ 19     7003   0.33%  <95.04%  > 4.63%
+ 20    12503   0.59%  <95.37%  > 4.04%
+ 21     3510   0.17%  <95.96%  > 3.88%
+ 22     1461   0.07%  <96.12%  > 3.81%
+ 23     1385   0.07%  <96.19%  > 3.74%
+ 24     3305   0.16%  <96.26%  > 3.59%
+ 25     5528   0.26%  <96.41%  > 3.33%
+ 26     8634   0.41%  <96.67%  > 2.92%
+ 27    10264   0.48%  <97.08%  > 2.44%
+ 28    11443   0.54%  <97.56%  > 1.90%
+ 29    10792   0.51%  <98.10%  > 1.39%
+ 30     8730   0.41%  <98.61%  > 0.98%
+ 31     6113   0.29%  <99.02%  > 0.70%
+ 32     3919   0.18%  <99.30%  > 0.51%
+ 33     2628   0.12%  <99.49%  > 0.39%
+ 34     1365   0.06%  <99.61%  > 0.32%
+ 35      697   0.03%  <99.68%  > 0.29%
+ 36     1581   0.07%  <99.71%  > 0.22%
+ 37      196   0.01%  <99.78%  > 0.21%
+ 38      175   0.01%  <99.79%  > 0.20%
+ 39       57   0.00%  <99.80%  > 0.20%
+ 40       46   0.00%  <99.80%  > 0.20%
+ 41       25   0.00%  <99.80%  > 0.19%
+ 42       23   0.00%  <99.81%  > 0.19%
+ 43       34   0.00%  <99.81%  > 0.19%
+ 44       45   0.00%  <99.81%  > 0.19%
+ 45       62   0.00%  <99.81%  > 0.19%
+ 46       57   0.00%  <99.81%  > 0.18%
+ 47       21   0.00%  <99.82%  > 0.18%
+ 48       23   0.00%  <99.82%  > 0.18%
+ 49       74   0.00%  <99.82%  > 0.18%
+ 50       76   0.00%  <99.82%  > 0.17%
+ 51      113   0.01%  <99.83%  > 0.17%
+ 52      161   0.01%  <99.83%  > 0.16%
+ 53       48   0.00%  <99.84%  > 0.16%
+ 54       83   0.00%  <99.84%  > 0.16%
+ 55      124   0.01%  <99.84%  > 0.15%
+ 56      175   0.01%  <99.85%  > 0.14%
+ 57      130   0.01%  <99.86%  > 0.14%
+ 58       34   0.00%  <99.86%  > 0.13%
+ 59       35   0.00%  <99.87%  > 0.13%
+ 60       40   0.00%  <99.87%  > 0.13%
+ 61      197   0.01%  <99.87%  > 0.12%
+ 62      382   0.02%  <99.88%  > 0.10%
+ 63       51   0.00%  <99.90%  > 0.10%
+ 64      104   0.00%  <99.90%  > 0.10%
+ 65       35   0.00%  <99.90%  > 0.09%
+ 66       18   0.00%  <99.91%  > 0.09%
+ 67       10   0.00%  <99.91%  > 0.09%
+ 68       24   0.00%  <99.91%  > 0.09%
+ 69        3   0.00%  <99.91%  > 0.09%
+ 70       24   0.00%  <99.91%  > 0.09%
+ 71        6   0.00%  <99.91%  > 0.09%
+ 72       14   0.00%  <99.91%  > 0.09%
+ 76       22   0.00%  <99.91%  > 0.09%
+ 77       24   0.00%  <99.91%  > 0.09%
+ 78       56   0.00%  <99.91%  > 0.08%
+ 80       24   0.00%  <99.92%  > 0.08%
+ 81        8   0.00%  <99.92%  > 0.08%
+ 82        8   0.00%  <99.92%  > 0.08%
+ 83        6   0.00%  <99.92%  > 0.08%
+ 84       10   0.00%  <99.92%  > 0.08%
+ 85       34   0.00%  <99.92%  > 0.08%
+ 86       28   0.00%  <99.92%  > 0.08%
+ 87        5   0.00%  <99.92%  > 0.08%
+ 88        3   0.00%  <99.92%  > 0.08%
+ 89       22   0.00%  <99.92%  > 0.08%
+ 90       30   0.00%  <99.92%  > 0.08%
+ 91       37   0.00%  <99.92%  > 0.07%
+ 92        9   0.00%  <99.93%  > 0.07%
+ 93       25   0.00%  <99.93%  > 0.07%
+ 94       15   0.00%  <99.93%  > 0.07%
+ 95       16   0.00%  <99.93%  > 0.07%
+ 96       31   0.00%  <99.93%  > 0.07%
+ 97        8   0.00%  <99.93%  > 0.07%
+ 98       31   0.00%  <99.93%  > 0.07%
+ 99       82   0.00%  <99.93%  > 0.06%
+100       24   0.00%  <99.94%  > 0.06%
+101       55   0.00%  <99.94%  > 0.06%
+102       39   0.00%  <99.94%  > 0.06%
+103       46   0.00%  <99.94%  > 0.06%
+104       20   0.00%  <99.94%  > 0.06%
+105       40   0.00%  <99.94%  > 0.05%
+107       22   0.00%  <99.95%  > 0.05%
+108        8   0.00%  <99.95%  > 0.05%
+109        6   0.00%  <99.95%  > 0.05%
+110        8   0.00%  <99.95%  > 0.05%
+111        4   0.00%  <99.95%  > 0.05%
+112       43   0.00%  <99.95%  > 0.05%
+113        6   0.00%  <99.95%  > 0.05%
+114        7   0.00%  <99.95%  > 0.05%
+115        9   0.00%  <99.95%  > 0.05%
+116       14   0.00%  <99.95%  > 0.05%
+117        4   0.00%  <99.95%  > 0.05%
+118       48   0.00%  <99.95%  > 0.05%
+119       54   0.00%  <99.95%  > 0.04%
+120        2   0.00%  <99.96%  > 0.04%
+121        8   0.00%  <99.96%  > 0.04%
+123       48   0.00%  <99.96%  > 0.04%
+124       12   0.00%  <99.96%  > 0.04%
+125        4   0.00%  <99.96%  > 0.04%
+126        6   0.00%  <99.96%  > 0.04%
+129       11   0.00%  <99.96%  > 0.04%
+130       17   0.00%  <99.96%  > 0.04%
+131       29   0.00%  <99.96%  > 0.04%
+132       11   0.00%  <99.96%  > 0.04%
+133        6   0.00%  <99.96%  > 0.04%
+134        1   0.00%  <99.96%  > 0.04%
+135       25   0.00%  <99.96%  > 0.03%
+136       16   0.00%  <99.97%  > 0.03%
+137        4   0.00%  <99.97%  > 0.03%
+138        4   0.00%  <99.97%  > 0.03%
+139        8   0.00%  <99.97%  > 0.03%
+140        2   0.00%  <99.97%  > 0.03%
+141       14   0.00%  <99.97%  > 0.03%
+142       14   0.00%  <99.97%  > 0.03%
+143       10   0.00%  <99.97%  > 0.03%
+144       16   0.00%  <99.97%  > 0.03%
+145        3   0.00%  <99.97%  > 0.03%
+146       12   0.00%  <99.97%  > 0.03%
+148        5   0.00%  <99.97%  > 0.03%
+149        8   0.00%  <99.97%  > 0.03%
+150        2   0.00%  <99.97%  > 0.03%
+151        2   0.00%  <99.97%  > 0.03%
+152       19   0.00%  <99.97%  > 0.03%
+153        4   0.00%  <99.97%  > 0.03%
+154        4   0.00%  <99.97%  > 0.03%
+155       12   0.00%  <99.97%  > 0.03%
+157        6   0.00%  <99.97%  > 0.03%
+158        6   0.00%  <99.97%  > 0.03%
+159       16   0.00%  <99.97%  > 0.03%
+160        4   0.00%  <99.97%  > 0.03%
+161       14   0.00%  <99.97%  > 0.02%
+162      126   0.01%  <99.98%  > 0.02%
+163       72   0.00%  <99.98%  > 0.02%
+164        6   0.00%  <99.98%  > 0.02%
+165        5   0.00%  <99.98%  > 0.01%
+166        2   0.00%  <99.99%  > 0.01%
+167        1   0.00%  <99.99%  > 0.01%
+168        6   0.00%  <99.99%  > 0.01%
+170        6   0.00%  <99.99%  > 0.01%
+171        6   0.00%  <99.99%  > 0.01%
+172       20   0.00%  <99.99%  > 0.01%
+173        1   0.00%  <99.99%  > 0.01%
+174        1   0.00%  <99.99%  > 0.01%
+175       38   0.00%  <99.99%  > 0.01%
+176       18   0.00%  <99.99%  > 0.01%
+177       15   0.00%  <99.99%  > 0.01%
+178        3   0.00%  <99.99%  > 0.01%
+179        3   0.00%  <99.99%  > 0.01%
+180       24   0.00%  <99.99%  > 0.01%
+181        7   0.00%  <99.99%  > 0.01%
+182        1   0.00%  <99.99%  > 0.01%
+185        3   0.00%  <99.99%  > 0.01%
+190        3   0.00%  <99.99%  > 0.01%
+191        2   0.00%  <99.99%  > 0.01%
+192        6   0.00%  <99.99%  > 0.01%
+196        8   0.00%  <99.99%  > 0.01%
+200        9   0.00%  <99.99%  > 0.01%
+213       18   0.00%  <99.99%  > 0.01%
+216       36   0.00%  <99.99%  > 0.00%
+217       12   0.00%  <100.00%  > 0.00%
+244        6   0.00%  <100.00%  > 0.00%
+247        9   0.00%  <100.00%  > 0.00%
+248        3   0.00%  <100.00%  > 0.00%
+255      326   0.02%  <100.00%  >-0.01%
+-----------------------
+name = Hash
+  0       19   0.07%  < 0.00%  >99.93%
+  1    22359  83.06%  < 0.07%  >16.87%
+  2      320   1.19%  <83.15%  >15.66%
+  3      425   1.58%  <84.34%  >14.08%
+  4      329   1.22%  <85.92%  >12.86%
+  5      716   2.66%  <87.14%  >10.20%
+  6      158   0.59%  <89.80%  > 9.61%
+  7      147   0.55%  <90.39%  > 9.06%
+  8      117   0.43%  <90.94%  > 8.63%
+  9      252   0.94%  <91.37%  > 7.69%
+ 10      142   0.53%  <92.31%  > 7.17%
+ 11       97   0.36%  <92.83%  > 6.81%
+ 12      144   0.53%  <93.19%  > 6.27%
+ 13       97   0.36%  <93.73%  > 5.91%
+ 14       72   0.27%  <94.09%  > 5.64%
+ 15       70   0.26%  <94.36%  > 5.38%
+ 16      114   0.42%  <94.62%  > 4.96%
+ 17       18   0.07%  <95.04%  > 4.89%
+ 18       15   0.06%  <95.11%  > 4.84%
+ 19        7   0.03%  <95.16%  > 4.81%
+ 20        7   0.03%  <95.19%  > 4.78%
+ 21        5   0.02%  <95.22%  > 4.77%
+ 22        3   0.01%  <95.23%  > 4.76%
+ 23        1   0.00%  <95.24%  > 4.75%
+ 24        2   0.01%  <95.25%  > 4.74%
+ 25        1   0.00%  <95.26%  > 4.74%
+ 27        1   0.00%  <95.26%  > 4.74%
+ 35        1   0.00%  <95.26%  > 4.73%
+ 36     1283   4.77%  <95.27%  >-0.03%
+ 38        1   0.00%  <100.03%  >-0.04%
+
+
+=========================================================
+TheIDE Dest
+-----------------------
+name = Dest
+  0  2019143  34.70%  < 0.00%  >65.30%
+ 14    73304   1.26%  <81.74%  >17.00%
+ 15    54341   0.93%  <83.00%  >16.07%
+ 22    30435   0.52%  <88.96%  >10.52%
+ 23    37915   0.65%  <89.48%  > 9.87%
+ 30    19241   0.33%  <94.20%  > 5.47%
+ 31    23357   0.40%  <94.53%  > 5.06%
+ 46     8272   0.14%  <97.54%  > 2.31%
+ 47     4888   0.08%  <97.69%  > 2.23%
+ 62     6174   0.11%  <98.90%  > 0.99%
+ 63     4641   0.08%  <99.01%  > 0.91%
+-----------------------
+name = Hash
+  0     1338   0.15%  < 0.00%  >99.85%
+ 14    12900   1.49%  <81.84%  >16.67%
+ 15    10799   1.25%  <83.33%  >15.42%
+ 22     8659   1.00%  <90.43%  > 8.57%
+ 23     8886   1.03%  <91.43%  > 7.54%
+ 30     5043   0.58%  <96.99%  > 2.43%
+ 31     3638   0.42%  <97.57%  > 2.01%
+ 46      328   0.04%  <99.59%  > 0.37%
+ 47      230   0.03%  <99.63%  > 0.34%
+ 62       70   0.01%  <99.89%  > 0.10%
+ 63       86   0.01%  <99.90%  > 0.09%
+=================================================
+Bussines logic app
+-----------------------
+name = Dest
+  0   311210  14.63%  < 0.00%  >85.37%
+ 14   236274  11.11%  <79.78%  > 9.11%
+ 15    27626   1.30%  <90.89%  > 7.81%
+ 22     1461   0.07%  <96.12%  > 3.81%
+ 23     1385   0.07%  <96.19%  > 3.74%
+ 30     8730   0.41%  <98.61%  > 0.98%
+ 31     6113   0.29%  <99.02%  > 0.70%
+ 46       57   0.00%  <99.81%  > 0.18%
+ 47       21   0.00%  <99.82%  > 0.18%
+ 62      382   0.02%  <99.88%  > 0.10%
+ 63       51   0.00%  <99.90%  > 0.10%
+-----------------------
+name = Hash
+  0       19   0.07%  < 0.00%  >99.93%
+ 14       72   0.27%  <94.09%  > 5.64%
+ 15       70   0.26%  <94.36%  > 5.38%
+ 22        3   0.01%  <95.23%  > 4.76%
+ 23        1   0.00%  <95.24%  > 4.75%
+ 36     1283   4.77%  <95.27%  >-0.03%
+
+////////////////////////////////////////////////////
+
+  16 B,  26117 allocated (  408 KB),     45 fragmented (    0 KB)
+  32 B,  84407 allocated ( 2637 KB),     48 fragmented (    1 KB)
+  48 B,  16884 allocated (  791 KB),      0 fragmented (    0 KB)
+  64 B,   8897 allocated (  556 KB),    175 fragmented (   10 KB)
+  80 B,  16480 allocated ( 1287 KB),    270 fragmented (   21 KB)
+  96 B,   1845 allocated (  172 KB),    129 fragmented (   12 KB)
+ 112 B,    432 allocated (   47 KB),      0 fragmented (    0 KB)
+ 128 B,   2232 allocated (  279 KB),      0 fragmented (    0 KB)
+ 144 B,    168 allocated (   23 KB),      0 fragmented (    0 KB)
+ 160 B,     77 allocated (   12 KB),     23 fragmented (    3 KB)
+ 176 B,     41 allocated (    7 KB),      5 fragmented (    0 KB)
+ 192 B,     24 allocated (    4 KB),     18 fragmented (    3 KB)
+ 224 B,     50 allocated (   10 KB),      4 fragmented (    0 KB)
+ 288 B,    508 allocated (  142 KB),     10 fragmented (    2 KB)
+ 352 B,     17 allocated (    5 KB),      5 fragmented (    1 KB)
+ 448 B,     47 allocated (   20 KB),      7 fragmented (    3 KB)
+ 576 B,    318 allocated (  178 KB),     11 fragmented (    6 KB)
+ 672 B,      8 allocated (    5 KB),      4 fragmented (    2 KB)
+ 800 B,     35 allocated (   27 KB),      5 fragmented (    3 KB)
+ 992 B,     16 allocated (   15 KB),      4 fragmented (    3 KB)
+1344 B,    276 allocated (  362 KB),      9 fragmented (   11 KB)
+ TOTAL, 158879 allocated ( 6996 KB),    772 fragmented (   91 KB)
+
+.............
+
+   4 B,    811 allocated (    3 KB),    213 fragmented (    0 KB)
+   8 B,    258 allocated (    2 KB),    254 fragmented (    1 KB)
+  16 B,  14878 allocated (  232 KB),    226 fragmented (    3 KB)
+  24 B,  68982 allocated ( 1616 KB),    208 fragmented (    4 KB)
+  32 B,  23844 allocated (  745 KB),     92 fragmented (    2 KB)
+  40 B,  13768 allocated (  537 KB),    104 fragmented (    4 KB)
+  48 B,   6564 allocated (  307 KB),     66 fragmented (    3 KB)
+  56 B,   2990 allocated (  163 KB),      3 fragmented (    0 KB)
+  64 B,   3358 allocated (  209 KB),     34 fragmented (    2 KB)
+  72 B,   2267 allocated (  159 KB),     29 fragmented (    2 KB)
+  80 B,  15465 allocated ( 1208 KB),     39 fragmented (    3 KB)
+  88 B,    393 allocated (   33 KB),     21 fragmented (    1 KB)
+  96 B,   1418 allocated (  132 KB),     52 fragmented (    4 KB)
+ 104 B,    151 allocated (   15 KB),      5 fragmented (    0 KB)
+ 112 B,    235 allocated (   25 KB),     17 fragmented (    1 KB)
+ 120 B,    945 allocated (  110 KB),     75 fragmented (    8 KB)
+ 128 B,   1140 allocated (  142 KB),     12 fragmented (    1 KB)
+ 144 B,    206 allocated (   28 KB),     18 fragmented (    2 KB)
+ 160 B,     44 allocated (    6 KB),      6 fragmented (    0 KB)
+ 176 B,     49 allocated (    8 KB),     20 fragmented (    3 KB)
+ 192 B,     23 allocated (    4 KB),     19 fragmented (    3 KB)
+ 224 B,     24 allocated (    5 KB),     12 fragmented (    2 KB)
+ 256 B,    464 allocated (  116 KB),     16 fragmented (    4 KB)
+ 288 B,     12 allocated (    3 KB),      2 fragmented (    0 KB)
+ 304 B,      5 allocated (    1 KB),      8 fragmented (    2 KB)
+ 336 B,     15 allocated (    4 KB),      9 fragmented (    2 KB)
+ 368 B,      3 allocated (    1 KB),      8 fragmented (    2 KB)
+ 408 B,      9 allocated (    3 KB),     11 fragmented (    4 KB)
+ 448 B,     29 allocated (   12 KB),      7 fragmented (    3 KB)
+ 512 B,    309 allocated (  154 KB),     11 fragmented (    5 KB)
+ 672 B,     13 allocated (    8 KB),      5 fragmented (    3 KB)
+ 816 B,      4 allocated (    3 KB),      1 fragmented (    0 KB)
+1024 B,    253 allocated (  253 KB),     11 fragmented (   11 KB)
+ TOTAL, 158929 allocated ( 6263 KB),   1614 fragmented (  101 KB)
+ 
+----------------------------
+NewCore idmap benchmark, Core2 Duo, 2.7Ghz
+
+Ubuntu64, gcc (GCC) 4.1.2 20060928 (prerelease) (Ubuntu 4.1.1-13ubuntu5)
+	Small
+		U++ allocator 
+			STL hash_map time: 2978 ms 
+			STL map time: 3318 ms 
+			NTL time: 1075 ms
+		Standard allocator
+			STL hash_map time: 3774 ms 
+			STL map time: 4079 ms 
+			NTL time: 1394 ms
+	Large
+		U++ allocator
+			STL hash_map time: 28558 ms 
+			STL map time: 37230 ms 
+			NTL time: 8604 ms
+		Standard allocator
+			STL hash_map time: 36374 ms 
+			STL map time: 43718 ms 
+			NTL time: 10552 ms
+			
diff --git a/uppsrc/plan.txt b/uppsrc/plan.txt
new file mode 100644
index 000000000..c6a60b4bb
--- /dev/null
+++ b/uppsrc/plan.txt
@@ -0,0 +1,549 @@
+
+==========================
+2. udelat kompletni vypis features, tedy mit dobry changelog s daty
+Changelog/Status/Roadmap
+
+==========================
+
+Postupne k doplneni...
+
+Cil: releasnout v nejake podobe UppSrc/Ide jako vyvojovy system do 1.1.2004,
+     nejlepe spolu s GCC3.4 pro Windows, posleze i pro Linux.
+
+Ukoly:
+
+- vytvorit Webove stranky
+- dokoncit otazky kolem problemu s codepage/language
+
+-------------------------------
+
+Opravit StringStream (predelat na StringBuffer...)
+
+Udelat file view pro dlouhe soubory...
+
+Zlobi latence u GUI..
+
+Pada Package organizer... v IDE
+
+> Zatim jsem se na to
+> vysral s tim, ze doplnujici requirement na HotKey je ten, ze pokud cokoli
+> rozumneho provede, tak musi vratit true, ale stalo by za uvahu, jestli tam
+> (a mozna i na obdobne misto v DispatchKey) nedodelat logiku s Ptr<Ctrl>.
+
+FileSel - defaultext pro type
+        - zjistit type
+        - vyber directory v Ide - zobrazovat fily
+
+SqlIsNull
+
+time_t x FileTime v Linuxu
+
+SqlLogin.cfg v package....
+
+
+
+Problem s DOC ve .sch
+
+Doplnit dalsi makra -D - datum, cas, zdrojovy soubor atd...
+
+Nezapomenout odstranit chraset WIN1250 bugtrap.
+
+Rename empty file.
+
+Podpora charset v LayDesu.
+
+Problem s otevrenim v designeru x okne.
+
+Save progress u LayDes
+
+SO link
+
+Cislovani radek nepochopitelne uletava (Ctrl-F10 apod).
+
+Dodelat framy do LayDes.
+
+DropPusher -> DropList...
+
+UTF8 se rozmrdalo.
+
+Zamknout package proti kompilaci...
+
+Zrusit SetIdeState
+
+BLITZ porad jeste neni optimalni - kombinaci pro zjisteni problemu
+separatnich souboru je potreba vylepsit !
+
+Schedule compile file...
+
+Oddelit package properties, aby se daly videt rovnou.
+
+ArrayCtrl::SetNoune aby to nebyl porad "row" pri Insert apod.
+
+Promyslet jeste jednout ChildGotFocus...
+
+LNG_ -> int
+
+Ctrl+F5 pokud jiz aplikace bezi v konzoli!
+
+zkontrolovat TransferFileCache !
+
+withdropchoice prestalo chodit (LngIdentRenameLayout)
+
+GCC builder / link options zatim asi nechodi (mozna ani MSC)_
+
+Open file v closed package vyresit !
+
+Kompilace IDIS s GNU.
+
+Nesedi .usc verze switche (viz. EN)
+
+QtfCtrl dodelat do .usc
+
+.usc Zvetsit Label u Labelu...
+
+Insert layout by mel byt lepsi (zrejme bud rovnou zacit editovat, nebo specialni funkce na to).
+
+SqlConfig.cfg proc se dava do adresare?!
+
+Nechodi paste do LayDesu z Alt-F12
+
+RichText:
+* v tomhle nemam uplne jasno: pokud ma prvni odstavec textu nastaveno 'page
+break before', udela se na zacatku dokumentu prazdna stranka. Z jisteho
+pohledu je to logicke, z jineho dost oprudive. Sam nevim, co mi prijde jako
+'spravnejsi', zatim jsem si to osetril vnitrne.
+
+RichText: Vlozeni vice paragrafu z Wordu do 3 radkoveho textu - posledni se pripojil ZA text
+nasledujiciho paragrafu misto pred nej...
+
+Debilni Word a RTF paste obrazku... a pripadne dodelat .PNG
+
+Nechodi Qtf v .usc; a stejne by bylo dobry ho zlepsit...
+
+Nechodi option na target override
+
+Nechodi minimal debug info u GDB
+
+Kdyz se zapise v LayDesu promenna, ukazuje se chvili zelene
+
+F5 debug
+
+Lepsi zadavani jazyku v LayDes
+
+
+Rescan .usc po PackageOrganizer...
+
+int64 a uint64 do Formatu a Convertu
+
+>
+> Taky mi prijde, ze nejak moc nabobtnalo to menu "Edit fields" v LayDesu.
+> Kdyby to tak slo rozdelit do dvou, bylo by to super. Treba by slo udelat
+> "Date / time edits", "Numeric edits" a "Text edits", do kterych by slo
+> zahrnout
+> i DocEdit a TextEdit. Co rikas?
+
+
+jacob@jacob.remcomp.fr (gdb / AMD64)
+
+---
+info line *0x7800861D
+No line number information available for address 0x7800861d <endthreadex+285>
+
+Buhviproc skoci do mt.h...
+---
+
+Console Remove child z frameu - nerefreshoval se frame!?
+
+---
+
+Kdyz mas vypnute 'stop on errors' a prerusis kompilaci pomoci F7, nezastavi
+se okamzite, ale projedou se vsechny package az do konce. To je dost
+oprudive, protoze na konzoli odscrolluje prave ten text, kvuli kteremu to
+casto tim F7 zastavujes (napr. nejaka chybova hlaska).
+
+--------
+SqlArray ma problem, kdyz se Esc editfield - zrusi to insert... (i kdyz byl predtim potvrzeny)
+(tezko rict co s tim...)
+---------
+Problem - editace .lay a double click vede k dvojnasobnemu otevreni...
+
+Ostatne, co ReadOnly u .lay ?
+
+---------
+Pri otevreni package bez cfg by to melo skocit na nejaky soubor, aby to nevypadalo tak blbe...
+
+---------
+Ignoruje se minsize u dialogu...
+
+---------
+
+Pro zmenu: drobny opruzik v IDE. Kdyz vyhazujes soubory z package (menu nebo
+Alt+Delete) a smazes 'zavreny' separator, chova se to celkem pochopitelne,
+ovsem trochu nelogicky tak, ze soubory 'v nem' tise odmigruji 'dovnitr'
+separatoru nad nim, takze pokud mas ten taky zavreny, tak ti vizualne ty
+soubory zmizi. Chapu, ze je to do jiste miry problem 'patchoviteho'
+charakteru teto upravy, ale jinak to funguje myslim bezvadne, takze touto
+drobnou opravou by to ziskalo jeste vyrazne na krase. Moznosti je podle meho
+nekolik:
+
+* pred smazanim 'zavreneho' separatoru tento rozbalit, takze se tam po jeho
+smazani ty soubory objevi.
+* smazani 'zavreneho' separatoru nedovolit (oprudit pipnutim)
+* smazat se separatorem i soubory v nem (logicke, ale drsne)
+
+----------
+TIMING MouseMove Sync : 500.0 ms -  25.0 ms (500.0 ms / 20 ), min:  18.0 ms, max:  30.0 ms, nesting: 1 - 20
+TIMING Paint          :   2.8 s  -   6.3 ms (  2.8 s  / 442 ), min:   4.0 ms, max: 240.0 ms, nesting: 1 - 442
+TIMING SyncItems      : 268.0 ms -   8.6 ms (268.0 ms / 31 ), min:   2.0 ms, max:  12.0 ms, nesting: 1 - 31
+TIMING UpdateTip      : 172.8 ms -  15.8 us (175.0 ms / 10960 ), min:   0.0 us, max:   1.0 ms, nesting: 1 - 10960
+TIMING SetToolBar     :   1.3 s  -   7.0 ms (  1.3 s  / 189 ), min:   1.0 ms, max:   9.0 ms, nesting: 1 - 189
+
+----------
+FindInFiles pro package, rovnou hledat id.
+
+----------
+Pokus/Temp
+
+nechodi v package template!
+
+---------
+Sablony do editace textu.
+
+----------
+Pri zkoumani nestingu v syntax-highlightingu oddelovat tridy....
+
+----------
+Prece jenom obcas se zblbne Undo/Redo asi...
+
+----------
+
+Chybi mezera za linker option! (alespon ve starem Ide 0.1.6, viz ide / GCC options).
+
+----------
+Je vazne potreba se mrknout na 256 barevny mod...
+
+----------
+Klikani na HeaderCtrl dela spatny cursor
+
+----------
+Horizontalni scrollbar - udelat zapnutej porad...
+
+----------
+Zjednodusit F5 u MSC...
+
+----------
+XFT -> NOXFT
+
+----------
+x STL min/max vyresit
+
+-----------
+lay .usc "Vodoměrné stanice"
+
+.usc QtfCtrl čeština
+
+-----------
+Skocit na soubor po startu, kdyz neni zadny
+
+-----------
+Scrollbar v konsoli (pouze on demand)
+
+-----------
+Splitter dodelat do Package organizeru
+
+-----------
+BLITZ - porovnavat s datumem blitzu - pokud je starsi, tak nechat blitzu...
+
+-----------
+-----------
+LayDes rozchodit poradne kodovani!
+
+-----------
+- Find in files - searching word(s) in the current project files, not only
+                  in selected folder
+- Editor - line numbers!
+
+-----------
+Sort flag list!
+
+-----------
+Compiler options to build method!!!
+
+-----------
+fix .upt for GUI_APP_MAIN and for app icons...
+
+-----------
+Jazykove Laydes, novy label, zapsat retezec v jazyce, build, smaze se.... (neulozi se...)
+
+-----------
+SetMain package - vynulovat output mode...
+
+-----------
+Additional dependence pridat k headeru -> expandovat (udela Tomas)
+
+-----------
+Reload file with encoding -> nastavit novy encoding do properties souboru
+
+-hm, zda se ze to chodi - takze otazka je kdy ne....
+-----------
+> Btw, a general question about "using" any package or file: is it possible
+> to "inactivate" it under certain circumstances: e.g. "when flag NO_QWE
+> is defined, then dont "use" package qwe or dont compile file Qwe.cpp"
+> (other than having #ifndef NO_QWE in Qwe.cpp or all qwe-package files).
+-----------
+Dodelat splitter!
+
+-----------
+Promyslet childy!
+
+=======================
+GCC DLL ULD test:
+
+posunuly se hotkeye (Ctrl-F5 na Run options)
+
+-----------------------
+Recosider/repair so version
+
+-----------------------
+Projednat GetStdSize -> zrusit!
+
+-----------------------
+-----------------------
+V IDE si lip pamatovat package a index ze kterych byl nacten soubor...
+
+-----------------------
+Jeste jedna picovina k IDE: uz delsi dobu me prudi, ze kdyz se zacne
+kompilovat, tak pokud chces behem toho buildu neco udelat s menu (napriklad
+zapnout / vypnout priznak 'verbose' nebo tak neco), tak se menu na konci
+kazdeho buildovaciho kroku zavre (takze to musis stihnout hrozne rychle).
+Nevylucuji, ze jsem to tam nekdy pred casem zanesl ja v souvislosti s tim
+jazykovym editorem nebo necim podobnym; otazkou zustava, jestli se na to mam
+podivat, nebo jestli to zkusis ty. Skutecnosti je, ze nejaky release by to
+chtelo, abychom trochu posimrali pod pytlikem to nase 3000. misto ve
+statistice SourceForge ;-), takze pokud na tom nejak finisujes, tak bude
+lepsi se na to docasne vysrat a resit to az posleze.
+
+------------
+TreeCtrl - lepsi by asi byly dve value nebo neco tak...
+
+------------
+Opravit bombs
+
+------------
+ISO 8859-1 kodovani divne po paste (Zora).
+
+------------
+SqlDialect zrusit a predelat na namespace
+
+-----------
+Vytvareni package v podadresari pomoci package creatoru.
+
+-----------
+GUI ST click optional name -> prazdne!!!
+
+----------
+PreInsert / PreDelete / PostInsert / PostDelete Highlight u editoru
+
+----------
+> - In line: #include <float.h>, word "float" is highlighted as if it was
+> keyword.
+
+----------
+Po kompilaci se prepne soubor...
+
+----------
+Separatory v Query!!!
+
+----------
+
+-----------
+Pekny opruz: omylem jsem pouzil
+
+if(text == "EE8MSWIN1250")
+
+pricemz text se zmenil ze Stringu na WString. Vzniklo to, ze zkonvertoval text na void * a porovnal jeho adresu s tim konstatnim stringem.
+
+Chtelo by to zvazit, jestli nedodelat kombinovane operatory do WStringu, aby to temhle prasarnam zabranilo.
+
+-----------------------
+WString((wchar *)event.u.LoadDll.lpImageName)
+
+f:\uppsrc\Core\String.h(482) : fatal error C1001: INTERNAL COMPILER ERROR
+        (compiler file 'msc1.cpp', line 2701)
+         Please choose the Technical Support command on the Visual C++
+         Help menu, or open the Technical Support help file for more information
+
+	template <class T> // GNU3.3 overload resolution bug patch
+	explicit WString(const T& object) : B(object.operator WString()) {}
+
+----------------------
+IsNull(int64) krachuje na _I64_MIN!!!
+
+----------------------
+upp.upp misto jmeno.upp
+
+----------------------
+PS: One small feature request to IDE. Ability to define key bind to switch
+between cpp and h file.
+
+----------------------------
+PDB DEBUGGER
+
+-	nechodi union
+
+----------------------------
+No, kdyz uz tak prudim... Ono jak se v "file properties" zadava "highlighting style", tak by mozna nebylo spatne moct tam nastavit i neco jako "build style"... pricemz defaultne by se to bralo samozrejme podle tech pripon. Je dost ugly, ze v msc/gccbuilderu musi byt ted natvrdo hacky na asi 10 ruznych zdrojakovych pripon...
+
+----------------------------
+Dodelat jazyky: Prekodovani jazyku, default LNG_ENGLISH (+ IdisMisc),
+
+----------------------------
+Problem s Krizenim serializace a RefreshLayout... Serializace Ctrlu by vzdycky mela mit nejaky Magic...
+aby spadla hned...
+
+----------------------------
+Kdyby te nahodou neco napadlo, uz asi 3 hodiny resim neskutecne debilni problem: delam to OCX pro ty Nemce a zjistil jsem podivnou vec: kdyz vytvorim ten OCX child, je vsechno v pohode. Ale kdyz udelam TopWindow (napr. Prompt), tak Windows mi pro jeho hwnd vraci IsWindowUnicode() -> false (prestoze samozrejme ten UPP-CLASS je zaregistrovany pres RegisterClassW). Spy mi pro ten child normalne ukazuje, ze jeho WindowProc je typu (unicode), zatimco pro to TopWindow ukazuje misto skutecne adresy WindowProc jakysi stub a pise, ze neni unicode. Jako by si Windows z nejakeho duvodu usmyslely, ze to TopWindow (jako owner ma NULL) nemuzou vytvorit jako (unicode). Nenapada te, cim by to mohlo byt? Pokud na to neprijdu, budu zrejme muset vzit jako fakt, ze Windows v urcite situaci odmitnou okno vytvorit jako Unicode, a velmi oprudive nahradit IsWinNT() vsude v Core zrejme tim volanim IsWindowUnicode, coz se mi teda vubec nechce...
+trc (17:15) :
+Tak fakt netusim, o co tam jde. Ted jsem se vyprudil a udelal jsem si OCX control cely v MFC. Zapnul jsem u nej, ze je Unicode, a udelal jsem (pomoci MFC) hlavni okno. Prekvapive ho ty Windows taky udelaly jako ANSI, nikoli Unicode. Vsechny childy naproti tomu se v pohode delaji jako Unicode. Zacinam mit neprijemny pocit, ze to muze byt opravdu nejaky problem (resp. omezeni) ve Windows - neco jako ze u OCX controlu se hlavni okno udela jako unicode napr. jenom tehdy, pokud i zakladni aplikace, ktera ten control vytvari, je unicode, nebo tak neco. Fakt nevim, co s tim...
+trc (17:19) :
+Nastesti ta podstatna mista, kde se to resi v CtrlCore, jsou jenom ctyri: 1) SetWindowText, 2) WM_CHAR, 3) + 4) DefWindowProc. Asi mi nezbyde, nez na techto mistech pro tento okamzik nahradit IsWinNT() -> IsWindowUnicode(hwnd). Do budoucna by bohuzel zrejme korektnejsi bylo udelat prasarnu, ze by se pri vytvareni TopWindow fyzicky vytvorily 2 HWND: jedno odpovidajici tomu Overlapped window, do ktereho by se udelalo druhe jako child (se SizePos). Tim by se melo zajistit, aby klavesove zpravy do deti chodily spravne v Unicode. Do toho se ted poustet rozhodne nebudu, to je prace na tyden...
+trc (17:22) :
+Jenom na okraj: pri tom zkoumani jsem taky prisel na to, ze se nikde nenastavuje Ctrl::hInstance. Pro tuto chvili jsem to soupnul do InitWin32, ale prislo by mi jako elegantnejsi ho uplne vyhodit a pouzivat misto toho AppGetHandle().
+
+----------------------------
+ I prefer adding
+compiler option with
+      processor type to using combo box.
+      I know that the next release of upp has great new fetures (code
+browser, bulit-in debugger)
+      but please don't forget about dialog with options to change the
+syntax highlighting colors.
+
+----------------------
+Polymorfni typy zjistovat pomoci vtable v debuggeru
+
+----------------------
+'ve created a toolbar in my application. The height of the toolbar is
+equal to the heighest image
+assigned to it (in my case it's 18). Fine. But then I added EditString
+control to the toolbar:
+
+bar.Add(edtQueryNum, Size(100,15));
+
+and the height of the edtQueryNum isn't 15 but 18. For me it doesn't look
+nice.
+Is it possible to extend add routine in next snapshot/release
+ from
+Add(Ctrl &, Size &)
+to
+Add(Ctrl &, Size &, bool dontStrechCtrl = false);
+
+if the dontStrechCtrl is true the control added to the toolbar should be
+verticaly centered.
+
+---------------------
+Code browswe - it woluld be cool if I could open it on the right side
+of ide or
+    had a button to switch view between file/project explorer and code
+browser.
+
+---------------------
+Laydes - RichEdit - ObjectSizeLayout - sirka???
+
+---------------------
+Automatic VC++ install -> IDE directory to path
+
+---------------------
+Environment variables.
+
+=======================
+
+> PS: Ctrl-C (ctrl-insert) Ctrl-V works in every edit control. I think
+> shift-insert
+>      sholud work too.
+
+=======================
+String na nulte urovni delsi v PDB debuggeru
+
+=======================
+Kouknout se na rychlost pri prepinani .lay (asi nacitani?!)
+
+Aktualni layout by po nacteni mel byt videt...
+
+=======================
+RichText:
+
+View: FindPara
+Editor: Formating SetStyle
+
+-----------------------
+Copy callstack to clipboard
+
+-----------------------
+Problem s CtrlPaint u WithDropChoice, pokud Ctrl je neznamy...
+
+-----------------------
+Browse Current file...
+
+-----------------------
+StdFont v XFT doresit... (asi screenshot?)
+
+-----------------------
+RELEASE je !DEBUG
+
+takze STATIC zavest!
+
+------------------------
+DocEdit needs TAB!
+
+------------------------
+Bug in TheIDE VC debugger - oo.exe, OA_Adresa explore...
+
+------------------------
+RichTextCtrl - proc je Null ?
+
+------------------------
+Problem se switch v debugger (jmp [asdf])
+
+------------------------
+AsQtf - GetUsedStyles!!!!
+
+------------------------
+u TopWindow owner - udelat out-of-order
+
+
+------------------------
+%% !!!
+
+------------------------
+Zablbnulo proporcionalni resizovani ArrayCtrlu....
+
+=======================
+Linux:
+	zda se ze cancel build nezrusi kompilatory....
+	Hlasi BadWindow na ChangeProperty
+	Neudrzuje se pozice okna...
+	Kasle to na min/max okna (lze resizovat i neresizovatelne)
+	OpenWebBrowser pomoci mozilla etc...
+
+	Nechodi aa.cpp:
+		Assertion failed in /upp/uppsrc/Image/aa.cpp, line 1799
+		dest.bpp == 24 && (src.bpp == 24 || src.bpp == 8 || src.bpp == 4 || src.bpp == 1)
+
+	http://www.daimi.au.dk/~kasperd/comp.os.linux.development.faq.html#zombie
+
+	cxa-at-exit do bm
+
+======================
+PDF:
+	Symbol font a ostatni unicode...
+
+----------------------
+TUTORIAL
+--------
+Ctrl-value
+Ctrl-Callback
+Format
+Qtf
+Frame
+Modal dialog (Breaker, OK, Cancel, for(;;))
diff --git a/uppsrc/plugin/astyle/ASBeautifier.cpp b/uppsrc/plugin/astyle/ASBeautifier.cpp
new file mode 100644
index 000000000..4dbe9c6d9
--- /dev/null
+++ b/uppsrc/plugin/astyle/ASBeautifier.cpp
@@ -0,0 +1,1975 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *   ASBeautifier.cpp
+ *
+ *   This file is a part of "Artistic Style" - an indentation and
+ *   reformatting tool for C, C++, C# and Java source files.
+ *   http://astyle.sourceforge.net
+ *
+ *   The "Artistic Style" project, including all files needed to
+ *   compile it, is free software; you can redistribute it and/or
+ *   modify it under the terms of the GNU Lesser General Public
+ *   License as published by the Free Software Foundation; either
+ *   version 2.1 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 Lesser General Public License for more details.
+ *
+ *   You should have received a copy of the GNU Lesser General Public
+ *   License along with this project; if not, write to the
+ *   Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ *   Boston, MA  02110-1301, USA.
+ *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ */
+
+ /*
+ 	2008-01-26 Patches by Massimo Del Fedele :
+ 		- modified sources to use Ultimate++ containers instead std:: ones
+ 		- fixed memory leaks based on bug report 1804791 submitted by Eran Ifrah
+ 		- modified to work with unicode
+ */
+#include "astyle.h"
+
+
+#define INIT_CONTAINER(container, value)     {if ( (container) != NULL ) delete (container); (container) = (value); }
+#define DELETE_CONTAINER(container)          {if ( (container) != NULL ) delete (container); }
+
+
+namespace astyle
+{
+Vector<const WString*> ASBeautifier::headers;
+Vector<const WString*> ASBeautifier::nonParenHeaders;
+Vector<const WString*> ASBeautifier::preBlockStatements;
+Vector<const WString*> ASBeautifier::assignmentOperators;
+Vector<const WString*> ASBeautifier::nonAssignmentOperators;
+
+
+/*
+ * initialize the static vars
+ */
+void ASBeautifier::initStatic()
+{
+	static int beautifierFileType = 9;     // initialized with an invalid type
+
+	if (fileType == beautifierFileType)    // don't build unless necessary
+		return;
+
+	beautifierFileType = fileType;
+
+	headers.clear();
+	nonParenHeaders.clear();
+	assignmentOperators.clear();
+	nonAssignmentOperators.clear();
+	preBlockStatements.clear();
+
+	ASResource::buildHeaders(headers, fileType, true);
+	ASResource::buildNonParenHeaders(nonParenHeaders, fileType, true);
+	ASResource::buildAssignmentOperators(assignmentOperators);
+	ASResource::buildNonAssignmentOperators(nonAssignmentOperators);
+	ASResource::buildPreBlockStatements(preBlockStatements);
+
+//	cout << "beaut" << endl;
+}
+
+/**
+ * ASBeautifier's constructor
+ */
+ASBeautifier::ASBeautifier()
+{
+	waitingBeautifierStack = NULL;
+	activeBeautifierStack = NULL;
+	waitingBeautifierStackLengthStack = NULL;
+	activeBeautifierStackLengthStack = NULL;
+
+	headerStack  = NULL;
+	tempStacks = NULL;
+	blockParenDepthStack = NULL;
+	blockStatementStack = NULL;
+	parenStatementStack = NULL;
+	bracketBlockStateStack = NULL;
+	inStatementIndentStack = NULL;
+	inStatementIndentStackSizeStack = NULL;
+	parenIndentStack = NULL;
+	sourceIterator = NULL;
+
+	isMinimalConditinalIndentSet = false;
+	shouldForceTabIndentation = false;
+
+	setSpaceIndentation(4);
+	setMaxInStatementIndentLength(40);
+	setClassIndent(false);
+	setSwitchIndent(false);
+	setCaseIndent(false);
+	setBlockIndent(false);
+	setBracketIndent(false);
+	setNamespaceIndent(false);
+	setLabelIndent(false);
+	setEmptyLineFill(false);
+	fileType = C_TYPE;
+	setCStyle();
+	setPreprocessorIndent(false);
+}
+
+/**
+ * ASBeautifier's copy constructor
+ */
+ASBeautifier::ASBeautifier(const ASBeautifier &other)
+{
+	waitingBeautifierStack = NULL;
+	activeBeautifierStack = NULL;
+	waitingBeautifierStackLengthStack = NULL;
+	activeBeautifierStackLengthStack = NULL;
+
+	headerStack  = new WithDeepCopy<Vector<const WString*> >;
+	*headerStack <<= *other.headerStack;
+
+	tempStacks = new WithDeepCopy<Vector<Vector<const WString*>*> >;
+	WithDeepCopy<Vector<Vector<const WString*>*> >::iterator iter;
+	for (iter = other.tempStacks->begin();
+	        iter != other.tempStacks->end();
+	        ++iter)
+	{
+		WithDeepCopy<Vector<const WString*> > *newVec = new WithDeepCopy<Vector<const WString*> >;
+		*newVec = **iter;
+		tempStacks->push_back(newVec);
+	}
+	blockParenDepthStack = new WithDeepCopy<Vector<int> >;
+	*blockParenDepthStack = *other.blockParenDepthStack;
+
+	blockStatementStack = new WithDeepCopy<Vector<bool> >;
+	*blockStatementStack = *other.blockStatementStack;
+
+	parenStatementStack =  new WithDeepCopy<Vector<bool> >;
+	*parenStatementStack = *other.parenStatementStack;
+
+	bracketBlockStateStack = new WithDeepCopy<Vector<bool> >;
+	*bracketBlockStateStack = *other.bracketBlockStateStack;
+
+	inStatementIndentStack = new WithDeepCopy<Vector<int> >;
+	*inStatementIndentStack = *other.inStatementIndentStack;
+
+	inStatementIndentStackSizeStack = new WithDeepCopy<Vector<int> >;
+	*inStatementIndentStackSizeStack = *other.inStatementIndentStackSizeStack;
+
+	parenIndentStack = new WithDeepCopy<Vector<int> >;
+	*parenIndentStack = *other.parenIndentStack;
+
+	sourceIterator = other.sourceIterator;
+
+	// protected variables
+	fileType = other.fileType;
+	isCStyle = other.isCStyle;
+	isJavaStyle = other.isJavaStyle;
+	isSharpStyle = other.isSharpStyle;
+
+	// variables set by ASFormatter
+	// must also be updated in preprocessor
+	inLineNumber = other.inLineNumber;
+	outLineNumber = other.outLineNumber;
+	lineCommentNoBeautify = other.lineCommentNoBeautify;
+	isNonInStatementArray = other.isNonInStatementArray;
+
+	// private variables
+	indentString = other.indentString;
+	currentHeader = other.currentHeader;
+	previousLastLineHeader = other.previousLastLineHeader;
+	immediatelyPreviousAssignmentOp = other.immediatelyPreviousAssignmentOp;
+	probationHeader = other.probationHeader;
+	isInQuote = other.isInQuote;
+	isInComment = other.isInComment;
+	isInCase = other.isInCase;
+	isInQuestion = other.isInQuestion;
+	isInStatement = other.isInStatement;
+	isInHeader = other.isInHeader;
+	isInOperator = other.isInOperator;
+	isInTemplate = other.isInTemplate;
+	isInDefine = other.isInDefine;
+	isInDefineDefinition = other.isInDefineDefinition;
+	classIndent = other.classIndent;
+	isInClassHeader = other.isInClassHeader;
+	isInClassHeaderTab = other.isInClassHeaderTab;
+	switchIndent = other.switchIndent;
+	caseIndent = other.caseIndent;
+	namespaceIndent = other.namespaceIndent;
+	bracketIndent = other.bracketIndent;
+	blockIndent = other.blockIndent;
+	labelIndent = other.labelIndent;
+	preprocessorIndent = other.preprocessorIndent;
+	isInConditional = other.isInConditional;
+	isMinimalConditinalIndentSet = other.isMinimalConditinalIndentSet;
+	shouldForceTabIndentation = other.shouldForceTabIndentation;
+	emptyLineFill = other.emptyLineFill;
+	backslashEndsPrevLine = other.backslashEndsPrevLine;
+	blockCommentNoIndent = other.blockCommentNoIndent;
+	blockCommentNoBeautify = other.blockCommentNoBeautify;
+	previousLineProbationTab = other.previousLineProbationTab;
+	minConditionalIndent = other.minConditionalIndent;
+	parenDepth = other.parenDepth;
+	indentLength = other.indentLength;
+	blockTabCount = other.blockTabCount;
+	leadingWhiteSpaces = other.leadingWhiteSpaces;
+	maxInStatementIndent = other.maxInStatementIndent;
+	templateDepth = other.templateDepth;
+	prevFinalLineSpaceTabCount = other.prevFinalLineSpaceTabCount;
+	prevFinalLineTabCount = other.prevFinalLineTabCount;
+	defineTabCount = other.defineTabCount;
+	quoteChar = other.quoteChar;
+	prevNonSpaceCh = other.prevNonSpaceCh;
+	currentNonSpaceCh = other.currentNonSpaceCh;
+	currentNonLegalCh = other.currentNonLegalCh;
+	prevNonLegalCh = other.prevNonLegalCh;
+}
+
+/**
+ * ASBeautifier's destructor
+ */
+ASBeautifier::~ASBeautifier()
+{
+	DELETE_CONTAINER(headerStack);
+	DELETE_CONTAINER(blockParenDepthStack);
+	DELETE_CONTAINER(blockStatementStack);
+	DELETE_CONTAINER(parenStatementStack);
+	DELETE_CONTAINER(bracketBlockStateStack);
+	DELETE_CONTAINER(inStatementIndentStack);
+	DELETE_CONTAINER(inStatementIndentStackSizeStack);
+	DELETE_CONTAINER(parenIndentStack);
+
+	//this two were missing...
+	DELETE_CONTAINER(waitingBeautifierStackLengthStack);
+	DELETE_CONTAINER(activeBeautifierStackLengthStack);
+
+	//the correct way to release tempStacks, waitingBeautifierStack and activeBeautifierStack
+	if(tempStacks)
+	{
+		Vector< Vector<const WString*>* >::iterator iter = tempStacks->begin();
+		for(; iter != tempStacks->end(); iter++)
+			delete *iter;
+		tempStacks->clear();
+		delete tempStacks;
+		tempStacks = NULL;
+	}
+
+	if(waitingBeautifierStack)
+	{
+		Vector<ASBeautifier*>::iterator iter = waitingBeautifierStack->begin();
+		for(; iter != waitingBeautifierStack->end(); iter++)
+			delete *iter;
+		waitingBeautifierStack->clear();
+		delete waitingBeautifierStack;
+		waitingBeautifierStack = NULL;
+	}
+
+	if(activeBeautifierStack)
+	{
+		Vector<ASBeautifier*>::iterator iter = activeBeautifierStack->begin();
+		for(; iter != activeBeautifierStack->end(); iter++)
+			delete *iter;
+		activeBeautifierStack->clear();
+		delete activeBeautifierStack;
+		activeBeautifierStack = NULL;
+	}
+}
+
+/**
+ * initialize the ASBeautifier.
+ *
+ * init() should be called every time a ABeautifier object is to start
+ * beautifying a NEW source file.
+ * init() recieves a pointer to a DYNAMICALLY CREATED ASSourceIterator object
+ * that will be used to iterate through the source code. This object will be
+ * deleted during the ASBeautifier's destruction, and thus should not be
+ * deleted elsewhere.
+ *
+ * @param iter     a pointer to the DYNAMICALLY CREATED ASSourceIterator object.
+ */
+void ASBeautifier::init(ASSourceIterator *iter)
+{
+	sourceIterator = iter;
+	init();
+}
+
+/**
+ * initialize the ASBeautifier.
+ */
+void ASBeautifier::init()
+{
+	initStatic();
+
+	INIT_CONTAINER(waitingBeautifierStack,  new Vector<ASBeautifier*>);
+	INIT_CONTAINER(activeBeautifierStack,  new Vector<ASBeautifier*>);
+
+	INIT_CONTAINER(waitingBeautifierStackLengthStack, new Vector<int>);
+	INIT_CONTAINER(activeBeautifierStackLengthStack, new Vector<int>);
+
+	INIT_CONTAINER(headerStack,  new WithDeepCopy<Vector<const WString*> >);
+	INIT_CONTAINER(tempStacks, new WithDeepCopy<Vector<Vector<const WString*>*> >);
+	tempStacks->push_back(new Vector<const WString*>);
+
+	INIT_CONTAINER(blockParenDepthStack, new WithDeepCopy<Vector<int> >);
+	INIT_CONTAINER(blockStatementStack, new WithDeepCopy<Vector<bool> >);
+	INIT_CONTAINER(parenStatementStack, new WithDeepCopy<Vector<bool> >);
+
+	INIT_CONTAINER(bracketBlockStateStack, new WithDeepCopy<Vector<bool> >);
+	bracketBlockStateStack->push_back(true);
+
+	INIT_CONTAINER(inStatementIndentStack, new WithDeepCopy<Vector<int> >);
+	INIT_CONTAINER(inStatementIndentStackSizeStack, new WithDeepCopy<Vector<int> >);
+	inStatementIndentStackSizeStack->push_back(0);
+	INIT_CONTAINER(parenIndentStack, new WithDeepCopy<Vector<int> >);
+
+	immediatelyPreviousAssignmentOp = NULL;
+	previousLastLineHeader = NULL;
+	currentHeader = NULL;
+
+	isInQuote = false;
+	isInComment = false;
+	isInStatement = false;
+	isInCase = false;
+	isInQuestion = false;
+	isInClassHeader = false;
+	isInClassHeaderTab = false;
+	isInHeader = false;
+	isInOperator = false;
+	isInTemplate = false;
+	isInConditional = false;
+	templateDepth = 0;
+	parenDepth = 0;
+	blockTabCount = 0;
+	leadingWhiteSpaces = 0;
+	prevNonSpaceCh = '{';
+	currentNonSpaceCh = '{';
+	prevNonLegalCh = '{';
+	currentNonLegalCh = '{';
+	quoteChar = ' ';
+	prevFinalLineSpaceTabCount = 0;
+	prevFinalLineTabCount = 0;
+	probationHeader = NULL;
+	backslashEndsPrevLine = false;
+	isInDefine = false;
+	isInDefineDefinition = false;
+	defineTabCount = 0;
+	lineCommentNoBeautify = false;
+	blockCommentNoIndent = false;
+	blockCommentNoBeautify = false;
+	previousLineProbationTab = false;
+	isNonInStatementArray = false;
+	inLineNumber = -1;           // for debugging
+	outLineNumber = 0;           // for debugging
+}
+
+/**
+ * set indentation style to C/C++.
+ */
+void ASBeautifier::setCStyle()
+{
+	fileType = C_TYPE;
+	isCStyle     = true;
+	isJavaStyle  = false;
+	isSharpStyle = false;
+}
+
+/**
+ * set indentation style to Java.
+ */
+void ASBeautifier::setJavaStyle()
+{
+	fileType = JAVA_TYPE;
+	isJavaStyle  = true;
+	isCStyle     = false;
+	isSharpStyle = false;
+}
+
+/**
+ * set indentation style to C#.
+ */
+void ASBeautifier::setSharpStyle()
+{
+	fileType = SHARP_TYPE;
+	isSharpStyle = true;
+	isCStyle     = false;
+	isJavaStyle  = false;
+}
+
+/**
+ * indent using one tab per indentation
+ */
+void ASBeautifier::setTabIndentation(int length, bool forceTabs)
+{
+	indentString = "\t";
+	indentLength = length;
+	shouldForceTabIndentation = forceTabs;
+
+	if (!isMinimalConditinalIndentSet)
+		minConditionalIndent = indentLength * 2;
+}
+
+/**
+ * indent using a number of spaces per indentation.
+ *
+ * @param   length     number of spaces per indent.
+ */
+void ASBeautifier::setSpaceIndentation(int length)
+{
+	indentString = WString(' ', length);
+	indentLength = length;
+
+	if (!isMinimalConditinalIndentSet)
+		minConditionalIndent = indentLength * 2;
+}
+
+/**
+ * set the maximum indentation between two lines in a multi-line statement.
+ *
+ * @param   max     maximum indentation length.
+ */
+void ASBeautifier::setMaxInStatementIndentLength(int max)
+{
+	maxInStatementIndent = max;
+}
+
+/**
+ * set the minimum indentation between two lines in a multi-line condition.
+ *
+ * @param   min     minimal indentation length.
+ */
+void ASBeautifier::setMinConditionalIndentLength(int min)
+{
+	minConditionalIndent = min;
+	isMinimalConditinalIndentSet = true;
+}
+
+/**
+ * set the state of the bracket indentation option. If true, brackets will
+ * be indented one additional indent.
+ *
+ * @param   state             state of option.
+ */
+void ASBeautifier::setBracketIndent(bool state)
+{
+	bracketIndent = state;
+}
+
+/**
+ * set the state of the block indentation option. If true, entire blocks
+ * will be indented one additional indent, similar to the GNU indent style.
+ *
+ * @param   state             state of option.
+ */
+void ASBeautifier::setBlockIndent(bool state)
+{
+	if (state)
+		setBracketIndent(false); // so that we don't have both bracket and block indent
+	blockIndent = state;
+}
+
+/**
+ * set the state of the class indentation option. If true, C++ class
+ * definitions will be indented one additional indent.
+ *
+ * @param   state             state of option.
+ */
+void ASBeautifier::setClassIndent(bool state)
+{
+	classIndent = state;
+}
+
+/**
+ * set the state of the switch indentation option. If true, blocks of 'switch'
+ * statements will be indented one additional indent.
+ *
+ * @param   state             state of option.
+ */
+void ASBeautifier::setSwitchIndent(bool state)
+{
+	switchIndent = state;
+}
+
+/**
+ * set the state of the case indentation option. If true, lines of 'case'
+ * statements will be indented one additional indent.
+ *
+ * @param   state             state of option.
+ */
+void ASBeautifier::setCaseIndent(bool state)
+{
+	caseIndent = state;
+}
+
+/**
+ * set the state of the namespace indentation option.
+ * If true, blocks of 'namespace' statements will be indented one
+ * additional indent. Otherwise, NO indentation will be added.
+ *
+ * @param   state             state of option.
+ */
+void ASBeautifier::setNamespaceIndent(bool state)
+{
+	namespaceIndent = state;
+}
+
+/**
+ * set the state of the label indentation option.
+ * If true, labels will be indented one indent LESS than the
+ * current indentation level.
+ * If false, labels will be flushed to the left with NO
+ * indent at all.
+ *
+ * @param   state             state of option.
+ */
+void ASBeautifier::setLabelIndent(bool state)
+{
+	labelIndent = state;
+}
+
+/**
+ * set the state of the preprocessor indentation option.
+ * If true, multiline #define statements will be indented.
+ *
+ * @param   state             state of option.
+ */
+void ASBeautifier::setPreprocessorIndent(bool state)
+{
+	preprocessorIndent = state;
+}
+
+/**
+ * set the state of the empty line fill option.
+ * If true, empty lines will be filled with the whitespace.
+ * of their previous lines.
+ * If false, these lines will remain empty.
+ *
+ * @param   state             state of option.
+ */
+void ASBeautifier::setEmptyLineFill(bool state)
+{
+	emptyLineFill = state;
+}
+
+/**
+ * get the number of spaces per indent
+ *
+ * @return   value of indentLength option.
+*/
+int ASBeautifier::getIndentLength(void)
+{
+	return indentLength;
+}
+
+/**
+ * get the char used for indentation, space or tab
+  *
+ * @return   the char used for indentation.
+ */
+WString ASBeautifier::getIndentString(void)
+{
+	return indentString;
+}
+
+/**
+ * get the state of the case indentation option. If true, lines of 'case'
+ * statements will be indented one additional indent.
+ *
+ * @return   state of caseIndent option.
+ */
+bool ASBeautifier::getCaseIndent(void)
+{
+	return caseIndent;
+}
+
+/**
+ * get C style identifier.
+ * If true, a C source is being indented.
+ *
+ * @return   state of isCStyle option.
+ */
+bool ASBeautifier::getCStyle(void)
+{
+	return isCStyle;
+}
+
+/**
+ * get Java style identifier.
+ * If true, a Java source is being indented.
+ *
+ * @return   state of isJavaStyle option.
+ */
+bool ASBeautifier::getJavaStyle(void)
+{
+	return isJavaStyle;
+}
+
+/**
+ * get C# style identifier.
+ * If true, a C# source is being indented.
+ *
+ * @return   state of isSharpStyle option.
+ */
+bool ASBeautifier::getSharpStyle(void)
+{
+	return isSharpStyle;
+}
+
+/**
+ * get the state of the empty line fill option.
+ * If true, empty lines will be filled with the whitespace.
+ * of their previous lines.
+ * If false, these lines will remain empty.
+ *
+ * @return   state of emptyLineFill option.
+ */
+bool ASBeautifier::getEmptyLineFill(void)
+{
+	return emptyLineFill;
+}
+
+/**
+ * check if there are any indented lines ready to be read by nextLine()
+ *
+ * @return    are there any indented lines ready?
+ */
+bool ASBeautifier::hasMoreLines() const
+{
+	return sourceIterator->hasMoreLines();
+}
+
+/**
+ * get the next indented line.
+ *
+ * @return    indented line.
+ */
+WString ASBeautifier::nextLine()
+{
+	return beautify(sourceIterator->nextLine());
+}
+
+/**
+ * beautify a line of source code.
+ * every line of source code in a source code file should be sent
+ * one after the other to the beautify method.
+ *
+ * @return      the indented line.
+ * @param originalLine       the original unindented line.
+ */
+WString ASBeautifier::beautify(const WString &originalLine)
+{
+	WString line;
+	bool isInLineComment = false;
+	bool lineStartsInComment = false;
+	bool isInClass = false;
+	bool isInSwitch = false;
+	bool isImmediatelyAfterConst = false;
+	bool isSpecialChar = false;
+	char ch = ' ';
+	char prevCh;
+	WString outBuffer; // the newly idented line is bufferd here
+	int tabCount = 0;
+	const WString *lastLineHeader = NULL;
+	bool closingBracketReached = false;
+	int spaceTabCount = 0;
+	char tempCh;
+	int headerStackSize = headerStack->GetCount();
+	bool shouldIndentBrackettedLine = true;
+	int lineOpeningBlocksNum = 0;
+	int lineClosingBlocksNum = 0;
+	bool previousLineProbation = (probationHeader != NULL);
+	int i;
+
+	currentHeader = NULL;
+	lineStartsInComment = isInComment;
+	blockCommentNoBeautify = blockCommentNoIndent;
+	previousLineProbationTab = false;
+	outLineNumber++;
+
+	// handle and remove white spaces around the line:
+	// If not in comment, first find out size of white space before line,
+	// so that possible comments starting in the line continue in
+	// relation to the preliminary white-space.
+	if (!isInComment)
+	{
+		int strlen = originalLine.GetCount();
+		leadingWhiteSpaces = 0;
+
+		for (int j = 0; j < strlen && isWhiteSpace(originalLine[j]); j++)
+		{
+			if (originalLine[j] == '\t')
+				leadingWhiteSpaces += indentLength;
+			else
+				leadingWhiteSpaces++;
+		}
+		line = trim(originalLine);
+	}
+	else
+	{
+		// convert leading tabs to spaces
+		WString spaceTabs(' ', indentLength);
+		WString newLine = originalLine;
+		int strlen = newLine.GetCount();
+
+		for (int j=0; j < leadingWhiteSpaces && j < strlen; j++)
+		{
+			if (newLine[j] == '\t')
+			{
+				ASString_Replace(newLine, j, 1, spaceTabs);
+				strlen = newLine.GetCount();
+			}
+		}
+
+		// trim the comment leaving the new leading whitespace
+		int trimSize = 0;
+		strlen = newLine.GetCount();
+
+		while (trimSize < strlen
+		        && trimSize < leadingWhiteSpaces
+		        && isWhiteSpace(newLine[trimSize]))
+			trimSize++;
+
+
+		while (trimSize < strlen && isWhiteSpace(newLine[strlen-1]))
+			strlen--;
+
+		line = newLine.Mid(trimSize, strlen);
+		int trimEnd = ASString_Find_Last_Not_Of(line, " \t");
+		if (trimEnd >= 0)
+		{
+			int spacesToDelete = line.GetCount() - 1 - trimEnd;
+			if (spacesToDelete > 0)
+				line.Remove(trimEnd + 1, spacesToDelete);
+		}
+	}
+
+
+	if (line.GetCount() == 0)
+	{
+		if (backslashEndsPrevLine)	// must continue to clear variables
+			line = " ";
+		else if (emptyLineFill)
+			return preLineWS(prevFinalLineSpaceTabCount, prevFinalLineTabCount);
+		else
+			return line;
+	}
+
+	// handle preprocessor commands
+
+	if (isCStyle && !isInComment && (line[0] == '#' || backslashEndsPrevLine))
+	{
+		if (line[0] == '#')
+		{
+			WString preproc = trim(line.Mid(1));
+
+			// When finding a multi-lined #define statement, the original beautifier
+			// 1. sets its isInDefineDefinition flag
+			// 2. clones a new beautifier that will be used for the actual indentation
+			//    of the #define. This clone is put into the activeBeautifierStack in order
+			//    to be called for the actual indentation.
+			// The original beautifier will have isInDefineDefinition = true, isInDefine = false
+			// The cloned beautifier will have   isInDefineDefinition = true, isInDefine = true
+			if (preprocessorIndent && preproc.Mid(0, 6) == WString("define") &&  *line.Last() == '\\')
+			{
+				if (!isInDefineDefinition)
+				{
+					ASBeautifier *defineBeautifier;
+
+					// this is the original beautifier
+					isInDefineDefinition = true;
+
+					// push a new beautifier into the active stack
+					// this beautifier will be used for the indentation of this define
+					defineBeautifier = new ASBeautifier(*this);
+					activeBeautifierStack->push_back(defineBeautifier);
+				}
+				else
+				{
+					// the is the cloned beautifier that is in charge of indenting the #define.
+					isInDefine = true;
+				}
+			}
+			else if (preproc.Mid(0, 2) == WString("if"))
+			{
+				// push a new beautifier into the stack
+				waitingBeautifierStackLengthStack->push_back(waitingBeautifierStack->GetCount());
+				activeBeautifierStackLengthStack->push_back(activeBeautifierStack->GetCount());
+				waitingBeautifierStack->push_back(new ASBeautifier(*this));
+			}
+			else if (preproc.Mid(0, 4) == WString("else"))
+			{
+				if (waitingBeautifierStack && !waitingBeautifierStack->IsEmpty())
+				{
+					// MOVE current waiting beautifier to active stack.
+					activeBeautifierStack->push_back(waitingBeautifierStack->back());
+					waitingBeautifierStack->pop_back();
+				}
+			}
+			else if (preproc.Mid(0, 4) == WString("elif"))
+			{
+				if (waitingBeautifierStack && !waitingBeautifierStack->IsEmpty())
+				{
+					// append a COPY current waiting beautifier to active stack, WITHOUT deleting the original.
+					activeBeautifierStack->push_back(new ASBeautifier(*(waitingBeautifierStack->back())));
+				}
+			}
+			else if (preproc.Mid(0, 5) == WString("endif"))
+			{
+				int stackLength;
+				ASBeautifier *beautifier;
+
+				if (waitingBeautifierStackLengthStack && !waitingBeautifierStackLengthStack->IsEmpty())
+				{
+					stackLength = waitingBeautifierStackLengthStack->back();
+					waitingBeautifierStackLengthStack->pop_back();
+					while ((int) waitingBeautifierStack->GetCount() > stackLength)
+					{
+						beautifier = waitingBeautifierStack->back();
+						waitingBeautifierStack->pop_back();
+						delete beautifier;
+					}
+				}
+
+				if (!activeBeautifierStackLengthStack->IsEmpty())
+				{
+					stackLength = activeBeautifierStackLengthStack->back();
+					activeBeautifierStackLengthStack->pop_back();
+					while ((int) activeBeautifierStack->GetCount() > stackLength)
+					{
+						beautifier = activeBeautifierStack->back();
+						activeBeautifierStack->pop_back();
+						delete beautifier;
+					}
+				}
+			}
+		}
+
+		// check if the last char is a backslash
+		if (line.GetCount() > 0)
+			backslashEndsPrevLine = (line[line.GetCount() - 1] == '\\');
+		else
+			backslashEndsPrevLine = false;
+
+		// check if this line ends a multi-line #define
+		// if so, use the #define's cloned beautifier for the line's indentation
+		// and then remove it from the active beautifier stack and delete it.
+		if (!backslashEndsPrevLine && isInDefineDefinition && !isInDefine)
+		{
+			WString beautifiedLine;
+			ASBeautifier *defineBeautifier;
+
+			isInDefineDefinition = false;
+			defineBeautifier = activeBeautifierStack->back();
+			activeBeautifierStack->pop_back();
+
+			beautifiedLine = defineBeautifier->beautify(line);
+			delete defineBeautifier;
+			return beautifiedLine;
+		}
+
+		// unless this is a multi-line #define, return this precompiler line as is.
+		if (!isInDefine && !isInDefineDefinition)
+			return originalLine;
+	}
+
+	// if there exists any worker beautifier in the activeBeautifierStack,
+	// then use it instead of me to indent the current line.
+	// variables set by ASFormatter must be updated.
+	if (!isInDefine && activeBeautifierStack != NULL && !activeBeautifierStack->IsEmpty())
+	{
+		activeBeautifierStack->back()->inLineNumber = inLineNumber;
+		activeBeautifierStack->back()->outLineNumber = outLineNumber;
+		activeBeautifierStack->back()->lineCommentNoBeautify = lineCommentNoBeautify;
+		activeBeautifierStack->back()->isNonInStatementArray = isNonInStatementArray;
+		return activeBeautifierStack->back()->beautify(line);
+	}
+
+	// calculate preliminary indentation based on data from past lines
+	if (!inStatementIndentStack->IsEmpty())
+		spaceTabCount = inStatementIndentStack->back();
+
+
+	for (i = 0; i < (int) headerStackSize; i++)
+	{
+		isInClass = false;
+
+		if (blockIndent || (!(i > 0 && (*headerStack)[i-1] != &AS_OPEN_BRACKET
+		                      && (*headerStack)[i] == &AS_OPEN_BRACKET)))
+			++tabCount;
+
+		if (!isJavaStyle && !namespaceIndent && i >= 1
+		        && (*headerStack)[i-1] == &AS_NAMESPACE
+		        && (*headerStack)[i] == &AS_OPEN_BRACKET)
+			--tabCount;
+
+		if (isCStyle && i >= 1
+		        && (*headerStack)[i-1] == &AS_CLASS
+		        && (*headerStack)[i] == &AS_OPEN_BRACKET)
+		{
+			if (classIndent)
+				++tabCount;
+			isInClass = true;
+		}
+
+		// is the switchIndent option is on, indent switch statements an additional indent.
+		else if (switchIndent && i > 1 &&
+		         (*headerStack)[i-1] == &AS_SWITCH &&
+		         (*headerStack)[i] == &AS_OPEN_BRACKET
+		        )
+		{
+			++tabCount;
+			isInSwitch = true;
+		}
+
+	}
+
+	if (!lineStartsInComment
+	        && isCStyle
+	        && isInClass
+	        && classIndent
+	        && headerStackSize >= 2
+	        && (*headerStack)[headerStackSize-2] == &AS_CLASS
+	        && (*headerStack)[headerStackSize-1] == &AS_OPEN_BRACKET
+	        && line[0] == '}')
+		--tabCount;
+
+	else if (!lineStartsInComment
+	         && isInSwitch
+	         && switchIndent
+	         && headerStackSize >= 2
+	         && (*headerStack)[headerStackSize-2] == &AS_SWITCH
+	         && (*headerStack)[headerStackSize-1] == &AS_OPEN_BRACKET
+	         && line[0] == '}')
+		--tabCount;
+
+	if (isInClassHeader)
+	{
+		isInClassHeaderTab = true;
+		tabCount += 2;
+	}
+
+	if (isInConditional)
+	{
+		--tabCount;
+	}
+
+
+	// parse characters in the current line.
+
+	for (i = 0; i < (int) line.GetCount(); i++)
+	{
+		tempCh = line[i];
+
+		prevCh = ch;
+		ch = tempCh;
+
+//		outBuffer.append(1, ch);
+		outBuffer.Cat(ch);
+
+		if (isWhiteSpace(ch))
+			continue;
+
+		// check for utf8 characters
+		// isalnum() will display an assert message in debug if not bypassed here
+		if (ch < 0)
+			continue;
+
+		// handle special characters (i.e. backslash+character such as \n, \t, ...)
+		if (isSpecialChar)
+		{
+			isSpecialChar = false;
+			continue;
+		}
+		if (!(isInComment || isInLineComment) && line.Mid(i, 2) == WString("\\\\"))
+		{
+			outBuffer.Cat('\\');
+			i++;
+			continue;
+		}
+		if (!(isInComment || isInLineComment) && ch == '\\')
+		{
+			isSpecialChar = true;
+			continue;
+		}
+
+		// handle quotes (such as 'x' and "Hello Dolly")
+		if (!(isInComment || isInLineComment) && (ch == '"' || ch == '\''))
+			if (!isInQuote)
+			{
+				quoteChar = ch;
+				isInQuote = true;
+			}
+			else if (quoteChar == ch)
+			{
+				isInQuote = false;
+				isInStatement = true;
+				continue;
+			}
+		if (isInQuote)
+			continue;
+
+		// handle comments
+
+		if (!(isInComment || isInLineComment) && line.Mid(i, 2) == WString("//"))
+		{
+			isInLineComment = true;
+			outBuffer.Cat('/');
+			i++;
+			continue;
+		}
+		else if (!(isInComment || isInLineComment) && line.Mid(i, 2) == WString("/*"))
+		{
+			isInComment = true;
+			outBuffer.Cat('*');
+			i++;
+			int j = ASString_Find_First_Not_Of(line, " \t");
+			if (line.Mid(j, 2) != WString("/*"))	// does line start with comment?
+				blockCommentNoIndent = true;		// if no, cannot indent continuation lines
+			continue;
+		}
+		else if ((isInComment || isInLineComment) && line.Mid(i, 2) ==  WString("*/"))
+		{
+			isInComment = false;
+			outBuffer.Cat('/');
+			i++;
+			blockCommentNoIndent = false;		// ok to indent next comment
+			continue;
+		}
+
+		if (isInComment || isInLineComment)
+			continue;
+
+		// if we have reached this far then we are NOT in a comment or String of special character...
+
+		if (probationHeader != NULL)
+		{
+			if (((probationHeader == &AS_STATIC || probationHeader == &AS_CONST) && ch == '{')
+			        || (probationHeader == &AS_SYNCHRONIZED && ch == '('))
+			{
+				// insert the probation header as a new header
+				isInHeader = true;
+				headerStack->push_back(probationHeader);
+
+				// handle the specific probation header
+				isInConditional = (probationHeader == &AS_SYNCHRONIZED);
+				if (probationHeader == &AS_CONST)
+					isImmediatelyAfterConst = true;
+
+				isInStatement = false;
+				// if the probation comes from the previous line, then indent by 1 tab count.
+				if (previousLineProbation && ch == '{')
+				{
+					tabCount++;
+					previousLineProbationTab = true;
+				}
+				previousLineProbation = false;
+			}
+
+			// dismiss the probation header
+			probationHeader = NULL;
+		}
+
+		prevNonSpaceCh = currentNonSpaceCh;
+		currentNonSpaceCh = ch;
+		if (!isLegalNameChar(ch) && ch != ',' && ch != ';')
+		{
+			prevNonLegalCh = currentNonLegalCh;
+			currentNonLegalCh = ch;
+		}
+
+		if (isInHeader)
+		{
+			isInHeader = false;
+			currentHeader = headerStack->back();
+		}
+		else
+			currentHeader = NULL;
+
+		if (isCStyle && isInTemplate
+		        && (ch == '<' || ch == '>')
+		        &&  findHeader(line, i, nonAssignmentOperators) == NULL)
+		{
+			if (ch == '<')
+			{
+				++templateDepth;
+			}
+			else if (ch == '>')
+			{
+				if (--templateDepth <= 0)
+				{
+					if (isInTemplate)
+						ch = ';';
+					else
+						ch = 't';
+					isInTemplate = false;
+					templateDepth = 0;
+				}
+			}
+		}
+
+		// handle parenthesies
+		if (ch == '(' || ch == '[' || ch == ')' || ch == ']')
+		{
+			if (ch == '(' || ch == '[')
+			{
+				if (parenDepth == 0)
+				{
+					parenStatementStack->push_back(isInStatement);
+					isInStatement = true;
+				}
+				parenDepth++;
+
+				inStatementIndentStackSizeStack->push_back(inStatementIndentStack->GetCount());
+
+				if (currentHeader != NULL)
+					registerInStatementIndent(line, i, spaceTabCount, minConditionalIndent/*indentLength*2*/, true);
+				else
+					registerInStatementIndent(line, i, spaceTabCount, 0, true);
+			}
+			else if (ch == ')' || ch == ']')
+			{
+				parenDepth--;
+				if (parenDepth == 0)
+				{
+					isInStatement = parenStatementStack->back();
+					parenStatementStack->pop_back();
+					ch = ' ';
+
+					isInConditional = false;
+				}
+
+				if (!inStatementIndentStackSizeStack->IsEmpty())
+				{
+					int previousIndentStackSize = inStatementIndentStackSizeStack->back();
+					inStatementIndentStackSizeStack->pop_back();
+					while (previousIndentStackSize < (int) inStatementIndentStack->GetCount())
+						inStatementIndentStack->pop_back();
+
+					if (!parenIndentStack->IsEmpty())
+					{
+						int poppedIndent = parenIndentStack->back();
+						parenIndentStack->pop_back();
+
+						if (i == 0)
+							spaceTabCount = poppedIndent;
+					}
+				}
+			}
+
+			continue;
+		}
+
+
+		if (ch == '{')
+		{
+			bool isBlockOpener;
+			// first, check if '{' is a block-opener or an static-array opener
+			isBlockOpener = ((prevNonSpaceCh == '{' && bracketBlockStateStack->back())
+			                 || prevNonSpaceCh == '}'
+			                 || prevNonSpaceCh == ')'
+			                 || prevNonSpaceCh == ';'
+			                 || peekNextChar(line, i) == '{'
+			                 || isNonInStatementArray
+			                 || isInClassHeader
+//			                 || isBlockOpener
+			                 || isImmediatelyAfterConst
+			                 || (isInDefine &&
+			                     (prevNonSpaceCh == '('
+			                      || prevNonSpaceCh == '_'
+			                      || isalnum(prevNonSpaceCh))));
+
+			isInClassHeader = false;
+			if (!isBlockOpener && currentHeader != NULL)
+			{
+				for (int n = 0; n < nonParenHeaders.GetCount(); n++)
+					if (currentHeader == nonParenHeaders[n])
+					{
+						isBlockOpener = true;
+						break;
+					}
+			}
+			bracketBlockStateStack->push_back(isBlockOpener);
+			if (!isBlockOpener)
+			{
+				inStatementIndentStackSizeStack->push_back(inStatementIndentStack->GetCount());
+				registerInStatementIndent(line, i, spaceTabCount, 0, true);
+				parenDepth++;
+				if (i == 0)
+					shouldIndentBrackettedLine = false;
+
+				continue;
+			}
+
+			// this bracket is a block opener...
+
+			++lineOpeningBlocksNum;
+//			if (isInClassHeader)
+//			isInClassHeader = false;
+
+			if (isInClassHeaderTab)
+			{
+				isInClassHeaderTab = false;
+				// decrease tab count if bracket is broken
+				int firstChar = ASString_Find_First_Not_Of(line, " \t");
+				if(firstChar >= 0)
+					if (line[firstChar] == '{' && (int) firstChar == i)
+						tabCount -= 2;
+			}
+
+			// do not allow inStatementIndent - should occur for Java files only
+			if (inStatementIndentStack->GetCount() > 0)
+			{
+				spaceTabCount = 0;
+				inStatementIndentStack->back() = 0;
+			}
+
+			blockParenDepthStack->push_back(parenDepth);
+			blockStatementStack->push_back(isInStatement);
+
+			inStatementIndentStackSizeStack->push_back(inStatementIndentStack->GetCount());
+			if (inStatementIndentStack->GetCount() > 0)
+				inStatementIndentStack->back() = 0;
+
+			blockTabCount += isInStatement ? 1 : 0;
+			parenDepth = 0;
+			isInStatement = false;
+
+			tempStacks->push_back(new Vector<const WString*>);
+			headerStack->push_back(&AS_OPEN_BRACKET);
+			lastLineHeader = &AS_OPEN_BRACKET;
+
+			continue;
+		}
+
+		//check if a header has been reached
+		if (isWhiteSpace(prevCh))
+		{
+			bool isIndentableHeader = true;
+			const WString *newHeader = findHeader(line, i, headers);
+			if (newHeader != NULL)
+			{
+				// if we reached here, then this is a header...
+				isInHeader = true;
+
+				Vector<const WString*> *lastTempStack;
+				if (tempStacks->IsEmpty())
+					lastTempStack = NULL;
+				else
+					lastTempStack = tempStacks->back();
+
+				// if a new block is opened, push a new stack into tempStacks to hold the
+				// future list of headers in the new block.
+
+				// take care of the special case: 'else if (...)'
+				if (newHeader == &AS_IF && lastLineHeader == &AS_ELSE)
+				{
+					headerStack->pop_back();
+				}
+
+				// take care of 'else'
+				else if (newHeader == &AS_ELSE)
+				{
+					if (lastTempStack != NULL)
+					{
+						int indexOfIf = indexOf(*lastTempStack, &AS_IF);
+						if (indexOfIf != -1)
+						{
+							// recreate the header list in headerStack up to the previous 'if'
+							// from the temporary snapshot stored in lastTempStack.
+							int restackSize = lastTempStack->GetCount() - indexOfIf - 1;
+							for (int r = 0; r < restackSize; r++)
+							{
+								headerStack->push_back(lastTempStack->back());
+								lastTempStack->pop_back();
+							}
+							if (!closingBracketReached)
+								tabCount += restackSize;
+						}
+						/*
+						 * If the above if is not true, i.e. no 'if' before the 'else',
+						 * then nothing beautiful will come out of this...
+						 * I should think about inserting an Exception here to notify the caller of this...
+						 */
+					}
+				}
+
+				// check if 'while' closes a previous 'do'
+				else if (newHeader == &AS_WHILE)
+				{
+					if (lastTempStack != NULL)
+					{
+						int indexOfDo = indexOf(*lastTempStack, &AS_DO);
+						if (indexOfDo != -1)
+						{
+							// recreate the header list in headerStack up to the previous 'do'
+							// from the temporary snapshot stored in lastTempStack.
+							int restackSize = lastTempStack->GetCount() - indexOfDo - 1;
+							for (int r = 0; r < restackSize; r++)
+							{
+								headerStack->push_back(lastTempStack->back());
+								lastTempStack->pop_back();
+							}
+							if (!closingBracketReached)
+								tabCount += restackSize;
+						}
+					}
+				}
+				// check if 'catch' closes a previous 'try' or 'catch'
+				else if (newHeader == &AS_CATCH || newHeader == &AS_FINALLY)
+				{
+					if (lastTempStack != NULL)
+					{
+						int indexOfTry = indexOf(*lastTempStack, &AS_TRY);
+						if (indexOfTry == -1)
+							indexOfTry = indexOf(*lastTempStack, &AS_CATCH);
+						if (indexOfTry != -1)
+						{
+							// recreate the header list in headerStack up to the previous 'try'
+							// from the temporary snapshot stored in lastTempStack.
+							int restackSize = lastTempStack->GetCount() - indexOfTry - 1;
+							for (int r = 0; r < restackSize; r++)
+							{
+								headerStack->push_back(lastTempStack->back());
+								lastTempStack->pop_back();
+							}
+
+							if (!closingBracketReached)
+								tabCount += restackSize;
+						}
+					}
+				}
+				else if (newHeader == &AS_CASE)
+				{
+					isInCase = true;
+					--tabCount;
+				}
+				else if (newHeader == &AS_DEFAULT)
+				{
+					isInCase = true;
+					--tabCount;
+				}
+				else if (newHeader == &AS_STATIC
+				         || newHeader == &AS_SYNCHRONIZED
+				         || (newHeader == &AS_CONST && isCStyle))
+				{
+					if (!headerStack->IsEmpty() &&
+					        (headerStack->back() == &AS_STATIC
+					         || headerStack->back() == &AS_SYNCHRONIZED
+					         || headerStack->back() == &AS_CONST))
+					{
+						isIndentableHeader = false;
+					}
+					else
+					{
+						isIndentableHeader = false;
+						probationHeader = newHeader;
+					}
+				}
+				else if (newHeader == &AS_CONST)
+				{
+					isIndentableHeader = false;
+				}
+				else if (newHeader == &AS_TEMPLATE)
+				{
+					if (isCStyle)
+						isInTemplate = true;
+					isIndentableHeader = false;
+				}
+
+
+				if (isIndentableHeader)
+				{
+					headerStack->push_back(newHeader);
+					isInStatement = false;
+					if (indexOf(nonParenHeaders, newHeader) == -1)
+					{
+						isInConditional = true;
+					}
+					lastLineHeader = newHeader;
+				}
+				else
+					isInHeader = false;
+
+				outBuffer.Cat(newHeader->Mid(1));
+				i += newHeader->GetCount() - 1;
+
+				continue;
+			}
+		}
+
+		if (isCStyle && !isalpha(prevCh)
+		        && line.Mid(i, 8) == WString("operator") && !isalnum(line[i+8]))
+		{
+			isInOperator = true;
+			outBuffer.Cat(AS_OPERATOR.Mid(1));
+			i += 7;
+			continue;
+		}
+
+		// "new" operator is a pointer, not a calculation
+		if (!isalpha(prevCh)
+		        && line.Mid(i, 3) == WString("new") && !isalnum(line[i+3]))
+		{
+			if (prevNonSpaceCh == '=' && isInStatement && !inStatementIndentStack->IsEmpty())
+				inStatementIndentStack->back() = 0;
+		}
+
+		if (ch == '?')
+			isInQuestion = true;
+
+
+		// special handling of 'case' statements
+		if (ch == ':')
+		{
+			if ((int) line.GetCount() > i + 1 && line[i+1] == ':') // look for ::
+			{
+				++i;
+				outBuffer.Cat(':');
+				ch = ' ';
+				continue;
+			}
+
+			else if (isInQuestion)
+			{
+				isInQuestion = false;
+			}
+
+			else if (isCStyle && isInClass && prevNonSpaceCh != ')')
+			{
+				--tabCount;
+				// found a 'private:' or 'public:' inside a class definition
+				// so do nothing special
+			}
+
+			else if (!isJavaStyle && isInClassHeader)
+			{
+				// found a 'class A : public B' definition
+				// so do nothing special
+			}
+
+			else if (isJavaStyle && lastLineHeader == &AS_FOR)
+			{
+				// found a java for-each statement
+				// so do nothing special
+			}
+
+			else if (isCStyle && prevNonSpaceCh == ')')
+			{
+				isInClassHeader = true;
+				if (i == 0)
+					tabCount += 2;
+			}
+			else
+			{
+				currentNonSpaceCh = ';'; // so that brackets after the ':' will appear as block-openers
+				if (isInCase)
+				{
+					isInCase = false;
+					ch = ';'; // from here on, treat char as ';'
+				}
+
+
+				else // is in a label (e.g. 'label1:')
+				{
+					if (labelIndent)
+						--tabCount; // unindent label by one indent
+					else
+						tabCount = 0; // completely flush indent to left
+				}
+
+
+
+			}
+		}
+
+		if ((ch == ';'  || (parenDepth > 0 && ch == ','))  && !inStatementIndentStackSizeStack->IsEmpty())
+			while ((int) inStatementIndentStackSizeStack->back() + (parenDepth > 0 ? 1 : 0)
+			        < (int) inStatementIndentStack->GetCount())
+				inStatementIndentStack->pop_back();
+
+
+		// handle ends of statements
+		if ((ch == ';' && parenDepth == 0) || ch == '}'/* || (ch == ',' && parenDepth == 0)*/)
+		{
+			if (ch == '}')
+			{
+				// first check if this '}' closes a previous block, or a static array...
+				if (!bracketBlockStateStack->IsEmpty())
+				{
+					bool bracketBlockState = bracketBlockStateStack->back();
+					bracketBlockStateStack->pop_back();
+					if (!bracketBlockState)
+					{
+						if (!inStatementIndentStackSizeStack->IsEmpty())
+						{
+							// this bracket is a static array
+
+							int previousIndentStackSize = inStatementIndentStackSizeStack->back();
+							inStatementIndentStackSizeStack->pop_back();
+							while (previousIndentStackSize < (int) inStatementIndentStack->GetCount())
+								inStatementIndentStack->pop_back();
+							parenDepth--;
+							if (i == 0)
+								shouldIndentBrackettedLine = false;
+
+							if (!parenIndentStack->IsEmpty())
+							{
+								int poppedIndent = parenIndentStack->back();
+								parenIndentStack->pop_back();
+								if (i == 0)
+									spaceTabCount = poppedIndent;
+							}
+						}
+						continue;
+					}
+				}
+
+				// this bracket is block closer...
+
+				++lineClosingBlocksNum;
+
+				if (!inStatementIndentStackSizeStack->IsEmpty())
+					inStatementIndentStackSizeStack->pop_back();
+
+				if (!blockParenDepthStack->IsEmpty())
+				{
+					parenDepth = blockParenDepthStack->back();
+					blockParenDepthStack->pop_back();
+					isInStatement = blockStatementStack->back();
+					blockStatementStack->pop_back();
+
+					if (isInStatement)
+						blockTabCount--;
+				}
+
+				closingBracketReached = true;
+				int headerPlace = indexOf(*headerStack, &AS_OPEN_BRACKET);
+				if (headerPlace != -1)
+				{
+					const WString *popped = headerStack->back();
+					while (popped != &AS_OPEN_BRACKET)
+					{
+						headerStack->pop_back();
+						popped = headerStack->back();
+					}
+					headerStack->pop_back();
+
+					if (!tempStacks->IsEmpty())
+					{
+						Vector<const WString*> *temp =  tempStacks->back();
+						tempStacks->pop_back();
+						delete temp;
+					}
+				}
+
+
+				ch = ' '; // needed due to cases such as '}else{', so that headers ('else' tn tih case) will be identified...
+			}
+
+			/*
+			 * Create a temporary snapshot of the current block's header-list in the
+			 * uppermost inner stack in tempStacks, and clear the headerStack up to
+			 * the begining of the block.
+			 * Thus, the next future statement will think it comes one indent past
+			 * the block's '{' unless it specifically checks for a companion-header
+			 * (such as a previous 'if' for an 'else' header) within the tempStacks,
+			 * and recreates the temporary snapshot by manipulating the tempStacks.
+			 */
+			if (!tempStacks->back()->IsEmpty())
+				while (!tempStacks->back()->IsEmpty())
+					tempStacks->back()->pop_back();
+			while (!headerStack->IsEmpty() && headerStack->back() != &AS_OPEN_BRACKET)
+			{
+				tempStacks->back()->push_back(headerStack->back());
+				headerStack->pop_back();
+			}
+
+			if (parenDepth == 0 && ch == ';')
+				isInStatement = false;
+
+			previousLastLineHeader = NULL;
+			isInClassHeader = false;
+			isInQuestion = false;
+
+			continue;
+		}
+
+
+		// check for preBlockStatements ONLY if not within parenthesies
+		// (otherwise 'struct XXX' statements would be wrongly interpreted...)
+		if (isWhiteSpace(prevCh) && !isInTemplate && parenDepth == 0)
+		{
+			const WString *newHeader = findHeader(line, i, preBlockStatements);
+			if (newHeader != NULL)
+			{
+				isInClassHeader = true;
+				outBuffer.Cat(newHeader->Mid(1));
+				i += newHeader->GetCount() - 1;
+				headerStack->push_back(newHeader);
+			}
+		}
+
+		// Handle operators
+
+		immediatelyPreviousAssignmentOp = NULL;
+
+		// Check if an operator has been reached.
+		const WString *foundAssignmentOp = findHeader(line, i, assignmentOperators, false);
+		if (foundAssignmentOp == &AS_RETURN)
+			foundAssignmentOp = findHeader(line, i, assignmentOperators, true);
+		const WString *foundNonAssignmentOp = findHeader(line, i, nonAssignmentOperators, false);
+
+		// Since findHeader's boundry checking was not used above, it is possible
+		// that both an assignment op and a non-assignment op where found,
+		// e.g. '>>' and '>>='. If this is the case, treat the LONGER one as the
+		// found operator.
+		if (foundAssignmentOp != NULL && foundNonAssignmentOp != NULL)
+			if (foundAssignmentOp->GetCount() < foundNonAssignmentOp->GetCount())
+				foundAssignmentOp = NULL;
+			else
+				foundNonAssignmentOp = NULL;
+
+		if (foundNonAssignmentOp != NULL)
+		{
+			if (foundNonAssignmentOp->GetCount() > 1)
+			{
+				outBuffer.Cat(foundNonAssignmentOp->Mid(1));
+				i += foundNonAssignmentOp->GetCount() - 1;
+			}
+		}
+
+		else if (foundAssignmentOp != NULL)
+		{
+			if (foundAssignmentOp->GetCount() > 1)
+			{
+				outBuffer.Cat(foundAssignmentOp->Mid(1));
+				i += foundAssignmentOp->GetCount() - 1;
+			}
+
+			if (!isInOperator && !isInTemplate && !isNonInStatementArray)
+			{
+				registerInStatementIndent(line, i, spaceTabCount, 0, false);
+				immediatelyPreviousAssignmentOp = foundAssignmentOp;
+				isInStatement = true;
+			}
+		}
+
+		if (isInOperator)
+			isInOperator = false;
+	}
+
+	// handle special cases of unindentation:
+
+	/*
+	 * if '{' doesn't follow an immediately previous '{' in the headerStack
+	 * (but rather another header such as "for" or "if", then unindent it
+	 * by one indentation relative to its block.
+	 */
+
+	if (!lineStartsInComment
+	        && !blockIndent
+	        && outBuffer.GetCount() > 0
+	        && outBuffer[0] == '{'
+	        && !(lineOpeningBlocksNum > 0 && lineOpeningBlocksNum == lineClosingBlocksNum)
+	        && !(headerStack->GetCount() > 1 && (*headerStack)[headerStack->GetCount()-2] == &AS_OPEN_BRACKET)
+	        && shouldIndentBrackettedLine)
+		--tabCount;
+
+	else if (!lineStartsInComment
+	         && outBuffer.GetCount() > 0
+	         && outBuffer[0] == '}'
+	         && shouldIndentBrackettedLine)
+		--tabCount;
+
+	// correctly indent one-line-blocks...
+	else if (!lineStartsInComment
+	         && outBuffer.GetCount() > 0
+	         && lineOpeningBlocksNum > 0
+	         && lineOpeningBlocksNum == lineClosingBlocksNum
+	         && previousLineProbationTab)
+		--tabCount; //lineOpeningBlocksNum - (blockIndent ? 1 : 0);
+
+	if (tabCount < 0)
+		tabCount = 0;
+
+	// take care of extra bracket indentatation option...
+	if (bracketIndent && outBuffer.GetCount() > 0 && shouldIndentBrackettedLine)
+		if (outBuffer[0] == '{' || outBuffer[0] == '}')
+			tabCount++;
+
+
+	if (isInDefine)
+	{
+		if (outBuffer[0] == '#')
+		{
+			WString preproc = trim(outBuffer.Mid(1));
+
+			if (preproc.Mid(0, 6) == WString("define"))
+			{
+				if (!inStatementIndentStack->IsEmpty()
+				        && inStatementIndentStack->back() > 0)
+				{
+					defineTabCount = tabCount;
+				}
+				else
+				{
+					defineTabCount = tabCount - 1;
+					tabCount--;
+				}
+			}
+		}
+
+		tabCount -= defineTabCount;
+	}
+
+	if (tabCount < 0)
+		tabCount = 0;
+	if (lineCommentNoBeautify || blockCommentNoBeautify)
+		tabCount = spaceTabCount = 0;
+
+	// finally, insert indentations into begining of line
+
+	prevFinalLineSpaceTabCount = spaceTabCount;
+	prevFinalLineTabCount = tabCount;
+
+	if (shouldForceTabIndentation)
+	{
+		tabCount += spaceTabCount / indentLength;
+		spaceTabCount = spaceTabCount % indentLength;
+	}
+
+	outBuffer = preLineWS(spaceTabCount, tabCount) + outBuffer;
+
+	if (lastLineHeader != NULL)
+		previousLastLineHeader = lastLineHeader;
+
+	return outBuffer;
+}
+
+
+WString ASBeautifier::preLineWS(int spaceTabCount, int tabCount)
+{
+	WString ws;
+
+	for (int i = 0; i < tabCount; i++)
+		ws += indentString;
+
+	while ((spaceTabCount--) > 0)
+		ws += WString(" ");
+
+	return ws;
+
+}
+
+/**
+ * register an in-statement indent.
+ */
+void ASBeautifier::registerInStatementIndent(const WString &line, int i, int spaceTabCount,
+        int minIndent, bool updateParenStack)
+{
+	int inStatementIndent;
+	int remainingCharNum = line.GetCount() - i;
+	int nextNonWSChar = getNextProgramCharDistance(line, i);
+
+	// if indent is around the last char in the line, indent instead 2 spaces from the previous indent
+	if (nextNonWSChar == remainingCharNum)
+	{
+		int previousIndent = spaceTabCount;
+		if (!inStatementIndentStack->IsEmpty())
+			previousIndent = inStatementIndentStack->back();
+
+		inStatementIndentStack->push_back(/*2*/ indentLength + previousIndent);
+		if (updateParenStack)
+			parenIndentStack->push_back(previousIndent);
+		return;
+	}
+
+	if (updateParenStack)
+		parenIndentStack->push_back(i + spaceTabCount);
+
+	inStatementIndent = i + nextNonWSChar + spaceTabCount;
+
+	if (i + nextNonWSChar < minIndent)
+		inStatementIndent = minIndent + spaceTabCount;
+
+	if (i + nextNonWSChar > maxInStatementIndent)
+		inStatementIndent =  indentLength * 2 + spaceTabCount;
+
+	if (!inStatementIndentStack->IsEmpty() &&
+	        inStatementIndent < inStatementIndentStack->back())
+		inStatementIndent = inStatementIndentStack->back();
+
+	if (isNonInStatementArray)
+		inStatementIndent = 0;
+
+	inStatementIndentStack->push_back(inStatementIndent);
+}
+
+/**
+ * get distance to the next non-white sspace, non-comment character in the line.
+ * if no such character exists, return the length remaining to the end of the line.
+ */
+int ASBeautifier::getNextProgramCharDistance(const WString &line, int i)
+{
+	bool inComment = false;
+	int  remainingCharNum = line.GetCount() - i;
+	int  charDistance;
+	char ch;
+
+	for (charDistance = 1; charDistance < remainingCharNum; charDistance++)
+	{
+		ch = line[i + charDistance];
+		if (inComment)
+		{
+			if (line.Mid(i + charDistance, 2) == WString("*/"))
+			{
+				charDistance++;
+				inComment = false;
+			}
+			continue;
+		}
+		else if (isWhiteSpace(ch))
+			continue;
+		else if (ch == '/')
+		{
+			if (line.Mid(i + charDistance, 2) == WString("//"))
+				return remainingCharNum;
+			else if (line.Mid(i + charDistance, 2) == WString("/*"))
+			{
+				charDistance++;
+				inComment = true;
+			}
+		}
+		else
+			return charDistance;
+	}
+
+	return charDistance;
+}
+
+
+/**
+ * check if a specific line position contains a header, out of several possible headers.
+ *
+ * @return    a pointer to the found header. if no header was found then return NULL.
+ */
+const WString *ASBeautifier::findHeader(const WString &line, int i, const Vector<const WString*> &possibleHeaders, bool checkBoundry)
+{
+	int maxHeaders = possibleHeaders.GetCount();
+	// const WString *header = NULL;
+	int p;
+
+	for (p = 0; p < maxHeaders; p++)
+	{
+		const WString *header = possibleHeaders[p];
+
+		if (line.Mid(i, header->GetCount()) == *header)
+		{
+			// check that this is a header and not a part of a longer word
+			// (e.g. not at its begining, not at its middle...)
+
+			int lineLength = line.GetCount();
+			int headerEnd = i + header->GetCount();
+			char startCh = (*header)[0];   // first char of header
+			char endCh = 0;                // char just after header
+			char prevCh = 0;               // char just before header
+
+			if (headerEnd < lineLength)
+			{
+				endCh = line[headerEnd];
+			}
+			if (i > 0)
+			{
+				prevCh = line[i-1];
+			}
+
+			if (!checkBoundry)
+			{
+				return header;
+			}
+			else if (prevCh != 0
+			         && isLegalNameChar(startCh)
+			         && isLegalNameChar(prevCh))
+			{
+				return NULL;
+			}
+			else if (headerEnd >= lineLength
+			         || !isLegalNameChar(startCh)
+			         || !isLegalNameChar(endCh))
+			{
+				return header;
+			}
+			else
+			{
+				return NULL;
+			}
+		}
+	}
+
+	return NULL;
+}
+
+/**
+ * find the index number of a string element in a container of strings
+ *
+ * @return              the index number of element in the ocntainer. -1 if element not found.
+ * @param container     a vector of strings.
+ * @param element       the element to find .
+ */
+int ASBeautifier::indexOf(Vector<const WString*> &container, const WString *element)
+{
+/*	Vector<const WString*>::const_iterator where;
+	where = find(container.begin(), container.end(), element);
+
+	if (where == container.end())
+		return -1;
+	else
+		return (int) (where - container.begin());
+*/
+
+	return FindIndex(container, element);
+}
+
+/**
+ * trim removes the white space surrounding a line.
+ *
+ * @return          the trimmed line.
+ * @param str       the line to trim.
+ */
+WString ASBeautifier::trim(const WString &str)
+{
+
+	int start = 0;
+	int end = str.GetCount() - 1;
+
+	while (start < end && isWhiteSpace(str[start]))
+		start++;
+
+	while (start <= end && isWhiteSpace(str[end]))
+		end--;
+
+//	WString returnStr(str, start, end + 1 - start);
+//	return returnStr;
+	return str.Mid(start, end+1-start);
+}
+
+/**
+* peek at the next unread character.
+*
+* @return     	the next unread character.
+* @param line   the line to check.
+* @param i      the current char position on the line.
+*/
+char ASBeautifier::peekNextChar(WString &line, int i)
+{
+	char ch = ' ';
+	int peekNum = ASString_Find_First_Not_Of(line, " \t", i + 1);
+
+	if (peekNum < 0)
+		return ch;
+
+	ch = line[peekNum];
+
+	return ch;
+}
+
+
+}   // end namespace astyle
diff --git a/uppsrc/plugin/astyle/ASEnhancer.cpp b/uppsrc/plugin/astyle/ASEnhancer.cpp
new file mode 100644
index 000000000..5509ffe8b
--- /dev/null
+++ b/uppsrc/plugin/astyle/ASEnhancer.cpp
@@ -0,0 +1,489 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *   ASEnhancer.cpp
+ *
+ *   This file is a part of "Artistic Style" - an indentation and
+ *   reformatting tool for C, C++, C# and Java source files.
+ *   http://astyle.sourceforge.net
+ *
+ *   The "Artistic Style" project, including all files needed to
+ *   compile it, is free software; you can redistribute it and/or
+ *   modify it under the terms of the GNU Lesser General Public
+ *   License as published by the Free Software Foundation; either
+ *   version 2.1 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 Lesser General Public License for more details.
+ *
+ *   You should have received a copy of the GNU Lesser General Public
+ *   License along with this project; if not, write to the
+ *   Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ *   Boston, MA  02110-1301, USA.
+ *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ */
+
+ /*
+ 	2008-01-26 Patches by Massimo Del Fedele :
+ 		- modified sources to use Ultimate++ containers instead std:: ones
+ 		- fixed memory leaks based on bug report 1804791 submitted by Eran Ifrah
+ 		- modified to work with unicode
+ */
+// can trace only if NDEBUG is not defined
+#ifndef NDEBUG
+// #define TRACEswitch
+// #define TRACEcase
+// #define TRACEmisc
+#endif
+
+#include "astyle.h"
+
+#include <iostream>
+#include <fstream>
+#include <sstream>
+
+#ifdef TRACEswitch
+#define TRswitch(a,b)   *traceOut << lineNumber << a << b << endl;
+#else
+#define TRswitch(a,b)   ((void)0)
+#endif // TRACEswitch
+#ifdef TRACEcase
+#define TRcase(a,b)     *traceOut << lineNumber << a << b << endl;
+#else
+#define TRcase(a,b)     ((void)0)
+#endif // TRACEcase
+#ifdef TRACEmisc
+#define TRmisc(a)       *traceOut << lineNumber << a << endl;
+#else
+#define TRmisc(a)       ((void)0)
+#endif // TRACEmisc
+
+
+namespace astyle
+{
+
+// ---------------------------- functions for ASEnhancer Class -------------------------------------
+
+/**
+ * ASEnhancer constructor
+ */
+ASEnhancer::ASEnhancer()
+{
+	// variables are initialized by init()
+	traceOut = new StringStream;
+}
+
+/**
+ * Destructor of ASEnhancer
+ * Display the TRACE entries.
+ */
+ASEnhancer::~ASEnhancer()
+{
+#if defined(TRACEswitch) || defined(TRACEcase) || defined(TRACEmisc)
+	WString line;
+	WString msg = "TRACE Entries\n\n";
+	char countLine[50];
+	int count = 0;
+
+	while (getline(*traceOut, line))
+	{
+		msg += line + '\n';
+		count++;
+	}
+	sprintf(countLine, "\n%d Entries", count);
+	msg += countLine;
+	// write a text file to "My Documents" (Windows)
+	char filename [_MAX_PATH + _MAX_FNAME + _MAX_EXT + 1];   // full path and filename
+	strcpy(filename, getenv("USERPROFILE"));
+	strcat(filename, "\\My Documents\\tracee.txt");
+	ofstream outfile(filename);
+	outfile << msg;
+	outfile.close();
+#endif
+	delete traceOut;
+}
+
+/**
+ * initialize the ASEnhancer.
+ *
+ * init() is called each time an ASFormatter object is initialized.
+ */
+void ASEnhancer::init(int _indentLength,
+                      WString _indentString,
+                      bool _isCStyle,
+                      bool _isJavaStyle,
+                      bool _isSharpStyle,
+                      bool _caseIndent,
+                      bool _emptyLineFill)
+{
+	// formatting variables from ASFormatter and ASBeautifier
+	indentLength = _indentLength;
+	if (_indentString[0] == '\t')
+		useTabs = true;
+	else
+		useTabs = false;
+	isCStyle      = _isCStyle;
+	isJavaStyle   = _isJavaStyle;
+	isSharpStyle  = _isSharpStyle;
+	caseIndent    = _caseIndent;
+	emptyLineFill = _emptyLineFill;
+
+	// unindent variables
+	lineNumber = 0;
+	bracketCount = 0;
+	isInComment = false;
+	isInQuote = false;
+	switchDepth = 0;
+	lookingForCaseBracket = false;
+	unindentNextLine = false;
+
+#if defined(TRACEswitch) || defined(TRACEcase) || defined(TRACEmisc)
+	*traceOut << "New file -------------" << endl;
+#endif
+}
+
+/**
+ * additional formatting for line of source code.
+ * every line of source code in a source code file should be sent
+ *     one after the other to this function.
+ * indents event tables
+ * unindents the case blocks
+ *
+ * @param line       the original formatted line will be updated if necessary.
+ */
+void ASEnhancer::enhance(WString &line)
+{
+	static Array<switchVariables>  swVector;       // stack Vector of switch variables
+	static switchVariables sw;                      // switch variables struct
+
+	static bool nextLineIsEventTable;				// begin event table is reached
+	static bool isInEventTable;						// need to indent an event table
+
+	bool   isSpecialChar = false;
+	int    lineLength;                             // length of the line being parsed
+
+	lineNumber++;
+	lineLength = line.GetCount();
+
+	// check for beginning of event table
+	if (nextLineIsEventTable)
+	{
+		isInEventTable = true;
+		nextLineIsEventTable = false;
+	}
+
+	if (lineLength == 0
+	        && ! isInEventTable
+	        && ! emptyLineFill)
+		return;
+
+	// test for unindent on attached brackets
+	if (unindentNextLine)
+	{
+		sw.unindentDepth++;
+		sw.unindentCase = true;
+		unindentNextLine = false;
+		TRcase(" unindent case ", sw.unindentDepth);
+	}
+
+	// parse characters in the current line.
+
+	for (int i = 0; i < lineLength; i++)
+	{
+		char ch = line[i];
+
+		// bypass whitespace
+		if (isWhiteSpaceX(ch))
+			continue;
+
+		// handle special characters (i.e. backslash+character such as \n, \t, ...)
+		if (isSpecialChar)
+		{
+			isSpecialChar = false;
+			continue;
+		}
+		if (!(isInComment) && line.Mid(i, 2) ==  WString("\\\\"))
+		{
+			i++;
+			continue;
+		}
+		if (!(isInComment) && ch == '\\')
+		{
+			isSpecialChar = true;
+			continue;
+		}
+
+		// handle quotes (such as 'x' and "Hello Dolly")
+		if (!(isInComment) && (ch == '"' || ch == '\''))
+			if (!isInQuote)
+			{
+				quoteChar = ch;
+				isInQuote = true;
+			}
+			else if (quoteChar == ch)
+			{
+				isInQuote = false;
+				continue;
+			}
+
+		if (isInQuote)
+			continue;
+
+		// handle comments
+
+		if (!(isInComment) && line.Mid(i, 2) ==  WString("//"))
+		{
+			// check for windows line markers
+//@@ CHECK !!!!			if (line.Mid(i + 2, 1) > WString("\xf0"))
+			if (line.Mid(i + 2, 1) > WString("\xf0") && line.Mid(i + 2, 1) > WString("\xff"))
+				lineNumber--;
+			break;                 // finished with the line
+		}
+		else if (!(isInComment) && line.Mid(i, 2) ==  WString("/*"))
+		{
+			isInComment = true;
+			i++;
+			continue;
+		}
+		else if ((isInComment) && line.Mid(i, 2) == WString("*/"))
+		{
+			isInComment = false;
+			i++;
+			continue;
+		}
+
+		if (isInComment)
+			continue;
+
+		// if we have reached this far then we are NOT in a comment or String of special characters
+
+		if (line[i] == '{')                                 // if open bracket
+			bracketCount++;
+
+		if (line[i] == '}')                     // if close bracket
+			bracketCount--;
+
+		// ----------------  process event tables  --------------------------------------
+
+		// check for event table begin
+		if (findKeyword(line, i, "BEGIN_EVENT_TABLE")
+		        || findKeyword(line, i, "BEGIN_MESSAGE_MAP"))
+			nextLineIsEventTable = true;
+
+		// check for event table end
+		if (findKeyword(line, i, "END_EVENT_TABLE")
+		        || findKeyword(line, i, "END_MESSAGE_MAP"))
+			isInEventTable = false;
+
+		// ----------------  process switch statements  ---------------------------------
+
+		if (findKeyword(line, i, "switch"))                 // if switch statement
+		{
+			switchDepth++;                                  // bump switch depth
+			TRswitch(" switch ", switchDepth);
+			swVector.push_back(sw);                         // save current variables
+			sw.switchBracketCount = 0;
+			sw.unindentCase = false;                        // don't clear case until end of switch
+			i += 5;                                         // bypass switch statement
+			continue;
+		}
+
+		// just want switch statements from this point
+
+		if (caseIndent || switchDepth == 0)                 // from here just want switch statements
+			continue;                                      // get next char
+
+		if (line[i] == '{')                                 // if open bracket
+		{
+			sw.switchBracketCount++;
+			if (lookingForCaseBracket)                      // if 1st after case statement
+			{
+				sw.unindentCase = true;                     // unindenting this case
+				sw.unindentDepth++;                         // bump depth
+				lookingForCaseBracket = false;              // not looking now
+				TRcase(" unindent case ", sw.unindentDepth);
+			}
+			continue;
+		}
+
+		lookingForCaseBracket = false;                      // no opening bracket, don't indent
+
+		if (line[i] == '}')                                 // if close bracket
+		{
+			sw.switchBracketCount--;
+			if (sw.switchBracketCount == 0)                 // if end of switch statement
+			{
+				TRswitch("  endsw ", switchDepth);
+				switchDepth--;                              // one less switch
+				sw = swVector.back();                       // restore sw struct
+				swVector.pop_back();                        // remove last entry from stack
+			}
+			continue;
+		}
+
+		// look for case or default header
+
+		if (findKeyword(line, i, "case") || findKeyword(line, i, "default"))
+		{
+			if (sw.unindentCase)                            // if unindented last case
+			{
+				sw.unindentCase = false;                    // stop unindenting previous case
+				sw.unindentDepth--;                         // reduce depth
+			}
+			for (; i < lineLength; i++)                     // bypass colon
+			{
+				if (line[i] == ':')
+					if ((i + 1 < lineLength) && (line[i + 1] == ':'))
+						i++;								// bypass scope resolution operator
+					else
+						break;
+			}
+			i++;
+			for (; i < lineLength; i++)                     // bypass whitespace
+			{
+				if (!(isWhiteSpaceX(line[i])))
+					break;
+			}
+			if (i < lineLength)                             // check for bracket
+			{
+				if (line[i] == '{')                         // if bracket found
+				{
+					sw.switchBracketCount++;
+					unindentNextLine = true;                // start unindenting on next line
+					continue;
+				}
+			}
+			lookingForCaseBracket = true;                   // bracket must be on next line
+			i--;                                            // need to check for comments
+			continue;
+		}
+	}   // end of for loop
+
+	if (isInEventTable) 									// if need to indent
+		indentLine(line, 1);               					//    do it
+
+	if (sw.unindentDepth > 0)                               // if need to unindent
+		unindentLine(line, sw.unindentDepth);               //    do it
+}
+
+/**
+ * indent a line by a given number of tabsets
+ *    by inserting leading whitespace to the line argument.
+ *
+ * @param line          a pointer to the line to indent.
+ * @param unindent      the number of tabsets to insert.
+ * @return              the number of characters inserted.
+ */
+int ASEnhancer::indentLine(WString  &line, const int indent) const
+{
+	if (line.GetCount() == 0
+	        && ! emptyLineFill)
+		return 0;
+
+	int charsToInsert;                   	// number of chars to insert
+
+	if (useTabs)                    			// if formatted with tabs
+	{
+		charsToInsert = indent;             	// tabs to insert
+		line.Insert(0, WString('\t', charsToInsert));    // insert the tabs
+	}
+	else
+	{
+		charsToInsert = indent * indentLength;  // compute chars to insert
+		line.Insert(0, WString('\t', charsToInsert));    // insert the tabs
+	}
+
+	return charsToInsert;
+}
+
+/**
+ * unindent a line by a given number of tabsets
+ *    by erasing the leading whitespace from the line argument.
+ *
+ * @param line          a pointer to the line to unindent.
+ * @param unindent      the number of tabsets to erase.
+ * @return              the number of characters erased.
+ */
+int ASEnhancer::unindentLine(WString  &line, const int unindent) const
+{
+	int whitespace = ASString_Find_First_Not_Of(line, " \t");
+	if (whitespace == -1)         // if line is blank
+		whitespace = line.GetCount();         // must remove padding, if any
+
+	if (whitespace == 0)
+		return 0;
+
+	int charsToErase;                    // number of chars to erase
+
+	if (useTabs)                    		// if formatted with tabs
+	{
+		charsToErase = unindent;            // tabs to erase
+		if (charsToErase <= whitespace)     // if there is enough whitespace
+			line.Remove(0, charsToErase);    // erase the tabs
+		else
+			charsToErase = 0;
+	}
+	else
+	{
+		charsToErase = unindent * indentLength; // compute chars to erase
+		if (charsToErase <= whitespace)         // if there is enough whitespace
+			line.Remove(0, charsToErase);        // erase the spaces
+		else
+			charsToErase = 0;
+	}
+
+	return charsToErase;
+}
+
+/**
+ * check if a specific line position contains a keyword.
+ *
+ * @return    true if the word was found. false if the word was not found.
+ */
+bool ASEnhancer::findKeyword(const WString &line, int i, const char *keyword) const
+{
+	if (line.Mid(i, strlen(keyword)) ==  WString(keyword))
+	{
+		// check that this is a header and not a part of a longer word
+		// (e.g. not at its begining, not at its middle...)
+
+		int lineLength = line.GetCount();
+		int wordEnd = i + strlen(keyword);
+		char startCh = keyword[0];      // first char of header
+		char endCh = 0;                // char just after header
+		char prevCh = 0;               // char just before header
+
+		if (wordEnd < lineLength)
+		{
+			endCh = line[wordEnd];
+		}
+		if (i > 0)
+		{
+			prevCh = line[i-1];
+		}
+
+		if (prevCh != 0
+		        && isLegalNameCharX(startCh)
+		        && isLegalNameCharX(prevCh))
+		{
+			return false;
+		}
+		else if (wordEnd >= lineLength
+		         || !isLegalNameCharX(startCh)
+		         || !isLegalNameCharX(endCh))
+		{
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	return false;
+}
+
+}   // end namespace astyle
diff --git a/uppsrc/plugin/astyle/ASFormatter.cpp b/uppsrc/plugin/astyle/ASFormatter.cpp
new file mode 100644
index 000000000..43e879975
--- /dev/null
+++ b/uppsrc/plugin/astyle/ASFormatter.cpp
@@ -0,0 +1,2204 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *   ASFormatter.cpp
+ *
+ *   This file is a part of "Artistic Style" - an indentation and
+ *   reformatting tool for C, C++, C# and Java source files.
+ *   http://astyle.sourceforge.net
+ *
+ *   The "Artistic Style" project, including all files needed to
+ *   compile it, is free software; you can redistribute it and/or
+ *   modify it under the terms of the GNU Lesser General Public
+ *   License as published by the Free Software Foundation; either
+ *   version 2.1 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 Lesser General Public License for more details.
+ *
+ *   You should have received a copy of the GNU Lesser General Public
+ *   License along with this project; if not, write to the
+ *   Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ *   Boston, MA  02110-1301, USA.
+ *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ */
+
+ /*
+ 	2008-01-26 Patches by Massimo Del Fedele :
+ 		- modified sources to use Ultimate++ containers instead std:: ones
+ 		- fixed memory leaks based on bug report 1804791 submitted by Eran Ifrah
+ 		- modified to work with unicode
+ */
+#include "astyle.h"
+
+#include <algorithm>
+#include <fstream>
+#include <iostream>
+#ifdef __VMS
+#include <assert>
+#else
+#include <cassert>
+#endif
+
+// can trace only if NDEBUG is not defined
+#ifndef NDEBUG
+// #define TRACEunpad
+// #define TRACEcomment
+// #define TRACEheader
+// #define TRACEbracket
+// #define TRACEarray
+#if defined(TRACEunpad) || defined(TRACEcomment) || defined(TRACEheader) \
+|| defined(TRACEbracket) || defined(TRACEarray)
+ofstream *traceOutF;
+#define TRACEF
+#endif
+#endif
+
+#ifdef TRACEunpad
+#define TRunpad(a,b,c)  if(b > 0 || c > 0) *traceOutF << outLineNumber << " " << b << a << c << endl
+#else
+#define TRunpad(a,b,c)  ((void)0)
+#endif
+
+#ifdef TRACEcomment
+#define TRcomment(a)    *traceOutF << outLineNumber << " " << a << endl
+#else
+#define TRcomment(a)    ((void)0)
+#endif
+
+#ifdef TRACEheader
+#define TRxtra(a)       *traceOutF << outLineNumber << " " << a << endl
+#else
+#define TRxtra(a)    ((void)0)
+#endif
+
+#ifdef TRACEbracket
+#define TRbracket(a)       *traceOutF << outLineNumber << " " << a << endl
+#else
+#define TRbracket(a)    ((void)0)
+#endif
+
+#ifdef TRACEarray
+#define TRarray(a)      *traceOutF << outLineNumber << " " << a << endl
+#else
+#define TRarray(a)      ((void)0)
+#endif
+
+#define INIT_CONTAINER(container, value)     {if ( (container) != NULL ) delete (container); (container) = (value); }
+#define DELETE_CONTAINER(container)          {if ( (container) != NULL ) delete (container); }
+#define IS_A(a,b)                            ( ((a) & (b)) == (b))
+
+using namespace std;
+
+namespace astyle
+{
+Vector<const WString*> ASFormatter::headers;
+Vector<const WString*> ASFormatter::nonParenHeaders;
+Vector<const WString*> ASFormatter::preDefinitionHeaders;
+Vector<const WString*> ASFormatter::preCommandHeaders;
+Vector<const WString*> ASFormatter::operators;
+Vector<const WString*> ASFormatter::assignmentOperators;
+Vector<const WString*> ASFormatter::castOperators;
+
+/**
+ * Constructor of ASFormatter
+ */
+ASFormatter::ASFormatter()
+{
+	preBracketHeaderStack = NULL;
+	bracketTypeStack = NULL;
+	parenStack = NULL;
+	lineCommentNoIndent = false;
+	sourceIterator = NULL;
+	bracketFormatMode = NONE_MODE;
+	shouldPadOperators = false;
+	shouldPadParensOutside = false;
+	shouldPadParensInside = false;
+	shouldUnPadParens = false;
+	shouldBreakOneLineBlocks = true;
+	shouldBreakOneLineStatements = true;
+	shouldConvertTabs = false;
+	shouldBreakBlocks = false;
+	shouldBreakClosingHeaderBlocks = false;
+	shouldBreakClosingHeaderBrackets = false;
+	shouldBreakElseIfs = false;
+#ifdef TRACEF
+	// create a trace text file
+	WString filename = "tracef.txt";
+	char* env = getenv("HOME");
+	if (env != NULL)
+		filename = WString(env) + WString("/tracef.txt");
+	else
+	{
+		env = getenv("USERPROFILE");
+		if (env != NULL)
+			filename = WString(env) + WString("\\My Documents\\tracef.txt");
+		else
+		{
+			cout << "\nCould not open tracef.txt\n" << endl;
+			exit(1);
+		}
+	}
+	traceOutF = new ofstream(filename.c_str());
+#endif
+}
+
+/**
+ * Destructor of ASFormatter
+ */
+ASFormatter::~ASFormatter()
+{
+	DELETE_CONTAINER(preBracketHeaderStack);
+	DELETE_CONTAINER(bracketTypeStack);
+	DELETE_CONTAINER(parenStack);
+#ifdef TRACEF
+	delete traceOutF;
+#endif
+}
+
+/**
+ * initialization of static data of ASFormatter.
+ */
+void ASFormatter::staticInit()
+{
+	static int formatterFileType = 9;      // initialized with an invalid type
+
+	if (fileType == formatterFileType)     // don't build unless necessary
+		return;
+
+	formatterFileType = fileType;
+
+	headers.clear();
+	nonParenHeaders.clear();
+	assignmentOperators.clear();
+	operators.clear();
+	preDefinitionHeaders.clear();
+	preCommandHeaders.clear();
+	castOperators.clear();
+
+	ASResource::buildHeaders(headers, fileType);
+	ASResource::buildNonParenHeaders(nonParenHeaders, fileType);
+	ASResource::buildAssignmentOperators(assignmentOperators);
+	ASResource::buildOperators(operators);
+	ASResource::buildPreDefinitionHeaders(preDefinitionHeaders);
+	ASResource::buildPreCommandHeaders(preCommandHeaders);
+	ASResource::buildCastOperators(castOperators);
+}
+
+/**
+ * initialize the ASFormatter.
+ *
+ * init() should be called every time a ASFormatter object is to start
+ * formatting a NEW source file.
+ * init() recieves a pointer to a DYNAMICALLY CREATED ASSourceIterator object
+ * that will be used to iterate through the source code. This object will be
+ * deleted during the ASFormatter's destruction, and thus should not be
+ * deleted elsewhere.
+ *
+ * @param iter     a pointer to the DYNAMICALLY CREATED ASSourceIterator object.
+ */
+void ASFormatter::init(ASSourceIterator *si)
+{
+	staticInit();
+
+	ASBeautifier::init(si);
+	ASEnhancer::init(ASBeautifier::getIndentLength(),
+	                 ASBeautifier::getIndentString(),
+	                 ASBeautifier::getCStyle(),
+	                 ASBeautifier::getJavaStyle(),
+	                 ASBeautifier::getSharpStyle(),
+	                 ASBeautifier::getCaseIndent(),
+	                 ASBeautifier::getEmptyLineFill());
+	sourceIterator = si;
+
+	INIT_CONTAINER(preBracketHeaderStack, new Vector<const WString*>);
+	INIT_CONTAINER(bracketTypeStack, new Vector<BracketType>);
+	bracketTypeStack->push_back(NULL_TYPE);
+	INIT_CONTAINER(parenStack, new Vector<int>);
+	parenStack->push_back(0);
+
+	currentHeader = NULL;
+	currentLine = WString("");
+	readyFormattedLine = WString("");
+	formattedLine = "";
+	currentChar = ' ';
+	previousChar = ' ';
+	previousCommandChar = ' ';
+	previousNonWSChar = ' ';
+	quoteChar = '"';
+	charNum = 0;
+	spacePadNum = 0;
+	previousReadyFormattedLineLength = -1;
+	templateDepth = 0;
+	previousBracketType = NULL_TYPE;
+	previousOperator = NULL;
+
+	isVirgin = true;
+	isInLineComment = false;
+	isInComment = false;
+	isInPreprocessor = false;
+	doesLineStartComment = false;
+	isInQuote = false;
+	isSpecialChar = false;
+	isNonParenHeader = true;
+	foundNamespaceHeader = false;
+	foundClassHeader = false;
+	foundPreDefinitionHeader = false;
+	foundPreCommandHeader = false;
+	foundCastOperator = false;
+	foundQuestionMark = false;
+	isInLineBreak = false;
+	endOfCodeReached = false;
+	isLineReady = false;
+	isPreviousBracketBlockRelated = true;
+	isInPotentialCalculation = false;
+	shouldReparseCurrentChar = false;
+	passedSemicolon = false;
+	passedColon = false;
+	isInTemplate = false;
+	isInBlParen = false;
+	shouldBreakLineAfterComments = false;
+	isImmediatelyPostComment = false;
+	isImmediatelyPostLineComment = false;
+	isImmediatelyPostEmptyBlock = false;
+	isImmediatelyPostPreprocessor = false;
+
+	isPrependPostBlockEmptyLineRequested = false;
+	isAppendPostBlockEmptyLineRequested = false;
+	prependEmptyLine = false;
+	appendOpeningBracket = false;
+
+	foundClosingHeader = false;
+	previousReadyFormattedLineLength = 0;
+
+	isImmediatelyPostHeader = false;
+	isInHeader = false;
+#ifdef TRACEF
+	// fileName will be empty if ASTYLE_LIB is defined
+	if (fileName.empty())
+		*traceOutF << "new file" << endl;
+	else
+		*traceOutF << fileName << endl;
+#endif
+}
+
+/**
+ * get the next formatted line.
+ *
+ * @return    formatted line.
+ */
+
+WString ASFormatter::nextLine()
+{
+	// these are reset with each new line
+	const WString *newHeader;
+	bool isInVirginLine = isVirgin;
+	isCharImmediatelyPostComment = false;
+	isPreviousCharPostComment = false;
+	isCharImmediatelyPostLineComment = false;
+	isCharImmediatelyPostOpenBlock = false;
+	isCharImmediatelyPostCloseBlock = false;
+	isCharImmediatelyPostTemplate = false;
+
+	while (!isLineReady)
+	{
+		if (shouldReparseCurrentChar)
+			shouldReparseCurrentChar = false;
+		else if (!getNextChar())
+		{
+			breakLine();
+			return beautify(readyFormattedLine);
+		}
+		else // stuff to do when reading a new character...
+		{
+			// make sure that a virgin '{' at the begining ofthe file will be treated as a block...
+			if (isInVirginLine && currentChar == '{')
+				previousCommandChar = '{';
+			isPreviousCharPostComment = isCharImmediatelyPostComment;
+			isCharImmediatelyPostComment = false;
+			isCharImmediatelyPostTemplate = false;
+		}
+
+		//if (inLineNumber >= 185)
+		//	int x = 1;
+
+		if (isInLineComment)
+		{
+			appendCurrentChar();
+
+			// explicitely break a line when a line comment's end is found.
+			if (charNum + 1 == (int) currentLine.GetCount())
+			{
+				isInLineBreak = true;
+				isInLineComment = false;
+				isImmediatelyPostLineComment = true;
+				currentChar = 0;  //make sure it is a neutral char.
+			}
+			continue;
+		}
+		else if (isInComment)
+		{
+			if (isSequenceReached("*/"))
+			{
+				isInComment = false;
+				isImmediatelyPostComment = true;
+				appendSequence(AS_CLOSE_COMMENT);
+				goForward(1);
+			}
+			else
+				appendCurrentChar();
+
+			continue;
+		}
+
+		// not in line comment or comment
+
+		else if (isInQuote)
+		{
+			if (isSpecialChar)
+			{
+				isSpecialChar = false;
+				appendCurrentChar();
+			}
+			else if (currentChar == '\\')
+			{
+				isSpecialChar = true;
+				appendCurrentChar();
+			}
+			else if (quoteChar == currentChar)
+			{
+				isInQuote = false;
+				appendCurrentChar();
+			}
+			else
+			{
+				appendCurrentChar();
+			}
+
+			continue;
+		}
+
+		// handle white space - needed to simplify the rest.
+		if (isWhiteSpace(currentChar) || isInPreprocessor)
+		{
+			appendCurrentChar();
+			continue;
+		}
+
+		/* not in MIDDLE of quote or comment or white-space of any type ... */
+
+		if (isSequenceReached("//"))
+		{
+			if (currentLine[charNum+2] == '\xf2')		// check for windows line marker
+				isAppendPostBlockEmptyLineRequested = false;
+			isInLineComment = true;
+			// do not indent if in column 1 or 2
+			if (lineCommentNoIndent == false)
+			{
+				if (charNum == 0)
+					lineCommentNoIndent = true;
+				else if (charNum == 1 && currentLine[0] == ' ')
+					lineCommentNoIndent = true;
+			}
+			// move comment if spaces were added or deleted
+			if (lineCommentNoIndent == false && spacePadNum != 0)
+				adjustComments();
+			formattedLineCommentNum = formattedLine.GetCount();
+			appendSequence(AS_OPEN_LINE_COMMENT);
+			goForward(1);
+			// explicitely break a line when a line comment's end is found.
+			if (charNum + 1 == (int) currentLine.GetCount())
+			{
+				isInLineBreak = true;
+				isInLineComment = false;
+				isImmediatelyPostLineComment = true;
+				currentChar = 0;  //make sure it is a neutral char.
+			}
+			continue;
+		}
+		else if (isSequenceReached("/*"))
+		{
+			isInComment = true;
+			if (spacePadNum != 0)
+				adjustComments();
+			formattedLineCommentNum = formattedLine.GetCount();
+			appendSequence(AS_OPEN_COMMENT);
+			goForward(1);
+			continue;
+		}
+		else if (currentChar == '"' || currentChar == '\'')
+		{
+			isInQuote = true;
+			quoteChar = currentChar;
+			appendCurrentChar();
+			continue;
+		}
+
+		/* not in quote or comment or white-space of any type ... */
+
+		// check if in preprocessor
+		// ** isInPreprocessor will be automatically reset at the begining
+		//    of a new line in getnextChar()
+		if (currentChar == '#')
+		{
+			isInPreprocessor = true;
+			appendCurrentChar();
+			continue;
+		}
+
+		/* not in preprocessor ... */
+
+		if (isImmediatelyPostComment)
+		{
+			isImmediatelyPostComment = false;
+			isCharImmediatelyPostComment = true;
+		}
+
+		if (isImmediatelyPostLineComment)
+		{
+			isImmediatelyPostLineComment = false;
+			isCharImmediatelyPostLineComment = true;
+		}
+
+		if (shouldBreakLineAfterComments)
+		{
+			shouldBreakLineAfterComments = false;
+			shouldReparseCurrentChar = true;
+			breakLine();
+			continue;
+		}
+
+		// reset isImmediatelyPostHeader information
+		if (isImmediatelyPostHeader)
+		{
+			isImmediatelyPostHeader = false;
+
+			// Make sure headers are broken from their succeeding blocks
+			// (e.g.
+			//     if (isFoo) DoBar();
+			//  should become
+			//     if (isFoo)
+			//         DoBar;
+			// )
+			// But treat else if() as a special case which should not be broken!
+			if (shouldBreakOneLineStatements)
+			{
+				// if may break 'else if()'s, then simply break the line
+
+				if (shouldBreakElseIfs)
+					isInLineBreak = true;
+			}
+		}
+
+		if (passedSemicolon)	// need to break the formattedLine
+		{
+			passedSemicolon = false;
+			if (parenStack->back() == 0 && currentChar != ';') // allow ;;
+			{
+				// does a one-line statement have ending comments?
+				if (IS_A(bracketTypeStack->back(), SINGLE_LINE_TYPE))
+				{
+					int blockEnd = ASString_ReverseFind(currentLine, AS_CLOSE_BRACKET);
+					assert(blockEnd != -1);
+
+					// move ending comments to this formattedLine
+					if (isBeforeLineEndComment(blockEnd))
+					{
+						int commentStart = ASString_Find_First_Not_Of(currentLine, " \t", blockEnd + 1);
+						assert(commentStart != -1);
+						assert((currentLine.Mid(commentStart, 2) == WString("//"))
+						       || (currentLine.Mid(commentStart, 2) == WString("/*")));
+						int commentLength = currentLine.GetCount() - commentStart;
+						int tabCount = getIndentLength();
+						appendSpacePad();
+						for (int i=1; i<tabCount; i++)
+							formattedLine.Cat(' ');
+						formattedLine.Cat(currentLine.Mid(commentStart, commentLength));
+						currentLine.Remove(commentStart, commentLength);
+					}
+				}
+				shouldReparseCurrentChar = true;
+				isInLineBreak = true;
+				continue;
+			}
+		}
+
+		if (passedColon)
+		{
+			passedColon = false;
+			if (parenStack->back() == 0 && !isBeforeComment())
+			{
+				shouldReparseCurrentChar = true;
+				isInLineBreak = true;
+				continue;
+			}
+		}
+
+		// Check if in template declaration, e.g. foo<bar> or foo<bar,fig>
+		// If so, set isInTemplate to true
+		if (!isInTemplate && currentChar == '<')
+		{
+			int maxTemplateDepth = 0;
+			templateDepth = 0;
+			const WString *oper;
+			for (int i = charNum;
+			        i < currentLine.GetCount();
+			        i += (oper ? oper->GetCount() : 1))
+			{
+				oper = ASBeautifier::findHeader(currentLine, i, operators);
+
+				if (oper == &AS_LS)
+				{
+					templateDepth++;
+					maxTemplateDepth++;
+				}
+				else if (oper == &AS_GR)
+				{
+					templateDepth--;
+					if (templateDepth == 0)
+					{
+						// this is a template!
+						isInTemplate = true;
+						templateDepth = maxTemplateDepth;
+						break;
+					}
+				}
+				else if (oper == &AS_COMMA            // comma,     e.g. A<int, char>
+				         || oper == &AS_BIT_AND       // reference, e.g. A<int&>
+				         || oper == &AS_MULT          // pointer,   e.g. A<int*>
+				         || oper == &AS_COLON_COLON)  // ::,        e.g. std::string
+				{
+					continue;
+				}
+				else if (!isLegalNameChar(currentLine[i]) && !isWhiteSpace(currentLine[i]))
+				{
+					// this is not a template -> leave...
+					isInTemplate = false;
+					break;
+				}
+			}
+		}
+
+		// handle parenthesies
+		if (currentChar == '(' || currentChar == '[' || (isInTemplate && currentChar == '<'))
+		{
+			parenStack->back()++;
+			if (currentChar == '[')
+				isInBlParen = true;
+		}
+		else if (currentChar == ')' || currentChar == ']' || (isInTemplate && currentChar == '>'))
+		{
+			parenStack->back()--;
+			if (isInTemplate && currentChar == '>')
+			{
+				templateDepth--;
+				if (templateDepth == 0)
+				{
+					isInTemplate = false;
+					isCharImmediatelyPostTemplate = true;
+				}
+			}
+
+			// check if this parenthesis closes a header, e.g. if (...), while (...)
+			if (isInHeader && parenStack->back() == 0)
+			{
+				isInHeader = false;
+				isImmediatelyPostHeader = true;
+			}
+			if (currentChar == ']')
+				isInBlParen = false;
+			if (currentChar == ')')
+				foundCastOperator = false;
+		}
+
+		// handle brackets
+		if (currentChar == '{' || currentChar == '}')
+		{
+			if (currentChar == '{')
+			{
+				BracketType newBracketType = getBracketType();
+				foundNamespaceHeader = false;
+				foundClassHeader = false;
+				foundPreDefinitionHeader = false;
+				foundPreCommandHeader = false;
+				isInPotentialCalculation = false;
+
+				bracketTypeStack->push_back(newBracketType);
+				preBracketHeaderStack->push_back(currentHeader);
+				currentHeader = NULL;
+
+				isPreviousBracketBlockRelated = !IS_A(newBracketType, ARRAY_TYPE);
+			}
+
+			// this must be done before the bracketTypeStack is popped
+			BracketType bracketType = bracketTypeStack->back();
+			bool isOpeningArrayBracket = (IS_A(bracketType, ARRAY_TYPE)
+			                              && bracketTypeStack->size() >= 2
+			                              && !IS_A((*bracketTypeStack)[bracketTypeStack->size()-2], ARRAY_TYPE)
+			                             );
+
+			if (currentChar == '}')
+			{
+				// if a request has been made to append a post block empty line,
+				// but the block exists immediately before a closing bracket,
+				// then there is not need for the post block empty line.
+				//
+				isAppendPostBlockEmptyLineRequested = false;
+
+				if (!bracketTypeStack->IsEmpty())
+				{
+					previousBracketType = bracketTypeStack->back();
+					bracketTypeStack->pop_back();
+					isPreviousBracketBlockRelated = !IS_A(bracketType, ARRAY_TYPE);
+				}
+
+				if (!preBracketHeaderStack->IsEmpty())
+				{
+					currentHeader = preBracketHeaderStack->back();
+					preBracketHeaderStack->pop_back();
+				}
+				else
+					currentHeader = NULL;
+			}
+
+			// format brackets
+			if (IS_A(bracketType, ARRAY_TYPE))
+				formatArrayBrackets(bracketType, isOpeningArrayBracket);
+			else
+				formatBrackets(bracketType);
+			continue;
+		}
+
+		if (((previousCommandChar == '{' && isPreviousBracketBlockRelated)
+		        || (previousCommandChar == '}'
+		            && bracketFormatMode != NONE_MODE
+		            && !isImmediatelyPostEmptyBlock
+		            && isPreviousBracketBlockRelated
+		            && !isPreviousCharPostComment       // Fixes wrongly appended newlines after '}' immediately after comments
+		            && peekNextChar() != ' '
+		            && !IS_A(previousBracketType,  DEFINITION_TYPE)
+		            && !(ASBeautifier::isJavaStyle && currentChar == ')'))
+		        && !IS_A(bracketTypeStack->back(),  DEFINITION_TYPE))
+		        && (shouldBreakOneLineBlocks
+		            || !IS_A(bracketTypeStack->back(),  SINGLE_LINE_TYPE)))
+		{
+			isCharImmediatelyPostOpenBlock = (previousCommandChar == '{');
+			isCharImmediatelyPostCloseBlock = (previousCommandChar == '}');
+
+			//if (bracketFormatMode != NONE_MODE)
+			//{
+			previousCommandChar = ' ';
+			isInLineBreak = true;
+			//}
+		}
+
+		// reset block handling flags
+		isImmediatelyPostEmptyBlock = false;
+
+		// look for headers
+		if (!isInTemplate)
+		{
+			if ((newHeader = findHeader(headers)) != NULL)
+			{
+				foundClosingHeader = false;
+				const WString *previousHeader;
+
+				// recognize closing headers of do..while, if..else, try..catch..finally
+				if ((newHeader == &AS_ELSE && currentHeader == &AS_IF)
+				        || (newHeader == &AS_WHILE && currentHeader == &AS_DO)
+				        || (newHeader == &AS_CATCH && currentHeader == &AS_TRY)
+				        || (newHeader == &AS_CATCH && currentHeader == &AS_CATCH)
+				        || (newHeader == &AS_FINALLY && currentHeader == &AS_TRY)
+				        || (newHeader == &AS_FINALLY && currentHeader == &AS_CATCH))
+					foundClosingHeader = true;
+
+				previousHeader = currentHeader;
+				currentHeader = newHeader;
+
+				// If in ATTACH or LINUX bracket modes, attach closing headers (e.g. 'else', 'catch')
+				// to their preceding bracket,
+				// But do not perform the attachment if the shouldBreakClosingHeaderBrackets is set!
+				if (!shouldBreakClosingHeaderBrackets
+				        && foundClosingHeader
+				        && (bracketFormatMode == ATTACH_MODE || bracketFormatMode == BDAC_MODE)
+				        && (shouldBreakOneLineBlocks || !IS_A(previousBracketType,  SINGLE_LINE_TYPE))
+				        && previousNonWSChar == '}')
+				{
+					spacePadNum = 0;                // don't count as padding
+
+					int firstChar = ASString_Find_First_Not_Of(formattedLine, " \t");
+
+					if (firstChar >= 0)		// if a blank line does not preceed this
+					{
+						isInLineBreak = false;
+						appendSpacePad();
+					}
+
+					if (shouldBreakBlocks)
+						isAppendPostBlockEmptyLineRequested = false;
+				}
+
+				// If NONE bracket mode, leave closing headers as they are (e.g. 'else', 'catch')
+				if (foundClosingHeader && bracketFormatMode == NONE_MODE && previousCommandChar == '}')
+				{
+					if (lineBeginsWith('}'))                    // is closing bracket broken?
+					{
+						isInLineBreak = false;
+						appendSpacePad();
+					}
+
+					if (shouldBreakBlocks)
+						isAppendPostBlockEmptyLineRequested = false;
+				}
+
+				if (foundClosingHeader && bracketFormatMode == BREAK_MODE && previousCommandChar == '}')
+					breakLine();
+
+				//Check if a template definition as been reached, e.g. template<class A>
+				//if (newHeader == &AS_TEMPLATE)
+				//{
+				//	isInTemplate = true;
+				//}
+
+				// check if the found header is non-paren header
+				isNonParenHeader = (find(nonParenHeaders.begin(), nonParenHeaders.end(),
+				                         newHeader) != nonParenHeaders.end());
+
+				appendSequence(*currentHeader);
+				goForward(currentHeader->GetCount() - 1);
+				// if a paren-header is found add a space after it, if needed
+				// this checks currentLine, appendSpacePad() checks formattedLine
+				if (!isNonParenHeader && charNum < (int) currentLine.GetCount() && !isWhiteSpace(currentLine[charNum+1]))
+					appendSpacePad();
+
+				// Signal that a header has been reached
+				// *** But treat a closing while() (as in do...while)
+				//     as if it where NOT a header since a closing while()
+				//     should never have a block after it!
+				if (!(foundClosingHeader && currentHeader == &AS_WHILE))
+				{
+					isInHeader = true;
+					if (isNonParenHeader)
+					{
+						isImmediatelyPostHeader = true;
+						isInHeader = false;
+					}
+				}
+
+				if (currentHeader == &AS_IF && previousHeader == &AS_ELSE)
+					isInLineBreak = false;
+
+				if (shouldBreakBlocks)
+				{
+					if (previousHeader == NULL
+					        && !foundClosingHeader
+					        && !isCharImmediatelyPostOpenBlock)
+					{
+						isPrependPostBlockEmptyLineRequested = true;
+					}
+
+					if (currentHeader == &AS_ELSE
+					        || currentHeader == &AS_CATCH
+					        || currentHeader == &AS_FINALLY
+					        || foundClosingHeader)
+					{
+						isPrependPostBlockEmptyLineRequested = false;
+					}
+
+					if (shouldBreakClosingHeaderBlocks
+					        &&  isCharImmediatelyPostCloseBlock)
+					{
+						isPrependPostBlockEmptyLineRequested = true;
+					}
+
+				}
+
+				continue;
+			}
+			else if ((newHeader = findHeader(preDefinitionHeaders)) != NULL
+			         && parenStack->back() == 0)
+			{
+				if (newHeader == &AS_NAMESPACE)
+					foundNamespaceHeader = true;
+				if (newHeader == &AS_CLASS)
+					foundClassHeader = true;
+				foundPreDefinitionHeader = true;
+				appendSequence(*newHeader);
+				goForward(newHeader->GetCount() - 1);
+
+				if (shouldBreakBlocks)
+					isPrependPostBlockEmptyLineRequested = true;
+
+				continue;
+			}
+			else if ((newHeader = findHeader(preCommandHeaders)) != NULL)
+			{
+				if (ASBeautifier::isJavaStyle
+				        || (*newHeader == AS_CONST && previousCommandChar == ')') // 'const' member functions is a command bracket
+				        || *newHeader == AS_EXTERN)
+					foundPreCommandHeader = true;
+				appendSequence(*newHeader);
+				goForward(newHeader->GetCount() - 1);
+
+				continue;
+			}
+			else if ((newHeader = findHeader(castOperators)) != NULL)
+			{
+				foundCastOperator = true;
+				appendSequence(*newHeader);
+				goForward(newHeader->GetCount() - 1);
+
+				continue;
+			}
+
+		}
+
+		if (isInLineBreak)          // OK to break line here
+			breakLine();
+
+		if (previousNonWSChar == '}' || currentChar == ';')
+		{
+			if (shouldBreakOneLineStatements && currentChar == ';'
+			        && (shouldBreakOneLineBlocks || !IS_A(bracketTypeStack->back(),  SINGLE_LINE_TYPE))
+			        //&& (! bracketFormatMode == NONE_MODE)
+			   )
+			{
+				passedSemicolon = true;
+			}
+
+			if (shouldBreakBlocks && currentHeader != NULL && parenStack->back() == 0)
+			{
+				isAppendPostBlockEmptyLineRequested = true;
+			}
+
+			if (currentChar != ';')
+				currentHeader = NULL;
+
+			foundQuestionMark = false;
+			foundNamespaceHeader = false;
+			foundClassHeader = false;
+			foundPreDefinitionHeader = false;
+			foundPreCommandHeader = false;
+			foundCastOperator = false;
+			isInPotentialCalculation = false;
+			isNonInStatementArray = false;
+		}
+
+		if (currentChar == ':'
+		        && shouldBreakOneLineStatements
+		        && !foundQuestionMark           // not in a ... ? ... : ... sequence
+		        && !foundPreDefinitionHeader    // not in a definition block (e.g. class foo : public bar
+		        && previousCommandChar != ')'   // not immediately after closing paren of a method header, e.g. ASFormatter::ASFormatter(...) : ASBeautifier(...)
+		        && previousChar != ':'          // not part of '::'
+		        && peekNextChar() != ':')       // not part of '::'
+		{
+			passedColon = true;
+			if (shouldBreakBlocks)
+				isPrependPostBlockEmptyLineRequested = true;
+		}
+
+		if (currentChar == '?')
+			foundQuestionMark = true;
+
+		// determine if this is a potential calculation
+		newHeader = findHeader(operators);
+
+		if (newHeader != NULL)
+		{
+			if (!isInPotentialCalculation)
+			{
+				if (find(assignmentOperators.begin(), assignmentOperators.end(), newHeader)
+				        != assignmentOperators.end())
+				{
+					char peekedChar = peekNextChar();
+					isInPotentialCalculation = (newHeader != &AS_RETURN
+					                            && !(newHeader == &AS_EQUAL && peekedChar == '*')
+					                            && !(newHeader == &AS_EQUAL && peekedChar == '&'));
+				}
+			}
+		}
+		else
+		{
+			// the following are not calculations
+			if (currentLine.Mid(charNum, 3) ==  WString("new") && !isLegalNameChar(currentLine[charNum+3]))
+				isInPotentialCalculation = false;
+		}
+
+		if (shouldPadOperators && newHeader != NULL)
+		{
+			padOperators(newHeader);
+			continue;
+		}
+
+		if ((shouldPadParensOutside || shouldPadParensInside || shouldUnPadParens)
+		        && (currentChar == '(' || currentChar == ')'))
+		{
+			padParens();
+			continue;
+		}
+
+		appendCurrentChar();
+	}   // end of while loop  *  end of while loop  *  end of while loop  *  end of while loop
+
+	// return a beautified (i.e. correctly indented) line.
+
+	WString beautifiedLine;
+	int readyFormattedLineLength = trim(readyFormattedLine).GetCount();
+
+	if (prependEmptyLine                // prepend a blank line before this formatted line
+	        && readyFormattedLineLength > 0
+	        && previousReadyFormattedLineLength > 0)
+	{
+		isLineReady = true;             // signal that a readyFormattedLine is still waiting
+		beautifiedLine = beautify("");
+		previousReadyFormattedLineLength = 0;
+	}
+	else								// format the current formatted line
+	{
+		isLineReady = false;
+		beautifiedLine = beautify(readyFormattedLine);
+		previousReadyFormattedLineLength = readyFormattedLineLength;
+		lineCommentNoBeautify = lineCommentNoIndent;
+		lineCommentNoIndent = false;
+		if (appendOpeningBracket)       // insert bracket after this formatted line
+		{
+			appendOpeningBracket = false;
+			isLineReady = true;         // signal that a readyFormattedLine is still waiting
+			readyFormattedLine = "{";
+			isPrependPostBlockEmptyLineRequested = false;	// next line should not be empty
+		}
+	}
+
+	prependEmptyLine = false;
+	enhance(beautifiedLine);                // call the enhancer function
+	return beautifiedLine;
+}
+
+
+/**
+* check if there are any indented lines ready to be read by nextLine()
+*
+* @return    are there any indented lines ready?
+*/
+bool ASFormatter::hasMoreLines() const
+{
+	return !endOfCodeReached;
+}
+
+/**
+ * set the bracket formatting mode.
+ * options:
+ *    astyle::NONE_MODE     no formatting of brackets.
+ *    astyle::ATTACH_MODE   Java, K&R style bracket placement.
+ *    astyle::BREAK_MODE    ANSI C/C++ style bracket placement.
+ *
+ * @param mode         the bracket formatting mode.
+ */
+void ASFormatter::setBracketFormatMode(BracketMode mode)
+{
+	bracketFormatMode = mode;
+}
+
+/**
+ * set closing header bracket breaking mode
+ * options:
+ *    true     brackets just before closing headers (e.g. 'else', 'catch')
+ *             will be broken, even if standard brackets are attached.
+ *    false    closing header brackets will be treated as standard brackets.
+ *
+ * @param state         the closing header bracket breaking mode.
+ */
+void ASFormatter::setBreakClosingHeaderBracketsMode(bool state)
+{
+	shouldBreakClosingHeaderBrackets = state;
+}
+
+/**
+ * set 'else if()' breaking mode
+ * options:
+ *    true     'else' headers will be broken from their succeeding 'if' headers.
+ *    false    'else' headers will be attached to their succeeding 'if' headers.
+ *
+ * @param state         the 'else if()' breaking mode.
+ */
+void ASFormatter::setBreakElseIfsMode(bool state)
+{
+	shouldBreakElseIfs = state;
+}
+
+/**
+ * set operator padding mode.
+ * options:
+ *    true     statement operators will be padded with spaces around them.
+ *    false    statement operators will not be padded.
+ *
+ * @param state         the padding mode.
+ */
+void ASFormatter::setOperatorPaddingMode(bool state)
+{
+	shouldPadOperators = state;
+}
+
+/**
+* set parenthesis outside padding mode.
+* options:
+*    true     statement parenthesiss will be padded with spaces around them.
+*    false    statement parenthesiss will not be padded.
+*
+* @param state         the padding mode.
+*/
+void ASFormatter::setParensOutsidePaddingMode(bool state)
+{
+	shouldPadParensOutside = state;
+}
+
+/**
+* set parenthesis inside padding mode.
+* options:
+*    true     statement parenthesis will be padded with spaces around them.
+*    false    statement parenthesis will not be padded.
+*
+* @param state         the padding mode.
+*/
+void ASFormatter::setParensInsidePaddingMode(bool state)
+{
+	shouldPadParensInside = state;
+}
+
+/**
+* set parenthesis unpadding mode.
+* options:
+*    true     statement parenthesis will be unpadded with spaces removed around them.
+*    false    statement parenthesis will not be unpadded.
+*
+* @param state         the padding mode.
+*/
+void ASFormatter::setParensUnPaddingMode(bool state)
+{
+	shouldUnPadParens = state;
+}
+
+/**
+ * set option to break/not break one-line blocks
+ *
+ * @param state        true = break, false = don't break.
+ */
+void ASFormatter::setBreakOneLineBlocksMode(bool state)
+{
+	shouldBreakOneLineBlocks = state;
+}
+
+/**
+ * set option to break/not break lines consisting of multiple statements.
+ *
+ * @param state        true = break, false = don't break.
+ */
+void ASFormatter::setSingleStatementsMode(bool state)
+{
+	shouldBreakOneLineStatements = state;
+}
+
+/**
+ * set option to convert tabs to spaces.
+ *
+ * @param state        true = convert, false = don't convert.
+ */
+void ASFormatter::setTabSpaceConversionMode(bool state)
+{
+	shouldConvertTabs = state;
+}
+
+
+/**
+ * set option to break unrelated blocks of code with empty lines.
+ *
+ * @param state        true = convert, false = don't convert.
+ */
+void ASFormatter::setBreakBlocksMode(bool state)
+{
+	shouldBreakBlocks = state;
+}
+
+/**
+ * set option to break closing header blocks of code (such as 'else', 'catch', ...) with empty lines.
+ *
+ * @param state        true = convert, false = don't convert.
+ */
+void ASFormatter::setBreakClosingHeaderBlocksMode(bool state)
+{
+	shouldBreakClosingHeaderBlocks = state;
+}
+
+/**
+ * jump over several characters.
+ *
+ * @param i       the number of characters to jump over.
+ */
+void ASFormatter::goForward(int i)
+{
+	while (--i >= 0)
+		getNextChar();
+}
+
+/**
+* peek at the next unread character.
+*
+* @return     the next unread character.
+*/
+char ASFormatter::peekNextChar() const
+{
+	char ch = ' ';
+	int peekNum = ASString_Find_First_Not_Of(currentLine, " \t", charNum + 1);
+	if (peekNum < 0)
+		return ch;
+
+	ch = currentLine[peekNum];
+
+//	if (shouldConvertTabs && ch == '\t')
+//		ch = ' ';
+
+	return ch;
+}
+
+/**
+* check if current placement is before a comment or line-comment
+*
+* @return     is before a comment or line-comment.
+*/
+bool ASFormatter::isBeforeComment() const
+{
+	bool foundComment = false;
+	int peekNum = ASString_Find_First_Not_Of(currentLine, " \t", charNum + 1);
+	if (peekNum < 0)
+		return foundComment;
+
+	foundComment = (currentLine.Mid(peekNum, 2) == WString("/*")
+	                || currentLine.Mid(peekNum, 2) == WString("//"));
+
+	return foundComment;
+}
+
+/**
+* check if current placement is before a comment or line-comment
+* if a block comment it must be at the end of the line
+*
+* @return     is before a comment or line-comment.
+*/
+bool ASFormatter::isBeforeLineEndComment(int startPos) const
+{
+	bool foundLineEndComment = false;
+	int peekNum = ASString_Find_First_Not_Of(currentLine, " \t", startPos + 1);
+	if (peekNum >= 0)
+	{
+		if (currentLine.Mid(peekNum, 2) == WString("//"))
+			foundLineEndComment = true;
+		else if (currentLine.Mid(peekNum, 2) == WString("/*"))
+		{
+			// comment must be closed on this line with nothing after it
+			int endNum = currentLine.Find("*/", peekNum + 2);
+			if (endNum >= 0)
+				if(ASString_Find_First_Not_Of(currentLine, " \t", endNum + 2) < 0)
+					foundLineEndComment = true;
+
+		}
+	}
+	return foundLineEndComment;
+}
+
+
+/**
+* get the next character, increasing the current placement in the process.
+* the new character is inserted into the variable currentChar.
+*
+* @return   whether succeded to recieve the new character.
+*/
+bool ASFormatter::getNextChar()
+{
+	isInLineBreak = false;
+	previousChar = currentChar;
+
+	if (!isWhiteSpace(currentChar))
+	{
+		previousNonWSChar = currentChar;
+		if (!isInComment && !isInLineComment && !isInQuote
+		        && !isImmediatelyPostComment
+		        && !isImmediatelyPostLineComment
+		        && !isSequenceReached("/*")
+		        && !isSequenceReached("//"))
+			previousCommandChar = previousNonWSChar;
+	}
+
+	int currentLineLength = currentLine.GetCount();
+
+	if (charNum + 1 < currentLineLength
+	        && (!isWhiteSpace(peekNextChar()) || isInComment || isInLineComment))
+	{
+		currentChar = currentLine[++charNum];
+
+		if (shouldConvertTabs && currentChar == '\t')
+			currentChar = ' ';
+
+		return true;
+	}
+	else        // end of line has been reached
+	{
+		if (sourceIterator->hasMoreLines())
+		{
+			currentLine = sourceIterator->nextLine();
+			spacePadNum = 0;
+			inLineNumber++;
+
+			if (currentLine.GetCount() == 0)
+			{
+				currentLine = WString(" ");        // a null is inserted if this is not done
+			}
+
+			// unless reading in the first line of the file,
+			// break a new line.
+			if (!isVirgin)
+				isInLineBreak = true;
+			else
+				isVirgin = false;
+
+			if (isInLineComment)
+				isImmediatelyPostLineComment = true;
+			isInLineComment = false;
+
+			// check if is in preprocessor before line trimming
+			isImmediatelyPostPreprocessor = isInPreprocessor;
+			if (previousNonWSChar != '\\')
+				isInPreprocessor = false;
+
+			trimNewLine();
+			currentChar = currentLine[charNum];
+
+			if (shouldConvertTabs && currentChar == '\t')
+				currentChar = ' ';
+
+			return true;
+		}
+		else
+		{
+			endOfCodeReached = true;
+			return false;
+		}
+	}
+}
+
+/**
+* jump over the leading white space in the current line,
+* IF the line does not begin a comment or is in a preprocessor definition.
+*/
+void ASFormatter::trimNewLine()
+{
+	int len = currentLine.GetCount();
+	charNum = 0;
+
+	if (isInComment || isInPreprocessor)
+		return;
+
+	while (isWhiteSpace(currentLine[charNum]) && charNum + 1 < len)
+		++charNum;
+
+	doesLineStartComment = false;
+	if (isSequenceReached("/*"))
+	{
+		charNum = 0;
+		doesLineStartComment = true;
+	}
+}
+
+/**
+ * append a character to the current formatted line.
+ * Unless disabled (via canBreakLine == false), first check if a
+ * line-break has been registered, and if so break the
+ * formatted line, and only then append the character into
+ * the next formatted line.
+ *
+ * @param ch               the character to append.
+ * @param canBreakLine     if true, a registered line-break
+ */
+void ASFormatter::appendChar(char ch, bool canBreakLine)
+{
+	if (canBreakLine && isInLineBreak)
+		breakLine();
+	formattedLine.Cat(ch);
+}
+
+/**
+ * append a string sequence to the current formatted line.
+ * Unless disabled (via canBreakLine == false), first check if a
+ * line-break has been registered, and if so break the
+ * formatted line, and only then append the sequence into
+ * the next formatted line.
+ *
+ * @param sequence         the sequence to append.
+ * @param canBreakLine     if true, a registered line-break
+ */
+void ASFormatter::appendSequence(const WString &sequence, bool canBreakLine)
+{
+	if (canBreakLine && isInLineBreak)
+		breakLine();
+	formattedLine.Cat(sequence);
+}
+
+/**
+ * append a space to the current formattedline, UNLESS the
+ * last character is already a white-space character.
+ */
+void ASFormatter::appendSpacePad()
+{
+	int len = formattedLine.GetCount();
+	if (len > 0 && !isWhiteSpace(formattedLine[len-1]))
+	{
+		formattedLine.Cat(' ');
+		spacePadNum++;
+	}
+}
+
+/**
+ * append a space to the current formattedline, UNLESS the
+ * next character is already a white-space character.
+ */
+void ASFormatter::appendSpaceAfter()
+{
+	int len = currentLine.GetCount();
+	if (charNum + 1 < len && !isWhiteSpace(currentLine[charNum+1]))
+	{
+		formattedLine.Cat(' ');
+		spacePadNum++;
+	}
+}
+
+/**
+ * register a line break for the formatted line.
+ */
+void ASFormatter::breakLine()
+{
+	isLineReady = true;
+	isInLineBreak = false;
+	spacePadNum = 0;
+	formattedLineCommentNum = -1;
+
+	// queue an empty line prepend request if one exists
+	prependEmptyLine = isPrependPostBlockEmptyLineRequested;
+
+	readyFormattedLine =  formattedLine;
+	if (isAppendPostBlockEmptyLineRequested)
+	{
+		isAppendPostBlockEmptyLineRequested = false;
+		isPrependPostBlockEmptyLineRequested = true;
+	}
+	else
+	{
+		isPrependPostBlockEmptyLineRequested = false;
+	}
+
+	formattedLine = "";
+}
+
+/**
+ * check if the currently reached open-bracket (i.e. '{')
+ * opens a:
+ * - a definition type block (such as a class or namespace),
+ * - a command block (such as a method block)
+ * - a static array
+ * this method takes for granted that the current character
+ * is an opening bracket.
+ *
+ * @return    the type of the opened block.
+ */
+BracketType ASFormatter::getBracketType() const
+{
+	BracketType returnVal;
+
+	if (foundPreDefinitionHeader)
+	{
+		returnVal = DEFINITION_TYPE;
+		if (foundNamespaceHeader)
+			returnVal = (BracketType)(returnVal | NAMESPACE_TYPE);
+		else if (foundClassHeader)
+			returnVal = (BracketType)(returnVal | CLASS_TYPE);
+	}
+	else
+	{
+		bool isCommandType = false;
+
+		if (previousNonWSChar != '=')
+			isCommandType = (foundPreCommandHeader
+			                 || (currentHeader != NULL && isNonParenHeader)
+			                 || (previousCommandChar == ')')
+			                 || (previousCommandChar == ':' && !foundQuestionMark)
+			                 || (previousCommandChar == ';')
+			                 || ((previousCommandChar == '{' ||  previousCommandChar == '}')
+			                     && isPreviousBracketBlockRelated));
+
+		returnVal = (isCommandType ? COMMAND_TYPE : ARRAY_TYPE);
+	}
+
+	if (isOneLineBlockReached())
+		returnVal = (BracketType)(returnVal | SINGLE_LINE_TYPE);
+
+	TRbracket(returnVal);
+	return returnVal;
+}
+
+/**
+ * check if the currently reached  '*' or '&' character is
+ * a pointer-or-reference symbol, or another operator.
+ * this method takes for granted that the current character
+ * is either a '*' or '&'.
+ *
+ * @return        whether current character is a reference-or-pointer
+ */
+bool ASFormatter::isPointerOrReference() const
+{
+	bool isPR;
+	isPR = (!isInPotentialCalculation
+	        || IS_A(bracketTypeStack->back(), DEFINITION_TYPE)
+	        || (!isLegalNameChar(previousNonWSChar)
+	            && previousNonWSChar != ')'
+	            && previousNonWSChar != ']')
+	       );
+
+	if (!isPR)
+	{
+		char nextChar = peekNextChar();
+		isPR |= (!isWhiteSpace(nextChar)
+		         && nextChar != '-'
+		         && nextChar != '('
+		         && nextChar != '['
+		         && !isLegalNameChar(nextChar));
+	}
+
+	return isPR;
+}
+
+
+/**
+ * check if the currently reached '-' character is
+ * a unary minus
+ * this method takes for granted that the current character
+ * is a '-'.
+ *
+ * @return        whether the current '-' is a unary minus.
+ */
+bool ASFormatter::isUnaryMinus() const
+{
+	return ((previousOperator == &AS_RETURN || !isalnum(previousCommandChar))
+	        && previousCommandChar != '.'
+	        && previousCommandChar != ')'
+	        && previousCommandChar != ']');
+}
+
+
+/**
+ * check if the currently reached '-' or '+' character is
+ * part of an exponent, i.e. 0.2E-5.
+ * this method takes for granted that the current character
+ * is a '-' or '+'.
+ *
+ * @return        whether the current '-' is in an exponent.
+ */
+bool ASFormatter::isInExponent() const
+{
+	int formattedLineLength = formattedLine.GetCount();
+	if (formattedLineLength >= 2)
+	{
+		char prevPrevFormattedChar = formattedLine[formattedLineLength - 2];
+		char prevFormattedChar = formattedLine[formattedLineLength - 1];
+
+		return ((prevFormattedChar == 'e' || prevFormattedChar == 'E')
+		        && (prevPrevFormattedChar == '.' || isdigit(prevPrevFormattedChar)));
+	}
+	else
+		return false;
+}
+
+/**
+ * check if a one-line bracket has been reached,
+ * i.e. if the currently reached '{' character is closed
+ * with a complimentry '}' elsewhere on the current line,
+ *.
+ * @return        has a one-line bracket been reached?
+ */
+bool ASFormatter::isOneLineBlockReached() const
+{
+	bool isInComment = false;
+	bool isInQuote = false;
+	int bracketCount = 1;
+	int currentLineLength = currentLine.GetCount();
+	char quoteChar = ' ';
+
+	for (int i = charNum + 1; i < currentLineLength; ++i)
+	{
+		char ch = currentLine[i];
+
+		if (isInComment)
+		{
+			if (currentLine.Mid(i, 2) == WString("*/"))
+			{
+				isInComment = false;
+				++i;
+			}
+			continue;
+		}
+
+		if (ch == '\\')
+		{
+			++i;
+			continue;
+		}
+
+		if (isInQuote)
+		{
+			if (ch == quoteChar)
+				isInQuote = false;
+			continue;
+		}
+
+		if (ch == '"' || ch == '\'')
+		{
+			isInQuote = true;
+			quoteChar = ch;
+			continue;
+		}
+
+		if (currentLine.Mid(i, 2) == WString("//"))
+			break;
+
+		if (currentLine.Mid(i, 2) == WString("/*"))
+		{
+			isInComment = true;
+			++i;
+			continue;
+		}
+
+		if (ch == '{')
+			++bracketCount;
+		else if (ch == '}')
+			--bracketCount;
+
+		if (bracketCount == 0)
+			return true;
+	}
+
+	return false;
+}
+
+/**
+ * check if one of a set of headers has been reached in the
+ * current position of the current line.
+ *
+ * @return             a pointer to the found header. Or a NULL if no header has been reached.
+ * @param headers      a vector of headers.
+ * @param checkBoundry
+ */
+const WString *ASFormatter::findHeader(const Vector<const WString*> &headers, bool checkBoundry)
+{
+	return ASBeautifier::findHeader(currentLine, charNum, headers, checkBoundry);
+}
+
+/**
+ * check if a line begins with the specified character
+ * i.e. if the current line begins with a open bracket.
+ *
+ * @return        true or false
+ */
+bool ASFormatter::lineBeginsWith(char charToCheck) const
+{
+	bool beginsWith = false;
+	int i = ASString_Find_First_Not_Of(currentLine, " \t");
+	if (i >= 0)
+		if (currentLine[i] == charToCheck && (int) i == charNum)
+			beginsWith = true;
+
+	return beginsWith;
+}
+
+/**
+ * adjust comment position because of adding or deleting spaces
+ * the spaces are added or deleted to formattedLine
+ * spacePadNum contains the adjustment
+ */
+void ASFormatter::adjustComments(void)
+{
+	assert(spacePadNum != 0);
+	assert(currentLine.Mid(charNum, 2) ==  WString("//")
+	       || currentLine.Mid(charNum, 2) == WString("/*"));
+
+
+	// block comment must be closed on this line with nothing after it
+	if (currentLine.Mid(charNum, 2) == WString("/*"))
+	{
+		int endNum = currentLine.Find("*/", charNum + 2);
+		if (endNum < 0)
+			return;
+		if(ASString_Find_First_Not_Of(currentLine, " \t", endNum + 2) >= 0)
+			return;
+	}
+
+	int len = formattedLine.GetCount();
+	// if spaces were removed, need to add spaces before the comment
+	if (spacePadNum < 0)
+	{
+		int adjust = -spacePadNum;          // make the number positive
+		if (formattedLine[len-1] != '\t')   // don't adjust if a tab
+			formattedLine.Cat(WString(' ', adjust));
+//		else								// comment out to avoid compiler warning
+//			adjust = 0;
+//		TRcomment(adjust);                  // trace macro
+	}
+	// if spaces were added, need to delete spaces before the comment, if possible
+	else if (spacePadNum > 0)
+	{
+		int adjust = spacePadNum;
+		if (ASString_Find_Last_Not_Of(formattedLine, " ") < len - adjust - 1
+		        && formattedLine[len-1] != '\t')    // don't adjust a tab
+			formattedLine.Trim(len - adjust);
+		// the following are commented out to avoid a Borland compiler warning
+		//else
+		//    adjust = 0;
+		TRcomment(-adjust);                 // trace macro
+	}
+}
+
+/**
+ * append the current bracket inside the end of line comments
+ * currentChar contains the bracket, it will be appended to formattedLine
+ * formattedLineCommentNum is the comment location on formattedLine
+ */
+void ASFormatter::appendCharInsideComments(void)
+{
+	if (formattedLineCommentNum == -1				// does the comment start on the previous line?
+	        || isBeforeComment())					// does a comment follow on this line?
+	{
+		appendCurrentChar(true);			// don't attach
+		return;
+	}
+	assert(formattedLine.Mid(formattedLineCommentNum, 2) == WString("//")
+	       || formattedLine.Mid(formattedLineCommentNum, 2) == WString("/*"));
+
+	// find the previous non space char
+	int end = formattedLineCommentNum;
+	int beg = ASString_Find_Last_Not_Of(formattedLine, " \t", end-1);
+	if (beg < 0)							// is the previous line comment only?
+	{
+		appendCurrentChar(true);			// don't attach
+		return;
+	}
+	beg++;
+
+	// insert the bracket
+	if (end - beg < 3)						// is there room to insert?
+		formattedLine.Insert(beg, WString(' ', 3-end+beg));
+	if (formattedLine[beg] == '\t')			// don't pad with a tab
+		formattedLine.Insert(beg, ' ');
+	formattedLine.Set(beg+1, currentChar);
+}
+
+/**
+ * add or remove space padding to operators
+ * currentChar contains the paren
+ * the operators and necessary padding will be appended to formattedLine
+ * the calling function should have a continue statement after calling this method
+ *
+ * @param *newOperator     the operator to be padded
+ */
+void ASFormatter::padOperators(const WString *newOperator)
+{
+	assert (shouldPadOperators);
+	assert(newOperator != NULL);
+
+	bool shouldPad = (newOperator != &AS_COLON_COLON
+	                  && newOperator != &AS_PAREN_PAREN
+	                  && newOperator != &AS_BLPAREN_BLPAREN
+	                  && newOperator != &AS_PLUS_PLUS
+	                  && newOperator != &AS_MINUS_MINUS
+	                  && newOperator != &AS_NOT
+	                  && newOperator != &AS_BIT_NOT
+	                  && newOperator != &AS_ARROW
+	                  && newOperator != &AS_OPERATOR
+	                  && newOperator != &AS_RETURN
+	                  && !(newOperator == &AS_MINUS && isInExponent())
+	                  && !(newOperator == &AS_MINUS             // check for negative number
+	                       && (previousNonWSChar == '('
+	                           || previousNonWSChar == '='
+	                           || previousNonWSChar == ','))
+                      && !(newOperator == &AS_PLUS && isInExponent())
+                      && previousOperator != &AS_OPERATOR
+                      && !((newOperator == &AS_MULT || newOperator == &AS_BIT_AND)
+                           && isPointerOrReference())
+                      && !(newOperator == &AS_MULT
+                           && (previousNonWSChar == '.'
+                               || previousNonWSChar == '>'))	// check for ->
+                      && !((isInTemplate || isCharImmediatelyPostTemplate)
+                           && (newOperator == &AS_LS || newOperator == &AS_GR))
+                     );
+	// pad before operator
+	if (shouldPad
+	        && !isInBlParen
+	        && !(newOperator == &AS_COLON && !foundQuestionMark)
+	        && newOperator != &AS_SEMICOLON
+	        && newOperator != &AS_COMMA)
+		appendSpacePad();
+	appendSequence(*newOperator);
+	goForward(newOperator->GetCount() - 1);
+
+	// since this block handles '()' and '[]',
+	// the parenStack must be updated here accordingly!
+	if (newOperator == &AS_PAREN_PAREN
+	        || newOperator == &AS_BLPAREN_BLPAREN)
+		parenStack->back()--;
+
+	currentChar = (*newOperator)[newOperator->GetCount() - 1];
+	// pad after operator
+	// but do not pad after a '-' that is a unary-minus.
+	if (shouldPad
+	        && !isInBlParen
+	        && !isBeforeComment()
+	        && !(newOperator == &AS_MINUS && isUnaryMinus())
+	        && (currentLine[charNum + 1] != ';')
+	        && (currentLine.Mid(charNum + 1, 2) != WString("::")))
+		appendSpaceAfter();
+
+	previousOperator = newOperator;
+	return;
+}
+
+/**
+ * add or remove space padding to parens
+ * currentChar contains the paren
+ * the parens and necessary padding will be appended to formattedLine
+ * the calling function should have a continue statement after calling this method
+ */
+void ASFormatter::padParens(void)
+{
+	assert(shouldPadParensOutside || shouldPadParensInside || shouldUnPadParens);
+	assert (currentChar == '(' || currentChar == ')');
+
+	if (currentChar == '(')
+	{
+		int spacesOutsideToDelete = formattedLine.GetCount() - 1;
+		int spacesInsideToDelete = 0;
+
+		// compute spaces outside the opening paren to delete
+		if (shouldUnPadParens)
+		{
+			char lastChar = ' ';
+			bool prevIsParenHeader = false;
+			int i = ASString_Find_Last_Not_Of(formattedLine, " \t");
+			if (i >= 0)
+			{
+				int end = i;
+				spacesOutsideToDelete -= i;
+				lastChar = formattedLine[i];
+				// was last word a paren header?
+				int start;          // start of the previous word
+				for (start = i; start > 0; start--)
+				{
+					if (isLegalNameChar(formattedLine[start]) || formattedLine[start] == '*')
+						continue;
+					start++;
+					break;
+				}
+				WString prevWord = formattedLine.Mid(start, end-start+1);
+				// if previous word is a header, it will be a paren header
+				const WString *prevWordH = ASBeautifier::findHeader(formattedLine, start, headers);
+				if (prevWordH != NULL)
+				{
+					prevIsParenHeader = true;
+					TRxtra(*prevWordH);         // trace macro
+				}
+				else if (prevWord == WString("return") 	// don't unpad return statements
+				         || prevWord == WString("*"))     // don't unpad multiply or pointer
+				{
+					prevIsParenHeader = true;
+					TRxtra(prevWord);           // trace macro
+				}
+				// don't unpad variables
+				else if (prevWord == WString("bool")
+				         || prevWord ==  WString("int")
+				         || prevWord ==  WString("void")
+				         || prevWord ==  WString("void*")
+				         || (prevWord.GetCount() >= 6     // check end of word for _t
+				             && prevWord.Mid(prevWord.GetCount()-2, 2) == WString("_t"))
+				         || prevWord ==  WString("BOOL")
+				         || prevWord ==  WString("DWORD")
+				         || prevWord ==  WString("HWND")
+				         || prevWord ==  WString("INT")
+				         || prevWord ==  WString("LPSTR")
+				         || prevWord ==  WString("VOID")
+				         || prevWord ==  WString("LPVOID")
+				        )
+				{
+					prevIsParenHeader = true;
+					TRxtra(prevWord);           // trace macro
+				}
+			}
+			// do not unpad operators, but leave them if already padded
+			if (shouldPadParensOutside || prevIsParenHeader)
+				spacesOutsideToDelete--;
+			else if (lastChar == '|'          // check for ||
+			         || lastChar == '&'      // check for &&
+			         || lastChar == ','
+			         || (lastChar == '>' && !foundCastOperator)
+			         || lastChar == '<'
+			         || lastChar == '?'
+			         || lastChar == ':'
+			         || lastChar == ';'
+			         || lastChar == '='
+			         || lastChar == '+'
+			         || lastChar == '-'
+			         || (lastChar == '*' && isInPotentialCalculation)
+			         || lastChar == '/'
+			         || lastChar == '%')
+				spacesOutsideToDelete--;
+
+			if (spacesOutsideToDelete > 0)
+			{
+				formattedLine.Remove(i + 1, spacesOutsideToDelete);
+				spacePadNum -= spacesOutsideToDelete;
+			}
+		}
+
+		// pad open paren outside
+		char peekedCharOutside = peekNextChar();
+		if (shouldPadParensOutside)
+			if (!(currentChar == '(' && peekedCharOutside == ')'))
+				appendSpacePad();
+
+		appendCurrentChar();
+
+		// unpad open paren inside
+		if (shouldUnPadParens)
+		{
+			int j = ASString_Find_First_Not_Of(currentLine, " \t", charNum + 1);
+			if (j >= 0)
+				spacesInsideToDelete = j - charNum - 1;
+			if (shouldPadParensInside)
+				spacesInsideToDelete--;
+			if (spacesInsideToDelete > 0)
+			{
+				currentLine.Remove(charNum + 1, spacesInsideToDelete);
+				spacePadNum -= spacesInsideToDelete;
+			}
+		}
+
+		// pad open paren inside
+		char peekedCharInside = peekNextChar();
+		if (shouldPadParensInside)
+			if (!(currentChar == '(' && peekedCharInside == ')'))
+				appendSpaceAfter();
+
+		TRunpad('(', spacesOutsideToDelete, spacesInsideToDelete);       // trace macro
+	}
+	else if (currentChar == ')' /*|| currentChar == ']'*/)
+	{
+		int spacesOutsideToDelete = 0;
+		int spacesInsideToDelete = formattedLine.GetCount();
+
+		// unpad close paren inside
+		if (shouldUnPadParens)
+		{
+			int i = ASString_Find_Last_Not_Of(formattedLine, " \t");
+			if (i >= 0)
+				spacesInsideToDelete = formattedLine.GetCount() - 1 - i;
+			if (shouldPadParensInside)
+				spacesInsideToDelete--;
+			if (spacesInsideToDelete > 0)
+			{
+				formattedLine.Remove(i + 1, spacesInsideToDelete);
+				spacePadNum -= spacesInsideToDelete;
+			}
+		}
+
+		// pad close paren inside
+		if (shouldPadParensInside)
+			if (!(previousChar == '(' && currentChar == ')'))
+				appendSpacePad();
+
+		appendCurrentChar();
+
+		// unpad close paren outside
+		if (shouldUnPadParens)
+		{
+			// may have end of line comments
+			int j = ASString_Find_First_Not_Of(currentLine, " \t", charNum + 1);
+			if (j >= 0)
+				if (currentLine[j] == '[' || currentLine[j] == ']')
+					spacesOutsideToDelete = j - charNum - 1;
+			if (shouldPadParensOutside)
+				spacesOutsideToDelete--;
+//                    spacesOutsideToDelete--;            // always leave 1 space
+
+			if (spacesOutsideToDelete > 0)
+			{
+				currentLine.Remove(charNum + 1, spacesOutsideToDelete);
+				spacePadNum -= spacesOutsideToDelete;
+			}
+		}
+
+		// pad close paren outside
+		char peekedCharOutside = peekNextChar();
+		if (shouldPadParensOutside)
+			if (peekedCharOutside != ';'
+			        && peekedCharOutside != ','
+			        && peekedCharOutside != '.'
+			        && peekedCharOutside != '-')    // check for ->
+//                            && !(currentChar == ']' && peekedCharOutside == '['))
+				appendSpaceAfter();
+
+		TRunpad(')', spacesInsideToDelete, 0 /*spacesOutsideToDelete*/);       // trace macro
+	}
+	return;
+}
+
+/**
+ * format brackets as attached or broken
+ * currentChar contains the bracket
+ * the brackets will be appended to the current formattedLine or a new formattedLine as necessary
+ * the calling function should have a continue statement after calling this method
+ *
+ * @param bracketType    the type of bracket to be formatted.
+ */
+void ASFormatter::formatBrackets(BracketType bracketType)
+{
+	assert(!IS_A(bracketType, ARRAY_TYPE));
+	assert (currentChar == '{' || currentChar == '}');
+
+	if (currentChar == '{')
+	{
+		parenStack->push_back(0);
+	}
+	else if (currentChar == '}')
+	{
+		if (!parenStack->IsEmpty())
+		{
+			parenStack->pop_back();
+		}
+	}
+
+	if (currentChar == '{')
+	{
+		bool bdacBreak = false;
+		// should a Linux bracket be broken?
+		if (bracketFormatMode == BDAC_MODE)
+		{
+			// always break a class
+			if (IS_A((*bracketTypeStack)[bracketTypeStack->size()-1], CLASS_TYPE))
+				bdacBreak = true;
+			// break a namespace and the first bracket if a function
+			else if (bracketTypeStack->size() <= 2)
+			{
+				if (IS_A((*bracketTypeStack)[bracketTypeStack->size()-1], NAMESPACE_TYPE)
+				        || IS_A((*bracketTypeStack)[bracketTypeStack->size()-1], COMMAND_TYPE))
+					bdacBreak = true;
+			}
+			// break the first bracket after a namespace if a function
+			else if (IS_A((*bracketTypeStack)[bracketTypeStack->size()-2], NAMESPACE_TYPE))
+			{
+				if (IS_A((*bracketTypeStack)[bracketTypeStack->size()-1], COMMAND_TYPE))
+					bdacBreak = true;
+			}
+			// if not C style then break the first bracket after a class if a function
+			else if (!ASBeautifier::isCStyle)
+			{
+				if (IS_A((*bracketTypeStack)[bracketTypeStack->size()-2], CLASS_TYPE)
+				        && IS_A((*bracketTypeStack)[bracketTypeStack->size()-1], COMMAND_TYPE))
+					bdacBreak = true;
+			}
+		}
+		if (bracketFormatMode == ATTACH_MODE
+		        || (bracketFormatMode == BDAC_MODE && !bdacBreak))
+		{
+			// are there comments before the bracket?
+			if (isCharImmediatelyPostComment || isCharImmediatelyPostLineComment)
+			{
+				if ((shouldBreakOneLineBlocks || !IS_A(bracketType,  SINGLE_LINE_TYPE))
+				        && peekNextChar() != '}')
+					appendCharInsideComments();
+				else
+					appendCurrentChar(true);		// don't attach
+			}
+			else if (previousCommandChar == '{'
+			         || previousCommandChar == '}'
+			         || previousCommandChar == ';')  // '}' , ';' chars added for proper handling of '{' immediately after a '}' or ';'
+			{
+				appendCurrentChar(true);			// don't attach
+			}
+			else
+			{
+				int firstChar = ASString_Find_First_Not_Of(formattedLine, " \t");
+				if (firstChar < 0)					// if a blank line preceeds this
+					appendCurrentChar(true);		// don't attach
+				else if (shouldBreakOneLineBlocks
+				         || !IS_A(bracketType,  SINGLE_LINE_TYPE)
+				         || peekNextChar() == '}')
+				{
+					appendSpacePad();
+					appendCurrentChar(false);		// OK to attach
+				}
+				else
+					appendCurrentChar(true);		// don't attach
+			}
+		}
+		else if (bracketFormatMode == BREAK_MODE
+		         || (bracketFormatMode == BDAC_MODE && bdacBreak))
+		{
+			if (isBeforeComment())
+			{
+				// do not break unless comment is at line end
+				if (isBeforeLineEndComment(charNum))
+				{
+					currentChar = ' ';				// remove bracket from current line
+					appendOpeningBracket = true;	// append bracket to following line
+				}
+			}
+			else if (!IS_A(bracketType,  SINGLE_LINE_TYPE))
+				breakLine();
+			else if (shouldBreakOneLineBlocks && peekNextChar() != '}')
+				breakLine();
+
+			appendCurrentChar();
+		}
+		else if (bracketFormatMode == NONE_MODE)
+		{
+			if (lineBeginsWith('{'))                // is opening bracket broken?
+				appendCurrentChar(true);
+			else
+				appendCurrentChar(false);
+		}
+	}
+	else if (currentChar == '}')
+	{
+		// mark state of immediately after empty block
+		// this state will be used for locating brackets that appear immedately AFTER an empty block (e.g. '{} \n}').
+		if (previousCommandChar == '{')
+			isImmediatelyPostEmptyBlock = true;
+
+		if ((!(previousCommandChar == '{' && isPreviousBracketBlockRelated))            // this '{' does not close an empty block
+		        && (shouldBreakOneLineBlocks || !IS_A(bracketType,  SINGLE_LINE_TYPE))  // astyle is allowed to break on line blocks
+		        && (!(bracketFormatMode == NONE_MODE && IS_A(bracketType,  SINGLE_LINE_TYPE)))
+		        && !isImmediatelyPostEmptyBlock)                                        // this '}' does not immediately follow an empty block
+		{
+			breakLine();
+			appendCurrentChar();
+		}
+		else
+		{
+			if (!isCharImmediatelyPostComment
+			        && !(bracketFormatMode == NONE_MODE)
+			        && !isImmediatelyPostEmptyBlock)
+				isInLineBreak = false;
+
+			appendCurrentChar();
+
+			//if (!bracketFormatMode == NONE_MODE)
+			//	if ((shouldBreakOneLineBlocks || !IS_A(bracketType,  SINGLE_LINE_TYPE))
+			//	        && !(currentChar == '}' && peekNextChar() == ';'))      // fixes }; placed on separate lines
+			//		shouldBreakLineAfterComments = true;
+		}
+
+		if (shouldBreakBlocks)
+		{
+			isAppendPostBlockEmptyLineRequested = true;
+		}
+	}
+	return;
+}
+
+/**
+ * format array brackets as attached or broken
+ * determine if the brackets can have an inStatement indent
+ * currentChar contains the bracket
+ * the brackets will be appended to the current formattedLine or a new formattedLine as necessary
+ * the calling function should have a continue statement after calling this method
+ *
+ * @param bracketType            the type of bracket to be formatted, must be an ARRAY_TYPE.
+ * @param isOpeningArrayBracket  indicates if this is the opening bracket for the array block.
+ */
+void ASFormatter::formatArrayBrackets(BracketType bracketType, bool isOpeningArrayBracket)
+{
+	assert(IS_A(bracketType, ARRAY_TYPE));
+	assert (currentChar == '{' || currentChar == '}');
+
+	if (currentChar == '{')
+	{
+		// is this the first opening bracket in the array?
+		if (isOpeningArrayBracket)
+		{
+			if (bracketFormatMode == ATTACH_MODE || bracketFormatMode == BDAC_MODE)
+			{
+				// don't attach to a preprocessor directive
+				if (isImmediatelyPostPreprocessor)
+					appendCurrentChar(true);			// don't attach
+				// are there comments before the bracket?
+				else if (isCharImmediatelyPostComment || isCharImmediatelyPostLineComment)
+				{
+					appendCharInsideComments();
+				}
+				else
+				{
+					// if bracket is broken or not an assignment
+					if (lineBeginsWith('{') || previousNonWSChar != '=')
+						appendSpacePad();
+					appendCurrentChar(false);			// OK to attach
+				}
+			}
+			else if (bracketFormatMode == BREAK_MODE)
+			{
+				if (isWhiteSpace(peekNextChar()))
+					breakLine();
+				else if (isBeforeComment())
+				{
+					// do not break unless comment is at line end
+					if (isBeforeLineEndComment(charNum))
+					{
+						currentChar = ' ';				// remove bracket from current line
+						appendOpeningBracket = true;	// append bracket to following line
+					}
+				}
+				appendCurrentChar();
+			}
+			else if (bracketFormatMode == NONE_MODE)
+			{
+				if (lineBeginsWith('{'))                // is opening bracket broken?
+					appendCurrentChar();
+				else
+					appendCurrentChar(false);
+			}
+		}
+		else
+			appendCurrentChar();	 // not the first opening bracket - don't change
+
+		// if an opening bracket ends the line there will be no inStatement indent
+		char nextChar = peekNextChar();
+		if (isWhiteSpace(nextChar)
+		        || isBeforeLineEndComment(charNum)
+		        || nextChar == '{')
+			isNonInStatementArray = true;
+		if (isNonInStatementArray)
+			TRarray('x');
+		else
+			TRarray(' ');
+
+	}
+	else if (currentChar == '}')
+	{
+		// does this close the first opening bracket in the array?
+		if (isOpeningArrayBracket && !IS_A(bracketType, SINGLE_LINE_TYPE) )
+		{
+			breakLine();
+			appendCurrentChar();
+		}
+		else
+			appendCurrentChar();
+	}
+}
+
+
+}   // end namespace astyle
diff --git a/uppsrc/plugin/astyle/ASResource.cpp b/uppsrc/plugin/astyle/ASResource.cpp
new file mode 100644
index 000000000..853fef082
--- /dev/null
+++ b/uppsrc/plugin/astyle/ASResource.cpp
@@ -0,0 +1,395 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *   ASResource.cpp
+ *
+ *   This file is a part of "Artistic Style" - an indentation and
+ *   reformatting tool for C, C++, C# and Java source files.
+ *   http://astyle.sourceforge.net
+ *
+ *   The "Artistic Style" project, including all files needed to
+ *   compile it, is free software; you can redistribute it and/or
+ *   modify it under the terms of the GNU Lesser General Public
+ *   License as published by the Free Software Foundation; either
+ *   version 2.1 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 Lesser General Public License for more details.
+ *
+ *   You should have received a copy of the GNU Lesser General Public
+ *   License along with this project; if not, write to the
+ *   Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ *   Boston, MA  02110-1301, USA.
+ *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ */
+
+ /*
+ 	2008-01-26 Patches by Massimo Del Fedele :
+ 		- modified sources to use Ultimate++ containers instead std:: ones
+ 		- fixed memory leaks based on bug report 1804791 submitted by Eran Ifrah
+ 		- modified to work with unicode
+ */
+#include "astyle.h"
+
+
+namespace astyle
+{
+const WString ASResource::AS_IF = WString("if");
+const WString ASResource::AS_ELSE = WString("else");
+const WString ASResource::AS_FOR = WString("for");
+const WString ASResource::AS_DO = WString("do");
+const WString ASResource::AS_WHILE = WString("while");
+const WString ASResource::AS_SWITCH = WString("switch");
+const WString ASResource::AS_CASE = WString("case");
+const WString ASResource::AS_DEFAULT = WString("default");
+const WString ASResource::AS_CLASS = WString("class");
+const WString ASResource::AS_STRUCT = WString("struct");
+const WString ASResource::AS_UNION = WString("union");
+const WString ASResource::AS_INTERFACE = WString("interface");
+const WString ASResource::AS_NAMESPACE = WString("namespace");
+const WString ASResource::AS_EXTERN = WString("extern");
+const WString ASResource::AS_PUBLIC = WString("public");
+const WString ASResource::AS_PROTECTED = WString("protected");
+const WString ASResource::AS_PRIVATE = WString("private");
+const WString ASResource::AS_STATIC = WString("static");
+const WString ASResource::AS_SYNCHRONIZED = WString("synchronized");
+const WString ASResource::AS_OPERATOR = WString("operator");
+const WString ASResource::AS_TEMPLATE = WString("template");
+const WString ASResource::AS_TRY = WString("try");
+const WString ASResource::AS_CATCH = WString("catch");
+const WString ASResource::AS_FINALLY = WString("finally");
+const WString ASResource::AS_THROWS = WString("throws");
+const WString ASResource::AS_CONST = WString("const");
+
+const WString ASResource::AS_ASM = WString("asm");
+
+const WString ASResource::AS_BAR_DEFINE = WString("#define");
+const WString ASResource::AS_BAR_INCLUDE = WString("#include");
+const WString ASResource::AS_BAR_IF = WString("#if");
+const WString ASResource::AS_BAR_EL = WString("#el");
+const WString ASResource::AS_BAR_ENDIF = WString("#endif");
+
+const WString ASResource::AS_OPEN_BRACKET = WString("{");
+const WString ASResource::AS_CLOSE_BRACKET = WString("}");
+const WString ASResource::AS_OPEN_LINE_COMMENT = WString("//");
+const WString ASResource::AS_OPEN_COMMENT = WString("/*");
+const WString ASResource::AS_CLOSE_COMMENT = WString("*/");
+
+const WString ASResource::AS_ASSIGN = WString("=");
+const WString ASResource::AS_PLUS_ASSIGN = WString("+=");
+const WString ASResource::AS_MINUS_ASSIGN = WString("-=");
+const WString ASResource::AS_MULT_ASSIGN = WString("*=");
+const WString ASResource::AS_DIV_ASSIGN = WString("/=");
+const WString ASResource::AS_MOD_ASSIGN = WString("%=");
+const WString ASResource::AS_OR_ASSIGN = WString("|=");
+const WString ASResource::AS_AND_ASSIGN = WString("&=");
+const WString ASResource::AS_XOR_ASSIGN = WString("^=");
+const WString ASResource::AS_GR_GR_ASSIGN = WString(">>=");
+const WString ASResource::AS_LS_LS_ASSIGN = WString("<<=");
+const WString ASResource::AS_GR_GR_GR_ASSIGN = WString(">>>=");
+const WString ASResource::AS_LS_LS_LS_ASSIGN = WString("<<<=");
+const WString ASResource::AS_RETURN = WString("return");
+
+const WString ASResource::AS_EQUAL = WString("==");
+const WString ASResource::AS_PLUS_PLUS = WString("++");
+const WString ASResource::AS_MINUS_MINUS = WString("--");
+const WString ASResource::AS_NOT_EQUAL = WString("!=");
+const WString ASResource::AS_GR_EQUAL = WString(">=");
+const WString ASResource::AS_GR_GR = WString(">>");
+const WString ASResource::AS_GR_GR_GR = WString(">>>");
+const WString ASResource::AS_LS_EQUAL = WString("<=");
+const WString ASResource::AS_LS_LS = WString("<<");
+const WString ASResource::AS_LS_LS_LS = WString("<<<");
+const WString ASResource::AS_ARROW = WString("->");
+const WString ASResource::AS_AND = WString("&&");
+const WString ASResource::AS_OR = WString("||");
+const WString ASResource::AS_COLON_COLON = WString("::");
+const WString ASResource::AS_PAREN_PAREN = WString("()");
+const WString ASResource::AS_BLPAREN_BLPAREN = WString("[]");
+
+const WString ASResource::AS_PLUS = WString("+");
+const WString ASResource::AS_MINUS = WString("-");
+const WString ASResource::AS_MULT = WString("*");
+const WString ASResource::AS_DIV = WString("/");
+const WString ASResource::AS_MOD = WString("%");
+const WString ASResource::AS_GR = WString(">");
+const WString ASResource::AS_LS = WString("<");
+const WString ASResource::AS_NOT = WString("!");
+const WString ASResource::AS_BIT_OR = WString("|");
+const WString ASResource::AS_BIT_AND = WString("&");
+const WString ASResource::AS_BIT_NOT = WString("~");
+const WString ASResource::AS_BIT_XOR = WString("^");
+const WString ASResource::AS_QUESTION = WString("?");
+const WString ASResource::AS_COLON = WString(":");
+const WString ASResource::AS_COMMA = WString(",");
+const WString ASResource::AS_SEMICOLON = WString(";");
+
+const WString ASResource::AS_FOREACH = WString("foreach");
+const WString ASResource::AS_LOCK = WString("lock");
+const WString ASResource::AS_UNSAFE = WString("unsafe");
+const WString ASResource::AS_FIXED = WString("fixed");
+const WString ASResource::AS_GET = WString("get");
+const WString ASResource::AS_SET = WString("set");
+const WString ASResource::AS_ADD = WString("add");
+const WString ASResource::AS_REMOVE = WString("remove");
+
+const WString ASResource::AS_CONST_CAST = WString("const_cast");
+const WString ASResource::AS_DYNAMIC_CAST = WString("dynamic_cast");
+const WString ASResource::AS_REINTERPRET_CAST = WString("reinterpret_cast");
+const WString ASResource::AS_STATIC_CAST = WString("static_cast");
+
+
+/**
+ * Build the vector of assignment operators.
+ * Used by BOTH ASFormatter.cpp and ASBeautifier.cpp
+ *
+ * @param assignmentOperators   a reference to the vector to be built.
+ */
+void ASResource::buildAssignmentOperators(Vector<const WString*> &assignmentOperators)
+{
+	assignmentOperators.push_back(&AS_ASSIGN);
+	assignmentOperators.push_back(&AS_PLUS_ASSIGN);
+	assignmentOperators.push_back(&AS_MINUS_ASSIGN);
+	assignmentOperators.push_back(&AS_MULT_ASSIGN);
+	assignmentOperators.push_back(&AS_DIV_ASSIGN);
+	assignmentOperators.push_back(&AS_MOD_ASSIGN);
+	assignmentOperators.push_back(&AS_OR_ASSIGN);
+	assignmentOperators.push_back(&AS_AND_ASSIGN);
+	assignmentOperators.push_back(&AS_XOR_ASSIGN);
+
+	// Java
+	assignmentOperators.push_back(&AS_GR_GR_GR_ASSIGN);
+	assignmentOperators.push_back(&AS_GR_GR_ASSIGN);
+	assignmentOperators.push_back(&AS_LS_LS_ASSIGN);
+
+	// Unknown
+	assignmentOperators.push_back(&AS_LS_LS_LS_ASSIGN);
+
+	assignmentOperators.push_back(&AS_RETURN);
+}
+
+/**
+ * Build the vector of C++ cast operators.
+ * Used by ONLY ASFormatter.cpp
+ *
+ * @param castOperators     a reference to the vector to be built.
+ */
+void ASResource::buildCastOperators(Vector<const WString*> &castOperators)
+{
+	castOperators.push_back(&AS_CONST_CAST);
+	castOperators.push_back(&AS_DYNAMIC_CAST);
+	castOperators.push_back(&AS_REINTERPRET_CAST);
+	castOperators.push_back(&AS_STATIC_CAST);
+}
+
+/**
+ * Build the vector of header words.
+ * Used by BOTH ASFormatter.cpp and ASBeautifier.cpp
+ *
+ * @param headers       a reference to the vector to be built.
+ */
+void ASResource::buildHeaders(Vector<const WString*> &headers, int fileType, bool beautifier)
+{
+	headers.push_back(&AS_IF);
+	headers.push_back(&AS_ELSE);
+	headers.push_back(&AS_FOR);
+	headers.push_back(&AS_WHILE);
+	headers.push_back(&AS_DO);
+	headers.push_back(&AS_SWITCH);
+	headers.push_back(&AS_TRY);
+	headers.push_back(&AS_CATCH);
+
+	if (beautifier)
+	{
+		headers.push_back(&AS_CASE);
+		headers.push_back(&AS_DEFAULT);
+		headers.push_back(&AS_CONST);
+		headers.push_back(&AS_STATIC);
+		headers.push_back(&AS_EXTERN);
+		headers.push_back(&AS_TEMPLATE);
+	}
+
+	if (fileType == JAVA_TYPE)
+	{
+		headers.push_back(&AS_FINALLY);
+		headers.push_back(&AS_SYNCHRONIZED);
+	}
+
+	if (fileType == SHARP_TYPE)
+	{
+		headers.push_back(&AS_FINALLY);
+		headers.push_back(&AS_FOREACH);
+		headers.push_back(&AS_LOCK);
+		headers.push_back(&AS_UNSAFE);
+		headers.push_back(&AS_FIXED);
+		headers.push_back(&AS_GET);
+		headers.push_back(&AS_SET);
+		headers.push_back(&AS_ADD);
+		headers.push_back(&AS_REMOVE);
+	}
+}
+
+/**
+ * Build the vector of non-assignment operators.
+ * Used by ONLY ASBeautifier.cpp
+ *
+ * @param nonParenHeaders       a reference to the vector to be built.
+ */
+void ASResource::buildNonAssignmentOperators(Vector<const WString*> &nonAssignmentOperators)
+{
+	nonAssignmentOperators.push_back(&AS_EQUAL);
+	nonAssignmentOperators.push_back(&AS_PLUS_PLUS);
+	nonAssignmentOperators.push_back(&AS_MINUS_MINUS);
+	nonAssignmentOperators.push_back(&AS_NOT_EQUAL);
+	nonAssignmentOperators.push_back(&AS_GR_EQUAL);
+	nonAssignmentOperators.push_back(&AS_GR_GR_GR);
+	nonAssignmentOperators.push_back(&AS_GR_GR);
+	nonAssignmentOperators.push_back(&AS_LS_EQUAL);
+	nonAssignmentOperators.push_back(&AS_LS_LS_LS);
+	nonAssignmentOperators.push_back(&AS_LS_LS);
+	nonAssignmentOperators.push_back(&AS_ARROW);
+	nonAssignmentOperators.push_back(&AS_AND);
+	nonAssignmentOperators.push_back(&AS_OR);
+}
+
+/**
+ * Build the vector of header non-paren headers.
+ * Used by BOTH ASFormatter.cpp and ASBeautifier.cpp
+ *
+ * @param nonParenHeaders       a reference to the vector to be built.
+ */
+void ASResource::buildNonParenHeaders(Vector<const WString*> &nonParenHeaders, int fileType, bool beautifier)
+{
+	nonParenHeaders.push_back(&AS_ELSE);
+	nonParenHeaders.push_back(&AS_DO);
+	nonParenHeaders.push_back(&AS_TRY);
+
+	if (beautifier)
+	{
+		nonParenHeaders.push_back(&AS_CASE);
+		nonParenHeaders.push_back(&AS_DEFAULT);
+		nonParenHeaders.push_back(&AS_CONST);
+		nonParenHeaders.push_back(&AS_STATIC);
+		nonParenHeaders.push_back(&AS_EXTERN);
+		nonParenHeaders.push_back(&AS_TEMPLATE);
+	}
+
+	if (fileType == JAVA_TYPE)
+	{
+		nonParenHeaders.push_back(&AS_FINALLY);
+	}
+
+	if (fileType == SHARP_TYPE)
+	{
+		nonParenHeaders.push_back(&AS_FINALLY);
+		nonParenHeaders.push_back(&AS_UNSAFE);
+		nonParenHeaders.push_back(&AS_GET);
+		nonParenHeaders.push_back(&AS_SET);
+		nonParenHeaders.push_back(&AS_ADD);
+		nonParenHeaders.push_back(&AS_REMOVE);
+	}
+}
+
+/**
+ * Build the vector of operators.
+ * Used by ONLY ASFormatter.cpp
+ *
+ * @param operators             a reference to the vector to be built.
+ */
+void ASResource::buildOperators(Vector<const WString*> &operators)
+{
+	operators.push_back(&AS_PLUS_ASSIGN);
+	operators.push_back(&AS_MINUS_ASSIGN);
+	operators.push_back(&AS_MULT_ASSIGN);
+	operators.push_back(&AS_DIV_ASSIGN);
+	operators.push_back(&AS_MOD_ASSIGN);
+	operators.push_back(&AS_OR_ASSIGN);
+	operators.push_back(&AS_AND_ASSIGN);
+	operators.push_back(&AS_XOR_ASSIGN);
+	operators.push_back(&AS_EQUAL);
+	operators.push_back(&AS_PLUS_PLUS);
+	operators.push_back(&AS_MINUS_MINUS);
+	operators.push_back(&AS_NOT_EQUAL);
+	operators.push_back(&AS_GR_EQUAL);
+	operators.push_back(&AS_GR_GR_GR_ASSIGN);
+	operators.push_back(&AS_GR_GR_ASSIGN);
+	operators.push_back(&AS_GR_GR_GR);
+	operators.push_back(&AS_GR_GR);
+	operators.push_back(&AS_LS_EQUAL);
+	operators.push_back(&AS_LS_LS_LS_ASSIGN);
+	operators.push_back(&AS_LS_LS_ASSIGN);
+	operators.push_back(&AS_LS_LS_LS);
+	operators.push_back(&AS_LS_LS);
+	operators.push_back(&AS_ARROW);
+	operators.push_back(&AS_AND);
+	operators.push_back(&AS_OR);
+	operators.push_back(&AS_COLON_COLON);
+	operators.push_back(&AS_PLUS);
+	operators.push_back(&AS_MINUS);
+	operators.push_back(&AS_MULT);
+	operators.push_back(&AS_DIV);
+	operators.push_back(&AS_MOD);
+	operators.push_back(&AS_QUESTION);
+	operators.push_back(&AS_COLON);
+	operators.push_back(&AS_ASSIGN);
+	operators.push_back(&AS_LS);
+	operators.push_back(&AS_GR);
+	operators.push_back(&AS_NOT);
+	operators.push_back(&AS_BIT_OR);
+	operators.push_back(&AS_BIT_AND);
+	operators.push_back(&AS_BIT_NOT);
+	operators.push_back(&AS_BIT_XOR);
+	operators.push_back(&AS_OPERATOR);
+	operators.push_back(&AS_COMMA);
+	operators.push_back(&AS_RETURN);
+}
+
+/**
+ * Build the vector of pre-block statements.
+ * Used by ONLY ASBeautifier.cpp
+ *
+ * @param preBlockStatements        a reference to the vector to be built.
+ */
+void ASResource::buildPreBlockStatements(Vector<const WString*> &preBlockStatements)
+{
+	preBlockStatements.push_back(&AS_CLASS);
+	preBlockStatements.push_back(&AS_STRUCT);
+	preBlockStatements.push_back(&AS_UNION);
+	preBlockStatements.push_back(&AS_INTERFACE);
+	preBlockStatements.push_back(&AS_NAMESPACE);
+	preBlockStatements.push_back(&AS_THROWS);
+	preBlockStatements.push_back(&AS_EXTERN);
+}
+
+/**
+ * Build the vector of pre-command headers.
+ * Used by ONLY ASFormatter.cpp
+ *
+ * @param preCommandHeaders     a reference to the vector to be built.
+ */
+void ASResource::buildPreCommandHeaders(Vector<const WString*> &preCommandHeaders)
+{
+	preCommandHeaders.push_back(&AS_EXTERN);
+	preCommandHeaders.push_back(&AS_THROWS);
+	preCommandHeaders.push_back(&AS_CONST);
+}
+
+/**
+ * Build the vector of pre-definition headers.
+ * Used by ONLY ASFormatter.cpp
+ *
+ * @param preDefinitionHeaders      a reference to the vector to be built.
+ */
+void ASResource::buildPreDefinitionHeaders(Vector<const WString*> &preDefinitionHeaders)
+{
+	preDefinitionHeaders.push_back(&AS_CLASS);
+	preDefinitionHeaders.push_back(&AS_INTERFACE);
+	preDefinitionHeaders.push_back(&AS_NAMESPACE);
+	preDefinitionHeaders.push_back(&AS_STRUCT);
+}
+
+
+}   // end namespace astyle
diff --git a/uppsrc/plugin/astyle/ASStringTools.cpp b/uppsrc/plugin/astyle/ASStringTools.cpp
new file mode 100644
index 000000000..a4b24f1fc
--- /dev/null
+++ b/uppsrc/plugin/astyle/ASStringTools.cpp
@@ -0,0 +1,86 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *   astyle.h
+ *
+ *   This file is a part of "Artistic Style" - an indentation and
+ *   reformatting tool for C, C++, C# and Java source files.
+ *   http://astyle.sourceforge.net
+ *
+ *   The "Artistic Style" project, including all files needed to
+ *   compile it, is free software; you can redistribute it and/or
+ *   modify it under the terms of the GNU Lesser General Public
+ *   License as published by the Free Software Foundation; either
+ *   version 2.1 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 Lesser General Public License for more details.
+ *
+ *   You should have received a copy of the GNU Lesser General Public
+ *   License along with this project; if not, write to the
+ *   Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ *   Boston, MA  02110-1301, USA.
+ *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ */
+
+ /*
+ 	2008-01-26 Patches by Massimo Del Fedele :
+ 		- modified sources to use Ultimate++ containers instead std:: ones
+ 		- fixed memory leaks based on bug report 1804791 submitted by Eran Ifrah
+ 		- modified to work with unicode
+ */
+#include "ASStringTools.hpp"
+
+///////////////////////////////////////////////////////////////////////////////////////////
+// Replaces a chunk in a string with a new string
+void ASString_Replace(WString &s, int Pos, int Len, WString const &newString)
+{
+	if(Pos < 0 || Pos >= s.GetCount())
+		return;
+	s.Remove(Pos, Len);
+	s.Insert(Pos, newString);
+
+} // END ASString_Replace()
+
+///////////////////////////////////////////////////////////////////////////////////////////
+// Find first character in a string *not* contained in another string
+int ASString_Find_First_Not_Of(WString const &s, WString const &Pattern, int pos)
+{
+	if(pos < 0 || pos >= s.GetCount())
+		return -1;
+	int len = s.GetCount();
+	while(pos < len && Pattern.Find(s[pos]) != -1)
+		pos++;
+	if(pos < len)
+		return pos;
+	else
+		return -1;
+
+} // END ASString_Find_First_Not_Of()
+
+///////////////////////////////////////////////////////////////////////////////////////////
+// Find last character in a string *not* contained in another string
+int ASString_Find_Last_Not_Of(WString const &s, WString const &Pattern, int pos)
+{
+	if(pos < 0 || pos >= s.GetCount())
+		pos = s.GetCount() -1;
+	while(pos > 0 && Pattern.Find(s[pos]) != -1)
+		pos--;
+	return pos;
+
+} // END ASString_Find_Last_Not_Of()
+
+///////////////////////////////////////////////////////////////////////////////////////////
+// Finds a substring starting at the end of a given string
+int ASString_ReverseFind(WString const &s, WString const &Pattern)
+{
+	int pos = -1;
+	int k = 0;
+	while( (k = s.Find(Pattern, k)) >= 0)
+		pos = k++;
+	return pos;
+
+} // END ASString_ReverseFind()
diff --git a/uppsrc/plugin/astyle/ASStringTools.hpp b/uppsrc/plugin/astyle/ASStringTools.hpp
new file mode 100644
index 000000000..af43f09f4
--- /dev/null
+++ b/uppsrc/plugin/astyle/ASStringTools.hpp
@@ -0,0 +1,58 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *   astyle.h
+ *
+ *   This file is a part of "Artistic Style" - an indentation and
+ *   reformatting tool for C, C++, C# and Java source files.
+ *   http://astyle.sourceforge.net
+ *
+ *   The "Artistic Style" project, including all files needed to
+ *   compile it, is free software; you can redistribute it and/or
+ *   modify it under the terms of the GNU Lesser General Public
+ *   License as published by the Free Software Foundation; either
+ *   version 2.1 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 Lesser General Public License for more details.
+ *
+ *   You should have received a copy of the GNU Lesser General Public
+ *   License along with this project; if not, write to the
+ *   Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ *   Boston, MA  02110-1301, USA.
+ *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ */
+
+ /*
+ 	2008-01-26 Patches by Massimo Del Fedele :
+ 		- modified sources to use Ultimate++ containers instead std:: ones
+ 		- fixed memory leaks based on bug report 1804791 submitted by Eran Ifrah
+ 		- modified to work with unicode
+ */
+#ifndef __ASSTRINGTOOLS_HPP
+#define __ASSTRINGTOOLS_HPP
+
+#include <Core/Core.h>
+
+using namespace Upp;
+
+///////////////////////////////////////////////////////////////////////////////////////////
+// Replaces a chunk in a string with a new string
+void ASString_Replace(WString &s, int Pos, int Len, WString const &newString);
+
+///////////////////////////////////////////////////////////////////////////////////////////
+// Find first character in a string *not* contained in another string
+int ASString_Find_First_Not_Of(WString const &s, WString const &Pattern, int from = 0);
+
+///////////////////////////////////////////////////////////////////////////////////////////
+// Find last character in a string *not* contained in another string
+int ASString_Find_Last_Not_Of(WString const &s, WString const &Pattern, int from = -1);
+
+///////////////////////////////////////////////////////////////////////////////////////////
+// Finds a substring starting at the end of a given string
+int ASString_ReverseFind(WString const &s, WString const &Pattern);
+
+#endif
diff --git a/uppsrc/plugin/astyle/astyle.h b/uppsrc/plugin/astyle/astyle.h
new file mode 100644
index 000000000..dc312c862
--- /dev/null
+++ b/uppsrc/plugin/astyle/astyle.h
@@ -0,0 +1,503 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *   astyle.h
+ *
+ *   This file is a part of "Artistic Style" - an indentation and
+ *   reformatting tool for C, C++, C# and Java source files.
+ *   http://astyle.sourceforge.net
+ *
+ *   The "Artistic Style" project, including all files needed to
+ *   compile it, is free software; you can redistribute it and/or
+ *   modify it under the terms of the GNU Lesser General Public
+ *   License as published by the Free Software Foundation; either
+ *   version 2.1 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 Lesser General Public License for more details.
+ *
+ *   You should have received a copy of the GNU Lesser General Public
+ *   License along with this project; if not, write to the
+ *   Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ *   Boston, MA  02110-1301, USA.
+ *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ */
+
+ /*
+ 	2008-01-26 Patches by Massimo Del Fedele :
+ 		- modified sources to use Ultimate++ containers instead std:: ones
+ 		- fixed memory leaks based on bug report 1804791 submitted by Eran Ifrah
+ 		- modified to work with unicode
+ */
+
+#ifndef ASTYLE_H
+#define ASTYLE_H
+
+#include <Core/Core.h>
+#include "ASStringTools.hpp"
+
+// 4996 - secure version deprecation warnings for .NET 2005
+// 4267 - 64 bit signed/unsigned loss of data
+#ifdef _MSC_VER
+#pragma warning(disable: 4996)
+#pragma warning(disable: 4267)
+#endif
+
+namespace astyle
+{
+
+enum FileType      { C_TYPE=0, JAVA_TYPE=1, SHARP_TYPE=2 };
+
+/* The enums below are not recognized by 'vectors' in Microsoft Visual C++
+   V5 when they are part of a namespace!!!  Use Visual C++ V6 or higher.
+*/
+enum BracketMode   { NONE_MODE, ATTACH_MODE, BREAK_MODE, BDAC_MODE };
+
+// added by Massimo Del Fedele - just an helper for dialog setup
+enum ParenthesisPad { PAD_NONE, PAD_INSIDE, PAD_OUTSIDE, PAD_BOTH };
+
+enum BracketType   { NULL_TYPE = 0,
+                     NAMESPACE_TYPE = 1,		// also a DEFINITION_TYPE
+                     CLASS_TYPE = 2,			// also a DEFINITION_TYPE
+                     DEFINITION_TYPE = 4,
+                     COMMAND_TYPE = 8,
+                     ARRAY_TYPE  = 16,          // arrays and enums
+                     SINGLE_LINE_TYPE = 32
+                   };
+class ASSourceIterator
+{
+	public:
+		int eolWindows;
+		int eolLinux;
+		int eolMacOld;
+		char outputEOL[4];    // output end of line char
+		ASSourceIterator() { eolWindows = eolLinux = eolMacOld = 0; }
+		virtual ~ASSourceIterator() {}
+		virtual bool hasMoreLines() const = 0;
+		virtual WString nextLine() = 0;
+};
+
+class ASResource
+{
+	public:
+		void buildAssignmentOperators(Vector<const WString*> &assignmentOperators);
+		void buildCastOperators(Vector<const WString*> &castOperators);
+		void buildHeaders(Vector<const WString*> &headers, int fileType, bool beautifier=false);
+		void buildNonAssignmentOperators(Vector<const WString*> &nonAssignmentOperators);
+		void buildNonParenHeaders(Vector<const WString*> &nonParenHeaders, int fileType, bool beautifier=false);
+		void buildOperators(Vector<const WString*> &operators);
+		void buildPreBlockStatements(Vector<const WString*> &preBlockStatements);
+		void buildPreCommandHeaders(Vector<const WString*> &preCommandHeaders);
+		void buildPreDefinitionHeaders(Vector<const WString*> &preDefinitionHeaders);
+
+	public:
+		static const WString AS_IF, AS_ELSE;
+		static const WString AS_DO, AS_WHILE;
+		static const WString AS_FOR;
+		static const WString AS_SWITCH, AS_CASE, AS_DEFAULT;
+		static const WString AS_TRY, AS_CATCH, AS_THROWS, AS_FINALLY;
+		static const WString AS_PUBLIC, AS_PROTECTED, AS_PRIVATE;
+		static const WString AS_CLASS, AS_STRUCT, AS_UNION, AS_INTERFACE, AS_NAMESPACE, AS_EXTERN;
+		static const WString AS_STATIC;
+		static const WString AS_CONST;
+		static const WString AS_SYNCHRONIZED;
+		static const WString AS_OPERATOR, AS_TEMPLATE;
+		static const WString AS_OPEN_BRACKET, AS_CLOSE_BRACKET;
+		static const WString AS_OPEN_LINE_COMMENT, AS_OPEN_COMMENT, AS_CLOSE_COMMENT;
+		static const WString AS_BAR_DEFINE, AS_BAR_INCLUDE, AS_BAR_IF, AS_BAR_EL, AS_BAR_ENDIF;
+		static const WString AS_RETURN;
+		static const WString AS_ASSIGN, AS_PLUS_ASSIGN, AS_MINUS_ASSIGN, AS_MULT_ASSIGN;
+		static const WString AS_DIV_ASSIGN, AS_MOD_ASSIGN, AS_XOR_ASSIGN, AS_OR_ASSIGN, AS_AND_ASSIGN;
+		static const WString AS_GR_GR_ASSIGN, AS_LS_LS_ASSIGN, AS_GR_GR_GR_ASSIGN, AS_LS_LS_LS_ASSIGN;
+		static const WString AS_EQUAL, AS_PLUS_PLUS, AS_MINUS_MINUS, AS_NOT_EQUAL, AS_GR_EQUAL, AS_GR_GR_GR, AS_GR_GR;
+		static const WString AS_LS_EQUAL, AS_LS_LS_LS, AS_LS_LS, AS_ARROW, AS_AND, AS_OR;
+		static const WString AS_COLON_COLON, AS_PAREN_PAREN, AS_BLPAREN_BLPAREN;
+		static const WString AS_PLUS, AS_MINUS, AS_MULT, AS_DIV, AS_MOD, AS_GR, AS_LS;
+		static const WString AS_NOT, AS_BIT_XOR, AS_BIT_OR, AS_BIT_AND, AS_BIT_NOT;
+		static const WString AS_QUESTION, AS_COLON, AS_SEMICOLON, AS_COMMA;
+		static const WString AS_ASM;
+		static const WString AS_FOREACH, AS_LOCK, AS_UNSAFE, AS_FIXED;
+		static const WString AS_GET, AS_SET, AS_ADD, AS_REMOVE;
+		static const WString AS_CONST_CAST, AS_DYNAMIC_CAST, AS_REINTERPRET_CAST, AS_STATIC_CAST;
+};
+
+class ASBeautifier : protected ASResource
+{
+	public:
+		ASBeautifier();
+		virtual ~ASBeautifier();
+		virtual void init(ASSourceIterator* iter); // pointer to dynamically created iterator.
+		void init();
+		virtual bool hasMoreLines() const;
+		virtual WString nextLine();
+		virtual WString beautify(const WString &line);
+		void setTabIndentation(int length = 4, bool forceTabs = false);
+		void setSpaceIndentation(int length = 4);
+		void setMaxInStatementIndentLength(int max);
+		void setMinConditionalIndentLength(int min);
+		void setClassIndent(bool state);
+		void setSwitchIndent(bool state);
+		void setCaseIndent(bool state);
+		void setBracketIndent(bool state);
+		void setBlockIndent(bool state);
+		void setNamespaceIndent(bool state);
+		void setLabelIndent(bool state);
+		void setCStyle();
+		void setJavaStyle();
+		void setSharpStyle();
+		void setEmptyLineFill(bool state);
+		void setPreprocessorIndent(bool state);
+		int  getIndentLength(void);
+		WString getIndentString(void);
+		bool getCaseIndent(void);
+		bool getCStyle(void);
+		bool getJavaStyle(void);
+		bool getSharpStyle(void);
+		bool getEmptyLineFill(void);
+
+	protected:
+		int getNextProgramCharDistance(const WString &line, int i);
+//		bool isLegalNameChar(char ch) const;
+		const WString *findHeader(const WString &line, int i,
+		                         const Vector<const WString*> &possibleHeaders,
+		                         bool checkBoundry = true);
+		WString trim(const WString &str);
+		int  indexOf(Vector<const WString*> &container, const WString *element);
+		int  fileType;
+		bool isCStyle;
+		bool isJavaStyle;
+		bool isSharpStyle;
+
+		// variables set by ASFormatter - must be updated in preprocessor
+		int  inLineNumber;              // for debugging
+		int  outLineNumber;				// for debugging
+		bool lineCommentNoBeautify;
+		bool isNonInStatementArray;
+
+	private:
+		ASBeautifier(const ASBeautifier &copy);
+		void operator=(ASBeautifier&); // not to be implemented
+
+		void initStatic();
+		void registerInStatementIndent(const WString &line, int i, int spaceTabCount,
+		                               int minIndent, bool updateParenStack);
+		WString preLineWS(int spaceTabCount, int tabCount);
+
+		static Vector<const WString*> headers;
+		static Vector<const WString*> nonParenHeaders;
+		static Vector<const WString*> preBlockStatements;
+		static Vector<const WString*> assignmentOperators;
+		static Vector<const WString*> nonAssignmentOperators;
+
+		ASSourceIterator *sourceIterator;
+		Vector<ASBeautifier*> *waitingBeautifierStack;
+		Vector<ASBeautifier*> *activeBeautifierStack;
+		Vector<int> *waitingBeautifierStackLengthStack;
+		Vector<int> *activeBeautifierStackLengthStack;
+		WithDeepCopy<Vector<const WString*> > *headerStack;
+		WithDeepCopy<Vector< Vector<const WString*>* > >*tempStacks;
+		WithDeepCopy<Vector<int> > *blockParenDepthStack;
+		WithDeepCopy<Vector<bool> > *blockStatementStack;
+		WithDeepCopy<Vector<bool> >*parenStatementStack;
+		WithDeepCopy<Vector<int> > *inStatementIndentStack;
+		WithDeepCopy<Vector<int> > *inStatementIndentStackSizeStack;
+		WithDeepCopy<Vector<int> > *parenIndentStack;
+		WithDeepCopy<Vector<bool> >*bracketBlockStateStack;
+		WString indentString;
+		const WString *currentHeader;
+		const WString *previousLastLineHeader;
+		const WString *immediatelyPreviousAssignmentOp;
+		const WString *probationHeader;
+		bool isInQuote;
+		bool isInComment;
+		bool isInCase;
+		bool isInQuestion;
+		bool isInStatement;
+		bool isInHeader;
+		bool isInOperator;
+		bool isInTemplate;
+		bool isInDefine;
+		bool isInDefineDefinition;
+		bool classIndent;
+		bool isInClassHeader;
+		bool isInClassHeaderTab;
+		bool switchIndent;
+		bool caseIndent;
+		bool namespaceIndent;
+		bool bracketIndent;
+		bool blockIndent;
+		bool labelIndent;
+		bool preprocessorIndent;
+		bool isInConditional;
+		bool isMinimalConditinalIndentSet;
+		bool shouldForceTabIndentation;
+		bool emptyLineFill;
+		bool backslashEndsPrevLine;
+		bool blockCommentNoIndent;
+		bool blockCommentNoBeautify;
+		bool previousLineProbationTab;
+		int  minConditionalIndent;
+		int  parenDepth;
+		int  indentLength;
+		int  blockTabCount;
+		int  leadingWhiteSpaces;
+		int  maxInStatementIndent;
+		int  templateDepth;
+		int  prevFinalLineSpaceTabCount;
+		int  prevFinalLineTabCount;
+		int  defineTabCount;
+		char quoteChar;
+		char prevNonSpaceCh;
+		char currentNonSpaceCh;
+		char currentNonLegalCh;
+		char prevNonLegalCh;
+		char peekNextChar(WString &line, int i);
+
+	protected:    // inline functions
+		// check if a specific character can be used in a legal variable/method/class name
+		inline bool isLegalNameChar(char ch) const {
+			return (isalnum(ch) || ch == '.' || ch == '_' || (isJavaStyle && ch == '$') || (isCStyle && ch == '~'));
+		}
+
+		// check if a specific character is a whitespace character
+		inline bool isWhiteSpace(char ch) const {
+			return (ch == ' ' || ch == '\t');
+		}
+};
+
+
+class ASEnhancer
+{
+	public:
+		// functions
+		ASEnhancer();
+		~ASEnhancer();
+		void init(int, WString, bool, bool, bool, bool, bool);
+		void enhance(WString &line);
+
+	private:
+		// set by init function
+		int    indentLength;
+		bool   useTabs;
+		bool   isCStyle;
+		bool   isJavaStyle;
+		bool   isSharpStyle;
+		bool   caseIndent;
+		bool   emptyLineFill;
+
+		// parsing variables
+		int  lineNumber;
+		bool isInQuote;
+		bool isInComment;
+		char quoteChar;
+
+		// unindent variables
+		int  bracketCount;
+		int  switchDepth;
+		bool lookingForCaseBracket;
+		bool unindentNextLine;
+
+		// StringStream for trace
+		StringStream *traceOut;
+
+	private:    // private functions
+		bool findKeyword(const WString &line, int i, const char *header) const;
+		int  indentLine(WString  &line, const int indent) const;
+		int  unindentLine(WString  &line, const int unindent) const;
+
+	private:
+		// struct used by ParseFormattedLine function
+		// contains variables used to unindent the case blocks
+		struct switchVariables {
+			int  switchBracketCount;
+			int  unindentDepth;
+			bool unindentCase;
+
+			switchVariables() {                 // constructor
+				switchBracketCount = 0;
+				unindentDepth = 0;
+				unindentCase = false;
+			}
+		};
+
+	private:    // inline functions
+		// check if a specific character can be used in a legal variable/method/class name
+		inline bool isLegalNameCharX(char ch) const {
+			return (isalnum(ch) || ch == '.' || ch == '_' || (isJavaStyle && ch == '$') || (isCStyle && ch == '~'));
+		}
+
+		// check if a specific character is a whitespace character
+		inline bool isWhiteSpaceX(char ch) const {
+			return (ch == ' ' || ch == '\t');
+		}
+};
+
+
+class ASFormatter : public ASBeautifier, private ASEnhancer
+{
+	public:
+		ASFormatter();
+		virtual ~ASFormatter();
+		virtual void init(ASSourceIterator* iter);
+		virtual bool hasMoreLines() const;
+		virtual WString nextLine();
+		void setBracketFormatMode(BracketMode mode);
+		void setBreakClosingHeaderBracketsMode(bool state);
+		void setOperatorPaddingMode(bool mode);
+		void setParensOutsidePaddingMode(bool mode);
+		void setParensInsidePaddingMode(bool mode);
+		void setParensUnPaddingMode(bool state);
+		void setBreakOneLineBlocksMode(bool state);
+		void setSingleStatementsMode(bool state);
+		void setTabSpaceConversionMode(bool state);
+		void setBreakBlocksMode(bool state);
+		void setBreakClosingHeaderBlocksMode(bool state);
+		void setBreakElseIfsMode(bool state);
+		WString fileName;
+
+	private:
+		void ASformatter(ASFormatter &copy);            // not to be imlpemented
+		void operator=(ASFormatter&);                  // not to be implemented
+		void staticInit();
+		void goForward(int i);
+		void trimNewLine();
+		char peekNextChar() const;
+		BracketType getBracketType() const;
+		bool getNextChar();
+		bool isBeforeComment() const;
+		bool isBeforeLineEndComment(int startPos) const;
+		bool isPointerOrReference() const;
+		bool isUnaryMinus() const;
+		bool isInExponent() const;
+		bool isOneLineBlockReached() const;
+//		bool isNextCharWhiteSpace() const;
+		bool lineBeginsWith(char charToCheck) const;
+		void appendChar(char ch, bool canBreakLine = true);
+		void appendCharInsideComments();
+		void appendSequence(const WString &sequence, bool canBreakLine = true);
+		void appendSpacePad();
+		void appendSpaceAfter();
+		void breakLine();
+		void padOperators(const WString *newOperator);
+		void padParens();
+		void formatBrackets(BracketType bracketType);
+		void formatArrayBrackets(BracketType bracketType, bool isOpeningArrayBracket);
+		void adjustComments();
+		const WString *findHeader(const Vector<const WString*> &headers, bool checkBoundry = true);
+
+		static Vector<const WString*> headers;
+		static Vector<const WString*> nonParenHeaders;
+		static Vector<const WString*> preDefinitionHeaders;
+		static Vector<const WString*> preCommandHeaders;
+		static Vector<const WString*> operators;
+		static Vector<const WString*> assignmentOperators;
+		static Vector<const WString*> castOperators;
+
+		ASSourceIterator *sourceIterator;
+		Vector<const WString*> *preBracketHeaderStack;
+		Vector<BracketType> *bracketTypeStack;
+		Vector<int> *parenStack;
+		WString readyFormattedLine;
+		WString currentLine;
+		WString formattedLine;
+		const WString *currentHeader;
+		const WString *previousOperator;    // used ONLY by pad=oper
+		char currentChar;
+		char previousChar;
+		char previousNonWSChar;
+		char previousCommandChar;
+		char quoteChar;
+		int  charNum;
+		int  spacePadNum;
+		int  templateDepth;
+		int  traceFileNumber;
+		int  formattedLineCommentNum;		// comment location on formattedLine
+		int  previousReadyFormattedLineLength;
+		BracketMode bracketFormatMode;
+		BracketType previousBracketType;
+		bool isVirgin;
+		bool shouldPadOperators;
+		bool shouldPadParensOutside;
+		bool shouldPadParensInside;
+		bool shouldUnPadParens;
+		bool shouldConvertTabs;
+		bool isInLineComment;
+		bool isInComment;
+		bool isInPreprocessor;
+		bool isInTemplate;   // true both in template definitions (e.g. template<class A>) and template usage (e.g. F<int>).
+		bool doesLineStartComment;
+		bool isInQuote;
+		bool isInBlParen;
+		bool isSpecialChar;
+		bool isNonParenHeader;
+		bool foundQuestionMark;
+		bool foundPreDefinitionHeader;
+		bool foundNamespaceHeader;
+		bool foundClassHeader;
+		bool foundPreCommandHeader;
+		bool foundCastOperator;
+		bool isInLineBreak;
+//		bool isInClosingBracketLineBreak;
+		bool endOfCodeReached;
+		bool lineCommentNoIndent;
+		bool isLineReady;
+		bool isPreviousBracketBlockRelated;
+		bool isInPotentialCalculation;
+		bool isCharImmediatelyPostComment;
+		bool isPreviousCharPostComment;
+		bool isCharImmediatelyPostLineComment;
+		bool isCharImmediatelyPostOpenBlock;
+		bool isCharImmediatelyPostCloseBlock;
+		bool isCharImmediatelyPostTemplate;
+		bool shouldBreakOneLineBlocks;
+		bool shouldReparseCurrentChar;
+		bool shouldBreakOneLineStatements;
+		bool shouldBreakLineAfterComments;
+		bool shouldBreakClosingHeaderBrackets;
+		bool shouldBreakElseIfs;
+		bool passedSemicolon;
+		bool passedColon;
+		bool isImmediatelyPostComment;
+		bool isImmediatelyPostLineComment;
+		bool isImmediatelyPostEmptyBlock;
+		bool isImmediatelyPostPreprocessor;
+
+		bool shouldBreakBlocks;
+		bool shouldBreakClosingHeaderBlocks;
+		bool isPrependPostBlockEmptyLineRequested;
+		bool isAppendPostBlockEmptyLineRequested;
+
+		bool prependEmptyLine;
+		bool appendOpeningBracket;
+		bool foundClosingHeader;
+
+		bool isInHeader;
+		bool isImmediatelyPostHeader;
+
+	private:    // inline functions
+		// append the CURRENT character (curentChar)to the current formatted line.
+		inline void appendCurrentChar(bool canBreakLine = true) {
+			appendChar(currentChar, canBreakLine);
+		}
+
+		// check if a specific sequence exists in the current placement of the current line
+		inline bool isSequenceReached(const char *sequence) const {
+//			return currentLine.compare(charNum, strlen(sequence), sequence) == 0;
+			return currentLine.Mid(charNum, strlen(sequence)) == WString(sequence);
+		}
+};
+
+}   // end of namespace astyle
+
+// NEEDED FOR Upp::Vector<>
+// marks enum BracketType as moveable so it can be used by Upp containers
+namespace Upp
+{
+	NTL_MOVEABLE(astyle::BracketType);
+
+} // end namespace Upp
+
+#endif // closes ASTYLE_H
diff --git a/uppsrc/plugin/astyle/astyle.upp b/uppsrc/plugin/astyle/astyle.upp
new file mode 100644
index 000000000..097496552
--- /dev/null
+++ b/uppsrc/plugin/astyle/astyle.upp
@@ -0,0 +1,11 @@
+uses
+	Core;
+
+file
+	ASStringTools.hpp,
+	ASStringTools.cpp,
+	astyle.h,
+	ASBeautifier.cpp,
+	ASEnhancer.cpp,
+	ASFormatter.cpp,
+	ASResource.cpp;
diff --git a/uppsrc/plugin/astyle/astyle_main.cpp b/uppsrc/plugin/astyle/astyle_main.cpp
new file mode 100644
index 000000000..807889fb1
--- /dev/null
+++ b/uppsrc/plugin/astyle/astyle_main.cpp
@@ -0,0 +1,1138 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *   astyle_main.cpp
+ *
+ *   This file is a part of "Artistic Style" - an indentation and
+ *   reformatting tool for C, C++, C# and Java source files.
+ *   http://astyle.sourceforge.net
+ *
+ *   The "Artistic Style" project, including all files needed to
+ *   compile it, is free software; you can redistribute it and/or
+ *   modify it under the terms of the GNU Lesser General Public
+ *   License as published by the Free Software Foundation; either
+ *   version 2.1 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 Lesser General Public License for more details.
+ *
+ *   You should have received a copy of the GNU Lesser General Public
+ *   License along with this project; if not, write to the
+ *   Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ *   Boston, MA  02110-1301, USA.
+ *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ */
+
+#include "astyle.h"
+
+#include <iostream>
+#include <fstream>
+#include <sstream>
+#include <cstdlib>
+#include <ctime>
+
+#ifndef ASTYLE_LIB             // for console build only
+#if defined(_MSC_VER) || defined(__DMC__)
+#include <sys/utime.h>
+#include <sys/stat.h>
+//#define utimbuf  _utimbuf
+//#define utime    _utime
+#else
+#include <utime.h>
+#include <sys/stat.h>
+#endif                         // end compiler checks
+#endif                         // end ASTYLE_LIB
+
+// for G++ implementation of string.compare:
+// compare((str), (place), (length))  instead of  compare(place, length, str)
+#if defined(__GNUC__) && __GNUC__ < 3
+#error - Use GNU C compiler release 3 or higher
+#endif
+
+// for namespace problem in version 5.0
+#if defined(_MSC_VER) && _MSC_VER < 1200        // check for V6.0
+#error - Use Microsoft compiler version 6 or higher
+#endif
+
+#ifdef _WIN32
+#define STDCALL __stdcall
+#define EXPORT  __declspec(dllexport)
+#else
+#define STDCALL
+#define EXPORT
+#endif
+
+#define IS_OPTION(arg,op)          ((arg).compare(op)==0)
+#define IS_OPTIONS(arg,a,b)        (IS_OPTION((arg),(a)) || IS_OPTION((arg),(b)))
+
+#define GET_PARAM(arg,op)          ((arg).substr(strlen(op)))
+#define GET_PARAMS(arg,a,b) (isParamOption((arg),(a)) ? GET_PARAM((arg),(a)) : GET_PARAM((arg),(b)))
+
+using namespace astyle;
+
+const char* _version = "1.21";
+
+// some compilers want this declared
+bool parseOption(ASFormatter &formatter, const string &arg, const string &errorInfo);
+
+#ifdef ASTYLE_LIB
+// GUI function pointers
+typedef void (STDCALL *fpError)(int, char*);       // pointer to callback error handler
+typedef char* (STDCALL *fpAlloc)(unsigned long);   // pointer to callback memory allocation
+// GUI variables
+stringstream *_err = NULL;
+#else
+// console variables
+ostream *_err = &cerr;
+bool _purgeOrigIn = false;
+bool _preserveDate = false;
+string _suffix = ".orig";
+stringstream _msg;          // info messages are not printed until a file is read
+#endif
+bool _modeManuallySet = false;
+
+
+// typename will be istringstream for GUI and istream otherwise
+template<typename T>
+class ASStreamIterator :
+			public ASSourceIterator
+{
+	public:
+		ASStreamIterator(T *in);
+		virtual ~ASStreamIterator();
+		bool hasMoreLines() const;
+		string nextLine();
+
+	private:
+		T * inStream;
+		string buffer;
+		bool inStreamEOF;
+};
+
+template<typename T>
+ASStreamIterator<T>::ASStreamIterator(T *in)
+{
+	inStream = in;
+	buffer.reserve(200);
+	inStreamEOF = false;
+}
+
+
+template<typename T>
+ASStreamIterator<T>::~ASStreamIterator()
+{
+}
+
+
+template<typename T>
+bool ASStreamIterator<T>::hasMoreLines() const
+{
+	return !inStreamEOF;
+}
+
+
+/**
+ * read the input stream, delete any end of line characters,
+ *     and build a string that contains the input line.
+ *
+ * @return        string containing the next input line minus any end of line characters
+ */
+template<typename T>
+string ASStreamIterator<T>::nextLine()
+{
+	char ch;
+	char LF = '\n';
+	char CR = '\r';
+	inStream->get(ch);
+	buffer.clear();
+
+	while (!inStream->eof() && ch != LF && ch != CR)
+	{
+		buffer.append(1, ch);
+		inStream->get(ch);
+	}
+
+	if (inStream->eof())
+	{
+		inStreamEOF = true;
+		return buffer;
+	}
+
+	int peekch = inStream->peek();
+
+	if (ch == CR)		// CR+LF is windows otherwise Mac OS 9
+	{
+		if (peekch == LF)
+		{
+			inStream->get();
+			eolWindows++;
+		}
+		else
+			eolMacOld++;
+	}
+	else				// LF is Linux, allow for improbable LF/CR
+	{
+		if (peekch == CR)
+		{
+			inStream->get();
+			eolWindows++;
+		}
+		else
+			eolLinux++;
+	}
+
+	// set output end of line character
+	if (eolWindows >= eolLinux)
+		if (eolWindows >= eolMacOld)
+			strcpy(outputEOL, "\r\n");  // Windows (CR+LF)
+		else
+			strcpy(outputEOL, "\r");    // MacOld (CR)
+	else
+		if (eolLinux >= eolMacOld)
+			strcpy(outputEOL, "\n");    // Linux (LF)
+		else
+			strcpy(outputEOL, "\r");    // MacOld (CR)
+
+	return buffer;
+}
+
+
+template<typename ITER>
+bool parseOptions(ASFormatter &formatter,
+                  const ITER &optionsBegin,
+                  const ITER &optionsEnd,
+                  const string &errorInfo)
+{
+	ITER option;
+	bool ok = true;
+	string arg, subArg;
+
+	for (option = optionsBegin; option != optionsEnd; ++option)
+	{
+		arg = *option;
+
+		if (arg.compare(0, 2, "--") == 0)
+			ok &= parseOption(formatter, arg.substr(2), errorInfo);
+		else if (arg[0] == '-')
+		{
+			size_t i;
+
+			for (i = 1; i < arg.length(); ++i)
+			{
+				if (isalpha(arg[i]) && i > 1)
+				{
+					ok &= parseOption(formatter, subArg, errorInfo);
+					subArg = "";
+				}
+				subArg.append(1, arg[i]);
+			}
+			ok &= parseOption(formatter, subArg, errorInfo);
+			subArg = "";
+		}
+		else
+		{
+			ok &= parseOption(formatter, arg, errorInfo);
+			subArg = "";
+		}
+	}
+	return ok;
+}
+
+void importOptions(istream &in, vector<string> &optionsVector)
+{
+	char ch;
+	string currentToken;
+
+	while (in)
+	{
+		currentToken = "";
+		do
+		{
+			in.get(ch);
+			if (in.eof())
+				break;
+			// treat '#' as line comments
+			if (ch == '#')
+				while (in)
+				{
+					in.get(ch);
+					if (ch == '\n')
+						break;
+				}
+
+			// break options on spaces, tabs or new-lines
+			if (in.eof() || ch == ' ' || ch == '\t' || ch == '\n')
+				break;
+			else
+				currentToken.append(1, ch);
+
+		}
+		while (in);
+
+		if (currentToken.length() != 0)
+			optionsVector.push_back(currentToken);
+	}
+}
+
+bool isParamOption(const string &arg, const char *option)
+{
+	bool retVal = arg.compare(0, strlen(option), option) == 0;
+	// if comparing for short option, 2nd char of arg must be numeric
+	if (retVal && strlen(option) == 1 && arg.length() > 1)
+		if (!isdigit(arg[1]))
+			retVal = false;
+	return retVal;
+}
+
+void isOptionError(const string &arg, const string &errorInfo)
+{
+#ifdef ASTYLE_LIB
+	if (_err->str().length() == 0)
+	{
+		(*_err) << errorInfo << endl;	// need main error message
+		(*_err) << arg;					// output the option in error
+	}
+	else
+		(*_err) << endl << arg;			// put endl after previous option
+#else
+	if (errorInfo.length() > 0)			// to avoid a compiler warning
+		(*_err) << "Error in param: " << arg << endl;
+#endif
+}
+
+bool isParamOption(const string &arg, const char *option1, const char *option2)
+{
+	return isParamOption(arg, option1) || isParamOption(arg, option2);
+}
+
+
+bool parseOption(ASFormatter &formatter, const string &arg, const string &errorInfo)
+{
+	if ( IS_OPTION(arg, "style=ansi") )
+	{
+		formatter.setSpaceIndentation(4);
+		formatter.setBracketFormatMode(BREAK_MODE);
+		formatter.setBracketIndent(false);
+		formatter.setClassIndent(false);
+		formatter.setSwitchIndent(false);
+		formatter.setNamespaceIndent(false);
+	}
+	else if ( IS_OPTION(arg, "style=gnu") )
+	{
+		formatter.setSpaceIndentation(2);
+		formatter.setBracketFormatMode(BREAK_MODE);
+		formatter.setBlockIndent(true);
+		formatter.setClassIndent(false);
+		formatter.setSwitchIndent(false);
+		formatter.setNamespaceIndent(false);
+	}
+	else if ( IS_OPTION(arg, "style=java") )
+	{
+//		formatter.setJavaStyle();
+//		_modeManuallySet = true;
+		formatter.setSpaceIndentation(4);
+		formatter.setBracketFormatMode(ATTACH_MODE);
+		formatter.setBracketIndent(false);
+		formatter.setSwitchIndent(false);
+	}
+	else if ( IS_OPTION(arg, "style=kr") )
+	{
+		//manuallySetCStyle(formatter);
+		formatter.setSpaceIndentation(4);
+		formatter.setBracketFormatMode(ATTACH_MODE);
+		formatter.setBracketIndent(false);
+		formatter.setClassIndent(false);
+		formatter.setSwitchIndent(false);
+		formatter.setNamespaceIndent(false);
+	}
+	else if ( IS_OPTION(arg, "style=linux") )
+	{
+		formatter.setSpaceIndentation(8);
+		formatter.setBracketFormatMode(BDAC_MODE);
+		formatter.setBracketIndent(false);
+		formatter.setClassIndent(false);
+		formatter.setSwitchIndent(false);
+		formatter.setNamespaceIndent(false);
+	}
+	// must check for mode=cs before mode=c !!!
+	else if ( IS_OPTION(arg, "mode=cs") )
+	{
+		formatter.setSharpStyle();
+		_modeManuallySet = true;
+	}
+	else if ( IS_OPTION(arg, "mode=c") )
+	{
+		formatter.setCStyle();
+		_modeManuallySet = true;
+	}
+	else if ( IS_OPTION(arg, "mode=java") )
+	{
+		formatter.setJavaStyle();
+		_modeManuallySet = true;
+	}
+	else if ( isParamOption(arg, "t", "indent=tab=") )
+	{
+		int spaceNum = 4;
+		string spaceNumParam = GET_PARAMS(arg, "t", "indent=tab=");
+		if (spaceNumParam.length() > 0)
+			spaceNum = atoi(spaceNumParam.c_str());
+		if (spaceNum < 2 || spaceNum > 20)
+			isOptionError(arg, errorInfo);
+		else
+			formatter.setTabIndentation(spaceNum, false);
+	}
+	else if ( isParamOption(arg, "T", "force-indent=tab=") )
+	{
+		int spaceNum = 4;
+		string spaceNumParam = GET_PARAMS(arg, "T", "force-indent=tab=");
+		if (spaceNumParam.length() > 0)
+			spaceNum = atoi(spaceNumParam.c_str());
+		if (spaceNum < 2 || spaceNum > 20)
+			isOptionError(arg, errorInfo);
+		else
+			formatter.setTabIndentation(spaceNum, true);
+	}
+	else if ( IS_OPTION(arg, "indent=tab") )
+	{
+		formatter.setTabIndentation(4);
+	}
+	else if ( isParamOption(arg, "s", "indent=spaces=") )
+	{
+		int spaceNum = 4;
+		string spaceNumParam = GET_PARAMS(arg, "s", "indent=spaces=");
+		if (spaceNumParam.length() > 0)
+			spaceNum = atoi(spaceNumParam.c_str());
+		if (spaceNum < 2 || spaceNum > 20)
+			isOptionError(arg, errorInfo);
+		else
+			formatter.setSpaceIndentation(spaceNum);
+	}
+	else if ( IS_OPTION(arg, "indent=spaces") )
+	{
+		formatter.setSpaceIndentation(4);
+	}
+	else if ( isParamOption(arg, "m", "min-conditional-indent=") )
+	{
+		int minIndent = 8;
+		string minIndentParam = GET_PARAMS(arg, "m", "min-conditional-indent=");
+		if (minIndentParam.length() > 0)
+			minIndent = atoi(minIndentParam.c_str());
+		if (minIndent > 40)
+			isOptionError(arg, errorInfo);
+		else
+			formatter.setMinConditionalIndentLength(minIndent);
+	}
+	else if ( isParamOption(arg, "M", "max-instatement-indent=") )
+	{
+		int maxIndent = 40;
+		string maxIndentParam = GET_PARAMS(arg, "M", "max-instatement-indent=");
+		if (maxIndentParam.length() > 0)
+			maxIndent = atoi(maxIndentParam.c_str());
+		if (maxIndent > 80)
+			isOptionError(arg, errorInfo);
+		else
+			formatter.setMaxInStatementIndentLength(maxIndent);
+	}
+	else if ( IS_OPTIONS(arg, "B", "indent-brackets") )
+	{
+		formatter.setBracketIndent(true);
+	}
+	else if ( IS_OPTIONS(arg, "G", "indent-blocks") )
+	{
+		formatter.setBlockIndent(true);
+	}
+	else if ( IS_OPTIONS(arg, "N", "indent-namespaces") )
+	{
+		formatter.setNamespaceIndent(true);
+	}
+	else if ( IS_OPTIONS(arg, "C", "indent-classes") )
+	{
+		formatter.setClassIndent(true);
+	}
+	else if ( IS_OPTIONS(arg, "S", "indent-switches") )
+	{
+		formatter.setSwitchIndent(true);
+	}
+	else if ( IS_OPTIONS(arg, "K", "indent-cases") )
+	{
+		formatter.setCaseIndent(true);
+	}
+	else if ( IS_OPTIONS(arg, "L", "indent-labels") )
+	{
+		formatter.setLabelIndent(true);
+	}
+	else if ( IS_OPTIONS(arg, "y", "brackets=break-closing") )
+	{
+		formatter.setBreakClosingHeaderBracketsMode(true);
+	}
+	else if ( IS_OPTIONS(arg, "b", "brackets=break") )
+	{
+		formatter.setBracketFormatMode(BREAK_MODE);
+	}
+	else if ( IS_OPTIONS(arg, "a", "brackets=attach") )
+	{
+		formatter.setBracketFormatMode(ATTACH_MODE);
+	}
+	else if ( IS_OPTIONS(arg, "l", "brackets=linux") )
+	{
+		formatter.setBracketFormatMode(BDAC_MODE);
+	}
+	else if ( IS_OPTIONS(arg, "O", "one-line=keep-blocks") )
+	{
+		formatter.setBreakOneLineBlocksMode(false);
+	}
+	else if ( IS_OPTIONS(arg, "o", "one-line=keep-statements") )
+	{
+		formatter.setSingleStatementsMode(false);
+	}
+	else if ( IS_OPTIONS(arg, "P", "pad=paren") )
+	{
+		formatter.setParensOutsidePaddingMode(true);
+		formatter.setParensInsidePaddingMode(true);
+	}
+	else if ( IS_OPTIONS(arg, "d", "pad=paren-out") )
+	{
+		formatter.setParensOutsidePaddingMode(true);
+	}
+	else if ( IS_OPTIONS(arg, "D", "pad=paren-in") )
+	{
+		formatter.setParensInsidePaddingMode(true);
+	}
+	else if ( IS_OPTIONS(arg, "U", "unpad=paren") )
+	{
+		formatter.setParensUnPaddingMode(true);
+	}
+	else if ( IS_OPTIONS(arg, "p", "pad=oper") )
+	{
+		formatter.setOperatorPaddingMode(true);
+	}
+	else if ( IS_OPTIONS(arg, "E", "fill-empty-lines") )
+	{
+		formatter.setEmptyLineFill(true);
+	}
+	else if ( IS_OPTIONS(arg, "w", "indent-preprocessor") )
+	{
+		formatter.setPreprocessorIndent(true);
+	}
+	else if ( IS_OPTIONS(arg, "V", "convert-tabs") )
+	{
+		formatter.setTabSpaceConversionMode(true);
+	}
+	else if ( IS_OPTIONS(arg, "F", "break-blocks=all") )
+	{
+		formatter.setBreakBlocksMode(true);
+		formatter.setBreakClosingHeaderBlocksMode(true);
+	}
+	else if ( IS_OPTIONS(arg, "f", "break-blocks") )
+	{
+		formatter.setBreakBlocksMode(true);
+	}
+	else if ( IS_OPTIONS(arg, "e", "break-elseifs") )
+	{
+		formatter.setBreakElseIfsMode(true);
+	}
+#ifdef ASTYLE_LIB
+	// End of options used by GUI
+	else
+		isOptionError(arg, errorInfo);
+#else
+	// Options used by only console
+	else if ( IS_OPTIONS(arg, "n", "suffix=none") )
+	{
+		_purgeOrigIn = true;
+	}
+	else if ( isParamOption(arg, "suffix=") )
+	{
+		string suffixParam = GET_PARAM(arg, "suffix=");
+		if (suffixParam.length() > 0)
+		{
+			_suffix = suffixParam;
+//			if (_suffix[0] != '.')
+//				_suffix = '.' + _suffix;
+		}
+	}
+	else if ( IS_OPTIONS(arg, "Z", "preserve-date") )
+	{
+		_preserveDate =true;
+	}
+	else if ( IS_OPTIONS(arg, "X", "errors-to-stdout") )
+	{
+		_err = &cout;
+	}
+	else if ( IS_OPTIONS(arg, "v", "version") )
+	{
+		(*_err) << "Artistic Style " << _version << endl;
+		exit(0);
+	}
+	else
+	{
+		(*_err) << errorInfo << arg << endl;
+		return false; // unknown option
+	}
+#endif
+// End of parseOption function
+	return true; //o.k.
+}
+
+
+#ifdef ASTYLE_LIB
+// *************************   GUI functions   *****************************************************
+/*
+ * IMPORTANT VC DLL linker must have the parameter  /EXPORT:AStyleMain=_AStyleMain@16
+ *                                                  /EXPORT:AStyleGetVersion=_AStyleGetVersion@0
+ * For Dll only - "warning C4702: unreachable code" in the <vector> header
+ *                is caused by using the Optimization options.
+ *                /O2   Maximize speed
+ *                /O1   Minimize size
+ *                /Ob2  Inline Expansion
+ *                This is a bug in the Microsoft compiler.  The program runs about twice as fast
+ *                with the options set.  There haven't been any problems so far.
+*/
+extern "C" EXPORT char* STDCALL
+	AStyleMain(const char* pSourceIn,          // pointer to the source to be formatted
+	           const char* pOptions,           // pointer to AStyle options, separated by \n
+	           fpError fpErrorHandler,         // pointer to error handler function
+	           fpAlloc fpMemoryAlloc)          // pointer to memory allocation function
+{
+	if (fpErrorHandler == NULL)			// cannot display a message if no error handler
+		return NULL;
+
+	if (pSourceIn == NULL)
+	{
+		fpErrorHandler(101, "No pointer to source input");
+		return NULL;
+	}
+	if (pOptions == NULL)
+	{
+		fpErrorHandler(102, "No pointer to AStyle options");
+		return NULL;
+	}
+	if (fpMemoryAlloc == NULL)
+	{
+		fpErrorHandler(103, "No pointer to memory allocation function");
+		return NULL;
+	}
+
+	ASFormatter formatter;
+
+	string arg;
+	vector<string> optionsVector;
+	istringstream opt(pOptions);
+	_err = new stringstream;
+	_modeManuallySet = false;
+
+	importOptions(opt, optionsVector);
+
+	parseOptions(formatter,
+	             optionsVector.begin(),
+	             optionsVector.end(),
+	             "Unknown Artistic Style options\n"
+	             "The following options were not processed:");
+
+	if (_err->str().length() > 0)
+		fpErrorHandler(210, (char*) _err->str().c_str());
+
+	delete _err;
+	_err = NULL;
+
+	istringstream in(pSourceIn);
+	ASStreamIterator<istringstream> streamIterator(&in);
+	ostringstream out;
+	formatter.init(&streamIterator);
+
+	while (formatter.hasMoreLines())
+	{
+		out << formatter.nextLine();
+		out << streamIterator.outputEOL;
+	}
+
+	unsigned long textSizeOut = out.str().length();
+	char* pTextOut = fpMemoryAlloc(textSizeOut + 1);     // call memory allocation function
+//    pTextOut = NULL;           // for testing
+	if (pTextOut == NULL)
+	{
+		fpErrorHandler(110, "Allocation failure on output");
+		return NULL;
+	}
+
+	strcpy(pTextOut, out.str().c_str());
+
+	return pTextOut;
+}
+
+extern "C" EXPORT const char* STDCALL AStyleGetVersion (void)
+{
+	return _version;
+}
+
+#else
+
+void preserveFileDate(const char *oldFileName, const char *newFileName)
+{
+	struct stat stBuf;
+	bool statErr = false;
+	if (stat (oldFileName, &stBuf) == -1)
+		statErr = true;
+	else
+	{
+		struct utimbuf outBuf;
+		outBuf.actime = stBuf.st_atime;
+		// add 1 so RCS will recoginze a change
+		outBuf.modtime = stBuf.st_mtime + 1;
+		if (utime (newFileName, &outBuf) == -1)
+			statErr = true;
+	}
+	if (statErr)
+		(*_err) << "    Could not preserve file date" << endl;
+}
+
+bool stringEndsWith(const string &str, const string &suffix)
+{
+	int strIndex = (int) str.length() - 1;
+	int suffixIndex = (int) suffix.length() - 1;
+
+	while (strIndex >= 0 && suffixIndex >= 0)
+	{
+		if (tolower(str[strIndex]) != tolower(suffix[suffixIndex]))
+			return false;
+
+		--strIndex;
+		--suffixIndex;
+	}
+
+	return true;
+}
+
+
+void error(const char *why, const char* what)
+{
+	(*_err) << why << ' ' << what << '\n' << endl;
+	exit(1);
+}
+
+
+void printHelp()
+{
+	(*_err) << endl;
+	(*_err) << "                            Artistic Style " << _version << endl;
+	(*_err) << "                         Maintained by: Jim Pattee\n";
+	(*_err) << "                       Original Author: Tal Davidson\n";
+	(*_err) << endl;
+	(*_err) << "Usage  :  astyle [options] Source1.cpp Source2.cpp  [...]\n";
+	(*_err) << "          astyle [options] < Original > Beautified\n";
+	(*_err) << endl;
+	(*_err) << "When indenting a specific file, the resulting indented file RETAINS the\n";
+	(*_err) << "original file-name. The original pre-indented file is renamed, with a\n";
+	(*_err) << "suffix of \".orig\" added to the original filename.\n";
+	(*_err) << endl;
+	(*_err) << "By default, astyle is set up to indent C/C++/C#/Java files, with 4 spaces\n";
+	(*_err) << "per indent, a maximal indentation of 40 spaces inside continuous statements,\n";
+	(*_err) << "and NO formatting.\n";
+	(*_err) << endl;
+	(*_err) << "Option's Format:\n";
+	(*_err) << "----------------\n";
+	(*_err) << "    Long options (starting with '--') must be written one at a time.\n";
+	(*_err) << "    Short options (starting with '-') may be appended together.\n";
+	(*_err) << "    Thus, -bps4 is the same as -b -p -s4.\n";
+	(*_err) << endl;
+	(*_err) << "Predefined Style Options:\n";
+	(*_err) << "-------------------------\n";
+	(*_err) << "    --style=ansi\n";
+	(*_err) << "    ANSI style formatting/indenting.\n";
+	(*_err) << endl;
+	(*_err) << "    --style=gnu\n";
+	(*_err) << "    GNU style formatting/indenting.\n";
+	(*_err) << endl;
+	(*_err) << "    --style=kr\n";
+	(*_err) << "    Kernighan&Ritchie style formatting/indenting.\n";
+	(*_err) << endl;
+	(*_err) << "    --style=linux\n";
+	(*_err) << "    Linux mode (8 spaces per indent, break definition-block\n";
+	(*_err) << "    brackets but attach command-block brackets).\n";
+	(*_err) << endl;
+	(*_err) << "    --style=java\n";
+	(*_err) << "    Java mode, with standard java style formatting/indenting.\n";
+	(*_err) << endl;
+	(*_err) << "Tab and Bracket Options:\n";
+	(*_err) << "------------------------\n";
+	(*_err) << "    default indent option\n";
+	(*_err) << "    If no indentation option is set,\n";
+	(*_err) << "    the default option of 4 spaces will be used.\n";
+	(*_err) << endl;
+	(*_err) << "    --indent=spaces=#   OR   -s#\n";
+	(*_err) << "    Indent using # spaces per indent. Not specifying #\n";
+	(*_err) << "    will result in a default of 4 spaces per indent.\n";
+	(*_err) << endl;
+	(*_err) << "    --indent=tab   OR   --indent=tab=#   OR   -t   OR   -t#\n";
+	(*_err) << "    Indent using tab characters, assuming that each\n";
+	(*_err) << "    tab is # spaces long. Not specifying # will result\n";
+	(*_err) << "    in a default assumption of 4 spaces per tab.\n";
+	(*_err) << endl;
+	(*_err) << "    --force-indent=tab=#   OR   -T#\n";
+	(*_err) << "    Indent using tab characters, assuming that each\n";
+	(*_err) << "    tab is # spaces long. Force tabs to be used in areas\n";
+	(*_err) << "    Astyle would prefer to use spaces.\n";
+	(*_err) << endl;
+	(*_err) << "    default brackets option\n";
+	(*_err) << "    If no brackets option is set,\n";
+	(*_err) << "    the brackets will not be changed.\n";
+	(*_err) << endl;
+	(*_err) << "    --brackets=break   OR   -b\n";
+	(*_err) << "    Break brackets from pre-block code (i.e. ANSI C/C++ style).\n";
+	(*_err) << endl;
+	(*_err) << "    --brackets=attach   OR   -a\n";
+	(*_err) << "    Attach brackets to pre-block code (i.e. Java/K&R style).\n";
+	(*_err) << endl;
+	(*_err) << "    --brackets=linux   OR   -l\n";
+	(*_err) << "    Break definition-block brackets and attach command-block\n";
+	(*_err) << "    brackets.\n";
+	(*_err) << endl;
+	(*_err) << "    --brackets=break-closing   OR   -y\n";
+	(*_err) << "    Break brackets before closing headers (e.g. 'else', 'catch', ...).\n";
+	(*_err) << "    Should be appended to --brackets=attach or --brackets=linux.\n";
+	(*_err) << endl;
+	(*_err) << "Indentation options:\n";
+	(*_err) << "--------------------\n";
+	(*_err) << "    --indent-classes   OR   -C\n";
+	(*_err) << "    Indent 'class' blocks, so that the inner 'public:',\n";
+	(*_err) << "    'protected:' and 'private: headers are indented in\n";
+	(*_err) << "    relation to the class block.\n";
+	(*_err) << endl;
+	(*_err) << "    --indent-switches   OR   -S\n";
+	(*_err) << "    Indent 'switch' blocks, so that the inner 'case XXX:'\n";
+	(*_err) << "    headers are indented in relation to the switch block.\n";
+	(*_err) << endl;
+	(*_err) << "    --indent-cases   OR   -K\n";
+	(*_err) << "    Indent case blocks from the 'case XXX:' headers.\n";
+	(*_err) << "    Case statements not enclosed in blocks are NOT indented.\n";
+	(*_err) << endl;
+	(*_err) << "    --indent-brackets   OR   -B\n";
+	(*_err) << "    Add extra indentation to '{' and '}' block brackets.\n";
+	(*_err) << endl;
+	(*_err) << "    --indent-blocks   OR   -G\n";
+	(*_err) << "    Add extra indentation entire blocks (including brackets).\n";
+	(*_err) << endl;
+	(*_err) << "    --indent-namespaces   OR   -N\n";
+	(*_err) << "    Indent the contents of namespace blocks.\n";
+	(*_err) << endl;
+	(*_err) << "    --indent-labels   OR   -L\n";
+	(*_err) << "    Indent labels so that they appear one indent less than\n";
+	(*_err) << "    the current indentation level, rather than being\n";
+	(*_err) << "    flushed completely to the left (which is the default).\n";
+	(*_err) << endl;
+	(*_err) << "    --indent-preprocessor   OR   -w\n";
+	(*_err) << "    Indent multi-line #define statements.\n";
+	(*_err) << endl;
+	(*_err) << "    --max-instatement-indent=#   OR   -M#\n";
+	(*_err) << "    Indent a maximal # spaces in a continuous statement,\n";
+	(*_err) << "    relative to the previous line.\n";
+	(*_err) << endl;
+	(*_err) << "    --min-conditional-indent=#   OR   -m#\n";
+	(*_err) << "    Indent a minimal # spaces in a continuous conditional\n";
+	(*_err) << "    belonging to a conditional header.\n";
+	(*_err) << endl;
+	(*_err) << "Formatting options:\n";
+	(*_err) << "-------------------\n";
+	(*_err) << "    --break-blocks   OR   -f\n";
+	(*_err) << "    Insert empty lines around unrelated blocks, labels, classes, ...\n";
+	(*_err) << endl;
+	(*_err) << "    --break-blocks=all   OR   -F\n";
+	(*_err) << "    Like --break-blocks, except also insert empty lines \n";
+	(*_err) << "    around closing headers (e.g. 'else', 'catch', ...).\n";
+	(*_err) << endl;
+	(*_err) << "    --break-elseifs   OR   -e\n";
+	(*_err) << "    Break 'else if()' statements into two different lines.\n";
+	(*_err) << endl;
+	(*_err) << "    --pad=oper   OR   -p\n";
+	(*_err) << "    Insert space paddings around operators.\n";
+	(*_err) << endl;
+	(*_err) << "    --pad=paren   OR   -P\n";
+	(*_err) << "    Insert space padding around parenthesis on both the outside\n";
+	(*_err) << "    and the inside.\n";
+	(*_err) << endl;
+	(*_err) << "    --pad=paren-out   OR   -d\n";
+	(*_err) << "    Insert space padding around parenthesis on the outside only.\n";
+	(*_err) << endl;
+	(*_err) << "    --pad=paren-in   OR   -D\n";
+	(*_err) << "    Insert space padding around parenthesis on the inside only.\n";
+	(*_err) << endl;
+	(*_err) << "    --unpad=paren   OR   -U\n";
+	(*_err) << "    Remove unnecessary space padding around parenthesis.  This\n";
+	(*_err) << "    can be used in combination with the 'pad' options above.\n";
+	(*_err) << endl;
+	(*_err) << "    --one-line=keep-statements   OR   -o\n";
+	(*_err) << "    Don't break lines containing multiple statements into\n";
+	(*_err) << "    multiple single-statement lines.\n";
+	(*_err) << endl;
+	(*_err) << "    --one-line=keep-blocks   OR   -O\n";
+	(*_err) << "    Don't break blocks residing completely on one line.\n";
+	(*_err) << endl;
+	(*_err) << "    --convert-tabs   OR   -V\n";
+	(*_err) << "    Convert tabs to spaces.\n";
+	(*_err) << endl;
+	(*_err) << "    --fill-empty-lines   OR   -E\n";
+	(*_err) << "    Fill empty lines with the white space of their\n";
+	(*_err) << "    previous lines.\n";
+	(*_err) << endl;
+	(*_err) << "    --mode=c   OR   -c\n";
+	(*_err) << "    Indent a C, C++ or C# source file (this is the default).\n";
+	(*_err) << endl;
+	(*_err) << "    --mode=java   OR   -j\n";
+	(*_err) << "    Indent a Java(TM) source file.\n";
+	(*_err) << endl;
+	(*_err) << "Other options:\n";
+	(*_err) << "--------------\n";
+	(*_err) << "    --suffix=####\n";
+	(*_err) << "    Append the suffix #### instead of '.orig' to original filename.\n";
+	(*_err) << endl;
+	(*_err) << "    --suffix=none   OR   -n\n";
+	(*_err) << "    Do not retain a backup of the original file.\n";
+	(*_err) << endl;
+	(*_err) << "    --options=####\n";
+	(*_err) << "    Specify an options file #### to read and use.\n";
+	(*_err) << endl;
+	(*_err) << "    --options=none\n";
+	(*_err) << "    Disable the default options file.\n";
+	(*_err) << "    Only the command-line parameters will be used.\n";
+	(*_err) << endl;
+	(*_err) << "    --preserve-date   OR   -Z\n";
+	(*_err) << "    The date and time modified will not be changed in the formatted file.\n";
+	(*_err) << endl;
+	(*_err) << "    --errors-to-stdout   OR   -X\n";
+	(*_err) << "    Print errors and help information to standard-output rather than\n";
+	(*_err) << "    to standard-error.\n";
+	(*_err) << endl;
+	(*_err) << "    --version   OR   -v\n";
+	(*_err) << "    Print version number.\n";
+	(*_err) << endl;
+	(*_err) << "    --help   OR   -h   OR   -?\n";
+	(*_err) << "    Print this help message.\n";
+	(*_err) << endl;
+	(*_err) << "Default options file:\n";
+	(*_err) << "---------------------\n";
+	(*_err) << "    Artistic Style looks for a default options file in the\n";
+	(*_err) << "    following order:\n";
+	(*_err) << "    1. The contents of the ARTISTIC_STYLE_OPTIONS environment\n";
+	(*_err) << "       variable if it exists.\n";
+	(*_err) << "    2. The file called .astylerc in the directory pointed to by the\n";
+	(*_err) << "       HOME environment variable ( i.e. $HOME/.astylerc ).\n";
+	(*_err) << "    3. The file called astylerc in the directory pointed to by the\n";
+	(*_err) << "       USERPROFILE environment variable ( i.e. %USERPROFILE%\\astylerc ).\n";
+	(*_err) << "    If a default options file is found, the options in this file\n";
+	(*_err) << "    will be parsed BEFORE the command-line options.\n";
+	(*_err) << "    Long options within the default option file may be written without\n";
+	(*_err) << "    the preliminary '--'.\n";
+	(*_err) << endl;
+}
+
+int main(int argc, char *argv[])
+{
+	ASFormatter formatter;
+	vector<string> fileNameVector;
+	vector<string> optionsVector;
+	string optionsFileName = "";
+	string arg;
+	bool ok = true;
+	bool shouldPrintHelp = false;
+	bool shouldParseOptionsFile = true;
+
+	_modeManuallySet = false;
+
+	_msg << "\nArtistic Style " << _version << endl;
+	// manage flags
+	for (int i = 1; i < argc; i++)
+	{
+		arg = string(argv[i]);
+
+		if ( IS_OPTION(arg, "--options=none") )
+		{
+			shouldParseOptionsFile = false;
+		}
+		else if ( isParamOption(arg, "--options=") )
+		{
+			optionsFileName = GET_PARAM(arg, "--options=");
+		}
+		else if ( IS_OPTION(arg, "-h")
+		          || IS_OPTION(arg, "--help")
+		          || IS_OPTION(arg, "-?") )
+		{
+			shouldPrintHelp = true;
+		}
+		else if (arg[0] == '-')
+		{
+			optionsVector.push_back(arg);
+		}
+		else // file-name
+		{
+			fileNameVector.push_back(arg);
+		}
+	}
+
+	// parse options file
+	if (shouldParseOptionsFile)
+	{
+		if (optionsFileName.compare("") == 0)
+		{
+			char* env = getenv("ARTISTIC_STYLE_OPTIONS");
+			if (env != NULL)
+				optionsFileName = string(env);
+		}
+		if (optionsFileName.compare("") == 0)
+		{
+			char* env = getenv("HOME");
+			if (env != NULL)
+				optionsFileName = string(env) + string("/.astylerc");
+		}
+		if (optionsFileName.compare("") == 0)
+		{
+			char* env = getenv("USERPROFILE");
+			if (env != NULL)
+				optionsFileName = string(env) + string("/astylerc");
+		}
+
+		if (optionsFileName.compare("") != 0)
+		{
+			ifstream optionsIn(optionsFileName.c_str());
+			if (optionsIn)
+			{
+				_msg << "Using default options file " << optionsFileName << endl;
+				vector<string> fileOptionsVector;
+				importOptions(optionsIn, fileOptionsVector);
+				ok = parseOptions(formatter,
+				                  fileOptionsVector.begin(),
+				                  fileOptionsVector.end(),
+				                  string("Unknown option in default options file: "));
+			}
+
+			optionsIn.close();
+			if (!ok)
+			{
+				(*_err) << "For help on options, type 'astyle -h' " << endl;
+			}
+		}
+	}
+
+	// parse options from command line
+
+	ok = parseOptions(formatter,
+	                  optionsVector.begin(),
+	                  optionsVector.end(),
+	                  string("Unknown command line option: "));
+	if (!ok)
+	{
+		(*_err) << "For help on options, type 'astyle -h' \n" << endl;
+		exit(1);
+	}
+
+	if (shouldPrintHelp)
+	{
+		printHelp();
+		exit(0);
+	}
+
+	// if no files have been given, use cin for input and cout for output
+	// this is used to format text for text editors like TextWrangler
+	// do NOT display any console messages when this branch is used
+	if (fileNameVector.empty())
+	{
+		ASStreamIterator<istream> streamIterator(&cin);
+
+		formatter.init(&streamIterator);
+
+		while (formatter.hasMoreLines())
+		{
+			cout << formatter.nextLine();
+			if (formatter.hasMoreLines())
+				cout << streamIterator.outputEOL;
+		}
+		cout.flush();
+	}
+	else
+	{
+		// indent the given files
+		cout << _msg.str().c_str();
+		clock_t startTime = clock();
+		for (size_t i = 0; i < fileNameVector.size(); i++)
+		{
+			string originalFileName = fileNameVector[i];
+			string inFileName = originalFileName + _suffix;
+
+			remove(inFileName.c_str());     // remove the old .orig if present
+
+			// check if the file is present before rename
+			ifstream inCheck(originalFileName.c_str());
+			if (!inCheck)
+				error("Could not open input file", originalFileName.c_str());
+			inCheck.close();
+
+			if (rename(originalFileName.c_str(), inFileName.c_str()) < 0)
+				error("Could not rename ", string(originalFileName + " to " + inFileName).c_str());
+
+			ifstream in(inFileName.c_str(), ios::binary);
+			if (!in)
+				error("Could not open input file", inFileName.c_str());
+
+			ofstream out(originalFileName.c_str(), ios::binary);
+			if (!out)
+				error("Could not open output file", originalFileName.c_str());
+
+			// Unless a specific language mode has been, set the language mode
+			// according to the file's suffix.
+			if (!_modeManuallySet)
+			{
+				if (stringEndsWith(originalFileName, string(".java")))
+					formatter.setJavaStyle();
+				else if (stringEndsWith(originalFileName, string(".cs")))
+					formatter.setSharpStyle();
+				else
+					formatter.setCStyle();
+			}
+			// display file formatting message and save the filename
+			cout << "formatting " << originalFileName.c_str() << endl;
+			size_t fname = originalFileName.find_last_of("/\\");
+			if (fname == string::npos)
+				fname = 0;
+			else
+				fname +=1;
+			formatter.fileName = originalFileName.substr(fname);
+
+			ASStreamIterator<istream> streamIterator(&in);
+			formatter.init(&streamIterator);
+
+			while (formatter.hasMoreLines())
+			{
+				out << formatter.nextLine();
+				// the last line does not get an eol
+				if (formatter.hasMoreLines())
+					out << streamIterator.outputEOL;
+			}
+			out.flush();
+			out.close();
+			in.close();
+
+			// change date modified to original file date
+			if (_preserveDate)
+				preserveFileDate(inFileName.c_str(), originalFileName.c_str());
+
+			if (_purgeOrigIn)
+				remove(inFileName.c_str());
+		}
+		// all files formatted
+		clock_t stopTime = clock();
+		float secs = (float) (stopTime - startTime) / CLOCKS_PER_SEC;
+		// show tenths of a second if time is less than 20 seconds
+		cout.precision(2);
+		if (secs >= 100 || (secs >= 10 && secs < 20))
+			cout.precision(3);
+		cout << "total time " << secs << " seconds" << endl;
+		cout.precision(0);
+		cout << endl;
+	}
+	return 0;
+}
+
+#endif
+// *************************   end of console functions   *****************************************
diff --git a/uppsrc/plugin/astyle/init b/uppsrc/plugin/astyle/init
new file mode 100644
index 000000000..cb0d67960
--- /dev/null
+++ b/uppsrc/plugin/astyle/init
@@ -0,0 +1,4 @@
+#ifndef _plugin_astyle_icpp_init_stub
+#define _plugin_astyle_icpp_init_stub
+#include "Core/init"
+#endif
diff --git a/uppsrc/plugin/bmp/Bmp.cpp b/uppsrc/plugin/bmp/Bmp.cpp
new file mode 100644
index 000000000..59e6e1ee0
--- /dev/null
+++ b/uppsrc/plugin/bmp/Bmp.cpp
@@ -0,0 +1,287 @@
+#include "bmp.h"
+
+NAMESPACE_UPP
+
+#include "bmphdr.h"
+
+bool LoadBMPHeader(Stream& stream, BMPHeader& header, bool file)
+{
+	if(!stream.IsOpen())
+		return false;
+	ASSERT(stream.IsLoading());
+	if(file)
+	{
+		BMP_FILEHEADER bmfh;
+		if(!stream.GetAll(&bmfh, sizeof(bmfh)))
+			return false;
+		bmfh.SwapEndian();
+		if(bmfh.bfType != 'B' + 256 * 'M')
+			return false;
+	}
+	Zero(header);
+	if(!stream.GetAll(&header, sizeof(BMP_INFOHEADER)) || header.biSize < sizeof(BMP_INFOHEADER))
+		return false;
+	header.SwapEndian();
+	if(header.biBitCount != 1 && header.biBitCount != 4 && header.biBitCount != 8
+	&& header.biBitCount != 16 && header.biBitCount != 24 && header.biBitCount != 32)
+		return false;
+	if(header.biSizeImage == 0) {
+		if(header.biCompression != 0 /* BI_RGB */)
+			return false;
+		header.biSizeImage = tabs(header.biHeight) * (((header.biWidth * header.biBitCount + 31) >> 3) & -4);
+	}
+	stream.SeekCur(header.biSize - sizeof(BMP_INFOHEADER));
+	if(header.biBitCount <= 8) {
+		if(!stream.GetAll(header.palette, (header.biClrUsed ? header.biClrUsed : 1 << header.biBitCount) * sizeof(BMP_RGB)))
+			return false;
+	}
+	else if(header.biBitCount == 16 || header.biBitCount == 32)
+	{ // prepare 16-bit rgb masks & shifts
+		if(header.biCompression == 0 /* BI_RGB */)
+			;
+		else if(header.biCompression == 3 /* BI_BITFIELDS */)
+		{ // read bitfield masks
+			if(!stream.GetAll(header.palette, 12))
+				return false;
+		}
+		else
+			return false;
+	}
+	if(header.biBitCount >= 16 && header.biClrUsed != 0)
+		stream.SeekCur(header.biClrUsed * sizeof(BMP_RGB));
+	return true;
+}
+
+static Size GetDotSize(Size pixel_size, int xpm, int ypm)
+{
+	if(!xpm || !ypm)
+		return Size(0, 0);
+	static const double DOTS_PER_METER = 60000 / 2.54;
+	return Size(fround(pixel_size.cx * DOTS_PER_METER / xpm), fround(pixel_size.cy * DOTS_PER_METER / ypm));
+}
+
+bool BMPRaster::Create()
+{
+	Stream& stream = GetStream();
+	size = Size(0, 0);
+	if(!stream.IsOpen()) {
+		SetError();
+		return false;
+	}
+	ASSERT(stream.IsLoading());
+	BMPHeader header;
+	if(!LoadBMPHeader(stream, header, file)) {
+		SetError();
+		return false;
+	}
+	switch(header.biBitCount) {
+	case 1: fmt.Set1mf(); break;
+	case 4: fmt.Set4mf(); break;
+	case 8: fmt.Set8(); break;
+	case 16:
+		if(header.biCompression == 3 /* BI_BITFIELD */)
+			fmt.Set16le(*(dword *)(header.palette + 0), *(dword *)(header.palette + 1), *(dword *)(header.palette + 2));
+		else
+			fmt.Set16le(31 << 10, 31 << 5, 31);
+		break;
+	case 24:
+		fmt.Set24le(0xff0000, 0x00ff00, 0x0000ff);
+		break;
+	case 32:
+		if(header.biCompression == 3 /* BI_BITFIELD */)
+			fmt.Set32le(*(dword *)(header.palette + 0), *(dword *)(header.palette + 1), *(dword *)(header.palette + 2));
+		else
+			fmt.Set32le(0xff0000, 0x00ff00, 0x0000ff);
+		break;
+	}
+	if(header.biBitCount <= 8) {
+		int ncolors = 1 << header.biBitCount;
+		palette.Alloc(ncolors);
+		const BMP_RGB *q = header.palette;
+		for(int i = 0; i < ncolors; i++) {
+			palette[i].r = q->rgbRed;
+			palette[i].g = q->rgbGreen;
+			palette[i].b = q->rgbBlue;
+			palette[i].a = 255;
+			q++;
+		}
+	}
+
+	size = Size(header.biWidth, tabs(header.biHeight));
+	info.kind = IMAGE_OPAQUE;
+	info.bpp = header.biBitCount;
+	info.dots = GetDotSize(size, header.biXPelsPerMeter, header.biYPelsPerMeter);
+	info.hotspot = Point(0, 0);
+	info.colors = fmt.GetColorCount();
+	topdown = header.biHeight < 0;
+	row_bytes = (fmt.GetByteCount(size.cx) + 3) & ~3;
+	scanline.Alloc(row_bytes);
+	soff = stream.GetPos();
+
+	if(header.biBitCount == 8 && header.biCompression == 1 /* BI_RLE8 */) {
+		ImageBuffer ib(size);
+		int x = 0;
+		int y = 0;
+		RGBA *t = ib[header.biHeight < 0 ? 0 : size.cy - 1];
+		while(!stream.IsEof()) {
+			int c = stream.Get();
+			if(stream.IsEof())
+				return false;
+			if(c) {
+				c = min(c, size.cx - c);
+				int q = stream.Get();
+				if(q < 0)
+					return false;
+				Fill(t, palette[q], c);
+				t += c;
+				x += c;
+			}
+			else {
+				c = stream.Get();
+				if(c < 0 || c == 1)
+					break;
+				if(c == 0) {
+					x = 0;
+					++y;
+					if(y == size.cy)
+						break;
+					t = ib[header.biHeight < 0 ? y : size.cy - 1 - y];
+				}
+				else
+				if(c == 2) {
+					x += stream.Get();
+					y += stream.Get();
+					if(x < 0 || x >= size.cx || y < 0 || y >= size.cy)
+						return false;
+					t = ib[header.biHeight < 0 ? y : size.cy - 1 - y];
+				}
+				else {
+					int al = c & 1;
+					while(c--) {
+						int q = stream.Get();
+						if(q < 0 || x >= size.cx)
+							return false;
+						*t++ = palette[q];
+						x++;
+					}
+					if(al)
+						stream.Get();
+				}
+			}
+		}
+		rle = new ImageRaster(ib);
+		return true;
+	}
+	if(header.biBitCount == 4 && header.biCompression == 2 /* BI_RLE4 */) {
+		ImageBuffer ib(size);
+		int x = 0;
+		int y = 0;
+		RGBA *t = ib[header.biHeight < 0 ? 0 : size.cy - 1];
+		while(!stream.IsEof()) {
+			int c = stream.Get();
+			if(stream.IsEof())
+				return false;
+			if(c) {
+				c = min(c, size.cx - x);
+				int q = stream.Get();
+				if(q < 0)
+					return false;
+				int q1 = q & 15;
+				q = (q >> 4) & 15;
+				x += c;
+				while(c--) {
+					*t++ = palette[q];
+					Swap(q, q1);
+				}
+			}
+			else {
+				c = stream.Get();
+				if(c < 0 || c == 1)
+					break;
+				if(c == 0) {
+					x = 0;
+					++y;
+					if(y == size.cy)
+						break;
+					t = ib[header.biHeight < 0 ? y : size.cy - 1 - y];
+				}
+				else
+				if(c == 2) {
+					x += stream.Get();
+					y += stream.Get();
+					if(x < 0 || x >= size.cx || y < 0 || y >= size.cy)
+						return false;
+					t = ib[header.biHeight < 0 ? y : size.cy - 1 - y];
+				}
+				else {
+					if(x + c >= size.cx)
+						return false;
+					x += c;
+					int i = 0;
+					while(i < c) {
+						int q = stream.Get();
+						if(q < 0)
+							return false;
+						*t++ = palette[(q >> 4) & 15];
+						if(++i >= c) break;
+						*t++ = palette[q & 15];
+						++i;
+					}
+					c = 3 - (c & 3);
+					while(c--)
+						stream.Get();
+				}
+			}
+		}
+		rle = new ImageRaster(ib);
+	}
+	return true;
+}
+
+Size BMPRaster::GetSize()
+{
+	return size;
+}
+
+Raster::Info BMPRaster::GetInfo()
+{
+	return info;
+}
+
+Raster::Line BMPRaster::GetLine(int line)
+{
+	if(rle)
+		return rle->GetLine(line);
+	byte *ptr = new byte[row_bytes];
+	if(!IsError()) {
+		Stream& stream = GetStream();
+		topdown = false;
+		stream.Seek(soff + (topdown ? line * row_bytes : (size.cy - line - 1) * row_bytes));
+		if(stream.GetAll(ptr, row_bytes))
+			return Line(ptr, this, true);
+		SetError();
+	}
+	memset(ptr, 0, row_bytes);
+	return Line(ptr, this, true);
+}
+
+int BMPRaster::GetPaletteCount()
+{
+	return fmt.GetPaletteCount();
+}
+
+RGBA *BMPRaster::GetPalette()
+{
+	return fmt.GetPaletteCount() ? ~palette : NULL;
+}
+
+const RasterFormat *BMPRaster::GetFormat()
+{
+	return &fmt;
+}
+
+BMPRaster::~BMPRaster()
+{
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/plugin/bmp/BmpReg.icpp b/uppsrc/plugin/bmp/BmpReg.icpp
new file mode 100644
index 000000000..c58c5bc91
--- /dev/null
+++ b/uppsrc/plugin/bmp/BmpReg.icpp
@@ -0,0 +1,9 @@
+#include "bmp.h"
+
+NAMESPACE_UPP
+
+INITBLOCK {
+	StreamRaster::Register<BMPRaster>();
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/plugin/bmp/BmpWrite.cpp b/uppsrc/plugin/bmp/BmpWrite.cpp
new file mode 100644
index 000000000..b9fa29700
--- /dev/null
+++ b/uppsrc/plugin/bmp/BmpWrite.cpp
@@ -0,0 +1,87 @@
+#include "bmp.h"
+
+NAMESPACE_UPP
+
+#include "bmphdr.h"
+
+int BMPEncoder::GetPaletteCount()
+{
+	if(bpp > 8 || grayscale) return 0;
+	return bpp == 8 ? 256 : bpp == 4 ? 16 : 2;
+}
+
+void BMPEncoder::Start(Size size)
+{
+	BMPHeader header;
+	Zero(header);
+	header.biSize = sizeof(BMP_INFOHEADER);
+	header.biWidth = size.cx;
+	header.biHeight = size.cy;
+	header.biBitCount = bpp;
+	header.biPlanes = 1;
+	header.biCompression = 0;
+	int ncolors = 0;
+	switch(bpp) {
+	case 1:  format.Set1mf(); ncolors = 2; break;
+	case 4:  format.Set4mf(); ncolors = 16; break;
+	case 8:  format.Set8(); ncolors = 256; break;
+	case 16: format.Set16le(0xf800, 0x07E0, 0x001f); break;
+	case 32: format.Set32le(0xff0000, 0x00ff00, 0x0000ff); break;
+	default: format.Set24le(0xff0000, 0x00ff00, 0x0000ff); break;
+	}
+	if(ncolors) {
+		if(grayscale)
+			for(int i = 0; i < ncolors; i++) {
+				BMP_RGB& p = header.palette[i];
+				p.rgbRed = p.rgbGreen = p.rgbBlue = 255 * i / (ncolors - 1);
+			}
+		else {
+			const RGBA *palette = GetPalette();
+			for(int i = 0; i < ncolors; i++) {
+				BMP_RGB& p = header.palette[i];
+				p.rgbRed = palette[i].r;
+				p.rgbGreen = palette[i].g;
+				p.rgbBlue = palette[i].b;
+			}
+		}
+	}
+	if(bpp == 16) {
+		dword *bitfields = reinterpret_cast<dword *>(header.palette);
+		bitfields[2] = 0x001f;
+		bitfields[1] = 0x07E0;
+		bitfields[0] = 0xf800;
+		header.biCompression = 3/* BI_BITFIELDS */;
+		ncolors = 3;
+	}
+	row_bytes = (format.GetByteCount(size.cx) + 3) & ~3;
+	scanline.Alloc(row_bytes);
+	header.biSizeImage = size.cy * row_bytes;
+	Size dots = GetDots();
+	if(dots.cx && dots.cy) {
+		header.biXPelsPerMeter = fround(header.biWidth  * (1000.0 / 25.4 * 600.0) / dots.cx);
+		header.biYPelsPerMeter = fround(header.biHeight * (1000.0 / 25.4 * 600.0) / dots.cy);
+	}
+	BMP_FILEHEADER bmfh;
+	Zero(bmfh);
+	bmfh.bfType = 'B' + 256 * 'M';
+	bmfh.bfOffBits = sizeof(bmfh) + sizeof(BMP_INFOHEADER) + sizeof(BMP_RGB) * ncolors;
+	bmfh.bfSize = sizeof(bmfh) + sizeof(BMP_INFOHEADER) + ncolors + header.biSizeImage;
+	bmfh.SwapEndian();
+	GetStream().Put(&bmfh, sizeof(bmfh));
+	header.SwapEndian();
+	int h = sizeof(BMP_INFOHEADER) + sizeof(BMP_RGB) * ncolors;
+	GetStream().Put(&header, h);
+	soff = GetStream().GetPos();
+	GetStream().SetSize(sizeof(bmfh) + h + size.cy * row_bytes);
+	linei = size.cy;
+	linebytes = format.GetByteCount(size.cx);
+}
+
+void BMPEncoder::WriteLineRaw(const byte *s)
+{
+	GetStream().Seek(soff + row_bytes * --linei);
+	memcpy(scanline, s, linebytes);
+	GetStream().Put(scanline, row_bytes);
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/plugin/bmp/Icon.cpp b/uppsrc/plugin/bmp/Icon.cpp
new file mode 100644
index 000000000..50e2df444
--- /dev/null
+++ b/uppsrc/plugin/bmp/Icon.cpp
@@ -0,0 +1,208 @@
+#include "bmp.h"
+
+NAMESPACE_UPP
+
+#include "bmphdr.h"
+
+Vector<Image> ReadIcon(String data)
+{
+	Vector<Image> out;
+	const byte *in = data;
+	int count = Peek16le(in + OFFSETOF(BMP_ICONDIR, idCount));
+	out.SetCount(count);
+	for(int i = 0; i < count; i++) {
+		const byte *hdr = in + sizeof(BMP_ICONDIR) + i * sizeof(BMP_ICONDIRENTRY);
+		dword offset = Peek32le(hdr + OFFSETOF(BMP_ICONDIRENTRY, dwImageOffset));
+		hdr = in + offset;
+		int hdrsize = Peek32le(hdr + OFFSETOF(BMP_INFOHEADER, biSize));
+		Size bmpsz(
+			Peek32le(hdr + OFFSETOF(BMP_INFOHEADER, biWidth)),
+			Peek32le(hdr + OFFSETOF(BMP_INFOHEADER, biHeight)));
+		Size size(bmpsz.cx, bmpsz.cy >> 1);
+		int compression = Peek32le(hdr + OFFSETOF(BMP_INFOHEADER, biCompression));
+		int bitcount = Peek16le(hdr + OFFSETOF(BMP_INFOHEADER, biBitCount));
+		int clrused = Peek32le(hdr + OFFSETOF(BMP_INFOHEADER, biClrUsed));
+		int rowbytes = ((bmpsz.cx * bitcount + 31) >> 3) & -4;
+		int maskbytes = ((size.cx + 31) >> 3) & -4;
+
+		hdr += hdrsize;
+		RasterFormat fmt;
+		switch(bitcount) {
+		case 1: fmt.Set1mf(); break;
+		case 4: fmt.Set4mf(); break;
+		case 8: fmt.Set8(); break;
+		case 16:
+			if(compression == 3 /* BI_BITFIELD */) {
+				fmt.Set16le(Peek32le(hdr), Peek32le(hdr + 4), Peek32le(hdr + 8));
+				hdr += 12;
+			}
+			else
+				fmt.Set16le(31 << 10, 31 << 5, 31);
+			break;
+		case 24:
+			fmt.Set24le(0xff0000, 0x00ff00, 0x0000ff);
+			break;
+		case 32:
+			if(compression == 3 /* BI_BITFIELD */) {
+				fmt.Set32le(Peek32le(hdr), Peek32le(hdr + 4), Peek32le(hdr + 8));
+				hdr += 12;
+			}
+			else
+				fmt.Set32le(0xff0000, 0x00ff00, 0x0000ff, 0xff000000);
+			break;
+		}
+
+		if(clrused == 0 && bitcount <= 8)
+			clrused = 1 << bitcount;
+		Vector<RGBA> palette;
+		if(bitcount <= 8) {
+			palette.SetCount(clrused);
+			for(int i = 0; i < clrused; i++, hdr += 4) {
+				RGBA rgba;
+				rgba.r = hdr[OFFSETOF(BMP_RGB, rgbRed)];
+				rgba.g = hdr[OFFSETOF(BMP_RGB, rgbGreen)];
+				rgba.b = hdr[OFFSETOF(BMP_RGB, rgbBlue)];
+				rgba.a = 255;
+				palette[i] = rgba;
+			}
+		}
+
+		ImageBuffer buffer(size);
+		for(int y = 0; y < size.cy; y++, hdr += rowbytes)
+			fmt.Read(buffer[size.cy - y - 1], hdr, size.cx, palette.Begin());
+		for(int y = 0; y < size.cy; y++, hdr += maskbytes) {
+			const byte *in = hdr;
+			RGBA *out = buffer[size.cy - y - 1];
+			int cx = size.cx;
+			while(cx >= 8) {
+				byte b = *in++;
+				if(b & 0x80) out[0] = RGBAZero();
+				if(b & 0x40) out[1] = RGBAZero();
+				if(b & 0x20) out[2] = RGBAZero();
+				if(b & 0x10) out[3] = RGBAZero();
+				if(b & 0x08) out[4] = RGBAZero();
+				if(b & 0x04) out[5] = RGBAZero();
+				if(b & 0x02) out[6] = RGBAZero();
+				if(b & 0x01) out[7] = RGBAZero();
+				out += 8;
+				cx -= 8;
+			}
+			if(cx) {
+				byte b = *in++;
+				do {
+					if(b & 0x80) *out = RGBAZero();
+					out++;
+					b <<= 1;
+				}
+				while(--cx);
+			}
+		}
+		out[i] = buffer;
+	}
+	return out;
+}
+
+String WriteIcon(const Vector<Image>& icons, int flags)
+{
+	Vector<byte> bpp;
+	if(flags & WI_32BIT) bpp.Add(32);
+	if(flags & WI_8BIT) bpp.Add(8);
+	if(flags & WI_4BIT) bpp.Add(4);
+	if(flags & WI_MONO) bpp.Add(1);
+	ASSERT(!bpp.IsEmpty());
+	int hdrsize =  sizeof(BMP_ICONDIR) + icons.GetCount() * bpp.GetCount() * sizeof(BMP_ICONDIRENTRY);
+	StringBuffer out;
+	out.SetCount(hdrsize);
+	memset(~out, 0, hdrsize);
+	Poke16le(~out + OFFSETOF(BMP_ICONDIR, idType), flags & WI_CURSOR ? 2 : 1);
+	Poke16le(~out + OFFSETOF(BMP_ICONDIR, idCount), icons.GetCount() * bpp.GetCount());
+	int icx = 0;
+	for(int b = 0; b < bpp.GetCount(); b++) {
+		int bits = bpp[b];
+		RasterFormat format;
+		switch(bits) {
+			case 1: format.Set1mf(); break;
+			case 4: format.Set4mf(); break;
+			case 8: format.Set8(); break;
+			default: format.Set32le(0xff0000, 0x00ff00, 0x0000ff, 0xff000000); break;
+		}
+		for(int i = 0; i < icons.GetCount(); i++) {
+			int out_offset = out.GetLength();
+			Image img = icons[i];
+			Size sz = img.GetSize();
+			int rowbytes = ((sz.cx * bits + 31) >> 3) & -4;
+			int maskbytes = ((sz.cx + 31) >> 3) & -4;
+			BMP_INFOHEADER bmih;
+			Zero(bmih);
+			bmih.biSize = sizeof(bmih);
+			bmih.biWidth = sz.cx;
+			bmih.biHeight = 2 * sz.cy;
+			bmih.biBitCount = bpp[b];
+			bmih.biPlanes = 1;
+			bmih.biCompression = 0; //BI_RGB
+			bmih.biSizeImage = sz.cy * (rowbytes + maskbytes);
+			One<PaletteCv> cv;
+			out.Cat((const char *)&bmih, sizeof(bmih));
+			if(bits <= 8) {
+				int ncolors = 1 << bits;
+				Buffer<RGBA> palette(ncolors);
+				ImageRaster ir(img);
+				CreatePalette(ir, ~palette, ncolors);
+				cv = new PaletteCv();
+				CreatePaletteCv(palette, ncolors, *cv);
+				for(int c = 0; c < ncolors; c++) {
+					BMP_RGB quad;
+					quad.rgbRed = palette[c].r;
+					quad.rgbGreen = palette[c].g;
+					quad.rgbBlue = palette[c].b;
+					quad.rgbReserved = 0;
+					out.Cat((const char *)&quad, sizeof(quad));
+				}
+			}
+			int bmpoff = out.GetLength();
+			out.Cat(0, bmih.biSizeImage);
+			byte *data = (byte *)~out + bmpoff;
+			for(int y = sz.cy; --y >= 0; data += rowbytes)
+				format.Write(data, img[y], sz.cx, ~cv);
+			for(int y = sz.cy; --y >= 0; data += maskbytes) {
+				int cx = sz.cx;
+				byte *out = data;
+				const RGBA *in = img[y];
+				while(cx >= 8) {
+					byte b = 0;
+					if(!in[0].a) b |= 0x80;
+					if(!in[1].a) b |= 0x40;
+					if(!in[2].a) b |= 0x20;
+					if(!in[3].a) b |= 0x10;
+					if(!in[4].a) b |= 0x08;
+					if(!in[5].a) b |= 0x04;
+					if(!in[6].a) b |= 0x02;
+					if(!in[7].a) b |= 0x01;
+					in += 8;
+					cx -= 8;
+					*out++ = b;
+				}
+				if(cx) {
+					byte b = 0, mask = 0x80;
+					do {
+						if(in++->a) b |= mask;
+						mask >>= 1;
+					}
+					while(--cx);
+					*out = b;
+				}
+			}
+			char *entry = ~out + sizeof(BMP_ICONDIR) + sizeof(BMP_ICONDIRENTRY) * icx++;
+			entry[OFFSETOF(BMP_ICONDIRENTRY, bWidth)] = sz.cx;
+			entry[OFFSETOF(BMP_ICONDIRENTRY, bHeight)] = sz.cy;
+			//entry[OFFSETOF(BMP_ICONDIRENTRY, bColorCount)];
+			//Poke16le(entry + OFFSETOF(BMP_ICONDIRENTRY, wPlanes)
+			//Poke16le(entry + OFFSETOF(BMP_ICONDIRENTRY, wBitCount)
+			Poke32le(entry + OFFSETOF(BMP_ICONDIRENTRY, dwBytesInRes), out.GetLength() - out_offset);
+			Poke32le(entry + OFFSETOF(BMP_ICONDIRENTRY, dwImageOffset), out_offset);
+		}
+	}
+	return out;
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/plugin/bmp/_bmp.h b/uppsrc/plugin/bmp/_bmp.h
new file mode 100644
index 000000000..633310983
--- /dev/null
+++ b/uppsrc/plugin/bmp/_bmp.h
@@ -0,0 +1,134 @@
+#ifndef _nImage__bmp_h_
+#define _nImage__bmp_h_
+
+#ifdef CPU_BIG_ENDIAD
+#error "Fix big endian issues!"
+#endif
+
+#ifdef COMPILER_MSC
+#pragma pack(push, 1)
+#endif
+
+struct BMP_FILEHEADER {
+	word    bfType;
+	dword   bfSize;
+	word    bfReserved1;
+	word    bfReserved2;
+	dword   bfOffBits;
+
+	void    EndianSwap()
+	{
+#ifdef CPU_BIG_ENDIAN
+		EndianSwap(bfType);
+		EndianSwap(bfSize);
+		EndianSwap(bfOffBits);
+#endif
+	}
+}
+#ifdef COMPILER_GCC
+__attribute__((packed))
+#endif
+;
+
+struct BMP_INFOHEADER
+{
+	dword      biSize;
+	long       biWidth;
+	long       biHeight;
+	word       biPlanes;
+	word       biBitCount;
+	dword      biCompression;
+	dword      biSizeImage;
+	long       biXPelsPerMeter;
+	long       biYPelsPerMeter;
+	dword      biClrUsed;
+	dword      biClrImportant;
+
+	void    EndianSwap()
+	{
+#ifdef CPU_BIG_ENDIAN
+		EndianSwap(biSize);
+		EndianSwap(biWidth);
+		EndianSwap(biHeight);
+		EndianSwap(biPlanes);
+		EndianSwap(biBitCount);
+		EndianSwap(biCompression);
+		EndianSwap(biSizeImage);
+		EndianSwap(biXPelsPerMeter);
+		EndianSwap(biYPelsPerMeter);
+		EndianSwap(biClrUsed);
+		EndianSwap(biClrImportant);
+
+#endif
+	}
+}
+#ifdef COMPILER_GCC
+__attribute__((packed))
+#endif
+;
+
+struct BMP_RGB
+{
+    byte    rgbBlue;
+    byte    rgbGreen;
+    byte    rgbRed;
+    byte    rgbReserved;
+};
+
+struct ICONDIR
+{
+	word           idReserved;   // Reserved (must be 0)
+	word           idType;       // Resource Type (1 for icons)
+	word           idCount;      // How many images?
+
+	void    EndianSwap()
+	{
+#ifdef CPU_BIG_ENDIAN
+		EndianSwap(idReserved);
+		EndianSwap(idType);
+		EndianSwap(idCount);
+#endif
+	}
+}
+#ifdef COMPILER_GCC
+__attribute__((packed))
+#endif
+;
+
+struct ICONDIRENTRY
+{
+	byte        bWidth;          // Width, in pixels, of the image
+	byte        bHeight;         // Height, in pixels, of the image
+	byte        bColorCount;
+	byte        bReserved;
+	short       wHotSpotX;
+	short       wHotSpotY;
+	dword       dwBytesInRes;    // How many bytes in this resource?
+	dword       dwImageOffset;   // Where in the file is this image?
+
+	void    EndianSwap()
+	{
+#ifdef CPU_BIG_ENDIAN
+		EndianSwap(wHotSpotX);
+		EndianSwap(wHotSpotY);
+		EndianSwap(dwBytesInRes);
+		EndianSwap(dwImageOffset);
+
+#endif
+	}
+}
+#ifdef COMPILER_GCC
+__attribute__((packed))
+#endif
+;
+
+#ifdef COMPILER_MSC
+#pragma pack(pop)
+#endif
+
+struct BMPHeader : public BMP_INFOHEADER
+{
+	BMP_RGB palette[256];
+};
+
+#endif
diff --git a/uppsrc/plugin/bmp/bmp.h b/uppsrc/plugin/bmp/bmp.h
new file mode 100644
index 000000000..6269f0a77
--- /dev/null
+++ b/uppsrc/plugin/bmp/bmp.h
@@ -0,0 +1,68 @@
+#ifndef _plugin_bmp_bmp_h_
+#define _plugin_bmp_bmp_h_
+
+#include <Draw/Draw.h>
+
+NAMESPACE_UPP
+
+class BMPRaster : public StreamRaster {
+	Size             size;
+	int              row_bytes;
+	Buffer<RGBA>     palette;
+	Buffer<byte>     scanline;
+	bool             topdown;
+	int64            soff;
+	RasterFormat     fmt;
+	Raster::Info     info;
+	One<ImageRaster> rle;
+	bool             file;
+
+public:
+	virtual bool    Create();
+	virtual Info    GetInfo();
+	virtual Size    GetSize();
+	virtual Line    GetLine(int line);
+	virtual int     GetPaletteCount();
+	virtual RGBA   *GetPalette();
+	virtual const RasterFormat *GetFormat();
+
+	BMPRaster(bool file = true) : file(file) {}
+	~BMPRaster();
+};
+
+class BMPEncoder : public StreamRasterEncoder {
+	int          row_bytes;
+	int          linei;
+	int64        soff;
+	Buffer<byte> scanline;
+	int          linebytes;
+
+	int       bpp;
+	bool      grayscale;
+
+public:
+	virtual int  GetPaletteCount();
+	virtual void Start(Size sz);
+	virtual void WriteLineRaw(const byte *data);
+
+	BMPEncoder& Bpp(int _bpp)                  { bpp = _bpp; return *this; }
+	BMPEncoder& Mono(bool gs = true)           { grayscale = gs; return *this; }
+
+	BMPEncoder(int _bpp = 24, bool gs = false) { bpp = _bpp; grayscale = gs; }
+};
+
+enum {
+	WI_MONO   = 0x01,
+	WI_4BIT   = 0x02,
+	WI_8BIT   = 0x04,
+	WI_32BIT  = 0x08,
+	WI_COLOR  = WI_4BIT | WI_8BIT | WI_32BIT, // recommended for XP
+	WI_CURSOR = 0x10,
+};
+
+Vector<Image> ReadIcon(String data);
+String        WriteIcon(const Vector<Image>& icons, int flags = WI_COLOR);
+
+END_UPP_NAMESPACE
+
+#endif
diff --git a/uppsrc/plugin/bmp/bmp.upp b/uppsrc/plugin/bmp/bmp.upp
new file mode 100644
index 000000000..ae2cef95a
--- /dev/null
+++ b/uppsrc/plugin/bmp/bmp.upp
@@ -0,0 +1,13 @@
+description "BMP image file format";
+
+uses
+	Draw;
+
+file
+	bmp.h,
+	bmphdr.h,
+	Bmp.cpp,
+	BmpWrite.cpp,
+	Icon.cpp,
+	BmpReg.icpp;
+
diff --git a/uppsrc/plugin/bmp/bmphdr.h b/uppsrc/plugin/bmp/bmphdr.h
new file mode 100644
index 000000000..1a4b05438
--- /dev/null
+++ b/uppsrc/plugin/bmp/bmphdr.h
@@ -0,0 +1,107 @@
+#ifndef _nImage__bmp_h_
+#define _nImage__bmp_h_
+
+#ifdef COMPILER_MSC
+#pragma pack(push, 1)
+#endif
+
+struct BMP_FILEHEADER {
+	word    bfType;
+	dword   bfSize;
+	word    bfReserved1;
+	word    bfReserved2;
+	dword   bfOffBits;
+
+	void    SwapEndian()
+	{
+#ifdef CPU_BIG_ENDIAN
+		bfType = UPP::SwapEndian(bfType);
+		bfSize = UPP::SwapEndian(bfSize);
+		bfOffBits = UPP::SwapEndian(bfOffBits);
+#endif
+	}
+}
+#ifdef COMPILER_GCC
+__attribute__((packed))
+#endif
+;
+
+struct BMP_INFOHEADER
+{
+	dword      biSize;
+	int32      biWidth;
+	int32      biHeight;
+	word       biPlanes;
+	word       biBitCount;
+	dword      biCompression;
+	dword      biSizeImage;
+	int32      biXPelsPerMeter;
+	int32      biYPelsPerMeter;
+	dword      biClrUsed;
+	dword      biClrImportant;
+
+	void    SwapEndian()
+	{
+#ifdef CPU_BIG_ENDIAN
+		biSize = UPP::SwapEndian(biSize);
+		biWidth = UPP::SwapEndian(biWidth);
+		biHeight = UPP::SwapEndian(biHeight);
+		biPlanes = UPP::SwapEndian(biPlanes);
+		biBitCount = UPP::SwapEndian(biBitCount);
+		biCompression = UPP::SwapEndian(biCompression);
+		biSizeImage = UPP::SwapEndian(biSizeImage);
+		biXPelsPerMeter = UPP::SwapEndian(biXPelsPerMeter);
+		biYPelsPerMeter = UPP::SwapEndian(biYPelsPerMeter);
+		biClrUsed = UPP::SwapEndian(biClrUsed);
+		biClrImportant = UPP::SwapEndian(biClrImportant);
+#endif
+	}
+}
+#ifdef COMPILER_GCC
+__attribute__((packed))
+#endif
+;
+
+struct BMP_RGB
+{
+    byte    rgbBlue;
+    byte    rgbGreen;
+    byte    rgbRed;
+    byte    rgbReserved;
+};
+
+struct BMP_ICONDIR {
+	word           idReserved;   // Reserved (must be 0)
+	word           idType;       // Resource Type (1 for icons)
+	word           idCount;      // How many images?
+}
+#ifdef COMPILER_GCC
+__attribute__((packed))
+#endif
+;
+
+struct BMP_ICONDIRENTRY {
+	byte        bWidth;          // Width, in pixels, of the image
+	byte        bHeight;         // Height, in pixels, of the image
+	byte        bColorCount;
+	byte        bReserved;
+	short       wHotSpotX;
+	short       wHotSpotY;
+	dword       dwBytesInRes;    // How many bytes in this resource?
+	dword       dwImageOffset;   // Where in the file is this image?
+}
+#ifdef COMPILER_GCC
+__attribute__((packed))
+#endif
+;
+
+#ifdef COMPILER_MSC
+#pragma pack(pop)
+#endif
+
+struct BMPHeader : public BMP_INFOHEADER
+{
+	BMP_RGB palette[256];
+};
+
+#endif
diff --git a/uppsrc/plugin/bmp/init b/uppsrc/plugin/bmp/init
new file mode 100644
index 000000000..328b32c6a
--- /dev/null
+++ b/uppsrc/plugin/bmp/init
@@ -0,0 +1,5 @@
+#ifndef _plugin_bmp_icpp_init_stub
+#define _plugin_bmp_icpp_init_stub
+#include "Draw/init"
+#include "BmpReg.icpp"
+#endif
diff --git a/uppsrc/plugin/bz2/bz2.h b/uppsrc/plugin/bz2/bz2.h
new file mode 100644
index 000000000..e02714c06
--- /dev/null
+++ b/uppsrc/plugin/bz2/bz2.h
@@ -0,0 +1,14 @@
+#ifndef __Plugin_BZ2__
+#define __Plugin_BZ2__
+
+NAMESPACE_UPP
+
+String        BZ2Compress(String s, Gate2<int, int> progress = false);
+String        BZ2Decompress(String s, Gate2<int, int> progress = false);
+String        BZ2Decompress(Stream& stream, Gate2<int, int> progress = false);
+void          BZ2Compress(Stream& out, Stream& in, Gate2<int, int> progress = false);
+void          BZ2Decompress(Stream& out, Stream& in, Gate2<int, int> progress = false);
+
+END_UPP_NAMESPACE
+
+#endif//__Plugin_Z__
diff --git a/uppsrc/plugin/bz2/bz2.upp b/uppsrc/plugin/bz2/bz2.upp
new file mode 100644
index 000000000..fc707eeea
--- /dev/null
+++ b/uppsrc/plugin/bz2/bz2.upp
@@ -0,0 +1,22 @@
+description "BZ2 compressor/decompressor";
+
+optimize_speed;
+
+uses
+	Core;
+
+file
+	Wrapper readonly separator,
+	bz2.h,
+	bz2upp.cpp,
+	"BZ2 files" readonly separator,
+	lib/bzlib.h,
+	lib/blocksort.c,
+	lib/bzlib.c,
+	lib/bzlib_private.h,
+	lib/compress.c,
+	lib/crctable.c,
+	lib/decompress.c,
+	lib/huffman.c,
+	lib/randtable.c;
+
diff --git a/uppsrc/plugin/bz2/bz2upp.cpp b/uppsrc/plugin/bz2/bz2upp.cpp
new file mode 100644
index 000000000..c2078cd7e
--- /dev/null
+++ b/uppsrc/plugin/bz2/bz2upp.cpp
@@ -0,0 +1,216 @@
+#include <Core/Core.h>
+#include <plugin/bz2/bz2.h>
+#include "lib/bzlib.h"
+
+
+NAMESPACE_UPP
+
+static void* bzalloc_new(void *opaque, int items, int size)
+{
+	return new byte[items * size];
+}
+
+static void bzfree_new(void *opaque, void *addr)
+{
+	delete[] (byte *)addr;
+}
+
+String BZ2Decompress(String s, Gate2<int, int> progress)
+{
+	if(s.IsEmpty())
+		return s;
+	bz_stream z;
+	Zero(z);
+	z.bzalloc = bzalloc_new;
+	z.bzfree = bzfree_new;
+	z.opaque = 0;
+	if(BZ2_bzDecompressInit(&z, 0, 0) != BZ_OK)
+		return String::GetVoid();
+	int buf_size = minmax(s.GetLength() / 2, 1024, 65536);
+	Buffer<char> output(buf_size);
+	z.next_in = (char *)s.Begin();
+	z.avail_in = s.GetLength();
+	z.next_out = output;
+	z.avail_out = buf_size;
+
+	String out;
+	while(BZ2_bzDecompress(&z) == BZ_OK)
+	{
+		if(z.avail_out == (dword)buf_size)
+		{ // no output generated - assume error
+			BZ2_bzDecompressEnd(&z);
+			return String::GetVoid();
+		}
+		out.Cat(output, buf_size - z.avail_out);
+		z.next_out = output;
+		z.avail_out = buf_size;
+		if(progress((const char *)z.next_in - ~s, s.GetLength()))
+		{
+			BZ2_bzDecompressEnd(&z);
+			return String::GetVoid();
+		}
+	}
+	if(z.avail_out < (unsigned)buf_size)
+		out.Cat(output, buf_size - z.avail_out);
+
+	BZ2_bzDecompressEnd(&z);
+
+	return out;
+}
+
+String BZ2Decompress(Stream& strm, Gate2<int, int> progress)
+{
+	StringStream out;
+	BZ2Decompress(out, strm, progress);
+	return out;
+}
+
+String BZ2Compress(String s, Gate2<int, int> progress)
+{
+	if(s.IsEmpty())
+		return s;
+	bz_stream z;
+	Zero(z);
+	z.bzalloc = bzalloc_new;
+	z.bzfree = bzfree_new;
+	z.opaque = 0;
+	if(BZ2_bzCompressInit(&z, 9, 0, 30) != BZ_OK)
+		return String::GetVoid();
+	int buf_size = minmax(s.GetLength(), 1024, 65536);
+	Buffer<char> output(buf_size);
+	z.next_in = (char *)s.Begin();
+	z.avail_in = s.GetLength();
+	z.next_out = output;
+	z.avail_out = buf_size;
+
+	String out;
+	int res;
+	while((res = BZ2_bzCompress(&z, z.avail_in ? BZ_RUN : BZ_FINISH)) == BZ_RUN_OK || res == BZ_FINISH_OK)
+	{
+		out.Cat(output, buf_size - z.avail_out);
+		z.next_out = output;
+		z.avail_out = buf_size;
+		if(progress((const char *)z.next_in - ~s, s.GetLength()))
+		{
+			BZ2_bzCompressEnd(&z);
+			return String::GetVoid();
+		}
+	}
+	out.Cat(output, buf_size - z.avail_out);
+	BZ2_bzCompressEnd(&z);
+	if(res != BZ_STREAM_END)
+		out = String::GetVoid();
+	return out;
+}
+
+void BZ2Decompress(Stream& out, Stream& in, Gate2<int, int> progress)
+{
+	enum { BUF_SIZE = 65536 };
+	Buffer<char> input(BUF_SIZE), output(BUF_SIZE);
+	int avail = in.Get(input, BUF_SIZE);
+	if(avail == 0)
+		return;
+	bz_stream z;
+	Zero(z);
+	z.bzalloc = bzalloc_new;
+	z.bzfree = bzfree_new;
+	z.opaque = 0;
+	if(BZ2_bzDecompressInit(&z, 0, 0) != BZ_OK)
+	{
+		out.SetError();
+		return;
+	}
+	z.next_in = input;
+	z.avail_in = avail;
+	z.next_out = output;
+	z.avail_out = BUF_SIZE;
+	int code;
+	bool running = true;
+	int64 total = in.GetLeft();
+	int done = 0;
+	do
+	{
+		if(z.avail_in == 0 && running)
+		{
+			if((z.avail_in = in.Get(z.next_in = input, BUF_SIZE)) == 0)
+				running = false;
+			done += z.avail_in;
+			if(progress(done, (int)total) || in.IsError())
+			{
+				BZ2_bzDecompressEnd(&z);
+				out.SetError();
+				return;
+			}
+		}
+		code = BZ2_bzDecompress(&z);
+		if(z.avail_out == 0)
+		{
+			out.Put(z.next_out = output, z.avail_out = BUF_SIZE);
+			if(out.IsError())
+			{
+				BZ2_bzDecompressEnd(&z);
+				return;
+			}
+		}
+	}
+	while(code == BZ_OK);
+	if(z.avail_out < BUF_SIZE)
+		out.Put(output, BUF_SIZE - z.avail_out);
+	BZ2_bzDecompressEnd(&z);
+}
+
+void BZ2Compress(Stream& out, Stream& in, Gate2<int, int> progress)
+{
+	enum { BUF_SIZE = 65536 };
+	Buffer<char> input(BUF_SIZE), output(BUF_SIZE);
+	bz_stream z;
+	z.bzalloc = bzalloc_new;
+	z.bzfree = bzfree_new;
+	z.opaque = 0;
+	if(BZ2_bzCompressInit(&z, 9, 0, 30) != BZ_OK)
+	{
+		out.SetError();
+		return;
+	}
+	z.avail_in = 0;
+	z.avail_out = BUF_SIZE;
+	z.next_out = output;
+	int code;
+	int flush = BZ_RUN;
+	int64 total = in.GetLeft();
+	int done = 0;
+	do
+	{
+		if(z.avail_in == 0 && flush == BZ_RUN)
+		{
+			z.next_in = input;
+			if((z.avail_in = in.Get(z.next_in = input, BUF_SIZE)) == 0)
+				flush = BZ_FINISH;
+			done += z.avail_in;
+			if(progress(done, (int)total) || in.IsError())
+			{
+				BZ2_bzCompressEnd(&z);
+				out.SetError();
+				return;
+			}
+		}
+		code = BZ2_bzCompress(&z, flush);
+		if(z.avail_out == 0)
+		{
+			out.Put(z.next_out = output, z.avail_out = BUF_SIZE);
+			if(out.IsError())
+			{
+				BZ2_bzCompressEnd(&z);
+				return;
+			}
+		}
+	}
+	while(code == BZ_RUN_OK || code == BZ_FINISH_OK);
+	if(z.avail_out < BUF_SIZE)
+		out.Put(output, BUF_SIZE - z.avail_out);
+	BZ2_bzCompressEnd(&z);
+	if(code != BZ_STREAM_END)
+		out.SetError();
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/plugin/bz2/init b/uppsrc/plugin/bz2/init
new file mode 100644
index 000000000..04b47c2d5
--- /dev/null
+++ b/uppsrc/plugin/bz2/init
@@ -0,0 +1,4 @@
+#ifndef _plugin_bz2_icpp_init_stub
+#define _plugin_bz2_icpp_init_stub
+#include "Core/init"
+#endif
diff --git a/uppsrc/plugin/bz2/lib/CHANGES b/uppsrc/plugin/bz2/lib/CHANGES
new file mode 100644
index 000000000..c28c8485c
--- /dev/null
+++ b/uppsrc/plugin/bz2/lib/CHANGES
@@ -0,0 +1,252 @@
+
+
+0.9.0
+~~~~~
+First version.
+
+
+0.9.0a
+~~~~~~
+Removed 'ranlib' from Makefile, since most modern Unix-es
+don't need it, or even know about it.
+
+
+0.9.0b
+~~~~~~
+Fixed a problem with error reporting in bzip2.c.  This does not effect
+the library in any way.  Problem is: versions 0.9.0 and 0.9.0a (of the
+program proper) compress and decompress correctly, but give misleading
+error messages (internal panics) when an I/O error occurs, instead of
+reporting the problem correctly.  This shouldn't give any data loss
+(as far as I can see), but is confusing.
+
+Made the inline declarations disappear for non-GCC compilers.
+
+
+0.9.0c
+~~~~~~
+Fixed some problems in the library pertaining to some boundary cases.
+This makes the library behave more correctly in those situations.  The
+fixes apply only to features (calls and parameters) not used by
+bzip2.c, so the non-fixedness of them in previous versions has no
+effect on reliability of bzip2.c.
+
+In bzlib.c:
+   * made zero-length BZ_FLUSH work correctly in bzCompress().
+   * fixed bzWrite/bzRead to ignore zero-length requests.
+   * fixed bzread to correctly handle read requests after EOF.
+   * wrong parameter order in call to bzDecompressInit in
+     bzBuffToBuffDecompress.  Fixed.
+
+In compress.c:
+   * changed setting of nGroups in sendMTFValues() so as to
+     do a bit better on small files.  This _does_ effect
+     bzip2.c.
+
+
+0.9.5a
+~~~~~~
+Major change: add a fallback sorting algorithm (blocksort.c)
+to give reasonable behaviour even for very repetitive inputs.
+Nuked --repetitive-best and --repetitive-fast since they are
+no longer useful.
+
+Minor changes: mostly a whole bunch of small changes/
+bugfixes in the driver (bzip2.c).  Changes pertaining to the
+user interface are:
+
+   allow decompression of symlink'd files to stdout
+   decompress/test files even without .bz2 extension
+   give more accurate error messages for I/O errors
+   when compressing/decompressing to stdout, don't catch control-C
+   read flags from BZIP2 and BZIP environment variables
+   decline to break hard links to a file unless forced with -f
+   allow -c flag even with no filenames
+   preserve file ownerships as far as possible
+   make -s -1 give the expected block size (100k)
+   add a flag -q --quiet to suppress nonessential warnings
+   stop decoding flags after --, so files beginning in - can be handled
+   resolved inconsistent naming: bzcat or bz2cat ?
+   bzip2 --help now returns 0
+
+Programming-level changes are:
+
+   fixed syntax error in GET_LL4 for Borland C++ 5.02
+   let bzBuffToBuffDecompress return BZ_DATA_ERROR{_MAGIC}
+   fix overshoot of mode-string end in bzopen_or_bzdopen
+   wrapped bzlib.h in #ifdef __cplusplus ... extern "C" { ... }
+   close file handles under all error conditions
+   added minor mods so it compiles with DJGPP out of the box
+   fixed Makefile so it doesn't give problems with BSD make
+   fix uninitialised memory reads in dlltest.c
+
+0.9.5b
+~~~~~~
+Open stdin/stdout in binary mode for DJGPP.
+
+0.9.5c
+~~~~~~
+Changed BZ_N_OVERSHOOT to be ... + 2 instead of ... + 1.  The + 1
+version could cause the sorted order to be wrong in some extremely
+obscure cases.  Also changed setting of quadrant in blocksort.c.
+
+0.9.5d
+~~~~~~
+The only functional change is to make bzlibVersion() in the library
+return the correct string.  This has no effect whatsoever on the
+functioning of the bzip2 program or library.  Added a couple of casts
+so the library compiles without warnings at level 3 in MS Visual
+Studio 6.0.  Included a Y2K statement in the file Y2K_INFO.  All other
+changes are minor documentation changes.
+
+1.0
+~~~
+Several minor bugfixes and enhancements:
+
+* Large file support.  The library uses 64-bit counters to
+  count the volume of data passing through it.  bzip2.c
+  is now compiled with -D_FILE_OFFSET_BITS=64 to get large
+  file support from the C library.  -v correctly prints out
+  file sizes greater than 4 gigabytes.  All these changes have
+  been made without assuming a 64-bit platform or a C compiler
+  which supports 64-bit ints, so, except for the C library
+  aspect, they are fully portable.
+
+* Decompression robustness.  The library/program should be
+  robust to any corruption of compressed data, detecting and
+  handling _all_ corruption, instead of merely relying on
+  the CRCs.  What this means is that the program should
+  never crash, given corrupted data, and the library should
+  always return BZ_DATA_ERROR.
+
+* Fixed an obscure race-condition bug only ever observed on
+  Solaris, in which, if you were very unlucky and issued
+  control-C at exactly the wrong time, both input and output
+  files would be deleted.
+
+* Don't run out of file handles on test/decompression when
+  large numbers of files have invalid magic numbers.
+
+* Avoid library namespace pollution.  Prefix all exported
+  symbols with BZ2_.
+
+* Minor sorting enhancements from my DCC2000 paper.
+
+* Advance the version number to 1.0, so as to counteract the
+  (false-in-this-case) impression some people have that programs
+  with version numbers less than 1.0 are in some way, experimental,
+  pre-release versions.
+
+* Create an initial Makefile-libbz2_so to build a shared library.
+  Yes, I know I should really use libtool et al ...
+
+* Make the program exit with 2 instead of 0 when decompression
+  fails due to a bad magic number (ie, an invalid bzip2 header).
+  Also exit with 1 (as the manual claims :-) whenever a diagnostic
+  message would have been printed AND the corresponding operation
+  is aborted, for example
+     bzip2: Output file xx already exists.
+  When a diagnostic message is printed but the operation is not
+  aborted, for example
+     bzip2: Can't guess original name for wurble -- using wurble.out
+  then the exit value 0 is returned, unless some other problem is
+  also detected.
+
+  I think it corresponds more closely to what the manual claims now.
+
+
+1.0.1
+~~~~~
+* Modified dlltest.c so it uses the new BZ2_ naming scheme.
+* Modified makefile-msc to fix minor build probs on Win2k.
+* Updated README.COMPILATION.PROBLEMS.
+
+There are no functionality changes or bug fixes relative to version
+1.0.0.  This is just a documentation update + a fix for minor Win32
+build problems.  For almost everyone, upgrading from 1.0.0 to 1.0.1 is
+utterly pointless.  Don't bother.
+
+
+1.0.2
+~~~~~
+A bug fix release, addressing various minor issues which have appeared
+in the 18 or so months since 1.0.1 was released.  Most of the fixes
+are to do with file-handling or documentation bugs.  To the best of my
+knowledge, there have been no data-loss-causing bugs reported in the
+compression/decompression engine of 1.0.0 or 1.0.1.
+
+Note that this release does not improve the rather crude build system
+for Unix platforms.  The general plan here is to autoconfiscate/
+libtoolise 1.0.2 soon after release, and release the result as 1.1.0
+or perhaps 1.2.0.  That, however, is still just a plan at this point.
+
+Here are the changes in 1.0.2.  Bug-reporters and/or patch-senders in
+parentheses.
+
+* Fix an infinite segfault loop in 1.0.1 when a directory is
+  encountered in -f (force) mode.
+     (Trond Eivind Glomsrod, Nicholas Nethercote, Volker Schmidt)
+
+* Avoid double fclose() of output file on certain I/O error paths.
+     (Solar Designer)
+
+* Don't fail with internal error 1007 when fed a long stream (> 48MB)
+  of byte 251.  Also print useful message suggesting that 1007s may be
+  caused by bad memory.
+     (noticed by Juan Pedro Vallejo, fixed by me)
+
+* Fix uninitialised variable silly bug in demo prog dlltest.c.
+     (Jorj Bauer)
+
+* Remove 512-MB limitation on recovered file size for bzip2recover
+  on selected platforms which support 64-bit ints.  At the moment
+  all GCC supported platforms, and Win32.
+     (me, Alson van der Meulen)
+
+* Hard-code header byte values, to give correct operation on platforms
+  using EBCDIC as their native character set (IBM's OS/390).
+     (Leland Lucius)
+
+* Copy file access times correctly.
+     (Marty Leisner)
+
+* Add distclean and check targets to Makefile.
+     (Michael Carmack)
+
+* Parameterise use of ar and ranlib in Makefile.  Also add $(LDFLAGS).
+     (Rich Ireland, Bo Thorsen)
+
+* Pass -p (create parent dirs as needed) to mkdir during make install.
+     (Jeremy Fusco)
+
+* Dereference symlinks when copying file permissions in -f mode.
+     (Volker Schmidt)
+
+* Majorly simplify implementation of uInt64_qrm10.
+     (Bo Lindbergh)
+
+* Check the input file still exists before deleting the output one,
+  when aborting in cleanUpAndFail().
+     (Joerg Prante, Robert Linden, Matthias Krings)
+
+Also a bunch of patches courtesy of Philippe Troin, the Debian maintainer
+of bzip2:
+
+* Wrapper scripts (with manpages): bzdiff, bzgrep, bzmore.
+
+* Spelling changes and minor enhancements in bzip2.1.
+
+* Avoid race condition between creating the output file and setting its
+  interim permissions safely, by using fopen_output_safely().
+  No changes to bzip2recover since there is no issue with file
+  permissions there.
+
+* do not print senseless report with -v when compressing an empty
+  file.
+
+* bzcat -f works on non-bzip2 files.
+
+* do not try to escape shell meta-characters on unix (the shell takes
+  care of these).
+
+* added --fast and --best aliases for -1 -9 for gzip compatibility.
diff --git a/uppsrc/plugin/bz2/lib/LICENSE b/uppsrc/plugin/bz2/lib/LICENSE
new file mode 100644
index 000000000..0273617e9
--- /dev/null
+++ b/uppsrc/plugin/bz2/lib/LICENSE
@@ -0,0 +1,38 @@
+
+This program, "bzip2" and associated library "libbzip2", are
+copyright (C) 1996-2002 Julian R Seward.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+2. The origin of this software must not be misrepresented; you must
+   not claim that you wrote the original software.  If you use this
+   software in a product, an acknowledgment in the product
+   documentation would be appreciated but is not required.
+
+3. Altered source versions must be plainly marked as such, and must
+   not be misrepresented as being the original software.
+
+4. The name of the author may not be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Julian Seward, Cambridge, UK.
+jseward@acm.org
+bzip2/libbzip2 version 1.0.2 of 30 December 2001
diff --git a/uppsrc/plugin/bz2/lib/README b/uppsrc/plugin/bz2/lib/README
new file mode 100644
index 000000000..4d10b6e75
--- /dev/null
+++ b/uppsrc/plugin/bz2/lib/README
@@ -0,0 +1,181 @@
+
+This is the README for bzip2, a block-sorting file compressor, version
+1.0.2.  This version is fully compatible with the previous public
+releases, versions 0.1pl2, 0.9.0, 0.9.5, 1.0.0 and 1.0.1.
+
+bzip2-1.0.2 is distributed under a BSD-style license.  For details,
+see the file LICENSE.
+
+Complete documentation is available in Postscript form (manual.ps),
+PDF (manual.pdf, amazingly enough) or html (manual_toc.html).  A
+plain-text version of the manual page is available as bzip2.txt.
+A statement about Y2K issues is now included in the file Y2K_INFO.
+
+
+HOW TO BUILD -- UNIX
+
+Type `make'.  This builds the library libbz2.a and then the
+programs bzip2 and bzip2recover.  Six self-tests are run.
+If the self-tests complete ok, carry on to installation:
+
+To install in /usr/bin, /usr/lib, /usr/man and /usr/include, type
+   make install
+To install somewhere else, eg, /xxx/yyy/{bin,lib,man,include}, type
+   make install PREFIX=/xxx/yyy
+If you are (justifiably) paranoid and want to see what 'make install'
+is going to do, you can first do
+   make -n install                      or
+   make -n install PREFIX=/xxx/yyy      respectively.
+The -n instructs make to show the commands it would execute, but
+not actually execute them.
+
+
+HOW TO BUILD -- UNIX, shared library libbz2.so.
+
+Do 'make -f Makefile-libbz2_so'.  This Makefile seems to work for
+Linux-ELF (RedHat 7.2 on an x86 box), with gcc.  I make no claims
+that it works for any other platform, though I suspect it probably
+will work for most platforms employing both ELF and gcc.
+
+bzip2-shared, a client of the shared library, is also built, but not
+self-tested.  So I suggest you also build using the normal Makefile,
+since that conducts a self-test.  A second reason to prefer the
+version statically linked to the library is that, on x86 platforms,
+building shared objects makes a valuable register (%ebx) unavailable
+to gcc, resulting in a slowdown of 10%-20%, at least for bzip2.
+
+Important note for people upgrading .so's from 0.9.0/0.9.5 to version
+1.0.X.  All the functions in the library have been renamed, from (eg)
+bzCompress to BZ2_bzCompress, to avoid namespace pollution.
+Unfortunately this means that the libbz2.so created by
+Makefile-libbz2_so will not work with any program which used an older
+version of the library.  Sorry.  I do encourage library clients to
+make the effort to upgrade to use version 1.0, since it is both faster
+and more robust than previous versions.
+
+
+HOW TO BUILD -- Windows 95, NT, DOS, Mac, etc.
+
+It's difficult for me to support compilation on all these platforms.
+My approach is to collect binaries for these platforms, and put them
+on the master web page (http://sources.redhat.com/bzip2).  Look there.
+However (FWIW), bzip2-1.0.X is very standard ANSI C and should compile
+unmodified with MS Visual C.  If you have difficulties building, you
+might want to read README.COMPILATION.PROBLEMS.
+
+At least using MS Visual C++ 6, you can build from the unmodified
+sources by issuing, in a command shell:
+   nmake -f makefile.msc
+(you may need to first run the MSVC-provided script VCVARS32.BAT
+ so as to set up paths to the MSVC tools correctly).
+
+
+VALIDATION
+
+Correct operation, in the sense that a compressed file can always be
+decompressed to reproduce the original, is obviously of paramount
+importance.  To validate bzip2, I used a modified version of Mark
+Nelson's churn program.  Churn is an automated test driver which
+recursively traverses a directory structure, using bzip2 to compress
+and then decompress each file it encounters, and checking that the
+decompressed data is the same as the original.  There are more details
+in Section 4 of the user guide.
+
+
+
+Please read and be aware of the following:
+
+WARNING:
+
+   This program (attempts to) compress data by performing several
+   non-trivial transformations on it.  Unless you are 100% familiar
+   with *all* the algorithms contained herein, and with the
+   consequences of modifying them, you should NOT meddle with the
+   compression or decompression machinery.  Incorrect changes can and
+   very likely *will* lead to disastrous loss of data.
+
+
+DISCLAIMER:
+
+   I TAKE NO RESPONSIBILITY FOR ANY LOSS OF DATA ARISING FROM THE
+   USE OF THIS PROGRAM, HOWSOEVER CAUSED.
+
+   Every compression of a file implies an assumption that the
+   compressed file can be decompressed to reproduce the original.
+   Great efforts in design, coding and testing have been made to
+   ensure that this program works correctly.  However, the complexity
+   of the algorithms, and, in particular, the presence of various
+   special cases in the code which occur with very low but non-zero
+   probability make it impossible to rule out the possibility of bugs
+   remaining in the program.  DO NOT COMPRESS ANY DATA WITH THIS
+   PROGRAM UNLESS YOU ARE PREPARED TO ACCEPT THE POSSIBILITY, HOWEVER
+   SMALL, THAT THE DATA WILL NOT BE RECOVERABLE.
+
+   That is not to say this program is inherently unreliable.  Indeed,
+   I very much hope the opposite is true.  bzip2 has been carefully
+   constructed and extensively tested.
+
+
+PATENTS:
+
+   To the best of my knowledge, bzip2 does not use any patented
+   algorithms.  However, I do not have the resources available to
+   carry out a full patent search.  Therefore I cannot give any
+   guarantee of the above statement.
+
+End of legalities.
+
+
+WHAT'S NEW IN 0.9.0 (as compared to 0.1pl2) ?
+
+   * Approx 10% faster compression, 30% faster decompression
+   * -t (test mode) is a lot quicker
+   * Can decompress concatenated compressed files
+   * Programming interface, so programs can directly read/write .bz2 files
+   * Less restrictive (BSD-style) licensing
+   * Flag handling more compatible with GNU gzip
+   * Much more documentation, i.e., a proper user manual
+   * Hopefully, improved portability (at least of the library)
+
+WHAT'S NEW IN 0.9.5 ?
+
+   * Compression speed is much less sensitive to the input
+     data than in previous versions.  Specifically, the very
+     slow performance caused by repetitive data is fixed.
+   * Many small improvements in file and flag handling.
+   * A Y2K statement.
+
+WHAT'S NEW IN 1.0.0 ?
+
+   See the CHANGES file.
+
+WHAT'S NEW IN 1.0.2 ?
+
+   See the CHANGES file.
+
+
+I hope you find bzip2 useful.  Feel free to contact me at
+   jseward@acm.org
+if you have any suggestions or queries.  Many people mailed me with
+comments, suggestions and patches after the releases of bzip-0.15,
+bzip-0.21, and bzip2 versions 0.1pl2, 0.9.0, 0.9.5, 1.0.0 and 1.0.1,
+and the changes in bzip2 are largely a result of this feedback.
+I thank you for your comments.
+
+At least for the time being, bzip2's "home" is (or can be reached via)
+http://sources.redhat.com/bzip2.
+
+Julian Seward
+jseward@acm.org
+
+Cambridge, UK (and what a great town this is!)
+
+18     July 1996 (version 0.15)
+25   August 1996 (version 0.21)
+ 7   August 1997 (bzip2, version 0.1)
+29   August 1997 (bzip2, version 0.1pl2)
+23   August 1998 (bzip2, version 0.9.0)
+ 8     June 1999 (bzip2, version 0.9.5)
+ 4     Sept 1999 (bzip2, version 0.9.5d)
+ 5      May 2000 (bzip2, version 1.0pre8)
+30 December 2001 (bzip2, version 1.0.2pre1)
\ No newline at end of file
diff --git a/uppsrc/plugin/bz2/lib/blocksort.c b/uppsrc/plugin/bz2/lib/blocksort.c
new file mode 100644
index 000000000..0ec10fc72
--- /dev/null
+++ b/uppsrc/plugin/bz2/lib/blocksort.c
@@ -0,0 +1,1141 @@
+
+/*-------------------------------------------------------------*/
+/*--- Block sorting machinery                               ---*/
+/*---                                           blocksort.c ---*/
+/*-------------------------------------------------------------*/
+
+/*--
+  This file is a part of bzip2 and/or libbzip2, a program and
+  library for lossless, block-sorting data compression.
+
+  Copyright (C) 1996-2002 Julian R Seward.  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions
+  are met:
+
+  1. Redistributions of source code must retain the above copyright
+     notice, this list of conditions and the following disclaimer.
+
+  2. The origin of this software must not be misrepresented; you must
+     not claim that you wrote the original software.  If you use this
+     software in a product, an acknowledgment in the product
+     documentation would be appreciated but is not required.
+
+  3. Altered source versions must be plainly marked as such, and must
+     not be misrepresented as being the original software.
+
+  4. The name of the author may not be used to endorse or promote
+     products derived from this software without specific prior written
+     permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+  OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+  ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+  GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+  Julian Seward, Cambridge, UK.
+  jseward@acm.org
+  bzip2/libbzip2 version 1.0 of 21 March 2000
+
+  This program is based on (at least) the work of:
+     Mike Burrows
+     David Wheeler
+     Peter Fenwick
+     Alistair Moffat
+     Radford Neal
+     Ian H. Witten
+     Robert Sedgewick
+     Jon L. Bentley
+
+  For more information on these sources, see the manual.
+
+  To get some idea how the block sorting algorithms in this file
+  work, read my paper
+     On the Performance of BWT Sorting Algorithms
+  in Proceedings of the IEEE Data Compression Conference 2000,
+  Snowbird, Utah, USA, 27-30 March 2000.  The main sort in this
+  file implements the algorithm called  cache  in the paper.
+--*/
+
+
+#include "bzlib_private.h"
+
+/*---------------------------------------------*/
+/*--- Fallback O(N log(N)^2) sorting        ---*/
+/*--- algorithm, for repetitive blocks      ---*/
+/*---------------------------------------------*/
+
+/*---------------------------------------------*/
+static
+__inline__
+void fallbackSimpleSort ( UInt32* fmap,
+                          UInt32* eclass,
+                          Int32   lo,
+                          Int32   hi )
+{
+   Int32 i, j, tmp;
+   UInt32 ec_tmp;
+
+   if (lo == hi) return;
+
+   if (hi - lo > 3) {
+      for ( i = hi-4; i >= lo; i-- ) {
+         tmp = fmap[i];
+         ec_tmp = eclass[tmp];
+         for ( j = i+4; j <= hi && ec_tmp > eclass[fmap[j]]; j += 4 )
+            fmap[j-4] = fmap[j];
+         fmap[j-4] = tmp;
+      }
+   }
+
+   for ( i = hi-1; i >= lo; i-- ) {
+      tmp = fmap[i];
+      ec_tmp = eclass[tmp];
+      for ( j = i+1; j <= hi && ec_tmp > eclass[fmap[j]]; j++ )
+         fmap[j-1] = fmap[j];
+      fmap[j-1] = tmp;
+   }
+}
+
+
+/*---------------------------------------------*/
+#define fswap(zz1, zz2) \
+   { Int32 zztmp = zz1; zz1 = zz2; zz2 = zztmp; }
+
+#define fvswap(zzp1, zzp2, zzn)       \
+{                                     \
+   Int32 yyp1 = (zzp1);               \
+   Int32 yyp2 = (zzp2);               \
+   Int32 yyn  = (zzn);                \
+   while (yyn > 0) {                  \
+      fswap(fmap[yyp1], fmap[yyp2]);  \
+      yyp1++; yyp2++; yyn--;          \
+   }                                  \
+}
+
+
+#define fmin(a,b) ((a) < (b)) ? (a) : (b)
+
+#define fpush(lz,hz) { stackLo[sp] = lz; \
+                       stackHi[sp] = hz; \
+                       sp++; }
+
+#define fpop(lz,hz) { sp--;              \
+                      lz = stackLo[sp];  \
+                      hz = stackHi[sp]; }
+
+#define FALLBACK_QSORT_SMALL_THRESH 10
+#define FALLBACK_QSORT_STACK_SIZE   100
+
+
+static
+void fallbackQSort3 ( UInt32* fmap,
+                      UInt32* eclass,
+                      Int32   loSt,
+                      Int32   hiSt )
+{
+   Int32 unLo, unHi, ltLo, gtHi, n, m;
+   Int32 sp, lo, hi;
+   UInt32 med, r, r3;
+   Int32 stackLo[FALLBACK_QSORT_STACK_SIZE];
+   Int32 stackHi[FALLBACK_QSORT_STACK_SIZE];
+
+   r = 0;
+
+   sp = 0;
+   fpush ( loSt, hiSt );
+
+   while (sp > 0) {
+
+      AssertH ( sp < FALLBACK_QSORT_STACK_SIZE, 1004 );
+
+      fpop ( lo, hi );
+      if (hi - lo < FALLBACK_QSORT_SMALL_THRESH) {
+         fallbackSimpleSort ( fmap, eclass, lo, hi );
+         continue;
+      }
+
+      /* Random partitioning.  Median of 3 sometimes fails to
+         avoid bad cases.  Median of 9 seems to help but
+         looks rather expensive.  This too seems to work but
+         is cheaper.  Guidance for the magic constants
+         7621 and 32768 is taken from Sedgewick's algorithms
+         book, chapter 35.
+      */
+      r = ((r * 7621) + 1) % 32768;
+      r3 = r % 3;
+      if (r3 == 0) med = eclass[fmap[lo]]; else
+      if (r3 == 1) med = eclass[fmap[(lo+hi)>>1]]; else
+                   med = eclass[fmap[hi]];
+
+      unLo = ltLo = lo;
+      unHi = gtHi = hi;
+
+      while (1) {
+         while (1) {
+            if (unLo > unHi) break;
+            n = (Int32)eclass[fmap[unLo]] - (Int32)med;
+            if (n == 0) {
+               fswap(fmap[unLo], fmap[ltLo]);
+               ltLo++; unLo++;
+               continue;
+            };
+            if (n > 0) break;
+            unLo++;
+         }
+         while (1) {
+            if (unLo > unHi) break;
+            n = (Int32)eclass[fmap[unHi]] - (Int32)med;
+            if (n == 0) {
+               fswap(fmap[unHi], fmap[gtHi]);
+               gtHi--; unHi--;
+               continue;
+            };
+            if (n < 0) break;
+            unHi--;
+         }
+         if (unLo > unHi) break;
+         fswap(fmap[unLo], fmap[unHi]); unLo++; unHi--;
+      }
+
+      AssertD ( unHi == unLo-1, "fallbackQSort3(2)" );
+
+      if (gtHi < ltLo) continue;
+
+      n = fmin(ltLo-lo, unLo-ltLo); fvswap(lo, unLo-n, n);
+      m = fmin(hi-gtHi, gtHi-unHi); fvswap(unLo, hi-m+1, m);
+
+      n = lo + unLo - ltLo - 1;
+      m = hi - (gtHi - unHi) + 1;
+
+      if (n - lo > hi - m) {
+         fpush ( lo, n );
+         fpush ( m, hi );
+      } else {
+         fpush ( m, hi );
+         fpush ( lo, n );
+      }
+   }
+}
+
+#undef fmin
+#undef fpush
+#undef fpop
+#undef fswap
+#undef fvswap
+#undef FALLBACK_QSORT_SMALL_THRESH
+#undef FALLBACK_QSORT_STACK_SIZE
+
+
+/*---------------------------------------------*/
+/* Pre:
+      nblock > 0
+      eclass exists for [0 .. nblock-1]
+      ((UChar*)eclass) [0 .. nblock-1] holds block
+      ptr exists for [0 .. nblock-1]
+
+   Post:
+      ((UChar*)eclass) [0 .. nblock-1] holds block
+      All other areas of eclass destroyed
+      fmap [0 .. nblock-1] holds sorted order
+      bhtab [ 0 .. 2+(nblock/32) ] destroyed
+*/
+
+#define       SET_BH(zz)  bhtab[(zz) >> 5] |= (1 << ((zz) & 31))
+#define     CLEAR_BH(zz)  bhtab[(zz) >> 5] &= ~(1 << ((zz) & 31))
+#define     ISSET_BH(zz)  (bhtab[(zz) >> 5] & (1 << ((zz) & 31)))
+#define      WORD_BH(zz)  bhtab[(zz) >> 5]
+#define UNALIGNED_BH(zz)  ((zz) & 0x01f)
+
+static
+void fallbackSort ( UInt32* fmap,
+                    UInt32* eclass,
+                    UInt32* bhtab,
+                    Int32   nblock,
+                    Int32   verb )
+{
+   Int32 ftab[257];
+   Int32 ftabCopy[256];
+   Int32 H, i, j, k, l, r, cc, cc1;
+   Int32 nNotDone;
+   Int32 nBhtab;
+   UChar* eclass8 = (UChar*)eclass;
+
+   /*--
+      Initial 1-char radix sort to generate
+      initial fmap and initial BH bits.
+   --*/
+   if (verb >= 4)
+      VPrintf0 ( "        bucket sorting ...\n" );
+   for (i = 0; i < 257;    i++) ftab[i] = 0;
+   for (i = 0; i < nblock; i++) ftab[eclass8[i]]++;
+   for (i = 0; i < 256;    i++) ftabCopy[i] = ftab[i];
+   for (i = 1; i < 257;    i++) ftab[i] += ftab[i-1];
+
+   for (i = 0; i < nblock; i++) {
+      j = eclass8[i];
+      k = ftab[j] - 1;
+      ftab[j] = k;
+      fmap[k] = i;
+   }
+
+   nBhtab = 2 + (nblock / 32);
+   for (i = 0; i < nBhtab; i++) bhtab[i] = 0;
+   for (i = 0; i < 256; i++) SET_BH(ftab[i]);
+
+   /*--
+      Inductively refine the buckets.  Kind-of an
+      "exponential radix sort" (!), inspired by the
+      Manber-Myers suffix array construction algorithm.
+   --*/
+
+   /*-- set sentinel bits for block-end detection --*/
+   for (i = 0; i < 32; i++) {
+      SET_BH(nblock + 2*i);
+      CLEAR_BH(nblock + 2*i + 1);
+   }
+
+   /*-- the log(N) loop --*/
+   H = 1;
+   while (1) {
+
+      if (verb >= 4)
+         VPrintf1 ( "        depth %6d has ", H );
+
+      j = 0;
+      for (i = 0; i < nblock; i++) {
+         if (ISSET_BH(i)) j = i;
+         k = fmap[i] - H; if (k < 0) k += nblock;
+         eclass[k] = j;
+      }
+
+      nNotDone = 0;
+      r = -1;
+      while (1) {
+
+	 /*-- find the next non-singleton bucket --*/
+         k = r + 1;
+         while (ISSET_BH(k) && UNALIGNED_BH(k)) k++;
+         if (ISSET_BH(k)) {
+            while (WORD_BH(k) == 0xffffffff) k += 32;
+            while (ISSET_BH(k)) k++;
+         }
+         l = k - 1;
+         if (l >= nblock) break;
+         while (!ISSET_BH(k) && UNALIGNED_BH(k)) k++;
+         if (!ISSET_BH(k)) {
+            while (WORD_BH(k) == 0x00000000) k += 32;
+            while (!ISSET_BH(k)) k++;
+         }
+         r = k - 1;
+         if (r >= nblock) break;
+
+         /*-- now [l, r] bracket current bucket --*/
+         if (r > l) {
+            nNotDone += (r - l + 1);
+            fallbackQSort3 ( fmap, eclass, l, r );
+
+            /*-- scan bucket and generate header bits-- */
+            cc = -1;
+            for (i = l; i <= r; i++) {
+               cc1 = eclass[fmap[i]];
+               if (cc != cc1) { SET_BH(i); cc = cc1; };
+            }
+         }
+      }
+
+      if (verb >= 4)
+         VPrintf1 ( "%6d unresolved strings\n", nNotDone );
+
+      H *= 2;
+      if (H > nblock || nNotDone == 0) break;
+   }
+
+   /*--
+      Reconstruct the original block in
+      eclass8 [0 .. nblock-1], since the
+      previous phase destroyed it.
+   --*/
+   if (verb >= 4)
+      VPrintf0 ( "        reconstructing block ...\n" );
+   j = 0;
+   for (i = 0; i < nblock; i++) {
+      while (ftabCopy[j] == 0) j++;
+      ftabCopy[j]--;
+      eclass8[fmap[i]] = (UChar)j;
+   }
+   AssertH ( j < 256, 1005 );
+}
+
+#undef       SET_BH
+#undef     CLEAR_BH
+#undef     ISSET_BH
+#undef      WORD_BH
+#undef UNALIGNED_BH
+
+
+/*---------------------------------------------*/
+/*--- The main, O(N^2 log(N)) sorting       ---*/
+/*--- algorithm.  Faster for "normal"       ---*/
+/*--- non-repetitive blocks.                ---*/
+/*---------------------------------------------*/
+
+/*---------------------------------------------*/
+static
+__inline__
+Bool mainGtU ( UInt32  i1,
+               UInt32  i2,
+               UChar*  block,
+               UInt16* quadrant,
+               UInt32  nblock,
+               Int32*  budget )
+{
+   Int32  k;
+   UChar  c1, c2;
+   UInt16 s1, s2;
+
+   AssertD ( i1 != i2, "mainGtU" );
+   /* 1 */
+   c1 = block[i1]; c2 = block[i2];
+   if (c1 != c2) return (c1 > c2);
+   i1++; i2++;
+   /* 2 */
+   c1 = block[i1]; c2 = block[i2];
+   if (c1 != c2) return (c1 > c2);
+   i1++; i2++;
+   /* 3 */
+   c1 = block[i1]; c2 = block[i2];
+   if (c1 != c2) return (c1 > c2);
+   i1++; i2++;
+   /* 4 */
+   c1 = block[i1]; c2 = block[i2];
+   if (c1 != c2) return (c1 > c2);
+   i1++; i2++;
+   /* 5 */
+   c1 = block[i1]; c2 = block[i2];
+   if (c1 != c2) return (c1 > c2);
+   i1++; i2++;
+   /* 6 */
+   c1 = block[i1]; c2 = block[i2];
+   if (c1 != c2) return (c1 > c2);
+   i1++; i2++;
+   /* 7 */
+   c1 = block[i1]; c2 = block[i2];
+   if (c1 != c2) return (c1 > c2);
+   i1++; i2++;
+   /* 8 */
+   c1 = block[i1]; c2 = block[i2];
+   if (c1 != c2) return (c1 > c2);
+   i1++; i2++;
+   /* 9 */
+   c1 = block[i1]; c2 = block[i2];
+   if (c1 != c2) return (c1 > c2);
+   i1++; i2++;
+   /* 10 */
+   c1 = block[i1]; c2 = block[i2];
+   if (c1 != c2) return (c1 > c2);
+   i1++; i2++;
+   /* 11 */
+   c1 = block[i1]; c2 = block[i2];
+   if (c1 != c2) return (c1 > c2);
+   i1++; i2++;
+   /* 12 */
+   c1 = block[i1]; c2 = block[i2];
+   if (c1 != c2) return (c1 > c2);
+   i1++; i2++;
+
+   k = nblock + 8;
+
+   do {
+      /* 1 */
+      c1 = block[i1]; c2 = block[i2];
+      if (c1 != c2) return (c1 > c2);
+      s1 = quadrant[i1]; s2 = quadrant[i2];
+      if (s1 != s2) return (s1 > s2);
+      i1++; i2++;
+      /* 2 */
+      c1 = block[i1]; c2 = block[i2];
+      if (c1 != c2) return (c1 > c2);
+      s1 = quadrant[i1]; s2 = quadrant[i2];
+      if (s1 != s2) return (s1 > s2);
+      i1++; i2++;
+      /* 3 */
+      c1 = block[i1]; c2 = block[i2];
+      if (c1 != c2) return (c1 > c2);
+      s1 = quadrant[i1]; s2 = quadrant[i2];
+      if (s1 != s2) return (s1 > s2);
+      i1++; i2++;
+      /* 4 */
+      c1 = block[i1]; c2 = block[i2];
+      if (c1 != c2) return (c1 > c2);
+      s1 = quadrant[i1]; s2 = quadrant[i2];
+      if (s1 != s2) return (s1 > s2);
+      i1++; i2++;
+      /* 5 */
+      c1 = block[i1]; c2 = block[i2];
+      if (c1 != c2) return (c1 > c2);
+      s1 = quadrant[i1]; s2 = quadrant[i2];
+      if (s1 != s2) return (s1 > s2);
+      i1++; i2++;
+      /* 6 */
+      c1 = block[i1]; c2 = block[i2];
+      if (c1 != c2) return (c1 > c2);
+      s1 = quadrant[i1]; s2 = quadrant[i2];
+      if (s1 != s2) return (s1 > s2);
+      i1++; i2++;
+      /* 7 */
+      c1 = block[i1]; c2 = block[i2];
+      if (c1 != c2) return (c1 > c2);
+      s1 = quadrant[i1]; s2 = quadrant[i2];
+      if (s1 != s2) return (s1 > s2);
+      i1++; i2++;
+      /* 8 */
+      c1 = block[i1]; c2 = block[i2];
+      if (c1 != c2) return (c1 > c2);
+      s1 = quadrant[i1]; s2 = quadrant[i2];
+      if (s1 != s2) return (s1 > s2);
+      i1++; i2++;
+
+      if (i1 >= nblock) i1 -= nblock;
+      if (i2 >= nblock) i2 -= nblock;
+
+      k -= 8;
+      (*budget)--;
+   }
+      while (k >= 0);
+
+   return False;
+}
+
+
+/*---------------------------------------------*/
+/*--
+   Knuth's increments seem to work better
+   than Incerpi-Sedgewick here.  Possibly
+   because the number of elems to sort is
+   usually small, typically <= 20.
+--*/
+static
+Int32 incs[14] = { 1, 4, 13, 40, 121, 364, 1093, 3280,
+                   9841, 29524, 88573, 265720,
+                   797161, 2391484 };
+
+static
+void mainSimpleSort ( UInt32* ptr,
+                      UChar*  block,
+                      UInt16* quadrant,
+                      Int32   nblock,
+                      Int32   lo,
+                      Int32   hi,
+                      Int32   d,
+                      Int32*  budget )
+{
+   Int32 i, j, h, bigN, hp;
+   UInt32 v;
+
+   bigN = hi - lo + 1;
+   if (bigN < 2) return;
+
+   hp = 0;
+   while (incs[hp] < bigN) hp++;
+   hp--;
+
+   for (; hp >= 0; hp--) {
+      h = incs[hp];
+
+      i = lo + h;
+      while (True) {
+
+         /*-- copy 1 --*/
+         if (i > hi) break;
+         v = ptr[i];
+         j = i;
+         while ( mainGtU (
+                    ptr[j-h]+d, v+d, block, quadrant, nblock, budget
+                 ) ) {
+            ptr[j] = ptr[j-h];
+            j = j - h;
+            if (j <= (lo + h - 1)) break;
+         }
+         ptr[j] = v;
+         i++;
+
+         /*-- copy 2 --*/
+         if (i > hi) break;
+         v = ptr[i];
+         j = i;
+         while ( mainGtU (
+                    ptr[j-h]+d, v+d, block, quadrant, nblock, budget
+                 ) ) {
+            ptr[j] = ptr[j-h];
+            j = j - h;
+            if (j <= (lo + h - 1)) break;
+         }
+         ptr[j] = v;
+         i++;
+
+         /*-- copy 3 --*/
+         if (i > hi) break;
+         v = ptr[i];
+         j = i;
+         while ( mainGtU (
+                    ptr[j-h]+d, v+d, block, quadrant, nblock, budget
+                 ) ) {
+            ptr[j] = ptr[j-h];
+            j = j - h;
+            if (j <= (lo + h - 1)) break;
+         }
+         ptr[j] = v;
+         i++;
+
+         if (*budget < 0) return;
+      }
+   }
+}
+
+
+/*---------------------------------------------*/
+/*--
+   The following is an implementation of
+   an elegant 3-way quicksort for strings,
+   described in a paper "Fast Algorithms for
+   Sorting and Searching Strings", by Robert
+   Sedgewick and Jon L. Bentley.
+--*/
+
+#define mswap(zz1, zz2) \
+   { Int32 zztmp = zz1; zz1 = zz2; zz2 = zztmp; }
+
+#define mvswap(zzp1, zzp2, zzn)       \
+{                                     \
+   Int32 yyp1 = (zzp1);               \
+   Int32 yyp2 = (zzp2);               \
+   Int32 yyn  = (zzn);                \
+   while (yyn > 0) {                  \
+      mswap(ptr[yyp1], ptr[yyp2]);    \
+      yyp1++; yyp2++; yyn--;          \
+   }                                  \
+}
+
+static
+__inline__
+UChar mmed3 ( UChar a, UChar b, UChar c )
+{
+   UChar t;
+   if (a > b) { t = a; a = b; b = t; };
+   if (b > c) {
+      b = c;
+      if (a > b) b = a;
+   }
+   return b;
+}
+
+#define mmin(a,b) ((a) < (b)) ? (a) : (b)
+
+#define mpush(lz,hz,dz) { stackLo[sp] = lz; \
+                          stackHi[sp] = hz; \
+                          stackD [sp] = dz; \
+                          sp++; }
+
+#define mpop(lz,hz,dz) { sp--;             \
+                         lz = stackLo[sp]; \
+                         hz = stackHi[sp]; \
+                         dz = stackD [sp]; }
+
+
+#define mnextsize(az) (nextHi[az]-nextLo[az])
+
+#define mnextswap(az,bz)                                        \
+   { Int32 tz;                                                  \
+     tz = nextLo[az]; nextLo[az] = nextLo[bz]; nextLo[bz] = tz; \
+     tz = nextHi[az]; nextHi[az] = nextHi[bz]; nextHi[bz] = tz; \
+     tz = nextD [az]; nextD [az] = nextD [bz]; nextD [bz] = tz; }
+
+
+#define MAIN_QSORT_SMALL_THRESH 20
+#define MAIN_QSORT_DEPTH_THRESH (BZ_N_RADIX + BZ_N_QSORT)
+#define MAIN_QSORT_STACK_SIZE 100
+
+static
+void mainQSort3 ( UInt32* ptr,
+                  UChar*  block,
+                  UInt16* quadrant,
+                  Int32   nblock,
+                  Int32   loSt,
+                  Int32   hiSt,
+                  Int32   dSt,
+                  Int32*  budget )
+{
+   Int32 unLo, unHi, ltLo, gtHi, n, m, med;
+   Int32 sp, lo, hi, d;
+
+   Int32 stackLo[MAIN_QSORT_STACK_SIZE];
+   Int32 stackHi[MAIN_QSORT_STACK_SIZE];
+   Int32 stackD [MAIN_QSORT_STACK_SIZE];
+
+   Int32 nextLo[3];
+   Int32 nextHi[3];
+   Int32 nextD [3];
+
+   sp = 0;
+   mpush ( loSt, hiSt, dSt );
+
+   while (sp > 0) {
+
+      AssertH ( sp < MAIN_QSORT_STACK_SIZE, 1001 );
+
+      mpop ( lo, hi, d );
+      if (hi - lo < MAIN_QSORT_SMALL_THRESH ||
+          d > MAIN_QSORT_DEPTH_THRESH) {
+         mainSimpleSort ( ptr, block, quadrant, nblock, lo, hi, d, budget );
+         if (*budget < 0) return;
+         continue;
+      }
+
+      med = (Int32)
+            mmed3 ( block[ptr[ lo         ]+d],
+                    block[ptr[ hi         ]+d],
+                    block[ptr[ (lo+hi)>>1 ]+d] );
+
+      unLo = ltLo = lo;
+      unHi = gtHi = hi;
+
+      while (True) {
+         while (True) {
+            if (unLo > unHi) break;
+            n = ((Int32)block[ptr[unLo]+d]) - med;
+            if (n == 0) {
+               mswap(ptr[unLo], ptr[ltLo]);
+               ltLo++; unLo++; continue;
+            };
+            if (n >  0) break;
+            unLo++;
+         }
+         while (True) {
+            if (unLo > unHi) break;
+            n = ((Int32)block[ptr[unHi]+d]) - med;
+            if (n == 0) {
+               mswap(ptr[unHi], ptr[gtHi]);
+               gtHi--; unHi--; continue;
+            };
+            if (n <  0) break;
+            unHi--;
+         }
+         if (unLo > unHi) break;
+         mswap(ptr[unLo], ptr[unHi]); unLo++; unHi--;
+      }
+
+      AssertD ( unHi == unLo-1, "mainQSort3(2)" );
+
+      if (gtHi < ltLo) {
+         mpush(lo, hi, d+1 );
+         continue;
+      }
+
+      n = mmin(ltLo-lo, unLo-ltLo); mvswap(lo, unLo-n, n);
+      m = mmin(hi-gtHi, gtHi-unHi); mvswap(unLo, hi-m+1, m);
+
+      n = lo + unLo - ltLo - 1;
+      m = hi - (gtHi - unHi) + 1;
+
+      nextLo[0] = lo;  nextHi[0] = n;   nextD[0] = d;
+      nextLo[1] = m;   nextHi[1] = hi;  nextD[1] = d;
+      nextLo[2] = n+1; nextHi[2] = m-1; nextD[2] = d+1;
+
+      if (mnextsize(0) < mnextsize(1)) mnextswap(0,1);
+      if (mnextsize(1) < mnextsize(2)) mnextswap(1,2);
+      if (mnextsize(0) < mnextsize(1)) mnextswap(0,1);
+
+      AssertD (mnextsize(0) >= mnextsize(1), "mainQSort3(8)" );
+      AssertD (mnextsize(1) >= mnextsize(2), "mainQSort3(9)" );
+
+      mpush (nextLo[0], nextHi[0], nextD[0]);
+      mpush (nextLo[1], nextHi[1], nextD[1]);
+      mpush (nextLo[2], nextHi[2], nextD[2]);
+   }
+}
+
+#undef mswap
+#undef mvswap
+#undef mpush
+#undef mpop
+#undef mmin
+#undef mnextsize
+#undef mnextswap
+#undef MAIN_QSORT_SMALL_THRESH
+#undef MAIN_QSORT_DEPTH_THRESH
+#undef MAIN_QSORT_STACK_SIZE
+
+
+/*---------------------------------------------*/
+/* Pre:
+      nblock > N_OVERSHOOT
+      block32 exists for [0 .. nblock-1 +N_OVERSHOOT]
+      ((UChar*)block32) [0 .. nblock-1] holds block
+      ptr exists for [0 .. nblock-1]
+
+   Post:
+      ((UChar*)block32) [0 .. nblock-1] holds block
+      All other areas of block32 destroyed
+      ftab [0 .. 65536 ] destroyed
+      ptr [0 .. nblock-1] holds sorted order
+      if (*budget < 0), sorting was abandoned
+*/
+
+#define BIGFREQ(b) (ftab[((b)+1) << 8] - ftab[(b) << 8])
+#define SETMASK (1 << 21)
+#define CLEARMASK (~(SETMASK))
+
+static
+void mainSort ( UInt32* ptr,
+                UChar*  block,
+                UInt16* quadrant,
+                UInt32* ftab,
+                Int32   nblock,
+                Int32   verb,
+                Int32*  budget )
+{
+   Int32  i, j, k, ss, sb;
+   Int32  runningOrder[256];
+   Bool   bigDone[256];
+   Int32  copyStart[256];
+   Int32  copyEnd  [256];
+   UChar  c1;
+   Int32  numQSorted;
+   UInt16 s;
+   if (verb >= 4) VPrintf0 ( "        main sort initialise ...\n" );
+
+   /*-- set up the 2-byte frequency table --*/
+   for (i = 65536; i >= 0; i--) ftab[i] = 0;
+
+   j = block[0] << 8;
+   i = nblock-1;
+   for (; i >= 3; i -= 4) {
+      quadrant[i] = 0;
+      j = (j >> 8) | ( ((UInt16)block[i]) << 8);
+      ftab[j]++;
+      quadrant[i-1] = 0;
+      j = (j >> 8) | ( ((UInt16)block[i-1]) << 8);
+      ftab[j]++;
+      quadrant[i-2] = 0;
+      j = (j >> 8) | ( ((UInt16)block[i-2]) << 8);
+      ftab[j]++;
+      quadrant[i-3] = 0;
+      j = (j >> 8) | ( ((UInt16)block[i-3]) << 8);
+      ftab[j]++;
+   }
+   for (; i >= 0; i--) {
+      quadrant[i] = 0;
+      j = (j >> 8) | ( ((UInt16)block[i]) << 8);
+      ftab[j]++;
+   }
+
+   /*-- (emphasises close relationship of block & quadrant) --*/
+   for (i = 0; i < BZ_N_OVERSHOOT; i++) {
+      block   [nblock+i] = block[i];
+      quadrant[nblock+i] = 0;
+   }
+
+   if (verb >= 4) VPrintf0 ( "        bucket sorting ...\n" );
+
+   /*-- Complete the initial radix sort --*/
+   for (i = 1; i <= 65536; i++) ftab[i] += ftab[i-1];
+
+   s = block[0] << 8;
+   i = nblock-1;
+   for (; i >= 3; i -= 4) {
+      s = (s >> 8) | (block[i] << 8);
+      j = ftab[s] -1;
+      ftab[s] = j;
+      ptr[j] = i;
+      s = (s >> 8) | (block[i-1] << 8);
+      j = ftab[s] -1;
+      ftab[s] = j;
+      ptr[j] = i-1;
+      s = (s >> 8) | (block[i-2] << 8);
+      j = ftab[s] -1;
+      ftab[s] = j;
+      ptr[j] = i-2;
+      s = (s >> 8) | (block[i-3] << 8);
+      j = ftab[s] -1;
+      ftab[s] = j;
+      ptr[j] = i-3;
+   }
+   for (; i >= 0; i--) {
+      s = (s >> 8) | (block[i] << 8);
+      j = ftab[s] -1;
+      ftab[s] = j;
+      ptr[j] = i;
+   }
+
+   /*--
+      Now ftab contains the first loc of every small bucket.
+      Calculate the running order, from smallest to largest
+      big bucket.
+   --*/
+   for (i = 0; i <= 255; i++) {
+      bigDone     [i] = False;
+      runningOrder[i] = i;
+   }
+
+   {
+      Int32 vv;
+      Int32 h = 1;
+      do h = 3 * h + 1; while (h <= 256);
+      do {
+         h = h / 3;
+         for (i = h; i <= 255; i++) {
+            vv = runningOrder[i];
+            j = i;
+            while ( BIGFREQ(runningOrder[j-h]) > BIGFREQ(vv) ) {
+               runningOrder[j] = runningOrder[j-h];
+               j = j - h;
+               if (j <= (h - 1)) goto zero;
+            }
+            zero:
+            runningOrder[j] = vv;
+         }
+      } while (h != 1);
+   }
+
+   /*--
+      The main sorting loop.
+   --*/
+
+   numQSorted = 0;
+
+   for (i = 0; i <= 255; i++) {
+
+      /*--
+         Process big buckets, starting with the least full.
+         Basically this is a 3-step process in which we call
+         mainQSort3 to sort the small buckets [ss, j], but
+         also make a big effort to avoid the calls if we can.
+      --*/
+      ss = runningOrder[i];
+
+      /*--
+         Step 1:
+         Complete the big bucket [ss] by quicksorting
+         any unsorted small buckets [ss, j], for j != ss.
+         Hopefully previous pointer-scanning phases have already
+         completed many of the small buckets [ss, j], so
+         we don't have to sort them at all.
+      --*/
+      for (j = 0; j <= 255; j++) {
+         if (j != ss) {
+            sb = (ss << 8) + j;
+            if ( ! (ftab[sb] & SETMASK) ) {
+               Int32 lo = ftab[sb]   & CLEARMASK;
+               Int32 hi = (ftab[sb+1] & CLEARMASK) - 1;
+               if (hi > lo) {
+                  if (verb >= 4)
+                     VPrintf4 ( "        qsort [0x%x, 0x%x]   "
+                                "done %d   this %d\n",
+                                ss, j, numQSorted, hi - lo + 1 );
+                  mainQSort3 (
+                     ptr, block, quadrant, nblock,
+                     lo, hi, BZ_N_RADIX, budget
+                  );
+                  numQSorted += (hi - lo + 1);
+                  if (*budget < 0) return;
+               }
+            }
+            ftab[sb] |= SETMASK;
+         }
+      }
+
+      AssertH ( !bigDone[ss], 1006 );
+
+      /*--
+         Step 2:
+         Now scan this big bucket [ss] so as to synthesise the
+         sorted order for small buckets [t, ss] for all t,
+         including, magically, the bucket [ss,ss] too.
+         This will avoid doing Real Work in subsequent Step 1's.
+      --*/
+      {
+         for (j = 0; j <= 255; j++) {
+            copyStart[j] =  ftab[(j << 8) + ss]     & CLEARMASK;
+            copyEnd  [j] = (ftab[(j << 8) + ss + 1] & CLEARMASK) - 1;
+         }
+         for (j = ftab[ss << 8] & CLEARMASK; j < copyStart[ss]; j++) {
+            k = ptr[j]-1; if (k < 0) k += nblock;
+            c1 = block[k];
+            if (!bigDone[c1])
+               ptr[ copyStart[c1]++ ] = k;
+         }
+         for (j = (ftab[(ss+1) << 8] & CLEARMASK) - 1; j > copyEnd[ss]; j--) {
+            k = ptr[j]-1; if (k < 0) k += nblock;
+            c1 = block[k];
+            if (!bigDone[c1])
+               ptr[ copyEnd[c1]-- ] = k;
+         }
+      }
+
+      AssertH ( (copyStart[ss]-1 == copyEnd[ss])
+                ||
+                /* Extremely rare case missing in bzip2-1.0.0 and 1.0.1.
+                   Necessity for this case is demonstrated by compressing
+                   a sequence of approximately 48.5 million of character
+                   251; 1.0.0/1.0.1 will then die here. */
+                (copyStart[ss] == 0 && copyEnd[ss] == nblock-1),
+                1007 )
+
+      for (j = 0; j <= 255; j++) ftab[(j << 8) + ss] |= SETMASK;
+
+      /*--
+         Step 3:
+         The [ss] big bucket is now done.  Record this fact,
+         and update the quadrant descriptors.  Remember to
+         update quadrants in the overshoot area too, if
+         necessary.  The "if (i < 255)" test merely skips
+         this updating for the last bucket processed, since
+         updating for the last bucket is pointless.
+
+         The quadrant array provides a way to incrementally
+         cache sort orderings, as they appear, so as to
+         make subsequent comparisons in fullGtU() complete
+         faster.  For repetitive blocks this makes a big
+         difference (but not big enough to be able to avoid
+         the fallback sorting mechanism, exponential radix sort).
+
+         The precise meaning is: at all times:
+
+            for 0 <= i < nblock and 0 <= j <= nblock
+
+            if block[i] != block[j],
+
+               then the relative values of quadrant[i] and
+                    quadrant[j] are meaningless.
+
+               else {
+                  if quadrant[i] < quadrant[j]
+                     then the string starting at i lexicographically
+                     precedes the string starting at j
+
+                  else if quadrant[i] > quadrant[j]
+                     then the string starting at j lexicographically
+                     precedes the string starting at i
+
+                  else
+                     the relative ordering of the strings starting
+                     at i and j has not yet been determined.
+               }
+      --*/
+      bigDone[ss] = True;
+
+      if (i < 255) {
+         Int32 bbStart  = ftab[ss << 8] & CLEARMASK;
+         Int32 bbSize   = (ftab[(ss+1) << 8] & CLEARMASK) - bbStart;
+         Int32 shifts   = 0;
+
+         while ((bbSize >> shifts) > 65534) shifts++;
+
+         for (j = bbSize-1; j >= 0; j--) {
+            Int32 a2update     = ptr[bbStart + j];
+            UInt16 qVal        = (UInt16)(j >> shifts);
+            quadrant[a2update] = qVal;
+            if (a2update < BZ_N_OVERSHOOT)
+               quadrant[a2update + nblock] = qVal;
+         }
+         AssertH ( ((bbSize-1) >> shifts) <= 65535, 1002 );
+      }
+
+   }
+
+   if (verb >= 4)
+      VPrintf3 ( "        %d pointers, %d sorted, %d scanned\n",
+                 nblock, numQSorted, nblock - numQSorted );
+}
+
+#undef BIGFREQ
+#undef SETMASK
+#undef CLEARMASK
+
+
+/*---------------------------------------------*/
+/* Pre:
+      nblock > 0
+      arr2 exists for [0 .. nblock-1 +N_OVERSHOOT]
+      ((UChar*)arr2)  [0 .. nblock-1] holds block
+      arr1 exists for [0 .. nblock-1]
+
+   Post:
+      ((UChar*)arr2) [0 .. nblock-1] holds block
+      All other areas of block destroyed
+      ftab [ 0 .. 65536 ] destroyed
+      arr1 [0 .. nblock-1] holds sorted order
+*/
+void BZ2_blockSort ( EState* s )
+{
+   UInt32* ptr    = s->ptr;
+   UChar*  block  = s->block;
+   UInt32* ftab   = s->ftab;
+   Int32   nblock = s->nblock;
+   Int32   verb   = s->verbosity;
+   Int32   wfact  = s->workFactor;
+   UInt16* quadrant;
+   Int32   budget;
+   Int32   budgetInit;
+   Int32   i;
+
+   if (nblock < 10000) {
+      fallbackSort ( s->arr1, s->arr2, ftab, nblock, verb );
+   } else {
+      /* Calculate the location for quadrant, remembering to get
+         the alignment right.  Assumes that &(block[0]) is at least
+         2-byte aligned -- this should be ok since block is really
+         the first section of arr2.
+      */
+      i = nblock+BZ_N_OVERSHOOT;
+      if (i & 1) i++;
+      quadrant = (UInt16*)(&(block[i]));
+
+      /* (wfact-1) / 3 puts the default-factor-30
+         transition point at very roughly the same place as
+         with v0.1 and v0.9.0.
+         Not that it particularly matters any more, since the
+         resulting compressed stream is now the same regardless
+         of whether or not we use the main sort or fallback sort.
+      */
+      if (wfact < 1  ) wfact = 1;
+      if (wfact > 100) wfact = 100;
+      budgetInit = nblock * ((wfact-1) / 3);
+      budget = budgetInit;
+
+      mainSort ( ptr, block, quadrant, ftab, nblock, verb, &budget );
+      if (verb >= 3)
+         VPrintf3 ( "      %d work, %d block, ratio %5.2f\n",
+                    budgetInit - budget,
+                    nblock,
+                    (float)(budgetInit - budget) /
+                    (float)(nblock==0 ? 1 : nblock) );
+      if (budget < 0) {
+         if (verb >= 2)
+            VPrintf0 ( "    too repetitive; using fallback"
+                       " sorting algorithm\n" );
+         fallbackSort ( s->arr1, s->arr2, ftab, nblock, verb );
+      }
+   }
+
+   s->origPtr = -1;
+   for (i = 0; i < s->nblock; i++)
+      if (ptr[i] == 0)
+         { s->origPtr = i; break; };
+
+   AssertH( s->origPtr != -1, 1003 );
+}
+
+
+/*-------------------------------------------------------------*/
+/*--- end                                       blocksort.c ---*/
+/*-------------------------------------------------------------*/
diff --git a/uppsrc/plugin/bz2/lib/bzip2.c b/uppsrc/plugin/bz2/lib/bzip2.c
new file mode 100644
index 000000000..dcd8041c8
--- /dev/null
+++ b/uppsrc/plugin/bz2/lib/bzip2.c
@@ -0,0 +1,2103 @@
+
+/*-----------------------------------------------------------*/
+/*--- A block-sorting, lossless compressor        bzip2.c ---*/
+/*-----------------------------------------------------------*/
+
+/*--
+  This file is a part of bzip2 and/or libbzip2, a program and
+  library for lossless, block-sorting data compression.
+
+  Copyright (C) 1996-2002 Julian R Seward.  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions
+  are met:
+
+  1. Redistributions of source code must retain the above copyright
+     notice, this list of conditions and the following disclaimer.
+
+  2. The origin of this software must not be misrepresented; you must
+     not claim that you wrote the original software.  If you use this
+     software in a product, an acknowledgment in the product
+     documentation would be appreciated but is not required.
+
+  3. Altered source versions must be plainly marked as such, and must
+     not be misrepresented as being the original software.
+
+  4. The name of the author may not be used to endorse or promote
+     products derived from this software without specific prior written
+     permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+  OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+  ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+  GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+  Julian Seward, Cambridge, UK.
+  jseward@acm.org
+  bzip2/libbzip2 version 1.0 of 21 March 2000
+
+  This program is based on (at least) the work of:
+     Mike Burrows
+     David Wheeler
+     Peter Fenwick
+     Alistair Moffat
+     Radford Neal
+     Ian H. Witten
+     Robert Sedgewick
+     Jon L. Bentley
+
+  For more information on these sources, see the manual.
+--*/
+
+
+/*----------------------------------------------------*/
+/*--- IMPORTANT                                    ---*/
+/*----------------------------------------------------*/
+
+/*--
+   WARNING:
+      This program and library (attempts to) compress data by
+      performing several non-trivial transformations on it.
+      Unless you are 100% familiar with *all* the algorithms
+      contained herein, and with the consequences of modifying them,
+      you should NOT meddle with the compression or decompression
+      machinery.  Incorrect changes can and very likely *will*
+      lead to disasterous loss of data.
+
+   DISCLAIMER:
+      I TAKE NO RESPONSIBILITY FOR ANY LOSS OF DATA ARISING FROM THE
+      USE OF THIS PROGRAM, HOWSOEVER CAUSED.
+
+      Every compression of a file implies an assumption that the
+      compressed file can be decompressed to reproduce the original.
+      Great efforts in design, coding and testing have been made to
+      ensure that this program works correctly.  However, the
+      complexity of the algorithms, and, in particular, the presence
+      of various special cases in the code which occur with very low
+      but non-zero probability make it impossible to rule out the
+      possibility of bugs remaining in the program.  DO NOT COMPRESS
+      ANY DATA WITH THIS PROGRAM AND/OR LIBRARY UNLESS YOU ARE PREPARED
+      TO ACCEPT THE POSSIBILITY, HOWEVER SMALL, THAT THE DATA WILL
+      NOT BE RECOVERABLE.
+
+      That is not to say this program is inherently unreliable.
+      Indeed, I very much hope the opposite is true.  bzip2/libbzip2
+      has been carefully constructed and extensively tested.
+
+   PATENTS:
+      To the best of my knowledge, bzip2/libbzip2 does not use any
+      patented algorithms.  However, I do not have the resources
+      available to carry out a full patent search.  Therefore I cannot
+      give any guarantee of the above statement.
+--*/
+
+
+
+/*----------------------------------------------------*/
+/*--- and now for something much more pleasant :-) ---*/
+/*----------------------------------------------------*/
+
+/*---------------------------------------------*/
+/*--
+  Place a 1 beside your platform, and 0 elsewhere.
+--*/
+
+/*--
+  Generic 32-bit Unix.
+  Also works on 64-bit Unix boxes.
+  This is the default.
+--*/
+#define BZ_UNIX      1
+
+/*--
+  Win32, as seen by Jacob Navia's excellent
+  port of (Chris Fraser & David Hanson)'s excellent
+  lcc compiler.  Or with MS Visual C.
+  This is selected automatically if compiled by a compiler which
+  defines _WIN32, not including the Cygwin GCC.
+--*/
+#define BZ_LCCWIN32  0
+
+#if defined(_WIN32) && !defined(__CYGWIN__)
+#undef  BZ_LCCWIN32
+#define BZ_LCCWIN32 1
+#undef  BZ_UNIX
+#define BZ_UNIX 0
+#endif
+
+
+/*---------------------------------------------*/
+/*--
+  Some stuff for all platforms.
+--*/
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <signal.h>
+#include <math.h>
+#include <errno.h>
+#include <ctype.h>
+#include "bzlib.h"
+
+#define ERROR_IF_EOF(i)       { if ((i) == EOF)  ioError(); }
+#define ERROR_IF_NOT_ZERO(i)  { if ((i) != 0)    ioError(); }
+#define ERROR_IF_MINUS_ONE(i) { if ((i) == (-1)) ioError(); }
+
+
+/*---------------------------------------------*/
+/*--
+   Platform-specific stuff.
+--*/
+
+#if BZ_UNIX
+#   include <fcntl.h>
+#   include <sys/types.h>
+#   include <utime.h>
+#   include <unistd.h>
+#   include <sys/stat.h>
+#   include <sys/times.h>
+
+#   define PATH_SEP    '/'
+#   define MY_LSTAT    lstat
+#   define MY_STAT     stat
+#   define MY_S_ISREG  S_ISREG
+#   define MY_S_ISDIR  S_ISDIR
+
+#   define APPEND_FILESPEC(root, name) \
+      root=snocString((root), (name))
+
+#   define APPEND_FLAG(root, name) \
+      root=snocString((root), (name))
+
+#   define SET_BINARY_MODE(fd) /**/
+
+#   ifdef __GNUC__
+#      define NORETURN __attribute__ ((noreturn))
+#   else
+#      define NORETURN /**/
+#   endif
+
+#   ifdef __DJGPP__
+#     include <io.h>
+#     include <fcntl.h>
+#     undef MY_LSTAT
+#     undef MY_STAT
+#     define MY_LSTAT stat
+#     define MY_STAT stat
+#     undef SET_BINARY_MODE
+#     define SET_BINARY_MODE(fd)                        \
+        do {                                            \
+           int retVal = setmode ( fileno ( fd ),        \
+                                  O_BINARY );           \
+           ERROR_IF_MINUS_ONE ( retVal );               \
+        } while ( 0 )
+#   endif
+
+#   ifdef __CYGWIN__
+#     include <io.h>
+#     include <fcntl.h>
+#     undef SET_BINARY_MODE
+#     define SET_BINARY_MODE(fd)                        \
+        do {                                            \
+           int retVal = setmode ( fileno ( fd ),        \
+                                  O_BINARY );           \
+           ERROR_IF_MINUS_ONE ( retVal );               \
+        } while ( 0 )
+#   endif
+#endif /* BZ_UNIX */
+
+
+
+#if BZ_LCCWIN32
+#   include <io.h>
+#   include <fcntl.h>
+#   include <sys\stat.h>
+
+#   define NORETURN       /**/
+#   define PATH_SEP       '\\'
+#   define MY_LSTAT       _stat
+#   define MY_STAT        _stat
+#   define MY_S_ISREG(x)  ((x) & _S_IFREG)
+#   define MY_S_ISDIR(x)  ((x) & _S_IFDIR)
+
+#   define APPEND_FLAG(root, name) \
+      root=snocString((root), (name))
+
+#   define APPEND_FILESPEC(root, name)                \
+      root = snocString ((root), (name))
+
+#   define SET_BINARY_MODE(fd)                        \
+      do {                                            \
+         int retVal = setmode ( fileno ( fd ),        \
+                                O_BINARY );           \
+         ERROR_IF_MINUS_ONE ( retVal );               \
+      } while ( 0 )
+
+#endif /* BZ_LCCWIN32 */
+
+
+/*---------------------------------------------*/
+/*--
+  Some more stuff for all platforms :-)
+--*/
+
+typedef char            Char;
+typedef unsigned char   Bool;
+typedef unsigned char   UChar;
+typedef int             Int32;
+typedef unsigned int    UInt32;
+typedef short           Int16;
+typedef unsigned short  UInt16;
+
+#define True  ((Bool)1)
+#define False ((Bool)0)
+
+/*--
+  IntNative is your platform's `native' int size.
+  Only here to avoid probs with 64-bit platforms.
+--*/
+typedef int IntNative;
+
+
+/*---------------------------------------------------*/
+/*--- Misc (file handling) data decls             ---*/
+/*---------------------------------------------------*/
+
+Int32   verbosity;
+Bool    keepInputFiles, smallMode, deleteOutputOnInterrupt;
+Bool    forceOverwrite, testFailsExist, unzFailsExist, noisy;
+Int32   numFileNames, numFilesProcessed, blockSize100k;
+Int32   exitValue;
+
+/*-- source modes; F==file, I==stdin, O==stdout --*/
+#define SM_I2O           1
+#define SM_F2O           2
+#define SM_F2F           3
+
+/*-- operation modes --*/
+#define OM_Z             1
+#define OM_UNZ           2
+#define OM_TEST          3
+
+Int32   opMode;
+Int32   srcMode;
+
+#define FILE_NAME_LEN 1034
+
+Int32   longestFileName;
+Char    inName [FILE_NAME_LEN];
+Char    outName[FILE_NAME_LEN];
+Char    tmpName[FILE_NAME_LEN];
+Char    *progName;
+Char    progNameReally[FILE_NAME_LEN];
+FILE    *outputHandleJustInCase;
+Int32   workFactor;
+
+static void    panic                 ( Char* )   NORETURN;
+static void    ioError               ( void )    NORETURN;
+static void    outOfMemory           ( void )    NORETURN;
+static void    configError           ( void )    NORETURN;
+static void    crcError              ( void )    NORETURN;
+static void    cleanUpAndFail        ( Int32 )   NORETURN;
+static void    compressedStreamEOF   ( void )    NORETURN;
+
+static void    copyFileName ( Char*, Char* );
+static void*   myMalloc     ( Int32 );
+
+
+
+/*---------------------------------------------------*/
+/*--- An implementation of 64-bit ints.  Sigh.    ---*/
+/*--- Roll on widespread deployment of ANSI C9X ! ---*/
+/*---------------------------------------------------*/
+
+typedef
+   struct { UChar b[8]; }
+   UInt64;
+
+
+static
+void uInt64_from_UInt32s ( UInt64* n, UInt32 lo32, UInt32 hi32 )
+{
+   n->b[7] = (UChar)((hi32 >> 24) & 0xFF);
+   n->b[6] = (UChar)((hi32 >> 16) & 0xFF);
+   n->b[5] = (UChar)((hi32 >> 8)  & 0xFF);
+   n->b[4] = (UChar) (hi32        & 0xFF);
+   n->b[3] = (UChar)((lo32 >> 24) & 0xFF);
+   n->b[2] = (UChar)((lo32 >> 16) & 0xFF);
+   n->b[1] = (UChar)((lo32 >> 8)  & 0xFF);
+   n->b[0] = (UChar) (lo32        & 0xFF);
+}
+
+
+static
+double uInt64_to_double ( UInt64* n )
+{
+   Int32  i;
+   double base = 1.0;
+   double sum  = 0.0;
+   for (i = 0; i < 8; i++) {
+      sum  += base * (double)(n->b[i]);
+      base *= 256.0;
+   }
+   return sum;
+}
+
+
+static
+Bool uInt64_isZero ( UInt64* n )
+{
+   Int32 i;
+   for (i = 0; i < 8; i++)
+      if (n->b[i] != 0) return 0;
+   return 1;
+}
+
+
+/* Divide *n by 10, and return the remainder.  */
+static
+Int32 uInt64_qrm10 ( UInt64* n )
+{
+   UInt32 rem, tmp;
+   Int32  i;
+   rem = 0;
+   for (i = 7; i >= 0; i--) {
+      tmp = rem * 256 + n->b[i];
+      n->b[i] = tmp / 10;
+      rem = tmp % 10;
+   }
+   return rem;
+}
+
+
+/* ... and the Whole Entire Point of all this UInt64 stuff is
+   so that we can supply the following function.
+*/
+static
+void uInt64_toAscii ( char* outbuf, UInt64* n )
+{
+   Int32  i, q;
+   UChar  buf[32];
+   Int32  nBuf   = 0;
+   UInt64 n_copy = *n;
+   do {
+      q = uInt64_qrm10 ( &n_copy );
+      buf[nBuf] = q + '0';
+      nBuf++;
+   } while (!uInt64_isZero(&n_copy));
+   outbuf[nBuf] = 0;
+   for (i = 0; i < nBuf; i++)
+      outbuf[i] = buf[nBuf-i-1];
+}
+
+
+/*---------------------------------------------------*/
+/*--- Processing of complete files and streams    ---*/
+/*---------------------------------------------------*/
+
+/*---------------------------------------------*/
+static
+Bool myfeof ( FILE* f )
+{
+   Int32 c = fgetc ( f );
+   if (c == EOF) return True;
+   ungetc ( c, f );
+   return False;
+}
+
+
+/*---------------------------------------------*/
+static
+void compressStream ( FILE *stream, FILE *zStream )
+{
+   BZFILE* bzf = NULL;
+   UChar   ibuf[5000];
+   Int32   nIbuf;
+   UInt32  nbytes_in_lo32, nbytes_in_hi32;
+   UInt32  nbytes_out_lo32, nbytes_out_hi32;
+   Int32   bzerr, bzerr_dummy, ret;
+
+   SET_BINARY_MODE(stream);
+   SET_BINARY_MODE(zStream);
+
+   if (ferror(stream)) goto errhandler_io;
+   if (ferror(zStream)) goto errhandler_io;
+
+   bzf = BZ2_bzWriteOpen ( &bzerr, zStream,
+                           blockSize100k, verbosity, workFactor );
+   if (bzerr != BZ_OK) goto errhandler;
+
+   if (verbosity >= 2) fprintf ( stderr, "\n" );
+
+   while (True) {
+
+      if (myfeof(stream)) break;
+      nIbuf = fread ( ibuf, sizeof(UChar), 5000, stream );
+      if (ferror(stream)) goto errhandler_io;
+      if (nIbuf > 0) BZ2_bzWrite ( &bzerr, bzf, (void*)ibuf, nIbuf );
+      if (bzerr != BZ_OK) goto errhandler;
+
+   }
+
+   BZ2_bzWriteClose64 ( &bzerr, bzf, 0,
+                        &nbytes_in_lo32, &nbytes_in_hi32,
+                        &nbytes_out_lo32, &nbytes_out_hi32 );
+   if (bzerr != BZ_OK) goto errhandler;
+
+   if (ferror(zStream)) goto errhandler_io;
+   ret = fflush ( zStream );
+   if (ret == EOF) goto errhandler_io;
+   if (zStream != stdout) {
+      ret = fclose ( zStream );
+      outputHandleJustInCase = NULL;
+      if (ret == EOF) goto errhandler_io;
+   }
+   outputHandleJustInCase = NULL;
+   if (ferror(stream)) goto errhandler_io;
+   ret = fclose ( stream );
+   if (ret == EOF) goto errhandler_io;
+
+   if (verbosity >= 1) {
+      if (nbytes_in_lo32 == 0 && nbytes_in_hi32 == 0) {
+	 fprintf ( stderr, " no data compressed.\n");
+      } else {
+	 Char   buf_nin[32], buf_nout[32];
+	 UInt64 nbytes_in,   nbytes_out;
+	 double nbytes_in_d, nbytes_out_d;
+	 uInt64_from_UInt32s ( &nbytes_in,
+			       nbytes_in_lo32, nbytes_in_hi32 );
+	 uInt64_from_UInt32s ( &nbytes_out,
+			       nbytes_out_lo32, nbytes_out_hi32 );
+	 nbytes_in_d  = uInt64_to_double ( &nbytes_in );
+	 nbytes_out_d = uInt64_to_double ( &nbytes_out );
+	 uInt64_toAscii ( buf_nin, &nbytes_in );
+	 uInt64_toAscii ( buf_nout, &nbytes_out );
+	 fprintf ( stderr, "%6.3f:1, %6.3f bits/byte, "
+		   "%5.2f%% saved, %s in, %s out.\n",
+		   nbytes_in_d / nbytes_out_d,
+		   (8.0 * nbytes_out_d) / nbytes_in_d,
+		   100.0 * (1.0 - nbytes_out_d / nbytes_in_d),
+		   buf_nin,
+		   buf_nout
+		 );
+      }
+   }
+
+   return;
+
+   errhandler:
+   BZ2_bzWriteClose64 ( &bzerr_dummy, bzf, 1,
+                        &nbytes_in_lo32, &nbytes_in_hi32,
+                        &nbytes_out_lo32, &nbytes_out_hi32 );
+   switch (bzerr) {
+      case BZ_CONFIG_ERROR:
+         configError(); break;
+      case BZ_MEM_ERROR:
+         outOfMemory (); break;
+      case BZ_IO_ERROR:
+         errhandler_io:
+         ioError(); break;
+      default:
+         panic ( "compress:unexpected error" );
+   }
+
+   panic ( "compress:end" );
+   /*notreached*/
+}
+
+
+
+/*---------------------------------------------*/
+static
+Bool uncompressStream ( FILE *zStream, FILE *stream )
+{
+   BZFILE* bzf = NULL;
+   Int32   bzerr, bzerr_dummy, ret, nread, streamNo, i;
+   UChar   obuf[5000];
+   UChar   unused[BZ_MAX_UNUSED];
+   Int32   nUnused;
+   UChar*  unusedTmp;
+
+   nUnused = 0;
+   streamNo = 0;
+
+   SET_BINARY_MODE(stream);
+   SET_BINARY_MODE(zStream);
+
+   if (ferror(stream)) goto errhandler_io;
+   if (ferror(zStream)) goto errhandler_io;
+
+   while (True) {
+
+      bzf = BZ2_bzReadOpen (
+               &bzerr, zStream, verbosity,
+               (int)smallMode, unused, nUnused
+            );
+      if (bzf == NULL || bzerr != BZ_OK) goto errhandler;
+      streamNo++;
+
+      while (bzerr == BZ_OK) {
+         nread = BZ2_bzRead ( &bzerr, bzf, obuf, 5000 );
+         if (bzerr == BZ_DATA_ERROR_MAGIC) goto trycat;
+         if ((bzerr == BZ_OK || bzerr == BZ_STREAM_END) && nread > 0)
+            fwrite ( obuf, sizeof(UChar), nread, stream );
+         if (ferror(stream)) goto errhandler_io;
+      }
+      if (bzerr != BZ_STREAM_END) goto errhandler;
+
+      BZ2_bzReadGetUnused ( &bzerr, bzf, (void**)(&unusedTmp), &nUnused );
+      if (bzerr != BZ_OK) panic ( "decompress:bzReadGetUnused" );
+
+      for (i = 0; i < nUnused; i++) unused[i] = unusedTmp[i];
+
+      BZ2_bzReadClose ( &bzerr, bzf );
+      if (bzerr != BZ_OK) panic ( "decompress:bzReadGetUnused" );
+
+      if (nUnused == 0 && myfeof(zStream)) break;
+   }
+
+   closeok:
+   if (ferror(zStream)) goto errhandler_io;
+   ret = fclose ( zStream );
+   if (ret == EOF) goto errhandler_io;
+
+   if (ferror(stream)) goto errhandler_io;
+   ret = fflush ( stream );
+   if (ret != 0) goto errhandler_io;
+   if (stream != stdout) {
+      ret = fclose ( stream );
+      outputHandleJustInCase = NULL;
+      if (ret == EOF) goto errhandler_io;
+   }
+   outputHandleJustInCase = NULL;
+   if (verbosity >= 2) fprintf ( stderr, "\n    " );
+   return True;
+
+   trycat:
+   if (forceOverwrite) {
+      rewind(zStream);
+      while (True) {
+      	 if (myfeof(zStream)) break;
+      	 nread = fread ( obuf, sizeof(UChar), 5000, zStream );
+      	 if (ferror(zStream)) goto errhandler_io;
+      	 if (nread > 0) fwrite ( obuf, sizeof(UChar), nread, stream );
+      	 if (ferror(stream)) goto errhandler_io;
+      }
+      goto closeok;
+   }
+
+   errhandler:
+   BZ2_bzReadClose ( &bzerr_dummy, bzf );
+   switch (bzerr) {
+      case BZ_CONFIG_ERROR:
+         configError(); break;
+      case BZ_IO_ERROR:
+         errhandler_io:
+         ioError(); break;
+      case BZ_DATA_ERROR:
+         crcError();
+      case BZ_MEM_ERROR:
+         outOfMemory();
+      case BZ_UNEXPECTED_EOF:
+         compressedStreamEOF();
+      case BZ_DATA_ERROR_MAGIC:
+         if (zStream != stdin) fclose(zStream);
+         if (stream != stdout) fclose(stream);
+         if (streamNo == 1) {
+            return False;
+         } else {
+            if (noisy)
+            fprintf ( stderr,
+                      "\n%s: %s: trailing garbage after EOF ignored\n",
+                      progName, inName );
+            return True;
+         }
+      default:
+         panic ( "decompress:unexpected error" );
+   }
+
+   panic ( "decompress:end" );
+   return True; /*notreached*/
+}
+
+
+/*---------------------------------------------*/
+static
+Bool testStream ( FILE *zStream )
+{
+   BZFILE* bzf = NULL;
+   Int32   bzerr, bzerr_dummy, ret, nread, streamNo, i;
+   UChar   obuf[5000];
+   UChar   unused[BZ_MAX_UNUSED];
+   Int32   nUnused;
+   UChar*  unusedTmp;
+
+   nUnused = 0;
+   streamNo = 0;
+
+   SET_BINARY_MODE(zStream);
+   if (ferror(zStream)) goto errhandler_io;
+
+   while (True) {
+
+      bzf = BZ2_bzReadOpen (
+               &bzerr, zStream, verbosity,
+               (int)smallMode, unused, nUnused
+            );
+      if (bzf == NULL || bzerr != BZ_OK) goto errhandler;
+      streamNo++;
+
+      while (bzerr == BZ_OK) {
+         nread = BZ2_bzRead ( &bzerr, bzf, obuf, 5000 );
+         if (bzerr == BZ_DATA_ERROR_MAGIC) goto errhandler;
+      }
+      if (bzerr != BZ_STREAM_END) goto errhandler;
+
+      BZ2_bzReadGetUnused ( &bzerr, bzf, (void**)(&unusedTmp), &nUnused );
+      if (bzerr != BZ_OK) panic ( "test:bzReadGetUnused" );
+
+      for (i = 0; i < nUnused; i++) unused[i] = unusedTmp[i];
+
+      BZ2_bzReadClose ( &bzerr, bzf );
+      if (bzerr != BZ_OK) panic ( "test:bzReadGetUnused" );
+      if (nUnused == 0 && myfeof(zStream)) break;
+
+   }
+
+   if (ferror(zStream)) goto errhandler_io;
+   ret = fclose ( zStream );
+   if (ret == EOF) goto errhandler_io;
+
+   if (verbosity >= 2) fprintf ( stderr, "\n    " );
+   return True;
+
+   errhandler:
+   BZ2_bzReadClose ( &bzerr_dummy, bzf );
+   if (verbosity == 0)
+      fprintf ( stderr, "%s: %s: ", progName, inName );
+   switch (bzerr) {
+      case BZ_CONFIG_ERROR:
+         configError(); break;
+      case BZ_IO_ERROR:
+         errhandler_io:
+         ioError(); break;
+      case BZ_DATA_ERROR:
+         fprintf ( stderr,
+                   "data integrity (CRC) error in data\n" );
+         return False;
+      case BZ_MEM_ERROR:
+         outOfMemory();
+      case BZ_UNEXPECTED_EOF:
+         fprintf ( stderr,
+                   "file ends unexpectedly\n" );
+         return False;
+      case BZ_DATA_ERROR_MAGIC:
+         if (zStream != stdin) fclose(zStream);
+         if (streamNo == 1) {
+          fprintf ( stderr,
+                    "bad magic number (file not created by bzip2)\n" );
+            return False;
+         } else {
+            if (noisy)
+            fprintf ( stderr,
+                      "trailing garbage after EOF ignored\n" );
+            return True;
+         }
+      default:
+         panic ( "test:unexpected error" );
+   }
+
+   panic ( "test:end" );
+   return True; /*notreached*/
+}
+
+
+/*---------------------------------------------------*/
+/*--- Error [non-] handling grunge                ---*/
+/*---------------------------------------------------*/
+
+/*---------------------------------------------*/
+static
+void setExit ( Int32 v )
+{
+   if (v > exitValue) exitValue = v;
+}
+
+
+/*---------------------------------------------*/
+static
+void cadvise ( void )
+{
+   if (noisy)
+   fprintf (
+      stderr,
+      "\nIt is possible that the compressed file(s) have become corrupted.\n"
+        "You can use the -tvv option to test integrity of such files.\n\n"
+        "You can use the `bzip2recover' program to attempt to recover\n"
+        "data from undamaged sections of corrupted files.\n\n"
+    );
+}
+
+
+/*---------------------------------------------*/
+static
+void showFileNames ( void )
+{
+   if (noisy)
+   fprintf (
+      stderr,
+      "\tInput file = %s, output file = %s\n",
+      inName, outName
+   );
+}
+
+
+/*---------------------------------------------*/
+static
+void cleanUpAndFail ( Int32 ec )
+{
+   IntNative      retVal;
+   struct MY_STAT statBuf;
+
+   if ( srcMode == SM_F2F
+        && opMode != OM_TEST
+        && deleteOutputOnInterrupt ) {
+
+      /* Check whether input file still exists.  Delete output file
+         only if input exists to avoid loss of data.  Joerg Prante, 5
+         January 2002.  (JRS 06-Jan-2002: other changes in 1.0.2 mean
+         this is less likely to happen.  But to be ultra-paranoid, we
+         do the check anyway.)  */
+      retVal = MY_STAT ( inName, &statBuf );
+      if (retVal == 0) {
+         if (noisy)
+            fprintf ( stderr,
+                      "%s: Deleting output file %s, if it exists.\n",
+                      progName, outName );
+         if (outputHandleJustInCase != NULL)
+            fclose ( outputHandleJustInCase );
+         retVal = remove ( outName );
+         if (retVal != 0)
+            fprintf ( stderr,
+                      "%s: WARNING: deletion of output file "
+                      "(apparently) failed.\n",
+                      progName );
+      } else {
+         fprintf ( stderr,
+                   "%s: WARNING: deletion of output file suppressed\n",
+                    progName );
+         fprintf ( stderr,
+                   "%s:    since input file no longer exists.  Output file\n",
+                   progName );
+         fprintf ( stderr,
+                   "%s:    `%s' may be incomplete.\n",
+                   progName, outName );
+         fprintf ( stderr,
+                   "%s:    I suggest doing an integrity test (bzip2 -tv)"
+                   " of it.\n",
+                   progName );
+      }
+   }
+
+   if (noisy && numFileNames > 0 && numFilesProcessed < numFileNames) {
+      fprintf ( stderr,
+                "%s: WARNING: some files have not been processed:\n"
+                "%s:    %d specified on command line, %d not processed yet.\n\n",
+                progName, progName,
+                numFileNames, numFileNames - numFilesProcessed );
+   }
+   setExit(ec);
+   exit(exitValue);
+}
+
+
+/*---------------------------------------------*/
+static
+void panic ( Char* s )
+{
+   fprintf ( stderr,
+             "\n%s: PANIC -- internal consistency error:\n"
+             "\t%s\n"
+             "\tThis is a BUG.  Please report it to me at:\n"
+             "\tjseward@acm.org\n",
+             progName, s );
+   showFileNames();
+   cleanUpAndFail( 3 );
+}
+
+
+/*---------------------------------------------*/
+static
+void crcError ( void )
+{
+   fprintf ( stderr,
+             "\n%s: Data integrity error when decompressing.\n",
+             progName );
+   showFileNames();
+   cadvise();
+   cleanUpAndFail( 2 );
+}
+
+
+/*---------------------------------------------*/
+static
+void compressedStreamEOF ( void )
+{
+  if (noisy) {
+    fprintf ( stderr,
+	      "\n%s: Compressed file ends unexpectedly;\n\t"
+	      "perhaps it is corrupted?  *Possible* reason follows.\n",
+	      progName );
+    perror ( progName );
+    showFileNames();
+    cadvise();
+  }
+  cleanUpAndFail( 2 );
+}
+
+
+/*---------------------------------------------*/
+static
+void ioError ( void )
+{
+   fprintf ( stderr,
+             "\n%s: I/O or other error, bailing out.  "
+             "Possible reason follows.\n",
+             progName );
+   perror ( progName );
+   showFileNames();
+   cleanUpAndFail( 1 );
+}
+
+
+/*---------------------------------------------*/
+static
+void mySignalCatcher ( IntNative n )
+{
+   fprintf ( stderr,
+             "\n%s: Control-C or similar caught, quitting.\n",
+             progName );
+   cleanUpAndFail(1);
+}
+
+
+/*---------------------------------------------*/
+static
+void mySIGSEGVorSIGBUScatcher ( IntNative n )
+{
+   if (opMode == OM_Z)
+      fprintf (
+      stderr,
+      "\n%s: Caught a SIGSEGV or SIGBUS whilst compressing.\n"
+      "\n"
+      "   Possible causes are (most likely first):\n"
+      "   (1) This computer has unreliable memory or cache hardware\n"
+      "       (a surprisingly common problem; try a different machine.)\n"
+      "   (2) A bug in the compiler used to create this executable\n"
+      "       (unlikely, if you didn't compile bzip2 yourself.)\n"
+      "   (3) A real bug in bzip2 -- I hope this should never be the case.\n"
+      "   The user's manual, Section 4.3, has more info on (1) and (2).\n"
+      "   \n"
+      "   If you suspect this is a bug in bzip2, or are unsure about (1)\n"
+      "   or (2), feel free to report it to me at: jseward@acm.org.\n"
+      "   Section 4.3 of the user's manual describes the info a useful\n"
+      "   bug report should have.  If the manual is available on your\n"
+      "   system, please try and read it before mailing me.  If you don't\n"
+      "   have the manual or can't be bothered to read it, mail me anyway.\n"
+      "\n",
+      progName );
+      else
+      fprintf (
+      stderr,
+      "\n%s: Caught a SIGSEGV or SIGBUS whilst decompressing.\n"
+      "\n"
+      "   Possible causes are (most likely first):\n"
+      "   (1) The compressed data is corrupted, and bzip2's usual checks\n"
+      "       failed to detect this.  Try bzip2 -tvv my_file.bz2.\n"
+      "   (2) This computer has unreliable memory or cache hardware\n"
+      "       (a surprisingly common problem; try a different machine.)\n"
+      "   (3) A bug in the compiler used to create this executable\n"
+      "       (unlikely, if you didn't compile bzip2 yourself.)\n"
+      "   (4) A real bug in bzip2 -- I hope this should never be the case.\n"
+      "   The user's manual, Section 4.3, has more info on (2) and (3).\n"
+      "   \n"
+      "   If you suspect this is a bug in bzip2, or are unsure about (2)\n"
+      "   or (3), feel free to report it to me at: jseward@acm.org.\n"
+      "   Section 4.3 of the user's manual describes the info a useful\n"
+      "   bug report should have.  If the manual is available on your\n"
+      "   system, please try and read it before mailing me.  If you don't\n"
+      "   have the manual or can't be bothered to read it, mail me anyway.\n"
+      "\n",
+      progName );
+
+   showFileNames();
+   if (opMode == OM_Z)
+      cleanUpAndFail( 3 ); else
+      { cadvise(); cleanUpAndFail( 2 ); }
+}
+
+
+/*---------------------------------------------*/
+static
+void outOfMemory ( void )
+{
+   fprintf ( stderr,
+             "\n%s: couldn't allocate enough memory\n",
+             progName );
+   showFileNames();
+   cleanUpAndFail(1);
+}
+
+
+/*---------------------------------------------*/
+static
+void configError ( void )
+{
+   fprintf ( stderr,
+             "bzip2: I'm not configured correctly for this platform!\n"
+             "\tI require Int32, Int16 and Char to have sizes\n"
+             "\tof 4, 2 and 1 bytes to run properly, and they don't.\n"
+             "\tProbably you can fix this by defining them correctly,\n"
+             "\tand recompiling.  Bye!\n" );
+   setExit(3);
+   exit(exitValue);
+}
+
+
+/*---------------------------------------------------*/
+/*--- The main driver machinery                   ---*/
+/*---------------------------------------------------*/
+
+/* All rather crufty.  The main problem is that input files
+   are stat()d multiple times before use.  This should be
+   cleaned up.
+*/
+
+/*---------------------------------------------*/
+static
+void pad ( Char *s )
+{
+   Int32 i;
+   if ( (Int32)strlen(s) >= longestFileName ) return;
+   for (i = 1; i <= longestFileName - (Int32)strlen(s); i++)
+      fprintf ( stderr, " " );
+}
+
+
+/*---------------------------------------------*/
+static
+void copyFileName ( Char* to, Char* from )
+{
+   if ( strlen(from) > FILE_NAME_LEN-10 )  {
+      fprintf (
+         stderr,
+         "bzip2: file name\n`%s'\n"
+         "is suspiciously (more than %d chars) long.\n"
+         "Try using a reasonable file name instead.  Sorry! :-)\n",
+         from, FILE_NAME_LEN-10
+      );
+      setExit(1);
+      exit(exitValue);
+   }
+
+  strncpy(to,from,FILE_NAME_LEN-10);
+  to[FILE_NAME_LEN-10]='\0';
+}
+
+
+/*---------------------------------------------*/
+static
+Bool fileExists ( Char* name )
+{
+   FILE *tmp   = fopen ( name, "rb" );
+   Bool exists = (tmp != NULL);
+   if (tmp != NULL) fclose ( tmp );
+   return exists;
+}
+
+
+/*---------------------------------------------*/
+/* Open an output file safely with O_EXCL and good permissions.
+   This avoids a race condition in versions < 1.0.2, in which
+   the file was first opened and then had its interim permissions
+   set safely.  We instead use open() to create the file with
+   the interim permissions required. (--- --- rw-).
+
+   For non-Unix platforms, if we are not worrying about
+   security issues, simple this simply behaves like fopen.
+*/
+FILE* fopen_output_safely ( Char* name, const char* mode )
+{
+#  if BZ_UNIX
+   FILE*     fp;
+   IntNative fh;
+   fh = open(name, O_WRONLY|O_CREAT|O_EXCL, S_IWUSR|S_IRUSR);
+   if (fh == -1) return NULL;
+   fp = fdopen(fh, mode);
+   if (fp == NULL) close(fh);
+   return fp;
+#  else
+   return fopen(name, mode);
+#  endif
+}
+
+
+/*---------------------------------------------*/
+/*--
+  if in doubt, return True
+--*/
+static
+Bool notAStandardFile ( Char* name )
+{
+   IntNative      i;
+   struct MY_STAT statBuf;
+
+   i = MY_LSTAT ( name, &statBuf );
+   if (i != 0) return True;
+   if (MY_S_ISREG(statBuf.st_mode)) return False;
+   return True;
+}
+
+
+/*---------------------------------------------*/
+/*--
+  rac 11/21/98 see if file has hard links to it
+--*/
+static
+Int32 countHardLinks ( Char* name )
+{
+   IntNative      i;
+   struct MY_STAT statBuf;
+
+   i = MY_LSTAT ( name, &statBuf );
+   if (i != 0) return 0;
+   return (statBuf.st_nlink - 1);
+}
+
+
+/*---------------------------------------------*/
+/* Copy modification date, access date, permissions and owner from the
+   source to destination file.  We have to copy this meta-info off
+   into fileMetaInfo before starting to compress / decompress it,
+   because doing it afterwards means we get the wrong access time.
+
+   To complicate matters, in compress() and decompress() below, the
+   sequence of tests preceding the call to saveInputFileMetaInfo()
+   involves calling fileExists(), which in turn establishes its result
+   by attempting to fopen() the file, and if successful, immediately
+   fclose()ing it again.  So we have to assume that the fopen() call
+   does not cause the access time field to be updated.
+
+   Reading of the man page for stat() (man 2 stat) on RedHat 7.2 seems
+   to imply that merely doing open() will not affect the access time.
+   Therefore we merely need to hope that the C library only does
+   open() as a result of fopen(), and not any kind of read()-ahead
+   cleverness.
+
+   It sounds pretty fragile to me.  Whether this carries across
+   robustly to arbitrary Unix-like platforms (or even works robustly
+   on this one, RedHat 7.2) is unknown to me.  Nevertheless ...
+*/
+#if BZ_UNIX
+static
+struct MY_STAT fileMetaInfo;
+#endif
+
+static
+void saveInputFileMetaInfo ( Char *srcName )
+{
+#  if BZ_UNIX
+   IntNative retVal;
+   /* Note use of stat here, not lstat. */
+   retVal = MY_STAT( srcName, &fileMetaInfo );
+   ERROR_IF_NOT_ZERO ( retVal );
+#  endif
+}
+
+
+static
+void applySavedMetaInfoToOutputFile ( Char *dstName )
+{
+#  if BZ_UNIX
+   IntNative      retVal;
+   struct utimbuf uTimBuf;
+
+   uTimBuf.actime = fileMetaInfo.st_atime;
+   uTimBuf.modtime = fileMetaInfo.st_mtime;
+
+   retVal = chmod ( dstName, fileMetaInfo.st_mode );
+   ERROR_IF_NOT_ZERO ( retVal );
+
+   retVal = utime ( dstName, &uTimBuf );
+   ERROR_IF_NOT_ZERO ( retVal );
+
+   retVal = chown ( dstName, fileMetaInfo.st_uid, fileMetaInfo.st_gid );
+   /* chown() will in many cases return with EPERM, which can
+      be safely ignored.
+   */
+#  endif
+}
+
+
+/*---------------------------------------------*/
+static
+Bool containsDubiousChars ( Char* name )
+{
+#  if BZ_UNIX
+   /* On unix, files can contain any characters and the file expansion
+    * is performed by the shell.
+    */
+   return False;
+#  else /* ! BZ_UNIX */
+   /* On non-unix (Win* platforms), wildcard characters are not allowed in
+    * filenames.
+    */
+   for (; *name != '\0'; name++)
+      if (*name == '?' || *name == '*') return True;
+   return False;
+#  endif /* BZ_UNIX */
+}
+
+
+/*---------------------------------------------*/
+#define BZ_N_SUFFIX_PAIRS 4
+
+Char* zSuffix[BZ_N_SUFFIX_PAIRS]
+   = { ".bz2", ".bz", ".tbz2", ".tbz" };
+Char* unzSuffix[BZ_N_SUFFIX_PAIRS]
+   = { "", "", ".tar", ".tar" };
+
+static
+Bool hasSuffix ( Char* s, Char* suffix )
+{
+   Int32 ns = strlen(s);
+   Int32 nx = strlen(suffix);
+   if (ns < nx) return False;
+   if (strcmp(s + ns - nx, suffix) == 0) return True;
+   return False;
+}
+
+static
+Bool mapSuffix ( Char* name,
+                 Char* oldSuffix, Char* newSuffix )
+{
+   if (!hasSuffix(name,oldSuffix)) return False;
+   name[strlen(name)-strlen(oldSuffix)] = 0;
+   strcat ( name, newSuffix );
+   return True;
+}
+
+
+/*---------------------------------------------*/
+static
+void compress ( Char *name )
+{
+   FILE  *inStr;
+   FILE  *outStr;
+   Int32 n, i;
+   struct MY_STAT statBuf;
+
+   deleteOutputOnInterrupt = False;
+
+   if (name == NULL && srcMode != SM_I2O)
+      panic ( "compress: bad modes\n" );
+
+   switch (srcMode) {
+      case SM_I2O:
+         copyFileName ( inName, "(stdin)" );
+         copyFileName ( outName, "(stdout)" );
+         break;
+      case SM_F2F:
+         copyFileName ( inName, name );
+         copyFileName ( outName, name );
+         strcat ( outName, ".bz2" );
+         break;
+      case SM_F2O:
+         copyFileName ( inName, name );
+         copyFileName ( outName, "(stdout)" );
+         break;
+   }
+
+   if ( srcMode != SM_I2O && containsDubiousChars ( inName ) ) {
+      if (noisy)
+      fprintf ( stderr, "%s: There are no files matching `%s'.\n",
+                progName, inName );
+      setExit(1);
+      return;
+   }
+   if ( srcMode != SM_I2O && !fileExists ( inName ) ) {
+      fprintf ( stderr, "%s: Can't open input file %s: %s.\n",
+                progName, inName, strerror(errno) );
+      setExit(1);
+      return;
+   }
+   for (i = 0; i < BZ_N_SUFFIX_PAIRS; i++) {
+      if (hasSuffix(inName, zSuffix[i])) {
+         if (noisy)
+         fprintf ( stderr,
+                   "%s: Input file %s already has %s suffix.\n",
+                   progName, inName, zSuffix[i] );
+         setExit(1);
+         return;
+      }
+   }
+   if ( srcMode == SM_F2F || srcMode == SM_F2O ) {
+      MY_STAT(inName, &statBuf);
+      if ( MY_S_ISDIR(statBuf.st_mode) ) {
+         fprintf( stderr,
+                  "%s: Input file %s is a directory.\n",
+                  progName,inName);
+         setExit(1);
+         return;
+      }
+   }
+   if ( srcMode == SM_F2F && !forceOverwrite && notAStandardFile ( inName )) {
+      if (noisy)
+      fprintf ( stderr, "%s: Input file %s is not a normal file.\n",
+                progName, inName );
+      setExit(1);
+      return;
+   }
+   if ( srcMode == SM_F2F && fileExists ( outName ) ) {
+      if (forceOverwrite) {
+	 remove(outName);
+      } else {
+	 fprintf ( stderr, "%s: Output file %s already exists.\n",
+		   progName, outName );
+	 setExit(1);
+	 return;
+      }
+   }
+   if ( srcMode == SM_F2F && !forceOverwrite &&
+        (n=countHardLinks ( inName )) > 0) {
+      fprintf ( stderr, "%s: Input file %s has %d other link%s.\n",
+                progName, inName, n, n > 1 ? "s" : "" );
+      setExit(1);
+      return;
+   }
+
+   if ( srcMode == SM_F2F ) {
+      /* Save the file's meta-info before we open it.  Doing it later
+         means we mess up the access times. */
+      saveInputFileMetaInfo ( inName );
+   }
+
+   switch ( srcMode ) {
+
+      case SM_I2O:
+         inStr = stdin;
+         outStr = stdout;
+         if ( isatty ( fileno ( stdout ) ) ) {
+            fprintf ( stderr,
+                      "%s: I won't write compressed data to a terminal.\n",
+                      progName );
+            fprintf ( stderr, "%s: For help, type: `%s --help'.\n",
+                              progName, progName );
+            setExit(1);
+            return;
+         };
+         break;
+
+      case SM_F2O:
+         inStr = fopen ( inName, "rb" );
+         outStr = stdout;
+         if ( isatty ( fileno ( stdout ) ) ) {
+            fprintf ( stderr,
+                      "%s: I won't write compressed data to a terminal.\n",
+                      progName );
+            fprintf ( stderr, "%s: For help, type: `%s --help'.\n",
+                              progName, progName );
+            if ( inStr != NULL ) fclose ( inStr );
+            setExit(1);
+            return;
+         };
+         if ( inStr == NULL ) {
+            fprintf ( stderr, "%s: Can't open input file %s: %s.\n",
+                      progName, inName, strerror(errno) );
+            setExit(1);
+            return;
+         };
+         break;
+
+      case SM_F2F:
+         inStr = fopen ( inName, "rb" );
+         outStr = fopen_output_safely ( outName, "wb" );
+         if ( outStr == NULL) {
+            fprintf ( stderr, "%s: Can't create output file %s: %s.\n",
+                      progName, outName, strerror(errno) );
+            if ( inStr != NULL ) fclose ( inStr );
+            setExit(1);
+            return;
+         }
+         if ( inStr == NULL ) {
+            fprintf ( stderr, "%s: Can't open input file %s: %s.\n",
+                      progName, inName, strerror(errno) );
+            if ( outStr != NULL ) fclose ( outStr );
+            setExit(1);
+            return;
+         };
+         break;
+
+      default:
+         panic ( "compress: bad srcMode" );
+         break;
+   }
+
+   if (verbosity >= 1) {
+      fprintf ( stderr,  "  %s: ", inName );
+      pad ( inName );
+      fflush ( stderr );
+   }
+
+   /*--- Now the input and output handles are sane.  Do the Biz. ---*/
+   outputHandleJustInCase = outStr;
+   deleteOutputOnInterrupt = True;
+   compressStream ( inStr, outStr );
+   outputHandleJustInCase = NULL;
+
+   /*--- If there was an I/O error, we won't get here. ---*/
+   if ( srcMode == SM_F2F ) {
+      applySavedMetaInfoToOutputFile ( outName );
+      deleteOutputOnInterrupt = False;
+      if ( !keepInputFiles ) {
+         IntNative retVal = remove ( inName );
+         ERROR_IF_NOT_ZERO ( retVal );
+      }
+   }
+
+   deleteOutputOnInterrupt = False;
+}
+
+
+/*---------------------------------------------*/
+static
+void uncompress ( Char *name )
+{
+   FILE  *inStr;
+   FILE  *outStr;
+   Int32 n, i;
+   Bool  magicNumberOK;
+   Bool  cantGuess;
+   struct MY_STAT statBuf;
+
+   deleteOutputOnInterrupt = False;
+
+   if (name == NULL && srcMode != SM_I2O)
+      panic ( "uncompress: bad modes\n" );
+
+   cantGuess = False;
+   switch (srcMode) {
+      case SM_I2O:
+         copyFileName ( inName, "(stdin)" );
+         copyFileName ( outName, "(stdout)" );
+         break;
+      case SM_F2F:
+         copyFileName ( inName, name );
+         copyFileName ( outName, name );
+         for (i = 0; i < BZ_N_SUFFIX_PAIRS; i++)
+            if (mapSuffix(outName,zSuffix[i],unzSuffix[i]))
+               goto zzz;
+         cantGuess = True;
+         strcat ( outName, ".out" );
+         break;
+      case SM_F2O:
+         copyFileName ( inName, name );
+         copyFileName ( outName, "(stdout)" );
+         break;
+   }
+
+   zzz:
+   if ( srcMode != SM_I2O && containsDubiousChars ( inName ) ) {
+      if (noisy)
+      fprintf ( stderr, "%s: There are no files matching `%s'.\n",
+                progName, inName );
+      setExit(1);
+      return;
+   }
+   if ( srcMode != SM_I2O && !fileExists ( inName ) ) {
+      fprintf ( stderr, "%s: Can't open input file %s: %s.\n",
+                progName, inName, strerror(errno) );
+      setExit(1);
+      return;
+   }
+   if ( srcMode == SM_F2F || srcMode == SM_F2O ) {
+      MY_STAT(inName, &statBuf);
+      if ( MY_S_ISDIR(statBuf.st_mode) ) {
+         fprintf( stderr,
+                  "%s: Input file %s is a directory.\n",
+                  progName,inName);
+         setExit(1);
+         return;
+      }
+   }
+   if ( srcMode == SM_F2F && !forceOverwrite && notAStandardFile ( inName )) {
+      if (noisy)
+      fprintf ( stderr, "%s: Input file %s is not a normal file.\n",
+                progName, inName );
+      setExit(1);
+      return;
+   }
+   if ( /* srcMode == SM_F2F implied && */ cantGuess ) {
+      if (noisy)
+      fprintf ( stderr,
+                "%s: Can't guess original name for %s -- using %s\n",
+                progName, inName, outName );
+      /* just a warning, no return */
+   }
+   if ( srcMode == SM_F2F && fileExists ( outName ) ) {
+      if (forceOverwrite) {
+	remove(outName);
+      } else {
+        fprintf ( stderr, "%s: Output file %s already exists.\n",
+                  progName, outName );
+        setExit(1);
+        return;
+      }
+   }
+   if ( srcMode == SM_F2F && !forceOverwrite &&
+        (n=countHardLinks ( inName ) ) > 0) {
+      fprintf ( stderr, "%s: Input file %s has %d other link%s.\n",
+                progName, inName, n, n > 1 ? "s" : "" );
+      setExit(1);
+      return;
+   }
+
+   if ( srcMode == SM_F2F ) {
+      /* Save the file's meta-info before we open it.  Doing it later
+         means we mess up the access times. */
+      saveInputFileMetaInfo ( inName );
+   }
+
+   switch ( srcMode ) {
+
+      case SM_I2O:
+         inStr = stdin;
+         outStr = stdout;
+         if ( isatty ( fileno ( stdin ) ) ) {
+            fprintf ( stderr,
+                      "%s: I won't read compressed data from a terminal.\n",
+                      progName );
+            fprintf ( stderr, "%s: For help, type: `%s --help'.\n",
+                              progName, progName );
+            setExit(1);
+            return;
+         };
+         break;
+
+      case SM_F2O:
+         inStr = fopen ( inName, "rb" );
+         outStr = stdout;
+         if ( inStr == NULL ) {
+            fprintf ( stderr, "%s: Can't open input file %s:%s.\n",
+                      progName, inName, strerror(errno) );
+            if ( inStr != NULL ) fclose ( inStr );
+            setExit(1);
+            return;
+         };
+         break;
+
+      case SM_F2F:
+         inStr = fopen ( inName, "rb" );
+         outStr = fopen_output_safely ( outName, "wb" );
+         if ( outStr == NULL) {
+            fprintf ( stderr, "%s: Can't create output file %s: %s.\n",
+                      progName, outName, strerror(errno) );
+            if ( inStr != NULL ) fclose ( inStr );
+            setExit(1);
+            return;
+         }
+         if ( inStr == NULL ) {
+            fprintf ( stderr, "%s: Can't open input file %s: %s.\n",
+                      progName, inName, strerror(errno) );
+            if ( outStr != NULL ) fclose ( outStr );
+            setExit(1);
+            return;
+         };
+         break;
+
+      default:
+         panic ( "uncompress: bad srcMode" );
+         break;
+   }
+
+   if (verbosity >= 1) {
+      fprintf ( stderr, "  %s: ", inName );
+      pad ( inName );
+      fflush ( stderr );
+   }
+
+   /*--- Now the input and output handles are sane.  Do the Biz. ---*/
+   outputHandleJustInCase = outStr;
+   deleteOutputOnInterrupt = True;
+   magicNumberOK = uncompressStream ( inStr, outStr );
+   outputHandleJustInCase = NULL;
+
+   /*--- If there was an I/O error, we won't get here. ---*/
+   if ( magicNumberOK ) {
+      if ( srcMode == SM_F2F ) {
+         applySavedMetaInfoToOutputFile ( outName );
+         deleteOutputOnInterrupt = False;
+         if ( !keepInputFiles ) {
+            IntNative retVal = remove ( inName );
+            ERROR_IF_NOT_ZERO ( retVal );
+         }
+      }
+   } else {
+      unzFailsExist = True;
+      deleteOutputOnInterrupt = False;
+      if ( srcMode == SM_F2F ) {
+         IntNative retVal = remove ( outName );
+         ERROR_IF_NOT_ZERO ( retVal );
+      }
+   }
+   deleteOutputOnInterrupt = False;
+
+   if ( magicNumberOK ) {
+      if (verbosity >= 1)
+         fprintf ( stderr, "done\n" );
+   } else {
+      setExit(2);
+      if (verbosity >= 1)
+         fprintf ( stderr, "not a bzip2 file.\n" ); else
+         fprintf ( stderr,
+                   "%s: %s is not a bzip2 file.\n",
+                   progName, inName );
+   }
+
+}
+
+
+/*---------------------------------------------*/
+static
+void testf ( Char *name )
+{
+   FILE *inStr;
+   Bool allOK;
+   struct MY_STAT statBuf;
+
+   deleteOutputOnInterrupt = False;
+
+   if (name == NULL && srcMode != SM_I2O)
+      panic ( "testf: bad modes\n" );
+
+   copyFileName ( outName, "(none)" );
+   switch (srcMode) {
+      case SM_I2O: copyFileName ( inName, "(stdin)" ); break;
+      case SM_F2F: copyFileName ( inName, name ); break;
+      case SM_F2O: copyFileName ( inName, name ); break;
+   }
+
+   if ( srcMode != SM_I2O && containsDubiousChars ( inName ) ) {
+      if (noisy)
+      fprintf ( stderr, "%s: There are no files matching `%s'.\n",
+                progName, inName );
+      setExit(1);
+      return;
+   }
+   if ( srcMode != SM_I2O && !fileExists ( inName ) ) {
+      fprintf ( stderr, "%s: Can't open input %s: %s.\n",
+                progName, inName, strerror(errno) );
+      setExit(1);
+      return;
+   }
+   if ( srcMode != SM_I2O ) {
+      MY_STAT(inName, &statBuf);
+      if ( MY_S_ISDIR(statBuf.st_mode) ) {
+         fprintf( stderr,
+                  "%s: Input file %s is a directory.\n",
+                  progName,inName);
+         setExit(1);
+         return;
+      }
+   }
+
+   switch ( srcMode ) {
+
+      case SM_I2O:
+         if ( isatty ( fileno ( stdin ) ) ) {
+            fprintf ( stderr,
+                      "%s: I won't read compressed data from a terminal.\n",
+                      progName );
+            fprintf ( stderr, "%s: For help, type: `%s --help'.\n",
+                              progName, progName );
+            setExit(1);
+            return;
+         };
+         inStr = stdin;
+         break;
+
+      case SM_F2O: case SM_F2F:
+         inStr = fopen ( inName, "rb" );
+         if ( inStr == NULL ) {
+            fprintf ( stderr, "%s: Can't open input file %s:%s.\n",
+                      progName, inName, strerror(errno) );
+            setExit(1);
+            return;
+         };
+         break;
+
+      default:
+         panic ( "testf: bad srcMode" );
+         break;
+   }
+
+   if (verbosity >= 1) {
+      fprintf ( stderr, "  %s: ", inName );
+      pad ( inName );
+      fflush ( stderr );
+   }
+
+   /*--- Now the input handle is sane.  Do the Biz. ---*/
+   outputHandleJustInCase = NULL;
+   allOK = testStream ( inStr );
+
+   if (allOK && verbosity >= 1) fprintf ( stderr, "ok\n" );
+   if (!allOK) testFailsExist = True;
+}
+
+
+/*---------------------------------------------*/
+static
+void license ( void )
+{
+   fprintf ( stderr,
+
+    "bzip2, a block-sorting file compressor.  "
+    "Version %s.\n"
+    "   \n"
+    "   Copyright (C) 1996-2002 by Julian Seward.\n"
+    "   \n"
+    "   This program is free software; you can redistribute it and/or modify\n"
+    "   it under the terms set out in the LICENSE file, which is included\n"
+    "   in the bzip2-1.0 source distribution.\n"
+    "   \n"
+    "   This program is distributed in the hope that it will be useful,\n"
+    "   but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+    "   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
+    "   LICENSE file for more details.\n"
+    "   \n",
+    BZ2_bzlibVersion()
+   );
+}
+
+
+/*---------------------------------------------*/
+static
+void usage ( Char *fullProgName )
+{
+   fprintf (
+      stderr,
+      "bzip2, a block-sorting file compressor.  "
+      "Version %s.\n"
+      "\n   usage: %s [flags and input files in any order]\n"
+      "\n"
+      "   -h --help           print this message\n"
+      "   -d --decompress     force decompression\n"
+      "   -z --compress       force compression\n"
+      "   -k --keep           keep (don't delete) input files\n"
+      "   -f --force          overwrite existing output files\n"
+      "   -t --test           test compressed file integrity\n"
+      "   -c --stdout         output to standard out\n"
+      "   -q --quiet          suppress noncritical error messages\n"
+      "   -v --verbose        be verbose (a 2nd -v gives more)\n"
+      "   -L --license        display software version & license\n"
+      "   -V --version        display software version & license\n"
+      "   -s --small          use less memory (at most 2500k)\n"
+      "   -1 .. -9            set block size to 100k .. 900k\n"
+      "   --fast              alias for -1\n"
+      "   --best              alias for -9\n"
+      "\n"
+      "   If invoked as `bzip2', default action is to compress.\n"
+      "              as `bunzip2',  default action is to decompress.\n"
+      "              as `bzcat', default action is to decompress to stdout.\n"
+      "\n"
+      "   If no file names are given, bzip2 compresses or decompresses\n"
+      "   from standard input to standard output.  You can combine\n"
+      "   short flags, so `-v -4' means the same as -v4 or -4v, &c.\n"
+#     if BZ_UNIX
+      "\n"
+#     endif
+      ,
+
+      BZ2_bzlibVersion(),
+      fullProgName
+   );
+}
+
+
+/*---------------------------------------------*/
+static
+void redundant ( Char* flag )
+{
+   fprintf (
+      stderr,
+      "%s: %s is redundant in versions 0.9.5 and above\n",
+      progName, flag );
+}
+
+
+/*---------------------------------------------*/
+/*--
+  All the garbage from here to main() is purely to
+  implement a linked list of command-line arguments,
+  into which main() copies argv[1 .. argc-1].
+
+  The purpose of this exercise is to facilitate
+  the expansion of wildcard characters * and ? in
+  filenames for OSs which don't know how to do it
+  themselves, like MSDOS, Windows 95 and NT.
+
+  The actual Dirty Work is done by the platform-
+  specific macro APPEND_FILESPEC.
+--*/
+
+typedef
+   struct zzzz {
+      Char        *name;
+      struct zzzz *link;
+   }
+   Cell;
+
+
+/*---------------------------------------------*/
+static
+void *myMalloc ( Int32 n )
+{
+   void* p;
+
+   p = malloc ( (size_t)n );
+   if (p == NULL) outOfMemory ();
+   return p;
+}
+
+
+/*---------------------------------------------*/
+static
+Cell *mkCell ( void )
+{
+   Cell *c;
+
+   c = (Cell*) myMalloc ( sizeof ( Cell ) );
+   c->name = NULL;
+   c->link = NULL;
+   return c;
+}
+
+
+/*---------------------------------------------*/
+static
+Cell *snocString ( Cell *root, Char *name )
+{
+   if (root == NULL) {
+      Cell *tmp = mkCell();
+      tmp->name = (Char*) myMalloc ( 5 + strlen(name) );
+      strcpy ( tmp->name, name );
+      return tmp;
+   } else {
+      Cell *tmp = root;
+      while (tmp->link != NULL) tmp = tmp->link;
+      tmp->link = snocString ( tmp->link, name );
+      return root;
+   }
+}
+
+
+/*---------------------------------------------*/
+static
+void addFlagsFromEnvVar ( Cell** argList, Char* varName )
+{
+   Int32 i, j, k;
+   Char *envbase, *p;
+
+   envbase = getenv(varName);
+   if (envbase != NULL) {
+      p = envbase;
+      i = 0;
+      while (True) {
+         if (p[i] == 0) break;
+         p += i;
+         i = 0;
+         while (isspace((Int32)(p[0]))) p++;
+         while (p[i] != 0 && !isspace((Int32)(p[i]))) i++;
+         if (i > 0) {
+            k = i; if (k > FILE_NAME_LEN-10) k = FILE_NAME_LEN-10;
+            for (j = 0; j < k; j++) tmpName[j] = p[j];
+            tmpName[k] = 0;
+            APPEND_FLAG(*argList, tmpName);
+         }
+      }
+   }
+}
+
+
+/*---------------------------------------------*/
+#define ISFLAG(s) (strcmp(aa->name, (s))==0)
+
+IntNative main ( IntNative argc, Char *argv[] )
+{
+   Int32  i, j;
+   Char   *tmp;
+   Cell   *argList;
+   Cell   *aa;
+   Bool   decode;
+
+   /*-- Be really really really paranoid :-) --*/
+   if (sizeof(Int32) != 4 || sizeof(UInt32) != 4  ||
+       sizeof(Int16) != 2 || sizeof(UInt16) != 2  ||
+       sizeof(Char)  != 1 || sizeof(UChar)  != 1)
+      configError();
+
+   /*-- Initialise --*/
+   outputHandleJustInCase  = NULL;
+   smallMode               = False;
+   keepInputFiles          = False;
+   forceOverwrite          = False;
+   noisy                   = True;
+   verbosity               = 0;
+   blockSize100k           = 9;
+   testFailsExist          = False;
+   unzFailsExist           = False;
+   numFileNames            = 0;
+   numFilesProcessed       = 0;
+   workFactor              = 30;
+   deleteOutputOnInterrupt = False;
+   exitValue               = 0;
+   i = j = 0; /* avoid bogus warning from egcs-1.1.X */
+
+   /*-- Set up signal handlers for mem access errors --*/
+   signal (SIGSEGV, mySIGSEGVorSIGBUScatcher);
+#  if BZ_UNIX
+#  ifndef __DJGPP__
+   signal (SIGBUS,  mySIGSEGVorSIGBUScatcher);
+#  endif
+#  endif
+
+   copyFileName ( inName,  "(none)" );
+   copyFileName ( outName, "(none)" );
+
+   copyFileName ( progNameReally, argv[0] );
+   progName = &progNameReally[0];
+   for (tmp = &progNameReally[0]; *tmp != '\0'; tmp++)
+      if (*tmp == PATH_SEP) progName = tmp + 1;
+
+
+   /*-- Copy flags from env var BZIP2, and
+        expand filename wildcards in arg list.
+   --*/
+   argList = NULL;
+   addFlagsFromEnvVar ( &argList,  "BZIP2" );
+   addFlagsFromEnvVar ( &argList,  "BZIP" );
+   for (i = 1; i <= argc-1; i++)
+      APPEND_FILESPEC(argList, argv[i]);
+
+
+   /*-- Find the length of the longest filename --*/
+   longestFileName = 7;
+   numFileNames    = 0;
+   decode          = True;
+   for (aa = argList; aa != NULL; aa = aa->link) {
+      if (ISFLAG("--")) { decode = False; continue; }
+      if (aa->name[0] == '-' && decode) continue;
+      numFileNames++;
+      if (longestFileName < (Int32)strlen(aa->name) )
+         longestFileName = (Int32)strlen(aa->name);
+   }
+
+
+   /*-- Determine source modes; flag handling may change this too. --*/
+   if (numFileNames == 0)
+      srcMode = SM_I2O; else srcMode = SM_F2F;
+
+
+   /*-- Determine what to do (compress/uncompress/test/cat). --*/
+   /*-- Note that subsequent flag handling may change this. --*/
+   opMode = OM_Z;
+
+   if ( (strstr ( progName, "unzip" ) != 0) ||
+        (strstr ( progName, "UNZIP" ) != 0) )
+      opMode = OM_UNZ;
+
+   if ( (strstr ( progName, "z2cat" ) != 0) ||
+        (strstr ( progName, "Z2CAT" ) != 0) ||
+        (strstr ( progName, "zcat" ) != 0)  ||
+        (strstr ( progName, "ZCAT" ) != 0) )  {
+      opMode = OM_UNZ;
+      srcMode = (numFileNames == 0) ? SM_I2O : SM_F2O;
+   }
+
+
+   /*-- Look at the flags. --*/
+   for (aa = argList; aa != NULL; aa = aa->link) {
+      if (ISFLAG("--")) break;
+      if (aa->name[0] == '-' && aa->name[1] != '-') {
+         for (j = 1; aa->name[j] != '\0'; j++) {
+            switch (aa->name[j]) {
+               case 'c': srcMode          = SM_F2O; break;
+               case 'd': opMode           = OM_UNZ; break;
+               case 'z': opMode           = OM_Z; break;
+               case 'f': forceOverwrite   = True; break;
+               case 't': opMode           = OM_TEST; break;
+               case 'k': keepInputFiles   = True; break;
+               case 's': smallMode        = True; break;
+               case 'q': noisy            = False; break;
+               case '1': blockSize100k    = 1; break;
+               case '2': blockSize100k    = 2; break;
+               case '3': blockSize100k    = 3; break;
+               case '4': blockSize100k    = 4; break;
+               case '5': blockSize100k    = 5; break;
+               case '6': blockSize100k    = 6; break;
+               case '7': blockSize100k    = 7; break;
+               case '8': blockSize100k    = 8; break;
+               case '9': blockSize100k    = 9; break;
+               case 'V':
+               case 'L': license();            break;
+               case 'v': verbosity++; break;
+               case 'h': usage ( progName );
+                         exit ( 0 );
+                         break;
+               default:  fprintf ( stderr, "%s: Bad flag `%s'\n",
+                                   progName, aa->name );
+                         usage ( progName );
+                         exit ( 1 );
+                         break;
+            }
+         }
+      }
+   }
+
+   /*-- And again ... --*/
+   for (aa = argList; aa != NULL; aa = aa->link) {
+      if (ISFLAG("--")) break;
+      if (ISFLAG("--stdout"))            srcMode          = SM_F2O;  else
+      if (ISFLAG("--decompress"))        opMode           = OM_UNZ;  else
+      if (ISFLAG("--compress"))          opMode           = OM_Z;    else
+      if (ISFLAG("--force"))             forceOverwrite   = True;    else
+      if (ISFLAG("--test"))              opMode           = OM_TEST; else
+      if (ISFLAG("--keep"))              keepInputFiles   = True;    else
+      if (ISFLAG("--small"))             smallMode        = True;    else
+      if (ISFLAG("--quiet"))             noisy            = False;   else
+      if (ISFLAG("--version"))           license();                  else
+      if (ISFLAG("--license"))           license();                  else
+      if (ISFLAG("--exponential"))       workFactor = 1;             else
+      if (ISFLAG("--repetitive-best"))   redundant(aa->name);        else
+      if (ISFLAG("--repetitive-fast"))   redundant(aa->name);        else
+      if (ISFLAG("--fast"))              blockSize100k = 1;          else
+      if (ISFLAG("--best"))              blockSize100k = 9;          else
+      if (ISFLAG("--verbose"))           verbosity++;                else
+      if (ISFLAG("--help"))              { usage ( progName ); exit ( 0 ); }
+         else
+         if (strncmp ( aa->name, "--", 2) == 0) {
+            fprintf ( stderr, "%s: Bad flag `%s'\n", progName, aa->name );
+            usage ( progName );
+            exit ( 1 );
+         }
+   }
+
+   if (verbosity > 4) verbosity = 4;
+   if (opMode == OM_Z && smallMode && blockSize100k > 2)
+      blockSize100k = 2;
+
+   if (opMode == OM_TEST && srcMode == SM_F2O) {
+      fprintf ( stderr, "%s: -c and -t cannot be used together.\n",
+                progName );
+      exit ( 1 );
+   }
+
+   if (srcMode == SM_F2O && numFileNames == 0)
+      srcMode = SM_I2O;
+
+   if (opMode != OM_Z) blockSize100k = 0;
+
+   if (srcMode == SM_F2F) {
+      signal (SIGINT,  mySignalCatcher);
+      signal (SIGTERM, mySignalCatcher);
+#     if BZ_UNIX
+      signal (SIGHUP,  mySignalCatcher);
+#     endif
+   }
+
+   if (opMode == OM_Z) {
+     if (srcMode == SM_I2O) {
+        compress ( NULL );
+     } else {
+        decode = True;
+        for (aa = argList; aa != NULL; aa = aa->link) {
+           if (ISFLAG("--")) { decode = False; continue; }
+           if (aa->name[0] == '-' && decode) continue;
+           numFilesProcessed++;
+           compress ( aa->name );
+        }
+     }
+   }
+   else
+
+   if (opMode == OM_UNZ) {
+      unzFailsExist = False;
+      if (srcMode == SM_I2O) {
+         uncompress ( NULL );
+      } else {
+         decode = True;
+         for (aa = argList; aa != NULL; aa = aa->link) {
+            if (ISFLAG("--")) { decode = False; continue; }
+            if (aa->name[0] == '-' && decode) continue;
+            numFilesProcessed++;
+            uncompress ( aa->name );
+         }
+      }
+      if (unzFailsExist) {
+         setExit(2);
+         exit(exitValue);
+      }
+   }
+
+   else {
+      testFailsExist = False;
+      if (srcMode == SM_I2O) {
+         testf ( NULL );
+      } else {
+         decode = True;
+         for (aa = argList; aa != NULL; aa = aa->link) {
+	    if (ISFLAG("--")) { decode = False; continue; }
+            if (aa->name[0] == '-' && decode) continue;
+            numFilesProcessed++;
+            testf ( aa->name );
+	 }
+      }
+      if (testFailsExist && noisy) {
+         fprintf ( stderr,
+           "\n"
+           "You can use the `bzip2recover' program to attempt to recover\n"
+           "data from undamaged sections of corrupted files.\n\n"
+         );
+         setExit(2);
+         exit(exitValue);
+      }
+   }
+
+   /* Free the argument list memory to mollify leak detectors
+      (eg) Purify, Checker.  Serves no other useful purpose.
+   */
+   aa = argList;
+   while (aa != NULL) {
+      Cell* aa2 = aa->link;
+      if (aa->name != NULL) free(aa->name);
+      free(aa);
+      aa = aa2;
+   }
+
+   return exitValue;
+}
+
+
+/*-----------------------------------------------------------*/
+/*--- end                                         bzip2.c ---*/
+/*-----------------------------------------------------------*/
diff --git a/uppsrc/plugin/bz2/lib/bzip2recover.c b/uppsrc/plugin/bz2/lib/bzip2recover.c
new file mode 100644
index 000000000..586534f9a
--- /dev/null
+++ b/uppsrc/plugin/bz2/lib/bzip2recover.c
@@ -0,0 +1,546 @@
+
+/*-----------------------------------------------------------*/
+/*--- Block recoverer program for bzip2                   ---*/
+/*---                                      bzip2recover.c ---*/
+/*-----------------------------------------------------------*/
+
+/*--
+  This program is bzip2recover, a program to attempt data
+  salvage from damaged files created by the accompanying
+  bzip2-1.0 program.
+
+  Copyright (C) 1996-2002 Julian R Seward.  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions
+  are met:
+
+  1. Redistributions of source code must retain the above copyright
+     notice, this list of conditions and the following disclaimer.
+
+  2. The origin of this software must not be misrepresented; you must
+     not claim that you wrote the original software.  If you use this
+     software in a product, an acknowledgment in the product
+     documentation would be appreciated but is not required.
+
+  3. Altered source versions must be plainly marked as such, and must
+     not be misrepresented as being the original software.
+
+  4. The name of the author may not be used to endorse or promote
+     products derived from this software without specific prior written
+     permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+  OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+  ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+  GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+  Julian Seward, Cambridge, UK.
+  jseward@acm.org
+  bzip2/libbzip2 version 1.0 of 21 March 2000
+--*/
+
+/*--
+  This program is a complete hack and should be rewritten
+  properly.  It isn't very complicated.
+--*/
+
+#include <stdio.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+
+
+/* This program records bit locations in the file to be recovered.
+   That means that if 64-bit ints are not supported, we will not
+   be able to recover .bz2 files over 512MB (2^32 bits) long.
+   On GNU supported platforms, we take advantage of the 64-bit
+   int support to circumvent this problem.  Ditto MSVC.
+
+   This change occurred in version 1.0.2; all prior versions have
+   the 512MB limitation.
+*/
+#ifdef __GNUC__
+   typedef  unsigned long long int  MaybeUInt64;
+#  define MaybeUInt64_FMT "%Lu"
+#else
+#ifdef _MSC_VER
+   typedef  unsigned __int64  MaybeUInt64;
+#  define MaybeUInt64_FMT "%I64u"
+#else
+   typedef  unsigned int   MaybeUInt64;
+#  define MaybeUInt64_FMT "%u"
+#endif
+#endif
+
+typedef  unsigned int   UInt32;
+typedef  int            Int32;
+typedef  unsigned char  UChar;
+typedef  char           Char;
+typedef  unsigned char  Bool;
+#define True    ((Bool)1)
+#define False   ((Bool)0)
+
+
+#define BZ_MAX_FILENAME 2000
+
+Char inFileName[BZ_MAX_FILENAME];
+Char outFileName[BZ_MAX_FILENAME];
+Char progName[BZ_MAX_FILENAME];
+
+MaybeUInt64 bytesOut = 0;
+MaybeUInt64 bytesIn  = 0;
+
+
+/*---------------------------------------------------*/
+/*--- Header bytes                                ---*/
+/*---------------------------------------------------*/
+
+#define BZ_HDR_B 0x42                         /* 'B' */
+#define BZ_HDR_Z 0x5a                         /* 'Z' */
+#define BZ_HDR_h 0x68                         /* 'h' */
+#define BZ_HDR_0 0x30                         /* '0' */
+
+
+/*---------------------------------------------------*/
+/*--- I/O errors                                  ---*/
+/*---------------------------------------------------*/
+
+/*---------------------------------------------*/
+void readError ( void )
+{
+   fprintf ( stderr,
+             "%s: I/O error reading `%s', possible reason follows.\n",
+            progName, inFileName );
+   perror ( progName );
+   fprintf ( stderr, "%s: warning: output file(s) may be incomplete.\n",
+             progName );
+   exit ( 1 );
+}
+
+
+/*---------------------------------------------*/
+void writeError ( void )
+{
+   fprintf ( stderr,
+             "%s: I/O error reading `%s', possible reason follows.\n",
+            progName, inFileName );
+   perror ( progName );
+   fprintf ( stderr, "%s: warning: output file(s) may be incomplete.\n",
+             progName );
+   exit ( 1 );
+}
+
+
+/*---------------------------------------------*/
+void mallocFail ( Int32 n )
+{
+   fprintf ( stderr,
+             "%s: malloc failed on request for %d bytes.\n",
+            progName, n );
+   fprintf ( stderr, "%s: warning: output file(s) may be incomplete.\n",
+             progName );
+   exit ( 1 );
+}
+
+
+/*---------------------------------------------*/
+void tooManyBlocks ( Int32 max_handled_blocks )
+{
+   fprintf ( stderr,
+             "%s: `%s' appears to contain more than %d blocks\n",
+            progName, inFileName, max_handled_blocks );
+   fprintf ( stderr,
+             "%s: and cannot be handled.  To fix, increase\n",
+             progName );
+   fprintf ( stderr,
+             "%s: BZ_MAX_HANDLED_BLOCKS in bzip2recover.c, and recompile.\n",
+             progName );
+   exit ( 1 );
+}
+
+
+
+/*---------------------------------------------------*/
+/*--- Bit stream I/O                              ---*/
+/*---------------------------------------------------*/
+
+typedef
+   struct {
+      FILE*  handle;
+      Int32  buffer;
+      Int32  buffLive;
+      Char   mode;
+   }
+   BitStream;
+
+
+/*---------------------------------------------*/
+BitStream* bsOpenReadStream ( FILE* stream )
+{
+   BitStream *bs = malloc ( sizeof(BitStream) );
+   if (bs == NULL) mallocFail ( sizeof(BitStream) );
+   bs->handle = stream;
+   bs->buffer = 0;
+   bs->buffLive = 0;
+   bs->mode = 'r';
+   return bs;
+}
+
+
+/*---------------------------------------------*/
+BitStream* bsOpenWriteStream ( FILE* stream )
+{
+   BitStream *bs = malloc ( sizeof(BitStream) );
+   if (bs == NULL) mallocFail ( sizeof(BitStream) );
+   bs->handle = stream;
+   bs->buffer = 0;
+   bs->buffLive = 0;
+   bs->mode = 'w';
+   return bs;
+}
+
+
+/*---------------------------------------------*/
+void bsPutBit ( BitStream* bs, Int32 bit )
+{
+   if (bs->buffLive == 8) {
+      Int32 retVal = putc ( (UChar) bs->buffer, bs->handle );
+      if (retVal == EOF) writeError();
+      bytesOut++;
+      bs->buffLive = 1;
+      bs->buffer = bit & 0x1;
+   } else {
+      bs->buffer = ( (bs->buffer << 1) | (bit & 0x1) );
+      bs->buffLive++;
+   };
+}
+
+
+/*---------------------------------------------*/
+/*--
+   Returns 0 or 1, or 2 to indicate EOF.
+--*/
+Int32 bsGetBit ( BitStream* bs )
+{
+   if (bs->buffLive > 0) {
+      bs->buffLive --;
+      return ( ((bs->buffer) >> (bs->buffLive)) & 0x1 );
+   } else {
+      Int32 retVal = getc ( bs->handle );
+      if ( retVal == EOF ) {
+         if (errno != 0) readError();
+         return 2;
+      }
+      bs->buffLive = 7;
+      bs->buffer = retVal;
+      return ( ((bs->buffer) >> 7) & 0x1 );
+   }
+}
+
+
+/*---------------------------------------------*/
+void bsClose ( BitStream* bs )
+{
+   Int32 retVal;
+
+   if ( bs->mode == 'w' ) {
+      while ( bs->buffLive < 8 ) {
+         bs->buffLive++;
+         bs->buffer <<= 1;
+      };
+      retVal = putc ( (UChar) (bs->buffer), bs->handle );
+      if (retVal == EOF) writeError();
+      bytesOut++;
+      retVal = fflush ( bs->handle );
+      if (retVal == EOF) writeError();
+   }
+   retVal = fclose ( bs->handle );
+   if (retVal == EOF) {
+      if (bs->mode == 'w') writeError(); else readError();
+   }
+   free ( bs );
+}
+
+
+/*---------------------------------------------*/
+void bsPutUChar ( BitStream* bs, UChar c )
+{
+   Int32 i;
+   for (i = 7; i >= 0; i--)
+      bsPutBit ( bs, (((UInt32) c) >> i) & 0x1 );
+}
+
+
+/*---------------------------------------------*/
+void bsPutUInt32 ( BitStream* bs, UInt32 c )
+{
+   Int32 i;
+
+   for (i = 31; i >= 0; i--)
+      bsPutBit ( bs, (c >> i) & 0x1 );
+}
+
+
+/*---------------------------------------------*/
+Bool endsInBz2 ( Char* name )
+{
+   Int32 n = strlen ( name );
+   if (n <= 4) return False;
+   return
+      (name[n-4] == '.' &&
+       name[n-3] == 'b' &&
+       name[n-2] == 'z' &&
+       name[n-1] == '2');
+}
+
+
+/*---------------------------------------------------*/
+/*---                                             ---*/
+/*---------------------------------------------------*/
+
+/* This logic isn't really right when it comes to Cygwin. */
+#ifdef _WIN32
+#  define  BZ_SPLIT_SYM  '\\'  /* path splitter on Windows platform */
+#else
+#  define  BZ_SPLIT_SYM  '/'   /* path splitter on Unix platform */
+#endif
+
+#define BLOCK_HEADER_HI  0x00003141UL
+#define BLOCK_HEADER_LO  0x59265359UL
+
+#define BLOCK_ENDMARK_HI 0x00001772UL
+#define BLOCK_ENDMARK_LO 0x45385090UL
+
+/* Increase if necessary.  However, a .bz2 file with > 50000 blocks
+   would have an uncompressed size of at least 40GB, so the chances
+   are low you'll need to up this.
+*/
+#define BZ_MAX_HANDLED_BLOCKS 50000
+
+MaybeUInt64 bStart [BZ_MAX_HANDLED_BLOCKS];
+MaybeUInt64 bEnd   [BZ_MAX_HANDLED_BLOCKS];
+MaybeUInt64 rbStart[BZ_MAX_HANDLED_BLOCKS];
+MaybeUInt64 rbEnd  [BZ_MAX_HANDLED_BLOCKS];
+
+Int32 main ( Int32 argc, Char** argv )
+{
+   FILE*       inFile;
+   FILE*       outFile;
+   BitStream*  bsIn, *bsWr;
+   Int32       b, wrBlock, currBlock, rbCtr;
+   MaybeUInt64 bitsRead;
+
+   UInt32      buffHi, buffLo, blockCRC;
+   Char*       p;
+
+   strcpy ( progName, argv[0] );
+   inFileName[0] = outFileName[0] = 0;
+
+   fprintf ( stderr,
+             "bzip2recover 1.0.2: extracts blocks from damaged .bz2 files.\n" );
+
+   if (argc != 2) {
+      fprintf ( stderr, "%s: usage is `%s damaged_file_name'.\n",
+                        progName, progName );
+      switch (sizeof(MaybeUInt64)) {
+         case 8:
+            fprintf(stderr,
+                    "\trestrictions on size of recovered file: None\n");
+            break;
+         case 4:
+            fprintf(stderr,
+                    "\trestrictions on size of recovered file: 512 MB\n");
+            fprintf(stderr,
+                    "\tto circumvent, recompile with MaybeUInt64 as an\n"
+                    "\tunsigned 64-bit int.\n");
+            break;
+         default:
+            fprintf(stderr,
+                    "\tsizeof(MaybeUInt64) is not 4 or 8 -- "
+                    "configuration error.\n");
+            break;
+      }
+      exit(1);
+   }
+
+   if (strlen(argv[1]) >= BZ_MAX_FILENAME-20) {
+      fprintf ( stderr,
+                "%s: supplied filename is suspiciously (>= %d chars) long.  Bye!\n",
+                progName, strlen(argv[1]) );
+      exit(1);
+   }
+
+   strcpy ( inFileName, argv[1] );
+
+   inFile = fopen ( inFileName, "rb" );
+   if (inFile == NULL) {
+      fprintf ( stderr, "%s: can't read `%s'\n", progName, inFileName );
+      exit(1);
+   }
+
+   bsIn = bsOpenReadStream ( inFile );
+   fprintf ( stderr, "%s: searching for block boundaries ...\n", progName );
+
+   bitsRead = 0;
+   buffHi = buffLo = 0;
+   currBlock = 0;
+   bStart[currBlock] = 0;
+
+   rbCtr = 0;
+
+   while (True) {
+      b = bsGetBit ( bsIn );
+      bitsRead++;
+      if (b == 2) {
+         if (bitsRead >= bStart[currBlock] &&
+            (bitsRead - bStart[currBlock]) >= 40) {
+            bEnd[currBlock] = bitsRead-1;
+            if (currBlock > 0)
+               fprintf ( stderr, "   block %d runs from " MaybeUInt64_FMT
+                                 " to " MaybeUInt64_FMT " (incomplete)\n",
+                         currBlock,  bStart[currBlock], bEnd[currBlock] );
+         } else
+            currBlock--;
+         break;
+      }
+      buffHi = (buffHi << 1) | (buffLo >> 31);
+      buffLo = (buffLo << 1) | (b & 1);
+      if ( ( (buffHi & 0x0000ffff) == BLOCK_HEADER_HI
+             && buffLo == BLOCK_HEADER_LO)
+           ||
+           ( (buffHi & 0x0000ffff) == BLOCK_ENDMARK_HI
+             && buffLo == BLOCK_ENDMARK_LO)
+         ) {
+         if (bitsRead > 49) {
+            bEnd[currBlock] = bitsRead-49;
+         } else {
+            bEnd[currBlock] = 0;
+         }
+         if (currBlock > 0 &&
+	     (bEnd[currBlock] - bStart[currBlock]) >= 130) {
+            fprintf ( stderr, "   block %d runs from " MaybeUInt64_FMT
+                              " to " MaybeUInt64_FMT "\n",
+                      rbCtr+1,  bStart[currBlock], bEnd[currBlock] );
+            rbStart[rbCtr] = bStart[currBlock];
+            rbEnd[rbCtr] = bEnd[currBlock];
+            rbCtr++;
+         }
+         if (currBlock >= BZ_MAX_HANDLED_BLOCKS)
+            tooManyBlocks(BZ_MAX_HANDLED_BLOCKS);
+         currBlock++;
+
+         bStart[currBlock] = bitsRead;
+      }
+   }
+
+   bsClose ( bsIn );
+
+   /*-- identified blocks run from 1 to rbCtr inclusive. --*/
+
+   if (rbCtr < 1) {
+      fprintf ( stderr,
+                "%s: sorry, I couldn't find any block boundaries.\n",
+                progName );
+      exit(1);
+   };
+
+   fprintf ( stderr, "%s: splitting into blocks\n", progName );
+
+   inFile = fopen ( inFileName, "rb" );
+   if (inFile == NULL) {
+      fprintf ( stderr, "%s: can't open `%s'\n", progName, inFileName );
+      exit(1);
+   }
+   bsIn = bsOpenReadStream ( inFile );
+
+   /*-- placate gcc's dataflow analyser --*/
+   blockCRC = 0; bsWr = 0;
+
+   bitsRead = 0;
+   outFile = NULL;
+   wrBlock = 0;
+   while (True) {
+      b = bsGetBit(bsIn);
+      if (b == 2) break;
+      buffHi = (buffHi << 1) | (buffLo >> 31);
+      buffLo = (buffLo << 1) | (b & 1);
+      if (bitsRead == 47+rbStart[wrBlock])
+         blockCRC = (buffHi << 16) | (buffLo >> 16);
+
+      if (outFile != NULL && bitsRead >= rbStart[wrBlock]
+                          && bitsRead <= rbEnd[wrBlock]) {
+         bsPutBit ( bsWr, b );
+      }
+
+      bitsRead++;
+
+      if (bitsRead == rbEnd[wrBlock]+1) {
+         if (outFile != NULL) {
+            bsPutUChar ( bsWr, 0x17 ); bsPutUChar ( bsWr, 0x72 );
+            bsPutUChar ( bsWr, 0x45 ); bsPutUChar ( bsWr, 0x38 );
+            bsPutUChar ( bsWr, 0x50 ); bsPutUChar ( bsWr, 0x90 );
+            bsPutUInt32 ( bsWr, blockCRC );
+            bsClose ( bsWr );
+         }
+         if (wrBlock >= rbCtr) break;
+         wrBlock++;
+      } else
+      if (bitsRead == rbStart[wrBlock]) {
+         /* Create the output file name, correctly handling leading paths.
+            (31.10.2001 by Sergey E. Kusikov) */
+         Char* split;
+         Int32 ofs, k;
+         for (k = 0; k < BZ_MAX_FILENAME; k++)
+            outFileName[k] = 0;
+         strcpy (outFileName, inFileName);
+         split = strrchr (outFileName, BZ_SPLIT_SYM);
+         if (split == NULL) {
+            split = outFileName;
+         } else {
+            ++split;
+	 }
+	 /* Now split points to the start of the basename. */
+         ofs  = split - outFileName;
+         sprintf (split, "rec%5d", wrBlock+1);
+         for (p = split; *p != 0; p++) if (*p == ' ') *p = '0';
+         strcat (outFileName, inFileName + ofs);
+
+         if ( !endsInBz2(outFileName)) strcat ( outFileName, ".bz2" );
+
+         fprintf ( stderr, "   writing block %d to `%s' ...\n",
+                           wrBlock+1, outFileName );
+
+         outFile = fopen ( outFileName, "wb" );
+         if (outFile == NULL) {
+            fprintf ( stderr, "%s: can't write `%s'\n",
+                      progName, outFileName );
+            exit(1);
+         }
+         bsWr = bsOpenWriteStream ( outFile );
+         bsPutUChar ( bsWr, BZ_HDR_B );
+         bsPutUChar ( bsWr, BZ_HDR_Z );
+         bsPutUChar ( bsWr, BZ_HDR_h );
+         bsPutUChar ( bsWr, BZ_HDR_0 + 9 );
+         bsPutUChar ( bsWr, 0x31 ); bsPutUChar ( bsWr, 0x41 );
+         bsPutUChar ( bsWr, 0x59 ); bsPutUChar ( bsWr, 0x26 );
+         bsPutUChar ( bsWr, 0x53 ); bsPutUChar ( bsWr, 0x59 );
+      }
+   }
+
+   fprintf ( stderr, "%s: finished\n", progName );
+   return 0;
+}
+
+
+
+/*-----------------------------------------------------------*/
+/*--- end                                  bzip2recover.c ---*/
+/*-----------------------------------------------------------*/
diff --git a/uppsrc/plugin/bz2/lib/bzlib.c b/uppsrc/plugin/bz2/lib/bzlib.c
new file mode 100644
index 000000000..8e314db0a
--- /dev/null
+++ b/uppsrc/plugin/bz2/lib/bzlib.c
@@ -0,0 +1,1593 @@
+
+/*-------------------------------------------------------------*/
+/*--- Library top-level functions.                          ---*/
+/*---                                               bzlib.c ---*/
+/*-------------------------------------------------------------*/
+
+/*--
+  This file is a part of bzip2 and/or libbzip2, a program and
+  library for lossless, block-sorting data compression.
+
+  Copyright (C) 1996-2002 Julian R Seward.  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions
+  are met:
+
+  1. Redistributions of source code must retain the above copyright
+     notice, this list of conditions and the following disclaimer.
+
+  2. The origin of this software must not be misrepresented; you must
+     not claim that you wrote the original software.  If you use this
+     software in a product, an acknowledgment in the product
+     documentation would be appreciated but is not required.
+
+  3. Altered source versions must be plainly marked as such, and must
+     not be misrepresented as being the original software.
+
+  4. The name of the author may not be used to endorse or promote
+     products derived from this software without specific prior written
+     permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+  OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+  ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+  GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+  Julian Seward, Cambridge, UK.
+  jseward@acm.org
+  bzip2/libbzip2 version 1.0 of 21 March 2000
+
+  This program is based on (at least) the work of:
+     Mike Burrows
+     David Wheeler
+     Peter Fenwick
+     Alistair Moffat
+     Radford Neal
+     Ian H. Witten
+     Robert Sedgewick
+     Jon L. Bentley
+
+  For more information on these sources, see the manual.
+--*/
+
+/*--
+   CHANGES
+   ~~~~~~~
+   0.9.0 -- original version.
+
+   0.9.0a/b -- no changes in this file.
+
+   0.9.0c
+      * made zero-length BZ_FLUSH work correctly in bzCompress().
+      * fixed bzWrite/bzRead to ignore zero-length requests.
+      * fixed bzread to correctly handle read requests after EOF.
+      * wrong parameter order in call to bzDecompressInit in
+        bzBuffToBuffDecompress.  Fixed.
+--*/
+
+#include "bzlib_private.h"
+
+
+/*---------------------------------------------------*/
+/*--- Compression stuff                           ---*/
+/*---------------------------------------------------*/
+
+
+/*---------------------------------------------------*/
+#ifndef BZ_NO_STDIO
+void BZ2_bz__AssertH__fail ( int errcode )
+{
+   fprintf(stderr,
+      "\n\nbzip2/libbzip2: internal error number %d.\n"
+      "This is a bug in bzip2/libbzip2, %s.\n"
+      "Please report it to me at: jseward@acm.org.  If this happened\n"
+      "when you were using some program which uses libbzip2 as a\n"
+      "component, you should also report this bug to the author(s)\n"
+      "of that program.  Please make an effort to report this bug;\n"
+      "timely and accurate bug reports eventually lead to higher\n"
+      "quality software.  Thanks.  Julian Seward, 30 December 2001.\n\n",
+      errcode,
+      BZ2_bzlibVersion()
+   );
+
+   if (errcode == 1007) {
+   fprintf(stderr,
+      "\n*** A special note about internal error number 1007 ***\n"
+      "\n"
+      "Experience suggests that a common cause of i.e. 1007\n"
+      "is unreliable memory or other hardware.  The 1007 assertion\n"
+      "just happens to cross-check the results of huge numbers of\n"
+      "memory reads/writes, and so acts (unintendedly) as a stress\n"
+      "test of your memory system.\n"
+      "\n"
+      "I suggest the following: try compressing the file again,\n"
+      "possibly monitoring progress in detail with the -vv flag.\n"
+      "\n"
+      "* If the error cannot be reproduced, and/or happens at different\n"
+      "  points in compression, you may have a flaky memory system.\n"
+      "  Try a memory-test program.  I have used Memtest86\n"
+      "  (www.memtest86.com).  At the time of writing it is free (GPLd).\n"
+      "  Memtest86 tests memory much more thorougly than your BIOSs\n"
+      "  power-on test, and may find failures that the BIOS doesn't.\n"
+      "\n"
+      "* If the error can be repeatably reproduced, this is a bug in\n"
+      "  bzip2, and I would very much like to hear about it.  Please\n"
+      "  let me know, and, ideally, save a copy of the file causing the\n"
+      "  problem -- without which I will be unable to investigate it.\n"
+      "\n"
+   );
+   }
+
+   exit(3);
+}
+#endif
+
+
+/*---------------------------------------------------*/
+static
+int bz_config_ok ( void )
+{
+   if (sizeof(int)   != 4) return 0;
+   if (sizeof(short) != 2) return 0;
+   if (sizeof(char)  != 1) return 0;
+   return 1;
+}
+
+
+/*---------------------------------------------------*/
+static
+void* default_bzalloc ( void* opaque, Int32 items, Int32 size )
+{
+   void* v = malloc ( items * size );
+   return v;
+}
+
+static
+void default_bzfree ( void* opaque, void* addr )
+{
+   if (addr != NULL) free ( addr );
+}
+
+
+/*---------------------------------------------------*/
+static
+void prepare_new_block ( EState* s )
+{
+   Int32 i;
+   s->nblock = 0;
+   s->numZ = 0;
+   s->state_out_pos = 0;
+   BZ_INITIALISE_CRC ( s->blockCRC );
+   for (i = 0; i < 256; i++) s->inUse[i] = False;
+   s->blockNo++;
+}
+
+
+/*---------------------------------------------------*/
+static
+void init_RL ( EState* s )
+{
+   s->state_in_ch  = 256;
+   s->state_in_len = 0;
+}
+
+
+static
+Bool isempty_RL ( EState* s )
+{
+   if (s->state_in_ch < 256 && s->state_in_len > 0)
+      return False; else
+      return True;
+}
+
+
+/*---------------------------------------------------*/
+int BZ_API(BZ2_bzCompressInit)
+                    ( bz_stream* strm,
+                     int        blockSize100k,
+                     int        verbosity,
+                     int        workFactor )
+{
+   Int32   n;
+   EState* s;
+
+   if (!bz_config_ok()) return BZ_CONFIG_ERROR;
+
+   if (strm == NULL ||
+       blockSize100k < 1 || blockSize100k > 9 ||
+       workFactor < 0 || workFactor > 250)
+     return BZ_PARAM_ERROR;
+
+   if (workFactor == 0) workFactor = 30;
+   if (strm->bzalloc == NULL) strm->bzalloc = default_bzalloc;
+   if (strm->bzfree == NULL) strm->bzfree = default_bzfree;
+
+   s = BZALLOC( sizeof(EState) );
+   if (s == NULL) return BZ_MEM_ERROR;
+   s->strm = strm;
+
+   s->arr1 = NULL;
+   s->arr2 = NULL;
+   s->ftab = NULL;
+
+   n       = 100000 * blockSize100k;
+   s->arr1 = BZALLOC( n                  * sizeof(UInt32) );
+   s->arr2 = BZALLOC( (n+BZ_N_OVERSHOOT) * sizeof(UInt32) );
+   s->ftab = BZALLOC( 65537              * sizeof(UInt32) );
+
+   if (s->arr1 == NULL || s->arr2 == NULL || s->ftab == NULL) {
+      if (s->arr1 != NULL) BZFREE(s->arr1);
+      if (s->arr2 != NULL) BZFREE(s->arr2);
+      if (s->ftab != NULL) BZFREE(s->ftab);
+      if (s       != NULL) BZFREE(s);
+      return BZ_MEM_ERROR;
+   }
+
+   s->blockNo           = 0;
+   s->state             = BZ_S_INPUT;
+   s->mode              = BZ_M_RUNNING;
+   s->combinedCRC       = 0;
+   s->blockSize100k     = blockSize100k;
+   s->nblockMAX         = 100000 * blockSize100k - 19;
+   s->verbosity         = verbosity;
+   s->workFactor        = workFactor;
+
+   s->block             = (UChar*)s->arr2;
+   s->mtfv              = (UInt16*)s->arr1;
+   s->zbits             = NULL;
+   s->ptr               = (UInt32*)s->arr1;
+
+   strm->state          = s;
+   strm->total_in_lo32  = 0;
+   strm->total_in_hi32  = 0;
+   strm->total_out_lo32 = 0;
+   strm->total_out_hi32 = 0;
+   init_RL ( s );
+   prepare_new_block ( s );
+   return BZ_OK;
+}
+
+
+/*---------------------------------------------------*/
+static
+void add_pair_to_block ( EState* s )
+{
+   Int32 i;
+   UChar ch = (UChar)(s->state_in_ch);
+   for (i = 0; i < s->state_in_len; i++) {
+      BZ_UPDATE_CRC( s->blockCRC, ch );
+   }
+   s->inUse[s->state_in_ch] = True;
+   switch (s->state_in_len) {
+      case 1:
+         s->block[s->nblock] = (UChar)ch; s->nblock++;
+         break;
+      case 2:
+         s->block[s->nblock] = (UChar)ch; s->nblock++;
+         s->block[s->nblock] = (UChar)ch; s->nblock++;
+         break;
+      case 3:
+         s->block[s->nblock] = (UChar)ch; s->nblock++;
+         s->block[s->nblock] = (UChar)ch; s->nblock++;
+         s->block[s->nblock] = (UChar)ch; s->nblock++;
+         break;
+      default:
+         s->inUse[s->state_in_len-4] = True;
+         s->block[s->nblock] = (UChar)ch; s->nblock++;
+         s->block[s->nblock] = (UChar)ch; s->nblock++;
+         s->block[s->nblock] = (UChar)ch; s->nblock++;
+         s->block[s->nblock] = (UChar)ch; s->nblock++;
+         s->block[s->nblock] = ((UChar)(s->state_in_len-4));
+         s->nblock++;
+         break;
+   }
+}
+
+
+/*---------------------------------------------------*/
+static
+void flush_RL ( EState* s )
+{
+   if (s->state_in_ch < 256) add_pair_to_block ( s );
+   init_RL ( s );
+}
+
+
+/*---------------------------------------------------*/
+#define ADD_CHAR_TO_BLOCK(zs,zchh0)               \
+{                                                 \
+   UInt32 zchh = (UInt32)(zchh0);                 \
+   /*-- fast track the common case --*/           \
+   if (zchh != zs->state_in_ch &&                 \
+       zs->state_in_len == 1) {                   \
+      UChar ch = (UChar)(zs->state_in_ch);        \
+      BZ_UPDATE_CRC( zs->blockCRC, ch );          \
+      zs->inUse[zs->state_in_ch] = True;          \
+      zs->block[zs->nblock] = (UChar)ch;          \
+      zs->nblock++;                               \
+      zs->state_in_ch = zchh;                     \
+   }                                              \
+   else                                           \
+   /*-- general, uncommon cases --*/              \
+   if (zchh != zs->state_in_ch ||                 \
+      zs->state_in_len == 255) {                  \
+      if (zs->state_in_ch < 256)                  \
+         add_pair_to_block ( zs );                \
+      zs->state_in_ch = zchh;                     \
+      zs->state_in_len = 1;                       \
+   } else {                                       \
+      zs->state_in_len++;                         \
+   }                                              \
+}
+
+
+/*---------------------------------------------------*/
+static
+Bool copy_input_until_stop ( EState* s )
+{
+   Bool progress_in = False;
+
+   if (s->mode == BZ_M_RUNNING) {
+
+      /*-- fast track the common case --*/
+      while (True) {
+         /*-- block full? --*/
+         if (s->nblock >= s->nblockMAX) break;
+         /*-- no input? --*/
+         if (s->strm->avail_in == 0) break;
+         progress_in = True;
+         ADD_CHAR_TO_BLOCK ( s, (UInt32)(*((UChar*)(s->strm->next_in))) );
+         s->strm->next_in++;
+         s->strm->avail_in--;
+         s->strm->total_in_lo32++;
+         if (s->strm->total_in_lo32 == 0) s->strm->total_in_hi32++;
+      }
+
+   } else {
+
+      /*-- general, uncommon case --*/
+      while (True) {
+         /*-- block full? --*/
+         if (s->nblock >= s->nblockMAX) break;
+         /*-- no input? --*/
+         if (s->strm->avail_in == 0) break;
+         /*-- flush/finish end? --*/
+         if (s->avail_in_expect == 0) break;
+         progress_in = True;
+         ADD_CHAR_TO_BLOCK ( s, (UInt32)(*((UChar*)(s->strm->next_in))) );
+         s->strm->next_in++;
+         s->strm->avail_in--;
+         s->strm->total_in_lo32++;
+         if (s->strm->total_in_lo32 == 0) s->strm->total_in_hi32++;
+         s->avail_in_expect--;
+      }
+   }
+   return progress_in;
+}
+
+
+/*---------------------------------------------------*/
+static
+Bool copy_output_until_stop ( EState* s )
+{
+   Bool progress_out = False;
+
+   while (True) {
+
+      /*-- no output space? --*/
+      if (s->strm->avail_out == 0) break;
+
+      /*-- block done? --*/
+      if (s->state_out_pos >= s->numZ) break;
+
+      progress_out = True;
+      *(s->strm->next_out) = s->zbits[s->state_out_pos];
+      s->state_out_pos++;
+      s->strm->avail_out--;
+      s->strm->next_out++;
+      s->strm->total_out_lo32++;
+      if (s->strm->total_out_lo32 == 0) s->strm->total_out_hi32++;
+   }
+
+   return progress_out;
+}
+
+
+/*---------------------------------------------------*/
+static
+Bool handle_compress ( bz_stream* strm )
+{
+   Bool progress_in  = False;
+   Bool progress_out = False;
+   EState* s = strm->state;
+
+   while (True) {
+
+      if (s->state == BZ_S_OUTPUT) {
+         progress_out |= copy_output_until_stop ( s );
+         if (s->state_out_pos < s->numZ) break;
+         if (s->mode == BZ_M_FINISHING &&
+             s->avail_in_expect == 0 &&
+             isempty_RL(s)) break;
+         prepare_new_block ( s );
+         s->state = BZ_S_INPUT;
+         if (s->mode == BZ_M_FLUSHING &&
+             s->avail_in_expect == 0 &&
+             isempty_RL(s)) break;
+      }
+
+      if (s->state == BZ_S_INPUT) {
+         progress_in |= copy_input_until_stop ( s );
+         if (s->mode != BZ_M_RUNNING && s->avail_in_expect == 0) {
+            flush_RL ( s );
+            BZ2_compressBlock ( s, (Bool)(s->mode == BZ_M_FINISHING) );
+            s->state = BZ_S_OUTPUT;
+         }
+         else
+         if (s->nblock >= s->nblockMAX) {
+            BZ2_compressBlock ( s, False );
+            s->state = BZ_S_OUTPUT;
+         }
+         else
+         if (s->strm->avail_in == 0) {
+            break;
+         }
+      }
+
+   }
+
+   return progress_in || progress_out;
+}
+
+
+/*---------------------------------------------------*/
+int BZ_API(BZ2_bzCompress) ( bz_stream *strm, int action )
+{
+   Bool progress;
+   EState* s;
+   if (strm == NULL) return BZ_PARAM_ERROR;
+   s = strm->state;
+   if (s == NULL) return BZ_PARAM_ERROR;
+   if (s->strm != strm) return BZ_PARAM_ERROR;
+
+   preswitch:
+   switch (s->mode) {
+
+      case BZ_M_IDLE:
+         return BZ_SEQUENCE_ERROR;
+
+      case BZ_M_RUNNING:
+         if (action == BZ_RUN) {
+            progress = handle_compress ( strm );
+            return progress ? BZ_RUN_OK : BZ_PARAM_ERROR;
+         }
+         else
+	 if (action == BZ_FLUSH) {
+            s->avail_in_expect = strm->avail_in;
+            s->mode = BZ_M_FLUSHING;
+            goto preswitch;
+         }
+         else
+         if (action == BZ_FINISH) {
+            s->avail_in_expect = strm->avail_in;
+            s->mode = BZ_M_FINISHING;
+            goto preswitch;
+         }
+         else
+            return BZ_PARAM_ERROR;
+
+      case BZ_M_FLUSHING:
+         if (action != BZ_FLUSH) return BZ_SEQUENCE_ERROR;
+         if (s->avail_in_expect != s->strm->avail_in)
+            return BZ_SEQUENCE_ERROR;
+         progress = handle_compress ( strm );
+         if (s->avail_in_expect > 0 || !isempty_RL(s) ||
+             s->state_out_pos < s->numZ) return BZ_FLUSH_OK;
+         s->mode = BZ_M_RUNNING;
+         return BZ_RUN_OK;
+
+      case BZ_M_FINISHING:
+         if (action != BZ_FINISH) return BZ_SEQUENCE_ERROR;
+         if (s->avail_in_expect != s->strm->avail_in)
+            return BZ_SEQUENCE_ERROR;
+         progress = handle_compress ( strm );
+         if (!progress) return BZ_SEQUENCE_ERROR;
+         if (s->avail_in_expect > 0 || !isempty_RL(s) ||
+             s->state_out_pos < s->numZ) return BZ_FINISH_OK;
+         s->mode = BZ_M_IDLE;
+         return BZ_STREAM_END;
+   }
+   return BZ_OK; /*--not reached--*/
+}
+
+
+/*---------------------------------------------------*/
+int BZ_API(BZ2_bzCompressEnd)  ( bz_stream *strm )
+{
+   EState* s;
+   if (strm == NULL) return BZ_PARAM_ERROR;
+   s = strm->state;
+   if (s == NULL) return BZ_PARAM_ERROR;
+   if (s->strm != strm) return BZ_PARAM_ERROR;
+
+   if (s->arr1 != NULL) BZFREE(s->arr1);
+   if (s->arr2 != NULL) BZFREE(s->arr2);
+   if (s->ftab != NULL) BZFREE(s->ftab);
+   BZFREE(strm->state);
+
+   strm->state = NULL;
+
+   return BZ_OK;
+}
+
+
+/*---------------------------------------------------*/
+/*--- Decompression stuff                         ---*/
+/*---------------------------------------------------*/
+
+/*---------------------------------------------------*/
+int BZ_API(BZ2_bzDecompressInit)
+                     ( bz_stream* strm,
+                       int        verbosity,
+                       int        small )
+{
+   DState* s;
+
+   if (!bz_config_ok()) return BZ_CONFIG_ERROR;
+
+   if (strm == NULL) return BZ_PARAM_ERROR;
+   if (small != 0 && small != 1) return BZ_PARAM_ERROR;
+   if (verbosity < 0 || verbosity > 4) return BZ_PARAM_ERROR;
+
+   if (strm->bzalloc == NULL) strm->bzalloc = default_bzalloc;
+   if (strm->bzfree == NULL) strm->bzfree = default_bzfree;
+
+   s = BZALLOC( sizeof(DState) );
+   if (s == NULL) return BZ_MEM_ERROR;
+   s->strm                  = strm;
+   strm->state              = s;
+   s->state                 = BZ_X_MAGIC_1;
+   s->bsLive                = 0;
+   s->bsBuff                = 0;
+   s->calculatedCombinedCRC = 0;
+   strm->total_in_lo32      = 0;
+   strm->total_in_hi32      = 0;
+   strm->total_out_lo32     = 0;
+   strm->total_out_hi32     = 0;
+   s->smallDecompress       = (Bool)small;
+   s->ll4                   = NULL;
+   s->ll16                  = NULL;
+   s->tt                    = NULL;
+   s->currBlockNo           = 0;
+   s->verbosity             = verbosity;
+
+   return BZ_OK;
+}
+
+
+/*---------------------------------------------------*/
+static
+void unRLE_obuf_to_output_FAST ( DState* s )
+{
+   UChar k1;
+
+   if (s->blockRandomised) {
+
+      while (True) {
+         /* try to finish existing run */
+         while (True) {
+            if (s->strm->avail_out == 0) return;
+            if (s->state_out_len == 0) break;
+            *( (UChar*)(s->strm->next_out) ) = s->state_out_ch;
+            BZ_UPDATE_CRC ( s->calculatedBlockCRC, s->state_out_ch );
+            s->state_out_len--;
+            s->strm->next_out++;
+            s->strm->avail_out--;
+            s->strm->total_out_lo32++;
+            if (s->strm->total_out_lo32 == 0) s->strm->total_out_hi32++;
+         }
+
+         /* can a new run be started? */
+         if (s->nblock_used == s->save_nblock+1) return;
+
+
+         s->state_out_len = 1;
+         s->state_out_ch = s->k0;
+         BZ_GET_FAST(k1); BZ_RAND_UPD_MASK;
+         k1 ^= BZ_RAND_MASK; s->nblock_used++;
+         if (s->nblock_used == s->save_nblock+1) continue;
+         if (k1 != s->k0) { s->k0 = k1; continue; };
+
+         s->state_out_len = 2;
+         BZ_GET_FAST(k1); BZ_RAND_UPD_MASK;
+         k1 ^= BZ_RAND_MASK; s->nblock_used++;
+         if (s->nblock_used == s->save_nblock+1) continue;
+         if (k1 != s->k0) { s->k0 = k1; continue; };
+
+         s->state_out_len = 3;
+         BZ_GET_FAST(k1); BZ_RAND_UPD_MASK;
+         k1 ^= BZ_RAND_MASK; s->nblock_used++;
+         if (s->nblock_used == s->save_nblock+1) continue;
+         if (k1 != s->k0) { s->k0 = k1; continue; };
+
+         BZ_GET_FAST(k1); BZ_RAND_UPD_MASK;
+         k1 ^= BZ_RAND_MASK; s->nblock_used++;
+         s->state_out_len = ((Int32)k1) + 4;
+         BZ_GET_FAST(s->k0); BZ_RAND_UPD_MASK;
+         s->k0 ^= BZ_RAND_MASK; s->nblock_used++;
+      }
+
+   } else {
+
+      /* restore */
+      UInt32        c_calculatedBlockCRC = s->calculatedBlockCRC;
+      UChar         c_state_out_ch       = s->state_out_ch;
+      Int32         c_state_out_len      = s->state_out_len;
+      Int32         c_nblock_used        = s->nblock_used;
+      Int32         c_k0                 = s->k0;
+      UInt32*       c_tt                 = s->tt;
+      UInt32        c_tPos               = s->tPos;
+      char*         cs_next_out          = s->strm->next_out;
+      unsigned int  cs_avail_out         = s->strm->avail_out;
+      /* end restore */
+
+      UInt32       avail_out_INIT = cs_avail_out;
+      Int32        s_save_nblockPP = s->save_nblock+1;
+      unsigned int total_out_lo32_old;
+
+      while (True) {
+
+         /* try to finish existing run */
+         if (c_state_out_len > 0) {
+            while (True) {
+               if (cs_avail_out == 0) goto return_notr;
+               if (c_state_out_len == 1) break;
+               *( (UChar*)(cs_next_out) ) = c_state_out_ch;
+               BZ_UPDATE_CRC ( c_calculatedBlockCRC, c_state_out_ch );
+               c_state_out_len--;
+               cs_next_out++;
+               cs_avail_out--;
+            }
+            s_state_out_len_eq_one:
+            {
+               if (cs_avail_out == 0) {
+                  c_state_out_len = 1; goto return_notr;
+               };
+               *( (UChar*)(cs_next_out) ) = c_state_out_ch;
+               BZ_UPDATE_CRC ( c_calculatedBlockCRC, c_state_out_ch );
+               cs_next_out++;
+               cs_avail_out--;
+            }
+         }
+         /* can a new run be started? */
+         if (c_nblock_used == s_save_nblockPP) {
+            c_state_out_len = 0; goto return_notr;
+         };
+         c_state_out_ch = c_k0;
+         BZ_GET_FAST_C(k1); c_nblock_used++;
+         if (k1 != c_k0) {
+            c_k0 = k1; goto s_state_out_len_eq_one;
+         };
+         if (c_nblock_used == s_save_nblockPP)
+            goto s_state_out_len_eq_one;
+
+         c_state_out_len = 2;
+         BZ_GET_FAST_C(k1); c_nblock_used++;
+         if (c_nblock_used == s_save_nblockPP) continue;
+         if (k1 != c_k0) { c_k0 = k1; continue; };
+
+         c_state_out_len = 3;
+         BZ_GET_FAST_C(k1); c_nblock_used++;
+         if (c_nblock_used == s_save_nblockPP) continue;
+         if (k1 != c_k0) { c_k0 = k1; continue; };
+
+         BZ_GET_FAST_C(k1); c_nblock_used++;
+         c_state_out_len = ((Int32)k1) + 4;
+         BZ_GET_FAST_C(c_k0); c_nblock_used++;
+      }
+
+      return_notr:
+      total_out_lo32_old = s->strm->total_out_lo32;
+      s->strm->total_out_lo32 += (avail_out_INIT - cs_avail_out);
+      if (s->strm->total_out_lo32 < total_out_lo32_old)
+         s->strm->total_out_hi32++;
+
+      /* save */
+      s->calculatedBlockCRC = c_calculatedBlockCRC;
+      s->state_out_ch       = c_state_out_ch;
+      s->state_out_len      = c_state_out_len;
+      s->nblock_used        = c_nblock_used;
+      s->k0                 = c_k0;
+      s->tt                 = c_tt;
+      s->tPos               = c_tPos;
+      s->strm->next_out     = cs_next_out;
+      s->strm->avail_out    = cs_avail_out;
+      /* end save */
+   }
+}
+
+
+
+/*---------------------------------------------------*/
+__inline__ Int32 BZ2_indexIntoF ( Int32 indx, Int32 *cftab )
+{
+   Int32 nb, na, mid;
+   nb = 0;
+   na = 256;
+   do {
+      mid = (nb + na) >> 1;
+      if (indx >= cftab[mid]) nb = mid; else na = mid;
+   }
+   while (na - nb != 1);
+   return nb;
+}
+
+
+/*---------------------------------------------------*/
+static
+void unRLE_obuf_to_output_SMALL ( DState* s )
+{
+   UChar k1;
+
+   if (s->blockRandomised) {
+
+      while (True) {
+         /* try to finish existing run */
+         while (True) {
+            if (s->strm->avail_out == 0) return;
+            if (s->state_out_len == 0) break;
+            *( (UChar*)(s->strm->next_out) ) = s->state_out_ch;
+            BZ_UPDATE_CRC ( s->calculatedBlockCRC, s->state_out_ch );
+            s->state_out_len--;
+            s->strm->next_out++;
+            s->strm->avail_out--;
+            s->strm->total_out_lo32++;
+            if (s->strm->total_out_lo32 == 0) s->strm->total_out_hi32++;
+         }
+
+         /* can a new run be started? */
+         if (s->nblock_used == s->save_nblock+1) return;
+
+
+         s->state_out_len = 1;
+         s->state_out_ch = s->k0;
+         BZ_GET_SMALL(k1); BZ_RAND_UPD_MASK;
+         k1 ^= BZ_RAND_MASK; s->nblock_used++;
+         if (s->nblock_used == s->save_nblock+1) continue;
+         if (k1 != s->k0) { s->k0 = k1; continue; };
+
+         s->state_out_len = 2;
+         BZ_GET_SMALL(k1); BZ_RAND_UPD_MASK;
+         k1 ^= BZ_RAND_MASK; s->nblock_used++;
+         if (s->nblock_used == s->save_nblock+1) continue;
+         if (k1 != s->k0) { s->k0 = k1; continue; };
+
+         s->state_out_len = 3;
+         BZ_GET_SMALL(k1); BZ_RAND_UPD_MASK;
+         k1 ^= BZ_RAND_MASK; s->nblock_used++;
+         if (s->nblock_used == s->save_nblock+1) continue;
+         if (k1 != s->k0) { s->k0 = k1; continue; };
+
+         BZ_GET_SMALL(k1); BZ_RAND_UPD_MASK;
+         k1 ^= BZ_RAND_MASK; s->nblock_used++;
+         s->state_out_len = ((Int32)k1) + 4;
+         BZ_GET_SMALL(s->k0); BZ_RAND_UPD_MASK;
+         s->k0 ^= BZ_RAND_MASK; s->nblock_used++;
+      }
+
+   } else {
+
+      while (True) {
+         /* try to finish existing run */
+         while (True) {
+            if (s->strm->avail_out == 0) return;
+            if (s->state_out_len == 0) break;
+            *( (UChar*)(s->strm->next_out) ) = s->state_out_ch;
+            BZ_UPDATE_CRC ( s->calculatedBlockCRC, s->state_out_ch );
+            s->state_out_len--;
+            s->strm->next_out++;
+            s->strm->avail_out--;
+            s->strm->total_out_lo32++;
+            if (s->strm->total_out_lo32 == 0) s->strm->total_out_hi32++;
+         }
+
+         /* can a new run be started? */
+         if (s->nblock_used == s->save_nblock+1) return;
+
+         s->state_out_len = 1;
+         s->state_out_ch = s->k0;
+         BZ_GET_SMALL(k1); s->nblock_used++;
+         if (s->nblock_used == s->save_nblock+1) continue;
+         if (k1 != s->k0) { s->k0 = k1; continue; };
+
+         s->state_out_len = 2;
+         BZ_GET_SMALL(k1); s->nblock_used++;
+         if (s->nblock_used == s->save_nblock+1) continue;
+         if (k1 != s->k0) { s->k0 = k1; continue; };
+
+         s->state_out_len = 3;
+         BZ_GET_SMALL(k1); s->nblock_used++;
+         if (s->nblock_used == s->save_nblock+1) continue;
+         if (k1 != s->k0) { s->k0 = k1; continue; };
+
+         BZ_GET_SMALL(k1); s->nblock_used++;
+         s->state_out_len = ((Int32)k1) + 4;
+         BZ_GET_SMALL(s->k0); s->nblock_used++;
+      }
+
+   }
+}
+
+
+/*---------------------------------------------------*/
+int BZ_API(BZ2_bzDecompress) ( bz_stream *strm )
+{
+   DState* s;
+   if (strm == NULL) return BZ_PARAM_ERROR;
+   s = strm->state;
+   if (s == NULL) return BZ_PARAM_ERROR;
+   if (s->strm != strm) return BZ_PARAM_ERROR;
+
+   while (True) {
+      if (s->state == BZ_X_IDLE) return BZ_SEQUENCE_ERROR;
+      if (s->state == BZ_X_OUTPUT) {
+         if (s->smallDecompress)
+            unRLE_obuf_to_output_SMALL ( s ); else
+            unRLE_obuf_to_output_FAST  ( s );
+         if (s->nblock_used == s->save_nblock+1 && s->state_out_len == 0) {
+            BZ_FINALISE_CRC ( s->calculatedBlockCRC );
+            if (s->verbosity >= 3)
+               VPrintf2 ( " {0x%x, 0x%x}", s->storedBlockCRC,
+                          s->calculatedBlockCRC );
+            if (s->verbosity >= 2) VPrintf0 ( "]" );
+            if (s->calculatedBlockCRC != s->storedBlockCRC)
+               return BZ_DATA_ERROR;
+            s->calculatedCombinedCRC
+               = (s->calculatedCombinedCRC << 1) |
+                    (s->calculatedCombinedCRC >> 31);
+            s->calculatedCombinedCRC ^= s->calculatedBlockCRC;
+            s->state = BZ_X_BLKHDR_1;
+         } else {
+            return BZ_OK;
+         }
+      }
+      if (s->state >= BZ_X_MAGIC_1) {
+         Int32 r = BZ2_decompress ( s );
+         if (r == BZ_STREAM_END) {
+            if (s->verbosity >= 3)
+               VPrintf2 ( "\n    combined CRCs: stored = 0x%x, computed = 0x%x",
+                          s->storedCombinedCRC, s->calculatedCombinedCRC );
+            if (s->calculatedCombinedCRC != s->storedCombinedCRC)
+               return BZ_DATA_ERROR;
+            return r;
+         }
+         if (s->state != BZ_X_OUTPUT) return r;
+      }
+   }
+
+   AssertH ( 0, 6001 );
+
+   return 0;  /*NOTREACHED*/
+}
+
+
+/*---------------------------------------------------*/
+int BZ_API(BZ2_bzDecompressEnd)  ( bz_stream *strm )
+{
+   DState* s;
+   if (strm == NULL) return BZ_PARAM_ERROR;
+   s = strm->state;
+   if (s == NULL) return BZ_PARAM_ERROR;
+   if (s->strm != strm) return BZ_PARAM_ERROR;
+
+   if (s->tt   != NULL) BZFREE(s->tt);
+   if (s->ll16 != NULL) BZFREE(s->ll16);
+   if (s->ll4  != NULL) BZFREE(s->ll4);
+
+   BZFREE(strm->state);
+   strm->state = NULL;
+
+   return BZ_OK;
+}
+
+
+#ifndef BZ_NO_STDIO
+/*---------------------------------------------------*/
+/*--- File I/O stuff                              ---*/
+/*---------------------------------------------------*/
+
+#define BZ_SETERR(eee)                    \
+{                                         \
+   if (bzerror != NULL) *bzerror = eee;   \
+   if (bzf != NULL) bzf->lastErr = eee;   \
+}
+
+typedef
+   struct {
+      FILE*     handle;
+      Char      buf[BZ_MAX_UNUSED];
+      Int32     bufN;
+      Bool      writing;
+      bz_stream strm;
+      Int32     lastErr;
+      Bool      initialisedOk;
+   }
+   bzFile;
+
+
+/*---------------------------------------------*/
+static Bool myfeof ( FILE* f )
+{
+   Int32 c = fgetc ( f );
+   if (c == EOF) return True;
+   ungetc ( c, f );
+   return False;
+}
+
+
+/*---------------------------------------------------*/
+BZFILE* BZ_API(BZ2_bzWriteOpen)
+                    ( int*  bzerror,
+                      FILE* f,
+                      int   blockSize100k,
+                      int   verbosity,
+                      int   workFactor )
+{
+   Int32   ret;
+   bzFile* bzf = NULL;
+
+   BZ_SETERR(BZ_OK);
+
+   if (f == NULL ||
+       (blockSize100k < 1 || blockSize100k > 9) ||
+       (workFactor < 0 || workFactor > 250) ||
+       (verbosity < 0 || verbosity > 4))
+      { BZ_SETERR(BZ_PARAM_ERROR); return NULL; };
+
+   if (ferror(f))
+      { BZ_SETERR(BZ_IO_ERROR); return NULL; };
+
+   bzf = malloc ( sizeof(bzFile) );
+   if (bzf == NULL)
+      { BZ_SETERR(BZ_MEM_ERROR); return NULL; };
+
+   BZ_SETERR(BZ_OK);
+   bzf->initialisedOk = False;
+   bzf->bufN          = 0;
+   bzf->handle        = f;
+   bzf->writing       = True;
+   bzf->strm.bzalloc  = NULL;
+   bzf->strm.bzfree   = NULL;
+   bzf->strm.opaque   = NULL;
+
+   if (workFactor == 0) workFactor = 30;
+   ret = BZ2_bzCompressInit ( &(bzf->strm), blockSize100k,
+                              verbosity, workFactor );
+   if (ret != BZ_OK)
+      { BZ_SETERR(ret); free(bzf); return NULL; };
+
+   bzf->strm.avail_in = 0;
+   bzf->initialisedOk = True;
+   return bzf;
+}
+
+
+
+/*---------------------------------------------------*/
+void BZ_API(BZ2_bzWrite)
+             ( int*    bzerror,
+               BZFILE* b,
+               void*   buf,
+               int     len )
+{
+   Int32 n, n2, ret;
+   bzFile* bzf = (bzFile*)b;
+
+   BZ_SETERR(BZ_OK);
+   if (bzf == NULL || buf == NULL || len < 0)
+      { BZ_SETERR(BZ_PARAM_ERROR); return; };
+   if (!(bzf->writing))
+      { BZ_SETERR(BZ_SEQUENCE_ERROR); return; };
+   if (ferror(bzf->handle))
+      { BZ_SETERR(BZ_IO_ERROR); return; };
+
+   if (len == 0)
+      { BZ_SETERR(BZ_OK); return; };
+
+   bzf->strm.avail_in = len;
+   bzf->strm.next_in  = buf;
+
+   while (True) {
+      bzf->strm.avail_out = BZ_MAX_UNUSED;
+      bzf->strm.next_out = bzf->buf;
+      ret = BZ2_bzCompress ( &(bzf->strm), BZ_RUN );
+      if (ret != BZ_RUN_OK)
+         { BZ_SETERR(ret); return; };
+
+      if (bzf->strm.avail_out < BZ_MAX_UNUSED) {
+         n = BZ_MAX_UNUSED - bzf->strm.avail_out;
+         n2 = fwrite ( (void*)(bzf->buf), sizeof(UChar),
+                       n, bzf->handle );
+         if (n != n2 || ferror(bzf->handle))
+            { BZ_SETERR(BZ_IO_ERROR); return; };
+      }
+
+      if (bzf->strm.avail_in == 0)
+         { BZ_SETERR(BZ_OK); return; };
+   }
+}
+
+
+/*---------------------------------------------------*/
+void BZ_API(BZ2_bzWriteClose)
+                  ( int*          bzerror,
+                    BZFILE*       b,
+                    int           abandon,
+                    unsigned int* nbytes_in,
+                    unsigned int* nbytes_out )
+{
+   BZ2_bzWriteClose64 ( bzerror, b, abandon,
+                        nbytes_in, NULL, nbytes_out, NULL );
+}
+
+
+void BZ_API(BZ2_bzWriteClose64)
+                  ( int*          bzerror,
+                    BZFILE*       b,
+                    int           abandon,
+                    unsigned int* nbytes_in_lo32,
+                    unsigned int* nbytes_in_hi32,
+                    unsigned int* nbytes_out_lo32,
+                    unsigned int* nbytes_out_hi32 )
+{
+   Int32   n, n2, ret;
+   bzFile* bzf = (bzFile*)b;
+
+   if (bzf == NULL)
+      { BZ_SETERR(BZ_OK); return; };
+   if (!(bzf->writing))
+      { BZ_SETERR(BZ_SEQUENCE_ERROR); return; };
+   if (ferror(bzf->handle))
+      { BZ_SETERR(BZ_IO_ERROR); return; };
+
+   if (nbytes_in_lo32 != NULL) *nbytes_in_lo32 = 0;
+   if (nbytes_in_hi32 != NULL) *nbytes_in_hi32 = 0;
+   if (nbytes_out_lo32 != NULL) *nbytes_out_lo32 = 0;
+   if (nbytes_out_hi32 != NULL) *nbytes_out_hi32 = 0;
+
+   if ((!abandon) && bzf->lastErr == BZ_OK) {
+      while (True) {
+         bzf->strm.avail_out = BZ_MAX_UNUSED;
+         bzf->strm.next_out = bzf->buf;
+         ret = BZ2_bzCompress ( &(bzf->strm), BZ_FINISH );
+         if (ret != BZ_FINISH_OK && ret != BZ_STREAM_END)
+            { BZ_SETERR(ret); return; };
+
+         if (bzf->strm.avail_out < BZ_MAX_UNUSED) {
+            n = BZ_MAX_UNUSED - bzf->strm.avail_out;
+            n2 = fwrite ( (void*)(bzf->buf), sizeof(UChar),
+                          n, bzf->handle );
+            if (n != n2 || ferror(bzf->handle))
+               { BZ_SETERR(BZ_IO_ERROR); return; };
+         }
+
+         if (ret == BZ_STREAM_END) break;
+      }
+   }
+
+   if ( !abandon && !ferror ( bzf->handle ) ) {
+      fflush ( bzf->handle );
+      if (ferror(bzf->handle))
+         { BZ_SETERR(BZ_IO_ERROR); return; };
+   }
+
+   if (nbytes_in_lo32 != NULL)
+      *nbytes_in_lo32 = bzf->strm.total_in_lo32;
+   if (nbytes_in_hi32 != NULL)
+      *nbytes_in_hi32 = bzf->strm.total_in_hi32;
+   if (nbytes_out_lo32 != NULL)
+      *nbytes_out_lo32 = bzf->strm.total_out_lo32;
+   if (nbytes_out_hi32 != NULL)
+      *nbytes_out_hi32 = bzf->strm.total_out_hi32;
+
+   BZ_SETERR(BZ_OK);
+   BZ2_bzCompressEnd ( &(bzf->strm) );
+   free ( bzf );
+}
+
+
+/*---------------------------------------------------*/
+BZFILE* BZ_API(BZ2_bzReadOpen)
+                   ( int*  bzerror,
+                     FILE* f,
+                     int   verbosity,
+                     int   small,
+                     void* unused,
+                     int   nUnused )
+{
+   bzFile* bzf = NULL;
+   int     ret;
+
+   BZ_SETERR(BZ_OK);
+
+   if (f == NULL ||
+       (small != 0 && small != 1) ||
+       (verbosity < 0 || verbosity > 4) ||
+       (unused == NULL && nUnused != 0) ||
+       (unused != NULL && (nUnused < 0 || nUnused > BZ_MAX_UNUSED)))
+      { BZ_SETERR(BZ_PARAM_ERROR); return NULL; };
+
+   if (ferror(f))
+      { BZ_SETERR(BZ_IO_ERROR); return NULL; };
+
+   bzf = malloc ( sizeof(bzFile) );
+   if (bzf == NULL)
+      { BZ_SETERR(BZ_MEM_ERROR); return NULL; };
+
+   BZ_SETERR(BZ_OK);
+
+   bzf->initialisedOk = False;
+   bzf->handle        = f;
+   bzf->bufN          = 0;
+   bzf->writing       = False;
+   bzf->strm.bzalloc  = NULL;
+   bzf->strm.bzfree   = NULL;
+   bzf->strm.opaque   = NULL;
+
+   while (nUnused > 0) {
+      bzf->buf[bzf->bufN] = *((UChar*)(unused)); bzf->bufN++;
+      unused = ((void*)( 1 + ((UChar*)(unused))  ));
+      nUnused--;
+   }
+
+   ret = BZ2_bzDecompressInit ( &(bzf->strm), verbosity, small );
+   if (ret != BZ_OK)
+      { BZ_SETERR(ret); free(bzf); return NULL; };
+
+   bzf->strm.avail_in = bzf->bufN;
+   bzf->strm.next_in  = bzf->buf;
+
+   bzf->initialisedOk = True;
+   return bzf;
+}
+
+
+/*---------------------------------------------------*/
+void BZ_API(BZ2_bzReadClose) ( int *bzerror, BZFILE *b )
+{
+   bzFile* bzf = (bzFile*)b;
+
+   BZ_SETERR(BZ_OK);
+   if (bzf == NULL)
+      { BZ_SETERR(BZ_OK); return; };
+
+   if (bzf->writing)
+      { BZ_SETERR(BZ_SEQUENCE_ERROR); return; };
+
+   if (bzf->initialisedOk)
+      (void)BZ2_bzDecompressEnd ( &(bzf->strm) );
+   free ( bzf );
+}
+
+
+/*---------------------------------------------------*/
+int BZ_API(BZ2_bzRead)
+           ( int*    bzerror,
+             BZFILE* b,
+             void*   buf,
+             int     len )
+{
+   Int32   n, ret;
+   bzFile* bzf = (bzFile*)b;
+
+   BZ_SETERR(BZ_OK);
+
+   if (bzf == NULL || buf == NULL || len < 0)
+      { BZ_SETERR(BZ_PARAM_ERROR); return 0; };
+
+   if (bzf->writing)
+      { BZ_SETERR(BZ_SEQUENCE_ERROR); return 0; };
+
+   if (len == 0)
+      { BZ_SETERR(BZ_OK); return 0; };
+
+   bzf->strm.avail_out = len;
+   bzf->strm.next_out = buf;
+
+   while (True) {
+
+      if (ferror(bzf->handle))
+         { BZ_SETERR(BZ_IO_ERROR); return 0; };
+
+      if (bzf->strm.avail_in == 0 && !myfeof(bzf->handle)) {
+         n = fread ( bzf->buf, sizeof(UChar),
+                     BZ_MAX_UNUSED, bzf->handle );
+         if (ferror(bzf->handle))
+            { BZ_SETERR(BZ_IO_ERROR); return 0; };
+         bzf->bufN = n;
+         bzf->strm.avail_in = bzf->bufN;
+         bzf->strm.next_in = bzf->buf;
+      }
+
+      ret = BZ2_bzDecompress ( &(bzf->strm) );
+
+      if (ret != BZ_OK && ret != BZ_STREAM_END)
+         { BZ_SETERR(ret); return 0; };
+
+      if (ret == BZ_OK && myfeof(bzf->handle) &&
+          bzf->strm.avail_in == 0 && bzf->strm.avail_out > 0)
+         { BZ_SETERR(BZ_UNEXPECTED_EOF); return 0; };
+
+      if (ret == BZ_STREAM_END)
+         { BZ_SETERR(BZ_STREAM_END);
+           return len - bzf->strm.avail_out; };
+      if (bzf->strm.avail_out == 0)
+         { BZ_SETERR(BZ_OK); return len; };
+
+   }
+
+   return 0; /*not reached*/
+}
+
+
+/*---------------------------------------------------*/
+void BZ_API(BZ2_bzReadGetUnused)
+                     ( int*    bzerror,
+                       BZFILE* b,
+                       void**  unused,
+                       int*    nUnused )
+{
+   bzFile* bzf = (bzFile*)b;
+   if (bzf == NULL)
+      { BZ_SETERR(BZ_PARAM_ERROR); return; };
+   if (bzf->lastErr != BZ_STREAM_END)
+      { BZ_SETERR(BZ_SEQUENCE_ERROR); return; };
+   if (unused == NULL || nUnused == NULL)
+      { BZ_SETERR(BZ_PARAM_ERROR); return; };
+
+   BZ_SETERR(BZ_OK);
+   *nUnused = bzf->strm.avail_in;
+   *unused = bzf->strm.next_in;
+}
+#endif
+
+
+/*---------------------------------------------------*/
+/*--- Misc convenience stuff                      ---*/
+/*---------------------------------------------------*/
+
+/*---------------------------------------------------*/
+int BZ_API(BZ2_bzBuffToBuffCompress)
+                         ( char*         dest,
+                           unsigned int* destLen,
+                           char*         source,
+                           unsigned int  sourceLen,
+                           int           blockSize100k,
+                           int           verbosity,
+                           int           workFactor )
+{
+   bz_stream strm;
+   int ret;
+
+   if (dest == NULL || destLen == NULL ||
+       source == NULL ||
+       blockSize100k < 1 || blockSize100k > 9 ||
+       verbosity < 0 || verbosity > 4 ||
+       workFactor < 0 || workFactor > 250)
+      return BZ_PARAM_ERROR;
+
+   if (workFactor == 0) workFactor = 30;
+   strm.bzalloc = NULL;
+   strm.bzfree = NULL;
+   strm.opaque = NULL;
+   ret = BZ2_bzCompressInit ( &strm, blockSize100k,
+                              verbosity, workFactor );
+   if (ret != BZ_OK) return ret;
+
+   strm.next_in = source;
+   strm.next_out = dest;
+   strm.avail_in = sourceLen;
+   strm.avail_out = *destLen;
+
+   ret = BZ2_bzCompress ( &strm, BZ_FINISH );
+   if (ret == BZ_FINISH_OK) goto output_overflow;
+   if (ret != BZ_STREAM_END) goto errhandler;
+
+   /* normal termination */
+   *destLen -= strm.avail_out;
+   BZ2_bzCompressEnd ( &strm );
+   return BZ_OK;
+
+   output_overflow:
+   BZ2_bzCompressEnd ( &strm );
+   return BZ_OUTBUFF_FULL;
+
+   errhandler:
+   BZ2_bzCompressEnd ( &strm );
+   return ret;
+}
+
+
+/*---------------------------------------------------*/
+int BZ_API(BZ2_bzBuffToBuffDecompress)
+                           ( char*         dest,
+                             unsigned int* destLen,
+                             char*         source,
+                             unsigned int  sourceLen,
+                             int           small,
+                             int           verbosity )
+{
+   bz_stream strm;
+   int ret;
+
+   if (dest == NULL || destLen == NULL ||
+       source == NULL ||
+       (small != 0 && small != 1) ||
+       verbosity < 0 || verbosity > 4)
+          return BZ_PARAM_ERROR;
+
+   strm.bzalloc = NULL;
+   strm.bzfree = NULL;
+   strm.opaque = NULL;
+   ret = BZ2_bzDecompressInit ( &strm, verbosity, small );
+   if (ret != BZ_OK) return ret;
+
+   strm.next_in = source;
+   strm.next_out = dest;
+   strm.avail_in = sourceLen;
+   strm.avail_out = *destLen;
+
+   ret = BZ2_bzDecompress ( &strm );
+   if (ret == BZ_OK) goto output_overflow_or_eof;
+   if (ret != BZ_STREAM_END) goto errhandler;
+
+   /* normal termination */
+   *destLen -= strm.avail_out;
+   BZ2_bzDecompressEnd ( &strm );
+   return BZ_OK;
+
+   output_overflow_or_eof:
+   if (strm.avail_out > 0) {
+      BZ2_bzDecompressEnd ( &strm );
+      return BZ_UNEXPECTED_EOF;
+   } else {
+      BZ2_bzDecompressEnd ( &strm );
+      return BZ_OUTBUFF_FULL;
+   };
+
+   errhandler:
+   BZ2_bzDecompressEnd ( &strm );
+   return ret;
+}
+
+
+/*---------------------------------------------------*/
+/*--
+   Code contributed by Yoshioka Tsuneo
+   (QWF00133@niftyserve.or.jp/tsuneo-y@is.aist-nara.ac.jp),
+   to support better zlib compatibility.
+   This code is not _officially_ part of libbzip2 (yet);
+   I haven't tested it, documented it, or considered the
+   threading-safeness of it.
+   If this code breaks, please contact both Yoshioka and me.
+--*/
+/*---------------------------------------------------*/
+
+/*---------------------------------------------------*/
+/*--
+   return version like "0.9.0c".
+--*/
+const char * BZ_API(BZ2_bzlibVersion)(void)
+{
+   return BZ_VERSION;
+}
+
+
+#ifndef BZ_NO_STDIO
+/*---------------------------------------------------*/
+
+#if defined(_WIN32) || defined(OS2) || defined(MSDOS)
+#   include <fcntl.h>
+#   include <io.h>
+#   define SET_BINARY_MODE(file) setmode(fileno(file),O_BINARY)
+#else
+#   define SET_BINARY_MODE(file)
+#endif
+static
+BZFILE * bzopen_or_bzdopen
+               ( const char *path,   /* no use when bzdopen */
+                 int fd,             /* no use when bzdopen */
+                 const char *mode,
+                 int open_mode)      /* bzopen: 0, bzdopen:1 */
+{
+   int    bzerr;
+   char   unused[BZ_MAX_UNUSED];
+   int    blockSize100k = 9;
+   int    writing       = 0;
+   char   mode2[10]     = "";
+   FILE   *fp           = NULL;
+   BZFILE *bzfp         = NULL;
+   int    verbosity     = 0;
+   int    workFactor    = 30;
+   int    smallMode     = 0;
+   int    nUnused       = 0;
+
+   if (mode == NULL) return NULL;
+   while (*mode) {
+      switch (*mode) {
+      case 'r':
+         writing = 0; break;
+      case 'w':
+         writing = 1; break;
+      case 's':
+         smallMode = 1; break;
+      default:
+         if (isdigit((int)(*mode))) {
+            blockSize100k = *mode-BZ_HDR_0;
+         }
+      }
+      mode++;
+   }
+   strcat(mode2, writing ? "w" : "r" );
+   strcat(mode2,"b");   /* binary mode */
+
+   if (open_mode==0) {
+      if (path==NULL || strcmp(path,"")==0) {
+        fp = (writing ? stdout : stdin);
+        SET_BINARY_MODE(fp);
+      } else {
+        fp = fopen(path,mode2);
+      }
+   } else {
+#ifdef BZ_STRICT_ANSI
+      fp = NULL;
+#else
+      fp = fdopen(fd,mode2);
+#endif
+   }
+   if (fp == NULL) return NULL;
+
+   if (writing) {
+      /* Guard against total chaos and anarchy -- JRS */
+      if (blockSize100k < 1) blockSize100k = 1;
+      if (blockSize100k > 9) blockSize100k = 9;
+      bzfp = BZ2_bzWriteOpen(&bzerr,fp,blockSize100k,
+                             verbosity,workFactor);
+   } else {
+      bzfp = BZ2_bzReadOpen(&bzerr,fp,verbosity,smallMode,
+                            unused,nUnused);
+   }
+   if (bzfp == NULL) {
+      if (fp != stdin && fp != stdout) fclose(fp);
+      return NULL;
+   }
+   return bzfp;
+}
+
+
+/*---------------------------------------------------*/
+/*--
+   open file for read or write.
+      ex) bzopen("file","w9")
+      case path="" or NULL => use stdin or stdout.
+--*/
+BZFILE * BZ_API(BZ2_bzopen)
+               ( const char *path,
+                 const char *mode )
+{
+   return bzopen_or_bzdopen(path,-1,mode,/*bzopen*/0);
+}
+
+
+/*---------------------------------------------------*/
+BZFILE * BZ_API(BZ2_bzdopen)
+               ( int fd,
+                 const char *mode )
+{
+   return bzopen_or_bzdopen(NULL,fd,mode,/*bzdopen*/1);
+}
+
+
+/*---------------------------------------------------*/
+int BZ_API(BZ2_bzread) (BZFILE* b, void* buf, int len )
+{
+   int bzerr, nread;
+   if (((bzFile*)b)->lastErr == BZ_STREAM_END) return 0;
+   nread = BZ2_bzRead(&bzerr,b,buf,len);
+   if (bzerr == BZ_OK || bzerr == BZ_STREAM_END) {
+      return nread;
+   } else {
+      return -1;
+   }
+}
+
+
+/*---------------------------------------------------*/
+int BZ_API(BZ2_bzwrite) (BZFILE* b, void* buf, int len )
+{
+   int bzerr;
+
+   BZ2_bzWrite(&bzerr,b,buf,len);
+   if(bzerr == BZ_OK){
+      return len;
+   }else{
+      return -1;
+   }
+}
+
+
+/*---------------------------------------------------*/
+int BZ_API(BZ2_bzflush) (BZFILE *b)
+{
+   /* do nothing now... */
+   return 0;
+}
+
+
+/*---------------------------------------------------*/
+void BZ_API(BZ2_bzclose) (BZFILE* b)
+{
+   int bzerr;
+   FILE *fp = ((bzFile *)b)->handle;
+
+   if (b==NULL) {return;}
+   if(((bzFile*)b)->writing){
+      BZ2_bzWriteClose(&bzerr,b,0,NULL,NULL);
+      if(bzerr != BZ_OK){
+         BZ2_bzWriteClose(NULL,b,1,NULL,NULL);
+      }
+   }else{
+      BZ2_bzReadClose(&bzerr,b);
+   }
+   if(fp!=stdin && fp!=stdout){
+      fclose(fp);
+   }
+}
+
+
+/*---------------------------------------------------*/
+/*--
+   return last error code
+--*/
+static char *bzerrorstrings[] = {
+       "OK"
+      ,"SEQUENCE_ERROR"
+      ,"PARAM_ERROR"
+      ,"MEM_ERROR"
+      ,"DATA_ERROR"
+      ,"DATA_ERROR_MAGIC"
+      ,"IO_ERROR"
+      ,"UNEXPECTED_EOF"
+      ,"OUTBUFF_FULL"
+      ,"CONFIG_ERROR"
+      ,"???"   /* for future */
+      ,"???"   /* for future */
+      ,"???"   /* for future */
+      ,"???"   /* for future */
+      ,"???"   /* for future */
+      ,"???"   /* for future */
+};
+
+
+const char * BZ_API(BZ2_bzerror) (BZFILE *b, int *errnum)
+{
+   int err = ((bzFile *)b)->lastErr;
+
+   if(err>0) err = 0;
+   *errnum = err;
+   return bzerrorstrings[err*-1];
+}
+#endif
+
+
+/*-------------------------------------------------------------*/
+/*--- end                                           bzlib.c ---*/
+/*-------------------------------------------------------------*/
diff --git a/uppsrc/plugin/bz2/lib/bzlib.h b/uppsrc/plugin/bz2/lib/bzlib.h
new file mode 100644
index 000000000..6a004f671
--- /dev/null
+++ b/uppsrc/plugin/bz2/lib/bzlib.h
@@ -0,0 +1,321 @@
+
+/*-------------------------------------------------------------*/
+/*--- Public header file for the library.                   ---*/
+/*---                                               bzlib.h ---*/
+/*-------------------------------------------------------------*/
+
+/*--
+  This file is a part of bzip2 and/or libbzip2, a program and
+  library for lossless, block-sorting data compression.
+
+  Copyright (C) 1996-2002 Julian R Seward.  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions
+  are met:
+
+  1. Redistributions of source code must retain the above copyright
+     notice, this list of conditions and the following disclaimer.
+
+  2. The origin of this software must not be misrepresented; you must
+     not claim that you wrote the original software.  If you use this
+     software in a product, an acknowledgment in the product
+     documentation would be appreciated but is not required.
+
+  3. Altered source versions must be plainly marked as such, and must
+     not be misrepresented as being the original software.
+
+  4. The name of the author may not be used to endorse or promote
+     products derived from this software without specific prior written
+     permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+  OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+  ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+  GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+  Julian Seward, Cambridge, UK.
+  jseward@acm.org
+  bzip2/libbzip2 version 1.0 of 21 March 2000
+
+  This program is based on (at least) the work of:
+     Mike Burrows
+     David Wheeler
+     Peter Fenwick
+     Alistair Moffat
+     Radford Neal
+     Ian H. Witten
+     Robert Sedgewick
+     Jon L. Bentley
+
+  For more information on these sources, see the manual.
+--*/
+
+
+#ifndef _BZLIB_H
+#define _BZLIB_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define BZ_RUN               0
+#define BZ_FLUSH             1
+#define BZ_FINISH            2
+
+#define BZ_OK                0
+#define BZ_RUN_OK            1
+#define BZ_FLUSH_OK          2
+#define BZ_FINISH_OK         3
+#define BZ_STREAM_END        4
+#define BZ_SEQUENCE_ERROR    (-1)
+#define BZ_PARAM_ERROR       (-2)
+#define BZ_MEM_ERROR         (-3)
+#define BZ_DATA_ERROR        (-4)
+#define BZ_DATA_ERROR_MAGIC  (-5)
+#define BZ_IO_ERROR          (-6)
+#define BZ_UNEXPECTED_EOF    (-7)
+#define BZ_OUTBUFF_FULL      (-8)
+#define BZ_CONFIG_ERROR      (-9)
+
+typedef
+   struct {
+      char *next_in;
+      unsigned int avail_in;
+      unsigned int total_in_lo32;
+      unsigned int total_in_hi32;
+
+      char *next_out;
+      unsigned int avail_out;
+      unsigned int total_out_lo32;
+      unsigned int total_out_hi32;
+
+      void *state;
+
+      void *(*bzalloc)(void *,int,int);
+      void (*bzfree)(void *,void *);
+      void *opaque;
+   }
+   bz_stream;
+
+
+#ifndef BZ_IMPORT
+#define BZ_EXPORT
+#endif
+
+/* Need a definitition for FILE */
+#include <stdio.h>
+
+#ifdef _WIN32
+#   include <windows.h>
+#   ifdef small
+      /* windows.h define small to char */
+#      undef small
+#   endif
+#   ifdef BZ_EXPORT
+#   define BZ_API(func) WINAPI func
+#   define BZ_EXTERN extern
+#   else
+   /* import windows dll dynamically */
+#   define BZ_API(func) (WINAPI * func)
+#   define BZ_EXTERN
+#   endif
+#else
+#   define BZ_API(func) func
+#   define BZ_EXTERN extern
+#endif
+
+
+/*-- Core (low-level) library functions --*/
+
+BZ_EXTERN int BZ_API(BZ2_bzCompressInit) (
+      bz_stream* strm,
+      int        blockSize100k,
+      int        verbosity,
+      int        workFactor
+   );
+
+BZ_EXTERN int BZ_API(BZ2_bzCompress) (
+      bz_stream* strm,
+      int action
+   );
+
+BZ_EXTERN int BZ_API(BZ2_bzCompressEnd) (
+      bz_stream* strm
+   );
+
+BZ_EXTERN int BZ_API(BZ2_bzDecompressInit) (
+      bz_stream *strm,
+      int       verbosity,
+      int       small
+   );
+
+BZ_EXTERN int BZ_API(BZ2_bzDecompress) (
+      bz_stream* strm
+   );
+
+BZ_EXTERN int BZ_API(BZ2_bzDecompressEnd) (
+      bz_stream *strm
+   );
+
+
+
+/*-- High(er) level library functions --*/
+
+#ifndef BZ_NO_STDIO
+#define BZ_MAX_UNUSED 5000
+
+typedef void BZFILE;
+
+BZ_EXTERN BZFILE* BZ_API(BZ2_bzReadOpen) (
+      int*  bzerror,
+      FILE* f,
+      int   verbosity,
+      int   small,
+      void* unused,
+      int   nUnused
+   );
+
+BZ_EXTERN void BZ_API(BZ2_bzReadClose) (
+      int*    bzerror,
+      BZFILE* b
+   );
+
+BZ_EXTERN void BZ_API(BZ2_bzReadGetUnused) (
+      int*    bzerror,
+      BZFILE* b,
+      void**  unused,
+      int*    nUnused
+   );
+
+BZ_EXTERN int BZ_API(BZ2_bzRead) (
+      int*    bzerror,
+      BZFILE* b,
+      void*   buf,
+      int     len
+   );
+
+BZ_EXTERN BZFILE* BZ_API(BZ2_bzWriteOpen) (
+      int*  bzerror,
+      FILE* f,
+      int   blockSize100k,
+      int   verbosity,
+      int   workFactor
+   );
+
+BZ_EXTERN void BZ_API(BZ2_bzWrite) (
+      int*    bzerror,
+      BZFILE* b,
+      void*   buf,
+      int     len
+   );
+
+BZ_EXTERN void BZ_API(BZ2_bzWriteClose) (
+      int*          bzerror,
+      BZFILE*       b,
+      int           abandon,
+      unsigned int* nbytes_in,
+      unsigned int* nbytes_out
+   );
+
+BZ_EXTERN void BZ_API(BZ2_bzWriteClose64) (
+      int*          bzerror,
+      BZFILE*       b,
+      int           abandon,
+      unsigned int* nbytes_in_lo32,
+      unsigned int* nbytes_in_hi32,
+      unsigned int* nbytes_out_lo32,
+      unsigned int* nbytes_out_hi32
+   );
+#endif
+
+
+/*-- Utility functions --*/
+
+BZ_EXTERN int BZ_API(BZ2_bzBuffToBuffCompress) (
+      char*         dest,
+      unsigned int* destLen,
+      char*         source,
+      unsigned int  sourceLen,
+      int           blockSize100k,
+      int           verbosity,
+      int           workFactor
+   );
+
+BZ_EXTERN int BZ_API(BZ2_bzBuffToBuffDecompress) (
+      char*         dest,
+      unsigned int* destLen,
+      char*         source,
+      unsigned int  sourceLen,
+      int           small,
+      int           verbosity
+   );
+
+
+/*--
+   Code contributed by Yoshioka Tsuneo
+   (QWF00133@niftyserve.or.jp/tsuneo-y@is.aist-nara.ac.jp),
+   to support better zlib compatibility.
+   This code is not _officially_ part of libbzip2 (yet);
+   I haven't tested it, documented it, or considered the
+   threading-safeness of it.
+   If this code breaks, please contact both Yoshioka and me.
+--*/
+
+BZ_EXTERN const char * BZ_API(BZ2_bzlibVersion) (
+      void
+   );
+
+#ifndef BZ_NO_STDIO
+BZ_EXTERN BZFILE * BZ_API(BZ2_bzopen) (
+      const char *path,
+      const char *mode
+   );
+
+BZ_EXTERN BZFILE * BZ_API(BZ2_bzdopen) (
+      int        fd,
+      const char *mode
+   );
+
+BZ_EXTERN int BZ_API(BZ2_bzread) (
+      BZFILE* b,
+      void* buf,
+      int len
+   );
+
+BZ_EXTERN int BZ_API(BZ2_bzwrite) (
+      BZFILE* b,
+      void*   buf,
+      int     len
+   );
+
+BZ_EXTERN int BZ_API(BZ2_bzflush) (
+      BZFILE* b
+   );
+
+BZ_EXTERN void BZ_API(BZ2_bzclose) (
+      BZFILE* b
+   );
+
+BZ_EXTERN const char * BZ_API(BZ2_bzerror) (
+      BZFILE *b,
+      int    *errnum
+   );
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+
+/*-------------------------------------------------------------*/
+/*--- end                                           bzlib.h ---*/
+/*-------------------------------------------------------------*/
diff --git a/uppsrc/plugin/bz2/lib/bzlib_private.h b/uppsrc/plugin/bz2/lib/bzlib_private.h
new file mode 100644
index 000000000..568334152
--- /dev/null
+++ b/uppsrc/plugin/bz2/lib/bzlib_private.h
@@ -0,0 +1,537 @@
+
+/*-------------------------------------------------------------*/
+/*--- Private header file for the library.                  ---*/
+/*---                                       bzlib_private.h ---*/
+/*-------------------------------------------------------------*/
+
+/*--
+  This file is a part of bzip2 and/or libbzip2, a program and
+  library for lossless, block-sorting data compression.
+
+  Copyright (C) 1996-2002 Julian R Seward.  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions
+  are met:
+
+  1. Redistributions of source code must retain the above copyright
+     notice, this list of conditions and the following disclaimer.
+
+  2. The origin of this software must not be misrepresented; you must
+     not claim that you wrote the original software.  If you use this
+     software in a product, an acknowledgment in the product
+     documentation would be appreciated but is not required.
+
+  3. Altered source versions must be plainly marked as such, and must
+     not be misrepresented as being the original software.
+
+  4. The name of the author may not be used to endorse or promote
+     products derived from this software without specific prior written
+     permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+  OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+  ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+  GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+  Julian Seward, Cambridge, UK.
+  jseward@acm.org
+  bzip2/libbzip2 version 1.0 of 21 March 2000
+
+  This program is based on (at least) the work of:
+     Mike Burrows
+     David Wheeler
+     Peter Fenwick
+     Alistair Moffat
+     Radford Neal
+     Ian H. Witten
+     Robert Sedgewick
+     Jon L. Bentley
+
+  For more information on these sources, see the manual.
+--*/
+
+
+#ifndef _BZLIB_PRIVATE_H
+#define _BZLIB_PRIVATE_H
+
+#include <stdlib.h>
+
+#ifndef BZ_NO_STDIO
+#include <stdio.h>
+#include <ctype.h>
+#include <string.h>
+#endif
+
+#include "bzlib.h"
+
+
+
+/*-- General stuff. --*/
+
+#define BZ_VERSION  "1.0.2, 30-Dec-2001"
+
+typedef char            Char;
+typedef unsigned char   Bool;
+typedef unsigned char   UChar;
+typedef int             Int32;
+typedef unsigned int    UInt32;
+typedef short           Int16;
+typedef unsigned short  UInt16;
+
+#define True  ((Bool)1)
+#define False ((Bool)0)
+
+#ifndef __GNUC__
+#define __inline__  /* */
+#endif
+
+#ifndef BZ_NO_STDIO
+extern void BZ2_bz__AssertH__fail ( int errcode );
+#define AssertH(cond,errcode) \
+   { if (!(cond)) BZ2_bz__AssertH__fail ( errcode ); }
+#if BZ_DEBUG
+#define AssertD(cond,msg) \
+   { if (!(cond)) {       \
+      fprintf ( stderr,   \
+        "\n\nlibbzip2(debug build): internal error\n\t%s\n", msg );\
+      exit(1); \
+   }}
+#else
+#define AssertD(cond,msg) /* */
+#endif
+#define VPrintf0(zf) \
+   fprintf(stderr,zf)
+#define VPrintf1(zf,za1) \
+   fprintf(stderr,zf,za1)
+#define VPrintf2(zf,za1,za2) \
+   fprintf(stderr,zf,za1,za2)
+#define VPrintf3(zf,za1,za2,za3) \
+   fprintf(stderr,zf,za1,za2,za3)
+#define VPrintf4(zf,za1,za2,za3,za4) \
+   fprintf(stderr,zf,za1,za2,za3,za4)
+#define VPrintf5(zf,za1,za2,za3,za4,za5) \
+   fprintf(stderr,zf,za1,za2,za3,za4,za5)
+#else
+extern void bz_internal_error ( int errcode );
+#define AssertH(cond,errcode) \
+   { if (!(cond)) bz_internal_error ( errcode ); }
+#define AssertD(cond,msg) /* */
+#define VPrintf0(zf) /* */
+#define VPrintf1(zf,za1) /* */
+#define VPrintf2(zf,za1,za2) /* */
+#define VPrintf3(zf,za1,za2,za3) /* */
+#define VPrintf4(zf,za1,za2,za3,za4) /* */
+#define VPrintf5(zf,za1,za2,za3,za4,za5) /* */
+#endif
+
+
+#define BZALLOC(nnn) (strm->bzalloc)(strm->opaque,(nnn),1)
+#define BZFREE(ppp)  (strm->bzfree)(strm->opaque,(ppp))
+
+
+/*-- Header bytes. --*/
+
+#define BZ_HDR_B 0x42   /* 'B' */
+#define BZ_HDR_Z 0x5a   /* 'Z' */
+#define BZ_HDR_h 0x68   /* 'h' */
+#define BZ_HDR_0 0x30   /* '0' */
+
+/*-- Constants for the back end. --*/
+
+#define BZ_MAX_ALPHA_SIZE 258
+#define BZ_MAX_CODE_LEN    23
+
+#define BZ_RUNA 0
+#define BZ_RUNB 1
+
+#define BZ_N_GROUPS 6
+#define BZ_G_SIZE   50
+#define BZ_N_ITERS  4
+
+#define BZ_MAX_SELECTORS (2 + (900000 / BZ_G_SIZE))
+
+
+
+/*-- Stuff for randomising repetitive blocks. --*/
+
+extern Int32 BZ2_rNums[512];
+
+#define BZ_RAND_DECLS                          \
+   Int32 rNToGo;                               \
+   Int32 rTPos                                 \
+
+#define BZ_RAND_INIT_MASK                      \
+   s->rNToGo = 0;                              \
+   s->rTPos  = 0                               \
+
+#define BZ_RAND_MASK ((s->rNToGo == 1) ? 1 : 0)
+
+#define BZ_RAND_UPD_MASK                       \
+   if (s->rNToGo == 0) {                       \
+      s->rNToGo = BZ2_rNums[s->rTPos];         \
+      s->rTPos++;                              \
+      if (s->rTPos == 512) s->rTPos = 0;       \
+   }                                           \
+   s->rNToGo--;
+
+
+
+/*-- Stuff for doing CRCs. --*/
+
+extern UInt32 BZ2_crc32Table[256];
+
+#define BZ_INITIALISE_CRC(crcVar)              \
+{                                              \
+   crcVar = 0xffffffffL;                       \
+}
+
+#define BZ_FINALISE_CRC(crcVar)                \
+{                                              \
+   crcVar = ~(crcVar);                         \
+}
+
+#define BZ_UPDATE_CRC(crcVar,cha)              \
+{                                              \
+   crcVar = (crcVar << 8) ^                    \
+            BZ2_crc32Table[(crcVar >> 24) ^    \
+                           ((UChar)cha)];      \
+}
+
+
+
+/*-- States and modes for compression. --*/
+
+#define BZ_M_IDLE      1
+#define BZ_M_RUNNING   2
+#define BZ_M_FLUSHING  3
+#define BZ_M_FINISHING 4
+
+#define BZ_S_OUTPUT    1
+#define BZ_S_INPUT     2
+
+#define BZ_N_RADIX 2
+#define BZ_N_QSORT 12
+#define BZ_N_SHELL 18
+#define BZ_N_OVERSHOOT (BZ_N_RADIX + BZ_N_QSORT + BZ_N_SHELL + 2)
+
+
+
+
+/*-- Structure holding all the compression-side stuff. --*/
+
+typedef
+   struct {
+      /* pointer back to the struct bz_stream */
+      bz_stream* strm;
+
+      /* mode this stream is in, and whether inputting */
+      /* or outputting data */
+      Int32    mode;
+      Int32    state;
+
+      /* remembers avail_in when flush/finish requested */
+      UInt32   avail_in_expect;
+
+      /* for doing the block sorting */
+      UInt32*  arr1;
+      UInt32*  arr2;
+      UInt32*  ftab;
+      Int32    origPtr;
+
+      /* aliases for arr1 and arr2 */
+      UInt32*  ptr;
+      UChar*   block;
+      UInt16*  mtfv;
+      UChar*   zbits;
+
+      /* for deciding when to use the fallback sorting algorithm */
+      Int32    workFactor;
+
+      /* run-length-encoding of the input */
+      UInt32   state_in_ch;
+      Int32    state_in_len;
+      BZ_RAND_DECLS;
+
+      /* input and output limits and current posns */
+      Int32    nblock;
+      Int32    nblockMAX;
+      Int32    numZ;
+      Int32    state_out_pos;
+
+      /* map of bytes used in block */
+      Int32    nInUse;
+      Bool     inUse[256];
+      UChar    unseqToSeq[256];
+
+      /* the buffer for bit stream creation */
+      UInt32   bsBuff;
+      Int32    bsLive;
+
+      /* block and combined CRCs */
+      UInt32   blockCRC;
+      UInt32   combinedCRC;
+
+      /* misc administratium */
+      Int32    verbosity;
+      Int32    blockNo;
+      Int32    blockSize100k;
+
+      /* stuff for coding the MTF values */
+      Int32    nMTF;
+      Int32    mtfFreq    [BZ_MAX_ALPHA_SIZE];
+      UChar    selector   [BZ_MAX_SELECTORS];
+      UChar    selectorMtf[BZ_MAX_SELECTORS];
+
+      UChar    len     [BZ_N_GROUPS][BZ_MAX_ALPHA_SIZE];
+      Int32    code    [BZ_N_GROUPS][BZ_MAX_ALPHA_SIZE];
+      Int32    rfreq   [BZ_N_GROUPS][BZ_MAX_ALPHA_SIZE];
+      /* second dimension: only 3 needed; 4 makes index calculations faster */
+      UInt32   len_pack[BZ_MAX_ALPHA_SIZE][4];
+
+   }
+   EState;
+
+
+
+/*-- externs for compression. --*/
+
+extern void
+BZ2_blockSort ( EState* );
+
+extern void
+BZ2_compressBlock ( EState*, Bool );
+
+extern void
+BZ2_bsInitWrite ( EState* );
+
+extern void
+BZ2_hbAssignCodes ( Int32*, UChar*, Int32, Int32, Int32 );
+
+extern void
+BZ2_hbMakeCodeLengths ( UChar*, Int32*, Int32, Int32 );
+
+
+
+/*-- states for decompression. --*/
+
+#define BZ_X_IDLE        1
+#define BZ_X_OUTPUT      2
+
+#define BZ_X_MAGIC_1     10
+#define BZ_X_MAGIC_2     11
+#define BZ_X_MAGIC_3     12
+#define BZ_X_MAGIC_4     13
+#define BZ_X_BLKHDR_1    14
+#define BZ_X_BLKHDR_2    15
+#define BZ_X_BLKHDR_3    16
+#define BZ_X_BLKHDR_4    17
+#define BZ_X_BLKHDR_5    18
+#define BZ_X_BLKHDR_6    19
+#define BZ_X_BCRC_1      20
+#define BZ_X_BCRC_2      21
+#define BZ_X_BCRC_3      22
+#define BZ_X_BCRC_4      23
+#define BZ_X_RANDBIT     24
+#define BZ_X_ORIGPTR_1   25
+#define BZ_X_ORIGPTR_2   26
+#define BZ_X_ORIGPTR_3   27
+#define BZ_X_MAPPING_1   28
+#define BZ_X_MAPPING_2   29
+#define BZ_X_SELECTOR_1  30
+#define BZ_X_SELECTOR_2  31
+#define BZ_X_SELECTOR_3  32
+#define BZ_X_CODING_1    33
+#define BZ_X_CODING_2    34
+#define BZ_X_CODING_3    35
+#define BZ_X_MTF_1       36
+#define BZ_X_MTF_2       37
+#define BZ_X_MTF_3       38
+#define BZ_X_MTF_4       39
+#define BZ_X_MTF_5       40
+#define BZ_X_MTF_6       41
+#define BZ_X_ENDHDR_2    42
+#define BZ_X_ENDHDR_3    43
+#define BZ_X_ENDHDR_4    44
+#define BZ_X_ENDHDR_5    45
+#define BZ_X_ENDHDR_6    46
+#define BZ_X_CCRC_1      47
+#define BZ_X_CCRC_2      48
+#define BZ_X_CCRC_3      49
+#define BZ_X_CCRC_4      50
+
+
+
+/*-- Constants for the fast MTF decoder. --*/
+
+#define MTFA_SIZE 4096
+#define MTFL_SIZE 16
+
+
+
+/*-- Structure holding all the decompression-side stuff. --*/
+
+typedef
+   struct {
+      /* pointer back to the struct bz_stream */
+      bz_stream* strm;
+
+      /* state indicator for this stream */
+      Int32    state;
+
+      /* for doing the final run-length decoding */
+      UChar    state_out_ch;
+      Int32    state_out_len;
+      Bool     blockRandomised;
+      BZ_RAND_DECLS;
+
+      /* the buffer for bit stream reading */
+      UInt32   bsBuff;
+      Int32    bsLive;
+
+      /* misc administratium */
+      Int32    blockSize100k;
+      Bool     smallDecompress;
+      Int32    currBlockNo;
+      Int32    verbosity;
+
+      /* for undoing the Burrows-Wheeler transform */
+      Int32    origPtr;
+      UInt32   tPos;
+      Int32    k0;
+      Int32    unzftab[256];
+      Int32    nblock_used;
+      Int32    cftab[257];
+      Int32    cftabCopy[257];
+
+      /* for undoing the Burrows-Wheeler transform (FAST) */
+      UInt32   *tt;
+
+      /* for undoing the Burrows-Wheeler transform (SMALL) */
+      UInt16   *ll16;
+      UChar    *ll4;
+
+      /* stored and calculated CRCs */
+      UInt32   storedBlockCRC;
+      UInt32   storedCombinedCRC;
+      UInt32   calculatedBlockCRC;
+      UInt32   calculatedCombinedCRC;
+
+      /* map of bytes used in block */
+      Int32    nInUse;
+      Bool     inUse[256];
+      Bool     inUse16[16];
+      UChar    seqToUnseq[256];
+
+      /* for decoding the MTF values */
+      UChar    mtfa   [MTFA_SIZE];
+      Int32    mtfbase[256 / MTFL_SIZE];
+      UChar    selector   [BZ_MAX_SELECTORS];
+      UChar    selectorMtf[BZ_MAX_SELECTORS];
+      UChar    len  [BZ_N_GROUPS][BZ_MAX_ALPHA_SIZE];
+
+      Int32    limit  [BZ_N_GROUPS][BZ_MAX_ALPHA_SIZE];
+      Int32    base   [BZ_N_GROUPS][BZ_MAX_ALPHA_SIZE];
+      Int32    perm   [BZ_N_GROUPS][BZ_MAX_ALPHA_SIZE];
+      Int32    minLens[BZ_N_GROUPS];
+
+      /* save area for scalars in the main decompress code */
+      Int32    save_i;
+      Int32    save_j;
+      Int32    save_t;
+      Int32    save_alphaSize;
+      Int32    save_nGroups;
+      Int32    save_nSelectors;
+      Int32    save_EOB;
+      Int32    save_groupNo;
+      Int32    save_groupPos;
+      Int32    save_nextSym;
+      Int32    save_nblockMAX;
+      Int32    save_nblock;
+      Int32    save_es;
+      Int32    save_N;
+      Int32    save_curr;
+      Int32    save_zt;
+      Int32    save_zn;
+      Int32    save_zvec;
+      Int32    save_zj;
+      Int32    save_gSel;
+      Int32    save_gMinlen;
+      Int32*   save_gLimit;
+      Int32*   save_gBase;
+      Int32*   save_gPerm;
+
+   }
+   DState;
+
+
+
+/*-- Macros for decompression. --*/
+
+#define BZ_GET_FAST(cccc)                     \
+    s->tPos = s->tt[s->tPos];                 \
+    cccc = (UChar)(s->tPos & 0xff);           \
+    s->tPos >>= 8;
+
+#define BZ_GET_FAST_C(cccc)                   \
+    c_tPos = c_tt[c_tPos];                    \
+    cccc = (UChar)(c_tPos & 0xff);            \
+    c_tPos >>= 8;
+
+#define SET_LL4(i,n)                                          \
+   { if (((i) & 0x1) == 0)                                    \
+        s->ll4[(i) >> 1] = (s->ll4[(i) >> 1] & 0xf0) | (n); else    \
+        s->ll4[(i) >> 1] = (s->ll4[(i) >> 1] & 0x0f) | ((n) << 4);  \
+   }
+
+#define GET_LL4(i)                             \
+   ((((UInt32)(s->ll4[(i) >> 1])) >> (((i) << 2) & 0x4)) & 0xF)
+
+#define SET_LL(i,n)                          \
+   { s->ll16[i] = (UInt16)(n & 0x0000ffff);  \
+     SET_LL4(i, n >> 16);                    \
+   }
+
+#define GET_LL(i) \
+   (((UInt32)s->ll16[i]) | (GET_LL4(i) << 16))
+
+#define BZ_GET_SMALL(cccc)                            \
+      cccc = BZ2_indexIntoF ( s->tPos, s->cftab );    \
+      s->tPos = GET_LL(s->tPos);
+
+
+/*-- externs for decompression. --*/
+
+extern Int32
+BZ2_indexIntoF ( Int32, Int32* );
+
+extern Int32
+BZ2_decompress ( DState* );
+
+extern void
+BZ2_hbCreateDecodeTables ( Int32*, Int32*, Int32*, UChar*,
+                           Int32,  Int32, Int32 );
+
+
+#endif
+
+
+/*-- BZ_NO_STDIO seems to make NULL disappear on some platforms. --*/
+
+#ifdef BZ_NO_STDIO
+#ifndef NULL
+#define NULL 0
+#endif
+#endif
+
+
+/*-------------------------------------------------------------*/
+/*--- end                                   bzlib_private.h ---*/
+/*-------------------------------------------------------------*/
diff --git a/uppsrc/plugin/bz2/lib/compress.c b/uppsrc/plugin/bz2/lib/compress.c
new file mode 100644
index 000000000..a9dddcfdd
--- /dev/null
+++ b/uppsrc/plugin/bz2/lib/compress.c
@@ -0,0 +1,714 @@
+
+/*-------------------------------------------------------------*/
+/*--- Compression machinery (not incl block sorting)        ---*/
+/*---                                            compress.c ---*/
+/*-------------------------------------------------------------*/
+
+/*--
+  This file is a part of bzip2 and/or libbzip2, a program and
+  library for lossless, block-sorting data compression.
+
+  Copyright (C) 1996-2002 Julian R Seward.  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions
+  are met:
+
+  1. Redistributions of source code must retain the above copyright
+     notice, this list of conditions and the following disclaimer.
+
+  2. The origin of this software must not be misrepresented; you must
+     not claim that you wrote the original software.  If you use this
+     software in a product, an acknowledgment in the product
+     documentation would be appreciated but is not required.
+
+  3. Altered source versions must be plainly marked as such, and must
+     not be misrepresented as being the original software.
+
+  4. The name of the author may not be used to endorse or promote
+     products derived from this software without specific prior written
+     permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+  OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+  ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+  GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+  Julian Seward, Cambridge, UK.
+  jseward@acm.org
+  bzip2/libbzip2 version 1.0 of 21 March 2000
+
+  This program is based on (at least) the work of:
+     Mike Burrows
+     David Wheeler
+     Peter Fenwick
+     Alistair Moffat
+     Radford Neal
+     Ian H. Witten
+     Robert Sedgewick
+     Jon L. Bentley
+
+  For more information on these sources, see the manual.
+--*/
+
+/*--
+   CHANGES
+   ~~~~~~~
+   0.9.0 -- original version.
+
+   0.9.0a/b -- no changes in this file.
+
+   0.9.0c
+      * changed setting of nGroups in sendMTFValues() so as to
+        do a bit better on small files
+--*/
+
+#include "bzlib_private.h"
+
+
+/*---------------------------------------------------*/
+/*--- Bit stream I/O                              ---*/
+/*---------------------------------------------------*/
+
+/*---------------------------------------------------*/
+void BZ2_bsInitWrite ( EState* s )
+{
+   s->bsLive = 0;
+   s->bsBuff = 0;
+}
+
+
+/*---------------------------------------------------*/
+static
+void bsFinishWrite ( EState* s )
+{
+   while (s->bsLive > 0) {
+      s->zbits[s->numZ] = (UChar)(s->bsBuff >> 24);
+      s->numZ++;
+      s->bsBuff <<= 8;
+      s->bsLive -= 8;
+   }
+}
+
+
+/*---------------------------------------------------*/
+#define bsNEEDW(nz)                           \
+{                                             \
+   while (s->bsLive >= 8) {                   \
+      s->zbits[s->numZ]                       \
+         = (UChar)(s->bsBuff >> 24);          \
+      s->numZ++;                              \
+      s->bsBuff <<= 8;                        \
+      s->bsLive -= 8;                         \
+   }                                          \
+}
+
+
+/*---------------------------------------------------*/
+static
+__inline__
+void bsW ( EState* s, Int32 n, UInt32 v )
+{
+   bsNEEDW ( n );
+   s->bsBuff |= (v << (32 - s->bsLive - n));
+   s->bsLive += n;
+}
+
+
+/*---------------------------------------------------*/
+static
+void bsPutUInt32 ( EState* s, UInt32 u )
+{
+   bsW ( s, 8, (u >> 24) & 0xffL );
+   bsW ( s, 8, (u >> 16) & 0xffL );
+   bsW ( s, 8, (u >>  8) & 0xffL );
+   bsW ( s, 8,  u        & 0xffL );
+}
+
+
+/*---------------------------------------------------*/
+static
+void bsPutUChar ( EState* s, UChar c )
+{
+   bsW( s, 8, (UInt32)c );
+}
+
+
+/*---------------------------------------------------*/
+/*--- The back end proper                         ---*/
+/*---------------------------------------------------*/
+
+/*---------------------------------------------------*/
+static
+void makeMaps_e ( EState* s )
+{
+   Int32 i;
+   s->nInUse = 0;
+   for (i = 0; i < 256; i++)
+      if (s->inUse[i]) {
+         s->unseqToSeq[i] = s->nInUse;
+         s->nInUse++;
+      }
+}
+
+
+/*---------------------------------------------------*/
+static
+void generateMTFValues ( EState* s )
+{
+   UChar   yy[256];
+   Int32   i, j;
+   Int32   zPend;
+   Int32   wr;
+   Int32   EOB;
+
+   /*
+      After sorting (eg, here),
+         s->arr1 [ 0 .. s->nblock-1 ] holds sorted order,
+         and
+         ((UChar*)s->arr2) [ 0 .. s->nblock-1 ]
+         holds the original block data.
+
+      The first thing to do is generate the MTF values,
+      and put them in
+         ((UInt16*)s->arr1) [ 0 .. s->nblock-1 ].
+      Because there are strictly fewer or equal MTF values
+      than block values, ptr values in this area are overwritten
+      with MTF values only when they are no longer needed.
+
+      The final compressed bitstream is generated into the
+      area starting at
+         (UChar*) (&((UChar*)s->arr2)[s->nblock])
+
+      These storage aliases are set up in bzCompressInit(),
+      except for the last one, which is arranged in
+      compressBlock().
+   */
+   UInt32* ptr   = s->ptr;
+   UChar* block  = s->block;
+   UInt16* mtfv  = s->mtfv;
+
+   makeMaps_e ( s );
+   EOB = s->nInUse+1;
+
+   for (i = 0; i <= EOB; i++) s->mtfFreq[i] = 0;
+
+   wr = 0;
+   zPend = 0;
+   for (i = 0; i < s->nInUse; i++) yy[i] = (UChar) i;
+
+   for (i = 0; i < s->nblock; i++) {
+      UChar ll_i;
+      AssertD ( wr <= i, "generateMTFValues(1)" );
+      j = ptr[i]-1; if (j < 0) j += s->nblock;
+      ll_i = s->unseqToSeq[block[j]];
+      AssertD ( ll_i < s->nInUse, "generateMTFValues(2a)" );
+
+      if (yy[0] == ll_i) {
+         zPend++;
+      } else {
+
+         if (zPend > 0) {
+            zPend--;
+            while (True) {
+               if (zPend & 1) {
+                  mtfv[wr] = BZ_RUNB; wr++;
+                  s->mtfFreq[BZ_RUNB]++;
+               } else {
+                  mtfv[wr] = BZ_RUNA; wr++;
+                  s->mtfFreq[BZ_RUNA]++;
+               }
+               if (zPend < 2) break;
+               zPend = (zPend - 2) / 2;
+            };
+            zPend = 0;
+         }
+         {
+            register UChar  rtmp;
+            register UChar* ryy_j;
+            register UChar  rll_i;
+            rtmp  = yy[1];
+            yy[1] = yy[0];
+            ryy_j = &(yy[1]);
+            rll_i = ll_i;
+            while ( rll_i != rtmp ) {
+               register UChar rtmp2;
+               ryy_j++;
+               rtmp2  = rtmp;
+               rtmp   = *ryy_j;
+               *ryy_j = rtmp2;
+            };
+            yy[0] = rtmp;
+            j = ryy_j - &(yy[0]);
+            mtfv[wr] = j+1; wr++; s->mtfFreq[j+1]++;
+         }
+
+      }
+   }
+
+   if (zPend > 0) {
+      zPend--;
+      while (True) {
+         if (zPend & 1) {
+            mtfv[wr] = BZ_RUNB; wr++;
+            s->mtfFreq[BZ_RUNB]++;
+         } else {
+            mtfv[wr] = BZ_RUNA; wr++;
+            s->mtfFreq[BZ_RUNA]++;
+         }
+         if (zPend < 2) break;
+         zPend = (zPend - 2) / 2;
+      };
+      zPend = 0;
+   }
+
+   mtfv[wr] = EOB; wr++; s->mtfFreq[EOB]++;
+
+   s->nMTF = wr;
+}
+
+
+/*---------------------------------------------------*/
+#define BZ_LESSER_ICOST  0
+#define BZ_GREATER_ICOST 15
+
+static
+void sendMTFValues ( EState* s )
+{
+   Int32 v, t, i, j, gs, ge, totc, bt, bc, iter;
+   Int32 nSelectors, alphaSize, minLen, maxLen, selCtr;
+   Int32 nGroups, nBytes;
+
+   /*--
+   UChar  len [BZ_N_GROUPS][BZ_MAX_ALPHA_SIZE];
+   is a global since the decoder also needs it.
+
+   Int32  code[BZ_N_GROUPS][BZ_MAX_ALPHA_SIZE];
+   Int32  rfreq[BZ_N_GROUPS][BZ_MAX_ALPHA_SIZE];
+   are also globals only used in this proc.
+   Made global to keep stack frame size small.
+   --*/
+
+
+   UInt16 cost[BZ_N_GROUPS];
+   Int32  fave[BZ_N_GROUPS];
+
+   UInt16* mtfv = s->mtfv;
+
+   if (s->verbosity >= 3)
+      VPrintf3( "      %d in block, %d after MTF & 1-2 coding, "
+                "%d+2 syms in use\n",
+                s->nblock, s->nMTF, s->nInUse );
+
+   alphaSize = s->nInUse+2;
+   for (t = 0; t < BZ_N_GROUPS; t++)
+      for (v = 0; v < alphaSize; v++)
+         s->len[t][v] = BZ_GREATER_ICOST;
+
+   /*--- Decide how many coding tables to use ---*/
+   AssertH ( s->nMTF > 0, 3001 );
+   if (s->nMTF < 200)  nGroups = 2; else
+   if (s->nMTF < 600)  nGroups = 3; else
+   if (s->nMTF < 1200) nGroups = 4; else
+   if (s->nMTF < 2400) nGroups = 5; else
+                       nGroups = 6;
+
+   /*--- Generate an initial set of coding tables ---*/
+   {
+      Int32 nPart, remF, tFreq, aFreq;
+
+      nPart = nGroups;
+      remF  = s->nMTF;
+      gs = 0;
+      while (nPart > 0) {
+         tFreq = remF / nPart;
+         ge = gs-1;
+         aFreq = 0;
+         while (aFreq < tFreq && ge < alphaSize-1) {
+            ge++;
+            aFreq += s->mtfFreq[ge];
+         }
+
+         if (ge > gs
+             && nPart != nGroups && nPart != 1
+             && ((nGroups-nPart) % 2 == 1)) {
+            aFreq -= s->mtfFreq[ge];
+            ge--;
+         }
+
+         if (s->verbosity >= 3)
+            VPrintf5( "      initial group %d, [%d .. %d], "
+                      "has %d syms (%4.1f%%)\n",
+                      nPart, gs, ge, aFreq,
+                      (100.0 * (float)aFreq) / (float)(s->nMTF) );
+
+         for (v = 0; v < alphaSize; v++)
+            if (v >= gs && v <= ge)
+               s->len[nPart-1][v] = BZ_LESSER_ICOST; else
+               s->len[nPart-1][v] = BZ_GREATER_ICOST;
+
+         nPart--;
+         gs = ge+1;
+         remF -= aFreq;
+      }
+   }
+
+   /*---
+      Iterate up to BZ_N_ITERS times to improve the tables.
+   ---*/
+   for (iter = 0; iter < BZ_N_ITERS; iter++) {
+
+      for (t = 0; t < nGroups; t++) fave[t] = 0;
+
+      for (t = 0; t < nGroups; t++)
+         for (v = 0; v < alphaSize; v++)
+            s->rfreq[t][v] = 0;
+
+      /*---
+        Set up an auxiliary length table which is used to fast-track
+	the common case (nGroups == 6).
+      ---*/
+      if (nGroups == 6) {
+         for (v = 0; v < alphaSize; v++) {
+            s->len_pack[v][0] = (s->len[1][v] << 16) | s->len[0][v];
+            s->len_pack[v][1] = (s->len[3][v] << 16) | s->len[2][v];
+            s->len_pack[v][2] = (s->len[5][v] << 16) | s->len[4][v];
+	 }
+      }
+
+      nSelectors = 0;
+      totc = 0;
+      gs = 0;
+      while (True) {
+
+         /*--- Set group start & end marks. --*/
+         if (gs >= s->nMTF) break;
+         ge = gs + BZ_G_SIZE - 1;
+         if (ge >= s->nMTF) ge = s->nMTF-1;
+
+         /*--
+            Calculate the cost of this group as coded
+            by each of the coding tables.
+         --*/
+         for (t = 0; t < nGroups; t++) cost[t] = 0;
+
+         if (nGroups == 6 && 50 == ge-gs+1) {
+            /*--- fast track the common case ---*/
+            register UInt32 cost01, cost23, cost45;
+            register UInt16 icv;
+            cost01 = cost23 = cost45 = 0;
+
+#           define BZ_ITER(nn)                \
+               icv = mtfv[gs+(nn)];           \
+               cost01 += s->len_pack[icv][0]; \
+               cost23 += s->len_pack[icv][1]; \
+               cost45 += s->len_pack[icv][2]; \
+
+            BZ_ITER(0);  BZ_ITER(1);  BZ_ITER(2);  BZ_ITER(3);  BZ_ITER(4);
+            BZ_ITER(5);  BZ_ITER(6);  BZ_ITER(7);  BZ_ITER(8);  BZ_ITER(9);
+            BZ_ITER(10); BZ_ITER(11); BZ_ITER(12); BZ_ITER(13); BZ_ITER(14);
+            BZ_ITER(15); BZ_ITER(16); BZ_ITER(17); BZ_ITER(18); BZ_ITER(19);
+            BZ_ITER(20); BZ_ITER(21); BZ_ITER(22); BZ_ITER(23); BZ_ITER(24);
+            BZ_ITER(25); BZ_ITER(26); BZ_ITER(27); BZ_ITER(28); BZ_ITER(29);
+            BZ_ITER(30); BZ_ITER(31); BZ_ITER(32); BZ_ITER(33); BZ_ITER(34);
+            BZ_ITER(35); BZ_ITER(36); BZ_ITER(37); BZ_ITER(38); BZ_ITER(39);
+            BZ_ITER(40); BZ_ITER(41); BZ_ITER(42); BZ_ITER(43); BZ_ITER(44);
+            BZ_ITER(45); BZ_ITER(46); BZ_ITER(47); BZ_ITER(48); BZ_ITER(49);
+
+#           undef BZ_ITER
+
+            cost[0] = cost01 & 0xffff; cost[1] = cost01 >> 16;
+            cost[2] = cost23 & 0xffff; cost[3] = cost23 >> 16;
+            cost[4] = cost45 & 0xffff; cost[5] = cost45 >> 16;
+
+         } else {
+	    /*--- slow version which correctly handles all situations ---*/
+            for (i = gs; i <= ge; i++) {
+               UInt16 icv = mtfv[i];
+               for (t = 0; t < nGroups; t++) cost[t] += s->len[t][icv];
+            }
+         }
+
+         /*--
+            Find the coding table which is best for this group,
+            and record its identity in the selector table.
+         --*/
+         bc = 999999999; bt = -1;
+         for (t = 0; t < nGroups; t++)
+            if (cost[t] < bc) { bc = cost[t]; bt = t; };
+         totc += bc;
+         fave[bt]++;
+         s->selector[nSelectors] = bt;
+         nSelectors++;
+
+         /*--
+            Increment the symbol frequencies for the selected table.
+          --*/
+         if (nGroups == 6 && 50 == ge-gs+1) {
+            /*--- fast track the common case ---*/
+
+#           define BZ_ITUR(nn) s->rfreq[bt][ mtfv[gs+(nn)] ]++
+
+            BZ_ITUR(0);  BZ_ITUR(1);  BZ_ITUR(2);  BZ_ITUR(3);  BZ_ITUR(4);
+            BZ_ITUR(5);  BZ_ITUR(6);  BZ_ITUR(7);  BZ_ITUR(8);  BZ_ITUR(9);
+            BZ_ITUR(10); BZ_ITUR(11); BZ_ITUR(12); BZ_ITUR(13); BZ_ITUR(14);
+            BZ_ITUR(15); BZ_ITUR(16); BZ_ITUR(17); BZ_ITUR(18); BZ_ITUR(19);
+            BZ_ITUR(20); BZ_ITUR(21); BZ_ITUR(22); BZ_ITUR(23); BZ_ITUR(24);
+            BZ_ITUR(25); BZ_ITUR(26); BZ_ITUR(27); BZ_ITUR(28); BZ_ITUR(29);
+            BZ_ITUR(30); BZ_ITUR(31); BZ_ITUR(32); BZ_ITUR(33); BZ_ITUR(34);
+            BZ_ITUR(35); BZ_ITUR(36); BZ_ITUR(37); BZ_ITUR(38); BZ_ITUR(39);
+            BZ_ITUR(40); BZ_ITUR(41); BZ_ITUR(42); BZ_ITUR(43); BZ_ITUR(44);
+            BZ_ITUR(45); BZ_ITUR(46); BZ_ITUR(47); BZ_ITUR(48); BZ_ITUR(49);
+
+#           undef BZ_ITUR
+
+         } else {
+	    /*--- slow version which correctly handles all situations ---*/
+            for (i = gs; i <= ge; i++)
+               s->rfreq[bt][ mtfv[i] ]++;
+         }
+
+         gs = ge+1;
+      }
+      if (s->verbosity >= 3) {
+         VPrintf2 ( "      pass %d: size is %d, grp uses are ",
+                   iter+1, totc/8 );
+         for (t = 0; t < nGroups; t++)
+            VPrintf1 ( "%d ", fave[t] );
+         VPrintf0 ( "\n" );
+      }
+
+      /*--
+        Recompute the tables based on the accumulated frequencies.
+      --*/
+      for (t = 0; t < nGroups; t++)
+         BZ2_hbMakeCodeLengths ( &(s->len[t][0]), &(s->rfreq[t][0]),
+                                 alphaSize, 20 );
+   }
+
+
+   AssertH( nGroups < 8, 3002 );
+   AssertH( nSelectors < 32768 &&
+            nSelectors <= (2 + (900000 / BZ_G_SIZE)),
+            3003 );
+
+
+   /*--- Compute MTF values for the selectors. ---*/
+   {
+      UChar pos[BZ_N_GROUPS], ll_i, tmp2, tmp;
+      for (i = 0; i < nGroups; i++) pos[i] = i;
+      for (i = 0; i < nSelectors; i++) {
+         ll_i = s->selector[i];
+         j = 0;
+         tmp = pos[j];
+         while ( ll_i != tmp ) {
+            j++;
+            tmp2 = tmp;
+            tmp = pos[j];
+            pos[j] = tmp2;
+         };
+         pos[0] = tmp;
+         s->selectorMtf[i] = j;
+      }
+   };
+
+   /*--- Assign actual codes for the tables. --*/
+   for (t = 0; t < nGroups; t++) {
+      minLen = 32;
+      maxLen = 0;
+      for (i = 0; i < alphaSize; i++) {
+         if (s->len[t][i] > maxLen) maxLen = s->len[t][i];
+         if (s->len[t][i] < minLen) minLen = s->len[t][i];
+      }
+      AssertH ( !(maxLen > 20), 3004 );
+      AssertH ( !(minLen < 1),  3005 );
+      BZ2_hbAssignCodes ( &(s->code[t][0]), &(s->len[t][0]),
+                          minLen, maxLen, alphaSize );
+   }
+
+   /*--- Transmit the mapping table. ---*/
+   {
+      Bool inUse16[16];
+      for (i = 0; i < 16; i++) {
+          inUse16[i] = False;
+          for (j = 0; j < 16; j++)
+             if (s->inUse[i * 16 + j]) inUse16[i] = True;
+      }
+
+      nBytes = s->numZ;
+      for (i = 0; i < 16; i++)
+         if (inUse16[i]) bsW(s,1,1); else bsW(s,1,0);
+
+      for (i = 0; i < 16; i++)
+         if (inUse16[i])
+            for (j = 0; j < 16; j++) {
+               if (s->inUse[i * 16 + j]) bsW(s,1,1); else bsW(s,1,0);
+            }
+
+      if (s->verbosity >= 3)
+         VPrintf1( "      bytes: mapping %d, ", s->numZ-nBytes );
+   }
+
+   /*--- Now the selectors. ---*/
+   nBytes = s->numZ;
+   bsW ( s, 3, nGroups );
+   bsW ( s, 15, nSelectors );
+   for (i = 0; i < nSelectors; i++) {
+      for (j = 0; j < s->selectorMtf[i]; j++) bsW(s,1,1);
+      bsW(s,1,0);
+   }
+   if (s->verbosity >= 3)
+      VPrintf1( "selectors %d, ", s->numZ-nBytes );
+
+   /*--- Now the coding tables. ---*/
+   nBytes = s->numZ;
+
+   for (t = 0; t < nGroups; t++) {
+      Int32 curr = s->len[t][0];
+      bsW ( s, 5, curr );
+      for (i = 0; i < alphaSize; i++) {
+         while (curr < s->len[t][i]) { bsW(s,2,2); curr++; /* 10 */ };
+         while (curr > s->len[t][i]) { bsW(s,2,3); curr--; /* 11 */ };
+         bsW ( s, 1, 0 );
+      }
+   }
+
+   if (s->verbosity >= 3)
+      VPrintf1 ( "code lengths %d, ", s->numZ-nBytes );
+
+   /*--- And finally, the block data proper ---*/
+   nBytes = s->numZ;
+   selCtr = 0;
+   gs = 0;
+   while (True) {
+      if (gs >= s->nMTF) break;
+      ge = gs + BZ_G_SIZE - 1;
+      if (ge >= s->nMTF) ge = s->nMTF-1;
+      AssertH ( s->selector[selCtr] < nGroups, 3006 );
+
+      if (nGroups == 6 && 50 == ge-gs+1) {
+            /*--- fast track the common case ---*/
+            UInt16 mtfv_i;
+            UChar* s_len_sel_selCtr
+               = &(s->len[s->selector[selCtr]][0]);
+            Int32* s_code_sel_selCtr
+               = &(s->code[s->selector[selCtr]][0]);
+
+#           define BZ_ITAH(nn)                      \
+               mtfv_i = mtfv[gs+(nn)];              \
+               bsW ( s,                             \
+                     s_len_sel_selCtr[mtfv_i],      \
+                     s_code_sel_selCtr[mtfv_i] )
+
+            BZ_ITAH(0);  BZ_ITAH(1);  BZ_ITAH(2);  BZ_ITAH(3);  BZ_ITAH(4);
+            BZ_ITAH(5);  BZ_ITAH(6);  BZ_ITAH(7);  BZ_ITAH(8);  BZ_ITAH(9);
+            BZ_ITAH(10); BZ_ITAH(11); BZ_ITAH(12); BZ_ITAH(13); BZ_ITAH(14);
+            BZ_ITAH(15); BZ_ITAH(16); BZ_ITAH(17); BZ_ITAH(18); BZ_ITAH(19);
+            BZ_ITAH(20); BZ_ITAH(21); BZ_ITAH(22); BZ_ITAH(23); BZ_ITAH(24);
+            BZ_ITAH(25); BZ_ITAH(26); BZ_ITAH(27); BZ_ITAH(28); BZ_ITAH(29);
+            BZ_ITAH(30); BZ_ITAH(31); BZ_ITAH(32); BZ_ITAH(33); BZ_ITAH(34);
+            BZ_ITAH(35); BZ_ITAH(36); BZ_ITAH(37); BZ_ITAH(38); BZ_ITAH(39);
+            BZ_ITAH(40); BZ_ITAH(41); BZ_ITAH(42); BZ_ITAH(43); BZ_ITAH(44);
+            BZ_ITAH(45); BZ_ITAH(46); BZ_ITAH(47); BZ_ITAH(48); BZ_ITAH(49);
+
+#           undef BZ_ITAH
+
+      } else {
+	 /*--- slow version which correctly handles all situations ---*/
+         for (i = gs; i <= ge; i++) {
+            bsW ( s,
+                  s->len  [s->selector[selCtr]] [mtfv[i]],
+                  s->code [s->selector[selCtr]] [mtfv[i]] );
+         }
+      }
+
+
+      gs = ge+1;
+      selCtr++;
+   }
+   AssertH( selCtr == nSelectors, 3007 );
+
+   if (s->verbosity >= 3)
+      VPrintf1( "codes %d\n", s->numZ-nBytes );
+}
+
+
+/*---------------------------------------------------*/
+void BZ2_compressBlock ( EState* s, Bool is_last_block )
+{
+   if (s->nblock > 0) {
+
+      BZ_FINALISE_CRC ( s->blockCRC );
+      s->combinedCRC = (s->combinedCRC << 1) | (s->combinedCRC >> 31);
+      s->combinedCRC ^= s->blockCRC;
+      if (s->blockNo > 1) s->numZ = 0;
+
+      if (s->verbosity >= 2)
+         VPrintf4( "    block %d: crc = 0x%8x, "
+                   "combined CRC = 0x%8x, size = %d\n",
+                   s->blockNo, s->blockCRC, s->combinedCRC, s->nblock );
+
+      BZ2_blockSort ( s );
+   }
+
+   s->zbits = (UChar*) (&((UChar*)s->arr2)[s->nblock]);
+
+   /*-- If this is the first block, create the stream header. --*/
+   if (s->blockNo == 1) {
+      BZ2_bsInitWrite ( s );
+      bsPutUChar ( s, BZ_HDR_B );
+      bsPutUChar ( s, BZ_HDR_Z );
+      bsPutUChar ( s, BZ_HDR_h );
+      bsPutUChar ( s, (UChar)(BZ_HDR_0 + s->blockSize100k) );
+   }
+
+   if (s->nblock > 0) {
+
+      bsPutUChar ( s, 0x31 ); bsPutUChar ( s, 0x41 );
+      bsPutUChar ( s, 0x59 ); bsPutUChar ( s, 0x26 );
+      bsPutUChar ( s, 0x53 ); bsPutUChar ( s, 0x59 );
+
+      /*-- Now the block's CRC, so it is in a known place. --*/
+      bsPutUInt32 ( s, s->blockCRC );
+
+      /*--
+         Now a single bit indicating (non-)randomisation.
+         As of version 0.9.5, we use a better sorting algorithm
+         which makes randomisation unnecessary.  So always set
+         the randomised bit to 'no'.  Of course, the decoder
+         still needs to be able to handle randomised blocks
+         so as to maintain backwards compatibility with
+         older versions of bzip2.
+      --*/
+      bsW(s,1,0);
+
+      bsW ( s, 24, s->origPtr );
+      generateMTFValues ( s );
+      sendMTFValues ( s );
+   }
+
+
+   /*-- If this is the last block, add the stream trailer. --*/
+   if (is_last_block) {
+
+      bsPutUChar ( s, 0x17 ); bsPutUChar ( s, 0x72 );
+      bsPutUChar ( s, 0x45 ); bsPutUChar ( s, 0x38 );
+      bsPutUChar ( s, 0x50 ); bsPutUChar ( s, 0x90 );
+      bsPutUInt32 ( s, s->combinedCRC );
+      if (s->verbosity >= 2)
+         VPrintf1( "    final combined CRC = 0x%x\n   ", s->combinedCRC );
+      bsFinishWrite ( s );
+   }
+}
+
+
+/*-------------------------------------------------------------*/
+/*--- end                                        compress.c ---*/
+/*-------------------------------------------------------------*/
diff --git a/uppsrc/plugin/bz2/lib/crctable.c b/uppsrc/plugin/bz2/lib/crctable.c
new file mode 100644
index 000000000..24fd174cf
--- /dev/null
+++ b/uppsrc/plugin/bz2/lib/crctable.c
@@ -0,0 +1,144 @@
+
+/*-------------------------------------------------------------*/
+/*--- Table for doing CRCs                                  ---*/
+/*---                                            crctable.c ---*/
+/*-------------------------------------------------------------*/
+
+/*--
+  This file is a part of bzip2 and/or libbzip2, a program and
+  library for lossless, block-sorting data compression.
+
+  Copyright (C) 1996-2002 Julian R Seward.  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions
+  are met:
+
+  1. Redistributions of source code must retain the above copyright
+     notice, this list of conditions and the following disclaimer.
+
+  2. The origin of this software must not be misrepresented; you must
+     not claim that you wrote the original software.  If you use this
+     software in a product, an acknowledgment in the product
+     documentation would be appreciated but is not required.
+
+  3. Altered source versions must be plainly marked as such, and must
+     not be misrepresented as being the original software.
+
+  4. The name of the author may not be used to endorse or promote
+     products derived from this software without specific prior written
+     permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+  OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+  ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+  GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+  Julian Seward, Cambridge, UK.
+  jseward@acm.org
+  bzip2/libbzip2 version 1.0 of 21 March 2000
+
+  This program is based on (at least) the work of:
+     Mike Burrows
+     David Wheeler
+     Peter Fenwick
+     Alistair Moffat
+     Radford Neal
+     Ian H. Witten
+     Robert Sedgewick
+     Jon L. Bentley
+
+  For more information on these sources, see the manual.
+--*/
+
+
+#include "bzlib_private.h"
+
+/*--
+  I think this is an implementation of the AUTODIN-II,
+  Ethernet & FDDI 32-bit CRC standard.  Vaguely derived
+  from code by Rob Warnock, in Section 51 of the
+  comp.compression FAQ.
+--*/
+
+UInt32 BZ2_crc32Table[256] = {
+
+   /*-- Ugly, innit? --*/
+
+   0x00000000L, 0x04c11db7L, 0x09823b6eL, 0x0d4326d9L,
+   0x130476dcL, 0x17c56b6bL, 0x1a864db2L, 0x1e475005L,
+   0x2608edb8L, 0x22c9f00fL, 0x2f8ad6d6L, 0x2b4bcb61L,
+   0x350c9b64L, 0x31cd86d3L, 0x3c8ea00aL, 0x384fbdbdL,
+   0x4c11db70L, 0x48d0c6c7L, 0x4593e01eL, 0x4152fda9L,
+   0x5f15adacL, 0x5bd4b01bL, 0x569796c2L, 0x52568b75L,
+   0x6a1936c8L, 0x6ed82b7fL, 0x639b0da6L, 0x675a1011L,
+   0x791d4014L, 0x7ddc5da3L, 0x709f7b7aL, 0x745e66cdL,
+   0x9823b6e0L, 0x9ce2ab57L, 0x91a18d8eL, 0x95609039L,
+   0x8b27c03cL, 0x8fe6dd8bL, 0x82a5fb52L, 0x8664e6e5L,
+   0xbe2b5b58L, 0xbaea46efL, 0xb7a96036L, 0xb3687d81L,
+   0xad2f2d84L, 0xa9ee3033L, 0xa4ad16eaL, 0xa06c0b5dL,
+   0xd4326d90L, 0xd0f37027L, 0xddb056feL, 0xd9714b49L,
+   0xc7361b4cL, 0xc3f706fbL, 0xceb42022L, 0xca753d95L,
+   0xf23a8028L, 0xf6fb9d9fL, 0xfbb8bb46L, 0xff79a6f1L,
+   0xe13ef6f4L, 0xe5ffeb43L, 0xe8bccd9aL, 0xec7dd02dL,
+   0x34867077L, 0x30476dc0L, 0x3d044b19L, 0x39c556aeL,
+   0x278206abL, 0x23431b1cL, 0x2e003dc5L, 0x2ac12072L,
+   0x128e9dcfL, 0x164f8078L, 0x1b0ca6a1L, 0x1fcdbb16L,
+   0x018aeb13L, 0x054bf6a4L, 0x0808d07dL, 0x0cc9cdcaL,
+   0x7897ab07L, 0x7c56b6b0L, 0x71159069L, 0x75d48ddeL,
+   0x6b93dddbL, 0x6f52c06cL, 0x6211e6b5L, 0x66d0fb02L,
+   0x5e9f46bfL, 0x5a5e5b08L, 0x571d7dd1L, 0x53dc6066L,
+   0x4d9b3063L, 0x495a2dd4L, 0x44190b0dL, 0x40d816baL,
+   0xaca5c697L, 0xa864db20L, 0xa527fdf9L, 0xa1e6e04eL,
+   0xbfa1b04bL, 0xbb60adfcL, 0xb6238b25L, 0xb2e29692L,
+   0x8aad2b2fL, 0x8e6c3698L, 0x832f1041L, 0x87ee0df6L,
+   0x99a95df3L, 0x9d684044L, 0x902b669dL, 0x94ea7b2aL,
+   0xe0b41de7L, 0xe4750050L, 0xe9362689L, 0xedf73b3eL,
+   0xf3b06b3bL, 0xf771768cL, 0xfa325055L, 0xfef34de2L,
+   0xc6bcf05fL, 0xc27dede8L, 0xcf3ecb31L, 0xcbffd686L,
+   0xd5b88683L, 0xd1799b34L, 0xdc3abdedL, 0xd8fba05aL,
+   0x690ce0eeL, 0x6dcdfd59L, 0x608edb80L, 0x644fc637L,
+   0x7a089632L, 0x7ec98b85L, 0x738aad5cL, 0x774bb0ebL,
+   0x4f040d56L, 0x4bc510e1L, 0x46863638L, 0x42472b8fL,
+   0x5c007b8aL, 0x58c1663dL, 0x558240e4L, 0x51435d53L,
+   0x251d3b9eL, 0x21dc2629L, 0x2c9f00f0L, 0x285e1d47L,
+   0x36194d42L, 0x32d850f5L, 0x3f9b762cL, 0x3b5a6b9bL,
+   0x0315d626L, 0x07d4cb91L, 0x0a97ed48L, 0x0e56f0ffL,
+   0x1011a0faL, 0x14d0bd4dL, 0x19939b94L, 0x1d528623L,
+   0xf12f560eL, 0xf5ee4bb9L, 0xf8ad6d60L, 0xfc6c70d7L,
+   0xe22b20d2L, 0xe6ea3d65L, 0xeba91bbcL, 0xef68060bL,
+   0xd727bbb6L, 0xd3e6a601L, 0xdea580d8L, 0xda649d6fL,
+   0xc423cd6aL, 0xc0e2d0ddL, 0xcda1f604L, 0xc960ebb3L,
+   0xbd3e8d7eL, 0xb9ff90c9L, 0xb4bcb610L, 0xb07daba7L,
+   0xae3afba2L, 0xaafbe615L, 0xa7b8c0ccL, 0xa379dd7bL,
+   0x9b3660c6L, 0x9ff77d71L, 0x92b45ba8L, 0x9675461fL,
+   0x8832161aL, 0x8cf30badL, 0x81b02d74L, 0x857130c3L,
+   0x5d8a9099L, 0x594b8d2eL, 0x5408abf7L, 0x50c9b640L,
+   0x4e8ee645L, 0x4a4ffbf2L, 0x470cdd2bL, 0x43cdc09cL,
+   0x7b827d21L, 0x7f436096L, 0x7200464fL, 0x76c15bf8L,
+   0x68860bfdL, 0x6c47164aL, 0x61043093L, 0x65c52d24L,
+   0x119b4be9L, 0x155a565eL, 0x18197087L, 0x1cd86d30L,
+   0x029f3d35L, 0x065e2082L, 0x0b1d065bL, 0x0fdc1becL,
+   0x3793a651L, 0x3352bbe6L, 0x3e119d3fL, 0x3ad08088L,
+   0x2497d08dL, 0x2056cd3aL, 0x2d15ebe3L, 0x29d4f654L,
+   0xc5a92679L, 0xc1683bceL, 0xcc2b1d17L, 0xc8ea00a0L,
+   0xd6ad50a5L, 0xd26c4d12L, 0xdf2f6bcbL, 0xdbee767cL,
+   0xe3a1cbc1L, 0xe760d676L, 0xea23f0afL, 0xeee2ed18L,
+   0xf0a5bd1dL, 0xf464a0aaL, 0xf9278673L, 0xfde69bc4L,
+   0x89b8fd09L, 0x8d79e0beL, 0x803ac667L, 0x84fbdbd0L,
+   0x9abc8bd5L, 0x9e7d9662L, 0x933eb0bbL, 0x97ffad0cL,
+   0xafb010b1L, 0xab710d06L, 0xa6322bdfL, 0xa2f33668L,
+   0xbcb4666dL, 0xb8757bdaL, 0xb5365d03L, 0xb1f740b4L
+};
+
+
+/*-------------------------------------------------------------*/
+/*--- end                                        crctable.c ---*/
+/*-------------------------------------------------------------*/
diff --git a/uppsrc/plugin/bz2/lib/decompress.c b/uppsrc/plugin/bz2/lib/decompress.c
new file mode 100644
index 000000000..43a96d3fb
--- /dev/null
+++ b/uppsrc/plugin/bz2/lib/decompress.c
@@ -0,0 +1,660 @@
+
+/*-------------------------------------------------------------*/
+/*--- Decompression machinery                               ---*/
+/*---                                          decompress.c ---*/
+/*-------------------------------------------------------------*/
+
+/*--
+  This file is a part of bzip2 and/or libbzip2, a program and
+  library for lossless, block-sorting data compression.
+
+  Copyright (C) 1996-2002 Julian R Seward.  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions
+  are met:
+
+  1. Redistributions of source code must retain the above copyright
+     notice, this list of conditions and the following disclaimer.
+
+  2. The origin of this software must not be misrepresented; you must
+     not claim that you wrote the original software.  If you use this
+     software in a product, an acknowledgment in the product
+     documentation would be appreciated but is not required.
+
+  3. Altered source versions must be plainly marked as such, and must
+     not be misrepresented as being the original software.
+
+  4. The name of the author may not be used to endorse or promote
+     products derived from this software without specific prior written
+     permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+  OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+  ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+  GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+  Julian Seward, Cambridge, UK.
+  jseward@acm.org
+  bzip2/libbzip2 version 1.0 of 21 March 2000
+
+  This program is based on (at least) the work of:
+     Mike Burrows
+     David Wheeler
+     Peter Fenwick
+     Alistair Moffat
+     Radford Neal
+     Ian H. Witten
+     Robert Sedgewick
+     Jon L. Bentley
+
+  For more information on these sources, see the manual.
+--*/
+
+
+#include "bzlib_private.h"
+
+
+/*---------------------------------------------------*/
+static
+void makeMaps_d ( DState* s )
+{
+   Int32 i;
+   s->nInUse = 0;
+   for (i = 0; i < 256; i++)
+      if (s->inUse[i]) {
+         s->seqToUnseq[s->nInUse] = i;
+         s->nInUse++;
+      }
+}
+
+
+/*---------------------------------------------------*/
+#define RETURN(rrr)                               \
+   { retVal = rrr; goto save_state_and_return; };
+
+#define GET_BITS(lll,vvv,nnn)                     \
+   case lll: s->state = lll;                      \
+   while (True) {                                 \
+      if (s->bsLive >= nnn) {                     \
+         UInt32 v;                                \
+         v = (s->bsBuff >>                        \
+             (s->bsLive-nnn)) & ((1 << nnn)-1);   \
+         s->bsLive -= nnn;                        \
+         vvv = v;                                 \
+         break;                                   \
+      }                                           \
+      if (s->strm->avail_in == 0) RETURN(BZ_OK);  \
+      s->bsBuff                                   \
+         = (s->bsBuff << 8) |                     \
+           ((UInt32)                              \
+              (*((UChar*)(s->strm->next_in))));   \
+      s->bsLive += 8;                             \
+      s->strm->next_in++;                         \
+      s->strm->avail_in--;                        \
+      s->strm->total_in_lo32++;                   \
+      if (s->strm->total_in_lo32 == 0)            \
+         s->strm->total_in_hi32++;                \
+   }
+
+#define GET_UCHAR(lll,uuu)                        \
+   GET_BITS(lll,uuu,8)
+
+#define GET_BIT(lll,uuu)                          \
+   GET_BITS(lll,uuu,1)
+
+/*---------------------------------------------------*/
+#define GET_MTF_VAL(label1,label2,lval)           \
+{                                                 \
+   if (groupPos == 0) {                           \
+      groupNo++;                                  \
+      if (groupNo >= nSelectors)                  \
+         RETURN(BZ_DATA_ERROR);                   \
+      groupPos = BZ_G_SIZE;                       \
+      gSel = s->selector[groupNo];                \
+      gMinlen = s->minLens[gSel];                 \
+      gLimit = &(s->limit[gSel][0]);              \
+      gPerm = &(s->perm[gSel][0]);                \
+      gBase = &(s->base[gSel][0]);                \
+   }                                              \
+   groupPos--;                                    \
+   zn = gMinlen;                                  \
+   GET_BITS(label1, zvec, zn);                    \
+   while (1) {                                    \
+      if (zn > 20 /* the longest code */)         \
+         RETURN(BZ_DATA_ERROR);                   \
+      if (zvec <= gLimit[zn]) break;              \
+      zn++;                                       \
+      GET_BIT(label2, zj);                        \
+      zvec = (zvec << 1) | zj;                    \
+   };                                             \
+   if (zvec - gBase[zn] < 0                       \
+       || zvec - gBase[zn] >= BZ_MAX_ALPHA_SIZE)  \
+      RETURN(BZ_DATA_ERROR);                      \
+   lval = gPerm[zvec - gBase[zn]];                \
+}
+
+
+/*---------------------------------------------------*/
+Int32 BZ2_decompress ( DState* s )
+{
+   UChar      uc;
+   Int32      retVal;
+   Int32      minLen, maxLen;
+   bz_stream* strm = s->strm;
+
+   /* stuff that needs to be saved/restored */
+   Int32  i;
+   Int32  j;
+   Int32  t;
+   Int32  alphaSize;
+   Int32  nGroups;
+   Int32  nSelectors;
+   Int32  EOB;
+   Int32  groupNo;
+   Int32  groupPos;
+   Int32  nextSym;
+   Int32  nblockMAX;
+   Int32  nblock;
+   Int32  es;
+   Int32  N;
+   Int32  curr;
+   Int32  zt;
+   Int32  zn;
+   Int32  zvec;
+   Int32  zj;
+   Int32  gSel;
+   Int32  gMinlen;
+   Int32* gLimit;
+   Int32* gBase;
+   Int32* gPerm;
+
+   if (s->state == BZ_X_MAGIC_1) {
+      /*initialise the save area*/
+      s->save_i           = 0;
+      s->save_j           = 0;
+      s->save_t           = 0;
+      s->save_alphaSize   = 0;
+      s->save_nGroups     = 0;
+      s->save_nSelectors  = 0;
+      s->save_EOB         = 0;
+      s->save_groupNo     = 0;
+      s->save_groupPos    = 0;
+      s->save_nextSym     = 0;
+      s->save_nblockMAX   = 0;
+      s->save_nblock      = 0;
+      s->save_es          = 0;
+      s->save_N           = 0;
+      s->save_curr        = 0;
+      s->save_zt          = 0;
+      s->save_zn          = 0;
+      s->save_zvec        = 0;
+      s->save_zj          = 0;
+      s->save_gSel        = 0;
+      s->save_gMinlen     = 0;
+      s->save_gLimit      = NULL;
+      s->save_gBase       = NULL;
+      s->save_gPerm       = NULL;
+   }
+
+   /*restore from the save area*/
+   i           = s->save_i;
+   j           = s->save_j;
+   t           = s->save_t;
+   alphaSize   = s->save_alphaSize;
+   nGroups     = s->save_nGroups;
+   nSelectors  = s->save_nSelectors;
+   EOB         = s->save_EOB;
+   groupNo     = s->save_groupNo;
+   groupPos    = s->save_groupPos;
+   nextSym     = s->save_nextSym;
+   nblockMAX   = s->save_nblockMAX;
+   nblock      = s->save_nblock;
+   es          = s->save_es;
+   N           = s->save_N;
+   curr        = s->save_curr;
+   zt          = s->save_zt;
+   zn          = s->save_zn;
+   zvec        = s->save_zvec;
+   zj          = s->save_zj;
+   gSel        = s->save_gSel;
+   gMinlen     = s->save_gMinlen;
+   gLimit      = s->save_gLimit;
+   gBase       = s->save_gBase;
+   gPerm       = s->save_gPerm;
+
+   retVal = BZ_OK;
+
+   switch (s->state) {
+
+      GET_UCHAR(BZ_X_MAGIC_1, uc);
+      if (uc != BZ_HDR_B) RETURN(BZ_DATA_ERROR_MAGIC);
+
+      GET_UCHAR(BZ_X_MAGIC_2, uc);
+      if (uc != BZ_HDR_Z) RETURN(BZ_DATA_ERROR_MAGIC);
+
+      GET_UCHAR(BZ_X_MAGIC_3, uc)
+      if (uc != BZ_HDR_h) RETURN(BZ_DATA_ERROR_MAGIC);
+
+      GET_BITS(BZ_X_MAGIC_4, s->blockSize100k, 8)
+      if (s->blockSize100k < (BZ_HDR_0 + 1) ||
+          s->blockSize100k > (BZ_HDR_0 + 9)) RETURN(BZ_DATA_ERROR_MAGIC);
+      s->blockSize100k -= BZ_HDR_0;
+
+      if (s->smallDecompress) {
+         s->ll16 = BZALLOC( s->blockSize100k * 100000 * sizeof(UInt16) );
+         s->ll4  = BZALLOC(
+                      ((1 + s->blockSize100k * 100000) >> 1) * sizeof(UChar)
+                   );
+         if (s->ll16 == NULL || s->ll4 == NULL) RETURN(BZ_MEM_ERROR);
+      } else {
+         s->tt  = BZALLOC( s->blockSize100k * 100000 * sizeof(Int32) );
+         if (s->tt == NULL) RETURN(BZ_MEM_ERROR);
+      }
+
+      GET_UCHAR(BZ_X_BLKHDR_1, uc);
+
+      if (uc == 0x17) goto endhdr_2;
+      if (uc != 0x31) RETURN(BZ_DATA_ERROR);
+      GET_UCHAR(BZ_X_BLKHDR_2, uc);
+      if (uc != 0x41) RETURN(BZ_DATA_ERROR);
+      GET_UCHAR(BZ_X_BLKHDR_3, uc);
+      if (uc != 0x59) RETURN(BZ_DATA_ERROR);
+      GET_UCHAR(BZ_X_BLKHDR_4, uc);
+      if (uc != 0x26) RETURN(BZ_DATA_ERROR);
+      GET_UCHAR(BZ_X_BLKHDR_5, uc);
+      if (uc != 0x53) RETURN(BZ_DATA_ERROR);
+      GET_UCHAR(BZ_X_BLKHDR_6, uc);
+      if (uc != 0x59) RETURN(BZ_DATA_ERROR);
+
+      s->currBlockNo++;
+      if (s->verbosity >= 2)
+         VPrintf1 ( "\n    [%d: huff+mtf ", s->currBlockNo );
+
+      s->storedBlockCRC = 0;
+      GET_UCHAR(BZ_X_BCRC_1, uc);
+      s->storedBlockCRC = (s->storedBlockCRC << 8) | ((UInt32)uc);
+      GET_UCHAR(BZ_X_BCRC_2, uc);
+      s->storedBlockCRC = (s->storedBlockCRC << 8) | ((UInt32)uc);
+      GET_UCHAR(BZ_X_BCRC_3, uc);
+      s->storedBlockCRC = (s->storedBlockCRC << 8) | ((UInt32)uc);
+      GET_UCHAR(BZ_X_BCRC_4, uc);
+      s->storedBlockCRC = (s->storedBlockCRC << 8) | ((UInt32)uc);
+
+      GET_BITS(BZ_X_RANDBIT, s->blockRandomised, 1);
+
+      s->origPtr = 0;
+      GET_UCHAR(BZ_X_ORIGPTR_1, uc);
+      s->origPtr = (s->origPtr << 8) | ((Int32)uc);
+      GET_UCHAR(BZ_X_ORIGPTR_2, uc);
+      s->origPtr = (s->origPtr << 8) | ((Int32)uc);
+      GET_UCHAR(BZ_X_ORIGPTR_3, uc);
+      s->origPtr = (s->origPtr << 8) | ((Int32)uc);
+
+      if (s->origPtr < 0)
+         RETURN(BZ_DATA_ERROR);
+      if (s->origPtr > 10 + 100000*s->blockSize100k)
+         RETURN(BZ_DATA_ERROR);
+
+      /*--- Receive the mapping table ---*/
+      for (i = 0; i < 16; i++) {
+         GET_BIT(BZ_X_MAPPING_1, uc);
+         if (uc == 1)
+            s->inUse16[i] = True; else
+            s->inUse16[i] = False;
+      }
+
+      for (i = 0; i < 256; i++) s->inUse[i] = False;
+
+      for (i = 0; i < 16; i++)
+         if (s->inUse16[i])
+            for (j = 0; j < 16; j++) {
+               GET_BIT(BZ_X_MAPPING_2, uc);
+               if (uc == 1) s->inUse[i * 16 + j] = True;
+            }
+      makeMaps_d ( s );
+      if (s->nInUse == 0) RETURN(BZ_DATA_ERROR);
+      alphaSize = s->nInUse+2;
+
+      /*--- Now the selectors ---*/
+      GET_BITS(BZ_X_SELECTOR_1, nGroups, 3);
+      if (nGroups < 2 || nGroups > 6) RETURN(BZ_DATA_ERROR);
+      GET_BITS(BZ_X_SELECTOR_2, nSelectors, 15);
+      if (nSelectors < 1) RETURN(BZ_DATA_ERROR);
+      for (i = 0; i < nSelectors; i++) {
+         j = 0;
+         while (True) {
+            GET_BIT(BZ_X_SELECTOR_3, uc);
+            if (uc == 0) break;
+            j++;
+            if (j >= nGroups) RETURN(BZ_DATA_ERROR);
+         }
+         s->selectorMtf[i] = j;
+      }
+
+      /*--- Undo the MTF values for the selectors. ---*/
+      {
+         UChar pos[BZ_N_GROUPS], tmp, v;
+         for (v = 0; v < nGroups; v++) pos[v] = v;
+
+         for (i = 0; i < nSelectors; i++) {
+            v = s->selectorMtf[i];
+            tmp = pos[v];
+            while (v > 0) { pos[v] = pos[v-1]; v--; }
+            pos[0] = tmp;
+            s->selector[i] = tmp;
+         }
+      }
+
+      /*--- Now the coding tables ---*/
+      for (t = 0; t < nGroups; t++) {
+         GET_BITS(BZ_X_CODING_1, curr, 5);
+         for (i = 0; i < alphaSize; i++) {
+            while (True) {
+               if (curr < 1 || curr > 20) RETURN(BZ_DATA_ERROR);
+               GET_BIT(BZ_X_CODING_2, uc);
+               if (uc == 0) break;
+               GET_BIT(BZ_X_CODING_3, uc);
+               if (uc == 0) curr++; else curr--;
+            }
+            s->len[t][i] = curr;
+         }
+      }
+
+      /*--- Create the Huffman decoding tables ---*/
+      for (t = 0; t < nGroups; t++) {
+         minLen = 32;
+         maxLen = 0;
+         for (i = 0; i < alphaSize; i++) {
+            if (s->len[t][i] > maxLen) maxLen = s->len[t][i];
+            if (s->len[t][i] < minLen) minLen = s->len[t][i];
+         }
+         BZ2_hbCreateDecodeTables (
+            &(s->limit[t][0]),
+            &(s->base[t][0]),
+            &(s->perm[t][0]),
+            &(s->len[t][0]),
+            minLen, maxLen, alphaSize
+         );
+         s->minLens[t] = minLen;
+      }
+
+      /*--- Now the MTF values ---*/
+
+      EOB      = s->nInUse+1;
+      nblockMAX = 100000 * s->blockSize100k;
+      groupNo  = -1;
+      groupPos = 0;
+
+      for (i = 0; i <= 255; i++) s->unzftab[i] = 0;
+
+      /*-- MTF init --*/
+      {
+         Int32 ii, jj, kk;
+         kk = MTFA_SIZE-1;
+         for (ii = 256 / MTFL_SIZE - 1; ii >= 0; ii--) {
+            for (jj = MTFL_SIZE-1; jj >= 0; jj--) {
+               s->mtfa[kk] = (UChar)(ii * MTFL_SIZE + jj);
+               kk--;
+            }
+            s->mtfbase[ii] = kk + 1;
+         }
+      }
+      /*-- end MTF init --*/
+
+      nblock = 0;
+      GET_MTF_VAL(BZ_X_MTF_1, BZ_X_MTF_2, nextSym);
+
+      while (True) {
+
+         if (nextSym == EOB) break;
+
+         if (nextSym == BZ_RUNA || nextSym == BZ_RUNB) {
+
+            es = -1;
+            N = 1;
+            do {
+               if (nextSym == BZ_RUNA) es = es + (0+1) * N; else
+               if (nextSym == BZ_RUNB) es = es + (1+1) * N;
+               N = N * 2;
+               GET_MTF_VAL(BZ_X_MTF_3, BZ_X_MTF_4, nextSym);
+            }
+               while (nextSym == BZ_RUNA || nextSym == BZ_RUNB);
+
+            es++;
+            uc = s->seqToUnseq[ s->mtfa[s->mtfbase[0]] ];
+            s->unzftab[uc] += es;
+
+            if (s->smallDecompress)
+               while (es > 0) {
+                  if (nblock >= nblockMAX) RETURN(BZ_DATA_ERROR);
+                  s->ll16[nblock] = (UInt16)uc;
+                  nblock++;
+                  es--;
+               }
+            else
+               while (es > 0) {
+                  if (nblock >= nblockMAX) RETURN(BZ_DATA_ERROR);
+                  s->tt[nblock] = (UInt32)uc;
+                  nblock++;
+                  es--;
+               };
+
+            continue;
+
+         } else {
+
+            if (nblock >= nblockMAX) RETURN(BZ_DATA_ERROR);
+
+            /*-- uc = MTF ( nextSym-1 ) --*/
+            {
+               Int32 ii, jj, kk, pp, lno, off;
+               UInt32 nn;
+               nn = (UInt32)(nextSym - 1);
+
+               if (nn < MTFL_SIZE) {
+                  /* avoid general-case expense */
+                  pp = s->mtfbase[0];
+                  uc = s->mtfa[pp+nn];
+                  while (nn > 3) {
+                     Int32 z = pp+nn;
+                     s->mtfa[(z)  ] = s->mtfa[(z)-1];
+                     s->mtfa[(z)-1] = s->mtfa[(z)-2];
+                     s->mtfa[(z)-2] = s->mtfa[(z)-3];
+                     s->mtfa[(z)-3] = s->mtfa[(z)-4];
+                     nn -= 4;
+                  }
+                  while (nn > 0) {
+                     s->mtfa[(pp+nn)] = s->mtfa[(pp+nn)-1]; nn--;
+                  };
+                  s->mtfa[pp] = uc;
+               } else {
+                  /* general case */
+                  lno = nn / MTFL_SIZE;
+                  off = nn % MTFL_SIZE;
+                  pp = s->mtfbase[lno] + off;
+                  uc = s->mtfa[pp];
+                  while (pp > s->mtfbase[lno]) {
+                     s->mtfa[pp] = s->mtfa[pp-1]; pp--;
+                  };
+                  s->mtfbase[lno]++;
+                  while (lno > 0) {
+                     s->mtfbase[lno]--;
+                     s->mtfa[s->mtfbase[lno]]
+                        = s->mtfa[s->mtfbase[lno-1] + MTFL_SIZE - 1];
+                     lno--;
+                  }
+                  s->mtfbase[0]--;
+                  s->mtfa[s->mtfbase[0]] = uc;
+                  if (s->mtfbase[0] == 0) {
+                     kk = MTFA_SIZE-1;
+                     for (ii = 256 / MTFL_SIZE-1; ii >= 0; ii--) {
+                        for (jj = MTFL_SIZE-1; jj >= 0; jj--) {
+                           s->mtfa[kk] = s->mtfa[s->mtfbase[ii] + jj];
+                           kk--;
+                        }
+                        s->mtfbase[ii] = kk + 1;
+                     }
+                  }
+               }
+            }
+            /*-- end uc = MTF ( nextSym-1 ) --*/
+
+            s->unzftab[s->seqToUnseq[uc]]++;
+            if (s->smallDecompress)
+               s->ll16[nblock] = (UInt16)(s->seqToUnseq[uc]); else
+               s->tt[nblock]   = (UInt32)(s->seqToUnseq[uc]);
+            nblock++;
+
+            GET_MTF_VAL(BZ_X_MTF_5, BZ_X_MTF_6, nextSym);
+            continue;
+         }
+      }
+
+      /* Now we know what nblock is, we can do a better sanity
+         check on s->origPtr.
+      */
+      if (s->origPtr < 0 || s->origPtr >= nblock)
+         RETURN(BZ_DATA_ERROR);
+
+      s->state_out_len = 0;
+      s->state_out_ch  = 0;
+      BZ_INITIALISE_CRC ( s->calculatedBlockCRC );
+      s->state = BZ_X_OUTPUT;
+      if (s->verbosity >= 2) VPrintf0 ( "rt+rld" );
+
+      /*-- Set up cftab to facilitate generation of T^(-1) --*/
+      s->cftab[0] = 0;
+      for (i = 1; i <= 256; i++) s->cftab[i] = s->unzftab[i-1];
+      for (i = 1; i <= 256; i++) s->cftab[i] += s->cftab[i-1];
+
+      if (s->smallDecompress) {
+
+         /*-- Make a copy of cftab, used in generation of T --*/
+         for (i = 0; i <= 256; i++) s->cftabCopy[i] = s->cftab[i];
+
+         /*-- compute the T vector --*/
+         for (i = 0; i < nblock; i++) {
+            uc = (UChar)(s->ll16[i]);
+            SET_LL(i, s->cftabCopy[uc]);
+            s->cftabCopy[uc]++;
+         }
+
+         /*-- Compute T^(-1) by pointer reversal on T --*/
+         i = s->origPtr;
+         j = GET_LL(i);
+         do {
+            Int32 tmp = GET_LL(j);
+            SET_LL(j, i);
+            i = j;
+            j = tmp;
+         }
+            while (i != s->origPtr);
+
+         s->tPos = s->origPtr;
+         s->nblock_used = 0;
+         if (s->blockRandomised) {
+            BZ_RAND_INIT_MASK;
+            BZ_GET_SMALL(s->k0); s->nblock_used++;
+            BZ_RAND_UPD_MASK; s->k0 ^= BZ_RAND_MASK;
+         } else {
+            BZ_GET_SMALL(s->k0); s->nblock_used++;
+         }
+
+      } else {
+
+         /*-- compute the T^(-1) vector --*/
+         for (i = 0; i < nblock; i++) {
+            uc = (UChar)(s->tt[i] & 0xff);
+            s->tt[s->cftab[uc]] |= (i << 8);
+            s->cftab[uc]++;
+         }
+
+         s->tPos = s->tt[s->origPtr] >> 8;
+         s->nblock_used = 0;
+         if (s->blockRandomised) {
+            BZ_RAND_INIT_MASK;
+            BZ_GET_FAST(s->k0); s->nblock_used++;
+            BZ_RAND_UPD_MASK; s->k0 ^= BZ_RAND_MASK;
+         } else {
+            BZ_GET_FAST(s->k0); s->nblock_used++;
+         }
+
+      }
+
+      RETURN(BZ_OK);
+
+
+
+    endhdr_2:
+
+      GET_UCHAR(BZ_X_ENDHDR_2, uc);
+      if (uc != 0x72) RETURN(BZ_DATA_ERROR);
+      GET_UCHAR(BZ_X_ENDHDR_3, uc);
+      if (uc != 0x45) RETURN(BZ_DATA_ERROR);
+      GET_UCHAR(BZ_X_ENDHDR_4, uc);
+      if (uc != 0x38) RETURN(BZ_DATA_ERROR);
+      GET_UCHAR(BZ_X_ENDHDR_5, uc);
+      if (uc != 0x50) RETURN(BZ_DATA_ERROR);
+      GET_UCHAR(BZ_X_ENDHDR_6, uc);
+      if (uc != 0x90) RETURN(BZ_DATA_ERROR);
+
+      s->storedCombinedCRC = 0;
+      GET_UCHAR(BZ_X_CCRC_1, uc);
+      s->storedCombinedCRC = (s->storedCombinedCRC << 8) | ((UInt32)uc);
+      GET_UCHAR(BZ_X_CCRC_2, uc);
+      s->storedCombinedCRC = (s->storedCombinedCRC << 8) | ((UInt32)uc);
+      GET_UCHAR(BZ_X_CCRC_3, uc);
+      s->storedCombinedCRC = (s->storedCombinedCRC << 8) | ((UInt32)uc);
+      GET_UCHAR(BZ_X_CCRC_4, uc);
+      s->storedCombinedCRC = (s->storedCombinedCRC << 8) | ((UInt32)uc);
+
+      s->state = BZ_X_IDLE;
+      RETURN(BZ_STREAM_END);
+
+      default: AssertH ( False, 4001 );
+   }
+
+   AssertH ( False, 4002 );
+
+   save_state_and_return:
+
+   s->save_i           = i;
+   s->save_j           = j;
+   s->save_t           = t;
+   s->save_alphaSize   = alphaSize;
+   s->save_nGroups     = nGroups;
+   s->save_nSelectors  = nSelectors;
+   s->save_EOB         = EOB;
+   s->save_groupNo     = groupNo;
+   s->save_groupPos    = groupPos;
+   s->save_nextSym     = nextSym;
+   s->save_nblockMAX   = nblockMAX;
+   s->save_nblock      = nblock;
+   s->save_es          = es;
+   s->save_N           = N;
+   s->save_curr        = curr;
+   s->save_zt          = zt;
+   s->save_zn          = zn;
+   s->save_zvec        = zvec;
+   s->save_zj          = zj;
+   s->save_gSel        = gSel;
+   s->save_gMinlen     = gMinlen;
+   s->save_gLimit      = gLimit;
+   s->save_gBase       = gBase;
+   s->save_gPerm       = gPerm;
+
+   return retVal;
+}
+
+
+/*-------------------------------------------------------------*/
+/*--- end                                      decompress.c ---*/
+/*-------------------------------------------------------------*/
diff --git a/uppsrc/plugin/bz2/lib/dlltest.c b/uppsrc/plugin/bz2/lib/dlltest.c
new file mode 100644
index 000000000..2049906ea
--- /dev/null
+++ b/uppsrc/plugin/bz2/lib/dlltest.c
@@ -0,0 +1,176 @@
+/*
+   minibz2
+      libbz2.dll test program.
+      by Yoshioka Tsuneo(QWF00133@nifty.ne.jp/tsuneo-y@is.aist-nara.ac.jp)
+      This file is Public Domain.
+      welcome any email to me.
+
+   usage: minibz2 [-d] [-{1,2,..9}] [[srcfilename] destfilename]
+*/
+
+#define BZ_IMPORT
+#include <stdio.h>
+#include <stdlib.h>
+#include "bzlib.h"
+#ifdef _WIN32
+#include <io.h>
+#endif
+
+
+#ifdef _WIN32
+
+#define BZ2_LIBNAME "libbz2-1.0.2.DLL"
+
+#include <windows.h>
+static int BZ2DLLLoaded = 0;
+static HINSTANCE BZ2DLLhLib;
+int BZ2DLLLoadLibrary(void)
+{
+   HINSTANCE hLib;
+
+   if(BZ2DLLLoaded==1){return 0;}
+   hLib=LoadLibrary(BZ2_LIBNAME);
+   if(hLib == NULL){
+      fprintf(stderr,"Can't load %s\n",BZ2_LIBNAME);
+      return -1;
+   }
+   BZ2_bzlibVersion=GetProcAddress(hLib,"BZ2_bzlibVersion");
+   BZ2_bzopen=GetProcAddress(hLib,"BZ2_bzopen");
+   BZ2_bzdopen=GetProcAddress(hLib,"BZ2_bzdopen");
+   BZ2_bzread=GetProcAddress(hLib,"BZ2_bzread");
+   BZ2_bzwrite=GetProcAddress(hLib,"BZ2_bzwrite");
+   BZ2_bzflush=GetProcAddress(hLib,"BZ2_bzflush");
+   BZ2_bzclose=GetProcAddress(hLib,"BZ2_bzclose");
+   BZ2_bzerror=GetProcAddress(hLib,"BZ2_bzerror");
+
+   if (!BZ2_bzlibVersion || !BZ2_bzopen || !BZ2_bzdopen
+       || !BZ2_bzread || !BZ2_bzwrite || !BZ2_bzflush
+       || !BZ2_bzclose || !BZ2_bzerror) {
+      fprintf(stderr,"GetProcAddress failed.\n");
+      return -1;
+   }
+   BZ2DLLLoaded=1;
+   BZ2DLLhLib=hLib;
+   return 0;
+
+}
+int BZ2DLLFreeLibrary(void)
+{
+   if(BZ2DLLLoaded==0){return 0;}
+   FreeLibrary(BZ2DLLhLib);
+   BZ2DLLLoaded=0;
+}
+#endif /* WIN32 */
+
+void usage(void)
+{
+   puts("usage: minibz2 [-d] [-{1,2,..9}] [[srcfilename] destfilename]");
+}
+
+int main(int argc,char *argv[])
+{
+   int decompress = 0;
+   int level = 9;
+   char *fn_r = NULL;
+   char *fn_w = NULL;
+
+#ifdef _WIN32
+   if(BZ2DLLLoadLibrary()<0){
+      fprintf(stderr,"Loading of %s failed.  Giving up.\n", BZ2_LIBNAME);
+      exit(1);
+   }
+   printf("Loading of %s succeeded.  Library version is %s.\n",
+          BZ2_LIBNAME, BZ2_bzlibVersion() );
+#endif
+   while(++argv,--argc){
+      if(**argv =='-' || **argv=='/'){
+         char *p;
+
+         for(p=*argv+1;*p;p++){
+            if(*p=='d'){
+               decompress = 1;
+            }else if('1'<=*p && *p<='9'){
+               level = *p - '0';
+            }else{
+               usage();
+               exit(1);
+            }
+         }
+      }else{
+         break;
+      }
+   }
+   if(argc>=1){
+      fn_r = *argv;
+      argc--;argv++;
+   }else{
+      fn_r = NULL;
+   }
+   if(argc>=1){
+      fn_w = *argv;
+      argc--;argv++;
+   }else{
+      fn_w = NULL;
+   }
+   {
+      int len;
+      char buff[0x1000];
+      char mode[10];
+
+      if(decompress){
+         BZFILE *BZ2fp_r = NULL;
+         FILE *fp_w = NULL;
+
+         if(fn_w){
+            if((fp_w = fopen(fn_w,"wb"))==NULL){
+               printf("can't open [%s]\n",fn_w);
+               perror("reason:");
+               exit(1);
+            }
+         }else{
+            fp_w = stdout;
+         }
+         if((fn_r == NULL && (BZ2fp_r = BZ2_bzdopen(fileno(stdin),"rb"))==NULL)
+            || (fn_r != NULL && (BZ2fp_r = BZ2_bzopen(fn_r,"rb"))==NULL)){
+            printf("can't bz2openstream\n");
+            exit(1);
+         }
+         while((len=BZ2_bzread(BZ2fp_r,buff,0x1000))>0){
+            fwrite(buff,1,len,fp_w);
+         }
+         BZ2_bzclose(BZ2fp_r);
+         if(fp_w != stdout) fclose(fp_w);
+      }else{
+         BZFILE *BZ2fp_w = NULL;
+         FILE *fp_r = NULL;
+
+         if(fn_r){
+            if((fp_r = fopen(fn_r,"rb"))==NULL){
+               printf("can't open [%s]\n",fn_r);
+               perror("reason:");
+               exit(1);
+            }
+         }else{
+            fp_r = stdin;
+         }
+         mode[0]='w';
+         mode[1] = '0' + level;
+         mode[2] = '\0';
+
+         if((fn_w == NULL && (BZ2fp_w = BZ2_bzdopen(fileno(stdout),mode))==NULL)
+            || (fn_w !=NULL && (BZ2fp_w = BZ2_bzopen(fn_w,mode))==NULL)){
+            printf("can't bz2openstream\n");
+            exit(1);
+         }
+         while((len=fread(buff,1,0x1000,fp_r))>0){
+            BZ2_bzwrite(BZ2fp_w,buff,len);
+         }
+         BZ2_bzclose(BZ2fp_w);
+         if(fp_r!=stdin)fclose(fp_r);
+      }
+   }
+#ifdef _WIN32
+   BZ2DLLFreeLibrary();
+#endif
+   return 0;
+}
diff --git a/uppsrc/plugin/bz2/lib/huffman.c b/uppsrc/plugin/bz2/lib/huffman.c
new file mode 100644
index 000000000..37d31f8eb
--- /dev/null
+++ b/uppsrc/plugin/bz2/lib/huffman.c
@@ -0,0 +1,228 @@
+
+/*-------------------------------------------------------------*/
+/*--- Huffman coding low-level stuff                        ---*/
+/*---                                             huffman.c ---*/
+/*-------------------------------------------------------------*/
+
+/*--
+  This file is a part of bzip2 and/or libbzip2, a program and
+  library for lossless, block-sorting data compression.
+
+  Copyright (C) 1996-2002 Julian R Seward.  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions
+  are met:
+
+  1. Redistributions of source code must retain the above copyright
+     notice, this list of conditions and the following disclaimer.
+
+  2. The origin of this software must not be misrepresented; you must
+     not claim that you wrote the original software.  If you use this
+     software in a product, an acknowledgment in the product
+     documentation would be appreciated but is not required.
+
+  3. Altered source versions must be plainly marked as such, and must
+     not be misrepresented as being the original software.
+
+  4. The name of the author may not be used to endorse or promote
+     products derived from this software without specific prior written
+     permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+  OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+  ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+  GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+  Julian Seward, Cambridge, UK.
+  jseward@acm.org
+  bzip2/libbzip2 version 1.0 of 21 March 2000
+
+  This program is based on (at least) the work of:
+     Mike Burrows
+     David Wheeler
+     Peter Fenwick
+     Alistair Moffat
+     Radford Neal
+     Ian H. Witten
+     Robert Sedgewick
+     Jon L. Bentley
+
+  For more information on these sources, see the manual.
+--*/
+
+
+#include "bzlib_private.h"
+
+/*---------------------------------------------------*/
+#define WEIGHTOF(zz0)  ((zz0) & 0xffffff00)
+#define DEPTHOF(zz1)   ((zz1) & 0x000000ff)
+#define MYMAX(zz2,zz3) ((zz2) > (zz3) ? (zz2) : (zz3))
+
+#define ADDWEIGHTS(zw1,zw2)                           \
+   (WEIGHTOF(zw1)+WEIGHTOF(zw2)) |                    \
+   (1 + MYMAX(DEPTHOF(zw1),DEPTHOF(zw2)))
+
+#define UPHEAP(z)                                     \
+{                                                     \
+   Int32 zz, tmp;                                     \
+   zz = z; tmp = heap[zz];                            \
+   while (weight[tmp] < weight[heap[zz >> 1]]) {      \
+      heap[zz] = heap[zz >> 1];                       \
+      zz >>= 1;                                       \
+   }                                                  \
+   heap[zz] = tmp;                                    \
+}
+
+#define DOWNHEAP(z)                                   \
+{                                                     \
+   Int32 zz, yy, tmp;                                 \
+   zz = z; tmp = heap[zz];                            \
+   while (True) {                                     \
+      yy = zz << 1;                                   \
+      if (yy > nHeap) break;                          \
+      if (yy < nHeap &&                               \
+          weight[heap[yy+1]] < weight[heap[yy]])      \
+         yy++;                                        \
+      if (weight[tmp] < weight[heap[yy]]) break;      \
+      heap[zz] = heap[yy];                            \
+      zz = yy;                                        \
+   }                                                  \
+   heap[zz] = tmp;                                    \
+}
+
+
+/*---------------------------------------------------*/
+void BZ2_hbMakeCodeLengths ( UChar *len,
+                             Int32 *freq,
+                             Int32 alphaSize,
+                             Int32 maxLen )
+{
+   /*--
+      Nodes and heap entries run from 1.  Entry 0
+      for both the heap and nodes is a sentinel.
+   --*/
+   Int32 nNodes, nHeap, n1, n2, i, j, k;
+   Bool  tooLong;
+
+   Int32 heap   [ BZ_MAX_ALPHA_SIZE + 2 ];
+   Int32 weight [ BZ_MAX_ALPHA_SIZE * 2 ];
+   Int32 parent [ BZ_MAX_ALPHA_SIZE * 2 ];
+
+   for (i = 0; i < alphaSize; i++)
+      weight[i+1] = (freq[i] == 0 ? 1 : freq[i]) << 8;
+
+   while (True) {
+
+      nNodes = alphaSize;
+      nHeap = 0;
+
+      heap[0] = 0;
+      weight[0] = 0;
+      parent[0] = -2;
+
+      for (i = 1; i <= alphaSize; i++) {
+         parent[i] = -1;
+         nHeap++;
+         heap[nHeap] = i;
+         UPHEAP(nHeap);
+      }
+
+      AssertH( nHeap < (BZ_MAX_ALPHA_SIZE+2), 2001 );
+
+      while (nHeap > 1) {
+         n1 = heap[1]; heap[1] = heap[nHeap]; nHeap--; DOWNHEAP(1);
+         n2 = heap[1]; heap[1] = heap[nHeap]; nHeap--; DOWNHEAP(1);
+         nNodes++;
+         parent[n1] = parent[n2] = nNodes;
+         weight[nNodes] = ADDWEIGHTS(weight[n1], weight[n2]);
+         parent[nNodes] = -1;
+         nHeap++;
+         heap[nHeap] = nNodes;
+         UPHEAP(nHeap);
+      }
+
+      AssertH( nNodes < (BZ_MAX_ALPHA_SIZE * 2), 2002 );
+
+      tooLong = False;
+      for (i = 1; i <= alphaSize; i++) {
+         j = 0;
+         k = i;
+         while (parent[k] >= 0) { k = parent[k]; j++; }
+         len[i-1] = j;
+         if (j > maxLen) tooLong = True;
+      }
+
+      if (! tooLong) break;
+
+      for (i = 1; i < alphaSize; i++) {
+         j = weight[i] >> 8;
+         j = 1 + (j / 2);
+         weight[i] = j << 8;
+      }
+   }
+}
+
+
+/*---------------------------------------------------*/
+void BZ2_hbAssignCodes ( Int32 *code,
+                         UChar *length,
+                         Int32 minLen,
+                         Int32 maxLen,
+                         Int32 alphaSize )
+{
+   Int32 n, vec, i;
+
+   vec = 0;
+   for (n = minLen; n <= maxLen; n++) {
+      for (i = 0; i < alphaSize; i++)
+         if (length[i] == n) { code[i] = vec; vec++; };
+      vec <<= 1;
+   }
+}
+
+
+/*---------------------------------------------------*/
+void BZ2_hbCreateDecodeTables ( Int32 *limit,
+                                Int32 *base,
+                                Int32 *perm,
+                                UChar *length,
+                                Int32 minLen,
+                                Int32 maxLen,
+                                Int32 alphaSize )
+{
+   Int32 pp, i, j, vec;
+
+   pp = 0;
+   for (i = minLen; i <= maxLen; i++)
+      for (j = 0; j < alphaSize; j++)
+         if (length[j] == i) { perm[pp] = j; pp++; };
+
+   for (i = 0; i < BZ_MAX_CODE_LEN; i++) base[i] = 0;
+   for (i = 0; i < alphaSize; i++) base[length[i]+1]++;
+
+   for (i = 1; i < BZ_MAX_CODE_LEN; i++) base[i] += base[i-1];
+
+   for (i = 0; i < BZ_MAX_CODE_LEN; i++) limit[i] = 0;
+   vec = 0;
+
+   for (i = minLen; i <= maxLen; i++) {
+      vec += (base[i+1] - base[i]);
+      limit[i] = vec-1;
+      vec <<= 1;
+   }
+   for (i = minLen + 1; i <= maxLen; i++)
+      base[i] = ((limit[i-1] + 1) << 1) - base[i];
+}
+
+
+/*-------------------------------------------------------------*/
+/*--- end                                         huffman.c ---*/
+/*-------------------------------------------------------------*/
diff --git a/uppsrc/plugin/bz2/lib/mk251.c b/uppsrc/plugin/bz2/lib/mk251.c
new file mode 100644
index 000000000..205778a84
--- /dev/null
+++ b/uppsrc/plugin/bz2/lib/mk251.c
@@ -0,0 +1,16 @@
+
+/* Spew out a long sequence of the byte 251.  When fed to bzip2
+   versions 1.0.0 or 1.0.1, causes it to die with internal error
+   1007 in blocksort.c.  This assertion misses an extremely rare
+   case, which is fixed in this version (1.0.2) and above.
+*/
+
+#include <stdio.h>
+
+int main ()
+{
+   int i;
+   for (i = 0; i < 48500000 ; i++)
+     putchar(251);
+   return 0;
+}
diff --git a/uppsrc/plugin/bz2/lib/randtable.c b/uppsrc/plugin/bz2/lib/randtable.c
new file mode 100644
index 000000000..6de73a486
--- /dev/null
+++ b/uppsrc/plugin/bz2/lib/randtable.c
@@ -0,0 +1,124 @@
+
+/*-------------------------------------------------------------*/
+/*--- Table for randomising repetitive blocks               ---*/
+/*---                                           randtable.c ---*/
+/*-------------------------------------------------------------*/
+
+/*--
+  This file is a part of bzip2 and/or libbzip2, a program and
+  library for lossless, block-sorting data compression.
+
+  Copyright (C) 1996-2002 Julian R Seward.  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions
+  are met:
+
+  1. Redistributions of source code must retain the above copyright
+     notice, this list of conditions and the following disclaimer.
+
+  2. The origin of this software must not be misrepresented; you must
+     not claim that you wrote the original software.  If you use this
+     software in a product, an acknowledgment in the product
+     documentation would be appreciated but is not required.
+
+  3. Altered source versions must be plainly marked as such, and must
+     not be misrepresented as being the original software.
+
+  4. The name of the author may not be used to endorse or promote
+     products derived from this software without specific prior written
+     permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+  OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+  ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+  GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+  Julian Seward, Cambridge, UK.
+  jseward@acm.org
+  bzip2/libbzip2 version 1.0 of 21 March 2000
+
+  This program is based on (at least) the work of:
+     Mike Burrows
+     David Wheeler
+     Peter Fenwick
+     Alistair Moffat
+     Radford Neal
+     Ian H. Witten
+     Robert Sedgewick
+     Jon L. Bentley
+
+  For more information on these sources, see the manual.
+--*/
+
+
+#include "bzlib_private.h"
+
+
+/*---------------------------------------------*/
+Int32 BZ2_rNums[512] = {
+   619, 720, 127, 481, 931, 816, 813, 233, 566, 247,
+   985, 724, 205, 454, 863, 491, 741, 242, 949, 214,
+   733, 859, 335, 708, 621, 574, 73, 654, 730, 472,
+   419, 436, 278, 496, 867, 210, 399, 680, 480, 51,
+   878, 465, 811, 169, 869, 675, 611, 697, 867, 561,
+   862, 687, 507, 283, 482, 129, 807, 591, 733, 623,
+   150, 238, 59, 379, 684, 877, 625, 169, 643, 105,
+   170, 607, 520, 932, 727, 476, 693, 425, 174, 647,
+   73, 122, 335, 530, 442, 853, 695, 249, 445, 515,
+   909, 545, 703, 919, 874, 474, 882, 500, 594, 612,
+   641, 801, 220, 162, 819, 984, 589, 513, 495, 799,
+   161, 604, 958, 533, 221, 400, 386, 867, 600, 782,
+   382, 596, 414, 171, 516, 375, 682, 485, 911, 276,
+   98, 553, 163, 354, 666, 933, 424, 341, 533, 870,
+   227, 730, 475, 186, 263, 647, 537, 686, 600, 224,
+   469, 68, 770, 919, 190, 373, 294, 822, 808, 206,
+   184, 943, 795, 384, 383, 461, 404, 758, 839, 887,
+   715, 67, 618, 276, 204, 918, 873, 777, 604, 560,
+   951, 160, 578, 722, 79, 804, 96, 409, 713, 940,
+   652, 934, 970, 447, 318, 353, 859, 672, 112, 785,
+   645, 863, 803, 350, 139, 93, 354, 99, 820, 908,
+   609, 772, 154, 274, 580, 184, 79, 626, 630, 742,
+   653, 282, 762, 623, 680, 81, 927, 626, 789, 125,
+   411, 521, 938, 300, 821, 78, 343, 175, 128, 250,
+   170, 774, 972, 275, 999, 639, 495, 78, 352, 126,
+   857, 956, 358, 619, 580, 124, 737, 594, 701, 612,
+   669, 112, 134, 694, 363, 992, 809, 743, 168, 974,
+   944, 375, 748, 52, 600, 747, 642, 182, 862, 81,
+   344, 805, 988, 739, 511, 655, 814, 334, 249, 515,
+   897, 955, 664, 981, 649, 113, 974, 459, 893, 228,
+   433, 837, 553, 268, 926, 240, 102, 654, 459, 51,
+   686, 754, 806, 760, 493, 403, 415, 394, 687, 700,
+   946, 670, 656, 610, 738, 392, 760, 799, 887, 653,
+   978, 321, 576, 617, 626, 502, 894, 679, 243, 440,
+   680, 879, 194, 572, 640, 724, 926, 56, 204, 700,
+   707, 151, 457, 449, 797, 195, 791, 558, 945, 679,
+   297, 59, 87, 824, 713, 663, 412, 693, 342, 606,
+   134, 108, 571, 364, 631, 212, 174, 643, 304, 329,
+   343, 97, 430, 751, 497, 314, 983, 374, 822, 928,
+   140, 206, 73, 263, 980, 736, 876, 478, 430, 305,
+   170, 514, 364, 692, 829, 82, 855, 953, 676, 246,
+   369, 970, 294, 750, 807, 827, 150, 790, 288, 923,
+   804, 378, 215, 828, 592, 281, 565, 555, 710, 82,
+   896, 831, 547, 261, 524, 462, 293, 465, 502, 56,
+   661, 821, 976, 991, 658, 869, 905, 758, 745, 193,
+   768, 550, 608, 933, 378, 286, 215, 979, 792, 961,
+   61, 688, 793, 644, 986, 403, 106, 366, 905, 644,
+   372, 567, 466, 434, 645, 210, 389, 550, 919, 135,
+   780, 773, 635, 389, 707, 100, 626, 958, 165, 504,
+   920, 176, 193, 713, 857, 265, 203, 50, 668, 108,
+   645, 990, 626, 197, 510, 357, 358, 850, 858, 364,
+   936, 638
+};
+
+
+/*-------------------------------------------------------------*/
+/*--- end                                       randtable.c ---*/
+/*-------------------------------------------------------------*/
diff --git a/uppsrc/plugin/bz2/lib/spewG.c b/uppsrc/plugin/bz2/lib/spewG.c
new file mode 100644
index 000000000..6caca9baa
--- /dev/null
+++ b/uppsrc/plugin/bz2/lib/spewG.c
@@ -0,0 +1,39 @@
+
+/* spew out a thoroughly gigantic file designed so that bzip2
+   can compress it reasonably rapidly.  This is to help test
+   support for large files (> 2GB) in a reasonable amount of time.
+   I suggest you use the undocumented --exponential option to
+   bzip2 when compressing the resulting file; this saves a bit of
+   time.  Note: *don't* bother with --exponential when compressing
+   Real Files; it'll just waste a lot of CPU time :-)
+   (but is otherwise harmless).
+*/
+
+#define _FILE_OFFSET_BITS 64
+
+#include <stdio.h>
+#include <stdlib.h>
+
+/* The number of megabytes of junk to spew out (roughly) */
+#define MEGABYTES 5000
+
+#define N_BUF 1000000
+char buf[N_BUF];
+
+int main ( int argc, char** argv )
+{
+   int ii, kk, p;
+   srandom(1);
+   setbuffer ( stdout, buf, N_BUF );
+   for (kk = 0; kk < MEGABYTES * 515; kk+=3) {
+      p = 25+random()%50;
+      for (ii = 0; ii < p; ii++)
+         printf ( "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" );
+      for (ii = 0; ii < p-1; ii++)
+         printf ( "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb" );
+      for (ii = 0; ii < p+1; ii++)
+         printf ( "ccccccccccccccccccccccccccccccccccccc" );
+   }
+   fflush(stdout);
+   return 0;
+}
diff --git a/uppsrc/plugin/bz2/lib/unzcrash.c b/uppsrc/plugin/bz2/lib/unzcrash.c
new file mode 100644
index 000000000..623aacc9f
--- /dev/null
+++ b/uppsrc/plugin/bz2/lib/unzcrash.c
@@ -0,0 +1,126 @@
+
+/* A test program written to test robustness to decompression of
+   corrupted data.  Usage is
+       unzcrash filename
+   and the program will read the specified file, compress it (in memory),
+   and then repeatedly decompress it, each time with a different bit of
+   the compressed data inverted, so as to test all possible one-bit errors.
+   This should not cause any invalid memory accesses.  If it does,
+   I want to know about it!
+
+   p.s.  As you can see from the above description, the process is
+   incredibly slow.  A file of size eg 5KB will cause it to run for
+   many hours.
+*/
+
+#include <stdio.h>
+#include <assert.h>
+#include "bzlib.h"
+
+#define M_BLOCK 1000000
+
+typedef unsigned char uchar;
+
+#define M_BLOCK_OUT (M_BLOCK + 1000000)
+uchar inbuf[M_BLOCK];
+uchar outbuf[M_BLOCK_OUT];
+uchar zbuf[M_BLOCK + 600 + (M_BLOCK / 100)];
+
+int nIn, nOut, nZ;
+
+static char *bzerrorstrings[] = {
+       "OK"
+      ,"SEQUENCE_ERROR"
+      ,"PARAM_ERROR"
+      ,"MEM_ERROR"
+      ,"DATA_ERROR"
+      ,"DATA_ERROR_MAGIC"
+      ,"IO_ERROR"
+      ,"UNEXPECTED_EOF"
+      ,"OUTBUFF_FULL"
+      ,"???"   /* for future */
+      ,"???"   /* for future */
+      ,"???"   /* for future */
+      ,"???"   /* for future */
+      ,"???"   /* for future */
+      ,"???"   /* for future */
+};
+
+void flip_bit ( int bit )
+{
+   int byteno = bit / 8;
+   int bitno  = bit % 8;
+   uchar mask = 1 << bitno;
+   //fprintf ( stderr, "(byte %d  bit %d  mask %d)",
+   //          byteno, bitno, (int)mask );
+   zbuf[byteno] ^= mask;
+}
+
+int main ( int argc, char** argv )
+{
+   FILE* f;
+   int   r;
+   int   bit;
+   int   i;
+
+   if (argc != 2) {
+      fprintf ( stderr, "usage: unzcrash filename\n" );
+      return 1;
+   }
+
+   f = fopen ( argv[1], "r" );
+   if (!f) {
+      fprintf ( stderr, "unzcrash: can't open %s\n", argv[1] );
+      return 1;
+   }
+
+   nIn = fread ( inbuf, 1, M_BLOCK, f );
+   fprintf ( stderr, "%d bytes read\n", nIn );
+
+   nZ = M_BLOCK;
+   r = BZ2_bzBuffToBuffCompress (
+         zbuf, &nZ, inbuf, nIn, 9, 0, 30 );
+
+   assert (r == BZ_OK);
+   fprintf ( stderr, "%d after compression\n", nZ );
+
+   for (bit = 0; bit < nZ*8; bit++) {
+      fprintf ( stderr, "bit %d  ", bit );
+      flip_bit ( bit );
+      nOut = M_BLOCK_OUT;
+      r = BZ2_bzBuffToBuffDecompress (
+            outbuf, &nOut, zbuf, nZ, 0, 0 );
+      fprintf ( stderr, " %d  %s ", r, bzerrorstrings[-r] );
+
+      if (r != BZ_OK) {
+         fprintf ( stderr, "\n" );
+      } else {
+         if (nOut != nIn) {
+           fprintf(stderr, "nIn/nOut mismatch %d %d\n", nIn, nOut );
+           return 1;
+         } else {
+           for (i = 0; i < nOut; i++)
+             if (inbuf[i] != outbuf[i]) {
+                fprintf(stderr, "mismatch at %d\n", i );
+                return 1;
+           }
+           if (i == nOut) fprintf(stderr, "really ok!\n" );
+         }
+      }
+
+      flip_bit ( bit );
+   }
+
+#if 0
+   assert (nOut == nIn);
+   for (i = 0; i < nOut; i++) {
+     if (inbuf[i] != outbuf[i]) {
+        fprintf ( stderr, "difference at %d !\n", i );
+        return 1;
+     }
+   }
+#endif
+
+   fprintf ( stderr, "all ok\n" );
+   return 0;
+}
diff --git a/uppsrc/plugin/dbf/dbf.cpp b/uppsrc/plugin/dbf/dbf.cpp
new file mode 100644
index 000000000..af851c2fa
--- /dev/null
+++ b/uppsrc/plugin/dbf/dbf.cpp
@@ -0,0 +1,948 @@
+#include "dbf.h"
+
+NAMESPACE_UPP
+
+#define LLOG(x) // LOG(x)
+#define LTIMING(x) // RTIMING(x)
+
+inline int DeleteShareFlag()
+{
+#ifdef PLATFORM_WIN32
+	return IsWinNT() ? FileStream::DELETESHARE : 0;
+#else
+	return 0;
+#endif
+}
+
+struct DbfCharset {
+	byte dbf_code;
+	byte charset;
+};
+
+static DbfCharset _dbfCharsets[] = {
+//	{ 0x01, CHARSET_UNKNOWN }, // DOS USA, CP437
+//	{ 0x02, CHARSET_UNKNOWN }, // DOS multilingual, CP850
+	{ 0x03, CHARSET_WIN1252 }, // Windows ANSI, CP1252
+//	{ 0x04, CHARSET_UNKNOWN }, // Standard Macintosh
+	{ 0x64, CHARSET_CP852   }, // EE MS-DOS, CP852
+//	{ 0x65, CHARSET_UNKNOWN }, // Nordic MS-DOS, CP865
+//	{ 0x66, CHARSET_UNKNOWN }, // Russian MS-DOS, CP866
+//	{ 0x67, CHARSET_UNKNOWN }, // Icelandic MS-DOS
+	{ 0x68, CHARSET_MJK     }, // Kamenicky (Czech) MS-DOS
+//	{ 0x69, CHARSET_UNKNOWN }, // Mazovia (Polish) MS-DOS
+//	{ 0x6A, CHARSET_UNKNOWN }, // Greek MS-DOS (437G)
+//	{ 0x6B, CHARSET_UNKNOWN }, // Turkish MS-DOS
+//	{ 0x96, CHARSET_UNKNOWN }, // Russian Macintosh
+//	{ 0x97, CHARSET_UNKNOWN }, // East European Macintosh
+//	{ 0x98, CHARSET_UNKNOWN }, // Greek Macintosh
+	{ 0xC8, CHARSET_WIN1250 },
+//	{ 0xC9, CHARSET_UNKNOWN }, // Russian Windows
+//	{ 0xCA, CHARSET_UNKNOWN }, // Turkish Windows
+//	{ 0xCB, CHARSET_UNKNOWN }, // Greek Windows
+};
+
+static void sStreamIL(Stream& s, int& x)
+{
+	if(s.IsLoading())
+		x = s.Get32le();
+	else
+		s.Put32le(x);
+}
+
+static void sStreamIW(Stream& s, int& x)
+{
+	if(s.IsLoading())
+		x = s.Get16le();
+	else
+		s.Put16le(x);
+}
+
+static int scan_int(const char *p, const char *e = 0)
+{
+	LTIMING("scan_int");
+	bool neg = false;
+	if(p != e && (*p == '+' || *p == '-'))
+		neg = (*p++ == '-');
+	if(p == e || (byte)(*p - '0') >= 10)
+		return Null;
+	int val = *p++ - '0';
+	while(p != e && (byte)(*p - '0') < 10)
+		val = 10 * val + *p++ - '0';
+	return neg ? -val : val;
+}
+
+static double scan_dbl(const char *p, const char *e = 0)
+{
+	LTIMING("scan_dbl");
+	bool neg = false;
+	if(p != e && (*p == '+' || *p == '-'))
+		neg = (*p++ == '-');
+	if(p == e || (byte)(*p - '0') >= 10)
+		return Null;
+	double mantissa = 0;
+	char c;
+	int exp = 0;
+	while(p != e && (byte)(*p - '0') < 10)
+		if((c = *p++) != '0') {
+			if(exp) { mantissa *= ipow10(exp); exp = 0; }
+			mantissa = 10 * mantissa + c - '0';
+		}
+		else
+			exp++;
+	int raise = exp;
+	if(p != e && *p == '.') // decimal part
+		while(++p != e && (byte)((c = *p) - '0') < 10)
+			if(c != '0') {
+				if(raise) { mantissa *= ipow10(raise); exp -= raise; raise = 0; }
+				exp--;
+				mantissa = 10 * mantissa + c - '0';
+			}
+			else
+				raise++;
+	if(p != e && (*p == 'E' || *p == 'e')) { // exponent
+		int vexp = scan_int(p + 1, e);
+		if(!IsNull(vexp))
+			exp += vexp;
+	}
+	if(exp) {
+		double e = ipow10(tabs(exp));
+		mantissa = (exp > 0 ? mantissa * e : mantissa / e);
+	}
+	return neg ? -mantissa : mantissa;
+}
+
+static int StrBool(char c)
+{
+	if(c == 'A' || c == 'a' || c == 'Y' || c == 'y' || c == 'T' || c == 't' || c == '1')
+		return 1;
+	if(c == 'N' || c == 'n' || c == 'F' || c == 'f' || c == '0')
+		return 0;
+	return (int)Null;
+}
+
+DbfStream::Field::Field(const char *_name, char type, byte width, byte decimal)
+: type(type), width(width), decimal(decimal), offset(0)
+{
+	if(_name) {
+		const char *p = reinterpret_cast<const char *>(memchr(_name, 0, 11));
+		name = String(_name, p ? p - _name : 11);
+	}
+	name = ToUpper(name);
+}
+
+String DbfStream::Field::Format(Value value, byte charset) const
+{
+	switch(type) {
+		case 'C': {
+			if(charset == GetDefaultCharset())
+				return StdFormat(value);
+			WString s;
+			if(value.GetType() == WSTRING_V)
+				s = value;
+			else
+				s = StdFormat(value).ToWString();
+			return FromUnicode(s, charset);
+		}
+
+		case 'N':
+		case 'F': {
+			double v = value;
+			if(IsNull(v))
+				return Null;
+			String out;
+			if(decimal == 0) {
+				if(width < 10)
+					out = FormatInt(fround(v));
+				else
+					out = FormatDoubleFix(v, 0);
+				if(out.GetLength() > width) {
+					out = (v >= 0 ? "" : "-");
+					out.Cat('9', width - out.GetLength());
+				}
+			}
+			else {
+				if(v == 0 || ilog10(fabs(v)) + 2 <= width)
+					out = FormatDoubleFix(v, decimal);
+				if(out.IsEmpty() || out.GetLength() > width)
+					out = FormatDoubleExp(v, min<int>(decimal, width - 6));
+				ASSERT(out.GetLength() <= width);
+			}
+			if(out.GetLength() < width)
+				out = String(' ', width - out.GetLength()) + out;
+			return out;
+		}
+
+		case 'D': {
+			UPP::Date dt = value;
+			if(IsNull(dt))
+				return Null;
+			char p[9];
+			p[8] = 0;
+			p[7] = dt.day % 10 + '0';
+			p[6] = dt.day / 10 + '0';
+			p[5] = dt.month % 10 + '0';
+			p[4] = dt.month / 10 + '0';
+			int y = dt.year;
+			p[3] = y % 10 + '0'; y /= 10;
+			p[2] = y % 10 + '0'; y /= 10;
+			p[1] = y % 10 + '0';
+			p[0] = y / 10 + '0';
+			return String(p, 8);
+		}
+
+		case '!': {
+			StringBuffer temp;
+			temp.SetCount(4);
+			Poke32le(~temp, (int)value);
+			return temp;
+		}
+
+		case '@': {
+			Time t(value);
+			int dt = UPP::Date(t) - UPP::Date(-4713, 1, 1);
+			int tm = 1000 * (t.second + 60 * (t.minute + 60 * t.hour));
+			StringBuffer temp;
+			temp.SetCount(8);
+			Poke32le(~temp + 0, dt);
+			Poke32le(~temp + 4, tm);
+			return temp;
+		}
+
+		case 'O': {
+			union {
+				char s[8];
+				double d;
+			};
+			d = value;
+			StringBuffer temp;
+			temp.SetCount(8);
+#ifdef CPU_LE
+			*(double *)~temp = d;
+#else
+			temp[0] = s[7];
+			temp[1] = s[6];
+			temp[2] = s[5];
+			temp[3] = s[4];
+			temp[4] = s[3];
+			temp[5] = s[2];
+			temp[6] = s[1];
+			temp[7] = s[0];
+#endif
+			return temp;
+		}
+
+		case 'L': {
+			int cond = value;
+			return cond && !IsNull(cond) ? "A" : "N";
+			}
+
+		default:  {
+			NEVER();
+			return Null;
+		}
+	}
+}
+
+DbfStream::Field DbfStream::Field::Text(const char *name, int width)
+{
+	ASSERT(width >= 1 && width <= 255);
+	return Field(name, 'C', width);
+}
+
+DbfStream::Field DbfStream::Field::Number(const char *name, int width, int decimals)
+{
+	ASSERT(width >= 1 && width <= 31);
+	ASSERT(decimals >= 0 && decimals <= width - 1);
+	return Field(name, 'N', width, decimals);
+}
+
+DbfStream::Field DbfStream::Field::Date(const char *name)
+{
+	return Field(name, 'D', 8);
+}
+
+DbfStream::Field DbfStream::Field::Logical(const char *name)
+{
+	return Field(name, 'L', 1);
+}
+
+int DbfStream::Field::GetType() const
+{
+	switch(type) {
+	case 'N':
+	case 'F': return (width <= 9 && decimal == 0 ? INT_V : DOUBLE_V);
+	case 'O': return DOUBLE_V;
+	case 'M':
+	case 'G':
+	case 'C': return STRING_V;
+	case 'D': return DATE_V;
+	case 'L': return INT_V;
+	default:  return VOID_V;
+	}
+}
+
+void DbfStream::Field::Serialize(Stream& stream)
+{
+	char buffer[12];
+	ZeroArray(buffer);
+	if(stream.IsStoring())
+		memcpy(buffer, name, min(name.GetLength(), 10));
+	stream.SerializeRaw((byte *)buffer, 11);
+	if(stream.IsLoading()) {
+		name = buffer;
+		name = ToUpper(name);
+	}
+	stream % type;
+	sStreamIL(stream, offset);
+	stream % width % decimal;
+	if(stream.IsStoring())
+		stream.Put(0, 14);
+	else
+		stream.SeekCur(14);
+}
+
+DbfStream::DbfStream()
+{
+}
+
+DbfStream::DbfStream(const char *_file, bool write, byte _charset, bool _delete_share)
+{
+	Open(_file, write, _charset, _delete_share);
+}
+
+bool DbfStream::Check(const char *filename, bool write)
+{
+	return DbfStream().Open(filename, write, CHARSET_DEFAULT);
+}
+
+bool DbfStream::Open(const char *file, bool write, byte _charset, bool _delete_share)
+{
+	Close();
+	LLOG("DbfStream::Open(" << file << ", write = " << write << ", charset = " << (int)_charset << ")");
+	if(!dbf.Open(file, (write ? FileStream::READWRITE : FileStream::READ)
+	| (_delete_share ? DeleteShareFlag() : 0))) {
+		LLOG("-> open error");
+		return false;
+	}
+	if(dbt.Open(ForceExt(file, ".dbt"),
+		FileStream::READ | (_delete_share ? DeleteShareFlag() : 0))) // writing MEMO's is not supported yet
+		dbt.SetLoading();
+	dbf.SetLoading();
+	if(DoOpen(_charset))
+		return true;
+	LLOG("-> DoOpen error");
+	Close();
+	return false;
+}
+
+bool DbfStream::Create(const char *filename, const Array<Field>& _fields, byte _charset, bool _delete_share)
+{
+	Close();
+	if(!dbf.Open(filename, FileStream::CREATE | (_delete_share ? DeleteShareFlag() : 0)))
+		return false;
+	if(DoCreate(_fields, _charset))
+		return true;
+	Close();
+	return false;
+}
+
+static inline bool IsValidType(char t)
+{
+	return t == 'C' || t == 'N' || t == 'D' || t == 'L' || t == 'M'
+	|| t == 'F' || t == 'O' || t == 'G';
+}
+
+bool DbfStream::StreamHeader(bool full)
+{
+	ASSERT(dbf.IsOpen());
+	data_offset = 32 + fields.GetCount() * 32 + 1;
+	if(dbf.IsStoring()) {
+		ASSERT(!IsReadOnly());
+		dbf.Put(0x03); // #0: version number - 03 without a DBT file
+		Date date = GetSysDate();
+		dbf.Put(date.year - 1900); // #1 - 3: date of last update
+		dbf.Put(date.month);
+		dbf.Put(date.day);
+	}
+	else
+		dbf.Get32le();
+	sStreamIL(dbf, rows);
+	if(!full)
+		return true;
+	sStreamIW(dbf, data_offset);
+	int row_width = record.GetCount();
+	if(dbf.IsStoring() && row_width == 0) { // calculate row width
+		row_width = 1;
+		for(int i = 0; i < fields.GetCount(); i++)
+			row_width += fields[i].width;
+	}
+	sStreamIW(dbf, row_width);
+	if(dbf.IsStoring()) {
+		dbf.Put(0, 17);
+		int i = __countof(_dbfCharsets);
+		while(--i >= 0 && _dbfCharsets[i].charset != charset)
+			;
+		dbf.Put(i >= 0 ? _dbfCharsets[i].dbf_code : 0);
+	//	dbf.PutIL(lang_code);
+		dbf.Put16(0);
+	}
+	else
+		dbf.SeekCur(20);
+	int field_count = fields.GetCount();
+	if(dbf.IsLoading()) {
+		if(rows < 0)
+			return false;
+		if(data_offset <= 32) // || (data_offset & 0x1F) != 1)
+			return false; // invalid header size
+		if(dbf.GetSize() < (unsigned)data_offset)
+			return false; // incomplete file header
+		int rec_count = (int)((dbf.GetSize() - data_offset) / row_width);
+		rows = min(rows, rec_count); // physical record #
+		field_count = (data_offset >> 5) - 1;
+		fields.Clear();
+		has_memo = false;
+	}
+	int offset = 1;
+	Index<String> used_names;
+	for(int i = 0; i < field_count && offset < row_width; i++) {
+		Field field;
+		if(dbf.IsStoring()) {
+			fields[i].offset = offset;
+			field = fields[i];
+		}
+		field.Serialize(dbf);
+		if(dbf.IsError())
+			return false;
+		if(dbf.IsLoading()) {
+			if(field.type == 0)
+				break;
+			String uname = ToUpper(ToAscii(field.name, charset), charset);
+			String outname;
+			for(const char *p = uname; *p; p++)
+				if(IsAlNum(*p) || *p == '_')
+					outname.Cat(*p);
+			if(outname.IsEmpty() || IsDigit(*outname))
+				outname.Insert(0, 'F');
+			if(used_names.Find(outname) >= 0) {
+				int i = 0;
+				while(used_names.Find(outname + '_' + IntStr(++i)) >= 0)
+					;
+				outname << '_' << i;
+			}
+			used_names.Add(field.name = outname);
+		}
+		if(dbf.IsLoading() && field.name != "_DBASELOCK" && IsValidType(field.type)) {
+			field.offset = offset;
+			fields.Add(field.name, field);
+			if(field.type == 'M')
+				has_memo = true;
+		}
+		offset += field.width;
+	}
+	byte b = 0x0D;
+	dbf % b;
+	ASSERT(dbf.GetPos() <= (unsigned)data_offset);
+	record.SetCount(row_width);
+	memset(record.Begin(), ' ', record.GetCount());
+	if(dbf.IsError())
+		return false;
+	if(has_memo && dbt.IsOpen() && dbt.IsLoading()) { // read DBT header
+		dbt.Seek(16);
+		int b = dbt.Get();
+		dbt_block_size = 512;
+		if(b != 3) {
+			dbt.Seek(20);
+			dbt_block_size = (short)dbt.Get16le();
+			if(dbt_block_size <= 0)
+				has_memo = false;
+		}
+	}
+	return true;
+}
+
+bool DbfStream::DoOpen(byte _charset)
+{
+	charset = _charset;
+	dirty = false;
+	dirty_header = false;
+	row_index = Null;
+	next_row_index = 0;
+	if(!StreamHeader(true))
+		return false;
+	DoFields();
+	return true;
+}
+
+bool DbfStream::DoCreate(const Array<Field>& _fields, byte _charset)
+{
+	charset = _charset;
+	rows = 0;
+	dirty = false;
+	dirty_header = false;
+	row_index = 0;
+	next_row_index = 0;
+	has_memo = false;
+	fields.Clear();
+	for(int i = 0; i < _fields.GetCount(); i++)
+		fields.Add(_fields[i].name, _fields[i]);
+	if(!StreamHeader(true))
+		return false;
+	DoFields();
+	return true;
+}
+
+void DbfStream::DoFields()
+{
+	field_read.Clear();
+	field_read.SetCount(fields.GetCount(), &DbfStream::GetItemEmpty);
+	for(int i = 0; i < fields.GetCount(); i++) {
+		const Field& fld = fields[i];
+		switch(fld.type) {
+		case 'C': field_read[i] = &DbfStream::GetItemString; break;
+		case 'N':
+		case 'F': field_read[i] = (fld.width < 10 && fld.decimal == 0 ? &DbfStream::GetItemInt : &DbfStream::GetItemDouble); break;
+		case 'O': field_read[i] = &DbfStream::GetItemDouble8; break;
+		case '!':
+		case '+': field_read[i] = &DbfStream::GetItemInt4; break;
+		case '@': field_read[i] = &DbfStream::GetItemDateTime8; break;
+		case 'D': field_read[i] = (fld.width < 10 ? &DbfStream::GetItemDateShort : &DbfStream::GetItemDateLong); break;
+		case 'L': field_read[i] = &DbfStream::GetItemLogical; break;
+		case 'M':
+		case 'G': field_read[i] = &DbfStream::GetItemMemoString; break;
+		case 'B': field_read[i] = &DbfStream::GetItemMemoBinary; break;
+		}
+	}
+}
+
+void DbfStream::SetRowCount(int count)
+{
+	if(rows > count) { // trim file
+		dbf.SetSize(data_offset + count * record.GetCount());
+		dirty_header = true;
+	}
+	else if(count > rows) { // extend file
+		dbf.Seek(data_offset + rows * record.GetCount());
+		dbf.Put(' ', (count - rows) * record.GetCount());
+		dirty_header = true;
+	}
+	rows = count;
+}
+
+void DbfStream::Flush()
+{
+	FlushRow();
+	FlushHeader();
+}
+
+void DbfStream::FlushRow()
+{
+	ASSERT(IsOpen());
+	if(dirty) {
+		ASSERT(!IsReadOnly());
+		ASSERT(row_index >= 0);
+		if(row_index > rows) {
+			dbf.Seek(data_offset + rows * record.GetCount());
+			dbf.Put(' ', (row_index - rows) * record.GetCount());
+		}
+		else
+			dbf.Seek(data_offset + row_index * record.GetCount());
+		dbf.Put(record.Begin(), record.GetCount());
+		if(row_index >= rows) {
+			rows = row_index + 1;
+			dirty_header = true;
+		}
+		dirty = false;
+	}
+}
+
+void DbfStream::FlushHeader()
+{
+	ASSERT(IsOpen());
+	if(dirty_header) {
+		ASSERT(!IsReadOnly());
+		dbf.Seek(0);
+		dbf.SetStoring();
+		StreamHeader(false);
+		dirty_header = false;
+	}
+}
+
+bool DbfStream::Close()
+{
+	if(IsOpen())
+		Flush();
+	dbf.Close();
+	dbt.Close();
+	return !dbf.IsError() && (!has_memo || !dbt.IsError());
+}
+
+bool DbfStream::Fetch(int row)
+{
+	LTIMING("DbfStream::Fetch");
+	ASSERT(IsOpen());
+	if(dirty)
+		FlushRow();
+	next_row_index = row + 1;
+	if(row == row_index)
+		return *record;
+	row_index = row;
+	if(row < 0 || row >= rows) {
+		*record.Begin() = 0;
+		return false;
+	}
+
+	dbf.Seek(data_offset + row * record.GetCount());
+	byte *p = record.Begin(), *e = record.End();
+	int count = dbf.Get(p, e - p);
+	if(count < record.GetCount())
+		memset(p + count, ' ', record.GetCount() - count);
+	if(count <= 0 || (*p != ' ' && *p != 0)) {
+		*p = 0;
+		return false;
+	}
+	*p = ' ';
+/*
+	if(codepage_cv)
+		for(const char *page = codepage_map; ++p < e; *p = page[*p])
+			;
+*/
+	dirty = false;
+	return true;
+}
+
+void DbfStream::Seek(int row)
+{
+	if(row != row_index) {
+		FlushRow();
+		next_row_index = row;
+	}
+}
+
+bool DbfStream::Fetch()
+{
+	int r = next_row_index;
+	for(; r < rows; r++)
+		if(Fetch(r))
+			return true;
+	return false;
+}
+
+Value DbfStream::GetItem(int i) const
+{
+	LTIMING("DbfStream::GetItem");
+	ASSERT(i >= 0 && i < fields.GetCount());
+	return (this ->* (field_read[i].proc))(i);
+}
+
+void DbfStream::PutItem(int i, Value value)
+{
+	const Field& fld = fields[i];
+	dirty = true;
+	byte *p = record.Begin() + fld.offset;
+	if(IsNull(value)) // empty value is the same for all data types
+		memset(p, ' ', fld.width);
+	else {
+		String s = fld.Format(value, charset);
+		int l = min<int>(s.GetLength(), fld.width);
+		memcpy(p, s, l);
+		if(l < fld.width)
+			memset(p + l, ' ', fld.width - l);
+	}
+}
+
+void DbfStream::PutItem(String n, Value value)
+{
+	int i = GetFieldIndex(n);
+	if(i >= 0)
+		PutItem(i, value);
+	else
+		NEVER(); // column missing
+}
+
+Value DbfStream::GetItem(String name) const
+{
+	int index = GetFieldIndex(name);
+	if(index >= 0)
+		return GetItem(index);
+	else {
+		NEVER();
+		return ErrorValue(NFormat("column '%s' not found", name));
+	}
+}
+
+Vector<Value> DbfStream::FetchRow()
+{
+	if(!Fetch())
+		return Vector<Value>();
+	return FetchRow(row_index);
+}
+
+Vector<Value> DbfStream::FetchRow(int row)
+{
+	LTIMING("DbfStream::FetchRow");
+	Vector<Value> values;
+	if(!Fetch(row))
+		return values;
+	values.SetCount(fields.GetCount());
+	for(int i = 0; i < fields.GetCount(); i++)
+		values[i] = (this ->* (field_read[i].proc))(i);
+	return values;
+}
+
+void DbfStream::WriteRow(int row, const Vector<Value>& values)
+{
+	RTIMING("DbfStream::WriteRow");
+	ASSERT(row >= 0);
+	FlushRow();
+	if(values.GetCount() < fields.GetCount())
+		Fetch(row);
+	else {
+		row_index = row;
+		next_row_index = row_index + 1;
+	}
+	for(int i = 0, n = min(values.GetCount(), fields.GetCount()); i < n; i++)
+		PutItem(i, values[i]);
+}
+
+void DbfStream::WriteRow(const Vector<Value>& values)
+{
+	WriteRow(next_row_index, values);
+	Seek(row_index + 1);
+}
+
+String DbfStream::ToString() const
+{
+	String result;
+	result
+		<< fields.GetCount() << " columns\n"
+		<< rows << " rows\n\nColumns:\n";
+
+	for(int i = 0; i < GetFieldCount(); i++) {
+		const Field& field = GetField(i);
+		result = Format("%2i: %-12s '%c' %d", i, ~field.name, field.type, field.width);
+		if(field.decimal)
+			result << '.' << field.decimal;
+		result << '\n';
+	}
+	return result << '\n';
+}
+
+void DbfStream::DumpData(Stream& stream)
+{
+	stream << *this; // dump layout
+
+	// dump column headers
+	stream << "ROWID ";
+	int total = 6;
+	Vector<int> fw;
+
+	int i;
+	for(i = 0; i < fields.GetCount(); i++) {
+		const Field& field = GetField(i);
+		int width = max<int>(field.width, strlen(field.name));
+		switch(field.type) {
+		case 'D': width = max(width, 10); break;
+		}
+		++width;
+		stream << NFormat("%*<s", width, field.name);
+		fw.Add() = width;
+		total += width;
+	}
+	stream << "\n-";
+	stream.Put('-', total - 2);
+	stream << '\n';
+
+	for(i = 0; i < rows; i++) {
+		stream << NFormat("%5d ", i);
+ 		if(Fetch(i)) { // display individual columns
+			for(int j = 0; j < fields.GetCount(); j++)
+				stream << NFormat("%*<vt", fw[j], GetItem(j));
+		}
+		stream << '\n';
+	}
+	stream << "\n\n";
+}
+
+Value DbfStream::GetItemDouble8(int i) const
+{
+	const byte *p = record.Begin() + fields[i].offset;
+#ifdef CPU_BE
+	union {
+		char temp[8];
+		double dbl;
+	};
+	temp[0] = p[7];
+	temp[1] = p[6];
+	temp[2] = p[5];
+	temp[3] = p[4];
+	temp[4] = p[3];
+	temp[5] = p[2];
+	temp[6] = p[1];
+	temp[7] = p[0];
+	return dbl;
+#else
+	return *(const double *)p;
+#endif
+}
+
+Value DbfStream::GetItemInt4(int i) const
+{
+	const byte *p = record.Begin() + fields[i].offset;
+	int v = Peek32le(p);
+	v ^= 0x80000000;
+	return v;
+}
+
+Value DbfStream::GetItemDateTime8(int i) const
+{
+	const byte *p = record.Begin() + fields[i].offset;
+	int dt = Peek32le(p + 0);
+	int tm = Peek32le(p + 4);
+	Date d = Date(-4713, 1, 1) + dt;
+	Time t = ToTime(d);
+	tm /= 1000;
+	t.second = tm % 60;
+	tm /= 60;
+	t.minute = tm % 60;
+	tm /= 60;
+	t.hour = tm;
+	return t;
+}
+
+Value DbfStream::GetItemInt(int i) const
+{
+	const byte *p = record.Begin() + fields[i].offset, *e = p + fields[i].width;
+	while(p < e && *p == ' ')
+		p++;
+	return scan_int((const char *)p, (const char *)e);
+}
+
+Value DbfStream::GetItemDouble(int i) const
+{
+	const byte *p = record.Begin() + fields[i].offset, *e = p + fields[i].width;
+	while(p < e && *p == ' ')
+		p++;
+	return scan_dbl((const char *)p, (const char *)e);
+}
+
+Value DbfStream::GetItemString(int i) const
+{
+	const byte *p = record.Begin() + fields[i].offset, *e = p + fields[i].width;
+	while(p < e && *p == ' ')
+		p++;
+	while(e > p && e[-1] == ' ')
+		e--;
+	String s(p, e - p);
+	if(charset == GetDefaultCharset())
+		return s;
+	return ToUnicode(s, charset);
+}
+
+Value DbfStream::GetItemDateShort(int i) const
+{
+	const byte *p = record.Begin() + fields[i].offset;
+	Date date;
+	if(IsDigit(*p))
+		if(p[2] == '.') {
+			date.day = 10 * p[0] + p[1] - 11 * '0';
+			date.month = 10 * p[3] + p[4] - 11 * '0';
+			date.year = 10 * p[6] + p[7] + 1900 - 11 * '0';
+		}
+		else {
+			date.year = 1000 * p[0] + 100 * p[1] + 10 * p[2] + p[3] - 1111 * '0';
+			date.month = 10 * p[4] + p[5] - 11 * '0';
+			date.day = 10 * p[6] + p[7] - 11 * '0';
+		}
+	return date;
+}
+
+Value DbfStream::GetItemDateLong(int i) const
+{
+	const byte *p = record.Begin() + fields[i].offset;
+	if(IsDigit(*p) && !IsDigit(p[2])) {
+		Date date;
+		date.day = 10 * p[0] + p[1] - 11 * '0';
+		date.month = 10 * p[3] + p[4] - 11 * '0';
+		date.year = 1000 * p[6] + 100 * p[7] + 10 * p[8] + p[9] - 1111 * '0';
+		return date;
+	}
+	else
+		return GetItemDateShort(i);
+}
+
+Value DbfStream::GetItemLogical(int i) const
+{
+	return StrBool(record[fields[i].offset]);
+}
+
+Value DbfStream::GetItemMemoString(int i) const
+{
+	return GetItemMemo(i, false);
+}
+
+Value DbfStream::GetItemMemoBinary(int i) const
+{
+	return GetItemMemo(i, true);
+}
+
+Value DbfStream::GetItemMemo(int i, bool binary) const
+{
+	if(!has_memo)
+		return false;
+	const byte *p = record.Begin() + fields[i].offset, *e = p + fields[i].width;
+	while(p < e && *p == ' ')
+		p++;
+	int block = scan_int((const char *)p, (const char *)e);
+	if(dbt.IsOpen() && !IsNull(block) && block > 0) {
+		unsigned pos = block * dbt_block_size;
+		if(pos >= dbt.GetSize())
+			return Value();
+		dbt.Seek(pos);
+		String out;
+		if(dbt.GetIL() == 0x8FFFF) { // dBASE IV memo with explicit length
+			unsigned len = dbt.GetIL();
+			if(len <= 0 || len > dbt.GetLeft())
+				return Value();
+			Buffer<byte> buffer(len);
+			if(!dbt.GetAll(buffer, len))
+				return Value();
+			if(!binary) {
+				byte *p;
+				if(p = (byte *)memchr(buffer, '\0', len)) len = p - buffer;
+				if(p = (byte *)memchr(buffer, '\x1A', len)) len = p - buffer;
+			}
+			out = String(buffer, len);
+		}
+		else { // dBASE III memo with 1A1A separator
+			Buffer<byte> buffer(dbt_block_size + 1);
+			bool eof = false;
+			for(int b; !eof && (b = dbt.Get(buffer, dbt_block_size + 1)) > 0;) {
+				byte *p = buffer, *e = p + b;
+				while((p = (byte *)memchr(p, '\x1A', e - p)) != 0)
+					if(++p < e && *p++ == '\x1A') { // double EOF found
+						e = p - 2;
+						eof = true;
+						break;
+					}
+				int l = e - buffer;
+				if(!eof && l > dbt_block_size) {
+					dbt.SeekCur(dbt_block_size - l);
+					e = buffer + l;
+				}
+				if(l > 0)
+					out.Cat(buffer, l);
+			}
+		}
+		if(binary || charset == GetDefaultCharset())
+			return out;
+		return ToUnicode(out, charset);
+	}
+	return Value();
+}
+
+Value DbfStream::GetItemEmpty(int i) const
+{
+	return Value();
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/plugin/dbf/dbf.h b/uppsrc/plugin/dbf/dbf.h
new file mode 100644
index 000000000..5428d8b78
--- /dev/null
+++ b/uppsrc/plugin/dbf/dbf.h
@@ -0,0 +1,148 @@
+#ifndef __dbf_dbf__
+#define __dbf_dbf__
+
+#include <Core/Core.h>
+
+NAMESPACE_UPP
+
+#define DBFCOL(x) (#x, x)
+
+int StrBool(const char* s);
+
+class DbfStream
+{
+public:
+	class Field : Moveable<Field>
+	{
+	public:
+		Field(const char *name = 0, char type = 0, byte width = 0, byte decimal = 0);
+
+		String       Format(Value value, byte charset) const;
+
+		static Field Text(const char *name, int width);
+		static Field Number(const char *name, int width = 19, int decimals = 10);
+		static Field Integer(const char *name, int width = 10) { return Number(name, width, 0); }
+		static Field Date(const char *name);
+		static Field Logical(const char *name);
+
+		int          GetType() const;
+		void         Serialize(Stream& stream);
+
+		int          offset;
+		String       name;
+		char         type;
+		byte         width;
+		byte         decimal;
+	};
+
+	DbfStream();
+	DbfStream(const char* filename, bool write = false, byte charset = CHARSET_CP852, bool delete_share = false);
+	~DbfStream() { Close(); }
+
+	bool            Open(const char *filename, bool write = false, byte charset = CHARSET_CP852, bool delete_share = false);
+	bool            Create(const char *filename, const Array<Field>& fields, byte charset = CHARSET_CP852, bool delete_share = false);
+	bool            Close();
+
+	static bool     Check(const char *filename, bool write = false);
+
+	bool            IsOpen() const                           { return dbf.IsOpen(); }
+	Stream&         GetDBF()                                 { return dbf; }
+	Stream&         GetDBT()                                 { return dbt; }
+	bool            IsReadOnly() const                       { return !(dbf.GetStyle() & STRM_WRITE); }
+	bool            IsError() const                          { return dbf.IsError(); }
+	Time            GetFileTime() const                      { return dbf.GetTime(); }
+	int64           GetFileSize() const                      { return dbf.GetSize(); }
+
+	int             GetFieldCount() const                    { return fields.GetCount(); }
+	const Field&    GetField(int index) const                { return fields[index]; }
+	int             GetFieldIndex(String field) const        { return fields.Find(field); }
+
+	const ArrayMap<String, Field>& GetFields() const         { return fields; }
+
+	void            SetRowCount(int rows);
+	int             GetRowCount() const                      { return rows; }
+
+	byte            GetCharset() const                       { return charset; }
+
+	void            Seek(int row);
+	int             GetPos() const                           { return row_index; }
+	int             GetNextPos() const                       { return next_row_index; }
+
+	bool            Fetch(int row); // true = valid, false = deleted
+	bool            Fetch();        // true = end of file
+	bool            IsValid() const                          { return record[0] == ' '; }
+	bool            IsDeleted() const                        { return !IsValid(); }
+
+	void            Flush();        // flush current record and record count
+
+	Value           GetItem(int i) const;
+	Value           GetItem(String column) const;
+
+	void            PutItem(int i, Value value);
+	void            PutItem(String column, Value value);
+
+	Vector<Value>   FetchRow(int row);
+	Vector<Value>   FetchRow();
+	void            WriteRow(int row, const Vector<Value>& values);
+	void            WriteRow(const Vector<Value>& values);
+
+	Value           operator [] (int i) const                { return GetItem(i); }
+	Value           operator [] (String column) const        { return GetItem(column); }
+
+	String          ToString() const;
+	void            DumpData(Stream& stream);
+
+protected:
+	Value           GetItemInt(int i) const;
+	Value           GetItemDouble(int i) const;
+	Value           GetItemString(int i) const;
+	Value           GetItemDateShort(int i) const;
+	Value           GetItemDateLong(int i) const;
+	Value           GetItemLogical(int i) const;
+	Value           GetItemMemoString(int i) const;
+	Value           GetItemMemoBinary(int i) const;
+	Value           GetItemMemo(int i, bool binary) const;
+	Value           GetItemEmpty(int i) const;
+	Value           GetItemDouble8(int i) const;
+	Value           GetItemInt4(int i) const;
+	Value           GetItemDateTime8(int i) const;
+
+	void            SetCharset(byte charset);
+	void            FlushRecord();
+	bool            DoOpen(byte charset);
+	bool            DoCreate(const Array<Field>& _fields, byte charset);
+	bool            StreamHeader(bool full);
+	void            FlushRow();
+	void            FlushHeader();
+	void            DoFields();
+
+	FileStream      dbf;
+	mutable FileStream dbt;
+	ArrayMap<String, Field> fields;
+	struct FieldProc : Moveable<FieldProc>
+	{
+		FieldProc(Value (DbfStream::*proc)(int) const = NULL) : proc(proc) {}
+		Value (DbfStream::*proc)(int) const;
+	};
+
+	Vector<FieldProc> field_read;
+	Vector<byte>    record; // current record
+
+	int             rows;
+	int             data_offset;
+	int             row_index; // current row
+	int             next_row_index; // row to fetch next
+	int             dbt_block_size; // memo block size
+	byte            charset;
+//	word            codepage_uni[256];
+//	char            codepage_map[256];
+//	char            codepage_rev[256];
+//	bool            codepage_cv;
+	bool            dirty;
+	bool            dirty_header;
+	bool            has_memo;
+};
+
+END_UPP_NAMESPACE
+
+#endif
diff --git a/uppsrc/plugin/dbf/dbf.upp b/uppsrc/plugin/dbf/dbf.upp
new file mode 100644
index 000000000..6955d3e1c
--- /dev/null
+++ b/uppsrc/plugin/dbf/dbf.upp
@@ -0,0 +1,6 @@
+uses
+	Core;
+
+file
+	dbf.h,
+	dbf.cpp;
diff --git a/uppsrc/plugin/ftp/ftp.cpp b/uppsrc/plugin/ftp/ftp.cpp
new file mode 100644
index 000000000..d120e41b4
--- /dev/null
+++ b/uppsrc/plugin/ftp/ftp.cpp
@@ -0,0 +1,311 @@
+#include "ftp.h"
+#include "lib/ftplib.h"
+
+NAMESPACE_UPP
+
+#define LLOGBLOCK(x)  // LOGBLOCK(x)
+#define LLOG(x)       // LOG(x)
+
+static bool ftpinit = false;
+
+FtpClient::FtpClient()
+{
+	ftpconn = NULL;
+	if(!ftpinit) {
+		INTERLOCKED {
+			if(!ftpinit) {
+				FtpInit();
+				ftpinit = true;
+			}
+		}
+	}
+}
+
+FtpClient::~FtpClient()
+{
+	Close();
+}
+
+bool FtpClient::IsOpen() const
+{
+	return ftpconn;
+}
+
+bool FtpClient::Connect(const char *host, const char *user, const char *password, bool pasv, int idletimeout_secs)
+{
+	LOGBLOCK("FtpClient::Connect");
+	Close();
+	char perror[512];
+	LLOG("FtpConnect(" << host << ")");
+	if(WhenProgress()) {
+		error = "connect aborted";
+		return false;
+	}
+	if(!FtpConnect(host, &ftpconn, perror, &FtpClient::Callback, this, 200, idletimeout_secs)) {
+		error = perror;
+		return false;
+	}
+	LLOG("FtpLogin(" << user << ", " << password << ")");
+	if(!FtpLogin(user, password, ftpconn)) {
+		error = FtpError(ftpconn);
+		Close();
+		return false;
+	}
+	LLOG("FtpOptions(pasv = " << pasv << ")");
+	if(!FtpOptions(FTPLIB_CONNMODE, pasv ? FTPLIB_PASSIVE : FTPLIB_PORT, ftpconn)) {
+		error = FtpError(ftpconn);
+		Close();
+		return false;
+	}
+	return true;
+}
+
+int FtpClient::Callback(netbuf *nControl, int xfered, void *arg)
+{
+	return !((FtpClient *)arg)->WhenProgress();
+}
+
+void FtpClient::Close()
+{
+	if(ftpconn) {
+		FtpQuit(ftpconn);
+		ftpconn = NULL;
+	}
+}
+
+bool FtpClient::CheckOpen()
+{
+	if(!IsOpen()) {
+		error = t_("not connected");
+		return false;
+	}
+	return true;
+}
+
+String FtpClient::Load(const char *path)
+{
+	LLOGBLOCK("FtpClient::Load");
+	if(!CheckOpen())
+		return String::GetVoid();
+	netbuf *ftpdata;
+	LLOG("FtpAccess(" << path << ")");
+	if(WhenProgress()) {
+		error = t_("aborted");
+		return String::GetVoid();
+	}
+	if(!FtpAccess(path, FTPLIB_FILE_READ, FTPLIB_IMAGE, ftpconn, &ftpdata)) {
+		error = FtpError(ftpconn);
+		return String::GetVoid();
+	}
+	load_data = Null;
+	int p = 0;
+	while(!WhenProgress()) {
+		byte buffer[1024];
+		int ndata = FtpRead(buffer, sizeof(buffer), ftpdata);
+		LLOG("FtpRead -> " << ndata);
+		if(ndata < 0) {
+			error = FtpError(ftpdata);
+			FtpClose(ftpdata);
+			return String::GetVoid();
+		}
+		if(ndata == 0) {
+			load_data.Shrink();
+			error = FtpError(ftpdata);
+			break;
+		}
+		load_data.Cat(buffer, ndata);
+#ifdef SLOWTRANSFER
+		int end = GetTickCount() + SLOWTRANSFER;
+		for(int d; (d = end - GetTickCount()) > 0; Sleep(d))
+			;
+#endif
+	}
+	FtpClose(ftpdata);
+	return load_data;
+}
+
+bool FtpClient::Save(const char *path, String data)
+{
+	return SaveCount(path, data) == data.GetLength();
+}
+
+int FtpClient::SaveCount(const char *path, String data)
+{
+	LLOGBLOCK("FtpClient::Save");
+	netbuf *ftpdata;
+	save_pos = 0;
+	save_total = data.GetLength();
+	if(!CheckOpen())
+		return 0;
+	LLOG("FtpAccess(" << path << ")");
+	if(WhenProgress())
+		return 0;
+	if(!FtpAccess(path, FTPLIB_FILE_WRITE, FTPLIB_IMAGE, ftpconn, &ftpdata)) {
+		error = FtpError(ftpconn);
+		return 0;
+	}
+	while(save_pos < data.GetLength()) {
+		if(WhenProgress()) {
+			error = NFormat(t_("write aborted after %d bytes(s)"), save_pos);
+			FtpClose(ftpdata);
+			return save_pos;
+		}
+		int chunk = min(data.GetLength() - save_pos, 1024);
+		int ndata = FtpWrite((void *)data.GetIter(save_pos), chunk, ftpdata);
+		LLOG("FtpWrite(" << chunk << ") -> " << ndata);
+		if(ndata <= 0 || ndata > chunk) {
+			error = FtpError(ftpdata);
+			FtpClose(ftpdata);
+			return save_pos;
+		}
+		save_pos += ndata;
+#ifdef SLOWTRANSFER
+		int end = GetTickCount() + SLOWTRANSFER;
+		for(int d; (d = end - GetTickCount()) > 0; Sleep(d))
+			;
+#endif
+	}
+	WhenProgress();
+	LLOG("FtpClose");
+	FtpClose(ftpdata);
+	return save_pos;
+}
+
+bool  FtpClient::Exists(const char *path) {
+	LLOGBLOCK("FtpClient::Exists");
+	if(!CheckOpen())
+		return false;
+	netbuf *data;
+	LLOG("FtpAccess(" << path << ")");
+	if(!FtpAccess(path, FTPLIB_FILE_READ, FTPLIB_IMAGE, ftpconn, &data)) {
+		error = FtpError(ftpconn);
+		return false;
+	}
+	FtpClose(data);
+	return true;
+}
+
+bool FtpClient::Rename(const char *oldpath, const char *newpath) {
+	LLOGBLOCK("FtpClient::Rename");
+	LLOG("FtpRename(oldname = " << oldpath << ", newname = " << newpath << ")");
+	return CheckOpen() && !!FtpRename(oldpath, newpath, ftpconn);
+}
+
+bool FtpClient::Cd(const char *path) {
+	LLOGBLOCK("FtpClient::Cd");
+	LLOG("FtpChdir(" << path << ")");
+	return CheckOpen() && !!FtpChdir(path, ftpconn);
+}
+
+bool FtpClient::MkDir(const char *path) {
+	LLOGBLOCK("FtpClient::MkDir");
+	LLOG("FtpMkdir(" << path << ")");
+	return CheckOpen() && !!FtpMkdir(path, ftpconn);
+}
+
+bool FtpClient::RmDir(const char *path) {
+	LLOGBLOCK("FtpClient::RmDir");
+	LLOG("FtpRmdir(" << path << ")");
+	return CheckOpen() && !!FtpRmdir(path, ftpconn);
+}
+
+bool FtpClient::Delete(const char *path) {
+	LLOGBLOCK("FtpClient::Delete");
+	LLOG("FtpDelete(" << path << ")");
+	return CheckOpen() && !!FtpDelete(path, ftpconn);
+}
+
+String FtpClient::List(const char *path)
+{
+	LLOGBLOCK("FtpClient::List");
+	load_data = Null;
+	if(!CheckOpen())
+		return String::GetVoid();
+	netbuf *ftpdata;
+	LLOG("FtpAccess(" << path << ")");
+	if(WhenProgress()) {
+		error = t_("aborted");
+		return String::GetVoid();
+	}
+	if(!FtpAccess(path, FTPLIB_DIR, FTPLIB_ASCII, ftpconn, &ftpdata)) {
+		error = FtpError(ftpconn);
+		return String::GetVoid();
+	}
+	int p = 0;
+	while(!WhenProgress()) {
+		byte buffer[1024];
+		int ndata = FtpRead(buffer, sizeof(buffer), ftpdata);
+		LLOG("FtpRead -> " << ndata);
+		if(ndata < 0) {
+			error = FtpError(ftpdata);
+			FtpClose(ftpdata);
+			return String::GetVoid();
+		}
+		if(ndata == 0) {
+			load_data.Shrink();
+			break;
+		}
+		load_data.Cat(buffer, ndata);
+	#ifdef SLOWTRANSFER
+		int end = GetTickCount() + SLOWTRANSFER;
+		for(int d; (d = end - GetTickCount()) > 0; Sleep(d))
+			;
+	#endif
+	}
+	FtpClose(ftpdata);
+	return load_data;
+}
+
+void FtpClient::RealizePath(const char *path)
+{
+	LLOGBLOCK("FtpClient::RealizePath");
+	const char *s = path;
+	if(*s == '\0') return;
+	for(;;) {
+		s = strchr(s + 1, '/');
+		if(!s) break;
+		MkDir(String(path, s));
+	}
+}
+
+String FtpClientGet(String url, String *error)
+{
+	const char *u = url, *t = u;
+	while(*t && *t != '?')
+		if(*t++ == '/') {
+			if(*t == '/')
+				u = ++t;
+			break;
+		}
+	t = u;
+	while(*u && *u != '@' && *u != '/')
+		u++;
+	String host = String(t, u);
+	String user, pwd;
+	if(*u == '@') {
+		t = ++u;
+		while(*u && *u != '/' && *u != ':')
+			u++;
+		user = String(t, u);
+		if(*u == ':') {
+			t = ++u;
+			while(*u && *u != '/')
+				u++;
+			pwd = String(t, u);
+		}
+	}
+	FtpClient ftp;
+	if(!ftp.Connect(host, user, pwd)) {
+		if(error)
+			*error = ftp.GetError();
+		return String::GetVoid();
+	}
+	String data = ftp.Load(u);
+	if(data.IsVoid()) {
+		if(error)
+			*error = ftp.GetError();
+	}
+	return data;
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/plugin/ftp/ftp.h b/uppsrc/plugin/ftp/ftp.h
new file mode 100644
index 000000000..711735c31
--- /dev/null
+++ b/uppsrc/plugin/ftp/ftp.h
@@ -0,0 +1,61 @@
+#ifndef _plugin_ftp_ftp_h_
+#define _plugin_ftp_ftp_h_
+
+#include <Core/Core.h>
+
+typedef struct NetBuf netbuf;
+
+NAMESPACE_UPP
+
+class FtpClient {
+public:
+	FtpClient();
+	~FtpClient();
+
+	bool    Connect(const char *host, const char *user = NULL, const char *password = NULL,
+		bool pasv = true, int idletimeout_secs = 30);
+	void    Close();
+	bool    IsOpen() const;
+
+	bool    Save(const char *path, String data);
+	int     SaveCount(const char *path, String data);
+	String  Load(const char *path);
+	String  List(const char *path);
+
+	String  GetLoadedPart() const { return load_data; }
+	int     GetSavePos() const    { return save_pos; }
+	int     GetSaveTotal() const  { return save_total; }
+
+	bool    Rename(const char *oldpath, const char *newpath);
+	bool    Cd(const char *path);
+	bool    MkDir(const char *path);
+	bool    RmDir(const char *path);
+	bool    Delete(const char *path);
+	bool    Exists(const char *path);
+	void    RealizePath(const char *path);
+
+	void    SetError(String s) { error = s; }
+	String  GetError() const   { return error; }
+	void    ClearError()       { error.Clear(); }
+
+	bool    CheckOpen();
+
+public:
+	Gate    WhenProgress;
+
+private:
+	static int Callback(netbuf *nControl, int xfered, void *arg);
+
+private:
+	netbuf *ftpconn;
+	String  error;
+	String  load_data;
+	int     save_pos;
+	int     save_total;
+};
+
+String FtpClientGet(String url, String *error = NULL);
+
+END_UPP_NAMESPACE
+
+#endif
diff --git a/uppsrc/plugin/ftp/ftp.upp b/uppsrc/plugin/ftp/ftp.upp
new file mode 100644
index 000000000..036c1cadb
--- /dev/null
+++ b/uppsrc/plugin/ftp/ftp.upp
@@ -0,0 +1,15 @@
+description "FTP client";
+
+uses
+	Core;
+
+library(WIN32) ws2_32;
+
+file
+	ftp.h,
+	ftp.cpp,
+	lib readonly separator,
+	lib\README.ftplib,
+	lib\ftplib.h,
+	lib\ftplib.cpp tabsize 4;
+
diff --git a/uppsrc/plugin/ftp/lib/README.ftplib b/uppsrc/plugin/ftp/lib/README.ftplib
new file mode 100644
index 000000000..b3abc1dce
--- /dev/null
+++ b/uppsrc/plugin/ftp/lib/README.ftplib
@@ -0,0 +1,139 @@
+FTP Library Routines Release 3
+Thomas Pfau (pfau@cnj.digex.net)
+December 2, 1997
+
+This package implements a callable interface to FTP.  The FTP protocol is
+specified in RFC 959.  The library has been tested on linux, OpenVMS and
+Windows NT.  It should also work without major modification on other
+POSIX systems.
+
+All programs using the library should include ftplib.h.
+
+The routines look at the global variable ftplib_debug to determine how
+much information they should display.  Level 1 has been left for user
+programs.  Level 2 displays all responses received from the server.
+Level 3 displays all commands sent to the server.
+
+Along with some bug fixes, version 3 also includes support for user
+access to data connections.  FtpAccess() allows a user program to open a
+remote file or directory.  FtpRead() and FtpWrite() can then be used to
+transfer data.  These functions perform the necessary conversions for
+ascii mode transfers if necessary.  FtpClose() is used to close this
+connection.
+
+---
+
+The following routines are implemented:
+
+void FtpInit(void);
+
+This routine should be called prior to any other routines.  On most
+operating systems, it is a no-op but some others don't implement TCP/IP
+as seamlessly as others (Windows NT).
+
+int FtpConnect(const char *host, netbuf **nControl);
+
+Establishes a connection to the named host.  The host name should be
+specified as <host> or <host>:<port> where <host> is a host name or ip
+address and <port> is a service name or port number.  The handle for the
+control connection is returned to 'nControl'.  This handle can then be
+passed to other routines to control the connection and exchange data.
+Returns success/fail.
+
+int FtpLogin(const char *user, const char *pass, netbuf *nControl);
+
+Logs in using the specified username and password.  Returns success/fail.
+
+int FtpSite(const char *cmd, netbuf *nControl);
+
+Issues the specified SITE command.  See RFC 959 for more information.
+
+int FtpMkdir(const char *path, netbuf *nControl);
+
+Sends a create directory request to the server using the specified path.
+Returns success/fail.
+
+int FtpChdir(const char *path, netbuf *nControl);
+
+Sends a change working directory request to the server using the
+specified path.  Returns success/fail.
+
+int FtpRmdir(const char *path, netbuf *nControl);
+
+Sends a remove directory request to the server using the specified path.
+Returns success/fail.
+
+int FtpNlst(const char *outputfile, const char *path, netbuf *nControl);
+
+Sends an NLST command to the server with the specified path.  The
+response to this is a list of file names which will be written to the
+file named in outputfile.  If outputfile is specified as NULL, the list
+will be written to stdout.
+
+int FtpDir(const char *outputfile, const char *path, netbuf *nControl);
+
+Sends a LIST command to the server with the specified path.  The response
+to this is usually a long format directory listing which will be written
+to the file named in outputfile.  If outputfile is specified as NULL, the
+list will be written to stdout.
+
+int FtpGet(const char *outputfile, const char *path, char mode,
+	netbuf *nControl);
+
+Retreives the file specified by path and writes it to the file specified
+in outputfile.  Image or ASCII transfer mode can be specified by setting
+mode to FTPLIB_IMAGE or FTPLIB_ASCII, respectively.
+
+int FtpPut(const char *inputfile, const char *path, char mode,
+	netbuf *nControl);
+
+Sends the file specified by inputfile to the server with the name
+specified in path.  Image or ASCII transfer mode can be specified by
+setting mode to FTPLIB_IMAGE or FTPLIB_ASCII, respectively.
+
+int FtpRename(const char *src, const char *dst, netbuf *nControl);
+
+Renames the remote file specified by src to the name specified in dst.
+
+int FtpDelete(const char *fnm, netbuf *nControl);
+
+Removes the specified file from the server.
+
+void FtpQuit(void, netbuf *nControl);
+
+Disconnects from the remote server.
+
+char *FtpLastResponse(netbuf *nControl);
+
+Returns a pointer to the buffer containing the last response received
+from the server.  Useful for displaying error messages.
+
+int FtpAccess(const char *path, int typ, int mode, netbuf *nControl,
+    netbuf **nHandle);
+
+Opens the file or directory specified by 'path' and returns a handle to
+'nHandle'.  This handle can then be passed to FtpRead() or FtpWrite() to
+exchange data.  To list a directory, set 'typ' to FTPLIB_DIR or
+FTPLIB_DIR_VERBOSE and 'mode' to FTPLIB_ASCII.  To transfer files, set
+'mode' to FTPLIB_ASCII for text files or FTPLIB_IMAGE for binary files and
+set 'typ' to FTPLIB_FILE_READ to retreive a file or FTPLIB_FILE_WRITE to
+send a file.
+
+int FtpRead(void *buf, int max, netbuf *nData);
+
+Reads up to 'max' bytes of data from the data connection specified by
+'nData' and stores it in 'buf'.  If the connection was opened in ascii
+mode, one line of is returned with the terminating new-line character.
+Otherwise, FtpRead() attempts to fill the buffer.
+
+int FtpWrite(void *buf, int len, netbuf *nData);
+
+Writes 'len' bytes of data from 'buf' to the data connection specified by
+'nData'.  If the connection was opened in ascii mode, FtpWrite() performs
+the necessary conversions.  Otherwise, FtpWrite() passes the data
+verbatim.
+
+int FtpClose(netbuf *nData);
+
+Closes the data connection specified by 'nData' and frees associated
+resources.
diff --git a/uppsrc/plugin/ftp/lib/README.ftplib_v3.1 b/uppsrc/plugin/ftp/lib/README.ftplib_v3.1
new file mode 100644
index 000000000..19154cd6e
--- /dev/null
+++ b/uppsrc/plugin/ftp/lib/README.ftplib_v3.1
@@ -0,0 +1,182 @@
+FTP Library Routines Release 3.1
+Thomas Pfau (pfau@cnj.digex.net)
+June 23, 1998
+
+This package implements a callable interface to FTP.  The FTP protocol is
+specified in RFC 959.  The library has been tested on linux, OpenVMS and
+Windows NT.  It should also work without major modification on other
+POSIX systems.
+
+All programs using the library should include ftplib.h.
+
+The routines look at the global variable ftplib_debug to determine how
+much information they should display.  Level 1 has been left for user
+programs.  Level 2 displays all responses received from the server.
+Level 3 displays all commands sent to the server.
+
+Along with some bug fixes, version 3 also includes support for user
+access to data connections.  FtpAccess() allows a user program to open a
+remote file or directory.  FtpRead() and FtpWrite() can then be used to
+transfer data.  These functions perform the necessary conversions for
+ascii mode transfers if necessary.  FtpClose() is used to close this
+connection.
+
+---
+
+The following routines are implemented:
+
+void FtpInit(void);
+
+This routine should be called prior to any other routines.  On most
+operating systems, it is a no-op but some others don't implement TCP/IP
+as seamlessly as others (Windows NT).
+
+int FtpConnect(const char *host, netbuf **nControl);
+
+Establishes a connection to the named host.  The host name should be
+specified as <host> or <host>:<port> where <host> is a host name or ip
+address and <port> is a service name or port number.  The handle for the
+control connection is returned to 'nControl'.  This handle can then be
+passed to other routines to control the connection and exchange data.
+Returns success/fail.
+
+int FtpOptions(int opt, long val, netbuf *nControl);
+
+Specifies options for the connection.  The available options are:
+	Option			Values
+	FTPLIB_CONNMODE		sets the command to use to establish
+				data connections.  FTPLIB_PASSIVE
+				requests use of PASV; FTPLIB_PORT
+				requests use of PORT.
+	FTPLIB_CALLBACK		address of a user callback routine
+	FTPLIB_IDLETIME		amount of time in milliseconds to wait
+				on a data socket before calling the
+				user's callback routine
+	FTPLIB_CALLBACKARG	argument to pass to user's callback
+				routine
+	FTPLIB_CALLBACKBYTES	number of bytes to transfer before
+				calling user's callback routine
+
+int FtpLogin(const char *user, const char *pass, netbuf *nControl);
+
+Logs in using the specified username and password.  Returns success/fail.
+
+int FtpSysType(char *buf, int max, netbuf *nControl);
+
+Attempts to parse the system type out of the response from a SYST message
+and return up to 'max' bytes of the result to 'buf'.  The entire response
+can be retrieved using FtpLastResponse().  Returns success/fail.
+
+int FtpSize(char *path, int *size, char mode, netbuf *nControl);
+
+Requests the size of the file specified by 'path' transferred in mode
+'mode' and stores it at 'size'.  Returns success/fail.
+
+int FtpModDate(char *path, char *buf, int max, netbuf *nControl);
+
+Requests the last modification date of the file specified by 'path' and
+returns up to 'max' bytes of the result to 'buf' in the format
+'YYYYMMDDHHMMSS'.  Returns success/fail.
+
+int FtpSite(const char *cmd, netbuf *nControl);
+
+Issues the specified SITE command.  See RFC 959 for more information.
+
+int FtpMkdir(const char *path, netbuf *nControl);
+
+Sends a create directory request to the server using the specified path.
+Returns success/fail.
+
+int FtpChdir(const char *path, netbuf *nControl);
+
+Sends a change working directory request to the server using the
+specified path.  Returns success/fail.
+
+int FtpCDUp(netbuf *nControl);
+
+Requests a change to the parent directory.  Returns sucess/fail.
+
+int FtpRmdir(const char *path, netbuf *nControl);
+
+Sends a remove directory request to the server using the specified path.
+Returns success/fail.
+
+int FtpPwd(char *path, int max, netbuf *nControl);
+
+Requests the current directory from the server and returns up to 'max'
+bytes of the result to 'path'.  Returns success/fail.
+
+int FtpNlst(const char *outputfile, const char *path, netbuf *nControl);
+
+Sends an NLST command to the server with the specified path.  The
+response to this is a list of file names which will be written to the
+file named in outputfile.  If outputfile is specified as NULL, the list
+will be written to stdout.
+
+int FtpDir(const char *outputfile, const char *path, netbuf *nControl);
+
+Sends a LIST command to the server with the specified path.  The response
+to this is usually a long format directory listing which will be written
+to the file named in outputfile.  If outputfile is specified as NULL, the
+list will be written to stdout.
+
+int FtpGet(const char *outputfile, const char *path, char mode,
+	netbuf *nControl);
+
+Retreives the file specified by path and writes it to the file specified
+in outputfile.  Image or ASCII transfer mode can be specified by setting
+mode to FTPLIB_IMAGE or FTPLIB_ASCII, respectively.
+
+int FtpPut(const char *inputfile, const char *path, char mode,
+	netbuf *nControl);
+
+Sends the file specified by inputfile to the server with the name
+specified in path.  Image or ASCII transfer mode can be specified by
+setting mode to FTPLIB_IMAGE or FTPLIB_ASCII, respectively.
+
+int FtpRename(const char *src, const char *dst, netbuf *nControl);
+
+Renames the remote file specified by src to the name specified in dst.
+
+int FtpDelete(const char *fnm, netbuf *nControl);
+
+Removes the specified file from the server.
+
+void FtpQuit(void, netbuf *nControl);
+
+Disconnects from the remote server.
+
+char *FtpLastResponse(netbuf *nControl);
+
+Returns a pointer to the buffer containing the last response received
+from the server.  Useful for displaying error messages.
+
+int FtpAccess(const char *path, int typ, int mode, netbuf *nControl,
+    netbuf **nHandle);
+
+Opens the file or directory specified by 'path' and returns a handle to
+'nHandle'.  This handle can then be passed to FtpRead() or FtpWrite() to
+exchange data.  To list a directory, set 'typ' to FTPLIB_DIR or
+FTPLIB_DIR_VERBOSE and 'mode' to FTPLIB_ASCII.  To transfer files, set
+'mode' to FTPLIB_ASCII for text files or FTPLIB_IMAGE for binary files and
+set 'typ' to FTPLIB_FILE_READ to retreive a file or FTPLIB_FILE_WRITE to
+send a file.
+
+int FtpRead(void *buf, int max, netbuf *nData);
+
+Reads up to 'max' bytes of data from the data connection specified by
+'nData' and stores it in 'buf'.  If the connection was opened in ascii
+mode, one line of is returned with the terminating new-line character.
+Otherwise, FtpRead() attempts to fill the buffer.
+
+int FtpWrite(void *buf, int len, netbuf *nData);
+
+Writes 'len' bytes of data from 'buf' to the data connection specified by
+'nData'.  If the connection was opened in ascii mode, FtpWrite() performs
+the necessary conversions.  Otherwise, FtpWrite() passes the data
+verbatim.
+
+int FtpClose(netbuf *nData);
+
+Closes the data connection specified by 'nData' and frees associated
+resources.
diff --git a/uppsrc/plugin/ftp/lib/ftplib.cpp b/uppsrc/plugin/ftp/lib/ftplib.cpp
new file mode 100644
index 000000000..76d480a5c
--- /dev/null
+++ b/uppsrc/plugin/ftp/lib/ftplib.cpp
@@ -0,0 +1,1427 @@
+/***************************************************************************/
+/*                                                                         */
+/* ftplib.c - callable ftp access routines                                 */
+/* Copyright (C) 1996-2001 Thomas Pfau, pfau@eclipse.net                   */
+/*      1407 Thomas Ave, North Brunswick, NJ, 08902                        */
+/*                                                                         */
+/* This library is free software; you can redistribute it and/or           */
+/* modify it under the terms of the GNU Library General Public             */
+/* License as published by the Free Software Foundation; either            */
+/* version 2 of the License, or (at your option) any later version.        */
+/*                                                                         */
+/* This library 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       */
+/* Library General Public License for more details.                        */
+/*                                                                         */
+/* You should have received a copy of the GNU Library General Public       */
+/* License along with this progam; if not, write to the                    */
+/* Free Software Foundation, Inc., 59 Temple Place - Suite 330,            */
+/* Boston, MA 02111-1307, USA.                                             */
+/*                                                                         */
+/***************************************************************************/
+
+#include <Core/Core.h>
+#if defined(_WIN32)
+	#include <winsock2.h>
+	#include <WS2tcpip.h>
+#else
+	#include <sys/time.h>
+	#include <sys/types.h>
+	#include <sys/socket.h>
+	#include <netdb.h>
+	#include <netinet/in.h>
+	#include <arpa/inet.h>
+#endif
+
+#define BUILDING_LIBRARY
+#include "ftplib.h"
+
+#define LLOG(x)      //RLOG(x)
+#define LLOGBLOCK(x) //RLOGBLOCK(x)
+#define LDUMP(x)     //RDUMP(x)
+
+#if defined(_WIN32)
+#define SETSOCKOPT_OPTVAL_TYPE (const char *)
+#define ERRPENDING WSAEWOULDBLOCK
+#else
+#define SETSOCKOPT_OPTVAL_TYPE (void *)
+#define ERRPENDING EINPROGRESS
+#endif
+
+#define FTPLIB_BUFSIZ 8192
+#define ACCEPT_TIMEOUT 30
+
+#define FTPLIB_CONTROL 0
+#define FTPLIB_READ 1
+#define FTPLIB_WRITE 2
+
+#if !defined FTPLIB_DEFMODE
+#define FTPLIB_DEFMODE FTPLIB_PASSIVE
+#endif
+
+struct NetBuf {
+	char *cput,*cget;
+	int handle;
+	int cavail,cleft;
+	char *buf;
+	int dir;
+	netbuf *ctrl;
+	netbuf *data;
+	int cmode;
+	struct timeval idletime;
+	int idletimeout_secs;
+	FtpCallback idlecb;
+	void *idlearg;
+	int xfered;
+	int cbbytes;
+	int xfered1;
+	char response[256];
+	char perror[256];
+};
+
+static char *version =
+	"ftplib Release 3.1-1 9/16/00, copyright 1996-2000 Thomas Pfau";
+
+GLOBALDEF int ftplib_debug = 0;
+
+#if defined(__unix__) || defined(VMS)
+#define net_read read
+#define net_write write
+#define net_close close
+#elif defined(_WIN32)
+#define net_read(x,y,z) recv(x,y,z,0)
+#define net_write(x,y,z) send(x,y,z,0)
+#define net_close closesocket
+#endif
+
+#if defined(NEED_MEMCCPY)
+/*
+* VAX C does not supply a memccpy routine so I provide my own
+*/
+void *memccpy(void *dest, const void *src, int c, size_t n)
+{
+	int i=0;
+	const unsigned char *ip=src;
+	unsigned char *op=dest;
+
+	while (i < n)
+	{
+		if ((*op++ = *ip++) == c)
+			break;
+		i++;
+	}
+	if (i == n)
+		return NULL;
+	return op;
+}
+#endif
+
+/*
+* socket_wait - wait for socket to receive or flush data
+*
+* return 1 if no user callback, otherwise, return value returned by
+* user callback
+*/
+static int socket_wait(netbuf *ctl, int write)
+{
+	fd_set fd,*rfd = NULL,*wfd = NULL;
+	struct timeval tv;
+	int rv = 0;
+	if (ctl->idlecb == NULL)
+		return 1;
+	if (write)
+		wfd = &fd;
+	else
+		rfd = &fd;
+	FD_ZERO(&fd);
+	int idle_end = UPP::msecs() + 1000 * ctl->idletimeout_secs;
+	do
+	{
+		FD_SET(ctl->handle,&fd);
+		tv = ctl->idletime;
+		rv = select(ctl->handle+1, rfd, wfd, NULL, &tv);
+		if (rv == -1)
+		{
+			rv = 0;
+			strcpy(ctl->perror, strerror(errno));
+			break;
+		}
+		else if (rv > 0)
+		{
+			rv = 1;
+			break;
+		}
+		else if(UPP::msecs(idle_end) >= 0) {
+			rv = 0;
+			sprintf(ctl->perror, "idle timeout expired (%d secs)", ctl->idletimeout_secs);
+			break;
+		}
+	}
+	while ((rv = ctl->idlecb(ctl, ctl->xfered, ctl->idlearg)));
+	return rv;
+}
+
+/*
+* read a line of text
+*
+* return -1 on error or bytecount
+*/
+static int readline(char *buf,int max,netbuf *ctl)
+{
+	int x,retval = 0;
+	char *end,*bp=buf;
+	int eof = 0;
+
+	if ((ctl->dir != FTPLIB_CONTROL) && (ctl->dir != FTPLIB_READ))
+		return -1;
+	if (max == 0)
+		return 0;
+	do
+	{
+		if (ctl->cavail > 0)
+		{
+			x = (max >= ctl->cavail) ? ctl->cavail : max-1;
+			end = (char *)memccpy(bp,ctl->cget,'\n',x);
+			if (end != NULL)
+				x = end - bp;
+			retval += x;
+			bp += x;
+			*bp = '\0';
+			max -= x;
+			ctl->cget += x;
+			ctl->cavail -= x;
+			if (end != NULL)
+			{
+				bp -= 2;
+				if (strcmp(bp,"\r\n") == 0)
+				{
+					*bp++ = '\n';
+					*bp++ = '\0';
+					--retval;
+				}
+				break;
+			}
+		}
+		if (max == 1)
+		{
+			*buf = '\0';
+			break;
+		}
+		if (ctl->cput == ctl->cget)
+		{
+			ctl->cput = ctl->cget = ctl->buf;
+			ctl->cavail = 0;
+			ctl->cleft = FTPLIB_BUFSIZ;
+		}
+		if (eof)
+		{
+			if (retval == 0)
+				retval = -1;
+			break;
+		}
+		if (!socket_wait(ctl, 0))
+			return retval;
+		if ((x = net_read(ctl->handle,ctl->cput,ctl->cleft)) == -1)
+		{
+			strcpy(ctl->perror, "read");
+			retval = -1;
+			break;
+		}
+		if (x == 0)
+			eof = 1;
+		ctl->cleft -= x;
+		ctl->cavail += x;
+		ctl->cput += x;
+	}
+	while (1);
+	LLOG("readline(" << retval << ") -> " << buf);
+	return retval;
+}
+
+/*
+* write lines of text
+*
+* return -1 on error or bytecount
+*/
+static int writeline(char *buf, int len, netbuf *nData)
+{
+	int x, nb=0, w;
+	char *ubp = buf, *nbp;
+	char lc=0;
+
+	if (nData->dir != FTPLIB_WRITE)
+		return -1;
+	nbp = nData->buf;
+	for (x=0; x < len; x++)
+	{
+		if ((*ubp == '\n') && (lc != '\r'))
+		{
+			if (nb == FTPLIB_BUFSIZ)
+			{
+				if (!socket_wait(nData, 1))
+					return x;
+				w = net_write(nData->handle, nbp, FTPLIB_BUFSIZ);
+				if (w != FTPLIB_BUFSIZ)
+				{
+					printf("net_write(1) returned %d, errno = %d\n", w, errno);
+					return(-1);
+				}
+				nb = 0;
+			}
+			nbp[nb++] = '\r';
+		}
+		if (nb == FTPLIB_BUFSIZ)
+		{
+			if (!socket_wait(nData, 1))
+				return x;
+			w = net_write(nData->handle, nbp, FTPLIB_BUFSIZ);
+			if (w != FTPLIB_BUFSIZ)
+			{
+				printf("net_write(2) returned %d, errno = %d\n", w, errno);
+				return(-1);
+			}
+			nb = 0;
+		}
+		nbp[nb++] = lc = *ubp++;
+	}
+	if (nb)
+	{
+		if (!socket_wait(nData, 1))
+			return x;
+		w = net_write(nData->handle, nbp, nb);
+		if (w != nb)
+		{
+			printf("net_write(3) returned %d, errno = %d\n", w, errno);
+			return(-1);
+		}
+	}
+	return len;
+}
+
+/*
+* read a response from the server
+*
+* return 0 if first char doesn't match
+* return 1 if first char matches
+*/
+static int readresp(char c, netbuf *nControl)
+{
+	char match[5];
+	if (readline(nControl->response,256,nControl) == -1)
+	{
+		strcpy(nControl->perror, "Control socket read failed");
+		return 0;
+	}
+	if (ftplib_debug > 1)
+		fprintf(stderr,"%s",nControl->response);
+	if (nControl->response[3] == '-')
+	{
+		strncpy(match,nControl->response,3);
+		match[3] = ' ';
+		match[4] = '\0';
+		do
+		{
+			if (readline(nControl->response,256,nControl) == -1)
+			{
+				strcpy(nControl->perror, "Control socket read failed");
+				return 0;
+			}
+			if (ftplib_debug > 1)
+				fprintf(stderr,"%s",nControl->response);
+		}
+		while (strncmp(nControl->response,match,4));
+	}
+	if (nControl->response[0] == c)
+		return 1;
+	strcpy(nControl->perror, nControl->response);
+	return 0;
+}
+
+/*
+* FtpInit for stupid operating systems that require it (Windows NT)
+*/
+GLOBALDEF void FtpInit(void)
+{
+#if defined(_WIN32)
+	WORD wVersionRequested;
+	WSADATA wsadata;
+	int err;
+	wVersionRequested = MAKEWORD(1,1);
+	if ((err = WSAStartup(wVersionRequested,&wsadata)) != 0)
+		fprintf(stderr,"Network failed to start: %d\n",err);
+#endif
+}
+
+/*
+* FtpLastResponse - return a pointer to the last response received
+*/
+GLOBALDEF char *FtpLastResponse(netbuf *nControl)
+{
+	if ((nControl) && (nControl->dir == FTPLIB_CONTROL))
+		return nControl->response;
+	return NULL;
+}
+
+static int FtpLastError()
+{
+#ifdef flagWIN32
+	return WSAGetLastError();
+#define SOCKERR(x) WSA##x
+#else
+	return errno;
+#define SOCKERR(x) x
+#endif
+}
+
+static int FtpBlock(int sockno, int block, char perror[])
+{
+#ifdef flagWIN32
+	u_long arg = (block ? 0 : 1);
+	if(ioctlsocket(sockno, FIONBIO, &arg)) {
+		strcpy(perror, "ioctlsocket(FIONBIO)");
+		return 0;
+	}
+#else
+	if(fcntl(sockno, F_SETFL, (fcntl(sockno, F_GETFL, 0) & ~O_NONBLOCK) | (block ? 0 : O_NONBLOCK))) {
+		strcpy(perror, "fcntl(O_NONBLOCK)");
+		return 0;
+	}
+#endif
+	return 1;
+}
+
+static int FtpCheckRead(int sockno, struct timeval *tv)
+{
+	fd_set mask;
+	FD_ZERO(&mask);
+	FD_SET(sockno, &mask);
+	return select(sockno + 1, &mask, NULL, &mask, tv) > 0 ? 1 : 0;
+}
+
+static int FtpCheckWrite(int sockno, struct timeval *tv)
+{
+	fd_set mask;
+	FD_ZERO(&mask);
+	FD_SET(sockno, &mask);
+	return select(sockno + 1, NULL, &mask, &mask, tv) > 0 ? 1 : 0;
+}
+
+/*
+* FtpConnect - connect to remote server
+*
+* return 1 if connected, 0 if not
+*/
+GLOBALDEF int FtpConnect(const char *host, netbuf **nControl, char perror[],
+	FtpCallback idlecb, void *idledata, int idletime_msecs, int idletimeout_secs)
+{
+	int sControl;
+	struct sockaddr_in sin;
+	struct hostent *phe;
+	struct servent *pse;
+	int on=1;
+	netbuf *ctrl;
+	struct timeval tm;
+
+	tm.tv_sec = idletime_msecs / 1000;
+	tm.tv_usec = (idletime_msecs % 1000) * 1000;
+	memset(&sin,0,sizeof(sin));
+	sin.sin_family = AF_INET;
+	UPP::String lhost = host;
+	int pnum = lhost.Find(':');
+	if (pnum < 0)
+	{
+#if defined(VMS)
+		sin.sin_port = htons(21);
+#else
+		if(pse = getservbyname("ftp", "tcp"))
+			sin.sin_port = pse->s_port;
+		else
+			sin.sin_port = htons(21);
+#endif
+	}
+	else
+	{
+		UPP::String port = lhost.Mid(pnum + 1);
+		lhost.Trim(pnum);
+		if(UPP::IsDigit(*port))
+			sin.sin_port = htons((short)atoi(port));
+		else {
+			pse = getservbyname(port,"tcp");
+			sin.sin_port = pse->s_port;
+		}
+	}
+	if ((sin.sin_addr.s_addr = inet_addr(lhost)) == -1)
+	{
+		if ((phe = gethostbyname(lhost)) == NULL)
+		{
+			strcpy(perror, "gethostbyname");
+			return 0;
+		}
+		memcpy((char *)&sin.sin_addr, phe->h_addr, phe->h_length);
+	}
+	sControl = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP);
+	if (sControl == -1)
+	{
+		strcpy(perror, "socket");
+		return 0;
+	}
+	if (setsockopt(sControl,SOL_SOCKET,SO_REUSEADDR,
+				SETSOCKOPT_OPTVAL_TYPE &on, sizeof(on)) == -1)
+	{
+		strcpy(perror, "setsockopt");
+		net_close(sControl);
+		return 0;
+	}
+	if(idlecb && !FtpBlock(sControl, 0, perror)) {
+		net_close(sControl);
+		return 0;
+	}
+	LLOG("connect(" << FormatIntHex(sin.sin_addr.s_addr) << ", port " << FormatIntHex(sin.sin_port, 4) << ")");
+	if (connect(sControl, (struct sockaddr *)&sin, sizeof(sin)) == -1)
+	{
+		if(idlecb && FtpLastError() == ERRPENDING) {
+		#ifdef PLATFORM_POSIX
+			int idle_end = UPP::GetTickCount() + 1000 * idletimeout_secs;
+		#else
+			int idle_end = GetTickCount() + 1000 * idletimeout_secs;
+		#endif
+			while(!FtpCheckWrite(sControl, &tm)) {
+				if(!idlecb(NULL, -1, idledata)) {
+					strcpy(perror, "connect aborted");
+					net_close(sControl);
+					return 0;
+				}
+		#ifdef PLATFORM_POSIX
+				if((int)(UPP::GetTickCount() - idle_end) >= 0)
+		#else
+				if((int)(GetTickCount() - idle_end) >= 0)
+		#endif
+				{
+					sprintf(perror, "connect timed out (%d secs)", idletimeout_secs);
+					net_close(sControl);
+					return 0;
+				}
+			}
+		}
+		else {
+			strcpy(perror, "connect");
+			net_close(sControl);
+			return 0;
+		}
+	}
+	if(idlecb && !FtpBlock(sControl, 1, perror)) {
+		net_close(sControl);
+		return 0;
+	}
+	ctrl = new NetBuf;
+	UPP::Zero(*ctrl);
+	ctrl->buf = new char[FTPLIB_BUFSIZ];
+	ctrl->handle = sControl;
+	ctrl->dir = FTPLIB_CONTROL;
+	ctrl->ctrl = NULL;
+	ctrl->cmode = FTPLIB_DEFMODE;
+	ctrl->idlecb = idlecb;
+	ctrl->idletime = tm;
+	ctrl->idletimeout_secs = idletimeout_secs;
+	ctrl->idlearg = idledata;
+	ctrl->xfered = 0;
+	ctrl->xfered1 = 0;
+	ctrl->cbbytes = 1;
+	if (readresp('2', ctrl) == 0)
+	{
+		net_close(sControl);
+		if(ctrl->buf)
+			delete[] ctrl->buf;
+		delete ctrl;
+		return 0;
+	}
+	*nControl = ctrl;
+	return 1;
+}
+
+/*
+* FtpOptions - change connection options
+*
+* returns 1 if successful, 0 on error
+*/
+GLOBALDEF int FtpOptions(int opt, long val, netbuf *nControl)
+{
+	int v,rv=0;
+	switch (opt)
+	{
+	case FTPLIB_CONNMODE:
+		v = (int) val;
+		if ((v == FTPLIB_PASSIVE) || (v == FTPLIB_PORT))
+		{
+			nControl->cmode = v;
+			rv = 1;
+		}
+		break;
+	case FTPLIB_CALLBACK:
+		nControl->idlecb = (FtpCallback) val;
+		rv = 1;
+		break;
+	case FTPLIB_IDLETIME:
+		v = (int) val;
+		rv = 1;
+		nControl->idletime.tv_sec = v / 1000;
+		nControl->idletime.tv_usec = (v % 1000) * 1000;
+		break;
+	case FTPLIB_CALLBACKARG:
+		rv = 1;
+		nControl->idlearg = (void *) val;
+		break;
+	case FTPLIB_CALLBACKBYTES:
+		rv = 1;
+		nControl->cbbytes = (int) val;
+		break;
+	case FTPLIB_IDLETIMEOUT:
+		rv = 1;
+		nControl->idletimeout_secs = (int) val;
+		break;
+	}
+	return rv;
+}
+
+/*
+* FtpSendCmd - send a command and wait for expected response
+*
+* return 1 if proper response received, 0 otherwise
+*/
+static int FtpSendCmd(const char *cmd, char expresp, netbuf *nControl)
+{
+	LLOG("FtpSendCmd(" << cmd << ", expresp = " << expresp << ")");
+	char buf[256];
+	if (nControl->dir != FTPLIB_CONTROL) {
+		LLOG("-> dir != FTPLIB_CONTROL");
+		return 0;
+	}
+	if (ftplib_debug > 2)
+		fprintf(stderr,"%s\n",cmd);
+	if ((strlen(cmd) + 3) > sizeof(buf)) {
+		LLOG("-> buffer size exceeded");
+		return 0;
+	}
+	sprintf(buf,"%s\r\n",cmd);
+	if (!socket_wait(nControl, 1)) {
+		strcpy(nControl->perror, "write aborted");
+		LLOG("-> write aborted in socket_wait");
+		return 0;
+	}
+	if (net_write(nControl->handle,buf,strlen(buf)) <= 0)
+	{
+		strcpy(nControl->perror, "write");
+		LLOG("-> write error");
+		return 0;
+	}
+	return readresp(expresp, nControl);
+}
+
+/*
+* FtpLogin - log in to remote server
+*
+* return 1 if logged in, 0 otherwise
+*/
+GLOBALDEF int FtpLogin(const char *user, const char *pass, netbuf *nControl)
+{
+	char tempbuf[64];
+
+	if (((strlen(user) + 7) > sizeof(tempbuf)) ||
+		((strlen(pass) + 7) > sizeof(tempbuf)))
+		return 0;
+	sprintf(tempbuf,"USER %s",user);
+	if (!FtpSendCmd(tempbuf,'3',nControl))
+	{
+		if (nControl->response[0] == '2')
+			return 1;
+		return 0;
+	}
+	sprintf(tempbuf,"PASS %s",pass);
+	return FtpSendCmd(tempbuf,'2',nControl);
+}
+
+/*
+* FtpOpenPort - set up data connection
+*
+* return 1 if successful, 0 otherwise
+*/
+static int FtpOpenPort(netbuf *nControl, netbuf **nData, int mode, int dir)
+{
+	LLOGBLOCK("FtpOpenPort");
+
+	int sData;
+	union {
+		struct sockaddr sa;
+		struct sockaddr_in in;
+	} sin;
+	struct linger lng = { 0, 0 };
+	socklen_t l;
+	int on=1;
+	netbuf *ctrl;
+	char *cp;
+	unsigned int v[6];
+	char buf[256];
+
+	if (nControl->dir != FTPLIB_CONTROL)
+		return -1;
+	if ((dir != FTPLIB_READ) && (dir != FTPLIB_WRITE))
+	{
+		sprintf(nControl->response, "Invalid direction %d\n", dir);
+		return -1;
+	}
+	if ((mode != FTPLIB_ASCII) && (mode != FTPLIB_IMAGE))
+	{
+		sprintf(nControl->response, "Invalid mode %c\n", mode);
+		return -1;
+	}
+	l = sizeof(sin);
+	if (nControl->cmode == FTPLIB_PASSIVE)
+	{
+		memset(&sin, 0, l);
+		sin.in.sin_family = AF_INET;
+		if (!FtpSendCmd("PASV",'2',nControl))
+			return -1;
+		cp = strchr(nControl->response,'(');
+		if (cp == NULL)
+			return -1;
+		cp++;
+		sscanf(cp,"%u,%u,%u,%u,%u,%u",&v[2],&v[3],&v[4],&v[5],&v[0],&v[1]);
+		sin.sa.sa_data[2] = v[2];
+		sin.sa.sa_data[3] = v[3];
+		sin.sa.sa_data[4] = v[4];
+		sin.sa.sa_data[5] = v[5];
+		sin.sa.sa_data[0] = v[0];
+		sin.sa.sa_data[1] = v[1];
+	}
+	else
+	{
+		if (getsockname(nControl->handle, &sin.sa, &l) < 0)
+		{
+			strcpy(nControl->perror, "getsockname");
+			return 0;
+		}
+	}
+	sData = socket(PF_INET,SOCK_STREAM,IPPROTO_TCP);
+	if (sData == -1)
+	{
+		strcpy(nControl->perror, "socket");
+		return -1;
+	}
+	if (setsockopt(sData,SOL_SOCKET,SO_REUSEADDR,
+				SETSOCKOPT_OPTVAL_TYPE &on,sizeof(on)) == -1)
+	{
+		strcpy(nControl->perror, "setsockopt");
+		net_close(sData);
+		return -1;
+	}
+	if (setsockopt(sData,SOL_SOCKET,SO_LINGER,
+				SETSOCKOPT_OPTVAL_TYPE &lng,sizeof(lng)) == -1)
+	{
+		strcpy(nControl->perror, "setsockopt");
+		net_close(sData);
+		return -1;
+	}
+	if (nControl->cmode == FTPLIB_PASSIVE)
+	{
+		LLOGBLOCK("FTPLIB_PASSIVE data port connect");
+//*
+		if(nControl->idlecb && !FtpBlock(sData, 0, nControl->perror)) {
+			net_close(sData);
+			return -1;
+		}
+//*/
+
+/*
+		for(int retry = 0;; retry++) {
+			if(nControl->idlecb && !nControl->idlecb(nControl, -2, nControl->idlearg)) {
+				strcpy(nControl->perror, "data connect aborted");
+				net_close(sData);
+				return -1;
+			}
+			if(connect(sData, &sin.sa, sizeof(sin.sa)) == 0)
+				break;
+			int err = FtpLastError();
+			if(err != SOCKERR(ETIMEDOUT) || retry >= 10) {
+				sprintf(nControl->perror, "data connect error: %d", err);
+				net_close(sData);
+				return -1;
+			}
+		}
+//*/
+
+//*
+		if (connect(sData, &sin.sa, sizeof(sin.sa)) == -1) {
+			int t0 = UPP::msecs(), tlim = 0;
+			if(nControl->idlecb && FtpLastError() == ERRPENDING) {
+				while(!FtpCheckWrite(sData, &nControl->idletime)) {
+					if(!nControl->idlecb(nControl, -2, nControl->idlearg)) {
+						strcpy(nControl->perror, "data connect aborted");
+						net_close(sData);
+						return -1;
+					}
+				}
+			}
+			else {
+				strcpy(nControl->perror, "connect");
+				net_close(sData);
+				return -1;
+			}
+		}
+//*/
+//*
+		if(nControl->idlecb && !FtpBlock(sData, 1, nControl->perror)) {
+			net_close(sData);
+			return -1;
+		}
+//*/
+	}
+	else
+	{
+		sin.in.sin_port = 0;
+		if (bind(sData, &sin.sa, sizeof(sin)) == -1)
+		{
+			strcpy(nControl->perror, "bind");
+			net_close(sData);
+			return 0;
+		}
+		if (listen(sData, 1) < 0)
+		{
+			strcpy(nControl->perror, "listen");
+			net_close(sData);
+			return 0;
+		}
+		if (getsockname(sData, &sin.sa, &l) < 0)
+			return 0;
+		sprintf(buf, "PORT %d,%d,%d,%d,%d,%d",
+				(unsigned char) sin.sa.sa_data[2],
+				(unsigned char) sin.sa.sa_data[3],
+				(unsigned char) sin.sa.sa_data[4],
+				(unsigned char) sin.sa.sa_data[5],
+				(unsigned char) sin.sa.sa_data[0],
+				(unsigned char) sin.sa.sa_data[1]);
+		if (!FtpSendCmd(buf,'2',nControl))
+		{
+			net_close(sData);
+			return 0;
+		}
+	}
+	ctrl = new NetBuf;
+	UPP::Zero(*ctrl);
+	if (mode == 'A')
+		ctrl->buf = new char[FTPLIB_BUFSIZ];
+	ctrl->handle = sData;
+	ctrl->dir = dir;
+	ctrl->idletime = nControl->idletime;
+	ctrl->idlearg = nControl->idlearg;
+	ctrl->idletimeout_secs = nControl->idletimeout_secs;
+	ctrl->xfered = 0;
+	ctrl->xfered1 = 0;
+	ctrl->cbbytes = nControl->cbbytes;
+	if (ctrl->idletime.tv_sec || ctrl->idletime.tv_usec || ctrl->cbbytes)
+		ctrl->idlecb = nControl->idlecb;
+	else
+		ctrl->idlecb = NULL;
+	*nData = ctrl;
+	return 1;
+}
+
+/*
+* FtpAcceptConnection - accept connection from server
+*
+* return 1 if successful, 0 otherwise
+*/
+static int FtpAcceptConnection(netbuf *nData, netbuf *nControl)
+{
+	int sData;
+	struct sockaddr addr;
+	socklen_t l;
+	int i;
+	struct timeval tv;
+
+	if(nControl->idlecb)
+		tv = nControl->idletime;
+	else {
+		tv.tv_usec = 0;
+		tv.tv_sec = nData->idletimeout_secs;
+	}
+
+	int end_time = UPP::msecs() + 1000 * nData->idletimeout_secs;
+	for(;;) {
+		fd_set mask;
+		FD_ZERO(&mask);
+		FD_SET(nControl->handle, &mask);
+		FD_SET(nData->handle, &mask);
+
+		i = nControl->handle;
+		if (i < nData->handle)
+			i = nData->handle;
+		i = select(i+1, &mask, NULL, NULL, &tv);
+		if (i == -1) {
+			strncpy(nControl->response, strerror(errno),
+					sizeof(nControl->response));
+			net_close(nData->handle);
+			nData->handle = 0;
+			return 0;
+		}
+		else if (i == 0) {
+			if(UPP::msecs(end_time) >= 0) {
+				strcpy(nControl->response, "timed out waiting for connection");
+				net_close(nData->handle);
+				nData->handle = 0;
+				return 0;
+			}
+			if(!nControl->idlecb(nControl, -3, nControl->idlearg)) {
+				strcpy(nControl->response, "accept aborted");
+				net_close(nData->handle);
+				nData->handle = 0;
+				return 0;
+			}
+			continue;
+		}
+		else {
+			if (FD_ISSET(nData->handle, &mask)) {
+				l = sizeof(addr);
+				sData = accept(nData->handle, &addr, &l);
+				i = errno;
+				net_close(nData->handle);
+				if (sData > 0) {
+					nData->handle = sData;
+					return 1;
+				}
+				else {
+					strncpy(nControl->response, strerror(i),
+							sizeof(nControl->response));
+					nData->handle = 0;
+					return 0;
+				}
+			}
+			else if (FD_ISSET(nControl->handle, &mask)) {
+				net_close(nData->handle);
+				nData->handle = 0;
+				readresp('2', nControl);
+				return 0;
+			}
+		}
+	}
+}
+
+/*
+* FtpAccess - return a handle for a data stream
+*
+* return 1 if successful, 0 otherwise
+*/
+GLOBALDEF int FtpAccess(const char *path, int typ, int mode, netbuf *nControl,
+	netbuf **nData)
+{
+	LLOG("FtpAccess");
+
+	char buf[256];
+	int dir;
+	if ((path == NULL) &&
+		((typ == FTPLIB_FILE_WRITE) || (typ == FTPLIB_FILE_READ)))
+	{
+		sprintf(nControl->response,
+				"Missing path argument for file transfer\n");
+		return 0;
+	}
+	sprintf(buf, "TYPE %c", mode);
+	if (!FtpSendCmd(buf, '2', nControl))
+		return 0;
+	switch (typ)
+	{
+	case FTPLIB_DIR:
+		strcpy(buf,"NLST");
+		dir = FTPLIB_READ;
+		break;
+	case FTPLIB_DIR_VERBOSE:
+		strcpy(buf,"LIST");
+		dir = FTPLIB_READ;
+		break;
+	case FTPLIB_FILE_READ:
+		strcpy(buf,"RETR");
+		dir = FTPLIB_READ;
+		break;
+	case FTPLIB_FILE_WRITE:
+		strcpy(buf,"STOR");
+		dir = FTPLIB_WRITE;
+		break;
+	default:
+		sprintf(nControl->response, "Invalid open type %d\n", typ);
+		return 0;
+	}
+	if (path != NULL)
+	{
+		int i = strlen(buf);
+		buf[i++] = ' ';
+		if ((strlen(path) + i) >= sizeof(buf))
+			return 0;
+		strcpy(&buf[i],path);
+	}
+	if (FtpOpenPort(nControl, nData, mode, dir) == -1)
+		return 0;
+	if (!FtpSendCmd(buf, '1', nControl))
+	{
+		FtpClose(*nData);
+		*nData = NULL;
+		return 0;
+	}
+	(*nData)->ctrl = nControl;
+	nControl->data = *nData;
+	if (nControl->cmode == FTPLIB_PORT)
+	{
+		if (!FtpAcceptConnection(*nData,nControl))
+		{
+			FtpClose(*nData);
+			*nData = NULL;
+			nControl->data = NULL;
+			return 0;
+		}
+	}
+	return 1;
+}
+
+/*
+* FtpRead - read from a data connection
+*/
+GLOBALDEF int FtpRead(void *buf, int max, netbuf *nData)
+{
+	LLOG("FtpRead");
+
+	int i;
+	if (nData->dir != FTPLIB_READ)
+		return 0;
+	if (nData->buf)
+		i = readline((char *)buf, max, nData);
+	else
+	{
+		i = socket_wait(nData, 0);
+		if (i != 1)
+			return 0;
+		i = net_read(nData->handle, (char *)buf, max);
+	}
+	if (i == -1)
+		return 0;
+	nData->xfered += i;
+	if (nData->idlecb && nData->cbbytes)
+	{
+		nData->xfered1 += i;
+		if (nData->xfered1 > nData->cbbytes)
+		{
+			if (nData->idlecb(nData, nData->xfered, nData->idlearg) == 0)
+				return 0;
+			nData->xfered1 = 0;
+		}
+	}
+	LLOG("-> done " << i);
+	return i;
+}
+
+/*
+* FtpWrite - write to a data connection
+*/
+GLOBALDEF int FtpWrite(void *buf, int len, netbuf *nData)
+{
+	LLOG("FtpWrite");
+
+	int i;
+	if (nData->dir != FTPLIB_WRITE)
+		return 0;
+	if (nData->buf)
+		i = writeline((char *)buf, len, nData);
+	else
+	{
+		socket_wait(nData, 1);
+		i = net_write(nData->handle, (const char *)buf, len);
+	}
+	if (i == -1)
+		return 0;
+	nData->xfered += i;
+	if (nData->idlecb && nData->cbbytes)
+	{
+		nData->xfered1 += i;
+		if (nData->xfered1 > nData->cbbytes)
+		{
+			nData->xfered1 = 0;
+			if(!nData->idlecb(nData, nData->xfered, nData->idlearg))
+				return 0;
+		}
+	}
+	LLOG("-> done " << i);
+	return i;
+}
+
+/*
+* FtpClose - close a data connection
+*/
+GLOBALDEF int FtpClose(netbuf *nData)
+{
+	netbuf *ctrl;
+	switch (nData->dir)
+	{
+	case FTPLIB_WRITE:
+		/* potential problem - if buffer flush fails, how to notify user? */
+		if (nData->buf != NULL)
+			writeline(NULL, 0, nData);
+	case FTPLIB_READ:
+		if (nData->buf)
+			delete [] nData->buf;
+		shutdown(nData->handle,2);
+		net_close(nData->handle);
+		ctrl = nData->ctrl;
+		delete nData;
+		if (ctrl)
+		{
+			ctrl->data = NULL;
+			return(readresp('2', ctrl));
+		}
+		return 1;
+	case FTPLIB_CONTROL:
+		if (nData->data)
+		{
+			nData->ctrl = NULL;
+			FtpClose(nData);
+		}
+		net_close(nData->handle);
+		delete nData;
+		return 0;
+	}
+	return 1;
+}
+
+/*
+* FtpSite - send a SITE command
+*
+* return 1 if command successful, 0 otherwise
+*/
+GLOBALDEF int FtpSite(const char *cmd, netbuf *nControl)
+{
+	char buf[256];
+
+	if ((strlen(cmd) + 7) > sizeof(buf))
+		return 0;
+	sprintf(buf,"SITE %s",cmd);
+	if (!FtpSendCmd(buf,'2',nControl))
+		return 0;
+	return 1;
+}
+
+/*
+* FtpSysType - send a SYST command
+*
+* Fills in the user buffer with the remote system type.  If more
+* information from the response is required, the user can parse
+* it out of the response buffer returned by FtpLastResponse().
+*
+* return 1 if command successful, 0 otherwise
+*/
+GLOBALDEF int FtpSysType(char *buf, int max, netbuf *nControl)
+{
+	int l = max;
+	char *b = buf;
+	char *s;
+	if (!FtpSendCmd("SYST",'2',nControl))
+		return 0;
+	s = &nControl->response[4];
+	while ((--l) && (*s != ' '))
+		*b++ = *s++;
+	*b++ = '\0';
+	return 1;
+}
+
+/*
+* FtpMkdir - create a directory at server
+*
+* return 1 if successful, 0 otherwise
+*/
+GLOBALDEF int FtpMkdir(const char *path, netbuf *nControl)
+{
+	char buf[256];
+
+	if ((strlen(path) + 6) > sizeof(buf))
+		return 0;
+	sprintf(buf,"MKD %s",path);
+	if (!FtpSendCmd(buf,'2', nControl))
+		return 0;
+	return 1;
+}
+
+/*
+* FtpChdir - change path at remote
+*
+* return 1 if successful, 0 otherwise
+*/
+GLOBALDEF int FtpChdir(const char *path, netbuf *nControl)
+{
+	char buf[256];
+
+	if ((strlen(path) + 6) > sizeof(buf))
+		return 0;
+	sprintf(buf,"CWD %s",path);
+	if (!FtpSendCmd(buf,'2',nControl))
+		return 0;
+	return 1;
+}
+
+/*
+* FtpCDUp - move to parent directory at remote
+*
+* return 1 if successful, 0 otherwise
+*/
+GLOBALDEF int FtpCDUp(netbuf *nControl)
+{
+	if (!FtpSendCmd("CDUP",'2',nControl))
+		return 0;
+	return 1;
+}
+
+/*
+* FtpRmdir - remove directory at remote
+*
+* return 1 if successful, 0 otherwise
+*/
+GLOBALDEF int FtpRmdir(const char *path, netbuf *nControl)
+{
+	char buf[256];
+
+	if ((strlen(path) + 6) > sizeof(buf))
+		return 0;
+	sprintf(buf,"RMD %s",path);
+	if (!FtpSendCmd(buf,'2',nControl))
+		return 0;
+	return 1;
+}
+
+/*
+* FtpPwd - get working directory at remote
+*
+* return 1 if successful, 0 otherwise
+*/
+GLOBALDEF int FtpPwd(char *path, int max, netbuf *nControl)
+{
+	int l = max;
+	char *b = path;
+	char *s;
+	if (!FtpSendCmd("PWD",'2',nControl))
+		return 0;
+	s = strchr(nControl->response, '"');
+	if (s == NULL)
+		return 0;
+	s++;
+	while ((--l) && (*s) && (*s != '"'))
+		*b++ = *s++;
+	*b++ = '\0';
+	return 1;
+}
+
+/*
+* FtpXfer - issue a command and transfer data
+*
+* return 1 if successful, 0 otherwise
+*/
+static int FtpXfer(const char *localfile, const char *path,
+		netbuf *nControl, int typ, int mode)
+{
+	int l,c;
+	char *dbuf;
+	FILE *local = NULL;
+	netbuf *nData;
+	int rv=1;
+
+	if (localfile != NULL)
+	{
+		char ac[4] = "w";
+		if (typ == FTPLIB_FILE_WRITE)
+			ac[0] = 'r';
+		if (mode == FTPLIB_IMAGE)
+			ac[1] = 'b';
+		local = fopen(localfile, ac);
+		if (local == NULL)
+		{
+			strncpy(nControl->response, strerror(errno),
+					sizeof(nControl->response));
+			return 0;
+		}
+	}
+	if (local == NULL)
+		local = (typ == FTPLIB_FILE_WRITE) ? stdin : stdout;
+	if (!FtpAccess(path, typ, mode, nControl, &nData))
+		return 0;
+	dbuf = new char[FTPLIB_BUFSIZ];
+	if (typ == FTPLIB_FILE_WRITE)
+	{
+		while ((l = fread(dbuf, 1, FTPLIB_BUFSIZ, local)) > 0)
+			if ((c = FtpWrite(dbuf, l, nData)) < l)
+			{
+				printf("short write: passed %d, wrote %d\n", l, c);
+				rv = 0;
+				break;
+			}
+	}
+	else
+	{
+		while ((l = FtpRead(dbuf, FTPLIB_BUFSIZ, nData)) > 0)
+			if (fwrite(dbuf, 1, l, local) <= 0)
+			{
+				strcpy(nControl->perror, "localfile write");
+				rv = 0;
+				break;
+			}
+	}
+	delete[] dbuf;
+	fflush(local);
+	if (localfile != NULL)
+		fclose(local);
+	FtpClose(nData);
+	return rv;
+}
+
+/*
+* FtpNlst - issue an NLST command and write response to output
+*
+* return 1 if successful, 0 otherwise
+*/
+GLOBALDEF int FtpNlst(const char *outputfile, const char *path,
+		netbuf *nControl)
+{
+	return FtpXfer(outputfile, path, nControl, FTPLIB_DIR, FTPLIB_ASCII);
+}
+
+/*
+* FtpDir - issue a LIST command and write response to output
+*
+* return 1 if successful, 0 otherwise
+*/
+GLOBALDEF int FtpDir(const char *outputfile, const char *path, netbuf *nControl)
+{
+	return FtpXfer(outputfile, path, nControl, FTPLIB_DIR_VERBOSE, FTPLIB_ASCII);
+}
+
+/*
+* FtpSize - determine the size of a remote file
+*
+* return 1 if successful, 0 otherwise
+*/
+GLOBALDEF int FtpSize(const char *path, int *size, char mode, netbuf *nControl)
+{
+	char cmd[256];
+	int resp,sz,rv=1;
+
+	if ((strlen(path) + 7) > sizeof(cmd))
+		return 0;
+	sprintf(cmd, "TYPE %c", mode);
+	if (!FtpSendCmd(cmd, '2', nControl))
+		return 0;
+	sprintf(cmd,"SIZE %s",path);
+	if (!FtpSendCmd(cmd,'2',nControl))
+		rv = 0;
+	else
+	{
+		if (sscanf(nControl->response, "%d %d", &resp, &sz) == 2)
+			*size = sz;
+		else
+			rv = 0;
+	}
+	return rv;
+}
+
+/*
+* FtpModDate - determine the modification date of a remote file
+*
+* return 1 if successful, 0 otherwise
+*/
+GLOBALDEF int FtpModDate(const char *path, char *dt, int max, netbuf *nControl)
+{
+	char buf[256];
+	int rv = 1;
+
+	if ((strlen(path) + 7) > sizeof(buf))
+		return 0;
+	sprintf(buf,"MDTM %s",path);
+	if (!FtpSendCmd(buf,'2',nControl))
+		rv = 0;
+	else
+		strncpy(dt, &nControl->response[4], max);
+	return rv;
+}
+
+/*
+* FtpGet - issue a GET command and write received data to output
+*
+* return 1 if successful, 0 otherwise
+*/
+GLOBALDEF int FtpGet(const char *outputfile, const char *path,
+		char mode, netbuf *nControl)
+{
+	return FtpXfer(outputfile, path, nControl, FTPLIB_FILE_READ, mode);
+}
+
+/*
+* FtpPut - issue a PUT command and send data from input
+*
+* return 1 if successful, 0 otherwise
+*/
+GLOBALDEF int FtpPut(const char *inputfile, const char *path, char mode,
+		netbuf *nControl)
+{
+	return FtpXfer(inputfile, path, nControl, FTPLIB_FILE_WRITE, mode);
+}
+
+/*
+* FtpRename - rename a file at remote
+*
+* return 1 if successful, 0 otherwise
+*/
+GLOBALDEF int FtpRename(const char *src, const char *dst, netbuf *nControl)
+{
+	char cmd[256];
+
+	if (((strlen(src) + 7) > sizeof(cmd)) ||
+		((strlen(dst) + 7) > sizeof(cmd)))
+		return 0;
+	sprintf(cmd,"RNFR %s",src);
+	if (!FtpSendCmd(cmd,'3',nControl))
+		return 0;
+	sprintf(cmd,"RNTO %s",dst);
+	if (!FtpSendCmd(cmd,'2',nControl))
+		return 0;
+	return 1;
+}
+
+/*
+* FtpDelete - delete a file at remote
+*
+* return 1 if successful, 0 otherwise
+*/
+GLOBALDEF int FtpDelete(const char *fnm, netbuf *nControl)
+{
+	char cmd[256];
+
+	if ((strlen(fnm) + 7) > sizeof(cmd))
+		return 0;
+	sprintf(cmd,"DELE %s",fnm);
+	if (!FtpSendCmd(cmd,'2', nControl))
+		return 0;
+	return 1;
+}
+
+/*
+* FtpQuit - disconnect from remote
+*
+* return 1 if successful, 0 otherwise
+*/
+GLOBALDEF void FtpQuit(netbuf *nControl)
+{
+	if (nControl->dir != FTPLIB_CONTROL)
+		return;
+	FtpSendCmd("QUIT",'2',nControl);
+	net_close(nControl->handle);
+	if(nControl->buf)
+		delete[] nControl->buf;
+	delete nControl;
+}
+
+GLOBALDEF const char *FtpError(netbuf *nControl)
+{
+	return nControl->perror;
+}
diff --git a/uppsrc/plugin/ftp/lib/ftplib.h b/uppsrc/plugin/ftp/lib/ftplib.h
new file mode 100644
index 000000000..0d200d7d2
--- /dev/null
+++ b/uppsrc/plugin/ftp/lib/ftplib.h
@@ -0,0 +1,103 @@
+/***************************************************************************/
+/*									   */
+/* ftplib.h - header file for callable ftp access routines                 */
+/* Copyright (C) 1996, 1997 Thomas Pfau, pfau@cnj.digex.net                */
+/*	73 Catherine Street, South Bound Brook, NJ, 08880		   */
+/*									   */
+/* This library is free software; you can redistribute it and/or	   */
+/* modify it under the terms of the GNU Library General Public		   */
+/* License as published by the Free Software Foundation; either		   */
+/* version 2 of the License, or (at your option) any later version.	   */
+/* 									   */
+/* This library 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	   */
+/* Library General Public License for more details.			   */
+/* 									   */
+/* You should have received a copy of the GNU Library General Public	   */
+/* License along with this progam; if not, write to the			   */
+/* Free Software Foundation, Inc., 59 Temple Place - Suite 330,		   */
+/* Boston, MA 02111-1307, USA.						   */
+/*									   */
+/***************************************************************************/
+
+#if !defined(__FTPLIB_H)
+#define __FTPLIB_H
+
+#if defined(__unix__) || defined(VMS)
+#define GLOBALDEF
+#define GLOBALREF extern
+#elif defined(_WIN32)
+#define GLOBALDEF
+#define GLOBALREF extern
+/*
+#if defined BUILDING_LIBRARY
+#define GLOBALDEF __declspec(dllexport)
+#define GLOBALREF __declspec(dllexport)
+#else
+#define GLOBALREF __declspec(dllimport)
+#endif
+*/
+#endif
+
+/* FtpAccess() type codes */
+#define FTPLIB_DIR 1
+#define FTPLIB_DIR_VERBOSE 2
+#define FTPLIB_FILE_READ 3
+#define FTPLIB_FILE_WRITE 4
+
+/* FtpAccess() mode codes */
+#define FTPLIB_ASCII 'A'
+#define FTPLIB_IMAGE 'I'
+#define FTPLIB_TEXT FTPLIB_ASCII
+#define FTPLIB_BINARY FTPLIB_IMAGE
+
+/* connection modes */
+#define FTPLIB_PASSIVE 1
+#define FTPLIB_PORT 2
+
+/* connection option names */
+#define FTPLIB_CONNMODE 1
+#define FTPLIB_CALLBACK 2
+#define FTPLIB_IDLETIME 3
+#define FTPLIB_CALLBACKARG 4
+#define FTPLIB_CALLBACKBYTES 5
+#define FTPLIB_IDLETIMEOUT 6
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct NetBuf netbuf;
+typedef int (*FtpCallback)(netbuf *nControl, int xfered, void *arg);
+
+GLOBALREF void FtpInit(void);
+GLOBALREF char *FtpLastResponse(netbuf *nControl);
+GLOBALREF int FtpConnect(const char *host, netbuf **nControl, char perror[512],
+	FtpCallback idlecb, void *idledata, int idletime_msecs, int idletimeout_secs);
+GLOBALREF int FtpOptions(int opt, long val, netbuf *nControl);
+GLOBALREF int FtpLogin(const char *user, const char *pass, netbuf *nControl);
+GLOBALREF int FtpAccess(const char *path, int typ, int mode, netbuf *nControl,
+    netbuf **nData);
+GLOBALREF int FtpRead(void *buf, int max, netbuf *nData);
+GLOBALREF int FtpWrite(void *buf, int len, netbuf *nData);
+GLOBALREF int FtpClose(netbuf *nData);
+GLOBALREF int FtpSite(const char *cmd, netbuf *nControl);
+GLOBALREF int FtpSysType(char *buf, int max, netbuf *nControl);
+GLOBALREF int FtpMkdir(const char *path, netbuf *nControl);
+GLOBALREF int FtpChdir(const char *path, netbuf *nControl);
+GLOBALREF int FtpCDUp(netbuf *nControl);
+GLOBALREF int FtpRmdir(const char *path, netbuf *nControl);
+GLOBALREF int FtpPwd(char *path, int max, netbuf *nControl);
+GLOBALREF int FtpSize(const char *path, int *size, char mode, netbuf *nControl);
+GLOBALREF int FtpModDate(const char *path, char *dt, int max, netbuf *nControl);
+GLOBALREF int FtpRename(const char *src, const char *dst, netbuf *nControl);
+GLOBALREF int FtpDelete(const char *fnm, netbuf *nControl);
+GLOBALREF void FtpQuit(netbuf *nControl);
+GLOBALREF const char *FtpError(netbuf *nControl);
+
+#ifdef __cplusplus
+};
+#endif
+
+#endif /* __FTPLIB_H */
diff --git a/uppsrc/plugin/gif/gif.h b/uppsrc/plugin/gif/gif.h
new file mode 100644
index 000000000..5520cea6a
--- /dev/null
+++ b/uppsrc/plugin/gif/gif.h
@@ -0,0 +1,53 @@
+#ifndef _plugin_gif_gif_h_
+#define _plugin_gif_gif_h_
+
+#include <Draw/Draw.h>
+
+
+NAMESPACE_UPP
+
+class GIFRaster : public StreamRaster {
+public:
+	class Data;
+	One<Data> data;
+
+public:
+	GIFRaster();
+	~GIFRaster();
+
+	virtual bool               Create();
+	virtual Size               GetSize();
+	virtual Info               GetInfo();
+	virtual Line               GetLine(int line);
+	virtual const RasterFormat *GetFormat();
+	virtual int                GetPaletteCount();
+	virtual RGBA               *GetPalette();
+
+private:
+	bool                       Init();
+};
+
+class GIFEncoder : public StreamRasterEncoder {
+public:
+	class Data;
+	One<Data> data;
+
+public:
+	GIFEncoder(bool ignore_alpha = false, String comment = Null);
+	~GIFEncoder();
+
+	GIFEncoder&  IgnoreAlpha(bool ia = true) { ignore_alpha = ia; return *this; }
+	GIFEncoder&  Comment(String c)           { comment = c; return *this; }
+
+	virtual int  GetPaletteCount();
+	virtual void Start(Size sz);
+	virtual void WriteLineRaw(const byte *s);
+
+private:
+	bool         ignore_alpha;
+	String       comment;
+};
+
+END_UPP_NAMESPACE
+
+#endif
diff --git a/uppsrc/plugin/gif/gif.icpp b/uppsrc/plugin/gif/gif.icpp
new file mode 100644
index 000000000..e767f9ccc
--- /dev/null
+++ b/uppsrc/plugin/gif/gif.icpp
@@ -0,0 +1,9 @@
+#include "gif.h"
+
+NAMESPACE_UPP
+
+INITBLOCK {
+	StreamRaster::Register<GIFRaster>();
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/plugin/gif/gif.upp b/uppsrc/plugin/gif/gif.upp
new file mode 100644
index 000000000..9b4ba3e42
--- /dev/null
+++ b/uppsrc/plugin/gif/gif.upp
@@ -0,0 +1,10 @@
+description "GIF image file format";
+
+uses
+	Draw;
+
+file
+	gif.h,
+	gifupp.cpp,
+	gif.icpp;
+
diff --git a/uppsrc/plugin/gif/gifupp.cpp b/uppsrc/plugin/gif/gifupp.cpp
new file mode 100644
index 000000000..88fd2ef4c
--- /dev/null
+++ b/uppsrc/plugin/gif/gifupp.cpp
@@ -0,0 +1,1530 @@
+#include "gif.h"
+
+
+NAMESPACE_UPP
+
+struct GifGlobalInfo // information about gif file
+{
+	void     Serialize(Stream& stream);
+
+	byte     tag[6];
+	word     width;
+	word     height;
+	byte     flags;
+
+	static const int GCT_PRESENT   = 0x80;
+	static const int GCT_SORTED    = 0x08;
+	static const int GCT_BITS_MASK = 0x07;
+	static const int GCT_BPP_MASK  = 0x07;
+	static const int GCT_BPP_SHIFT = 4;
+
+	byte     bgnd;     // background color index
+	byte     raw_aspect;
+
+	bool     gct_flag; // true = GCT is present
+	bool     gct_sort; // true = GCT is sorted
+	int      gct_bits; // log2(records in GCT)
+	int      gct_recs; // records in GCT = 1 << gct_bits
+	int      gct_size; // bytes in GCT = 3 * gct_rect
+	int      bpp;      // bits per pixel
+	int      pixels;   // pixel types = 1 << bpp
+	int      aspect;   // aspect ratio * 1000, 0 = undefined
+
+	int64    glo_fpos; // file position of this global info
+	int64    gct_fpos; // file position of gct
+	int64    loc_fpos; // address of 1st local subimage descriptor
+};
+
+void GifGlobalInfo::Serialize(Stream& stream)
+{
+	glo_fpos = stream.GetPos();
+	stream.SerializeRaw(tag, 6);
+	if(stream.IsError() || memcmp(tag, "GIF8", 4)) {
+		stream.SetError();
+		return;
+	}
+	stream % width % height % flags % bgnd % raw_aspect;
+	if(stream.IsLoading()) {
+		gct_flag = flags & GCT_PRESENT;
+		gct_sort = flags & GCT_SORTED;
+		gct_bits = (flags & GCT_BITS_MASK) + 1;
+		gct_recs = 1 << gct_bits;
+		gct_size = 3 * gct_recs;
+		bpp      = ((flags >> GCT_BPP_SHIFT) & GCT_BPP_MASK) + 1;
+		pixels   = 1 << bpp;
+		if(raw_aspect == 0)
+			aspect = 0;
+		else
+			aspect = ((raw_aspect + 15) * 125u) >> 3;
+	}
+
+	loc_fpos = gct_fpos = stream.GetPos();
+	if(gct_flag)
+		loc_fpos += gct_size;
+}
+
+struct GifLocalInfo // subimage info
+{
+	bool    Load(Stream& stream);
+
+	word    x;
+	word    y;
+	word    width;
+	word    height;
+	byte    lct_flag;    // 1 = LCT is present
+	byte    lct_sort;    // 1 = LCT is sorted
+	word    lct_bits;    // log2(records in LCT)
+	word    lct_recs;    // records in LCT = 1 << lct_bits
+	word    lct_size;    // bytes in LCT = 3 * lct_recs
+	byte    interlace;   // 1 = interlaced
+
+	int     transparent; // transparent color index, -1 = unused
+	String  comment;     // comment string
+
+	int64   loc_fpos;    // file address of this structure
+	int64   lct_fpos;    // file address of LCT
+	int64   dat_fpos;    // data position (1st byte after LCT)
+};
+
+bool GifLocalInfo::Load(Stream& stream)
+{
+	byte flags;
+	int  c1;
+
+	transparent = -1;
+
+	while((c1 = stream.Get()) != 0x2C)
+		if(c1 == 0x00)
+			;
+		else if(c1 == 0x21) {
+			int code = stream.Get();
+			int len = stream.Get();
+			int64 next = stream.GetPos() + len;
+			if(code == 0xF9) { // read transparent color index
+				byte flags = stream.Get(); // packed fields
+				stream.Get16le(); // delay time
+				transparent = stream.Get();
+				if(!(flags & 1))
+					transparent = -1;
+			}
+			else if(code == 0xFE) { // comment
+				stream.Seek(next);
+				while((len = stream.Get()) != 0) {
+					int old = comment.GetLength();
+					StringBuffer b(old + len);
+					memcpy(b, comment, old);
+					bool res = stream.GetAll(~b + old, len);
+					comment = b;
+					if(!res)
+						return false;
+				}
+				next = 0;
+			}
+			if(next) {
+				stream.Seek(next);
+				while((len = stream.Get()) > 0)
+					stream.SeekCur(len);
+			}
+		}
+		else
+			return false;
+
+	loc_fpos  = stream.GetPos() - 1;
+	x         = stream.Get16le();
+	y         = stream.Get16le();
+	width     = stream.Get16le();
+	height    = stream.Get16le();
+	flags     = stream.Get();
+	lct_flag  = (flags & 0x80) != 0;
+	lct_sort  = (flags & 0x20) != 0;
+	lct_bits  = (flags & 0x07) + 1;
+	lct_recs  = 1 << lct_bits;
+	lct_size  = 3 * lct_recs;
+	interlace = (flags & 0x40) != 0;
+	lct_fpos  = stream.GetPos();
+	dat_fpos  = lct_fpos;
+	if(lct_flag)
+		dat_fpos += lct_size;
+	return true;
+}
+
+#if 0
+class GifProcessor
+{
+public:
+	GifProcessor(Stream& stream, const AlphaArray *input_image);
+
+	AlphaArray        Load();
+	void              Save(bool optimize_palette = false, const String& comment = Null);
+
+public:
+	String            comment;
+//	int               transparent_index;
+	bool              optimize_palette;
+
+private:
+	bool              LoadSubimage(int& transparent_index);
+	void              SaveSubimage();
+	void              ClearTable(bool save = false);
+	bool              Fetch(byte *&ptr, const byte *end);
+	bool              FetchDataBlock();
+	void              FlushDataBlock();
+
+private:
+	static const int MAX_BITS = 12;
+	static const int MAX_COUNT = 1 << MAX_BITS;
+	static const int HASH_COUNT = 5331;
+
+	struct Item {
+		union {
+			const Item *prefix;
+			Item       *child;
+		};
+		Item       *left, *right;
+		short       length;
+		byte        character;
+	};
+
+	Item              items[MAX_COUNT];
+	int               item_count;
+	const AlphaArray *raw_image;
+	AlphaArray        temp_image;
+
+	Stream&           stream;
+	byte              data_block[256];
+	byte              old_first;
+	byte             *data_ptr;
+	byte             *data_end;
+	dword             old_byte;
+	int               old_shift;
+	int               old_code;
+	int               old_bits;
+	int               max_bit_count;
+	int               start_bpp;
+};
+
+GifProcessor::GifProcessor(Stream& stream, const AlphaArray *raw_image)
+: stream(stream), raw_image(raw_image)
+{
+//	ASSERT(stream.IsOpen() && stream.IsStoring());
+//	ASSERT(raw_image.size.cx > 0 && raw_image.size.cy > 0);
+}
+
+void GifProcessor::Save(bool optimize_palette, const String& cm)
+{
+	const AlphaArray *src_image = raw_image;
+	if(src_image->pixel.bpp > 8 || optimize_palette || src_image->HasAlpha()) {
+		temp_image.pixel = CreatePalette(src_image->pixel, 8, 255);
+		raw_image = &temp_image;
+	}
+	if(optimize_palette) {
+		if(raw_image != &temp_image) {
+			temp_image.pixel <<= src_image->pixel;
+			raw_image = &temp_image;
+		}
+		OptimizePalette(temp_image.pixel);
+	}
+	int transparent_index = -1;
+	if(src_image->HasAlpha()) {
+		ASSERT(temp_image.pixel.palette.GetCount() < 256);
+		transparent_index = temp_image.pixel.palette.GetCount();
+		temp_image.pixel.palette.Add(Black());
+		PixelKillMask(temp_image.pixel, src_image->alpha, transparent_index);
+	}
+
+	comment = cm;
+	for(start_bpp = 1; start_bpp < 8 && raw_image->pixel.palette.GetCount() > (1 << start_bpp); start_bpp++)
+		;
+
+	GifGlobalInfo g;
+	memcpy(g.tag, !IsNull(comment) ? "GIF89a" : "GIF87a", 6);
+	g.width = raw_image->GetWidth();
+	g.height = raw_image->GetHeight();
+	g.flags = g.GCT_PRESENT | ((start_bpp - 1) << g.GCT_BPP_SHIFT) | (start_bpp - 1);
+	if(optimize_palette)
+		g.flags |= g.GCT_SORTED;
+	g.bgnd = 0;
+	g.raw_aspect = 0;
+
+	stream % g;
+ { // write palette
+		for(int i = 0, n = 1 << start_bpp; i < n; i++) {
+			Color color = Black;
+			if(i < raw_image->pixel.palette.GetCount())
+				color = raw_image->pixel.palette[i];
+			stream.Put(color.GetR());
+			stream.Put(color.GetG());
+			stream.Put(color.GetB());
+		}
+	}
+
+	// write comment block
+	if(!IsNull(comment)) {
+		stream.Put(0x21);
+		stream.Put(0xFE);
+		for(int t = 0, n; (n = min(comment.GetLength() - t, 255)) > 0; t += n) {
+			stream.Put(n);
+			stream.Put(comment.Begin() + t, n);
+		}
+		stream.Put(0x00);
+	}
+
+	// store transparent color index
+	if(transparent_index >= 0) {
+		stream.Put(0x21);
+		stream.Put(0xF9);
+		stream.Put(4);
+		stream.Put(1); // transparent index present
+		stream.Put16le(0); // delay time = 0
+		stream.Put(transparent_index);
+		stream.Put(0);
+	}
+
+	if(start_bpp == 1)
+		start_bpp++;
+	SaveSubimage();
+
+	stream.Put(0x00);
+	stream.Put(0x3B);
+}
+
+void GifProcessor::SaveSubimage()
+{
+//	TIMING("GifProcessor::SaveSubimage");
+
+	// subimage header
+	stream.Put(0x2C);
+	stream.Put16le(0);
+	stream.Put16le(0);
+	stream.Put16le(raw_image->GetWidth());
+	stream.Put16le(raw_image->GetHeight());
+	stream.Put(0x00); // no LCT, non-interlaced, no sort, LCT size-1 = 0
+
+	data_ptr = data_block;
+	data_end = data_ptr + 255;
+	ClearTable(true);
+
+	stream.Put(start_bpp); // start bits
+
+	int y = raw_image->GetHeight();
+	const byte *sp = 0, *se = 0;
+
+	int _old_shift = 0;
+	int _old_byte = 0;
+	int _old_bits = old_bits;
+//	int _lsh = start_bpp, _rsh = 32 - start_bpp;
+
+//	static TimingInspector ti_put("PUT_CODE");
+
+#define PUT_CODE(code) \
+	do \ { \
+		/*TimingInspector::Routine r(ti_put);*/ \
+		_old_byte |= (code) << _old_shift; \
+		_old_shift += _old_bits; \
+		if(_old_shift >= 16) \ { \
+			if(data_ptr >= data_end) \
+				FlushDataBlock(); \
+			*data_ptr++ = _old_byte; \
+			if(data_ptr >= data_end) \
+				FlushDataBlock(); \
+			*data_ptr++ = _old_byte >>= 8; \
+			_old_byte >>= 8; \
+			_old_shift -= 16; \
+		} \
+		else if(_old_shift >= 8) \ { \
+			if(data_ptr >= data_end) \
+				FlushDataBlock(); \
+			*data_ptr++ = _old_byte; \
+			_old_byte >>= 8; \
+			_old_shift -= 8; \
+		} \
+	} \
+	while(false)
+
+	int restart_code = 1 << start_bpp;
+	PUT_CODE(restart_code);
+
+	for(;;) {
+		if(sp == se) {
+			if(--y < 0)
+				break;
+			sp = raw_image->GetPixelUpScan(y);
+			se = sp + raw_image->GetWidth();
+		}
+		Item *i = &items[*sp++], *p;
+		Item *new_item = &items[item_count];
+		ASSERT(i >= items && i <= &items[MAX_COUNT]);
+
+SEEK:
+		if(sp == se) {
+			if(--y < 0) {
+				PUT_CODE(i - items);
+				break;
+			}
+			sp = raw_image->GetPixelUpScan(y);
+			se = sp + raw_image->GetWidth();
+		}
+		byte c = *sp++;
+
+		if((i = (p = i)->child) == 0)
+			p->child = new_item;
+		else
+			for(;;) {
+				if(i->character == c)
+					goto SEEK;
+				if(c < i->character) {
+					if(i->left)
+						i = i->left;
+					else {
+						i->left = new_item;
+						break;
+					}
+				}
+				else {
+					if(i->right)
+						i = i->right;
+					else {
+						i = i->right = new_item;
+						break;
+					}
+				}
+			}
+
+		// code not found - rewind last char & output current prefix, add new code to table
+		sp--;
+		PUT_CODE(p - items);
+		if(item_count < MAX_COUNT) { // add new entry to item table
+			if(item_count >= max_bit_count) {
+				max_bit_count <<= 1;
+				_old_bits++;
+			}
+			new_item->character = c;
+			new_item->left = new_item->right = new_item->child = 0;
+			item_count++;
+		}
+		else { // restart table
+			PUT_CODE(restart_code);
+			ClearTable(true);
+			_old_bits = old_bits;
+		}
+	}
+
+	// put terminator code & close output block
+	PUT_CODE(restart_code + 1);
+	if(_old_shift > 0) {
+		if(data_ptr >= data_end)
+			FlushDataBlock();
+		*data_ptr++ = _old_byte;
+	}
+	FlushDataBlock();
+}
+
+bool GifProcessor::FetchDataBlock()
+{
+//	TIMING("GifEncoder::FetchDataBlock");
+
+	int count = stream.Term();
+	if(count <= 0)
+		return false;
+	stream.Get();
+	if(!stream.GetAll(data_block, count))
+		return false;
+	data_ptr = data_block;
+	data_end = data_ptr + count;
+	return true;
+}
+
+void GifProcessor::FlushDataBlock()
+{
+//	TIMING("GifEncoder::FlushDataBlock");
+
+	int count = data_ptr - data_block;
+	if(count) {
+		ASSERT(count <= 255);
+		stream.Put(count);
+		stream.Put(data_block, count);
+		data_ptr = data_block;
+	}
+}
+
+void GifProcessor::ClearTable(bool save)
+{
+	for(int i = 0, n = 1 << start_bpp; i < n; i++) {
+		Item& item = items[i];
+		item.character = i;
+		item.length = 1;
+		if(save)
+			item.left = item.right = item.child = 0;
+		else
+			item.prefix = 0;
+	}
+	item_count = (1 << start_bpp);
+	items[item_count++].length = -1;
+	items[item_count++].length = -2;
+	old_code = -1;
+	old_bits = start_bpp;
+	max_bit_count = 1 << old_bits;
+	while(item_count > max_bit_count) {
+		old_bits++;
+		max_bit_count <<= 1;
+	}
+}
+
+bool GifProcessor::Fetch(byte *&cptr, const byte *cend)
+{
+//	TIMING("GifEncoder::Fetch");
+	byte *cp = cptr;
+	byte _old_shift = old_shift;
+	byte _old_bits = old_bits;
+	byte *_data_ptr = data_ptr;
+	byte *_data_end = data_end;
+	dword _old_byte = old_byte;
+	while(cp < cend) {
+//		static TimingInspector ti("Fetch-Get");
+//		ti.Start();
+		int code;
+		if(_old_shift + _old_bits <= 8) {
+			code = (_old_byte >> _old_shift) & ((1 << _old_bits) - 1);
+			_old_shift += _old_bits;
+		}
+		else {
+			if(_data_ptr >= _data_end) {
+				if(!FetchDataBlock()) {
+//					ti.End();
+					cptr = cp;
+					return false;
+				}
+				_data_ptr = data_ptr;
+				_data_end = data_end;
+			}
+			_old_byte |= *_data_ptr++ << 8;
+			if(_old_shift + _old_bits <= 16) {
+				code = (_old_byte >> _old_shift) & ((1 << _old_bits) - 1);
+				_old_shift += _old_bits - 8;
+				_old_byte >>= 8;
+			}
+			else {
+				if(_data_ptr >= _data_end) {
+					if(!FetchDataBlock()) {
+//						ti.End();
+						cptr = cp;
+						return false;
+					}
+					_data_ptr = data_ptr;
+					_data_end = data_end;
+				}
+				_old_byte |= *_data_ptr++ << 16;
+				ASSERT(_old_shift + _old_bits <= 24);
+				code = (_old_byte >> _old_shift) & ((1 << _old_bits) - 1);
+				_old_shift += _old_bits - 16;
+				_old_byte >>= 16;
+			}
+		}
+//		ti.End();
+
+		if(code < item_count) {
+//			TIMING("Fetch-existing code");
+			const Item& item = items[code];
+			if(item.length < 0)
+				if(item.length == -1) {
+					ClearTable();
+					_old_bits = old_bits;
+				}
+				else {
+					cptr = cp;
+					return false; // end of stream
+				}
+			else { // copy new pixels to output
+				byte *p = (cp += item.length);
+				byte first;
+/*
+
+				__asm {
+					mov    ebx, [p]
+					mov    edx, [item]
+					dec    ebx
+					mov    al, [edx]item.character
+					mov    [ebx], al
+					movzx  ecx, [edx]item.length
+					dec    ecx
+					cmp    ecx, 8
+					jb     __1
+				}
+__2:
+#define BYTE_AT(off) \
+				__asm mov    edx, [edx]item.prefix \
+				__asm mov    al, [edx]item.character \
+				__asm mov    [ebx - 1], al
+
+				BYTE_AT(-1) BYTE_AT(-2) BYTE_AT(-3) BYTE_AT(-4)
+				BYTE_AT(-5) BYTE_AT(-6) BYTE_AT(-7) BYTE_AT(-8)
+
+				__asm {
+					sub    ebx, 8
+					sub    ecx, 8
+					cmp    ecx, 8
+					jae    __2
+__1:
+					test   cl, 4
+					je     __no4
+				}
+				BYTE_AT(-1) BYTE_AT(-2) BYTE_AT(-3) BYTE_AT(-4)
+
+				__asm {
+					sub    ebx, 4
+__no4:
+					test   cl, 2
+					je     __no2
+				}
+				BYTE_AT(-2) BYTE_AT(-2)
+
+				__asm {
+					dec    ebx
+					dec    ebx
+__no2:
+					test   cl, 1
+					je     __no1
+				}
+				BYTE_AT(-1)
+				__asm {
+					dec    ebx
+__no1:
+					mov    al, [ebx]
+					mov    [first], al
+				}
+//*/
+
+				const Item *i = &item;
+				*--p = i->character;
+				int left = item.length;
+				if(--left > 0) {
+					for(; left >= 8; p -= 8, left -= 8) {
+						p[-1] = (i = i->prefix)->character;
+						p[-2] = (i = i->prefix)->character;
+						p[-3] = (i = i->prefix)->character;
+						p[-4] = (i = i->prefix)->character;
+						p[-5] = (i = i->prefix)->character;
+						p[-6] = (i = i->prefix)->character;
+						p[-7] = (i = i->prefix)->character;
+						p[-8] = (i = i->prefix)->character;
+					}
+					if(left & 4) {
+						p[-1] = (i = i->prefix)->character;
+						p[-2] = (i = i->prefix)->character;
+						p[-3] = (i = i->prefix)->character;
+						p[-4] = (i = i->prefix)->character;
+						p -= 4;
+					}
+					if(left & 2) {
+						p[-1] = (i = i->prefix)->character;
+						p[-2] = (i = i->prefix)->character;
+						p -= 2;
+					}
+					if(left & 1)
+						p[-1] = (i = i->prefix)->character;
+				}
+				first = i->character;
+//*/
+//				while(i->prefix)
+//					*--p = (i = i->prefix)->character;
+				if(old_code >= 0 && item_count < MAX_COUNT) { // add to string table
+					Item& item = items[item_count++];
+					item.character = first;
+					item.prefix = &items[old_code];
+					item.length = item.prefix->length + 1;
+				}
+				if(item_count >= max_bit_count && item_count < MAX_COUNT) {
+					max_bit_count <<= 1;
+					++_old_bits;
+				}
+				old_code = code;
+				old_first = first;
+			}
+		}
+		else { // special case: duplicate first character of old_code
+//			TIMING("Fetch-new code");
+			if(old_code < 0 || code > item_count) { // decoder error
+				stream.SetError();
+				cptr = cp;
+				return false;
+			}
+			ASSERT(item_count < MAX_COUNT);
+			Item& item = items[item_count++];
+			item.prefix = &items[old_code];
+			item.length = item.prefix->length + 1;
+			item.character = old_first;
+			const Item *i = &item;
+			byte *p = (cp += item.length);
+			*--p = i->character;
+			while(i->prefix)
+				*--p = (i = i->prefix)->character;
+			if(item_count >= max_bit_count && item_count < MAX_COUNT) {
+				max_bit_count <<= 1;
+				++_old_bits;
+			}
+			old_code = code;
+		}
+	}
+	cptr = cp;
+	old_shift = _old_shift;
+	old_bits = _old_bits;
+	data_ptr = _data_ptr;
+	data_end = _data_end;
+	old_byte = _old_byte;
+	return true;
+}
+
+bool GifProcessor::LoadSubimage(int& transparent_index)
+{
+//	TIMING("GifEncoder::LoadSubimage");
+	GifLocalInfo l;
+	if(!l.Load(stream))
+		return false;
+
+	if(l.transparent >= 0)
+		transparent_index = l.transparent;
+
+	if(l.x + l.width > temp_image.GetWidth()
+	|| l.y + l.height > temp_image.GetHeight())
+		return false; // out of bitmap rectangle
+
+	// ignore LCT
+	stream.Seek(l.dat_fpos);
+
+	if((start_bpp = stream.Get()) <= 0 || start_bpp > 12)
+		return false;
+
+	data_ptr = data_end = data_block; // empty data block
+	old_shift = 8;
+	old_byte = 0;
+	ClearTable();
+
+	PixelReader8 reader(temp_image.pixel);
+	PixelWriter8 writer(temp_image.pixel);
+
+	int cache = max(temp_image.GetWidth(), 1000);
+	Buffer<byte> data(cache + MAX_COUNT);
+	bool more = true;
+	byte *data_ptr = data, *data_end = data;
+	int pass = 0;
+	Size size = temp_image.GetSize();
+	for(int y = 0; y < size.cy;) {
+		if(more && data_ptr + size.cx > data_end) { // fetch more data
+			if(data_end > data_ptr)
+				Copy((byte *)data, data_ptr, data_end);
+			data_end -= (data_ptr - data);
+			data_ptr = data;
+			more = Fetch(data_end, data + cache);
+		}
+		int avail = min(size.cx, (int)intptr_t(data_end - data_ptr));
+		if(avail == 0)
+			break;
+		byte *wrt = writer[y];
+		if(avail < temp_image.GetWidth()) {
+			const byte *rd = reader[y];
+			if(rd != wrt)
+				memcpy(wrt, rd, temp_image.GetWidth());
+		}
+		memcpy(wrt, data_ptr, avail);
+		writer.Write();
+		data_ptr += avail;
+		if(l.interlace)
+			switch(pass) {
+			case 0: if((y += 8) < size.cy) break; y = 4 - 8; pass++;
+			case 1: if((y += 8) < size.cy) break; y = 2 - 4; pass++;
+			case 2: if((y += 4) < size.cy) break; y = 1 - 2; pass++;
+			case 3: y += 2; break;
+			}
+		else
+			y++;
+	}
+	while(FetchDataBlock()) // flush remaining data blocks
+		;
+	stream.Get(); // fetch terminating empty subblock
+	return true;
+}
+
+AlphaArray GifProcessor::Load()
+{
+	ASSERT(stream.IsLoading());
+	int transparent_index = -1;
+	GifGlobalInfo g;
+	stream % g;
+	if(stream.IsError() || g.width <= 0 || g.height <= 0)
+		return temp_image;
+	temp_image.pixel.Create(g.width, g.height, g.gct_recs <= 2 ? 1 : g.gct_recs <= 16 ? 4 : 8);
+	stream.Seek(g.gct_fpos);
+	for(int i = 0; i < g.gct_recs; i++) {
+		int r = stream.Get(), g = stream.Get(), b = stream.Get();
+		temp_image.pixel.palette.Add(Color(r, g, b));
+	}
+	stream.Seek(g.loc_fpos);
+	while(LoadSubimage(transparent_index))
+		;
+	if(stream.Term() == 0x3B)
+		stream.Get();
+
+	if(transparent_index >= 0) {
+		temp_image.pixel.palette.DoIndex(transparent_index) = Black;
+		temp_image.alpha.CreateMono(g.width, g.height, 1);
+		byte xlat[256];
+		ZeroArray(xlat);
+		xlat[transparent_index] = 1;
+		PixelReader8 reader(temp_image.pixel);
+		PixelWriter8 writer(temp_image.alpha);
+		for(int y = 0; y < g.height; y++) {
+			BltXlatB(writer[y], reader[y], g.width, xlat);
+			writer.Write();
+		}
+	}
+
+	return temp_image;
+}
+
+GifEncoder::GifEncoder(bool optimize_palette, String comment)
+: optimize_palette(optimize_palette), comment(comment) {}
+
+GifEncoder::~GifEncoder() {}
+
+Array<AlphaArray> GifEncoder::LoadRaw(Stream& _stream, const Vector<int>& page_index)
+{
+//	RTIMING("GifEncoder::LoadRaw");
+	static PixelArray dummy;
+	Array<AlphaArray> out;
+	out.Add() = GifProcessor(_stream, NULL).Load();
+	return out;
+}
+
+void GifEncoder::SaveRaw(Stream& stream, const Vector<const AlphaArray *>& pages)
+{
+	if(pages.GetCount() != 1) {
+		stream.SetError();
+		return;
+	}
+	GifProcessor(stream, pages[0]).Save(optimize_palette, comment);
+}
+
+Array<ImageInfo> GifEncoder::InfoRaw(Stream& stream)
+{
+	Array<ImageInfo> out;
+	out.SetCount(1);
+	ImageInfo& info = out[0];
+	if(!stream.IsOpen())
+		return Array<ImageInfo>();
+	ASSERT(stream.IsLoading());
+	GifGlobalInfo g;
+	stream % g;
+	if(stream.IsError())
+		return Array<ImageInfo>();
+	info.size = Size(g.width, g.height);
+	info.bits_per_pixel = g.bpp;
+	return out;
+}
+#endif
+
+class GIFRaster::Data {
+public:
+	Data(GIFRaster& owner, Stream& stream);
+	~Data();
+
+	bool               Create();
+	Raster::Line       GetLine(int line);
+	const RasterFormat *GetFormat() const  { return &format; }
+	int                GetPaletteCount()   { return 256; }
+	RGBA               *GetPalette()       { return palette; }
+
+public:
+	Size size;
+	Raster::Info info;
+
+private:
+	void ClearTable();
+	bool LoadSubimage(int& transparent_index);
+	bool FetchDataBlock();
+	bool Fetch(byte *&cptr, const byte *cend);
+
+private:
+	GIFRaster& owner;
+	Stream& stream;
+	RasterFormat format;
+	RGBA palette[256];
+	GifGlobalInfo ggi;
+	Vector<byte> temp;
+	bool first_row;
+
+	static const int MAX_BITS = 12;
+	static const int MAX_COUNT = 1 << MAX_BITS;
+	static const int HASH_COUNT = 5331;
+
+	struct Item {
+		union {
+			const Item *prefix;
+			Item       *child;
+		};
+		Item       *left, *right;
+		short       length;
+		byte        character;
+	};
+
+	Item              items[MAX_COUNT];
+	int               item_count;
+	byte              old_first;
+	int               old_code;
+	int               old_bits;
+	int               max_bit_count;
+	int               start_bpp;
+	byte             *data_ptr;
+	byte             *data_end;
+	byte              data_block[256];
+	dword             old_byte;
+	int               old_shift;
+};
+
+GIFRaster::Data::Data(GIFRaster& owner, Stream& stream)
+: owner(owner), stream(stream)
+{
+}
+
+GIFRaster::Data::~Data()
+{
+}
+
+void GIFRaster::Data::ClearTable()
+{
+	for(int i = 0, n = 1 << start_bpp; i < n; i++) {
+		Item& item = items[i];
+		item.character = i;
+		item.length = 1;
+		item.prefix = 0;
+	}
+	item_count = (1 << start_bpp);
+	items[item_count++].length = -1;
+	items[item_count++].length = -2;
+	old_code = -1;
+	old_bits = start_bpp;
+	max_bit_count = 1 << old_bits;
+	while(item_count > max_bit_count) {
+		old_bits++;
+		max_bit_count <<= 1;
+	}
+}
+
+bool GIFRaster::Data::FetchDataBlock()
+{
+//	TIMING("GifEncoder::FetchDataBlock");
+
+	int count = stream.Term();
+	if(count <= 0)
+		return false;
+	stream.Get();
+	if(!stream.GetAll(data_block, count))
+		return false;
+	data_ptr = data_block;
+	data_end = data_ptr + count;
+	return true;
+}
+
+bool GIFRaster::Data::Fetch(byte *&cptr, const byte *cend)
+{
+//	TIMING("GifEncoder::Fetch");
+	byte *cp = cptr;
+	byte _old_shift = old_shift;
+	byte _old_bits = old_bits;
+	byte *_data_ptr = data_ptr;
+	byte *_data_end = data_end;
+	dword _old_byte = old_byte;
+	while(cp < cend) {
+//		static TimingInspector ti("Fetch-Get");
+//		ti.Start();
+		int code;
+		if(_old_shift + _old_bits <= 8) {
+			code = (_old_byte >> _old_shift) & ((1 << _old_bits) - 1);
+			_old_shift += _old_bits;
+		}
+		else {
+			if(_data_ptr >= _data_end) {
+				if(!FetchDataBlock()) {
+//					ti.End();
+					cptr = cp;
+					return false;
+				}
+				_data_ptr = data_ptr;
+				_data_end = data_end;
+			}
+			_old_byte |= *_data_ptr++ << 8;
+			if(_old_shift + _old_bits <= 16) {
+				code = (_old_byte >> _old_shift) & ((1 << _old_bits) - 1);
+				_old_shift += _old_bits - 8;
+				_old_byte >>= 8;
+			}
+			else {
+				if(_data_ptr >= _data_end) {
+					if(!FetchDataBlock()) {
+//						ti.End();
+						cptr = cp;
+						return false;
+					}
+					_data_ptr = data_ptr;
+					_data_end = data_end;
+				}
+				_old_byte |= *_data_ptr++ << 16;
+				ASSERT(_old_shift + _old_bits <= 24);
+				code = (_old_byte >> _old_shift) & ((1 << _old_bits) - 1);
+				_old_shift += _old_bits - 16;
+				_old_byte >>= 16;
+			}
+		}
+//		ti.End();
+
+		if(code < item_count) {
+//			TIMING("Fetch-existing code");
+			const Item& item = items[code];
+			if(item.length < 0)
+				if(item.length == -1) {
+					ClearTable();
+					_old_bits = old_bits;
+				}
+				else {
+					cptr = cp;
+					return false; // end of stream
+				}
+			else { // copy new pixels to output
+				byte *p = (cp += item.length);
+				byte first;
+				const Item *i = &item;
+				*--p = i->character;
+				int left = item.length;
+				if(--left > 0) {
+					for(; left >= 8; p -= 8, left -= 8) {
+						p[-1] = (i = i->prefix)->character;
+						p[-2] = (i = i->prefix)->character;
+						p[-3] = (i = i->prefix)->character;
+						p[-4] = (i = i->prefix)->character;
+						p[-5] = (i = i->prefix)->character;
+						p[-6] = (i = i->prefix)->character;
+						p[-7] = (i = i->prefix)->character;
+						p[-8] = (i = i->prefix)->character;
+					}
+					if(left & 4) {
+						p[-1] = (i = i->prefix)->character;
+						p[-2] = (i = i->prefix)->character;
+						p[-3] = (i = i->prefix)->character;
+						p[-4] = (i = i->prefix)->character;
+						p -= 4;
+					}
+					if(left & 2) {
+						p[-1] = (i = i->prefix)->character;
+						p[-2] = (i = i->prefix)->character;
+						p -= 2;
+					}
+					if(left & 1)
+						p[-1] = (i = i->prefix)->character;
+				}
+				first = i->character;
+//*/
+//				while(i->prefix)
+//					*--p = (i = i->prefix)->character;
+				if(old_code >= 0 && item_count < MAX_COUNT) { // add to string table
+					Item& item = items[item_count++];
+					item.character = first;
+					item.prefix = &items[old_code];
+					item.length = item.prefix->length + 1;
+				}
+				if(item_count >= max_bit_count && item_count < MAX_COUNT) {
+					max_bit_count <<= 1;
+					++_old_bits;
+				}
+				old_code = code;
+				old_first = first;
+			}
+		}
+		else { // special case: duplicate first character of old_code
+//			TIMING("Fetch-new code");
+			if(old_code < 0 || code > item_count) { // decoder error
+				stream.SetError();
+				cptr = cp;
+				return false;
+			}
+			ASSERT(item_count < MAX_COUNT);
+			Item& item = items[item_count++];
+			item.prefix = &items[old_code];
+			item.length = item.prefix->length + 1;
+			item.character = old_first;
+			const Item *i = &item;
+			byte *p = (cp += item.length);
+			*--p = i->character;
+			while(i->prefix)
+				*--p = (i = i->prefix)->character;
+			if(item_count >= max_bit_count && item_count < MAX_COUNT) {
+				max_bit_count <<= 1;
+				++_old_bits;
+			}
+			old_code = code;
+		}
+	}
+	cptr = cp;
+	old_shift = _old_shift;
+	old_bits = _old_bits;
+	data_ptr = _data_ptr;
+	data_end = _data_end;
+	old_byte = _old_byte;
+	return true;
+}
+
+bool GIFRaster::Data::LoadSubimage(int& transparent_index)
+{
+//	TIMING("GifEncoder::LoadSubimage");
+	GifLocalInfo l;
+	if(!l.Load(stream))
+		return false;
+
+	if(l.transparent >= 0)
+		transparent_index = l.transparent;
+
+	if(l.x + l.width > size.cx || l.y + l.height > size.cy)
+		return false; // out of bitmap rectangle
+
+	// ignore LCT
+	stream.Seek(l.dat_fpos);
+
+	if((start_bpp = stream.Get()) <= 0 || start_bpp > 12)
+		return false;
+
+	data_ptr = data_end = data_block; // empty data block
+	old_shift = 8;
+	old_byte = 0;
+	ClearTable();
+
+	int cache = max(size.cx, 1000);
+	Buffer<byte> data(cache + MAX_COUNT);
+	bool more = true;
+	byte *data_ptr = data, *data_end = data;
+	int pass = 0;
+	for(int y = 0; y < size.cy;) {
+		if(more && data_ptr + size.cx > data_end) { // fetch more data
+			if(data_end > data_ptr)
+				Copy((byte *)data, data_ptr, data_end);
+			data_end -= (data_ptr - data);
+			data_ptr = data;
+			more = Fetch(data_end, data + cache);
+		}
+		int avail = min(size.cx, (int)intptr_t(data_end - data_ptr));
+		if(avail == 0)
+			break;
+		byte *wrt = &temp[y * size.cx];
+		memcpy(wrt, data_ptr, avail);
+		data_ptr += avail;
+		if(l.interlace)
+			switch(pass) {
+			case 0: if((y += 8) < size.cy) break; y = 4 - 8; pass++;
+			case 1: if((y += 8) < size.cy) break; y = 2 - 4; pass++;
+			case 2: if((y += 4) < size.cy) break; y = 1 - 2; pass++;
+			case 3: y += 2; break;
+			}
+		else
+			y++;
+	}
+	while(FetchDataBlock()) // flush remaining data blocks
+		;
+	stream.Get(); // fetch terminating empty subblock
+	return true;
+}
+
+bool GIFRaster::Data::Create()
+{
+	stream % ggi;
+	if(stream.IsError() || ggi.width <= 0 || ggi.height <= 0)
+		return false;
+	size.cx = ggi.width;
+	size.cy = ggi.height;
+	info.bpp = 8;
+	info.colors = ggi.gct_recs;
+	info.dots = size;
+	info.hotspot = Null;
+	info.kind = IMAGE_UNKNOWN;
+	temp.Clear();
+	first_row = true;
+
+	stream.Seek(ggi.gct_fpos);
+	for(int i = 0; i < ggi.gct_recs; i++) {
+		palette[i].r = stream.Get();
+		palette[i].g = stream.Get();
+		palette[i].b = stream.Get();
+		palette[i].a = 255;
+	}
+	format.Set8();
+	return true;
+}
+
+Raster::Line GIFRaster::Data::GetLine(int line)
+{
+	if(first_row) {
+		first_row = false;
+		temp.SetCount(size.cx * size.cy, 0);
+
+		stream.Seek(ggi.loc_fpos);
+		int transparent_index = -1;
+		while(LoadSubimage(transparent_index))
+			;
+		if(stream.Term() == 0x3B)
+			stream.Get();
+
+		if(transparent_index >= 0 && transparent_index < 256)
+			palette[transparent_index] = RGBAZero();
+	}
+	return Raster::Line(&temp[size.cx * line], &owner, false);
+}
+
+GIFRaster::GIFRaster()
+{
+}
+
+GIFRaster::~GIFRaster()
+{
+}
+
+bool GIFRaster::Create()
+{
+	data = new Data(*this, GetStream());
+	return data->Create();
+}
+
+Size GIFRaster::GetSize()
+{
+	return data->size;
+}
+
+Raster::Info GIFRaster::GetInfo()
+{
+	return data->info;
+}
+
+Raster::Line GIFRaster::GetLine(int line)
+{
+	return data->GetLine(line);
+}
+
+const RasterFormat *GIFRaster::GetFormat()
+{
+	return data->GetFormat();
+}
+
+int GIFRaster::GetPaletteCount()
+{
+	return data->GetPaletteCount();
+}
+
+RGBA *GIFRaster::GetPalette()
+{
+	return data->GetPalette();
+}
+
+class GIFEncoder::Data {
+public:
+	Data(Stream& stream, RasterFormat& format);
+	~Data();
+
+	void Start(Size sz, bool ignore_alpha, String comment, const RGBA *palette);
+	void WriteLineRaw(const byte *s);
+
+private:
+	void FlushDataBlock();
+	void ClearTable();
+
+private:
+	static const int MAX_BITS = 12;
+	static const int MAX_COUNT = 1 << MAX_BITS;
+	static const int HASH_COUNT = 5331;
+
+	RasterFormat&    format;
+	Stream& stream;
+
+	struct Item {
+		union {
+			const Item *prefix;
+			Item       *child;
+		};
+		Item       *left, *right;
+		short       length;
+		byte        character;
+	};
+
+	Item              items[MAX_COUNT];
+	int               item_count;
+	int               start_bpp;
+	byte              data_block[256];
+	byte             *data_ptr;
+	byte             *data_end;
+	int               old_code;
+	int               old_bits;
+	int               max_bit_count;
+
+	int               _old_shift;
+	int               _old_byte;
+	int               _old_bits;
+	int               restart_code;
+
+	Size              size;
+	int               ypos;
+
+	Item              *i;
+	Item              *p;
+	Item              *new_item;
+};
+
+GIFEncoder::Data::Data(Stream& stream, RasterFormat& format)
+: format(format), stream(stream)
+{
+}
+
+GIFEncoder::Data::~Data()
+{
+}
+
+void GIFEncoder::Data::FlushDataBlock()
+{
+//	TIMING("GifEncoder::FlushDataBlock");
+
+	int count = data_ptr - data_block;
+	if(count) {
+		ASSERT(count <= 255);
+		stream.Put(count);
+		stream.Put(data_block, count);
+		data_ptr = data_block;
+	}
+}
+
+void GIFEncoder::Data::ClearTable()
+{
+	for(int i = 0, n = 1 << start_bpp; i < n; i++) {
+		Item& item = items[i];
+		item.character = i;
+		item.length = 1;
+		item.left = item.right = item.child = 0;
+	}
+	item_count = (1 << start_bpp);
+	items[item_count++].length = -1;
+	items[item_count++].length = -2;
+	old_code = -1;
+	old_bits = start_bpp;
+	max_bit_count = 1 << old_bits;
+	while(item_count > max_bit_count) {
+		old_bits++;
+		max_bit_count <<= 1;
+	}
+}
+
+void GIFEncoder::Data::Start(Size sz, bool ignore_alpha, String comment, const RGBA *palette)
+{
+	size = sz;
+	format.Set8();
+
+	int transparent_index = -1;
+	if(!ignore_alpha)
+		transparent_index = 255;
+	start_bpp = 8;
+//	for(start_bpp = 1; start_bpp < 8 && raw_image->pixel.palette.GetCount() > (1 << start_bpp); start_bpp++)
+//		;
+
+	GifGlobalInfo g;
+	memcpy(g.tag, !IsNull(comment) ? "GIF89a" : "GIF87a", 6);
+	g.width = sz.cx;
+	g.height = sz.cy;
+	g.flags = g.GCT_PRESENT | ((start_bpp - 1) << g.GCT_BPP_SHIFT) | (start_bpp - 1);
+//	if(optimize_palette)
+//		g.flags |= g.GCT_SORTED;
+	g.bgnd = 0;
+	g.raw_aspect = 0;
+
+	stream % g;
+ { // write palette
+		for(int i = 0, n = 1 << start_bpp; i < n; i++) {
+			RGBA rgba = (i == transparent_index ? RGBAZero() : palette[i]);
+			stream.Put(rgba.r);
+			stream.Put(rgba.g);
+			stream.Put(rgba.b);
+		}
+	}
+
+	// write comment block
+	if(!IsNull(comment)) {
+		stream.Put(0x21);
+		stream.Put(0xFE);
+		for(int t = 0, n; (n = min(comment.GetLength() - t, 255)) > 0; t += n) {
+			stream.Put(n);
+			stream.Put(comment.Begin() + t, n);
+		}
+		stream.Put(0x00);
+	}
+
+	// store transparent color index
+	if(transparent_index >= 0) {
+		stream.Put(0x21);
+		stream.Put(0xF9);
+		stream.Put(4);
+		stream.Put(1); // transparent index present
+		stream.Put16le(0); // delay time = 0
+		stream.Put(transparent_index);
+		stream.Put(0);
+	}
+
+	if(start_bpp == 1)
+		start_bpp++;
+
+	stream.Put(0x2C);
+	stream.Put16le(0);
+	stream.Put16le(0);
+	stream.Put16le(sz.cx);
+	stream.Put16le(sz.cy);
+	stream.Put(0x00); // no LCT, non-interlaced, no sort, LCT size-1 = 0
+
+	data_ptr = data_block;
+	data_end = data_ptr + 255;
+	ClearTable();
+
+	stream.Put(start_bpp); // start bits
+
+	ypos = 0;
+	_old_shift = 0;
+	_old_byte = 0;
+	_old_bits = old_bits;
+
+//	int _lsh = start_bpp, _rsh = 32 - start_bpp;
+
+//	static TimingInspector ti_put("PUT_CODE");
+
+#define PUT_CODE(code) \
+	do { \
+		/*TimingInspector::Routine r(ti_put);*/ \
+		_old_byte |= (code) << _old_shift; \
+		_old_shift += _old_bits; \
+		if(_old_shift >= 16) { \
+			if(data_ptr >= data_end) \
+				FlushDataBlock(); \
+			*data_ptr++ = _old_byte; \
+			if(data_ptr >= data_end) \
+				FlushDataBlock(); \
+			*data_ptr++ = _old_byte >>= 8; \
+			_old_byte >>= 8; \
+			_old_shift -= 16; \
+		} \
+		else if(_old_shift >= 8) { \
+			if(data_ptr >= data_end) \
+				FlushDataBlock(); \
+			*data_ptr++ = _old_byte; \
+			_old_byte >>= 8; \
+			_old_shift -= 8; \
+		} \
+	} \
+	while(false)
+
+	restart_code = 1 << start_bpp;
+	PUT_CODE(restart_code);
+
+	i = new_item = NULL;
+}
+
+void GIFEncoder::Data::WriteLineRaw(const byte *sp)
+{
+	const byte *se = sp + size.cx;
+
+	if(!i) {
+		i = &items[*sp++];
+		new_item = &items[item_count];
+		ASSERT(i >= items && i <= &items[MAX_COUNT]);
+	}
+
+	for(;;) {
+	SEEK:
+		if(sp >= se)
+			break;
+		byte c = *sp++;
+		if((i = (p = i)->child) == 0)
+			p->child = new_item;
+		else
+			for(;;) {
+				if(i->character == c)
+					goto SEEK;
+				if(c < i->character) {
+					if(i->left)
+						i = i->left;
+					else {
+						i->left = new_item;
+						break;
+					}
+				}
+				else {
+					if(i->right)
+						i = i->right;
+					else {
+						i = i->right = new_item;
+						break;
+					}
+				}
+			}
+
+		// code not found - rewind last char & output current prefix, add new code to table
+		sp--;
+		PUT_CODE(p - items);
+		if(item_count < MAX_COUNT) { // add new entry to item table
+			if(item_count >= max_bit_count) {
+				max_bit_count <<= 1;
+				_old_bits++;
+			}
+			new_item->character = c;
+			new_item->left = new_item->right = new_item->child = 0;
+			item_count++;
+		}
+		else { // restart table
+			PUT_CODE(restart_code);
+			ClearTable();
+			_old_bits = old_bits;
+		}
+
+		i = &items[*sp++];
+		new_item = &items[item_count];
+		ASSERT(i >= items && i <= &items[MAX_COUNT]);
+	}
+
+	if(++ypos >= size.cy) {
+		PUT_CODE(i - items);
+		// put terminator code & close output block
+		PUT_CODE(restart_code + 1);
+		if(_old_shift > 0) {
+			if(data_ptr >= data_end)
+				FlushDataBlock();
+			*data_ptr++ = _old_byte;
+		}
+		FlushDataBlock();
+
+		stream.Put(0x00);
+		stream.Put(0x3B);
+	}
+}
+
+GIFEncoder::GIFEncoder(bool ignore_alpha_, String comment_)
+: ignore_alpha(ignore_alpha_), comment(comment_)
+{
+}
+
+GIFEncoder::~GIFEncoder()
+{
+}
+
+int GIFEncoder::GetPaletteCount()
+{
+	return 255;
+}
+
+void GIFEncoder::Start(Size sz)
+{
+	data = new Data(GetStream(), format);
+	data->Start(sz, ignore_alpha, comment, GetPalette());
+}
+
+void GIFEncoder::WriteLineRaw(const byte *s)
+{
+	data->WriteLineRaw(s);
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/plugin/gif/init b/uppsrc/plugin/gif/init
new file mode 100644
index 000000000..863a9dd86
--- /dev/null
+++ b/uppsrc/plugin/gif/init
@@ -0,0 +1,5 @@
+#ifndef _plugin_gif_icpp_init_stub
+#define _plugin_gif_icpp_init_stub
+#include "Draw/init"
+#include "gif.icpp"
+#endif
diff --git a/uppsrc/plugin/jpg/init b/uppsrc/plugin/jpg/init
new file mode 100644
index 000000000..80b4d590b
--- /dev/null
+++ b/uppsrc/plugin/jpg/init
@@ -0,0 +1,5 @@
+#ifndef _plugin_jpg_icpp_init_stub
+#define _plugin_jpg_icpp_init_stub
+#include "Draw/init"
+#include "jpgreg.icpp"
+#endif
diff --git a/uppsrc/plugin/jpg/jpg.h b/uppsrc/plugin/jpg/jpg.h
new file mode 100644
index 000000000..8749279f7
--- /dev/null
+++ b/uppsrc/plugin/jpg/jpg.h
@@ -0,0 +1,48 @@
+#ifndef _plugin_jpg_jpg_h_
+#define _plugin_jpg_jpg_h_
+
+#include <Draw/Draw.h>
+
+
+NAMESPACE_UPP
+
+class JPGRaster : public StreamRaster {
+public:
+	class Data;
+	One<Data> data;
+
+public:
+	JPGRaster();
+	~JPGRaster();
+
+	virtual bool    Create();
+	virtual Size    GetSize();
+	virtual Info    GetInfo();
+	virtual Line    GetLine(int line);
+	virtual const RGBA *GetPalette();
+	virtual const RasterFormat *GetFormat();
+	virtual Value   GetMetaData(String id);
+	virtual void    EnumMetaData(Vector<String>& id_list);
+};
+
+class JPGEncoder : public StreamRasterEncoder {
+	class Data;
+	One<Data> data;
+
+public:
+	JPGEncoder(int quality = 50);
+	~JPGEncoder();
+
+	JPGEncoder&  Quality(int q) { quality = q; return *this; }
+
+	virtual int  GetPaletteCount();
+	virtual void Start(Size sz);
+	virtual void WriteLineRaw(const byte *s);
+
+private:
+	int          quality;
+};
+
+END_UPP_NAMESPACE
+
+#endif
diff --git a/uppsrc/plugin/jpg/jpg.upp b/uppsrc/plugin/jpg/jpg.upp
new file mode 100644
index 000000000..e90ff6256
--- /dev/null
+++ b/uppsrc/plugin/jpg/jpg.upp
@@ -0,0 +1,104 @@
+description "JPEG image file format";
+
+uses
+	Draw;
+
+file
+	jpg.h,
+	jpgupp.cpp,
+	jpgreg.icpp,
+	lib readonly separator,
+	lib\cderror.h,
+	lib\cdjpeg.c,
+	lib\cdjpeg.h,
+	lib\jcapimin.c,
+	lib\jcapistd.c,
+	lib\jccoefct.c,
+	lib\jccolor.c,
+	lib\jcdctmgr.c,
+	lib\jcdiffct.c,
+	lib\jchuff.c,
+	lib\jchuff.h,
+	lib\jcinit.c,
+	lib\jclhuff.c,
+	lib\jclossls.c,
+	lib\jclossy.c,
+	lib\jcmainct.c,
+	lib\jcmarker.c,
+	lib\jcmaster.c,
+	lib\jcodec.c,
+	lib\jcomapi.c,
+	lib\jconfig.h,
+	lib\jcparam.c,
+	lib\jcphuff.c,
+	lib\jcpred.c,
+	lib\jcprepct.c,
+	lib\jcsample.c,
+	lib\jcscale.c,
+	lib\jcshuff.c,
+	lib\jctrans.c,
+	lib\jdapimin.c,
+	lib\jdapistd.c,
+	lib\jdatadst.c,
+	lib\jdatasrc.c,
+	lib\jdcoefct.c,
+	lib\jdcolor.c,
+	lib\jdct.h,
+	lib\jddctmgr.c,
+	lib\jddiffct.c,
+	lib\jdhuff.c,
+	lib\jdhuff.h,
+	lib\jdinput.c,
+	lib\jdlhuff.c,
+	lib\jdlossls.c,
+	lib\jdlossy.c,
+	lib\jdmainct.c,
+	lib\jdmarker.c,
+	lib\jdmaster.c,
+	lib\jdmerge.c,
+	lib\jdphuff.c,
+	lib\jdpostct.c,
+	lib\jdpred.c,
+	lib\jdsample.c,
+	lib\jdscale.c,
+	lib\jdshuff.c,
+	lib\jdtrans.c,
+	lib\jerror.c,
+	lib\jerror.h,
+	lib\jfdctflt.c,
+	lib\jfdctfst.c,
+	lib\jfdctint.c,
+	lib\jidctflt.c,
+	lib\jidctfst.c,
+	lib\jidctint.c,
+	lib\jidctred.c,
+	lib\jinclude.h,
+	lib\jlossls.h,
+	lib\jlossy.h,
+	lib\jmemansi.c,
+	lib\jmemmgr.c,
+	lib\jmemsys.h,
+	lib\jmorecfg.h,
+	lib\jpegint.h,
+	lib\jpeglib.h,
+	lib\jquant1.c,
+	lib\jquant2.c,
+	lib\jutils.c,
+	lib\jversion.h,
+	lib\rdbmp.c,
+	lib\rdcolmap.c,
+	lib\rdgif.c,
+	lib\rdppm.c,
+	lib\rdrle.c,
+	lib\rdswitch.c,
+	lib\rdtarga.c,
+	lib\README,
+	lib\transupp.c,
+	lib\transupp.h,
+	lib\wrbmp.c,
+	lib\wrgif.c,
+	lib\wrppm.c,
+	lib\wrrle.c,
+	lib\wrtarga.c,
+	end readonly separator;
+
diff --git a/uppsrc/plugin/jpg/jpgreg.icpp b/uppsrc/plugin/jpg/jpgreg.icpp
new file mode 100644
index 000000000..1a3343144
--- /dev/null
+++ b/uppsrc/plugin/jpg/jpgreg.icpp
@@ -0,0 +1,9 @@
+#include "jpg.h"
+
+NAMESPACE_UPP
+
+INITBLOCK {
+	StreamRaster::Register<JPGRaster>();
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/plugin/jpg/jpgupp.cpp b/uppsrc/plugin/jpg/jpgupp.cpp
new file mode 100644
index 000000000..b3ea1ecc4
--- /dev/null
+++ b/uppsrc/plugin/jpg/jpgupp.cpp
@@ -0,0 +1,622 @@
+#include <Draw/Draw.h>
+#include <setjmp.h>
+#include "jpg.h"
+#define HAVE_BOOLEAN
+#define boolean int
+#undef FAR
+extern "C" {
+#include "lib/jinclude.h"
+#include "lib/jpeglib.h"
+#include "lib/jerror.h"
+}
+#undef XINT32
+
+
+NAMESPACE_UPP
+
+#define LLOG(x)  // LOG(x)
+
+static void NoOutput(j_common_ptr cinfo)
+{
+}
+
+enum
+{
+	STREAM_BUF_SIZE = 16384,
+	ROW_BUF_SIZE    = 16384,
+};
+
+struct jpg_stream_destination_mgr
+{
+	jpeg_destination_mgr  pub;
+	Stream               *stream;
+	JOCTET               *buffer;
+};
+
+typedef jpg_stream_destination_mgr *stream_dest_ptr;
+
+static void init_destination(j_compress_ptr cinfo)
+{
+	stream_dest_ptr dest = (stream_dest_ptr)cinfo->dest;
+	dest->buffer = (JOCTET *)
+		(*cinfo->mem->alloc_small)((j_common_ptr)cinfo, JPOOL_IMAGE,
+			STREAM_BUF_SIZE * sizeof(JOCTET));
+	dest->pub.next_output_byte = dest->buffer;
+	dest->pub.free_in_buffer = STREAM_BUF_SIZE;
+}
+
+static boolean empty_output_buffer(j_compress_ptr cinfo)
+{
+	stream_dest_ptr dest = (stream_dest_ptr)cinfo->dest;
+	dest->stream->Put(dest->buffer, STREAM_BUF_SIZE * sizeof(JOCTET));
+	dest->pub.next_output_byte = dest->buffer;
+	dest->pub.free_in_buffer = STREAM_BUF_SIZE;
+	return true;
+}
+
+static void term_destination(j_compress_ptr cinfo)
+{
+	stream_dest_ptr dest = (stream_dest_ptr)cinfo->dest;
+	size_t done = STREAM_BUF_SIZE - dest->pub.free_in_buffer;
+	if(done > 0)
+		dest->stream->Put(dest->buffer, done * sizeof(JOCTET));
+}
+
+static void jpeg_stream_dest(j_compress_ptr cinfo, Stream& stream)
+{
+	if(cinfo->dest == NULL)
+		cinfo->dest = (jpeg_destination_mgr *)
+			(*cinfo->mem->alloc_small)((j_common_ptr)cinfo, JPOOL_PERMANENT,
+				sizeof(jpg_stream_destination_mgr));
+
+	stream_dest_ptr dest = (stream_dest_ptr)cinfo->dest;
+	dest->pub.init_destination    = init_destination;
+	dest->pub.empty_output_buffer = empty_output_buffer;
+	dest->pub.term_destination    = term_destination;
+	dest->pub.next_output_byte    = NULL;
+	dest->pub.free_in_buffer      = 0;
+	dest->stream                  = &stream;
+	dest->buffer                  = NULL;
+}
+
+struct jpg_stream_source_mgr
+{
+	jpeg_source_mgr pub;
+	Stream         *stream;
+	JOCTET         *buffer;
+	bool            start_of_file;
+};
+
+typedef jpg_stream_source_mgr *stream_src_ptr;
+
+static void init_source(j_decompress_ptr cinfo)
+{
+	stream_src_ptr src = (stream_src_ptr)cinfo->src;
+	src->start_of_file = true;
+}
+
+static boolean fill_input_buffer(j_decompress_ptr cinfo)
+{
+	stream_src_ptr src = (stream_src_ptr)cinfo->src;
+	size_t nbytes = src->stream->Get(src->buffer, STREAM_BUF_SIZE * sizeof(JOCTET));
+	if(nbytes == 0)
+	{
+		if(src->start_of_file)
+			ERREXIT(cinfo, JERR_INPUT_EMPTY);
+		WARNMS(cinfo, JWRN_JPEG_EOF);
+		/* Insert a fake EOI marker */
+		src->buffer[0] = (JOCTET) 0xFF;
+		src->buffer[1] = (JOCTET) JPEG_EOI;
+		nbytes = 2;
+	}
+
+	src->pub.next_input_byte = src->buffer;
+	src->pub.bytes_in_buffer = nbytes;
+	src->start_of_file       = false;
+
+	return true;
+}
+
+static void skip_input_data(j_decompress_ptr cinfo, long num_bytes)
+{
+	stream_src_ptr src = (stream_src_ptr)cinfo->src;
+	int above = num_bytes - src->pub.bytes_in_buffer;
+	if(above < 0)
+	{ // we're still within the input buffer
+		src->pub.next_input_byte += num_bytes;
+		src->pub.bytes_in_buffer = -above;
+	}
+	else
+	{
+		src->stream->Seek(src->stream->GetPos() + above);
+		src->start_of_file = false;
+		src->pub.next_input_byte = NULL;
+		src->pub.bytes_in_buffer = 0;
+	}
+}
+
+static void term_source(j_decompress_ptr cinfo)
+{
+	stream_src_ptr src = (stream_src_ptr)cinfo->src;
+	src->pub.next_input_byte = NULL;
+	src->pub.bytes_in_buffer = 0;
+}
+
+static void jpeg_stream_src(j_decompress_ptr cinfo, Stream& stream)
+{
+	stream_src_ptr src = (stream_src_ptr)cinfo->src;
+	if(src == NULL)
+	{
+		cinfo->src = (jpeg_source_mgr *)
+			(*cinfo->mem->alloc_small)((j_common_ptr)cinfo, JPOOL_PERMANENT,
+				sizeof(jpg_stream_source_mgr));
+		src = (stream_src_ptr)cinfo->src;
+		src->buffer = (JOCTET *)(*cinfo->mem->alloc_small)((j_common_ptr)cinfo,
+			JPOOL_PERMANENT, STREAM_BUF_SIZE * sizeof(JOCTET));
+	}
+
+	src->pub.init_source       = init_source;
+	src->pub.fill_input_buffer = fill_input_buffer;
+	src->pub.skip_input_data   = skip_input_data;
+	src->pub.resync_to_restart = jpeg_resync_to_restart;
+	src->pub.term_source       = term_source;
+	src->pub.bytes_in_buffer   = 0;
+	src->pub.next_input_byte   = NULL;
+	src->stream                = &stream;
+}
+
+struct jpeg_longjmp_error_mgr : public jpeg_error_mgr {
+	jmp_buf jmpbuf;
+};
+
+static void error_exit(j_common_ptr cinfo)
+{
+	(*cinfo->err->output_message)(cinfo);
+	jpeg_longjmp_error_mgr *jlem = (jpeg_longjmp_error_mgr *)cinfo->err;
+	longjmp(jlem->jmpbuf, 1);
+}
+
+class JPGRaster::Data {
+	friend class JPGRaster;
+
+public:
+	Data(JPGRaster& owner);
+	~Data();
+
+	bool Create(Stream& stream);
+	void Construct();
+	void Free();
+	Raster::Info GetInfo();
+	Raster::Line GetLine(int line);
+	void ScanMetaData();
+	void ScanExifData(const char *begin);
+	Value GetMetaData(String id);
+	void EnumMetaData(Vector<String>& id_list);
+
+private:
+	bool Init();
+
+	int     Exif16(const char *s) { return exif_big_endian ? Peek16be(s) : Peek16le(s); }
+	int     Exif32(const char *s) { return exif_big_endian ? Peek32be(s) : Peek32le(s); }
+	double  ExifF5(const char *s);
+
+	enum IFD_TYPE { BASE_IFD, GPS_IFD };
+	int  ExifDir(const char *begin, int offset, IFD_TYPE type);
+
+private:
+	JPGRaster& owner;
+	Stream *stream;
+	int64 stream_fpos;
+
+	RasterFormat format;
+	RGBA palette[256];
+
+	VectorMap<String, Value> metadata;
+
+	struct jpeg_decompress_struct cinfo;
+	struct jpeg_longjmp_error_mgr jerr;
+
+	Size size;
+	Size dot_size;
+	int row_bytes;
+	int row_bytes_4;
+	bool finish;
+	bool exif_big_endian;
+
+	int next_line;
+};
+
+void JPGRaster::Data::Construct()
+{
+	stream = NULL;
+	size = dot_size = Null;
+	next_line = 0;
+	finish = false;
+
+	jpeg_create_decompress(&cinfo);
+}
+
+JPGRaster::Data::Data(JPGRaster& owner_)
+: owner(owner_)
+{
+	Construct();
+}
+
+void JPGRaster::Data::Free()
+{
+	if(setjmp(jerr.jmpbuf))
+		return;
+	if(finish)
+		jpeg_abort_decompress(&cinfo);
+	jpeg_destroy_decompress(&cinfo);
+}
+
+JPGRaster::Data::~Data()
+{
+	Free();
+}
+
+bool JPGRaster::Data::Create(Stream& stream_)
+{
+	stream = &stream_;
+	stream_fpos = stream->GetPos();
+	cinfo.err = jpeg_std_error(&jerr);
+	cinfo.err->output_message = &NoOutput;
+	cinfo.dct_method = JDCT_IFAST;
+	jerr.error_exit = error_exit;
+
+	return Init();
+}
+
+void JPGRaster::Data::ScanMetaData()
+{
+	if(!metadata.IsEmpty())
+		return;
+	for(jpeg_saved_marker_ptr p = cinfo.marker_list; p; p = p->next) {
+		String data(p->data, p->data_length);
+		String key;
+		if(p->marker == JPEG_COM)
+			key = "COM";
+		else if(p->marker >= JPEG_APP0 && p->marker <= JPEG_APP0 + 15) {
+			key = NFormat("APP%d", p->marker - JPEG_APP0);
+			if(p->marker == JPEG_APP0 + 1 && !memcmp(data, "Exif\0\0", 6))
+				ScanExifData(data.GetIter(6));
+		}
+		if(metadata.Find(key) >= 0) {
+			for(int i = 1;; i++) {
+				String suffix;
+				suffix << key << '$' << i;
+				if(metadata.Find(suffix) < 0) {
+					key = suffix;
+					break;
+				}
+			}
+		}
+		metadata.Add(key, data);
+	}
+}
+
+double JPGRaster::Data::ExifF5(const char *s)
+{
+	unsigned num = Exif32(s + 0);
+	unsigned den = Exif32(s + 4);
+	return num / (double)(den ? den : 1);
+}
+
+int JPGRaster::Data::ExifDir(const char *begin, int offset, IFD_TYPE type)
+{
+	const char *e = begin + offset;
+	int nitems = Exif16(e);
+//	puts(NFormat("directory %08x: %d items", dir, nitems));
+	e += 2;
+	for(int i = 0; i < nitems; i++, e += 12) {
+		int tag = Exif16(e);
+		int fmt = Exif16(e + 2);
+		int count = Exif32(e + 4);
+		static const int fmtlen[] = {
+			1, 1, 2, 4, 8, 1, 1, 2, 4, 8, 4, 8
+		};
+		int len = 0;
+		if(fmt > 0 && fmt <= __countof(fmtlen))
+			len = fmtlen[fmt - 1] * count;
+		const char *data = e + 8;
+		if(len > 4)
+			data = begin + Exif32(data);
+//		puts(NFormat("[%d]: tag %04x fmt %d, count %d, data %s",
+//			i, tag, fmt, count, BinHexEncode(data, data + len)));
+		if(type == BASE_IFD) {
+			if(tag == 0x8825) {
+				int offset = Exif32(data);
+	//			puts(NFormat("GPS IFD at %08x", offset));
+				ExifDir(begin, offset, GPS_IFD);
+			}
+		}
+		else if(type == GPS_IFD) {
+			if((tag == 2 || tag == 4) && fmt == 5 && count == 3) {
+				metadata.Add(tag == 2 ? "GPSLatitude" : "GPSLongitude",
+					ExifF5(data + 0) + ExifF5(data + 8) / 60 + ExifF5(data + 16) / 3600);
+//				puts(NFormat("GPSLatitude: %n %n %n", n1, n2, n3));
+			}
+			else if(tag == 6 && fmt == 5 && count == 1)
+				metadata.Add("GPSAltitude", ExifF5(data));
+		}
+	}
+	int nextoff = Exif32(e);
+//	puts(NFormat("next offset = %08x", nextoff));
+	return nextoff;
+}
+
+void JPGRaster::Data::ScanExifData(const char *begin)
+{
+	const char *p = begin;
+	if(p[0] == 'I' && p[1] == 'I')
+		exif_big_endian = false;
+	else if(p[0] == 'M' && p[1] == 'M')
+		exif_big_endian = true;
+	else
+		return;
+	for(int diroff = Exif32(p + 4); diroff; diroff = ExifDir(begin, diroff, BASE_IFD))
+		;
+}
+
+Value JPGRaster::Data::GetMetaData(String id)
+{
+	ScanMetaData();
+	return metadata.Get(id, Value());
+}
+
+void JPGRaster::Data::EnumMetaData(Vector<String>& id_list)
+{
+	ScanMetaData();
+	id_list <<= metadata.GetKeys();
+}
+
+bool JPGRaster::Data::Init()
+{
+	if(setjmp(jerr.jmpbuf))
+		return false;
+
+	jpeg_stream_src(&cinfo, *stream);
+	jpeg_save_markers(&cinfo, JPEG_COM, 0xFFFF);
+	for(int i = 0; i <= 15; i++)
+		jpeg_save_markers(&cinfo, JPEG_APP0 + i, 0xFFFF);
+	jpeg_read_header(&cinfo, TRUE);
+	jpeg_start_decompress(&cinfo);
+
+	switch(cinfo.output_components) {
+		case 1: {
+			format.Set8();
+			for(int i = 0; i < 256; i++) {
+				RGBA rgba;
+				rgba.r = rgba.g = rgba.b = i;
+				rgba.a = 255;
+				palette[i] = rgba;
+			}
+			break;
+		}
+		case 3: {
+			format.Set24le(0xFF, 0xFF00, 0xFF0000);
+			break;
+		}
+		default: {
+			LLOG("JPGRaster: invalid number of components: " << (int)cinfo.output_components);
+			return false;
+		}
+	}
+
+	size.cx = cinfo.output_width;
+	size.cy = cinfo.output_height;
+
+	row_bytes = cinfo.output_components * size.cx;
+	row_bytes_4 = (row_bytes + 3) & -4;
+
+	double dot_scaling = (cinfo.density_unit == 1 ? 600 : cinfo.density_unit == 2 ? 600.0 / 2.54 : 0);
+	if(dot_scaling && cinfo.X_density > 0) {
+		dot_size.cx = fround(cinfo.image_width  * dot_scaling / cinfo.X_density);
+		dot_size.cy = fround(cinfo.image_height * dot_scaling / cinfo.Y_density);
+	}
+
+	finish = true;
+	return true;
+}
+
+Raster::Info JPGRaster::Data::GetInfo()
+{
+	Raster::Info info;
+	try {
+		info.bpp = 24;
+		info.colors = 0;
+		info.dots = dot_size;
+		info.hotspot = Null;
+		info.kind = IMAGE_OPAQUE;
+	}
+	catch(Exc e) {
+		LLOG(e);
+	}
+	return info;
+}
+
+Raster::Line JPGRaster::Data::GetLine(int line)
+{
+	byte *rowbuf = new byte[row_bytes_4];
+	if(setjmp(jerr.jmpbuf))
+		return Raster::Line(rowbuf, &owner, true);
+
+	ASSERT(line >= 0 && line < size.cy);
+	if(line < next_line) {
+		stream->Seek(stream_fpos);
+		Stream *s = stream;
+		Free();
+		Construct();
+		Create(*s);
+		next_line = 0;
+		LOG("Seek back");
+	}
+	JSAMPROW rowptr[] = { (JSAMPROW)rowbuf };
+	while(next_line++ < line)
+		jpeg_read_scanlines(&cinfo, rowptr, 1);
+	jpeg_read_scanlines(&cinfo, rowptr, 1);
+	return Raster::Line(rowbuf, &owner, true);
+}
+
+JPGRaster::JPGRaster()
+{
+}
+
+JPGRaster::~JPGRaster()
+{
+}
+
+bool JPGRaster::Create()
+{
+	ASSERT(sizeof(JSAMPLE) == sizeof(byte));
+	data = new Data(*this);
+	return data->Create(GetStream());
+}
+
+Size JPGRaster::GetSize()
+{
+	return data->size;
+}
+
+Raster::Info JPGRaster::GetInfo()
+{
+	ASSERT(data);
+	Raster::Info info;
+	info.kind = IMAGE_OPAQUE;
+	if(data->cinfo.output_components == 1) {
+		info.bpp = 8;
+		info.colors = 256;
+	}
+	else {
+		info.bpp = 24;
+		info.colors = 0;
+	}
+	info.dots = data->dot_size;
+	info.hotspot = Null;
+	return info;
+}
+
+Value JPGRaster::GetMetaData(String id)
+{
+	ASSERT(data);
+	return data->GetMetaData(id);
+}
+
+void JPGRaster::EnumMetaData(Vector<String>& id_list)
+{
+	ASSERT(data);
+	data->EnumMetaData(id_list);
+}
+
+Raster::Line JPGRaster::GetLine(int line)
+{
+	ASSERT(data);
+	return data->GetLine(line);
+}
+
+const RGBA *JPGRaster::GetPalette()
+{
+	ASSERT(data);
+	return data->palette;
+}
+
+const RasterFormat *JPGRaster::GetFormat()
+{
+	ASSERT(data);
+	return &data->format;
+}
+
+class JPGEncoder::Data {
+public:
+	Data();
+	~Data();
+
+	void Start(Stream& stream, Size size, int quality);
+	void WriteLineRaw(const byte *rgba);
+
+private:
+	struct jpeg_compress_struct cinfo;
+	struct jpeg_error_mgr jerr;
+	Size size;
+	int line;
+};
+
+JPGEncoder::Data::Data()
+{
+	cinfo.err = jpeg_std_error(&jerr);
+	cinfo.err->output_message = &NoOutput;
+	jpeg_create_compress(&cinfo);
+	cinfo.dct_method = JDCT_IFAST;
+}
+
+JPGEncoder::Data::~Data()
+{
+	jpeg_destroy_compress(&cinfo);
+}
+
+void JPGEncoder::Data::Start(Stream& stream, Size size_, int quality)
+{
+	size = size_;
+
+	jpeg_stream_dest(&cinfo, stream);
+
+	cinfo.image_width = size.cx;
+	cinfo.image_height = size.cy;
+	cinfo.input_components = 3; // # of color components per pixel
+	cinfo.in_color_space = JCS_RGB; // colorspace of input image
+
+	jpeg_set_defaults(&cinfo);
+
+/*
+	if(dot_size.cx || dot_size.cy)
+	{ // set up image density
+		cinfo.density_unit = 1; // dots per inch
+		cinfo.X_density = dot_size.cx ? fround(size.cx * 600.0 / dot_size.cx) : 0;
+		cinfo.Y_density = dot_size.cy ? fround(size.cy * 600.0 / dot_size.cy) : 0;
+	}
+*/
+
+	jpeg_set_quality(&cinfo, quality, true); // limit to baseline-JPEG values
+	jpeg_start_compress(&cinfo, true);
+
+	line = 0;
+
+	ASSERT(sizeof(JSAMPLE) == sizeof(byte));
+}
+
+void JPGEncoder::Data::WriteLineRaw(const byte *s)
+{
+	JSAMPROW rowptr[] = { (byte *)s };
+	jpeg_write_scanlines(&cinfo, rowptr, 1);
+	if(++line >= size.cy)
+		jpeg_finish_compress(&cinfo);
+}
+
+JPGEncoder::JPGEncoder(int quality_)
+: quality(quality_)
+{
+	format.Set24le(0xff, 0xff00, 0xff0000);
+}
+
+JPGEncoder::~JPGEncoder()
+{
+}
+
+int JPGEncoder::GetPaletteCount()
+{
+	return 0;
+}
+
+void JPGEncoder::Start(Size sz)
+{
+	data = new Data;
+	data->Start(GetStream(), sz, quality);
+}
+
+void JPGEncoder::WriteLineRaw(const byte *s)
+{
+	data->WriteLineRaw(s);
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/plugin/jpg/lib/README b/uppsrc/plugin/jpg/lib/README
new file mode 100644
index 000000000..86cc20669
--- /dev/null
+++ b/uppsrc/plugin/jpg/lib/README
@@ -0,0 +1,385 @@
+The Independent JPEG Group's JPEG software
+==========================================
+
+README for release 6b of 27-Mar-1998
+====================================
+
+This distribution contains the sixth public release of the Independent JPEG
+Group's free JPEG software.  You are welcome to redistribute this software and
+to use it for any purpose, subject to the conditions under LEGAL ISSUES, below.
+
+Serious users of this software (particularly those incorporating it into
+larger programs) should contact IJG at jpeg-info@uunet.uu.net to be added to
+our electronic mailing list.  Mailing list members are notified of updates
+and have a chance to participate in technical discussions, etc.
+
+This software is the work of Tom Lane, Philip Gladstone, Jim Boucher,
+Lee Crocker, Julian Minguillon, Luis Ortiz, George Phillips, Davide Rossi,
+Guido Vollbeding, Ge' Weijers, and other members of the Independent JPEG
+Group.
+
+IJG is not affiliated with the official ISO JPEG standards committee.
+
+
+DOCUMENTATION ROADMAP
+=====================
+
+This file contains the following sections:
+
+OVERVIEW            General description of JPEG and the IJG software.
+LEGAL ISSUES        Copyright, lack of warranty, terms of distribution.
+REFERENCES          Where to learn more about JPEG.
+ARCHIVE LOCATIONS   Where to find newer versions of this software.
+RELATED SOFTWARE    Other stuff you should get.
+FILE FORMAT WARS    Software *not* to get.
+TO DO               Plans for future IJG releases.
+
+Other documentation files in the distribution are:
+
+User documentation:
+  install.doc       How to configure and install the IJG software.
+  usage.doc         Usage instructions for cjpeg, djpeg, jpegtran,
+                    rdjpgcom, and wrjpgcom.
+  *.1               Unix-style man pages for programs (same info as usage.doc).
+  wizard.doc        Advanced usage instructions for JPEG wizards only.
+  change.log        Version-to-version change highlights.
+Programmer and internal documentation:
+  libjpeg.doc       How to use the JPEG library in your own programs.
+  example.c         Sample code for calling the JPEG library.
+  structure.doc     Overview of the JPEG library's internal structure.
+  filelist.doc      Road map of IJG files.
+  coderules.doc     Coding style rules --- please read if you contribute code.
+
+Please read at least the files install.doc and usage.doc.  Useful information
+can also be found in the JPEG FAQ (Frequently Asked Questions) article.  See
+ARCHIVE LOCATIONS below to find out where to obtain the FAQ article.
+
+If you want to understand how the JPEG code works, we suggest reading one or
+more of the REFERENCES, then looking at the documentation files (in roughly
+the order listed) before diving into the code.
+
+
+OVERVIEW
+========
+
+This package contains C software to implement JPEG image compression and
+decompression.  JPEG (pronounced "jay-peg") is a standardized compression
+method for full-color and gray-scale images.  JPEG is intended for compressing
+"real-world" scenes; line drawings, cartoons and other non-realistic images
+are not its strong suit.  JPEG is lossy, meaning that the output image is not
+exactly identical to the input image.  Hence you must not use JPEG if you
+have to have identical output bits.  However, on typical photographic images,
+very good compression levels can be obtained with no visible change, and
+remarkably high compression levels are possible if you can tolerate a
+low-quality image.  For more details, see the references, or just experiment
+with various compression settings.
+
+This software implements JPEG baseline, extended-sequential, and progressive
+compression processes.  Provision is made for supporting all variants of these
+processes, although some uncommon parameter settings aren't implemented yet.
+For legal reasons, we are not distributing code for the arithmetic-coding
+variants of JPEG; see LEGAL ISSUES.  We have made no provision for supporting
+the hierarchical or lossless processes defined in the standard.
+
+We provide a set of library routines for reading and writing JPEG image files,
+plus two sample applications "cjpeg" and "djpeg", which use the library to
+perform conversion between JPEG and some other popular image file formats.
+The library is intended to be reused in other applications.
+
+In order to support file conversion and viewing software, we have included
+considerable functionality beyond the bare JPEG coding/decoding capability;
+for example, the color quantization modules are not strictly part of JPEG
+decoding, but they are essential for output to colormapped file formats or
+colormapped displays.  These extra functions can be compiled out of the
+library if not required for a particular application.  We have also included
+"jpegtran", a utility for lossless transcoding between different JPEG
+processes, and "rdjpgcom" and "wrjpgcom", two simple applications for
+inserting and extracting textual comments in JFIF files.
+
+The emphasis in designing this software has been on achieving portability and
+flexibility, while also making it fast enough to be useful.  In particular,
+the software is not intended to be read as a tutorial on JPEG.  (See the
+REFERENCES section for introductory material.)  Rather, it is intended to
+be reliable, portable, industrial-strength code.  We do not claim to have
+achieved that goal in every aspect of the software, but we strive for it.
+
+We welcome the use of this software as a component of commercial products.
+No royalty is required, but we do ask for an acknowledgement in product
+documentation, as described under LEGAL ISSUES.
+
+
+LEGAL ISSUES
+============
+
+In plain English:
+
+1. We don't promise that this software works.  (But if you find any bugs,
+   please let us know!)
+2. You can use this software for whatever you want.  You don't have to pay us.
+3. You may not pretend that you wrote this software.  If you use it in a
+   program, you must acknowledge somewhere in your documentation that
+   you've used the IJG code.
+
+In legalese:
+
+The authors make NO WARRANTY or representation, either express or implied,
+with respect to this software, its quality, accuracy, merchantability, or
+fitness for a particular purpose.  This software is provided "AS IS", and you,
+its user, assume the entire risk as to its quality and accuracy.
+
+This software is copyright (C) 1991-1998, Thomas G. Lane.
+All Rights Reserved except as specified below.
+
+Permission is hereby granted to use, copy, modify, and distribute this
+software (or portions thereof) for any purpose, without fee, subject to these
+conditions:
+(1) If any part of the source code for this software is distributed, then this
+README file must be included, with this copyright and no-warranty notice
+unaltered; and any additions, deletions, or changes to the original files
+must be clearly indicated in accompanying documentation.
+(2) If only executable code is distributed, then the accompanying
+documentation must state that "this software is based in part on the work of
+the Independent JPEG Group".
+(3) Permission for use of this software is granted only if the user accepts
+full responsibility for any undesirable consequences; the authors accept
+NO LIABILITY for damages of any kind.
+
+These conditions apply to any software derived from or based on the IJG code,
+not just to the unmodified library.  If you use our work, you ought to
+acknowledge us.
+
+Permission is NOT granted for the use of any IJG author's name or company name
+in advertising or publicity relating to this software or products derived from
+it.  This software may be referred to only as "the Independent JPEG Group's
+software".
+
+We specifically permit and encourage the use of this software as the basis of
+commercial products, provided that all warranty or liability claims are
+assumed by the product vendor.
+
+
+ansi2knr.c is included in this distribution by permission of L. Peter Deutsch,
+sole proprietor of its copyright holder, Aladdin Enterprises of Menlo Park, CA.
+ansi2knr.c is NOT covered by the above copyright and conditions, but instead
+by the usual distribution terms of the Free Software Foundation; principally,
+that you must include source code if you redistribute it.  (See the file
+ansi2knr.c for full details.)  However, since ansi2knr.c is not needed as part
+of any program generated from the IJG code, this does not limit you more than
+the foregoing paragraphs do.
+
+The Unix configuration script "configure" was produced with GNU Autoconf.
+It is copyright by the Free Software Foundation but is freely distributable.
+The same holds for its supporting scripts (config.guess, config.sub,
+ltconfig, ltmain.sh).  Another support script, install-sh, is copyright
+by M.I.T. but is also freely distributable.
+
+It appears that the arithmetic coding option of the JPEG spec is covered by
+patents owned by IBM, AT&T, and Mitsubishi.  Hence arithmetic coding cannot
+legally be used without obtaining one or more licenses.  For this reason,
+support for arithmetic coding has been removed from the free JPEG software.
+(Since arithmetic coding provides only a marginal gain over the unpatented
+Huffman mode, it is unlikely that very many implementations will support it.)
+So far as we are aware, there are no patent restrictions on the remaining
+code.
+
+The IJG distribution formerly included code to read and write GIF files.
+To avoid entanglement with the Unisys LZW patent, GIF reading support has
+been removed altogether, and the GIF writer has been simplified to produce
+"uncompressed GIFs".  This technique does not use the LZW algorithm; the
+resulting GIF files are larger than usual, but are readable by all standard
+GIF decoders.
+
+We are required to state that
+    "The Graphics Interchange Format(c) is the Copyright property of
+    CompuServe Incorporated.  GIF(sm) is a Service Mark property of
+    CompuServe Incorporated."
+
+
+REFERENCES
+==========
+
+We highly recommend reading one or more of these references before trying to
+understand the innards of the JPEG software.
+
+The best short technical introduction to the JPEG compression algorithm is
+	Wallace, Gregory K.  "The JPEG Still Picture Compression Standard",
+	Communications of the ACM, April 1991 (vol. 34 no. 4), pp. 30-44.
+(Adjacent articles in that issue discuss MPEG motion picture compression,
+applications of JPEG, and related topics.)  If you don't have the CACM issue
+handy, a PostScript file containing a revised version of Wallace's article is
+available at ftp://ftp.uu.net/graphics/jpeg/wallace.ps.gz.  The file (actually
+a preprint for an article that appeared in IEEE Trans. Consumer Electronics)
+omits the sample images that appeared in CACM, but it includes corrections
+and some added material.  Note: the Wallace article is copyright ACM and IEEE,
+and it may not be used for commercial purposes.
+
+A somewhat less technical, more leisurely introduction to JPEG can be found in
+"The Data Compression Book" by Mark Nelson and Jean-loup Gailly, published by
+M&T Books (New York), 2nd ed. 1996, ISBN 1-55851-434-1.  This book provides
+good explanations and example C code for a multitude of compression methods
+including JPEG.  It is an excellent source if you are comfortable reading C
+code but don't know much about data compression in general.  The book's JPEG
+sample code is far from industrial-strength, but when you are ready to look
+at a full implementation, you've got one here...
+
+The best full description of JPEG is the textbook "JPEG Still Image Data
+Compression Standard" by William B. Pennebaker and Joan L. Mitchell, published
+by Van Nostrand Reinhold, 1993, ISBN 0-442-01272-1.  Price US$59.95, 638 pp.
+The book includes the complete text of the ISO JPEG standards (DIS 10918-1
+and draft DIS 10918-2).  This is by far the most complete exposition of JPEG
+in existence, and we highly recommend it.
+
+The JPEG standard itself is not available electronically; you must order a
+paper copy through ISO or ITU.  (Unless you feel a need to own a certified
+official copy, we recommend buying the Pennebaker and Mitchell book instead;
+it's much cheaper and includes a great deal of useful explanatory material.)
+In the USA, copies of the standard may be ordered from ANSI Sales at (212)
+642-4900, or from Global Engineering Documents at (800) 854-7179.  (ANSI
+doesn't take credit card orders, but Global does.)  It's not cheap: as of
+1992, ANSI was charging $95 for Part 1 and $47 for Part 2, plus 7%
+shipping/handling.  The standard is divided into two parts, Part 1 being the
+actual specification, while Part 2 covers compliance testing methods.  Part 1
+is titled "Digital Compression and Coding of Continuous-tone Still Images,
+Part 1: Requirements and guidelines" and has document numbers ISO/IEC IS
+10918-1, ITU-T T.81.  Part 2 is titled "Digital Compression and Coding of
+Continuous-tone Still Images, Part 2: Compliance testing" and has document
+numbers ISO/IEC IS 10918-2, ITU-T T.83.
+
+Some extensions to the original JPEG standard are defined in JPEG Part 3,
+a newer ISO standard numbered ISO/IEC IS 10918-3 and ITU-T T.84.  IJG
+currently does not support any Part 3 extensions.
+
+The JPEG standard does not specify all details of an interchangeable file
+format.  For the omitted details we follow the "JFIF" conventions, revision
+1.02.  A copy of the JFIF spec is available from:
+	Literature Department
+	C-Cube Microsystems, Inc.
+	1778 McCarthy Blvd.
+	Milpitas, CA 95035
+	phone (408) 944-6300,  fax (408) 944-6314
+A PostScript version of this document is available by FTP at
+ftp://ftp.uu.net/graphics/jpeg/jfif.ps.gz.  There is also a plain text
+version at ftp://ftp.uu.net/graphics/jpeg/jfif.txt.gz, but it is missing
+the figures.
+
+The TIFF 6.0 file format specification can be obtained by FTP from
+ftp://ftp.sgi.com/graphics/tiff/TIFF6.ps.gz.  The JPEG incorporation scheme
+found in the TIFF 6.0 spec of 3-June-92 has a number of serious problems.
+IJG does not recommend use of the TIFF 6.0 design (TIFF Compression tag 6).
+Instead, we recommend the JPEG design proposed by TIFF Technical Note #2
+(Compression tag 7).  Copies of this Note can be obtained from ftp.sgi.com or
+from ftp://ftp.uu.net/graphics/jpeg/.  It is expected that the next revision
+of the TIFF spec will replace the 6.0 JPEG design with the Note's design.
+Although IJG's own code does not support TIFF/JPEG, the free libtiff library
+uses our library to implement TIFF/JPEG per the Note.  libtiff is available
+from ftp://ftp.sgi.com/graphics/tiff/.
+
+
+ARCHIVE LOCATIONS
+=================
+
+The "official" archive site for this software is ftp.uu.net (Internet
+address 192.48.96.9).  The most recent released version can always be found
+there in directory graphics/jpeg.  This particular version will be archived
+as ftp://ftp.uu.net/graphics/jpeg/jpegsrc.v6b.tar.gz.  If you don't have
+direct Internet access, UUNET's archives are also available via UUCP; contact
+help@uunet.uu.net for information on retrieving files that way.
+
+Numerous Internet sites maintain copies of the UUNET files.  However, only
+ftp.uu.net is guaranteed to have the latest official version.
+
+You can also obtain this software in DOS-compatible "zip" archive format from
+the SimTel archives (ftp://ftp.simtel.net/pub/simtelnet/msdos/graphics/), or
+on CompuServe in the Graphics Support forum (GO CIS:GRAPHSUP), library 12
+"JPEG Tools".  Again, these versions may sometimes lag behind the ftp.uu.net
+release.
+
+The JPEG FAQ (Frequently Asked Questions) article is a useful source of
+general information about JPEG.  It is updated constantly and therefore is
+not included in this distribution.  The FAQ is posted every two weeks to
+Usenet newsgroups comp.graphics.misc, news.answers, and other groups.
+It is available on the World Wide Web at http://www.faqs.org/faqs/jpeg-faq/
+and other news.answers archive sites, including the official news.answers
+archive at rtfm.mit.edu: ftp://rtfm.mit.edu/pub/usenet/news.answers/jpeg-faq/.
+If you don't have Web or FTP access, send e-mail to mail-server@rtfm.mit.edu
+with body
+	send usenet/news.answers/jpeg-faq/part1
+	send usenet/news.answers/jpeg-faq/part2
+
+
+RELATED SOFTWARE
+================
+
+Numerous viewing and image manipulation programs now support JPEG.  (Quite a
+few of them use this library to do so.)  The JPEG FAQ described above lists
+some of the more popular free and shareware viewers, and tells where to
+obtain them on Internet.
+
+If you are on a Unix machine, we highly recommend Jef Poskanzer's free
+PBMPLUS software, which provides many useful operations on PPM-format image
+files.  In particular, it can convert PPM images to and from a wide range of
+other formats, thus making cjpeg/djpeg considerably more useful.  The latest
+version is distributed by the NetPBM group, and is available from numerous
+sites, notably ftp://wuarchive.wustl.edu/graphics/graphics/packages/NetPBM/.
+Unfortunately PBMPLUS/NETPBM is not nearly as portable as the IJG software is;
+you are likely to have difficulty making it work on any non-Unix machine.
+
+A different free JPEG implementation, written by the PVRG group at Stanford,
+is available from ftp://havefun.stanford.edu/pub/jpeg/.  This program
+is designed for research and experimentation rather than production use;
+it is slower, harder to use, and less portable than the IJG code, but it
+is easier to read and modify.  Also, the PVRG code supports lossless JPEG,
+which we do not.  (On the other hand, it doesn't do progressive JPEG.)
+
+
+FILE FORMAT WARS
+================
+
+Some JPEG programs produce files that are not compatible with our library.
+The root of the problem is that the ISO JPEG committee failed to specify a
+concrete file format.  Some vendors "filled in the blanks" on their own,
+creating proprietary formats that no one else could read.  (For example, none
+of the early commercial JPEG implementations for the Macintosh were able to
+exchange compressed files.)
+
+The file format we have adopted is called JFIF (see REFERENCES).  This format
+has been agreed to by a number of major commercial JPEG vendors, and it has
+become the de facto standard.  JFIF is a minimal or "low end" representation.
+We recommend the use of TIFF/JPEG (TIFF revision 6.0 as modified by TIFF
+Technical Note #2) for "high end" applications that need to record a lot of
+additional data about an image.  TIFF/JPEG is fairly new and not yet widely
+supported, unfortunately.
+
+The upcoming JPEG Part 3 standard defines a file format called SPIFF.
+SPIFF is interoperable with JFIF, in the sense that most JFIF decoders should
+be able to read the most common variant of SPIFF.  SPIFF has some technical
+advantages over JFIF, but its major claim to fame is simply that it is an
+official standard rather than an informal one.  At this point it is unclear
+whether SPIFF will supersede JFIF or whether JFIF will remain the de-facto
+standard.  IJG intends to support SPIFF once the standard is frozen, but we
+have not decided whether it should become our default output format or not.
+(In any case, our decoder will remain capable of reading JFIF indefinitely.)
+
+Various proprietary file formats incorporating JPEG compression also exist.
+We have little or no sympathy for the existence of these formats.  Indeed,
+one of the original reasons for developing this free software was to help
+force convergence on common, open format standards for JPEG files.  Don't
+use a proprietary file format!
+
+
+TO DO
+=====
+
+The major thrust for v7 will probably be improvement of visual quality.
+The current method for scaling the quantization tables is known not to be
+very good at low Q values.  We also intend to investigate block boundary
+smoothing, "poor man's variable quantization", and other means of improving
+quality-vs-file-size performance without sacrificing compatibility.
+
+In future versions, we are considering supporting some of the upcoming JPEG
+Part 3 extensions --- principally, variable quantization and the SPIFF file
+format.
+
+As always, speeding things up is of great interest.
+
+Please send bug reports, offers of help, etc. to jpeg-info@uunet.uu.net.
diff --git a/uppsrc/plugin/jpg/lib/ansi2knr.c b/uppsrc/plugin/jpg/lib/ansi2knr.c
new file mode 100644
index 000000000..4e05fc2d3
--- /dev/null
+++ b/uppsrc/plugin/jpg/lib/ansi2knr.c
@@ -0,0 +1,693 @@
+/* ansi2knr.c */
+/* Convert ANSI C function definitions to K&R ("traditional C") syntax */
+
+/*
+ansi2knr is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY.  No author or distributor accepts responsibility to anyone for the
+consequences of using it or for whether it serves any particular purpose or
+works at all, unless he says so in writing.  Refer to the GNU General Public
+License (the "GPL") for full details.
+
+Everyone is granted permission to copy, modify and redistribute ansi2knr,
+but only under the conditions described in the GPL.  A copy of this license
+is supposed to have been given to you along with ansi2knr so you can know
+your rights and responsibilities.  It should be in a file named COPYLEFT.
+[In the IJG distribution, the GPL appears below, not in a separate file.]
+Among other things, the copyright notice and this notice must be preserved
+on all copies.
+
+We explicitly state here what we believe is already implied by the GPL: if
+the ansi2knr program is distributed as a separate set of sources and a
+separate executable file which are aggregated on a storage medium together
+with another program, this in itself does not bring the other program under
+the GPL, nor does the mere fact that such a program or the procedures for
+constructing it invoke the ansi2knr executable bring any other part of the
+program under the GPL.
+*/
+
+/*
+---------- Here is the GNU GPL file COPYLEFT, referred to above ----------
+----- These terms do NOT apply to the JPEG software itself; see README ------
+
+		    GHOSTSCRIPT GENERAL PUBLIC LICENSE
+		    (Clarified 11 Feb 1988)
+
+ Copyright (C) 1988 Richard M. Stallman
+ Everyone is permitted to copy and distribute verbatim copies of this
+ license, but changing it is not allowed.  You can also use this wording
+ to make the terms for other programs.
+
+  The license agreements of most software companies keep you at the
+mercy of those companies.  By contrast, our general public license is
+intended to give everyone the right to share Ghostscript.  To make sure
+that you get the rights we want you to have, we need to make
+restrictions that forbid anyone to deny you these rights or to ask you
+to surrender the rights.  Hence this license agreement.
+
+  Specifically, we want to make sure that you have the right to give
+away copies of Ghostscript, that you receive source code or else can get
+it if you want it, that you can change Ghostscript or use pieces of it
+in new free programs, and that you know you can do these things.
+
+  To make sure that everyone has such rights, we have to forbid you to
+deprive anyone else of these rights.  For example, if you distribute
+copies of Ghostscript, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must tell them their rights.
+
+  Also, for our own protection, we must make certain that everyone finds
+out that there is no warranty for Ghostscript.  If Ghostscript is
+modified by someone else and passed on, we want its recipients to know
+that what they have is not what we distributed, so that any problems
+introduced by others will not reflect on our reputation.
+
+  Therefore we (Richard M. Stallman and the Free Software Foundation,
+Inc.) make the following terms which say what you must do to be allowed
+to distribute or change Ghostscript.
+
+
+			COPYING POLICIES
+
+  1. You may copy and distribute verbatim copies of Ghostscript source
+code as you receive it, in any medium, provided that you conspicuously
+and appropriately publish on each copy a valid copyright and license
+notice "Copyright (C) 1989 Aladdin Enterprises.  All rights reserved.
+Distributed by Free Software Foundation, Inc." (or with whatever year is
+appropriate); keep intact the notices on all files that refer to this
+License Agreement and to the absence of any warranty; and give any other
+recipients of the Ghostscript program a copy of this License Agreement
+along with the program.  You may charge a distribution fee for the
+physical act of transferring a copy.
+
+  2. You may modify your copy or copies of Ghostscript or any portion of
+it, and copy and distribute such modifications under the terms of
+Paragraph 1 above, provided that you also do the following:
+
+    a) cause the modified files to carry prominent notices stating
+    that you changed the files and the date of any change; and
+
+    b) cause the whole of any work that you distribute or publish,
+    that in whole or in part contains or is a derivative of Ghostscript
+    or any part thereof, to be licensed at no charge to all third
+    parties on terms identical to those contained in this License
+    Agreement (except that you may choose to grant more extensive
+    warranty protection to some or all third parties, at your option).
+
+    c) You may charge a distribution fee for the physical act of
+    transferring a copy, and you may at your option offer warranty
+    protection in exchange for a fee.
+
+Mere aggregation of another unrelated program with this program (or its
+derivative) on a volume of a storage or distribution medium does not bring
+the other program under the scope of these terms.
+
+  3. You may copy and distribute Ghostscript (or a portion or derivative
+of it, under Paragraph 2) in object code or executable form under the
+terms of Paragraphs 1 and 2 above provided that you also do one of the
+following:
+
+    a) accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of
+    Paragraphs 1 and 2 above; or,
+
+    b) accompany it with a written offer, valid for at least three
+    years, to give any third party free (except for a nominal
+    shipping charge) a complete machine-readable copy of the
+    corresponding source code, to be distributed under the terms of
+    Paragraphs 1 and 2 above; or,
+
+    c) accompany it with the information you received as to where the
+    corresponding source code may be obtained.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form alone.)
+
+For an executable file, complete source code means all the source code for
+all modules it contains; but, as a special exception, it need not include
+source code for modules which are standard libraries that accompany the
+operating system on which the executable file runs.
+
+  4. You may not copy, sublicense, distribute or transfer Ghostscript
+except as expressly provided under this License Agreement.  Any attempt
+otherwise to copy, sublicense, distribute or transfer Ghostscript is
+void and your rights to use the program under this License agreement
+shall be automatically terminated.  However, parties who have received
+computer software programs from you with this License Agreement will not
+have their licenses terminated so long as such parties remain in full
+compliance.
+
+  5. If you wish to incorporate parts of Ghostscript into other free
+programs whose distribution conditions are different, write to the Free
+Software Foundation at 675 Mass Ave, Cambridge, MA 02139.  We have not
+yet worked out a simple rule that can be stated here, but we will often
+permit this.  We will be guided by the two goals of preserving the free
+status of all derivatives of our free software and of promoting the
+sharing and reuse of software.
+
+Your comments and suggestions about our licensing policies and our
+software are welcome!  Please contact the Free Software Foundation,
+Inc., 675 Mass Ave, Cambridge, MA 02139, or call (617) 876-3296.
+
+		       NO WARRANTY
+
+  BECAUSE GHOSTSCRIPT IS LICENSED FREE OF CHARGE, WE PROVIDE ABSOLUTELY
+NO WARRANTY, TO THE EXTENT PERMITTED BY APPLICABLE STATE LAW.  EXCEPT
+WHEN OTHERWISE STATED IN WRITING, FREE SOFTWARE FOUNDATION, INC, RICHARD
+M. STALLMAN, ALADDIN ENTERPRISES, L. PETER DEUTSCH, AND/OR OTHER PARTIES
+PROVIDE GHOSTSCRIPT "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER
+EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE
+ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF GHOSTSCRIPT IS WITH
+YOU.  SHOULD GHOSTSCRIPT PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL
+NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW WILL RICHARD M.
+STALLMAN, THE FREE SOFTWARE FOUNDATION, INC., L. PETER DEUTSCH, ALADDIN
+ENTERPRISES, AND/OR ANY OTHER PARTY WHO MAY MODIFY AND REDISTRIBUTE
+GHOSTSCRIPT AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING
+ANY LOST PROFITS, LOST MONIES, OR OTHER SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE
+(INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED
+INACCURATE OR LOSSES SUSTAINED BY THIRD PARTIES OR A FAILURE OF THE
+PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS) GHOSTSCRIPT, EVEN IF YOU
+HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES, OR FOR ANY CLAIM
+BY ANY OTHER PARTY.
+
+-------------------- End of file COPYLEFT ------------------------------
+*/
+
+/*
+ * Usage:
+	ansi2knr input_file [output_file]
+ * If no output_file is supplied, output goes to stdout.
+ * There are no error messages.
+ *
+ * ansi2knr recognizes function definitions by seeing a non-keyword
+ * identifier at the left margin, followed by a left parenthesis,
+ * with a right parenthesis as the last character on the line,
+ * and with a left brace as the first token on the following line
+ * (ignoring possible intervening comments).
+ * It will recognize a multi-line header provided that no intervening
+ * line ends with a left or right brace or a semicolon.
+ * These algorithms ignore whitespace and comments, except that
+ * the function name must be the first thing on the line.
+ * The following constructs will confuse it:
+ *	- Any other construct that starts at the left margin and
+ *	    follows the above syntax (such as a macro or function call).
+ *	- Some macros that tinker with the syntax of the function header.
+ */
+
+/*
+ * The original and principal author of ansi2knr is L. Peter Deutsch
+ * <ghost@aladdin.com>.  Other authors are noted in the change history
+ * that follows (in reverse chronological order):
+	lpd 96-01-21 added code to cope with not HAVE_CONFIG_H and with
+		compilers that don't understand void, as suggested by
+		Tom Lane
+	lpd 96-01-15 changed to require that the first non-comment token
+		on the line following a function header be a left brace,
+		to reduce sensitivity to macros, as suggested by Tom Lane
+		<tgl@sss.pgh.pa.us>
+	lpd 95-06-22 removed #ifndefs whose sole purpose was to define
+		undefined preprocessor symbols as 0; changed all #ifdefs
+		for configuration symbols to #ifs
+	lpd 95-04-05 changed copyright notice to make it clear that
+		including ansi2knr in a program does not bring the entire
+		program under the GPL
+	lpd 94-12-18 added conditionals for systems where ctype macros
+		don't handle 8-bit characters properly, suggested by
+		Francois Pinard <pinard@iro.umontreal.ca>;
+		removed --varargs switch (this is now the default)
+	lpd 94-10-10 removed CONFIG_BROKETS conditional
+	lpd 94-07-16 added some conditionals to help GNU `configure',
+		suggested by Francois Pinard <pinard@iro.umontreal.ca>;
+		properly erase prototype args in function parameters,
+		contributed by Jim Avera <jima@netcom.com>;
+		correct error in writeblanks (it shouldn't erase EOLs)
+	lpd 89-xx-xx original version
+ */
+
+/* Most of the conditionals here are to make ansi2knr work with */
+/* or without the GNU configure machinery. */
+
+#if HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include <stdio.h>
+#include <ctype.h>
+
+#if HAVE_CONFIG_H
+
+/*
+   For properly autoconfiguring ansi2knr, use AC_CONFIG_HEADER(config.h).
+   This will define HAVE_CONFIG_H and so, activate the following lines.
+ */
+
+# if STDC_HEADERS || HAVE_STRING_H
+#  include <string.h>
+# else
+#  include <strings.h>
+# endif
+
+#else /* not HAVE_CONFIG_H */
+
+/* Otherwise do it the hard way */
+
+# ifdef BSD
+#  include <strings.h>
+# else
+#  ifdef VMS
+    extern int strlen(), strncmp();
+#  else
+#   include <string.h>
+#  endif
+# endif
+
+#endif /* not HAVE_CONFIG_H */
+
+#if STDC_HEADERS
+# include <stdlib.h>
+#else
+/*
+   malloc and free should be declared in stdlib.h,
+   but if you've got a K&R compiler, they probably aren't.
+ */
+# ifdef MSDOS
+#  include <malloc.h>
+# else
+#  ifdef VMS
+     extern char *malloc();
+     extern void free();
+#  else
+     extern char *malloc();
+     extern int free();
+#  endif
+# endif
+
+#endif
+
+/*
+ * The ctype macros don't always handle 8-bit characters correctly.
+ * Compensate for this here.
+ */
+#ifdef isascii
+#  undef HAVE_ISASCII		/* just in case */
+#  define HAVE_ISASCII 1
+#else
+#endif
+#if STDC_HEADERS || !HAVE_ISASCII
+#  define is_ascii(c) 1
+#else
+#  define is_ascii(c) isascii(c)
+#endif
+
+#define is_space(c) (is_ascii(c) && isspace(c))
+#define is_alpha(c) (is_ascii(c) && isalpha(c))
+#define is_alnum(c) (is_ascii(c) && isalnum(c))
+
+/* Scanning macros */
+#define isidchar(ch) (is_alnum(ch) || (ch) == '_')
+#define isidfirstchar(ch) (is_alpha(ch) || (ch) == '_')
+
+/* Forward references */
+char *skipspace();
+int writeblanks();
+int test1();
+int convert1();
+
+/* The main program */
+int
+main(argc, argv)
+    int argc;
+    char *argv[];
+{	FILE *in, *out;
+#define bufsize 5000			/* arbitrary size */
+	char *buf;
+	char *line;
+	char *more;
+	/*
+	 * In previous versions, ansi2knr recognized a --varargs switch.
+	 * If this switch was supplied, ansi2knr would attempt to convert
+	 * a ... argument to va_alist and va_dcl; if this switch was not
+	 * supplied, ansi2knr would simply drop any such arguments.
+	 * Now, ansi2knr always does this conversion, and we only
+	 * check for this switch for backward compatibility.
+	 */
+	int convert_varargs = 1;
+
+	if ( argc > 1 && argv[1][0] == '-' )
+	  {	if ( !strcmp(argv[1], "--varargs") )
+		  {	convert_varargs = 1;
+			argc--;
+			argv++;
+		  }
+		else
+		  {	fprintf(stderr, "Unrecognized switch: %s\n", argv[1]);
+			exit(1);
+		  }
+	  }
+	switch ( argc )
+	   {
+	default:
+		printf("Usage: ansi2knr input_file [output_file]\n");
+		exit(0);
+	case 2:
+		out = stdout;
+		break;
+	case 3:
+		out = fopen(argv[2], "w");
+		if ( out == NULL )
+		   {	fprintf(stderr, "Cannot open output file %s\n", argv[2]);
+			exit(1);
+		   }
+	   }
+	in = fopen(argv[1], "r");
+	if ( in == NULL )
+	   {	fprintf(stderr, "Cannot open input file %s\n", argv[1]);
+		exit(1);
+	   }
+	fprintf(out, "#line 1 \"%s\"\n", argv[1]);
+	buf = malloc(bufsize);
+	line = buf;
+	while ( fgets(line, (unsigned)(buf + bufsize - line), in) != NULL )
+	   {
+test:		line += strlen(line);
+		switch ( test1(buf) )
+		   {
+		case 2:			/* a function header */
+			convert1(buf, out, 1, convert_varargs);
+			break;
+		case 1:			/* a function */
+			/* Check for a { at the start of the next line. */
+			more = ++line;
+f:			if ( line >= buf + (bufsize - 1) ) /* overflow check */
+			  goto wl;
+			if ( fgets(line, (unsigned)(buf + bufsize - line), in) == NULL )
+			  goto wl;
+			switch ( *skipspace(more, 1) )
+			  {
+			  case '{':
+			    /* Definitely a function header. */
+			    convert1(buf, out, 0, convert_varargs);
+			    fputs(more, out);
+			    break;
+			  case 0:
+			    /* The next line was blank or a comment: */
+			    /* keep scanning for a non-comment. */
+			    line += strlen(line);
+			    goto f;
+			  default:
+			    /* buf isn't a function header, but */
+			    /* more might be. */
+			    fputs(buf, out);
+			    strcpy(buf, more);
+			    line = buf;
+			    goto test;
+			  }
+			break;
+		case -1:		/* maybe the start of a function */
+			if ( line != buf + (bufsize - 1) ) /* overflow check */
+			  continue;
+			/* falls through */
+		default:		/* not a function */
+wl:			fputs(buf, out);
+			break;
+		   }
+		line = buf;
+	   }
+	if ( line != buf )
+	  fputs(buf, out);
+	free(buf);
+	fclose(out);
+	fclose(in);
+	return 0;
+}
+
+/* Skip over space and comments, in either direction. */
+char *
+skipspace(p, dir)
+    register char *p;
+    register int dir;			/* 1 for forward, -1 for backward */
+{	for ( ; ; )
+	   {	while ( is_space(*p) )
+		  p += dir;
+		if ( !(*p == '/' && p[dir] == '*') )
+		  break;
+		p += dir;  p += dir;
+		while ( !(*p == '*' && p[dir] == '/') )
+		   {	if ( *p == 0 )
+			  return p;	/* multi-line comment?? */
+			p += dir;
+		   }
+		p += dir;  p += dir;
+	   }
+	return p;
+}
+
+/*
+ * Write blanks over part of a string.
+ * Don't overwrite end-of-line characters.
+ */
+int
+writeblanks(start, end)
+    char *start;
+    char *end;
+{	char *p;
+	for ( p = start; p < end; p++ )
+	  if ( *p != '\r' && *p != '\n' )
+	    *p = ' ';
+	return 0;
+}
+
+/*
+ * Test whether the string in buf is a function definition.
+ * The string may contain and/or end with a newline.
+ * Return as follows:
+ *	0 - definitely not a function definition;
+ *	1 - definitely a function definition;
+ *	2 - definitely a function prototype (NOT USED);
+ *	-1 - may be the beginning of a function definition,
+ *		append another line and look again.
+ * The reason we don't attempt to convert function prototypes is that
+ * Ghostscript's declaration-generating macros look too much like
+ * prototypes, and confuse the algorithms.
+ */
+int
+test1(buf)
+    char *buf;
+{	register char *p = buf;
+	char *bend;
+	char *endfn;
+	int contin;
+
+	if ( !isidfirstchar(*p) )
+	  return 0;		/* no name at left margin */
+	bend = skipspace(buf + strlen(buf) - 1, -1);
+	switch ( *bend )
+	   {
+	   case ';': contin = 0 /*2*/; break;
+	   case ')': contin = 1; break;
+	   case '{': return 0;		/* not a function */
+	   case '}': return 0;		/* not a function */
+	   default: contin = -1;
+	   }
+	while ( isidchar(*p) )
+	  p++;
+	endfn = p;
+	p = skipspace(p, 1);
+	if ( *p++ != '(' )
+	  return 0;		/* not a function */
+	p = skipspace(p, 1);
+	if ( *p == ')' )
+	  return 0;		/* no parameters */
+	/* Check that the apparent function name isn't a keyword. */
+	/* We only need to check for keywords that could be followed */
+	/* by a left parenthesis (which, unfortunately, is most of them). */
+	   {	static char *words[] =
+		   {	"asm", "auto", "case", "char", "const", "double",
+			"extern", "float", "for", "if", "int", "long",
+			"register", "return", "short", "signed", "sizeof",
+			"static", "switch", "typedef", "unsigned",
+			"void", "volatile", "while", 0
+		   };
+		char **key = words;
+		char *kp;
+		int len = endfn - buf;
+
+		while ( (kp = *key) != 0 )
+		   {	if ( strlen(kp) == len && !strncmp(kp, buf, len) )
+			  return 0;	/* name is a keyword */
+			key++;
+		   }
+	   }
+	return contin;
+}
+
+/* Convert a recognized function definition or header to K&R syntax. */
+int
+convert1(buf, out, header, convert_varargs)
+    char *buf;
+    FILE *out;
+    int header;			/* Boolean */
+    int convert_varargs;	/* Boolean */
+{	char *endfn;
+	register char *p;
+	char **breaks;
+	unsigned num_breaks = 2;	/* for testing */
+	char **btop;
+	char **bp;
+	char **ap;
+	char *vararg = 0;
+
+	/* Pre-ANSI implementations don't agree on whether strchr */
+	/* is called strchr or index, so we open-code it here. */
+	for ( endfn = buf; *(endfn++) != '('; )
+	  ;
+top:	p = endfn;
+	breaks = (char **)malloc(sizeof(char *) * num_breaks * 2);
+	if ( breaks == 0 )
+	   {	/* Couldn't allocate break table, give up */
+		fprintf(stderr, "Unable to allocate break table!\n");
+		fputs(buf, out);
+		return -1;
+	   }
+	btop = breaks + num_breaks * 2 - 2;
+	bp = breaks;
+	/* Parse the argument list */
+	do
+	   {	int level = 0;
+		char *lp = NULL;
+		char *rp;
+		char *end = NULL;
+
+		if ( bp >= btop )
+		   {	/* Filled up break table. */
+			/* Allocate a bigger one and start over. */
+			free((char *)breaks);
+			num_breaks <<= 1;
+			goto top;
+		   }
+		*bp++ = p;
+		/* Find the end of the argument */
+		for ( ; end == NULL; p++ )
+		   {	switch(*p)
+			   {
+			   case ',':
+				if ( !level ) end = p;
+				break;
+			   case '(':
+				if ( !level ) lp = p;
+				level++;
+				break;
+			   case ')':
+				if ( --level < 0 ) end = p;
+				else rp = p;
+				break;
+			   case '/':
+				p = skipspace(p, 1) - 1;
+				break;
+			   default:
+				;
+			   }
+		   }
+		/* Erase any embedded prototype parameters. */
+		if ( lp )
+		  writeblanks(lp + 1, rp);
+		p--;			/* back up over terminator */
+		/* Find the name being declared. */
+		/* This is complicated because of procedure and */
+		/* array modifiers. */
+		for ( ; ; )
+		   {	p = skipspace(p - 1, -1);
+			switch ( *p )
+			   {
+			   case ']':	/* skip array dimension(s) */
+			   case ')':	/* skip procedure args OR name */
+			   {	int level = 1;
+				while ( level )
+				 switch ( *--p )
+				   {
+				   case ']': case ')': level++; break;
+				   case '[': case '(': level--; break;
+				   case '/': p = skipspace(p, -1) + 1; break;
+				   default: ;
+				   }
+			   }
+				if ( *p == '(' && *skipspace(p + 1, 1) == '*' )
+				   {	/* We found the name being declared */
+					while ( !isidfirstchar(*p) )
+					  p = skipspace(p, 1) + 1;
+					goto found;
+				   }
+				break;
+			   default:
+				goto found;
+			   }
+		   }
+found:		if ( *p == '.' && p[-1] == '.' && p[-2] == '.' )
+		  {	if ( convert_varargs )
+			  {	*bp++ = "va_alist";
+				vararg = p-2;
+			  }
+			else
+			  {	p++;
+				if ( bp == breaks + 1 )	/* sole argument */
+				  writeblanks(breaks[0], p);
+				else
+				  writeblanks(bp[-1] - 1, p);
+				bp--;
+			  }
+		   }
+		else
+		   {	while ( isidchar(*p) ) p--;
+			*bp++ = p+1;
+		   }
+		p = end;
+	   }
+	while ( *p++ == ',' );
+	*bp = p;
+	/* Make a special check for 'void' arglist */
+	if ( bp == breaks+2 )
+	   {	p = skipspace(breaks[0], 1);
+		if ( !strncmp(p, "void", 4) )
+		   {	p = skipspace(p+4, 1);
+			if ( p == breaks[2] - 1 )
+			   {	bp = breaks;	/* yup, pretend arglist is empty */
+				writeblanks(breaks[0], p + 1);
+			   }
+		   }
+	   }
+	/* Put out the function name and left parenthesis. */
+	p = buf;
+	while ( p != endfn ) putc(*p, out), p++;
+	/* Put out the declaration. */
+	if ( header )
+	  {	fputs(");", out);
+		for ( p = breaks[0]; *p; p++ )
+		  if ( *p == '\r' || *p == '\n' )
+		    putc(*p, out);
+	  }
+	else
+	  {	for ( ap = breaks+1; ap < bp; ap += 2 )
+		  {	p = *ap;
+			while ( isidchar(*p) )
+			  putc(*p, out), p++;
+			if ( ap < bp - 1 )
+			  fputs(", ", out);
+		  }
+		fputs(")  ", out);
+		/* Put out the argument declarations */
+		for ( ap = breaks+2; ap <= bp; ap += 2 )
+		  (*ap)[-1] = ';';
+		if ( vararg != 0 )
+		  {	*vararg = 0;
+			fputs(breaks[0], out);		/* any prior args */
+			fputs("va_dcl", out);		/* the final arg */
+			fputs(bp[0], out);
+		  }
+		else
+		  fputs(breaks[0], out);
+	  }
+	free((char *)breaks);
+	return 0;
+}
diff --git a/uppsrc/plugin/jpg/lib/cderror.h b/uppsrc/plugin/jpg/lib/cderror.h
new file mode 100644
index 000000000..70435e161
--- /dev/null
+++ b/uppsrc/plugin/jpg/lib/cderror.h
@@ -0,0 +1,132 @@
+/*
+ * cderror.h
+ *
+ * Copyright (C) 1994-1997, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file defines the error and message codes for the cjpeg/djpeg
+ * applications.  These strings are not needed as part of the JPEG library
+ * proper.
+ * Edit this file to add new codes, or to translate the message strings to
+ * some other language.
+ */
+
+/*
+ * To define the enum list of message codes, include this file without
+ * defining macro JMESSAGE.  To create a message string table, include it
+ * again with a suitable JMESSAGE definition (see jerror.c for an example).
+ */
+#ifndef JMESSAGE
+#ifndef CDERROR_H
+#define CDERROR_H
+/* First time through, define the enum list */
+#define JMAKE_ENUM_LIST
+#else
+/* Repeated inclusions of this file are no-ops unless JMESSAGE is defined */
+#define JMESSAGE(code,string)
+#endif /* CDERROR_H */
+#endif /* JMESSAGE */
+
+#ifdef JMAKE_ENUM_LIST
+
+typedef enum {
+
+#define JMESSAGE(code,string)	code ,
+
+#endif /* JMAKE_ENUM_LIST */
+
+JMESSAGE(JMSG_FIRSTADDONCODE=1000, NULL) /* Must be first entry! */
+
+#ifdef BMP_SUPPORTED
+JMESSAGE(JERR_BMP_BADCMAP, "Unsupported BMP colormap format")
+JMESSAGE(JERR_BMP_BADDEPTH, "Only 8- and 24-bit BMP files are supported")
+JMESSAGE(JERR_BMP_BADHEADER, "Invalid BMP file: bad header length")
+JMESSAGE(JERR_BMP_BADPLANES, "Invalid BMP file: biPlanes not equal to 1")
+JMESSAGE(JERR_BMP_COLORSPACE, "BMP output must be grayscale or RGB")
+JMESSAGE(JERR_BMP_COMPRESSED, "Sorry, compressed BMPs not yet supported")
+JMESSAGE(JERR_BMP_NOT, "Not a BMP file - does not start with BM")
+JMESSAGE(JTRC_BMP, "%ux%u 24-bit BMP image")
+JMESSAGE(JTRC_BMP_MAPPED, "%ux%u 8-bit colormapped BMP image")
+JMESSAGE(JTRC_BMP_OS2, "%ux%u 24-bit OS2 BMP image")
+JMESSAGE(JTRC_BMP_OS2_MAPPED, "%ux%u 8-bit colormapped OS2 BMP image")
+#endif /* BMP_SUPPORTED */
+
+#ifdef GIF_SUPPORTED
+JMESSAGE(JERR_GIF_BUG, "GIF output got confused")
+JMESSAGE(JERR_GIF_CODESIZE, "Bogus GIF codesize %d")
+JMESSAGE(JERR_GIF_COLORSPACE, "GIF output must be grayscale or RGB")
+JMESSAGE(JERR_GIF_IMAGENOTFOUND, "Too few images in GIF file")
+JMESSAGE(JERR_GIF_NOT, "Not a GIF file")
+JMESSAGE(JTRC_GIF, "%ux%ux%d GIF image")
+JMESSAGE(JTRC_GIF_BADVERSION,
+	 "Warning: unexpected GIF version number '%c%c%c'")
+JMESSAGE(JTRC_GIF_EXTENSION, "Ignoring GIF extension block of type 0x%02x")
+JMESSAGE(JTRC_GIF_NONSQUARE, "Caution: nonsquare pixels in input")
+JMESSAGE(JWRN_GIF_BADDATA, "Corrupt data in GIF file")
+JMESSAGE(JWRN_GIF_CHAR, "Bogus char 0x%02x in GIF file, ignoring")
+JMESSAGE(JWRN_GIF_ENDCODE, "Premature end of GIF image")
+JMESSAGE(JWRN_GIF_NOMOREDATA, "Ran out of GIF bits")
+#endif /* GIF_SUPPORTED */
+
+#ifdef PPM_SUPPORTED
+JMESSAGE(JERR_PPM_COLORSPACE, "PPM output must be grayscale or RGB")
+JMESSAGE(JERR_PPM_NONNUMERIC, "Nonnumeric data in PPM file")
+JMESSAGE(JERR_PPM_NOT, "Not a PPM/PGM file")
+JMESSAGE(JTRC_PGM, "%ux%u PGM image")
+JMESSAGE(JTRC_PGM_TEXT, "%ux%u text PGM image")
+JMESSAGE(JTRC_PPM, "%ux%u PPM image")
+JMESSAGE(JTRC_PPM_TEXT, "%ux%u text PPM image")
+#endif /* PPM_SUPPORTED */
+
+#ifdef RLE_SUPPORTED
+JMESSAGE(JERR_RLE_BADERROR, "Bogus error code from RLE library")
+JMESSAGE(JERR_RLE_COLORSPACE, "RLE output must be grayscale or RGB")
+JMESSAGE(JERR_RLE_DIMENSIONS, "Image dimensions (%ux%u) too large for RLE")
+JMESSAGE(JERR_RLE_EMPTY, "Empty RLE file")
+JMESSAGE(JERR_RLE_EOF, "Premature EOF in RLE header")
+JMESSAGE(JERR_RLE_MEM, "Insufficient memory for RLE header")
+JMESSAGE(JERR_RLE_NOT, "Not an RLE file")
+JMESSAGE(JERR_RLE_TOOMANYCHANNELS, "Cannot handle %d output channels for RLE")
+JMESSAGE(JERR_RLE_UNSUPPORTED, "Cannot handle this RLE setup")
+JMESSAGE(JTRC_RLE, "%ux%u full-color RLE file")
+JMESSAGE(JTRC_RLE_FULLMAP, "%ux%u full-color RLE file with map of length %d")
+JMESSAGE(JTRC_RLE_GRAY, "%ux%u grayscale RLE file")
+JMESSAGE(JTRC_RLE_MAPGRAY, "%ux%u grayscale RLE file with map of length %d")
+JMESSAGE(JTRC_RLE_MAPPED, "%ux%u colormapped RLE file with map of length %d")
+#endif /* RLE_SUPPORTED */
+
+#ifdef TARGA_SUPPORTED
+JMESSAGE(JERR_TGA_BADCMAP, "Unsupported Targa colormap format")
+JMESSAGE(JERR_TGA_BADPARMS, "Invalid or unsupported Targa file")
+JMESSAGE(JERR_TGA_COLORSPACE, "Targa output must be grayscale or RGB")
+JMESSAGE(JTRC_TGA, "%ux%u RGB Targa image")
+JMESSAGE(JTRC_TGA_GRAY, "%ux%u grayscale Targa image")
+JMESSAGE(JTRC_TGA_MAPPED, "%ux%u colormapped Targa image")
+#else
+JMESSAGE(JERR_TGA_NOTCOMP, "Targa support was not compiled")
+#endif /* TARGA_SUPPORTED */
+
+JMESSAGE(JERR_BAD_CMAP_FILE,
+	 "Color map file is invalid or of unsupported format")
+JMESSAGE(JERR_TOO_MANY_COLORS,
+	 "Output file format cannot handle %d colormap entries")
+JMESSAGE(JERR_UNGETC_FAILED, "ungetc failed")
+#ifdef TARGA_SUPPORTED
+JMESSAGE(JERR_UNKNOWN_FORMAT,
+	 "Unrecognized input file format --- perhaps you need -targa")
+#else
+JMESSAGE(JERR_UNKNOWN_FORMAT, "Unrecognized input file format")
+#endif
+JMESSAGE(JERR_UNSUPPORTED_FORMAT, "Unsupported output file format")
+
+#ifdef JMAKE_ENUM_LIST
+
+  JMSG_LASTADDONCODE
+} ADDON_MESSAGE_CODE;
+
+#undef JMAKE_ENUM_LIST
+#endif /* JMAKE_ENUM_LIST */
+
+/* Zap JMESSAGE macro so that future re-inclusions do nothing by default */
+#undef JMESSAGE
diff --git a/uppsrc/plugin/jpg/lib/cdjpeg.c b/uppsrc/plugin/jpg/lib/cdjpeg.c
new file mode 100644
index 000000000..b6250ff97
--- /dev/null
+++ b/uppsrc/plugin/jpg/lib/cdjpeg.c
@@ -0,0 +1,181 @@
+/*
+ * cdjpeg.c
+ *
+ * Copyright (C) 1991-1997, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains common support routines used by the IJG application
+ * programs (cjpeg, djpeg, jpegtran).
+ */
+
+#include "cdjpeg.h"		/* Common decls for cjpeg/djpeg applications */
+#include <ctype.h>		/* to declare isupper(), tolower() */
+#ifdef NEED_SIGNAL_CATCHER
+#include <signal.h>		/* to declare signal() */
+#endif
+#ifdef USE_SETMODE
+#include <fcntl.h>		/* to declare setmode()'s parameter macros */
+/* If you have setmode() but not <io.h>, just delete this line: */
+#include <io.h>			/* to declare setmode() */
+#endif
+
+
+/*
+ * Signal catcher to ensure that temporary files are removed before aborting.
+ * NB: for Amiga Manx C this is actually a global routine named _abort();
+ * we put "#define signal_catcher _abort" in jconfig.h.  Talk about bogus...
+ */
+
+#ifdef NEED_SIGNAL_CATCHER
+
+static j_common_ptr sig_cinfo;
+
+void				/* must be global for Manx C */
+signal_catcher (int signum)
+{
+  if (sig_cinfo != NULL) {
+    if (sig_cinfo->err != NULL) /* turn off trace output */
+      sig_cinfo->err->trace_level = 0;
+    jpeg_destroy(sig_cinfo);	/* clean up memory allocation & temp files */
+  }
+  exit(EXIT_FAILURE);
+}
+
+
+GLOBAL(void)
+enable_signal_catcher (j_common_ptr cinfo)
+{
+  sig_cinfo = cinfo;
+#ifdef SIGINT			/* not all systems have SIGINT */
+  signal(SIGINT, signal_catcher);
+#endif
+#ifdef SIGTERM			/* not all systems have SIGTERM */
+  signal(SIGTERM, signal_catcher);
+#endif
+}
+
+#endif
+
+
+/*
+ * Optional progress monitor: display a percent-done figure on stderr.
+ */
+
+#ifdef PROGRESS_REPORT
+
+METHODDEF(void)
+progress_monitor (j_common_ptr cinfo)
+{
+  cd_progress_ptr prog = (cd_progress_ptr) cinfo->progress;
+  int total_passes = prog->pub.total_passes + prog->total_extra_passes;
+  int percent_done = (int) (prog->pub.pass_counter*100L/prog->pub.pass_limit);
+
+  if (percent_done != prog->percent_done) {
+    prog->percent_done = percent_done;
+    if (total_passes > 1) {
+      fprintf(stderr, "\rPass %d/%d: %3d%% ",
+	      prog->pub.completed_passes + prog->completed_extra_passes + 1,
+	      total_passes, percent_done);
+    } else {
+      fprintf(stderr, "\r %3d%% ", percent_done);
+    }
+    fflush(stderr);
+  }
+}
+
+
+GLOBAL(void)
+start_progress_monitor (j_common_ptr cinfo, cd_progress_ptr progress)
+{
+  /* Enable progress display, unless trace output is on */
+  if (cinfo->err->trace_level == 0) {
+    progress->pub.progress_monitor = progress_monitor;
+    progress->completed_extra_passes = 0;
+    progress->total_extra_passes = 0;
+    progress->percent_done = -1;
+    cinfo->progress = &progress->pub;
+  }
+}
+
+
+GLOBAL(void)
+end_progress_monitor (j_common_ptr cinfo)
+{
+  /* Clear away progress display */
+  if (cinfo->err->trace_level == 0) {
+    fprintf(stderr, "\r                \r");
+    fflush(stderr);
+  }
+}
+
+#endif
+
+
+/*
+ * Case-insensitive matching of possibly-abbreviated keyword switches.
+ * keyword is the constant keyword (must be lower case already),
+ * minchars is length of minimum legal abbreviation.
+ */
+
+GLOBAL(boolean)
+keymatch (char * arg, const char * keyword, int minchars)
+{
+  register int ca, ck;
+  register int nmatched = 0;
+
+  while ((ca = *arg++) != '\0') {
+    if ((ck = *keyword++) == '\0')
+      return FALSE;		/* arg longer than keyword, no good */
+    if (isupper(ca))		/* force arg to lcase (assume ck is already) */
+      ca = tolower(ca);
+    if (ca != ck)
+      return FALSE;		/* no good */
+    nmatched++;			/* count matched characters */
+  }
+  /* reached end of argument; fail if it's too short for unique abbrev */
+  if (nmatched < minchars)
+    return FALSE;
+  return TRUE;			/* A-OK */
+}
+
+
+/*
+ * Routines to establish binary I/O mode for stdin and stdout.
+ * Non-Unix systems often require some hacking to get out of text mode.
+ */
+
+GLOBAL(FILE *)
+read_stdin (void)
+{
+  FILE * input_file = stdin;
+
+#ifdef USE_SETMODE		/* need to hack file mode? */
+  setmode(fileno(stdin), O_BINARY);
+#endif
+#ifdef USE_FDOPEN		/* need to re-open in binary mode? */
+  if ((input_file = fdopen(fileno(stdin), READ_BINARY)) == NULL) {
+    fprintf(stderr, "Cannot reopen stdin\n");
+    exit(EXIT_FAILURE);
+  }
+#endif
+  return input_file;
+}
+
+
+GLOBAL(FILE *)
+write_stdout (void)
+{
+  FILE * output_file = stdout;
+
+#ifdef USE_SETMODE		/* need to hack file mode? */
+  setmode(fileno(stdout), O_BINARY);
+#endif
+#ifdef USE_FDOPEN		/* need to re-open in binary mode? */
+  if ((output_file = fdopen(fileno(stdout), WRITE_BINARY)) == NULL) {
+    fprintf(stderr, "Cannot reopen stdout\n");
+    exit(EXIT_FAILURE);
+  }
+#endif
+  return output_file;
+}
diff --git a/uppsrc/plugin/jpg/lib/cdjpeg.h b/uppsrc/plugin/jpg/lib/cdjpeg.h
new file mode 100644
index 000000000..2b387b6e5
--- /dev/null
+++ b/uppsrc/plugin/jpg/lib/cdjpeg.h
@@ -0,0 +1,184 @@
+/*
+ * cdjpeg.h
+ *
+ * Copyright (C) 1994-1997, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains common declarations for the sample applications
+ * cjpeg and djpeg.  It is NOT used by the core JPEG library.
+ */
+
+#define JPEG_CJPEG_DJPEG	/* define proper options in jconfig.h */
+#define JPEG_INTERNAL_OPTIONS	/* cjpeg.c,djpeg.c need to see xxx_SUPPORTED */
+#include "jinclude.h"
+#include "jpeglib.h"
+#include "jerror.h"		/* get library error codes too */
+#include "cderror.h"		/* get application-specific error codes */
+
+
+/*
+ * Object interface for cjpeg's source file decoding modules
+ */
+
+typedef struct cjpeg_source_struct * cjpeg_source_ptr;
+
+struct cjpeg_source_struct {
+  JMETHOD(void, start_input, (j_compress_ptr cinfo,
+			      cjpeg_source_ptr sinfo));
+  JMETHOD(JDIMENSION, get_pixel_rows, (j_compress_ptr cinfo,
+				       cjpeg_source_ptr sinfo));
+  JMETHOD(void, finish_input, (j_compress_ptr cinfo,
+			       cjpeg_source_ptr sinfo));
+
+  FILE *input_file;
+
+  JSAMPARRAY buffer;
+  JDIMENSION buffer_height;
+};
+
+
+/*
+ * Object interface for djpeg's output file encoding modules
+ */
+
+typedef struct djpeg_dest_struct * djpeg_dest_ptr;
+
+struct djpeg_dest_struct {
+  /* start_output is called after jpeg_start_decompress finishes.
+   * The color map will be ready at this time, if one is needed.
+   */
+  JMETHOD(void, start_output, (j_decompress_ptr cinfo,
+			       djpeg_dest_ptr dinfo));
+  /* Emit the specified number of pixel rows from the buffer. */
+  JMETHOD(void, put_pixel_rows, (j_decompress_ptr cinfo,
+				 djpeg_dest_ptr dinfo,
+				 JDIMENSION rows_supplied));
+  /* Finish up at the end of the image. */
+  JMETHOD(void, finish_output, (j_decompress_ptr cinfo,
+				djpeg_dest_ptr dinfo));
+
+  /* Target file spec; filled in by djpeg.c after object is created. */
+  FILE * output_file;
+
+  /* Output pixel-row buffer.  Created by module init or start_output.
+   * Width is cinfo->output_width * cinfo->output_components;
+   * height is buffer_height.
+   */
+  JSAMPARRAY buffer;
+  JDIMENSION buffer_height;
+};
+
+
+/*
+ * cjpeg/djpeg may need to perform extra passes to convert to or from
+ * the source/destination file format.  The JPEG library does not know
+ * about these passes, but we'd like them to be counted by the progress
+ * monitor.  We use an expanded progress monitor object to hold the
+ * additional pass count.
+ */
+
+struct cdjpeg_progress_mgr {
+  struct jpeg_progress_mgr pub;	/* fields known to JPEG library */
+  int completed_extra_passes;	/* extra passes completed */
+  int total_extra_passes;	/* total extra */
+  /* last printed percentage stored here to avoid multiple printouts */
+  int percent_done;
+};
+
+typedef struct cdjpeg_progress_mgr * cd_progress_ptr;
+
+
+/* Short forms of external names for systems with brain-damaged linkers. */
+
+#ifdef NEED_SHORT_EXTERNAL_NAMES
+#define jinit_read_bmp		jIRdBMP
+#define jinit_write_bmp		jIWrBMP
+#define jinit_read_gif		jIRdGIF
+#define jinit_write_gif		jIWrGIF
+#define jinit_read_ppm		jIRdPPM
+#define jinit_write_ppm		jIWrPPM
+#define jinit_read_rle		jIRdRLE
+#define jinit_write_rle		jIWrRLE
+#define jinit_read_targa	jIRdTarga
+#define jinit_write_targa	jIWrTarga
+#define read_quant_tables	RdQTables
+#define read_scan_script	RdScnScript
+#define set_quant_slots		SetQSlots
+#define set_sample_factors	SetSFacts
+#define read_color_map		RdCMap
+#define enable_signal_catcher	EnSigCatcher
+#define start_progress_monitor	StProgMon
+#define end_progress_monitor	EnProgMon
+#define read_stdin		RdStdin
+#define write_stdout		WrStdout
+#endif /* NEED_SHORT_EXTERNAL_NAMES */
+
+/* Module selection routines for I/O modules. */
+
+EXTERN(cjpeg_source_ptr) jinit_read_bmp JPP((j_compress_ptr cinfo));
+EXTERN(djpeg_dest_ptr) jinit_write_bmp JPP((j_decompress_ptr cinfo,
+					    boolean is_os2));
+EXTERN(cjpeg_source_ptr) jinit_read_gif JPP((j_compress_ptr cinfo));
+EXTERN(djpeg_dest_ptr) jinit_write_gif JPP((j_decompress_ptr cinfo));
+EXTERN(cjpeg_source_ptr) jinit_read_ppm JPP((j_compress_ptr cinfo));
+EXTERN(djpeg_dest_ptr) jinit_write_ppm JPP((j_decompress_ptr cinfo));
+EXTERN(cjpeg_source_ptr) jinit_read_rle JPP((j_compress_ptr cinfo));
+EXTERN(djpeg_dest_ptr) jinit_write_rle JPP((j_decompress_ptr cinfo));
+EXTERN(cjpeg_source_ptr) jinit_read_targa JPP((j_compress_ptr cinfo));
+EXTERN(djpeg_dest_ptr) jinit_write_targa JPP((j_decompress_ptr cinfo));
+
+/* cjpeg support routines (in rdswitch.c) */
+
+EXTERN(boolean) read_quant_tables JPP((j_compress_ptr cinfo, char * filename,
+				    int scale_factor, boolean force_baseline));
+EXTERN(boolean) read_scan_script JPP((j_compress_ptr cinfo, char * filename));
+EXTERN(boolean) set_quant_slots JPP((j_compress_ptr cinfo, char *arg));
+EXTERN(boolean) set_sample_factors JPP((j_compress_ptr cinfo, char *arg));
+
+/* djpeg support routines (in rdcolmap.c) */
+
+EXTERN(void) read_color_map JPP((j_decompress_ptr cinfo, FILE * infile));
+
+/* common support routines (in cdjpeg.c) */
+
+EXTERN(void) enable_signal_catcher JPP((j_common_ptr cinfo));
+EXTERN(void) start_progress_monitor JPP((j_common_ptr cinfo,
+					 cd_progress_ptr progress));
+EXTERN(void) end_progress_monitor JPP((j_common_ptr cinfo));
+EXTERN(boolean) keymatch JPP((char * arg, const char * keyword, int minchars));
+EXTERN(FILE *) read_stdin JPP((void));
+EXTERN(FILE *) write_stdout JPP((void));
+
+/* miscellaneous useful macros */
+
+#ifdef DONT_USE_B_MODE		/* define mode parameters for fopen() */
+#define READ_BINARY	"r"
+#define WRITE_BINARY	"w"
+#else
+#ifdef VMS			/* VMS is very nonstandard */
+#define READ_BINARY	"rb", "ctx=stm"
+#define WRITE_BINARY	"wb", "ctx=stm"
+#else				/* standard ANSI-compliant case */
+#define READ_BINARY	"rb"
+#define WRITE_BINARY	"wb"
+#endif
+#endif
+
+#ifndef EXIT_FAILURE		/* define exit() codes if not provided */
+#define EXIT_FAILURE  1
+#endif
+#ifndef EXIT_SUCCESS
+#ifdef VMS
+#define EXIT_SUCCESS  1		/* VMS is very nonstandard */
+#else
+#define EXIT_SUCCESS  0
+#endif
+#endif
+#ifndef EXIT_WARNING
+#ifdef VMS
+#define EXIT_WARNING  1		/* VMS is very nonstandard */
+#else
+#define EXIT_WARNING  2
+#endif
+#endif
diff --git a/uppsrc/plugin/jpg/lib/cjpeg.c b/uppsrc/plugin/jpg/lib/cjpeg.c
new file mode 100644
index 000000000..9fdc2cfd6
--- /dev/null
+++ b/uppsrc/plugin/jpg/lib/cjpeg.c
@@ -0,0 +1,629 @@
+/*
+ * cjpeg.c
+ *
+ * Copyright (C) 1991-1998, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains a command-line user interface for the JPEG compressor.
+ * It should work on any system with Unix- or MS-DOS-style command lines.
+ *
+ * Two different command line styles are permitted, depending on the
+ * compile-time switch TWO_FILE_COMMANDLINE:
+ *	cjpeg [options]  inputfile outputfile
+ *	cjpeg [options]  [inputfile]
+ * In the second style, output is always to standard output, which you'd
+ * normally redirect to a file or pipe to some other program.  Input is
+ * either from a named file or from standard input (typically redirected).
+ * The second style is convenient on Unix but is unhelpful on systems that
+ * don't support pipes.  Also, you MUST use the first style if your system
+ * doesn't do binary I/O to stdin/stdout.
+ * To simplify script writing, the "-outfile" switch is provided.  The syntax
+ *	cjpeg [options]  -outfile outputfile  inputfile
+ * works regardless of which command line style is used.
+ */
+
+#include "cdjpeg.h"		/* Common decls for cjpeg/djpeg applications */
+#include "jversion.h"		/* for version message */
+
+#ifdef USE_CCOMMAND		/* command-line reader for Macintosh */
+#ifdef __MWERKS__
+#include <SIOUX.h>              /* Metrowerks needs this */
+#include <console.h>		/* ... and this */
+#endif
+#ifdef THINK_C
+#include <console.h>		/* Think declares it here */
+#endif
+#endif
+
+
+/* Create the add-on message string table. */
+
+#define JMESSAGE(code,string)	string ,
+
+static const char * const cdjpeg_message_table[] = {
+#include "cderror.h"
+  NULL
+};
+
+
+/*
+ * This routine determines what format the input file is,
+ * and selects the appropriate input-reading module.
+ *
+ * To determine which family of input formats the file belongs to,
+ * we may look only at the first byte of the file, since C does not
+ * guarantee that more than one character can be pushed back with ungetc.
+ * Looking at additional bytes would require one of these approaches:
+ *     1) assume we can fseek() the input file (fails for piped input);
+ *     2) assume we can push back more than one character (works in
+ *        some C implementations, but unportable);
+ *     3) provide our own buffering (breaks input readers that want to use
+ *        stdio directly, such as the RLE library);
+ * or  4) don't put back the data, and modify the input_init methods to assume
+ *        they start reading after the start of file (also breaks RLE library).
+ * #1 is attractive for MS-DOS but is untenable on Unix.
+ *
+ * The most portable solution for file types that can't be identified by their
+ * first byte is to make the user tell us what they are.  This is also the
+ * only approach for "raw" file types that contain only arbitrary values.
+ * We presently apply this method for Targa files.  Most of the time Targa
+ * files start with 0x00, so we recognize that case.  Potentially, however,
+ * a Targa file could start with any byte value (byte 0 is the length of the
+ * seldom-used ID field), so we provide a switch to force Targa input mode.
+ */
+
+static boolean is_targa;	/* records user -targa switch */
+
+
+LOCAL(cjpeg_source_ptr)
+select_file_type (j_compress_ptr cinfo, FILE * infile)
+{
+  int c;
+
+  if (is_targa) {
+#ifdef TARGA_SUPPORTED
+    return jinit_read_targa(cinfo);
+#else
+    ERREXIT(cinfo, JERR_TGA_NOTCOMP);
+#endif
+  }
+
+  if ((c = getc(infile)) == EOF)
+    ERREXIT(cinfo, JERR_INPUT_EMPTY);
+  if (ungetc(c, infile) == EOF)
+    ERREXIT(cinfo, JERR_UNGETC_FAILED);
+
+  switch (c) {
+#ifdef BMP_SUPPORTED
+  case 'B':
+    return jinit_read_bmp(cinfo);
+#endif
+#ifdef GIF_SUPPORTED
+  case 'G':
+    return jinit_read_gif(cinfo);
+#endif
+#ifdef PPM_SUPPORTED
+  case 'P':
+    return jinit_read_ppm(cinfo);
+#endif
+#ifdef RLE_SUPPORTED
+  case 'R':
+    return jinit_read_rle(cinfo);
+#endif
+#ifdef TARGA_SUPPORTED
+  case 0x00:
+    return jinit_read_targa(cinfo);
+#endif
+  default:
+    ERREXIT(cinfo, JERR_UNKNOWN_FORMAT);
+    break;
+  }
+
+  return NULL;			/* suppress compiler warnings */
+}
+
+
+/*
+ * Argument-parsing code.
+ * The switch parser is designed to be useful with DOS-style command line
+ * syntax, ie, intermixed switches and file names, where only the switches
+ * to the left of a given file name affect processing of that file.
+ * The main program in this file doesn't actually use this capability...
+ */
+
+
+static const char * progname;	/* program name for error messages */
+static char * outfilename;	/* for -outfile switch */
+
+
+LOCAL(void)
+usage (void)
+/* complain about bad command line */
+{
+  fprintf(stderr, "usage: %s [switches] ", progname);
+#ifdef TWO_FILE_COMMANDLINE
+  fprintf(stderr, "inputfile outputfile\n");
+#else
+  fprintf(stderr, "[inputfile]\n");
+#endif
+
+  fprintf(stderr, "Switches (names may be abbreviated):\n");
+  fprintf(stderr, "  -quality N     Compression quality (0..100; 5-95 is useful range)\n");
+  fprintf(stderr, "  -grayscale     Create monochrome JPEG file\n");
+#ifdef ENTROPY_OPT_SUPPORTED
+  fprintf(stderr, "  -optimize      Optimize Huffman table (smaller file, but slow compression)\n");
+#endif
+#ifdef C_PROGRESSIVE_SUPPORTED
+  fprintf(stderr, "  -progressive   Create progressive JPEG file\n");
+#endif
+#ifdef C_LOSSLESS_SUPPORTED
+  fprintf(stderr, "  -lossless psv[,Pt]  Create lossless JPEG file\n");
+#endif
+#ifdef TARGA_SUPPORTED
+  fprintf(stderr, "  -targa         Input file is Targa format (usually not needed)\n");
+#endif
+  fprintf(stderr, "Switches for advanced users:\n");
+#ifdef DCT_ISLOW_SUPPORTED
+  fprintf(stderr, "  -dct int       Use integer DCT method%s\n",
+	  (JDCT_DEFAULT == JDCT_ISLOW ? " (default)" : ""));
+#endif
+#ifdef DCT_IFAST_SUPPORTED
+  fprintf(stderr, "  -dct fast      Use fast integer DCT (less accurate)%s\n",
+	  (JDCT_DEFAULT == JDCT_IFAST ? " (default)" : ""));
+#endif
+#ifdef DCT_FLOAT_SUPPORTED
+  fprintf(stderr, "  -dct float     Use floating-point DCT method%s\n",
+	  (JDCT_DEFAULT == JDCT_FLOAT ? " (default)" : ""));
+#endif
+  fprintf(stderr, "  -restart N     Set restart interval in rows, or in blocks with B\n");
+#ifdef INPUT_SMOOTHING_SUPPORTED
+  fprintf(stderr, "  -smooth N      Smooth dithered input (N=1..100 is strength)\n");
+#endif
+  fprintf(stderr, "  -maxmemory N   Maximum memory to use (in kbytes)\n");
+  fprintf(stderr, "  -outfile name  Specify name for output file\n");
+  fprintf(stderr, "  -verbose  or  -debug   Emit debug output\n");
+  fprintf(stderr, "Switches for wizards:\n");
+#ifdef C_ARITH_CODING_SUPPORTED
+  fprintf(stderr, "  -arithmetic    Use arithmetic coding\n");
+#endif
+  fprintf(stderr, "  -baseline      Force baseline quantization tables\n");
+  fprintf(stderr, "  -qtables file  Use quantization tables given in file\n");
+  fprintf(stderr, "  -qslots N[,...]    Set component quantization tables\n");
+  fprintf(stderr, "  -sample HxV[,...]  Set component sampling factors\n");
+#ifdef C_MULTISCAN_FILES_SUPPORTED
+  fprintf(stderr, "  -scans file    Create multi-scan JPEG per script file\n");
+#endif
+  exit(EXIT_FAILURE);
+}
+
+
+LOCAL(int)
+parse_switches (j_compress_ptr cinfo, int argc, char **argv,
+		int last_file_arg_seen, boolean for_real)
+/* Parse optional switches.
+ * Returns argv[] index of first file-name argument (== argc if none).
+ * Any file names with indexes <= last_file_arg_seen are ignored;
+ * they have presumably been processed in a previous iteration.
+ * (Pass 0 for last_file_arg_seen on the first or only iteration.)
+ * for_real is FALSE on the first (dummy) pass; we may skip any expensive
+ * processing.
+ */
+{
+  int argn;
+  char * arg;
+  int quality;			/* -quality parameter */
+  int q_scale_factor;		/* scaling percentage for -qtables */
+  boolean force_baseline;
+  boolean simple_progressive;
+  char * qtablefile = NULL;	/* saves -qtables filename if any */
+  char * qslotsarg = NULL;	/* saves -qslots parm if any */
+  char * samplearg = NULL;	/* saves -sample parm if any */
+  char * scansarg = NULL;	/* saves -scans parm if any */
+  char * losslsarg = NULL;	/* saves -lossless parm if any */
+
+  /* Set up default JPEG parameters. */
+  /* Note that default -quality level need not, and does not,
+   * match the default scaling for an explicit -qtables argument.
+   */
+  quality = 75;			/* default -quality value */
+  q_scale_factor = 100;		/* default to no scaling for -qtables */
+  force_baseline = FALSE;	/* by default, allow 16-bit quantizers */
+  simple_progressive = FALSE;
+  is_targa = FALSE;
+  outfilename = NULL;
+  cinfo->err->trace_level = 0;
+
+  /* Scan command line options, adjust parameters */
+
+  for (argn = 1; argn < argc; argn++) {
+    arg = argv[argn];
+    if (*arg != '-') {
+      /* Not a switch, must be a file name argument */
+      if (argn <= last_file_arg_seen) {
+	outfilename = NULL;	/* -outfile applies to just one input file */
+	continue;		/* ignore this name if previously processed */
+      }
+      break;			/* else done parsing switches */
+    }
+    arg++;			/* advance past switch marker character */
+
+    if (keymatch(arg, "arithmetic", 1)) {
+      /* Use arithmetic coding. */
+#ifdef C_ARITH_CODING_SUPPORTED
+      cinfo->arith_code = TRUE;
+#else
+      fprintf(stderr, "%s: sorry, arithmetic coding not supported\n",
+	      progname);
+      exit(EXIT_FAILURE);
+#endif
+
+    } else if (keymatch(arg, "baseline", 1)) {
+      /* Force baseline-compatible output (8-bit quantizer values). */
+      force_baseline = TRUE;
+
+    } else if (keymatch(arg, "dct", 2)) {
+      /* Select DCT algorithm. */
+      if (++argn >= argc)	/* advance to next argument */
+	usage();
+      if (keymatch(argv[argn], "int", 1)) {
+	cinfo->dct_method = JDCT_ISLOW;
+      } else if (keymatch(argv[argn], "fast", 2)) {
+	cinfo->dct_method = JDCT_IFAST;
+      } else if (keymatch(argv[argn], "float", 2)) {
+	cinfo->dct_method = JDCT_FLOAT;
+      } else
+	usage();
+
+    } else if (keymatch(arg, "debug", 1) || keymatch(arg, "verbose", 1)) {
+      /* Enable debug printouts. */
+      /* On first -d, print version identification */
+      static boolean printed_version = FALSE;
+
+      if (! printed_version) {
+	fprintf(stderr, "Independent JPEG Group's CJPEG, version %s\n%s\n",
+		JVERSION, JCOPYRIGHT);
+	printed_version = TRUE;
+      }
+      cinfo->err->trace_level++;
+
+    } else if (keymatch(arg, "grayscale", 2) || keymatch(arg, "greyscale",2)) {
+      /* Force a monochrome JPEG file to be generated. */
+      jpeg_set_colorspace(cinfo, JCS_GRAYSCALE);
+
+    } else if (keymatch(arg, "lossless", 1)) {
+/* Select simple lossless mode. */
+#ifdef C_LOSSLESS_SUPPORTED
+      if (++argn >= argc)	/* advance to next argument */
+	usage();
+      losslsarg = argv[argn];
+      /* We must postpone execution until num_components is known. */
+#else
+      fprintf(stderr, "%s: sorry, lossless output was not compiled\n",
+	      progname);
+      exit(EXIT_FAILURE);
+#endif
+
+    } else if (keymatch(arg, "maxmemory", 3)) {
+      /* Maximum memory in Kb (or Mb with 'm'). */
+      long lval;
+      char ch = 'x';
+
+      if (++argn >= argc)	/* advance to next argument */
+	usage();
+      if (sscanf(argv[argn], "%ld%c", &lval, &ch) < 1)
+	usage();
+      if (ch == 'm' || ch == 'M')
+	lval *= 1000L;
+      cinfo->mem->max_memory_to_use = lval * 1000L;
+
+    } else if (keymatch(arg, "optimize", 1) || keymatch(arg, "optimise", 1)) {
+      /* Enable entropy parm optimization. */
+#ifdef ENTROPY_OPT_SUPPORTED
+      cinfo->optimize_coding = TRUE;
+#else
+      fprintf(stderr, "%s: sorry, entropy optimization was not compiled\n",
+	      progname);
+      exit(EXIT_FAILURE);
+#endif
+
+    } else if (keymatch(arg, "outfile", 4)) {
+      /* Set output file name. */
+      if (++argn >= argc)	/* advance to next argument */
+	usage();
+      outfilename = argv[argn];	/* save it away for later use */
+
+    } else if (keymatch(arg, "progressive", 1)) {
+      /* Select simple progressive mode. */
+#ifdef C_PROGRESSIVE_SUPPORTED
+      simple_progressive = TRUE;
+      /* We must postpone execution until num_components is known. */
+#else
+      fprintf(stderr, "%s: sorry, progressive output was not compiled\n",
+	      progname);
+      exit(EXIT_FAILURE);
+#endif
+
+    } else if (keymatch(arg, "quality", 1)) {
+      /* Quality factor (quantization table scaling factor). */
+      if (++argn >= argc)	/* advance to next argument */
+	usage();
+      if (sscanf(argv[argn], "%d", &quality) != 1)
+	usage();
+      /* Change scale factor in case -qtables is present. */
+      q_scale_factor = jpeg_quality_scaling(quality);
+
+    } else if (keymatch(arg, "qslots", 2)) {
+      /* Quantization table slot numbers. */
+      if (++argn >= argc)	/* advance to next argument */
+	usage();
+      qslotsarg = argv[argn];
+      /* Must delay setting qslots until after we have processed any
+       * colorspace-determining switches, since jpeg_set_colorspace sets
+       * default quant table numbers.
+       */
+
+    } else if (keymatch(arg, "qtables", 2)) {
+      /* Quantization tables fetched from file. */
+      if (++argn >= argc)	/* advance to next argument */
+	usage();
+      qtablefile = argv[argn];
+      /* We postpone actually reading the file in case -quality comes later. */
+
+    } else if (keymatch(arg, "restart", 1)) {
+      /* Restart interval in MCU rows (or in MCUs with 'b'). */
+      long lval;
+      char ch = 'x';
+
+      if (++argn >= argc)	/* advance to next argument */
+	usage();
+      if (sscanf(argv[argn], "%ld%c", &lval, &ch) < 1)
+	usage();
+      if (lval < 0 || lval > 65535L)
+	usage();
+      if (ch == 'b' || ch == 'B') {
+	cinfo->restart_interval = (unsigned int) lval;
+	cinfo->restart_in_rows = 0; /* else prior '-restart n' overrides me */
+      } else {
+	cinfo->restart_in_rows = (int) lval;
+	/* restart_interval will be computed during startup */
+      }
+
+    } else if (keymatch(arg, "sample", 2)) {
+      /* Set sampling factors. */
+      if (++argn >= argc)	/* advance to next argument */
+	usage();
+      samplearg = argv[argn];
+      /* Must delay setting sample factors until after we have processed any
+       * colorspace-determining switches, since jpeg_set_colorspace sets
+       * default sampling factors.
+       */
+
+    } else if (keymatch(arg, "scans", 2)) {
+      /* Set scan script. */
+#ifdef C_MULTISCAN_FILES_SUPPORTED
+      if (++argn >= argc)	/* advance to next argument */
+	usage();
+      scansarg = argv[argn];
+      /* We must postpone reading the file in case -progressive appears. */
+#else
+      fprintf(stderr, "%s: sorry, multi-scan output was not compiled\n",
+	      progname);
+      exit(EXIT_FAILURE);
+#endif
+
+    } else if (keymatch(arg, "smooth", 2)) {
+      /* Set input smoothing factor. */
+      int val;
+
+      if (++argn >= argc)	/* advance to next argument */
+	usage();
+      if (sscanf(argv[argn], "%d", &val) != 1)
+	usage();
+      if (val < 0 || val > 100)
+	usage();
+      cinfo->smoothing_factor = val;
+
+    } else if (keymatch(arg, "targa", 1)) {
+      /* Input file is Targa format. */
+      is_targa = TRUE;
+
+    } else {
+      usage();			/* bogus switch */
+    }
+  }
+
+  /* Post-switch-scanning cleanup */
+
+  if (for_real) {
+
+    /* Set quantization tables for selected quality. */
+    /* Some or all may be overridden if -qtables is present. */
+    jpeg_set_quality(cinfo, quality, force_baseline);
+
+    if (qtablefile != NULL)	/* process -qtables if it was present */
+      if (! read_quant_tables(cinfo, qtablefile,
+			      q_scale_factor, force_baseline))
+	usage();
+
+    if (qslotsarg != NULL)	/* process -qslots if it was present */
+      if (! set_quant_slots(cinfo, qslotsarg))
+	usage();
+
+    if (samplearg != NULL)	/* process -sample if it was present */
+      if (! set_sample_factors(cinfo, samplearg))
+	usage();
+
+#ifdef C_PROGRESSIVE_SUPPORTED
+    if (simple_progressive)	/* process -progressive; -scans can override */
+      jpeg_simple_progression(cinfo);
+#endif
+
+#ifdef C_LOSSLESS_SUPPORTED
+    if (losslsarg != NULL)	/* process -lossless if it was present */
+      if (! set_simple_lossless(cinfo, losslsarg))
+	usage();
+#endif
+
+#ifdef C_MULTISCAN_FILES_SUPPORTED
+    if (scansarg != NULL)	/* process -scans if it was present */
+      if (! read_scan_script(cinfo, scansarg))
+	usage();
+#endif
+  }
+
+  return argn;			/* return index of next arg (file name) */
+}
+
+
+/*
+ * The main program.
+ */
+
+int
+main (int argc, char **argv)
+{
+  struct jpeg_compress_struct cinfo;
+  struct jpeg_error_mgr jerr;
+#ifdef PROGRESS_REPORT
+  struct cdjpeg_progress_mgr progress;
+#endif
+  int file_index;
+  cjpeg_source_ptr src_mgr;
+  FILE * input_file;
+  FILE * output_file;
+  JDIMENSION num_scanlines;
+
+  /* On Mac, fetch a command line. */
+#ifdef USE_CCOMMAND
+  argc = ccommand(&argv);
+#endif
+
+  progname = argv[0];
+  if (progname == NULL || progname[0] == 0)
+    progname = "cjpeg";		/* in case C library doesn't provide it */
+
+  /* Initialize the JPEG compression object with default error handling. */
+  cinfo.err = jpeg_std_error(&jerr);
+  jpeg_create_compress(&cinfo);
+  /* Add some application-specific error messages (from cderror.h) */
+  jerr.addon_message_table = cdjpeg_message_table;
+  jerr.first_addon_message = JMSG_FIRSTADDONCODE;
+  jerr.last_addon_message = JMSG_LASTADDONCODE;
+
+  /* Now safe to enable signal catcher. */
+#ifdef NEED_SIGNAL_CATCHER
+  enable_signal_catcher((j_common_ptr) &cinfo);
+#endif
+
+  /* Initialize JPEG parameters.
+   * Much of this may be overridden later.
+   * In particular, we don't yet know the input file's color space,
+   * but we need to provide some value for jpeg_set_defaults() to work.
+   */
+
+  cinfo.in_color_space = JCS_RGB; /* arbitrary guess */
+  jpeg_set_defaults(&cinfo);
+
+  /* Scan command line to find file names.
+   * It is convenient to use just one switch-parsing routine, but the switch
+   * values read here are ignored; we will rescan the switches after opening
+   * the input file.
+   */
+
+  file_index = parse_switches(&cinfo, argc, argv, 0, FALSE);
+
+#ifdef TWO_FILE_COMMANDLINE
+  /* Must have either -outfile switch or explicit output file name */
+  if (outfilename == NULL) {
+    if (file_index != argc-2) {
+      fprintf(stderr, "%s: must name one input and one output file\n",
+	      progname);
+      usage();
+    }
+    outfilename = argv[file_index+1];
+  } else {
+    if (file_index != argc-1) {
+      fprintf(stderr, "%s: must name one input and one output file\n",
+	      progname);
+      usage();
+    }
+  }
+#else
+  /* Unix style: expect zero or one file name */
+  if (file_index < argc-1) {
+    fprintf(stderr, "%s: only one input file\n", progname);
+    usage();
+  }
+#endif /* TWO_FILE_COMMANDLINE */
+
+  /* Open the input file. */
+  if (file_index < argc) {
+    if ((input_file = fopen(argv[file_index], READ_BINARY)) == NULL) {
+      fprintf(stderr, "%s: can't open %s\n", progname, argv[file_index]);
+      exit(EXIT_FAILURE);
+    }
+  } else {
+    /* default input file is stdin */
+    input_file = read_stdin();
+  }
+
+  /* Open the output file. */
+  if (outfilename != NULL) {
+    if ((output_file = fopen(outfilename, WRITE_BINARY)) == NULL) {
+      fprintf(stderr, "%s: can't open %s\n", progname, outfilename);
+      exit(EXIT_FAILURE);
+    }
+  } else {
+    /* default output file is stdout */
+    output_file = write_stdout();
+  }
+
+#ifdef PROGRESS_REPORT
+  start_progress_monitor((j_common_ptr) &cinfo, &progress);
+#endif
+
+  /* Figure out the input file format, and set up to read it. */
+  src_mgr = select_file_type(&cinfo, input_file);
+  src_mgr->input_file = input_file;
+
+  /* Read the input file header to obtain file size & colorspace. */
+  (*src_mgr->start_input) (&cinfo, src_mgr);
+
+  /* Now that we know input colorspace, fix colorspace-dependent defaults */
+  jpeg_default_colorspace(&cinfo);
+
+  /* Adjust default compression parameters by re-parsing the options */
+  file_index = parse_switches(&cinfo, argc, argv, 0, TRUE);
+
+  /* Specify data destination for compression */
+  jpeg_stdio_dest(&cinfo, output_file);
+
+  /* Start compressor */
+  jpeg_start_compress(&cinfo, TRUE);
+
+  /* Process data */
+  while (cinfo.next_scanline < cinfo.image_height) {
+    num_scanlines = (*src_mgr->get_pixel_rows) (&cinfo, src_mgr);
+    (void) jpeg_write_scanlines(&cinfo, src_mgr->buffer, num_scanlines);
+  }
+
+  /* Finish compression and release memory */
+  (*src_mgr->finish_input) (&cinfo, src_mgr);
+  jpeg_finish_compress(&cinfo);
+  jpeg_destroy_compress(&cinfo);
+
+  /* Close files, if we opened them */
+  if (input_file != stdin)
+    fclose(input_file);
+  if (output_file != stdout)
+    fclose(output_file);
+
+#ifdef PROGRESS_REPORT
+  end_progress_monitor((j_common_ptr) &cinfo);
+#endif
+
+  /* All done. */
+  exit(jerr.num_warnings ? EXIT_WARNING : EXIT_SUCCESS);
+  return 0;			/* suppress no-return-value warnings */
+}
diff --git a/uppsrc/plugin/jpg/lib/ckconfig.c b/uppsrc/plugin/jpg/lib/ckconfig.c
new file mode 100644
index 000000000..34baf795b
--- /dev/null
+++ b/uppsrc/plugin/jpg/lib/ckconfig.c
@@ -0,0 +1,402 @@
+/*
+ * ckconfig.c
+ *
+ * Copyright (C) 1991-1994, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ */
+
+/*
+ * This program is intended to help you determine how to configure the JPEG
+ * software for installation on a particular system.  The idea is to try to
+ * compile and execute this program.  If your compiler fails to compile the
+ * program, make changes as indicated in the comments below.  Once you can
+ * compile the program, run it, and it will produce a "jconfig.h" file for
+ * your system.
+ *
+ * As a general rule, each time you try to compile this program,
+ * pay attention only to the *first* error message you get from the compiler.
+ * Many C compilers will issue lots of spurious error messages once they
+ * have gotten confused.  Go to the line indicated in the first error message,
+ * and read the comments preceding that line to see what to change.
+ *
+ * Almost all of the edits you may need to make to this program consist of
+ * changing a line that reads "#define SOME_SYMBOL" to "#undef SOME_SYMBOL",
+ * or vice versa.  This is called defining or undefining that symbol.
+ */
+
+
+/* First we must see if your system has the include files we need.
+ * We start out with the assumption that your system has all the ANSI-standard
+ * include files.  If you get any error trying to include one of these files,
+ * undefine the corresponding HAVE_xxx symbol.
+ */
+
+#define HAVE_STDDEF_H		/* replace 'define' by 'undef' if error here */
+#ifdef HAVE_STDDEF_H		/* next line will be skipped if you undef... */
+#include <stddef.h>
+#endif
+
+#define HAVE_STDLIB_H		/* same thing for stdlib.h */
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+
+#include <stdio.h>		/* If you ain't got this, you ain't got C. */
+
+/* We have to see if your string functions are defined by
+ * strings.h (old BSD convention) or string.h (everybody else).
+ * We try the non-BSD convention first; define NEED_BSD_STRINGS
+ * if the compiler says it can't find string.h.
+ */
+
+#undef NEED_BSD_STRINGS
+
+#ifdef NEED_BSD_STRINGS
+#include <strings.h>
+#else
+#include <string.h>
+#endif
+
+/* On some systems (especially older Unix machines), type size_t is
+ * defined only in the include file <sys/types.h>.  If you get a failure
+ * on the size_t test below, try defining NEED_SYS_TYPES_H.
+ */
+
+#undef NEED_SYS_TYPES_H		/* start by assuming we don't need it */
+#ifdef NEED_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+
+
+/* Usually type size_t is defined in one of the include files we've included
+ * above.  If not, you'll get an error on the "typedef size_t my_size_t;" line.
+ * In that case, first try defining NEED_SYS_TYPES_H just above.
+ * If that doesn't work, you'll have to search through your system library
+ * to figure out which include file defines "size_t".  Look for a line that
+ * says "typedef something-or-other size_t;".  Then, change the line below
+ * that says "#include <someincludefile.h>" to instead include the file
+ * you found size_t in, and define NEED_SPECIAL_INCLUDE.  If you can't find
+ * type size_t anywhere, try replacing "#include <someincludefile.h>" with
+ * "typedef unsigned int size_t;".
+ */
+
+#undef NEED_SPECIAL_INCLUDE	/* assume we DON'T need it, for starters */
+
+#ifdef NEED_SPECIAL_INCLUDE
+#include <someincludefile.h>
+#endif
+
+typedef size_t my_size_t;	/* The payoff: do we have size_t now? */
+
+
+/* The next question is whether your compiler supports ANSI-style function
+ * prototypes.  You need to know this in order to choose between using
+ * makefile.ansi and using makefile.unix.
+ * The #define line below is set to assume you have ANSI function prototypes.
+ * If you get an error in this group of lines, undefine HAVE_PROTOTYPES.
+ */
+
+#define HAVE_PROTOTYPES
+
+#ifdef HAVE_PROTOTYPES
+int testfunction (int arg1, int * arg2); /* check prototypes */
+
+struct methods_struct {		/* check method-pointer declarations */
+  int (*error_exit) (char *msgtext);
+  int (*trace_message) (char *msgtext);
+  int (*another_method) (void);
+};
+
+int testfunction (int arg1, int * arg2) /* check definitions */
+{
+  return arg2[arg1];
+}
+
+int test2function (void)	/* check void arg list */
+{
+  return 0;
+}
+#endif
+
+
+/* Now we want to find out if your compiler knows what "unsigned char" means.
+ * If you get an error on the "unsigned char un_char;" line,
+ * then undefine HAVE_UNSIGNED_CHAR.
+ */
+
+#define HAVE_UNSIGNED_CHAR
+
+#ifdef HAVE_UNSIGNED_CHAR
+unsigned char un_char;
+#endif
+
+
+/* Now we want to find out if your compiler knows what "unsigned short" means.
+ * If you get an error on the "unsigned short un_short;" line,
+ * then undefine HAVE_UNSIGNED_SHORT.
+ */
+
+#define HAVE_UNSIGNED_SHORT
+
+#ifdef HAVE_UNSIGNED_SHORT
+unsigned short un_short;
+#endif
+
+
+/* Now we want to find out if your compiler understands type "void".
+ * If you get an error anywhere in here, undefine HAVE_VOID.
+ */
+
+#define HAVE_VOID
+
+#ifdef HAVE_VOID
+/* Caution: a C++ compiler will insist on complete prototypes */
+typedef void * void_ptr;	/* check void * */
+#ifdef HAVE_PROTOTYPES		/* check ptr to function returning void */
+typedef void (*void_func) (int a, int b);
+#else
+typedef void (*void_func) ();
+#endif
+
+#ifdef HAVE_PROTOTYPES		/* check void function result */
+void test3function (void_ptr arg1, void_func arg2)
+#else
+void test3function (arg1, arg2)
+     void_ptr arg1;
+     void_func arg2;
+#endif
+{
+  char * locptr = (char *) arg1; /* check casting to and from void * */
+  arg1 = (void *) locptr;
+  (*arg2) (1, 2);		/* check call of fcn returning void */
+}
+#endif
+
+
+/* Now we want to find out if your compiler knows what "const" means.
+ * If you get an error here, undefine HAVE_CONST.
+ */
+
+#define HAVE_CONST
+
+#ifdef HAVE_CONST
+static const int carray[3] = {1, 2, 3};
+
+#ifdef HAVE_PROTOTYPES
+int test4function (const int arg1)
+#else
+int test4function (arg1)
+     const int arg1;
+#endif
+{
+  return carray[arg1];
+}
+#endif
+
+
+/* If you get an error or warning about this structure definition,
+ * define INCOMPLETE_TYPES_BROKEN.
+ */
+
+#undef INCOMPLETE_TYPES_BROKEN
+
+#ifndef INCOMPLETE_TYPES_BROKEN
+typedef struct undefined_structure * undef_struct_ptr;
+#endif
+
+
+/* If you get an error about duplicate names,
+ * define NEED_SHORT_EXTERNAL_NAMES.
+ */
+
+#undef NEED_SHORT_EXTERNAL_NAMES
+
+#ifndef NEED_SHORT_EXTERNAL_NAMES
+
+int possibly_duplicate_function ()
+{
+  return 0;
+}
+
+int possibly_dupli_function ()
+{
+  return 1;
+}
+
+#endif
+
+
+
+/************************************************************************
+ *  OK, that's it.  You should not have to change anything beyond this
+ *  point in order to compile and execute this program.  (You might get
+ *  some warnings, but you can ignore them.)
+ *  When you run the program, it will make a couple more tests that it
+ *  can do automatically, and then it will create jconfig.h and print out
+ *  any additional suggestions it has.
+ ************************************************************************
+ */
+
+
+#ifdef HAVE_PROTOTYPES
+int is_char_signed (int arg)
+#else
+int is_char_signed (arg)
+     int arg;
+#endif
+{
+  if (arg == 189) {		/* expected result for unsigned char */
+    return 0;			/* type char is unsigned */
+  }
+  else if (arg != -67) {	/* expected result for signed char */
+    printf("Hmm, it seems 'char' is not eight bits wide on your machine.\n");
+    printf("I fear the JPEG software will not work at all.\n\n");
+  }
+  return 1;			/* assume char is signed otherwise */
+}
+
+
+#ifdef HAVE_PROTOTYPES
+int is_shifting_signed (long arg)
+#else
+int is_shifting_signed (arg)
+     long arg;
+#endif
+/* See whether right-shift on a long is signed or not. */
+{
+  long res = arg >> 4;
+
+  if (res == -0x7F7E80CL) {	/* expected result for signed shift */
+    return 1;			/* right shift is signed */
+  }
+  /* see if unsigned-shift hack will fix it. */
+  /* we can't just test exact value since it depends on width of long... */
+  res |= (~0L) << (32-4);
+  if (res == -0x7F7E80CL) {	/* expected result now? */
+    return 0;			/* right shift is unsigned */
+  }
+  printf("Right shift isn't acting as I expect it to.\n");
+  printf("I fear the JPEG software will not work at all.\n\n");
+  return 0;			/* try it with unsigned anyway */
+}
+
+
+#ifdef HAVE_PROTOTYPES
+int main (int argc, char ** argv)
+#else
+int main (argc, argv)
+     int argc;
+     char ** argv;
+#endif
+{
+  char signed_char_check = (char) (-67);
+  FILE *outfile;
+
+  /* Attempt to write jconfig.h */
+  if ((outfile = fopen("jconfig.h", "w")) == NULL) {
+    printf("Failed to write jconfig.h\n");
+    return 1;
+  }
+
+  /* Write out all the info */
+  fprintf(outfile, "/* jconfig.h --- generated by ckconfig.c */\n");
+  fprintf(outfile, "/* see jconfig.doc for explanations */\n\n");
+#ifdef HAVE_PROTOTYPES
+  fprintf(outfile, "#define HAVE_PROTOTYPES\n");
+#else
+  fprintf(outfile, "#undef HAVE_PROTOTYPES\n");
+#endif
+#ifdef HAVE_UNSIGNED_CHAR
+  fprintf(outfile, "#define HAVE_UNSIGNED_CHAR\n");
+#else
+  fprintf(outfile, "#undef HAVE_UNSIGNED_CHAR\n");
+#endif
+#ifdef HAVE_UNSIGNED_SHORT
+  fprintf(outfile, "#define HAVE_UNSIGNED_SHORT\n");
+#else
+  fprintf(outfile, "#undef HAVE_UNSIGNED_SHORT\n");
+#endif
+#ifdef HAVE_VOID
+  fprintf(outfile, "/* #define void char */\n");
+#else
+  fprintf(outfile, "#define void char\n");
+#endif
+#ifdef HAVE_CONST
+  fprintf(outfile, "/* #define const */\n");
+#else
+  fprintf(outfile, "#define const\n");
+#endif
+  if (is_char_signed((int) signed_char_check))
+    fprintf(outfile, "#undef CHAR_IS_UNSIGNED\n");
+  else
+    fprintf(outfile, "#define CHAR_IS_UNSIGNED\n");
+#ifdef HAVE_STDDEF_H
+  fprintf(outfile, "#define HAVE_STDDEF_H\n");
+#else
+  fprintf(outfile, "#undef HAVE_STDDEF_H\n");
+#endif
+#ifdef HAVE_STDLIB_H
+  fprintf(outfile, "#define HAVE_STDLIB_H\n");
+#else
+  fprintf(outfile, "#undef HAVE_STDLIB_H\n");
+#endif
+#ifdef NEED_BSD_STRINGS
+  fprintf(outfile, "#define NEED_BSD_STRINGS\n");
+#else
+  fprintf(outfile, "#undef NEED_BSD_STRINGS\n");
+#endif
+#ifdef NEED_SYS_TYPES_H
+  fprintf(outfile, "#define NEED_SYS_TYPES_H\n");
+#else
+  fprintf(outfile, "#undef NEED_SYS_TYPES_H\n");
+#endif
+  fprintf(outfile, "#undef NEED_FAR_POINTERS\n");
+#ifdef NEED_SHORT_EXTERNAL_NAMES
+  fprintf(outfile, "#define NEED_SHORT_EXTERNAL_NAMES\n");
+#else
+  fprintf(outfile, "#undef NEED_SHORT_EXTERNAL_NAMES\n");
+#endif
+#ifdef INCOMPLETE_TYPES_BROKEN
+  fprintf(outfile, "#define INCOMPLETE_TYPES_BROKEN\n");
+#else
+  fprintf(outfile, "#undef INCOMPLETE_TYPES_BROKEN\n");
+#endif
+  fprintf(outfile, "\n#ifdef JPEG_INTERNALS\n\n");
+  if (is_shifting_signed(-0x7F7E80B1L))
+    fprintf(outfile, "#undef RIGHT_SHIFT_IS_UNSIGNED\n");
+  else
+    fprintf(outfile, "#define RIGHT_SHIFT_IS_UNSIGNED\n");
+  fprintf(outfile, "\n#endif /* JPEG_INTERNALS */\n");
+  fprintf(outfile, "\n#ifdef JPEG_CJPEG_DJPEG\n\n");
+  fprintf(outfile, "#define BMP_SUPPORTED		/* BMP image file format */\n");
+  fprintf(outfile, "#define GIF_SUPPORTED		/* GIF image file format */\n");
+  fprintf(outfile, "#define PPM_SUPPORTED		/* PBMPLUS PPM/PGM image file format */\n");
+  fprintf(outfile, "#undef RLE_SUPPORTED		/* Utah RLE image file format */\n");
+  fprintf(outfile, "#define TARGA_SUPPORTED		/* Targa image file format */\n\n");
+  fprintf(outfile, "#undef TWO_FILE_COMMANDLINE	/* You may need this on non-Unix systems */\n");
+  fprintf(outfile, "#undef NEED_SIGNAL_CATCHER	/* Define this if you use jmemname.c */\n");
+  fprintf(outfile, "#undef DONT_USE_B_MODE\n");
+  fprintf(outfile, "/* #define PROGRESS_REPORT */	/* optional */\n");
+  fprintf(outfile, "\n#endif /* JPEG_CJPEG_DJPEG */\n");
+
+  /* Close the jconfig.h file */
+  fclose(outfile);
+
+  /* User report */
+  printf("Configuration check for Independent JPEG Group's software done.\n");
+  printf("\nI have written the jconfig.h file for you.\n\n");
+#ifdef HAVE_PROTOTYPES
+  printf("You should use makefile.ansi as the starting point for your Makefile.\n");
+#else
+  printf("You should use makefile.unix as the starting point for your Makefile.\n");
+#endif
+
+#ifdef NEED_SPECIAL_INCLUDE
+  printf("\nYou'll need to change jconfig.h to include the system include file\n");
+  printf("that you found type size_t in, or add a direct definition of type\n");
+  printf("size_t if that's what you used.  Just add it to the end.\n");
+#endif
+
+  return 0;
+}
diff --git a/uppsrc/plugin/jpg/lib/djpeg.c b/uppsrc/plugin/jpg/lib/djpeg.c
new file mode 100644
index 000000000..e099e90ae
--- /dev/null
+++ b/uppsrc/plugin/jpg/lib/djpeg.c
@@ -0,0 +1,616 @@
+/*
+ * djpeg.c
+ *
+ * Copyright (C) 1991-1997, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains a command-line user interface for the JPEG decompressor.
+ * It should work on any system with Unix- or MS-DOS-style command lines.
+ *
+ * Two different command line styles are permitted, depending on the
+ * compile-time switch TWO_FILE_COMMANDLINE:
+ *	djpeg [options]  inputfile outputfile
+ *	djpeg [options]  [inputfile]
+ * In the second style, output is always to standard output, which you'd
+ * normally redirect to a file or pipe to some other program.  Input is
+ * either from a named file or from standard input (typically redirected).
+ * The second style is convenient on Unix but is unhelpful on systems that
+ * don't support pipes.  Also, you MUST use the first style if your system
+ * doesn't do binary I/O to stdin/stdout.
+ * To simplify script writing, the "-outfile" switch is provided.  The syntax
+ *	djpeg [options]  -outfile outputfile  inputfile
+ * works regardless of which command line style is used.
+ */
+
+#include "cdjpeg.h"		/* Common decls for cjpeg/djpeg applications */
+#include "jversion.h"		/* for version message */
+
+#include <ctype.h>		/* to declare isprint() */
+
+#ifdef USE_CCOMMAND		/* command-line reader for Macintosh */
+#ifdef __MWERKS__
+#include <SIOUX.h>              /* Metrowerks needs this */
+#include <console.h>		/* ... and this */
+#endif
+#ifdef THINK_C
+#include <console.h>		/* Think declares it here */
+#endif
+#endif
+
+
+/* Create the add-on message string table. */
+
+#define JMESSAGE(code,string)	string ,
+
+static const char * const cdjpeg_message_table[] = {
+#include "cderror.h"
+  NULL
+};
+
+
+/*
+ * This list defines the known output image formats
+ * (not all of which need be supported by a given version).
+ * You can change the default output format by defining DEFAULT_FMT;
+ * indeed, you had better do so if you undefine PPM_SUPPORTED.
+ */
+
+typedef enum {
+	FMT_BMP,		/* BMP format (Windows flavor) */
+	FMT_GIF,		/* GIF format */
+	FMT_OS2,		/* BMP format (OS/2 flavor) */
+	FMT_PPM,		/* PPM/PGM (PBMPLUS formats) */
+	FMT_RLE,		/* RLE format */
+	FMT_TARGA,		/* Targa format */
+	FMT_TIFF		/* TIFF format */
+} IMAGE_FORMATS;
+
+#ifndef DEFAULT_FMT		/* so can override from CFLAGS in Makefile */
+#define DEFAULT_FMT	FMT_PPM
+#endif
+
+static IMAGE_FORMATS requested_fmt;
+
+
+/*
+ * Argument-parsing code.
+ * The switch parser is designed to be useful with DOS-style command line
+ * syntax, ie, intermixed switches and file names, where only the switches
+ * to the left of a given file name affect processing of that file.
+ * The main program in this file doesn't actually use this capability...
+ */
+
+
+static const char * progname;	/* program name for error messages */
+static char * outfilename;	/* for -outfile switch */
+
+
+LOCAL(void)
+usage (void)
+/* complain about bad command line */
+{
+  fprintf(stderr, "usage: %s [switches] ", progname);
+#ifdef TWO_FILE_COMMANDLINE
+  fprintf(stderr, "inputfile outputfile\n");
+#else
+  fprintf(stderr, "[inputfile]\n");
+#endif
+
+  fprintf(stderr, "Switches (names may be abbreviated):\n");
+  fprintf(stderr, "  -colors N      Reduce image to no more than N colors\n");
+  fprintf(stderr, "  -fast          Fast, low-quality processing\n");
+  fprintf(stderr, "  -grayscale     Force grayscale output\n");
+#ifdef IDCT_SCALING_SUPPORTED
+  fprintf(stderr, "  -scale M/N     Scale output image by fraction M/N, eg, 1/8\n");
+#endif
+#ifdef BMP_SUPPORTED
+  fprintf(stderr, "  -bmp           Select BMP output format (Windows style)%s\n",
+	  (DEFAULT_FMT == FMT_BMP ? " (default)" : ""));
+#endif
+#ifdef GIF_SUPPORTED
+  fprintf(stderr, "  -gif           Select GIF output format%s\n",
+	  (DEFAULT_FMT == FMT_GIF ? " (default)" : ""));
+#endif
+#ifdef BMP_SUPPORTED
+  fprintf(stderr, "  -os2           Select BMP output format (OS/2 style)%s\n",
+	  (DEFAULT_FMT == FMT_OS2 ? " (default)" : ""));
+#endif
+#ifdef PPM_SUPPORTED
+  fprintf(stderr, "  -pnm           Select PBMPLUS (PPM/PGM) output format%s\n",
+	  (DEFAULT_FMT == FMT_PPM ? " (default)" : ""));
+#endif
+#ifdef RLE_SUPPORTED
+  fprintf(stderr, "  -rle           Select Utah RLE output format%s\n",
+	  (DEFAULT_FMT == FMT_RLE ? " (default)" : ""));
+#endif
+#ifdef TARGA_SUPPORTED
+  fprintf(stderr, "  -targa         Select Targa output format%s\n",
+	  (DEFAULT_FMT == FMT_TARGA ? " (default)" : ""));
+#endif
+  fprintf(stderr, "Switches for advanced users:\n");
+#ifdef DCT_ISLOW_SUPPORTED
+  fprintf(stderr, "  -dct int       Use integer DCT method%s\n",
+	  (JDCT_DEFAULT == JDCT_ISLOW ? " (default)" : ""));
+#endif
+#ifdef DCT_IFAST_SUPPORTED
+  fprintf(stderr, "  -dct fast      Use fast integer DCT (less accurate)%s\n",
+	  (JDCT_DEFAULT == JDCT_IFAST ? " (default)" : ""));
+#endif
+#ifdef DCT_FLOAT_SUPPORTED
+  fprintf(stderr, "  -dct float     Use floating-point DCT method%s\n",
+	  (JDCT_DEFAULT == JDCT_FLOAT ? " (default)" : ""));
+#endif
+  fprintf(stderr, "  -dither fs     Use F-S dithering (default)\n");
+  fprintf(stderr, "  -dither none   Don't use dithering in quantization\n");
+  fprintf(stderr, "  -dither ordered  Use ordered dither (medium speed, quality)\n");
+#ifdef QUANT_2PASS_SUPPORTED
+  fprintf(stderr, "  -map FILE      Map to colors used in named image file\n");
+#endif
+  fprintf(stderr, "  -nosmooth      Don't use high-quality upsampling\n");
+#ifdef QUANT_1PASS_SUPPORTED
+  fprintf(stderr, "  -onepass       Use 1-pass quantization (fast, low quality)\n");
+#endif
+  fprintf(stderr, "  -maxmemory N   Maximum memory to use (in kbytes)\n");
+  fprintf(stderr, "  -outfile name  Specify name for output file\n");
+  fprintf(stderr, "  -verbose  or  -debug   Emit debug output\n");
+  exit(EXIT_FAILURE);
+}
+
+
+LOCAL(int)
+parse_switches (j_decompress_ptr cinfo, int argc, char **argv,
+		int last_file_arg_seen, boolean for_real)
+/* Parse optional switches.
+ * Returns argv[] index of first file-name argument (== argc if none).
+ * Any file names with indexes <= last_file_arg_seen are ignored;
+ * they have presumably been processed in a previous iteration.
+ * (Pass 0 for last_file_arg_seen on the first or only iteration.)
+ * for_real is FALSE on the first (dummy) pass; we may skip any expensive
+ * processing.
+ */
+{
+  int argn;
+  char * arg;
+
+  /* Set up default JPEG parameters. */
+  requested_fmt = DEFAULT_FMT;	/* set default output file format */
+  outfilename = NULL;
+  cinfo->err->trace_level = 0;
+
+  /* Scan command line options, adjust parameters */
+
+  for (argn = 1; argn < argc; argn++) {
+    arg = argv[argn];
+    if (*arg != '-') {
+      /* Not a switch, must be a file name argument */
+      if (argn <= last_file_arg_seen) {
+	outfilename = NULL;	/* -outfile applies to just one input file */
+	continue;		/* ignore this name if previously processed */
+      }
+      break;			/* else done parsing switches */
+    }
+    arg++;			/* advance past switch marker character */
+
+    if (keymatch(arg, "bmp", 1)) {
+      /* BMP output format. */
+      requested_fmt = FMT_BMP;
+
+    } else if (keymatch(arg, "colors", 1) || keymatch(arg, "colours", 1) ||
+	       keymatch(arg, "quantize", 1) || keymatch(arg, "quantise", 1)) {
+      /* Do color quantization. */
+      int val;
+
+      if (++argn >= argc)	/* advance to next argument */
+	usage();
+      if (sscanf(argv[argn], "%d", &val) != 1)
+	usage();
+      cinfo->desired_number_of_colors = val;
+      cinfo->quantize_colors = TRUE;
+
+    } else if (keymatch(arg, "dct", 2)) {
+      /* Select IDCT algorithm. */
+      if (++argn >= argc)	/* advance to next argument */
+	usage();
+      if (keymatch(argv[argn], "int", 1)) {
+	cinfo->dct_method = JDCT_ISLOW;
+      } else if (keymatch(argv[argn], "fast", 2)) {
+	cinfo->dct_method = JDCT_IFAST;
+      } else if (keymatch(argv[argn], "float", 2)) {
+	cinfo->dct_method = JDCT_FLOAT;
+      } else
+	usage();
+
+    } else if (keymatch(arg, "dither", 2)) {
+      /* Select dithering algorithm. */
+      if (++argn >= argc)	/* advance to next argument */
+	usage();
+      if (keymatch(argv[argn], "fs", 2)) {
+	cinfo->dither_mode = JDITHER_FS;
+      } else if (keymatch(argv[argn], "none", 2)) {
+	cinfo->dither_mode = JDITHER_NONE;
+      } else if (keymatch(argv[argn], "ordered", 2)) {
+	cinfo->dither_mode = JDITHER_ORDERED;
+      } else
+	usage();
+
+    } else if (keymatch(arg, "debug", 1) || keymatch(arg, "verbose", 1)) {
+      /* Enable debug printouts. */
+      /* On first -d, print version identification */
+      static boolean printed_version = FALSE;
+
+      if (! printed_version) {
+	fprintf(stderr, "Independent JPEG Group's DJPEG, version %s\n%s\n",
+		JVERSION, JCOPYRIGHT);
+	printed_version = TRUE;
+      }
+      cinfo->err->trace_level++;
+
+    } else if (keymatch(arg, "fast", 1)) {
+      /* Select recommended processing options for quick-and-dirty output. */
+      cinfo->two_pass_quantize = FALSE;
+      cinfo->dither_mode = JDITHER_ORDERED;
+      if (! cinfo->quantize_colors) /* don't override an earlier -colors */
+	cinfo->desired_number_of_colors = 216;
+      cinfo->dct_method = JDCT_FASTEST;
+      cinfo->do_fancy_upsampling = FALSE;
+
+    } else if (keymatch(arg, "gif", 1)) {
+      /* GIF output format. */
+      requested_fmt = FMT_GIF;
+
+    } else if (keymatch(arg, "grayscale", 2) || keymatch(arg, "greyscale",2)) {
+      /* Force monochrome output. */
+      cinfo->out_color_space = JCS_GRAYSCALE;
+
+    } else if (keymatch(arg, "map", 3)) {
+      /* Quantize to a color map taken from an input file. */
+      if (++argn >= argc)	/* advance to next argument */
+	usage();
+      if (for_real) {		/* too expensive to do twice! */
+#ifdef QUANT_2PASS_SUPPORTED	/* otherwise can't quantize to supplied map */
+	FILE * mapfile;
+
+	if ((mapfile = fopen(argv[argn], READ_BINARY)) == NULL) {
+	  fprintf(stderr, "%s: can't open %s\n", progname, argv[argn]);
+	  exit(EXIT_FAILURE);
+	}
+	read_color_map(cinfo, mapfile);
+	fclose(mapfile);
+	cinfo->quantize_colors = TRUE;
+#else
+	ERREXIT(cinfo, JERR_NOT_COMPILED);
+#endif
+      }
+
+    } else if (keymatch(arg, "maxmemory", 3)) {
+      /* Maximum memory in Kb (or Mb with 'm'). */
+      long lval;
+      char ch = 'x';
+
+      if (++argn >= argc)	/* advance to next argument */
+	usage();
+      if (sscanf(argv[argn], "%ld%c", &lval, &ch) < 1)
+	usage();
+      if (ch == 'm' || ch == 'M')
+	lval *= 1000L;
+      cinfo->mem->max_memory_to_use = lval * 1000L;
+
+    } else if (keymatch(arg, "nosmooth", 3)) {
+      /* Suppress fancy upsampling */
+      cinfo->do_fancy_upsampling = FALSE;
+
+    } else if (keymatch(arg, "onepass", 3)) {
+      /* Use fast one-pass quantization. */
+      cinfo->two_pass_quantize = FALSE;
+
+    } else if (keymatch(arg, "os2", 3)) {
+      /* BMP output format (OS/2 flavor). */
+      requested_fmt = FMT_OS2;
+
+    } else if (keymatch(arg, "outfile", 4)) {
+      /* Set output file name. */
+      if (++argn >= argc)	/* advance to next argument */
+	usage();
+      outfilename = argv[argn];	/* save it away for later use */
+
+    } else if (keymatch(arg, "pnm", 1) || keymatch(arg, "ppm", 1)) {
+      /* PPM/PGM output format. */
+      requested_fmt = FMT_PPM;
+
+    } else if (keymatch(arg, "rle", 1)) {
+      /* RLE output format. */
+      requested_fmt = FMT_RLE;
+
+    } else if (keymatch(arg, "scale", 1)) {
+      /* Scale the output image by a fraction M/N. */
+      if (++argn >= argc)	/* advance to next argument */
+	usage();
+      if (sscanf(argv[argn], "%d/%d",
+		 &cinfo->scale_num, &cinfo->scale_denom) != 2)
+	usage();
+
+    } else if (keymatch(arg, "targa", 1)) {
+      /* Targa output format. */
+      requested_fmt = FMT_TARGA;
+
+    } else {
+      usage();			/* bogus switch */
+    }
+  }
+
+  return argn;			/* return index of next arg (file name) */
+}
+
+
+/*
+ * Marker processor for COM and interesting APPn markers.
+ * This replaces the library's built-in processor, which just skips the marker.
+ * We want to print out the marker as text, to the extent possible.
+ * Note this code relies on a non-suspending data source.
+ */
+
+LOCAL(unsigned int)
+jpeg_getc (j_decompress_ptr cinfo)
+/* Read next byte */
+{
+  struct jpeg_source_mgr * datasrc = cinfo->src;
+
+  if (datasrc->bytes_in_buffer == 0) {
+    if (! (*datasrc->fill_input_buffer) (cinfo))
+      ERREXIT(cinfo, JERR_CANT_SUSPEND);
+  }
+  datasrc->bytes_in_buffer--;
+  return GETJOCTET(*datasrc->next_input_byte++);
+}
+
+
+METHODDEF(boolean)
+print_text_marker (j_decompress_ptr cinfo)
+{
+  boolean traceit = (cinfo->err->trace_level >= 1);
+  INT32 length;
+  unsigned int ch;
+  unsigned int lastch = 0;
+
+  length = jpeg_getc(cinfo) << 8;
+  length += jpeg_getc(cinfo);
+  length -= 2;			/* discount the length word itself */
+
+  if (traceit) {
+    if (cinfo->unread_marker == JPEG_COM)
+      fprintf(stderr, "Comment, length %ld:\n", (long) length);
+    else			/* assume it is an APPn otherwise */
+      fprintf(stderr, "APP%d, length %ld:\n",
+	      cinfo->unread_marker - JPEG_APP0, (long) length);
+  }
+
+  while (--length >= 0) {
+    ch = jpeg_getc(cinfo);
+    if (traceit) {
+      /* Emit the character in a readable form.
+       * Nonprintables are converted to \nnn form,
+       * while \ is converted to \\.
+       * Newlines in CR, CR/LF, or LF form will be printed as one newline.
+       */
+      if (ch == '\r') {
+	fprintf(stderr, "\n");
+      } else if (ch == '\n') {
+	if (lastch != '\r')
+	  fprintf(stderr, "\n");
+      } else if (ch == '\\') {
+	fprintf(stderr, "\\\\");
+      } else if (isprint(ch)) {
+	putc(ch, stderr);
+      } else {
+	fprintf(stderr, "\\%03o", ch);
+      }
+      lastch = ch;
+    }
+  }
+
+  if (traceit)
+    fprintf(stderr, "\n");
+
+  return TRUE;
+}
+
+
+/*
+ * The main program.
+ */
+
+int
+main (int argc, char **argv)
+{
+  struct jpeg_decompress_struct cinfo;
+  struct jpeg_error_mgr jerr;
+#ifdef PROGRESS_REPORT
+  struct cdjpeg_progress_mgr progress;
+#endif
+  int file_index;
+  djpeg_dest_ptr dest_mgr = NULL;
+  FILE * input_file;
+  FILE * output_file;
+  JDIMENSION num_scanlines;
+
+  /* On Mac, fetch a command line. */
+#ifdef USE_CCOMMAND
+  argc = ccommand(&argv);
+#endif
+
+  progname = argv[0];
+  if (progname == NULL || progname[0] == 0)
+    progname = "djpeg";		/* in case C library doesn't provide it */
+
+  /* Initialize the JPEG decompression object with default error handling. */
+  cinfo.err = jpeg_std_error(&jerr);
+  jpeg_create_decompress(&cinfo);
+  /* Add some application-specific error messages (from cderror.h) */
+  jerr.addon_message_table = cdjpeg_message_table;
+  jerr.first_addon_message = JMSG_FIRSTADDONCODE;
+  jerr.last_addon_message = JMSG_LASTADDONCODE;
+
+  /* Insert custom marker processor for COM and APP12.
+   * APP12 is used by some digital camera makers for textual info,
+   * so we provide the ability to display it as text.
+   * If you like, additional APPn marker types can be selected for display,
+   * but don't try to override APP0 or APP14 this way (see libjpeg.doc).
+   */
+  jpeg_set_marker_processor(&cinfo, JPEG_COM, print_text_marker);
+  jpeg_set_marker_processor(&cinfo, JPEG_APP0+12, print_text_marker);
+
+  /* Now safe to enable signal catcher. */
+#ifdef NEED_SIGNAL_CATCHER
+  enable_signal_catcher((j_common_ptr) &cinfo);
+#endif
+
+  /* Scan command line to find file names. */
+  /* It is convenient to use just one switch-parsing routine, but the switch
+   * values read here are ignored; we will rescan the switches after opening
+   * the input file.
+   * (Exception: tracing level set here controls verbosity for COM markers
+   * found during jpeg_read_header...)
+   */
+
+  file_index = parse_switches(&cinfo, argc, argv, 0, FALSE);
+
+#ifdef TWO_FILE_COMMANDLINE
+  /* Must have either -outfile switch or explicit output file name */
+  if (outfilename == NULL) {
+    if (file_index != argc-2) {
+      fprintf(stderr, "%s: must name one input and one output file\n",
+	      progname);
+      usage();
+    }
+    outfilename = argv[file_index+1];
+  } else {
+    if (file_index != argc-1) {
+      fprintf(stderr, "%s: must name one input and one output file\n",
+	      progname);
+      usage();
+    }
+  }
+#else
+  /* Unix style: expect zero or one file name */
+  if (file_index < argc-1) {
+    fprintf(stderr, "%s: only one input file\n", progname);
+    usage();
+  }
+#endif /* TWO_FILE_COMMANDLINE */
+
+  /* Open the input file. */
+  if (file_index < argc) {
+    if ((input_file = fopen(argv[file_index], READ_BINARY)) == NULL) {
+      fprintf(stderr, "%s: can't open %s\n", progname, argv[file_index]);
+      exit(EXIT_FAILURE);
+    }
+  } else {
+    /* default input file is stdin */
+    input_file = read_stdin();
+  }
+
+  /* Open the output file. */
+  if (outfilename != NULL) {
+    if ((output_file = fopen(outfilename, WRITE_BINARY)) == NULL) {
+      fprintf(stderr, "%s: can't open %s\n", progname, outfilename);
+      exit(EXIT_FAILURE);
+    }
+  } else {
+    /* default output file is stdout */
+    output_file = write_stdout();
+  }
+
+#ifdef PROGRESS_REPORT
+  start_progress_monitor((j_common_ptr) &cinfo, &progress);
+#endif
+
+  /* Specify data source for decompression */
+  jpeg_stdio_src(&cinfo, input_file);
+
+  /* Read file header, set default decompression parameters */
+  (void) jpeg_read_header(&cinfo, TRUE);
+
+  /* Adjust default decompression parameters by re-parsing the options */
+  file_index = parse_switches(&cinfo, argc, argv, 0, TRUE);
+
+  /* Initialize the output module now to let it override any crucial
+   * option settings (for instance, GIF wants to force color quantization).
+   */
+  switch (requested_fmt) {
+#ifdef BMP_SUPPORTED
+  case FMT_BMP:
+    dest_mgr = jinit_write_bmp(&cinfo, FALSE);
+    break;
+  case FMT_OS2:
+    dest_mgr = jinit_write_bmp(&cinfo, TRUE);
+    break;
+#endif
+#ifdef GIF_SUPPORTED
+  case FMT_GIF:
+    dest_mgr = jinit_write_gif(&cinfo);
+    break;
+#endif
+#ifdef PPM_SUPPORTED
+  case FMT_PPM:
+    dest_mgr = jinit_write_ppm(&cinfo);
+    break;
+#endif
+#ifdef RLE_SUPPORTED
+  case FMT_RLE:
+    dest_mgr = jinit_write_rle(&cinfo);
+    break;
+#endif
+#ifdef TARGA_SUPPORTED
+  case FMT_TARGA:
+    dest_mgr = jinit_write_targa(&cinfo);
+    break;
+#endif
+  default:
+    ERREXIT(&cinfo, JERR_UNSUPPORTED_FORMAT);
+    break;
+  }
+  dest_mgr->output_file = output_file;
+
+  /* Start decompressor */
+  (void) jpeg_start_decompress(&cinfo);
+
+  /* Write output file header */
+  (*dest_mgr->start_output) (&cinfo, dest_mgr);
+
+  /* Process data */
+  while (cinfo.output_scanline < cinfo.output_height) {
+    num_scanlines = jpeg_read_scanlines(&cinfo, dest_mgr->buffer,
+					dest_mgr->buffer_height);
+    (*dest_mgr->put_pixel_rows) (&cinfo, dest_mgr, num_scanlines);
+  }
+
+#ifdef PROGRESS_REPORT
+  /* Hack: count final pass as done in case finish_output does an extra pass.
+   * The library won't have updated completed_passes.
+   */
+  progress.pub.completed_passes = progress.pub.total_passes;
+#endif
+
+  /* Finish decompression and release memory.
+   * I must do it in this order because output module has allocated memory
+   * of lifespan JPOOL_IMAGE; it needs to finish before releasing memory.
+   */
+  (*dest_mgr->finish_output) (&cinfo, dest_mgr);
+  (void) jpeg_finish_decompress(&cinfo);
+  jpeg_destroy_decompress(&cinfo);
+
+  /* Close files, if we opened them */
+  if (input_file != stdin)
+    fclose(input_file);
+  if (output_file != stdout)
+    fclose(output_file);
+
+#ifdef PROGRESS_REPORT
+  end_progress_monitor((j_common_ptr) &cinfo);
+#endif
+
+  /* All done. */
+  exit(jerr.num_warnings ? EXIT_WARNING : EXIT_SUCCESS);
+  return 0;			/* suppress no-return-value warnings */
+}
diff --git a/uppsrc/plugin/jpg/lib/example.c b/uppsrc/plugin/jpg/lib/example.c
new file mode 100644
index 000000000..1c3f7175a
--- /dev/null
+++ b/uppsrc/plugin/jpg/lib/example.c
@@ -0,0 +1,433 @@
+/*
+ * example.c
+ *
+ * This file illustrates how to use the IJG code as a subroutine library
+ * to read or write JPEG image files.  You should look at this code in
+ * conjunction with the documentation file libjpeg.doc.
+ *
+ * This code will not do anything useful as-is, but it may be helpful as a
+ * skeleton for constructing routines that call the JPEG library.
+ *
+ * We present these routines in the same coding style used in the JPEG code
+ * (ANSI function definitions, etc); but you are of course free to code your
+ * routines in a different style if you prefer.
+ */
+
+#include <stdio.h>
+
+/*
+ * Include file for users of JPEG library.
+ * You will need to have included system headers that define at least
+ * the typedefs FILE and size_t before you can include jpeglib.h.
+ * (stdio.h is sufficient on ANSI-conforming systems.)
+ * You may also wish to include "jerror.h".
+ */
+
+#include "jpeglib.h"
+
+/*
+ * <setjmp.h> is used for the optional error recovery mechanism shown in
+ * the second part of the example.
+ */
+
+#include <setjmp.h>
+
+
+
+/******************** JPEG COMPRESSION SAMPLE INTERFACE *******************/
+
+/* This half of the example shows how to feed data into the JPEG compressor.
+ * We present a minimal version that does not worry about refinements such
+ * as error recovery (the JPEG code will just exit() if it gets an error).
+ */
+
+
+/*
+ * IMAGE DATA FORMATS:
+ *
+ * The standard input image format is a rectangular array of pixels, with
+ * each pixel having the same number of "component" values (color channels).
+ * Each pixel row is an array of JSAMPLEs (which typically are unsigned chars).
+ * If you are working with color data, then the color values for each pixel
+ * must be adjacent in the row; for example, R,G,B,R,G,B,R,G,B,... for 24-bit
+ * RGB color.
+ *
+ * For this example, we'll assume that this data structure matches the way
+ * our application has stored the image in memory, so we can just pass a
+ * pointer to our image buffer.  In particular, let's say that the image is
+ * RGB color and is described by:
+ */
+
+extern JSAMPLE * image_buffer;	/* Points to large array of R,G,B-order data */
+extern int image_height;	/* Number of rows in image */
+extern int image_width;		/* Number of columns in image */
+
+
+/*
+ * Sample routine for JPEG compression.  We assume that the target file name
+ * and a compression quality factor are passed in.
+ */
+
+GLOBAL(void)
+write_JPEG_file (char * filename, int quality)
+{
+  /* This struct contains the JPEG compression parameters and pointers to
+   * working space (which is allocated as needed by the JPEG library).
+   * It is possible to have several such structures, representing multiple
+   * compression/decompression processes, in existence at once.  We refer
+   * to any one struct (and its associated working data) as a "JPEG object".
+   */
+  struct jpeg_compress_struct cinfo;
+  /* This struct represents a JPEG error handler.  It is declared separately
+   * because applications often want to supply a specialized error handler
+   * (see the second half of this file for an example).  But here we just
+   * take the easy way out and use the standard error handler, which will
+   * print a message on stderr and call exit() if compression fails.
+   * Note that this struct must live as long as the main JPEG parameter
+   * struct, to avoid dangling-pointer problems.
+   */
+  struct jpeg_error_mgr jerr;
+  /* More stuff */
+  FILE * outfile;		/* target file */
+  JSAMPROW row_pointer[1];	/* pointer to JSAMPLE row[s] */
+  int row_stride;		/* physical row width in image buffer */
+
+  /* Step 1: allocate and initialize JPEG compression object */
+
+  /* We have to set up the error handler first, in case the initialization
+   * step fails.  (Unlikely, but it could happen if you are out of memory.)
+   * This routine fills in the contents of struct jerr, and returns jerr's
+   * address which we place into the link field in cinfo.
+   */
+  cinfo.err = jpeg_std_error(&jerr);
+  /* Now we can initialize the JPEG compression object. */
+  jpeg_create_compress(&cinfo);
+
+  /* Step 2: specify data destination (eg, a file) */
+  /* Note: steps 2 and 3 can be done in either order. */
+
+  /* Here we use the library-supplied code to send compressed data to a
+   * stdio stream.  You can also write your own code to do something else.
+   * VERY IMPORTANT: use "b" option to fopen() if you are on a machine that
+   * requires it in order to write binary files.
+   */
+  if ((outfile = fopen(filename, "wb")) == NULL) {
+    fprintf(stderr, "can't open %s\n", filename);
+    exit(1);
+  }
+  jpeg_stdio_dest(&cinfo, outfile);
+
+  /* Step 3: set parameters for compression */
+
+  /* First we supply a description of the input image.
+   * Four fields of the cinfo struct must be filled in:
+   */
+  cinfo.image_width = image_width; 	/* image width and height, in pixels */
+  cinfo.image_height = image_height;
+  cinfo.input_components = 3;		/* # of color components per pixel */
+  cinfo.in_color_space = JCS_RGB; 	/* colorspace of input image */
+  /* Now use the library's routine to set default compression parameters.
+   * (You must set at least cinfo.in_color_space before calling this,
+   * since the defaults depend on the source color space.)
+   */
+  jpeg_set_defaults(&cinfo);
+  /* Now you can set any non-default parameters you wish to.
+   * Here we just illustrate the use of quality (quantization table) scaling:
+   */
+  jpeg_set_quality(&cinfo, quality, TRUE /* limit to baseline-JPEG values */);
+
+  /* Step 4: Start compressor */
+
+  /* TRUE ensures that we will write a complete interchange-JPEG file.
+   * Pass TRUE unless you are very sure of what you're doing.
+   */
+  jpeg_start_compress(&cinfo, TRUE);
+
+  /* Step 5: while (scan lines remain to be written) */
+  /*           jpeg_write_scanlines(...); */
+
+  /* Here we use the library's state variable cinfo.next_scanline as the
+   * loop counter, so that we don't have to keep track ourselves.
+   * To keep things simple, we pass one scanline per call; you can pass
+   * more if you wish, though.
+   */
+  row_stride = image_width * 3;	/* JSAMPLEs per row in image_buffer */
+
+  while (cinfo.next_scanline < cinfo.image_height) {
+    /* jpeg_write_scanlines expects an array of pointers to scanlines.
+     * Here the array is only one element long, but you could pass
+     * more than one scanline at a time if that's more convenient.
+     */
+    row_pointer[0] = & image_buffer[cinfo.next_scanline * row_stride];
+    (void) jpeg_write_scanlines(&cinfo, row_pointer, 1);
+  }
+
+  /* Step 6: Finish compression */
+
+  jpeg_finish_compress(&cinfo);
+  /* After finish_compress, we can close the output file. */
+  fclose(outfile);
+
+  /* Step 7: release JPEG compression object */
+
+  /* This is an important step since it will release a good deal of memory. */
+  jpeg_destroy_compress(&cinfo);
+
+  /* And we're done! */
+}
+
+
+/*
+ * SOME FINE POINTS:
+ *
+ * In the above loop, we ignored the return value of jpeg_write_scanlines,
+ * which is the number of scanlines actually written.  We could get away
+ * with this because we were only relying on the value of cinfo.next_scanline,
+ * which will be incremented correctly.  If you maintain additional loop
+ * variables then you should be careful to increment them properly.
+ * Actually, for output to a stdio stream you needn't worry, because
+ * then jpeg_write_scanlines will write all the lines passed (or else exit
+ * with a fatal error).  Partial writes can only occur if you use a data
+ * destination module that can demand suspension of the compressor.
+ * (If you don't know what that's for, you don't need it.)
+ *
+ * If the compressor requires full-image buffers (for entropy-coding
+ * optimization or a multi-scan JPEG file), it will create temporary
+ * files for anything that doesn't fit within the maximum-memory setting.
+ * (Note that temp files are NOT needed if you use the default parameters.)
+ * On some systems you may need to set up a signal handler to ensure that
+ * temporary files are deleted if the program is interrupted.  See libjpeg.doc.
+ *
+ * Scanlines MUST be supplied in top-to-bottom order if you want your JPEG
+ * files to be compatible with everyone else's.  If you cannot readily read
+ * your data in that order, you'll need an intermediate array to hold the
+ * image.  See rdtarga.c or rdbmp.c for examples of handling bottom-to-top
+ * source data using the JPEG code's internal virtual-array mechanisms.
+ */
+
+
+
+/******************** JPEG DECOMPRESSION SAMPLE INTERFACE *******************/
+
+/* This half of the example shows how to read data from the JPEG decompressor.
+ * It's a bit more refined than the above, in that we show:
+ *   (a) how to modify the JPEG library's standard error-reporting behavior;
+ *   (b) how to allocate workspace using the library's memory manager.
+ *
+ * Just to make this example a little different from the first one, we'll
+ * assume that we do not intend to put the whole image into an in-memory
+ * buffer, but to send it line-by-line someplace else.  We need a one-
+ * scanline-high JSAMPLE array as a work buffer, and we will let the JPEG
+ * memory manager allocate it for us.  This approach is actually quite useful
+ * because we don't need to remember to deallocate the buffer separately: it
+ * will go away automatically when the JPEG object is cleaned up.
+ */
+
+
+/*
+ * ERROR HANDLING:
+ *
+ * The JPEG library's standard error handler (jerror.c) is divided into
+ * several "methods" which you can override individually.  This lets you
+ * adjust the behavior without duplicating a lot of code, which you might
+ * have to update with each future release.
+ *
+ * Our example here shows how to override the "error_exit" method so that
+ * control is returned to the library's caller when a fatal error occurs,
+ * rather than calling exit() as the standard error_exit method does.
+ *
+ * We use C's setjmp/longjmp facility to return control.  This means that the
+ * routine which calls the JPEG library must first execute a setjmp() call to
+ * establish the return point.  We want the replacement error_exit to do a
+ * longjmp().  But we need to make the setjmp buffer accessible to the
+ * error_exit routine.  To do this, we make a private extension of the
+ * standard JPEG error handler object.  (If we were using C++, we'd say we
+ * were making a subclass of the regular error handler.)
+ *
+ * Here's the extended error handler struct:
+ */
+
+struct my_error_mgr {
+  struct jpeg_error_mgr pub;	/* "public" fields */
+
+  jmp_buf setjmp_buffer;	/* for return to caller */
+};
+
+typedef struct my_error_mgr * my_error_ptr;
+
+/*
+ * Here's the routine that will replace the standard error_exit method:
+ */
+
+METHODDEF(void)
+my_error_exit (j_common_ptr cinfo)
+{
+  /* cinfo->err really points to a my_error_mgr struct, so coerce pointer */
+  my_error_ptr myerr = (my_error_ptr) cinfo->err;
+
+  /* Always display the message. */
+  /* We could postpone this until after returning, if we chose. */
+  (*cinfo->err->output_message) (cinfo);
+
+  /* Return control to the setjmp point */
+  longjmp(myerr->setjmp_buffer, 1);
+}
+
+
+/*
+ * Sample routine for JPEG decompression.  We assume that the source file name
+ * is passed in.  We want to return 1 on success, 0 on error.
+ */
+
+
+GLOBAL(int)
+read_JPEG_file (char * filename)
+{
+  /* This struct contains the JPEG decompression parameters and pointers to
+   * working space (which is allocated as needed by the JPEG library).
+   */
+  struct jpeg_decompress_struct cinfo;
+  /* We use our private extension JPEG error handler.
+   * Note that this struct must live as long as the main JPEG parameter
+   * struct, to avoid dangling-pointer problems.
+   */
+  struct my_error_mgr jerr;
+  /* More stuff */
+  FILE * infile;		/* source file */
+  JSAMPARRAY buffer;		/* Output row buffer */
+  int row_stride;		/* physical row width in output buffer */
+
+  /* In this example we want to open the input file before doing anything else,
+   * so that the setjmp() error recovery below can assume the file is open.
+   * VERY IMPORTANT: use "b" option to fopen() if you are on a machine that
+   * requires it in order to read binary files.
+   */
+
+  if ((infile = fopen(filename, "rb")) == NULL) {
+    fprintf(stderr, "can't open %s\n", filename);
+    return 0;
+  }
+
+  /* Step 1: allocate and initialize JPEG decompression object */
+
+  /* We set up the normal JPEG error routines, then override error_exit. */
+  cinfo.err = jpeg_std_error(&jerr.pub);
+  jerr.pub.error_exit = my_error_exit;
+  /* Establish the setjmp return context for my_error_exit to use. */
+  if (setjmp(jerr.setjmp_buffer)) {
+    /* If we get here, the JPEG code has signaled an error.
+     * We need to clean up the JPEG object, close the input file, and return.
+     */
+    jpeg_destroy_decompress(&cinfo);
+    fclose(infile);
+    return 0;
+  }
+  /* Now we can initialize the JPEG decompression object. */
+  jpeg_create_decompress(&cinfo);
+
+  /* Step 2: specify data source (eg, a file) */
+
+  jpeg_stdio_src(&cinfo, infile);
+
+  /* Step 3: read file parameters with jpeg_read_header() */
+
+  (void) jpeg_read_header(&cinfo, TRUE);
+  /* We can ignore the return value from jpeg_read_header since
+   *   (a) suspension is not possible with the stdio data source, and
+   *   (b) we passed TRUE to reject a tables-only JPEG file as an error.
+   * See libjpeg.doc for more info.
+   */
+
+  /* Step 4: set parameters for decompression */
+
+  /* In this example, we don't need to change any of the defaults set by
+   * jpeg_read_header(), so we do nothing here.
+   */
+
+  /* Step 5: Start decompressor */
+
+  (void) jpeg_start_decompress(&cinfo);
+  /* We can ignore the return value since suspension is not possible
+   * with the stdio data source.
+   */
+
+  /* We may need to do some setup of our own at this point before reading
+   * the data.  After jpeg_start_decompress() we have the correct scaled
+   * output image dimensions available, as well as the output colormap
+   * if we asked for color quantization.
+   * In this example, we need to make an output work buffer of the right size.
+   */
+  /* JSAMPLEs per row in output buffer */
+  row_stride = cinfo.output_width * cinfo.output_components;
+  /* Make a one-row-high sample array that will go away when done with image */
+  buffer = (*cinfo.mem->alloc_sarray)
+		((j_common_ptr) &cinfo, JPOOL_IMAGE, row_stride, 1);
+
+  /* Step 6: while (scan lines remain to be read) */
+  /*           jpeg_read_scanlines(...); */
+
+  /* Here we use the library's state variable cinfo.output_scanline as the
+   * loop counter, so that we don't have to keep track ourselves.
+   */
+  while (cinfo.output_scanline < cinfo.output_height) {
+    /* jpeg_read_scanlines expects an array of pointers to scanlines.
+     * Here the array is only one element long, but you could ask for
+     * more than one scanline at a time if that's more convenient.
+     */
+    (void) jpeg_read_scanlines(&cinfo, buffer, 1);
+    /* Assume put_scanline_someplace wants a pointer and sample count. */
+    put_scanline_someplace(buffer[0], row_stride);
+  }
+
+  /* Step 7: Finish decompression */
+
+  (void) jpeg_finish_decompress(&cinfo);
+  /* We can ignore the return value since suspension is not possible
+   * with the stdio data source.
+   */
+
+  /* Step 8: Release JPEG decompression object */
+
+  /* This is an important step since it will release a good deal of memory. */
+  jpeg_destroy_decompress(&cinfo);
+
+  /* After finish_decompress, we can close the input file.
+   * Here we postpone it until after no more JPEG errors are possible,
+   * so as to simplify the setjmp error logic above.  (Actually, I don't
+   * think that jpeg_destroy can do an error exit, but why assume anything...)
+   */
+  fclose(infile);
+
+  /* At this point you may want to check to see whether any corrupt-data
+   * warnings occurred (test whether jerr.pub.num_warnings is nonzero).
+   */
+
+  /* And we're done! */
+  return 1;
+}
+
+
+/*
+ * SOME FINE POINTS:
+ *
+ * In the above code, we ignored the return value of jpeg_read_scanlines,
+ * which is the number of scanlines actually read.  We could get away with
+ * this because we asked for only one line at a time and we weren't using
+ * a suspending data source.  See libjpeg.doc for more info.
+ *
+ * We cheated a bit by calling alloc_sarray() after jpeg_start_decompress();
+ * we should have done it beforehand to ensure that the space would be
+ * counted against the JPEG max_memory setting.  In some systems the above
+ * code would risk an out-of-memory error.  However, in general we don't
+ * know the output image dimensions before jpeg_start_decompress(), unless we
+ * call jpeg_calc_output_dimensions().  See libjpeg.doc for more about this.
+ *
+ * Scanlines are returned in the same order as they appear in the JPEG file,
+ * which is standardly top-to-bottom.  If you must emit data bottom-to-top,
+ * you can use one of the virtual arrays provided by the JPEG memory manager
+ * to invert the data.  See wrbmp.c for an example.
+ *
+ * As with compression, some operating modes may require temporary files.
+ * On some systems you may need to set up a signal handler to ensure that
+ * temporary files are deleted if the program is interrupted.  See libjpeg.doc.
+ */
diff --git a/uppsrc/plugin/jpg/lib/jcapimin.c b/uppsrc/plugin/jpg/lib/jcapimin.c
new file mode 100644
index 000000000..927c002ae
--- /dev/null
+++ b/uppsrc/plugin/jpg/lib/jcapimin.c
@@ -0,0 +1,280 @@
+/*
+ * jcapimin.c
+ *
+ * Copyright (C) 1994-1998, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains application interface code for the compression half
+ * of the JPEG library.  These are the "minimum" API routines that may be
+ * needed in either the normal full-compression case or the transcoding-only
+ * case.
+ *
+ * Most of the routines intended to be called directly by an application
+ * are in this file or in jcapistd.c.  But also see jcparam.c for
+ * parameter-setup helper routines, jcomapi.c for routines shared by
+ * compression and decompression, and jctrans.c for the transcoding case.
+ */
+
+#define JPEG_INTERNALS
+#include "jinclude.h"
+#include "jpeglib.h"
+
+
+/*
+ * Initialization of a JPEG compression object.
+ * The error manager must already be set up (in case memory manager fails).
+ */
+
+GLOBAL(void)
+jpeg_CreateCompress (j_compress_ptr cinfo, int version, size_t structsize)
+{
+  int i;
+
+  /* Guard against version mismatches between library and caller. */
+  cinfo->mem = NULL;		/* so jpeg_destroy knows mem mgr not called */
+  if (version != JPEG_LIB_VERSION)
+    ERREXIT2(cinfo, JERR_BAD_LIB_VERSION, JPEG_LIB_VERSION, version);
+  if (structsize != SIZEOF(struct jpeg_compress_struct))
+    ERREXIT2(cinfo, JERR_BAD_STRUCT_SIZE,
+	     (int) SIZEOF(struct jpeg_compress_struct), (int) structsize);
+
+  /* For debugging purposes, we zero the whole master structure.
+   * But the application has already set the err pointer, and may have set
+   * client_data, so we have to save and restore those fields.
+   * Note: if application hasn't set client_data, tools like Purify may
+   * complain here.
+   */
+  {
+    struct jpeg_error_mgr * err = cinfo->err;
+    void * client_data = cinfo->client_data; /* ignore Purify complaint here */
+    MEMZERO(cinfo, SIZEOF(struct jpeg_compress_struct));
+    cinfo->err = err;
+    cinfo->client_data = client_data;
+  }
+  cinfo->is_decompressor = FALSE;
+
+  /* Initialize a memory manager instance for this object */
+  jinit_memory_mgr((j_common_ptr) cinfo);
+
+  /* Zero out pointers to permanent structures. */
+  cinfo->progress = NULL;
+  cinfo->dest = NULL;
+
+  cinfo->comp_info = NULL;
+
+  for (i = 0; i < NUM_QUANT_TBLS; i++)
+    cinfo->quant_tbl_ptrs[i] = NULL;
+
+  for (i = 0; i < NUM_HUFF_TBLS; i++) {
+    cinfo->dc_huff_tbl_ptrs[i] = NULL;
+    cinfo->ac_huff_tbl_ptrs[i] = NULL;
+  }
+
+  cinfo->script_space = NULL;
+
+  cinfo->input_gamma = 1.0;	/* in case application forgets */
+
+  /* OK, I'm ready */
+  cinfo->global_state = CSTATE_START;
+}
+
+
+/*
+ * Destruction of a JPEG compression object
+ */
+
+GLOBAL(void)
+jpeg_destroy_compress (j_compress_ptr cinfo)
+{
+  jpeg_destroy((j_common_ptr) cinfo); /* use common routine */
+}
+
+
+/*
+ * Abort processing of a JPEG compression operation,
+ * but don't destroy the object itself.
+ */
+
+GLOBAL(void)
+jpeg_abort_compress (j_compress_ptr cinfo)
+{
+  jpeg_abort((j_common_ptr) cinfo); /* use common routine */
+}
+
+
+/*
+ * Forcibly suppress or un-suppress all quantization and Huffman tables.
+ * Marks all currently defined tables as already written (if suppress)
+ * or not written (if !suppress).  This will control whether they get emitted
+ * by a subsequent jpeg_start_compress call.
+ *
+ * This routine is exported for use by applications that want to produce
+ * abbreviated JPEG datastreams.  It logically belongs in jcparam.c, but
+ * since it is called by jpeg_start_compress, we put it here --- otherwise
+ * jcparam.o would be linked whether the application used it or not.
+ */
+
+GLOBAL(void)
+jpeg_suppress_tables (j_compress_ptr cinfo, boolean suppress)
+{
+  int i;
+  JQUANT_TBL * qtbl;
+  JHUFF_TBL * htbl;
+
+  for (i = 0; i < NUM_QUANT_TBLS; i++) {
+    if ((qtbl = cinfo->quant_tbl_ptrs[i]) != NULL)
+      qtbl->sent_table = suppress;
+  }
+
+  for (i = 0; i < NUM_HUFF_TBLS; i++) {
+    if ((htbl = cinfo->dc_huff_tbl_ptrs[i]) != NULL)
+      htbl->sent_table = suppress;
+    if ((htbl = cinfo->ac_huff_tbl_ptrs[i]) != NULL)
+      htbl->sent_table = suppress;
+  }
+}
+
+
+/*
+ * Finish JPEG compression.
+ *
+ * If a multipass operating mode was selected, this may do a great deal of
+ * work including most of the actual output.
+ */
+
+GLOBAL(void)
+jpeg_finish_compress (j_compress_ptr cinfo)
+{
+  JDIMENSION iMCU_row;
+
+  if (cinfo->global_state == CSTATE_SCANNING ||
+      cinfo->global_state == CSTATE_RAW_OK) {
+    /* Terminate first pass */
+    if (cinfo->next_scanline < cinfo->image_height)
+      ERREXIT(cinfo, JERR_TOO_LITTLE_DATA);
+    (*cinfo->master->finish_pass) (cinfo);
+  } else if (cinfo->global_state != CSTATE_WRCOEFS)
+    ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);
+  /* Perform any remaining passes */
+  while (! cinfo->master->is_last_pass) {
+    (*cinfo->master->prepare_for_pass) (cinfo);
+    for (iMCU_row = 0; iMCU_row < cinfo->total_iMCU_rows; iMCU_row++) {
+      if (cinfo->progress != NULL) {
+	cinfo->progress->pass_counter = (long) iMCU_row;
+	cinfo->progress->pass_limit = (long) cinfo->total_iMCU_rows;
+	(*cinfo->progress->progress_monitor) ((j_common_ptr) cinfo);
+      }
+      /* We bypass the main controller and invoke coef controller directly;
+       * all work is being done from the coefficient buffer.
+       */
+      if (! (*cinfo->codec->compress_data) (cinfo, (JSAMPIMAGE) NULL))
+	ERREXIT(cinfo, JERR_CANT_SUSPEND);
+    }
+    (*cinfo->master->finish_pass) (cinfo);
+  }
+  /* Write EOI, do final cleanup */
+  (*cinfo->marker->write_file_trailer) (cinfo);
+  (*cinfo->dest->term_destination) (cinfo);
+  /* We can use jpeg_abort to release memory and reset global_state */
+  jpeg_abort((j_common_ptr) cinfo);
+}
+
+
+/*
+ * Write a special marker.
+ * This is only recommended for writing COM or APPn markers.
+ * Must be called after jpeg_start_compress() and before
+ * first call to jpeg_write_scanlines() or jpeg_write_raw_data().
+ */
+
+GLOBAL(void)
+jpeg_write_marker (j_compress_ptr cinfo, int marker,
+		   const JOCTET *dataptr, unsigned int datalen)
+{
+  JMETHOD(void, write_marker_byte, (j_compress_ptr info, int val));
+
+  if (cinfo->next_scanline != 0 ||
+      (cinfo->global_state != CSTATE_SCANNING &&
+       cinfo->global_state != CSTATE_RAW_OK &&
+       cinfo->global_state != CSTATE_WRCOEFS))
+    ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);
+
+  (*cinfo->marker->write_marker_header) (cinfo, marker, datalen);
+  write_marker_byte = cinfo->marker->write_marker_byte;	/* copy for speed */
+  while (datalen--) {
+    (*write_marker_byte) (cinfo, *dataptr);
+    dataptr++;
+  }
+}
+
+/* Same, but piecemeal. */
+
+GLOBAL(void)
+jpeg_write_m_header (j_compress_ptr cinfo, int marker, unsigned int datalen)
+{
+  if (cinfo->next_scanline != 0 ||
+      (cinfo->global_state != CSTATE_SCANNING &&
+       cinfo->global_state != CSTATE_RAW_OK &&
+       cinfo->global_state != CSTATE_WRCOEFS))
+    ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);
+
+  (*cinfo->marker->write_marker_header) (cinfo, marker, datalen);
+}
+
+GLOBAL(void)
+jpeg_write_m_byte (j_compress_ptr cinfo, int val)
+{
+  (*cinfo->marker->write_marker_byte) (cinfo, val);
+}
+
+
+/*
+ * Alternate compression function: just write an abbreviated table file.
+ * Before calling this, all parameters and a data destination must be set up.
+ *
+ * To produce a pair of files containing abbreviated tables and abbreviated
+ * image data, one would proceed as follows:
+ *
+ *		initialize JPEG object
+ *		set JPEG parameters
+ *		set destination to table file
+ *		jpeg_write_tables(cinfo);
+ *		set destination to image file
+ *		jpeg_start_compress(cinfo, FALSE);
+ *		write data...
+ *		jpeg_finish_compress(cinfo);
+ *
+ * jpeg_write_tables has the side effect of marking all tables written
+ * (same as jpeg_suppress_tables(..., TRUE)).  Thus a subsequent start_compress
+ * will not re-emit the tables unless it is passed write_all_tables=TRUE.
+ */
+
+GLOBAL(void)
+jpeg_write_tables (j_compress_ptr cinfo)
+{
+  if (cinfo->global_state != CSTATE_START)
+    ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);
+
+  /* (Re)initialize error mgr and destination modules */
+  (*cinfo->err->reset_error_mgr) ((j_common_ptr) cinfo);
+  (*cinfo->dest->init_destination) (cinfo);
+  /* Initialize the marker writer ... bit of a crock to do it here. */
+  jinit_marker_writer(cinfo);
+  /* Write them tables! */
+  (*cinfo->marker->write_tables_only) (cinfo);
+  /* And clean up. */
+  (*cinfo->dest->term_destination) (cinfo);
+  /*
+   * In library releases up through v6a, we called jpeg_abort() here to free
+   * any working memory allocated by the destination manager and marker
+   * writer.  Some applications had a problem with that: they allocated space
+   * of their own from the library memory manager, and didn't want it to go
+   * away during write_tables.  So now we do nothing.  This will cause a
+   * memory leak if an app calls write_tables repeatedly without doing a full
+   * compression cycle or otherwise resetting the JPEG object.  However, that
+   * seems less bad than unexpectedly freeing memory in the normal case.
+   * An app that prefers the old behavior can call jpeg_abort for itself after
+   * each call to jpeg_write_tables().
+   */
+}
diff --git a/uppsrc/plugin/jpg/lib/jcapistd.c b/uppsrc/plugin/jpg/lib/jcapistd.c
new file mode 100644
index 000000000..ddd943580
--- /dev/null
+++ b/uppsrc/plugin/jpg/lib/jcapistd.c
@@ -0,0 +1,161 @@
+/*
+ * jcapistd.c
+ *
+ * Copyright (C) 1994-1996, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains application interface code for the compression half
+ * of the JPEG library.  These are the "standard" API routines that are
+ * used in the normal full-compression case.  They are not used by a
+ * transcoding-only application.  Note that if an application links in
+ * jpeg_start_compress, it will end up linking in the entire compressor.
+ * We thus must separate this file from jcapimin.c to avoid linking the
+ * whole compression library into a transcoder.
+ */
+
+#define JPEG_INTERNALS
+#include "jinclude.h"
+#include "jpeglib.h"
+
+
+/*
+ * Compression initialization.
+ * Before calling this, all parameters and a data destination must be set up.
+ *
+ * We require a write_all_tables parameter as a failsafe check when writing
+ * multiple datastreams from the same compression object.  Since prior runs
+ * will have left all the tables marked sent_table=TRUE, a subsequent run
+ * would emit an abbreviated stream (no tables) by default.  This may be what
+ * is wanted, but for safety's sake it should not be the default behavior:
+ * programmers should have to make a deliberate choice to emit abbreviated
+ * images.  Therefore the documentation and examples should encourage people
+ * to pass write_all_tables=TRUE; then it will take active thought to do the
+ * wrong thing.
+ */
+
+GLOBAL(void)
+jpeg_start_compress (j_compress_ptr cinfo, boolean write_all_tables)
+{
+  if (cinfo->global_state != CSTATE_START)
+    ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);
+
+  if (write_all_tables)
+    jpeg_suppress_tables(cinfo, FALSE);	/* mark all tables to be written */
+
+  /* (Re)initialize error mgr and destination modules */
+  (*cinfo->err->reset_error_mgr) ((j_common_ptr) cinfo);
+  (*cinfo->dest->init_destination) (cinfo);
+  /* Perform master selection of active modules */
+  jinit_compress_master(cinfo);
+  /* Set up for the first pass */
+  (*cinfo->master->prepare_for_pass) (cinfo);
+  /* Ready for application to drive first pass through jpeg_write_scanlines
+   * or jpeg_write_raw_data.
+   */
+  cinfo->next_scanline = 0;
+  cinfo->global_state = (cinfo->raw_data_in ? CSTATE_RAW_OK : CSTATE_SCANNING);
+}
+
+
+/*
+ * Write some scanlines of data to the JPEG compressor.
+ *
+ * The return value will be the number of lines actually written.
+ * This should be less than the supplied num_lines only in case that
+ * the data destination module has requested suspension of the compressor,
+ * or if more than image_height scanlines are passed in.
+ *
+ * Note: we warn about excess calls to jpeg_write_scanlines() since
+ * this likely signals an application programmer error.  However,
+ * excess scanlines passed in the last valid call are *silently* ignored,
+ * so that the application need not adjust num_lines for end-of-image
+ * when using a multiple-scanline buffer.
+ */
+
+GLOBAL(JDIMENSION)
+jpeg_write_scanlines (j_compress_ptr cinfo, JSAMPARRAY scanlines,
+		      JDIMENSION num_lines)
+{
+  JDIMENSION row_ctr, rows_left;
+
+  if (cinfo->global_state != CSTATE_SCANNING)
+    ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);
+  if (cinfo->next_scanline >= cinfo->image_height)
+    WARNMS(cinfo, JWRN_TOO_MUCH_DATA);
+
+  /* Call progress monitor hook if present */
+  if (cinfo->progress != NULL) {
+    cinfo->progress->pass_counter = (long) cinfo->next_scanline;
+    cinfo->progress->pass_limit = (long) cinfo->image_height;
+    (*cinfo->progress->progress_monitor) ((j_common_ptr) cinfo);
+  }
+
+  /* Give master control module another chance if this is first call to
+   * jpeg_write_scanlines.  This lets output of the frame/scan headers be
+   * delayed so that application can write COM, etc, markers between
+   * jpeg_start_compress and jpeg_write_scanlines.
+   */
+  if (cinfo->master->call_pass_startup)
+    (*cinfo->master->pass_startup) (cinfo);
+
+  /* Ignore any extra scanlines at bottom of image. */
+  rows_left = cinfo->image_height - cinfo->next_scanline;
+  if (num_lines > rows_left)
+    num_lines = rows_left;
+
+  row_ctr = 0;
+  (*cinfo->main->process_data) (cinfo, scanlines, &row_ctr, num_lines);
+  cinfo->next_scanline += row_ctr;
+  return row_ctr;
+}
+
+
+/*
+ * Alternate entry point to write raw data.
+ * Processes exactly one iMCU row per call, unless suspended.
+ */
+
+GLOBAL(JDIMENSION)
+jpeg_write_raw_data (j_compress_ptr cinfo, JSAMPIMAGE data,
+		     JDIMENSION num_lines)
+{
+  JDIMENSION lines_per_iMCU_row;
+
+  if (cinfo->global_state != CSTATE_RAW_OK)
+    ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);
+  if (cinfo->next_scanline >= cinfo->image_height) {
+    WARNMS(cinfo, JWRN_TOO_MUCH_DATA);
+    return 0;
+  }
+
+  /* Call progress monitor hook if present */
+  if (cinfo->progress != NULL) {
+    cinfo->progress->pass_counter = (long) cinfo->next_scanline;
+    cinfo->progress->pass_limit = (long) cinfo->image_height;
+    (*cinfo->progress->progress_monitor) ((j_common_ptr) cinfo);
+  }
+
+  /* Give master control module another chance if this is first call to
+   * jpeg_write_raw_data.  This lets output of the frame/scan headers be
+   * delayed so that application can write COM, etc, markers between
+   * jpeg_start_compress and jpeg_write_raw_data.
+   */
+  if (cinfo->master->call_pass_startup)
+    (*cinfo->master->pass_startup) (cinfo);
+
+  /* Verify that at least one iMCU row has been passed. */
+  lines_per_iMCU_row = cinfo->max_v_samp_factor * cinfo->data_unit;
+  if (num_lines < lines_per_iMCU_row)
+    ERREXIT(cinfo, JERR_BUFFER_SIZE);
+
+  /* Directly compress the row. */
+  if (! (*cinfo->codec->compress_data) (cinfo, data)) {
+    /* If compressor did not consume the whole row, suspend processing. */
+    return 0;
+  }
+
+  /* OK, we processed one iMCU row. */
+  cinfo->next_scanline += lines_per_iMCU_row;
+  return lines_per_iMCU_row;
+}
diff --git a/uppsrc/plugin/jpg/lib/jccoefct.c b/uppsrc/plugin/jpg/lib/jccoefct.c
new file mode 100644
index 000000000..a8e6ddaef
--- /dev/null
+++ b/uppsrc/plugin/jpg/lib/jccoefct.c
@@ -0,0 +1,454 @@
+/*
+ * jccoefct.c
+ *
+ * Copyright (C) 1994-1998, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains the coefficient buffer controller for compression.
+ * This controller is the top level of the JPEG compressor proper.
+ * The coefficient buffer lies between forward-DCT and entropy encoding steps.
+ */
+
+#define JPEG_INTERNALS
+#include "jinclude.h"
+#include "jpeglib.h"
+#include "jlossy.h"		/* Private declarations for lossy codec */
+
+
+/* We use a full-image coefficient buffer when doing Huffman optimization,
+ * and also for writing multiple-scan JPEG files.  In all cases, the DCT
+ * step is run during the first pass, and subsequent passes need only read
+ * the buffered coefficients.
+ */
+#ifdef ENTROPY_OPT_SUPPORTED
+#define FULL_COEF_BUFFER_SUPPORTED
+#else
+#ifdef C_MULTISCAN_FILES_SUPPORTED
+#define FULL_COEF_BUFFER_SUPPORTED
+#endif
+#endif
+
+
+/* Private buffer controller object */
+
+typedef struct {
+  JDIMENSION iMCU_row_num;	/* iMCU row # within image */
+  JDIMENSION mcu_ctr;		/* counts MCUs processed in current row */
+  int MCU_vert_offset;		/* counts MCU rows within iMCU row */
+  int MCU_rows_per_iMCU_row;	/* number of such rows needed */
+
+  /* For single-pass compression, it's sufficient to buffer just one MCU
+   * (although this may prove a bit slow in practice).  We allocate a
+   * workspace of C_MAX_DATA_UNITS_IN_MCU coefficient blocks, and reuse it for
+   * each MCU constructed and sent.  (On 80x86, the workspace is FAR even
+   * though it's not really very big; this is to keep the module interfaces
+   * unchanged when a large coefficient buffer is necessary.)
+   * In multi-pass modes, this array points to the current MCU's blocks
+   * within the virtual arrays.
+   */
+  JBLOCKROW MCU_buffer[C_MAX_DATA_UNITS_IN_MCU];
+
+  /* In multi-pass modes, we need a virtual block array for each component. */
+  jvirt_barray_ptr whole_image[MAX_COMPONENTS];
+} c_coef_controller;
+
+typedef c_coef_controller * c_coef_ptr;
+
+
+/* Forward declarations */
+METHODDEF(boolean) compress_data
+    JPP((j_compress_ptr cinfo, JSAMPIMAGE input_buf));
+#ifdef FULL_COEF_BUFFER_SUPPORTED
+METHODDEF(boolean) compress_first_pass
+    JPP((j_compress_ptr cinfo, JSAMPIMAGE input_buf));
+METHODDEF(boolean) compress_output
+    JPP((j_compress_ptr cinfo, JSAMPIMAGE input_buf));
+#endif
+
+
+LOCAL(void)
+start_iMCU_row (j_compress_ptr cinfo)
+/* Reset within-iMCU-row counters for a new row */
+{
+  j_lossy_c_ptr lossyc = (j_lossy_c_ptr) cinfo->codec;
+  c_coef_ptr coef = (c_coef_ptr) lossyc->coef_private;
+
+  /* In an interleaved scan, an MCU row is the same as an iMCU row.
+   * In a noninterleaved scan, an iMCU row has v_samp_factor MCU rows.
+   * But at the bottom of the image, process only what's left.
+   */
+  if (cinfo->comps_in_scan > 1) {
+    coef->MCU_rows_per_iMCU_row = 1;
+  } else {
+    if (coef->iMCU_row_num < (cinfo->total_iMCU_rows-1))
+      coef->MCU_rows_per_iMCU_row = cinfo->cur_comp_info[0]->v_samp_factor;
+    else
+      coef->MCU_rows_per_iMCU_row = cinfo->cur_comp_info[0]->last_row_height;
+  }
+
+  coef->mcu_ctr = 0;
+  coef->MCU_vert_offset = 0;
+}
+
+
+/*
+ * Initialize for a processing pass.
+ */
+
+METHODDEF(void)
+start_pass_coef (j_compress_ptr cinfo, J_BUF_MODE pass_mode)
+{
+  j_lossy_c_ptr lossyc = (j_lossy_c_ptr) cinfo->codec;
+  c_coef_ptr coef = (c_coef_ptr) lossyc->coef_private;
+
+  coef->iMCU_row_num = 0;
+  start_iMCU_row(cinfo);
+
+  switch (pass_mode) {
+  case JBUF_PASS_THRU:
+    if (coef->whole_image[0] != NULL)
+      ERREXIT(cinfo, JERR_BAD_BUFFER_MODE);
+    lossyc->pub.compress_data = compress_data;
+    break;
+#ifdef FULL_COEF_BUFFER_SUPPORTED
+  case JBUF_SAVE_AND_PASS:
+    if (coef->whole_image[0] == NULL)
+      ERREXIT(cinfo, JERR_BAD_BUFFER_MODE);
+    lossyc->pub.compress_data = compress_first_pass;
+    break;
+  case JBUF_CRANK_DEST:
+    if (coef->whole_image[0] == NULL)
+      ERREXIT(cinfo, JERR_BAD_BUFFER_MODE);
+    lossyc->pub.compress_data = compress_output;
+    break;
+#endif
+  default:
+    ERREXIT(cinfo, JERR_BAD_BUFFER_MODE);
+    break;
+  }
+}
+
+
+/*
+ * Process some data in the single-pass case.
+ * We process the equivalent of one fully interleaved MCU row ("iMCU" row)
+ * per call, ie, v_samp_factor block rows for each component in the image.
+ * Returns TRUE if the iMCU row is completed, FALSE if suspended.
+ *
+ * NB: input_buf contains a plane for each component in image,
+ * which we index according to the component's SOF position.
+ */
+
+METHODDEF(boolean)
+compress_data (j_compress_ptr cinfo, JSAMPIMAGE input_buf)
+{
+  j_lossy_c_ptr lossyc = (j_lossy_c_ptr) cinfo->codec;
+  c_coef_ptr coef = (c_coef_ptr) lossyc->coef_private;
+  JDIMENSION MCU_col_num;	/* index of current MCU within row */
+  JDIMENSION last_MCU_col = cinfo->MCUs_per_row - 1;
+  JDIMENSION last_iMCU_row = cinfo->total_iMCU_rows - 1;
+  int blkn, bi, ci, yindex, yoffset, blockcnt;
+  JDIMENSION ypos, xpos;
+  jpeg_component_info *compptr;
+
+  /* Loop to write as much as one whole iMCU row */
+  for (yoffset = coef->MCU_vert_offset; yoffset < coef->MCU_rows_per_iMCU_row;
+       yoffset++) {
+    for (MCU_col_num = coef->mcu_ctr; MCU_col_num <= last_MCU_col;
+	 MCU_col_num++) {
+      /* Determine where data comes from in input_buf and do the DCT thing.
+       * Each call on forward_DCT processes a horizontal row of DCT blocks
+       * as wide as an MCU; we rely on having allocated the MCU_buffer[] blocks
+       * sequentially.  Dummy blocks at the right or bottom edge are filled in
+       * specially.  The data in them does not matter for image reconstruction,
+       * so we fill them with values that will encode to the smallest amount of
+       * data, viz: all zeroes in the AC entries, DC entries equal to previous
+       * block's DC value.  (Thanks to Thomas Kinsman for this idea.)
+       */
+      blkn = 0;
+      for (ci = 0; ci < cinfo->comps_in_scan; ci++) {
+	compptr = cinfo->cur_comp_info[ci];
+	blockcnt = (MCU_col_num < last_MCU_col) ? compptr->MCU_width
+						: compptr->last_col_width;
+	xpos = MCU_col_num * compptr->MCU_sample_width;
+	ypos = yoffset * DCTSIZE; /* ypos == (yoffset+yindex) * DCTSIZE */
+	for (yindex = 0; yindex < compptr->MCU_height; yindex++) {
+	  if (coef->iMCU_row_num < last_iMCU_row ||
+	      yoffset+yindex < compptr->last_row_height) {
+	    (*lossyc->fdct_forward_DCT) (cinfo, compptr,
+				    input_buf[compptr->component_index],
+				    coef->MCU_buffer[blkn],
+				    ypos, xpos, (JDIMENSION) blockcnt);
+	    if (blockcnt < compptr->MCU_width) {
+	      /* Create some dummy blocks at the right edge of the image. */
+	      jzero_far((void FAR *) coef->MCU_buffer[blkn + blockcnt],
+			(compptr->MCU_width - blockcnt) * SIZEOF(JBLOCK));
+	      for (bi = blockcnt; bi < compptr->MCU_width; bi++) {
+		coef->MCU_buffer[blkn+bi][0][0] = coef->MCU_buffer[blkn+bi-1][0][0];
+	      }
+	    }
+	  } else {
+	    /* Create a row of dummy blocks at the bottom of the image. */
+	    jzero_far((void FAR *) coef->MCU_buffer[blkn],
+		      compptr->MCU_width * SIZEOF(JBLOCK));
+	    for (bi = 0; bi < compptr->MCU_width; bi++) {
+	      coef->MCU_buffer[blkn+bi][0][0] = coef->MCU_buffer[blkn-1][0][0];
+	    }
+	  }
+	  blkn += compptr->MCU_width;
+	  ypos += DCTSIZE;
+	}
+      }
+      /* Try to write the MCU.  In event of a suspension failure, we will
+       * re-DCT the MCU on restart (a bit inefficient, could be fixed...)
+       */
+      if (! (*lossyc->entropy_encode_mcu) (cinfo, coef->MCU_buffer)) {
+	/* Suspension forced; update state counters and exit */
+	coef->MCU_vert_offset = yoffset;
+	coef->mcu_ctr = MCU_col_num;
+	return FALSE;
+      }
+    }
+    /* Completed an MCU row, but perhaps not an iMCU row */
+    coef->mcu_ctr = 0;
+  }
+  /* Completed the iMCU row, advance counters for next one */
+  coef->iMCU_row_num++;
+  start_iMCU_row(cinfo);
+  return TRUE;
+}
+
+
+#ifdef FULL_COEF_BUFFER_SUPPORTED
+
+/*
+ * Process some data in the first pass of a multi-pass case.
+ * We process the equivalent of one fully interleaved MCU row ("iMCU" row)
+ * per call, ie, v_samp_factor block rows for each component in the image.
+ * This amount of data is read from the source buffer, DCT'd and quantized,
+ * and saved into the virtual arrays.  We also generate suitable dummy blocks
+ * as needed at the right and lower edges.  (The dummy blocks are constructed
+ * in the virtual arrays, which have been padded appropriately.)  This makes
+ * it possible for subsequent passes not to worry about real vs. dummy blocks.
+ *
+ * We must also emit the data to the entropy encoder.  This is conveniently
+ * done by calling compress_output() after we've loaded the current strip
+ * of the virtual arrays.
+ *
+ * NB: input_buf contains a plane for each component in image.  All
+ * components are DCT'd and loaded into the virtual arrays in this pass.
+ * However, it may be that only a subset of the components are emitted to
+ * the entropy encoder during this first pass; be careful about looking
+ * at the scan-dependent variables (MCU dimensions, etc).
+ */
+
+METHODDEF(boolean)
+compress_first_pass (j_compress_ptr cinfo, JSAMPIMAGE input_buf)
+{
+  j_lossy_c_ptr lossyc = (j_lossy_c_ptr) cinfo->codec;
+  c_coef_ptr coef = (c_coef_ptr) lossyc->coef_private;
+  JDIMENSION last_iMCU_row = cinfo->total_iMCU_rows - 1;
+  JDIMENSION blocks_across, MCUs_across, MCUindex;
+  int bi, ci, h_samp_factor, block_row, block_rows, ndummy;
+  JCOEF lastDC;
+  jpeg_component_info *compptr;
+  JBLOCKARRAY buffer;
+  JBLOCKROW thisblockrow, lastblockrow;
+
+  for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
+       ci++, compptr++) {
+    /* Align the virtual buffer for this component. */
+    buffer = (*cinfo->mem->access_virt_barray)
+      ((j_common_ptr) cinfo, coef->whole_image[ci],
+       coef->iMCU_row_num * compptr->v_samp_factor,
+       (JDIMENSION) compptr->v_samp_factor, TRUE);
+    /* Count non-dummy DCT block rows in this iMCU row. */
+    if (coef->iMCU_row_num < last_iMCU_row)
+      block_rows = compptr->v_samp_factor;
+    else {
+      /* NB: can't use last_row_height here, since may not be set! */
+      block_rows = (int) (compptr->height_in_data_units % compptr->v_samp_factor);
+      if (block_rows == 0) block_rows = compptr->v_samp_factor;
+    }
+    blocks_across = compptr->width_in_data_units;
+    h_samp_factor = compptr->h_samp_factor;
+    /* Count number of dummy blocks to be added at the right margin. */
+    ndummy = (int) (blocks_across % h_samp_factor);
+    if (ndummy > 0)
+      ndummy = h_samp_factor - ndummy;
+    /* Perform DCT for all non-dummy blocks in this iMCU row.  Each call
+     * on forward_DCT processes a complete horizontal row of DCT blocks.
+     */
+    for (block_row = 0; block_row < block_rows; block_row++) {
+      thisblockrow = buffer[block_row];
+      (*lossyc->fdct_forward_DCT) (cinfo, compptr,
+				   input_buf[ci], thisblockrow,
+				   (JDIMENSION) (block_row * DCTSIZE),
+				   (JDIMENSION) 0, blocks_across);
+      if (ndummy > 0) {
+	/* Create dummy blocks at the right edge of the image. */
+	thisblockrow += blocks_across; /* => first dummy block */
+	jzero_far((void FAR *) thisblockrow, ndummy * SIZEOF(JBLOCK));
+	lastDC = thisblockrow[-1][0];
+	for (bi = 0; bi < ndummy; bi++) {
+	  thisblockrow[bi][0] = lastDC;
+	}
+      }
+    }
+    /* If at end of image, create dummy block rows as needed.
+     * The tricky part here is that within each MCU, we want the DC values
+     * of the dummy blocks to match the last real block's DC value.
+     * This squeezes a few more bytes out of the resulting file...
+     */
+    if (coef->iMCU_row_num == last_iMCU_row) {
+      blocks_across += ndummy;	/* include lower right corner */
+      MCUs_across = blocks_across / h_samp_factor;
+      for (block_row = block_rows; block_row < compptr->v_samp_factor;
+	   block_row++) {
+	thisblockrow = buffer[block_row];
+	lastblockrow = buffer[block_row-1];
+	jzero_far((void FAR *) thisblockrow,
+		  (size_t) (blocks_across * SIZEOF(JBLOCK)));
+	for (MCUindex = 0; MCUindex < MCUs_across; MCUindex++) {
+	  lastDC = lastblockrow[h_samp_factor-1][0];
+	  for (bi = 0; bi < h_samp_factor; bi++) {
+	    thisblockrow[bi][0] = lastDC;
+	  }
+	  thisblockrow += h_samp_factor; /* advance to next MCU in row */
+	  lastblockrow += h_samp_factor;
+	}
+      }
+    }
+  }
+  /* NB: compress_output will increment iMCU_row_num if successful.
+   * A suspension return will result in redoing all the work above next time.
+   */
+
+  /* Emit data to the entropy encoder, sharing code with subsequent passes */
+  return compress_output(cinfo, input_buf);
+}
+
+
+/*
+ * Process some data in subsequent passes of a multi-pass case.
+ * We process the equivalent of one fully interleaved MCU row ("iMCU" row)
+ * per call, ie, v_samp_factor block rows for each component in the scan.
+ * The data is obtained from the virtual arrays and fed to the entropy coder.
+ * Returns TRUE if the iMCU row is completed, FALSE if suspended.
+ *
+ * NB: input_buf is ignored; it is likely to be a NULL pointer.
+ */
+
+METHODDEF(boolean)
+compress_output (j_compress_ptr cinfo, JSAMPIMAGE input_buf)
+{
+  j_lossy_c_ptr lossyc = (j_lossy_c_ptr) cinfo->codec;
+  c_coef_ptr coef = (c_coef_ptr) lossyc->coef_private;
+  JDIMENSION MCU_col_num;	/* index of current MCU within row */
+  int blkn, ci, xindex, yindex, yoffset;
+  JDIMENSION start_col;
+  JBLOCKARRAY buffer[MAX_COMPS_IN_SCAN];
+  JBLOCKROW buffer_ptr;
+  jpeg_component_info *compptr;
+
+  /* Align the virtual buffers for the components used in this scan.
+   * NB: during first pass, this is safe only because the buffers will
+   * already be aligned properly, so jmemmgr.c won't need to do any I/O.
+   */
+  for (ci = 0; ci < cinfo->comps_in_scan; ci++) {
+    compptr = cinfo->cur_comp_info[ci];
+    buffer[ci] = (*cinfo->mem->access_virt_barray)
+      ((j_common_ptr) cinfo, coef->whole_image[compptr->component_index],
+       coef->iMCU_row_num * compptr->v_samp_factor,
+       (JDIMENSION) compptr->v_samp_factor, FALSE);
+  }
+
+  /* Loop to process one whole iMCU row */
+  for (yoffset = coef->MCU_vert_offset; yoffset < coef->MCU_rows_per_iMCU_row;
+       yoffset++) {
+    for (MCU_col_num = coef->mcu_ctr; MCU_col_num < cinfo->MCUs_per_row;
+	 MCU_col_num++) {
+      /* Construct list of pointers to DCT blocks belonging to this MCU */
+      blkn = 0;			/* index of current DCT block within MCU */
+      for (ci = 0; ci < cinfo->comps_in_scan; ci++) {
+	compptr = cinfo->cur_comp_info[ci];
+	start_col = MCU_col_num * compptr->MCU_width;
+	for (yindex = 0; yindex < compptr->MCU_height; yindex++) {
+	  buffer_ptr = buffer[ci][yindex+yoffset] + start_col;
+	  for (xindex = 0; xindex < compptr->MCU_width; xindex++) {
+	    coef->MCU_buffer[blkn++] = buffer_ptr++;
+	  }
+	}
+      }
+      /* Try to write the MCU. */
+      if (! (*lossyc->entropy_encode_mcu) (cinfo, coef->MCU_buffer)) {
+	/* Suspension forced; update state counters and exit */
+	coef->MCU_vert_offset = yoffset;
+	coef->mcu_ctr = MCU_col_num;
+	return FALSE;
+      }
+    }
+    /* Completed an MCU row, but perhaps not an iMCU row */
+    coef->mcu_ctr = 0;
+  }
+  /* Completed the iMCU row, advance counters for next one */
+  coef->iMCU_row_num++;
+  start_iMCU_row(cinfo);
+  return TRUE;
+}
+
+#endif /* FULL_COEF_BUFFER_SUPPORTED */
+
+
+/*
+ * Initialize coefficient buffer controller.
+ */
+
+GLOBAL(void)
+jinit_c_coef_controller (j_compress_ptr cinfo, boolean need_full_buffer)
+{
+  j_lossy_c_ptr lossyc = (j_lossy_c_ptr) cinfo->codec;
+  c_coef_ptr coef;
+
+  coef = (c_coef_ptr)
+    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+				SIZEOF(c_coef_controller));
+  lossyc->coef_private = (struct jpeg_c_coef_controller *) coef;
+  lossyc->coef_start_pass = start_pass_coef;
+
+  /* Create the coefficient buffer. */
+  if (need_full_buffer) {
+#ifdef FULL_COEF_BUFFER_SUPPORTED
+    /* Allocate a full-image virtual array for each component, */
+    /* padded to a multiple of samp_factor DCT blocks in each direction. */
+    int ci;
+    jpeg_component_info *compptr;
+
+    for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
+	 ci++, compptr++) {
+      coef->whole_image[ci] = (*cinfo->mem->request_virt_barray)
+	((j_common_ptr) cinfo, JPOOL_IMAGE, FALSE,
+	 (JDIMENSION) jround_up((long) compptr->width_in_data_units,
+				(long) compptr->h_samp_factor),
+	 (JDIMENSION) jround_up((long) compptr->height_in_data_units,
+				(long) compptr->v_samp_factor),
+	 (JDIMENSION) compptr->v_samp_factor);
+    }
+#else
+    ERREXIT(cinfo, JERR_BAD_BUFFER_MODE);
+#endif
+  } else {
+    /* We only need a single-MCU buffer. */
+    JBLOCKROW buffer;
+    int i;
+
+    buffer = (JBLOCKROW)
+      (*cinfo->mem->alloc_large) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+				  C_MAX_DATA_UNITS_IN_MCU * SIZEOF(JBLOCK));
+    for (i = 0; i < C_MAX_DATA_UNITS_IN_MCU; i++) {
+      coef->MCU_buffer[i] = buffer + i;
+    }
+    coef->whole_image[0] = NULL; /* flag for no virtual arrays */
+  }
+}
diff --git a/uppsrc/plugin/jpg/lib/jccolor.c b/uppsrc/plugin/jpg/lib/jccolor.c
new file mode 100644
index 000000000..0a8a4b5d1
--- /dev/null
+++ b/uppsrc/plugin/jpg/lib/jccolor.c
@@ -0,0 +1,459 @@
+/*
+ * jccolor.c
+ *
+ * Copyright (C) 1991-1996, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains input colorspace conversion routines.
+ */
+
+#define JPEG_INTERNALS
+#include "jinclude.h"
+#include "jpeglib.h"
+
+
+/* Private subobject */
+
+typedef struct {
+  struct jpeg_color_converter pub; /* public fields */
+
+  /* Private state for RGB->YCC conversion */
+  INT32 * rgb_ycc_tab;		/* => table for RGB to YCbCr conversion */
+} my_color_converter;
+
+typedef my_color_converter * my_cconvert_ptr;
+
+
+/**************** RGB -> YCbCr conversion: most common case **************/
+
+/*
+ * YCbCr is defined per CCIR 601-1, except that Cb and Cr are
+ * normalized to the range 0..MAXJSAMPLE rather than -0.5 .. 0.5.
+ * The conversion equations to be implemented are therefore
+ *	Y  =  0.29900 * R + 0.58700 * G + 0.11400 * B
+ *	Cb = -0.16874 * R - 0.33126 * G + 0.50000 * B  + CENTERJSAMPLE
+ *	Cr =  0.50000 * R - 0.41869 * G - 0.08131 * B  + CENTERJSAMPLE
+ * (These numbers are derived from TIFF 6.0 section 21, dated 3-June-92.)
+ * Note: older versions of the IJG code used a zero offset of MAXJSAMPLE/2,
+ * rather than CENTERJSAMPLE, for Cb and Cr.  This gave equal positive and
+ * negative swings for Cb/Cr, but meant that grayscale values (Cb=Cr=0)
+ * were not represented exactly.  Now we sacrifice exact representation of
+ * maximum red and maximum blue in order to get exact grayscales.
+ *
+ * To avoid floating-point arithmetic, we represent the fractional constants
+ * as integers scaled up by 2^16 (about 4 digits precision); we have to divide
+ * the products by 2^16, with appropriate rounding, to get the correct answer.
+ *
+ * For even more speed, we avoid doing any multiplications in the inner loop
+ * by precalculating the constants times R,G,B for all possible values.
+ * For 8-bit JSAMPLEs this is very reasonable (only 256 entries per table);
+ * for 12-bit samples it is still acceptable.  It's not very reasonable for
+ * 16-bit samples, but if you want lossless storage you shouldn't be changing
+ * colorspace anyway.
+ * The CENTERJSAMPLE offsets and the rounding fudge-factor of 0.5 are included
+ * in the tables to save adding them separately in the inner loop.
+ */
+
+#define SCALEBITS	16	/* speediest right-shift on some machines */
+#define CBCR_OFFSET	((INT32) CENTERJSAMPLE << SCALEBITS)
+#define ONE_HALF	((INT32) 1 << (SCALEBITS-1))
+#define FIX(x)		((INT32) ((x) * (1L<<SCALEBITS) + 0.5))
+
+/* We allocate one big table and divide it up into eight parts, instead of
+ * doing eight alloc_small requests.  This lets us use a single table base
+ * address, which can be held in a register in the inner loops on many
+ * machines (more than can hold all eight addresses, anyway).
+ */
+
+#define R_Y_OFF		0			/* offset to R => Y section */
+#define G_Y_OFF		(1*(MAXJSAMPLE+1))	/* offset to G => Y section */
+#define B_Y_OFF		(2*(MAXJSAMPLE+1))	/* etc. */
+#define R_CB_OFF	(3*(MAXJSAMPLE+1))
+#define G_CB_OFF	(4*(MAXJSAMPLE+1))
+#define B_CB_OFF	(5*(MAXJSAMPLE+1))
+#define R_CR_OFF	B_CB_OFF		/* B=>Cb, R=>Cr are the same */
+#define G_CR_OFF	(6*(MAXJSAMPLE+1))
+#define B_CR_OFF	(7*(MAXJSAMPLE+1))
+#define TABLE_SIZE	(8*(MAXJSAMPLE+1))
+
+
+/*
+ * Initialize for RGB->YCC colorspace conversion.
+ */
+
+METHODDEF(void)
+rgb_ycc_start (j_compress_ptr cinfo)
+{
+  my_cconvert_ptr cconvert = (my_cconvert_ptr) cinfo->cconvert;
+  INT32 * rgb_ycc_tab;
+  INT32 i;
+
+  /* Allocate and fill in the conversion tables. */
+  cconvert->rgb_ycc_tab = rgb_ycc_tab = (INT32 *)
+    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+				(TABLE_SIZE * SIZEOF(INT32)));
+
+  for (i = 0; i <= MAXJSAMPLE; i++) {
+    rgb_ycc_tab[i+R_Y_OFF] = FIX(0.29900) * i;
+    rgb_ycc_tab[i+G_Y_OFF] = FIX(0.58700) * i;
+    rgb_ycc_tab[i+B_Y_OFF] = FIX(0.11400) * i     + ONE_HALF;
+    rgb_ycc_tab[i+R_CB_OFF] = (-FIX(0.16874)) * i;
+    rgb_ycc_tab[i+G_CB_OFF] = (-FIX(0.33126)) * i;
+    /* We use a rounding fudge-factor of 0.5-epsilon for Cb and Cr.
+     * This ensures that the maximum output will round to MAXJSAMPLE
+     * not MAXJSAMPLE+1, and thus that we don't have to range-limit.
+     */
+    rgb_ycc_tab[i+B_CB_OFF] = FIX(0.50000) * i    + CBCR_OFFSET + ONE_HALF-1;
+/*  B=>Cb and R=>Cr tables are the same
+    rgb_ycc_tab[i+R_CR_OFF] = FIX(0.50000) * i    + CBCR_OFFSET + ONE_HALF-1;
+*/
+    rgb_ycc_tab[i+G_CR_OFF] = (-FIX(0.41869)) * i;
+    rgb_ycc_tab[i+B_CR_OFF] = (-FIX(0.08131)) * i;
+  }
+}
+
+
+/*
+ * Convert some rows of samples to the JPEG colorspace.
+ *
+ * Note that we change from the application's interleaved-pixel format
+ * to our internal noninterleaved, one-plane-per-component format.
+ * The input buffer is therefore three times as wide as the output buffer.
+ *
+ * A starting row offset is provided only for the output buffer.  The caller
+ * can easily adjust the passed input_buf value to accommodate any row
+ * offset required on that side.
+ */
+
+METHODDEF(void)
+rgb_ycc_convert (j_compress_ptr cinfo,
+		 JSAMPARRAY input_buf, JSAMPIMAGE output_buf,
+		 JDIMENSION output_row, int num_rows)
+{
+  my_cconvert_ptr cconvert = (my_cconvert_ptr) cinfo->cconvert;
+  register int r, g, b;
+  register INT32 * ctab = cconvert->rgb_ycc_tab;
+  register JSAMPROW inptr;
+  register JSAMPROW outptr0, outptr1, outptr2;
+  register JDIMENSION col;
+  JDIMENSION num_cols = cinfo->image_width;
+
+  while (--num_rows >= 0) {
+    inptr = *input_buf++;
+    outptr0 = output_buf[0][output_row];
+    outptr1 = output_buf[1][output_row];
+    outptr2 = output_buf[2][output_row];
+    output_row++;
+    for (col = 0; col < num_cols; col++) {
+      r = GETJSAMPLE(inptr[RGB_RED]);
+      g = GETJSAMPLE(inptr[RGB_GREEN]);
+      b = GETJSAMPLE(inptr[RGB_BLUE]);
+      inptr += RGB_PIXELSIZE;
+      /* If the inputs are 0..MAXJSAMPLE, the outputs of these equations
+       * must be too; we do not need an explicit range-limiting operation.
+       * Hence the value being shifted is never negative, and we don't
+       * need the general RIGHT_SHIFT macro.
+       */
+      /* Y */
+      outptr0[col] = (JSAMPLE)
+		((ctab[r+R_Y_OFF] + ctab[g+G_Y_OFF] + ctab[b+B_Y_OFF])
+		 >> SCALEBITS);
+      /* Cb */
+      outptr1[col] = (JSAMPLE)
+		((ctab[r+R_CB_OFF] + ctab[g+G_CB_OFF] + ctab[b+B_CB_OFF])
+		 >> SCALEBITS);
+      /* Cr */
+      outptr2[col] = (JSAMPLE)
+		((ctab[r+R_CR_OFF] + ctab[g+G_CR_OFF] + ctab[b+B_CR_OFF])
+		 >> SCALEBITS);
+    }
+  }
+}
+
+
+/**************** Cases other than RGB -> YCbCr **************/
+
+
+/*
+ * Convert some rows of samples to the JPEG colorspace.
+ * This version handles RGB->grayscale conversion, which is the same
+ * as the RGB->Y portion of RGB->YCbCr.
+ * We assume rgb_ycc_start has been called (we only use the Y tables).
+ */
+
+METHODDEF(void)
+rgb_gray_convert (j_compress_ptr cinfo,
+		  JSAMPARRAY input_buf, JSAMPIMAGE output_buf,
+		  JDIMENSION output_row, int num_rows)
+{
+  my_cconvert_ptr cconvert = (my_cconvert_ptr) cinfo->cconvert;
+  register int r, g, b;
+  register INT32 * ctab = cconvert->rgb_ycc_tab;
+  register JSAMPROW inptr;
+  register JSAMPROW outptr;
+  register JDIMENSION col;
+  JDIMENSION num_cols = cinfo->image_width;
+
+  while (--num_rows >= 0) {
+    inptr = *input_buf++;
+    outptr = output_buf[0][output_row];
+    output_row++;
+    for (col = 0; col < num_cols; col++) {
+      r = GETJSAMPLE(inptr[RGB_RED]);
+      g = GETJSAMPLE(inptr[RGB_GREEN]);
+      b = GETJSAMPLE(inptr[RGB_BLUE]);
+      inptr += RGB_PIXELSIZE;
+      /* Y */
+      outptr[col] = (JSAMPLE)
+		((ctab[r+R_Y_OFF] + ctab[g+G_Y_OFF] + ctab[b+B_Y_OFF])
+		 >> SCALEBITS);
+    }
+  }
+}
+
+
+/*
+ * Convert some rows of samples to the JPEG colorspace.
+ * This version handles Adobe-style CMYK->YCCK conversion,
+ * where we convert R=1-C, G=1-M, and B=1-Y to YCbCr using the same
+ * conversion as above, while passing K (black) unchanged.
+ * We assume rgb_ycc_start has been called.
+ */
+
+METHODDEF(void)
+cmyk_ycck_convert (j_compress_ptr cinfo,
+		   JSAMPARRAY input_buf, JSAMPIMAGE output_buf,
+		   JDIMENSION output_row, int num_rows)
+{
+  my_cconvert_ptr cconvert = (my_cconvert_ptr) cinfo->cconvert;
+  register int r, g, b;
+  register INT32 * ctab = cconvert->rgb_ycc_tab;
+  register JSAMPROW inptr;
+  register JSAMPROW outptr0, outptr1, outptr2, outptr3;
+  register JDIMENSION col;
+  JDIMENSION num_cols = cinfo->image_width;
+
+  while (--num_rows >= 0) {
+    inptr = *input_buf++;
+    outptr0 = output_buf[0][output_row];
+    outptr1 = output_buf[1][output_row];
+    outptr2 = output_buf[2][output_row];
+    outptr3 = output_buf[3][output_row];
+    output_row++;
+    for (col = 0; col < num_cols; col++) {
+      r = MAXJSAMPLE - GETJSAMPLE(inptr[0]);
+      g = MAXJSAMPLE - GETJSAMPLE(inptr[1]);
+      b = MAXJSAMPLE - GETJSAMPLE(inptr[2]);
+      /* K passes through as-is */
+      outptr3[col] = inptr[3];	/* don't need GETJSAMPLE here */
+      inptr += 4;
+      /* If the inputs are 0..MAXJSAMPLE, the outputs of these equations
+       * must be too; we do not need an explicit range-limiting operation.
+       * Hence the value being shifted is never negative, and we don't
+       * need the general RIGHT_SHIFT macro.
+       */
+      /* Y */
+      outptr0[col] = (JSAMPLE)
+		((ctab[r+R_Y_OFF] + ctab[g+G_Y_OFF] + ctab[b+B_Y_OFF])
+		 >> SCALEBITS);
+      /* Cb */
+      outptr1[col] = (JSAMPLE)
+		((ctab[r+R_CB_OFF] + ctab[g+G_CB_OFF] + ctab[b+B_CB_OFF])
+		 >> SCALEBITS);
+      /* Cr */
+      outptr2[col] = (JSAMPLE)
+		((ctab[r+R_CR_OFF] + ctab[g+G_CR_OFF] + ctab[b+B_CR_OFF])
+		 >> SCALEBITS);
+    }
+  }
+}
+
+
+/*
+ * Convert some rows of samples to the JPEG colorspace.
+ * This version handles grayscale output with no conversion.
+ * The source can be either plain grayscale or YCbCr (since Y == gray).
+ */
+
+METHODDEF(void)
+grayscale_convert (j_compress_ptr cinfo,
+		   JSAMPARRAY input_buf, JSAMPIMAGE output_buf,
+		   JDIMENSION output_row, int num_rows)
+{
+  register JSAMPROW inptr;
+  register JSAMPROW outptr;
+  register JDIMENSION col;
+  JDIMENSION num_cols = cinfo->image_width;
+  int instride = cinfo->input_components;
+
+  while (--num_rows >= 0) {
+    inptr = *input_buf++;
+    outptr = output_buf[0][output_row];
+    output_row++;
+    for (col = 0; col < num_cols; col++) {
+      outptr[col] = inptr[0];	/* don't need GETJSAMPLE() here */
+      inptr += instride;
+    }
+  }
+}
+
+
+/*
+ * Convert some rows of samples to the JPEG colorspace.
+ * This version handles multi-component colorspaces without conversion.
+ * We assume input_components == num_components.
+ */
+
+METHODDEF(void)
+null_convert (j_compress_ptr cinfo,
+	      JSAMPARRAY input_buf, JSAMPIMAGE output_buf,
+	      JDIMENSION output_row, int num_rows)
+{
+  register JSAMPROW inptr;
+  register JSAMPROW outptr;
+  register JDIMENSION col;
+  register int ci;
+  int nc = cinfo->num_components;
+  JDIMENSION num_cols = cinfo->image_width;
+
+  while (--num_rows >= 0) {
+    /* It seems fastest to make a separate pass for each component. */
+    for (ci = 0; ci < nc; ci++) {
+      inptr = *input_buf;
+      outptr = output_buf[ci][output_row];
+      for (col = 0; col < num_cols; col++) {
+	outptr[col] = inptr[ci]; /* don't need GETJSAMPLE() here */
+	inptr += nc;
+      }
+    }
+    input_buf++;
+    output_row++;
+  }
+}
+
+
+/*
+ * Empty method for start_pass.
+ */
+
+METHODDEF(void)
+null_method (j_compress_ptr cinfo)
+{
+  /* no work needed */
+}
+
+
+/*
+ * Module initialization routine for input colorspace conversion.
+ */
+
+GLOBAL(void)
+jinit_color_converter (j_compress_ptr cinfo)
+{
+  my_cconvert_ptr cconvert;
+
+  cconvert = (my_cconvert_ptr)
+    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+				SIZEOF(my_color_converter));
+  cinfo->cconvert = (struct jpeg_color_converter *) cconvert;
+  /* set start_pass to null method until we find out differently */
+  cconvert->pub.start_pass = null_method;
+
+  /* Make sure input_components agrees with in_color_space */
+  switch (cinfo->in_color_space) {
+  case JCS_GRAYSCALE:
+    if (cinfo->input_components != 1)
+      ERREXIT(cinfo, JERR_BAD_IN_COLORSPACE);
+    break;
+
+  case JCS_RGB:
+#if RGB_PIXELSIZE != 3
+    if (cinfo->input_components != RGB_PIXELSIZE)
+      ERREXIT(cinfo, JERR_BAD_IN_COLORSPACE);
+    break;
+#endif /* else share code with YCbCr */
+
+  case JCS_YCbCr:
+    if (cinfo->input_components != 3)
+      ERREXIT(cinfo, JERR_BAD_IN_COLORSPACE);
+    break;
+
+  case JCS_CMYK:
+  case JCS_YCCK:
+    if (cinfo->input_components != 4)
+      ERREXIT(cinfo, JERR_BAD_IN_COLORSPACE);
+    break;
+
+  default:			/* JCS_UNKNOWN can be anything */
+    if (cinfo->input_components < 1)
+      ERREXIT(cinfo, JERR_BAD_IN_COLORSPACE);
+    break;
+  }
+
+  /* Check num_components, set conversion method based on requested space */
+  switch (cinfo->jpeg_color_space) {
+  case JCS_GRAYSCALE:
+    if (cinfo->num_components != 1)
+      ERREXIT(cinfo, JERR_BAD_J_COLORSPACE);
+    if (cinfo->in_color_space == JCS_GRAYSCALE)
+      cconvert->pub.color_convert = grayscale_convert;
+    else if (cinfo->in_color_space == JCS_RGB) {
+      cconvert->pub.start_pass = rgb_ycc_start;
+      cconvert->pub.color_convert = rgb_gray_convert;
+    } else if (cinfo->in_color_space == JCS_YCbCr)
+      cconvert->pub.color_convert = grayscale_convert;
+    else
+      ERREXIT(cinfo, JERR_CONVERSION_NOTIMPL);
+    break;
+
+  case JCS_RGB:
+    if (cinfo->num_components != 3)
+      ERREXIT(cinfo, JERR_BAD_J_COLORSPACE);
+    if (cinfo->in_color_space == JCS_RGB && RGB_PIXELSIZE == 3)
+      cconvert->pub.color_convert = null_convert;
+    else
+      ERREXIT(cinfo, JERR_CONVERSION_NOTIMPL);
+    break;
+
+  case JCS_YCbCr:
+    if (cinfo->num_components != 3)
+      ERREXIT(cinfo, JERR_BAD_J_COLORSPACE);
+    if (cinfo->in_color_space == JCS_RGB) {
+      cconvert->pub.start_pass = rgb_ycc_start;
+      cconvert->pub.color_convert = rgb_ycc_convert;
+    } else if (cinfo->in_color_space == JCS_YCbCr)
+      cconvert->pub.color_convert = null_convert;
+    else
+      ERREXIT(cinfo, JERR_CONVERSION_NOTIMPL);
+    break;
+
+  case JCS_CMYK:
+    if (cinfo->num_components != 4)
+      ERREXIT(cinfo, JERR_BAD_J_COLORSPACE);
+    if (cinfo->in_color_space == JCS_CMYK)
+      cconvert->pub.color_convert = null_convert;
+    else
+      ERREXIT(cinfo, JERR_CONVERSION_NOTIMPL);
+    break;
+
+  case JCS_YCCK:
+    if (cinfo->num_components != 4)
+      ERREXIT(cinfo, JERR_BAD_J_COLORSPACE);
+    if (cinfo->in_color_space == JCS_CMYK) {
+      cconvert->pub.start_pass = rgb_ycc_start;
+      cconvert->pub.color_convert = cmyk_ycck_convert;
+    } else if (cinfo->in_color_space == JCS_YCCK)
+      cconvert->pub.color_convert = null_convert;
+    else
+      ERREXIT(cinfo, JERR_CONVERSION_NOTIMPL);
+    break;
+
+  default:			/* allow null conversion of JCS_UNKNOWN */
+    if (cinfo->jpeg_color_space != cinfo->in_color_space ||
+	cinfo->num_components != cinfo->input_components)
+      ERREXIT(cinfo, JERR_CONVERSION_NOTIMPL);
+    cconvert->pub.color_convert = null_convert;
+    break;
+  }
+}
diff --git a/uppsrc/plugin/jpg/lib/jcdctmgr.c b/uppsrc/plugin/jpg/lib/jcdctmgr.c
new file mode 100644
index 000000000..d280bf44d
--- /dev/null
+++ b/uppsrc/plugin/jpg/lib/jcdctmgr.c
@@ -0,0 +1,390 @@
+/*
+ * jcdctmgr.c
+ *
+ * Copyright (C) 1994-1998, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains the forward-DCT management logic.
+ * This code selects a particular DCT implementation to be used,
+ * and it performs related housekeeping chores including coefficient
+ * quantization.
+ */
+
+#define JPEG_INTERNALS
+#include "jinclude.h"
+#include "jpeglib.h"
+#include "jlossy.h"		/* Private declarations for lossy codec */
+#include "jdct.h"		/* Private declarations for DCT subsystem */
+
+
+/* Private subobject for this module */
+
+typedef struct {
+  /* Pointer to the DCT routine actually in use */
+  forward_DCT_method_ptr do_dct;
+
+  /* The actual post-DCT divisors --- not identical to the quant table
+   * entries, because of scaling (especially for an unnormalized DCT).
+   * Each table is given in normal array order.
+   */
+  DCTELEM * divisors[NUM_QUANT_TBLS];
+
+#ifdef DCT_FLOAT_SUPPORTED
+  /* Same as above for the floating-point case. */
+  float_DCT_method_ptr do_float_dct;
+  FAST_FLOAT * float_divisors[NUM_QUANT_TBLS];
+#endif
+} fdct_controller;
+
+typedef fdct_controller * fdct_ptr;
+
+
+/*
+ * Initialize for a processing pass.
+ * Verify that all referenced Q-tables are present, and set up
+ * the divisor table for each one.
+ * In the current implementation, DCT of all components is done during
+ * the first pass, even if only some components will be output in the
+ * first scan.  Hence all components should be examined here.
+ */
+
+METHODDEF(void)
+start_pass_fdctmgr (j_compress_ptr cinfo)
+{
+  j_lossy_c_ptr lossyc = (j_lossy_c_ptr) cinfo->codec;
+  fdct_ptr fdct = (fdct_ptr) lossyc->fdct_private;
+  int ci, qtblno, i;
+  jpeg_component_info *compptr;
+  JQUANT_TBL * qtbl;
+  DCTELEM * dtbl;
+
+  for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
+       ci++, compptr++) {
+    qtblno = compptr->quant_tbl_no;
+    /* Make sure specified quantization table is present */
+    if (qtblno < 0 || qtblno >= NUM_QUANT_TBLS ||
+	cinfo->quant_tbl_ptrs[qtblno] == NULL)
+      ERREXIT1(cinfo, JERR_NO_QUANT_TABLE, qtblno);
+    qtbl = cinfo->quant_tbl_ptrs[qtblno];
+    /* Compute divisors for this quant table */
+    /* We may do this more than once for same table, but it's not a big deal */
+    switch (cinfo->dct_method) {
+#ifdef DCT_ISLOW_SUPPORTED
+    case JDCT_ISLOW:
+      /* For LL&M IDCT method, divisors are equal to raw quantization
+       * coefficients multiplied by 8 (to counteract scaling).
+       */
+      if (fdct->divisors[qtblno] == NULL) {
+	fdct->divisors[qtblno] = (DCTELEM *)
+	  (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+				      DCTSIZE2 * SIZEOF(DCTELEM));
+      }
+      dtbl = fdct->divisors[qtblno];
+      for (i = 0; i < DCTSIZE2; i++) {
+	dtbl[i] = ((DCTELEM) qtbl->quantval[i]) << 3;
+      }
+      break;
+#endif
+#ifdef DCT_IFAST_SUPPORTED
+    case JDCT_IFAST:
+      {
+	/* For AA&N IDCT method, divisors are equal to quantization
+	 * coefficients scaled by scalefactor[row]*scalefactor[col], where
+	 *   scalefactor[0] = 1
+	 *   scalefactor[k] = cos(k*PI/16) * sqrt(2)    for k=1..7
+	 * We apply a further scale factor of 8.
+	 */
+#define CONST_BITS 14
+	static const INT16 aanscales[DCTSIZE2] = {
+	  /* precomputed values scaled up by 14 bits */
+	  16384, 22725, 21407, 19266, 16384, 12873,  8867,  4520,
+	  22725, 31521, 29692, 26722, 22725, 17855, 12299,  6270,
+	  21407, 29692, 27969, 25172, 21407, 16819, 11585,  5906,
+	  19266, 26722, 25172, 22654, 19266, 15137, 10426,  5315,
+	  16384, 22725, 21407, 19266, 16384, 12873,  8867,  4520,
+	  12873, 17855, 16819, 15137, 12873, 10114,  6967,  3552,
+	   8867, 12299, 11585, 10426,  8867,  6967,  4799,  2446,
+	   4520,  6270,  5906,  5315,  4520,  3552,  2446,  1247
+	};
+	SHIFT_TEMPS
+
+	if (fdct->divisors[qtblno] == NULL) {
+	  fdct->divisors[qtblno] = (DCTELEM *)
+	    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+					DCTSIZE2 * SIZEOF(DCTELEM));
+	}
+	dtbl = fdct->divisors[qtblno];
+	for (i = 0; i < DCTSIZE2; i++) {
+	  dtbl[i] = (DCTELEM)
+	    DESCALE(MULTIPLY16V16((INT32) qtbl->quantval[i],
+				  (INT32) aanscales[i]),
+		    CONST_BITS-3);
+	}
+      }
+      break;
+#endif
+#ifdef DCT_FLOAT_SUPPORTED
+    case JDCT_FLOAT:
+      {
+	/* For float AA&N IDCT method, divisors are equal to quantization
+	 * coefficients scaled by scalefactor[row]*scalefactor[col], where
+	 *   scalefactor[0] = 1
+	 *   scalefactor[k] = cos(k*PI/16) * sqrt(2)    for k=1..7
+	 * We apply a further scale factor of 8.
+	 * What's actually stored is 1/divisor so that the inner loop can
+	 * use a multiplication rather than a division.
+	 */
+	FAST_FLOAT * fdtbl;
+	int row, col;
+	static const double aanscalefactor[DCTSIZE] = {
+	  1.0, 1.387039845, 1.306562965, 1.175875602,
+	  1.0, 0.785694958, 0.541196100, 0.275899379
+	};
+
+	if (fdct->float_divisors[qtblno] == NULL) {
+	  fdct->float_divisors[qtblno] = (FAST_FLOAT *)
+	    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+					DCTSIZE2 * SIZEOF(FAST_FLOAT));
+	}
+	fdtbl = fdct->float_divisors[qtblno];
+	i = 0;
+	for (row = 0; row < DCTSIZE; row++) {
+	  for (col = 0; col < DCTSIZE; col++) {
+	    fdtbl[i] = (FAST_FLOAT)
+	      (1.0 / (((double) qtbl->quantval[i] *
+		       aanscalefactor[row] * aanscalefactor[col] * 8.0)));
+	    i++;
+	  }
+	}
+      }
+      break;
+#endif
+    default:
+      ERREXIT(cinfo, JERR_NOT_COMPILED);
+      break;
+    }
+  }
+}
+
+
+/*
+ * Perform forward DCT on one or more blocks of a component.
+ *
+ * The input samples are taken from the sample_data[] array starting at
+ * position start_row/start_col, and moving to the right for any additional
+ * blocks. The quantized coefficients are returned in coef_blocks[].
+ */
+
+METHODDEF(void)
+forward_DCT (j_compress_ptr cinfo, jpeg_component_info * compptr,
+	     JSAMPARRAY sample_data, JBLOCKROW coef_blocks,
+	     JDIMENSION start_row, JDIMENSION start_col,
+	     JDIMENSION num_blocks)
+/* This version is used for integer DCT implementations. */
+{
+  /* This routine is heavily used, so it's worth coding it tightly. */
+  j_lossy_c_ptr lossyc = (j_lossy_c_ptr) cinfo->codec;
+  fdct_ptr fdct = (fdct_ptr) lossyc->fdct_private;
+  forward_DCT_method_ptr do_dct = fdct->do_dct;
+  DCTELEM * divisors = fdct->divisors[compptr->quant_tbl_no];
+  DCTELEM workspace[DCTSIZE2];	/* work area for FDCT subroutine */
+  JDIMENSION bi;
+
+  sample_data += start_row;	/* fold in the vertical offset once */
+
+  for (bi = 0; bi < num_blocks; bi++, start_col += DCTSIZE) {
+    /* Load data into workspace, applying unsigned->signed conversion */
+    { register DCTELEM *workspaceptr;
+      register JSAMPROW elemptr;
+      register int elemr;
+
+      workspaceptr = workspace;
+      for (elemr = 0; elemr < DCTSIZE; elemr++) {
+	elemptr = sample_data[elemr] + start_col;
+#if DCTSIZE == 8		/* unroll the inner loop */
+	*workspaceptr++ = GETJSAMPLE(*elemptr++) - CENTERJSAMPLE;
+	*workspaceptr++ = GETJSAMPLE(*elemptr++) - CENTERJSAMPLE;
+	*workspaceptr++ = GETJSAMPLE(*elemptr++) - CENTERJSAMPLE;
+	*workspaceptr++ = GETJSAMPLE(*elemptr++) - CENTERJSAMPLE;
+	*workspaceptr++ = GETJSAMPLE(*elemptr++) - CENTERJSAMPLE;
+	*workspaceptr++ = GETJSAMPLE(*elemptr++) - CENTERJSAMPLE;
+	*workspaceptr++ = GETJSAMPLE(*elemptr++) - CENTERJSAMPLE;
+	*workspaceptr++ = GETJSAMPLE(*elemptr++) - CENTERJSAMPLE;
+#else
+	{ register int elemc;
+	  for (elemc = DCTSIZE; elemc > 0; elemc--) {
+	    *workspaceptr++ = GETJSAMPLE(*elemptr++) - CENTERJSAMPLE;
+	  }
+	}
+#endif
+      }
+    }
+
+    /* Perform the DCT */
+    (*do_dct) (workspace);
+
+    /* Quantize/descale the coefficients, and store into coef_blocks[] */
+    { register DCTELEM temp, qval;
+      register int i;
+      register JCOEFPTR output_ptr = coef_blocks[bi];
+
+      for (i = 0; i < DCTSIZE2; i++) {
+	qval = divisors[i];
+	temp = workspace[i];
+	/* Divide the coefficient value by qval, ensuring proper rounding.
+	 * Since C does not specify the direction of rounding for negative
+	 * quotients, we have to force the dividend positive for portability.
+	 *
+	 * In most files, at least half of the output values will be zero
+	 * (at default quantization settings, more like three-quarters...)
+	 * so we should ensure that this case is fast.  On many machines,
+	 * a comparison is enough cheaper than a divide to make a special test
+	 * a win.  Since both inputs will be nonnegative, we need only test
+	 * for a < b to discover whether a/b is 0.
+	 * If your machine's division is fast enough, define FAST_DIVIDE.
+	 */
+#ifdef FAST_DIVIDE
+#define DIVIDE_BY(a,b)	a /= b
+#else
+#define DIVIDE_BY(a,b)	if (a >= b) a /= b; else a = 0
+#endif
+	if (temp < 0) {
+	  temp = -temp;
+	  temp += qval>>1;	/* for rounding */
+	  DIVIDE_BY(temp, qval);
+	  temp = -temp;
+	} else {
+	  temp += qval>>1;	/* for rounding */
+	  DIVIDE_BY(temp, qval);
+	}
+	output_ptr[i] = (JCOEF) temp;
+      }
+    }
+  }
+}
+
+
+#ifdef DCT_FLOAT_SUPPORTED
+
+METHODDEF(void)
+forward_DCT_float (j_compress_ptr cinfo, jpeg_component_info * compptr,
+		   JSAMPARRAY sample_data, JBLOCKROW coef_blocks,
+		   JDIMENSION start_row, JDIMENSION start_col,
+		   JDIMENSION num_blocks)
+/* This version is used for floating-point DCT implementations. */
+{
+  /* This routine is heavily used, so it's worth coding it tightly. */
+  j_lossy_c_ptr lossyc = (j_lossy_c_ptr) cinfo->codec;
+  fdct_ptr fdct = (fdct_ptr) lossyc->fdct_private;
+  float_DCT_method_ptr do_dct = fdct->do_float_dct;
+  FAST_FLOAT * divisors = fdct->float_divisors[compptr->quant_tbl_no];
+  FAST_FLOAT workspace[DCTSIZE2]; /* work area for FDCT subroutine */
+  JDIMENSION bi;
+
+  sample_data += start_row;	/* fold in the vertical offset once */
+
+  for (bi = 0; bi < num_blocks; bi++, start_col += DCTSIZE) {
+    /* Load data into workspace, applying unsigned->signed conversion */
+    { register FAST_FLOAT *workspaceptr;
+      register JSAMPROW elemptr;
+      register int elemr;
+
+      workspaceptr = workspace;
+      for (elemr = 0; elemr < DCTSIZE; elemr++) {
+	elemptr = sample_data[elemr] + start_col;
+#if DCTSIZE == 8		/* unroll the inner loop */
+	*workspaceptr++ = (FAST_FLOAT)(GETJSAMPLE(*elemptr++) - CENTERJSAMPLE);
+	*workspaceptr++ = (FAST_FLOAT)(GETJSAMPLE(*elemptr++) - CENTERJSAMPLE);
+	*workspaceptr++ = (FAST_FLOAT)(GETJSAMPLE(*elemptr++) - CENTERJSAMPLE);
+	*workspaceptr++ = (FAST_FLOAT)(GETJSAMPLE(*elemptr++) - CENTERJSAMPLE);
+	*workspaceptr++ = (FAST_FLOAT)(GETJSAMPLE(*elemptr++) - CENTERJSAMPLE);
+	*workspaceptr++ = (FAST_FLOAT)(GETJSAMPLE(*elemptr++) - CENTERJSAMPLE);
+	*workspaceptr++ = (FAST_FLOAT)(GETJSAMPLE(*elemptr++) - CENTERJSAMPLE);
+	*workspaceptr++ = (FAST_FLOAT)(GETJSAMPLE(*elemptr++) - CENTERJSAMPLE);
+#else
+	{ register int elemc;
+	  for (elemc = DCTSIZE; elemc > 0; elemc--) {
+	    *workspaceptr++ = (FAST_FLOAT)
+	      (GETJSAMPLE(*elemptr++) - CENTERJSAMPLE);
+	  }
+	}
+#endif
+      }
+    }
+
+    /* Perform the DCT */
+    (*do_dct) (workspace);
+
+    /* Quantize/descale the coefficients, and store into coef_blocks[] */
+    { register FAST_FLOAT temp;
+      register int i;
+      register JCOEFPTR output_ptr = coef_blocks[bi];
+
+      for (i = 0; i < DCTSIZE2; i++) {
+	/* Apply the quantization and scaling factor */
+	temp = workspace[i] * divisors[i];
+	/* Round to nearest integer.
+	 * Since C does not specify the direction of rounding for negative
+	 * quotients, we have to force the dividend positive for portability.
+	 * The maximum coefficient size is +-16K (for 12-bit data), so this
+	 * code should work for either 16-bit or 32-bit ints.
+	 */
+	output_ptr[i] = (JCOEF) ((int) (temp + (FAST_FLOAT) 16384.5) - 16384);
+      }
+    }
+  }
+}
+
+#endif /* DCT_FLOAT_SUPPORTED */
+
+
+/*
+ * Initialize FDCT manager.
+ */
+
+GLOBAL(void)
+jinit_forward_dct (j_compress_ptr cinfo)
+{
+  j_lossy_c_ptr lossyc = (j_lossy_c_ptr) cinfo->codec;
+  fdct_ptr fdct;
+  int i;
+
+  fdct = (fdct_ptr)
+    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+				SIZEOF(fdct_controller));
+  lossyc->fdct_private = (struct jpeg_forward_dct *) fdct;
+  lossyc->fdct_start_pass = start_pass_fdctmgr;
+
+  switch (cinfo->dct_method) {
+#ifdef DCT_ISLOW_SUPPORTED
+  case JDCT_ISLOW:
+    lossyc->fdct_forward_DCT = forward_DCT;
+    fdct->do_dct = jpeg_fdct_islow;
+    break;
+#endif
+#ifdef DCT_IFAST_SUPPORTED
+  case JDCT_IFAST:
+    lossyc->fdct_forward_DCT = forward_DCT;
+    fdct->do_dct = jpeg_fdct_ifast;
+    break;
+#endif
+#ifdef DCT_FLOAT_SUPPORTED
+  case JDCT_FLOAT:
+    lossyc->fdct_forward_DCT = forward_DCT_float;
+    fdct->do_float_dct = jpeg_fdct_float;
+    break;
+#endif
+  default:
+    ERREXIT(cinfo, JERR_NOT_COMPILED);
+    break;
+  }
+
+  /* Mark divisor tables unallocated */
+  for (i = 0; i < NUM_QUANT_TBLS; i++) {
+    fdct->divisors[i] = NULL;
+#ifdef DCT_FLOAT_SUPPORTED
+    fdct->float_divisors[i] = NULL;
+#endif
+  }
+}
diff --git a/uppsrc/plugin/jpg/lib/jcdiffct.c b/uppsrc/plugin/jpg/lib/jcdiffct.c
new file mode 100644
index 000000000..7e48eb541
--- /dev/null
+++ b/uppsrc/plugin/jpg/lib/jcdiffct.c
@@ -0,0 +1,409 @@
+/*
+ * jcdiffct.c
+ *
+ * Copyright (C) 1994-1998, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains the difference buffer controller for compression.
+ * This controller is the top level of the lossless JPEG compressor proper.
+ * The difference buffer lies between prediction/differencing and entropy
+ * encoding.
+ */
+
+#define JPEG_INTERNALS
+#include "jinclude.h"
+#include "jpeglib.h"
+#include "jlossls.h"		/* Private declarations for lossless codec */
+
+
+#ifdef C_LOSSLESS_SUPPORTED
+
+/* We use a full-image sample buffer when doing Huffman optimization,
+ * and also for writing multiple-scan JPEG files.  In all cases, the
+ * full-image buffer is filled during the first pass, and the scaling,
+ * prediction and differencing steps are run during subsequent passes.
+ */
+#ifdef ENTROPY_OPT_SUPPORTED
+#define FULL_SAMP_BUFFER_SUPPORTED
+#else
+#ifdef C_MULTISCAN_FILES_SUPPORTED
+#define FULL_SAMP_BUFFER_SUPPORTED
+#endif
+#endif
+
+
+/* Private buffer controller object */
+
+typedef struct {
+  JDIMENSION iMCU_row_num;	/* iMCU row # within image */
+  JDIMENSION mcu_ctr;		/* counts MCUs processed in current row */
+  int MCU_vert_offset;		/* counts MCU rows within iMCU row */
+  int MCU_rows_per_iMCU_row;	/* number of such rows needed */
+
+  JSAMPROW cur_row[MAX_COMPONENTS];	/* row of point transformed samples */
+  JSAMPROW prev_row[MAX_COMPONENTS];	/* previous row of Pt'd samples */
+  JDIFFARRAY diff_buf[MAX_COMPONENTS];	/* iMCU row of differences */
+
+  /* In multi-pass modes, we need a virtual sample array for each component. */
+  jvirt_sarray_ptr whole_image[MAX_COMPONENTS];
+} c_diff_controller;
+
+typedef c_diff_controller * c_diff_ptr;
+
+
+/* Forward declarations */
+METHODDEF(boolean) compress_data
+    JPP((j_compress_ptr cinfo, JSAMPIMAGE input_buf));
+#ifdef FULL_SAMP_BUFFER_SUPPORTED
+METHODDEF(boolean) compress_first_pass
+    JPP((j_compress_ptr cinfo, JSAMPIMAGE input_buf));
+METHODDEF(boolean) compress_output
+    JPP((j_compress_ptr cinfo, JSAMPIMAGE input_buf));
+#endif
+
+
+LOCAL(void)
+start_iMCU_row (j_compress_ptr cinfo)
+/* Reset within-iMCU-row counters for a new row */
+{
+  j_lossless_c_ptr losslsc = (j_lossless_c_ptr) cinfo->codec;
+  c_diff_ptr diff = (c_diff_ptr) losslsc->diff_private;
+
+  /* In an interleaved scan, an MCU row is the same as an iMCU row.
+   * In a noninterleaved scan, an iMCU row has v_samp_factor MCU rows.
+   * But at the bottom of the image, process only what's left.
+   */
+  if (cinfo->comps_in_scan > 1) {
+    diff->MCU_rows_per_iMCU_row = 1;
+  } else {
+    if (diff->iMCU_row_num < (cinfo->total_iMCU_rows-1))
+      diff->MCU_rows_per_iMCU_row = cinfo->cur_comp_info[0]->v_samp_factor;
+    else
+      diff->MCU_rows_per_iMCU_row = cinfo->cur_comp_info[0]->last_row_height;
+  }
+
+  diff->mcu_ctr = 0;
+  diff->MCU_vert_offset = 0;
+}
+
+
+/*
+ * Initialize for a processing pass.
+ */
+
+METHODDEF(void)
+start_pass_diff (j_compress_ptr cinfo, J_BUF_MODE pass_mode)
+{
+  j_lossless_c_ptr losslsc = (j_lossless_c_ptr) cinfo->codec;
+  c_diff_ptr diff = (c_diff_ptr) losslsc->diff_private;
+
+  diff->iMCU_row_num = 0;
+  start_iMCU_row(cinfo);
+
+  switch (pass_mode) {
+  case JBUF_PASS_THRU:
+    if (diff->whole_image[0] != NULL)
+      ERREXIT(cinfo, JERR_BAD_BUFFER_MODE);
+    losslsc->pub.compress_data = compress_data;
+    break;
+#ifdef FULL_SAMP_BUFFER_SUPPORTED
+  case JBUF_SAVE_AND_PASS:
+    if (diff->whole_image[0] == NULL)
+      ERREXIT(cinfo, JERR_BAD_BUFFER_MODE);
+    losslsc->pub.compress_data = compress_first_pass;
+    break;
+  case JBUF_CRANK_DEST:
+    if (diff->whole_image[0] == NULL)
+      ERREXIT(cinfo, JERR_BAD_BUFFER_MODE);
+    losslsc->pub.compress_data = compress_output;
+    break;
+#endif
+  default:
+    ERREXIT(cinfo, JERR_BAD_BUFFER_MODE);
+    break;
+  }
+}
+
+
+#define SWAP_ROWS(rowa,rowb) {JSAMPROW temp; temp=rowa; rowa=rowb; rowb=temp;}
+
+/*
+ * Process some data in the single-pass case.
+ * We process the equivalent of one fully interleaved MCU row ("iMCU" row)
+ * per call, ie, v_samp_factor rows for each component in the image.
+ * Returns TRUE if the iMCU row is completed, FALSE if suspended.
+ *
+ * NB: input_buf contains a plane for each component in image,
+ * which we index according to the component's SOF position.
+ */
+
+METHODDEF(boolean)
+compress_data (j_compress_ptr cinfo, JSAMPIMAGE input_buf)
+{
+  j_lossless_c_ptr losslsc = (j_lossless_c_ptr) cinfo->codec;
+  c_diff_ptr diff = (c_diff_ptr) losslsc->diff_private;
+  JDIMENSION MCU_col_num;	/* index of current MCU within row */
+  JDIMENSION MCU_count;		/* number of MCUs encoded */
+  JDIMENSION last_MCU_col = cinfo->MCUs_per_row - 1;
+  JDIMENSION last_iMCU_row = cinfo->total_iMCU_rows - 1;
+  int comp, ci, yoffset, samp_row, samp_rows, samps_across;
+  jpeg_component_info *compptr;
+
+  /* Loop to write as much as one whole iMCU row */
+  for (yoffset = diff->MCU_vert_offset; yoffset < diff->MCU_rows_per_iMCU_row;
+       yoffset++) {
+
+    MCU_col_num = diff->mcu_ctr;
+
+    /* Scale and predict each scanline of the MCU-row separately.
+     *
+     * Note: We only do this if we are at the start of a MCU-row, ie,
+     * we don't want to reprocess a row suspended by the output.
+     */
+    if (MCU_col_num == 0) {
+      for (comp = 0; comp < cinfo->comps_in_scan; comp++) {
+	compptr = cinfo->cur_comp_info[comp];
+	ci = compptr->component_index;
+	if (diff->iMCU_row_num < last_iMCU_row)
+	  samp_rows = compptr->v_samp_factor;
+	else {
+	  /* NB: can't use last_row_height here, since may not be set! */
+	  samp_rows = (int) (compptr->height_in_data_units % compptr->v_samp_factor);
+	  if (samp_rows == 0) samp_rows = compptr->v_samp_factor;
+	  else {
+	    /* Fill dummy difference rows at the bottom edge with zeros, which
+	     * will encode to the smallest amount of data.
+	     */
+	    for (samp_row = samp_rows; samp_row < compptr->v_samp_factor;
+		 samp_row++)
+	      MEMZERO(diff->diff_buf[ci][samp_row],
+		      jround_up((long) compptr->width_in_data_units,
+				(long) compptr->h_samp_factor) * SIZEOF(JDIFF));
+	  }
+	}
+	samps_across = compptr->width_in_data_units;
+
+	for (samp_row = 0; samp_row < samp_rows; samp_row++) {
+	  (*losslsc->scaler_scale) (cinfo,
+				    input_buf[ci][samp_row],
+				    diff->cur_row[ci], samps_across);
+	  (*losslsc->predict_difference[ci]) (cinfo, ci,
+					      diff->cur_row[ci],
+					      diff->prev_row[ci],
+					      diff->diff_buf[ci][samp_row],
+					      samps_across);
+	  SWAP_ROWS(diff->cur_row[ci], diff->prev_row[ci]);
+	}
+      }
+    }
+
+    /* Try to write the MCU-row (or remaining portion of suspended MCU-row). */
+    MCU_count =
+      (*losslsc->entropy_encode_mcus) (cinfo,
+				       diff->diff_buf, yoffset, MCU_col_num,
+				       cinfo->MCUs_per_row - MCU_col_num);
+    if (MCU_count != cinfo->MCUs_per_row - MCU_col_num) {
+      /* Suspension forced; update state counters and exit */
+      diff->MCU_vert_offset = yoffset;
+      diff->mcu_ctr += MCU_col_num;
+      return FALSE;
+    }
+
+    /* Completed an MCU row, but perhaps not an iMCU row */
+    diff->mcu_ctr = 0;
+  }
+
+  /* Completed the iMCU row, advance counters for next one */
+  diff->iMCU_row_num++;
+  start_iMCU_row(cinfo);
+  return TRUE;
+}
+
+
+#ifdef FULL_SAMP_BUFFER_SUPPORTED
+
+/*
+ * Process some data in the first pass of a multi-pass case.
+ * We process the equivalent of one fully interleaved MCU row ("iMCU" row)
+ * per call, ie, v_samp_factor rows for each component in the image.
+ * This amount of data is read from the source buffer and saved into the
+ * virtual arrays.
+ *
+ * We must also emit the data to the compressor.  This is conveniently
+ * done by calling compress_output() after we've loaded the current strip
+ * of the virtual arrays.
+ *
+ * NB: input_buf contains a plane for each component in image.  All components
+ * are loaded into the virtual arrays in this pass.  However, it may be that
+ * only a subset of the components are emitted to the compressor during
+ * this first pass; be careful about looking at the scan-dependent variables
+ * (MCU dimensions, etc).
+ */
+
+METHODDEF(boolean)
+compress_first_pass (j_compress_ptr cinfo, JSAMPIMAGE input_buf)
+{
+  j_lossless_c_ptr losslsc = (j_lossless_c_ptr) cinfo->codec;
+  c_diff_ptr diff = (c_diff_ptr) losslsc->diff_private;
+  JDIMENSION last_iMCU_row = cinfo->total_iMCU_rows - 1;
+  JDIMENSION samps_across;
+  int ci, samp_row, samp_rows;
+  JSAMPARRAY buffer[MAX_COMPONENTS];
+  jpeg_component_info *compptr;
+
+  for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
+       ci++, compptr++) {
+    /* Align the virtual buffers for this component. */
+    buffer[ci] = (*cinfo->mem->access_virt_sarray)
+      ((j_common_ptr) cinfo, diff->whole_image[ci],
+       diff->iMCU_row_num * compptr->v_samp_factor,
+       (JDIMENSION) compptr->v_samp_factor, TRUE);
+
+    /* Count non-dummy sample rows in this iMCU row. */
+    if (diff->iMCU_row_num < last_iMCU_row)
+      samp_rows = compptr->v_samp_factor;
+    else {
+      /* NB: can't use last_row_height here, since may not be set! */
+      samp_rows = (int) (compptr->height_in_data_units % compptr->v_samp_factor);
+      if (samp_rows == 0) samp_rows = compptr->v_samp_factor;
+    }
+    samps_across = compptr->width_in_data_units;
+
+    /* Perform point transform scaling and prediction/differencing for all
+     * non-dummy rows in this iMCU row.  Each call on these functions
+     * process a complete row of samples.
+     */
+    for (samp_row = 0; samp_row < samp_rows; samp_row++) {
+      MEMCOPY(buffer[ci][samp_row], input_buf[ci][samp_row],
+	      samps_across * SIZEOF(JSAMPLE));
+    }
+  }
+
+  /* NB: compress_output will increment iMCU_row_num if successful.
+   * A suspension return will result in redoing all the work above next time.
+   */
+
+  /* Emit data to the compressor, sharing code with subsequent passes */
+  return compress_output(cinfo, input_buf);
+}
+
+
+/*
+ * Process some data in subsequent passes of a multi-pass case.
+ * We process the equivalent of one fully interleaved MCU row ("iMCU" row)
+ * per call, ie, v_samp_factor rows for each component in the scan.
+ * The data is obtained from the virtual arrays and fed to the compressor.
+ * Returns TRUE if the iMCU row is completed, FALSE if suspended.
+ *
+ * NB: input_buf is ignored; it is likely to be a NULL pointer.
+ */
+
+METHODDEF(boolean)
+compress_output (j_compress_ptr cinfo, JSAMPIMAGE input_buf)
+{
+  j_lossless_c_ptr losslsc = (j_lossless_c_ptr) cinfo->codec;
+  c_diff_ptr diff = (c_diff_ptr) losslsc->diff_private;
+//  JDIMENSION MCU_col_num;	/* index of current MCU within row */
+//  JDIMENSION MCU_count;		/* number of MCUs encoded */
+  int comp, ci; //, yoffset;
+  JSAMPARRAY buffer[MAX_COMPONENTS];
+  jpeg_component_info *compptr;
+
+  /* Align the virtual buffers for the components used in this scan.
+   * NB: during first pass, this is safe only because the buffers will
+   * already be aligned properly, so jmemmgr.c won't need to do any I/O.
+   */
+  for (comp = 0; comp < cinfo->comps_in_scan; comp++) {
+    compptr = cinfo->cur_comp_info[comp];
+    ci = compptr->component_index;
+    buffer[ci] = (*cinfo->mem->access_virt_sarray)
+      ((j_common_ptr) cinfo, diff->whole_image[ci],
+       diff->iMCU_row_num * compptr->v_samp_factor,
+       (JDIMENSION) compptr->v_samp_factor, FALSE);
+  }
+
+  return compress_data(cinfo, buffer);
+}
+
+#endif /* FULL_SAMP_BUFFER_SUPPORTED */
+
+
+/*
+ * Initialize difference buffer controller.
+ */
+
+GLOBAL(void)
+jinit_c_diff_controller (j_compress_ptr cinfo, boolean need_full_buffer)
+{
+  j_lossless_c_ptr losslsc = (j_lossless_c_ptr) cinfo->codec;
+  c_diff_ptr diff;
+  int ci, row;
+  jpeg_component_info *compptr;
+
+  diff = (c_diff_ptr)
+    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+				SIZEOF(c_diff_controller));
+  losslsc->diff_private = (void *) diff;
+  losslsc->diff_start_pass = start_pass_diff;
+
+  /* Create the prediction row buffers. */
+  for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
+       ci++, compptr++) {
+    diff->cur_row[ci] = *(*cinfo->mem->alloc_sarray)
+      ((j_common_ptr) cinfo, JPOOL_IMAGE,
+       (JDIMENSION) jround_up((long) compptr->width_in_data_units,
+			      (long) compptr->h_samp_factor),
+       (JDIMENSION) 1);
+    diff->prev_row[ci] = *(*cinfo->mem->alloc_sarray)
+      ((j_common_ptr) cinfo, JPOOL_IMAGE,
+       (JDIMENSION) jround_up((long) compptr->width_in_data_units,
+			      (long) compptr->h_samp_factor),
+       (JDIMENSION) 1);
+  }
+
+  /* Create the difference buffer. */
+  for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
+       ci++, compptr++) {
+    diff->diff_buf[ci] = (*cinfo->mem->alloc_darray)
+      ((j_common_ptr) cinfo, JPOOL_IMAGE,
+       (JDIMENSION) jround_up((long) compptr->width_in_data_units,
+			      (long) compptr->h_samp_factor),
+       (JDIMENSION) compptr->v_samp_factor);
+    /* Prefill difference rows with zeros.  We do this because only actual
+     * data is placed in the buffers during prediction/differencing, leaving
+     * any dummy differences at the right edge as zeros, which will encode
+     * to the smallest amount of data.
+     */
+    for (row = 0; row < compptr->v_samp_factor; row++)
+      MEMZERO(diff->diff_buf[ci][row],
+	      jround_up((long) compptr->width_in_data_units,
+			(long) compptr->h_samp_factor) * SIZEOF(JDIFF));
+  }
+
+  /* Create the sample buffer. */
+  if (need_full_buffer) {
+#ifdef FULL_SAMP_BUFFER_SUPPORTED
+    /* Allocate a full-image virtual array for each component, */
+    /* padded to a multiple of samp_factor differences in each direction. */
+    int ci;
+    jpeg_component_info *compptr;
+
+    for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
+	 ci++, compptr++) {
+      diff->whole_image[ci] = (*cinfo->mem->request_virt_sarray)
+	((j_common_ptr) cinfo, JPOOL_IMAGE, FALSE,
+	 (JDIMENSION) jround_up((long) compptr->width_in_data_units,
+				(long) compptr->h_samp_factor),
+	 (JDIMENSION) jround_up((long) compptr->height_in_data_units,
+				(long) compptr->v_samp_factor),
+	 (JDIMENSION) compptr->v_samp_factor);
+    }
+#else
+    ERREXIT(cinfo, JERR_BAD_BUFFER_MODE);
+#endif
+  } else
+    diff->whole_image[0] = NULL; /* flag for no virtual arrays */
+}
+
+#endif /* C_LOSSLESS_SUPPORTED */
diff --git a/uppsrc/plugin/jpg/lib/jchuff.c b/uppsrc/plugin/jpg/lib/jchuff.c
new file mode 100644
index 000000000..35b90993f
--- /dev/null
+++ b/uppsrc/plugin/jpg/lib/jchuff.c
@@ -0,0 +1,273 @@
+/*
+ * jchuff.c
+ *
+ * Copyright (C) 1991-1998, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains Huffman entropy decoding routines which are shared
+ * by the sequential, progressive and lossless decoders.
+ */
+
+#define JPEG_INTERNALS
+#include "jinclude.h"
+#include "jpeglib.h"
+#include "jchuff.h"		/* Declarations shared with jc*huff.c */
+
+
+/*
+ * Compute the derived values for a Huffman table.
+ * This routine also performs some validation checks on the table.
+ */
+
+GLOBAL(void)
+jpeg_make_c_derived_tbl (j_compress_ptr cinfo, boolean isDC, int tblno,
+			 c_derived_tbl ** pdtbl)
+{
+  JHUFF_TBL *htbl;
+  c_derived_tbl *dtbl;
+  int p, i, l, lastp, si, maxsymbol;
+  char huffsize[257];
+  unsigned int huffcode[257];
+  unsigned int code;
+
+  /* Note that huffsize[] and huffcode[] are filled in code-length order,
+   * paralleling the order of the symbols themselves in htbl->huffval[].
+   */
+
+  /* Find the input Huffman table */
+  if (tblno < 0 || tblno >= NUM_HUFF_TBLS)
+    ERREXIT1(cinfo, JERR_NO_HUFF_TABLE, tblno);
+  htbl =
+    isDC ? cinfo->dc_huff_tbl_ptrs[tblno] : cinfo->ac_huff_tbl_ptrs[tblno];
+  if (htbl == NULL)
+    ERREXIT1(cinfo, JERR_NO_HUFF_TABLE, tblno);
+
+  /* Allocate a workspace if we haven't already done so. */
+  if (*pdtbl == NULL)
+    *pdtbl = (c_derived_tbl *)
+      (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+				  SIZEOF(c_derived_tbl));
+  dtbl = *pdtbl;
+
+  /* Figure C.1: make table of Huffman code length for each symbol */
+
+  p = 0;
+  for (l = 1; l <= 16; l++) {
+    i = (int) htbl->bits[l];
+    if (i < 0 || p + i > 256)	/* protect against table overrun */
+      ERREXIT(cinfo, JERR_BAD_HUFF_TABLE);
+    while (i--)
+      huffsize[p++] = (char) l;
+  }
+  huffsize[p] = 0;
+  lastp = p;
+
+  /* Figure C.2: generate the codes themselves */
+  /* We also validate that the counts represent a legal Huffman code tree. */
+
+  code = 0;
+  si = huffsize[0];
+  p = 0;
+  while (huffsize[p]) {
+    while (((int) huffsize[p]) == si) {
+      huffcode[p++] = code;
+      code++;
+    }
+    /* code is now 1 more than the last code used for codelength si; but
+     * it must still fit in si bits, since no code is allowed to be all ones.
+     */
+    if (((INT32) code) >= (((INT32) 1) << si))
+      ERREXIT(cinfo, JERR_BAD_HUFF_TABLE);
+    code <<= 1;
+    si++;
+  }
+
+  /* Figure C.3: generate encoding tables */
+  /* These are code and size indexed by symbol value */
+
+  /* Set all codeless symbols to have code length 0;
+   * this lets us detect duplicate VAL entries here, and later
+   * allows emit_bits to detect any attempt to emit such symbols.
+   */
+  MEMZERO(dtbl->ehufsi, SIZEOF(dtbl->ehufsi));
+
+  /* This is also a convenient place to check for out-of-range
+   * and duplicated VAL entries.  We allow 0..255 for AC symbols
+   * but only 0..16 for DC.  (We could constrain them further
+   * based on data depth and mode, but this seems enough.)
+   */
+  maxsymbol = isDC ? 16 : 255;
+
+  for (p = 0; p < lastp; p++) {
+    i = htbl->huffval[p];
+    if (i < 0 || i > maxsymbol || dtbl->ehufsi[i])
+      ERREXIT(cinfo, JERR_BAD_HUFF_TABLE);
+    dtbl->ehufco[i] = huffcode[p];
+    dtbl->ehufsi[i] = huffsize[p];
+  }
+}
+
+
+/*
+ * Generate the best Huffman code table for the given counts, fill htbl.
+ *
+ * The JPEG standard requires that no symbol be assigned a codeword of all
+ * one bits (so that padding bits added at the end of a compressed segment
+ * can't look like a valid code).  Because of the canonical ordering of
+ * codewords, this just means that there must be an unused slot in the
+ * longest codeword length category.  Section K.2 of the JPEG spec suggests
+ * reserving such a slot by pretending that symbol 256 is a valid symbol
+ * with count 1.  In theory that's not optimal; giving it count zero but
+ * including it in the symbol set anyway should give a better Huffman code.
+ * But the theoretically better code actually seems to come out worse in
+ * practice, because it produces more all-ones bytes (which incur stuffed
+ * zero bytes in the final file).  In any case the difference is tiny.
+ *
+ * The JPEG standard requires Huffman codes to be no more than 16 bits long.
+ * If some symbols have a very small but nonzero probability, the Huffman tree
+ * must be adjusted to meet the code length restriction.  We currently use
+ * the adjustment method suggested in JPEG section K.2.  This method is *not*
+ * optimal; it may not choose the best possible limited-length code.  But
+ * typically only very-low-frequency symbols will be given less-than-optimal
+ * lengths, so the code is almost optimal.  Experimental comparisons against
+ * an optimal limited-length-code algorithm indicate that the difference is
+ * microscopic --- usually less than a hundredth of a percent of total size.
+ * So the extra complexity of an optimal algorithm doesn't seem worthwhile.
+ */
+
+GLOBAL(void)
+jpeg_gen_optimal_table (j_compress_ptr cinfo, JHUFF_TBL * htbl, long freq[])
+{
+#define MAX_CLEN 32		/* assumed maximum initial code length */
+  UINT8 bits[MAX_CLEN+1];	/* bits[k] = # of symbols with code length k */
+  int codesize[257];		/* codesize[k] = code length of symbol k */
+  int others[257];		/* next symbol in current branch of tree */
+  int c1, c2;
+  int p, i, j;
+  long v;
+
+  /* This algorithm is explained in section K.2 of the JPEG standard */
+
+  MEMZERO(bits, SIZEOF(bits));
+  MEMZERO(codesize, SIZEOF(codesize));
+  for (i = 0; i < 257; i++)
+    others[i] = -1;		/* init links to empty */
+
+  freq[256] = 1;		/* make sure 256 has a nonzero count */
+  /* Including the pseudo-symbol 256 in the Huffman procedure guarantees
+   * that no real symbol is given code-value of all ones, because 256
+   * will be placed last in the largest codeword category.
+   */
+
+  /* Huffman's basic algorithm to assign optimal code lengths to symbols */
+
+  for (;;) {
+    /* Find the smallest nonzero frequency, set c1 = its symbol */
+    /* In case of ties, take the larger symbol number */
+    c1 = -1;
+    v = 1000000000L;
+    for (i = 0; i <= 256; i++) {
+      if (freq[i] && freq[i] <= v) {
+	v = freq[i];
+	c1 = i;
+      }
+    }
+
+    /* Find the next smallest nonzero frequency, set c2 = its symbol */
+    /* In case of ties, take the larger symbol number */
+    c2 = -1;
+    v = 1000000000L;
+    for (i = 0; i <= 256; i++) {
+      if (freq[i] && freq[i] <= v && i != c1) {
+	v = freq[i];
+	c2 = i;
+      }
+    }
+
+    /* Done if we've merged everything into one frequency */
+    if (c2 < 0)
+      break;
+
+    /* Else merge the two counts/trees */
+    freq[c1] += freq[c2];
+    freq[c2] = 0;
+
+    /* Increment the codesize of everything in c1's tree branch */
+    codesize[c1]++;
+    while (others[c1] >= 0) {
+      c1 = others[c1];
+      codesize[c1]++;
+    }
+
+    others[c1] = c2;		/* chain c2 onto c1's tree branch */
+
+    /* Increment the codesize of everything in c2's tree branch */
+    codesize[c2]++;
+    while (others[c2] >= 0) {
+      c2 = others[c2];
+      codesize[c2]++;
+    }
+  }
+
+  /* Now count the number of symbols of each code length */
+  for (i = 0; i <= 256; i++) {
+    if (codesize[i]) {
+      /* The JPEG standard seems to think that this can't happen, */
+      /* but I'm paranoid... */
+      if (codesize[i] > MAX_CLEN)
+	ERREXIT(cinfo, JERR_HUFF_CLEN_OVERFLOW);
+
+      bits[codesize[i]]++;
+    }
+  }
+
+  /* JPEG doesn't allow symbols with code lengths over 16 bits, so if the pure
+   * Huffman procedure assigned any such lengths, we must adjust the coding.
+   * Here is what the JPEG spec says about how this next bit works:
+   * Since symbols are paired for the longest Huffman code, the symbols are
+   * removed from this length category two at a time.  The prefix for the pair
+   * (which is one bit shorter) is allocated to one of the pair; then,
+   * skipping the BITS entry for that prefix length, a code word from the next
+   * shortest nonzero BITS entry is converted into a prefix for two code words
+   * one bit longer.
+   */
+
+  for (i = MAX_CLEN; i > 16; i--) {
+    while (bits[i] > 0) {
+      j = i - 2;		/* find length of new prefix to be used */
+      while (bits[j] == 0)
+	j--;
+
+      bits[i] -= 2;		/* remove two symbols */
+      bits[i-1]++;		/* one goes in this length */
+      bits[j+1] += 2;		/* two new symbols in this length */
+      bits[j]--;		/* symbol of this length is now a prefix */
+    }
+  }
+
+  /* Remove the count for the pseudo-symbol 256 from the largest codelength */
+  while (bits[i] == 0)		/* find largest codelength still in use */
+    i--;
+  bits[i]--;
+
+  /* Return final symbol counts (only for lengths 0..16) */
+  MEMCOPY(htbl->bits, bits, SIZEOF(htbl->bits));
+
+  /* Return a list of the symbols sorted by code length */
+  /* It's not real clear to me why we don't need to consider the codelength
+   * changes made above, but the JPEG spec seems to think this works.
+   */
+  p = 0;
+  for (i = 1; i <= MAX_CLEN; i++) {
+    for (j = 0; j <= 255; j++) {
+      if (codesize[j] == i) {
+	htbl->huffval[p] = (UINT8) j;
+	p++;
+      }
+    }
+  }
+
+  /* Set sent_table FALSE so updated table will be written to JPEG file. */
+  htbl->sent_table = FALSE;
+}
diff --git a/uppsrc/plugin/jpg/lib/jchuff.h b/uppsrc/plugin/jpg/lib/jchuff.h
new file mode 100644
index 000000000..b4db2b57e
--- /dev/null
+++ b/uppsrc/plugin/jpg/lib/jchuff.h
@@ -0,0 +1,54 @@
+/*
+ * jchuff.h
+ *
+ * Copyright (C) 1991-1997, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains declarations for Huffman entropy encoding routines
+ * that are shared between the sequential encoder (jchuff.c) and the
+ * progressive encoder (jcphuff.c).  No other modules need to see these.
+ */
+
+/* The legal range of a DCT coefficient is
+ *  -1024 .. +1023  for 8-bit data;
+ * -16384 .. +16383 for 12-bit data.
+ * Hence the magnitude should always fit in 10 or 14 bits respectively.
+ */
+
+#if BITS_IN_JSAMPLE == 8
+#define MAX_COEF_BITS 10
+#else
+#define MAX_COEF_BITS 14
+#endif
+
+/* The legal range of a spatial difference is
+ * -32767 .. +32768.
+ * Hence the magnitude should always fit in 16 bits.
+ */
+
+#define MAX_DIFF_BITS 16
+
+/* Derived data constructed for each Huffman table */
+
+typedef struct {
+  unsigned int ehufco[256];	/* code for each symbol */
+  char ehufsi[256];		/* length of code for each symbol */
+  /* If no code has been allocated for a symbol S, ehufsi[S] contains 0 */
+} c_derived_tbl;
+
+/* Short forms of external names for systems with brain-damaged linkers. */
+
+#ifdef NEED_SHORT_EXTERNAL_NAMES
+#define jpeg_make_c_derived_tbl	jMkCDerived
+#define jpeg_gen_optimal_table	jGenOptTbl
+#endif /* NEED_SHORT_EXTERNAL_NAMES */
+
+/* Expand a Huffman table definition into the derived format */
+EXTERN(void) jpeg_make_c_derived_tbl
+	JPP((j_compress_ptr cinfo, boolean isDC, int tblno,
+	     c_derived_tbl ** pdtbl));
+
+/* Generate an optimal table definition given the specified counts */
+EXTERN(void) jpeg_gen_optimal_table
+	JPP((j_compress_ptr cinfo, JHUFF_TBL * htbl, long freq[]));
diff --git a/uppsrc/plugin/jpg/lib/jcinit.c b/uppsrc/plugin/jpg/lib/jcinit.c
new file mode 100644
index 000000000..b485a8e7e
--- /dev/null
+++ b/uppsrc/plugin/jpg/lib/jcinit.c
@@ -0,0 +1,57 @@
+/*
+ * jcinit.c
+ *
+ * Copyright (C) 1991-1997, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains initialization logic for the JPEG compressor.
+ * This routine is in charge of selecting the modules to be executed and
+ * making an initialization call to each one.
+ *
+ * Logically, this code belongs in jcmaster.c.  It's split out because
+ * linking this routine implies linking the entire compression library.
+ * For a transcoding-only application, we want to be able to use jcmaster.c
+ * without linking in the whole library.
+ */
+
+#define JPEG_INTERNALS
+#include "jinclude.h"
+#include "jpeglib.h"
+
+
+/*
+ * Master selection of compression modules.
+ * This is done once at the start of processing an image.  We determine
+ * which modules will be used and give them appropriate initialization calls.
+ */
+
+GLOBAL(void)
+jinit_compress_master (j_compress_ptr cinfo)
+{
+  /* Initialize master control (includes parameter checking/processing) */
+  jinit_c_master_control(cinfo, FALSE /* full compression */);
+
+  /* Initialize compression codec */
+  jinit_c_codec(cinfo);
+
+  /* Preprocessing */
+  if (! cinfo->raw_data_in) {
+    jinit_color_converter(cinfo);
+    jinit_downsampler(cinfo);
+    jinit_c_prep_controller(cinfo, FALSE /* never need full buffer here */);
+  }
+
+  jinit_c_main_controller(cinfo, FALSE /* never need full buffer here */);
+
+  jinit_marker_writer(cinfo);
+
+  /* We can now tell the memory manager to allocate virtual arrays. */
+  (*cinfo->mem->realize_virt_arrays) ((j_common_ptr) cinfo);
+
+  /* Write the datastream header (SOI) immediately.
+   * Frame and scan headers are postponed till later.
+   * This lets application insert special markers after the SOI.
+   */
+  (*cinfo->marker->write_file_header) (cinfo);
+}
diff --git a/uppsrc/plugin/jpg/lib/jclhuff.c b/uppsrc/plugin/jpg/lib/jclhuff.c
new file mode 100644
index 000000000..4aa206c9e
--- /dev/null
+++ b/uppsrc/plugin/jpg/lib/jclhuff.c
@@ -0,0 +1,599 @@
+/*
+ * jclhuff.c
+ *
+ * Copyright (C) 1991-1998, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains Huffman entropy encoding routines for lossless JPEG.
+ *
+ * Much of the complexity here has to do with supporting output suspension.
+ * If the data destination module demands suspension, we want to be able to
+ * back up to the start of the current MCU.  To do this, we copy state
+ * variables into local working storage, and update them back to the
+ * permanent JPEG objects only upon successful completion of an MCU.
+ */
+
+#define JPEG_INTERNALS
+#include "jinclude.h"
+#include "jpeglib.h"
+#include "jlossls.h"		/* Private declarations for lossless codec */
+#include "jchuff.h"		/* Declarations shared with jc*huff.c */
+
+
+/* Expanded entropy encoder object for Huffman encoding.
+ *
+ * The savable_state subrecord contains fields that change within an MCU,
+ * but must not be updated permanently until we complete the MCU.
+ */
+
+typedef struct {
+  INT32 put_buffer;		/* current bit-accumulation buffer */
+  int put_bits;			/* # of bits now in it */
+} savable_state;
+
+/* This macro is to work around compilers with missing or broken
+ * structure assignment.  You'll need to fix this code if you have
+ * such a compiler and you change MAX_COMPS_IN_SCAN.
+ */
+
+#ifndef NO_STRUCT_ASSIGN
+#define ASSIGN_STATE(dest,src)  ((dest) = (src))
+#else
+#define ASSIGN_STATE(dest,src)  \
+	((dest).put_buffer = (src).put_buffer, \
+	 (dest).put_bits = (src).put_bits)
+#endif
+
+
+typedef struct {
+  int ci, yoffset, MCU_width;
+} lhe_input_ptr_info;
+
+
+typedef struct {
+  savable_state saved;		/* Bit buffer at start of MCU */
+
+  /* These fields are NOT loaded into local working state. */
+  unsigned int restarts_to_go;	/* MCUs left in this restart interval */
+  int next_restart_num;		/* next restart number to write (0-7) */
+
+  /* Pointers to derived tables (these workspaces have image lifespan) */
+  c_derived_tbl * derived_tbls[NUM_HUFF_TBLS];
+
+  /* Pointers to derived tables to be used for each data unit within an MCU */
+  c_derived_tbl * cur_tbls[C_MAX_DATA_UNITS_IN_MCU];
+
+#ifdef ENTROPY_OPT_SUPPORTED	/* Statistics tables for optimization */
+  long * count_ptrs[NUM_HUFF_TBLS];
+
+  /* Pointers to stats tables to be used for each data unit within an MCU */
+  long * cur_counts[C_MAX_DATA_UNITS_IN_MCU];
+#endif
+
+  /* Pointers to the proper input difference row for each group of data units
+   * within an MCU.  For each component, there are Vi groups of Hi data units.
+   */
+  JDIFFROW input_ptr[C_MAX_DATA_UNITS_IN_MCU];
+
+  /* Number of input pointers in use for the current MCU.  This is the sum
+   * of all Vi in the MCU.
+   */
+  int num_input_ptrs;
+
+  /* Information used for positioning the input pointers within the input
+   * difference rows.
+   */
+  lhe_input_ptr_info input_ptr_info[C_MAX_DATA_UNITS_IN_MCU];
+
+  /* Index of the proper input pointer for each data unit within an MCU */
+  int input_ptr_index[C_MAX_DATA_UNITS_IN_MCU];
+
+} lhuff_entropy_encoder;
+
+typedef lhuff_entropy_encoder * lhuff_entropy_ptr;
+
+/* Working state while writing an MCU.
+ * This struct contains all the fields that are needed by subroutines.
+ */
+
+typedef struct {
+  JOCTET * next_output_byte;	/* => next byte to write in buffer */
+  size_t free_in_buffer;	/* # of byte spaces remaining in buffer */
+  savable_state cur;		/* Current bit buffer & DC state */
+  j_compress_ptr cinfo;		/* dump_buffer needs access to this */
+} working_state;
+
+
+/* Forward declarations */
+METHODDEF(JDIMENSION) encode_mcus_huff (j_compress_ptr cinfo,
+					JDIFFIMAGE diff_buf,
+					JDIMENSION MCU_row_num,
+					JDIMENSION MCU_col_num,
+					JDIMENSION nMCU);
+METHODDEF(void) finish_pass_huff JPP((j_compress_ptr cinfo));
+#ifdef ENTROPY_OPT_SUPPORTED
+METHODDEF(JDIMENSION) encode_mcus_gather (j_compress_ptr cinfo,
+					  JDIFFIMAGE diff_buf,
+					  JDIMENSION MCU_row_num,
+					  JDIMENSION MCU_col_num,
+					  JDIMENSION nMCU);
+METHODDEF(void) finish_pass_gather JPP((j_compress_ptr cinfo));
+#endif
+
+
+/*
+ * Initialize for a Huffman-compressed scan.
+ * If gather_statistics is TRUE, we do not output anything during the scan,
+ * just count the Huffman symbols used and generate Huffman code tables.
+ */
+
+METHODDEF(void)
+start_pass_huff (j_compress_ptr cinfo, boolean gather_statistics)
+{
+  j_lossless_c_ptr losslsc = (j_lossless_c_ptr) cinfo->codec;
+  lhuff_entropy_ptr entropy = (lhuff_entropy_ptr) losslsc->entropy_private;
+  int ci, dctbl, sampn, ptrn, yoffset, xoffset;
+  jpeg_component_info * compptr;
+
+  if (gather_statistics) {
+#ifdef ENTROPY_OPT_SUPPORTED
+    losslsc->entropy_encode_mcus = encode_mcus_gather;
+    losslsc->pub.entropy_finish_pass = finish_pass_gather;
+#else
+    ERREXIT(cinfo, JERR_NOT_COMPILED);
+#endif
+  } else {
+    losslsc->entropy_encode_mcus = encode_mcus_huff;
+    losslsc->pub.entropy_finish_pass = finish_pass_huff;
+  }
+
+  for (ci = 0; ci < cinfo->comps_in_scan; ci++) {
+    compptr = cinfo->cur_comp_info[ci];
+    dctbl = compptr->dc_tbl_no;
+    if (gather_statistics) {
+#ifdef ENTROPY_OPT_SUPPORTED
+      /* Check for invalid table indexes */
+      /* (make_c_derived_tbl does this in the other path) */
+      if (dctbl < 0 || dctbl >= NUM_HUFF_TBLS)
+	ERREXIT1(cinfo, JERR_NO_HUFF_TABLE, dctbl);
+      /* Allocate and zero the statistics tables */
+      /* Note that jpeg_gen_optimal_table expects 257 entries in each table! */
+      if (entropy->count_ptrs[dctbl] == NULL)
+	entropy->count_ptrs[dctbl] = (long *)
+	  (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+				      257 * SIZEOF(long));
+      MEMZERO(entropy->count_ptrs[dctbl], 257 * SIZEOF(long));
+#endif
+    } else {
+      /* Compute derived values for Huffman tables */
+      /* We may do this more than once for a table, but it's not expensive */
+      jpeg_make_c_derived_tbl(cinfo, TRUE, dctbl,
+			      & entropy->derived_tbls[dctbl]);
+    }
+  }
+
+  /* Precalculate encoding info for each sample in an MCU of this scan */
+  for (sampn = 0, ptrn = 0; sampn < cinfo->data_units_in_MCU;) {
+    compptr = cinfo->cur_comp_info[cinfo->MCU_membership[sampn]];
+    ci = compptr->component_index;
+    /*    ci = cinfo->MCU_membership[sampn];
+    compptr = cinfo->cur_comp_info[ci];*/
+    for (yoffset = 0; yoffset < compptr->MCU_height; yoffset++, ptrn++) {
+      /* Precalculate the setup info for each input pointer */
+      entropy->input_ptr_info[ptrn].ci = ci;
+      entropy->input_ptr_info[ptrn].yoffset = yoffset;
+      entropy->input_ptr_info[ptrn].MCU_width = compptr->MCU_width;
+      for (xoffset = 0; xoffset < compptr->MCU_width; xoffset++, sampn++) {
+	/* Precalculate the input pointer index for each sample */
+	entropy->input_ptr_index[sampn] = ptrn;
+	/* Precalculate which tables to use for each sample */
+	entropy->cur_tbls[sampn] = entropy->derived_tbls[compptr->dc_tbl_no];
+	entropy->cur_counts[sampn] = entropy->count_ptrs[compptr->dc_tbl_no];
+      }
+    }
+  }
+  entropy->num_input_ptrs = ptrn;
+
+  /* Initialize bit buffer to empty */
+  entropy->saved.put_buffer = 0;
+  entropy->saved.put_bits = 0;
+
+  /* Initialize restart stuff */
+  entropy->restarts_to_go = cinfo->restart_interval;
+  entropy->next_restart_num = 0;
+}
+
+
+/* Outputting bytes to the file */
+
+/* Emit a byte, taking 'action' if must suspend. */
+#define emit_byte(state,val,action)  \
+	{ *(state)->next_output_byte++ = (JOCTET) (val);  \
+	  if (--(state)->free_in_buffer == 0)  \
+	    if (! dump_buffer(state))  \
+	      { action; } }
+
+
+LOCAL(boolean)
+dump_buffer (working_state * state)
+/* Empty the output buffer; return TRUE if successful, FALSE if must suspend */
+{
+  struct jpeg_destination_mgr * dest = state->cinfo->dest;
+
+  if (! (*dest->empty_output_buffer) (state->cinfo))
+    return FALSE;
+  /* After a successful buffer dump, must reset buffer pointers */
+  state->next_output_byte = dest->next_output_byte;
+  state->free_in_buffer = dest->free_in_buffer;
+  return TRUE;
+}
+
+
+/* Outputting bits to the file */
+
+/* Only the right 24 bits of put_buffer are used; the valid bits are
+ * left-justified in this part.  At most 16 bits can be passed to emit_bits
+ * in one call, and we never retain more than 7 bits in put_buffer
+ * between calls, so 24 bits are sufficient.
+ */
+
+INLINE
+LOCAL(boolean)
+emit_bits (working_state * state, unsigned int code, int size)
+/* Emit some bits; return TRUE if successful, FALSE if must suspend */
+{
+  /* This routine is heavily used, so it's worth coding tightly. */
+  register INT32 put_buffer = (INT32) code;
+  register int put_bits = state->cur.put_bits;
+
+  /* if size is 0, caller used an invalid Huffman table entry */
+  if (size == 0)
+    ERREXIT(state->cinfo, JERR_HUFF_MISSING_CODE);
+
+  put_buffer &= (((INT32) 1)<<size) - 1; /* mask off any extra bits in code */
+
+  put_bits += size;		/* new number of bits in buffer */
+
+  put_buffer <<= 24 - put_bits; /* align incoming bits */
+
+  put_buffer |= state->cur.put_buffer; /* and merge with old buffer contents */
+
+  while (put_bits >= 8) {
+    int c = (int) ((put_buffer >> 16) & 0xFF);
+
+    emit_byte(state, c, return FALSE);
+    if (c == 0xFF) {		/* need to stuff a zero byte? */
+      emit_byte(state, 0, return FALSE);
+    }
+    put_buffer <<= 8;
+    put_bits -= 8;
+  }
+
+  state->cur.put_buffer = put_buffer; /* update state variables */
+  state->cur.put_bits = put_bits;
+
+  return TRUE;
+}
+
+
+LOCAL(boolean)
+flush_bits (working_state * state)
+{
+  if (! emit_bits(state, 0x7F, 7)) /* fill any partial byte with ones */
+    return FALSE;
+  state->cur.put_buffer = 0;	/* and reset bit-buffer to empty */
+  state->cur.put_bits = 0;
+  return TRUE;
+}
+
+
+/*
+ * Emit a restart marker & resynchronize predictions.
+ */
+
+LOCAL(boolean)
+emit_restart (working_state * state, int restart_num)
+{
+//  int ci;
+
+  if (! flush_bits(state))
+    return FALSE;
+
+  emit_byte(state, 0xFF, return FALSE);
+  emit_byte(state, JPEG_RST0 + restart_num, return FALSE);
+
+  /* The restart counter is not updated until we successfully write the MCU. */
+
+  return TRUE;
+}
+
+
+/*
+ * Encode and output one nMCU's worth of Huffman-compressed differences.
+ */
+
+METHODDEF(JDIMENSION)
+encode_mcus_huff (j_compress_ptr cinfo, JDIFFIMAGE diff_buf,
+		  JDIMENSION MCU_row_num, JDIMENSION MCU_col_num,
+		  JDIMENSION nMCU)
+{
+  j_lossless_c_ptr losslsc = (j_lossless_c_ptr) cinfo->codec;
+  lhuff_entropy_ptr entropy = (lhuff_entropy_ptr) losslsc->entropy_private;
+  working_state state;
+  int mcu_num, sampn, ci, yoffset, MCU_width, ptrn;
+//  jpeg_component_info * compptr;
+
+  /* Load up working state */
+  state.next_output_byte = cinfo->dest->next_output_byte;
+  state.free_in_buffer = cinfo->dest->free_in_buffer;
+  ASSIGN_STATE(state.cur, entropy->saved);
+  state.cinfo = cinfo;
+
+  /* Emit restart marker if needed */
+  if (cinfo->restart_interval) {
+    if (entropy->restarts_to_go == 0)
+      if (! emit_restart(&state, entropy->next_restart_num))
+	return 0;
+  }
+
+  /* Set input pointer locations based on MCU_col_num */
+  for (ptrn = 0; ptrn < entropy->num_input_ptrs; ptrn++) {
+    ci = entropy->input_ptr_info[ptrn].ci;
+    yoffset = entropy->input_ptr_info[ptrn].yoffset;
+    MCU_width = entropy->input_ptr_info[ptrn].MCU_width;
+    entropy->input_ptr[ptrn] =
+      diff_buf[ci][MCU_row_num + yoffset] + (MCU_col_num * MCU_width);
+  }
+
+  for (mcu_num = 0; (unsigned)mcu_num < nMCU; mcu_num++) {
+
+    /* Inner loop handles the samples in the MCU */
+    for (sampn = 0; sampn < cinfo->data_units_in_MCU; sampn++) {
+      register int temp, temp2; //, temp3;
+      register int nbits;
+      c_derived_tbl *dctbl = entropy->cur_tbls[sampn];
+
+      /* Encode the difference per section H.1.2.2 */
+
+      /* Input the sample difference */
+      temp = *entropy->input_ptr[entropy->input_ptr_index[sampn]]++;
+
+      if (temp & 0x8000) {	/* instead of temp < 0 */
+	temp = (-temp) & 0x7FFF; /* absolute value, mod 2^16 */
+	if (temp == 0)		/* special case: magnitude = 32768 */
+	  temp2 = temp = 0x8000;
+	temp2 = ~ temp;		/* one's complement of magnitude */
+      } else {
+	temp &= 0x7FFF;		/* abs value mod 2^16 */
+	temp2 = temp;		/* magnitude */
+      }
+
+      /* Find the number of bits needed for the magnitude of the difference */
+      nbits = 0;
+      while (temp) {
+	nbits++;
+	temp >>= 1;
+      }
+      /* Check for out-of-range difference values.
+       */
+      if (nbits > MAX_DIFF_BITS)
+	ERREXIT(cinfo, JERR_BAD_DIFF);
+
+      /* Emit the Huffman-coded symbol for the number of bits */
+      if (! emit_bits(&state, dctbl->ehufco[nbits], dctbl->ehufsi[nbits]))
+	return mcu_num;
+
+      /* Emit that number of bits of the value, if positive, */
+      /* or the complement of its magnitude, if negative. */
+      if (nbits &&		/* emit_bits rejects calls with size 0 */
+	  nbits != 16)		/* special case: no bits should be emitted */
+	if (! emit_bits(&state, (unsigned int) temp2, nbits))
+	  return mcu_num;
+    }
+
+    /* Completed MCU, so update state */
+    cinfo->dest->next_output_byte = state.next_output_byte;
+    cinfo->dest->free_in_buffer = state.free_in_buffer;
+    ASSIGN_STATE(entropy->saved, state.cur);
+
+    /* Update restart-interval state too */
+    if (cinfo->restart_interval) {
+      if (entropy->restarts_to_go == 0) {
+	entropy->restarts_to_go = cinfo->restart_interval;
+	entropy->next_restart_num++;
+	entropy->next_restart_num &= 7;
+      }
+      entropy->restarts_to_go--;
+    }
+
+  }
+
+  return nMCU;
+}
+
+
+/*
+ * Finish up at the end of a Huffman-compressed scan.
+ */
+
+METHODDEF(void)
+finish_pass_huff (j_compress_ptr cinfo)
+{
+  j_lossless_c_ptr losslsc = (j_lossless_c_ptr) cinfo->codec;
+  lhuff_entropy_ptr entropy = (lhuff_entropy_ptr) losslsc->entropy_private;
+  working_state state;
+
+  /* Load up working state ... flush_bits needs it */
+  state.next_output_byte = cinfo->dest->next_output_byte;
+  state.free_in_buffer = cinfo->dest->free_in_buffer;
+  ASSIGN_STATE(state.cur, entropy->saved);
+  state.cinfo = cinfo;
+
+  /* Flush out the last data */
+  if (! flush_bits(&state))
+    ERREXIT(cinfo, JERR_CANT_SUSPEND);
+
+  /* Update state */
+  cinfo->dest->next_output_byte = state.next_output_byte;
+  cinfo->dest->free_in_buffer = state.free_in_buffer;
+  ASSIGN_STATE(entropy->saved, state.cur);
+}
+
+
+/*
+ * Huffman coding optimization.
+ *
+ * We first scan the supplied data and count the number of uses of each symbol
+ * that is to be Huffman-coded. (This process MUST agree with the code above.)
+ * Then we build a Huffman coding tree for the observed counts.
+ * Symbols which are not needed at all for the particular image are not
+ * assigned any code, which saves space in the DHT marker as well as in
+ * the compressed data.
+ */
+
+#ifdef ENTROPY_OPT_SUPPORTED
+
+/*
+ * Trial-encode one nMCU's worth of Huffman-compressed differences.
+ * No data is actually output, so no suspension return is possible.
+ */
+
+METHODDEF(JDIMENSION)
+encode_mcus_gather (j_compress_ptr cinfo, JDIFFIMAGE diff_buf,
+		    JDIMENSION MCU_row_num, JDIMENSION MCU_col_num,
+		    JDIMENSION nMCU)
+{
+  j_lossless_c_ptr losslsc = (j_lossless_c_ptr) cinfo->codec;
+  lhuff_entropy_ptr entropy = (lhuff_entropy_ptr) losslsc->entropy_private;
+  int mcu_num, sampn, ci, yoffset, MCU_width, ptrn;
+//  jpeg_component_info * compptr;
+
+  /* Take care of restart intervals if needed */
+  if (cinfo->restart_interval) {
+    if (entropy->restarts_to_go == 0) {
+      /* Update restart state */
+      entropy->restarts_to_go = cinfo->restart_interval;
+    }
+    entropy->restarts_to_go--;
+  }
+
+  /* Set input pointer locations based on MCU_col_num */
+  for (ptrn = 0; ptrn < entropy->num_input_ptrs; ptrn++) {
+    ci = entropy->input_ptr_info[ptrn].ci;
+    yoffset = entropy->input_ptr_info[ptrn].yoffset;
+    MCU_width = entropy->input_ptr_info[ptrn].MCU_width;
+    entropy->input_ptr[ptrn] =
+      diff_buf[ci][MCU_row_num + yoffset] + (MCU_col_num * MCU_width);
+  }
+
+  for (mcu_num = 0; (unsigned)mcu_num < nMCU; mcu_num++) {
+
+    /* Inner loop handles the samples in the MCU */
+    for (sampn = 0; sampn < cinfo->data_units_in_MCU; sampn++) {
+      register int temp;
+      register int nbits;
+      c_derived_tbl *dctbl = entropy->cur_tbls[sampn];
+      long * counts = entropy->cur_counts[sampn];
+
+      /* Encode the difference per section H.1.2.2 */
+
+      /* Input the sample difference */
+      temp = *entropy->input_ptr[entropy->input_ptr_index[sampn]]++;
+
+      if (temp & 0x8000) {	/* instead of temp < 0 */
+	temp = (-temp) & 0x7FFF; /* absolute value, mod 2^16 */
+	if (temp == 0)		/* special case: magnitude = 32768 */
+	  temp = 0x8000;
+      } else
+	temp &= 0x7FFF;		/* abs value mod 2^16 */
+
+      /* Find the number of bits needed for the magnitude of the difference */
+      nbits = 0;
+      while (temp) {
+	nbits++;
+	temp >>= 1;
+      }
+      /* Check for out-of-range difference values.
+       */
+      if (nbits > MAX_DIFF_BITS)
+	ERREXIT(cinfo, JERR_BAD_DIFF);
+
+      /* Count the Huffman symbol for the number of bits */
+      counts[nbits]++;
+    }
+  }
+
+  return nMCU;
+}
+
+
+/*
+ * Finish up a statistics-gathering pass and create the new Huffman tables.
+ */
+
+METHODDEF(void)
+finish_pass_gather (j_compress_ptr cinfo)
+{
+  j_lossless_c_ptr losslsc = (j_lossless_c_ptr) cinfo->codec;
+  lhuff_entropy_ptr entropy = (lhuff_entropy_ptr) losslsc->entropy_private;
+  int ci, dctbl;
+  jpeg_component_info * compptr;
+  JHUFF_TBL **htblptr;
+  boolean did_dc[NUM_HUFF_TBLS];
+
+  /* It's important not to apply jpeg_gen_optimal_table more than once
+   * per table, because it clobbers the input frequency counts!
+   */
+  MEMZERO(did_dc, SIZEOF(did_dc));
+
+  for (ci = 0; ci < cinfo->comps_in_scan; ci++) {
+    compptr = cinfo->cur_comp_info[ci];
+    dctbl = compptr->dc_tbl_no;
+    if (! did_dc[dctbl]) {
+      htblptr = & cinfo->dc_huff_tbl_ptrs[dctbl];
+      if (*htblptr == NULL)
+	*htblptr = jpeg_alloc_huff_table((j_common_ptr) cinfo);
+      jpeg_gen_optimal_table(cinfo, *htblptr, entropy->count_ptrs[dctbl]);
+      did_dc[dctbl] = TRUE;
+    }
+  }
+}
+
+
+#endif /* ENTROPY_OPT_SUPPORTED */
+
+
+METHODDEF(boolean)
+need_optimization_pass (j_compress_ptr cinfo)
+{
+  return TRUE;
+}
+
+
+/*
+ * Module initialization routine for Huffman entropy encoding.
+ */
+
+GLOBAL(void)
+jinit_lhuff_encoder (j_compress_ptr cinfo)
+{
+  j_lossless_c_ptr losslsc = (j_lossless_c_ptr) cinfo->codec;
+  lhuff_entropy_ptr entropy;
+  int i;
+
+  entropy = (lhuff_entropy_ptr)
+    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+				SIZEOF(lhuff_entropy_encoder));
+  losslsc->entropy_private = (struct jpeg_entropy_encoder *) entropy;
+  losslsc->pub.entropy_start_pass = start_pass_huff;
+  losslsc->pub.need_optimization_pass = need_optimization_pass;
+
+  /* Mark tables unallocated */
+  for (i = 0; i < NUM_HUFF_TBLS; i++) {
+    entropy->derived_tbls[i] = NULL;
+#ifdef ENTROPY_OPT_SUPPORTED
+    entropy->count_ptrs[i] = NULL;
+#endif
+  }
+}
diff --git a/uppsrc/plugin/jpg/lib/jclossls.c b/uppsrc/plugin/jpg/lib/jclossls.c
new file mode 100644
index 000000000..af736e0af
--- /dev/null
+++ b/uppsrc/plugin/jpg/lib/jclossls.c
@@ -0,0 +1,78 @@
+/*
+ * jclossls.c
+ *
+ * Copyright (C) 1998, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains the control logic for the lossless JPEG compressor.
+ */
+
+#define JPEG_INTERNALS
+#include "jinclude.h"
+#include "jpeglib.h"
+#include "jlossls.h"
+
+
+#ifdef C_LOSSLESS_SUPPORTED
+
+/*
+ * Initialize for a processing pass.
+ */
+
+METHODDEF(void)
+start_pass (j_compress_ptr cinfo, J_BUF_MODE pass_mode)
+{
+  j_lossless_c_ptr losslsc = (j_lossless_c_ptr) cinfo->codec;
+
+  (*losslsc->scaler_start_pass) (cinfo);
+  (*losslsc->predict_start_pass) (cinfo);
+  (*losslsc->diff_start_pass) (cinfo, pass_mode);
+}
+
+
+/*
+ * Initialize the lossless compression codec.
+ * This is called only once, during master selection.
+ */
+
+GLOBAL(void)
+jinit_lossless_c_codec(j_compress_ptr cinfo)
+{
+  j_lossless_c_ptr losslsc;
+
+  /* Create subobject in permanent pool */
+  losslsc = (j_lossless_c_ptr)
+    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT,
+				SIZEOF(jpeg_lossless_c_codec));
+  cinfo->codec = (struct jpeg_c_codec *) losslsc;
+
+  /* Initialize sub-modules */
+
+  /* Scaler */
+  jinit_c_scaler(cinfo);
+
+  /* Differencer */
+  jinit_differencer(cinfo);
+
+  /* Entropy encoding: either Huffman or arithmetic coding. */
+  if (cinfo->arith_code) {
+    ERREXIT(cinfo, JERR_ARITH_NOTIMPL);
+  } else {
+    jinit_lhuff_encoder(cinfo);
+  }
+
+  /* Need a full-image difference buffer in any multi-pass mode. */
+  jinit_c_diff_controller(cinfo,
+			  (boolean) (cinfo->num_scans > 1 ||
+				     cinfo->optimize_coding));
+
+  /* Initialize method pointers.
+   *
+   * Note: entropy_start_pass and entropy_finish_pass are assigned in
+   * jclhuff.c and compress_data is assigned in jcdiffct.c.
+   */
+  losslsc->pub.start_pass = start_pass;
+}
+
+#endif /* C_LOSSLESS_SUPPORTED */
diff --git a/uppsrc/plugin/jpg/lib/jclossy.c b/uppsrc/plugin/jpg/lib/jclossy.c
new file mode 100644
index 000000000..173494dda
--- /dev/null
+++ b/uppsrc/plugin/jpg/lib/jclossy.c
@@ -0,0 +1,76 @@
+/*
+ * jclossy.c
+ *
+ * Copyright (C) 1998, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains the control logic for the lossy JPEG compressor.
+ */
+
+#define JPEG_INTERNALS
+#include "jinclude.h"
+#include "jpeglib.h"
+#include "jlossy.h"
+
+
+/*
+ * Initialize for a processing pass.
+ */
+
+METHODDEF(void)
+start_pass (j_compress_ptr cinfo, J_BUF_MODE pass_mode)
+{
+  j_lossy_c_ptr lossyc = (j_lossy_c_ptr) cinfo->codec;
+
+  (*lossyc->fdct_start_pass) (cinfo);
+  (*lossyc->coef_start_pass) (cinfo, pass_mode);
+}
+
+
+/*
+ * Initialize the lossy compression codec.
+ * This is called only once, during master selection.
+ */
+
+GLOBAL(void)
+jinit_lossy_c_codec (j_compress_ptr cinfo)
+{
+  j_lossy_c_ptr lossyc;
+
+  /* Create subobject in permanent pool */
+  lossyc = (j_lossy_c_ptr)
+    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT,
+				SIZEOF(jpeg_lossy_c_codec));
+  cinfo->codec = (struct jpeg_c_codec *) lossyc;
+
+  /* Initialize sub-modules */
+
+  /* Forward DCT */
+  jinit_forward_dct(cinfo);
+  /* Entropy encoding: either Huffman or arithmetic coding. */
+  if (cinfo->arith_code) {
+    ERREXIT(cinfo, JERR_ARITH_NOTIMPL);
+  } else {
+    if (cinfo->process == JPROC_PROGRESSIVE) {
+#ifdef C_PROGRESSIVE_SUPPORTED
+      jinit_phuff_encoder(cinfo);
+#else
+      ERREXIT(cinfo, JERR_NOT_COMPILED);
+#endif
+    } else
+      jinit_shuff_encoder(cinfo);
+  }
+
+  /* Need a full-image coefficient buffer in any multi-pass mode. */
+  jinit_c_coef_controller(cinfo,
+			  (boolean) (cinfo->num_scans > 1 ||
+				     cinfo->optimize_coding));
+
+  /* Initialize method pointers.
+   *
+   * Note: entropy_start_pass and entropy_finish_pass are assigned in
+   * jcshuff.c or jcphuff.c and compress_data is assigned in jccoefct.c.
+   */
+  lossyc->pub.start_pass = start_pass;
+}
diff --git a/uppsrc/plugin/jpg/lib/jcmainct.c b/uppsrc/plugin/jpg/lib/jcmainct.c
new file mode 100644
index 000000000..edf1c425b
--- /dev/null
+++ b/uppsrc/plugin/jpg/lib/jcmainct.c
@@ -0,0 +1,296 @@
+/*
+ * jcmainct.c
+ *
+ * Copyright (C) 1994-1998, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains the main buffer controller for compression.
+ * The main buffer lies between the pre-processor and the JPEG
+ * compressor proper; it holds downsampled data in the JPEG colorspace.
+ */
+
+#define JPEG_INTERNALS
+#include "jinclude.h"
+#include "jpeglib.h"
+
+
+/* Note: currently, there is no operating mode in which a full-image buffer
+ * is needed at this step.  If there were, that mode could not be used with
+ * "raw data" input, since this module is bypassed in that case.  However,
+ * we've left the code here for possible use in special applications.
+ */
+#undef FULL_MAIN_BUFFER_SUPPORTED
+
+
+/* Private buffer controller object */
+
+typedef struct {
+  struct jpeg_c_main_controller pub; /* public fields */
+
+  JDIMENSION cur_iMCU_row;	/* number of current iMCU row */
+  JDIMENSION rowgroup_ctr;	/* counts row groups received in iMCU row */
+  boolean suspended;		/* remember if we suspended output */
+  J_BUF_MODE pass_mode;		/* current operating mode */
+
+  /* If using just a strip buffer, this points to the entire set of buffers
+   * (we allocate one for each component).  In the full-image case, this
+   * points to the currently accessible strips of the virtual arrays.
+   */
+  JSAMPARRAY buffer[MAX_COMPONENTS];
+
+#ifdef FULL_MAIN_BUFFER_SUPPORTED
+  /* If using full-image storage, this array holds pointers to virtual-array
+   * control blocks for each component.  Unused if not full-image storage.
+   */
+  jvirt_sarray_ptr whole_image[MAX_COMPONENTS];
+#endif
+} my_main_controller;
+
+typedef my_main_controller * my_main_ptr;
+
+
+/* Forward declarations */
+METHODDEF(void) process_data_simple_main
+	JPP((j_compress_ptr cinfo, JSAMPARRAY input_buf,
+	     JDIMENSION *in_row_ctr, JDIMENSION in_rows_avail));
+#ifdef FULL_MAIN_BUFFER_SUPPORTED
+METHODDEF(void) process_data_buffer_main
+	JPP((j_compress_ptr cinfo, JSAMPARRAY input_buf,
+	     JDIMENSION *in_row_ctr, JDIMENSION in_rows_avail));
+#endif
+
+
+/*
+ * Initialize for a processing pass.
+ */
+
+METHODDEF(void)
+start_pass_main (j_compress_ptr cinfo, J_BUF_MODE pass_mode)
+{
+  my_main_ptr main = (my_main_ptr) cinfo->main;
+
+  /* Do nothing in raw-data mode. */
+  if (cinfo->raw_data_in)
+    return;
+
+  main->cur_iMCU_row = 0;	/* initialize counters */
+  main->rowgroup_ctr = 0;
+  main->suspended = FALSE;
+  main->pass_mode = pass_mode;	/* save mode for use by process_data */
+
+  switch (pass_mode) {
+  case JBUF_PASS_THRU:
+#ifdef FULL_MAIN_BUFFER_SUPPORTED
+    if (main->whole_image[0] != NULL)
+      ERREXIT(cinfo, JERR_BAD_BUFFER_MODE);
+#endif
+    main->pub.process_data = process_data_simple_main;
+    break;
+#ifdef FULL_MAIN_BUFFER_SUPPORTED
+  case JBUF_SAVE_SOURCE:
+  case JBUF_CRANK_DEST:
+  case JBUF_SAVE_AND_PASS:
+    if (main->whole_image[0] == NULL)
+      ERREXIT(cinfo, JERR_BAD_BUFFER_MODE);
+    main->pub.process_data = process_data_buffer_main;
+    break;
+#endif
+  default:
+    ERREXIT(cinfo, JERR_BAD_BUFFER_MODE);
+    break;
+  }
+}
+
+
+/*
+ * Process some data.
+ * This routine handles the simple pass-through mode,
+ * where we have only a strip buffer.
+ */
+
+METHODDEF(void)
+process_data_simple_main (j_compress_ptr cinfo,
+			  JSAMPARRAY input_buf, JDIMENSION *in_row_ctr,
+			  JDIMENSION in_rows_avail)
+{
+  my_main_ptr main = (my_main_ptr) cinfo->main;
+  unsigned data_unit = cinfo->data_unit;
+
+  while (main->cur_iMCU_row < cinfo->total_iMCU_rows) {
+    /* Read input data if we haven't filled the main buffer yet */
+    if (main->rowgroup_ctr < data_unit)
+      (*cinfo->prep->pre_process_data) (cinfo,
+					input_buf, in_row_ctr, in_rows_avail,
+					main->buffer, &main->rowgroup_ctr,
+					(JDIMENSION) data_unit);
+
+    /* If we don't have a full iMCU row buffered, return to application for
+     * more data.  Note that preprocessor will always pad to fill the iMCU row
+     * at the bottom of the image.
+     */
+    if (main->rowgroup_ctr != data_unit)
+      return;
+
+    /* Send the completed row to the compressor */
+    if (! (*cinfo->codec->compress_data) (cinfo, main->buffer)) {
+      /* If compressor did not consume the whole row, then we must need to
+       * suspend processing and return to the application.  In this situation
+       * we pretend we didn't yet consume the last input row; otherwise, if
+       * it happened to be the last row of the image, the application would
+       * think we were done.
+       */
+      if (! main->suspended) {
+	(*in_row_ctr)--;
+	main->suspended = TRUE;
+      }
+      return;
+    }
+    /* We did finish the row.  Undo our little suspension hack if a previous
+     * call suspended; then mark the main buffer empty.
+     */
+    if (main->suspended) {
+      (*in_row_ctr)++;
+      main->suspended = FALSE;
+    }
+    main->rowgroup_ctr = 0;
+    main->cur_iMCU_row++;
+  }
+}
+
+
+#ifdef FULL_MAIN_BUFFER_SUPPORTED
+
+/*
+ * Process some data.
+ * This routine handles all of the modes that use a full-size buffer.
+ */
+
+METHODDEF(void)
+process_data_buffer_main (j_compress_ptr cinfo,
+			  JSAMPARRAY input_buf, JDIMENSION *in_row_ctr,
+			  JDIMENSION in_rows_avail)
+{
+  my_main_ptr main = (my_main_ptr) cinfo->main;
+  int ci;
+  jpeg_component_info *compptr;
+  boolean writing = (main->pass_mode != JBUF_CRANK_DEST);
+  int data_unit = cinfo->data_unit;
+
+  while (main->cur_iMCU_row < cinfo->total_iMCU_rows) {
+    /* Realign the virtual buffers if at the start of an iMCU row. */
+    if (main->rowgroup_ctr == 0) {
+      for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
+	   ci++, compptr++) {
+	main->buffer[ci] = (*cinfo->mem->access_virt_sarray)
+	  ((j_common_ptr) cinfo, main->whole_image[ci],
+	   main->cur_iMCU_row * (compptr->v_samp_factor * data_unit),
+	   (JDIMENSION) (compptr->v_samp_factor * data_unit), writing);
+      }
+      /* In a read pass, pretend we just read some source data. */
+      if (! writing) {
+	*in_row_ctr += cinfo->max_v_samp_factor * data_unit;
+	main->rowgroup_ctr = data_unit;
+      }
+    }
+
+    /* If a write pass, read input data until the current iMCU row is full. */
+    /* Note: preprocessor will pad if necessary to fill the last iMCU row. */
+    if (writing) {
+      (*cinfo->prep->pre_process_data) (cinfo,
+					input_buf, in_row_ctr, in_rows_avail,
+					main->buffer, &main->rowgroup_ctr,
+					(JDIMENSION) data_unit);
+      /* Return to application if we need more data to fill the iMCU row. */
+      if (main->rowgroup_ctr < data_unit)
+	return;
+    }
+
+    /* Emit data, unless this is a sink-only pass. */
+    if (main->pass_mode != JBUF_SAVE_SOURCE) {
+      if (! (*cinfo->codec->compress_data) (cinfo, main->buffer)) {
+	/* If compressor did not consume the whole row, then we must need to
+	 * suspend processing and return to the application.  In this situation
+	 * we pretend we didn't yet consume the last input row; otherwise, if
+	 * it happened to be the last row of the image, the application would
+	 * think we were done.
+	 */
+	if (! main->suspended) {
+	  (*in_row_ctr)--;
+	  main->suspended = TRUE;
+	}
+	return;
+      }
+      /* We did finish the row.  Undo our little suspension hack if a previous
+       * call suspended; then mark the main buffer empty.
+       */
+      if (main->suspended) {
+	(*in_row_ctr)++;
+	main->suspended = FALSE;
+      }
+    }
+
+    /* If get here, we are done with this iMCU row.  Mark buffer empty. */
+    main->rowgroup_ctr = 0;
+    main->cur_iMCU_row++;
+  }
+}
+
+#endif /* FULL_MAIN_BUFFER_SUPPORTED */
+
+
+/*
+ * Initialize main buffer controller.
+ */
+
+GLOBAL(void)
+jinit_c_main_controller (j_compress_ptr cinfo, boolean need_full_buffer)
+{
+  my_main_ptr main;
+  int ci;
+  jpeg_component_info *compptr;
+  int data_unit = cinfo->data_unit;
+
+  main = (my_main_ptr)
+    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+				SIZEOF(my_main_controller));
+  cinfo->main = (struct jpeg_c_main_controller *) main;
+  main->pub.start_pass = start_pass_main;
+
+  /* We don't need to create a buffer in raw-data mode. */
+  if (cinfo->raw_data_in)
+    return;
+
+  /* Create the buffer.  It holds downsampled data, so each component
+   * may be of a different size.
+   */
+  if (need_full_buffer) {
+#ifdef FULL_MAIN_BUFFER_SUPPORTED
+    /* Allocate a full-image virtual array for each component */
+    /* Note we pad the bottom to a multiple of the iMCU height */
+    for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
+	 ci++, compptr++) {
+      main->whole_image[ci] = (*cinfo->mem->request_virt_sarray)
+	((j_common_ptr) cinfo, JPOOL_IMAGE, FALSE,
+	 compptr->width_in_data_units * data_unit,
+	 (JDIMENSION) jround_up((long) compptr->height_in_data_units,
+				(long) compptr->v_samp_factor) * data_unit,
+	 (JDIMENSION) (compptr->v_samp_factor * data_unit));
+    }
+#else
+    ERREXIT(cinfo, JERR_BAD_BUFFER_MODE);
+#endif
+  } else {
+#ifdef FULL_MAIN_BUFFER_SUPPORTED
+    main->whole_image[0] = NULL; /* flag for no virtual arrays */
+#endif
+    /* Allocate a strip buffer for each component */
+    for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
+	 ci++, compptr++) {
+      main->buffer[ci] = (*cinfo->mem->alloc_sarray)
+	((j_common_ptr) cinfo, JPOOL_IMAGE,
+	 compptr->width_in_data_units * data_unit,
+	 (JDIMENSION) (compptr->v_samp_factor * data_unit));
+    }
+  }
+}
diff --git a/uppsrc/plugin/jpg/lib/jcmarker.c b/uppsrc/plugin/jpg/lib/jcmarker.c
new file mode 100644
index 000000000..1b6ec764a
--- /dev/null
+++ b/uppsrc/plugin/jpg/lib/jcmarker.c
@@ -0,0 +1,671 @@
+/*
+ * jcmarker.c
+ *
+ * Copyright (C) 1991-1998, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains routines to write JPEG datastream markers.
+ */
+
+#define JPEG_INTERNALS
+#include "jinclude.h"
+#include "jpeglib.h"
+
+
+typedef enum {			/* JPEG marker codes */
+  M_SOF0  = 0xc0,
+  M_SOF1  = 0xc1,
+  M_SOF2  = 0xc2,
+  M_SOF3  = 0xc3,
+
+  M_SOF5  = 0xc5,
+  M_SOF6  = 0xc6,
+  M_SOF7  = 0xc7,
+
+  M_JPG   = 0xc8,
+  M_SOF9  = 0xc9,
+  M_SOF10 = 0xca,
+  M_SOF11 = 0xcb,
+
+  M_SOF13 = 0xcd,
+  M_SOF14 = 0xce,
+  M_SOF15 = 0xcf,
+
+  M_DHT   = 0xc4,
+
+  M_DAC   = 0xcc,
+
+  M_RST0  = 0xd0,
+  M_RST1  = 0xd1,
+  M_RST2  = 0xd2,
+  M_RST3  = 0xd3,
+  M_RST4  = 0xd4,
+  M_RST5  = 0xd5,
+  M_RST6  = 0xd6,
+  M_RST7  = 0xd7,
+
+  M_SOI   = 0xd8,
+  M_EOI   = 0xd9,
+  M_SOS   = 0xda,
+  M_DQT   = 0xdb,
+  M_DNL   = 0xdc,
+  M_DRI   = 0xdd,
+  M_DHP   = 0xde,
+  M_EXP   = 0xdf,
+
+  M_APP0  = 0xe0,
+  M_APP1  = 0xe1,
+  M_APP2  = 0xe2,
+  M_APP3  = 0xe3,
+  M_APP4  = 0xe4,
+  M_APP5  = 0xe5,
+  M_APP6  = 0xe6,
+  M_APP7  = 0xe7,
+  M_APP8  = 0xe8,
+  M_APP9  = 0xe9,
+  M_APP10 = 0xea,
+  M_APP11 = 0xeb,
+  M_APP12 = 0xec,
+  M_APP13 = 0xed,
+  M_APP14 = 0xee,
+  M_APP15 = 0xef,
+
+  M_JPG0  = 0xf0,
+  M_JPG13 = 0xfd,
+  M_COM   = 0xfe,
+
+  M_TEM   = 0x01,
+
+  M_ERROR = 0x100
+} JPEG_MARKER;
+
+
+/* Private state */
+
+typedef struct {
+  struct jpeg_marker_writer pub; /* public fields */
+
+  unsigned int last_restart_interval; /* last DRI value emitted; 0 after SOI */
+} my_marker_writer;
+
+typedef my_marker_writer * my_marker_ptr;
+
+
+/*
+ * Basic output routines.
+ *
+ * Note that we do not support suspension while writing a marker.
+ * Therefore, an application using suspension must ensure that there is
+ * enough buffer space for the initial markers (typ. 600-700 bytes) before
+ * calling jpeg_start_compress, and enough space to write the trailing EOI
+ * (a few bytes) before calling jpeg_finish_compress.  Multipass compression
+ * modes are not supported at all with suspension, so those two are the only
+ * points where markers will be written.
+ */
+
+LOCAL(void)
+emit_byte (j_compress_ptr cinfo, int val)
+/* Emit a byte */
+{
+  struct jpeg_destination_mgr * dest = cinfo->dest;
+
+  *(dest->next_output_byte)++ = (JOCTET) val;
+  if (--dest->free_in_buffer == 0) {
+    if (! (*dest->empty_output_buffer) (cinfo))
+      ERREXIT(cinfo, JERR_CANT_SUSPEND);
+  }
+}
+
+
+LOCAL(void)
+emit_marker (j_compress_ptr cinfo, JPEG_MARKER mark)
+/* Emit a marker code */
+{
+  emit_byte(cinfo, 0xFF);
+  emit_byte(cinfo, (int) mark);
+}
+
+
+LOCAL(void)
+emit_2bytes (j_compress_ptr cinfo, int value)
+/* Emit a 2-byte integer; these are always MSB first in JPEG files */
+{
+  emit_byte(cinfo, (value >> 8) & 0xFF);
+  emit_byte(cinfo, value & 0xFF);
+}
+
+
+/*
+ * Routines to write specific marker types.
+ */
+
+LOCAL(int)
+emit_dqt (j_compress_ptr cinfo, int index)
+/* Emit a DQT marker */
+/* Returns the precision used (0 = 8bits, 1 = 16bits) for baseline checking */
+{
+  JQUANT_TBL * qtbl = cinfo->quant_tbl_ptrs[index];
+  int prec;
+  int i;
+
+  if (qtbl == NULL)
+    ERREXIT1(cinfo, JERR_NO_QUANT_TABLE, index);
+
+  prec = 0;
+  for (i = 0; i < DCTSIZE2; i++) {
+    if (qtbl->quantval[i] > 255)
+      prec = 1;
+  }
+
+  if (! qtbl->sent_table) {
+    emit_marker(cinfo, M_DQT);
+
+    emit_2bytes(cinfo, prec ? DCTSIZE2*2 + 1 + 2 : DCTSIZE2 + 1 + 2);
+
+    emit_byte(cinfo, index + (prec<<4));
+
+    for (i = 0; i < DCTSIZE2; i++) {
+      /* The table entries must be emitted in zigzag order. */
+      unsigned int qval = qtbl->quantval[jpeg_natural_order[i]];
+      if (prec)
+	emit_byte(cinfo, (int) (qval >> 8));
+      emit_byte(cinfo, (int) (qval & 0xFF));
+    }
+
+    qtbl->sent_table = TRUE;
+  }
+
+  return prec;
+}
+
+
+LOCAL(void)
+emit_dht (j_compress_ptr cinfo, int index, boolean is_ac)
+/* Emit a DHT marker */
+{
+  JHUFF_TBL * htbl;
+  int length, i;
+
+  if (is_ac) {
+    htbl = cinfo->ac_huff_tbl_ptrs[index];
+    index += 0x10;		/* output index has AC bit set */
+  } else {
+    htbl = cinfo->dc_huff_tbl_ptrs[index];
+  }
+
+  if (htbl == NULL)
+    ERREXIT1(cinfo, JERR_NO_HUFF_TABLE, index);
+
+  if (! htbl->sent_table) {
+    emit_marker(cinfo, M_DHT);
+
+    length = 0;
+    for (i = 1; i <= 16; i++)
+      length += htbl->bits[i];
+
+    emit_2bytes(cinfo, length + 2 + 1 + 16);
+    emit_byte(cinfo, index);
+
+    for (i = 1; i <= 16; i++)
+      emit_byte(cinfo, htbl->bits[i]);
+
+    for (i = 0; i < length; i++)
+      emit_byte(cinfo, htbl->huffval[i]);
+
+    htbl->sent_table = TRUE;
+  }
+}
+
+
+LOCAL(void)
+emit_dac (j_compress_ptr cinfo)
+/* Emit a DAC marker */
+/* Since the useful info is so small, we want to emit all the tables in */
+/* one DAC marker.  Therefore this routine does its own scan of the table. */
+{
+#ifdef C_ARITH_CODING_SUPPORTED
+  char dc_in_use[NUM_ARITH_TBLS];
+  char ac_in_use[NUM_ARITH_TBLS];
+  int length, i;
+  jpeg_component_info *compptr;
+
+  for (i = 0; i < NUM_ARITH_TBLS; i++)
+    dc_in_use[i] = ac_in_use[i] = 0;
+
+  for (i = 0; i < cinfo->comps_in_scan; i++) {
+    compptr = cinfo->cur_comp_info[i];
+    dc_in_use[compptr->dc_tbl_no] = 1;
+    ac_in_use[compptr->ac_tbl_no] = 1;
+  }
+
+  length = 0;
+  for (i = 0; i < NUM_ARITH_TBLS; i++)
+    length += dc_in_use[i] + ac_in_use[i];
+
+  emit_marker(cinfo, M_DAC);
+
+  emit_2bytes(cinfo, length*2 + 2);
+
+  for (i = 0; i < NUM_ARITH_TBLS; i++) {
+    if (dc_in_use[i]) {
+      emit_byte(cinfo, i);
+      emit_byte(cinfo, cinfo->arith_dc_L[i] + (cinfo->arith_dc_U[i]<<4));
+    }
+    if (ac_in_use[i]) {
+      emit_byte(cinfo, i + 0x10);
+      emit_byte(cinfo, cinfo->arith_ac_K[i]);
+    }
+  }
+#endif /* C_ARITH_CODING_SUPPORTED */
+}
+
+
+LOCAL(void)
+emit_dri (j_compress_ptr cinfo)
+/* Emit a DRI marker */
+{
+  emit_marker(cinfo, M_DRI);
+
+  emit_2bytes(cinfo, 4);	/* fixed length */
+
+  emit_2bytes(cinfo, (int) cinfo->restart_interval);
+}
+
+
+LOCAL(void)
+emit_sof (j_compress_ptr cinfo, JPEG_MARKER code)
+/* Emit a SOF marker */
+{
+  int ci;
+  jpeg_component_info *compptr;
+
+  emit_marker(cinfo, code);
+
+  emit_2bytes(cinfo, 3 * cinfo->num_components + 2 + 5 + 1); /* length */
+
+  /* Make sure image isn't bigger than SOF field can handle */
+  if ((long) cinfo->image_height > 65535L ||
+      (long) cinfo->image_width > 65535L)
+    ERREXIT1(cinfo, JERR_IMAGE_TOO_BIG, (unsigned int) 65535);
+
+  emit_byte(cinfo, cinfo->data_precision);
+  emit_2bytes(cinfo, (int) cinfo->image_height);
+  emit_2bytes(cinfo, (int) cinfo->image_width);
+
+  emit_byte(cinfo, cinfo->num_components);
+
+  for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
+       ci++, compptr++) {
+    emit_byte(cinfo, compptr->component_id);
+    emit_byte(cinfo, (compptr->h_samp_factor << 4) + compptr->v_samp_factor);
+    emit_byte(cinfo, compptr->quant_tbl_no);
+  }
+}
+
+
+LOCAL(void)
+emit_sos (j_compress_ptr cinfo)
+/* Emit a SOS marker */
+{
+  int i, td, ta;
+  jpeg_component_info *compptr;
+
+  emit_marker(cinfo, M_SOS);
+
+  emit_2bytes(cinfo, 2 * cinfo->comps_in_scan + 2 + 1 + 3); /* length */
+
+  emit_byte(cinfo, cinfo->comps_in_scan);
+
+  for (i = 0; i < cinfo->comps_in_scan; i++) {
+    compptr = cinfo->cur_comp_info[i];
+    emit_byte(cinfo, compptr->component_id);
+    td = compptr->dc_tbl_no;
+    ta = compptr->ac_tbl_no;
+    if (cinfo->process == JPROC_PROGRESSIVE) {
+      /* Progressive mode: only DC or only AC tables are used in one scan;
+       * furthermore, Huffman coding of DC refinement uses no table at all.
+       * We emit 0 for unused field(s); this is recommended by the P&M text
+       * but does not seem to be specified in the standard.
+       */
+      if (cinfo->Ss == 0) {
+	ta = 0;			/* DC scan */
+	if (cinfo->Ah != 0 && !cinfo->arith_code)
+	  td = 0;		/* no DC table either */
+      } else {
+	td = 0;			/* AC scan */
+      }
+    }
+    emit_byte(cinfo, (td << 4) + ta);
+  }
+
+  emit_byte(cinfo, cinfo->Ss);
+  emit_byte(cinfo, cinfo->Se);
+  emit_byte(cinfo, (cinfo->Ah << 4) + cinfo->Al);
+}
+
+
+LOCAL(void)
+emit_jfif_app0 (j_compress_ptr cinfo)
+/* Emit a JFIF-compliant APP0 marker */
+{
+  /*
+   * Length of APP0 block	(2 bytes)
+   * Block ID			(4 bytes - ASCII "JFIF")
+   * Zero byte			(1 byte to terminate the ID string)
+   * Version Major, Minor	(2 bytes - major first)
+   * Units			(1 byte - 0x00 = none, 0x01 = inch, 0x02 = cm)
+   * Xdpu			(2 bytes - dots per unit horizontal)
+   * Ydpu			(2 bytes - dots per unit vertical)
+   * Thumbnail X size		(1 byte)
+   * Thumbnail Y size		(1 byte)
+   */
+
+  emit_marker(cinfo, M_APP0);
+
+  emit_2bytes(cinfo, 2 + 4 + 1 + 2 + 1 + 2 + 2 + 1 + 1); /* length */
+
+  emit_byte(cinfo, 0x4A);	/* Identifier: ASCII "JFIF" */
+  emit_byte(cinfo, 0x46);
+  emit_byte(cinfo, 0x49);
+  emit_byte(cinfo, 0x46);
+  emit_byte(cinfo, 0);
+  emit_byte(cinfo, cinfo->JFIF_major_version); /* Version fields */
+  emit_byte(cinfo, cinfo->JFIF_minor_version);
+  emit_byte(cinfo, cinfo->density_unit); /* Pixel size information */
+  emit_2bytes(cinfo, (int) cinfo->X_density);
+  emit_2bytes(cinfo, (int) cinfo->Y_density);
+  emit_byte(cinfo, 0);		/* No thumbnail image */
+  emit_byte(cinfo, 0);
+}
+
+
+LOCAL(void)
+emit_adobe_app14 (j_compress_ptr cinfo)
+/* Emit an Adobe APP14 marker */
+{
+  /*
+   * Length of APP14 block	(2 bytes)
+   * Block ID			(5 bytes - ASCII "Adobe")
+   * Version Number		(2 bytes - currently 100)
+   * Flags0			(2 bytes - currently 0)
+   * Flags1			(2 bytes - currently 0)
+   * Color transform		(1 byte)
+   *
+   * Although Adobe TN 5116 mentions Version = 101, all the Adobe files
+   * now in circulation seem to use Version = 100, so that's what we write.
+   *
+   * We write the color transform byte as 1 if the JPEG color space is
+   * YCbCr, 2 if it's YCCK, 0 otherwise.  Adobe's definition has to do with
+   * whether the encoder performed a transformation, which is pretty useless.
+   */
+
+  emit_marker(cinfo, M_APP14);
+
+  emit_2bytes(cinfo, 2 + 5 + 2 + 2 + 2 + 1); /* length */
+
+  emit_byte(cinfo, 0x41);	/* Identifier: ASCII "Adobe" */
+  emit_byte(cinfo, 0x64);
+  emit_byte(cinfo, 0x6F);
+  emit_byte(cinfo, 0x62);
+  emit_byte(cinfo, 0x65);
+  emit_2bytes(cinfo, 100);	/* Version */
+  emit_2bytes(cinfo, 0);	/* Flags0 */
+  emit_2bytes(cinfo, 0);	/* Flags1 */
+  switch (cinfo->jpeg_color_space) {
+  case JCS_YCbCr:
+    emit_byte(cinfo, 1);	/* Color transform = 1 */
+    break;
+  case JCS_YCCK:
+    emit_byte(cinfo, 2);	/* Color transform = 2 */
+    break;
+  default:
+    emit_byte(cinfo, 0);	/* Color transform = 0 */
+    break;
+  }
+}
+
+
+/*
+ * These routines allow writing an arbitrary marker with parameters.
+ * The only intended use is to emit COM or APPn markers after calling
+ * write_file_header and before calling write_frame_header.
+ * Other uses are not guaranteed to produce desirable results.
+ * Counting the parameter bytes properly is the caller's responsibility.
+ */
+
+METHODDEF(void)
+write_marker_header (j_compress_ptr cinfo, int marker, unsigned int datalen)
+/* Emit an arbitrary marker header */
+{
+  if (datalen > (unsigned int) 65533)		/* safety check */
+    ERREXIT(cinfo, JERR_BAD_LENGTH);
+
+  emit_marker(cinfo, (JPEG_MARKER) marker);
+
+  emit_2bytes(cinfo, (int) (datalen + 2));	/* total length */
+}
+
+METHODDEF(void)
+write_marker_byte (j_compress_ptr cinfo, int val)
+/* Emit one byte of marker parameters following write_marker_header */
+{
+  emit_byte(cinfo, val);
+}
+
+
+/*
+ * Write datastream header.
+ * This consists of an SOI and optional APPn markers.
+ * We recommend use of the JFIF marker, but not the Adobe marker,
+ * when using YCbCr or grayscale data.  The JFIF marker should NOT
+ * be used for any other JPEG colorspace.  The Adobe marker is helpful
+ * to distinguish RGB, CMYK, and YCCK colorspaces.
+ * Note that an application can write additional header markers after
+ * jpeg_start_compress returns.
+ */
+
+METHODDEF(void)
+write_file_header (j_compress_ptr cinfo)
+{
+  my_marker_ptr marker = (my_marker_ptr) cinfo->marker;
+
+  emit_marker(cinfo, M_SOI);	/* first the SOI */
+
+  /* SOI is defined to reset restart interval to 0 */
+  marker->last_restart_interval = 0;
+
+  if (cinfo->write_JFIF_header)	/* next an optional JFIF APP0 */
+    emit_jfif_app0(cinfo);
+  if (cinfo->write_Adobe_marker) /* next an optional Adobe APP14 */
+    emit_adobe_app14(cinfo);
+}
+
+
+/*
+ * Write frame header.
+ * This consists of DQT and SOFn markers.
+ * Note that we do not emit the SOF until we have emitted the DQT(s).
+ * This avoids compatibility problems with incorrect implementations that
+ * try to error-check the quant table numbers as soon as they see the SOF.
+ */
+
+METHODDEF(void)
+write_frame_header (j_compress_ptr cinfo)
+{
+  int ci, prec;
+  boolean is_baseline;
+  jpeg_component_info *compptr;
+
+  if (cinfo->process != JPROC_LOSSLESS) {
+    /* Emit DQT for each quantization table.
+     * Note that emit_dqt() suppresses any duplicate tables.
+     */
+    prec = 0;
+    for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
+	 ci++, compptr++) {
+      prec += emit_dqt(cinfo, compptr->quant_tbl_no);
+    }
+    /* now prec is nonzero iff there are any 16-bit quant tables. */
+  }
+
+  /* Check for a non-baseline specification.
+   * Note we assume that Huffman table numbers won't be changed later.
+   */
+  if (cinfo->arith_code || cinfo->process != JPROC_SEQUENTIAL ||
+      cinfo->data_precision != 8) {
+    is_baseline = FALSE;
+  } else {
+    is_baseline = TRUE;
+    for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
+	 ci++, compptr++) {
+      if (compptr->dc_tbl_no > 1 || compptr->ac_tbl_no > 1)
+	is_baseline = FALSE;
+    }
+    if (prec && is_baseline) {
+      is_baseline = FALSE;
+      /* If it's baseline except for quantizer size, warn the user */
+      TRACEMS(cinfo, 0, JTRC_16BIT_TABLES);
+    }
+  }
+
+  /* Emit the proper SOF marker */
+  if (cinfo->arith_code) {
+    emit_sof(cinfo, M_SOF9);	/* SOF code for arithmetic coding */
+  } else {
+    if (cinfo->process == JPROC_PROGRESSIVE)
+      emit_sof(cinfo, M_SOF2);	/* SOF code for progressive Huffman */
+    else if (cinfo->process == JPROC_LOSSLESS)
+      emit_sof(cinfo, M_SOF3);	/* SOF code for lossless Huffman */
+    else if (is_baseline)
+      emit_sof(cinfo, M_SOF0);	/* SOF code for baseline implementation */
+    else
+      emit_sof(cinfo, M_SOF1);	/* SOF code for non-baseline Huffman file */
+  }
+}
+
+
+/*
+ * Write scan header.
+ * This consists of DHT or DAC markers, optional DRI, and SOS.
+ * Compressed data will be written following the SOS.
+ */
+
+METHODDEF(void)
+write_scan_header (j_compress_ptr cinfo)
+{
+  my_marker_ptr marker = (my_marker_ptr) cinfo->marker;
+  int i;
+  jpeg_component_info *compptr;
+
+  if (cinfo->arith_code) {
+    /* Emit arith conditioning info.  We may have some duplication
+     * if the file has multiple scans, but it's so small it's hardly
+     * worth worrying about.
+     */
+    emit_dac(cinfo);
+  } else {
+    /* Emit Huffman tables.
+     * Note that emit_dht() suppresses any duplicate tables.
+     */
+    for (i = 0; i < cinfo->comps_in_scan; i++) {
+      compptr = cinfo->cur_comp_info[i];
+      if (cinfo->process == JPROC_PROGRESSIVE) {
+	/* Progressive mode: only DC or only AC tables are used in one scan */
+	if (cinfo->Ss == 0) {
+	  if (cinfo->Ah == 0)	/* DC needs no table for refinement scan */
+	    emit_dht(cinfo, compptr->dc_tbl_no, FALSE);
+	} else {
+	  emit_dht(cinfo, compptr->ac_tbl_no, TRUE);
+	}
+      } else if (cinfo->process == JPROC_LOSSLESS) {
+	/* Lossless mode: only DC tables are used */
+	emit_dht(cinfo, compptr->dc_tbl_no, FALSE);
+      } else {
+	/* Sequential mode: need both DC and AC tables */
+	emit_dht(cinfo, compptr->dc_tbl_no, FALSE);
+	emit_dht(cinfo, compptr->ac_tbl_no, TRUE);
+      }
+    }
+  }
+
+  /* Emit DRI if required --- note that DRI value could change for each scan.
+   * We avoid wasting space with unnecessary DRIs, however.
+   */
+  if (cinfo->restart_interval != marker->last_restart_interval) {
+    emit_dri(cinfo);
+    marker->last_restart_interval = cinfo->restart_interval;
+  }
+
+  emit_sos(cinfo);
+}
+
+
+/*
+ * Write datastream trailer.
+ */
+
+METHODDEF(void)
+write_file_trailer (j_compress_ptr cinfo)
+{
+  emit_marker(cinfo, M_EOI);
+}
+
+
+/*
+ * Write an abbreviated table-specification datastream.
+ * This consists of SOI, DQT and DHT tables, and EOI.
+ * Any table that is defined and not marked sent_table = TRUE will be
+ * emitted.  Note that all tables will be marked sent_table = TRUE at exit.
+ */
+
+METHODDEF(void)
+write_tables_only (j_compress_ptr cinfo)
+{
+  int i;
+
+  emit_marker(cinfo, M_SOI);
+
+  for (i = 0; i < NUM_QUANT_TBLS; i++) {
+    if (cinfo->quant_tbl_ptrs[i] != NULL)
+      (void) emit_dqt(cinfo, i);
+  }
+
+  if (! cinfo->arith_code) {
+    for (i = 0; i < NUM_HUFF_TBLS; i++) {
+      if (cinfo->dc_huff_tbl_ptrs[i] != NULL)
+	emit_dht(cinfo, i, FALSE);
+      if (cinfo->ac_huff_tbl_ptrs[i] != NULL)
+	emit_dht(cinfo, i, TRUE);
+    }
+  }
+
+  emit_marker(cinfo, M_EOI);
+}
+
+
+/*
+ * Initialize the marker writer module.
+ */
+
+GLOBAL(void)
+jinit_marker_writer (j_compress_ptr cinfo)
+{
+  my_marker_ptr marker;
+
+  /* Create the subobject */
+  marker = (my_marker_ptr)
+    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+				SIZEOF(my_marker_writer));
+  cinfo->marker = (struct jpeg_marker_writer *) marker;
+  /* Initialize method pointers */
+  marker->pub.write_file_header = write_file_header;
+  marker->pub.write_frame_header = write_frame_header;
+  marker->pub.write_scan_header = write_scan_header;
+  marker->pub.write_file_trailer = write_file_trailer;
+  marker->pub.write_tables_only = write_tables_only;
+  marker->pub.write_marker_header = write_marker_header;
+  marker->pub.write_marker_byte = write_marker_byte;
+  /* Initialize private state */
+  marker->last_restart_interval = 0;
+}
diff --git a/uppsrc/plugin/jpg/lib/jcmaster.c b/uppsrc/plugin/jpg/lib/jcmaster.c
new file mode 100644
index 000000000..e816a03b3
--- /dev/null
+++ b/uppsrc/plugin/jpg/lib/jcmaster.c
@@ -0,0 +1,647 @@
+/*
+ * jcmaster.c
+ *
+ * Copyright (C) 1991-1998, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains master control logic for the JPEG compressor.
+ * These routines are concerned with parameter validation, initial setup,
+ * and inter-pass control (determining the number of passes and the work
+ * to be done in each pass).
+ */
+
+#define JPEG_INTERNALS
+#include "jinclude.h"
+#include "jpeglib.h"
+#include "jlossy.h"		/* Private declarations for lossy codec */
+
+
+/* Private state */
+
+typedef enum {
+	main_pass,		/* input data, also do first output step */
+	huff_opt_pass,		/* Huffman code optimization pass */
+	output_pass		/* data output pass */
+} c_pass_type;
+
+typedef struct {
+  struct jpeg_comp_master pub;	/* public fields */
+
+  c_pass_type pass_type;	/* the type of the current pass */
+
+  int pass_number;		/* # of passes completed */
+  int total_passes;		/* total # of passes needed */
+
+  int scan_number;		/* current index in scan_info[] */
+} my_comp_master;
+
+typedef my_comp_master * my_master_ptr;
+
+
+/*
+ * Support routines that do various essential calculations.
+ */
+
+LOCAL(void)
+initial_setup (j_compress_ptr cinfo)
+/* Do computations that are needed before master selection phase */
+{
+  int ci;
+  jpeg_component_info *compptr;
+  long samplesperrow;
+  JDIMENSION jd_samplesperrow;
+  int data_unit = cinfo->data_unit;
+
+  /* Sanity check on image dimensions */
+  if (cinfo->image_height <= 0 || cinfo->image_width <= 0
+      || cinfo->num_components <= 0 || cinfo->input_components <= 0)
+    ERREXIT(cinfo, JERR_EMPTY_IMAGE);
+
+  /* Make sure image isn't bigger than I can handle */
+  if ((long) cinfo->image_height > (long) JPEG_MAX_DIMENSION ||
+      (long) cinfo->image_width > (long) JPEG_MAX_DIMENSION)
+    ERREXIT1(cinfo, JERR_IMAGE_TOO_BIG, (unsigned int) JPEG_MAX_DIMENSION);
+
+  /* Width of an input scanline must be representable as JDIMENSION. */
+  samplesperrow = (long) cinfo->image_width * (long) cinfo->input_components;
+  jd_samplesperrow = (JDIMENSION) samplesperrow;
+  if ((long) jd_samplesperrow != samplesperrow)
+    ERREXIT(cinfo, JERR_WIDTH_OVERFLOW);
+
+  /* For now, precision must match compiled-in value... */
+  if (cinfo->data_precision != BITS_IN_JSAMPLE)
+    ERREXIT1(cinfo, JERR_BAD_PRECISION, cinfo->data_precision);
+
+  /* Check that number of components won't exceed internal array sizes */
+  if (cinfo->num_components > MAX_COMPONENTS)
+    ERREXIT2(cinfo, JERR_COMPONENT_COUNT, cinfo->num_components,
+	     MAX_COMPONENTS);
+
+  /* Compute maximum sampling factors; check factor validity */
+  cinfo->max_h_samp_factor = 1;
+  cinfo->max_v_samp_factor = 1;
+  for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
+       ci++, compptr++) {
+    if (compptr->h_samp_factor<=0 || compptr->h_samp_factor>MAX_SAMP_FACTOR ||
+	compptr->v_samp_factor<=0 || compptr->v_samp_factor>MAX_SAMP_FACTOR)
+      ERREXIT(cinfo, JERR_BAD_SAMPLING);
+    cinfo->max_h_samp_factor = MAX(cinfo->max_h_samp_factor,
+				   compptr->h_samp_factor);
+    cinfo->max_v_samp_factor = MAX(cinfo->max_v_samp_factor,
+				   compptr->v_samp_factor);
+  }
+
+  /* Compute dimensions of components */
+  for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
+       ci++, compptr++) {
+    /* Fill in the correct component_index value; don't rely on application */
+    compptr->component_index = ci;
+    /* For compression, we never do any codec-based processing. */
+    compptr->codec_data_unit = data_unit;
+    /* Size in data units */
+    compptr->width_in_data_units = (JDIMENSION)
+      jdiv_round_up((long) cinfo->image_width * (long) compptr->h_samp_factor,
+		    (long) (cinfo->max_h_samp_factor * data_unit));
+    compptr->height_in_data_units = (JDIMENSION)
+      jdiv_round_up((long) cinfo->image_height * (long) compptr->v_samp_factor,
+		    (long) (cinfo->max_v_samp_factor * data_unit));
+    /* Size in samples */
+    compptr->downsampled_width = (JDIMENSION)
+      jdiv_round_up((long) cinfo->image_width * (long) compptr->h_samp_factor,
+		    (long) cinfo->max_h_samp_factor);
+    compptr->downsampled_height = (JDIMENSION)
+      jdiv_round_up((long) cinfo->image_height * (long) compptr->v_samp_factor,
+		    (long) cinfo->max_v_samp_factor);
+    /* Mark component needed (this flag isn't actually used for compression) */
+    compptr->component_needed = TRUE;
+  }
+
+  /* Compute number of fully interleaved MCU rows (number of times that
+   * main controller will call coefficient controller).
+   */
+  cinfo->total_iMCU_rows = (JDIMENSION)
+    jdiv_round_up((long) cinfo->image_height,
+		  (long) (cinfo->max_v_samp_factor*data_unit));
+}
+
+#ifdef C_MULTISCAN_FILES_SUPPORTED
+#define NEED_SCAN_SCRIPT
+#else
+#ifdef C_LOSSLESS_SUPPORTED
+#define NEED_SCAN_SCRIPT
+#endif
+#endif
+
+#ifdef NEED_SCAN_SCRIPT
+
+LOCAL(void)
+validate_script (j_compress_ptr cinfo)
+/* Verify that the scan script in cinfo->scan_info[] is valid; also
+ * determine whether it uses progressive JPEG, and set cinfo->process.
+ */
+{
+  const jpeg_scan_info * scanptr;
+  int scanno, ncomps, ci, coefi, thisi;
+  int Ss, Se, Ah, Al;
+  boolean component_sent[MAX_COMPONENTS];
+#ifdef C_PROGRESSIVE_SUPPORTED
+  int * last_bitpos_ptr;
+  int last_bitpos[MAX_COMPONENTS][DCTSIZE2];
+  /* -1 until that coefficient has been seen; then last Al for it */
+#endif
+
+  if (cinfo->num_scans <= 0)
+    ERREXIT1(cinfo, JERR_BAD_SCAN_SCRIPT, 0);
+
+#ifndef C_MULTISCAN_FILES_SUPPORTED
+  if (cinfo->num_scans > 1)
+    ERREXIT(cinfo, JERR_NOT_COMPILED);
+#endif
+
+  scanptr = cinfo->scan_info;
+  if (cinfo->lossless) {
+#ifdef C_LOSSLESS_SUPPORTED
+    cinfo->process = JPROC_LOSSLESS;
+    for (ci = 0; ci < cinfo->num_components; ci++)
+      component_sent[ci] = FALSE;
+#else
+    ERREXIT(cinfo, JERR_NOT_COMPILED);
+#endif
+  }
+  /* For sequential JPEG, all scans must have Ss=0, Se=DCTSIZE2-1;
+   * for progressive JPEG, no scan can have this.
+   */
+  else if (scanptr->Ss != 0 || scanptr->Se != DCTSIZE2-1) {
+#ifdef C_PROGRESSIVE_SUPPORTED
+    cinfo->process = JPROC_PROGRESSIVE;
+    last_bitpos_ptr = & last_bitpos[0][0];
+    for (ci = 0; ci < cinfo->num_components; ci++)
+      for (coefi = 0; coefi < DCTSIZE2; coefi++)
+	*last_bitpos_ptr++ = -1;
+#else
+    ERREXIT(cinfo, JERR_NOT_COMPILED);
+#endif
+  } else {
+    cinfo->process = JPROC_SEQUENTIAL;
+    for (ci = 0; ci < cinfo->num_components; ci++)
+      component_sent[ci] = FALSE;
+  }
+
+  for (scanno = 1; scanno <= cinfo->num_scans; scanptr++, scanno++) {
+    /* Validate component indexes */
+    ncomps = scanptr->comps_in_scan;
+    if (ncomps <= 0 || ncomps > MAX_COMPS_IN_SCAN)
+      ERREXIT2(cinfo, JERR_COMPONENT_COUNT, ncomps, MAX_COMPS_IN_SCAN);
+    for (ci = 0; ci < ncomps; ci++) {
+      thisi = scanptr->component_index[ci];
+      if (thisi < 0 || thisi >= cinfo->num_components)
+	ERREXIT1(cinfo, JERR_BAD_SCAN_SCRIPT, scanno);
+      /* Components must appear in SOF order within each scan */
+      if (ci > 0 && thisi <= scanptr->component_index[ci-1])
+	ERREXIT1(cinfo, JERR_BAD_SCAN_SCRIPT, scanno);
+    }
+    /* Validate progression parameters */
+    Ss = scanptr->Ss;
+    Se = scanptr->Se;
+    Ah = scanptr->Ah;
+    Al = scanptr->Al;
+    if (cinfo->process == JPROC_LOSSLESS) {
+#ifdef C_LOSSLESS_SUPPORTED
+      /* The JPEG spec simply gives the range 0..15 for Al (Pt), but that
+       * seems wrong: the upper bound ought to depend on data precision.
+       * Perhaps they really meant 0..N-1 for N-bit precision, which is what
+       * we allow here.
+       */
+      if (Ss < 1 || Ss > 7 ||			/* predictor selector */
+	  Se != 0 || Ah != 0 ||
+	  Al < 0 || Al >= cinfo->data_precision) /* point transform */
+	ERREXIT1(cinfo, JERR_BAD_LOSSLESS_SCRIPT, scanno);
+      /* Make sure components are not sent twice */
+      for (ci = 0; ci < ncomps; ci++) {
+	thisi = scanptr->component_index[ci];
+	if (component_sent[thisi])
+	  ERREXIT1(cinfo, JERR_BAD_SCAN_SCRIPT, scanno);
+	component_sent[thisi] = TRUE;
+      }
+#endif
+    } else if (cinfo->process == JPROC_PROGRESSIVE) {
+#ifdef C_PROGRESSIVE_SUPPORTED
+      /* The JPEG spec simply gives the ranges 0..13 for Ah and Al, but that
+       * seems wrong: the upper bound ought to depend on data precision.
+       * Perhaps they really meant 0..N+1 for N-bit precision.
+       * Here we allow 0..10 for 8-bit data; Al larger than 10 results in
+       * out-of-range reconstructed DC values during the first DC scan,
+       * which might cause problems for some decoders.
+       */
+#if BITS_IN_JSAMPLE == 8
+#define MAX_AH_AL 10
+#else
+#define MAX_AH_AL 13
+#endif
+      if (Ss < 0 || Ss >= DCTSIZE2 || Se < Ss || Se >= DCTSIZE2 ||
+	  Ah < 0 || Ah > MAX_AH_AL || Al < 0 || Al > MAX_AH_AL)
+	ERREXIT1(cinfo, JERR_BAD_PROG_SCRIPT, scanno);
+      if (Ss == 0) {
+	if (Se != 0)		/* DC and AC together not OK */
+	  ERREXIT1(cinfo, JERR_BAD_PROG_SCRIPT, scanno);
+      } else {
+	if (ncomps != 1)	/* AC scans must be for only one component */
+	  ERREXIT1(cinfo, JERR_BAD_PROG_SCRIPT, scanno);
+      }
+      for (ci = 0; ci < ncomps; ci++) {
+	last_bitpos_ptr = & last_bitpos[scanptr->component_index[ci]][0];
+	if (Ss != 0 && last_bitpos_ptr[0] < 0) /* AC without prior DC scan */
+	  ERREXIT1(cinfo, JERR_BAD_PROG_SCRIPT, scanno);
+	for (coefi = Ss; coefi <= Se; coefi++) {
+	  if (last_bitpos_ptr[coefi] < 0) {
+	    /* first scan of this coefficient */
+	    if (Ah != 0)
+	      ERREXIT1(cinfo, JERR_BAD_PROG_SCRIPT, scanno);
+	  } else {
+	    /* not first scan */
+	    if (Ah != last_bitpos_ptr[coefi] || Al != Ah-1)
+	      ERREXIT1(cinfo, JERR_BAD_PROG_SCRIPT, scanno);
+	  }
+	  last_bitpos_ptr[coefi] = Al;
+	}
+      }
+#endif
+    } else {
+      /* For sequential JPEG, all progression parameters must be these: */
+      if (Ss != 0 || Se != DCTSIZE2-1 || Ah != 0 || Al != 0)
+	ERREXIT1(cinfo, JERR_BAD_PROG_SCRIPT, scanno);
+      /* Make sure components are not sent twice */
+      for (ci = 0; ci < ncomps; ci++) {
+	thisi = scanptr->component_index[ci];
+	if (component_sent[thisi])
+	  ERREXIT1(cinfo, JERR_BAD_SCAN_SCRIPT, scanno);
+	component_sent[thisi] = TRUE;
+      }
+    }
+  }
+
+  /* Now verify that everything got sent. */
+  if (cinfo->process == JPROC_PROGRESSIVE) {
+#ifdef C_PROGRESSIVE_SUPPORTED
+    /* For progressive mode, we only check that at least some DC data
+     * got sent for each component; the spec does not require that all bits
+     * of all coefficients be transmitted.  Would it be wiser to enforce
+     * transmission of all coefficient bits??
+     */
+    for (ci = 0; ci < cinfo->num_components; ci++) {
+      if (last_bitpos[ci][0] < 0)
+	ERREXIT(cinfo, JERR_MISSING_DATA);
+    }
+#endif
+  } else {
+    for (ci = 0; ci < cinfo->num_components; ci++) {
+      if (! component_sent[ci])
+	ERREXIT(cinfo, JERR_MISSING_DATA);
+    }
+  }
+}
+
+#endif /* NEED_SCAN_SCRIPT */
+
+
+LOCAL(void)
+select_scan_parameters (j_compress_ptr cinfo)
+/* Set up the scan parameters for the current scan */
+{
+  int ci;
+
+#ifdef NEED_SCAN_SCRIPT
+  if (cinfo->scan_info != NULL) {
+    /* Prepare for current scan --- the script is already validated */
+    my_master_ptr master = (my_master_ptr) cinfo->master;
+    const jpeg_scan_info * scanptr = cinfo->scan_info + master->scan_number;
+
+    cinfo->comps_in_scan = scanptr->comps_in_scan;
+    for (ci = 0; ci < scanptr->comps_in_scan; ci++) {
+      cinfo->cur_comp_info[ci] =
+	&cinfo->comp_info[scanptr->component_index[ci]];
+    }
+    cinfo->Ss = scanptr->Ss;
+    cinfo->Se = scanptr->Se;
+    cinfo->Ah = scanptr->Ah;
+    cinfo->Al = scanptr->Al;
+  } else
+#endif
+  {
+    /* Prepare for single sequential-JPEG scan containing all components */
+    if (cinfo->num_components > MAX_COMPS_IN_SCAN)
+      ERREXIT2(cinfo, JERR_COMPONENT_COUNT, cinfo->num_components,
+	       MAX_COMPS_IN_SCAN);
+    cinfo->comps_in_scan = cinfo->num_components;
+    for (ci = 0; ci < cinfo->num_components; ci++) {
+      cinfo->cur_comp_info[ci] = &cinfo->comp_info[ci];
+    }
+    if (cinfo->lossless) {
+#ifdef C_LOSSLESS_SUPPORTED
+    /* If we fall through to here, the user specified lossless, but did not
+     * provide a scan script.
+     */
+      ERREXIT(cinfo, JERR_NO_LOSSLESS_SCRIPT);
+#endif
+    } else {
+      cinfo->process = JPROC_SEQUENTIAL;
+      cinfo->Ss = 0;
+      cinfo->Se = DCTSIZE2-1;
+      cinfo->Ah = 0;
+      cinfo->Al = 0;
+    }
+  }
+}
+
+
+LOCAL(void)
+per_scan_setup (j_compress_ptr cinfo)
+/* Do computations that are needed before processing a JPEG scan */
+/* cinfo->comps_in_scan and cinfo->cur_comp_info[] are already set */
+{
+  int ci, mcublks, tmp;
+  jpeg_component_info *compptr;
+  int data_unit = cinfo->data_unit;
+
+  if (cinfo->comps_in_scan == 1) {
+
+    /* Noninterleaved (single-component) scan */
+    compptr = cinfo->cur_comp_info[0];
+
+    /* Overall image size in MCUs */
+    cinfo->MCUs_per_row = compptr->width_in_data_units;
+    cinfo->MCU_rows_in_scan = compptr->height_in_data_units;
+
+    /* For noninterleaved scan, always one block per MCU */
+    compptr->MCU_width = 1;
+    compptr->MCU_height = 1;
+    compptr->MCU_data_units = 1;
+    compptr->MCU_sample_width = data_unit;
+    compptr->last_col_width = 1;
+    /* For noninterleaved scans, it is convenient to define last_row_height
+     * as the number of block rows present in the last iMCU row.
+     */
+    tmp = (int) (compptr->height_in_data_units % compptr->v_samp_factor);
+    if (tmp == 0) tmp = compptr->v_samp_factor;
+    compptr->last_row_height = tmp;
+
+    /* Prepare array describing MCU composition */
+    cinfo->data_units_in_MCU = 1;
+    cinfo->MCU_membership[0] = 0;
+
+  } else {
+
+    /* Interleaved (multi-component) scan */
+    if (cinfo->comps_in_scan <= 0 || cinfo->comps_in_scan > MAX_COMPS_IN_SCAN)
+      ERREXIT2(cinfo, JERR_COMPONENT_COUNT, cinfo->comps_in_scan,
+	       MAX_COMPS_IN_SCAN);
+
+    /* Overall image size in MCUs */
+    cinfo->MCUs_per_row = (JDIMENSION)
+      jdiv_round_up((long) cinfo->image_width,
+		    (long) (cinfo->max_h_samp_factor*data_unit));
+    cinfo->MCU_rows_in_scan = (JDIMENSION)
+      jdiv_round_up((long) cinfo->image_height,
+		    (long) (cinfo->max_v_samp_factor*data_unit));
+
+    cinfo->data_units_in_MCU = 0;
+
+    for (ci = 0; ci < cinfo->comps_in_scan; ci++) {
+      compptr = cinfo->cur_comp_info[ci];
+      /* Sampling factors give # of blocks of component in each MCU */
+      compptr->MCU_width = compptr->h_samp_factor;
+      compptr->MCU_height = compptr->v_samp_factor;
+      compptr->MCU_data_units = compptr->MCU_width * compptr->MCU_height;
+      compptr->MCU_sample_width = compptr->MCU_width * data_unit;
+      /* Figure number of non-dummy blocks in last MCU column & row */
+      tmp = (int) (compptr->width_in_data_units % compptr->MCU_width);
+      if (tmp == 0) tmp = compptr->MCU_width;
+      compptr->last_col_width = tmp;
+      tmp = (int) (compptr->height_in_data_units % compptr->MCU_height);
+      if (tmp == 0) tmp = compptr->MCU_height;
+      compptr->last_row_height = tmp;
+      /* Prepare array describing MCU composition */
+      mcublks = compptr->MCU_data_units;
+      if (cinfo->data_units_in_MCU + mcublks > C_MAX_DATA_UNITS_IN_MCU)
+	ERREXIT(cinfo, JERR_BAD_MCU_SIZE);
+      while (mcublks-- > 0) {
+	cinfo->MCU_membership[cinfo->data_units_in_MCU++] = ci;
+      }
+    }
+
+  }
+
+  /* Convert restart specified in rows to actual MCU count. */
+  /* Note that count must fit in 16 bits, so we provide limiting. */
+  if (cinfo->restart_in_rows > 0) {
+    long nominal = (long) cinfo->restart_in_rows * (long) cinfo->MCUs_per_row;
+    cinfo->restart_interval = (unsigned int) MIN(nominal, 65535L);
+  }
+}
+
+
+/*
+ * Per-pass setup.
+ * This is called at the beginning of each pass.  We determine which modules
+ * will be active during this pass and give them appropriate start_pass calls.
+ * We also set is_last_pass to indicate whether any more passes will be
+ * required.
+ */
+
+METHODDEF(void)
+prepare_for_pass (j_compress_ptr cinfo)
+{
+  j_lossy_c_ptr lossyc = (j_lossy_c_ptr) cinfo->codec;
+  my_master_ptr master = (my_master_ptr) cinfo->master;
+
+  switch (master->pass_type) {
+  case main_pass:
+    /* Initial pass: will collect input data, and do either Huffman
+     * optimization or data output for the first scan.
+     */
+    select_scan_parameters(cinfo);
+    per_scan_setup(cinfo);
+    if (! cinfo->raw_data_in) {
+      (*cinfo->cconvert->start_pass) (cinfo);
+      (*cinfo->downsample->start_pass) (cinfo);
+      (*cinfo->prep->start_pass) (cinfo, JBUF_PASS_THRU);
+    }
+    (*cinfo->codec->entropy_start_pass) (cinfo, cinfo->optimize_coding);
+    (*cinfo->codec->start_pass) (cinfo,
+				 (master->total_passes > 1 ?
+				  JBUF_SAVE_AND_PASS : JBUF_PASS_THRU));
+    (*cinfo->main->start_pass) (cinfo, JBUF_PASS_THRU);
+    if (cinfo->optimize_coding) {
+      /* No immediate data output; postpone writing frame/scan headers */
+      master->pub.call_pass_startup = FALSE;
+    } else {
+      /* Will write frame/scan headers at first jpeg_write_scanlines call */
+      master->pub.call_pass_startup = TRUE;
+    }
+    break;
+#ifdef ENTROPY_OPT_SUPPORTED
+  case huff_opt_pass:
+    /* Do Huffman optimization for a scan after the first one. */
+    select_scan_parameters(cinfo);
+    per_scan_setup(cinfo);
+    if ((*cinfo->codec->need_optimization_pass) (cinfo) || cinfo->arith_code) {
+      (*cinfo->codec->entropy_start_pass) (cinfo, TRUE);
+      (*cinfo->codec->start_pass) (cinfo, JBUF_CRANK_DEST);
+      master->pub.call_pass_startup = FALSE;
+      break;
+    }
+    /* Special case: Huffman DC refinement scans need no Huffman table
+     * and therefore we can skip the optimization pass for them.
+     */
+    master->pass_type = output_pass;
+    master->pass_number++;
+    /*FALLTHROUGH*/
+#endif
+  case output_pass:
+    /* Do a data-output pass. */
+    /* We need not repeat per-scan setup if prior optimization pass did it. */
+    if (! cinfo->optimize_coding) {
+      select_scan_parameters(cinfo);
+      per_scan_setup(cinfo);
+    }
+    (*cinfo->codec->entropy_start_pass) (cinfo, FALSE);
+    (*cinfo->codec->start_pass) (cinfo, JBUF_CRANK_DEST);
+    /* We emit frame/scan headers now */
+    if (master->scan_number == 0)
+      (*cinfo->marker->write_frame_header) (cinfo);
+    (*cinfo->marker->write_scan_header) (cinfo);
+    master->pub.call_pass_startup = FALSE;
+    break;
+  default:
+    ERREXIT(cinfo, JERR_NOT_COMPILED);
+  }
+
+  master->pub.is_last_pass = (master->pass_number == master->total_passes-1);
+
+  /* Set up progress monitor's pass info if present */
+  if (cinfo->progress != NULL) {
+    cinfo->progress->completed_passes = master->pass_number;
+    cinfo->progress->total_passes = master->total_passes;
+  }
+}
+
+
+/*
+ * Special start-of-pass hook.
+ * This is called by jpeg_write_scanlines if call_pass_startup is TRUE.
+ * In single-pass processing, we need this hook because we don't want to
+ * write frame/scan headers during jpeg_start_compress; we want to let the
+ * application write COM markers etc. between jpeg_start_compress and the
+ * jpeg_write_scanlines loop.
+ * In multi-pass processing, this routine is not used.
+ */
+
+METHODDEF(void)
+pass_startup (j_compress_ptr cinfo)
+{
+  cinfo->master->call_pass_startup = FALSE; /* reset flag so call only once */
+
+  (*cinfo->marker->write_frame_header) (cinfo);
+  (*cinfo->marker->write_scan_header) (cinfo);
+}
+
+
+/*
+ * Finish up at end of pass.
+ */
+
+METHODDEF(void)
+finish_pass_master (j_compress_ptr cinfo)
+{
+  j_lossy_c_ptr lossyc = (j_lossy_c_ptr) cinfo->codec;
+  my_master_ptr master = (my_master_ptr) cinfo->master;
+
+  /* The entropy coder always needs an end-of-pass call,
+   * either to analyze statistics or to flush its output buffer.
+   */
+  (*lossyc->pub.entropy_finish_pass) (cinfo);
+
+  /* Update state for next pass */
+  switch (master->pass_type) {
+  case main_pass:
+    /* next pass is either output of scan 0 (after optimization)
+     * or output of scan 1 (if no optimization).
+     */
+    master->pass_type = output_pass;
+    if (! cinfo->optimize_coding)
+      master->scan_number++;
+    break;
+  case huff_opt_pass:
+    /* next pass is always output of current scan */
+    master->pass_type = output_pass;
+    break;
+  case output_pass:
+    /* next pass is either optimization or output of next scan */
+    if (cinfo->optimize_coding)
+      master->pass_type = huff_opt_pass;
+    master->scan_number++;
+    break;
+  }
+
+  master->pass_number++;
+}
+
+
+/*
+ * Initialize master compression control.
+ */
+
+GLOBAL(void)
+jinit_c_master_control (j_compress_ptr cinfo, boolean transcode_only)
+{
+  my_master_ptr master;
+
+  master = (my_master_ptr)
+      (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+				  SIZEOF(my_comp_master));
+  cinfo->master = (struct jpeg_comp_master *) master;
+  master->pub.prepare_for_pass = prepare_for_pass;
+  master->pub.pass_startup = pass_startup;
+  master->pub.finish_pass = finish_pass_master;
+  master->pub.is_last_pass = FALSE;
+
+  cinfo->data_unit = cinfo->lossless ? 1 : DCTSIZE;
+
+  /* Validate parameters, determine derived values */
+  initial_setup(cinfo);
+
+  if (cinfo->scan_info != NULL) {
+#ifdef NEED_SCAN_SCRIPT
+    validate_script(cinfo);
+#else
+    ERREXIT(cinfo, JERR_NOT_COMPILED);
+#endif
+  } else {
+    cinfo->process = JPROC_SEQUENTIAL;
+    cinfo->num_scans = 1;
+  }
+
+  if (cinfo->process == JPROC_PROGRESSIVE ||	/*  TEMPORARY HACK ??? */
+      cinfo->process == JPROC_LOSSLESS)
+    cinfo->optimize_coding = TRUE; /* assume default tables no good for
+				    * progressive mode or lossless mode */
+
+  /* Initialize my private state */
+  if (transcode_only) {
+    /* no main pass in transcoding */
+    if (cinfo->optimize_coding)
+      master->pass_type = huff_opt_pass;
+    else
+      master->pass_type = output_pass;
+  } else {
+    /* for normal compression, first pass is always this type: */
+    master->pass_type = main_pass;
+  }
+  master->scan_number = 0;
+  master->pass_number = 0;
+  if (cinfo->optimize_coding)
+    master->total_passes = cinfo->num_scans * 2;
+  else
+    master->total_passes = cinfo->num_scans;
+}
diff --git a/uppsrc/plugin/jpg/lib/jcodec.c b/uppsrc/plugin/jpg/lib/jcodec.c
new file mode 100644
index 000000000..9529caaa1
--- /dev/null
+++ b/uppsrc/plugin/jpg/lib/jcodec.c
@@ -0,0 +1,53 @@
+/*
+ * jcodec.c
+ *
+ * Copyright (C) 1998, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains utility functions for the JPEG codec(s).
+ */
+
+#define JPEG_INTERNALS
+#include "jinclude.h"
+#include "jpeglib.h"
+#include "jlossy.h"
+#include "jlossls.h"
+
+
+/*
+ * Initialize the compression codec.
+ * This is called only once, during master selection.
+ */
+
+GLOBAL(void)
+jinit_c_codec (j_compress_ptr cinfo)
+{
+  if (cinfo->process == JPROC_LOSSLESS) {
+#ifdef C_LOSSLESS_SUPPORTED
+    jinit_lossless_c_codec(cinfo);
+#else
+    ERREXIT(cinfo, JERR_NOT_COMPILED);
+#endif
+  } else
+    jinit_lossy_c_codec(cinfo);
+}
+
+
+/*
+ * Initialize the decompression codec.
+ * This is called only once, during master selection.
+ */
+
+GLOBAL(void)
+jinit_d_codec (j_decompress_ptr cinfo)
+{
+  if (cinfo->process == JPROC_LOSSLESS) {
+#ifdef D_LOSSLESS_SUPPORTED
+    jinit_lossless_d_codec(cinfo);
+#else
+    ERREXIT(cinfo, JERR_NOT_COMPILED);
+#endif
+  } else
+    jinit_lossy_d_codec(cinfo);
+}
diff --git a/uppsrc/plugin/jpg/lib/jcomapi.c b/uppsrc/plugin/jpg/lib/jcomapi.c
new file mode 100644
index 000000000..9b1fa7568
--- /dev/null
+++ b/uppsrc/plugin/jpg/lib/jcomapi.c
@@ -0,0 +1,106 @@
+/*
+ * jcomapi.c
+ *
+ * Copyright (C) 1994-1997, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains application interface routines that are used for both
+ * compression and decompression.
+ */
+
+#define JPEG_INTERNALS
+#include "jinclude.h"
+#include "jpeglib.h"
+
+
+/*
+ * Abort processing of a JPEG compression or decompression operation,
+ * but don't destroy the object itself.
+ *
+ * For this, we merely clean up all the nonpermanent memory pools.
+ * Note that temp files (virtual arrays) are not allowed to belong to
+ * the permanent pool, so we will be able to close all temp files here.
+ * Closing a data source or destination, if necessary, is the application's
+ * responsibility.
+ */
+
+GLOBAL(void)
+jpeg_abort (j_common_ptr cinfo)
+{
+  int pool;
+
+  /* Do nothing if called on a not-initialized or destroyed JPEG object. */
+  if (cinfo->mem == NULL)
+    return;
+
+  /* Releasing pools in reverse order might help avoid fragmentation
+   * with some (brain-damaged) malloc libraries.
+   */
+  for (pool = JPOOL_NUMPOOLS-1; pool > JPOOL_PERMANENT; pool--) {
+    (*cinfo->mem->free_pool) (cinfo, pool);
+  }
+
+  /* Reset overall state for possible reuse of object */
+  if (cinfo->is_decompressor) {
+    cinfo->global_state = DSTATE_START;
+    /* Try to keep application from accessing now-deleted marker list.
+     * A bit kludgy to do it here, but this is the most central place.
+     */
+    ((j_decompress_ptr) cinfo)->marker_list = NULL;
+  } else {
+    cinfo->global_state = CSTATE_START;
+  }
+}
+
+
+/*
+ * Destruction of a JPEG object.
+ *
+ * Everything gets deallocated except the master jpeg_compress_struct itself
+ * and the error manager struct.  Both of these are supplied by the application
+ * and must be freed, if necessary, by the application.  (Often they are on
+ * the stack and so don't need to be freed anyway.)
+ * Closing a data source or destination, if necessary, is the application's
+ * responsibility.
+ */
+
+GLOBAL(void)
+jpeg_destroy (j_common_ptr cinfo)
+{
+  /* We need only tell the memory manager to release everything. */
+  /* NB: mem pointer is NULL if memory mgr failed to initialize. */
+  if (cinfo->mem != NULL)
+    (*cinfo->mem->self_destruct) (cinfo);
+  cinfo->mem = NULL;		/* be safe if jpeg_destroy is called twice */
+  cinfo->global_state = 0;	/* mark it destroyed */
+}
+
+
+/*
+ * Convenience routines for allocating quantization and Huffman tables.
+ * (Would jutils.c be a more reasonable place to put these?)
+ */
+
+GLOBAL(JQUANT_TBL *)
+jpeg_alloc_quant_table (j_common_ptr cinfo)
+{
+  JQUANT_TBL *tbl;
+
+  tbl = (JQUANT_TBL *)
+    (*cinfo->mem->alloc_small) (cinfo, JPOOL_PERMANENT, SIZEOF(JQUANT_TBL));
+  tbl->sent_table = FALSE;	/* make sure this is false in any new table */
+  return tbl;
+}
+
+
+GLOBAL(JHUFF_TBL *)
+jpeg_alloc_huff_table (j_common_ptr cinfo)
+{
+  JHUFF_TBL *tbl;
+
+  tbl = (JHUFF_TBL *)
+    (*cinfo->mem->alloc_small) (cinfo, JPOOL_PERMANENT, SIZEOF(JHUFF_TBL));
+  tbl->sent_table = FALSE;	/* make sure this is false in any new table */
+  return tbl;
+}
diff --git a/uppsrc/plugin/jpg/lib/jconfig.h b/uppsrc/plugin/jpg/lib/jconfig.h
new file mode 100644
index 000000000..de687e600
--- /dev/null
+++ b/uppsrc/plugin/jpg/lib/jconfig.h
@@ -0,0 +1,40 @@
+/* jconfig.h --- generated by ckconfig.c */
+/* see jconfig.doc for explanations */
+
+#define HAVE_PROTOTYPES
+#define HAVE_UNSIGNED_CHAR
+#define HAVE_UNSIGNED_SHORT
+/* #define void char */
+/* #define const */
+#undef CHAR_IS_UNSIGNED
+#define HAVE_STDDEF_H
+#define HAVE_STDLIB_H
+#undef NEED_BSD_STRINGS
+#undef NEED_SYS_TYPES_H
+#undef NEED_FAR_POINTERS
+#undef NEED_SHORT_EXTERNAL_NAMES
+#undef INCOMPLETE_TYPES_BROKEN
+
+#ifdef JPEG_INTERNALS
+
+#undef RIGHT_SHIFT_IS_UNSIGNED
+
+#endif /* JPEG_INTERNALS */
+
+//#define JDCT_DEFAULT  JDCT_FLOAT
+//#define JDCT_FASTEST  JDCT_FLOAT
+
+#ifdef JPEG_CJPEG_DJPEG
+
+#define BMP_SUPPORTED		/* BMP image file format */
+#define GIF_SUPPORTED		/* GIF image file format */
+#define PPM_SUPPORTED		/* PBMPLUS PPM/PGM image file format */
+#undef RLE_SUPPORTED		/* Utah RLE image file format */
+#define TARGA_SUPPORTED		/* Targa image file format */
+
+#undef TWO_FILE_COMMANDLINE	/* You may need this on non-Unix systems */
+#undef NEED_SIGNAL_CATCHER	/* Define this if you use jmemname.c */
+#undef DONT_USE_B_MODE
+/* #define PROGRESS_REPORT */	/* optional */
+
+#endif /* JPEG_CJPEG_DJPEG */
diff --git a/uppsrc/plugin/jpg/lib/jcparam.c b/uppsrc/plugin/jpg/lib/jcparam.c
new file mode 100644
index 000000000..af2287f75
--- /dev/null
+++ b/uppsrc/plugin/jpg/lib/jcparam.c
@@ -0,0 +1,687 @@
+/*
+ * jcparam.c
+ *
+ * Copyright (C) 1991-1998, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains optional default-setting code for the JPEG compressor.
+ * Applications do not have to use this file, but those that don't use it
+ * must know a lot more about the innards of the JPEG code.
+ */
+
+#define JPEG_INTERNALS
+#include "jinclude.h"
+#include "jpeglib.h"
+
+
+/*
+ * Quantization table setup routines
+ */
+
+GLOBAL(void)
+jpeg_add_quant_table (j_compress_ptr cinfo, int which_tbl,
+		      const unsigned int *basic_table,
+		      int scale_factor, boolean force_baseline)
+/* Define a quantization table equal to the basic_table times
+ * a scale factor (given as a percentage).
+ * If force_baseline is TRUE, the computed quantization table entries
+ * are limited to 1..255 for JPEG baseline compatibility.
+ */
+{
+  JQUANT_TBL ** qtblptr;
+  int i;
+  long temp;
+
+  /* Safety check to ensure start_compress not called yet. */
+  if (cinfo->global_state != CSTATE_START)
+    ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);
+
+  if (which_tbl < 0 || which_tbl >= NUM_QUANT_TBLS)
+    ERREXIT1(cinfo, JERR_DQT_INDEX, which_tbl);
+
+  qtblptr = & cinfo->quant_tbl_ptrs[which_tbl];
+
+  if (*qtblptr == NULL)
+    *qtblptr = jpeg_alloc_quant_table((j_common_ptr) cinfo);
+
+  for (i = 0; i < DCTSIZE2; i++) {
+    temp = ((long) basic_table[i] * scale_factor + 50L) / 100L;
+    /* limit the values to the valid range */
+    if (temp <= 0L) temp = 1L;
+    if (temp > 32767L) temp = 32767L; /* max quantizer needed for 12 bits */
+    if (force_baseline && temp > 255L)
+      temp = 255L;		/* limit to baseline range if requested */
+    (*qtblptr)->quantval[i] = (UINT16) temp;
+  }
+
+  /* Initialize sent_table FALSE so table will be written to JPEG file. */
+  (*qtblptr)->sent_table = FALSE;
+}
+
+
+GLOBAL(void)
+jpeg_set_linear_quality (j_compress_ptr cinfo, int scale_factor,
+			 boolean force_baseline)
+/* Set or change the 'quality' (quantization) setting, using default tables
+ * and a straight percentage-scaling quality scale.  In most cases it's better
+ * to use jpeg_set_quality (below); this entry point is provided for
+ * applications that insist on a linear percentage scaling.
+ */
+{
+  /* These are the sample quantization tables given in JPEG spec section K.1.
+   * The spec says that the values given produce "good" quality, and
+   * when divided by 2, "very good" quality.
+   */
+  static const unsigned int std_luminance_quant_tbl[DCTSIZE2] = {
+    16,  11,  10,  16,  24,  40,  51,  61,
+    12,  12,  14,  19,  26,  58,  60,  55,
+    14,  13,  16,  24,  40,  57,  69,  56,
+    14,  17,  22,  29,  51,  87,  80,  62,
+    18,  22,  37,  56,  68, 109, 103,  77,
+    24,  35,  55,  64,  81, 104, 113,  92,
+    49,  64,  78,  87, 103, 121, 120, 101,
+    72,  92,  95,  98, 112, 100, 103,  99
+  };
+  static const unsigned int std_chrominance_quant_tbl[DCTSIZE2] = {
+    17,  18,  24,  47,  99,  99,  99,  99,
+    18,  21,  26,  66,  99,  99,  99,  99,
+    24,  26,  56,  99,  99,  99,  99,  99,
+    47,  66,  99,  99,  99,  99,  99,  99,
+    99,  99,  99,  99,  99,  99,  99,  99,
+    99,  99,  99,  99,  99,  99,  99,  99,
+    99,  99,  99,  99,  99,  99,  99,  99,
+    99,  99,  99,  99,  99,  99,  99,  99
+  };
+
+  /* Set up two quantization tables using the specified scaling */
+  jpeg_add_quant_table(cinfo, 0, std_luminance_quant_tbl,
+		       scale_factor, force_baseline);
+  jpeg_add_quant_table(cinfo, 1, std_chrominance_quant_tbl,
+		       scale_factor, force_baseline);
+}
+
+
+GLOBAL(int)
+jpeg_quality_scaling (int quality)
+/* Convert a user-specified quality rating to a percentage scaling factor
+ * for an underlying quantization table, using our recommended scaling curve.
+ * The input 'quality' factor should be 0 (terrible) to 100 (very good).
+ */
+{
+  /* Safety limit on quality factor.  Convert 0 to 1 to avoid zero divide. */
+  if (quality <= 0) quality = 1;
+  if (quality > 100) quality = 100;
+
+  /* The basic table is used as-is (scaling 100) for a quality of 50.
+   * Qualities 50..100 are converted to scaling percentage 200 - 2*Q;
+   * note that at Q=100 the scaling is 0, which will cause jpeg_add_quant_table
+   * to make all the table entries 1 (hence, minimum quantization loss).
+   * Qualities 1..50 are converted to scaling percentage 5000/Q.
+   */
+  if (quality < 50)
+    quality = 5000 / quality;
+  else
+    quality = 200 - quality*2;
+
+  return quality;
+}
+
+
+GLOBAL(void)
+jpeg_set_quality (j_compress_ptr cinfo, int quality, boolean force_baseline)
+/* Set or change the 'quality' (quantization) setting, using default tables.
+ * This is the standard quality-adjusting entry point for typical user
+ * interfaces; only those who want detailed control over quantization tables
+ * would use the preceding three routines directly.
+ */
+{
+  /* Convert user 0-100 rating to percentage scaling */
+  quality = jpeg_quality_scaling(quality);
+
+  /* Set up standard quality tables */
+  jpeg_set_linear_quality(cinfo, quality, force_baseline);
+}
+
+
+/*
+ * Huffman table setup routines
+ */
+
+LOCAL(void)
+add_huff_table (j_compress_ptr cinfo,
+		JHUFF_TBL **htblptr, const UINT8 *bits, const UINT8 *val)
+/* Define a Huffman table */
+{
+  int nsymbols, len;
+
+  if (*htblptr == NULL)
+    *htblptr = jpeg_alloc_huff_table((j_common_ptr) cinfo);
+
+  /* Copy the number-of-symbols-of-each-code-length counts */
+  MEMCOPY((*htblptr)->bits, bits, SIZEOF((*htblptr)->bits));
+
+  /* Validate the counts.  We do this here mainly so we can copy the right
+   * number of symbols from the val[] array, without risking marching off
+   * the end of memory.  jchuff.c will do a more thorough test later.
+   */
+  nsymbols = 0;
+  for (len = 1; len <= 16; len++)
+    nsymbols += bits[len];
+  if (nsymbols < 1 || nsymbols > 256)
+    ERREXIT(cinfo, JERR_BAD_HUFF_TABLE);
+
+  MEMCOPY((*htblptr)->huffval, val, nsymbols * SIZEOF(UINT8));
+
+  /* Initialize sent_table FALSE so table will be written to JPEG file. */
+  (*htblptr)->sent_table = FALSE;
+}
+
+
+LOCAL(void)
+std_huff_tables (j_compress_ptr cinfo)
+/* Set up the standard Huffman tables (cf. JPEG standard section K.3) */
+/* IMPORTANT: these are only valid for 8-bit data precision! */
+{
+  static const UINT8 bits_dc_luminance[17] =
+    { /* 0-base */ 0, 0, 1, 5, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0 };
+  static const UINT8 val_dc_luminance[] =
+    { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 };
+
+  static const UINT8 bits_dc_chrominance[17] =
+    { /* 0-base */ 0, 0, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0 };
+  static const UINT8 val_dc_chrominance[] =
+    { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 };
+
+  static const UINT8 bits_ac_luminance[17] =
+    { /* 0-base */ 0, 0, 2, 1, 3, 3, 2, 4, 3, 5, 5, 4, 4, 0, 0, 1, 0x7d };
+  static const UINT8 val_ac_luminance[] =
+    { 0x01, 0x02, 0x03, 0x00, 0x04, 0x11, 0x05, 0x12,
+      0x21, 0x31, 0x41, 0x06, 0x13, 0x51, 0x61, 0x07,
+      0x22, 0x71, 0x14, 0x32, 0x81, 0x91, 0xa1, 0x08,
+      0x23, 0x42, 0xb1, 0xc1, 0x15, 0x52, 0xd1, 0xf0,
+      0x24, 0x33, 0x62, 0x72, 0x82, 0x09, 0x0a, 0x16,
+      0x17, 0x18, 0x19, 0x1a, 0x25, 0x26, 0x27, 0x28,
+      0x29, 0x2a, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39,
+      0x3a, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49,
+      0x4a, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59,
+      0x5a, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69,
+      0x6a, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79,
+      0x7a, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89,
+      0x8a, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98,
+      0x99, 0x9a, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7,
+      0xa8, 0xa9, 0xaa, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6,
+      0xb7, 0xb8, 0xb9, 0xba, 0xc2, 0xc3, 0xc4, 0xc5,
+      0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xd2, 0xd3, 0xd4,
+      0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda, 0xe1, 0xe2,
+      0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, 0xea,
+      0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8,
+      0xf9, 0xfa };
+
+  static const UINT8 bits_ac_chrominance[17] =
+    { /* 0-base */ 0, 0, 2, 1, 2, 4, 4, 3, 4, 7, 5, 4, 4, 0, 1, 2, 0x77 };
+  static const UINT8 val_ac_chrominance[] =
+    { 0x00, 0x01, 0x02, 0x03, 0x11, 0x04, 0x05, 0x21,
+      0x31, 0x06, 0x12, 0x41, 0x51, 0x07, 0x61, 0x71,
+      0x13, 0x22, 0x32, 0x81, 0x08, 0x14, 0x42, 0x91,
+      0xa1, 0xb1, 0xc1, 0x09, 0x23, 0x33, 0x52, 0xf0,
+      0x15, 0x62, 0x72, 0xd1, 0x0a, 0x16, 0x24, 0x34,
+      0xe1, 0x25, 0xf1, 0x17, 0x18, 0x19, 0x1a, 0x26,
+      0x27, 0x28, 0x29, 0x2a, 0x35, 0x36, 0x37, 0x38,
+      0x39, 0x3a, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48,
+      0x49, 0x4a, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58,
+      0x59, 0x5a, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68,
+      0x69, 0x6a, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78,
+      0x79, 0x7a, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87,
+      0x88, 0x89, 0x8a, 0x92, 0x93, 0x94, 0x95, 0x96,
+      0x97, 0x98, 0x99, 0x9a, 0xa2, 0xa3, 0xa4, 0xa5,
+      0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xb2, 0xb3, 0xb4,
+      0xb5, 0xb6, 0xb7, 0xb8, 0xb9, 0xba, 0xc2, 0xc3,
+      0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xd2,
+      0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda,
+      0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9,
+      0xea, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8,
+      0xf9, 0xfa };
+
+  add_huff_table(cinfo, &cinfo->dc_huff_tbl_ptrs[0],
+		 bits_dc_luminance, val_dc_luminance);
+  add_huff_table(cinfo, &cinfo->ac_huff_tbl_ptrs[0],
+		 bits_ac_luminance, val_ac_luminance);
+  add_huff_table(cinfo, &cinfo->dc_huff_tbl_ptrs[1],
+		 bits_dc_chrominance, val_dc_chrominance);
+  add_huff_table(cinfo, &cinfo->ac_huff_tbl_ptrs[1],
+		 bits_ac_chrominance, val_ac_chrominance);
+}
+
+
+/*
+ * Default parameter setup for compression.
+ *
+ * Applications that don't choose to use this routine must do their
+ * own setup of all these parameters.  Alternately, you can call this
+ * to establish defaults and then alter parameters selectively.  This
+ * is the recommended approach since, if we add any new parameters,
+ * your code will still work (they'll be set to reasonable defaults).
+ */
+
+GLOBAL(void)
+jpeg_set_defaults (j_compress_ptr cinfo)
+{
+  int i;
+
+  /* Safety check to ensure start_compress not called yet. */
+  if (cinfo->global_state != CSTATE_START)
+    ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);
+
+  /* Allocate comp_info array large enough for maximum component count.
+   * Array is made permanent in case application wants to compress
+   * multiple images at same param settings.
+   */
+  if (cinfo->comp_info == NULL)
+    cinfo->comp_info = (jpeg_component_info *)
+      (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT,
+				  MAX_COMPONENTS * SIZEOF(jpeg_component_info));
+
+  /* Initialize everything not dependent on the color space */
+
+  cinfo->lossless = FALSE;
+  cinfo->data_precision = BITS_IN_JSAMPLE;
+  /* Set up two quantization tables using default quality of 75 */
+  jpeg_set_quality(cinfo, 75, TRUE);
+  /* Set up two Huffman tables */
+  std_huff_tables(cinfo);
+
+  /* Initialize default arithmetic coding conditioning */
+  for (i = 0; i < NUM_ARITH_TBLS; i++) {
+    cinfo->arith_dc_L[i] = 0;
+    cinfo->arith_dc_U[i] = 1;
+    cinfo->arith_ac_K[i] = 5;
+  }
+
+  /* Default is no multiple-scan output */
+  cinfo->scan_info = NULL;
+  cinfo->num_scans = 0;
+
+  /* Expect normal source image, not raw downsampled data */
+  cinfo->raw_data_in = FALSE;
+
+  /* Use Huffman coding, not arithmetic coding, by default */
+  cinfo->arith_code = FALSE;
+
+  /* By default, don't do extra passes to optimize entropy coding */
+  cinfo->optimize_coding = FALSE;
+  /* The standard Huffman tables are only valid for 8-bit data precision.
+   * If the precision is higher, force optimization on so that usable
+   * tables will be computed.  This test can be removed if default tables
+   * are supplied that are valid for the desired precision.
+   */
+  if (cinfo->data_precision > 8)
+    cinfo->optimize_coding = TRUE;
+
+  /* By default, use the simpler non-cosited sampling alignment */
+  cinfo->CCIR601_sampling = FALSE;
+
+  /* No input smoothing */
+  cinfo->smoothing_factor = 0;
+
+  /* DCT algorithm preference */
+  cinfo->dct_method = JDCT_DEFAULT;
+
+  /* No restart markers */
+  cinfo->restart_interval = 0;
+  cinfo->restart_in_rows = 0;
+
+  /* Fill in default JFIF marker parameters.  Note that whether the marker
+   * will actually be written is determined by jpeg_set_colorspace.
+   *
+   * By default, the library emits JFIF version code 1.01.
+   * An application that wants to emit JFIF 1.02 extension markers should set
+   * JFIF_minor_version to 2.  We could probably get away with just defaulting
+   * to 1.02, but there may still be some decoders in use that will complain
+   * about that; saying 1.01 should minimize compatibility problems.
+   */
+  cinfo->JFIF_major_version = 1; /* Default JFIF version = 1.01 */
+  cinfo->JFIF_minor_version = 1;
+  cinfo->density_unit = 0;	/* Pixel size is unknown by default */
+  cinfo->X_density = 1;		/* Pixel aspect ratio is square by default */
+  cinfo->Y_density = 1;
+
+  /* Choose JPEG colorspace based on input space, set defaults accordingly */
+
+  jpeg_default_colorspace(cinfo);
+}
+
+
+/*
+ * Select an appropriate JPEG colorspace for in_color_space.
+ */
+
+GLOBAL(void)
+jpeg_default_colorspace (j_compress_ptr cinfo)
+{
+  if (cinfo->lossless)
+    jpeg_set_colorspace(cinfo, cinfo->in_color_space);
+  else { /* lossy */
+    switch (cinfo->in_color_space) {
+    case JCS_GRAYSCALE:
+      jpeg_set_colorspace(cinfo, JCS_GRAYSCALE);
+      break;
+    case JCS_RGB:
+      jpeg_set_colorspace(cinfo, JCS_YCbCr);
+      break;
+    case JCS_YCbCr:
+      jpeg_set_colorspace(cinfo, JCS_YCbCr);
+      break;
+    case JCS_CMYK:
+      jpeg_set_colorspace(cinfo, JCS_CMYK); /* By default, no translation */
+      break;
+    case JCS_YCCK:
+      jpeg_set_colorspace(cinfo, JCS_YCCK);
+      break;
+    case JCS_UNKNOWN:
+      jpeg_set_colorspace(cinfo, JCS_UNKNOWN);
+      break;
+    default:
+      ERREXIT(cinfo, JERR_BAD_IN_COLORSPACE);
+    }
+  }
+}
+
+
+/*
+ * Set the JPEG colorspace, and choose colorspace-dependent default values.
+ */
+
+GLOBAL(void)
+jpeg_set_colorspace (j_compress_ptr cinfo, J_COLOR_SPACE colorspace)
+{
+  jpeg_component_info * compptr;
+  int ci;
+
+#define SET_COMP(index,id,hsamp,vsamp,quant,dctbl,actbl)  \
+  (compptr = &cinfo->comp_info[index], \
+   compptr->component_id = (id), \
+   compptr->h_samp_factor = (hsamp), \
+   compptr->v_samp_factor = (vsamp), \
+   compptr->quant_tbl_no = (quant), \
+   compptr->dc_tbl_no = (dctbl), \
+   compptr->ac_tbl_no = (actbl) )
+
+  /* Safety check to ensure start_compress not called yet. */
+  if (cinfo->global_state != CSTATE_START)
+    ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);
+
+  /* For all colorspaces, we use Q and Huff tables 0 for luminance components,
+   * tables 1 for chrominance components.
+   */
+
+  cinfo->jpeg_color_space = colorspace;
+
+  cinfo->write_JFIF_header = FALSE; /* No marker for non-JFIF colorspaces */
+  cinfo->write_Adobe_marker = FALSE; /* write no Adobe marker by default */
+
+  switch (colorspace) {
+  case JCS_GRAYSCALE:
+    cinfo->write_JFIF_header = TRUE; /* Write a JFIF marker */
+    cinfo->num_components = 1;
+    /* JFIF specifies component ID 1 */
+    SET_COMP(0, 1, 1,1, 0, 0,0);
+    break;
+  case JCS_RGB:
+    cinfo->write_Adobe_marker = TRUE; /* write Adobe marker to flag RGB */
+    cinfo->num_components = 3;
+    SET_COMP(0, 0x52 /* 'R' */, 1,1, 0, 0,0);
+    SET_COMP(1, 0x47 /* 'G' */, 1,1, 0, 0,0);
+    SET_COMP(2, 0x42 /* 'B' */, 1,1, 0, 0,0);
+    break;
+  case JCS_YCbCr:
+    cinfo->write_JFIF_header = TRUE; /* Write a JFIF marker */
+    cinfo->num_components = 3;
+    /* JFIF specifies component IDs 1,2,3 */
+    if (cinfo->lossless) {
+      SET_COMP(0, 1, 1,1, 0, 0,0);
+      SET_COMP(1, 2, 1,1, 1, 1,1);
+      SET_COMP(2, 3, 1,1, 1, 1,1);
+    } else { /* lossy */
+      /* We default to 2x2 subsamples of chrominance */
+      SET_COMP(0, 1, 2,2, 0, 0,0);
+      SET_COMP(1, 2, 1,1, 1, 1,1);
+      SET_COMP(2, 3, 1,1, 1, 1,1);
+    }
+    break;
+  case JCS_CMYK:
+    cinfo->write_Adobe_marker = TRUE; /* write Adobe marker to flag CMYK */
+    cinfo->num_components = 4;
+    SET_COMP(0, 0x43 /* 'C' */, 1,1, 0, 0,0);
+    SET_COMP(1, 0x4D /* 'M' */, 1,1, 0, 0,0);
+    SET_COMP(2, 0x59 /* 'Y' */, 1,1, 0, 0,0);
+    SET_COMP(3, 0x4B /* 'K' */, 1,1, 0, 0,0);
+    break;
+  case JCS_YCCK:
+    cinfo->write_Adobe_marker = TRUE; /* write Adobe marker to flag YCCK */
+    cinfo->num_components = 4;
+    if (cinfo->lossless) {
+      SET_COMP(0, 1, 1,1, 0, 0,0);
+      SET_COMP(1, 2, 1,1, 1, 1,1);
+      SET_COMP(2, 3, 1,1, 1, 1,1);
+      SET_COMP(3, 4, 1,1, 0, 0,0);
+    } else { /* lossy */
+      SET_COMP(0, 1, 2,2, 0, 0,0);
+      SET_COMP(1, 2, 1,1, 1, 1,1);
+      SET_COMP(2, 3, 1,1, 1, 1,1);
+      SET_COMP(3, 4, 2,2, 0, 0,0);
+    }
+    break;
+  case JCS_UNKNOWN:
+    cinfo->num_components = cinfo->input_components;
+    if (cinfo->num_components < 1 || cinfo->num_components > MAX_COMPONENTS)
+      ERREXIT2(cinfo, JERR_COMPONENT_COUNT, cinfo->num_components,
+	       MAX_COMPONENTS);
+    for (ci = 0; ci < cinfo->num_components; ci++) {
+      SET_COMP(ci, ci, 1,1, 0, 0,0);
+    }
+    break;
+  default:
+    ERREXIT(cinfo, JERR_BAD_J_COLORSPACE);
+  }
+}
+
+
+#ifdef C_PROGRESSIVE_SUPPORTED
+
+LOCAL(jpeg_scan_info *)
+fill_scans (jpeg_scan_info * scanptr, int ncomps,
+	    int Ss, int Se, int Ah, int Al)
+/* Support routine: generate one scan for each component */
+{
+  int ci;
+
+  for (ci = 0; ci < ncomps; ci++) {
+    scanptr->comps_in_scan = 1;
+    scanptr->component_index[0] = ci;
+    scanptr->Ss = Ss;
+    scanptr->Se = Se;
+    scanptr->Ah = Ah;
+    scanptr->Al = Al;
+    scanptr++;
+  }
+  return scanptr;
+}
+
+
+LOCAL(jpeg_scan_info *)
+fill_a_scan (jpeg_scan_info * scanptr, int ci,
+	     int Ss, int Se, int Ah, int Al)
+/* Support routine: generate one scan for specified component */
+{
+  scanptr->comps_in_scan = 1;
+  scanptr->component_index[0] = ci;
+  scanptr->Ss = Ss;
+  scanptr->Se = Se;
+  scanptr->Ah = Ah;
+  scanptr->Al = Al;
+  scanptr++;
+  return scanptr;
+}
+
+LOCAL(jpeg_scan_info *)
+fill_dc_scans (jpeg_scan_info * scanptr, int ncomps, int Ah, int Al)
+/* Support routine: generate interleaved DC scan if possible, else N scans */
+{
+  int ci;
+
+  if (ncomps <= MAX_COMPS_IN_SCAN) {
+    /* Single interleaved DC scan */
+    scanptr->comps_in_scan = ncomps;
+    for (ci = 0; ci < ncomps; ci++)
+      scanptr->component_index[ci] = ci;
+    scanptr->Ss = scanptr->Se = 0;
+    scanptr->Ah = Ah;
+    scanptr->Al = Al;
+    scanptr++;
+  } else {
+    /* Noninterleaved DC scan for each component */
+    scanptr = fill_scans(scanptr, ncomps, 0, 0, Ah, Al);
+  }
+  return scanptr;
+}
+
+
+/*
+ * Create a recommended progressive-JPEG script.
+ * cinfo->num_components and cinfo->jpeg_color_space must be correct.
+ */
+
+GLOBAL(void)
+jpeg_simple_progression (j_compress_ptr cinfo)
+{
+  int ncomps = cinfo->num_components;
+  int nscans;
+  jpeg_scan_info * scanptr;
+
+  /* Safety check to ensure start_compress not called yet. */
+  if (cinfo->global_state != CSTATE_START)
+    ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);
+
+  /* Figure space needed for script.  Calculation must match code below! */
+  if (ncomps == 3 && cinfo->jpeg_color_space == JCS_YCbCr) {
+    /* Custom script for YCbCr color images. */
+    nscans = 10;
+  } else {
+    /* All-purpose script for other color spaces. */
+    if (ncomps > MAX_COMPS_IN_SCAN)
+      nscans = 6 * ncomps;	/* 2 DC + 4 AC scans per component */
+    else
+      nscans = 2 + 4 * ncomps;	/* 2 DC scans; 4 AC scans per component */
+  }
+
+  /* Allocate space for script.
+   * We need to put it in the permanent pool in case the application performs
+   * multiple compressions without changing the settings.  To avoid a memory
+   * leak if jpeg_simple_progression is called repeatedly for the same JPEG
+   * object, we try to re-use previously allocated space, and we allocate
+   * enough space to handle YCbCr even if initially asked for grayscale.
+   */
+  if (cinfo->script_space == NULL || cinfo->script_space_size < nscans) {
+    cinfo->script_space_size = MAX(nscans, 10);
+    cinfo->script_space = (jpeg_scan_info *)
+      (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT,
+			cinfo->script_space_size * SIZEOF(jpeg_scan_info));
+  }
+  scanptr = cinfo->script_space;
+  cinfo->scan_info = scanptr;
+  cinfo->num_scans = nscans;
+
+  if (ncomps == 3 && cinfo->jpeg_color_space == JCS_YCbCr) {
+    /* Custom script for YCbCr color images. */
+    /* Initial DC scan */
+    scanptr = fill_dc_scans(scanptr, ncomps, 0, 1);
+    /* Initial AC scan: get some luma data out in a hurry */
+    scanptr = fill_a_scan(scanptr, 0, 1, 5, 0, 2);
+    /* Chroma data is too small to be worth expending many scans on */
+    scanptr = fill_a_scan(scanptr, 2, 1, 63, 0, 1);
+    scanptr = fill_a_scan(scanptr, 1, 1, 63, 0, 1);
+    /* Complete spectral selection for luma AC */
+    scanptr = fill_a_scan(scanptr, 0, 6, 63, 0, 2);
+    /* Refine next bit of luma AC */
+    scanptr = fill_a_scan(scanptr, 0, 1, 63, 2, 1);
+    /* Finish DC successive approximation */
+    scanptr = fill_dc_scans(scanptr, ncomps, 1, 0);
+    /* Finish AC successive approximation */
+    scanptr = fill_a_scan(scanptr, 2, 1, 63, 1, 0);
+    scanptr = fill_a_scan(scanptr, 1, 1, 63, 1, 0);
+    /* Luma bottom bit comes last since it's usually largest scan */
+    scanptr = fill_a_scan(scanptr, 0, 1, 63, 1, 0);
+  } else {
+    /* All-purpose script for other color spaces. */
+    /* Successive approximation first pass */
+    scanptr = fill_dc_scans(scanptr, ncomps, 0, 1);
+    scanptr = fill_scans(scanptr, ncomps, 1, 5, 0, 2);
+    scanptr = fill_scans(scanptr, ncomps, 6, 63, 0, 2);
+    /* Successive approximation second pass */
+    scanptr = fill_scans(scanptr, ncomps, 1, 63, 2, 1);
+    /* Successive approximation final pass */
+    scanptr = fill_dc_scans(scanptr, ncomps, 1, 0);
+    scanptr = fill_scans(scanptr, ncomps, 1, 63, 1, 0);
+  }
+}
+
+#endif /* C_PROGRESSIVE_SUPPORTED */
+
+
+#ifdef C_LOSSLESS_SUPPORTED
+
+/*
+ * Create a single-entry lossless-JPEG script containing all components.
+ * cinfo->num_components must be correct.
+ */
+
+GLOBAL(void)
+jpeg_simple_lossless (j_compress_ptr cinfo, int predictor, int point_transform)
+{
+  int ncomps = cinfo->num_components;
+  int nscans = 1;
+  int ci;
+  jpeg_scan_info * scanptr;
+
+  /* Safety check to ensure start_compress not called yet. */
+  if (cinfo->global_state != CSTATE_START)
+    ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);
+
+  cinfo->lossless = TRUE;
+
+  /* Set jpeg_color_space. */
+  jpeg_default_colorspace(cinfo);
+
+  /* Check to ensure that all components will fit in one scan. */
+  if (cinfo->num_components > MAX_COMPS_IN_SCAN)
+    ERREXIT2(cinfo, JERR_COMPONENT_COUNT, cinfo->num_components,
+	     MAX_COMPS_IN_SCAN);
+
+  /* Allocate space for script.
+   * We need to put it in the permanent pool in case the application performs
+   * multiple compressions without changing the settings.  To avoid a memory
+   * leak if jpeg_simple_lossless is called repeatedly for the same JPEG
+   * object, we try to re-use previously allocated space.
+   */
+  if (cinfo->script_space == NULL || cinfo->script_space_size < nscans) {
+    cinfo->script_space_size = nscans;
+    cinfo->script_space = (jpeg_scan_info *)
+      (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT,
+			cinfo->script_space_size * SIZEOF(jpeg_scan_info));
+  }
+  scanptr = cinfo->script_space;
+  cinfo->scan_info = scanptr;
+  cinfo->num_scans = nscans;
+
+  /* Fill the script. */
+  scanptr->comps_in_scan = ncomps;
+  for (ci = 0; ci < ncomps; ci++)
+    scanptr->component_index[ci] = ci;
+  scanptr->Ss = predictor;
+  scanptr->Se = 0;
+  scanptr->Ah = 0;
+  scanptr->Al = point_transform;
+}
+
+#endif /* C_LOSSLESS_SUPPORTED */
diff --git a/uppsrc/plugin/jpg/lib/jcphuff.c b/uppsrc/plugin/jpg/lib/jcphuff.c
new file mode 100644
index 000000000..e7d53b1fe
--- /dev/null
+++ b/uppsrc/plugin/jpg/lib/jcphuff.c
@@ -0,0 +1,848 @@
+/*
+ * jcphuff.c
+ *
+ * Copyright (C) 1995-1998, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains Huffman entropy encoding routines for progressive JPEG.
+ *
+ * We do not support output suspension in this module, since the library
+ * currently does not allow multiple-scan files to be written with output
+ * suspension.
+ */
+
+#define JPEG_INTERNALS
+#include "jinclude.h"
+#include "jpeglib.h"
+#include "jlossy.h"		/* Private declarations for lossy codec */
+#include "jchuff.h"		/* Declarations shared with jc*huff.c */
+
+#ifdef C_PROGRESSIVE_SUPPORTED
+
+/* Expanded entropy encoder object for progressive Huffman encoding. */
+
+typedef struct {
+  /* Mode flag: TRUE for optimization, FALSE for actual data output */
+  boolean gather_statistics;
+
+  /* Bit-level coding status.
+   * next_output_byte/free_in_buffer are local copies of cinfo->dest fields.
+   */
+  JOCTET * next_output_byte;	/* => next byte to write in buffer */
+  size_t free_in_buffer;	/* # of byte spaces remaining in buffer */
+  INT32 put_buffer;		/* current bit-accumulation buffer */
+  int put_bits;			/* # of bits now in it */
+  j_compress_ptr cinfo;		/* link to cinfo (needed for dump_buffer) */
+
+  /* Coding status for DC components */
+  int last_dc_val[MAX_COMPS_IN_SCAN]; /* last DC coef for each component */
+
+  /* Coding status for AC components */
+  int ac_tbl_no;		/* the table number of the single component */
+  unsigned int EOBRUN;		/* run length of EOBs */
+  unsigned int BE;		/* # of buffered correction bits before MCU */
+  char * bit_buffer;		/* buffer for correction bits (1 per char) */
+  /* packing correction bits tightly would save some space but cost time... */
+
+  unsigned int restarts_to_go;	/* MCUs left in this restart interval */
+  int next_restart_num;		/* next restart number to write (0-7) */
+
+  /* Pointers to derived tables (these workspaces have image lifespan).
+   * Since any one scan codes only DC or only AC, we only need one set
+   * of tables, not one for DC and one for AC.
+   */
+  c_derived_tbl * derived_tbls[NUM_HUFF_TBLS];
+
+  /* Statistics tables for optimization; again, one set is enough */
+  long * count_ptrs[NUM_HUFF_TBLS];
+} phuff_entropy_encoder;
+
+typedef phuff_entropy_encoder * phuff_entropy_ptr;
+
+/* MAX_CORR_BITS is the number of bits the AC refinement correction-bit
+ * buffer can hold.  Larger sizes may slightly improve compression, but
+ * 1000 is already well into the realm of overkill.
+ * The minimum safe size is 64 bits.
+ */
+
+#define MAX_CORR_BITS  1000	/* Max # of correction bits I can buffer */
+
+/* IRIGHT_SHIFT is like RIGHT_SHIFT, but works on int rather than INT32.
+ * We assume that int right shift is unsigned if INT32 right shift is,
+ * which should be safe.
+ */
+
+#ifdef RIGHT_SHIFT_IS_UNSIGNED
+#define ISHIFT_TEMPS	int ishift_temp;
+#define IRIGHT_SHIFT(x,shft)  \
+	((ishift_temp = (x)) < 0 ? \
+	 (ishift_temp >> (shft)) | ((~0) << (16-(shft))) : \
+	 (ishift_temp >> (shft)))
+#else
+#define ISHIFT_TEMPS
+#define IRIGHT_SHIFT(x,shft)	((x) >> (shft))
+#endif
+
+/* Forward declarations */
+METHODDEF(boolean) encode_mcu_DC_first JPP((j_compress_ptr cinfo,
+					    JBLOCKROW *MCU_data));
+METHODDEF(boolean) encode_mcu_AC_first JPP((j_compress_ptr cinfo,
+					    JBLOCKROW *MCU_data));
+METHODDEF(boolean) encode_mcu_DC_refine JPP((j_compress_ptr cinfo,
+					     JBLOCKROW *MCU_data));
+METHODDEF(boolean) encode_mcu_AC_refine JPP((j_compress_ptr cinfo,
+					     JBLOCKROW *MCU_data));
+METHODDEF(void) finish_pass_phuff JPP((j_compress_ptr cinfo));
+METHODDEF(void) finish_pass_gather_phuff JPP((j_compress_ptr cinfo));
+
+
+/*
+ * Initialize for a Huffman-compressed scan using progressive JPEG.
+ */
+
+METHODDEF(void)
+start_pass_phuff (j_compress_ptr cinfo, boolean gather_statistics)
+{
+  j_lossy_c_ptr lossyc = (j_lossy_c_ptr) cinfo->codec;
+  phuff_entropy_ptr entropy = (phuff_entropy_ptr) lossyc->entropy_private;
+  boolean is_DC_band;
+  int ci, tbl;
+  jpeg_component_info * compptr;
+
+  entropy->cinfo = cinfo;
+  entropy->gather_statistics = gather_statistics;
+
+  is_DC_band = (cinfo->Ss == 0);
+
+  /* We assume jcmaster.c already validated the scan parameters. */
+
+  /* Select execution routines */
+  if (cinfo->Ah == 0) {
+    if (is_DC_band)
+      lossyc->entropy_encode_mcu = encode_mcu_DC_first;
+    else
+      lossyc->entropy_encode_mcu = encode_mcu_AC_first;
+  } else {
+    if (is_DC_band)
+      lossyc->entropy_encode_mcu = encode_mcu_DC_refine;
+    else {
+      lossyc->entropy_encode_mcu = encode_mcu_AC_refine;
+      /* AC refinement needs a correction bit buffer */
+      if (entropy->bit_buffer == NULL)
+	entropy->bit_buffer = (char *)
+	  (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+				      MAX_CORR_BITS * SIZEOF(char));
+    }
+  }
+  if (gather_statistics)
+    lossyc->pub.entropy_finish_pass = finish_pass_gather_phuff;
+  else
+    lossyc->pub.entropy_finish_pass = finish_pass_phuff;
+
+  /* Only DC coefficients may be interleaved, so cinfo->comps_in_scan = 1
+   * for AC coefficients.
+   */
+  for (ci = 0; ci < cinfo->comps_in_scan; ci++) {
+    compptr = cinfo->cur_comp_info[ci];
+    /* Initialize DC predictions to 0 */
+    entropy->last_dc_val[ci] = 0;
+    /* Get table index */
+    if (is_DC_band) {
+      if (cinfo->Ah != 0)	/* DC refinement needs no table */
+	continue;
+      tbl = compptr->dc_tbl_no;
+    } else {
+      entropy->ac_tbl_no = tbl = compptr->ac_tbl_no;
+    }
+    if (gather_statistics) {
+      /* Check for invalid table index */
+      /* (make_c_derived_tbl does this in the other path) */
+      if (tbl < 0 || tbl >= NUM_HUFF_TBLS)
+        ERREXIT1(cinfo, JERR_NO_HUFF_TABLE, tbl);
+      /* Allocate and zero the statistics tables */
+      /* Note that jpeg_gen_optimal_table expects 257 entries in each table! */
+      if (entropy->count_ptrs[tbl] == NULL)
+	entropy->count_ptrs[tbl] = (long *)
+	  (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+				      257 * SIZEOF(long));
+      MEMZERO(entropy->count_ptrs[tbl], 257 * SIZEOF(long));
+    } else {
+      /* Compute derived values for Huffman table */
+      /* We may do this more than once for a table, but it's not expensive */
+      jpeg_make_c_derived_tbl(cinfo, is_DC_band, tbl,
+			      & entropy->derived_tbls[tbl]);
+    }
+  }
+
+  /* Initialize AC stuff */
+  entropy->EOBRUN = 0;
+  entropy->BE = 0;
+
+  /* Initialize bit buffer to empty */
+  entropy->put_buffer = 0;
+  entropy->put_bits = 0;
+
+  /* Initialize restart stuff */
+  entropy->restarts_to_go = cinfo->restart_interval;
+  entropy->next_restart_num = 0;
+}
+
+
+/* Outputting bytes to the file.
+ * NB: these must be called only when actually outputting,
+ * that is, entropy->gather_statistics == FALSE.
+ */
+
+/* Emit a byte */
+#define emit_byte(entropy,val)  \
+	{ *(entropy)->next_output_byte++ = (JOCTET) (val);  \
+	  if (--(entropy)->free_in_buffer == 0)  \
+	    dump_buffer(entropy); }
+
+
+LOCAL(void)
+dump_buffer (phuff_entropy_ptr entropy)
+/* Empty the output buffer; we do not support suspension in this module. */
+{
+  struct jpeg_destination_mgr * dest = entropy->cinfo->dest;
+
+  if (! (*dest->empty_output_buffer) (entropy->cinfo))
+    ERREXIT(entropy->cinfo, JERR_CANT_SUSPEND);
+  /* After a successful buffer dump, must reset buffer pointers */
+  entropy->next_output_byte = dest->next_output_byte;
+  entropy->free_in_buffer = dest->free_in_buffer;
+}
+
+
+/* Outputting bits to the file */
+
+/* Only the right 24 bits of put_buffer are used; the valid bits are
+ * left-justified in this part.  At most 16 bits can be passed to emit_bits
+ * in one call, and we never retain more than 7 bits in put_buffer
+ * between calls, so 24 bits are sufficient.
+ */
+
+INLINE
+LOCAL(void)
+emit_bits (phuff_entropy_ptr entropy, unsigned int code, int size)
+/* Emit some bits, unless we are in gather mode */
+{
+  /* This routine is heavily used, so it's worth coding tightly. */
+  register INT32 put_buffer = (INT32) code;
+  register int put_bits = entropy->put_bits;
+
+  /* if size is 0, caller used an invalid Huffman table entry */
+  if (size == 0)
+    ERREXIT(entropy->cinfo, JERR_HUFF_MISSING_CODE);
+
+  if (entropy->gather_statistics)
+    return;			/* do nothing if we're only getting stats */
+
+  put_buffer &= (((INT32) 1)<<size) - 1; /* mask off any extra bits in code */
+
+  put_bits += size;		/* new number of bits in buffer */
+
+  put_buffer <<= 24 - put_bits; /* align incoming bits */
+
+  put_buffer |= entropy->put_buffer; /* and merge with old buffer contents */
+
+  while (put_bits >= 8) {
+    int c = (int) ((put_buffer >> 16) & 0xFF);
+
+    emit_byte(entropy, c);
+    if (c == 0xFF) {		/* need to stuff a zero byte? */
+      emit_byte(entropy, 0);
+    }
+    put_buffer <<= 8;
+    put_bits -= 8;
+  }
+
+  entropy->put_buffer = put_buffer; /* update variables */
+  entropy->put_bits = put_bits;
+}
+
+
+LOCAL(void)
+flush_bits (phuff_entropy_ptr entropy)
+{
+  emit_bits(entropy, 0x7F, 7); /* fill any partial byte with ones */
+  entropy->put_buffer = 0;     /* and reset bit-buffer to empty */
+  entropy->put_bits = 0;
+}
+
+
+/*
+ * Emit (or just count) a Huffman symbol.
+ */
+
+INLINE
+LOCAL(void)
+emit_symbol (phuff_entropy_ptr entropy, int tbl_no, int symbol)
+{
+  if (entropy->gather_statistics)
+    entropy->count_ptrs[tbl_no][symbol]++;
+  else {
+    c_derived_tbl * tbl = entropy->derived_tbls[tbl_no];
+    emit_bits(entropy, tbl->ehufco[symbol], tbl->ehufsi[symbol]);
+  }
+}
+
+
+/*
+ * Emit bits from a correction bit buffer.
+ */
+
+LOCAL(void)
+emit_buffered_bits (phuff_entropy_ptr entropy, char * bufstart,
+		    unsigned int nbits)
+{
+  if (entropy->gather_statistics)
+    return;			/* no real work */
+
+  while (nbits > 0) {
+    emit_bits(entropy, (unsigned int) (*bufstart), 1);
+    bufstart++;
+    nbits--;
+  }
+}
+
+
+/*
+ * Emit any pending EOBRUN symbol.
+ */
+
+LOCAL(void)
+emit_eobrun (phuff_entropy_ptr entropy)
+{
+  register int temp, nbits;
+
+  if (entropy->EOBRUN > 0) {	/* if there is any pending EOBRUN */
+    temp = entropy->EOBRUN;
+    nbits = 0;
+    while ((temp >>= 1))
+      nbits++;
+    /* safety check: shouldn't happen given limited correction-bit buffer */
+    if (nbits > 14)
+      ERREXIT(entropy->cinfo, JERR_HUFF_MISSING_CODE);
+
+    emit_symbol(entropy, entropy->ac_tbl_no, nbits << 4);
+    if (nbits)
+      emit_bits(entropy, entropy->EOBRUN, nbits);
+
+    entropy->EOBRUN = 0;
+
+    /* Emit any buffered correction bits */
+    emit_buffered_bits(entropy, entropy->bit_buffer, entropy->BE);
+    entropy->BE = 0;
+  }
+}
+
+
+/*
+ * Emit a restart marker & resynchronize predictions.
+ */
+
+LOCAL(void)
+emit_restart (phuff_entropy_ptr entropy, int restart_num)
+{
+  int ci;
+
+  emit_eobrun(entropy);
+
+  if (! entropy->gather_statistics) {
+    flush_bits(entropy);
+    emit_byte(entropy, 0xFF);
+    emit_byte(entropy, JPEG_RST0 + restart_num);
+  }
+
+  if (entropy->cinfo->Ss == 0) {
+    /* Re-initialize DC predictions to 0 */
+    for (ci = 0; ci < entropy->cinfo->comps_in_scan; ci++)
+      entropy->last_dc_val[ci] = 0;
+  } else {
+    /* Re-initialize all AC-related fields to 0 */
+    entropy->EOBRUN = 0;
+    entropy->BE = 0;
+  }
+}
+
+
+/*
+ * MCU encoding for DC initial scan (either spectral selection,
+ * or first pass of successive approximation).
+ */
+
+METHODDEF(boolean)
+encode_mcu_DC_first (j_compress_ptr cinfo, JBLOCKROW *MCU_data)
+{
+  j_lossy_c_ptr lossyc = (j_lossy_c_ptr) cinfo->codec;
+  phuff_entropy_ptr entropy = (phuff_entropy_ptr) lossyc->entropy_private;
+  register int temp, temp2;
+  register int nbits;
+  int blkn, ci;
+  int Al = cinfo->Al;
+  JBLOCKROW block;
+  jpeg_component_info * compptr;
+  ISHIFT_TEMPS
+
+  entropy->next_output_byte = cinfo->dest->next_output_byte;
+  entropy->free_in_buffer = cinfo->dest->free_in_buffer;
+
+  /* Emit restart marker if needed */
+  if (cinfo->restart_interval)
+    if (entropy->restarts_to_go == 0)
+      emit_restart(entropy, entropy->next_restart_num);
+
+  /* Encode the MCU data blocks */
+  for (blkn = 0; blkn < cinfo->data_units_in_MCU; blkn++) {
+    block = MCU_data[blkn];
+    ci = cinfo->MCU_membership[blkn];
+    compptr = cinfo->cur_comp_info[ci];
+
+    /* Compute the DC value after the required point transform by Al.
+     * This is simply an arithmetic right shift.
+     */
+    temp2 = IRIGHT_SHIFT((int) ((*block)[0]), Al);
+
+    /* DC differences are figured on the point-transformed values. */
+    temp = temp2 - entropy->last_dc_val[ci];
+    entropy->last_dc_val[ci] = temp2;
+
+    /* Encode the DC coefficient difference per section G.1.2.1 */
+    temp2 = temp;
+    if (temp < 0) {
+      temp = -temp;		/* temp is abs value of input */
+      /* For a negative input, want temp2 = bitwise complement of abs(input) */
+      /* This code assumes we are on a two's complement machine */
+      temp2--;
+    }
+
+    /* Find the number of bits needed for the magnitude of the coefficient */
+    nbits = 0;
+    while (temp) {
+      nbits++;
+      temp >>= 1;
+    }
+    /* Check for out-of-range coefficient values.
+     * Since we're encoding a difference, the range limit is twice as much.
+     */
+    if (nbits > MAX_COEF_BITS+1)
+      ERREXIT(cinfo, JERR_BAD_DCT_COEF);
+
+    /* Count/emit the Huffman-coded symbol for the number of bits */
+    emit_symbol(entropy, compptr->dc_tbl_no, nbits);
+
+    /* Emit that number of bits of the value, if positive, */
+    /* or the complement of its magnitude, if negative. */
+    if (nbits)			/* emit_bits rejects calls with size 0 */
+      emit_bits(entropy, (unsigned int) temp2, nbits);
+  }
+
+  cinfo->dest->next_output_byte = entropy->next_output_byte;
+  cinfo->dest->free_in_buffer = entropy->free_in_buffer;
+
+  /* Update restart-interval state too */
+  if (cinfo->restart_interval) {
+    if (entropy->restarts_to_go == 0) {
+      entropy->restarts_to_go = cinfo->restart_interval;
+      entropy->next_restart_num++;
+      entropy->next_restart_num &= 7;
+    }
+    entropy->restarts_to_go--;
+  }
+
+  return TRUE;
+}
+
+
+/*
+ * MCU encoding for AC initial scan (either spectral selection,
+ * or first pass of successive approximation).
+ */
+
+METHODDEF(boolean)
+encode_mcu_AC_first (j_compress_ptr cinfo, JBLOCKROW *MCU_data)
+{
+  j_lossy_c_ptr lossyc = (j_lossy_c_ptr) cinfo->codec;
+  phuff_entropy_ptr entropy = (phuff_entropy_ptr) lossyc->entropy_private;
+  register int temp, temp2;
+  register int nbits;
+  register int r, k;
+  int Se = cinfo->Se;
+  int Al = cinfo->Al;
+  JBLOCKROW block;
+
+  entropy->next_output_byte = cinfo->dest->next_output_byte;
+  entropy->free_in_buffer = cinfo->dest->free_in_buffer;
+
+  /* Emit restart marker if needed */
+  if (cinfo->restart_interval)
+    if (entropy->restarts_to_go == 0)
+      emit_restart(entropy, entropy->next_restart_num);
+
+  /* Encode the MCU data block */
+  block = MCU_data[0];
+
+  /* Encode the AC coefficients per section G.1.2.2, fig. G.3 */
+
+  r = 0;			/* r = run length of zeros */
+
+  for (k = cinfo->Ss; k <= Se; k++) {
+    if ((temp = (*block)[jpeg_natural_order[k]]) == 0) {
+      r++;
+      continue;
+    }
+    /* We must apply the point transform by Al.  For AC coefficients this
+     * is an integer division with rounding towards 0.  To do this portably
+     * in C, we shift after obtaining the absolute value; so the code is
+     * interwoven with finding the abs value (temp) and output bits (temp2).
+     */
+    if (temp < 0) {
+      temp = -temp;		/* temp is abs value of input */
+      temp >>= Al;		/* apply the point transform */
+      /* For a negative coef, want temp2 = bitwise complement of abs(coef) */
+      temp2 = ~temp;
+    } else {
+      temp >>= Al;		/* apply the point transform */
+      temp2 = temp;
+    }
+    /* Watch out for case that nonzero coef is zero after point transform */
+    if (temp == 0) {
+      r++;
+      continue;
+    }
+
+    /* Emit any pending EOBRUN */
+    if (entropy->EOBRUN > 0)
+      emit_eobrun(entropy);
+    /* if run length > 15, must emit special run-length-16 codes (0xF0) */
+    while (r > 15) {
+      emit_symbol(entropy, entropy->ac_tbl_no, 0xF0);
+      r -= 16;
+    }
+
+    /* Find the number of bits needed for the magnitude of the coefficient */
+    nbits = 1;			/* there must be at least one 1 bit */
+    while ((temp >>= 1))
+      nbits++;
+    /* Check for out-of-range coefficient values */
+    if (nbits > MAX_COEF_BITS)
+      ERREXIT(cinfo, JERR_BAD_DCT_COEF);
+
+    /* Count/emit Huffman symbol for run length / number of bits */
+    emit_symbol(entropy, entropy->ac_tbl_no, (r << 4) + nbits);
+
+    /* Emit that number of bits of the value, if positive, */
+    /* or the complement of its magnitude, if negative. */
+    emit_bits(entropy, (unsigned int) temp2, nbits);
+
+    r = 0;			/* reset zero run length */
+  }
+
+  if (r > 0) {			/* If there are trailing zeroes, */
+    entropy->EOBRUN++;		/* count an EOB */
+    if (entropy->EOBRUN == 0x7FFF)
+      emit_eobrun(entropy);	/* force it out to avoid overflow */
+  }
+
+  cinfo->dest->next_output_byte = entropy->next_output_byte;
+  cinfo->dest->free_in_buffer = entropy->free_in_buffer;
+
+  /* Update restart-interval state too */
+  if (cinfo->restart_interval) {
+    if (entropy->restarts_to_go == 0) {
+      entropy->restarts_to_go = cinfo->restart_interval;
+      entropy->next_restart_num++;
+      entropy->next_restart_num &= 7;
+    }
+    entropy->restarts_to_go--;
+  }
+
+  return TRUE;
+}
+
+
+/*
+ * MCU encoding for DC successive approximation refinement scan.
+ * Note: we assume such scans can be multi-component, although the spec
+ * is not very clear on the point.
+ */
+
+METHODDEF(boolean)
+encode_mcu_DC_refine (j_compress_ptr cinfo, JBLOCKROW *MCU_data)
+{
+  j_lossy_c_ptr lossyc = (j_lossy_c_ptr) cinfo->codec;
+  phuff_entropy_ptr entropy = (phuff_entropy_ptr) lossyc->entropy_private;
+  register int temp;
+  int blkn;
+  int Al = cinfo->Al;
+  JBLOCKROW block;
+
+  entropy->next_output_byte = cinfo->dest->next_output_byte;
+  entropy->free_in_buffer = cinfo->dest->free_in_buffer;
+
+  /* Emit restart marker if needed */
+  if (cinfo->restart_interval)
+    if (entropy->restarts_to_go == 0)
+      emit_restart(entropy, entropy->next_restart_num);
+
+  /* Encode the MCU data blocks */
+  for (blkn = 0; blkn < cinfo->data_units_in_MCU; blkn++) {
+    block = MCU_data[blkn];
+
+    /* We simply emit the Al'th bit of the DC coefficient value. */
+    temp = (*block)[0];
+    emit_bits(entropy, (unsigned int) (temp >> Al), 1);
+  }
+
+  cinfo->dest->next_output_byte = entropy->next_output_byte;
+  cinfo->dest->free_in_buffer = entropy->free_in_buffer;
+
+  /* Update restart-interval state too */
+  if (cinfo->restart_interval) {
+    if (entropy->restarts_to_go == 0) {
+      entropy->restarts_to_go = cinfo->restart_interval;
+      entropy->next_restart_num++;
+      entropy->next_restart_num &= 7;
+    }
+    entropy->restarts_to_go--;
+  }
+
+  return TRUE;
+}
+
+
+/*
+ * MCU encoding for AC successive approximation refinement scan.
+ */
+
+METHODDEF(boolean)
+encode_mcu_AC_refine (j_compress_ptr cinfo, JBLOCKROW *MCU_data)
+{
+  j_lossy_c_ptr lossyc = (j_lossy_c_ptr) cinfo->codec;
+  phuff_entropy_ptr entropy = (phuff_entropy_ptr) lossyc->entropy_private;
+  register int temp;
+  register int r, k;
+  int EOB;
+  char *BR_buffer;
+  unsigned int BR;
+  int Se = cinfo->Se;
+  int Al = cinfo->Al;
+  JBLOCKROW block;
+  int absvalues[DCTSIZE2];
+
+  entropy->next_output_byte = cinfo->dest->next_output_byte;
+  entropy->free_in_buffer = cinfo->dest->free_in_buffer;
+
+  /* Emit restart marker if needed */
+  if (cinfo->restart_interval)
+    if (entropy->restarts_to_go == 0)
+      emit_restart(entropy, entropy->next_restart_num);
+
+  /* Encode the MCU data block */
+  block = MCU_data[0];
+
+  /* It is convenient to make a pre-pass to determine the transformed
+   * coefficients' absolute values and the EOB position.
+   */
+  EOB = 0;
+  for (k = cinfo->Ss; k <= Se; k++) {
+    temp = (*block)[jpeg_natural_order[k]];
+    /* We must apply the point transform by Al.  For AC coefficients this
+     * is an integer division with rounding towards 0.  To do this portably
+     * in C, we shift after obtaining the absolute value.
+     */
+    if (temp < 0)
+      temp = -temp;		/* temp is abs value of input */
+    temp >>= Al;		/* apply the point transform */
+    absvalues[k] = temp;	/* save abs value for main pass */
+    if (temp == 1)
+      EOB = k;			/* EOB = index of last newly-nonzero coef */
+  }
+
+  /* Encode the AC coefficients per section G.1.2.3, fig. G.7 */
+
+  r = 0;			/* r = run length of zeros */
+  BR = 0;			/* BR = count of buffered bits added now */
+  BR_buffer = entropy->bit_buffer + entropy->BE; /* Append bits to buffer */
+
+  for (k = cinfo->Ss; k <= Se; k++) {
+    if ((temp = absvalues[k]) == 0) {
+      r++;
+      continue;
+    }
+
+    /* Emit any required ZRLs, but not if they can be folded into EOB */
+    while (r > 15 && k <= EOB) {
+      /* emit any pending EOBRUN and the BE correction bits */
+      emit_eobrun(entropy);
+      /* Emit ZRL */
+      emit_symbol(entropy, entropy->ac_tbl_no, 0xF0);
+      r -= 16;
+      /* Emit buffered correction bits that must be associated with ZRL */
+      emit_buffered_bits(entropy, BR_buffer, BR);
+      BR_buffer = entropy->bit_buffer; /* BE bits are gone now */
+      BR = 0;
+    }
+
+    /* If the coef was previously nonzero, it only needs a correction bit.
+     * NOTE: a straight translation of the spec's figure G.7 would suggest
+     * that we also need to test r > 15.  But if r > 15, we can only get here
+     * if k > EOB, which implies that this coefficient is not 1.
+     */
+    if (temp > 1) {
+      /* The correction bit is the next bit of the absolute value. */
+      BR_buffer[BR++] = (char) (temp & 1);
+      continue;
+    }
+
+    /* Emit any pending EOBRUN and the BE correction bits */
+    emit_eobrun(entropy);
+
+    /* Count/emit Huffman symbol for run length / number of bits */
+    emit_symbol(entropy, entropy->ac_tbl_no, (r << 4) + 1);
+
+    /* Emit output bit for newly-nonzero coef */
+    temp = ((*block)[jpeg_natural_order[k]] < 0) ? 0 : 1;
+    emit_bits(entropy, (unsigned int) temp, 1);
+
+    /* Emit buffered correction bits that must be associated with this code */
+    emit_buffered_bits(entropy, BR_buffer, BR);
+    BR_buffer = entropy->bit_buffer; /* BE bits are gone now */
+    BR = 0;
+    r = 0;			/* reset zero run length */
+  }
+
+  if (r > 0 || BR > 0) {	/* If there are trailing zeroes, */
+    entropy->EOBRUN++;		/* count an EOB */
+    entropy->BE += BR;		/* concat my correction bits to older ones */
+    /* We force out the EOB if we risk either:
+     * 1. overflow of the EOB counter;
+     * 2. overflow of the correction bit buffer during the next MCU.
+     */
+    if (entropy->EOBRUN == 0x7FFF || entropy->BE > (MAX_CORR_BITS-DCTSIZE2+1))
+      emit_eobrun(entropy);
+  }
+
+  cinfo->dest->next_output_byte = entropy->next_output_byte;
+  cinfo->dest->free_in_buffer = entropy->free_in_buffer;
+
+  /* Update restart-interval state too */
+  if (cinfo->restart_interval) {
+    if (entropy->restarts_to_go == 0) {
+      entropy->restarts_to_go = cinfo->restart_interval;
+      entropy->next_restart_num++;
+      entropy->next_restart_num &= 7;
+    }
+    entropy->restarts_to_go--;
+  }
+
+  return TRUE;
+}
+
+
+/*
+ * Finish up at the end of a Huffman-compressed progressive scan.
+ */
+
+METHODDEF(void)
+finish_pass_phuff (j_compress_ptr cinfo)
+{
+  j_lossy_c_ptr lossyc = (j_lossy_c_ptr) cinfo->codec;
+  phuff_entropy_ptr entropy = (phuff_entropy_ptr) lossyc->entropy_private;
+
+  entropy->next_output_byte = cinfo->dest->next_output_byte;
+  entropy->free_in_buffer = cinfo->dest->free_in_buffer;
+
+  /* Flush out any buffered data */
+  emit_eobrun(entropy);
+  flush_bits(entropy);
+
+  cinfo->dest->next_output_byte = entropy->next_output_byte;
+  cinfo->dest->free_in_buffer = entropy->free_in_buffer;
+}
+
+
+/*
+ * Finish up a statistics-gathering pass and create the new Huffman tables.
+ */
+
+METHODDEF(void)
+finish_pass_gather_phuff (j_compress_ptr cinfo)
+{
+  j_lossy_c_ptr lossyc = (j_lossy_c_ptr) cinfo->codec;
+  phuff_entropy_ptr entropy = (phuff_entropy_ptr) lossyc->entropy_private;
+  boolean is_DC_band;
+  int ci, tbl;
+  jpeg_component_info * compptr;
+  JHUFF_TBL **htblptr;
+  boolean did[NUM_HUFF_TBLS];
+
+  /* Flush out buffered data (all we care about is counting the EOB symbol) */
+  emit_eobrun(entropy);
+
+  is_DC_band = (cinfo->Ss == 0);
+
+  /* It's important not to apply jpeg_gen_optimal_table more than once
+   * per table, because it clobbers the input frequency counts!
+   */
+  MEMZERO(did, SIZEOF(did));
+
+  for (ci = 0; ci < cinfo->comps_in_scan; ci++) {
+    compptr = cinfo->cur_comp_info[ci];
+    if (is_DC_band) {
+      if (cinfo->Ah != 0)	/* DC refinement needs no table */
+	continue;
+      tbl = compptr->dc_tbl_no;
+    } else {
+      tbl = compptr->ac_tbl_no;
+    }
+    if (! did[tbl]) {
+      if (is_DC_band)
+        htblptr = & cinfo->dc_huff_tbl_ptrs[tbl];
+      else
+        htblptr = & cinfo->ac_huff_tbl_ptrs[tbl];
+      if (*htblptr == NULL)
+        *htblptr = jpeg_alloc_huff_table((j_common_ptr) cinfo);
+      jpeg_gen_optimal_table(cinfo, *htblptr, entropy->count_ptrs[tbl]);
+      did[tbl] = TRUE;
+    }
+  }
+}
+
+
+METHODDEF(boolean)
+need_optimization_pass (j_compress_ptr cinfo)
+{
+  return (cinfo->Ss != 0 || cinfo->Ah == 0);
+}
+
+
+/*
+ * Module initialization routine for progressive Huffman entropy encoding.
+ */
+
+GLOBAL(void)
+jinit_phuff_encoder (j_compress_ptr cinfo)
+{
+  j_lossy_c_ptr lossyc = (j_lossy_c_ptr) cinfo->codec;
+  phuff_entropy_ptr entropy;
+  int i;
+
+  entropy = (phuff_entropy_ptr)
+    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+				SIZEOF(phuff_entropy_encoder));
+  lossyc->entropy_private = (struct jpeg_entropy_encoder *) entropy;
+  lossyc->pub.entropy_start_pass = start_pass_phuff;
+  lossyc->pub.need_optimization_pass = need_optimization_pass;
+
+  /* Mark tables unallocated */
+  for (i = 0; i < NUM_HUFF_TBLS; i++) {
+    entropy->derived_tbls[i] = NULL;
+    entropy->count_ptrs[i] = NULL;
+  }
+  entropy->bit_buffer = NULL;	/* needed only in AC refinement scan */
+}
+
+#endif /* C_PROGRESSIVE_SUPPORTED */
diff --git a/uppsrc/plugin/jpg/lib/jcpred.c b/uppsrc/plugin/jpg/lib/jcpred.c
new file mode 100644
index 000000000..b1a18ea61
--- /dev/null
+++ b/uppsrc/plugin/jpg/lib/jcpred.c
@@ -0,0 +1,296 @@
+/*
+ * jcpred.c
+ *
+ * Copyright (C) 1998, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains sample differencing for lossless JPEG.
+ *
+ * In order to avoid paying the performance penalty of having to check the
+ * predictor being used and the row being processed for each call of the
+ * undifferencer, and to promote optimization, we have separate differencing
+ * functions for each case.
+ *
+ * We are able to avoid duplicating source code by implementing the predictors
+ * and differencers as macros.  Each of the differencing functions are
+ * simply wrappers around a DIFFERENCE macro with the appropriate PREDICTOR
+ * macro passed as an argument.
+ */
+
+#define JPEG_INTERNALS
+#include "jinclude.h"
+#include "jpeglib.h"
+#include "jlossls.h"		/* Private declarations for lossless codec */
+
+
+#ifdef C_LOSSLESS_SUPPORTED
+
+/* Private predictor object */
+
+typedef struct {
+  /* MCU-rows left in the restart interval for each component */
+  unsigned int restart_rows_to_go[MAX_COMPONENTS];
+} c_predictor;
+
+typedef c_predictor * c_pred_ptr;
+
+/* Forward declarations */
+LOCAL(void) reset_predictor
+	JPP((j_compress_ptr cinfo, int ci));
+METHODDEF(void) start_pass
+	JPP((j_compress_ptr cinfo));
+
+
+/* Predictor for the first column of the first row: 2^(P-Pt-1) */
+#define INITIAL_PREDICTORx	(1 << (cinfo->data_precision - cinfo->Al - 1))
+
+/* Predictor for the first column of the remaining rows: Rb */
+#define INITIAL_PREDICTOR2	GETJSAMPLE(prev_row[0])
+
+
+/*
+ * 1-Dimensional differencer routine.
+ *
+ * This macro implements the 1-D horizontal predictor (1).  INITIAL_PREDICTOR
+ * is used as the special case predictor for the first column, which must be
+ * either INITIAL_PREDICTOR2 or INITIAL_PREDICTORx.  The remaining samples
+ * use PREDICTOR1.
+ */
+
+#define DIFFERENCE_1D(INITIAL_PREDICTOR) \
+	j_lossless_c_ptr losslsc = (j_lossless_c_ptr) cinfo->codec; \
+	c_pred_ptr pred = (c_pred_ptr) losslsc->pred_private; \
+	boolean restart = FALSE; \
+	unsigned xindex; \
+	int samp, Ra; \
+ \
+	samp = GETJSAMPLE(input_buf[0]); \
+	diff_buf[0] = samp - INITIAL_PREDICTOR; \
+ \
+	for (xindex = 1; xindex < width; xindex++) { \
+	  Ra = samp; \
+	  samp = GETJSAMPLE(input_buf[xindex]); \
+	  diff_buf[xindex] = samp - PREDICTOR1; \
+	} \
+ \
+	/* Account for restart interval (no-op if not using restarts) */ \
+	if (cinfo->restart_interval) { \
+	  if (--(pred->restart_rows_to_go[ci]) == 0) { \
+	    reset_predictor(cinfo, ci); \
+	    restart = TRUE; \
+	  } \
+	}
+
+
+/*
+ * 2-Dimensional differencer routine.
+ *
+ * This macro implements the 2-D horizontal predictors (#2-7).  PREDICTOR2 is
+ * used as the special case predictor for the first column.  The remaining
+ * samples use PREDICTOR, which is a function of Ra, Rb, Rc.
+ *
+ * Because prev_row and output_buf may point to the same storage area (in an
+ * interleaved image with Vi=1, for example), we must take care to buffer Rb/Rc
+ * before writing the current reconstructed sample value into output_buf.
+ */
+
+#define DIFFERENCE_2D(PREDICTOR) \
+	j_lossless_c_ptr losslsc = (j_lossless_c_ptr) cinfo->codec; \
+	c_pred_ptr pred = (c_pred_ptr) losslsc->pred_private; \
+	unsigned xindex; \
+	int samp, Ra, Rb, Rc; \
+ \
+	Rb = GETJSAMPLE(prev_row[0]); \
+	samp = GETJSAMPLE(input_buf[0]); \
+	diff_buf[0] = samp - PREDICTOR2; \
+ \
+	for (xindex = 1; xindex < width; xindex++) { \
+	  Rc = Rb; \
+	  Rb = GETJSAMPLE(prev_row[xindex]); \
+	  Ra = samp; \
+	  samp = GETJSAMPLE(input_buf[xindex]); \
+	  diff_buf[xindex] = samp - PREDICTOR; \
+	} \
+ \
+	/* Account for restart interval (no-op if not using restarts) */ \
+	if (cinfo->restart_interval) { \
+	  if (--pred->restart_rows_to_go[ci] == 0) \
+	    reset_predictor(cinfo, ci); \
+	}
+
+
+/*
+ * Differencers for the all rows but the first in a scan or restart interval.
+ * The first sample in the row is differenced using the vertical
+ * predictor (2).  The rest of the samples are differenced using the
+ * predictor specified in the scan header.
+ */
+
+METHODDEF(void)
+jpeg_difference1(j_compress_ptr cinfo, int ci,
+		 JSAMPROW input_buf, JSAMPROW prev_row,
+		 JDIFFROW diff_buf, JDIMENSION width)
+{
+  DIFFERENCE_1D(INITIAL_PREDICTOR2);
+}
+
+METHODDEF(void)
+jpeg_difference2(j_compress_ptr cinfo, int ci,
+		 JSAMPROW input_buf, JSAMPROW prev_row,
+		 JDIFFROW diff_buf, JDIMENSION width)
+{
+  DIFFERENCE_2D(PREDICTOR2);
+}
+
+METHODDEF(void)
+jpeg_difference3(j_compress_ptr cinfo, int ci,
+		 JSAMPROW input_buf, JSAMPROW prev_row,
+		 JDIFFROW diff_buf, JDIMENSION width)
+{
+  DIFFERENCE_2D(PREDICTOR3);
+}
+
+METHODDEF(void)
+jpeg_difference4(j_compress_ptr cinfo, int ci,
+		 JSAMPROW input_buf, JSAMPROW prev_row,
+		 JDIFFROW diff_buf, JDIMENSION width)
+{
+  DIFFERENCE_2D(PREDICTOR4);
+}
+
+METHODDEF(void)
+jpeg_difference5(j_compress_ptr cinfo, int ci,
+		 JSAMPROW input_buf, JSAMPROW prev_row,
+		 JDIFFROW diff_buf, JDIMENSION width)
+{
+  DIFFERENCE_2D(PREDICTOR5);
+}
+
+METHODDEF(void)
+jpeg_difference6(j_compress_ptr cinfo, int ci,
+		 JSAMPROW input_buf, JSAMPROW prev_row,
+		 JDIFFROW diff_buf, JDIMENSION width)
+{
+  DIFFERENCE_2D(PREDICTOR6);
+}
+
+METHODDEF(void)
+jpeg_difference7(j_compress_ptr cinfo, int ci,
+		 JSAMPROW input_buf, JSAMPROW prev_row,
+		 JDIFFROW diff_buf, JDIMENSION width)
+{
+  DIFFERENCE_2D(PREDICTOR7);
+}
+
+
+/*
+ * Differencer for the first row in a scan or restart interval.  The first
+ * sample in the row is differenced using the special predictor constant
+ * x=2^(P-Pt-1).  The rest of the samples are differenced using the
+ * 1-D horizontal predictor (1).
+ */
+
+METHODDEF(void)
+jpeg_difference_first_row(j_compress_ptr cinfo, int ci,
+		 JSAMPROW input_buf, JSAMPROW prev_row,
+		 JDIFFROW diff_buf, JDIMENSION width)
+{
+  DIFFERENCE_1D(INITIAL_PREDICTORx);
+
+  /*
+   * Now that we have differenced the first row, we want to use the
+   * differencer which corresponds to the predictor specified in the
+   * scan header.
+   *
+   * Note that we don't to do this if we have just reset the predictor
+   * for a new restart interval.
+   */
+  if (!restart) {
+    switch (cinfo->Ss) {
+    case 1:
+      losslsc->predict_difference[ci] = jpeg_difference1;
+      break;
+    case 2:
+      losslsc->predict_difference[ci] = jpeg_difference2;
+      break;
+    case 3:
+      losslsc->predict_difference[ci] = jpeg_difference3;
+      break;
+    case 4:
+      losslsc->predict_difference[ci] = jpeg_difference4;
+      break;
+    case 5:
+      losslsc->predict_difference[ci] = jpeg_difference5;
+      break;
+    case 6:
+      losslsc->predict_difference[ci] = jpeg_difference6;
+      break;
+    case 7:
+      losslsc->predict_difference[ci] = jpeg_difference7;
+      break;
+    }
+  }
+}
+
+/*
+ * Reset predictor at the start of a pass or restart interval.
+ */
+
+LOCAL(void)
+reset_predictor (j_compress_ptr cinfo, int ci)
+{
+  j_lossless_c_ptr losslsc = (j_lossless_c_ptr) cinfo->codec;
+  c_pred_ptr pred = (c_pred_ptr) losslsc->pred_private;
+
+  /* Initialize restart counter */
+  pred->restart_rows_to_go[ci] =
+    cinfo->restart_interval / cinfo->MCUs_per_row;
+
+  /* Set difference function to first row function */
+  losslsc->predict_difference[ci] = jpeg_difference_first_row;
+}
+
+
+/*
+ * Initialize for an input processing pass.
+ */
+
+METHODDEF(void)
+start_pass (j_compress_ptr cinfo)
+{
+  j_lossless_c_ptr losslsc = (j_lossless_c_ptr) cinfo->codec;
+  c_pred_ptr pred = (c_pred_ptr) losslsc->pred_private;
+  int ci;
+
+  /* Check that the restart interval is an integer multiple of the number
+   * of MCU in an MCU-row.
+   */
+  if (cinfo->restart_interval % cinfo->MCUs_per_row != 0)
+    ERREXIT2(cinfo, JERR_BAD_RESTART,
+	     cinfo->restart_interval, cinfo->MCUs_per_row);
+
+  /* Set predictors for start of pass */
+  for (ci = 0; ci < cinfo->num_components; ci++)
+    reset_predictor(cinfo, ci);
+}
+
+
+/*
+ * Module initialization routine for the differencer.
+ */
+
+GLOBAL(void)
+jinit_differencer (j_compress_ptr cinfo)
+{
+  j_lossless_c_ptr losslsc = (j_lossless_c_ptr) cinfo->codec;
+  c_pred_ptr pred;
+
+  pred = (c_pred_ptr)
+    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+				SIZEOF(c_predictor));
+  losslsc->pred_private = (void *) pred;
+  losslsc->predict_start_pass = start_pass;
+}
+
+#endif /* C_LOSSLESS_SUPPORTED */
diff --git a/uppsrc/plugin/jpg/lib/jcprepct.c b/uppsrc/plugin/jpg/lib/jcprepct.c
new file mode 100644
index 000000000..c3bb32843
--- /dev/null
+++ b/uppsrc/plugin/jpg/lib/jcprepct.c
@@ -0,0 +1,354 @@
+/*
+ * jcprepct.c
+ *
+ * Copyright (C) 1994-1998, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains the compression preprocessing controller.
+ * This controller manages the color conversion, downsampling,
+ * and edge expansion steps.
+ *
+ * Most of the complexity here is associated with buffering input rows
+ * as required by the downsampler.  See the comments at the head of
+ * jcsample.c for the downsampler's needs.
+ */
+
+#define JPEG_INTERNALS
+#include "jinclude.h"
+#include "jpeglib.h"
+
+
+/* At present, jcsample.c can request context rows only for smoothing.
+ * In the future, we might also need context rows for CCIR601 sampling
+ * or other more-complex downsampling procedures.  The code to support
+ * context rows should be compiled only if needed.
+ */
+#ifdef INPUT_SMOOTHING_SUPPORTED
+#define CONTEXT_ROWS_SUPPORTED
+#endif
+
+
+/*
+ * For the simple (no-context-row) case, we just need to buffer one
+ * row group's worth of pixels for the downsampling step.  At the bottom of
+ * the image, we pad to a full row group by replicating the last pixel row.
+ * The downsampler's last output row is then replicated if needed to pad
+ * out to a full iMCU row.
+ *
+ * When providing context rows, we must buffer three row groups' worth of
+ * pixels.  Three row groups are physically allocated, but the row pointer
+ * arrays are made five row groups high, with the extra pointers above and
+ * below "wrapping around" to point to the last and first real row groups.
+ * This allows the downsampler to access the proper context rows.
+ * At the top and bottom of the image, we create dummy context rows by
+ * copying the first or last real pixel row.  This copying could be avoided
+ * by pointer hacking as is done in jdmainct.c, but it doesn't seem worth the
+ * trouble on the compression side.
+ */
+
+
+/* Private buffer controller object */
+
+typedef struct {
+  struct jpeg_c_prep_controller pub; /* public fields */
+
+  /* Downsampling input buffer.  This buffer holds color-converted data
+   * until we have enough to do a downsample step.
+   */
+  JSAMPARRAY color_buf[MAX_COMPONENTS];
+
+  JDIMENSION rows_to_go;	/* counts rows remaining in source image */
+  int next_buf_row;		/* index of next row to store in color_buf */
+
+#ifdef CONTEXT_ROWS_SUPPORTED	/* only needed for context case */
+  int this_row_group;		/* starting row index of group to process */
+  int next_buf_stop;		/* downsample when we reach this index */
+#endif
+} my_prep_controller;
+
+typedef my_prep_controller * my_prep_ptr;
+
+
+/*
+ * Initialize for a processing pass.
+ */
+
+METHODDEF(void)
+start_pass_prep (j_compress_ptr cinfo, J_BUF_MODE pass_mode)
+{
+  my_prep_ptr prep = (my_prep_ptr) cinfo->prep;
+
+  if (pass_mode != JBUF_PASS_THRU)
+    ERREXIT(cinfo, JERR_BAD_BUFFER_MODE);
+
+  /* Initialize total-height counter for detecting bottom of image */
+  prep->rows_to_go = cinfo->image_height;
+  /* Mark the conversion buffer empty */
+  prep->next_buf_row = 0;
+#ifdef CONTEXT_ROWS_SUPPORTED
+  /* Preset additional state variables for context mode.
+   * These aren't used in non-context mode, so we needn't test which mode.
+   */
+  prep->this_row_group = 0;
+  /* Set next_buf_stop to stop after two row groups have been read in. */
+  prep->next_buf_stop = 2 * cinfo->max_v_samp_factor;
+#endif
+}
+
+
+/*
+ * Expand an image vertically from height input_rows to height output_rows,
+ * by duplicating the bottom row.
+ */
+
+LOCAL(void)
+expand_bottom_edge (JSAMPARRAY image_data, JDIMENSION num_cols,
+		    int input_rows, int output_rows)
+{
+  register int row;
+
+  for (row = input_rows; row < output_rows; row++) {
+    jcopy_sample_rows(image_data, input_rows-1, image_data, row,
+		      1, num_cols);
+  }
+}
+
+
+/*
+ * Process some data in the simple no-context case.
+ *
+ * Preprocessor output data is counted in "row groups".  A row group
+ * is defined to be v_samp_factor sample rows of each component.
+ * Downsampling will produce this much data from each max_v_samp_factor
+ * input rows.
+ */
+
+METHODDEF(void)
+pre_process_data (j_compress_ptr cinfo,
+		  JSAMPARRAY input_buf, JDIMENSION *in_row_ctr,
+		  JDIMENSION in_rows_avail,
+		  JSAMPIMAGE output_buf, JDIMENSION *out_row_group_ctr,
+		  JDIMENSION out_row_groups_avail)
+{
+  my_prep_ptr prep = (my_prep_ptr) cinfo->prep;
+  int numrows, ci;
+  JDIMENSION inrows;
+  jpeg_component_info * compptr;
+
+  while (*in_row_ctr < in_rows_avail &&
+	 *out_row_group_ctr < out_row_groups_avail) {
+    /* Do color conversion to fill the conversion buffer. */
+    inrows = in_rows_avail - *in_row_ctr;
+    numrows = cinfo->max_v_samp_factor - prep->next_buf_row;
+    numrows = (int) MIN((JDIMENSION) numrows, inrows);
+    (*cinfo->cconvert->color_convert) (cinfo, input_buf + *in_row_ctr,
+				       prep->color_buf,
+				       (JDIMENSION) prep->next_buf_row,
+				       numrows);
+    *in_row_ctr += numrows;
+    prep->next_buf_row += numrows;
+    prep->rows_to_go -= numrows;
+    /* If at bottom of image, pad to fill the conversion buffer. */
+    if (prep->rows_to_go == 0 &&
+	prep->next_buf_row < cinfo->max_v_samp_factor) {
+      for (ci = 0; ci < cinfo->num_components; ci++) {
+	expand_bottom_edge(prep->color_buf[ci], cinfo->image_width,
+			   prep->next_buf_row, cinfo->max_v_samp_factor);
+      }
+      prep->next_buf_row = cinfo->max_v_samp_factor;
+    }
+    /* If we've filled the conversion buffer, empty it. */
+    if (prep->next_buf_row == cinfo->max_v_samp_factor) {
+      (*cinfo->downsample->downsample) (cinfo,
+					prep->color_buf, (JDIMENSION) 0,
+					output_buf, *out_row_group_ctr);
+      prep->next_buf_row = 0;
+      (*out_row_group_ctr)++;
+    }
+    /* If at bottom of image, pad the output to a full iMCU height.
+     * Note we assume the caller is providing a one-iMCU-height output buffer!
+     */
+    if (prep->rows_to_go == 0 &&
+	*out_row_group_ctr < out_row_groups_avail) {
+      for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
+	   ci++, compptr++) {
+	expand_bottom_edge(output_buf[ci],
+			   compptr->width_in_data_units * cinfo->data_unit,
+			   (int) (*out_row_group_ctr * compptr->v_samp_factor),
+			   (int) (out_row_groups_avail * compptr->v_samp_factor));
+      }
+      *out_row_group_ctr = out_row_groups_avail;
+      break;			/* can exit outer loop without test */
+    }
+  }
+}
+
+
+#ifdef CONTEXT_ROWS_SUPPORTED
+
+/*
+ * Process some data in the context case.
+ */
+
+METHODDEF(void)
+pre_process_context (j_compress_ptr cinfo,
+		     JSAMPARRAY input_buf, JDIMENSION *in_row_ctr,
+		     JDIMENSION in_rows_avail,
+		     JSAMPIMAGE output_buf, JDIMENSION *out_row_group_ctr,
+		     JDIMENSION out_row_groups_avail)
+{
+  my_prep_ptr prep = (my_prep_ptr) cinfo->prep;
+  int numrows, ci;
+  int buf_height = cinfo->max_v_samp_factor * 3;
+  JDIMENSION inrows;
+
+  while (*out_row_group_ctr < out_row_groups_avail) {
+    if (*in_row_ctr < in_rows_avail) {
+      /* Do color conversion to fill the conversion buffer. */
+      inrows = in_rows_avail - *in_row_ctr;
+      numrows = prep->next_buf_stop - prep->next_buf_row;
+      numrows = (int) MIN((JDIMENSION) numrows, inrows);
+      (*cinfo->cconvert->color_convert) (cinfo, input_buf + *in_row_ctr,
+					 prep->color_buf,
+					 (JDIMENSION) prep->next_buf_row,
+					 numrows);
+      /* Pad at top of image, if first time through */
+      if (prep->rows_to_go == cinfo->image_height) {
+	for (ci = 0; ci < cinfo->num_components; ci++) {
+	  int row;
+	  for (row = 1; row <= cinfo->max_v_samp_factor; row++) {
+	    jcopy_sample_rows(prep->color_buf[ci], 0,
+			      prep->color_buf[ci], -row,
+			      1, cinfo->image_width);
+	  }
+	}
+      }
+      *in_row_ctr += numrows;
+      prep->next_buf_row += numrows;
+      prep->rows_to_go -= numrows;
+    } else {
+      /* Return for more data, unless we are at the bottom of the image. */
+      if (prep->rows_to_go != 0)
+	break;
+      /* When at bottom of image, pad to fill the conversion buffer. */
+      if (prep->next_buf_row < prep->next_buf_stop) {
+	for (ci = 0; ci < cinfo->num_components; ci++) {
+	  expand_bottom_edge(prep->color_buf[ci], cinfo->image_width,
+			     prep->next_buf_row, prep->next_buf_stop);
+	}
+	prep->next_buf_row = prep->next_buf_stop;
+      }
+    }
+    /* If we've gotten enough data, downsample a row group. */
+    if (prep->next_buf_row == prep->next_buf_stop) {
+      (*cinfo->downsample->downsample) (cinfo,
+					prep->color_buf,
+					(JDIMENSION) prep->this_row_group,
+					output_buf, *out_row_group_ctr);
+      (*out_row_group_ctr)++;
+      /* Advance pointers with wraparound as necessary. */
+      prep->this_row_group += cinfo->max_v_samp_factor;
+      if (prep->this_row_group >= buf_height)
+	prep->this_row_group = 0;
+      if (prep->next_buf_row >= buf_height)
+	prep->next_buf_row = 0;
+      prep->next_buf_stop = prep->next_buf_row + cinfo->max_v_samp_factor;
+    }
+  }
+}
+
+
+/*
+ * Create the wrapped-around downsampling input buffer needed for context mode.
+ */
+
+LOCAL(void)
+create_context_buffer (j_compress_ptr cinfo)
+{
+  my_prep_ptr prep = (my_prep_ptr) cinfo->prep;
+  int rgroup_height = cinfo->max_v_samp_factor;
+  int ci, i;
+  jpeg_component_info * compptr;
+  JSAMPARRAY true_buffer, fake_buffer;
+
+  /* Grab enough space for fake row pointers for all the components;
+   * we need five row groups' worth of pointers for each component.
+   */
+  fake_buffer = (JSAMPARRAY)
+    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+				(cinfo->num_components * 5 * rgroup_height) *
+				SIZEOF(JSAMPROW));
+
+  for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
+       ci++, compptr++) {
+    /* Allocate the actual buffer space (3 row groups) for this component.
+     * We make the buffer wide enough to allow the downsampler to edge-expand
+     * horizontally within the buffer, if it so chooses.
+     */
+    true_buffer = (*cinfo->mem->alloc_sarray)
+      ((j_common_ptr) cinfo, JPOOL_IMAGE,
+       (JDIMENSION) (((long) compptr->width_in_data_units * cinfo->data_unit *
+		      cinfo->max_h_samp_factor) / compptr->h_samp_factor),
+       (JDIMENSION) (3 * rgroup_height));
+    /* Copy true buffer row pointers into the middle of the fake row array */
+    MEMCOPY(fake_buffer + rgroup_height, true_buffer,
+	    3 * rgroup_height * SIZEOF(JSAMPROW));
+    /* Fill in the above and below wraparound pointers */
+    for (i = 0; i < rgroup_height; i++) {
+      fake_buffer[i] = true_buffer[2 * rgroup_height + i];
+      fake_buffer[4 * rgroup_height + i] = true_buffer[i];
+    }
+    prep->color_buf[ci] = fake_buffer + rgroup_height;
+    fake_buffer += 5 * rgroup_height; /* point to space for next component */
+  }
+}
+
+#endif /* CONTEXT_ROWS_SUPPORTED */
+
+
+/*
+ * Initialize preprocessing controller.
+ */
+
+GLOBAL(void)
+jinit_c_prep_controller (j_compress_ptr cinfo, boolean need_full_buffer)
+{
+  my_prep_ptr prep;
+  int ci;
+  jpeg_component_info * compptr;
+
+  if (need_full_buffer)		/* safety check */
+    ERREXIT(cinfo, JERR_BAD_BUFFER_MODE);
+
+  prep = (my_prep_ptr)
+    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+				SIZEOF(my_prep_controller));
+  cinfo->prep = (struct jpeg_c_prep_controller *) prep;
+  prep->pub.start_pass = start_pass_prep;
+
+  /* Allocate the color conversion buffer.
+   * We make the buffer wide enough to allow the downsampler to edge-expand
+   * horizontally within the buffer, if it so chooses.
+   */
+  if (cinfo->downsample->need_context_rows) {
+    /* Set up to provide context rows */
+#ifdef CONTEXT_ROWS_SUPPORTED
+    prep->pub.pre_process_data = pre_process_context;
+    create_context_buffer(cinfo);
+#else
+    ERREXIT(cinfo, JERR_NOT_COMPILED);
+#endif
+  } else {
+    /* No context, just make it tall enough for one row group */
+    prep->pub.pre_process_data = pre_process_data;
+    for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
+	 ci++, compptr++) {
+      prep->color_buf[ci] = (*cinfo->mem->alloc_sarray)
+	((j_common_ptr) cinfo, JPOOL_IMAGE,
+	 (JDIMENSION) (((long) compptr->width_in_data_units * cinfo->data_unit *
+			cinfo->max_h_samp_factor) / compptr->h_samp_factor),
+	 (JDIMENSION) cinfo->max_v_samp_factor);
+    }
+  }
+}
diff --git a/uppsrc/plugin/jpg/lib/jcsample.c b/uppsrc/plugin/jpg/lib/jcsample.c
new file mode 100644
index 000000000..e3a4e58c8
--- /dev/null
+++ b/uppsrc/plugin/jpg/lib/jcsample.c
@@ -0,0 +1,519 @@
+/*
+ * jcsample.c
+ *
+ * Copyright (C) 1991-1998, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains downsampling routines.
+ *
+ * Downsampling input data is counted in "row groups".  A row group
+ * is defined to be max_v_samp_factor pixel rows of each component,
+ * from which the downsampler produces v_samp_factor sample rows.
+ * A single row group is processed in each call to the downsampler module.
+ *
+ * The downsampler is responsible for edge-expansion of its output data
+ * to fill an integral number of DCT blocks horizontally.  The source buffer
+ * may be modified if it is helpful for this purpose (the source buffer is
+ * allocated wide enough to correspond to the desired output width).
+ * The caller (the prep controller) is responsible for vertical padding.
+ *
+ * The downsampler may request "context rows" by setting need_context_rows
+ * during startup.  In this case, the input arrays will contain at least
+ * one row group's worth of pixels above and below the passed-in data;
+ * the caller will create dummy rows at image top and bottom by replicating
+ * the first or last real pixel row.
+ *
+ * An excellent reference for image resampling is
+ *   Digital Image Warping, George Wolberg, 1990.
+ *   Pub. by IEEE Computer Society Press, Los Alamitos, CA. ISBN 0-8186-8944-7.
+ *
+ * The downsampling algorithm used here is a simple average of the source
+ * pixels covered by the output pixel.  The hi-falutin sampling literature
+ * refers to this as a "box filter".  In general the characteristics of a box
+ * filter are not very good, but for the specific cases we normally use (1:1
+ * and 2:1 ratios) the box is equivalent to a "triangle filter" which is not
+ * nearly so bad.  If you intend to use other sampling ratios, you'd be well
+ * advised to improve this code.
+ *
+ * A simple input-smoothing capability is provided.  This is mainly intended
+ * for cleaning up color-dithered GIF input files (if you find it inadequate,
+ * we suggest using an external filtering program such as pnmconvol).  When
+ * enabled, each input pixel P is replaced by a weighted sum of itself and its
+ * eight neighbors.  P's weight is 1-8*SF and each neighbor's weight is SF,
+ * where SF = (smoothing_factor / 1024).
+ * Currently, smoothing is only supported for 2h2v sampling factors.
+ */
+
+#define JPEG_INTERNALS
+#include "jinclude.h"
+#include "jpeglib.h"
+
+
+/* Pointer to routine to downsample a single component */
+typedef JMETHOD(void, downsample1_ptr,
+		(j_compress_ptr cinfo, jpeg_component_info * compptr,
+		 JSAMPARRAY input_data, JSAMPARRAY output_data));
+
+/* Private subobject */
+
+typedef struct {
+  struct jpeg_downsampler pub;	/* public fields */
+
+  /* Downsampling method pointers, one per component */
+  downsample1_ptr methods[MAX_COMPONENTS];
+} my_downsampler;
+
+typedef my_downsampler * my_downsample_ptr;
+
+
+/*
+ * Initialize for a downsampling pass.
+ */
+
+METHODDEF(void)
+start_pass_downsample (j_compress_ptr cinfo)
+{
+  /* no work for now */
+}
+
+
+/*
+ * Expand a component horizontally from width input_cols to width output_cols,
+ * by duplicating the rightmost samples.
+ */
+
+LOCAL(void)
+expand_right_edge (JSAMPARRAY image_data, int num_rows,
+		   JDIMENSION input_cols, JDIMENSION output_cols)
+{
+  register JSAMPROW ptr;
+  register JSAMPLE pixval;
+  register int count;
+  int row;
+  int numcols = (int) (output_cols - input_cols);
+
+  if (numcols > 0) {
+    for (row = 0; row < num_rows; row++) {
+      ptr = image_data[row] + input_cols;
+      pixval = ptr[-1];		/* don't need GETJSAMPLE() here */
+      for (count = numcols; count > 0; count--)
+	*ptr++ = pixval;
+    }
+  }
+}
+
+
+/*
+ * Do downsampling for a whole row group (all components).
+ *
+ * In this version we simply downsample each component independently.
+ */
+
+METHODDEF(void)
+sep_downsample (j_compress_ptr cinfo,
+		JSAMPIMAGE input_buf, JDIMENSION in_row_index,
+		JSAMPIMAGE output_buf, JDIMENSION out_row_group_index)
+{
+  my_downsample_ptr downsample = (my_downsample_ptr) cinfo->downsample;
+  int ci;
+  jpeg_component_info * compptr;
+  JSAMPARRAY in_ptr, out_ptr;
+
+  for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
+       ci++, compptr++) {
+    in_ptr = input_buf[ci] + in_row_index;
+    out_ptr = output_buf[ci] + (out_row_group_index * compptr->v_samp_factor);
+    (*downsample->methods[ci]) (cinfo, compptr, in_ptr, out_ptr);
+  }
+}
+
+
+/*
+ * Downsample pixel values of a single component.
+ * One row group is processed per call.
+ * This version handles arbitrary integral sampling ratios, without smoothing.
+ * Note that this version is not actually used for customary sampling ratios.
+ */
+
+METHODDEF(void)
+int_downsample (j_compress_ptr cinfo, jpeg_component_info * compptr,
+		JSAMPARRAY input_data, JSAMPARRAY output_data)
+{
+  int inrow, outrow, h_expand, v_expand, numpix, numpix2, h, v;
+  JDIMENSION outcol, outcol_h;	/* outcol_h == outcol*h_expand */
+  JDIMENSION output_cols = compptr->width_in_data_units * cinfo->data_unit;
+  JSAMPROW inptr, outptr;
+  INT32 outvalue;
+
+  h_expand = cinfo->max_h_samp_factor / compptr->h_samp_factor;
+  v_expand = cinfo->max_v_samp_factor / compptr->v_samp_factor;
+  numpix = h_expand * v_expand;
+  numpix2 = numpix/2;
+
+  /* Expand input data enough to let all the output samples be generated
+   * by the standard loop.  Special-casing padded output would be more
+   * efficient.
+   */
+  expand_right_edge(input_data, cinfo->max_v_samp_factor,
+		    cinfo->image_width, output_cols * h_expand);
+
+  inrow = 0;
+  for (outrow = 0; outrow < compptr->v_samp_factor; outrow++) {
+    outptr = output_data[outrow];
+    for (outcol = 0, outcol_h = 0; outcol < output_cols;
+	 outcol++, outcol_h += h_expand) {
+      outvalue = 0;
+      for (v = 0; v < v_expand; v++) {
+	inptr = input_data[inrow+v] + outcol_h;
+	for (h = 0; h < h_expand; h++) {
+	  outvalue += (INT32) GETJSAMPLE(*inptr++);
+	}
+      }
+      *outptr++ = (JSAMPLE) ((outvalue + numpix2) / numpix);
+    }
+    inrow += v_expand;
+  }
+}
+
+
+/*
+ * Downsample pixel values of a single component.
+ * This version handles the special case of a full-size component,
+ * without smoothing.
+ */
+
+METHODDEF(void)
+fullsize_downsample (j_compress_ptr cinfo, jpeg_component_info * compptr,
+		     JSAMPARRAY input_data, JSAMPARRAY output_data)
+{
+  /* Copy the data */
+  jcopy_sample_rows(input_data, 0, output_data, 0,
+		    cinfo->max_v_samp_factor, cinfo->image_width);
+  /* Edge-expand */
+  expand_right_edge(output_data, cinfo->max_v_samp_factor,
+		    cinfo->image_width, compptr->width_in_data_units * cinfo->data_unit);
+}
+
+
+/*
+ * Downsample pixel values of a single component.
+ * This version handles the common case of 2:1 horizontal and 1:1 vertical,
+ * without smoothing.
+ *
+ * A note about the "bias" calculations: when rounding fractional values to
+ * integer, we do not want to always round 0.5 up to the next integer.
+ * If we did that, we'd introduce a noticeable bias towards larger values.
+ * Instead, this code is arranged so that 0.5 will be rounded up or down at
+ * alternate pixel locations (a simple ordered dither pattern).
+ */
+
+METHODDEF(void)
+h2v1_downsample (j_compress_ptr cinfo, jpeg_component_info * compptr,
+		 JSAMPARRAY input_data, JSAMPARRAY output_data)
+{
+  int outrow;
+  JDIMENSION outcol;
+  JDIMENSION output_cols = compptr->width_in_data_units * cinfo->data_unit;
+  register JSAMPROW inptr, outptr;
+  register int bias;
+
+  /* Expand input data enough to let all the output samples be generated
+   * by the standard loop.  Special-casing padded output would be more
+   * efficient.
+   */
+  expand_right_edge(input_data, cinfo->max_v_samp_factor,
+		    cinfo->image_width, output_cols * 2);
+
+  for (outrow = 0; outrow < compptr->v_samp_factor; outrow++) {
+    outptr = output_data[outrow];
+    inptr = input_data[outrow];
+    bias = 0;			/* bias = 0,1,0,1,... for successive samples */
+    for (outcol = 0; outcol < output_cols; outcol++) {
+      *outptr++ = (JSAMPLE) ((GETJSAMPLE(*inptr) + GETJSAMPLE(inptr[1])
+			      + bias) >> 1);
+      bias ^= 1;		/* 0=>1, 1=>0 */
+      inptr += 2;
+    }
+  }
+}
+
+
+/*
+ * Downsample pixel values of a single component.
+ * This version handles the standard case of 2:1 horizontal and 2:1 vertical,
+ * without smoothing.
+ */
+
+METHODDEF(void)
+h2v2_downsample (j_compress_ptr cinfo, jpeg_component_info * compptr,
+		 JSAMPARRAY input_data, JSAMPARRAY output_data)
+{
+  int inrow, outrow;
+  JDIMENSION outcol;
+  JDIMENSION output_cols = compptr->width_in_data_units * cinfo->data_unit;
+  register JSAMPROW inptr0, inptr1, outptr;
+  register int bias;
+
+  /* Expand input data enough to let all the output samples be generated
+   * by the standard loop.  Special-casing padded output would be more
+   * efficient.
+   */
+  expand_right_edge(input_data, cinfo->max_v_samp_factor,
+		    cinfo->image_width, output_cols * 2);
+
+  inrow = 0;
+  for (outrow = 0; outrow < compptr->v_samp_factor; outrow++) {
+    outptr = output_data[outrow];
+    inptr0 = input_data[inrow];
+    inptr1 = input_data[inrow+1];
+    bias = 1;			/* bias = 1,2,1,2,... for successive samples */
+    for (outcol = 0; outcol < output_cols; outcol++) {
+      *outptr++ = (JSAMPLE) ((GETJSAMPLE(*inptr0) + GETJSAMPLE(inptr0[1]) +
+			      GETJSAMPLE(*inptr1) + GETJSAMPLE(inptr1[1])
+			      + bias) >> 2);
+      bias ^= 3;		/* 1=>2, 2=>1 */
+      inptr0 += 2; inptr1 += 2;
+    }
+    inrow += 2;
+  }
+}
+
+
+#ifdef INPUT_SMOOTHING_SUPPORTED
+
+/*
+ * Downsample pixel values of a single component.
+ * This version handles the standard case of 2:1 horizontal and 2:1 vertical,
+ * with smoothing.  One row of context is required.
+ */
+
+METHODDEF(void)
+h2v2_smooth_downsample (j_compress_ptr cinfo, jpeg_component_info * compptr,
+			JSAMPARRAY input_data, JSAMPARRAY output_data)
+{
+  int inrow, outrow;
+  JDIMENSION colctr;
+  JDIMENSION output_cols = compptr->width_in_data_units * cinfo->data_unit;
+  register JSAMPROW inptr0, inptr1, above_ptr, below_ptr, outptr;
+  INT32 membersum, neighsum, memberscale, neighscale;
+
+  /* Expand input data enough to let all the output samples be generated
+   * by the standard loop.  Special-casing padded output would be more
+   * efficient.
+   */
+  expand_right_edge(input_data - 1, cinfo->max_v_samp_factor + 2,
+		    cinfo->image_width, output_cols * 2);
+
+  /* We don't bother to form the individual "smoothed" input pixel values;
+   * we can directly compute the output which is the average of the four
+   * smoothed values.  Each of the four member pixels contributes a fraction
+   * (1-8*SF) to its own smoothed image and a fraction SF to each of the three
+   * other smoothed pixels, therefore a total fraction (1-5*SF)/4 to the final
+   * output.  The four corner-adjacent neighbor pixels contribute a fraction
+   * SF to just one smoothed pixel, or SF/4 to the final output; while the
+   * eight edge-adjacent neighbors contribute SF to each of two smoothed
+   * pixels, or SF/2 overall.  In order to use integer arithmetic, these
+   * factors are scaled by 2^16 = 65536.
+   * Also recall that SF = smoothing_factor / 1024.
+   */
+
+  memberscale = 16384 - cinfo->smoothing_factor * 80; /* scaled (1-5*SF)/4 */
+  neighscale = cinfo->smoothing_factor * 16; /* scaled SF/4 */
+
+  inrow = 0;
+  for (outrow = 0; outrow < compptr->v_samp_factor; outrow++) {
+    outptr = output_data[outrow];
+    inptr0 = input_data[inrow];
+    inptr1 = input_data[inrow+1];
+    above_ptr = input_data[inrow-1];
+    below_ptr = input_data[inrow+2];
+
+    /* Special case for first column: pretend column -1 is same as column 0 */
+    membersum = GETJSAMPLE(*inptr0) + GETJSAMPLE(inptr0[1]) +
+		GETJSAMPLE(*inptr1) + GETJSAMPLE(inptr1[1]);
+    neighsum = GETJSAMPLE(*above_ptr) + GETJSAMPLE(above_ptr[1]) +
+	       GETJSAMPLE(*below_ptr) + GETJSAMPLE(below_ptr[1]) +
+	       GETJSAMPLE(*inptr0) + GETJSAMPLE(inptr0[2]) +
+	       GETJSAMPLE(*inptr1) + GETJSAMPLE(inptr1[2]);
+    neighsum += neighsum;
+    neighsum += GETJSAMPLE(*above_ptr) + GETJSAMPLE(above_ptr[2]) +
+		GETJSAMPLE(*below_ptr) + GETJSAMPLE(below_ptr[2]);
+    membersum = membersum * memberscale + neighsum * neighscale;
+    *outptr++ = (JSAMPLE) ((membersum + 32768) >> 16);
+    inptr0 += 2; inptr1 += 2; above_ptr += 2; below_ptr += 2;
+
+    for (colctr = output_cols - 2; colctr > 0; colctr--) {
+      /* sum of pixels directly mapped to this output element */
+      membersum = GETJSAMPLE(*inptr0) + GETJSAMPLE(inptr0[1]) +
+		  GETJSAMPLE(*inptr1) + GETJSAMPLE(inptr1[1]);
+      /* sum of edge-neighbor pixels */
+      neighsum = GETJSAMPLE(*above_ptr) + GETJSAMPLE(above_ptr[1]) +
+		 GETJSAMPLE(*below_ptr) + GETJSAMPLE(below_ptr[1]) +
+		 GETJSAMPLE(inptr0[-1]) + GETJSAMPLE(inptr0[2]) +
+		 GETJSAMPLE(inptr1[-1]) + GETJSAMPLE(inptr1[2]);
+      /* The edge-neighbors count twice as much as corner-neighbors */
+      neighsum += neighsum;
+      /* Add in the corner-neighbors */
+      neighsum += GETJSAMPLE(above_ptr[-1]) + GETJSAMPLE(above_ptr[2]) +
+		  GETJSAMPLE(below_ptr[-1]) + GETJSAMPLE(below_ptr[2]);
+      /* form final output scaled up by 2^16 */
+      membersum = membersum * memberscale + neighsum * neighscale;
+      /* round, descale and output it */
+      *outptr++ = (JSAMPLE) ((membersum + 32768) >> 16);
+      inptr0 += 2; inptr1 += 2; above_ptr += 2; below_ptr += 2;
+    }
+
+    /* Special case for last column */
+    membersum = GETJSAMPLE(*inptr0) + GETJSAMPLE(inptr0[1]) +
+		GETJSAMPLE(*inptr1) + GETJSAMPLE(inptr1[1]);
+    neighsum = GETJSAMPLE(*above_ptr) + GETJSAMPLE(above_ptr[1]) +
+	       GETJSAMPLE(*below_ptr) + GETJSAMPLE(below_ptr[1]) +
+	       GETJSAMPLE(inptr0[-1]) + GETJSAMPLE(inptr0[1]) +
+	       GETJSAMPLE(inptr1[-1]) + GETJSAMPLE(inptr1[1]);
+    neighsum += neighsum;
+    neighsum += GETJSAMPLE(above_ptr[-1]) + GETJSAMPLE(above_ptr[1]) +
+		GETJSAMPLE(below_ptr[-1]) + GETJSAMPLE(below_ptr[1]);
+    membersum = membersum * memberscale + neighsum * neighscale;
+    *outptr = (JSAMPLE) ((membersum + 32768) >> 16);
+
+    inrow += 2;
+  }
+}
+
+
+/*
+ * Downsample pixel values of a single component.
+ * This version handles the special case of a full-size component,
+ * with smoothing.  One row of context is required.
+ */
+
+METHODDEF(void)
+fullsize_smooth_downsample (j_compress_ptr cinfo, jpeg_component_info *compptr,
+			    JSAMPARRAY input_data, JSAMPARRAY output_data)
+{
+  int outrow;
+  JDIMENSION colctr;
+  JDIMENSION output_cols = compptr->width_in_data_units * cinfo->data_unit;
+  register JSAMPROW inptr, above_ptr, below_ptr, outptr;
+  INT32 membersum, neighsum, memberscale, neighscale;
+  int colsum, lastcolsum, nextcolsum;
+
+  /* Expand input data enough to let all the output samples be generated
+   * by the standard loop.  Special-casing padded output would be more
+   * efficient.
+   */
+  expand_right_edge(input_data - 1, cinfo->max_v_samp_factor + 2,
+		    cinfo->image_width, output_cols);
+
+  /* Each of the eight neighbor pixels contributes a fraction SF to the
+   * smoothed pixel, while the main pixel contributes (1-8*SF).  In order
+   * to use integer arithmetic, these factors are multiplied by 2^16 = 65536.
+   * Also recall that SF = smoothing_factor / 1024.
+   */
+
+  memberscale = 65536L - cinfo->smoothing_factor * 512L; /* scaled 1-8*SF */
+  neighscale = cinfo->smoothing_factor * 64; /* scaled SF */
+
+  for (outrow = 0; outrow < compptr->v_samp_factor; outrow++) {
+    outptr = output_data[outrow];
+    inptr = input_data[outrow];
+    above_ptr = input_data[outrow-1];
+    below_ptr = input_data[outrow+1];
+
+    /* Special case for first column */
+    colsum = GETJSAMPLE(*above_ptr++) + GETJSAMPLE(*below_ptr++) +
+	     GETJSAMPLE(*inptr);
+    membersum = GETJSAMPLE(*inptr++);
+    nextcolsum = GETJSAMPLE(*above_ptr) + GETJSAMPLE(*below_ptr) +
+		 GETJSAMPLE(*inptr);
+    neighsum = colsum + (colsum - membersum) + nextcolsum;
+    membersum = membersum * memberscale + neighsum * neighscale;
+    *outptr++ = (JSAMPLE) ((membersum + 32768) >> 16);
+    lastcolsum = colsum; colsum = nextcolsum;
+
+    for (colctr = output_cols - 2; colctr > 0; colctr--) {
+      membersum = GETJSAMPLE(*inptr++);
+      above_ptr++; below_ptr++;
+      nextcolsum = GETJSAMPLE(*above_ptr) + GETJSAMPLE(*below_ptr) +
+		   GETJSAMPLE(*inptr);
+      neighsum = lastcolsum + (colsum - membersum) + nextcolsum;
+      membersum = membersum * memberscale + neighsum * neighscale;
+      *outptr++ = (JSAMPLE) ((membersum + 32768) >> 16);
+      lastcolsum = colsum; colsum = nextcolsum;
+    }
+
+    /* Special case for last column */
+    membersum = GETJSAMPLE(*inptr);
+    neighsum = lastcolsum + (colsum - membersum) + colsum;
+    membersum = membersum * memberscale + neighsum * neighscale;
+    *outptr = (JSAMPLE) ((membersum + 32768) >> 16);
+
+  }
+}
+
+#endif /* INPUT_SMOOTHING_SUPPORTED */
+
+
+/*
+ * Module initialization routine for downsampling.
+ * Note that we must select a routine for each component.
+ */
+
+GLOBAL(void)
+jinit_downsampler (j_compress_ptr cinfo)
+{
+  my_downsample_ptr downsample;
+  int ci;
+  jpeg_component_info * compptr;
+  boolean smoothok = TRUE;
+
+  downsample = (my_downsample_ptr)
+    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+				SIZEOF(my_downsampler));
+  cinfo->downsample = (struct jpeg_downsampler *) downsample;
+  downsample->pub.start_pass = start_pass_downsample;
+  downsample->pub.downsample = sep_downsample;
+  downsample->pub.need_context_rows = FALSE;
+
+  if (cinfo->CCIR601_sampling)
+    ERREXIT(cinfo, JERR_CCIR601_NOTIMPL);
+
+  /* Verify we can handle the sampling factors, and set up method pointers */
+  for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
+       ci++, compptr++) {
+    if (compptr->h_samp_factor == cinfo->max_h_samp_factor &&
+	compptr->v_samp_factor == cinfo->max_v_samp_factor) {
+#ifdef INPUT_SMOOTHING_SUPPORTED
+      if (cinfo->smoothing_factor) {
+	downsample->methods[ci] = fullsize_smooth_downsample;
+	downsample->pub.need_context_rows = TRUE;
+      } else
+#endif
+	downsample->methods[ci] = fullsize_downsample;
+    } else if (compptr->h_samp_factor * 2 == cinfo->max_h_samp_factor &&
+	       compptr->v_samp_factor == cinfo->max_v_samp_factor) {
+      smoothok = FALSE;
+      downsample->methods[ci] = h2v1_downsample;
+    } else if (compptr->h_samp_factor * 2 == cinfo->max_h_samp_factor &&
+	       compptr->v_samp_factor * 2 == cinfo->max_v_samp_factor) {
+#ifdef INPUT_SMOOTHING_SUPPORTED
+      if (cinfo->smoothing_factor) {
+	downsample->methods[ci] = h2v2_smooth_downsample;
+	downsample->pub.need_context_rows = TRUE;
+      } else
+#endif
+	downsample->methods[ci] = h2v2_downsample;
+    } else if ((cinfo->max_h_samp_factor % compptr->h_samp_factor) == 0 &&
+	       (cinfo->max_v_samp_factor % compptr->v_samp_factor) == 0) {
+      smoothok = FALSE;
+      downsample->methods[ci] = int_downsample;
+    } else
+      ERREXIT(cinfo, JERR_FRACT_SAMPLE_NOTIMPL);
+  }
+
+#ifdef INPUT_SMOOTHING_SUPPORTED
+  if (cinfo->smoothing_factor && !smoothok)
+    TRACEMS(cinfo, 0, JTRC_SMOOTH_NOTIMPL);
+#endif
+}
diff --git a/uppsrc/plugin/jpg/lib/jcscale.c b/uppsrc/plugin/jpg/lib/jcscale.c
new file mode 100644
index 000000000..c96ba54e2
--- /dev/null
+++ b/uppsrc/plugin/jpg/lib/jcscale.c
@@ -0,0 +1,62 @@
+/*
+ * jcscale.c
+ *
+ * Copyright (C) 1998, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains sample downscaling by 2^Pt for lossless JPEG.
+ */
+
+#define JPEG_INTERNALS
+#include "jinclude.h"
+#include "jpeglib.h"
+#include "jlossls.h"		/* Private declarations for lossless codec */
+
+
+#ifdef C_LOSSLESS_SUPPORTED
+
+METHODDEF(void)
+simple_downscale(j_compress_ptr cinfo,
+		 JSAMPROW input_buf, JSAMPROW output_buf, JDIMENSION width)
+{
+  j_lossless_c_ptr losslsc = (j_lossless_c_ptr) cinfo->codec;
+  unsigned xindex;
+
+  for (xindex = 0; xindex < width; xindex++)
+    output_buf[xindex] = (JSAMPLE) RIGHT_SHIFT(GETJSAMPLE(input_buf[xindex]),
+					       cinfo->Al);
+}
+
+
+METHODDEF(void)
+noscale(j_compress_ptr cinfo,
+	JSAMPROW input_buf, JSAMPROW output_buf, JDIMENSION width)
+{
+  MEMCOPY(output_buf, input_buf, width * SIZEOF(JSAMPLE));
+  return;
+}
+
+
+METHODDEF(void)
+scaler_start_pass (j_compress_ptr cinfo)
+{
+  j_lossless_c_ptr losslsc = (j_lossless_c_ptr) cinfo->codec;
+
+  /* Set scaler function based on Pt */
+  if (cinfo->Al)
+    losslsc->scaler_scale = simple_downscale;
+  else
+    losslsc->scaler_scale = noscale;
+}
+
+
+GLOBAL(void)
+jinit_c_scaler (j_compress_ptr cinfo)
+{
+  j_lossless_c_ptr losslsc = (j_lossless_c_ptr) cinfo->codec;
+
+  losslsc->scaler_start_pass = scaler_start_pass;
+}
+
+#endif /* C_LOSSLESS_SUPPORTED */
diff --git a/uppsrc/plugin/jpg/lib/jcshuff.c b/uppsrc/plugin/jpg/lib/jcshuff.c
new file mode 100644
index 000000000..d57a34af6
--- /dev/null
+++ b/uppsrc/plugin/jpg/lib/jcshuff.c
@@ -0,0 +1,661 @@
+/*
+ * jcshuff.c
+ *
+ * Copyright (C) 1991-1998, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains Huffman entropy encoding routines for sequential JPEG.
+ *
+ * Much of the complexity here has to do with supporting output suspension.
+ * If the data destination module demands suspension, we want to be able to
+ * back up to the start of the current MCU.  To do this, we copy state
+ * variables into local working storage, and update them back to the
+ * permanent JPEG objects only upon successful completion of an MCU.
+ */
+
+#define JPEG_INTERNALS
+#include "jinclude.h"
+#include "jpeglib.h"
+#include "jlossy.h"		/* Private declarations for lossy codec */
+#include "jchuff.h"		/* Declarations shared with jc*huff.c */
+
+
+/* Expanded entropy encoder object for Huffman encoding.
+ *
+ * The savable_state subrecord contains fields that change within an MCU,
+ * but must not be updated permanently until we complete the MCU.
+ */
+
+typedef struct {
+  INT32 put_buffer;		/* current bit-accumulation buffer */
+  int put_bits;			/* # of bits now in it */
+  int last_dc_val[MAX_COMPS_IN_SCAN]; /* last DC coef for each component */
+} savable_state;
+
+/* This macro is to work around compilers with missing or broken
+ * structure assignment.  You'll need to fix this code if you have
+ * such a compiler and you change MAX_COMPS_IN_SCAN.
+ */
+
+#ifndef NO_STRUCT_ASSIGN
+#define ASSIGN_STATE(dest,src)  ((dest) = (src))
+#else
+#if MAX_COMPS_IN_SCAN == 4
+#define ASSIGN_STATE(dest,src)  \
+	((dest).put_buffer = (src).put_buffer, \
+	 (dest).put_bits = (src).put_bits, \
+	 (dest).last_dc_val[0] = (src).last_dc_val[0], \
+	 (dest).last_dc_val[1] = (src).last_dc_val[1], \
+	 (dest).last_dc_val[2] = (src).last_dc_val[2], \
+	 (dest).last_dc_val[3] = (src).last_dc_val[3])
+#endif
+#endif
+
+
+typedef struct {
+  savable_state saved;		/* Bit buffer & DC state at start of MCU */
+
+  /* These fields are NOT loaded into local working state. */
+  unsigned int restarts_to_go;	/* MCUs left in this restart interval */
+  int next_restart_num;		/* next restart number to write (0-7) */
+
+  /* Pointers to derived tables (these workspaces have image lifespan) */
+  c_derived_tbl * dc_derived_tbls[NUM_HUFF_TBLS];
+  c_derived_tbl * ac_derived_tbls[NUM_HUFF_TBLS];
+
+#ifdef ENTROPY_OPT_SUPPORTED	/* Statistics tables for optimization */
+  long * dc_count_ptrs[NUM_HUFF_TBLS];
+  long * ac_count_ptrs[NUM_HUFF_TBLS];
+#endif
+} shuff_entropy_encoder;
+
+typedef shuff_entropy_encoder * shuff_entropy_ptr;
+
+/* Working state while writing an MCU.
+ * This struct contains all the fields that are needed by subroutines.
+ */
+
+typedef struct {
+  JOCTET * next_output_byte;	/* => next byte to write in buffer */
+  size_t free_in_buffer;	/* # of byte spaces remaining in buffer */
+  savable_state cur;		/* Current bit buffer & DC state */
+  j_compress_ptr cinfo;		/* dump_buffer needs access to this */
+} working_state;
+
+
+/* Forward declarations */
+METHODDEF(boolean) encode_mcu_huff JPP((j_compress_ptr cinfo,
+					JBLOCKROW *MCU_data));
+METHODDEF(void) finish_pass_huff JPP((j_compress_ptr cinfo));
+#ifdef ENTROPY_OPT_SUPPORTED
+METHODDEF(boolean) encode_mcu_gather JPP((j_compress_ptr cinfo,
+					  JBLOCKROW *MCU_data));
+METHODDEF(void) finish_pass_gather JPP((j_compress_ptr cinfo));
+#endif
+
+
+/*
+ * Initialize for a Huffman-compressed scan.
+ * If gather_statistics is TRUE, we do not output anything during the scan,
+ * just count the Huffman symbols used and generate Huffman code tables.
+ */
+
+METHODDEF(void)
+start_pass_huff (j_compress_ptr cinfo, boolean gather_statistics)
+{
+  j_lossy_c_ptr lossyc = (j_lossy_c_ptr) cinfo->codec;
+  shuff_entropy_ptr entropy = (shuff_entropy_ptr) lossyc->entropy_private;
+  int ci, dctbl, actbl;
+  jpeg_component_info * compptr;
+
+  if (gather_statistics) {
+#ifdef ENTROPY_OPT_SUPPORTED
+    lossyc->entropy_encode_mcu = encode_mcu_gather;
+    lossyc->pub.entropy_finish_pass = finish_pass_gather;
+#else
+    ERREXIT(cinfo, JERR_NOT_COMPILED);
+#endif
+  } else {
+    lossyc->entropy_encode_mcu = encode_mcu_huff;
+    lossyc->pub.entropy_finish_pass = finish_pass_huff;
+  }
+
+  for (ci = 0; ci < cinfo->comps_in_scan; ci++) {
+    compptr = cinfo->cur_comp_info[ci];
+    dctbl = compptr->dc_tbl_no;
+    actbl = compptr->ac_tbl_no;
+    if (gather_statistics) {
+#ifdef ENTROPY_OPT_SUPPORTED
+      /* Check for invalid table indexes */
+      /* (make_c_derived_tbl does this in the other path) */
+      if (dctbl < 0 || dctbl >= NUM_HUFF_TBLS)
+	ERREXIT1(cinfo, JERR_NO_HUFF_TABLE, dctbl);
+      if (actbl < 0 || actbl >= NUM_HUFF_TBLS)
+	ERREXIT1(cinfo, JERR_NO_HUFF_TABLE, actbl);
+      /* Allocate and zero the statistics tables */
+      /* Note that jpeg_gen_optimal_table expects 257 entries in each table! */
+      if (entropy->dc_count_ptrs[dctbl] == NULL)
+	entropy->dc_count_ptrs[dctbl] = (long *)
+	  (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+				      257 * SIZEOF(long));
+      MEMZERO(entropy->dc_count_ptrs[dctbl], 257 * SIZEOF(long));
+      if (entropy->ac_count_ptrs[actbl] == NULL)
+	entropy->ac_count_ptrs[actbl] = (long *)
+	  (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+				      257 * SIZEOF(long));
+      MEMZERO(entropy->ac_count_ptrs[actbl], 257 * SIZEOF(long));
+#endif
+    } else {
+      /* Compute derived values for Huffman tables */
+      /* We may do this more than once for a table, but it's not expensive */
+      jpeg_make_c_derived_tbl(cinfo, TRUE, dctbl,
+			      & entropy->dc_derived_tbls[dctbl]);
+      jpeg_make_c_derived_tbl(cinfo, FALSE, actbl,
+			      & entropy->ac_derived_tbls[actbl]);
+    }
+    /* Initialize DC predictions to 0 */
+    entropy->saved.last_dc_val[ci] = 0;
+  }
+
+  /* Initialize bit buffer to empty */
+  entropy->saved.put_buffer = 0;
+  entropy->saved.put_bits = 0;
+
+  /* Initialize restart stuff */
+  entropy->restarts_to_go = cinfo->restart_interval;
+  entropy->next_restart_num = 0;
+}
+
+
+/* Outputting bytes to the file */
+
+/* Emit a byte, taking 'action' if must suspend. */
+#define emit_byte(state,val,action)  \
+	{ *(state)->next_output_byte++ = (JOCTET) (val);  \
+	  if (--(state)->free_in_buffer == 0)  \
+	    if (! dump_buffer(state))  \
+	      { action; } }
+
+
+LOCAL(boolean)
+dump_buffer (working_state * state)
+/* Empty the output buffer; return TRUE if successful, FALSE if must suspend */
+{
+  struct jpeg_destination_mgr * dest = state->cinfo->dest;
+
+  if (! (*dest->empty_output_buffer) (state->cinfo))
+    return FALSE;
+  /* After a successful buffer dump, must reset buffer pointers */
+  state->next_output_byte = dest->next_output_byte;
+  state->free_in_buffer = dest->free_in_buffer;
+  return TRUE;
+}
+
+
+/* Outputting bits to the file */
+
+/* Only the right 24 bits of put_buffer are used; the valid bits are
+ * left-justified in this part.  At most 16 bits can be passed to emit_bits
+ * in one call, and we never retain more than 7 bits in put_buffer
+ * between calls, so 24 bits are sufficient.
+ */
+
+INLINE
+LOCAL(boolean)
+emit_bits (working_state * state, unsigned int code, int size)
+/* Emit some bits; return TRUE if successful, FALSE if must suspend */
+{
+  /* This routine is heavily used, so it's worth coding tightly. */
+  register INT32 put_buffer = (INT32) code;
+  register int put_bits = state->cur.put_bits;
+
+  /* if size is 0, caller used an invalid Huffman table entry */
+  if (size == 0)
+    ERREXIT(state->cinfo, JERR_HUFF_MISSING_CODE);
+
+  put_buffer &= (((INT32) 1)<<size) - 1; /* mask off any extra bits in code */
+
+  put_bits += size;		/* new number of bits in buffer */
+
+  put_buffer <<= 24 - put_bits; /* align incoming bits */
+
+  put_buffer |= state->cur.put_buffer; /* and merge with old buffer contents */
+
+  while (put_bits >= 8) {
+    int c = (int) ((put_buffer >> 16) & 0xFF);
+
+    emit_byte(state, c, return FALSE);
+    if (c == 0xFF) {		/* need to stuff a zero byte? */
+      emit_byte(state, 0, return FALSE);
+    }
+    put_buffer <<= 8;
+    put_bits -= 8;
+  }
+
+  state->cur.put_buffer = put_buffer; /* update state variables */
+  state->cur.put_bits = put_bits;
+
+  return TRUE;
+}
+
+
+LOCAL(boolean)
+flush_bits (working_state * state)
+{
+  if (! emit_bits(state, 0x7F, 7)) /* fill any partial byte with ones */
+    return FALSE;
+  state->cur.put_buffer = 0;	/* and reset bit-buffer to empty */
+  state->cur.put_bits = 0;
+  return TRUE;
+}
+
+
+/* Encode a single block's worth of coefficients */
+
+LOCAL(boolean)
+encode_one_block (working_state * state, JCOEFPTR block, int last_dc_val,
+		  c_derived_tbl *dctbl, c_derived_tbl *actbl)
+{
+  register int temp, temp2;
+  register int nbits;
+  register int k, r, i;
+
+  /* Encode the DC coefficient difference per section F.1.2.1 */
+
+  temp = temp2 = block[0] - last_dc_val;
+
+  if (temp < 0) {
+    temp = -temp;		/* temp is abs value of input */
+    /* For a negative input, want temp2 = bitwise complement of abs(input) */
+    /* This code assumes we are on a two's complement machine */
+    temp2--;
+  }
+
+  /* Find the number of bits needed for the magnitude of the coefficient */
+  nbits = 0;
+  while (temp) {
+    nbits++;
+    temp >>= 1;
+  }
+  /* Check for out-of-range coefficient values.
+   * Since we're encoding a difference, the range limit is twice as much.
+   */
+  if (nbits > MAX_COEF_BITS+1)
+    ERREXIT(state->cinfo, JERR_BAD_DCT_COEF);
+
+  /* Emit the Huffman-coded symbol for the number of bits */
+  if (! emit_bits(state, dctbl->ehufco[nbits], dctbl->ehufsi[nbits]))
+    return FALSE;
+
+  /* Emit that number of bits of the value, if positive, */
+  /* or the complement of its magnitude, if negative. */
+  if (nbits)			/* emit_bits rejects calls with size 0 */
+    if (! emit_bits(state, (unsigned int) temp2, nbits))
+      return FALSE;
+
+  /* Encode the AC coefficients per section F.1.2.2 */
+
+  r = 0;			/* r = run length of zeros */
+
+  for (k = 1; k < DCTSIZE2; k++) {
+    if ((temp = block[jpeg_natural_order[k]]) == 0) {
+      r++;
+    } else {
+      /* if run length > 15, must emit special run-length-16 codes (0xF0) */
+      while (r > 15) {
+	if (! emit_bits(state, actbl->ehufco[0xF0], actbl->ehufsi[0xF0]))
+	  return FALSE;
+	r -= 16;
+      }
+
+      temp2 = temp;
+      if (temp < 0) {
+	temp = -temp;		/* temp is abs value of input */
+	/* This code assumes we are on a two's complement machine */
+	temp2--;
+      }
+
+      /* Find the number of bits needed for the magnitude of the coefficient */
+      nbits = 1;		/* there must be at least one 1 bit */
+      while ((temp >>= 1))
+	nbits++;
+      /* Check for out-of-range coefficient values */
+      if (nbits > MAX_COEF_BITS)
+	ERREXIT(state->cinfo, JERR_BAD_DCT_COEF);
+
+      /* Emit Huffman symbol for run length / number of bits */
+      i = (r << 4) + nbits;
+      if (! emit_bits(state, actbl->ehufco[i], actbl->ehufsi[i]))
+	return FALSE;
+
+      /* Emit that number of bits of the value, if positive, */
+      /* or the complement of its magnitude, if negative. */
+      if (! emit_bits(state, (unsigned int) temp2, nbits))
+	return FALSE;
+
+      r = 0;
+    }
+  }
+
+  /* If the last coef(s) were zero, emit an end-of-block code */
+  if (r > 0)
+    if (! emit_bits(state, actbl->ehufco[0], actbl->ehufsi[0]))
+      return FALSE;
+
+  return TRUE;
+}
+
+
+/*
+ * Emit a restart marker & resynchronize predictions.
+ */
+
+LOCAL(boolean)
+emit_restart (working_state * state, int restart_num)
+{
+  int ci;
+
+  if (! flush_bits(state))
+    return FALSE;
+
+  emit_byte(state, 0xFF, return FALSE);
+  emit_byte(state, JPEG_RST0 + restart_num, return FALSE);
+
+  /* Re-initialize DC predictions to 0 */
+  for (ci = 0; ci < state->cinfo->comps_in_scan; ci++)
+    state->cur.last_dc_val[ci] = 0;
+
+  /* The restart counter is not updated until we successfully write the MCU. */
+
+  return TRUE;
+}
+
+
+/*
+ * Encode and output one MCU's worth of Huffman-compressed coefficients.
+ */
+
+METHODDEF(boolean)
+encode_mcu_huff (j_compress_ptr cinfo, JBLOCKROW *MCU_data)
+{
+  j_lossy_c_ptr lossyc = (j_lossy_c_ptr) cinfo->codec;
+  shuff_entropy_ptr entropy = (shuff_entropy_ptr) lossyc->entropy_private;
+  working_state state;
+  int blkn, ci;
+  jpeg_component_info * compptr;
+
+  /* Load up working state */
+  state.next_output_byte = cinfo->dest->next_output_byte;
+  state.free_in_buffer = cinfo->dest->free_in_buffer;
+  ASSIGN_STATE(state.cur, entropy->saved);
+  state.cinfo = cinfo;
+
+  /* Emit restart marker if needed */
+  if (cinfo->restart_interval) {
+    if (entropy->restarts_to_go == 0)
+      if (! emit_restart(&state, entropy->next_restart_num))
+	return FALSE;
+  }
+
+  /* Encode the MCU data blocks */
+  for (blkn = 0; blkn < cinfo->data_units_in_MCU; blkn++) {
+    ci = cinfo->MCU_membership[blkn];
+    compptr = cinfo->cur_comp_info[ci];
+    if (! encode_one_block(&state,
+			   MCU_data[blkn][0], state.cur.last_dc_val[ci],
+			   entropy->dc_derived_tbls[compptr->dc_tbl_no],
+			   entropy->ac_derived_tbls[compptr->ac_tbl_no]))
+      return FALSE;
+    /* Update last_dc_val */
+    state.cur.last_dc_val[ci] = MCU_data[blkn][0][0];
+  }
+
+  /* Completed MCU, so update state */
+  cinfo->dest->next_output_byte = state.next_output_byte;
+  cinfo->dest->free_in_buffer = state.free_in_buffer;
+  ASSIGN_STATE(entropy->saved, state.cur);
+
+  /* Update restart-interval state too */
+  if (cinfo->restart_interval) {
+    if (entropy->restarts_to_go == 0) {
+      entropy->restarts_to_go = cinfo->restart_interval;
+      entropy->next_restart_num++;
+      entropy->next_restart_num &= 7;
+    }
+    entropy->restarts_to_go--;
+  }
+
+  return TRUE;
+}
+
+
+/*
+ * Finish up at the end of a Huffman-compressed scan.
+ */
+
+METHODDEF(void)
+finish_pass_huff (j_compress_ptr cinfo)
+{
+  j_lossy_c_ptr lossyc = (j_lossy_c_ptr) cinfo->codec;
+  shuff_entropy_ptr entropy = (shuff_entropy_ptr) lossyc->entropy_private;
+  working_state state;
+
+  /* Load up working state ... flush_bits needs it */
+  state.next_output_byte = cinfo->dest->next_output_byte;
+  state.free_in_buffer = cinfo->dest->free_in_buffer;
+  ASSIGN_STATE(state.cur, entropy->saved);
+  state.cinfo = cinfo;
+
+  /* Flush out the last data */
+  if (! flush_bits(&state))
+    ERREXIT(cinfo, JERR_CANT_SUSPEND);
+
+  /* Update state */
+  cinfo->dest->next_output_byte = state.next_output_byte;
+  cinfo->dest->free_in_buffer = state.free_in_buffer;
+  ASSIGN_STATE(entropy->saved, state.cur);
+}
+
+
+/*
+ * Huffman coding optimization.
+ *
+ * We first scan the supplied data and count the number of uses of each symbol
+ * that is to be Huffman-coded. (This process MUST agree with the code above.)
+ * Then we build a Huffman coding tree for the observed counts.
+ * Symbols which are not needed at all for the particular image are not
+ * assigned any code, which saves space in the DHT marker as well as in
+ * the compressed data.
+ */
+
+#ifdef ENTROPY_OPT_SUPPORTED
+
+
+/* Process a single block's worth of coefficients */
+
+LOCAL(void)
+htest_one_block (j_compress_ptr cinfo, JCOEFPTR block, int last_dc_val,
+		 long dc_counts[], long ac_counts[])
+{
+  register int temp;
+  register int nbits;
+  register int k, r;
+
+  /* Encode the DC coefficient difference per section F.1.2.1 */
+
+  temp = block[0] - last_dc_val;
+  if (temp < 0)
+    temp = -temp;
+
+  /* Find the number of bits needed for the magnitude of the coefficient */
+  nbits = 0;
+  while (temp) {
+    nbits++;
+    temp >>= 1;
+  }
+  /* Check for out-of-range coefficient values.
+   * Since we're encoding a difference, the range limit is twice as much.
+   */
+  if (nbits > MAX_COEF_BITS+1)
+    ERREXIT(cinfo, JERR_BAD_DCT_COEF);
+
+  /* Count the Huffman symbol for the number of bits */
+  dc_counts[nbits]++;
+
+  /* Encode the AC coefficients per section F.1.2.2 */
+
+  r = 0;			/* r = run length of zeros */
+
+  for (k = 1; k < DCTSIZE2; k++) {
+    if ((temp = block[jpeg_natural_order[k]]) == 0) {
+      r++;
+    } else {
+      /* if run length > 15, must emit special run-length-16 codes (0xF0) */
+      while (r > 15) {
+	ac_counts[0xF0]++;
+	r -= 16;
+      }
+
+      /* Find the number of bits needed for the magnitude of the coefficient */
+      if (temp < 0)
+	temp = -temp;
+
+      /* Find the number of bits needed for the magnitude of the coefficient */
+      nbits = 1;		/* there must be at least one 1 bit */
+      while ((temp >>= 1))
+	nbits++;
+      /* Check for out-of-range coefficient values */
+      if (nbits > MAX_COEF_BITS)
+	ERREXIT(cinfo, JERR_BAD_DCT_COEF);
+
+      /* Count Huffman symbol for run length / number of bits */
+      ac_counts[(r << 4) + nbits]++;
+
+      r = 0;
+    }
+  }
+
+  /* If the last coef(s) were zero, emit an end-of-block code */
+  if (r > 0)
+    ac_counts[0]++;
+}
+
+
+/*
+ * Trial-encode one MCU's worth of Huffman-compressed coefficients.
+ * No data is actually output, so no suspension return is possible.
+ */
+
+METHODDEF(boolean)
+encode_mcu_gather (j_compress_ptr cinfo, JBLOCKROW *MCU_data)
+{
+  j_lossy_c_ptr lossyc = (j_lossy_c_ptr) cinfo->codec;
+  shuff_entropy_ptr entropy = (shuff_entropy_ptr) lossyc->entropy_private;
+  int blkn, ci;
+  jpeg_component_info * compptr;
+
+  /* Take care of restart intervals if needed */
+  if (cinfo->restart_interval) {
+    if (entropy->restarts_to_go == 0) {
+      /* Re-initialize DC predictions to 0 */
+      for (ci = 0; ci < cinfo->comps_in_scan; ci++)
+	entropy->saved.last_dc_val[ci] = 0;
+      /* Update restart state */
+      entropy->restarts_to_go = cinfo->restart_interval;
+    }
+    entropy->restarts_to_go--;
+  }
+
+  for (blkn = 0; blkn < cinfo->data_units_in_MCU; blkn++) {
+    ci = cinfo->MCU_membership[blkn];
+    compptr = cinfo->cur_comp_info[ci];
+    htest_one_block(cinfo, MCU_data[blkn][0], entropy->saved.last_dc_val[ci],
+		    entropy->dc_count_ptrs[compptr->dc_tbl_no],
+		    entropy->ac_count_ptrs[compptr->ac_tbl_no]);
+    entropy->saved.last_dc_val[ci] = MCU_data[blkn][0][0];
+  }
+
+  return TRUE;
+}
+
+
+/*
+ * Finish up a statistics-gathering pass and create the new Huffman tables.
+ */
+
+METHODDEF(void)
+finish_pass_gather (j_compress_ptr cinfo)
+{
+  j_lossy_c_ptr lossyc = (j_lossy_c_ptr) cinfo->codec;
+  shuff_entropy_ptr entropy = (shuff_entropy_ptr) lossyc->entropy_private;
+  int ci, dctbl, actbl;
+  jpeg_component_info * compptr;
+  JHUFF_TBL **htblptr;
+  boolean did_dc[NUM_HUFF_TBLS];
+  boolean did_ac[NUM_HUFF_TBLS];
+
+  /* It's important not to apply jpeg_gen_optimal_table more than once
+   * per table, because it clobbers the input frequency counts!
+   */
+  MEMZERO(did_dc, SIZEOF(did_dc));
+  MEMZERO(did_ac, SIZEOF(did_ac));
+
+  for (ci = 0; ci < cinfo->comps_in_scan; ci++) {
+    compptr = cinfo->cur_comp_info[ci];
+    dctbl = compptr->dc_tbl_no;
+    actbl = compptr->ac_tbl_no;
+    if (! did_dc[dctbl]) {
+      htblptr = & cinfo->dc_huff_tbl_ptrs[dctbl];
+      if (*htblptr == NULL)
+	*htblptr = jpeg_alloc_huff_table((j_common_ptr) cinfo);
+      jpeg_gen_optimal_table(cinfo, *htblptr, entropy->dc_count_ptrs[dctbl]);
+      did_dc[dctbl] = TRUE;
+    }
+    if (! did_ac[actbl]) {
+      htblptr = & cinfo->ac_huff_tbl_ptrs[actbl];
+      if (*htblptr == NULL)
+	*htblptr = jpeg_alloc_huff_table((j_common_ptr) cinfo);
+      jpeg_gen_optimal_table(cinfo, *htblptr, entropy->ac_count_ptrs[actbl]);
+      did_ac[actbl] = TRUE;
+    }
+  }
+}
+
+
+#endif /* ENTROPY_OPT_SUPPORTED */
+
+
+METHODDEF(boolean)
+need_optimization_pass (j_compress_ptr cinfo)
+{
+  return TRUE;
+}
+
+
+/*
+ * Module initialization routine for Huffman entropy encoding.
+ */
+
+GLOBAL(void)
+jinit_shuff_encoder (j_compress_ptr cinfo)
+{
+  j_lossy_c_ptr lossyc = (j_lossy_c_ptr) cinfo->codec;
+  shuff_entropy_ptr entropy;
+  int i;
+
+  entropy = (shuff_entropy_ptr)
+    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+				SIZEOF(shuff_entropy_encoder));
+  lossyc->entropy_private = (struct jpeg_entropy_encoder *) entropy;
+  lossyc->pub.entropy_start_pass = start_pass_huff;
+  lossyc->pub.need_optimization_pass = need_optimization_pass;
+
+  /* Mark tables unallocated */
+  for (i = 0; i < NUM_HUFF_TBLS; i++) {
+    entropy->dc_derived_tbls[i] = entropy->ac_derived_tbls[i] = NULL;
+#ifdef ENTROPY_OPT_SUPPORTED
+    entropy->dc_count_ptrs[i] = entropy->ac_count_ptrs[i] = NULL;
+#endif
+  }
+}
diff --git a/uppsrc/plugin/jpg/lib/jctrans.c b/uppsrc/plugin/jpg/lib/jctrans.c
new file mode 100644
index 000000000..88aa0b3e9
--- /dev/null
+++ b/uppsrc/plugin/jpg/lib/jctrans.c
@@ -0,0 +1,420 @@
+/*
+ * jctrans.c
+ *
+ * Copyright (C) 1995-1998, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains library routines for transcoding compression,
+ * that is, writing raw DCT coefficient arrays to an output JPEG file.
+ * The routines in jcapimin.c will also be needed by a transcoder.
+ */
+
+#define JPEG_INTERNALS
+#include "jinclude.h"
+#include "jpeglib.h"
+#include "jlossy.h"		/* Private declarations for lossy codec */
+
+
+/* Forward declarations */
+LOCAL(void) transencode_master_selection
+	JPP((j_compress_ptr cinfo, jvirt_barray_ptr * coef_arrays));
+LOCAL(void) transencode_codec
+	JPP((j_compress_ptr cinfo, jvirt_barray_ptr * coef_arrays));
+LOCAL(void) transencode_coef_controller
+	JPP((j_compress_ptr cinfo, jvirt_barray_ptr * coef_arrays));
+
+
+/*
+ * Compression initialization for writing raw-coefficient data.
+ * Before calling this, all parameters and a data destination must be set up.
+ * Call jpeg_finish_compress() to actually write the data.
+ *
+ * The number of passed virtual arrays must match cinfo->num_components.
+ * Note that the virtual arrays need not be filled or even realized at
+ * the time write_coefficients is called; indeed, if the virtual arrays
+ * were requested from this compression object's memory manager, they
+ * typically will be realized during this routine and filled afterwards.
+ */
+
+GLOBAL(void)
+jpeg_write_coefficients (j_compress_ptr cinfo, jvirt_barray_ptr * coef_arrays)
+{
+  if (cinfo->global_state != CSTATE_START)
+    ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);
+  /* Mark all tables to be written */
+  jpeg_suppress_tables(cinfo, FALSE);
+  /* (Re)initialize error mgr and destination modules */
+  (*cinfo->err->reset_error_mgr) ((j_common_ptr) cinfo);
+  (*cinfo->dest->init_destination) (cinfo);
+  /* Perform master selection of active modules */
+  transencode_master_selection(cinfo, coef_arrays);
+  /* Wait for jpeg_finish_compress() call */
+  cinfo->next_scanline = 0;	/* so jpeg_write_marker works */
+  cinfo->global_state = CSTATE_WRCOEFS;
+}
+
+
+/*
+ * Initialize the compression object with default parameters,
+ * then copy from the source object all parameters needed for lossless
+ * transcoding.  Parameters that can be varied without loss (such as
+ * scan script and Huffman optimization) are left in their default states.
+ */
+
+GLOBAL(void)
+jpeg_copy_critical_parameters (j_decompress_ptr srcinfo,
+			       j_compress_ptr dstinfo)
+{
+  JQUANT_TBL ** qtblptr;
+  jpeg_component_info *incomp, *outcomp;
+  JQUANT_TBL *c_quant, *slot_quant;
+  int tblno, ci, coefi;
+
+  /* Safety check to ensure start_compress not called yet. */
+  if (dstinfo->global_state != CSTATE_START)
+    ERREXIT1(dstinfo, JERR_BAD_STATE, dstinfo->global_state);
+  /* Copy fundamental image dimensions */
+  dstinfo->image_width = srcinfo->image_width;
+  dstinfo->image_height = srcinfo->image_height;
+  dstinfo->input_components = srcinfo->num_components;
+  dstinfo->in_color_space = srcinfo->jpeg_color_space;
+  /* Initialize all parameters to default values */
+  jpeg_set_defaults(dstinfo);
+  /* jpeg_set_defaults may choose wrong colorspace, eg YCbCr if input is RGB.
+   * Fix it to get the right header markers for the image colorspace.
+   */
+  jpeg_set_colorspace(dstinfo, srcinfo->jpeg_color_space);
+  dstinfo->data_precision = srcinfo->data_precision;
+  dstinfo->CCIR601_sampling = srcinfo->CCIR601_sampling;
+  /* Copy the source's quantization tables. */
+  for (tblno = 0; tblno < NUM_QUANT_TBLS; tblno++) {
+    if (srcinfo->quant_tbl_ptrs[tblno] != NULL) {
+      qtblptr = & dstinfo->quant_tbl_ptrs[tblno];
+      if (*qtblptr == NULL)
+	*qtblptr = jpeg_alloc_quant_table((j_common_ptr) dstinfo);
+      MEMCOPY((*qtblptr)->quantval,
+	      srcinfo->quant_tbl_ptrs[tblno]->quantval,
+	      SIZEOF((*qtblptr)->quantval));
+      (*qtblptr)->sent_table = FALSE;
+    }
+  }
+  /* Copy the source's per-component info.
+   * Note we assume jpeg_set_defaults has allocated the dest comp_info array.
+   */
+  dstinfo->num_components = srcinfo->num_components;
+  if (dstinfo->num_components < 1 || dstinfo->num_components > MAX_COMPONENTS)
+    ERREXIT2(dstinfo, JERR_COMPONENT_COUNT, dstinfo->num_components,
+	     MAX_COMPONENTS);
+  for (ci = 0, incomp = srcinfo->comp_info, outcomp = dstinfo->comp_info;
+       ci < dstinfo->num_components; ci++, incomp++, outcomp++) {
+    outcomp->component_id = incomp->component_id;
+    outcomp->h_samp_factor = incomp->h_samp_factor;
+    outcomp->v_samp_factor = incomp->v_samp_factor;
+    outcomp->quant_tbl_no = incomp->quant_tbl_no;
+    /* Make sure saved quantization table for component matches the qtable
+     * slot.  If not, the input file re-used this qtable slot.
+     * IJG encoder currently cannot duplicate this.
+     */
+    tblno = outcomp->quant_tbl_no;
+    if (tblno < 0 || tblno >= NUM_QUANT_TBLS ||
+	srcinfo->quant_tbl_ptrs[tblno] == NULL)
+      ERREXIT1(dstinfo, JERR_NO_QUANT_TABLE, tblno);
+    slot_quant = srcinfo->quant_tbl_ptrs[tblno];
+    c_quant = incomp->quant_table;
+    if (c_quant != NULL) {
+      for (coefi = 0; coefi < DCTSIZE2; coefi++) {
+	if (c_quant->quantval[coefi] != slot_quant->quantval[coefi])
+	  ERREXIT1(dstinfo, JERR_MISMATCHED_QUANT_TABLE, tblno);
+      }
+    }
+    /* Note: we do not copy the source's Huffman table assignments;
+     * instead we rely on jpeg_set_colorspace to have made a suitable choice.
+     */
+  }
+  /* Also copy JFIF version and resolution information, if available.
+   * Strictly speaking this isn't "critical" info, but it's nearly
+   * always appropriate to copy it if available.  In particular,
+   * if the application chooses to copy JFIF 1.02 extension markers from
+   * the source file, we need to copy the version to make sure we don't
+   * emit a file that has 1.02 extensions but a claimed version of 1.01.
+   * We will *not*, however, copy version info from mislabeled "2.01" files.
+   */
+  if (srcinfo->saw_JFIF_marker) {
+    if (srcinfo->JFIF_major_version == 1) {
+      dstinfo->JFIF_major_version = srcinfo->JFIF_major_version;
+      dstinfo->JFIF_minor_version = srcinfo->JFIF_minor_version;
+    }
+    dstinfo->density_unit = srcinfo->density_unit;
+    dstinfo->X_density = srcinfo->X_density;
+    dstinfo->Y_density = srcinfo->Y_density;
+  }
+}
+
+
+/*
+ * Master selection of compression modules for transcoding.
+ * This substitutes for jcinit.c's initialization of the full compressor.
+ */
+
+LOCAL(void)
+transencode_master_selection (j_compress_ptr cinfo,
+			      jvirt_barray_ptr * coef_arrays)
+{
+  cinfo->data_unit = DCTSIZE;
+  /* Although we don't actually use input_components for transcoding,
+   * jcmaster.c's initial_setup will complain if input_components is 0.
+   */
+  cinfo->input_components = 1;
+  /* Initialize master control (includes parameter checking/processing) */
+  jinit_c_master_control(cinfo, TRUE /* transcode only */);
+
+  /* We need a special compression codec. */
+  transencode_codec(cinfo, coef_arrays);
+
+  jinit_marker_writer(cinfo);
+
+  /* We can now tell the memory manager to allocate virtual arrays. */
+  (*cinfo->mem->realize_virt_arrays) ((j_common_ptr) cinfo);
+
+  /* Write the datastream header (SOI, JFIF) immediately.
+   * Frame and scan headers are postponed till later.
+   * This lets application insert special markers after the SOI.
+   */
+  (*cinfo->marker->write_file_header) (cinfo);
+}
+
+
+/*
+ * The rest of this file is a special implementation of the coefficient
+ * buffer controller.  This is similar to jccoefct.c, but it handles only
+ * output from presupplied virtual arrays.  Furthermore, we generate any
+ * dummy padding blocks on-the-fly rather than expecting them to be present
+ * in the arrays.
+ */
+
+/* Private buffer controller object */
+
+typedef struct {
+  JDIMENSION iMCU_row_num;	/* iMCU row # within image */
+  JDIMENSION mcu_ctr;		/* counts MCUs processed in current row */
+  int MCU_vert_offset;		/* counts MCU rows within iMCU row */
+  int MCU_rows_per_iMCU_row;	/* number of such rows needed */
+
+  /* Virtual block array for each component. */
+  jvirt_barray_ptr * whole_image;
+
+  /* Workspace for constructing dummy blocks at right/bottom edges. */
+  JBLOCKROW dummy_buffer[C_MAX_DATA_UNITS_IN_MCU];
+} c_coef_controller;
+
+typedef c_coef_controller * c_coef_ptr;
+
+
+LOCAL(void)
+start_iMCU_row (j_compress_ptr cinfo)
+/* Reset within-iMCU-row counters for a new row */
+{
+  j_lossy_c_ptr lossyc = (j_lossy_c_ptr) cinfo->codec;
+  c_coef_ptr coef = (c_coef_ptr) lossyc->coef_private;
+
+  /* In an interleaved scan, an MCU row is the same as an iMCU row.
+   * In a noninterleaved scan, an iMCU row has v_samp_factor MCU rows.
+   * But at the bottom of the image, process only what's left.
+   */
+  if (cinfo->comps_in_scan > 1) {
+    coef->MCU_rows_per_iMCU_row = 1;
+  } else {
+    if (coef->iMCU_row_num < (cinfo->total_iMCU_rows-1))
+      coef->MCU_rows_per_iMCU_row = cinfo->cur_comp_info[0]->v_samp_factor;
+    else
+      coef->MCU_rows_per_iMCU_row = cinfo->cur_comp_info[0]->last_row_height;
+  }
+
+  coef->mcu_ctr = 0;
+  coef->MCU_vert_offset = 0;
+}
+
+
+/*
+ * Initialize for a processing pass.
+ */
+
+METHODDEF(void)
+start_pass_coef (j_compress_ptr cinfo, J_BUF_MODE pass_mode)
+{
+  j_lossy_c_ptr lossyc = (j_lossy_c_ptr) cinfo->codec;
+  c_coef_ptr coef = (c_coef_ptr) lossyc->coef_private;
+
+  if (pass_mode != JBUF_CRANK_DEST)
+    ERREXIT(cinfo, JERR_BAD_BUFFER_MODE);
+
+  coef->iMCU_row_num = 0;
+  start_iMCU_row(cinfo);
+}
+
+
+/*
+ * Process some data.
+ * We process the equivalent of one fully interleaved MCU row ("iMCU" row)
+ * per call, ie, v_samp_factor block rows for each component in the scan.
+ * The data is obtained from the virtual arrays and fed to the entropy coder.
+ * Returns TRUE if the iMCU row is completed, FALSE if suspended.
+ *
+ * NB: input_buf is ignored; it is likely to be a NULL pointer.
+ */
+
+METHODDEF(boolean)
+compress_output (j_compress_ptr cinfo, JSAMPIMAGE input_buf)
+{
+  j_lossy_c_ptr lossyc = (j_lossy_c_ptr) cinfo->codec;
+  c_coef_ptr coef = (c_coef_ptr) lossyc->coef_private;
+  JDIMENSION MCU_col_num;	/* index of current MCU within row */
+  JDIMENSION last_MCU_col = cinfo->MCUs_per_row - 1;
+  JDIMENSION last_iMCU_row = cinfo->total_iMCU_rows - 1;
+  int blkn, ci, xindex, yindex, yoffset, blockcnt;
+  JDIMENSION start_col;
+  JBLOCKARRAY buffer[MAX_COMPS_IN_SCAN];
+  JBLOCKROW MCU_buffer[C_MAX_DATA_UNITS_IN_MCU];
+  JBLOCKROW buffer_ptr;
+  jpeg_component_info *compptr;
+
+  /* Align the virtual buffers for the components used in this scan. */
+  for (ci = 0; ci < cinfo->comps_in_scan; ci++) {
+    compptr = cinfo->cur_comp_info[ci];
+    buffer[ci] = (*cinfo->mem->access_virt_barray)
+      ((j_common_ptr) cinfo, coef->whole_image[compptr->component_index],
+       coef->iMCU_row_num * compptr->v_samp_factor,
+       (JDIMENSION) compptr->v_samp_factor, FALSE);
+  }
+
+  /* Loop to process one whole iMCU row */
+  for (yoffset = coef->MCU_vert_offset; yoffset < coef->MCU_rows_per_iMCU_row;
+       yoffset++) {
+    for (MCU_col_num = coef->mcu_ctr; MCU_col_num < cinfo->MCUs_per_row;
+	 MCU_col_num++) {
+      /* Construct list of pointers to DCT blocks belonging to this MCU */
+      blkn = 0;			/* index of current DCT block within MCU */
+      for (ci = 0; ci < cinfo->comps_in_scan; ci++) {
+	compptr = cinfo->cur_comp_info[ci];
+	start_col = MCU_col_num * compptr->MCU_width;
+	blockcnt = (MCU_col_num < last_MCU_col) ? compptr->MCU_width
+						: compptr->last_col_width;
+	for (yindex = 0; yindex < compptr->MCU_height; yindex++) {
+	  if (coef->iMCU_row_num < last_iMCU_row ||
+	      yindex+yoffset < compptr->last_row_height) {
+	    /* Fill in pointers to real blocks in this row */
+	    buffer_ptr = buffer[ci][yindex+yoffset] + start_col;
+	    for (xindex = 0; xindex < blockcnt; xindex++)
+	      MCU_buffer[blkn++] = buffer_ptr++;
+	  } else {
+	    /* At bottom of image, need a whole row of dummy blocks */
+	    xindex = 0;
+	  }
+	  /* Fill in any dummy blocks needed in this row.
+	   * Dummy blocks are filled in the same way as in jccoefct.c:
+	   * all zeroes in the AC entries, DC entries equal to previous
+	   * block's DC value.  The init routine has already zeroed the
+	   * AC entries, so we need only set the DC entries correctly.
+	   */
+	  for (; xindex < compptr->MCU_width; xindex++) {
+	    MCU_buffer[blkn] = coef->dummy_buffer[blkn];
+	    MCU_buffer[blkn][0][0] = MCU_buffer[blkn-1][0][0];
+	    blkn++;
+	  }
+	}
+      }
+      /* Try to write the MCU. */
+      if (! (*lossyc->entropy_encode_mcu) (cinfo, MCU_buffer)) {
+	/* Suspension forced; update state counters and exit */
+	coef->MCU_vert_offset = yoffset;
+	coef->mcu_ctr = MCU_col_num;
+	return FALSE;
+      }
+    }
+    /* Completed an MCU row, but perhaps not an iMCU row */
+    coef->mcu_ctr = 0;
+  }
+  /* Completed the iMCU row, advance counters for next one */
+  coef->iMCU_row_num++;
+  start_iMCU_row(cinfo);
+  return TRUE;
+}
+
+
+/*
+ * Initialize coefficient buffer controller.
+ *
+ * Each passed coefficient array must be the right size for that
+ * coefficient: width_in_data_units wide and height_in_data_units high,
+ * with unitheight at least v_samp_factor.
+ */
+
+LOCAL(void)
+transencode_coef_controller (j_compress_ptr cinfo,
+			     jvirt_barray_ptr * coef_arrays)
+{
+  j_lossy_c_ptr lossyc = (j_lossy_c_ptr) cinfo->codec;
+  c_coef_ptr coef;
+  JBLOCKROW buffer;
+  int i;
+
+  coef = (c_coef_ptr)
+    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+				SIZEOF(c_coef_controller));
+  lossyc->coef_private = (struct jpeg_c_coef_controller *) coef;
+
+  /* Save pointer to virtual arrays */
+  coef->whole_image = coef_arrays;
+
+  /* Allocate and pre-zero space for dummy DCT blocks. */
+  buffer = (JBLOCKROW)
+    (*cinfo->mem->alloc_large) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+				C_MAX_DATA_UNITS_IN_MCU * SIZEOF(JBLOCK));
+  jzero_far((void FAR *) buffer, C_MAX_DATA_UNITS_IN_MCU * SIZEOF(JBLOCK));
+  for (i = 0; i < C_MAX_DATA_UNITS_IN_MCU; i++) {
+    coef->dummy_buffer[i] = buffer + i;
+  }
+}
+
+
+/*
+ * Initialize the transencoer codec.
+ * This is called only once, during master selection.
+ */
+
+LOCAL(void)
+transencode_codec (j_compress_ptr cinfo,
+		   jvirt_barray_ptr * coef_arrays)
+{
+  j_lossy_c_ptr lossyc;
+
+  /* Create subobject in permanent pool */
+  lossyc = (j_lossy_c_ptr)
+    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT,
+				SIZEOF(jpeg_lossy_c_codec));
+  cinfo->codec = (struct jpeg_c_codec *) lossyc;
+
+  /* Initialize sub-modules */
+
+  /* Entropy encoding: either Huffman or arithmetic coding. */
+  if (cinfo->arith_code) {
+    ERREXIT(cinfo, JERR_ARITH_NOTIMPL);
+  } else {
+    if (cinfo->process == JPROC_PROGRESSIVE) {
+#ifdef C_PROGRESSIVE_SUPPORTED
+      jinit_phuff_encoder(cinfo);
+#else
+      ERREXIT(cinfo, JERR_NOT_COMPILED);
+#endif
+    } else
+      jinit_shuff_encoder(cinfo);
+  }
+
+  /* We need a special coefficient buffer controller. */
+  transencode_coef_controller(cinfo, coef_arrays);
+
+  /* Initialize method pointers */
+  lossyc->pub.start_pass = start_pass_coef;
+  lossyc->pub.compress_data = compress_output;
+}
diff --git a/uppsrc/plugin/jpg/lib/jdapimin.c b/uppsrc/plugin/jpg/lib/jdapimin.c
new file mode 100644
index 000000000..350f2920d
--- /dev/null
+++ b/uppsrc/plugin/jpg/lib/jdapimin.c
@@ -0,0 +1,401 @@
+/*
+ * jdapimin.c
+ *
+ * Copyright (C) 1994-1998, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains application interface code for the decompression half
+ * of the JPEG library.  These are the "minimum" API routines that may be
+ * needed in either the normal full-decompression case or the
+ * transcoding-only case.
+ *
+ * Most of the routines intended to be called directly by an application
+ * are in this file or in jdapistd.c.  But also see jcomapi.c for routines
+ * shared by compression and decompression, and jdtrans.c for the transcoding
+ * case.
+ */
+
+#define JPEG_INTERNALS
+#include "jinclude.h"
+#include "jpeglib.h"
+
+
+/*
+ * Initialization of a JPEG decompression object.
+ * The error manager must already be set up (in case memory manager fails).
+ */
+
+GLOBAL(void)
+jpeg_CreateDecompress (j_decompress_ptr cinfo, int version, size_t structsize)
+{
+  int i;
+
+  /* Guard against version mismatches between library and caller. */
+  cinfo->mem = NULL;		/* so jpeg_destroy knows mem mgr not called */
+  if (version != JPEG_LIB_VERSION)
+    ERREXIT2(cinfo, JERR_BAD_LIB_VERSION, JPEG_LIB_VERSION, version);
+  if (structsize != SIZEOF(struct jpeg_decompress_struct))
+    ERREXIT2(cinfo, JERR_BAD_STRUCT_SIZE,
+	     (int) SIZEOF(struct jpeg_decompress_struct), (int) structsize);
+
+  /* For debugging purposes, we zero the whole master structure.
+   * But the application has already set the err pointer, and may have set
+   * client_data, so we have to save and restore those fields.
+   * Note: if application hasn't set client_data, tools like Purify may
+   * complain here.
+   */
+  {
+    struct jpeg_error_mgr * err = cinfo->err;
+    void * client_data = cinfo->client_data; /* ignore Purify complaint here */
+    MEMZERO(cinfo, SIZEOF(struct jpeg_decompress_struct));
+    cinfo->err = err;
+    cinfo->client_data = client_data;
+  }
+  cinfo->is_decompressor = TRUE;
+
+  /* Initialize a memory manager instance for this object */
+  jinit_memory_mgr((j_common_ptr) cinfo);
+
+  /* Zero out pointers to permanent structures. */
+  cinfo->progress = NULL;
+  cinfo->src = NULL;
+
+  for (i = 0; i < NUM_QUANT_TBLS; i++)
+    cinfo->quant_tbl_ptrs[i] = NULL;
+
+  for (i = 0; i < NUM_HUFF_TBLS; i++) {
+    cinfo->dc_huff_tbl_ptrs[i] = NULL;
+    cinfo->ac_huff_tbl_ptrs[i] = NULL;
+  }
+
+  /* Initialize marker processor so application can override methods
+   * for COM, APPn markers before calling jpeg_read_header.
+   */
+  cinfo->marker_list = NULL;
+  jinit_marker_reader(cinfo);
+
+  /* And initialize the overall input controller. */
+  jinit_input_controller(cinfo);
+
+  /* OK, I'm ready */
+  cinfo->global_state = DSTATE_START;
+}
+
+
+/*
+ * Destruction of a JPEG decompression object
+ */
+
+GLOBAL(void)
+jpeg_destroy_decompress (j_decompress_ptr cinfo)
+{
+  jpeg_destroy((j_common_ptr) cinfo); /* use common routine */
+}
+
+
+/*
+ * Abort processing of a JPEG decompression operation,
+ * but don't destroy the object itself.
+ */
+
+GLOBAL(void)
+jpeg_abort_decompress (j_decompress_ptr cinfo)
+{
+  jpeg_abort((j_common_ptr) cinfo); /* use common routine */
+}
+
+
+/*
+ * Set default decompression parameters.
+ */
+
+LOCAL(void)
+default_decompress_parms (j_decompress_ptr cinfo)
+{
+  /* Guess the input colorspace, and set output colorspace accordingly. */
+  /* (Wish JPEG committee had provided a real way to specify this...) */
+  /* Note application may override our guesses. */
+  switch (cinfo->num_components) {
+  case 1:
+    cinfo->jpeg_color_space = JCS_GRAYSCALE;
+    cinfo->out_color_space = JCS_GRAYSCALE;
+    break;
+
+  case 3:
+    if (cinfo->saw_JFIF_marker) {
+      cinfo->jpeg_color_space = JCS_YCbCr; /* JFIF implies YCbCr */
+    } else if (cinfo->saw_Adobe_marker) {
+      switch (cinfo->Adobe_transform) {
+      case 0:
+	cinfo->jpeg_color_space = JCS_RGB;
+	break;
+      case 1:
+	cinfo->jpeg_color_space = JCS_YCbCr;
+	break;
+      default:
+	WARNMS1(cinfo, JWRN_ADOBE_XFORM, cinfo->Adobe_transform);
+	cinfo->jpeg_color_space = JCS_YCbCr; /* assume it's YCbCr */
+	break;
+      }
+    } else {
+      /* Saw no special markers, try to guess from the component IDs */
+      int cid0 = cinfo->comp_info[0].component_id;
+      int cid1 = cinfo->comp_info[1].component_id;
+      int cid2 = cinfo->comp_info[2].component_id;
+
+      if (cid0 == 1 && cid1 == 2 && cid2 == 3)
+	cinfo->jpeg_color_space = JCS_YCbCr; /* assume JFIF w/out marker */
+      else if (cid0 == 82 && cid1 == 71 && cid2 == 66)
+	cinfo->jpeg_color_space = JCS_RGB; /* ASCII 'R', 'G', 'B' */
+      else {
+	if (cinfo->process == JPROC_LOSSLESS) {
+	  TRACEMS3(cinfo, 1, JTRC_UNKNOWN_LOSSLESS_IDS, cid0, cid1, cid2);
+	  cinfo->jpeg_color_space = JCS_RGB; /* assume it's RGB */
+	}
+	else {  /* Lossy processes */
+	  TRACEMS3(cinfo, 1, JTRC_UNKNOWN_LOSSY_IDS, cid0, cid1, cid2);
+	  cinfo->jpeg_color_space = JCS_YCbCr; /* assume it's YCbCr */
+	}
+      }
+    }
+    /* Always guess RGB is proper output colorspace. */
+    cinfo->out_color_space = JCS_RGB;
+    break;
+
+  case 4:
+    if (cinfo->saw_Adobe_marker) {
+      switch (cinfo->Adobe_transform) {
+      case 0:
+	cinfo->jpeg_color_space = JCS_CMYK;
+	break;
+      case 2:
+	cinfo->jpeg_color_space = JCS_YCCK;
+	break;
+      default:
+	WARNMS1(cinfo, JWRN_ADOBE_XFORM, cinfo->Adobe_transform);
+	cinfo->jpeg_color_space = JCS_YCCK; /* assume it's YCCK */
+	break;
+      }
+    } else {
+      /* No special markers, assume straight CMYK. */
+      cinfo->jpeg_color_space = JCS_CMYK;
+    }
+    cinfo->out_color_space = JCS_CMYK;
+    break;
+
+  default:
+    cinfo->jpeg_color_space = JCS_UNKNOWN;
+    cinfo->out_color_space = JCS_UNKNOWN;
+    break;
+  }
+
+  /* Set defaults for other decompression parameters. */
+  cinfo->scale_num = 1;		/* 1:1 scaling */
+  cinfo->scale_denom = 1;
+  cinfo->output_gamma = 1.0;
+  cinfo->buffered_image = FALSE;
+  cinfo->raw_data_out = FALSE;
+  cinfo->dct_method = JDCT_DEFAULT;
+  cinfo->do_fancy_upsampling = TRUE;
+  cinfo->do_block_smoothing = TRUE;
+  cinfo->quantize_colors = FALSE;
+  /* We set these in case application only sets quantize_colors. */
+  cinfo->dither_mode = JDITHER_FS;
+#ifdef QUANT_2PASS_SUPPORTED
+  cinfo->two_pass_quantize = TRUE;
+#else
+  cinfo->two_pass_quantize = FALSE;
+#endif
+  cinfo->desired_number_of_colors = 256;
+  cinfo->colormap = NULL;
+  /* Initialize for no mode change in buffered-image mode. */
+  cinfo->enable_1pass_quant = FALSE;
+  cinfo->enable_external_quant = FALSE;
+  cinfo->enable_2pass_quant = FALSE;
+}
+
+
+/*
+ * Decompression startup: read start of JPEG datastream to see what's there.
+ * Need only initialize JPEG object and supply a data source before calling.
+ *
+ * This routine will read as far as the first SOS marker (ie, actual start of
+ * compressed data), and will save all tables and parameters in the JPEG
+ * object.  It will also initialize the decompression parameters to default
+ * values, and finally return JPEG_HEADER_OK.  On return, the application may
+ * adjust the decompression parameters and then call jpeg_start_decompress.
+ * (Or, if the application only wanted to determine the image parameters,
+ * the data need not be decompressed.  In that case, call jpeg_abort or
+ * jpeg_destroy to release any temporary space.)
+ * If an abbreviated (tables only) datastream is presented, the routine will
+ * return JPEG_HEADER_TABLES_ONLY upon reaching EOI.  The application may then
+ * re-use the JPEG object to read the abbreviated image datastream(s).
+ * It is unnecessary (but OK) to call jpeg_abort in this case.
+ * The JPEG_SUSPENDED return code only occurs if the data source module
+ * requests suspension of the decompressor.  In this case the application
+ * should load more source data and then re-call jpeg_read_header to resume
+ * processing.
+ * If a non-suspending data source is used and require_image is TRUE, then the
+ * return code need not be inspected since only JPEG_HEADER_OK is possible.
+ *
+ * This routine is now just a front end to jpeg_consume_input, with some
+ * extra error checking.
+ */
+
+GLOBAL(int)
+jpeg_read_header (j_decompress_ptr cinfo, boolean require_image)
+{
+  int retcode;
+
+  if (cinfo->global_state != DSTATE_START &&
+      cinfo->global_state != DSTATE_INHEADER)
+    ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);
+
+  retcode = jpeg_consume_input(cinfo);
+
+  switch (retcode) {
+  case JPEG_REACHED_SOS:
+    retcode = JPEG_HEADER_OK;
+    break;
+  case JPEG_REACHED_EOI:
+    if (require_image)		/* Complain if application wanted an image */
+      ERREXIT(cinfo, JERR_NO_IMAGE);
+    /* Reset to start state; it would be safer to require the application to
+     * call jpeg_abort, but we can't change it now for compatibility reasons.
+     * A side effect is to free any temporary memory (there shouldn't be any).
+     */
+    jpeg_abort((j_common_ptr) cinfo); /* sets state = DSTATE_START */
+    retcode = JPEG_HEADER_TABLES_ONLY;
+    break;
+  case JPEG_SUSPENDED:
+    /* no work */
+    break;
+  }
+
+  return retcode;
+}
+
+
+/*
+ * Consume data in advance of what the decompressor requires.
+ * This can be called at any time once the decompressor object has
+ * been created and a data source has been set up.
+ *
+ * This routine is essentially a state machine that handles a couple
+ * of critical state-transition actions, namely initial setup and
+ * transition from header scanning to ready-for-start_decompress.
+ * All the actual input is done via the input controller's consume_input
+ * method.
+ */
+
+GLOBAL(int)
+jpeg_consume_input (j_decompress_ptr cinfo)
+{
+  int retcode = JPEG_SUSPENDED;
+
+  /* NB: every possible DSTATE value should be listed in this switch */
+  switch (cinfo->global_state) {
+  case DSTATE_START:
+    /* Start-of-datastream actions: reset appropriate modules */
+    (*cinfo->inputctl->reset_input_controller) (cinfo);
+    /* Initialize application's data source module */
+    (*cinfo->src->init_source) (cinfo);
+    cinfo->global_state = DSTATE_INHEADER;
+    /*FALLTHROUGH*/
+  case DSTATE_INHEADER:
+    retcode = (*cinfo->inputctl->consume_input) (cinfo);
+    if (retcode == JPEG_REACHED_SOS) { /* Found SOS, prepare to decompress */
+      /* Set up default parameters based on header data */
+      default_decompress_parms(cinfo);
+      /* Set global state: ready for start_decompress */
+      cinfo->global_state = DSTATE_READY;
+    }
+    break;
+  case DSTATE_READY:
+    /* Can't advance past first SOS until start_decompress is called */
+    retcode = JPEG_REACHED_SOS;
+    break;
+  case DSTATE_PRELOAD:
+  case DSTATE_PRESCAN:
+  case DSTATE_SCANNING:
+  case DSTATE_RAW_OK:
+  case DSTATE_BUFIMAGE:
+  case DSTATE_BUFPOST:
+  case DSTATE_STOPPING:
+    retcode = (*cinfo->inputctl->consume_input) (cinfo);
+    break;
+  default:
+    ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);
+  }
+  return retcode;
+}
+
+
+/*
+ * Have we finished reading the input file?
+ */
+
+GLOBAL(boolean)
+jpeg_input_complete (j_decompress_ptr cinfo)
+{
+  /* Check for valid jpeg object */
+  if (cinfo->global_state < DSTATE_START ||
+      cinfo->global_state > DSTATE_STOPPING)
+    ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);
+  return cinfo->inputctl->eoi_reached;
+}
+
+
+/*
+ * Is there more than one scan?
+ */
+
+GLOBAL(boolean)
+jpeg_has_multiple_scans (j_decompress_ptr cinfo)
+{
+  /* Only valid after jpeg_read_header completes */
+  if (cinfo->global_state < DSTATE_READY ||
+      cinfo->global_state > DSTATE_STOPPING)
+    ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);
+  return cinfo->inputctl->has_multiple_scans;
+}
+
+
+/*
+ * Finish JPEG decompression.
+ *
+ * This will normally just verify the file trailer and release temp storage.
+ *
+ * Returns FALSE if suspended.  The return value need be inspected only if
+ * a suspending data source is used.
+ */
+
+GLOBAL(boolean)
+jpeg_finish_decompress (j_decompress_ptr cinfo)
+{
+  if ((cinfo->global_state == DSTATE_SCANNING ||
+       cinfo->global_state == DSTATE_RAW_OK) && ! cinfo->buffered_image) {
+    /* Terminate final pass of non-buffered mode */
+    if (cinfo->output_scanline < cinfo->output_height)
+      ERREXIT(cinfo, JERR_TOO_LITTLE_DATA);
+    (*cinfo->master->finish_output_pass) (cinfo);
+    cinfo->global_state = DSTATE_STOPPING;
+  } else if (cinfo->global_state == DSTATE_BUFIMAGE) {
+    /* Finishing after a buffered-image operation */
+    cinfo->global_state = DSTATE_STOPPING;
+  } else if (cinfo->global_state != DSTATE_STOPPING) {
+    /* STOPPING = repeat call after a suspension, anything else is error */
+    ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);
+  }
+  /* Read until EOI */
+  while (! cinfo->inputctl->eoi_reached) {
+    if ((*cinfo->inputctl->consume_input) (cinfo) == JPEG_SUSPENDED)
+      return FALSE;		/* Suspend, come back later */
+  }
+  /* Do final cleanup */
+  (*cinfo->src->term_source) (cinfo);
+  /* We can use jpeg_abort to release memory and reset global_state */
+  jpeg_abort((j_common_ptr) cinfo);
+  return TRUE;
+}
diff --git a/uppsrc/plugin/jpg/lib/jdapistd.c b/uppsrc/plugin/jpg/lib/jdapistd.c
new file mode 100644
index 000000000..6577e5a5e
--- /dev/null
+++ b/uppsrc/plugin/jpg/lib/jdapistd.c
@@ -0,0 +1,275 @@
+/*
+ * jdapistd.c
+ *
+ * Copyright (C) 1994-1998, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains application interface code for the decompression half
+ * of the JPEG library.  These are the "standard" API routines that are
+ * used in the normal full-decompression case.  They are not used by a
+ * transcoding-only application.  Note that if an application links in
+ * jpeg_start_decompress, it will end up linking in the entire decompressor.
+ * We thus must separate this file from jdapimin.c to avoid linking the
+ * whole decompression library into a transcoder.
+ */
+
+#define JPEG_INTERNALS
+#include "jinclude.h"
+#include "jpeglib.h"
+
+
+/* Forward declarations */
+LOCAL(boolean) output_pass_setup JPP((j_decompress_ptr cinfo));
+
+
+/*
+ * Decompression initialization.
+ * jpeg_read_header must be completed before calling this.
+ *
+ * If a multipass operating mode was selected, this will do all but the
+ * last pass, and thus may take a great deal of time.
+ *
+ * Returns FALSE if suspended.  The return value need be inspected only if
+ * a suspending data source is used.
+ */
+
+GLOBAL(boolean)
+jpeg_start_decompress (j_decompress_ptr cinfo)
+{
+  if (cinfo->global_state == DSTATE_READY) {
+    /* First call: initialize master control, select active modules */
+    jinit_master_decompress(cinfo);
+    if (cinfo->buffered_image) {
+      /* No more work here; expecting jpeg_start_output next */
+      cinfo->global_state = DSTATE_BUFIMAGE;
+      return TRUE;
+    }
+    cinfo->global_state = DSTATE_PRELOAD;
+  }
+  if (cinfo->global_state == DSTATE_PRELOAD) {
+    /* If file has multiple scans, absorb them all into the coef buffer */
+    if (cinfo->inputctl->has_multiple_scans) {
+#ifdef D_MULTISCAN_FILES_SUPPORTED
+      for (;;) {
+	int retcode;
+	/* Call progress monitor hook if present */
+	if (cinfo->progress != NULL)
+	  (*cinfo->progress->progress_monitor) ((j_common_ptr) cinfo);
+	/* Absorb some more input */
+	retcode = (*cinfo->inputctl->consume_input) (cinfo);
+	if (retcode == JPEG_SUSPENDED)
+	  return FALSE;
+	if (retcode == JPEG_REACHED_EOI)
+	  break;
+	/* Advance progress counter if appropriate */
+	if (cinfo->progress != NULL &&
+	    (retcode == JPEG_ROW_COMPLETED || retcode == JPEG_REACHED_SOS)) {
+	  if (++cinfo->progress->pass_counter >= cinfo->progress->pass_limit) {
+	    /* jdmaster underestimated number of scans; ratchet up one scan */
+	    cinfo->progress->pass_limit += (long) cinfo->total_iMCU_rows;
+	  }
+	}
+      }
+#else
+      ERREXIT(cinfo, JERR_NOT_COMPILED);
+#endif /* D_MULTISCAN_FILES_SUPPORTED */
+    }
+    cinfo->output_scan_number = cinfo->input_scan_number;
+  } else if (cinfo->global_state != DSTATE_PRESCAN)
+    ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);
+  /* Perform any dummy output passes, and set up for the final pass */
+  return output_pass_setup(cinfo);
+}
+
+
+/*
+ * Set up for an output pass, and perform any dummy pass(es) needed.
+ * Common subroutine for jpeg_start_decompress and jpeg_start_output.
+ * Entry: global_state = DSTATE_PRESCAN only if previously suspended.
+ * Exit: If done, returns TRUE and sets global_state for proper output mode.
+ *       If suspended, returns FALSE and sets global_state = DSTATE_PRESCAN.
+ */
+
+LOCAL(boolean)
+output_pass_setup (j_decompress_ptr cinfo)
+{
+  if (cinfo->global_state != DSTATE_PRESCAN) {
+    /* First call: do pass setup */
+    (*cinfo->master->prepare_for_output_pass) (cinfo);
+    cinfo->output_scanline = 0;
+    cinfo->global_state = DSTATE_PRESCAN;
+  }
+  /* Loop over any required dummy passes */
+  while (cinfo->master->is_dummy_pass) {
+#ifdef QUANT_2PASS_SUPPORTED
+    /* Crank through the dummy pass */
+    while (cinfo->output_scanline < cinfo->output_height) {
+      JDIMENSION last_scanline;
+      /* Call progress monitor hook if present */
+      if (cinfo->progress != NULL) {
+	cinfo->progress->pass_counter = (long) cinfo->output_scanline;
+	cinfo->progress->pass_limit = (long) cinfo->output_height;
+	(*cinfo->progress->progress_monitor) ((j_common_ptr) cinfo);
+      }
+      /* Process some data */
+      last_scanline = cinfo->output_scanline;
+      (*cinfo->main->process_data) (cinfo, (JSAMPARRAY) NULL,
+				    &cinfo->output_scanline, (JDIMENSION) 0);
+      if (cinfo->output_scanline == last_scanline)
+	return FALSE;		/* No progress made, must suspend */
+    }
+    /* Finish up dummy pass, and set up for another one */
+    (*cinfo->master->finish_output_pass) (cinfo);
+    (*cinfo->master->prepare_for_output_pass) (cinfo);
+    cinfo->output_scanline = 0;
+#else
+    ERREXIT(cinfo, JERR_NOT_COMPILED);
+#endif /* QUANT_2PASS_SUPPORTED */
+  }
+  /* Ready for application to drive output pass through
+   * jpeg_read_scanlines or jpeg_read_raw_data.
+   */
+  cinfo->global_state = cinfo->raw_data_out ? DSTATE_RAW_OK : DSTATE_SCANNING;
+  return TRUE;
+}
+
+
+/*
+ * Read some scanlines of data from the JPEG decompressor.
+ *
+ * The return value will be the number of lines actually read.
+ * This may be less than the number requested in several cases,
+ * including bottom of image, data source suspension, and operating
+ * modes that emit multiple scanlines at a time.
+ *
+ * Note: we warn about excess calls to jpeg_read_scanlines() since
+ * this likely signals an application programmer error.  However,
+ * an oversize buffer (max_lines > scanlines remaining) is not an error.
+ */
+
+GLOBAL(JDIMENSION)
+jpeg_read_scanlines (j_decompress_ptr cinfo, JSAMPARRAY scanlines,
+		     JDIMENSION max_lines)
+{
+  JDIMENSION row_ctr;
+
+  if (cinfo->global_state != DSTATE_SCANNING)
+    ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);
+  if (cinfo->output_scanline >= cinfo->output_height) {
+    WARNMS(cinfo, JWRN_TOO_MUCH_DATA);
+    return 0;
+  }
+
+  /* Call progress monitor hook if present */
+  if (cinfo->progress != NULL) {
+    cinfo->progress->pass_counter = (long) cinfo->output_scanline;
+    cinfo->progress->pass_limit = (long) cinfo->output_height;
+    (*cinfo->progress->progress_monitor) ((j_common_ptr) cinfo);
+  }
+
+  /* Process some data */
+  row_ctr = 0;
+  (*cinfo->main->process_data) (cinfo, scanlines, &row_ctr, max_lines);
+  cinfo->output_scanline += row_ctr;
+  return row_ctr;
+}
+
+
+/*
+ * Alternate entry point to read raw data.
+ * Processes exactly one iMCU row per call, unless suspended.
+ */
+
+GLOBAL(JDIMENSION)
+jpeg_read_raw_data (j_decompress_ptr cinfo, JSAMPIMAGE data,
+		    JDIMENSION max_lines)
+{
+  JDIMENSION lines_per_iMCU_row;
+
+  if (cinfo->global_state != DSTATE_RAW_OK)
+    ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);
+  if (cinfo->output_scanline >= cinfo->output_height) {
+    WARNMS(cinfo, JWRN_TOO_MUCH_DATA);
+    return 0;
+  }
+
+  /* Call progress monitor hook if present */
+  if (cinfo->progress != NULL) {
+    cinfo->progress->pass_counter = (long) cinfo->output_scanline;
+    cinfo->progress->pass_limit = (long) cinfo->output_height;
+    (*cinfo->progress->progress_monitor) ((j_common_ptr) cinfo);
+  }
+
+  /* Verify that at least one iMCU row can be returned. */
+  lines_per_iMCU_row = cinfo->max_v_samp_factor * cinfo->min_codec_data_unit;
+  if (max_lines < lines_per_iMCU_row)
+    ERREXIT(cinfo, JERR_BUFFER_SIZE);
+
+  /* Decompress directly into user's buffer. */
+  if (! (*cinfo->codec->decompress_data) (cinfo, data))
+    return 0;			/* suspension forced, can do nothing more */
+
+  /* OK, we processed one iMCU row. */
+  cinfo->output_scanline += lines_per_iMCU_row;
+  return lines_per_iMCU_row;
+}
+
+
+/* Additional entry points for buffered-image mode. */
+
+#ifdef D_MULTISCAN_FILES_SUPPORTED
+
+/*
+ * Initialize for an output pass in buffered-image mode.
+ */
+
+GLOBAL(boolean)
+jpeg_start_output (j_decompress_ptr cinfo, int scan_number)
+{
+  if (cinfo->global_state != DSTATE_BUFIMAGE &&
+      cinfo->global_state != DSTATE_PRESCAN)
+    ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);
+  /* Limit scan number to valid range */
+  if (scan_number <= 0)
+    scan_number = 1;
+  if (cinfo->inputctl->eoi_reached &&
+      scan_number > cinfo->input_scan_number)
+    scan_number = cinfo->input_scan_number;
+  cinfo->output_scan_number = scan_number;
+  /* Perform any dummy output passes, and set up for the real pass */
+  return output_pass_setup(cinfo);
+}
+
+
+/*
+ * Finish up after an output pass in buffered-image mode.
+ *
+ * Returns FALSE if suspended.  The return value need be inspected only if
+ * a suspending data source is used.
+ */
+
+GLOBAL(boolean)
+jpeg_finish_output (j_decompress_ptr cinfo)
+{
+  if ((cinfo->global_state == DSTATE_SCANNING ||
+       cinfo->global_state == DSTATE_RAW_OK) && cinfo->buffered_image) {
+    /* Terminate this pass. */
+    /* We do not require the whole pass to have been completed. */
+    (*cinfo->master->finish_output_pass) (cinfo);
+    cinfo->global_state = DSTATE_BUFPOST;
+  } else if (cinfo->global_state != DSTATE_BUFPOST) {
+    /* BUFPOST = repeat call after a suspension, anything else is error */
+    ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);
+  }
+  /* Read markers looking for SOS or EOI */
+  while (cinfo->input_scan_number <= cinfo->output_scan_number &&
+	 ! cinfo->inputctl->eoi_reached) {
+    if ((*cinfo->inputctl->consume_input) (cinfo) == JPEG_SUSPENDED)
+      return FALSE;		/* Suspend, come back later */
+  }
+  cinfo->global_state = DSTATE_BUFIMAGE;
+  return TRUE;
+}
+
+#endif /* D_MULTISCAN_FILES_SUPPORTED */
diff --git a/uppsrc/plugin/jpg/lib/jdatadst.c b/uppsrc/plugin/jpg/lib/jdatadst.c
new file mode 100644
index 000000000..a8f6fb0e0
--- /dev/null
+++ b/uppsrc/plugin/jpg/lib/jdatadst.c
@@ -0,0 +1,151 @@
+/*
+ * jdatadst.c
+ *
+ * Copyright (C) 1994-1996, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains compression data destination routines for the case of
+ * emitting JPEG data to a file (or any stdio stream).  While these routines
+ * are sufficient for most applications, some will want to use a different
+ * destination manager.
+ * IMPORTANT: we assume that fwrite() will correctly transcribe an array of
+ * JOCTETs into 8-bit-wide elements on external storage.  If char is wider
+ * than 8 bits on your machine, you may need to do some tweaking.
+ */
+
+/* this is not a core library module, so it doesn't define JPEG_INTERNALS */
+#include "jinclude.h"
+#include "jpeglib.h"
+#include "jerror.h"
+
+
+/* Expanded data destination object for stdio output */
+
+typedef struct {
+  struct jpeg_destination_mgr pub; /* public fields */
+
+  FILE * outfile;		/* target stream */
+  JOCTET * buffer;		/* start of buffer */
+} my_destination_mgr;
+
+typedef my_destination_mgr * my_dest_ptr;
+
+#define OUTPUT_BUF_SIZE  4096	/* choose an efficiently fwrite'able size */
+
+
+/*
+ * Initialize destination --- called by jpeg_start_compress
+ * before any data is actually written.
+ */
+
+METHODDEF(void)
+init_destination (j_compress_ptr cinfo)
+{
+  my_dest_ptr dest = (my_dest_ptr) cinfo->dest;
+
+  /* Allocate the output buffer --- it will be released when done with image */
+  dest->buffer = (JOCTET *)
+      (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+				  OUTPUT_BUF_SIZE * SIZEOF(JOCTET));
+
+  dest->pub.next_output_byte = dest->buffer;
+  dest->pub.free_in_buffer = OUTPUT_BUF_SIZE;
+}
+
+
+/*
+ * Empty the output buffer --- called whenever buffer fills up.
+ *
+ * In typical applications, this should write the entire output buffer
+ * (ignoring the current state of next_output_byte & free_in_buffer),
+ * reset the pointer & count to the start of the buffer, and return TRUE
+ * indicating that the buffer has been dumped.
+ *
+ * In applications that need to be able to suspend compression due to output
+ * overrun, a FALSE return indicates that the buffer cannot be emptied now.
+ * In this situation, the compressor will return to its caller (possibly with
+ * an indication that it has not accepted all the supplied scanlines).  The
+ * application should resume compression after it has made more room in the
+ * output buffer.  Note that there are substantial restrictions on the use of
+ * suspension --- see the documentation.
+ *
+ * When suspending, the compressor will back up to a convenient restart point
+ * (typically the start of the current MCU). next_output_byte & free_in_buffer
+ * indicate where the restart point will be if the current call returns FALSE.
+ * Data beyond this point will be regenerated after resumption, so do not
+ * write it out when emptying the buffer externally.
+ */
+
+METHODDEF(boolean)
+empty_output_buffer (j_compress_ptr cinfo)
+{
+  my_dest_ptr dest = (my_dest_ptr) cinfo->dest;
+
+  if (JFWRITE(dest->outfile, dest->buffer, OUTPUT_BUF_SIZE) !=
+      (size_t) OUTPUT_BUF_SIZE)
+    ERREXIT(cinfo, JERR_FILE_WRITE);
+
+  dest->pub.next_output_byte = dest->buffer;
+  dest->pub.free_in_buffer = OUTPUT_BUF_SIZE;
+
+  return TRUE;
+}
+
+
+/*
+ * Terminate destination --- called by jpeg_finish_compress
+ * after all data has been written.  Usually needs to flush buffer.
+ *
+ * NB: *not* called by jpeg_abort or jpeg_destroy; surrounding
+ * application must deal with any cleanup that should happen even
+ * for error exit.
+ */
+
+METHODDEF(void)
+term_destination (j_compress_ptr cinfo)
+{
+  my_dest_ptr dest = (my_dest_ptr) cinfo->dest;
+  size_t datacount = OUTPUT_BUF_SIZE - dest->pub.free_in_buffer;
+
+  /* Write any data remaining in the buffer */
+  if (datacount > 0) {
+    if (JFWRITE(dest->outfile, dest->buffer, datacount) != datacount)
+      ERREXIT(cinfo, JERR_FILE_WRITE);
+  }
+  fflush(dest->outfile);
+  /* Make sure we wrote the output file OK */
+  if (ferror(dest->outfile))
+    ERREXIT(cinfo, JERR_FILE_WRITE);
+}
+
+
+/*
+ * Prepare for output to a stdio stream.
+ * The caller must have already opened the stream, and is responsible
+ * for closing it after finishing compression.
+ */
+
+GLOBAL(void)
+jpeg_stdio_dest (j_compress_ptr cinfo, FILE * outfile)
+{
+  my_dest_ptr dest;
+
+  /* The destination object is made permanent so that multiple JPEG images
+   * can be written to the same file without re-executing jpeg_stdio_dest.
+   * This makes it dangerous to use this manager and a different destination
+   * manager serially with the same JPEG object, because their private object
+   * sizes may be different.  Caveat programmer.
+   */
+  if (cinfo->dest == NULL) {	/* first time for this JPEG object? */
+    cinfo->dest = (struct jpeg_destination_mgr *)
+      (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT,
+				  SIZEOF(my_destination_mgr));
+  }
+
+  dest = (my_dest_ptr) cinfo->dest;
+  dest->pub.init_destination = init_destination;
+  dest->pub.empty_output_buffer = empty_output_buffer;
+  dest->pub.term_destination = term_destination;
+  dest->outfile = outfile;
+}
diff --git a/uppsrc/plugin/jpg/lib/jdatasrc.c b/uppsrc/plugin/jpg/lib/jdatasrc.c
new file mode 100644
index 000000000..edc752bf5
--- /dev/null
+++ b/uppsrc/plugin/jpg/lib/jdatasrc.c
@@ -0,0 +1,212 @@
+/*
+ * jdatasrc.c
+ *
+ * Copyright (C) 1994-1996, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains decompression data source routines for the case of
+ * reading JPEG data from a file (or any stdio stream).  While these routines
+ * are sufficient for most applications, some will want to use a different
+ * source manager.
+ * IMPORTANT: we assume that fread() will correctly transcribe an array of
+ * JOCTETs from 8-bit-wide elements on external storage.  If char is wider
+ * than 8 bits on your machine, you may need to do some tweaking.
+ */
+
+/* this is not a core library module, so it doesn't define JPEG_INTERNALS */
+#include "jinclude.h"
+#include "jpeglib.h"
+#include "jerror.h"
+
+
+/* Expanded data source object for stdio input */
+
+typedef struct {
+  struct jpeg_source_mgr pub;	/* public fields */
+
+  FILE * infile;		/* source stream */
+  JOCTET * buffer;		/* start of buffer */
+  boolean start_of_file;	/* have we gotten any data yet? */
+} my_source_mgr;
+
+typedef my_source_mgr * my_src_ptr;
+
+#define INPUT_BUF_SIZE  4096	/* choose an efficiently fread'able size */
+
+
+/*
+ * Initialize source --- called by jpeg_read_header
+ * before any data is actually read.
+ */
+
+METHODDEF(void)
+init_source (j_decompress_ptr cinfo)
+{
+  my_src_ptr src = (my_src_ptr) cinfo->src;
+
+  /* We reset the empty-input-file flag for each image,
+   * but we don't clear the input buffer.
+   * This is correct behavior for reading a series of images from one source.
+   */
+  src->start_of_file = TRUE;
+}
+
+
+/*
+ * Fill the input buffer --- called whenever buffer is emptied.
+ *
+ * In typical applications, this should read fresh data into the buffer
+ * (ignoring the current state of next_input_byte & bytes_in_buffer),
+ * reset the pointer & count to the start of the buffer, and return TRUE
+ * indicating that the buffer has been reloaded.  It is not necessary to
+ * fill the buffer entirely, only to obtain at least one more byte.
+ *
+ * There is no such thing as an EOF return.  If the end of the file has been
+ * reached, the routine has a choice of ERREXIT() or inserting fake data into
+ * the buffer.  In most cases, generating a warning message and inserting a
+ * fake EOI marker is the best course of action --- this will allow the
+ * decompressor to output however much of the image is there.  However,
+ * the resulting error message is misleading if the real problem is an empty
+ * input file, so we handle that case specially.
+ *
+ * In applications that need to be able to suspend compression due to input
+ * not being available yet, a FALSE return indicates that no more data can be
+ * obtained right now, but more may be forthcoming later.  In this situation,
+ * the decompressor will return to its caller (with an indication of the
+ * number of scanlines it has read, if any).  The application should resume
+ * decompression after it has loaded more data into the input buffer.  Note
+ * that there are substantial restrictions on the use of suspension --- see
+ * the documentation.
+ *
+ * When suspending, the decompressor will back up to a convenient restart point
+ * (typically the start of the current MCU). next_input_byte & bytes_in_buffer
+ * indicate where the restart point will be if the current call returns FALSE.
+ * Data beyond this point must be rescanned after resumption, so move it to
+ * the front of the buffer rather than discarding it.
+ */
+
+METHODDEF(boolean)
+fill_input_buffer (j_decompress_ptr cinfo)
+{
+  my_src_ptr src = (my_src_ptr) cinfo->src;
+  size_t nbytes;
+
+  nbytes = JFREAD(src->infile, src->buffer, INPUT_BUF_SIZE);
+
+  if (nbytes <= 0) {
+    if (src->start_of_file)	/* Treat empty input file as fatal error */
+      ERREXIT(cinfo, JERR_INPUT_EMPTY);
+    WARNMS(cinfo, JWRN_JPEG_EOF);
+    /* Insert a fake EOI marker */
+    src->buffer[0] = (JOCTET) 0xFF;
+    src->buffer[1] = (JOCTET) JPEG_EOI;
+    nbytes = 2;
+  }
+
+  src->pub.next_input_byte = src->buffer;
+  src->pub.bytes_in_buffer = nbytes;
+  src->start_of_file = FALSE;
+
+  return TRUE;
+}
+
+
+/*
+ * Skip data --- used to skip over a potentially large amount of
+ * uninteresting data (such as an APPn marker).
+ *
+ * Writers of suspendable-input applications must note that skip_input_data
+ * is not granted the right to give a suspension return.  If the skip extends
+ * beyond the data currently in the buffer, the buffer can be marked empty so
+ * that the next read will cause a fill_input_buffer call that can suspend.
+ * Arranging for additional bytes to be discarded before reloading the input
+ * buffer is the application writer's problem.
+ */
+
+METHODDEF(void)
+skip_input_data (j_decompress_ptr cinfo, long num_bytes)
+{
+  my_src_ptr src = (my_src_ptr) cinfo->src;
+
+  /* Just a dumb implementation for now.  Could use fseek() except
+   * it doesn't work on pipes.  Not clear that being smart is worth
+   * any trouble anyway --- large skips are infrequent.
+   */
+  if (num_bytes > 0) {
+    while (num_bytes > (long) src->pub.bytes_in_buffer) {
+      num_bytes -= (long) src->pub.bytes_in_buffer;
+      (void) fill_input_buffer(cinfo);
+      /* note we assume that fill_input_buffer will never return FALSE,
+       * so suspension need not be handled.
+       */
+    }
+    src->pub.next_input_byte += (size_t) num_bytes;
+    src->pub.bytes_in_buffer -= (size_t) num_bytes;
+  }
+}
+
+
+/*
+ * An additional method that can be provided by data source modules is the
+ * resync_to_restart method for error recovery in the presence of RST markers.
+ * For the moment, this source module just uses the default resync method
+ * provided by the JPEG library.  That method assumes that no backtracking
+ * is possible.
+ */
+
+
+/*
+ * Terminate source --- called by jpeg_finish_decompress
+ * after all data has been read.  Often a no-op.
+ *
+ * NB: *not* called by jpeg_abort or jpeg_destroy; surrounding
+ * application must deal with any cleanup that should happen even
+ * for error exit.
+ */
+
+METHODDEF(void)
+term_source (j_decompress_ptr cinfo)
+{
+  /* no work necessary here */
+}
+
+
+/*
+ * Prepare for input from a stdio stream.
+ * The caller must have already opened the stream, and is responsible
+ * for closing it after finishing decompression.
+ */
+
+GLOBAL(void)
+jpeg_stdio_src (j_decompress_ptr cinfo, FILE * infile)
+{
+  my_src_ptr src;
+
+  /* The source object and input buffer are made permanent so that a series
+   * of JPEG images can be read from the same file by calling jpeg_stdio_src
+   * only before the first one.  (If we discarded the buffer at the end of
+   * one image, we'd likely lose the start of the next one.)
+   * This makes it unsafe to use this manager and a different source
+   * manager serially with the same JPEG object.  Caveat programmer.
+   */
+  if (cinfo->src == NULL) {	/* first time for this JPEG object? */
+    cinfo->src = (struct jpeg_source_mgr *)
+      (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT,
+				  SIZEOF(my_source_mgr));
+    src = (my_src_ptr) cinfo->src;
+    src->buffer = (JOCTET *)
+      (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT,
+				  INPUT_BUF_SIZE * SIZEOF(JOCTET));
+  }
+
+  src = (my_src_ptr) cinfo->src;
+  src->pub.init_source = init_source;
+  src->pub.fill_input_buffer = fill_input_buffer;
+  src->pub.skip_input_data = skip_input_data;
+  src->pub.resync_to_restart = jpeg_resync_to_restart; /* use default method */
+  src->pub.term_source = term_source;
+  src->infile = infile;
+  src->pub.bytes_in_buffer = 0; /* forces fill_input_buffer on first read */
+  src->pub.next_input_byte = NULL; /* until buffer loaded */
+}
diff --git a/uppsrc/plugin/jpg/lib/jdcoefct.c b/uppsrc/plugin/jpg/lib/jdcoefct.c
new file mode 100644
index 000000000..4aa96fcca
--- /dev/null
+++ b/uppsrc/plugin/jpg/lib/jdcoefct.c
@@ -0,0 +1,743 @@
+/*
+ * jdcoefct.c
+ *
+ * Copyright (C) 1994-1998, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains the coefficient buffer controller for decompression.
+ * This controller is the top level of the lossy JPEG decompressor proper.
+ * The coefficient buffer lies between entropy decoding and inverse-DCT steps.
+ *
+ * In buffered-image mode, this controller is the interface between
+ * input-oriented processing and output-oriented processing.
+ * Also, the input side (only) is used when reading a file for transcoding.
+ */
+
+#define JPEG_INTERNALS
+#include "jinclude.h"
+#include "jpeglib.h"
+#include "jlossy.h"
+
+/* Block smoothing is only applicable for progressive JPEG, so: */
+#ifndef D_PROGRESSIVE_SUPPORTED
+#undef BLOCK_SMOOTHING_SUPPORTED
+#endif
+
+/* Private buffer controller object */
+
+typedef struct {
+  /* These variables keep track of the current location of the input side. */
+  /* cinfo->input_iMCU_row is also used for this. */
+  JDIMENSION MCU_ctr;		/* counts MCUs processed in current row */
+  int MCU_vert_offset;		/* counts MCU rows within iMCU row */
+  int MCU_rows_per_iMCU_row;	/* number of such rows needed */
+
+  /* The output side's location is represented by cinfo->output_iMCU_row. */
+
+  /* In single-pass modes, it's sufficient to buffer just one MCU.
+   * We allocate a workspace of D_MAX_DATA_UNITS_IN_MCU coefficient blocks,
+   * and let the entropy decoder write into that workspace each time.
+   * (On 80x86, the workspace is FAR even though it's not really very big;
+   * this is to keep the module interfaces unchanged when a large coefficient
+   * buffer is necessary.)
+   * In multi-pass modes, this array points to the current MCU's blocks
+   * within the virtual arrays; it is used only by the input side.
+   */
+  JBLOCKROW MCU_buffer[D_MAX_DATA_UNITS_IN_MCU];
+
+#ifdef D_MULTISCAN_FILES_SUPPORTED
+  /* In multi-pass modes, we need a virtual block array for each component. */
+  jvirt_barray_ptr whole_image[MAX_COMPONENTS];
+#endif
+
+#ifdef BLOCK_SMOOTHING_SUPPORTED
+  /* When doing block smoothing, we latch coefficient Al values here */
+  int * coef_bits_latch;
+#define SAVED_COEFS  6		/* we save coef_bits[0..5] */
+#endif
+} d_coef_controller;
+
+typedef d_coef_controller * d_coef_ptr;
+
+/* Forward declarations */
+METHODDEF(int) decompress_onepass
+	JPP((j_decompress_ptr cinfo, JSAMPIMAGE output_buf));
+#ifdef D_MULTISCAN_FILES_SUPPORTED
+METHODDEF(int) decompress_data
+	JPP((j_decompress_ptr cinfo, JSAMPIMAGE output_buf));
+#endif
+#ifdef BLOCK_SMOOTHING_SUPPORTED
+LOCAL(boolean) smoothing_ok JPP((j_decompress_ptr cinfo));
+METHODDEF(int) decompress_smooth_data
+	JPP((j_decompress_ptr cinfo, JSAMPIMAGE output_buf));
+#endif
+
+
+LOCAL(void)
+start_iMCU_row (j_decompress_ptr cinfo)
+/* Reset within-iMCU-row counters for a new row (input side) */
+{
+  j_lossy_d_ptr lossyd = (j_lossy_d_ptr) cinfo->codec;
+  d_coef_ptr coef = (d_coef_ptr) lossyd->coef_private;
+
+  /* In an interleaved scan, an MCU row is the same as an iMCU row.
+   * In a noninterleaved scan, an iMCU row has v_samp_factor MCU rows.
+   * But at the bottom of the image, process only what's left.
+   */
+  if (cinfo->comps_in_scan > 1) {
+    coef->MCU_rows_per_iMCU_row = 1;
+  } else {
+    if (cinfo->input_iMCU_row < (cinfo->total_iMCU_rows-1))
+      coef->MCU_rows_per_iMCU_row = cinfo->cur_comp_info[0]->v_samp_factor;
+    else
+      coef->MCU_rows_per_iMCU_row = cinfo->cur_comp_info[0]->last_row_height;
+  }
+
+  coef->MCU_ctr = 0;
+  coef->MCU_vert_offset = 0;
+}
+
+
+/*
+ * Initialize for an input processing pass.
+ */
+
+METHODDEF(void)
+start_input_pass (j_decompress_ptr cinfo)
+{
+  cinfo->input_iMCU_row = 0;
+  start_iMCU_row(cinfo);
+}
+
+
+/*
+ * Initialize for an output processing pass.
+ */
+
+METHODDEF(void)
+start_output_pass (j_decompress_ptr cinfo)
+{
+#ifdef BLOCK_SMOOTHING_SUPPORTED
+  j_lossy_d_ptr lossyd = (j_lossy_d_ptr) cinfo->codec;
+  d_coef_ptr coef = (d_coef_ptr) lossyd->coef_private;
+
+  /* If multipass, check to see whether to use block smoothing on this pass */
+  if (lossyd->coef_arrays != NULL) {
+    if (cinfo->do_block_smoothing && smoothing_ok(cinfo))
+      lossyd->pub.decompress_data = decompress_smooth_data;
+    else
+      lossyd->pub.decompress_data = decompress_data;
+  }
+#endif
+  cinfo->output_iMCU_row = 0;
+}
+
+
+/*
+ * Decompress and return some data in the single-pass case.
+ * Always attempts to emit one fully interleaved MCU row ("iMCU" row).
+ * Input and output must run in lockstep since we have only a one-MCU buffer.
+ * Return value is JPEG_ROW_COMPLETED, JPEG_SCAN_COMPLETED, or JPEG_SUSPENDED.
+ *
+ * NB: output_buf contains a plane for each component in image,
+ * which we index according to the component's SOF position.
+ */
+
+METHODDEF(int)
+decompress_onepass (j_decompress_ptr cinfo, JSAMPIMAGE output_buf)
+{
+  j_lossy_d_ptr lossyd = (j_lossy_d_ptr) cinfo->codec;
+  d_coef_ptr coef = (d_coef_ptr) lossyd->coef_private;
+  JDIMENSION MCU_col_num;	/* index of current MCU within row */
+  JDIMENSION last_MCU_col = cinfo->MCUs_per_row - 1;
+  JDIMENSION last_iMCU_row = cinfo->total_iMCU_rows - 1;
+  int blkn, ci, xindex, yindex, yoffset, useful_width;
+  JSAMPARRAY output_ptr;
+  JDIMENSION start_col, output_col;
+  jpeg_component_info *compptr;
+  inverse_DCT_method_ptr inverse_DCT;
+
+  /* Loop to process as much as one whole iMCU row */
+  for (yoffset = coef->MCU_vert_offset; yoffset < coef->MCU_rows_per_iMCU_row;
+       yoffset++) {
+    for (MCU_col_num = coef->MCU_ctr; MCU_col_num <= last_MCU_col;
+	 MCU_col_num++) {
+      /* Try to fetch an MCU.  Entropy decoder expects buffer to be zeroed. */
+      jzero_far((void FAR *) coef->MCU_buffer[0],
+		(size_t) (cinfo->data_units_in_MCU * SIZEOF(JBLOCK)));
+      if (! (*lossyd->entropy_decode_mcu) (cinfo, coef->MCU_buffer)) {
+	/* Suspension forced; update state counters and exit */
+	coef->MCU_vert_offset = yoffset;
+	coef->MCU_ctr = MCU_col_num;
+	return JPEG_SUSPENDED;
+      }
+      /* Determine where data should go in output_buf and do the IDCT thing.
+       * We skip dummy blocks at the right and bottom edges (but blkn gets
+       * incremented past them!).  Note the inner loop relies on having
+       * allocated the MCU_buffer[] blocks sequentially.
+       */
+      blkn = 0;			/* index of current DCT block within MCU */
+      for (ci = 0; ci < cinfo->comps_in_scan; ci++) {
+	compptr = cinfo->cur_comp_info[ci];
+	/* Don't bother to IDCT an uninteresting component. */
+	if (! compptr->component_needed) {
+	  blkn += compptr->MCU_data_units;
+	  continue;
+	}
+	inverse_DCT = lossyd->inverse_DCT[compptr->component_index];
+	useful_width = (MCU_col_num < last_MCU_col) ? compptr->MCU_width
+						    : compptr->last_col_width;
+	output_ptr = output_buf[compptr->component_index] +
+	  yoffset * compptr->codec_data_unit;
+	start_col = MCU_col_num * compptr->MCU_sample_width;
+	for (yindex = 0; yindex < compptr->MCU_height; yindex++) {
+	  if (cinfo->input_iMCU_row < last_iMCU_row ||
+	      yoffset+yindex < compptr->last_row_height) {
+	    output_col = start_col;
+	    for (xindex = 0; xindex < useful_width; xindex++) {
+	      (*inverse_DCT) (cinfo, compptr,
+			      (JCOEFPTR) coef->MCU_buffer[blkn+xindex],
+			      output_ptr, output_col);
+	      output_col += compptr->codec_data_unit;
+	    }
+	  }
+	  blkn += compptr->MCU_width;
+	  output_ptr += compptr->codec_data_unit;
+	}
+      }
+    }
+    /* Completed an MCU row, but perhaps not an iMCU row */
+    coef->MCU_ctr = 0;
+  }
+  /* Completed the iMCU row, advance counters for next one */
+  cinfo->output_iMCU_row++;
+  if (++(cinfo->input_iMCU_row) < cinfo->total_iMCU_rows) {
+    start_iMCU_row(cinfo);
+    return JPEG_ROW_COMPLETED;
+  }
+  /* Completed the scan */
+  (*cinfo->inputctl->finish_input_pass) (cinfo);
+  return JPEG_SCAN_COMPLETED;
+}
+
+
+/*
+ * Dummy consume-input routine for single-pass operation.
+ */
+
+METHODDEF(int)
+dummy_consume_data (j_decompress_ptr cinfo)
+{
+  return JPEG_SUSPENDED;	/* Always indicate nothing was done */
+}
+
+
+#ifdef D_MULTISCAN_FILES_SUPPORTED
+
+/*
+ * Consume input data and store it in the full-image coefficient buffer.
+ * We read as much as one fully interleaved MCU row ("iMCU" row) per call,
+ * ie, v_samp_factor block rows for each component in the scan.
+ * Return value is JPEG_ROW_COMPLETED, JPEG_SCAN_COMPLETED, or JPEG_SUSPENDED.
+ */
+
+METHODDEF(int)
+consume_data (j_decompress_ptr cinfo)
+{
+  j_lossy_d_ptr lossyd = (j_lossy_d_ptr) cinfo->codec;
+  d_coef_ptr coef = (d_coef_ptr) lossyd->coef_private;
+  JDIMENSION MCU_col_num;	/* index of current MCU within row */
+  int blkn, ci, xindex, yindex, yoffset;
+  JDIMENSION start_col;
+  JBLOCKARRAY buffer[MAX_COMPS_IN_SCAN];
+  JBLOCKROW buffer_ptr;
+  jpeg_component_info *compptr;
+
+  /* Align the virtual buffers for the components used in this scan. */
+  for (ci = 0; ci < cinfo->comps_in_scan; ci++) {
+    compptr = cinfo->cur_comp_info[ci];
+    buffer[ci] = (*cinfo->mem->access_virt_barray)
+      ((j_common_ptr) cinfo, coef->whole_image[compptr->component_index],
+       cinfo->input_iMCU_row * compptr->v_samp_factor,
+       (JDIMENSION) compptr->v_samp_factor, TRUE);
+    /* Note: entropy decoder expects buffer to be zeroed,
+     * but this is handled automatically by the memory manager
+     * because we requested a pre-zeroed array.
+     */
+  }
+
+  /* Loop to process one whole iMCU row */
+  for (yoffset = coef->MCU_vert_offset; yoffset < coef->MCU_rows_per_iMCU_row;
+       yoffset++) {
+    for (MCU_col_num = coef->MCU_ctr; MCU_col_num < cinfo->MCUs_per_row;
+	 MCU_col_num++) {
+      /* Construct list of pointers to DCT blocks belonging to this MCU */
+      blkn = 0;			/* index of current DCT block within MCU */
+      for (ci = 0; ci < cinfo->comps_in_scan; ci++) {
+	compptr = cinfo->cur_comp_info[ci];
+	start_col = MCU_col_num * compptr->MCU_width;
+	for (yindex = 0; yindex < compptr->MCU_height; yindex++) {
+	  buffer_ptr = buffer[ci][yindex+yoffset] + start_col;
+	  for (xindex = 0; xindex < compptr->MCU_width; xindex++) {
+	    coef->MCU_buffer[blkn++] = buffer_ptr++;
+	  }
+	}
+      }
+      /* Try to fetch the MCU. */
+      if (! (*lossyd->entropy_decode_mcu) (cinfo, coef->MCU_buffer)) {
+	/* Suspension forced; update state counters and exit */
+	coef->MCU_vert_offset = yoffset;
+	coef->MCU_ctr = MCU_col_num;
+	return JPEG_SUSPENDED;
+      }
+    }
+    /* Completed an MCU row, but perhaps not an iMCU row */
+    coef->MCU_ctr = 0;
+  }
+  /* Completed the iMCU row, advance counters for next one */
+  if (++(cinfo->input_iMCU_row) < cinfo->total_iMCU_rows) {
+    start_iMCU_row(cinfo);
+    return JPEG_ROW_COMPLETED;
+  }
+  /* Completed the scan */
+  (*cinfo->inputctl->finish_input_pass) (cinfo);
+  return JPEG_SCAN_COMPLETED;
+}
+
+
+/*
+ * Decompress and return some data in the multi-pass case.
+ * Always attempts to emit one fully interleaved MCU row ("iMCU" row).
+ * Return value is JPEG_ROW_COMPLETED, JPEG_SCAN_COMPLETED, or JPEG_SUSPENDED.
+ *
+ * NB: output_buf contains a plane for each component in image.
+ */
+
+METHODDEF(int)
+decompress_data (j_decompress_ptr cinfo, JSAMPIMAGE output_buf)
+{
+  j_lossy_d_ptr lossyd = (j_lossy_d_ptr) cinfo->codec;
+  d_coef_ptr coef = (d_coef_ptr) lossyd->coef_private;
+  JDIMENSION last_iMCU_row = cinfo->total_iMCU_rows - 1;
+  JDIMENSION block_num;
+  int ci, block_row, block_rows;
+  JBLOCKARRAY buffer;
+  JBLOCKROW buffer_ptr;
+  JSAMPARRAY output_ptr;
+  JDIMENSION output_col;
+  jpeg_component_info *compptr;
+  inverse_DCT_method_ptr inverse_DCT;
+
+  /* Force some input to be done if we are getting ahead of the input. */
+  while (cinfo->input_scan_number < cinfo->output_scan_number ||
+	 (cinfo->input_scan_number == cinfo->output_scan_number &&
+	  cinfo->input_iMCU_row <= cinfo->output_iMCU_row)) {
+    if ((*cinfo->inputctl->consume_input)(cinfo) == JPEG_SUSPENDED)
+      return JPEG_SUSPENDED;
+  }
+
+  /* OK, output from the virtual arrays. */
+  for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
+       ci++, compptr++) {
+    /* Don't bother to IDCT an uninteresting component. */
+    if (! compptr->component_needed)
+      continue;
+    /* Align the virtual buffer for this component. */
+    buffer = (*cinfo->mem->access_virt_barray)
+      ((j_common_ptr) cinfo, coef->whole_image[ci],
+       cinfo->output_iMCU_row * compptr->v_samp_factor,
+       (JDIMENSION) compptr->v_samp_factor, FALSE);
+    /* Count non-dummy DCT block rows in this iMCU row. */
+    if (cinfo->output_iMCU_row < last_iMCU_row)
+      block_rows = compptr->v_samp_factor;
+    else {
+      /* NB: can't use last_row_height here; it is input-side-dependent! */
+      block_rows = (int) (compptr->height_in_data_units % compptr->v_samp_factor);
+      if (block_rows == 0) block_rows = compptr->v_samp_factor;
+    }
+    inverse_DCT = lossyd->inverse_DCT[ci];
+    output_ptr = output_buf[ci];
+    /* Loop over all DCT blocks to be processed. */
+    for (block_row = 0; block_row < block_rows; block_row++) {
+      buffer_ptr = buffer[block_row];
+      output_col = 0;
+      for (block_num = 0; block_num < compptr->width_in_data_units; block_num++) {
+	(*inverse_DCT) (cinfo, compptr, (JCOEFPTR) buffer_ptr,
+			output_ptr, output_col);
+	buffer_ptr++;
+	output_col += compptr->codec_data_unit;
+      }
+      output_ptr += compptr->codec_data_unit;
+    }
+  }
+
+  if (++(cinfo->output_iMCU_row) < cinfo->total_iMCU_rows)
+    return JPEG_ROW_COMPLETED;
+  return JPEG_SCAN_COMPLETED;
+}
+
+#endif /* D_MULTISCAN_FILES_SUPPORTED */
+
+
+#ifdef BLOCK_SMOOTHING_SUPPORTED
+
+/*
+ * This code applies interblock smoothing as described by section K.8
+ * of the JPEG standard: the first 5 AC coefficients are estimated from
+ * the DC values of a DCT block and its 8 neighboring blocks.
+ * We apply smoothing only for progressive JPEG decoding, and only if
+ * the coefficients it can estimate are not yet known to full precision.
+ */
+
+/* Natural-order array positions of the first 5 zigzag-order coefficients */
+#define Q01_POS  1
+#define Q10_POS  8
+#define Q20_POS  16
+#define Q11_POS  9
+#define Q02_POS  2
+
+/*
+ * Determine whether block smoothing is applicable and safe.
+ * We also latch the current states of the coef_bits[] entries for the
+ * AC coefficients; otherwise, if the input side of the decompressor
+ * advances into a new scan, we might think the coefficients are known
+ * more accurately than they really are.
+ */
+
+LOCAL(boolean)
+smoothing_ok (j_decompress_ptr cinfo)
+{
+  j_lossy_d_ptr lossyd = (j_lossy_d_ptr) cinfo->codec;
+  d_coef_ptr coef = (d_coef_ptr) lossyd->coef_private;
+  boolean smoothing_useful = FALSE;
+  int ci, coefi;
+  jpeg_component_info *compptr;
+  JQUANT_TBL * qtable;
+  int * coef_bits;
+  int * coef_bits_latch;
+
+  if (! cinfo->process == JPROC_PROGRESSIVE || cinfo->coef_bits == NULL)
+    return FALSE;
+
+  /* Allocate latch area if not already done */
+  if (coef->coef_bits_latch == NULL)
+    coef->coef_bits_latch = (int *)
+      (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+				  cinfo->num_components *
+				  (SAVED_COEFS * SIZEOF(int)));
+  coef_bits_latch = coef->coef_bits_latch;
+
+  for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
+       ci++, compptr++) {
+    /* All components' quantization values must already be latched. */
+    if ((qtable = compptr->quant_table) == NULL)
+      return FALSE;
+    /* Verify DC & first 5 AC quantizers are nonzero to avoid zero-divide. */
+    if (qtable->quantval[0] == 0 ||
+	qtable->quantval[Q01_POS] == 0 ||
+	qtable->quantval[Q10_POS] == 0 ||
+	qtable->quantval[Q20_POS] == 0 ||
+	qtable->quantval[Q11_POS] == 0 ||
+	qtable->quantval[Q02_POS] == 0)
+      return FALSE;
+    /* DC values must be at least partly known for all components. */
+    coef_bits = cinfo->coef_bits[ci];
+    if (coef_bits[0] < 0)
+      return FALSE;
+    /* Block smoothing is helpful if some AC coefficients remain inaccurate. */
+    for (coefi = 1; coefi <= 5; coefi++) {
+      coef_bits_latch[coefi] = coef_bits[coefi];
+      if (coef_bits[coefi] != 0)
+	smoothing_useful = TRUE;
+    }
+    coef_bits_latch += SAVED_COEFS;
+  }
+
+  return smoothing_useful;
+}
+
+
+/*
+ * Variant of decompress_data for use when doing block smoothing.
+ */
+
+METHODDEF(int)
+decompress_smooth_data (j_decompress_ptr cinfo, JSAMPIMAGE output_buf)
+{
+  j_lossy_d_ptr lossyd = (j_lossy_d_ptr) cinfo->codec;
+  d_coef_ptr coef = (d_coef_ptr) lossyd->coef_private;
+  JDIMENSION last_iMCU_row = cinfo->total_iMCU_rows - 1;
+  JDIMENSION block_num, last_block_column;
+  int ci, block_row, block_rows, access_rows;
+  JBLOCKARRAY buffer;
+  JBLOCKROW buffer_ptr, prev_block_row, next_block_row;
+  JSAMPARRAY output_ptr;
+  JDIMENSION output_col;
+  jpeg_component_info *compptr;
+  inverse_DCT_method_ptr inverse_DCT;
+  boolean first_row, last_row;
+  JBLOCK workspace;
+  int *coef_bits;
+  JQUANT_TBL *quanttbl;
+  INT32 Q00,Q01,Q02,Q10,Q11,Q20, num;
+  int DC1,DC2,DC3,DC4,DC5,DC6,DC7,DC8,DC9;
+  int Al, pred;
+
+  /* Force some input to be done if we are getting ahead of the input. */
+  while (cinfo->input_scan_number <= cinfo->output_scan_number &&
+	 ! cinfo->inputctl->eoi_reached) {
+    if (cinfo->input_scan_number == cinfo->output_scan_number) {
+      /* If input is working on current scan, we ordinarily want it to
+       * have completed the current row.  But if input scan is DC,
+       * we want it to keep one row ahead so that next block row's DC
+       * values are up to date.
+       */
+      JDIMENSION delta = (cinfo->Ss == 0) ? 1 : 0;
+      if (cinfo->input_iMCU_row > cinfo->output_iMCU_row+delta)
+	break;
+    }
+    if ((*cinfo->inputctl->consume_input)(cinfo) == JPEG_SUSPENDED)
+      return JPEG_SUSPENDED;
+  }
+
+  /* OK, output from the virtual arrays. */
+  for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
+       ci++, compptr++) {
+    /* Don't bother to IDCT an uninteresting component. */
+    if (! compptr->component_needed)
+      continue;
+    /* Count non-dummy DCT block rows in this iMCU row. */
+    if (cinfo->output_iMCU_row < last_iMCU_row) {
+      block_rows = compptr->v_samp_factor;
+      access_rows = block_rows * 2; /* this and next iMCU row */
+      last_row = FALSE;
+    } else {
+      /* NB: can't use last_row_height here; it is input-side-dependent! */
+      block_rows = (int) (compptr->height_in_data_units % compptr->v_samp_factor);
+      if (block_rows == 0) block_rows = compptr->v_samp_factor;
+      access_rows = block_rows; /* this iMCU row only */
+      last_row = TRUE;
+    }
+    /* Align the virtual buffer for this component. */
+    if (cinfo->output_iMCU_row > 0) {
+      access_rows += compptr->v_samp_factor; /* prior iMCU row too */
+      buffer = (*cinfo->mem->access_virt_barray)
+	((j_common_ptr) cinfo, coef->whole_image[ci],
+	 (cinfo->output_iMCU_row - 1) * compptr->v_samp_factor,
+	 (JDIMENSION) access_rows, FALSE);
+      buffer += compptr->v_samp_factor;	/* point to current iMCU row */
+      first_row = FALSE;
+    } else {
+      buffer = (*cinfo->mem->access_virt_barray)
+	((j_common_ptr) cinfo, coef->whole_image[ci],
+	 (JDIMENSION) 0, (JDIMENSION) access_rows, FALSE);
+      first_row = TRUE;
+    }
+    /* Fetch component-dependent info */
+    coef_bits = coef->coef_bits_latch + (ci * SAVED_COEFS);
+    quanttbl = compptr->quant_table;
+    Q00 = quanttbl->quantval[0];
+    Q01 = quanttbl->quantval[Q01_POS];
+    Q10 = quanttbl->quantval[Q10_POS];
+    Q20 = quanttbl->quantval[Q20_POS];
+    Q11 = quanttbl->quantval[Q11_POS];
+    Q02 = quanttbl->quantval[Q02_POS];
+    inverse_DCT = lossyd->inverse_DCT[ci];
+    output_ptr = output_buf[ci];
+    /* Loop over all DCT blocks to be processed. */
+    for (block_row = 0; block_row < block_rows; block_row++) {
+      buffer_ptr = buffer[block_row];
+      if (first_row && block_row == 0)
+	prev_block_row = buffer_ptr;
+      else
+	prev_block_row = buffer[block_row-1];
+      if (last_row && block_row == block_rows-1)
+	next_block_row = buffer_ptr;
+      else
+	next_block_row = buffer[block_row+1];
+      /* We fetch the surrounding DC values using a sliding-register approach.
+       * Initialize all nine here so as to do the right thing on narrow pics.
+       */
+      DC1 = DC2 = DC3 = (int) prev_block_row[0][0];
+      DC4 = DC5 = DC6 = (int) buffer_ptr[0][0];
+      DC7 = DC8 = DC9 = (int) next_block_row[0][0];
+      output_col = 0;
+      last_block_column = compptr->width_in_data_units - 1;
+      for (block_num = 0; block_num <= last_block_column; block_num++) {
+	/* Fetch current DCT block into workspace so we can modify it. */
+	jcopy_block_row(buffer_ptr, (JBLOCKROW) workspace, (JDIMENSION) 1);
+	/* Update DC values */
+	if (block_num < last_block_column) {
+	  DC3 = (int) prev_block_row[1][0];
+	  DC6 = (int) buffer_ptr[1][0];
+	  DC9 = (int) next_block_row[1][0];
+	}
+	/* Compute coefficient estimates per K.8.
+	 * An estimate is applied only if coefficient is still zero,
+	 * and is not known to be fully accurate.
+	 */
+	/* AC01 */
+	if ((Al=coef_bits[1]) != 0 && workspace[1] == 0) {
+	  num = 36 * Q00 * (DC4 - DC6);
+	  if (num >= 0) {
+	    pred = (int) (((Q01<<7) + num) / (Q01<<8));
+	    if (Al > 0 && pred >= (1<<Al))
+	      pred = (1<<Al)-1;
+	  } else {
+	    pred = (int) (((Q01<<7) - num) / (Q01<<8));
+	    if (Al > 0 && pred >= (1<<Al))
+	      pred = (1<<Al)-1;
+	    pred = -pred;
+	  }
+	  workspace[1] = (JCOEF) pred;
+	}
+	/* AC10 */
+	if ((Al=coef_bits[2]) != 0 && workspace[8] == 0) {
+	  num = 36 * Q00 * (DC2 - DC8);
+	  if (num >= 0) {
+	    pred = (int) (((Q10<<7) + num) / (Q10<<8));
+	    if (Al > 0 && pred >= (1<<Al))
+	      pred = (1<<Al)-1;
+	  } else {
+	    pred = (int) (((Q10<<7) - num) / (Q10<<8));
+	    if (Al > 0 && pred >= (1<<Al))
+	      pred = (1<<Al)-1;
+	    pred = -pred;
+	  }
+	  workspace[8] = (JCOEF) pred;
+	}
+	/* AC20 */
+	if ((Al=coef_bits[3]) != 0 && workspace[16] == 0) {
+	  num = 9 * Q00 * (DC2 + DC8 - 2*DC5);
+	  if (num >= 0) {
+	    pred = (int) (((Q20<<7) + num) / (Q20<<8));
+	    if (Al > 0 && pred >= (1<<Al))
+	      pred = (1<<Al)-1;
+	  } else {
+	    pred = (int) (((Q20<<7) - num) / (Q20<<8));
+	    if (Al > 0 && pred >= (1<<Al))
+	      pred = (1<<Al)-1;
+	    pred = -pred;
+	  }
+	  workspace[16] = (JCOEF) pred;
+	}
+	/* AC11 */
+	if ((Al=coef_bits[4]) != 0 && workspace[9] == 0) {
+	  num = 5 * Q00 * (DC1 - DC3 - DC7 + DC9);
+	  if (num >= 0) {
+	    pred = (int) (((Q11<<7) + num) / (Q11<<8));
+	    if (Al > 0 && pred >= (1<<Al))
+	      pred = (1<<Al)-1;
+	  } else {
+	    pred = (int) (((Q11<<7) - num) / (Q11<<8));
+	    if (Al > 0 && pred >= (1<<Al))
+	      pred = (1<<Al)-1;
+	    pred = -pred;
+	  }
+	  workspace[9] = (JCOEF) pred;
+	}
+	/* AC02 */
+	if ((Al=coef_bits[5]) != 0 && workspace[2] == 0) {
+	  num = 9 * Q00 * (DC4 + DC6 - 2*DC5);
+	  if (num >= 0) {
+	    pred = (int) (((Q02<<7) + num) / (Q02<<8));
+	    if (Al > 0 && pred >= (1<<Al))
+	      pred = (1<<Al)-1;
+	  } else {
+	    pred = (int) (((Q02<<7) - num) / (Q02<<8));
+	    if (Al > 0 && pred >= (1<<Al))
+	      pred = (1<<Al)-1;
+	    pred = -pred;
+	  }
+	  workspace[2] = (JCOEF) pred;
+	}
+	/* OK, do the IDCT */
+	(*inverse_DCT) (cinfo, compptr, (JCOEFPTR) workspace,
+			output_ptr, output_col);
+	/* Advance for next column */
+	DC1 = DC2; DC2 = DC3;
+	DC4 = DC5; DC5 = DC6;
+	DC7 = DC8; DC8 = DC9;
+	buffer_ptr++, prev_block_row++, next_block_row++;
+	output_col += compptr->codec_data_unit;
+      }
+      output_ptr += compptr->codec_data_unit;
+    }
+  }
+
+  if (++(cinfo->output_iMCU_row) < cinfo->total_iMCU_rows)
+    return JPEG_ROW_COMPLETED;
+  return JPEG_SCAN_COMPLETED;
+}
+
+#endif /* BLOCK_SMOOTHING_SUPPORTED */
+
+
+/*
+ * Initialize coefficient buffer controller.
+ */
+
+GLOBAL(void)
+jinit_d_coef_controller (j_decompress_ptr cinfo, boolean need_full_buffer)
+{
+  j_lossy_d_ptr lossyd = (j_lossy_d_ptr) cinfo->codec;
+  d_coef_ptr coef;
+
+  coef = (d_coef_ptr)
+    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+				SIZEOF(d_coef_controller));
+  lossyd->coef_private = (void *) coef;
+  lossyd->coef_start_input_pass = start_input_pass;
+  lossyd->coef_start_output_pass = start_output_pass;
+#ifdef BLOCK_SMOOTHING_SUPPORTED
+  coef->coef_bits_latch = NULL;
+#endif
+
+  /* Create the coefficient buffer. */
+  if (need_full_buffer) {
+#ifdef D_MULTISCAN_FILES_SUPPORTED
+    /* Allocate a full-image virtual array for each component, */
+    /* padded to a multiple of samp_factor DCT blocks in each direction. */
+    /* Note we ask for a pre-zeroed array. */
+    int ci, access_rows;
+    jpeg_component_info *compptr;
+
+    for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
+	 ci++, compptr++) {
+      access_rows = compptr->v_samp_factor;
+#ifdef BLOCK_SMOOTHING_SUPPORTED
+      /* If block smoothing could be used, need a bigger window */
+      if (cinfo->process == JPROC_PROGRESSIVE)
+	access_rows *= 3;
+#endif
+      coef->whole_image[ci] = (*cinfo->mem->request_virt_barray)
+	((j_common_ptr) cinfo, JPOOL_IMAGE, TRUE,
+	 (JDIMENSION) jround_up((long) compptr->width_in_data_units,
+				(long) compptr->h_samp_factor),
+	 (JDIMENSION) jround_up((long) compptr->height_in_data_units,
+				(long) compptr->v_samp_factor),
+	 (JDIMENSION) access_rows);
+    }
+    lossyd->pub.consume_data = consume_data;
+    lossyd->pub.decompress_data = decompress_data;
+    lossyd->coef_arrays = coef->whole_image; /* link to virtual arrays */
+#else
+    ERREXIT(cinfo, JERR_NOT_COMPILED);
+#endif
+  } else {
+    /* We only need a single-MCU buffer. */
+    JBLOCKROW buffer;
+    int i;
+
+    buffer = (JBLOCKROW)
+      (*cinfo->mem->alloc_large) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+				  D_MAX_DATA_UNITS_IN_MCU * SIZEOF(JBLOCK));
+    for (i = 0; i < D_MAX_DATA_UNITS_IN_MCU; i++) {
+      coef->MCU_buffer[i] = buffer + i;
+    }
+    lossyd->pub.consume_data = dummy_consume_data;
+    lossyd->pub.decompress_data = decompress_onepass;
+    lossyd->coef_arrays = NULL; /* flag for no virtual arrays */
+  }
+}
diff --git a/uppsrc/plugin/jpg/lib/jdcolor.c b/uppsrc/plugin/jpg/lib/jdcolor.c
new file mode 100644
index 000000000..6c04dfe8a
--- /dev/null
+++ b/uppsrc/plugin/jpg/lib/jdcolor.c
@@ -0,0 +1,396 @@
+/*
+ * jdcolor.c
+ *
+ * Copyright (C) 1991-1997, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains output colorspace conversion routines.
+ */
+
+#define JPEG_INTERNALS
+#include "jinclude.h"
+#include "jpeglib.h"
+
+
+/* Private subobject */
+
+typedef struct {
+  struct jpeg_color_deconverter pub; /* public fields */
+
+  /* Private state for YCC->RGB conversion */
+  int * Cr_r_tab;		/* => table for Cr to R conversion */
+  int * Cb_b_tab;		/* => table for Cb to B conversion */
+  INT32 * Cr_g_tab;		/* => table for Cr to G conversion */
+  INT32 * Cb_g_tab;		/* => table for Cb to G conversion */
+} my_color_deconverter;
+
+typedef my_color_deconverter * my_cconvert_ptr;
+
+
+/**************** YCbCr -> RGB conversion: most common case **************/
+
+/*
+ * YCbCr is defined per CCIR 601-1, except that Cb and Cr are
+ * normalized to the range 0..MAXJSAMPLE rather than -0.5 .. 0.5.
+ * The conversion equations to be implemented are therefore
+ *	R = Y                + 1.40200 * Cr
+ *	G = Y - 0.34414 * Cb - 0.71414 * Cr
+ *	B = Y + 1.77200 * Cb
+ * where Cb and Cr represent the incoming values less CENTERJSAMPLE.
+ * (These numbers are derived from TIFF 6.0 section 21, dated 3-June-92.)
+ *
+ * To avoid floating-point arithmetic, we represent the fractional constants
+ * as integers scaled up by 2^16 (about 4 digits precision); we have to divide
+ * the products by 2^16, with appropriate rounding, to get the correct answer.
+ * Notice that Y, being an integral input, does not contribute any fraction
+ * so it need not participate in the rounding.
+ *
+ * For even more speed, we avoid doing any multiplications in the inner loop
+ * by precalculating the constants times Cb and Cr for all possible values.
+ * For 8-bit JSAMPLEs this is very reasonable (only 256 entries per table);
+ * for 12-bit samples it is still acceptable.  It's not very reasonable for
+ * 16-bit samples, but if you want lossless storage you shouldn't be changing
+ * colorspace anyway.
+ * The Cr=>R and Cb=>B values can be rounded to integers in advance; the
+ * values for the G calculation are left scaled up, since we must add them
+ * together before rounding.
+ */
+
+#define SCALEBITS	16	/* speediest right-shift on some machines */
+#define ONE_HALF	((INT32) 1 << (SCALEBITS-1))
+#define FIX(x)		((INT32) ((x) * (1L<<SCALEBITS) + 0.5))
+
+
+/*
+ * Initialize tables for YCC->RGB colorspace conversion.
+ */
+
+LOCAL(void)
+build_ycc_rgb_table (j_decompress_ptr cinfo)
+{
+  my_cconvert_ptr cconvert = (my_cconvert_ptr) cinfo->cconvert;
+  int i;
+  INT32 x;
+  SHIFT_TEMPS
+
+  cconvert->Cr_r_tab = (int *)
+    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+				(MAXJSAMPLE+1) * SIZEOF(int));
+  cconvert->Cb_b_tab = (int *)
+    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+				(MAXJSAMPLE+1) * SIZEOF(int));
+  cconvert->Cr_g_tab = (INT32 *)
+    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+				(MAXJSAMPLE+1) * SIZEOF(INT32));
+  cconvert->Cb_g_tab = (INT32 *)
+    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+				(MAXJSAMPLE+1) * SIZEOF(INT32));
+
+  for (i = 0, x = -CENTERJSAMPLE; i <= MAXJSAMPLE; i++, x++) {
+    /* i is the actual input pixel value, in the range 0..MAXJSAMPLE */
+    /* The Cb or Cr value we are thinking of is x = i - CENTERJSAMPLE */
+    /* Cr=>R value is nearest int to 1.40200 * x */
+    cconvert->Cr_r_tab[i] = (int)
+		    RIGHT_SHIFT(FIX(1.40200) * x + ONE_HALF, SCALEBITS);
+    /* Cb=>B value is nearest int to 1.77200 * x */
+    cconvert->Cb_b_tab[i] = (int)
+		    RIGHT_SHIFT(FIX(1.77200) * x + ONE_HALF, SCALEBITS);
+    /* Cr=>G value is scaled-up -0.71414 * x */
+    cconvert->Cr_g_tab[i] = (- FIX(0.71414)) * x;
+    /* Cb=>G value is scaled-up -0.34414 * x */
+    /* We also add in ONE_HALF so that need not do it in inner loop */
+    cconvert->Cb_g_tab[i] = (- FIX(0.34414)) * x + ONE_HALF;
+  }
+}
+
+
+/*
+ * Convert some rows of samples to the output colorspace.
+ *
+ * Note that we change from noninterleaved, one-plane-per-component format
+ * to interleaved-pixel format.  The output buffer is therefore three times
+ * as wide as the input buffer.
+ * A starting row offset is provided only for the input buffer.  The caller
+ * can easily adjust the passed output_buf value to accommodate any row
+ * offset required on that side.
+ */
+
+METHODDEF(void)
+ycc_rgb_convert (j_decompress_ptr cinfo,
+		 JSAMPIMAGE input_buf, JDIMENSION input_row,
+		 JSAMPARRAY output_buf, int num_rows)
+{
+  my_cconvert_ptr cconvert = (my_cconvert_ptr) cinfo->cconvert;
+  register int y, cb, cr;
+  register JSAMPROW outptr;
+  register JSAMPROW inptr0, inptr1, inptr2;
+  register JDIMENSION col;
+  JDIMENSION num_cols = cinfo->output_width;
+  /* copy these pointers into registers if possible */
+  register JSAMPLE * range_limit = cinfo->sample_range_limit;
+  register int * Crrtab = cconvert->Cr_r_tab;
+  register int * Cbbtab = cconvert->Cb_b_tab;
+  register INT32 * Crgtab = cconvert->Cr_g_tab;
+  register INT32 * Cbgtab = cconvert->Cb_g_tab;
+  SHIFT_TEMPS
+
+  while (--num_rows >= 0) {
+    inptr0 = input_buf[0][input_row];
+    inptr1 = input_buf[1][input_row];
+    inptr2 = input_buf[2][input_row];
+    input_row++;
+    outptr = *output_buf++;
+    for (col = 0; col < num_cols; col++) {
+      y  = GETJSAMPLE(inptr0[col]);
+      cb = GETJSAMPLE(inptr1[col]);
+      cr = GETJSAMPLE(inptr2[col]);
+      /* Range-limiting is essential due to noise introduced by DCT losses. */
+      outptr[RGB_RED] =   range_limit[y + Crrtab[cr]];
+      outptr[RGB_GREEN] = range_limit[y +
+			      ((int) RIGHT_SHIFT(Cbgtab[cb] + Crgtab[cr],
+						 SCALEBITS))];
+      outptr[RGB_BLUE] =  range_limit[y + Cbbtab[cb]];
+      outptr += RGB_PIXELSIZE;
+    }
+  }
+}
+
+
+/**************** Cases other than YCbCr -> RGB **************/
+
+
+/*
+ * Color conversion for no colorspace change: just copy the data,
+ * converting from separate-planes to interleaved representation.
+ */
+
+METHODDEF(void)
+null_convert (j_decompress_ptr cinfo,
+	      JSAMPIMAGE input_buf, JDIMENSION input_row,
+	      JSAMPARRAY output_buf, int num_rows)
+{
+  register JSAMPROW inptr, outptr;
+  register JDIMENSION count;
+  register int num_components = cinfo->num_components;
+  JDIMENSION num_cols = cinfo->output_width;
+  int ci;
+
+  while (--num_rows >= 0) {
+    for (ci = 0; ci < num_components; ci++) {
+      inptr = input_buf[ci][input_row];
+      outptr = output_buf[0] + ci;
+      for (count = num_cols; count > 0; count--) {
+	*outptr = *inptr++;	/* needn't bother with GETJSAMPLE() here */
+	outptr += num_components;
+      }
+    }
+    input_row++;
+    output_buf++;
+  }
+}
+
+
+/*
+ * Color conversion for grayscale: just copy the data.
+ * This also works for YCbCr -> grayscale conversion, in which
+ * we just copy the Y (luminance) component and ignore chrominance.
+ */
+
+METHODDEF(void)
+grayscale_convert (j_decompress_ptr cinfo,
+		   JSAMPIMAGE input_buf, JDIMENSION input_row,
+		   JSAMPARRAY output_buf, int num_rows)
+{
+  jcopy_sample_rows(input_buf[0], (int) input_row, output_buf, 0,
+		    num_rows, cinfo->output_width);
+}
+
+
+/*
+ * Convert grayscale to RGB: just duplicate the graylevel three times.
+ * This is provided to support applications that don't want to cope
+ * with grayscale as a separate case.
+ */
+
+METHODDEF(void)
+gray_rgb_convert (j_decompress_ptr cinfo,
+		  JSAMPIMAGE input_buf, JDIMENSION input_row,
+		  JSAMPARRAY output_buf, int num_rows)
+{
+  register JSAMPROW inptr, outptr;
+  register JDIMENSION col;
+  JDIMENSION num_cols = cinfo->output_width;
+
+  while (--num_rows >= 0) {
+    inptr = input_buf[0][input_row++];
+    outptr = *output_buf++;
+    for (col = 0; col < num_cols; col++) {
+      /* We can dispense with GETJSAMPLE() here */
+      outptr[RGB_RED] = outptr[RGB_GREEN] = outptr[RGB_BLUE] = inptr[col];
+      outptr += RGB_PIXELSIZE;
+    }
+  }
+}
+
+
+/*
+ * Adobe-style YCCK->CMYK conversion.
+ * We convert YCbCr to R=1-C, G=1-M, and B=1-Y using the same
+ * conversion as above, while passing K (black) unchanged.
+ * We assume build_ycc_rgb_table has been called.
+ */
+
+METHODDEF(void)
+ycck_cmyk_convert (j_decompress_ptr cinfo,
+		   JSAMPIMAGE input_buf, JDIMENSION input_row,
+		   JSAMPARRAY output_buf, int num_rows)
+{
+  my_cconvert_ptr cconvert = (my_cconvert_ptr) cinfo->cconvert;
+  register int y, cb, cr;
+  register JSAMPROW outptr;
+  register JSAMPROW inptr0, inptr1, inptr2, inptr3;
+  register JDIMENSION col;
+  JDIMENSION num_cols = cinfo->output_width;
+  /* copy these pointers into registers if possible */
+  register JSAMPLE * range_limit = cinfo->sample_range_limit;
+  register int * Crrtab = cconvert->Cr_r_tab;
+  register int * Cbbtab = cconvert->Cb_b_tab;
+  register INT32 * Crgtab = cconvert->Cr_g_tab;
+  register INT32 * Cbgtab = cconvert->Cb_g_tab;
+  SHIFT_TEMPS
+
+  while (--num_rows >= 0) {
+    inptr0 = input_buf[0][input_row];
+    inptr1 = input_buf[1][input_row];
+    inptr2 = input_buf[2][input_row];
+    inptr3 = input_buf[3][input_row];
+    input_row++;
+    outptr = *output_buf++;
+    for (col = 0; col < num_cols; col++) {
+      y  = GETJSAMPLE(inptr0[col]);
+      cb = GETJSAMPLE(inptr1[col]);
+      cr = GETJSAMPLE(inptr2[col]);
+      /* Range-limiting is essential due to noise introduced by DCT losses. */
+      outptr[0] = range_limit[MAXJSAMPLE - (y + Crrtab[cr])];	/* red */
+      outptr[1] = range_limit[MAXJSAMPLE - (y +			/* green */
+			      ((int) RIGHT_SHIFT(Cbgtab[cb] + Crgtab[cr],
+						 SCALEBITS)))];
+      outptr[2] = range_limit[MAXJSAMPLE - (y + Cbbtab[cb])];	/* blue */
+      /* K passes through unchanged */
+      outptr[3] = inptr3[col];	/* don't need GETJSAMPLE here */
+      outptr += 4;
+    }
+  }
+}
+
+
+/*
+ * Empty method for start_pass.
+ */
+
+METHODDEF(void)
+start_pass_dcolor (j_decompress_ptr cinfo)
+{
+  /* no work needed */
+}
+
+
+/*
+ * Module initialization routine for output colorspace conversion.
+ */
+
+GLOBAL(void)
+jinit_color_deconverter (j_decompress_ptr cinfo)
+{
+  my_cconvert_ptr cconvert;
+  int ci;
+
+  cconvert = (my_cconvert_ptr)
+    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+				SIZEOF(my_color_deconverter));
+  cinfo->cconvert = (struct jpeg_color_deconverter *) cconvert;
+  cconvert->pub.start_pass = start_pass_dcolor;
+
+  /* Make sure num_components agrees with jpeg_color_space */
+  switch (cinfo->jpeg_color_space) {
+  case JCS_GRAYSCALE:
+    if (cinfo->num_components != 1)
+      ERREXIT(cinfo, JERR_BAD_J_COLORSPACE);
+    break;
+
+  case JCS_RGB:
+  case JCS_YCbCr:
+    if (cinfo->num_components != 3)
+      ERREXIT(cinfo, JERR_BAD_J_COLORSPACE);
+    break;
+
+  case JCS_CMYK:
+  case JCS_YCCK:
+    if (cinfo->num_components != 4)
+      ERREXIT(cinfo, JERR_BAD_J_COLORSPACE);
+    break;
+
+  default:			/* JCS_UNKNOWN can be anything */
+    if (cinfo->num_components < 1)
+      ERREXIT(cinfo, JERR_BAD_J_COLORSPACE);
+    break;
+  }
+
+  /* Set out_color_components and conversion method based on requested space.
+   * Also clear the component_needed flags for any unused components,
+   * so that earlier pipeline stages can avoid useless computation.
+   */
+
+  switch (cinfo->out_color_space) {
+  case JCS_GRAYSCALE:
+    cinfo->out_color_components = 1;
+    if (cinfo->jpeg_color_space == JCS_GRAYSCALE ||
+	cinfo->jpeg_color_space == JCS_YCbCr) {
+      cconvert->pub.color_convert = grayscale_convert;
+      /* For color->grayscale conversion, only the Y (0) component is needed */
+      for (ci = 1; ci < cinfo->num_components; ci++)
+	cinfo->comp_info[ci].component_needed = FALSE;
+    } else
+      ERREXIT(cinfo, JERR_CONVERSION_NOTIMPL);
+    break;
+
+  case JCS_RGB:
+    cinfo->out_color_components = RGB_PIXELSIZE;
+    if (cinfo->jpeg_color_space == JCS_YCbCr) {
+      cconvert->pub.color_convert = ycc_rgb_convert;
+      build_ycc_rgb_table(cinfo);
+    } else if (cinfo->jpeg_color_space == JCS_GRAYSCALE) {
+      cconvert->pub.color_convert = gray_rgb_convert;
+    } else if (cinfo->jpeg_color_space == JCS_RGB && RGB_PIXELSIZE == 3) {
+      cconvert->pub.color_convert = null_convert;
+    } else
+      ERREXIT(cinfo, JERR_CONVERSION_NOTIMPL);
+    break;
+
+  case JCS_CMYK:
+    cinfo->out_color_components = 4;
+    if (cinfo->jpeg_color_space == JCS_YCCK) {
+      cconvert->pub.color_convert = ycck_cmyk_convert;
+      build_ycc_rgb_table(cinfo);
+    } else if (cinfo->jpeg_color_space == JCS_CMYK) {
+      cconvert->pub.color_convert = null_convert;
+    } else
+      ERREXIT(cinfo, JERR_CONVERSION_NOTIMPL);
+    break;
+
+  default:
+    /* Permit null conversion to same output space */
+    if (cinfo->out_color_space == cinfo->jpeg_color_space) {
+      cinfo->out_color_components = cinfo->num_components;
+      cconvert->pub.color_convert = null_convert;
+    } else			/* unsupported non-null conversion */
+      ERREXIT(cinfo, JERR_CONVERSION_NOTIMPL);
+    break;
+  }
+
+  if (cinfo->quantize_colors)
+    cinfo->output_components = 1; /* single colormapped output component */
+  else
+    cinfo->output_components = cinfo->out_color_components;
+}
diff --git a/uppsrc/plugin/jpg/lib/jdct.h b/uppsrc/plugin/jpg/lib/jdct.h
new file mode 100644
index 000000000..31054a898
--- /dev/null
+++ b/uppsrc/plugin/jpg/lib/jdct.h
@@ -0,0 +1,176 @@
+/*
+ * jdct.h
+ *
+ * Copyright (C) 1994-1996, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This include file contains common declarations for the forward and
+ * inverse DCT modules.  These declarations are private to the DCT managers
+ * (jcdctmgr.c, jddctmgr.c) and the individual DCT algorithms.
+ * The individual DCT algorithms are kept in separate files to ease
+ * machine-dependent tuning (e.g., assembly coding).
+ */
+
+
+/*
+ * A forward DCT routine is given a pointer to a work area of type DCTELEM[];
+ * the DCT is to be performed in-place in that buffer.  Type DCTELEM is int
+ * for 8-bit samples, INT32 for 12-bit samples.  (NOTE: Floating-point DCT
+ * implementations use an array of type FAST_FLOAT, instead.)
+ * The DCT inputs are expected to be signed (range +-CENTERJSAMPLE).
+ * The DCT outputs are returned scaled up by a factor of 8; they therefore
+ * have a range of +-8K for 8-bit data, +-128K for 12-bit data.  This
+ * convention improves accuracy in integer implementations and saves some
+ * work in floating-point ones.
+ * Quantization of the output coefficients is done by jcdctmgr.c.
+ */
+
+#if BITS_IN_JSAMPLE == 8
+typedef int DCTELEM;		/* 16 or 32 bits is fine */
+#else
+typedef INT32 DCTELEM;		/* must have 32 bits */
+#endif
+
+typedef JMETHOD(void, forward_DCT_method_ptr, (DCTELEM * data));
+typedef JMETHOD(void, float_DCT_method_ptr, (FAST_FLOAT * data));
+
+
+/*
+ * An inverse DCT routine is given a pointer to the input JBLOCK and a pointer
+ * to an output sample array.  The routine must dequantize the input data as
+ * well as perform the IDCT; for dequantization, it uses the multiplier table
+ * pointed to by compptr->dct_table.  The output data is to be placed into the
+ * sample array starting at a specified column.  (Any row offset needed will
+ * be applied to the array pointer before it is passed to the IDCT code.)
+ * Note that the number of samples emitted by the IDCT routine is
+ * DCT_scaled_size * DCT_scaled_size.
+ */
+
+/* typedef inverse_DCT_method_ptr is declared in jpegint.h */
+
+/*
+ * Each IDCT routine has its own ideas about the best dct_table element type.
+ */
+
+typedef MULTIPLIER ISLOW_MULT_TYPE; /* short or int, whichever is faster */
+#if BITS_IN_JSAMPLE == 8
+typedef MULTIPLIER IFAST_MULT_TYPE; /* 16 bits is OK, use short if faster */
+#define IFAST_SCALE_BITS  2	/* fractional bits in scale factors */
+#else
+typedef INT32 IFAST_MULT_TYPE;	/* need 32 bits for scaled quantizers */
+#define IFAST_SCALE_BITS  13	/* fractional bits in scale factors */
+#endif
+typedef FAST_FLOAT FLOAT_MULT_TYPE; /* preferred floating type */
+
+
+/*
+ * Each IDCT routine is responsible for range-limiting its results and
+ * converting them to unsigned form (0..MAXJSAMPLE).  The raw outputs could
+ * be quite far out of range if the input data is corrupt, so a bulletproof
+ * range-limiting step is required.  We use a mask-and-table-lookup method
+ * to do the combined operations quickly.  See the comments with
+ * prepare_range_limit_table (in jdmaster.c) for more info.
+ */
+
+#define IDCT_range_limit(cinfo)  ((cinfo)->sample_range_limit + CENTERJSAMPLE)
+
+#define RANGE_MASK  (MAXJSAMPLE * 4 + 3) /* 2 bits wider than legal samples */
+
+
+/* Short forms of external names for systems with brain-damaged linkers. */
+
+#ifdef NEED_SHORT_EXTERNAL_NAMES
+#define jpeg_fdct_islow		jFDislow
+#define jpeg_fdct_ifast		jFDifast
+#define jpeg_fdct_float		jFDfloat
+#define jpeg_idct_islow		jRDislow
+#define jpeg_idct_ifast		jRDifast
+#define jpeg_idct_float		jRDfloat
+#define jpeg_idct_4x4		jRD4x4
+#define jpeg_idct_2x2		jRD2x2
+#define jpeg_idct_1x1		jRD1x1
+#endif /* NEED_SHORT_EXTERNAL_NAMES */
+
+/* Extern declarations for the forward and inverse DCT routines. */
+
+EXTERN(void) jpeg_fdct_islow JPP((DCTELEM * data));
+EXTERN(void) jpeg_fdct_ifast JPP((DCTELEM * data));
+EXTERN(void) jpeg_fdct_float JPP((FAST_FLOAT * data));
+
+EXTERN(void) jpeg_idct_islow
+    JPP((j_decompress_ptr cinfo, jpeg_component_info * compptr,
+	 JCOEFPTR coef_block, JSAMPARRAY output_buf, JDIMENSION output_col));
+EXTERN(void) jpeg_idct_ifast
+    JPP((j_decompress_ptr cinfo, jpeg_component_info * compptr,
+	 JCOEFPTR coef_block, JSAMPARRAY output_buf, JDIMENSION output_col));
+EXTERN(void) jpeg_idct_float
+    JPP((j_decompress_ptr cinfo, jpeg_component_info * compptr,
+	 JCOEFPTR coef_block, JSAMPARRAY output_buf, JDIMENSION output_col));
+EXTERN(void) jpeg_idct_4x4
+    JPP((j_decompress_ptr cinfo, jpeg_component_info * compptr,
+	 JCOEFPTR coef_block, JSAMPARRAY output_buf, JDIMENSION output_col));
+EXTERN(void) jpeg_idct_2x2
+    JPP((j_decompress_ptr cinfo, jpeg_component_info * compptr,
+	 JCOEFPTR coef_block, JSAMPARRAY output_buf, JDIMENSION output_col));
+EXTERN(void) jpeg_idct_1x1
+    JPP((j_decompress_ptr cinfo, jpeg_component_info * compptr,
+	 JCOEFPTR coef_block, JSAMPARRAY output_buf, JDIMENSION output_col));
+
+
+/*
+ * Macros for handling fixed-point arithmetic; these are used by many
+ * but not all of the DCT/IDCT modules.
+ *
+ * All values are expected to be of type INT32.
+ * Fractional constants are scaled left by CONST_BITS bits.
+ * CONST_BITS is defined within each module using these macros,
+ * and may differ from one module to the next.
+ */
+
+#define ONE	((INT32) 1)
+#define CONST_SCALE (ONE << CONST_BITS)
+
+/* Convert a positive real constant to an integer scaled by CONST_SCALE.
+ * Caution: some C compilers fail to reduce "FIX(constant)" at compile time,
+ * thus causing a lot of useless floating-point operations at run time.
+ */
+
+#define FIX(x)	((INT32) ((x) * CONST_SCALE + 0.5))
+
+/* Descale and correctly round an INT32 value that's scaled by N bits.
+ * We assume RIGHT_SHIFT rounds towards minus infinity, so adding
+ * the fudge factor is correct for either sign of X.
+ */
+
+#define DESCALE(x,n)  RIGHT_SHIFT((x) + (ONE << ((n)-1)), n)
+
+/* Multiply an INT32 variable by an INT32 constant to yield an INT32 result.
+ * This macro is used only when the two inputs will actually be no more than
+ * 16 bits wide, so that a 16x16->32 bit multiply can be used instead of a
+ * full 32x32 multiply.  This provides a useful speedup on many machines.
+ * Unfortunately there is no way to specify a 16x16->32 multiply portably
+ * in C, but some C compilers will do the right thing if you provide the
+ * correct combination of casts.
+ */
+
+#ifdef SHORTxSHORT_32		/* may work if 'int' is 32 bits */
+#define MULTIPLY16C16(var,const)  (((INT16) (var)) * ((INT16) (const)))
+#endif
+#ifdef SHORTxLCONST_32		/* known to work with Microsoft C 6.0 */
+#define MULTIPLY16C16(var,const)  (((INT16) (var)) * ((INT32) (const)))
+#endif
+
+#ifndef MULTIPLY16C16		/* default definition */
+#define MULTIPLY16C16(var,const)  ((var) * (const))
+#endif
+
+/* Same except both inputs are variables. */
+
+#ifdef SHORTxSHORT_32		/* may work if 'int' is 32 bits */
+#define MULTIPLY16V16(var1,var2)  (((INT16) (var1)) * ((INT16) (var2)))
+#endif
+
+#ifndef MULTIPLY16V16		/* default definition */
+#define MULTIPLY16V16(var1,var2)  ((var1) * (var2))
+#endif
diff --git a/uppsrc/plugin/jpg/lib/jddctmgr.c b/uppsrc/plugin/jpg/lib/jddctmgr.c
new file mode 100644
index 000000000..092eb1f7c
--- /dev/null
+++ b/uppsrc/plugin/jpg/lib/jddctmgr.c
@@ -0,0 +1,270 @@
+/*
+ * jddctmgr.c
+ *
+ * Copyright (C) 1994-1998, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains the inverse-DCT management logic.
+ * This code selects a particular IDCT implementation to be used,
+ * and it performs related housekeeping chores.  No code in this file
+ * is executed per IDCT step, only during output pass setup.
+ *
+ * Note that the IDCT routines are responsible for performing coefficient
+ * dequantization as well as the IDCT proper.  This module sets up the
+ * dequantization multiplier table needed by the IDCT routine.
+ */
+
+#define JPEG_INTERNALS
+#include "jinclude.h"
+#include "jpeglib.h"
+#include "jlossy.h"		/* Private declarations for lossy subsystem */
+#include "jdct.h"		/* Private declarations for DCT subsystem */
+
+
+/*
+ * The decompressor input side (jdinput.c) saves away the appropriate
+ * quantization table for each component at the start of the first scan
+ * involving that component.  (This is necessary in order to correctly
+ * decode files that reuse Q-table slots.)
+ * When we are ready to make an output pass, the saved Q-table is converted
+ * to a multiplier table that will actually be used by the IDCT routine.
+ * The multiplier table contents are IDCT-method-dependent.  To support
+ * application changes in IDCT method between scans, we can remake the
+ * multiplier tables if necessary.
+ * In buffered-image mode, the first output pass may occur before any data
+ * has been seen for some components, and thus before their Q-tables have
+ * been saved away.  To handle this case, multiplier tables are preset
+ * to zeroes; the result of the IDCT will be a neutral gray level.
+ */
+
+
+/* Private subobject for this module */
+
+typedef struct {
+  /* This array contains the IDCT method code that each multiplier table
+   * is currently set up for, or -1 if it's not yet set up.
+   * The actual multiplier tables are pointed to by dct_table in the
+   * per-component comp_info structures.
+   */
+  int cur_method[MAX_COMPONENTS];
+} idct_controller;
+
+typedef idct_controller * idct_ptr;
+
+
+/* Allocated multiplier tables: big enough for any supported variant */
+
+typedef union {
+  ISLOW_MULT_TYPE islow_array[DCTSIZE2];
+#ifdef DCT_IFAST_SUPPORTED
+  IFAST_MULT_TYPE ifast_array[DCTSIZE2];
+#endif
+#ifdef DCT_FLOAT_SUPPORTED
+  FLOAT_MULT_TYPE float_array[DCTSIZE2];
+#endif
+} multiplier_table;
+
+
+/* The current scaled-IDCT routines require ISLOW-style multiplier tables,
+ * so be sure to compile that code if either ISLOW or SCALING is requested.
+ */
+#ifdef DCT_ISLOW_SUPPORTED
+#define PROVIDE_ISLOW_TABLES
+#else
+#ifdef IDCT_SCALING_SUPPORTED
+#define PROVIDE_ISLOW_TABLES
+#endif
+#endif
+
+
+/*
+ * Prepare for an output pass.
+ * Here we select the proper IDCT routine for each component and build
+ * a matching multiplier table.
+ */
+
+METHODDEF(void)
+start_pass (j_decompress_ptr cinfo)
+{
+  j_lossy_d_ptr lossyd = (j_lossy_d_ptr) cinfo->codec;
+  idct_ptr idct = (idct_ptr) lossyd->idct_private;
+  int ci, i;
+  jpeg_component_info *compptr;
+  int method = 0;
+  inverse_DCT_method_ptr method_ptr = NULL;
+  JQUANT_TBL * qtbl;
+
+  for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
+       ci++, compptr++) {
+    /* Select the proper IDCT routine for this component's scaling */
+    switch (compptr->codec_data_unit) {
+#ifdef IDCT_SCALING_SUPPORTED
+    case 1:
+      method_ptr = jpeg_idct_1x1;
+      method = JDCT_ISLOW;	/* jidctred uses islow-style table */
+      break;
+    case 2:
+      method_ptr = jpeg_idct_2x2;
+      method = JDCT_ISLOW;	/* jidctred uses islow-style table */
+      break;
+    case 4:
+      method_ptr = jpeg_idct_4x4;
+      method = JDCT_ISLOW;	/* jidctred uses islow-style table */
+      break;
+#endif
+    case DCTSIZE:
+      switch (cinfo->dct_method) {
+#ifdef DCT_ISLOW_SUPPORTED
+      case JDCT_ISLOW:
+	method_ptr = jpeg_idct_islow;
+	method = JDCT_ISLOW;
+	break;
+#endif
+#ifdef DCT_IFAST_SUPPORTED
+      case JDCT_IFAST:
+	method_ptr = jpeg_idct_ifast;
+	method = JDCT_IFAST;
+	break;
+#endif
+#ifdef DCT_FLOAT_SUPPORTED
+      case JDCT_FLOAT:
+	method_ptr = jpeg_idct_float;
+	method = JDCT_FLOAT;
+	break;
+#endif
+      default:
+	ERREXIT(cinfo, JERR_NOT_COMPILED);
+	break;
+      }
+      break;
+    default:
+      ERREXIT1(cinfo, JERR_BAD_DCTSIZE, compptr->codec_data_unit);
+      break;
+    }
+    lossyd->inverse_DCT[ci] = method_ptr;
+    /* Create multiplier table from quant table.
+     * However, we can skip this if the component is uninteresting
+     * or if we already built the table.  Also, if no quant table
+     * has yet been saved for the component, we leave the
+     * multiplier table all-zero; we'll be reading zeroes from the
+     * coefficient controller's buffer anyway.
+     */
+    if (! compptr->component_needed || idct->cur_method[ci] == method)
+      continue;
+    qtbl = compptr->quant_table;
+    if (qtbl == NULL)		/* happens if no data yet for component */
+      continue;
+    idct->cur_method[ci] = method;
+    switch (method) {
+#ifdef PROVIDE_ISLOW_TABLES
+    case JDCT_ISLOW:
+      {
+	/* For LL&M IDCT method, multipliers are equal to raw quantization
+	 * coefficients, but are stored as ints to ensure access efficiency.
+	 */
+	ISLOW_MULT_TYPE * ismtbl = (ISLOW_MULT_TYPE *) compptr->dct_table;
+	for (i = 0; i < DCTSIZE2; i++) {
+	  ismtbl[i] = (ISLOW_MULT_TYPE) qtbl->quantval[i];
+	}
+      }
+      break;
+#endif
+#ifdef DCT_IFAST_SUPPORTED
+    case JDCT_IFAST:
+      {
+	/* For AA&N IDCT method, multipliers are equal to quantization
+	 * coefficients scaled by scalefactor[row]*scalefactor[col], where
+	 *   scalefactor[0] = 1
+	 *   scalefactor[k] = cos(k*PI/16) * sqrt(2)    for k=1..7
+	 * For integer operation, the multiplier table is to be scaled by
+	 * IFAST_SCALE_BITS.
+	 */
+	IFAST_MULT_TYPE * ifmtbl = (IFAST_MULT_TYPE *) compptr->dct_table;
+#define CONST_BITS 14
+	static const INT16 aanscales[DCTSIZE2] = {
+	  /* precomputed values scaled up by 14 bits */
+	  16384, 22725, 21407, 19266, 16384, 12873,  8867,  4520,
+	  22725, 31521, 29692, 26722, 22725, 17855, 12299,  6270,
+	  21407, 29692, 27969, 25172, 21407, 16819, 11585,  5906,
+	  19266, 26722, 25172, 22654, 19266, 15137, 10426,  5315,
+	  16384, 22725, 21407, 19266, 16384, 12873,  8867,  4520,
+	  12873, 17855, 16819, 15137, 12873, 10114,  6967,  3552,
+	   8867, 12299, 11585, 10426,  8867,  6967,  4799,  2446,
+	   4520,  6270,  5906,  5315,  4520,  3552,  2446,  1247
+	};
+	SHIFT_TEMPS
+
+	for (i = 0; i < DCTSIZE2; i++) {
+	  ifmtbl[i] = (IFAST_MULT_TYPE)
+	    DESCALE(MULTIPLY16V16((INT32) qtbl->quantval[i],
+				  (INT32) aanscales[i]),
+		    CONST_BITS-IFAST_SCALE_BITS);
+	}
+      }
+      break;
+#endif
+#ifdef DCT_FLOAT_SUPPORTED
+    case JDCT_FLOAT:
+      {
+	/* For float AA&N IDCT method, multipliers are equal to quantization
+	 * coefficients scaled by scalefactor[row]*scalefactor[col], where
+	 *   scalefactor[0] = 1
+	 *   scalefactor[k] = cos(k*PI/16) * sqrt(2)    for k=1..7
+	 */
+	FLOAT_MULT_TYPE * fmtbl = (FLOAT_MULT_TYPE *) compptr->dct_table;
+	int row, col;
+	static const double aanscalefactor[DCTSIZE] = {
+	  1.0, 1.387039845, 1.306562965, 1.175875602,
+	  1.0, 0.785694958, 0.541196100, 0.275899379
+	};
+
+	i = 0;
+	for (row = 0; row < DCTSIZE; row++) {
+	  for (col = 0; col < DCTSIZE; col++) {
+	    fmtbl[i] = (FLOAT_MULT_TYPE)
+	      ((double) qtbl->quantval[i] *
+	       aanscalefactor[row] * aanscalefactor[col]);
+	    i++;
+	  }
+	}
+      }
+      break;
+#endif
+    default:
+      ERREXIT(cinfo, JERR_NOT_COMPILED);
+      break;
+    }
+  }
+}
+
+
+/*
+ * Initialize IDCT manager.
+ */
+
+GLOBAL(void)
+jinit_inverse_dct (j_decompress_ptr cinfo)
+{
+  j_lossy_d_ptr lossyd = (j_lossy_d_ptr) cinfo->codec;
+  idct_ptr idct;
+  int ci;
+  jpeg_component_info *compptr;
+
+  idct = (idct_ptr)
+    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+				SIZEOF(idct_controller));
+  lossyd->idct_private = (void *) idct;
+  lossyd->idct_start_pass = start_pass;
+
+  for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
+       ci++, compptr++) {
+    /* Allocate and pre-zero a multiplier table for each component */
+    compptr->dct_table =
+      (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+				  SIZEOF(multiplier_table));
+    MEMZERO(compptr->dct_table, SIZEOF(multiplier_table));
+    /* Mark multiplier table not yet set up for any method */
+    idct->cur_method[ci] = -1;
+  }
+}
diff --git a/uppsrc/plugin/jpg/lib/jddiffct.c b/uppsrc/plugin/jpg/lib/jddiffct.c
new file mode 100644
index 000000000..d3ede5994
--- /dev/null
+++ b/uppsrc/plugin/jpg/lib/jddiffct.c
@@ -0,0 +1,398 @@
+/*
+ * jddiffct.c
+ *
+ * Copyright (C) 1994-1998, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains the [un]difference buffer controller for decompression.
+ * This controller is the top level of the lossless JPEG decompressor proper.
+ * The difference buffer lies between the entropy decoding and
+ * prediction/undifferencing steps.  The undifference buffer lies between the
+ * prediction/undifferencing and scaling steps.
+ *
+ * In buffered-image mode, this controller is the interface between
+ * input-oriented processing and output-oriented processing.
+ */
+
+#define JPEG_INTERNALS
+#include "jinclude.h"
+#include "jpeglib.h"
+#include "jlossls.h"
+
+
+#ifdef D_LOSSLESS_SUPPORTED
+
+/* Private buffer controller object */
+
+typedef struct {
+  /* These variables keep track of the current location of the input side. */
+  /* cinfo->input_iMCU_row is also used for this. */
+  JDIMENSION MCU_ctr;		/* counts MCUs processed in current row */
+  unsigned int restart_rows_to_go;	/* MCU-rows left in this restart interval */
+  unsigned int MCU_vert_offset;		/* counts MCU rows within iMCU row */
+  unsigned int MCU_rows_per_iMCU_row;	/* number of such rows needed */
+
+  /* The output side's location is represented by cinfo->output_iMCU_row. */
+
+  JDIFFARRAY diff_buf[MAX_COMPONENTS];	/* iMCU row of differences */
+  JDIFFARRAY undiff_buf[MAX_COMPONENTS]; /* iMCU row of undiff'd samples */
+
+#ifdef D_MULTISCAN_FILES_SUPPORTED
+  /* In multi-pass modes, we need a virtual sample array for each component. */
+  jvirt_sarray_ptr whole_image[MAX_COMPONENTS];
+#endif
+} d_diff_controller;
+
+typedef d_diff_controller * d_diff_ptr;
+
+/* Forward declarations */
+METHODDEF(int) decompress_data
+	JPP((j_decompress_ptr cinfo, JSAMPIMAGE output_buf));
+#ifdef D_MULTISCAN_FILES_SUPPORTED
+METHODDEF(int) output_data
+	JPP((j_decompress_ptr cinfo, JSAMPIMAGE output_buf));
+#endif
+
+
+LOCAL(void)
+start_iMCU_row (j_decompress_ptr cinfo)
+/* Reset within-iMCU-row counters for a new row (input side) */
+{
+  j_lossless_d_ptr losslsd = (j_lossless_d_ptr) cinfo->codec;
+  d_diff_ptr diff = (d_diff_ptr) losslsd->diff_private;
+
+  /* In an interleaved scan, an MCU row is the same as an iMCU row.
+   * In a noninterleaved scan, an iMCU row has v_samp_factor MCU rows.
+   * But at the bottom of the image, process only what's left.
+   */
+  if (cinfo->comps_in_scan > 1) {
+    diff->MCU_rows_per_iMCU_row = 1;
+  } else {
+    if (cinfo->input_iMCU_row < (cinfo->total_iMCU_rows-1))
+      diff->MCU_rows_per_iMCU_row = cinfo->cur_comp_info[0]->v_samp_factor;
+    else
+      diff->MCU_rows_per_iMCU_row = cinfo->cur_comp_info[0]->last_row_height;
+  }
+
+  diff->MCU_ctr = 0;
+  diff->MCU_vert_offset = 0;
+}
+
+
+/*
+ * Initialize for an input processing pass.
+ */
+
+METHODDEF(void)
+start_input_pass (j_decompress_ptr cinfo)
+{
+  j_lossless_d_ptr losslsd = (j_lossless_d_ptr) cinfo->codec;
+  d_diff_ptr diff = (d_diff_ptr) losslsd->diff_private;
+
+  /* Check that the restart interval is an integer multiple of the number
+   * of MCU in an MCU-row.
+   */
+  if (cinfo->restart_interval % cinfo->MCUs_per_row != 0)
+    ERREXIT2(cinfo, JERR_BAD_RESTART,
+	     cinfo->restart_interval, cinfo->MCUs_per_row);
+
+  /* Initialize restart counter */
+  diff->restart_rows_to_go = cinfo->restart_interval / cinfo->MCUs_per_row;
+
+  cinfo->input_iMCU_row = 0;
+  start_iMCU_row(cinfo);
+}
+
+
+/*
+ * Check for a restart marker & resynchronize decoder, undifferencer.
+ * Returns FALSE if must suspend.
+ */
+
+METHODDEF(boolean)
+process_restart (j_decompress_ptr cinfo)
+{
+  j_lossless_d_ptr losslsd = (j_lossless_d_ptr) cinfo->codec;
+  d_diff_ptr diff = (d_diff_ptr) losslsd->diff_private;
+
+  if (! (*losslsd->entropy_process_restart) (cinfo))
+    return FALSE;
+
+  (*losslsd->predict_process_restart) (cinfo);
+
+  /* Reset restart counter */
+  diff->restart_rows_to_go = cinfo->restart_interval / cinfo->MCUs_per_row;
+
+  return TRUE;
+}
+
+
+/*
+ * Initialize for an output processing pass.
+ */
+
+METHODDEF(void)
+start_output_pass (j_decompress_ptr cinfo)
+{
+  cinfo->output_iMCU_row = 0;
+}
+
+
+/*
+ * Decompress and return some data in the supplied buffer.
+ * Always attempts to emit one fully interleaved MCU row ("iMCU" row).
+ * Input and output must run in lockstep since we have only a one-MCU buffer.
+ * Return value is JPEG_ROW_COMPLETED, JPEG_SCAN_COMPLETED, or JPEG_SUSPENDED.
+ *
+ * NB: output_buf contains a plane for each component in image,
+ * which we index according to the component's SOF position.
+ */
+
+METHODDEF(int)
+decompress_data (j_decompress_ptr cinfo, JSAMPIMAGE output_buf)
+{
+  j_lossless_d_ptr losslsd = (j_lossless_d_ptr) cinfo->codec;
+  d_diff_ptr diff = (d_diff_ptr) losslsd->diff_private;
+  JDIMENSION MCU_col_num;	/* index of current MCU within row */
+  JDIMENSION MCU_count;		/* number of MCUs decoded */
+  JDIMENSION last_iMCU_row = cinfo->total_iMCU_rows - 1;
+  int comp, ci, yoffset, row, prev_row;
+  jpeg_component_info *compptr;
+
+  /* Loop to process as much as one whole iMCU row */
+  for (yoffset = diff->MCU_vert_offset; (unsigned)yoffset < diff->MCU_rows_per_iMCU_row;
+       yoffset++) {
+
+    /* Process restart marker if needed; may have to suspend */
+    if (cinfo->restart_interval) {
+      if (diff->restart_rows_to_go == 0)
+	if (! process_restart(cinfo))
+	  return JPEG_SUSPENDED;
+    }
+
+    MCU_col_num = diff->MCU_ctr;
+    /* Try to fetch an MCU-row (or remaining portion of suspended MCU-row). */
+    MCU_count =
+      (*losslsd->entropy_decode_mcus) (cinfo,
+				       diff->diff_buf, yoffset, MCU_col_num,
+				       cinfo->MCUs_per_row - MCU_col_num);
+    if (MCU_count != cinfo->MCUs_per_row - MCU_col_num) {
+      /* Suspension forced; update state counters and exit */
+      diff->MCU_vert_offset = yoffset;
+      diff->MCU_ctr += MCU_count;
+      return JPEG_SUSPENDED;
+    }
+
+    /* Account for restart interval (no-op if not using restarts) */
+    diff->restart_rows_to_go--;
+
+    /* Completed an MCU row, but perhaps not an iMCU row */
+    diff->MCU_ctr = 0;
+  }
+
+  /*
+   * Undifference and scale each scanline of the disassembled MCU-row
+   * separately.  We do not process dummy samples at the end of a scanline
+   * or dummy rows at the end of the image.
+   */
+  for (comp = 0; comp < cinfo->comps_in_scan; comp++) {
+    compptr = cinfo->cur_comp_info[comp];
+    ci = compptr->component_index;
+    for (row = 0, prev_row = compptr->v_samp_factor - 1;
+	 row < (cinfo->input_iMCU_row == last_iMCU_row ?
+		compptr->last_row_height : compptr->v_samp_factor);
+	 prev_row = row, row++) {
+      (*losslsd->predict_undifference[ci]) (cinfo, ci,
+					    diff->diff_buf[ci][row],
+					    diff->undiff_buf[ci][prev_row],
+					    diff->undiff_buf[ci][row],
+					    compptr->width_in_data_units);
+      (*losslsd->scaler_scale) (cinfo, diff->undiff_buf[ci][row],
+				output_buf[ci][row],
+				compptr->width_in_data_units);
+    }
+  }
+
+  /* Completed the iMCU row, advance counters for next one.
+   *
+   * NB: output_data will increment output_iMCU_row.
+   * This counter is not needed for the single-pass case
+   * or the input side of the multi-pass case.
+   */
+  if (++(cinfo->input_iMCU_row) < cinfo->total_iMCU_rows) {
+    start_iMCU_row(cinfo);
+    return JPEG_ROW_COMPLETED;
+  }
+  /* Completed the scan */
+  (*cinfo->inputctl->finish_input_pass) (cinfo);
+  return JPEG_SCAN_COMPLETED;
+}
+
+
+/*
+ * Dummy consume-input routine for single-pass operation.
+ */
+
+METHODDEF(int)
+dummy_consume_data (j_decompress_ptr cinfo)
+{
+  return JPEG_SUSPENDED;	/* Always indicate nothing was done */
+}
+
+
+#ifdef D_MULTISCAN_FILES_SUPPORTED
+
+/*
+ * Consume input data and store it in the full-image sample buffer.
+ * We read as much as one fully interleaved MCU row ("iMCU" row) per call,
+ * ie, v_samp_factor rows for each component in the scan.
+ * Return value is JPEG_ROW_COMPLETED, JPEG_SCAN_COMPLETED, or JPEG_SUSPENDED.
+ */
+
+METHODDEF(int)
+consume_data (j_decompress_ptr cinfo)
+{
+  j_lossless_d_ptr losslsd = (j_lossless_d_ptr) cinfo->codec;
+  d_diff_ptr diff = (d_diff_ptr) losslsd->diff_private;
+//  JDIMENSION MCU_col_num;	/* index of current MCU within row */
+//  JDIMENSION MCU_count;		/* number of MCUs decoded */
+  JDIMENSION last_iMCU_row = cinfo->total_iMCU_rows - 1;
+  int comp, ci; //, yoffset, row, prev_row;
+  JSAMPARRAY buffer[MAX_COMPS_IN_SCAN];
+  jpeg_component_info *compptr;
+
+  /* Align the virtual buffers for the components used in this scan. */
+  for (comp = 0; comp < cinfo->comps_in_scan; comp++) {
+    compptr = cinfo->cur_comp_info[comp];
+    ci = compptr->component_index;
+    buffer[ci] = (*cinfo->mem->access_virt_sarray)
+      ((j_common_ptr) cinfo, diff->whole_image[ci],
+       cinfo->input_iMCU_row * compptr->v_samp_factor,
+       (JDIMENSION) compptr->v_samp_factor, TRUE);
+  }
+
+  return decompress_data(cinfo, buffer);
+}
+
+
+/*
+ * Output some data from the full-image buffer sample in the multi-pass case.
+ * Always attempts to emit one fully interleaved MCU row ("iMCU" row).
+ * Return value is JPEG_ROW_COMPLETED, JPEG_SCAN_COMPLETED, or JPEG_SUSPENDED.
+ *
+ * NB: output_buf contains a plane for each component in image.
+ */
+
+METHODDEF(int)
+output_data (j_decompress_ptr cinfo, JSAMPIMAGE output_buf)
+{
+  j_lossless_d_ptr losslsd = (j_lossless_d_ptr) cinfo->codec;
+  d_diff_ptr diff = (d_diff_ptr) losslsd->diff_private;
+  JDIMENSION last_iMCU_row = cinfo->total_iMCU_rows - 1;
+  int ci, samp_rows, row;
+  JSAMPARRAY buffer;
+  jpeg_component_info *compptr;
+
+  /* Force some input to be done if we are getting ahead of the input. */
+  while (cinfo->input_scan_number < cinfo->output_scan_number ||
+	 (cinfo->input_scan_number == cinfo->output_scan_number &&
+	  cinfo->input_iMCU_row <= cinfo->output_iMCU_row)) {
+    if ((*cinfo->inputctl->consume_input)(cinfo) == JPEG_SUSPENDED)
+      return JPEG_SUSPENDED;
+  }
+
+  /* OK, output from the virtual arrays. */
+  for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
+       ci++, compptr++) {
+    /* Align the virtual buffer for this component. */
+    buffer = (*cinfo->mem->access_virt_sarray)
+      ((j_common_ptr) cinfo, diff->whole_image[ci],
+       cinfo->output_iMCU_row * compptr->v_samp_factor,
+       (JDIMENSION) compptr->v_samp_factor, FALSE);
+
+    if (cinfo->output_iMCU_row < last_iMCU_row)
+      samp_rows = compptr->v_samp_factor;
+    else {
+      /* NB: can't use last_row_height here; it is input-side-dependent! */
+      samp_rows = (int) (compptr->height_in_data_units % compptr->v_samp_factor);
+      if (samp_rows == 0) samp_rows = compptr->v_samp_factor;
+    }
+
+    for (row = 0; row < samp_rows; row++) {
+      MEMCOPY(output_buf[ci][row], buffer[row],
+	      compptr->width_in_data_units * SIZEOF(JSAMPLE));
+    }
+  }
+
+  if (++(cinfo->output_iMCU_row) < cinfo->total_iMCU_rows)
+    return JPEG_ROW_COMPLETED;
+  return JPEG_SCAN_COMPLETED;
+}
+
+#endif /* D_MULTISCAN_FILES_SUPPORTED */
+
+
+/*
+ * Initialize difference buffer controller.
+ */
+
+GLOBAL(void)
+jinit_d_diff_controller (j_decompress_ptr cinfo, boolean need_full_buffer)
+{
+  j_lossless_d_ptr losslsd = (j_lossless_d_ptr) cinfo->codec;
+  d_diff_ptr diff;
+  int ci;
+  jpeg_component_info *compptr;
+
+  diff = (d_diff_ptr)
+    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+				SIZEOF(d_diff_controller));
+  losslsd->diff_private = (void *) diff;
+  losslsd->diff_start_input_pass = start_input_pass;
+  losslsd->pub.start_output_pass = start_output_pass;
+
+  /* Create the [un]difference buffers. */
+  for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
+       ci++, compptr++) {
+    diff->diff_buf[ci] = (*cinfo->mem->alloc_darray)
+      ((j_common_ptr) cinfo, JPOOL_IMAGE,
+       (JDIMENSION) jround_up((long) compptr->width_in_data_units,
+			      (long) compptr->h_samp_factor),
+       (JDIMENSION) compptr->v_samp_factor);
+    diff->undiff_buf[ci] = (*cinfo->mem->alloc_darray)
+      ((j_common_ptr) cinfo, JPOOL_IMAGE,
+       (JDIMENSION) jround_up((long) compptr->width_in_data_units,
+			      (long) compptr->h_samp_factor),
+       (JDIMENSION) compptr->v_samp_factor);
+  }
+
+  if (need_full_buffer) {
+#ifdef D_MULTISCAN_FILES_SUPPORTED
+    /* Allocate a full-image virtual array for each component. */
+    int access_rows;
+
+    for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
+	 ci++, compptr++) {
+      access_rows = compptr->v_samp_factor;
+      diff->whole_image[ci] = (*cinfo->mem->request_virt_sarray)
+	((j_common_ptr) cinfo, JPOOL_IMAGE, FALSE,
+	 (JDIMENSION) jround_up((long) compptr->width_in_data_units,
+				(long) compptr->h_samp_factor),
+	 (JDIMENSION) jround_up((long) compptr->height_in_data_units,
+				(long) compptr->v_samp_factor),
+	 (JDIMENSION) access_rows);
+    }
+    losslsd->pub.consume_data = consume_data;
+    losslsd->pub.decompress_data = output_data;
+#else
+    ERREXIT(cinfo, JERR_NOT_COMPILED);
+#endif
+  } else {
+    losslsd->pub.consume_data = dummy_consume_data;
+    losslsd->pub.decompress_data = decompress_data;
+    diff->whole_image[0] = NULL; /* flag for no virtual arrays */
+  }
+}
+
+#endif /* D_LOSSLESS_SUPPORTED */
diff --git a/uppsrc/plugin/jpg/lib/jdhuff.c b/uppsrc/plugin/jpg/lib/jdhuff.c
new file mode 100644
index 000000000..0e179ccb4
--- /dev/null
+++ b/uppsrc/plugin/jpg/lib/jdhuff.c
@@ -0,0 +1,315 @@
+/*
+ * jdhuff.c
+ *
+ * Copyright (C) 1991-1998, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains Huffman entropy decoding routines which are shared
+ * by the sequential, progressive and lossless decoders.
+ */
+
+#define JPEG_INTERNALS
+#include "jinclude.h"
+#include "jpeglib.h"
+#include "jlossy.h"		/* Private declarations for lossy codec */
+#include "jlossls.h"		/* Private declarations for lossless codec */
+#include "jdhuff.h"		/* Declarations shared with jd*huff.c */
+
+
+/*
+ * Compute the derived values for a Huffman table.
+ * This routine also performs some validation checks on the table.
+ */
+
+GLOBAL(void)
+jpeg_make_d_derived_tbl (j_decompress_ptr cinfo, boolean isDC, int tblno,
+			 d_derived_tbl ** pdtbl)
+{
+  JHUFF_TBL *htbl;
+  d_derived_tbl *dtbl;
+  int p, i, l, si, numsymbols;
+  int lookbits, ctr;
+  char huffsize[257];
+  unsigned int huffcode[257];
+  unsigned int code;
+
+  /* Note that huffsize[] and huffcode[] are filled in code-length order,
+   * paralleling the order of the symbols themselves in htbl->huffval[].
+   */
+
+  /* Find the input Huffman table */
+  if (tblno < 0 || tblno >= NUM_HUFF_TBLS)
+    ERREXIT1(cinfo, JERR_NO_HUFF_TABLE, tblno);
+  htbl =
+    isDC ? cinfo->dc_huff_tbl_ptrs[tblno] : cinfo->ac_huff_tbl_ptrs[tblno];
+  if (htbl == NULL)
+    ERREXIT1(cinfo, JERR_NO_HUFF_TABLE, tblno);
+
+  /* Allocate a workspace if we haven't already done so. */
+  if (*pdtbl == NULL)
+    *pdtbl = (d_derived_tbl *)
+      (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+				  SIZEOF(d_derived_tbl));
+  dtbl = *pdtbl;
+  dtbl->pub = htbl;		/* fill in back link */
+
+  /* Figure C.1: make table of Huffman code length for each symbol */
+
+  p = 0;
+  for (l = 1; l <= 16; l++) {
+    i = (int) htbl->bits[l];
+    if (i < 0 || p + i > 256)	/* protect against table overrun */
+      ERREXIT(cinfo, JERR_BAD_HUFF_TABLE);
+    while (i--)
+      huffsize[p++] = (char) l;
+  }
+  huffsize[p] = 0;
+  numsymbols = p;
+
+  /* Figure C.2: generate the codes themselves */
+  /* We also validate that the counts represent a legal Huffman code tree. */
+
+  code = 0;
+  si = huffsize[0];
+  p = 0;
+  while (huffsize[p]) {
+    while (((int) huffsize[p]) == si) {
+      huffcode[p++] = code;
+      code++;
+    }
+    /* code is now 1 more than the last code used for codelength si; but
+     * it must still fit in si bits, since no code is allowed to be all ones.
+     */
+    if (((INT32) code) >= (((INT32) 1) << si))
+      ERREXIT(cinfo, JERR_BAD_HUFF_TABLE);
+    code <<= 1;
+    si++;
+  }
+
+  /* Figure F.15: generate decoding tables for bit-sequential decoding */
+
+  p = 0;
+  for (l = 1; l <= 16; l++) {
+    if (htbl->bits[l]) {
+      /* valoffset[l] = huffval[] index of 1st symbol of code length l,
+       * minus the minimum code of length l
+       */
+      dtbl->valoffset[l] = (INT32) p - (INT32) huffcode[p];
+      p += htbl->bits[l];
+      dtbl->maxcode[l] = huffcode[p-1]; /* maximum code of length l */
+    } else {
+      dtbl->maxcode[l] = -1;	/* -1 if no codes of this length */
+    }
+  }
+  dtbl->maxcode[17] = 0xFFFFFL; /* ensures jpeg_huff_decode terminates */
+
+  /* Compute lookahead tables to speed up decoding.
+   * First we set all the table entries to 0, indicating "too long";
+   * then we iterate through the Huffman codes that are short enough and
+   * fill in all the entries that correspond to bit sequences starting
+   * with that code.
+   */
+
+  MEMZERO(dtbl->look_nbits, SIZEOF(dtbl->look_nbits));
+
+  p = 0;
+  for (l = 1; l <= HUFF_LOOKAHEAD; l++) {
+    for (i = 1; i <= (int) htbl->bits[l]; i++, p++) {
+      /* l = current code's length, p = its index in huffcode[] & huffval[]. */
+      /* Generate left-justified code followed by all possible bit sequences */
+      lookbits = huffcode[p] << (HUFF_LOOKAHEAD-l);
+      for (ctr = 1 << (HUFF_LOOKAHEAD-l); ctr > 0; ctr--) {
+	dtbl->look_nbits[lookbits] = l;
+	dtbl->look_sym[lookbits] = htbl->huffval[p];
+	lookbits++;
+      }
+    }
+  }
+
+  /* Validate symbols as being reasonable.
+   * For AC tables, we make no check, but accept all byte values 0..255.
+   * For DC tables, we require the symbols to be in range 0..16.
+   * (Tighter bounds could be applied depending on the data depth and mode,
+   * but this is sufficient to ensure safe decoding.)
+   */
+  if (isDC) {
+    for (i = 0; i < numsymbols; i++) {
+      int sym = htbl->huffval[i];
+      if (sym < 0 || sym > 16)
+	ERREXIT(cinfo, JERR_BAD_HUFF_TABLE);
+    }
+  }
+}
+
+
+/*
+ * Out-of-line code for bit fetching.
+ * See jdhuff.h for info about usage.
+ * Note: current values of get_buffer and bits_left are passed as parameters,
+ * but are returned in the corresponding fields of the state struct.
+ *
+ * On most machines MIN_GET_BITS should be 25 to allow the full 32-bit width
+ * of get_buffer to be used.  (On machines with wider words, an even larger
+ * buffer could be used.)  However, on some machines 32-bit shifts are
+ * quite slow and take time proportional to the number of places shifted.
+ * (This is true with most PC compilers, for instance.)  In this case it may
+ * be a win to set MIN_GET_BITS to the minimum value of 15.  This reduces the
+ * average shift distance at the cost of more calls to jpeg_fill_bit_buffer.
+ */
+
+#ifdef SLOW_SHIFT_32
+#define MIN_GET_BITS  15	/* minimum allowable value */
+#else
+#define MIN_GET_BITS  (BIT_BUF_SIZE-7)
+#endif
+
+
+GLOBAL(boolean)
+jpeg_fill_bit_buffer (bitread_working_state * state,
+		      register bit_buf_type get_buffer, register int bits_left,
+		      int nbits)
+/* Load up the bit buffer to a depth of at least nbits */
+{
+  /* Copy heavily used state fields into locals (hopefully registers) */
+  register const JOCTET * next_input_byte = state->next_input_byte;
+  register size_t bytes_in_buffer = state->bytes_in_buffer;
+  j_decompress_ptr cinfo = state->cinfo;
+
+  /* Attempt to load at least MIN_GET_BITS bits into get_buffer. */
+  /* (It is assumed that no request will be for more than that many bits.) */
+  /* We fail to do so only if we hit a marker or are forced to suspend. */
+
+  if (cinfo->unread_marker == 0) {	/* cannot advance past a marker */
+    while (bits_left < MIN_GET_BITS) {
+      register int c;
+
+      /* Attempt to read a byte */
+      if (bytes_in_buffer == 0) {
+	if (! (*cinfo->src->fill_input_buffer) (cinfo))
+	  return FALSE;
+	next_input_byte = cinfo->src->next_input_byte;
+	bytes_in_buffer = cinfo->src->bytes_in_buffer;
+      }
+      bytes_in_buffer--;
+      c = GETJOCTET(*next_input_byte++);
+
+      /* If it's 0xFF, check and discard stuffed zero byte */
+      if (c == 0xFF) {
+	/* Loop here to discard any padding FF's on terminating marker,
+	 * so that we can save a valid unread_marker value.  NOTE: we will
+	 * accept multiple FF's followed by a 0 as meaning a single FF data
+	 * byte.  This data pattern is not valid according to the standard.
+	 */
+	do {
+	  if (bytes_in_buffer == 0) {
+	    if (! (*cinfo->src->fill_input_buffer) (cinfo))
+	      return FALSE;
+	    next_input_byte = cinfo->src->next_input_byte;
+	    bytes_in_buffer = cinfo->src->bytes_in_buffer;
+	  }
+	  bytes_in_buffer--;
+	  c = GETJOCTET(*next_input_byte++);
+	} while (c == 0xFF);
+
+	if (c == 0) {
+	  /* Found FF/00, which represents an FF data byte */
+	  c = 0xFF;
+	} else {
+	  /* Oops, it's actually a marker indicating end of compressed data.
+	   * Save the marker code for later use.
+	   * Fine point: it might appear that we should save the marker into
+	   * bitread working state, not straight into permanent state.  But
+	   * once we have hit a marker, we cannot need to suspend within the
+	   * current MCU, because we will read no more bytes from the data
+	   * source.  So it is OK to update permanent state right away.
+	   */
+	  cinfo->unread_marker = c;
+	  /* See if we need to insert some fake zero bits. */
+	  goto no_more_bytes;
+	}
+      }
+
+      /* OK, load c into get_buffer */
+      get_buffer = (get_buffer << 8) | c;
+      bits_left += 8;
+    } /* end while */
+  } else {
+  no_more_bytes:
+    /* We get here if we've read the marker that terminates the compressed
+     * data segment.  There should be enough bits in the buffer register
+     * to satisfy the request; if so, no problem.
+     */
+    if (nbits > bits_left) {
+      /* Uh-oh.  Report corrupted data to user and stuff zeroes into
+       * the data stream, so that we can produce some kind of image.
+       * We use a nonvolatile flag to ensure that only one warning message
+       * appears per data segment.
+       */
+      huffd_common_ptr huffd;
+      if (cinfo->process == JPROC_LOSSLESS)
+	huffd = (huffd_common_ptr) ((j_lossless_d_ptr) cinfo->codec)->entropy_private;
+      else
+	huffd = (huffd_common_ptr) ((j_lossy_d_ptr) cinfo->codec)->entropy_private;
+      if (! huffd->insufficient_data) {
+	WARNMS(cinfo, JWRN_HIT_MARKER);
+	huffd->insufficient_data = TRUE;
+      }
+      /* Fill the buffer with zero bits */
+      get_buffer <<= MIN_GET_BITS - bits_left;
+      bits_left = MIN_GET_BITS;
+    }
+  }
+
+  /* Unload the local registers */
+  state->next_input_byte = next_input_byte;
+  state->bytes_in_buffer = bytes_in_buffer;
+  state->get_buffer = get_buffer;
+  state->bits_left = bits_left;
+
+  return TRUE;
+}
+
+
+/*
+ * Out-of-line code for Huffman code decoding.
+ * See jdhuff.h for info about usage.
+ */
+
+GLOBAL(int)
+jpeg_huff_decode (bitread_working_state * state,
+		  register bit_buf_type get_buffer, register int bits_left,
+		  d_derived_tbl * htbl, int min_bits)
+{
+  register int l = min_bits;
+  register INT32 code;
+
+  /* HUFF_DECODE has determined that the code is at least min_bits */
+  /* bits long, so fetch that many bits in one swoop. */
+
+  CHECK_BIT_BUFFER(*state, l, return -1);
+  code = GET_BITS(l);
+
+  /* Collect the rest of the Huffman code one bit at a time. */
+  /* This is per Figure F.16 in the JPEG spec. */
+
+  while (code > htbl->maxcode[l]) {
+    code <<= 1;
+    CHECK_BIT_BUFFER(*state, 1, return -1);
+    code |= GET_BITS(1);
+    l++;
+  }
+
+  /* Unload the local registers */
+  state->get_buffer = get_buffer;
+  state->bits_left = bits_left;
+
+  /* With garbage input we may reach the sentinel value l = 17. */
+
+  if (l > 16) {
+    WARNMS(state->cinfo, JWRN_HUFF_BAD_CODE);
+    return 0;			/* fake a zero as the safest result */
+  }
+
+  return htbl->pub->huffval[ (int) (code + htbl->valoffset[l]) ];
+}
diff --git a/uppsrc/plugin/jpg/lib/jdhuff.h b/uppsrc/plugin/jpg/lib/jdhuff.h
new file mode 100644
index 000000000..f9bfc5cc2
--- /dev/null
+++ b/uppsrc/plugin/jpg/lib/jdhuff.h
@@ -0,0 +1,229 @@
+/*
+ * jdhuff.h
+ *
+ * Copyright (C) 1991-1998, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains declarations for Huffman entropy decoding routines
+ * that are shared between the sequential decoder (jdhuff.c), the
+ * progressive decoder (jdphuff.c) and the lossless decoder (jdlhuff.c).
+ * No other modules need to see these.
+ */
+
+/* Short forms of external names for systems with brain-damaged linkers. */
+
+#ifdef NEED_SHORT_EXTERNAL_NAMES
+#define jpeg_make_d_derived_tbl	jMkDDerived
+#define jpeg_fill_bit_buffer	jFilBitBuf
+#define jpeg_huff_decode	jHufDecode
+#endif /* NEED_SHORT_EXTERNAL_NAMES */
+
+
+/* Derived data constructed for each Huffman table */
+
+#define HUFF_LOOKAHEAD	8	/* # of bits of lookahead */
+
+typedef struct {
+  /* Basic tables: (element [0] of each array is unused) */
+  INT32 maxcode[18];		/* largest code of length k (-1 if none) */
+  /* (maxcode[17] is a sentinel to ensure jpeg_huff_decode terminates) */
+  INT32 valoffset[17];		/* huffval[] offset for codes of length k */
+  /* valoffset[k] = huffval[] index of 1st symbol of code length k, less
+   * the smallest code of length k; so given a code of length k, the
+   * corresponding symbol is huffval[code + valoffset[k]]
+   */
+
+  /* Link to public Huffman table (needed only in jpeg_huff_decode) */
+  JHUFF_TBL *pub;
+
+  /* Lookahead tables: indexed by the next HUFF_LOOKAHEAD bits of
+   * the input data stream.  If the next Huffman code is no more
+   * than HUFF_LOOKAHEAD bits long, we can obtain its length and
+   * the corresponding symbol directly from these tables.
+   */
+  int look_nbits[1<<HUFF_LOOKAHEAD]; /* # bits, or 0 if too long */
+  UINT8 look_sym[1<<HUFF_LOOKAHEAD]; /* symbol, or unused */
+} d_derived_tbl;
+
+/* Expand a Huffman table definition into the derived format */
+EXTERN(void) jpeg_make_d_derived_tbl
+	JPP((j_decompress_ptr cinfo, boolean isDC, int tblno,
+	     d_derived_tbl ** pdtbl));
+
+
+/*
+ * Fetching the next N bits from the input stream is a time-critical operation
+ * for the Huffman decoders.  We implement it with a combination of inline
+ * macros and out-of-line subroutines.  Note that N (the number of bits
+ * demanded at one time) never exceeds 15 for JPEG use.
+ *
+ * We read source bytes into get_buffer and dole out bits as needed.
+ * If get_buffer already contains enough bits, they are fetched in-line
+ * by the macros CHECK_BIT_BUFFER and GET_BITS.  When there aren't enough
+ * bits, jpeg_fill_bit_buffer is called; it will attempt to fill get_buffer
+ * as full as possible (not just to the number of bits needed; this
+ * prefetching reduces the overhead cost of calling jpeg_fill_bit_buffer).
+ * Note that jpeg_fill_bit_buffer may return FALSE to indicate suspension.
+ * On TRUE return, jpeg_fill_bit_buffer guarantees that get_buffer contains
+ * at least the requested number of bits --- dummy zeroes are inserted if
+ * necessary.
+ */
+
+typedef INT32 bit_buf_type;	/* type of bit-extraction buffer */
+#define BIT_BUF_SIZE  32	/* size of buffer in bits */
+
+/* If long is > 32 bits on your machine, and shifting/masking longs is
+ * reasonably fast, making bit_buf_type be long and setting BIT_BUF_SIZE
+ * appropriately should be a win.  Unfortunately we can't define the size
+ * with something like  #define BIT_BUF_SIZE (sizeof(bit_buf_type)*8)
+ * because not all machines measure sizeof in 8-bit bytes.
+ */
+
+typedef struct {		/* Bitreading state saved across MCUs */
+  bit_buf_type get_buffer;	/* current bit-extraction buffer */
+  int bits_left;		/* # of unused bits in it */
+} bitread_perm_state;
+
+typedef struct {		/* Bitreading working state within an MCU */
+  /* Current data source location */
+  /* We need a copy, rather than munging the original, in case of suspension */
+  const JOCTET * next_input_byte; /* => next byte to read from source */
+  size_t bytes_in_buffer;	/* # of bytes remaining in source buffer */
+  /* Bit input buffer --- note these values are kept in register variables,
+   * not in this struct, inside the inner loops.
+   */
+  bit_buf_type get_buffer;	/* current bit-extraction buffer */
+  int bits_left;		/* # of unused bits in it */
+  /* Pointer needed by jpeg_fill_bit_buffer. */
+  j_decompress_ptr cinfo;	/* back link to decompress master record */
+} bitread_working_state;
+
+/* Macros to declare and load/save bitread local variables. */
+#define BITREAD_STATE_VARS  \
+	register bit_buf_type get_buffer;  \
+	register int bits_left;  \
+	bitread_working_state br_state
+
+#define BITREAD_LOAD_STATE(cinfop,permstate)  \
+	br_state.cinfo = cinfop; \
+	br_state.next_input_byte = cinfop->src->next_input_byte; \
+	br_state.bytes_in_buffer = cinfop->src->bytes_in_buffer; \
+	get_buffer = permstate.get_buffer; \
+	bits_left = permstate.bits_left;
+
+#define BITREAD_SAVE_STATE(cinfop,permstate)  \
+	cinfop->src->next_input_byte = br_state.next_input_byte; \
+	cinfop->src->bytes_in_buffer = br_state.bytes_in_buffer; \
+	permstate.get_buffer = get_buffer; \
+	permstate.bits_left = bits_left
+
+/*
+ * These macros provide the in-line portion of bit fetching.
+ * Use CHECK_BIT_BUFFER to ensure there are N bits in get_buffer
+ * before using GET_BITS, PEEK_BITS, or DROP_BITS.
+ * The variables get_buffer and bits_left are assumed to be locals,
+ * but the state struct might not be (jpeg_huff_decode needs this).
+ *	CHECK_BIT_BUFFER(state,n,action);
+ *		Ensure there are N bits in get_buffer; if suspend, take action.
+ *      val = GET_BITS(n);
+ *		Fetch next N bits.
+ *      val = PEEK_BITS(n);
+ *		Fetch next N bits without removing them from the buffer.
+ *	DROP_BITS(n);
+ *		Discard next N bits.
+ * The value N should be a simple variable, not an expression, because it
+ * is evaluated multiple times.
+ */
+
+#define CHECK_BIT_BUFFER(state,nbits,action) \
+	{ if (bits_left < (nbits)) {  \
+	    if (! jpeg_fill_bit_buffer(&(state),get_buffer,bits_left,nbits))  \
+	      { action; }  \
+	    get_buffer = (state).get_buffer; bits_left = (state).bits_left; } }
+
+#define GET_BITS(nbits) \
+	(((int) (get_buffer >> (bits_left -= (nbits)))) & ((1<<(nbits))-1))
+
+#define PEEK_BITS(nbits) \
+	(((int) (get_buffer >> (bits_left -  (nbits)))) & ((1<<(nbits))-1))
+
+#define DROP_BITS(nbits) \
+	(bits_left -= (nbits))
+
+/* Load up the bit buffer to a depth of at least nbits */
+EXTERN(boolean) jpeg_fill_bit_buffer
+	JPP((bitread_working_state * state, register bit_buf_type get_buffer,
+	     register int bits_left, int nbits));
+
+
+/*
+ * Code for extracting next Huffman-coded symbol from input bit stream.
+ * Again, this is time-critical and we make the main paths be macros.
+ *
+ * We use a lookahead table to process codes of up to HUFF_LOOKAHEAD bits
+ * without looping.  Usually, more than 95% of the Huffman codes will be 8
+ * or fewer bits long.  The few overlength codes are handled with a loop,
+ * which need not be inline code.
+ *
+ * Notes about the HUFF_DECODE macro:
+ * 1. Near the end of the data segment, we may fail to get enough bits
+ *    for a lookahead.  In that case, we do it the hard way.
+ * 2. If the lookahead table contains no entry, the next code must be
+ *    more than HUFF_LOOKAHEAD bits long.
+ * 3. jpeg_huff_decode returns -1 if forced to suspend.
+ */
+
+#define HUFF_DECODE(result,state,htbl,failaction,slowlabel) \
+{ register int nb, look; \
+  if (bits_left < HUFF_LOOKAHEAD) { \
+    if (! jpeg_fill_bit_buffer(&state,get_buffer,bits_left, 0)) {failaction;} \
+    get_buffer = state.get_buffer; bits_left = state.bits_left; \
+    if (bits_left < HUFF_LOOKAHEAD) { \
+      nb = 1; goto slowlabel; \
+    } \
+  } \
+  look = PEEK_BITS(HUFF_LOOKAHEAD); \
+  if ((nb = htbl->look_nbits[look]) != 0) { \
+    DROP_BITS(nb); \
+    result = htbl->look_sym[look]; \
+  } else { \
+    nb = HUFF_LOOKAHEAD+1; \
+slowlabel: \
+    if ((result=jpeg_huff_decode(&state,get_buffer,bits_left,htbl,nb)) < 0) \
+	{ failaction; } \
+    get_buffer = state.get_buffer; bits_left = state.bits_left; \
+  } \
+}
+
+/* Out-of-line case for Huffman code fetching */
+EXTERN(int) jpeg_huff_decode
+	JPP((bitread_working_state * state, register bit_buf_type get_buffer,
+	     register int bits_left, d_derived_tbl * htbl, int min_bits));
+
+
+/* Common fields between sequential, progressive and lossless Huffman entropy
+ * decoder master structs.
+ */
+
+#define huffd_common_fields \
+  boolean insufficient_data;	/* set TRUE after emmitting warning */ \
+  /* These fields are loaded into local variables at start of each MCU. \
+   * In case of suspension, we exit WITHOUT updating them. \
+   */ \
+  bitread_perm_state bitstate	/* Bit buffer at start of MCU */
+
+/* Routines that are to be used by any or all of the entropy decoders are
+ * declared to receive a pointer to this structure.  There are no actual
+ * instances of huffd_common_struct, only of shuff_entropy_decoder,
+ * phuff_entropy_decoder and lhuff_entropy_decoder.
+ */
+struct huffd_common_struct {
+  huffd_common_fields;		/* Fields common to all decoder struct types */
+  /* Additional fields follow in an actual shuff_entropy_decoder,
+   * phuff_entropy_decoder or lhuff_entropy_decoder struct.  All four structs
+   * must agree on these initial fields!  (This would be a lot cleaner in C++.)
+   */
+};
+
+typedef struct huffd_common_struct * huffd_common_ptr;
diff --git a/uppsrc/plugin/jpg/lib/jdinput.c b/uppsrc/plugin/jpg/lib/jdinput.c
new file mode 100644
index 000000000..c4415f43a
--- /dev/null
+++ b/uppsrc/plugin/jpg/lib/jdinput.c
@@ -0,0 +1,347 @@
+/*
+ * jdinput.c
+ *
+ * Copyright (C) 1991-1998, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains input control logic for the JPEG decompressor.
+ * These routines are concerned with controlling the decompressor's input
+ * processing (marker reading and coefficient/difference decoding).
+ * The actual input reading is done in jdmarker.c, jdhuff.c, jdphuff.c,
+ * and jdlhuff.c.
+ */
+
+#define JPEG_INTERNALS
+#include "jinclude.h"
+#include "jpeglib.h"
+
+
+/* Private state */
+
+typedef struct {
+  struct jpeg_input_controller pub; /* public fields */
+
+  boolean inheaders;		/* TRUE until first SOS is reached */
+} my_input_controller;
+
+typedef my_input_controller * my_inputctl_ptr;
+
+
+/* Forward declarations */
+METHODDEF(int) consume_markers JPP((j_decompress_ptr cinfo));
+
+
+/*
+ * Routines to calculate various quantities related to the size of the image.
+ */
+
+LOCAL(void)
+initial_setup (j_decompress_ptr cinfo)
+/* Called once, when first SOS marker is reached */
+{
+  int ci;
+  jpeg_component_info *compptr;
+
+  /* Make sure image isn't bigger than I can handle */
+  if ((long) cinfo->image_height > (long) JPEG_MAX_DIMENSION ||
+      (long) cinfo->image_width > (long) JPEG_MAX_DIMENSION)
+    ERREXIT1(cinfo, JERR_IMAGE_TOO_BIG, (unsigned int) JPEG_MAX_DIMENSION);
+
+  if (cinfo->process == JPROC_LOSSLESS) {
+    /* If precision > compiled-in value, we must downscale */
+    if (cinfo->data_precision > BITS_IN_JSAMPLE)
+      WARNMS2(cinfo, JWRN_MUST_DOWNSCALE,
+	      cinfo->data_precision, BITS_IN_JSAMPLE);
+  }
+  else {  /* Lossy processes */
+    /* For now, precision must match compiled-in value... */
+    if (cinfo->data_precision != BITS_IN_JSAMPLE)
+      ERREXIT1(cinfo, JERR_BAD_PRECISION, cinfo->data_precision);
+  }
+
+  /* Check that number of components won't exceed internal array sizes */
+  if (cinfo->num_components > MAX_COMPONENTS)
+    ERREXIT2(cinfo, JERR_COMPONENT_COUNT, cinfo->num_components,
+	     MAX_COMPONENTS);
+
+  /* Compute maximum sampling factors; check factor validity */
+  cinfo->max_h_samp_factor = 1;
+  cinfo->max_v_samp_factor = 1;
+  for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
+       ci++, compptr++) {
+    if (compptr->h_samp_factor<=0 || compptr->h_samp_factor>MAX_SAMP_FACTOR ||
+	compptr->v_samp_factor<=0 || compptr->v_samp_factor>MAX_SAMP_FACTOR)
+      ERREXIT(cinfo, JERR_BAD_SAMPLING);
+    cinfo->max_h_samp_factor = MAX(cinfo->max_h_samp_factor,
+				   compptr->h_samp_factor);
+    cinfo->max_v_samp_factor = MAX(cinfo->max_v_samp_factor,
+				   compptr->v_samp_factor);
+  }
+
+  /* We initialize codec_data_unit and min_codec_data_unit to data_unit.
+   * In the full decompressor, this will be overridden by jdmaster.c;
+   * but in the transcoder, jdmaster.c is not used, so we must do it here.
+   */
+  cinfo->min_codec_data_unit = cinfo->data_unit;
+
+  /* Compute dimensions of components */
+  for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
+       ci++, compptr++) {
+    compptr->codec_data_unit = cinfo->data_unit;
+    /* Size in data units */
+    compptr->width_in_data_units = (JDIMENSION)
+      jdiv_round_up((long) cinfo->image_width * (long) compptr->h_samp_factor,
+		    (long) (cinfo->max_h_samp_factor * cinfo->data_unit));
+    compptr->height_in_data_units = (JDIMENSION)
+      jdiv_round_up((long) cinfo->image_height * (long) compptr->v_samp_factor,
+		    (long) (cinfo->max_v_samp_factor * cinfo->data_unit));
+    /* downsampled_width and downsampled_height will also be overridden by
+     * jdmaster.c if we are doing full decompression.  The transcoder library
+     * doesn't use these values, but the calling application might.
+     */
+    /* Size in samples */
+    compptr->downsampled_width = (JDIMENSION)
+      jdiv_round_up((long) cinfo->image_width * (long) compptr->h_samp_factor,
+		    (long) cinfo->max_h_samp_factor);
+    compptr->downsampled_height = (JDIMENSION)
+      jdiv_round_up((long) cinfo->image_height * (long) compptr->v_samp_factor,
+		    (long) cinfo->max_v_samp_factor);
+    /* Mark component needed, until color conversion says otherwise */
+    compptr->component_needed = TRUE;
+    /* Mark no quantization table yet saved for component */
+    compptr->quant_table = NULL;
+  }
+
+  /* Compute number of fully interleaved MCU rows. */
+  cinfo->total_iMCU_rows = (JDIMENSION)
+    jdiv_round_up((long) cinfo->image_height,
+		  (long) (cinfo->max_v_samp_factor*cinfo->data_unit));
+
+  /* Decide whether file contains multiple scans */
+  if (cinfo->comps_in_scan < cinfo->num_components ||
+      cinfo->process == JPROC_PROGRESSIVE)
+    cinfo->inputctl->has_multiple_scans = TRUE;
+  else
+    cinfo->inputctl->has_multiple_scans = FALSE;
+}
+
+
+LOCAL(void)
+per_scan_setup (j_decompress_ptr cinfo)
+/* Do computations that are needed before processing a JPEG scan */
+/* cinfo->comps_in_scan and cinfo->cur_comp_info[] were set from SOS marker */
+{
+  int ci, mcublks, tmp;
+  jpeg_component_info *compptr;
+
+  if (cinfo->comps_in_scan == 1) {
+
+    /* Noninterleaved (single-component) scan */
+    compptr = cinfo->cur_comp_info[0];
+
+    /* Overall image size in MCUs */
+    cinfo->MCUs_per_row = compptr->width_in_data_units;
+    cinfo->MCU_rows_in_scan = compptr->height_in_data_units;
+
+    /* For noninterleaved scan, always one data unit per MCU */
+    compptr->MCU_width = 1;
+    compptr->MCU_height = 1;
+    compptr->MCU_data_units = 1;
+    compptr->MCU_sample_width = compptr->codec_data_unit;
+    compptr->last_col_width = 1;
+    /* For noninterleaved scans, it is convenient to define last_row_height
+     * as the number of data unit rows present in the last iMCU row.
+     */
+    tmp = (int) (compptr->height_in_data_units % compptr->v_samp_factor);
+    if (tmp == 0) tmp = compptr->v_samp_factor;
+    compptr->last_row_height = tmp;
+
+    /* Prepare array describing MCU composition */
+    cinfo->data_units_in_MCU = 1;
+    cinfo->MCU_membership[0] = 0;
+
+  } else {
+
+    /* Interleaved (multi-component) scan */
+    if (cinfo->comps_in_scan <= 0 || cinfo->comps_in_scan > MAX_COMPS_IN_SCAN)
+      ERREXIT2(cinfo, JERR_COMPONENT_COUNT, cinfo->comps_in_scan,
+	       MAX_COMPS_IN_SCAN);
+
+    /* Overall image size in MCUs */
+    cinfo->MCUs_per_row = (JDIMENSION)
+      jdiv_round_up((long) cinfo->image_width,
+		    (long) (cinfo->max_h_samp_factor*cinfo->data_unit));
+    cinfo->MCU_rows_in_scan = (JDIMENSION)
+      jdiv_round_up((long) cinfo->image_height,
+		    (long) (cinfo->max_v_samp_factor*cinfo->data_unit));
+
+    cinfo->data_units_in_MCU = 0;
+
+    for (ci = 0; ci < cinfo->comps_in_scan; ci++) {
+      compptr = cinfo->cur_comp_info[ci];
+      /* Sampling factors give # of data units of component in each MCU */
+      compptr->MCU_width = compptr->h_samp_factor;
+      compptr->MCU_height = compptr->v_samp_factor;
+      compptr->MCU_data_units = compptr->MCU_width * compptr->MCU_height;
+      compptr->MCU_sample_width = compptr->MCU_width * compptr->codec_data_unit;
+      /* Figure number of non-dummy data units in last MCU column & row */
+      tmp = (int) (compptr->width_in_data_units % compptr->MCU_width);
+      if (tmp == 0) tmp = compptr->MCU_width;
+      compptr->last_col_width = tmp;
+      tmp = (int) (compptr->height_in_data_units % compptr->MCU_height);
+      if (tmp == 0) tmp = compptr->MCU_height;
+      compptr->last_row_height = tmp;
+      /* Prepare array describing MCU composition */
+      mcublks = compptr->MCU_data_units;
+      if (cinfo->data_units_in_MCU + mcublks > D_MAX_DATA_UNITS_IN_MCU)
+	ERREXIT(cinfo, JERR_BAD_MCU_SIZE);
+      while (mcublks-- > 0) {
+	cinfo->MCU_membership[cinfo->data_units_in_MCU++] = ci;
+      }
+    }
+
+  }
+}
+
+
+/*
+ * Initialize the input modules to read a scan of compressed data.
+ * The first call to this is done by jdmaster.c after initializing
+ * the entire decompressor (during jpeg_start_decompress).
+ * Subsequent calls come from consume_markers, below.
+ */
+
+METHODDEF(void)
+start_input_pass (j_decompress_ptr cinfo)
+{
+  per_scan_setup(cinfo);
+  (*cinfo->codec->start_input_pass) (cinfo);
+  cinfo->inputctl->consume_input = cinfo->codec->consume_data;
+}
+
+
+/*
+ * Finish up after inputting a compressed-data scan.
+ * This is called by the coefficient controller after it's read all
+ * the expected data of the scan.
+ */
+
+METHODDEF(void)
+finish_input_pass (j_decompress_ptr cinfo)
+{
+  cinfo->inputctl->consume_input = consume_markers;
+}
+
+
+/*
+ * Read JPEG markers before, between, or after compressed-data scans.
+ * Change state as necessary when a new scan is reached.
+ * Return value is JPEG_SUSPENDED, JPEG_REACHED_SOS, or JPEG_REACHED_EOI.
+ *
+ * The consume_input method pointer points either here or to the
+ * coefficient controller's consume_data routine, depending on whether
+ * we are reading a compressed data segment or inter-segment markers.
+ */
+
+METHODDEF(int)
+consume_markers (j_decompress_ptr cinfo)
+{
+  my_inputctl_ptr inputctl = (my_inputctl_ptr) cinfo->inputctl;
+  int val;
+
+  if (inputctl->pub.eoi_reached) /* After hitting EOI, read no further */
+    return JPEG_REACHED_EOI;
+
+  val = (*cinfo->marker->read_markers) (cinfo);
+
+  switch (val) {
+  case JPEG_REACHED_SOS:	/* Found SOS */
+    if (inputctl->inheaders) {	/* 1st SOS */
+      initial_setup(cinfo);
+      /*
+       * Initialize the decompression codec.  We need to do this here so that
+       * any codec-specific fields and function pointers are available to
+       * the rest of the library.
+       */
+      jinit_d_codec(cinfo);
+      inputctl->inheaders = FALSE;
+      /* Note: start_input_pass must be called by jdmaster.c
+       * before any more input can be consumed.  jdapimin.c is
+       * responsible for enforcing this sequencing.
+       */
+    } else {			/* 2nd or later SOS marker */
+      if (! inputctl->pub.has_multiple_scans)
+	ERREXIT(cinfo, JERR_EOI_EXPECTED); /* Oops, I wasn't expecting this! */
+      start_input_pass(cinfo);
+    }
+    break;
+  case JPEG_REACHED_EOI:	/* Found EOI */
+    inputctl->pub.eoi_reached = TRUE;
+    if (inputctl->inheaders) {	/* Tables-only datastream, apparently */
+      if (cinfo->marker->saw_SOF)
+	ERREXIT(cinfo, JERR_SOF_NO_SOS);
+    } else {
+      /* Prevent infinite loop in coef ctlr's decompress_data routine
+       * if user set output_scan_number larger than number of scans.
+       */
+      if (cinfo->output_scan_number > cinfo->input_scan_number)
+	cinfo->output_scan_number = cinfo->input_scan_number;
+    }
+    break;
+  case JPEG_SUSPENDED:
+    break;
+  }
+
+  return val;
+}
+
+
+/*
+ * Reset state to begin a fresh datastream.
+ */
+
+METHODDEF(void)
+reset_input_controller (j_decompress_ptr cinfo)
+{
+  my_inputctl_ptr inputctl = (my_inputctl_ptr) cinfo->inputctl;
+
+  inputctl->pub.consume_input = consume_markers;
+  inputctl->pub.has_multiple_scans = FALSE; /* "unknown" would be better */
+  inputctl->pub.eoi_reached = FALSE;
+  inputctl->inheaders = TRUE;
+  /* Reset other modules */
+  (*cinfo->err->reset_error_mgr) ((j_common_ptr) cinfo);
+  (*cinfo->marker->reset_marker_reader) (cinfo);
+  /* Reset progression state -- would be cleaner if entropy decoder did this */
+  cinfo->coef_bits = NULL;
+}
+
+
+/*
+ * Initialize the input controller module.
+ * This is called only once, when the decompression object is created.
+ */
+
+GLOBAL(void)
+jinit_input_controller (j_decompress_ptr cinfo)
+{
+  my_inputctl_ptr inputctl;
+
+  /* Create subobject in permanent pool */
+  inputctl = (my_inputctl_ptr)
+    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT,
+				SIZEOF(my_input_controller));
+  cinfo->inputctl = (struct jpeg_input_controller *) inputctl;
+  /* Initialize method pointers */
+  inputctl->pub.consume_input = consume_markers;
+  inputctl->pub.reset_input_controller = reset_input_controller;
+  inputctl->pub.start_input_pass = start_input_pass;
+  inputctl->pub.finish_input_pass = finish_input_pass;
+  /* Initialize state: can't use reset_input_controller since we don't
+   * want to try to reset other modules yet.
+   */
+  inputctl->pub.has_multiple_scans = FALSE; /* "unknown" would be better */
+  inputctl->pub.eoi_reached = FALSE;
+  inputctl->inheaders = TRUE;
+}
diff --git a/uppsrc/plugin/jpg/lib/jdlhuff.c b/uppsrc/plugin/jpg/lib/jdlhuff.c
new file mode 100644
index 000000000..014a68c3d
--- /dev/null
+++ b/uppsrc/plugin/jpg/lib/jdlhuff.c
@@ -0,0 +1,290 @@
+/*
+ * jdlhuff.c
+ *
+ * Copyright (C) 1991-1998, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains Huffman entropy decoding routines for lossless JPEG.
+ *
+ * Much of the complexity here has to do with supporting input suspension.
+ * If the data source module demands suspension, we want to be able to back
+ * up to the start of the current MCU.  To do this, we copy state variables
+ * into local working storage, and update them back to the permanent
+ * storage only upon successful completion of an MCU.
+ */
+
+#define JPEG_INTERNALS
+#include "jinclude.h"
+#include "jpeglib.h"
+#include "jlossls.h"		/* Private declarations for lossless codec */
+#include "jdhuff.h"		/* Declarations shared with jd*huff.c */
+
+
+#ifdef D_LOSSLESS_SUPPORTED
+
+typedef struct {
+  int ci, yoffset, MCU_width;
+} lhd_output_ptr_info;
+
+/*
+ * Private entropy decoder object for lossless Huffman decoding.
+ */
+
+typedef struct {
+  huffd_common_fields;		/* Fields shared with other entropy decoders */
+
+  /* Pointers to derived tables (these workspaces have image lifespan) */
+  d_derived_tbl * derived_tbls[NUM_HUFF_TBLS];
+
+  /* Precalculated info set up by start_pass for use in decode_mcus: */
+
+  /* Pointers to derived tables to be used for each data unit within an MCU */
+  d_derived_tbl * cur_tbls[D_MAX_DATA_UNITS_IN_MCU];
+
+  /* Pointers to the proper output difference row for each group of data units
+   * within an MCU.  For each component, there are Vi groups of Hi data units.
+   */
+  JDIFFROW output_ptr[D_MAX_DATA_UNITS_IN_MCU];
+
+  /* Number of output pointers in use for the current MCU.  This is the sum
+   * of all Vi in the MCU.
+   */
+  int num_output_ptrs;
+
+  /* Information used for positioning the output pointers within the output
+   * difference rows.
+   */
+  lhd_output_ptr_info output_ptr_info[D_MAX_DATA_UNITS_IN_MCU];
+
+  /* Index of the proper output pointer for each data unit within an MCU */
+  int output_ptr_index[D_MAX_DATA_UNITS_IN_MCU];
+
+} lhuff_entropy_decoder;
+
+typedef lhuff_entropy_decoder * lhuff_entropy_ptr;
+
+
+/*
+ * Initialize for a Huffman-compressed scan.
+ */
+
+METHODDEF(void)
+start_pass_lhuff_decoder (j_decompress_ptr cinfo)
+{
+  j_lossless_d_ptr losslsd = (j_lossless_d_ptr) cinfo->codec;
+  lhuff_entropy_ptr entropy = (lhuff_entropy_ptr) losslsd->entropy_private;
+  int ci, dctbl, sampn, ptrn, yoffset, xoffset;
+  jpeg_component_info * compptr;
+
+  for (ci = 0; ci < cinfo->comps_in_scan; ci++) {
+    compptr = cinfo->cur_comp_info[ci];
+    dctbl = compptr->dc_tbl_no;
+    /* Make sure requested tables are present */
+    if (dctbl < 0 || dctbl >= NUM_HUFF_TBLS ||
+	cinfo->dc_huff_tbl_ptrs[dctbl] == NULL)
+      ERREXIT1(cinfo, JERR_NO_HUFF_TABLE, dctbl);
+    /* Compute derived values for Huffman tables */
+    /* We may do this more than once for a table, but it's not expensive */
+    jpeg_make_d_derived_tbl(cinfo, TRUE, dctbl,
+			    & entropy->derived_tbls[dctbl]);
+  }
+
+  /* Precalculate decoding info for each sample in an MCU of this scan */
+  for (sampn = 0, ptrn = 0; sampn < cinfo->data_units_in_MCU;) {
+    compptr = cinfo->cur_comp_info[cinfo->MCU_membership[sampn]];
+    ci = compptr->component_index;
+    for (yoffset = 0; yoffset < compptr->MCU_height; yoffset++, ptrn++) {
+      /* Precalculate the setup info for each output pointer */
+      entropy->output_ptr_info[ptrn].ci = ci;
+      entropy->output_ptr_info[ptrn].yoffset = yoffset;
+      entropy->output_ptr_info[ptrn].MCU_width = compptr->MCU_width;
+      for (xoffset = 0; xoffset < compptr->MCU_width; xoffset++, sampn++) {
+	/* Precalculate the output pointer index for each sample */
+	entropy->output_ptr_index[sampn] = ptrn;
+	/* Precalculate which table to use for each sample */
+	entropy->cur_tbls[sampn] = entropy->derived_tbls[compptr->dc_tbl_no];
+      }
+    }
+  }
+  entropy->num_output_ptrs = ptrn;
+
+  /* Initialize bitread state variables */
+  entropy->bitstate.bits_left = 0;
+  entropy->bitstate.get_buffer = 0; /* unnecessary, but keeps Purify quiet */
+  entropy->insufficient_data = FALSE;
+}
+
+
+/*
+ * Figure F.12: extend sign bit.
+ * On some machines, a shift and add will be faster than a table lookup.
+ */
+
+#ifdef AVOID_TABLES
+
+#define HUFF_EXTEND(x,s)  ((x) < (1<<((s)-1)) ? (x) + (((-1)<<(s)) + 1) : (x))
+
+#else
+
+#define HUFF_EXTEND(x,s)  ((x) < extend_test[s] ? (x) + extend_offset[s] : (x))
+
+static const int extend_test[16] =   /* entry n is 2**(n-1) */
+  { 0, 0x0001, 0x0002, 0x0004, 0x0008, 0x0010, 0x0020, 0x0040, 0x0080,
+    0x0100, 0x0200, 0x0400, 0x0800, 0x1000, 0x2000, 0x4000 };
+
+static const int extend_offset[16] = /* entry n is (-1 << n) + 1 */
+  { 0, ((-1)<<1) + 1, ((-1)<<2) + 1, ((-1)<<3) + 1, ((-1)<<4) + 1,
+    ((-1)<<5) + 1, ((-1)<<6) + 1, ((-1)<<7) + 1, ((-1)<<8) + 1,
+    ((-1)<<9) + 1, ((-1)<<10) + 1, ((-1)<<11) + 1, ((-1)<<12) + 1,
+    ((-1)<<13) + 1, ((-1)<<14) + 1, ((-1)<<15) + 1 };
+
+#endif /* AVOID_TABLES */
+
+
+/*
+ * Check for a restart marker & resynchronize decoder.
+ * Returns FALSE if must suspend.
+ */
+
+METHODDEF(boolean)
+process_restart (j_decompress_ptr cinfo)
+{
+  j_lossless_d_ptr losslsd = (j_lossless_d_ptr) cinfo->codec;
+  lhuff_entropy_ptr entropy = (lhuff_entropy_ptr) losslsd->entropy_private;
+//  int ci;
+
+  /* Throw away any unused bits remaining in bit buffer; */
+  /* include any full bytes in next_marker's count of discarded bytes */
+  cinfo->marker->discarded_bytes += entropy->bitstate.bits_left / 8;
+  entropy->bitstate.bits_left = 0;
+
+  /* Advance past the RSTn marker */
+  if (! (*cinfo->marker->read_restart_marker) (cinfo))
+    return FALSE;
+
+  /* Reset out-of-data flag, unless read_restart_marker left us smack up
+   * against a marker.  In that case we will end up treating the next data
+   * segment as empty, and we can avoid producing bogus output pixels by
+   * leaving the flag set.
+   */
+  if (cinfo->unread_marker == 0)
+    entropy->insufficient_data = FALSE;
+
+  return TRUE;
+}
+
+
+/*
+ * Decode and return nMCU's worth of Huffman-compressed differences.
+ * Each MCU is also disassembled and placed accordingly in diff_buf.
+ *
+ * MCU_col_num specifies the column of the first MCU being requested within
+ * the MCU-row.  This tells us where to position the output row pointers in
+ * diff_buf.
+ *
+ * Returns the number of MCUs decoded.  This may be less than nMCU if data
+ * source requested suspension.  In that case no changes have been made to
+ * permanent state.  (Exception: some output differences may already have
+ * been assigned.  This is harmless for this module, since we'll just
+ * re-assign them on the next call.)
+ */
+
+METHODDEF(JDIMENSION)
+decode_mcus (j_decompress_ptr cinfo, JDIFFIMAGE diff_buf,
+	     JDIMENSION MCU_row_num, JDIMENSION MCU_col_num, JDIMENSION nMCU)
+{
+  j_lossless_d_ptr losslsd = (j_lossless_d_ptr) cinfo->codec;
+  lhuff_entropy_ptr entropy = (lhuff_entropy_ptr) losslsd->entropy_private;
+  int mcu_num, sampn, ci, yoffset, MCU_width, ptrn;
+  BITREAD_STATE_VARS;
+
+  /* Set output pointer locations based on MCU_col_num */
+  for (ptrn = 0; ptrn < entropy->num_output_ptrs; ptrn++) {
+    ci = entropy->output_ptr_info[ptrn].ci;
+    yoffset = entropy->output_ptr_info[ptrn].yoffset;
+    MCU_width = entropy->output_ptr_info[ptrn].MCU_width;
+    entropy->output_ptr[ptrn] =
+      diff_buf[ci][MCU_row_num + yoffset] + (MCU_col_num * MCU_width);
+  }
+
+  /*
+   * If we've run out of data, zero out the buffers and return.
+   * By resetting the undifferencer, the output samples will be CENTERJSAMPLE.
+   *
+   * NB: We should find a way to do this without interacting with the
+   * undifferencer module directly.
+   */
+  if (entropy->insufficient_data) {
+    for (ptrn = 0; ptrn < entropy->num_output_ptrs; ptrn++)
+      jzero_far((void FAR *) entropy->output_ptr[ptrn],
+		nMCU * entropy->output_ptr_info[ptrn].MCU_width * SIZEOF(JDIFF));
+
+    (*losslsd->predict_process_restart) (cinfo);
+  }
+
+  else {
+
+    /* Load up working state */
+    BITREAD_LOAD_STATE(cinfo,entropy->bitstate);
+
+    /* Outer loop handles the number of MCU requested */
+
+    for (mcu_num = 0; (unsigned)mcu_num < nMCU; mcu_num++) {
+
+      /* Inner loop handles the samples in the MCU */
+      for (sampn = 0; sampn < cinfo->data_units_in_MCU; sampn++) {
+	d_derived_tbl * dctbl = entropy->cur_tbls[sampn];
+	register int s, r;
+
+	/* Section H.2.2: decode the sample difference */
+	HUFF_DECODE(s, br_state, dctbl, return mcu_num, label1);
+	if (s) {
+	  if (s == 16)	/* special case: always output 32768 */
+	    s = 32768;
+	  else {	/* normal case: fetch subsequent bits */
+	    CHECK_BIT_BUFFER(br_state, s, return mcu_num);
+	    r = GET_BITS(s);
+	    s = HUFF_EXTEND(r, s);
+	  }
+	}
+
+	/* Output the sample difference */
+	*entropy->output_ptr[entropy->output_ptr_index[sampn]]++ = (JDIFF) s;
+      }
+
+      /* Completed MCU, so update state */
+      BITREAD_SAVE_STATE(cinfo,entropy->bitstate);
+    }
+  }
+
+ return nMCU;
+}
+
+
+/*
+ * Module initialization routine for lossless Huffman entropy decoding.
+ */
+
+GLOBAL(void)
+jinit_lhuff_decoder (j_decompress_ptr cinfo)
+{
+  j_lossless_d_ptr losslsd = (j_lossless_d_ptr) cinfo->codec;
+  lhuff_entropy_ptr entropy;
+  int i;
+
+  entropy = (lhuff_entropy_ptr)
+    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+				SIZEOF(lhuff_entropy_decoder));
+  losslsd->entropy_private = (void *) entropy;
+  losslsd->entropy_start_pass = start_pass_lhuff_decoder;
+  losslsd->entropy_process_restart = process_restart;
+  losslsd->entropy_decode_mcus = decode_mcus;
+
+  /* Mark tables unallocated */
+  for (i = 0; i < NUM_HUFF_TBLS; i++) {
+    entropy->derived_tbls[i] = NULL;
+  }
+}
+
+#endif /* D_LOSSLESS_SUPPORTED */
diff --git a/uppsrc/plugin/jpg/lib/jdlossls.c b/uppsrc/plugin/jpg/lib/jdlossls.c
new file mode 100644
index 000000000..ddbf444ff
--- /dev/null
+++ b/uppsrc/plugin/jpg/lib/jdlossls.c
@@ -0,0 +1,94 @@
+/*
+ * jdlossls.c
+ *
+ * Copyright (C) 1998, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains the control logic for the lossless JPEG decompressor.
+ */
+
+#define JPEG_INTERNALS
+#include "jinclude.h"
+#include "jpeglib.h"
+#include "jlossls.h"
+
+
+#ifdef D_LOSSLESS_SUPPORTED
+
+/*
+ * Compute output image dimensions and related values.
+ */
+
+METHODDEF(void)
+calc_output_dimensions (j_decompress_ptr cinfo)
+{
+  /* Hardwire it to "no scaling" */
+  cinfo->output_width = cinfo->image_width;
+  cinfo->output_height = cinfo->image_height;
+  /* jdinput.c has already initialized codec_data_unit to 1,
+   * and has computed unscaled downsampled_width and downsampled_height.
+   */
+}
+
+
+/*
+ * Initialize for an input processing pass.
+ */
+
+METHODDEF(void)
+start_input_pass (j_decompress_ptr cinfo)
+{
+  j_lossless_d_ptr losslsd = (j_lossless_d_ptr) cinfo->codec;
+
+  (*losslsd->entropy_start_pass) (cinfo);
+  (*losslsd->predict_start_pass) (cinfo);
+  (*losslsd->scaler_start_pass) (cinfo);
+  (*losslsd->diff_start_input_pass) (cinfo);
+}
+
+
+/*
+ * Initialize the lossless decompression codec.
+ * This is called only once, during master selection.
+ */
+
+GLOBAL(void)
+jinit_lossless_d_codec(j_decompress_ptr cinfo)
+{
+  j_lossless_d_ptr losslsd;
+  boolean use_c_buffer;
+
+  /* Create subobject in permanent pool */
+  losslsd = (j_lossless_d_ptr)
+    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT,
+				SIZEOF(jpeg_lossless_d_codec));
+  cinfo->codec = (struct jpeg_d_codec *) losslsd;
+
+  /* Initialize sub-modules */
+  /* Entropy decoding: either Huffman or arithmetic coding. */
+  if (cinfo->arith_code) {
+    ERREXIT(cinfo, JERR_ARITH_NOTIMPL);
+  } else {
+    jinit_lhuff_decoder(cinfo);
+  }
+
+  /* Undifferencer */
+  jinit_undifferencer(cinfo);
+
+  /* Scaler */
+  jinit_d_scaler(cinfo);
+
+  use_c_buffer = cinfo->inputctl->has_multiple_scans || cinfo->buffered_image;
+  jinit_d_diff_controller(cinfo, use_c_buffer);
+
+  /* Initialize method pointers.
+   *
+   * Note: consume_data, start_output_pass and decompress_data are
+   * assigned in jddiffct.c.
+   */
+  losslsd->pub.calc_output_dimensions = calc_output_dimensions;
+  losslsd->pub.start_input_pass = start_input_pass;
+}
+
+#endif /* D_LOSSLESS_SUPPORTED */
diff --git a/uppsrc/plugin/jpg/lib/jdlossy.c b/uppsrc/plugin/jpg/lib/jdlossy.c
new file mode 100644
index 000000000..23140faf9
--- /dev/null
+++ b/uppsrc/plugin/jpg/lib/jdlossy.c
@@ -0,0 +1,224 @@
+/*
+ * jdlossy.c
+ *
+ * Copyright (C) 1998, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains the control logic for the lossy JPEG decompressor.
+ */
+
+#define JPEG_INTERNALS
+#include "jinclude.h"
+#include "jpeglib.h"
+#include "jlossy.h"
+
+
+/*
+ * Compute output image dimensions and related values.
+ */
+
+METHODDEF(void)
+calc_output_dimensions (j_decompress_ptr cinfo)
+{
+#ifdef IDCT_SCALING_SUPPORTED
+  int ci;
+  jpeg_component_info *compptr;
+
+  /* Compute actual output image dimensions and DCT scaling choices. */
+  if (cinfo->scale_num * 8 <= cinfo->scale_denom) {
+    /* Provide 1/8 scaling */
+    cinfo->output_width = (JDIMENSION)
+      jdiv_round_up((long) cinfo->image_width, 8L);
+    cinfo->output_height = (JDIMENSION)
+      jdiv_round_up((long) cinfo->image_height, 8L);
+    cinfo->min_codec_data_unit = 1;
+  } else if (cinfo->scale_num * 4 <= cinfo->scale_denom) {
+    /* Provide 1/4 scaling */
+    cinfo->output_width = (JDIMENSION)
+      jdiv_round_up((long) cinfo->image_width, 4L);
+    cinfo->output_height = (JDIMENSION)
+      jdiv_round_up((long) cinfo->image_height, 4L);
+    cinfo->min_codec_data_unit = 2;
+  } else if (cinfo->scale_num * 2 <= cinfo->scale_denom) {
+    /* Provide 1/2 scaling */
+    cinfo->output_width = (JDIMENSION)
+      jdiv_round_up((long) cinfo->image_width, 2L);
+    cinfo->output_height = (JDIMENSION)
+      jdiv_round_up((long) cinfo->image_height, 2L);
+    cinfo->min_codec_data_unit = 4;
+  } else {
+    /* Provide 1/1 scaling */
+    cinfo->output_width = cinfo->image_width;
+    cinfo->output_height = cinfo->image_height;
+    cinfo->min_codec_data_unit = DCTSIZE;
+  }
+  /* In selecting the actual DCT scaling for each component, we try to
+   * scale up the chroma components via IDCT scaling rather than upsampling.
+   * This saves time if the upsampler gets to use 1:1 scaling.
+   * Note this code assumes that the supported DCT scalings are powers of 2.
+   */
+  for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
+       ci++, compptr++) {
+    int ssize = cinfo->min_codec_data_unit;
+    while (ssize < DCTSIZE &&
+	   (compptr->h_samp_factor * ssize * 2 <=
+	    cinfo->max_h_samp_factor * cinfo->min_codec_data_unit) &&
+	   (compptr->v_samp_factor * ssize * 2 <=
+	    cinfo->max_v_samp_factor * cinfo->min_codec_data_unit)) {
+      ssize = ssize * 2;
+    }
+    compptr->codec_data_unit = ssize;
+  }
+
+  /* Recompute downsampled dimensions of components;
+   * application needs to know these if using raw downsampled data.
+   */
+  for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
+       ci++, compptr++) {
+    /* Size in samples, after IDCT scaling */
+    compptr->downsampled_width = (JDIMENSION)
+      jdiv_round_up((long) cinfo->image_width *
+		    (long) (compptr->h_samp_factor * compptr->codec_data_unit),
+		    (long) (cinfo->max_h_samp_factor * DCTSIZE));
+    compptr->downsampled_height = (JDIMENSION)
+      jdiv_round_up((long) cinfo->image_height *
+		    (long) (compptr->v_samp_factor * compptr->codec_data_unit),
+		    (long) (cinfo->max_v_samp_factor * DCTSIZE));
+  }
+
+#else /* !IDCT_SCALING_SUPPORTED */
+
+  /* Hardwire it to "no scaling" */
+  cinfo->output_width = cinfo->image_width;
+  cinfo->output_height = cinfo->image_height;
+  /* jdinput.c has already initialized codec_data_unit to DCTSIZE,
+   * and has computed unscaled downsampled_width and downsampled_height.
+   */
+
+#endif /* IDCT_SCALING_SUPPORTED */
+}
+
+
+/*
+ * Save away a copy of the Q-table referenced by each component present
+ * in the current scan, unless already saved during a prior scan.
+ *
+ * In a multiple-scan JPEG file, the encoder could assign different components
+ * the same Q-table slot number, but change table definitions between scans
+ * so that each component uses a different Q-table.  (The IJG encoder is not
+ * currently capable of doing this, but other encoders might.)  Since we want
+ * to be able to dequantize all the components at the end of the file, this
+ * means that we have to save away the table actually used for each component.
+ * We do this by copying the table at the start of the first scan containing
+ * the component.
+ * The JPEG spec prohibits the encoder from changing the contents of a Q-table
+ * slot between scans of a component using that slot.  If the encoder does so
+ * anyway, this decoder will simply use the Q-table values that were current
+ * at the start of the first scan for the component.
+ *
+ * The decompressor output side looks only at the saved quant tables,
+ * not at the current Q-table slots.
+ */
+
+LOCAL(void)
+latch_quant_tables (j_decompress_ptr cinfo)
+{
+  int ci, qtblno;
+  jpeg_component_info *compptr;
+  JQUANT_TBL * qtbl;
+
+  for (ci = 0; ci < cinfo->comps_in_scan; ci++) {
+    compptr = cinfo->cur_comp_info[ci];
+    /* No work if we already saved Q-table for this component */
+    if (compptr->quant_table != NULL)
+      continue;
+    /* Make sure specified quantization table is present */
+    qtblno = compptr->quant_tbl_no;
+    if (qtblno < 0 || qtblno >= NUM_QUANT_TBLS ||
+	cinfo->quant_tbl_ptrs[qtblno] == NULL)
+      ERREXIT1(cinfo, JERR_NO_QUANT_TABLE, qtblno);
+    /* OK, save away the quantization table */
+    qtbl = (JQUANT_TBL *)
+      (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+				  SIZEOF(JQUANT_TBL));
+    MEMCOPY(qtbl, cinfo->quant_tbl_ptrs[qtblno], SIZEOF(JQUANT_TBL));
+    compptr->quant_table = qtbl;
+  }
+}
+
+
+/*
+ * Initialize for an input processing pass.
+ */
+
+METHODDEF(void)
+start_input_pass (j_decompress_ptr cinfo)
+{
+  j_lossy_d_ptr lossyd = (j_lossy_d_ptr) cinfo->codec;
+
+  latch_quant_tables(cinfo);
+  (*lossyd->entropy_start_pass) (cinfo);
+  (*lossyd->coef_start_input_pass) (cinfo);
+}
+
+
+/*
+ * Initialize for an output processing pass.
+ */
+
+METHODDEF(void)
+start_output_pass (j_decompress_ptr cinfo)
+{
+  j_lossy_d_ptr lossyd = (j_lossy_d_ptr) cinfo->codec;
+
+  (*lossyd->idct_start_pass) (cinfo);
+  (*lossyd->coef_start_output_pass) (cinfo);
+}
+
+/*
+ * Initialize the lossy decompression codec.
+ * This is called only once, during master selection.
+ */
+
+GLOBAL(void)
+jinit_lossy_d_codec (j_decompress_ptr cinfo)
+{
+  j_lossy_d_ptr lossyd;
+  boolean use_c_buffer;
+
+  /* Create subobject in permanent pool */
+  lossyd = (j_lossy_d_ptr)
+    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT,
+				SIZEOF(jpeg_lossy_d_codec));
+  cinfo->codec = (struct jpeg_d_codec *) lossyd;
+
+  /* Initialize sub-modules */
+
+  /* Inverse DCT */
+  jinit_inverse_dct(cinfo);
+  /* Entropy decoding: either Huffman or arithmetic coding. */
+  if (cinfo->arith_code) {
+    ERREXIT(cinfo, JERR_ARITH_NOTIMPL);
+  } else {
+    if (cinfo->process == JPROC_PROGRESSIVE) {
+#ifdef D_PROGRESSIVE_SUPPORTED
+      jinit_phuff_decoder(cinfo);
+#else
+      ERREXIT(cinfo, JERR_NOT_COMPILED);
+#endif
+    } else
+      jinit_shuff_decoder(cinfo);
+  }
+
+  use_c_buffer = cinfo->inputctl->has_multiple_scans || cinfo->buffered_image;
+  jinit_d_coef_controller(cinfo, use_c_buffer);
+
+  /* Initialize method pointers.
+   *
+   * Note: consume_data and decompress_data are assigned in jdcoefct.c.
+   */
+  lossyd->pub.calc_output_dimensions = calc_output_dimensions;
+  lossyd->pub.start_input_pass = start_input_pass;
+  lossyd->pub.start_output_pass = start_output_pass;
+}
diff --git a/uppsrc/plugin/jpg/lib/jdmainct.c b/uppsrc/plugin/jpg/lib/jdmainct.c
new file mode 100644
index 000000000..59c61b8b6
--- /dev/null
+++ b/uppsrc/plugin/jpg/lib/jdmainct.c
@@ -0,0 +1,512 @@
+/*
+ * jdmainct.c
+ *
+ * Copyright (C) 1994-1998, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains the main buffer controller for decompression.
+ * The main buffer lies between the JPEG decompressor proper and the
+ * post-processor; it holds downsampled data in the JPEG colorspace.
+ *
+ * Note that this code is bypassed in raw-data mode, since the application
+ * supplies the equivalent of the main buffer in that case.
+ */
+
+#define JPEG_INTERNALS
+#include "jinclude.h"
+#include "jpeglib.h"
+
+
+/*
+ * In the current system design, the main buffer need never be a full-image
+ * buffer; any full-height buffers will be found inside the coefficient or
+ * postprocessing controllers.  Nonetheless, the main controller is not
+ * trivial.  Its responsibility is to provide context rows for upsampling/
+ * rescaling, and doing this in an efficient fashion is a bit tricky.
+ *
+ * Postprocessor input data is counted in "row groups".  A row group
+ * is defined to be (v_samp_factor * codec_data_unit / min_codec_data_unit)
+ * sample rows of each component.  (We require codec_data_unit values to be
+ * chosen such that these numbers are integers.  In practice codec_data_unit
+ * values will likely be powers of two, so we actually have the stronger
+ * condition that codec_data_unit / min_codec_data_unit is an integer.)
+ * Upsampling will typically produce max_v_samp_factor pixel rows from each
+ * row group (times any additional scale factor that the upsampler is
+ * applying).
+ *
+ * The decompression codec will deliver data to us one iMCU row at a time;
+ * each iMCU row contains v_samp_factor * codec_data_unit sample rows, or
+ * exactly min_codec_data_unit row groups.  (This amount of data corresponds
+ * to one row of MCUs when the image is fully interleaved.)  Note that the
+ * number of sample rows varies across components, but the number of row
+ * groups does not.  Some garbage sample rows may be included in the last iMCU
+ * row at the bottom of the image.
+ *
+ * Depending on the vertical scaling algorithm used, the upsampler may need
+ * access to the sample row(s) above and below its current input row group.
+ * The upsampler is required to set need_context_rows TRUE at global selection
+ * time if so.  When need_context_rows is FALSE, this controller can simply
+ * obtain one iMCU row at a time from the coefficient controller and dole it
+ * out as row groups to the postprocessor.
+ *
+ * When need_context_rows is TRUE, this controller guarantees that the buffer
+ * passed to postprocessing contains at least one row group's worth of samples
+ * above and below the row group(s) being processed.  Note that the context
+ * rows "above" the first passed row group appear at negative row offsets in
+ * the passed buffer.  At the top and bottom of the image, the required
+ * context rows are manufactured by duplicating the first or last real sample
+ * row; this avoids having special cases in the upsampling inner loops.
+ *
+ * The amount of context is fixed at one row group just because that's a
+ * convenient number for this controller to work with.  The existing
+ * upsamplers really only need one sample row of context.  An upsampler
+ * supporting arbitrary output rescaling might wish for more than one row
+ * group of context when shrinking the image; tough, we don't handle that.
+ * (This is justified by the assumption that downsizing will be handled mostly
+ * by adjusting the codec_data_unit values, so that the actual scale factor at
+ * the upsample step needn't be much less than one.)
+ *
+ * To provide the desired context, we have to retain the last two row groups
+ * of one iMCU row while reading in the next iMCU row.  (The last row group
+ * can't be processed until we have another row group for its below-context,
+ * and so we have to save the next-to-last group too for its above-context.)
+ * We could do this most simply by copying data around in our buffer, but
+ * that'd be very slow.  We can avoid copying any data by creating a rather
+ * strange pointer structure.  Here's how it works.  We allocate a workspace
+ * consisting of M+2 row groups (where M = min_codec_data_unit is the number
+ * of row groups per iMCU row).  We create two sets of redundant pointers to
+ * the workspace.  Labeling the physical row groups 0 to M+1, the synthesized
+ * pointer lists look like this:
+ *                   M+1                          M-1
+ * master pointer --> 0         master pointer --> 0
+ *                    1                            1
+ *                   ...                          ...
+ *                   M-3                          M-3
+ *                   M-2                           M
+ *                   M-1                          M+1
+ *                    M                           M-2
+ *                   M+1                          M-1
+ *                    0                            0
+ * We read alternate iMCU rows using each master pointer; thus the last two
+ * row groups of the previous iMCU row remain un-overwritten in the workspace.
+ * The pointer lists are set up so that the required context rows appear to
+ * be adjacent to the proper places when we pass the pointer lists to the
+ * upsampler.
+ *
+ * The above pictures describe the normal state of the pointer lists.
+ * At top and bottom of the image, we diddle the pointer lists to duplicate
+ * the first or last sample row as necessary (this is cheaper than copying
+ * sample rows around).
+ *
+ * This scheme breaks down if M < 2, ie, min_codec_data_unit is 1.  In that
+ * situation each iMCU row provides only one row group so the buffering logic
+ * must be different (eg, we must read two iMCU rows before we can emit the
+ * first row group).  For now, we simply do not support providing context
+ * rows when min_codec_data_unit is 1.  That combination seems unlikely to
+ * be worth providing --- if someone wants a 1/8th-size preview, they probably
+ * want it quick and dirty, so a context-free upsampler is sufficient.
+ */
+
+
+/* Private buffer controller object */
+
+typedef struct {
+  struct jpeg_d_main_controller pub; /* public fields */
+
+  /* Pointer to allocated workspace (M or M+2 row groups). */
+  JSAMPARRAY buffer[MAX_COMPONENTS];
+
+  boolean buffer_full;		/* Have we gotten an iMCU row from decoder? */
+  JDIMENSION rowgroup_ctr;	/* counts row groups output to postprocessor */
+
+  /* Remaining fields are only used in the context case. */
+
+  /* These are the master pointers to the funny-order pointer lists. */
+  JSAMPIMAGE xbuffer[2];	/* pointers to weird pointer lists */
+
+  int whichptr;			/* indicates which pointer set is now in use */
+  int context_state;		/* process_data state machine status */
+  JDIMENSION rowgroups_avail;	/* row groups available to postprocessor */
+  JDIMENSION iMCU_row_ctr;	/* counts iMCU rows to detect image top/bot */
+} my_main_controller;
+
+typedef my_main_controller * my_main_ptr;
+
+/* context_state values: */
+#define CTX_PREPARE_FOR_IMCU	0	/* need to prepare for MCU row */
+#define CTX_PROCESS_IMCU	1	/* feeding iMCU to postprocessor */
+#define CTX_POSTPONED_ROW	2	/* feeding postponed row group */
+
+
+/* Forward declarations */
+METHODDEF(void) process_data_simple_main
+	JPP((j_decompress_ptr cinfo, JSAMPARRAY output_buf,
+	     JDIMENSION *out_row_ctr, JDIMENSION out_rows_avail));
+METHODDEF(void) process_data_context_main
+	JPP((j_decompress_ptr cinfo, JSAMPARRAY output_buf,
+	     JDIMENSION *out_row_ctr, JDIMENSION out_rows_avail));
+#ifdef QUANT_2PASS_SUPPORTED
+METHODDEF(void) process_data_crank_post
+	JPP((j_decompress_ptr cinfo, JSAMPARRAY output_buf,
+	     JDIMENSION *out_row_ctr, JDIMENSION out_rows_avail));
+#endif
+
+
+LOCAL(void)
+alloc_funny_pointers (j_decompress_ptr cinfo)
+/* Allocate space for the funny pointer lists.
+ * This is done only once, not once per pass.
+ */
+{
+  my_main_ptr main = (my_main_ptr) cinfo->main;
+  int ci, rgroup;
+  int M = cinfo->min_codec_data_unit;
+  jpeg_component_info *compptr;
+  JSAMPARRAY xbuf;
+
+  /* Get top-level space for component array pointers.
+   * We alloc both arrays with one call to save a few cycles.
+   */
+  main->xbuffer[0] = (JSAMPIMAGE)
+    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+				cinfo->num_components * 2 * SIZEOF(JSAMPARRAY));
+  main->xbuffer[1] = main->xbuffer[0] + cinfo->num_components;
+
+  for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
+       ci++, compptr++) {
+    rgroup = (compptr->v_samp_factor * compptr->codec_data_unit) /
+      cinfo->min_codec_data_unit; /* height of a row group of component */
+    /* Get space for pointer lists --- M+4 row groups in each list.
+     * We alloc both pointer lists with one call to save a few cycles.
+     */
+    xbuf = (JSAMPARRAY)
+      (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+				  2 * (rgroup * (M + 4)) * SIZEOF(JSAMPROW));
+    xbuf += rgroup;		/* want one row group at negative offsets */
+    main->xbuffer[0][ci] = xbuf;
+    xbuf += rgroup * (M + 4);
+    main->xbuffer[1][ci] = xbuf;
+  }
+}
+
+
+LOCAL(void)
+make_funny_pointers (j_decompress_ptr cinfo)
+/* Create the funny pointer lists discussed in the comments above.
+ * The actual workspace is already allocated (in main->buffer),
+ * and the space for the pointer lists is allocated too.
+ * This routine just fills in the curiously ordered lists.
+ * This will be repeated at the beginning of each pass.
+ */
+{
+  my_main_ptr main = (my_main_ptr) cinfo->main;
+  int ci, i, rgroup;
+  int M = cinfo->min_codec_data_unit;
+  jpeg_component_info *compptr;
+  JSAMPARRAY buf, xbuf0, xbuf1;
+
+  for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
+       ci++, compptr++) {
+    rgroup = (compptr->v_samp_factor * compptr->codec_data_unit) /
+      cinfo->min_codec_data_unit; /* height of a row group of component */
+    xbuf0 = main->xbuffer[0][ci];
+    xbuf1 = main->xbuffer[1][ci];
+    /* First copy the workspace pointers as-is */
+    buf = main->buffer[ci];
+    for (i = 0; i < rgroup * (M + 2); i++) {
+      xbuf0[i] = xbuf1[i] = buf[i];
+    }
+    /* In the second list, put the last four row groups in swapped order */
+    for (i = 0; i < rgroup * 2; i++) {
+      xbuf1[rgroup*(M-2) + i] = buf[rgroup*M + i];
+      xbuf1[rgroup*M + i] = buf[rgroup*(M-2) + i];
+    }
+    /* The wraparound pointers at top and bottom will be filled later
+     * (see set_wraparound_pointers, below).  Initially we want the "above"
+     * pointers to duplicate the first actual data line.  This only needs
+     * to happen in xbuffer[0].
+     */
+    for (i = 0; i < rgroup; i++) {
+      xbuf0[i - rgroup] = xbuf0[0];
+    }
+  }
+}
+
+
+LOCAL(void)
+set_wraparound_pointers (j_decompress_ptr cinfo)
+/* Set up the "wraparound" pointers at top and bottom of the pointer lists.
+ * This changes the pointer list state from top-of-image to the normal state.
+ */
+{
+  my_main_ptr main = (my_main_ptr) cinfo->main;
+  int ci, i, rgroup;
+  int M = cinfo->min_codec_data_unit;
+  jpeg_component_info *compptr;
+  JSAMPARRAY xbuf0, xbuf1;
+
+  for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
+       ci++, compptr++) {
+    rgroup = (compptr->v_samp_factor * compptr->codec_data_unit) /
+      cinfo->min_codec_data_unit; /* height of a row group of component */
+    xbuf0 = main->xbuffer[0][ci];
+    xbuf1 = main->xbuffer[1][ci];
+    for (i = 0; i < rgroup; i++) {
+      xbuf0[i - rgroup] = xbuf0[rgroup*(M+1) + i];
+      xbuf1[i - rgroup] = xbuf1[rgroup*(M+1) + i];
+      xbuf0[rgroup*(M+2) + i] = xbuf0[i];
+      xbuf1[rgroup*(M+2) + i] = xbuf1[i];
+    }
+  }
+}
+
+
+LOCAL(void)
+set_bottom_pointers (j_decompress_ptr cinfo)
+/* Change the pointer lists to duplicate the last sample row at the bottom
+ * of the image.  whichptr indicates which xbuffer holds the final iMCU row.
+ * Also sets rowgroups_avail to indicate number of nondummy row groups in row.
+ */
+{
+  my_main_ptr main = (my_main_ptr) cinfo->main;
+  int ci, i, rgroup, iMCUheight, rows_left;
+  jpeg_component_info *compptr;
+  JSAMPARRAY xbuf;
+
+  for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
+       ci++, compptr++) {
+    /* Count sample rows in one iMCU row and in one row group */
+    iMCUheight = compptr->v_samp_factor * compptr->codec_data_unit;
+    rgroup = iMCUheight / cinfo->min_codec_data_unit;
+    /* Count nondummy sample rows remaining for this component */
+    rows_left = (int) (compptr->downsampled_height % (JDIMENSION) iMCUheight);
+    if (rows_left == 0) rows_left = iMCUheight;
+    /* Count nondummy row groups.  Should get same answer for each component,
+     * so we need only do it once.
+     */
+    if (ci == 0) {
+      main->rowgroups_avail = (JDIMENSION) ((rows_left-1) / rgroup + 1);
+    }
+    /* Duplicate the last real sample row rgroup*2 times; this pads out the
+     * last partial rowgroup and ensures at least one full rowgroup of context.
+     */
+    xbuf = main->xbuffer[main->whichptr][ci];
+    for (i = 0; i < rgroup * 2; i++) {
+      xbuf[rows_left + i] = xbuf[rows_left-1];
+    }
+  }
+}
+
+
+/*
+ * Initialize for a processing pass.
+ */
+
+METHODDEF(void)
+start_pass_main (j_decompress_ptr cinfo, J_BUF_MODE pass_mode)
+{
+  my_main_ptr main = (my_main_ptr) cinfo->main;
+
+  switch (pass_mode) {
+  case JBUF_PASS_THRU:
+    if (cinfo->upsample->need_context_rows) {
+      main->pub.process_data = process_data_context_main;
+      make_funny_pointers(cinfo); /* Create the xbuffer[] lists */
+      main->whichptr = 0;	/* Read first iMCU row into xbuffer[0] */
+      main->context_state = CTX_PREPARE_FOR_IMCU;
+      main->iMCU_row_ctr = 0;
+    } else {
+      /* Simple case with no context needed */
+      main->pub.process_data = process_data_simple_main;
+    }
+    main->buffer_full = FALSE;	/* Mark buffer empty */
+    main->rowgroup_ctr = 0;
+    break;
+#ifdef QUANT_2PASS_SUPPORTED
+  case JBUF_CRANK_DEST:
+    /* For last pass of 2-pass quantization, just crank the postprocessor */
+    main->pub.process_data = process_data_crank_post;
+    break;
+#endif
+  default:
+    ERREXIT(cinfo, JERR_BAD_BUFFER_MODE);
+    break;
+  }
+}
+
+
+/*
+ * Process some data.
+ * This handles the simple case where no context is required.
+ */
+
+METHODDEF(void)
+process_data_simple_main (j_decompress_ptr cinfo,
+			  JSAMPARRAY output_buf, JDIMENSION *out_row_ctr,
+			  JDIMENSION out_rows_avail)
+{
+  my_main_ptr main = (my_main_ptr) cinfo->main;
+  JDIMENSION rowgroups_avail;
+
+  /* Read input data if we haven't filled the main buffer yet */
+  if (! main->buffer_full) {
+    if (! (*cinfo->codec->decompress_data) (cinfo, main->buffer))
+      return;			/* suspension forced, can do nothing more */
+    main->buffer_full = TRUE;	/* OK, we have an iMCU row to work with */
+  }
+
+  /* There are always min_codec_data_unit row groups in an iMCU row. */
+  rowgroups_avail = (JDIMENSION) cinfo->min_codec_data_unit;
+  /* Note: at the bottom of the image, we may pass extra garbage row groups
+   * to the postprocessor.  The postprocessor has to check for bottom
+   * of image anyway (at row resolution), so no point in us doing it too.
+   */
+
+  /* Feed the postprocessor */
+  (*cinfo->post->post_process_data) (cinfo, main->buffer,
+				     &main->rowgroup_ctr, rowgroups_avail,
+				     output_buf, out_row_ctr, out_rows_avail);
+
+  /* Has postprocessor consumed all the data yet? If so, mark buffer empty */
+  if (main->rowgroup_ctr >= rowgroups_avail) {
+    main->buffer_full = FALSE;
+    main->rowgroup_ctr = 0;
+  }
+}
+
+
+/*
+ * Process some data.
+ * This handles the case where context rows must be provided.
+ */
+
+METHODDEF(void)
+process_data_context_main (j_decompress_ptr cinfo,
+			   JSAMPARRAY output_buf, JDIMENSION *out_row_ctr,
+			   JDIMENSION out_rows_avail)
+{
+  my_main_ptr main = (my_main_ptr) cinfo->main;
+
+  /* Read input data if we haven't filled the main buffer yet */
+  if (! main->buffer_full) {
+    if (! (*cinfo->codec->decompress_data) (cinfo,
+					   main->xbuffer[main->whichptr]))
+      return;			/* suspension forced, can do nothing more */
+    main->buffer_full = TRUE;	/* OK, we have an iMCU row to work with */
+    main->iMCU_row_ctr++;	/* count rows received */
+  }
+
+  /* Postprocessor typically will not swallow all the input data it is handed
+   * in one call (due to filling the output buffer first).  Must be prepared
+   * to exit and restart.  This switch lets us keep track of how far we got.
+   * Note that each case falls through to the next on successful completion.
+   */
+  switch (main->context_state) {
+  case CTX_POSTPONED_ROW:
+    /* Call postprocessor using previously set pointers for postponed row */
+    (*cinfo->post->post_process_data) (cinfo, main->xbuffer[main->whichptr],
+			&main->rowgroup_ctr, main->rowgroups_avail,
+			output_buf, out_row_ctr, out_rows_avail);
+    if (main->rowgroup_ctr < main->rowgroups_avail)
+      return;			/* Need to suspend */
+    main->context_state = CTX_PREPARE_FOR_IMCU;
+    if (*out_row_ctr >= out_rows_avail)
+      return;			/* Postprocessor exactly filled output buf */
+    /*FALLTHROUGH*/
+  case CTX_PREPARE_FOR_IMCU:
+    /* Prepare to process first M-1 row groups of this iMCU row */
+    main->rowgroup_ctr = 0;
+    main->rowgroups_avail = (JDIMENSION) (cinfo->min_codec_data_unit - 1);
+    /* Check for bottom of image: if so, tweak pointers to "duplicate"
+     * the last sample row, and adjust rowgroups_avail to ignore padding rows.
+     */
+    if (main->iMCU_row_ctr == cinfo->total_iMCU_rows)
+      set_bottom_pointers(cinfo);
+    main->context_state = CTX_PROCESS_IMCU;
+    /*FALLTHROUGH*/
+  case CTX_PROCESS_IMCU:
+    /* Call postprocessor using previously set pointers */
+    (*cinfo->post->post_process_data) (cinfo, main->xbuffer[main->whichptr],
+			&main->rowgroup_ctr, main->rowgroups_avail,
+			output_buf, out_row_ctr, out_rows_avail);
+    if (main->rowgroup_ctr < main->rowgroups_avail)
+      return;			/* Need to suspend */
+    /* After the first iMCU, change wraparound pointers to normal state */
+    if (main->iMCU_row_ctr == 1)
+      set_wraparound_pointers(cinfo);
+    /* Prepare to load new iMCU row using other xbuffer list */
+    main->whichptr ^= 1;	/* 0=>1 or 1=>0 */
+    main->buffer_full = FALSE;
+    /* Still need to process last row group of this iMCU row, */
+    /* which is saved at index M+1 of the other xbuffer */
+    main->rowgroup_ctr = (JDIMENSION) (cinfo->min_codec_data_unit + 1);
+    main->rowgroups_avail = (JDIMENSION) (cinfo->min_codec_data_unit + 2);
+    main->context_state = CTX_POSTPONED_ROW;
+  }
+}
+
+
+/*
+ * Process some data.
+ * Final pass of two-pass quantization: just call the postprocessor.
+ * Source data will be the postprocessor controller's internal buffer.
+ */
+
+#ifdef QUANT_2PASS_SUPPORTED
+
+METHODDEF(void)
+process_data_crank_post (j_decompress_ptr cinfo,
+			 JSAMPARRAY output_buf, JDIMENSION *out_row_ctr,
+			 JDIMENSION out_rows_avail)
+{
+  (*cinfo->post->post_process_data) (cinfo, (JSAMPIMAGE) NULL,
+				     (JDIMENSION *) NULL, (JDIMENSION) 0,
+				     output_buf, out_row_ctr, out_rows_avail);
+}
+
+#endif /* QUANT_2PASS_SUPPORTED */
+
+
+/*
+ * Initialize main buffer controller.
+ */
+
+GLOBAL(void)
+jinit_d_main_controller (j_decompress_ptr cinfo, boolean need_full_buffer)
+{
+  my_main_ptr main;
+  int ci, rgroup, ngroups;
+  jpeg_component_info *compptr;
+
+  main = (my_main_ptr)
+    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+				SIZEOF(my_main_controller));
+  cinfo->main = (struct jpeg_d_main_controller *) main;
+  main->pub.start_pass = start_pass_main;
+
+  if (need_full_buffer)		/* shouldn't happen */
+    ERREXIT(cinfo, JERR_BAD_BUFFER_MODE);
+
+  /* Allocate the workspace.
+   * ngroups is the number of row groups we need.
+   */
+  if (cinfo->upsample->need_context_rows) {
+    if (cinfo->min_codec_data_unit < 2) /* unsupported, see comments above */
+      ERREXIT(cinfo, JERR_NOTIMPL);
+    alloc_funny_pointers(cinfo); /* Alloc space for xbuffer[] lists */
+    ngroups = cinfo->min_codec_data_unit + 2;
+  } else {
+    ngroups = cinfo->min_codec_data_unit;
+  }
+
+  for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
+       ci++, compptr++) {
+    rgroup = (compptr->v_samp_factor * compptr->codec_data_unit) /
+      cinfo->min_codec_data_unit; /* height of a row group of component */
+    main->buffer[ci] = (*cinfo->mem->alloc_sarray)
+			((j_common_ptr) cinfo, JPOOL_IMAGE,
+			 compptr->width_in_data_units * compptr->codec_data_unit,
+			 (JDIMENSION) (rgroup * ngroups));
+  }
+}
diff --git a/uppsrc/plugin/jpg/lib/jdmarker.c b/uppsrc/plugin/jpg/lib/jdmarker.c
new file mode 100644
index 000000000..844c72e09
--- /dev/null
+++ b/uppsrc/plugin/jpg/lib/jdmarker.c
@@ -0,0 +1,1370 @@
+/*
+ * jdmarker.c
+ *
+ * Copyright (C) 1991-1998, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains routines to decode JPEG datastream markers.
+ * Most of the complexity arises from our desire to support input
+ * suspension: if not all of the data for a marker is available,
+ * we must exit back to the application.  On resumption, we reprocess
+ * the marker.
+ */
+
+#define JPEG_INTERNALS
+#include "jinclude.h"
+#include "jpeglib.h"
+
+
+typedef enum {			/* JPEG marker codes */
+  M_SOF0  = 0xc0,
+  M_SOF1  = 0xc1,
+  M_SOF2  = 0xc2,
+  M_SOF3  = 0xc3,
+
+  M_SOF5  = 0xc5,
+  M_SOF6  = 0xc6,
+  M_SOF7  = 0xc7,
+
+  M_JPG   = 0xc8,
+  M_SOF9  = 0xc9,
+  M_SOF10 = 0xca,
+  M_SOF11 = 0xcb,
+
+  M_SOF13 = 0xcd,
+  M_SOF14 = 0xce,
+  M_SOF15 = 0xcf,
+
+  M_DHT   = 0xc4,
+
+  M_DAC   = 0xcc,
+
+  M_RST0  = 0xd0,
+  M_RST1  = 0xd1,
+  M_RST2  = 0xd2,
+  M_RST3  = 0xd3,
+  M_RST4  = 0xd4,
+  M_RST5  = 0xd5,
+  M_RST6  = 0xd6,
+  M_RST7  = 0xd7,
+
+  M_SOI   = 0xd8,
+  M_EOI   = 0xd9,
+  M_SOS   = 0xda,
+  M_DQT   = 0xdb,
+  M_DNL   = 0xdc,
+  M_DRI   = 0xdd,
+  M_DHP   = 0xde,
+  M_EXP   = 0xdf,
+
+  M_APP0  = 0xe0,
+  M_APP1  = 0xe1,
+  M_APP2  = 0xe2,
+  M_APP3  = 0xe3,
+  M_APP4  = 0xe4,
+  M_APP5  = 0xe5,
+  M_APP6  = 0xe6,
+  M_APP7  = 0xe7,
+  M_APP8  = 0xe8,
+  M_APP9  = 0xe9,
+  M_APP10 = 0xea,
+  M_APP11 = 0xeb,
+  M_APP12 = 0xec,
+  M_APP13 = 0xed,
+  M_APP14 = 0xee,
+  M_APP15 = 0xef,
+
+  M_JPG0  = 0xf0,
+  M_JPG13 = 0xfd,
+  M_COM   = 0xfe,
+
+  M_TEM   = 0x01,
+
+  M_ERROR = 0x100
+} JPEG_MARKER;
+
+
+/* Private state */
+
+typedef struct {
+  struct jpeg_marker_reader pub; /* public fields */
+
+  /* Application-overridable marker processing methods */
+  jpeg_marker_parser_method process_COM;
+  jpeg_marker_parser_method process_APPn[16];
+
+  /* Limit on marker data length to save for each marker type */
+  unsigned int length_limit_COM;
+  unsigned int length_limit_APPn[16];
+
+  /* Status of COM/APPn marker saving */
+  jpeg_saved_marker_ptr cur_marker;	/* NULL if not processing a marker */
+  unsigned int bytes_read;		/* data bytes read so far in marker */
+  /* Note: cur_marker is not linked into marker_list until it's all read. */
+} my_marker_reader;
+
+typedef my_marker_reader * my_marker_ptr;
+
+
+/*
+ * Macros for fetching data from the data source module.
+ *
+ * At all times, cinfo->src->next_input_byte and ->bytes_in_buffer reflect
+ * the current restart point; we update them only when we have reached a
+ * suitable place to restart if a suspension occurs.
+ */
+
+/* Declare and initialize local copies of input pointer/count */
+#define INPUT_VARS(cinfo)  \
+	struct jpeg_source_mgr * datasrc = (cinfo)->src;  \
+	const JOCTET * next_input_byte = datasrc->next_input_byte;  \
+	size_t bytes_in_buffer = datasrc->bytes_in_buffer
+
+/* Unload the local copies --- do this only at a restart boundary */
+#define INPUT_SYNC(cinfo)  \
+	( datasrc->next_input_byte = next_input_byte,  \
+	  datasrc->bytes_in_buffer = bytes_in_buffer )
+
+/* Reload the local copies --- used only in MAKE_BYTE_AVAIL */
+#define INPUT_RELOAD(cinfo)  \
+	( next_input_byte = datasrc->next_input_byte,  \
+	  bytes_in_buffer = datasrc->bytes_in_buffer )
+
+/* Internal macro for INPUT_BYTE and INPUT_2BYTES: make a byte available.
+ * Note we do *not* do INPUT_SYNC before calling fill_input_buffer,
+ * but we must reload the local copies after a successful fill.
+ */
+#define MAKE_BYTE_AVAIL(cinfo,action)  \
+	if (bytes_in_buffer == 0) {  \
+	  if (! (*datasrc->fill_input_buffer) (cinfo))  \
+	    { action; }  \
+	  INPUT_RELOAD(cinfo);  \
+	}
+
+/* Read a byte into variable V.
+ * If must suspend, take the specified action (typically "return FALSE").
+ */
+#define INPUT_BYTE(cinfo,V,action)  \
+	MAKESTMT( MAKE_BYTE_AVAIL(cinfo,action); \
+		  bytes_in_buffer--; \
+		  V = GETJOCTET(*next_input_byte++); )
+
+/* As above, but read two bytes interpreted as an unsigned 16-bit integer.
+ * V should be declared unsigned int or perhaps INT32.
+ */
+#define INPUT_2BYTES(cinfo,V,action)  \
+	MAKESTMT( MAKE_BYTE_AVAIL(cinfo,action); \
+		  bytes_in_buffer--; \
+		  V = ((unsigned int) GETJOCTET(*next_input_byte++)) << 8; \
+		  MAKE_BYTE_AVAIL(cinfo,action); \
+		  bytes_in_buffer--; \
+		  V += GETJOCTET(*next_input_byte++); )
+
+
+/*
+ * Routines to process JPEG markers.
+ *
+ * Entry condition: JPEG marker itself has been read and its code saved
+ *   in cinfo->unread_marker; input restart point is just after the marker.
+ *
+ * Exit: if return TRUE, have read and processed any parameters, and have
+ *   updated the restart point to point after the parameters.
+ *   If return FALSE, was forced to suspend before reaching end of
+ *   marker parameters; restart point has not been moved.  Same routine
+ *   will be called again after application supplies more input data.
+ *
+ * This approach to suspension assumes that all of a marker's parameters
+ * can fit into a single input bufferload.  This should hold for "normal"
+ * markers.  Some COM/APPn markers might have large parameter segments
+ * that might not fit.  If we are simply dropping such a marker, we use
+ * skip_input_data to get past it, and thereby put the problem on the
+ * source manager's shoulders.  If we are saving the marker's contents
+ * into memory, we use a slightly different convention: when forced to
+ * suspend, the marker processor updates the restart point to the end of
+ * what it's consumed (ie, the end of the buffer) before returning FALSE.
+ * On resumption, cinfo->unread_marker still contains the marker code,
+ * but the data source will point to the next chunk of marker data.
+ * The marker processor must retain internal state to deal with this.
+ *
+ * Note that we don't bother to avoid duplicate trace messages if a
+ * suspension occurs within marker parameters.  Other side effects
+ * require more care.
+ */
+
+
+LOCAL(boolean)
+get_soi (j_decompress_ptr cinfo)
+/* Process an SOI marker */
+{
+  int i;
+
+  TRACEMS(cinfo, 1, JTRC_SOI);
+
+  if (cinfo->marker->saw_SOI)
+    ERREXIT(cinfo, JERR_SOI_DUPLICATE);
+
+  /* Reset all parameters that are defined to be reset by SOI */
+
+  for (i = 0; i < NUM_ARITH_TBLS; i++) {
+    cinfo->arith_dc_L[i] = 0;
+    cinfo->arith_dc_U[i] = 1;
+    cinfo->arith_ac_K[i] = 5;
+  }
+  cinfo->restart_interval = 0;
+
+  /* Set initial assumptions for colorspace etc */
+
+  cinfo->jpeg_color_space = JCS_UNKNOWN;
+  cinfo->CCIR601_sampling = FALSE; /* Assume non-CCIR sampling??? */
+
+  cinfo->saw_JFIF_marker = FALSE;
+  cinfo->JFIF_major_version = 1; /* set default JFIF APP0 values */
+  cinfo->JFIF_minor_version = 1;
+  cinfo->density_unit = 0;
+  cinfo->X_density = 1;
+  cinfo->Y_density = 1;
+  cinfo->saw_Adobe_marker = FALSE;
+  cinfo->Adobe_transform = 0;
+
+  cinfo->marker->saw_SOI = TRUE;
+
+  return TRUE;
+}
+
+
+LOCAL(boolean)
+get_sof (j_decompress_ptr cinfo, J_CODEC_PROCESS process, boolean is_arith,
+	 int data_unit)
+/* Process a SOFn marker */
+{
+  INT32 length;
+  int c, ci;
+  jpeg_component_info * compptr;
+  INPUT_VARS(cinfo);
+
+  cinfo->data_unit = data_unit;
+  cinfo->process = process;
+  cinfo->arith_code = is_arith;
+
+  INPUT_2BYTES(cinfo, length, return FALSE);
+
+  INPUT_BYTE(cinfo, cinfo->data_precision, return FALSE);
+  INPUT_2BYTES(cinfo, cinfo->image_height, return FALSE);
+  INPUT_2BYTES(cinfo, cinfo->image_width, return FALSE);
+  INPUT_BYTE(cinfo, cinfo->num_components, return FALSE);
+
+  length -= 8;
+
+  TRACEMS4(cinfo, 1, JTRC_SOF, cinfo->unread_marker,
+	   (int) cinfo->image_width, (int) cinfo->image_height,
+	   cinfo->num_components);
+
+  if (cinfo->marker->saw_SOF)
+    ERREXIT(cinfo, JERR_SOF_DUPLICATE);
+
+  /* We don't support files in which the image height is initially specified */
+  /* as 0 and is later redefined by DNL.  As long as we have to check that,  */
+  /* might as well have a general sanity check. */
+  if (cinfo->image_height <= 0 || cinfo->image_width <= 0
+      || cinfo->num_components <= 0)
+    ERREXIT(cinfo, JERR_EMPTY_IMAGE);
+
+  if (length != (cinfo->num_components * 3))
+    ERREXIT(cinfo, JERR_BAD_LENGTH);
+
+  if (cinfo->comp_info == NULL)	/* do only once, even if suspend */
+    cinfo->comp_info = (jpeg_component_info *) (*cinfo->mem->alloc_small)
+			((j_common_ptr) cinfo, JPOOL_IMAGE,
+			 cinfo->num_components * SIZEOF(jpeg_component_info));
+
+  for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
+       ci++, compptr++) {
+    compptr->component_index = ci;
+    INPUT_BYTE(cinfo, compptr->component_id, return FALSE);
+    INPUT_BYTE(cinfo, c, return FALSE);
+    compptr->h_samp_factor = (c >> 4) & 15;
+    compptr->v_samp_factor = (c     ) & 15;
+    INPUT_BYTE(cinfo, compptr->quant_tbl_no, return FALSE);
+
+    TRACEMS4(cinfo, 1, JTRC_SOF_COMPONENT,
+	     compptr->component_id, compptr->h_samp_factor,
+	     compptr->v_samp_factor, compptr->quant_tbl_no);
+  }
+
+  cinfo->marker->saw_SOF = TRUE;
+
+  INPUT_SYNC(cinfo);
+  return TRUE;
+}
+
+
+LOCAL(boolean)
+get_sos (j_decompress_ptr cinfo)
+/* Process a SOS marker */
+{
+  INT32 length;
+  int i, ci, n, c, cc;
+  jpeg_component_info * compptr;
+  INPUT_VARS(cinfo);
+
+  if (! cinfo->marker->saw_SOF)
+    ERREXIT(cinfo, JERR_SOS_NO_SOF);
+
+  INPUT_2BYTES(cinfo, length, return FALSE);
+
+  INPUT_BYTE(cinfo, n, return FALSE); /* Number of components */
+
+  TRACEMS1(cinfo, 1, JTRC_SOS, n);
+
+  if (length != (n * 2 + 6) || n < 1 || n > MAX_COMPS_IN_SCAN)
+    ERREXIT(cinfo, JERR_BAD_LENGTH);
+
+  cinfo->comps_in_scan = n;
+
+  /* Collect the component-spec parameters */
+
+  for (i = 0; i < n; i++) {
+    INPUT_BYTE(cinfo, cc, return FALSE);
+    INPUT_BYTE(cinfo, c, return FALSE);
+
+    for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
+	 ci++, compptr++) {
+      if (cc == compptr->component_id)
+	goto id_found;
+    }
+
+    ERREXIT1(cinfo, JERR_BAD_COMPONENT_ID, cc);
+
+  id_found:
+
+    cinfo->cur_comp_info[i] = compptr;
+    compptr->dc_tbl_no = (c >> 4) & 15;
+    compptr->ac_tbl_no = (c     ) & 15;
+
+    TRACEMS3(cinfo, 1, JTRC_SOS_COMPONENT, cc,
+	     compptr->dc_tbl_no, compptr->ac_tbl_no);
+  }
+
+  /* Collect the additional scan parameters Ss, Se, Ah/Al. */
+  INPUT_BYTE(cinfo, c, return FALSE);
+  cinfo->Ss = c;
+  INPUT_BYTE(cinfo, c, return FALSE);
+  cinfo->Se = c;
+  INPUT_BYTE(cinfo, c, return FALSE);
+  cinfo->Ah = (c >> 4) & 15;
+  cinfo->Al = (c     ) & 15;
+
+  TRACEMS4(cinfo, 1, JTRC_SOS_PARAMS, cinfo->Ss, cinfo->Se,
+	   cinfo->Ah, cinfo->Al);
+
+  /* Prepare to scan data & restart markers */
+  cinfo->marker->next_restart_num = 0;
+
+  /* Count another SOS marker */
+  cinfo->input_scan_number++;
+
+  INPUT_SYNC(cinfo);
+  return TRUE;
+}
+
+
+#ifdef D_ARITH_CODING_SUPPORTED
+
+LOCAL(boolean)
+get_dac (j_decompress_ptr cinfo)
+/* Process a DAC marker */
+{
+  INT32 length;
+  int index, val;
+  INPUT_VARS(cinfo);
+
+  INPUT_2BYTES(cinfo, length, return FALSE);
+  length -= 2;
+
+  while (length > 0) {
+    INPUT_BYTE(cinfo, index, return FALSE);
+    INPUT_BYTE(cinfo, val, return FALSE);
+
+    length -= 2;
+
+    TRACEMS2(cinfo, 1, JTRC_DAC, index, val);
+
+    if (index < 0 || index >= (2*NUM_ARITH_TBLS))
+      ERREXIT1(cinfo, JERR_DAC_INDEX, index);
+
+    if (index >= NUM_ARITH_TBLS) { /* define AC table */
+      cinfo->arith_ac_K[index-NUM_ARITH_TBLS] = (UINT8) val;
+    } else {			/* define DC table */
+      cinfo->arith_dc_L[index] = (UINT8) (val & 0x0F);
+      cinfo->arith_dc_U[index] = (UINT8) (val >> 4);
+      if (cinfo->arith_dc_L[index] > cinfo->arith_dc_U[index])
+	ERREXIT1(cinfo, JERR_DAC_VALUE, val);
+    }
+  }
+
+  if (length != 0)
+    ERREXIT(cinfo, JERR_BAD_LENGTH);
+
+  INPUT_SYNC(cinfo);
+  return TRUE;
+}
+
+#else /* ! D_ARITH_CODING_SUPPORTED */
+
+#define get_dac(cinfo)  skip_variable(cinfo)
+
+#endif /* D_ARITH_CODING_SUPPORTED */
+
+
+LOCAL(boolean)
+get_dht (j_decompress_ptr cinfo)
+/* Process a DHT marker */
+{
+  INT32 length;
+  UINT8 bits[17];
+  UINT8 huffval[256];
+  int i, index, count;
+  JHUFF_TBL **htblptr;
+  INPUT_VARS(cinfo);
+
+  INPUT_2BYTES(cinfo, length, return FALSE);
+  length -= 2;
+
+  while (length > 16) {
+    INPUT_BYTE(cinfo, index, return FALSE);
+
+    TRACEMS1(cinfo, 1, JTRC_DHT, index);
+
+    bits[0] = 0;
+    count = 0;
+    for (i = 1; i <= 16; i++) {
+      INPUT_BYTE(cinfo, bits[i], return FALSE);
+      count += bits[i];
+    }
+
+    length -= 1 + 16;
+
+    TRACEMS8(cinfo, 2, JTRC_HUFFBITS,
+	     bits[1], bits[2], bits[3], bits[4],
+	     bits[5], bits[6], bits[7], bits[8]);
+    TRACEMS8(cinfo, 2, JTRC_HUFFBITS,
+	     bits[9], bits[10], bits[11], bits[12],
+	     bits[13], bits[14], bits[15], bits[16]);
+
+    /* Here we just do minimal validation of the counts to avoid walking
+     * off the end of our table space.  jdhuff.c will check more carefully.
+     */
+    if (count > 256 || ((INT32) count) > length)
+      ERREXIT(cinfo, JERR_BAD_HUFF_TABLE);
+
+    for (i = 0; i < count; i++)
+      INPUT_BYTE(cinfo, huffval[i], return FALSE);
+
+    length -= count;
+
+    if (index & 0x10) {		/* AC table definition */
+      index -= 0x10;
+      htblptr = &cinfo->ac_huff_tbl_ptrs[index];
+    } else {			/* DC table definition */
+      htblptr = &cinfo->dc_huff_tbl_ptrs[index];
+    }
+
+    if (index < 0 || index >= NUM_HUFF_TBLS)
+      ERREXIT1(cinfo, JERR_DHT_INDEX, index);
+
+    if (*htblptr == NULL)
+      *htblptr = jpeg_alloc_huff_table((j_common_ptr) cinfo);
+
+    MEMCOPY((*htblptr)->bits, bits, SIZEOF((*htblptr)->bits));
+    MEMCOPY((*htblptr)->huffval, huffval, SIZEOF((*htblptr)->huffval));
+  }
+
+  if (length != 0)
+    ERREXIT(cinfo, JERR_BAD_LENGTH);
+
+  INPUT_SYNC(cinfo);
+  return TRUE;
+}
+
+
+LOCAL(boolean)
+get_dqt (j_decompress_ptr cinfo)
+/* Process a DQT marker */
+{
+  INT32 length;
+  int n, i, prec;
+  unsigned int tmp;
+  JQUANT_TBL *quant_ptr;
+  INPUT_VARS(cinfo);
+
+  INPUT_2BYTES(cinfo, length, return FALSE);
+  length -= 2;
+
+  while (length > 0) {
+    INPUT_BYTE(cinfo, n, return FALSE);
+    prec = n >> 4;
+    n &= 0x0F;
+
+    TRACEMS2(cinfo, 1, JTRC_DQT, n, prec);
+
+    if (n >= NUM_QUANT_TBLS)
+      ERREXIT1(cinfo, JERR_DQT_INDEX, n);
+
+    if (cinfo->quant_tbl_ptrs[n] == NULL)
+      cinfo->quant_tbl_ptrs[n] = jpeg_alloc_quant_table((j_common_ptr) cinfo);
+    quant_ptr = cinfo->quant_tbl_ptrs[n];
+
+    for (i = 0; i < DCTSIZE2; i++) {
+      if (prec)
+	INPUT_2BYTES(cinfo, tmp, return FALSE);
+      else
+	INPUT_BYTE(cinfo, tmp, return FALSE);
+      /* We convert the zigzag-order table to natural array order. */
+      quant_ptr->quantval[jpeg_natural_order[i]] = (UINT16) tmp;
+    }
+
+    if (cinfo->err->trace_level >= 2) {
+      for (i = 0; i < DCTSIZE2; i += 8) {
+	TRACEMS8(cinfo, 2, JTRC_QUANTVALS,
+		 quant_ptr->quantval[i],   quant_ptr->quantval[i+1],
+		 quant_ptr->quantval[i+2], quant_ptr->quantval[i+3],
+		 quant_ptr->quantval[i+4], quant_ptr->quantval[i+5],
+		 quant_ptr->quantval[i+6], quant_ptr->quantval[i+7]);
+      }
+    }
+
+    length -= DCTSIZE2+1;
+    if (prec) length -= DCTSIZE2;
+  }
+
+  if (length != 0)
+    ERREXIT(cinfo, JERR_BAD_LENGTH);
+
+  INPUT_SYNC(cinfo);
+  return TRUE;
+}
+
+
+LOCAL(boolean)
+get_dri (j_decompress_ptr cinfo)
+/* Process a DRI marker */
+{
+  INT32 length;
+  unsigned int tmp;
+  INPUT_VARS(cinfo);
+
+  INPUT_2BYTES(cinfo, length, return FALSE);
+
+  if (length != 4)
+    ERREXIT(cinfo, JERR_BAD_LENGTH);
+
+  INPUT_2BYTES(cinfo, tmp, return FALSE);
+
+  TRACEMS1(cinfo, 1, JTRC_DRI, tmp);
+
+  cinfo->restart_interval = tmp;
+
+  INPUT_SYNC(cinfo);
+  return TRUE;
+}
+
+
+/*
+ * Routines for processing APPn and COM markers.
+ * These are either saved in memory or discarded, per application request.
+ * APP0 and APP14 are specially checked to see if they are
+ * JFIF and Adobe markers, respectively.
+ */
+
+#define APP0_DATA_LEN	14	/* Length of interesting data in APP0 */
+#define APP14_DATA_LEN	12	/* Length of interesting data in APP14 */
+#define APPN_DATA_LEN	14	/* Must be the largest of the above!! */
+
+
+LOCAL(void)
+examine_app0 (j_decompress_ptr cinfo, JOCTET FAR * data,
+	      unsigned int datalen, INT32 remaining)
+/* Examine first few bytes from an APP0.
+ * Take appropriate action if it is a JFIF marker.
+ * datalen is # of bytes at data[], remaining is length of rest of marker data.
+ */
+{
+  INT32 totallen = (INT32) datalen + remaining;
+
+  if (datalen >= APP0_DATA_LEN &&
+      GETJOCTET(data[0]) == 0x4A &&
+      GETJOCTET(data[1]) == 0x46 &&
+      GETJOCTET(data[2]) == 0x49 &&
+      GETJOCTET(data[3]) == 0x46 &&
+      GETJOCTET(data[4]) == 0) {
+    /* Found JFIF APP0 marker: save info */
+    cinfo->saw_JFIF_marker = TRUE;
+    cinfo->JFIF_major_version = GETJOCTET(data[5]);
+    cinfo->JFIF_minor_version = GETJOCTET(data[6]);
+    cinfo->density_unit = GETJOCTET(data[7]);
+    cinfo->X_density = (GETJOCTET(data[8]) << 8) + GETJOCTET(data[9]);
+    cinfo->Y_density = (GETJOCTET(data[10]) << 8) + GETJOCTET(data[11]);
+    /* Check version.
+     * Major version must be 1, anything else signals an incompatible change.
+     * (We used to treat this as an error, but now it's a nonfatal warning,
+     * because some bozo at Hijaak couldn't read the spec.)
+     * Minor version should be 0..2, but process anyway if newer.
+     */
+    if (cinfo->JFIF_major_version != 1)
+      WARNMS2(cinfo, JWRN_JFIF_MAJOR,
+	      cinfo->JFIF_major_version, cinfo->JFIF_minor_version);
+    /* Generate trace messages */
+    TRACEMS5(cinfo, 1, JTRC_JFIF,
+	     cinfo->JFIF_major_version, cinfo->JFIF_minor_version,
+	     cinfo->X_density, cinfo->Y_density, cinfo->density_unit);
+    /* Validate thumbnail dimensions and issue appropriate messages */
+    if (GETJOCTET(data[12]) | GETJOCTET(data[13]))
+      TRACEMS2(cinfo, 1, JTRC_JFIF_THUMBNAIL,
+	       GETJOCTET(data[12]), GETJOCTET(data[13]));
+    totallen -= APP0_DATA_LEN;
+    if (totallen !=
+	((INT32)GETJOCTET(data[12]) * (INT32)GETJOCTET(data[13]) * (INT32) 3))
+      TRACEMS1(cinfo, 1, JTRC_JFIF_BADTHUMBNAILSIZE, (int) totallen);
+  } else if (datalen >= 6 &&
+      GETJOCTET(data[0]) == 0x4A &&
+      GETJOCTET(data[1]) == 0x46 &&
+      GETJOCTET(data[2]) == 0x58 &&
+      GETJOCTET(data[3]) == 0x58 &&
+      GETJOCTET(data[4]) == 0) {
+    /* Found JFIF "JFXX" extension APP0 marker */
+    /* The library doesn't actually do anything with these,
+     * but we try to produce a helpful trace message.
+     */
+    switch (GETJOCTET(data[5])) {
+    case 0x10:
+      TRACEMS1(cinfo, 1, JTRC_THUMB_JPEG, (int) totallen);
+      break;
+    case 0x11:
+      TRACEMS1(cinfo, 1, JTRC_THUMB_PALETTE, (int) totallen);
+      break;
+    case 0x13:
+      TRACEMS1(cinfo, 1, JTRC_THUMB_RGB, (int) totallen);
+      break;
+    default:
+      TRACEMS2(cinfo, 1, JTRC_JFIF_EXTENSION,
+	       GETJOCTET(data[5]), (int) totallen);
+      break;
+    }
+  } else {
+    /* Start of APP0 does not match "JFIF" or "JFXX", or too short */
+    TRACEMS1(cinfo, 1, JTRC_APP0, (int) totallen);
+  }
+}
+
+
+LOCAL(void)
+examine_app14 (j_decompress_ptr cinfo, JOCTET FAR * data,
+	       unsigned int datalen, INT32 remaining)
+/* Examine first few bytes from an APP14.
+ * Take appropriate action if it is an Adobe marker.
+ * datalen is # of bytes at data[], remaining is length of rest of marker data.
+ */
+{
+  unsigned int version, flags0, flags1, transform;
+
+  if (datalen >= APP14_DATA_LEN &&
+      GETJOCTET(data[0]) == 0x41 &&
+      GETJOCTET(data[1]) == 0x64 &&
+      GETJOCTET(data[2]) == 0x6F &&
+      GETJOCTET(data[3]) == 0x62 &&
+      GETJOCTET(data[4]) == 0x65) {
+    /* Found Adobe APP14 marker */
+    version = (GETJOCTET(data[5]) << 8) + GETJOCTET(data[6]);
+    flags0 = (GETJOCTET(data[7]) << 8) + GETJOCTET(data[8]);
+    flags1 = (GETJOCTET(data[9]) << 8) + GETJOCTET(data[10]);
+    transform = GETJOCTET(data[11]);
+    TRACEMS4(cinfo, 1, JTRC_ADOBE, version, flags0, flags1, transform);
+    cinfo->saw_Adobe_marker = TRUE;
+    cinfo->Adobe_transform = (UINT8) transform;
+  } else {
+    /* Start of APP14 does not match "Adobe", or too short */
+    TRACEMS1(cinfo, 1, JTRC_APP14, (int) (datalen + remaining));
+  }
+}
+
+
+METHODDEF(boolean)
+get_interesting_appn (j_decompress_ptr cinfo)
+/* Process an APP0 or APP14 marker without saving it */
+{
+  INT32 length;
+  JOCTET b[APPN_DATA_LEN];
+  unsigned int i, numtoread;
+  INPUT_VARS(cinfo);
+
+  INPUT_2BYTES(cinfo, length, return FALSE);
+  length -= 2;
+
+  /* get the interesting part of the marker data */
+  if (length >= APPN_DATA_LEN)
+    numtoread = APPN_DATA_LEN;
+  else if (length > 0)
+    numtoread = (unsigned int) length;
+  else
+    numtoread = 0;
+  for (i = 0; i < numtoread; i++)
+    INPUT_BYTE(cinfo, b[i], return FALSE);
+  length -= numtoread;
+
+  /* process it */
+  switch (cinfo->unread_marker) {
+  case M_APP0:
+    examine_app0(cinfo, (JOCTET FAR *) b, numtoread, length);
+    break;
+  case M_APP14:
+    examine_app14(cinfo, (JOCTET FAR *) b, numtoread, length);
+    break;
+  default:
+    /* can't get here unless jpeg_save_markers chooses wrong processor */
+    ERREXIT1(cinfo, JERR_UNKNOWN_MARKER, cinfo->unread_marker);
+    break;
+  }
+
+  /* skip any remaining data -- could be lots */
+  INPUT_SYNC(cinfo);
+  if (length > 0)
+    (*cinfo->src->skip_input_data) (cinfo, (long) length);
+
+  return TRUE;
+}
+
+
+#ifdef SAVE_MARKERS_SUPPORTED
+
+METHODDEF(boolean)
+save_marker (j_decompress_ptr cinfo)
+/* Save an APPn or COM marker into the marker list */
+{
+  my_marker_ptr marker = (my_marker_ptr) cinfo->marker;
+  jpeg_saved_marker_ptr cur_marker = marker->cur_marker;
+  unsigned int bytes_read, data_length;
+  JOCTET FAR * data;
+  INT32 length = 0;
+  INPUT_VARS(cinfo);
+
+  if (cur_marker == NULL) {
+    /* begin reading a marker */
+    INPUT_2BYTES(cinfo, length, return FALSE);
+    length -= 2;
+    if (length >= 0) {		/* watch out for bogus length word */
+      /* figure out how much we want to save */
+      unsigned int limit;
+      if (cinfo->unread_marker == (int) M_COM)
+	limit = marker->length_limit_COM;
+      else
+	limit = marker->length_limit_APPn[cinfo->unread_marker - (int) M_APP0];
+      if ((unsigned int) length < limit)
+	limit = (unsigned int) length;
+      /* allocate and initialize the marker item */
+      cur_marker = (jpeg_saved_marker_ptr)
+	(*cinfo->mem->alloc_large) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+				    SIZEOF(struct jpeg_marker_struct) + limit);
+      cur_marker->next = NULL;
+      cur_marker->marker = (UINT8) cinfo->unread_marker;
+      cur_marker->original_length = (unsigned int) length;
+      cur_marker->data_length = limit;
+      /* data area is just beyond the jpeg_marker_struct */
+      data = cur_marker->data = (JOCTET FAR *) (cur_marker + 1);
+      marker->cur_marker = cur_marker;
+      marker->bytes_read = 0;
+      bytes_read = 0;
+      data_length = limit;
+    } else {
+      /* deal with bogus length word */
+      bytes_read = data_length = 0;
+      data = NULL;
+    }
+  } else {
+    /* resume reading a marker */
+    bytes_read = marker->bytes_read;
+    data_length = cur_marker->data_length;
+    data = cur_marker->data + bytes_read;
+  }
+
+  while (bytes_read < data_length) {
+    INPUT_SYNC(cinfo);		/* move the restart point to here */
+    marker->bytes_read = bytes_read;
+    /* If there's not at least one byte in buffer, suspend */
+    MAKE_BYTE_AVAIL(cinfo, return FALSE);
+    /* Copy bytes with reasonable rapidity */
+    while (bytes_read < data_length && bytes_in_buffer > 0) {
+      *data++ = *next_input_byte++;
+      bytes_in_buffer--;
+      bytes_read++;
+    }
+  }
+
+  /* Done reading what we want to read */
+  if (cur_marker != NULL) {	/* will be NULL if bogus length word */
+    /* Add new marker to end of list */
+    if (cinfo->marker_list == NULL) {
+      cinfo->marker_list = cur_marker;
+    } else {
+      jpeg_saved_marker_ptr prev = cinfo->marker_list;
+      while (prev->next != NULL)
+	prev = prev->next;
+      prev->next = cur_marker;
+    }
+    /* Reset pointer & calc remaining data length */
+    data = cur_marker->data;
+    length = cur_marker->original_length - data_length;
+  }
+  /* Reset to initial state for next marker */
+  marker->cur_marker = NULL;
+
+  /* Process the marker if interesting; else just make a generic trace msg */
+  switch (cinfo->unread_marker) {
+  case M_APP0:
+    examine_app0(cinfo, data, data_length, length);
+    break;
+  case M_APP14:
+    examine_app14(cinfo, data, data_length, length);
+    break;
+  default:
+    TRACEMS2(cinfo, 1, JTRC_MISC_MARKER, cinfo->unread_marker,
+	     (int) (data_length + length));
+    break;
+  }
+
+  /* skip any remaining data -- could be lots */
+  INPUT_SYNC(cinfo);		/* do before skip_input_data */
+  if (length > 0)
+    (*cinfo->src->skip_input_data) (cinfo, (long) length);
+
+  return TRUE;
+}
+
+#endif /* SAVE_MARKERS_SUPPORTED */
+
+
+METHODDEF(boolean)
+skip_variable (j_decompress_ptr cinfo)
+/* Skip over an unknown or uninteresting variable-length marker */
+{
+  INT32 length;
+  INPUT_VARS(cinfo);
+
+  INPUT_2BYTES(cinfo, length, return FALSE);
+  length -= 2;
+
+  TRACEMS2(cinfo, 1, JTRC_MISC_MARKER, cinfo->unread_marker, (int) length);
+
+  INPUT_SYNC(cinfo);		/* do before skip_input_data */
+  if (length > 0)
+    (*cinfo->src->skip_input_data) (cinfo, (long) length);
+
+  return TRUE;
+}
+
+
+/*
+ * Find the next JPEG marker, save it in cinfo->unread_marker.
+ * Returns FALSE if had to suspend before reaching a marker;
+ * in that case cinfo->unread_marker is unchanged.
+ *
+ * Note that the result might not be a valid marker code,
+ * but it will never be 0 or FF.
+ */
+
+LOCAL(boolean)
+next_marker (j_decompress_ptr cinfo)
+{
+  int c;
+  INPUT_VARS(cinfo);
+
+  for (;;) {
+    INPUT_BYTE(cinfo, c, return FALSE);
+    /* Skip any non-FF bytes.
+     * This may look a bit inefficient, but it will not occur in a valid file.
+     * We sync after each discarded byte so that a suspending data source
+     * can discard the byte from its buffer.
+     */
+    while (c != 0xFF) {
+      cinfo->marker->discarded_bytes++;
+      INPUT_SYNC(cinfo);
+      INPUT_BYTE(cinfo, c, return FALSE);
+    }
+    /* This loop swallows any duplicate FF bytes.  Extra FFs are legal as
+     * pad bytes, so don't count them in discarded_bytes.  We assume there
+     * will not be so many consecutive FF bytes as to overflow a suspending
+     * data source's input buffer.
+     */
+    do {
+      INPUT_BYTE(cinfo, c, return FALSE);
+    } while (c == 0xFF);
+    if (c != 0)
+      break;			/* found a valid marker, exit loop */
+    /* Reach here if we found a stuffed-zero data sequence (FF/00).
+     * Discard it and loop back to try again.
+     */
+    cinfo->marker->discarded_bytes += 2;
+    INPUT_SYNC(cinfo);
+  }
+
+  if (cinfo->marker->discarded_bytes != 0) {
+    WARNMS2(cinfo, JWRN_EXTRANEOUS_DATA, cinfo->marker->discarded_bytes, c);
+    cinfo->marker->discarded_bytes = 0;
+  }
+
+  cinfo->unread_marker = c;
+
+  INPUT_SYNC(cinfo);
+  return TRUE;
+}
+
+
+LOCAL(boolean)
+first_marker (j_decompress_ptr cinfo)
+/* Like next_marker, but used to obtain the initial SOI marker. */
+/* For this marker, we do not allow preceding garbage or fill; otherwise,
+ * we might well scan an entire input file before realizing it ain't JPEG.
+ * If an application wants to process non-JFIF files, it must seek to the
+ * SOI before calling the JPEG library.
+ */
+{
+  int c, c2;
+  INPUT_VARS(cinfo);
+
+  INPUT_BYTE(cinfo, c, return FALSE);
+  INPUT_BYTE(cinfo, c2, return FALSE);
+  if (c != 0xFF || c2 != (int) M_SOI)
+    ERREXIT2(cinfo, JERR_NO_SOI, c, c2);
+
+  cinfo->unread_marker = c2;
+
+  INPUT_SYNC(cinfo);
+  return TRUE;
+}
+
+
+/*
+ * Read markers until SOS or EOI.
+ *
+ * Returns same codes as are defined for jpeg_consume_input:
+ * JPEG_SUSPENDED, JPEG_REACHED_SOS, or JPEG_REACHED_EOI.
+ */
+
+METHODDEF(int)
+read_markers (j_decompress_ptr cinfo)
+{
+  /* Outer loop repeats once for each marker. */
+  for (;;) {
+    /* Collect the marker proper, unless we already did. */
+    /* NB: first_marker() enforces the requirement that SOI appear first. */
+    if (cinfo->unread_marker == 0) {
+      if (! cinfo->marker->saw_SOI) {
+	if (! first_marker(cinfo))
+	  return JPEG_SUSPENDED;
+      } else {
+	if (! next_marker(cinfo))
+	  return JPEG_SUSPENDED;
+      }
+    }
+    /* At this point cinfo->unread_marker contains the marker code and the
+     * input point is just past the marker proper, but before any parameters.
+     * A suspension will cause us to return with this state still true.
+     */
+    switch (cinfo->unread_marker) {
+    case M_SOI:
+      if (! get_soi(cinfo))
+	return JPEG_SUSPENDED;
+      break;
+
+    case M_SOF0:		/* Baseline */
+    case M_SOF1:		/* Extended sequential, Huffman */
+      if (! get_sof(cinfo, JPROC_SEQUENTIAL, FALSE, DCTSIZE))
+	return JPEG_SUSPENDED;
+      break;
+
+    case M_SOF2:		/* Progressive, Huffman */
+      if (! get_sof(cinfo, JPROC_PROGRESSIVE, FALSE, DCTSIZE))
+	return JPEG_SUSPENDED;
+      break;
+
+    case M_SOF3:		/* Lossless, Huffman */
+      if (! get_sof(cinfo, JPROC_LOSSLESS, FALSE, 1))
+	return JPEG_SUSPENDED;
+      break;
+
+    case M_SOF9:		/* Extended sequential, arithmetic */
+      if (! get_sof(cinfo, JPROC_SEQUENTIAL, TRUE, DCTSIZE))
+	return JPEG_SUSPENDED;
+      break;
+
+    case M_SOF10:		/* Progressive, arithmetic */
+      if (! get_sof(cinfo, JPROC_PROGRESSIVE, TRUE, DCTSIZE))
+	return JPEG_SUSPENDED;
+      break;
+
+    case M_SOF11:		/* Lossless, arithmetic */
+      if (! get_sof(cinfo, JPROC_LOSSLESS, TRUE, 1))
+	return JPEG_SUSPENDED;
+      break;
+
+    /* Currently unsupported SOFn types */
+    case M_SOF5:		/* Differential sequential, Huffman */
+    case M_SOF6:		/* Differential progressive, Huffman */
+    case M_SOF7:		/* Differential lossless, Huffman */
+    case M_JPG:			/* Reserved for JPEG extensions */
+    case M_SOF13:		/* Differential sequential, arithmetic */
+    case M_SOF14:		/* Differential progressive, arithmetic */
+    case M_SOF15:		/* Differential lossless, arithmetic */
+      ERREXIT1(cinfo, JERR_SOF_UNSUPPORTED, cinfo->unread_marker);
+      break;
+
+    case M_SOS:
+      if (! get_sos(cinfo))
+	return JPEG_SUSPENDED;
+      cinfo->unread_marker = 0;	/* processed the marker */
+      return JPEG_REACHED_SOS;
+
+    case M_EOI:
+      TRACEMS(cinfo, 1, JTRC_EOI);
+      cinfo->unread_marker = 0;	/* processed the marker */
+      return JPEG_REACHED_EOI;
+
+    case M_DAC:
+      if (! get_dac(cinfo))
+	return JPEG_SUSPENDED;
+      break;
+
+    case M_DHT:
+      if (! get_dht(cinfo))
+	return JPEG_SUSPENDED;
+      break;
+
+    case M_DQT:
+      if (! get_dqt(cinfo))
+	return JPEG_SUSPENDED;
+      break;
+
+    case M_DRI:
+      if (! get_dri(cinfo))
+	return JPEG_SUSPENDED;
+      break;
+
+    case M_APP0:
+    case M_APP1:
+    case M_APP2:
+    case M_APP3:
+    case M_APP4:
+    case M_APP5:
+    case M_APP6:
+    case M_APP7:
+    case M_APP8:
+    case M_APP9:
+    case M_APP10:
+    case M_APP11:
+    case M_APP12:
+    case M_APP13:
+    case M_APP14:
+    case M_APP15:
+      if (! (*((my_marker_ptr) cinfo->marker)->process_APPn[
+		cinfo->unread_marker - (int) M_APP0]) (cinfo))
+	return JPEG_SUSPENDED;
+      break;
+
+    case M_COM:
+      if (! (*((my_marker_ptr) cinfo->marker)->process_COM) (cinfo))
+	return JPEG_SUSPENDED;
+      break;
+
+    case M_RST0:		/* these are all parameterless */
+    case M_RST1:
+    case M_RST2:
+    case M_RST3:
+    case M_RST4:
+    case M_RST5:
+    case M_RST6:
+    case M_RST7:
+    case M_TEM:
+      TRACEMS1(cinfo, 1, JTRC_PARMLESS_MARKER, cinfo->unread_marker);
+      break;
+
+    case M_DNL:			/* Ignore DNL ... perhaps the wrong thing */
+      if (! skip_variable(cinfo))
+	return JPEG_SUSPENDED;
+      break;
+
+    default:			/* must be DHP, EXP, JPGn, or RESn */
+      /* For now, we treat the reserved markers as fatal errors since they are
+       * likely to be used to signal incompatible JPEG Part 3 extensions.
+       * Once the JPEG 3 version-number marker is well defined, this code
+       * ought to change!
+       */
+      ERREXIT1(cinfo, JERR_UNKNOWN_MARKER, cinfo->unread_marker);
+      break;
+    }
+    /* Successfully processed marker, so reset state variable */
+    cinfo->unread_marker = 0;
+  } /* end loop */
+}
+
+
+/*
+ * Read a restart marker, which is expected to appear next in the datastream;
+ * if the marker is not there, take appropriate recovery action.
+ * Returns FALSE if suspension is required.
+ *
+ * This is called by the entropy decoder after it has read an appropriate
+ * number of MCUs.  cinfo->unread_marker may be nonzero if the entropy decoder
+ * has already read a marker from the data source.  Under normal conditions
+ * cinfo->unread_marker will be reset to 0 before returning; if not reset,
+ * it holds a marker which the decoder will be unable to read past.
+ */
+
+METHODDEF(boolean)
+read_restart_marker (j_decompress_ptr cinfo)
+{
+  /* Obtain a marker unless we already did. */
+  /* Note that next_marker will complain if it skips any data. */
+  if (cinfo->unread_marker == 0) {
+    if (! next_marker(cinfo))
+      return FALSE;
+  }
+
+  if (cinfo->unread_marker ==
+      ((int) M_RST0 + cinfo->marker->next_restart_num)) {
+    /* Normal case --- swallow the marker and let entropy decoder continue */
+    TRACEMS1(cinfo, 3, JTRC_RST, cinfo->marker->next_restart_num);
+    cinfo->unread_marker = 0;
+  } else {
+    /* Uh-oh, the restart markers have been messed up. */
+    /* Let the data source manager determine how to resync. */
+    if (! (*cinfo->src->resync_to_restart) (cinfo,
+					    cinfo->marker->next_restart_num))
+      return FALSE;
+  }
+
+  /* Update next-restart state */
+  cinfo->marker->next_restart_num = (cinfo->marker->next_restart_num + 1) & 7;
+
+  return TRUE;
+}
+
+
+/*
+ * This is the default resync_to_restart method for data source managers
+ * to use if they don't have any better approach.  Some data source managers
+ * may be able to back up, or may have additional knowledge about the data
+ * which permits a more intelligent recovery strategy; such managers would
+ * presumably supply their own resync method.
+ *
+ * read_restart_marker calls resync_to_restart if it finds a marker other than
+ * the restart marker it was expecting.  (This code is *not* used unless
+ * a nonzero restart interval has been declared.)  cinfo->unread_marker is
+ * the marker code actually found (might be anything, except 0 or FF).
+ * The desired restart marker number (0..7) is passed as a parameter.
+ * This routine is supposed to apply whatever error recovery strategy seems
+ * appropriate in order to position the input stream to the next data segment.
+ * Note that cinfo->unread_marker is treated as a marker appearing before
+ * the current data-source input point; usually it should be reset to zero
+ * before returning.
+ * Returns FALSE if suspension is required.
+ *
+ * This implementation is substantially constrained by wanting to treat the
+ * input as a data stream; this means we can't back up.  Therefore, we have
+ * only the following actions to work with:
+ *   1. Simply discard the marker and let the entropy decoder resume at next
+ *      byte of file.
+ *   2. Read forward until we find another marker, discarding intervening
+ *      data.  (In theory we could look ahead within the current bufferload,
+ *      without having to discard data if we don't find the desired marker.
+ *      This idea is not implemented here, in part because it makes behavior
+ *      dependent on buffer size and chance buffer-boundary positions.)
+ *   3. Leave the marker unread (by failing to zero cinfo->unread_marker).
+ *      This will cause the entropy decoder to process an empty data segment,
+ *      inserting dummy zeroes, and then we will reprocess the marker.
+ *
+ * #2 is appropriate if we think the desired marker lies ahead, while #3 is
+ * appropriate if the found marker is a future restart marker (indicating
+ * that we have missed the desired restart marker, probably because it got
+ * corrupted).
+ * We apply #2 or #3 if the found marker is a restart marker no more than
+ * two counts behind or ahead of the expected one.  We also apply #2 if the
+ * found marker is not a legal JPEG marker code (it's certainly bogus data).
+ * If the found marker is a restart marker more than 2 counts away, we do #1
+ * (too much risk that the marker is erroneous; with luck we will be able to
+ * resync at some future point).
+ * For any valid non-restart JPEG marker, we apply #3.  This keeps us from
+ * overrunning the end of a scan.  An implementation limited to single-scan
+ * files might find it better to apply #2 for markers other than EOI, since
+ * any other marker would have to be bogus data in that case.
+ */
+
+GLOBAL(boolean)
+jpeg_resync_to_restart (j_decompress_ptr cinfo, int desired)
+{
+  int marker = cinfo->unread_marker;
+  int action = 1;
+
+  /* Always put up a warning. */
+  WARNMS2(cinfo, JWRN_MUST_RESYNC, marker, desired);
+
+  /* Outer loop handles repeated decision after scanning forward. */
+  for (;;) {
+    if (marker < (int) M_SOF0)
+      action = 2;		/* invalid marker */
+    else if (marker < (int) M_RST0 || marker > (int) M_RST7)
+      action = 3;		/* valid non-restart marker */
+    else {
+      if (marker == ((int) M_RST0 + ((desired+1) & 7)) ||
+	  marker == ((int) M_RST0 + ((desired+2) & 7)))
+	action = 3;		/* one of the next two expected restarts */
+      else if (marker == ((int) M_RST0 + ((desired-1) & 7)) ||
+	       marker == ((int) M_RST0 + ((desired-2) & 7)))
+	action = 2;		/* a prior restart, so advance */
+      else
+	action = 1;		/* desired restart or too far away */
+    }
+    TRACEMS2(cinfo, 4, JTRC_RECOVERY_ACTION, marker, action);
+    switch (action) {
+    case 1:
+      /* Discard marker and let entropy decoder resume processing. */
+      cinfo->unread_marker = 0;
+      return TRUE;
+    case 2:
+      /* Scan to the next marker, and repeat the decision loop. */
+      if (! next_marker(cinfo))
+	return FALSE;
+      marker = cinfo->unread_marker;
+      break;
+    case 3:
+      /* Return without advancing past this marker. */
+      /* Entropy decoder will be forced to process an empty segment. */
+      return TRUE;
+    }
+  } /* end loop */
+}
+
+
+/*
+ * Reset marker processing state to begin a fresh datastream.
+ */
+
+METHODDEF(void)
+reset_marker_reader (j_decompress_ptr cinfo)
+{
+  my_marker_ptr marker = (my_marker_ptr) cinfo->marker;
+
+  cinfo->comp_info = NULL;		/* until allocated by get_sof */
+  cinfo->input_scan_number = 0;		/* no SOS seen yet */
+  cinfo->unread_marker = 0;		/* no pending marker */
+  marker->pub.saw_SOI = FALSE;		/* set internal state too */
+  marker->pub.saw_SOF = FALSE;
+  marker->pub.discarded_bytes = 0;
+  marker->cur_marker = NULL;
+}
+
+
+/*
+ * Initialize the marker reader module.
+ * This is called only once, when the decompression object is created.
+ */
+
+GLOBAL(void)
+jinit_marker_reader (j_decompress_ptr cinfo)
+{
+  my_marker_ptr marker;
+  int i;
+
+  /* Create subobject in permanent pool */
+  marker = (my_marker_ptr)
+    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT,
+				SIZEOF(my_marker_reader));
+  cinfo->marker = (struct jpeg_marker_reader *) marker;
+  /* Initialize public method pointers */
+  marker->pub.reset_marker_reader = reset_marker_reader;
+  marker->pub.read_markers = read_markers;
+  marker->pub.read_restart_marker = read_restart_marker;
+  /* Initialize COM/APPn processing.
+   * By default, we examine and then discard APP0 and APP14,
+   * but simply discard COM and all other APPn.
+   */
+  marker->process_COM = skip_variable;
+  marker->length_limit_COM = 0;
+  for (i = 0; i < 16; i++) {
+    marker->process_APPn[i] = skip_variable;
+    marker->length_limit_APPn[i] = 0;
+  }
+  marker->process_APPn[0] = get_interesting_appn;
+  marker->process_APPn[14] = get_interesting_appn;
+  /* Reset marker processing state */
+  reset_marker_reader(cinfo);
+}
+
+
+/*
+ * Control saving of COM and APPn markers into marker_list.
+ */
+
+#ifdef SAVE_MARKERS_SUPPORTED
+
+GLOBAL(void)
+jpeg_save_markers (j_decompress_ptr cinfo, int marker_code,
+		   unsigned int length_limit)
+{
+  my_marker_ptr marker = (my_marker_ptr) cinfo->marker;
+  long maxlength;
+  jpeg_marker_parser_method processor;
+
+  /* Length limit mustn't be larger than what we can allocate
+   * (should only be a concern in a 16-bit environment).
+   */
+  maxlength = cinfo->mem->max_alloc_chunk - SIZEOF(struct jpeg_marker_struct);
+  if (((long) length_limit) > maxlength)
+    length_limit = (unsigned int) maxlength;
+
+  /* Choose processor routine to use.
+   * APP0/APP14 have special requirements.
+   */
+  if (length_limit) {
+    processor = save_marker;
+    /* If saving APP0/APP14, save at least enough for our internal use. */
+    if (marker_code == (int) M_APP0 && length_limit < APP0_DATA_LEN)
+      length_limit = APP0_DATA_LEN;
+    else if (marker_code == (int) M_APP14 && length_limit < APP14_DATA_LEN)
+      length_limit = APP14_DATA_LEN;
+  } else {
+    processor = skip_variable;
+    /* If discarding APP0/APP14, use our regular on-the-fly processor. */
+    if (marker_code == (int) M_APP0 || marker_code == (int) M_APP14)
+      processor = get_interesting_appn;
+  }
+
+  if (marker_code == (int) M_COM) {
+    marker->process_COM = processor;
+    marker->length_limit_COM = length_limit;
+  } else if (marker_code >= (int) M_APP0 && marker_code <= (int) M_APP15) {
+    marker->process_APPn[marker_code - (int) M_APP0] = processor;
+    marker->length_limit_APPn[marker_code - (int) M_APP0] = length_limit;
+  } else
+    ERREXIT1(cinfo, JERR_UNKNOWN_MARKER, marker_code);
+}
+
+#endif /* SAVE_MARKERS_SUPPORTED */
+
+
+/*
+ * Install a special processing method for COM or APPn markers.
+ */
+
+GLOBAL(void)
+jpeg_set_marker_processor (j_decompress_ptr cinfo, int marker_code,
+			   jpeg_marker_parser_method routine)
+{
+  my_marker_ptr marker = (my_marker_ptr) cinfo->marker;
+
+  if (marker_code == (int) M_COM)
+    marker->process_COM = routine;
+  else if (marker_code >= (int) M_APP0 && marker_code <= (int) M_APP15)
+    marker->process_APPn[marker_code - (int) M_APP0] = routine;
+  else
+    ERREXIT1(cinfo, JERR_UNKNOWN_MARKER, marker_code);
+}
diff --git a/uppsrc/plugin/jpg/lib/jdmaster.c b/uppsrc/plugin/jpg/lib/jdmaster.c
new file mode 100644
index 000000000..b91918749
--- /dev/null
+++ b/uppsrc/plugin/jpg/lib/jdmaster.c
@@ -0,0 +1,460 @@
+/*
+ * jdmaster.c
+ *
+ * Copyright (C) 1991-1998, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains master control logic for the JPEG decompressor.
+ * These routines are concerned with selecting the modules to be executed
+ * and with determining the number of passes and the work to be done in each
+ * pass.
+ */
+
+#define JPEG_INTERNALS
+#include "jinclude.h"
+#include "jpeglib.h"
+
+
+/* Private state */
+
+typedef struct {
+  struct jpeg_decomp_master pub; /* public fields */
+
+  int pass_number;		/* # of passes completed */
+
+  boolean using_merged_upsample; /* TRUE if using merged upsample/cconvert */
+
+  /* Saved references to initialized quantizer modules,
+   * in case we need to switch modes.
+   */
+  struct jpeg_color_quantizer * quantizer_1pass;
+  struct jpeg_color_quantizer * quantizer_2pass;
+} my_decomp_master;
+
+typedef my_decomp_master * my_master_ptr;
+
+
+/*
+ * Determine whether merged upsample/color conversion should be used.
+ * CRUCIAL: this must match the actual capabilities of jdmerge.c!
+ */
+
+LOCAL(boolean)
+use_merged_upsample (j_decompress_ptr cinfo)
+{
+#ifdef UPSAMPLE_MERGING_SUPPORTED
+  /* Merging is the equivalent of plain box-filter upsampling */
+  if (cinfo->do_fancy_upsampling || cinfo->CCIR601_sampling)
+    return FALSE;
+  /* jdmerge.c only supports YCC=>RGB color conversion */
+  if (cinfo->jpeg_color_space != JCS_YCbCr || cinfo->num_components != 3 ||
+      cinfo->out_color_space != JCS_RGB ||
+      cinfo->out_color_components != RGB_PIXELSIZE)
+    return FALSE;
+  /* and it only handles 2h1v or 2h2v sampling ratios */
+  if (cinfo->comp_info[0].h_samp_factor != 2 ||
+      cinfo->comp_info[1].h_samp_factor != 1 ||
+      cinfo->comp_info[2].h_samp_factor != 1 ||
+      cinfo->comp_info[0].v_samp_factor >  2 ||
+      cinfo->comp_info[1].v_samp_factor != 1 ||
+      cinfo->comp_info[2].v_samp_factor != 1)
+    return FALSE;
+  /* furthermore, it doesn't work if each component has been
+     processed differently */
+  if (cinfo->comp_info[0].codec_data_unit != cinfo->min_codec_data_unit ||
+      cinfo->comp_info[1].codec_data_unit != cinfo->min_codec_data_unit ||
+      cinfo->comp_info[2].codec_data_unit != cinfo->min_codec_data_unit)
+    return FALSE;
+  /* ??? also need to test for upsample-time rescaling, when & if supported */
+  return TRUE;			/* by golly, it'll work... */
+#else
+  return FALSE;
+#endif
+}
+
+
+/*
+ * Compute output image dimensions and related values.
+ * NOTE: this is exported for possible use by application.
+ * Hence it mustn't do anything that can't be done twice.
+ * Also note that it may be called before the master module is initialized!
+ */
+
+GLOBAL(void)
+jpeg_calc_output_dimensions (j_decompress_ptr cinfo)
+/* Do computations that are needed before master selection phase */
+{
+  /* Prevent application from calling me at wrong times */
+  if (cinfo->global_state != DSTATE_READY)
+    ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);
+
+  (*cinfo->codec->calc_output_dimensions) (cinfo);
+
+  /* Report number of components in selected colorspace. */
+  /* Probably this should be in the color conversion module... */
+  switch (cinfo->out_color_space) {
+  case JCS_GRAYSCALE:
+    cinfo->out_color_components = 1;
+    break;
+  case JCS_RGB:
+#if RGB_PIXELSIZE != 3
+    cinfo->out_color_components = RGB_PIXELSIZE;
+    break;
+#endif /* else share code with YCbCr */
+  case JCS_YCbCr:
+    cinfo->out_color_components = 3;
+    break;
+  case JCS_CMYK:
+  case JCS_YCCK:
+    cinfo->out_color_components = 4;
+    break;
+  default:			/* else must be same colorspace as in file */
+    cinfo->out_color_components = cinfo->num_components;
+    break;
+  }
+  cinfo->output_components = (cinfo->quantize_colors ? 1 :
+			      cinfo->out_color_components);
+
+  /* See if upsampler will want to emit more than one row at a time */
+  if (use_merged_upsample(cinfo))
+    cinfo->rec_outbuf_height = cinfo->max_v_samp_factor;
+  else
+    cinfo->rec_outbuf_height = 1;
+}
+
+
+/*
+ * Several decompression processes need to range-limit values to the range
+ * 0..MAXJSAMPLE; the input value may fall somewhat outside this range
+ * due to noise introduced by quantization, roundoff error, etc.  These
+ * processes are inner loops and need to be as fast as possible.  On most
+ * machines, particularly CPUs with pipelines or instruction prefetch,
+ * a (subscript-check-less) C table lookup
+ *		x = sample_range_limit[x];
+ * is faster than explicit tests
+ *		if (x < 0)  x = 0;
+ *		else if (x > MAXJSAMPLE)  x = MAXJSAMPLE;
+ * These processes all use a common table prepared by the routine below.
+ *
+ * For most steps we can mathematically guarantee that the initial value
+ * of x is within MAXJSAMPLE+1 of the legal range, so a table running from
+ * -(MAXJSAMPLE+1) to 2*MAXJSAMPLE+1 is sufficient.  But for the initial
+ * limiting step (just after the IDCT), a wildly out-of-range value is
+ * possible if the input data is corrupt.  To avoid any chance of indexing
+ * off the end of memory and getting a bad-pointer trap, we perform the
+ * post-IDCT limiting thus:
+ *		x = range_limit[x & MASK];
+ * where MASK is 2 bits wider than legal sample data, ie 10 bits for 8-bit
+ * samples.  Under normal circumstances this is more than enough range and
+ * a correct output will be generated; with bogus input data the mask will
+ * cause wraparound, and we will safely generate a bogus-but-in-range output.
+ * For the post-IDCT step, we want to convert the data from signed to unsigned
+ * representation by adding CENTERJSAMPLE at the same time that we limit it.
+ * So the post-IDCT limiting table ends up looking like this:
+ *   CENTERJSAMPLE,CENTERJSAMPLE+1,...,MAXJSAMPLE,
+ *   MAXJSAMPLE (repeat 2*(MAXJSAMPLE+1)-CENTERJSAMPLE times),
+ *   0          (repeat 2*(MAXJSAMPLE+1)-CENTERJSAMPLE times),
+ *   0,1,...,CENTERJSAMPLE-1
+ * Negative inputs select values from the upper half of the table after
+ * masking.
+ *
+ * We can save some space by overlapping the start of the post-IDCT table
+ * with the simpler range limiting table.  The post-IDCT table begins at
+ * sample_range_limit + CENTERJSAMPLE.
+ *
+ * Note that the table is allocated in near data space on PCs; it's small
+ * enough and used often enough to justify this.
+ */
+
+LOCAL(void)
+prepare_range_limit_table (j_decompress_ptr cinfo)
+/* Allocate and fill in the sample_range_limit table */
+{
+  JSAMPLE * table;
+  int i;
+
+  table = (JSAMPLE *)
+    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+		(5 * (MAXJSAMPLE+1) + CENTERJSAMPLE) * SIZEOF(JSAMPLE));
+  table += (MAXJSAMPLE+1);	/* allow negative subscripts of simple table */
+  cinfo->sample_range_limit = table;
+  /* First segment of "simple" table: limit[x] = 0 for x < 0 */
+  MEMZERO(table - (MAXJSAMPLE+1), (MAXJSAMPLE+1) * SIZEOF(JSAMPLE));
+  /* Main part of "simple" table: limit[x] = x */
+  for (i = 0; i <= MAXJSAMPLE; i++)
+    table[i] = (JSAMPLE) i;
+  table += CENTERJSAMPLE;	/* Point to where post-IDCT table starts */
+  /* End of simple table, rest of first half of post-IDCT table */
+  for (i = CENTERJSAMPLE; i < 2*(MAXJSAMPLE+1); i++)
+    table[i] = MAXJSAMPLE;
+  /* Second half of post-IDCT table */
+  MEMZERO(table + (2 * (MAXJSAMPLE+1)),
+	  (2 * (MAXJSAMPLE+1) - CENTERJSAMPLE) * SIZEOF(JSAMPLE));
+  MEMCOPY(table + (4 * (MAXJSAMPLE+1) - CENTERJSAMPLE),
+	  cinfo->sample_range_limit, CENTERJSAMPLE * SIZEOF(JSAMPLE));
+}
+
+
+/*
+ * Master selection of decompression modules.
+ * This is done once at jpeg_start_decompress time.  We determine
+ * which modules will be used and give them appropriate initialization calls.
+ * We also initialize the decompressor input side to begin consuming data.
+ *
+ * Since jpeg_read_header has finished, we know what is in the SOF
+ * and (first) SOS markers.  We also have all the application parameter
+ * settings.
+ */
+
+LOCAL(void)
+master_selection (j_decompress_ptr cinfo)
+{
+  my_master_ptr master = (my_master_ptr) cinfo->master;
+  long samplesperrow;
+  JDIMENSION jd_samplesperrow;
+
+  /* Initialize dimensions and other stuff */
+  jpeg_calc_output_dimensions(cinfo);
+  prepare_range_limit_table(cinfo);
+
+  /* Width of an output scanline must be representable as JDIMENSION. */
+  samplesperrow = (long) cinfo->output_width * (long) cinfo->out_color_components;
+  jd_samplesperrow = (JDIMENSION) samplesperrow;
+  if ((long) jd_samplesperrow != samplesperrow)
+    ERREXIT(cinfo, JERR_WIDTH_OVERFLOW);
+
+  /* Initialize my private state */
+  master->pass_number = 0;
+  master->using_merged_upsample = use_merged_upsample(cinfo);
+
+  /* Color quantizer selection */
+  master->quantizer_1pass = NULL;
+  master->quantizer_2pass = NULL;
+  /* No mode changes if not using buffered-image mode. */
+  if (! cinfo->quantize_colors || ! cinfo->buffered_image) {
+    cinfo->enable_1pass_quant = FALSE;
+    cinfo->enable_external_quant = FALSE;
+    cinfo->enable_2pass_quant = FALSE;
+  }
+  if (cinfo->quantize_colors) {
+    if (cinfo->raw_data_out)
+      ERREXIT(cinfo, JERR_NOTIMPL);
+    /* 2-pass quantizer only works in 3-component color space. */
+    if (cinfo->out_color_components != 3) {
+      cinfo->enable_1pass_quant = TRUE;
+      cinfo->enable_external_quant = FALSE;
+      cinfo->enable_2pass_quant = FALSE;
+      cinfo->colormap = NULL;
+    } else if (cinfo->colormap != NULL) {
+      cinfo->enable_external_quant = TRUE;
+    } else if (cinfo->two_pass_quantize) {
+      cinfo->enable_2pass_quant = TRUE;
+    } else {
+      cinfo->enable_1pass_quant = TRUE;
+    }
+
+    if (cinfo->enable_1pass_quant) {
+#ifdef QUANT_1PASS_SUPPORTED
+      jinit_1pass_quantizer(cinfo);
+      master->quantizer_1pass = cinfo->cquantize;
+#else
+      ERREXIT(cinfo, JERR_NOT_COMPILED);
+#endif
+    }
+
+    /* We use the 2-pass code to map to external colormaps. */
+    if (cinfo->enable_2pass_quant || cinfo->enable_external_quant) {
+#ifdef QUANT_2PASS_SUPPORTED
+      jinit_2pass_quantizer(cinfo);
+      master->quantizer_2pass = cinfo->cquantize;
+#else
+      ERREXIT(cinfo, JERR_NOT_COMPILED);
+#endif
+    }
+    /* If both quantizers are initialized, the 2-pass one is left active;
+     * this is necessary for starting with quantization to an external map.
+     */
+  }
+
+  /* Post-processing: in particular, color conversion first */
+  if (! cinfo->raw_data_out) {
+    if (master->using_merged_upsample) {
+#ifdef UPSAMPLE_MERGING_SUPPORTED
+      jinit_merged_upsampler(cinfo); /* does color conversion too */
+#else
+      ERREXIT(cinfo, JERR_NOT_COMPILED);
+#endif
+    } else {
+      jinit_color_deconverter(cinfo);
+      jinit_upsampler(cinfo);
+    }
+    jinit_d_post_controller(cinfo, cinfo->enable_2pass_quant);
+  }
+
+  /* Initialize principal buffer controllers. */
+  if (! cinfo->raw_data_out)
+    jinit_d_main_controller(cinfo, FALSE /* never need full buffer here */);
+
+  /* We can now tell the memory manager to allocate virtual arrays. */
+  (*cinfo->mem->realize_virt_arrays) ((j_common_ptr) cinfo);
+
+  /* Initialize input side of decompressor to consume first scan. */
+  (*cinfo->inputctl->start_input_pass) (cinfo);
+
+#ifdef D_MULTISCAN_FILES_SUPPORTED
+  /* If jpeg_start_decompress will read the whole file, initialize
+   * progress monitoring appropriately.  The input step is counted
+   * as one pass.
+   */
+  if (cinfo->progress != NULL && ! cinfo->buffered_image &&
+      cinfo->inputctl->has_multiple_scans) {
+    int nscans;
+    /* Estimate number of scans to set pass_limit. */
+    if (cinfo->process == JPROC_PROGRESSIVE) {
+      /* Arbitrarily estimate 2 interleaved DC scans + 3 AC scans/component. */
+      nscans = 2 + 3 * cinfo->num_components;
+    } else {
+      /* For a nonprogressive multiscan file, estimate 1 scan per component. */
+      nscans = cinfo->num_components;
+    }
+    cinfo->progress->pass_counter = 0L;
+    cinfo->progress->pass_limit = (long) cinfo->total_iMCU_rows * nscans;
+    cinfo->progress->completed_passes = 0;
+    cinfo->progress->total_passes = (cinfo->enable_2pass_quant ? 3 : 2);
+    /* Count the input pass as done */
+    master->pass_number++;
+  }
+#endif /* D_MULTISCAN_FILES_SUPPORTED */
+}
+
+
+/*
+ * Per-pass setup.
+ * This is called at the beginning of each output pass.  We determine which
+ * modules will be active during this pass and give them appropriate
+ * start_pass calls.  We also set is_dummy_pass to indicate whether this
+ * is a "real" output pass or a dummy pass for color quantization.
+ * (In the latter case, jdapistd.c will crank the pass to completion.)
+ */
+
+METHODDEF(void)
+prepare_for_output_pass (j_decompress_ptr cinfo)
+{
+  my_master_ptr master = (my_master_ptr) cinfo->master;
+
+  if (master->pub.is_dummy_pass) {
+#ifdef QUANT_2PASS_SUPPORTED
+    /* Final pass of 2-pass quantization */
+    master->pub.is_dummy_pass = FALSE;
+    (*cinfo->cquantize->start_pass) (cinfo, FALSE);
+    (*cinfo->post->start_pass) (cinfo, JBUF_CRANK_DEST);
+    (*cinfo->main->start_pass) (cinfo, JBUF_CRANK_DEST);
+#else
+    ERREXIT(cinfo, JERR_NOT_COMPILED);
+#endif /* QUANT_2PASS_SUPPORTED */
+  } else {
+    if (cinfo->quantize_colors && cinfo->colormap == NULL) {
+      /* Select new quantization method */
+      if (cinfo->two_pass_quantize && cinfo->enable_2pass_quant) {
+	cinfo->cquantize = master->quantizer_2pass;
+	master->pub.is_dummy_pass = TRUE;
+      } else if (cinfo->enable_1pass_quant) {
+	cinfo->cquantize = master->quantizer_1pass;
+      } else {
+	ERREXIT(cinfo, JERR_MODE_CHANGE);
+      }
+    }
+    (*cinfo->codec->start_output_pass) (cinfo);
+    if (! cinfo->raw_data_out) {
+      if (! master->using_merged_upsample)
+	(*cinfo->cconvert->start_pass) (cinfo);
+      (*cinfo->upsample->start_pass) (cinfo);
+      if (cinfo->quantize_colors)
+	(*cinfo->cquantize->start_pass) (cinfo, master->pub.is_dummy_pass);
+      (*cinfo->post->start_pass) (cinfo,
+	    (master->pub.is_dummy_pass ? JBUF_SAVE_AND_PASS : JBUF_PASS_THRU));
+      (*cinfo->main->start_pass) (cinfo, JBUF_PASS_THRU);
+    }
+  }
+
+  /* Set up progress monitor's pass info if present */
+  if (cinfo->progress != NULL) {
+    cinfo->progress->completed_passes = master->pass_number;
+    cinfo->progress->total_passes = master->pass_number +
+				    (master->pub.is_dummy_pass ? 2 : 1);
+    /* In buffered-image mode, we assume one more output pass if EOI not
+     * yet reached, but no more passes if EOI has been reached.
+     */
+    if (cinfo->buffered_image && ! cinfo->inputctl->eoi_reached) {
+      cinfo->progress->total_passes += (cinfo->enable_2pass_quant ? 2 : 1);
+    }
+  }
+}
+
+
+/*
+ * Finish up at end of an output pass.
+ */
+
+METHODDEF(void)
+finish_output_pass (j_decompress_ptr cinfo)
+{
+  my_master_ptr master = (my_master_ptr) cinfo->master;
+
+  if (cinfo->quantize_colors)
+    (*cinfo->cquantize->finish_pass) (cinfo);
+  master->pass_number++;
+}
+
+
+#ifdef D_MULTISCAN_FILES_SUPPORTED
+
+/*
+ * Switch to a new external colormap between output passes.
+ */
+
+GLOBAL(void)
+jpeg_new_colormap (j_decompress_ptr cinfo)
+{
+  my_master_ptr master = (my_master_ptr) cinfo->master;
+
+  /* Prevent application from calling me at wrong times */
+  if (cinfo->global_state != DSTATE_BUFIMAGE)
+    ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);
+
+  if (cinfo->quantize_colors && cinfo->enable_external_quant &&
+      cinfo->colormap != NULL) {
+    /* Select 2-pass quantizer for external colormap use */
+    cinfo->cquantize = master->quantizer_2pass;
+    /* Notify quantizer of colormap change */
+    (*cinfo->cquantize->new_color_map) (cinfo);
+    master->pub.is_dummy_pass = FALSE; /* just in case */
+  } else
+    ERREXIT(cinfo, JERR_MODE_CHANGE);
+}
+
+#endif /* D_MULTISCAN_FILES_SUPPORTED */
+
+
+/*
+ * Initialize master decompression control and select active modules.
+ * This is performed at the start of jpeg_start_decompress.
+ */
+
+GLOBAL(void)
+jinit_master_decompress (j_decompress_ptr cinfo)
+{
+  my_master_ptr master;
+
+  master = (my_master_ptr)
+      (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+				  SIZEOF(my_decomp_master));
+  cinfo->master = (struct jpeg_decomp_master *) master;
+  master->pub.prepare_for_output_pass = prepare_for_output_pass;
+  master->pub.finish_output_pass = finish_output_pass;
+
+  master->pub.is_dummy_pass = FALSE;
+
+  master_selection(cinfo);
+}
diff --git a/uppsrc/plugin/jpg/lib/jdmerge.c b/uppsrc/plugin/jpg/lib/jdmerge.c
new file mode 100644
index 000000000..37444468c
--- /dev/null
+++ b/uppsrc/plugin/jpg/lib/jdmerge.c
@@ -0,0 +1,400 @@
+/*
+ * jdmerge.c
+ *
+ * Copyright (C) 1994-1996, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains code for merged upsampling/color conversion.
+ *
+ * This file combines functions from jdsample.c and jdcolor.c;
+ * read those files first to understand what's going on.
+ *
+ * When the chroma components are to be upsampled by simple replication
+ * (ie, box filtering), we can save some work in color conversion by
+ * calculating all the output pixels corresponding to a pair of chroma
+ * samples at one time.  In the conversion equations
+ *	R = Y           + K1 * Cr
+ *	G = Y + K2 * Cb + K3 * Cr
+ *	B = Y + K4 * Cb
+ * only the Y term varies among the group of pixels corresponding to a pair
+ * of chroma samples, so the rest of the terms can be calculated just once.
+ * At typical sampling ratios, this eliminates half or three-quarters of the
+ * multiplications needed for color conversion.
+ *
+ * This file currently provides implementations for the following cases:
+ *	YCbCr => RGB color conversion only.
+ *	Sampling ratios of 2h1v or 2h2v.
+ *	No scaling needed at upsample time.
+ *	Corner-aligned (non-CCIR601) sampling alignment.
+ * Other special cases could be added, but in most applications these are
+ * the only common cases.  (For uncommon cases we fall back on the more
+ * general code in jdsample.c and jdcolor.c.)
+ */
+
+#define JPEG_INTERNALS
+#include "jinclude.h"
+#include "jpeglib.h"
+
+#ifdef UPSAMPLE_MERGING_SUPPORTED
+
+
+/* Private subobject */
+
+typedef struct {
+  struct jpeg_upsampler pub;	/* public fields */
+
+  /* Pointer to routine to do actual upsampling/conversion of one row group */
+  JMETHOD(void, upmethod, (j_decompress_ptr cinfo,
+			   JSAMPIMAGE input_buf, JDIMENSION in_row_group_ctr,
+			   JSAMPARRAY output_buf));
+
+  /* Private state for YCC->RGB conversion */
+  int * Cr_r_tab;		/* => table for Cr to R conversion */
+  int * Cb_b_tab;		/* => table for Cb to B conversion */
+  INT32 * Cr_g_tab;		/* => table for Cr to G conversion */
+  INT32 * Cb_g_tab;		/* => table for Cb to G conversion */
+
+  /* For 2:1 vertical sampling, we produce two output rows at a time.
+   * We need a "spare" row buffer to hold the second output row if the
+   * application provides just a one-row buffer; we also use the spare
+   * to discard the dummy last row if the image height is odd.
+   */
+  JSAMPROW spare_row;
+  boolean spare_full;		/* T if spare buffer is occupied */
+
+  JDIMENSION out_row_width;	/* samples per output row */
+  JDIMENSION rows_to_go;	/* counts rows remaining in image */
+} my_upsampler;
+
+typedef my_upsampler * my_upsample_ptr;
+
+#define SCALEBITS	16	/* speediest right-shift on some machines */
+#define ONE_HALF	((INT32) 1 << (SCALEBITS-1))
+#define FIX(x)		((INT32) ((x) * (1L<<SCALEBITS) + 0.5))
+
+
+/*
+ * Initialize tables for YCC->RGB colorspace conversion.
+ * This is taken directly from jdcolor.c; see that file for more info.
+ */
+
+LOCAL(void)
+build_ycc_rgb_table (j_decompress_ptr cinfo)
+{
+  my_upsample_ptr upsample = (my_upsample_ptr) cinfo->upsample;
+  int i;
+  INT32 x;
+  SHIFT_TEMPS
+
+  upsample->Cr_r_tab = (int *)
+    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+				(MAXJSAMPLE+1) * SIZEOF(int));
+  upsample->Cb_b_tab = (int *)
+    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+				(MAXJSAMPLE+1) * SIZEOF(int));
+  upsample->Cr_g_tab = (INT32 *)
+    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+				(MAXJSAMPLE+1) * SIZEOF(INT32));
+  upsample->Cb_g_tab = (INT32 *)
+    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+				(MAXJSAMPLE+1) * SIZEOF(INT32));
+
+  for (i = 0, x = -CENTERJSAMPLE; i <= MAXJSAMPLE; i++, x++) {
+    /* i is the actual input pixel value, in the range 0..MAXJSAMPLE */
+    /* The Cb or Cr value we are thinking of is x = i - CENTERJSAMPLE */
+    /* Cr=>R value is nearest int to 1.40200 * x */
+    upsample->Cr_r_tab[i] = (int)
+		    RIGHT_SHIFT(FIX(1.40200) * x + ONE_HALF, SCALEBITS);
+    /* Cb=>B value is nearest int to 1.77200 * x */
+    upsample->Cb_b_tab[i] = (int)
+		    RIGHT_SHIFT(FIX(1.77200) * x + ONE_HALF, SCALEBITS);
+    /* Cr=>G value is scaled-up -0.71414 * x */
+    upsample->Cr_g_tab[i] = (- FIX(0.71414)) * x;
+    /* Cb=>G value is scaled-up -0.34414 * x */
+    /* We also add in ONE_HALF so that need not do it in inner loop */
+    upsample->Cb_g_tab[i] = (- FIX(0.34414)) * x + ONE_HALF;
+  }
+}
+
+
+/*
+ * Initialize for an upsampling pass.
+ */
+
+METHODDEF(void)
+start_pass_merged_upsample (j_decompress_ptr cinfo)
+{
+  my_upsample_ptr upsample = (my_upsample_ptr) cinfo->upsample;
+
+  /* Mark the spare buffer empty */
+  upsample->spare_full = FALSE;
+  /* Initialize total-height counter for detecting bottom of image */
+  upsample->rows_to_go = cinfo->output_height;
+}
+
+
+/*
+ * Control routine to do upsampling (and color conversion).
+ *
+ * The control routine just handles the row buffering considerations.
+ */
+
+METHODDEF(void)
+merged_2v_upsample (j_decompress_ptr cinfo,
+		    JSAMPIMAGE input_buf, JDIMENSION *in_row_group_ctr,
+		    JDIMENSION in_row_groups_avail,
+		    JSAMPARRAY output_buf, JDIMENSION *out_row_ctr,
+		    JDIMENSION out_rows_avail)
+/* 2:1 vertical sampling case: may need a spare row. */
+{
+  my_upsample_ptr upsample = (my_upsample_ptr) cinfo->upsample;
+  JSAMPROW work_ptrs[2];
+  JDIMENSION num_rows;		/* number of rows returned to caller */
+
+  if (upsample->spare_full) {
+    /* If we have a spare row saved from a previous cycle, just return it. */
+    jcopy_sample_rows(& upsample->spare_row, 0, output_buf + *out_row_ctr, 0,
+		      1, upsample->out_row_width);
+    num_rows = 1;
+    upsample->spare_full = FALSE;
+  } else {
+    /* Figure number of rows to return to caller. */
+    num_rows = 2;
+    /* Not more than the distance to the end of the image. */
+    if (num_rows > upsample->rows_to_go)
+      num_rows = upsample->rows_to_go;
+    /* And not more than what the client can accept: */
+    out_rows_avail -= *out_row_ctr;
+    if (num_rows > out_rows_avail)
+      num_rows = out_rows_avail;
+    /* Create output pointer array for upsampler. */
+    work_ptrs[0] = output_buf[*out_row_ctr];
+    if (num_rows > 1) {
+      work_ptrs[1] = output_buf[*out_row_ctr + 1];
+    } else {
+      work_ptrs[1] = upsample->spare_row;
+      upsample->spare_full = TRUE;
+    }
+    /* Now do the upsampling. */
+    (*upsample->upmethod) (cinfo, input_buf, *in_row_group_ctr, work_ptrs);
+  }
+
+  /* Adjust counts */
+  *out_row_ctr += num_rows;
+  upsample->rows_to_go -= num_rows;
+  /* When the buffer is emptied, declare this input row group consumed */
+  if (! upsample->spare_full)
+    (*in_row_group_ctr)++;
+}
+
+
+METHODDEF(void)
+merged_1v_upsample (j_decompress_ptr cinfo,
+		    JSAMPIMAGE input_buf, JDIMENSION *in_row_group_ctr,
+		    JDIMENSION in_row_groups_avail,
+		    JSAMPARRAY output_buf, JDIMENSION *out_row_ctr,
+		    JDIMENSION out_rows_avail)
+/* 1:1 vertical sampling case: much easier, never need a spare row. */
+{
+  my_upsample_ptr upsample = (my_upsample_ptr) cinfo->upsample;
+
+  /* Just do the upsampling. */
+  (*upsample->upmethod) (cinfo, input_buf, *in_row_group_ctr,
+			 output_buf + *out_row_ctr);
+  /* Adjust counts */
+  (*out_row_ctr)++;
+  (*in_row_group_ctr)++;
+}
+
+
+/*
+ * These are the routines invoked by the control routines to do
+ * the actual upsampling/conversion.  One row group is processed per call.
+ *
+ * Note: since we may be writing directly into application-supplied buffers,
+ * we have to be honest about the output width; we can't assume the buffer
+ * has been rounded up to an even width.
+ */
+
+
+/*
+ * Upsample and color convert for the case of 2:1 horizontal and 1:1 vertical.
+ */
+
+METHODDEF(void)
+h2v1_merged_upsample (j_decompress_ptr cinfo,
+		      JSAMPIMAGE input_buf, JDIMENSION in_row_group_ctr,
+		      JSAMPARRAY output_buf)
+{
+  my_upsample_ptr upsample = (my_upsample_ptr) cinfo->upsample;
+  register int y, cred, cgreen, cblue;
+  int cb, cr;
+  register JSAMPROW outptr;
+  JSAMPROW inptr0, inptr1, inptr2;
+  JDIMENSION col;
+  /* copy these pointers into registers if possible */
+  register JSAMPLE * range_limit = cinfo->sample_range_limit;
+  int * Crrtab = upsample->Cr_r_tab;
+  int * Cbbtab = upsample->Cb_b_tab;
+  INT32 * Crgtab = upsample->Cr_g_tab;
+  INT32 * Cbgtab = upsample->Cb_g_tab;
+  SHIFT_TEMPS
+
+  inptr0 = input_buf[0][in_row_group_ctr];
+  inptr1 = input_buf[1][in_row_group_ctr];
+  inptr2 = input_buf[2][in_row_group_ctr];
+  outptr = output_buf[0];
+  /* Loop for each pair of output pixels */
+  for (col = cinfo->output_width >> 1; col > 0; col--) {
+    /* Do the chroma part of the calculation */
+    cb = GETJSAMPLE(*inptr1++);
+    cr = GETJSAMPLE(*inptr2++);
+    cred = Crrtab[cr];
+    cgreen = (int) RIGHT_SHIFT(Cbgtab[cb] + Crgtab[cr], SCALEBITS);
+    cblue = Cbbtab[cb];
+    /* Fetch 2 Y values and emit 2 pixels */
+    y  = GETJSAMPLE(*inptr0++);
+    outptr[RGB_RED] =   range_limit[y + cred];
+    outptr[RGB_GREEN] = range_limit[y + cgreen];
+    outptr[RGB_BLUE] =  range_limit[y + cblue];
+    outptr += RGB_PIXELSIZE;
+    y  = GETJSAMPLE(*inptr0++);
+    outptr[RGB_RED] =   range_limit[y + cred];
+    outptr[RGB_GREEN] = range_limit[y + cgreen];
+    outptr[RGB_BLUE] =  range_limit[y + cblue];
+    outptr += RGB_PIXELSIZE;
+  }
+  /* If image width is odd, do the last output column separately */
+  if (cinfo->output_width & 1) {
+    cb = GETJSAMPLE(*inptr1);
+    cr = GETJSAMPLE(*inptr2);
+    cred = Crrtab[cr];
+    cgreen = (int) RIGHT_SHIFT(Cbgtab[cb] + Crgtab[cr], SCALEBITS);
+    cblue = Cbbtab[cb];
+    y  = GETJSAMPLE(*inptr0);
+    outptr[RGB_RED] =   range_limit[y + cred];
+    outptr[RGB_GREEN] = range_limit[y + cgreen];
+    outptr[RGB_BLUE] =  range_limit[y + cblue];
+  }
+}
+
+
+/*
+ * Upsample and color convert for the case of 2:1 horizontal and 2:1 vertical.
+ */
+
+METHODDEF(void)
+h2v2_merged_upsample (j_decompress_ptr cinfo,
+		      JSAMPIMAGE input_buf, JDIMENSION in_row_group_ctr,
+		      JSAMPARRAY output_buf)
+{
+  my_upsample_ptr upsample = (my_upsample_ptr) cinfo->upsample;
+  register int y, cred, cgreen, cblue;
+  int cb, cr;
+  register JSAMPROW outptr0, outptr1;
+  JSAMPROW inptr00, inptr01, inptr1, inptr2;
+  JDIMENSION col;
+  /* copy these pointers into registers if possible */
+  register JSAMPLE * range_limit = cinfo->sample_range_limit;
+  int * Crrtab = upsample->Cr_r_tab;
+  int * Cbbtab = upsample->Cb_b_tab;
+  INT32 * Crgtab = upsample->Cr_g_tab;
+  INT32 * Cbgtab = upsample->Cb_g_tab;
+  SHIFT_TEMPS
+
+  inptr00 = input_buf[0][in_row_group_ctr*2];
+  inptr01 = input_buf[0][in_row_group_ctr*2 + 1];
+  inptr1 = input_buf[1][in_row_group_ctr];
+  inptr2 = input_buf[2][in_row_group_ctr];
+  outptr0 = output_buf[0];
+  outptr1 = output_buf[1];
+  /* Loop for each group of output pixels */
+  for (col = cinfo->output_width >> 1; col > 0; col--) {
+    /* Do the chroma part of the calculation */
+    cb = GETJSAMPLE(*inptr1++);
+    cr = GETJSAMPLE(*inptr2++);
+    cred = Crrtab[cr];
+    cgreen = (int) RIGHT_SHIFT(Cbgtab[cb] + Crgtab[cr], SCALEBITS);
+    cblue = Cbbtab[cb];
+    /* Fetch 4 Y values and emit 4 pixels */
+    y  = GETJSAMPLE(*inptr00++);
+    outptr0[RGB_RED] =   range_limit[y + cred];
+    outptr0[RGB_GREEN] = range_limit[y + cgreen];
+    outptr0[RGB_BLUE] =  range_limit[y + cblue];
+    outptr0 += RGB_PIXELSIZE;
+    y  = GETJSAMPLE(*inptr00++);
+    outptr0[RGB_RED] =   range_limit[y + cred];
+    outptr0[RGB_GREEN] = range_limit[y + cgreen];
+    outptr0[RGB_BLUE] =  range_limit[y + cblue];
+    outptr0 += RGB_PIXELSIZE;
+    y  = GETJSAMPLE(*inptr01++);
+    outptr1[RGB_RED] =   range_limit[y + cred];
+    outptr1[RGB_GREEN] = range_limit[y + cgreen];
+    outptr1[RGB_BLUE] =  range_limit[y + cblue];
+    outptr1 += RGB_PIXELSIZE;
+    y  = GETJSAMPLE(*inptr01++);
+    outptr1[RGB_RED] =   range_limit[y + cred];
+    outptr1[RGB_GREEN] = range_limit[y + cgreen];
+    outptr1[RGB_BLUE] =  range_limit[y + cblue];
+    outptr1 += RGB_PIXELSIZE;
+  }
+  /* If image width is odd, do the last output column separately */
+  if (cinfo->output_width & 1) {
+    cb = GETJSAMPLE(*inptr1);
+    cr = GETJSAMPLE(*inptr2);
+    cred = Crrtab[cr];
+    cgreen = (int) RIGHT_SHIFT(Cbgtab[cb] + Crgtab[cr], SCALEBITS);
+    cblue = Cbbtab[cb];
+    y  = GETJSAMPLE(*inptr00);
+    outptr0[RGB_RED] =   range_limit[y + cred];
+    outptr0[RGB_GREEN] = range_limit[y + cgreen];
+    outptr0[RGB_BLUE] =  range_limit[y + cblue];
+    y  = GETJSAMPLE(*inptr01);
+    outptr1[RGB_RED] =   range_limit[y + cred];
+    outptr1[RGB_GREEN] = range_limit[y + cgreen];
+    outptr1[RGB_BLUE] =  range_limit[y + cblue];
+  }
+}
+
+
+/*
+ * Module initialization routine for merged upsampling/color conversion.
+ *
+ * NB: this is called under the conditions determined by use_merged_upsample()
+ * in jdmaster.c.  That routine MUST correspond to the actual capabilities
+ * of this module; no safety checks are made here.
+ */
+
+GLOBAL(void)
+jinit_merged_upsampler (j_decompress_ptr cinfo)
+{
+  my_upsample_ptr upsample;
+
+  upsample = (my_upsample_ptr)
+    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+				SIZEOF(my_upsampler));
+  cinfo->upsample = (struct jpeg_upsampler *) upsample;
+  upsample->pub.start_pass = start_pass_merged_upsample;
+  upsample->pub.need_context_rows = FALSE;
+
+  upsample->out_row_width = cinfo->output_width * cinfo->out_color_components;
+
+  if (cinfo->max_v_samp_factor == 2) {
+    upsample->pub.upsample = merged_2v_upsample;
+    upsample->upmethod = h2v2_merged_upsample;
+    /* Allocate a spare row buffer */
+    upsample->spare_row = (JSAMPROW)
+      (*cinfo->mem->alloc_large) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+		(size_t) (upsample->out_row_width * SIZEOF(JSAMPLE)));
+  } else {
+    upsample->pub.upsample = merged_1v_upsample;
+    upsample->upmethod = h2v1_merged_upsample;
+    /* No spare row needed */
+    upsample->spare_row = NULL;
+  }
+
+  build_ycc_rgb_table(cinfo);
+}
+
+#endif /* UPSAMPLE_MERGING_SUPPORTED */
diff --git a/uppsrc/plugin/jpg/lib/jdphuff.c b/uppsrc/plugin/jpg/lib/jdphuff.c
new file mode 100644
index 000000000..0da7db2f8
--- /dev/null
+++ b/uppsrc/plugin/jpg/lib/jdphuff.c
@@ -0,0 +1,675 @@
+/*
+ * jdphuff.c
+ *
+ * Copyright (C) 1995-1998, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains Huffman entropy decoding routines for progressive JPEG.
+ *
+ * Much of the complexity here has to do with supporting input suspension.
+ * If the data source module demands suspension, we want to be able to back
+ * up to the start of the current MCU.  To do this, we copy state variables
+ * into local working storage, and update them back to the permanent
+ * storage only upon successful completion of an MCU.
+ */
+
+#define JPEG_INTERNALS
+#include "jinclude.h"
+#include "jpeglib.h"
+#include "jlossy.h"		/* Private declarations for lossy subsystem */
+#include "jdhuff.h"		/* Declarations shared with jd*huff.c */
+
+
+#ifdef D_PROGRESSIVE_SUPPORTED
+
+/*
+ * Private entropy decoder object for progressive Huffman decoding.
+ *
+ * The savable_state subrecord contains fields that change within an MCU,
+ * but must not be updated permanently until we complete the MCU.
+ */
+
+typedef struct {
+  unsigned int EOBRUN;			/* remaining EOBs in EOBRUN */
+  int last_dc_val[MAX_COMPS_IN_SCAN];	/* last DC coef for each component */
+} savable_state;
+
+/* This macro is to work around compilers with missing or broken
+ * structure assignment.  You'll need to fix this code if you have
+ * such a compiler and you change MAX_COMPS_IN_SCAN.
+ */
+
+#ifndef NO_STRUCT_ASSIGN
+#define ASSIGN_STATE(dest,src)  ((dest) = (src))
+#else
+#if MAX_COMPS_IN_SCAN == 4
+#define ASSIGN_STATE(dest,src)  \
+	((dest).EOBRUN = (src).EOBRUN, \
+	 (dest).last_dc_val[0] = (src).last_dc_val[0], \
+	 (dest).last_dc_val[1] = (src).last_dc_val[1], \
+	 (dest).last_dc_val[2] = (src).last_dc_val[2], \
+	 (dest).last_dc_val[3] = (src).last_dc_val[3])
+#endif
+#endif
+
+
+typedef struct {
+  huffd_common_fields;		/* Fields shared with other entropy decoders */
+
+  /* These fields are loaded into local variables at start of each MCU.
+   * In case of suspension, we exit WITHOUT updating them.
+   */
+  savable_state saved;		/* Other state at start of MCU */
+
+  /* These fields are NOT loaded into local working state. */
+  unsigned int restarts_to_go;	/* MCUs left in this restart interval */
+
+  /* Pointers to derived tables (these workspaces have image lifespan) */
+  d_derived_tbl * derived_tbls[NUM_HUFF_TBLS];
+
+  d_derived_tbl * ac_derived_tbl; /* active table during an AC scan */
+} phuff_entropy_decoder;
+
+typedef phuff_entropy_decoder * phuff_entropy_ptr;
+
+/* Forward declarations */
+METHODDEF(boolean) decode_mcu_DC_first JPP((j_decompress_ptr cinfo,
+					    JBLOCKROW *MCU_data));
+METHODDEF(boolean) decode_mcu_AC_first JPP((j_decompress_ptr cinfo,
+					    JBLOCKROW *MCU_data));
+METHODDEF(boolean) decode_mcu_DC_refine JPP((j_decompress_ptr cinfo,
+					     JBLOCKROW *MCU_data));
+METHODDEF(boolean) decode_mcu_AC_refine JPP((j_decompress_ptr cinfo,
+					     JBLOCKROW *MCU_data));
+
+
+/*
+ * Initialize for a Huffman-compressed scan.
+ */
+
+METHODDEF(void)
+start_pass_phuff_decoder (j_decompress_ptr cinfo)
+{
+  j_lossy_d_ptr lossyd = (j_lossy_d_ptr) cinfo->codec;
+  phuff_entropy_ptr entropy = (phuff_entropy_ptr) lossyd->entropy_private;
+  boolean is_DC_band, bad;
+  int ci, coefi, tbl;
+  int *coef_bit_ptr;
+  jpeg_component_info * compptr;
+
+  is_DC_band = (cinfo->Ss == 0);
+
+  /* Validate scan parameters */
+  bad = FALSE;
+  if (is_DC_band) {
+    if (cinfo->Se != 0)
+      bad = TRUE;
+  } else {
+    /* need not check Ss/Se < 0 since they came from unsigned bytes */
+    if (cinfo->Ss > cinfo->Se || cinfo->Se >= DCTSIZE2)
+      bad = TRUE;
+    /* AC scans may have only one component */
+    if (cinfo->comps_in_scan != 1)
+      bad = TRUE;
+  }
+  if (cinfo->Ah != 0) {
+    /* Successive approximation refinement scan: must have Al = Ah-1. */
+    if (cinfo->Al != cinfo->Ah-1)
+      bad = TRUE;
+  }
+  if (cinfo->Al > 13)		/* need not check for < 0 */
+    bad = TRUE;
+  /* Arguably the maximum Al value should be less than 13 for 8-bit precision,
+   * but the spec doesn't say so, and we try to be liberal about what we
+   * accept.  Note: large Al values could result in out-of-range DC
+   * coefficients during early scans, leading to bizarre displays due to
+   * overflows in the IDCT math.  But we won't crash.
+   */
+  if (bad)
+    ERREXIT4(cinfo, JERR_BAD_PROGRESSION,
+	     cinfo->Ss, cinfo->Se, cinfo->Ah, cinfo->Al);
+  /* Update progression status, and verify that scan order is legal.
+   * Note that inter-scan inconsistencies are treated as warnings
+   * not fatal errors ... not clear if this is right way to behave.
+   */
+  for (ci = 0; ci < cinfo->comps_in_scan; ci++) {
+    int cindex = cinfo->cur_comp_info[ci]->component_index;
+    coef_bit_ptr = & cinfo->coef_bits[cindex][0];
+    if (!is_DC_band && coef_bit_ptr[0] < 0) /* AC without prior DC scan */
+      WARNMS2(cinfo, JWRN_BOGUS_PROGRESSION, cindex, 0);
+    for (coefi = cinfo->Ss; coefi <= cinfo->Se; coefi++) {
+      int expected = (coef_bit_ptr[coefi] < 0) ? 0 : coef_bit_ptr[coefi];
+      if (cinfo->Ah != expected)
+	WARNMS2(cinfo, JWRN_BOGUS_PROGRESSION, cindex, coefi);
+      coef_bit_ptr[coefi] = cinfo->Al;
+    }
+  }
+
+  /* Select MCU decoding routine */
+  if (cinfo->Ah == 0) {
+    if (is_DC_band)
+      lossyd->entropy_decode_mcu = decode_mcu_DC_first;
+    else
+      lossyd->entropy_decode_mcu = decode_mcu_AC_first;
+  } else {
+    if (is_DC_band)
+      lossyd->entropy_decode_mcu = decode_mcu_DC_refine;
+    else
+      lossyd->entropy_decode_mcu = decode_mcu_AC_refine;
+  }
+
+  for (ci = 0; ci < cinfo->comps_in_scan; ci++) {
+    compptr = cinfo->cur_comp_info[ci];
+    /* Make sure requested tables are present, and compute derived tables.
+     * We may build same derived table more than once, but it's not expensive.
+     */
+    if (is_DC_band) {
+      if (cinfo->Ah == 0) {	/* DC refinement needs no table */
+	tbl = compptr->dc_tbl_no;
+	jpeg_make_d_derived_tbl(cinfo, TRUE, tbl,
+				& entropy->derived_tbls[tbl]);
+      }
+    } else {
+      tbl = compptr->ac_tbl_no;
+      jpeg_make_d_derived_tbl(cinfo, FALSE, tbl,
+			      & entropy->derived_tbls[tbl]);
+      /* remember the single active table */
+      entropy->ac_derived_tbl = entropy->derived_tbls[tbl];
+    }
+    /* Initialize DC predictions to 0 */
+    entropy->saved.last_dc_val[ci] = 0;
+  }
+
+  /* Initialize bitread state variables */
+  entropy->bitstate.bits_left = 0;
+  entropy->bitstate.get_buffer = 0; /* unnecessary, but keeps Purify quiet */
+  entropy->insufficient_data = FALSE;
+
+  /* Initialize private state variables */
+  entropy->saved.EOBRUN = 0;
+
+  /* Initialize restart counter */
+  entropy->restarts_to_go = cinfo->restart_interval;
+}
+
+
+/*
+ * Figure F.12: extend sign bit.
+ * On some machines, a shift and add will be faster than a table lookup.
+ */
+
+#ifdef AVOID_TABLES
+
+#define HUFF_EXTEND(x,s)  ((x) < (1<<((s)-1)) ? (x) + (((-1)<<(s)) + 1) : (x))
+
+#else
+
+#define HUFF_EXTEND(x,s)  ((x) < extend_test[s] ? (x) + extend_offset[s] : (x))
+
+static const int extend_test[16] =   /* entry n is 2**(n-1) */
+  { 0, 0x0001, 0x0002, 0x0004, 0x0008, 0x0010, 0x0020, 0x0040, 0x0080,
+    0x0100, 0x0200, 0x0400, 0x0800, 0x1000, 0x2000, 0x4000 };
+
+static const int extend_offset[16] = /* entry n is (-1 << n) + 1 */
+  { 0, ((-1)<<1) + 1, ((-1)<<2) + 1, ((-1)<<3) + 1, ((-1)<<4) + 1,
+    ((-1)<<5) + 1, ((-1)<<6) + 1, ((-1)<<7) + 1, ((-1)<<8) + 1,
+    ((-1)<<9) + 1, ((-1)<<10) + 1, ((-1)<<11) + 1, ((-1)<<12) + 1,
+    ((-1)<<13) + 1, ((-1)<<14) + 1, ((-1)<<15) + 1 };
+
+#endif /* AVOID_TABLES */
+
+
+/*
+ * Check for a restart marker & resynchronize decoder.
+ * Returns FALSE if must suspend.
+ */
+
+LOCAL(boolean)
+process_restart (j_decompress_ptr cinfo)
+{
+  j_lossy_d_ptr lossyd = (j_lossy_d_ptr) cinfo->codec;
+  phuff_entropy_ptr entropy = (phuff_entropy_ptr) lossyd->entropy_private;
+  int ci;
+
+  /* Throw away any unused bits remaining in bit buffer; */
+  /* include any full bytes in next_marker's count of discarded bytes */
+  cinfo->marker->discarded_bytes += entropy->bitstate.bits_left / 8;
+  entropy->bitstate.bits_left = 0;
+
+  /* Advance past the RSTn marker */
+  if (! (*cinfo->marker->read_restart_marker) (cinfo))
+    return FALSE;
+
+  /* Re-initialize DC predictions to 0 */
+  for (ci = 0; ci < cinfo->comps_in_scan; ci++)
+    entropy->saved.last_dc_val[ci] = 0;
+  /* Re-init EOB run count, too */
+  entropy->saved.EOBRUN = 0;
+
+  /* Reset restart counter */
+  entropy->restarts_to_go = cinfo->restart_interval;
+
+  /* Reset out-of-data flag, unless read_restart_marker left us smack up
+   * against a marker.  In that case we will end up treating the next data
+   * segment as empty, and we can avoid producing bogus output pixels by
+   * leaving the flag set.
+   */
+  if (cinfo->unread_marker == 0)
+    entropy->insufficient_data = FALSE;
+
+  return TRUE;
+}
+
+
+/*
+ * Huffman MCU decoding.
+ * Each of these routines decodes and returns one MCU's worth of
+ * Huffman-compressed coefficients.
+ * The coefficients are reordered from zigzag order into natural array order,
+ * but are not dequantized.
+ *
+ * The i'th block of the MCU is stored into the block pointed to by
+ * MCU_data[i].  WE ASSUME THIS AREA IS INITIALLY ZEROED BY THE CALLER.
+ *
+ * We return FALSE if data source requested suspension.  In that case no
+ * changes have been made to permanent state.  (Exception: some output
+ * coefficients may already have been assigned.  This is harmless for
+ * spectral selection, since we'll just re-assign them on the next call.
+ * Successive approximation AC refinement has to be more careful, however.)
+ */
+
+/*
+ * MCU decoding for DC initial scan (either spectral selection,
+ * or first pass of successive approximation).
+ */
+
+METHODDEF(boolean)
+decode_mcu_DC_first (j_decompress_ptr cinfo, JBLOCKROW *MCU_data)
+{
+  j_lossy_d_ptr lossyd = (j_lossy_d_ptr) cinfo->codec;
+  phuff_entropy_ptr entropy = (phuff_entropy_ptr) lossyd->entropy_private;
+  int Al = cinfo->Al;
+  register int s, r;
+  int blkn, ci;
+  JBLOCKROW block;
+  BITREAD_STATE_VARS;
+  savable_state state;
+  d_derived_tbl * tbl;
+  jpeg_component_info * compptr;
+
+  /* Process restart marker if needed; may have to suspend */
+  if (cinfo->restart_interval) {
+    if (entropy->restarts_to_go == 0)
+      if (! process_restart(cinfo))
+	return FALSE;
+  }
+
+  /* If we've run out of data, just leave the MCU set to zeroes.
+   * This way, we return uniform gray for the remainder of the segment.
+   */
+  if (! entropy->insufficient_data) {
+
+    /* Load up working state */
+    BITREAD_LOAD_STATE(cinfo,entropy->bitstate);
+    ASSIGN_STATE(state, entropy->saved);
+
+    /* Outer loop handles each block in the MCU */
+
+    for (blkn = 0; blkn < cinfo->data_units_in_MCU; blkn++) {
+      block = MCU_data[blkn];
+      ci = cinfo->MCU_membership[blkn];
+      compptr = cinfo->cur_comp_info[ci];
+      tbl = entropy->derived_tbls[compptr->dc_tbl_no];
+
+      /* Decode a single block's worth of coefficients */
+
+      /* Section F.2.2.1: decode the DC coefficient difference */
+      HUFF_DECODE(s, br_state, tbl, return FALSE, label1);
+      if (s) {
+	CHECK_BIT_BUFFER(br_state, s, return FALSE);
+	r = GET_BITS(s);
+	s = HUFF_EXTEND(r, s);
+      }
+
+      /* Convert DC difference to actual value, update last_dc_val */
+      s += state.last_dc_val[ci];
+      state.last_dc_val[ci] = s;
+      /* Scale and output the coefficient (assumes jpeg_natural_order[0]=0) */
+      (*block)[0] = (JCOEF) (s << Al);
+    }
+
+    /* Completed MCU, so update state */
+    BITREAD_SAVE_STATE(cinfo,entropy->bitstate);
+    ASSIGN_STATE(entropy->saved, state);
+  }
+
+  /* Account for restart interval (no-op if not using restarts) */
+  entropy->restarts_to_go--;
+
+  return TRUE;
+}
+
+
+/*
+ * MCU decoding for AC initial scan (either spectral selection,
+ * or first pass of successive approximation).
+ */
+
+METHODDEF(boolean)
+decode_mcu_AC_first (j_decompress_ptr cinfo, JBLOCKROW *MCU_data)
+{
+  j_lossy_d_ptr lossyd = (j_lossy_d_ptr) cinfo->codec;
+  phuff_entropy_ptr entropy = (phuff_entropy_ptr) lossyd->entropy_private;
+  int Se = cinfo->Se;
+  int Al = cinfo->Al;
+  register int s, k, r;
+  unsigned int EOBRUN;
+  JBLOCKROW block;
+  BITREAD_STATE_VARS;
+  d_derived_tbl * tbl;
+
+  /* Process restart marker if needed; may have to suspend */
+  if (cinfo->restart_interval) {
+    if (entropy->restarts_to_go == 0)
+      if (! process_restart(cinfo))
+	return FALSE;
+  }
+
+  /* If we've run out of data, just leave the MCU set to zeroes.
+   * This way, we return uniform gray for the remainder of the segment.
+   */
+  if (! entropy->insufficient_data) {
+
+    /* Load up working state.
+     * We can avoid loading/saving bitread state if in an EOB run.
+     */
+    EOBRUN = entropy->saved.EOBRUN;	/* only part of saved state we need */
+
+    /* There is always only one block per MCU */
+
+    if (EOBRUN > 0)		/* if it's a band of zeroes... */
+      EOBRUN--;			/* ...process it now (we do nothing) */
+    else {
+      BITREAD_LOAD_STATE(cinfo,entropy->bitstate);
+      block = MCU_data[0];
+      tbl = entropy->ac_derived_tbl;
+
+      for (k = cinfo->Ss; k <= Se; k++) {
+	HUFF_DECODE(s, br_state, tbl, return FALSE, label2);
+	r = s >> 4;
+	s &= 15;
+	if (s) {
+	  k += r;
+	  CHECK_BIT_BUFFER(br_state, s, return FALSE);
+	  r = GET_BITS(s);
+	  s = HUFF_EXTEND(r, s);
+	  /* Scale and output coefficient in natural (dezigzagged) order */
+	  (*block)[jpeg_natural_order[k]] = (JCOEF) (s << Al);
+	} else {
+	  if (r == 15) {	/* ZRL */
+	    k += 15;		/* skip 15 zeroes in band */
+	  } else {		/* EOBr, run length is 2^r + appended bits */
+	    EOBRUN = 1 << r;
+	    if (r) {		/* EOBr, r > 0 */
+	      CHECK_BIT_BUFFER(br_state, r, return FALSE);
+	      r = GET_BITS(r);
+	      EOBRUN += r;
+	    }
+	    EOBRUN--;		/* this band is processed at this moment */
+	    break;		/* force end-of-band */
+	  }
+	}
+      }
+
+      BITREAD_SAVE_STATE(cinfo,entropy->bitstate);
+    }
+
+    /* Completed MCU, so update state */
+    entropy->saved.EOBRUN = EOBRUN;	/* only part of saved state we need */
+  }
+
+  /* Account for restart interval (no-op if not using restarts) */
+  entropy->restarts_to_go--;
+
+  return TRUE;
+}
+
+
+/*
+ * MCU decoding for DC successive approximation refinement scan.
+ * Note: we assume such scans can be multi-component, although the spec
+ * is not very clear on the point.
+ */
+
+METHODDEF(boolean)
+decode_mcu_DC_refine (j_decompress_ptr cinfo, JBLOCKROW *MCU_data)
+{
+  j_lossy_d_ptr lossyd = (j_lossy_d_ptr) cinfo->codec;
+  phuff_entropy_ptr entropy = (phuff_entropy_ptr) lossyd->entropy_private;
+  int p1 = 1 << cinfo->Al;	/* 1 in the bit position being coded */
+  int blkn;
+  JBLOCKROW block;
+  BITREAD_STATE_VARS;
+
+  /* Process restart marker if needed; may have to suspend */
+  if (cinfo->restart_interval) {
+    if (entropy->restarts_to_go == 0)
+      if (! process_restart(cinfo))
+	return FALSE;
+  }
+
+  /* Not worth the cycles to check insufficient_data here,
+   * since we will not change the data anyway if we read zeroes.
+   */
+
+  /* Load up working state */
+  BITREAD_LOAD_STATE(cinfo,entropy->bitstate);
+
+  /* Outer loop handles each block in the MCU */
+
+  for (blkn = 0; blkn < cinfo->data_units_in_MCU; blkn++) {
+    block = MCU_data[blkn];
+
+    /* Encoded data is simply the next bit of the two's-complement DC value */
+    CHECK_BIT_BUFFER(br_state, 1, return FALSE);
+    if (GET_BITS(1))
+      (*block)[0] |= p1;
+    /* Note: since we use |=, repeating the assignment later is safe */
+  }
+
+  /* Completed MCU, so update state */
+  BITREAD_SAVE_STATE(cinfo,entropy->bitstate);
+
+  /* Account for restart interval (no-op if not using restarts) */
+  entropy->restarts_to_go--;
+
+  return TRUE;
+}
+
+
+/*
+ * MCU decoding for AC successive approximation refinement scan.
+ */
+
+METHODDEF(boolean)
+decode_mcu_AC_refine (j_decompress_ptr cinfo, JBLOCKROW *MCU_data)
+{
+  j_lossy_d_ptr lossyd = (j_lossy_d_ptr) cinfo->codec;
+  phuff_entropy_ptr entropy = (phuff_entropy_ptr) lossyd->entropy_private;
+  int Se = cinfo->Se;
+  int p1 = 1 << cinfo->Al;	/* 1 in the bit position being coded */
+  int m1 = (-1) << cinfo->Al;	/* -1 in the bit position being coded */
+  register int s, k, r;
+  unsigned int EOBRUN;
+  JBLOCKROW block;
+  JCOEFPTR thiscoef;
+  BITREAD_STATE_VARS;
+  d_derived_tbl * tbl;
+  int num_newnz;
+  int newnz_pos[DCTSIZE2];
+
+  /* Process restart marker if needed; may have to suspend */
+  if (cinfo->restart_interval) {
+    if (entropy->restarts_to_go == 0)
+      if (! process_restart(cinfo))
+	return FALSE;
+  }
+
+  /* If we've run out of data, don't modify the MCU.
+   */
+  if (! entropy->insufficient_data) {
+
+    /* Load up working state */
+    BITREAD_LOAD_STATE(cinfo,entropy->bitstate);
+    EOBRUN = entropy->saved.EOBRUN; /* only part of saved state we need */
+
+    /* There is always only one block per MCU */
+    block = MCU_data[0];
+    tbl = entropy->ac_derived_tbl;
+
+    /* If we are forced to suspend, we must undo the assignments to any newly
+     * nonzero coefficients in the block, because otherwise we'd get confused
+     * next time about which coefficients were already nonzero.
+     * But we need not undo addition of bits to already-nonzero coefficients;
+     * instead, we can test the current bit to see if we already did it.
+     */
+    num_newnz = 0;
+
+    /* initialize coefficient loop counter to start of band */
+    k = cinfo->Ss;
+
+    if (EOBRUN == 0) {
+      for (; k <= Se; k++) {
+	HUFF_DECODE(s, br_state, tbl, goto undoit, label3);
+	r = s >> 4;
+	s &= 15;
+	if (s) {
+	  if (s != 1)		/* size of new coef should always be 1 */
+	    WARNMS(cinfo, JWRN_HUFF_BAD_CODE);
+	  CHECK_BIT_BUFFER(br_state, 1, goto undoit);
+	  if (GET_BITS(1))
+	    s = p1;		/* newly nonzero coef is positive */
+	  else
+	    s = m1;		/* newly nonzero coef is negative */
+	} else {
+	  if (r != 15) {
+	    EOBRUN = 1 << r;	/* EOBr, run length is 2^r + appended bits */
+	    if (r) {
+	      CHECK_BIT_BUFFER(br_state, r, goto undoit);
+	      r = GET_BITS(r);
+	      EOBRUN += r;
+	    }
+	    break;		/* rest of block is handled by EOB logic */
+	  }
+	  /* note s = 0 for processing ZRL */
+	}
+	/* Advance over already-nonzero coefs and r still-zero coefs,
+	 * appending correction bits to the nonzeroes.  A correction bit is 1
+	 * if the absolute value of the coefficient must be increased.
+	 */
+	do {
+	  thiscoef = *block + jpeg_natural_order[k];
+	  if (*thiscoef != 0) {
+	    CHECK_BIT_BUFFER(br_state, 1, goto undoit);
+	    if (GET_BITS(1)) {
+	      if ((*thiscoef & p1) == 0) { /* do nothing if already set it */
+		if (*thiscoef >= 0)
+		  *thiscoef += p1;
+		else
+		  *thiscoef += m1;
+	      }
+	    }
+	  } else {
+	    if (--r < 0)
+	      break;		/* reached target zero coefficient */
+	  }
+	  k++;
+	} while (k <= Se);
+	if (s) {
+	  int pos = jpeg_natural_order[k];
+	  /* Output newly nonzero coefficient */
+	  (*block)[pos] = (JCOEF) s;
+	  /* Remember its position in case we have to suspend */
+	  newnz_pos[num_newnz++] = pos;
+	}
+      }
+    }
+
+    if (EOBRUN > 0) {
+      /* Scan any remaining coefficient positions after the end-of-band
+       * (the last newly nonzero coefficient, if any).  Append a correction
+       * bit to each already-nonzero coefficient.  A correction bit is 1
+       * if the absolute value of the coefficient must be increased.
+       */
+      for (; k <= Se; k++) {
+	thiscoef = *block + jpeg_natural_order[k];
+	if (*thiscoef != 0) {
+	  CHECK_BIT_BUFFER(br_state, 1, goto undoit);
+	  if (GET_BITS(1)) {
+	    if ((*thiscoef & p1) == 0) { /* do nothing if already changed it */
+	      if (*thiscoef >= 0)
+		*thiscoef += p1;
+	      else
+		*thiscoef += m1;
+	    }
+	  }
+	}
+      }
+      /* Count one block completed in EOB run */
+      EOBRUN--;
+    }
+
+    /* Completed MCU, so update state */
+    BITREAD_SAVE_STATE(cinfo,entropy->bitstate);
+    entropy->saved.EOBRUN = EOBRUN; /* only part of saved state we need */
+  }
+
+  /* Account for restart interval (no-op if not using restarts) */
+  entropy->restarts_to_go--;
+
+  return TRUE;
+
+undoit:
+  /* Re-zero any output coefficients that we made newly nonzero */
+  while (num_newnz > 0)
+    (*block)[newnz_pos[--num_newnz]] = 0;
+
+  return FALSE;
+}
+
+
+/*
+ * Module initialization routine for progressive Huffman entropy decoding.
+ */
+
+GLOBAL(void)
+jinit_phuff_decoder (j_decompress_ptr cinfo)
+{
+  j_lossy_d_ptr lossyd = (j_lossy_d_ptr) cinfo->codec;
+  phuff_entropy_ptr entropy;
+  int *coef_bit_ptr;
+  int ci, i;
+
+  entropy = (phuff_entropy_ptr)
+    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+				SIZEOF(phuff_entropy_decoder));
+  lossyd->entropy_private = (void *) entropy;
+  lossyd->entropy_start_pass = start_pass_phuff_decoder;
+
+  /* Mark derived tables unallocated */
+  for (i = 0; i < NUM_HUFF_TBLS; i++) {
+    entropy->derived_tbls[i] = NULL;
+  }
+
+  /* Create progression status table */
+  cinfo->coef_bits = (int (*)[DCTSIZE2])
+    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+				cinfo->num_components*DCTSIZE2*SIZEOF(int));
+  coef_bit_ptr = & cinfo->coef_bits[0][0];
+  for (ci = 0; ci < cinfo->num_components; ci++)
+    for (i = 0; i < DCTSIZE2; i++)
+      *coef_bit_ptr++ = -1;
+}
+
+#endif /* D_PROGRESSIVE_SUPPORTED */
diff --git a/uppsrc/plugin/jpg/lib/jdpostct.c b/uppsrc/plugin/jpg/lib/jdpostct.c
new file mode 100644
index 000000000..571563d72
--- /dev/null
+++ b/uppsrc/plugin/jpg/lib/jdpostct.c
@@ -0,0 +1,290 @@
+/*
+ * jdpostct.c
+ *
+ * Copyright (C) 1994-1996, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains the decompression postprocessing controller.
+ * This controller manages the upsampling, color conversion, and color
+ * quantization/reduction steps; specifically, it controls the buffering
+ * between upsample/color conversion and color quantization/reduction.
+ *
+ * If no color quantization/reduction is required, then this module has no
+ * work to do, and it just hands off to the upsample/color conversion code.
+ * An integrated upsample/convert/quantize process would replace this module
+ * entirely.
+ */
+
+#define JPEG_INTERNALS
+#include "jinclude.h"
+#include "jpeglib.h"
+
+
+/* Private buffer controller object */
+
+typedef struct {
+  struct jpeg_d_post_controller pub; /* public fields */
+
+  /* Color quantization source buffer: this holds output data from
+   * the upsample/color conversion step to be passed to the quantizer.
+   * For two-pass color quantization, we need a full-image buffer;
+   * for one-pass operation, a strip buffer is sufficient.
+   */
+  jvirt_sarray_ptr whole_image;	/* virtual array, or NULL if one-pass */
+  JSAMPARRAY buffer;		/* strip buffer, or current strip of virtual */
+  JDIMENSION strip_height;	/* buffer size in rows */
+  /* for two-pass mode only: */
+  JDIMENSION starting_row;	/* row # of first row in current strip */
+  JDIMENSION next_row;		/* index of next row to fill/empty in strip */
+} my_post_controller;
+
+typedef my_post_controller * my_post_ptr;
+
+
+/* Forward declarations */
+METHODDEF(void) post_process_1pass
+	JPP((j_decompress_ptr cinfo,
+	     JSAMPIMAGE input_buf, JDIMENSION *in_row_group_ctr,
+	     JDIMENSION in_row_groups_avail,
+	     JSAMPARRAY output_buf, JDIMENSION *out_row_ctr,
+	     JDIMENSION out_rows_avail));
+#ifdef QUANT_2PASS_SUPPORTED
+METHODDEF(void) post_process_prepass
+	JPP((j_decompress_ptr cinfo,
+	     JSAMPIMAGE input_buf, JDIMENSION *in_row_group_ctr,
+	     JDIMENSION in_row_groups_avail,
+	     JSAMPARRAY output_buf, JDIMENSION *out_row_ctr,
+	     JDIMENSION out_rows_avail));
+METHODDEF(void) post_process_2pass
+	JPP((j_decompress_ptr cinfo,
+	     JSAMPIMAGE input_buf, JDIMENSION *in_row_group_ctr,
+	     JDIMENSION in_row_groups_avail,
+	     JSAMPARRAY output_buf, JDIMENSION *out_row_ctr,
+	     JDIMENSION out_rows_avail));
+#endif
+
+
+/*
+ * Initialize for a processing pass.
+ */
+
+METHODDEF(void)
+start_pass_dpost (j_decompress_ptr cinfo, J_BUF_MODE pass_mode)
+{
+  my_post_ptr post = (my_post_ptr) cinfo->post;
+
+  switch (pass_mode) {
+  case JBUF_PASS_THRU:
+    if (cinfo->quantize_colors) {
+      /* Single-pass processing with color quantization. */
+      post->pub.post_process_data = post_process_1pass;
+      /* We could be doing buffered-image output before starting a 2-pass
+       * color quantization; in that case, jinit_d_post_controller did not
+       * allocate a strip buffer.  Use the virtual-array buffer as workspace.
+       */
+      if (post->buffer == NULL) {
+	post->buffer = (*cinfo->mem->access_virt_sarray)
+	  ((j_common_ptr) cinfo, post->whole_image,
+	   (JDIMENSION) 0, post->strip_height, TRUE);
+      }
+    } else {
+      /* For single-pass processing without color quantization,
+       * I have no work to do; just call the upsampler directly.
+       */
+      post->pub.post_process_data = cinfo->upsample->upsample;
+    }
+    break;
+#ifdef QUANT_2PASS_SUPPORTED
+  case JBUF_SAVE_AND_PASS:
+    /* First pass of 2-pass quantization */
+    if (post->whole_image == NULL)
+      ERREXIT(cinfo, JERR_BAD_BUFFER_MODE);
+    post->pub.post_process_data = post_process_prepass;
+    break;
+  case JBUF_CRANK_DEST:
+    /* Second pass of 2-pass quantization */
+    if (post->whole_image == NULL)
+      ERREXIT(cinfo, JERR_BAD_BUFFER_MODE);
+    post->pub.post_process_data = post_process_2pass;
+    break;
+#endif /* QUANT_2PASS_SUPPORTED */
+  default:
+    ERREXIT(cinfo, JERR_BAD_BUFFER_MODE);
+    break;
+  }
+  post->starting_row = post->next_row = 0;
+}
+
+
+/*
+ * Process some data in the one-pass (strip buffer) case.
+ * This is used for color precision reduction as well as one-pass quantization.
+ */
+
+METHODDEF(void)
+post_process_1pass (j_decompress_ptr cinfo,
+		    JSAMPIMAGE input_buf, JDIMENSION *in_row_group_ctr,
+		    JDIMENSION in_row_groups_avail,
+		    JSAMPARRAY output_buf, JDIMENSION *out_row_ctr,
+		    JDIMENSION out_rows_avail)
+{
+  my_post_ptr post = (my_post_ptr) cinfo->post;
+  JDIMENSION num_rows, max_rows;
+
+  /* Fill the buffer, but not more than what we can dump out in one go. */
+  /* Note we rely on the upsampler to detect bottom of image. */
+  max_rows = out_rows_avail - *out_row_ctr;
+  if (max_rows > post->strip_height)
+    max_rows = post->strip_height;
+  num_rows = 0;
+  (*cinfo->upsample->upsample) (cinfo,
+		input_buf, in_row_group_ctr, in_row_groups_avail,
+		post->buffer, &num_rows, max_rows);
+  /* Quantize and emit data. */
+  (*cinfo->cquantize->color_quantize) (cinfo,
+		post->buffer, output_buf + *out_row_ctr, (int) num_rows);
+  *out_row_ctr += num_rows;
+}
+
+
+#ifdef QUANT_2PASS_SUPPORTED
+
+/*
+ * Process some data in the first pass of 2-pass quantization.
+ */
+
+METHODDEF(void)
+post_process_prepass (j_decompress_ptr cinfo,
+		      JSAMPIMAGE input_buf, JDIMENSION *in_row_group_ctr,
+		      JDIMENSION in_row_groups_avail,
+		      JSAMPARRAY output_buf, JDIMENSION *out_row_ctr,
+		      JDIMENSION out_rows_avail)
+{
+  my_post_ptr post = (my_post_ptr) cinfo->post;
+  JDIMENSION old_next_row, num_rows;
+
+  /* Reposition virtual buffer if at start of strip. */
+  if (post->next_row == 0) {
+    post->buffer = (*cinfo->mem->access_virt_sarray)
+	((j_common_ptr) cinfo, post->whole_image,
+	 post->starting_row, post->strip_height, TRUE);
+  }
+
+  /* Upsample some data (up to a strip height's worth). */
+  old_next_row = post->next_row;
+  (*cinfo->upsample->upsample) (cinfo,
+		input_buf, in_row_group_ctr, in_row_groups_avail,
+		post->buffer, &post->next_row, post->strip_height);
+
+  /* Allow quantizer to scan new data.  No data is emitted, */
+  /* but we advance out_row_ctr so outer loop can tell when we're done. */
+  if (post->next_row > old_next_row) {
+    num_rows = post->next_row - old_next_row;
+    (*cinfo->cquantize->color_quantize) (cinfo, post->buffer + old_next_row,
+					 (JSAMPARRAY) NULL, (int) num_rows);
+    *out_row_ctr += num_rows;
+  }
+
+  /* Advance if we filled the strip. */
+  if (post->next_row >= post->strip_height) {
+    post->starting_row += post->strip_height;
+    post->next_row = 0;
+  }
+}
+
+
+/*
+ * Process some data in the second pass of 2-pass quantization.
+ */
+
+METHODDEF(void)
+post_process_2pass (j_decompress_ptr cinfo,
+		    JSAMPIMAGE input_buf, JDIMENSION *in_row_group_ctr,
+		    JDIMENSION in_row_groups_avail,
+		    JSAMPARRAY output_buf, JDIMENSION *out_row_ctr,
+		    JDIMENSION out_rows_avail)
+{
+  my_post_ptr post = (my_post_ptr) cinfo->post;
+  JDIMENSION num_rows, max_rows;
+
+  /* Reposition virtual buffer if at start of strip. */
+  if (post->next_row == 0) {
+    post->buffer = (*cinfo->mem->access_virt_sarray)
+	((j_common_ptr) cinfo, post->whole_image,
+	 post->starting_row, post->strip_height, FALSE);
+  }
+
+  /* Determine number of rows to emit. */
+  num_rows = post->strip_height - post->next_row; /* available in strip */
+  max_rows = out_rows_avail - *out_row_ctr; /* available in output area */
+  if (num_rows > max_rows)
+    num_rows = max_rows;
+  /* We have to check bottom of image here, can't depend on upsampler. */
+  max_rows = cinfo->output_height - post->starting_row;
+  if (num_rows > max_rows)
+    num_rows = max_rows;
+
+  /* Quantize and emit data. */
+  (*cinfo->cquantize->color_quantize) (cinfo,
+		post->buffer + post->next_row, output_buf + *out_row_ctr,
+		(int) num_rows);
+  *out_row_ctr += num_rows;
+
+  /* Advance if we filled the strip. */
+  post->next_row += num_rows;
+  if (post->next_row >= post->strip_height) {
+    post->starting_row += post->strip_height;
+    post->next_row = 0;
+  }
+}
+
+#endif /* QUANT_2PASS_SUPPORTED */
+
+
+/*
+ * Initialize postprocessing controller.
+ */
+
+GLOBAL(void)
+jinit_d_post_controller (j_decompress_ptr cinfo, boolean need_full_buffer)
+{
+  my_post_ptr post;
+
+  post = (my_post_ptr)
+    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+				SIZEOF(my_post_controller));
+  cinfo->post = (struct jpeg_d_post_controller *) post;
+  post->pub.start_pass = start_pass_dpost;
+  post->whole_image = NULL;	/* flag for no virtual arrays */
+  post->buffer = NULL;		/* flag for no strip buffer */
+
+  /* Create the quantization buffer, if needed */
+  if (cinfo->quantize_colors) {
+    /* The buffer strip height is max_v_samp_factor, which is typically
+     * an efficient number of rows for upsampling to return.
+     * (In the presence of output rescaling, we might want to be smarter?)
+     */
+    post->strip_height = (JDIMENSION) cinfo->max_v_samp_factor;
+    if (need_full_buffer) {
+      /* Two-pass color quantization: need full-image storage. */
+      /* We round up the number of rows to a multiple of the strip height. */
+#ifdef QUANT_2PASS_SUPPORTED
+      post->whole_image = (*cinfo->mem->request_virt_sarray)
+	((j_common_ptr) cinfo, JPOOL_IMAGE, FALSE,
+	 cinfo->output_width * cinfo->out_color_components,
+	 (JDIMENSION) jround_up((long) cinfo->output_height,
+				(long) post->strip_height),
+	 post->strip_height);
+#else
+      ERREXIT(cinfo, JERR_BAD_BUFFER_MODE);
+#endif /* QUANT_2PASS_SUPPORTED */
+    } else {
+      /* One-pass color quantization: just make a strip buffer. */
+      post->buffer = (*cinfo->mem->alloc_sarray)
+	((j_common_ptr) cinfo, JPOOL_IMAGE,
+	 cinfo->output_width * cinfo->out_color_components,
+	 post->strip_height);
+    }
+  }
+}
diff --git a/uppsrc/plugin/jpg/lib/jdpred.c b/uppsrc/plugin/jpg/lib/jdpred.c
new file mode 100644
index 000000000..7d21281c3
--- /dev/null
+++ b/uppsrc/plugin/jpg/lib/jdpred.c
@@ -0,0 +1,246 @@
+/*
+ * jdpred.c
+ *
+ * Copyright (C) 1998, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains sample undifferencing (reconstruction) for lossless JPEG.
+ *
+ * In order to avoid paying the performance penalty of having to check the
+ * predictor being used and the row being processed for each call of the
+ * undifferencer, and to promote optimization, we have separate undifferencing
+ * functions for each case.
+ *
+ * We are able to avoid duplicating source code by implementing the predictors
+ * and undifferencers as macros.  Each of the undifferencing functions are
+ * simply wrappers around an UNDIFFERENCE macro with the appropriate PREDICTOR
+ * macro passed as an argument.
+ */
+
+#define JPEG_INTERNALS
+#include "jinclude.h"
+#include "jpeglib.h"
+#include "jlossls.h"		/* Private declarations for lossless codec */
+
+
+#ifdef D_LOSSLESS_SUPPORTED
+
+/* Predictor for the first column of the first row: 2^(P-Pt-1) */
+#define INITIAL_PREDICTORx	(1 << (cinfo->data_precision - cinfo->Al - 1))
+
+/* Predictor for the first column of the remaining rows: Rb */
+#define INITIAL_PREDICTOR2	GETJSAMPLE(prev_row[0])
+
+
+/*
+ * 1-Dimensional undifferencer routine.
+ *
+ * This macro implements the 1-D horizontal predictor (1).  INITIAL_PREDICTOR
+ * is used as the special case predictor for the first column, which must be
+ * either INITIAL_PREDICTOR2 or INITIAL_PREDICTORx.  The remaining samples
+ * use PREDICTOR1.
+ *
+ * The reconstructed sample is supposed to be calculated modulo 2^16, so we
+ * logically AND the result with 0xFFFF.
+*/
+
+#define UNDIFFERENCE_1D(INITIAL_PREDICTOR) \
+	unsigned xindex; \
+	int Ra; \
+ \
+	Ra = (diff_buf[0] + INITIAL_PREDICTOR) & 0xFFFF; \
+	undiff_buf[0] = Ra; \
+ \
+	for (xindex = 1; xindex < width; xindex++) { \
+	  Ra = (diff_buf[xindex] + PREDICTOR1) & 0xFFFF; \
+	  undiff_buf[xindex] = Ra; \
+	}
+
+/*
+ * 2-Dimensional undifferencer routine.
+ *
+ * This macro implements the 2-D horizontal predictors (#2-7).  PREDICTOR2 is
+ * used as the special case predictor for the first column.  The remaining
+ * samples use PREDICTOR, which is a function of Ra, Rb, Rc.
+ *
+ * Because prev_row and output_buf may point to the same storage area (in an
+ * interleaved image with Vi=1, for example), we must take care to buffer Rb/Rc
+ * before writing the current reconstructed sample value into output_buf.
+ *
+ * The reconstructed sample is supposed to be calculated modulo 2^16, so we
+ * logically AND the result with 0xFFFF.
+ */
+
+#define UNDIFFERENCE_2D(PREDICTOR) \
+	unsigned xindex; \
+	int Ra, Rb, Rc; \
+ \
+	Rb = GETJSAMPLE(prev_row[0]); \
+	Ra = (diff_buf[0] + PREDICTOR2) & 0xFFFF; \
+	undiff_buf[0] = Ra; \
+ \
+	for (xindex = 1; xindex < width; xindex++) { \
+	  Rc = Rb; \
+	  Rb = GETJSAMPLE(prev_row[xindex]); \
+	  Ra = (diff_buf[xindex] + PREDICTOR) & 0xFFFF; \
+	  undiff_buf[xindex] = Ra; \
+	}
+
+
+/*
+ * Undifferencers for the all rows but the first in a scan or restart interval.
+ * The first sample in the row is undifferenced using the vertical
+ * predictor (2).  The rest of the samples are undifferenced using the
+ * predictor specified in the scan header.
+ */
+
+METHODDEF(void)
+jpeg_undifference1(j_decompress_ptr cinfo, int comp_index,
+		   JDIFFROW diff_buf, JDIFFROW prev_row,
+		   JDIFFROW undiff_buf, JDIMENSION width)
+{
+  UNDIFFERENCE_1D(INITIAL_PREDICTOR2);
+}
+
+METHODDEF(void)
+jpeg_undifference2(j_decompress_ptr cinfo, int comp_index,
+		   JDIFFROW diff_buf, JDIFFROW prev_row,
+		   JDIFFROW undiff_buf, JDIMENSION width)
+{
+  UNDIFFERENCE_2D(PREDICTOR2);
+}
+
+METHODDEF(void)
+jpeg_undifference3(j_decompress_ptr cinfo, int comp_index,
+		   JDIFFROW diff_buf, JDIFFROW prev_row,
+		   JDIFFROW undiff_buf, JDIMENSION width)
+{
+  UNDIFFERENCE_2D(PREDICTOR3);
+}
+
+METHODDEF(void)
+jpeg_undifference4(j_decompress_ptr cinfo, int comp_index,
+		   JDIFFROW diff_buf, JDIFFROW prev_row,
+		   JDIFFROW undiff_buf, JDIMENSION width)
+{
+  UNDIFFERENCE_2D(PREDICTOR4);
+}
+
+METHODDEF(void)
+jpeg_undifference5(j_decompress_ptr cinfo, int comp_index,
+		   JDIFFROW diff_buf, JDIFFROW prev_row,
+		   JDIFFROW undiff_buf, JDIMENSION width)
+{
+  UNDIFFERENCE_2D(PREDICTOR5);
+}
+
+METHODDEF(void)
+jpeg_undifference6(j_decompress_ptr cinfo, int comp_index,
+		   JDIFFROW diff_buf, JDIFFROW prev_row,
+		   JDIFFROW undiff_buf, JDIMENSION width)
+{
+  UNDIFFERENCE_2D(PREDICTOR6);
+}
+
+METHODDEF(void)
+jpeg_undifference7(j_decompress_ptr cinfo, int comp_index,
+		   JDIFFROW diff_buf, JDIFFROW prev_row,
+		   JDIFFROW undiff_buf, JDIMENSION width)
+{
+  UNDIFFERENCE_2D(PREDICTOR7);
+}
+
+
+/*
+ * Undifferencer for the first row in a scan or restart interval.  The first
+ * sample in the row is undifferenced using the special predictor constant
+ * x=2^(P-Pt-1).  The rest of the samples are undifferenced using the
+ * 1-D horizontal predictor (1).
+ */
+
+METHODDEF(void)
+jpeg_undifference_first_row(j_decompress_ptr cinfo, int comp_index,
+			    JDIFFROW diff_buf, JDIFFROW prev_row,
+			    JDIFFROW undiff_buf, JDIMENSION width)
+{
+  j_lossless_d_ptr losslsd = (j_lossless_d_ptr) cinfo->codec;
+
+  UNDIFFERENCE_1D(INITIAL_PREDICTORx);
+
+  /*
+   * Now that we have undifferenced the first row, we want to use the
+   * undifferencer which corresponds to the predictor specified in the
+   * scan header.
+   */
+  switch (cinfo->Ss) {
+  case 1:
+    losslsd->predict_undifference[comp_index] = jpeg_undifference1;
+    break;
+  case 2:
+    losslsd->predict_undifference[comp_index] = jpeg_undifference2;
+    break;
+  case 3:
+    losslsd->predict_undifference[comp_index] = jpeg_undifference3;
+    break;
+  case 4:
+    losslsd->predict_undifference[comp_index] = jpeg_undifference4;
+    break;
+  case 5:
+    losslsd->predict_undifference[comp_index] = jpeg_undifference5;
+    break;
+  case 6:
+    losslsd->predict_undifference[comp_index] = jpeg_undifference6;
+    break;
+  case 7:
+    losslsd->predict_undifference[comp_index] = jpeg_undifference7;
+    break;
+  }
+}
+
+
+/*
+ * Initialize for an input processing pass.
+ */
+
+METHODDEF(void)
+predict_start_pass (j_decompress_ptr cinfo)
+{
+  j_lossless_d_ptr losslsd = (j_lossless_d_ptr) cinfo->codec;
+  int ci;
+
+  /* Check that the scan parameters Ss, Se, Ah, Al are OK for lossless JPEG.
+   *
+   * Ss is the predictor selection value (psv).  Legal values for sequential
+   * lossless JPEG are: 1 <= psv <= 7.
+   *
+   * Se and Ah are not used and should be zero.
+   *
+   * Al specifies the point transform (Pt).  Legal values are: 0 <= Pt <= 15.
+   */
+  if (cinfo->Ss < 1 || cinfo->Ss > 7 ||
+      cinfo->Se != 0 || cinfo->Ah != 0 ||
+      cinfo->Al > 15)				/* need not check for < 0 */
+    ERREXIT4(cinfo, JERR_BAD_LOSSLESS,
+	     cinfo->Ss, cinfo->Se, cinfo->Ah, cinfo->Al);
+
+  /* Set undifference functions to first row function */
+  for (ci = 0; ci < cinfo->num_components; ci++)
+    losslsd->predict_undifference[ci] = jpeg_undifference_first_row;
+}
+
+
+/*
+ * Module initialization routine for the undifferencer.
+ */
+
+GLOBAL(void)
+jinit_undifferencer (j_decompress_ptr cinfo)
+{
+  j_lossless_d_ptr losslsd = (j_lossless_d_ptr) cinfo->codec;
+
+  losslsd->predict_start_pass = predict_start_pass;
+  losslsd->predict_process_restart = predict_start_pass;
+}
+
+#endif /* D_LOSSLESS_SUPPORTED */
diff --git a/uppsrc/plugin/jpg/lib/jdsample.c b/uppsrc/plugin/jpg/lib/jdsample.c
new file mode 100644
index 000000000..764a0a0a5
--- /dev/null
+++ b/uppsrc/plugin/jpg/lib/jdsample.c
@@ -0,0 +1,478 @@
+/*
+ * jdsample.c
+ *
+ * Copyright (C) 1991-1998, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains upsampling routines.
+ *
+ * Upsampling input data is counted in "row groups".  A row group
+ * is defined to be (v_samp_factor * codec_data_unit / min_codec_data_unit)
+ * sample rows of each component.  Upsampling will normally produce
+ * max_v_samp_factor pixel rows from each row group (but this could vary
+ * if the upsampler is applying a scale factor of its own).
+ *
+ * An excellent reference for image resampling is
+ *   Digital Image Warping, George Wolberg, 1990.
+ *   Pub. by IEEE Computer Society Press, Los Alamitos, CA. ISBN 0-8186-8944-7.
+ */
+
+#define JPEG_INTERNALS
+#include "jinclude.h"
+#include "jpeglib.h"
+
+
+/* Pointer to routine to upsample a single component */
+typedef JMETHOD(void, upsample1_ptr,
+		(j_decompress_ptr cinfo, jpeg_component_info * compptr,
+		 JSAMPARRAY input_data, JSAMPARRAY * output_data_ptr));
+
+/* Private subobject */
+
+typedef struct {
+  struct jpeg_upsampler pub;	/* public fields */
+
+  /* Color conversion buffer.  When using separate upsampling and color
+   * conversion steps, this buffer holds one upsampled row group until it
+   * has been color converted and output.
+   * Note: we do not allocate any storage for component(s) which are full-size,
+   * ie do not need rescaling.  The corresponding entry of color_buf[] is
+   * simply set to point to the input data array, thereby avoiding copying.
+   */
+  JSAMPARRAY color_buf[MAX_COMPONENTS];
+
+  /* Per-component upsampling method pointers */
+  upsample1_ptr methods[MAX_COMPONENTS];
+
+  int next_row_out;		/* counts rows emitted from color_buf */
+  JDIMENSION rows_to_go;	/* counts rows remaining in image */
+
+  /* Height of an input row group for each component. */
+  int rowgroup_height[MAX_COMPONENTS];
+
+  /* These arrays save pixel expansion factors so that int_expand need not
+   * recompute them each time.  They are unused for other upsampling methods.
+   */
+  UINT8 h_expand[MAX_COMPONENTS];
+  UINT8 v_expand[MAX_COMPONENTS];
+} my_upsampler;
+
+typedef my_upsampler * my_upsample_ptr;
+
+
+/*
+ * Initialize for an upsampling pass.
+ */
+
+METHODDEF(void)
+start_pass_upsample (j_decompress_ptr cinfo)
+{
+  my_upsample_ptr upsample = (my_upsample_ptr) cinfo->upsample;
+
+  /* Mark the conversion buffer empty */
+  upsample->next_row_out = cinfo->max_v_samp_factor;
+  /* Initialize total-height counter for detecting bottom of image */
+  upsample->rows_to_go = cinfo->output_height;
+}
+
+
+/*
+ * Control routine to do upsampling (and color conversion).
+ *
+ * In this version we upsample each component independently.
+ * We upsample one row group into the conversion buffer, then apply
+ * color conversion a row at a time.
+ */
+
+METHODDEF(void)
+sep_upsample (j_decompress_ptr cinfo,
+	      JSAMPIMAGE input_buf, JDIMENSION *in_row_group_ctr,
+	      JDIMENSION in_row_groups_avail,
+	      JSAMPARRAY output_buf, JDIMENSION *out_row_ctr,
+	      JDIMENSION out_rows_avail)
+{
+  my_upsample_ptr upsample = (my_upsample_ptr) cinfo->upsample;
+  int ci;
+  jpeg_component_info * compptr;
+  JDIMENSION num_rows;
+
+  /* Fill the conversion buffer, if it's empty */
+  if (upsample->next_row_out >= cinfo->max_v_samp_factor) {
+    for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
+	 ci++, compptr++) {
+      /* Invoke per-component upsample method.  Notice we pass a POINTER
+       * to color_buf[ci], so that fullsize_upsample can change it.
+       */
+      (*upsample->methods[ci]) (cinfo, compptr,
+	input_buf[ci] + (*in_row_group_ctr * upsample->rowgroup_height[ci]),
+	upsample->color_buf + ci);
+    }
+    upsample->next_row_out = 0;
+  }
+
+  /* Color-convert and emit rows */
+
+  /* How many we have in the buffer: */
+  num_rows = (JDIMENSION) (cinfo->max_v_samp_factor - upsample->next_row_out);
+  /* Not more than the distance to the end of the image.  Need this test
+   * in case the image height is not a multiple of max_v_samp_factor:
+   */
+  if (num_rows > upsample->rows_to_go)
+    num_rows = upsample->rows_to_go;
+  /* And not more than what the client can accept: */
+  out_rows_avail -= *out_row_ctr;
+  if (num_rows > out_rows_avail)
+    num_rows = out_rows_avail;
+
+  (*cinfo->cconvert->color_convert) (cinfo, upsample->color_buf,
+				     (JDIMENSION) upsample->next_row_out,
+				     output_buf + *out_row_ctr,
+				     (int) num_rows);
+
+  /* Adjust counts */
+  *out_row_ctr += num_rows;
+  upsample->rows_to_go -= num_rows;
+  upsample->next_row_out += num_rows;
+  /* When the buffer is emptied, declare this input row group consumed */
+  if (upsample->next_row_out >= cinfo->max_v_samp_factor)
+    (*in_row_group_ctr)++;
+}
+
+
+/*
+ * These are the routines invoked by sep_upsample to upsample pixel values
+ * of a single component.  One row group is processed per call.
+ */
+
+
+/*
+ * For full-size components, we just make color_buf[ci] point at the
+ * input buffer, and thus avoid copying any data.  Note that this is
+ * safe only because sep_upsample doesn't declare the input row group
+ * "consumed" until we are done color converting and emitting it.
+ */
+
+METHODDEF(void)
+fullsize_upsample (j_decompress_ptr cinfo, jpeg_component_info * compptr,
+		   JSAMPARRAY input_data, JSAMPARRAY * output_data_ptr)
+{
+  *output_data_ptr = input_data;
+}
+
+
+/*
+ * This is a no-op version used for "uninteresting" components.
+ * These components will not be referenced by color conversion.
+ */
+
+METHODDEF(void)
+noop_upsample (j_decompress_ptr cinfo, jpeg_component_info * compptr,
+	       JSAMPARRAY input_data, JSAMPARRAY * output_data_ptr)
+{
+  *output_data_ptr = NULL;	/* safety check */
+}
+
+
+/*
+ * This version handles any integral sampling ratios.
+ * This is not used for typical JPEG files, so it need not be fast.
+ * Nor, for that matter, is it particularly accurate: the algorithm is
+ * simple replication of the input pixel onto the corresponding output
+ * pixels.  The hi-falutin sampling literature refers to this as a
+ * "box filter".  A box filter tends to introduce visible artifacts,
+ * so if you are actually going to use 3:1 or 4:1 sampling ratios
+ * you would be well advised to improve this code.
+ */
+
+METHODDEF(void)
+int_upsample (j_decompress_ptr cinfo, jpeg_component_info * compptr,
+	      JSAMPARRAY input_data, JSAMPARRAY * output_data_ptr)
+{
+  my_upsample_ptr upsample = (my_upsample_ptr) cinfo->upsample;
+  JSAMPARRAY output_data = *output_data_ptr;
+  register JSAMPROW inptr, outptr;
+  register JSAMPLE invalue;
+  register int h;
+  JSAMPROW outend;
+  int h_expand, v_expand;
+  int inrow, outrow;
+
+  h_expand = upsample->h_expand[compptr->component_index];
+  v_expand = upsample->v_expand[compptr->component_index];
+
+  inrow = outrow = 0;
+  while (outrow < cinfo->max_v_samp_factor) {
+    /* Generate one output row with proper horizontal expansion */
+    inptr = input_data[inrow];
+    outptr = output_data[outrow];
+    outend = outptr + cinfo->output_width;
+    while (outptr < outend) {
+      invalue = *inptr++;	/* don't need GETJSAMPLE() here */
+      for (h = h_expand; h > 0; h--) {
+	*outptr++ = invalue;
+      }
+    }
+    /* Generate any additional output rows by duplicating the first one */
+    if (v_expand > 1) {
+      jcopy_sample_rows(output_data, outrow, output_data, outrow+1,
+			v_expand-1, cinfo->output_width);
+    }
+    inrow++;
+    outrow += v_expand;
+  }
+}
+
+
+/*
+ * Fast processing for the common case of 2:1 horizontal and 1:1 vertical.
+ * It's still a box filter.
+ */
+
+METHODDEF(void)
+h2v1_upsample (j_decompress_ptr cinfo, jpeg_component_info * compptr,
+	       JSAMPARRAY input_data, JSAMPARRAY * output_data_ptr)
+{
+  JSAMPARRAY output_data = *output_data_ptr;
+  register JSAMPROW inptr, outptr;
+  register JSAMPLE invalue;
+  JSAMPROW outend;
+  int inrow;
+
+  for (inrow = 0; inrow < cinfo->max_v_samp_factor; inrow++) {
+    inptr = input_data[inrow];
+    outptr = output_data[inrow];
+    outend = outptr + cinfo->output_width;
+    while (outptr < outend) {
+      invalue = *inptr++;	/* don't need GETJSAMPLE() here */
+      *outptr++ = invalue;
+      *outptr++ = invalue;
+    }
+  }
+}
+
+
+/*
+ * Fast processing for the common case of 2:1 horizontal and 2:1 vertical.
+ * It's still a box filter.
+ */
+
+METHODDEF(void)
+h2v2_upsample (j_decompress_ptr cinfo, jpeg_component_info * compptr,
+	       JSAMPARRAY input_data, JSAMPARRAY * output_data_ptr)
+{
+  JSAMPARRAY output_data = *output_data_ptr;
+  register JSAMPROW inptr, outptr;
+  register JSAMPLE invalue;
+  JSAMPROW outend;
+  int inrow, outrow;
+
+  inrow = outrow = 0;
+  while (outrow < cinfo->max_v_samp_factor) {
+    inptr = input_data[inrow];
+    outptr = output_data[outrow];
+    outend = outptr + cinfo->output_width;
+    while (outptr < outend) {
+      invalue = *inptr++;	/* don't need GETJSAMPLE() here */
+      *outptr++ = invalue;
+      *outptr++ = invalue;
+    }
+    jcopy_sample_rows(output_data, outrow, output_data, outrow+1,
+		      1, cinfo->output_width);
+    inrow++;
+    outrow += 2;
+  }
+}
+
+
+/*
+ * Fancy processing for the common case of 2:1 horizontal and 1:1 vertical.
+ *
+ * The upsampling algorithm is linear interpolation between pixel centers,
+ * also known as a "triangle filter".  This is a good compromise between
+ * speed and visual quality.  The centers of the output pixels are 1/4 and 3/4
+ * of the way between input pixel centers.
+ *
+ * A note about the "bias" calculations: when rounding fractional values to
+ * integer, we do not want to always round 0.5 up to the next integer.
+ * If we did that, we'd introduce a noticeable bias towards larger values.
+ * Instead, this code is arranged so that 0.5 will be rounded up or down at
+ * alternate pixel locations (a simple ordered dither pattern).
+ */
+
+METHODDEF(void)
+h2v1_fancy_upsample (j_decompress_ptr cinfo, jpeg_component_info * compptr,
+		     JSAMPARRAY input_data, JSAMPARRAY * output_data_ptr)
+{
+  JSAMPARRAY output_data = *output_data_ptr;
+  register JSAMPROW inptr, outptr;
+  register int invalue;
+  register JDIMENSION colctr;
+  int inrow;
+
+  for (inrow = 0; inrow < cinfo->max_v_samp_factor; inrow++) {
+    inptr = input_data[inrow];
+    outptr = output_data[inrow];
+    /* Special case for first column */
+    invalue = GETJSAMPLE(*inptr++);
+    *outptr++ = (JSAMPLE) invalue;
+    *outptr++ = (JSAMPLE) ((invalue * 3 + GETJSAMPLE(*inptr) + 2) >> 2);
+
+    for (colctr = compptr->downsampled_width - 2; colctr > 0; colctr--) {
+      /* General case: 3/4 * nearer pixel + 1/4 * further pixel */
+      invalue = GETJSAMPLE(*inptr++) * 3;
+      *outptr++ = (JSAMPLE) ((invalue + GETJSAMPLE(inptr[-2]) + 1) >> 2);
+      *outptr++ = (JSAMPLE) ((invalue + GETJSAMPLE(*inptr) + 2) >> 2);
+    }
+
+    /* Special case for last column */
+    invalue = GETJSAMPLE(*inptr);
+    *outptr++ = (JSAMPLE) ((invalue * 3 + GETJSAMPLE(inptr[-1]) + 1) >> 2);
+    *outptr++ = (JSAMPLE) invalue;
+  }
+}
+
+
+/*
+ * Fancy processing for the common case of 2:1 horizontal and 2:1 vertical.
+ * Again a triangle filter; see comments for h2v1 case, above.
+ *
+ * It is OK for us to reference the adjacent input rows because we demanded
+ * context from the main buffer controller (see initialization code).
+ */
+
+METHODDEF(void)
+h2v2_fancy_upsample (j_decompress_ptr cinfo, jpeg_component_info * compptr,
+		     JSAMPARRAY input_data, JSAMPARRAY * output_data_ptr)
+{
+  JSAMPARRAY output_data = *output_data_ptr;
+  register JSAMPROW inptr0, inptr1, outptr;
+#if BITS_IN_JSAMPLE == 8
+  register int thiscolsum, lastcolsum, nextcolsum;
+#else
+  register INT32 thiscolsum, lastcolsum, nextcolsum;
+#endif
+  register JDIMENSION colctr;
+  int inrow, outrow, v;
+
+  inrow = outrow = 0;
+  while (outrow < cinfo->max_v_samp_factor) {
+    for (v = 0; v < 2; v++) {
+      /* inptr0 points to nearest input row, inptr1 points to next nearest */
+      inptr0 = input_data[inrow];
+      if (v == 0)		/* next nearest is row above */
+	inptr1 = input_data[inrow-1];
+      else			/* next nearest is row below */
+	inptr1 = input_data[inrow+1];
+      outptr = output_data[outrow++];
+
+      /* Special case for first column */
+      thiscolsum = GETJSAMPLE(*inptr0++) * 3 + GETJSAMPLE(*inptr1++);
+      nextcolsum = GETJSAMPLE(*inptr0++) * 3 + GETJSAMPLE(*inptr1++);
+      *outptr++ = (JSAMPLE) ((thiscolsum * 4 + 8) >> 4);
+      *outptr++ = (JSAMPLE) ((thiscolsum * 3 + nextcolsum + 7) >> 4);
+      lastcolsum = thiscolsum; thiscolsum = nextcolsum;
+
+      for (colctr = compptr->downsampled_width - 2; colctr > 0; colctr--) {
+	/* General case: 3/4 * nearer pixel + 1/4 * further pixel in each */
+	/* dimension, thus 9/16, 3/16, 3/16, 1/16 overall */
+	nextcolsum = GETJSAMPLE(*inptr0++) * 3 + GETJSAMPLE(*inptr1++);
+	*outptr++ = (JSAMPLE) ((thiscolsum * 3 + lastcolsum + 8) >> 4);
+	*outptr++ = (JSAMPLE) ((thiscolsum * 3 + nextcolsum + 7) >> 4);
+	lastcolsum = thiscolsum; thiscolsum = nextcolsum;
+      }
+
+      /* Special case for last column */
+      *outptr++ = (JSAMPLE) ((thiscolsum * 3 + lastcolsum + 8) >> 4);
+      *outptr++ = (JSAMPLE) ((thiscolsum * 4 + 7) >> 4);
+    }
+    inrow++;
+  }
+}
+
+
+/*
+ * Module initialization routine for upsampling.
+ */
+
+GLOBAL(void)
+jinit_upsampler (j_decompress_ptr cinfo)
+{
+  my_upsample_ptr upsample;
+  int ci;
+  jpeg_component_info * compptr;
+  boolean need_buffer, do_fancy;
+  int h_in_group, v_in_group, h_out_group, v_out_group;
+
+  upsample = (my_upsample_ptr)
+    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+				SIZEOF(my_upsampler));
+  cinfo->upsample = (struct jpeg_upsampler *) upsample;
+  upsample->pub.start_pass = start_pass_upsample;
+  upsample->pub.upsample = sep_upsample;
+  upsample->pub.need_context_rows = FALSE; /* until we find out differently */
+
+  if (cinfo->CCIR601_sampling)	/* this isn't supported */
+    ERREXIT(cinfo, JERR_CCIR601_NOTIMPL);
+
+  /* jdmainct.c doesn't support context rows when min_codec_data_unit = 1,
+   * so don't ask for it.
+   */
+  do_fancy = cinfo->do_fancy_upsampling && cinfo->min_codec_data_unit > 1;
+
+  /* Verify we can handle the sampling factors, select per-component methods,
+   * and create storage as needed.
+   */
+  for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
+       ci++, compptr++) {
+    /* Compute size of an "input group" after IDCT scaling.  This many samples
+     * are to be converted to max_h_samp_factor * max_v_samp_factor pixels.
+     */
+    h_in_group = (compptr->h_samp_factor * compptr->codec_data_unit) /
+		 cinfo->min_codec_data_unit;
+    v_in_group = (compptr->v_samp_factor * compptr->codec_data_unit) /
+		 cinfo->min_codec_data_unit;
+    h_out_group = cinfo->max_h_samp_factor;
+    v_out_group = cinfo->max_v_samp_factor;
+    upsample->rowgroup_height[ci] = v_in_group; /* save for use later */
+    need_buffer = TRUE;
+    if (! compptr->component_needed) {
+      /* Don't bother to upsample an uninteresting component. */
+      upsample->methods[ci] = noop_upsample;
+      need_buffer = FALSE;
+    } else if (h_in_group == h_out_group && v_in_group == v_out_group) {
+      /* Fullsize components can be processed without any work. */
+      upsample->methods[ci] = fullsize_upsample;
+      need_buffer = FALSE;
+    } else if (h_in_group * 2 == h_out_group &&
+	       v_in_group == v_out_group) {
+      /* Special cases for 2h1v upsampling */
+      if (do_fancy && compptr->downsampled_width > 2)
+	upsample->methods[ci] = h2v1_fancy_upsample;
+      else
+	upsample->methods[ci] = h2v1_upsample;
+    } else if (h_in_group * 2 == h_out_group &&
+	       v_in_group * 2 == v_out_group) {
+      /* Special cases for 2h2v upsampling */
+      if (do_fancy && compptr->downsampled_width > 2) {
+	upsample->methods[ci] = h2v2_fancy_upsample;
+	upsample->pub.need_context_rows = TRUE;
+      } else
+	upsample->methods[ci] = h2v2_upsample;
+    } else if ((h_out_group % h_in_group) == 0 &&
+	       (v_out_group % v_in_group) == 0) {
+      /* Generic integral-factors upsampling method */
+      upsample->methods[ci] = int_upsample;
+      upsample->h_expand[ci] = (UINT8) (h_out_group / h_in_group);
+      upsample->v_expand[ci] = (UINT8) (v_out_group / v_in_group);
+    } else
+      ERREXIT(cinfo, JERR_FRACT_SAMPLE_NOTIMPL);
+    if (need_buffer) {
+      upsample->color_buf[ci] = (*cinfo->mem->alloc_sarray)
+	((j_common_ptr) cinfo, JPOOL_IMAGE,
+	 (JDIMENSION) jround_up((long) cinfo->output_width,
+				(long) cinfo->max_h_samp_factor),
+	 (JDIMENSION) cinfo->max_v_samp_factor);
+    }
+  }
+}
diff --git a/uppsrc/plugin/jpg/lib/jdscale.c b/uppsrc/plugin/jpg/lib/jdscale.c
new file mode 100644
index 000000000..8d52a9810
--- /dev/null
+++ b/uppsrc/plugin/jpg/lib/jdscale.c
@@ -0,0 +1,117 @@
+/*
+ * jdscale.c
+ *
+ * Copyright (C) 1998, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains sample scaling for lossless JPEG.  This is a
+ * combination of upscaling the undifferenced sample by 2^Pt and downscaling
+ * the sample to fit into JSAMPLE.
+ */
+
+#define JPEG_INTERNALS
+#include "jinclude.h"
+#include "jpeglib.h"
+#include "jlossls.h"		/* Private declarations for lossless codec */
+
+
+#ifdef D_LOSSLESS_SUPPORTED
+
+/*
+ * Private scaler object for lossless decoding.
+ */
+
+typedef struct {
+  int scale_factor;
+} scaler;
+
+typedef scaler * scaler_ptr;
+
+
+/*
+ * Scalers for packing sample differences into JSAMPLEs.
+ */
+
+METHODDEF(void)
+simple_upscale(j_decompress_ptr cinfo,
+	       JDIFFROW diff_buf, JSAMPROW output_buf,
+	       JDIMENSION width)
+{
+  j_lossless_d_ptr losslsd = (j_lossless_d_ptr) cinfo->codec;
+  scaler_ptr scaler = (scaler_ptr) losslsd->scaler_private;
+  int scale_factor = scaler->scale_factor;
+  unsigned xindex;
+
+  for (xindex = 0; xindex < width; xindex++)
+    output_buf[xindex] = (JSAMPLE) (diff_buf[xindex] << scale_factor);
+}
+
+METHODDEF(void)
+simple_downscale(j_decompress_ptr cinfo,
+		 JDIFFROW diff_buf, JSAMPROW output_buf,
+		 JDIMENSION width)
+{
+  j_lossless_d_ptr losslsd = (j_lossless_d_ptr) cinfo->codec;
+  scaler_ptr scaler = (scaler_ptr) losslsd->scaler_private;
+  int scale_factor = scaler->scale_factor;
+  unsigned xindex;
+
+  for (xindex = 0; xindex < width; xindex++)
+    output_buf[xindex] = (JSAMPLE) RIGHT_SHIFT(diff_buf[xindex], scale_factor);
+}
+
+METHODDEF(void)
+noscale(j_decompress_ptr cinfo,
+	JDIFFROW diff_buf, JSAMPROW output_buf,
+	JDIMENSION width)
+{
+  unsigned xindex;
+
+  for (xindex = 0; xindex < width; xindex++)
+    output_buf[xindex] = (JSAMPLE) diff_buf[xindex];
+}
+
+
+METHODDEF(void)
+scaler_start_pass (j_decompress_ptr cinfo)
+{
+  j_lossless_d_ptr losslsd = (j_lossless_d_ptr) cinfo->codec;
+  scaler_ptr scaler = (scaler_ptr) losslsd->scaler_private;
+  int downscale;
+
+  /*
+   * Downscale by the difference in the input vs. output precision.  If the
+   * output precision >= input precision, then do not downscale.
+   */
+  downscale = BITS_IN_JSAMPLE < cinfo->data_precision ?
+    cinfo->data_precision - BITS_IN_JSAMPLE : 0;
+
+  scaler->scale_factor = cinfo->Al - downscale;
+
+  /* Set scaler functions based on scale_factor (positive = left shift) */
+  if (scaler->scale_factor > 0)
+    losslsd->scaler_scale = simple_upscale;
+  else if (scaler->scale_factor < 0) {
+    scaler->scale_factor = -scaler->scale_factor;
+    losslsd->scaler_scale = simple_downscale;
+  }
+  else
+    losslsd->scaler_scale = noscale;
+}
+
+
+GLOBAL(void)
+jinit_d_scaler (j_decompress_ptr cinfo)
+{
+  j_lossless_d_ptr losslsd = (j_lossless_d_ptr) cinfo->codec;
+  scaler_ptr scaler;
+
+  scaler = (scaler_ptr)
+    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+				SIZEOF(scaler));
+  losslsd->scaler_private = (void *) scaler;
+  losslsd->scaler_start_pass = scaler_start_pass;
+}
+
+#endif /* D_LOSSLESS_SUPPORTED */
diff --git a/uppsrc/plugin/jpg/lib/jdshuff.c b/uppsrc/plugin/jpg/lib/jdshuff.c
new file mode 100644
index 000000000..424027fd4
--- /dev/null
+++ b/uppsrc/plugin/jpg/lib/jdshuff.c
@@ -0,0 +1,393 @@
+/*
+ * jdshuff.c
+ *
+ * Copyright (C) 1991-1998, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains Huffman entropy decoding routines for sequential JPEG.
+ *
+ * Much of the complexity here has to do with supporting input suspension.
+ * If the data source module demands suspension, we want to be able to back
+ * up to the start of the current MCU.  To do this, we copy state variables
+ * into local working storage, and update them back to the permanent
+ * storage only upon successful completion of an MCU.
+ */
+
+#define JPEG_INTERNALS
+#include "jinclude.h"
+#include "jpeglib.h"
+#include "jlossy.h"		/* Private declarations for lossy codec */
+#include "jdhuff.h"		/* Declarations shared with jd*huff.c */
+
+
+/*
+ * Private entropy decoder object for Huffman decoding.
+ *
+ * The savable_state subrecord contains fields that change within an MCU,
+ * but must not be updated permanently until we complete the MCU.
+ */
+
+typedef struct {
+  int last_dc_val[MAX_COMPS_IN_SCAN]; /* last DC coef for each component */
+} savable_state;
+
+/* This macro is to work around compilers with missing or broken
+ * structure assignment.  You'll need to fix this code if you have
+ * such a compiler and you change MAX_COMPS_IN_SCAN.
+ */
+
+#ifndef NO_STRUCT_ASSIGN
+#define ASSIGN_STATE(dest,src)  ((dest) = (src))
+#else
+#if MAX_COMPS_IN_SCAN == 4
+#define ASSIGN_STATE(dest,src)  \
+	((dest).last_dc_val[0] = (src).last_dc_val[0], \
+	 (dest).last_dc_val[1] = (src).last_dc_val[1], \
+	 (dest).last_dc_val[2] = (src).last_dc_val[2], \
+	 (dest).last_dc_val[3] = (src).last_dc_val[3])
+#endif
+#endif
+
+
+typedef struct {
+  huffd_common_fields;		/* Fields shared with other entropy decoders */
+
+  /* These fields are loaded into local variables at start of each MCU.
+   * In case of suspension, we exit WITHOUT updating them.
+   */
+  savable_state saved;		/* Other state at start of MCU */
+
+  /* These fields are NOT loaded into local working state. */
+  unsigned int restarts_to_go;	/* MCUs left in this restart interval */
+
+  /* Pointers to derived tables (these workspaces have image lifespan) */
+  d_derived_tbl * dc_derived_tbls[NUM_HUFF_TBLS];
+  d_derived_tbl * ac_derived_tbls[NUM_HUFF_TBLS];
+
+  /* Precalculated info set up by start_pass for use in decode_mcu: */
+
+  /* Pointers to derived tables to be used for each block within an MCU */
+  d_derived_tbl * dc_cur_tbls[D_MAX_DATA_UNITS_IN_MCU];
+  d_derived_tbl * ac_cur_tbls[D_MAX_DATA_UNITS_IN_MCU];
+  /* Whether we care about the DC and AC coefficient values for each block */
+  boolean dc_needed[D_MAX_DATA_UNITS_IN_MCU];
+  boolean ac_needed[D_MAX_DATA_UNITS_IN_MCU];
+} shuff_entropy_decoder;
+
+typedef shuff_entropy_decoder * shuff_entropy_ptr;
+
+
+/*
+ * Initialize for a Huffman-compressed scan.
+ */
+
+METHODDEF(void)
+start_pass_huff_decoder (j_decompress_ptr cinfo)
+{
+  j_lossy_d_ptr lossyd = (j_lossy_d_ptr) cinfo->codec;
+  shuff_entropy_ptr entropy = (shuff_entropy_ptr) lossyd->entropy_private;
+  int ci, blkn, dctbl, actbl;
+  jpeg_component_info * compptr;
+
+  /* Check that the scan parameters Ss, Se, Ah/Al are OK for sequential JPEG.
+   * This ought to be an error condition, but we make it a warning because
+   * there are some baseline files out there with all zeroes in these bytes.
+   */
+  if (cinfo->Ss != 0 || cinfo->Se != DCTSIZE2-1 ||
+      cinfo->Ah != 0 || cinfo->Al != 0)
+    WARNMS(cinfo, JWRN_NOT_SEQUENTIAL);
+
+  for (ci = 0; ci < cinfo->comps_in_scan; ci++) {
+    compptr = cinfo->cur_comp_info[ci];
+    dctbl = compptr->dc_tbl_no;
+    actbl = compptr->ac_tbl_no;
+    /* Compute derived values for Huffman tables */
+    /* We may do this more than once for a table, but it's not expensive */
+    jpeg_make_d_derived_tbl(cinfo, TRUE, dctbl,
+			    & entropy->dc_derived_tbls[dctbl]);
+    jpeg_make_d_derived_tbl(cinfo, FALSE, actbl,
+			    & entropy->ac_derived_tbls[actbl]);
+    /* Initialize DC predictions to 0 */
+    entropy->saved.last_dc_val[ci] = 0;
+  }
+
+  /* Precalculate decoding info for each block in an MCU of this scan */
+  for (blkn = 0; blkn < cinfo->data_units_in_MCU; blkn++) {
+    ci = cinfo->MCU_membership[blkn];
+    compptr = cinfo->cur_comp_info[ci];
+    /* Precalculate which table to use for each block */
+    entropy->dc_cur_tbls[blkn] = entropy->dc_derived_tbls[compptr->dc_tbl_no];
+    entropy->ac_cur_tbls[blkn] = entropy->ac_derived_tbls[compptr->ac_tbl_no];
+    /* Decide whether we really care about the coefficient values */
+    if (compptr->component_needed) {
+      entropy->dc_needed[blkn] = TRUE;
+      /* we don't need the ACs if producing a 1/8th-size image */
+      entropy->ac_needed[blkn] = (compptr->codec_data_unit > 1);
+    } else {
+      entropy->dc_needed[blkn] = entropy->ac_needed[blkn] = FALSE;
+    }
+  }
+
+  /* Initialize bitread state variables */
+  entropy->bitstate.bits_left = 0;
+  entropy->bitstate.get_buffer = 0; /* unnecessary, but keeps Purify quiet */
+  entropy->insufficient_data = FALSE;
+
+  /* Initialize restart counter */
+  entropy->restarts_to_go = cinfo->restart_interval;
+}
+
+
+/*
+ * Figure F.12: extend sign bit.
+ * On some machines, a shift and add will be faster than a table lookup.
+ */
+
+#ifdef AVOID_TABLES
+
+#define HUFF_EXTEND(x,s)  ((x) < (1<<((s)-1)) ? (x) + (((-1)<<(s)) + 1) : (x))
+
+#else
+
+#define HUFF_EXTEND(x,s)  ((x) < extend_test[s] ? (x) + extend_offset[s] : (x))
+
+static const int extend_test[16] =   /* entry n is 2**(n-1) */
+  { 0, 0x0001, 0x0002, 0x0004, 0x0008, 0x0010, 0x0020, 0x0040, 0x0080,
+    0x0100, 0x0200, 0x0400, 0x0800, 0x1000, 0x2000, 0x4000 };
+
+static const int extend_offset[16] = /* entry n is (-1 << n) + 1 */
+  { 0, ((-1)<<1) + 1, ((-1)<<2) + 1, ((-1)<<3) + 1, ((-1)<<4) + 1,
+    ((-1)<<5) + 1, ((-1)<<6) + 1, ((-1)<<7) + 1, ((-1)<<8) + 1,
+    ((-1)<<9) + 1, ((-1)<<10) + 1, ((-1)<<11) + 1, ((-1)<<12) + 1,
+    ((-1)<<13) + 1, ((-1)<<14) + 1, ((-1)<<15) + 1 };
+
+#endif /* AVOID_TABLES */
+
+
+/*
+ * Check for a restart marker & resynchronize decoder.
+ * Returns FALSE if must suspend.
+ */
+
+LOCAL(boolean)
+process_restart (j_decompress_ptr cinfo)
+{
+  j_lossy_d_ptr lossyd = (j_lossy_d_ptr) cinfo->codec;
+  shuff_entropy_ptr entropy = (shuff_entropy_ptr) lossyd->entropy_private;
+  int ci;
+
+  /* Throw away any unused bits remaining in bit buffer; */
+  /* include any full bytes in next_marker's count of discarded bytes */
+  cinfo->marker->discarded_bytes += entropy->bitstate.bits_left / 8;
+  entropy->bitstate.bits_left = 0;
+
+  /* Advance past the RSTn marker */
+  if (! (*cinfo->marker->read_restart_marker) (cinfo))
+    return FALSE;
+
+  /* Re-initialize DC predictions to 0 */
+  for (ci = 0; ci < cinfo->comps_in_scan; ci++)
+    entropy->saved.last_dc_val[ci] = 0;
+
+  /* Reset restart counter */
+  entropy->restarts_to_go = cinfo->restart_interval;
+
+  /* Reset out-of-data flag, unless read_restart_marker left us smack up
+   * against a marker.  In that case we will end up treating the next data
+   * segment as empty, and we can avoid producing bogus output pixels by
+   * leaving the flag set.
+   */
+  if (cinfo->unread_marker == 0)
+    entropy->insufficient_data = FALSE;
+
+  return TRUE;
+}
+
+
+/*
+ * Decode and return one MCU's worth of Huffman-compressed coefficients.
+ * The coefficients are reordered from zigzag order into natural array order,
+ * but are not dequantized.
+ *
+ * The i'th block of the MCU is stored into the block pointed to by
+ * MCU_data[i].  WE ASSUME THIS AREA HAS BEEN ZEROED BY THE CALLER.
+ * (Wholesale zeroing is usually a little faster than retail...)
+ *
+ * Returns FALSE if data source requested suspension.  In that case no
+ * changes have been made to permanent state.  (Exception: some output
+ * coefficients may already have been assigned.  This is harmless for
+ * this module, since we'll just re-assign them on the next call.)
+ */
+
+METHODDEF(boolean)
+decode_mcu (j_decompress_ptr cinfo, JBLOCKROW *MCU_data)
+{
+  j_lossy_d_ptr lossyd = (j_lossy_d_ptr) cinfo->codec;
+  shuff_entropy_ptr entropy = (shuff_entropy_ptr) lossyd->entropy_private;
+  int blkn;
+  BITREAD_STATE_VARS;
+  savable_state state;
+
+  /* Process restart marker if needed; may have to suspend */
+  if (cinfo->restart_interval) {
+    if (entropy->restarts_to_go == 0)
+      if (! process_restart(cinfo))
+	return FALSE;
+  }
+
+  /* If we've run out of data, just leave the MCU set to zeroes.
+   * This way, we return uniform gray for the remainder of the segment.
+   */
+  if (! entropy->insufficient_data) {
+
+    /* Load up working state */
+    BITREAD_LOAD_STATE(cinfo,entropy->bitstate);
+    ASSIGN_STATE(state, entropy->saved);
+
+    /* Outer loop handles each block in the MCU */
+
+    for (blkn = 0; blkn < cinfo->data_units_in_MCU; blkn++) {
+      JBLOCKROW block = MCU_data[blkn];
+      d_derived_tbl * dctbl = entropy->dc_cur_tbls[blkn];
+      d_derived_tbl * actbl = entropy->ac_cur_tbls[blkn];
+      register int s, k, r;
+
+      /* Decode a single block's worth of coefficients */
+
+      /* Section F.2.2.1: decode the DC coefficient difference */
+      HUFF_DECODE(s, br_state, dctbl, return FALSE, label1);
+      if (s) {
+	CHECK_BIT_BUFFER(br_state, s, return FALSE);
+	r = GET_BITS(s);
+	s = HUFF_EXTEND(r, s);
+      }
+
+      if (entropy->dc_needed[blkn]) {
+	/* Convert DC difference to actual value, update last_dc_val */
+	int ci = cinfo->MCU_membership[blkn];
+	s += state.last_dc_val[ci];
+	state.last_dc_val[ci] = s;
+	/* Output the DC coefficient (assumes jpeg_natural_order[0] = 0) */
+	(*block)[0] = (JCOEF) s;
+      }
+
+      if (entropy->ac_needed[blkn]) {
+
+	/* Section F.2.2.2: decode the AC coefficients */
+	/* Since zeroes are skipped, output area must be cleared beforehand */
+	for (k = 1; k < DCTSIZE2; k++) {
+	  HUFF_DECODE(s, br_state, actbl, return FALSE, label2);
+
+	  r = s >> 4;
+	  s &= 15;
+
+	  if (s) {
+	    k += r;
+	    CHECK_BIT_BUFFER(br_state, s, return FALSE);
+	    r = GET_BITS(s);
+	    s = HUFF_EXTEND(r, s);
+	    /* Output coefficient in natural (dezigzagged) order.
+	     * Note: the extra entries in jpeg_natural_order[] will save us
+	     * if k >= DCTSIZE2, which could happen if the data is corrupted.
+	     */
+	    (*block)[jpeg_natural_order[k]] = (JCOEF) s;
+	  } else {
+	    if (r != 15)
+	      break;
+	    k += 15;
+	  }
+	}
+
+      } else {
+
+	/* Section F.2.2.2: decode the AC coefficients */
+	/* In this path we just discard the values */
+	for (k = 1; k < DCTSIZE2; k++) {
+	  HUFF_DECODE(s, br_state, actbl, return FALSE, label3);
+
+	  r = s >> 4;
+	  s &= 15;
+
+	  if (s) {
+	    k += r;
+	    CHECK_BIT_BUFFER(br_state, s, return FALSE);
+	    DROP_BITS(s);
+	  } else {
+	    if (r != 15)
+	      break;
+	    k += 15;
+	  }
+	}
+
+      }
+    }
+
+    /* Completed MCU, so update state */
+    BITREAD_SAVE_STATE(cinfo,entropy->bitstate);
+    ASSIGN_STATE(entropy->saved, state);
+  }
+
+  /* Account for restart interval (no-op if not using restarts) */
+  entropy->restarts_to_go--;
+
+  return TRUE;
+}
+
+
+/*
+ * Module initialization routine for Huffman entropy decoding.
+ */
+
+GLOBAL(void)
+jinit_shuff_decoder (j_decompress_ptr cinfo)
+{
+  j_lossy_d_ptr lossyd = (j_lossy_d_ptr) cinfo->codec;
+  shuff_entropy_ptr entropy;
+  int i;
+
+  entropy = (shuff_entropy_ptr)
+    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+				SIZEOF(shuff_entropy_decoder));
+  lossyd->entropy_private = (void *) entropy;
+  lossyd->entropy_start_pass = start_pass_huff_decoder;
+  lossyd->entropy_decode_mcu = decode_mcu;
+
+  /* Mark tables unallocated */
+  for (i = 0; i < NUM_HUFF_TBLS; i++) {
+    entropy->dc_derived_tbls[i] = entropy->ac_derived_tbls[i] = NULL;
+  }
+}
+
+/*
+ * BEWARE OF KLUDGE:  This subroutine is a hack for decoding illegal JPEG-in-
+ *                    TIFF encapsulations produced by Microsoft's Wang Imaging
+ * for Windows application with the public-domain TIFF Library.  Based upon an
+ * examination of selected output files, this program apparently divides a JPEG
+ * bit-stream into consecutive horizontal TIFF "strips", such that the JPEG
+ * encoder's/decoder's DC coefficients for each image component are reset before
+ * each "strip".  Moreover, a "strip" is not necessarily encoded in a multiple
+ * of 8 bits, so one must sometimes discard 1-7 bits at the end of each "strip"
+ * for alignment to the next input-Byte storage boundary.  IJG JPEG Library
+ * decoder state is not normally exposed to client applications, so this sub-
+ * routine provides the TIFF Library with a "hook" to make these corrections.
+ * It should be called after "jpeg_start_decompress()" and before
+ * "jpeg_finish_decompress()", just before decoding each "strip" using
+ * "jpeg_read_raw_data()" or "jpeg_read_scanlines()".
+ *
+ * This kludge is not sanctioned or supported by the Independent JPEG Group, and
+ * future changes to the IJG JPEG Library might invalidate it.  Do not send bug
+ * reports about this code to IJG developers.  Instead, contact the author for
+ * advice: Scott B. Marovich <marovich@hpl.hp.com>, Hewlett-Packard Labs, 6/01.
+ */
+GLOBAL(void)
+jpeg_reset_huff_decode (register j_decompress_ptr cinfo)
+{ register shuff_entropy_ptr entropy = (shuff_entropy_ptr)
+                                       ((j_lossy_d_ptr)cinfo->codec)->entropy_private;
+  register int ci = 0;
+
+  /* Discard encoded input bits, up to the next Byte boundary */
+  entropy->bitstate.bits_left &= ~7;
+  /* Re-initialize DC predictions to 0 */
+  do entropy->saved.last_dc_val[ci] = 0; while (++ci < cinfo->comps_in_scan);
+}
diff --git a/uppsrc/plugin/jpg/lib/jdtrans.c b/uppsrc/plugin/jpg/lib/jdtrans.c
new file mode 100644
index 000000000..e482aaa4c
--- /dev/null
+++ b/uppsrc/plugin/jpg/lib/jdtrans.c
@@ -0,0 +1,138 @@
+/*
+ * jdtrans.c
+ *
+ * Copyright (C) 1995-1998, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains library routines for transcoding decompression,
+ * that is, reading raw DCT coefficient arrays from an input JPEG file.
+ * The routines in jdapimin.c will also be needed by a transcoder.
+ */
+
+#define JPEG_INTERNALS
+#include "jinclude.h"
+#include "jpeglib.h"
+#include "jlossy.h"
+
+
+/* Forward declarations */
+LOCAL(void) transdecode_master_selection JPP((j_decompress_ptr cinfo));
+
+
+/*
+ * Read the coefficient arrays from a JPEG file.
+ * jpeg_read_header must be completed before calling this.
+ *
+ * The entire image is read into a set of virtual coefficient-block arrays,
+ * one per component.  The return value is a pointer to the array of
+ * virtual-array descriptors.  These can be manipulated directly via the
+ * JPEG memory manager, or handed off to jpeg_write_coefficients().
+ * To release the memory occupied by the virtual arrays, call
+ * jpeg_finish_decompress() when done with the data.
+ *
+ * An alternative usage is to simply obtain access to the coefficient arrays
+ * during a buffered-image-mode decompression operation.  This is allowed
+ * after any jpeg_finish_output() call.  The arrays can be accessed until
+ * jpeg_finish_decompress() is called.  (Note that any call to the library
+ * may reposition the arrays, so don't rely on access_virt_barray() results
+ * to stay valid across library calls.)
+ *
+ * Returns NULL if suspended.  This case need be checked only if
+ * a suspending data source is used.
+ */
+
+GLOBAL(jvirt_barray_ptr *)
+jpeg_read_coefficients (j_decompress_ptr cinfo)
+{
+//  j_lossy_d_ptr decomp;
+
+  /* Can't read coefficients from lossless streams */
+  if (cinfo->process == JPROC_LOSSLESS) {
+    ERREXIT(cinfo, JERR_CANT_TRANSCODE);
+    return NULL;
+  }
+
+  if (cinfo->global_state == DSTATE_READY) {
+    /* First call: initialize active modules */
+    transdecode_master_selection(cinfo);
+    cinfo->global_state = DSTATE_RDCOEFS;
+  }
+  if (cinfo->global_state == DSTATE_RDCOEFS) {
+    /* Absorb whole file into the coef buffer */
+    for (;;) {
+      int retcode;
+      /* Call progress monitor hook if present */
+      if (cinfo->progress != NULL)
+	(*cinfo->progress->progress_monitor) ((j_common_ptr) cinfo);
+      /* Absorb some more input */
+      retcode = (*cinfo->inputctl->consume_input) (cinfo);
+      if (retcode == JPEG_SUSPENDED)
+	return NULL;
+      if (retcode == JPEG_REACHED_EOI)
+	break;
+      /* Advance progress counter if appropriate */
+      if (cinfo->progress != NULL &&
+	  (retcode == JPEG_ROW_COMPLETED || retcode == JPEG_REACHED_SOS)) {
+	if (++cinfo->progress->pass_counter >= cinfo->progress->pass_limit) {
+	  /* startup underestimated number of scans; ratchet up one scan */
+	  cinfo->progress->pass_limit += (long) cinfo->total_iMCU_rows;
+	}
+      }
+    }
+    /* Set state so that jpeg_finish_decompress does the right thing */
+    cinfo->global_state = DSTATE_STOPPING;
+  }
+  /* At this point we should be in state DSTATE_STOPPING if being used
+   * standalone, or in state DSTATE_BUFIMAGE if being invoked to get access
+   * to the coefficients during a full buffered-image-mode decompression.
+   */
+  if ((cinfo->global_state == DSTATE_STOPPING ||
+       cinfo->global_state == DSTATE_BUFIMAGE) && cinfo->buffered_image) {
+    return ((j_lossy_d_ptr) cinfo->codec)->coef_arrays;
+  }
+  /* Oops, improper usage */
+  ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);
+  return NULL;			/* keep compiler happy */
+}
+
+
+/*
+ * Master selection of decompression modules for transcoding.
+ * This substitutes for jdmaster.c's initialization of the full decompressor.
+ */
+
+LOCAL(void)
+transdecode_master_selection (j_decompress_ptr cinfo)
+{
+  /* This is effectively a buffered-image operation. */
+  cinfo->buffered_image = TRUE;
+
+  /* Initialize decompression codec */
+  jinit_d_codec(cinfo);
+
+  /* We can now tell the memory manager to allocate virtual arrays. */
+  (*cinfo->mem->realize_virt_arrays) ((j_common_ptr) cinfo);
+
+  /* Initialize input side of decompressor to consume first scan. */
+  (*cinfo->inputctl->start_input_pass) (cinfo);
+
+  /* Initialize progress monitoring. */
+  if (cinfo->progress != NULL) {
+    int nscans;
+    /* Estimate number of scans to set pass_limit. */
+    if (cinfo->process == JPROC_PROGRESSIVE) {
+      /* Arbitrarily estimate 2 interleaved DC scans + 3 AC scans/component. */
+      nscans = 2 + 3 * cinfo->num_components;
+    } else if (cinfo->inputctl->has_multiple_scans) {
+      /* For a nonprogressive multiscan file, estimate 1 scan per component. */
+      nscans = cinfo->num_components;
+    } else {
+      nscans = 1;
+    }
+    cinfo->progress->pass_counter = 0L;
+    cinfo->progress->pass_limit = (long) cinfo->total_iMCU_rows * nscans;
+    cinfo->progress->completed_passes = 0;
+    cinfo->progress->total_passes = 1;
+  }
+}
diff --git a/uppsrc/plugin/jpg/lib/jerror.c b/uppsrc/plugin/jpg/lib/jerror.c
new file mode 100644
index 000000000..3da7be86a
--- /dev/null
+++ b/uppsrc/plugin/jpg/lib/jerror.c
@@ -0,0 +1,252 @@
+/*
+ * jerror.c
+ *
+ * Copyright (C) 1991-1998, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains simple error-reporting and trace-message routines.
+ * These are suitable for Unix-like systems and others where writing to
+ * stderr is the right thing to do.  Many applications will want to replace
+ * some or all of these routines.
+ *
+ * If you define USE_WINDOWS_MESSAGEBOX in jconfig.h or in the makefile,
+ * you get a Windows-specific hack to display error messages in a dialog box.
+ * It ain't much, but it beats dropping error messages into the bit bucket,
+ * which is what happens to output to stderr under most Windows C compilers.
+ *
+ * These routines are used by both the compression and decompression code.
+ */
+
+/* this is not a core library module, so it doesn't define JPEG_INTERNALS */
+#include "jinclude.h"
+#include "jpeglib.h"
+#include "jversion.h"
+#include "jerror.h"
+
+#ifdef USE_WINDOWS_MESSAGEBOX
+#include <windows.h>
+#endif
+
+#ifndef EXIT_FAILURE		/* define exit() codes if not provided */
+#define EXIT_FAILURE  1
+#endif
+
+
+/*
+ * Create the message string table.
+ * We do this from the master message list in jerror.h by re-reading
+ * jerror.h with a suitable definition for macro JMESSAGE.
+ * The message table is made an external symbol just in case any applications
+ * want to refer to it directly.
+ */
+
+#ifdef NEED_SHORT_EXTERNAL_NAMES
+#define jpeg_std_message_table	jMsgTable
+#endif
+
+#define JMESSAGE(code,string)	string ,
+
+const char * const jpeg_std_message_table[] = {
+#include "jerror.h"
+  NULL
+};
+
+
+/*
+ * Error exit handler: must not return to caller.
+ *
+ * Applications may override this if they want to get control back after
+ * an error.  Typically one would longjmp somewhere instead of exiting.
+ * The setjmp buffer can be made a private field within an expanded error
+ * handler object.  Note that the info needed to generate an error message
+ * is stored in the error object, so you can generate the message now or
+ * later, at your convenience.
+ * You should make sure that the JPEG object is cleaned up (with jpeg_abort
+ * or jpeg_destroy) at some point.
+ */
+
+METHODDEF(void)
+error_exit (j_common_ptr cinfo)
+{
+  /* Always display the message */
+  (*cinfo->err->output_message) (cinfo);
+
+  /* Let the memory manager delete any temp files before we die */
+  jpeg_destroy(cinfo);
+
+  exit(EXIT_FAILURE);
+}
+
+
+/*
+ * Actual output of an error or trace message.
+ * Applications may override this method to send JPEG messages somewhere
+ * other than stderr.
+ *
+ * On Windows, printing to stderr is generally completely useless,
+ * so we provide optional code to produce an error-dialog popup.
+ * Most Windows applications will still prefer to override this routine,
+ * but if they don't, it'll do something at least marginally useful.
+ *
+ * NOTE: to use the library in an environment that doesn't support the
+ * C stdio library, you may have to delete the call to fprintf() entirely,
+ * not just not use this routine.
+ */
+
+METHODDEF(void)
+output_message (j_common_ptr cinfo)
+{
+  char buffer[JMSG_LENGTH_MAX];
+
+  /* Create the message */
+  (*cinfo->err->format_message) (cinfo, buffer);
+
+#ifdef USE_WINDOWS_MESSAGEBOX
+  /* Display it in a message dialog box */
+  MessageBox(GetActiveWindow(), buffer, "JPEG Library Error",
+	     MB_OK | MB_ICONERROR);
+#else
+  /* Send it to stderr, adding a newline */
+  fprintf(stderr, "%s\n", buffer);
+#endif
+}
+
+
+/*
+ * Decide whether to emit a trace or warning message.
+ * msg_level is one of:
+ *   -1: recoverable corrupt-data warning, may want to abort.
+ *    0: important advisory messages (always display to user).
+ *    1: first level of tracing detail.
+ *    2,3,...: successively more detailed tracing messages.
+ * An application might override this method if it wanted to abort on warnings
+ * or change the policy about which messages to display.
+ */
+
+METHODDEF(void)
+emit_message (j_common_ptr cinfo, int msg_level)
+{
+  struct jpeg_error_mgr * err = cinfo->err;
+
+  if (msg_level < 0) {
+    /* It's a warning message.  Since corrupt files may generate many warnings,
+     * the policy implemented here is to show only the first warning,
+     * unless trace_level >= 3.
+     */
+    if (err->num_warnings == 0 || err->trace_level >= 3)
+      (*err->output_message) (cinfo);
+    /* Always count warnings in num_warnings. */
+    err->num_warnings++;
+  } else {
+    /* It's a trace message.  Show it if trace_level >= msg_level. */
+    if (err->trace_level >= msg_level)
+      (*err->output_message) (cinfo);
+  }
+}
+
+
+/*
+ * Format a message string for the most recent JPEG error or message.
+ * The message is stored into buffer, which should be at least JMSG_LENGTH_MAX
+ * characters.  Note that no '\n' character is added to the string.
+ * Few applications should need to override this method.
+ */
+
+METHODDEF(void)
+format_message (j_common_ptr cinfo, char * buffer)
+{
+  struct jpeg_error_mgr * err = cinfo->err;
+  int msg_code = err->msg_code;
+  const char * msgtext = NULL;
+  const char * msgptr;
+  char ch;
+  boolean isstring;
+
+  /* Look up message string in proper table */
+  if (msg_code > 0 && msg_code <= err->last_jpeg_message) {
+    msgtext = err->jpeg_message_table[msg_code];
+  } else if (err->addon_message_table != NULL &&
+	     msg_code >= err->first_addon_message &&
+	     msg_code <= err->last_addon_message) {
+    msgtext = err->addon_message_table[msg_code - err->first_addon_message];
+  }
+
+  /* Defend against bogus message number */
+  if (msgtext == NULL) {
+    err->msg_parm.i[0] = msg_code;
+    msgtext = err->jpeg_message_table[0];
+  }
+
+  /* Check for string parameter, as indicated by %s in the message text */
+  isstring = FALSE;
+  msgptr = msgtext;
+  while ((ch = *msgptr++) != '\0') {
+    if (ch == '%') {
+      if (*msgptr == 's') isstring = TRUE;
+      break;
+    }
+  }
+
+  /* Format the message into the passed buffer */
+  if (isstring)
+    sprintf(buffer, msgtext, err->msg_parm.s);
+  else
+    sprintf(buffer, msgtext,
+	    err->msg_parm.i[0], err->msg_parm.i[1],
+	    err->msg_parm.i[2], err->msg_parm.i[3],
+	    err->msg_parm.i[4], err->msg_parm.i[5],
+	    err->msg_parm.i[6], err->msg_parm.i[7]);
+}
+
+
+/*
+ * Reset error state variables at start of a new image.
+ * This is called during compression startup to reset trace/error
+ * processing to default state, without losing any application-specific
+ * method pointers.  An application might possibly want to override
+ * this method if it has additional error processing state.
+ */
+
+METHODDEF(void)
+reset_error_mgr (j_common_ptr cinfo)
+{
+  cinfo->err->num_warnings = 0;
+  /* trace_level is not reset since it is an application-supplied parameter */
+  cinfo->err->msg_code = 0;	/* may be useful as a flag for "no error" */
+}
+
+
+/*
+ * Fill in the standard error-handling methods in a jpeg_error_mgr object.
+ * Typical call is:
+ *	struct jpeg_compress_struct cinfo;
+ *	struct jpeg_error_mgr err;
+ *
+ *	cinfo.err = jpeg_std_error(&err);
+ * after which the application may override some of the methods.
+ */
+
+GLOBAL(struct jpeg_error_mgr *)
+jpeg_std_error (struct jpeg_error_mgr * err)
+{
+  err->error_exit = error_exit;
+  err->emit_message = emit_message;
+  err->output_message = output_message;
+  err->format_message = format_message;
+  err->reset_error_mgr = reset_error_mgr;
+
+  err->trace_level = 0;		/* default = no tracing */
+  err->num_warnings = 0;	/* no warnings emitted yet */
+  err->msg_code = 0;		/* may be useful as a flag for "no error" */
+
+  /* Initialize message table pointers */
+  err->jpeg_message_table = jpeg_std_message_table;
+  err->last_jpeg_message = (int) JMSG_LASTMSGCODE - 1;
+
+  err->addon_message_table = NULL;
+  err->first_addon_message = 0;	/* for safety */
+  err->last_addon_message = 0;
+
+  return err;
+}
diff --git a/uppsrc/plugin/jpg/lib/jerror.h b/uppsrc/plugin/jpg/lib/jerror.h
new file mode 100644
index 000000000..b38a05917
--- /dev/null
+++ b/uppsrc/plugin/jpg/lib/jerror.h
@@ -0,0 +1,304 @@
+/*
+ * jerror.h
+ *
+ * Copyright (C) 1994-1998, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file defines the error and message codes for the JPEG library.
+ * Edit this file to add new codes, or to translate the message strings to
+ * some other language.
+ * A set of error-reporting macros are defined too.  Some applications using
+ * the JPEG library may wish to include this file to get the error codes
+ * and/or the macros.
+ */
+
+/*
+ * To define the enum list of message codes, include this file without
+ * defining macro JMESSAGE.  To create a message string table, include it
+ * again with a suitable JMESSAGE definition (see jerror.c for an example).
+ */
+#ifndef JMESSAGE
+#ifndef JERROR_H
+/* First time through, define the enum list */
+#define JMAKE_ENUM_LIST
+#else
+/* Repeated inclusions of this file are no-ops unless JMESSAGE is defined */
+#define JMESSAGE(code,string)
+#endif /* JERROR_H */
+#endif /* JMESSAGE */
+
+#ifdef JMAKE_ENUM_LIST
+
+typedef enum {
+
+#define JMESSAGE(code,string)	code ,
+
+#endif /* JMAKE_ENUM_LIST */
+
+JMESSAGE(JMSG_NOMESSAGE, "Bogus message code %d") /* Must be first entry! */
+
+/* For maintenance convenience, list is alphabetical by message code name */
+JMESSAGE(JERR_ARITH_NOTIMPL,
+	 "Sorry, there are legal restrictions on arithmetic coding")
+JMESSAGE(JERR_BAD_ALIGN_TYPE, "ALIGN_TYPE is wrong, please fix")
+JMESSAGE(JERR_BAD_ALLOC_CHUNK, "MAX_ALLOC_CHUNK is wrong, please fix")
+JMESSAGE(JERR_BAD_BUFFER_MODE, "Bogus buffer control mode")
+JMESSAGE(JERR_BAD_COMPONENT_ID, "Invalid component ID %d in SOS")
+JMESSAGE(JERR_BAD_DCT_COEF, "DCT coefficient out of range")
+JMESSAGE(JERR_BAD_DCTSIZE, "IDCT output block size %d not supported")
+JMESSAGE(JERR_BAD_DIFF, "spatial difference out of range")
+JMESSAGE(JERR_BAD_HUFF_TABLE, "Bogus Huffman table definition")
+JMESSAGE(JERR_BAD_IN_COLORSPACE, "Bogus input colorspace")
+JMESSAGE(JERR_BAD_J_COLORSPACE, "Bogus JPEG colorspace")
+JMESSAGE(JERR_BAD_LENGTH, "Bogus marker length")
+JMESSAGE(JERR_BAD_LIB_VERSION,
+	 "Wrong JPEG library version: library is %d, caller expects %d")
+JMESSAGE(JERR_BAD_LOSSLESS,
+	 "Invalid lossless parameters Ss=%d Se=%d Ah=%d Al=%d")
+JMESSAGE(JERR_BAD_LOSSLESS_SCRIPT,
+	 "Invalid lossless parameters at scan script entry %d")
+JMESSAGE(JERR_BAD_MCU_SIZE, "Sampling factors too large for interleaved scan")
+JMESSAGE(JERR_BAD_POOL_ID, "Invalid memory pool code %d")
+JMESSAGE(JERR_BAD_PRECISION, "Unsupported JPEG data precision %d")
+JMESSAGE(JERR_BAD_PROGRESSION,
+	 "Invalid progressive parameters Ss=%d Se=%d Ah=%d Al=%d")
+JMESSAGE(JERR_BAD_PROG_SCRIPT,
+	 "Invalid progressive parameters at scan script entry %d")
+JMESSAGE(JERR_BAD_RESTART, "Invalid restart interval: %d, must be an integer multiple of the number of MCUs in an MCU_row (%d)")
+JMESSAGE(JERR_BAD_SAMPLING, "Bogus sampling factors")
+JMESSAGE(JERR_BAD_SCAN_SCRIPT, "Invalid scan script at entry %d")
+JMESSAGE(JERR_BAD_STATE, "Improper call to JPEG library in state %d")
+JMESSAGE(JERR_BAD_STRUCT_SIZE,
+	 "JPEG parameter struct mismatch: library thinks size is %u, caller expects %u")
+JMESSAGE(JERR_BAD_VIRTUAL_ACCESS, "Bogus virtual array access")
+JMESSAGE(JERR_BUFFER_SIZE, "Buffer passed to JPEG library is too small")
+JMESSAGE(JERR_CANT_SUSPEND, "Suspension not allowed here")
+JMESSAGE(JERR_CANT_TRANSCODE,
+	 "Cannot transcode to/from lossless JPEG datastreams")
+JMESSAGE(JERR_CCIR601_NOTIMPL, "CCIR601 sampling not implemented yet")
+JMESSAGE(JERR_COMPONENT_COUNT, "Too many color components: %d, max %d")
+JMESSAGE(JERR_CONVERSION_NOTIMPL, "Unsupported color conversion request")
+JMESSAGE(JERR_DAC_INDEX, "Bogus DAC index %d")
+JMESSAGE(JERR_DAC_VALUE, "Bogus DAC value 0x%x")
+JMESSAGE(JERR_DHT_INDEX, "Bogus DHT index %d")
+JMESSAGE(JERR_DQT_INDEX, "Bogus DQT index %d")
+JMESSAGE(JERR_EMPTY_IMAGE, "Empty JPEG image (DNL not supported)")
+JMESSAGE(JERR_EMS_READ, "Read from EMS failed")
+JMESSAGE(JERR_EMS_WRITE, "Write to EMS failed")
+JMESSAGE(JERR_EOI_EXPECTED, "Didn't expect more than one scan")
+JMESSAGE(JERR_FILE_READ, "Input file read error")
+JMESSAGE(JERR_FILE_WRITE, "Output file write error --- out of disk space?")
+JMESSAGE(JERR_FRACT_SAMPLE_NOTIMPL, "Fractional sampling not implemented yet")
+JMESSAGE(JERR_HUFF_CLEN_OVERFLOW, "Huffman code size table overflow")
+JMESSAGE(JERR_HUFF_MISSING_CODE, "Missing Huffman code table entry")
+JMESSAGE(JERR_IMAGE_TOO_BIG, "Maximum supported image dimension is %u pixels")
+JMESSAGE(JERR_INPUT_EMPTY, "Empty input file")
+JMESSAGE(JERR_INPUT_EOF, "Premature end of input file")
+JMESSAGE(JERR_MISMATCHED_QUANT_TABLE,
+	 "Cannot transcode due to multiple use of quantization table %d")
+JMESSAGE(JERR_MISSING_DATA, "Scan script does not transmit all data")
+JMESSAGE(JERR_MODE_CHANGE, "Invalid color quantization mode change")
+JMESSAGE(JERR_NOTIMPL, "Not implemented yet")
+JMESSAGE(JERR_NOT_COMPILED, "Requested feature was omitted at compile time")
+JMESSAGE(JERR_NO_BACKING_STORE, "Backing store not supported")
+JMESSAGE(JERR_NO_HUFF_TABLE, "Huffman table 0x%02x was not defined")
+JMESSAGE(JERR_NO_IMAGE, "JPEG datastream contains no image")
+JMESSAGE(JERR_NO_LOSSLESS_SCRIPT, "Lossless encoding was requested but no scan script was supplied")
+JMESSAGE(JERR_NO_QUANT_TABLE, "Quantization table 0x%02x was not defined")
+JMESSAGE(JERR_NO_SOI, "Not a JPEG file: starts with 0x%02x 0x%02x")
+JMESSAGE(JERR_OUT_OF_MEMORY, "Insufficient memory (case %d)")
+JMESSAGE(JERR_QUANT_COMPONENTS,
+	 "Cannot quantize more than %d color components")
+JMESSAGE(JERR_QUANT_FEW_COLORS, "Cannot quantize to fewer than %d colors")
+JMESSAGE(JERR_QUANT_MANY_COLORS, "Cannot quantize to more than %d colors")
+JMESSAGE(JERR_SOF_DUPLICATE, "Invalid JPEG file structure: two SOF markers")
+JMESSAGE(JERR_SOF_NO_SOS, "Invalid JPEG file structure: missing SOS marker")
+JMESSAGE(JERR_SOF_UNSUPPORTED, "Unsupported JPEG process: SOF type 0x%02x")
+JMESSAGE(JERR_SOI_DUPLICATE, "Invalid JPEG file structure: two SOI markers")
+JMESSAGE(JERR_SOS_NO_SOF, "Invalid JPEG file structure: SOS before SOF")
+JMESSAGE(JERR_TFILE_CREATE, "Failed to create temporary file %s")
+JMESSAGE(JERR_TFILE_READ, "Read failed on temporary file")
+JMESSAGE(JERR_TFILE_SEEK, "Seek failed on temporary file")
+JMESSAGE(JERR_TFILE_WRITE,
+	 "Write failed on temporary file --- out of disk space?")
+JMESSAGE(JERR_TOO_LITTLE_DATA, "Application transferred too few scanlines")
+JMESSAGE(JERR_UNKNOWN_MARKER, "Unsupported marker type 0x%02x")
+JMESSAGE(JERR_VIRTUAL_BUG, "Virtual array controller messed up")
+JMESSAGE(JERR_WIDTH_OVERFLOW, "Image too wide for this implementation")
+JMESSAGE(JERR_XMS_READ, "Read from XMS failed")
+JMESSAGE(JERR_XMS_WRITE, "Write to XMS failed")
+JMESSAGE(JMSG_COPYRIGHT, JCOPYRIGHT)
+JMESSAGE(JMSG_VERSION, JVERSION)
+JMESSAGE(JTRC_16BIT_TABLES,
+	 "Caution: quantization tables are too coarse for baseline JPEG")
+JMESSAGE(JTRC_ADOBE,
+	 "Adobe APP14 marker: version %d, flags 0x%04x 0x%04x, transform %d")
+JMESSAGE(JTRC_APP0, "Unknown APP0 marker (not JFIF), length %u")
+JMESSAGE(JTRC_APP14, "Unknown APP14 marker (not Adobe), length %u")
+JMESSAGE(JTRC_DAC, "Define Arithmetic Table 0x%02x: 0x%02x")
+JMESSAGE(JTRC_DHT, "Define Huffman Table 0x%02x")
+JMESSAGE(JTRC_DQT, "Define Quantization Table %d  precision %d")
+JMESSAGE(JTRC_DRI, "Define Restart Interval %u")
+JMESSAGE(JTRC_EMS_CLOSE, "Freed EMS handle %u")
+JMESSAGE(JTRC_EMS_OPEN, "Obtained EMS handle %u")
+JMESSAGE(JTRC_EOI, "End Of Image")
+JMESSAGE(JTRC_HUFFBITS, "        %3d %3d %3d %3d %3d %3d %3d %3d")
+JMESSAGE(JTRC_JFIF, "JFIF APP0 marker: version %d.%02d, density %dx%d  %d")
+JMESSAGE(JTRC_JFIF_BADTHUMBNAILSIZE,
+	 "Warning: thumbnail image size does not match data length %u")
+JMESSAGE(JTRC_JFIF_EXTENSION,
+	 "JFIF extension marker: type 0x%02x, length %u")
+JMESSAGE(JTRC_JFIF_THUMBNAIL, "    with %d x %d thumbnail image")
+JMESSAGE(JTRC_MISC_MARKER, "Miscellaneous marker 0x%02x, length %u")
+JMESSAGE(JTRC_PARMLESS_MARKER, "Unexpected marker 0x%02x")
+JMESSAGE(JTRC_QUANTVALS, "        %4u %4u %4u %4u %4u %4u %4u %4u")
+JMESSAGE(JTRC_QUANT_3_NCOLORS, "Quantizing to %d = %d*%d*%d colors")
+JMESSAGE(JTRC_QUANT_NCOLORS, "Quantizing to %d colors")
+JMESSAGE(JTRC_QUANT_SELECTED, "Selected %d colors for quantization")
+JMESSAGE(JTRC_RECOVERY_ACTION, "At marker 0x%02x, recovery action %d")
+JMESSAGE(JTRC_RST, "RST%d")
+JMESSAGE(JTRC_SMOOTH_NOTIMPL,
+	 "Smoothing not supported with nonstandard sampling ratios")
+JMESSAGE(JTRC_SOF, "Start Of Frame 0x%02x: width=%u, height=%u, components=%d")
+JMESSAGE(JTRC_SOF_COMPONENT, "    Component %d: %dhx%dv q=%d")
+JMESSAGE(JTRC_SOI, "Start of Image")
+JMESSAGE(JTRC_SOS, "Start Of Scan: %d components")
+JMESSAGE(JTRC_SOS_COMPONENT, "    Component %d: dc=%d ac=%d")
+JMESSAGE(JTRC_SOS_PARAMS, "  Ss=%d, Se=%d, Ah=%d, Al=%d")
+JMESSAGE(JTRC_TFILE_CLOSE, "Closed temporary file %s")
+JMESSAGE(JTRC_TFILE_OPEN, "Opened temporary file %s")
+JMESSAGE(JTRC_THUMB_JPEG,
+	 "JFIF extension marker: JPEG-compressed thumbnail image, length %u")
+JMESSAGE(JTRC_THUMB_PALETTE,
+	 "JFIF extension marker: palette thumbnail image, length %u")
+JMESSAGE(JTRC_THUMB_RGB,
+	 "JFIF extension marker: RGB thumbnail image, length %u")
+JMESSAGE(JTRC_UNKNOWN_LOSSLESS_IDS,
+	 "Unrecognized component IDs %d %d %d, assuming RGB")
+JMESSAGE(JTRC_UNKNOWN_LOSSY_IDS,
+	 "Unrecognized component IDs %d %d %d, assuming YCbCr")
+JMESSAGE(JTRC_XMS_CLOSE, "Freed XMS handle %u")
+JMESSAGE(JTRC_XMS_OPEN, "Obtained XMS handle %u")
+JMESSAGE(JWRN_ADOBE_XFORM, "Unknown Adobe color transform code %d")
+JMESSAGE(JWRN_BOGUS_PROGRESSION,
+	 "Inconsistent progression sequence for component %d coefficient %d")
+JMESSAGE(JWRN_EXTRANEOUS_DATA,
+	 "Corrupt JPEG data: %u extraneous bytes before marker 0x%02x")
+JMESSAGE(JWRN_HIT_MARKER, "Corrupt JPEG data: premature end of data segment")
+JMESSAGE(JWRN_HUFF_BAD_CODE, "Corrupt JPEG data: bad Huffman code")
+JMESSAGE(JWRN_JFIF_MAJOR, "Warning: unknown JFIF revision number %d.%02d")
+JMESSAGE(JWRN_JPEG_EOF, "Premature end of JPEG file")
+JMESSAGE(JWRN_MUST_DOWNSCALE,
+	 "Must downscale data from %d bits to %d")
+JMESSAGE(JWRN_MUST_RESYNC,
+	 "Corrupt JPEG data: found marker 0x%02x instead of RST%d")
+JMESSAGE(JWRN_NOT_SEQUENTIAL, "Invalid SOS parameters for sequential JPEG")
+JMESSAGE(JWRN_TOO_MUCH_DATA, "Application transferred too many scanlines")
+
+#ifdef JMAKE_ENUM_LIST
+
+  JMSG_LASTMSGCODE
+} J_MESSAGE_CODE;
+
+#undef JMAKE_ENUM_LIST
+#endif /* JMAKE_ENUM_LIST */
+
+/* Zap JMESSAGE macro so that future re-inclusions do nothing by default */
+#undef JMESSAGE
+
+
+#ifndef JERROR_H
+#define JERROR_H
+
+/* Macros to simplify using the error and trace message stuff */
+/* The first parameter is either type of cinfo pointer */
+
+/* Fatal errors (print message and exit) */
+#define ERREXIT(cinfo,code)  \
+  ((cinfo)->err->msg_code = (code), \
+   (*(cinfo)->err->error_exit) ((j_common_ptr) (cinfo)))
+#define ERREXIT1(cinfo,code,p1)  \
+  ((cinfo)->err->msg_code = (code), \
+   (cinfo)->err->msg_parm.i[0] = (p1), \
+   (*(cinfo)->err->error_exit) ((j_common_ptr) (cinfo)))
+#define ERREXIT2(cinfo,code,p1,p2)  \
+  ((cinfo)->err->msg_code = (code), \
+   (cinfo)->err->msg_parm.i[0] = (p1), \
+   (cinfo)->err->msg_parm.i[1] = (p2), \
+   (*(cinfo)->err->error_exit) ((j_common_ptr) (cinfo)))
+#define ERREXIT3(cinfo,code,p1,p2,p3)  \
+  ((cinfo)->err->msg_code = (code), \
+   (cinfo)->err->msg_parm.i[0] = (p1), \
+   (cinfo)->err->msg_parm.i[1] = (p2), \
+   (cinfo)->err->msg_parm.i[2] = (p3), \
+   (*(cinfo)->err->error_exit) ((j_common_ptr) (cinfo)))
+#define ERREXIT4(cinfo,code,p1,p2,p3,p4)  \
+  ((cinfo)->err->msg_code = (code), \
+   (cinfo)->err->msg_parm.i[0] = (p1), \
+   (cinfo)->err->msg_parm.i[1] = (p2), \
+   (cinfo)->err->msg_parm.i[2] = (p3), \
+   (cinfo)->err->msg_parm.i[3] = (p4), \
+   (*(cinfo)->err->error_exit) ((j_common_ptr) (cinfo)))
+#define ERREXITS(cinfo,code,str)  \
+  ((cinfo)->err->msg_code = (code), \
+   strncpy((cinfo)->err->msg_parm.s, (str), JMSG_STR_PARM_MAX), \
+   (*(cinfo)->err->error_exit) ((j_common_ptr) (cinfo)))
+
+#define MAKESTMT(stuff)		do { stuff } while (0)
+
+/* Nonfatal errors (we can keep going, but the data is probably corrupt) */
+#define WARNMS(cinfo,code)  \
+  ((cinfo)->err->msg_code = (code), \
+   (*(cinfo)->err->emit_message) ((j_common_ptr) (cinfo), -1))
+#define WARNMS1(cinfo,code,p1)  \
+  ((cinfo)->err->msg_code = (code), \
+   (cinfo)->err->msg_parm.i[0] = (p1), \
+   (*(cinfo)->err->emit_message) ((j_common_ptr) (cinfo), -1))
+#define WARNMS2(cinfo,code,p1,p2)  \
+  ((cinfo)->err->msg_code = (code), \
+   (cinfo)->err->msg_parm.i[0] = (p1), \
+   (cinfo)->err->msg_parm.i[1] = (p2), \
+   (*(cinfo)->err->emit_message) ((j_common_ptr) (cinfo), -1))
+
+/* Informational/debugging messages */
+#define TRACEMS(cinfo,lvl,code)  \
+  ((cinfo)->err->msg_code = (code), \
+   (*(cinfo)->err->emit_message) ((j_common_ptr) (cinfo), (lvl)))
+#define TRACEMS1(cinfo,lvl,code,p1)  \
+  ((cinfo)->err->msg_code = (code), \
+   (cinfo)->err->msg_parm.i[0] = (p1), \
+   (*(cinfo)->err->emit_message) ((j_common_ptr) (cinfo), (lvl)))
+#define TRACEMS2(cinfo,lvl,code,p1,p2)  \
+  ((cinfo)->err->msg_code = (code), \
+   (cinfo)->err->msg_parm.i[0] = (p1), \
+   (cinfo)->err->msg_parm.i[1] = (p2), \
+   (*(cinfo)->err->emit_message) ((j_common_ptr) (cinfo), (lvl)))
+#define TRACEMS3(cinfo,lvl,code,p1,p2,p3)  \
+  MAKESTMT(int * _mp = (cinfo)->err->msg_parm.i; \
+	   _mp[0] = (p1); _mp[1] = (p2); _mp[2] = (p3); \
+	   (cinfo)->err->msg_code = (code); \
+	   (*(cinfo)->err->emit_message) ((j_common_ptr) (cinfo), (lvl)); )
+#define TRACEMS4(cinfo,lvl,code,p1,p2,p3,p4)  \
+  MAKESTMT(int * _mp = (cinfo)->err->msg_parm.i; \
+	   _mp[0] = (p1); _mp[1] = (p2); _mp[2] = (p3); _mp[3] = (p4); \
+	   (cinfo)->err->msg_code = (code); \
+	   (*(cinfo)->err->emit_message) ((j_common_ptr) (cinfo), (lvl)); )
+#define TRACEMS5(cinfo,lvl,code,p1,p2,p3,p4,p5)  \
+  MAKESTMT(int * _mp = (cinfo)->err->msg_parm.i; \
+	   _mp[0] = (p1); _mp[1] = (p2); _mp[2] = (p3); _mp[3] = (p4); \
+	   _mp[4] = (p5); \
+	   (cinfo)->err->msg_code = (code); \
+	   (*(cinfo)->err->emit_message) ((j_common_ptr) (cinfo), (lvl)); )
+#define TRACEMS8(cinfo,lvl,code,p1,p2,p3,p4,p5,p6,p7,p8)  \
+  MAKESTMT(int * _mp = (cinfo)->err->msg_parm.i; \
+	   _mp[0] = (p1); _mp[1] = (p2); _mp[2] = (p3); _mp[3] = (p4); \
+	   _mp[4] = (p5); _mp[5] = (p6); _mp[6] = (p7); _mp[7] = (p8); \
+	   (cinfo)->err->msg_code = (code); \
+	   (*(cinfo)->err->emit_message) ((j_common_ptr) (cinfo), (lvl)); )
+#define TRACEMSS(cinfo,lvl,code,str)  \
+  ((cinfo)->err->msg_code = (code), \
+   strncpy((cinfo)->err->msg_parm.s, (str), JMSG_STR_PARM_MAX), \
+   (*(cinfo)->err->emit_message) ((j_common_ptr) (cinfo), (lvl)))
+
+#endif /* JERROR_H */
diff --git a/uppsrc/plugin/jpg/lib/jfdctflt.c b/uppsrc/plugin/jpg/lib/jfdctflt.c
new file mode 100644
index 000000000..13c9ed147
--- /dev/null
+++ b/uppsrc/plugin/jpg/lib/jfdctflt.c
@@ -0,0 +1,168 @@
+/*
+ * jfdctflt.c
+ *
+ * Copyright (C) 1994-1996, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains a floating-point implementation of the
+ * forward DCT (Discrete Cosine Transform).
+ *
+ * This implementation should be more accurate than either of the integer
+ * DCT implementations.  However, it may not give the same results on all
+ * machines because of differences in roundoff behavior.  Speed will depend
+ * on the hardware's floating point capacity.
+ *
+ * A 2-D DCT can be done by 1-D DCT on each row followed by 1-D DCT
+ * on each column.  Direct algorithms are also available, but they are
+ * much more complex and seem not to be any faster when reduced to code.
+ *
+ * This implementation is based on Arai, Agui, and Nakajima's algorithm for
+ * scaled DCT.  Their original paper (Trans. IEICE E-71(11):1095) is in
+ * Japanese, but the algorithm is described in the Pennebaker & Mitchell
+ * JPEG textbook (see REFERENCES section in file README).  The following code
+ * is based directly on figure 4-8 in P&M.
+ * While an 8-point DCT cannot be done in less than 11 multiplies, it is
+ * possible to arrange the computation so that many of the multiplies are
+ * simple scalings of the final outputs.  These multiplies can then be
+ * folded into the multiplications or divisions by the JPEG quantization
+ * table entries.  The AA&N method leaves only 5 multiplies and 29 adds
+ * to be done in the DCT itself.
+ * The primary disadvantage of this method is that with a fixed-point
+ * implementation, accuracy is lost due to imprecise representation of the
+ * scaled quantization values.  However, that problem does not arise if
+ * we use floating point arithmetic.
+ */
+
+#define JPEG_INTERNALS
+#include "jinclude.h"
+#include "jpeglib.h"
+#include "jdct.h"		/* Private declarations for DCT subsystem */
+
+#ifdef DCT_FLOAT_SUPPORTED
+
+
+/*
+ * This module is specialized to the case DCTSIZE = 8.
+ */
+
+#if DCTSIZE != 8
+  Sorry, this code only copes with 8x8 DCTs. /* deliberate syntax err */
+#endif
+
+
+/*
+ * Perform the forward DCT on one block of samples.
+ */
+
+GLOBAL(void)
+jpeg_fdct_float (FAST_FLOAT * data)
+{
+  FAST_FLOAT tmp0, tmp1, tmp2, tmp3, tmp4, tmp5, tmp6, tmp7;
+  FAST_FLOAT tmp10, tmp11, tmp12, tmp13;
+  FAST_FLOAT z1, z2, z3, z4, z5, z11, z13;
+  FAST_FLOAT *dataptr;
+  int ctr;
+
+  /* Pass 1: process rows. */
+
+  dataptr = data;
+  for (ctr = DCTSIZE-1; ctr >= 0; ctr--) {
+    tmp0 = dataptr[0] + dataptr[7];
+    tmp7 = dataptr[0] - dataptr[7];
+    tmp1 = dataptr[1] + dataptr[6];
+    tmp6 = dataptr[1] - dataptr[6];
+    tmp2 = dataptr[2] + dataptr[5];
+    tmp5 = dataptr[2] - dataptr[5];
+    tmp3 = dataptr[3] + dataptr[4];
+    tmp4 = dataptr[3] - dataptr[4];
+
+    /* Even part */
+
+    tmp10 = tmp0 + tmp3;	/* phase 2 */
+    tmp13 = tmp0 - tmp3;
+    tmp11 = tmp1 + tmp2;
+    tmp12 = tmp1 - tmp2;
+
+    dataptr[0] = tmp10 + tmp11; /* phase 3 */
+    dataptr[4] = tmp10 - tmp11;
+
+    z1 = (tmp12 + tmp13) * ((FAST_FLOAT) 0.707106781); /* c4 */
+    dataptr[2] = tmp13 + z1;	/* phase 5 */
+    dataptr[6] = tmp13 - z1;
+
+    /* Odd part */
+
+    tmp10 = tmp4 + tmp5;	/* phase 2 */
+    tmp11 = tmp5 + tmp6;
+    tmp12 = tmp6 + tmp7;
+
+    /* The rotator is modified from fig 4-8 to avoid extra negations. */
+    z5 = (tmp10 - tmp12) * ((FAST_FLOAT) 0.382683433); /* c6 */
+    z2 = ((FAST_FLOAT) 0.541196100) * tmp10 + z5; /* c2-c6 */
+    z4 = ((FAST_FLOAT) 1.306562965) * tmp12 + z5; /* c2+c6 */
+    z3 = tmp11 * ((FAST_FLOAT) 0.707106781); /* c4 */
+
+    z11 = tmp7 + z3;		/* phase 5 */
+    z13 = tmp7 - z3;
+
+    dataptr[5] = z13 + z2;	/* phase 6 */
+    dataptr[3] = z13 - z2;
+    dataptr[1] = z11 + z4;
+    dataptr[7] = z11 - z4;
+
+    dataptr += DCTSIZE;		/* advance pointer to next row */
+  }
+
+  /* Pass 2: process columns. */
+
+  dataptr = data;
+  for (ctr = DCTSIZE-1; ctr >= 0; ctr--) {
+    tmp0 = dataptr[DCTSIZE*0] + dataptr[DCTSIZE*7];
+    tmp7 = dataptr[DCTSIZE*0] - dataptr[DCTSIZE*7];
+    tmp1 = dataptr[DCTSIZE*1] + dataptr[DCTSIZE*6];
+    tmp6 = dataptr[DCTSIZE*1] - dataptr[DCTSIZE*6];
+    tmp2 = dataptr[DCTSIZE*2] + dataptr[DCTSIZE*5];
+    tmp5 = dataptr[DCTSIZE*2] - dataptr[DCTSIZE*5];
+    tmp3 = dataptr[DCTSIZE*3] + dataptr[DCTSIZE*4];
+    tmp4 = dataptr[DCTSIZE*3] - dataptr[DCTSIZE*4];
+
+    /* Even part */
+
+    tmp10 = tmp0 + tmp3;	/* phase 2 */
+    tmp13 = tmp0 - tmp3;
+    tmp11 = tmp1 + tmp2;
+    tmp12 = tmp1 - tmp2;
+
+    dataptr[DCTSIZE*0] = tmp10 + tmp11; /* phase 3 */
+    dataptr[DCTSIZE*4] = tmp10 - tmp11;
+
+    z1 = (tmp12 + tmp13) * ((FAST_FLOAT) 0.707106781); /* c4 */
+    dataptr[DCTSIZE*2] = tmp13 + z1; /* phase 5 */
+    dataptr[DCTSIZE*6] = tmp13 - z1;
+
+    /* Odd part */
+
+    tmp10 = tmp4 + tmp5;	/* phase 2 */
+    tmp11 = tmp5 + tmp6;
+    tmp12 = tmp6 + tmp7;
+
+    /* The rotator is modified from fig 4-8 to avoid extra negations. */
+    z5 = (tmp10 - tmp12) * ((FAST_FLOAT) 0.382683433); /* c6 */
+    z2 = ((FAST_FLOAT) 0.541196100) * tmp10 + z5; /* c2-c6 */
+    z4 = ((FAST_FLOAT) 1.306562965) * tmp12 + z5; /* c2+c6 */
+    z3 = tmp11 * ((FAST_FLOAT) 0.707106781); /* c4 */
+
+    z11 = tmp7 + z3;		/* phase 5 */
+    z13 = tmp7 - z3;
+
+    dataptr[DCTSIZE*5] = z13 + z2; /* phase 6 */
+    dataptr[DCTSIZE*3] = z13 - z2;
+    dataptr[DCTSIZE*1] = z11 + z4;
+    dataptr[DCTSIZE*7] = z11 - z4;
+
+    dataptr++;			/* advance pointer to next column */
+  }
+}
+
+#endif /* DCT_FLOAT_SUPPORTED */
diff --git a/uppsrc/plugin/jpg/lib/jfdctfst.c b/uppsrc/plugin/jpg/lib/jfdctfst.c
new file mode 100644
index 000000000..6c19cf9f2
--- /dev/null
+++ b/uppsrc/plugin/jpg/lib/jfdctfst.c
@@ -0,0 +1,224 @@
+/*
+ * jfdctfst.c
+ *
+ * Copyright (C) 1994-1996, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains a fast, not so accurate integer implementation of the
+ * forward DCT (Discrete Cosine Transform).
+ *
+ * A 2-D DCT can be done by 1-D DCT on each row followed by 1-D DCT
+ * on each column.  Direct algorithms are also available, but they are
+ * much more complex and seem not to be any faster when reduced to code.
+ *
+ * This implementation is based on Arai, Agui, and Nakajima's algorithm for
+ * scaled DCT.  Their original paper (Trans. IEICE E-71(11):1095) is in
+ * Japanese, but the algorithm is described in the Pennebaker & Mitchell
+ * JPEG textbook (see REFERENCES section in file README).  The following code
+ * is based directly on figure 4-8 in P&M.
+ * While an 8-point DCT cannot be done in less than 11 multiplies, it is
+ * possible to arrange the computation so that many of the multiplies are
+ * simple scalings of the final outputs.  These multiplies can then be
+ * folded into the multiplications or divisions by the JPEG quantization
+ * table entries.  The AA&N method leaves only 5 multiplies and 29 adds
+ * to be done in the DCT itself.
+ * The primary disadvantage of this method is that with fixed-point math,
+ * accuracy is lost due to imprecise representation of the scaled
+ * quantization values.  The smaller the quantization table entry, the less
+ * precise the scaled value, so this implementation does worse with high-
+ * quality-setting files than with low-quality ones.
+ */
+
+#define JPEG_INTERNALS
+#include "jinclude.h"
+#include "jpeglib.h"
+#include "jdct.h"		/* Private declarations for DCT subsystem */
+
+#ifdef DCT_IFAST_SUPPORTED
+
+
+/*
+ * This module is specialized to the case DCTSIZE = 8.
+ */
+
+#if DCTSIZE != 8
+  Sorry, this code only copes with 8x8 DCTs. /* deliberate syntax err */
+#endif
+
+
+/* Scaling decisions are generally the same as in the LL&M algorithm;
+ * see jfdctint.c for more details.  However, we choose to descale
+ * (right shift) multiplication products as soon as they are formed,
+ * rather than carrying additional fractional bits into subsequent additions.
+ * This compromises accuracy slightly, but it lets us save a few shifts.
+ * More importantly, 16-bit arithmetic is then adequate (for 8-bit samples)
+ * everywhere except in the multiplications proper; this saves a good deal
+ * of work on 16-bit-int machines.
+ *
+ * Again to save a few shifts, the intermediate results between pass 1 and
+ * pass 2 are not upscaled, but are represented only to integral precision.
+ *
+ * A final compromise is to represent the multiplicative constants to only
+ * 8 fractional bits, rather than 13.  This saves some shifting work on some
+ * machines, and may also reduce the cost of multiplication (since there
+ * are fewer one-bits in the constants).
+ */
+
+#define CONST_BITS  8
+
+
+/* Some C compilers fail to reduce "FIX(constant)" at compile time, thus
+ * causing a lot of useless floating-point operations at run time.
+ * To get around this we use the following pre-calculated constants.
+ * If you change CONST_BITS you may want to add appropriate values.
+ * (With a reasonable C compiler, you can just rely on the FIX() macro...)
+ */
+
+#if CONST_BITS == 8
+#define FIX_0_382683433  ((INT32)   98)		/* FIX(0.382683433) */
+#define FIX_0_541196100  ((INT32)  139)		/* FIX(0.541196100) */
+#define FIX_0_707106781  ((INT32)  181)		/* FIX(0.707106781) */
+#define FIX_1_306562965  ((INT32)  334)		/* FIX(1.306562965) */
+#else
+#define FIX_0_382683433  FIX(0.382683433)
+#define FIX_0_541196100  FIX(0.541196100)
+#define FIX_0_707106781  FIX(0.707106781)
+#define FIX_1_306562965  FIX(1.306562965)
+#endif
+
+
+/* We can gain a little more speed, with a further compromise in accuracy,
+ * by omitting the addition in a descaling shift.  This yields an incorrectly
+ * rounded result half the time...
+ */
+
+#ifndef USE_ACCURATE_ROUNDING
+#undef DESCALE
+#define DESCALE(x,n)  RIGHT_SHIFT(x, n)
+#endif
+
+
+/* Multiply a DCTELEM variable by an INT32 constant, and immediately
+ * descale to yield a DCTELEM result.
+ */
+
+#define MULTIPLY(var,const)  ((DCTELEM) DESCALE((var) * (const), CONST_BITS))
+
+
+/*
+ * Perform the forward DCT on one block of samples.
+ */
+
+GLOBAL(void)
+jpeg_fdct_ifast (DCTELEM * data)
+{
+  DCTELEM tmp0, tmp1, tmp2, tmp3, tmp4, tmp5, tmp6, tmp7;
+  DCTELEM tmp10, tmp11, tmp12, tmp13;
+  DCTELEM z1, z2, z3, z4, z5, z11, z13;
+  DCTELEM *dataptr;
+  int ctr;
+  SHIFT_TEMPS
+
+  /* Pass 1: process rows. */
+
+  dataptr = data;
+  for (ctr = DCTSIZE-1; ctr >= 0; ctr--) {
+    tmp0 = dataptr[0] + dataptr[7];
+    tmp7 = dataptr[0] - dataptr[7];
+    tmp1 = dataptr[1] + dataptr[6];
+    tmp6 = dataptr[1] - dataptr[6];
+    tmp2 = dataptr[2] + dataptr[5];
+    tmp5 = dataptr[2] - dataptr[5];
+    tmp3 = dataptr[3] + dataptr[4];
+    tmp4 = dataptr[3] - dataptr[4];
+
+    /* Even part */
+
+    tmp10 = tmp0 + tmp3;	/* phase 2 */
+    tmp13 = tmp0 - tmp3;
+    tmp11 = tmp1 + tmp2;
+    tmp12 = tmp1 - tmp2;
+
+    dataptr[0] = tmp10 + tmp11; /* phase 3 */
+    dataptr[4] = tmp10 - tmp11;
+
+    z1 = MULTIPLY(tmp12 + tmp13, FIX_0_707106781); /* c4 */
+    dataptr[2] = tmp13 + z1;	/* phase 5 */
+    dataptr[6] = tmp13 - z1;
+
+    /* Odd part */
+
+    tmp10 = tmp4 + tmp5;	/* phase 2 */
+    tmp11 = tmp5 + tmp6;
+    tmp12 = tmp6 + tmp7;
+
+    /* The rotator is modified from fig 4-8 to avoid extra negations. */
+    z5 = MULTIPLY(tmp10 - tmp12, FIX_0_382683433); /* c6 */
+    z2 = MULTIPLY(tmp10, FIX_0_541196100) + z5; /* c2-c6 */
+    z4 = MULTIPLY(tmp12, FIX_1_306562965) + z5; /* c2+c6 */
+    z3 = MULTIPLY(tmp11, FIX_0_707106781); /* c4 */
+
+    z11 = tmp7 + z3;		/* phase 5 */
+    z13 = tmp7 - z3;
+
+    dataptr[5] = z13 + z2;	/* phase 6 */
+    dataptr[3] = z13 - z2;
+    dataptr[1] = z11 + z4;
+    dataptr[7] = z11 - z4;
+
+    dataptr += DCTSIZE;		/* advance pointer to next row */
+  }
+
+  /* Pass 2: process columns. */
+
+  dataptr = data;
+  for (ctr = DCTSIZE-1; ctr >= 0; ctr--) {
+    tmp0 = dataptr[DCTSIZE*0] + dataptr[DCTSIZE*7];
+    tmp7 = dataptr[DCTSIZE*0] - dataptr[DCTSIZE*7];
+    tmp1 = dataptr[DCTSIZE*1] + dataptr[DCTSIZE*6];
+    tmp6 = dataptr[DCTSIZE*1] - dataptr[DCTSIZE*6];
+    tmp2 = dataptr[DCTSIZE*2] + dataptr[DCTSIZE*5];
+    tmp5 = dataptr[DCTSIZE*2] - dataptr[DCTSIZE*5];
+    tmp3 = dataptr[DCTSIZE*3] + dataptr[DCTSIZE*4];
+    tmp4 = dataptr[DCTSIZE*3] - dataptr[DCTSIZE*4];
+
+    /* Even part */
+
+    tmp10 = tmp0 + tmp3;	/* phase 2 */
+    tmp13 = tmp0 - tmp3;
+    tmp11 = tmp1 + tmp2;
+    tmp12 = tmp1 - tmp2;
+
+    dataptr[DCTSIZE*0] = tmp10 + tmp11; /* phase 3 */
+    dataptr[DCTSIZE*4] = tmp10 - tmp11;
+
+    z1 = MULTIPLY(tmp12 + tmp13, FIX_0_707106781); /* c4 */
+    dataptr[DCTSIZE*2] = tmp13 + z1; /* phase 5 */
+    dataptr[DCTSIZE*6] = tmp13 - z1;
+
+    /* Odd part */
+
+    tmp10 = tmp4 + tmp5;	/* phase 2 */
+    tmp11 = tmp5 + tmp6;
+    tmp12 = tmp6 + tmp7;
+
+    /* The rotator is modified from fig 4-8 to avoid extra negations. */
+    z5 = MULTIPLY(tmp10 - tmp12, FIX_0_382683433); /* c6 */
+    z2 = MULTIPLY(tmp10, FIX_0_541196100) + z5; /* c2-c6 */
+    z4 = MULTIPLY(tmp12, FIX_1_306562965) + z5; /* c2+c6 */
+    z3 = MULTIPLY(tmp11, FIX_0_707106781); /* c4 */
+
+    z11 = tmp7 + z3;		/* phase 5 */
+    z13 = tmp7 - z3;
+
+    dataptr[DCTSIZE*5] = z13 + z2; /* phase 6 */
+    dataptr[DCTSIZE*3] = z13 - z2;
+    dataptr[DCTSIZE*1] = z11 + z4;
+    dataptr[DCTSIZE*7] = z11 - z4;
+
+    dataptr++;			/* advance pointer to next column */
+  }
+}
+
+#endif /* DCT_IFAST_SUPPORTED */
diff --git a/uppsrc/plugin/jpg/lib/jfdctint.c b/uppsrc/plugin/jpg/lib/jfdctint.c
new file mode 100644
index 000000000..6b268e45a
--- /dev/null
+++ b/uppsrc/plugin/jpg/lib/jfdctint.c
@@ -0,0 +1,283 @@
+/*
+ * jfdctint.c
+ *
+ * Copyright (C) 1991-1996, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains a slow-but-accurate integer implementation of the
+ * forward DCT (Discrete Cosine Transform).
+ *
+ * A 2-D DCT can be done by 1-D DCT on each row followed by 1-D DCT
+ * on each column.  Direct algorithms are also available, but they are
+ * much more complex and seem not to be any faster when reduced to code.
+ *
+ * This implementation is based on an algorithm described in
+ *   C. Loeffler, A. Ligtenberg and G. Moschytz, "Practical Fast 1-D DCT
+ *   Algorithms with 11 Multiplications", Proc. Int'l. Conf. on Acoustics,
+ *   Speech, and Signal Processing 1989 (ICASSP '89), pp. 988-991.
+ * The primary algorithm described there uses 11 multiplies and 29 adds.
+ * We use their alternate method with 12 multiplies and 32 adds.
+ * The advantage of this method is that no data path contains more than one
+ * multiplication; this allows a very simple and accurate implementation in
+ * scaled fixed-point arithmetic, with a minimal number of shifts.
+ */
+
+#define JPEG_INTERNALS
+#include "jinclude.h"
+#include "jpeglib.h"
+#include "jdct.h"		/* Private declarations for DCT subsystem */
+
+#ifdef DCT_ISLOW_SUPPORTED
+
+
+/*
+ * This module is specialized to the case DCTSIZE = 8.
+ */
+
+#if DCTSIZE != 8
+  Sorry, this code only copes with 8x8 DCTs. /* deliberate syntax err */
+#endif
+
+
+/*
+ * The poop on this scaling stuff is as follows:
+ *
+ * Each 1-D DCT step produces outputs which are a factor of sqrt(N)
+ * larger than the true DCT outputs.  The final outputs are therefore
+ * a factor of N larger than desired; since N=8 this can be cured by
+ * a simple right shift at the end of the algorithm.  The advantage of
+ * this arrangement is that we save two multiplications per 1-D DCT,
+ * because the y0 and y4 outputs need not be divided by sqrt(N).
+ * In the IJG code, this factor of 8 is removed by the quantization step
+ * (in jcdctmgr.c), NOT in this module.
+ *
+ * We have to do addition and subtraction of the integer inputs, which
+ * is no problem, and multiplication by fractional constants, which is
+ * a problem to do in integer arithmetic.  We multiply all the constants
+ * by CONST_SCALE and convert them to integer constants (thus retaining
+ * CONST_BITS bits of precision in the constants).  After doing a
+ * multiplication we have to divide the product by CONST_SCALE, with proper
+ * rounding, to produce the correct output.  This division can be done
+ * cheaply as a right shift of CONST_BITS bits.  We postpone shifting
+ * as long as possible so that partial sums can be added together with
+ * full fractional precision.
+ *
+ * The outputs of the first pass are scaled up by PASS1_BITS bits so that
+ * they are represented to better-than-integral precision.  These outputs
+ * require BITS_IN_JSAMPLE + PASS1_BITS + 3 bits; this fits in a 16-bit word
+ * with the recommended scaling.  (For 12-bit sample data, the intermediate
+ * array is INT32 anyway.)
+ *
+ * To avoid overflow of the 32-bit intermediate results in pass 2, we must
+ * have BITS_IN_JSAMPLE + CONST_BITS + PASS1_BITS <= 26.  Error analysis
+ * shows that the values given below are the most effective.
+ */
+
+#if BITS_IN_JSAMPLE == 8
+#define CONST_BITS  13
+#define PASS1_BITS  2
+#else
+#define CONST_BITS  13
+#define PASS1_BITS  1		/* lose a little precision to avoid overflow */
+#endif
+
+/* Some C compilers fail to reduce "FIX(constant)" at compile time, thus
+ * causing a lot of useless floating-point operations at run time.
+ * To get around this we use the following pre-calculated constants.
+ * If you change CONST_BITS you may want to add appropriate values.
+ * (With a reasonable C compiler, you can just rely on the FIX() macro...)
+ */
+
+#if CONST_BITS == 13
+#define FIX_0_298631336  ((INT32)  2446)	/* FIX(0.298631336) */
+#define FIX_0_390180644  ((INT32)  3196)	/* FIX(0.390180644) */
+#define FIX_0_541196100  ((INT32)  4433)	/* FIX(0.541196100) */
+#define FIX_0_765366865  ((INT32)  6270)	/* FIX(0.765366865) */
+#define FIX_0_899976223  ((INT32)  7373)	/* FIX(0.899976223) */
+#define FIX_1_175875602  ((INT32)  9633)	/* FIX(1.175875602) */
+#define FIX_1_501321110  ((INT32)  12299)	/* FIX(1.501321110) */
+#define FIX_1_847759065  ((INT32)  15137)	/* FIX(1.847759065) */
+#define FIX_1_961570560  ((INT32)  16069)	/* FIX(1.961570560) */
+#define FIX_2_053119869  ((INT32)  16819)	/* FIX(2.053119869) */
+#define FIX_2_562915447  ((INT32)  20995)	/* FIX(2.562915447) */
+#define FIX_3_072711026  ((INT32)  25172)	/* FIX(3.072711026) */
+#else
+#define FIX_0_298631336  FIX(0.298631336)
+#define FIX_0_390180644  FIX(0.390180644)
+#define FIX_0_541196100  FIX(0.541196100)
+#define FIX_0_765366865  FIX(0.765366865)
+#define FIX_0_899976223  FIX(0.899976223)
+#define FIX_1_175875602  FIX(1.175875602)
+#define FIX_1_501321110  FIX(1.501321110)
+#define FIX_1_847759065  FIX(1.847759065)
+#define FIX_1_961570560  FIX(1.961570560)
+#define FIX_2_053119869  FIX(2.053119869)
+#define FIX_2_562915447  FIX(2.562915447)
+#define FIX_3_072711026  FIX(3.072711026)
+#endif
+
+
+/* Multiply an INT32 variable by an INT32 constant to yield an INT32 result.
+ * For 8-bit samples with the recommended scaling, all the variable
+ * and constant values involved are no more than 16 bits wide, so a
+ * 16x16->32 bit multiply can be used instead of a full 32x32 multiply.
+ * For 12-bit samples, a full 32-bit multiplication will be needed.
+ */
+
+#if BITS_IN_JSAMPLE == 8
+#define MULTIPLY(var,const)  MULTIPLY16C16(var,const)
+#else
+#define MULTIPLY(var,const)  ((var) * (const))
+#endif
+
+
+/*
+ * Perform the forward DCT on one block of samples.
+ */
+
+GLOBAL(void)
+jpeg_fdct_islow (DCTELEM * data)
+{
+  INT32 tmp0, tmp1, tmp2, tmp3, tmp4, tmp5, tmp6, tmp7;
+  INT32 tmp10, tmp11, tmp12, tmp13;
+  INT32 z1, z2, z3, z4, z5;
+  DCTELEM *dataptr;
+  int ctr;
+  SHIFT_TEMPS
+
+  /* Pass 1: process rows. */
+  /* Note results are scaled up by sqrt(8) compared to a true DCT; */
+  /* furthermore, we scale the results by 2**PASS1_BITS. */
+
+  dataptr = data;
+  for (ctr = DCTSIZE-1; ctr >= 0; ctr--) {
+    tmp0 = dataptr[0] + dataptr[7];
+    tmp7 = dataptr[0] - dataptr[7];
+    tmp1 = dataptr[1] + dataptr[6];
+    tmp6 = dataptr[1] - dataptr[6];
+    tmp2 = dataptr[2] + dataptr[5];
+    tmp5 = dataptr[2] - dataptr[5];
+    tmp3 = dataptr[3] + dataptr[4];
+    tmp4 = dataptr[3] - dataptr[4];
+
+    /* Even part per LL&M figure 1 --- note that published figure is faulty;
+     * rotator "sqrt(2)*c1" should be "sqrt(2)*c6".
+     */
+
+    tmp10 = tmp0 + tmp3;
+    tmp13 = tmp0 - tmp3;
+    tmp11 = tmp1 + tmp2;
+    tmp12 = tmp1 - tmp2;
+
+    dataptr[0] = (DCTELEM) ((tmp10 + tmp11) << PASS1_BITS);
+    dataptr[4] = (DCTELEM) ((tmp10 - tmp11) << PASS1_BITS);
+
+    z1 = MULTIPLY(tmp12 + tmp13, FIX_0_541196100);
+    dataptr[2] = (DCTELEM) DESCALE(z1 + MULTIPLY(tmp13, FIX_0_765366865),
+				   CONST_BITS-PASS1_BITS);
+    dataptr[6] = (DCTELEM) DESCALE(z1 + MULTIPLY(tmp12, - FIX_1_847759065),
+				   CONST_BITS-PASS1_BITS);
+
+    /* Odd part per figure 8 --- note paper omits factor of sqrt(2).
+     * cK represents cos(K*pi/16).
+     * i0..i3 in the paper are tmp4..tmp7 here.
+     */
+
+    z1 = tmp4 + tmp7;
+    z2 = tmp5 + tmp6;
+    z3 = tmp4 + tmp6;
+    z4 = tmp5 + tmp7;
+    z5 = MULTIPLY(z3 + z4, FIX_1_175875602); /* sqrt(2) * c3 */
+
+    tmp4 = MULTIPLY(tmp4, FIX_0_298631336); /* sqrt(2) * (-c1+c3+c5-c7) */
+    tmp5 = MULTIPLY(tmp5, FIX_2_053119869); /* sqrt(2) * ( c1+c3-c5+c7) */
+    tmp6 = MULTIPLY(tmp6, FIX_3_072711026); /* sqrt(2) * ( c1+c3+c5-c7) */
+    tmp7 = MULTIPLY(tmp7, FIX_1_501321110); /* sqrt(2) * ( c1+c3-c5-c7) */
+    z1 = MULTIPLY(z1, - FIX_0_899976223); /* sqrt(2) * (c7-c3) */
+    z2 = MULTIPLY(z2, - FIX_2_562915447); /* sqrt(2) * (-c1-c3) */
+    z3 = MULTIPLY(z3, - FIX_1_961570560); /* sqrt(2) * (-c3-c5) */
+    z4 = MULTIPLY(z4, - FIX_0_390180644); /* sqrt(2) * (c5-c3) */
+
+    z3 += z5;
+    z4 += z5;
+
+    dataptr[7] = (DCTELEM) DESCALE(tmp4 + z1 + z3, CONST_BITS-PASS1_BITS);
+    dataptr[5] = (DCTELEM) DESCALE(tmp5 + z2 + z4, CONST_BITS-PASS1_BITS);
+    dataptr[3] = (DCTELEM) DESCALE(tmp6 + z2 + z3, CONST_BITS-PASS1_BITS);
+    dataptr[1] = (DCTELEM) DESCALE(tmp7 + z1 + z4, CONST_BITS-PASS1_BITS);
+
+    dataptr += DCTSIZE;		/* advance pointer to next row */
+  }
+
+  /* Pass 2: process columns.
+   * We remove the PASS1_BITS scaling, but leave the results scaled up
+   * by an overall factor of 8.
+   */
+
+  dataptr = data;
+  for (ctr = DCTSIZE-1; ctr >= 0; ctr--) {
+    tmp0 = dataptr[DCTSIZE*0] + dataptr[DCTSIZE*7];
+    tmp7 = dataptr[DCTSIZE*0] - dataptr[DCTSIZE*7];
+    tmp1 = dataptr[DCTSIZE*1] + dataptr[DCTSIZE*6];
+    tmp6 = dataptr[DCTSIZE*1] - dataptr[DCTSIZE*6];
+    tmp2 = dataptr[DCTSIZE*2] + dataptr[DCTSIZE*5];
+    tmp5 = dataptr[DCTSIZE*2] - dataptr[DCTSIZE*5];
+    tmp3 = dataptr[DCTSIZE*3] + dataptr[DCTSIZE*4];
+    tmp4 = dataptr[DCTSIZE*3] - dataptr[DCTSIZE*4];
+
+    /* Even part per LL&M figure 1 --- note that published figure is faulty;
+     * rotator "sqrt(2)*c1" should be "sqrt(2)*c6".
+     */
+
+    tmp10 = tmp0 + tmp3;
+    tmp13 = tmp0 - tmp3;
+    tmp11 = tmp1 + tmp2;
+    tmp12 = tmp1 - tmp2;
+
+    dataptr[DCTSIZE*0] = (DCTELEM) DESCALE(tmp10 + tmp11, PASS1_BITS);
+    dataptr[DCTSIZE*4] = (DCTELEM) DESCALE(tmp10 - tmp11, PASS1_BITS);
+
+    z1 = MULTIPLY(tmp12 + tmp13, FIX_0_541196100);
+    dataptr[DCTSIZE*2] = (DCTELEM) DESCALE(z1 + MULTIPLY(tmp13, FIX_0_765366865),
+					   CONST_BITS+PASS1_BITS);
+    dataptr[DCTSIZE*6] = (DCTELEM) DESCALE(z1 + MULTIPLY(tmp12, - FIX_1_847759065),
+					   CONST_BITS+PASS1_BITS);
+
+    /* Odd part per figure 8 --- note paper omits factor of sqrt(2).
+     * cK represents cos(K*pi/16).
+     * i0..i3 in the paper are tmp4..tmp7 here.
+     */
+
+    z1 = tmp4 + tmp7;
+    z2 = tmp5 + tmp6;
+    z3 = tmp4 + tmp6;
+    z4 = tmp5 + tmp7;
+    z5 = MULTIPLY(z3 + z4, FIX_1_175875602); /* sqrt(2) * c3 */
+
+    tmp4 = MULTIPLY(tmp4, FIX_0_298631336); /* sqrt(2) * (-c1+c3+c5-c7) */
+    tmp5 = MULTIPLY(tmp5, FIX_2_053119869); /* sqrt(2) * ( c1+c3-c5+c7) */
+    tmp6 = MULTIPLY(tmp6, FIX_3_072711026); /* sqrt(2) * ( c1+c3+c5-c7) */
+    tmp7 = MULTIPLY(tmp7, FIX_1_501321110); /* sqrt(2) * ( c1+c3-c5-c7) */
+    z1 = MULTIPLY(z1, - FIX_0_899976223); /* sqrt(2) * (c7-c3) */
+    z2 = MULTIPLY(z2, - FIX_2_562915447); /* sqrt(2) * (-c1-c3) */
+    z3 = MULTIPLY(z3, - FIX_1_961570560); /* sqrt(2) * (-c3-c5) */
+    z4 = MULTIPLY(z4, - FIX_0_390180644); /* sqrt(2) * (c5-c3) */
+
+    z3 += z5;
+    z4 += z5;
+
+    dataptr[DCTSIZE*7] = (DCTELEM) DESCALE(tmp4 + z1 + z3,
+					   CONST_BITS+PASS1_BITS);
+    dataptr[DCTSIZE*5] = (DCTELEM) DESCALE(tmp5 + z2 + z4,
+					   CONST_BITS+PASS1_BITS);
+    dataptr[DCTSIZE*3] = (DCTELEM) DESCALE(tmp6 + z2 + z3,
+					   CONST_BITS+PASS1_BITS);
+    dataptr[DCTSIZE*1] = (DCTELEM) DESCALE(tmp7 + z1 + z4,
+					   CONST_BITS+PASS1_BITS);
+
+    dataptr++;			/* advance pointer to next column */
+  }
+}
+
+#endif /* DCT_ISLOW_SUPPORTED */
diff --git a/uppsrc/plugin/jpg/lib/jidctflt.c b/uppsrc/plugin/jpg/lib/jidctflt.c
new file mode 100644
index 000000000..9a49eb3a7
--- /dev/null
+++ b/uppsrc/plugin/jpg/lib/jidctflt.c
@@ -0,0 +1,242 @@
+/*
+ * jidctflt.c
+ *
+ * Copyright (C) 1994-1998, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains a floating-point implementation of the
+ * inverse DCT (Discrete Cosine Transform).  In the IJG code, this routine
+ * must also perform dequantization of the input coefficients.
+ *
+ * This implementation should be more accurate than either of the integer
+ * IDCT implementations.  However, it may not give the same results on all
+ * machines because of differences in roundoff behavior.  Speed will depend
+ * on the hardware's floating point capacity.
+ *
+ * A 2-D IDCT can be done by 1-D IDCT on each column followed by 1-D IDCT
+ * on each row (or vice versa, but it's more convenient to emit a row at
+ * a time).  Direct algorithms are also available, but they are much more
+ * complex and seem not to be any faster when reduced to code.
+ *
+ * This implementation is based on Arai, Agui, and Nakajima's algorithm for
+ * scaled DCT.  Their original paper (Trans. IEICE E-71(11):1095) is in
+ * Japanese, but the algorithm is described in the Pennebaker & Mitchell
+ * JPEG textbook (see REFERENCES section in file README).  The following code
+ * is based directly on figure 4-8 in P&M.
+ * While an 8-point DCT cannot be done in less than 11 multiplies, it is
+ * possible to arrange the computation so that many of the multiplies are
+ * simple scalings of the final outputs.  These multiplies can then be
+ * folded into the multiplications or divisions by the JPEG quantization
+ * table entries.  The AA&N method leaves only 5 multiplies and 29 adds
+ * to be done in the DCT itself.
+ * The primary disadvantage of this method is that with a fixed-point
+ * implementation, accuracy is lost due to imprecise representation of the
+ * scaled quantization values.  However, that problem does not arise if
+ * we use floating point arithmetic.
+ */
+
+#define JPEG_INTERNALS
+#include "jinclude.h"
+#include "jpeglib.h"
+#include "jdct.h"		/* Private declarations for DCT subsystem */
+
+#ifdef DCT_FLOAT_SUPPORTED
+
+
+/*
+ * This module is specialized to the case DCTSIZE = 8.
+ */
+
+#if DCTSIZE != 8
+  Sorry, this code only copes with 8x8 DCTs. /* deliberate syntax err */
+#endif
+
+
+/* Dequantize a coefficient by multiplying it by the multiplier-table
+ * entry; produce a float result.
+ */
+
+#define DEQUANTIZE(coef,quantval)  (((FAST_FLOAT) (coef)) * (quantval))
+
+
+/*
+ * Perform dequantization and inverse DCT on one block of coefficients.
+ */
+
+GLOBAL(void)
+jpeg_idct_float (j_decompress_ptr cinfo, jpeg_component_info * compptr,
+		 JCOEFPTR coef_block,
+		 JSAMPARRAY output_buf, JDIMENSION output_col)
+{
+  FAST_FLOAT tmp0, tmp1, tmp2, tmp3, tmp4, tmp5, tmp6, tmp7;
+  FAST_FLOAT tmp10, tmp11, tmp12, tmp13;
+  FAST_FLOAT z5, z10, z11, z12, z13;
+  JCOEFPTR inptr;
+  FLOAT_MULT_TYPE * quantptr;
+  FAST_FLOAT * wsptr;
+  JSAMPROW outptr;
+  JSAMPLE *range_limit = IDCT_range_limit(cinfo);
+  int ctr;
+  FAST_FLOAT workspace[DCTSIZE2]; /* buffers data between passes */
+  SHIFT_TEMPS
+
+  /* Pass 1: process columns from input, store into work array. */
+
+  inptr = coef_block;
+  quantptr = (FLOAT_MULT_TYPE *) compptr->dct_table;
+  wsptr = workspace;
+  for (ctr = DCTSIZE; ctr > 0; ctr--) {
+    /* Due to quantization, we will usually find that many of the input
+     * coefficients are zero, especially the AC terms.  We can exploit this
+     * by short-circuiting the IDCT calculation for any column in which all
+     * the AC terms are zero.  In that case each output is equal to the
+     * DC coefficient (with scale factor as needed).
+     * With typical images and quantization tables, half or more of the
+     * column DCT calculations can be simplified this way.
+     */
+
+    if (inptr[DCTSIZE*1] == 0 && inptr[DCTSIZE*2] == 0 &&
+	inptr[DCTSIZE*3] == 0 && inptr[DCTSIZE*4] == 0 &&
+	inptr[DCTSIZE*5] == 0 && inptr[DCTSIZE*6] == 0 &&
+	inptr[DCTSIZE*7] == 0) {
+      /* AC terms all zero */
+      FAST_FLOAT dcval = DEQUANTIZE(inptr[DCTSIZE*0], quantptr[DCTSIZE*0]);
+
+      wsptr[DCTSIZE*0] = dcval;
+      wsptr[DCTSIZE*1] = dcval;
+      wsptr[DCTSIZE*2] = dcval;
+      wsptr[DCTSIZE*3] = dcval;
+      wsptr[DCTSIZE*4] = dcval;
+      wsptr[DCTSIZE*5] = dcval;
+      wsptr[DCTSIZE*6] = dcval;
+      wsptr[DCTSIZE*7] = dcval;
+
+      inptr++;			/* advance pointers to next column */
+      quantptr++;
+      wsptr++;
+      continue;
+    }
+
+    /* Even part */
+
+    tmp0 = DEQUANTIZE(inptr[DCTSIZE*0], quantptr[DCTSIZE*0]);
+    tmp1 = DEQUANTIZE(inptr[DCTSIZE*2], quantptr[DCTSIZE*2]);
+    tmp2 = DEQUANTIZE(inptr[DCTSIZE*4], quantptr[DCTSIZE*4]);
+    tmp3 = DEQUANTIZE(inptr[DCTSIZE*6], quantptr[DCTSIZE*6]);
+
+    tmp10 = tmp0 + tmp2;	/* phase 3 */
+    tmp11 = tmp0 - tmp2;
+
+    tmp13 = tmp1 + tmp3;	/* phases 5-3 */
+    tmp12 = (tmp1 - tmp3) * ((FAST_FLOAT) 1.414213562) - tmp13; /* 2*c4 */
+
+    tmp0 = tmp10 + tmp13;	/* phase 2 */
+    tmp3 = tmp10 - tmp13;
+    tmp1 = tmp11 + tmp12;
+    tmp2 = tmp11 - tmp12;
+
+    /* Odd part */
+
+    tmp4 = DEQUANTIZE(inptr[DCTSIZE*1], quantptr[DCTSIZE*1]);
+    tmp5 = DEQUANTIZE(inptr[DCTSIZE*3], quantptr[DCTSIZE*3]);
+    tmp6 = DEQUANTIZE(inptr[DCTSIZE*5], quantptr[DCTSIZE*5]);
+    tmp7 = DEQUANTIZE(inptr[DCTSIZE*7], quantptr[DCTSIZE*7]);
+
+    z13 = tmp6 + tmp5;		/* phase 6 */
+    z10 = tmp6 - tmp5;
+    z11 = tmp4 + tmp7;
+    z12 = tmp4 - tmp7;
+
+    tmp7 = z11 + z13;		/* phase 5 */
+    tmp11 = (z11 - z13) * ((FAST_FLOAT) 1.414213562); /* 2*c4 */
+
+    z5 = (z10 + z12) * ((FAST_FLOAT) 1.847759065); /* 2*c2 */
+    tmp10 = ((FAST_FLOAT) 1.082392200) * z12 - z5; /* 2*(c2-c6) */
+    tmp12 = ((FAST_FLOAT) -2.613125930) * z10 + z5; /* -2*(c2+c6) */
+
+    tmp6 = tmp12 - tmp7;	/* phase 2 */
+    tmp5 = tmp11 - tmp6;
+    tmp4 = tmp10 + tmp5;
+
+    wsptr[DCTSIZE*0] = tmp0 + tmp7;
+    wsptr[DCTSIZE*7] = tmp0 - tmp7;
+    wsptr[DCTSIZE*1] = tmp1 + tmp6;
+    wsptr[DCTSIZE*6] = tmp1 - tmp6;
+    wsptr[DCTSIZE*2] = tmp2 + tmp5;
+    wsptr[DCTSIZE*5] = tmp2 - tmp5;
+    wsptr[DCTSIZE*4] = tmp3 + tmp4;
+    wsptr[DCTSIZE*3] = tmp3 - tmp4;
+
+    inptr++;			/* advance pointers to next column */
+    quantptr++;
+    wsptr++;
+  }
+
+  /* Pass 2: process rows from work array, store into output array. */
+  /* Note that we must descale the results by a factor of 8 == 2**3. */
+
+  wsptr = workspace;
+  for (ctr = 0; ctr < DCTSIZE; ctr++) {
+    outptr = output_buf[ctr] + output_col;
+    /* Rows of zeroes can be exploited in the same way as we did with columns.
+     * However, the column calculation has created many nonzero AC terms, so
+     * the simplification applies less often (typically 5% to 10% of the time).
+     * And testing floats for zero is relatively expensive, so we don't bother.
+     */
+
+    /* Even part */
+
+    tmp10 = wsptr[0] + wsptr[4];
+    tmp11 = wsptr[0] - wsptr[4];
+
+    tmp13 = wsptr[2] + wsptr[6];
+    tmp12 = (wsptr[2] - wsptr[6]) * ((FAST_FLOAT) 1.414213562) - tmp13;
+
+    tmp0 = tmp10 + tmp13;
+    tmp3 = tmp10 - tmp13;
+    tmp1 = tmp11 + tmp12;
+    tmp2 = tmp11 - tmp12;
+
+    /* Odd part */
+
+    z13 = wsptr[5] + wsptr[3];
+    z10 = wsptr[5] - wsptr[3];
+    z11 = wsptr[1] + wsptr[7];
+    z12 = wsptr[1] - wsptr[7];
+
+    tmp7 = z11 + z13;
+    tmp11 = (z11 - z13) * ((FAST_FLOAT) 1.414213562);
+
+    z5 = (z10 + z12) * ((FAST_FLOAT) 1.847759065); /* 2*c2 */
+    tmp10 = ((FAST_FLOAT) 1.082392200) * z12 - z5; /* 2*(c2-c6) */
+    tmp12 = ((FAST_FLOAT) -2.613125930) * z10 + z5; /* -2*(c2+c6) */
+
+    tmp6 = tmp12 - tmp7;
+    tmp5 = tmp11 - tmp6;
+    tmp4 = tmp10 + tmp5;
+
+    /* Final output stage: scale down by a factor of 8 and range-limit */
+
+    outptr[0] = range_limit[(int) DESCALE((INT32) (tmp0 + tmp7), 3)
+			    & RANGE_MASK];
+    outptr[7] = range_limit[(int) DESCALE((INT32) (tmp0 - tmp7), 3)
+			    & RANGE_MASK];
+    outptr[1] = range_limit[(int) DESCALE((INT32) (tmp1 + tmp6), 3)
+			    & RANGE_MASK];
+    outptr[6] = range_limit[(int) DESCALE((INT32) (tmp1 - tmp6), 3)
+			    & RANGE_MASK];
+    outptr[2] = range_limit[(int) DESCALE((INT32) (tmp2 + tmp5), 3)
+			    & RANGE_MASK];
+    outptr[5] = range_limit[(int) DESCALE((INT32) (tmp2 - tmp5), 3)
+			    & RANGE_MASK];
+    outptr[4] = range_limit[(int) DESCALE((INT32) (tmp3 + tmp4), 3)
+			    & RANGE_MASK];
+    outptr[3] = range_limit[(int) DESCALE((INT32) (tmp3 - tmp4), 3)
+			    & RANGE_MASK];
+
+    wsptr += DCTSIZE;		/* advance pointer to next row */
+  }
+}
+
+#endif /* DCT_FLOAT_SUPPORTED */
diff --git a/uppsrc/plugin/jpg/lib/jidctfst.c b/uppsrc/plugin/jpg/lib/jidctfst.c
new file mode 100644
index 000000000..af3f7733d
--- /dev/null
+++ b/uppsrc/plugin/jpg/lib/jidctfst.c
@@ -0,0 +1,368 @@
+/*
+ * jidctfst.c
+ *
+ * Copyright (C) 1994-1998, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains a fast, not so accurate integer implementation of the
+ * inverse DCT (Discrete Cosine Transform).  In the IJG code, this routine
+ * must also perform dequantization of the input coefficients.
+ *
+ * A 2-D IDCT can be done by 1-D IDCT on each column followed by 1-D IDCT
+ * on each row (or vice versa, but it's more convenient to emit a row at
+ * a time).  Direct algorithms are also available, but they are much more
+ * complex and seem not to be any faster when reduced to code.
+ *
+ * This implementation is based on Arai, Agui, and Nakajima's algorithm for
+ * scaled DCT.  Their original paper (Trans. IEICE E-71(11):1095) is in
+ * Japanese, but the algorithm is described in the Pennebaker & Mitchell
+ * JPEG textbook (see REFERENCES section in file README).  The following code
+ * is based directly on figure 4-8 in P&M.
+ * While an 8-point DCT cannot be done in less than 11 multiplies, it is
+ * possible to arrange the computation so that many of the multiplies are
+ * simple scalings of the final outputs.  These multiplies can then be
+ * folded into the multiplications or divisions by the JPEG quantization
+ * table entries.  The AA&N method leaves only 5 multiplies and 29 adds
+ * to be done in the DCT itself.
+ * The primary disadvantage of this method is that with fixed-point math,
+ * accuracy is lost due to imprecise representation of the scaled
+ * quantization values.  The smaller the quantization table entry, the less
+ * precise the scaled value, so this implementation does worse with high-
+ * quality-setting files than with low-quality ones.
+ */
+
+#define JPEG_INTERNALS
+#include "jinclude.h"
+#include "jpeglib.h"
+#include "jdct.h"		/* Private declarations for DCT subsystem */
+
+#ifdef DCT_IFAST_SUPPORTED
+
+
+/*
+ * This module is specialized to the case DCTSIZE = 8.
+ */
+
+#if DCTSIZE != 8
+  Sorry, this code only copes with 8x8 DCTs. /* deliberate syntax err */
+#endif
+
+
+/* Scaling decisions are generally the same as in the LL&M algorithm;
+ * see jidctint.c for more details.  However, we choose to descale
+ * (right shift) multiplication products as soon as they are formed,
+ * rather than carrying additional fractional bits into subsequent additions.
+ * This compromises accuracy slightly, but it lets us save a few shifts.
+ * More importantly, 16-bit arithmetic is then adequate (for 8-bit samples)
+ * everywhere except in the multiplications proper; this saves a good deal
+ * of work on 16-bit-int machines.
+ *
+ * The dequantized coefficients are not integers because the AA&N scaling
+ * factors have been incorporated.  We represent them scaled up by PASS1_BITS,
+ * so that the first and second IDCT rounds have the same input scaling.
+ * For 8-bit JSAMPLEs, we choose IFAST_SCALE_BITS = PASS1_BITS so as to
+ * avoid a descaling shift; this compromises accuracy rather drastically
+ * for small quantization table entries, but it saves a lot of shifts.
+ * For 12-bit JSAMPLEs, there's no hope of using 16x16 multiplies anyway,
+ * so we use a much larger scaling factor to preserve accuracy.
+ *
+ * A final compromise is to represent the multiplicative constants to only
+ * 8 fractional bits, rather than 13.  This saves some shifting work on some
+ * machines, and may also reduce the cost of multiplication (since there
+ * are fewer one-bits in the constants).
+ */
+
+#if BITS_IN_JSAMPLE == 8
+#define CONST_BITS  8
+#define PASS1_BITS  2
+#else
+#define CONST_BITS  8
+#define PASS1_BITS  1		/* lose a little precision to avoid overflow */
+#endif
+
+/* Some C compilers fail to reduce "FIX(constant)" at compile time, thus
+ * causing a lot of useless floating-point operations at run time.
+ * To get around this we use the following pre-calculated constants.
+ * If you change CONST_BITS you may want to add appropriate values.
+ * (With a reasonable C compiler, you can just rely on the FIX() macro...)
+ */
+
+#if CONST_BITS == 8
+#define FIX_1_082392200  ((INT32)  277)		/* FIX(1.082392200) */
+#define FIX_1_414213562  ((INT32)  362)		/* FIX(1.414213562) */
+#define FIX_1_847759065  ((INT32)  473)		/* FIX(1.847759065) */
+#define FIX_2_613125930  ((INT32)  669)		/* FIX(2.613125930) */
+#else
+#define FIX_1_082392200  FIX(1.082392200)
+#define FIX_1_414213562  FIX(1.414213562)
+#define FIX_1_847759065  FIX(1.847759065)
+#define FIX_2_613125930  FIX(2.613125930)
+#endif
+
+
+/* We can gain a little more speed, with a further compromise in accuracy,
+ * by omitting the addition in a descaling shift.  This yields an incorrectly
+ * rounded result half the time...
+ */
+
+#ifndef USE_ACCURATE_ROUNDING
+#undef DESCALE
+#define DESCALE(x,n)  RIGHT_SHIFT(x, n)
+#endif
+
+
+/* Multiply a DCTELEM variable by an INT32 constant, and immediately
+ * descale to yield a DCTELEM result.
+ */
+
+#define MULTIPLY(var,const)  ((DCTELEM) DESCALE((var) * (const), CONST_BITS))
+
+
+/* Dequantize a coefficient by multiplying it by the multiplier-table
+ * entry; produce a DCTELEM result.  For 8-bit data a 16x16->16
+ * multiplication will do.  For 12-bit data, the multiplier table is
+ * declared INT32, so a 32-bit multiply will be used.
+ */
+
+#if BITS_IN_JSAMPLE == 8
+#define DEQUANTIZE(coef,quantval)  (((IFAST_MULT_TYPE) (coef)) * (quantval))
+#else
+#define DEQUANTIZE(coef,quantval)  \
+	DESCALE((coef)*(quantval), IFAST_SCALE_BITS-PASS1_BITS)
+#endif
+
+
+/* Like DESCALE, but applies to a DCTELEM and produces an int.
+ * We assume that int right shift is unsigned if INT32 right shift is.
+ */
+
+#ifdef RIGHT_SHIFT_IS_UNSIGNED
+#define ISHIFT_TEMPS	DCTELEM ishift_temp;
+#if BITS_IN_JSAMPLE == 8
+#define DCTELEMBITS  16		/* DCTELEM may be 16 or 32 bits */
+#else
+#define DCTELEMBITS  32		/* DCTELEM must be 32 bits */
+#endif
+#define IRIGHT_SHIFT(x,shft)  \
+    ((ishift_temp = (x)) < 0 ? \
+     (ishift_temp >> (shft)) | ((~((DCTELEM) 0)) << (DCTELEMBITS-(shft))) : \
+     (ishift_temp >> (shft)))
+#else
+#define ISHIFT_TEMPS
+#define IRIGHT_SHIFT(x,shft)	((x) >> (shft))
+#endif
+
+#ifdef USE_ACCURATE_ROUNDING
+#define IDESCALE(x,n)  ((int) IRIGHT_SHIFT((x) + (1 << ((n)-1)), n))
+#else
+#define IDESCALE(x,n)  ((int) IRIGHT_SHIFT(x, n))
+#endif
+
+
+/*
+ * Perform dequantization and inverse DCT on one block of coefficients.
+ */
+
+GLOBAL(void)
+jpeg_idct_ifast (j_decompress_ptr cinfo, jpeg_component_info * compptr,
+		 JCOEFPTR coef_block,
+		 JSAMPARRAY output_buf, JDIMENSION output_col)
+{
+  DCTELEM tmp0, tmp1, tmp2, tmp3, tmp4, tmp5, tmp6, tmp7;
+  DCTELEM tmp10, tmp11, tmp12, tmp13;
+  DCTELEM z5, z10, z11, z12, z13;
+  JCOEFPTR inptr;
+  IFAST_MULT_TYPE * quantptr;
+  int * wsptr;
+  JSAMPROW outptr;
+  JSAMPLE *range_limit = IDCT_range_limit(cinfo);
+  int ctr;
+  int workspace[DCTSIZE2];	/* buffers data between passes */
+  SHIFT_TEMPS			/* for DESCALE */
+  ISHIFT_TEMPS			/* for IDESCALE */
+
+  /* Pass 1: process columns from input, store into work array. */
+
+  inptr = coef_block;
+  quantptr = (IFAST_MULT_TYPE *) compptr->dct_table;
+  wsptr = workspace;
+  for (ctr = DCTSIZE; ctr > 0; ctr--) {
+    /* Due to quantization, we will usually find that many of the input
+     * coefficients are zero, especially the AC terms.  We can exploit this
+     * by short-circuiting the IDCT calculation for any column in which all
+     * the AC terms are zero.  In that case each output is equal to the
+     * DC coefficient (with scale factor as needed).
+     * With typical images and quantization tables, half or more of the
+     * column DCT calculations can be simplified this way.
+     */
+
+    if (inptr[DCTSIZE*1] == 0 && inptr[DCTSIZE*2] == 0 &&
+	inptr[DCTSIZE*3] == 0 && inptr[DCTSIZE*4] == 0 &&
+	inptr[DCTSIZE*5] == 0 && inptr[DCTSIZE*6] == 0 &&
+	inptr[DCTSIZE*7] == 0) {
+      /* AC terms all zero */
+      int dcval = (int) DEQUANTIZE(inptr[DCTSIZE*0], quantptr[DCTSIZE*0]);
+
+      wsptr[DCTSIZE*0] = dcval;
+      wsptr[DCTSIZE*1] = dcval;
+      wsptr[DCTSIZE*2] = dcval;
+      wsptr[DCTSIZE*3] = dcval;
+      wsptr[DCTSIZE*4] = dcval;
+      wsptr[DCTSIZE*5] = dcval;
+      wsptr[DCTSIZE*6] = dcval;
+      wsptr[DCTSIZE*7] = dcval;
+
+      inptr++;			/* advance pointers to next column */
+      quantptr++;
+      wsptr++;
+      continue;
+    }
+
+    /* Even part */
+
+    tmp0 = DEQUANTIZE(inptr[DCTSIZE*0], quantptr[DCTSIZE*0]);
+    tmp1 = DEQUANTIZE(inptr[DCTSIZE*2], quantptr[DCTSIZE*2]);
+    tmp2 = DEQUANTIZE(inptr[DCTSIZE*4], quantptr[DCTSIZE*4]);
+    tmp3 = DEQUANTIZE(inptr[DCTSIZE*6], quantptr[DCTSIZE*6]);
+
+    tmp10 = tmp0 + tmp2;	/* phase 3 */
+    tmp11 = tmp0 - tmp2;
+
+    tmp13 = tmp1 + tmp3;	/* phases 5-3 */
+    tmp12 = MULTIPLY(tmp1 - tmp3, FIX_1_414213562) - tmp13; /* 2*c4 */
+
+    tmp0 = tmp10 + tmp13;	/* phase 2 */
+    tmp3 = tmp10 - tmp13;
+    tmp1 = tmp11 + tmp12;
+    tmp2 = tmp11 - tmp12;
+
+    /* Odd part */
+
+    tmp4 = DEQUANTIZE(inptr[DCTSIZE*1], quantptr[DCTSIZE*1]);
+    tmp5 = DEQUANTIZE(inptr[DCTSIZE*3], quantptr[DCTSIZE*3]);
+    tmp6 = DEQUANTIZE(inptr[DCTSIZE*5], quantptr[DCTSIZE*5]);
+    tmp7 = DEQUANTIZE(inptr[DCTSIZE*7], quantptr[DCTSIZE*7]);
+
+    z13 = tmp6 + tmp5;		/* phase 6 */
+    z10 = tmp6 - tmp5;
+    z11 = tmp4 + tmp7;
+    z12 = tmp4 - tmp7;
+
+    tmp7 = z11 + z13;		/* phase 5 */
+    tmp11 = MULTIPLY(z11 - z13, FIX_1_414213562); /* 2*c4 */
+
+    z5 = MULTIPLY(z10 + z12, FIX_1_847759065); /* 2*c2 */
+    tmp10 = MULTIPLY(z12, FIX_1_082392200) - z5; /* 2*(c2-c6) */
+    tmp12 = MULTIPLY(z10, - FIX_2_613125930) + z5; /* -2*(c2+c6) */
+
+    tmp6 = tmp12 - tmp7;	/* phase 2 */
+    tmp5 = tmp11 - tmp6;
+    tmp4 = tmp10 + tmp5;
+
+    wsptr[DCTSIZE*0] = (int) (tmp0 + tmp7);
+    wsptr[DCTSIZE*7] = (int) (tmp0 - tmp7);
+    wsptr[DCTSIZE*1] = (int) (tmp1 + tmp6);
+    wsptr[DCTSIZE*6] = (int) (tmp1 - tmp6);
+    wsptr[DCTSIZE*2] = (int) (tmp2 + tmp5);
+    wsptr[DCTSIZE*5] = (int) (tmp2 - tmp5);
+    wsptr[DCTSIZE*4] = (int) (tmp3 + tmp4);
+    wsptr[DCTSIZE*3] = (int) (tmp3 - tmp4);
+
+    inptr++;			/* advance pointers to next column */
+    quantptr++;
+    wsptr++;
+  }
+
+  /* Pass 2: process rows from work array, store into output array. */
+  /* Note that we must descale the results by a factor of 8 == 2**3, */
+  /* and also undo the PASS1_BITS scaling. */
+
+  wsptr = workspace;
+  for (ctr = 0; ctr < DCTSIZE; ctr++) {
+    outptr = output_buf[ctr] + output_col;
+    /* Rows of zeroes can be exploited in the same way as we did with columns.
+     * However, the column calculation has created many nonzero AC terms, so
+     * the simplification applies less often (typically 5% to 10% of the time).
+     * On machines with very fast multiplication, it's possible that the
+     * test takes more time than it's worth.  In that case this section
+     * may be commented out.
+     */
+
+#ifndef NO_ZERO_ROW_TEST
+    if (wsptr[1] == 0 && wsptr[2] == 0 && wsptr[3] == 0 && wsptr[4] == 0 &&
+	wsptr[5] == 0 && wsptr[6] == 0 && wsptr[7] == 0) {
+      /* AC terms all zero */
+      JSAMPLE dcval = range_limit[IDESCALE(wsptr[0], PASS1_BITS+3)
+				  & RANGE_MASK];
+
+      outptr[0] = dcval;
+      outptr[1] = dcval;
+      outptr[2] = dcval;
+      outptr[3] = dcval;
+      outptr[4] = dcval;
+      outptr[5] = dcval;
+      outptr[6] = dcval;
+      outptr[7] = dcval;
+
+      wsptr += DCTSIZE;		/* advance pointer to next row */
+      continue;
+    }
+#endif
+
+    /* Even part */
+
+    tmp10 = ((DCTELEM) wsptr[0] + (DCTELEM) wsptr[4]);
+    tmp11 = ((DCTELEM) wsptr[0] - (DCTELEM) wsptr[4]);
+
+    tmp13 = ((DCTELEM) wsptr[2] + (DCTELEM) wsptr[6]);
+    tmp12 = MULTIPLY((DCTELEM) wsptr[2] - (DCTELEM) wsptr[6], FIX_1_414213562)
+	    - tmp13;
+
+    tmp0 = tmp10 + tmp13;
+    tmp3 = tmp10 - tmp13;
+    tmp1 = tmp11 + tmp12;
+    tmp2 = tmp11 - tmp12;
+
+    /* Odd part */
+
+    z13 = (DCTELEM) wsptr[5] + (DCTELEM) wsptr[3];
+    z10 = (DCTELEM) wsptr[5] - (DCTELEM) wsptr[3];
+    z11 = (DCTELEM) wsptr[1] + (DCTELEM) wsptr[7];
+    z12 = (DCTELEM) wsptr[1] - (DCTELEM) wsptr[7];
+
+    tmp7 = z11 + z13;		/* phase 5 */
+    tmp11 = MULTIPLY(z11 - z13, FIX_1_414213562); /* 2*c4 */
+
+    z5 = MULTIPLY(z10 + z12, FIX_1_847759065); /* 2*c2 */
+    tmp10 = MULTIPLY(z12, FIX_1_082392200) - z5; /* 2*(c2-c6) */
+    tmp12 = MULTIPLY(z10, - FIX_2_613125930) + z5; /* -2*(c2+c6) */
+
+    tmp6 = tmp12 - tmp7;	/* phase 2 */
+    tmp5 = tmp11 - tmp6;
+    tmp4 = tmp10 + tmp5;
+
+    /* Final output stage: scale down by a factor of 8 and range-limit */
+
+    outptr[0] = range_limit[IDESCALE(tmp0 + tmp7, PASS1_BITS+3)
+			    & RANGE_MASK];
+    outptr[7] = range_limit[IDESCALE(tmp0 - tmp7, PASS1_BITS+3)
+			    & RANGE_MASK];
+    outptr[1] = range_limit[IDESCALE(tmp1 + tmp6, PASS1_BITS+3)
+			    & RANGE_MASK];
+    outptr[6] = range_limit[IDESCALE(tmp1 - tmp6, PASS1_BITS+3)
+			    & RANGE_MASK];
+    outptr[2] = range_limit[IDESCALE(tmp2 + tmp5, PASS1_BITS+3)
+			    & RANGE_MASK];
+    outptr[5] = range_limit[IDESCALE(tmp2 - tmp5, PASS1_BITS+3)
+			    & RANGE_MASK];
+    outptr[4] = range_limit[IDESCALE(tmp3 + tmp4, PASS1_BITS+3)
+			    & RANGE_MASK];
+    outptr[3] = range_limit[IDESCALE(tmp3 - tmp4, PASS1_BITS+3)
+			    & RANGE_MASK];
+
+    wsptr += DCTSIZE;		/* advance pointer to next row */
+  }
+}
+
+#endif /* DCT_IFAST_SUPPORTED */
diff --git a/uppsrc/plugin/jpg/lib/jidctint.c b/uppsrc/plugin/jpg/lib/jidctint.c
new file mode 100644
index 000000000..2e0235feb
--- /dev/null
+++ b/uppsrc/plugin/jpg/lib/jidctint.c
@@ -0,0 +1,389 @@
+/*
+ * jidctint.c
+ *
+ * Copyright (C) 1991-1998, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains a slow-but-accurate integer implementation of the
+ * inverse DCT (Discrete Cosine Transform).  In the IJG code, this routine
+ * must also perform dequantization of the input coefficients.
+ *
+ * A 2-D IDCT can be done by 1-D IDCT on each column followed by 1-D IDCT
+ * on each row (or vice versa, but it's more convenient to emit a row at
+ * a time).  Direct algorithms are also available, but they are much more
+ * complex and seem not to be any faster when reduced to code.
+ *
+ * This implementation is based on an algorithm described in
+ *   C. Loeffler, A. Ligtenberg and G. Moschytz, "Practical Fast 1-D DCT
+ *   Algorithms with 11 Multiplications", Proc. Int'l. Conf. on Acoustics,
+ *   Speech, and Signal Processing 1989 (ICASSP '89), pp. 988-991.
+ * The primary algorithm described there uses 11 multiplies and 29 adds.
+ * We use their alternate method with 12 multiplies and 32 adds.
+ * The advantage of this method is that no data path contains more than one
+ * multiplication; this allows a very simple and accurate implementation in
+ * scaled fixed-point arithmetic, with a minimal number of shifts.
+ */
+
+#define JPEG_INTERNALS
+#include "jinclude.h"
+#include "jpeglib.h"
+#include "jdct.h"		/* Private declarations for DCT subsystem */
+
+#ifdef DCT_ISLOW_SUPPORTED
+
+
+/*
+ * This module is specialized to the case DCTSIZE = 8.
+ */
+
+#if DCTSIZE != 8
+  Sorry, this code only copes with 8x8 DCTs. /* deliberate syntax err */
+#endif
+
+
+/*
+ * The poop on this scaling stuff is as follows:
+ *
+ * Each 1-D IDCT step produces outputs which are a factor of sqrt(N)
+ * larger than the true IDCT outputs.  The final outputs are therefore
+ * a factor of N larger than desired; since N=8 this can be cured by
+ * a simple right shift at the end of the algorithm.  The advantage of
+ * this arrangement is that we save two multiplications per 1-D IDCT,
+ * because the y0 and y4 inputs need not be divided by sqrt(N).
+ *
+ * We have to do addition and subtraction of the integer inputs, which
+ * is no problem, and multiplication by fractional constants, which is
+ * a problem to do in integer arithmetic.  We multiply all the constants
+ * by CONST_SCALE and convert them to integer constants (thus retaining
+ * CONST_BITS bits of precision in the constants).  After doing a
+ * multiplication we have to divide the product by CONST_SCALE, with proper
+ * rounding, to produce the correct output.  This division can be done
+ * cheaply as a right shift of CONST_BITS bits.  We postpone shifting
+ * as long as possible so that partial sums can be added together with
+ * full fractional precision.
+ *
+ * The outputs of the first pass are scaled up by PASS1_BITS bits so that
+ * they are represented to better-than-integral precision.  These outputs
+ * require BITS_IN_JSAMPLE + PASS1_BITS + 3 bits; this fits in a 16-bit word
+ * with the recommended scaling.  (To scale up 12-bit sample data further, an
+ * intermediate INT32 array would be needed.)
+ *
+ * To avoid overflow of the 32-bit intermediate results in pass 2, we must
+ * have BITS_IN_JSAMPLE + CONST_BITS + PASS1_BITS <= 26.  Error analysis
+ * shows that the values given below are the most effective.
+ */
+
+#if BITS_IN_JSAMPLE == 8
+#define CONST_BITS  13
+#define PASS1_BITS  2
+#else
+#define CONST_BITS  13
+#define PASS1_BITS  1		/* lose a little precision to avoid overflow */
+#endif
+
+/* Some C compilers fail to reduce "FIX(constant)" at compile time, thus
+ * causing a lot of useless floating-point operations at run time.
+ * To get around this we use the following pre-calculated constants.
+ * If you change CONST_BITS you may want to add appropriate values.
+ * (With a reasonable C compiler, you can just rely on the FIX() macro...)
+ */
+
+#if CONST_BITS == 13
+#define FIX_0_298631336  ((INT32)  2446)	/* FIX(0.298631336) */
+#define FIX_0_390180644  ((INT32)  3196)	/* FIX(0.390180644) */
+#define FIX_0_541196100  ((INT32)  4433)	/* FIX(0.541196100) */
+#define FIX_0_765366865  ((INT32)  6270)	/* FIX(0.765366865) */
+#define FIX_0_899976223  ((INT32)  7373)	/* FIX(0.899976223) */
+#define FIX_1_175875602  ((INT32)  9633)	/* FIX(1.175875602) */
+#define FIX_1_501321110  ((INT32)  12299)	/* FIX(1.501321110) */
+#define FIX_1_847759065  ((INT32)  15137)	/* FIX(1.847759065) */
+#define FIX_1_961570560  ((INT32)  16069)	/* FIX(1.961570560) */
+#define FIX_2_053119869  ((INT32)  16819)	/* FIX(2.053119869) */
+#define FIX_2_562915447  ((INT32)  20995)	/* FIX(2.562915447) */
+#define FIX_3_072711026  ((INT32)  25172)	/* FIX(3.072711026) */
+#else
+#define FIX_0_298631336  FIX(0.298631336)
+#define FIX_0_390180644  FIX(0.390180644)
+#define FIX_0_541196100  FIX(0.541196100)
+#define FIX_0_765366865  FIX(0.765366865)
+#define FIX_0_899976223  FIX(0.899976223)
+#define FIX_1_175875602  FIX(1.175875602)
+#define FIX_1_501321110  FIX(1.501321110)
+#define FIX_1_847759065  FIX(1.847759065)
+#define FIX_1_961570560  FIX(1.961570560)
+#define FIX_2_053119869  FIX(2.053119869)
+#define FIX_2_562915447  FIX(2.562915447)
+#define FIX_3_072711026  FIX(3.072711026)
+#endif
+
+
+/* Multiply an INT32 variable by an INT32 constant to yield an INT32 result.
+ * For 8-bit samples with the recommended scaling, all the variable
+ * and constant values involved are no more than 16 bits wide, so a
+ * 16x16->32 bit multiply can be used instead of a full 32x32 multiply.
+ * For 12-bit samples, a full 32-bit multiplication will be needed.
+ */
+
+#if BITS_IN_JSAMPLE == 8
+#define MULTIPLY(var,const)  MULTIPLY16C16(var,const)
+#else
+#define MULTIPLY(var,const)  ((var) * (const))
+#endif
+
+
+/* Dequantize a coefficient by multiplying it by the multiplier-table
+ * entry; produce an int result.  In this module, both inputs and result
+ * are 16 bits or less, so either int or short multiply will work.
+ */
+
+#define DEQUANTIZE(coef,quantval)  (((ISLOW_MULT_TYPE) (coef)) * (quantval))
+
+
+/*
+ * Perform dequantization and inverse DCT on one block of coefficients.
+ */
+
+GLOBAL(void)
+jpeg_idct_islow (j_decompress_ptr cinfo, jpeg_component_info * compptr,
+		 JCOEFPTR coef_block,
+		 JSAMPARRAY output_buf, JDIMENSION output_col)
+{
+  INT32 tmp0, tmp1, tmp2, tmp3;
+  INT32 tmp10, tmp11, tmp12, tmp13;
+  INT32 z1, z2, z3, z4, z5;
+  JCOEFPTR inptr;
+  ISLOW_MULT_TYPE * quantptr;
+  int * wsptr;
+  JSAMPROW outptr;
+  JSAMPLE *range_limit = IDCT_range_limit(cinfo);
+  int ctr;
+  int workspace[DCTSIZE2];	/* buffers data between passes */
+  SHIFT_TEMPS
+
+  /* Pass 1: process columns from input, store into work array. */
+  /* Note results are scaled up by sqrt(8) compared to a true IDCT; */
+  /* furthermore, we scale the results by 2**PASS1_BITS. */
+
+  inptr = coef_block;
+  quantptr = (ISLOW_MULT_TYPE *) compptr->dct_table;
+  wsptr = workspace;
+  for (ctr = DCTSIZE; ctr > 0; ctr--) {
+    /* Due to quantization, we will usually find that many of the input
+     * coefficients are zero, especially the AC terms.  We can exploit this
+     * by short-circuiting the IDCT calculation for any column in which all
+     * the AC terms are zero.  In that case each output is equal to the
+     * DC coefficient (with scale factor as needed).
+     * With typical images and quantization tables, half or more of the
+     * column DCT calculations can be simplified this way.
+     */
+
+    if (inptr[DCTSIZE*1] == 0 && inptr[DCTSIZE*2] == 0 &&
+	inptr[DCTSIZE*3] == 0 && inptr[DCTSIZE*4] == 0 &&
+	inptr[DCTSIZE*5] == 0 && inptr[DCTSIZE*6] == 0 &&
+	inptr[DCTSIZE*7] == 0) {
+      /* AC terms all zero */
+      int dcval = DEQUANTIZE(inptr[DCTSIZE*0], quantptr[DCTSIZE*0]) << PASS1_BITS;
+
+      wsptr[DCTSIZE*0] = dcval;
+      wsptr[DCTSIZE*1] = dcval;
+      wsptr[DCTSIZE*2] = dcval;
+      wsptr[DCTSIZE*3] = dcval;
+      wsptr[DCTSIZE*4] = dcval;
+      wsptr[DCTSIZE*5] = dcval;
+      wsptr[DCTSIZE*6] = dcval;
+      wsptr[DCTSIZE*7] = dcval;
+
+      inptr++;			/* advance pointers to next column */
+      quantptr++;
+      wsptr++;
+      continue;
+    }
+
+    /* Even part: reverse the even part of the forward DCT. */
+    /* The rotator is sqrt(2)*c(-6). */
+
+    z2 = DEQUANTIZE(inptr[DCTSIZE*2], quantptr[DCTSIZE*2]);
+    z3 = DEQUANTIZE(inptr[DCTSIZE*6], quantptr[DCTSIZE*6]);
+
+    z1 = MULTIPLY(z2 + z3, FIX_0_541196100);
+    tmp2 = z1 + MULTIPLY(z3, - FIX_1_847759065);
+    tmp3 = z1 + MULTIPLY(z2, FIX_0_765366865);
+
+    z2 = DEQUANTIZE(inptr[DCTSIZE*0], quantptr[DCTSIZE*0]);
+    z3 = DEQUANTIZE(inptr[DCTSIZE*4], quantptr[DCTSIZE*4]);
+
+    tmp0 = (z2 + z3) << CONST_BITS;
+    tmp1 = (z2 - z3) << CONST_BITS;
+
+    tmp10 = tmp0 + tmp3;
+    tmp13 = tmp0 - tmp3;
+    tmp11 = tmp1 + tmp2;
+    tmp12 = tmp1 - tmp2;
+
+    /* Odd part per figure 8; the matrix is unitary and hence its
+     * transpose is its inverse.  i0..i3 are y7,y5,y3,y1 respectively.
+     */
+
+    tmp0 = DEQUANTIZE(inptr[DCTSIZE*7], quantptr[DCTSIZE*7]);
+    tmp1 = DEQUANTIZE(inptr[DCTSIZE*5], quantptr[DCTSIZE*5]);
+    tmp2 = DEQUANTIZE(inptr[DCTSIZE*3], quantptr[DCTSIZE*3]);
+    tmp3 = DEQUANTIZE(inptr[DCTSIZE*1], quantptr[DCTSIZE*1]);
+
+    z1 = tmp0 + tmp3;
+    z2 = tmp1 + tmp2;
+    z3 = tmp0 + tmp2;
+    z4 = tmp1 + tmp3;
+    z5 = MULTIPLY(z3 + z4, FIX_1_175875602); /* sqrt(2) * c3 */
+
+    tmp0 = MULTIPLY(tmp0, FIX_0_298631336); /* sqrt(2) * (-c1+c3+c5-c7) */
+    tmp1 = MULTIPLY(tmp1, FIX_2_053119869); /* sqrt(2) * ( c1+c3-c5+c7) */
+    tmp2 = MULTIPLY(tmp2, FIX_3_072711026); /* sqrt(2) * ( c1+c3+c5-c7) */
+    tmp3 = MULTIPLY(tmp3, FIX_1_501321110); /* sqrt(2) * ( c1+c3-c5-c7) */
+    z1 = MULTIPLY(z1, - FIX_0_899976223); /* sqrt(2) * (c7-c3) */
+    z2 = MULTIPLY(z2, - FIX_2_562915447); /* sqrt(2) * (-c1-c3) */
+    z3 = MULTIPLY(z3, - FIX_1_961570560); /* sqrt(2) * (-c3-c5) */
+    z4 = MULTIPLY(z4, - FIX_0_390180644); /* sqrt(2) * (c5-c3) */
+
+    z3 += z5;
+    z4 += z5;
+
+    tmp0 += z1 + z3;
+    tmp1 += z2 + z4;
+    tmp2 += z2 + z3;
+    tmp3 += z1 + z4;
+
+    /* Final output stage: inputs are tmp10..tmp13, tmp0..tmp3 */
+
+    wsptr[DCTSIZE*0] = (int) DESCALE(tmp10 + tmp3, CONST_BITS-PASS1_BITS);
+    wsptr[DCTSIZE*7] = (int) DESCALE(tmp10 - tmp3, CONST_BITS-PASS1_BITS);
+    wsptr[DCTSIZE*1] = (int) DESCALE(tmp11 + tmp2, CONST_BITS-PASS1_BITS);
+    wsptr[DCTSIZE*6] = (int) DESCALE(tmp11 - tmp2, CONST_BITS-PASS1_BITS);
+    wsptr[DCTSIZE*2] = (int) DESCALE(tmp12 + tmp1, CONST_BITS-PASS1_BITS);
+    wsptr[DCTSIZE*5] = (int) DESCALE(tmp12 - tmp1, CONST_BITS-PASS1_BITS);
+    wsptr[DCTSIZE*3] = (int) DESCALE(tmp13 + tmp0, CONST_BITS-PASS1_BITS);
+    wsptr[DCTSIZE*4] = (int) DESCALE(tmp13 - tmp0, CONST_BITS-PASS1_BITS);
+
+    inptr++;			/* advance pointers to next column */
+    quantptr++;
+    wsptr++;
+  }
+
+  /* Pass 2: process rows from work array, store into output array. */
+  /* Note that we must descale the results by a factor of 8 == 2**3, */
+  /* and also undo the PASS1_BITS scaling. */
+
+  wsptr = workspace;
+  for (ctr = 0; ctr < DCTSIZE; ctr++) {
+    outptr = output_buf[ctr] + output_col;
+    /* Rows of zeroes can be exploited in the same way as we did with columns.
+     * However, the column calculation has created many nonzero AC terms, so
+     * the simplification applies less often (typically 5% to 10% of the time).
+     * On machines with very fast multiplication, it's possible that the
+     * test takes more time than it's worth.  In that case this section
+     * may be commented out.
+     */
+
+#ifndef NO_ZERO_ROW_TEST
+    if (wsptr[1] == 0 && wsptr[2] == 0 && wsptr[3] == 0 && wsptr[4] == 0 &&
+	wsptr[5] == 0 && wsptr[6] == 0 && wsptr[7] == 0) {
+      /* AC terms all zero */
+      JSAMPLE dcval = range_limit[(int) DESCALE((INT32) wsptr[0], PASS1_BITS+3)
+				  & RANGE_MASK];
+
+      outptr[0] = dcval;
+      outptr[1] = dcval;
+      outptr[2] = dcval;
+      outptr[3] = dcval;
+      outptr[4] = dcval;
+      outptr[5] = dcval;
+      outptr[6] = dcval;
+      outptr[7] = dcval;
+
+      wsptr += DCTSIZE;		/* advance pointer to next row */
+      continue;
+    }
+#endif
+
+    /* Even part: reverse the even part of the forward DCT. */
+    /* The rotator is sqrt(2)*c(-6). */
+
+    z2 = (INT32) wsptr[2];
+    z3 = (INT32) wsptr[6];
+
+    z1 = MULTIPLY(z2 + z3, FIX_0_541196100);
+    tmp2 = z1 + MULTIPLY(z3, - FIX_1_847759065);
+    tmp3 = z1 + MULTIPLY(z2, FIX_0_765366865);
+
+    tmp0 = ((INT32) wsptr[0] + (INT32) wsptr[4]) << CONST_BITS;
+    tmp1 = ((INT32) wsptr[0] - (INT32) wsptr[4]) << CONST_BITS;
+
+    tmp10 = tmp0 + tmp3;
+    tmp13 = tmp0 - tmp3;
+    tmp11 = tmp1 + tmp2;
+    tmp12 = tmp1 - tmp2;
+
+    /* Odd part per figure 8; the matrix is unitary and hence its
+     * transpose is its inverse.  i0..i3 are y7,y5,y3,y1 respectively.
+     */
+
+    tmp0 = (INT32) wsptr[7];
+    tmp1 = (INT32) wsptr[5];
+    tmp2 = (INT32) wsptr[3];
+    tmp3 = (INT32) wsptr[1];
+
+    z1 = tmp0 + tmp3;
+    z2 = tmp1 + tmp2;
+    z3 = tmp0 + tmp2;
+    z4 = tmp1 + tmp3;
+    z5 = MULTIPLY(z3 + z4, FIX_1_175875602); /* sqrt(2) * c3 */
+
+    tmp0 = MULTIPLY(tmp0, FIX_0_298631336); /* sqrt(2) * (-c1+c3+c5-c7) */
+    tmp1 = MULTIPLY(tmp1, FIX_2_053119869); /* sqrt(2) * ( c1+c3-c5+c7) */
+    tmp2 = MULTIPLY(tmp2, FIX_3_072711026); /* sqrt(2) * ( c1+c3+c5-c7) */
+    tmp3 = MULTIPLY(tmp3, FIX_1_501321110); /* sqrt(2) * ( c1+c3-c5-c7) */
+    z1 = MULTIPLY(z1, - FIX_0_899976223); /* sqrt(2) * (c7-c3) */
+    z2 = MULTIPLY(z2, - FIX_2_562915447); /* sqrt(2) * (-c1-c3) */
+    z3 = MULTIPLY(z3, - FIX_1_961570560); /* sqrt(2) * (-c3-c5) */
+    z4 = MULTIPLY(z4, - FIX_0_390180644); /* sqrt(2) * (c5-c3) */
+
+    z3 += z5;
+    z4 += z5;
+
+    tmp0 += z1 + z3;
+    tmp1 += z2 + z4;
+    tmp2 += z2 + z3;
+    tmp3 += z1 + z4;
+
+    /* Final output stage: inputs are tmp10..tmp13, tmp0..tmp3 */
+
+    outptr[0] = range_limit[(int) DESCALE(tmp10 + tmp3,
+					  CONST_BITS+PASS1_BITS+3)
+			    & RANGE_MASK];
+    outptr[7] = range_limit[(int) DESCALE(tmp10 - tmp3,
+					  CONST_BITS+PASS1_BITS+3)
+			    & RANGE_MASK];
+    outptr[1] = range_limit[(int) DESCALE(tmp11 + tmp2,
+					  CONST_BITS+PASS1_BITS+3)
+			    & RANGE_MASK];
+    outptr[6] = range_limit[(int) DESCALE(tmp11 - tmp2,
+					  CONST_BITS+PASS1_BITS+3)
+			    & RANGE_MASK];
+    outptr[2] = range_limit[(int) DESCALE(tmp12 + tmp1,
+					  CONST_BITS+PASS1_BITS+3)
+			    & RANGE_MASK];
+    outptr[5] = range_limit[(int) DESCALE(tmp12 - tmp1,
+					  CONST_BITS+PASS1_BITS+3)
+			    & RANGE_MASK];
+    outptr[3] = range_limit[(int) DESCALE(tmp13 + tmp0,
+					  CONST_BITS+PASS1_BITS+3)
+			    & RANGE_MASK];
+    outptr[4] = range_limit[(int) DESCALE(tmp13 - tmp0,
+					  CONST_BITS+PASS1_BITS+3)
+			    & RANGE_MASK];
+
+    wsptr += DCTSIZE;		/* advance pointer to next row */
+  }
+}
+
+#endif /* DCT_ISLOW_SUPPORTED */
diff --git a/uppsrc/plugin/jpg/lib/jidctred.c b/uppsrc/plugin/jpg/lib/jidctred.c
new file mode 100644
index 000000000..3d7b24d8c
--- /dev/null
+++ b/uppsrc/plugin/jpg/lib/jidctred.c
@@ -0,0 +1,398 @@
+/*
+ * jidctred.c
+ *
+ * Copyright (C) 1994-1998, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains inverse-DCT routines that produce reduced-size output:
+ * either 4x4, 2x2, or 1x1 pixels from an 8x8 DCT block.
+ *
+ * The implementation is based on the Loeffler, Ligtenberg and Moschytz (LL&M)
+ * algorithm used in jidctint.c.  We simply replace each 8-to-8 1-D IDCT step
+ * with an 8-to-4 step that produces the four averages of two adjacent outputs
+ * (or an 8-to-2 step producing two averages of four outputs, for 2x2 output).
+ * These steps were derived by computing the corresponding values at the end
+ * of the normal LL&M code, then simplifying as much as possible.
+ *
+ * 1x1 is trivial: just take the DC coefficient divided by 8.
+ *
+ * See jidctint.c for additional comments.
+ */
+
+#define JPEG_INTERNALS
+#include "jinclude.h"
+#include "jpeglib.h"
+#include "jdct.h"		/* Private declarations for DCT subsystem */
+
+#ifdef IDCT_SCALING_SUPPORTED
+
+
+/*
+ * This module is specialized to the case DCTSIZE = 8.
+ */
+
+#if DCTSIZE != 8
+  Sorry, this code only copes with 8x8 DCTs. /* deliberate syntax err */
+#endif
+
+
+/* Scaling is the same as in jidctint.c. */
+
+#if BITS_IN_JSAMPLE == 8
+#define CONST_BITS  13
+#define PASS1_BITS  2
+#else
+#define CONST_BITS  13
+#define PASS1_BITS  1		/* lose a little precision to avoid overflow */
+#endif
+
+/* Some C compilers fail to reduce "FIX(constant)" at compile time, thus
+ * causing a lot of useless floating-point operations at run time.
+ * To get around this we use the following pre-calculated constants.
+ * If you change CONST_BITS you may want to add appropriate values.
+ * (With a reasonable C compiler, you can just rely on the FIX() macro...)
+ */
+
+#if CONST_BITS == 13
+#define FIX_0_211164243  ((INT32)  1730)	/* FIX(0.211164243) */
+#define FIX_0_509795579  ((INT32)  4176)	/* FIX(0.509795579) */
+#define FIX_0_601344887  ((INT32)  4926)	/* FIX(0.601344887) */
+#define FIX_0_720959822  ((INT32)  5906)	/* FIX(0.720959822) */
+#define FIX_0_765366865  ((INT32)  6270)	/* FIX(0.765366865) */
+#define FIX_0_850430095  ((INT32)  6967)	/* FIX(0.850430095) */
+#define FIX_0_899976223  ((INT32)  7373)	/* FIX(0.899976223) */
+#define FIX_1_061594337  ((INT32)  8697)	/* FIX(1.061594337) */
+#define FIX_1_272758580  ((INT32)  10426)	/* FIX(1.272758580) */
+#define FIX_1_451774981  ((INT32)  11893)	/* FIX(1.451774981) */
+#define FIX_1_847759065  ((INT32)  15137)	/* FIX(1.847759065) */
+#define FIX_2_172734803  ((INT32)  17799)	/* FIX(2.172734803) */
+#define FIX_2_562915447  ((INT32)  20995)	/* FIX(2.562915447) */
+#define FIX_3_624509785  ((INT32)  29692)	/* FIX(3.624509785) */
+#else
+#define FIX_0_211164243  FIX(0.211164243)
+#define FIX_0_509795579  FIX(0.509795579)
+#define FIX_0_601344887  FIX(0.601344887)
+#define FIX_0_720959822  FIX(0.720959822)
+#define FIX_0_765366865  FIX(0.765366865)
+#define FIX_0_850430095  FIX(0.850430095)
+#define FIX_0_899976223  FIX(0.899976223)
+#define FIX_1_061594337  FIX(1.061594337)
+#define FIX_1_272758580  FIX(1.272758580)
+#define FIX_1_451774981  FIX(1.451774981)
+#define FIX_1_847759065  FIX(1.847759065)
+#define FIX_2_172734803  FIX(2.172734803)
+#define FIX_2_562915447  FIX(2.562915447)
+#define FIX_3_624509785  FIX(3.624509785)
+#endif
+
+
+/* Multiply an INT32 variable by an INT32 constant to yield an INT32 result.
+ * For 8-bit samples with the recommended scaling, all the variable
+ * and constant values involved are no more than 16 bits wide, so a
+ * 16x16->32 bit multiply can be used instead of a full 32x32 multiply.
+ * For 12-bit samples, a full 32-bit multiplication will be needed.
+ */
+
+#if BITS_IN_JSAMPLE == 8
+#define MULTIPLY(var,const)  MULTIPLY16C16(var,const)
+#else
+#define MULTIPLY(var,const)  ((var) * (const))
+#endif
+
+
+/* Dequantize a coefficient by multiplying it by the multiplier-table
+ * entry; produce an int result.  In this module, both inputs and result
+ * are 16 bits or less, so either int or short multiply will work.
+ */
+
+#define DEQUANTIZE(coef,quantval)  (((ISLOW_MULT_TYPE) (coef)) * (quantval))
+
+
+/*
+ * Perform dequantization and inverse DCT on one block of coefficients,
+ * producing a reduced-size 4x4 output block.
+ */
+
+GLOBAL(void)
+jpeg_idct_4x4 (j_decompress_ptr cinfo, jpeg_component_info * compptr,
+	       JCOEFPTR coef_block,
+	       JSAMPARRAY output_buf, JDIMENSION output_col)
+{
+  INT32 tmp0, tmp2, tmp10, tmp12;
+  INT32 z1, z2, z3, z4;
+  JCOEFPTR inptr;
+  ISLOW_MULT_TYPE * quantptr;
+  int * wsptr;
+  JSAMPROW outptr;
+  JSAMPLE *range_limit = IDCT_range_limit(cinfo);
+  int ctr;
+  int workspace[DCTSIZE*4];	/* buffers data between passes */
+  SHIFT_TEMPS
+
+  /* Pass 1: process columns from input, store into work array. */
+
+  inptr = coef_block;
+  quantptr = (ISLOW_MULT_TYPE *) compptr->dct_table;
+  wsptr = workspace;
+  for (ctr = DCTSIZE; ctr > 0; inptr++, quantptr++, wsptr++, ctr--) {
+    /* Don't bother to process column 4, because second pass won't use it */
+    if (ctr == DCTSIZE-4)
+      continue;
+    if (inptr[DCTSIZE*1] == 0 && inptr[DCTSIZE*2] == 0 &&
+	inptr[DCTSIZE*3] == 0 && inptr[DCTSIZE*5] == 0 &&
+	inptr[DCTSIZE*6] == 0 && inptr[DCTSIZE*7] == 0) {
+      /* AC terms all zero; we need not examine term 4 for 4x4 output */
+      int dcval = DEQUANTIZE(inptr[DCTSIZE*0], quantptr[DCTSIZE*0]) << PASS1_BITS;
+
+      wsptr[DCTSIZE*0] = dcval;
+      wsptr[DCTSIZE*1] = dcval;
+      wsptr[DCTSIZE*2] = dcval;
+      wsptr[DCTSIZE*3] = dcval;
+
+      continue;
+    }
+
+    /* Even part */
+
+    tmp0 = DEQUANTIZE(inptr[DCTSIZE*0], quantptr[DCTSIZE*0]);
+    tmp0 <<= (CONST_BITS+1);
+
+    z2 = DEQUANTIZE(inptr[DCTSIZE*2], quantptr[DCTSIZE*2]);
+    z3 = DEQUANTIZE(inptr[DCTSIZE*6], quantptr[DCTSIZE*6]);
+
+    tmp2 = MULTIPLY(z2, FIX_1_847759065) + MULTIPLY(z3, - FIX_0_765366865);
+
+    tmp10 = tmp0 + tmp2;
+    tmp12 = tmp0 - tmp2;
+
+    /* Odd part */
+
+    z1 = DEQUANTIZE(inptr[DCTSIZE*7], quantptr[DCTSIZE*7]);
+    z2 = DEQUANTIZE(inptr[DCTSIZE*5], quantptr[DCTSIZE*5]);
+    z3 = DEQUANTIZE(inptr[DCTSIZE*3], quantptr[DCTSIZE*3]);
+    z4 = DEQUANTIZE(inptr[DCTSIZE*1], quantptr[DCTSIZE*1]);
+
+    tmp0 = MULTIPLY(z1, - FIX_0_211164243) /* sqrt(2) * (c3-c1) */
+	 + MULTIPLY(z2, FIX_1_451774981) /* sqrt(2) * (c3+c7) */
+	 + MULTIPLY(z3, - FIX_2_172734803) /* sqrt(2) * (-c1-c5) */
+	 + MULTIPLY(z4, FIX_1_061594337); /* sqrt(2) * (c5+c7) */
+
+    tmp2 = MULTIPLY(z1, - FIX_0_509795579) /* sqrt(2) * (c7-c5) */
+	 + MULTIPLY(z2, - FIX_0_601344887) /* sqrt(2) * (c5-c1) */
+	 + MULTIPLY(z3, FIX_0_899976223) /* sqrt(2) * (c3-c7) */
+	 + MULTIPLY(z4, FIX_2_562915447); /* sqrt(2) * (c1+c3) */
+
+    /* Final output stage */
+
+    wsptr[DCTSIZE*0] = (int) DESCALE(tmp10 + tmp2, CONST_BITS-PASS1_BITS+1);
+    wsptr[DCTSIZE*3] = (int) DESCALE(tmp10 - tmp2, CONST_BITS-PASS1_BITS+1);
+    wsptr[DCTSIZE*1] = (int) DESCALE(tmp12 + tmp0, CONST_BITS-PASS1_BITS+1);
+    wsptr[DCTSIZE*2] = (int) DESCALE(tmp12 - tmp0, CONST_BITS-PASS1_BITS+1);
+  }
+
+  /* Pass 2: process 4 rows from work array, store into output array. */
+
+  wsptr = workspace;
+  for (ctr = 0; ctr < 4; ctr++) {
+    outptr = output_buf[ctr] + output_col;
+    /* It's not clear whether a zero row test is worthwhile here ... */
+
+#ifndef NO_ZERO_ROW_TEST
+    if (wsptr[1] == 0 && wsptr[2] == 0 && wsptr[3] == 0 &&
+	wsptr[5] == 0 && wsptr[6] == 0 && wsptr[7] == 0) {
+      /* AC terms all zero */
+      JSAMPLE dcval = range_limit[(int) DESCALE((INT32) wsptr[0], PASS1_BITS+3)
+				  & RANGE_MASK];
+
+      outptr[0] = dcval;
+      outptr[1] = dcval;
+      outptr[2] = dcval;
+      outptr[3] = dcval;
+
+      wsptr += DCTSIZE;		/* advance pointer to next row */
+      continue;
+    }
+#endif
+
+    /* Even part */
+
+    tmp0 = ((INT32) wsptr[0]) << (CONST_BITS+1);
+
+    tmp2 = MULTIPLY((INT32) wsptr[2], FIX_1_847759065)
+	 + MULTIPLY((INT32) wsptr[6], - FIX_0_765366865);
+
+    tmp10 = tmp0 + tmp2;
+    tmp12 = tmp0 - tmp2;
+
+    /* Odd part */
+
+    z1 = (INT32) wsptr[7];
+    z2 = (INT32) wsptr[5];
+    z3 = (INT32) wsptr[3];
+    z4 = (INT32) wsptr[1];
+
+    tmp0 = MULTIPLY(z1, - FIX_0_211164243) /* sqrt(2) * (c3-c1) */
+	 + MULTIPLY(z2, FIX_1_451774981) /* sqrt(2) * (c3+c7) */
+	 + MULTIPLY(z3, - FIX_2_172734803) /* sqrt(2) * (-c1-c5) */
+	 + MULTIPLY(z4, FIX_1_061594337); /* sqrt(2) * (c5+c7) */
+
+    tmp2 = MULTIPLY(z1, - FIX_0_509795579) /* sqrt(2) * (c7-c5) */
+	 + MULTIPLY(z2, - FIX_0_601344887) /* sqrt(2) * (c5-c1) */
+	 + MULTIPLY(z3, FIX_0_899976223) /* sqrt(2) * (c3-c7) */
+	 + MULTIPLY(z4, FIX_2_562915447); /* sqrt(2) * (c1+c3) */
+
+    /* Final output stage */
+
+    outptr[0] = range_limit[(int) DESCALE(tmp10 + tmp2,
+					  CONST_BITS+PASS1_BITS+3+1)
+			    & RANGE_MASK];
+    outptr[3] = range_limit[(int) DESCALE(tmp10 - tmp2,
+					  CONST_BITS+PASS1_BITS+3+1)
+			    & RANGE_MASK];
+    outptr[1] = range_limit[(int) DESCALE(tmp12 + tmp0,
+					  CONST_BITS+PASS1_BITS+3+1)
+			    & RANGE_MASK];
+    outptr[2] = range_limit[(int) DESCALE(tmp12 - tmp0,
+					  CONST_BITS+PASS1_BITS+3+1)
+			    & RANGE_MASK];
+
+    wsptr += DCTSIZE;		/* advance pointer to next row */
+  }
+}
+
+
+/*
+ * Perform dequantization and inverse DCT on one block of coefficients,
+ * producing a reduced-size 2x2 output block.
+ */
+
+GLOBAL(void)
+jpeg_idct_2x2 (j_decompress_ptr cinfo, jpeg_component_info * compptr,
+	       JCOEFPTR coef_block,
+	       JSAMPARRAY output_buf, JDIMENSION output_col)
+{
+  INT32 tmp0, tmp10, z1;
+  JCOEFPTR inptr;
+  ISLOW_MULT_TYPE * quantptr;
+  int * wsptr;
+  JSAMPROW outptr;
+  JSAMPLE *range_limit = IDCT_range_limit(cinfo);
+  int ctr;
+  int workspace[DCTSIZE*2];	/* buffers data between passes */
+  SHIFT_TEMPS
+
+  /* Pass 1: process columns from input, store into work array. */
+
+  inptr = coef_block;
+  quantptr = (ISLOW_MULT_TYPE *) compptr->dct_table;
+  wsptr = workspace;
+  for (ctr = DCTSIZE; ctr > 0; inptr++, quantptr++, wsptr++, ctr--) {
+    /* Don't bother to process columns 2,4,6 */
+    if (ctr == DCTSIZE-2 || ctr == DCTSIZE-4 || ctr == DCTSIZE-6)
+      continue;
+    if (inptr[DCTSIZE*1] == 0 && inptr[DCTSIZE*3] == 0 &&
+	inptr[DCTSIZE*5] == 0 && inptr[DCTSIZE*7] == 0) {
+      /* AC terms all zero; we need not examine terms 2,4,6 for 2x2 output */
+      int dcval = DEQUANTIZE(inptr[DCTSIZE*0], quantptr[DCTSIZE*0]) << PASS1_BITS;
+
+      wsptr[DCTSIZE*0] = dcval;
+      wsptr[DCTSIZE*1] = dcval;
+
+      continue;
+    }
+
+    /* Even part */
+
+    z1 = DEQUANTIZE(inptr[DCTSIZE*0], quantptr[DCTSIZE*0]);
+    tmp10 = z1 << (CONST_BITS+2);
+
+    /* Odd part */
+
+    z1 = DEQUANTIZE(inptr[DCTSIZE*7], quantptr[DCTSIZE*7]);
+    tmp0 = MULTIPLY(z1, - FIX_0_720959822); /* sqrt(2) * (c7-c5+c3-c1) */
+    z1 = DEQUANTIZE(inptr[DCTSIZE*5], quantptr[DCTSIZE*5]);
+    tmp0 += MULTIPLY(z1, FIX_0_850430095); /* sqrt(2) * (-c1+c3+c5+c7) */
+    z1 = DEQUANTIZE(inptr[DCTSIZE*3], quantptr[DCTSIZE*3]);
+    tmp0 += MULTIPLY(z1, - FIX_1_272758580); /* sqrt(2) * (-c1+c3-c5-c7) */
+    z1 = DEQUANTIZE(inptr[DCTSIZE*1], quantptr[DCTSIZE*1]);
+    tmp0 += MULTIPLY(z1, FIX_3_624509785); /* sqrt(2) * (c1+c3+c5+c7) */
+
+    /* Final output stage */
+
+    wsptr[DCTSIZE*0] = (int) DESCALE(tmp10 + tmp0, CONST_BITS-PASS1_BITS+2);
+    wsptr[DCTSIZE*1] = (int) DESCALE(tmp10 - tmp0, CONST_BITS-PASS1_BITS+2);
+  }
+
+  /* Pass 2: process 2 rows from work array, store into output array. */
+
+  wsptr = workspace;
+  for (ctr = 0; ctr < 2; ctr++) {
+    outptr = output_buf[ctr] + output_col;
+    /* It's not clear whether a zero row test is worthwhile here ... */
+
+#ifndef NO_ZERO_ROW_TEST
+    if (wsptr[1] == 0 && wsptr[3] == 0 && wsptr[5] == 0 && wsptr[7] == 0) {
+      /* AC terms all zero */
+      JSAMPLE dcval = range_limit[(int) DESCALE((INT32) wsptr[0], PASS1_BITS+3)
+				  & RANGE_MASK];
+
+      outptr[0] = dcval;
+      outptr[1] = dcval;
+
+      wsptr += DCTSIZE;		/* advance pointer to next row */
+      continue;
+    }
+#endif
+
+    /* Even part */
+
+    tmp10 = ((INT32) wsptr[0]) << (CONST_BITS+2);
+
+    /* Odd part */
+
+    tmp0 = MULTIPLY((INT32) wsptr[7], - FIX_0_720959822) /* sqrt(2) * (c7-c5+c3-c1) */
+	 + MULTIPLY((INT32) wsptr[5], FIX_0_850430095) /* sqrt(2) * (-c1+c3+c5+c7) */
+	 + MULTIPLY((INT32) wsptr[3], - FIX_1_272758580) /* sqrt(2) * (-c1+c3-c5-c7) */
+	 + MULTIPLY((INT32) wsptr[1], FIX_3_624509785); /* sqrt(2) * (c1+c3+c5+c7) */
+
+    /* Final output stage */
+
+    outptr[0] = range_limit[(int) DESCALE(tmp10 + tmp0,
+					  CONST_BITS+PASS1_BITS+3+2)
+			    & RANGE_MASK];
+    outptr[1] = range_limit[(int) DESCALE(tmp10 - tmp0,
+					  CONST_BITS+PASS1_BITS+3+2)
+			    & RANGE_MASK];
+
+    wsptr += DCTSIZE;		/* advance pointer to next row */
+  }
+}
+
+
+/*
+ * Perform dequantization and inverse DCT on one block of coefficients,
+ * producing a reduced-size 1x1 output block.
+ */
+
+GLOBAL(void)
+jpeg_idct_1x1 (j_decompress_ptr cinfo, jpeg_component_info * compptr,
+	       JCOEFPTR coef_block,
+	       JSAMPARRAY output_buf, JDIMENSION output_col)
+{
+  int dcval;
+  ISLOW_MULT_TYPE * quantptr;
+  JSAMPLE *range_limit = IDCT_range_limit(cinfo);
+  SHIFT_TEMPS
+
+  /* We hardly need an inverse DCT routine for this: just take the
+   * average pixel value, which is one-eighth of the DC coefficient.
+   */
+  quantptr = (ISLOW_MULT_TYPE *) compptr->dct_table;
+  dcval = DEQUANTIZE(coef_block[0], quantptr[0]);
+  dcval = (int) DESCALE((INT32) dcval, 3);
+
+  output_buf[0][output_col] = range_limit[dcval & RANGE_MASK];
+}
+
+#endif /* IDCT_SCALING_SUPPORTED */
diff --git a/uppsrc/plugin/jpg/lib/jinclude.h b/uppsrc/plugin/jpg/lib/jinclude.h
new file mode 100644
index 000000000..0a4f15146
--- /dev/null
+++ b/uppsrc/plugin/jpg/lib/jinclude.h
@@ -0,0 +1,91 @@
+/*
+ * jinclude.h
+ *
+ * Copyright (C) 1991-1994, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file exists to provide a single place to fix any problems with
+ * including the wrong system include files.  (Common problems are taken
+ * care of by the standard jconfig symbols, but on really weird systems
+ * you may have to edit this file.)
+ *
+ * NOTE: this file is NOT intended to be included by applications using the
+ * JPEG library.  Most applications need only include jpeglib.h.
+ */
+
+
+/* Include auto-config file to find out which system include files we need. */
+
+#include "jconfig.h"		/* auto configuration options */
+#define JCONFIG_INCLUDED	/* so that jpeglib.h doesn't do it again */
+
+/*
+ * We need the NULL macro and size_t typedef.
+ * On an ANSI-conforming system it is sufficient to include <stddef.h>.
+ * Otherwise, we get them from <stdlib.h> or <stdio.h>; we may have to
+ * pull in <sys/types.h> as well.
+ * Note that the core JPEG library does not require <stdio.h>;
+ * only the default error handler and data source/destination modules do.
+ * But we must pull it in because of the references to FILE in jpeglib.h.
+ * You can remove those references if you want to compile without <stdio.h>.
+ */
+
+#ifdef HAVE_STDDEF_H
+#include <stddef.h>
+#endif
+
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+
+#ifdef NEED_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+
+#include <stdio.h>
+
+/*
+ * We need memory copying and zeroing functions, plus strncpy().
+ * ANSI and System V implementations declare these in <string.h>.
+ * BSD doesn't have the mem() functions, but it does have bcopy()/bzero().
+ * Some systems may declare memset and memcpy in <memory.h>.
+ *
+ * NOTE: we assume the size parameters to these functions are of type size_t.
+ * Change the casts in these macros if not!
+ */
+
+#ifdef NEED_BSD_STRINGS
+
+#include <strings.h>
+#define MEMZERO(target,size)	bzero((void *)(target), (size_t)(size))
+#define MEMCOPY(dest,src,size)	bcopy((const void *)(src), (void *)(dest), (size_t)(size))
+
+#else /* not BSD, assume ANSI/SysV string lib */
+
+#include <string.h>
+#define MEMZERO(target,size)	memset((void *)(target), 0, (size_t)(size))
+#define MEMCOPY(dest,src,size)	memcpy((void *)(dest), (const void *)(src), (size_t)(size))
+
+#endif
+
+/*
+ * In ANSI C, and indeed any rational implementation, size_t is also the
+ * type returned by sizeof().  However, it seems there are some irrational
+ * implementations out there, in which sizeof() returns an int even though
+ * size_t is defined as long or unsigned long.  To ensure consistent results
+ * we always use this SIZEOF() macro in place of using sizeof() directly.
+ */
+
+#define SIZEOF(object)	((size_t) sizeof(object))
+
+/*
+ * The modules that use fread() and fwrite() always invoke them through
+ * these macros.  On some systems you may need to twiddle the argument casts.
+ * CAUTION: argument order is different from underlying functions!
+ */
+
+#define JFREAD(file,buf,sizeofbuf)  \
+  ((size_t) fread((void *) (buf), (size_t) 1, (size_t) (sizeofbuf), (file)))
+#define JFWRITE(file,buf,sizeofbuf)  \
+  ((size_t) fwrite((const void *) (buf), (size_t) 1, (size_t) (sizeofbuf), (file)))
diff --git a/uppsrc/plugin/jpg/lib/jlossls.h b/uppsrc/plugin/jpg/lib/jlossls.h
new file mode 100644
index 000000000..13c5be633
--- /dev/null
+++ b/uppsrc/plugin/jpg/lib/jlossls.h
@@ -0,0 +1,149 @@
+/*
+ * jlossls.h
+ *
+ * Copyright (C) 1998, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This include file contains common declarations for the lossless JPEG
+ * codec modules.
+ */
+
+#ifndef JLOSSLS_H
+#define JLOSSLS_H
+
+
+/*
+ * Table H.1: Predictors for lossless coding.
+ */
+
+#define PREDICTOR1	Ra
+#define PREDICTOR2	Rb
+#define PREDICTOR3	Rc
+#define PREDICTOR4	(int) ((INT32) Ra + (INT32) Rb - (INT32) Rc)
+#define PREDICTOR5	(int) ((INT32) Ra + RIGHT_SHIFT((INT32) Rb - (INT32) Rc, 1))
+#define PREDICTOR6	(int) ((INT32) Rb + RIGHT_SHIFT((INT32) Ra - (INT32) Rc, 1))
+#define PREDICTOR7	(int) RIGHT_SHIFT((INT32) Ra + (INT32) Rb, 1)
+
+
+typedef JMETHOD(void, predict_difference_method_ptr,
+		(j_compress_ptr cinfo, int ci,
+		 JSAMPROW input_buf, JSAMPROW prev_row,
+		 JDIFFROW diff_buf, JDIMENSION width));
+
+typedef JMETHOD(void, scaler_method_ptr,
+		(j_compress_ptr cinfo, int ci,
+		 JSAMPROW input_buf, JSAMPROW output_buf,
+		 JDIMENSION width));
+
+/* Lossless-specific compression codec (compressor proper) */
+typedef struct {
+  struct jpeg_c_codec pub; /* public fields */
+
+
+  /* Difference buffer control */
+  JMETHOD(void, diff_start_pass, (j_compress_ptr cinfo,
+				  J_BUF_MODE pass_mode));
+
+  /* Pointer to data which is private to diff controller */
+  void *diff_private;
+
+
+  /* Entropy encoding */
+  JMETHOD(JDIMENSION, entropy_encode_mcus, (j_compress_ptr cinfo,
+					    JDIFFIMAGE diff_buf,
+					    JDIMENSION MCU_row_num,
+					    JDIMENSION MCU_col_num,
+					    JDIMENSION nMCU));
+
+  /* Pointer to data which is private to entropy module */
+  void *entropy_private;
+
+
+  /* Prediction, differencing */
+  JMETHOD(void, predict_start_pass, (j_compress_ptr cinfo));
+
+  /* It is useful to allow each component to have a separate diff method. */
+  predict_difference_method_ptr predict_difference[MAX_COMPONENTS];
+
+  /* Pointer to data which is private to predictor module */
+  void *pred_private;
+
+  /* Sample scaling */
+  JMETHOD(void, scaler_start_pass, (j_compress_ptr cinfo));
+  JMETHOD(void, scaler_scale, (j_compress_ptr cinfo,
+			       JSAMPROW input_buf, JSAMPROW output_buf,
+			       JDIMENSION width));
+
+  /* Pointer to data which is private to scaler module */
+  void *scaler_private;
+
+} jpeg_lossless_c_codec;
+
+typedef jpeg_lossless_c_codec * j_lossless_c_ptr;
+
+
+typedef JMETHOD(void, predict_undifference_method_ptr,
+		(j_decompress_ptr cinfo, int comp_index,
+		 JDIFFROW diff_buf, JDIFFROW prev_row,
+		 JDIFFROW undiff_buf, JDIMENSION width));
+
+/* Lossless-specific decompression codec (decompressor proper) */
+typedef struct {
+  struct jpeg_d_codec pub; /* public fields */
+
+
+  /* Difference buffer control */
+  JMETHOD(void, diff_start_input_pass, (j_decompress_ptr cinfo));
+
+  /* Pointer to data which is private to diff controller */
+  void *diff_private;
+
+
+  /* Entropy decoding */
+  JMETHOD(void, entropy_start_pass, (j_decompress_ptr cinfo));
+  JMETHOD(boolean, entropy_process_restart, (j_decompress_ptr cinfo));
+  JMETHOD(JDIMENSION, entropy_decode_mcus, (j_decompress_ptr cinfo,
+					    JDIFFIMAGE diff_buf,
+					    JDIMENSION MCU_row_num,
+					    JDIMENSION MCU_col_num,
+					    JDIMENSION nMCU));
+
+  /* Pointer to data which is private to entropy module */
+  void *entropy_private;
+
+
+  /* Prediction, undifferencing */
+  JMETHOD(void, predict_start_pass, (j_decompress_ptr cinfo));
+  JMETHOD(void, predict_process_restart, (j_decompress_ptr cinfo));
+
+  /* It is useful to allow each component to have a separate undiff method. */
+  predict_undifference_method_ptr predict_undifference[MAX_COMPONENTS];
+
+  /* Pointer to data which is private to predictor module */
+  void *pred_private;
+
+  /* Sample scaling */
+  JMETHOD(void, scaler_start_pass, (j_decompress_ptr cinfo));
+  JMETHOD(void, scaler_scale, (j_decompress_ptr cinfo,
+			       JDIFFROW diff_buf, JSAMPROW output_buf,
+			       JDIMENSION width));
+
+  /* Pointer to data which is private to scaler module */
+  void *scaler_private;
+
+} jpeg_lossless_d_codec;
+
+typedef jpeg_lossless_d_codec * j_lossless_d_ptr;
+
+
+/* Compression module initialization routines */
+EXTERN(void) jinit_lhuff_encoder JPP((j_compress_ptr cinfo));
+EXTERN(void) jinit_differencer JPP((j_compress_ptr cinfo));
+EXTERN(void) jinit_c_scaler JPP((j_compress_ptr cinfo));
+/* Decompression module initialization routines */
+EXTERN(void) jinit_lhuff_decoder JPP((j_decompress_ptr cinfo));
+EXTERN(void) jinit_undifferencer JPP((j_decompress_ptr cinfo));
+EXTERN(void) jinit_d_scaler JPP((j_decompress_ptr cinfo));
+
+#endif /* JLOSSLS_H */
diff --git a/uppsrc/plugin/jpg/lib/jlossy.h b/uppsrc/plugin/jpg/lib/jlossy.h
new file mode 100644
index 000000000..ad4d62b34
--- /dev/null
+++ b/uppsrc/plugin/jpg/lib/jlossy.h
@@ -0,0 +1,120 @@
+/*
+ * jlossy.h
+ *
+ * Copyright (C) 1998, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This include file contains common declarations for the lossy (DCT-based)
+ * JPEG codec modules.
+ */
+
+#ifndef JLOSSY_H
+#define JLOSSY_H
+
+
+/* Lossy-specific compression codec (compressor proper) */
+typedef struct {
+  struct jpeg_c_codec pub; /* public fields */
+
+
+  /* Coefficient buffer control */
+  JMETHOD(void, coef_start_pass, (j_compress_ptr cinfo, J_BUF_MODE pass_mode));
+  /*  JMETHOD(boolean, coef_compress_data, (j_compress_ptr cinfo,
+					JSAMPIMAGE input_buf));*/
+
+  /* Pointer to data which is private to coef module */
+  void *coef_private;
+
+
+  /* Forward DCT (also controls coefficient quantization) */
+  JMETHOD(void, fdct_start_pass, (j_compress_ptr cinfo));
+  /* perhaps this should be an array??? */
+  JMETHOD(void, fdct_forward_DCT, (j_compress_ptr cinfo,
+				   jpeg_component_info * compptr,
+				   JSAMPARRAY sample_data, JBLOCKROW coef_blocks,
+				   JDIMENSION start_row, JDIMENSION start_col,
+				   JDIMENSION num_blocks));
+
+  /* Pointer to data which is private to fdct module */
+  void *fdct_private;
+
+
+  /* Entropy encoding */
+  JMETHOD(boolean, entropy_encode_mcu, (j_compress_ptr cinfo,
+					JBLOCKROW *MCU_data));
+
+  /* Pointer to data which is private to entropy module */
+  void *entropy_private;
+
+} jpeg_lossy_c_codec;
+
+typedef jpeg_lossy_c_codec * j_lossy_c_ptr;
+
+
+
+typedef JMETHOD(void, inverse_DCT_method_ptr,
+		(j_decompress_ptr cinfo, jpeg_component_info * compptr,
+		 JCOEFPTR coef_block,
+		 JSAMPARRAY output_buf, JDIMENSION output_col));
+
+/* Lossy-specific decompression codec (decompressor proper) */
+typedef struct {
+  struct jpeg_d_codec pub; /* public fields */
+
+
+  /* Coefficient buffer control */
+  JMETHOD(void, coef_start_input_pass, (j_decompress_ptr cinfo));
+  JMETHOD(void, coef_start_output_pass, (j_decompress_ptr cinfo));
+
+  /* Pointer to array of coefficient virtual arrays, or NULL if none */
+  jvirt_barray_ptr *coef_arrays;
+
+  /* Pointer to data which is private to coef module */
+  void *coef_private;
+
+
+  /* Entropy decoding */
+  JMETHOD(void, entropy_start_pass, (j_decompress_ptr cinfo));
+  JMETHOD(boolean, entropy_decode_mcu, (j_decompress_ptr cinfo,
+					JBLOCKROW *MCU_data));
+
+  /* This is here to share code between baseline and progressive decoders; */
+  /* other modules probably should not use it */
+  boolean entropy_insufficient_data;	/* set TRUE after emitting warning */
+
+  /* Pointer to data which is private to entropy module */
+  void *entropy_private;
+
+
+  /* Inverse DCT (also performs dequantization) */
+  JMETHOD(void, idct_start_pass, (j_decompress_ptr cinfo));
+
+  /* It is useful to allow each component to have a separate IDCT method. */
+  inverse_DCT_method_ptr inverse_DCT[MAX_COMPONENTS];
+
+  /* Pointer to data which is private to idct module */
+  void *idct_private;
+
+} jpeg_lossy_d_codec;
+
+typedef jpeg_lossy_d_codec * j_lossy_d_ptr;
+
+
+/* Compression module initialization routines */
+EXTERN(void) jinit_lossy_c_codec JPP((j_compress_ptr cinfo));
+EXTERN(void) jinit_c_coef_controller JPP((j_compress_ptr cinfo,
+					  boolean need_full_buffer));
+EXTERN(void) jinit_forward_dct JPP((j_compress_ptr cinfo));
+EXTERN(void) jinit_shuff_encoder JPP((j_compress_ptr cinfo));
+EXTERN(void) jinit_phuff_encoder JPP((j_compress_ptr cinfo));
+
+/* Decompression module initialization routines */
+EXTERN(void) jinit_lossy_d_codec JPP((j_decompress_ptr cinfo));
+EXTERN(void) jinit_d_coef_controller JPP((j_decompress_ptr cinfo,
+					  boolean need_full_buffer));
+EXTERN(void) jinit_shuff_decoder JPP((j_decompress_ptr cinfo));
+EXTERN(void) jinit_phuff_decoder JPP((j_decompress_ptr cinfo));
+EXTERN(void) jinit_inverse_dct JPP((j_decompress_ptr cinfo));
+
+#endif /* JLOSSY_H */
diff --git a/uppsrc/plugin/jpg/lib/jmemansi.c b/uppsrc/plugin/jpg/lib/jmemansi.c
new file mode 100644
index 000000000..2d93e4962
--- /dev/null
+++ b/uppsrc/plugin/jpg/lib/jmemansi.c
@@ -0,0 +1,167 @@
+/*
+ * jmemansi.c
+ *
+ * Copyright (C) 1992-1996, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file provides a simple generic implementation of the system-
+ * dependent portion of the JPEG memory manager.  This implementation
+ * assumes that you have the ANSI-standard library routine tmpfile().
+ * Also, the problem of determining the amount of memory available
+ * is shoved onto the user.
+ */
+
+#define JPEG_INTERNALS
+#include "jinclude.h"
+#include "jpeglib.h"
+#include "jmemsys.h"		/* import the system-dependent declarations */
+
+#ifndef HAVE_STDLIB_H		/* <stdlib.h> should declare malloc(),free() */
+extern void * malloc JPP((size_t size));
+extern void free JPP((void *ptr));
+#endif
+
+#ifndef SEEK_SET		/* pre-ANSI systems may not define this; */
+#define SEEK_SET  0		/* if not, assume 0 is correct */
+#endif
+
+
+/*
+ * Memory allocation and freeing are controlled by the regular library
+ * routines malloc() and free().
+ */
+
+GLOBAL(void *)
+jpeg_get_small (j_common_ptr cinfo, size_t sizeofobject)
+{
+  return (void *) malloc(sizeofobject);
+}
+
+GLOBAL(void)
+jpeg_free_small (j_common_ptr cinfo, void * object, size_t sizeofobject)
+{
+  free(object);
+}
+
+
+/*
+ * "Large" objects are treated the same as "small" ones.
+ * NB: although we include FAR keywords in the routine declarations,
+ * this file won't actually work in 80x86 small/medium model; at least,
+ * you probably won't be able to process useful-size images in only 64KB.
+ */
+
+GLOBAL(void FAR *)
+jpeg_get_large (j_common_ptr cinfo, size_t sizeofobject)
+{
+  return (void FAR *) malloc(sizeofobject);
+}
+
+GLOBAL(void)
+jpeg_free_large (j_common_ptr cinfo, void FAR * object, size_t sizeofobject)
+{
+  free(object);
+}
+
+
+/*
+ * This routine computes the total memory space available for allocation.
+ * It's impossible to do this in a portable way; our current solution is
+ * to make the user tell us (with a default value set at compile time).
+ * If you can actually get the available space, it's a good idea to subtract
+ * a slop factor of 5% or so.
+ */
+
+#ifndef DEFAULT_MAX_MEM		/* so can override from makefile */
+#define DEFAULT_MAX_MEM		1000000L /* default: one megabyte */
+#endif
+
+GLOBAL(long)
+jpeg_mem_available (j_common_ptr cinfo, long min_bytes_needed,
+		    long max_bytes_needed, long already_allocated)
+{
+  return cinfo->mem->max_memory_to_use - already_allocated;
+}
+
+
+/*
+ * Backing store (temporary file) management.
+ * Backing store objects are only used when the value returned by
+ * jpeg_mem_available is less than the total space needed.  You can dispense
+ * with these routines if you have plenty of virtual memory; see jmemnobs.c.
+ */
+
+
+METHODDEF(void)
+read_backing_store (j_common_ptr cinfo, backing_store_ptr info,
+		    void FAR * buffer_address,
+		    long file_offset, long byte_count)
+{
+  if (fseek(info->temp_file, file_offset, SEEK_SET))
+    ERREXIT(cinfo, JERR_TFILE_SEEK);
+  if (JFREAD(info->temp_file, buffer_address, byte_count)
+      != (size_t) byte_count)
+    ERREXIT(cinfo, JERR_TFILE_READ);
+}
+
+
+METHODDEF(void)
+write_backing_store (j_common_ptr cinfo, backing_store_ptr info,
+		     void FAR * buffer_address,
+		     long file_offset, long byte_count)
+{
+  if (fseek(info->temp_file, file_offset, SEEK_SET))
+    ERREXIT(cinfo, JERR_TFILE_SEEK);
+  if (JFWRITE(info->temp_file, buffer_address, byte_count)
+      != (size_t) byte_count)
+    ERREXIT(cinfo, JERR_TFILE_WRITE);
+}
+
+
+METHODDEF(void)
+close_backing_store (j_common_ptr cinfo, backing_store_ptr info)
+{
+  fclose(info->temp_file);
+  /* Since this implementation uses tmpfile() to create the file,
+   * no explicit file deletion is needed.
+   */
+}
+
+
+/*
+ * Initial opening of a backing-store object.
+ *
+ * This version uses tmpfile(), which constructs a suitable file name
+ * behind the scenes.  We don't have to use info->temp_name[] at all;
+ * indeed, we can't even find out the actual name of the temp file.
+ */
+
+GLOBAL(void)
+jpeg_open_backing_store (j_common_ptr cinfo, backing_store_ptr info,
+			 long total_bytes_needed)
+{
+  if ((info->temp_file = tmpfile()) == NULL)
+    ERREXITS(cinfo, JERR_TFILE_CREATE, "");
+  info->read_backing_store = read_backing_store;
+  info->write_backing_store = write_backing_store;
+  info->close_backing_store = close_backing_store;
+}
+
+
+/*
+ * These routines take care of any system-dependent initialization and
+ * cleanup required.
+ */
+
+GLOBAL(long)
+jpeg_mem_init (j_common_ptr cinfo)
+{
+  return DEFAULT_MAX_MEM;	/* default for max_memory_to_use */
+}
+
+GLOBAL(void)
+jpeg_mem_term (j_common_ptr cinfo)
+{
+  /* no work */
+}
diff --git a/uppsrc/plugin/jpg/lib/jmemdos.c b/uppsrc/plugin/jpg/lib/jmemdos.c
new file mode 100644
index 000000000..4b693e3f5
--- /dev/null
+++ b/uppsrc/plugin/jpg/lib/jmemdos.c
@@ -0,0 +1,638 @@
+/*
+ * jmemdos.c
+ *
+ * Copyright (C) 1992-1997, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file provides an MS-DOS-compatible implementation of the system-
+ * dependent portion of the JPEG memory manager.  Temporary data can be
+ * stored in extended or expanded memory as well as in regular DOS files.
+ *
+ * If you use this file, you must be sure that NEED_FAR_POINTERS is defined
+ * if you compile in a small-data memory model; it should NOT be defined if
+ * you use a large-data memory model.  This file is not recommended if you
+ * are using a flat-memory-space 386 environment such as DJGCC or Watcom C.
+ * Also, this code will NOT work if struct fields are aligned on greater than
+ * 2-byte boundaries.
+ *
+ * Based on code contributed by Ge' Weijers.
+ */
+
+/*
+ * If you have both extended and expanded memory, you may want to change the
+ * order in which they are tried in jopen_backing_store.  On a 286 machine
+ * expanded memory is usually faster, since extended memory access involves
+ * an expensive protected-mode-and-back switch.  On 386 and better, extended
+ * memory is usually faster.  As distributed, the code tries extended memory
+ * first (what? not everyone has a 386? :-).
+ *
+ * You can disable use of extended/expanded memory entirely by altering these
+ * definitions or overriding them from the Makefile (eg, -DEMS_SUPPORTED=0).
+ */
+
+#ifndef XMS_SUPPORTED
+#define XMS_SUPPORTED  1
+#endif
+#ifndef EMS_SUPPORTED
+#define EMS_SUPPORTED  1
+#endif
+
+
+#define JPEG_INTERNALS
+#include "jinclude.h"
+#include "jpeglib.h"
+#include "jmemsys.h"		/* import the system-dependent declarations */
+
+#ifndef HAVE_STDLIB_H		/* <stdlib.h> should declare these */
+extern void * malloc JPP((size_t size));
+extern void free JPP((void *ptr));
+extern char * getenv JPP((const char * name));
+#endif
+
+#ifdef NEED_FAR_POINTERS
+
+#ifdef __TURBOC__
+/* These definitions work for Borland C (Turbo C) */
+#include <alloc.h>		/* need farmalloc(), farfree() */
+#define far_malloc(x)	farmalloc(x)
+#define far_free(x)	farfree(x)
+#else
+/* These definitions work for Microsoft C and compatible compilers */
+#include <malloc.h>		/* need _fmalloc(), _ffree() */
+#define far_malloc(x)	_fmalloc(x)
+#define far_free(x)	_ffree(x)
+#endif
+
+#else /* not NEED_FAR_POINTERS */
+
+#define far_malloc(x)	malloc(x)
+#define far_free(x)	free(x)
+
+#endif /* NEED_FAR_POINTERS */
+
+#ifdef DONT_USE_B_MODE		/* define mode parameters for fopen() */
+#define READ_BINARY	"r"
+#else
+#define READ_BINARY	"rb"
+#endif
+
+#ifndef USE_MSDOS_MEMMGR	/* make sure user got configuration right */
+  You forgot to define USE_MSDOS_MEMMGR in jconfig.h. /* deliberate syntax error */
+#endif
+
+#if MAX_ALLOC_CHUNK >= 65535L	/* make sure jconfig.h got this right */
+  MAX_ALLOC_CHUNK should be less than 64K. /* deliberate syntax error */
+#endif
+
+
+/*
+ * Declarations for assembly-language support routines (see jmemdosa.asm).
+ *
+ * The functions are declared "far" as are all their pointer arguments;
+ * this ensures the assembly source code will work regardless of the
+ * compiler memory model.  We assume "short" is 16 bits, "long" is 32.
+ */
+
+typedef void far * XMSDRIVER;	/* actually a pointer to code */
+typedef struct {		/* registers for calling XMS driver */
+	unsigned short ax, dx, bx;
+	void far * ds_si;
+      } XMScontext;
+typedef struct {		/* registers for calling EMS driver */
+	unsigned short ax, dx, bx;
+	void far * ds_si;
+      } EMScontext;
+
+extern short far jdos_open JPP((short far * handle, char far * filename));
+extern short far jdos_close JPP((short handle));
+extern short far jdos_seek JPP((short handle, long offset));
+extern short far jdos_read JPP((short handle, void far * buffer,
+				unsigned short count));
+extern short far jdos_write JPP((short handle, void far * buffer,
+				 unsigned short count));
+extern void far jxms_getdriver JPP((XMSDRIVER far *));
+extern void far jxms_calldriver JPP((XMSDRIVER, XMScontext far *));
+extern short far jems_available JPP((void));
+extern void far jems_calldriver JPP((EMScontext far *));
+
+
+/*
+ * Selection of a file name for a temporary file.
+ * This is highly system-dependent, and you may want to customize it.
+ */
+
+static int next_file_num;	/* to distinguish among several temp files */
+
+LOCAL(void)
+select_file_name (char * fname)
+{
+  const char * env;
+  char * ptr;
+  FILE * tfile;
+
+  /* Keep generating file names till we find one that's not in use */
+  for (;;) {
+    /* Get temp directory name from environment TMP or TEMP variable;
+     * if none, use "."
+     */
+    if ((env = (const char *) getenv("TMP")) == NULL)
+      if ((env = (const char *) getenv("TEMP")) == NULL)
+	env = ".";
+    if (*env == '\0')		/* null string means "." */
+      env = ".";
+    ptr = fname;		/* copy name to fname */
+    while (*env != '\0')
+      *ptr++ = *env++;
+    if (ptr[-1] != '\\' && ptr[-1] != '/')
+      *ptr++ = '\\';		/* append backslash if not in env variable */
+    /* Append a suitable file name */
+    next_file_num++;		/* advance counter */
+    sprintf(ptr, "JPG%03d.TMP", next_file_num);
+    /* Probe to see if file name is already in use */
+    if ((tfile = fopen(fname, READ_BINARY)) == NULL)
+      break;
+    fclose(tfile);		/* oops, it's there; close tfile & try again */
+  }
+}
+
+
+/*
+ * Near-memory allocation and freeing are controlled by the regular library
+ * routines malloc() and free().
+ */
+
+GLOBAL(void *)
+jpeg_get_small (j_common_ptr cinfo, size_t sizeofobject)
+{
+  return (void *) malloc(sizeofobject);
+}
+
+GLOBAL(void)
+jpeg_free_small (j_common_ptr cinfo, void * object, size_t sizeofobject)
+{
+  free(object);
+}
+
+
+/*
+ * "Large" objects are allocated in far memory, if possible
+ */
+
+GLOBAL(void FAR *)
+jpeg_get_large (j_common_ptr cinfo, size_t sizeofobject)
+{
+  return (void FAR *) far_malloc(sizeofobject);
+}
+
+GLOBAL(void)
+jpeg_free_large (j_common_ptr cinfo, void FAR * object, size_t sizeofobject)
+{
+  far_free(object);
+}
+
+
+/*
+ * This routine computes the total memory space available for allocation.
+ * It's impossible to do this in a portable way; our current solution is
+ * to make the user tell us (with a default value set at compile time).
+ * If you can actually get the available space, it's a good idea to subtract
+ * a slop factor of 5% or so.
+ */
+
+#ifndef DEFAULT_MAX_MEM		/* so can override from makefile */
+#define DEFAULT_MAX_MEM		300000L /* for total usage about 450K */
+#endif
+
+GLOBAL(long)
+jpeg_mem_available (j_common_ptr cinfo, long min_bytes_needed,
+		    long max_bytes_needed, long already_allocated)
+{
+  return cinfo->mem->max_memory_to_use - already_allocated;
+}
+
+
+/*
+ * Backing store (temporary file) management.
+ * Backing store objects are only used when the value returned by
+ * jpeg_mem_available is less than the total space needed.  You can dispense
+ * with these routines if you have plenty of virtual memory; see jmemnobs.c.
+ */
+
+/*
+ * For MS-DOS we support three types of backing storage:
+ *   1. Conventional DOS files.  We access these by direct DOS calls rather
+ *      than via the stdio package.  This provides a bit better performance,
+ *      but the real reason is that the buffers to be read or written are FAR.
+ *      The stdio library for small-data memory models can't cope with that.
+ *   2. Extended memory, accessed per the XMS V2.0 specification.
+ *   3. Expanded memory, accessed per the LIM/EMS 4.0 specification.
+ * You'll need copies of those specs to make sense of the related code.
+ * The specs are available by Internet FTP from the SIMTEL archives
+ * (oak.oakland.edu and its various mirror sites).  See files
+ * pub/msdos/microsoft/xms20.arc and pub/msdos/info/limems41.zip.
+ */
+
+
+/*
+ * Access methods for a DOS file.
+ */
+
+
+METHODDEF(void)
+read_file_store (j_common_ptr cinfo, backing_store_ptr info,
+		 void FAR * buffer_address,
+		 long file_offset, long byte_count)
+{
+  if (jdos_seek(info->handle.file_handle, file_offset))
+    ERREXIT(cinfo, JERR_TFILE_SEEK);
+  /* Since MAX_ALLOC_CHUNK is less than 64K, byte_count will be too. */
+  if (byte_count > 65535L)	/* safety check */
+    ERREXIT(cinfo, JERR_BAD_ALLOC_CHUNK);
+  if (jdos_read(info->handle.file_handle, buffer_address,
+		(unsigned short) byte_count))
+    ERREXIT(cinfo, JERR_TFILE_READ);
+}
+
+
+METHODDEF(void)
+write_file_store (j_common_ptr cinfo, backing_store_ptr info,
+		  void FAR * buffer_address,
+		  long file_offset, long byte_count)
+{
+  if (jdos_seek(info->handle.file_handle, file_offset))
+    ERREXIT(cinfo, JERR_TFILE_SEEK);
+  /* Since MAX_ALLOC_CHUNK is less than 64K, byte_count will be too. */
+  if (byte_count > 65535L)	/* safety check */
+    ERREXIT(cinfo, JERR_BAD_ALLOC_CHUNK);
+  if (jdos_write(info->handle.file_handle, buffer_address,
+		 (unsigned short) byte_count))
+    ERREXIT(cinfo, JERR_TFILE_WRITE);
+}
+
+
+METHODDEF(void)
+close_file_store (j_common_ptr cinfo, backing_store_ptr info)
+{
+  jdos_close(info->handle.file_handle);	/* close the file */
+  remove(info->temp_name);	/* delete the file */
+/* If your system doesn't have remove(), try unlink() instead.
+ * remove() is the ANSI-standard name for this function, but
+ * unlink() was more common in pre-ANSI systems.
+ */
+  TRACEMSS(cinfo, 1, JTRC_TFILE_CLOSE, info->temp_name);
+}
+
+
+LOCAL(boolean)
+open_file_store (j_common_ptr cinfo, backing_store_ptr info,
+		 long total_bytes_needed)
+{
+  short handle;
+
+  select_file_name(info->temp_name);
+  if (jdos_open((short far *) & handle, (char far *) info->temp_name)) {
+    /* might as well exit since jpeg_open_backing_store will fail anyway */
+    ERREXITS(cinfo, JERR_TFILE_CREATE, info->temp_name);
+    return FALSE;
+  }
+  info->handle.file_handle = handle;
+  info->read_backing_store = read_file_store;
+  info->write_backing_store = write_file_store;
+  info->close_backing_store = close_file_store;
+  TRACEMSS(cinfo, 1, JTRC_TFILE_OPEN, info->temp_name);
+  return TRUE;			/* succeeded */
+}
+
+
+/*
+ * Access methods for extended memory.
+ */
+
+#if XMS_SUPPORTED
+
+static XMSDRIVER xms_driver;	/* saved address of XMS driver */
+
+typedef union {			/* either long offset or real-mode pointer */
+	long offset;
+	void far * ptr;
+      } XMSPTR;
+
+typedef struct {		/* XMS move specification structure */
+	long length;
+	XMSH src_handle;
+	XMSPTR src;
+	XMSH dst_handle;
+	XMSPTR dst;
+      } XMSspec;
+
+#define ODD(X)	(((X) & 1L) != 0)
+
+
+METHODDEF(void)
+read_xms_store (j_common_ptr cinfo, backing_store_ptr info,
+		void FAR * buffer_address,
+		long file_offset, long byte_count)
+{
+  XMScontext ctx;
+  XMSspec spec;
+  char endbuffer[2];
+
+  /* The XMS driver can't cope with an odd length, so handle the last byte
+   * specially if byte_count is odd.  We don't expect this to be common.
+   */
+
+  spec.length = byte_count & (~ 1L);
+  spec.src_handle = info->handle.xms_handle;
+  spec.src.offset = file_offset;
+  spec.dst_handle = 0;
+  spec.dst.ptr = buffer_address;
+
+  ctx.ds_si = (void far *) & spec;
+  ctx.ax = 0x0b00;		/* EMB move */
+  jxms_calldriver(xms_driver, (XMScontext far *) & ctx);
+  if (ctx.ax != 1)
+    ERREXIT(cinfo, JERR_XMS_READ);
+
+  if (ODD(byte_count)) {
+    read_xms_store(cinfo, info, (void FAR *) endbuffer,
+		   file_offset + byte_count - 1L, 2L);
+    ((char FAR *) buffer_address)[byte_count - 1L] = endbuffer[0];
+  }
+}
+
+
+METHODDEF(void)
+write_xms_store (j_common_ptr cinfo, backing_store_ptr info,
+		 void FAR * buffer_address,
+		 long file_offset, long byte_count)
+{
+  XMScontext ctx;
+  XMSspec spec;
+  char endbuffer[2];
+
+  /* The XMS driver can't cope with an odd length, so handle the last byte
+   * specially if byte_count is odd.  We don't expect this to be common.
+   */
+
+  spec.length = byte_count & (~ 1L);
+  spec.src_handle = 0;
+  spec.src.ptr = buffer_address;
+  spec.dst_handle = info->handle.xms_handle;
+  spec.dst.offset = file_offset;
+
+  ctx.ds_si = (void far *) & spec;
+  ctx.ax = 0x0b00;		/* EMB move */
+  jxms_calldriver(xms_driver, (XMScontext far *) & ctx);
+  if (ctx.ax != 1)
+    ERREXIT(cinfo, JERR_XMS_WRITE);
+
+  if (ODD(byte_count)) {
+    read_xms_store(cinfo, info, (void FAR *) endbuffer,
+		   file_offset + byte_count - 1L, 2L);
+    endbuffer[0] = ((char FAR *) buffer_address)[byte_count - 1L];
+    write_xms_store(cinfo, info, (void FAR *) endbuffer,
+		    file_offset + byte_count - 1L, 2L);
+  }
+}
+
+
+METHODDEF(void)
+close_xms_store (j_common_ptr cinfo, backing_store_ptr info)
+{
+  XMScontext ctx;
+
+  ctx.dx = info->handle.xms_handle;
+  ctx.ax = 0x0a00;
+  jxms_calldriver(xms_driver, (XMScontext far *) & ctx);
+  TRACEMS1(cinfo, 1, JTRC_XMS_CLOSE, info->handle.xms_handle);
+  /* we ignore any error return from the driver */
+}
+
+
+LOCAL(boolean)
+open_xms_store (j_common_ptr cinfo, backing_store_ptr info,
+		long total_bytes_needed)
+{
+  XMScontext ctx;
+
+  /* Get address of XMS driver */
+  jxms_getdriver((XMSDRIVER far *) & xms_driver);
+  if (xms_driver == NULL)
+    return FALSE;		/* no driver to be had */
+
+  /* Get version number, must be >= 2.00 */
+  ctx.ax = 0x0000;
+  jxms_calldriver(xms_driver, (XMScontext far *) & ctx);
+  if (ctx.ax < (unsigned short) 0x0200)
+    return FALSE;
+
+  /* Try to get space (expressed in kilobytes) */
+  ctx.dx = (unsigned short) ((total_bytes_needed + 1023L) >> 10);
+  ctx.ax = 0x0900;
+  jxms_calldriver(xms_driver, (XMScontext far *) & ctx);
+  if (ctx.ax != 1)
+    return FALSE;
+
+  /* Succeeded, save the handle and away we go */
+  info->handle.xms_handle = ctx.dx;
+  info->read_backing_store = read_xms_store;
+  info->write_backing_store = write_xms_store;
+  info->close_backing_store = close_xms_store;
+  TRACEMS1(cinfo, 1, JTRC_XMS_OPEN, ctx.dx);
+  return TRUE;			/* succeeded */
+}
+
+#endif /* XMS_SUPPORTED */
+
+
+/*
+ * Access methods for expanded memory.
+ */
+
+#if EMS_SUPPORTED
+
+/* The EMS move specification structure requires word and long fields aligned
+ * at odd byte boundaries.  Some compilers will align struct fields at even
+ * byte boundaries.  While it's usually possible to force byte alignment,
+ * that causes an overall performance penalty and may pose problems in merging
+ * JPEG into a larger application.  Instead we accept some rather dirty code
+ * here.  Note this code would fail if the hardware did not allow odd-byte
+ * word & long accesses, but all 80x86 CPUs do.
+ */
+
+typedef void far * EMSPTR;
+
+typedef union {			/* EMS move specification structure */
+	long length;		/* It's easy to access first 4 bytes */
+	char bytes[18];		/* Misaligned fields in here! */
+      } EMSspec;
+
+/* Macros for accessing misaligned fields */
+#define FIELD_AT(spec,offset,type)  (*((type *) &(spec.bytes[offset])))
+#define SRC_TYPE(spec)		FIELD_AT(spec,4,char)
+#define SRC_HANDLE(spec)	FIELD_AT(spec,5,EMSH)
+#define SRC_OFFSET(spec)	FIELD_AT(spec,7,unsigned short)
+#define SRC_PAGE(spec)		FIELD_AT(spec,9,unsigned short)
+#define SRC_PTR(spec)		FIELD_AT(spec,7,EMSPTR)
+#define DST_TYPE(spec)		FIELD_AT(spec,11,char)
+#define DST_HANDLE(spec)	FIELD_AT(spec,12,EMSH)
+#define DST_OFFSET(spec)	FIELD_AT(spec,14,unsigned short)
+#define DST_PAGE(spec)		FIELD_AT(spec,16,unsigned short)
+#define DST_PTR(spec)		FIELD_AT(spec,14,EMSPTR)
+
+#define EMSPAGESIZE	16384L	/* gospel, see the EMS specs */
+
+#define HIBYTE(W)  (((W) >> 8) & 0xFF)
+#define LOBYTE(W)  ((W) & 0xFF)
+
+
+METHODDEF(void)
+read_ems_store (j_common_ptr cinfo, backing_store_ptr info,
+		void FAR * buffer_address,
+		long file_offset, long byte_count)
+{
+  EMScontext ctx;
+  EMSspec spec;
+
+  spec.length = byte_count;
+  SRC_TYPE(spec) = 1;
+  SRC_HANDLE(spec) = info->handle.ems_handle;
+  SRC_PAGE(spec)   = (unsigned short) (file_offset / EMSPAGESIZE);
+  SRC_OFFSET(spec) = (unsigned short) (file_offset % EMSPAGESIZE);
+  DST_TYPE(spec) = 0;
+  DST_HANDLE(spec) = 0;
+  DST_PTR(spec)    = buffer_address;
+
+  ctx.ds_si = (void far *) & spec;
+  ctx.ax = 0x5700;		/* move memory region */
+  jems_calldriver((EMScontext far *) & ctx);
+  if (HIBYTE(ctx.ax) != 0)
+    ERREXIT(cinfo, JERR_EMS_READ);
+}
+
+
+METHODDEF(void)
+write_ems_store (j_common_ptr cinfo, backing_store_ptr info,
+		 void FAR * buffer_address,
+		 long file_offset, long byte_count)
+{
+  EMScontext ctx;
+  EMSspec spec;
+
+  spec.length = byte_count;
+  SRC_TYPE(spec) = 0;
+  SRC_HANDLE(spec) = 0;
+  SRC_PTR(spec)    = buffer_address;
+  DST_TYPE(spec) = 1;
+  DST_HANDLE(spec) = info->handle.ems_handle;
+  DST_PAGE(spec)   = (unsigned short) (file_offset / EMSPAGESIZE);
+  DST_OFFSET(spec) = (unsigned short) (file_offset % EMSPAGESIZE);
+
+  ctx.ds_si = (void far *) & spec;
+  ctx.ax = 0x5700;		/* move memory region */
+  jems_calldriver((EMScontext far *) & ctx);
+  if (HIBYTE(ctx.ax) != 0)
+    ERREXIT(cinfo, JERR_EMS_WRITE);
+}
+
+
+METHODDEF(void)
+close_ems_store (j_common_ptr cinfo, backing_store_ptr info)
+{
+  EMScontext ctx;
+
+  ctx.ax = 0x4500;
+  ctx.dx = info->handle.ems_handle;
+  jems_calldriver((EMScontext far *) & ctx);
+  TRACEMS1(cinfo, 1, JTRC_EMS_CLOSE, info->handle.ems_handle);
+  /* we ignore any error return from the driver */
+}
+
+
+LOCAL(boolean)
+open_ems_store (j_common_ptr cinfo, backing_store_ptr info,
+		long total_bytes_needed)
+{
+  EMScontext ctx;
+
+  /* Is EMS driver there? */
+  if (! jems_available())
+    return FALSE;
+
+  /* Get status, make sure EMS is OK */
+  ctx.ax = 0x4000;
+  jems_calldriver((EMScontext far *) & ctx);
+  if (HIBYTE(ctx.ax) != 0)
+    return FALSE;
+
+  /* Get version, must be >= 4.0 */
+  ctx.ax = 0x4600;
+  jems_calldriver((EMScontext far *) & ctx);
+  if (HIBYTE(ctx.ax) != 0 || LOBYTE(ctx.ax) < 0x40)
+    return FALSE;
+
+  /* Try to allocate requested space */
+  ctx.ax = 0x4300;
+  ctx.bx = (unsigned short) ((total_bytes_needed + EMSPAGESIZE-1L) / EMSPAGESIZE);
+  jems_calldriver((EMScontext far *) & ctx);
+  if (HIBYTE(ctx.ax) != 0)
+    return FALSE;
+
+  /* Succeeded, save the handle and away we go */
+  info->handle.ems_handle = ctx.dx;
+  info->read_backing_store = read_ems_store;
+  info->write_backing_store = write_ems_store;
+  info->close_backing_store = close_ems_store;
+  TRACEMS1(cinfo, 1, JTRC_EMS_OPEN, ctx.dx);
+  return TRUE;			/* succeeded */
+}
+
+#endif /* EMS_SUPPORTED */
+
+
+/*
+ * Initial opening of a backing-store object.
+ */
+
+GLOBAL(void)
+jpeg_open_backing_store (j_common_ptr cinfo, backing_store_ptr info,
+			 long total_bytes_needed)
+{
+  /* Try extended memory, then expanded memory, then regular file. */
+#if XMS_SUPPORTED
+  if (open_xms_store(cinfo, info, total_bytes_needed))
+    return;
+#endif
+#if EMS_SUPPORTED
+  if (open_ems_store(cinfo, info, total_bytes_needed))
+    return;
+#endif
+  if (open_file_store(cinfo, info, total_bytes_needed))
+    return;
+  ERREXITS(cinfo, JERR_TFILE_CREATE, "");
+}
+
+
+/*
+ * These routines take care of any system-dependent initialization and
+ * cleanup required.
+ */
+
+GLOBAL(long)
+jpeg_mem_init (j_common_ptr cinfo)
+{
+  next_file_num = 0;		/* initialize temp file name generator */
+  return DEFAULT_MAX_MEM;	/* default for max_memory_to_use */
+}
+
+GLOBAL(void)
+jpeg_mem_term (j_common_ptr cinfo)
+{
+  /* Microsoft C, at least in v6.00A, will not successfully reclaim freed
+   * blocks of size > 32Kbytes unless we give it a kick in the rear, like so:
+   */
+#ifdef NEED_FHEAPMIN
+  _fheapmin();
+#endif
+}
diff --git a/uppsrc/plugin/jpg/lib/jmemmac.c b/uppsrc/plugin/jpg/lib/jmemmac.c
new file mode 100644
index 000000000..106f9bea0
--- /dev/null
+++ b/uppsrc/plugin/jpg/lib/jmemmac.c
@@ -0,0 +1,289 @@
+/*
+ * jmemmac.c
+ *
+ * Copyright (C) 1992-1997, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * jmemmac.c provides an Apple Macintosh implementation of the system-
+ * dependent portion of the JPEG memory manager.
+ *
+ * If you use jmemmac.c, then you must define USE_MAC_MEMMGR in the
+ * JPEG_INTERNALS part of jconfig.h.
+ *
+ * jmemmac.c uses the Macintosh toolbox routines NewPtr and DisposePtr
+ * instead of malloc and free.  It accurately determines the amount of
+ * memory available by using CompactMem.  Notice that if left to its
+ * own devices, this code can chew up all available space in the
+ * application's zone, with the exception of the rather small "slop"
+ * factor computed in jpeg_mem_available().  The application can ensure
+ * that more space is left over by reducing max_memory_to_use.
+ *
+ * Large images are swapped to disk using temporary files and System 7.0+'s
+ * temporary folder functionality.
+ *
+ * Note that jmemmac.c depends on two features of MacOS that were first
+ * introduced in System 7: FindFolder and the FSSpec-based calls.
+ * If your application uses jmemmac.c and is run under System 6 or earlier,
+ * and the jpeg library decides it needs a temporary file, it will abort,
+ * printing error messages about requiring System 7.  (If no temporary files
+ * are created, it will run fine.)
+ *
+ * If you want to use jmemmac.c in an application that might be used with
+ * System 6 or earlier, then you should remove dependencies on FindFolder
+ * and the FSSpec calls.  You will need to replace FindFolder with some
+ * other mechanism for finding a place to put temporary files, and you
+ * should replace the FSSpec calls with their HFS equivalents:
+ *
+ *     FSpDelete     ->  HDelete
+ *     FSpGetFInfo   ->  HGetFInfo
+ *     FSpCreate     ->  HCreate
+ *     FSpOpenDF     ->  HOpen      *** Note: not HOpenDF ***
+ *     FSMakeFSSpec  ->  (fill in spec by hand.)
+ *
+ * (Use HOpen instead of HOpenDF.  HOpen is just a glue-interface to PBHOpen,
+ * which is on all HFS macs.  HOpenDF is a System 7 addition which avoids the
+ * ages-old problem of names starting with a period.)
+ *
+ * Contributed by Sam Bushell (jsam@iagu.on.net) and
+ * Dan Gildor (gyld@in-touch.com).
+ */
+
+#define JPEG_INTERNALS
+#include "jinclude.h"
+#include "jpeglib.h"
+#include "jmemsys.h"    /* import the system-dependent declarations */
+
+#ifndef USE_MAC_MEMMGR	/* make sure user got configuration right */
+  You forgot to define USE_MAC_MEMMGR in jconfig.h. /* deliberate syntax error */
+#endif
+
+#include <Memory.h>     /* we use the MacOS memory manager */
+#include <Files.h>      /* we use the MacOS File stuff */
+#include <Folders.h>    /* we use the MacOS HFS stuff */
+#include <Script.h>     /* for smSystemScript */
+#include <Gestalt.h>    /* we use Gestalt to test for specific functionality */
+
+#ifndef TEMP_FILE_NAME		/* can override from jconfig.h or Makefile */
+#define TEMP_FILE_NAME  "JPG%03d.TMP"
+#endif
+
+static int next_file_num;	/* to distinguish among several temp files */
+
+
+/*
+ * Memory allocation and freeing are controlled by the MacOS library
+ * routines NewPtr() and DisposePtr(), which allocate fixed-address
+ * storage.  Unfortunately, the IJG library isn't smart enough to cope
+ * with relocatable storage.
+ */
+
+GLOBAL(void *)
+jpeg_get_small (j_common_ptr cinfo, size_t sizeofobject)
+{
+  return (void *) NewPtr(sizeofobject);
+}
+
+GLOBAL(void)
+jpeg_free_small (j_common_ptr cinfo, void * object, size_t sizeofobject)
+{
+  DisposePtr((Ptr) object);
+}
+
+
+/*
+ * "Large" objects are treated the same as "small" ones.
+ * NB: we include FAR keywords in the routine declarations simply for
+ * consistency with the rest of the IJG code; FAR should expand to empty
+ * on rational architectures like the Mac.
+ */
+
+GLOBAL(void FAR *)
+jpeg_get_large (j_common_ptr cinfo, size_t sizeofobject)
+{
+  return (void FAR *) NewPtr(sizeofobject);
+}
+
+GLOBAL(void)
+jpeg_free_large (j_common_ptr cinfo, void FAR * object, size_t sizeofobject)
+{
+  DisposePtr((Ptr) object);
+}
+
+
+/*
+ * This routine computes the total memory space available for allocation.
+ */
+
+GLOBAL(long)
+jpeg_mem_available (j_common_ptr cinfo, long min_bytes_needed,
+		    long max_bytes_needed, long already_allocated)
+{
+  long limit = cinfo->mem->max_memory_to_use - already_allocated;
+  long slop, mem;
+
+  /* Don't ask for more than what application has told us we may use */
+  if (max_bytes_needed > limit && limit > 0)
+    max_bytes_needed = limit;
+  /* Find whether there's a big enough free block in the heap.
+   * CompactMem tries to create a contiguous block of the requested size,
+   * and then returns the size of the largest free block (which could be
+   * much more or much less than we asked for).
+   * We add some slop to ensure we don't use up all available memory.
+   */
+  slop = max_bytes_needed / 16 + 32768L;
+  mem = CompactMem(max_bytes_needed + slop) - slop;
+  if (mem < 0)
+    mem = 0;			/* sigh, couldn't even get the slop */
+  /* Don't take more than the application says we can have */
+  if (mem > limit && limit > 0)
+    mem = limit;
+  return mem;
+}
+
+
+/*
+ * Backing store (temporary file) management.
+ * Backing store objects are only used when the value returned by
+ * jpeg_mem_available is less than the total space needed.  You can dispense
+ * with these routines if you have plenty of virtual memory; see jmemnobs.c.
+ */
+
+
+METHODDEF(void)
+read_backing_store (j_common_ptr cinfo, backing_store_ptr info,
+		    void FAR * buffer_address,
+		    long file_offset, long byte_count)
+{
+  long bytes = byte_count;
+  long retVal;
+
+  if ( SetFPos ( info->temp_file, fsFromStart, file_offset ) != noErr )
+    ERREXIT(cinfo, JERR_TFILE_SEEK);
+
+  retVal = FSRead ( info->temp_file, &bytes,
+		    (unsigned char *) buffer_address );
+  if ( retVal != noErr || bytes != byte_count )
+    ERREXIT(cinfo, JERR_TFILE_READ);
+}
+
+
+METHODDEF(void)
+write_backing_store (j_common_ptr cinfo, backing_store_ptr info,
+		     void FAR * buffer_address,
+		     long file_offset, long byte_count)
+{
+  long bytes = byte_count;
+  long retVal;
+
+  if ( SetFPos ( info->temp_file, fsFromStart, file_offset ) != noErr )
+    ERREXIT(cinfo, JERR_TFILE_SEEK);
+
+  retVal = FSWrite ( info->temp_file, &bytes,
+		     (unsigned char *) buffer_address );
+  if ( retVal != noErr || bytes != byte_count )
+    ERREXIT(cinfo, JERR_TFILE_WRITE);
+}
+
+
+METHODDEF(void)
+close_backing_store (j_common_ptr cinfo, backing_store_ptr info)
+{
+  FSClose ( info->temp_file );
+  FSpDelete ( &(info->tempSpec) );
+}
+
+
+/*
+ * Initial opening of a backing-store object.
+ *
+ * This version uses FindFolder to find the Temporary Items folder,
+ * and puts the temporary file in there.
+ */
+
+GLOBAL(void)
+jpeg_open_backing_store (j_common_ptr cinfo, backing_store_ptr info,
+			 long total_bytes_needed)
+{
+  short         tmpRef, vRefNum;
+  long          dirID;
+  FInfo         finderInfo;
+  FSSpec        theSpec;
+  Str255        fName;
+  OSErr         osErr;
+  long          gestaltResponse = 0;
+
+  /* Check that FSSpec calls are available. */
+  osErr = Gestalt( gestaltFSAttr, &gestaltResponse );
+  if ( ( osErr != noErr )
+       || !( gestaltResponse & (1<<gestaltHasFSSpecCalls) ) )
+    ERREXITS(cinfo, JERR_TFILE_CREATE, "- System 7.0 or later required");
+  /* TO DO: add a proper error message to jerror.h. */
+
+  /* Check that FindFolder is available. */
+  osErr = Gestalt( gestaltFindFolderAttr, &gestaltResponse );
+  if ( ( osErr != noErr )
+       || !( gestaltResponse & (1<<gestaltFindFolderPresent) ) )
+    ERREXITS(cinfo, JERR_TFILE_CREATE, "- System 7.0 or later required.");
+  /* TO DO: add a proper error message to jerror.h. */
+
+  osErr = FindFolder ( kOnSystemDisk, kTemporaryFolderType, kCreateFolder,
+                       &vRefNum, &dirID );
+  if ( osErr != noErr )
+    ERREXITS(cinfo, JERR_TFILE_CREATE, "- temporary items folder unavailable");
+  /* TO DO: Try putting the temp files somewhere else. */
+
+  /* Keep generating file names till we find one that's not in use */
+  for (;;) {
+    next_file_num++;		/* advance counter */
+
+    sprintf(info->temp_name, TEMP_FILE_NAME, next_file_num);
+    strcpy ( (Ptr)fName+1, info->temp_name );
+    *fName = strlen (info->temp_name);
+    osErr = FSMakeFSSpec ( vRefNum, dirID, fName, &theSpec );
+
+    if ( (osErr = FSpGetFInfo ( &theSpec, &finderInfo ) ) != noErr )
+      break;
+  }
+
+  osErr = FSpCreate ( &theSpec, '????', '????', smSystemScript );
+  if ( osErr != noErr )
+    ERREXITS(cinfo, JERR_TFILE_CREATE, info->temp_name);
+
+  osErr = FSpOpenDF ( &theSpec, fsRdWrPerm, &(info->temp_file) );
+  if ( osErr != noErr )
+    ERREXITS(cinfo, JERR_TFILE_CREATE, info->temp_name);
+
+  info->tempSpec = theSpec;
+
+  info->read_backing_store = read_backing_store;
+  info->write_backing_store = write_backing_store;
+  info->close_backing_store = close_backing_store;
+  TRACEMSS(cinfo, 1, JTRC_TFILE_OPEN, info->temp_name);
+}
+
+
+/*
+ * These routines take care of any system-dependent initialization and
+ * cleanup required.
+ */
+
+GLOBAL(long)
+jpeg_mem_init (j_common_ptr cinfo)
+{
+  next_file_num = 0;
+
+  /* max_memory_to_use will be initialized to FreeMem()'s result;
+   * the calling application might later reduce it, for example
+   * to leave room to invoke multiple JPEG objects.
+   * Note that FreeMem returns the total number of free bytes;
+   * it may not be possible to allocate a single block of this size.
+   */
+  return FreeMem();
+}
+
+GLOBAL(void)
+jpeg_mem_term (j_common_ptr cinfo)
+{
+  /* no work */
+}
diff --git a/uppsrc/plugin/jpg/lib/jmemmgr.c b/uppsrc/plugin/jpg/lib/jmemmgr.c
new file mode 100644
index 000000000..3cf0704f0
--- /dev/null
+++ b/uppsrc/plugin/jpg/lib/jmemmgr.c
@@ -0,0 +1,1174 @@
+/*
+ * jmemmgr.c
+ *
+ * Copyright (C) 1991-1998, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains the JPEG system-independent memory management
+ * routines.  This code is usable across a wide variety of machines; most
+ * of the system dependencies have been isolated in a separate file.
+ * The major functions provided here are:
+ *   * pool-based allocation and freeing of memory;
+ *   * policy decisions about how to divide available memory among the
+ *     virtual arrays;
+ *   * control logic for swapping virtual arrays between main memory and
+ *     backing storage.
+ * The separate system-dependent file provides the actual backing-storage
+ * access code, and it contains the policy decision about how much total
+ * main memory to use.
+ * This file is system-dependent in the sense that some of its functions
+ * are unnecessary in some systems.  For example, if there is enough virtual
+ * memory so that backing storage will never be used, much of the virtual
+ * array control logic could be removed.  (Of course, if you have that much
+ * memory then you shouldn't care about a little bit of unused code...)
+ */
+
+#define JPEG_INTERNALS
+#define AM_MEMORY_MANAGER	/* we define jvirt_Xarray_control structs */
+#include "jinclude.h"
+#include "jpeglib.h"
+#include "jmemsys.h"		/* import the system-dependent declarations */
+
+#ifndef NO_GETENV
+#ifndef HAVE_STDLIB_H		/* <stdlib.h> should declare getenv() */
+extern char * getenv JPP((const char * name));
+#endif
+#endif
+
+
+/*
+ * Some important notes:
+ *   The allocation routines provided here must never return NULL.
+ *   They should exit to error_exit if unsuccessful.
+ *
+ *   It's not a good idea to try to merge the sarray, barray and darray
+ *   routines, even though they are textually almost the same, because
+ *   samples are usually stored as bytes while coefficients and differenced
+ *   are shorts or ints.  Thus, in machines where byte pointers have a
+ *   different representation from word pointers, the resulting machine
+ *   code could not be the same.
+ */
+
+
+/*
+ * Many machines require storage alignment: longs must start on 4-byte
+ * boundaries, doubles on 8-byte boundaries, etc.  On such machines, malloc()
+ * always returns pointers that are multiples of the worst-case alignment
+ * requirement, and we had better do so too.
+ * There isn't any really portable way to determine the worst-case alignment
+ * requirement.  This module assumes that the alignment requirement is
+ * multiples of sizeof(ALIGN_TYPE).
+ * By default, we define ALIGN_TYPE as double.  This is necessary on some
+ * workstations (where doubles really do need 8-byte alignment) and will work
+ * fine on nearly everything.  If your machine has lesser alignment needs,
+ * you can save a few bytes by making ALIGN_TYPE smaller.
+ * The only place I know of where this will NOT work is certain Macintosh
+ * 680x0 compilers that define double as a 10-byte IEEE extended float.
+ * Doing 10-byte alignment is counterproductive because longwords won't be
+ * aligned well.  Put "#define ALIGN_TYPE long" in jconfig.h if you have
+ * such a compiler.
+ */
+
+#ifndef ALIGN_TYPE		/* so can override from jconfig.h */
+#define ALIGN_TYPE  double
+#endif
+
+
+/*
+ * We allocate objects from "pools", where each pool is gotten with a single
+ * request to jpeg_get_small() or jpeg_get_large().  There is no per-object
+ * overhead within a pool, except for alignment padding.  Each pool has a
+ * header with a link to the next pool of the same class.
+ * Small and large pool headers are identical except that the latter's
+ * link pointer must be FAR on 80x86 machines.
+ * Notice that the "real" header fields are union'ed with a dummy ALIGN_TYPE
+ * field.  This forces the compiler to make SIZEOF(small_pool_hdr) a multiple
+ * of the alignment requirement of ALIGN_TYPE.
+ */
+
+typedef union small_pool_struct * small_pool_ptr;
+
+typedef union small_pool_struct {
+  struct {
+    small_pool_ptr next;	/* next in list of pools */
+    size_t bytes_used;		/* how many bytes already used within pool */
+    size_t bytes_left;		/* bytes still available in this pool */
+  } hdr;
+  ALIGN_TYPE dummy;		/* included in union to ensure alignment */
+} small_pool_hdr;
+
+typedef union large_pool_struct FAR * large_pool_ptr;
+
+typedef union large_pool_struct {
+  struct {
+    large_pool_ptr next;	/* next in list of pools */
+    size_t bytes_used;		/* how many bytes already used within pool */
+    size_t bytes_left;		/* bytes still available in this pool */
+  } hdr;
+  ALIGN_TYPE dummy;		/* included in union to ensure alignment */
+} large_pool_hdr;
+
+
+/*
+ * Here is the full definition of a memory manager object.
+ */
+
+typedef struct {
+  struct jpeg_memory_mgr pub;	/* public fields */
+
+  /* Each pool identifier (lifetime class) names a linked list of pools. */
+  small_pool_ptr small_list[JPOOL_NUMPOOLS];
+  large_pool_ptr large_list[JPOOL_NUMPOOLS];
+
+  /* Since we only have one lifetime class of virtual arrays, only one
+   * linked list is necessary (for each datatype).  Note that the virtual
+   * array control blocks being linked together are actually stored somewhere
+   * in the small-pool list.
+   */
+  jvirt_sarray_ptr virt_sarray_list;
+  jvirt_barray_ptr virt_barray_list;
+
+  /* This counts total space obtained from jpeg_get_small/large */
+  long total_space_allocated;
+
+  /* alloc_sarray and alloc_barray set this value for use by virtual
+   * array routines.
+   */
+  JDIMENSION last_rowsperchunk;	/* from most recent alloc_sarray/barray */
+} my_memory_mgr;
+
+typedef my_memory_mgr * my_mem_ptr;
+
+
+/*
+ * The control blocks for virtual arrays.
+ * Note that these blocks are allocated in the "small" pool area.
+ * System-dependent info for the associated backing store (if any) is hidden
+ * inside the backing_store_info struct.
+ */
+
+struct jvirt_sarray_control {
+  JSAMPARRAY mem_buffer;	/* => the in-memory buffer */
+  JDIMENSION rows_in_array;	/* total virtual array height */
+  JDIMENSION samplesperrow;	/* width of array (and of memory buffer) */
+  JDIMENSION maxaccess;		/* max rows accessed by access_virt_sarray */
+  JDIMENSION rows_in_mem;	/* height of memory buffer */
+  JDIMENSION rowsperchunk;	/* allocation chunk size in mem_buffer */
+  JDIMENSION cur_start_row;	/* first logical row # in the buffer */
+  JDIMENSION first_undef_row;	/* row # of first uninitialized row */
+  boolean pre_zero;		/* pre-zero mode requested? */
+  boolean dirty;		/* do current buffer contents need written? */
+  boolean b_s_open;		/* is backing-store data valid? */
+  jvirt_sarray_ptr next;	/* link to next virtual sarray control block */
+  backing_store_info b_s_info;	/* System-dependent control info */
+};
+
+struct jvirt_barray_control {
+  JBLOCKARRAY mem_buffer;	/* => the in-memory buffer */
+  JDIMENSION rows_in_array;	/* total virtual array height */
+  JDIMENSION blocksperrow;	/* width of array (and of memory buffer) */
+  JDIMENSION maxaccess;		/* max rows accessed by access_virt_barray */
+  JDIMENSION rows_in_mem;	/* height of memory buffer */
+  JDIMENSION rowsperchunk;	/* allocation chunk size in mem_buffer */
+  JDIMENSION cur_start_row;	/* first logical row # in the buffer */
+  JDIMENSION first_undef_row;	/* row # of first uninitialized row */
+  boolean pre_zero;		/* pre-zero mode requested? */
+  boolean dirty;		/* do current buffer contents need written? */
+  boolean b_s_open;		/* is backing-store data valid? */
+  jvirt_barray_ptr next;	/* link to next virtual barray control block */
+  backing_store_info b_s_info;	/* System-dependent control info */
+};
+
+
+#ifdef MEM_STATS		/* optional extra stuff for statistics */
+
+LOCAL(void)
+print_mem_stats (j_common_ptr cinfo, int pool_id)
+{
+  my_mem_ptr mem = (my_mem_ptr) cinfo->mem;
+  small_pool_ptr shdr_ptr;
+  large_pool_ptr lhdr_ptr;
+
+  /* Since this is only a debugging stub, we can cheat a little by using
+   * fprintf directly rather than going through the trace message code.
+   * This is helpful because message parm array can't handle longs.
+   */
+  fprintf(stderr, "Freeing pool %d, total space = %ld\n",
+	  pool_id, mem->total_space_allocated);
+
+  for (lhdr_ptr = mem->large_list[pool_id]; lhdr_ptr != NULL;
+       lhdr_ptr = lhdr_ptr->hdr.next) {
+    fprintf(stderr, "  Large chunk used %ld\n",
+	    (long) lhdr_ptr->hdr.bytes_used);
+  }
+
+  for (shdr_ptr = mem->small_list[pool_id]; shdr_ptr != NULL;
+       shdr_ptr = shdr_ptr->hdr.next) {
+    fprintf(stderr, "  Small chunk used %ld free %ld\n",
+	    (long) shdr_ptr->hdr.bytes_used,
+	    (long) shdr_ptr->hdr.bytes_left);
+  }
+}
+
+#endif /* MEM_STATS */
+
+
+LOCAL(void)
+out_of_memory (j_common_ptr cinfo, int which)
+/* Report an out-of-memory error and stop execution */
+/* If we compiled MEM_STATS support, report alloc requests before dying */
+{
+#ifdef MEM_STATS
+  cinfo->err->trace_level = 2;	/* force self_destruct to report stats */
+#endif
+  ERREXIT1(cinfo, JERR_OUT_OF_MEMORY, which);
+}
+
+
+/*
+ * Allocation of "small" objects.
+ *
+ * For these, we use pooled storage.  When a new pool must be created,
+ * we try to get enough space for the current request plus a "slop" factor,
+ * where the slop will be the amount of leftover space in the new pool.
+ * The speed vs. space tradeoff is largely determined by the slop values.
+ * A different slop value is provided for each pool class (lifetime),
+ * and we also distinguish the first pool of a class from later ones.
+ * NOTE: the values given work fairly well on both 16- and 32-bit-int
+ * machines, but may be too small if longs are 64 bits or more.
+ */
+
+static const size_t first_pool_slop[JPOOL_NUMPOOLS] =
+{
+	1600,			/* first PERMANENT pool */
+	16000			/* first IMAGE pool */
+};
+
+static const size_t extra_pool_slop[JPOOL_NUMPOOLS] =
+{
+	0,			/* additional PERMANENT pools */
+	5000			/* additional IMAGE pools */
+};
+
+#define MIN_SLOP  50		/* greater than 0 to avoid futile looping */
+
+
+METHODDEF(void *)
+alloc_small (j_common_ptr cinfo, int pool_id, size_t sizeofobject)
+/* Allocate a "small" object */
+{
+  my_mem_ptr mem = (my_mem_ptr) cinfo->mem;
+  small_pool_ptr hdr_ptr, prev_hdr_ptr;
+  char * data_ptr;
+  size_t odd_bytes, min_request, slop;
+
+  /* Check for unsatisfiable request (do now to ensure no overflow below) */
+  if (sizeofobject > (size_t) (MAX_ALLOC_CHUNK-SIZEOF(small_pool_hdr)))
+    out_of_memory(cinfo, 1);	/* request exceeds malloc's ability */
+
+  /* Round up the requested size to a multiple of SIZEOF(ALIGN_TYPE) */
+  odd_bytes = sizeofobject % SIZEOF(ALIGN_TYPE);
+  if (odd_bytes > 0)
+    sizeofobject += SIZEOF(ALIGN_TYPE) - odd_bytes;
+
+  /* See if space is available in any existing pool */
+  if (pool_id < 0 || pool_id >= JPOOL_NUMPOOLS)
+    ERREXIT1(cinfo, JERR_BAD_POOL_ID, pool_id);	/* safety check */
+  prev_hdr_ptr = NULL;
+  hdr_ptr = mem->small_list[pool_id];
+  while (hdr_ptr != NULL) {
+    if (hdr_ptr->hdr.bytes_left >= sizeofobject)
+      break;			/* found pool with enough space */
+    prev_hdr_ptr = hdr_ptr;
+    hdr_ptr = hdr_ptr->hdr.next;
+  }
+
+  /* Time to make a new pool? */
+  if (hdr_ptr == NULL) {
+    /* min_request is what we need now, slop is what will be leftover */
+    min_request = sizeofobject + SIZEOF(small_pool_hdr);
+    if (prev_hdr_ptr == NULL)	/* first pool in class? */
+      slop = first_pool_slop[pool_id];
+    else
+      slop = extra_pool_slop[pool_id];
+    /* Don't ask for more than MAX_ALLOC_CHUNK */
+    if (slop > (size_t) (MAX_ALLOC_CHUNK-min_request))
+      slop = (size_t) (MAX_ALLOC_CHUNK-min_request);
+    /* Try to get space, if fail reduce slop and try again */
+    for (;;) {
+      hdr_ptr = (small_pool_ptr) jpeg_get_small(cinfo, min_request + slop);
+      if (hdr_ptr != NULL)
+	break;
+      slop /= 2;
+      if (slop < MIN_SLOP)	/* give up when it gets real small */
+	out_of_memory(cinfo, 2); /* jpeg_get_small failed */
+    }
+    mem->total_space_allocated += min_request + slop;
+    /* Success, initialize the new pool header and add to end of list */
+    hdr_ptr->hdr.next = NULL;
+    hdr_ptr->hdr.bytes_used = 0;
+    hdr_ptr->hdr.bytes_left = sizeofobject + slop;
+    if (prev_hdr_ptr == NULL)	/* first pool in class? */
+      mem->small_list[pool_id] = hdr_ptr;
+    else
+      prev_hdr_ptr->hdr.next = hdr_ptr;
+  }
+
+  /* OK, allocate the object from the current pool */
+  data_ptr = (char *) (hdr_ptr + 1); /* point to first data byte in pool */
+  data_ptr += hdr_ptr->hdr.bytes_used; /* point to place for object */
+  hdr_ptr->hdr.bytes_used += sizeofobject;
+  hdr_ptr->hdr.bytes_left -= sizeofobject;
+
+  return (void *) data_ptr;
+}
+
+
+/*
+ * Allocation of "large" objects.
+ *
+ * The external semantics of these are the same as "small" objects,
+ * except that FAR pointers are used on 80x86.  However the pool
+ * management heuristics are quite different.  We assume that each
+ * request is large enough that it may as well be passed directly to
+ * jpeg_get_large; the pool management just links everything together
+ * so that we can free it all on demand.
+ * Note: the major use of "large" objects is in JSAMPARRAY and JBLOCKARRAY
+ * structures.  The routines that create these structures (see below)
+ * deliberately bunch rows together to ensure a large request size.
+ */
+
+METHODDEF(void FAR *)
+alloc_large (j_common_ptr cinfo, int pool_id, size_t sizeofobject)
+/* Allocate a "large" object */
+{
+  my_mem_ptr mem = (my_mem_ptr) cinfo->mem;
+  large_pool_ptr hdr_ptr;
+  size_t odd_bytes;
+
+  /* Check for unsatisfiable request (do now to ensure no overflow below) */
+  if (sizeofobject > (size_t) (MAX_ALLOC_CHUNK-SIZEOF(large_pool_hdr)))
+    out_of_memory(cinfo, 3);	/* request exceeds malloc's ability */
+
+  /* Round up the requested size to a multiple of SIZEOF(ALIGN_TYPE) */
+  odd_bytes = sizeofobject % SIZEOF(ALIGN_TYPE);
+  if (odd_bytes > 0)
+    sizeofobject += SIZEOF(ALIGN_TYPE) - odd_bytes;
+
+  /* Always make a new pool */
+  if (pool_id < 0 || pool_id >= JPOOL_NUMPOOLS)
+    ERREXIT1(cinfo, JERR_BAD_POOL_ID, pool_id);	/* safety check */
+
+  hdr_ptr = (large_pool_ptr) jpeg_get_large(cinfo, sizeofobject +
+					    SIZEOF(large_pool_hdr));
+  if (hdr_ptr == NULL)
+    out_of_memory(cinfo, 4);	/* jpeg_get_large failed */
+  mem->total_space_allocated += sizeofobject + SIZEOF(large_pool_hdr);
+
+  /* Success, initialize the new pool header and add to list */
+  hdr_ptr->hdr.next = mem->large_list[pool_id];
+  /* We maintain space counts in each pool header for statistical purposes,
+   * even though they are not needed for allocation.
+   */
+  hdr_ptr->hdr.bytes_used = sizeofobject;
+  hdr_ptr->hdr.bytes_left = 0;
+  mem->large_list[pool_id] = hdr_ptr;
+
+  return (void FAR *) (hdr_ptr + 1); /* point to first data byte in pool */
+}
+
+
+/*
+ * Creation of 2-D sample arrays.
+ * The pointers are in near heap, the samples themselves in FAR heap.
+ *
+ * To minimize allocation overhead and to allow I/O of large contiguous
+ * blocks, we allocate the sample rows in groups of as many rows as possible
+ * without exceeding MAX_ALLOC_CHUNK total bytes per allocation request.
+ * NB: the virtual array control routines, later in this file, know about
+ * this chunking of rows.  The rowsperchunk value is left in the mem manager
+ * object so that it can be saved away if this sarray is the workspace for
+ * a virtual array.
+ */
+
+METHODDEF(JSAMPARRAY)
+alloc_sarray (j_common_ptr cinfo, int pool_id,
+	      JDIMENSION samplesperrow, JDIMENSION numrows)
+/* Allocate a 2-D sample array */
+{
+  my_mem_ptr mem = (my_mem_ptr) cinfo->mem;
+  JSAMPARRAY result;
+  JSAMPROW workspace;
+  JDIMENSION rowsperchunk, currow, i;
+  long ltemp;
+
+  /* Calculate max # of rows allowed in one allocation chunk */
+  ltemp = (MAX_ALLOC_CHUNK-SIZEOF(large_pool_hdr)) /
+	  ((long) samplesperrow * SIZEOF(JSAMPLE));
+  if (ltemp <= 0)
+    ERREXIT(cinfo, JERR_WIDTH_OVERFLOW);
+  if (ltemp < (long) numrows)
+    rowsperchunk = (JDIMENSION) ltemp;
+  else
+    rowsperchunk = numrows;
+  mem->last_rowsperchunk = rowsperchunk;
+
+  /* Get space for row pointers (small object) */
+  result = (JSAMPARRAY) alloc_small(cinfo, pool_id,
+				    (size_t) (numrows * SIZEOF(JSAMPROW)));
+
+  /* Get the rows themselves (large objects) */
+  currow = 0;
+  while (currow < numrows) {
+    rowsperchunk = MIN(rowsperchunk, numrows - currow);
+    workspace = (JSAMPROW) alloc_large(cinfo, pool_id,
+	(size_t) ((size_t) rowsperchunk * (size_t) samplesperrow
+		  * SIZEOF(JSAMPLE)));
+    for (i = rowsperchunk; i > 0; i--) {
+      result[currow++] = workspace;
+      workspace += samplesperrow;
+    }
+  }
+
+  return result;
+}
+
+
+/*
+ * Creation of 2-D coefficient-block arrays.
+ * This is essentially the same as the code for sample arrays, above.
+ */
+
+METHODDEF(JBLOCKARRAY)
+alloc_barray (j_common_ptr cinfo, int pool_id,
+	      JDIMENSION blocksperrow, JDIMENSION numrows)
+/* Allocate a 2-D coefficient-block array */
+{
+  my_mem_ptr mem = (my_mem_ptr) cinfo->mem;
+  JBLOCKARRAY result;
+  JBLOCKROW workspace;
+  JDIMENSION rowsperchunk, currow, i;
+  long ltemp;
+
+  /* Calculate max # of rows allowed in one allocation chunk */
+  ltemp = (MAX_ALLOC_CHUNK-SIZEOF(large_pool_hdr)) /
+	  ((long) blocksperrow * SIZEOF(JBLOCK));
+  if (ltemp <= 0)
+    ERREXIT(cinfo, JERR_WIDTH_OVERFLOW);
+  if (ltemp < (long) numrows)
+    rowsperchunk = (JDIMENSION) ltemp;
+  else
+    rowsperchunk = numrows;
+  mem->last_rowsperchunk = rowsperchunk;
+
+  /* Get space for row pointers (small object) */
+  result = (JBLOCKARRAY) alloc_small(cinfo, pool_id,
+				     (size_t) (numrows * SIZEOF(JBLOCKROW)));
+
+  /* Get the rows themselves (large objects) */
+  currow = 0;
+  while (currow < numrows) {
+    rowsperchunk = MIN(rowsperchunk, numrows - currow);
+    workspace = (JBLOCKROW) alloc_large(cinfo, pool_id,
+	(size_t) ((size_t) rowsperchunk * (size_t) blocksperrow
+		  * SIZEOF(JBLOCK)));
+    for (i = rowsperchunk; i > 0; i--) {
+      result[currow++] = workspace;
+      workspace += blocksperrow;
+    }
+  }
+
+  return result;
+}
+
+
+#ifdef NEED_DARRAY
+
+/*
+ * Creation of 2-D difference arrays.
+ * This is essentially the same as the code for sample arrays, above.
+ */
+
+METHODDEF(JDIFFARRAY)
+alloc_darray (j_common_ptr cinfo, int pool_id,
+	      JDIMENSION diffsperrow, JDIMENSION numrows)
+/* Allocate a 2-D difference array */
+{
+  my_mem_ptr mem = (my_mem_ptr) cinfo->mem;
+  JDIFFARRAY result;
+  JDIFFROW workspace;
+  JDIMENSION rowsperchunk, currow, i;
+  long ltemp;
+
+  /* Calculate max # of rows allowed in one allocation chunk */
+  ltemp = (MAX_ALLOC_CHUNK-SIZEOF(large_pool_hdr)) /
+	  ((long) diffsperrow * SIZEOF(JDIFF));
+  if (ltemp <= 0)
+    ERREXIT(cinfo, JERR_WIDTH_OVERFLOW);
+  if (ltemp < (long) numrows)
+    rowsperchunk = (JDIMENSION) ltemp;
+  else
+    rowsperchunk = numrows;
+  mem->last_rowsperchunk = rowsperchunk;
+
+  /* Get space for row pointers (small object) */
+  result = (JDIFFARRAY) alloc_small(cinfo, pool_id,
+				    (size_t) (numrows * SIZEOF(JDIFFROW)));
+
+  /* Get the rows themselves (large objects) */
+  currow = 0;
+  while (currow < numrows) {
+    rowsperchunk = MIN(rowsperchunk, numrows - currow);
+    workspace = (JDIFFROW) alloc_large(cinfo, pool_id,
+	(size_t) ((size_t) rowsperchunk * (size_t) diffsperrow
+		  * SIZEOF(JDIFF)));
+    for (i = rowsperchunk; i > 0; i--) {
+      result[currow++] = workspace;
+      workspace += diffsperrow;
+    }
+  }
+
+  return result;
+}
+
+#endif
+
+
+/*
+ * About virtual array management:
+ *
+ * The above "normal" array routines are only used to allocate strip buffers
+ * (as wide as the image, but just a few rows high).  Full-image-sized buffers
+ * are handled as "virtual" arrays.  The array is still accessed a strip at a
+ * time, but the memory manager must save the whole array for repeated
+ * accesses.  The intended implementation is that there is a strip buffer in
+ * memory (as high as is possible given the desired memory limit), plus a
+ * backing file that holds the rest of the array.
+ *
+ * The request_virt_array routines are told the total size of the image and
+ * the maximum number of rows that will be accessed at once.  The in-memory
+ * buffer must be at least as large as the maxaccess value.
+ *
+ * The request routines create control blocks but not the in-memory buffers.
+ * That is postponed until realize_virt_arrays is called.  At that time the
+ * total amount of space needed is known (approximately, anyway), so free
+ * memory can be divided up fairly.
+ *
+ * The access_virt_array routines are responsible for making a specific strip
+ * area accessible (after reading or writing the backing file, if necessary).
+ * Note that the access routines are told whether the caller intends to modify
+ * the accessed strip; during a read-only pass this saves having to rewrite
+ * data to disk.  The access routines are also responsible for pre-zeroing
+ * any newly accessed rows, if pre-zeroing was requested.
+ *
+ * In current usage, the access requests are usually for nonoverlapping
+ * strips; that is, successive access start_row numbers differ by exactly
+ * num_rows = maxaccess.  This means we can get good performance with simple
+ * buffer dump/reload logic, by making the in-memory buffer be a multiple
+ * of the access height; then there will never be accesses across bufferload
+ * boundaries.  The code will still work with overlapping access requests,
+ * but it doesn't handle bufferload overlaps very efficiently.
+ */
+
+
+METHODDEF(jvirt_sarray_ptr)
+request_virt_sarray (j_common_ptr cinfo, int pool_id, boolean pre_zero,
+		     JDIMENSION samplesperrow, JDIMENSION numrows,
+		     JDIMENSION maxaccess)
+/* Request a virtual 2-D sample array */
+{
+  my_mem_ptr mem = (my_mem_ptr) cinfo->mem;
+  jvirt_sarray_ptr result;
+
+  /* Only IMAGE-lifetime virtual arrays are currently supported */
+  if (pool_id != JPOOL_IMAGE)
+    ERREXIT1(cinfo, JERR_BAD_POOL_ID, pool_id);	/* safety check */
+
+  /* get control block */
+  result = (jvirt_sarray_ptr) alloc_small(cinfo, pool_id,
+					  SIZEOF(struct jvirt_sarray_control));
+
+  result->mem_buffer = NULL;	/* marks array not yet realized */
+  result->rows_in_array = numrows;
+  result->samplesperrow = samplesperrow;
+  result->maxaccess = maxaccess;
+  result->pre_zero = pre_zero;
+  result->b_s_open = FALSE;	/* no associated backing-store object */
+  result->next = mem->virt_sarray_list; /* add to list of virtual arrays */
+  mem->virt_sarray_list = result;
+
+  return result;
+}
+
+
+METHODDEF(jvirt_barray_ptr)
+request_virt_barray (j_common_ptr cinfo, int pool_id, boolean pre_zero,
+		     JDIMENSION blocksperrow, JDIMENSION numrows,
+		     JDIMENSION maxaccess)
+/* Request a virtual 2-D coefficient-block array */
+{
+  my_mem_ptr mem = (my_mem_ptr) cinfo->mem;
+  jvirt_barray_ptr result;
+
+  /* Only IMAGE-lifetime virtual arrays are currently supported */
+  if (pool_id != JPOOL_IMAGE)
+    ERREXIT1(cinfo, JERR_BAD_POOL_ID, pool_id);	/* safety check */
+
+  /* get control block */
+  result = (jvirt_barray_ptr) alloc_small(cinfo, pool_id,
+					  SIZEOF(struct jvirt_barray_control));
+
+  result->mem_buffer = NULL;	/* marks array not yet realized */
+  result->rows_in_array = numrows;
+  result->blocksperrow = blocksperrow;
+  result->maxaccess = maxaccess;
+  result->pre_zero = pre_zero;
+  result->b_s_open = FALSE;	/* no associated backing-store object */
+  result->next = mem->virt_barray_list; /* add to list of virtual arrays */
+  mem->virt_barray_list = result;
+
+  return result;
+}
+
+
+METHODDEF(void)
+realize_virt_arrays (j_common_ptr cinfo)
+/* Allocate the in-memory buffers for any unrealized virtual arrays */
+{
+  my_mem_ptr mem = (my_mem_ptr) cinfo->mem;
+  long space_per_minheight, maximum_space, avail_mem;
+  long minheights, max_minheights;
+  jvirt_sarray_ptr sptr;
+  jvirt_barray_ptr bptr;
+
+  /* Compute the minimum space needed (maxaccess rows in each buffer)
+   * and the maximum space needed (full image height in each buffer).
+   * These may be of use to the system-dependent jpeg_mem_available routine.
+   */
+  space_per_minheight = 0;
+  maximum_space = 0;
+  for (sptr = mem->virt_sarray_list; sptr != NULL; sptr = sptr->next) {
+    if (sptr->mem_buffer == NULL) { /* if not realized yet */
+      space_per_minheight += (long) sptr->maxaccess *
+			     (long) sptr->samplesperrow * SIZEOF(JSAMPLE);
+      maximum_space += (long) sptr->rows_in_array *
+		       (long) sptr->samplesperrow * SIZEOF(JSAMPLE);
+    }
+  }
+  for (bptr = mem->virt_barray_list; bptr != NULL; bptr = bptr->next) {
+    if (bptr->mem_buffer == NULL) { /* if not realized yet */
+      space_per_minheight += (long) bptr->maxaccess *
+			     (long) bptr->blocksperrow * SIZEOF(JBLOCK);
+      maximum_space += (long) bptr->rows_in_array *
+		       (long) bptr->blocksperrow * SIZEOF(JBLOCK);
+    }
+  }
+
+  if (space_per_minheight <= 0)
+    return;			/* no unrealized arrays, no work */
+
+  /* Determine amount of memory to actually use; this is system-dependent. */
+  avail_mem = jpeg_mem_available(cinfo, space_per_minheight, maximum_space,
+				 mem->total_space_allocated);
+
+  /* If the maximum space needed is available, make all the buffers full
+   * height; otherwise parcel it out with the same number of minheights
+   * in each buffer.
+   */
+  if (avail_mem >= maximum_space)
+    max_minheights = 1000000000L;
+  else {
+    max_minheights = avail_mem / space_per_minheight;
+    /* If there doesn't seem to be enough space, try to get the minimum
+     * anyway.  This allows a "stub" implementation of jpeg_mem_available().
+     */
+    if (max_minheights <= 0)
+      max_minheights = 1;
+  }
+
+  /* Allocate the in-memory buffers and initialize backing store as needed. */
+
+  for (sptr = mem->virt_sarray_list; sptr != NULL; sptr = sptr->next) {
+    if (sptr->mem_buffer == NULL) { /* if not realized yet */
+      minheights = ((long) sptr->rows_in_array - 1L) / sptr->maxaccess + 1L;
+      if (minheights <= max_minheights) {
+	/* This buffer fits in memory */
+	sptr->rows_in_mem = sptr->rows_in_array;
+      } else {
+	/* It doesn't fit in memory, create backing store. */
+	sptr->rows_in_mem = (JDIMENSION) (max_minheights * sptr->maxaccess);
+	jpeg_open_backing_store(cinfo, & sptr->b_s_info,
+				(long) sptr->rows_in_array *
+				(long) sptr->samplesperrow *
+				(long) SIZEOF(JSAMPLE));
+	sptr->b_s_open = TRUE;
+      }
+      sptr->mem_buffer = alloc_sarray(cinfo, JPOOL_IMAGE,
+				      sptr->samplesperrow, sptr->rows_in_mem);
+      sptr->rowsperchunk = mem->last_rowsperchunk;
+      sptr->cur_start_row = 0;
+      sptr->first_undef_row = 0;
+      sptr->dirty = FALSE;
+    }
+  }
+
+  for (bptr = mem->virt_barray_list; bptr != NULL; bptr = bptr->next) {
+    if (bptr->mem_buffer == NULL) { /* if not realized yet */
+      minheights = ((long) bptr->rows_in_array - 1L) / bptr->maxaccess + 1L;
+      if (minheights <= max_minheights) {
+	/* This buffer fits in memory */
+	bptr->rows_in_mem = bptr->rows_in_array;
+      } else {
+	/* It doesn't fit in memory, create backing store. */
+	bptr->rows_in_mem = (JDIMENSION) (max_minheights * bptr->maxaccess);
+	jpeg_open_backing_store(cinfo, & bptr->b_s_info,
+				(long) bptr->rows_in_array *
+				(long) bptr->blocksperrow *
+				(long) SIZEOF(JBLOCK));
+	bptr->b_s_open = TRUE;
+      }
+      bptr->mem_buffer = alloc_barray(cinfo, JPOOL_IMAGE,
+				      bptr->blocksperrow, bptr->rows_in_mem);
+      bptr->rowsperchunk = mem->last_rowsperchunk;
+      bptr->cur_start_row = 0;
+      bptr->first_undef_row = 0;
+      bptr->dirty = FALSE;
+    }
+  }
+}
+
+
+LOCAL(void)
+do_sarray_io (j_common_ptr cinfo, jvirt_sarray_ptr ptr, boolean writing)
+/* Do backing store read or write of a virtual sample array */
+{
+  long bytesperrow, file_offset, byte_count, rows, thisrow, i;
+
+  bytesperrow = (long) ptr->samplesperrow * SIZEOF(JSAMPLE);
+  file_offset = ptr->cur_start_row * bytesperrow;
+  /* Loop to read or write each allocation chunk in mem_buffer */
+  for (i = 0; i < (long) ptr->rows_in_mem; i += ptr->rowsperchunk) {
+    /* One chunk, but check for short chunk at end of buffer */
+    rows = MIN((long) ptr->rowsperchunk, (long) ptr->rows_in_mem - i);
+    /* Transfer no more than is currently defined */
+    thisrow = (long) ptr->cur_start_row + i;
+    rows = MIN(rows, (long) ptr->first_undef_row - thisrow);
+    /* Transfer no more than fits in file */
+    rows = MIN(rows, (long) ptr->rows_in_array - thisrow);
+    if (rows <= 0)		/* this chunk might be past end of file! */
+      break;
+    byte_count = rows * bytesperrow;
+    if (writing)
+      (*ptr->b_s_info.write_backing_store) (cinfo, & ptr->b_s_info,
+					    (void FAR *) ptr->mem_buffer[i],
+					    file_offset, byte_count);
+    else
+      (*ptr->b_s_info.read_backing_store) (cinfo, & ptr->b_s_info,
+					   (void FAR *) ptr->mem_buffer[i],
+					   file_offset, byte_count);
+    file_offset += byte_count;
+  }
+}
+
+
+LOCAL(void)
+do_barray_io (j_common_ptr cinfo, jvirt_barray_ptr ptr, boolean writing)
+/* Do backing store read or write of a virtual coefficient-block array */
+{
+  long bytesperrow, file_offset, byte_count, rows, thisrow, i;
+
+  bytesperrow = (long) ptr->blocksperrow * SIZEOF(JBLOCK);
+  file_offset = ptr->cur_start_row * bytesperrow;
+  /* Loop to read or write each allocation chunk in mem_buffer */
+  for (i = 0; i < (long) ptr->rows_in_mem; i += ptr->rowsperchunk) {
+    /* One chunk, but check for short chunk at end of buffer */
+    rows = MIN((long) ptr->rowsperchunk, (long) ptr->rows_in_mem - i);
+    /* Transfer no more than is currently defined */
+    thisrow = (long) ptr->cur_start_row + i;
+    rows = MIN(rows, (long) ptr->first_undef_row - thisrow);
+    /* Transfer no more than fits in file */
+    rows = MIN(rows, (long) ptr->rows_in_array - thisrow);
+    if (rows <= 0)		/* this chunk might be past end of file! */
+      break;
+    byte_count = rows * bytesperrow;
+    if (writing)
+      (*ptr->b_s_info.write_backing_store) (cinfo, & ptr->b_s_info,
+					    (void FAR *) ptr->mem_buffer[i],
+					    file_offset, byte_count);
+    else
+      (*ptr->b_s_info.read_backing_store) (cinfo, & ptr->b_s_info,
+					   (void FAR *) ptr->mem_buffer[i],
+					   file_offset, byte_count);
+    file_offset += byte_count;
+  }
+}
+
+
+METHODDEF(JSAMPARRAY)
+access_virt_sarray (j_common_ptr cinfo, jvirt_sarray_ptr ptr,
+		    JDIMENSION start_row, JDIMENSION num_rows,
+		    boolean writable)
+/* Access the part of a virtual sample array starting at start_row */
+/* and extending for num_rows rows.  writable is true if  */
+/* caller intends to modify the accessed area. */
+{
+  JDIMENSION end_row = start_row + num_rows;
+  JDIMENSION undef_row;
+
+  /* debugging check */
+  if (end_row > ptr->rows_in_array || num_rows > ptr->maxaccess ||
+      ptr->mem_buffer == NULL)
+    ERREXIT(cinfo, JERR_BAD_VIRTUAL_ACCESS);
+
+  /* Make the desired part of the virtual array accessible */
+  if (start_row < ptr->cur_start_row ||
+      end_row > ptr->cur_start_row+ptr->rows_in_mem) {
+    if (! ptr->b_s_open)
+      ERREXIT(cinfo, JERR_VIRTUAL_BUG);
+    /* Flush old buffer contents if necessary */
+    if (ptr->dirty) {
+      do_sarray_io(cinfo, ptr, TRUE);
+      ptr->dirty = FALSE;
+    }
+    /* Decide what part of virtual array to access.
+     * Algorithm: if target address > current window, assume forward scan,
+     * load starting at target address.  If target address < current window,
+     * assume backward scan, load so that target area is top of window.
+     * Note that when switching from forward write to forward read, will have
+     * start_row = 0, so the limiting case applies and we load from 0 anyway.
+     */
+    if (start_row > ptr->cur_start_row) {
+      ptr->cur_start_row = start_row;
+    } else {
+      /* use long arithmetic here to avoid overflow & unsigned problems */
+      long ltemp;
+
+      ltemp = (long) end_row - (long) ptr->rows_in_mem;
+      if (ltemp < 0)
+	ltemp = 0;		/* don't fall off front end of file */
+      ptr->cur_start_row = (JDIMENSION) ltemp;
+    }
+    /* Read in the selected part of the array.
+     * During the initial write pass, we will do no actual read
+     * because the selected part is all undefined.
+     */
+    do_sarray_io(cinfo, ptr, FALSE);
+  }
+  /* Ensure the accessed part of the array is defined; prezero if needed.
+   * To improve locality of access, we only prezero the part of the array
+   * that the caller is about to access, not the entire in-memory array.
+   */
+  if (ptr->first_undef_row < end_row) {
+    if (ptr->first_undef_row < start_row) {
+      if (writable)		/* writer skipped over a section of array */
+	ERREXIT(cinfo, JERR_BAD_VIRTUAL_ACCESS);
+      undef_row = start_row;	/* but reader is allowed to read ahead */
+    } else {
+      undef_row = ptr->first_undef_row;
+    }
+    if (writable)
+      ptr->first_undef_row = end_row;
+    if (ptr->pre_zero) {
+      size_t bytesperrow = (size_t) ptr->samplesperrow * SIZEOF(JSAMPLE);
+      undef_row -= ptr->cur_start_row; /* make indexes relative to buffer */
+      end_row -= ptr->cur_start_row;
+      while (undef_row < end_row) {
+	jzero_far((void FAR *) ptr->mem_buffer[undef_row], bytesperrow);
+	undef_row++;
+      }
+    } else {
+      if (! writable)		/* reader looking at undefined data */
+	ERREXIT(cinfo, JERR_BAD_VIRTUAL_ACCESS);
+    }
+  }
+  /* Flag the buffer dirty if caller will write in it */
+  if (writable)
+    ptr->dirty = TRUE;
+  /* Return address of proper part of the buffer */
+  return ptr->mem_buffer + (start_row - ptr->cur_start_row);
+}
+
+
+METHODDEF(JBLOCKARRAY)
+access_virt_barray (j_common_ptr cinfo, jvirt_barray_ptr ptr,
+		    JDIMENSION start_row, JDIMENSION num_rows,
+		    boolean writable)
+/* Access the part of a virtual block array starting at start_row */
+/* and extending for num_rows rows.  writable is true if  */
+/* caller intends to modify the accessed area. */
+{
+  JDIMENSION end_row = start_row + num_rows;
+  JDIMENSION undef_row;
+
+  /* debugging check */
+  if (end_row > ptr->rows_in_array || num_rows > ptr->maxaccess ||
+      ptr->mem_buffer == NULL)
+    ERREXIT(cinfo, JERR_BAD_VIRTUAL_ACCESS);
+
+  /* Make the desired part of the virtual array accessible */
+  if (start_row < ptr->cur_start_row ||
+      end_row > ptr->cur_start_row+ptr->rows_in_mem) {
+    if (! ptr->b_s_open)
+      ERREXIT(cinfo, JERR_VIRTUAL_BUG);
+    /* Flush old buffer contents if necessary */
+    if (ptr->dirty) {
+      do_barray_io(cinfo, ptr, TRUE);
+      ptr->dirty = FALSE;
+    }
+    /* Decide what part of virtual array to access.
+     * Algorithm: if target address > current window, assume forward scan,
+     * load starting at target address.  If target address < current window,
+     * assume backward scan, load so that target area is top of window.
+     * Note that when switching from forward write to forward read, will have
+     * start_row = 0, so the limiting case applies and we load from 0 anyway.
+     */
+    if (start_row > ptr->cur_start_row) {
+      ptr->cur_start_row = start_row;
+    } else {
+      /* use long arithmetic here to avoid overflow & unsigned problems */
+      long ltemp;
+
+      ltemp = (long) end_row - (long) ptr->rows_in_mem;
+      if (ltemp < 0)
+	ltemp = 0;		/* don't fall off front end of file */
+      ptr->cur_start_row = (JDIMENSION) ltemp;
+    }
+    /* Read in the selected part of the array.
+     * During the initial write pass, we will do no actual read
+     * because the selected part is all undefined.
+     */
+    do_barray_io(cinfo, ptr, FALSE);
+  }
+  /* Ensure the accessed part of the array is defined; prezero if needed.
+   * To improve locality of access, we only prezero the part of the array
+   * that the caller is about to access, not the entire in-memory array.
+   */
+  if (ptr->first_undef_row < end_row) {
+    if (ptr->first_undef_row < start_row) {
+      if (writable)		/* writer skipped over a section of array */
+	ERREXIT(cinfo, JERR_BAD_VIRTUAL_ACCESS);
+      undef_row = start_row;	/* but reader is allowed to read ahead */
+    } else {
+      undef_row = ptr->first_undef_row;
+    }
+    if (writable)
+      ptr->first_undef_row = end_row;
+    if (ptr->pre_zero) {
+      size_t bytesperrow = (size_t) ptr->blocksperrow * SIZEOF(JBLOCK);
+      undef_row -= ptr->cur_start_row; /* make indexes relative to buffer */
+      end_row -= ptr->cur_start_row;
+      while (undef_row < end_row) {
+	jzero_far((void FAR *) ptr->mem_buffer[undef_row], bytesperrow);
+	undef_row++;
+      }
+    } else {
+      if (! writable)		/* reader looking at undefined data */
+	ERREXIT(cinfo, JERR_BAD_VIRTUAL_ACCESS);
+    }
+  }
+  /* Flag the buffer dirty if caller will write in it */
+  if (writable)
+    ptr->dirty = TRUE;
+  /* Return address of proper part of the buffer */
+  return ptr->mem_buffer + (start_row - ptr->cur_start_row);
+}
+
+
+/*
+ * Release all objects belonging to a specified pool.
+ */
+
+METHODDEF(void)
+free_pool (j_common_ptr cinfo, int pool_id)
+{
+  my_mem_ptr mem = (my_mem_ptr) cinfo->mem;
+  small_pool_ptr shdr_ptr;
+  large_pool_ptr lhdr_ptr;
+  size_t space_freed;
+
+  if (pool_id < 0 || pool_id >= JPOOL_NUMPOOLS)
+    ERREXIT1(cinfo, JERR_BAD_POOL_ID, pool_id);	/* safety check */
+
+#ifdef MEM_STATS
+  if (cinfo->err->trace_level > 1)
+    print_mem_stats(cinfo, pool_id); /* print pool's memory usage statistics */
+#endif
+
+  /* If freeing IMAGE pool, close any virtual arrays first */
+  if (pool_id == JPOOL_IMAGE) {
+    jvirt_sarray_ptr sptr;
+    jvirt_barray_ptr bptr;
+
+    for (sptr = mem->virt_sarray_list; sptr != NULL; sptr = sptr->next) {
+      if (sptr->b_s_open) {	/* there may be no backing store */
+	sptr->b_s_open = FALSE;	/* prevent recursive close if error */
+	(*sptr->b_s_info.close_backing_store) (cinfo, & sptr->b_s_info);
+      }
+    }
+    mem->virt_sarray_list = NULL;
+    for (bptr = mem->virt_barray_list; bptr != NULL; bptr = bptr->next) {
+      if (bptr->b_s_open) {	/* there may be no backing store */
+	bptr->b_s_open = FALSE;	/* prevent recursive close if error */
+	(*bptr->b_s_info.close_backing_store) (cinfo, & bptr->b_s_info);
+      }
+    }
+    mem->virt_barray_list = NULL;
+  }
+
+  /* Release large objects */
+  lhdr_ptr = mem->large_list[pool_id];
+  mem->large_list[pool_id] = NULL;
+
+  while (lhdr_ptr != NULL) {
+    large_pool_ptr next_lhdr_ptr = lhdr_ptr->hdr.next;
+    space_freed = lhdr_ptr->hdr.bytes_used +
+		  lhdr_ptr->hdr.bytes_left +
+		  SIZEOF(large_pool_hdr);
+    jpeg_free_large(cinfo, (void FAR *) lhdr_ptr, space_freed);
+    mem->total_space_allocated -= space_freed;
+    lhdr_ptr = next_lhdr_ptr;
+  }
+
+  /* Release small objects */
+  shdr_ptr = mem->small_list[pool_id];
+  mem->small_list[pool_id] = NULL;
+
+  while (shdr_ptr != NULL) {
+    small_pool_ptr next_shdr_ptr = shdr_ptr->hdr.next;
+    space_freed = shdr_ptr->hdr.bytes_used +
+		  shdr_ptr->hdr.bytes_left +
+		  SIZEOF(small_pool_hdr);
+    jpeg_free_small(cinfo, (void *) shdr_ptr, space_freed);
+    mem->total_space_allocated -= space_freed;
+    shdr_ptr = next_shdr_ptr;
+  }
+}
+
+
+/*
+ * Close up shop entirely.
+ * Note that this cannot be called unless cinfo->mem is non-NULL.
+ */
+
+METHODDEF(void)
+self_destruct (j_common_ptr cinfo)
+{
+  int pool;
+
+  /* Close all backing store, release all memory.
+   * Releasing pools in reverse order might help avoid fragmentation
+   * with some (brain-damaged) malloc libraries.
+   */
+  for (pool = JPOOL_NUMPOOLS-1; pool >= JPOOL_PERMANENT; pool--) {
+    free_pool(cinfo, pool);
+  }
+
+  /* Release the memory manager control block too. */
+  jpeg_free_small(cinfo, (void *) cinfo->mem, SIZEOF(my_memory_mgr));
+  cinfo->mem = NULL;		/* ensures I will be called only once */
+
+  jpeg_mem_term(cinfo);		/* system-dependent cleanup */
+}
+
+
+/*
+ * Memory manager initialization.
+ * When this is called, only the error manager pointer is valid in cinfo!
+ */
+
+GLOBAL(void)
+jinit_memory_mgr (j_common_ptr cinfo)
+{
+  my_mem_ptr mem;
+  long max_to_use;
+  int pool;
+  size_t test_mac;
+
+  cinfo->mem = NULL;		/* for safety if init fails */
+
+  /* Check for configuration errors.
+   * SIZEOF(ALIGN_TYPE) should be a power of 2; otherwise, it probably
+   * doesn't reflect any real hardware alignment requirement.
+   * The test is a little tricky: for X>0, X and X-1 have no one-bits
+   * in common if and only if X is a power of 2, ie has only one one-bit.
+   * Some compilers may give an "unreachable code" warning here; ignore it.
+   */
+  if ((SIZEOF(ALIGN_TYPE) & (SIZEOF(ALIGN_TYPE)-1)) != 0)
+    ERREXIT(cinfo, JERR_BAD_ALIGN_TYPE);
+  /* MAX_ALLOC_CHUNK must be representable as type size_t, and must be
+   * a multiple of SIZEOF(ALIGN_TYPE).
+   * Again, an "unreachable code" warning may be ignored here.
+   * But a "constant too large" warning means you need to fix MAX_ALLOC_CHUNK.
+   */
+  test_mac = (size_t) MAX_ALLOC_CHUNK;
+  if ((long) test_mac != MAX_ALLOC_CHUNK ||
+      (MAX_ALLOC_CHUNK % SIZEOF(ALIGN_TYPE)) != 0)
+    ERREXIT(cinfo, JERR_BAD_ALLOC_CHUNK);
+
+  max_to_use = jpeg_mem_init(cinfo); /* system-dependent initialization */
+
+  /* Attempt to allocate memory manager's control block */
+  mem = (my_mem_ptr) jpeg_get_small(cinfo, SIZEOF(my_memory_mgr));
+
+  if (mem == NULL) {
+    jpeg_mem_term(cinfo);	/* system-dependent cleanup */
+    ERREXIT1(cinfo, JERR_OUT_OF_MEMORY, 0);
+  }
+
+  /* OK, fill in the method pointers */
+  mem->pub.alloc_small = alloc_small;
+  mem->pub.alloc_large = alloc_large;
+  mem->pub.alloc_sarray = alloc_sarray;
+  mem->pub.alloc_barray = alloc_barray;
+#ifdef NEED_DARRAY
+  mem->pub.alloc_darray = alloc_darray;
+#endif
+  mem->pub.request_virt_sarray = request_virt_sarray;
+  mem->pub.request_virt_barray = request_virt_barray;
+  mem->pub.realize_virt_arrays = realize_virt_arrays;
+  mem->pub.access_virt_sarray = access_virt_sarray;
+  mem->pub.access_virt_barray = access_virt_barray;
+  mem->pub.free_pool = free_pool;
+  mem->pub.self_destruct = self_destruct;
+
+  /* Make MAX_ALLOC_CHUNK accessible to other modules */
+  mem->pub.max_alloc_chunk = MAX_ALLOC_CHUNK;
+
+  /* Initialize working state */
+  mem->pub.max_memory_to_use = max_to_use;
+
+  for (pool = JPOOL_NUMPOOLS-1; pool >= JPOOL_PERMANENT; pool--) {
+    mem->small_list[pool] = NULL;
+    mem->large_list[pool] = NULL;
+  }
+  mem->virt_sarray_list = NULL;
+  mem->virt_barray_list = NULL;
+
+  mem->total_space_allocated = SIZEOF(my_memory_mgr);
+
+  /* Declare ourselves open for business */
+  cinfo->mem = & mem->pub;
+
+  /* Check for an environment variable JPEGMEM; if found, override the
+   * default max_memory setting from jpeg_mem_init.  Note that the
+   * surrounding application may again override this value.
+   * If your system doesn't support getenv(), define NO_GETENV to disable
+   * this feature.
+   */
+#ifndef NO_GETENV
+  { char * memenv;
+
+    if ((memenv = getenv("JPEGMEM")) != NULL) {
+      char ch = 'x';
+
+      if (sscanf(memenv, "%ld%c", &max_to_use, &ch) > 0) {
+	if (ch == 'm' || ch == 'M')
+	  max_to_use *= 1000L;
+	mem->pub.max_memory_to_use = max_to_use * 1000L;
+      }
+    }
+  }
+#endif
+
+}
diff --git a/uppsrc/plugin/jpg/lib/jmemname.c b/uppsrc/plugin/jpg/lib/jmemname.c
new file mode 100644
index 000000000..ed96dee1b
--- /dev/null
+++ b/uppsrc/plugin/jpg/lib/jmemname.c
@@ -0,0 +1,276 @@
+/*
+ * jmemname.c
+ *
+ * Copyright (C) 1992-1997, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file provides a generic implementation of the system-dependent
+ * portion of the JPEG memory manager.  This implementation assumes that
+ * you must explicitly construct a name for each temp file.
+ * Also, the problem of determining the amount of memory available
+ * is shoved onto the user.
+ */
+
+#define JPEG_INTERNALS
+#include "jinclude.h"
+#include "jpeglib.h"
+#include "jmemsys.h"		/* import the system-dependent declarations */
+
+#ifndef HAVE_STDLIB_H		/* <stdlib.h> should declare malloc(),free() */
+extern void * malloc JPP((size_t size));
+extern void free JPP((void *ptr));
+#endif
+
+#ifndef SEEK_SET		/* pre-ANSI systems may not define this; */
+#define SEEK_SET  0		/* if not, assume 0 is correct */
+#endif
+
+#ifdef DONT_USE_B_MODE		/* define mode parameters for fopen() */
+#define READ_BINARY	"r"
+#define RW_BINARY	"w+"
+#else
+#ifdef VMS			/* VMS is very nonstandard */
+#define READ_BINARY	"rb", "ctx=stm"
+#define RW_BINARY	"w+b", "ctx=stm"
+#else				/* standard ANSI-compliant case */
+#define READ_BINARY	"rb"
+#define RW_BINARY	"w+b"
+#endif
+#endif
+
+
+/*
+ * Selection of a file name for a temporary file.
+ * This is system-dependent!
+ *
+ * The code as given is suitable for most Unix systems, and it is easily
+ * modified for most non-Unix systems.  Some notes:
+ *  1.  The temp file is created in the directory named by TEMP_DIRECTORY.
+ *      The default value is /usr/tmp, which is the conventional place for
+ *      creating large temp files on Unix.  On other systems you'll probably
+ *      want to change the file location.  You can do this by editing the
+ *      #define, or (preferred) by defining TEMP_DIRECTORY in jconfig.h.
+ *
+ *  2.  If you need to change the file name as well as its location,
+ *      you can override the TEMP_FILE_NAME macro.  (Note that this is
+ *      actually a printf format string; it must contain %s and %d.)
+ *      Few people should need to do this.
+ *
+ *  3.  mktemp() is used to ensure that multiple processes running
+ *      simultaneously won't select the same file names.  If your system
+ *      doesn't have mktemp(), define NO_MKTEMP to do it the hard way.
+ *      (If you don't have <errno.h>, also define NO_ERRNO_H.)
+ *
+ *  4.  You probably want to define NEED_SIGNAL_CATCHER so that cjpeg.c/djpeg.c
+ *      will cause the temp files to be removed if you stop the program early.
+ */
+
+#ifndef TEMP_DIRECTORY		/* can override from jconfig.h or Makefile */
+#define TEMP_DIRECTORY  "/usr/tmp/" /* recommended setting for Unix */
+#endif
+
+static int next_file_num;	/* to distinguish among several temp files */
+
+#ifdef NO_MKTEMP
+
+#ifndef TEMP_FILE_NAME		/* can override from jconfig.h or Makefile */
+#define TEMP_FILE_NAME  "%sJPG%03d.TMP"
+#endif
+
+#ifndef NO_ERRNO_H
+#include <errno.h>		/* to define ENOENT */
+#endif
+
+/* ANSI C specifies that errno is a macro, but on older systems it's more
+ * likely to be a plain int variable.  And not all versions of errno.h
+ * bother to declare it, so we have to in order to be most portable.  Thus:
+ */
+#ifndef errno
+extern int errno;
+#endif
+
+
+LOCAL(void)
+select_file_name (char * fname)
+{
+  FILE * tfile;
+
+  /* Keep generating file names till we find one that's not in use */
+  for (;;) {
+    next_file_num++;		/* advance counter */
+    sprintf(fname, TEMP_FILE_NAME, TEMP_DIRECTORY, next_file_num);
+    if ((tfile = fopen(fname, READ_BINARY)) == NULL) {
+      /* fopen could have failed for a reason other than the file not
+       * being there; for example, file there but unreadable.
+       * If <errno.h> isn't available, then we cannot test the cause.
+       */
+#ifdef ENOENT
+      if (errno != ENOENT)
+	continue;
+#endif
+      break;
+    }
+    fclose(tfile);		/* oops, it's there; close tfile & try again */
+  }
+}
+
+#else /* ! NO_MKTEMP */
+
+/* Note that mktemp() requires the initial filename to end in six X's */
+#ifndef TEMP_FILE_NAME		/* can override from jconfig.h or Makefile */
+#define TEMP_FILE_NAME  "%sJPG%dXXXXXX"
+#endif
+
+LOCAL(void)
+select_file_name (char * fname)
+{
+  next_file_num++;		/* advance counter */
+  sprintf(fname, TEMP_FILE_NAME, TEMP_DIRECTORY, next_file_num);
+  mktemp(fname);		/* make sure file name is unique */
+  /* mktemp replaces the trailing XXXXXX with a unique string of characters */
+}
+
+#endif /* NO_MKTEMP */
+
+
+/*
+ * Memory allocation and freeing are controlled by the regular library
+ * routines malloc() and free().
+ */
+
+GLOBAL(void *)
+jpeg_get_small (j_common_ptr cinfo, size_t sizeofobject)
+{
+  return (void *) malloc(sizeofobject);
+}
+
+GLOBAL(void)
+jpeg_free_small (j_common_ptr cinfo, void * object, size_t sizeofobject)
+{
+  free(object);
+}
+
+
+/*
+ * "Large" objects are treated the same as "small" ones.
+ * NB: although we include FAR keywords in the routine declarations,
+ * this file won't actually work in 80x86 small/medium model; at least,
+ * you probably won't be able to process useful-size images in only 64KB.
+ */
+
+GLOBAL(void FAR *)
+jpeg_get_large (j_common_ptr cinfo, size_t sizeofobject)
+{
+  return (void FAR *) malloc(sizeofobject);
+}
+
+GLOBAL(void)
+jpeg_free_large (j_common_ptr cinfo, void FAR * object, size_t sizeofobject)
+{
+  free(object);
+}
+
+
+/*
+ * This routine computes the total memory space available for allocation.
+ * It's impossible to do this in a portable way; our current solution is
+ * to make the user tell us (with a default value set at compile time).
+ * If you can actually get the available space, it's a good idea to subtract
+ * a slop factor of 5% or so.
+ */
+
+#ifndef DEFAULT_MAX_MEM		/* so can override from makefile */
+#define DEFAULT_MAX_MEM		1000000L /* default: one megabyte */
+#endif
+
+GLOBAL(long)
+jpeg_mem_available (j_common_ptr cinfo, long min_bytes_needed,
+		    long max_bytes_needed, long already_allocated)
+{
+  return cinfo->mem->max_memory_to_use - already_allocated;
+}
+
+
+/*
+ * Backing store (temporary file) management.
+ * Backing store objects are only used when the value returned by
+ * jpeg_mem_available is less than the total space needed.  You can dispense
+ * with these routines if you have plenty of virtual memory; see jmemnobs.c.
+ */
+
+
+METHODDEF(void)
+read_backing_store (j_common_ptr cinfo, backing_store_ptr info,
+		    void FAR * buffer_address,
+		    long file_offset, long byte_count)
+{
+  if (fseek(info->temp_file, file_offset, SEEK_SET))
+    ERREXIT(cinfo, JERR_TFILE_SEEK);
+  if (JFREAD(info->temp_file, buffer_address, byte_count)
+      != (size_t) byte_count)
+    ERREXIT(cinfo, JERR_TFILE_READ);
+}
+
+
+METHODDEF(void)
+write_backing_store (j_common_ptr cinfo, backing_store_ptr info,
+		     void FAR * buffer_address,
+		     long file_offset, long byte_count)
+{
+  if (fseek(info->temp_file, file_offset, SEEK_SET))
+    ERREXIT(cinfo, JERR_TFILE_SEEK);
+  if (JFWRITE(info->temp_file, buffer_address, byte_count)
+      != (size_t) byte_count)
+    ERREXIT(cinfo, JERR_TFILE_WRITE);
+}
+
+
+METHODDEF(void)
+close_backing_store (j_common_ptr cinfo, backing_store_ptr info)
+{
+  fclose(info->temp_file);	/* close the file */
+  unlink(info->temp_name);	/* delete the file */
+/* If your system doesn't have unlink(), use remove() instead.
+ * remove() is the ANSI-standard name for this function, but if
+ * your system was ANSI you'd be using jmemansi.c, right?
+ */
+  TRACEMSS(cinfo, 1, JTRC_TFILE_CLOSE, info->temp_name);
+}
+
+
+/*
+ * Initial opening of a backing-store object.
+ */
+
+GLOBAL(void)
+jpeg_open_backing_store (j_common_ptr cinfo, backing_store_ptr info,
+			 long total_bytes_needed)
+{
+  select_file_name(info->temp_name);
+  if ((info->temp_file = fopen(info->temp_name, RW_BINARY)) == NULL)
+    ERREXITS(cinfo, JERR_TFILE_CREATE, info->temp_name);
+  info->read_backing_store = read_backing_store;
+  info->write_backing_store = write_backing_store;
+  info->close_backing_store = close_backing_store;
+  TRACEMSS(cinfo, 1, JTRC_TFILE_OPEN, info->temp_name);
+}
+
+
+/*
+ * These routines take care of any system-dependent initialization and
+ * cleanup required.
+ */
+
+GLOBAL(long)
+jpeg_mem_init (j_common_ptr cinfo)
+{
+  next_file_num = 0;		/* initialize temp file name generator */
+  return DEFAULT_MAX_MEM;	/* default for max_memory_to_use */
+}
+
+GLOBAL(void)
+jpeg_mem_term (j_common_ptr cinfo)
+{
+  /* no work */
+}
diff --git a/uppsrc/plugin/jpg/lib/jmemnobs.c b/uppsrc/plugin/jpg/lib/jmemnobs.c
new file mode 100644
index 000000000..eb8c33772
--- /dev/null
+++ b/uppsrc/plugin/jpg/lib/jmemnobs.c
@@ -0,0 +1,109 @@
+/*
+ * jmemnobs.c
+ *
+ * Copyright (C) 1992-1996, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file provides a really simple implementation of the system-
+ * dependent portion of the JPEG memory manager.  This implementation
+ * assumes that no backing-store files are needed: all required space
+ * can be obtained from malloc().
+ * This is very portable in the sense that it'll compile on almost anything,
+ * but you'd better have lots of main memory (or virtual memory) if you want
+ * to process big images.
+ * Note that the max_memory_to_use option is ignored by this implementation.
+ */
+
+#define JPEG_INTERNALS
+#include "jinclude.h"
+#include "jpeglib.h"
+#include "jmemsys.h"		/* import the system-dependent declarations */
+
+#ifndef HAVE_STDLIB_H		/* <stdlib.h> should declare malloc(),free() */
+extern void * malloc JPP((size_t size));
+extern void free JPP((void *ptr));
+#endif
+
+
+/*
+ * Memory allocation and freeing are controlled by the regular library
+ * routines malloc() and free().
+ */
+
+GLOBAL(void *)
+jpeg_get_small (j_common_ptr cinfo, size_t sizeofobject)
+{
+  return (void *) malloc(sizeofobject);
+}
+
+GLOBAL(void)
+jpeg_free_small (j_common_ptr cinfo, void * object, size_t sizeofobject)
+{
+  free(object);
+}
+
+
+/*
+ * "Large" objects are treated the same as "small" ones.
+ * NB: although we include FAR keywords in the routine declarations,
+ * this file won't actually work in 80x86 small/medium model; at least,
+ * you probably won't be able to process useful-size images in only 64KB.
+ */
+
+GLOBAL(void FAR *)
+jpeg_get_large (j_common_ptr cinfo, size_t sizeofobject)
+{
+  return (void FAR *) malloc(sizeofobject);
+}
+
+GLOBAL(void)
+jpeg_free_large (j_common_ptr cinfo, void FAR * object, size_t sizeofobject)
+{
+  free(object);
+}
+
+
+/*
+ * This routine computes the total memory space available for allocation.
+ * Here we always say, "we got all you want bud!"
+ */
+
+GLOBAL(long)
+jpeg_mem_available (j_common_ptr cinfo, long min_bytes_needed,
+		    long max_bytes_needed, long already_allocated)
+{
+  return max_bytes_needed;
+}
+
+
+/*
+ * Backing store (temporary file) management.
+ * Since jpeg_mem_available always promised the moon,
+ * this should never be called and we can just error out.
+ */
+
+GLOBAL(void)
+jpeg_open_backing_store (j_common_ptr cinfo, backing_store_ptr info,
+			 long total_bytes_needed)
+{
+  ERREXIT(cinfo, JERR_NO_BACKING_STORE);
+}
+
+
+/*
+ * These routines take care of any system-dependent initialization and
+ * cleanup required.  Here, there isn't any.
+ */
+
+GLOBAL(long)
+jpeg_mem_init (j_common_ptr cinfo)
+{
+  return 0;			/* just set max_memory_to_use to 0 */
+}
+
+GLOBAL(void)
+jpeg_mem_term (j_common_ptr cinfo)
+{
+  /* no work */
+}
diff --git a/uppsrc/plugin/jpg/lib/jmemsys.h b/uppsrc/plugin/jpg/lib/jmemsys.h
new file mode 100644
index 000000000..6c3c6d348
--- /dev/null
+++ b/uppsrc/plugin/jpg/lib/jmemsys.h
@@ -0,0 +1,198 @@
+/*
+ * jmemsys.h
+ *
+ * Copyright (C) 1992-1997, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This include file defines the interface between the system-independent
+ * and system-dependent portions of the JPEG memory manager.  No other
+ * modules need include it.  (The system-independent portion is jmemmgr.c;
+ * there are several different versions of the system-dependent portion.)
+ *
+ * This file works as-is for the system-dependent memory managers supplied
+ * in the IJG distribution.  You may need to modify it if you write a
+ * custom memory manager.  If system-dependent changes are needed in
+ * this file, the best method is to #ifdef them based on a configuration
+ * symbol supplied in jconfig.h, as we have done with USE_MSDOS_MEMMGR
+ * and USE_MAC_MEMMGR.
+ */
+
+
+/* Short forms of external names for systems with brain-damaged linkers. */
+
+#ifdef NEED_SHORT_EXTERNAL_NAMES
+#define jpeg_get_small		jGetSmall
+#define jpeg_free_small		jFreeSmall
+#define jpeg_get_large		jGetLarge
+#define jpeg_free_large		jFreeLarge
+#define jpeg_mem_available	jMemAvail
+#define jpeg_open_backing_store	jOpenBackStore
+#define jpeg_mem_init		jMemInit
+#define jpeg_mem_term		jMemTerm
+#endif /* NEED_SHORT_EXTERNAL_NAMES */
+
+
+/*
+ * These two functions are used to allocate and release small chunks of
+ * memory.  (Typically the total amount requested through jpeg_get_small is
+ * no more than 20K or so; this will be requested in chunks of a few K each.)
+ * Behavior should be the same as for the standard library functions malloc
+ * and free; in particular, jpeg_get_small must return NULL on failure.
+ * On most systems, these ARE malloc and free.  jpeg_free_small is passed the
+ * size of the object being freed, just in case it's needed.
+ * On an 80x86 machine using small-data memory model, these manage near heap.
+ */
+
+EXTERN(void *) jpeg_get_small JPP((j_common_ptr cinfo, size_t sizeofobject));
+EXTERN(void) jpeg_free_small JPP((j_common_ptr cinfo, void * object,
+				  size_t sizeofobject));
+
+/*
+ * These two functions are used to allocate and release large chunks of
+ * memory (up to the total free space designated by jpeg_mem_available).
+ * The interface is the same as above, except that on an 80x86 machine,
+ * far pointers are used.  On most other machines these are identical to
+ * the jpeg_get/free_small routines; but we keep them separate anyway,
+ * in case a different allocation strategy is desirable for large chunks.
+ */
+
+EXTERN(void FAR *) jpeg_get_large JPP((j_common_ptr cinfo,
+				       size_t sizeofobject));
+EXTERN(void) jpeg_free_large JPP((j_common_ptr cinfo, void FAR * object,
+				  size_t sizeofobject));
+
+/*
+ * The macro MAX_ALLOC_CHUNK designates the maximum number of bytes that may
+ * be requested in a single call to jpeg_get_large (and jpeg_get_small for that
+ * matter, but that case should never come into play).  This macro is needed
+ * to model the 64Kb-segment-size limit of far addressing on 80x86 machines.
+ * On those machines, we expect that jconfig.h will provide a proper value.
+ * On machines with 32-bit flat address spaces, any large constant may be used.
+ *
+ * NB: jmemmgr.c expects that MAX_ALLOC_CHUNK will be representable as type
+ * size_t and will be a multiple of sizeof(align_type).
+ */
+
+#ifndef MAX_ALLOC_CHUNK		/* may be overridden in jconfig.h */
+#define MAX_ALLOC_CHUNK  1000000000L
+#endif
+
+/*
+ * This routine computes the total space still available for allocation by
+ * jpeg_get_large.  If more space than this is needed, backing store will be
+ * used.  NOTE: any memory already allocated must not be counted.
+ *
+ * There is a minimum space requirement, corresponding to the minimum
+ * feasible buffer sizes; jmemmgr.c will request that much space even if
+ * jpeg_mem_available returns zero.  The maximum space needed, enough to hold
+ * all working storage in memory, is also passed in case it is useful.
+ * Finally, the total space already allocated is passed.  If no better
+ * method is available, cinfo->mem->max_memory_to_use - already_allocated
+ * is often a suitable calculation.
+ *
+ * It is OK for jpeg_mem_available to underestimate the space available
+ * (that'll just lead to more backing-store access than is really necessary).
+ * However, an overestimate will lead to failure.  Hence it's wise to subtract
+ * a slop factor from the true available space.  5% should be enough.
+ *
+ * On machines with lots of virtual memory, any large constant may be returned.
+ * Conversely, zero may be returned to always use the minimum amount of memory.
+ */
+
+EXTERN(long) jpeg_mem_available JPP((j_common_ptr cinfo,
+				     long min_bytes_needed,
+				     long max_bytes_needed,
+				     long already_allocated));
+
+
+/*
+ * This structure holds whatever state is needed to access a single
+ * backing-store object.  The read/write/close method pointers are called
+ * by jmemmgr.c to manipulate the backing-store object; all other fields
+ * are private to the system-dependent backing store routines.
+ */
+
+#define TEMP_NAME_LENGTH   64	/* max length of a temporary file's name */
+
+
+#ifdef USE_MSDOS_MEMMGR		/* DOS-specific junk */
+
+typedef unsigned short XMSH;	/* type of extended-memory handles */
+typedef unsigned short EMSH;	/* type of expanded-memory handles */
+
+typedef union {
+  short file_handle;		/* DOS file handle if it's a temp file */
+  XMSH xms_handle;		/* handle if it's a chunk of XMS */
+  EMSH ems_handle;		/* handle if it's a chunk of EMS */
+} handle_union;
+
+#endif /* USE_MSDOS_MEMMGR */
+
+#ifdef USE_MAC_MEMMGR		/* Mac-specific junk */
+#include <Files.h>
+#endif /* USE_MAC_MEMMGR */
+
+
+typedef struct backing_store_struct * backing_store_ptr;
+
+typedef struct backing_store_struct {
+  /* Methods for reading/writing/closing this backing-store object */
+  JMETHOD(void, read_backing_store, (j_common_ptr cinfo,
+				     backing_store_ptr info,
+				     void FAR * buffer_address,
+				     long file_offset, long byte_count));
+  JMETHOD(void, write_backing_store, (j_common_ptr cinfo,
+				      backing_store_ptr info,
+				      void FAR * buffer_address,
+				      long file_offset, long byte_count));
+  JMETHOD(void, close_backing_store, (j_common_ptr cinfo,
+				      backing_store_ptr info));
+
+  /* Private fields for system-dependent backing-store management */
+#ifdef USE_MSDOS_MEMMGR
+  /* For the MS-DOS manager (jmemdos.c), we need: */
+  handle_union handle;		/* reference to backing-store storage object */
+  char temp_name[TEMP_NAME_LENGTH]; /* name if it's a file */
+#else
+#ifdef USE_MAC_MEMMGR
+  /* For the Mac manager (jmemmac.c), we need: */
+  short temp_file;		/* file reference number to temp file */
+  FSSpec tempSpec;		/* the FSSpec for the temp file */
+  char temp_name[TEMP_NAME_LENGTH]; /* name if it's a file */
+#else
+  /* For a typical implementation with temp files, we need: */
+  FILE * temp_file;		/* stdio reference to temp file */
+  char temp_name[TEMP_NAME_LENGTH]; /* name of temp file */
+#endif
+#endif
+} backing_store_info;
+
+
+/*
+ * Initial opening of a backing-store object.  This must fill in the
+ * read/write/close pointers in the object.  The read/write routines
+ * may take an error exit if the specified maximum file size is exceeded.
+ * (If jpeg_mem_available always returns a large value, this routine can
+ * just take an error exit.)
+ */
+
+EXTERN(void) jpeg_open_backing_store JPP((j_common_ptr cinfo,
+					  backing_store_ptr info,
+					  long total_bytes_needed));
+
+
+/*
+ * These routines take care of any system-dependent initialization and
+ * cleanup required.  jpeg_mem_init will be called before anything is
+ * allocated (and, therefore, nothing in cinfo is of use except the error
+ * manager pointer).  It should return a suitable default value for
+ * max_memory_to_use; this may subsequently be overridden by the surrounding
+ * application.  (Note that max_memory_to_use is only important if
+ * jpeg_mem_available chooses to consult it ... no one else will.)
+ * jpeg_mem_term may assume that all requested memory has been freed and that
+ * all opened backing-store objects have been closed.
+ */
+
+EXTERN(long) jpeg_mem_init JPP((j_common_ptr cinfo));
+EXTERN(void) jpeg_mem_term JPP((j_common_ptr cinfo));
diff --git a/uppsrc/plugin/jpg/lib/jmorecfg.h b/uppsrc/plugin/jpg/lib/jmorecfg.h
new file mode 100644
index 000000000..b3823c311
--- /dev/null
+++ b/uppsrc/plugin/jpg/lib/jmorecfg.h
@@ -0,0 +1,403 @@
+/*
+ * jmorecfg.h
+ *
+ * Copyright (C) 1991-1998, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains additional configuration options that customize the
+ * JPEG software for special applications or support machine-dependent
+ * optimizations.  Most users will not need to touch this file.
+ */
+
+
+/*
+ * Define BITS_IN_JSAMPLE as either
+ *   8   for 8-bit sample values (the usual setting)
+ *   12  for 12-bit sample values
+ * Only 8 and 12 are legal data precisions for lossy JPEG according to the
+ * JPEG standard, and the IJG code does not support anything else!
+ * We do not support run-time selection of data precision, sorry.
+ */
+
+#define BITS_IN_JSAMPLE  8	/* use 8 or 12 */
+
+
+/*
+ * Maximum number of components (color channels) allowed in JPEG image.
+ * To meet the letter of the JPEG spec, set this to 255.  However, darn
+ * few applications need more than 4 channels (maybe 5 for CMYK + alpha
+ * mask).  We recommend 10 as a reasonable compromise; use 4 if you are
+ * really short on memory.  (Each allowed component costs a hundred or so
+ * bytes of storage, whether actually used in an image or not.)
+ */
+
+#define MAX_COMPONENTS  10	/* maximum number of image components */
+
+
+/*
+ * Basic data types.
+ * You may need to change these if you have a machine with unusual data
+ * type sizes; for example, "char" not 8 bits, "short" not 16 bits,
+ * or "long" not 32 bits.  We don't care whether "int" is 16 or 32 bits,
+ * but it had better be at least 16.
+ */
+
+/* Representation of a single sample (pixel element value).
+ * We frequently allocate large arrays of these, so it's important to keep
+ * them small.  But if you have memory to burn and access to char or short
+ * arrays is very slow on your hardware, you might want to change these.
+ */
+
+#if BITS_IN_JSAMPLE == 8
+/* JSAMPLE should be the smallest type that will hold the values 0..255.
+ * You can use a signed char by having GETJSAMPLE mask it with 0xFF.
+ */
+
+#ifdef HAVE_UNSIGNED_CHAR
+
+typedef unsigned char JSAMPLE;
+#define GETJSAMPLE(value)  ((int) (value))
+
+#else /* not HAVE_UNSIGNED_CHAR */
+
+typedef char JSAMPLE;
+#ifdef CHAR_IS_UNSIGNED
+#define GETJSAMPLE(value)  ((int) (value))
+#else
+#define GETJSAMPLE(value)  ((int) (value) & 0xFF)
+#endif /* CHAR_IS_UNSIGNED */
+
+#endif /* HAVE_UNSIGNED_CHAR */
+
+#define MAXJSAMPLE	255
+#define CENTERJSAMPLE	128
+
+#endif /* BITS_IN_JSAMPLE == 8 */
+
+
+#if BITS_IN_JSAMPLE == 12
+/* JSAMPLE should be the smallest type that will hold the values 0..4095.
+ * On nearly all machines "short" will do nicely.
+ */
+
+typedef short JSAMPLE;
+#define GETJSAMPLE(value)  ((int) (value))
+
+#define MAXJSAMPLE	4095
+#define CENTERJSAMPLE	2048
+
+#endif /* BITS_IN_JSAMPLE == 12 */
+
+
+#if BITS_IN_JSAMPLE == 16
+/* JSAMPLE should be the smallest type that will hold the values 0..65535.
+ * You can use a signed short by having GETJSAMPLE mask it with 0xFFFF.
+ */
+
+#ifdef HAVE_UNSIGNED_SHORT
+
+typedef unsigned short JSAMPLE;
+#define GETJSAMPLE(value)  ((int) (value))
+
+#else /* not HAVE_UNSIGNED_SHORT */
+
+typedef short JSAMPLE;
+#ifdef SHORT_IS_UNSIGNED
+#define GETJSAMPLE(value)  ((int) (value))
+#else
+#define GETJSAMPLE(value)  ((int) (value) & 0xFFFF)
+#endif /* SHORT_IS_UNSIGNED */
+
+#endif /* HAVE_UNSIGNED_SHORT */
+
+#define MAXJSAMPLE	65535
+#define CENTERJSAMPLE	32768
+
+#endif /* BITS_IN_JSAMPLE == 16 */
+
+
+/* Representation of a DCT frequency coefficient.
+ * This should be a signed value of at least 16 bits; "short" is usually OK.
+ * Again, we allocate large arrays of these, but you can change to int
+ * if you have memory to burn and "short" is really slow.
+ */
+
+typedef short JCOEF;
+
+
+/* Representation of a spatial difference value.
+ * This should be a signed value of at least 16 bits; int is usually OK.
+ */
+
+typedef int JDIFF;
+
+
+/* Compressed datastreams are represented as arrays of JOCTET.
+ * These must be EXACTLY 8 bits wide, at least once they are written to
+ * external storage.  Note that when using the stdio data source/destination
+ * managers, this is also the data type passed to fread/fwrite.
+ */
+
+#ifdef HAVE_UNSIGNED_CHAR
+
+typedef unsigned char JOCTET;
+#define GETJOCTET(value)  (value)
+
+#else /* not HAVE_UNSIGNED_CHAR */
+
+typedef char JOCTET;
+#ifdef CHAR_IS_UNSIGNED
+#define GETJOCTET(value)  (value)
+#else
+#define GETJOCTET(value)  ((value) & 0xFF)
+#endif /* CHAR_IS_UNSIGNED */
+
+#endif /* HAVE_UNSIGNED_CHAR */
+
+
+/* These typedefs are used for various table entries and so forth.
+ * They must be at least as wide as specified; but making them too big
+ * won't cost a huge amount of memory, so we don't provide special
+ * extraction code like we did for JSAMPLE.  (In other words, these
+ * typedefs live at a different point on the speed/space tradeoff curve.)
+ */
+
+/* UINT8 must hold at least the values 0..255. */
+
+#ifdef HAVE_UNSIGNED_CHAR
+typedef unsigned char UINT8;
+#else /* not HAVE_UNSIGNED_CHAR */
+#ifdef CHAR_IS_UNSIGNED
+typedef char UINT8;
+#else /* not CHAR_IS_UNSIGNED */
+typedef short UINT8;
+#endif /* CHAR_IS_UNSIGNED */
+#endif /* HAVE_UNSIGNED_CHAR */
+
+/* UINT16 must hold at least the values 0..65535. */
+
+#ifdef HAVE_UNSIGNED_SHORT
+typedef unsigned short UINT16;
+#else /* not HAVE_UNSIGNED_SHORT */
+typedef unsigned int UINT16;
+#endif /* HAVE_UNSIGNED_SHORT */
+
+/* INT16 must hold at least the values -32768..32767. */
+
+#ifndef XMD_H			/* X11/xmd.h correctly defines INT16 */
+typedef short INT16;
+#endif
+
+/* INT32 must hold at least signed 32-bit values. */
+
+#if !defined(XMD_H) && !defined(_BASETSD_H) && !defined(_BASETSD_H_) /* X11/xmd.h correctly defines INT32 */
+typedef long INT32;
+#endif
+
+/* Datatype used for image dimensions.  The JPEG standard only supports
+ * images up to 64K*64K due to 16-bit fields in SOF markers.  Therefore
+ * "unsigned int" is sufficient on all machines.  However, if you need to
+ * handle larger images and you don't mind deviating from the spec, you
+ * can change this datatype.
+ */
+
+typedef unsigned int JDIMENSION;
+
+#define JPEG_MAX_DIMENSION  65500L  /* a tad under 64K to prevent overflows */
+
+
+/* These macros are used in all function definitions and extern declarations.
+ * You could modify them if you need to change function linkage conventions;
+ * in particular, you'll need to do that to make the library a Windows DLL.
+ * Another application is to make all functions global for use with debuggers
+ * or code profilers that require it.
+ */
+
+/* a function called through method pointers: */
+#define METHODDEF(type)		static type
+/* a function used only in its module: */
+#define LOCAL(type)		static type
+/* a function referenced thru EXTERNs: */
+#define GLOBAL(type)		type
+/* a reference to a GLOBAL function: */
+#define EXTERN(type)		extern type
+
+
+/* This macro is used to declare a "method", that is, a function pointer.
+ * We want to supply prototype parameters if the compiler can cope.
+ * Note that the arglist parameter must be parenthesized!
+ * Again, you can customize this if you need special linkage keywords.
+ */
+
+#ifdef HAVE_PROTOTYPES
+#define JMETHOD(type,methodname,arglist)  type (*methodname) arglist
+#else
+#define JMETHOD(type,methodname,arglist)  type (*methodname) ()
+#endif
+
+
+/* Here is the pseudo-keyword for declaring pointers that must be "far"
+ * on 80x86 machines.  Most of the specialized coding for 80x86 is handled
+ * by just saying "FAR *" where such a pointer is needed.  In a few places
+ * explicit coding is needed; see uses of the NEED_FAR_POINTERS symbol.
+ */
+
+#ifdef NEED_FAR_POINTERS
+#define FAR  far
+#else
+#define FAR
+#endif
+
+
+/*
+ * On a few systems, type boolean and/or its values FALSE, TRUE may appear
+ * in standard header files.  Or you may have conflicts with application-
+ * specific header files that you want to include together with these files.
+ * Defining HAVE_BOOLEAN before including jpeglib.h should make it work.
+ */
+
+#ifndef HAVE_BOOLEAN
+#ifdef boolean
+#undef boolean
+#endif
+#define boolean int
+#endif
+#ifndef FALSE			/* in case these macros already exist */
+#define FALSE	0		/* values of boolean */
+#endif
+#ifndef TRUE
+#define TRUE	1
+#endif
+
+
+/*
+ * The remaining options affect code selection within the JPEG library,
+ * but they don't need to be visible to most applications using the library.
+ * To minimize application namespace pollution, the symbols won't be
+ * defined unless JPEG_INTERNALS or JPEG_INTERNAL_OPTIONS has been defined.
+ */
+
+#ifdef JPEG_INTERNALS
+#define JPEG_INTERNAL_OPTIONS
+#endif
+
+#ifdef JPEG_INTERNAL_OPTIONS
+
+
+/*
+ * These defines indicate whether to include various optional functions.
+ * Undefining some of these symbols will produce a smaller but less capable
+ * library.  Note that you can leave certain source files out of the
+ * compilation/linking process if you've #undef'd the corresponding symbols.
+ * (You may HAVE to do that if your compiler doesn't like null source files.)
+ */
+
+/* Arithmetic coding is unsupported for legal reasons.  Complaints to IBM. */
+
+/* Capability options common to encoder and decoder: */
+
+#define DCT_ISLOW_SUPPORTED	/* slow but accurate integer algorithm */
+#define DCT_IFAST_SUPPORTED	/* faster, less accurate integer method */
+#define DCT_FLOAT_SUPPORTED	/* floating-point: accurate, fast on fast HW */
+
+/* Encoder capability options: */
+
+#undef  C_ARITH_CODING_SUPPORTED    /* Arithmetic coding back end? */
+#define C_MULTISCAN_FILES_SUPPORTED /* Multiple-scan JPEG files? */
+#define C_PROGRESSIVE_SUPPORTED	    /* Progressive JPEG? (Requires MULTISCAN)*/
+#define C_LOSSLESS_SUPPORTED	    /* Lossless JPEG? */
+#define ENTROPY_OPT_SUPPORTED	    /* Optimization of entropy coding parms? */
+/* Note: if you selected 12-bit data precision, it is dangerous to turn off
+ * ENTROPY_OPT_SUPPORTED.  The standard Huffman tables are only good for 8-bit
+ * precision, so jcshuff.c normally uses entropy optimization to compute
+ * usable tables for higher precision.  If you don't want to do optimization,
+ * you'll have to supply different default Huffman tables.
+ * The exact same statements apply for progressive and lossless JPEG:
+ * the default tables don't work for progressive mode or lossless mode.
+ * (This may get fixed, however.)
+ */
+#define INPUT_SMOOTHING_SUPPORTED   /* Input image smoothing option? */
+
+/* Decoder capability options: */
+
+#undef  D_ARITH_CODING_SUPPORTED    /* Arithmetic coding back end? */
+#define D_MULTISCAN_FILES_SUPPORTED /* Multiple-scan JPEG files? */
+#define D_PROGRESSIVE_SUPPORTED	    /* Progressive JPEG? (Requires MULTISCAN)*/
+#define D_LOSSLESS_SUPPORTED	    /* Lossless JPEG? */
+#define SAVE_MARKERS_SUPPORTED	    /* jpeg_save_markers() needed? */
+#define BLOCK_SMOOTHING_SUPPORTED   /* Block smoothing? (Progressive only) */
+#define IDCT_SCALING_SUPPORTED	    /* Output rescaling via IDCT? */
+#undef  UPSAMPLE_SCALING_SUPPORTED  /* Output rescaling at upsample stage? */
+#define UPSAMPLE_MERGING_SUPPORTED  /* Fast path for sloppy upsampling? */
+#define QUANT_1PASS_SUPPORTED	    /* 1-pass color quantization? */
+#define QUANT_2PASS_SUPPORTED	    /* 2-pass color quantization? */
+
+/* more capability options later, no doubt */
+
+
+/*
+ * Ordering of RGB data in scanlines passed to or from the application.
+ * If your application wants to deal with data in the order B,G,R, just
+ * change these macros.  You can also deal with formats such as R,G,B,X
+ * (one extra byte per pixel) by changing RGB_PIXELSIZE.  Note that changing
+ * the offsets will also change the order in which colormap data is organized.
+ * RESTRICTIONS:
+ * 1. The sample applications cjpeg,djpeg do NOT support modified RGB formats.
+ * 2. These macros only affect RGB<=>YCbCr color conversion, so they are not
+ *    useful if you are using JPEG color spaces other than YCbCr or grayscale.
+ * 3. The color quantizer modules will not behave desirably if RGB_PIXELSIZE
+ *    is not 3 (they don't understand about dummy color components!).  So you
+ *    can't use color quantization if you change that value.
+ */
+
+#define RGB_RED		0	/* Offset of Red in an RGB scanline element */
+#define RGB_GREEN	1	/* Offset of Green */
+#define RGB_BLUE	2	/* Offset of Blue */
+#define RGB_PIXELSIZE	3	/* JSAMPLEs per RGB scanline element */
+
+
+/* Definitions for speed-related optimizations. */
+
+
+/* If your compiler supports inline functions, define INLINE
+ * as the inline keyword; otherwise define it as empty.
+ */
+
+#ifndef INLINE
+#ifdef __GNUC__			/* for instance, GNU C knows about inline */
+#define INLINE __inline__
+#endif
+#ifndef INLINE
+#define INLINE			/* default is to define it as empty */
+#endif
+#endif
+
+
+/* On some machines (notably 68000 series) "int" is 32 bits, but multiplying
+ * two 16-bit shorts is faster than multiplying two ints.  Define MULTIPLIER
+ * as short on such a machine.  MULTIPLIER must be at least 16 bits wide.
+ */
+
+#ifndef MULTIPLIER
+#define MULTIPLIER  int		/* type for fastest integer multiply */
+#endif
+
+
+/* FAST_FLOAT should be either float or double, whichever is done faster
+ * by your compiler.  (Note that this type is only used in the floating point
+ * DCT routines, so it only matters if you've defined DCT_FLOAT_SUPPORTED.)
+ * Typically, float is faster in ANSI C compilers, while double is faster in
+ * pre-ANSI compilers (because they insist on converting to double anyway).
+ * The code below therefore chooses float if we have ANSI-style prototypes.
+ */
+
+#ifndef FAST_FLOAT
+#ifdef HAVE_PROTOTYPES
+#define FAST_FLOAT  float
+#else
+#define FAST_FLOAT  double
+#endif
+#endif
+
+#endif /* JPEG_INTERNAL_OPTIONS */
diff --git a/uppsrc/plugin/jpg/lib/jpegint.h b/uppsrc/plugin/jpg/lib/jpegint.h
new file mode 100644
index 000000000..6a93e43e8
--- /dev/null
+++ b/uppsrc/plugin/jpg/lib/jpegint.h
@@ -0,0 +1,361 @@
+/*
+ * jpegint.h
+ *
+ * Copyright (C) 1991-1998, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file provides common declarations for the various JPEG modules.
+ * These declarations are considered internal to the JPEG library; most
+ * applications using the library shouldn't need to include this file.
+ */
+
+
+/* Declarations for both compression & decompression */
+
+typedef enum {			/* Operating modes for buffer controllers */
+	JBUF_PASS_THRU,		/* Plain stripwise operation */
+	/* Remaining modes require a full-image buffer to have been created */
+	JBUF_SAVE_SOURCE,	/* Run source subobject only, save output */
+	JBUF_CRANK_DEST,	/* Run dest subobject only, using saved data */
+	JBUF_SAVE_AND_PASS	/* Run both subobjects, save output */
+} J_BUF_MODE;
+
+/* Values of global_state field (jdapi.c has some dependencies on ordering!) */
+#define CSTATE_START	100	/* after create_compress */
+#define CSTATE_SCANNING	101	/* start_compress done, write_scanlines OK */
+#define CSTATE_RAW_OK	102	/* start_compress done, write_raw_data OK */
+#define CSTATE_WRCOEFS	103	/* jpeg_write_coefficients done */
+#define DSTATE_START	200	/* after create_decompress */
+#define DSTATE_INHEADER	201	/* reading header markers, no SOS yet */
+#define DSTATE_READY	202	/* found SOS, ready for start_decompress */
+#define DSTATE_PRELOAD	203	/* reading multiscan file in start_decompress*/
+#define DSTATE_PRESCAN	204	/* performing dummy pass for 2-pass quant */
+#define DSTATE_SCANNING	205	/* start_decompress done, read_scanlines OK */
+#define DSTATE_RAW_OK	206	/* start_decompress done, read_raw_data OK */
+#define DSTATE_BUFIMAGE	207	/* expecting jpeg_start_output */
+#define DSTATE_BUFPOST	208	/* looking for SOS/EOI in jpeg_finish_output */
+#define DSTATE_RDCOEFS	209	/* reading file in jpeg_read_coefficients */
+#define DSTATE_STOPPING	210	/* looking for EOI in jpeg_finish_decompress */
+
+
+/* Declarations for compression modules */
+
+/* Master control module */
+struct jpeg_comp_master {
+  JMETHOD(void, prepare_for_pass, (j_compress_ptr cinfo));
+  JMETHOD(void, pass_startup, (j_compress_ptr cinfo));
+  JMETHOD(void, finish_pass, (j_compress_ptr cinfo));
+
+  /* State variables made visible to other modules */
+  boolean call_pass_startup;	/* True if pass_startup must be called */
+  boolean is_last_pass;		/* True during last pass */
+};
+
+/* Main buffer control (downsampled-data buffer) */
+struct jpeg_c_main_controller {
+  JMETHOD(void, start_pass, (j_compress_ptr cinfo, J_BUF_MODE pass_mode));
+  JMETHOD(void, process_data, (j_compress_ptr cinfo,
+			       JSAMPARRAY input_buf, JDIMENSION *in_row_ctr,
+			       JDIMENSION in_rows_avail));
+};
+
+/* Compression preprocessing (downsampling input buffer control) */
+struct jpeg_c_prep_controller {
+  JMETHOD(void, start_pass, (j_compress_ptr cinfo, J_BUF_MODE pass_mode));
+  JMETHOD(void, pre_process_data, (j_compress_ptr cinfo,
+				   JSAMPARRAY input_buf,
+				   JDIMENSION *in_row_ctr,
+				   JDIMENSION in_rows_avail,
+				   JSAMPIMAGE output_buf,
+				   JDIMENSION *out_row_group_ctr,
+				   JDIMENSION out_row_groups_avail));
+};
+
+/* Compression codec (compressor proper) */
+struct jpeg_c_codec {
+  JMETHOD(void, entropy_start_pass, (j_compress_ptr cinfo,
+				     boolean gather_statistics));
+  JMETHOD(void, entropy_finish_pass, (j_compress_ptr cinfo));
+  JMETHOD(boolean, need_optimization_pass, (j_compress_ptr cinfo));
+  JMETHOD(void, start_pass, (j_compress_ptr cinfo, J_BUF_MODE pass_mode));
+  JMETHOD(boolean, compress_data, (j_compress_ptr cinfo,
+				   JSAMPIMAGE input_buf));
+};
+
+/* Colorspace conversion */
+struct jpeg_color_converter {
+  JMETHOD(void, start_pass, (j_compress_ptr cinfo));
+  JMETHOD(void, color_convert, (j_compress_ptr cinfo,
+				JSAMPARRAY input_buf, JSAMPIMAGE output_buf,
+				JDIMENSION output_row, int num_rows));
+};
+
+/* Downsampling */
+struct jpeg_downsampler {
+  JMETHOD(void, start_pass, (j_compress_ptr cinfo));
+  JMETHOD(void, downsample, (j_compress_ptr cinfo,
+			     JSAMPIMAGE input_buf, JDIMENSION in_row_index,
+			     JSAMPIMAGE output_buf,
+			     JDIMENSION out_row_group_index));
+
+  boolean need_context_rows;	/* TRUE if need rows above & below */
+};
+
+/* Marker writing */
+struct jpeg_marker_writer {
+  JMETHOD(void, write_file_header, (j_compress_ptr cinfo));
+  JMETHOD(void, write_frame_header, (j_compress_ptr cinfo));
+  JMETHOD(void, write_scan_header, (j_compress_ptr cinfo));
+  JMETHOD(void, write_file_trailer, (j_compress_ptr cinfo));
+  JMETHOD(void, write_tables_only, (j_compress_ptr cinfo));
+  /* These routines are exported to allow insertion of extra markers */
+  /* Probably only COM and APPn markers should be written this way */
+  JMETHOD(void, write_marker_header, (j_compress_ptr cinfo, int marker,
+				      unsigned int datalen));
+  JMETHOD(void, write_marker_byte, (j_compress_ptr cinfo, int val));
+};
+
+
+/* Declarations for decompression modules */
+
+/* Master control module */
+struct jpeg_decomp_master {
+  JMETHOD(void, prepare_for_output_pass, (j_decompress_ptr cinfo));
+  JMETHOD(void, finish_output_pass, (j_decompress_ptr cinfo));
+
+  /* State variables made visible to other modules */
+  boolean is_dummy_pass;	/* True during 1st pass for 2-pass quant */
+};
+
+/* Input control module */
+struct jpeg_input_controller {
+  JMETHOD(int, consume_input, (j_decompress_ptr cinfo));
+  JMETHOD(void, reset_input_controller, (j_decompress_ptr cinfo));
+  JMETHOD(void, start_input_pass, (j_decompress_ptr cinfo));
+  JMETHOD(void, finish_input_pass, (j_decompress_ptr cinfo));
+
+  /* State variables made visible to other modules */
+  boolean has_multiple_scans;	/* True if file has multiple scans */
+  boolean eoi_reached;		/* True when EOI has been consumed */
+};
+
+/* Main buffer control (downsampled-data buffer) */
+struct jpeg_d_main_controller {
+  JMETHOD(void, start_pass, (j_decompress_ptr cinfo, J_BUF_MODE pass_mode));
+  JMETHOD(void, process_data, (j_decompress_ptr cinfo,
+			       JSAMPARRAY output_buf, JDIMENSION *out_row_ctr,
+			       JDIMENSION out_rows_avail));
+};
+
+/* Decompression codec (decompressor proper) */
+struct jpeg_d_codec {
+  JMETHOD(void, calc_output_dimensions, (j_decompress_ptr cinfo));
+  JMETHOD(void, start_input_pass, (j_decompress_ptr cinfo));
+  JMETHOD(int, consume_data, (j_decompress_ptr cinfo));
+  JMETHOD(void, start_output_pass, (j_decompress_ptr cinfo));
+  JMETHOD(int, decompress_data, (j_decompress_ptr cinfo,
+				 JSAMPIMAGE output_buf));
+};
+
+/* Decompression postprocessing (color quantization buffer control) */
+struct jpeg_d_post_controller {
+  JMETHOD(void, start_pass, (j_decompress_ptr cinfo, J_BUF_MODE pass_mode));
+  JMETHOD(void, post_process_data, (j_decompress_ptr cinfo,
+				    JSAMPIMAGE input_buf,
+				    JDIMENSION *in_row_group_ctr,
+				    JDIMENSION in_row_groups_avail,
+				    JSAMPARRAY output_buf,
+				    JDIMENSION *out_row_ctr,
+				    JDIMENSION out_rows_avail));
+};
+
+/* Marker reading & parsing */
+struct jpeg_marker_reader {
+  JMETHOD(void, reset_marker_reader, (j_decompress_ptr cinfo));
+  /* Read markers until SOS or EOI.
+   * Returns same codes as are defined for jpeg_consume_input:
+   * JPEG_SUSPENDED, JPEG_REACHED_SOS, or JPEG_REACHED_EOI.
+   */
+  JMETHOD(int, read_markers, (j_decompress_ptr cinfo));
+  /* Read a restart marker --- exported for use by entropy decoder only */
+  jpeg_marker_parser_method read_restart_marker;
+
+  /* State of marker reader --- nominally internal, but applications
+   * supplying COM or APPn handlers might like to know the state.
+   */
+  boolean saw_SOI;		/* found SOI? */
+  boolean saw_SOF;		/* found SOF? */
+  int next_restart_num;		/* next restart number expected (0-7) */
+  unsigned int discarded_bytes;	/* # of bytes skipped looking for a marker */
+};
+
+/* Upsampling (note that upsampler must also call color converter) */
+struct jpeg_upsampler {
+  JMETHOD(void, start_pass, (j_decompress_ptr cinfo));
+  JMETHOD(void, upsample, (j_decompress_ptr cinfo,
+			   JSAMPIMAGE input_buf,
+			   JDIMENSION *in_row_group_ctr,
+			   JDIMENSION in_row_groups_avail,
+			   JSAMPARRAY output_buf,
+			   JDIMENSION *out_row_ctr,
+			   JDIMENSION out_rows_avail));
+
+  boolean need_context_rows;	/* TRUE if need rows above & below */
+};
+
+/* Colorspace conversion */
+struct jpeg_color_deconverter {
+  JMETHOD(void, start_pass, (j_decompress_ptr cinfo));
+  JMETHOD(void, color_convert, (j_decompress_ptr cinfo,
+				JSAMPIMAGE input_buf, JDIMENSION input_row,
+				JSAMPARRAY output_buf, int num_rows));
+};
+
+/* Color quantization or color precision reduction */
+struct jpeg_color_quantizer {
+  JMETHOD(void, start_pass, (j_decompress_ptr cinfo, boolean is_pre_scan));
+  JMETHOD(void, color_quantize, (j_decompress_ptr cinfo,
+				 JSAMPARRAY input_buf, JSAMPARRAY output_buf,
+				 int num_rows));
+  JMETHOD(void, finish_pass, (j_decompress_ptr cinfo));
+  JMETHOD(void, new_color_map, (j_decompress_ptr cinfo));
+};
+
+
+/* Miscellaneous useful macros */
+
+#undef MAX
+#define MAX(a,b)	((a) > (b) ? (a) : (b))
+#undef MIN
+#define MIN(a,b)	((a) < (b) ? (a) : (b))
+
+
+/* We assume that right shift corresponds to signed division by 2 with
+ * rounding towards minus infinity.  This is correct for typical "arithmetic
+ * shift" instructions that shift in copies of the sign bit.  But some
+ * C compilers implement >> with an unsigned shift.  For these machines you
+ * must define RIGHT_SHIFT_IS_UNSIGNED.
+ * RIGHT_SHIFT provides a proper signed right shift of an INT32 quantity.
+ * It is only applied with constant shift counts.  SHIFT_TEMPS must be
+ * included in the variables of any routine using RIGHT_SHIFT.
+ */
+
+#ifdef RIGHT_SHIFT_IS_UNSIGNED
+#define SHIFT_TEMPS	INT32 shift_temp;
+#define RIGHT_SHIFT(x,shft)  \
+	((shift_temp = (x)) < 0 ? \
+	 (shift_temp >> (shft)) | ((~((INT32) 0)) << (32-(shft))) : \
+	 (shift_temp >> (shft)))
+#else
+#define SHIFT_TEMPS
+#define RIGHT_SHIFT(x,shft)	((x) >> (shft))
+#endif
+
+
+/* Short forms of external names for systems with brain-damaged linkers. */
+
+#ifdef NEED_SHORT_EXTERNAL_NAMES
+#define jinit_c_codec		jICCodec
+#define jinit_lossy_c_codec	jILossyC
+#define jinit_compress_master	jICompress
+#define jinit_c_master_control	jICMaster
+#define jinit_c_main_controller	jICMainC
+#define jinit_c_prep_controller	jICPrepC
+#define jinit_c_coef_controller	jICCoefC
+#define jinit_color_converter	jICColor
+#define jinit_downsampler	jIDownsampler
+#define jinit_forward_dct	jIFDCT
+#define jinit_shuff_encoder	jISHEncoder
+#define jinit_phuff_encoder	jIPHEncoder
+#define jinit_marker_writer	jIMWriter
+#define jinit_d_codec		jIDCodec
+#define jinit_lossy_d_codec	jILossyD
+#define jinit_lossless_d_codec	jILosslsD
+#define jinit_master_decompress	jIDMaster
+#define jinit_d_main_controller	jIDMainC
+#define jinit_d_coef_controller	jIDCoefC
+#define jinit_d_diff_controller	jIDDiffC
+#define jinit_d_post_controller	jIDPostC
+#define jinit_input_controller	jIInCtlr
+#define jinit_marker_reader	jIMReader
+#define jinit_shuff_decoder	jISHDecoder
+#define jinit_phuff_decoder	jIPHDecoder
+#define jinit_lhuff_decoder	jILHDecoder
+#define jinit_undifferencer	jIUndiff
+#define jinit_d_scaler		jIDScaler
+#define jinit_inverse_dct	jIIDCT
+#define jinit_upsampler		jIUpsampler
+#define jinit_color_deconverter	jIDColor
+#define jinit_1pass_quantizer	jI1Quant
+#define jinit_2pass_quantizer	jI2Quant
+#define jinit_merged_upsampler	jIMUpsampler
+#define jinit_memory_mgr	jIMemMgr
+#define jdiv_round_up		jDivRound
+#define jround_up		jRound
+#define jcopy_sample_rows	jCopySamples
+#define jcopy_block_row		jCopyBlocks
+#define jzero_far		jZeroFar
+#define jpeg_zigzag_order	jZIGTable
+#define jpeg_natural_order	jZAGTable
+#endif /* NEED_SHORT_EXTERNAL_NAMES */
+
+
+/* Compression module initialization routines */
+EXTERN(void) jinit_compress_master JPP((j_compress_ptr cinfo));
+EXTERN(void) jinit_c_master_control JPP((j_compress_ptr cinfo,
+					 boolean transcode_only));
+EXTERN(void) jinit_c_codec JPP((j_compress_ptr cinfo));
+EXTERN(void) jinit_lossless_c_codec JPP((j_compress_ptr cinfo));
+EXTERN(void) jinit_c_diff_controller JPP((j_compress_ptr cinfo, boolean need_full_buffer));
+EXTERN(void) jinit_c_main_controller JPP((j_compress_ptr cinfo,
+					  boolean need_full_buffer));
+EXTERN(void) jinit_c_prep_controller JPP((j_compress_ptr cinfo,
+					  boolean need_full_buffer));
+EXTERN(void) jinit_compressor JPP((j_compress_ptr cinfo));
+EXTERN(void) jinit_color_converter JPP((j_compress_ptr cinfo));
+EXTERN(void) jinit_downsampler JPP((j_compress_ptr cinfo));
+EXTERN(void) jinit_marker_writer JPP((j_compress_ptr cinfo));
+/* Decompression module initialization routines */
+EXTERN(void) jinit_master_decompress JPP((j_decompress_ptr cinfo));
+EXTERN(void) jinit_d_main_controller JPP((j_decompress_ptr cinfo,
+					  boolean need_full_buffer));
+EXTERN(void) jinit_d_codec JPP((j_decompress_ptr cinfo));
+EXTERN(void) jinit_lossless_d_codec JPP((j_decompress_ptr cinfo));
+EXTERN(void) jinit_d_diff_controller JPP((j_decompress_ptr cinfo, boolean need_full_buffer));
+EXTERN(void) jinit_decompressor JPP((j_decompress_ptr cinfo));
+EXTERN(void) jinit_d_post_controller JPP((j_decompress_ptr cinfo,
+					  boolean need_full_buffer));
+EXTERN(void) jinit_input_controller JPP((j_decompress_ptr cinfo));
+EXTERN(void) jinit_marker_reader JPP((j_decompress_ptr cinfo));
+EXTERN(void) jinit_upsampler JPP((j_decompress_ptr cinfo));
+EXTERN(void) jinit_color_deconverter JPP((j_decompress_ptr cinfo));
+EXTERN(void) jinit_1pass_quantizer JPP((j_decompress_ptr cinfo));
+EXTERN(void) jinit_2pass_quantizer JPP((j_decompress_ptr cinfo));
+EXTERN(void) jinit_merged_upsampler JPP((j_decompress_ptr cinfo));
+/* Memory manager initialization */
+EXTERN(void) jinit_memory_mgr JPP((j_common_ptr cinfo));
+
+/* Utility routines in jutils.c */
+EXTERN(long) jdiv_round_up JPP((long a, long b));
+EXTERN(long) jround_up JPP((long a, long b));
+EXTERN(void) jcopy_sample_rows JPP((JSAMPARRAY input_array, int source_row,
+				    JSAMPARRAY output_array, int dest_row,
+				    int num_rows, JDIMENSION num_cols));
+EXTERN(void) jcopy_block_row JPP((JBLOCKROW input_row, JBLOCKROW output_row,
+				  JDIMENSION num_blocks));
+EXTERN(void) jzero_far JPP((void FAR * target, size_t bytestozero));
+/* Constant tables in jutils.c */
+#if 0				/* This table is not actually needed in v6a */
+extern const int jpeg_zigzag_order[]; /* natural coef order to zigzag order */
+#endif
+extern const int jpeg_natural_order[]; /* zigzag coef order to natural order */
+
+/* Suppress undefined-structure complaints if necessary. */
+
+#ifdef INCOMPLETE_TYPES_BROKEN
+#ifndef AM_MEMORY_MANAGER	/* only jmemmgr.c defines these */
+struct jvirt_sarray_control { long dummy; };
+struct jvirt_barray_control { long dummy; };
+#endif
+#endif /* INCOMPLETE_TYPES_BROKEN */
diff --git a/uppsrc/plugin/jpg/lib/jpeglib.h b/uppsrc/plugin/jpg/lib/jpeglib.h
new file mode 100644
index 000000000..74ca77f82
--- /dev/null
+++ b/uppsrc/plugin/jpg/lib/jpeglib.h
@@ -0,0 +1,1131 @@
+/*
+ * jpeglib.h
+ *
+ * Copyright (C) 1991-1998, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file defines the application interface for the JPEG library.
+ * Most applications using the library need only include this file,
+ * and perhaps jerror.h if they want to know the exact error codes.
+ */
+
+#ifndef JPEGLIB_H
+#define JPEGLIB_H
+
+/*
+ * First we include the configuration files that record how this
+ * installation of the JPEG library is set up.  jconfig.h can be
+ * generated automatically for many systems.  jmorecfg.h contains
+ * manual configuration options that most people need not worry about.
+ */
+
+#ifndef JCONFIG_INCLUDED	/* in case jinclude.h already did */
+#include "jconfig.h"		/* widely used configuration options */
+#endif
+#include "jmorecfg.h"		/* seldom changed options */
+
+
+/* Version ID for the JPEG library.
+ * Might be useful for tests like "#if JPEG_LIB_VERSION >= 60".
+ */
+
+#define JPEG_LIB_VERSION  62	/* Version 6b */
+
+
+/* Various constants determining the sizes of things.
+ * All of these are specified by the JPEG standard, so don't change them
+ * if you want to be compatible.
+ */
+
+#define DCTSIZE		    8	/* The basic DCT block is 8x8 samples */
+#define DCTSIZE2	    64	/* DCTSIZE squared; # of elements in a block */
+#define NUM_QUANT_TBLS      4	/* Quantization tables are numbered 0..3 */
+#define NUM_HUFF_TBLS       4	/* Huffman tables are numbered 0..3 */
+#define NUM_ARITH_TBLS      16	/* Arith-coding tables are numbered 0..15 */
+#define MAX_COMPS_IN_SCAN   4	/* JPEG limit on # of components in one scan */
+#define MAX_SAMP_FACTOR     4	/* JPEG limit on sampling factors */
+/* Unfortunately, some bozo at Adobe saw no reason to be bound by the standard;
+ * the PostScript DCT filter can emit files with many more than 10 data units
+ * per MCU.
+ * If you happen to run across such a file, you can up D_MAX_DATA_UNITS_IN_MCU
+ * to handle it.  We even let you do this from the jconfig.h file.  However,
+ * we strongly discourage changing C_MAX_DATA_UNITS_IN_MCU; just because Adobe
+ * sometimes emits noncompliant files doesn't mean you should too.
+ */
+#define C_MAX_DATA_UNITS_IN_MCU   10 /* compressor's limit on data units/MCU */
+#ifndef D_MAX_DATA_UNITS_IN_MCU
+#define D_MAX_DATA_UNITS_IN_MCU   10 /* decompressor's limit on data units/MCU */
+#endif
+
+
+/* Data structures for images (arrays of samples and of DCT coefficients).
+ * On 80x86 machines, the image arrays are too big for near pointers,
+ * but the pointer arrays can fit in near memory.
+ */
+
+typedef JSAMPLE FAR *JSAMPROW;	/* ptr to one image row of pixel samples. */
+typedef JSAMPROW *JSAMPARRAY;	/* ptr to some rows (a 2-D sample array) */
+typedef JSAMPARRAY *JSAMPIMAGE;	/* a 3-D sample array: top index is color */
+
+typedef JCOEF JBLOCK[DCTSIZE2];	/* one block of coefficients */
+typedef JBLOCK FAR *JBLOCKROW;	/* pointer to one row of coefficient blocks */
+typedef JBLOCKROW *JBLOCKARRAY;		/* a 2-D array of coefficient blocks */
+typedef JBLOCKARRAY *JBLOCKIMAGE;	/* a 3-D array of coefficient blocks */
+
+typedef JCOEF FAR *JCOEFPTR;	/* useful in a couple of places */
+
+typedef JDIFF FAR *JDIFFROW;	/* pointer to one row of difference values */
+typedef JDIFFROW *JDIFFARRAY;	/* ptr to some rows (a 2-D diff array) */
+typedef JDIFFARRAY *JDIFFIMAGE;	/* a 3-D diff array: top index is color */
+
+
+/* Types for JPEG compression parameters and working tables. */
+
+
+/* DCT coefficient quantization tables. */
+
+typedef struct {
+  /* This array gives the coefficient quantizers in natural array order
+   * (not the zigzag order in which they are stored in a JPEG DQT marker).
+   * CAUTION: IJG versions prior to v6a kept this array in zigzag order.
+   */
+  UINT16 quantval[DCTSIZE2];	/* quantization step for each coefficient */
+  /* This field is used only during compression.  It's initialized FALSE when
+   * the table is created, and set TRUE when it's been output to the file.
+   * You could suppress output of a table by setting this to TRUE.
+   * (See jpeg_suppress_tables for an example.)
+   */
+  boolean sent_table;		/* TRUE when table has been output */
+} JQUANT_TBL;
+
+
+/* Huffman coding tables. */
+
+typedef struct {
+  /* These two fields directly represent the contents of a JPEG DHT marker */
+  UINT8 bits[17];		/* bits[k] = # of symbols with codes of */
+				/* length k bits; bits[0] is unused */
+  UINT8 huffval[256];		/* The symbols, in order of incr code length */
+  /* This field is used only during compression.  It's initialized FALSE when
+   * the table is created, and set TRUE when it's been output to the file.
+   * You could suppress output of a table by setting this to TRUE.
+   * (See jpeg_suppress_tables for an example.)
+   */
+  boolean sent_table;		/* TRUE when table has been output */
+} JHUFF_TBL;
+
+
+/* Basic info about one component (color channel). */
+
+typedef struct {
+  /* These values are fixed over the whole image. */
+  /* For compression, they must be supplied by parameter setup; */
+  /* for decompression, they are read from the SOF marker. */
+  int component_id;		/* identifier for this component (0..255) */
+  int component_index;		/* its index in SOF or cinfo->comp_info[] */
+  int h_samp_factor;		/* horizontal sampling factor (1..4) */
+  int v_samp_factor;		/* vertical sampling factor (1..4) */
+  int quant_tbl_no;		/* quantization table selector (0..3) */
+  /* These values may vary between scans. */
+  /* For compression, they must be supplied by parameter setup; */
+  /* for decompression, they are read from the SOS marker. */
+  /* The decompressor output side may not use these variables. */
+  int dc_tbl_no;		/* DC entropy table selector (0..3) */
+  int ac_tbl_no;		/* AC entropy table selector (0..3) */
+
+  /* Remaining fields should be treated as private by applications. */
+
+  /* These values are computed during compression or decompression startup: */
+  /* Component's size in data units.
+   * Any dummy data units added to complete an MCU are not counted; therefore
+   * these values do not depend on whether a scan is interleaved or not.
+   */
+  JDIMENSION width_in_data_units;
+  JDIMENSION height_in_data_units;
+  /* Size of a data unit in/output by the codec (in samples).  Always
+   * data_unit for compression.  For decompression this is the size of the
+   * output from one data_unit, reflecting any processing performed by the
+   * codec.  For example, in the DCT-based codec, scaling may be applied
+   * during the IDCT step.  Values of 1,2,4,8 are likely to be supported.
+   * Note that different components may have different codec_data_unit sizes.
+   */
+  int codec_data_unit;
+  /* The downsampled dimensions are the component's actual, unpadded number
+   * of samples at the main buffer (preprocessing/compression interface), thus
+   * downsampled_width = ceil(image_width * Hi/Hmax)
+   * and similarly for height.  For decompression, codec-based processing is
+   * included (ie, IDCT scaling), so
+   * downsampled_width = ceil(image_width * Hi/Hmax * codec_data_unit/data_unit)
+   */
+  JDIMENSION downsampled_width;	 /* actual width in samples */
+  JDIMENSION downsampled_height; /* actual height in samples */
+  /* This flag is used only for decompression.  In cases where some of the
+   * components will be ignored (eg grayscale output from YCbCr image),
+   * we can skip most computations for the unused components.
+   */
+  boolean component_needed;	/* do we need the value of this component? */
+
+  /* These values are computed before starting a scan of the component. */
+  /* The decompressor output side may not use these variables. */
+  int MCU_width;		/* number of data units per MCU, horizontally */
+  int MCU_height;		/* number of data units per MCU, vertically */
+  int MCU_data_units;		/* MCU_width * MCU_height */
+  int MCU_sample_width;		/* MCU width in samples, MCU_width*codec_data_unit */
+  int last_col_width;		/* # of non-dummy data_units across in last MCU */
+  int last_row_height;		/* # of non-dummy data_units down in last MCU */
+
+  /* Saved quantization table for component; NULL if none yet saved.
+   * See jdinput.c comments about the need for this information.
+   * This field is currently used only for decompression.
+   */
+  JQUANT_TBL * quant_table;
+
+  /* Private per-component storage for DCT or IDCT subsystem. */
+  void * dct_table;
+} jpeg_component_info;
+
+
+/* The script for encoding a multiple-scan file is an array of these: */
+
+typedef struct {
+  int comps_in_scan;		/* number of components encoded in this scan */
+  int component_index[MAX_COMPS_IN_SCAN]; /* their SOF/comp_info[] indexes */
+  int Ss, Se;			/* progressive JPEG spectral selection parms
+				   lossless JPEG predictor select parm (Ss) */
+  int Ah, Al;			/* progressive JPEG successive approx. parms
+				   lossless JPEG point transform parm (Al) */
+} jpeg_scan_info;
+
+/* The decompressor can save APPn and COM markers in a list of these: */
+
+typedef struct jpeg_marker_struct FAR * jpeg_saved_marker_ptr;
+
+struct jpeg_marker_struct {
+  jpeg_saved_marker_ptr next;	/* next in list, or NULL */
+  UINT8 marker;			/* marker code: JPEG_COM, or JPEG_APP0+n */
+  unsigned int original_length;	/* # bytes of data in the file */
+  unsigned int data_length;	/* # bytes of data saved at data[] */
+  JOCTET FAR * data;		/* the data contained in the marker */
+  /* the marker length word is not counted in data_length or original_length */
+};
+
+/* Known codec processes. */
+
+typedef enum {
+	JPROC_SEQUENTIAL,	/* baseline/extended sequential DCT */
+	JPROC_PROGRESSIVE,	/* progressive DCT */
+	JPROC_LOSSLESS		/* lossless (sequential) */
+} J_CODEC_PROCESS;
+
+/* Known color spaces. */
+
+typedef enum {
+	JCS_UNKNOWN,		/* error/unspecified */
+	JCS_GRAYSCALE,		/* monochrome */
+	JCS_RGB,		/* red/green/blue */
+	JCS_YCbCr,		/* Y/Cb/Cr (also known as YUV) */
+	JCS_CMYK,		/* C/M/Y/K */
+	JCS_YCCK		/* Y/Cb/Cr/K */
+} J_COLOR_SPACE;
+
+/* DCT/IDCT algorithm options. */
+
+typedef enum {
+	JDCT_ISLOW,		/* slow but accurate integer algorithm */
+	JDCT_IFAST,		/* faster, less accurate integer method */
+	JDCT_FLOAT		/* floating-point: accurate, fast on fast HW */
+} J_DCT_METHOD;
+
+#ifndef JDCT_DEFAULT		/* may be overridden in jconfig.h */
+#define JDCT_DEFAULT  JDCT_ISLOW
+#endif
+#ifndef JDCT_FASTEST		/* may be overridden in jconfig.h */
+#define JDCT_FASTEST  JDCT_IFAST
+#endif
+
+/* Dithering options for decompression. */
+
+typedef enum {
+	JDITHER_NONE,		/* no dithering */
+	JDITHER_ORDERED,	/* simple ordered dither */
+	JDITHER_FS		/* Floyd-Steinberg error diffusion dither */
+} J_DITHER_MODE;
+
+
+/* Common fields between JPEG compression and decompression master structs. */
+
+#define jpeg_common_fields \
+  struct jpeg_error_mgr * err;	/* Error handler module */\
+  struct jpeg_memory_mgr * mem;	/* Memory manager module */\
+  struct jpeg_progress_mgr * progress; /* Progress monitor, or NULL if none */\
+  void * client_data;		/* Available for use by application */\
+  boolean is_decompressor;	/* So common code can tell which is which */\
+  int global_state		/* For checking call sequence validity */
+
+/* Routines that are to be used by both halves of the library are declared
+ * to receive a pointer to this structure.  There are no actual instances of
+ * jpeg_common_struct, only of jpeg_compress_struct and jpeg_decompress_struct.
+ */
+struct jpeg_common_struct {
+  jpeg_common_fields;		/* Fields common to both master struct types */
+  /* Additional fields follow in an actual jpeg_compress_struct or
+   * jpeg_decompress_struct.  All three structs must agree on these
+   * initial fields!  (This would be a lot cleaner in C++.)
+   */
+};
+
+typedef struct jpeg_common_struct * j_common_ptr;
+typedef struct jpeg_compress_struct * j_compress_ptr;
+typedef struct jpeg_decompress_struct * j_decompress_ptr;
+
+
+/* Master record for a compression instance */
+
+struct jpeg_compress_struct {
+  jpeg_common_fields;		/* Fields shared with jpeg_decompress_struct */
+
+  /* Destination for compressed data */
+  struct jpeg_destination_mgr * dest;
+
+  /* Description of source image --- these fields must be filled in by
+   * outer application before starting compression.  in_color_space must
+   * be correct before you can even call jpeg_set_defaults().
+   */
+
+  JDIMENSION image_width;	/* input image width */
+  JDIMENSION image_height;	/* input image height */
+  int input_components;		/* # of color components in input image */
+  J_COLOR_SPACE in_color_space;	/* colorspace of input image */
+
+  double input_gamma;		/* image gamma of input image */
+
+  /* Compression parameters --- these fields must be set before calling
+   * jpeg_start_compress().  We recommend calling jpeg_set_defaults() to
+   * initialize everything to reasonable defaults, then changing anything
+   * the application specifically wants to change.  That way you won't get
+   * burnt when new parameters are added.  Also note that there are several
+   * helper routines to simplify changing parameters.
+   */
+
+  boolean lossless;		/* TRUE=lossless encoding, FALSE=lossy */
+
+  int data_precision;		/* bits of precision in image data */
+
+  int num_components;		/* # of color components in JPEG image */
+  J_COLOR_SPACE jpeg_color_space; /* colorspace of JPEG image */
+
+  jpeg_component_info * comp_info;
+  /* comp_info[i] describes component that appears i'th in SOF */
+
+  JQUANT_TBL * quant_tbl_ptrs[NUM_QUANT_TBLS];
+  /* ptrs to coefficient quantization tables, or NULL if not defined */
+
+  JHUFF_TBL * dc_huff_tbl_ptrs[NUM_HUFF_TBLS];
+  JHUFF_TBL * ac_huff_tbl_ptrs[NUM_HUFF_TBLS];
+  /* ptrs to Huffman coding tables, or NULL if not defined */
+
+  UINT8 arith_dc_L[NUM_ARITH_TBLS]; /* L values for DC arith-coding tables */
+  UINT8 arith_dc_U[NUM_ARITH_TBLS]; /* U values for DC arith-coding tables */
+  UINT8 arith_ac_K[NUM_ARITH_TBLS]; /* Kx values for AC arith-coding tables */
+
+  int num_scans;		/* # of entries in scan_info array */
+  const jpeg_scan_info * scan_info; /* script for multi-scan file, or NULL */
+  /* The default value of scan_info is NULL, which causes a single-scan
+   * sequential JPEG file to be emitted.  To create a multi-scan file,
+   * set num_scans and scan_info to point to an array of scan definitions.
+   */
+
+  boolean raw_data_in;		/* TRUE=caller supplies downsampled data */
+  boolean arith_code;		/* TRUE=arithmetic coding, FALSE=Huffman */
+  boolean optimize_coding;	/* TRUE=optimize entropy encoding parms */
+  boolean CCIR601_sampling;	/* TRUE=first samples are cosited */
+  int smoothing_factor;		/* 1..100, or 0 for no input smoothing */
+  J_DCT_METHOD dct_method;	/* DCT algorithm selector */
+
+  /* The restart interval can be specified in absolute MCUs by setting
+   * restart_interval, or in MCU rows by setting restart_in_rows
+   * (in which case the correct restart_interval will be figured
+   * for each scan).
+   */
+  unsigned int restart_interval; /* MCUs per restart, or 0 for no restart */
+  int restart_in_rows;		/* if > 0, MCU rows per restart interval */
+
+  /* Parameters controlling emission of special markers. */
+
+  boolean write_JFIF_header;	/* should a JFIF marker be written? */
+  UINT8 JFIF_major_version;	/* What to write for the JFIF version number */
+  UINT8 JFIF_minor_version;
+  /* These three values are not used by the JPEG code, merely copied */
+  /* into the JFIF APP0 marker.  density_unit can be 0 for unknown, */
+  /* 1 for dots/inch, or 2 for dots/cm.  Note that the pixel aspect */
+  /* ratio is defined by X_density/Y_density even when density_unit=0. */
+  UINT8 density_unit;		/* JFIF code for pixel size units */
+  UINT16 X_density;		/* Horizontal pixel density */
+  UINT16 Y_density;		/* Vertical pixel density */
+  boolean write_Adobe_marker;	/* should an Adobe marker be written? */
+
+  /* State variable: index of next scanline to be written to
+   * jpeg_write_scanlines().  Application may use this to control its
+   * processing loop, e.g., "while (next_scanline < image_height)".
+   */
+
+  JDIMENSION next_scanline;	/* 0 .. image_height-1  */
+
+  /* Remaining fields are known throughout compressor, but generally
+   * should not be touched by a surrounding application.
+   */
+
+  /*
+   * These fields are computed during compression startup
+   */
+  int data_unit;		/* size of data unit in samples */
+  J_CODEC_PROCESS process;	/* encoding process of JPEG image */
+
+  int max_h_samp_factor;	/* largest h_samp_factor */
+  int max_v_samp_factor;	/* largest v_samp_factor */
+
+  JDIMENSION total_iMCU_rows;	/* # of iMCU rows to be input to codec */
+  /* The codec receives data in units of MCU rows as defined for fully
+   * interleaved scans (whether the JPEG file is interleaved or not).
+   * There are v_samp_factor * data_unit sample rows of each component in an
+   * "iMCU" (interleaved MCU) row.
+   */
+
+  /*
+   * These fields are valid during any one scan.
+   * They describe the components and MCUs actually appearing in the scan.
+   */
+  int comps_in_scan;		/* # of JPEG components in this scan */
+  jpeg_component_info * cur_comp_info[MAX_COMPS_IN_SCAN];
+  /* *cur_comp_info[i] describes component that appears i'th in SOS */
+
+  JDIMENSION MCUs_per_row;	/* # of MCUs across the image */
+  JDIMENSION MCU_rows_in_scan;	/* # of MCU rows in the image */
+
+  int data_units_in_MCU;	/* # of data units per MCU */
+  int MCU_membership[C_MAX_DATA_UNITS_IN_MCU];
+  /* MCU_membership[i] is index in cur_comp_info of component owning */
+  /* i'th block in an MCU */
+
+  int Ss, Se, Ah, Al;		/* progressive/lossless JPEG parameters for scan */
+
+  /*
+   * Links to compression subobjects (methods and private variables of modules)
+   */
+  struct jpeg_comp_master * master;
+  struct jpeg_c_main_controller * main;
+  struct jpeg_c_prep_controller * prep;
+  struct jpeg_c_codec * codec;
+  struct jpeg_marker_writer * marker;
+  struct jpeg_color_converter * cconvert;
+  struct jpeg_downsampler * downsample;
+  jpeg_scan_info * script_space; /* workspace for jpeg_simple_progression */
+  int script_space_size;
+};
+
+
+/* Master record for a decompression instance */
+
+struct jpeg_decompress_struct {
+  jpeg_common_fields;		/* Fields shared with jpeg_compress_struct */
+
+  /* Source of compressed data */
+  struct jpeg_source_mgr * src;
+
+  /* Basic description of image --- filled in by jpeg_read_header(). */
+  /* Application may inspect these values to decide how to process image. */
+
+  JDIMENSION image_width;	/* nominal image width (from SOF marker) */
+  JDIMENSION image_height;	/* nominal image height */
+  int num_components;		/* # of color components in JPEG image */
+  J_COLOR_SPACE jpeg_color_space; /* colorspace of JPEG image */
+
+  /* Decompression processing parameters --- these fields must be set before
+   * calling jpeg_start_decompress().  Note that jpeg_read_header() initializes
+   * them to default values.
+   */
+
+  J_COLOR_SPACE out_color_space; /* colorspace for output */
+
+  unsigned int scale_num, scale_denom; /* fraction by which to scale image */
+
+  double output_gamma;		/* image gamma wanted in output */
+
+  boolean buffered_image;	/* TRUE=multiple output passes */
+  boolean raw_data_out;		/* TRUE=downsampled data wanted */
+
+  J_DCT_METHOD dct_method;	/* IDCT algorithm selector */
+  boolean do_fancy_upsampling;	/* TRUE=apply fancy upsampling */
+  boolean do_block_smoothing;	/* TRUE=apply interblock smoothing */
+
+  boolean quantize_colors;	/* TRUE=colormapped output wanted */
+  /* the following are ignored if not quantize_colors: */
+  J_DITHER_MODE dither_mode;	/* type of color dithering to use */
+  boolean two_pass_quantize;	/* TRUE=use two-pass color quantization */
+  int desired_number_of_colors;	/* max # colors to use in created colormap */
+  /* these are significant only in buffered-image mode: */
+  boolean enable_1pass_quant;	/* enable future use of 1-pass quantizer */
+  boolean enable_external_quant;/* enable future use of external colormap */
+  boolean enable_2pass_quant;	/* enable future use of 2-pass quantizer */
+
+  /* Description of actual output image that will be returned to application.
+   * These fields are computed by jpeg_start_decompress().
+   * You can also use jpeg_calc_output_dimensions() to determine these values
+   * in advance of calling jpeg_start_decompress().
+   */
+
+  JDIMENSION output_width;	/* scaled image width */
+  JDIMENSION output_height;	/* scaled image height */
+  int out_color_components;	/* # of color components in out_color_space */
+  int output_components;	/* # of color components returned */
+  /* output_components is 1 (a colormap index) when quantizing colors;
+   * otherwise it equals out_color_components.
+   */
+  int rec_outbuf_height;	/* min recommended height of scanline buffer */
+  /* If the buffer passed to jpeg_read_scanlines() is less than this many rows
+   * high, space and time will be wasted due to unnecessary data copying.
+   * Usually rec_outbuf_height will be 1 or 2, at most 4.
+   */
+
+  /* When quantizing colors, the output colormap is described by these fields.
+   * The application can supply a colormap by setting colormap non-NULL before
+   * calling jpeg_start_decompress; otherwise a colormap is created during
+   * jpeg_start_decompress or jpeg_start_output.
+   * The map has out_color_components rows and actual_number_of_colors columns.
+   */
+  int actual_number_of_colors;	/* number of entries in use */
+  JSAMPARRAY colormap;		/* The color map as a 2-D pixel array */
+
+  /* State variables: these variables indicate the progress of decompression.
+   * The application may examine these but must not modify them.
+   */
+
+  /* Row index of next scanline to be read from jpeg_read_scanlines().
+   * Application may use this to control its processing loop, e.g.,
+   * "while (output_scanline < output_height)".
+   */
+  JDIMENSION output_scanline;	/* 0 .. output_height-1  */
+
+  /* Current input scan number and number of iMCU rows completed in scan.
+   * These indicate the progress of the decompressor input side.
+   */
+  int input_scan_number;	/* Number of SOS markers seen so far */
+  JDIMENSION input_iMCU_row;	/* Number of iMCU rows completed */
+
+  /* The "output scan number" is the notional scan being displayed by the
+   * output side.  The decompressor will not allow output scan/row number
+   * to get ahead of input scan/row, but it can fall arbitrarily far behind.
+   */
+  int output_scan_number;	/* Nominal scan number being displayed */
+  JDIMENSION output_iMCU_row;	/* Number of iMCU rows read */
+
+  /* Current progression status.  coef_bits[c][i] indicates the precision
+   * with which component c's DCT coefficient i (in zigzag order) is known.
+   * It is -1 when no data has yet been received, otherwise it is the point
+   * transform (shift) value for the most recent scan of the coefficient
+   * (thus, 0 at completion of the progression).
+   * This pointer is NULL when reading a non-progressive file.
+   */
+  int (*coef_bits)[DCTSIZE2];	/* -1 or current Al value for each coef */
+
+  /* Internal JPEG parameters --- the application usually need not look at
+   * these fields.  Note that the decompressor output side may not use
+   * any parameters that can change between scans.
+   */
+
+  /* Quantization and Huffman tables are carried forward across input
+   * datastreams when processing abbreviated JPEG datastreams.
+   */
+
+  JQUANT_TBL * quant_tbl_ptrs[NUM_QUANT_TBLS];
+  /* ptrs to coefficient quantization tables, or NULL if not defined */
+
+  JHUFF_TBL * dc_huff_tbl_ptrs[NUM_HUFF_TBLS];
+  JHUFF_TBL * ac_huff_tbl_ptrs[NUM_HUFF_TBLS];
+  /* ptrs to Huffman coding tables, or NULL if not defined */
+
+  /* These parameters are never carried across datastreams, since they
+   * are given in SOF/SOS markers or defined to be reset by SOI.
+   */
+
+  int data_precision;		/* bits of precision in image data */
+
+  jpeg_component_info * comp_info;
+  /* comp_info[i] describes component that appears i'th in SOF */
+
+  boolean arith_code;		/* TRUE=arithmetic coding, FALSE=Huffman */
+
+  UINT8 arith_dc_L[NUM_ARITH_TBLS]; /* L values for DC arith-coding tables */
+  UINT8 arith_dc_U[NUM_ARITH_TBLS]; /* U values for DC arith-coding tables */
+  UINT8 arith_ac_K[NUM_ARITH_TBLS]; /* Kx values for AC arith-coding tables */
+
+  unsigned int restart_interval; /* MCUs per restart interval, or 0 for no restart */
+
+  /* These fields record data obtained from optional markers recognized by
+   * the JPEG library.
+   */
+  boolean saw_JFIF_marker;	/* TRUE iff a JFIF APP0 marker was found */
+  /* Data copied from JFIF marker; only valid if saw_JFIF_marker is TRUE: */
+  UINT8 JFIF_major_version;	/* JFIF version number */
+  UINT8 JFIF_minor_version;
+  UINT8 density_unit;		/* JFIF code for pixel size units */
+  UINT16 X_density;		/* Horizontal pixel density */
+  UINT16 Y_density;		/* Vertical pixel density */
+  boolean saw_Adobe_marker;	/* TRUE iff an Adobe APP14 marker was found */
+  UINT8 Adobe_transform;	/* Color transform code from Adobe marker */
+
+  boolean CCIR601_sampling;	/* TRUE=first samples are cosited */
+
+  /* Aside from the specific data retained from APPn markers known to the
+   * library, the uninterpreted contents of any or all APPn and COM markers
+   * can be saved in a list for examination by the application.
+   */
+  jpeg_saved_marker_ptr marker_list; /* Head of list of saved markers */
+
+  /* Remaining fields are known throughout decompressor, but generally
+   * should not be touched by a surrounding application.
+   */
+
+  /*
+   * These fields are computed during decompression startup
+   */
+  int data_unit;		/* size of data unit in samples */
+  J_CODEC_PROCESS process;	/* decoding process of JPEG image */
+
+  int max_h_samp_factor;	/* largest h_samp_factor */
+  int max_v_samp_factor;	/* largest v_samp_factor */
+
+  int min_codec_data_unit;	/* smallest codec_data_unit of any component */
+
+  JDIMENSION total_iMCU_rows;	/* # of iMCU rows in image */
+  /* The codec's input and output progress is measured in units of "iMCU"
+   * (interleaved MCU) rows.  These are the same as MCU rows in fully
+   * interleaved JPEG scans, but are used whether the scan is interleaved
+   * or not.  We define an iMCU row as v_samp_factor data_unit rows of each
+   * component.  Therefore, the codec output contains
+   * v_samp_factor*codec_data_unit sample rows of a component per iMCU row.
+   */
+
+  JSAMPLE * sample_range_limit; /* table for fast range-limiting */
+
+  /*
+   * These fields are valid during any one scan.
+   * They describe the components and MCUs actually appearing in the scan.
+   * Note that the decompressor output side must not use these fields.
+   */
+  int comps_in_scan;		/* # of JPEG components in this scan */
+  jpeg_component_info * cur_comp_info[MAX_COMPS_IN_SCAN];
+  /* *cur_comp_info[i] describes component that appears i'th in SOS */
+
+  JDIMENSION MCUs_per_row;	/* # of MCUs across the image */
+  JDIMENSION MCU_rows_in_scan;	/* # of MCU rows in the image */
+
+  int data_units_in_MCU;	/* # of data _units per MCU */
+  int MCU_membership[D_MAX_DATA_UNITS_IN_MCU];
+  /* MCU_membership[i] is index in cur_comp_info of component owning */
+  /* i'th data unit in an MCU */
+
+  int Ss, Se, Ah, Al;		/* progressive/lossless JPEG parms for scan */
+
+  /* This field is shared between entropy decoder and marker parser.
+   * It is either zero or the code of a JPEG marker that has been
+   * read from the data source, but has not yet been processed.
+   */
+  int unread_marker;
+
+  /*
+   * Links to decompression subobjects (methods, private variables of modules)
+   */
+  struct jpeg_decomp_master * master;
+  struct jpeg_d_main_controller * main;
+  struct jpeg_d_codec * codec;
+  struct jpeg_d_post_controller * post;
+  struct jpeg_input_controller * inputctl;
+  struct jpeg_marker_reader * marker;
+  struct jpeg_upsampler * upsample;
+  struct jpeg_color_deconverter * cconvert;
+  struct jpeg_color_quantizer * cquantize;
+};
+
+
+/* "Object" declarations for JPEG modules that may be supplied or called
+ * directly by the surrounding application.
+ * As with all objects in the JPEG library, these structs only define the
+ * publicly visible methods and state variables of a module.  Additional
+ * private fields may exist after the public ones.
+ */
+
+
+/* Error handler object */
+
+struct jpeg_error_mgr {
+  /* Error exit handler: does not return to caller */
+  JMETHOD(void, error_exit, (j_common_ptr cinfo));
+  /* Conditionally emit a trace or warning message */
+  JMETHOD(void, emit_message, (j_common_ptr cinfo, int msg_level));
+  /* Routine that actually outputs a trace or error message */
+  JMETHOD(void, output_message, (j_common_ptr cinfo));
+  /* Format a message string for the most recent JPEG error or message */
+  JMETHOD(void, format_message, (j_common_ptr cinfo, char * buffer));
+#define JMSG_LENGTH_MAX  200	/* recommended size of format_message buffer */
+  /* Reset error state variables at start of a new image */
+  JMETHOD(void, reset_error_mgr, (j_common_ptr cinfo));
+
+  /* The message ID code and any parameters are saved here.
+   * A message can have one string parameter or up to 8 int parameters.
+   */
+  int msg_code;
+#define JMSG_STR_PARM_MAX  80
+  union {
+    int i[8];
+    char s[JMSG_STR_PARM_MAX];
+  } msg_parm;
+
+  /* Standard state variables for error facility */
+
+  int trace_level;		/* max msg_level that will be displayed */
+
+  /* For recoverable corrupt-data errors, we emit a warning message,
+   * but keep going unless emit_message chooses to abort.  emit_message
+   * should count warnings in num_warnings.  The surrounding application
+   * can check for bad data by seeing if num_warnings is nonzero at the
+   * end of processing.
+   */
+  long num_warnings;		/* number of corrupt-data warnings */
+
+  /* These fields point to the table(s) of error message strings.
+   * An application can change the table pointer to switch to a different
+   * message list (typically, to change the language in which errors are
+   * reported).  Some applications may wish to add additional error codes
+   * that will be handled by the JPEG library error mechanism; the second
+   * table pointer is used for this purpose.
+   *
+   * First table includes all errors generated by JPEG library itself.
+   * Error code 0 is reserved for a "no such error string" message.
+   */
+  const char * const * jpeg_message_table; /* Library errors */
+  int last_jpeg_message;    /* Table contains strings 0..last_jpeg_message */
+  /* Second table can be added by application (see cjpeg/djpeg for example).
+   * It contains strings numbered first_addon_message..last_addon_message.
+   */
+  const char * const * addon_message_table; /* Non-library errors */
+  int first_addon_message;	/* code for first string in addon table */
+  int last_addon_message;	/* code for last string in addon table */
+};
+
+
+/* Progress monitor object */
+
+struct jpeg_progress_mgr {
+  JMETHOD(void, progress_monitor, (j_common_ptr cinfo));
+
+  long pass_counter;		/* work units completed in this pass */
+  long pass_limit;		/* total number of work units in this pass */
+  int completed_passes;		/* passes completed so far */
+  int total_passes;		/* total number of passes expected */
+};
+
+
+/* Data destination object for compression */
+
+struct jpeg_destination_mgr {
+  JOCTET * next_output_byte;	/* => next byte to write in buffer */
+  size_t free_in_buffer;	/* # of byte spaces remaining in buffer */
+
+  JMETHOD(void, init_destination, (j_compress_ptr cinfo));
+  JMETHOD(boolean, empty_output_buffer, (j_compress_ptr cinfo));
+  JMETHOD(void, term_destination, (j_compress_ptr cinfo));
+};
+
+
+/* Data source object for decompression */
+
+struct jpeg_source_mgr {
+  const JOCTET * next_input_byte; /* => next byte to read from buffer */
+  size_t bytes_in_buffer;	/* # of bytes remaining in buffer */
+
+  JMETHOD(void, init_source, (j_decompress_ptr cinfo));
+  JMETHOD(boolean, fill_input_buffer, (j_decompress_ptr cinfo));
+  JMETHOD(void, skip_input_data, (j_decompress_ptr cinfo, long num_bytes));
+  JMETHOD(boolean, resync_to_restart, (j_decompress_ptr cinfo, int desired));
+  JMETHOD(void, term_source, (j_decompress_ptr cinfo));
+};
+
+
+/* Memory manager object.
+ * Allocates "small" objects (a few K total), "large" objects (tens of K),
+ * and "really big" objects (virtual arrays with backing store if needed).
+ * The memory manager does not allow individual objects to be freed; rather,
+ * each created object is assigned to a pool, and whole pools can be freed
+ * at once.  This is faster and more convenient than remembering exactly what
+ * to free, especially where malloc()/free() are not too speedy.
+ * NB: alloc routines never return NULL.  They exit to error_exit if not
+ * successful.
+ */
+
+#define JPOOL_PERMANENT	0	/* lasts until master record is destroyed */
+#define JPOOL_IMAGE	1	/* lasts until done with image/datastream */
+#define JPOOL_NUMPOOLS	2
+
+typedef struct jvirt_sarray_control * jvirt_sarray_ptr;
+typedef struct jvirt_barray_control * jvirt_barray_ptr;
+
+
+#ifdef C_LOSSLESS_SUPPORTED
+#define NEED_DARRAY
+#else
+#ifdef D_LOSSLESS_SUPPORTED
+#define NEED_DARRAY
+#endif
+#endif
+
+struct jpeg_memory_mgr {
+  /* Method pointers */
+  JMETHOD(void *, alloc_small, (j_common_ptr cinfo, int pool_id,
+				size_t sizeofobject));
+  JMETHOD(void FAR *, alloc_large, (j_common_ptr cinfo, int pool_id,
+				     size_t sizeofobject));
+  JMETHOD(JSAMPARRAY, alloc_sarray, (j_common_ptr cinfo, int pool_id,
+				     JDIMENSION samplesperrow,
+				     JDIMENSION numrows));
+  JMETHOD(JBLOCKARRAY, alloc_barray, (j_common_ptr cinfo, int pool_id,
+				      JDIMENSION blocksperrow,
+				      JDIMENSION numrows));
+#ifdef NEED_DARRAY
+  JMETHOD(JDIFFARRAY, alloc_darray, (j_common_ptr cinfo, int pool_id,
+				     JDIMENSION diffsperrow,
+				     JDIMENSION numrows));
+#endif
+  JMETHOD(jvirt_sarray_ptr, request_virt_sarray, (j_common_ptr cinfo,
+						  int pool_id,
+						  boolean pre_zero,
+						  JDIMENSION samplesperrow,
+						  JDIMENSION numrows,
+						  JDIMENSION maxaccess));
+  JMETHOD(jvirt_barray_ptr, request_virt_barray, (j_common_ptr cinfo,
+						  int pool_id,
+						  boolean pre_zero,
+						  JDIMENSION blocksperrow,
+						  JDIMENSION numrows,
+						  JDIMENSION maxaccess));
+  JMETHOD(void, realize_virt_arrays, (j_common_ptr cinfo));
+  JMETHOD(JSAMPARRAY, access_virt_sarray, (j_common_ptr cinfo,
+					   jvirt_sarray_ptr ptr,
+					   JDIMENSION start_row,
+					   JDIMENSION num_rows,
+					   boolean writable));
+  JMETHOD(JBLOCKARRAY, access_virt_barray, (j_common_ptr cinfo,
+					    jvirt_barray_ptr ptr,
+					    JDIMENSION start_row,
+					    JDIMENSION num_rows,
+					    boolean writable));
+  JMETHOD(void, free_pool, (j_common_ptr cinfo, int pool_id));
+  JMETHOD(void, self_destruct, (j_common_ptr cinfo));
+
+  /* Limit on memory allocation for this JPEG object.  (Note that this is
+   * merely advisory, not a guaranteed maximum; it only affects the space
+   * used for virtual-array buffers.)  May be changed by outer application
+   * after creating the JPEG object.
+   */
+  long max_memory_to_use;
+
+  /* Maximum allocation request accepted by alloc_large. */
+  long max_alloc_chunk;
+};
+
+
+/* Routine signature for application-supplied marker processing methods.
+ * Need not pass marker code since it is stored in cinfo->unread_marker.
+ */
+typedef JMETHOD(boolean, jpeg_marker_parser_method, (j_decompress_ptr cinfo));
+
+
+/* Declarations for routines called by application.
+ * The JPP macro hides prototype parameters from compilers that can't cope.
+ * Note JPP requires double parentheses.
+ */
+
+#ifdef HAVE_PROTOTYPES
+#define JPP(arglist)	arglist
+#else
+#define JPP(arglist)	()
+#endif
+
+
+/* Short forms of external names for systems with brain-damaged linkers.
+ * We shorten external names to be unique in the first six letters, which
+ * is good enough for all known systems.
+ * (If your compiler itself needs names to be unique in less than 15
+ * characters, you are out of luck.  Get a better compiler.)
+ */
+
+#ifdef NEED_SHORT_EXTERNAL_NAMES
+#define jpeg_std_error		jStdError
+#define jpeg_CreateCompress	jCreaCompress
+#define jpeg_CreateDecompress	jCreaDecompress
+#define jpeg_destroy_compress	jDestCompress
+#define jpeg_destroy_decompress	jDestDecompress
+#define jpeg_stdio_dest		jStdDest
+#define jpeg_stdio_src		jStdSrc
+#define jpeg_set_defaults	jSetDefaults
+#define jpeg_set_colorspace	jSetColorspace
+#define jpeg_default_colorspace	jDefColorspace
+#define jpeg_set_quality	jSetQuality
+#define jpeg_set_linear_quality	jSetLQuality
+#define jpeg_add_quant_table	jAddQuantTable
+#define jpeg_quality_scaling	jQualityScaling
+#define jpeg_simple_lossless	jSimLossless
+#define jpeg_simple_progression	jSimProgress
+#define jpeg_suppress_tables	jSuppressTables
+#define jpeg_alloc_quant_table	jAlcQTable
+#define jpeg_alloc_huff_table	jAlcHTable
+#define jpeg_start_compress	jStrtCompress
+#define jpeg_write_scanlines	jWrtScanlines
+#define jpeg_finish_compress	jFinCompress
+#define jpeg_write_raw_data	jWrtRawData
+#define jpeg_write_marker	jWrtMarker
+#define jpeg_write_m_header	jWrtMHeader
+#define jpeg_write_m_byte	jWrtMByte
+#define jpeg_write_tables	jWrtTables
+#define jpeg_read_header	jReadHeader
+#define jpeg_start_decompress	jStrtDecompress
+#define jpeg_read_scanlines	jReadScanlines
+#define jpeg_finish_decompress	jFinDecompress
+#define jpeg_read_raw_data	jReadRawData
+#define jpeg_has_multiple_scans	jHasMultScn
+#define jpeg_start_output	jStrtOutput
+#define jpeg_finish_output	jFinOutput
+#define jpeg_input_complete	jInComplete
+#define jpeg_new_colormap	jNewCMap
+#define jpeg_consume_input	jConsumeInput
+#define jpeg_calc_output_dimensions	jCalcDimensions
+#define jpeg_save_markers	jSaveMarkers
+#define jpeg_set_marker_processor	jSetMarker
+#define jpeg_read_coefficients	jReadCoefs
+#define jpeg_write_coefficients	jWrtCoefs
+#define jpeg_copy_critical_parameters	jCopyCrit
+#define jpeg_abort_compress	jAbrtCompress
+#define jpeg_abort_decompress	jAbrtDecompress
+#define jpeg_abort		jAbort
+#define jpeg_destroy		jDestroy
+#define jpeg_resync_to_restart	jResyncRestart
+#endif /* NEED_SHORT_EXTERNAL_NAMES */
+
+
+/* Default error-management setup */
+EXTERN(struct jpeg_error_mgr *) jpeg_std_error
+	JPP((struct jpeg_error_mgr * err));
+
+/* Initialization of JPEG compression objects.
+ * jpeg_create_compress() and jpeg_create_decompress() are the exported
+ * names that applications should call.  These expand to calls on
+ * jpeg_CreateCompress and jpeg_CreateDecompress with additional information
+ * passed for version mismatch checking.
+ * NB: you must set up the error-manager BEFORE calling jpeg_create_xxx.
+ */
+#define jpeg_create_compress(cinfo) \
+    jpeg_CreateCompress((cinfo), JPEG_LIB_VERSION, \
+			(size_t) sizeof(struct jpeg_compress_struct))
+#define jpeg_create_decompress(cinfo) \
+    jpeg_CreateDecompress((cinfo), JPEG_LIB_VERSION, \
+			  (size_t) sizeof(struct jpeg_decompress_struct))
+EXTERN(void) jpeg_CreateCompress JPP((j_compress_ptr cinfo,
+				      int version, size_t structsize));
+EXTERN(void) jpeg_CreateDecompress JPP((j_decompress_ptr cinfo,
+					int version, size_t structsize));
+/* Destruction of JPEG compression objects */
+EXTERN(void) jpeg_destroy_compress JPP((j_compress_ptr cinfo));
+EXTERN(void) jpeg_destroy_decompress JPP((j_decompress_ptr cinfo));
+
+/* Standard data source and destination managers: stdio streams. */
+/* Caller is responsible for opening the file before and closing after. */
+EXTERN(void) jpeg_stdio_dest JPP((j_compress_ptr cinfo, FILE * outfile));
+EXTERN(void) jpeg_stdio_src JPP((j_decompress_ptr cinfo, FILE * infile));
+
+/* Default parameter setup for compression */
+EXTERN(void) jpeg_set_defaults JPP((j_compress_ptr cinfo));
+/* Compression parameter setup aids */
+EXTERN(void) jpeg_set_colorspace JPP((j_compress_ptr cinfo,
+				      J_COLOR_SPACE colorspace));
+EXTERN(void) jpeg_default_colorspace JPP((j_compress_ptr cinfo));
+EXTERN(void) jpeg_set_quality JPP((j_compress_ptr cinfo, int quality,
+				   boolean force_baseline));
+EXTERN(void) jpeg_set_linear_quality JPP((j_compress_ptr cinfo,
+					  int scale_factor,
+					  boolean force_baseline));
+EXTERN(void) jpeg_add_quant_table JPP((j_compress_ptr cinfo, int which_tbl,
+				       const unsigned int *basic_table,
+				       int scale_factor,
+				       boolean force_baseline));
+EXTERN(int) jpeg_quality_scaling JPP((int quality));
+EXTERN(void) jpeg_simple_lossless JPP((j_compress_ptr cinfo,
+				       int predictor, int point_transform));
+EXTERN(void) jpeg_simple_progression JPP((j_compress_ptr cinfo));
+EXTERN(void) jpeg_suppress_tables JPP((j_compress_ptr cinfo,
+				       boolean suppress));
+EXTERN(JQUANT_TBL *) jpeg_alloc_quant_table JPP((j_common_ptr cinfo));
+EXTERN(JHUFF_TBL *) jpeg_alloc_huff_table JPP((j_common_ptr cinfo));
+
+/* Main entry points for compression */
+EXTERN(void) jpeg_start_compress JPP((j_compress_ptr cinfo,
+				      boolean write_all_tables));
+EXTERN(JDIMENSION) jpeg_write_scanlines JPP((j_compress_ptr cinfo,
+					     JSAMPARRAY scanlines,
+					     JDIMENSION num_lines));
+EXTERN(void) jpeg_finish_compress JPP((j_compress_ptr cinfo));
+
+/* Replaces jpeg_write_scanlines when writing raw downsampled data. */
+EXTERN(JDIMENSION) jpeg_write_raw_data JPP((j_compress_ptr cinfo,
+					    JSAMPIMAGE data,
+					    JDIMENSION num_lines));
+
+/* Write a special marker.  See libjpeg.doc concerning safe usage. */
+EXTERN(void) jpeg_write_marker
+	JPP((j_compress_ptr cinfo, int marker,
+	     const JOCTET * dataptr, unsigned int datalen));
+/* Same, but piecemeal. */
+EXTERN(void) jpeg_write_m_header
+	JPP((j_compress_ptr cinfo, int marker, unsigned int datalen));
+EXTERN(void) jpeg_write_m_byte
+	JPP((j_compress_ptr cinfo, int val));
+
+/* Alternate compression function: just write an abbreviated table file */
+EXTERN(void) jpeg_write_tables JPP((j_compress_ptr cinfo));
+
+/* Decompression startup: read start of JPEG datastream to see what's there */
+EXTERN(int) jpeg_read_header JPP((j_decompress_ptr cinfo,
+				  boolean require_image));
+/* Return value is one of: */
+#define JPEG_SUSPENDED		0 /* Suspended due to lack of input data */
+#define JPEG_HEADER_OK		1 /* Found valid image datastream */
+#define JPEG_HEADER_TABLES_ONLY	2 /* Found valid table-specs-only datastream */
+/* If you pass require_image = TRUE (normal case), you need not check for
+ * a TABLES_ONLY return code; an abbreviated file will cause an error exit.
+ * JPEG_SUSPENDED is only possible if you use a data source module that can
+ * give a suspension return (the stdio source module doesn't).
+ */
+
+/* Main entry points for decompression */
+EXTERN(boolean) jpeg_start_decompress JPP((j_decompress_ptr cinfo));
+EXTERN(JDIMENSION) jpeg_read_scanlines JPP((j_decompress_ptr cinfo,
+					    JSAMPARRAY scanlines,
+					    JDIMENSION max_lines));
+EXTERN(boolean) jpeg_finish_decompress JPP((j_decompress_ptr cinfo));
+
+/* Replaces jpeg_read_scanlines when reading raw downsampled data. */
+EXTERN(JDIMENSION) jpeg_read_raw_data JPP((j_decompress_ptr cinfo,
+					   JSAMPIMAGE data,
+					   JDIMENSION max_lines));
+
+/* Additional entry points for buffered-image mode. */
+EXTERN(boolean) jpeg_has_multiple_scans JPP((j_decompress_ptr cinfo));
+EXTERN(boolean) jpeg_start_output JPP((j_decompress_ptr cinfo,
+				       int scan_number));
+EXTERN(boolean) jpeg_finish_output JPP((j_decompress_ptr cinfo));
+EXTERN(boolean) jpeg_input_complete JPP((j_decompress_ptr cinfo));
+EXTERN(void) jpeg_new_colormap JPP((j_decompress_ptr cinfo));
+EXTERN(int) jpeg_consume_input JPP((j_decompress_ptr cinfo));
+/* Return value is one of: */
+/* #define JPEG_SUSPENDED	0    Suspended due to lack of input data */
+#define JPEG_REACHED_SOS	1 /* Reached start of new scan */
+#define JPEG_REACHED_EOI	2 /* Reached end of image */
+#define JPEG_ROW_COMPLETED	3 /* Completed one iMCU row */
+#define JPEG_SCAN_COMPLETED	4 /* Completed last iMCU row of a scan */
+
+/* Precalculate output dimensions for current decompression parameters. */
+EXTERN(void) jpeg_calc_output_dimensions JPP((j_decompress_ptr cinfo));
+
+/* Control saving of COM and APPn markers into marker_list. */
+EXTERN(void) jpeg_save_markers
+	JPP((j_decompress_ptr cinfo, int marker_code,
+	     unsigned int length_limit));
+
+/* Install a special processing method for COM or APPn markers. */
+EXTERN(void) jpeg_set_marker_processor
+	JPP((j_decompress_ptr cinfo, int marker_code,
+	     jpeg_marker_parser_method routine));
+
+/* Read or write raw DCT coefficients --- useful for lossless transcoding. */
+EXTERN(jvirt_barray_ptr *) jpeg_read_coefficients JPP((j_decompress_ptr cinfo));
+EXTERN(void) jpeg_write_coefficients JPP((j_compress_ptr cinfo,
+					  jvirt_barray_ptr * coef_arrays));
+EXTERN(void) jpeg_copy_critical_parameters JPP((j_decompress_ptr srcinfo,
+						j_compress_ptr dstinfo));
+
+/* If you choose to abort compression or decompression before completing
+ * jpeg_finish_(de)compress, then you need to clean up to release memory,
+ * temporary files, etc.  You can just call jpeg_destroy_(de)compress
+ * if you're done with the JPEG object, but if you want to clean it up and
+ * reuse it, call this:
+ */
+EXTERN(void) jpeg_abort_compress JPP((j_compress_ptr cinfo));
+EXTERN(void) jpeg_abort_decompress JPP((j_decompress_ptr cinfo));
+
+/* Generic versions of jpeg_abort and jpeg_destroy that work on either
+ * flavor of JPEG object.  These may be more convenient in some places.
+ */
+EXTERN(void) jpeg_abort JPP((j_common_ptr cinfo));
+EXTERN(void) jpeg_destroy JPP((j_common_ptr cinfo));
+
+/* Default restart-marker-resync procedure for use by data source modules */
+EXTERN(boolean) jpeg_resync_to_restart JPP((j_decompress_ptr cinfo,
+					    int desired));
+
+
+/* These marker codes are exported since applications and data source modules
+ * are likely to want to use them.
+ */
+
+#define JPEG_RST0	0xD0	/* RST0 marker code */
+#define JPEG_EOI	0xD9	/* EOI marker code */
+#define JPEG_APP0	0xE0	/* APP0 marker code */
+#define JPEG_COM	0xFE	/* COM marker code */
+
+
+/* If we have a brain-damaged compiler that emits warnings (or worse, errors)
+ * for structure definitions that are never filled in, keep it quiet by
+ * supplying dummy definitions for the various substructures.
+ */
+
+#ifdef INCOMPLETE_TYPES_BROKEN
+#ifndef JPEG_INTERNALS		/* will be defined in jpegint.h */
+struct jvirt_sarray_control { long dummy; };
+struct jvirt_barray_control { long dummy; };
+struct jpeg_comp_master { long dummy; };
+struct jpeg_c_main_controller { long dummy; };
+struct jpeg_c_prep_controller { long dummy; };
+struct jpeg_c_coef_controller { long dummy; };
+struct jpeg_marker_writer { long dummy; };
+struct jpeg_color_converter { long dummy; };
+struct jpeg_downsampler { long dummy; };
+struct jpeg_forward_dct { long dummy; };
+struct jpeg_entropy_encoder { long dummy; };
+struct jpeg_decomp_master { long dummy; };
+struct jpeg_d_main_controller { long dummy; };
+struct jpeg_d_coef_controller { long dummy; };
+struct jpeg_d_post_controller { long dummy; };
+struct jpeg_input_controller { long dummy; };
+struct jpeg_marker_reader { long dummy; };
+struct jpeg_entropy_decoder { long dummy; };
+struct jpeg_inverse_dct { long dummy; };
+struct jpeg_upsampler { long dummy; };
+struct jpeg_color_deconverter { long dummy; };
+struct jpeg_color_quantizer { long dummy; };
+#endif /* JPEG_INTERNALS */
+#endif /* INCOMPLETE_TYPES_BROKEN */
+
+
+/*
+ * The JPEG library modules define JPEG_INTERNALS before including this file.
+ * The internal structure declarations are read only when that is true.
+ * Applications using the library should not include jpegint.h, but may wish
+ * to include jerror.h.
+ */
+
+#ifdef JPEG_INTERNALS
+#include "jpegint.h"		/* fetch private declarations */
+#include "jerror.h"		/* fetch error codes too */
+#endif
+
+#endif /* JPEGLIB_H */
diff --git a/uppsrc/plugin/jpg/lib/jpegtran.c b/uppsrc/plugin/jpg/lib/jpegtran.c
new file mode 100644
index 000000000..20ef111b3
--- /dev/null
+++ b/uppsrc/plugin/jpg/lib/jpegtran.c
@@ -0,0 +1,504 @@
+/*
+ * jpegtran.c
+ *
+ * Copyright (C) 1995-1997, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains a command-line user interface for JPEG transcoding.
+ * It is very similar to cjpeg.c, but provides lossless transcoding between
+ * different JPEG file formats.  It also provides some lossless and sort-of-
+ * lossless transformations of JPEG data.
+ */
+
+#include "cdjpeg.h"		/* Common decls for cjpeg/djpeg applications */
+#include "transupp.h"		/* Support routines for jpegtran */
+#include "jversion.h"		/* for version message */
+
+#ifdef USE_CCOMMAND		/* command-line reader for Macintosh */
+#ifdef __MWERKS__
+#include <SIOUX.h>              /* Metrowerks needs this */
+#include <console.h>		/* ... and this */
+#endif
+#ifdef THINK_C
+#include <console.h>		/* Think declares it here */
+#endif
+#endif
+
+
+/*
+ * Argument-parsing code.
+ * The switch parser is designed to be useful with DOS-style command line
+ * syntax, ie, intermixed switches and file names, where only the switches
+ * to the left of a given file name affect processing of that file.
+ * The main program in this file doesn't actually use this capability...
+ */
+
+
+static const char * progname;	/* program name for error messages */
+static char * outfilename;	/* for -outfile switch */
+static JCOPY_OPTION copyoption;	/* -copy switch */
+static jpeg_transform_info transformoption; /* image transformation options */
+
+
+LOCAL(void)
+usage (void)
+/* complain about bad command line */
+{
+  fprintf(stderr, "usage: %s [switches] ", progname);
+#ifdef TWO_FILE_COMMANDLINE
+  fprintf(stderr, "inputfile outputfile\n");
+#else
+  fprintf(stderr, "[inputfile]\n");
+#endif
+
+  fprintf(stderr, "Switches (names may be abbreviated):\n");
+  fprintf(stderr, "  -copy none     Copy no extra markers from source file\n");
+  fprintf(stderr, "  -copy comments Copy only comment markers (default)\n");
+  fprintf(stderr, "  -copy all      Copy all extra markers\n");
+#ifdef ENTROPY_OPT_SUPPORTED
+  fprintf(stderr, "  -optimize      Optimize Huffman table (smaller file, but slow compression)\n");
+#endif
+#ifdef C_PROGRESSIVE_SUPPORTED
+  fprintf(stderr, "  -progressive   Create progressive JPEG file\n");
+#endif
+#if TRANSFORMS_SUPPORTED
+  fprintf(stderr, "Switches for modifying the image:\n");
+  fprintf(stderr, "  -grayscale     Reduce to grayscale (omit color data)\n");
+  fprintf(stderr, "  -flip [horizontal|vertical]  Mirror image (left-right or top-bottom)\n");
+  fprintf(stderr, "  -rotate [90|180|270]         Rotate image (degrees clockwise)\n");
+  fprintf(stderr, "  -transpose     Transpose image\n");
+  fprintf(stderr, "  -transverse    Transverse transpose image\n");
+  fprintf(stderr, "  -trim          Drop non-transformable edge blocks\n");
+#endif /* TRANSFORMS_SUPPORTED */
+  fprintf(stderr, "Switches for advanced users:\n");
+  fprintf(stderr, "  -restart N     Set restart interval in rows, or in blocks with B\n");
+  fprintf(stderr, "  -maxmemory N   Maximum memory to use (in kbytes)\n");
+  fprintf(stderr, "  -outfile name  Specify name for output file\n");
+  fprintf(stderr, "  -verbose  or  -debug   Emit debug output\n");
+  fprintf(stderr, "Switches for wizards:\n");
+#ifdef C_ARITH_CODING_SUPPORTED
+  fprintf(stderr, "  -arithmetic    Use arithmetic coding\n");
+#endif
+#ifdef C_MULTISCAN_FILES_SUPPORTED
+  fprintf(stderr, "  -scans file    Create multi-scan JPEG per script file\n");
+#endif
+  exit(EXIT_FAILURE);
+}
+
+
+LOCAL(void)
+select_transform (JXFORM_CODE transform)
+/* Silly little routine to detect multiple transform options,
+ * which we can't handle.
+ */
+{
+#if TRANSFORMS_SUPPORTED
+  if (transformoption.transform == JXFORM_NONE ||
+      transformoption.transform == transform) {
+    transformoption.transform = transform;
+  } else {
+    fprintf(stderr, "%s: can only do one image transformation at a time\n",
+	    progname);
+    usage();
+  }
+#else
+  fprintf(stderr, "%s: sorry, image transformation was not compiled\n",
+	  progname);
+  exit(EXIT_FAILURE);
+#endif
+}
+
+
+LOCAL(int)
+parse_switches (j_compress_ptr cinfo, int argc, char **argv,
+		int last_file_arg_seen, boolean for_real)
+/* Parse optional switches.
+ * Returns argv[] index of first file-name argument (== argc if none).
+ * Any file names with indexes <= last_file_arg_seen are ignored;
+ * they have presumably been processed in a previous iteration.
+ * (Pass 0 for last_file_arg_seen on the first or only iteration.)
+ * for_real is FALSE on the first (dummy) pass; we may skip any expensive
+ * processing.
+ */
+{
+  int argn;
+  char * arg;
+  boolean simple_progressive;
+  char * scansarg = NULL;	/* saves -scans parm if any */
+
+  /* Set up default JPEG parameters. */
+  simple_progressive = FALSE;
+  outfilename = NULL;
+  copyoption = JCOPYOPT_DEFAULT;
+  transformoption.transform = JXFORM_NONE;
+  transformoption.trim = FALSE;
+  transformoption.force_grayscale = FALSE;
+  cinfo->err->trace_level = 0;
+
+  /* Scan command line options, adjust parameters */
+
+  for (argn = 1; argn < argc; argn++) {
+    arg = argv[argn];
+    if (*arg != '-') {
+      /* Not a switch, must be a file name argument */
+      if (argn <= last_file_arg_seen) {
+	outfilename = NULL;	/* -outfile applies to just one input file */
+	continue;		/* ignore this name if previously processed */
+      }
+      break;			/* else done parsing switches */
+    }
+    arg++;			/* advance past switch marker character */
+
+    if (keymatch(arg, "arithmetic", 1)) {
+      /* Use arithmetic coding. */
+#ifdef C_ARITH_CODING_SUPPORTED
+      cinfo->arith_code = TRUE;
+#else
+      fprintf(stderr, "%s: sorry, arithmetic coding not supported\n",
+	      progname);
+      exit(EXIT_FAILURE);
+#endif
+
+    } else if (keymatch(arg, "copy", 1)) {
+      /* Select which extra markers to copy. */
+      if (++argn >= argc)	/* advance to next argument */
+	usage();
+      if (keymatch(argv[argn], "none", 1)) {
+	copyoption = JCOPYOPT_NONE;
+      } else if (keymatch(argv[argn], "comments", 1)) {
+	copyoption = JCOPYOPT_COMMENTS;
+      } else if (keymatch(argv[argn], "all", 1)) {
+	copyoption = JCOPYOPT_ALL;
+      } else
+	usage();
+
+    } else if (keymatch(arg, "debug", 1) || keymatch(arg, "verbose", 1)) {
+      /* Enable debug printouts. */
+      /* On first -d, print version identification */
+      static boolean printed_version = FALSE;
+
+      if (! printed_version) {
+	fprintf(stderr, "Independent JPEG Group's JPEGTRAN, version %s\n%s\n",
+		JVERSION, JCOPYRIGHT);
+	printed_version = TRUE;
+      }
+      cinfo->err->trace_level++;
+
+    } else if (keymatch(arg, "flip", 1)) {
+      /* Mirror left-right or top-bottom. */
+      if (++argn >= argc)	/* advance to next argument */
+	usage();
+      if (keymatch(argv[argn], "horizontal", 1))
+	select_transform(JXFORM_FLIP_H);
+      else if (keymatch(argv[argn], "vertical", 1))
+	select_transform(JXFORM_FLIP_V);
+      else
+	usage();
+
+    } else if (keymatch(arg, "grayscale", 1) || keymatch(arg, "greyscale",1)) {
+      /* Force to grayscale. */
+#if TRANSFORMS_SUPPORTED
+      transformoption.force_grayscale = TRUE;
+#else
+      select_transform(JXFORM_NONE);	/* force an error */
+#endif
+
+    } else if (keymatch(arg, "maxmemory", 3)) {
+      /* Maximum memory in Kb (or Mb with 'm'). */
+      long lval;
+      char ch = 'x';
+
+      if (++argn >= argc)	/* advance to next argument */
+	usage();
+      if (sscanf(argv[argn], "%ld%c", &lval, &ch) < 1)
+	usage();
+      if (ch == 'm' || ch == 'M')
+	lval *= 1000L;
+      cinfo->mem->max_memory_to_use = lval * 1000L;
+
+    } else if (keymatch(arg, "optimize", 1) || keymatch(arg, "optimise", 1)) {
+      /* Enable entropy parm optimization. */
+#ifdef ENTROPY_OPT_SUPPORTED
+      cinfo->optimize_coding = TRUE;
+#else
+      fprintf(stderr, "%s: sorry, entropy optimization was not compiled\n",
+	      progname);
+      exit(EXIT_FAILURE);
+#endif
+
+    } else if (keymatch(arg, "outfile", 4)) {
+      /* Set output file name. */
+      if (++argn >= argc)	/* advance to next argument */
+	usage();
+      outfilename = argv[argn];	/* save it away for later use */
+
+    } else if (keymatch(arg, "progressive", 1)) {
+      /* Select simple progressive mode. */
+#ifdef C_PROGRESSIVE_SUPPORTED
+      simple_progressive = TRUE;
+      /* We must postpone execution until num_components is known. */
+#else
+      fprintf(stderr, "%s: sorry, progressive output was not compiled\n",
+	      progname);
+      exit(EXIT_FAILURE);
+#endif
+
+    } else if (keymatch(arg, "restart", 1)) {
+      /* Restart interval in MCU rows (or in MCUs with 'b'). */
+      long lval;
+      char ch = 'x';
+
+      if (++argn >= argc)	/* advance to next argument */
+	usage();
+      if (sscanf(argv[argn], "%ld%c", &lval, &ch) < 1)
+	usage();
+      if (lval < 0 || lval > 65535L)
+	usage();
+      if (ch == 'b' || ch == 'B') {
+	cinfo->restart_interval = (unsigned int) lval;
+	cinfo->restart_in_rows = 0; /* else prior '-restart n' overrides me */
+      } else {
+	cinfo->restart_in_rows = (int) lval;
+	/* restart_interval will be computed during startup */
+      }
+
+    } else if (keymatch(arg, "rotate", 2)) {
+      /* Rotate 90, 180, or 270 degrees (measured clockwise). */
+      if (++argn >= argc)	/* advance to next argument */
+	usage();
+      if (keymatch(argv[argn], "90", 2))
+	select_transform(JXFORM_ROT_90);
+      else if (keymatch(argv[argn], "180", 3))
+	select_transform(JXFORM_ROT_180);
+      else if (keymatch(argv[argn], "270", 3))
+	select_transform(JXFORM_ROT_270);
+      else
+	usage();
+
+    } else if (keymatch(arg, "scans", 1)) {
+      /* Set scan script. */
+#ifdef C_MULTISCAN_FILES_SUPPORTED
+      if (++argn >= argc)	/* advance to next argument */
+	usage();
+      scansarg = argv[argn];
+      /* We must postpone reading the file in case -progressive appears. */
+#else
+      fprintf(stderr, "%s: sorry, multi-scan output was not compiled\n",
+	      progname);
+      exit(EXIT_FAILURE);
+#endif
+
+    } else if (keymatch(arg, "transpose", 1)) {
+      /* Transpose (across UL-to-LR axis). */
+      select_transform(JXFORM_TRANSPOSE);
+
+    } else if (keymatch(arg, "transverse", 6)) {
+      /* Transverse transpose (across UR-to-LL axis). */
+      select_transform(JXFORM_TRANSVERSE);
+
+    } else if (keymatch(arg, "trim", 3)) {
+      /* Trim off any partial edge MCUs that the transform can't handle. */
+      transformoption.trim = TRUE;
+
+    } else {
+      usage();			/* bogus switch */
+    }
+  }
+
+  /* Post-switch-scanning cleanup */
+
+  if (for_real) {
+
+#ifdef C_PROGRESSIVE_SUPPORTED
+    if (simple_progressive)	/* process -progressive; -scans can override */
+      jpeg_simple_progression(cinfo);
+#endif
+
+#ifdef C_MULTISCAN_FILES_SUPPORTED
+    if (scansarg != NULL)	/* process -scans if it was present */
+      if (! read_scan_script(cinfo, scansarg))
+	usage();
+#endif
+  }
+
+  return argn;			/* return index of next arg (file name) */
+}
+
+
+/*
+ * The main program.
+ */
+
+int
+main (int argc, char **argv)
+{
+  struct jpeg_decompress_struct srcinfo;
+  struct jpeg_compress_struct dstinfo;
+  struct jpeg_error_mgr jsrcerr, jdsterr;
+#ifdef PROGRESS_REPORT
+  struct cdjpeg_progress_mgr progress;
+#endif
+  jvirt_barray_ptr * src_coef_arrays;
+  jvirt_barray_ptr * dst_coef_arrays;
+  int file_index;
+  FILE * input_file;
+  FILE * output_file;
+
+  /* On Mac, fetch a command line. */
+#ifdef USE_CCOMMAND
+  argc = ccommand(&argv);
+#endif
+
+  progname = argv[0];
+  if (progname == NULL || progname[0] == 0)
+    progname = "jpegtran";	/* in case C library doesn't provide it */
+
+  /* Initialize the JPEG decompression object with default error handling. */
+  srcinfo.err = jpeg_std_error(&jsrcerr);
+  jpeg_create_decompress(&srcinfo);
+  /* Initialize the JPEG compression object with default error handling. */
+  dstinfo.err = jpeg_std_error(&jdsterr);
+  jpeg_create_compress(&dstinfo);
+
+  /* Now safe to enable signal catcher.
+   * Note: we assume only the decompression object will have virtual arrays.
+   */
+#ifdef NEED_SIGNAL_CATCHER
+  enable_signal_catcher((j_common_ptr) &srcinfo);
+#endif
+
+  /* Scan command line to find file names.
+   * It is convenient to use just one switch-parsing routine, but the switch
+   * values read here are mostly ignored; we will rescan the switches after
+   * opening the input file.  Also note that most of the switches affect the
+   * destination JPEG object, so we parse into that and then copy over what
+   * needs to affects the source too.
+   */
+
+  file_index = parse_switches(&dstinfo, argc, argv, 0, FALSE);
+  jsrcerr.trace_level = jdsterr.trace_level;
+  srcinfo.mem->max_memory_to_use = dstinfo.mem->max_memory_to_use;
+
+#ifdef TWO_FILE_COMMANDLINE
+  /* Must have either -outfile switch or explicit output file name */
+  if (outfilename == NULL) {
+    if (file_index != argc-2) {
+      fprintf(stderr, "%s: must name one input and one output file\n",
+	      progname);
+      usage();
+    }
+    outfilename = argv[file_index+1];
+  } else {
+    if (file_index != argc-1) {
+      fprintf(stderr, "%s: must name one input and one output file\n",
+	      progname);
+      usage();
+    }
+  }
+#else
+  /* Unix style: expect zero or one file name */
+  if (file_index < argc-1) {
+    fprintf(stderr, "%s: only one input file\n", progname);
+    usage();
+  }
+#endif /* TWO_FILE_COMMANDLINE */
+
+  /* Open the input file. */
+  if (file_index < argc) {
+    if ((input_file = fopen(argv[file_index], READ_BINARY)) == NULL) {
+      fprintf(stderr, "%s: can't open %s\n", progname, argv[file_index]);
+      exit(EXIT_FAILURE);
+    }
+  } else {
+    /* default input file is stdin */
+    input_file = read_stdin();
+  }
+
+  /* Open the output file. */
+  if (outfilename != NULL) {
+    if ((output_file = fopen(outfilename, WRITE_BINARY)) == NULL) {
+      fprintf(stderr, "%s: can't open %s\n", progname, outfilename);
+      exit(EXIT_FAILURE);
+    }
+  } else {
+    /* default output file is stdout */
+    output_file = write_stdout();
+  }
+
+#ifdef PROGRESS_REPORT
+  start_progress_monitor((j_common_ptr) &dstinfo, &progress);
+#endif
+
+  /* Specify data source for decompression */
+  jpeg_stdio_src(&srcinfo, input_file);
+
+  /* Enable saving of extra markers that we want to copy */
+  jcopy_markers_setup(&srcinfo, copyoption);
+
+  /* Read file header */
+  (void) jpeg_read_header(&srcinfo, TRUE);
+
+  /* Any space needed by a transform option must be requested before
+   * jpeg_read_coefficients so that memory allocation will be done right.
+   */
+#if TRANSFORMS_SUPPORTED
+  jtransform_request_workspace(&srcinfo, &transformoption);
+#endif
+
+  /* Read source file as DCT coefficients */
+  src_coef_arrays = jpeg_read_coefficients(&srcinfo);
+
+  /* Initialize destination compression parameters from source values */
+  jpeg_copy_critical_parameters(&srcinfo, &dstinfo);
+
+  /* Adjust destination parameters if required by transform options;
+   * also find out which set of coefficient arrays will hold the output.
+   */
+#if TRANSFORMS_SUPPORTED
+  dst_coef_arrays = jtransform_adjust_parameters(&srcinfo, &dstinfo,
+						 src_coef_arrays,
+						 &transformoption);
+#else
+  dst_coef_arrays = src_coef_arrays;
+#endif
+
+  /* Adjust default compression parameters by re-parsing the options */
+  file_index = parse_switches(&dstinfo, argc, argv, 0, TRUE);
+
+  /* Specify data destination for compression */
+  jpeg_stdio_dest(&dstinfo, output_file);
+
+  /* Start compressor (note no image data is actually written here) */
+  jpeg_write_coefficients(&dstinfo, dst_coef_arrays);
+
+  /* Copy to the output file any extra markers that we want to preserve */
+  jcopy_markers_execute(&srcinfo, &dstinfo, copyoption);
+
+  /* Execute image transformation, if any */
+#if TRANSFORMS_SUPPORTED
+  jtransform_execute_transformation(&srcinfo, &dstinfo,
+				    src_coef_arrays,
+				    &transformoption);
+#endif
+
+  /* Finish compression and release memory */
+  jpeg_finish_compress(&dstinfo);
+  jpeg_destroy_compress(&dstinfo);
+  (void) jpeg_finish_decompress(&srcinfo);
+  jpeg_destroy_decompress(&srcinfo);
+
+  /* Close files, if we opened them */
+  if (input_file != stdin)
+    fclose(input_file);
+  if (output_file != stdout)
+    fclose(output_file);
+
+#ifdef PROGRESS_REPORT
+  end_progress_monitor((j_common_ptr) &dstinfo);
+#endif
+
+  /* All done. */
+  exit(jsrcerr.num_warnings + jdsterr.num_warnings ?EXIT_WARNING:EXIT_SUCCESS);
+  return 0;			/* suppress no-return-value warnings */
+}
diff --git a/uppsrc/plugin/jpg/lib/jquant1.c b/uppsrc/plugin/jpg/lib/jquant1.c
new file mode 100644
index 000000000..a32629bea
--- /dev/null
+++ b/uppsrc/plugin/jpg/lib/jquant1.c
@@ -0,0 +1,856 @@
+/*
+ * jquant1.c
+ *
+ * Copyright (C) 1991-1996, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains 1-pass color quantization (color mapping) routines.
+ * These routines provide mapping to a fixed color map using equally spaced
+ * color values.  Optional Floyd-Steinberg or ordered dithering is available.
+ */
+
+#define JPEG_INTERNALS
+#include "jinclude.h"
+#include "jpeglib.h"
+
+#ifdef QUANT_1PASS_SUPPORTED
+
+
+/*
+ * The main purpose of 1-pass quantization is to provide a fast, if not very
+ * high quality, colormapped output capability.  A 2-pass quantizer usually
+ * gives better visual quality; however, for quantized grayscale output this
+ * quantizer is perfectly adequate.  Dithering is highly recommended with this
+ * quantizer, though you can turn it off if you really want to.
+ *
+ * In 1-pass quantization the colormap must be chosen in advance of seeing the
+ * image.  We use a map consisting of all combinations of Ncolors[i] color
+ * values for the i'th component.  The Ncolors[] values are chosen so that
+ * their product, the total number of colors, is no more than that requested.
+ * (In most cases, the product will be somewhat less.)
+ *
+ * Since the colormap is orthogonal, the representative value for each color
+ * component can be determined without considering the other components;
+ * then these indexes can be combined into a colormap index by a standard
+ * N-dimensional-array-subscript calculation.  Most of the arithmetic involved
+ * can be precalculated and stored in the lookup table colorindex[].
+ * colorindex[i][j] maps pixel value j in component i to the nearest
+ * representative value (grid plane) for that component; this index is
+ * multiplied by the array stride for component i, so that the
+ * index of the colormap entry closest to a given pixel value is just
+ *    sum( colorindex[component-number][pixel-component-value] )
+ * Aside from being fast, this scheme allows for variable spacing between
+ * representative values with no additional lookup cost.
+ *
+ * If gamma correction has been applied in color conversion, it might be wise
+ * to adjust the color grid spacing so that the representative colors are
+ * equidistant in linear space.  At this writing, gamma correction is not
+ * implemented by jdcolor, so nothing is done here.
+ */
+
+
+/* Declarations for ordered dithering.
+ *
+ * We use a standard 16x16 ordered dither array.  The basic concept of ordered
+ * dithering is described in many references, for instance Dale Schumacher's
+ * chapter II.2 of Graphics Gems II (James Arvo, ed. Academic Press, 1991).
+ * In place of Schumacher's comparisons against a "threshold" value, we add a
+ * "dither" value to the input pixel and then round the result to the nearest
+ * output value.  The dither value is equivalent to (0.5 - threshold) times
+ * the distance between output values.  For ordered dithering, we assume that
+ * the output colors are equally spaced; if not, results will probably be
+ * worse, since the dither may be too much or too little at a given point.
+ *
+ * The normal calculation would be to form pixel value + dither, range-limit
+ * this to 0..MAXJSAMPLE, and then index into the colorindex table as usual.
+ * We can skip the separate range-limiting step by extending the colorindex
+ * table in both directions.
+ */
+
+#define ODITHER_SIZE  16	/* dimension of dither matrix */
+/* NB: if ODITHER_SIZE is not a power of 2, ODITHER_MASK uses will break */
+#define ODITHER_CELLS (ODITHER_SIZE*ODITHER_SIZE)	/* # cells in matrix */
+#define ODITHER_MASK  (ODITHER_SIZE-1) /* mask for wrapping around counters */
+
+typedef int ODITHER_MATRIX[ODITHER_SIZE][ODITHER_SIZE];
+typedef int (*ODITHER_MATRIX_PTR)[ODITHER_SIZE];
+
+static const UINT8 base_dither_matrix[ODITHER_SIZE][ODITHER_SIZE] = {
+  /* Bayer's order-4 dither array.  Generated by the code given in
+   * Stephen Hawley's article "Ordered Dithering" in Graphics Gems I.
+   * The values in this array must range from 0 to ODITHER_CELLS-1.
+   */
+  {   0,192, 48,240, 12,204, 60,252,  3,195, 51,243, 15,207, 63,255 },
+  { 128, 64,176,112,140, 76,188,124,131, 67,179,115,143, 79,191,127 },
+  {  32,224, 16,208, 44,236, 28,220, 35,227, 19,211, 47,239, 31,223 },
+  { 160, 96,144, 80,172,108,156, 92,163, 99,147, 83,175,111,159, 95 },
+  {   8,200, 56,248,  4,196, 52,244, 11,203, 59,251,  7,199, 55,247 },
+  { 136, 72,184,120,132, 68,180,116,139, 75,187,123,135, 71,183,119 },
+  {  40,232, 24,216, 36,228, 20,212, 43,235, 27,219, 39,231, 23,215 },
+  { 168,104,152, 88,164,100,148, 84,171,107,155, 91,167,103,151, 87 },
+  {   2,194, 50,242, 14,206, 62,254,  1,193, 49,241, 13,205, 61,253 },
+  { 130, 66,178,114,142, 78,190,126,129, 65,177,113,141, 77,189,125 },
+  {  34,226, 18,210, 46,238, 30,222, 33,225, 17,209, 45,237, 29,221 },
+  { 162, 98,146, 82,174,110,158, 94,161, 97,145, 81,173,109,157, 93 },
+  {  10,202, 58,250,  6,198, 54,246,  9,201, 57,249,  5,197, 53,245 },
+  { 138, 74,186,122,134, 70,182,118,137, 73,185,121,133, 69,181,117 },
+  {  42,234, 26,218, 38,230, 22,214, 41,233, 25,217, 37,229, 21,213 },
+  { 170,106,154, 90,166,102,150, 86,169,105,153, 89,165,101,149, 85 }
+};
+
+
+/* Declarations for Floyd-Steinberg dithering.
+ *
+ * Errors are accumulated into the array fserrors[], at a resolution of
+ * 1/16th of a pixel count.  The error at a given pixel is propagated
+ * to its not-yet-processed neighbors using the standard F-S fractions,
+ *		...	(here)	7/16
+ *		3/16	5/16	1/16
+ * We work left-to-right on even rows, right-to-left on odd rows.
+ *
+ * We can get away with a single array (holding one row's worth of errors)
+ * by using it to store the current row's errors at pixel columns not yet
+ * processed, but the next row's errors at columns already processed.  We
+ * need only a few extra variables to hold the errors immediately around the
+ * current column.  (If we are lucky, those variables are in registers, but
+ * even if not, they're probably cheaper to access than array elements are.)
+ *
+ * The fserrors[] array is indexed [component#][position].
+ * We provide (#columns + 2) entries per component; the extra entry at each
+ * end saves us from special-casing the first and last pixels.
+ *
+ * Note: on a wide image, we might not have enough room in a PC's near data
+ * segment to hold the error array; so it is allocated with alloc_large.
+ */
+
+#if BITS_IN_JSAMPLE == 8
+typedef INT16 FSERROR;		/* 16 bits should be enough */
+typedef int LOCFSERROR;		/* use 'int' for calculation temps */
+#else
+typedef INT32 FSERROR;		/* may need more than 16 bits */
+typedef INT32 LOCFSERROR;	/* be sure calculation temps are big enough */
+#endif
+
+typedef FSERROR FAR *FSERRPTR;	/* pointer to error array (in FAR storage!) */
+
+
+/* Private subobject */
+
+#define MAX_Q_COMPS 4		/* max components I can handle */
+
+typedef struct {
+  struct jpeg_color_quantizer pub; /* public fields */
+
+  /* Initially allocated colormap is saved here */
+  JSAMPARRAY sv_colormap;	/* The color map as a 2-D pixel array */
+  int sv_actual;		/* number of entries in use */
+
+  JSAMPARRAY colorindex;	/* Precomputed mapping for speed */
+  /* colorindex[i][j] = index of color closest to pixel value j in component i,
+   * premultiplied as described above.  Since colormap indexes must fit into
+   * JSAMPLEs, the entries of this array will too.
+   */
+  boolean is_padded;		/* is the colorindex padded for odither? */
+
+  int Ncolors[MAX_Q_COMPS];	/* # of values alloced to each component */
+
+  /* Variables for ordered dithering */
+  int row_index;		/* cur row's vertical index in dither matrix */
+  ODITHER_MATRIX_PTR odither[MAX_Q_COMPS]; /* one dither array per component */
+
+  /* Variables for Floyd-Steinberg dithering */
+  FSERRPTR fserrors[MAX_Q_COMPS]; /* accumulated errors */
+  boolean on_odd_row;		/* flag to remember which row we are on */
+} my_cquantizer;
+
+typedef my_cquantizer * my_cquantize_ptr;
+
+
+/*
+ * Policy-making subroutines for create_colormap and create_colorindex.
+ * These routines determine the colormap to be used.  The rest of the module
+ * only assumes that the colormap is orthogonal.
+ *
+ *  * select_ncolors decides how to divvy up the available colors
+ *    among the components.
+ *  * output_value defines the set of representative values for a component.
+ *  * largest_input_value defines the mapping from input values to
+ *    representative values for a component.
+ * Note that the latter two routines may impose different policies for
+ * different components, though this is not currently done.
+ */
+
+
+LOCAL(int)
+select_ncolors (j_decompress_ptr cinfo, int Ncolors[])
+/* Determine allocation of desired colors to components, */
+/* and fill in Ncolors[] array to indicate choice. */
+/* Return value is total number of colors (product of Ncolors[] values). */
+{
+  int nc = cinfo->out_color_components; /* number of color components */
+  int max_colors = cinfo->desired_number_of_colors;
+  int total_colors, iroot, i, j;
+  boolean changed;
+  long temp;
+  static const int RGB_order[3] = { RGB_GREEN, RGB_RED, RGB_BLUE };
+
+  /* We can allocate at least the nc'th root of max_colors per component. */
+  /* Compute floor(nc'th root of max_colors). */
+  iroot = 1;
+  do {
+    iroot++;
+    temp = iroot;		/* set temp = iroot ** nc */
+    for (i = 1; i < nc; i++)
+      temp *= iroot;
+  } while (temp <= (long) max_colors); /* repeat till iroot exceeds root */
+  iroot--;			/* now iroot = floor(root) */
+
+  /* Must have at least 2 color values per component */
+  if (iroot < 2)
+    ERREXIT1(cinfo, JERR_QUANT_FEW_COLORS, (int) temp);
+
+  /* Initialize to iroot color values for each component */
+  total_colors = 1;
+  for (i = 0; i < nc; i++) {
+    Ncolors[i] = iroot;
+    total_colors *= iroot;
+  }
+  /* We may be able to increment the count for one or more components without
+   * exceeding max_colors, though we know not all can be incremented.
+   * Sometimes, the first component can be incremented more than once!
+   * (Example: for 16 colors, we start at 2*2*2, go to 3*2*2, then 4*2*2.)
+   * In RGB colorspace, try to increment G first, then R, then B.
+   */
+  do {
+    changed = FALSE;
+    for (i = 0; i < nc; i++) {
+      j = (cinfo->out_color_space == JCS_RGB ? RGB_order[i] : i);
+      /* calculate new total_colors if Ncolors[j] is incremented */
+      temp = total_colors / Ncolors[j];
+      temp *= Ncolors[j]+1;	/* done in long arith to avoid oflo */
+      if (temp > (long) max_colors)
+	break;			/* won't fit, done with this pass */
+      Ncolors[j]++;		/* OK, apply the increment */
+      total_colors = (int) temp;
+      changed = TRUE;
+    }
+  } while (changed);
+
+  return total_colors;
+}
+
+
+LOCAL(int)
+output_value (j_decompress_ptr cinfo, int ci, int j, int maxj)
+/* Return j'th output value, where j will range from 0 to maxj */
+/* The output values must fall in 0..MAXJSAMPLE in increasing order */
+{
+  /* We always provide values 0 and MAXJSAMPLE for each component;
+   * any additional values are equally spaced between these limits.
+   * (Forcing the upper and lower values to the limits ensures that
+   * dithering can't produce a color outside the selected gamut.)
+   */
+  return (int) (((INT32) j * MAXJSAMPLE + maxj/2) / maxj);
+}
+
+
+LOCAL(int)
+largest_input_value (j_decompress_ptr cinfo, int ci, int j, int maxj)
+/* Return largest input value that should map to j'th output value */
+/* Must have largest(j=0) >= 0, and largest(j=maxj) >= MAXJSAMPLE */
+{
+  /* Breakpoints are halfway between values returned by output_value */
+  return (int) (((INT32) (2*j + 1) * MAXJSAMPLE + maxj) / (2*maxj));
+}
+
+
+/*
+ * Create the colormap.
+ */
+
+LOCAL(void)
+create_colormap (j_decompress_ptr cinfo)
+{
+  my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;
+  JSAMPARRAY colormap;		/* Created colormap */
+  int total_colors;		/* Number of distinct output colors */
+  int i,j,k, nci, blksize, blkdist, ptr, val;
+
+  /* Select number of colors for each component */
+  total_colors = select_ncolors(cinfo, cquantize->Ncolors);
+
+  /* Report selected color counts */
+  if (cinfo->out_color_components == 3)
+    TRACEMS4(cinfo, 1, JTRC_QUANT_3_NCOLORS,
+	     total_colors, cquantize->Ncolors[0],
+	     cquantize->Ncolors[1], cquantize->Ncolors[2]);
+  else
+    TRACEMS1(cinfo, 1, JTRC_QUANT_NCOLORS, total_colors);
+
+  /* Allocate and fill in the colormap. */
+  /* The colors are ordered in the map in standard row-major order, */
+  /* i.e. rightmost (highest-indexed) color changes most rapidly. */
+
+  colormap = (*cinfo->mem->alloc_sarray)
+    ((j_common_ptr) cinfo, JPOOL_IMAGE,
+     (JDIMENSION) total_colors, (JDIMENSION) cinfo->out_color_components);
+
+  /* blksize is number of adjacent repeated entries for a component */
+  /* blkdist is distance between groups of identical entries for a component */
+  blkdist = total_colors;
+
+  for (i = 0; i < cinfo->out_color_components; i++) {
+    /* fill in colormap entries for i'th color component */
+    nci = cquantize->Ncolors[i]; /* # of distinct values for this color */
+    blksize = blkdist / nci;
+    for (j = 0; j < nci; j++) {
+      /* Compute j'th output value (out of nci) for component */
+      val = output_value(cinfo, i, j, nci-1);
+      /* Fill in all colormap entries that have this value of this component */
+      for (ptr = j * blksize; ptr < total_colors; ptr += blkdist) {
+	/* fill in blksize entries beginning at ptr */
+	for (k = 0; k < blksize; k++)
+	  colormap[i][ptr+k] = (JSAMPLE) val;
+      }
+    }
+    blkdist = blksize;		/* blksize of this color is blkdist of next */
+  }
+
+  /* Save the colormap in private storage,
+   * where it will survive color quantization mode changes.
+   */
+  cquantize->sv_colormap = colormap;
+  cquantize->sv_actual = total_colors;
+}
+
+
+/*
+ * Create the color index table.
+ */
+
+LOCAL(void)
+create_colorindex (j_decompress_ptr cinfo)
+{
+  my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;
+  JSAMPROW indexptr;
+  int i,j,k, nci, blksize, val, pad;
+
+  /* For ordered dither, we pad the color index tables by MAXJSAMPLE in
+   * each direction (input index values can be -MAXJSAMPLE .. 2*MAXJSAMPLE).
+   * This is not necessary in the other dithering modes.  However, we
+   * flag whether it was done in case user changes dithering mode.
+   */
+  if (cinfo->dither_mode == JDITHER_ORDERED) {
+    pad = MAXJSAMPLE*2;
+    cquantize->is_padded = TRUE;
+  } else {
+    pad = 0;
+    cquantize->is_padded = FALSE;
+  }
+
+  cquantize->colorindex = (*cinfo->mem->alloc_sarray)
+    ((j_common_ptr) cinfo, JPOOL_IMAGE,
+     (JDIMENSION) (MAXJSAMPLE+1 + pad),
+     (JDIMENSION) cinfo->out_color_components);
+
+  /* blksize is number of adjacent repeated entries for a component */
+  blksize = cquantize->sv_actual;
+
+  for (i = 0; i < cinfo->out_color_components; i++) {
+    /* fill in colorindex entries for i'th color component */
+    nci = cquantize->Ncolors[i]; /* # of distinct values for this color */
+    blksize = blksize / nci;
+
+    /* adjust colorindex pointers to provide padding at negative indexes. */
+    if (pad)
+      cquantize->colorindex[i] += MAXJSAMPLE;
+
+    /* in loop, val = index of current output value, */
+    /* and k = largest j that maps to current val */
+    indexptr = cquantize->colorindex[i];
+    val = 0;
+    k = largest_input_value(cinfo, i, 0, nci-1);
+    for (j = 0; j <= MAXJSAMPLE; j++) {
+      while (j > k)		/* advance val if past boundary */
+	k = largest_input_value(cinfo, i, ++val, nci-1);
+      /* premultiply so that no multiplication needed in main processing */
+      indexptr[j] = (JSAMPLE) (val * blksize);
+    }
+    /* Pad at both ends if necessary */
+    if (pad)
+      for (j = 1; j <= MAXJSAMPLE; j++) {
+	indexptr[-j] = indexptr[0];
+	indexptr[MAXJSAMPLE+j] = indexptr[MAXJSAMPLE];
+      }
+  }
+}
+
+
+/*
+ * Create an ordered-dither array for a component having ncolors
+ * distinct output values.
+ */
+
+LOCAL(ODITHER_MATRIX_PTR)
+make_odither_array (j_decompress_ptr cinfo, int ncolors)
+{
+  ODITHER_MATRIX_PTR odither;
+  int j,k;
+  INT32 num,den;
+
+  odither = (ODITHER_MATRIX_PTR)
+    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+				SIZEOF(ODITHER_MATRIX));
+  /* The inter-value distance for this color is MAXJSAMPLE/(ncolors-1).
+   * Hence the dither value for the matrix cell with fill order f
+   * (f=0..N-1) should be (N-1-2*f)/(2*N) * MAXJSAMPLE/(ncolors-1).
+   * On 16-bit-int machine, be careful to avoid overflow.
+   */
+  den = 2 * ODITHER_CELLS * ((INT32) (ncolors - 1));
+  for (j = 0; j < ODITHER_SIZE; j++) {
+    for (k = 0; k < ODITHER_SIZE; k++) {
+      num = ((INT32) (ODITHER_CELLS-1 - 2*((int)base_dither_matrix[j][k])))
+	    * MAXJSAMPLE;
+      /* Ensure round towards zero despite C's lack of consistency
+       * about rounding negative values in integer division...
+       */
+      odither[j][k] = (int) (num<0 ? -((-num)/den) : num/den);
+    }
+  }
+  return odither;
+}
+
+
+/*
+ * Create the ordered-dither tables.
+ * Components having the same number of representative colors may
+ * share a dither table.
+ */
+
+LOCAL(void)
+create_odither_tables (j_decompress_ptr cinfo)
+{
+  my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;
+  ODITHER_MATRIX_PTR odither;
+  int i, j, nci;
+
+  for (i = 0; i < cinfo->out_color_components; i++) {
+    nci = cquantize->Ncolors[i]; /* # of distinct values for this color */
+    odither = NULL;		/* search for matching prior component */
+    for (j = 0; j < i; j++) {
+      if (nci == cquantize->Ncolors[j]) {
+	odither = cquantize->odither[j];
+	break;
+      }
+    }
+    if (odither == NULL)	/* need a new table? */
+      odither = make_odither_array(cinfo, nci);
+    cquantize->odither[i] = odither;
+  }
+}
+
+
+/*
+ * Map some rows of pixels to the output colormapped representation.
+ */
+
+METHODDEF(void)
+color_quantize (j_decompress_ptr cinfo, JSAMPARRAY input_buf,
+		JSAMPARRAY output_buf, int num_rows)
+/* General case, no dithering */
+{
+  my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;
+  JSAMPARRAY colorindex = cquantize->colorindex;
+  register int pixcode, ci;
+  register JSAMPROW ptrin, ptrout;
+  int row;
+  JDIMENSION col;
+  JDIMENSION width = cinfo->output_width;
+  register int nc = cinfo->out_color_components;
+
+  for (row = 0; row < num_rows; row++) {
+    ptrin = input_buf[row];
+    ptrout = output_buf[row];
+    for (col = width; col > 0; col--) {
+      pixcode = 0;
+      for (ci = 0; ci < nc; ci++) {
+	pixcode += GETJSAMPLE(colorindex[ci][GETJSAMPLE(*ptrin++)]);
+      }
+      *ptrout++ = (JSAMPLE) pixcode;
+    }
+  }
+}
+
+
+METHODDEF(void)
+color_quantize3 (j_decompress_ptr cinfo, JSAMPARRAY input_buf,
+		 JSAMPARRAY output_buf, int num_rows)
+/* Fast path for out_color_components==3, no dithering */
+{
+  my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;
+  register int pixcode;
+  register JSAMPROW ptrin, ptrout;
+  JSAMPROW colorindex0 = cquantize->colorindex[0];
+  JSAMPROW colorindex1 = cquantize->colorindex[1];
+  JSAMPROW colorindex2 = cquantize->colorindex[2];
+  int row;
+  JDIMENSION col;
+  JDIMENSION width = cinfo->output_width;
+
+  for (row = 0; row < num_rows; row++) {
+    ptrin = input_buf[row];
+    ptrout = output_buf[row];
+    for (col = width; col > 0; col--) {
+      pixcode  = GETJSAMPLE(colorindex0[GETJSAMPLE(*ptrin++)]);
+      pixcode += GETJSAMPLE(colorindex1[GETJSAMPLE(*ptrin++)]);
+      pixcode += GETJSAMPLE(colorindex2[GETJSAMPLE(*ptrin++)]);
+      *ptrout++ = (JSAMPLE) pixcode;
+    }
+  }
+}
+
+
+METHODDEF(void)
+quantize_ord_dither (j_decompress_ptr cinfo, JSAMPARRAY input_buf,
+		     JSAMPARRAY output_buf, int num_rows)
+/* General case, with ordered dithering */
+{
+  my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;
+  register JSAMPROW input_ptr;
+  register JSAMPROW output_ptr;
+  JSAMPROW colorindex_ci;
+  int * dither;			/* points to active row of dither matrix */
+  int row_index, col_index;	/* current indexes into dither matrix */
+  int nc = cinfo->out_color_components;
+  int ci;
+  int row;
+  JDIMENSION col;
+  JDIMENSION width = cinfo->output_width;
+
+  for (row = 0; row < num_rows; row++) {
+    /* Initialize output values to 0 so can process components separately */
+    jzero_far((void FAR *) output_buf[row],
+	      (size_t) (width * SIZEOF(JSAMPLE)));
+    row_index = cquantize->row_index;
+    for (ci = 0; ci < nc; ci++) {
+      input_ptr = input_buf[row] + ci;
+      output_ptr = output_buf[row];
+      colorindex_ci = cquantize->colorindex[ci];
+      dither = cquantize->odither[ci][row_index];
+      col_index = 0;
+
+      for (col = width; col > 0; col--) {
+	/* Form pixel value + dither, range-limit to 0..MAXJSAMPLE,
+	 * select output value, accumulate into output code for this pixel.
+	 * Range-limiting need not be done explicitly, as we have extended
+	 * the colorindex table to produce the right answers for out-of-range
+	 * inputs.  The maximum dither is +- MAXJSAMPLE; this sets the
+	 * required amount of padding.
+	 */
+	*output_ptr += colorindex_ci[GETJSAMPLE(*input_ptr)+dither[col_index]];
+	input_ptr += nc;
+	output_ptr++;
+	col_index = (col_index + 1) & ODITHER_MASK;
+      }
+    }
+    /* Advance row index for next row */
+    row_index = (row_index + 1) & ODITHER_MASK;
+    cquantize->row_index = row_index;
+  }
+}
+
+
+METHODDEF(void)
+quantize3_ord_dither (j_decompress_ptr cinfo, JSAMPARRAY input_buf,
+		      JSAMPARRAY output_buf, int num_rows)
+/* Fast path for out_color_components==3, with ordered dithering */
+{
+  my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;
+  register int pixcode;
+  register JSAMPROW input_ptr;
+  register JSAMPROW output_ptr;
+  JSAMPROW colorindex0 = cquantize->colorindex[0];
+  JSAMPROW colorindex1 = cquantize->colorindex[1];
+  JSAMPROW colorindex2 = cquantize->colorindex[2];
+  int * dither0;		/* points to active row of dither matrix */
+  int * dither1;
+  int * dither2;
+  int row_index, col_index;	/* current indexes into dither matrix */
+  int row;
+  JDIMENSION col;
+  JDIMENSION width = cinfo->output_width;
+
+  for (row = 0; row < num_rows; row++) {
+    row_index = cquantize->row_index;
+    input_ptr = input_buf[row];
+    output_ptr = output_buf[row];
+    dither0 = cquantize->odither[0][row_index];
+    dither1 = cquantize->odither[1][row_index];
+    dither2 = cquantize->odither[2][row_index];
+    col_index = 0;
+
+    for (col = width; col > 0; col--) {
+      pixcode  = GETJSAMPLE(colorindex0[GETJSAMPLE(*input_ptr++) +
+					dither0[col_index]]);
+      pixcode += GETJSAMPLE(colorindex1[GETJSAMPLE(*input_ptr++) +
+					dither1[col_index]]);
+      pixcode += GETJSAMPLE(colorindex2[GETJSAMPLE(*input_ptr++) +
+					dither2[col_index]]);
+      *output_ptr++ = (JSAMPLE) pixcode;
+      col_index = (col_index + 1) & ODITHER_MASK;
+    }
+    row_index = (row_index + 1) & ODITHER_MASK;
+    cquantize->row_index = row_index;
+  }
+}
+
+
+METHODDEF(void)
+quantize_fs_dither (j_decompress_ptr cinfo, JSAMPARRAY input_buf,
+		    JSAMPARRAY output_buf, int num_rows)
+/* General case, with Floyd-Steinberg dithering */
+{
+  my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;
+  register LOCFSERROR cur;	/* current error or pixel value */
+  LOCFSERROR belowerr;		/* error for pixel below cur */
+  LOCFSERROR bpreverr;		/* error for below/prev col */
+  LOCFSERROR bnexterr;		/* error for below/next col */
+  LOCFSERROR delta;
+  register FSERRPTR errorptr;	/* => fserrors[] at column before current */
+  register JSAMPROW input_ptr;
+  register JSAMPROW output_ptr;
+  JSAMPROW colorindex_ci;
+  JSAMPROW colormap_ci;
+  int pixcode;
+  int nc = cinfo->out_color_components;
+  int dir;			/* 1 for left-to-right, -1 for right-to-left */
+  int dirnc;			/* dir * nc */
+  int ci;
+  int row;
+  JDIMENSION col;
+  JDIMENSION width = cinfo->output_width;
+  JSAMPLE *range_limit = cinfo->sample_range_limit;
+  SHIFT_TEMPS
+
+  for (row = 0; row < num_rows; row++) {
+    /* Initialize output values to 0 so can process components separately */
+    jzero_far((void FAR *) output_buf[row],
+	      (size_t) (width * SIZEOF(JSAMPLE)));
+    for (ci = 0; ci < nc; ci++) {
+      input_ptr = input_buf[row] + ci;
+      output_ptr = output_buf[row];
+      if (cquantize->on_odd_row) {
+	/* work right to left in this row */
+	input_ptr += (width-1) * nc; /* so point to rightmost pixel */
+	output_ptr += width-1;
+	dir = -1;
+	dirnc = -nc;
+	errorptr = cquantize->fserrors[ci] + (width+1); /* => entry after last column */
+      } else {
+	/* work left to right in this row */
+	dir = 1;
+	dirnc = nc;
+	errorptr = cquantize->fserrors[ci]; /* => entry before first column */
+      }
+      colorindex_ci = cquantize->colorindex[ci];
+      colormap_ci = cquantize->sv_colormap[ci];
+      /* Preset error values: no error propagated to first pixel from left */
+      cur = 0;
+      /* and no error propagated to row below yet */
+      belowerr = bpreverr = 0;
+
+      for (col = width; col > 0; col--) {
+	/* cur holds the error propagated from the previous pixel on the
+	 * current line.  Add the error propagated from the previous line
+	 * to form the complete error correction term for this pixel, and
+	 * round the error term (which is expressed * 16) to an integer.
+	 * RIGHT_SHIFT rounds towards minus infinity, so adding 8 is correct
+	 * for either sign of the error value.
+	 * Note: errorptr points to *previous* column's array entry.
+	 */
+	cur = RIGHT_SHIFT(cur + errorptr[dir] + 8, 4);
+	/* Form pixel value + error, and range-limit to 0..MAXJSAMPLE.
+	 * The maximum error is +- MAXJSAMPLE; this sets the required size
+	 * of the range_limit array.
+	 */
+	cur += GETJSAMPLE(*input_ptr);
+	cur = GETJSAMPLE(range_limit[cur]);
+	/* Select output value, accumulate into output code for this pixel */
+	pixcode = GETJSAMPLE(colorindex_ci[cur]);
+	*output_ptr += (JSAMPLE) pixcode;
+	/* Compute actual representation error at this pixel */
+	/* Note: we can do this even though we don't have the final */
+	/* pixel code, because the colormap is orthogonal. */
+	cur -= GETJSAMPLE(colormap_ci[pixcode]);
+	/* Compute error fractions to be propagated to adjacent pixels.
+	 * Add these into the running sums, and simultaneously shift the
+	 * next-line error sums left by 1 column.
+	 */
+	bnexterr = cur;
+	delta = cur * 2;
+	cur += delta;		/* form error * 3 */
+	errorptr[0] = (FSERROR) (bpreverr + cur);
+	cur += delta;		/* form error * 5 */
+	bpreverr = belowerr + cur;
+	belowerr = bnexterr;
+	cur += delta;		/* form error * 7 */
+	/* At this point cur contains the 7/16 error value to be propagated
+	 * to the next pixel on the current line, and all the errors for the
+	 * next line have been shifted over. We are therefore ready to move on.
+	 */
+	input_ptr += dirnc;	/* advance input ptr to next column */
+	output_ptr += dir;	/* advance output ptr to next column */
+	errorptr += dir;	/* advance errorptr to current column */
+      }
+      /* Post-loop cleanup: we must unload the final error value into the
+       * final fserrors[] entry.  Note we need not unload belowerr because
+       * it is for the dummy column before or after the actual array.
+       */
+      errorptr[0] = (FSERROR) bpreverr; /* unload prev err into array */
+    }
+    cquantize->on_odd_row = (cquantize->on_odd_row ? FALSE : TRUE);
+  }
+}
+
+
+/*
+ * Allocate workspace for Floyd-Steinberg errors.
+ */
+
+LOCAL(void)
+alloc_fs_workspace (j_decompress_ptr cinfo)
+{
+  my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;
+  size_t arraysize;
+  int i;
+
+  arraysize = (size_t) ((cinfo->output_width + 2) * SIZEOF(FSERROR));
+  for (i = 0; i < cinfo->out_color_components; i++) {
+    cquantize->fserrors[i] = (FSERRPTR)
+      (*cinfo->mem->alloc_large)((j_common_ptr) cinfo, JPOOL_IMAGE, arraysize);
+  }
+}
+
+
+/*
+ * Initialize for one-pass color quantization.
+ */
+
+METHODDEF(void)
+start_pass_1_quant (j_decompress_ptr cinfo, boolean is_pre_scan)
+{
+  my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;
+  size_t arraysize;
+  int i;
+
+  /* Install my colormap. */
+  cinfo->colormap = cquantize->sv_colormap;
+  cinfo->actual_number_of_colors = cquantize->sv_actual;
+
+  /* Initialize for desired dithering mode. */
+  switch (cinfo->dither_mode) {
+  case JDITHER_NONE:
+    if (cinfo->out_color_components == 3)
+      cquantize->pub.color_quantize = color_quantize3;
+    else
+      cquantize->pub.color_quantize = color_quantize;
+    break;
+  case JDITHER_ORDERED:
+    if (cinfo->out_color_components == 3)
+      cquantize->pub.color_quantize = quantize3_ord_dither;
+    else
+      cquantize->pub.color_quantize = quantize_ord_dither;
+    cquantize->row_index = 0;	/* initialize state for ordered dither */
+    /* If user changed to ordered dither from another mode,
+     * we must recreate the color index table with padding.
+     * This will cost extra space, but probably isn't very likely.
+     */
+    if (! cquantize->is_padded)
+      create_colorindex(cinfo);
+    /* Create ordered-dither tables if we didn't already. */
+    if (cquantize->odither[0] == NULL)
+      create_odither_tables(cinfo);
+    break;
+  case JDITHER_FS:
+    cquantize->pub.color_quantize = quantize_fs_dither;
+    cquantize->on_odd_row = FALSE; /* initialize state for F-S dither */
+    /* Allocate Floyd-Steinberg workspace if didn't already. */
+    if (cquantize->fserrors[0] == NULL)
+      alloc_fs_workspace(cinfo);
+    /* Initialize the propagated errors to zero. */
+    arraysize = (size_t) ((cinfo->output_width + 2) * SIZEOF(FSERROR));
+    for (i = 0; i < cinfo->out_color_components; i++)
+      jzero_far((void FAR *) cquantize->fserrors[i], arraysize);
+    break;
+  default:
+    ERREXIT(cinfo, JERR_NOT_COMPILED);
+    break;
+  }
+}
+
+
+/*
+ * Finish up at the end of the pass.
+ */
+
+METHODDEF(void)
+finish_pass_1_quant (j_decompress_ptr cinfo)
+{
+  /* no work in 1-pass case */
+}
+
+
+/*
+ * Switch to a new external colormap between output passes.
+ * Shouldn't get to this module!
+ */
+
+METHODDEF(void)
+new_color_map_1_quant (j_decompress_ptr cinfo)
+{
+  ERREXIT(cinfo, JERR_MODE_CHANGE);
+}
+
+
+/*
+ * Module initialization routine for 1-pass color quantization.
+ */
+
+GLOBAL(void)
+jinit_1pass_quantizer (j_decompress_ptr cinfo)
+{
+  my_cquantize_ptr cquantize;
+
+  cquantize = (my_cquantize_ptr)
+    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+				SIZEOF(my_cquantizer));
+  cinfo->cquantize = (struct jpeg_color_quantizer *) cquantize;
+  cquantize->pub.start_pass = start_pass_1_quant;
+  cquantize->pub.finish_pass = finish_pass_1_quant;
+  cquantize->pub.new_color_map = new_color_map_1_quant;
+  cquantize->fserrors[0] = NULL; /* Flag FS workspace not allocated */
+  cquantize->odither[0] = NULL;	/* Also flag odither arrays not allocated */
+
+  /* Make sure my internal arrays won't overflow */
+  if (cinfo->out_color_components > MAX_Q_COMPS)
+    ERREXIT1(cinfo, JERR_QUANT_COMPONENTS, MAX_Q_COMPS);
+  /* Make sure colormap indexes can be represented by JSAMPLEs */
+  if (cinfo->desired_number_of_colors > (MAXJSAMPLE+1))
+    ERREXIT1(cinfo, JERR_QUANT_MANY_COLORS, MAXJSAMPLE+1);
+
+  /* Create the colormap and color index table. */
+  create_colormap(cinfo);
+  create_colorindex(cinfo);
+
+  /* Allocate Floyd-Steinberg workspace now if requested.
+   * We do this now since it is FAR storage and may affect the memory
+   * manager's space calculations.  If the user changes to FS dither
+   * mode in a later pass, we will allocate the space then, and will
+   * possibly overrun the max_memory_to_use setting.
+   */
+  if (cinfo->dither_mode == JDITHER_FS)
+    alloc_fs_workspace(cinfo);
+}
+
+#endif /* QUANT_1PASS_SUPPORTED */
diff --git a/uppsrc/plugin/jpg/lib/jquant2.c b/uppsrc/plugin/jpg/lib/jquant2.c
new file mode 100644
index 000000000..85eb4c361
--- /dev/null
+++ b/uppsrc/plugin/jpg/lib/jquant2.c
@@ -0,0 +1,1310 @@
+/*
+ * jquant2.c
+ *
+ * Copyright (C) 1991-1996, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains 2-pass color quantization (color mapping) routines.
+ * These routines provide selection of a custom color map for an image,
+ * followed by mapping of the image to that color map, with optional
+ * Floyd-Steinberg dithering.
+ * It is also possible to use just the second pass to map to an arbitrary
+ * externally-given color map.
+ *
+ * Note: ordered dithering is not supported, since there isn't any fast
+ * way to compute intercolor distances; it's unclear that ordered dither's
+ * fundamental assumptions even hold with an irregularly spaced color map.
+ */
+
+#define JPEG_INTERNALS
+#include "jinclude.h"
+#include "jpeglib.h"
+
+#ifdef QUANT_2PASS_SUPPORTED
+
+
+/*
+ * This module implements the well-known Heckbert paradigm for color
+ * quantization.  Most of the ideas used here can be traced back to
+ * Heckbert's seminal paper
+ *   Heckbert, Paul.  "Color Image Quantization for Frame Buffer Display",
+ *   Proc. SIGGRAPH '82, Computer Graphics v.16 #3 (July 1982), pp 297-304.
+ *
+ * In the first pass over the image, we accumulate a histogram showing the
+ * usage count of each possible color.  To keep the histogram to a reasonable
+ * size, we reduce the precision of the input; typical practice is to retain
+ * 5 or 6 bits per color, so that 8 or 4 different input values are counted
+ * in the same histogram cell.
+ *
+ * Next, the color-selection step begins with a box representing the whole
+ * color space, and repeatedly splits the "largest" remaining box until we
+ * have as many boxes as desired colors.  Then the mean color in each
+ * remaining box becomes one of the possible output colors.
+ *
+ * The second pass over the image maps each input pixel to the closest output
+ * color (optionally after applying a Floyd-Steinberg dithering correction).
+ * This mapping is logically trivial, but making it go fast enough requires
+ * considerable care.
+ *
+ * Heckbert-style quantizers vary a good deal in their policies for choosing
+ * the "largest" box and deciding where to cut it.  The particular policies
+ * used here have proved out well in experimental comparisons, but better ones
+ * may yet be found.
+ *
+ * In earlier versions of the IJG code, this module quantized in YCbCr color
+ * space, processing the raw upsampled data without a color conversion step.
+ * This allowed the color conversion math to be done only once per colormap
+ * entry, not once per pixel.  However, that optimization precluded other
+ * useful optimizations (such as merging color conversion with upsampling)
+ * and it also interfered with desired capabilities such as quantizing to an
+ * externally-supplied colormap.  We have therefore abandoned that approach.
+ * The present code works in the post-conversion color space, typically RGB.
+ *
+ * To improve the visual quality of the results, we actually work in scaled
+ * RGB space, giving G distances more weight than R, and R in turn more than
+ * B.  To do everything in integer math, we must use integer scale factors.
+ * The 2/3/1 scale factors used here correspond loosely to the relative
+ * weights of the colors in the NTSC grayscale equation.
+ * If you want to use this code to quantize a non-RGB color space, you'll
+ * probably need to change these scale factors.
+ */
+
+#define R_SCALE 2		/* scale R distances by this much */
+#define G_SCALE 3		/* scale G distances by this much */
+#define B_SCALE 1		/* and B by this much */
+
+/* Relabel R/G/B as components 0/1/2, respecting the RGB ordering defined
+ * in jmorecfg.h.  As the code stands, it will do the right thing for R,G,B
+ * and B,G,R orders.  If you define some other weird order in jmorecfg.h,
+ * you'll get compile errors until you extend this logic.  In that case
+ * you'll probably want to tweak the histogram sizes too.
+ */
+
+#if RGB_RED == 0
+#define C0_SCALE R_SCALE
+#endif
+#if RGB_BLUE == 0
+#define C0_SCALE B_SCALE
+#endif
+#if RGB_GREEN == 1
+#define C1_SCALE G_SCALE
+#endif
+#if RGB_RED == 2
+#define C2_SCALE R_SCALE
+#endif
+#if RGB_BLUE == 2
+#define C2_SCALE B_SCALE
+#endif
+
+
+/*
+ * First we have the histogram data structure and routines for creating it.
+ *
+ * The number of bits of precision can be adjusted by changing these symbols.
+ * We recommend keeping 6 bits for G and 5 each for R and B.
+ * If you have plenty of memory and cycles, 6 bits all around gives marginally
+ * better results; if you are short of memory, 5 bits all around will save
+ * some space but degrade the results.
+ * To maintain a fully accurate histogram, we'd need to allocate a "long"
+ * (preferably unsigned long) for each cell.  In practice this is overkill;
+ * we can get by with 16 bits per cell.  Few of the cell counts will overflow,
+ * and clamping those that do overflow to the maximum value will give close-
+ * enough results.  This reduces the recommended histogram size from 256Kb
+ * to 128Kb, which is a useful savings on PC-class machines.
+ * (In the second pass the histogram space is re-used for pixel mapping data;
+ * in that capacity, each cell must be able to store zero to the number of
+ * desired colors.  16 bits/cell is plenty for that too.)
+ * Since the JPEG code is intended to run in small memory model on 80x86
+ * machines, we can't just allocate the histogram in one chunk.  Instead
+ * of a true 3-D array, we use a row of pointers to 2-D arrays.  Each
+ * pointer corresponds to a C0 value (typically 2^5 = 32 pointers) and
+ * each 2-D array has 2^6*2^5 = 2048 or 2^6*2^6 = 4096 entries.  Note that
+ * on 80x86 machines, the pointer row is in near memory but the actual
+ * arrays are in far memory (same arrangement as we use for image arrays).
+ */
+
+#define MAXNUMCOLORS  (MAXJSAMPLE+1) /* maximum size of colormap */
+
+/* These will do the right thing for either R,G,B or B,G,R color order,
+ * but you may not like the results for other color orders.
+ */
+#define HIST_C0_BITS  5		/* bits of precision in R/B histogram */
+#define HIST_C1_BITS  6		/* bits of precision in G histogram */
+#define HIST_C2_BITS  5		/* bits of precision in B/R histogram */
+
+/* Number of elements along histogram axes. */
+#define HIST_C0_ELEMS  (1<<HIST_C0_BITS)
+#define HIST_C1_ELEMS  (1<<HIST_C1_BITS)
+#define HIST_C2_ELEMS  (1<<HIST_C2_BITS)
+
+/* These are the amounts to shift an input value to get a histogram index. */
+#define C0_SHIFT  (BITS_IN_JSAMPLE-HIST_C0_BITS)
+#define C1_SHIFT  (BITS_IN_JSAMPLE-HIST_C1_BITS)
+#define C2_SHIFT  (BITS_IN_JSAMPLE-HIST_C2_BITS)
+
+
+typedef UINT16 histcell;	/* histogram cell; prefer an unsigned type */
+
+typedef histcell FAR * histptr;	/* for pointers to histogram cells */
+
+typedef histcell hist1d[HIST_C2_ELEMS]; /* typedefs for the array */
+typedef hist1d FAR * hist2d;	/* type for the 2nd-level pointers */
+typedef hist2d * hist3d;	/* type for top-level pointer */
+
+
+/* Declarations for Floyd-Steinberg dithering.
+ *
+ * Errors are accumulated into the array fserrors[], at a resolution of
+ * 1/16th of a pixel count.  The error at a given pixel is propagated
+ * to its not-yet-processed neighbors using the standard F-S fractions,
+ *		...	(here)	7/16
+ *		3/16	5/16	1/16
+ * We work left-to-right on even rows, right-to-left on odd rows.
+ *
+ * We can get away with a single array (holding one row's worth of errors)
+ * by using it to store the current row's errors at pixel columns not yet
+ * processed, but the next row's errors at columns already processed.  We
+ * need only a few extra variables to hold the errors immediately around the
+ * current column.  (If we are lucky, those variables are in registers, but
+ * even if not, they're probably cheaper to access than array elements are.)
+ *
+ * The fserrors[] array has (#columns + 2) entries; the extra entry at
+ * each end saves us from special-casing the first and last pixels.
+ * Each entry is three values long, one value for each color component.
+ *
+ * Note: on a wide image, we might not have enough room in a PC's near data
+ * segment to hold the error array; so it is allocated with alloc_large.
+ */
+
+#if BITS_IN_JSAMPLE == 8
+typedef INT16 FSERROR;		/* 16 bits should be enough */
+typedef int LOCFSERROR;		/* use 'int' for calculation temps */
+#else
+typedef INT32 FSERROR;		/* may need more than 16 bits */
+typedef INT32 LOCFSERROR;	/* be sure calculation temps are big enough */
+#endif
+
+typedef FSERROR FAR *FSERRPTR;	/* pointer to error array (in FAR storage!) */
+
+
+/* Private subobject */
+
+typedef struct {
+  struct jpeg_color_quantizer pub; /* public fields */
+
+  /* Space for the eventually created colormap is stashed here */
+  JSAMPARRAY sv_colormap;	/* colormap allocated at init time */
+  int desired;			/* desired # of colors = size of colormap */
+
+  /* Variables for accumulating image statistics */
+  hist3d histogram;		/* pointer to the histogram */
+
+  boolean needs_zeroed;		/* TRUE if next pass must zero histogram */
+
+  /* Variables for Floyd-Steinberg dithering */
+  FSERRPTR fserrors;		/* accumulated errors */
+  boolean on_odd_row;		/* flag to remember which row we are on */
+  int * error_limiter;		/* table for clamping the applied error */
+} my_cquantizer;
+
+typedef my_cquantizer * my_cquantize_ptr;
+
+
+/*
+ * Prescan some rows of pixels.
+ * In this module the prescan simply updates the histogram, which has been
+ * initialized to zeroes by start_pass.
+ * An output_buf parameter is required by the method signature, but no data
+ * is actually output (in fact the buffer controller is probably passing a
+ * NULL pointer).
+ */
+
+METHODDEF(void)
+prescan_quantize (j_decompress_ptr cinfo, JSAMPARRAY input_buf,
+		  JSAMPARRAY output_buf, int num_rows)
+{
+  my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;
+  register JSAMPROW ptr;
+  register histptr histp;
+  register hist3d histogram = cquantize->histogram;
+  int row;
+  JDIMENSION col;
+  JDIMENSION width = cinfo->output_width;
+
+  for (row = 0; row < num_rows; row++) {
+    ptr = input_buf[row];
+    for (col = width; col > 0; col--) {
+      /* get pixel value and index into the histogram */
+      histp = & histogram[GETJSAMPLE(ptr[0]) >> C0_SHIFT]
+			 [GETJSAMPLE(ptr[1]) >> C1_SHIFT]
+			 [GETJSAMPLE(ptr[2]) >> C2_SHIFT];
+      /* increment, check for overflow and undo increment if so. */
+      if (++(*histp) <= 0)
+	(*histp)--;
+      ptr += 3;
+    }
+  }
+}
+
+
+/*
+ * Next we have the really interesting routines: selection of a colormap
+ * given the completed histogram.
+ * These routines work with a list of "boxes", each representing a rectangular
+ * subset of the input color space (to histogram precision).
+ */
+
+typedef struct {
+  /* The bounds of the box (inclusive); expressed as histogram indexes */
+  int c0min, c0max;
+  int c1min, c1max;
+  int c2min, c2max;
+  /* The volume (actually 2-norm) of the box */
+  INT32 volume;
+  /* The number of nonzero histogram cells within this box */
+  long colorcount;
+} box;
+
+typedef box * boxptr;
+
+
+LOCAL(boxptr)
+find_biggest_color_pop (boxptr boxlist, int numboxes)
+/* Find the splittable box with the largest color population */
+/* Returns NULL if no splittable boxes remain */
+{
+  register boxptr boxp;
+  register int i;
+  register long maxc = 0;
+  boxptr which = NULL;
+
+  for (i = 0, boxp = boxlist; i < numboxes; i++, boxp++) {
+    if (boxp->colorcount > maxc && boxp->volume > 0) {
+      which = boxp;
+      maxc = boxp->colorcount;
+    }
+  }
+  return which;
+}
+
+
+LOCAL(boxptr)
+find_biggest_volume (boxptr boxlist, int numboxes)
+/* Find the splittable box with the largest (scaled) volume */
+/* Returns NULL if no splittable boxes remain */
+{
+  register boxptr boxp;
+  register int i;
+  register INT32 maxv = 0;
+  boxptr which = NULL;
+
+  for (i = 0, boxp = boxlist; i < numboxes; i++, boxp++) {
+    if (boxp->volume > maxv) {
+      which = boxp;
+      maxv = boxp->volume;
+    }
+  }
+  return which;
+}
+
+
+LOCAL(void)
+update_box (j_decompress_ptr cinfo, boxptr boxp)
+/* Shrink the min/max bounds of a box to enclose only nonzero elements, */
+/* and recompute its volume and population */
+{
+  my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;
+  hist3d histogram = cquantize->histogram;
+  histptr histp;
+  int c0,c1,c2;
+  int c0min,c0max,c1min,c1max,c2min,c2max;
+  INT32 dist0,dist1,dist2;
+  long ccount;
+
+  c0min = boxp->c0min;  c0max = boxp->c0max;
+  c1min = boxp->c1min;  c1max = boxp->c1max;
+  c2min = boxp->c2min;  c2max = boxp->c2max;
+
+  if (c0max > c0min)
+    for (c0 = c0min; c0 <= c0max; c0++)
+      for (c1 = c1min; c1 <= c1max; c1++) {
+	histp = & histogram[c0][c1][c2min];
+	for (c2 = c2min; c2 <= c2max; c2++)
+	  if (*histp++ != 0) {
+	    boxp->c0min = c0min = c0;
+	    goto have_c0min;
+	  }
+      }
+ have_c0min:
+  if (c0max > c0min)
+    for (c0 = c0max; c0 >= c0min; c0--)
+      for (c1 = c1min; c1 <= c1max; c1++) {
+	histp = & histogram[c0][c1][c2min];
+	for (c2 = c2min; c2 <= c2max; c2++)
+	  if (*histp++ != 0) {
+	    boxp->c0max = c0max = c0;
+	    goto have_c0max;
+	  }
+      }
+ have_c0max:
+  if (c1max > c1min)
+    for (c1 = c1min; c1 <= c1max; c1++)
+      for (c0 = c0min; c0 <= c0max; c0++) {
+	histp = & histogram[c0][c1][c2min];
+	for (c2 = c2min; c2 <= c2max; c2++)
+	  if (*histp++ != 0) {
+	    boxp->c1min = c1min = c1;
+	    goto have_c1min;
+	  }
+      }
+ have_c1min:
+  if (c1max > c1min)
+    for (c1 = c1max; c1 >= c1min; c1--)
+      for (c0 = c0min; c0 <= c0max; c0++) {
+	histp = & histogram[c0][c1][c2min];
+	for (c2 = c2min; c2 <= c2max; c2++)
+	  if (*histp++ != 0) {
+	    boxp->c1max = c1max = c1;
+	    goto have_c1max;
+	  }
+      }
+ have_c1max:
+  if (c2max > c2min)
+    for (c2 = c2min; c2 <= c2max; c2++)
+      for (c0 = c0min; c0 <= c0max; c0++) {
+	histp = & histogram[c0][c1min][c2];
+	for (c1 = c1min; c1 <= c1max; c1++, histp += HIST_C2_ELEMS)
+	  if (*histp != 0) {
+	    boxp->c2min = c2min = c2;
+	    goto have_c2min;
+	  }
+      }
+ have_c2min:
+  if (c2max > c2min)
+    for (c2 = c2max; c2 >= c2min; c2--)
+      for (c0 = c0min; c0 <= c0max; c0++) {
+	histp = & histogram[c0][c1min][c2];
+	for (c1 = c1min; c1 <= c1max; c1++, histp += HIST_C2_ELEMS)
+	  if (*histp != 0) {
+	    boxp->c2max = c2max = c2;
+	    goto have_c2max;
+	  }
+      }
+ have_c2max:
+
+  /* Update box volume.
+   * We use 2-norm rather than real volume here; this biases the method
+   * against making long narrow boxes, and it has the side benefit that
+   * a box is splittable iff norm > 0.
+   * Since the differences are expressed in histogram-cell units,
+   * we have to shift back to JSAMPLE units to get consistent distances;
+   * after which, we scale according to the selected distance scale factors.
+   */
+  dist0 = ((c0max - c0min) << C0_SHIFT) * C0_SCALE;
+  dist1 = ((c1max - c1min) << C1_SHIFT) * C1_SCALE;
+  dist2 = ((c2max - c2min) << C2_SHIFT) * C2_SCALE;
+  boxp->volume = dist0*dist0 + dist1*dist1 + dist2*dist2;
+
+  /* Now scan remaining volume of box and compute population */
+  ccount = 0;
+  for (c0 = c0min; c0 <= c0max; c0++)
+    for (c1 = c1min; c1 <= c1max; c1++) {
+      histp = & histogram[c0][c1][c2min];
+      for (c2 = c2min; c2 <= c2max; c2++, histp++)
+	if (*histp != 0) {
+	  ccount++;
+	}
+    }
+  boxp->colorcount = ccount;
+}
+
+
+LOCAL(int)
+median_cut (j_decompress_ptr cinfo, boxptr boxlist, int numboxes,
+	    int desired_colors)
+/* Repeatedly select and split the largest box until we have enough boxes */
+{
+  int n,lb;
+  int c0,c1,c2,cmax;
+  register boxptr b1,b2;
+
+  while (numboxes < desired_colors) {
+    /* Select box to split.
+     * Current algorithm: by population for first half, then by volume.
+     */
+    if (numboxes*2 <= desired_colors) {
+      b1 = find_biggest_color_pop(boxlist, numboxes);
+    } else {
+      b1 = find_biggest_volume(boxlist, numboxes);
+    }
+    if (b1 == NULL)		/* no splittable boxes left! */
+      break;
+    b2 = &boxlist[numboxes];	/* where new box will go */
+    /* Copy the color bounds to the new box. */
+    b2->c0max = b1->c0max; b2->c1max = b1->c1max; b2->c2max = b1->c2max;
+    b2->c0min = b1->c0min; b2->c1min = b1->c1min; b2->c2min = b1->c2min;
+    /* Choose which axis to split the box on.
+     * Current algorithm: longest scaled axis.
+     * See notes in update_box about scaling distances.
+     */
+    c0 = ((b1->c0max - b1->c0min) << C0_SHIFT) * C0_SCALE;
+    c1 = ((b1->c1max - b1->c1min) << C1_SHIFT) * C1_SCALE;
+    c2 = ((b1->c2max - b1->c2min) << C2_SHIFT) * C2_SCALE;
+    /* We want to break any ties in favor of green, then red, blue last.
+     * This code does the right thing for R,G,B or B,G,R color orders only.
+     */
+#if RGB_RED == 0
+    cmax = c1; n = 1;
+    if (c0 > cmax) { cmax = c0; n = 0; }
+    if (c2 > cmax) { n = 2; }
+#else
+    cmax = c1; n = 1;
+    if (c2 > cmax) { cmax = c2; n = 2; }
+    if (c0 > cmax) { n = 0; }
+#endif
+    /* Choose split point along selected axis, and update box bounds.
+     * Current algorithm: split at halfway point.
+     * (Since the box has been shrunk to minimum volume,
+     * any split will produce two nonempty subboxes.)
+     * Note that lb value is max for lower box, so must be < old max.
+     */
+    switch (n) {
+    case 0:
+      lb = (b1->c0max + b1->c0min) / 2;
+      b1->c0max = lb;
+      b2->c0min = lb+1;
+      break;
+    case 1:
+      lb = (b1->c1max + b1->c1min) / 2;
+      b1->c1max = lb;
+      b2->c1min = lb+1;
+      break;
+    case 2:
+      lb = (b1->c2max + b1->c2min) / 2;
+      b1->c2max = lb;
+      b2->c2min = lb+1;
+      break;
+    }
+    /* Update stats for boxes */
+    update_box(cinfo, b1);
+    update_box(cinfo, b2);
+    numboxes++;
+  }
+  return numboxes;
+}
+
+
+LOCAL(void)
+compute_color (j_decompress_ptr cinfo, boxptr boxp, int icolor)
+/* Compute representative color for a box, put it in colormap[icolor] */
+{
+  /* Current algorithm: mean weighted by pixels (not colors) */
+  /* Note it is important to get the rounding correct! */
+  my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;
+  hist3d histogram = cquantize->histogram;
+  histptr histp;
+  int c0,c1,c2;
+  int c0min,c0max,c1min,c1max,c2min,c2max;
+  long count;
+  long total = 0;
+  long c0total = 0;
+  long c1total = 0;
+  long c2total = 0;
+
+  c0min = boxp->c0min;  c0max = boxp->c0max;
+  c1min = boxp->c1min;  c1max = boxp->c1max;
+  c2min = boxp->c2min;  c2max = boxp->c2max;
+
+  for (c0 = c0min; c0 <= c0max; c0++)
+    for (c1 = c1min; c1 <= c1max; c1++) {
+      histp = & histogram[c0][c1][c2min];
+      for (c2 = c2min; c2 <= c2max; c2++) {
+	if ((count = *histp++) != 0) {
+	  total += count;
+	  c0total += ((c0 << C0_SHIFT) + ((1<<C0_SHIFT)>>1)) * count;
+	  c1total += ((c1 << C1_SHIFT) + ((1<<C1_SHIFT)>>1)) * count;
+	  c2total += ((c2 << C2_SHIFT) + ((1<<C2_SHIFT)>>1)) * count;
+	}
+      }
+    }
+
+  cinfo->colormap[0][icolor] = (JSAMPLE) ((c0total + (total>>1)) / total);
+  cinfo->colormap[1][icolor] = (JSAMPLE) ((c1total + (total>>1)) / total);
+  cinfo->colormap[2][icolor] = (JSAMPLE) ((c2total + (total>>1)) / total);
+}
+
+
+LOCAL(void)
+select_colors (j_decompress_ptr cinfo, int desired_colors)
+/* Master routine for color selection */
+{
+  boxptr boxlist;
+  int numboxes;
+  int i;
+
+  /* Allocate workspace for box list */
+  boxlist = (boxptr) (*cinfo->mem->alloc_small)
+    ((j_common_ptr) cinfo, JPOOL_IMAGE, desired_colors * SIZEOF(box));
+  /* Initialize one box containing whole space */
+  numboxes = 1;
+  boxlist[0].c0min = 0;
+  boxlist[0].c0max = MAXJSAMPLE >> C0_SHIFT;
+  boxlist[0].c1min = 0;
+  boxlist[0].c1max = MAXJSAMPLE >> C1_SHIFT;
+  boxlist[0].c2min = 0;
+  boxlist[0].c2max = MAXJSAMPLE >> C2_SHIFT;
+  /* Shrink it to actually-used volume and set its statistics */
+  update_box(cinfo, & boxlist[0]);
+  /* Perform median-cut to produce final box list */
+  numboxes = median_cut(cinfo, boxlist, numboxes, desired_colors);
+  /* Compute the representative color for each box, fill colormap */
+  for (i = 0; i < numboxes; i++)
+    compute_color(cinfo, & boxlist[i], i);
+  cinfo->actual_number_of_colors = numboxes;
+  TRACEMS1(cinfo, 1, JTRC_QUANT_SELECTED, numboxes);
+}
+
+
+/*
+ * These routines are concerned with the time-critical task of mapping input
+ * colors to the nearest color in the selected colormap.
+ *
+ * We re-use the histogram space as an "inverse color map", essentially a
+ * cache for the results of nearest-color searches.  All colors within a
+ * histogram cell will be mapped to the same colormap entry, namely the one
+ * closest to the cell's center.  This may not be quite the closest entry to
+ * the actual input color, but it's almost as good.  A zero in the cache
+ * indicates we haven't found the nearest color for that cell yet; the array
+ * is cleared to zeroes before starting the mapping pass.  When we find the
+ * nearest color for a cell, its colormap index plus one is recorded in the
+ * cache for future use.  The pass2 scanning routines call fill_inverse_cmap
+ * when they need to use an unfilled entry in the cache.
+ *
+ * Our method of efficiently finding nearest colors is based on the "locally
+ * sorted search" idea described by Heckbert and on the incremental distance
+ * calculation described by Spencer W. Thomas in chapter III.1 of Graphics
+ * Gems II (James Arvo, ed.  Academic Press, 1991).  Thomas points out that
+ * the distances from a given colormap entry to each cell of the histogram can
+ * be computed quickly using an incremental method: the differences between
+ * distances to adjacent cells themselves differ by a constant.  This allows a
+ * fairly fast implementation of the "brute force" approach of computing the
+ * distance from every colormap entry to every histogram cell.  Unfortunately,
+ * it needs a work array to hold the best-distance-so-far for each histogram
+ * cell (because the inner loop has to be over cells, not colormap entries).
+ * The work array elements have to be INT32s, so the work array would need
+ * 256Kb at our recommended precision.  This is not feasible in DOS machines.
+ *
+ * To get around these problems, we apply Thomas' method to compute the
+ * nearest colors for only the cells within a small subbox of the histogram.
+ * The work array need be only as big as the subbox, so the memory usage
+ * problem is solved.  Furthermore, we need not fill subboxes that are never
+ * referenced in pass2; many images use only part of the color gamut, so a
+ * fair amount of work is saved.  An additional advantage of this
+ * approach is that we can apply Heckbert's locality criterion to quickly
+ * eliminate colormap entries that are far away from the subbox; typically
+ * three-fourths of the colormap entries are rejected by Heckbert's criterion,
+ * and we need not compute their distances to individual cells in the subbox.
+ * The speed of this approach is heavily influenced by the subbox size: too
+ * small means too much overhead, too big loses because Heckbert's criterion
+ * can't eliminate as many colormap entries.  Empirically the best subbox
+ * size seems to be about 1/512th of the histogram (1/8th in each direction).
+ *
+ * Thomas' article also describes a refined method which is asymptotically
+ * faster than the brute-force method, but it is also far more complex and
+ * cannot efficiently be applied to small subboxes.  It is therefore not
+ * useful for programs intended to be portable to DOS machines.  On machines
+ * with plenty of memory, filling the whole histogram in one shot with Thomas'
+ * refined method might be faster than the present code --- but then again,
+ * it might not be any faster, and it's certainly more complicated.
+ */
+
+
+/* log2(histogram cells in update box) for each axis; this can be adjusted */
+#define BOX_C0_LOG  (HIST_C0_BITS-3)
+#define BOX_C1_LOG  (HIST_C1_BITS-3)
+#define BOX_C2_LOG  (HIST_C2_BITS-3)
+
+#define BOX_C0_ELEMS  (1<<BOX_C0_LOG) /* # of hist cells in update box */
+#define BOX_C1_ELEMS  (1<<BOX_C1_LOG)
+#define BOX_C2_ELEMS  (1<<BOX_C2_LOG)
+
+#define BOX_C0_SHIFT  (C0_SHIFT + BOX_C0_LOG)
+#define BOX_C1_SHIFT  (C1_SHIFT + BOX_C1_LOG)
+#define BOX_C2_SHIFT  (C2_SHIFT + BOX_C2_LOG)
+
+
+/*
+ * The next three routines implement inverse colormap filling.  They could
+ * all be folded into one big routine, but splitting them up this way saves
+ * some stack space (the mindist[] and bestdist[] arrays need not coexist)
+ * and may allow some compilers to produce better code by registerizing more
+ * inner-loop variables.
+ */
+
+LOCAL(int)
+find_nearby_colors (j_decompress_ptr cinfo, int minc0, int minc1, int minc2,
+		    JSAMPLE colorlist[])
+/* Locate the colormap entries close enough to an update box to be candidates
+ * for the nearest entry to some cell(s) in the update box.  The update box
+ * is specified by the center coordinates of its first cell.  The number of
+ * candidate colormap entries is returned, and their colormap indexes are
+ * placed in colorlist[].
+ * This routine uses Heckbert's "locally sorted search" criterion to select
+ * the colors that need further consideration.
+ */
+{
+  int numcolors = cinfo->actual_number_of_colors;
+  int maxc0, maxc1, maxc2;
+  int centerc0, centerc1, centerc2;
+  int i, x, ncolors;
+  INT32 minmaxdist, min_dist, max_dist, tdist;
+  INT32 mindist[MAXNUMCOLORS];	/* min distance to colormap entry i */
+
+  /* Compute true coordinates of update box's upper corner and center.
+   * Actually we compute the coordinates of the center of the upper-corner
+   * histogram cell, which are the upper bounds of the volume we care about.
+   * Note that since ">>" rounds down, the "center" values may be closer to
+   * min than to max; hence comparisons to them must be "<=", not "<".
+   */
+  maxc0 = minc0 + ((1 << BOX_C0_SHIFT) - (1 << C0_SHIFT));
+  centerc0 = (minc0 + maxc0) >> 1;
+  maxc1 = minc1 + ((1 << BOX_C1_SHIFT) - (1 << C1_SHIFT));
+  centerc1 = (minc1 + maxc1) >> 1;
+  maxc2 = minc2 + ((1 << BOX_C2_SHIFT) - (1 << C2_SHIFT));
+  centerc2 = (minc2 + maxc2) >> 1;
+
+  /* For each color in colormap, find:
+   *  1. its minimum squared-distance to any point in the update box
+   *     (zero if color is within update box);
+   *  2. its maximum squared-distance to any point in the update box.
+   * Both of these can be found by considering only the corners of the box.
+   * We save the minimum distance for each color in mindist[];
+   * only the smallest maximum distance is of interest.
+   */
+  minmaxdist = 0x7FFFFFFFL;
+
+  for (i = 0; i < numcolors; i++) {
+    /* We compute the squared-c0-distance term, then add in the other two. */
+    x = GETJSAMPLE(cinfo->colormap[0][i]);
+    if (x < minc0) {
+      tdist = (x - minc0) * C0_SCALE;
+      min_dist = tdist*tdist;
+      tdist = (x - maxc0) * C0_SCALE;
+      max_dist = tdist*tdist;
+    } else if (x > maxc0) {
+      tdist = (x - maxc0) * C0_SCALE;
+      min_dist = tdist*tdist;
+      tdist = (x - minc0) * C0_SCALE;
+      max_dist = tdist*tdist;
+    } else {
+      /* within cell range so no contribution to min_dist */
+      min_dist = 0;
+      if (x <= centerc0) {
+	tdist = (x - maxc0) * C0_SCALE;
+	max_dist = tdist*tdist;
+      } else {
+	tdist = (x - minc0) * C0_SCALE;
+	max_dist = tdist*tdist;
+      }
+    }
+
+    x = GETJSAMPLE(cinfo->colormap[1][i]);
+    if (x < minc1) {
+      tdist = (x - minc1) * C1_SCALE;
+      min_dist += tdist*tdist;
+      tdist = (x - maxc1) * C1_SCALE;
+      max_dist += tdist*tdist;
+    } else if (x > maxc1) {
+      tdist = (x - maxc1) * C1_SCALE;
+      min_dist += tdist*tdist;
+      tdist = (x - minc1) * C1_SCALE;
+      max_dist += tdist*tdist;
+    } else {
+      /* within cell range so no contribution to min_dist */
+      if (x <= centerc1) {
+	tdist = (x - maxc1) * C1_SCALE;
+	max_dist += tdist*tdist;
+      } else {
+	tdist = (x - minc1) * C1_SCALE;
+	max_dist += tdist*tdist;
+      }
+    }
+
+    x = GETJSAMPLE(cinfo->colormap[2][i]);
+    if (x < minc2) {
+      tdist = (x - minc2) * C2_SCALE;
+      min_dist += tdist*tdist;
+      tdist = (x - maxc2) * C2_SCALE;
+      max_dist += tdist*tdist;
+    } else if (x > maxc2) {
+      tdist = (x - maxc2) * C2_SCALE;
+      min_dist += tdist*tdist;
+      tdist = (x - minc2) * C2_SCALE;
+      max_dist += tdist*tdist;
+    } else {
+      /* within cell range so no contribution to min_dist */
+      if (x <= centerc2) {
+	tdist = (x - maxc2) * C2_SCALE;
+	max_dist += tdist*tdist;
+      } else {
+	tdist = (x - minc2) * C2_SCALE;
+	max_dist += tdist*tdist;
+      }
+    }
+
+    mindist[i] = min_dist;	/* save away the results */
+    if (max_dist < minmaxdist)
+      minmaxdist = max_dist;
+  }
+
+  /* Now we know that no cell in the update box is more than minmaxdist
+   * away from some colormap entry.  Therefore, only colors that are
+   * within minmaxdist of some part of the box need be considered.
+   */
+  ncolors = 0;
+  for (i = 0; i < numcolors; i++) {
+    if (mindist[i] <= minmaxdist)
+      colorlist[ncolors++] = (JSAMPLE) i;
+  }
+  return ncolors;
+}
+
+
+LOCAL(void)
+find_best_colors (j_decompress_ptr cinfo, int minc0, int minc1, int minc2,
+		  int numcolors, JSAMPLE colorlist[], JSAMPLE bestcolor[])
+/* Find the closest colormap entry for each cell in the update box,
+ * given the list of candidate colors prepared by find_nearby_colors.
+ * Return the indexes of the closest entries in the bestcolor[] array.
+ * This routine uses Thomas' incremental distance calculation method to
+ * find the distance from a colormap entry to successive cells in the box.
+ */
+{
+  int ic0, ic1, ic2;
+  int i, icolor;
+  register INT32 * bptr;	/* pointer into bestdist[] array */
+  JSAMPLE * cptr;		/* pointer into bestcolor[] array */
+  INT32 dist0, dist1;		/* initial distance values */
+  register INT32 dist2;		/* current distance in inner loop */
+  INT32 xx0, xx1;		/* distance increments */
+  register INT32 xx2;
+  INT32 inc0, inc1, inc2;	/* initial values for increments */
+  /* This array holds the distance to the nearest-so-far color for each cell */
+  INT32 bestdist[BOX_C0_ELEMS * BOX_C1_ELEMS * BOX_C2_ELEMS];
+
+  /* Initialize best-distance for each cell of the update box */
+  bptr = bestdist;
+  for (i = BOX_C0_ELEMS*BOX_C1_ELEMS*BOX_C2_ELEMS-1; i >= 0; i--)
+    *bptr++ = 0x7FFFFFFFL;
+
+  /* For each color selected by find_nearby_colors,
+   * compute its distance to the center of each cell in the box.
+   * If that's less than best-so-far, update best distance and color number.
+   */
+
+  /* Nominal steps between cell centers ("x" in Thomas article) */
+#define STEP_C0  ((1 << C0_SHIFT) * C0_SCALE)
+#define STEP_C1  ((1 << C1_SHIFT) * C1_SCALE)
+#define STEP_C2  ((1 << C2_SHIFT) * C2_SCALE)
+
+  for (i = 0; i < numcolors; i++) {
+    icolor = GETJSAMPLE(colorlist[i]);
+    /* Compute (square of) distance from minc0/c1/c2 to this color */
+    inc0 = (minc0 - GETJSAMPLE(cinfo->colormap[0][icolor])) * C0_SCALE;
+    dist0 = inc0*inc0;
+    inc1 = (minc1 - GETJSAMPLE(cinfo->colormap[1][icolor])) * C1_SCALE;
+    dist0 += inc1*inc1;
+    inc2 = (minc2 - GETJSAMPLE(cinfo->colormap[2][icolor])) * C2_SCALE;
+    dist0 += inc2*inc2;
+    /* Form the initial difference increments */
+    inc0 = inc0 * (2 * STEP_C0) + STEP_C0 * STEP_C0;
+    inc1 = inc1 * (2 * STEP_C1) + STEP_C1 * STEP_C1;
+    inc2 = inc2 * (2 * STEP_C2) + STEP_C2 * STEP_C2;
+    /* Now loop over all cells in box, updating distance per Thomas method */
+    bptr = bestdist;
+    cptr = bestcolor;
+    xx0 = inc0;
+    for (ic0 = BOX_C0_ELEMS-1; ic0 >= 0; ic0--) {
+      dist1 = dist0;
+      xx1 = inc1;
+      for (ic1 = BOX_C1_ELEMS-1; ic1 >= 0; ic1--) {
+	dist2 = dist1;
+	xx2 = inc2;
+	for (ic2 = BOX_C2_ELEMS-1; ic2 >= 0; ic2--) {
+	  if (dist2 < *bptr) {
+	    *bptr = dist2;
+	    *cptr = (JSAMPLE) icolor;
+	  }
+	  dist2 += xx2;
+	  xx2 += 2 * STEP_C2 * STEP_C2;
+	  bptr++;
+	  cptr++;
+	}
+	dist1 += xx1;
+	xx1 += 2 * STEP_C1 * STEP_C1;
+      }
+      dist0 += xx0;
+      xx0 += 2 * STEP_C0 * STEP_C0;
+    }
+  }
+}
+
+
+LOCAL(void)
+fill_inverse_cmap (j_decompress_ptr cinfo, int c0, int c1, int c2)
+/* Fill the inverse-colormap entries in the update box that contains */
+/* histogram cell c0/c1/c2.  (Only that one cell MUST be filled, but */
+/* we can fill as many others as we wish.) */
+{
+  my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;
+  hist3d histogram = cquantize->histogram;
+  int minc0, minc1, minc2;	/* lower left corner of update box */
+  int ic0, ic1, ic2;
+  register JSAMPLE * cptr;	/* pointer into bestcolor[] array */
+  register histptr cachep;	/* pointer into main cache array */
+  /* This array lists the candidate colormap indexes. */
+  JSAMPLE colorlist[MAXNUMCOLORS];
+  int numcolors;		/* number of candidate colors */
+  /* This array holds the actually closest colormap index for each cell. */
+  JSAMPLE bestcolor[BOX_C0_ELEMS * BOX_C1_ELEMS * BOX_C2_ELEMS];
+
+  /* Convert cell coordinates to update box ID */
+  c0 >>= BOX_C0_LOG;
+  c1 >>= BOX_C1_LOG;
+  c2 >>= BOX_C2_LOG;
+
+  /* Compute true coordinates of update box's origin corner.
+   * Actually we compute the coordinates of the center of the corner
+   * histogram cell, which are the lower bounds of the volume we care about.
+   */
+  minc0 = (c0 << BOX_C0_SHIFT) + ((1 << C0_SHIFT) >> 1);
+  minc1 = (c1 << BOX_C1_SHIFT) + ((1 << C1_SHIFT) >> 1);
+  minc2 = (c2 << BOX_C2_SHIFT) + ((1 << C2_SHIFT) >> 1);
+
+  /* Determine which colormap entries are close enough to be candidates
+   * for the nearest entry to some cell in the update box.
+   */
+  numcolors = find_nearby_colors(cinfo, minc0, minc1, minc2, colorlist);
+
+  /* Determine the actually nearest colors. */
+  find_best_colors(cinfo, minc0, minc1, minc2, numcolors, colorlist,
+		   bestcolor);
+
+  /* Save the best color numbers (plus 1) in the main cache array */
+  c0 <<= BOX_C0_LOG;		/* convert ID back to base cell indexes */
+  c1 <<= BOX_C1_LOG;
+  c2 <<= BOX_C2_LOG;
+  cptr = bestcolor;
+  for (ic0 = 0; ic0 < BOX_C0_ELEMS; ic0++) {
+    for (ic1 = 0; ic1 < BOX_C1_ELEMS; ic1++) {
+      cachep = & histogram[c0+ic0][c1+ic1][c2];
+      for (ic2 = 0; ic2 < BOX_C2_ELEMS; ic2++) {
+	*cachep++ = (histcell) (GETJSAMPLE(*cptr++) + 1);
+      }
+    }
+  }
+}
+
+
+/*
+ * Map some rows of pixels to the output colormapped representation.
+ */
+
+METHODDEF(void)
+pass2_no_dither (j_decompress_ptr cinfo,
+		 JSAMPARRAY input_buf, JSAMPARRAY output_buf, int num_rows)
+/* This version performs no dithering */
+{
+  my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;
+  hist3d histogram = cquantize->histogram;
+  register JSAMPROW inptr, outptr;
+  register histptr cachep;
+  register int c0, c1, c2;
+  int row;
+  JDIMENSION col;
+  JDIMENSION width = cinfo->output_width;
+
+  for (row = 0; row < num_rows; row++) {
+    inptr = input_buf[row];
+    outptr = output_buf[row];
+    for (col = width; col > 0; col--) {
+      /* get pixel value and index into the cache */
+      c0 = GETJSAMPLE(*inptr++) >> C0_SHIFT;
+      c1 = GETJSAMPLE(*inptr++) >> C1_SHIFT;
+      c2 = GETJSAMPLE(*inptr++) >> C2_SHIFT;
+      cachep = & histogram[c0][c1][c2];
+      /* If we have not seen this color before, find nearest colormap entry */
+      /* and update the cache */
+      if (*cachep == 0)
+	fill_inverse_cmap(cinfo, c0,c1,c2);
+      /* Now emit the colormap index for this cell */
+      *outptr++ = (JSAMPLE) (*cachep - 1);
+    }
+  }
+}
+
+
+METHODDEF(void)
+pass2_fs_dither (j_decompress_ptr cinfo,
+		 JSAMPARRAY input_buf, JSAMPARRAY output_buf, int num_rows)
+/* This version performs Floyd-Steinberg dithering */
+{
+  my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;
+  hist3d histogram = cquantize->histogram;
+  register LOCFSERROR cur0, cur1, cur2;	/* current error or pixel value */
+  LOCFSERROR belowerr0, belowerr1, belowerr2; /* error for pixel below cur */
+  LOCFSERROR bpreverr0, bpreverr1, bpreverr2; /* error for below/prev col */
+  register FSERRPTR errorptr;	/* => fserrors[] at column before current */
+  JSAMPROW inptr;		/* => current input pixel */
+  JSAMPROW outptr;		/* => current output pixel */
+  histptr cachep;
+  int dir;			/* +1 or -1 depending on direction */
+  int dir3;			/* 3*dir, for advancing inptr & errorptr */
+  int row;
+  JDIMENSION col;
+  JDIMENSION width = cinfo->output_width;
+  JSAMPLE *range_limit = cinfo->sample_range_limit;
+  int *error_limit = cquantize->error_limiter;
+  JSAMPROW colormap0 = cinfo->colormap[0];
+  JSAMPROW colormap1 = cinfo->colormap[1];
+  JSAMPROW colormap2 = cinfo->colormap[2];
+  SHIFT_TEMPS
+
+  for (row = 0; row < num_rows; row++) {
+    inptr = input_buf[row];
+    outptr = output_buf[row];
+    if (cquantize->on_odd_row) {
+      /* work right to left in this row */
+      inptr += (width-1) * 3;	/* so point to rightmost pixel */
+      outptr += width-1;
+      dir = -1;
+      dir3 = -3;
+      errorptr = cquantize->fserrors + (width+1)*3; /* => entry after last column */
+      cquantize->on_odd_row = FALSE; /* flip for next time */
+    } else {
+      /* work left to right in this row */
+      dir = 1;
+      dir3 = 3;
+      errorptr = cquantize->fserrors; /* => entry before first real column */
+      cquantize->on_odd_row = TRUE; /* flip for next time */
+    }
+    /* Preset error values: no error propagated to first pixel from left */
+    cur0 = cur1 = cur2 = 0;
+    /* and no error propagated to row below yet */
+    belowerr0 = belowerr1 = belowerr2 = 0;
+    bpreverr0 = bpreverr1 = bpreverr2 = 0;
+
+    for (col = width; col > 0; col--) {
+      /* curN holds the error propagated from the previous pixel on the
+       * current line.  Add the error propagated from the previous line
+       * to form the complete error correction term for this pixel, and
+       * round the error term (which is expressed * 16) to an integer.
+       * RIGHT_SHIFT rounds towards minus infinity, so adding 8 is correct
+       * for either sign of the error value.
+       * Note: errorptr points to *previous* column's array entry.
+       */
+      cur0 = RIGHT_SHIFT(cur0 + errorptr[dir3+0] + 8, 4);
+      cur1 = RIGHT_SHIFT(cur1 + errorptr[dir3+1] + 8, 4);
+      cur2 = RIGHT_SHIFT(cur2 + errorptr[dir3+2] + 8, 4);
+      /* Limit the error using transfer function set by init_error_limit.
+       * See comments with init_error_limit for rationale.
+       */
+      cur0 = error_limit[cur0];
+      cur1 = error_limit[cur1];
+      cur2 = error_limit[cur2];
+      /* Form pixel value + error, and range-limit to 0..MAXJSAMPLE.
+       * The maximum error is +- MAXJSAMPLE (or less with error limiting);
+       * this sets the required size of the range_limit array.
+       */
+      cur0 += GETJSAMPLE(inptr[0]);
+      cur1 += GETJSAMPLE(inptr[1]);
+      cur2 += GETJSAMPLE(inptr[2]);
+      cur0 = GETJSAMPLE(range_limit[cur0]);
+      cur1 = GETJSAMPLE(range_limit[cur1]);
+      cur2 = GETJSAMPLE(range_limit[cur2]);
+      /* Index into the cache with adjusted pixel value */
+      cachep = & histogram[cur0>>C0_SHIFT][cur1>>C1_SHIFT][cur2>>C2_SHIFT];
+      /* If we have not seen this color before, find nearest colormap */
+      /* entry and update the cache */
+      if (*cachep == 0)
+	fill_inverse_cmap(cinfo, cur0>>C0_SHIFT,cur1>>C1_SHIFT,cur2>>C2_SHIFT);
+      /* Now emit the colormap index for this cell */
+      { register int pixcode = *cachep - 1;
+	*outptr = (JSAMPLE) pixcode;
+	/* Compute representation error for this pixel */
+	cur0 -= GETJSAMPLE(colormap0[pixcode]);
+	cur1 -= GETJSAMPLE(colormap1[pixcode]);
+	cur2 -= GETJSAMPLE(colormap2[pixcode]);
+      }
+      /* Compute error fractions to be propagated to adjacent pixels.
+       * Add these into the running sums, and simultaneously shift the
+       * next-line error sums left by 1 column.
+       */
+      { register LOCFSERROR bnexterr, delta;
+
+	bnexterr = cur0;	/* Process component 0 */
+	delta = cur0 * 2;
+	cur0 += delta;		/* form error * 3 */
+	errorptr[0] = (FSERROR) (bpreverr0 + cur0);
+	cur0 += delta;		/* form error * 5 */
+	bpreverr0 = belowerr0 + cur0;
+	belowerr0 = bnexterr;
+	cur0 += delta;		/* form error * 7 */
+	bnexterr = cur1;	/* Process component 1 */
+	delta = cur1 * 2;
+	cur1 += delta;		/* form error * 3 */
+	errorptr[1] = (FSERROR) (bpreverr1 + cur1);
+	cur1 += delta;		/* form error * 5 */
+	bpreverr1 = belowerr1 + cur1;
+	belowerr1 = bnexterr;
+	cur1 += delta;		/* form error * 7 */
+	bnexterr = cur2;	/* Process component 2 */
+	delta = cur2 * 2;
+	cur2 += delta;		/* form error * 3 */
+	errorptr[2] = (FSERROR) (bpreverr2 + cur2);
+	cur2 += delta;		/* form error * 5 */
+	bpreverr2 = belowerr2 + cur2;
+	belowerr2 = bnexterr;
+	cur2 += delta;		/* form error * 7 */
+      }
+      /* At this point curN contains the 7/16 error value to be propagated
+       * to the next pixel on the current line, and all the errors for the
+       * next line have been shifted over.  We are therefore ready to move on.
+       */
+      inptr += dir3;		/* Advance pixel pointers to next column */
+      outptr += dir;
+      errorptr += dir3;		/* advance errorptr to current column */
+    }
+    /* Post-loop cleanup: we must unload the final error values into the
+     * final fserrors[] entry.  Note we need not unload belowerrN because
+     * it is for the dummy column before or after the actual array.
+     */
+    errorptr[0] = (FSERROR) bpreverr0; /* unload prev errs into array */
+    errorptr[1] = (FSERROR) bpreverr1;
+    errorptr[2] = (FSERROR) bpreverr2;
+  }
+}
+
+
+/*
+ * Initialize the error-limiting transfer function (lookup table).
+ * The raw F-S error computation can potentially compute error values of up to
+ * +- MAXJSAMPLE.  But we want the maximum correction applied to a pixel to be
+ * much less, otherwise obviously wrong pixels will be created.  (Typical
+ * effects include weird fringes at color-area boundaries, isolated bright
+ * pixels in a dark area, etc.)  The standard advice for avoiding this problem
+ * is to ensure that the "corners" of the color cube are allocated as output
+ * colors; then repeated errors in the same direction cannot cause cascading
+ * error buildup.  However, that only prevents the error from getting
+ * completely out of hand; Aaron Giles reports that error limiting improves
+ * the results even with corner colors allocated.
+ * A simple clamping of the error values to about +- MAXJSAMPLE/8 works pretty
+ * well, but the smoother transfer function used below is even better.  Thanks
+ * to Aaron Giles for this idea.
+ */
+
+LOCAL(void)
+init_error_limit (j_decompress_ptr cinfo)
+/* Allocate and fill in the error_limiter table */
+{
+  my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;
+  int * table;
+  int in, out;
+
+  table = (int *) (*cinfo->mem->alloc_small)
+    ((j_common_ptr) cinfo, JPOOL_IMAGE, (MAXJSAMPLE*2+1) * SIZEOF(int));
+  table += MAXJSAMPLE;		/* so can index -MAXJSAMPLE .. +MAXJSAMPLE */
+  cquantize->error_limiter = table;
+
+#define STEPSIZE ((MAXJSAMPLE+1)/16)
+  /* Map errors 1:1 up to +- MAXJSAMPLE/16 */
+  out = 0;
+  for (in = 0; in < STEPSIZE; in++, out++) {
+    table[in] = out; table[-in] = -out;
+  }
+  /* Map errors 1:2 up to +- 3*MAXJSAMPLE/16 */
+  for (; in < STEPSIZE*3; in++, out += (in&1) ? 0 : 1) {
+    table[in] = out; table[-in] = -out;
+  }
+  /* Clamp the rest to final out value (which is (MAXJSAMPLE+1)/8) */
+  for (; in <= MAXJSAMPLE; in++) {
+    table[in] = out; table[-in] = -out;
+  }
+#undef STEPSIZE
+}
+
+
+/*
+ * Finish up at the end of each pass.
+ */
+
+METHODDEF(void)
+finish_pass1 (j_decompress_ptr cinfo)
+{
+  my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;
+
+  /* Select the representative colors and fill in cinfo->colormap */
+  cinfo->colormap = cquantize->sv_colormap;
+  select_colors(cinfo, cquantize->desired);
+  /* Force next pass to zero the color index table */
+  cquantize->needs_zeroed = TRUE;
+}
+
+
+METHODDEF(void)
+finish_pass2 (j_decompress_ptr cinfo)
+{
+  /* no work */
+}
+
+
+/*
+ * Initialize for each processing pass.
+ */
+
+METHODDEF(void)
+start_pass_2_quant (j_decompress_ptr cinfo, boolean is_pre_scan)
+{
+  my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;
+  hist3d histogram = cquantize->histogram;
+  int i;
+
+  /* Only F-S dithering or no dithering is supported. */
+  /* If user asks for ordered dither, give him F-S. */
+  if (cinfo->dither_mode != JDITHER_NONE)
+    cinfo->dither_mode = JDITHER_FS;
+
+  if (is_pre_scan) {
+    /* Set up method pointers */
+    cquantize->pub.color_quantize = prescan_quantize;
+    cquantize->pub.finish_pass = finish_pass1;
+    cquantize->needs_zeroed = TRUE; /* Always zero histogram */
+  } else {
+    /* Set up method pointers */
+    if (cinfo->dither_mode == JDITHER_FS)
+      cquantize->pub.color_quantize = pass2_fs_dither;
+    else
+      cquantize->pub.color_quantize = pass2_no_dither;
+    cquantize->pub.finish_pass = finish_pass2;
+
+    /* Make sure color count is acceptable */
+    i = cinfo->actual_number_of_colors;
+    if (i < 1)
+      ERREXIT1(cinfo, JERR_QUANT_FEW_COLORS, 1);
+    if (i > MAXNUMCOLORS)
+      ERREXIT1(cinfo, JERR_QUANT_MANY_COLORS, MAXNUMCOLORS);
+
+    if (cinfo->dither_mode == JDITHER_FS) {
+      size_t arraysize = (size_t) ((cinfo->output_width + 2) *
+				   (3 * SIZEOF(FSERROR)));
+      /* Allocate Floyd-Steinberg workspace if we didn't already. */
+      if (cquantize->fserrors == NULL)
+	cquantize->fserrors = (FSERRPTR) (*cinfo->mem->alloc_large)
+	  ((j_common_ptr) cinfo, JPOOL_IMAGE, arraysize);
+      /* Initialize the propagated errors to zero. */
+      jzero_far((void FAR *) cquantize->fserrors, arraysize);
+      /* Make the error-limit table if we didn't already. */
+      if (cquantize->error_limiter == NULL)
+	init_error_limit(cinfo);
+      cquantize->on_odd_row = FALSE;
+    }
+
+  }
+  /* Zero the histogram or inverse color map, if necessary */
+  if (cquantize->needs_zeroed) {
+    for (i = 0; i < HIST_C0_ELEMS; i++) {
+      jzero_far((void FAR *) histogram[i],
+		HIST_C1_ELEMS*HIST_C2_ELEMS * SIZEOF(histcell));
+    }
+    cquantize->needs_zeroed = FALSE;
+  }
+}
+
+
+/*
+ * Switch to a new external colormap between output passes.
+ */
+
+METHODDEF(void)
+new_color_map_2_quant (j_decompress_ptr cinfo)
+{
+  my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;
+
+  /* Reset the inverse color map */
+  cquantize->needs_zeroed = TRUE;
+}
+
+
+/*
+ * Module initialization routine for 2-pass color quantization.
+ */
+
+GLOBAL(void)
+jinit_2pass_quantizer (j_decompress_ptr cinfo)
+{
+  my_cquantize_ptr cquantize;
+  int i;
+
+  cquantize = (my_cquantize_ptr)
+    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+				SIZEOF(my_cquantizer));
+  cinfo->cquantize = (struct jpeg_color_quantizer *) cquantize;
+  cquantize->pub.start_pass = start_pass_2_quant;
+  cquantize->pub.new_color_map = new_color_map_2_quant;
+  cquantize->fserrors = NULL;	/* flag optional arrays not allocated */
+  cquantize->error_limiter = NULL;
+
+  /* Make sure jdmaster didn't give me a case I can't handle */
+  if (cinfo->out_color_components != 3)
+    ERREXIT(cinfo, JERR_NOTIMPL);
+
+  /* Allocate the histogram/inverse colormap storage */
+  cquantize->histogram = (hist3d) (*cinfo->mem->alloc_small)
+    ((j_common_ptr) cinfo, JPOOL_IMAGE, HIST_C0_ELEMS * SIZEOF(hist2d));
+  for (i = 0; i < HIST_C0_ELEMS; i++) {
+    cquantize->histogram[i] = (hist2d) (*cinfo->mem->alloc_large)
+      ((j_common_ptr) cinfo, JPOOL_IMAGE,
+       HIST_C1_ELEMS*HIST_C2_ELEMS * SIZEOF(histcell));
+  }
+  cquantize->needs_zeroed = TRUE; /* histogram is garbage now */
+
+  /* Allocate storage for the completed colormap, if required.
+   * We do this now since it is FAR storage and may affect
+   * the memory manager's space calculations.
+   */
+  if (cinfo->enable_2pass_quant) {
+    /* Make sure color count is acceptable */
+    int desired = cinfo->desired_number_of_colors;
+    /* Lower bound on # of colors ... somewhat arbitrary as long as > 0 */
+    if (desired < 8)
+      ERREXIT1(cinfo, JERR_QUANT_FEW_COLORS, 8);
+    /* Make sure colormap indexes can be represented by JSAMPLEs */
+    if (desired > MAXNUMCOLORS)
+      ERREXIT1(cinfo, JERR_QUANT_MANY_COLORS, MAXNUMCOLORS);
+    cquantize->sv_colormap = (*cinfo->mem->alloc_sarray)
+      ((j_common_ptr) cinfo,JPOOL_IMAGE, (JDIMENSION) desired, (JDIMENSION) 3);
+    cquantize->desired = desired;
+  } else
+    cquantize->sv_colormap = NULL;
+
+  /* Only F-S dithering or no dithering is supported. */
+  /* If user asks for ordered dither, give him F-S. */
+  if (cinfo->dither_mode != JDITHER_NONE)
+    cinfo->dither_mode = JDITHER_FS;
+
+  /* Allocate Floyd-Steinberg workspace if necessary.
+   * This isn't really needed until pass 2, but again it is FAR storage.
+   * Although we will cope with a later change in dither_mode,
+   * we do not promise to honor max_memory_to_use if dither_mode changes.
+   */
+  if (cinfo->dither_mode == JDITHER_FS) {
+    cquantize->fserrors = (FSERRPTR) (*cinfo->mem->alloc_large)
+      ((j_common_ptr) cinfo, JPOOL_IMAGE,
+       (size_t) ((cinfo->output_width + 2) * (3 * SIZEOF(FSERROR))));
+    /* Might as well create the error-limiting table too. */
+    init_error_limit(cinfo);
+  }
+}
+
+#endif /* QUANT_2PASS_SUPPORTED */
diff --git a/uppsrc/plugin/jpg/lib/jutils.c b/uppsrc/plugin/jpg/lib/jutils.c
new file mode 100644
index 000000000..d18a95556
--- /dev/null
+++ b/uppsrc/plugin/jpg/lib/jutils.c
@@ -0,0 +1,179 @@
+/*
+ * jutils.c
+ *
+ * Copyright (C) 1991-1996, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains tables and miscellaneous utility routines needed
+ * for both compression and decompression.
+ * Note we prefix all global names with "j" to minimize conflicts with
+ * a surrounding application.
+ */
+
+#define JPEG_INTERNALS
+#include "jinclude.h"
+#include "jpeglib.h"
+
+
+/*
+ * jpeg_zigzag_order[i] is the zigzag-order position of the i'th element
+ * of a DCT block read in natural order (left to right, top to bottom).
+ */
+
+#if 0				/* This table is not actually needed in v6a */
+
+const int jpeg_zigzag_order[DCTSIZE2] = {
+   0,  1,  5,  6, 14, 15, 27, 28,
+   2,  4,  7, 13, 16, 26, 29, 42,
+   3,  8, 12, 17, 25, 30, 41, 43,
+   9, 11, 18, 24, 31, 40, 44, 53,
+  10, 19, 23, 32, 39, 45, 52, 54,
+  20, 22, 33, 38, 46, 51, 55, 60,
+  21, 34, 37, 47, 50, 56, 59, 61,
+  35, 36, 48, 49, 57, 58, 62, 63
+};
+
+#endif
+
+/*
+ * jpeg_natural_order[i] is the natural-order position of the i'th element
+ * of zigzag order.
+ *
+ * When reading corrupted data, the Huffman decoders could attempt
+ * to reference an entry beyond the end of this array (if the decoded
+ * zero run length reaches past the end of the block).  To prevent
+ * wild stores without adding an inner-loop test, we put some extra
+ * "63"s after the real entries.  This will cause the extra coefficient
+ * to be stored in location 63 of the block, not somewhere random.
+ * The worst case would be a run-length of 15, which means we need 16
+ * fake entries.
+ */
+
+const int jpeg_natural_order[DCTSIZE2+16] = {
+  0,  1,  8, 16,  9,  2,  3, 10,
+ 17, 24, 32, 25, 18, 11,  4,  5,
+ 12, 19, 26, 33, 40, 48, 41, 34,
+ 27, 20, 13,  6,  7, 14, 21, 28,
+ 35, 42, 49, 56, 57, 50, 43, 36,
+ 29, 22, 15, 23, 30, 37, 44, 51,
+ 58, 59, 52, 45, 38, 31, 39, 46,
+ 53, 60, 61, 54, 47, 55, 62, 63,
+ 63, 63, 63, 63, 63, 63, 63, 63, /* extra entries for safety in decoder */
+ 63, 63, 63, 63, 63, 63, 63, 63
+};
+
+
+/*
+ * Arithmetic utilities
+ */
+
+GLOBAL(long)
+jdiv_round_up (long a, long b)
+/* Compute a/b rounded up to next integer, ie, ceil(a/b) */
+/* Assumes a >= 0, b > 0 */
+{
+  return (a + b - 1L) / b;
+}
+
+
+GLOBAL(long)
+jround_up (long a, long b)
+/* Compute a rounded up to next multiple of b, ie, ceil(a/b)*b */
+/* Assumes a >= 0, b > 0 */
+{
+  a += b - 1L;
+  return a - (a % b);
+}
+
+
+/* On normal machines we can apply MEMCOPY() and MEMZERO() to sample arrays
+ * and coefficient-block arrays.  This won't work on 80x86 because the arrays
+ * are FAR and we're assuming a small-pointer memory model.  However, some
+ * DOS compilers provide far-pointer versions of memcpy() and memset() even
+ * in the small-model libraries.  These will be used if USE_FMEM is defined.
+ * Otherwise, the routines below do it the hard way.  (The performance cost
+ * is not all that great, because these routines aren't very heavily used.)
+ */
+
+#ifndef NEED_FAR_POINTERS	/* normal case, same as regular macros */
+#define FMEMCOPY(dest,src,size)	MEMCOPY(dest,src,size)
+#define FMEMZERO(target,size)	MEMZERO(target,size)
+#else				/* 80x86 case, define if we can */
+#ifdef USE_FMEM
+#define FMEMCOPY(dest,src,size)	_fmemcpy((void FAR *)(dest), (const void FAR *)(src), (size_t)(size))
+#define FMEMZERO(target,size)	_fmemset((void FAR *)(target), 0, (size_t)(size))
+#endif
+#endif
+
+
+GLOBAL(void)
+jcopy_sample_rows (JSAMPARRAY input_array, int source_row,
+		   JSAMPARRAY output_array, int dest_row,
+		   int num_rows, JDIMENSION num_cols)
+/* Copy some rows of samples from one place to another.
+ * num_rows rows are copied from input_array[source_row++]
+ * to output_array[dest_row++]; these areas may overlap for duplication.
+ * The source and destination arrays must be at least as wide as num_cols.
+ */
+{
+  register JSAMPROW inptr, outptr;
+#ifdef FMEMCOPY
+  register size_t count = (size_t) (num_cols * SIZEOF(JSAMPLE));
+#else
+  register JDIMENSION count;
+#endif
+  register int row;
+
+  input_array += source_row;
+  output_array += dest_row;
+
+  for (row = num_rows; row > 0; row--) {
+    inptr = *input_array++;
+    outptr = *output_array++;
+#ifdef FMEMCOPY
+    FMEMCOPY(outptr, inptr, count);
+#else
+    for (count = num_cols; count > 0; count--)
+      *outptr++ = *inptr++;	/* needn't bother with GETJSAMPLE() here */
+#endif
+  }
+}
+
+
+GLOBAL(void)
+jcopy_block_row (JBLOCKROW input_row, JBLOCKROW output_row,
+		 JDIMENSION num_blocks)
+/* Copy a row of coefficient blocks from one place to another. */
+{
+#ifdef FMEMCOPY
+  FMEMCOPY(output_row, input_row, num_blocks * (DCTSIZE2 * SIZEOF(JCOEF)));
+#else
+  register JCOEFPTR inptr, outptr;
+  register long count;
+
+  inptr = (JCOEFPTR) input_row;
+  outptr = (JCOEFPTR) output_row;
+  for (count = (long) num_blocks * DCTSIZE2; count > 0; count--) {
+    *outptr++ = *inptr++;
+  }
+#endif
+}
+
+
+GLOBAL(void)
+jzero_far (void FAR * target, size_t bytestozero)
+/* Zero out a chunk of FAR memory. */
+/* This might be sample-array data, block-array data, or alloc_large data. */
+{
+#ifdef FMEMZERO
+  FMEMZERO(target, bytestozero);
+#else
+  register char FAR * ptr = (char FAR *) target;
+  register size_t count;
+
+  for (count = bytestozero; count > 0; count--) {
+    *ptr++ = 0;
+  }
+#endif
+}
diff --git a/uppsrc/plugin/jpg/lib/jversion.h b/uppsrc/plugin/jpg/lib/jversion.h
new file mode 100644
index 000000000..6472c58d3
--- /dev/null
+++ b/uppsrc/plugin/jpg/lib/jversion.h
@@ -0,0 +1,14 @@
+/*
+ * jversion.h
+ *
+ * Copyright (C) 1991-1998, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains software version identification.
+ */
+
+
+#define JVERSION	"6b  27-Mar-1998"
+
+#define JCOPYRIGHT	"Copyright (C) 1998, Thomas G. Lane"
diff --git a/uppsrc/plugin/jpg/lib/rdbmp.c b/uppsrc/plugin/jpg/lib/rdbmp.c
new file mode 100644
index 000000000..b05fe2ac4
--- /dev/null
+++ b/uppsrc/plugin/jpg/lib/rdbmp.c
@@ -0,0 +1,439 @@
+/*
+ * rdbmp.c
+ *
+ * Copyright (C) 1994-1996, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains routines to read input images in Microsoft "BMP"
+ * format (MS Windows 3.x, OS/2 1.x, and OS/2 2.x flavors).
+ * Currently, only 8-bit and 24-bit images are supported, not 1-bit or
+ * 4-bit (feeding such low-depth images into JPEG would be silly anyway).
+ * Also, we don't support RLE-compressed files.
+ *
+ * These routines may need modification for non-Unix environments or
+ * specialized applications.  As they stand, they assume input from
+ * an ordinary stdio stream.  They further assume that reading begins
+ * at the start of the file; start_input may need work if the
+ * user interface has already read some data (e.g., to determine that
+ * the file is indeed BMP format).
+ *
+ * This code contributed by James Arthur Boucher.
+ */
+
+#include "cdjpeg.h"		/* Common decls for cjpeg/djpeg applications */
+
+#ifdef BMP_SUPPORTED
+
+
+/* Macros to deal with unsigned chars as efficiently as compiler allows */
+
+#ifdef HAVE_UNSIGNED_CHAR
+typedef unsigned char U_CHAR;
+#define UCH(x)	((int) (x))
+#else /* !HAVE_UNSIGNED_CHAR */
+#ifdef CHAR_IS_UNSIGNED
+typedef char U_CHAR;
+#define UCH(x)	((int) (x))
+#else
+typedef char U_CHAR;
+#define UCH(x)	((int) (x) & 0xFF)
+#endif
+#endif /* HAVE_UNSIGNED_CHAR */
+
+
+#define	ReadOK(file,buffer,len)	(JFREAD(file,buffer,len) == ((size_t) (len)))
+
+
+/* Private version of data source object */
+
+typedef struct _bmp_source_struct * bmp_source_ptr;
+
+typedef struct _bmp_source_struct {
+  struct cjpeg_source_struct pub; /* public fields */
+
+  j_compress_ptr cinfo;		/* back link saves passing separate parm */
+
+  JSAMPARRAY colormap;		/* BMP colormap (converted to my format) */
+
+  jvirt_sarray_ptr whole_image;	/* Needed to reverse row order */
+  JDIMENSION source_row;	/* Current source row number */
+  JDIMENSION row_width;		/* Physical width of scanlines in file */
+
+  int bits_per_pixel;		/* remembers 8- or 24-bit format */
+} bmp_source_struct;
+
+
+LOCAL(int)
+read_byte (bmp_source_ptr sinfo)
+/* Read next byte from BMP file */
+{
+  register FILE *infile = sinfo->pub.input_file;
+  register int c;
+
+  if ((c = getc(infile)) == EOF)
+    ERREXIT(sinfo->cinfo, JERR_INPUT_EOF);
+  return c;
+}
+
+
+LOCAL(void)
+read_colormap (bmp_source_ptr sinfo, int cmaplen, int mapentrysize)
+/* Read the colormap from a BMP file */
+{
+  int i;
+
+  switch (mapentrysize) {
+  case 3:
+    /* BGR format (occurs in OS/2 files) */
+    for (i = 0; i < cmaplen; i++) {
+      sinfo->colormap[2][i] = (JSAMPLE) read_byte(sinfo);
+      sinfo->colormap[1][i] = (JSAMPLE) read_byte(sinfo);
+      sinfo->colormap[0][i] = (JSAMPLE) read_byte(sinfo);
+    }
+    break;
+  case 4:
+    /* BGR0 format (occurs in MS Windows files) */
+    for (i = 0; i < cmaplen; i++) {
+      sinfo->colormap[2][i] = (JSAMPLE) read_byte(sinfo);
+      sinfo->colormap[1][i] = (JSAMPLE) read_byte(sinfo);
+      sinfo->colormap[0][i] = (JSAMPLE) read_byte(sinfo);
+      (void) read_byte(sinfo);
+    }
+    break;
+  default:
+    ERREXIT(sinfo->cinfo, JERR_BMP_BADCMAP);
+    break;
+  }
+}
+
+
+/*
+ * Read one row of pixels.
+ * The image has been read into the whole_image array, but is otherwise
+ * unprocessed.  We must read it out in top-to-bottom row order, and if
+ * it is an 8-bit image, we must expand colormapped pixels to 24bit format.
+ */
+
+METHODDEF(JDIMENSION)
+get_8bit_row (j_compress_ptr cinfo, cjpeg_source_ptr sinfo)
+/* This version is for reading 8-bit colormap indexes */
+{
+  bmp_source_ptr source = (bmp_source_ptr) sinfo;
+  register JSAMPARRAY colormap = source->colormap;
+  JSAMPARRAY image_ptr;
+  register int t;
+  register JSAMPROW inptr, outptr;
+  register JDIMENSION col;
+
+  /* Fetch next row from virtual array */
+  source->source_row--;
+  image_ptr = (*cinfo->mem->access_virt_sarray)
+    ((j_common_ptr) cinfo, source->whole_image,
+     source->source_row, (JDIMENSION) 1, FALSE);
+
+  /* Expand the colormap indexes to real data */
+  inptr = image_ptr[0];
+  outptr = source->pub.buffer[0];
+  for (col = cinfo->image_width; col > 0; col--) {
+    t = GETJSAMPLE(*inptr++);
+    *outptr++ = colormap[0][t];	/* can omit GETJSAMPLE() safely */
+    *outptr++ = colormap[1][t];
+    *outptr++ = colormap[2][t];
+  }
+
+  return 1;
+}
+
+
+METHODDEF(JDIMENSION)
+get_24bit_row (j_compress_ptr cinfo, cjpeg_source_ptr sinfo)
+/* This version is for reading 24-bit pixels */
+{
+  bmp_source_ptr source = (bmp_source_ptr) sinfo;
+  JSAMPARRAY image_ptr;
+  register JSAMPROW inptr, outptr;
+  register JDIMENSION col;
+
+  /* Fetch next row from virtual array */
+  source->source_row--;
+  image_ptr = (*cinfo->mem->access_virt_sarray)
+    ((j_common_ptr) cinfo, source->whole_image,
+     source->source_row, (JDIMENSION) 1, FALSE);
+
+  /* Transfer data.  Note source values are in BGR order
+   * (even though Microsoft's own documents say the opposite).
+   */
+  inptr = image_ptr[0];
+  outptr = source->pub.buffer[0];
+  for (col = cinfo->image_width; col > 0; col--) {
+    outptr[2] = *inptr++;	/* can omit GETJSAMPLE() safely */
+    outptr[1] = *inptr++;
+    outptr[0] = *inptr++;
+    outptr += 3;
+  }
+
+  return 1;
+}
+
+
+/*
+ * This method loads the image into whole_image during the first call on
+ * get_pixel_rows.  The get_pixel_rows pointer is then adjusted to call
+ * get_8bit_row or get_24bit_row on subsequent calls.
+ */
+
+METHODDEF(JDIMENSION)
+preload_image (j_compress_ptr cinfo, cjpeg_source_ptr sinfo)
+{
+  bmp_source_ptr source = (bmp_source_ptr) sinfo;
+  register FILE *infile = source->pub.input_file;
+  register int c;
+  register JSAMPROW out_ptr;
+  JSAMPARRAY image_ptr;
+  JDIMENSION row, col;
+  cd_progress_ptr progress = (cd_progress_ptr) cinfo->progress;
+
+  /* Read the data into a virtual array in input-file row order. */
+  for (row = 0; row < cinfo->image_height; row++) {
+    if (progress != NULL) {
+      progress->pub.pass_counter = (long) row;
+      progress->pub.pass_limit = (long) cinfo->image_height;
+      (*progress->pub.progress_monitor) ((j_common_ptr) cinfo);
+    }
+    image_ptr = (*cinfo->mem->access_virt_sarray)
+      ((j_common_ptr) cinfo, source->whole_image,
+       row, (JDIMENSION) 1, TRUE);
+    out_ptr = image_ptr[0];
+    for (col = source->row_width; col > 0; col--) {
+      /* inline copy of read_byte() for speed */
+      if ((c = getc(infile)) == EOF)
+	ERREXIT(cinfo, JERR_INPUT_EOF);
+      *out_ptr++ = (JSAMPLE) c;
+    }
+  }
+  if (progress != NULL)
+    progress->completed_extra_passes++;
+
+  /* Set up to read from the virtual array in top-to-bottom order */
+  switch (source->bits_per_pixel) {
+  case 8:
+    source->pub.get_pixel_rows = get_8bit_row;
+    break;
+  case 24:
+    source->pub.get_pixel_rows = get_24bit_row;
+    break;
+  default:
+    ERREXIT(cinfo, JERR_BMP_BADDEPTH);
+  }
+  source->source_row = cinfo->image_height;
+
+  /* And read the first row */
+  return (*source->pub.get_pixel_rows) (cinfo, sinfo);
+}
+
+
+/*
+ * Read the file header; return image size and component count.
+ */
+
+METHODDEF(void)
+start_input_bmp (j_compress_ptr cinfo, cjpeg_source_ptr sinfo)
+{
+  bmp_source_ptr source = (bmp_source_ptr) sinfo;
+  U_CHAR bmpfileheader[14];
+  U_CHAR bmpinfoheader[64];
+#define GET_2B(array,offset)  ((unsigned int) UCH(array[offset]) + \
+			       (((unsigned int) UCH(array[offset+1])) << 8))
+#define GET_4B(array,offset)  ((INT32) UCH(array[offset]) + \
+			       (((INT32) UCH(array[offset+1])) << 8) + \
+			       (((INT32) UCH(array[offset+2])) << 16) + \
+			       (((INT32) UCH(array[offset+3])) << 24))
+  INT32 bfOffBits;
+  INT32 headerSize;
+  INT32 biWidth = 0;		/* initialize to avoid compiler warning */
+  INT32 biHeight = 0;
+  unsigned int biPlanes;
+  INT32 biCompression;
+  INT32 biXPelsPerMeter,biYPelsPerMeter;
+  INT32 biClrUsed = 0;
+  int mapentrysize = 0;		/* 0 indicates no colormap */
+  INT32 bPad;
+  JDIMENSION row_width;
+
+  /* Read and verify the bitmap file header */
+  if (! ReadOK(source->pub.input_file, bmpfileheader, 14))
+    ERREXIT(cinfo, JERR_INPUT_EOF);
+  if (GET_2B(bmpfileheader,0) != 0x4D42) /* 'BM' */
+    ERREXIT(cinfo, JERR_BMP_NOT);
+  bfOffBits = (INT32) GET_4B(bmpfileheader,10);
+  /* We ignore the remaining fileheader fields */
+
+  /* The infoheader might be 12 bytes (OS/2 1.x), 40 bytes (Windows),
+   * or 64 bytes (OS/2 2.x).  Check the first 4 bytes to find out which.
+   */
+  if (! ReadOK(source->pub.input_file, bmpinfoheader, 4))
+    ERREXIT(cinfo, JERR_INPUT_EOF);
+  headerSize = (INT32) GET_4B(bmpinfoheader,0);
+  if (headerSize < 12 || headerSize > 64)
+    ERREXIT(cinfo, JERR_BMP_BADHEADER);
+  if (! ReadOK(source->pub.input_file, bmpinfoheader+4, headerSize-4))
+    ERREXIT(cinfo, JERR_INPUT_EOF);
+
+  switch ((int) headerSize) {
+  case 12:
+    /* Decode OS/2 1.x header (Microsoft calls this a BITMAPCOREHEADER) */
+    biWidth = (INT32) GET_2B(bmpinfoheader,4);
+    biHeight = (INT32) GET_2B(bmpinfoheader,6);
+    biPlanes = GET_2B(bmpinfoheader,8);
+    source->bits_per_pixel = (int) GET_2B(bmpinfoheader,10);
+
+    switch (source->bits_per_pixel) {
+    case 8:			/* colormapped image */
+      mapentrysize = 3;		/* OS/2 uses RGBTRIPLE colormap */
+      TRACEMS2(cinfo, 1, JTRC_BMP_OS2_MAPPED, (int) biWidth, (int) biHeight);
+      break;
+    case 24:			/* RGB image */
+      TRACEMS2(cinfo, 1, JTRC_BMP_OS2, (int) biWidth, (int) biHeight);
+      break;
+    default:
+      ERREXIT(cinfo, JERR_BMP_BADDEPTH);
+      break;
+    }
+    if (biPlanes != 1)
+      ERREXIT(cinfo, JERR_BMP_BADPLANES);
+    break;
+  case 40:
+  case 64:
+    /* Decode Windows 3.x header (Microsoft calls this a BITMAPINFOHEADER) */
+    /* or OS/2 2.x header, which has additional fields that we ignore */
+    biWidth = GET_4B(bmpinfoheader,4);
+    biHeight = GET_4B(bmpinfoheader,8);
+    biPlanes = GET_2B(bmpinfoheader,12);
+    source->bits_per_pixel = (int) GET_2B(bmpinfoheader,14);
+    biCompression = GET_4B(bmpinfoheader,16);
+    biXPelsPerMeter = GET_4B(bmpinfoheader,24);
+    biYPelsPerMeter = GET_4B(bmpinfoheader,28);
+    biClrUsed = GET_4B(bmpinfoheader,32);
+    /* biSizeImage, biClrImportant fields are ignored */
+
+    switch (source->bits_per_pixel) {
+    case 8:			/* colormapped image */
+      mapentrysize = 4;		/* Windows uses RGBQUAD colormap */
+      TRACEMS2(cinfo, 1, JTRC_BMP_MAPPED, (int) biWidth, (int) biHeight);
+      break;
+    case 24:			/* RGB image */
+      TRACEMS2(cinfo, 1, JTRC_BMP, (int) biWidth, (int) biHeight);
+      break;
+    default:
+      ERREXIT(cinfo, JERR_BMP_BADDEPTH);
+      break;
+    }
+    if (biPlanes != 1)
+      ERREXIT(cinfo, JERR_BMP_BADPLANES);
+    if (biCompression != 0)
+      ERREXIT(cinfo, JERR_BMP_COMPRESSED);
+
+    if (biXPelsPerMeter > 0 && biYPelsPerMeter > 0) {
+      /* Set JFIF density parameters from the BMP data */
+      cinfo->X_density = (UINT16) (biXPelsPerMeter/100); /* 100 cm per meter */
+      cinfo->Y_density = (UINT16) (biYPelsPerMeter/100);
+      cinfo->density_unit = 2;	/* dots/cm */
+    }
+    break;
+  default:
+    ERREXIT(cinfo, JERR_BMP_BADHEADER);
+    break;
+  }
+
+  /* Compute distance to bitmap data --- will adjust for colormap below */
+  bPad = bfOffBits - (headerSize + 14);
+
+  /* Read the colormap, if any */
+  if (mapentrysize > 0) {
+    if (biClrUsed <= 0)
+      biClrUsed = 256;		/* assume it's 256 */
+    else if (biClrUsed > 256)
+      ERREXIT(cinfo, JERR_BMP_BADCMAP);
+    /* Allocate space to store the colormap */
+    source->colormap = (*cinfo->mem->alloc_sarray)
+      ((j_common_ptr) cinfo, JPOOL_IMAGE,
+       (JDIMENSION) biClrUsed, (JDIMENSION) 3);
+    /* and read it from the file */
+    read_colormap(source, (int) biClrUsed, mapentrysize);
+    /* account for size of colormap */
+    bPad -= biClrUsed * mapentrysize;
+  }
+
+  /* Skip any remaining pad bytes */
+  if (bPad < 0)			/* incorrect bfOffBits value? */
+    ERREXIT(cinfo, JERR_BMP_BADHEADER);
+  while (--bPad >= 0) {
+    (void) read_byte(source);
+  }
+
+  /* Compute row width in file, including padding to 4-byte boundary */
+  if (source->bits_per_pixel == 24)
+    row_width = (JDIMENSION) (biWidth * 3);
+  else
+    row_width = (JDIMENSION) biWidth;
+  while ((row_width & 3) != 0) row_width++;
+  source->row_width = row_width;
+
+  /* Allocate space for inversion array, prepare for preload pass */
+  source->whole_image = (*cinfo->mem->request_virt_sarray)
+    ((j_common_ptr) cinfo, JPOOL_IMAGE, FALSE,
+     row_width, (JDIMENSION) biHeight, (JDIMENSION) 1);
+  source->pub.get_pixel_rows = preload_image;
+  if (cinfo->progress != NULL) {
+    cd_progress_ptr progress = (cd_progress_ptr) cinfo->progress;
+    progress->total_extra_passes++; /* count file input as separate pass */
+  }
+
+  /* Allocate one-row buffer for returned data */
+  source->pub.buffer = (*cinfo->mem->alloc_sarray)
+    ((j_common_ptr) cinfo, JPOOL_IMAGE,
+     (JDIMENSION) (biWidth * 3), (JDIMENSION) 1);
+  source->pub.buffer_height = 1;
+
+  cinfo->in_color_space = JCS_RGB;
+  cinfo->input_components = 3;
+  cinfo->data_precision = 8;
+  cinfo->image_width = (JDIMENSION) biWidth;
+  cinfo->image_height = (JDIMENSION) biHeight;
+}
+
+
+/*
+ * Finish up at the end of the file.
+ */
+
+METHODDEF(void)
+finish_input_bmp (j_compress_ptr cinfo, cjpeg_source_ptr sinfo)
+{
+  /* no work */
+}
+
+
+/*
+ * The module selection routine for BMP format input.
+ */
+
+GLOBAL(cjpeg_source_ptr)
+jinit_read_bmp (j_compress_ptr cinfo)
+{
+  bmp_source_ptr source;
+
+  /* Create module interface object */
+  source = (bmp_source_ptr)
+      (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+				  SIZEOF(bmp_source_struct));
+  source->cinfo = cinfo;	/* make back link for subroutines */
+  /* Fill in method ptrs, except get_pixel_rows which start_input sets */
+  source->pub.start_input = start_input_bmp;
+  source->pub.finish_input = finish_input_bmp;
+
+  return (cjpeg_source_ptr) source;
+}
+
+#endif /* BMP_SUPPORTED */
diff --git a/uppsrc/plugin/jpg/lib/rdcolmap.c b/uppsrc/plugin/jpg/lib/rdcolmap.c
new file mode 100644
index 000000000..b12dce073
--- /dev/null
+++ b/uppsrc/plugin/jpg/lib/rdcolmap.c
@@ -0,0 +1,253 @@
+/*
+ * rdcolmap.c
+ *
+ * Copyright (C) 1994-1996, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file implements djpeg's "-map file" switch.  It reads a source image
+ * and constructs a colormap to be supplied to the JPEG decompressor.
+ *
+ * Currently, these file formats are supported for the map file:
+ *   GIF: the contents of the GIF's global colormap are used.
+ *   PPM (either text or raw flavor): the entire file is read and
+ *      each unique pixel value is entered in the map.
+ * Note that reading a large PPM file will be horrendously slow.
+ * Typically, a PPM-format map file should contain just one pixel
+ * of each desired color.  Such a file can be extracted from an
+ * ordinary image PPM file with ppmtomap(1).
+ *
+ * Rescaling a PPM that has a maxval unequal to MAXJSAMPLE is not
+ * currently implemented.
+ */
+
+#include "cdjpeg.h"		/* Common decls for cjpeg/djpeg applications */
+
+#ifdef QUANT_2PASS_SUPPORTED	/* otherwise can't quantize to supplied map */
+
+/* Portions of this code are based on the PBMPLUS library, which is:
+**
+** Copyright (C) 1988 by Jef Poskanzer.
+**
+** Permission to use, copy, modify, and distribute this software and its
+** documentation for any purpose and without fee is hereby granted, provided
+** that the above copyright notice appear in all copies and that both that
+** copyright notice and this permission notice appear in supporting
+** documentation.  This software is provided "as is" without express or
+** implied warranty.
+*/
+
+
+/*
+ * Add a (potentially) new color to the color map.
+ */
+
+LOCAL(void)
+add_map_entry (j_decompress_ptr cinfo, int R, int G, int B)
+{
+  JSAMPROW colormap0 = cinfo->colormap[0];
+  JSAMPROW colormap1 = cinfo->colormap[1];
+  JSAMPROW colormap2 = cinfo->colormap[2];
+  int ncolors = cinfo->actual_number_of_colors;
+  int index;
+
+  /* Check for duplicate color. */
+  for (index = 0; index < ncolors; index++) {
+    if (GETJSAMPLE(colormap0[index]) == R &&
+	GETJSAMPLE(colormap1[index]) == G &&
+	GETJSAMPLE(colormap2[index]) == B)
+      return;			/* color is already in map */
+  }
+
+  /* Check for map overflow. */
+  if (ncolors >= (MAXJSAMPLE+1))
+    ERREXIT1(cinfo, JERR_QUANT_MANY_COLORS, (MAXJSAMPLE+1));
+
+  /* OK, add color to map. */
+  colormap0[ncolors] = (JSAMPLE) R;
+  colormap1[ncolors] = (JSAMPLE) G;
+  colormap2[ncolors] = (JSAMPLE) B;
+  cinfo->actual_number_of_colors++;
+}
+
+
+/*
+ * Extract color map from a GIF file.
+ */
+
+LOCAL(void)
+read_gif_map (j_decompress_ptr cinfo, FILE * infile)
+{
+  int header[13];
+  int i, colormaplen;
+  int R, G, B;
+
+  /* Initial 'G' has already been read by read_color_map */
+  /* Read the rest of the GIF header and logical screen descriptor */
+  for (i = 1; i < 13; i++) {
+    if ((header[i] = getc(infile)) == EOF)
+      ERREXIT(cinfo, JERR_BAD_CMAP_FILE);
+  }
+
+  /* Verify GIF Header */
+  if (header[1] != 'I' || header[2] != 'F')
+    ERREXIT(cinfo, JERR_BAD_CMAP_FILE);
+
+  /* There must be a global color map. */
+  if ((header[10] & 0x80) == 0)
+    ERREXIT(cinfo, JERR_BAD_CMAP_FILE);
+
+  /* OK, fetch it. */
+  colormaplen = 2 << (header[10] & 0x07);
+
+  for (i = 0; i < colormaplen; i++) {
+    R = getc(infile);
+    G = getc(infile);
+    B = getc(infile);
+    if (R == EOF || G == EOF || B == EOF)
+      ERREXIT(cinfo, JERR_BAD_CMAP_FILE);
+    add_map_entry(cinfo,
+		  R << (BITS_IN_JSAMPLE-8),
+		  G << (BITS_IN_JSAMPLE-8),
+		  B << (BITS_IN_JSAMPLE-8));
+  }
+}
+
+
+/* Support routines for reading PPM */
+
+
+LOCAL(int)
+pbm_getc (FILE * infile)
+/* Read next char, skipping over any comments */
+/* A comment/newline sequence is returned as a newline */
+{
+  register int ch;
+
+  ch = getc(infile);
+  if (ch == '#') {
+    do {
+      ch = getc(infile);
+    } while (ch != '\n' && ch != EOF);
+  }
+  return ch;
+}
+
+
+LOCAL(unsigned int)
+read_pbm_integer (j_decompress_ptr cinfo, FILE * infile)
+/* Read an unsigned decimal integer from the PPM file */
+/* Swallows one trailing character after the integer */
+/* Note that on a 16-bit-int machine, only values up to 64k can be read. */
+/* This should not be a problem in practice. */
+{
+  register int ch;
+  register unsigned int val;
+
+  /* Skip any leading whitespace */
+  do {
+    ch = pbm_getc(infile);
+    if (ch == EOF)
+      ERREXIT(cinfo, JERR_BAD_CMAP_FILE);
+  } while (ch == ' ' || ch == '\t' || ch == '\n' || ch == '\r');
+
+  if (ch < '0' || ch > '9')
+    ERREXIT(cinfo, JERR_BAD_CMAP_FILE);
+
+  val = ch - '0';
+  while ((ch = pbm_getc(infile)) >= '0' && ch <= '9') {
+    val *= 10;
+    val += ch - '0';
+  }
+  return val;
+}
+
+
+/*
+ * Extract color map from a PPM file.
+ */
+
+LOCAL(void)
+read_ppm_map (j_decompress_ptr cinfo, FILE * infile)
+{
+  int c;
+  unsigned int w, h, maxval, row, col;
+  int R, G, B;
+
+  /* Initial 'P' has already been read by read_color_map */
+  c = getc(infile);		/* save format discriminator for a sec */
+
+  /* while we fetch the remaining header info */
+  w = read_pbm_integer(cinfo, infile);
+  h = read_pbm_integer(cinfo, infile);
+  maxval = read_pbm_integer(cinfo, infile);
+
+  if (w <= 0 || h <= 0 || maxval <= 0) /* error check */
+    ERREXIT(cinfo, JERR_BAD_CMAP_FILE);
+
+  /* For now, we don't support rescaling from an unusual maxval. */
+  if (maxval != (unsigned int) MAXJSAMPLE)
+    ERREXIT(cinfo, JERR_BAD_CMAP_FILE);
+
+  switch (c) {
+  case '3':			/* it's a text-format PPM file */
+    for (row = 0; row < h; row++) {
+      for (col = 0; col < w; col++) {
+	R = read_pbm_integer(cinfo, infile);
+	G = read_pbm_integer(cinfo, infile);
+	B = read_pbm_integer(cinfo, infile);
+	add_map_entry(cinfo, R, G, B);
+      }
+    }
+    break;
+
+  case '6':			/* it's a raw-format PPM file */
+    for (row = 0; row < h; row++) {
+      for (col = 0; col < w; col++) {
+	R = getc(infile);
+	G = getc(infile);
+	B = getc(infile);
+	if (R == EOF || G == EOF || B == EOF)
+	  ERREXIT(cinfo, JERR_BAD_CMAP_FILE);
+	add_map_entry(cinfo, R, G, B);
+      }
+    }
+    break;
+
+  default:
+    ERREXIT(cinfo, JERR_BAD_CMAP_FILE);
+    break;
+  }
+}
+
+
+/*
+ * Main entry point from djpeg.c.
+ *  Input: opened input file (from file name argument on command line).
+ *  Output: colormap and actual_number_of_colors fields are set in cinfo.
+ */
+
+GLOBAL(void)
+read_color_map (j_decompress_ptr cinfo, FILE * infile)
+{
+  /* Allocate space for a color map of maximum supported size. */
+  cinfo->colormap = (*cinfo->mem->alloc_sarray)
+    ((j_common_ptr) cinfo, JPOOL_IMAGE,
+     (JDIMENSION) (MAXJSAMPLE+1), (JDIMENSION) 3);
+  cinfo->actual_number_of_colors = 0; /* initialize map to empty */
+
+  /* Read first byte to determine file format */
+  switch (getc(infile)) {
+  case 'G':
+    read_gif_map(cinfo, infile);
+    break;
+  case 'P':
+    read_ppm_map(cinfo, infile);
+    break;
+  default:
+    ERREXIT(cinfo, JERR_BAD_CMAP_FILE);
+    break;
+  }
+}
+
+#endif /* QUANT_2PASS_SUPPORTED */
diff --git a/uppsrc/plugin/jpg/lib/rdgif.c b/uppsrc/plugin/jpg/lib/rdgif.c
new file mode 100644
index 000000000..b27c1675d
--- /dev/null
+++ b/uppsrc/plugin/jpg/lib/rdgif.c
@@ -0,0 +1,38 @@
+/*
+ * rdgif.c
+ *
+ * Copyright (C) 1991-1997, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains routines to read input images in GIF format.
+ *
+ *****************************************************************************
+ * NOTE: to avoid entanglements with Unisys' patent on LZW compression,      *
+ * the ability to read GIF files has been removed from the IJG distribution. *
+ * Sorry about that.                                                         *
+ *****************************************************************************
+ *
+ * We are required to state that
+ *    "The Graphics Interchange Format(c) is the Copyright property of
+ *    CompuServe Incorporated. GIF(sm) is a Service Mark property of
+ *    CompuServe Incorporated."
+ */
+
+#include "cdjpeg.h"		/* Common decls for cjpeg/djpeg applications */
+
+#ifdef GIF_SUPPORTED
+
+/*
+ * The module selection routine for GIF format input.
+ */
+
+GLOBAL(cjpeg_source_ptr)
+jinit_read_gif (j_compress_ptr cinfo)
+{
+  fprintf(stderr, "GIF input is unsupported for legal reasons.  Sorry.\n");
+  exit(EXIT_FAILURE);
+  return NULL;			/* keep compiler happy */
+}
+
+#endif /* GIF_SUPPORTED */
diff --git a/uppsrc/plugin/jpg/lib/rdjpgcom.c b/uppsrc/plugin/jpg/lib/rdjpgcom.c
new file mode 100644
index 000000000..ffe6fc621
--- /dev/null
+++ b/uppsrc/plugin/jpg/lib/rdjpgcom.c
@@ -0,0 +1,496 @@
+/*
+ * rdjpgcom.c
+ *
+ * Copyright (C) 1994-1997, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains a very simple stand-alone application that displays
+ * the text in COM (comment) markers in a JFIF file.
+ * This may be useful as an example of the minimum logic needed to parse
+ * JPEG markers.
+ */
+
+#define JPEG_CJPEG_DJPEG	/* to get the command-line config symbols */
+#include "jinclude.h"		/* get auto-config symbols, <stdio.h> */
+
+#include <ctype.h>		/* to declare isupper(), tolower() */
+#ifdef USE_SETMODE
+#include <fcntl.h>		/* to declare setmode()'s parameter macros */
+/* If you have setmode() but not <io.h>, just delete this line: */
+#include <io.h>			/* to declare setmode() */
+#endif
+
+#ifdef USE_CCOMMAND		/* command-line reader for Macintosh */
+#ifdef __MWERKS__
+#include <SIOUX.h>              /* Metrowerks needs this */
+#include <console.h>		/* ... and this */
+#endif
+#ifdef THINK_C
+#include <console.h>		/* Think declares it here */
+#endif
+#endif
+
+#ifdef DONT_USE_B_MODE		/* define mode parameters for fopen() */
+#define READ_BINARY	"r"
+#else
+#ifdef VMS			/* VMS is very nonstandard */
+#define READ_BINARY	"rb", "ctx=stm"
+#else				/* standard ANSI-compliant case */
+#define READ_BINARY	"rb"
+#endif
+#endif
+
+#ifndef EXIT_FAILURE		/* define exit() codes if not provided */
+#define EXIT_FAILURE  1
+#endif
+#ifndef EXIT_SUCCESS
+#ifdef VMS
+#define EXIT_SUCCESS  1		/* VMS is very nonstandard */
+#else
+#define EXIT_SUCCESS  0
+#endif
+#endif
+
+
+/*
+ * These macros are used to read the input file.
+ * To reuse this code in another application, you might need to change these.
+ */
+
+static FILE * infile;		/* input JPEG file */
+
+/* Return next input byte, or EOF if no more */
+#define NEXTBYTE()  getc(infile)
+
+
+/* Error exit handler */
+#define ERREXIT(msg)  (fprintf(stderr, "%s\n", msg), exit(EXIT_FAILURE))
+
+
+/* Read one byte, testing for EOF */
+static int
+read_1_byte (void)
+{
+  int c;
+
+  c = NEXTBYTE();
+  if (c == EOF)
+    ERREXIT("Premature EOF in JPEG file");
+  return c;
+}
+
+/* Read 2 bytes, convert to unsigned int */
+/* All 2-byte quantities in JPEG markers are MSB first */
+static unsigned int
+read_2_bytes (void)
+{
+  int c1, c2;
+
+  c1 = NEXTBYTE();
+  if (c1 == EOF)
+    ERREXIT("Premature EOF in JPEG file");
+  c2 = NEXTBYTE();
+  if (c2 == EOF)
+    ERREXIT("Premature EOF in JPEG file");
+  return (((unsigned int) c1) << 8) + ((unsigned int) c2);
+}
+
+
+/*
+ * JPEG markers consist of one or more 0xFF bytes, followed by a marker
+ * code byte (which is not an FF).  Here are the marker codes of interest
+ * in this program.  (See jdmarker.c for a more complete list.)
+ */
+
+#define M_SOF0  0xC0		/* Start Of Frame N */
+#define M_SOF1  0xC1		/* N indicates which compression process */
+#define M_SOF2  0xC2		/* Only SOF0-SOF2 are now in common use */
+#define M_SOF3  0xC3
+#define M_SOF5  0xC5		/* NB: codes C4 and CC are NOT SOF markers */
+#define M_SOF6  0xC6
+#define M_SOF7  0xC7
+#define M_SOF9  0xC9
+#define M_SOF10 0xCA
+#define M_SOF11 0xCB
+#define M_SOF13 0xCD
+#define M_SOF14 0xCE
+#define M_SOF15 0xCF
+#define M_SOI   0xD8		/* Start Of Image (beginning of datastream) */
+#define M_EOI   0xD9		/* End Of Image (end of datastream) */
+#define M_SOS   0xDA		/* Start Of Scan (begins compressed data) */
+#define M_APP0	0xE0		/* Application-specific marker, type N */
+#define M_APP12	0xEC		/* (we don't bother to list all 16 APPn's) */
+#define M_COM   0xFE		/* COMment */
+
+
+/*
+ * Find the next JPEG marker and return its marker code.
+ * We expect at least one FF byte, possibly more if the compressor used FFs
+ * to pad the file.
+ * There could also be non-FF garbage between markers.  The treatment of such
+ * garbage is unspecified; we choose to skip over it but emit a warning msg.
+ * NB: this routine must not be used after seeing SOS marker, since it will
+ * not deal correctly with FF/00 sequences in the compressed image data...
+ */
+
+static int
+next_marker (void)
+{
+  int c;
+  int discarded_bytes = 0;
+
+  /* Find 0xFF byte; count and skip any non-FFs. */
+  c = read_1_byte();
+  while (c != 0xFF) {
+    discarded_bytes++;
+    c = read_1_byte();
+  }
+  /* Get marker code byte, swallowing any duplicate FF bytes.  Extra FFs
+   * are legal as pad bytes, so don't count them in discarded_bytes.
+   */
+  do {
+    c = read_1_byte();
+  } while (c == 0xFF);
+
+  if (discarded_bytes != 0) {
+    fprintf(stderr, "Warning: garbage data found in JPEG file\n");
+  }
+
+  return c;
+}
+
+
+/*
+ * Read the initial marker, which should be SOI.
+ * For a JFIF file, the first two bytes of the file should be literally
+ * 0xFF M_SOI.  To be more general, we could use next_marker, but if the
+ * input file weren't actually JPEG at all, next_marker might read the whole
+ * file and then return a misleading error message...
+ */
+
+static int
+first_marker (void)
+{
+  int c1, c2;
+
+  c1 = NEXTBYTE();
+  c2 = NEXTBYTE();
+  if (c1 != 0xFF || c2 != M_SOI)
+    ERREXIT("Not a JPEG file");
+  return c2;
+}
+
+
+/*
+ * Most types of marker are followed by a variable-length parameter segment.
+ * This routine skips over the parameters for any marker we don't otherwise
+ * want to process.
+ * Note that we MUST skip the parameter segment explicitly in order not to
+ * be fooled by 0xFF bytes that might appear within the parameter segment;
+ * such bytes do NOT introduce new markers.
+ */
+
+static void
+skip_variable (void)
+/* Skip over an unknown or uninteresting variable-length marker */
+{
+  unsigned int length;
+
+  /* Get the marker parameter length count */
+  length = read_2_bytes();
+  /* Length includes itself, so must be at least 2 */
+  if (length < 2)
+    ERREXIT("Erroneous JPEG marker length");
+  length -= 2;
+  /* Skip over the remaining bytes */
+  while (length > 0) {
+    (void) read_1_byte();
+    length--;
+  }
+}
+
+
+/*
+ * Process a COM marker.
+ * We want to print out the marker contents as legible text;
+ * we must guard against non-text junk and varying newline representations.
+ */
+
+static void
+process_COM (void)
+{
+  unsigned int length;
+  int ch;
+  int lastch = 0;
+
+  /* Get the marker parameter length count */
+  length = read_2_bytes();
+  /* Length includes itself, so must be at least 2 */
+  if (length < 2)
+    ERREXIT("Erroneous JPEG marker length");
+  length -= 2;
+
+  while (length > 0) {
+    ch = read_1_byte();
+    /* Emit the character in a readable form.
+     * Nonprintables are converted to \nnn form,
+     * while \ is converted to \\.
+     * Newlines in CR, CR/LF, or LF form will be printed as one newline.
+     */
+    if (ch == '\r') {
+      printf("\n");
+    } else if (ch == '\n') {
+      if (lastch != '\r')
+	printf("\n");
+    } else if (ch == '\\') {
+      printf("\\\\");
+    } else if (isprint(ch)) {
+      putc(ch, stdout);
+    } else {
+      printf("\\%03o", ch);
+    }
+    lastch = ch;
+    length--;
+  }
+  printf("\n");
+}
+
+
+/*
+ * Process a SOFn marker.
+ * This code is only needed if you want to know the image dimensions...
+ */
+
+static void
+process_SOFn (int marker)
+{
+  unsigned int length;
+  unsigned int image_height, image_width;
+  int data_precision, num_components;
+  const char * process;
+  int ci;
+
+  length = read_2_bytes();	/* usual parameter length count */
+
+  data_precision = read_1_byte();
+  image_height = read_2_bytes();
+  image_width = read_2_bytes();
+  num_components = read_1_byte();
+
+  switch (marker) {
+  case M_SOF0:	process = "Baseline";  break;
+  case M_SOF1:	process = "Extended sequential";  break;
+  case M_SOF2:	process = "Progressive";  break;
+  case M_SOF3:	process = "Lossless";  break;
+  case M_SOF5:	process = "Differential sequential";  break;
+  case M_SOF6:	process = "Differential progressive";  break;
+  case M_SOF7:	process = "Differential lossless";  break;
+  case M_SOF9:	process = "Extended sequential, arithmetic coding";  break;
+  case M_SOF10:	process = "Progressive, arithmetic coding";  break;
+  case M_SOF11:	process = "Lossless, arithmetic coding";  break;
+  case M_SOF13:	process = "Differential sequential, arithmetic coding";  break;
+  case M_SOF14:	process = "Differential progressive, arithmetic coding"; break;
+  case M_SOF15:	process = "Differential lossless, arithmetic coding";  break;
+  default:	process = "Unknown";  break;
+  }
+
+  printf("JPEG image is %uw * %uh, %d color components, %d bits per sample\n",
+	 image_width, image_height, num_components, data_precision);
+  printf("JPEG process: %s\n", process);
+
+  if (length != (unsigned int) (8 + num_components * 3))
+    ERREXIT("Bogus SOF marker length");
+
+  for (ci = 0; ci < num_components; ci++) {
+    (void) read_1_byte();	/* Component ID code */
+    (void) read_1_byte();	/* H, V sampling factors */
+    (void) read_1_byte();	/* Quantization table number */
+  }
+}
+
+
+/*
+ * Parse the marker stream until SOS or EOI is seen;
+ * display any COM markers.
+ * While the companion program wrjpgcom will always insert COM markers before
+ * SOFn, other implementations might not, so we scan to SOS before stopping.
+ * If we were only interested in the image dimensions, we would stop at SOFn.
+ * (Conversely, if we only cared about COM markers, there would be no need
+ * for special code to handle SOFn; we could treat it like other markers.)
+ */
+
+static int
+scan_JPEG_header (int verbose)
+{
+  int marker;
+
+  /* Expect SOI at start of file */
+  if (first_marker() != M_SOI)
+    ERREXIT("Expected SOI marker first");
+
+  /* Scan miscellaneous markers until we reach SOS. */
+  for (;;) {
+    marker = next_marker();
+    switch (marker) {
+      /* Note that marker codes 0xC4, 0xC8, 0xCC are not, and must not be,
+       * treated as SOFn.  C4 in particular is actually DHT.
+       */
+    case M_SOF0:		/* Baseline */
+    case M_SOF1:		/* Extended sequential, Huffman */
+    case M_SOF2:		/* Progressive, Huffman */
+    case M_SOF3:		/* Lossless, Huffman */
+    case M_SOF5:		/* Differential sequential, Huffman */
+    case M_SOF6:		/* Differential progressive, Huffman */
+    case M_SOF7:		/* Differential lossless, Huffman */
+    case M_SOF9:		/* Extended sequential, arithmetic */
+    case M_SOF10:		/* Progressive, arithmetic */
+    case M_SOF11:		/* Lossless, arithmetic */
+    case M_SOF13:		/* Differential sequential, arithmetic */
+    case M_SOF14:		/* Differential progressive, arithmetic */
+    case M_SOF15:		/* Differential lossless, arithmetic */
+      if (verbose)
+	process_SOFn(marker);
+      else
+	skip_variable();
+      break;
+
+    case M_SOS:			/* stop before hitting compressed data */
+      return marker;
+
+    case M_EOI:			/* in case it's a tables-only JPEG stream */
+      return marker;
+
+    case M_COM:
+      process_COM();
+      break;
+
+    case M_APP12:
+      /* Some digital camera makers put useful textual information into
+       * APP12 markers, so we print those out too when in -verbose mode.
+       */
+      if (verbose) {
+	printf("APP12 contains:\n");
+	process_COM();
+      } else
+	skip_variable();
+      break;
+
+    default:			/* Anything else just gets skipped */
+      skip_variable();		/* we assume it has a parameter count... */
+      break;
+    }
+  } /* end loop */
+}
+
+
+/* Command line parsing code */
+
+static const char * progname;	/* program name for error messages */
+
+
+static void
+usage (void)
+/* complain about bad command line */
+{
+  fprintf(stderr, "rdjpgcom displays any textual comments in a JPEG file.\n");
+
+  fprintf(stderr, "Usage: %s [switches] [inputfile]\n", progname);
+
+  fprintf(stderr, "Switches (names may be abbreviated):\n");
+  fprintf(stderr, "  -verbose    Also display dimensions of JPEG image\n");
+
+  exit(EXIT_FAILURE);
+}
+
+
+static int
+keymatch (char * arg, const char * keyword, int minchars)
+/* Case-insensitive matching of (possibly abbreviated) keyword switches. */
+/* keyword is the constant keyword (must be lower case already), */
+/* minchars is length of minimum legal abbreviation. */
+{
+  register int ca, ck;
+  register int nmatched = 0;
+
+  while ((ca = *arg++) != '\0') {
+    if ((ck = *keyword++) == '\0')
+      return 0;			/* arg longer than keyword, no good */
+    if (isupper(ca))		/* force arg to lcase (assume ck is already) */
+      ca = tolower(ca);
+    if (ca != ck)
+      return 0;			/* no good */
+    nmatched++;			/* count matched characters */
+  }
+  /* reached end of argument; fail if it's too short for unique abbrev */
+  if (nmatched < minchars)
+    return 0;
+  return 1;			/* A-OK */
+}
+
+
+/*
+ * The main program.
+ */
+
+int
+main (int argc, char **argv)
+{
+  int argn;
+  char * arg;
+  int verbose = 0;
+
+  /* On Mac, fetch a command line. */
+#ifdef USE_CCOMMAND
+  argc = ccommand(&argv);
+#endif
+
+  progname = argv[0];
+  if (progname == NULL || progname[0] == 0)
+    progname = "rdjpgcom";	/* in case C library doesn't provide it */
+
+  /* Parse switches, if any */
+  for (argn = 1; argn < argc; argn++) {
+    arg = argv[argn];
+    if (arg[0] != '-')
+      break;			/* not switch, must be file name */
+    arg++;			/* advance over '-' */
+    if (keymatch(arg, "verbose", 1)) {
+      verbose++;
+    } else
+      usage();
+  }
+
+  /* Open the input file. */
+  /* Unix style: expect zero or one file name */
+  if (argn < argc-1) {
+    fprintf(stderr, "%s: only one input file\n", progname);
+    usage();
+  }
+  if (argn < argc) {
+    if ((infile = fopen(argv[argn], READ_BINARY)) == NULL) {
+      fprintf(stderr, "%s: can't open %s\n", progname, argv[argn]);
+      exit(EXIT_FAILURE);
+    }
+  } else {
+    /* default input file is stdin */
+#ifdef USE_SETMODE		/* need to hack file mode? */
+    setmode(fileno(stdin), O_BINARY);
+#endif
+#ifdef USE_FDOPEN		/* need to re-open in binary mode? */
+    if ((infile = fdopen(fileno(stdin), READ_BINARY)) == NULL) {
+      fprintf(stderr, "%s: can't open stdin\n", progname);
+      exit(EXIT_FAILURE);
+    }
+#else
+    infile = stdin;
+#endif
+  }
+
+  /* Scan the JPEG headers. */
+  (void) scan_JPEG_header(verbose);
+
+  /* All done. */
+  exit(EXIT_SUCCESS);
+  return 0;			/* suppress no-return-value warnings */
+}
diff --git a/uppsrc/plugin/jpg/lib/rdppm.c b/uppsrc/plugin/jpg/lib/rdppm.c
new file mode 100644
index 000000000..1df35c1b3
--- /dev/null
+++ b/uppsrc/plugin/jpg/lib/rdppm.c
@@ -0,0 +1,458 @@
+/*
+ * rdppm.c
+ *
+ * Copyright (C) 1991-1997, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains routines to read input images in PPM/PGM format.
+ * The extended 2-byte-per-sample raw PPM/PGM formats are supported.
+ * The PBMPLUS library is NOT required to compile this software
+ * (but it is highly useful as a set of PPM image manipulation programs).
+ *
+ * These routines may need modification for non-Unix environments or
+ * specialized applications.  As they stand, they assume input from
+ * an ordinary stdio stream.  They further assume that reading begins
+ * at the start of the file; start_input may need work if the
+ * user interface has already read some data (e.g., to determine that
+ * the file is indeed PPM format).
+ */
+
+#include "cdjpeg.h"		/* Common decls for cjpeg/djpeg applications */
+
+#ifdef PPM_SUPPORTED
+
+
+/* Portions of this code are based on the PBMPLUS library, which is:
+**
+** Copyright (C) 1988 by Jef Poskanzer.
+**
+** Permission to use, copy, modify, and distribute this software and its
+** documentation for any purpose and without fee is hereby granted, provided
+** that the above copyright notice appear in all copies and that both that
+** copyright notice and this permission notice appear in supporting
+** documentation.  This software is provided "as is" without express or
+** implied warranty.
+*/
+
+
+/* Macros to deal with unsigned chars as efficiently as compiler allows */
+
+#ifdef HAVE_UNSIGNED_CHAR
+typedef unsigned char U_CHAR;
+#define UCH(x)	((int) (x))
+#else /* !HAVE_UNSIGNED_CHAR */
+#ifdef CHAR_IS_UNSIGNED
+typedef char U_CHAR;
+#define UCH(x)	((int) (x))
+#else
+typedef char U_CHAR;
+#define UCH(x)	((int) (x) & 0xFF)
+#endif
+#endif /* HAVE_UNSIGNED_CHAR */
+
+
+#define	ReadOK(file,buffer,len)	(JFREAD(file,buffer,len) == ((size_t) (len)))
+
+
+/*
+ * On most systems, reading individual bytes with getc() is drastically less
+ * efficient than buffering a row at a time with fread().  On PCs, we must
+ * allocate the buffer in near data space, because we are assuming small-data
+ * memory model, wherein fread() can't reach far memory.  If you need to
+ * process very wide images on a PC, you might have to compile in large-memory
+ * model, or else replace fread() with a getc() loop --- which will be much
+ * slower.
+ */
+
+
+/* Private version of data source object */
+
+typedef struct {
+  struct cjpeg_source_struct pub; /* public fields */
+
+  U_CHAR *iobuffer;		/* non-FAR pointer to I/O buffer */
+  JSAMPROW pixrow;		/* FAR pointer to same */
+  size_t buffer_width;		/* width of I/O buffer */
+  JSAMPLE *rescale;		/* => maxval-remapping array, or NULL */
+} ppm_source_struct;
+
+typedef ppm_source_struct * ppm_source_ptr;
+
+
+LOCAL(int)
+pbm_getc (FILE * infile)
+/* Read next char, skipping over any comments */
+/* A comment/newline sequence is returned as a newline */
+{
+  register int ch;
+
+  ch = getc(infile);
+  if (ch == '#') {
+    do {
+      ch = getc(infile);
+    } while (ch != '\n' && ch != EOF);
+  }
+  return ch;
+}
+
+
+LOCAL(unsigned int)
+read_pbm_integer (j_compress_ptr cinfo, FILE * infile)
+/* Read an unsigned decimal integer from the PPM file */
+/* Swallows one trailing character after the integer */
+/* Note that on a 16-bit-int machine, only values up to 64k can be read. */
+/* This should not be a problem in practice. */
+{
+  register int ch;
+  register unsigned int val;
+
+  /* Skip any leading whitespace */
+  do {
+    ch = pbm_getc(infile);
+    if (ch == EOF)
+      ERREXIT(cinfo, JERR_INPUT_EOF);
+  } while (ch == ' ' || ch == '\t' || ch == '\n' || ch == '\r');
+
+  if (ch < '0' || ch > '9')
+    ERREXIT(cinfo, JERR_PPM_NONNUMERIC);
+
+  val = ch - '0';
+  while ((ch = pbm_getc(infile)) >= '0' && ch <= '9') {
+    val *= 10;
+    val += ch - '0';
+  }
+  return val;
+}
+
+
+/*
+ * Read one row of pixels.
+ *
+ * We provide several different versions depending on input file format.
+ * In all cases, input is scaled to the size of JSAMPLE.
+ *
+ * A really fast path is provided for reading byte/sample raw files with
+ * maxval = MAXJSAMPLE, which is the normal case for 8-bit data.
+ */
+
+
+METHODDEF(JDIMENSION)
+get_text_gray_row (j_compress_ptr cinfo, cjpeg_source_ptr sinfo)
+/* This version is for reading text-format PGM files with any maxval */
+{
+  ppm_source_ptr source = (ppm_source_ptr) sinfo;
+  FILE * infile = source->pub.input_file;
+  register JSAMPROW ptr;
+  register JSAMPLE *rescale = source->rescale;
+  JDIMENSION col;
+
+  ptr = source->pub.buffer[0];
+  for (col = cinfo->image_width; col > 0; col--) {
+    *ptr++ = rescale[read_pbm_integer(cinfo, infile)];
+  }
+  return 1;
+}
+
+
+METHODDEF(JDIMENSION)
+get_text_rgb_row (j_compress_ptr cinfo, cjpeg_source_ptr sinfo)
+/* This version is for reading text-format PPM files with any maxval */
+{
+  ppm_source_ptr source = (ppm_source_ptr) sinfo;
+  FILE * infile = source->pub.input_file;
+  register JSAMPROW ptr;
+  register JSAMPLE *rescale = source->rescale;
+  JDIMENSION col;
+
+  ptr = source->pub.buffer[0];
+  for (col = cinfo->image_width; col > 0; col--) {
+    *ptr++ = rescale[read_pbm_integer(cinfo, infile)];
+    *ptr++ = rescale[read_pbm_integer(cinfo, infile)];
+    *ptr++ = rescale[read_pbm_integer(cinfo, infile)];
+  }
+  return 1;
+}
+
+
+METHODDEF(JDIMENSION)
+get_scaled_gray_row (j_compress_ptr cinfo, cjpeg_source_ptr sinfo)
+/* This version is for reading raw-byte-format PGM files with any maxval */
+{
+  ppm_source_ptr source = (ppm_source_ptr) sinfo;
+  register JSAMPROW ptr;
+  register U_CHAR * bufferptr;
+  register JSAMPLE *rescale = source->rescale;
+  JDIMENSION col;
+
+  if (! ReadOK(source->pub.input_file, source->iobuffer, source->buffer_width))
+    ERREXIT(cinfo, JERR_INPUT_EOF);
+  ptr = source->pub.buffer[0];
+  bufferptr = source->iobuffer;
+  for (col = cinfo->image_width; col > 0; col--) {
+    *ptr++ = rescale[UCH(*bufferptr++)];
+  }
+  return 1;
+}
+
+
+METHODDEF(JDIMENSION)
+get_scaled_rgb_row (j_compress_ptr cinfo, cjpeg_source_ptr sinfo)
+/* This version is for reading raw-byte-format PPM files with any maxval */
+{
+  ppm_source_ptr source = (ppm_source_ptr) sinfo;
+  register JSAMPROW ptr;
+  register U_CHAR * bufferptr;
+  register JSAMPLE *rescale = source->rescale;
+  JDIMENSION col;
+
+  if (! ReadOK(source->pub.input_file, source->iobuffer, source->buffer_width))
+    ERREXIT(cinfo, JERR_INPUT_EOF);
+  ptr = source->pub.buffer[0];
+  bufferptr = source->iobuffer;
+  for (col = cinfo->image_width; col > 0; col--) {
+    *ptr++ = rescale[UCH(*bufferptr++)];
+    *ptr++ = rescale[UCH(*bufferptr++)];
+    *ptr++ = rescale[UCH(*bufferptr++)];
+  }
+  return 1;
+}
+
+
+METHODDEF(JDIMENSION)
+get_raw_row (j_compress_ptr cinfo, cjpeg_source_ptr sinfo)
+/* This version is for reading raw-byte-format files with maxval = MAXJSAMPLE.
+ * In this case we just read right into the JSAMPLE buffer!
+ * Note that same code works for PPM and PGM files.
+ */
+{
+  ppm_source_ptr source = (ppm_source_ptr) sinfo;
+
+  if (! ReadOK(source->pub.input_file, source->iobuffer, source->buffer_width))
+    ERREXIT(cinfo, JERR_INPUT_EOF);
+  return 1;
+}
+
+
+METHODDEF(JDIMENSION)
+get_word_gray_row (j_compress_ptr cinfo, cjpeg_source_ptr sinfo)
+/* This version is for reading raw-word-format PGM files with any maxval */
+{
+  ppm_source_ptr source = (ppm_source_ptr) sinfo;
+  register JSAMPROW ptr;
+  register U_CHAR * bufferptr;
+  register JSAMPLE *rescale = source->rescale;
+  JDIMENSION col;
+
+  if (! ReadOK(source->pub.input_file, source->iobuffer, source->buffer_width))
+    ERREXIT(cinfo, JERR_INPUT_EOF);
+  ptr = source->pub.buffer[0];
+  bufferptr = source->iobuffer;
+  for (col = cinfo->image_width; col > 0; col--) {
+    register int temp;
+    temp  = UCH(*bufferptr++);
+    temp |= UCH(*bufferptr++) << 8;
+    *ptr++ = rescale[temp];
+  }
+  return 1;
+}
+
+
+METHODDEF(JDIMENSION)
+get_word_rgb_row (j_compress_ptr cinfo, cjpeg_source_ptr sinfo)
+/* This version is for reading raw-word-format PPM files with any maxval */
+{
+  ppm_source_ptr source = (ppm_source_ptr) sinfo;
+  register JSAMPROW ptr;
+  register U_CHAR * bufferptr;
+  register JSAMPLE *rescale = source->rescale;
+  JDIMENSION col;
+
+  if (! ReadOK(source->pub.input_file, source->iobuffer, source->buffer_width))
+    ERREXIT(cinfo, JERR_INPUT_EOF);
+  ptr = source->pub.buffer[0];
+  bufferptr = source->iobuffer;
+  for (col = cinfo->image_width; col > 0; col--) {
+    register int temp;
+    temp  = UCH(*bufferptr++);
+    temp |= UCH(*bufferptr++) << 8;
+    *ptr++ = rescale[temp];
+    temp  = UCH(*bufferptr++);
+    temp |= UCH(*bufferptr++) << 8;
+    *ptr++ = rescale[temp];
+    temp  = UCH(*bufferptr++);
+    temp |= UCH(*bufferptr++) << 8;
+    *ptr++ = rescale[temp];
+  }
+  return 1;
+}
+
+
+/*
+ * Read the file header; return image size and component count.
+ */
+
+METHODDEF(void)
+start_input_ppm (j_compress_ptr cinfo, cjpeg_source_ptr sinfo)
+{
+  ppm_source_ptr source = (ppm_source_ptr) sinfo;
+  int c;
+  unsigned int w, h, maxval;
+  boolean need_iobuffer, use_raw_buffer, need_rescale;
+
+  if (getc(source->pub.input_file) != 'P')
+    ERREXIT(cinfo, JERR_PPM_NOT);
+
+  c = getc(source->pub.input_file); /* subformat discriminator character */
+
+  /* detect unsupported variants (ie, PBM) before trying to read header */
+  switch (c) {
+  case '2':			/* it's a text-format PGM file */
+  case '3':			/* it's a text-format PPM file */
+  case '5':			/* it's a raw-format PGM file */
+  case '6':			/* it's a raw-format PPM file */
+    break;
+  default:
+    ERREXIT(cinfo, JERR_PPM_NOT);
+    break;
+  }
+
+  /* fetch the remaining header info */
+  w = read_pbm_integer(cinfo, source->pub.input_file);
+  h = read_pbm_integer(cinfo, source->pub.input_file);
+  maxval = read_pbm_integer(cinfo, source->pub.input_file);
+
+  if (w <= 0 || h <= 0 || maxval <= 0) /* error check */
+    ERREXIT(cinfo, JERR_PPM_NOT);
+
+  cinfo->data_precision = BITS_IN_JSAMPLE; /* we always rescale data to this */
+  cinfo->image_width = (JDIMENSION) w;
+  cinfo->image_height = (JDIMENSION) h;
+
+  /* initialize flags to most common settings */
+  need_iobuffer = TRUE;		/* do we need an I/O buffer? */
+  use_raw_buffer = FALSE;	/* do we map input buffer onto I/O buffer? */
+  need_rescale = TRUE;		/* do we need a rescale array? */
+
+  switch (c) {
+  case '2':			/* it's a text-format PGM file */
+    cinfo->input_components = 1;
+    cinfo->in_color_space = JCS_GRAYSCALE;
+    TRACEMS2(cinfo, 1, JTRC_PGM_TEXT, w, h);
+    source->pub.get_pixel_rows = get_text_gray_row;
+    need_iobuffer = FALSE;
+    break;
+
+  case '3':			/* it's a text-format PPM file */
+    cinfo->input_components = 3;
+    cinfo->in_color_space = JCS_RGB;
+    TRACEMS2(cinfo, 1, JTRC_PPM_TEXT, w, h);
+    source->pub.get_pixel_rows = get_text_rgb_row;
+    need_iobuffer = FALSE;
+    break;
+
+  case '5':			/* it's a raw-format PGM file */
+    cinfo->input_components = 1;
+    cinfo->in_color_space = JCS_GRAYSCALE;
+    TRACEMS2(cinfo, 1, JTRC_PGM, w, h);
+    if (maxval > 255) {
+      source->pub.get_pixel_rows = get_word_gray_row;
+    } else if (maxval == MAXJSAMPLE && SIZEOF(JSAMPLE) == SIZEOF(U_CHAR)) {
+      source->pub.get_pixel_rows = get_raw_row;
+      use_raw_buffer = TRUE;
+      need_rescale = FALSE;
+    } else {
+      source->pub.get_pixel_rows = get_scaled_gray_row;
+    }
+    break;
+
+  case '6':			/* it's a raw-format PPM file */
+    cinfo->input_components = 3;
+    cinfo->in_color_space = JCS_RGB;
+    TRACEMS2(cinfo, 1, JTRC_PPM, w, h);
+    if (maxval > 255) {
+      source->pub.get_pixel_rows = get_word_rgb_row;
+    } else if (maxval == MAXJSAMPLE && SIZEOF(JSAMPLE) == SIZEOF(U_CHAR)) {
+      source->pub.get_pixel_rows = get_raw_row;
+      use_raw_buffer = TRUE;
+      need_rescale = FALSE;
+    } else {
+      source->pub.get_pixel_rows = get_scaled_rgb_row;
+    }
+    break;
+  }
+
+  /* Allocate space for I/O buffer: 1 or 3 bytes or words/pixel. */
+  if (need_iobuffer) {
+    source->buffer_width = (size_t) w * cinfo->input_components *
+      ((maxval<=255) ? SIZEOF(U_CHAR) : (2*SIZEOF(U_CHAR)));
+    source->iobuffer = (U_CHAR *)
+      (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+				  source->buffer_width);
+  }
+
+  /* Create compressor input buffer. */
+  if (use_raw_buffer) {
+    /* For unscaled raw-input case, we can just map it onto the I/O buffer. */
+    /* Synthesize a JSAMPARRAY pointer structure */
+    /* Cast here implies near->far pointer conversion on PCs */
+    source->pixrow = (JSAMPROW) source->iobuffer;
+    source->pub.buffer = & source->pixrow;
+    source->pub.buffer_height = 1;
+  } else {
+    /* Need to translate anyway, so make a separate sample buffer. */
+    source->pub.buffer = (*cinfo->mem->alloc_sarray)
+      ((j_common_ptr) cinfo, JPOOL_IMAGE,
+       (JDIMENSION) w * cinfo->input_components, (JDIMENSION) 1);
+    source->pub.buffer_height = 1;
+  }
+
+  /* Compute the rescaling array if required. */
+  if (need_rescale) {
+    INT32 val, half_maxval;
+
+    /* On 16-bit-int machines we have to be careful of maxval = 65535 */
+    source->rescale = (JSAMPLE *)
+      (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+				  (size_t) (((long) maxval + 1L) * SIZEOF(JSAMPLE)));
+    half_maxval = maxval / 2;
+    for (val = 0; val <= (INT32) maxval; val++) {
+      /* The multiplication here must be done in 32 bits to avoid overflow */
+      source->rescale[val] = (JSAMPLE) ((val*MAXJSAMPLE + half_maxval)/maxval);
+    }
+  }
+}
+
+
+/*
+ * Finish up at the end of the file.
+ */
+
+METHODDEF(void)
+finish_input_ppm (j_compress_ptr cinfo, cjpeg_source_ptr sinfo)
+{
+  /* no work */
+}
+
+
+/*
+ * The module selection routine for PPM format input.
+ */
+
+GLOBAL(cjpeg_source_ptr)
+jinit_read_ppm (j_compress_ptr cinfo)
+{
+  ppm_source_ptr source;
+
+  /* Create module interface object */
+  source = (ppm_source_ptr)
+      (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+				  SIZEOF(ppm_source_struct));
+  /* Fill in method ptrs, except get_pixel_rows which start_input sets */
+  source->pub.start_input = start_input_ppm;
+  source->pub.finish_input = finish_input_ppm;
+
+  return (cjpeg_source_ptr) source;
+}
+
+#endif /* PPM_SUPPORTED */
diff --git a/uppsrc/plugin/jpg/lib/rdrle.c b/uppsrc/plugin/jpg/lib/rdrle.c
new file mode 100644
index 000000000..03acb0753
--- /dev/null
+++ b/uppsrc/plugin/jpg/lib/rdrle.c
@@ -0,0 +1,387 @@
+/*
+ * rdrle.c
+ *
+ * Copyright (C) 1991-1996, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains routines to read input images in Utah RLE format.
+ * The Utah Raster Toolkit library is required (version 3.1 or later).
+ *
+ * These routines may need modification for non-Unix environments or
+ * specialized applications.  As they stand, they assume input from
+ * an ordinary stdio stream.  They further assume that reading begins
+ * at the start of the file; start_input may need work if the
+ * user interface has already read some data (e.g., to determine that
+ * the file is indeed RLE format).
+ *
+ * Based on code contributed by Mike Lijewski,
+ * with updates from Robert Hutchinson.
+ */
+
+#include "cdjpeg.h"		/* Common decls for cjpeg/djpeg applications */
+
+#ifdef RLE_SUPPORTED
+
+/* rle.h is provided by the Utah Raster Toolkit. */
+
+#include <rle.h>
+
+/*
+ * We assume that JSAMPLE has the same representation as rle_pixel,
+ * to wit, "unsigned char".  Hence we can't cope with 12- or 16-bit samples.
+ */
+
+#if BITS_IN_JSAMPLE != 8
+  Sorry, this code only copes with 8-bit JSAMPLEs. /* deliberate syntax err */
+#endif
+
+/*
+ * We support the following types of RLE files:
+ *
+ *   GRAYSCALE   - 8 bits, no colormap
+ *   MAPPEDGRAY  - 8 bits, 1 channel colomap
+ *   PSEUDOCOLOR - 8 bits, 3 channel colormap
+ *   TRUECOLOR   - 24 bits, 3 channel colormap
+ *   DIRECTCOLOR - 24 bits, no colormap
+ *
+ * For now, we ignore any alpha channel in the image.
+ */
+
+typedef enum
+  { GRAYSCALE, MAPPEDGRAY, PSEUDOCOLOR, TRUECOLOR, DIRECTCOLOR } rle_kind;
+
+
+/*
+ * Since RLE stores scanlines bottom-to-top, we have to invert the image
+ * to conform to JPEG's top-to-bottom order.  To do this, we read the
+ * incoming image into a virtual array on the first get_pixel_rows call,
+ * then fetch the required row from the virtual array on subsequent calls.
+ */
+
+typedef struct _rle_source_struct * rle_source_ptr;
+
+typedef struct _rle_source_struct {
+  struct cjpeg_source_struct pub; /* public fields */
+
+  rle_kind visual;              /* actual type of input file */
+  jvirt_sarray_ptr image;       /* virtual array to hold the image */
+  JDIMENSION row;		/* current row # in the virtual array */
+  rle_hdr header;               /* Input file information */
+  rle_pixel** rle_row;          /* holds a row returned by rle_getrow() */
+
+} rle_source_struct;
+
+
+/*
+ * Read the file header; return image size and component count.
+ */
+
+METHODDEF(void)
+start_input_rle (j_compress_ptr cinfo, cjpeg_source_ptr sinfo)
+{
+  rle_source_ptr source = (rle_source_ptr) sinfo;
+  JDIMENSION width, height;
+#ifdef PROGRESS_REPORT
+  cd_progress_ptr progress = (cd_progress_ptr) cinfo->progress;
+#endif
+
+  /* Use RLE library routine to get the header info */
+  source->header = *rle_hdr_init(NULL);
+  source->header.rle_file = source->pub.input_file;
+  switch (rle_get_setup(&(source->header))) {
+  case RLE_SUCCESS:
+    /* A-OK */
+    break;
+  case RLE_NOT_RLE:
+    ERREXIT(cinfo, JERR_RLE_NOT);
+    break;
+  case RLE_NO_SPACE:
+    ERREXIT(cinfo, JERR_RLE_MEM);
+    break;
+  case RLE_EMPTY:
+    ERREXIT(cinfo, JERR_RLE_EMPTY);
+    break;
+  case RLE_EOF:
+    ERREXIT(cinfo, JERR_RLE_EOF);
+    break;
+  default:
+    ERREXIT(cinfo, JERR_RLE_BADERROR);
+    break;
+  }
+
+  /* Figure out what we have, set private vars and return values accordingly */
+
+  width  = source->header.xmax - source->header.xmin + 1;
+  height = source->header.ymax - source->header.ymin + 1;
+  source->header.xmin = 0;		/* realign horizontally */
+  source->header.xmax = width-1;
+
+  cinfo->image_width      = width;
+  cinfo->image_height     = height;
+  cinfo->data_precision   = 8;  /* we can only handle 8 bit data */
+
+  if (source->header.ncolors == 1 && source->header.ncmap == 0) {
+    source->visual     = GRAYSCALE;
+    TRACEMS2(cinfo, 1, JTRC_RLE_GRAY, width, height);
+  } else if (source->header.ncolors == 1 && source->header.ncmap == 1) {
+    source->visual     = MAPPEDGRAY;
+    TRACEMS3(cinfo, 1, JTRC_RLE_MAPGRAY, width, height,
+             1 << source->header.cmaplen);
+  } else if (source->header.ncolors == 1 && source->header.ncmap == 3) {
+    source->visual     = PSEUDOCOLOR;
+    TRACEMS3(cinfo, 1, JTRC_RLE_MAPPED, width, height,
+	     1 << source->header.cmaplen);
+  } else if (source->header.ncolors == 3 && source->header.ncmap == 3) {
+    source->visual     = TRUECOLOR;
+    TRACEMS3(cinfo, 1, JTRC_RLE_FULLMAP, width, height,
+	     1 << source->header.cmaplen);
+  } else if (source->header.ncolors == 3 && source->header.ncmap == 0) {
+    source->visual     = DIRECTCOLOR;
+    TRACEMS2(cinfo, 1, JTRC_RLE, width, height);
+  } else
+    ERREXIT(cinfo, JERR_RLE_UNSUPPORTED);
+
+  if (source->visual == GRAYSCALE || source->visual == MAPPEDGRAY) {
+    cinfo->in_color_space   = JCS_GRAYSCALE;
+    cinfo->input_components = 1;
+  } else {
+    cinfo->in_color_space   = JCS_RGB;
+    cinfo->input_components = 3;
+  }
+
+  /*
+   * A place to hold each scanline while it's converted.
+   * (GRAYSCALE scanlines don't need converting)
+   */
+  if (source->visual != GRAYSCALE) {
+    source->rle_row = (rle_pixel**) (*cinfo->mem->alloc_sarray)
+      ((j_common_ptr) cinfo, JPOOL_IMAGE,
+       (JDIMENSION) width, (JDIMENSION) cinfo->input_components);
+  }
+
+  /* request a virtual array to hold the image */
+  source->image = (*cinfo->mem->request_virt_sarray)
+    ((j_common_ptr) cinfo, JPOOL_IMAGE, FALSE,
+     (JDIMENSION) (width * source->header.ncolors),
+     (JDIMENSION) height, (JDIMENSION) 1);
+
+#ifdef PROGRESS_REPORT
+  if (progress != NULL) {
+    /* count file input as separate pass */
+    progress->total_extra_passes++;
+  }
+#endif
+
+  source->pub.buffer_height = 1;
+}
+
+
+/*
+ * Read one row of pixels.
+ * Called only after load_image has read the image into the virtual array.
+ * Used for GRAYSCALE, MAPPEDGRAY, TRUECOLOR, and DIRECTCOLOR images.
+ */
+
+METHODDEF(JDIMENSION)
+get_rle_row (j_compress_ptr cinfo, cjpeg_source_ptr sinfo)
+{
+  rle_source_ptr source = (rle_source_ptr) sinfo;
+
+  source->row--;
+  source->pub.buffer = (*cinfo->mem->access_virt_sarray)
+    ((j_common_ptr) cinfo, source->image, source->row, (JDIMENSION) 1, FALSE);
+
+  return 1;
+}
+
+/*
+ * Read one row of pixels.
+ * Called only after load_image has read the image into the virtual array.
+ * Used for PSEUDOCOLOR images.
+ */
+
+METHODDEF(JDIMENSION)
+get_pseudocolor_row (j_compress_ptr cinfo, cjpeg_source_ptr sinfo)
+{
+  rle_source_ptr source = (rle_source_ptr) sinfo;
+  JSAMPROW src_row, dest_row;
+  JDIMENSION col;
+  rle_map *colormap;
+  int val;
+
+  colormap = source->header.cmap;
+  dest_row = source->pub.buffer[0];
+  source->row--;
+  src_row = * (*cinfo->mem->access_virt_sarray)
+    ((j_common_ptr) cinfo, source->image, source->row, (JDIMENSION) 1, FALSE);
+
+  for (col = cinfo->image_width; col > 0; col--) {
+    val = GETJSAMPLE(*src_row++);
+    *dest_row++ = (JSAMPLE) (colormap[val      ] >> 8);
+    *dest_row++ = (JSAMPLE) (colormap[val + 256] >> 8);
+    *dest_row++ = (JSAMPLE) (colormap[val + 512] >> 8);
+  }
+
+  return 1;
+}
+
+
+/*
+ * Load the image into a virtual array.  We have to do this because RLE
+ * files start at the lower left while the JPEG standard has them starting
+ * in the upper left.  This is called the first time we want to get a row
+ * of input.  What we do is load the RLE data into the array and then call
+ * the appropriate routine to read one row from the array.  Before returning,
+ * we set source->pub.get_pixel_rows so that subsequent calls go straight to
+ * the appropriate row-reading routine.
+ */
+
+METHODDEF(JDIMENSION)
+load_image (j_compress_ptr cinfo, cjpeg_source_ptr sinfo)
+{
+  rle_source_ptr source = (rle_source_ptr) sinfo;
+  JDIMENSION row, col;
+  JSAMPROW  scanline, red_ptr, green_ptr, blue_ptr;
+  rle_pixel **rle_row;
+  rle_map *colormap;
+  char channel;
+#ifdef PROGRESS_REPORT
+  cd_progress_ptr progress = (cd_progress_ptr) cinfo->progress;
+#endif
+
+  colormap = source->header.cmap;
+  rle_row = source->rle_row;
+
+  /* Read the RLE data into our virtual array.
+   * We assume here that (a) rle_pixel is represented the same as JSAMPLE,
+   * and (b) we are not on a machine where FAR pointers differ from regular.
+   */
+  RLE_CLR_BIT(source->header, RLE_ALPHA); /* don't read the alpha channel */
+
+#ifdef PROGRESS_REPORT
+  if (progress != NULL) {
+    progress->pub.pass_limit = cinfo->image_height;
+    progress->pub.pass_counter = 0;
+    (*progress->pub.progress_monitor) ((j_common_ptr) cinfo);
+  }
+#endif
+
+  switch (source->visual) {
+
+  case GRAYSCALE:
+  case PSEUDOCOLOR:
+    for (row = 0; row < cinfo->image_height; row++) {
+      rle_row = (rle_pixel **) (*cinfo->mem->access_virt_sarray)
+         ((j_common_ptr) cinfo, source->image, row, (JDIMENSION) 1, TRUE);
+      rle_getrow(&source->header, rle_row);
+#ifdef PROGRESS_REPORT
+      if (progress != NULL) {
+        progress->pub.pass_counter++;
+        (*progress->pub.progress_monitor) ((j_common_ptr) cinfo);
+      }
+#endif
+    }
+    break;
+
+  case MAPPEDGRAY:
+  case TRUECOLOR:
+    for (row = 0; row < cinfo->image_height; row++) {
+      scanline = * (*cinfo->mem->access_virt_sarray)
+        ((j_common_ptr) cinfo, source->image, row, (JDIMENSION) 1, TRUE);
+      rle_row = source->rle_row;
+      rle_getrow(&source->header, rle_row);
+
+      for (col = 0; col < cinfo->image_width; col++) {
+        for (channel = 0; channel < source->header.ncolors; channel++) {
+          *scanline++ = (JSAMPLE)
+            (colormap[GETJSAMPLE(rle_row[channel][col]) + 256 * channel] >> 8);
+        }
+      }
+
+#ifdef PROGRESS_REPORT
+      if (progress != NULL) {
+        progress->pub.pass_counter++;
+        (*progress->pub.progress_monitor) ((j_common_ptr) cinfo);
+      }
+#endif
+    }
+    break;
+
+  case DIRECTCOLOR:
+    for (row = 0; row < cinfo->image_height; row++) {
+      scanline = * (*cinfo->mem->access_virt_sarray)
+        ((j_common_ptr) cinfo, source->image, row, (JDIMENSION) 1, TRUE);
+      rle_getrow(&source->header, rle_row);
+
+      red_ptr   = rle_row[0];
+      green_ptr = rle_row[1];
+      blue_ptr  = rle_row[2];
+
+      for (col = cinfo->image_width; col > 0; col--) {
+        *scanline++ = *red_ptr++;
+        *scanline++ = *green_ptr++;
+        *scanline++ = *blue_ptr++;
+      }
+
+#ifdef PROGRESS_REPORT
+      if (progress != NULL) {
+        progress->pub.pass_counter++;
+        (*progress->pub.progress_monitor) ((j_common_ptr) cinfo);
+      }
+#endif
+    }
+  }
+
+#ifdef PROGRESS_REPORT
+  if (progress != NULL)
+    progress->completed_extra_passes++;
+#endif
+
+  /* Set up to call proper row-extraction routine in future */
+  if (source->visual == PSEUDOCOLOR) {
+    source->pub.buffer = source->rle_row;
+    source->pub.get_pixel_rows = get_pseudocolor_row;
+  } else {
+    source->pub.get_pixel_rows = get_rle_row;
+  }
+  source->row = cinfo->image_height;
+
+  /* And fetch the topmost (bottommost) row */
+  return (*source->pub.get_pixel_rows) (cinfo, sinfo);
+}
+
+
+/*
+ * Finish up at the end of the file.
+ */
+
+METHODDEF(void)
+finish_input_rle (j_compress_ptr cinfo, cjpeg_source_ptr sinfo)
+{
+  /* no work */
+}
+
+
+/*
+ * The module selection routine for RLE format input.
+ */
+
+GLOBAL(cjpeg_source_ptr)
+jinit_read_rle (j_compress_ptr cinfo)
+{
+  rle_source_ptr source;
+
+  /* Create module interface object */
+  source = (rle_source_ptr)
+      (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+                                  SIZEOF(rle_source_struct));
+  /* Fill in method ptrs */
+  source->pub.start_input = start_input_rle;
+  source->pub.finish_input = finish_input_rle;
+  source->pub.get_pixel_rows = load_image;
+
+  return (cjpeg_source_ptr) source;
+}
+
+#endif /* RLE_SUPPORTED */
diff --git a/uppsrc/plugin/jpg/lib/rdswitch.c b/uppsrc/plugin/jpg/lib/rdswitch.c
new file mode 100644
index 000000000..072dad2fd
--- /dev/null
+++ b/uppsrc/plugin/jpg/lib/rdswitch.c
@@ -0,0 +1,358 @@
+/*
+ * rdswitch.c
+ *
+ * Copyright (C) 1991-1996, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains routines to process some of cjpeg's more complicated
+ * command-line switches.  Switches processed here are:
+ *	-qtables file		Read quantization tables from text file
+ *	-scans file		Read scan script from text file
+ *	-qslots N[,N,...]	Set component quantization table selectors
+ *	-sample HxV[,HxV,...]	Set component sampling factors
+ */
+
+#include "cdjpeg.h"		/* Common decls for cjpeg/djpeg applications */
+#include <ctype.h>		/* to declare isdigit(), isspace() */
+
+
+LOCAL(int)
+text_getc (FILE * file)
+/* Read next char, skipping over any comments (# to end of line) */
+/* A comment/newline sequence is returned as a newline */
+{
+  register int ch;
+
+  ch = getc(file);
+  if (ch == '#') {
+    do {
+      ch = getc(file);
+    } while (ch != '\n' && ch != EOF);
+  }
+  return ch;
+}
+
+
+LOCAL(boolean)
+read_text_integer (FILE * file, long * result, int * termchar)
+/* Read an unsigned decimal integer from a file, store it in result */
+/* Reads one trailing character after the integer; returns it in termchar */
+{
+  register int ch;
+  register long val;
+
+  /* Skip any leading whitespace, detect EOF */
+  do {
+    ch = text_getc(file);
+    if (ch == EOF) {
+      *termchar = ch;
+      return FALSE;
+    }
+  } while (isspace(ch));
+
+  if (! isdigit(ch)) {
+    *termchar = ch;
+    return FALSE;
+  }
+
+  val = ch - '0';
+  while ((ch = text_getc(file)) != EOF) {
+    if (! isdigit(ch))
+      break;
+    val *= 10;
+    val += ch - '0';
+  }
+  *result = val;
+  *termchar = ch;
+  return TRUE;
+}
+
+
+GLOBAL(boolean)
+read_quant_tables (j_compress_ptr cinfo, char * filename,
+		   int scale_factor, boolean force_baseline)
+/* Read a set of quantization tables from the specified file.
+ * The file is plain ASCII text: decimal numbers with whitespace between.
+ * Comments preceded by '#' may be included in the file.
+ * There may be one to NUM_QUANT_TBLS tables in the file, each of 64 values.
+ * The tables are implicitly numbered 0,1,etc.
+ * NOTE: does not affect the qslots mapping, which will default to selecting
+ * table 0 for luminance (or primary) components, 1 for chrominance components.
+ * You must use -qslots if you want a different component->table mapping.
+ */
+{
+  FILE * fp;
+  int tblno, i, termchar;
+  long val;
+  unsigned int table[DCTSIZE2];
+
+  if ((fp = fopen(filename, "r")) == NULL) {
+    fprintf(stderr, "Can't open table file %s\n", filename);
+    return FALSE;
+  }
+  tblno = 0;
+
+  while (read_text_integer(fp, &val, &termchar)) { /* read 1st element of table */
+    if (tblno >= NUM_QUANT_TBLS) {
+      fprintf(stderr, "Too many tables in file %s\n", filename);
+      fclose(fp);
+      return FALSE;
+    }
+    table[0] = (unsigned int) val;
+    for (i = 1; i < DCTSIZE2; i++) {
+      if (! read_text_integer(fp, &val, &termchar)) {
+	fprintf(stderr, "Invalid table data in file %s\n", filename);
+	fclose(fp);
+	return FALSE;
+      }
+      table[i] = (unsigned int) val;
+    }
+    jpeg_add_quant_table(cinfo, tblno, table, scale_factor, force_baseline);
+    tblno++;
+  }
+
+  if (termchar != EOF) {
+    fprintf(stderr, "Non-numeric data in file %s\n", filename);
+    fclose(fp);
+    return FALSE;
+  }
+
+  fclose(fp);
+  return TRUE;
+}
+
+
+#ifdef C_MULTISCAN_FILES_SUPPORTED
+
+LOCAL(boolean)
+read_scan_integer (FILE * file, long * result, int * termchar)
+/* Variant of read_text_integer that always looks for a non-space termchar;
+ * this simplifies parsing of punctuation in scan scripts.
+ */
+{
+  register int ch;
+
+  if (! read_text_integer(file, result, termchar))
+    return FALSE;
+  ch = *termchar;
+  while (ch != EOF && isspace(ch))
+    ch = text_getc(file);
+  if (isdigit(ch)) {		/* oops, put it back */
+    if (ungetc(ch, file) == EOF)
+      return FALSE;
+    ch = ' ';
+  } else {
+    /* Any separators other than ';' and ':' are ignored;
+     * this allows user to insert commas, etc, if desired.
+     */
+    if (ch != EOF && ch != ';' && ch != ':')
+      ch = ' ';
+  }
+  *termchar = ch;
+  return TRUE;
+}
+
+
+GLOBAL(boolean)
+read_scan_script (j_compress_ptr cinfo, char * filename)
+/* Read a scan script from the specified text file.
+ * Each entry in the file defines one scan to be emitted.
+ * Entries are separated by semicolons ';'.
+ * An entry contains one to four component indexes,
+ * optionally followed by a colon ':' and four progressive-JPEG parameters.
+ * The component indexes denote which component(s) are to be transmitted
+ * in the current scan.  The first component has index 0.
+ * Sequential JPEG is used if the progressive-JPEG parameters are omitted.
+ * The file is free format text: any whitespace may appear between numbers
+ * and the ':' and ';' punctuation marks.  Also, other punctuation (such
+ * as commas or dashes) can be placed between numbers if desired.
+ * Comments preceded by '#' may be included in the file.
+ * Note: we do very little validity checking here;
+ * jcmaster.c will validate the script parameters.
+ */
+{
+  FILE * fp;
+  int scanno, ncomps, termchar;
+  long val;
+  jpeg_scan_info * scanptr;
+#define MAX_SCANS  100		/* quite arbitrary limit */
+  jpeg_scan_info scans[MAX_SCANS];
+
+  if ((fp = fopen(filename, "r")) == NULL) {
+    fprintf(stderr, "Can't open scan definition file %s\n", filename);
+    return FALSE;
+  }
+  scanptr = scans;
+  scanno = 0;
+
+  while (read_scan_integer(fp, &val, &termchar)) {
+    if (scanno >= MAX_SCANS) {
+      fprintf(stderr, "Too many scans defined in file %s\n", filename);
+      fclose(fp);
+      return FALSE;
+    }
+    scanptr->component_index[0] = (int) val;
+    ncomps = 1;
+    while (termchar == ' ') {
+      if (ncomps >= MAX_COMPS_IN_SCAN) {
+	fprintf(stderr, "Too many components in one scan in file %s\n",
+		filename);
+	fclose(fp);
+	return FALSE;
+      }
+      if (! read_scan_integer(fp, &val, &termchar))
+	goto bogus;
+      scanptr->component_index[ncomps] = (int) val;
+      ncomps++;
+    }
+    scanptr->comps_in_scan = ncomps;
+    if (termchar == ':') {
+      if (! read_scan_integer(fp, &val, &termchar) || termchar != ' ')
+	goto bogus;
+      scanptr->Ss = (int) val;
+      if (! read_scan_integer(fp, &val, &termchar) || termchar != ' ')
+	goto bogus;
+      scanptr->Se = (int) val;
+      if (! read_scan_integer(fp, &val, &termchar) || termchar != ' ')
+	goto bogus;
+      scanptr->Ah = (int) val;
+      if (! read_scan_integer(fp, &val, &termchar))
+	goto bogus;
+      scanptr->Al = (int) val;
+    } else {
+      /* set non-progressive parameters */
+      scanptr->Ss = 0;
+      scanptr->Se = DCTSIZE2-1;
+      scanptr->Ah = 0;
+      scanptr->Al = 0;
+    }
+    if (termchar != ';' && termchar != EOF) {
+bogus:
+      fprintf(stderr, "Invalid scan entry format in file %s\n", filename);
+      fclose(fp);
+      return FALSE;
+    }
+    scanptr++, scanno++;
+  }
+
+  if (termchar != EOF) {
+    fprintf(stderr, "Non-numeric data in file %s\n", filename);
+    fclose(fp);
+    return FALSE;
+  }
+
+  if (scanno > 0) {
+    /* Stash completed scan list in cinfo structure.
+     * NOTE: for cjpeg's use, JPOOL_IMAGE is the right lifetime for this data,
+     * but if you want to compress multiple images you'd want JPOOL_PERMANENT.
+     */
+    scanptr = (jpeg_scan_info *)
+      (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+				  scanno * SIZEOF(jpeg_scan_info));
+    MEMCOPY(scanptr, scans, scanno * SIZEOF(jpeg_scan_info));
+    cinfo->scan_info = scanptr;
+    cinfo->num_scans = scanno;
+  }
+
+  fclose(fp);
+  return TRUE;
+}
+
+#endif /* C_MULTISCAN_FILES_SUPPORTED */
+
+
+GLOBAL(boolean)
+set_quant_slots (j_compress_ptr cinfo, char *arg)
+/* Process a quantization-table-selectors parameter string, of the form
+ *     N[,N,...]
+ * If there are more components than parameters, the last value is replicated.
+ */
+{
+  int val = 0;			/* default table # */
+  int ci;
+  char ch;
+
+  for (ci = 0; ci < MAX_COMPONENTS; ci++) {
+    if (*arg) {
+      ch = ',';			/* if not set by sscanf, will be ',' */
+      if (sscanf(arg, "%d%c", &val, &ch) < 1)
+	return FALSE;
+      if (ch != ',')		/* syntax check */
+	return FALSE;
+      if (val < 0 || val >= NUM_QUANT_TBLS) {
+	fprintf(stderr, "JPEG quantization tables are numbered 0..%d\n",
+		NUM_QUANT_TBLS-1);
+	return FALSE;
+      }
+      cinfo->comp_info[ci].quant_tbl_no = val;
+      while (*arg && *arg++ != ',') /* advance to next segment of arg string */
+	;
+    } else {
+      /* reached end of parameter, set remaining components to last table */
+      cinfo->comp_info[ci].quant_tbl_no = val;
+    }
+  }
+  return TRUE;
+}
+
+
+GLOBAL(boolean)
+set_sample_factors (j_compress_ptr cinfo, char *arg)
+/* Process a sample-factors parameter string, of the form
+ *     HxV[,HxV,...]
+ * If there are more components than parameters, "1x1" is assumed for the rest.
+ */
+{
+  int ci, val1, val2;
+  char ch1, ch2;
+
+  for (ci = 0; ci < MAX_COMPONENTS; ci++) {
+    if (*arg) {
+      ch2 = ',';		/* if not set by sscanf, will be ',' */
+      if (sscanf(arg, "%d%c%d%c", &val1, &ch1, &val2, &ch2) < 3)
+	return FALSE;
+      if ((ch1 != 'x' && ch1 != 'X') || ch2 != ',') /* syntax check */
+	return FALSE;
+      if (val1 <= 0 || val1 > 4 || val2 <= 0 || val2 > 4) {
+	fprintf(stderr, "JPEG sampling factors must be 1..4\n");
+	return FALSE;
+      }
+      cinfo->comp_info[ci].h_samp_factor = val1;
+      cinfo->comp_info[ci].v_samp_factor = val2;
+      while (*arg && *arg++ != ',') /* advance to next segment of arg string */
+	;
+    } else {
+      /* reached end of parameter, set remaining components to 1x1 sampling */
+      cinfo->comp_info[ci].h_samp_factor = 1;
+      cinfo->comp_info[ci].v_samp_factor = 1;
+    }
+  }
+  return TRUE;
+}
+
+
+#ifdef C_LOSSLESS_SUPPORTED
+
+GLOBAL(boolean)
+set_simple_lossless (j_compress_ptr cinfo, char *arg)
+{
+  int pred, pt = 0;
+  char ch;
+
+  ch = ',';		/* if not set by sscanf, will be ',' */
+  if (sscanf(arg, "%d%c", &pred, &ch) < 1)
+    return FALSE;
+  if (ch != ',')		/* syntax check */
+    return FALSE;
+  while (*arg && *arg++ != ',') /* advance to next segment of arg string */
+    ;
+  if (*arg) {
+    if (sscanf(arg, "%d", &pt) != 1)
+      pt = 0;
+  }
+  jpeg_simple_lossless(cinfo, pred, pt);
+  return TRUE;
+}
+
+#endif /* C_LOSSLESS_SUPPORTED */
diff --git a/uppsrc/plugin/jpg/lib/rdtarga.c b/uppsrc/plugin/jpg/lib/rdtarga.c
new file mode 100644
index 000000000..879783826
--- /dev/null
+++ b/uppsrc/plugin/jpg/lib/rdtarga.c
@@ -0,0 +1,500 @@
+/*
+ * rdtarga.c
+ *
+ * Copyright (C) 1991-1996, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains routines to read input images in Targa format.
+ *
+ * These routines may need modification for non-Unix environments or
+ * specialized applications.  As they stand, they assume input from
+ * an ordinary stdio stream.  They further assume that reading begins
+ * at the start of the file; start_input may need work if the
+ * user interface has already read some data (e.g., to determine that
+ * the file is indeed Targa format).
+ *
+ * Based on code contributed by Lee Daniel Crocker.
+ */
+
+#include "cdjpeg.h"		/* Common decls for cjpeg/djpeg applications */
+
+#ifdef TARGA_SUPPORTED
+
+
+/* Macros to deal with unsigned chars as efficiently as compiler allows */
+
+#ifdef HAVE_UNSIGNED_CHAR
+typedef unsigned char U_CHAR;
+#define UCH(x)	((int) (x))
+#else /* !HAVE_UNSIGNED_CHAR */
+#ifdef CHAR_IS_UNSIGNED
+typedef char U_CHAR;
+#define UCH(x)	((int) (x))
+#else
+typedef char U_CHAR;
+#define UCH(x)	((int) (x) & 0xFF)
+#endif
+#endif /* HAVE_UNSIGNED_CHAR */
+
+
+#define	ReadOK(file,buffer,len)	(JFREAD(file,buffer,len) == ((size_t) (len)))
+
+
+/* Private version of data source object */
+
+typedef struct _tga_source_struct * tga_source_ptr;
+
+typedef struct _tga_source_struct {
+  struct cjpeg_source_struct pub; /* public fields */
+
+  j_compress_ptr cinfo;		/* back link saves passing separate parm */
+
+  JSAMPARRAY colormap;		/* Targa colormap (converted to my format) */
+
+  jvirt_sarray_ptr whole_image;	/* Needed if funny input row order */
+  JDIMENSION current_row;	/* Current logical row number to read */
+
+  /* Pointer to routine to extract next Targa pixel from input file */
+  JMETHOD(void, read_pixel, (tga_source_ptr sinfo));
+
+  /* Result of read_pixel is delivered here: */
+  U_CHAR tga_pixel[4];
+
+  int pixel_size;		/* Bytes per Targa pixel (1 to 4) */
+
+  /* State info for reading RLE-coded pixels; both counts must be init to 0 */
+  int block_count;		/* # of pixels remaining in RLE block */
+  int dup_pixel_count;		/* # of times to duplicate previous pixel */
+
+  /* This saves the correct pixel-row-expansion method for preload_image */
+  JMETHOD(JDIMENSION, get_pixel_rows, (j_compress_ptr cinfo,
+				       cjpeg_source_ptr sinfo));
+} tga_source_struct;
+
+
+/* For expanding 5-bit pixel values to 8-bit with best rounding */
+
+static const UINT8 c5to8bits[32] = {
+    0,   8,  16,  25,  33,  41,  49,  58,
+   66,  74,  82,  90,  99, 107, 115, 123,
+  132, 140, 148, 156, 165, 173, 181, 189,
+  197, 206, 214, 222, 230, 239, 247, 255
+};
+
+
+
+LOCAL(int)
+read_byte (tga_source_ptr sinfo)
+/* Read next byte from Targa file */
+{
+  register FILE *infile = sinfo->pub.input_file;
+  register int c;
+
+  if ((c = getc(infile)) == EOF)
+    ERREXIT(sinfo->cinfo, JERR_INPUT_EOF);
+  return c;
+}
+
+
+LOCAL(void)
+read_colormap (tga_source_ptr sinfo, int cmaplen, int mapentrysize)
+/* Read the colormap from a Targa file */
+{
+  int i;
+
+  /* Presently only handles 24-bit BGR format */
+  if (mapentrysize != 24)
+    ERREXIT(sinfo->cinfo, JERR_TGA_BADCMAP);
+
+  for (i = 0; i < cmaplen; i++) {
+    sinfo->colormap[2][i] = (JSAMPLE) read_byte(sinfo);
+    sinfo->colormap[1][i] = (JSAMPLE) read_byte(sinfo);
+    sinfo->colormap[0][i] = (JSAMPLE) read_byte(sinfo);
+  }
+}
+
+
+/*
+ * read_pixel methods: get a single pixel from Targa file into tga_pixel[]
+ */
+
+METHODDEF(void)
+read_non_rle_pixel (tga_source_ptr sinfo)
+/* Read one Targa pixel from the input file; no RLE expansion */
+{
+  register FILE *infile = sinfo->pub.input_file;
+  register int i;
+
+  for (i = 0; i < sinfo->pixel_size; i++) {
+    sinfo->tga_pixel[i] = (U_CHAR) getc(infile);
+  }
+}
+
+
+METHODDEF(void)
+read_rle_pixel (tga_source_ptr sinfo)
+/* Read one Targa pixel from the input file, expanding RLE data as needed */
+{
+  register FILE *infile = sinfo->pub.input_file;
+  register int i;
+
+  /* Duplicate previously read pixel? */
+  if (sinfo->dup_pixel_count > 0) {
+    sinfo->dup_pixel_count--;
+    return;
+  }
+
+  /* Time to read RLE block header? */
+  if (--sinfo->block_count < 0) { /* decrement pixels remaining in block */
+    i = read_byte(sinfo);
+    if (i & 0x80) {		/* Start of duplicate-pixel block? */
+      sinfo->dup_pixel_count = i & 0x7F; /* number of dups after this one */
+      sinfo->block_count = 0;	/* then read new block header */
+    } else {
+      sinfo->block_count = i & 0x7F; /* number of pixels after this one */
+    }
+  }
+
+  /* Read next pixel */
+  for (i = 0; i < sinfo->pixel_size; i++) {
+    sinfo->tga_pixel[i] = (U_CHAR) getc(infile);
+  }
+}
+
+
+/*
+ * Read one row of pixels.
+ *
+ * We provide several different versions depending on input file format.
+ */
+
+
+METHODDEF(JDIMENSION)
+get_8bit_gray_row (j_compress_ptr cinfo, cjpeg_source_ptr sinfo)
+/* This version is for reading 8-bit grayscale pixels */
+{
+  tga_source_ptr source = (tga_source_ptr) sinfo;
+  register JSAMPROW ptr;
+  register JDIMENSION col;
+
+  ptr = source->pub.buffer[0];
+  for (col = cinfo->image_width; col > 0; col--) {
+    (*source->read_pixel) (source); /* Load next pixel into tga_pixel */
+    *ptr++ = (JSAMPLE) UCH(source->tga_pixel[0]);
+  }
+  return 1;
+}
+
+METHODDEF(JDIMENSION)
+get_8bit_row (j_compress_ptr cinfo, cjpeg_source_ptr sinfo)
+/* This version is for reading 8-bit colormap indexes */
+{
+  tga_source_ptr source = (tga_source_ptr) sinfo;
+  register int t;
+  register JSAMPROW ptr;
+  register JDIMENSION col;
+  register JSAMPARRAY colormap = source->colormap;
+
+  ptr = source->pub.buffer[0];
+  for (col = cinfo->image_width; col > 0; col--) {
+    (*source->read_pixel) (source); /* Load next pixel into tga_pixel */
+    t = UCH(source->tga_pixel[0]);
+    *ptr++ = colormap[0][t];
+    *ptr++ = colormap[1][t];
+    *ptr++ = colormap[2][t];
+  }
+  return 1;
+}
+
+METHODDEF(JDIMENSION)
+get_16bit_row (j_compress_ptr cinfo, cjpeg_source_ptr sinfo)
+/* This version is for reading 16-bit pixels */
+{
+  tga_source_ptr source = (tga_source_ptr) sinfo;
+  register int t;
+  register JSAMPROW ptr;
+  register JDIMENSION col;
+
+  ptr = source->pub.buffer[0];
+  for (col = cinfo->image_width; col > 0; col--) {
+    (*source->read_pixel) (source); /* Load next pixel into tga_pixel */
+    t = UCH(source->tga_pixel[0]);
+    t += UCH(source->tga_pixel[1]) << 8;
+    /* We expand 5 bit data to 8 bit sample width.
+     * The format of the 16-bit (LSB first) input word is
+     *     xRRRRRGGGGGBBBBB
+     */
+    ptr[2] = (JSAMPLE) c5to8bits[t & 0x1F];
+    t >>= 5;
+    ptr[1] = (JSAMPLE) c5to8bits[t & 0x1F];
+    t >>= 5;
+    ptr[0] = (JSAMPLE) c5to8bits[t & 0x1F];
+    ptr += 3;
+  }
+  return 1;
+}
+
+METHODDEF(JDIMENSION)
+get_24bit_row (j_compress_ptr cinfo, cjpeg_source_ptr sinfo)
+/* This version is for reading 24-bit pixels */
+{
+  tga_source_ptr source = (tga_source_ptr) sinfo;
+  register JSAMPROW ptr;
+  register JDIMENSION col;
+
+  ptr = source->pub.buffer[0];
+  for (col = cinfo->image_width; col > 0; col--) {
+    (*source->read_pixel) (source); /* Load next pixel into tga_pixel */
+    *ptr++ = (JSAMPLE) UCH(source->tga_pixel[2]); /* change BGR to RGB order */
+    *ptr++ = (JSAMPLE) UCH(source->tga_pixel[1]);
+    *ptr++ = (JSAMPLE) UCH(source->tga_pixel[0]);
+  }
+  return 1;
+}
+
+/*
+ * Targa also defines a 32-bit pixel format with order B,G,R,A.
+ * We presently ignore the attribute byte, so the code for reading
+ * these pixels is identical to the 24-bit routine above.
+ * This works because the actual pixel length is only known to read_pixel.
+ */
+
+#define get_32bit_row  get_24bit_row
+
+
+/*
+ * This method is for re-reading the input data in standard top-down
+ * row order.  The entire image has already been read into whole_image
+ * with proper conversion of pixel format, but it's in a funny row order.
+ */
+
+METHODDEF(JDIMENSION)
+get_memory_row (j_compress_ptr cinfo, cjpeg_source_ptr sinfo)
+{
+  tga_source_ptr source = (tga_source_ptr) sinfo;
+  JDIMENSION source_row;
+
+  /* Compute row of source that maps to current_row of normal order */
+  /* For now, assume image is bottom-up and not interlaced. */
+  /* NEEDS WORK to support interlaced images! */
+  source_row = cinfo->image_height - source->current_row - 1;
+
+  /* Fetch that row from virtual array */
+  source->pub.buffer = (*cinfo->mem->access_virt_sarray)
+    ((j_common_ptr) cinfo, source->whole_image,
+     source_row, (JDIMENSION) 1, FALSE);
+
+  source->current_row++;
+  return 1;
+}
+
+
+/*
+ * This method loads the image into whole_image during the first call on
+ * get_pixel_rows.  The get_pixel_rows pointer is then adjusted to call
+ * get_memory_row on subsequent calls.
+ */
+
+METHODDEF(JDIMENSION)
+preload_image (j_compress_ptr cinfo, cjpeg_source_ptr sinfo)
+{
+  tga_source_ptr source = (tga_source_ptr) sinfo;
+  JDIMENSION row;
+  cd_progress_ptr progress = (cd_progress_ptr) cinfo->progress;
+
+  /* Read the data into a virtual array in input-file row order. */
+  for (row = 0; row < cinfo->image_height; row++) {
+    if (progress != NULL) {
+      progress->pub.pass_counter = (long) row;
+      progress->pub.pass_limit = (long) cinfo->image_height;
+      (*progress->pub.progress_monitor) ((j_common_ptr) cinfo);
+    }
+    source->pub.buffer = (*cinfo->mem->access_virt_sarray)
+      ((j_common_ptr) cinfo, source->whole_image, row, (JDIMENSION) 1, TRUE);
+    (*source->get_pixel_rows) (cinfo, sinfo);
+  }
+  if (progress != NULL)
+    progress->completed_extra_passes++;
+
+  /* Set up to read from the virtual array in unscrambled order */
+  source->pub.get_pixel_rows = get_memory_row;
+  source->current_row = 0;
+  /* And read the first row */
+  return get_memory_row(cinfo, sinfo);
+}
+
+
+/*
+ * Read the file header; return image size and component count.
+ */
+
+METHODDEF(void)
+start_input_tga (j_compress_ptr cinfo, cjpeg_source_ptr sinfo)
+{
+  tga_source_ptr source = (tga_source_ptr) sinfo;
+  U_CHAR targaheader[18];
+  int idlen, cmaptype, subtype, flags, interlace_type, components;
+  unsigned int width, height, maplen;
+  boolean is_bottom_up;
+
+#define GET_2B(offset)	((unsigned int) UCH(targaheader[offset]) + \
+			 (((unsigned int) UCH(targaheader[offset+1])) << 8))
+
+  if (! ReadOK(source->pub.input_file, targaheader, 18))
+    ERREXIT(cinfo, JERR_INPUT_EOF);
+
+  /* Pretend "15-bit" pixels are 16-bit --- we ignore attribute bit anyway */
+  if (targaheader[16] == 15)
+    targaheader[16] = 16;
+
+  idlen = UCH(targaheader[0]);
+  cmaptype = UCH(targaheader[1]);
+  subtype = UCH(targaheader[2]);
+  maplen = GET_2B(5);
+  width = GET_2B(12);
+  height = GET_2B(14);
+  source->pixel_size = UCH(targaheader[16]) >> 3;
+  flags = UCH(targaheader[17]);	/* Image Descriptor byte */
+
+  is_bottom_up = ((flags & 0x20) == 0);	/* bit 5 set => top-down */
+  interlace_type = flags >> 6;	/* bits 6/7 are interlace code */
+
+  if (cmaptype > 1 ||		/* cmaptype must be 0 or 1 */
+      source->pixel_size < 1 || source->pixel_size > 4 ||
+      (UCH(targaheader[16]) & 7) != 0 || /* bits/pixel must be multiple of 8 */
+      interlace_type != 0)	/* currently don't allow interlaced image */
+    ERREXIT(cinfo, JERR_TGA_BADPARMS);
+
+  if (subtype > 8) {
+    /* It's an RLE-coded file */
+    source->read_pixel = read_rle_pixel;
+    source->block_count = source->dup_pixel_count = 0;
+    subtype -= 8;
+  } else {
+    /* Non-RLE file */
+    source->read_pixel = read_non_rle_pixel;
+  }
+
+  /* Now should have subtype 1, 2, or 3 */
+  components = 3;		/* until proven different */
+  cinfo->in_color_space = JCS_RGB;
+
+  switch (subtype) {
+  case 1:			/* Colormapped image */
+    if (source->pixel_size == 1 && cmaptype == 1)
+      source->get_pixel_rows = get_8bit_row;
+    else
+      ERREXIT(cinfo, JERR_TGA_BADPARMS);
+    TRACEMS2(cinfo, 1, JTRC_TGA_MAPPED, width, height);
+    break;
+  case 2:			/* RGB image */
+    switch (source->pixel_size) {
+    case 2:
+      source->get_pixel_rows = get_16bit_row;
+      break;
+    case 3:
+      source->get_pixel_rows = get_24bit_row;
+      break;
+    case 4:
+      source->get_pixel_rows = get_32bit_row;
+      break;
+    default:
+      ERREXIT(cinfo, JERR_TGA_BADPARMS);
+      break;
+    }
+    TRACEMS2(cinfo, 1, JTRC_TGA, width, height);
+    break;
+  case 3:			/* Grayscale image */
+    components = 1;
+    cinfo->in_color_space = JCS_GRAYSCALE;
+    if (source->pixel_size == 1)
+      source->get_pixel_rows = get_8bit_gray_row;
+    else
+      ERREXIT(cinfo, JERR_TGA_BADPARMS);
+    TRACEMS2(cinfo, 1, JTRC_TGA_GRAY, width, height);
+    break;
+  default:
+    ERREXIT(cinfo, JERR_TGA_BADPARMS);
+    break;
+  }
+
+  if (is_bottom_up) {
+    /* Create a virtual array to buffer the upside-down image. */
+    source->whole_image = (*cinfo->mem->request_virt_sarray)
+      ((j_common_ptr) cinfo, JPOOL_IMAGE, FALSE,
+       (JDIMENSION) width * components, (JDIMENSION) height, (JDIMENSION) 1);
+    if (cinfo->progress != NULL) {
+      cd_progress_ptr progress = (cd_progress_ptr) cinfo->progress;
+      progress->total_extra_passes++; /* count file input as separate pass */
+    }
+    /* source->pub.buffer will point to the virtual array. */
+    source->pub.buffer_height = 1; /* in case anyone looks at it */
+    source->pub.get_pixel_rows = preload_image;
+  } else {
+    /* Don't need a virtual array, but do need a one-row input buffer. */
+    source->whole_image = NULL;
+    source->pub.buffer = (*cinfo->mem->alloc_sarray)
+      ((j_common_ptr) cinfo, JPOOL_IMAGE,
+       (JDIMENSION) width * components, (JDIMENSION) 1);
+    source->pub.buffer_height = 1;
+    source->pub.get_pixel_rows = source->get_pixel_rows;
+  }
+
+  while (idlen--)		/* Throw away ID field */
+    (void) read_byte(source);
+
+  if (maplen > 0) {
+    if (maplen > 256 || GET_2B(3) != 0)
+      ERREXIT(cinfo, JERR_TGA_BADCMAP);
+    /* Allocate space to store the colormap */
+    source->colormap = (*cinfo->mem->alloc_sarray)
+      ((j_common_ptr) cinfo, JPOOL_IMAGE, (JDIMENSION) maplen, (JDIMENSION) 3);
+    /* and read it from the file */
+    read_colormap(source, (int) maplen, UCH(targaheader[7]));
+  } else {
+    if (cmaptype)		/* but you promised a cmap! */
+      ERREXIT(cinfo, JERR_TGA_BADPARMS);
+    source->colormap = NULL;
+  }
+
+  cinfo->input_components = components;
+  cinfo->data_precision = 8;
+  cinfo->image_width = width;
+  cinfo->image_height = height;
+}
+
+
+/*
+ * Finish up at the end of the file.
+ */
+
+METHODDEF(void)
+finish_input_tga (j_compress_ptr cinfo, cjpeg_source_ptr sinfo)
+{
+  /* no work */
+}
+
+
+/*
+ * The module selection routine for Targa format input.
+ */
+
+GLOBAL(cjpeg_source_ptr)
+jinit_read_targa (j_compress_ptr cinfo)
+{
+  tga_source_ptr source;
+
+  /* Create module interface object */
+  source = (tga_source_ptr)
+      (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+				  SIZEOF(tga_source_struct));
+  source->cinfo = cinfo;	/* make back link for subroutines */
+  /* Fill in method ptrs, except get_pixel_rows which start_input sets */
+  source->pub.start_input = start_input_tga;
+  source->pub.finish_input = finish_input_tga;
+
+  return (cjpeg_source_ptr) source;
+}
+
+#endif /* TARGA_SUPPORTED */
diff --git a/uppsrc/plugin/jpg/lib/transupp.c b/uppsrc/plugin/jpg/lib/transupp.c
new file mode 100644
index 000000000..c8216256e
--- /dev/null
+++ b/uppsrc/plugin/jpg/lib/transupp.c
@@ -0,0 +1,928 @@
+/*
+ * transupp.c
+ *
+ * Copyright (C) 1997-1998, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains image transformation routines and other utility code
+ * used by the jpegtran sample application.  These are NOT part of the core
+ * JPEG library.  But we keep these routines separate from jpegtran.c to
+ * ease the task of maintaining jpegtran-like programs that have other user
+ * interfaces.
+ */
+
+/* Although this file really shouldn't have access to the library internals,
+ * it's helpful to let it call jround_up() and jcopy_block_row().
+ */
+#define JPEG_INTERNALS
+
+#include "jinclude.h"
+#include "jpeglib.h"
+#include "transupp.h"		/* My own external interface */
+
+
+#if TRANSFORMS_SUPPORTED
+
+/*
+ * Lossless image transformation routines.  These routines work on DCT
+ * coefficient arrays and thus do not require any lossy decompression
+ * or recompression of the image.
+ * Thanks to Guido Vollbeding for the initial design and code of this feature.
+ *
+ * Horizontal flipping is done in-place, using a single top-to-bottom
+ * pass through the virtual source array.  It will thus be much the
+ * fastest option for images larger than main memory.
+ *
+ * The other routines require a set of destination virtual arrays, so they
+ * need twice as much memory as jpegtran normally does.  The destination
+ * arrays are always written in normal scan order (top to bottom) because
+ * the virtual array manager expects this.  The source arrays will be scanned
+ * in the corresponding order, which means multiple passes through the source
+ * arrays for most of the transforms.  That could result in much thrashing
+ * if the image is larger than main memory.
+ *
+ * Some notes about the operating environment of the individual transform
+ * routines:
+ * 1. Both the source and destination virtual arrays are allocated from the
+ *    source JPEG object, and therefore should be manipulated by calling the
+ *    source's memory manager.
+ * 2. The destination's component count should be used.  It may be smaller
+ *    than the source's when forcing to grayscale.
+ * 3. Likewise the destination's sampling factors should be used.  When
+ *    forcing to grayscale the destination's sampling factors will be all 1,
+ *    and we may as well take that as the effective iMCU size.
+ * 4. When "trim" is in effect, the destination's dimensions will be the
+ *    trimmed values but the source's will be untrimmed.
+ * 5. All the routines assume that the source and destination buffers are
+ *    padded out to a full iMCU boundary.  This is true, although for the
+ *    source buffer it is an undocumented property of jdcoefct.c.
+ * Notes 2,3,4 boil down to this: generally we should use the destination's
+ * dimensions and ignore the source's.
+ */
+
+
+LOCAL(void)
+do_flip_h (j_decompress_ptr srcinfo, j_compress_ptr dstinfo,
+	   jvirt_barray_ptr *src_coef_arrays)
+/* Horizontal flip; done in-place, so no separate dest array is required */
+{
+  JDIMENSION MCU_cols, comp_width, blk_x, blk_y;
+  int ci, k, offset_y;
+  JBLOCKARRAY buffer;
+  JCOEFPTR ptr1, ptr2;
+  JCOEF temp1, temp2;
+  jpeg_component_info *compptr;
+
+  /* Horizontal mirroring of DCT blocks is accomplished by swapping
+   * pairs of blocks in-place.  Within a DCT block, we perform horizontal
+   * mirroring by changing the signs of odd-numbered columns.
+   * Partial iMCUs at the right edge are left untouched.
+   */
+  MCU_cols = dstinfo->image_width / (dstinfo->max_h_samp_factor * DCTSIZE);
+
+  for (ci = 0; ci < dstinfo->num_components; ci++) {
+    compptr = dstinfo->comp_info + ci;
+    comp_width = MCU_cols * compptr->h_samp_factor;
+    for (blk_y = 0; blk_y < compptr->height_in_data_units;
+	 blk_y += compptr->v_samp_factor) {
+      buffer = (*srcinfo->mem->access_virt_barray)
+	((j_common_ptr) srcinfo, src_coef_arrays[ci], blk_y,
+	 (JDIMENSION) compptr->v_samp_factor, TRUE);
+      for (offset_y = 0; offset_y < compptr->v_samp_factor; offset_y++) {
+	for (blk_x = 0; blk_x * 2 < comp_width; blk_x++) {
+	  ptr1 = buffer[offset_y][blk_x];
+	  ptr2 = buffer[offset_y][comp_width - blk_x - 1];
+	  /* this unrolled loop doesn't need to know which row it's on... */
+	  for (k = 0; k < DCTSIZE2; k += 2) {
+	    temp1 = *ptr1;	/* swap even column */
+	    temp2 = *ptr2;
+	    *ptr1++ = temp2;
+	    *ptr2++ = temp1;
+	    temp1 = *ptr1;	/* swap odd column with sign change */
+	    temp2 = *ptr2;
+	    *ptr1++ = -temp2;
+	    *ptr2++ = -temp1;
+	  }
+	}
+      }
+    }
+  }
+}
+
+
+LOCAL(void)
+do_flip_v (j_decompress_ptr srcinfo, j_compress_ptr dstinfo,
+	   jvirt_barray_ptr *src_coef_arrays,
+	   jvirt_barray_ptr *dst_coef_arrays)
+/* Vertical flip */
+{
+  JDIMENSION MCU_rows, comp_height, dst_blk_x, dst_blk_y;
+  int ci, i, j, offset_y;
+  JBLOCKARRAY src_buffer, dst_buffer;
+  JBLOCKROW src_row_ptr, dst_row_ptr;
+  JCOEFPTR src_ptr, dst_ptr;
+  jpeg_component_info *compptr;
+
+  /* We output into a separate array because we can't touch different
+   * rows of the source virtual array simultaneously.  Otherwise, this
+   * is a pretty straightforward analog of horizontal flip.
+   * Within a DCT block, vertical mirroring is done by changing the signs
+   * of odd-numbered rows.
+   * Partial iMCUs at the bottom edge are copied verbatim.
+   */
+  MCU_rows = dstinfo->image_height / (dstinfo->max_v_samp_factor * DCTSIZE);
+
+  for (ci = 0; ci < dstinfo->num_components; ci++) {
+    compptr = dstinfo->comp_info + ci;
+    comp_height = MCU_rows * compptr->v_samp_factor;
+    for (dst_blk_y = 0; dst_blk_y < compptr->height_in_data_units;
+	 dst_blk_y += compptr->v_samp_factor) {
+      dst_buffer = (*srcinfo->mem->access_virt_barray)
+	((j_common_ptr) srcinfo, dst_coef_arrays[ci], dst_blk_y,
+	 (JDIMENSION) compptr->v_samp_factor, TRUE);
+      if (dst_blk_y < comp_height) {
+	/* Row is within the mirrorable area. */
+	src_buffer = (*srcinfo->mem->access_virt_barray)
+	  ((j_common_ptr) srcinfo, src_coef_arrays[ci],
+	   comp_height - dst_blk_y - (JDIMENSION) compptr->v_samp_factor,
+	   (JDIMENSION) compptr->v_samp_factor, FALSE);
+      } else {
+	/* Bottom-edge blocks will be copied verbatim. */
+	src_buffer = (*srcinfo->mem->access_virt_barray)
+	  ((j_common_ptr) srcinfo, src_coef_arrays[ci], dst_blk_y,
+	   (JDIMENSION) compptr->v_samp_factor, FALSE);
+      }
+      for (offset_y = 0; offset_y < compptr->v_samp_factor; offset_y++) {
+	if (dst_blk_y < comp_height) {
+	  /* Row is within the mirrorable area. */
+	  dst_row_ptr = dst_buffer[offset_y];
+	  src_row_ptr = src_buffer[compptr->v_samp_factor - offset_y - 1];
+	  for (dst_blk_x = 0; dst_blk_x < compptr->width_in_data_units;
+	       dst_blk_x++) {
+	    dst_ptr = dst_row_ptr[dst_blk_x];
+	    src_ptr = src_row_ptr[dst_blk_x];
+	    for (i = 0; i < DCTSIZE; i += 2) {
+	      /* copy even row */
+	      for (j = 0; j < DCTSIZE; j++)
+		*dst_ptr++ = *src_ptr++;
+	      /* copy odd row with sign change */
+	      for (j = 0; j < DCTSIZE; j++)
+		*dst_ptr++ = - *src_ptr++;
+	    }
+	  }
+	} else {
+	  /* Just copy row verbatim. */
+	  jcopy_block_row(src_buffer[offset_y], dst_buffer[offset_y],
+			  compptr->width_in_data_units);
+	}
+      }
+    }
+  }
+}
+
+
+LOCAL(void)
+do_transpose (j_decompress_ptr srcinfo, j_compress_ptr dstinfo,
+	      jvirt_barray_ptr *src_coef_arrays,
+	      jvirt_barray_ptr *dst_coef_arrays)
+/* Transpose source into destination */
+{
+  JDIMENSION dst_blk_x, dst_blk_y;
+  int ci, i, j, offset_x, offset_y;
+  JBLOCKARRAY src_buffer, dst_buffer;
+  JCOEFPTR src_ptr, dst_ptr;
+  jpeg_component_info *compptr;
+
+  /* Transposing pixels within a block just requires transposing the
+   * DCT coefficients.
+   * Partial iMCUs at the edges require no special treatment; we simply
+   * process all the available DCT blocks for every component.
+   */
+  for (ci = 0; ci < dstinfo->num_components; ci++) {
+    compptr = dstinfo->comp_info + ci;
+    for (dst_blk_y = 0; dst_blk_y < compptr->height_in_data_units;
+	 dst_blk_y += compptr->v_samp_factor) {
+      dst_buffer = (*srcinfo->mem->access_virt_barray)
+	((j_common_ptr) srcinfo, dst_coef_arrays[ci], dst_blk_y,
+	 (JDIMENSION) compptr->v_samp_factor, TRUE);
+      for (offset_y = 0; offset_y < compptr->v_samp_factor; offset_y++) {
+	for (dst_blk_x = 0; dst_blk_x < compptr->width_in_data_units;
+	     dst_blk_x += compptr->h_samp_factor) {
+	  src_buffer = (*srcinfo->mem->access_virt_barray)
+	    ((j_common_ptr) srcinfo, src_coef_arrays[ci], dst_blk_x,
+	     (JDIMENSION) compptr->h_samp_factor, FALSE);
+	  for (offset_x = 0; offset_x < compptr->h_samp_factor; offset_x++) {
+	    src_ptr = src_buffer[offset_x][dst_blk_y + offset_y];
+	    dst_ptr = dst_buffer[offset_y][dst_blk_x + offset_x];
+	    for (i = 0; i < DCTSIZE; i++)
+	      for (j = 0; j < DCTSIZE; j++)
+		dst_ptr[j*DCTSIZE+i] = src_ptr[i*DCTSIZE+j];
+	  }
+	}
+      }
+    }
+  }
+}
+
+
+LOCAL(void)
+do_rot_90 (j_decompress_ptr srcinfo, j_compress_ptr dstinfo,
+	   jvirt_barray_ptr *src_coef_arrays,
+	   jvirt_barray_ptr *dst_coef_arrays)
+/* 90 degree rotation is equivalent to
+ *   1. Transposing the image;
+ *   2. Horizontal mirroring.
+ * These two steps are merged into a single processing routine.
+ */
+{
+  JDIMENSION MCU_cols, comp_width, dst_blk_x, dst_blk_y;
+  int ci, i, j, offset_x, offset_y;
+  JBLOCKARRAY src_buffer, dst_buffer;
+  JCOEFPTR src_ptr, dst_ptr;
+  jpeg_component_info *compptr;
+
+  /* Because of the horizontal mirror step, we can't process partial iMCUs
+   * at the (output) right edge properly.  They just get transposed and
+   * not mirrored.
+   */
+  MCU_cols = dstinfo->image_width / (dstinfo->max_h_samp_factor * DCTSIZE);
+
+  for (ci = 0; ci < dstinfo->num_components; ci++) {
+    compptr = dstinfo->comp_info + ci;
+    comp_width = MCU_cols * compptr->h_samp_factor;
+    for (dst_blk_y = 0; dst_blk_y < compptr->height_in_data_units;
+	 dst_blk_y += compptr->v_samp_factor) {
+      dst_buffer = (*srcinfo->mem->access_virt_barray)
+	((j_common_ptr) srcinfo, dst_coef_arrays[ci], dst_blk_y,
+	 (JDIMENSION) compptr->v_samp_factor, TRUE);
+      for (offset_y = 0; offset_y < compptr->v_samp_factor; offset_y++) {
+	for (dst_blk_x = 0; dst_blk_x < compptr->width_in_data_units;
+	     dst_blk_x += compptr->h_samp_factor) {
+	  src_buffer = (*srcinfo->mem->access_virt_barray)
+	    ((j_common_ptr) srcinfo, src_coef_arrays[ci], dst_blk_x,
+	     (JDIMENSION) compptr->h_samp_factor, FALSE);
+	  for (offset_x = 0; offset_x < compptr->h_samp_factor; offset_x++) {
+	    src_ptr = src_buffer[offset_x][dst_blk_y + offset_y];
+	    if (dst_blk_x < comp_width) {
+	      /* Block is within the mirrorable area. */
+	      dst_ptr = dst_buffer[offset_y]
+		[comp_width - dst_blk_x - offset_x - 1];
+	      for (i = 0; i < DCTSIZE; i++) {
+		for (j = 0; j < DCTSIZE; j++)
+		  dst_ptr[j*DCTSIZE+i] = src_ptr[i*DCTSIZE+j];
+		i++;
+		for (j = 0; j < DCTSIZE; j++)
+		  dst_ptr[j*DCTSIZE+i] = -src_ptr[i*DCTSIZE+j];
+	      }
+	    } else {
+	      /* Edge blocks are transposed but not mirrored. */
+	      dst_ptr = dst_buffer[offset_y][dst_blk_x + offset_x];
+	      for (i = 0; i < DCTSIZE; i++)
+		for (j = 0; j < DCTSIZE; j++)
+		  dst_ptr[j*DCTSIZE+i] = src_ptr[i*DCTSIZE+j];
+	    }
+	  }
+	}
+      }
+    }
+  }
+}
+
+
+LOCAL(void)
+do_rot_270 (j_decompress_ptr srcinfo, j_compress_ptr dstinfo,
+	    jvirt_barray_ptr *src_coef_arrays,
+	    jvirt_barray_ptr *dst_coef_arrays)
+/* 270 degree rotation is equivalent to
+ *   1. Horizontal mirroring;
+ *   2. Transposing the image.
+ * These two steps are merged into a single processing routine.
+ */
+{
+  JDIMENSION MCU_rows, comp_height, dst_blk_x, dst_blk_y;
+  int ci, i, j, offset_x, offset_y;
+  JBLOCKARRAY src_buffer, dst_buffer;
+  JCOEFPTR src_ptr, dst_ptr;
+  jpeg_component_info *compptr;
+
+  /* Because of the horizontal mirror step, we can't process partial iMCUs
+   * at the (output) bottom edge properly.  They just get transposed and
+   * not mirrored.
+   */
+  MCU_rows = dstinfo->image_height / (dstinfo->max_v_samp_factor * DCTSIZE);
+
+  for (ci = 0; ci < dstinfo->num_components; ci++) {
+    compptr = dstinfo->comp_info + ci;
+    comp_height = MCU_rows * compptr->v_samp_factor;
+    for (dst_blk_y = 0; dst_blk_y < compptr->height_in_data_units;
+	 dst_blk_y += compptr->v_samp_factor) {
+      dst_buffer = (*srcinfo->mem->access_virt_barray)
+	((j_common_ptr) srcinfo, dst_coef_arrays[ci], dst_blk_y,
+	 (JDIMENSION) compptr->v_samp_factor, TRUE);
+      for (offset_y = 0; offset_y < compptr->v_samp_factor; offset_y++) {
+	for (dst_blk_x = 0; dst_blk_x < compptr->width_in_data_units;
+	     dst_blk_x += compptr->h_samp_factor) {
+	  src_buffer = (*srcinfo->mem->access_virt_barray)
+	    ((j_common_ptr) srcinfo, src_coef_arrays[ci], dst_blk_x,
+	     (JDIMENSION) compptr->h_samp_factor, FALSE);
+	  for (offset_x = 0; offset_x < compptr->h_samp_factor; offset_x++) {
+	    dst_ptr = dst_buffer[offset_y][dst_blk_x + offset_x];
+	    if (dst_blk_y < comp_height) {
+	      /* Block is within the mirrorable area. */
+	      src_ptr = src_buffer[offset_x]
+		[comp_height - dst_blk_y - offset_y - 1];
+	      for (i = 0; i < DCTSIZE; i++) {
+		for (j = 0; j < DCTSIZE; j++) {
+		  dst_ptr[j*DCTSIZE+i] = src_ptr[i*DCTSIZE+j];
+		  j++;
+		  dst_ptr[j*DCTSIZE+i] = -src_ptr[i*DCTSIZE+j];
+		}
+	      }
+	    } else {
+	      /* Edge blocks are transposed but not mirrored. */
+	      src_ptr = src_buffer[offset_x][dst_blk_y + offset_y];
+	      for (i = 0; i < DCTSIZE; i++)
+		for (j = 0; j < DCTSIZE; j++)
+		  dst_ptr[j*DCTSIZE+i] = src_ptr[i*DCTSIZE+j];
+	    }
+	  }
+	}
+      }
+    }
+  }
+}
+
+
+LOCAL(void)
+do_rot_180 (j_decompress_ptr srcinfo, j_compress_ptr dstinfo,
+	    jvirt_barray_ptr *src_coef_arrays,
+	    jvirt_barray_ptr *dst_coef_arrays)
+/* 180 degree rotation is equivalent to
+ *   1. Vertical mirroring;
+ *   2. Horizontal mirroring.
+ * These two steps are merged into a single processing routine.
+ */
+{
+  JDIMENSION MCU_cols, MCU_rows, comp_width, comp_height, dst_blk_x, dst_blk_y;
+  int ci, i, j, offset_y;
+  JBLOCKARRAY src_buffer, dst_buffer;
+  JBLOCKROW src_row_ptr, dst_row_ptr;
+  JCOEFPTR src_ptr, dst_ptr;
+  jpeg_component_info *compptr;
+
+  MCU_cols = dstinfo->image_width / (dstinfo->max_h_samp_factor * DCTSIZE);
+  MCU_rows = dstinfo->image_height / (dstinfo->max_v_samp_factor * DCTSIZE);
+
+  for (ci = 0; ci < dstinfo->num_components; ci++) {
+    compptr = dstinfo->comp_info + ci;
+    comp_width = MCU_cols * compptr->h_samp_factor;
+    comp_height = MCU_rows * compptr->v_samp_factor;
+    for (dst_blk_y = 0; dst_blk_y < compptr->height_in_data_units;
+	 dst_blk_y += compptr->v_samp_factor) {
+      dst_buffer = (*srcinfo->mem->access_virt_barray)
+	((j_common_ptr) srcinfo, dst_coef_arrays[ci], dst_blk_y,
+	 (JDIMENSION) compptr->v_samp_factor, TRUE);
+      if (dst_blk_y < comp_height) {
+	/* Row is within the vertically mirrorable area. */
+	src_buffer = (*srcinfo->mem->access_virt_barray)
+	  ((j_common_ptr) srcinfo, src_coef_arrays[ci],
+	   comp_height - dst_blk_y - (JDIMENSION) compptr->v_samp_factor,
+	   (JDIMENSION) compptr->v_samp_factor, FALSE);
+      } else {
+	/* Bottom-edge rows are only mirrored horizontally. */
+	src_buffer = (*srcinfo->mem->access_virt_barray)
+	  ((j_common_ptr) srcinfo, src_coef_arrays[ci], dst_blk_y,
+	   (JDIMENSION) compptr->v_samp_factor, FALSE);
+      }
+      for (offset_y = 0; offset_y < compptr->v_samp_factor; offset_y++) {
+	if (dst_blk_y < comp_height) {
+	  /* Row is within the mirrorable area. */
+	  dst_row_ptr = dst_buffer[offset_y];
+	  src_row_ptr = src_buffer[compptr->v_samp_factor - offset_y - 1];
+	  /* Process the blocks that can be mirrored both ways. */
+	  for (dst_blk_x = 0; dst_blk_x < comp_width; dst_blk_x++) {
+	    dst_ptr = dst_row_ptr[dst_blk_x];
+	    src_ptr = src_row_ptr[comp_width - dst_blk_x - 1];
+	    for (i = 0; i < DCTSIZE; i += 2) {
+	      /* For even row, negate every odd column. */
+	      for (j = 0; j < DCTSIZE; j += 2) {
+		*dst_ptr++ = *src_ptr++;
+		*dst_ptr++ = - *src_ptr++;
+	      }
+	      /* For odd row, negate every even column. */
+	      for (j = 0; j < DCTSIZE; j += 2) {
+		*dst_ptr++ = - *src_ptr++;
+		*dst_ptr++ = *src_ptr++;
+	      }
+	    }
+	  }
+	  /* Any remaining right-edge blocks are only mirrored vertically. */
+	  for (; dst_blk_x < compptr->width_in_data_units; dst_blk_x++) {
+	    dst_ptr = dst_row_ptr[dst_blk_x];
+	    src_ptr = src_row_ptr[dst_blk_x];
+	    for (i = 0; i < DCTSIZE; i += 2) {
+	      for (j = 0; j < DCTSIZE; j++)
+		*dst_ptr++ = *src_ptr++;
+	      for (j = 0; j < DCTSIZE; j++)
+		*dst_ptr++ = - *src_ptr++;
+	    }
+	  }
+	} else {
+	  /* Remaining rows are just mirrored horizontally. */
+	  dst_row_ptr = dst_buffer[offset_y];
+	  src_row_ptr = src_buffer[offset_y];
+	  /* Process the blocks that can be mirrored. */
+	  for (dst_blk_x = 0; dst_blk_x < comp_width; dst_blk_x++) {
+	    dst_ptr = dst_row_ptr[dst_blk_x];
+	    src_ptr = src_row_ptr[comp_width - dst_blk_x - 1];
+	    for (i = 0; i < DCTSIZE2; i += 2) {
+	      *dst_ptr++ = *src_ptr++;
+	      *dst_ptr++ = - *src_ptr++;
+	    }
+	  }
+	  /* Any remaining right-edge blocks are only copied. */
+	  for (; dst_blk_x < compptr->width_in_data_units; dst_blk_x++) {
+	    dst_ptr = dst_row_ptr[dst_blk_x];
+	    src_ptr = src_row_ptr[dst_blk_x];
+	    for (i = 0; i < DCTSIZE2; i++)
+	      *dst_ptr++ = *src_ptr++;
+	  }
+	}
+      }
+    }
+  }
+}
+
+
+LOCAL(void)
+do_transverse (j_decompress_ptr srcinfo, j_compress_ptr dstinfo,
+	       jvirt_barray_ptr *src_coef_arrays,
+	       jvirt_barray_ptr *dst_coef_arrays)
+/* Transverse transpose is equivalent to
+ *   1. 180 degree rotation;
+ *   2. Transposition;
+ * or
+ *   1. Horizontal mirroring;
+ *   2. Transposition;
+ *   3. Horizontal mirroring.
+ * These steps are merged into a single processing routine.
+ */
+{
+  JDIMENSION MCU_cols, MCU_rows, comp_width, comp_height, dst_blk_x, dst_blk_y;
+  int ci, i, j, offset_x, offset_y;
+  JBLOCKARRAY src_buffer, dst_buffer;
+  JCOEFPTR src_ptr, dst_ptr;
+  jpeg_component_info *compptr;
+
+  MCU_cols = dstinfo->image_width / (dstinfo->max_h_samp_factor * DCTSIZE);
+  MCU_rows = dstinfo->image_height / (dstinfo->max_v_samp_factor * DCTSIZE);
+
+  for (ci = 0; ci < dstinfo->num_components; ci++) {
+    compptr = dstinfo->comp_info + ci;
+    comp_width = MCU_cols * compptr->h_samp_factor;
+    comp_height = MCU_rows * compptr->v_samp_factor;
+    for (dst_blk_y = 0; dst_blk_y < compptr->height_in_data_units;
+	 dst_blk_y += compptr->v_samp_factor) {
+      dst_buffer = (*srcinfo->mem->access_virt_barray)
+	((j_common_ptr) srcinfo, dst_coef_arrays[ci], dst_blk_y,
+	 (JDIMENSION) compptr->v_samp_factor, TRUE);
+      for (offset_y = 0; offset_y < compptr->v_samp_factor; offset_y++) {
+	for (dst_blk_x = 0; dst_blk_x < compptr->width_in_data_units;
+	     dst_blk_x += compptr->h_samp_factor) {
+	  src_buffer = (*srcinfo->mem->access_virt_barray)
+	    ((j_common_ptr) srcinfo, src_coef_arrays[ci], dst_blk_x,
+	     (JDIMENSION) compptr->h_samp_factor, FALSE);
+	  for (offset_x = 0; offset_x < compptr->h_samp_factor; offset_x++) {
+	    if (dst_blk_y < comp_height) {
+	      src_ptr = src_buffer[offset_x]
+		[comp_height - dst_blk_y - offset_y - 1];
+	      if (dst_blk_x < comp_width) {
+		/* Block is within the mirrorable area. */
+		dst_ptr = dst_buffer[offset_y]
+		  [comp_width - dst_blk_x - offset_x - 1];
+		for (i = 0; i < DCTSIZE; i++) {
+		  for (j = 0; j < DCTSIZE; j++) {
+		    dst_ptr[j*DCTSIZE+i] = src_ptr[i*DCTSIZE+j];
+		    j++;
+		    dst_ptr[j*DCTSIZE+i] = -src_ptr[i*DCTSIZE+j];
+		  }
+		  i++;
+		  for (j = 0; j < DCTSIZE; j++) {
+		    dst_ptr[j*DCTSIZE+i] = -src_ptr[i*DCTSIZE+j];
+		    j++;
+		    dst_ptr[j*DCTSIZE+i] = src_ptr[i*DCTSIZE+j];
+		  }
+		}
+	      } else {
+		/* Right-edge blocks are mirrored in y only */
+		dst_ptr = dst_buffer[offset_y][dst_blk_x + offset_x];
+		for (i = 0; i < DCTSIZE; i++) {
+		  for (j = 0; j < DCTSIZE; j++) {
+		    dst_ptr[j*DCTSIZE+i] = src_ptr[i*DCTSIZE+j];
+		    j++;
+		    dst_ptr[j*DCTSIZE+i] = -src_ptr[i*DCTSIZE+j];
+		  }
+		}
+	      }
+	    } else {
+	      src_ptr = src_buffer[offset_x][dst_blk_y + offset_y];
+	      if (dst_blk_x < comp_width) {
+		/* Bottom-edge blocks are mirrored in x only */
+		dst_ptr = dst_buffer[offset_y]
+		  [comp_width - dst_blk_x - offset_x - 1];
+		for (i = 0; i < DCTSIZE; i++) {
+		  for (j = 0; j < DCTSIZE; j++)
+		    dst_ptr[j*DCTSIZE+i] = src_ptr[i*DCTSIZE+j];
+		  i++;
+		  for (j = 0; j < DCTSIZE; j++)
+		    dst_ptr[j*DCTSIZE+i] = -src_ptr[i*DCTSIZE+j];
+		}
+	      } else {
+		/* At lower right corner, just transpose, no mirroring */
+		dst_ptr = dst_buffer[offset_y][dst_blk_x + offset_x];
+		for (i = 0; i < DCTSIZE; i++)
+		  for (j = 0; j < DCTSIZE; j++)
+		    dst_ptr[j*DCTSIZE+i] = src_ptr[i*DCTSIZE+j];
+	      }
+	    }
+	  }
+	}
+      }
+    }
+  }
+}
+
+
+/* Request any required workspace.
+ *
+ * We allocate the workspace virtual arrays from the source decompression
+ * object, so that all the arrays (both the original data and the workspace)
+ * will be taken into account while making memory management decisions.
+ * Hence, this routine must be called after jpeg_read_header (which reads
+ * the image dimensions) and before jpeg_read_coefficients (which realizes
+ * the source's virtual arrays).
+ */
+
+GLOBAL(void)
+jtransform_request_workspace (j_decompress_ptr srcinfo,
+			      jpeg_transform_info *info)
+{
+  jvirt_barray_ptr *coef_arrays = NULL;
+  jpeg_component_info *compptr;
+  int ci;
+
+  if (info->force_grayscale &&
+      srcinfo->jpeg_color_space == JCS_YCbCr &&
+      srcinfo->num_components == 3) {
+    /* We'll only process the first component */
+    info->num_components = 1;
+  } else {
+    /* Process all the components */
+    info->num_components = srcinfo->num_components;
+  }
+
+  switch (info->transform) {
+  case JXFORM_NONE:
+  case JXFORM_FLIP_H:
+    /* Don't need a workspace array */
+    break;
+  case JXFORM_FLIP_V:
+  case JXFORM_ROT_180:
+    /* Need workspace arrays having same dimensions as source image.
+     * Note that we allocate arrays padded out to the next iMCU boundary,
+     * so that transform routines need not worry about missing edge blocks.
+     */
+    coef_arrays = (jvirt_barray_ptr *)
+      (*srcinfo->mem->alloc_small) ((j_common_ptr) srcinfo, JPOOL_IMAGE,
+	SIZEOF(jvirt_barray_ptr) * info->num_components);
+    for (ci = 0; ci < info->num_components; ci++) {
+      compptr = srcinfo->comp_info + ci;
+      coef_arrays[ci] = (*srcinfo->mem->request_virt_barray)
+	((j_common_ptr) srcinfo, JPOOL_IMAGE, FALSE,
+	 (JDIMENSION) jround_up((long) compptr->width_in_data_units,
+				(long) compptr->h_samp_factor),
+	 (JDIMENSION) jround_up((long) compptr->height_in_data_units,
+				(long) compptr->v_samp_factor),
+	 (JDIMENSION) compptr->v_samp_factor);
+    }
+    break;
+  case JXFORM_TRANSPOSE:
+  case JXFORM_TRANSVERSE:
+  case JXFORM_ROT_90:
+  case JXFORM_ROT_270:
+    /* Need workspace arrays having transposed dimensions.
+     * Note that we allocate arrays padded out to the next iMCU boundary,
+     * so that transform routines need not worry about missing edge blocks.
+     */
+    coef_arrays = (jvirt_barray_ptr *)
+      (*srcinfo->mem->alloc_small) ((j_common_ptr) srcinfo, JPOOL_IMAGE,
+	SIZEOF(jvirt_barray_ptr) * info->num_components);
+    for (ci = 0; ci < info->num_components; ci++) {
+      compptr = srcinfo->comp_info + ci;
+      coef_arrays[ci] = (*srcinfo->mem->request_virt_barray)
+	((j_common_ptr) srcinfo, JPOOL_IMAGE, FALSE,
+	 (JDIMENSION) jround_up((long) compptr->height_in_data_units,
+				(long) compptr->v_samp_factor),
+	 (JDIMENSION) jround_up((long) compptr->width_in_data_units,
+				(long) compptr->h_samp_factor),
+	 (JDIMENSION) compptr->h_samp_factor);
+    }
+    break;
+  }
+  info->workspace_coef_arrays = coef_arrays;
+}
+
+
+/* Transpose destination image parameters */
+
+LOCAL(void)
+transpose_critical_parameters (j_compress_ptr dstinfo)
+{
+  int tblno, i, j, ci, itemp;
+  jpeg_component_info *compptr;
+  JQUANT_TBL *qtblptr;
+  JDIMENSION dtemp;
+  UINT16 qtemp;
+
+  /* Transpose basic image dimensions */
+  dtemp = dstinfo->image_width;
+  dstinfo->image_width = dstinfo->image_height;
+  dstinfo->image_height = dtemp;
+
+  /* Transpose sampling factors */
+  for (ci = 0; ci < dstinfo->num_components; ci++) {
+    compptr = dstinfo->comp_info + ci;
+    itemp = compptr->h_samp_factor;
+    compptr->h_samp_factor = compptr->v_samp_factor;
+    compptr->v_samp_factor = itemp;
+  }
+
+  /* Transpose quantization tables */
+  for (tblno = 0; tblno < NUM_QUANT_TBLS; tblno++) {
+    qtblptr = dstinfo->quant_tbl_ptrs[tblno];
+    if (qtblptr != NULL) {
+      for (i = 0; i < DCTSIZE; i++) {
+	for (j = 0; j < i; j++) {
+	  qtemp = qtblptr->quantval[i*DCTSIZE+j];
+	  qtblptr->quantval[i*DCTSIZE+j] = qtblptr->quantval[j*DCTSIZE+i];
+	  qtblptr->quantval[j*DCTSIZE+i] = qtemp;
+	}
+      }
+    }
+  }
+}
+
+
+/* Trim off any partial iMCUs on the indicated destination edge */
+
+LOCAL(void)
+trim_right_edge (j_compress_ptr dstinfo)
+{
+  int ci, max_h_samp_factor;
+  JDIMENSION MCU_cols;
+
+  /* We have to compute max_h_samp_factor ourselves,
+   * because it hasn't been set yet in the destination
+   * (and we don't want to use the source's value).
+   */
+  max_h_samp_factor = 1;
+  for (ci = 0; ci < dstinfo->num_components; ci++) {
+    int h_samp_factor = dstinfo->comp_info[ci].h_samp_factor;
+    max_h_samp_factor = MAX(max_h_samp_factor, h_samp_factor);
+  }
+  MCU_cols = dstinfo->image_width / (max_h_samp_factor * DCTSIZE);
+  if (MCU_cols > 0)		/* can't trim to 0 pixels */
+    dstinfo->image_width = MCU_cols * (max_h_samp_factor * DCTSIZE);
+}
+
+LOCAL(void)
+trim_bottom_edge (j_compress_ptr dstinfo)
+{
+  int ci, max_v_samp_factor;
+  JDIMENSION MCU_rows;
+
+  /* We have to compute max_v_samp_factor ourselves,
+   * because it hasn't been set yet in the destination
+   * (and we don't want to use the source's value).
+   */
+  max_v_samp_factor = 1;
+  for (ci = 0; ci < dstinfo->num_components; ci++) {
+    int v_samp_factor = dstinfo->comp_info[ci].v_samp_factor;
+    max_v_samp_factor = MAX(max_v_samp_factor, v_samp_factor);
+  }
+  MCU_rows = dstinfo->image_height / (max_v_samp_factor * DCTSIZE);
+  if (MCU_rows > 0)		/* can't trim to 0 pixels */
+    dstinfo->image_height = MCU_rows * (max_v_samp_factor * DCTSIZE);
+}
+
+
+/* Adjust output image parameters as needed.
+ *
+ * This must be called after jpeg_copy_critical_parameters()
+ * and before jpeg_write_coefficients().
+ *
+ * The return value is the set of virtual coefficient arrays to be written
+ * (either the ones allocated by jtransform_request_workspace, or the
+ * original source data arrays).  The caller will need to pass this value
+ * to jpeg_write_coefficients().
+ */
+
+GLOBAL(jvirt_barray_ptr *)
+jtransform_adjust_parameters (j_decompress_ptr srcinfo,
+			      j_compress_ptr dstinfo,
+			      jvirt_barray_ptr *src_coef_arrays,
+			      jpeg_transform_info *info)
+{
+  /* If force-to-grayscale is requested, adjust destination parameters */
+  if (info->force_grayscale) {
+    /* We use jpeg_set_colorspace to make sure subsidiary settings get fixed
+     * properly.  Among other things, the target h_samp_factor & v_samp_factor
+     * will get set to 1, which typically won't match the source.
+     * In fact we do this even if the source is already grayscale; that
+     * provides an easy way of coercing a grayscale JPEG with funny sampling
+     * factors to the customary 1,1.  (Some decoders fail on other factors.)
+     */
+    if ((dstinfo->jpeg_color_space == JCS_YCbCr &&
+	 dstinfo->num_components == 3) ||
+	(dstinfo->jpeg_color_space == JCS_GRAYSCALE &&
+	 dstinfo->num_components == 1)) {
+      /* We have to preserve the source's quantization table number. */
+      int sv_quant_tbl_no = dstinfo->comp_info[0].quant_tbl_no;
+      jpeg_set_colorspace(dstinfo, JCS_GRAYSCALE);
+      dstinfo->comp_info[0].quant_tbl_no = sv_quant_tbl_no;
+    } else {
+      /* Sorry, can't do it */
+      ERREXIT(dstinfo, JERR_CONVERSION_NOTIMPL);
+    }
+  }
+
+  /* Correct the destination's image dimensions etc if necessary */
+  switch (info->transform) {
+  case JXFORM_NONE:
+    /* Nothing to do */
+    break;
+  case JXFORM_FLIP_H:
+    if (info->trim)
+      trim_right_edge(dstinfo);
+    break;
+  case JXFORM_FLIP_V:
+    if (info->trim)
+      trim_bottom_edge(dstinfo);
+    break;
+  case JXFORM_TRANSPOSE:
+    transpose_critical_parameters(dstinfo);
+    /* transpose does NOT have to trim anything */
+    break;
+  case JXFORM_TRANSVERSE:
+    transpose_critical_parameters(dstinfo);
+    if (info->trim) {
+      trim_right_edge(dstinfo);
+      trim_bottom_edge(dstinfo);
+    }
+    break;
+  case JXFORM_ROT_90:
+    transpose_critical_parameters(dstinfo);
+    if (info->trim)
+      trim_right_edge(dstinfo);
+    break;
+  case JXFORM_ROT_180:
+    if (info->trim) {
+      trim_right_edge(dstinfo);
+      trim_bottom_edge(dstinfo);
+    }
+    break;
+  case JXFORM_ROT_270:
+    transpose_critical_parameters(dstinfo);
+    if (info->trim)
+      trim_bottom_edge(dstinfo);
+    break;
+  }
+
+  /* Return the appropriate output data set */
+  if (info->workspace_coef_arrays != NULL)
+    return info->workspace_coef_arrays;
+  return src_coef_arrays;
+}
+
+
+/* Execute the actual transformation, if any.
+ *
+ * This must be called *after* jpeg_write_coefficients, because it depends
+ * on jpeg_write_coefficients to have computed subsidiary values such as
+ * the per-component width and height fields in the destination object.
+ *
+ * Note that some transformations will modify the source data arrays!
+ */
+
+GLOBAL(void)
+jtransform_execute_transformation (j_decompress_ptr srcinfo,
+				   j_compress_ptr dstinfo,
+				   jvirt_barray_ptr *src_coef_arrays,
+				   jpeg_transform_info *info)
+{
+  jvirt_barray_ptr *dst_coef_arrays = info->workspace_coef_arrays;
+
+  switch (info->transform) {
+  case JXFORM_NONE:
+    break;
+  case JXFORM_FLIP_H:
+    do_flip_h(srcinfo, dstinfo, src_coef_arrays);
+    break;
+  case JXFORM_FLIP_V:
+    do_flip_v(srcinfo, dstinfo, src_coef_arrays, dst_coef_arrays);
+    break;
+  case JXFORM_TRANSPOSE:
+    do_transpose(srcinfo, dstinfo, src_coef_arrays, dst_coef_arrays);
+    break;
+  case JXFORM_TRANSVERSE:
+    do_transverse(srcinfo, dstinfo, src_coef_arrays, dst_coef_arrays);
+    break;
+  case JXFORM_ROT_90:
+    do_rot_90(srcinfo, dstinfo, src_coef_arrays, dst_coef_arrays);
+    break;
+  case JXFORM_ROT_180:
+    do_rot_180(srcinfo, dstinfo, src_coef_arrays, dst_coef_arrays);
+    break;
+  case JXFORM_ROT_270:
+    do_rot_270(srcinfo, dstinfo, src_coef_arrays, dst_coef_arrays);
+    break;
+  }
+}
+
+#endif /* TRANSFORMS_SUPPORTED */
+
+
+/* Setup decompression object to save desired markers in memory.
+ * This must be called before jpeg_read_header() to have the desired effect.
+ */
+
+GLOBAL(void)
+jcopy_markers_setup (j_decompress_ptr srcinfo, JCOPY_OPTION option)
+{
+#ifdef SAVE_MARKERS_SUPPORTED
+  int m;
+
+  /* Save comments except under NONE option */
+  if (option != JCOPYOPT_NONE) {
+    jpeg_save_markers(srcinfo, JPEG_COM, 0xFFFF);
+  }
+  /* Save all types of APPn markers iff ALL option */
+  if (option == JCOPYOPT_ALL) {
+    for (m = 0; m < 16; m++)
+      jpeg_save_markers(srcinfo, JPEG_APP0 + m, 0xFFFF);
+  }
+#endif /* SAVE_MARKERS_SUPPORTED */
+}
+
+/* Copy markers saved in the given source object to the destination object.
+ * This should be called just after jpeg_start_compress() or
+ * jpeg_write_coefficients().
+ * Note that those routines will have written the SOI, and also the
+ * JFIF APP0 or Adobe APP14 markers if selected.
+ */
+
+GLOBAL(void)
+jcopy_markers_execute (j_decompress_ptr srcinfo, j_compress_ptr dstinfo,
+		       JCOPY_OPTION option)
+{
+  jpeg_saved_marker_ptr marker;
+
+  /* In the current implementation, we don't actually need to examine the
+   * option flag here; we just copy everything that got saved.
+   * But to avoid confusion, we do not output JFIF and Adobe APP14 markers
+   * if the encoder library already wrote one.
+   */
+  for (marker = srcinfo->marker_list; marker != NULL; marker = marker->next) {
+    if (dstinfo->write_JFIF_header &&
+	marker->marker == JPEG_APP0 &&
+	marker->data_length >= 5 &&
+	GETJOCTET(marker->data[0]) == 0x4A &&
+	GETJOCTET(marker->data[1]) == 0x46 &&
+	GETJOCTET(marker->data[2]) == 0x49 &&
+	GETJOCTET(marker->data[3]) == 0x46 &&
+	GETJOCTET(marker->data[4]) == 0)
+      continue;			/* reject duplicate JFIF */
+    if (dstinfo->write_Adobe_marker &&
+	marker->marker == JPEG_APP0+14 &&
+	marker->data_length >= 5 &&
+	GETJOCTET(marker->data[0]) == 0x41 &&
+	GETJOCTET(marker->data[1]) == 0x64 &&
+	GETJOCTET(marker->data[2]) == 0x6F &&
+	GETJOCTET(marker->data[3]) == 0x62 &&
+	GETJOCTET(marker->data[4]) == 0x65)
+      continue;			/* reject duplicate Adobe */
+#ifdef NEED_FAR_POINTERS
+    /* We could use jpeg_write_marker if the data weren't FAR... */
+    {
+      unsigned int i;
+      jpeg_write_m_header(dstinfo, marker->marker, marker->data_length);
+      for (i = 0; i < marker->data_length; i++)
+	jpeg_write_m_byte(dstinfo, marker->data[i]);
+    }
+#else
+    jpeg_write_marker(dstinfo, marker->marker,
+		      marker->data, marker->data_length);
+#endif
+  }
+}
diff --git a/uppsrc/plugin/jpg/lib/transupp.h b/uppsrc/plugin/jpg/lib/transupp.h
new file mode 100644
index 000000000..5c2d32aff
--- /dev/null
+++ b/uppsrc/plugin/jpg/lib/transupp.h
@@ -0,0 +1,135 @@
+/*
+ * transupp.h
+ *
+ * Copyright (C) 1997, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains declarations for image transformation routines and
+ * other utility code used by the jpegtran sample application.  These are
+ * NOT part of the core JPEG library.  But we keep these routines separate
+ * from jpegtran.c to ease the task of maintaining jpegtran-like programs
+ * that have other user interfaces.
+ *
+ * NOTE: all the routines declared here have very specific requirements
+ * about when they are to be executed during the reading and writing of the
+ * source and destination files.  See the comments in transupp.c, or see
+ * jpegtran.c for an example of correct usage.
+ */
+
+/* If you happen not to want the image transform support, disable it here */
+#ifndef TRANSFORMS_SUPPORTED
+#define TRANSFORMS_SUPPORTED 1		/* 0 disables transform code */
+#endif
+
+/* Short forms of external names for systems with brain-damaged linkers. */
+
+#ifdef NEED_SHORT_EXTERNAL_NAMES
+#define jtransform_request_workspace		jTrRequest
+#define jtransform_adjust_parameters		jTrAdjust
+#define jtransform_execute_transformation	jTrExec
+#define jcopy_markers_setup			jCMrkSetup
+#define jcopy_markers_execute			jCMrkExec
+#endif /* NEED_SHORT_EXTERNAL_NAMES */
+
+
+/*
+ * Codes for supported types of image transformations.
+ */
+
+typedef enum {
+	JXFORM_NONE,		/* no transformation */
+	JXFORM_FLIP_H,		/* horizontal flip */
+	JXFORM_FLIP_V,		/* vertical flip */
+	JXFORM_TRANSPOSE,	/* transpose across UL-to-LR axis */
+	JXFORM_TRANSVERSE,	/* transpose across UR-to-LL axis */
+	JXFORM_ROT_90,		/* 90-degree clockwise rotation */
+	JXFORM_ROT_180,		/* 180-degree rotation */
+	JXFORM_ROT_270		/* 270-degree clockwise (or 90 ccw) */
+} JXFORM_CODE;
+
+/*
+ * Although rotating and flipping data expressed as DCT coefficients is not
+ * hard, there is an asymmetry in the JPEG format specification for images
+ * whose dimensions aren't multiples of the iMCU size.  The right and bottom
+ * image edges are padded out to the next iMCU boundary with junk data; but
+ * no padding is possible at the top and left edges.  If we were to flip
+ * the whole image including the pad data, then pad garbage would become
+ * visible at the top and/or left, and real pixels would disappear into the
+ * pad margins --- perhaps permanently, since encoders & decoders may not
+ * bother to preserve DCT blocks that appear to be completely outside the
+ * nominal image area.  So, we have to exclude any partial iMCUs from the
+ * basic transformation.
+ *
+ * Transpose is the only transformation that can handle partial iMCUs at the
+ * right and bottom edges completely cleanly.  flip_h can flip partial iMCUs
+ * at the bottom, but leaves any partial iMCUs at the right edge untouched.
+ * Similarly flip_v leaves any partial iMCUs at the bottom edge untouched.
+ * The other transforms are defined as combinations of these basic transforms
+ * and process edge blocks in a way that preserves the equivalence.
+ *
+ * The "trim" option causes untransformable partial iMCUs to be dropped;
+ * this is not strictly lossless, but it usually gives the best-looking
+ * result for odd-size images.  Note that when this option is active,
+ * the expected mathematical equivalences between the transforms may not hold.
+ * (For example, -rot 270 -trim trims only the bottom edge, but -rot 90 -trim
+ * followed by -rot 180 -trim trims both edges.)
+ *
+ * We also offer a "force to grayscale" option, which simply discards the
+ * chrominance channels of a YCbCr image.  This is lossless in the sense that
+ * the luminance channel is preserved exactly.  It's not the same kind of
+ * thing as the rotate/flip transformations, but it's convenient to handle it
+ * as part of this package, mainly because the transformation routines have to
+ * be aware of the option to know how many components to work on.
+ */
+
+typedef struct {
+  /* Options: set by caller */
+  JXFORM_CODE transform;	/* image transform operator */
+  boolean trim;			/* if TRUE, trim partial MCUs as needed */
+  boolean force_grayscale;	/* if TRUE, convert color image to grayscale */
+
+  /* Internal workspace: caller should not touch these */
+  int num_components;		/* # of components in workspace */
+  jvirt_barray_ptr * workspace_coef_arrays; /* workspace for transformations */
+} jpeg_transform_info;
+
+
+#if TRANSFORMS_SUPPORTED
+
+/* Request any required workspace */
+EXTERN(void) jtransform_request_workspace
+	JPP((j_decompress_ptr srcinfo, jpeg_transform_info *info));
+/* Adjust output image parameters */
+EXTERN(jvirt_barray_ptr *) jtransform_adjust_parameters
+	JPP((j_decompress_ptr srcinfo, j_compress_ptr dstinfo,
+	     jvirt_barray_ptr *src_coef_arrays,
+	     jpeg_transform_info *info));
+/* Execute the actual transformation, if any */
+EXTERN(void) jtransform_execute_transformation
+	JPP((j_decompress_ptr srcinfo, j_compress_ptr dstinfo,
+	     jvirt_barray_ptr *src_coef_arrays,
+	     jpeg_transform_info *info));
+
+#endif /* TRANSFORMS_SUPPORTED */
+
+
+/*
+ * Support for copying optional markers from source to destination file.
+ */
+
+typedef enum {
+	JCOPYOPT_NONE,		/* copy no optional markers */
+	JCOPYOPT_COMMENTS,	/* copy only comment (COM) markers */
+	JCOPYOPT_ALL		/* copy all optional markers */
+} JCOPY_OPTION;
+
+#define JCOPYOPT_DEFAULT  JCOPYOPT_COMMENTS	/* recommended default */
+
+/* Setup decompression object to save desired markers in memory */
+EXTERN(void) jcopy_markers_setup
+	JPP((j_decompress_ptr srcinfo, JCOPY_OPTION option));
+/* Copy markers saved in the given source object to the destination object */
+EXTERN(void) jcopy_markers_execute
+	JPP((j_decompress_ptr srcinfo, j_compress_ptr dstinfo,
+	     JCOPY_OPTION option));
diff --git a/uppsrc/plugin/jpg/lib/wrbmp.c b/uppsrc/plugin/jpg/lib/wrbmp.c
new file mode 100644
index 000000000..84e7dc96b
--- /dev/null
+++ b/uppsrc/plugin/jpg/lib/wrbmp.c
@@ -0,0 +1,442 @@
+/*
+ * wrbmp.c
+ *
+ * Copyright (C) 1994-1996, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains routines to write output images in Microsoft "BMP"
+ * format (MS Windows 3.x and OS/2 1.x flavors).
+ * Either 8-bit colormapped or 24-bit full-color format can be written.
+ * No compression is supported.
+ *
+ * These routines may need modification for non-Unix environments or
+ * specialized applications.  As they stand, they assume output to
+ * an ordinary stdio stream.
+ *
+ * This code contributed by James Arthur Boucher.
+ */
+
+#include "cdjpeg.h"		/* Common decls for cjpeg/djpeg applications */
+
+#ifdef BMP_SUPPORTED
+
+
+/*
+ * To support 12-bit JPEG data, we'd have to scale output down to 8 bits.
+ * This is not yet implemented.
+ */
+
+#if BITS_IN_JSAMPLE != 8
+  Sorry, this code only copes with 8-bit JSAMPLEs. /* deliberate syntax err */
+#endif
+
+/*
+ * Since BMP stores scanlines bottom-to-top, we have to invert the image
+ * from JPEG's top-to-bottom order.  To do this, we save the outgoing data
+ * in a virtual array during put_pixel_row calls, then actually emit the
+ * BMP file during finish_output.  The virtual array contains one JSAMPLE per
+ * pixel if the output is grayscale or colormapped, three if it is full color.
+ */
+
+/* Private version of data destination object */
+
+typedef struct {
+  struct djpeg_dest_struct pub;	/* public fields */
+
+  boolean is_os2;		/* saves the OS2 format request flag */
+
+  jvirt_sarray_ptr whole_image;	/* needed to reverse row order */
+  JDIMENSION data_width;	/* JSAMPLEs per row */
+  JDIMENSION row_width;		/* physical width of one row in the BMP file */
+  int pad_bytes;		/* number of padding bytes needed per row */
+  JDIMENSION cur_output_row;	/* next row# to write to virtual array */
+} bmp_dest_struct;
+
+typedef bmp_dest_struct * bmp_dest_ptr;
+
+
+/* Forward declarations */
+LOCAL(void) write_colormap
+	JPP((j_decompress_ptr cinfo, bmp_dest_ptr dest,
+	     int map_colors, int map_entry_size));
+
+
+/*
+ * Write some pixel data.
+ * In this module rows_supplied will always be 1.
+ */
+
+METHODDEF(void)
+put_pixel_rows (j_decompress_ptr cinfo, djpeg_dest_ptr dinfo,
+		JDIMENSION rows_supplied)
+/* This version is for writing 24-bit pixels */
+{
+  bmp_dest_ptr dest = (bmp_dest_ptr) dinfo;
+  JSAMPARRAY image_ptr;
+  register JSAMPROW inptr, outptr;
+  register JDIMENSION col;
+  int pad;
+
+  /* Access next row in virtual array */
+  image_ptr = (*cinfo->mem->access_virt_sarray)
+    ((j_common_ptr) cinfo, dest->whole_image,
+     dest->cur_output_row, (JDIMENSION) 1, TRUE);
+  dest->cur_output_row++;
+
+  /* Transfer data.  Note destination values must be in BGR order
+   * (even though Microsoft's own documents say the opposite).
+   */
+  inptr = dest->pub.buffer[0];
+  outptr = image_ptr[0];
+  for (col = cinfo->output_width; col > 0; col--) {
+    outptr[2] = *inptr++;	/* can omit GETJSAMPLE() safely */
+    outptr[1] = *inptr++;
+    outptr[0] = *inptr++;
+    outptr += 3;
+  }
+
+  /* Zero out the pad bytes. */
+  pad = dest->pad_bytes;
+  while (--pad >= 0)
+    *outptr++ = 0;
+}
+
+METHODDEF(void)
+put_gray_rows (j_decompress_ptr cinfo, djpeg_dest_ptr dinfo,
+	       JDIMENSION rows_supplied)
+/* This version is for grayscale OR quantized color output */
+{
+  bmp_dest_ptr dest = (bmp_dest_ptr) dinfo;
+  JSAMPARRAY image_ptr;
+  register JSAMPROW inptr, outptr;
+  register JDIMENSION col;
+  int pad;
+
+  /* Access next row in virtual array */
+  image_ptr = (*cinfo->mem->access_virt_sarray)
+    ((j_common_ptr) cinfo, dest->whole_image,
+     dest->cur_output_row, (JDIMENSION) 1, TRUE);
+  dest->cur_output_row++;
+
+  /* Transfer data. */
+  inptr = dest->pub.buffer[0];
+  outptr = image_ptr[0];
+  for (col = cinfo->output_width; col > 0; col--) {
+    *outptr++ = *inptr++;	/* can omit GETJSAMPLE() safely */
+  }
+
+  /* Zero out the pad bytes. */
+  pad = dest->pad_bytes;
+  while (--pad >= 0)
+    *outptr++ = 0;
+}
+
+
+/*
+ * Startup: normally writes the file header.
+ * In this module we may as well postpone everything until finish_output.
+ */
+
+METHODDEF(void)
+start_output_bmp (j_decompress_ptr cinfo, djpeg_dest_ptr dinfo)
+{
+  /* no work here */
+}
+
+
+/*
+ * Finish up at the end of the file.
+ *
+ * Here is where we really output the BMP file.
+ *
+ * First, routines to write the Windows and OS/2 variants of the file header.
+ */
+
+LOCAL(void)
+write_bmp_header (j_decompress_ptr cinfo, bmp_dest_ptr dest)
+/* Write a Windows-style BMP file header, including colormap if needed */
+{
+  char bmpfileheader[14];
+  char bmpinfoheader[40];
+#define PUT_2B(array,offset,value)  \
+	(array[offset] = (char) ((value) & 0xFF), \
+	 array[offset+1] = (char) (((value) >> 8) & 0xFF))
+#define PUT_4B(array,offset,value)  \
+	(array[offset] = (char) ((value) & 0xFF), \
+	 array[offset+1] = (char) (((value) >> 8) & 0xFF), \
+	 array[offset+2] = (char) (((value) >> 16) & 0xFF), \
+	 array[offset+3] = (char) (((value) >> 24) & 0xFF))
+  INT32 headersize, bfSize;
+  int bits_per_pixel, cmap_entries;
+
+  /* Compute colormap size and total file size */
+  if (cinfo->out_color_space == JCS_RGB) {
+    if (cinfo->quantize_colors) {
+      /* Colormapped RGB */
+      bits_per_pixel = 8;
+      cmap_entries = 256;
+    } else {
+      /* Unquantized, full color RGB */
+      bits_per_pixel = 24;
+      cmap_entries = 0;
+    }
+  } else {
+    /* Grayscale output.  We need to fake a 256-entry colormap. */
+    bits_per_pixel = 8;
+    cmap_entries = 256;
+  }
+  /* File size */
+  headersize = 14 + 40 + cmap_entries * 4; /* Header and colormap */
+  bfSize = headersize + (INT32) dest->row_width * (INT32) cinfo->output_height;
+
+  /* Set unused fields of header to 0 */
+  MEMZERO(bmpfileheader, SIZEOF(bmpfileheader));
+  MEMZERO(bmpinfoheader, SIZEOF(bmpinfoheader));
+
+  /* Fill the file header */
+  bmpfileheader[0] = 0x42;	/* first 2 bytes are ASCII 'B', 'M' */
+  bmpfileheader[1] = 0x4D;
+  PUT_4B(bmpfileheader, 2, bfSize); /* bfSize */
+  /* we leave bfReserved1 & bfReserved2 = 0 */
+  PUT_4B(bmpfileheader, 10, headersize); /* bfOffBits */
+
+  /* Fill the info header (Microsoft calls this a BITMAPINFOHEADER) */
+  PUT_2B(bmpinfoheader, 0, 40);	/* biSize */
+  PUT_4B(bmpinfoheader, 4, cinfo->output_width); /* biWidth */
+  PUT_4B(bmpinfoheader, 8, cinfo->output_height); /* biHeight */
+  PUT_2B(bmpinfoheader, 12, 1);	/* biPlanes - must be 1 */
+  PUT_2B(bmpinfoheader, 14, bits_per_pixel); /* biBitCount */
+  /* we leave biCompression = 0, for none */
+  /* we leave biSizeImage = 0; this is correct for uncompressed data */
+  if (cinfo->density_unit == 2) { /* if have density in dots/cm, then */
+    PUT_4B(bmpinfoheader, 24, (INT32) (cinfo->X_density*100)); /* XPels/M */
+    PUT_4B(bmpinfoheader, 28, (INT32) (cinfo->Y_density*100)); /* XPels/M */
+  }
+  PUT_2B(bmpinfoheader, 32, cmap_entries); /* biClrUsed */
+  /* we leave biClrImportant = 0 */
+
+  if (JFWRITE(dest->pub.output_file, bmpfileheader, 14) != (size_t) 14)
+    ERREXIT(cinfo, JERR_FILE_WRITE);
+  if (JFWRITE(dest->pub.output_file, bmpinfoheader, 40) != (size_t) 40)
+    ERREXIT(cinfo, JERR_FILE_WRITE);
+
+  if (cmap_entries > 0)
+    write_colormap(cinfo, dest, cmap_entries, 4);
+}
+
+
+LOCAL(void)
+write_os2_header (j_decompress_ptr cinfo, bmp_dest_ptr dest)
+/* Write an OS2-style BMP file header, including colormap if needed */
+{
+  char bmpfileheader[14];
+  char bmpcoreheader[12];
+  INT32 headersize, bfSize;
+  int bits_per_pixel, cmap_entries;
+
+  /* Compute colormap size and total file size */
+  if (cinfo->out_color_space == JCS_RGB) {
+    if (cinfo->quantize_colors) {
+      /* Colormapped RGB */
+      bits_per_pixel = 8;
+      cmap_entries = 256;
+    } else {
+      /* Unquantized, full color RGB */
+      bits_per_pixel = 24;
+      cmap_entries = 0;
+    }
+  } else {
+    /* Grayscale output.  We need to fake a 256-entry colormap. */
+    bits_per_pixel = 8;
+    cmap_entries = 256;
+  }
+  /* File size */
+  headersize = 14 + 12 + cmap_entries * 3; /* Header and colormap */
+  bfSize = headersize + (INT32) dest->row_width * (INT32) cinfo->output_height;
+
+  /* Set unused fields of header to 0 */
+  MEMZERO(bmpfileheader, SIZEOF(bmpfileheader));
+  MEMZERO(bmpcoreheader, SIZEOF(bmpcoreheader));
+
+  /* Fill the file header */
+  bmpfileheader[0] = 0x42;	/* first 2 bytes are ASCII 'B', 'M' */
+  bmpfileheader[1] = 0x4D;
+  PUT_4B(bmpfileheader, 2, bfSize); /* bfSize */
+  /* we leave bfReserved1 & bfReserved2 = 0 */
+  PUT_4B(bmpfileheader, 10, headersize); /* bfOffBits */
+
+  /* Fill the info header (Microsoft calls this a BITMAPCOREHEADER) */
+  PUT_2B(bmpcoreheader, 0, 12);	/* bcSize */
+  PUT_2B(bmpcoreheader, 4, cinfo->output_width); /* bcWidth */
+  PUT_2B(bmpcoreheader, 6, cinfo->output_height); /* bcHeight */
+  PUT_2B(bmpcoreheader, 8, 1);	/* bcPlanes - must be 1 */
+  PUT_2B(bmpcoreheader, 10, bits_per_pixel); /* bcBitCount */
+
+  if (JFWRITE(dest->pub.output_file, bmpfileheader, 14) != (size_t) 14)
+    ERREXIT(cinfo, JERR_FILE_WRITE);
+  if (JFWRITE(dest->pub.output_file, bmpcoreheader, 12) != (size_t) 12)
+    ERREXIT(cinfo, JERR_FILE_WRITE);
+
+  if (cmap_entries > 0)
+    write_colormap(cinfo, dest, cmap_entries, 3);
+}
+
+
+/*
+ * Write the colormap.
+ * Windows uses BGR0 map entries; OS/2 uses BGR entries.
+ */
+
+LOCAL(void)
+write_colormap (j_decompress_ptr cinfo, bmp_dest_ptr dest,
+		int map_colors, int map_entry_size)
+{
+  JSAMPARRAY colormap = cinfo->colormap;
+  int num_colors = cinfo->actual_number_of_colors;
+  FILE * outfile = dest->pub.output_file;
+  int i;
+
+  if (colormap != NULL) {
+    if (cinfo->out_color_components == 3) {
+      /* Normal case with RGB colormap */
+      for (i = 0; i < num_colors; i++) {
+	putc(GETJSAMPLE(colormap[2][i]), outfile);
+	putc(GETJSAMPLE(colormap[1][i]), outfile);
+	putc(GETJSAMPLE(colormap[0][i]), outfile);
+	if (map_entry_size == 4)
+	  putc(0, outfile);
+      }
+    } else {
+      /* Grayscale colormap (only happens with grayscale quantization) */
+      for (i = 0; i < num_colors; i++) {
+	putc(GETJSAMPLE(colormap[0][i]), outfile);
+	putc(GETJSAMPLE(colormap[0][i]), outfile);
+	putc(GETJSAMPLE(colormap[0][i]), outfile);
+	if (map_entry_size == 4)
+	  putc(0, outfile);
+      }
+    }
+  } else {
+    /* If no colormap, must be grayscale data.  Generate a linear "map". */
+    for (i = 0; i < 256; i++) {
+      putc(i, outfile);
+      putc(i, outfile);
+      putc(i, outfile);
+      if (map_entry_size == 4)
+	putc(0, outfile);
+    }
+  }
+  /* Pad colormap with zeros to ensure specified number of colormap entries */
+  if (i > map_colors)
+    ERREXIT1(cinfo, JERR_TOO_MANY_COLORS, i);
+  for (; i < map_colors; i++) {
+    putc(0, outfile);
+    putc(0, outfile);
+    putc(0, outfile);
+    if (map_entry_size == 4)
+      putc(0, outfile);
+  }
+}
+
+
+METHODDEF(void)
+finish_output_bmp (j_decompress_ptr cinfo, djpeg_dest_ptr dinfo)
+{
+  bmp_dest_ptr dest = (bmp_dest_ptr) dinfo;
+  register FILE * outfile = dest->pub.output_file;
+  JSAMPARRAY image_ptr;
+  register JSAMPROW data_ptr;
+  JDIMENSION row;
+  register JDIMENSION col;
+  cd_progress_ptr progress = (cd_progress_ptr) cinfo->progress;
+
+  /* Write the header and colormap */
+  if (dest->is_os2)
+    write_os2_header(cinfo, dest);
+  else
+    write_bmp_header(cinfo, dest);
+
+  /* Write the file body from our virtual array */
+  for (row = cinfo->output_height; row > 0; row--) {
+    if (progress != NULL) {
+      progress->pub.pass_counter = (long) (cinfo->output_height - row);
+      progress->pub.pass_limit = (long) cinfo->output_height;
+      (*progress->pub.progress_monitor) ((j_common_ptr) cinfo);
+    }
+    image_ptr = (*cinfo->mem->access_virt_sarray)
+      ((j_common_ptr) cinfo, dest->whole_image, row-1, (JDIMENSION) 1, FALSE);
+    data_ptr = image_ptr[0];
+    for (col = dest->row_width; col > 0; col--) {
+      putc(GETJSAMPLE(*data_ptr), outfile);
+      data_ptr++;
+    }
+  }
+  if (progress != NULL)
+    progress->completed_extra_passes++;
+
+  /* Make sure we wrote the output file OK */
+  fflush(outfile);
+  if (ferror(outfile))
+    ERREXIT(cinfo, JERR_FILE_WRITE);
+}
+
+
+/*
+ * The module selection routine for BMP format output.
+ */
+
+GLOBAL(djpeg_dest_ptr)
+jinit_write_bmp (j_decompress_ptr cinfo, boolean is_os2)
+{
+  bmp_dest_ptr dest;
+  JDIMENSION row_width;
+
+  /* Create module interface object, fill in method pointers */
+  dest = (bmp_dest_ptr)
+      (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+				  SIZEOF(bmp_dest_struct));
+  dest->pub.start_output = start_output_bmp;
+  dest->pub.finish_output = finish_output_bmp;
+  dest->is_os2 = is_os2;
+
+  if (cinfo->out_color_space == JCS_GRAYSCALE) {
+    dest->pub.put_pixel_rows = put_gray_rows;
+  } else if (cinfo->out_color_space == JCS_RGB) {
+    if (cinfo->quantize_colors)
+      dest->pub.put_pixel_rows = put_gray_rows;
+    else
+      dest->pub.put_pixel_rows = put_pixel_rows;
+  } else {
+    ERREXIT(cinfo, JERR_BMP_COLORSPACE);
+  }
+
+  /* Calculate output image dimensions so we can allocate space */
+  jpeg_calc_output_dimensions(cinfo);
+
+  /* Determine width of rows in the BMP file (padded to 4-byte boundary). */
+  row_width = cinfo->output_width * cinfo->output_components;
+  dest->data_width = row_width;
+  while ((row_width & 3) != 0) row_width++;
+  dest->row_width = row_width;
+  dest->pad_bytes = (int) (row_width - dest->data_width);
+
+  /* Allocate space for inversion array, prepare for write pass */
+  dest->whole_image = (*cinfo->mem->request_virt_sarray)
+    ((j_common_ptr) cinfo, JPOOL_IMAGE, FALSE,
+     row_width, cinfo->output_height, (JDIMENSION) 1);
+  dest->cur_output_row = 0;
+  if (cinfo->progress != NULL) {
+    cd_progress_ptr progress = (cd_progress_ptr) cinfo->progress;
+    progress->total_extra_passes++; /* count file input as separate pass */
+  }
+
+  /* Create decompressor output buffer. */
+  dest->pub.buffer = (*cinfo->mem->alloc_sarray)
+    ((j_common_ptr) cinfo, JPOOL_IMAGE, row_width, (JDIMENSION) 1);
+  dest->pub.buffer_height = 1;
+
+  return (djpeg_dest_ptr) dest;
+}
+
+#endif /* BMP_SUPPORTED */
diff --git a/uppsrc/plugin/jpg/lib/wrgif.c b/uppsrc/plugin/jpg/lib/wrgif.c
new file mode 100644
index 000000000..5fe832839
--- /dev/null
+++ b/uppsrc/plugin/jpg/lib/wrgif.c
@@ -0,0 +1,399 @@
+/*
+ * wrgif.c
+ *
+ * Copyright (C) 1991-1997, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains routines to write output images in GIF format.
+ *
+ **************************************************************************
+ * NOTE: to avoid entanglements with Unisys' patent on LZW compression,   *
+ * this code has been modified to output "uncompressed GIF" files.        *
+ * There is no trace of the LZW algorithm in this file.                   *
+ **************************************************************************
+ *
+ * These routines may need modification for non-Unix environments or
+ * specialized applications.  As they stand, they assume output to
+ * an ordinary stdio stream.
+ */
+
+/*
+ * This code is loosely based on ppmtogif from the PBMPLUS distribution
+ * of Feb. 1991.  That file contains the following copyright notice:
+ *    Based on GIFENCODE by David Rowley <mgardi@watdscu.waterloo.edu>.
+ *    Lempel-Ziv compression based on "compress" by Spencer W. Thomas et al.
+ *    Copyright (C) 1989 by Jef Poskanzer.
+ *    Permission to use, copy, modify, and distribute this software and its
+ *    documentation for any purpose and without fee is hereby granted, provided
+ *    that the above copyright notice appear in all copies and that both that
+ *    copyright notice and this permission notice appear in supporting
+ *    documentation.  This software is provided "as is" without express or
+ *    implied warranty.
+ *
+ * We are also required to state that
+ *    "The Graphics Interchange Format(c) is the Copyright property of
+ *    CompuServe Incorporated. GIF(sm) is a Service Mark property of
+ *    CompuServe Incorporated."
+ */
+
+#include "cdjpeg.h"		/* Common decls for cjpeg/djpeg applications */
+
+#ifdef GIF_SUPPORTED
+
+
+/* Private version of data destination object */
+
+typedef struct {
+  struct djpeg_dest_struct pub;	/* public fields */
+
+  j_decompress_ptr cinfo;	/* back link saves passing separate parm */
+
+  /* State for packing variable-width codes into a bitstream */
+  int n_bits;			/* current number of bits/code */
+  int maxcode;			/* maximum code, given n_bits */
+  INT32 cur_accum;		/* holds bits not yet output */
+  int cur_bits;			/* # of bits in cur_accum */
+
+  /* State for GIF code assignment */
+  int ClearCode;		/* clear code (doesn't change) */
+  int EOFCode;			/* EOF code (ditto) */
+  int code_counter;		/* counts output symbols */
+
+  /* GIF data packet construction buffer */
+  int bytesinpkt;		/* # of bytes in current packet */
+  char packetbuf[256];		/* workspace for accumulating packet */
+
+} gif_dest_struct;
+
+typedef gif_dest_struct * gif_dest_ptr;
+
+/* Largest value that will fit in N bits */
+#define MAXCODE(n_bits)	((1 << (n_bits)) - 1)
+
+
+/*
+ * Routines to package finished data bytes into GIF data blocks.
+ * A data block consists of a count byte (1..255) and that many data bytes.
+ */
+
+LOCAL(void)
+flush_packet (gif_dest_ptr dinfo)
+/* flush any accumulated data */
+{
+  if (dinfo->bytesinpkt > 0) {	/* never write zero-length packet */
+    dinfo->packetbuf[0] = (char) dinfo->bytesinpkt++;
+    if (JFWRITE(dinfo->pub.output_file, dinfo->packetbuf, dinfo->bytesinpkt)
+	!= (size_t) dinfo->bytesinpkt)
+      ERREXIT(dinfo->cinfo, JERR_FILE_WRITE);
+    dinfo->bytesinpkt = 0;
+  }
+}
+
+
+/* Add a character to current packet; flush to disk if necessary */
+#define CHAR_OUT(dinfo,c)  \
+	{ (dinfo)->packetbuf[++(dinfo)->bytesinpkt] = (char) (c);  \
+	    if ((dinfo)->bytesinpkt >= 255)  \
+	      flush_packet(dinfo);  \
+	}
+
+
+/* Routine to convert variable-width codes into a byte stream */
+
+LOCAL(void)
+output (gif_dest_ptr dinfo, int code)
+/* Emit a code of n_bits bits */
+/* Uses cur_accum and cur_bits to reblock into 8-bit bytes */
+{
+  dinfo->cur_accum |= ((INT32) code) << dinfo->cur_bits;
+  dinfo->cur_bits += dinfo->n_bits;
+
+  while (dinfo->cur_bits >= 8) {
+    CHAR_OUT(dinfo, dinfo->cur_accum & 0xFF);
+    dinfo->cur_accum >>= 8;
+    dinfo->cur_bits -= 8;
+  }
+}
+
+
+/* The pseudo-compression algorithm.
+ *
+ * In this module we simply output each pixel value as a separate symbol;
+ * thus, no compression occurs.  In fact, there is expansion of one bit per
+ * pixel, because we use a symbol width one bit wider than the pixel width.
+ *
+ * GIF ordinarily uses variable-width symbols, and the decoder will expect
+ * to ratchet up the symbol width after a fixed number of symbols.
+ * To simplify the logic and keep the expansion penalty down, we emit a
+ * GIF Clear code to reset the decoder just before the width would ratchet up.
+ * Thus, all the symbols in the output file will have the same bit width.
+ * Note that emitting the Clear codes at the right times is a mere matter of
+ * counting output symbols and is in no way dependent on the LZW patent.
+ *
+ * With a small basic pixel width (low color count), Clear codes will be
+ * needed very frequently, causing the file to expand even more.  So this
+ * simplistic approach wouldn't work too well on bilevel images, for example.
+ * But for output of JPEG conversions the pixel width will usually be 8 bits
+ * (129 to 256 colors), so the overhead added by Clear symbols is only about
+ * one symbol in every 256.
+ */
+
+LOCAL(void)
+compress_init (gif_dest_ptr dinfo, int i_bits)
+/* Initialize pseudo-compressor */
+{
+  /* init all the state variables */
+  dinfo->n_bits = i_bits;
+  dinfo->maxcode = MAXCODE(dinfo->n_bits);
+  dinfo->ClearCode = (1 << (i_bits - 1));
+  dinfo->EOFCode = dinfo->ClearCode + 1;
+  dinfo->code_counter = dinfo->ClearCode + 2;
+  /* init output buffering vars */
+  dinfo->bytesinpkt = 0;
+  dinfo->cur_accum = 0;
+  dinfo->cur_bits = 0;
+  /* GIF specifies an initial Clear code */
+  output(dinfo, dinfo->ClearCode);
+}
+
+
+LOCAL(void)
+compress_pixel (gif_dest_ptr dinfo, int c)
+/* Accept and "compress" one pixel value.
+ * The given value must be less than n_bits wide.
+ */
+{
+  /* Output the given pixel value as a symbol. */
+  output(dinfo, c);
+  /* Issue Clear codes often enough to keep the reader from ratcheting up
+   * its symbol size.
+   */
+  if (dinfo->code_counter < dinfo->maxcode) {
+    dinfo->code_counter++;
+  } else {
+    output(dinfo, dinfo->ClearCode);
+    dinfo->code_counter = dinfo->ClearCode + 2;	/* reset the counter */
+  }
+}
+
+
+LOCAL(void)
+compress_term (gif_dest_ptr dinfo)
+/* Clean up at end */
+{
+  /* Send an EOF code */
+  output(dinfo, dinfo->EOFCode);
+  /* Flush the bit-packing buffer */
+  if (dinfo->cur_bits > 0) {
+    CHAR_OUT(dinfo, dinfo->cur_accum & 0xFF);
+  }
+  /* Flush the packet buffer */
+  flush_packet(dinfo);
+}
+
+
+/* GIF header construction */
+
+
+LOCAL(void)
+put_word (gif_dest_ptr dinfo, unsigned int w)
+/* Emit a 16-bit word, LSB first */
+{
+  putc(w & 0xFF, dinfo->pub.output_file);
+  putc((w >> 8) & 0xFF, dinfo->pub.output_file);
+}
+
+
+LOCAL(void)
+put_3bytes (gif_dest_ptr dinfo, int val)
+/* Emit 3 copies of same byte value --- handy subr for colormap construction */
+{
+  putc(val, dinfo->pub.output_file);
+  putc(val, dinfo->pub.output_file);
+  putc(val, dinfo->pub.output_file);
+}
+
+
+LOCAL(void)
+emit_header (gif_dest_ptr dinfo, int num_colors, JSAMPARRAY colormap)
+/* Output the GIF file header, including color map */
+/* If colormap==NULL, synthesize a gray-scale colormap */
+{
+  int BitsPerPixel, ColorMapSize, InitCodeSize, FlagByte;
+  int cshift = dinfo->cinfo->data_precision - 8;
+  int i;
+
+  if (num_colors > 256)
+    ERREXIT1(dinfo->cinfo, JERR_TOO_MANY_COLORS, num_colors);
+  /* Compute bits/pixel and related values */
+  BitsPerPixel = 1;
+  while (num_colors > (1 << BitsPerPixel))
+    BitsPerPixel++;
+  ColorMapSize = 1 << BitsPerPixel;
+  if (BitsPerPixel <= 1)
+    InitCodeSize = 2;
+  else
+    InitCodeSize = BitsPerPixel;
+  /*
+   * Write the GIF header.
+   * Note that we generate a plain GIF87 header for maximum compatibility.
+   */
+  putc('G', dinfo->pub.output_file);
+  putc('I', dinfo->pub.output_file);
+  putc('F', dinfo->pub.output_file);
+  putc('8', dinfo->pub.output_file);
+  putc('7', dinfo->pub.output_file);
+  putc('a', dinfo->pub.output_file);
+  /* Write the Logical Screen Descriptor */
+  put_word(dinfo, (unsigned int) dinfo->cinfo->output_width);
+  put_word(dinfo, (unsigned int) dinfo->cinfo->output_height);
+  FlagByte = 0x80;		/* Yes, there is a global color table */
+  FlagByte |= (BitsPerPixel-1) << 4; /* color resolution */
+  FlagByte |= (BitsPerPixel-1);	/* size of global color table */
+  putc(FlagByte, dinfo->pub.output_file);
+  putc(0, dinfo->pub.output_file); /* Background color index */
+  putc(0, dinfo->pub.output_file); /* Reserved (aspect ratio in GIF89) */
+  /* Write the Global Color Map */
+  /* If the color map is more than 8 bits precision, */
+  /* we reduce it to 8 bits by shifting */
+  for (i=0; i < ColorMapSize; i++) {
+    if (i < num_colors) {
+      if (colormap != NULL) {
+	if (dinfo->cinfo->out_color_space == JCS_RGB) {
+	  /* Normal case: RGB color map */
+	  putc(GETJSAMPLE(colormap[0][i]) >> cshift, dinfo->pub.output_file);
+	  putc(GETJSAMPLE(colormap[1][i]) >> cshift, dinfo->pub.output_file);
+	  putc(GETJSAMPLE(colormap[2][i]) >> cshift, dinfo->pub.output_file);
+	} else {
+	  /* Grayscale "color map": possible if quantizing grayscale image */
+	  put_3bytes(dinfo, GETJSAMPLE(colormap[0][i]) >> cshift);
+	}
+      } else {
+	/* Create a gray-scale map of num_colors values, range 0..255 */
+	put_3bytes(dinfo, (i * 255 + (num_colors-1)/2) / (num_colors-1));
+      }
+    } else {
+      /* fill out the map to a power of 2 */
+      put_3bytes(dinfo, 0);
+    }
+  }
+  /* Write image separator and Image Descriptor */
+  putc(',', dinfo->pub.output_file); /* separator */
+  put_word(dinfo, 0);		/* left/top offset */
+  put_word(dinfo, 0);
+  put_word(dinfo, (unsigned int) dinfo->cinfo->output_width); /* image size */
+  put_word(dinfo, (unsigned int) dinfo->cinfo->output_height);
+  /* flag byte: not interlaced, no local color map */
+  putc(0x00, dinfo->pub.output_file);
+  /* Write Initial Code Size byte */
+  putc(InitCodeSize, dinfo->pub.output_file);
+
+  /* Initialize for "compression" of image data */
+  compress_init(dinfo, InitCodeSize+1);
+}
+
+
+/*
+ * Startup: write the file header.
+ */
+
+METHODDEF(void)
+start_output_gif (j_decompress_ptr cinfo, djpeg_dest_ptr dinfo)
+{
+  gif_dest_ptr dest = (gif_dest_ptr) dinfo;
+
+  if (cinfo->quantize_colors)
+    emit_header(dest, cinfo->actual_number_of_colors, cinfo->colormap);
+  else
+    emit_header(dest, 256, (JSAMPARRAY) NULL);
+}
+
+
+/*
+ * Write some pixel data.
+ * In this module rows_supplied will always be 1.
+ */
+
+METHODDEF(void)
+put_pixel_rows (j_decompress_ptr cinfo, djpeg_dest_ptr dinfo,
+		JDIMENSION rows_supplied)
+{
+  gif_dest_ptr dest = (gif_dest_ptr) dinfo;
+  register JSAMPROW ptr;
+  register JDIMENSION col;
+
+  ptr = dest->pub.buffer[0];
+  for (col = cinfo->output_width; col > 0; col--) {
+    compress_pixel(dest, GETJSAMPLE(*ptr++));
+  }
+}
+
+
+/*
+ * Finish up at the end of the file.
+ */
+
+METHODDEF(void)
+finish_output_gif (j_decompress_ptr cinfo, djpeg_dest_ptr dinfo)
+{
+  gif_dest_ptr dest = (gif_dest_ptr) dinfo;
+
+  /* Flush "compression" mechanism */
+  compress_term(dest);
+  /* Write a zero-length data block to end the series */
+  putc(0, dest->pub.output_file);
+  /* Write the GIF terminator mark */
+  putc(';', dest->pub.output_file);
+  /* Make sure we wrote the output file OK */
+  fflush(dest->pub.output_file);
+  if (ferror(dest->pub.output_file))
+    ERREXIT(cinfo, JERR_FILE_WRITE);
+}
+
+
+/*
+ * The module selection routine for GIF format output.
+ */
+
+GLOBAL(djpeg_dest_ptr)
+jinit_write_gif (j_decompress_ptr cinfo)
+{
+  gif_dest_ptr dest;
+
+  /* Create module interface object, fill in method pointers */
+  dest = (gif_dest_ptr)
+      (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+				  SIZEOF(gif_dest_struct));
+  dest->cinfo = cinfo;		/* make back link for subroutines */
+  dest->pub.start_output = start_output_gif;
+  dest->pub.put_pixel_rows = put_pixel_rows;
+  dest->pub.finish_output = finish_output_gif;
+
+  if (cinfo->out_color_space != JCS_GRAYSCALE &&
+      cinfo->out_color_space != JCS_RGB)
+    ERREXIT(cinfo, JERR_GIF_COLORSPACE);
+
+  /* Force quantization if color or if > 8 bits input */
+  if (cinfo->out_color_space != JCS_GRAYSCALE || cinfo->data_precision > 8) {
+    /* Force quantization to at most 256 colors */
+    cinfo->quantize_colors = TRUE;
+    if (cinfo->desired_number_of_colors > 256)
+      cinfo->desired_number_of_colors = 256;
+  }
+
+  /* Calculate output image dimensions so we can allocate space */
+  jpeg_calc_output_dimensions(cinfo);
+
+  if (cinfo->output_components != 1) /* safety check: just one component? */
+    ERREXIT(cinfo, JERR_GIF_BUG);
+
+  /* Create decompressor output buffer. */
+  dest->pub.buffer = (*cinfo->mem->alloc_sarray)
+    ((j_common_ptr) cinfo, JPOOL_IMAGE, cinfo->output_width, (JDIMENSION) 1);
+  dest->pub.buffer_height = 1;
+
+  return (djpeg_dest_ptr) dest;
+}
+
+#endif /* GIF_SUPPORTED */
diff --git a/uppsrc/plugin/jpg/lib/wrjpgcom.c b/uppsrc/plugin/jpg/lib/wrjpgcom.c
new file mode 100644
index 000000000..8c04b0551
--- /dev/null
+++ b/uppsrc/plugin/jpg/lib/wrjpgcom.c
@@ -0,0 +1,583 @@
+/*
+ * wrjpgcom.c
+ *
+ * Copyright (C) 1994-1997, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains a very simple stand-alone application that inserts
+ * user-supplied text as a COM (comment) marker in a JFIF file.
+ * This may be useful as an example of the minimum logic needed to parse
+ * JPEG markers.
+ */
+
+#define JPEG_CJPEG_DJPEG	/* to get the command-line config symbols */
+#include "jinclude.h"		/* get auto-config symbols, <stdio.h> */
+
+#ifndef HAVE_STDLIB_H		/* <stdlib.h> should declare malloc() */
+extern void * malloc ();
+#endif
+#include <ctype.h>		/* to declare isupper(), tolower() */
+#ifdef USE_SETMODE
+#include <fcntl.h>		/* to declare setmode()'s parameter macros */
+/* If you have setmode() but not <io.h>, just delete this line: */
+#include <io.h>			/* to declare setmode() */
+#endif
+
+#ifdef USE_CCOMMAND		/* command-line reader for Macintosh */
+#ifdef __MWERKS__
+#include <SIOUX.h>              /* Metrowerks needs this */
+#include <console.h>		/* ... and this */
+#endif
+#ifdef THINK_C
+#include <console.h>		/* Think declares it here */
+#endif
+#endif
+
+#ifdef DONT_USE_B_MODE		/* define mode parameters for fopen() */
+#define READ_BINARY	"r"
+#define WRITE_BINARY	"w"
+#else
+#ifdef VMS			/* VMS is very nonstandard */
+#define READ_BINARY	"rb", "ctx=stm"
+#define WRITE_BINARY	"wb", "ctx=stm"
+#else				/* standard ANSI-compliant case */
+#define READ_BINARY	"rb"
+#define WRITE_BINARY	"wb"
+#endif
+#endif
+
+#ifndef EXIT_FAILURE		/* define exit() codes if not provided */
+#define EXIT_FAILURE  1
+#endif
+#ifndef EXIT_SUCCESS
+#ifdef VMS
+#define EXIT_SUCCESS  1		/* VMS is very nonstandard */
+#else
+#define EXIT_SUCCESS  0
+#endif
+#endif
+
+/* Reduce this value if your malloc() can't allocate blocks up to 64K.
+ * On DOS, compiling in large model is usually a better solution.
+ */
+
+#ifndef MAX_COM_LENGTH
+#define MAX_COM_LENGTH 65000L	/* must be <= 65533 in any case */
+#endif
+
+
+/*
+ * These macros are used to read the input file and write the output file.
+ * To reuse this code in another application, you might need to change these.
+ */
+
+static FILE * infile;		/* input JPEG file */
+
+/* Return next input byte, or EOF if no more */
+#define NEXTBYTE()  getc(infile)
+
+static FILE * outfile;		/* output JPEG file */
+
+/* Emit an output byte */
+#define PUTBYTE(x)  putc((x), outfile)
+
+
+/* Error exit handler */
+#define ERREXIT(msg)  (fprintf(stderr, "%s\n", msg), exit(EXIT_FAILURE))
+
+
+/* Read one byte, testing for EOF */
+static int
+read_1_byte (void)
+{
+  int c;
+
+  c = NEXTBYTE();
+  if (c == EOF)
+    ERREXIT("Premature EOF in JPEG file");
+  return c;
+}
+
+/* Read 2 bytes, convert to unsigned int */
+/* All 2-byte quantities in JPEG markers are MSB first */
+static unsigned int
+read_2_bytes (void)
+{
+  int c1, c2;
+
+  c1 = NEXTBYTE();
+  if (c1 == EOF)
+    ERREXIT("Premature EOF in JPEG file");
+  c2 = NEXTBYTE();
+  if (c2 == EOF)
+    ERREXIT("Premature EOF in JPEG file");
+  return (((unsigned int) c1) << 8) + ((unsigned int) c2);
+}
+
+
+/* Routines to write data to output file */
+
+static void
+write_1_byte (int c)
+{
+  PUTBYTE(c);
+}
+
+static void
+write_2_bytes (unsigned int val)
+{
+  PUTBYTE((val >> 8) & 0xFF);
+  PUTBYTE(val & 0xFF);
+}
+
+static void
+write_marker (int marker)
+{
+  PUTBYTE(0xFF);
+  PUTBYTE(marker);
+}
+
+static void
+copy_rest_of_file (void)
+{
+  int c;
+
+  while ((c = NEXTBYTE()) != EOF)
+    PUTBYTE(c);
+}
+
+
+/*
+ * JPEG markers consist of one or more 0xFF bytes, followed by a marker
+ * code byte (which is not an FF).  Here are the marker codes of interest
+ * in this program.  (See jdmarker.c for a more complete list.)
+ */
+
+#define M_SOF0  0xC0		/* Start Of Frame N */
+#define M_SOF1  0xC1		/* N indicates which compression process */
+#define M_SOF2  0xC2		/* Only SOF0-SOF2 are now in common use */
+#define M_SOF3  0xC3
+#define M_SOF5  0xC5		/* NB: codes C4 and CC are NOT SOF markers */
+#define M_SOF6  0xC6
+#define M_SOF7  0xC7
+#define M_SOF9  0xC9
+#define M_SOF10 0xCA
+#define M_SOF11 0xCB
+#define M_SOF13 0xCD
+#define M_SOF14 0xCE
+#define M_SOF15 0xCF
+#define M_SOI   0xD8		/* Start Of Image (beginning of datastream) */
+#define M_EOI   0xD9		/* End Of Image (end of datastream) */
+#define M_SOS   0xDA		/* Start Of Scan (begins compressed data) */
+#define M_COM   0xFE		/* COMment */
+
+
+/*
+ * Find the next JPEG marker and return its marker code.
+ * We expect at least one FF byte, possibly more if the compressor used FFs
+ * to pad the file.  (Padding FFs will NOT be replicated in the output file.)
+ * There could also be non-FF garbage between markers.  The treatment of such
+ * garbage is unspecified; we choose to skip over it but emit a warning msg.
+ * NB: this routine must not be used after seeing SOS marker, since it will
+ * not deal correctly with FF/00 sequences in the compressed image data...
+ */
+
+static int
+next_marker (void)
+{
+  int c;
+  int discarded_bytes = 0;
+
+  /* Find 0xFF byte; count and skip any non-FFs. */
+  c = read_1_byte();
+  while (c != 0xFF) {
+    discarded_bytes++;
+    c = read_1_byte();
+  }
+  /* Get marker code byte, swallowing any duplicate FF bytes.  Extra FFs
+   * are legal as pad bytes, so don't count them in discarded_bytes.
+   */
+  do {
+    c = read_1_byte();
+  } while (c == 0xFF);
+
+  if (discarded_bytes != 0) {
+    fprintf(stderr, "Warning: garbage data found in JPEG file\n");
+  }
+
+  return c;
+}
+
+
+/*
+ * Read the initial marker, which should be SOI.
+ * For a JFIF file, the first two bytes of the file should be literally
+ * 0xFF M_SOI.  To be more general, we could use next_marker, but if the
+ * input file weren't actually JPEG at all, next_marker might read the whole
+ * file and then return a misleading error message...
+ */
+
+static int
+first_marker (void)
+{
+  int c1, c2;
+
+  c1 = NEXTBYTE();
+  c2 = NEXTBYTE();
+  if (c1 != 0xFF || c2 != M_SOI)
+    ERREXIT("Not a JPEG file");
+  return c2;
+}
+
+
+/*
+ * Most types of marker are followed by a variable-length parameter segment.
+ * This routine skips over the parameters for any marker we don't otherwise
+ * want to process.
+ * Note that we MUST skip the parameter segment explicitly in order not to
+ * be fooled by 0xFF bytes that might appear within the parameter segment;
+ * such bytes do NOT introduce new markers.
+ */
+
+static void
+copy_variable (void)
+/* Copy an unknown or uninteresting variable-length marker */
+{
+  unsigned int length;
+
+  /* Get the marker parameter length count */
+  length = read_2_bytes();
+  write_2_bytes(length);
+  /* Length includes itself, so must be at least 2 */
+  if (length < 2)
+    ERREXIT("Erroneous JPEG marker length");
+  length -= 2;
+  /* Skip over the remaining bytes */
+  while (length > 0) {
+    write_1_byte(read_1_byte());
+    length--;
+  }
+}
+
+static void
+skip_variable (void)
+/* Skip over an unknown or uninteresting variable-length marker */
+{
+  unsigned int length;
+
+  /* Get the marker parameter length count */
+  length = read_2_bytes();
+  /* Length includes itself, so must be at least 2 */
+  if (length < 2)
+    ERREXIT("Erroneous JPEG marker length");
+  length -= 2;
+  /* Skip over the remaining bytes */
+  while (length > 0) {
+    (void) read_1_byte();
+    length--;
+  }
+}
+
+
+/*
+ * Parse the marker stream until SOFn or EOI is seen;
+ * copy data to output, but discard COM markers unless keep_COM is true.
+ */
+
+static int
+scan_JPEG_header (int keep_COM)
+{
+  int marker;
+
+  /* Expect SOI at start of file */
+  if (first_marker() != M_SOI)
+    ERREXIT("Expected SOI marker first");
+  write_marker(M_SOI);
+
+  /* Scan miscellaneous markers until we reach SOFn. */
+  for (;;) {
+    marker = next_marker();
+    switch (marker) {
+      /* Note that marker codes 0xC4, 0xC8, 0xCC are not, and must not be,
+       * treated as SOFn.  C4 in particular is actually DHT.
+       */
+    case M_SOF0:		/* Baseline */
+    case M_SOF1:		/* Extended sequential, Huffman */
+    case M_SOF2:		/* Progressive, Huffman */
+    case M_SOF3:		/* Lossless, Huffman */
+    case M_SOF5:		/* Differential sequential, Huffman */
+    case M_SOF6:		/* Differential progressive, Huffman */
+    case M_SOF7:		/* Differential lossless, Huffman */
+    case M_SOF9:		/* Extended sequential, arithmetic */
+    case M_SOF10:		/* Progressive, arithmetic */
+    case M_SOF11:		/* Lossless, arithmetic */
+    case M_SOF13:		/* Differential sequential, arithmetic */
+    case M_SOF14:		/* Differential progressive, arithmetic */
+    case M_SOF15:		/* Differential lossless, arithmetic */
+      return marker;
+
+    case M_SOS:			/* should not see compressed data before SOF */
+      ERREXIT("SOS without prior SOFn");
+      break;
+
+    case M_EOI:			/* in case it's a tables-only JPEG stream */
+      return marker;
+
+    case M_COM:			/* Existing COM: conditionally discard */
+      if (keep_COM) {
+	write_marker(marker);
+	copy_variable();
+      } else {
+	skip_variable();
+      }
+      break;
+
+    default:			/* Anything else just gets copied */
+      write_marker(marker);
+      copy_variable();		/* we assume it has a parameter count... */
+      break;
+    }
+  } /* end loop */
+}
+
+
+/* Command line parsing code */
+
+static const char * progname;	/* program name for error messages */
+
+
+static void
+usage (void)
+/* complain about bad command line */
+{
+  fprintf(stderr, "wrjpgcom inserts a textual comment in a JPEG file.\n");
+  fprintf(stderr, "You can add to or replace any existing comment(s).\n");
+
+  fprintf(stderr, "Usage: %s [switches] ", progname);
+#ifdef TWO_FILE_COMMANDLINE
+  fprintf(stderr, "inputfile outputfile\n");
+#else
+  fprintf(stderr, "[inputfile]\n");
+#endif
+
+  fprintf(stderr, "Switches (names may be abbreviated):\n");
+  fprintf(stderr, "  -replace         Delete any existing comments\n");
+  fprintf(stderr, "  -comment \"text\"  Insert comment with given text\n");
+  fprintf(stderr, "  -cfile name      Read comment from named file\n");
+  fprintf(stderr, "Notice that you must put quotes around the comment text\n");
+  fprintf(stderr, "when you use -comment.\n");
+  fprintf(stderr, "If you do not give either -comment or -cfile on the command line,\n");
+  fprintf(stderr, "then the comment text is read from standard input.\n");
+  fprintf(stderr, "It can be multiple lines, up to %u characters total.\n",
+	  (unsigned int) MAX_COM_LENGTH);
+#ifndef TWO_FILE_COMMANDLINE
+  fprintf(stderr, "You must specify an input JPEG file name when supplying\n");
+  fprintf(stderr, "comment text from standard input.\n");
+#endif
+
+  exit(EXIT_FAILURE);
+}
+
+
+static int
+keymatch (char * arg, const char * keyword, int minchars)
+/* Case-insensitive matching of (possibly abbreviated) keyword switches. */
+/* keyword is the constant keyword (must be lower case already), */
+/* minchars is length of minimum legal abbreviation. */
+{
+  register int ca, ck;
+  register int nmatched = 0;
+
+  while ((ca = *arg++) != '\0') {
+    if ((ck = *keyword++) == '\0')
+      return 0;			/* arg longer than keyword, no good */
+    if (isupper(ca))		/* force arg to lcase (assume ck is already) */
+      ca = tolower(ca);
+    if (ca != ck)
+      return 0;			/* no good */
+    nmatched++;			/* count matched characters */
+  }
+  /* reached end of argument; fail if it's too short for unique abbrev */
+  if (nmatched < minchars)
+    return 0;
+  return 1;			/* A-OK */
+}
+
+
+/*
+ * The main program.
+ */
+
+int
+main (int argc, char **argv)
+{
+  int argn;
+  char * arg;
+  int keep_COM = 1;
+  char * comment_arg = NULL;
+  FILE * comment_file = NULL;
+  unsigned int comment_length = 0;
+  int marker;
+
+  /* On Mac, fetch a command line. */
+#ifdef USE_CCOMMAND
+  argc = ccommand(&argv);
+#endif
+
+  progname = argv[0];
+  if (progname == NULL || progname[0] == 0)
+    progname = "wrjpgcom";	/* in case C library doesn't provide it */
+
+  /* Parse switches, if any */
+  for (argn = 1; argn < argc; argn++) {
+    arg = argv[argn];
+    if (arg[0] != '-')
+      break;			/* not switch, must be file name */
+    arg++;			/* advance over '-' */
+    if (keymatch(arg, "replace", 1)) {
+      keep_COM = 0;
+    } else if (keymatch(arg, "cfile", 2)) {
+      if (++argn >= argc) usage();
+      if ((comment_file = fopen(argv[argn], "r")) == NULL) {
+	fprintf(stderr, "%s: can't open %s\n", progname, argv[argn]);
+	exit(EXIT_FAILURE);
+      }
+    } else if (keymatch(arg, "comment", 1)) {
+      if (++argn >= argc) usage();
+      comment_arg = argv[argn];
+      /* If the comment text starts with '"', then we are probably running
+       * under MS-DOG and must parse out the quoted string ourselves.  Sigh.
+       */
+      if (comment_arg[0] == '"') {
+	comment_arg = (char *) malloc((size_t) MAX_COM_LENGTH);
+	if (comment_arg == NULL)
+	  ERREXIT("Insufficient memory");
+	strcpy(comment_arg, argv[argn]+1);
+	for (;;) {
+	  comment_length = (unsigned int) strlen(comment_arg);
+	  if (comment_length > 0 && comment_arg[comment_length-1] == '"') {
+	    comment_arg[comment_length-1] = '\0'; /* zap terminating quote */
+	    break;
+	  }
+	  if (++argn >= argc)
+	    ERREXIT("Missing ending quote mark");
+	  strcat(comment_arg, " ");
+	  strcat(comment_arg, argv[argn]);
+	}
+      }
+      comment_length = (unsigned int) strlen(comment_arg);
+    } else
+      usage();
+  }
+
+  /* Cannot use both -comment and -cfile. */
+  if (comment_arg != NULL && comment_file != NULL)
+    usage();
+  /* If there is neither -comment nor -cfile, we will read the comment text
+   * from stdin; in this case there MUST be an input JPEG file name.
+   */
+  if (comment_arg == NULL && comment_file == NULL && argn >= argc)
+    usage();
+
+  /* Open the input file. */
+  if (argn < argc) {
+    if ((infile = fopen(argv[argn], READ_BINARY)) == NULL) {
+      fprintf(stderr, "%s: can't open %s\n", progname, argv[argn]);
+      exit(EXIT_FAILURE);
+    }
+  } else {
+    /* default input file is stdin */
+#ifdef USE_SETMODE		/* need to hack file mode? */
+    setmode(fileno(stdin), O_BINARY);
+#endif
+#ifdef USE_FDOPEN		/* need to re-open in binary mode? */
+    if ((infile = fdopen(fileno(stdin), READ_BINARY)) == NULL) {
+      fprintf(stderr, "%s: can't open stdin\n", progname);
+      exit(EXIT_FAILURE);
+    }
+#else
+    infile = stdin;
+#endif
+  }
+
+  /* Open the output file. */
+#ifdef TWO_FILE_COMMANDLINE
+  /* Must have explicit output file name */
+  if (argn != argc-2) {
+    fprintf(stderr, "%s: must name one input and one output file\n",
+	    progname);
+    usage();
+  }
+  if ((outfile = fopen(argv[argn+1], WRITE_BINARY)) == NULL) {
+    fprintf(stderr, "%s: can't open %s\n", progname, argv[argn+1]);
+    exit(EXIT_FAILURE);
+  }
+#else
+  /* Unix style: expect zero or one file name */
+  if (argn < argc-1) {
+    fprintf(stderr, "%s: only one input file\n", progname);
+    usage();
+  }
+  /* default output file is stdout */
+#ifdef USE_SETMODE		/* need to hack file mode? */
+  setmode(fileno(stdout), O_BINARY);
+#endif
+#ifdef USE_FDOPEN		/* need to re-open in binary mode? */
+  if ((outfile = fdopen(fileno(stdout), WRITE_BINARY)) == NULL) {
+    fprintf(stderr, "%s: can't open stdout\n", progname);
+    exit(EXIT_FAILURE);
+  }
+#else
+  outfile = stdout;
+#endif
+#endif /* TWO_FILE_COMMANDLINE */
+
+  /* Collect comment text from comment_file or stdin, if necessary */
+  if (comment_arg == NULL) {
+    FILE * src_file;
+    int c;
+
+    comment_arg = (char *) malloc((size_t) MAX_COM_LENGTH);
+    if (comment_arg == NULL)
+      ERREXIT("Insufficient memory");
+    comment_length = 0;
+    src_file = (comment_file != NULL ? comment_file : stdin);
+    while ((c = getc(src_file)) != EOF) {
+      if (comment_length >= (unsigned int) MAX_COM_LENGTH) {
+	fprintf(stderr, "Comment text may not exceed %u bytes\n",
+		(unsigned int) MAX_COM_LENGTH);
+	exit(EXIT_FAILURE);
+      }
+      comment_arg[comment_length++] = (char) c;
+    }
+    if (comment_file != NULL)
+      fclose(comment_file);
+  }
+
+  /* Copy JPEG headers until SOFn marker;
+   * we will insert the new comment marker just before SOFn.
+   * This (a) causes the new comment to appear after, rather than before,
+   * existing comments; and (b) ensures that comments come after any JFIF
+   * or JFXX markers, as required by the JFIF specification.
+   */
+  marker = scan_JPEG_header(keep_COM);
+  /* Insert the new COM marker, but only if nonempty text has been supplied */
+  if (comment_length > 0) {
+    write_marker(M_COM);
+    write_2_bytes(comment_length + 2);
+    while (comment_length > 0) {
+      write_1_byte(*comment_arg++);
+      comment_length--;
+    }
+  }
+  /* Duplicate the remainder of the source file.
+   * Note that any COM markers occuring after SOF will not be touched.
+   */
+  write_marker(marker);
+  copy_rest_of_file();
+
+  /* All done. */
+  exit(EXIT_SUCCESS);
+  return 0;			/* suppress no-return-value warnings */
+}
diff --git a/uppsrc/plugin/jpg/lib/wrppm.c b/uppsrc/plugin/jpg/lib/wrppm.c
new file mode 100644
index 000000000..6c6d90881
--- /dev/null
+++ b/uppsrc/plugin/jpg/lib/wrppm.c
@@ -0,0 +1,268 @@
+/*
+ * wrppm.c
+ *
+ * Copyright (C) 1991-1996, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains routines to write output images in PPM/PGM format.
+ * The extended 2-byte-per-sample raw PPM/PGM formats are supported.
+ * The PBMPLUS library is NOT required to compile this software
+ * (but it is highly useful as a set of PPM image manipulation programs).
+ *
+ * These routines may need modification for non-Unix environments or
+ * specialized applications.  As they stand, they assume output to
+ * an ordinary stdio stream.
+ */
+
+#include "cdjpeg.h"		/* Common decls for cjpeg/djpeg applications */
+
+#ifdef PPM_SUPPORTED
+
+
+/*
+ * For 12-bit JPEG data, we either downscale the values to 8 bits
+ * (to write standard byte-per-sample PPM/PGM files), or output
+ * nonstandard word-per-sample PPM/PGM files.  Downscaling is done
+ * if PPM_NORAWWORD is defined (this can be done in the Makefile
+ * or in jconfig.h).
+ * (When the core library supports data precision reduction, a cleaner
+ * implementation will be to ask for that instead.)
+ */
+
+#if BITS_IN_JSAMPLE == 8
+#define PUTPPMSAMPLE(ptr,v)  *ptr++ = (char) (v)
+#define BYTESPERSAMPLE 1
+#define PPM_MAXVAL 255
+#else
+#ifdef PPM_NORAWWORD
+#define PUTPPMSAMPLE(ptr,v)  *ptr++ = (char) ((v) >> (BITS_IN_JSAMPLE-8))
+#define BYTESPERSAMPLE 1
+#define PPM_MAXVAL 255
+#else
+/* The word-per-sample format always puts the LSB first. */
+#define PUTPPMSAMPLE(ptr,v)			\
+	{ register int val_ = v;		\
+	  *ptr++ = (char) (val_ & 0xFF);	\
+	  *ptr++ = (char) ((val_ >> 8) & 0xFF);	\
+	}
+#define BYTESPERSAMPLE 2
+#define PPM_MAXVAL ((1<<BITS_IN_JSAMPLE)-1)
+#endif
+#endif
+
+
+/*
+ * When JSAMPLE is the same size as char, we can just fwrite() the
+ * decompressed data to the PPM or PGM file.  On PCs, in order to make this
+ * work the output buffer must be allocated in near data space, because we are
+ * assuming small-data memory model wherein fwrite() can't reach far memory.
+ * If you need to process very wide images on a PC, you might have to compile
+ * in large-memory model, or else replace fwrite() with a putc() loop ---
+ * which will be much slower.
+ */
+
+
+/* Private version of data destination object */
+
+typedef struct {
+  struct djpeg_dest_struct pub;	/* public fields */
+
+  /* Usually these two pointers point to the same place: */
+  char *iobuffer;		/* fwrite's I/O buffer */
+  JSAMPROW pixrow;		/* decompressor output buffer */
+  size_t buffer_width;		/* width of I/O buffer */
+  JDIMENSION samples_per_row;	/* JSAMPLEs per output row */
+} ppm_dest_struct;
+
+typedef ppm_dest_struct * ppm_dest_ptr;
+
+
+/*
+ * Write some pixel data.
+ * In this module rows_supplied will always be 1.
+ *
+ * put_pixel_rows handles the "normal" 8-bit case where the decompressor
+ * output buffer is physically the same as the fwrite buffer.
+ */
+
+METHODDEF(void)
+put_pixel_rows (j_decompress_ptr cinfo, djpeg_dest_ptr dinfo,
+		JDIMENSION rows_supplied)
+{
+  ppm_dest_ptr dest = (ppm_dest_ptr) dinfo;
+
+  (void) JFWRITE(dest->pub.output_file, dest->iobuffer, dest->buffer_width);
+}
+
+
+/*
+ * This code is used when we have to copy the data and apply a pixel
+ * format translation.  Typically this only happens in 12-bit mode.
+ */
+
+METHODDEF(void)
+copy_pixel_rows (j_decompress_ptr cinfo, djpeg_dest_ptr dinfo,
+		 JDIMENSION rows_supplied)
+{
+  ppm_dest_ptr dest = (ppm_dest_ptr) dinfo;
+  register char * bufferptr;
+  register JSAMPROW ptr;
+  register JDIMENSION col;
+
+  ptr = dest->pub.buffer[0];
+  bufferptr = dest->iobuffer;
+  for (col = dest->samples_per_row; col > 0; col--) {
+    PUTPPMSAMPLE(bufferptr, GETJSAMPLE(*ptr++));
+  }
+  (void) JFWRITE(dest->pub.output_file, dest->iobuffer, dest->buffer_width);
+}
+
+
+/*
+ * Write some pixel data when color quantization is in effect.
+ * We have to demap the color index values to straight data.
+ */
+
+METHODDEF(void)
+put_demapped_rgb (j_decompress_ptr cinfo, djpeg_dest_ptr dinfo,
+		  JDIMENSION rows_supplied)
+{
+  ppm_dest_ptr dest = (ppm_dest_ptr) dinfo;
+  register char * bufferptr;
+  register int pixval;
+  register JSAMPROW ptr;
+  register JSAMPROW color_map0 = cinfo->colormap[0];
+  register JSAMPROW color_map1 = cinfo->colormap[1];
+  register JSAMPROW color_map2 = cinfo->colormap[2];
+  register JDIMENSION col;
+
+  ptr = dest->pub.buffer[0];
+  bufferptr = dest->iobuffer;
+  for (col = cinfo->output_width; col > 0; col--) {
+    pixval = GETJSAMPLE(*ptr++);
+    PUTPPMSAMPLE(bufferptr, GETJSAMPLE(color_map0[pixval]));
+    PUTPPMSAMPLE(bufferptr, GETJSAMPLE(color_map1[pixval]));
+    PUTPPMSAMPLE(bufferptr, GETJSAMPLE(color_map2[pixval]));
+  }
+  (void) JFWRITE(dest->pub.output_file, dest->iobuffer, dest->buffer_width);
+}
+
+
+METHODDEF(void)
+put_demapped_gray (j_decompress_ptr cinfo, djpeg_dest_ptr dinfo,
+		   JDIMENSION rows_supplied)
+{
+  ppm_dest_ptr dest = (ppm_dest_ptr) dinfo;
+  register char * bufferptr;
+  register JSAMPROW ptr;
+  register JSAMPROW color_map = cinfo->colormap[0];
+  register JDIMENSION col;
+
+  ptr = dest->pub.buffer[0];
+  bufferptr = dest->iobuffer;
+  for (col = cinfo->output_width; col > 0; col--) {
+    PUTPPMSAMPLE(bufferptr, GETJSAMPLE(color_map[GETJSAMPLE(*ptr++)]));
+  }
+  (void) JFWRITE(dest->pub.output_file, dest->iobuffer, dest->buffer_width);
+}
+
+
+/*
+ * Startup: write the file header.
+ */
+
+METHODDEF(void)
+start_output_ppm (j_decompress_ptr cinfo, djpeg_dest_ptr dinfo)
+{
+  ppm_dest_ptr dest = (ppm_dest_ptr) dinfo;
+
+  /* Emit file header */
+  switch (cinfo->out_color_space) {
+  case JCS_GRAYSCALE:
+    /* emit header for raw PGM format */
+    fprintf(dest->pub.output_file, "P5\n%ld %ld\n%d\n",
+	    (long) cinfo->output_width, (long) cinfo->output_height,
+	    PPM_MAXVAL);
+    break;
+  case JCS_RGB:
+    /* emit header for raw PPM format */
+    fprintf(dest->pub.output_file, "P6\n%ld %ld\n%d\n",
+	    (long) cinfo->output_width, (long) cinfo->output_height,
+	    PPM_MAXVAL);
+    break;
+  default:
+    ERREXIT(cinfo, JERR_PPM_COLORSPACE);
+  }
+}
+
+
+/*
+ * Finish up at the end of the file.
+ */
+
+METHODDEF(void)
+finish_output_ppm (j_decompress_ptr cinfo, djpeg_dest_ptr dinfo)
+{
+  /* Make sure we wrote the output file OK */
+  fflush(dinfo->output_file);
+  if (ferror(dinfo->output_file))
+    ERREXIT(cinfo, JERR_FILE_WRITE);
+}
+
+
+/*
+ * The module selection routine for PPM format output.
+ */
+
+GLOBAL(djpeg_dest_ptr)
+jinit_write_ppm (j_decompress_ptr cinfo)
+{
+  ppm_dest_ptr dest;
+
+  /* Create module interface object, fill in method pointers */
+  dest = (ppm_dest_ptr)
+      (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+				  SIZEOF(ppm_dest_struct));
+  dest->pub.start_output = start_output_ppm;
+  dest->pub.finish_output = finish_output_ppm;
+
+  /* Calculate output image dimensions so we can allocate space */
+  jpeg_calc_output_dimensions(cinfo);
+
+  /* Create physical I/O buffer.  Note we make this near on a PC. */
+  dest->samples_per_row = cinfo->output_width * cinfo->out_color_components;
+  dest->buffer_width = dest->samples_per_row * (BYTESPERSAMPLE * SIZEOF(char));
+  dest->iobuffer = (char *) (*cinfo->mem->alloc_small)
+    ((j_common_ptr) cinfo, JPOOL_IMAGE, dest->buffer_width);
+
+  if (cinfo->quantize_colors || BITS_IN_JSAMPLE != 8 ||
+      SIZEOF(JSAMPLE) != SIZEOF(char)) {
+    /* When quantizing, we need an output buffer for colormap indexes
+     * that's separate from the physical I/O buffer.  We also need a
+     * separate buffer if pixel format translation must take place.
+     */
+    dest->pub.buffer = (*cinfo->mem->alloc_sarray)
+      ((j_common_ptr) cinfo, JPOOL_IMAGE,
+       cinfo->output_width * cinfo->output_components, (JDIMENSION) 1);
+    dest->pub.buffer_height = 1;
+    if (! cinfo->quantize_colors)
+      dest->pub.put_pixel_rows = copy_pixel_rows;
+    else if (cinfo->out_color_space == JCS_GRAYSCALE)
+      dest->pub.put_pixel_rows = put_demapped_gray;
+    else
+      dest->pub.put_pixel_rows = put_demapped_rgb;
+  } else {
+    /* We will fwrite() directly from decompressor output buffer. */
+    /* Synthesize a JSAMPARRAY pointer structure */
+    /* Cast here implies near->far pointer conversion on PCs */
+    dest->pixrow = (JSAMPROW) dest->iobuffer;
+    dest->pub.buffer = & dest->pixrow;
+    dest->pub.buffer_height = 1;
+    dest->pub.put_pixel_rows = put_pixel_rows;
+  }
+
+  return (djpeg_dest_ptr) dest;
+}
+
+#endif /* PPM_SUPPORTED */
diff --git a/uppsrc/plugin/jpg/lib/wrrle.c b/uppsrc/plugin/jpg/lib/wrrle.c
new file mode 100644
index 000000000..6af488dbc
--- /dev/null
+++ b/uppsrc/plugin/jpg/lib/wrrle.c
@@ -0,0 +1,305 @@
+/*
+ * wrrle.c
+ *
+ * Copyright (C) 1991-1996, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains routines to write output images in RLE format.
+ * The Utah Raster Toolkit library is required (version 3.1 or later).
+ *
+ * These routines may need modification for non-Unix environments or
+ * specialized applications.  As they stand, they assume output to
+ * an ordinary stdio stream.
+ *
+ * Based on code contributed by Mike Lijewski,
+ * with updates from Robert Hutchinson.
+ */
+
+#include "cdjpeg.h"		/* Common decls for cjpeg/djpeg applications */
+
+#ifdef RLE_SUPPORTED
+
+/* rle.h is provided by the Utah Raster Toolkit. */
+
+#include <rle.h>
+
+/*
+ * We assume that JSAMPLE has the same representation as rle_pixel,
+ * to wit, "unsigned char".  Hence we can't cope with 12- or 16-bit samples.
+ */
+
+#if BITS_IN_JSAMPLE != 8
+  Sorry, this code only copes with 8-bit JSAMPLEs. /* deliberate syntax err */
+#endif
+
+
+/*
+ * Since RLE stores scanlines bottom-to-top, we have to invert the image
+ * from JPEG's top-to-bottom order.  To do this, we save the outgoing data
+ * in a virtual array during put_pixel_row calls, then actually emit the
+ * RLE file during finish_output.
+ */
+
+
+/*
+ * For now, if we emit an RLE color map then it is always 256 entries long,
+ * though not all of the entries need be used.
+ */
+
+#define CMAPBITS	8
+#define CMAPLENGTH	(1<<(CMAPBITS))
+
+typedef struct {
+  struct djpeg_dest_struct pub; /* public fields */
+
+  jvirt_sarray_ptr image;	/* virtual array to store the output image */
+  rle_map *colormap;	 	/* RLE-style color map, or NULL if none */
+  rle_pixel **rle_row;		/* To pass rows to rle_putrow() */
+
+} rle_dest_struct;
+
+typedef rle_dest_struct * rle_dest_ptr;
+
+/* Forward declarations */
+METHODDEF(void) rle_put_pixel_rows
+    JPP((j_decompress_ptr cinfo, djpeg_dest_ptr dinfo,
+	 JDIMENSION rows_supplied));
+
+
+/*
+ * Write the file header.
+ *
+ * In this module it's easier to wait till finish_output to write anything.
+ */
+
+METHODDEF(void)
+start_output_rle (j_decompress_ptr cinfo, djpeg_dest_ptr dinfo)
+{
+  rle_dest_ptr dest = (rle_dest_ptr) dinfo;
+  size_t cmapsize;
+  int i, ci;
+#ifdef PROGRESS_REPORT
+  cd_progress_ptr progress = (cd_progress_ptr) cinfo->progress;
+#endif
+
+  /*
+   * Make sure the image can be stored in RLE format.
+   *
+   * - RLE stores image dimensions as *signed* 16 bit integers.  JPEG
+   *   uses unsigned, so we have to check the width.
+   *
+   * - Colorspace is expected to be grayscale or RGB.
+   *
+   * - The number of channels (components) is expected to be 1 (grayscale/
+   *   pseudocolor) or 3 (truecolor/directcolor).
+   *   (could be 2 or 4 if using an alpha channel, but we aren't)
+   */
+
+  if (cinfo->output_width > 32767 || cinfo->output_height > 32767)
+    ERREXIT2(cinfo, JERR_RLE_DIMENSIONS, cinfo->output_width,
+	     cinfo->output_height);
+
+  if (cinfo->out_color_space != JCS_GRAYSCALE &&
+      cinfo->out_color_space != JCS_RGB)
+    ERREXIT(cinfo, JERR_RLE_COLORSPACE);
+
+  if (cinfo->output_components != 1 && cinfo->output_components != 3)
+    ERREXIT1(cinfo, JERR_RLE_TOOMANYCHANNELS, cinfo->num_components);
+
+  /* Convert colormap, if any, to RLE format. */
+
+  dest->colormap = NULL;
+
+  if (cinfo->quantize_colors) {
+    /* Allocate storage for RLE-style cmap, zero any extra entries */
+    cmapsize = cinfo->out_color_components * CMAPLENGTH * SIZEOF(rle_map);
+    dest->colormap = (rle_map *) (*cinfo->mem->alloc_small)
+      ((j_common_ptr) cinfo, JPOOL_IMAGE, cmapsize);
+    MEMZERO(dest->colormap, cmapsize);
+
+    /* Save away data in RLE format --- note 8-bit left shift! */
+    /* Shifting would need adjustment for JSAMPLEs wider than 8 bits. */
+    for (ci = 0; ci < cinfo->out_color_components; ci++) {
+      for (i = 0; i < cinfo->actual_number_of_colors; i++) {
+        dest->colormap[ci * CMAPLENGTH + i] =
+          GETJSAMPLE(cinfo->colormap[ci][i]) << 8;
+      }
+    }
+  }
+
+  /* Set the output buffer to the first row */
+  dest->pub.buffer = (*cinfo->mem->access_virt_sarray)
+    ((j_common_ptr) cinfo, dest->image, (JDIMENSION) 0, (JDIMENSION) 1, TRUE);
+  dest->pub.buffer_height = 1;
+
+  dest->pub.put_pixel_rows = rle_put_pixel_rows;
+
+#ifdef PROGRESS_REPORT
+  if (progress != NULL) {
+    progress->total_extra_passes++;  /* count file writing as separate pass */
+  }
+#endif
+}
+
+
+/*
+ * Write some pixel data.
+ *
+ * This routine just saves the data away in a virtual array.
+ */
+
+METHODDEF(void)
+rle_put_pixel_rows (j_decompress_ptr cinfo, djpeg_dest_ptr dinfo,
+		    JDIMENSION rows_supplied)
+{
+  rle_dest_ptr dest = (rle_dest_ptr) dinfo;
+
+  if (cinfo->output_scanline < cinfo->output_height) {
+    dest->pub.buffer = (*cinfo->mem->access_virt_sarray)
+      ((j_common_ptr) cinfo, dest->image,
+       cinfo->output_scanline, (JDIMENSION) 1, TRUE);
+  }
+}
+
+/*
+ * Finish up at the end of the file.
+ *
+ * Here is where we really output the RLE file.
+ */
+
+METHODDEF(void)
+finish_output_rle (j_decompress_ptr cinfo, djpeg_dest_ptr dinfo)
+{
+  rle_dest_ptr dest = (rle_dest_ptr) dinfo;
+  rle_hdr header;		/* Output file information */
+  rle_pixel **rle_row, *red, *green, *blue;
+  JSAMPROW output_row;
+  char cmapcomment[80];
+  int row, col;
+  int ci;
+#ifdef PROGRESS_REPORT
+  cd_progress_ptr progress = (cd_progress_ptr) cinfo->progress;
+#endif
+
+  /* Initialize the header info */
+  header = *rle_hdr_init(NULL);
+  header.rle_file = dest->pub.output_file;
+  header.xmin     = 0;
+  header.xmax     = cinfo->output_width  - 1;
+  header.ymin     = 0;
+  header.ymax     = cinfo->output_height - 1;
+  header.alpha    = 0;
+  header.ncolors  = cinfo->output_components;
+  for (ci = 0; ci < cinfo->output_components; ci++) {
+    RLE_SET_BIT(header, ci);
+  }
+  if (cinfo->quantize_colors) {
+    header.ncmap   = cinfo->out_color_components;
+    header.cmaplen = CMAPBITS;
+    header.cmap    = dest->colormap;
+    /* Add a comment to the output image with the true colormap length. */
+    sprintf(cmapcomment, "color_map_length=%d", cinfo->actual_number_of_colors);
+    rle_putcom(cmapcomment, &header);
+  }
+
+  /* Emit the RLE header and color map (if any) */
+  rle_put_setup(&header);
+
+  /* Now output the RLE data from our virtual array.
+   * We assume here that (a) rle_pixel is represented the same as JSAMPLE,
+   * and (b) we are not on a machine where FAR pointers differ from regular.
+   */
+
+#ifdef PROGRESS_REPORT
+  if (progress != NULL) {
+    progress->pub.pass_limit = cinfo->output_height;
+    progress->pub.pass_counter = 0;
+    (*progress->pub.progress_monitor) ((j_common_ptr) cinfo);
+  }
+#endif
+
+  if (cinfo->output_components == 1) {
+    for (row = cinfo->output_height-1; row >= 0; row--) {
+      rle_row = (rle_pixel **) (*cinfo->mem->access_virt_sarray)
+        ((j_common_ptr) cinfo, dest->image,
+	 (JDIMENSION) row, (JDIMENSION) 1, FALSE);
+      rle_putrow(rle_row, (int) cinfo->output_width, &header);
+#ifdef PROGRESS_REPORT
+      if (progress != NULL) {
+        progress->pub.pass_counter++;
+        (*progress->pub.progress_monitor) ((j_common_ptr) cinfo);
+      }
+#endif
+    }
+  } else {
+    for (row = cinfo->output_height-1; row >= 0; row--) {
+      rle_row = (rle_pixel **) dest->rle_row;
+      output_row = * (*cinfo->mem->access_virt_sarray)
+        ((j_common_ptr) cinfo, dest->image,
+	 (JDIMENSION) row, (JDIMENSION) 1, FALSE);
+      red = rle_row[0];
+      green = rle_row[1];
+      blue = rle_row[2];
+      for (col = cinfo->output_width; col > 0; col--) {
+        *red++ = GETJSAMPLE(*output_row++);
+        *green++ = GETJSAMPLE(*output_row++);
+        *blue++ = GETJSAMPLE(*output_row++);
+      }
+      rle_putrow(rle_row, (int) cinfo->output_width, &header);
+#ifdef PROGRESS_REPORT
+      if (progress != NULL) {
+        progress->pub.pass_counter++;
+        (*progress->pub.progress_monitor) ((j_common_ptr) cinfo);
+      }
+#endif
+    }
+  }
+
+#ifdef PROGRESS_REPORT
+  if (progress != NULL)
+    progress->completed_extra_passes++;
+#endif
+
+  /* Emit file trailer */
+  rle_puteof(&header);
+  fflush(dest->pub.output_file);
+  if (ferror(dest->pub.output_file))
+    ERREXIT(cinfo, JERR_FILE_WRITE);
+}
+
+
+/*
+ * The module selection routine for RLE format output.
+ */
+
+GLOBAL(djpeg_dest_ptr)
+jinit_write_rle (j_decompress_ptr cinfo)
+{
+  rle_dest_ptr dest;
+
+  /* Create module interface object, fill in method pointers */
+  dest = (rle_dest_ptr)
+      (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+                                  SIZEOF(rle_dest_struct));
+  dest->pub.start_output = start_output_rle;
+  dest->pub.finish_output = finish_output_rle;
+
+  /* Calculate output image dimensions so we can allocate space */
+  jpeg_calc_output_dimensions(cinfo);
+
+  /* Allocate a work array for output to the RLE library. */
+  dest->rle_row = (*cinfo->mem->alloc_sarray)
+    ((j_common_ptr) cinfo, JPOOL_IMAGE,
+     cinfo->output_width, (JDIMENSION) cinfo->output_components);
+
+  /* Allocate a virtual array to hold the image. */
+  dest->image = (*cinfo->mem->request_virt_sarray)
+    ((j_common_ptr) cinfo, JPOOL_IMAGE, FALSE,
+     (JDIMENSION) (cinfo->output_width * cinfo->output_components),
+     cinfo->output_height, (JDIMENSION) 1);
+
+  return (djpeg_dest_ptr) dest;
+}
+
+#endif /* RLE_SUPPORTED */
diff --git a/uppsrc/plugin/jpg/lib/wrtarga.c b/uppsrc/plugin/jpg/lib/wrtarga.c
new file mode 100644
index 000000000..cf104d2de
--- /dev/null
+++ b/uppsrc/plugin/jpg/lib/wrtarga.c
@@ -0,0 +1,253 @@
+/*
+ * wrtarga.c
+ *
+ * Copyright (C) 1991-1996, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains routines to write output images in Targa format.
+ *
+ * These routines may need modification for non-Unix environments or
+ * specialized applications.  As they stand, they assume output to
+ * an ordinary stdio stream.
+ *
+ * Based on code contributed by Lee Daniel Crocker.
+ */
+
+#include "cdjpeg.h"		/* Common decls for cjpeg/djpeg applications */
+
+#ifdef TARGA_SUPPORTED
+
+
+/*
+ * To support 12-bit JPEG data, we'd have to scale output down to 8 bits.
+ * This is not yet implemented.
+ */
+
+#if BITS_IN_JSAMPLE != 8
+  Sorry, this code only copes with 8-bit JSAMPLEs. /* deliberate syntax err */
+#endif
+
+/*
+ * The output buffer needs to be writable by fwrite().  On PCs, we must
+ * allocate the buffer in near data space, because we are assuming small-data
+ * memory model, wherein fwrite() can't reach far memory.  If you need to
+ * process very wide images on a PC, you might have to compile in large-memory
+ * model, or else replace fwrite() with a putc() loop --- which will be much
+ * slower.
+ */
+
+
+/* Private version of data destination object */
+
+typedef struct {
+  struct djpeg_dest_struct pub;	/* public fields */
+
+  char *iobuffer;		/* physical I/O buffer */
+  JDIMENSION buffer_width;	/* width of one row */
+} tga_dest_struct;
+
+typedef tga_dest_struct * tga_dest_ptr;
+
+
+LOCAL(void)
+write_header (j_decompress_ptr cinfo, djpeg_dest_ptr dinfo, int num_colors)
+/* Create and write a Targa header */
+{
+  char targaheader[18];
+
+  /* Set unused fields of header to 0 */
+  MEMZERO(targaheader, SIZEOF(targaheader));
+
+  if (num_colors > 0) {
+    targaheader[1] = 1;		/* color map type 1 */
+    targaheader[5] = (char) (num_colors & 0xFF);
+    targaheader[6] = (char) (num_colors >> 8);
+    targaheader[7] = 24;	/* 24 bits per cmap entry */
+  }
+
+  targaheader[12] = (char) (cinfo->output_width & 0xFF);
+  targaheader[13] = (char) (cinfo->output_width >> 8);
+  targaheader[14] = (char) (cinfo->output_height & 0xFF);
+  targaheader[15] = (char) (cinfo->output_height >> 8);
+  targaheader[17] = 0x20;	/* Top-down, non-interlaced */
+
+  if (cinfo->out_color_space == JCS_GRAYSCALE) {
+    targaheader[2] = 3;		/* image type = uncompressed gray-scale */
+    targaheader[16] = 8;	/* bits per pixel */
+  } else {			/* must be RGB */
+    if (num_colors > 0) {
+      targaheader[2] = 1;	/* image type = colormapped RGB */
+      targaheader[16] = 8;
+    } else {
+      targaheader[2] = 2;	/* image type = uncompressed RGB */
+      targaheader[16] = 24;
+    }
+  }
+
+  if (JFWRITE(dinfo->output_file, targaheader, 18) != (size_t) 18)
+    ERREXIT(cinfo, JERR_FILE_WRITE);
+}
+
+
+/*
+ * Write some pixel data.
+ * In this module rows_supplied will always be 1.
+ */
+
+METHODDEF(void)
+put_pixel_rows (j_decompress_ptr cinfo, djpeg_dest_ptr dinfo,
+		JDIMENSION rows_supplied)
+/* used for unquantized full-color output */
+{
+  tga_dest_ptr dest = (tga_dest_ptr) dinfo;
+  register JSAMPROW inptr;
+  register char * outptr;
+  register JDIMENSION col;
+
+  inptr = dest->pub.buffer[0];
+  outptr = dest->iobuffer;
+  for (col = cinfo->output_width; col > 0; col--) {
+    outptr[0] = (char) GETJSAMPLE(inptr[2]); /* RGB to BGR order */
+    outptr[1] = (char) GETJSAMPLE(inptr[1]);
+    outptr[2] = (char) GETJSAMPLE(inptr[0]);
+    inptr += 3, outptr += 3;
+  }
+  (void) JFWRITE(dest->pub.output_file, dest->iobuffer, dest->buffer_width);
+}
+
+METHODDEF(void)
+put_gray_rows (j_decompress_ptr cinfo, djpeg_dest_ptr dinfo,
+	       JDIMENSION rows_supplied)
+/* used for grayscale OR quantized color output */
+{
+  tga_dest_ptr dest = (tga_dest_ptr) dinfo;
+  register JSAMPROW inptr;
+  register char * outptr;
+  register JDIMENSION col;
+
+  inptr = dest->pub.buffer[0];
+  outptr = dest->iobuffer;
+  for (col = cinfo->output_width; col > 0; col--) {
+    *outptr++ = (char) GETJSAMPLE(*inptr++);
+  }
+  (void) JFWRITE(dest->pub.output_file, dest->iobuffer, dest->buffer_width);
+}
+
+
+/*
+ * Write some demapped pixel data when color quantization is in effect.
+ * For Targa, this is only applied to grayscale data.
+ */
+
+METHODDEF(void)
+put_demapped_gray (j_decompress_ptr cinfo, djpeg_dest_ptr dinfo,
+		   JDIMENSION rows_supplied)
+{
+  tga_dest_ptr dest = (tga_dest_ptr) dinfo;
+  register JSAMPROW inptr;
+  register char * outptr;
+  register JSAMPROW color_map0 = cinfo->colormap[0];
+  register JDIMENSION col;
+
+  inptr = dest->pub.buffer[0];
+  outptr = dest->iobuffer;
+  for (col = cinfo->output_width; col > 0; col--) {
+    *outptr++ = (char) GETJSAMPLE(color_map0[GETJSAMPLE(*inptr++)]);
+  }
+  (void) JFWRITE(dest->pub.output_file, dest->iobuffer, dest->buffer_width);
+}
+
+
+/*
+ * Startup: write the file header.
+ */
+
+METHODDEF(void)
+start_output_tga (j_decompress_ptr cinfo, djpeg_dest_ptr dinfo)
+{
+  tga_dest_ptr dest = (tga_dest_ptr) dinfo;
+  int num_colors, i;
+  FILE *outfile;
+
+  if (cinfo->out_color_space == JCS_GRAYSCALE) {
+    /* Targa doesn't have a mapped grayscale format, so we will */
+    /* demap quantized gray output.  Never emit a colormap. */
+    write_header(cinfo, dinfo, 0);
+    if (cinfo->quantize_colors)
+      dest->pub.put_pixel_rows = put_demapped_gray;
+    else
+      dest->pub.put_pixel_rows = put_gray_rows;
+  } else if (cinfo->out_color_space == JCS_RGB) {
+    if (cinfo->quantize_colors) {
+      /* We only support 8-bit colormap indexes, so only 256 colors */
+      num_colors = cinfo->actual_number_of_colors;
+      if (num_colors > 256)
+	ERREXIT1(cinfo, JERR_TOO_MANY_COLORS, num_colors);
+      write_header(cinfo, dinfo, num_colors);
+      /* Write the colormap.  Note Targa uses BGR byte order */
+      outfile = dest->pub.output_file;
+      for (i = 0; i < num_colors; i++) {
+	putc(GETJSAMPLE(cinfo->colormap[2][i]), outfile);
+	putc(GETJSAMPLE(cinfo->colormap[1][i]), outfile);
+	putc(GETJSAMPLE(cinfo->colormap[0][i]), outfile);
+      }
+      dest->pub.put_pixel_rows = put_gray_rows;
+    } else {
+      write_header(cinfo, dinfo, 0);
+      dest->pub.put_pixel_rows = put_pixel_rows;
+    }
+  } else {
+    ERREXIT(cinfo, JERR_TGA_COLORSPACE);
+  }
+}
+
+
+/*
+ * Finish up at the end of the file.
+ */
+
+METHODDEF(void)
+finish_output_tga (j_decompress_ptr cinfo, djpeg_dest_ptr dinfo)
+{
+  /* Make sure we wrote the output file OK */
+  fflush(dinfo->output_file);
+  if (ferror(dinfo->output_file))
+    ERREXIT(cinfo, JERR_FILE_WRITE);
+}
+
+
+/*
+ * The module selection routine for Targa format output.
+ */
+
+GLOBAL(djpeg_dest_ptr)
+jinit_write_targa (j_decompress_ptr cinfo)
+{
+  tga_dest_ptr dest;
+
+  /* Create module interface object, fill in method pointers */
+  dest = (tga_dest_ptr)
+      (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+				  SIZEOF(tga_dest_struct));
+  dest->pub.start_output = start_output_tga;
+  dest->pub.finish_output = finish_output_tga;
+
+  /* Calculate output image dimensions so we can allocate space */
+  jpeg_calc_output_dimensions(cinfo);
+
+  /* Create I/O buffer.  Note we make this near on a PC. */
+  dest->buffer_width = cinfo->output_width * cinfo->output_components;
+  dest->iobuffer = (char *)
+    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+				(size_t) (dest->buffer_width * SIZEOF(char)));
+
+  /* Create decompressor output buffer. */
+  dest->pub.buffer = (*cinfo->mem->alloc_sarray)
+    ((j_common_ptr) cinfo, JPOOL_IMAGE, dest->buffer_width, (JDIMENSION) 1);
+  dest->pub.buffer_height = 1;
+
+  return (djpeg_dest_ptr) dest;
+}
+
+#endif /* TARGA_SUPPORTED */
diff --git a/uppsrc/plugin/ndisasm/init b/uppsrc/plugin/ndisasm/init
new file mode 100644
index 000000000..81e720a50
--- /dev/null
+++ b/uppsrc/plugin/ndisasm/init
@@ -0,0 +1,4 @@
+#ifndef _plugin_ndisasm_icpp_init_stub
+#define _plugin_ndisasm_icpp_init_stub
+#include "Core/init"
+#endif
diff --git a/uppsrc/plugin/ndisasm/lib/AUTHORS b/uppsrc/plugin/ndisasm/lib/AUTHORS
new file mode 100644
index 000000000..0fbac02fd
--- /dev/null
+++ b/uppsrc/plugin/ndisasm/lib/AUTHORS
@@ -0,0 +1,119 @@
+This is the AUTHORS file for the NASM project located at:
+http://nasm.2y.net/
+
+Names should be inserted as follows:
+
+N: Name Here
+E: Email Here
+D: Description Here
+D: Additional Description Here.... and so on
+
+Such is life.
+-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
+
+N: Julian Hall
+E: Jules@acris.co.uk
+D: Original author and co-conspirator
+
+N: Simon Tatham
+E: anakin@pobox.com
+D: Original author and co-conspirator
+
+N: Nelson Rush
+E: palisade@users.sourceforge.net
+D: Some guy.
+
+N: Frank Kotler
+E: fbkotler@nettaxi.com
+D: Bug smashing.
+D: Documentation - "KATMAI" and "3DNow!" instructions supported by 0.98
+D: General coordination and moral support.
+
+N: Stephen Silver
+E: nasm@argentum.freeserve.co.uk
+D: Documentation - "3dNow!" instructions and misc.
+D: insns.dat fixes and new instructions.
+
+N: AMD Inc. (names of developers here?)
+E:
+D: 3DNow instructions
+D: New Athlon instructions
+D: Makefile.vc fix
+
+N: John Coffman
+E: johninsd@users.sourceforge.net
+D: added Jcc optimizations; CPU level checks
+D: bug fixes, compilation fixes
+
+N: Yuri Zaporogets
+E: yuriz@users.sourceforge.net
+D: RDOFF support
+
+N: H. Peter Anvin
+E: hpa@zytor.com
+D: Organized 0.98 release and Linux binaries; new CVS tree.
+
+N: John Fine
+E: johnfine@earthlink.net
+D: Preprocessor and OBJ (OMF) output format driver
+D: Organized DOS versions of 0.98 release
+
+N: Kendall Bennet
+E: KendallB@scitechsoft.com
+D: NASM enhancements
+D: macros
+D: Syntax modifications
+
+N: Gary Clark
+E:
+D: AMD 3DNow! instructions
+
+N: Andrew Crabtree
+E:
+D: Debugging support
+
+N: Rafael R. Sevilla
+E: dido@pacific.net.ph
+D: RDF2HEX utility
+
+N: Jaime Tejedor G�mez, aka Metalbrain
+E: metalbrain_coder@gmx.net
+D: jecxz bug fix
+
+N: James Seter
+E: pharos@zsnes.com
+D: --POSTFIX, --PREFIX switches
+D: ?
+
+N: Edward J. Beroset
+E: beroset@mindspring.com
+D: added %substr and %strlen
+
+N: Stanislav Karchebny, aka berkus, madfire, daemonhunter
+E: madfire@users.sourceforge.net
+D: multiple sections support for -fbin format
+D: cvs maintenance
+D: webpage at http://nasm.2y.net maintenance
+
+N: Debbie Wiles, aka debs
+E: debs@dwiles.demon.co.uk
+D: Work on docs, added undocumented instructions (esp SSE2 and 3D-Now!)
+D: Added other documentation and tidied up docs
+D: Added a few instructions to insns.dat and tidied it up.
+
+N: Trevor Woerner
+E: FIXME
+D: Quiet compiler warnings
+
+N: Michael K. Ter Louw
+E: mterlo1 "at" uic "dot" edu
+D: Multisection support for "-f bin"
+
+N: Martin Wawro
+E: FIXME
+D: stabs debug support for "-f elf"
+
+N: Alexei Frounze
+E: alexfru@users.sourceforge.net
+D: "-I" paths searched for "incbined" files
+D: bugswatting
diff --git a/uppsrc/plugin/ndisasm/lib/COPYING b/uppsrc/plugin/ndisasm/lib/COPYING
new file mode 100644
index 000000000..35dbef427
--- /dev/null
+++ b/uppsrc/plugin/ndisasm/lib/COPYING
@@ -0,0 +1,462 @@
+
+                  GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL.  It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it.  You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations
+below.
+
+  When we speak of free software, we are referring to freedom of use,
+not price.  Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+  To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights.  These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  To protect each distributor, we want to make it very clear that
+there is no warranty for the free library.  Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+^L
+  Finally, software patents pose a constant threat to the existence of
+any free program.  We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder.  Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+  Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License.  This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License.  We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+  When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library.  The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom.  The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+  We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License.  It also provides other free software developers Less
+of an advantage over competing non-free programs.  These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries.  However, the Lesser license provides advantages in certain
+special circumstances.
+
+  For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it
+becomes a de-facto standard.  To achieve this, non-free programs must
+be allowed to use the library.  A more frequent case is that a free
+library does the same job as widely used non-free libraries.  In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+  In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software.  For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+  Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+^L
+                  GNU LESSER GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control
+compilation and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+^L
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+^L
+  6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Use a suitable shared library mechanism for linking with the
+    Library.  A suitable mechanism is one that (1) uses at run time a
+    copy of the library already present on the user's computer system,
+    rather than copying library functions into the executable, and (2)
+    will operate properly with a modified version of the library, if
+    the user installs one, as long as the modified version is
+    interface-compatible with the version that the work was made with.
+
+    c) Accompany the work with a written offer, valid for at least
+    three years, to give the same user the materials specified in
+    Subsection 6a, above, for a charge no more than the cost of
+    performing this distribution.
+
+    d) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    e) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+^L
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+^L
+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply, and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License
+may add an explicit geographical distribution limitation excluding those
+countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+^L
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+                            NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+^L
diff --git a/uppsrc/plugin/ndisasm/lib/README b/uppsrc/plugin/ndisasm/lib/README
new file mode 100644
index 000000000..a29f7f586
--- /dev/null
+++ b/uppsrc/plugin/ndisasm/lib/README
@@ -0,0 +1,21 @@
+              NASM, the Netwide Assembler.
+
+Many many developers all over the net respect NASM for what it is
+- a widespread (thus netwide), portable (thus netwide!), very
+flexible and mature assembler tool with support for many output
+formats (thus netwide!!).
+
+Now we have good news for you: NASM is licensed under LGPL.
+This means its development is open to even wider society of
+programmers wishing to improve their lovely assembler.
+
+The NASM project is now situated at SourceForge.net, the most
+famous Open Source development center on The Net.
+
+Visit our development page at http://nasm.2y.net/ and our
+SF project at http://sf.net/projects/nasm/
+
+See the file CHANGES for the description of changes between revisions.
+
+                                                   With best regards,
+                                                           NASM crew.
diff --git a/uppsrc/plugin/ndisasm/lib/disasm.c b/uppsrc/plugin/ndisasm/lib/disasm.c
new file mode 100644
index 000000000..f2180afe0
--- /dev/null
+++ b/uppsrc/plugin/ndisasm/lib/disasm.c
@@ -0,0 +1,750 @@
+/* disasm.c   where all the _work_ gets done in the Netwide Disassembler
+ *
+ * The Netwide Assembler is copyright (C) 1996 Simon Tatham and
+ * Julian Hall. All rights reserved. The software is
+ * redistributable under the licence given in the file "Licence"
+ * distributed in the NASM archive.
+ *
+ * initial version 27/iii/95 by Simon Tatham
+ */
+
+#define _CRT_SECURE_NO_DEPRECATE
+
+#include <stdio.h>
+#include <string.h>
+
+#include "nasm.h"
+#include "disasm.h"
+#include "sync.h"
+#include "insns.h"
+
+#include "names.c"
+
+extern struct itemplate **itable[];
+
+/*
+ * Flags that go into the `segment' field of `insn' structures
+ * during disassembly.
+ */
+#define SEG_RELATIVE 1
+#define SEG_32BIT 2
+#define SEG_RMREG 4
+#define SEG_DISP8 8
+#define SEG_DISP16 16
+#define SEG_DISP32 32
+#define SEG_NODISP 64
+#define SEG_SIGNED 128
+
+static int whichreg(long regflags, int regval)
+{
+#include "regdis.c"
+
+    if (!(REG_AL & ~regflags))
+	return R_AL;
+    if (!(REG_AX & ~regflags))
+	return R_AX;
+    if (!(REG_EAX & ~regflags))
+	return R_EAX;
+    if (!(REG_DL & ~regflags))
+	return R_DL;
+    if (!(REG_DX & ~regflags))
+	return R_DX;
+    if (!(REG_EDX & ~regflags))
+	return R_EDX;
+    if (!(REG_CL & ~regflags))
+	return R_CL;
+    if (!(REG_CX & ~regflags))
+	return R_CX;
+    if (!(REG_ECX & ~regflags))
+	return R_ECX;
+    if (!(FPU0 & ~regflags))
+	return R_ST0;
+    if (!(REG_CS & ~regflags))
+        return (regval == 1) ? R_CS : 0;
+    if (!(REG_DESS & ~regflags))
+	return (regval == 0 || regval == 2 || regval == 3 ? sreg[regval] : 0);
+    if (!(REG_FSGS & ~regflags))
+	return (regval == 4 || regval == 5 ? sreg[regval] : 0);
+    if (!(REG_SEG67 & ~regflags))
+	return (regval == 6 || regval == 7 ? sreg[regval] : 0);
+
+    /* All the entries below look up regval in an 8-entry array */
+    if (regval < 0 || regval > 7)
+	return 0;
+
+    if (!((REGMEM|BITS8) & ~regflags))
+	return reg8[regval];
+    if (!((REGMEM|BITS16) & ~regflags))
+	return reg16[regval];
+    if (!((REGMEM|BITS32) & ~regflags))
+	return reg32[regval];
+    if (!(REG_SREG & ~regflags))
+	return sreg[regval];
+    if (!(REG_CREG & ~regflags))
+	return creg[regval];
+    if (!(REG_DREG & ~regflags))
+	return dreg[regval];
+    if (!(REG_TREG & ~regflags))
+	return treg[regval];
+    if (!(FPUREG & ~regflags))
+	return fpureg[regval];
+    if (!(MMXREG & ~regflags))
+	return mmxreg[regval];
+    if (!(XMMREG & ~regflags))
+	return xmmreg[regval];
+
+    return 0;
+}
+
+static const char *whichcond(int condval)
+{
+    static int conds[] = {
+	C_O, C_NO, C_C, C_NC, C_Z, C_NZ, C_NA, C_A,
+	C_S, C_NS, C_PE, C_PO, C_L, C_NL, C_NG, C_G
+    };
+    return conditions[conds[condval]];
+}
+
+/*
+ * Process an effective address (ModRM) specification.
+ */
+static unsigned char *do_ea (unsigned char *data, int modrm, int asize,
+			     int segsize, operand *op)
+{
+    int mod, rm, scale, index, base;
+
+    mod = (modrm >> 6) & 03;
+    rm = modrm & 07;
+
+    if (mod == 3) {		       /* pure register version */
+	op->basereg = rm;
+	op->segment |= SEG_RMREG;
+	return data;
+    }
+
+    op->addr_size = 0;
+
+    if (asize == 16) {
+	/*
+	 * <mod> specifies the displacement size (none, byte or
+	 * word), and <rm> specifies the register combination.
+	 * Exception: mod=0,rm=6 does not specify [BP] as one might
+	 * expect, but instead specifies [disp16].
+	 */
+	op->indexreg = op->basereg = -1;
+	op->scale = 1;		       /* always, in 16 bits */
+	switch (rm) {
+	  case 0: op->basereg = R_BX; op->indexreg = R_SI; break;
+	  case 1: op->basereg = R_BX; op->indexreg = R_DI; break;
+	  case 2: op->basereg = R_BP; op->indexreg = R_SI; break;
+	  case 3: op->basereg = R_BP; op->indexreg = R_DI; break;
+	  case 4: op->basereg = R_SI; break;
+	  case 5: op->basereg = R_DI; break;
+	  case 6: op->basereg = R_BP; break;
+	  case 7: op->basereg = R_BX; break;
+	}
+	if (rm == 6 && mod == 0) {     /* special case */
+	    op->basereg = -1;
+	    if (segsize != 16)
+		op->addr_size = 16;
+	    mod = 2;		       /* fake disp16 */
+	}
+	switch (mod) {
+	  case 0:
+	    op->segment |= SEG_NODISP;
+	    break;
+	  case 1:
+	    op->segment |= SEG_DISP8;
+	    op->offset = (signed char) *data++;
+	    break;
+	  case 2:
+	    op->segment |= SEG_DISP16;
+	    op->offset = *data++;
+	    op->offset |= ((unsigned) *data++) << 8;
+	    break;
+	}
+	return data;
+    } else {
+	/*
+	 * Once again, <mod> specifies displacement size (this time
+	 * none, byte or *dword*), while <rm> specifies the base
+	 * register. Again, [EBP] is missing, replaced by a pure
+	 * disp32 (this time that's mod=0,rm=*5*). However, rm=4
+	 * indicates not a single base register, but instead the
+	 * presence of a SIB byte...
+	 */
+	op->indexreg = -1;
+	switch (rm) {
+	  case 0: op->basereg = R_EAX; break;
+	  case 1: op->basereg = R_ECX; break;
+	  case 2: op->basereg = R_EDX; break;
+	  case 3: op->basereg = R_EBX; break;
+	  case 5: op->basereg = R_EBP; break;
+	  case 6: op->basereg = R_ESI; break;
+	  case 7: op->basereg = R_EDI; break;
+	}
+	if (rm == 5 && mod == 0) {
+	    op->basereg = -1;
+	    if (segsize != 32)
+		op->addr_size = 32;
+	    mod = 2;		       /* fake disp32 */
+	}
+	if (rm == 4) {		       /* process SIB */
+	    scale = (*data >> 6) & 03;
+	    index = (*data >> 3) & 07;
+	    base = *data & 07;
+	    data++;
+
+	    op->scale = 1 << scale;
+	    switch (index) {
+	      case 0: op->indexreg = R_EAX; break;
+	      case 1: op->indexreg = R_ECX; break;
+	      case 2: op->indexreg = R_EDX; break;
+	      case 3: op->indexreg = R_EBX; break;
+	      case 4: op->indexreg = -1; break;
+	      case 5: op->indexreg = R_EBP; break;
+	      case 6: op->indexreg = R_ESI; break;
+	      case 7: op->indexreg = R_EDI; break;
+	    }
+
+	    switch (base) {
+	      case 0: op->basereg = R_EAX; break;
+	      case 1: op->basereg = R_ECX; break;
+	      case 2: op->basereg = R_EDX; break;
+	      case 3: op->basereg = R_EBX; break;
+	      case 4: op->basereg = R_ESP; break;
+	      case 6: op->basereg = R_ESI; break;
+	      case 7: op->basereg = R_EDI; break;
+	      case 5:
+		if (mod == 0) {
+		    mod = 2;
+		    op->basereg = -1;
+		} else
+		    op->basereg = R_EBP;
+		break;
+	    }
+	}
+	switch (mod) {
+	  case 0:
+	    op->segment |= SEG_NODISP;
+	    break;
+	  case 1:
+	    op->segment |= SEG_DISP8;
+	    op->offset = (signed char) *data++;
+	    break;
+	  case 2:
+	    op->segment |= SEG_DISP32;
+	    op->offset = *data++;
+	    op->offset |= ((unsigned) *data++) << 8;
+	    op->offset |= ((long) *data++) << 16;
+	    op->offset |= ((long) *data++) << 24;
+	    break;
+	}
+	return data;
+    }
+}
+
+/*
+ * Determine whether the instruction template in t corresponds to the data
+ * stream in data. Return the number of bytes matched if so.
+ */
+static int matches (struct itemplate *t, unsigned char *data, int asize,
+		    int osize, int segsize, int rep, insn *ins)
+{
+    unsigned char * r = (unsigned char *)(t->code);
+    unsigned char * origdata = data;
+    int           a_used = FALSE, o_used = FALSE;
+    int           drep = 0;
+
+    if ( rep == 0xF2 )
+      drep = P_REPNE;
+    else if ( rep == 0xF3 )
+      drep = P_REP;
+
+    while (*r)
+    {
+	int c = *r++;
+	if (c >= 01 && c <= 03) {
+	    while (c--)
+		if (*r++ != *data++)
+		    return FALSE;
+	}
+	if (c == 04) {
+	    switch (*data++) {
+	      case 0x07: ins->oprs[0].basereg = 0; break;
+	      case 0x17: ins->oprs[0].basereg = 2; break;
+	      case 0x1F: ins->oprs[0].basereg = 3; break;
+	      default: return FALSE;
+	    }
+	}
+	if (c == 05) {
+	    switch (*data++) {
+	      case 0xA1: ins->oprs[0].basereg = 4; break;
+	      case 0xA9: ins->oprs[0].basereg = 5; break;
+	      default: return FALSE;
+	    }
+	}
+	if (c == 06) {
+	    switch (*data++) {
+	      case 0x06: ins->oprs[0].basereg = 0; break;
+	      case 0x0E: ins->oprs[0].basereg = 1; break;
+	      case 0x16: ins->oprs[0].basereg = 2; break;
+	      case 0x1E: ins->oprs[0].basereg = 3; break;
+	      default: return FALSE;
+	    }
+	}
+	if (c == 07) {
+	    switch (*data++) {
+	      case 0xA0: ins->oprs[0].basereg = 4; break;
+	      case 0xA8: ins->oprs[0].basereg = 5; break;
+	      default: return FALSE;
+	    }
+	}
+	if (c >= 010 && c <= 012) {
+	    int t = *r++, d = *data++;
+	    if (d < t || d > t+7)
+		return FALSE;
+	    else {
+		ins->oprs[c-010].basereg = d-t;
+		ins->oprs[c-010].segment |= SEG_RMREG;
+	    }
+	}
+	if (c == 017)
+	    if (*data++)
+		return FALSE;
+	if (c >= 014 && c <= 016) {
+	    ins->oprs[c-014].offset = (signed char) *data++;
+	    ins->oprs[c-014].segment |= SEG_SIGNED;
+	}
+	if (c >= 020 && c <= 022)
+	    ins->oprs[c-020].offset = *data++;
+	if (c >= 024 && c <= 026)
+	    ins->oprs[c-024].offset = *data++;
+	if (c >= 030 && c <= 032) {
+	    ins->oprs[c-030].offset = *data++;
+	    ins->oprs[c-030].offset |= (((unsigned) *data++) << 8);
+	}
+	if (c >= 034 && c <= 036) {
+	    ins->oprs[c-034].offset = *data++;
+	    ins->oprs[c-034].offset |= (((unsigned) *data++) << 8);
+	    if (osize == 32) {
+		ins->oprs[c-034].offset |= (((long) *data++) << 16);
+		ins->oprs[c-034].offset |= (((long) *data++) << 24);
+	    }
+	    if (segsize != asize)
+		ins->oprs[c-034].addr_size = asize;
+	}
+	if (c >= 040 && c <= 042) {
+	    ins->oprs[c-040].offset = *data++;
+	    ins->oprs[c-040].offset |= (((unsigned) *data++) << 8);
+	    ins->oprs[c-040].offset |= (((long) *data++) << 16);
+	    ins->oprs[c-040].offset |= (((long) *data++) << 24);
+	}
+	if (c >= 044 && c <= 046) {
+	    ins->oprs[c-044].offset = *data++;
+	    ins->oprs[c-044].offset |= (((unsigned) *data++) << 8);
+	    if (asize == 32) {
+		ins->oprs[c-044].offset |= (((long) *data++) << 16);
+		ins->oprs[c-044].offset |= (((long) *data++) << 24);
+	    }
+	    if (segsize != asize)
+		ins->oprs[c-044].addr_size = asize;
+	}
+	if (c >= 050 && c <= 052) {
+	    ins->oprs[c-050].offset = (signed char) *data++;
+	    ins->oprs[c-050].segment |= SEG_RELATIVE;
+	}
+	if (c >= 060 && c <= 062) {
+	    ins->oprs[c-060].offset = *data++;
+	    ins->oprs[c-060].offset |= (((unsigned) *data++) << 8);
+	    ins->oprs[c-060].segment |= SEG_RELATIVE;
+	    ins->oprs[c-060].segment &= ~SEG_32BIT;
+	}
+	if (c >= 064 && c <= 066) {
+	    ins->oprs[c-064].offset = *data++;
+	    ins->oprs[c-064].offset |= (((unsigned) *data++) << 8);
+	    if (osize == 32) {
+		ins->oprs[c-064].offset |= (((long) *data++) << 16);
+		ins->oprs[c-064].offset |= (((long) *data++) << 24);
+		ins->oprs[c-064].segment |= SEG_32BIT;
+	    } else
+		ins->oprs[c-064].segment &= ~SEG_32BIT;
+	    ins->oprs[c-064].segment |= SEG_RELATIVE;
+	    if (segsize != osize) {
+	        ins->oprs[c-064].type =
+		    (ins->oprs[c-064].type & NON_SIZE)
+		    | ((osize == 16) ? BITS16 : BITS32);
+	    }
+	}
+	if (c >= 070 && c <= 072) {
+	    ins->oprs[c-070].offset = *data++;
+	    ins->oprs[c-070].offset |= (((unsigned) *data++) << 8);
+	    ins->oprs[c-070].offset |= (((long) *data++) << 16);
+	    ins->oprs[c-070].offset |= (((long) *data++) << 24);
+	    ins->oprs[c-070].segment |= SEG_32BIT | SEG_RELATIVE;
+	}
+	if (c >= 0100 && c < 0130) {
+	    int modrm = *data++;
+	    ins->oprs[c & 07].basereg = (modrm >> 3) & 07;
+	    ins->oprs[c & 07].segment |= SEG_RMREG;
+	    data = do_ea (data, modrm, asize, segsize,
+			  &ins->oprs[(c >> 3) & 07]);
+	}
+	if (c >= 0130 && c <= 0132) {
+	    ins->oprs[c-0130].offset = *data++;
+	    ins->oprs[c-0130].offset |= (((unsigned) *data++) << 8);
+	}
+	if (c >= 0140 && c <= 0142) {
+	    ins->oprs[c-0140].offset = *data++;
+	    ins->oprs[c-0140].offset |= (((unsigned) *data++) << 8);
+	    ins->oprs[c-0140].offset |= (((long) *data++) << 16);
+	    ins->oprs[c-0140].offset |= (((long) *data++) << 24);
+	}
+	if (c >= 0200 && c <= 0277) {
+	    int modrm = *data++;
+	    if (((modrm >> 3) & 07) != (c & 07))
+		return FALSE;	       /* spare field doesn't match up */
+	    data = do_ea (data, modrm, asize, segsize,
+			  &ins->oprs[(c >> 3) & 07]);
+	}
+	if (c >= 0300 && c <= 0302) {
+	    if (asize)
+		ins->oprs[c-0300].segment |= SEG_32BIT;
+	    else
+		ins->oprs[c-0300].segment &= ~SEG_32BIT;
+	    a_used = TRUE;
+	}
+	if (c == 0310) {
+	    if (asize == 32)
+		return FALSE;
+	    else
+		a_used = TRUE;
+	}
+	if (c == 0311) {
+	    if (asize == 16)
+		return FALSE;
+	    else
+		a_used = TRUE;
+	}
+	if (c == 0312) {
+	    if (asize != segsize)
+		return FALSE;
+	    else
+		a_used = TRUE;
+	}
+	if (c == 0320) {
+	    if (osize == 32)
+		return FALSE;
+	    else
+		o_used = TRUE;
+	}
+	if (c == 0321) {
+	    if (osize == 16)
+		return FALSE;
+	    else
+		o_used = TRUE;
+	}
+	if (c == 0322) {
+	    if (osize != segsize)
+		return FALSE;
+	    else
+		o_used = TRUE;
+	}
+	if (c == 0330) {
+	    int t = *r++, d = *data++;
+	    if (d < t || d > t+15)
+		return FALSE;
+	    else
+		ins->condition = d - t;
+	}
+	if (c == 0331) {
+	    if ( rep )
+	        return FALSE;
+	}
+	if (c == 0332) {
+	    if (drep == P_REP)
+	        drep = P_REPE;
+	}
+	if (c == 0333) {
+	    if ( rep != 0xF3 )
+	        return FALSE;
+	    drep = 0;
+	}
+    }
+
+    /*
+     * Check for unused rep or a/o prefixes.
+     */
+    ins->nprefix = 0;
+    if (drep)
+        ins->prefixes[ins->nprefix++] = drep;
+    if (!a_used && asize != segsize)
+	ins->prefixes[ins->nprefix++] = (asize == 16 ? P_A16 : P_A32);
+    if (!o_used && osize != segsize)
+	ins->prefixes[ins->nprefix++] = (osize == 16 ? P_O16 : P_O32);
+
+    return data - origdata;
+}
+
+long disasm (unsigned char *data, char *output, int segsize, long offset,
+	     int autosync, unsigned long prefer)
+{
+    struct itemplate **p, **best_p;
+    int length, best_length = 0;
+    char *segover;
+    int rep, lock, asize, osize, i, slen, colon;
+    unsigned char *origdata;
+    int works;
+    insn tmp_ins, ins;
+    unsigned long goodness, best;
+
+    /*
+     * Scan for prefixes.
+     */
+    asize = osize = segsize;
+    segover = NULL;
+    rep = lock = 0;
+    origdata = data;
+    for (;;) {
+	if (*data == 0xF3 || *data == 0xF2)
+	    rep = *data++;
+	else if (*data == 0xF0)
+	    lock = *data++;
+	else if (*data == 0x2E || *data == 0x36 || *data == 0x3E ||
+		 *data == 0x26 || *data == 0x64 || *data == 0x65) {
+	    switch (*data++) {
+	      case 0x2E: segover = "cs"; break;
+	      case 0x36: segover = "ss"; break;
+	      case 0x3E: segover = "ds"; break;
+	      case 0x26: segover = "es"; break;
+	      case 0x64: segover = "fs"; break;
+	      case 0x65: segover = "gs"; break;
+	    }
+	} else if (*data == 0x66)
+	    osize = 48 - segsize, data++;
+	else if (*data == 0x67)
+	    asize = 48 - segsize, data++;
+	else
+	    break;
+    }
+
+    tmp_ins.oprs[0].segment = tmp_ins.oprs[1].segment =
+    tmp_ins.oprs[2].segment =
+    tmp_ins.oprs[0].addr_size = tmp_ins.oprs[1].addr_size =
+      tmp_ins.oprs[2].addr_size = (segsize == 16 ? 0 : SEG_32BIT);
+    tmp_ins.condition = -1;
+    best = ~0UL;		/* Worst possible */
+    best_p = NULL;
+    for (p = itable[*data]; *p; p++) {
+      if ( (length = matches(*p, data, asize, osize,
+			     segsize, rep, &tmp_ins)) ) {
+	works = TRUE;
+	/*
+	 * Final check to make sure the types of r/m match up.
+	 */
+	for (i = 0; i < (*p)->operands; i++) {
+	  if (
+	      /* If it's a mem-only EA but we have a register, die. */
+	      ((tmp_ins.oprs[i].segment & SEG_RMREG) &&
+	       !(MEMORY & ~(*p)->opd[i])) ||
+
+	      /* If it's a reg-only EA but we have a memory ref, die. */
+	      (!(tmp_ins.oprs[i].segment & SEG_RMREG) &&
+	       !(REGNORM & ~(*p)->opd[i]) &&
+	       !((*p)->opd[i] & REG_SMASK)) ||
+
+	      /* Register type mismatch (eg FS vs REG_DESS): die. */
+	      ((((*p)->opd[i] & (REGISTER | FPUREG)) ||
+		(tmp_ins.oprs[i].segment & SEG_RMREG)) &&
+	       !whichreg ((*p)->opd[i], tmp_ins.oprs[i].basereg))) {
+	    works = FALSE;
+	    break;
+	  }
+	}
+
+	if (works) {
+	  goodness = ((*p)->flags & IF_PFMASK) ^ prefer;
+	  if ( goodness < best ) {
+	    /* This is the best one found so far */
+	    best        = goodness;
+	    best_p      = p;
+	    best_length = length;
+	    ins         = tmp_ins;
+	  }
+	}
+      }
+    }
+
+    if (!best_p)
+	return 0;		       /* no instruction was matched */
+
+    /* Pick the best match */
+    p      = best_p;
+    length = best_length;
+
+    slen = 0;
+
+    if (lock)
+	slen += sprintf(output+slen, "lock ");
+    for (i = 0; i < ins.nprefix; i++)
+	switch (ins.prefixes[i]) {
+	  case P_REP:   slen += sprintf(output+slen, "rep "); break;
+	  case P_REPE:  slen += sprintf(output+slen, "repe "); break;
+	  case P_REPNE: slen += sprintf(output+slen, "repne "); break;
+	  case P_A16:   slen += sprintf(output+slen, "a16 "); break;
+	  case P_A32:   slen += sprintf(output+slen, "a32 "); break;
+	  case P_O16:   slen += sprintf(output+slen, "o16 "); break;
+	  case P_O32:   slen += sprintf(output+slen, "o32 "); break;
+	}
+
+    for (i = 0; i < elements(ico); i++)
+	if ((*p)->opcode == ico[i]) {
+	    slen += sprintf(output+slen, "%s%s", icn[i],
+			    whichcond(ins.condition));
+	    break;
+	}
+    if (i >= elements(ico))
+	slen += sprintf(output+slen, "%s", insn_names[(*p)->opcode]);
+    colon = FALSE;
+    length += data - origdata;	       /* fix up for prefixes */
+    for (i=0; i<(*p)->operands; i++) {
+	output[slen++] = (colon ? ':' : i==0 ? ' ' : ',');
+
+	if (ins.oprs[i].segment & SEG_RELATIVE) {
+	    ins.oprs[i].offset += offset + length;
+	    /*
+	     * sort out wraparound
+	     */
+	    if (!(ins.oprs[i].segment & SEG_32BIT))
+		ins.oprs[i].offset &= 0xFFFF;
+	    /*
+	     * add sync marker, if autosync is on
+	     */
+	    if (autosync)
+		add_sync (ins.oprs[i].offset, 0L);
+	}
+
+	if ((*p)->opd[i] & COLON)
+	    colon = TRUE;
+	else
+	    colon = FALSE;
+
+	if (((*p)->opd[i] & (REGISTER | FPUREG)) ||
+	    (ins.oprs[i].segment & SEG_RMREG))
+	{
+	    ins.oprs[i].basereg = whichreg ((*p)->opd[i],
+					    ins.oprs[i].basereg);
+	    if ( (*p)->opd[i] & TO )
+		slen += sprintf(output+slen, "to ");
+	    slen += sprintf(output+slen, "%s",
+			    reg_names[ins.oprs[i].basereg-EXPR_REG_START]);
+	} else if (!(UNITY & ~(*p)->opd[i])) {
+	    output[slen++] = '1';
+	} else if ( (*p)->opd[i] & IMMEDIATE ) {
+	    if ( (*p)->opd[i] & BITS8 ) {
+		slen += sprintf(output+slen, "byte ");
+		if (ins.oprs[i].segment & SEG_SIGNED) {
+		    if (ins.oprs[i].offset < 0) {
+			ins.oprs[i].offset *= -1;
+			output[slen++] = '-';
+		    } else
+			output[slen++] = '+';
+		}
+	    } else if ( (*p)->opd[i] & BITS16 ) {
+		slen += sprintf(output+slen, "word ");
+	    } else if ( (*p)->opd[i] & BITS32 ) {
+		slen += sprintf(output+slen, "dword ");
+	    } else if ( (*p)->opd[i] & NEAR ) {
+		slen += sprintf(output+slen, "near ");
+	    } else if ( (*p)->opd[i] & SHORT ) {
+		slen += sprintf(output+slen, "short ");
+	    }
+	    slen += sprintf(output+slen, "0x%lx", ins.oprs[i].offset);
+	} else if ( !(MEM_OFFS & ~(*p)->opd[i]) ) {
+	    slen += sprintf(output+slen, "[%s%s%s0x%lx]",
+			    (segover ? segover : ""),
+			    (segover ? ":" : ""),
+			    (ins.oprs[i].addr_size == 32 ? "dword " :
+			     ins.oprs[i].addr_size == 16 ? "word " : ""),
+			    ins.oprs[i].offset);
+	    segover = NULL;
+	} else if ( !(REGMEM & ~(*p)->opd[i]) ) {
+	    int started = FALSE;
+	    if ( (*p)->opd[i] & BITS8 )
+		slen += sprintf(output+slen, "byte ");
+	    if ( (*p)->opd[i] & BITS16 )
+		slen += sprintf(output+slen, "word ");
+	    if ( (*p)->opd[i] & BITS32 )
+		slen += sprintf(output+slen, "dword ");
+	    if ( (*p)->opd[i] & BITS64 )
+		slen += sprintf(output+slen, "qword ");
+	    if ( (*p)->opd[i] & BITS80 )
+		slen += sprintf(output+slen, "tword ");
+	    if ( (*p)->opd[i] & FAR )
+		slen += sprintf(output+slen, "far ");
+	    if ( (*p)->opd[i] & NEAR )
+		slen += sprintf(output+slen, "near ");
+	    output[slen++] = '[';
+	    if (ins.oprs[i].addr_size)
+		slen += sprintf(output+slen, "%s",
+				(ins.oprs[i].addr_size == 32 ? "dword " :
+				 ins.oprs[i].addr_size == 16 ? "word " : ""));
+	    if (segover) {
+		slen += sprintf(output+slen, "%s:", segover);
+		segover = NULL;
+	    }
+	    if (ins.oprs[i].basereg != -1) {
+		slen += sprintf(output+slen, "%s",
+				reg_names[(ins.oprs[i].basereg -
+					   EXPR_REG_START)]);
+		started = TRUE;
+	    }
+	    if (ins.oprs[i].indexreg != -1) {
+		if (started)
+		    output[slen++] = '+';
+		slen += sprintf(output+slen, "%s",
+				reg_names[(ins.oprs[i].indexreg -
+					   EXPR_REG_START)]);
+		if (ins.oprs[i].scale > 1)
+		    slen += sprintf(output+slen, "*%d", ins.oprs[i].scale);
+		started = TRUE;
+	    }
+	    if (ins.oprs[i].segment & SEG_DISP8) {
+		int sign = '+';
+		if (ins.oprs[i].offset & 0x80) {
+		    ins.oprs[i].offset = - (signed char) ins.oprs[i].offset;
+		    sign = '-';
+		}
+		slen += sprintf(output+slen, "%c0x%lx", sign,
+				ins.oprs[i].offset);
+	    } else if (ins.oprs[i].segment & SEG_DISP16) {
+		if (started)
+		    output[slen++] = '+';
+		slen += sprintf(output+slen, "0x%lx", ins.oprs[i].offset);
+	    } else if (ins.oprs[i].segment & SEG_DISP32) {
+		if (started)
+		    output[slen++] = '+';
+		slen += sprintf(output+slen, "0x%lx", ins.oprs[i].offset);
+	    }
+	    output[slen++] = ']';
+	} else {
+	    slen += sprintf(output+slen, "<operand%d>", i);
+	}
+    }
+    output[slen] = '\0';
+    if (segover) {		       /* unused segment override */
+	char *p = output;
+	int count = slen+1;
+	while (count--)
+	    p[count+3] = p[count];
+	strncpy (output, segover, 2);
+	output[2] = ' ';
+    }
+    return length;
+}
+
+long eatbyte (unsigned char *data, char *output)
+{
+    sprintf(output, "db 0x%02X", *data);
+    return 1;
+}
diff --git a/uppsrc/plugin/ndisasm/lib/disasm.h b/uppsrc/plugin/ndisasm/lib/disasm.h
new file mode 100644
index 000000000..16cdbda08
--- /dev/null
+++ b/uppsrc/plugin/ndisasm/lib/disasm.h
@@ -0,0 +1,18 @@
+/* disasm.h   header file for disasm.c
+ *
+ * The Netwide Assembler is copyright (C) 1996 Simon Tatham and
+ * Julian Hall. All rights reserved. The software is
+ * redistributable under the licence given in the file "Licence"
+ * distributed in the NASM archive.
+ */
+
+#ifndef NASM_DISASM_H
+#define NASM_DISASM_H
+
+#define INSN_MAX 32	/* one instruction can't be longer than this */
+
+long disasm (unsigned char *data, char *output, int segsize, long offset,
+	     int autosync, unsigned long prefer);
+long eatbyte (unsigned char *data, char *output);
+
+#endif
diff --git a/uppsrc/plugin/ndisasm/lib/insns.h b/uppsrc/plugin/ndisasm/lib/insns.h
new file mode 100644
index 000000000..dfa30cac2
--- /dev/null
+++ b/uppsrc/plugin/ndisasm/lib/insns.h
@@ -0,0 +1,99 @@
+/* insns.h   header file for insns.c
+ * $Id: insns.h,v 1.1 2005/02/07 00:26:03 rylek Exp $
+ *
+ * The Netwide Assembler is copyright (C) 1996 Simon Tatham and
+ * Julian Hall. All rights reserved. The software is
+ * redistributable under the licence given in the file "Licence"
+ * distributed in the NASM archive.
+ */
+
+#ifndef NASM_INSNS_H
+#define NASM_INSNS_H
+
+#include "insnsi.h"		       /* instruction opcode enum */
+
+/* max length of any instruction, register name etc. */
+#if MAX_INSLEN > 9		/* MAX_INSLEN defined in insnsi.h */
+#define MAX_KEYWORD MAX_INSLEN
+#else
+#define MAX_KEYWORD 9
+#endif
+
+struct itemplate {
+    int opcode;			       /* the token, passed from "parser.c" */
+    int operands;		       /* number of operands */
+    long opd[3];		       /* bit flags for operand types */
+    const char *code;		   /* the code it assembles to */
+    unsigned long flags;	       /* some flags */
+};
+
+/*
+ * this define is used to signify the end of an itemplate
+ */
+#define ITEMPLATE_END {-1,-1,{-1,-1,-1},NULL,0}
+
+/*
+ * Instruction template flags. These specify which processor
+ * targets the instruction is eligible for, whether it is
+ * privileged or undocumented, and also specify extra error
+ * checking on the matching of the instruction.
+ *
+ * IF_SM stands for Size Match: any operand whose size is not
+ * explicitly specified by the template is `really' intended to be
+ * the same size as the first size-specified operand.
+ * Non-specification is tolerated in the input instruction, but
+ * _wrong_ specification is not.
+ *
+ * IF_SM2 invokes Size Match on only the first _two_ operands, for
+ * three-operand instructions such as SHLD: it implies that the
+ * first two operands must match in size, but that the third is
+ * required to be _unspecified_.
+ *
+ * IF_SB invokes Size Byte: operands with unspecified size in the
+ * template are really bytes, and so no non-byte specification in
+ * the input instruction will be tolerated. IF_SW similarly invokes
+ * Size Word, and IF_SD invokes Size Doubleword.
+ *
+ * (The default state if neither IF_SM nor IF_SM2 is specified is
+ * that any operand with unspecified size in the template is
+ * required to have unspecified size in the instruction too...)
+ */
+
+#define IF_SM     0x00000001UL	       /* size match */
+#define IF_SM2    0x00000002UL	       /* size match first two operands */
+#define IF_SB     0x00000004UL	       /* unsized operands can't be non-byte */
+#define IF_SW     0x00000008UL	       /* unsized operands can't be non-word */
+#define IF_SD     0x00000010UL	       /* unsized operands can't be nondword */
+#define IF_AR0	  0x00000020UL	       /* SB, SW, SD applies to argument 0 */
+#define IF_AR1	  0x00000040UL	       /* SB, SW, SD applies to argument 1 */
+#define IF_AR2	  0x00000060UL	       /* SB, SW, SD applies to argument 2 */
+#define IF_ARMASK 0x00000060UL         /* mask for unsized argument spec */
+#define IF_PRIV   0x00000100UL	       /* it's a privileged instruction */
+#define IF_SMM    0x00000200UL	       /* it's only valid in SMM */
+#define IF_PROT   0x00000400UL         /* it's protected mode only */
+#define IF_UNDOC  0x00001000UL	       /* it's an undocumented instruction */
+#define IF_FPU    0x00002000UL	       /* it's an FPU instruction */
+#define IF_MMX    0x00004000UL	       /* it's an MMX instruction */
+#define IF_3DNOW  0x00008000UL	       /* it's a 3DNow! instruction */
+#define IF_SSE    0x00010000UL	       /* it's a SSE (KNI, MMX2) instruction */
+#define IF_SSE2   0x00020000UL	       /* it's a SSE2 instruction */
+#define IF_SSE3   0x00040000UL	       /* it's a SSE3 (PNI) instruction */
+#define IF_PMASK  0xFF000000UL	       /* the mask for processor types */
+#define IF_PLEVEL 0x0F000000UL         /* the mask for processor instr. level */
+					/* also the highest possible processor */
+#define IF_PFMASK 0xF001FF00UL	       /* the mask for disassembly "prefer" */
+#define IF_8086   0x00000000UL	       /* 8086 instruction */
+#define IF_186    0x01000000UL	       /* 186+ instruction */
+#define IF_286    0x02000000UL	       /* 286+ instruction */
+#define IF_386    0x03000000UL	       /* 386+ instruction */
+#define IF_486    0x04000000UL	       /* 486+ instruction */
+#define IF_PENT   0x05000000UL	       /* Pentium instruction */
+#define IF_P6     0x06000000UL	       /* P6 instruction */
+#define IF_KATMAI 0x07000000UL         /* Katmai instructions */
+#define IF_WILLAMETTE 0x08000000UL         /* Willamette instructions */
+#define IF_PRESCOTT   0x09000000UL     /* Prescott instructions */
+#define IF_IA64   0x0F000000UL	       /* IA64 instructions */
+#define IF_CYRIX  0x10000000UL	       /* Cyrix-specific instruction */
+#define IF_AMD    0x20000000UL	       /* AMD-specific instruction */
+
+#endif
diff --git a/uppsrc/plugin/ndisasm/lib/insnsd.c b/uppsrc/plugin/ndisasm/lib/insnsd.c
new file mode 100644
index 000000000..1870828af
--- /dev/null
+++ b/uppsrc/plugin/ndisasm/lib/insnsd.c
@@ -0,0 +1,4516 @@
+/* This file auto-generated from insns.dat by insns.pl - don't edit it */
+
+#include "nasm.h"
+#include "insns.h"
+
+static struct itemplate instrux[] = {
+    {I_AAA, 0, {0,0,0}, "\1\x37", IF_8086},
+    {I_AAD, 0, {0,0,0}, "\2\xD5\x0A", IF_8086},
+    {I_AAD, 1, {IMMEDIATE,0,0}, "\1\xD5\24", IF_8086|IF_SB},
+    {I_AAM, 0, {0,0,0}, "\2\xD4\x0A", IF_8086},
+    {I_AAM, 1, {IMMEDIATE,0,0}, "\1\xD4\24", IF_8086|IF_SB},
+    {I_AAS, 0, {0,0,0}, "\1\x3F", IF_8086},
+    {I_ADC, 2, {MEMORY,REG8,0}, "\300\1\x10\101", IF_8086|IF_SM},
+    {I_ADC, 2, {REG8,REG8,0}, "\1\x10\101", IF_8086},
+    {I_ADC, 2, {MEMORY,REG16,0}, "\320\300\1\x11\101", IF_8086|IF_SM},
+    {I_ADC, 2, {REG16,REG16,0}, "\320\1\x11\101", IF_8086},
+    {I_ADC, 2, {MEMORY,REG32,0}, "\321\300\1\x11\101", IF_386|IF_SM},
+    {I_ADC, 2, {REG32,REG32,0}, "\321\1\x11\101", IF_386},
+    {I_ADC, 2, {REG8,MEMORY,0}, "\301\1\x12\110", IF_8086|IF_SM},
+    {I_ADC, 2, {REG8,REG8,0}, "\1\x12\110", IF_8086},
+    {I_ADC, 2, {REG16,MEMORY,0}, "\320\301\1\x13\110", IF_8086|IF_SM},
+    {I_ADC, 2, {REG16,REG16,0}, "\320\1\x13\110", IF_8086},
+    {I_ADC, 2, {REG32,MEMORY,0}, "\321\301\1\x13\110", IF_386|IF_SM},
+    {I_ADC, 2, {REG32,REG32,0}, "\321\1\x13\110", IF_386},
+    {I_ADC, 2, {REGMEM|BITS16,IMMEDIATE|BITS8,0}, "\320\300\1\x83\202\15", IF_8086},
+    {I_ADC, 2, {REGMEM|BITS32,IMMEDIATE|BITS8,0}, "\321\300\1\x83\202\15", IF_386},
+    {I_ADC, 2, {REG_AL,IMMEDIATE,0}, "\1\x14\21", IF_8086|IF_SM},
+    {I_ADC, 2, {REG_AX,IMMEDIATE,0}, "\320\1\x15\31", IF_8086|IF_SM},
+    {I_ADC, 2, {REG_EAX,IMMEDIATE,0}, "\321\1\x15\41", IF_386|IF_SM},
+    {I_ADC, 2, {REGMEM|BITS8,IMMEDIATE,0}, "\300\1\x80\202\21", IF_8086|IF_SM},
+    {I_ADC, 2, {REGMEM|BITS16,IMMEDIATE,0}, "\320\300\134\1\x81\202\131", IF_8086|IF_SM},
+    {I_ADC, 2, {REGMEM|BITS32,IMMEDIATE,0}, "\321\300\144\1\x81\202\141", IF_386|IF_SM},
+    {I_ADC, 2, {MEMORY,IMMEDIATE|BITS8,0}, "\300\1\x80\202\21", IF_8086|IF_SM},
+    {I_ADC, 2, {MEMORY,IMMEDIATE|BITS16,0}, "\320\300\134\1\x81\202\131", IF_8086|IF_SM},
+    {I_ADC, 2, {MEMORY,IMMEDIATE|BITS32,0}, "\321\300\144\1\x81\202\141", IF_386|IF_SM},
+    {I_ADD, 2, {MEMORY,REG8,0}, "\300\17\101", IF_8086|IF_SM},
+    {I_ADD, 2, {REG8,REG8,0}, "\17\101", IF_8086},
+    {I_ADD, 2, {MEMORY,REG16,0}, "\320\300\1\x01\101", IF_8086|IF_SM},
+    {I_ADD, 2, {REG16,REG16,0}, "\320\1\x01\101", IF_8086},
+    {I_ADD, 2, {MEMORY,REG32,0}, "\321\300\1\x01\101", IF_386|IF_SM},
+    {I_ADD, 2, {REG32,REG32,0}, "\321\1\x01\101", IF_386},
+    {I_ADD, 2, {REG8,MEMORY,0}, "\301\1\x02\110", IF_8086|IF_SM},
+    {I_ADD, 2, {REG8,REG8,0}, "\1\x02\110", IF_8086},
+    {I_ADD, 2, {REG16,MEMORY,0}, "\320\301\1\x03\110", IF_8086|IF_SM},
+    {I_ADD, 2, {REG16,REG16,0}, "\320\1\x03\110", IF_8086},
+    {I_ADD, 2, {REG32,MEMORY,0}, "\321\301\1\x03\110", IF_386|IF_SM},
+    {I_ADD, 2, {REG32,REG32,0}, "\321\1\x03\110", IF_386},
+    {I_ADD, 2, {REGMEM|BITS16,IMMEDIATE|BITS8,0}, "\320\300\1\x83\200\15", IF_8086},
+    {I_ADD, 2, {REGMEM|BITS32,IMMEDIATE|BITS8,0}, "\321\300\1\x83\200\15", IF_386},
+    {I_ADD, 2, {REG_AL,IMMEDIATE,0}, "\1\x04\21", IF_8086|IF_SM},
+    {I_ADD, 2, {REG_AX,IMMEDIATE,0}, "\320\1\x05\31", IF_8086|IF_SM},
+    {I_ADD, 2, {REG_EAX,IMMEDIATE,0}, "\321\1\x05\41", IF_386|IF_SM},
+    {I_ADD, 2, {REGMEM|BITS8,IMMEDIATE,0}, "\300\1\x80\200\21", IF_8086|IF_SM},
+    {I_ADD, 2, {REGMEM|BITS16,IMMEDIATE,0}, "\320\300\134\1\x81\200\131", IF_8086|IF_SM},
+    {I_ADD, 2, {REGMEM|BITS32,IMMEDIATE,0}, "\321\300\144\1\x81\200\141", IF_386|IF_SM},
+    {I_ADD, 2, {MEMORY,IMMEDIATE|BITS8,0}, "\300\1\x80\200\21", IF_8086|IF_SM},
+    {I_ADD, 2, {MEMORY,IMMEDIATE|BITS16,0}, "\320\300\134\1\x81\200\131", IF_8086|IF_SM},
+    {I_ADD, 2, {MEMORY,IMMEDIATE|BITS32,0}, "\321\300\144\1\x81\200\141", IF_386|IF_SM},
+    {I_AND, 2, {MEMORY,REG8,0}, "\300\1\x20\101", IF_8086|IF_SM},
+    {I_AND, 2, {REG8,REG8,0}, "\1\x20\101", IF_8086},
+    {I_AND, 2, {MEMORY,REG16,0}, "\320\300\1\x21\101", IF_8086|IF_SM},
+    {I_AND, 2, {REG16,REG16,0}, "\320\1\x21\101", IF_8086},
+    {I_AND, 2, {MEMORY,REG32,0}, "\321\300\1\x21\101", IF_386|IF_SM},
+    {I_AND, 2, {REG32,REG32,0}, "\321\1\x21\101", IF_386},
+    {I_AND, 2, {REG8,MEMORY,0}, "\301\1\x22\110", IF_8086|IF_SM},
+    {I_AND, 2, {REG8,REG8,0}, "\1\x22\110", IF_8086},
+    {I_AND, 2, {REG16,MEMORY,0}, "\320\301\1\x23\110", IF_8086|IF_SM},
+    {I_AND, 2, {REG16,REG16,0}, "\320\1\x23\110", IF_8086},
+    {I_AND, 2, {REG32,MEMORY,0}, "\321\301\1\x23\110", IF_386|IF_SM},
+    {I_AND, 2, {REG32,REG32,0}, "\321\1\x23\110", IF_386},
+    {I_AND, 2, {REGMEM|BITS16,IMMEDIATE|BITS8,0}, "\320\300\1\x83\204\15", IF_8086},
+    {I_AND, 2, {REGMEM|BITS32,IMMEDIATE|BITS8,0}, "\321\300\1\x83\204\15", IF_386},
+    {I_AND, 2, {REG_AL,IMMEDIATE,0}, "\1\x24\21", IF_8086|IF_SM},
+    {I_AND, 2, {REG_AX,IMMEDIATE,0}, "\320\1\x25\31", IF_8086|IF_SM},
+    {I_AND, 2, {REG_EAX,IMMEDIATE,0}, "\321\1\x25\41", IF_386|IF_SM},
+    {I_AND, 2, {REGMEM|BITS8,IMMEDIATE,0}, "\300\1\x80\204\21", IF_8086|IF_SM},
+    {I_AND, 2, {REGMEM|BITS16,IMMEDIATE,0}, "\320\300\134\1\x81\204\131", IF_8086|IF_SM},
+    {I_AND, 2, {REGMEM|BITS32,IMMEDIATE,0}, "\321\300\144\1\x81\204\141", IF_386|IF_SM},
+    {I_AND, 2, {MEMORY,IMMEDIATE|BITS8,0}, "\300\1\x80\204\21", IF_8086|IF_SM},
+    {I_AND, 2, {MEMORY,IMMEDIATE|BITS16,0}, "\320\300\134\1\x81\204\131", IF_8086|IF_SM},
+    {I_AND, 2, {MEMORY,IMMEDIATE|BITS32,0}, "\321\300\144\1\x81\204\141", IF_386|IF_SM},
+    {I_ARPL, 2, {MEMORY,REG16,0}, "\300\1\x63\101", IF_286|IF_PROT|IF_SM},
+    {I_ARPL, 2, {REG16,REG16,0}, "\1\x63\101", IF_286|IF_PROT},
+    {I_BOUND, 2, {REG16,MEMORY,0}, "\320\301\1\x62\110", IF_186},
+    {I_BOUND, 2, {REG32,MEMORY,0}, "\321\301\1\x62\110", IF_386},
+    {I_BSF, 2, {REG16,MEMORY,0}, "\320\301\2\x0F\xBC\110", IF_386|IF_SM},
+    {I_BSF, 2, {REG16,REG16,0}, "\320\2\x0F\xBC\110", IF_386},
+    {I_BSF, 2, {REG32,MEMORY,0}, "\321\301\2\x0F\xBC\110", IF_386|IF_SM},
+    {I_BSF, 2, {REG32,REG32,0}, "\321\2\x0F\xBC\110", IF_386},
+    {I_BSR, 2, {REG16,MEMORY,0}, "\320\301\2\x0F\xBD\110", IF_386|IF_SM},
+    {I_BSR, 2, {REG16,REG16,0}, "\320\2\x0F\xBD\110", IF_386},
+    {I_BSR, 2, {REG32,MEMORY,0}, "\321\301\2\x0F\xBD\110", IF_386|IF_SM},
+    {I_BSR, 2, {REG32,REG32,0}, "\321\2\x0F\xBD\110", IF_386},
+    {I_BSWAP, 1, {REG32,0,0}, "\321\1\x0F\10\xC8", IF_486},
+    {I_BT, 2, {MEMORY,REG16,0}, "\320\300\2\x0F\xA3\101", IF_386|IF_SM},
+    {I_BT, 2, {REG16,REG16,0}, "\320\2\x0F\xA3\101", IF_386},
+    {I_BT, 2, {MEMORY,REG32,0}, "\321\300\2\x0F\xA3\101", IF_386|IF_SM},
+    {I_BT, 2, {REG32,REG32,0}, "\321\2\x0F\xA3\101", IF_386},
+    {I_BT, 2, {REGMEM|BITS16,IMMEDIATE,0}, "\320\300\2\x0F\xBA\204\25", IF_386|IF_SB},
+    {I_BT, 2, {REGMEM|BITS32,IMMEDIATE,0}, "\321\300\2\x0F\xBA\204\25", IF_386|IF_SB},
+    {I_BTC, 2, {MEMORY,REG16,0}, "\320\300\2\x0F\xBB\101", IF_386|IF_SM},
+    {I_BTC, 2, {REG16,REG16,0}, "\320\2\x0F\xBB\101", IF_386},
+    {I_BTC, 2, {MEMORY,REG32,0}, "\321\300\2\x0F\xBB\101", IF_386|IF_SM},
+    {I_BTC, 2, {REG32,REG32,0}, "\321\2\x0F\xBB\101", IF_386},
+    {I_BTC, 2, {REGMEM|BITS16,IMMEDIATE,0}, "\320\300\2\x0F\xBA\207\25", IF_386|IF_SB},
+    {I_BTC, 2, {REGMEM|BITS32,IMMEDIATE,0}, "\321\300\2\x0F\xBA\207\25", IF_386|IF_SB},
+    {I_BTR, 2, {MEMORY,REG16,0}, "\320\300\2\x0F\xB3\101", IF_386|IF_SM},
+    {I_BTR, 2, {REG16,REG16,0}, "\320\2\x0F\xB3\101", IF_386},
+    {I_BTR, 2, {MEMORY,REG32,0}, "\321\300\2\x0F\xB3\101", IF_386|IF_SM},
+    {I_BTR, 2, {REG32,REG32,0}, "\321\2\x0F\xB3\101", IF_386},
+    {I_BTR, 2, {REGMEM|BITS16,IMMEDIATE,0}, "\320\300\2\x0F\xBA\206\25", IF_386|IF_SB},
+    {I_BTR, 2, {REGMEM|BITS32,IMMEDIATE,0}, "\321\300\2\x0F\xBA\206\25", IF_386|IF_SB},
+    {I_BTS, 2, {MEMORY,REG16,0}, "\320\300\2\x0F\xAB\101", IF_386|IF_SM},
+    {I_BTS, 2, {REG16,REG16,0}, "\320\2\x0F\xAB\101", IF_386},
+    {I_BTS, 2, {MEMORY,REG32,0}, "\321\300\2\x0F\xAB\101", IF_386|IF_SM},
+    {I_BTS, 2, {REG32,REG32,0}, "\321\2\x0F\xAB\101", IF_386},
+    {I_BTS, 2, {REGMEM|BITS16,IMMEDIATE,0}, "\320\300\2\x0F\xBA\205\25", IF_386|IF_SB},
+    {I_BTS, 2, {REGMEM|BITS32,IMMEDIATE,0}, "\321\300\2\x0F\xBA\205\25", IF_386|IF_SB},
+    {I_CALL, 1, {IMMEDIATE,0,0}, "\322\1\xE8\64", IF_8086},
+    {I_CALL, 1, {IMMEDIATE|NEAR,0,0}, "\322\1\xE8\64", IF_8086},
+    {I_CALL, 1, {IMMEDIATE|BITS16,0,0}, "\320\1\xE8\64", IF_8086},
+    {I_CALL, 1, {IMMEDIATE|BITS16|NEAR,0,0}, "\320\1\xE8\64", IF_8086},
+    {I_CALL, 1, {IMMEDIATE|BITS32,0,0}, "\321\1\xE8\64", IF_386},
+    {I_CALL, 1, {IMMEDIATE|BITS32|NEAR,0,0}, "\321\1\xE8\64", IF_386},
+    {I_CALL, 2, {IMMEDIATE|COLON,IMMEDIATE,0}, "\322\1\x9A\35\30", IF_8086},
+    {I_CALL, 2, {IMMEDIATE|BITS16|COLON,IMMEDIATE,0}, "\320\1\x9A\31\30", IF_8086},
+    {I_CALL, 2, {IMMEDIATE|COLON,IMMEDIATE|BITS16,0}, "\320\1\x9A\31\30", IF_8086},
+    {I_CALL, 2, {IMMEDIATE|BITS32|COLON,IMMEDIATE,0}, "\321\1\x9A\41\30", IF_386},
+    {I_CALL, 2, {IMMEDIATE|COLON,IMMEDIATE|BITS32,0}, "\321\1\x9A\41\30", IF_386},
+    {I_CALL, 1, {MEMORY|FAR,0,0}, "\322\300\1\xFF\203", IF_8086},
+    {I_CALL, 1, {MEMORY|BITS16|FAR,0,0}, "\320\300\1\xFF\203", IF_8086},
+    {I_CALL, 1, {MEMORY|BITS32|FAR,0,0}, "\321\300\1\xFF\203", IF_386},
+    {I_CALL, 1, {MEMORY|NEAR,0,0}, "\322\300\1\xFF\202", IF_8086},
+    {I_CALL, 1, {MEMORY|BITS16|NEAR,0,0}, "\320\300\1\xFF\202", IF_8086},
+    {I_CALL, 1, {MEMORY|BITS32|NEAR,0,0}, "\321\300\1\xFF\202", IF_386},
+    {I_CALL, 1, {REG16,0,0}, "\320\300\1\xFF\202", IF_8086},
+    {I_CALL, 1, {REG32,0,0}, "\321\300\1\xFF\202", IF_386},
+    {I_CALL, 1, {MEMORY,0,0}, "\322\300\1\xFF\202", IF_8086},
+    {I_CALL, 1, {MEMORY|BITS16,0,0}, "\320\300\1\xFF\202", IF_8086},
+    {I_CALL, 1, {MEMORY|BITS32,0,0}, "\321\300\1\xFF\202", IF_386},
+    {I_CBW, 0, {0,0,0}, "\320\1\x98", IF_8086},
+    {I_CDQ, 0, {0,0,0}, "\321\1\x99", IF_386},
+    {I_CLC, 0, {0,0,0}, "\1\xF8", IF_8086},
+    {I_CLD, 0, {0,0,0}, "\1\xFC", IF_8086},
+    {I_CLI, 0, {0,0,0}, "\1\xFA", IF_8086},
+    {I_CLTS, 0, {0,0,0}, "\2\x0F\x06", IF_286|IF_PRIV},
+    {I_CMC, 0, {0,0,0}, "\1\xF5", IF_8086},
+    {I_CMP, 2, {MEMORY,REG8,0}, "\300\1\x38\101", IF_8086|IF_SM},
+    {I_CMP, 2, {REG8,REG8,0}, "\1\x38\101", IF_8086},
+    {I_CMP, 2, {MEMORY,REG16,0}, "\320\300\1\x39\101", IF_8086|IF_SM},
+    {I_CMP, 2, {REG16,REG16,0}, "\320\1\x39\101", IF_8086},
+    {I_CMP, 2, {MEMORY,REG32,0}, "\321\300\1\x39\101", IF_386|IF_SM},
+    {I_CMP, 2, {REG32,REG32,0}, "\321\1\x39\101", IF_386},
+    {I_CMP, 2, {REG8,MEMORY,0}, "\301\1\x3A\110", IF_8086|IF_SM},
+    {I_CMP, 2, {REG8,REG8,0}, "\1\x3A\110", IF_8086},
+    {I_CMP, 2, {REG16,MEMORY,0}, "\320\301\1\x3B\110", IF_8086|IF_SM},
+    {I_CMP, 2, {REG16,REG16,0}, "\320\1\x3B\110", IF_8086},
+    {I_CMP, 2, {REG32,MEMORY,0}, "\321\301\1\x3B\110", IF_386|IF_SM},
+    {I_CMP, 2, {REG32,REG32,0}, "\321\1\x3B\110", IF_386},
+    {I_CMP, 2, {REGMEM|BITS16,IMMEDIATE|BITS8,0}, "\320\300\1\x83\207\15", IF_8086},
+    {I_CMP, 2, {REGMEM|BITS32,IMMEDIATE|BITS8,0}, "\321\300\1\x83\207\15", IF_386},
+    {I_CMP, 2, {REG_AL,IMMEDIATE,0}, "\1\x3C\21", IF_8086|IF_SM},
+    {I_CMP, 2, {REG_AX,IMMEDIATE,0}, "\320\1\x3D\31", IF_8086|IF_SM},
+    {I_CMP, 2, {REG_EAX,IMMEDIATE,0}, "\321\1\x3D\41", IF_386|IF_SM},
+    {I_CMP, 2, {REGMEM|BITS8,IMMEDIATE,0}, "\300\1\x80\207\21", IF_8086|IF_SM},
+    {I_CMP, 2, {REGMEM|BITS16,IMMEDIATE,0}, "\320\300\134\1\x81\207\131", IF_8086|IF_SM},
+    {I_CMP, 2, {REGMEM|BITS32,IMMEDIATE,0}, "\321\300\144\1\x81\207\141", IF_386|IF_SM},
+    {I_CMP, 2, {MEMORY,IMMEDIATE|BITS8,0}, "\300\1\x80\207\21", IF_8086|IF_SM},
+    {I_CMP, 2, {MEMORY,IMMEDIATE|BITS16,0}, "\320\300\134\1\x81\207\131", IF_8086|IF_SM},
+    {I_CMP, 2, {MEMORY,IMMEDIATE|BITS32,0}, "\321\300\144\1\x81\207\141", IF_386|IF_SM},
+    {I_CMPSB, 0, {0,0,0}, "\332\1\xA6", IF_8086},
+    {I_CMPSD, 0, {0,0,0}, "\332\321\1\xA7", IF_386},
+    {I_CMPSW, 0, {0,0,0}, "\332\320\1\xA7", IF_8086},
+    {I_CMPXCHG, 2, {MEMORY,REG8,0}, "\300\2\x0F\xB0\101", IF_PENT|IF_SM},
+    {I_CMPXCHG, 2, {REG8,REG8,0}, "\2\x0F\xB0\101", IF_PENT},
+    {I_CMPXCHG, 2, {MEMORY,REG16,0}, "\320\300\2\x0F\xB1\101", IF_PENT|IF_SM},
+    {I_CMPXCHG, 2, {REG16,REG16,0}, "\320\2\x0F\xB1\101", IF_PENT},
+    {I_CMPXCHG, 2, {MEMORY,REG32,0}, "\321\300\2\x0F\xB1\101", IF_PENT|IF_SM},
+    {I_CMPXCHG, 2, {REG32,REG32,0}, "\321\2\x0F\xB1\101", IF_PENT},
+    {I_CMPXCHG486, 2, {MEMORY,REG8,0}, "\300\2\x0F\xA6\101", IF_486|IF_SM|IF_UNDOC},
+    {I_CMPXCHG486, 2, {REG8,REG8,0}, "\2\x0F\xA6\101", IF_486|IF_UNDOC},
+    {I_CMPXCHG486, 2, {MEMORY,REG16,0}, "\320\300\2\x0F\xA7\101", IF_486|IF_SM|IF_UNDOC},
+    {I_CMPXCHG486, 2, {REG16,REG16,0}, "\320\2\x0F\xA7\101", IF_486|IF_UNDOC},
+    {I_CMPXCHG486, 2, {MEMORY,REG32,0}, "\321\300\2\x0F\xA7\101", IF_486|IF_SM|IF_UNDOC},
+    {I_CMPXCHG486, 2, {REG32,REG32,0}, "\321\2\x0F\xA7\101", IF_486|IF_UNDOC},
+    {I_CMPXCHG8B, 1, {MEMORY,0,0}, "\300\2\x0F\xC7\201", IF_PENT},
+    {I_CPUID, 0, {0,0,0}, "\2\x0F\xA2", IF_PENT},
+    {I_CWD, 0, {0,0,0}, "\320\1\x99", IF_8086},
+    {I_CWDE, 0, {0,0,0}, "\321\1\x98", IF_386},
+    {I_DAA, 0, {0,0,0}, "\1\x27", IF_8086},
+    {I_DAS, 0, {0,0,0}, "\1\x2F", IF_8086},
+    {I_DEC, 1, {REG16,0,0}, "\320\10\x48", IF_8086},
+    {I_DEC, 1, {REG32,0,0}, "\321\10\x48", IF_386},
+    {I_DEC, 1, {REGMEM|BITS8,0,0}, "\300\1\xFE\201", IF_8086},
+    {I_DEC, 1, {REGMEM|BITS16,0,0}, "\320\300\1\xFF\201", IF_8086},
+    {I_DEC, 1, {REGMEM|BITS32,0,0}, "\321\300\1\xFF\201", IF_386},
+    {I_DIV, 1, {REGMEM|BITS8,0,0}, "\300\1\xF6\206", IF_8086},
+    {I_DIV, 1, {REGMEM|BITS16,0,0}, "\320\300\1\xF7\206", IF_8086},
+    {I_DIV, 1, {REGMEM|BITS32,0,0}, "\321\300\1\xF7\206", IF_386},
+    {I_EMMS, 0, {0,0,0}, "\2\x0F\x77", IF_PENT|IF_MMX},
+    {I_ENTER, 2, {IMMEDIATE,IMMEDIATE,0}, "\1\xC8\30\25", IF_186},
+    {I_EQU, 1, {IMMEDIATE,0,0}, "\0", IF_8086},
+    {I_EQU, 2, {IMMEDIATE|COLON,IMMEDIATE,0}, "\0", IF_8086},
+    {I_F2XM1, 0, {0,0,0}, "\2\xD9\xF0", IF_8086|IF_FPU},
+    {I_FABS, 0, {0,0,0}, "\2\xD9\xE1", IF_8086|IF_FPU},
+    {I_FADD, 1, {MEMORY|BITS32,0,0}, "\300\1\xD8\200", IF_8086|IF_FPU},
+    {I_FADD, 1, {MEMORY|BITS64,0,0}, "\300\1\xDC\200", IF_8086|IF_FPU},
+    {I_FADD, 1, {FPUREG|TO,0,0}, "\1\xDC\10\xC0", IF_8086|IF_FPU},
+    {I_FADD, 1, {FPUREG,0,0}, "\1\xD8\10\xC0", IF_8086|IF_FPU},
+    {I_FADD, 2, {FPUREG,FPU0,0}, "\1\xDC\10\xC0", IF_8086|IF_FPU},
+    {I_FADD, 2, {FPU0,FPUREG,0}, "\1\xD8\11\xC0", IF_8086|IF_FPU},
+    {I_FADDP, 1, {FPUREG,0,0}, "\1\xDE\10\xC0", IF_8086|IF_FPU},
+    {I_FADDP, 2, {FPUREG,FPU0,0}, "\1\xDE\10\xC0", IF_8086|IF_FPU},
+    {I_FBLD, 1, {MEMORY|BITS80,0,0}, "\300\1\xDF\204", IF_8086|IF_FPU},
+    {I_FBLD, 1, {MEMORY,0,0}, "\300\1\xDF\204", IF_8086|IF_FPU},
+    {I_FBSTP, 1, {MEMORY|BITS80,0,0}, "\300\1\xDF\206", IF_8086|IF_FPU},
+    {I_FBSTP, 1, {MEMORY,0,0}, "\300\1\xDF\206", IF_8086|IF_FPU},
+    {I_FCHS, 0, {0,0,0}, "\2\xD9\xE0", IF_8086|IF_FPU},
+    {I_FCLEX, 0, {0,0,0}, "\3\x9B\xDB\xE2", IF_8086|IF_FPU},
+    {I_FCMOVB, 1, {FPUREG,0,0}, "\1\xDA\10\xC0", IF_P6|IF_FPU},
+    {I_FCMOVB, 2, {FPU0,FPUREG,0}, "\1\xDA\11\xC0", IF_P6|IF_FPU},
+    {I_FCMOVBE, 1, {FPUREG,0,0}, "\1\xDA\10\xD0", IF_P6|IF_FPU},
+    {I_FCMOVBE, 2, {FPU0,FPUREG,0}, "\1\xDA\11\xD0", IF_P6|IF_FPU},
+    {I_FCMOVE, 1, {FPUREG,0,0}, "\1\xDA\10\xC8", IF_P6|IF_FPU},
+    {I_FCMOVE, 2, {FPU0,FPUREG,0}, "\1\xDA\11\xC8", IF_P6|IF_FPU},
+    {I_FCMOVNB, 1, {FPUREG,0,0}, "\1\xDB\10\xC0", IF_P6|IF_FPU},
+    {I_FCMOVNB, 2, {FPU0,FPUREG,0}, "\1\xDB\11\xC0", IF_P6|IF_FPU},
+    {I_FCMOVNBE, 1, {FPUREG,0,0}, "\1\xDB\10\xD0", IF_P6|IF_FPU},
+    {I_FCMOVNBE, 2, {FPU0,FPUREG,0}, "\1\xDB\11\xD0", IF_P6|IF_FPU},
+    {I_FCMOVNE, 1, {FPUREG,0,0}, "\1\xDB\10\xC8", IF_P6|IF_FPU},
+    {I_FCMOVNE, 2, {FPU0,FPUREG,0}, "\1\xDB\11\xC8", IF_P6|IF_FPU},
+    {I_FCMOVNU, 1, {FPUREG,0,0}, "\1\xDB\10\xD8", IF_P6|IF_FPU},
+    {I_FCMOVNU, 2, {FPU0,FPUREG,0}, "\1\xDB\11\xD8", IF_P6|IF_FPU},
+    {I_FCMOVU, 1, {FPUREG,0,0}, "\1\xDA\10\xD8", IF_P6|IF_FPU},
+    {I_FCMOVU, 2, {FPU0,FPUREG,0}, "\1\xDA\11\xD8", IF_P6|IF_FPU},
+    {I_FCOM, 1, {MEMORY|BITS32,0,0}, "\300\1\xD8\202", IF_8086|IF_FPU},
+    {I_FCOM, 1, {MEMORY|BITS64,0,0}, "\300\1\xDC\202", IF_8086|IF_FPU},
+    {I_FCOM, 1, {FPUREG,0,0}, "\1\xD8\10\xD0", IF_8086|IF_FPU},
+    {I_FCOM, 2, {FPU0,FPUREG,0}, "\1\xD8\11\xD0", IF_8086|IF_FPU},
+    {I_FCOMI, 1, {FPUREG,0,0}, "\1\xDB\10\xF0", IF_P6|IF_FPU},
+    {I_FCOMI, 2, {FPU0,FPUREG,0}, "\1\xDB\11\xF0", IF_P6|IF_FPU},
+    {I_FCOMIP, 1, {FPUREG,0,0}, "\1\xDF\10\xF0", IF_P6|IF_FPU},
+    {I_FCOMIP, 2, {FPU0,FPUREG,0}, "\1\xDF\11\xF0", IF_P6|IF_FPU},
+    {I_FCOMP, 1, {MEMORY|BITS32,0,0}, "\300\1\xD8\203", IF_8086|IF_FPU},
+    {I_FCOMP, 1, {MEMORY|BITS64,0,0}, "\300\1\xDC\203", IF_8086|IF_FPU},
+    {I_FCOMP, 1, {FPUREG,0,0}, "\1\xD8\10\xD8", IF_8086|IF_FPU},
+    {I_FCOMP, 2, {FPU0,FPUREG,0}, "\1\xD8\11\xD8", IF_8086|IF_FPU},
+    {I_FCOMPP, 0, {0,0,0}, "\2\xDE\xD9", IF_8086|IF_FPU},
+    {I_FCOS, 0, {0,0,0}, "\2\xD9\xFF", IF_386|IF_FPU},
+    {I_FDECSTP, 0, {0,0,0}, "\2\xD9\xF6", IF_8086|IF_FPU},
+    {I_FDISI, 0, {0,0,0}, "\3\x9B\xDB\xE1", IF_8086|IF_FPU},
+    {I_FDIV, 1, {MEMORY|BITS32,0,0}, "\300\1\xD8\206", IF_8086|IF_FPU},
+    {I_FDIV, 1, {MEMORY|BITS64,0,0}, "\300\1\xDC\206", IF_8086|IF_FPU},
+    {I_FDIV, 1, {FPUREG|TO,0,0}, "\1\xDC\10\xF8", IF_8086|IF_FPU},
+    {I_FDIV, 2, {FPUREG,FPU0,0}, "\1\xDC\10\xF8", IF_8086|IF_FPU},
+    {I_FDIV, 1, {FPUREG,0,0}, "\1\xD8\10\xF0", IF_8086|IF_FPU},
+    {I_FDIV, 2, {FPU0,FPUREG,0}, "\1\xD8\11\xF0", IF_8086|IF_FPU},
+    {I_FDIVP, 2, {FPUREG,FPU0,0}, "\1\xDE\10\xF8", IF_8086|IF_FPU},
+    {I_FDIVP, 1, {FPUREG,0,0}, "\1\xDE\10\xF8", IF_8086|IF_FPU},
+    {I_FDIVR, 1, {MEMORY|BITS32,0,0}, "\300\1\xD8\207", IF_8086|IF_FPU},
+    {I_FDIVR, 1, {MEMORY|BITS64,0,0}, "\300\1\xDC\207", IF_8086|IF_FPU},
+    {I_FDIVR, 1, {FPUREG|TO,0,0}, "\1\xDC\10\xF0", IF_8086|IF_FPU},
+    {I_FDIVR, 2, {FPUREG,FPU0,0}, "\1\xDC\10\xF0", IF_8086|IF_FPU},
+    {I_FDIVR, 1, {FPUREG,0,0}, "\1\xD8\10\xF8", IF_8086|IF_FPU},
+    {I_FDIVR, 2, {FPU0,FPUREG,0}, "\1\xD8\11\xF8", IF_8086|IF_FPU},
+    {I_FDIVRP, 1, {FPUREG,0,0}, "\1\xDE\10\xF0", IF_8086|IF_FPU},
+    {I_FDIVRP, 2, {FPUREG,FPU0,0}, "\1\xDE\10\xF0", IF_8086|IF_FPU},
+    {I_FEMMS, 0, {0,0,0}, "\2\x0F\x0E", IF_PENT|IF_3DNOW},
+    {I_FENI, 0, {0,0,0}, "\3\x9B\xDB\xE0", IF_8086|IF_FPU},
+    {I_FFREE, 1, {FPUREG,0,0}, "\1\xDD\10\xC0", IF_8086|IF_FPU},
+    {I_FFREEP, 1, {FPUREG,0,0}, "\1\xDF\10\xC0", IF_286|IF_FPU|IF_UNDOC},
+    {I_FIADD, 1, {MEMORY|BITS32,0,0}, "\300\1\xDA\200", IF_8086|IF_FPU},
+    {I_FIADD, 1, {MEMORY|BITS16,0,0}, "\300\1\xDE\200", IF_8086|IF_FPU},
+    {I_FICOM, 1, {MEMORY|BITS32,0,0}, "\300\1\xDA\202", IF_8086|IF_FPU},
+    {I_FICOM, 1, {MEMORY|BITS16,0,0}, "\300\1\xDE\202", IF_8086|IF_FPU},
+    {I_FICOMP, 1, {MEMORY|BITS32,0,0}, "\300\1\xDA\203", IF_8086|IF_FPU},
+    {I_FICOMP, 1, {MEMORY|BITS16,0,0}, "\300\1\xDE\203", IF_8086|IF_FPU},
+    {I_FIDIV, 1, {MEMORY|BITS32,0,0}, "\300\1\xDA\206", IF_8086|IF_FPU},
+    {I_FIDIV, 1, {MEMORY|BITS16,0,0}, "\300\1\xDE\206", IF_8086|IF_FPU},
+    {I_FIDIVR, 1, {MEMORY|BITS32,0,0}, "\300\1\xDA\207", IF_8086|IF_FPU},
+    {I_FIDIVR, 1, {MEMORY|BITS16,0,0}, "\300\1\xDE\207", IF_8086|IF_FPU},
+    {I_FILD, 1, {MEMORY|BITS32,0,0}, "\300\1\xDB\200", IF_8086|IF_FPU},
+    {I_FILD, 1, {MEMORY|BITS16,0,0}, "\300\1\xDF\200", IF_8086|IF_FPU},
+    {I_FILD, 1, {MEMORY|BITS64,0,0}, "\300\1\xDF\205", IF_8086|IF_FPU},
+    {I_FIMUL, 1, {MEMORY|BITS32,0,0}, "\300\1\xDA\201", IF_8086|IF_FPU},
+    {I_FIMUL, 1, {MEMORY|BITS16,0,0}, "\300\1\xDE\201", IF_8086|IF_FPU},
+    {I_FINCSTP, 0, {0,0,0}, "\2\xD9\xF7", IF_8086|IF_FPU},
+    {I_FINIT, 0, {0,0,0}, "\3\x9B\xDB\xE3", IF_8086|IF_FPU},
+    {I_FIST, 1, {MEMORY|BITS32,0,0}, "\300\1\xDB\202", IF_8086|IF_FPU},
+    {I_FIST, 1, {MEMORY|BITS16,0,0}, "\300\1\xDF\202", IF_8086|IF_FPU},
+    {I_FISTP, 1, {MEMORY|BITS32,0,0}, "\300\1\xDB\203", IF_8086|IF_FPU},
+    {I_FISTP, 1, {MEMORY|BITS16,0,0}, "\300\1\xDF\203", IF_8086|IF_FPU},
+    {I_FISTP, 1, {MEMORY|BITS64,0,0}, "\300\1\xDF\207", IF_8086|IF_FPU},
+    {I_FISTTP, 1, {MEMORY|BITS32,0,0}, "\300\1\xDD\201", IF_PRESCOTT|IF_FPU},
+    {I_FISTTP, 1, {MEMORY|BITS16,0,0}, "\300\1\xDB\201", IF_PRESCOTT|IF_FPU},
+    {I_FISTTP, 1, {MEMORY|BITS64,0,0}, "\300\1\xDF\201", IF_PRESCOTT|IF_FPU},
+    {I_FISUB, 1, {MEMORY|BITS32,0,0}, "\300\1\xDA\204", IF_8086|IF_FPU},
+    {I_FISUB, 1, {MEMORY|BITS16,0,0}, "\300\1\xDE\204", IF_8086|IF_FPU},
+    {I_FISUBR, 1, {MEMORY|BITS32,0,0}, "\300\1\xDA\205", IF_8086|IF_FPU},
+    {I_FISUBR, 1, {MEMORY|BITS16,0,0}, "\300\1\xDE\205", IF_8086|IF_FPU},
+    {I_FLD, 1, {MEMORY|BITS32,0,0}, "\300\1\xD9\200", IF_8086|IF_FPU},
+    {I_FLD, 1, {MEMORY|BITS64,0,0}, "\300\1\xDD\200", IF_8086|IF_FPU},
+    {I_FLD, 1, {MEMORY|BITS80,0,0}, "\300\1\xDB\205", IF_8086|IF_FPU},
+    {I_FLD, 1, {FPUREG,0,0}, "\1\xD9\10\xC0", IF_8086|IF_FPU},
+    {I_FLD1, 0, {0,0,0}, "\2\xD9\xE8", IF_8086|IF_FPU},
+    {I_FLDCW, 1, {MEMORY,0,0}, "\300\1\xD9\205", IF_8086|IF_FPU|IF_SW},
+    {I_FLDENV, 1, {MEMORY,0,0}, "\300\1\xD9\204", IF_8086|IF_FPU},
+    {I_FLDL2E, 0, {0,0,0}, "\2\xD9\xEA", IF_8086|IF_FPU},
+    {I_FLDL2T, 0, {0,0,0}, "\2\xD9\xE9", IF_8086|IF_FPU},
+    {I_FLDLG2, 0, {0,0,0}, "\2\xD9\xEC", IF_8086|IF_FPU},
+    {I_FLDLN2, 0, {0,0,0}, "\2\xD9\xED", IF_8086|IF_FPU},
+    {I_FLDPI, 0, {0,0,0}, "\2\xD9\xEB", IF_8086|IF_FPU},
+    {I_FLDZ, 0, {0,0,0}, "\2\xD9\xEE", IF_8086|IF_FPU},
+    {I_FMUL, 1, {MEMORY|BITS32,0,0}, "\300\1\xD8\201", IF_8086|IF_FPU},
+    {I_FMUL, 1, {MEMORY|BITS64,0,0}, "\300\1\xDC\201", IF_8086|IF_FPU},
+    {I_FMUL, 1, {FPUREG|TO,0,0}, "\1\xDC\10\xC8", IF_8086|IF_FPU},
+    {I_FMUL, 2, {FPUREG,FPU0,0}, "\1\xDC\10\xC8", IF_8086|IF_FPU},
+    {I_FMUL, 1, {FPUREG,0,0}, "\1\xD8\10\xC8", IF_8086|IF_FPU},
+    {I_FMUL, 2, {FPU0,FPUREG,0}, "\1\xD8\11\xC8", IF_8086|IF_FPU},
+    {I_FMULP, 1, {FPUREG,0,0}, "\1\xDE\10\xC8", IF_8086|IF_FPU},
+    {I_FMULP, 2, {FPUREG,FPU0,0}, "\1\xDE\10\xC8", IF_8086|IF_FPU},
+    {I_FNCLEX, 0, {0,0,0}, "\2\xDB\xE2", IF_8086|IF_FPU},
+    {I_FNDISI, 0, {0,0,0}, "\2\xDB\xE1", IF_8086|IF_FPU},
+    {I_FNENI, 0, {0,0,0}, "\2\xDB\xE0", IF_8086|IF_FPU},
+    {I_FNINIT, 0, {0,0,0}, "\2\xDB\xE3", IF_8086|IF_FPU},
+    {I_FNOP, 0, {0,0,0}, "\2\xD9\xD0", IF_8086|IF_FPU},
+    {I_FNSAVE, 1, {MEMORY,0,0}, "\300\1\xDD\206", IF_8086|IF_FPU},
+    {I_FNSTCW, 1, {MEMORY,0,0}, "\300\1\xD9\207", IF_8086|IF_FPU|IF_SW},
+    {I_FNSTENV, 1, {MEMORY,0,0}, "\300\1\xD9\206", IF_8086|IF_FPU},
+    {I_FNSTSW, 1, {MEMORY,0,0}, "\300\1\xDD\207", IF_8086|IF_FPU|IF_SW},
+    {I_FNSTSW, 1, {REG_AX,0,0}, "\2\xDF\xE0", IF_286|IF_FPU},
+    {I_FPATAN, 0, {0,0,0}, "\2\xD9\xF3", IF_8086|IF_FPU},
+    {I_FPREM, 0, {0,0,0}, "\2\xD9\xF8", IF_8086|IF_FPU},
+    {I_FPREM1, 0, {0,0,0}, "\2\xD9\xF5", IF_386|IF_FPU},
+    {I_FPTAN, 0, {0,0,0}, "\2\xD9\xF2", IF_8086|IF_FPU},
+    {I_FRNDINT, 0, {0,0,0}, "\2\xD9\xFC", IF_8086|IF_FPU},
+    {I_FRSTOR, 1, {MEMORY,0,0}, "\300\1\xDD\204", IF_8086|IF_FPU},
+    {I_FSAVE, 1, {MEMORY,0,0}, "\300\2\x9B\xDD\206", IF_8086|IF_FPU},
+    {I_FSCALE, 0, {0,0,0}, "\2\xD9\xFD", IF_8086|IF_FPU},
+    {I_FSETPM, 0, {0,0,0}, "\2\xDB\xE4", IF_286|IF_FPU},
+    {I_FSIN, 0, {0,0,0}, "\2\xD9\xFE", IF_386|IF_FPU},
+    {I_FSINCOS, 0, {0,0,0}, "\2\xD9\xFB", IF_386|IF_FPU},
+    {I_FSQRT, 0, {0,0,0}, "\2\xD9\xFA", IF_8086|IF_FPU},
+    {I_FST, 1, {MEMORY|BITS32,0,0}, "\300\1\xD9\202", IF_8086|IF_FPU},
+    {I_FST, 1, {MEMORY|BITS64,0,0}, "\300\1\xDD\202", IF_8086|IF_FPU},
+    {I_FST, 1, {FPUREG,0,0}, "\1\xDD\10\xD0", IF_8086|IF_FPU},
+    {I_FSTCW, 1, {MEMORY,0,0}, "\300\2\x9B\xD9\207", IF_8086|IF_FPU|IF_SW},
+    {I_FSTENV, 1, {MEMORY,0,0}, "\300\2\x9B\xD9\206", IF_8086|IF_FPU},
+    {I_FSTP, 1, {MEMORY|BITS32,0,0}, "\300\1\xD9\203", IF_8086|IF_FPU},
+    {I_FSTP, 1, {MEMORY|BITS64,0,0}, "\300\1\xDD\203", IF_8086|IF_FPU},
+    {I_FSTP, 1, {MEMORY|BITS80,0,0}, "\300\1\xDB\207", IF_8086|IF_FPU},
+    {I_FSTP, 1, {FPUREG,0,0}, "\1\xDD\10\xD8", IF_8086|IF_FPU},
+    {I_FSTSW, 1, {MEMORY,0,0}, "\300\2\x9B\xDD\207", IF_8086|IF_FPU|IF_SW},
+    {I_FSTSW, 1, {REG_AX,0,0}, "\3\x9B\xDF\xE0", IF_286|IF_FPU},
+    {I_FSUB, 1, {MEMORY|BITS32,0,0}, "\300\1\xD8\204", IF_8086|IF_FPU},
+    {I_FSUB, 1, {MEMORY|BITS64,0,0}, "\300\1\xDC\204", IF_8086|IF_FPU},
+    {I_FSUB, 1, {FPUREG|TO,0,0}, "\1\xDC\10\xE8", IF_8086|IF_FPU},
+    {I_FSUB, 2, {FPUREG,FPU0,0}, "\1\xDC\10\xE8", IF_8086|IF_FPU},
+    {I_FSUB, 1, {FPUREG,0,0}, "\1\xD8\10\xE0", IF_8086|IF_FPU},
+    {I_FSUB, 2, {FPU0,FPUREG,0}, "\1\xD8\11\xE0", IF_8086|IF_FPU},
+    {I_FSUBP, 1, {FPUREG,0,0}, "\1\xDE\10\xE8", IF_8086|IF_FPU},
+    {I_FSUBP, 2, {FPUREG,FPU0,0}, "\1\xDE\10\xE8", IF_8086|IF_FPU},
+    {I_FSUBR, 1, {MEMORY|BITS32,0,0}, "\300\1\xD8\205", IF_8086|IF_FPU},
+    {I_FSUBR, 1, {MEMORY|BITS64,0,0}, "\300\1\xDC\205", IF_8086|IF_FPU},
+    {I_FSUBR, 1, {FPUREG|TO,0,0}, "\1\xDC\10\xE0", IF_8086|IF_FPU},
+    {I_FSUBR, 2, {FPUREG,FPU0,0}, "\1\xDC\10\xE0", IF_8086|IF_FPU},
+    {I_FSUBR, 1, {FPUREG,0,0}, "\1\xD8\10\xE8", IF_8086|IF_FPU},
+    {I_FSUBR, 2, {FPU0,FPUREG,0}, "\1\xD8\11\xE8", IF_8086|IF_FPU},
+    {I_FSUBRP, 1, {FPUREG,0,0}, "\1\xDE\10\xE0", IF_8086|IF_FPU},
+    {I_FSUBRP, 2, {FPUREG,FPU0,0}, "\1\xDE\10\xE0", IF_8086|IF_FPU},
+    {I_FTST, 0, {0,0,0}, "\2\xD9\xE4", IF_8086|IF_FPU},
+    {I_FUCOM, 1, {FPUREG,0,0}, "\1\xDD\10\xE0", IF_386|IF_FPU},
+    {I_FUCOM, 2, {FPU0,FPUREG,0}, "\1\xDD\11\xE0", IF_386|IF_FPU},
+    {I_FUCOMI, 1, {FPUREG,0,0}, "\1\xDB\10\xE8", IF_P6|IF_FPU},
+    {I_FUCOMI, 2, {FPU0,FPUREG,0}, "\1\xDB\11\xE8", IF_P6|IF_FPU},
+    {I_FUCOMIP, 1, {FPUREG,0,0}, "\1\xDF\10\xE8", IF_P6|IF_FPU},
+    {I_FUCOMIP, 2, {FPU0,FPUREG,0}, "\1\xDF\11\xE8", IF_P6|IF_FPU},
+    {I_FUCOMP, 1, {FPUREG,0,0}, "\1\xDD\10\xE8", IF_386|IF_FPU},
+    {I_FUCOMP, 2, {FPU0,FPUREG,0}, "\1\xDD\11\xE8", IF_386|IF_FPU},
+    {I_FUCOMPP, 0, {0,0,0}, "\2\xDA\xE9", IF_386|IF_FPU},
+    {I_FXAM, 0, {0,0,0}, "\2\xD9\xE5", IF_8086|IF_FPU},
+    {I_FXCH, 0, {0,0,0}, "\2\xD9\xC9", IF_8086|IF_FPU},
+    {I_FXCH, 1, {FPUREG,0,0}, "\1\xD9\10\xC8", IF_8086|IF_FPU},
+    {I_FXCH, 2, {FPUREG,FPU0,0}, "\1\xD9\10\xC8", IF_8086|IF_FPU},
+    {I_FXCH, 2, {FPU0,FPUREG,0}, "\1\xD9\11\xC8", IF_8086|IF_FPU},
+    {I_FXTRACT, 0, {0,0,0}, "\2\xD9\xF4", IF_8086|IF_FPU},
+    {I_FYL2X, 0, {0,0,0}, "\2\xD9\xF1", IF_8086|IF_FPU},
+    {I_FYL2XP1, 0, {0,0,0}, "\2\xD9\xF9", IF_8086|IF_FPU},
+    {I_HLT, 0, {0,0,0}, "\1\xF4", IF_8086|IF_PRIV},
+    {I_IDIV, 1, {REGMEM|BITS8,0,0}, "\300\1\xF6\207", IF_8086},
+    {I_IDIV, 1, {REGMEM|BITS16,0,0}, "\320\300\1\xF7\207", IF_8086},
+    {I_IDIV, 1, {REGMEM|BITS32,0,0}, "\321\300\1\xF7\207", IF_386},
+    {I_IMUL, 1, {REGMEM|BITS8,0,0}, "\300\1\xF6\205", IF_8086},
+    {I_IMUL, 1, {REGMEM|BITS16,0,0}, "\320\300\1\xF7\205", IF_8086},
+    {I_IMUL, 1, {REGMEM|BITS32,0,0}, "\321\300\1\xF7\205", IF_386},
+    {I_IMUL, 2, {REG16,MEMORY,0}, "\320\301\2\x0F\xAF\110", IF_386|IF_SM},
+    {I_IMUL, 2, {REG16,REG16,0}, "\320\2\x0F\xAF\110", IF_386},
+    {I_IMUL, 2, {REG32,MEMORY,0}, "\321\301\2\x0F\xAF\110", IF_386|IF_SM},
+    {I_IMUL, 2, {REG32,REG32,0}, "\321\2\x0F\xAF\110", IF_386},
+    {I_IMUL, 3, {REG16,MEMORY,IMMEDIATE|BITS8}, "\320\301\1\x6B\110\16", IF_186|IF_SM},
+    {I_IMUL, 3, {REG16,MEMORY,IMMEDIATE|BITS16}, "\320\301\1\x69\110\32", IF_186|IF_SM},
+    {I_IMUL, 3, {REG16,REG16,IMMEDIATE|BITS8}, "\320\1\x6B\110\16", IF_186},
+    {I_IMUL, 3, {REG16,REG16,IMMEDIATE|BITS16}, "\320\1\x69\110\32", IF_186},
+    {I_IMUL, 3, {REG32,MEMORY,IMMEDIATE|BITS8}, "\321\301\1\x6B\110\16", IF_386|IF_SM},
+    {I_IMUL, 3, {REG32,MEMORY,IMMEDIATE|BITS32}, "\321\301\1\x69\110\42", IF_386|IF_SM},
+    {I_IMUL, 3, {REG32,REG32,IMMEDIATE|BITS8}, "\321\1\x6B\110\16", IF_386},
+    {I_IMUL, 3, {REG32,REG32,IMMEDIATE|BITS32}, "\321\1\x69\110\42", IF_386},
+    {I_IMUL, 2, {REG16,IMMEDIATE|BITS8,0}, "\320\1\x6B\100\15", IF_186},
+    {I_IMUL, 2, {REG16,IMMEDIATE|BITS16,0}, "\320\1\x69\100\31", IF_186},
+    {I_IMUL, 2, {REG32,IMMEDIATE|BITS8,0}, "\321\1\x6B\100\15", IF_386},
+    {I_IMUL, 2, {REG32,IMMEDIATE|BITS32,0}, "\321\1\x69\100\41", IF_386},
+    {I_IN, 2, {REG_AL,IMMEDIATE,0}, "\1\xE4\25", IF_8086|IF_SB},
+    {I_IN, 2, {REG_AX,IMMEDIATE,0}, "\320\1\xE5\25", IF_8086|IF_SB},
+    {I_IN, 2, {REG_EAX,IMMEDIATE,0}, "\321\1\xE5\25", IF_386|IF_SB},
+    {I_IN, 2, {REG_AL,REG_DX,0}, "\1\xEC", IF_8086},
+    {I_IN, 2, {REG_AX,REG_DX,0}, "\320\1\xED", IF_8086},
+    {I_IN, 2, {REG_EAX,REG_DX,0}, "\321\1\xED", IF_386},
+    {I_INC, 1, {REG16,0,0}, "\320\10\x40", IF_8086},
+    {I_INC, 1, {REG32,0,0}, "\321\10\x40", IF_386},
+    {I_INC, 1, {REGMEM|BITS8,0,0}, "\300\1\xFE\200", IF_8086},
+    {I_INC, 1, {REGMEM|BITS16,0,0}, "\320\300\1\xFF\200", IF_8086},
+    {I_INC, 1, {REGMEM|BITS32,0,0}, "\321\300\1\xFF\200", IF_386},
+    {I_INSB, 0, {0,0,0}, "\1\x6C", IF_186},
+    {I_INSD, 0, {0,0,0}, "\321\1\x6D", IF_386},
+    {I_INSW, 0, {0,0,0}, "\320\1\x6D", IF_186},
+    {I_INT, 1, {IMMEDIATE,0,0}, "\1\xCD\24", IF_8086|IF_SB},
+    {I_INT1, 0, {0,0,0}, "\1\xF1", IF_386},
+    {I_INT3, 0, {0,0,0}, "\1\xCC", IF_8086},
+    {I_INTO, 0, {0,0,0}, "\1\xCE", IF_8086},
+    {I_INVD, 0, {0,0,0}, "\2\x0F\x08", IF_486|IF_PRIV},
+    {I_INVLPG, 1, {MEMORY,0,0}, "\300\2\x0F\x01\207", IF_486|IF_PRIV},
+    {I_IRET, 0, {0,0,0}, "\322\1\xCF", IF_8086},
+    {I_IRETD, 0, {0,0,0}, "\321\1\xCF", IF_386},
+    {I_IRETW, 0, {0,0,0}, "\320\1\xCF", IF_8086},
+    {I_JCXZ, 1, {IMMEDIATE,0,0}, "\310\1\xE3\50", IF_8086},
+    {I_JECXZ, 1, {IMMEDIATE,0,0}, "\311\1\xE3\50", IF_386},
+    {I_JMP, 1, {IMMEDIATE|SHORT,0,0}, "\1\xEB\50", IF_8086},
+    {I_JMP, 1, {IMMEDIATE,0,0}, "\322\1\xE9\64", IF_8086},
+    {I_JMP, 1, {IMMEDIATE|BITS16,0,0}, "\320\1\xE9\64", IF_8086},
+    {I_JMP, 1, {IMMEDIATE|BITS32,0,0}, "\321\1\xE9\64", IF_386},
+    {I_JMP, 2, {IMMEDIATE|COLON,IMMEDIATE,0}, "\322\1\xEA\35\30", IF_8086},
+    {I_JMP, 2, {IMMEDIATE|BITS16|COLON,IMMEDIATE,0}, "\320\1\xEA\31\30", IF_8086},
+    {I_JMP, 2, {IMMEDIATE|COLON,IMMEDIATE|BITS16,0}, "\320\1\xEA\31\30", IF_8086},
+    {I_JMP, 2, {IMMEDIATE|BITS32|COLON,IMMEDIATE,0}, "\321\1\xEA\41\30", IF_386},
+    {I_JMP, 2, {IMMEDIATE|COLON,IMMEDIATE|BITS32,0}, "\321\1\xEA\41\30", IF_386},
+    {I_JMP, 1, {MEMORY|FAR,0,0}, "\322\300\1\xFF\205", IF_8086},
+    {I_JMP, 1, {MEMORY|BITS16|FAR,0,0}, "\320\300\1\xFF\205", IF_8086},
+    {I_JMP, 1, {MEMORY|BITS32|FAR,0,0}, "\321\300\1\xFF\205", IF_386},
+    {I_JMP, 1, {MEMORY|NEAR,0,0}, "\322\300\1\xFF\204", IF_8086},
+    {I_JMP, 1, {MEMORY|BITS16|NEAR,0,0}, "\320\300\1\xFF\204", IF_8086},
+    {I_JMP, 1, {MEMORY|BITS32|NEAR,0,0}, "\321\300\1\xFF\204", IF_386},
+    {I_JMP, 1, {REG16,0,0}, "\320\300\1\xFF\204", IF_8086},
+    {I_JMP, 1, {REG32,0,0}, "\321\300\1\xFF\204", IF_386},
+    {I_JMP, 1, {MEMORY,0,0}, "\322\300\1\xFF\204", IF_8086},
+    {I_JMP, 1, {MEMORY|BITS16,0,0}, "\320\300\1\xFF\204", IF_8086},
+    {I_JMP, 1, {MEMORY|BITS32,0,0}, "\321\300\1\xFF\204", IF_386},
+    {I_JMPE, 1, {IMMEDIATE,0,0}, "\322\2\x0F\xB8\64", IF_IA64},
+    {I_JMPE, 1, {IMMEDIATE|BITS16,0,0}, "\320\2\x0F\xB8\64", IF_IA64},
+    {I_JMPE, 1, {IMMEDIATE|BITS32,0,0}, "\321\2\x0F\xB8\64", IF_IA64},
+    {I_JMPE, 1, {REGMEM|BITS16,0,0}, "\320\2\x0F\x00\206", IF_IA64},
+    {I_JMPE, 1, {REGMEM|BITS32,0,0}, "\321\2\x0F\x00\206", IF_IA64},
+    {I_LAHF, 0, {0,0,0}, "\1\x9F", IF_8086},
+    {I_LAR, 2, {REG16,MEMORY,0}, "\320\301\2\x0F\x02\110", IF_286|IF_PROT|IF_SM},
+    {I_LAR, 2, {REG16,REG16,0}, "\320\2\x0F\x02\110", IF_286|IF_PROT},
+    {I_LAR, 2, {REG32,MEMORY,0}, "\321\301\2\x0F\x02\110", IF_386|IF_PROT|IF_SM},
+    {I_LAR, 2, {REG32,REG32,0}, "\321\2\x0F\x02\110", IF_386|IF_PROT},
+    {I_LDS, 2, {REG16,MEMORY,0}, "\320\301\1\xC5\110", IF_8086},
+    {I_LDS, 2, {REG32,MEMORY,0}, "\321\301\1\xC5\110", IF_386},
+    {I_LEA, 2, {REG16,MEMORY,0}, "\320\301\1\x8D\110", IF_8086},
+    {I_LEA, 2, {REG32,MEMORY,0}, "\321\301\1\x8D\110", IF_386},
+    {I_LEAVE, 0, {0,0,0}, "\1\xC9", IF_186},
+    {I_LES, 2, {REG16,MEMORY,0}, "\320\301\1\xC4\110", IF_8086},
+    {I_LES, 2, {REG32,MEMORY,0}, "\321\301\1\xC4\110", IF_386},
+    {I_LFS, 2, {REG16,MEMORY,0}, "\320\301\2\x0F\xB4\110", IF_386},
+    {I_LFS, 2, {REG32,MEMORY,0}, "\321\301\2\x0F\xB4\110", IF_386},
+    {I_LGDT, 1, {MEMORY,0,0}, "\300\2\x0F\x01\202", IF_286|IF_PRIV},
+    {I_LGS, 2, {REG16,MEMORY,0}, "\320\301\2\x0F\xB5\110", IF_386},
+    {I_LGS, 2, {REG32,MEMORY,0}, "\321\301\2\x0F\xB5\110", IF_386},
+    {I_LIDT, 1, {MEMORY,0,0}, "\300\2\x0F\x01\203", IF_286|IF_PRIV},
+    {I_LLDT, 1, {MEMORY,0,0}, "\300\1\x0F\17\202", IF_286|IF_PROT|IF_PRIV},
+    {I_LLDT, 1, {MEMORY|BITS16,0,0}, "\300\1\x0F\17\202", IF_286|IF_PROT|IF_PRIV},
+    {I_LLDT, 1, {REG16,0,0}, "\1\x0F\17\202", IF_286|IF_PROT|IF_PRIV},
+    {I_LMSW, 1, {MEMORY,0,0}, "\300\2\x0F\x01\206", IF_286|IF_PRIV},
+    {I_LMSW, 1, {MEMORY|BITS16,0,0}, "\300\2\x0F\x01\206", IF_286|IF_PRIV},
+    {I_LMSW, 1, {REG16,0,0}, "\2\x0F\x01\206", IF_286|IF_PRIV},
+    {I_LOADALL, 0, {0,0,0}, "\2\x0F\x07", IF_386|IF_UNDOC},
+    {I_LOADALL286, 0, {0,0,0}, "\2\x0F\x05", IF_286|IF_UNDOC},
+    {I_LODSB, 0, {0,0,0}, "\1\xAC", IF_8086},
+    {I_LODSD, 0, {0,0,0}, "\321\1\xAD", IF_386},
+    {I_LODSW, 0, {0,0,0}, "\320\1\xAD", IF_8086},
+    {I_LOOP, 1, {IMMEDIATE,0,0}, "\312\1\xE2\50", IF_8086},
+    {I_LOOP, 2, {IMMEDIATE,REG_CX,0}, "\310\1\xE2\50", IF_8086},
+    {I_LOOP, 2, {IMMEDIATE,REG_ECX,0}, "\311\1\xE2\50", IF_386},
+    {I_LOOPE, 1, {IMMEDIATE,0,0}, "\312\1\xE1\50", IF_8086},
+    {I_LOOPE, 2, {IMMEDIATE,REG_CX,0}, "\310\1\xE1\50", IF_8086},
+    {I_LOOPE, 2, {IMMEDIATE,REG_ECX,0}, "\311\1\xE1\50", IF_386},
+    {I_LOOPNE, 1, {IMMEDIATE,0,0}, "\312\1\xE0\50", IF_8086},
+    {I_LOOPNE, 2, {IMMEDIATE,REG_CX,0}, "\310\1\xE0\50", IF_8086},
+    {I_LOOPNE, 2, {IMMEDIATE,REG_ECX,0}, "\311\1\xE0\50", IF_386},
+    {I_LOOPNZ, 1, {IMMEDIATE,0,0}, "\312\1\xE0\50", IF_8086},
+    {I_LOOPNZ, 2, {IMMEDIATE,REG_CX,0}, "\310\1\xE0\50", IF_8086},
+    {I_LOOPNZ, 2, {IMMEDIATE,REG_ECX,0}, "\311\1\xE0\50", IF_386},
+    {I_LOOPZ, 1, {IMMEDIATE,0,0}, "\312\1\xE1\50", IF_8086},
+    {I_LOOPZ, 2, {IMMEDIATE,REG_CX,0}, "\310\1\xE1\50", IF_8086},
+    {I_LOOPZ, 2, {IMMEDIATE,REG_ECX,0}, "\311\1\xE1\50", IF_386},
+    {I_LSL, 2, {REG16,MEMORY,0}, "\320\301\2\x0F\x03\110", IF_286|IF_PROT|IF_SM},
+    {I_LSL, 2, {REG16,REG16,0}, "\320\2\x0F\x03\110", IF_286|IF_PROT},
+    {I_LSL, 2, {REG32,MEMORY,0}, "\321\301\2\x0F\x03\110", IF_386|IF_PROT|IF_SM},
+    {I_LSL, 2, {REG32,REG32,0}, "\321\2\x0F\x03\110", IF_386|IF_PROT},
+    {I_LSS, 2, {REG16,MEMORY,0}, "\320\301\2\x0F\xB2\110", IF_386},
+    {I_LSS, 2, {REG32,MEMORY,0}, "\321\301\2\x0F\xB2\110", IF_386},
+    {I_LTR, 1, {MEMORY,0,0}, "\300\1\x0F\17\203", IF_286|IF_PROT|IF_PRIV},
+    {I_LTR, 1, {MEMORY|BITS16,0,0}, "\300\1\x0F\17\203", IF_286|IF_PROT|IF_PRIV},
+    {I_LTR, 1, {REG16,0,0}, "\1\x0F\17\203", IF_286|IF_PROT|IF_PRIV},
+    {I_MONITOR, 0, {0,0,0}, "\3\x0F\x01\xC8", IF_PRESCOTT},
+    {I_MOV, 2, {MEMORY,REG_SREG,0}, "\300\1\x8C\101", IF_8086|IF_SM},
+    {I_MOV, 2, {REG16,REG_SREG,0}, "\320\1\x8C\101", IF_8086},
+    {I_MOV, 2, {REG32,REG_SREG,0}, "\321\1\x8C\101", IF_386},
+    {I_MOV, 2, {REG_SREG,MEMORY,0}, "\301\1\x8E\110", IF_8086|IF_SM},
+    {I_MOV, 2, {REG_SREG,REG16,0}, "\1\x8E\110", IF_8086},
+    {I_MOV, 2, {REG_SREG,REG32,0}, "\1\x8E\110", IF_386},
+    {I_MOV, 2, {REG_AL,MEM_OFFS,0}, "\301\1\xA0\45", IF_8086|IF_SM},
+    {I_MOV, 2, {REG_AX,MEM_OFFS,0}, "\301\320\1\xA1\45", IF_8086|IF_SM},
+    {I_MOV, 2, {REG_EAX,MEM_OFFS,0}, "\301\321\1\xA1\45", IF_386|IF_SM},
+    {I_MOV, 2, {MEM_OFFS,REG_AL,0}, "\300\1\xA2\44", IF_8086|IF_SM},
+    {I_MOV, 2, {MEM_OFFS,REG_AX,0}, "\300\320\1\xA3\44", IF_8086|IF_SM},
+    {I_MOV, 2, {MEM_OFFS,REG_EAX,0}, "\300\321\1\xA3\44", IF_386|IF_SM},
+    {I_MOV, 2, {REG32,REG_CREG,0}, "\2\x0F\x20\101", IF_386|IF_PRIV},
+    {I_MOV, 2, {REG32,REG_DREG,0}, "\2\x0F\x21\101", IF_386|IF_PRIV},
+    {I_MOV, 2, {REG32,REG_TREG,0}, "\2\x0F\x24\101", IF_386|IF_PRIV},
+    {I_MOV, 2, {REG_CREG,REG32,0}, "\2\x0F\x22\110", IF_386|IF_PRIV},
+    {I_MOV, 2, {REG_DREG,REG32,0}, "\2\x0F\x23\110", IF_386|IF_PRIV},
+    {I_MOV, 2, {REG_TREG,REG32,0}, "\2\x0F\x26\110", IF_386|IF_PRIV},
+    {I_MOV, 2, {MEMORY,REG8,0}, "\300\1\x88\101", IF_8086|IF_SM},
+    {I_MOV, 2, {REG8,REG8,0}, "\1\x88\101", IF_8086},
+    {I_MOV, 2, {MEMORY,REG16,0}, "\320\300\1\x89\101", IF_8086|IF_SM},
+    {I_MOV, 2, {REG16,REG16,0}, "\320\1\x89\101", IF_8086},
+    {I_MOV, 2, {MEMORY,REG32,0}, "\321\300\1\x89\101", IF_386|IF_SM},
+    {I_MOV, 2, {REG32,REG32,0}, "\321\1\x89\101", IF_386},
+    {I_MOV, 2, {REG8,MEMORY,0}, "\301\1\x8A\110", IF_8086|IF_SM},
+    {I_MOV, 2, {REG8,REG8,0}, "\1\x8A\110", IF_8086},
+    {I_MOV, 2, {REG16,MEMORY,0}, "\320\301\1\x8B\110", IF_8086|IF_SM},
+    {I_MOV, 2, {REG16,REG16,0}, "\320\1\x8B\110", IF_8086},
+    {I_MOV, 2, {REG32,MEMORY,0}, "\321\301\1\x8B\110", IF_386|IF_SM},
+    {I_MOV, 2, {REG32,REG32,0}, "\321\1\x8B\110", IF_386},
+    {I_MOV, 2, {REG8,IMMEDIATE,0}, "\10\xB0\21", IF_8086|IF_SM},
+    {I_MOV, 2, {REG16,IMMEDIATE,0}, "\320\10\xB8\31", IF_8086|IF_SM},
+    {I_MOV, 2, {REG32,IMMEDIATE,0}, "\321\10\xB8\41", IF_386|IF_SM},
+    {I_MOV, 2, {REGMEM|BITS8,IMMEDIATE,0}, "\300\1\xC6\200\21", IF_8086|IF_SM},
+    {I_MOV, 2, {REGMEM|BITS16,IMMEDIATE,0}, "\320\300\1\xC7\200\31", IF_8086|IF_SM},
+    {I_MOV, 2, {REGMEM|BITS32,IMMEDIATE,0}, "\321\300\1\xC7\200\41", IF_386|IF_SM},
+    {I_MOV, 2, {MEMORY,IMMEDIATE|BITS8,0}, "\300\1\xC6\200\21", IF_8086|IF_SM},
+    {I_MOV, 2, {MEMORY,IMMEDIATE|BITS16,0}, "\320\300\1\xC7\200\31", IF_8086|IF_SM},
+    {I_MOV, 2, {MEMORY,IMMEDIATE|BITS32,0}, "\321\300\1\xC7\200\41", IF_386|IF_SM},
+    {I_MOVD, 2, {MMXREG,MEMORY,0}, "\301\2\x0F\x6E\110", IF_PENT|IF_MMX|IF_SD},
+    {I_MOVD, 2, {MMXREG,REG32,0}, "\2\x0F\x6E\110", IF_PENT|IF_MMX},
+    {I_MOVD, 2, {MEMORY,MMXREG,0}, "\300\2\x0F\x7E\101", IF_PENT|IF_MMX|IF_SD},
+    {I_MOVD, 2, {REG32,MMXREG,0}, "\2\x0F\x7E\101", IF_PENT|IF_MMX},
+    {I_MOVQ, 2, {MMXREG,MEMORY,0}, "\301\2\x0F\x6F\110", IF_PENT|IF_MMX|IF_SM},
+    {I_MOVQ, 2, {MMXREG,MMXREG,0}, "\2\x0F\x6F\110", IF_PENT|IF_MMX},
+    {I_MOVQ, 2, {MEMORY,MMXREG,0}, "\300\2\x0F\x7F\101", IF_PENT|IF_MMX|IF_SM},
+    {I_MOVQ, 2, {MMXREG,MMXREG,0}, "\2\x0F\x7F\101", IF_PENT|IF_MMX},
+    {I_MOVSB, 0, {0,0,0}, "\1\xA4", IF_8086},
+    {I_MOVSD, 0, {0,0,0}, "\321\1\xA5", IF_386},
+    {I_MOVSW, 0, {0,0,0}, "\320\1\xA5", IF_8086},
+    {I_MOVSX, 2, {REG16,MEMORY,0}, "\320\301\2\x0F\xBE\110", IF_386|IF_SB},
+    {I_MOVSX, 2, {REG16,REG8,0}, "\320\2\x0F\xBE\110", IF_386},
+    {I_MOVSX, 2, {REG32,REGMEM|BITS8,0}, "\321\301\2\x0F\xBE\110", IF_386},
+    {I_MOVSX, 2, {REG32,REGMEM|BITS16,0}, "\321\301\2\x0F\xBF\110", IF_386},
+    {I_MOVZX, 2, {REG16,MEMORY,0}, "\320\301\2\x0F\xB6\110", IF_386|IF_SB},
+    {I_MOVZX, 2, {REG16,REG8,0}, "\320\2\x0F\xB6\110", IF_386},
+    {I_MOVZX, 2, {REG32,REGMEM|BITS8,0}, "\321\301\2\x0F\xB6\110", IF_386},
+    {I_MOVZX, 2, {REG32,REGMEM|BITS16,0}, "\321\301\2\x0F\xB7\110", IF_386},
+    {I_MUL, 1, {REGMEM|BITS8,0,0}, "\300\1\xF6\204", IF_8086},
+    {I_MUL, 1, {REGMEM|BITS16,0,0}, "\320\300\1\xF7\204", IF_8086},
+    {I_MUL, 1, {REGMEM|BITS32,0,0}, "\321\300\1\xF7\204", IF_386},
+    {I_MWAIT, 0, {0,0,0}, "\3\x0F\x01\xC9", IF_PRESCOTT},
+    {I_NEG, 1, {REGMEM|BITS8,0,0}, "\300\1\xF6\203", IF_8086},
+    {I_NEG, 1, {REGMEM|BITS16,0,0}, "\320\300\1\xF7\203", IF_8086},
+    {I_NEG, 1, {REGMEM|BITS32,0,0}, "\321\300\1\xF7\203", IF_386},
+    {I_NOP, 0, {0,0,0}, "\1\x90", IF_8086},
+    {I_NOT, 1, {REGMEM|BITS8,0,0}, "\300\1\xF6\202", IF_8086},
+    {I_NOT, 1, {REGMEM|BITS16,0,0}, "\320\300\1\xF7\202", IF_8086},
+    {I_NOT, 1, {REGMEM|BITS32,0,0}, "\321\300\1\xF7\202", IF_386},
+    {I_OR, 2, {MEMORY,REG8,0}, "\300\1\x08\101", IF_8086|IF_SM},
+    {I_OR, 2, {REG8,REG8,0}, "\1\x08\101", IF_8086},
+    {I_OR, 2, {MEMORY,REG16,0}, "\320\300\1\x09\101", IF_8086|IF_SM},
+    {I_OR, 2, {REG16,REG16,0}, "\320\1\x09\101", IF_8086},
+    {I_OR, 2, {MEMORY,REG32,0}, "\321\300\1\x09\101", IF_386|IF_SM},
+    {I_OR, 2, {REG32,REG32,0}, "\321\1\x09\101", IF_386},
+    {I_OR, 2, {REG8,MEMORY,0}, "\301\1\x0A\110", IF_8086|IF_SM},
+    {I_OR, 2, {REG8,REG8,0}, "\1\x0A\110", IF_8086},
+    {I_OR, 2, {REG16,MEMORY,0}, "\320\301\1\x0B\110", IF_8086|IF_SM},
+    {I_OR, 2, {REG16,REG16,0}, "\320\1\x0B\110", IF_8086},
+    {I_OR, 2, {REG32,MEMORY,0}, "\321\301\1\x0B\110", IF_386|IF_SM},
+    {I_OR, 2, {REG32,REG32,0}, "\321\1\x0B\110", IF_386},
+    {I_OR, 2, {REGMEM|BITS16,IMMEDIATE|BITS8,0}, "\320\300\1\x83\201\15", IF_8086},
+    {I_OR, 2, {REGMEM|BITS32,IMMEDIATE|BITS8,0}, "\321\300\1\x83\201\15", IF_386},
+    {I_OR, 2, {REG_AL,IMMEDIATE,0}, "\1\x0C\21", IF_8086|IF_SM},
+    {I_OR, 2, {REG_AX,IMMEDIATE,0}, "\320\1\x0D\31", IF_8086|IF_SM},
+    {I_OR, 2, {REG_EAX,IMMEDIATE,0}, "\321\1\x0D\41", IF_386|IF_SM},
+    {I_OR, 2, {REGMEM|BITS8,IMMEDIATE,0}, "\300\1\x80\201\21", IF_8086|IF_SM},
+    {I_OR, 2, {REGMEM|BITS16,IMMEDIATE,0}, "\320\300\134\1\x81\201\131", IF_8086|IF_SM},
+    {I_OR, 2, {REGMEM|BITS32,IMMEDIATE,0}, "\321\300\144\1\x81\201\141", IF_386|IF_SM},
+    {I_OR, 2, {MEMORY,IMMEDIATE|BITS8,0}, "\300\1\x80\201\21", IF_8086|IF_SM},
+    {I_OR, 2, {MEMORY,IMMEDIATE|BITS16,0}, "\320\300\134\1\x81\201\131", IF_8086|IF_SM},
+    {I_OR, 2, {MEMORY,IMMEDIATE|BITS32,0}, "\321\300\144\1\x81\201\141", IF_386|IF_SM},
+    {I_OUT, 2, {IMMEDIATE,REG_AL,0}, "\1\xE6\24", IF_8086|IF_SB},
+    {I_OUT, 2, {IMMEDIATE,REG_AX,0}, "\320\1\xE7\24", IF_8086|IF_SB},
+    {I_OUT, 2, {IMMEDIATE,REG_EAX,0}, "\321\1\xE7\24", IF_386|IF_SB},
+    {I_OUT, 2, {REG_DX,REG_AL,0}, "\1\xEE", IF_8086},
+    {I_OUT, 2, {REG_DX,REG_AX,0}, "\320\1\xEF", IF_8086},
+    {I_OUT, 2, {REG_DX,REG_EAX,0}, "\321\1\xEF", IF_386},
+    {I_OUTSB, 0, {0,0,0}, "\1\x6E", IF_186},
+    {I_OUTSD, 0, {0,0,0}, "\321\1\x6F", IF_386},
+    {I_OUTSW, 0, {0,0,0}, "\320\1\x6F", IF_186},
+    {I_PACKSSDW, 2, {MMXREG,MEMORY,0}, "\301\2\x0F\x6B\110", IF_PENT|IF_MMX|IF_SM},
+    {I_PACKSSDW, 2, {MMXREG,MMXREG,0}, "\2\x0F\x6B\110", IF_PENT|IF_MMX},
+    {I_PACKSSWB, 2, {MMXREG,MEMORY,0}, "\301\2\x0F\x63\110", IF_PENT|IF_MMX|IF_SM},
+    {I_PACKSSWB, 2, {MMXREG,MMXREG,0}, "\2\x0F\x63\110", IF_PENT|IF_MMX},
+    {I_PACKUSWB, 2, {MMXREG,MEMORY,0}, "\301\2\x0F\x67\110", IF_PENT|IF_MMX|IF_SM},
+    {I_PACKUSWB, 2, {MMXREG,MMXREG,0}, "\2\x0F\x67\110", IF_PENT|IF_MMX},
+    {I_PADDB, 2, {MMXREG,MEMORY,0}, "\301\2\x0F\xFC\110", IF_PENT|IF_MMX|IF_SM},
+    {I_PADDB, 2, {MMXREG,MMXREG,0}, "\2\x0F\xFC\110", IF_PENT|IF_MMX},
+    {I_PADDD, 2, {MMXREG,MEMORY,0}, "\301\2\x0F\xFE\110", IF_PENT|IF_MMX|IF_SM},
+    {I_PADDD, 2, {MMXREG,MMXREG,0}, "\2\x0F\xFE\110", IF_PENT|IF_MMX},
+    {I_PADDSB, 2, {MMXREG,MEMORY,0}, "\301\2\x0F\xEC\110", IF_PENT|IF_MMX|IF_SM},
+    {I_PADDSB, 2, {MMXREG,MMXREG,0}, "\2\x0F\xEC\110", IF_PENT|IF_MMX},
+    {I_PADDSIW, 2, {MMXREG,MEMORY,0}, "\301\2\x0F\x51\110", IF_PENT|IF_MMX|IF_SM|IF_CYRIX},
+    {I_PADDSIW, 2, {MMXREG,MMXREG,0}, "\2\x0F\x51\110", IF_PENT|IF_MMX|IF_CYRIX},
+    {I_PADDSW, 2, {MMXREG,MEMORY,0}, "\301\2\x0F\xED\110", IF_PENT|IF_MMX|IF_SM},
+    {I_PADDSW, 2, {MMXREG,MMXREG,0}, "\2\x0F\xED\110", IF_PENT|IF_MMX},
+    {I_PADDUSB, 2, {MMXREG,MEMORY,0}, "\301\2\x0F\xDC\110", IF_PENT|IF_MMX|IF_SM},
+    {I_PADDUSB, 2, {MMXREG,MMXREG,0}, "\2\x0F\xDC\110", IF_PENT|IF_MMX},
+    {I_PADDUSW, 2, {MMXREG,MEMORY,0}, "\301\2\x0F\xDD\110", IF_PENT|IF_MMX|IF_SM},
+    {I_PADDUSW, 2, {MMXREG,MMXREG,0}, "\2\x0F\xDD\110", IF_PENT|IF_MMX},
+    {I_PADDW, 2, {MMXREG,MEMORY,0}, "\301\2\x0F\xFD\110", IF_PENT|IF_MMX|IF_SM},
+    {I_PADDW, 2, {MMXREG,MMXREG,0}, "\2\x0F\xFD\110", IF_PENT|IF_MMX},
+    {I_PAND, 2, {MMXREG,MEMORY,0}, "\301\2\x0F\xDB\110", IF_PENT|IF_MMX|IF_SM},
+    {I_PAND, 2, {MMXREG,MMXREG,0}, "\2\x0F\xDB\110", IF_PENT|IF_MMX},
+    {I_PANDN, 2, {MMXREG,MEMORY,0}, "\301\2\x0F\xDF\110", IF_PENT|IF_MMX|IF_SM},
+    {I_PANDN, 2, {MMXREG,MMXREG,0}, "\2\x0F\xDF\110", IF_PENT|IF_MMX},
+    {I_PAVEB, 2, {MMXREG,MEMORY,0}, "\301\2\x0F\x50\110", IF_PENT|IF_MMX|IF_SM|IF_CYRIX},
+    {I_PAVEB, 2, {MMXREG,MMXREG,0}, "\2\x0F\x50\110", IF_PENT|IF_MMX|IF_CYRIX},
+    {I_PAVGUSB, 2, {MMXREG,MEMORY,0}, "\301\2\x0F\x0F\110\01\xBF", IF_PENT|IF_3DNOW|IF_SM},
+    {I_PAVGUSB, 2, {MMXREG,MMXREG,0}, "\2\x0F\x0F\110\01\xBF", IF_PENT|IF_3DNOW},
+    {I_PCMPEQB, 2, {MMXREG,MEMORY,0}, "\301\2\x0F\x74\110", IF_PENT|IF_MMX|IF_SM},
+    {I_PCMPEQB, 2, {MMXREG,MMXREG,0}, "\2\x0F\x74\110", IF_PENT|IF_MMX},
+    {I_PCMPEQD, 2, {MMXREG,MEMORY,0}, "\301\2\x0F\x76\110", IF_PENT|IF_MMX|IF_SM},
+    {I_PCMPEQD, 2, {MMXREG,MMXREG,0}, "\2\x0F\x76\110", IF_PENT|IF_MMX},
+    {I_PCMPEQW, 2, {MMXREG,MEMORY,0}, "\301\2\x0F\x75\110", IF_PENT|IF_MMX|IF_SM},
+    {I_PCMPEQW, 2, {MMXREG,MMXREG,0}, "\2\x0F\x75\110", IF_PENT|IF_MMX},
+    {I_PCMPGTB, 2, {MMXREG,MEMORY,0}, "\301\2\x0F\x64\110", IF_PENT|IF_MMX|IF_SM},
+    {I_PCMPGTB, 2, {MMXREG,MMXREG,0}, "\2\x0F\x64\110", IF_PENT|IF_MMX},
+    {I_PCMPGTD, 2, {MMXREG,MEMORY,0}, "\301\2\x0F\x66\110", IF_PENT|IF_MMX|IF_SM},
+    {I_PCMPGTD, 2, {MMXREG,MMXREG,0}, "\2\x0F\x66\110", IF_PENT|IF_MMX},
+    {I_PCMPGTW, 2, {MMXREG,MEMORY,0}, "\301\2\x0F\x65\110", IF_PENT|IF_MMX|IF_SM},
+    {I_PCMPGTW, 2, {MMXREG,MMXREG,0}, "\2\x0F\x65\110", IF_PENT|IF_MMX},
+    {I_PDISTIB, 2, {MMXREG,MEMORY,0}, "\301\2\x0F\x54\110", IF_PENT|IF_MMX|IF_SM|IF_CYRIX},
+    {I_PF2ID, 2, {MMXREG,MEMORY,0}, "\301\2\x0F\x0F\110\01\x1D", IF_PENT|IF_3DNOW|IF_SM},
+    {I_PF2ID, 2, {MMXREG,MMXREG,0}, "\2\x0F\x0F\110\01\x1D", IF_PENT|IF_3DNOW},
+    {I_PFACC, 2, {MMXREG,MEMORY,0}, "\301\2\x0F\x0F\110\01\xAE", IF_PENT|IF_3DNOW|IF_SM},
+    {I_PFACC, 2, {MMXREG,MMXREG,0}, "\2\x0F\x0F\110\01\xAE", IF_PENT|IF_3DNOW},
+    {I_PFADD, 2, {MMXREG,MEMORY,0}, "\301\2\x0F\x0F\110\01\x9E", IF_PENT|IF_3DNOW|IF_SM},
+    {I_PFADD, 2, {MMXREG,MMXREG,0}, "\2\x0F\x0F\110\01\x9E", IF_PENT|IF_3DNOW},
+    {I_PFCMPEQ, 2, {MMXREG,MEMORY,0}, "\301\2\x0F\x0F\110\01\xB0", IF_PENT|IF_3DNOW|IF_SM},
+    {I_PFCMPEQ, 2, {MMXREG,MMXREG,0}, "\2\x0F\x0F\110\01\xB0", IF_PENT|IF_3DNOW},
+    {I_PFCMPGE, 2, {MMXREG,MEMORY,0}, "\301\2\x0F\x0F\110\01\x90", IF_PENT|IF_3DNOW|IF_SM},
+    {I_PFCMPGE, 2, {MMXREG,MMXREG,0}, "\2\x0F\x0F\110\01\x90", IF_PENT|IF_3DNOW},
+    {I_PFCMPGT, 2, {MMXREG,MEMORY,0}, "\301\2\x0F\x0F\110\01\xA0", IF_PENT|IF_3DNOW|IF_SM},
+    {I_PFCMPGT, 2, {MMXREG,MMXREG,0}, "\2\x0F\x0F\110\01\xA0", IF_PENT|IF_3DNOW},
+    {I_PFMAX, 2, {MMXREG,MEMORY,0}, "\301\2\x0F\x0F\110\01\xA4", IF_PENT|IF_3DNOW|IF_SM},
+    {I_PFMAX, 2, {MMXREG,MMXREG,0}, "\2\x0F\x0F\110\01\xA4", IF_PENT|IF_3DNOW},
+    {I_PFMIN, 2, {MMXREG,MEMORY,0}, "\301\2\x0F\x0F\110\01\x94", IF_PENT|IF_3DNOW|IF_SM},
+    {I_PFMIN, 2, {MMXREG,MMXREG,0}, "\2\x0F\x0F\110\01\x94", IF_PENT|IF_3DNOW},
+    {I_PFMUL, 2, {MMXREG,MEMORY,0}, "\301\2\x0F\x0F\110\01\xB4", IF_PENT|IF_3DNOW|IF_SM},
+    {I_PFMUL, 2, {MMXREG,MMXREG,0}, "\2\x0F\x0F\110\01\xB4", IF_PENT|IF_3DNOW},
+    {I_PFRCP, 2, {MMXREG,MEMORY,0}, "\301\2\x0F\x0F\110\01\x96", IF_PENT|IF_3DNOW|IF_SM},
+    {I_PFRCP, 2, {MMXREG,MMXREG,0}, "\2\x0F\x0F\110\01\x96", IF_PENT|IF_3DNOW},
+    {I_PFRCPIT1, 2, {MMXREG,MEMORY,0}, "\301\2\x0F\x0F\110\01\xA6", IF_PENT|IF_3DNOW|IF_SM},
+    {I_PFRCPIT1, 2, {MMXREG,MMXREG,0}, "\2\x0F\x0F\110\01\xA6", IF_PENT|IF_3DNOW},
+    {I_PFRCPIT2, 2, {MMXREG,MEMORY,0}, "\301\2\x0F\x0F\110\01\xB6", IF_PENT|IF_3DNOW|IF_SM},
+    {I_PFRCPIT2, 2, {MMXREG,MMXREG,0}, "\2\x0F\x0F\110\01\xB6", IF_PENT|IF_3DNOW},
+    {I_PFRSQIT1, 2, {MMXREG,MEMORY,0}, "\301\2\x0F\x0F\110\01\xA7", IF_PENT|IF_3DNOW|IF_SM},
+    {I_PFRSQIT1, 2, {MMXREG,MMXREG,0}, "\2\x0F\x0F\110\01\xA7", IF_PENT|IF_3DNOW},
+    {I_PFRSQRT, 2, {MMXREG,MEMORY,0}, "\301\2\x0F\x0F\110\01\x97", IF_PENT|IF_3DNOW|IF_SM},
+    {I_PFRSQRT, 2, {MMXREG,MMXREG,0}, "\2\x0F\x0F\110\01\x97", IF_PENT|IF_3DNOW},
+    {I_PFSUB, 2, {MMXREG,MEMORY,0}, "\301\2\x0F\x0F\110\01\x9A", IF_PENT|IF_3DNOW|IF_SM},
+    {I_PFSUB, 2, {MMXREG,MMXREG,0}, "\2\x0F\x0F\110\01\x9A", IF_PENT|IF_3DNOW},
+    {I_PFSUBR, 2, {MMXREG,MEMORY,0}, "\301\2\x0F\x0F\110\01\xAA", IF_PENT|IF_3DNOW|IF_SM},
+    {I_PFSUBR, 2, {MMXREG,MMXREG,0}, "\2\x0F\x0F\110\01\xAA", IF_PENT|IF_3DNOW},
+    {I_PI2FD, 2, {MMXREG,MEMORY,0}, "\301\2\x0F\x0F\110\01\x0D", IF_PENT|IF_3DNOW|IF_SM},
+    {I_PI2FD, 2, {MMXREG,MMXREG,0}, "\2\x0F\x0F\110\01\x0D", IF_PENT|IF_3DNOW},
+    {I_PMACHRIW, 2, {MMXREG,MEMORY,0}, "\301\2\x0F\x5E\110", IF_PENT|IF_MMX|IF_SM|IF_CYRIX},
+    {I_PMADDWD, 2, {MMXREG,MEMORY,0}, "\301\2\x0F\xF5\110", IF_PENT|IF_MMX|IF_SM},
+    {I_PMADDWD, 2, {MMXREG,MMXREG,0}, "\2\x0F\xF5\110", IF_PENT|IF_MMX},
+    {I_PMAGW, 2, {MMXREG,MEMORY,0}, "\301\2\x0F\x52\110", IF_PENT|IF_MMX|IF_SM|IF_CYRIX},
+    {I_PMAGW, 2, {MMXREG,MMXREG,0}, "\2\x0F\x52\110", IF_PENT|IF_MMX|IF_CYRIX},
+    {I_PMULHRIW, 2, {MMXREG,MEMORY,0}, "\301\2\x0F\x5D\110", IF_PENT|IF_MMX|IF_SM|IF_CYRIX},
+    {I_PMULHRIW, 2, {MMXREG,MMXREG,0}, "\2\x0F\x5D\110", IF_PENT|IF_MMX|IF_CYRIX},
+    {I_PMULHRWA, 2, {MMXREG,MEMORY,0}, "\301\2\x0F\x0F\110\1\xB7", IF_PENT|IF_3DNOW|IF_SM},
+    {I_PMULHRWA, 2, {MMXREG,MMXREG,0}, "\2\x0F\x0F\110\1\xB7", IF_PENT|IF_3DNOW},
+    {I_PMULHRWC, 2, {MMXREG,MEMORY,0}, "\301\2\x0F\x59\110", IF_PENT|IF_MMX|IF_SM|IF_CYRIX},
+    {I_PMULHRWC, 2, {MMXREG,MMXREG,0}, "\2\x0F\x59\110", IF_PENT|IF_MMX|IF_CYRIX},
+    {I_PMULHW, 2, {MMXREG,MEMORY,0}, "\301\2\x0F\xE5\110", IF_PENT|IF_MMX|IF_SM},
+    {I_PMULHW, 2, {MMXREG,MMXREG,0}, "\2\x0F\xE5\110", IF_PENT|IF_MMX},
+    {I_PMULLW, 2, {MMXREG,MEMORY,0}, "\301\2\x0F\xD5\110", IF_PENT|IF_MMX|IF_SM},
+    {I_PMULLW, 2, {MMXREG,MMXREG,0}, "\2\x0F\xD5\110", IF_PENT|IF_MMX},
+    {I_PMVGEZB, 2, {MMXREG,MEMORY,0}, "\301\2\x0F\x5C\110", IF_PENT|IF_MMX|IF_SM|IF_CYRIX},
+    {I_PMVLZB, 2, {MMXREG,MEMORY,0}, "\301\2\x0F\x5B\110", IF_PENT|IF_MMX|IF_SM|IF_CYRIX},
+    {I_PMVNZB, 2, {MMXREG,MEMORY,0}, "\301\2\x0F\x5A\110", IF_PENT|IF_MMX|IF_SM|IF_CYRIX},
+    {I_PMVZB, 2, {MMXREG,MEMORY,0}, "\301\2\x0F\x58\110", IF_PENT|IF_MMX|IF_SM|IF_CYRIX},
+    {I_POP, 1, {REG16,0,0}, "\320\10\x58", IF_8086},
+    {I_POP, 1, {REG32,0,0}, "\321\10\x58", IF_386},
+    {I_POP, 1, {REGMEM|BITS16,0,0}, "\320\300\1\x8F\200", IF_8086},
+    {I_POP, 1, {REGMEM|BITS32,0,0}, "\321\300\1\x8F\200", IF_386},
+    {I_POP, 1, {REG_DESS,0,0}, "\4", IF_8086},
+    {I_POP, 1, {REG_FSGS,0,0}, "\1\x0F\5", IF_386},
+    {I_POPA, 0, {0,0,0}, "\322\1\x61", IF_186},
+    {I_POPAD, 0, {0,0,0}, "\321\1\x61", IF_386},
+    {I_POPAW, 0, {0,0,0}, "\320\1\x61", IF_186},
+    {I_POPF, 0, {0,0,0}, "\322\1\x9D", IF_8086},
+    {I_POPFD, 0, {0,0,0}, "\321\1\x9D", IF_386},
+    {I_POPFW, 0, {0,0,0}, "\320\1\x9D", IF_8086},
+    {I_POR, 2, {MMXREG,MEMORY,0}, "\301\2\x0F\xEB\110", IF_PENT|IF_MMX|IF_SM},
+    {I_POR, 2, {MMXREG,MMXREG,0}, "\2\x0F\xEB\110", IF_PENT|IF_MMX},
+    {I_PREFETCH, 1, {MEMORY,0,0}, "\2\x0F\x0D\200", IF_PENT|IF_3DNOW|IF_SM},
+    {I_PREFETCHW, 1, {MEMORY,0,0}, "\2\x0F\x0D\201", IF_PENT|IF_3DNOW|IF_SM},
+    {I_PSLLD, 2, {MMXREG,MEMORY,0}, "\301\2\x0F\xF2\110", IF_PENT|IF_MMX|IF_SM},
+    {I_PSLLD, 2, {MMXREG,MMXREG,0}, "\2\x0F\xF2\110", IF_PENT|IF_MMX},
+    {I_PSLLD, 2, {MMXREG,IMMEDIATE,0}, "\2\x0F\x72\206\25", IF_PENT|IF_MMX},
+    {I_PSLLQ, 2, {MMXREG,MEMORY,0}, "\301\2\x0F\xF3\110", IF_PENT|IF_MMX|IF_SM},
+    {I_PSLLQ, 2, {MMXREG,MMXREG,0}, "\2\x0F\xF3\110", IF_PENT|IF_MMX},
+    {I_PSLLQ, 2, {MMXREG,IMMEDIATE,0}, "\2\x0F\x73\206\25", IF_PENT|IF_MMX},
+    {I_PSLLW, 2, {MMXREG,MEMORY,0}, "\301\2\x0F\xF1\110", IF_PENT|IF_MMX|IF_SM},
+    {I_PSLLW, 2, {MMXREG,MMXREG,0}, "\2\x0F\xF1\110", IF_PENT|IF_MMX},
+    {I_PSLLW, 2, {MMXREG,IMMEDIATE,0}, "\2\x0F\x71\206\25", IF_PENT|IF_MMX},
+    {I_PSRAD, 2, {MMXREG,MEMORY,0}, "\301\2\x0F\xE2\110", IF_PENT|IF_MMX|IF_SM},
+    {I_PSRAD, 2, {MMXREG,MMXREG,0}, "\2\x0F\xE2\110", IF_PENT|IF_MMX},
+    {I_PSRAD, 2, {MMXREG,IMMEDIATE,0}, "\2\x0F\x72\204\25", IF_PENT|IF_MMX},
+    {I_PSRAW, 2, {MMXREG,MEMORY,0}, "\301\2\x0F\xE1\110", IF_PENT|IF_MMX|IF_SM},
+    {I_PSRAW, 2, {MMXREG,MMXREG,0}, "\2\x0F\xE1\110", IF_PENT|IF_MMX},
+    {I_PSRAW, 2, {MMXREG,IMMEDIATE,0}, "\2\x0F\x71\204\25", IF_PENT|IF_MMX},
+    {I_PSRLD, 2, {MMXREG,MEMORY,0}, "\301\2\x0F\xD2\110", IF_PENT|IF_MMX|IF_SM},
+    {I_PSRLD, 2, {MMXREG,MMXREG,0}, "\2\x0F\xD2\110", IF_PENT|IF_MMX},
+    {I_PSRLD, 2, {MMXREG,IMMEDIATE,0}, "\2\x0F\x72\202\25", IF_PENT|IF_MMX},
+    {I_PSRLQ, 2, {MMXREG,MEMORY,0}, "\301\2\x0F\xD3\110", IF_PENT|IF_MMX|IF_SM},
+    {I_PSRLQ, 2, {MMXREG,MMXREG,0}, "\2\x0F\xD3\110", IF_PENT|IF_MMX},
+    {I_PSRLQ, 2, {MMXREG,IMMEDIATE,0}, "\2\x0F\x73\202\25", IF_PENT|IF_MMX},
+    {I_PSRLW, 2, {MMXREG,MEMORY,0}, "\301\2\x0F\xD1\110", IF_PENT|IF_MMX|IF_SM},
+    {I_PSRLW, 2, {MMXREG,MMXREG,0}, "\2\x0F\xD1\110", IF_PENT|IF_MMX},
+    {I_PSRLW, 2, {MMXREG,IMMEDIATE,0}, "\2\x0F\x71\202\25", IF_PENT|IF_MMX},
+    {I_PSUBB, 2, {MMXREG,MEMORY,0}, "\301\2\x0F\xF8\110", IF_PENT|IF_MMX|IF_SM},
+    {I_PSUBB, 2, {MMXREG,MMXREG,0}, "\2\x0F\xF8\110", IF_PENT|IF_MMX},
+    {I_PSUBD, 2, {MMXREG,MEMORY,0}, "\301\2\x0F\xFA\110", IF_PENT|IF_MMX|IF_SM},
+    {I_PSUBD, 2, {MMXREG,MMXREG,0}, "\2\x0F\xFA\110", IF_PENT|IF_MMX},
+    {I_PSUBSB, 2, {MMXREG,MEMORY,0}, "\301\2\x0F\xE8\110", IF_PENT|IF_MMX|IF_SM},
+    {I_PSUBSB, 2, {MMXREG,MMXREG,0}, "\2\x0F\xE8\110", IF_PENT|IF_MMX},
+    {I_PSUBSIW, 2, {MMXREG,MEMORY,0}, "\301\2\x0F\x55\110", IF_PENT|IF_MMX|IF_SM|IF_CYRIX},
+    {I_PSUBSIW, 2, {MMXREG,MMXREG,0}, "\2\x0F\x55\110", IF_PENT|IF_MMX|IF_CYRIX},
+    {I_PSUBSW, 2, {MMXREG,MEMORY,0}, "\301\2\x0F\xE9\110", IF_PENT|IF_MMX|IF_SM},
+    {I_PSUBSW, 2, {MMXREG,MMXREG,0}, "\2\x0F\xE9\110", IF_PENT|IF_MMX},
+    {I_PSUBUSB, 2, {MMXREG,MEMORY,0}, "\301\2\x0F\xD8\110", IF_PENT|IF_MMX|IF_SM},
+    {I_PSUBUSB, 2, {MMXREG,MMXREG,0}, "\2\x0F\xD8\110", IF_PENT|IF_MMX},
+    {I_PSUBUSW, 2, {MMXREG,MEMORY,0}, "\301\2\x0F\xD9\110", IF_PENT|IF_MMX|IF_SM},
+    {I_PSUBUSW, 2, {MMXREG,MMXREG,0}, "\2\x0F\xD9\110", IF_PENT|IF_MMX},
+    {I_PSUBW, 2, {MMXREG,MEMORY,0}, "\301\2\x0F\xF9\110", IF_PENT|IF_MMX|IF_SM},
+    {I_PSUBW, 2, {MMXREG,MMXREG,0}, "\2\x0F\xF9\110", IF_PENT|IF_MMX},
+    {I_PUNPCKHBW, 2, {MMXREG,MEMORY,0}, "\301\2\x0F\x68\110", IF_PENT|IF_MMX|IF_SM},
+    {I_PUNPCKHBW, 2, {MMXREG,MMXREG,0}, "\2\x0F\x68\110", IF_PENT|IF_MMX},
+    {I_PUNPCKHDQ, 2, {MMXREG,MEMORY,0}, "\301\2\x0F\x6A\110", IF_PENT|IF_MMX|IF_SM},
+    {I_PUNPCKHDQ, 2, {MMXREG,MMXREG,0}, "\2\x0F\x6A\110", IF_PENT|IF_MMX},
+    {I_PUNPCKHWD, 2, {MMXREG,MEMORY,0}, "\301\2\x0F\x69\110", IF_PENT|IF_MMX|IF_SM},
+    {I_PUNPCKHWD, 2, {MMXREG,MMXREG,0}, "\2\x0F\x69\110", IF_PENT|IF_MMX},
+    {I_PUNPCKLBW, 2, {MMXREG,MEMORY,0}, "\301\2\x0F\x60\110", IF_PENT|IF_MMX|IF_SM},
+    {I_PUNPCKLBW, 2, {MMXREG,MMXREG,0}, "\2\x0F\x60\110", IF_PENT|IF_MMX},
+    {I_PUNPCKLDQ, 2, {MMXREG,MEMORY,0}, "\301\2\x0F\x62\110", IF_PENT|IF_MMX|IF_SM},
+    {I_PUNPCKLDQ, 2, {MMXREG,MMXREG,0}, "\2\x0F\x62\110", IF_PENT|IF_MMX},
+    {I_PUNPCKLWD, 2, {MMXREG,MEMORY,0}, "\301\2\x0F\x61\110", IF_PENT|IF_MMX|IF_SM},
+    {I_PUNPCKLWD, 2, {MMXREG,MMXREG,0}, "\2\x0F\x61\110", IF_PENT|IF_MMX},
+    {I_PUSH, 1, {REG16,0,0}, "\320\10\x50", IF_8086},
+    {I_PUSH, 1, {REG32,0,0}, "\321\10\x50", IF_386},
+    {I_PUSH, 1, {REGMEM|BITS16,0,0}, "\320\300\1\xFF\206", IF_8086},
+    {I_PUSH, 1, {REGMEM|BITS32,0,0}, "\321\300\1\xFF\206", IF_386},
+    {I_PUSH, 1, {REG_CS,0,0}, "\6", IF_8086},
+    {I_PUSH, 1, {REG_DESS,0,0}, "\6", IF_8086},
+    {I_PUSH, 1, {REG_FSGS,0,0}, "\1\x0F\7", IF_386},
+    {I_PUSH, 1, {IMMEDIATE|BITS8,0,0}, "\1\x6A\14", IF_186},
+    {I_PUSH, 1, {IMMEDIATE|BITS16,0,0}, "\320\133\1\x68\130", IF_186},
+    {I_PUSH, 1, {IMMEDIATE|BITS32,0,0}, "\321\143\1\x68\140", IF_386},
+    {I_PUSH, 1, {IMMEDIATE,0,0}, "\1\x68\34", IF_186},
+    {I_PUSHA, 0, {0,0,0}, "\322\1\x60", IF_186},
+    {I_PUSHAD, 0, {0,0,0}, "\321\1\x60", IF_386},
+    {I_PUSHAW, 0, {0,0,0}, "\320\1\x60", IF_186},
+    {I_PUSHF, 0, {0,0,0}, "\322\1\x9C", IF_8086},
+    {I_PUSHFD, 0, {0,0,0}, "\321\1\x9C", IF_386},
+    {I_PUSHFW, 0, {0,0,0}, "\320\1\x9C", IF_8086},
+    {I_PXOR, 2, {MMXREG,MEMORY,0}, "\301\2\x0F\xEF\110", IF_PENT|IF_MMX|IF_SM},
+    {I_PXOR, 2, {MMXREG,MMXREG,0}, "\2\x0F\xEF\110", IF_PENT|IF_MMX},
+    {I_RCL, 2, {REGMEM|BITS8,UNITY,0}, "\300\1\xD0\202", IF_8086},
+    {I_RCL, 2, {REGMEM|BITS8,REG_CL,0}, "\300\1\xD2\202", IF_8086},
+    {I_RCL, 2, {REGMEM|BITS8,IMMEDIATE,0}, "\300\1\xC0\202\25", IF_186|IF_SB},
+    {I_RCL, 2, {REGMEM|BITS16,UNITY,0}, "\320\300\1\xD1\202", IF_8086},
+    {I_RCL, 2, {REGMEM|BITS16,REG_CL,0}, "\320\300\1\xD3\202", IF_8086},
+    {I_RCL, 2, {REGMEM|BITS16,IMMEDIATE,0}, "\320\300\1\xC1\202\25", IF_186|IF_SB},
+    {I_RCL, 2, {REGMEM|BITS32,UNITY,0}, "\321\300\1\xD1\202", IF_386},
+    {I_RCL, 2, {REGMEM|BITS32,REG_CL,0}, "\321\300\1\xD3\202", IF_386},
+    {I_RCL, 2, {REGMEM|BITS32,IMMEDIATE,0}, "\321\300\1\xC1\202\25", IF_386|IF_SB},
+    {I_RCR, 2, {REGMEM|BITS8,UNITY,0}, "\300\1\xD0\203", IF_8086},
+    {I_RCR, 2, {REGMEM|BITS8,REG_CL,0}, "\300\1\xD2\203", IF_8086},
+    {I_RCR, 2, {REGMEM|BITS8,IMMEDIATE,0}, "\300\1\xC0\203\25", IF_186|IF_SB},
+    {I_RCR, 2, {REGMEM|BITS16,UNITY,0}, "\320\300\1\xD1\203", IF_8086},
+    {I_RCR, 2, {REGMEM|BITS16,REG_CL,0}, "\320\300\1\xD3\203", IF_8086},
+    {I_RCR, 2, {REGMEM|BITS16,IMMEDIATE,0}, "\320\300\1\xC1\203\25", IF_186|IF_SB},
+    {I_RCR, 2, {REGMEM|BITS32,UNITY,0}, "\321\300\1\xD1\203", IF_386},
+    {I_RCR, 2, {REGMEM|BITS32,REG_CL,0}, "\321\300\1\xD3\203", IF_386},
+    {I_RCR, 2, {REGMEM|BITS32,IMMEDIATE,0}, "\321\300\1\xC1\203\25", IF_386|IF_SB},
+    {I_RDSHR, 1, {REGMEM|BITS32,0,0}, "\321\300\2\x0F\x36\200", IF_P6|IF_CYRIX|IF_SMM},
+    {I_RDMSR, 0, {0,0,0}, "\2\x0F\x32", IF_PENT|IF_PRIV},
+    {I_RDPMC, 0, {0,0,0}, "\2\x0F\x33", IF_P6},
+    {I_RDTSC, 0, {0,0,0}, "\2\x0F\x31", IF_PENT},
+    {I_RESB, 1, {IMMEDIATE,0,0}, "\340", IF_8086},
+    {I_RET, 0, {0,0,0}, "\1\xC3", IF_8086},
+    {I_RET, 1, {IMMEDIATE,0,0}, "\1\xC2\30", IF_8086|IF_SW},
+    {I_RETF, 0, {0,0,0}, "\1\xCB", IF_8086},
+    {I_RETF, 1, {IMMEDIATE,0,0}, "\1\xCA\30", IF_8086|IF_SW},
+    {I_RETN, 0, {0,0,0}, "\1\xC3", IF_8086},
+    {I_RETN, 1, {IMMEDIATE,0,0}, "\1\xC2\30", IF_8086|IF_SW},
+    {I_ROL, 2, {REGMEM|BITS8,UNITY,0}, "\300\1\xD0\200", IF_8086},
+    {I_ROL, 2, {REGMEM|BITS8,REG_CL,0}, "\300\1\xD2\200", IF_8086},
+    {I_ROL, 2, {REGMEM|BITS8,IMMEDIATE,0}, "\300\1\xC0\200\25", IF_186|IF_SB},
+    {I_ROL, 2, {REGMEM|BITS16,UNITY,0}, "\320\300\1\xD1\200", IF_8086},
+    {I_ROL, 2, {REGMEM|BITS16,REG_CL,0}, "\320\300\1\xD3\200", IF_8086},
+    {I_ROL, 2, {REGMEM|BITS16,IMMEDIATE,0}, "\320\300\1\xC1\200\25", IF_186|IF_SB},
+    {I_ROL, 2, {REGMEM|BITS32,UNITY,0}, "\321\300\1\xD1\200", IF_386},
+    {I_ROL, 2, {REGMEM|BITS32,REG_CL,0}, "\321\300\1\xD3\200", IF_386},
+    {I_ROL, 2, {REGMEM|BITS32,IMMEDIATE,0}, "\321\300\1\xC1\200\25", IF_386|IF_SB},
+    {I_ROR, 2, {REGMEM|BITS8,UNITY,0}, "\300\1\xD0\201", IF_8086},
+    {I_ROR, 2, {REGMEM|BITS8,REG_CL,0}, "\300\1\xD2\201", IF_8086},
+    {I_ROR, 2, {REGMEM|BITS8,IMMEDIATE,0}, "\300\1\xC0\201\25", IF_186|IF_SB},
+    {I_ROR, 2, {REGMEM|BITS16,UNITY,0}, "\320\300\1\xD1\201", IF_8086},
+    {I_ROR, 2, {REGMEM|BITS16,REG_CL,0}, "\320\300\1\xD3\201", IF_8086},
+    {I_ROR, 2, {REGMEM|BITS16,IMMEDIATE,0}, "\320\300\1\xC1\201\25", IF_186|IF_SB},
+    {I_ROR, 2, {REGMEM|BITS32,UNITY,0}, "\321\300\1\xD1\201", IF_386},
+    {I_ROR, 2, {REGMEM|BITS32,REG_CL,0}, "\321\300\1\xD3\201", IF_386},
+    {I_ROR, 2, {REGMEM|BITS32,IMMEDIATE,0}, "\321\300\1\xC1\201\25", IF_386|IF_SB},
+    {I_RSDC, 2, {REG_SREG,MEMORY|BITS80,0}, "\301\2\x0F\x79\110", IF_486|IF_CYRIX|IF_SMM},
+    {I_RSLDT, 1, {MEMORY|BITS80,0,0}, "\300\2\x0F\x7B\200", IF_486|IF_CYRIX|IF_SMM},
+    {I_RSM, 0, {0,0,0}, "\2\x0F\xAA", IF_PENT|IF_SMM},
+    {I_RSTS, 1, {MEMORY|BITS80,0,0}, "\300\2\x0F\x7D\200", IF_486|IF_CYRIX|IF_SMM},
+    {I_SAHF, 0, {0,0,0}, "\1\x9E", IF_8086},
+    {I_SALC, 0, {0,0,0}, "\1\xD6", IF_8086|IF_UNDOC},
+    {I_SAR, 2, {REGMEM|BITS8,UNITY,0}, "\300\1\xD0\207", IF_8086},
+    {I_SAR, 2, {REGMEM|BITS8,REG_CL,0}, "\300\1\xD2\207", IF_8086},
+    {I_SAR, 2, {REGMEM|BITS8,IMMEDIATE,0}, "\300\1\xC0\207\25", IF_186|IF_SB},
+    {I_SAR, 2, {REGMEM|BITS16,UNITY,0}, "\320\300\1\xD1\207", IF_8086},
+    {I_SAR, 2, {REGMEM|BITS16,REG_CL,0}, "\320\300\1\xD3\207", IF_8086},
+    {I_SAR, 2, {REGMEM|BITS16,IMMEDIATE,0}, "\320\300\1\xC1\207\25", IF_186|IF_SB},
+    {I_SAR, 2, {REGMEM|BITS32,UNITY,0}, "\321\300\1\xD1\207", IF_386},
+    {I_SAR, 2, {REGMEM|BITS32,REG_CL,0}, "\321\300\1\xD3\207", IF_386},
+    {I_SAR, 2, {REGMEM|BITS32,IMMEDIATE,0}, "\321\300\1\xC1\207\25", IF_386|IF_SB},
+    {I_SBB, 2, {MEMORY,REG8,0}, "\300\1\x18\101", IF_8086|IF_SM},
+    {I_SBB, 2, {REG8,REG8,0}, "\1\x18\101", IF_8086},
+    {I_SBB, 2, {MEMORY,REG16,0}, "\320\300\1\x19\101", IF_8086|IF_SM},
+    {I_SBB, 2, {REG16,REG16,0}, "\320\1\x19\101", IF_8086},
+    {I_SBB, 2, {MEMORY,REG32,0}, "\321\300\1\x19\101", IF_386|IF_SM},
+    {I_SBB, 2, {REG32,REG32,0}, "\321\1\x19\101", IF_386},
+    {I_SBB, 2, {REG8,MEMORY,0}, "\301\1\x1A\110", IF_8086|IF_SM},
+    {I_SBB, 2, {REG8,REG8,0}, "\1\x1A\110", IF_8086},
+    {I_SBB, 2, {REG16,MEMORY,0}, "\320\301\1\x1B\110", IF_8086|IF_SM},
+    {I_SBB, 2, {REG16,REG16,0}, "\320\1\x1B\110", IF_8086},
+    {I_SBB, 2, {REG32,MEMORY,0}, "\321\301\1\x1B\110", IF_386|IF_SM},
+    {I_SBB, 2, {REG32,REG32,0}, "\321\1\x1B\110", IF_386},
+    {I_SBB, 2, {REGMEM|BITS16,IMMEDIATE|BITS8,0}, "\320\300\1\x83\203\15", IF_8086},
+    {I_SBB, 2, {REGMEM|BITS32,IMMEDIATE|BITS8,0}, "\321\300\1\x83\203\15", IF_386},
+    {I_SBB, 2, {REG_AL,IMMEDIATE,0}, "\1\x1C\21", IF_8086|IF_SM},
+    {I_SBB, 2, {REG_AX,IMMEDIATE,0}, "\320\1\x1D\31", IF_8086|IF_SM},
+    {I_SBB, 2, {REG_EAX,IMMEDIATE,0}, "\321\1\x1D\41", IF_386|IF_SM},
+    {I_SBB, 2, {REGMEM|BITS8,IMMEDIATE,0}, "\300\1\x80\203\21", IF_8086|IF_SM},
+    {I_SBB, 2, {REGMEM|BITS16,IMMEDIATE,0}, "\320\300\134\1\x81\203\131", IF_8086|IF_SM},
+    {I_SBB, 2, {REGMEM|BITS32,IMMEDIATE,0}, "\321\300\144\1\x81\203\141", IF_386|IF_SM},
+    {I_SBB, 2, {MEMORY,IMMEDIATE|BITS8,0}, "\300\1\x80\203\21", IF_8086|IF_SM},
+    {I_SBB, 2, {MEMORY,IMMEDIATE|BITS16,0}, "\320\300\134\1\x81\203\131", IF_8086|IF_SM},
+    {I_SBB, 2, {MEMORY,IMMEDIATE|BITS32,0}, "\321\300\144\1\x81\203\141", IF_386|IF_SM},
+    {I_SCASB, 0, {0,0,0}, "\332\1\xAE", IF_8086},
+    {I_SCASD, 0, {0,0,0}, "\332\321\1\xAF", IF_386},
+    {I_SCASW, 0, {0,0,0}, "\332\320\1\xAF", IF_8086},
+    {I_SGDT, 1, {MEMORY,0,0}, "\300\2\x0F\x01\200", IF_286},
+    {I_SHL, 2, {REGMEM|BITS8,UNITY,0}, "\300\1\xD0\204", IF_8086},
+    {I_SHL, 2, {REGMEM|BITS8,REG_CL,0}, "\300\1\xD2\204", IF_8086},
+    {I_SHL, 2, {REGMEM|BITS8,IMMEDIATE,0}, "\300\1\xC0\204\25", IF_186|IF_SB},
+    {I_SHL, 2, {REGMEM|BITS16,UNITY,0}, "\320\300\1\xD1\204", IF_8086},
+    {I_SHL, 2, {REGMEM|BITS16,REG_CL,0}, "\320\300\1\xD3\204", IF_8086},
+    {I_SHL, 2, {REGMEM|BITS16,IMMEDIATE,0}, "\320\300\1\xC1\204\25", IF_186|IF_SB},
+    {I_SHL, 2, {REGMEM|BITS32,UNITY,0}, "\321\300\1\xD1\204", IF_386},
+    {I_SHL, 2, {REGMEM|BITS32,REG_CL,0}, "\321\300\1\xD3\204", IF_386},
+    {I_SHL, 2, {REGMEM|BITS32,IMMEDIATE,0}, "\321\300\1\xC1\204\25", IF_386|IF_SB},
+    {I_SHLD, 3, {MEMORY,REG16,IMMEDIATE}, "\300\320\2\x0F\xA4\101\26", IF_386|IF_SM2|IF_SB|IF_AR2},
+    {I_SHLD, 3, {REG16,REG16,IMMEDIATE}, "\320\2\x0F\xA4\101\26", IF_386|IF_SM2|IF_SB|IF_AR2},
+    {I_SHLD, 3, {MEMORY,REG32,IMMEDIATE}, "\300\321\2\x0F\xA4\101\26", IF_386|IF_SM2|IF_SB|IF_AR2},
+    {I_SHLD, 3, {REG32,REG32,IMMEDIATE}, "\321\2\x0F\xA4\101\26", IF_386|IF_SM2|IF_SB|IF_AR2},
+    {I_SHLD, 3, {MEMORY,REG16,REG_CL}, "\300\320\2\x0F\xA5\101", IF_386|IF_SM},
+    {I_SHLD, 3, {REG16,REG16,REG_CL}, "\320\2\x0F\xA5\101", IF_386},
+    {I_SHLD, 3, {MEMORY,REG32,REG_CL}, "\300\321\2\x0F\xA5\101", IF_386|IF_SM},
+    {I_SHLD, 3, {REG32,REG32,REG_CL}, "\321\2\x0F\xA5\101", IF_386},
+    {I_SHR, 2, {REGMEM|BITS8,UNITY,0}, "\300\1\xD0\205", IF_8086},
+    {I_SHR, 2, {REGMEM|BITS8,REG_CL,0}, "\300\1\xD2\205", IF_8086},
+    {I_SHR, 2, {REGMEM|BITS8,IMMEDIATE,0}, "\300\1\xC0\205\25", IF_186|IF_SB},
+    {I_SHR, 2, {REGMEM|BITS16,UNITY,0}, "\320\300\1\xD1\205", IF_8086},
+    {I_SHR, 2, {REGMEM|BITS16,REG_CL,0}, "\320\300\1\xD3\205", IF_8086},
+    {I_SHR, 2, {REGMEM|BITS16,IMMEDIATE,0}, "\320\300\1\xC1\205\25", IF_186|IF_SB},
+    {I_SHR, 2, {REGMEM|BITS32,UNITY,0}, "\321\300\1\xD1\205", IF_386},
+    {I_SHR, 2, {REGMEM|BITS32,REG_CL,0}, "\321\300\1\xD3\205", IF_386},
+    {I_SHR, 2, {REGMEM|BITS32,IMMEDIATE,0}, "\321\300\1\xC1\205\25", IF_386|IF_SB},
+    {I_SHRD, 3, {MEMORY,REG16,IMMEDIATE}, "\300\320\2\x0F\xAC\101\26", IF_386|IF_SM2|IF_SB|IF_AR2},
+    {I_SHRD, 3, {REG16,REG16,IMMEDIATE}, "\320\2\x0F\xAC\101\26", IF_386|IF_SM2|IF_SB|IF_AR2},
+    {I_SHRD, 3, {MEMORY,REG32,IMMEDIATE}, "\300\321\2\x0F\xAC\101\26", IF_386|IF_SM2|IF_SB|IF_AR2},
+    {I_SHRD, 3, {REG32,REG32,IMMEDIATE}, "\321\2\x0F\xAC\101\26", IF_386|IF_SM2|IF_SB|IF_AR2},
+    {I_SHRD, 3, {MEMORY,REG16,REG_CL}, "\300\320\2\x0F\xAD\101", IF_386|IF_SM},
+    {I_SHRD, 3, {REG16,REG16,REG_CL}, "\320\2\x0F\xAD\101", IF_386},
+    {I_SHRD, 3, {MEMORY,REG32,REG_CL}, "\300\321\2\x0F\xAD\101", IF_386|IF_SM},
+    {I_SHRD, 3, {REG32,REG32,REG_CL}, "\321\2\x0F\xAD\101", IF_386},
+    {I_SIDT, 1, {MEMORY,0,0}, "\300\2\x0F\x01\201", IF_286},
+    {I_SLDT, 1, {MEMORY,0,0}, "\300\1\x0F\17\200", IF_286},
+    {I_SLDT, 1, {MEMORY|BITS16,0,0}, "\300\1\x0F\17\200", IF_286},
+    {I_SLDT, 1, {REG16,0,0}, "\320\1\x0F\17\200", IF_286},
+    {I_SLDT, 1, {REG32,0,0}, "\321\1\x0F\17\200", IF_386},
+    {I_SMI, 0, {0,0,0}, "\1\xF1", IF_386|IF_UNDOC},
+    {I_SMINT, 0, {0,0,0}, "\2\x0F\x38", IF_P6|IF_CYRIX},
+    {I_SMSW, 1, {MEMORY,0,0}, "\300\2\x0F\x01\204", IF_286},
+    {I_SMSW, 1, {MEMORY|BITS16,0,0}, "\300\2\x0F\x01\204", IF_286},
+    {I_SMSW, 1, {REG16,0,0}, "\320\2\x0F\x01\204", IF_286},
+    {I_SMSW, 1, {REG32,0,0}, "\321\2\x0F\x01\204", IF_386},
+    {I_STC, 0, {0,0,0}, "\1\xF9", IF_8086},
+    {I_STD, 0, {0,0,0}, "\1\xFD", IF_8086},
+    {I_STI, 0, {0,0,0}, "\1\xFB", IF_8086},
+    {I_STOSB, 0, {0,0,0}, "\1\xAA", IF_8086},
+    {I_STOSD, 0, {0,0,0}, "\321\1\xAB", IF_386},
+    {I_STOSW, 0, {0,0,0}, "\320\1\xAB", IF_8086},
+    {I_STR, 1, {MEMORY,0,0}, "\300\1\x0F\17\201", IF_286|IF_PROT},
+    {I_STR, 1, {MEMORY|BITS16,0,0}, "\300\1\x0F\17\201", IF_286|IF_PROT},
+    {I_STR, 1, {REG16,0,0}, "\320\1\x0F\17\201", IF_286|IF_PROT},
+    {I_STR, 1, {REG32,0,0}, "\321\1\x0F\17\201", IF_386|IF_PROT},
+    {I_SUB, 2, {MEMORY,REG8,0}, "\300\1\x28\101", IF_8086|IF_SM},
+    {I_SUB, 2, {REG8,REG8,0}, "\1\x28\101", IF_8086},
+    {I_SUB, 2, {MEMORY,REG16,0}, "\320\300\1\x29\101", IF_8086|IF_SM},
+    {I_SUB, 2, {REG16,REG16,0}, "\320\1\x29\101", IF_8086},
+    {I_SUB, 2, {MEMORY,REG32,0}, "\321\300\1\x29\101", IF_386|IF_SM},
+    {I_SUB, 2, {REG32,REG32,0}, "\321\1\x29\101", IF_386},
+    {I_SUB, 2, {REG8,MEMORY,0}, "\301\1\x2A\110", IF_8086|IF_SM},
+    {I_SUB, 2, {REG8,REG8,0}, "\1\x2A\110", IF_8086},
+    {I_SUB, 2, {REG16,MEMORY,0}, "\320\301\1\x2B\110", IF_8086|IF_SM},
+    {I_SUB, 2, {REG16,REG16,0}, "\320\1\x2B\110", IF_8086},
+    {I_SUB, 2, {REG32,MEMORY,0}, "\321\301\1\x2B\110", IF_386|IF_SM},
+    {I_SUB, 2, {REG32,REG32,0}, "\321\1\x2B\110", IF_386},
+    {I_SUB, 2, {REGMEM|BITS16,IMMEDIATE|BITS8,0}, "\320\300\1\x83\205\15", IF_8086},
+    {I_SUB, 2, {REGMEM|BITS32,IMMEDIATE|BITS8,0}, "\321\300\1\x83\205\15", IF_386},
+    {I_SUB, 2, {REG_AL,IMMEDIATE,0}, "\1\x2C\21", IF_8086|IF_SM},
+    {I_SUB, 2, {REG_AX,IMMEDIATE,0}, "\320\1\x2D\31", IF_8086|IF_SM},
+    {I_SUB, 2, {REG_EAX,IMMEDIATE,0}, "\321\1\x2D\41", IF_386|IF_SM},
+    {I_SUB, 2, {REGMEM|BITS8,IMMEDIATE,0}, "\300\1\x80\205\21", IF_8086|IF_SM},
+    {I_SUB, 2, {REGMEM|BITS16,IMMEDIATE,0}, "\320\300\134\1\x81\205\131", IF_8086|IF_SM},
+    {I_SUB, 2, {REGMEM|BITS32,IMMEDIATE,0}, "\321\300\144\1\x81\205\141", IF_386|IF_SM},
+    {I_SUB, 2, {MEMORY,IMMEDIATE|BITS8,0}, "\300\1\x80\205\21", IF_8086|IF_SM},
+    {I_SUB, 2, {MEMORY,IMMEDIATE|BITS16,0}, "\320\300\134\1\x81\205\131", IF_8086|IF_SM},
+    {I_SUB, 2, {MEMORY,IMMEDIATE|BITS32,0}, "\321\300\144\1\x81\205\141", IF_386|IF_SM},
+    {I_SVDC, 2, {MEMORY|BITS80,REG_SREG,0}, "\300\2\x0F\x78\101", IF_486|IF_CYRIX|IF_SMM},
+    {I_SVLDT, 1, {MEMORY|BITS80,0,0}, "\300\2\x0F\x7A\200", IF_486|IF_CYRIX|IF_SMM},
+    {I_SVTS, 1, {MEMORY|BITS80,0,0}, "\300\2\x0F\x7C\200", IF_486|IF_CYRIX|IF_SMM},
+    {I_SYSCALL, 0, {0,0,0}, "\2\x0F\x05", IF_P6|IF_AMD},
+    {I_SYSENTER, 0, {0,0,0}, "\2\x0F\x34", IF_P6},
+    {I_SYSEXIT, 0, {0,0,0}, "\2\x0F\x35", IF_P6|IF_PRIV},
+    {I_SYSRET, 0, {0,0,0}, "\2\x0F\x07", IF_P6|IF_PRIV|IF_AMD},
+    {I_TEST, 2, {MEMORY,REG8,0}, "\300\1\x84\101", IF_8086|IF_SM},
+    {I_TEST, 2, {REG8,REG8,0}, "\1\x84\101", IF_8086},
+    {I_TEST, 2, {MEMORY,REG16,0}, "\320\300\1\x85\101", IF_8086|IF_SM},
+    {I_TEST, 2, {REG16,REG16,0}, "\320\1\x85\101", IF_8086},
+    {I_TEST, 2, {MEMORY,REG32,0}, "\321\300\1\x85\101", IF_386|IF_SM},
+    {I_TEST, 2, {REG32,REG32,0}, "\321\1\x85\101", IF_386},
+    {I_TEST, 2, {REG8,MEMORY,0}, "\301\1\x84\110", IF_8086|IF_SM},
+    {I_TEST, 2, {REG16,MEMORY,0}, "\320\301\1\x85\110", IF_8086|IF_SM},
+    {I_TEST, 2, {REG32,MEMORY,0}, "\321\301\1\x85\110", IF_386|IF_SM},
+    {I_TEST, 2, {REG_AL,IMMEDIATE,0}, "\1\xA8\21", IF_8086|IF_SM},
+    {I_TEST, 2, {REG_AX,IMMEDIATE,0}, "\320\1\xA9\31", IF_8086|IF_SM},
+    {I_TEST, 2, {REG_EAX,IMMEDIATE,0}, "\321\1\xA9\41", IF_386|IF_SM},
+    {I_TEST, 2, {REGMEM|BITS8,IMMEDIATE,0}, "\300\1\xF6\200\21", IF_8086|IF_SM},
+    {I_TEST, 2, {REGMEM|BITS16,IMMEDIATE,0}, "\320\300\1\xF7\200\31", IF_8086|IF_SM},
+    {I_TEST, 2, {REGMEM|BITS32,IMMEDIATE,0}, "\321\300\1\xF7\200\41", IF_386|IF_SM},
+    {I_TEST, 2, {MEMORY,IMMEDIATE|BITS8,0}, "\300\1\xF6\200\21", IF_8086|IF_SM},
+    {I_TEST, 2, {MEMORY,IMMEDIATE|BITS16,0}, "\320\300\1\xF7\200\31", IF_8086|IF_SM},
+    {I_TEST, 2, {MEMORY,IMMEDIATE|BITS32,0}, "\321\300\1\xF7\200\41", IF_386|IF_SM},
+    {I_UD0, 0, {0,0,0}, "\2\x0F\xFF", IF_286|IF_UNDOC},
+    {I_UD1, 0, {0,0,0}, "\2\x0F\xB9", IF_286|IF_UNDOC},
+    {I_UD2, 0, {0,0,0}, "\2\x0F\x0B", IF_286},
+    {I_UMOV, 2, {MEMORY,REG8,0}, "\300\2\x0F\x10\101", IF_386|IF_UNDOC|IF_SM},
+    {I_UMOV, 2, {REG8,REG8,0}, "\2\x0F\x10\101", IF_386|IF_UNDOC},
+    {I_UMOV, 2, {MEMORY,REG16,0}, "\320\300\2\x0F\x11\101", IF_386|IF_UNDOC|IF_SM},
+    {I_UMOV, 2, {REG16,REG16,0}, "\320\2\x0F\x11\101", IF_386|IF_UNDOC},
+    {I_UMOV, 2, {MEMORY,REG32,0}, "\321\300\2\x0F\x11\101", IF_386|IF_UNDOC|IF_SM},
+    {I_UMOV, 2, {REG32,REG32,0}, "\321\2\x0F\x11\101", IF_386|IF_UNDOC},
+    {I_UMOV, 2, {REG8,MEMORY,0}, "\301\2\x0F\x12\110", IF_386|IF_UNDOC|IF_SM},
+    {I_UMOV, 2, {REG8,REG8,0}, "\2\x0F\x12\110", IF_386|IF_UNDOC},
+    {I_UMOV, 2, {REG16,MEMORY,0}, "\320\301\2\x0F\x13\110", IF_386|IF_UNDOC|IF_SM},
+    {I_UMOV, 2, {REG16,REG16,0}, "\320\2\x0F\x13\110", IF_386|IF_UNDOC},
+    {I_UMOV, 2, {REG32,MEMORY,0}, "\321\301\2\x0F\x13\110", IF_386|IF_UNDOC|IF_SM},
+    {I_UMOV, 2, {REG32,REG32,0}, "\321\2\x0F\x13\110", IF_386|IF_UNDOC},
+    {I_VERR, 1, {MEMORY,0,0}, "\300\1\x0F\17\204", IF_286|IF_PROT},
+    {I_VERR, 1, {MEMORY|BITS16,0,0}, "\300\1\x0F\17\204", IF_286|IF_PROT},
+    {I_VERR, 1, {REG16,0,0}, "\1\x0F\17\204", IF_286|IF_PROT},
+    {I_VERW, 1, {MEMORY,0,0}, "\300\1\x0F\17\205", IF_286|IF_PROT},
+    {I_VERW, 1, {MEMORY|BITS16,0,0}, "\300\1\x0F\17\205", IF_286|IF_PROT},
+    {I_VERW, 1, {REG16,0,0}, "\1\x0F\17\205", IF_286|IF_PROT},
+    {I_WAIT, 0, {0,0,0}, "\1\x9B", IF_8086},
+    {I_FWAIT, 0, {0,0,0}, "\1\x9B", IF_8086},
+    {I_WBINVD, 0, {0,0,0}, "\2\x0F\x09", IF_486|IF_PRIV},
+    {I_WRSHR, 1, {REGMEM|BITS32,0,0}, "\321\300\2\x0F\x37\200", IF_P6|IF_CYRIX|IF_SMM},
+    {I_WRMSR, 0, {0,0,0}, "\2\x0F\x30", IF_PENT|IF_PRIV},
+    {I_XADD, 2, {MEMORY,REG8,0}, "\300\2\x0F\xC0\101", IF_486|IF_SM},
+    {I_XADD, 2, {REG8,REG8,0}, "\2\x0F\xC0\101", IF_486},
+    {I_XADD, 2, {MEMORY,REG16,0}, "\320\300\2\x0F\xC1\101", IF_486|IF_SM},
+    {I_XADD, 2, {REG16,REG16,0}, "\320\2\x0F\xC1\101", IF_486},
+    {I_XADD, 2, {MEMORY,REG32,0}, "\321\300\2\x0F\xC1\101", IF_486|IF_SM},
+    {I_XADD, 2, {REG32,REG32,0}, "\321\2\x0F\xC1\101", IF_486},
+    {I_XCHG, 2, {REG_AX,REG16,0}, "\320\11\x90", IF_8086},
+    {I_XCHG, 2, {REG_EAX,REG32,0}, "\321\11\x90", IF_386},
+    {I_XCHG, 2, {REG16,REG_AX,0}, "\320\10\x90", IF_8086},
+    {I_XCHG, 2, {REG32,REG_EAX,0}, "\321\10\x90", IF_386},
+    {I_XCHG, 2, {REG8,MEMORY,0}, "\301\1\x86\110", IF_8086|IF_SM},
+    {I_XCHG, 2, {REG8,REG8,0}, "\1\x86\110", IF_8086},
+    {I_XCHG, 2, {REG16,MEMORY,0}, "\320\301\1\x87\110", IF_8086|IF_SM},
+    {I_XCHG, 2, {REG16,REG16,0}, "\320\1\x87\110", IF_8086},
+    {I_XCHG, 2, {REG32,MEMORY,0}, "\321\301\1\x87\110", IF_386|IF_SM},
+    {I_XCHG, 2, {REG32,REG32,0}, "\321\1\x87\110", IF_386},
+    {I_XCHG, 2, {MEMORY,REG8,0}, "\300\1\x86\101", IF_8086|IF_SM},
+    {I_XCHG, 2, {REG8,REG8,0}, "\1\x86\101", IF_8086},
+    {I_XCHG, 2, {MEMORY,REG16,0}, "\320\300\1\x87\101", IF_8086|IF_SM},
+    {I_XCHG, 2, {REG16,REG16,0}, "\320\1\x87\101", IF_8086},
+    {I_XCHG, 2, {MEMORY,REG32,0}, "\321\300\1\x87\101", IF_386|IF_SM},
+    {I_XCHG, 2, {REG32,REG32,0}, "\321\1\x87\101", IF_386},
+    {I_XLATB, 0, {0,0,0}, "\1\xD7", IF_8086},
+    {I_XLAT, 0, {0,0,0}, "\1\xD7", IF_8086},
+    {I_XOR, 2, {MEMORY,REG8,0}, "\300\1\x30\101", IF_8086|IF_SM},
+    {I_XOR, 2, {REG8,REG8,0}, "\1\x30\101", IF_8086},
+    {I_XOR, 2, {MEMORY,REG16,0}, "\320\300\1\x31\101", IF_8086|IF_SM},
+    {I_XOR, 2, {REG16,REG16,0}, "\320\1\x31\101", IF_8086},
+    {I_XOR, 2, {MEMORY,REG32,0}, "\321\300\1\x31\101", IF_386|IF_SM},
+    {I_XOR, 2, {REG32,REG32,0}, "\321\1\x31\101", IF_386},
+    {I_XOR, 2, {REG8,MEMORY,0}, "\301\1\x32\110", IF_8086|IF_SM},
+    {I_XOR, 2, {REG8,REG8,0}, "\1\x32\110", IF_8086},
+    {I_XOR, 2, {REG16,MEMORY,0}, "\320\301\1\x33\110", IF_8086|IF_SM},
+    {I_XOR, 2, {REG16,REG16,0}, "\320\1\x33\110", IF_8086},
+    {I_XOR, 2, {REG32,MEMORY,0}, "\321\301\1\x33\110", IF_386|IF_SM},
+    {I_XOR, 2, {REG32,REG32,0}, "\321\1\x33\110", IF_386},
+    {I_XOR, 2, {REGMEM|BITS16,IMMEDIATE|BITS8,0}, "\320\300\1\x83\206\15", IF_8086},
+    {I_XOR, 2, {REGMEM|BITS32,IMMEDIATE|BITS8,0}, "\321\300\1\x83\206\15", IF_386},
+    {I_XOR, 2, {REG_AL,IMMEDIATE,0}, "\1\x34\21", IF_8086|IF_SM},
+    {I_XOR, 2, {REG_AX,IMMEDIATE,0}, "\320\1\x35\31", IF_8086|IF_SM},
+    {I_XOR, 2, {REG_EAX,IMMEDIATE,0}, "\321\1\x35\41", IF_386|IF_SM},
+    {I_XOR, 2, {REGMEM|BITS8,IMMEDIATE,0}, "\300\1\x80\206\21", IF_8086|IF_SM},
+    {I_XOR, 2, {REGMEM|BITS16,IMMEDIATE,0}, "\320\300\134\1\x81\206\131", IF_8086|IF_SM},
+    {I_XOR, 2, {REGMEM|BITS32,IMMEDIATE,0}, "\321\300\144\1\x81\206\141", IF_386|IF_SM},
+    {I_XOR, 2, {MEMORY,IMMEDIATE|BITS8,0}, "\300\1\x80\206\21", IF_8086|IF_SM},
+    {I_XOR, 2, {MEMORY,IMMEDIATE|BITS16,0}, "\320\300\134\1\x81\206\131", IF_8086|IF_SM},
+    {I_XOR, 2, {MEMORY,IMMEDIATE|BITS32,0}, "\321\300\144\1\x81\206\141", IF_386|IF_SM},
+    {I_XSTORE, 0, {0,0,0}, "\3\x0F\xA7\xC0", IF_P6|IF_CYRIX},
+    {I_CMOVcc, 2, {REG16,MEMORY,0}, "\320\301\1\x0F\330\x40\110", IF_P6|IF_SM},
+    {I_CMOVcc, 2, {REG16,REG16,0}, "\320\1\x0F\330\x40\110", IF_P6},
+    {I_CMOVcc, 2, {REG32,MEMORY,0}, "\321\301\1\x0F\330\x40\110", IF_P6|IF_SM},
+    {I_CMOVcc, 2, {REG32,REG32,0}, "\321\1\x0F\330\x40\110", IF_P6},
+    {I_Jcc, 1, {IMMEDIATE|NEAR,0,0}, "\322\1\x0F\330\x80\64", IF_386},
+    {I_Jcc, 1, {IMMEDIATE|BITS16|NEAR,0,0}, "\320\1\x0F\330\x80\64", IF_386},
+    {I_Jcc, 1, {IMMEDIATE|BITS32|NEAR,0,0}, "\321\1\x0F\330\x80\64", IF_386},
+    {I_Jcc, 1, {IMMEDIATE,0,0}, "\330\x70\50", IF_8086},
+    {I_SETcc, 1, {MEMORY,0,0}, "\300\1\x0F\330\x90\200", IF_386|IF_SB},
+    {I_SETcc, 1, {REG8,0,0}, "\300\1\x0F\330\x90\200", IF_386},
+    {I_ADDPS, 2, {XMMREG,MEMORY,0}, "\301\331\2\x0F\x58\110", IF_KATMAI|IF_SSE},
+    {I_ADDPS, 2, {XMMREG,XMMREG,0}, "\331\2\x0F\x58\110", IF_KATMAI|IF_SSE},
+    {I_ADDSS, 2, {XMMREG,MEMORY,0}, "\301\333\2\x0F\x58\110", IF_KATMAI|IF_SSE},
+    {I_ADDSS, 2, {XMMREG,XMMREG,0}, "\333\2\x0F\x58\110", IF_KATMAI|IF_SSE},
+    {I_ANDNPS, 2, {XMMREG,MEMORY,0}, "\301\2\x0F\x55\110", IF_KATMAI|IF_SSE},
+    {I_ANDNPS, 2, {XMMREG,XMMREG,0}, "\2\x0F\x55\110", IF_KATMAI|IF_SSE},
+    {I_ANDPS, 2, {XMMREG,MEMORY,0}, "\301\2\x0F\x54\110", IF_KATMAI|IF_SSE},
+    {I_ANDPS, 2, {XMMREG,XMMREG,0}, "\2\x0F\x54\110", IF_KATMAI|IF_SSE},
+    {I_CMPEQPS, 2, {XMMREG,MEMORY,0}, "\301\331\2\x0F\xC2\110\1\x00", IF_KATMAI|IF_SSE},
+    {I_CMPEQPS, 2, {XMMREG,XMMREG,0}, "\331\2\x0F\xC2\110\1\x00", IF_KATMAI|IF_SSE},
+    {I_CMPEQSS, 2, {XMMREG,MEMORY,0}, "\301\333\2\x0F\xC2\110\1\x00", IF_KATMAI|IF_SSE},
+    {I_CMPEQSS, 2, {XMMREG,XMMREG,0}, "\333\2\x0F\xC2\110\1\x00", IF_KATMAI|IF_SSE},
+    {I_CMPLEPS, 2, {XMMREG,MEMORY,0}, "\301\331\2\x0F\xC2\110\1\x02", IF_KATMAI|IF_SSE},
+    {I_CMPLEPS, 2, {XMMREG,XMMREG,0}, "\331\2\x0F\xC2\110\1\x02", IF_KATMAI|IF_SSE},
+    {I_CMPLESS, 2, {XMMREG,MEMORY,0}, "\301\333\2\x0F\xC2\110\1\x02", IF_KATMAI|IF_SSE},
+    {I_CMPLESS, 2, {XMMREG,XMMREG,0}, "\333\2\x0F\xC2\110\1\x02", IF_KATMAI|IF_SSE},
+    {I_CMPLTPS, 2, {XMMREG,MEMORY,0}, "\301\331\2\x0F\xC2\110\1\x01", IF_KATMAI|IF_SSE},
+    {I_CMPLTPS, 2, {XMMREG,XMMREG,0}, "\331\2\x0F\xC2\110\1\x01", IF_KATMAI|IF_SSE},
+    {I_CMPLTSS, 2, {XMMREG,MEMORY,0}, "\301\333\2\x0F\xC2\110\1\x01", IF_KATMAI|IF_SSE},
+    {I_CMPLTSS, 2, {XMMREG,XMMREG,0}, "\333\2\x0F\xC2\110\1\x01", IF_KATMAI|IF_SSE},
+    {I_CMPNEQPS, 2, {XMMREG,MEMORY,0}, "\301\331\2\x0F\xC2\110\1\x04", IF_KATMAI|IF_SSE},
+    {I_CMPNEQPS, 2, {XMMREG,XMMREG,0}, "\331\2\x0F\xC2\110\1\x04", IF_KATMAI|IF_SSE},
+    {I_CMPNEQSS, 2, {XMMREG,MEMORY,0}, "\301\333\2\x0F\xC2\110\1\x04", IF_KATMAI|IF_SSE},
+    {I_CMPNEQSS, 2, {XMMREG,XMMREG,0}, "\333\2\x0F\xC2\110\1\x04", IF_KATMAI|IF_SSE},
+    {I_CMPNLEPS, 2, {XMMREG,MEMORY,0}, "\301\331\2\x0F\xC2\110\1\x06", IF_KATMAI|IF_SSE},
+    {I_CMPNLEPS, 2, {XMMREG,XMMREG,0}, "\331\2\x0F\xC2\110\1\x06", IF_KATMAI|IF_SSE},
+    {I_CMPNLESS, 2, {XMMREG,MEMORY,0}, "\301\333\2\x0F\xC2\110\1\x06", IF_KATMAI|IF_SSE},
+    {I_CMPNLESS, 2, {XMMREG,XMMREG,0}, "\333\2\x0F\xC2\110\1\x06", IF_KATMAI|IF_SSE},
+    {I_CMPNLTPS, 2, {XMMREG,MEMORY,0}, "\301\331\2\x0F\xC2\110\1\x05", IF_KATMAI|IF_SSE},
+    {I_CMPNLTPS, 2, {XMMREG,XMMREG,0}, "\331\2\x0F\xC2\110\1\x05", IF_KATMAI|IF_SSE},
+    {I_CMPNLTSS, 2, {XMMREG,MEMORY,0}, "\301\333\2\x0F\xC2\110\1\x05", IF_KATMAI|IF_SSE},
+    {I_CMPNLTSS, 2, {XMMREG,XMMREG,0}, "\333\2\x0F\xC2\110\1\x05", IF_KATMAI|IF_SSE},
+    {I_CMPORDPS, 2, {XMMREG,MEMORY,0}, "\301\331\2\x0F\xC2\110\1\x07", IF_KATMAI|IF_SSE},
+    {I_CMPORDPS, 2, {XMMREG,XMMREG,0}, "\331\2\x0F\xC2\110\1\x07", IF_KATMAI|IF_SSE},
+    {I_CMPORDSS, 2, {XMMREG,MEMORY,0}, "\301\333\2\x0F\xC2\110\1\x07", IF_KATMAI|IF_SSE},
+    {I_CMPORDSS, 2, {XMMREG,XMMREG,0}, "\333\2\x0F\xC2\110\1\x07", IF_KATMAI|IF_SSE},
+    {I_CMPUNORDPS, 2, {XMMREG,MEMORY,0}, "\301\331\2\x0F\xC2\110\1\x03", IF_KATMAI|IF_SSE},
+    {I_CMPUNORDPS, 2, {XMMREG,XMMREG,0}, "\331\2\x0F\xC2\110\1\x03", IF_KATMAI|IF_SSE},
+    {I_CMPUNORDSS, 2, {XMMREG,MEMORY,0}, "\301\333\2\x0F\xC2\110\1\x03", IF_KATMAI|IF_SSE},
+    {I_CMPUNORDSS, 2, {XMMREG,XMMREG,0}, "\333\2\x0F\xC2\110\1\x03", IF_KATMAI|IF_SSE},
+    {I_CMPPS, 3, {XMMREG,MEMORY,IMMEDIATE}, "\301\331\2\x0F\xC2\110\26", IF_KATMAI|IF_SSE|IF_SB|IF_AR2},
+    {I_CMPPS, 3, {XMMREG,XMMREG,IMMEDIATE}, "\331\2\x0F\xC2\110\26", IF_KATMAI|IF_SSE|IF_SB|IF_AR2},
+    {I_CMPSS, 3, {XMMREG,MEMORY,IMMEDIATE}, "\301\333\2\x0F\xC2\110\26", IF_KATMAI|IF_SSE|IF_SB|IF_AR2},
+    {I_CMPSS, 3, {XMMREG,XMMREG,IMMEDIATE}, "\333\2\x0F\xC2\110\26", IF_KATMAI|IF_SSE|IF_SB|IF_AR2},
+    {I_COMISS, 2, {XMMREG,MEMORY,0}, "\301\2\x0F\x2F\110", IF_KATMAI|IF_SSE},
+    {I_COMISS, 2, {XMMREG,XMMREG,0}, "\2\x0F\x2F\110", IF_KATMAI|IF_SSE},
+    {I_CVTPI2PS, 2, {XMMREG,MEMORY,0}, "\301\331\2\x0F\x2A\110", IF_KATMAI|IF_SSE|IF_MMX},
+    {I_CVTPI2PS, 2, {XMMREG,MMXREG,0}, "\331\2\x0F\x2A\110", IF_KATMAI|IF_SSE|IF_MMX},
+    {I_CVTPS2PI, 2, {MMXREG,MEMORY,0}, "\301\331\2\x0F\x2D\110", IF_KATMAI|IF_SSE|IF_MMX},
+    {I_CVTPS2PI, 2, {MMXREG,XMMREG,0}, "\331\2\x0F\x2D\110", IF_KATMAI|IF_SSE|IF_MMX},
+    {I_CVTSI2SS, 2, {XMMREG,MEMORY,0}, "\301\333\2\x0F\x2A\110", IF_KATMAI|IF_SSE|IF_SD|IF_AR1},
+    {I_CVTSI2SS, 2, {XMMREG,REG32,0}, "\333\2\x0F\x2A\110", IF_KATMAI|IF_SSE},
+    {I_CVTSS2SI, 2, {REG32,MEMORY,0}, "\301\333\2\x0F\x2D\110", IF_KATMAI|IF_SSE},
+    {I_CVTSS2SI, 2, {REG32,XMMREG,0}, "\333\2\x0F\x2D\110", IF_KATMAI|IF_SSE},
+    {I_CVTTPS2PI, 2, {MMXREG,MEMORY,0}, "\301\331\2\x0F\x2C\110", IF_KATMAI|IF_SSE|IF_MMX},
+    {I_CVTTPS2PI, 2, {MMXREG,XMMREG,0}, "\331\2\x0F\x2C\110", IF_KATMAI|IF_SSE|IF_MMX},
+    {I_CVTTSS2SI, 2, {REG32,MEMORY,0}, "\301\333\2\x0F\x2C\110", IF_KATMAI|IF_SSE},
+    {I_CVTTSS2SI, 2, {REG32,XMMREG,0}, "\333\2\x0F\x2C\110", IF_KATMAI|IF_SSE},
+    {I_DIVPS, 2, {XMMREG,MEMORY,0}, "\301\331\2\x0F\x5E\110", IF_KATMAI|IF_SSE},
+    {I_DIVPS, 2, {XMMREG,XMMREG,0}, "\331\2\x0F\x5E\110", IF_KATMAI|IF_SSE},
+    {I_DIVSS, 2, {XMMREG,MEMORY,0}, "\301\333\2\x0F\x5E\110", IF_KATMAI|IF_SSE},
+    {I_DIVSS, 2, {XMMREG,XMMREG,0}, "\333\2\x0F\x5E\110", IF_KATMAI|IF_SSE},
+    {I_LDMXCSR, 1, {MEMORY,0,0}, "\300\2\x0F\xAE\202", IF_KATMAI|IF_SSE|IF_SD},
+    {I_MAXPS, 2, {XMMREG,MEMORY,0}, "\301\331\2\x0F\x5F\110", IF_KATMAI|IF_SSE},
+    {I_MAXPS, 2, {XMMREG,XMMREG,0}, "\331\2\x0F\x5F\110", IF_KATMAI|IF_SSE},
+    {I_MAXSS, 2, {XMMREG,MEMORY,0}, "\301\333\2\x0F\x5F\110", IF_KATMAI|IF_SSE},
+    {I_MAXSS, 2, {XMMREG,XMMREG,0}, "\333\2\x0F\x5F\110", IF_KATMAI|IF_SSE},
+    {I_MINPS, 2, {XMMREG,MEMORY,0}, "\301\331\2\x0F\x5D\110", IF_KATMAI|IF_SSE},
+    {I_MINPS, 2, {XMMREG,XMMREG,0}, "\331\2\x0F\x5D\110", IF_KATMAI|IF_SSE},
+    {I_MINSS, 2, {XMMREG,MEMORY,0}, "\301\333\2\x0F\x5D\110", IF_KATMAI|IF_SSE},
+    {I_MINSS, 2, {XMMREG,XMMREG,0}, "\333\2\x0F\x5D\110", IF_KATMAI|IF_SSE},
+    {I_MOVAPS, 2, {XMMREG,MEMORY,0}, "\301\2\x0F\x28\110", IF_KATMAI|IF_SSE},
+    {I_MOVAPS, 2, {MEMORY,XMMREG,0}, "\300\2\x0F\x29\101", IF_KATMAI|IF_SSE},
+    {I_MOVAPS, 2, {XMMREG,XMMREG,0}, "\2\x0F\x28\110", IF_KATMAI|IF_SSE},
+    {I_MOVAPS, 2, {XMMREG,XMMREG,0}, "\2\x0F\x29\101", IF_KATMAI|IF_SSE},
+    {I_MOVHPS, 2, {XMMREG,MEMORY,0}, "\301\2\x0F\x16\110", IF_KATMAI|IF_SSE},
+    {I_MOVHPS, 2, {MEMORY,XMMREG,0}, "\300\2\x0F\x17\101", IF_KATMAI|IF_SSE},
+    {I_MOVLHPS, 2, {XMMREG,XMMREG,0}, "\2\x0F\x16\110", IF_KATMAI|IF_SSE},
+    {I_MOVLPS, 2, {XMMREG,MEMORY,0}, "\301\2\x0F\x12\110", IF_KATMAI|IF_SSE},
+    {I_MOVLPS, 2, {MEMORY,XMMREG,0}, "\300\2\x0F\x13\101", IF_KATMAI|IF_SSE},
+    {I_MOVHLPS, 2, {XMMREG,XMMREG,0}, "\2\x0F\x12\110", IF_KATMAI|IF_SSE},
+    {I_MOVMSKPS, 2, {REG32,XMMREG,0}, "\2\x0F\x50\110", IF_KATMAI|IF_SSE},
+    {I_MOVNTPS, 2, {MEMORY,XMMREG,0}, "\300\2\x0F\x2B\101", IF_KATMAI|IF_SSE},
+    {I_MOVSS, 2, {XMMREG,MEMORY,0}, "\301\333\2\x0F\x10\110", IF_KATMAI|IF_SSE},
+    {I_MOVSS, 2, {MEMORY,XMMREG,0}, "\300\333\2\x0F\x11\101", IF_KATMAI|IF_SSE},
+    {I_MOVSS, 2, {XMMREG,XMMREG,0}, "\333\2\x0F\x10\110", IF_KATMAI|IF_SSE},
+    {I_MOVSS, 2, {XMMREG,XMMREG,0}, "\333\2\x0F\x11\101", IF_KATMAI|IF_SSE},
+    {I_MOVUPS, 2, {XMMREG,MEMORY,0}, "\301\331\2\x0F\x10\110", IF_KATMAI|IF_SSE},
+    {I_MOVUPS, 2, {MEMORY,XMMREG,0}, "\300\331\2\x0F\x11\101", IF_KATMAI|IF_SSE},
+    {I_MOVUPS, 2, {XMMREG,XMMREG,0}, "\331\2\x0F\x10\110", IF_KATMAI|IF_SSE},
+    {I_MOVUPS, 2, {XMMREG,XMMREG,0}, "\331\2\x0F\x11\101", IF_KATMAI|IF_SSE},
+    {I_MULPS, 2, {XMMREG,MEMORY,0}, "\301\2\x0F\x59\110", IF_KATMAI|IF_SSE},
+    {I_MULPS, 2, {XMMREG,XMMREG,0}, "\2\x0F\x59\110", IF_KATMAI|IF_SSE},
+    {I_MULSS, 2, {XMMREG,MEMORY,0}, "\301\333\2\x0F\x59\110", IF_KATMAI|IF_SSE},
+    {I_MULSS, 2, {XMMREG,XMMREG,0}, "\333\2\x0F\x59\110", IF_KATMAI|IF_SSE},
+    {I_ORPS, 2, {XMMREG,MEMORY,0}, "\301\2\x0F\x56\110", IF_KATMAI|IF_SSE},
+    {I_ORPS, 2, {XMMREG,XMMREG,0}, "\2\x0F\x56\110", IF_KATMAI|IF_SSE},
+    {I_RCPPS, 2, {XMMREG,MEMORY,0}, "\301\331\2\x0F\x53\110", IF_KATMAI|IF_SSE},
+    {I_RCPPS, 2, {XMMREG,XMMREG,0}, "\331\2\x0F\x53\110", IF_KATMAI|IF_SSE},
+    {I_RCPSS, 2, {XMMREG,MEMORY,0}, "\301\333\2\x0F\x53\110", IF_KATMAI|IF_SSE},
+    {I_RCPSS, 2, {XMMREG,XMMREG,0}, "\333\2\x0F\x53\110", IF_KATMAI|IF_SSE},
+    {I_RSQRTPS, 2, {XMMREG,MEMORY,0}, "\301\331\2\x0F\x52\110", IF_KATMAI|IF_SSE},
+    {I_RSQRTPS, 2, {XMMREG,XMMREG,0}, "\331\2\x0F\x52\110", IF_KATMAI|IF_SSE},
+    {I_RSQRTSS, 2, {XMMREG,MEMORY,0}, "\301\333\2\x0F\x52\110", IF_KATMAI|IF_SSE},
+    {I_RSQRTSS, 2, {XMMREG,XMMREG,0}, "\333\2\x0F\x52\110", IF_KATMAI|IF_SSE},
+    {I_SHUFPS, 3, {XMMREG,MEMORY,IMMEDIATE}, "\301\2\x0F\xC6\110\26", IF_KATMAI|IF_SSE|IF_SB|IF_AR2},
+    {I_SHUFPS, 3, {XMMREG,XMMREG,IMMEDIATE}, "\2\x0F\xC6\110\26", IF_KATMAI|IF_SSE|IF_SB|IF_AR2},
+    {I_SQRTPS, 2, {XMMREG,MEMORY,0}, "\301\331\2\x0F\x51\110", IF_KATMAI|IF_SSE},
+    {I_SQRTPS, 2, {XMMREG,XMMREG,0}, "\331\2\x0F\x51\110", IF_KATMAI|IF_SSE},
+    {I_SQRTSS, 2, {XMMREG,MEMORY,0}, "\301\333\2\x0F\x51\110", IF_KATMAI|IF_SSE},
+    {I_SQRTSS, 2, {XMMREG,XMMREG,0}, "\333\2\x0F\x51\110", IF_KATMAI|IF_SSE},
+    {I_STMXCSR, 1, {MEMORY,0,0}, "\300\2\x0F\xAE\203", IF_KATMAI|IF_SSE|IF_SD},
+    {I_SUBPS, 2, {XMMREG,MEMORY,0}, "\301\331\2\x0F\x5C\110", IF_KATMAI|IF_SSE},
+    {I_SUBPS, 2, {XMMREG,XMMREG,0}, "\331\2\x0F\x5C\110", IF_KATMAI|IF_SSE},
+    {I_SUBSS, 2, {XMMREG,MEMORY,0}, "\301\333\2\x0F\x5C\110", IF_KATMAI|IF_SSE},
+    {I_SUBSS, 2, {XMMREG,XMMREG,0}, "\333\2\x0F\x5C\110", IF_KATMAI|IF_SSE},
+    {I_UCOMISS, 2, {XMMREG,MEMORY,0}, "\301\2\x0F\x2E\110", IF_KATMAI|IF_SSE},
+    {I_UCOMISS, 2, {XMMREG,XMMREG,0}, "\2\x0F\x2E\110", IF_KATMAI|IF_SSE},
+    {I_UNPCKHPS, 2, {XMMREG,MEMORY,0}, "\301\2\x0F\x15\110", IF_KATMAI|IF_SSE},
+    {I_UNPCKHPS, 2, {XMMREG,XMMREG,0}, "\2\x0F\x15\110", IF_KATMAI|IF_SSE},
+    {I_UNPCKLPS, 2, {XMMREG,MEMORY,0}, "\301\2\x0F\x14\110", IF_KATMAI|IF_SSE},
+    {I_UNPCKLPS, 2, {XMMREG,XMMREG,0}, "\2\x0F\x14\110", IF_KATMAI|IF_SSE},
+    {I_XORPS, 2, {XMMREG,MEMORY,0}, "\301\2\x0F\x57\110", IF_KATMAI|IF_SSE},
+    {I_XORPS, 2, {XMMREG,XMMREG,0}, "\2\x0F\x57\110", IF_KATMAI|IF_SSE},
+    {I_FXRSTOR, 1, {MEMORY,0,0}, "\300\2\x0F\xAE\201", IF_P6|IF_SSE|IF_FPU},
+    {I_FXSAVE, 1, {MEMORY,0,0}, "\300\2\x0F\xAE\200", IF_P6|IF_SSE|IF_FPU},
+    {I_PREFETCHNTA, 1, {MEMORY,0,0}, "\300\2\x0F\x18\200", IF_KATMAI},
+    {I_PREFETCHT0, 1, {MEMORY,0,0}, "\300\2\x0F\x18\201", IF_KATMAI},
+    {I_PREFETCHT1, 1, {MEMORY,0,0}, "\300\2\x0F\x18\202", IF_KATMAI},
+    {I_PREFETCHT2, 1, {MEMORY,0,0}, "\300\2\x0F\x18\203", IF_KATMAI},
+    {I_SFENCE, 0, {0,0,0}, "\3\x0F\xAE\xF8", IF_KATMAI},
+    {I_MASKMOVQ, 2, {MMXREG,MMXREG,0}, "\2\x0F\xF7\110", IF_KATMAI|IF_MMX},
+    {I_MOVNTQ, 2, {MEMORY,MMXREG,0}, "\300\2\x0F\xE7\101", IF_KATMAI|IF_MMX|IF_SM},
+    {I_PAVGB, 2, {MMXREG,MMXREG,0}, "\2\x0F\xE0\110", IF_KATMAI|IF_MMX},
+    {I_PAVGB, 2, {MMXREG,MEMORY,0}, "\301\2\x0F\xE0\110", IF_KATMAI|IF_MMX|IF_SM},
+    {I_PAVGW, 2, {MMXREG,MMXREG,0}, "\2\x0F\xE3\110", IF_KATMAI|IF_MMX},
+    {I_PAVGW, 2, {MMXREG,MEMORY,0}, "\301\2\x0F\xE3\110", IF_KATMAI|IF_MMX|IF_SM},
+    {I_PEXTRW, 3, {REG32,MMXREG,IMMEDIATE}, "\2\x0F\xC5\110\26", IF_KATMAI|IF_MMX|IF_SB|IF_AR2},
+    {I_PINSRW, 3, {MMXREG,REG16,IMMEDIATE}, "\2\x0F\xC4\110\26", IF_KATMAI|IF_MMX|IF_SB|IF_AR2},
+    {I_PINSRW, 3, {MMXREG,MEMORY,IMMEDIATE}, "\301\2\x0F\xC4\110\26", IF_KATMAI|IF_MMX|IF_SB|IF_AR2},
+    {I_PMAXSW, 2, {MMXREG,MMXREG,0}, "\2\x0F\xEE\110", IF_KATMAI|IF_MMX},
+    {I_PMAXSW, 2, {MMXREG,MEMORY,0}, "\301\2\x0F\xEE\110", IF_KATMAI|IF_MMX|IF_SM},
+    {I_PMAXUB, 2, {MMXREG,MMXREG,0}, "\2\x0F\xDE\110", IF_KATMAI|IF_MMX},
+    {I_PMAXUB, 2, {MMXREG,MEMORY,0}, "\301\2\x0F\xDE\110", IF_KATMAI|IF_MMX|IF_SM},
+    {I_PMINSW, 2, {MMXREG,MMXREG,0}, "\2\x0F\xEA\110", IF_KATMAI|IF_MMX},
+    {I_PMINSW, 2, {MMXREG,MEMORY,0}, "\301\2\x0F\xEA\110", IF_KATMAI|IF_MMX|IF_SM},
+    {I_PMINUB, 2, {MMXREG,MMXREG,0}, "\2\x0F\xDA\110", IF_KATMAI|IF_MMX},
+    {I_PMINUB, 2, {MMXREG,MEMORY,0}, "\301\2\x0F\xDA\110", IF_KATMAI|IF_MMX|IF_SM},
+    {I_PMOVMSKB, 2, {REG32,MMXREG,0}, "\2\x0F\xD7\110", IF_KATMAI|IF_MMX},
+    {I_PMULHUW, 2, {MMXREG,MMXREG,0}, "\2\x0F\xE4\110", IF_KATMAI|IF_MMX},
+    {I_PMULHUW, 2, {MMXREG,MEMORY,0}, "\301\2\x0F\xE4\110", IF_KATMAI|IF_MMX|IF_SM},
+    {I_PSADBW, 2, {MMXREG,MMXREG,0}, "\2\x0F\xF6\110", IF_KATMAI|IF_MMX},
+    {I_PSADBW, 2, {MMXREG,MEMORY,0}, "\301\2\x0F\xF6\110", IF_KATMAI|IF_MMX|IF_SM},
+    {I_PSHUFW, 3, {MMXREG,MMXREG,IMMEDIATE}, "\2\x0F\x70\110\22", IF_KATMAI|IF_MMX|IF_SB|IF_AR2},
+    {I_PSHUFW, 3, {MMXREG,MEMORY,IMMEDIATE}, "\301\2\x0F\x70\110\22", IF_KATMAI|IF_MMX|IF_SM2|IF_SB|IF_AR2},
+    {I_PF2IW, 2, {MMXREG,MEMORY,0}, "\301\2\x0F\x0F\110\01\x1C", IF_PENT|IF_3DNOW|IF_SM},
+    {I_PF2IW, 2, {MMXREG,MMXREG,0}, "\2\x0F\x0F\110\01\x1C", IF_PENT|IF_3DNOW},
+    {I_PFNACC, 2, {MMXREG,MEMORY,0}, "\301\2\x0F\x0F\110\01\x8A", IF_PENT|IF_3DNOW|IF_SM},
+    {I_PFNACC, 2, {MMXREG,MMXREG,0}, "\2\x0F\x0F\110\01\x8A", IF_PENT|IF_3DNOW},
+    {I_PFPNACC, 2, {MMXREG,MEMORY,0}, "\301\2\x0F\x0F\110\01\x8E", IF_PENT|IF_3DNOW|IF_SM},
+    {I_PFPNACC, 2, {MMXREG,MMXREG,0}, "\2\x0F\x0F\110\01\x8E", IF_PENT|IF_3DNOW},
+    {I_PI2FW, 2, {MMXREG,MEMORY,0}, "\301\2\x0F\x0F\110\01\x0C", IF_PENT|IF_3DNOW|IF_SM},
+    {I_PI2FW, 2, {MMXREG,MMXREG,0}, "\2\x0F\x0F\110\01\x0C", IF_PENT|IF_3DNOW},
+    {I_PSWAPD, 2, {MMXREG,MEMORY,0}, "\301\2\x0F\x0F\110\01\xBB", IF_PENT|IF_3DNOW|IF_SM},
+    {I_PSWAPD, 2, {MMXREG,MMXREG,0}, "\2\x0F\x0F\110\01\xBB", IF_PENT|IF_3DNOW},
+    {I_MASKMOVDQU, 2, {XMMREG,XMMREG,0}, "\3\x66\x0F\xF7\110", IF_WILLAMETTE|IF_SSE2},
+    {I_CLFLUSH, 1, {MEMORY,0,0}, "\300\2\x0F\xAE\207", IF_WILLAMETTE|IF_SSE2},
+    {I_MOVNTDQ, 2, {MEMORY,XMMREG,0}, "\300\3\x66\x0F\xE7\101", IF_WILLAMETTE|IF_SSE2|IF_SM},
+    {I_MOVNTI, 2, {MEMORY,REG32,0}, "\300\2\x0F\xC3\101", IF_WILLAMETTE|IF_SSE2|IF_SM},
+    {I_MOVNTPD, 2, {MEMORY,XMMREG,0}, "\300\3\x66\x0F\x2B\101", IF_WILLAMETTE|IF_SSE2|IF_SM},
+    {I_PAUSE, 0, {0,0,0}, "\333\1\x90", IF_WILLAMETTE|IF_SSE2},
+    {I_LFENCE, 0, {0,0,0}, "\3\x0F\xAE\xE8", IF_WILLAMETTE|IF_SSE2},
+    {I_MFENCE, 0, {0,0,0}, "\3\x0F\xAE\xF0", IF_WILLAMETTE|IF_SSE2},
+    {I_MOVD, 2, {XMMREG,REG32,0}, "\3\x66\x0F\x6E\110", IF_WILLAMETTE|IF_SSE2},
+    {I_MOVD, 2, {REG32,XMMREG,0}, "\3\x66\x0F\x7E\101", IF_WILLAMETTE|IF_SSE2},
+    {I_MOVD, 2, {MEMORY,XMMREG,0}, "\300\3\x66\x0F\x7E\101", IF_WILLAMETTE|IF_SSE2},
+    {I_MOVD, 2, {XMMREG,MEMORY,0}, "\301\3\x66\x0F\x6E\110", IF_WILLAMETTE|IF_SSE2},
+    {I_MOVDQA, 2, {XMMREG,XMMREG,0}, "\3\x66\x0F\x6F\110", IF_WILLAMETTE|IF_SSE2},
+    {I_MOVDQA, 2, {MEMORY,XMMREG,0}, "\300\3\x66\x0F\x7F\101", IF_WILLAMETTE|IF_SSE2|IF_SM},
+    {I_MOVDQA, 2, {XMMREG,MEMORY,0}, "\301\3\x66\x0F\x6F\110", IF_WILLAMETTE|IF_SSE2|IF_SM},
+    {I_MOVDQA, 2, {XMMREG,XMMREG,0}, "\3\x66\x0F\x7F\110", IF_WILLAMETTE|IF_SSE2},
+    {I_MOVDQU, 2, {XMMREG,XMMREG,0}, "\333\2\x0F\x6F\110", IF_WILLAMETTE|IF_SSE2},
+    {I_MOVDQU, 2, {MEMORY,XMMREG,0}, "\333\300\2\x0F\x7F\101", IF_WILLAMETTE|IF_SSE2|IF_SM},
+    {I_MOVDQU, 2, {XMMREG,MEMORY,0}, "\301\333\2\x0F\x6F\110", IF_WILLAMETTE|IF_SSE2|IF_SM},
+    {I_MOVDQU, 2, {XMMREG,XMMREG,0}, "\333\2\x0F\x7F\110", IF_WILLAMETTE|IF_SSE2},
+    {I_MOVDQ2Q, 2, {MMXREG,XMMREG,0}, "\3\xF2\x0F\xD6\110", IF_WILLAMETTE|IF_SSE2},
+    {I_MOVQ, 2, {XMMREG,XMMREG,0}, "\333\2\x0F\x7E\110", IF_WILLAMETTE|IF_SSE2},
+    {I_MOVQ, 2, {XMMREG,XMMREG,0}, "\3\x66\x0F\xD6\110", IF_WILLAMETTE|IF_SSE2},
+    {I_MOVQ, 2, {MEMORY,XMMREG,0}, "\300\3\x66\x0F\xD6\101", IF_WILLAMETTE|IF_SSE2},
+    {I_MOVQ, 2, {XMMREG,MEMORY,0}, "\301\333\2\x0F\x7E\110", IF_WILLAMETTE|IF_SSE2},
+    {I_MOVQ2DQ, 2, {XMMREG,MMXREG,0}, "\333\2\x0F\xD6\110", IF_WILLAMETTE|IF_SSE2},
+    {I_PACKSSWB, 2, {XMMREG,XMMREG,0}, "\3\x66\x0F\x63\110", IF_WILLAMETTE|IF_SSE2},
+    {I_PACKSSWB, 2, {XMMREG,MEMORY,0}, "\301\3\x66\x0F\x63\110", IF_WILLAMETTE|IF_SSE2|IF_SM},
+    {I_PACKSSDW, 2, {XMMREG,XMMREG,0}, "\3\x66\x0F\x6B\110", IF_WILLAMETTE|IF_SSE2},
+    {I_PACKSSDW, 2, {XMMREG,MEMORY,0}, "\301\3\x66\x0F\x6B\110", IF_WILLAMETTE|IF_SSE2|IF_SM},
+    {I_PACKUSWB, 2, {XMMREG,XMMREG,0}, "\3\x66\x0F\x67\110", IF_WILLAMETTE|IF_SSE2},
+    {I_PACKUSWB, 2, {XMMREG,MEMORY,0}, "\301\3\x66\x0F\x67\110", IF_WILLAMETTE|IF_SSE2|IF_SM},
+    {I_PADDB, 2, {XMMREG,XMMREG,0}, "\3\x66\x0F\xFC\110", IF_WILLAMETTE|IF_SSE2},
+    {I_PADDB, 2, {XMMREG,MEMORY,0}, "\301\3\x66\x0F\xFC\110", IF_WILLAMETTE|IF_SSE2|IF_SM},
+    {I_PADDW, 2, {XMMREG,XMMREG,0}, "\3\x66\x0F\xFD\110", IF_WILLAMETTE|IF_SSE2},
+    {I_PADDW, 2, {XMMREG,MEMORY,0}, "\301\3\x66\x0F\xFD\110", IF_WILLAMETTE|IF_SSE2|IF_SM},
+    {I_PADDD, 2, {XMMREG,XMMREG,0}, "\3\x66\x0F\xFE\110", IF_WILLAMETTE|IF_SSE2},
+    {I_PADDD, 2, {XMMREG,MEMORY,0}, "\301\3\x66\x0F\xFE\110", IF_WILLAMETTE|IF_SSE2|IF_SM},
+    {I_PADDQ, 2, {MMXREG,MMXREG,0}, "\2\x0F\xD4\110", IF_WILLAMETTE|IF_SSE2},
+    {I_PADDQ, 2, {MMXREG,MEMORY,0}, "\301\2\x0F\xD4\110", IF_WILLAMETTE|IF_SSE2|IF_SM},
+    {I_PADDQ, 2, {XMMREG,XMMREG,0}, "\3\x66\x0F\xD4\110", IF_WILLAMETTE|IF_SSE2},
+    {I_PADDQ, 2, {XMMREG,MEMORY,0}, "\301\3\x66\x0F\xD4\110", IF_WILLAMETTE|IF_SSE2|IF_SM},
+    {I_PADDSB, 2, {XMMREG,MEMORY,0}, "\301\3\x66\x0F\xEC\110", IF_WILLAMETTE|IF_SSE2|IF_SM},
+    {I_PADDSB, 2, {XMMREG,XMMREG,0}, "\3\x66\x0F\xEC\110", IF_WILLAMETTE|IF_SSE2},
+    {I_PADDSW, 2, {XMMREG,MEMORY,0}, "\301\3\x66\x0F\xED\110", IF_WILLAMETTE|IF_SSE2|IF_SM},
+    {I_PADDSW, 2, {XMMREG,XMMREG,0}, "\3\x66\x0F\xED\110", IF_WILLAMETTE|IF_SSE2},
+    {I_PADDUSB, 2, {XMMREG,MEMORY,0}, "\301\3\x66\x0F\xDC\110", IF_WILLAMETTE|IF_SSE2|IF_SM},
+    {I_PADDUSB, 2, {XMMREG,XMMREG,0}, "\3\x66\x0F\xDC\110", IF_WILLAMETTE|IF_SSE2},
+    {I_PADDUSW, 2, {XMMREG,MEMORY,0}, "\301\3\x66\x0F\xDD\110", IF_WILLAMETTE|IF_SSE2|IF_SM},
+    {I_PADDUSW, 2, {XMMREG,XMMREG,0}, "\3\x66\x0F\xDD\110", IF_WILLAMETTE|IF_SSE2},
+    {I_PAND, 2, {XMMREG,XMMREG,0}, "\3\x66\x0F\xDB\110", IF_WILLAMETTE|IF_SSE2},
+    {I_PAND, 2, {XMMREG,MEMORY,0}, "\301\3\x66\x0F\xDB\110", IF_WILLAMETTE|IF_SSE2|IF_SM},
+    {I_PANDN, 2, {XMMREG,XMMREG,0}, "\3\x66\x0F\xDF\110", IF_WILLAMETTE|IF_SSE2},
+    {I_PANDN, 2, {XMMREG,MEMORY,0}, "\301\3\x66\x0F\xDF\110", IF_WILLAMETTE|IF_SSE2|IF_SM},
+    {I_PAVGB, 2, {XMMREG,XMMREG,0}, "\3\x66\x0F\xE0\110", IF_WILLAMETTE|IF_SSE2},
+    {I_PAVGB, 2, {XMMREG,MEMORY,0}, "\301\3\x66\x0F\xE0\110", IF_WILLAMETTE|IF_SSE2|IF_SM},
+    {I_PAVGW, 2, {XMMREG,XMMREG,0}, "\3\x66\x0F\xE3\110", IF_WILLAMETTE|IF_SSE2},
+    {I_PAVGW, 2, {XMMREG,MEMORY,0}, "\301\3\x66\x0F\xE3\110", IF_WILLAMETTE|IF_SSE2|IF_SM},
+    {I_PCMPEQB, 2, {XMMREG,XMMREG,0}, "\3\x66\x0F\x74\110", IF_WILLAMETTE|IF_SSE2},
+    {I_PCMPEQB, 2, {XMMREG,MEMORY,0}, "\301\3\x66\x0F\x74\110", IF_WILLAMETTE|IF_SSE2|IF_SM},
+    {I_PCMPEQW, 2, {XMMREG,XMMREG,0}, "\3\x66\x0F\x75\110", IF_WILLAMETTE|IF_SSE2},
+    {I_PCMPEQW, 2, {XMMREG,MEMORY,0}, "\301\3\x66\x0F\x75\110", IF_WILLAMETTE|IF_SSE2|IF_SM},
+    {I_PCMPEQD, 2, {XMMREG,XMMREG,0}, "\3\x66\x0F\x76\110", IF_WILLAMETTE|IF_SSE2},
+    {I_PCMPEQD, 2, {XMMREG,MEMORY,0}, "\301\3\x66\x0F\x76\110", IF_WILLAMETTE|IF_SSE2|IF_SM},
+    {I_PCMPGTB, 2, {XMMREG,XMMREG,0}, "\3\x66\x0F\x64\110", IF_WILLAMETTE|IF_SSE2},
+    {I_PCMPGTB, 2, {XMMREG,MEMORY,0}, "\301\3\x66\x0F\x64\110", IF_WILLAMETTE|IF_SSE2|IF_SM},
+    {I_PCMPGTW, 2, {XMMREG,XMMREG,0}, "\3\x66\x0F\x65\110", IF_WILLAMETTE|IF_SSE2},
+    {I_PCMPGTW, 2, {XMMREG,MEMORY,0}, "\301\3\x66\x0F\x65\110", IF_WILLAMETTE|IF_SSE2|IF_SM},
+    {I_PCMPGTD, 2, {XMMREG,XMMREG,0}, "\3\x66\x0F\x66\110", IF_WILLAMETTE|IF_SSE2},
+    {I_PCMPGTD, 2, {XMMREG,MEMORY,0}, "\301\3\x66\x0F\x66\110", IF_WILLAMETTE|IF_SSE2|IF_SM},
+    {I_PEXTRW, 3, {REG32,XMMREG,IMMEDIATE}, "\3\x66\x0F\xC5\110\26", IF_WILLAMETTE|IF_SSE2|IF_SB|IF_AR2},
+    {I_PINSRW, 3, {XMMREG,REG16,IMMEDIATE}, "\3\x66\x0F\xC4\110\26", IF_WILLAMETTE|IF_SSE2|IF_SB|IF_AR2},
+    {I_PINSRW, 3, {XMMREG,MEMORY,IMMEDIATE}, "\301\3\x66\x0F\xC4\110\26", IF_WILLAMETTE|IF_SSE2|IF_SB|IF_AR2},
+    {I_PMADDWD, 2, {XMMREG,MEMORY,0}, "\301\3\x66\x0F\xF5\110", IF_WILLAMETTE|IF_SSE2|IF_SM},
+    {I_PMADDWD, 2, {XMMREG,XMMREG,0}, "\3\x66\x0F\xF5\110", IF_WILLAMETTE|IF_SSE2},
+    {I_PMAXSW, 2, {XMMREG,XMMREG,0}, "\3\x66\x0F\xEE\110", IF_WILLAMETTE|IF_SSE2},
+    {I_PMAXSW, 2, {XMMREG,MEMORY,0}, "\301\3\x66\x0F\xEE\110", IF_WILLAMETTE|IF_SSE2|IF_SM},
+    {I_PMAXUB, 2, {XMMREG,XMMREG,0}, "\3\x66\x0F\xDE\110", IF_WILLAMETTE|IF_SSE2},
+    {I_PMAXUB, 2, {XMMREG,MEMORY,0}, "\301\3\x66\x0F\xDE\110", IF_WILLAMETTE|IF_SSE2|IF_SM},
+    {I_PMINSW, 2, {XMMREG,XMMREG,0}, "\3\x66\x0F\xEA\110", IF_WILLAMETTE|IF_SSE2},
+    {I_PMINSW, 2, {XMMREG,MEMORY,0}, "\301\3\x66\x0F\xEA\110", IF_WILLAMETTE|IF_SSE2|IF_SM},
+    {I_PMINUB, 2, {XMMREG,XMMREG,0}, "\3\x66\x0F\xDA\110", IF_WILLAMETTE|IF_SSE2},
+    {I_PMINUB, 2, {XMMREG,MEMORY,0}, "\301\3\x66\x0F\xDA\110", IF_WILLAMETTE|IF_SSE2|IF_SM},
+    {I_PMOVMSKB, 2, {REG32,XMMREG,0}, "\3\x66\x0F\xD7\110", IF_WILLAMETTE|IF_SSE2},
+    {I_PMULHUW, 2, {XMMREG,XMMREG,0}, "\3\x66\x0F\xE4\110", IF_WILLAMETTE|IF_SSE2},
+    {I_PMULHUW, 2, {XMMREG,MEMORY,0}, "\301\3\x66\x0F\xE4\110", IF_WILLAMETTE|IF_SSE2|IF_SM},
+    {I_PMULHW, 2, {XMMREG,MEMORY,0}, "\301\3\x66\x0F\xE5\110", IF_WILLAMETTE|IF_SSE2|IF_SM},
+    {I_PMULHW, 2, {XMMREG,XMMREG,0}, "\3\x66\x0F\xE5\110", IF_WILLAMETTE|IF_SSE2},
+    {I_PMULLW, 2, {XMMREG,MEMORY,0}, "\301\3\x66\x0F\xD5\110", IF_WILLAMETTE|IF_SSE2|IF_SM},
+    {I_PMULLW, 2, {XMMREG,XMMREG,0}, "\3\x66\x0F\xD5\110", IF_WILLAMETTE|IF_SSE2},
+    {I_PMULUDQ, 2, {MMXREG,MMXREG,0}, "\2\x0F\xF4\110", IF_WILLAMETTE|IF_SSE2},
+    {I_PMULUDQ, 2, {MMXREG,MEMORY,0}, "\301\2\x0F\xF4\110", IF_WILLAMETTE|IF_SSE2|IF_SM},
+    {I_PMULUDQ, 2, {XMMREG,XMMREG,0}, "\3\x66\x0F\xF4\110", IF_WILLAMETTE|IF_SSE2},
+    {I_PMULUDQ, 2, {XMMREG,MEMORY,0}, "\301\3\x66\x0F\xF4\110", IF_WILLAMETTE|IF_SSE2|IF_SM},
+    {I_POR, 2, {XMMREG,MEMORY,0}, "\301\3\x66\x0F\xEB\110", IF_WILLAMETTE|IF_SSE2|IF_SM},
+    {I_POR, 2, {XMMREG,XMMREG,0}, "\3\x66\x0F\xEB\110", IF_WILLAMETTE|IF_SSE2},
+    {I_PSADBW, 2, {XMMREG,XMMREG,0}, "\3\x66\x0F\xF6\110", IF_WILLAMETTE|IF_SSE2},
+    {I_PSADBW, 2, {XMMREG,MEMORY,0}, "\301\3\x66\x0F\xF6\110", IF_WILLAMETTE|IF_SSE2|IF_SM},
+    {I_PSHUFD, 3, {XMMREG,XMMREG,IMMEDIATE}, "\3\x66\x0F\x70\110\22", IF_WILLAMETTE|IF_SSE2|IF_SB|IF_AR2},
+    {I_PSHUFD, 3, {XMMREG,MEMORY,IMMEDIATE}, "\301\3\x66\x0F\x70\110\22", IF_WILLAMETTE|IF_SSE2|IF_SM2|IF_SB|IF_AR2},
+    {I_PSHUFHW, 3, {XMMREG,XMMREG,IMMEDIATE}, "\333\2\x0F\x70\110\22", IF_WILLAMETTE|IF_SSE2|IF_SB|IF_AR2},
+    {I_PSHUFHW, 3, {XMMREG,MEMORY,IMMEDIATE}, "\301\333\2\x0F\x70\110\22", IF_WILLAMETTE|IF_SSE2|IF_SM2|IF_SB|IF_AR2},
+    {I_PSHUFLW, 3, {XMMREG,XMMREG,IMMEDIATE}, "\3\xF2\x0F\x70\110\22", IF_WILLAMETTE|IF_SSE2|IF_SB|IF_AR2},
+    {I_PSHUFLW, 3, {XMMREG,MEMORY,IMMEDIATE}, "\301\3\xF2\x0F\x70\110\22", IF_WILLAMETTE|IF_SSE2|IF_SM2|IF_SB|IF_AR2},
+    {I_PSLLDQ, 2, {XMMREG,IMMEDIATE,0}, "\3\x66\x0F\x73\207\25", IF_WILLAMETTE|IF_SSE2|IF_SB|IF_AR1},
+    {I_PSLLW, 2, {XMMREG,MEMORY,0}, "\301\3\x66\x0F\xF1\110", IF_WILLAMETTE|IF_SSE2|IF_SM},
+    {I_PSLLW, 2, {XMMREG,XMMREG,0}, "\3\x66\x0F\xF1\110", IF_WILLAMETTE|IF_SSE2},
+    {I_PSLLW, 2, {XMMREG,IMMEDIATE,0}, "\3\x66\x0F\x71\206\25", IF_WILLAMETTE|IF_SSE2|IF_SB|IF_AR1},
+    {I_PSLLD, 2, {XMMREG,MEMORY,0}, "\301\3\x66\x0F\xF2\110", IF_WILLAMETTE|IF_SSE2|IF_SM},
+    {I_PSLLD, 2, {XMMREG,XMMREG,0}, "\3\x66\x0F\xF2\110", IF_WILLAMETTE|IF_SSE2},
+    {I_PSLLD, 2, {XMMREG,IMMEDIATE,0}, "\3\x66\x0F\x72\206\25", IF_WILLAMETTE|IF_SSE2|IF_SB|IF_AR1},
+    {I_PSLLQ, 2, {XMMREG,MEMORY,0}, "\301\3\x66\x0F\xF3\110", IF_WILLAMETTE|IF_SSE2|IF_SM},
+    {I_PSLLQ, 2, {XMMREG,XMMREG,0}, "\3\x66\x0F\xF3\110", IF_WILLAMETTE|IF_SSE2},
+    {I_PSLLQ, 2, {XMMREG,IMMEDIATE,0}, "\3\x66\x0F\x73\206\25", IF_WILLAMETTE|IF_SSE2|IF_SB|IF_AR1},
+    {I_PSRAW, 2, {XMMREG,MEMORY,0}, "\301\3\x66\x0F\xE1\110", IF_WILLAMETTE|IF_SSE2|IF_SM},
+    {I_PSRAW, 2, {XMMREG,XMMREG,0}, "\3\x66\x0F\xE1\110", IF_WILLAMETTE|IF_SSE2},
+    {I_PSRAW, 2, {XMMREG,IMMEDIATE,0}, "\3\x66\x0F\x71\204\25", IF_WILLAMETTE|IF_SSE2|IF_SB|IF_AR1},
+    {I_PSRAD, 2, {XMMREG,MEMORY,0}, "\301\3\x66\x0F\xE2\110", IF_WILLAMETTE|IF_SSE2|IF_SM},
+    {I_PSRAD, 2, {XMMREG,XMMREG,0}, "\3\x66\x0F\xE2\110", IF_WILLAMETTE|IF_SSE2},
+    {I_PSRAD, 2, {XMMREG,IMMEDIATE,0}, "\3\x66\x0F\x72\204\25", IF_WILLAMETTE|IF_SSE2|IF_SB|IF_AR1},
+    {I_PSRLDQ, 2, {XMMREG,IMMEDIATE,0}, "\3\x66\x0F\x73\203\25", IF_WILLAMETTE|IF_SSE2|IF_SB|IF_AR1},
+    {I_PSRLW, 2, {XMMREG,MEMORY,0}, "\301\3\x66\x0F\xD1\110", IF_WILLAMETTE|IF_SSE2|IF_SM},
+    {I_PSRLW, 2, {XMMREG,XMMREG,0}, "\3\x66\x0F\xD1\110", IF_WILLAMETTE|IF_SSE2},
+    {I_PSRLW, 2, {XMMREG,IMMEDIATE,0}, "\3\x66\x0F\x71\202\25", IF_WILLAMETTE|IF_SSE2|IF_SB|IF_AR1},
+    {I_PSRLD, 2, {XMMREG,MEMORY,0}, "\301\3\x66\x0F\xD2\110", IF_WILLAMETTE|IF_SSE2|IF_SM},
+    {I_PSRLD, 2, {XMMREG,XMMREG,0}, "\3\x66\x0F\xD2\110", IF_WILLAMETTE|IF_SSE2},
+    {I_PSRLD, 2, {XMMREG,IMMEDIATE,0}, "\3\x66\x0F\x72\202\25", IF_WILLAMETTE|IF_SSE2|IF_SB|IF_AR1},
+    {I_PSRLQ, 2, {XMMREG,MEMORY,0}, "\301\3\x66\x0F\xD3\110", IF_WILLAMETTE|IF_SSE2|IF_SM},
+    {I_PSRLQ, 2, {XMMREG,XMMREG,0}, "\3\x66\x0F\xD3\110", IF_WILLAMETTE|IF_SSE2},
+    {I_PSRLQ, 2, {XMMREG,IMMEDIATE,0}, "\3\x66\x0F\x73\202\25", IF_WILLAMETTE|IF_SSE2|IF_SB|IF_AR1},
+    {I_PSUBB, 2, {XMMREG,MEMORY,0}, "\301\3\x66\x0F\xF8\110", IF_WILLAMETTE|IF_SSE2|IF_SM},
+    {I_PSUBB, 2, {XMMREG,XMMREG,0}, "\3\x66\x0F\xF8\110", IF_WILLAMETTE|IF_SSE2},
+    {I_PSUBW, 2, {XMMREG,MEMORY,0}, "\301\3\x66\x0F\xF9\110", IF_WILLAMETTE|IF_SSE2|IF_SM},
+    {I_PSUBW, 2, {XMMREG,XMMREG,0}, "\3\x66\x0F\xF9\110", IF_WILLAMETTE|IF_SSE2},
+    {I_PSUBD, 2, {XMMREG,MEMORY,0}, "\301\3\x66\x0F\xFA\110", IF_WILLAMETTE|IF_SSE2|IF_SM},
+    {I_PSUBD, 2, {XMMREG,XMMREG,0}, "\3\x66\x0F\xFA\110", IF_WILLAMETTE|IF_SSE2},
+    {I_PSUBQ, 2, {MMXREG,MMXREG,0}, "\2\x0F\xFB\110", IF_WILLAMETTE|IF_SSE2},
+    {I_PSUBQ, 2, {MMXREG,MEMORY,0}, "\301\2\x0F\xFB\110", IF_WILLAMETTE|IF_SSE2|IF_SM},
+    {I_PSUBQ, 2, {XMMREG,XMMREG,0}, "\3\x66\x0F\xFB\110", IF_WILLAMETTE|IF_SSE2},
+    {I_PSUBQ, 2, {XMMREG,MEMORY,0}, "\301\3\x66\x0F\xFB\110", IF_WILLAMETTE|IF_SSE2|IF_SM},
+    {I_PSUBSB, 2, {XMMREG,MEMORY,0}, "\301\3\x66\x0F\xE8\110", IF_WILLAMETTE|IF_SSE2|IF_SM},
+    {I_PSUBSB, 2, {XMMREG,XMMREG,0}, "\3\x66\x0F\xE8\110", IF_WILLAMETTE|IF_SSE2},
+    {I_PSUBSW, 2, {XMMREG,MEMORY,0}, "\301\3\x66\x0F\xE9\110", IF_WILLAMETTE|IF_SSE2|IF_SM},
+    {I_PSUBSW, 2, {XMMREG,XMMREG,0}, "\3\x66\x0F\xE9\110", IF_WILLAMETTE|IF_SSE2},
+    {I_PSUBUSB, 2, {XMMREG,MEMORY,0}, "\301\3\x66\x0F\xD8\110", IF_WILLAMETTE|IF_SSE2|IF_SM},
+    {I_PSUBUSB, 2, {XMMREG,XMMREG,0}, "\3\x66\x0F\xD8\110", IF_WILLAMETTE|IF_SSE2},
+    {I_PSUBUSW, 2, {XMMREG,MEMORY,0}, "\301\3\x66\x0F\xD9\110", IF_WILLAMETTE|IF_SSE2|IF_SM},
+    {I_PSUBUSW, 2, {XMMREG,XMMREG,0}, "\3\x66\x0F\xD9\110", IF_WILLAMETTE|IF_SSE2},
+    {I_PUNPCKHBW, 2, {XMMREG,MEMORY,0}, "\301\3\x66\x0F\x68\110", IF_WILLAMETTE|IF_SSE2|IF_SM},
+    {I_PUNPCKHBW, 2, {XMMREG,XMMREG,0}, "\3\x66\x0F\x68\110", IF_WILLAMETTE|IF_SSE2},
+    {I_PUNPCKHWD, 2, {XMMREG,MEMORY,0}, "\301\3\x66\x0F\x69\110", IF_WILLAMETTE|IF_SSE2|IF_SM},
+    {I_PUNPCKHWD, 2, {XMMREG,XMMREG,0}, "\3\x66\x0F\x69\110", IF_WILLAMETTE|IF_SSE2},
+    {I_PUNPCKHDQ, 2, {XMMREG,MEMORY,0}, "\301\3\x66\x0F\x6A\110", IF_WILLAMETTE|IF_SSE2|IF_SM},
+    {I_PUNPCKHDQ, 2, {XMMREG,XMMREG,0}, "\3\x66\x0F\x6A\110", IF_WILLAMETTE|IF_SSE2},
+    {I_PUNPCKHQDQ, 2, {XMMREG,XMMREG,0}, "\3\x66\x0F\x6D\110", IF_WILLAMETTE|IF_SSE2},
+    {I_PUNPCKHQDQ, 2, {XMMREG,MEMORY,0}, "\301\3\x66\x0F\x6D\110", IF_WILLAMETTE|IF_SSE2|IF_SM},
+    {I_PUNPCKLBW, 2, {XMMREG,MEMORY,0}, "\301\3\x66\x0F\x60\110", IF_WILLAMETTE|IF_SSE2|IF_SM},
+    {I_PUNPCKLBW, 2, {XMMREG,XMMREG,0}, "\3\x66\x0F\x60\110", IF_WILLAMETTE|IF_SSE2},
+    {I_PUNPCKLWD, 2, {XMMREG,MEMORY,0}, "\301\3\x66\x0F\x61\110", IF_WILLAMETTE|IF_SSE2|IF_SM},
+    {I_PUNPCKLWD, 2, {XMMREG,XMMREG,0}, "\3\x66\x0F\x61\110", IF_WILLAMETTE|IF_SSE2},
+    {I_PUNPCKLDQ, 2, {XMMREG,MEMORY,0}, "\301\3\x66\x0F\x62\110", IF_WILLAMETTE|IF_SSE2|IF_SM},
+    {I_PUNPCKLDQ, 2, {XMMREG,XMMREG,0}, "\3\x66\x0F\x62\110", IF_WILLAMETTE|IF_SSE2},
+    {I_PUNPCKLQDQ, 2, {XMMREG,XMMREG,0}, "\3\x66\x0F\x6C\110", IF_WILLAMETTE|IF_SSE2},
+    {I_PUNPCKLQDQ, 2, {XMMREG,MEMORY,0}, "\301\3\x66\x0F\x6C\110", IF_WILLAMETTE|IF_SSE2|IF_SM},
+    {I_PXOR, 2, {XMMREG,MEMORY,0}, "\301\3\x66\x0F\xEF\110", IF_WILLAMETTE|IF_SSE2|IF_SM},
+    {I_PXOR, 2, {XMMREG,XMMREG,0}, "\3\x66\x0F\xEF\110", IF_WILLAMETTE|IF_SSE2},
+    {I_ADDPD, 2, {XMMREG,XMMREG,0}, "\331\3\x66\x0F\x58\110", IF_WILLAMETTE|IF_SSE2},
+    {I_ADDPD, 2, {XMMREG,MEMORY,0}, "\301\331\3\x66\x0F\x58\110", IF_WILLAMETTE|IF_SSE2|IF_SM},
+    {I_ADDSD, 2, {XMMREG,XMMREG,0}, "\331\3\xF2\x0F\x58\110", IF_WILLAMETTE|IF_SSE2},
+    {I_ADDSD, 2, {XMMREG,MEMORY,0}, "\301\331\3\xF2\x0F\x58\110", IF_WILLAMETTE|IF_SSE2},
+    {I_ANDNPD, 2, {XMMREG,XMMREG,0}, "\331\3\x66\x0F\x55\110", IF_WILLAMETTE|IF_SSE2},
+    {I_ANDNPD, 2, {XMMREG,MEMORY,0}, "\301\331\3\x66\x0F\x55\110", IF_WILLAMETTE|IF_SSE2|IF_SM},
+    {I_ANDPD, 2, {XMMREG,XMMREG,0}, "\331\3\x66\x0F\x54\110", IF_WILLAMETTE|IF_SSE2},
+    {I_ANDPD, 2, {XMMREG,MEMORY,0}, "\301\331\3\x66\x0F\x54\110", IF_WILLAMETTE|IF_SSE2|IF_SM},
+    {I_CMPEQPD, 2, {XMMREG,MEMORY,0}, "\301\331\3\x66\x0F\xC2\110\1\x00", IF_WILLAMETTE|IF_SSE2|IF_SM},
+    {I_CMPEQPD, 2, {XMMREG,XMMREG,0}, "\331\3\x66\x0F\xC2\110\1\x00", IF_WILLAMETTE|IF_SSE2},
+    {I_CMPEQSD, 2, {XMMREG,MEMORY,0}, "\301\331\3\xF2\x0F\xC2\110\1\x00", IF_WILLAMETTE|IF_SSE2},
+    {I_CMPEQSD, 2, {XMMREG,XMMREG,0}, "\331\3\xF2\x0F\xC2\110\1\x00", IF_WILLAMETTE|IF_SSE2},
+    {I_CMPLEPD, 2, {XMMREG,MEMORY,0}, "\301\331\3\x66\x0F\xC2\110\1\x02", IF_WILLAMETTE|IF_SSE2|IF_SM},
+    {I_CMPLEPD, 2, {XMMREG,XMMREG,0}, "\331\3\x66\x0F\xC2\110\1\x02", IF_WILLAMETTE|IF_SSE2},
+    {I_CMPLESD, 2, {XMMREG,MEMORY,0}, "\301\331\3\xF2\x0F\xC2\110\1\x02", IF_WILLAMETTE|IF_SSE2},
+    {I_CMPLESD, 2, {XMMREG,XMMREG,0}, "\331\3\xF2\x0F\xC2\110\1\x02", IF_WILLAMETTE|IF_SSE2},
+    {I_CMPLTPD, 2, {XMMREG,MEMORY,0}, "\301\331\3\x66\x0F\xC2\110\1\x01", IF_WILLAMETTE|IF_SSE2|IF_SM},
+    {I_CMPLTPD, 2, {XMMREG,XMMREG,0}, "\331\3\x66\x0F\xC2\110\1\x01", IF_WILLAMETTE|IF_SSE2},
+    {I_CMPLTSD, 2, {XMMREG,MEMORY,0}, "\301\331\3\xF2\x0F\xC2\110\1\x01", IF_WILLAMETTE|IF_SSE2},
+    {I_CMPLTSD, 2, {XMMREG,XMMREG,0}, "\331\3\xF2\x0F\xC2\110\1\x01", IF_WILLAMETTE|IF_SSE2},
+    {I_CMPNEQPD, 2, {XMMREG,MEMORY,0}, "\301\331\3\x66\x0F\xC2\110\1\x04", IF_WILLAMETTE|IF_SSE2|IF_SM},
+    {I_CMPNEQPD, 2, {XMMREG,XMMREG,0}, "\331\3\x66\x0F\xC2\110\1\x04", IF_WILLAMETTE|IF_SSE2},
+    {I_CMPNEQSD, 2, {XMMREG,MEMORY,0}, "\301\331\3\xF2\x0F\xC2\110\1\x04", IF_WILLAMETTE|IF_SSE2},
+    {I_CMPNEQSD, 2, {XMMREG,XMMREG,0}, "\331\3\xF2\x0F\xC2\110\1\x04", IF_WILLAMETTE|IF_SSE2},
+    {I_CMPNLEPD, 2, {XMMREG,MEMORY,0}, "\301\331\3\x66\x0F\xC2\110\1\x06", IF_WILLAMETTE|IF_SSE2|IF_SM},
+    {I_CMPNLEPD, 2, {XMMREG,XMMREG,0}, "\331\3\x66\x0F\xC2\110\1\x06", IF_WILLAMETTE|IF_SSE2},
+    {I_CMPNLESD, 2, {XMMREG,MEMORY,0}, "\301\331\3\xF2\x0F\xC2\110\1\x06", IF_WILLAMETTE|IF_SSE2},
+    {I_CMPNLESD, 2, {XMMREG,XMMREG,0}, "\331\3\xF2\x0F\xC2\110\1\x06", IF_WILLAMETTE|IF_SSE2},
+    {I_CMPNLTPD, 2, {XMMREG,MEMORY,0}, "\301\331\3\x66\x0F\xC2\110\1\x05", IF_WILLAMETTE|IF_SSE2|IF_SM},
+    {I_CMPNLTPD, 2, {XMMREG,XMMREG,0}, "\331\3\x66\x0F\xC2\110\1\x05", IF_WILLAMETTE|IF_SSE2},
+    {I_CMPNLTSD, 2, {XMMREG,MEMORY,0}, "\301\331\3\xF2\x0F\xC2\110\1\x05", IF_WILLAMETTE|IF_SSE2},
+    {I_CMPNLTSD, 2, {XMMREG,XMMREG,0}, "\331\3\xF2\x0F\xC2\110\1\x05", IF_WILLAMETTE|IF_SSE2},
+    {I_CMPORDPD, 2, {XMMREG,MEMORY,0}, "\301\331\3\x66\x0F\xC2\110\1\x07", IF_WILLAMETTE|IF_SSE2|IF_SM},
+    {I_CMPORDPD, 2, {XMMREG,XMMREG,0}, "\331\3\x66\x0F\xC2\110\1\x07", IF_WILLAMETTE|IF_SSE2},
+    {I_CMPORDSD, 2, {XMMREG,MEMORY,0}, "\301\331\3\xF2\x0F\xC2\110\1\x07", IF_WILLAMETTE|IF_SSE2},
+    {I_CMPORDSD, 2, {XMMREG,XMMREG,0}, "\331\3\xF2\x0F\xC2\110\1\x07", IF_WILLAMETTE|IF_SSE2},
+    {I_CMPUNORDPD, 2, {XMMREG,MEMORY,0}, "\301\331\3\x66\x0F\xC2\110\1\x03", IF_WILLAMETTE|IF_SSE2|IF_SM},
+    {I_CMPUNORDPD, 2, {XMMREG,XMMREG,0}, "\331\3\x66\x0F\xC2\110\1\x03", IF_WILLAMETTE|IF_SSE2},
+    {I_CMPUNORDSD, 2, {XMMREG,MEMORY,0}, "\301\331\3\xF2\x0F\xC2\110\1\x03", IF_WILLAMETTE|IF_SSE2},
+    {I_CMPUNORDSD, 2, {XMMREG,XMMREG,0}, "\331\3\xF2\x0F\xC2\110\1\x03", IF_WILLAMETTE|IF_SSE2},
+    {I_CMPPD, 3, {XMMREG,XMMREG,IMMEDIATE}, "\331\3\x66\x0F\xC2\110\26", IF_WILLAMETTE|IF_SSE2|IF_SB|IF_AR2},
+    {I_CMPPD, 3, {XMMREG,MEMORY,IMMEDIATE}, "\301\331\3\x66\x0F\xC2\110\26", IF_WILLAMETTE|IF_SSE2|IF_SM2|IF_SB|IF_AR2},
+    {I_CMPSD, 3, {XMMREG,XMMREG,IMMEDIATE}, "\331\3\xF2\x0F\xC2\110\26", IF_WILLAMETTE|IF_SSE2|IF_SB|IF_AR2},
+    {I_CMPSD, 3, {XMMREG,MEMORY,IMMEDIATE}, "\301\331\3\xF2\x0F\xC2\110\26", IF_WILLAMETTE|IF_SSE2|IF_SB|IF_AR2},
+    {I_COMISD, 2, {XMMREG,XMMREG,0}, "\331\3\x66\x0F\x2F\110", IF_WILLAMETTE|IF_SSE2},
+    {I_COMISD, 2, {XMMREG,MEMORY,0}, "\301\331\3\x66\x0F\x2F\110", IF_WILLAMETTE|IF_SSE2},
+    {I_CVTDQ2PD, 2, {XMMREG,XMMREG,0}, "\333\2\x0F\xE6\110", IF_WILLAMETTE|IF_SSE2},
+    {I_CVTDQ2PD, 2, {XMMREG,MEMORY,0}, "\301\333\2\x0F\xE6\110", IF_WILLAMETTE|IF_SSE2},
+    {I_CVTDQ2PS, 2, {XMMREG,XMMREG,0}, "\2\x0F\x5B\110", IF_WILLAMETTE|IF_SSE2},
+    {I_CVTDQ2PS, 2, {XMMREG,MEMORY,0}, "\301\2\x0F\x5B\110", IF_WILLAMETTE|IF_SSE2|IF_SM},
+    {I_CVTPD2DQ, 2, {XMMREG,XMMREG,0}, "\3\xF2\x0F\xE6\110", IF_WILLAMETTE|IF_SSE2},
+    {I_CVTPD2DQ, 2, {XMMREG,MEMORY,0}, "\301\3\xF2\x0F\xE6\110", IF_WILLAMETTE|IF_SSE2|IF_SM},
+    {I_CVTPD2PI, 2, {MMXREG,XMMREG,0}, "\3\x66\x0F\x2D\110", IF_WILLAMETTE|IF_SSE2},
+    {I_CVTPD2PI, 2, {MMXREG,MEMORY,0}, "\301\3\x66\x0F\x2D\110", IF_WILLAMETTE|IF_SSE2},
+    {I_CVTPD2PS, 2, {XMMREG,XMMREG,0}, "\3\x66\x0F\x5A\110", IF_WILLAMETTE|IF_SSE2},
+    {I_CVTPD2PS, 2, {XMMREG,MEMORY,0}, "\301\3\x66\x0F\x5A\110", IF_WILLAMETTE|IF_SSE2|IF_SM},
+    {I_CVTPI2PD, 2, {XMMREG,MMXREG,0}, "\3\x66\x0F\x2A\110", IF_WILLAMETTE|IF_SSE2},
+    {I_CVTPI2PD, 2, {XMMREG,MEMORY,0}, "\301\3\x66\x0F\x2A\110", IF_WILLAMETTE|IF_SSE2},
+    {I_CVTPS2DQ, 2, {XMMREG,XMMREG,0}, "\3\x66\x0F\x5B\110", IF_WILLAMETTE|IF_SSE2},
+    {I_CVTPS2DQ, 2, {XMMREG,MEMORY,0}, "\301\3\x66\x0F\x5B\110", IF_WILLAMETTE|IF_SSE2|IF_SM},
+    {I_CVTPS2PD, 2, {XMMREG,XMMREG,0}, "\2\x0F\x5A\110", IF_WILLAMETTE|IF_SSE2},
+    {I_CVTPS2PD, 2, {XMMREG,MEMORY,0}, "\301\2\x0F\x5A\110", IF_WILLAMETTE|IF_SSE2},
+    {I_CVTSD2SI, 2, {REG32,XMMREG,0}, "\3\xF2\x0F\x2D\110", IF_WILLAMETTE|IF_SSE2},
+    {I_CVTSD2SI, 2, {REG32,MEMORY,0}, "\301\3\xF2\x0F\x2D\110", IF_WILLAMETTE|IF_SSE2},
+    {I_CVTSD2SS, 2, {XMMREG,XMMREG,0}, "\3\xF2\x0F\x5A\110", IF_WILLAMETTE|IF_SSE2},
+    {I_CVTSD2SS, 2, {XMMREG,MEMORY,0}, "\301\3\xF2\x0F\x5A\110", IF_WILLAMETTE|IF_SSE2},
+    {I_CVTSI2SD, 2, {XMMREG,REG32,0}, "\3\xF2\x0F\x2A\110", IF_WILLAMETTE|IF_SSE2},
+    {I_CVTSI2SD, 2, {XMMREG,MEMORY,0}, "\301\3\xF2\x0F\x2A\110", IF_WILLAMETTE|IF_SSE2},
+    {I_CVTSS2SD, 2, {XMMREG,XMMREG,0}, "\333\2\x0F\x5A\110", IF_WILLAMETTE|IF_SSE2},
+    {I_CVTSS2SD, 2, {XMMREG,MEMORY,0}, "\301\333\2\x0F\x5A\110", IF_WILLAMETTE|IF_SSE2},
+    {I_CVTTPD2PI, 2, {MMXREG,XMMREG,0}, "\3\x66\x0F\x2C\110", IF_WILLAMETTE|IF_SSE2},
+    {I_CVTTPD2PI, 2, {MMXREG,MEMORY,0}, "\301\3\x66\x0F\x2C\110", IF_WILLAMETTE|IF_SSE2},
+    {I_CVTTPD2DQ, 2, {XMMREG,XMMREG,0}, "\3\x66\x0F\xE6\110", IF_WILLAMETTE|IF_SSE2},
+    {I_CVTTPD2DQ, 2, {XMMREG,MEMORY,0}, "\301\3\x66\x0F\xE6\110", IF_WILLAMETTE|IF_SSE2|IF_SM},
+    {I_CVTTPS2DQ, 2, {XMMREG,XMMREG,0}, "\333\2\x0F\x5B\110", IF_WILLAMETTE|IF_SSE2},
+    {I_CVTTPS2DQ, 2, {XMMREG,MEMORY,0}, "\301\333\2\x0F\x5B\110", IF_WILLAMETTE|IF_SSE2|IF_SM},
+    {I_CVTTSD2SI, 2, {REG32,XMMREG,0}, "\3\xF2\x0F\x2C\110", IF_WILLAMETTE|IF_SSE2},
+    {I_CVTTSD2SI, 2, {REG32,MEMORY,0}, "\301\3\xF2\x0F\x2C\110", IF_WILLAMETTE|IF_SSE2},
+    {I_DIVPD, 2, {XMMREG,XMMREG,0}, "\3\x66\x0F\x5E\110", IF_WILLAMETTE|IF_SSE2},
+    {I_DIVPD, 2, {XMMREG,MEMORY,0}, "\301\3\x66\x0F\x5E\110", IF_WILLAMETTE|IF_SSE2|IF_SM},
+    {I_DIVSD, 2, {XMMREG,XMMREG,0}, "\3\xF2\x0F\x5E\110", IF_WILLAMETTE|IF_SSE2},
+    {I_DIVSD, 2, {XMMREG,MEMORY,0}, "\301\3\xF2\x0F\x5E\110", IF_WILLAMETTE|IF_SSE2},
+    {I_MAXPD, 2, {XMMREG,XMMREG,0}, "\3\x66\x0F\x5F\110", IF_WILLAMETTE|IF_SSE2},
+    {I_MAXPD, 2, {XMMREG,MEMORY,0}, "\301\3\x66\x0F\x5F\110", IF_WILLAMETTE|IF_SSE2|IF_SM},
+    {I_MAXSD, 2, {XMMREG,XMMREG,0}, "\3\xF2\x0F\x5F\110", IF_WILLAMETTE|IF_SSE2},
+    {I_MAXSD, 2, {XMMREG,MEMORY,0}, "\301\3\xF2\x0F\x5F\110", IF_WILLAMETTE|IF_SSE2},
+    {I_MINPD, 2, {XMMREG,XMMREG,0}, "\3\x66\x0F\x5D\110", IF_WILLAMETTE|IF_SSE2},
+    {I_MINPD, 2, {XMMREG,MEMORY,0}, "\301\3\x66\x0F\x5D\110", IF_WILLAMETTE|IF_SSE2|IF_SM},
+    {I_MINSD, 2, {XMMREG,XMMREG,0}, "\3\xF2\x0F\x5D\110", IF_WILLAMETTE|IF_SSE2},
+    {I_MINSD, 2, {XMMREG,MEMORY,0}, "\301\3\xF2\x0F\x5D\110", IF_WILLAMETTE|IF_SSE2},
+    {I_MOVAPD, 2, {XMMREG,XMMREG,0}, "\3\x66\x0F\x28\110", IF_WILLAMETTE|IF_SSE2},
+    {I_MOVAPD, 2, {XMMREG,XMMREG,0}, "\3\x66\x0F\x29\110", IF_WILLAMETTE|IF_SSE2},
+    {I_MOVAPD, 2, {MEMORY,XMMREG,0}, "\300\3\x66\x0F\x29\101", IF_WILLAMETTE|IF_SSE2|IF_SM},
+    {I_MOVAPD, 2, {XMMREG,MEMORY,0}, "\301\3\x66\x0F\x28\110", IF_WILLAMETTE|IF_SSE2|IF_SM},
+    {I_MOVHPD, 2, {MEMORY,XMMREG,0}, "\300\3\x66\x0F\x17\101", IF_WILLAMETTE|IF_SSE2},
+    {I_MOVHPD, 2, {XMMREG,MEMORY,0}, "\301\3\x66\x0F\x16\110", IF_WILLAMETTE|IF_SSE2},
+    {I_MOVLPD, 2, {MEMORY,XMMREG,0}, "\300\3\x66\x0F\x13\101", IF_WILLAMETTE|IF_SSE2},
+    {I_MOVLPD, 2, {XMMREG,MEMORY,0}, "\301\3\x66\x0F\x12\110", IF_WILLAMETTE|IF_SSE2},
+    {I_MOVMSKPD, 2, {REG32,XMMREG,0}, "\3\x66\x0F\x50\110", IF_WILLAMETTE|IF_SSE2},
+    {I_MOVSD, 2, {XMMREG,XMMREG,0}, "\3\xF2\x0F\x10\110", IF_WILLAMETTE|IF_SSE2},
+    {I_MOVSD, 2, {XMMREG,XMMREG,0}, "\3\xF2\x0F\x11\110", IF_WILLAMETTE|IF_SSE2},
+    {I_MOVSD, 2, {MEMORY,XMMREG,0}, "\300\3\xF2\x0F\x11\101", IF_WILLAMETTE|IF_SSE2},
+    {I_MOVSD, 2, {XMMREG,MEMORY,0}, "\301\3\xF2\x0F\x10\110", IF_WILLAMETTE|IF_SSE2},
+    {I_MOVUPD, 2, {XMMREG,XMMREG,0}, "\3\x66\x0F\x10\110", IF_WILLAMETTE|IF_SSE2},
+    {I_MOVUPD, 2, {XMMREG,XMMREG,0}, "\3\x66\x0F\x11\110", IF_WILLAMETTE|IF_SSE2},
+    {I_MOVUPD, 2, {MEMORY,XMMREG,0}, "\300\3\x66\x0F\x11\101", IF_WILLAMETTE|IF_SSE2|IF_SM},
+    {I_MOVUPD, 2, {XMMREG,MEMORY,0}, "\301\3\x66\x0F\x10\110", IF_WILLAMETTE|IF_SSE2|IF_SM},
+    {I_MULPD, 2, {XMMREG,XMMREG,0}, "\3\x66\x0F\x59\110", IF_WILLAMETTE|IF_SSE2},
+    {I_MULPD, 2, {XMMREG,MEMORY,0}, "\301\3\x66\x0F\x59\110", IF_WILLAMETTE|IF_SSE2|IF_SM},
+    {I_MULSD, 2, {XMMREG,XMMREG,0}, "\3\xF2\x0F\x59\110", IF_WILLAMETTE|IF_SSE2},
+    {I_MULSD, 2, {XMMREG,MEMORY,0}, "\301\3\xF2\x0F\x59\110", IF_WILLAMETTE|IF_SSE2},
+    {I_ORPD, 2, {XMMREG,MEMORY,0}, "\301\3\x66\x0F\x56\110", IF_WILLAMETTE|IF_SSE2|IF_SM},
+    {I_ORPD, 2, {XMMREG,XMMREG,0}, "\3\x66\x0F\x56\110", IF_WILLAMETTE|IF_SSE2},
+    {I_SHUFPD, 3, {XMMREG,XMMREG,IMMEDIATE}, "\3\x66\x0F\xC6\110\26", IF_WILLAMETTE|IF_SSE2|IF_SB|IF_AR2},
+    {I_SHUFPD, 3, {XMMREG,MEMORY,IMMEDIATE}, "\301\3\x66\x0F\xC6\110\26", IF_WILLAMETTE|IF_SSE2|IF_SM|IF_SB|IF_AR2},
+    {I_SQRTPD, 2, {XMMREG,XMMREG,0}, "\3\x66\x0F\x51\110", IF_WILLAMETTE|IF_SSE2},
+    {I_SQRTPD, 2, {XMMREG,MEMORY,0}, "\301\3\x66\x0F\x51\110", IF_WILLAMETTE|IF_SSE2|IF_SM},
+    {I_SQRTSD, 2, {XMMREG,XMMREG,0}, "\3\xF2\x0F\x51\110", IF_WILLAMETTE|IF_SSE2},
+    {I_SQRTSD, 2, {XMMREG,MEMORY,0}, "\301\3\xF2\x0F\x51\110", IF_WILLAMETTE|IF_SSE2},
+    {I_SUBPD, 2, {XMMREG,XMMREG,0}, "\3\x66\x0F\x5C\110", IF_WILLAMETTE|IF_SSE2},
+    {I_SUBPD, 2, {XMMREG,MEMORY,0}, "\301\3\x66\x0F\x5C\110", IF_WILLAMETTE|IF_SSE2|IF_SM},
+    {I_SUBSD, 2, {XMMREG,XMMREG,0}, "\3\xF2\x0F\x5C\110", IF_WILLAMETTE|IF_SSE2},
+    {I_SUBSD, 2, {XMMREG,MEMORY,0}, "\301\3\xF2\x0F\x5C\110", IF_WILLAMETTE|IF_SSE2},
+    {I_UCOMISD, 2, {XMMREG,XMMREG,0}, "\3\x66\x0F\x2E\110", IF_WILLAMETTE|IF_SSE2},
+    {I_UCOMISD, 2, {XMMREG,MEMORY,0}, "\301\3\x66\x0F\x2E\110", IF_WILLAMETTE|IF_SSE2},
+    {I_UNPCKHPD, 2, {XMMREG,XMMREG,0}, "\3\x66\x0F\x15\110", IF_WILLAMETTE|IF_SSE2},
+    {I_UNPCKHPD, 2, {XMMREG,MEMORY,0}, "\301\3\x66\x0F\x15\110", IF_WILLAMETTE|IF_SSE2|IF_SM},
+    {I_UNPCKLPD, 2, {XMMREG,XMMREG,0}, "\3\x66\x0F\x14\110", IF_WILLAMETTE|IF_SSE2},
+    {I_UNPCKLPD, 2, {XMMREG,MEMORY,0}, "\301\3\x66\x0F\x14\110", IF_WILLAMETTE|IF_SSE2|IF_SM},
+    {I_XORPD, 2, {XMMREG,XMMREG,0}, "\3\x66\x0F\x57\110", IF_WILLAMETTE|IF_SSE2},
+    {I_XORPD, 2, {XMMREG,MEMORY,0}, "\301\3\x66\x0F\x57\110", IF_WILLAMETTE|IF_SSE2|IF_SM},
+    {I_ADDSUBPD, 2, {XMMREG,MEMORY,0}, "\301\3\x66\x0F\xD0\110", IF_PRESCOTT|IF_SSE3|IF_SM},
+    {I_ADDSUBPD, 2, {XMMREG,XMMREG,0}, "\3\x66\x0F\xD0\110", IF_PRESCOTT|IF_SSE3},
+    {I_ADDSUBPS, 2, {XMMREG,MEMORY,0}, "\301\3\xF2\x0F\xD0\110", IF_PRESCOTT|IF_SSE3|IF_SM},
+    {I_ADDSUBPS, 2, {XMMREG,XMMREG,0}, "\3\xF2\x0F\xD0\110", IF_PRESCOTT|IF_SSE3},
+    {I_HADDPD, 2, {XMMREG,MEMORY,0}, "\301\3\x66\x0F\x7C\110", IF_PRESCOTT|IF_SSE3|IF_SM},
+    {I_HADDPD, 2, {XMMREG,XMMREG,0}, "\3\x66\x0F\x7C\110", IF_PRESCOTT|IF_SSE3},
+    {I_HADDPS, 2, {XMMREG,MEMORY,0}, "\301\3\xF2\x0F\x7C\110", IF_PRESCOTT|IF_SSE3|IF_SM},
+    {I_HADDPS, 2, {XMMREG,XMMREG,0}, "\3\xF2\x0F\x7C\110", IF_PRESCOTT|IF_SSE3},
+    {I_HSUBPD, 2, {XMMREG,MEMORY,0}, "\301\3\x66\x0F\x7D\110", IF_PRESCOTT|IF_SSE3|IF_SM},
+    {I_HSUBPD, 2, {XMMREG,XMMREG,0}, "\3\x66\x0F\x7D\110", IF_PRESCOTT|IF_SSE3},
+    {I_HSUBPS, 2, {XMMREG,MEMORY,0}, "\301\3\xF2\x0F\x7D\110", IF_PRESCOTT|IF_SSE3|IF_SM},
+    {I_HSUBPS, 2, {XMMREG,XMMREG,0}, "\3\xF2\x0F\x7D\110", IF_PRESCOTT|IF_SSE3},
+    {I_LDDQU, 2, {XMMREG,MEMORY,0}, "\3\xF2\x0F\xF0\110", IF_PRESCOTT|IF_SSE3},
+    {I_MOVDDUP, 2, {XMMREG,MEMORY,0}, "\301\3\xF2\x0F\x12\110", IF_PRESCOTT|IF_SSE3},
+    {I_MOVDDUP, 2, {XMMREG,XMMREG,0}, "\3\xF2\x0F\x12\110", IF_PRESCOTT|IF_SSE3},
+    {I_MOVSHDUP, 2, {XMMREG,MEMORY,0}, "\301\3\xF3\x0F\x16\110", IF_PRESCOTT|IF_SSE3},
+    {I_MOVSHDUP, 2, {XMMREG,XMMREG,0}, "\3\xF3\x0F\x16\110", IF_PRESCOTT|IF_SSE3},
+    {I_MOVSLDUP, 2, {XMMREG,MEMORY,0}, "\301\3\xF3\x0F\x12\110", IF_PRESCOTT|IF_SSE3},
+    {I_MOVSLDUP, 2, {XMMREG,XMMREG,0}, "\3\xF3\x0F\x12\110", IF_PRESCOTT|IF_SSE3},
+    ITEMPLATE_END
+};
+
+static struct itemplate *itable_00[] = {
+    instrux + 29,
+    instrux + 30,
+    NULL
+};
+
+static struct itemplate *itable_01[] = {
+    instrux + 31,
+    instrux + 32,
+    instrux + 33,
+    instrux + 34,
+    NULL
+};
+
+static struct itemplate *itable_02[] = {
+    instrux + 35,
+    instrux + 36,
+    NULL
+};
+
+static struct itemplate *itable_03[] = {
+    instrux + 37,
+    instrux + 38,
+    instrux + 39,
+    instrux + 40,
+    NULL
+};
+
+static struct itemplate *itable_04[] = {
+    instrux + 43,
+    NULL
+};
+
+static struct itemplate *itable_05[] = {
+    instrux + 44,
+    instrux + 45,
+    NULL
+};
+
+static struct itemplate *itable_06[] = {
+    instrux + 778,
+    instrux + 779,
+    NULL
+};
+
+static struct itemplate *itable_07[] = {
+    instrux + 710,
+    NULL
+};
+
+static struct itemplate *itable_08[] = {
+    instrux + 578,
+    instrux + 579,
+    NULL
+};
+
+static struct itemplate *itable_09[] = {
+    instrux + 580,
+    instrux + 581,
+    instrux + 582,
+    instrux + 583,
+    NULL
+};
+
+static struct itemplate *itable_0A[] = {
+    instrux + 584,
+    instrux + 585,
+    NULL
+};
+
+static struct itemplate *itable_0B[] = {
+    instrux + 586,
+    instrux + 587,
+    instrux + 588,
+    instrux + 589,
+    NULL
+};
+
+static struct itemplate *itable_0C[] = {
+    instrux + 592,
+    NULL
+};
+
+static struct itemplate *itable_0D[] = {
+    instrux + 593,
+    instrux + 594,
+    NULL
+};
+
+static struct itemplate *itable_0E[] = {
+    instrux + 778,
+    instrux + 779,
+    NULL
+};
+
+static struct itemplate *itable_0F[] = {
+    instrux + 79,
+    instrux + 80,
+    instrux + 81,
+    instrux + 82,
+    instrux + 83,
+    instrux + 84,
+    instrux + 85,
+    instrux + 86,
+    instrux + 87,
+    instrux + 88,
+    instrux + 89,
+    instrux + 90,
+    instrux + 91,
+    instrux + 92,
+    instrux + 93,
+    instrux + 94,
+    instrux + 95,
+    instrux + 96,
+    instrux + 97,
+    instrux + 98,
+    instrux + 99,
+    instrux + 100,
+    instrux + 101,
+    instrux + 102,
+    instrux + 103,
+    instrux + 104,
+    instrux + 105,
+    instrux + 106,
+    instrux + 107,
+    instrux + 108,
+    instrux + 109,
+    instrux + 110,
+    instrux + 111,
+    instrux + 139,
+    instrux + 167,
+    instrux + 168,
+    instrux + 169,
+    instrux + 170,
+    instrux + 171,
+    instrux + 172,
+    instrux + 173,
+    instrux + 174,
+    instrux + 175,
+    instrux + 176,
+    instrux + 177,
+    instrux + 178,
+    instrux + 179,
+    instrux + 180,
+    instrux + 193,
+    instrux + 261,
+    instrux + 389,
+    instrux + 390,
+    instrux + 391,
+    instrux + 392,
+    instrux + 423,
+    instrux + 424,
+    instrux + 450,
+    instrux + 451,
+    instrux + 452,
+    instrux + 453,
+    instrux + 454,
+    instrux + 456,
+    instrux + 457,
+    instrux + 458,
+    instrux + 459,
+    instrux + 467,
+    instrux + 468,
+    instrux + 469,
+    instrux + 470,
+    instrux + 471,
+    instrux + 472,
+    instrux + 473,
+    instrux + 474,
+    instrux + 475,
+    instrux + 476,
+    instrux + 477,
+    instrux + 478,
+    instrux + 479,
+    instrux + 480,
+    instrux + 499,
+    instrux + 500,
+    instrux + 501,
+    instrux + 502,
+    instrux + 503,
+    instrux + 504,
+    instrux + 505,
+    instrux + 506,
+    instrux + 507,
+    instrux + 508,
+    instrux + 521,
+    instrux + 522,
+    instrux + 523,
+    instrux + 524,
+    instrux + 525,
+    instrux + 526,
+    instrux + 548,
+    instrux + 549,
+    instrux + 550,
+    instrux + 551,
+    instrux + 552,
+    instrux + 553,
+    instrux + 554,
+    instrux + 555,
+    instrux + 559,
+    instrux + 560,
+    instrux + 561,
+    instrux + 562,
+    instrux + 563,
+    instrux + 564,
+    instrux + 565,
+    instrux + 566,
+    instrux + 570,
+    instrux + 610,
+    instrux + 611,
+    instrux + 612,
+    instrux + 613,
+    instrux + 614,
+    instrux + 615,
+    instrux + 616,
+    instrux + 617,
+    instrux + 618,
+    instrux + 619,
+    instrux + 620,
+    instrux + 621,
+    instrux + 622,
+    instrux + 623,
+    instrux + 624,
+    instrux + 625,
+    instrux + 626,
+    instrux + 627,
+    instrux + 628,
+    instrux + 629,
+    instrux + 630,
+    instrux + 631,
+    instrux + 632,
+    instrux + 633,
+    instrux + 634,
+    instrux + 635,
+    instrux + 636,
+    instrux + 637,
+    instrux + 638,
+    instrux + 639,
+    instrux + 640,
+    instrux + 641,
+    instrux + 642,
+    instrux + 643,
+    instrux + 644,
+    instrux + 645,
+    instrux + 646,
+    instrux + 647,
+    instrux + 648,
+    instrux + 649,
+    instrux + 650,
+    instrux + 651,
+    instrux + 652,
+    instrux + 653,
+    instrux + 654,
+    instrux + 655,
+    instrux + 656,
+    instrux + 657,
+    instrux + 658,
+    instrux + 659,
+    instrux + 660,
+    instrux + 661,
+    instrux + 662,
+    instrux + 663,
+    instrux + 664,
+    instrux + 665,
+    instrux + 666,
+    instrux + 667,
+    instrux + 668,
+    instrux + 669,
+    instrux + 670,
+    instrux + 671,
+    instrux + 672,
+    instrux + 673,
+    instrux + 674,
+    instrux + 675,
+    instrux + 676,
+    instrux + 677,
+    instrux + 678,
+    instrux + 679,
+    instrux + 680,
+    instrux + 681,
+    instrux + 682,
+    instrux + 683,
+    instrux + 684,
+    instrux + 685,
+    instrux + 686,
+    instrux + 687,
+    instrux + 688,
+    instrux + 689,
+    instrux + 690,
+    instrux + 691,
+    instrux + 692,
+    instrux + 693,
+    instrux + 694,
+    instrux + 695,
+    instrux + 696,
+    instrux + 697,
+    instrux + 698,
+    instrux + 699,
+    instrux + 700,
+    instrux + 701,
+    instrux + 702,
+    instrux + 703,
+    instrux + 704,
+    instrux + 705,
+    instrux + 711,
+    instrux + 718,
+    instrux + 719,
+    instrux + 720,
+    instrux + 721,
+    instrux + 722,
+    instrux + 723,
+    instrux + 724,
+    instrux + 725,
+    instrux + 726,
+    instrux + 727,
+    instrux + 728,
+    instrux + 729,
+    instrux + 730,
+    instrux + 731,
+    instrux + 732,
+    instrux + 733,
+    instrux + 734,
+    instrux + 735,
+    instrux + 736,
+    instrux + 737,
+    instrux + 738,
+    instrux + 739,
+    instrux + 740,
+    instrux + 741,
+    instrux + 742,
+    instrux + 743,
+    instrux + 744,
+    instrux + 745,
+    instrux + 746,
+    instrux + 747,
+    instrux + 748,
+    instrux + 749,
+    instrux + 750,
+    instrux + 751,
+    instrux + 752,
+    instrux + 753,
+    instrux + 754,
+    instrux + 755,
+    instrux + 756,
+    instrux + 757,
+    instrux + 758,
+    instrux + 759,
+    instrux + 760,
+    instrux + 761,
+    instrux + 762,
+    instrux + 763,
+    instrux + 764,
+    instrux + 765,
+    instrux + 766,
+    instrux + 767,
+    instrux + 768,
+    instrux + 769,
+    instrux + 770,
+    instrux + 771,
+    instrux + 772,
+    instrux + 773,
+    instrux + 780,
+    instrux + 791,
+    instrux + 792,
+    instrux + 811,
+    instrux + 812,
+    instrux + 813,
+    instrux + 814,
+    instrux + 840,
+    instrux + 841,
+    instrux + 842,
+    instrux + 843,
+    instrux + 881,
+    instrux + 891,
+    instrux + 892,
+    instrux + 893,
+    instrux + 894,
+    instrux + 895,
+    instrux + 896,
+    instrux + 897,
+    instrux + 898,
+    instrux + 908,
+    instrux + 909,
+    instrux + 910,
+    instrux + 911,
+    instrux + 912,
+    instrux + 913,
+    instrux + 914,
+    instrux + 915,
+    instrux + 916,
+    instrux + 917,
+    instrux + 918,
+    instrux + 919,
+    instrux + 920,
+    instrux + 922,
+    instrux + 923,
+    instrux + 924,
+    instrux + 925,
+    instrux + 926,
+    instrux + 933,
+    instrux + 934,
+    instrux + 935,
+    instrux + 936,
+    instrux + 960,
+    instrux + 961,
+    instrux + 962,
+    instrux + 963,
+    instrux + 964,
+    instrux + 965,
+    instrux + 966,
+    instrux + 985,
+    instrux + 986,
+    instrux + 987,
+    instrux + 988,
+    instrux + 989,
+    instrux + 990,
+    instrux + 991,
+    instrux + 992,
+    instrux + 993,
+    instrux + 994,
+    instrux + 995,
+    instrux + 996,
+    instrux + 997,
+    instrux + 998,
+    instrux + 999,
+    instrux + 1000,
+    instrux + 1001,
+    instrux + 1002,
+    instrux + 1003,
+    instrux + 1004,
+    instrux + 1005,
+    instrux + 1008,
+    instrux + 1009,
+    instrux + 1010,
+    instrux + 1011,
+    instrux + 1012,
+    instrux + 1013,
+    instrux + 1014,
+    instrux + 1015,
+    instrux + 1016,
+    instrux + 1058,
+    instrux + 1059,
+    instrux + 1060,
+    instrux + 1061,
+    instrux + 1062,
+    instrux + 1063,
+    instrux + 1064,
+    instrux + 1065,
+    instrux + 1067,
+    instrux + 1068,
+    instrux + 1069,
+    instrux + 1070,
+    instrux + 1071,
+    instrux + 1072,
+    instrux + 1073,
+    instrux + 1074,
+    instrux + 1075,
+    instrux + 1076,
+    instrux + 1077,
+    instrux + 1078,
+    instrux + 1079,
+    instrux + 1080,
+    instrux + 1081,
+    instrux + 1082,
+    instrux + 1083,
+    instrux + 1084,
+    instrux + 1085,
+    instrux + 1086,
+    instrux + 1087,
+    instrux + 1088,
+    instrux + 1089,
+    instrux + 1090,
+    instrux + 1091,
+    instrux + 1092,
+    instrux + 1093,
+    instrux + 1094,
+    instrux + 1095,
+    instrux + 1096,
+    instrux + 1097,
+    instrux + 1098,
+    instrux + 1099,
+    instrux + 1100,
+    instrux + 1101,
+    instrux + 1102,
+    instrux + 1103,
+    instrux + 1104,
+    instrux + 1105,
+    instrux + 1106,
+    instrux + 1107,
+    instrux + 1108,
+    instrux + 1109,
+    instrux + 1110,
+    instrux + 1111,
+    instrux + 1112,
+    instrux + 1113,
+    instrux + 1114,
+    instrux + 1115,
+    instrux + 1116,
+    instrux + 1117,
+    instrux + 1118,
+    instrux + 1119,
+    instrux + 1120,
+    instrux + 1121,
+    instrux + 1122,
+    instrux + 1123,
+    instrux + 1124,
+    instrux + 1125,
+    instrux + 1126,
+    instrux + 1127,
+    instrux + 1128,
+    instrux + 1129,
+    instrux + 1130,
+    instrux + 1131,
+    instrux + 1132,
+    instrux + 1133,
+    instrux + 1134,
+    instrux + 1135,
+    instrux + 1136,
+    instrux + 1137,
+    instrux + 1138,
+    instrux + 1139,
+    instrux + 1140,
+    instrux + 1141,
+    instrux + 1142,
+    instrux + 1143,
+    instrux + 1144,
+    instrux + 1145,
+    instrux + 1146,
+    instrux + 1147,
+    instrux + 1148,
+    instrux + 1149,
+    instrux + 1150,
+    instrux + 1151,
+    instrux + 1152,
+    instrux + 1153,
+    instrux + 1154,
+    instrux + 1155,
+    instrux + 1156,
+    instrux + 1157,
+    instrux + 1158,
+    instrux + 1159,
+    instrux + 1160,
+    instrux + 1161,
+    instrux + 1162,
+    instrux + 1163,
+    instrux + 1164,
+    instrux + 1165,
+    instrux + 1166,
+    instrux + 1167,
+    instrux + 1168,
+    instrux + 1169,
+    instrux + 1170,
+    instrux + 1171,
+    instrux + 1172,
+    instrux + 1173,
+    instrux + 1174,
+    instrux + 1175,
+    instrux + 1176,
+    instrux + 1177,
+    instrux + 1178,
+    instrux + 1179,
+    instrux + 1180,
+    instrux + 1181,
+    instrux + 1182,
+    instrux + 1183,
+    instrux + 1184,
+    instrux + 1185,
+    instrux + 1186,
+    instrux + 1187,
+    instrux + 1188,
+    instrux + 1189,
+    instrux + 1190,
+    instrux + 1191,
+    instrux + 1192,
+    instrux + 1193,
+    instrux + 1194,
+    instrux + 1195,
+    instrux + 1196,
+    instrux + 1197,
+    instrux + 1198,
+    instrux + 1199,
+    instrux + 1200,
+    instrux + 1201,
+    instrux + 1202,
+    instrux + 1203,
+    instrux + 1204,
+    instrux + 1205,
+    instrux + 1206,
+    instrux + 1207,
+    instrux + 1208,
+    instrux + 1209,
+    instrux + 1210,
+    instrux + 1211,
+    instrux + 1212,
+    instrux + 1213,
+    instrux + 1214,
+    instrux + 1215,
+    instrux + 1216,
+    instrux + 1217,
+    instrux + 1218,
+    instrux + 1219,
+    instrux + 1220,
+    instrux + 1221,
+    instrux + 1222,
+    instrux + 1223,
+    instrux + 1224,
+    instrux + 1225,
+    instrux + 1226,
+    instrux + 1227,
+    instrux + 1228,
+    instrux + 1229,
+    instrux + 1230,
+    instrux + 1231,
+    instrux + 1232,
+    instrux + 1233,
+    instrux + 1235,
+    instrux + 1237,
+    instrux + 1240,
+    instrux + 1241,
+    instrux + 1250,
+    instrux + 1251,
+    instrux + 1252,
+    instrux + 1253,
+    instrux + 1255,
+    instrux + 1258,
+    instrux + 1259,
+    instrux + 1272,
+    instrux + 1273,
+    instrux + 1324,
+    instrux + 1325,
+    instrux + 1334,
+    instrux + 1335,
+    instrux + 1370,
+    instrux + 1371,
+    instrux + 1446,
+    instrux + 1447,
+    instrux + 1448,
+    instrux + 1449,
+    instrux + 1460,
+    instrux + 1461,
+    instrux + 1468,
+    instrux + 1469,
+    instrux + 1474,
+    instrux + 1475,
+    NULL
+};
+
+static struct itemplate *itable_10[] = {
+    instrux + 6,
+    instrux + 7,
+    NULL
+};
+
+static struct itemplate *itable_11[] = {
+    instrux + 8,
+    instrux + 9,
+    instrux + 10,
+    instrux + 11,
+    NULL
+};
+
+static struct itemplate *itable_12[] = {
+    instrux + 12,
+    instrux + 13,
+    NULL
+};
+
+static struct itemplate *itable_13[] = {
+    instrux + 14,
+    instrux + 15,
+    instrux + 16,
+    instrux + 17,
+    NULL
+};
+
+static struct itemplate *itable_14[] = {
+    instrux + 20,
+    NULL
+};
+
+static struct itemplate *itable_15[] = {
+    instrux + 21,
+    instrux + 22,
+    NULL
+};
+
+static struct itemplate *itable_16[] = {
+    instrux + 778,
+    instrux + 779,
+    NULL
+};
+
+static struct itemplate *itable_17[] = {
+    instrux + 710,
+    NULL
+};
+
+static struct itemplate *itable_18[] = {
+    instrux + 855,
+    instrux + 856,
+    NULL
+};
+
+static struct itemplate *itable_19[] = {
+    instrux + 857,
+    instrux + 858,
+    instrux + 859,
+    instrux + 860,
+    NULL
+};
+
+static struct itemplate *itable_1A[] = {
+    instrux + 861,
+    instrux + 862,
+    NULL
+};
+
+static struct itemplate *itable_1B[] = {
+    instrux + 863,
+    instrux + 864,
+    instrux + 865,
+    instrux + 866,
+    NULL
+};
+
+static struct itemplate *itable_1C[] = {
+    instrux + 869,
+    NULL
+};
+
+static struct itemplate *itable_1D[] = {
+    instrux + 870,
+    instrux + 871,
+    NULL
+};
+
+static struct itemplate *itable_1E[] = {
+    instrux + 778,
+    instrux + 779,
+    NULL
+};
+
+static struct itemplate *itable_1F[] = {
+    instrux + 710,
+    NULL
+};
+
+static struct itemplate *itable_20[] = {
+    instrux + 52,
+    instrux + 53,
+    NULL
+};
+
+static struct itemplate *itable_21[] = {
+    instrux + 54,
+    instrux + 55,
+    instrux + 56,
+    instrux + 57,
+    NULL
+};
+
+static struct itemplate *itable_22[] = {
+    instrux + 58,
+    instrux + 59,
+    NULL
+};
+
+static struct itemplate *itable_23[] = {
+    instrux + 60,
+    instrux + 61,
+    instrux + 62,
+    instrux + 63,
+    NULL
+};
+
+static struct itemplate *itable_24[] = {
+    instrux + 66,
+    NULL
+};
+
+static struct itemplate *itable_25[] = {
+    instrux + 67,
+    instrux + 68,
+    NULL
+};
+
+static struct itemplate *itable_26[] = {
+    NULL
+};
+
+static struct itemplate *itable_27[] = {
+    instrux + 183,
+    NULL
+};
+
+static struct itemplate *itable_28[] = {
+    instrux + 937,
+    instrux + 938,
+    NULL
+};
+
+static struct itemplate *itable_29[] = {
+    instrux + 939,
+    instrux + 940,
+    instrux + 941,
+    instrux + 942,
+    NULL
+};
+
+static struct itemplate *itable_2A[] = {
+    instrux + 943,
+    instrux + 944,
+    NULL
+};
+
+static struct itemplate *itable_2B[] = {
+    instrux + 945,
+    instrux + 946,
+    instrux + 947,
+    instrux + 948,
+    NULL
+};
+
+static struct itemplate *itable_2C[] = {
+    instrux + 951,
+    NULL
+};
+
+static struct itemplate *itable_2D[] = {
+    instrux + 952,
+    instrux + 953,
+    NULL
+};
+
+static struct itemplate *itable_2E[] = {
+    NULL
+};
+
+static struct itemplate *itable_2F[] = {
+    instrux + 184,
+    NULL
+};
+
+static struct itemplate *itable_30[] = {
+    instrux + 1035,
+    instrux + 1036,
+    NULL
+};
+
+static struct itemplate *itable_31[] = {
+    instrux + 1037,
+    instrux + 1038,
+    instrux + 1039,
+    instrux + 1040,
+    NULL
+};
+
+static struct itemplate *itable_32[] = {
+    instrux + 1041,
+    instrux + 1042,
+    NULL
+};
+
+static struct itemplate *itable_33[] = {
+    instrux + 1043,
+    instrux + 1044,
+    instrux + 1045,
+    instrux + 1046,
+    NULL
+};
+
+static struct itemplate *itable_34[] = {
+    instrux + 1049,
+    NULL
+};
+
+static struct itemplate *itable_35[] = {
+    instrux + 1050,
+    instrux + 1051,
+    NULL
+};
+
+static struct itemplate *itable_36[] = {
+    NULL
+};
+
+static struct itemplate *itable_37[] = {
+    instrux + 0,
+    NULL
+};
+
+static struct itemplate *itable_38[] = {
+    instrux + 141,
+    instrux + 142,
+    NULL
+};
+
+static struct itemplate *itable_39[] = {
+    instrux + 143,
+    instrux + 144,
+    instrux + 145,
+    instrux + 146,
+    NULL
+};
+
+static struct itemplate *itable_3A[] = {
+    instrux + 147,
+    instrux + 148,
+    NULL
+};
+
+static struct itemplate *itable_3B[] = {
+    instrux + 149,
+    instrux + 150,
+    instrux + 151,
+    instrux + 152,
+    NULL
+};
+
+static struct itemplate *itable_3C[] = {
+    instrux + 155,
+    NULL
+};
+
+static struct itemplate *itable_3D[] = {
+    instrux + 156,
+    instrux + 157,
+    NULL
+};
+
+static struct itemplate *itable_3E[] = {
+    NULL
+};
+
+static struct itemplate *itable_3F[] = {
+    instrux + 5,
+    NULL
+};
+
+static struct itemplate *itable_40[] = {
+    instrux + 411,
+    instrux + 412,
+    NULL
+};
+
+static struct itemplate *itable_41[] = {
+    instrux + 411,
+    instrux + 412,
+    NULL
+};
+
+static struct itemplate *itable_42[] = {
+    instrux + 411,
+    instrux + 412,
+    NULL
+};
+
+static struct itemplate *itable_43[] = {
+    instrux + 411,
+    instrux + 412,
+    NULL
+};
+
+static struct itemplate *itable_44[] = {
+    instrux + 411,
+    instrux + 412,
+    NULL
+};
+
+static struct itemplate *itable_45[] = {
+    instrux + 411,
+    instrux + 412,
+    NULL
+};
+
+static struct itemplate *itable_46[] = {
+    instrux + 411,
+    instrux + 412,
+    NULL
+};
+
+static struct itemplate *itable_47[] = {
+    instrux + 411,
+    instrux + 412,
+    NULL
+};
+
+static struct itemplate *itable_48[] = {
+    instrux + 185,
+    instrux + 186,
+    NULL
+};
+
+static struct itemplate *itable_49[] = {
+    instrux + 185,
+    instrux + 186,
+    NULL
+};
+
+static struct itemplate *itable_4A[] = {
+    instrux + 185,
+    instrux + 186,
+    NULL
+};
+
+static struct itemplate *itable_4B[] = {
+    instrux + 185,
+    instrux + 186,
+    NULL
+};
+
+static struct itemplate *itable_4C[] = {
+    instrux + 185,
+    instrux + 186,
+    NULL
+};
+
+static struct itemplate *itable_4D[] = {
+    instrux + 185,
+    instrux + 186,
+    NULL
+};
+
+static struct itemplate *itable_4E[] = {
+    instrux + 185,
+    instrux + 186,
+    NULL
+};
+
+static struct itemplate *itable_4F[] = {
+    instrux + 185,
+    instrux + 186,
+    NULL
+};
+
+static struct itemplate *itable_50[] = {
+    instrux + 774,
+    instrux + 775,
+    NULL
+};
+
+static struct itemplate *itable_51[] = {
+    instrux + 774,
+    instrux + 775,
+    NULL
+};
+
+static struct itemplate *itable_52[] = {
+    instrux + 774,
+    instrux + 775,
+    NULL
+};
+
+static struct itemplate *itable_53[] = {
+    instrux + 774,
+    instrux + 775,
+    NULL
+};
+
+static struct itemplate *itable_54[] = {
+    instrux + 774,
+    instrux + 775,
+    NULL
+};
+
+static struct itemplate *itable_55[] = {
+    instrux + 774,
+    instrux + 775,
+    NULL
+};
+
+static struct itemplate *itable_56[] = {
+    instrux + 774,
+    instrux + 775,
+    NULL
+};
+
+static struct itemplate *itable_57[] = {
+    instrux + 774,
+    instrux + 775,
+    NULL
+};
+
+static struct itemplate *itable_58[] = {
+    instrux + 706,
+    instrux + 707,
+    NULL
+};
+
+static struct itemplate *itable_59[] = {
+    instrux + 706,
+    instrux + 707,
+    NULL
+};
+
+static struct itemplate *itable_5A[] = {
+    instrux + 706,
+    instrux + 707,
+    NULL
+};
+
+static struct itemplate *itable_5B[] = {
+    instrux + 706,
+    instrux + 707,
+    NULL
+};
+
+static struct itemplate *itable_5C[] = {
+    instrux + 706,
+    instrux + 707,
+    NULL
+};
+
+static struct itemplate *itable_5D[] = {
+    instrux + 706,
+    instrux + 707,
+    NULL
+};
+
+static struct itemplate *itable_5E[] = {
+    instrux + 706,
+    instrux + 707,
+    NULL
+};
+
+static struct itemplate *itable_5F[] = {
+    instrux + 706,
+    instrux + 707,
+    NULL
+};
+
+static struct itemplate *itable_60[] = {
+    instrux + 785,
+    instrux + 786,
+    instrux + 787,
+    NULL
+};
+
+static struct itemplate *itable_61[] = {
+    instrux + 712,
+    instrux + 713,
+    instrux + 714,
+    NULL
+};
+
+static struct itemplate *itable_62[] = {
+    instrux + 77,
+    instrux + 78,
+    NULL
+};
+
+static struct itemplate *itable_63[] = {
+    instrux + 75,
+    instrux + 76,
+    NULL
+};
+
+static struct itemplate *itable_64[] = {
+    NULL
+};
+
+static struct itemplate *itable_65[] = {
+    NULL
+};
+
+static struct itemplate *itable_66[] = {
+    instrux + 1234,
+    instrux + 1236,
+    instrux + 1238,
+    instrux + 1242,
+    instrux + 1243,
+    instrux + 1244,
+    instrux + 1245,
+    instrux + 1246,
+    instrux + 1247,
+    instrux + 1248,
+    instrux + 1249,
+    instrux + 1256,
+    instrux + 1257,
+    instrux + 1260,
+    instrux + 1261,
+    instrux + 1262,
+    instrux + 1263,
+    instrux + 1264,
+    instrux + 1265,
+    instrux + 1266,
+    instrux + 1267,
+    instrux + 1268,
+    instrux + 1269,
+    instrux + 1270,
+    instrux + 1271,
+    instrux + 1274,
+    instrux + 1275,
+    instrux + 1276,
+    instrux + 1277,
+    instrux + 1278,
+    instrux + 1279,
+    instrux + 1280,
+    instrux + 1281,
+    instrux + 1282,
+    instrux + 1283,
+    instrux + 1284,
+    instrux + 1285,
+    instrux + 1286,
+    instrux + 1287,
+    instrux + 1288,
+    instrux + 1289,
+    instrux + 1290,
+    instrux + 1291,
+    instrux + 1292,
+    instrux + 1293,
+    instrux + 1294,
+    instrux + 1295,
+    instrux + 1296,
+    instrux + 1297,
+    instrux + 1298,
+    instrux + 1299,
+    instrux + 1300,
+    instrux + 1301,
+    instrux + 1302,
+    instrux + 1303,
+    instrux + 1304,
+    instrux + 1305,
+    instrux + 1306,
+    instrux + 1307,
+    instrux + 1308,
+    instrux + 1309,
+    instrux + 1310,
+    instrux + 1311,
+    instrux + 1312,
+    instrux + 1313,
+    instrux + 1314,
+    instrux + 1315,
+    instrux + 1316,
+    instrux + 1317,
+    instrux + 1318,
+    instrux + 1319,
+    instrux + 1320,
+    instrux + 1321,
+    instrux + 1322,
+    instrux + 1323,
+    instrux + 1326,
+    instrux + 1327,
+    instrux + 1328,
+    instrux + 1329,
+    instrux + 1330,
+    instrux + 1331,
+    instrux + 1332,
+    instrux + 1333,
+    instrux + 1338,
+    instrux + 1339,
+    instrux + 1340,
+    instrux + 1341,
+    instrux + 1342,
+    instrux + 1343,
+    instrux + 1344,
+    instrux + 1345,
+    instrux + 1346,
+    instrux + 1347,
+    instrux + 1348,
+    instrux + 1349,
+    instrux + 1350,
+    instrux + 1351,
+    instrux + 1352,
+    instrux + 1353,
+    instrux + 1354,
+    instrux + 1355,
+    instrux + 1356,
+    instrux + 1357,
+    instrux + 1358,
+    instrux + 1359,
+    instrux + 1360,
+    instrux + 1361,
+    instrux + 1362,
+    instrux + 1363,
+    instrux + 1364,
+    instrux + 1365,
+    instrux + 1366,
+    instrux + 1367,
+    instrux + 1368,
+    instrux + 1369,
+    instrux + 1372,
+    instrux + 1373,
+    instrux + 1374,
+    instrux + 1375,
+    instrux + 1376,
+    instrux + 1377,
+    instrux + 1378,
+    instrux + 1379,
+    instrux + 1380,
+    instrux + 1381,
+    instrux + 1382,
+    instrux + 1383,
+    instrux + 1384,
+    instrux + 1385,
+    instrux + 1386,
+    instrux + 1387,
+    instrux + 1388,
+    instrux + 1389,
+    instrux + 1390,
+    instrux + 1391,
+    instrux + 1392,
+    instrux + 1393,
+    instrux + 1394,
+    instrux + 1395,
+    instrux + 1396,
+    instrux + 1397,
+    instrux + 1398,
+    instrux + 1399,
+    instrux + 1400,
+    instrux + 1401,
+    instrux + 1404,
+    instrux + 1405,
+    instrux + 1406,
+    instrux + 1407,
+    instrux + 1408,
+    instrux + 1409,
+    instrux + 1412,
+    instrux + 1413,
+    instrux + 1416,
+    instrux + 1417,
+    instrux + 1420,
+    instrux + 1421,
+    instrux + 1424,
+    instrux + 1425,
+    instrux + 1428,
+    instrux + 1429,
+    instrux + 1432,
+    instrux + 1433,
+    instrux + 1436,
+    instrux + 1437,
+    instrux + 1440,
+    instrux + 1441,
+    instrux + 1444,
+    instrux + 1445,
+    instrux + 1452,
+    instrux + 1453,
+    instrux + 1454,
+    instrux + 1455,
+    instrux + 1456,
+    instrux + 1457,
+    instrux + 1458,
+    instrux + 1459,
+    instrux + 1470,
+    instrux + 1471,
+    instrux + 1472,
+    instrux + 1473,
+    instrux + 1478,
+    instrux + 1479,
+    instrux + 1482,
+    instrux + 1483,
+    instrux + 1486,
+    instrux + 1487,
+    instrux + 1490,
+    instrux + 1491,
+    instrux + 1492,
+    instrux + 1493,
+    instrux + 1494,
+    instrux + 1495,
+    instrux + 1496,
+    instrux + 1497,
+    instrux + 1498,
+    instrux + 1503,
+    instrux + 1504,
+    instrux + 1505,
+    instrux + 1506,
+    instrux + 1507,
+    instrux + 1508,
+    instrux + 1511,
+    instrux + 1512,
+    instrux + 1513,
+    instrux + 1514,
+    instrux + 1515,
+    instrux + 1516,
+    instrux + 1519,
+    instrux + 1520,
+    instrux + 1523,
+    instrux + 1524,
+    instrux + 1525,
+    instrux + 1526,
+    instrux + 1527,
+    instrux + 1528,
+    instrux + 1529,
+    instrux + 1530,
+    instrux + 1531,
+    instrux + 1532,
+    instrux + 1535,
+    instrux + 1536,
+    instrux + 1539,
+    instrux + 1540,
+    NULL
+};
+
+static struct itemplate *itable_67[] = {
+    NULL
+};
+
+static struct itemplate *itable_68[] = {
+    instrux + 782,
+    instrux + 783,
+    instrux + 784,
+    NULL
+};
+
+static struct itemplate *itable_69[] = {
+    instrux + 394,
+    instrux + 396,
+    instrux + 398,
+    instrux + 400,
+    instrux + 402,
+    instrux + 404,
+    NULL
+};
+
+static struct itemplate *itable_6A[] = {
+    instrux + 781,
+    NULL
+};
+
+static struct itemplate *itable_6B[] = {
+    instrux + 393,
+    instrux + 395,
+    instrux + 397,
+    instrux + 399,
+    instrux + 401,
+    instrux + 403,
+    NULL
+};
+
+static struct itemplate *itable_6C[] = {
+    instrux + 416,
+    NULL
+};
+
+static struct itemplate *itable_6D[] = {
+    instrux + 417,
+    instrux + 418,
+    NULL
+};
+
+static struct itemplate *itable_6E[] = {
+    instrux + 607,
+    NULL
+};
+
+static struct itemplate *itable_6F[] = {
+    instrux + 608,
+    instrux + 609,
+    NULL
+};
+
+static struct itemplate *itable_70[] = {
+    instrux + 1066,
+    NULL
+};
+
+static struct itemplate *itable_71[] = {
+    instrux + 1066,
+    NULL
+};
+
+static struct itemplate *itable_72[] = {
+    instrux + 1066,
+    NULL
+};
+
+static struct itemplate *itable_73[] = {
+    instrux + 1066,
+    NULL
+};
+
+static struct itemplate *itable_74[] = {
+    instrux + 1066,
+    NULL
+};
+
+static struct itemplate *itable_75[] = {
+    instrux + 1066,
+    NULL
+};
+
+static struct itemplate *itable_76[] = {
+    instrux + 1066,
+    NULL
+};
+
+static struct itemplate *itable_77[] = {
+    instrux + 1066,
+    NULL
+};
+
+static struct itemplate *itable_78[] = {
+    instrux + 1066,
+    NULL
+};
+
+static struct itemplate *itable_79[] = {
+    instrux + 1066,
+    NULL
+};
+
+static struct itemplate *itable_7A[] = {
+    instrux + 1066,
+    NULL
+};
+
+static struct itemplate *itable_7B[] = {
+    instrux + 1066,
+    NULL
+};
+
+static struct itemplate *itable_7C[] = {
+    instrux + 1066,
+    NULL
+};
+
+static struct itemplate *itable_7D[] = {
+    instrux + 1066,
+    NULL
+};
+
+static struct itemplate *itable_7E[] = {
+    instrux + 1066,
+    NULL
+};
+
+static struct itemplate *itable_7F[] = {
+    instrux + 1066,
+    NULL
+};
+
+static struct itemplate *itable_80[] = {
+    instrux + 23,
+    instrux + 26,
+    instrux + 46,
+    instrux + 49,
+    instrux + 69,
+    instrux + 72,
+    instrux + 158,
+    instrux + 161,
+    instrux + 595,
+    instrux + 598,
+    instrux + 872,
+    instrux + 875,
+    instrux + 954,
+    instrux + 957,
+    instrux + 1052,
+    instrux + 1055,
+    NULL
+};
+
+static struct itemplate *itable_81[] = {
+    instrux + 24,
+    instrux + 25,
+    instrux + 27,
+    instrux + 28,
+    instrux + 47,
+    instrux + 48,
+    instrux + 50,
+    instrux + 51,
+    instrux + 70,
+    instrux + 71,
+    instrux + 73,
+    instrux + 74,
+    instrux + 159,
+    instrux + 160,
+    instrux + 162,
+    instrux + 163,
+    instrux + 596,
+    instrux + 597,
+    instrux + 599,
+    instrux + 600,
+    instrux + 873,
+    instrux + 874,
+    instrux + 876,
+    instrux + 877,
+    instrux + 955,
+    instrux + 956,
+    instrux + 958,
+    instrux + 959,
+    instrux + 1053,
+    instrux + 1054,
+    instrux + 1056,
+    instrux + 1057,
+    NULL
+};
+
+static struct itemplate *itable_82[] = {
+    NULL
+};
+
+static struct itemplate *itable_83[] = {
+    instrux + 18,
+    instrux + 19,
+    instrux + 41,
+    instrux + 42,
+    instrux + 64,
+    instrux + 65,
+    instrux + 153,
+    instrux + 154,
+    instrux + 590,
+    instrux + 591,
+    instrux + 867,
+    instrux + 868,
+    instrux + 949,
+    instrux + 950,
+    instrux + 1047,
+    instrux + 1048,
+    NULL
+};
+
+static struct itemplate *itable_84[] = {
+    instrux + 967,
+    instrux + 968,
+    instrux + 973,
+    NULL
+};
+
+static struct itemplate *itable_85[] = {
+    instrux + 969,
+    instrux + 970,
+    instrux + 971,
+    instrux + 972,
+    instrux + 974,
+    instrux + 975,
+    NULL
+};
+
+static struct itemplate *itable_86[] = {
+    instrux + 1021,
+    instrux + 1022,
+    instrux + 1027,
+    instrux + 1028,
+    NULL
+};
+
+static struct itemplate *itable_87[] = {
+    instrux + 1023,
+    instrux + 1024,
+    instrux + 1025,
+    instrux + 1026,
+    instrux + 1029,
+    instrux + 1030,
+    instrux + 1031,
+    instrux + 1032,
+    NULL
+};
+
+static struct itemplate *itable_88[] = {
+    instrux + 527,
+    instrux + 528,
+    NULL
+};
+
+static struct itemplate *itable_89[] = {
+    instrux + 529,
+    instrux + 530,
+    instrux + 531,
+    instrux + 532,
+    NULL
+};
+
+static struct itemplate *itable_8A[] = {
+    instrux + 533,
+    instrux + 534,
+    NULL
+};
+
+static struct itemplate *itable_8B[] = {
+    instrux + 535,
+    instrux + 536,
+    instrux + 537,
+    instrux + 538,
+    NULL
+};
+
+static struct itemplate *itable_8C[] = {
+    instrux + 509,
+    instrux + 510,
+    instrux + 511,
+    NULL
+};
+
+static struct itemplate *itable_8D[] = {
+    instrux + 462,
+    instrux + 463,
+    NULL
+};
+
+static struct itemplate *itable_8E[] = {
+    instrux + 512,
+    instrux + 513,
+    instrux + 514,
+    NULL
+};
+
+static struct itemplate *itable_8F[] = {
+    instrux + 708,
+    instrux + 709,
+    NULL
+};
+
+static struct itemplate *itable_90[] = {
+    instrux + 574,
+    instrux + 1017,
+    instrux + 1018,
+    instrux + 1019,
+    instrux + 1020,
+    instrux + 1239,
+    NULL
+};
+
+static struct itemplate *itable_91[] = {
+    instrux + 1017,
+    instrux + 1018,
+    instrux + 1019,
+    instrux + 1020,
+    NULL
+};
+
+static struct itemplate *itable_92[] = {
+    instrux + 1017,
+    instrux + 1018,
+    instrux + 1019,
+    instrux + 1020,
+    NULL
+};
+
+static struct itemplate *itable_93[] = {
+    instrux + 1017,
+    instrux + 1018,
+    instrux + 1019,
+    instrux + 1020,
+    NULL
+};
+
+static struct itemplate *itable_94[] = {
+    instrux + 1017,
+    instrux + 1018,
+    instrux + 1019,
+    instrux + 1020,
+    NULL
+};
+
+static struct itemplate *itable_95[] = {
+    instrux + 1017,
+    instrux + 1018,
+    instrux + 1019,
+    instrux + 1020,
+    NULL
+};
+
+static struct itemplate *itable_96[] = {
+    instrux + 1017,
+    instrux + 1018,
+    instrux + 1019,
+    instrux + 1020,
+    NULL
+};
+
+static struct itemplate *itable_97[] = {
+    instrux + 1017,
+    instrux + 1018,
+    instrux + 1019,
+    instrux + 1020,
+    NULL
+};
+
+static struct itemplate *itable_98[] = {
+    instrux + 134,
+    instrux + 182,
+    NULL
+};
+
+static struct itemplate *itable_99[] = {
+    instrux + 135,
+    instrux + 181,
+    NULL
+};
+
+static struct itemplate *itable_9A[] = {
+    instrux + 118,
+    instrux + 119,
+    instrux + 120,
+    instrux + 121,
+    instrux + 122,
+    NULL
+};
+
+static struct itemplate *itable_9B[] = {
+    instrux + 212,
+    instrux + 244,
+    instrux + 262,
+    instrux + 281,
+    instrux + 331,
+    instrux + 340,
+    instrux + 341,
+    instrux + 346,
+    instrux + 347,
+    instrux + 1006,
+    instrux + 1007,
+    NULL
+};
+
+static struct itemplate *itable_9C[] = {
+    instrux + 788,
+    instrux + 789,
+    instrux + 790,
+    NULL
+};
+
+static struct itemplate *itable_9D[] = {
+    instrux + 715,
+    instrux + 716,
+    instrux + 717,
+    NULL
+};
+
+static struct itemplate *itable_9E[] = {
+    instrux + 844,
+    NULL
+};
+
+static struct itemplate *itable_9F[] = {
+    instrux + 455,
+    NULL
+};
+
+static struct itemplate *itable_A0[] = {
+    instrux + 515,
+    NULL
+};
+
+static struct itemplate *itable_A1[] = {
+    instrux + 516,
+    instrux + 517,
+    NULL
+};
+
+static struct itemplate *itable_A2[] = {
+    instrux + 518,
+    NULL
+};
+
+static struct itemplate *itable_A3[] = {
+    instrux + 519,
+    instrux + 520,
+    NULL
+};
+
+static struct itemplate *itable_A4[] = {
+    instrux + 556,
+    NULL
+};
+
+static struct itemplate *itable_A5[] = {
+    instrux + 557,
+    instrux + 558,
+    NULL
+};
+
+static struct itemplate *itable_A6[] = {
+    instrux + 164,
+    NULL
+};
+
+static struct itemplate *itable_A7[] = {
+    instrux + 165,
+    instrux + 166,
+    NULL
+};
+
+static struct itemplate *itable_A8[] = {
+    instrux + 976,
+    NULL
+};
+
+static struct itemplate *itable_A9[] = {
+    instrux + 977,
+    instrux + 978,
+    NULL
+};
+
+static struct itemplate *itable_AA[] = {
+    instrux + 930,
+    NULL
+};
+
+static struct itemplate *itable_AB[] = {
+    instrux + 931,
+    instrux + 932,
+    NULL
+};
+
+static struct itemplate *itable_AC[] = {
+    instrux + 481,
+    NULL
+};
+
+static struct itemplate *itable_AD[] = {
+    instrux + 482,
+    instrux + 483,
+    NULL
+};
+
+static struct itemplate *itable_AE[] = {
+    instrux + 878,
+    NULL
+};
+
+static struct itemplate *itable_AF[] = {
+    instrux + 879,
+    instrux + 880,
+    NULL
+};
+
+static struct itemplate *itable_B0[] = {
+    instrux + 539,
+    NULL
+};
+
+static struct itemplate *itable_B1[] = {
+    instrux + 539,
+    NULL
+};
+
+static struct itemplate *itable_B2[] = {
+    instrux + 539,
+    NULL
+};
+
+static struct itemplate *itable_B3[] = {
+    instrux + 539,
+    NULL
+};
+
+static struct itemplate *itable_B4[] = {
+    instrux + 539,
+    NULL
+};
+
+static struct itemplate *itable_B5[] = {
+    instrux + 539,
+    NULL
+};
+
+static struct itemplate *itable_B6[] = {
+    instrux + 539,
+    NULL
+};
+
+static struct itemplate *itable_B7[] = {
+    instrux + 539,
+    NULL
+};
+
+static struct itemplate *itable_B8[] = {
+    instrux + 540,
+    instrux + 541,
+    NULL
+};
+
+static struct itemplate *itable_B9[] = {
+    instrux + 540,
+    instrux + 541,
+    NULL
+};
+
+static struct itemplate *itable_BA[] = {
+    instrux + 540,
+    instrux + 541,
+    NULL
+};
+
+static struct itemplate *itable_BB[] = {
+    instrux + 540,
+    instrux + 541,
+    NULL
+};
+
+static struct itemplate *itable_BC[] = {
+    instrux + 540,
+    instrux + 541,
+    NULL
+};
+
+static struct itemplate *itable_BD[] = {
+    instrux + 540,
+    instrux + 541,
+    NULL
+};
+
+static struct itemplate *itable_BE[] = {
+    instrux + 540,
+    instrux + 541,
+    NULL
+};
+
+static struct itemplate *itable_BF[] = {
+    instrux + 540,
+    instrux + 541,
+    NULL
+};
+
+static struct itemplate *itable_C0[] = {
+    instrux + 795,
+    instrux + 804,
+    instrux + 824,
+    instrux + 833,
+    instrux + 848,
+    instrux + 884,
+    instrux + 901,
+    NULL
+};
+
+static struct itemplate *itable_C1[] = {
+    instrux + 798,
+    instrux + 801,
+    instrux + 807,
+    instrux + 810,
+    instrux + 827,
+    instrux + 830,
+    instrux + 836,
+    instrux + 839,
+    instrux + 851,
+    instrux + 854,
+    instrux + 887,
+    instrux + 890,
+    instrux + 904,
+    instrux + 907,
+    NULL
+};
+
+static struct itemplate *itable_C2[] = {
+    instrux + 817,
+    instrux + 821,
+    NULL
+};
+
+static struct itemplate *itable_C3[] = {
+    instrux + 816,
+    instrux + 820,
+    NULL
+};
+
+static struct itemplate *itable_C4[] = {
+    instrux + 465,
+    instrux + 466,
+    NULL
+};
+
+static struct itemplate *itable_C5[] = {
+    instrux + 460,
+    instrux + 461,
+    NULL
+};
+
+static struct itemplate *itable_C6[] = {
+    instrux + 542,
+    instrux + 545,
+    NULL
+};
+
+static struct itemplate *itable_C7[] = {
+    instrux + 543,
+    instrux + 544,
+    instrux + 546,
+    instrux + 547,
+    NULL
+};
+
+static struct itemplate *itable_C8[] = {
+    instrux + 194,
+    NULL
+};
+
+static struct itemplate *itable_C9[] = {
+    instrux + 464,
+    NULL
+};
+
+static struct itemplate *itable_CA[] = {
+    instrux + 819,
+    NULL
+};
+
+static struct itemplate *itable_CB[] = {
+    instrux + 818,
+    NULL
+};
+
+static struct itemplate *itable_CC[] = {
+    instrux + 421,
+    NULL
+};
+
+static struct itemplate *itable_CD[] = {
+    instrux + 419,
+    NULL
+};
+
+static struct itemplate *itable_CE[] = {
+    instrux + 422,
+    NULL
+};
+
+static struct itemplate *itable_CF[] = {
+    instrux + 425,
+    instrux + 426,
+    instrux + 427,
+    NULL
+};
+
+static struct itemplate *itable_D0[] = {
+    instrux + 793,
+    instrux + 802,
+    instrux + 822,
+    instrux + 831,
+    instrux + 846,
+    instrux + 882,
+    instrux + 899,
+    NULL
+};
+
+static struct itemplate *itable_D1[] = {
+    instrux + 796,
+    instrux + 799,
+    instrux + 805,
+    instrux + 808,
+    instrux + 825,
+    instrux + 828,
+    instrux + 834,
+    instrux + 837,
+    instrux + 849,
+    instrux + 852,
+    instrux + 885,
+    instrux + 888,
+    instrux + 902,
+    instrux + 905,
+    NULL
+};
+
+static struct itemplate *itable_D2[] = {
+    instrux + 794,
+    instrux + 803,
+    instrux + 823,
+    instrux + 832,
+    instrux + 847,
+    instrux + 883,
+    instrux + 900,
+    NULL
+};
+
+static struct itemplate *itable_D3[] = {
+    instrux + 797,
+    instrux + 800,
+    instrux + 806,
+    instrux + 809,
+    instrux + 826,
+    instrux + 829,
+    instrux + 835,
+    instrux + 838,
+    instrux + 850,
+    instrux + 853,
+    instrux + 886,
+    instrux + 889,
+    instrux + 903,
+    instrux + 906,
+    NULL
+};
+
+static struct itemplate *itable_D4[] = {
+    instrux + 3,
+    instrux + 4,
+    NULL
+};
+
+static struct itemplate *itable_D5[] = {
+    instrux + 1,
+    instrux + 2,
+    NULL
+};
+
+static struct itemplate *itable_D6[] = {
+    instrux + 845,
+    NULL
+};
+
+static struct itemplate *itable_D7[] = {
+    instrux + 1033,
+    instrux + 1034,
+    NULL
+};
+
+static struct itemplate *itable_D8[] = {
+    instrux + 199,
+    instrux + 202,
+    instrux + 204,
+    instrux + 229,
+    instrux + 231,
+    instrux + 232,
+    instrux + 237,
+    instrux + 239,
+    instrux + 240,
+    instrux + 245,
+    instrux + 249,
+    instrux + 250,
+    instrux + 253,
+    instrux + 257,
+    instrux + 258,
+    instrux + 307,
+    instrux + 311,
+    instrux + 312,
+    instrux + 348,
+    instrux + 352,
+    instrux + 353,
+    instrux + 356,
+    instrux + 360,
+    instrux + 361,
+    NULL
+};
+
+static struct itemplate *itable_D9[] = {
+    instrux + 197,
+    instrux + 198,
+    instrux + 211,
+    instrux + 242,
+    instrux + 243,
+    instrux + 280,
+    instrux + 294,
+    instrux + 297,
+    instrux + 298,
+    instrux + 299,
+    instrux + 300,
+    instrux + 301,
+    instrux + 302,
+    instrux + 303,
+    instrux + 304,
+    instrux + 305,
+    instrux + 306,
+    instrux + 319,
+    instrux + 321,
+    instrux + 322,
+    instrux + 325,
+    instrux + 326,
+    instrux + 327,
+    instrux + 328,
+    instrux + 329,
+    instrux + 332,
+    instrux + 334,
+    instrux + 335,
+    instrux + 336,
+    instrux + 337,
+    instrux + 342,
+    instrux + 364,
+    instrux + 374,
+    instrux + 375,
+    instrux + 376,
+    instrux + 377,
+    instrux + 378,
+    instrux + 379,
+    instrux + 380,
+    instrux + 381,
+    NULL
+};
+
+static struct itemplate *itable_DA[] = {
+    instrux + 213,
+    instrux + 214,
+    instrux + 215,
+    instrux + 216,
+    instrux + 217,
+    instrux + 218,
+    instrux + 227,
+    instrux + 228,
+    instrux + 265,
+    instrux + 267,
+    instrux + 269,
+    instrux + 271,
+    instrux + 273,
+    instrux + 278,
+    instrux + 290,
+    instrux + 292,
+    instrux + 373,
+    NULL
+};
+
+static struct itemplate *itable_DB[] = {
+    instrux + 219,
+    instrux + 220,
+    instrux + 221,
+    instrux + 222,
+    instrux + 223,
+    instrux + 224,
+    instrux + 225,
+    instrux + 226,
+    instrux + 233,
+    instrux + 234,
+    instrux + 275,
+    instrux + 282,
+    instrux + 284,
+    instrux + 288,
+    instrux + 296,
+    instrux + 315,
+    instrux + 316,
+    instrux + 317,
+    instrux + 318,
+    instrux + 333,
+    instrux + 344,
+    instrux + 367,
+    instrux + 368,
+    NULL
+};
+
+static struct itemplate *itable_DC[] = {
+    instrux + 200,
+    instrux + 201,
+    instrux + 203,
+    instrux + 230,
+    instrux + 238,
+    instrux + 246,
+    instrux + 247,
+    instrux + 248,
+    instrux + 254,
+    instrux + 255,
+    instrux + 256,
+    instrux + 308,
+    instrux + 309,
+    instrux + 310,
+    instrux + 349,
+    instrux + 350,
+    instrux + 351,
+    instrux + 357,
+    instrux + 358,
+    instrux + 359,
+    NULL
+};
+
+static struct itemplate *itable_DD[] = {
+    instrux + 263,
+    instrux + 287,
+    instrux + 295,
+    instrux + 320,
+    instrux + 323,
+    instrux + 330,
+    instrux + 338,
+    instrux + 339,
+    instrux + 343,
+    instrux + 345,
+    instrux + 365,
+    instrux + 366,
+    instrux + 371,
+    instrux + 372,
+    NULL
+};
+
+static struct itemplate *itable_DE[] = {
+    instrux + 205,
+    instrux + 206,
+    instrux + 241,
+    instrux + 251,
+    instrux + 252,
+    instrux + 259,
+    instrux + 260,
+    instrux + 266,
+    instrux + 268,
+    instrux + 270,
+    instrux + 272,
+    instrux + 274,
+    instrux + 279,
+    instrux + 291,
+    instrux + 293,
+    instrux + 313,
+    instrux + 314,
+    instrux + 354,
+    instrux + 355,
+    instrux + 362,
+    instrux + 363,
+    NULL
+};
+
+static struct itemplate *itable_DF[] = {
+    instrux + 207,
+    instrux + 208,
+    instrux + 209,
+    instrux + 210,
+    instrux + 235,
+    instrux + 236,
+    instrux + 264,
+    instrux + 276,
+    instrux + 277,
+    instrux + 283,
+    instrux + 285,
+    instrux + 286,
+    instrux + 289,
+    instrux + 324,
+    instrux + 369,
+    instrux + 370,
+    NULL
+};
+
+static struct itemplate *itable_E0[] = {
+    instrux + 490,
+    instrux + 491,
+    instrux + 492,
+    instrux + 493,
+    instrux + 494,
+    instrux + 495,
+    NULL
+};
+
+static struct itemplate *itable_E1[] = {
+    instrux + 487,
+    instrux + 488,
+    instrux + 489,
+    instrux + 496,
+    instrux + 497,
+    instrux + 498,
+    NULL
+};
+
+static struct itemplate *itable_E2[] = {
+    instrux + 484,
+    instrux + 485,
+    instrux + 486,
+    NULL
+};
+
+static struct itemplate *itable_E3[] = {
+    instrux + 428,
+    instrux + 429,
+    NULL
+};
+
+static struct itemplate *itable_E4[] = {
+    instrux + 405,
+    NULL
+};
+
+static struct itemplate *itable_E5[] = {
+    instrux + 406,
+    instrux + 407,
+    NULL
+};
+
+static struct itemplate *itable_E6[] = {
+    instrux + 601,
+    NULL
+};
+
+static struct itemplate *itable_E7[] = {
+    instrux + 602,
+    instrux + 603,
+    NULL
+};
+
+static struct itemplate *itable_E8[] = {
+    instrux + 112,
+    instrux + 113,
+    instrux + 114,
+    instrux + 115,
+    instrux + 116,
+    instrux + 117,
+    NULL
+};
+
+static struct itemplate *itable_E9[] = {
+    instrux + 431,
+    instrux + 432,
+    instrux + 433,
+    NULL
+};
+
+static struct itemplate *itable_EA[] = {
+    instrux + 434,
+    instrux + 435,
+    instrux + 436,
+    instrux + 437,
+    instrux + 438,
+    NULL
+};
+
+static struct itemplate *itable_EB[] = {
+    instrux + 430,
+    NULL
+};
+
+static struct itemplate *itable_EC[] = {
+    instrux + 408,
+    NULL
+};
+
+static struct itemplate *itable_ED[] = {
+    instrux + 409,
+    instrux + 410,
+    NULL
+};
+
+static struct itemplate *itable_EE[] = {
+    instrux + 604,
+    NULL
+};
+
+static struct itemplate *itable_EF[] = {
+    instrux + 605,
+    instrux + 606,
+    NULL
+};
+
+static struct itemplate *itable_F0[] = {
+    NULL
+};
+
+static struct itemplate *itable_F1[] = {
+    instrux + 420,
+    instrux + 921,
+    NULL
+};
+
+static struct itemplate *itable_F2[] = {
+    instrux + 1254,
+    instrux + 1336,
+    instrux + 1337,
+    instrux + 1402,
+    instrux + 1403,
+    instrux + 1410,
+    instrux + 1411,
+    instrux + 1414,
+    instrux + 1415,
+    instrux + 1418,
+    instrux + 1419,
+    instrux + 1422,
+    instrux + 1423,
+    instrux + 1426,
+    instrux + 1427,
+    instrux + 1430,
+    instrux + 1431,
+    instrux + 1434,
+    instrux + 1435,
+    instrux + 1438,
+    instrux + 1439,
+    instrux + 1442,
+    instrux + 1443,
+    instrux + 1450,
+    instrux + 1451,
+    instrux + 1462,
+    instrux + 1463,
+    instrux + 1464,
+    instrux + 1465,
+    instrux + 1466,
+    instrux + 1467,
+    instrux + 1476,
+    instrux + 1477,
+    instrux + 1480,
+    instrux + 1481,
+    instrux + 1484,
+    instrux + 1485,
+    instrux + 1488,
+    instrux + 1489,
+    instrux + 1499,
+    instrux + 1500,
+    instrux + 1501,
+    instrux + 1502,
+    instrux + 1509,
+    instrux + 1510,
+    instrux + 1517,
+    instrux + 1518,
+    instrux + 1521,
+    instrux + 1522,
+    instrux + 1533,
+    instrux + 1534,
+    instrux + 1537,
+    instrux + 1538,
+    instrux + 1541,
+    instrux + 1542,
+    instrux + 1543,
+    instrux + 1544,
+    instrux + 1545,
+    NULL
+};
+
+static struct itemplate *itable_F3[] = {
+    instrux + 1546,
+    instrux + 1547,
+    instrux + 1548,
+    instrux + 1549,
+    NULL
+};
+
+static struct itemplate *itable_F4[] = {
+    instrux + 382,
+    NULL
+};
+
+static struct itemplate *itable_F5[] = {
+    instrux + 140,
+    NULL
+};
+
+static struct itemplate *itable_F6[] = {
+    instrux + 190,
+    instrux + 383,
+    instrux + 386,
+    instrux + 567,
+    instrux + 571,
+    instrux + 575,
+    instrux + 979,
+    instrux + 982,
+    NULL
+};
+
+static struct itemplate *itable_F7[] = {
+    instrux + 191,
+    instrux + 192,
+    instrux + 384,
+    instrux + 385,
+    instrux + 387,
+    instrux + 388,
+    instrux + 568,
+    instrux + 569,
+    instrux + 572,
+    instrux + 573,
+    instrux + 576,
+    instrux + 577,
+    instrux + 980,
+    instrux + 981,
+    instrux + 983,
+    instrux + 984,
+    NULL
+};
+
+static struct itemplate *itable_F8[] = {
+    instrux + 136,
+    NULL
+};
+
+static struct itemplate *itable_F9[] = {
+    instrux + 927,
+    NULL
+};
+
+static struct itemplate *itable_FA[] = {
+    instrux + 138,
+    NULL
+};
+
+static struct itemplate *itable_FB[] = {
+    instrux + 929,
+    NULL
+};
+
+static struct itemplate *itable_FC[] = {
+    instrux + 137,
+    NULL
+};
+
+static struct itemplate *itable_FD[] = {
+    instrux + 928,
+    NULL
+};
+
+static struct itemplate *itable_FE[] = {
+    instrux + 187,
+    instrux + 413,
+    NULL
+};
+
+static struct itemplate *itable_FF[] = {
+    instrux + 123,
+    instrux + 124,
+    instrux + 125,
+    instrux + 126,
+    instrux + 127,
+    instrux + 128,
+    instrux + 129,
+    instrux + 130,
+    instrux + 131,
+    instrux + 132,
+    instrux + 133,
+    instrux + 188,
+    instrux + 189,
+    instrux + 414,
+    instrux + 415,
+    instrux + 439,
+    instrux + 440,
+    instrux + 441,
+    instrux + 442,
+    instrux + 443,
+    instrux + 444,
+    instrux + 445,
+    instrux + 446,
+    instrux + 447,
+    instrux + 448,
+    instrux + 449,
+    instrux + 776,
+    instrux + 777,
+    NULL
+};
+
+struct itemplate **itable[] = {
+    itable_00,
+    itable_01,
+    itable_02,
+    itable_03,
+    itable_04,
+    itable_05,
+    itable_06,
+    itable_07,
+    itable_08,
+    itable_09,
+    itable_0A,
+    itable_0B,
+    itable_0C,
+    itable_0D,
+    itable_0E,
+    itable_0F,
+    itable_10,
+    itable_11,
+    itable_12,
+    itable_13,
+    itable_14,
+    itable_15,
+    itable_16,
+    itable_17,
+    itable_18,
+    itable_19,
+    itable_1A,
+    itable_1B,
+    itable_1C,
+    itable_1D,
+    itable_1E,
+    itable_1F,
+    itable_20,
+    itable_21,
+    itable_22,
+    itable_23,
+    itable_24,
+    itable_25,
+    itable_26,
+    itable_27,
+    itable_28,
+    itable_29,
+    itable_2A,
+    itable_2B,
+    itable_2C,
+    itable_2D,
+    itable_2E,
+    itable_2F,
+    itable_30,
+    itable_31,
+    itable_32,
+    itable_33,
+    itable_34,
+    itable_35,
+    itable_36,
+    itable_37,
+    itable_38,
+    itable_39,
+    itable_3A,
+    itable_3B,
+    itable_3C,
+    itable_3D,
+    itable_3E,
+    itable_3F,
+    itable_40,
+    itable_41,
+    itable_42,
+    itable_43,
+    itable_44,
+    itable_45,
+    itable_46,
+    itable_47,
+    itable_48,
+    itable_49,
+    itable_4A,
+    itable_4B,
+    itable_4C,
+    itable_4D,
+    itable_4E,
+    itable_4F,
+    itable_50,
+    itable_51,
+    itable_52,
+    itable_53,
+    itable_54,
+    itable_55,
+    itable_56,
+    itable_57,
+    itable_58,
+    itable_59,
+    itable_5A,
+    itable_5B,
+    itable_5C,
+    itable_5D,
+    itable_5E,
+    itable_5F,
+    itable_60,
+    itable_61,
+    itable_62,
+    itable_63,
+    itable_64,
+    itable_65,
+    itable_66,
+    itable_67,
+    itable_68,
+    itable_69,
+    itable_6A,
+    itable_6B,
+    itable_6C,
+    itable_6D,
+    itable_6E,
+    itable_6F,
+    itable_70,
+    itable_71,
+    itable_72,
+    itable_73,
+    itable_74,
+    itable_75,
+    itable_76,
+    itable_77,
+    itable_78,
+    itable_79,
+    itable_7A,
+    itable_7B,
+    itable_7C,
+    itable_7D,
+    itable_7E,
+    itable_7F,
+    itable_80,
+    itable_81,
+    itable_82,
+    itable_83,
+    itable_84,
+    itable_85,
+    itable_86,
+    itable_87,
+    itable_88,
+    itable_89,
+    itable_8A,
+    itable_8B,
+    itable_8C,
+    itable_8D,
+    itable_8E,
+    itable_8F,
+    itable_90,
+    itable_91,
+    itable_92,
+    itable_93,
+    itable_94,
+    itable_95,
+    itable_96,
+    itable_97,
+    itable_98,
+    itable_99,
+    itable_9A,
+    itable_9B,
+    itable_9C,
+    itable_9D,
+    itable_9E,
+    itable_9F,
+    itable_A0,
+    itable_A1,
+    itable_A2,
+    itable_A3,
+    itable_A4,
+    itable_A5,
+    itable_A6,
+    itable_A7,
+    itable_A8,
+    itable_A9,
+    itable_AA,
+    itable_AB,
+    itable_AC,
+    itable_AD,
+    itable_AE,
+    itable_AF,
+    itable_B0,
+    itable_B1,
+    itable_B2,
+    itable_B3,
+    itable_B4,
+    itable_B5,
+    itable_B6,
+    itable_B7,
+    itable_B8,
+    itable_B9,
+    itable_BA,
+    itable_BB,
+    itable_BC,
+    itable_BD,
+    itable_BE,
+    itable_BF,
+    itable_C0,
+    itable_C1,
+    itable_C2,
+    itable_C3,
+    itable_C4,
+    itable_C5,
+    itable_C6,
+    itable_C7,
+    itable_C8,
+    itable_C9,
+    itable_CA,
+    itable_CB,
+    itable_CC,
+    itable_CD,
+    itable_CE,
+    itable_CF,
+    itable_D0,
+    itable_D1,
+    itable_D2,
+    itable_D3,
+    itable_D4,
+    itable_D5,
+    itable_D6,
+    itable_D7,
+    itable_D8,
+    itable_D9,
+    itable_DA,
+    itable_DB,
+    itable_DC,
+    itable_DD,
+    itable_DE,
+    itable_DF,
+    itable_E0,
+    itable_E1,
+    itable_E2,
+    itable_E3,
+    itable_E4,
+    itable_E5,
+    itable_E6,
+    itable_E7,
+    itable_E8,
+    itable_E9,
+    itable_EA,
+    itable_EB,
+    itable_EC,
+    itable_ED,
+    itable_EE,
+    itable_EF,
+    itable_F0,
+    itable_F1,
+    itable_F2,
+    itable_F3,
+    itable_F4,
+    itable_F5,
+    itable_F6,
+    itable_F7,
+    itable_F8,
+    itable_F9,
+    itable_FA,
+    itable_FB,
+    itable_FC,
+    itable_FD,
+    itable_FE,
+    itable_FF,
+};
diff --git a/uppsrc/plugin/ndisasm/lib/insnsi.h b/uppsrc/plugin/ndisasm/lib/insnsi.h
new file mode 100644
index 000000000..0fa1f24de
--- /dev/null
+++ b/uppsrc/plugin/ndisasm/lib/insnsi.h
@@ -0,0 +1,572 @@
+/* This file is auto-generated from insns.dat by insns.pl - don't edit it */
+
+/* This file in included by nasm.h */
+
+/* Instruction names */
+enum {
+	I_AAA,
+	I_AAD,
+	I_AAM,
+	I_AAS,
+	I_ADC,
+	I_ADD,
+	I_ADDPD,
+	I_ADDPS,
+	I_ADDSD,
+	I_ADDSS,
+	I_ADDSUBPD,
+	I_ADDSUBPS,
+	I_AND,
+	I_ANDNPD,
+	I_ANDNPS,
+	I_ANDPD,
+	I_ANDPS,
+	I_ARPL,
+	I_BOUND,
+	I_BSF,
+	I_BSR,
+	I_BSWAP,
+	I_BT,
+	I_BTC,
+	I_BTR,
+	I_BTS,
+	I_CALL,
+	I_CBW,
+	I_CDQ,
+	I_CLC,
+	I_CLD,
+	I_CLFLUSH,
+	I_CLI,
+	I_CLTS,
+	I_CMC,
+	I_CMP,
+	I_CMPEQPD,
+	I_CMPEQPS,
+	I_CMPEQSD,
+	I_CMPEQSS,
+	I_CMPLEPD,
+	I_CMPLEPS,
+	I_CMPLESD,
+	I_CMPLESS,
+	I_CMPLTPD,
+	I_CMPLTPS,
+	I_CMPLTSD,
+	I_CMPLTSS,
+	I_CMPNEQPD,
+	I_CMPNEQPS,
+	I_CMPNEQSD,
+	I_CMPNEQSS,
+	I_CMPNLEPD,
+	I_CMPNLEPS,
+	I_CMPNLESD,
+	I_CMPNLESS,
+	I_CMPNLTPD,
+	I_CMPNLTPS,
+	I_CMPNLTSD,
+	I_CMPNLTSS,
+	I_CMPORDPD,
+	I_CMPORDPS,
+	I_CMPORDSD,
+	I_CMPORDSS,
+	I_CMPPD,
+	I_CMPPS,
+	I_CMPSB,
+	I_CMPSD,
+	I_CMPSS,
+	I_CMPSW,
+	I_CMPUNORDPD,
+	I_CMPUNORDPS,
+	I_CMPUNORDSD,
+	I_CMPUNORDSS,
+	I_CMPXCHG,
+	I_CMPXCHG486,
+	I_CMPXCHG8B,
+	I_COMISD,
+	I_COMISS,
+	I_CPUID,
+	I_CVTDQ2PD,
+	I_CVTDQ2PS,
+	I_CVTPD2DQ,
+	I_CVTPD2PI,
+	I_CVTPD2PS,
+	I_CVTPI2PD,
+	I_CVTPI2PS,
+	I_CVTPS2DQ,
+	I_CVTPS2PD,
+	I_CVTPS2PI,
+	I_CVTSD2SI,
+	I_CVTSD2SS,
+	I_CVTSI2SD,
+	I_CVTSI2SS,
+	I_CVTSS2SD,
+	I_CVTSS2SI,
+	I_CVTTPD2DQ,
+	I_CVTTPD2PI,
+	I_CVTTPS2DQ,
+	I_CVTTPS2PI,
+	I_CVTTSD2SI,
+	I_CVTTSS2SI,
+	I_CWD,
+	I_CWDE,
+	I_DAA,
+	I_DAS,
+	I_DB,
+	I_DD,
+	I_DEC,
+	I_DIV,
+	I_DIVPD,
+	I_DIVPS,
+	I_DIVSD,
+	I_DIVSS,
+	I_DQ,
+	I_DT,
+	I_DW,
+	I_EMMS,
+	I_ENTER,
+	I_EQU,
+	I_F2XM1,
+	I_FABS,
+	I_FADD,
+	I_FADDP,
+	I_FBLD,
+	I_FBSTP,
+	I_FCHS,
+	I_FCLEX,
+	I_FCMOVB,
+	I_FCMOVBE,
+	I_FCMOVE,
+	I_FCMOVNB,
+	I_FCMOVNBE,
+	I_FCMOVNE,
+	I_FCMOVNU,
+	I_FCMOVU,
+	I_FCOM,
+	I_FCOMI,
+	I_FCOMIP,
+	I_FCOMP,
+	I_FCOMPP,
+	I_FCOS,
+	I_FDECSTP,
+	I_FDISI,
+	I_FDIV,
+	I_FDIVP,
+	I_FDIVR,
+	I_FDIVRP,
+	I_FEMMS,
+	I_FENI,
+	I_FFREE,
+	I_FFREEP,
+	I_FIADD,
+	I_FICOM,
+	I_FICOMP,
+	I_FIDIV,
+	I_FIDIVR,
+	I_FILD,
+	I_FIMUL,
+	I_FINCSTP,
+	I_FINIT,
+	I_FIST,
+	I_FISTP,
+	I_FISTTP,
+	I_FISUB,
+	I_FISUBR,
+	I_FLD,
+	I_FLD1,
+	I_FLDCW,
+	I_FLDENV,
+	I_FLDL2E,
+	I_FLDL2T,
+	I_FLDLG2,
+	I_FLDLN2,
+	I_FLDPI,
+	I_FLDZ,
+	I_FMUL,
+	I_FMULP,
+	I_FNCLEX,
+	I_FNDISI,
+	I_FNENI,
+	I_FNINIT,
+	I_FNOP,
+	I_FNSAVE,
+	I_FNSTCW,
+	I_FNSTENV,
+	I_FNSTSW,
+	I_FPATAN,
+	I_FPREM,
+	I_FPREM1,
+	I_FPTAN,
+	I_FRNDINT,
+	I_FRSTOR,
+	I_FSAVE,
+	I_FSCALE,
+	I_FSETPM,
+	I_FSIN,
+	I_FSINCOS,
+	I_FSQRT,
+	I_FST,
+	I_FSTCW,
+	I_FSTENV,
+	I_FSTP,
+	I_FSTSW,
+	I_FSUB,
+	I_FSUBP,
+	I_FSUBR,
+	I_FSUBRP,
+	I_FTST,
+	I_FUCOM,
+	I_FUCOMI,
+	I_FUCOMIP,
+	I_FUCOMP,
+	I_FUCOMPP,
+	I_FWAIT,
+	I_FXAM,
+	I_FXCH,
+	I_FXRSTOR,
+	I_FXSAVE,
+	I_FXTRACT,
+	I_FYL2X,
+	I_FYL2XP1,
+	I_HADDPD,
+	I_HADDPS,
+	I_HLT,
+	I_HSUBPD,
+	I_HSUBPS,
+	I_IBTS,
+	I_ICEBP,
+	I_IDIV,
+	I_IMUL,
+	I_IN,
+	I_INC,
+	I_INCBIN,
+	I_INSB,
+	I_INSD,
+	I_INSW,
+	I_INT,
+	I_INT01,
+	I_INT03,
+	I_INT1,
+	I_INT3,
+	I_INTO,
+	I_INVD,
+	I_INVLPG,
+	I_IRET,
+	I_IRETD,
+	I_IRETW,
+	I_JCXZ,
+	I_JECXZ,
+	I_JMP,
+	I_JMPE,
+	I_LAHF,
+	I_LAR,
+	I_LDDQU,
+	I_LDMXCSR,
+	I_LDS,
+	I_LEA,
+	I_LEAVE,
+	I_LES,
+	I_LFENCE,
+	I_LFS,
+	I_LGDT,
+	I_LGS,
+	I_LIDT,
+	I_LLDT,
+	I_LMSW,
+	I_LOADALL,
+	I_LOADALL286,
+	I_LODSB,
+	I_LODSD,
+	I_LODSW,
+	I_LOOP,
+	I_LOOPE,
+	I_LOOPNE,
+	I_LOOPNZ,
+	I_LOOPZ,
+	I_LSL,
+	I_LSS,
+	I_LTR,
+	I_MASKMOVDQU,
+	I_MASKMOVQ,
+	I_MAXPD,
+	I_MAXPS,
+	I_MAXSD,
+	I_MAXSS,
+	I_MFENCE,
+	I_MINPD,
+	I_MINPS,
+	I_MINSD,
+	I_MINSS,
+	I_MONITOR,
+	I_MOV,
+	I_MOVAPD,
+	I_MOVAPS,
+	I_MOVD,
+	I_MOVDDUP,
+	I_MOVDQ2Q,
+	I_MOVDQA,
+	I_MOVDQU,
+	I_MOVHLPS,
+	I_MOVHPD,
+	I_MOVHPS,
+	I_MOVLHPS,
+	I_MOVLPD,
+	I_MOVLPS,
+	I_MOVMSKPD,
+	I_MOVMSKPS,
+	I_MOVNTDQ,
+	I_MOVNTI,
+	I_MOVNTPD,
+	I_MOVNTPS,
+	I_MOVNTQ,
+	I_MOVQ,
+	I_MOVQ2DQ,
+	I_MOVSB,
+	I_MOVSD,
+	I_MOVSHDUP,
+	I_MOVSLDUP,
+	I_MOVSS,
+	I_MOVSW,
+	I_MOVSX,
+	I_MOVUPD,
+	I_MOVUPS,
+	I_MOVZX,
+	I_MUL,
+	I_MULPD,
+	I_MULPS,
+	I_MULSD,
+	I_MULSS,
+	I_MWAIT,
+	I_NEG,
+	I_NOP,
+	I_NOT,
+	I_OR,
+	I_ORPD,
+	I_ORPS,
+	I_OUT,
+	I_OUTSB,
+	I_OUTSD,
+	I_OUTSW,
+	I_PACKSSDW,
+	I_PACKSSWB,
+	I_PACKUSWB,
+	I_PADDB,
+	I_PADDD,
+	I_PADDQ,
+	I_PADDSB,
+	I_PADDSIW,
+	I_PADDSW,
+	I_PADDUSB,
+	I_PADDUSW,
+	I_PADDW,
+	I_PAND,
+	I_PANDN,
+	I_PAUSE,
+	I_PAVEB,
+	I_PAVGB,
+	I_PAVGUSB,
+	I_PAVGW,
+	I_PCMPEQB,
+	I_PCMPEQD,
+	I_PCMPEQW,
+	I_PCMPGTB,
+	I_PCMPGTD,
+	I_PCMPGTW,
+	I_PDISTIB,
+	I_PEXTRW,
+	I_PF2ID,
+	I_PF2IW,
+	I_PFACC,
+	I_PFADD,
+	I_PFCMPEQ,
+	I_PFCMPGE,
+	I_PFCMPGT,
+	I_PFMAX,
+	I_PFMIN,
+	I_PFMUL,
+	I_PFNACC,
+	I_PFPNACC,
+	I_PFRCP,
+	I_PFRCPIT1,
+	I_PFRCPIT2,
+	I_PFRSQIT1,
+	I_PFRSQRT,
+	I_PFSUB,
+	I_PFSUBR,
+	I_PI2FD,
+	I_PI2FW,
+	I_PINSRW,
+	I_PMACHRIW,
+	I_PMADDWD,
+	I_PMAGW,
+	I_PMAXSW,
+	I_PMAXUB,
+	I_PMINSW,
+	I_PMINUB,
+	I_PMOVMSKB,
+	I_PMULHRIW,
+	I_PMULHRWA,
+	I_PMULHRWC,
+	I_PMULHUW,
+	I_PMULHW,
+	I_PMULLW,
+	I_PMULUDQ,
+	I_PMVGEZB,
+	I_PMVLZB,
+	I_PMVNZB,
+	I_PMVZB,
+	I_POP,
+	I_POPA,
+	I_POPAD,
+	I_POPAW,
+	I_POPF,
+	I_POPFD,
+	I_POPFW,
+	I_POR,
+	I_PREFETCH,
+	I_PREFETCHNTA,
+	I_PREFETCHT0,
+	I_PREFETCHT1,
+	I_PREFETCHT2,
+	I_PREFETCHW,
+	I_PSADBW,
+	I_PSHUFD,
+	I_PSHUFHW,
+	I_PSHUFLW,
+	I_PSHUFW,
+	I_PSLLD,
+	I_PSLLDQ,
+	I_PSLLQ,
+	I_PSLLW,
+	I_PSRAD,
+	I_PSRAW,
+	I_PSRLD,
+	I_PSRLDQ,
+	I_PSRLQ,
+	I_PSRLW,
+	I_PSUBB,
+	I_PSUBD,
+	I_PSUBQ,
+	I_PSUBSB,
+	I_PSUBSIW,
+	I_PSUBSW,
+	I_PSUBUSB,
+	I_PSUBUSW,
+	I_PSUBW,
+	I_PSWAPD,
+	I_PUNPCKHBW,
+	I_PUNPCKHDQ,
+	I_PUNPCKHQDQ,
+	I_PUNPCKHWD,
+	I_PUNPCKLBW,
+	I_PUNPCKLDQ,
+	I_PUNPCKLQDQ,
+	I_PUNPCKLWD,
+	I_PUSH,
+	I_PUSHA,
+	I_PUSHAD,
+	I_PUSHAW,
+	I_PUSHF,
+	I_PUSHFD,
+	I_PUSHFW,
+	I_PXOR,
+	I_RCL,
+	I_RCPPS,
+	I_RCPSS,
+	I_RCR,
+	I_RDMSR,
+	I_RDPMC,
+	I_RDSHR,
+	I_RDTSC,
+	I_RESB,
+	I_RESD,
+	I_RESQ,
+	I_REST,
+	I_RESW,
+	I_RET,
+	I_RETF,
+	I_RETN,
+	I_ROL,
+	I_ROR,
+	I_RSDC,
+	I_RSLDT,
+	I_RSM,
+	I_RSQRTPS,
+	I_RSQRTSS,
+	I_RSTS,
+	I_SAHF,
+	I_SAL,
+	I_SALC,
+	I_SAR,
+	I_SBB,
+	I_SCASB,
+	I_SCASD,
+	I_SCASW,
+	I_SFENCE,
+	I_SGDT,
+	I_SHL,
+	I_SHLD,
+	I_SHR,
+	I_SHRD,
+	I_SHUFPD,
+	I_SHUFPS,
+	I_SIDT,
+	I_SLDT,
+	I_SMI,
+	I_SMINT,
+	I_SMINTOLD,
+	I_SMSW,
+	I_SQRTPD,
+	I_SQRTPS,
+	I_SQRTSD,
+	I_SQRTSS,
+	I_STC,
+	I_STD,
+	I_STI,
+	I_STMXCSR,
+	I_STOSB,
+	I_STOSD,
+	I_STOSW,
+	I_STR,
+	I_SUB,
+	I_SUBPD,
+	I_SUBPS,
+	I_SUBSD,
+	I_SUBSS,
+	I_SVDC,
+	I_SVLDT,
+	I_SVTS,
+	I_SYSCALL,
+	I_SYSENTER,
+	I_SYSEXIT,
+	I_SYSRET,
+	I_TEST,
+	I_UCOMISD,
+	I_UCOMISS,
+	I_UD0,
+	I_UD1,
+	I_UD2,
+	I_UMOV,
+	I_UNPCKHPD,
+	I_UNPCKHPS,
+	I_UNPCKLPD,
+	I_UNPCKLPS,
+	I_VERR,
+	I_VERW,
+	I_WAIT,
+	I_WBINVD,
+	I_WRMSR,
+	I_WRSHR,
+	I_XADD,
+	I_XBTS,
+	I_XCHG,
+	I_XLAT,
+	I_XLATB,
+	I_XOR,
+	I_XORPD,
+	I_XORPS,
+	I_XSTORE,
+	I_CMOVcc,
+	I_Jcc,
+	I_SETcc
+};
+
+#define MAX_INSLEN 11
diff --git a/uppsrc/plugin/ndisasm/lib/insnsn.c b/uppsrc/plugin/ndisasm/lib/insnsn.c
new file mode 100644
index 000000000..b7aa328fc
--- /dev/null
+++ b/uppsrc/plugin/ndisasm/lib/insnsn.c
@@ -0,0 +1,580 @@
+/* This file is auto-generated from insns.dat by insns.pl - don't edit it */
+
+/* This file in included by names.c */
+
+static const char *insn_names[] = {
+	"aaa",
+	"aad",
+	"aam",
+	"aas",
+	"adc",
+	"add",
+	"addpd",
+	"addps",
+	"addsd",
+	"addss",
+	"addsubpd",
+	"addsubps",
+	"and",
+	"andnpd",
+	"andnps",
+	"andpd",
+	"andps",
+	"arpl",
+	"bound",
+	"bsf",
+	"bsr",
+	"bswap",
+	"bt",
+	"btc",
+	"btr",
+	"bts",
+	"call",
+	"cbw",
+	"cdq",
+	"clc",
+	"cld",
+	"clflush",
+	"cli",
+	"clts",
+	"cmc",
+	"cmp",
+	"cmpeqpd",
+	"cmpeqps",
+	"cmpeqsd",
+	"cmpeqss",
+	"cmplepd",
+	"cmpleps",
+	"cmplesd",
+	"cmpless",
+	"cmpltpd",
+	"cmpltps",
+	"cmpltsd",
+	"cmpltss",
+	"cmpneqpd",
+	"cmpneqps",
+	"cmpneqsd",
+	"cmpneqss",
+	"cmpnlepd",
+	"cmpnleps",
+	"cmpnlesd",
+	"cmpnless",
+	"cmpnltpd",
+	"cmpnltps",
+	"cmpnltsd",
+	"cmpnltss",
+	"cmpordpd",
+	"cmpordps",
+	"cmpordsd",
+	"cmpordss",
+	"cmppd",
+	"cmpps",
+	"cmpsb",
+	"cmpsd",
+	"cmpss",
+	"cmpsw",
+	"cmpunordpd",
+	"cmpunordps",
+	"cmpunordsd",
+	"cmpunordss",
+	"cmpxchg",
+	"cmpxchg486",
+	"cmpxchg8b",
+	"comisd",
+	"comiss",
+	"cpuid",
+	"cvtdq2pd",
+	"cvtdq2ps",
+	"cvtpd2dq",
+	"cvtpd2pi",
+	"cvtpd2ps",
+	"cvtpi2pd",
+	"cvtpi2ps",
+	"cvtps2dq",
+	"cvtps2pd",
+	"cvtps2pi",
+	"cvtsd2si",
+	"cvtsd2ss",
+	"cvtsi2sd",
+	"cvtsi2ss",
+	"cvtss2sd",
+	"cvtss2si",
+	"cvttpd2dq",
+	"cvttpd2pi",
+	"cvttps2dq",
+	"cvttps2pi",
+	"cvttsd2si",
+	"cvttss2si",
+	"cwd",
+	"cwde",
+	"daa",
+	"das",
+	"db",
+	"dd",
+	"dec",
+	"div",
+	"divpd",
+	"divps",
+	"divsd",
+	"divss",
+	"dq",
+	"dt",
+	"dw",
+	"emms",
+	"enter",
+	"equ",
+	"f2xm1",
+	"fabs",
+	"fadd",
+	"faddp",
+	"fbld",
+	"fbstp",
+	"fchs",
+	"fclex",
+	"fcmovb",
+	"fcmovbe",
+	"fcmove",
+	"fcmovnb",
+	"fcmovnbe",
+	"fcmovne",
+	"fcmovnu",
+	"fcmovu",
+	"fcom",
+	"fcomi",
+	"fcomip",
+	"fcomp",
+	"fcompp",
+	"fcos",
+	"fdecstp",
+	"fdisi",
+	"fdiv",
+	"fdivp",
+	"fdivr",
+	"fdivrp",
+	"femms",
+	"feni",
+	"ffree",
+	"ffreep",
+	"fiadd",
+	"ficom",
+	"ficomp",
+	"fidiv",
+	"fidivr",
+	"fild",
+	"fimul",
+	"fincstp",
+	"finit",
+	"fist",
+	"fistp",
+	"fisttp",
+	"fisub",
+	"fisubr",
+	"fld",
+	"fld1",
+	"fldcw",
+	"fldenv",
+	"fldl2e",
+	"fldl2t",
+	"fldlg2",
+	"fldln2",
+	"fldpi",
+	"fldz",
+	"fmul",
+	"fmulp",
+	"fnclex",
+	"fndisi",
+	"fneni",
+	"fninit",
+	"fnop",
+	"fnsave",
+	"fnstcw",
+	"fnstenv",
+	"fnstsw",
+	"fpatan",
+	"fprem",
+	"fprem1",
+	"fptan",
+	"frndint",
+	"frstor",
+	"fsave",
+	"fscale",
+	"fsetpm",
+	"fsin",
+	"fsincos",
+	"fsqrt",
+	"fst",
+	"fstcw",
+	"fstenv",
+	"fstp",
+	"fstsw",
+	"fsub",
+	"fsubp",
+	"fsubr",
+	"fsubrp",
+	"ftst",
+	"fucom",
+	"fucomi",
+	"fucomip",
+	"fucomp",
+	"fucompp",
+	"fwait",
+	"fxam",
+	"fxch",
+	"fxrstor",
+	"fxsave",
+	"fxtract",
+	"fyl2x",
+	"fyl2xp1",
+	"haddpd",
+	"haddps",
+	"hlt",
+	"hsubpd",
+	"hsubps",
+	"ibts",
+	"icebp",
+	"idiv",
+	"imul",
+	"in",
+	"inc",
+	"incbin",
+	"insb",
+	"insd",
+	"insw",
+	"int",
+	"int01",
+	"int03",
+	"int1",
+	"int3",
+	"into",
+	"invd",
+	"invlpg",
+	"iret",
+	"iretd",
+	"iretw",
+	"jcxz",
+	"jecxz",
+	"jmp",
+	"jmpe",
+	"lahf",
+	"lar",
+	"lddqu",
+	"ldmxcsr",
+	"lds",
+	"lea",
+	"leave",
+	"les",
+	"lfence",
+	"lfs",
+	"lgdt",
+	"lgs",
+	"lidt",
+	"lldt",
+	"lmsw",
+	"loadall",
+	"loadall286",
+	"lodsb",
+	"lodsd",
+	"lodsw",
+	"loop",
+	"loope",
+	"loopne",
+	"loopnz",
+	"loopz",
+	"lsl",
+	"lss",
+	"ltr",
+	"maskmovdqu",
+	"maskmovq",
+	"maxpd",
+	"maxps",
+	"maxsd",
+	"maxss",
+	"mfence",
+	"minpd",
+	"minps",
+	"minsd",
+	"minss",
+	"monitor",
+	"mov",
+	"movapd",
+	"movaps",
+	"movd",
+	"movddup",
+	"movdq2q",
+	"movdqa",
+	"movdqu",
+	"movhlps",
+	"movhpd",
+	"movhps",
+	"movlhps",
+	"movlpd",
+	"movlps",
+	"movmskpd",
+	"movmskps",
+	"movntdq",
+	"movnti",
+	"movntpd",
+	"movntps",
+	"movntq",
+	"movq",
+	"movq2dq",
+	"movsb",
+	"movsd",
+	"movshdup",
+	"movsldup",
+	"movss",
+	"movsw",
+	"movsx",
+	"movupd",
+	"movups",
+	"movzx",
+	"mul",
+	"mulpd",
+	"mulps",
+	"mulsd",
+	"mulss",
+	"mwait",
+	"neg",
+	"nop",
+	"not",
+	"or",
+	"orpd",
+	"orps",
+	"out",
+	"outsb",
+	"outsd",
+	"outsw",
+	"packssdw",
+	"packsswb",
+	"packuswb",
+	"paddb",
+	"paddd",
+	"paddq",
+	"paddsb",
+	"paddsiw",
+	"paddsw",
+	"paddusb",
+	"paddusw",
+	"paddw",
+	"pand",
+	"pandn",
+	"pause",
+	"paveb",
+	"pavgb",
+	"pavgusb",
+	"pavgw",
+	"pcmpeqb",
+	"pcmpeqd",
+	"pcmpeqw",
+	"pcmpgtb",
+	"pcmpgtd",
+	"pcmpgtw",
+	"pdistib",
+	"pextrw",
+	"pf2id",
+	"pf2iw",
+	"pfacc",
+	"pfadd",
+	"pfcmpeq",
+	"pfcmpge",
+	"pfcmpgt",
+	"pfmax",
+	"pfmin",
+	"pfmul",
+	"pfnacc",
+	"pfpnacc",
+	"pfrcp",
+	"pfrcpit1",
+	"pfrcpit2",
+	"pfrsqit1",
+	"pfrsqrt",
+	"pfsub",
+	"pfsubr",
+	"pi2fd",
+	"pi2fw",
+	"pinsrw",
+	"pmachriw",
+	"pmaddwd",
+	"pmagw",
+	"pmaxsw",
+	"pmaxub",
+	"pminsw",
+	"pminub",
+	"pmovmskb",
+	"pmulhriw",
+	"pmulhrwa",
+	"pmulhrwc",
+	"pmulhuw",
+	"pmulhw",
+	"pmullw",
+	"pmuludq",
+	"pmvgezb",
+	"pmvlzb",
+	"pmvnzb",
+	"pmvzb",
+	"pop",
+	"popa",
+	"popad",
+	"popaw",
+	"popf",
+	"popfd",
+	"popfw",
+	"por",
+	"prefetch",
+	"prefetchnta",
+	"prefetcht0",
+	"prefetcht1",
+	"prefetcht2",
+	"prefetchw",
+	"psadbw",
+	"pshufd",
+	"pshufhw",
+	"pshuflw",
+	"pshufw",
+	"pslld",
+	"pslldq",
+	"psllq",
+	"psllw",
+	"psrad",
+	"psraw",
+	"psrld",
+	"psrldq",
+	"psrlq",
+	"psrlw",
+	"psubb",
+	"psubd",
+	"psubq",
+	"psubsb",
+	"psubsiw",
+	"psubsw",
+	"psubusb",
+	"psubusw",
+	"psubw",
+	"pswapd",
+	"punpckhbw",
+	"punpckhdq",
+	"punpckhqdq",
+	"punpckhwd",
+	"punpcklbw",
+	"punpckldq",
+	"punpcklqdq",
+	"punpcklwd",
+	"push",
+	"pusha",
+	"pushad",
+	"pushaw",
+	"pushf",
+	"pushfd",
+	"pushfw",
+	"pxor",
+	"rcl",
+	"rcpps",
+	"rcpss",
+	"rcr",
+	"rdmsr",
+	"rdpmc",
+	"rdshr",
+	"rdtsc",
+	"resb",
+	"resd",
+	"resq",
+	"rest",
+	"resw",
+	"ret",
+	"retf",
+	"retn",
+	"rol",
+	"ror",
+	"rsdc",
+	"rsldt",
+	"rsm",
+	"rsqrtps",
+	"rsqrtss",
+	"rsts",
+	"sahf",
+	"sal",
+	"salc",
+	"sar",
+	"sbb",
+	"scasb",
+	"scasd",
+	"scasw",
+	"sfence",
+	"sgdt",
+	"shl",
+	"shld",
+	"shr",
+	"shrd",
+	"shufpd",
+	"shufps",
+	"sidt",
+	"sldt",
+	"smi",
+	"smint",
+	"smintold",
+	"smsw",
+	"sqrtpd",
+	"sqrtps",
+	"sqrtsd",
+	"sqrtss",
+	"stc",
+	"std",
+	"sti",
+	"stmxcsr",
+	"stosb",
+	"stosd",
+	"stosw",
+	"str",
+	"sub",
+	"subpd",
+	"subps",
+	"subsd",
+	"subss",
+	"svdc",
+	"svldt",
+	"svts",
+	"syscall",
+	"sysenter",
+	"sysexit",
+	"sysret",
+	"test",
+	"ucomisd",
+	"ucomiss",
+	"ud0",
+	"ud1",
+	"ud2",
+	"umov",
+	"unpckhpd",
+	"unpckhps",
+	"unpcklpd",
+	"unpcklps",
+	"verr",
+	"verw",
+	"wait",
+	"wbinvd",
+	"wrmsr",
+	"wrshr",
+	"xadd",
+	"xbts",
+	"xchg",
+	"xlat",
+	"xlatb",
+	"xor",
+	"xorpd",
+	"xorps",
+	"xstore"
+};
+
+/* Conditional instructions */
+static const char *icn[] = {
+	"cmov",
+	"j",
+	"set"
+};
+
+/* and the corresponding opcodes */
+static int ico[] = {
+	I_CMOVcc,
+	I_Jcc,
+	I_SETcc
+};
diff --git a/uppsrc/plugin/ndisasm/lib/names.c b/uppsrc/plugin/ndisasm/lib/names.c
new file mode 100644
index 000000000..97767b084
--- /dev/null
+++ b/uppsrc/plugin/ndisasm/lib/names.c
@@ -0,0 +1,20 @@
+/* names.c   included source file defining instruction and register
+ *           names for the Netwide [Dis]Assembler
+ *
+ * The Netwide Assembler is copyright (C) 1996 Simon Tatham and
+ * Julian Hall. All rights reserved. The software is
+ * redistributable under the licence given in the file "Licence"
+ * distributed in the NASM archive.
+ */
+
+static const char *conditions[] = {	       /* condition code names */
+    "a", "ae", "b", "be", "c", "e", "g", "ge", "l", "le", "na", "nae",
+    "nb", "nbe", "nc", "ne", "ng", "nge", "nl", "nle", "no", "np",
+    "ns", "nz", "o", "p", "pe", "po", "s", "z"
+};
+
+/* Register names automatically generated from regs.dat */
+#include "regs.c"
+
+/* Instruction names automatically generated from insns.dat */
+#include "insnsn.c"
diff --git a/uppsrc/plugin/ndisasm/lib/nasm.h b/uppsrc/plugin/ndisasm/lib/nasm.h
new file mode 100644
index 000000000..8c42b6031
--- /dev/null
+++ b/uppsrc/plugin/ndisasm/lib/nasm.h
@@ -0,0 +1,852 @@
+/* nasm.h   main header file for the Netwide Assembler: inter-module interface
+ *
+ * The Netwide Assembler is copyright (C) 1996 Simon Tatham and
+ * Julian Hall. All rights reserved. The software is
+ * redistributable under the licence given in the file "Licence"
+ * distributed in the NASM archive.
+ *
+ * initial version: 27/iii/95 by Simon Tatham
+ */
+
+#ifndef NASM_NASM_H
+#define NASM_NASM_H
+
+#include <stdio.h>
+#include "version.h"		       /* generated NASM version macros */
+
+#ifndef NULL
+#define NULL 0
+#endif
+
+#ifndef FALSE
+#define FALSE 0			       /* comes in handy */
+#endif
+#ifndef TRUE
+#define TRUE 1
+#endif
+
+#define NO_SEG -1L		       /* null segment value */
+#define SEG_ABS 0x40000000L	       /* mask for far-absolute segments */
+
+#ifndef FILENAME_MAX
+#define FILENAME_MAX 256
+#endif
+
+#ifndef PREFIX_MAX
+#define PREFIX_MAX 10
+#endif
+
+#ifndef POSTFIX_MAX
+#define POSTFIX_MAX 10
+#endif
+
+#define IDLEN_MAX 4096
+
+/*
+ * Name pollution problems: <time.h> on Digital UNIX pulls in some
+ * strange hardware header file which sees fit to define R_SP. We
+ * undefine it here so as not to break the enum below.
+ */
+#ifdef R_SP
+#undef R_SP
+#endif
+
+/*
+ * We must declare the existence of this structure type up here,
+ * since we have to reference it before we define it...
+ */
+struct ofmt;
+
+/*
+ * -------------------------
+ * Error reporting functions
+ * -------------------------
+ */
+
+/*
+ * An error reporting function should look like this.
+ */
+typedef void (*efunc) (int severity, const char *fmt, ...);
+
+/*
+ * These are the error severity codes which get passed as the first
+ * argument to an efunc.
+ */
+
+#define ERR_DEBUG  	0x00000008	/* put out debugging message */
+#define ERR_WARNING	0x00000000	/* warn only: no further action */
+#define ERR_NONFATAL	0x00000001	/* terminate assembly after phase */
+#define ERR_FATAL	0x00000002	/* instantly fatal: exit with error */
+#define ERR_PANIC	0x00000003	/* internal error: panic instantly
+					* and dump core for reference */
+#define ERR_MASK	0x0000000F	/* mask off the above codes */
+#define ERR_NOFILE	0x00000010	/* don't give source file name/line */
+#define ERR_USAGE	0x00000020	/* print a usage message */
+#define ERR_PASS1	0x00000040	/* only print this error on pass one */
+
+/*
+ * These codes define specific types of suppressible warning.
+ */
+
+#define ERR_WARN_MASK	0x0000FF00	/* the mask for this feature */
+#define ERR_WARN_SHR  8		       /* how far to shift right */
+
+#define ERR_WARN_MNP	0x00000100	/* macro-num-parameters warning */
+#define ERR_WARN_MSR	0x00000200	/* macro self-reference */
+#define ERR_WARN_OL	0x00000300	/* orphan label (no colon, and
+					* alone on line) */
+#define ERR_WARN_NOV	0x00000400	/* numeric overflow */
+#define ERR_WARN_GNUELF	0x00000500      /* using GNU ELF extensions */
+#define ERR_WARN_MAX	5		/* the highest numbered one */
+
+/*
+ * -----------------------
+ * Other function typedefs
+ * -----------------------
+ */
+
+/*
+ * A label-lookup function should look like this.
+ */
+typedef int (*lfunc) (char *label, long *segment, long *offset);
+
+/*
+ * And a label-definition function like this. The boolean parameter
+ * `is_norm' states whether the label is a `normal' label (which
+ * should affect the local-label system), or something odder like
+ * an EQU or a segment-base symbol, which shouldn't.
+ */
+typedef void (*ldfunc) (char *label, long segment, long offset, char *special,
+			int is_norm, int isextrn, struct ofmt *ofmt,
+			efunc error);
+
+/*
+ * List-file generators should look like this:
+ */
+typedef struct {
+    /*
+     * Called to initialise the listing file generator. Before this
+     * is called, the other routines will silently do nothing when
+     * called. The `char *' parameter is the file name to write the
+     * listing to.
+     */
+    void (*init) (char *, efunc);
+
+    /*
+     * Called to clear stuff up and close the listing file.
+     */
+    void (*cleanup) (void);
+
+    /*
+     * Called to output binary data. Parameters are: the offset;
+     * the data; the data type. Data types are similar to the
+     * output-format interface, only OUT_ADDRESS will _always_ be
+     * displayed as if it's relocatable, so ensure that any non-
+     * relocatable address has been converted to OUT_RAWDATA by
+     * then. Note that OUT_RAWDATA+0 is a valid data type, and is a
+     * dummy call used to give the listing generator an offset to
+     * work with when doing things like uplevel(LIST_TIMES) or
+     * uplevel(LIST_INCBIN).
+     */
+    void (*output) (long, const void *, unsigned long);
+
+    /*
+     * Called to send a text line to the listing generator. The
+     * `int' parameter is LIST_READ or LIST_MACRO depending on
+     * whether the line came directly from an input file or is the
+     * result of a multi-line macro expansion.
+     */
+    void (*line) (int, char *);
+
+    /*
+     * Called to change one of the various levelled mechanisms in
+     * the listing generator. LIST_INCLUDE and LIST_MACRO can be
+     * used to increase the nesting level of include files and
+     * macro expansions; LIST_TIMES and LIST_INCBIN switch on the
+     * two binary-output-suppression mechanisms for large-scale
+     * pseudo-instructions.
+     *
+     * LIST_MACRO_NOLIST is synonymous with LIST_MACRO except that
+     * it indicates the beginning of the expansion of a `nolist'
+     * macro, so anything under that level won't be expanded unless
+     * it includes another file.
+     */
+    void (*uplevel) (int);
+
+    /*
+     * Reverse the effects of uplevel.
+     */
+    void (*downlevel) (int);
+} ListGen;
+
+/*
+ * The expression evaluator must be passed a scanner function; a
+ * standard scanner is provided as part of nasmlib.c. The
+ * preprocessor will use a different one. Scanners, and the
+ * token-value structures they return, look like this.
+ *
+ * The return value from the scanner is always a copy of the
+ * `t_type' field in the structure.
+ */
+struct tokenval {
+    int t_type;
+    long t_integer, t_inttwo;
+    char *t_charptr;
+};
+typedef int (*scanner) (void *private_data, struct tokenval *tv);
+
+/*
+ * Token types returned by the scanner, in addition to ordinary
+ * ASCII character values, and zero for end-of-string.
+ */
+enum {				       /* token types, other than chars */
+    TOKEN_INVALID = -1,		       /* a placeholder value */
+    TOKEN_EOS = 0,		       /* end of string */
+    TOKEN_EQ = '=', TOKEN_GT = '>', TOKEN_LT = '<',   /* aliases */
+    TOKEN_ID = 256, TOKEN_NUM, TOKEN_REG, TOKEN_INSN,  /* major token types */
+    TOKEN_ERRNUM,		       /* numeric constant with error in */
+    TOKEN_HERE, TOKEN_BASE,	       /* $ and $$ */
+    TOKEN_SPECIAL,		       /* BYTE, WORD, DWORD, FAR, NEAR, etc */
+    TOKEN_PREFIX,		       /* A32, O16, LOCK, REPNZ, TIMES, etc */
+    TOKEN_SHL, TOKEN_SHR,	       /* << and >> */
+    TOKEN_SDIV, TOKEN_SMOD,	       /* // and %% */
+    TOKEN_GE, TOKEN_LE, TOKEN_NE,      /* >=, <= and <> (!= is same as <>) */
+    TOKEN_DBL_AND, TOKEN_DBL_OR, TOKEN_DBL_XOR,   /* &&, || and ^^ */
+    TOKEN_SEG, TOKEN_WRT,	       /* SEG and WRT */
+    TOKEN_FLOAT			       /* floating-point constant */
+};
+
+typedef struct {
+    long segment;
+    long offset;
+    int  known;
+} loc_t;
+
+/*
+ * Expression-evaluator datatype. Expressions, within the
+ * evaluator, are stored as an array of these beasts, terminated by
+ * a record with type==0. Mostly, it's a vector type: each type
+ * denotes some kind of a component, and the value denotes the
+ * multiple of that component present in the expression. The
+ * exception is the WRT type, whose `value' field denotes the
+ * segment to which the expression is relative. These segments will
+ * be segment-base types, i.e. either odd segment values or SEG_ABS
+ * types. So it is still valid to assume that anything with a
+ * `value' field of zero is insignificant.
+ */
+typedef struct {
+    long type;			       /* a register, or EXPR_xxx */
+    long value;			       /* must be >= 32 bits */
+} expr;
+
+/*
+ * The evaluator can also return hints about which of two registers
+ * used in an expression should be the base register. See also the
+ * `operand' structure.
+ */
+struct eval_hints {
+    int base;
+    int type;
+};
+
+/*
+ * The actual expression evaluator function looks like this. When
+ * called, it expects the first token of its expression to already
+ * be in `*tv'; if it is not, set tv->t_type to TOKEN_INVALID and
+ * it will start by calling the scanner.
+ *
+ * If a forward reference happens during evaluation, the evaluator
+ * must set `*fwref' to TRUE if `fwref' is non-NULL.
+ *
+ * `critical' is non-zero if the expression may not contain forward
+ * references. The evaluator will report its own error if this
+ * occurs; if `critical' is 1, the error will be "symbol not
+ * defined before use", whereas if `critical' is 2, the error will
+ * be "symbol undefined".
+ *
+ * If `critical' has bit 8 set (in addition to its main value: 0x101
+ * and 0x102 correspond to 1 and 2) then an extended expression
+ * syntax is recognised, in which relational operators such as =, <
+ * and >= are accepted, as well as low-precedence logical operators
+ * &&, ^^ and ||.
+ *
+ * If `hints' is non-NULL, it gets filled in with some hints as to
+ * the base register in complex effective addresses.
+ */
+#define CRITICAL 0x100
+typedef expr *(*evalfunc) (scanner sc, void *scprivate, struct tokenval *tv,
+			   int *fwref, int critical, efunc error,
+			   struct eval_hints *hints);
+
+/*
+ * Special values for expr->type. ASSUMPTION MADE HERE: the number
+ * of distinct register names (i.e. possible "type" fields for an
+ * expr structure) does not exceed 124 (EXPR_REG_START through
+ * EXPR_REG_END).
+ */
+#define EXPR_REG_START 1
+#define EXPR_REG_END 124
+#define EXPR_UNKNOWN 125L	       /* for forward references */
+#define EXPR_SIMPLE 126L
+#define EXPR_WRT 127L
+#define EXPR_SEGBASE 128L
+
+/*
+ * Preprocessors ought to look like this:
+ */
+typedef struct {
+    /*
+     * Called at the start of a pass; given a file name, the number
+     * of the pass, an error reporting function, an evaluator
+     * function, and a listing generator to talk to.
+     */
+    void (*reset) (char *, int, efunc, evalfunc, ListGen *);
+
+    /*
+     * Called to fetch a line of preprocessed source. The line
+     * returned has been malloc'ed, and so should be freed after
+     * use.
+     */
+    char *(*getline) (void);
+
+    /*
+     * Called at the end of a pass.
+     */
+    void (*cleanup) (int);
+} Preproc;
+
+/*
+ * ----------------------------------------------------------------
+ * Some lexical properties of the NASM source language, included
+ * here because they are shared between the parser and preprocessor
+ * ----------------------------------------------------------------
+ */
+
+/*
+ * isidstart matches any character that may start an identifier, and isidchar
+ * matches any character that may appear at places other than the start of an
+ * identifier. E.g. a period may only appear at the start of an identifier
+ * (for local labels), whereas a number may appear anywhere *but* at the
+ * start.
+ */
+
+#define isidstart(c) ( isalpha(c) || (c)=='_' || (c)=='.' || (c)=='?' \
+                                  || (c)=='@' )
+#define isidchar(c)  ( isidstart(c) || isdigit(c) || (c)=='$' || (c)=='#' \
+                                                  || (c)=='~' )
+
+/* Ditto for numeric constants. */
+
+#define isnumstart(c)  ( isdigit(c) || (c)=='$' )
+#define isnumchar(c)   ( isalnum(c) )
+
+/* This returns the numeric value of a given 'digit'. */
+
+#define numvalue(c)  ((c)>='a' ? (c)-'a'+10 : (c)>='A' ? (c)-'A'+10 : (c)-'0')
+
+/*
+ * Data-type flags that get passed to listing-file routines.
+ */
+enum {
+    LIST_READ, LIST_MACRO, LIST_MACRO_NOLIST, LIST_INCLUDE,
+    LIST_INCBIN, LIST_TIMES
+};
+
+/*
+ * -----------------------------------------------------------
+ * Format of the `insn' structure returned from `parser.c' and
+ * passed into `assemble.c'
+ * -----------------------------------------------------------
+ */
+
+/*
+ * Here we define the operand types. These are implemented as bit
+ * masks, since some are subsets of others; e.g. AX in a MOV
+ * instruction is a special operand type, whereas AX in other
+ * contexts is just another 16-bit register. (Also, consider CL in
+ * shift instructions, DX in OUT, etc.)
+ */
+
+/* size, and other attributes, of the operand */
+#define BITS8     0x00000001L
+#define BITS16    0x00000002L
+#define BITS32    0x00000004L
+#define BITS64    0x00000008L	       /* FPU only */
+#define BITS80    0x00000010L	       /* FPU only */
+#define FAR       0x00000020L	       /* grotty: this means 16:16 or */
+				       /* 16:32, like in CALL/JMP */
+#define NEAR      0x00000040L
+#define SHORT     0x00000080L	       /* and this means what it says :) */
+
+#define SIZE_MASK 0x000000FFL	       /* all the size attributes */
+#define NON_SIZE  (~SIZE_MASK)
+
+#define TO        0x00000100L          /* reverse effect in FADD, FSUB &c */
+#define COLON     0x00000200L	       /* operand is followed by a colon */
+#define STRICT    0x00000400L	       /* do not optimize this operand */
+
+/* type of operand: memory reference, register, etc. */
+#define MEMORY    0x00204000L
+#define REGISTER  0x00001000L	       /* register number in 'basereg' */
+#define IMMEDIATE 0x00002000L
+
+#define REGMEM    0x00200000L	       /* for r/m, ie EA, operands */
+#define REGNORM   0x00201000L	       /* 'normal' reg, qualifies as EA */
+#define REG8      0x00201001L
+#define REG16     0x00201002L
+#define REG32     0x00201004L
+#define MMXREG    0x00201008L	       /* MMX registers */
+#define XMMREG    0x00201010L          /* XMM Katmai reg */
+#define FPUREG    0x01000000L	       /* floating point stack registers */
+#define FPU0      0x01000800L	       /* FPU stack register zero */
+
+/* special register operands: these may be treated differently */
+#define REG_SMASK 0x00070000L	       /* a mask for the following */
+#define REG_ACCUM 0x00211000L	       /* accumulator: AL, AX or EAX */
+#define REG_AL    0x00211001L	       /* REG_ACCUM | BITSxx */
+#define REG_AX    0x00211002L	       /* ditto */
+#define REG_EAX   0x00211004L	       /* and again */
+#define REG_COUNT 0x00221000L	       /* counter: CL, CX or ECX */
+#define REG_CL    0x00221001L	       /* REG_COUNT | BITSxx */
+#define REG_CX    0x00221002L	       /* ditto */
+#define REG_ECX   0x00221004L	       /* another one */
+#define REG_DL    0x00241001L
+#define REG_DX    0x00241002L
+#define REG_EDX   0x00241004L
+#define REG_SREG  0x00081002L	       /* any segment register */
+#define REG_CS    0x01081002L	       /* CS */
+#define REG_DESS  0x02081002L	       /* DS, ES, SS (non-CS 86 registers) */
+#define REG_FSGS  0x04081002L	       /* FS, GS (386 extended registers) */
+#define REG_SEG67 0x08081002L          /* Non-implemented segment registers */
+#define REG_CDT   0x00101004L	       /* CRn, DRn and TRn */
+#define REG_CREG  0x08101004L	       /* CRn */
+#define REG_DREG  0x10101004L	       /* DRn */
+#define REG_TREG  0x20101004L	       /* TRn */
+
+/* special type of EA */
+#define MEM_OFFS  0x00604000L	       /* simple [address] offset */
+
+/* special type of immediate operand */
+#define ONENESS   0x00800000L          /* so UNITY == IMMEDIATE | ONENESS */
+#define UNITY     0x00802000L	       /* for shift/rotate instructions */
+#define BYTENESS  0x40000000L          /* so SBYTE == IMMEDIATE | BYTENESS */
+#define SBYTE 	  0x40002000L	       /* for op r16/32,immediate instrs. */
+
+/* Register names automatically generated from regs.dat */
+#include "regs.h"
+
+enum {				       /* condition code names */
+    C_A, C_AE, C_B, C_BE, C_C, C_E, C_G, C_GE, C_L, C_LE, C_NA, C_NAE,
+    C_NB, C_NBE, C_NC, C_NE, C_NG, C_NGE, C_NL, C_NLE, C_NO, C_NP,
+    C_NS, C_NZ, C_O, C_P, C_PE, C_PO, C_S, C_Z
+};
+
+/*
+ * Note that because segment registers may be used as instruction
+ * prefixes, we must ensure the enumerations for prefixes and
+ * register names do not overlap.
+ */
+enum {				       /* instruction prefixes */
+    PREFIX_ENUM_START = REG_ENUM_LIMIT,
+    P_A16 = PREFIX_ENUM_START, P_A32, P_LOCK, P_O16, P_O32, P_REP, P_REPE,
+    P_REPNE, P_REPNZ, P_REPZ, P_TIMES
+};
+
+enum {				       /* extended operand types */
+    EOT_NOTHING, EOT_DB_STRING, EOT_DB_NUMBER
+};
+
+enum {				       /* special EA flags */
+    EAF_BYTEOFFS = 1,		       /* force offset part to byte size */
+    EAF_WORDOFFS = 2,		       /* force offset part to [d]word size */
+    EAF_TIMESTWO = 4		       /* really do EAX*2 not EAX+EAX */
+};
+
+enum {				       /* values for `hinttype' */
+    EAH_NOHINT = 0,		       /* no hint at all - our discretion */
+    EAH_MAKEBASE = 1,		       /* try to make given reg the base */
+    EAH_NOTBASE = 2		       /* try _not_ to make reg the base */
+};
+
+typedef struct {		       /* operand to an instruction */
+    long type;			       /* type of operand */
+    int addr_size;		       /* 0 means default; 16; 32 */
+    int basereg, indexreg, scale;      /* registers and scale involved */
+    int hintbase, hinttype;	       /* hint as to real base register */
+    long segment;		       /* immediate segment, if needed */
+    long offset;		       /* any immediate number */
+    long wrt;			       /* segment base it's relative to */
+    int eaflags;		       /* special EA flags */
+    int opflags;		       /* see OPFLAG_* defines below */
+} operand;
+
+#define OPFLAG_FORWARD		1      /* operand is a forward reference */
+#define OPFLAG_EXTERN		2      /* operand is an external reference */
+
+typedef struct extop {		       /* extended operand */
+    struct extop *next;		       /* linked list */
+    long type;			       /* defined above */
+    char *stringval;		       /* if it's a string, then here it is */
+    int stringlen;		       /* ... and here's how long it is */
+    long segment;		       /* if it's a number/address, then... */
+    long offset;		       /* ... it's given here ... */
+    long wrt;			       /* ... and here */
+} extop;
+
+#define MAXPREFIX 4
+
+typedef struct {		       /* an instruction itself */
+    char *label;		       /* the label defined, or NULL */
+    int prefixes[MAXPREFIX];	       /* instruction prefixes, if any */
+    int nprefix;		       /* number of entries in above */
+    int opcode;			       /* the opcode - not just the string */
+    int condition;		       /* the condition code, if Jcc/SETcc */
+    int operands;		       /* how many operands? 0-3
+                                        * (more if db et al) */
+    operand oprs[3];	   	       /* the operands, defined as above */
+    extop *eops;		       /* extended operands */
+    int eops_float;                    /* true if DD and floating */
+    long times;			       /* repeat count (TIMES prefix) */
+    int forw_ref;		       /* is there a forward reference? */
+} insn;
+
+enum geninfo { GI_SWITCH };
+/*
+ * ------------------------------------------------------------
+ * The data structure defining an output format driver, and the
+ * interfaces to the functions therein.
+ * ------------------------------------------------------------
+ */
+
+struct ofmt {
+    /*
+     * This is a short (one-liner) description of the type of
+     * output generated by the driver.
+     */
+    const char *fullname;
+
+    /*
+     * This is a single keyword used to select the driver.
+     */
+    const char *shortname;
+
+    /*
+     * this is reserved for out module specific help.
+     * It is set to NULL in all the out modules but is not implemented
+     * in the main program
+     */
+    const char *helpstring;
+
+    /*
+     * this is a pointer to the first element of the debug information
+     */
+    struct dfmt **debug_formats;
+
+    /*
+     * and a pointer to the element that is being used
+     * note: this is set to the default at compile time and changed if the
+     * -F option is selected.  If developing a set of new debug formats for
+     * an output format, be sure to set this to whatever default you want
+     *
+     */
+    struct dfmt *current_dfmt;
+
+    /*
+     * This, if non-NULL, is a NULL-terminated list of `char *'s
+     * pointing to extra standard macros supplied by the object
+     * format (e.g. a sensible initial default value of __SECT__,
+     * and user-level equivalents for any format-specific
+     * directives).
+     */
+    const char **stdmac;
+
+    /*
+     * This procedure is called at the start of an output session.
+     * It tells the output format what file it will be writing to,
+     * what routine to report errors through, and how to interface
+     * to the label manager and expression evaluator if necessary.
+     * It also gives it a chance to do other initialisation.
+     */
+    void (*init) (FILE *fp, efunc error, ldfunc ldef, evalfunc eval);
+
+    /*
+     * This procedure is called to pass generic information to the
+     * object file.  The first parameter gives the information type
+     * (currently only command line switches)
+     * and the second parameter gives the value.  This function returns
+     * 1 if recognized, 0 if unrecognized
+     */
+    int (*setinfo)(enum geninfo type, char **string);
+
+    /*
+     * This procedure is called by assemble() to write actual
+     * generated code or data to the object file. Typically it
+     * doesn't have to actually _write_ it, just store it for
+     * later.
+     *
+     * The `type' argument specifies the type of output data, and
+     * usually the size as well: its contents are described below.
+     */
+    void (*output) (long segto, const void *data, unsigned long type,
+		    long segment, long wrt);
+
+    /*
+     * This procedure is called once for every symbol defined in
+     * the module being assembled. It gives the name and value of
+     * the symbol, in NASM's terms, and indicates whether it has
+     * been declared to be global. Note that the parameter "name",
+     * when passed, will point to a piece of static storage
+     * allocated inside the label manager - it's safe to keep using
+     * that pointer, because the label manager doesn't clean up
+     * until after the output driver has.
+     *
+     * Values of `is_global' are: 0 means the symbol is local; 1
+     * means the symbol is global; 2 means the symbol is common (in
+     * which case `offset' holds the _size_ of the variable).
+     * Anything else is available for the output driver to use
+     * internally.
+     *
+     * This routine explicitly _is_ allowed to call the label
+     * manager to define further symbols, if it wants to, even
+     * though it's been called _from_ the label manager. That much
+     * re-entrancy is guaranteed in the label manager. However, the
+     * label manager will in turn call this routine, so it should
+     * be prepared to be re-entrant itself.
+     *
+     * The `special' parameter contains special information passed
+     * through from the command that defined the label: it may have
+     * been an EXTERN, a COMMON or a GLOBAL. The distinction should
+     * be obvious to the output format from the other parameters.
+     */
+    void (*symdef) (char *name, long segment, long offset, int is_global,
+		    char *special);
+
+    /*
+     * This procedure is called when the source code requests a
+     * segment change. It should return the corresponding segment
+     * _number_ for the name, or NO_SEG if the name is not a valid
+     * segment name.
+     *
+     * It may also be called with NULL, in which case it is to
+     * return the _default_ section number for starting assembly in.
+     *
+     * It is allowed to modify the string it is given a pointer to.
+     *
+     * It is also allowed to specify a default instruction size for
+     * the segment, by setting `*bits' to 16 or 32. Or, if it
+     * doesn't wish to define a default, it can leave `bits' alone.
+     */
+    long (*section) (char *name, int pass, int *bits);
+
+    /*
+     * This procedure is called to modify the segment base values
+     * returned from the SEG operator. It is given a segment base
+     * value (i.e. a segment value with the low bit set), and is
+     * required to produce in return a segment value which may be
+     * different. It can map segment bases to absolute numbers by
+     * means of returning SEG_ABS types.
+     *
+     * It should return NO_SEG if the segment base cannot be
+     * determined; the evaluator (which calls this routine) is
+     * responsible for throwing an error condition if that occurs
+     * in pass two or in a critical expression.
+     */
+    long (*segbase) (long segment);
+
+    /*
+     * This procedure is called to allow the output driver to
+     * process its own specific directives. When called, it has the
+     * directive word in `directive' and the parameter string in
+     * `value'. It is called in both assembly passes, and `pass'
+     * will be either 1 or 2.
+     *
+     * This procedure should return zero if it does not _recognise_
+     * the directive, so that the main program can report an error.
+     * If it recognises the directive but then has its own errors,
+     * it should report them itself and then return non-zero. It
+     * should also return non-zero if it correctly processes the
+     * directive.
+     */
+    int (*directive) (char *directive, char *value, int pass);
+
+    /*
+     * This procedure is called before anything else - even before
+     * the "init" routine - and is passed the name of the input
+     * file from which this output file is being generated. It
+     * should return its preferred name for the output file in
+     * `outname', if outname[0] is not '\0', and do nothing to
+     * `outname' otherwise. Since it is called before the driver is
+     * properly initialised, it has to be passed its error handler
+     * separately.
+     *
+     * This procedure may also take its own copy of the input file
+     * name for use in writing the output file: it is _guaranteed_
+     * that it will be called before the "init" routine.
+     *
+     * The parameter `outname' points to an area of storage
+     * guaranteed to be at least FILENAME_MAX in size.
+     */
+    void (*filename) (char *inname, char *outname, efunc error);
+
+    /*
+     * This procedure is called after assembly finishes, to allow
+     * the output driver to clean itself up and free its memory.
+     * Typically, it will also be the point at which the object
+     * file actually gets _written_.
+     *
+     * One thing the cleanup routine should always do is to close
+     * the output file pointer.
+     */
+    void (*cleanup) (int debuginfo);
+};
+
+/*
+ * values for the `type' parameter to an output function. Each one
+ * must have the actual number of _bytes_ added to it.
+ *
+ * Exceptions are OUT_RELxADR, which denote an x-byte relocation
+ * which will be a relative jump. For this we need to know the
+ * distance in bytes from the start of the relocated record until
+ * the end of the containing instruction. _This_ is what is stored
+ * in the size part of the parameter, in this case.
+ *
+ * Also OUT_RESERVE denotes reservation of N bytes of BSS space,
+ * and the contents of the "data" parameter is irrelevant.
+ *
+ * The "data" parameter for the output function points to a "long",
+ * containing the address in question, unless the type is
+ * OUT_RAWDATA, in which case it points to an "unsigned char"
+ * array.
+ */
+#define OUT_RAWDATA 0x00000000UL
+#define OUT_ADDRESS 0x10000000UL
+#define OUT_REL2ADR 0x20000000UL
+#define OUT_REL4ADR 0x30000000UL
+#define OUT_RESERVE 0x40000000UL
+#define OUT_TYPMASK 0xF0000000UL
+#define OUT_SIZMASK 0x0FFFFFFFUL
+
+/*
+ * ------------------------------------------------------------
+ * The data structure defining a debug format driver, and the
+ * interfaces to the functions therein.
+ * ------------------------------------------------------------
+ */
+
+struct dfmt {
+
+    /*
+     * This is a short (one-liner) description of the type of
+     * output generated by the driver.
+     */
+    const char *fullname;
+
+    /*
+     * This is a single keyword used to select the driver.
+     */
+    const char *shortname;
+
+
+    /*
+     * init - called initially to set up local pointer to object format,
+     * void pointer to implementation defined data, file pointer (which
+     * probably won't be used, but who knows?), and error function.
+     */
+    void (*init) (struct ofmt * of, void * id, FILE * fp, efunc error);
+
+    /*
+     * linenum - called any time there is output with a change of
+     * line number or file.
+     */
+    void (*linenum) (const char * filename, long linenumber, long segto);
+
+    /*
+     * debug_deflabel - called whenever a label is defined. Parameters
+     * are the same as to 'symdef()' in the output format. This function
+     * would be called before the output format version.
+     */
+
+    void (*debug_deflabel) (char * name, long segment, long offset,
+                            int is_global, char * special);
+    /*
+     * debug_directive - called whenever a DEBUG directive other than 'LINE'
+     * is encountered. 'directive' contains the first parameter to the
+     * DEBUG directive, and params contains the rest. For example,
+     * 'DEBUG VAR _somevar:int' would translate to a call to this
+     * function with 'directive' equal to "VAR" and 'params' equal to
+     * "_somevar:int".
+     */
+    void (*debug_directive) (const char * directive, const char * params);
+
+    /*
+     * typevalue - called whenever the assembler wishes to register a type
+     * for the last defined label.  This routine MUST detect if a type was
+     * already registered and not re-register it.
+     */
+    void (*debug_typevalue) (long type);
+
+    /*
+     * debug_output - called whenever output is required
+     * 'type' is the type of info required, and this is format-specific
+     */
+    void (*debug_output) (int type, void *param);
+
+    /*
+     * cleanup - called after processing of file is complete
+     */
+    void (*cleanup) (void);
+
+};
+/*
+ * The type definition macros
+ * for debugging
+ *
+ * low 3 bits: reserved
+ * next 5 bits: type
+ * next 24 bits: number of elements for arrays (0 for labels)
+ */
+
+#define TY_UNKNOWN 0x00
+#define TY_LABEL   0x08
+#define TY_BYTE    0x10
+#define TY_WORD    0x18
+#define TY_DWORD   0x20
+#define TY_FLOAT   0x28
+#define TY_QWORD   0x30
+#define TY_TBYTE   0x38
+#define TY_COMMON  0xE0
+#define TY_SEG     0xE8
+#define TY_EXTERN  0xF0
+#define TY_EQU     0xF8
+
+#define TYM_TYPE(x) ((x) & 0xF8)
+#define TYM_ELEMENTS(x) (((x) & 0xFFFFFF00) >> 8)
+
+#define TYS_ELEMENTS(x)  ((x) << 8)
+/*
+ * -----
+ * Other
+ * -----
+ */
+
+/*
+ * This is a useful #define which I keep meaning to use more often:
+ * the number of elements of a statically defined array.
+ */
+
+#define elements(x)     ( sizeof(x) / sizeof(*(x)) )
+
+extern int tasm_compatible_mode;
+
+/*
+ * This declaration passes the "pass" number to all other modules
+ * "pass0" assumes the values: 0, 0, ..., 0, 1, 2
+ * where 0 = optimizing pass
+ *       1 = pass 1
+ *       2 = pass 2
+ */
+
+extern int pass0;	/* this is globally known */
+extern int optimizing;
+
+#endif
diff --git a/uppsrc/plugin/ndisasm/lib/nasmlib.c b/uppsrc/plugin/ndisasm/lib/nasmlib.c
new file mode 100644
index 000000000..d28b76dad
--- /dev/null
+++ b/uppsrc/plugin/ndisasm/lib/nasmlib.c
@@ -0,0 +1,1122 @@
+/* nasmlib.c	library routines for the Netwide Assembler
+ *
+ * The Netwide Assembler is copyright (C) 1996 Simon Tatham and
+ * Julian Hall. All rights reserved. The software is
+ * redistributable under the licence given in the file "Licence"
+ * distributed in the NASM archive.
+ */
+
+#define _CRT_SECURE_NO_DEPRECATE
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+
+#include "nasm.h"
+#include "nasmlib.h"
+#include "insns.h"		/* For MAX_KEYWORD */
+
+static efunc nasm_malloc_error;
+
+#ifdef LOGALLOC
+static FILE *logfp;
+#endif
+
+void nasm_set_malloc_error (efunc error)
+{
+    nasm_malloc_error = error;
+#ifdef LOGALLOC
+    logfp = fopen ("malloc.log", "w");
+    setvbuf (logfp, NULL, _IOLBF, BUFSIZ);
+    fprintf (logfp, "null pointer is %p\n", NULL);
+#endif
+}
+
+#ifdef LOGALLOC
+void *nasm_malloc_log (char *file, int line, size_t size)
+#else
+void *nasm_malloc (size_t size)
+#endif
+{
+    void *p = malloc(size);
+    if (!p)
+	nasm_malloc_error (ERR_FATAL | ERR_NOFILE, "out of memory");
+#ifdef LOGALLOC
+    else
+	fprintf(logfp, "%s %d malloc(%ld) returns %p\n",
+		file, line, (long)size, p);
+#endif
+    return p;
+}
+
+#ifdef LOGALLOC
+void *nasm_realloc_log (char *file, int line, void *q, size_t size)
+#else
+void *nasm_realloc (void *q, size_t size)
+#endif
+{
+    void *p = q ? realloc(q, size) : malloc(size);
+    if (!p)
+	nasm_malloc_error (ERR_FATAL | ERR_NOFILE, "out of memory");
+#ifdef LOGALLOC
+    else if (q)
+	fprintf(logfp, "%s %d realloc(%p,%ld) returns %p\n",
+		file, line, q, (long)size, p);
+    else
+	fprintf(logfp, "%s %d malloc(%ld) returns %p\n",
+		file, line, (long)size, p);
+#endif
+    return p;
+}
+
+#ifdef LOGALLOC
+void nasm_free_log (char *file, int line, void *q)
+#else
+void nasm_free (void *q)
+#endif
+{
+    if (q) {
+	free (q);
+#ifdef LOGALLOC
+	fprintf(logfp, "%s %d free(%p)\n",
+		file, line, q);
+#endif
+    }
+}
+
+#ifdef LOGALLOC
+char *nasm_strdup_log (char *file, int line, const char *s)
+#else
+char *nasm_strdup (const char *s)
+#endif
+{
+    char *p;
+    int size = strlen(s)+1;
+
+    p = malloc(size);
+    if (!p)
+	nasm_malloc_error (ERR_FATAL | ERR_NOFILE, "out of memory");
+#ifdef LOGALLOC
+    else
+	fprintf(logfp, "%s %d strdup(%ld) returns %p\n",
+		file, line, (long)size, p);
+#endif
+    strcpy (p, s);
+    return p;
+}
+
+#ifdef LOGALLOC
+char *nasm_strndup_log (char *file, int line, char *s, size_t len)
+#else
+char *nasm_strndup (char *s, size_t len)
+#endif
+{
+    char *p;
+    int size = len+1;
+
+    p = malloc(size);
+    if (!p)
+	nasm_malloc_error (ERR_FATAL | ERR_NOFILE, "out of memory");
+#ifdef LOGALLOC
+    else
+	fprintf(logfp, "%s %d strndup(%ld) returns %p\n",
+		file, line, (long)size, p);
+#endif
+    strncpy (p, s, len);
+    p[len] = '\0';
+    return p;
+}
+
+#if !defined(stricmp) && !defined(strcasecmp)
+int nasm_stricmp (const char *s1, const char *s2)
+{
+    while (*s1 && tolower(*s1) == tolower(*s2))
+	s1++, s2++;
+    if (!*s1 && !*s2)
+	return 0;
+    else if (tolower(*s1) < tolower(*s2))
+	return -1;
+    else
+	return 1;
+}
+#endif
+
+#if !defined(strnicmp) && !defined(strncasecmp)
+int nasm_strnicmp (const char *s1, const char *s2, int n)
+{
+    while (n > 0 && *s1 && tolower(*s1) == tolower(*s2))
+	s1++, s2++, n--;
+    if ((!*s1 && !*s2) || n==0)
+	return 0;
+    else if (tolower(*s1) < tolower(*s2))
+	return -1;
+    else
+	return 1;
+}
+#endif
+
+#define lib_isnumchar(c)   ( isalnum(c) || (c) == '$')
+#define numvalue(c)  ((c)>='a' ? (c)-'a'+10 : (c)>='A' ? (c)-'A'+10 : (c)-'0')
+
+long readnum (char *str, int *error)
+{
+    char *r = str, *q;
+    long radix;
+    unsigned long result, checklimit;
+    int digit, last;
+    int warn = FALSE;
+    int sign = 1;
+
+    *error = FALSE;
+
+    while (isspace(*r)) r++;	       /* find start of number */
+
+    /*
+     * If the number came from make_tok_num (as a result of an %assign), it
+     * might have a '-' built into it (rather than in a preceeding token).
+     */
+    if (*r == '-')
+    {
+	r++;
+	sign = -1;
+    }
+
+    q = r;
+
+    while (lib_isnumchar(*q)) q++;     /* find end of number */
+
+    /*
+     * If it begins 0x, 0X or $, or ends in H, it's in hex. if it
+     * ends in Q, it's octal. if it ends in B, it's binary.
+     * Otherwise, it's ordinary decimal.
+     */
+    if (*r=='0' && (r[1]=='x' || r[1]=='X'))
+	radix = 16, r += 2;
+    else if (*r=='$')
+	radix = 16, r++;
+    else if (q[-1]=='H' || q[-1]=='h')
+	radix = 16 , q--;
+    else if (q[-1]=='Q' || q[-1]=='q' || q[-1]=='O' || q[-1]=='o')
+	radix = 8 , q--;
+    else if (q[-1]=='B' || q[-1]=='b')
+	radix = 2 , q--;
+    else
+	radix = 10;
+
+    /*
+     * If this number has been found for us by something other than
+     * the ordinary scanners, then it might be malformed by having
+     * nothing between the prefix and the suffix. Check this case
+     * now.
+     */
+    if (r >= q) {
+	*error = TRUE;
+	return 0;
+    }
+
+    /*
+     * `checklimit' must be 2**32 / radix. We can't do that in
+     * 32-bit arithmetic, which we're (probably) using, so we
+     * cheat: since we know that all radices we use are even, we
+     * can divide 2**31 by radix/2 instead.
+     */
+    checklimit = 0x80000000UL / (radix>>1);
+
+    /*
+     * Calculate the highest allowable value for the last digit
+     * of a 32 bit constant... in radix 10, it is 6, otherwise it is 0
+     */
+    last = (radix == 10 ? 6 : 0);
+
+    result = 0;
+    while (*r && r < q) {
+	if (*r<'0' || (*r>'9' && *r<'A') || (digit = numvalue(*r)) >= radix)
+	{
+	    *error = TRUE;
+	    return 0;
+	}
+	if (result > checklimit ||
+	    (result == checklimit && digit >= last))
+	{
+	    warn = TRUE;
+	}
+
+	result = radix * result + digit;
+	r++;
+    }
+
+    if (warn)
+	nasm_malloc_error (ERR_WARNING | ERR_PASS1 | ERR_WARN_NOV,
+			   "numeric constant %s does not fit in 32 bits",
+			   str);
+
+    return result*sign;
+}
+
+long readstrnum (char *str, int length, int *warn)
+{
+    long charconst = 0;
+    int i;
+
+    *warn = FALSE;
+
+    str += length;
+    for (i=0; i<length; i++) {
+	if (charconst & 0xff000000UL) {
+	    *warn = TRUE;
+	}
+	charconst = (charconst<<8) + (unsigned char) *--str;
+    }
+    return charconst;
+}
+
+static long next_seg;
+
+void seg_init(void)
+{
+    next_seg = 0;
+}
+
+long seg_alloc(void)
+{
+    return (next_seg += 2) - 2;
+}
+
+void fwriteshort (int data, FILE *fp)
+{
+    fputc ((int) (data & 255), fp);
+    fputc ((int) ((data >> 8) & 255), fp);
+}
+
+void fwritelong (long data, FILE *fp)
+{
+    fputc ((int) (data & 255), fp);
+    fputc ((int) ((data >> 8) & 255), fp);
+    fputc ((int) ((data >> 16) & 255), fp);
+    fputc ((int) ((data >> 24) & 255), fp);
+}
+
+void standard_extension (char *inname, char *outname, char *extension,
+			 efunc error)
+{
+    char *p, *q;
+
+    if (*outname)		       /* file name already exists, */
+	return;			       /* so do nothing */
+    q = inname;
+    p = outname;
+    while (*q) *p++ = *q++;	       /* copy, and find end of string */
+    *p = '\0';			       /* terminate it */
+    while (p > outname && *--p != '.');/* find final period (or whatever) */
+    if (*p != '.') while (*p) p++;     /* go back to end if none found */
+    if (!strcmp(p, extension)) {       /* is the extension already there? */
+	if (*extension)
+	    error(ERR_WARNING | ERR_NOFILE,
+		  "file name already ends in `%s': "
+		  "output will be in `nasm.out'",
+		  extension);
+	else
+	    error(ERR_WARNING | ERR_NOFILE,
+		  "file name already has no extension: "
+		  "output will be in `nasm.out'");
+	strcpy(outname, "nasm.out");
+    } else
+	strcpy(p, extension);
+}
+
+#define LEAFSIZ (sizeof(RAA)-sizeof(RAA_UNION)+sizeof(RAA_LEAF))
+#define BRANCHSIZ (sizeof(RAA)-sizeof(RAA_UNION)+sizeof(RAA_BRANCH))
+
+#define LAYERSIZ(r) ( (r)->layers==0 ? RAA_BLKSIZE : RAA_LAYERSIZE )
+
+static struct RAA *real_raa_init (int layers)
+{
+    struct RAA *r;
+    int i;
+
+    if (layers == 0) {
+	r = nasm_malloc (LEAFSIZ);
+	r->layers = 0;
+	memset (r->u.l.data, 0, sizeof(r->u.l.data));
+	r->stepsize = 1L;
+    } else {
+	r = nasm_malloc (BRANCHSIZ);
+	r->layers = layers;
+	for ( i = 0 ; i < RAA_LAYERSIZE ; i++ )
+	  r->u.b.data[i] = NULL;
+	r->stepsize = RAA_BLKSIZE;
+	while (--layers)
+	    r->stepsize *= RAA_LAYERSIZE;
+    }
+    return r;
+}
+
+struct RAA *raa_init (void)
+{
+    return real_raa_init (0);
+}
+
+void raa_free (struct RAA *r)
+{
+    if (r->layers == 0)
+	nasm_free (r);
+    else {
+	struct RAA **p;
+	for (p = r->u.b.data; p - r->u.b.data < RAA_LAYERSIZE; p++)
+	    if (*p)
+		raa_free (*p);
+    }
+}
+
+long raa_read (struct RAA *r, long posn)
+{
+    if (posn >= r->stepsize * LAYERSIZ(r))
+	return 0;		/* Return 0 for undefined entries */
+    while (r->layers > 0) {
+	ldiv_t l;
+	l = ldiv (posn, r->stepsize);
+	r = r->u.b.data[l.quot];
+	posn = l.rem;
+	if (!r)
+	    return 0;		/* Return 0 for undefined entries */
+    }
+    return r->u.l.data[posn];
+}
+
+struct RAA *raa_write (struct RAA *r, long posn, long value)
+{
+    struct RAA *result;
+
+    if (posn < 0)
+	nasm_malloc_error (ERR_PANIC, "negative position in raa_write");
+
+    while (r->stepsize * LAYERSIZ(r) <= posn) {
+	/*
+	 * Must add a layer.
+	 */
+	struct RAA *s;
+	int i;
+
+	s = nasm_malloc (BRANCHSIZ);
+	for ( i = 0 ; i < RAA_LAYERSIZE ; i++ )
+	    s->u.b.data[i] = NULL;
+	s->layers = r->layers + 1;
+	s->stepsize = LAYERSIZ(r) * r->stepsize;
+	s->u.b.data[0] = r;
+	r = s;
+    }
+
+    result = r;
+
+    while (r->layers > 0) {
+	ldiv_t l;
+	struct RAA **s;
+	l = ldiv (posn, r->stepsize);
+	s = &r->u.b.data[l.quot];
+	if (!*s)
+	    *s = real_raa_init (r->layers - 1);
+	r = *s;
+	posn = l.rem;
+    }
+
+    r->u.l.data[posn] = value;
+
+    return result;
+}
+
+#define SAA_MAXLEN 8192
+
+struct SAA *saa_init (long elem_len)
+{
+    struct SAA *s;
+
+    if (elem_len > SAA_MAXLEN)
+	nasm_malloc_error (ERR_PANIC | ERR_NOFILE, "SAA with huge elements");
+
+    s = nasm_malloc (sizeof(struct SAA));
+    s->posn = s->start = 0L;
+    s->elem_len = elem_len;
+    s->length = SAA_MAXLEN - (SAA_MAXLEN % elem_len);
+    s->data = nasm_malloc (s->length);
+    s->next = NULL;
+    s->end = s;
+
+    return s;
+}
+
+void saa_free (struct SAA *s)
+{
+    struct SAA *t;
+
+    while (s) {
+	t = s->next;
+	nasm_free (s->data);
+	nasm_free (s);
+	s = t;
+    }
+}
+
+void *saa_wstruct (struct SAA *s)
+{
+    void *p;
+
+    if (s->end->length - s->end->posn < s->elem_len) {
+	s->end->next = nasm_malloc (sizeof(struct SAA));
+	s->end->next->start = s->end->start + s->end->posn;
+	s->end = s->end->next;
+	s->end->length = s->length;
+	s->end->next = NULL;
+	s->end->posn = 0L;
+	s->end->data = nasm_malloc (s->length);
+    }
+
+    p = s->end->data + s->end->posn;
+    s->end->posn += s->elem_len;
+    return p;
+}
+
+void saa_wbytes (struct SAA *s, const void *data, long len)
+{
+    const char *d = data;
+
+    while (len > 0) {
+	long l = s->end->length - s->end->posn;
+	if (l > len)
+	    l = len;
+	if (l > 0) {
+	    if (d) {
+		memcpy (s->end->data + s->end->posn, d, l);
+		d += l;
+	    } else
+		memset (s->end->data + s->end->posn, 0, l);
+	    s->end->posn += l;
+	    len -= l;
+	}
+	if (len > 0) {
+	    s->end->next = nasm_malloc (sizeof(struct SAA));
+	    s->end->next->start = s->end->start + s->end->posn;
+	    s->end = s->end->next;
+	    s->end->length = s->length;
+	    s->end->next = NULL;
+	    s->end->posn = 0L;
+	    s->end->data = nasm_malloc (s->length);
+	}
+    }
+}
+
+void saa_rewind (struct SAA *s)
+{
+    s->rptr = s;
+    s->rpos = 0L;
+}
+
+void *saa_rstruct (struct SAA *s)
+{
+    void *p;
+
+    if (!s->rptr)
+	return NULL;
+
+    if (s->rptr->posn - s->rpos < s->elem_len) {
+	s->rptr = s->rptr->next;
+	if (!s->rptr)
+	    return NULL;	       /* end of array */
+	s->rpos = 0L;
+    }
+
+    p = s->rptr->data + s->rpos;
+    s->rpos += s->elem_len;
+    return p;
+}
+
+void *saa_rbytes (struct SAA *s, long *len)
+{
+    void *p;
+
+    if (!s->rptr)
+	return NULL;
+
+    p = s->rptr->data + s->rpos;
+    *len = s->rptr->posn - s->rpos;
+    s->rptr = s->rptr->next;
+    s->rpos = 0L;
+    return p;
+}
+
+void saa_rnbytes (struct SAA *s, void *data, long len)
+{
+    char *d = data;
+
+    while (len > 0) {
+	long l;
+
+	if (!s->rptr)
+	    return;
+
+	l = s->rptr->posn - s->rpos;
+	if (l > len)
+	    l = len;
+	if (l > 0) {
+	    memcpy (d, s->rptr->data + s->rpos, l);
+	    d += l;
+	    s->rpos += l;
+	    len -= l;
+	}
+	if (len > 0) {
+	    s->rptr = s->rptr->next;
+	    s->rpos = 0L;
+	}
+    }
+}
+
+void saa_fread (struct SAA *s, long posn, void *data, long len)
+{
+    struct SAA *p;
+    long pos;
+    char *cdata = data;
+
+    if (!s->rptr || posn < s->rptr->start)
+	saa_rewind (s);
+    p = s->rptr;
+    while (posn >= p->start + p->posn) {
+	p = p->next;
+	if (!p)
+	    return;		       /* what else can we do?! */
+    }
+
+    pos = posn - p->start;
+    while (len) {
+	long l = p->posn - pos;
+	if (l > len)
+	    l = len;
+	memcpy (cdata, p->data+pos, l);
+	len -= l;
+	cdata += l;
+	p = p->next;
+	if (!p)
+	    return;
+	pos = 0L;
+    }
+    s->rptr = p;
+}
+
+void saa_fwrite (struct SAA *s, long posn, void *data, long len)
+{
+    struct SAA *p;
+    long pos;
+    char *cdata = data;
+
+    if (!s->rptr || posn < s->rptr->start)
+	saa_rewind (s);
+    p = s->rptr;
+    while (posn >= p->start + p->posn) {
+	p = p->next;
+	if (!p)
+	    return;		       /* what else can we do?! */
+    }
+
+    pos = posn - p->start;
+    while (len) {
+	long l = p->posn - pos;
+	if (l > len)
+	    l = len;
+	memcpy (p->data+pos, cdata, l);
+	len -= l;
+	cdata += l;
+	p = p->next;
+	if (!p)
+	    return;
+	pos = 0L;
+    }
+    s->rptr = p;
+}
+
+void saa_fpwrite (struct SAA *s, FILE *fp)
+{
+    char *data;
+    long len;
+
+    saa_rewind (s);
+    while ( (data = saa_rbytes (s, &len)) )
+	fwrite (data, 1, len, fp);
+}
+
+/*
+ * Register, instruction, condition-code and prefix keywords used
+ * by the scanner.
+ */
+#include "names.c"
+static const char *special_names[] = {
+    "byte", "dword", "far", "long", "near", "nosplit", "qword",
+    "short", "strict", "to", "tword", "word"
+};
+static const char *prefix_names[] = {
+    "a16", "a32", "lock", "o16", "o32", "rep", "repe", "repne",
+    "repnz", "repz", "times"
+};
+
+
+/*
+ * Standard scanner routine used by parser.c and some output
+ * formats. It keeps a succession of temporary-storage strings in
+ * stdscan_tempstorage, which can be cleared using stdscan_reset.
+ */
+static char **stdscan_tempstorage = NULL;
+static int stdscan_tempsize = 0, stdscan_templen = 0;
+#define STDSCAN_TEMP_DELTA 256
+
+static void stdscan_pop(void)
+{
+    nasm_free (stdscan_tempstorage[--stdscan_templen]);
+}
+
+void stdscan_reset(void)
+{
+    while (stdscan_templen > 0)
+	stdscan_pop();
+}
+
+/*
+ * Unimportant cleanup is done to avoid confusing people who are trying
+ * to debug real memory leaks
+ */
+void nasmlib_cleanup (void)
+{
+    stdscan_reset();
+    nasm_free (stdscan_tempstorage);
+}
+
+static char *stdscan_copy(char *p, int len)
+{
+    char *text;
+
+    text = nasm_malloc(len+1);
+    strncpy (text, p, len);
+    text[len] = '\0';
+
+    if (stdscan_templen >= stdscan_tempsize) {
+	stdscan_tempsize += STDSCAN_TEMP_DELTA;
+	stdscan_tempstorage = nasm_realloc(stdscan_tempstorage,
+					   stdscan_tempsize*sizeof(char *));
+    }
+    stdscan_tempstorage[stdscan_templen++] = text;
+
+    return text;
+}
+
+char *stdscan_bufptr = NULL;
+int stdscan (void *private_data, struct tokenval *tv)
+{
+    char ourcopy[MAX_KEYWORD+1], *r, *s;
+
+    (void) private_data;  /* Don't warn that this parameter is unused */
+
+    while (isspace(*stdscan_bufptr)) stdscan_bufptr++;
+    if (!*stdscan_bufptr)
+	return tv->t_type = 0;
+
+    /* we have a token; either an id, a number or a char */
+    if (isidstart(*stdscan_bufptr) ||
+	(*stdscan_bufptr == '$' && isidstart(stdscan_bufptr[1]))) {
+	/* now we've got an identifier */
+	int i;
+	int is_sym = FALSE;
+
+	if (*stdscan_bufptr == '$') {
+	    is_sym = TRUE;
+	    stdscan_bufptr++;
+	}
+
+ 	r = stdscan_bufptr++;
+	/* read the entire buffer to advance the buffer pointer but... */
+	while (isidchar(*stdscan_bufptr)) stdscan_bufptr++;
+
+	/* ... copy only up to IDLEN_MAX-1 characters */
+	tv->t_charptr = stdscan_copy(r, stdscan_bufptr - r < IDLEN_MAX ?
+		stdscan_bufptr - r : IDLEN_MAX - 1);
+
+	if (is_sym || stdscan_bufptr-r > MAX_KEYWORD)
+	    return tv->t_type = TOKEN_ID;/* bypass all other checks */
+
+	for (s=tv->t_charptr, r=ourcopy; *s; s++)
+	    *r++ = tolower (*s);
+	*r = '\0';
+	/* right, so we have an identifier sitting in temp storage. now,
+	 * is it actually a register or instruction name, or what? */
+	if ((tv->t_integer=bsi(ourcopy, reg_names,
+			       elements(reg_names)))>=0) {
+	    tv->t_integer += EXPR_REG_START;
+	    return tv->t_type = TOKEN_REG;
+	} else if ((tv->t_integer=bsi(ourcopy, insn_names,
+				      elements(insn_names)))>=0) {
+	    return tv->t_type = TOKEN_INSN;
+	}
+	for (i=0; i<elements(icn); i++)
+	    if (!strncmp(ourcopy, icn[i], strlen(icn[i]))) {
+		char *p = ourcopy + strlen(icn[i]);
+		tv->t_integer = ico[i];
+		if ((tv->t_inttwo=bsi(p, conditions,
+					 elements(conditions)))>=0)
+		    return tv->t_type = TOKEN_INSN;
+	    }
+	if ((tv->t_integer=bsi(ourcopy, prefix_names,
+				  elements(prefix_names)))>=0) {
+	    tv->t_integer += PREFIX_ENUM_START;
+	    return tv->t_type = TOKEN_PREFIX;
+	}
+	if ((tv->t_integer=bsi(ourcopy, special_names,
+				  elements(special_names)))>=0)
+	    return tv->t_type = TOKEN_SPECIAL;
+	if (!nasm_stricmp(ourcopy, "seg"))
+	    return tv->t_type = TOKEN_SEG;
+	if (!nasm_stricmp(ourcopy, "wrt"))
+	    return tv->t_type = TOKEN_WRT;
+	return tv->t_type = TOKEN_ID;
+    } else if (*stdscan_bufptr == '$' && !isnumchar(stdscan_bufptr[1])) {
+	/*
+	 * It's a $ sign with no following hex number; this must
+	 * mean it's a Here token ($), evaluating to the current
+	 * assembly location, or a Base token ($$), evaluating to
+	 * the base of the current segment.
+	 */
+	stdscan_bufptr++;
+	if (*stdscan_bufptr == '$') {
+	    stdscan_bufptr++;
+	    return tv->t_type = TOKEN_BASE;
+	}
+	return tv->t_type = TOKEN_HERE;
+    } else if (isnumstart(*stdscan_bufptr)) {  /* now we've got a number */
+	int rn_error;
+
+	r = stdscan_bufptr++;
+	while (isnumchar(*stdscan_bufptr))
+	    stdscan_bufptr++;
+
+	if (*stdscan_bufptr == '.') {
+	    /*
+	     * a floating point constant
+	     */
+	    stdscan_bufptr++;
+	    while (isnumchar(*stdscan_bufptr) ||
+		   ((stdscan_bufptr[-1] == 'e' || stdscan_bufptr[-1] == 'E')
+		    && (*stdscan_bufptr == '-' || *stdscan_bufptr == '+')) )
+	    {
+		stdscan_bufptr++;
+	    }
+	    tv->t_charptr = stdscan_copy(r, stdscan_bufptr - r);
+	    return tv->t_type = TOKEN_FLOAT;
+	}
+	r = stdscan_copy(r, stdscan_bufptr - r);
+	tv->t_integer = readnum(r, &rn_error);
+	stdscan_pop();
+	if (rn_error)
+	    return tv->t_type = TOKEN_ERRNUM;/* some malformation occurred */
+	tv->t_charptr = NULL;
+	return tv->t_type = TOKEN_NUM;
+    } else if (*stdscan_bufptr == '\'' ||
+	       *stdscan_bufptr == '"') {/* a char constant */
+    	char quote = *stdscan_bufptr++, *r;
+	int rn_warn;
+	r = tv->t_charptr = stdscan_bufptr;
+	while (*stdscan_bufptr && *stdscan_bufptr != quote) stdscan_bufptr++;
+	tv->t_inttwo = stdscan_bufptr - r;      /* store full version */
+	if (!*stdscan_bufptr)
+	    return tv->t_type = TOKEN_ERRNUM;       /* unmatched quotes */
+	stdscan_bufptr++;			/* skip over final quote */
+	tv->t_integer = readstrnum(r, tv->t_inttwo, &rn_warn);
+	/* FIXME: rn_warn is not checked! */
+	return tv->t_type = TOKEN_NUM;
+    } else if (*stdscan_bufptr == ';') {  /* a comment has happened - stay */
+	return tv->t_type = 0;
+    } else if (stdscan_bufptr[0] == '>' && stdscan_bufptr[1] == '>') {
+	stdscan_bufptr += 2;
+	return tv->t_type = TOKEN_SHR;
+    } else if (stdscan_bufptr[0] == '<' && stdscan_bufptr[1] == '<') {
+	stdscan_bufptr += 2;
+	return tv->t_type = TOKEN_SHL;
+    } else if (stdscan_bufptr[0] == '/' && stdscan_bufptr[1] == '/') {
+	stdscan_bufptr += 2;
+	return tv->t_type = TOKEN_SDIV;
+    } else if (stdscan_bufptr[0] == '%' && stdscan_bufptr[1] == '%') {
+	stdscan_bufptr += 2;
+	return tv->t_type = TOKEN_SMOD;
+    } else if (stdscan_bufptr[0] == '=' && stdscan_bufptr[1] == '=') {
+	stdscan_bufptr += 2;
+	return tv->t_type = TOKEN_EQ;
+    } else if (stdscan_bufptr[0] == '<' && stdscan_bufptr[1] == '>') {
+	stdscan_bufptr += 2;
+	return tv->t_type = TOKEN_NE;
+    } else if (stdscan_bufptr[0] == '!' && stdscan_bufptr[1] == '=') {
+	stdscan_bufptr += 2;
+	return tv->t_type = TOKEN_NE;
+    } else if (stdscan_bufptr[0] == '<' && stdscan_bufptr[1] == '=') {
+	stdscan_bufptr += 2;
+	return tv->t_type = TOKEN_LE;
+    } else if (stdscan_bufptr[0] == '>' && stdscan_bufptr[1] == '=') {
+	stdscan_bufptr += 2;
+	return tv->t_type = TOKEN_GE;
+    } else if (stdscan_bufptr[0] == '&' && stdscan_bufptr[1] == '&') {
+	stdscan_bufptr += 2;
+	return tv->t_type = TOKEN_DBL_AND;
+    } else if (stdscan_bufptr[0] == '^' && stdscan_bufptr[1] == '^') {
+	stdscan_bufptr += 2;
+	return tv->t_type = TOKEN_DBL_XOR;
+    } else if (stdscan_bufptr[0] == '|' && stdscan_bufptr[1] == '|') {
+	stdscan_bufptr += 2;
+	return tv->t_type = TOKEN_DBL_OR;
+    } else			       /* just an ordinary char */
+    	return tv->t_type = (unsigned char) (*stdscan_bufptr++);
+}
+
+/*
+ * Return TRUE if the argument is a simple scalar. (Or a far-
+ * absolute, which counts.)
+ */
+int is_simple (expr *vect)
+{
+    while (vect->type && !vect->value)
+    	vect++;
+    if (!vect->type)
+	return 1;
+    if (vect->type != EXPR_SIMPLE)
+	return 0;
+    do {
+	vect++;
+    } while (vect->type && !vect->value);
+    if (vect->type && vect->type < EXPR_SEGBASE+SEG_ABS) return 0;
+    return 1;
+}
+
+/*
+ * Return TRUE if the argument is a simple scalar, _NOT_ a far-
+ * absolute.
+ */
+int is_really_simple (expr *vect)
+{
+    while (vect->type && !vect->value)
+    	vect++;
+    if (!vect->type)
+	return 1;
+    if (vect->type != EXPR_SIMPLE)
+	return 0;
+    do {
+	vect++;
+    } while (vect->type && !vect->value);
+    if (vect->type) return 0;
+    return 1;
+}
+
+/*
+ * Return TRUE if the argument is relocatable (i.e. a simple
+ * scalar, plus at most one segment-base, plus possibly a WRT).
+ */
+int is_reloc (expr *vect)
+{
+    while (vect->type && !vect->value) /* skip initial value-0 terms */
+    	vect++;
+    if (!vect->type)		       /* trivially return TRUE if nothing */
+	return 1;		       /* is present apart from value-0s */
+    if (vect->type < EXPR_SIMPLE)      /* FALSE if a register is present */
+	return 0;
+    if (vect->type == EXPR_SIMPLE) {   /* skip over a pure number term... */
+	do {
+	    vect++;
+	} while (vect->type && !vect->value);
+	if (!vect->type)	       /* ...returning TRUE if that's all */
+	    return 1;
+    }
+    if (vect->type == EXPR_WRT) {      /* skip over a WRT term... */
+	do {
+	    vect++;
+	} while (vect->type && !vect->value);
+	if (!vect->type)	       /* ...returning TRUE if that's all */
+	    return 1;
+    }
+    if (vect->value != 0 && vect->value != 1)
+	return 0;		       /* segment base multiplier non-unity */
+    do {			       /* skip over _one_ seg-base term... */
+	vect++;
+    } while (vect->type && !vect->value);
+    if (!vect->type)		       /* ...returning TRUE if that's all */
+	return 1;
+    return 0;			       /* And return FALSE if there's more */
+}
+
+/*
+ * Return TRUE if the argument contains an `unknown' part.
+ */
+int is_unknown(expr *vect)
+{
+    while (vect->type && vect->type < EXPR_UNKNOWN)
+	vect++;
+    return (vect->type == EXPR_UNKNOWN);
+}
+
+/*
+ * Return TRUE if the argument contains nothing but an `unknown'
+ * part.
+ */
+int is_just_unknown(expr *vect)
+{
+    while (vect->type && !vect->value)
+	vect++;
+    return (vect->type == EXPR_UNKNOWN);
+}
+
+/*
+ * Return the scalar part of a relocatable vector. (Including
+ * simple scalar vectors - those qualify as relocatable.)
+ */
+long reloc_value (expr *vect)
+{
+    while (vect->type && !vect->value)
+    	vect++;
+    if (!vect->type) return 0;
+    if (vect->type == EXPR_SIMPLE)
+	return vect->value;
+    else
+	return 0;
+}
+
+/*
+ * Return the segment number of a relocatable vector, or NO_SEG for
+ * simple scalars.
+ */
+long reloc_seg (expr *vect)
+{
+    while (vect->type && (vect->type == EXPR_WRT || !vect->value))
+    	vect++;
+    if (vect->type == EXPR_SIMPLE) {
+	do {
+	    vect++;
+	} while (vect->type && (vect->type == EXPR_WRT || !vect->value));
+    }
+    if (!vect->type)
+	return NO_SEG;
+    else
+	return vect->type - EXPR_SEGBASE;
+}
+
+/*
+ * Return the WRT segment number of a relocatable vector, or NO_SEG
+ * if no WRT part is present.
+ */
+long reloc_wrt (expr *vect)
+{
+    while (vect->type && vect->type < EXPR_WRT)
+    	vect++;
+    if (vect->type == EXPR_WRT) {
+	return vect->value;
+    } else
+	return NO_SEG;
+}
+
+/*
+ * Binary search.
+ */
+int bsi (char *string, const char **array, int size)
+{
+    int i = -1, j = size;	       /* always, i < index < j */
+    while (j-i >= 2) {
+	int k = (i+j)/2;
+	int l = strcmp(string, array[k]);
+	if (l<0)		       /* it's in the first half */
+	    j = k;
+	else if (l>0)		       /* it's in the second half */
+	    i = k;
+	else			       /* we've got it :) */
+	    return k;
+    }
+    return -1;			       /* we haven't got it :( */
+}
+
+static char *file_name = NULL;
+static long line_number = 0;
+
+char *src_set_fname(char *newname)
+{
+    char *oldname = file_name;
+    file_name = newname;
+    return oldname;
+}
+
+long src_set_linnum(long newline)
+{
+    long oldline = line_number;
+    line_number = newline;
+    return oldline;
+}
+
+long src_get_linnum(void)
+{
+    return line_number;
+}
+
+int src_get(long *xline, char **xname)
+{
+    if (!file_name || !*xname || strcmp(*xname, file_name))
+    {
+	nasm_free(*xname);
+	*xname = file_name ? nasm_strdup(file_name) : NULL;
+	*xline = line_number;
+	return -2;
+    }
+    if (*xline != line_number)
+    {
+	long tmp = line_number - *xline;
+	*xline = line_number;
+	return tmp;
+    }
+    return 0;
+}
+
+void nasm_quote(char **str)
+{
+    int ln=strlen(*str);
+    char q=(*str)[0];
+    char *p;
+    if (ln>1 && (*str)[ln-1]==q && (q=='"' || q=='\''))
+	return;
+    q = '"';
+    if (strchr(*str,q))
+	q = '\'';
+    p = nasm_malloc(ln+3);
+    strcpy(p+1, *str);
+    nasm_free(*str);
+    p[ln+1] = p[0] = q;
+    p[ln+2] = 0;
+    *str = p;
+}
+
+char *nasm_strcat(char *one, char *two)
+{
+    char *rslt;
+    int l1=strlen(one);
+    rslt = nasm_malloc(l1+strlen(two)+1);
+    strcpy(rslt, one);
+    strcpy(rslt+l1, two);
+    return rslt;
+}
+
+void null_debug_init(struct ofmt *of, void *id, FILE *fp, efunc error ) {}
+void null_debug_linenum(const char *filename, long linenumber, long segto) {}
+void null_debug_deflabel(char *name, long segment, long offset, int is_global, char *special) {}
+void null_debug_routine(const char *directive, const char *params) {}
+void null_debug_typevalue(long type) {}
+void null_debug_output(int type, void *param) {}
+void null_debug_cleanup(void){}
+
+struct dfmt null_debug_form = {
+    "Null debug format",
+    "null",
+    null_debug_init,
+    null_debug_linenum,
+    null_debug_deflabel,
+    null_debug_routine,
+    null_debug_typevalue,
+    null_debug_output,
+    null_debug_cleanup
+};
+
+struct dfmt *null_debug_arr[2] = { &null_debug_form, NULL };
diff --git a/uppsrc/plugin/ndisasm/lib/nasmlib.h b/uppsrc/plugin/ndisasm/lib/nasmlib.h
new file mode 100644
index 000000000..4e4eda3f7
--- /dev/null
+++ b/uppsrc/plugin/ndisasm/lib/nasmlib.h
@@ -0,0 +1,263 @@
+/* nasmlib.h	header file for nasmlib.c
+ *
+ * The Netwide Assembler is copyright (C) 1996 Simon Tatham and
+ * Julian Hall. All rights reserved. The software is
+ * redistributable under the licence given in the file "Licence"
+ * distributed in the NASM archive.
+ */
+
+#ifndef NASM_NASMLIB_H
+#define NASM_NASMLIB_H
+
+/*
+ * If this is defined, the wrappers around malloc et al will
+ * transform into logging variants, which will cause NASM to create
+ * a file called `malloc.log' when run, and spew details of all its
+ * memory management into that. That can then be analysed to detect
+ * memory leaks and potentially other problems too.
+ */
+/* #define LOGALLOC */
+
+/*
+ * Wrappers around malloc, realloc and free. nasm_malloc will
+ * fatal-error and die rather than return NULL; nasm_realloc will
+ * do likewise, and will also guarantee to work right on being
+ * passed a NULL pointer; nasm_free will do nothing if it is passed
+ * a NULL pointer.
+ */
+#ifdef NASM_NASM_H		       /* need efunc defined for this */
+void nasm_set_malloc_error (efunc);
+#ifndef LOGALLOC
+void *nasm_malloc (size_t);
+void *nasm_realloc (void *, size_t);
+void nasm_free (void *);
+char *nasm_strdup (const char *);
+char *nasm_strndup (char *, size_t);
+#else
+void *nasm_malloc_log (char *, int, size_t);
+void *nasm_realloc_log (char *, int, void *, size_t);
+void nasm_free_log (char *, int, void *);
+char *nasm_strdup_log (char *, int, const char *);
+char *nasm_strndup_log (char *, int, char *, size_t);
+#define nasm_malloc(x) nasm_malloc_log(__FILE__,__LINE__,x)
+#define nasm_realloc(x,y) nasm_realloc_log(__FILE__,__LINE__,x,y)
+#define nasm_free(x) nasm_free_log(__FILE__,__LINE__,x)
+#define nasm_strdup(x) nasm_strdup_log(__FILE__,__LINE__,x)
+#define nasm_strndup(x,y) nasm_strndup_log(__FILE__,__LINE__,x,y)
+#endif
+#endif
+
+/*
+ * ANSI doesn't guarantee the presence of `stricmp' or
+ * `strcasecmp'.
+ */
+#if defined(stricmp) || defined(strcasecmp)
+#if defined(stricmp)
+#define nasm_stricmp stricmp
+#else
+#define nasm_stricmp strcasecmp
+#endif
+#else
+int nasm_stricmp (const char *, const char *);
+#endif
+
+#if defined(strnicmp) || defined(strncasecmp)
+#if defined(strnicmp)
+#define nasm_strnicmp strnicmp
+#else
+#define nasm_strnicmp strncasecmp
+#endif
+#else
+int nasm_strnicmp (const char *, const char *, int);
+#endif
+
+/*
+ * Convert a string into a number, using NASM number rules. Sets
+ * `*error' to TRUE if an error occurs, and FALSE otherwise.
+ */
+long readnum(char *str, int *error);
+
+/*
+ * Convert a character constant into a number. Sets
+ * `*warn' to TRUE if an overflow occurs, and FALSE otherwise.
+ * str points to and length covers the middle of the string,
+ * without the quotes.
+ */
+long readstrnum(char *str, int length, int *warn);
+
+/*
+ * seg_init: Initialise the segment-number allocator.
+ * seg_alloc: allocate a hitherto unused segment number.
+ */
+void seg_init(void);
+long seg_alloc(void);
+
+/*
+ * many output formats will be able to make use of this: a standard
+ * function to add an extension to the name of the input file
+ */
+#ifdef NASM_NASM_H
+void standard_extension (char *inname, char *outname, char *extension,
+			 efunc error);
+#endif
+
+/*
+ * some handy macros that will probably be of use in more than one
+ * output format: convert integers into little-endian byte packed
+ * format in memory
+ */
+
+#define WRITECHAR(p,v) \
+  do { \
+    *(p)++ = (v) & 0xFF; \
+  } while (0)
+
+#define WRITESHORT(p,v) \
+  do { \
+    WRITECHAR(p,v); \
+    WRITECHAR(p,(v) >> 8); \
+  } while (0)
+
+#define WRITELONG(p,v) \
+  do { \
+    WRITECHAR(p,v); \
+    WRITECHAR(p,(v) >> 8); \
+    WRITECHAR(p,(v) >> 16); \
+    WRITECHAR(p,(v) >> 24); \
+  } while (0)
+
+/*
+ * and routines to do the same thing to a file
+ */
+void fwriteshort (int data, FILE *fp);
+void fwritelong (long data, FILE *fp);
+
+/*
+ * Routines to manage a dynamic random access array of longs which
+ * may grow in size to be more than the largest single malloc'able
+ * chunk.
+ */
+
+#define RAA_BLKSIZE 4096	       /* this many longs allocated at once */
+#define RAA_LAYERSIZE 1024	       /* this many _pointers_ allocated */
+
+typedef struct RAA RAA;
+typedef union RAA_UNION RAA_UNION;
+typedef struct RAA_LEAF RAA_LEAF;
+typedef struct RAA_BRANCH RAA_BRANCH;
+
+struct RAA {
+    /*
+     * Number of layers below this one to get to the real data. 0
+     * means this structure is a leaf, holding RAA_BLKSIZE real
+     * data items; 1 and above mean it's a branch, holding
+     * RAA_LAYERSIZE pointers to the next level branch or leaf
+     * structures.
+     */
+    int layers;
+    /*
+     * Number of real data items spanned by one position in the
+     * `data' array at this level. This number is 1, trivially, for
+     * a leaf (level 0): for a level 1 branch it should be
+     * RAA_BLKSIZE, and for a level 2 branch it's
+     * RAA_LAYERSIZE*RAA_BLKSIZE.
+     */
+    long stepsize;
+    union RAA_UNION {
+	struct RAA_LEAF {
+	    long data[RAA_BLKSIZE];
+	} l;
+	struct RAA_BRANCH {
+	    struct RAA *data[RAA_LAYERSIZE];
+	} b;
+    } u;
+};
+
+
+struct RAA *raa_init (void);
+void raa_free (struct RAA *);
+long raa_read (struct RAA *, long);
+struct RAA *raa_write (struct RAA *r, long posn, long value);
+
+/*
+ * Routines to manage a dynamic sequential-access array, under the
+ * same restriction on maximum mallocable block. This array may be
+ * written to in two ways: a contiguous chunk can be reserved of a
+ * given size, and a pointer returned, or single-byte data may be
+ * written. The array can also be read back in the same two ways:
+ * as a series of big byte-data blocks or as a list of structures
+ * of a given size.
+ */
+
+struct SAA {
+    /*
+     * members `end' and `elem_len' are only valid in first link in
+     * list; `rptr' and `rpos' are used for reading
+     */
+    struct SAA *next, *end, *rptr;
+    long elem_len, length, posn, start, rpos;
+    char *data;
+};
+
+struct SAA *saa_init (long elem_len);  /* 1 == byte */
+void saa_free (struct SAA *);
+void *saa_wstruct (struct SAA *);      /* return a structure of elem_len */
+void saa_wbytes (struct SAA *, const void *, long);  /* write arbitrary bytes */
+void saa_rewind (struct SAA *);	       /* for reading from beginning */
+void *saa_rstruct (struct SAA *);      /* return NULL on EOA */
+void *saa_rbytes (struct SAA *, long *);   /* return 0 on EOA */
+void saa_rnbytes (struct SAA *, void *, long); /* read a given no. of bytes */
+void saa_fread (struct SAA *s, long posn, void *p, long len);   /* fixup */
+void saa_fwrite (struct SAA *s, long posn, void *p, long len);   /* fixup */
+void saa_fpwrite (struct SAA *, FILE *);
+
+#ifdef NASM_NASM_H
+/*
+ * Standard scanner.
+ */
+extern char *stdscan_bufptr;
+void stdscan_reset(void);
+int stdscan (void *private_data, struct tokenval *tv);
+#endif
+
+#ifdef NASM_NASM_H
+/*
+ * Library routines to manipulate expression data types.
+ */
+int is_reloc(expr *);
+int is_simple(expr *);
+int is_really_simple (expr *);
+int is_unknown(expr *);
+int is_just_unknown(expr *);
+long reloc_value(expr *);
+long reloc_seg(expr *);
+long reloc_wrt(expr *);
+#endif
+
+/*
+ * Binary search routine. Returns index into `array' of an entry
+ * matching `string', or <0 if no match. `array' is taken to
+ * contain `size' elements.
+ */
+int bsi (char *string, const char **array, int size);
+
+
+char *src_set_fname(char *newname);
+long src_set_linnum(long newline);
+long src_get_linnum(void);
+/*
+ * src_get may be used if you simply want to know the source file and line.
+ * It is also used if you maintain private status about the source location
+ * It return 0 if the information was the same as the last time you
+ * checked, -1 if the name changed and (new-old) if just the line changed.
+ */
+int src_get(long *xline, char **xname);
+
+void nasm_quote(char **str);
+char *nasm_strcat(char *one, char *two);
+void nasmlib_cleanup(void);
+
+void null_debug_routine(const char *directive, const char *params);
+extern struct dfmt null_debug_form;
+extern struct dfmt *null_debug_arr[2];
+#endif
diff --git a/uppsrc/plugin/ndisasm/lib/ndisasm.c b/uppsrc/plugin/ndisasm/lib/ndisasm.c
new file mode 100644
index 000000000..1e5093000
--- /dev/null
+++ b/uppsrc/plugin/ndisasm/lib/ndisasm.c
@@ -0,0 +1,321 @@
+/* ndisasm.c   the Netwide Disassembler main module
+ *
+ * The Netwide Assembler is copyright (C) 1996 Simon Tatham and
+ * Julian Hall. All rights reserved. The software is
+ * redistributable under the licence given in the file "Licence"
+ * distributed in the NASM archive.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include <errno.h>
+
+#include "insns.h"
+#include "nasm.h"
+#include "nasmlib.h"
+#include "sync.h"
+#include "disasm.h"
+
+#define BPL 8			       /* bytes per line of hex dump */
+
+static const char *help =
+"usage: ndisasm [-a] [-i] [-h] [-r] [-u] [-b bits] [-o origin] [-s sync...]\n"
+"               [-e bytes] [-k start,bytes] [-p vendor] file\n"
+"   -a or -i activates auto (intelligent) sync\n"
+"   -u sets USE32 (32-bit mode)\n"
+"   -b 16 or -b 32 sets number of bits too\n"
+"   -h displays this text\n"
+"   -r or -v displays the version number\n"
+"   -e skips <bytes> bytes of header\n"
+"   -k avoids disassembling <bytes> bytes from position <start>\n"
+"   -p selects the preferred vendor instruction set (intel, amd, cyrix, idt)\n";
+
+static void output_ins (unsigned long, unsigned char *, int, char *);
+static void skip (unsigned long dist, FILE *fp);
+
+int main(int argc, char **argv)
+{
+    unsigned char buffer[INSN_MAX * 2], *p, *q;
+    char outbuf[256];
+    char *pname = *argv;
+    char *filename = NULL;
+    unsigned long nextsync, synclen, initskip = 0L;
+    int lenread;
+    long lendis;
+    int autosync = FALSE;
+    int bits = 16;
+    int eof = FALSE;
+    unsigned long prefer = 0;
+    int rn_error;
+    long offset;
+    FILE *fp;
+
+    offset = 0;
+    init_sync();
+
+    while (--argc) {
+	char *v, *vv, *p = *++argv;
+	if (*p == '-' && p[1]) {
+	    p++;
+	    while (*p) switch (tolower(*p)) {
+	      case 'a':		       /* auto or intelligent sync */
+	      case 'i':
+		autosync = TRUE;
+		p++;
+		break;
+	      case 'h':
+		fprintf(stderr, help);
+		return 0;
+	      case 'r':
+              case 'v':
+                fprintf(stderr, "NDISASM version %s compiled " __DATE__ "\n", NASM_VER);
+		return 0;
+	      case 'u':		       /* USE32 */
+		bits = 32;
+		p++;
+		break;
+	      case 'b':		       /* bits */
+		v = p[1] ? p+1 : --argc ? *++argv : NULL;
+		if (!v) {
+		    fprintf(stderr, "%s: `-b' requires an argument\n", pname);
+		    return 1;
+		}
+		if (!strcmp(v, "16"))
+		    bits = 16;
+		else if (!strcmp(v, "32"))
+		    bits = 32;
+		else {
+		    fprintf(stderr, "%s: argument to `-b' should"
+			    " be `16' or `32'\n", pname);
+		}
+		p = "";		       /* force to next argument */
+		break;
+	      case 'o':		       /* origin */
+		v = p[1] ? p+1 : --argc ? *++argv : NULL;
+		if (!v) {
+		    fprintf(stderr, "%s: `-o' requires an argument\n", pname);
+		    return 1;
+		}
+		offset = readnum (v, &rn_error);
+		if (rn_error) {
+		    fprintf(stderr, "%s: `-o' requires a numeric argument\n",
+			    pname);
+		    return 1;
+		}
+		p = "";		       /* force to next argument */
+		break;
+	      case 's':		       /* sync point */
+		v = p[1] ? p+1 : --argc ? *++argv : NULL;
+		if (!v) {
+		    fprintf(stderr, "%s: `-s' requires an argument\n", pname);
+		    return 1;
+		}
+		add_sync (readnum (v, &rn_error), 0L);
+		if (rn_error) {
+		    fprintf(stderr, "%s: `-s' requires a numeric argument\n",
+			    pname);
+		    return 1;
+		}
+		p = "";		       /* force to next argument */
+		break;
+	      case 'e':		       /* skip a header */
+		v = p[1] ? p+1 : --argc ? *++argv : NULL;
+		if (!v) {
+		    fprintf(stderr, "%s: `-e' requires an argument\n", pname);
+		    return 1;
+		}
+		initskip = readnum (v, &rn_error);
+		if (rn_error) {
+		    fprintf(stderr, "%s: `-e' requires a numeric argument\n",
+			    pname);
+		    return 1;
+		}
+		p = "";		       /* force to next argument */
+		break;
+	      case 'k':		       /* skip a region */
+		v = p[1] ? p+1 : --argc ? *++argv : NULL;
+		if (!v) {
+		    fprintf(stderr, "%s: `-k' requires an argument\n", pname);
+		    return 1;
+		}
+		vv = strchr(v, ',');
+		if (!vv) {
+		    fprintf(stderr, "%s: `-k' requires two numbers separated"
+			    " by a comma\n", pname);
+		    return 1;
+		}
+		*vv++ = '\0';
+		nextsync = readnum (v, &rn_error);
+		if (rn_error) {
+		    fprintf(stderr, "%s: `-k' requires numeric arguments\n",
+			    pname);
+		    return 1;
+		}
+		synclen = readnum (vv, &rn_error);
+		if (rn_error) {
+		    fprintf(stderr, "%s: `-k' requires numeric arguments\n",
+			    pname);
+		    return 1;
+		}
+		add_sync (nextsync, synclen);
+		p = "";		       /* force to next argument */
+		break;
+	    case 'p':		       /* preferred vendor */
+		v = p[1] ? p+1 : --argc ? *++argv : NULL;
+		if (!v) {
+		    fprintf(stderr, "%s: `-p' requires an argument\n", pname);
+		    return 1;
+		}
+		if ( !strcmp(v, "intel") ) {
+		  prefer = 0;	/* Default */
+		} else if ( !strcmp(v, "amd") ) {
+		  prefer = IF_AMD|IF_3DNOW;
+		} else if ( !strcmp(v, "cyrix") ) {
+		  prefer = IF_CYRIX|IF_3DNOW;
+		} else if ( !strcmp(v, "idt") || !strcmp(v, "centaur") ||
+			    !strcmp(v, "winchip") ) {
+		  prefer = IF_3DNOW;
+		} else {
+		  fprintf(stderr, "%s: unknown vendor `%s' specified with `-p'\n", pname, v);
+		  return 1;
+		}
+		p = "";		       /* force to next argument */
+		break;
+	    default:							/*bf*/
+		fprintf(stderr, "%s: unrecognised option `-%c'\n",
+			pname, *p);
+		return 1;
+	    }
+	} else if (!filename) {
+	    filename = p;
+	} else {
+	    fprintf(stderr, "%s: more than one filename specified\n", pname);
+	    return 1;
+	}
+    }
+
+    if (!filename) {
+	fprintf(stderr, help, pname);
+	return 0;
+    }
+
+    if (strcmp(filename, "-")) {
+	fp = fopen(filename, "rb");
+	if (!fp) {
+	    fprintf(stderr, "%s: unable to open `%s': %s\n",
+		    pname, filename, strerror(errno));
+	    return 1;
+	}
+    } else
+	fp = stdin;
+
+    if (initskip > 0)
+	skip (initskip, fp);
+
+    /*
+     * This main loop is really horrible, and wants rewriting with
+     * an axe. It'll stay the way it is for a while though, until I
+     * find the energy...
+     */
+
+    p = q = buffer;
+    nextsync = next_sync (offset, &synclen);
+    do {
+	unsigned long to_read = buffer+sizeof(buffer)-p;
+	if (to_read > nextsync-offset-(p-q))
+	    to_read = nextsync-offset-(p-q);
+	if (to_read) {
+	    lenread = fread (p, 1, to_read, fp);
+	    if (lenread == 0)
+		eof = TRUE;	       /* help along systems with bad feof */
+	} else
+	    lenread = 0;
+	p += lenread;
+	if ((unsigned long)offset == nextsync) {
+	    if (synclen) {
+		fprintf(stdout, "%08lX  skipping 0x%lX bytes\n", offset, synclen);
+		offset += synclen;
+		skip (synclen, fp);
+	    }
+	    p = q = buffer;
+	    nextsync = next_sync (offset, &synclen);
+	}
+	while (p > q && (p - q >= INSN_MAX || lenread == 0)) {
+	    lendis = disasm (q, outbuf, bits, offset, autosync, prefer);
+	    if (!lendis || lendis > (p - q) ||
+		(unsigned long)lendis > nextsync-offset)
+		lendis = eatbyte (q, outbuf);
+	    output_ins (offset, q, lendis, outbuf);
+	    q += lendis;
+	    offset += lendis;
+	}
+	if (q >= buffer+INSN_MAX) {
+	    unsigned char *r = buffer, *s = q;
+	    int count = p - q;
+	    while (count--)
+		*r++ = *s++;
+	    p -= (q - buffer);
+	    q = buffer;
+	}
+    } while (lenread > 0 || !(eof || feof(fp)));
+
+    if (fp != stdin)
+	fclose (fp);
+
+    return 0;
+}
+
+static void output_ins (unsigned long offset, unsigned char *data,
+			int datalen, char *insn)
+{
+    int bytes;
+    fprintf(stdout, "%08lX  ", offset);
+
+    bytes = 0;
+    while (datalen > 0 && bytes < BPL) {
+	fprintf(stdout, "%02X", *data++);
+	bytes++;
+	datalen--;
+    }
+
+    fprintf(stdout, "%*s%s\n", (BPL+1-bytes)*2, "", insn);
+
+    while (datalen > 0) {
+	fprintf(stdout, "         -");
+	bytes = 0;
+	while (datalen > 0 && bytes < BPL) {
+	    fprintf(stdout, "%02X", *data++);
+	    bytes++;
+	    datalen--;
+	}
+	fprintf(stdout, "\n");
+    }
+}
+
+/*
+ * Skip a certain amount of data in a file, either by seeking if
+ * possible, or if that fails then by reading and discarding.
+ */
+static void skip (unsigned long dist, FILE *fp)
+{
+    char buffer[256];		       /* should fit on most stacks :-) */
+
+    /*
+     * Got to be careful with fseek: at least one fseek I've tried
+     * doesn't approve of SEEK_CUR. So I'll use SEEK_SET and
+     * ftell... horrible but apparently necessary.
+     */
+    if (fseek (fp, dist+ftell(fp), SEEK_SET)) {
+	while (dist > 0) {
+	    unsigned long len = (dist < sizeof(buffer) ?
+				 dist : sizeof(buffer));
+	    if (fread (buffer, 1, len, fp) < len) {
+		perror("fread");
+		exit(1);
+	    }
+	    dist -= len;
+	}
+    }
+}
diff --git a/uppsrc/plugin/ndisasm/lib/regdis.c b/uppsrc/plugin/ndisasm/lib/regdis.c
new file mode 100644
index 000000000..4e4e6ff1e
--- /dev/null
+++ b/uppsrc/plugin/ndisasm/lib/regdis.c
@@ -0,0 +1,11 @@
+/* automatically generated from ./regs.dat - do not edit */
+static const int creg    [] = {R_CR0,R_CR1,R_CR2,R_CR3,R_CR4,R_CR5,R_CR6,R_CR7};
+static const int dreg    [] = {R_DR0,R_DR1,R_DR2,R_DR3,R_DR4,R_DR5,R_DR6,R_DR7};
+static const int fpureg  [] = {R_ST0,R_ST1,R_ST2,R_ST3,R_ST4,R_ST5,R_ST6,R_ST7};
+static const int mmxreg  [] = {R_MM0,R_MM1,R_MM2,R_MM3,R_MM4,R_MM5,R_MM6,R_MM7};
+static const int reg16   [] = {R_AX,R_CX,R_DX,R_BX,R_SP,R_BP,R_SI,R_DI};
+static const int reg32   [] = {R_EAX,R_ECX,R_EDX,R_EBX,R_ESP,R_EBP,R_ESI,R_EDI};
+static const int reg8    [] = {R_AL,R_CL,R_DL,R_BL,R_AH,R_CH,R_DH,R_BH};
+static const int sreg    [] = {R_ES,R_CS,R_SS,R_DS,R_FS,R_GS,R_SEGR6,R_SEGR7};
+static const int treg    [] = {R_TR0,R_TR1,R_TR2,R_TR3,R_TR4,R_TR5,R_TR6,R_TR7};
+static const int xmmreg  [] = {R_XMM0,R_XMM1,R_XMM2,R_XMM3,R_XMM4,R_XMM5,R_XMM6,R_XMM7};
diff --git a/uppsrc/plugin/ndisasm/lib/regs.c b/uppsrc/plugin/ndisasm/lib/regs.c
new file mode 100644
index 000000000..9ef48ec22
--- /dev/null
+++ b/uppsrc/plugin/ndisasm/lib/regs.c
@@ -0,0 +1,83 @@
+/* automatically generated from ./regs.dat - do not edit */
+static const char *reg_names[] = {
+    "ah",
+    "al",
+    "ax",
+    "bh",
+    "bl",
+    "bp",
+    "bx",
+    "ch",
+    "cl",
+    "cr0",
+    "cr1",
+    "cr2",
+    "cr3",
+    "cr4",
+    "cr5",
+    "cr6",
+    "cr7",
+    "cs",
+    "cx",
+    "dh",
+    "di",
+    "dl",
+    "dr0",
+    "dr1",
+    "dr2",
+    "dr3",
+    "dr4",
+    "dr5",
+    "dr6",
+    "dr7",
+    "ds",
+    "dx",
+    "eax",
+    "ebp",
+    "ebx",
+    "ecx",
+    "edi",
+    "edx",
+    "es",
+    "esi",
+    "esp",
+    "fs",
+    "gs",
+    "mm0",
+    "mm1",
+    "mm2",
+    "mm3",
+    "mm4",
+    "mm5",
+    "mm6",
+    "mm7",
+    "segr6",
+    "segr7",
+    "si",
+    "sp",
+    "ss",
+    "st0",
+    "st1",
+    "st2",
+    "st3",
+    "st4",
+    "st5",
+    "st6",
+    "st7",
+    "tr0",
+    "tr1",
+    "tr2",
+    "tr3",
+    "tr4",
+    "tr5",
+    "tr6",
+    "tr7",
+    "xmm0",
+    "xmm1",
+    "xmm2",
+    "xmm3",
+    "xmm4",
+    "xmm5",
+    "xmm6",
+    "xmm7"
+};
diff --git a/uppsrc/plugin/ndisasm/lib/regs.h b/uppsrc/plugin/ndisasm/lib/regs.h
new file mode 100644
index 000000000..a4c9e5b8f
--- /dev/null
+++ b/uppsrc/plugin/ndisasm/lib/regs.h
@@ -0,0 +1,84 @@
+/* automatically generated from ./regs.dat - do not edit */
+enum reg_enum {
+    R_AH = EXPR_REG_START,
+    R_AL,
+    R_AX,
+    R_BH,
+    R_BL,
+    R_BP,
+    R_BX,
+    R_CH,
+    R_CL,
+    R_CR0,
+    R_CR1,
+    R_CR2,
+    R_CR3,
+    R_CR4,
+    R_CR5,
+    R_CR6,
+    R_CR7,
+    R_CS,
+    R_CX,
+    R_DH,
+    R_DI,
+    R_DL,
+    R_DR0,
+    R_DR1,
+    R_DR2,
+    R_DR3,
+    R_DR4,
+    R_DR5,
+    R_DR6,
+    R_DR7,
+    R_DS,
+    R_DX,
+    R_EAX,
+    R_EBP,
+    R_EBX,
+    R_ECX,
+    R_EDI,
+    R_EDX,
+    R_ES,
+    R_ESI,
+    R_ESP,
+    R_FS,
+    R_GS,
+    R_MM0,
+    R_MM1,
+    R_MM2,
+    R_MM3,
+    R_MM4,
+    R_MM5,
+    R_MM6,
+    R_MM7,
+    R_SEGR6,
+    R_SEGR7,
+    R_SI,
+    R_SP,
+    R_SS,
+    R_ST0,
+    R_ST1,
+    R_ST2,
+    R_ST3,
+    R_ST4,
+    R_ST5,
+    R_ST6,
+    R_ST7,
+    R_TR0,
+    R_TR1,
+    R_TR2,
+    R_TR3,
+    R_TR4,
+    R_TR5,
+    R_TR6,
+    R_TR7,
+    R_XMM0,
+    R_XMM1,
+    R_XMM2,
+    R_XMM3,
+    R_XMM4,
+    R_XMM5,
+    R_XMM6,
+    R_XMM7,
+    REG_ENUM_LIMIT
+};
diff --git a/uppsrc/plugin/ndisasm/lib/sync.c b/uppsrc/plugin/ndisasm/lib/sync.c
new file mode 100644
index 000000000..e7556f26d
--- /dev/null
+++ b/uppsrc/plugin/ndisasm/lib/sync.c
@@ -0,0 +1,112 @@
+/* sync.c   the Netwide Disassembler synchronisation processing module
+ *
+ * The Netwide Assembler is copyright (C) 1996 Simon Tatham and
+ * Julian Hall. All rights reserved. The software is
+ * redistributable under the licence given in the file "Licence"
+ * distributed in the NASM archive.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <limits.h>
+
+#include "sync.h"
+
+#define SYNC_MAX 4096		       /* max # of sync points */
+
+/*
+ * This lot manages the current set of sync points by means of a
+ * heap (priority queue) structure.
+ */
+
+static struct Sync {
+    unsigned long pos;
+    unsigned long length;
+} *synx;
+static int nsynx;
+
+void init_sync(void)
+{
+    /*
+     * I'd like to allocate an array of size SYNC_MAX, then write
+     * `synx--' which would allow numbering the array from one
+     * instead of zero without wasting memory. Sadly I don't trust
+     * this to work in 16-bit Large model, so it's staying the way
+     * it is. Btw, we don't care about freeing this array, since it
+     * has to last for the duration of the program and will then be
+     * auto-freed on exit. And I'm lazy ;-)
+     *
+     * Speaking of 16-bit Large model, that's also the reason I'm
+     * not declaring this array statically - by doing it
+     * dynamically I avoid problems with the total size of DGROUP
+     * in Borland C.
+     */
+    synx = malloc((SYNC_MAX+1) * sizeof(*synx));
+    if (!synx) {
+	fprintf(stderr, "ndisasm: not enough memory for sync array\n");
+	exit(1);
+    }
+    nsynx = 0;
+}
+
+void add_sync(unsigned long pos, unsigned long length)
+{
+    int i;
+
+    if (nsynx == SYNC_MAX)
+	return;			       /* can't do anything - overflow */
+
+    nsynx++;
+    synx[nsynx].pos = pos;
+    synx[nsynx].length = length;
+
+    for (i = nsynx; i > 1; i /= 2) {
+	if (synx[i/2].pos > synx[i].pos) {
+	    struct Sync t;
+	    t = synx[i/2];	       /* structure copy */
+	    synx[i/2] = synx[i];       /* structure copy again */
+	    synx[i] = t;	       /* another structure copy */
+	}
+    }
+}
+
+unsigned long next_sync(unsigned long position, unsigned long *length)
+{
+    while (nsynx > 0 && synx[1].pos + synx[1].length <= position) {
+	int i, j;
+	struct Sync t;
+	t = synx[nsynx];	       /* structure copy */
+	synx[nsynx] = synx[1];	       /* structure copy */
+	synx[1] = t;		       /* ditto */
+
+	nsynx--;
+
+        i = 1;
+	while (i*2 <= nsynx) {
+	    j = i*2;
+	    if (synx[j].pos < synx[i].pos &&
+		(j+1 > nsynx || synx[j+1].pos > synx[j].pos)) {
+		t = synx[j];	       /* structure copy */
+		synx[j] = synx[i];     /* lots of these... */
+		synx[i] = t;	       /* ...aren't there? */
+		i = j;
+	    } else if (j+1 <= nsynx && synx[j+1].pos < synx[i].pos) {
+		t = synx[j+1];	       /* structure copy */
+		synx[j+1] = synx[i];   /* structure <yawn> copy */
+		synx[i] = t;	       /* structure copy <zzzz....> */
+		i = j+1;
+	    } else
+		break;
+	}
+    }
+
+    if (nsynx > 0) {
+	if (length)
+	    *length = synx[1].length;
+	return synx[1].pos;
+    } else {
+	if (length)
+	    *length = 0L;
+	return ULONG_MAX;
+    }
+}
diff --git a/uppsrc/plugin/ndisasm/lib/sync.h b/uppsrc/plugin/ndisasm/lib/sync.h
new file mode 100644
index 000000000..ecb920113
--- /dev/null
+++ b/uppsrc/plugin/ndisasm/lib/sync.h
@@ -0,0 +1,16 @@
+/* sync.h   header file for sync.c
+ *
+ * The Netwide Assembler is copyright (C) 1996 Simon Tatham and
+ * Julian Hall. All rights reserved. The software is
+ * redistributable under the licence given in the file "Licence"
+ * distributed in the NASM archive.
+ */
+
+#ifndef NASM_SYNC_H
+#define NASM_SYNC_H
+
+void init_sync(void);
+void add_sync(unsigned long position, unsigned long length);
+unsigned long next_sync(unsigned long position, unsigned long *length);
+
+#endif
diff --git a/uppsrc/plugin/ndisasm/lib/version b/uppsrc/plugin/ndisasm/lib/version
new file mode 100644
index 000000000..bbd22ad1f
--- /dev/null
+++ b/uppsrc/plugin/ndisasm/lib/version
@@ -0,0 +1 @@
+0.98.38
diff --git a/uppsrc/plugin/ndisasm/lib/version.h b/uppsrc/plugin/ndisasm/lib/version.h
new file mode 100644
index 000000000..6464839d9
--- /dev/null
+++ b/uppsrc/plugin/ndisasm/lib/version.h
@@ -0,0 +1,9 @@
+#ifndef NASM_VERSION_H
+#define NASM_VERSION_H
+#define NASM_MAJOR_VER      0
+#define NASM_MINOR_VER      98
+#define NASM_SUBMINOR_VER   38
+#define NASM_PATCHLEVEL_VER 0
+#define NASM_VERSION_ID     0x00622600
+#define NASM_VER            "0.98.38"
+#endif /* NASM_VERSION_H */
diff --git a/uppsrc/plugin/ndisasm/ndisasm.h b/uppsrc/plugin/ndisasm/ndisasm.h
new file mode 100644
index 000000000..464cbc336
--- /dev/null
+++ b/uppsrc/plugin/ndisasm/ndisasm.h
@@ -0,0 +1,16 @@
+#ifndef _plugin_ndisasm_ndisasm_h_
+#define _plugin_ndisasm_ndisasm_h_
+
+NAMESPACE_UPP
+
+static const int NDISASM_INSN_MAX = 32;     // one instruction can't be longer than this
+static const int NDISASM_OUTBUF_SIZE = 256; // maximum length of disassembly output
+
+#ifdef CPU_32
+int NDisassemble(char *output, const byte *data, long offset); // returns instruction length
+#else
+int NDisassemble(char *output, const byte *data, int64 offset); // returns instruction length
+#endif
+END_UPP_NAMESPACE
+
+#endif
diff --git a/uppsrc/plugin/ndisasm/ndisasm.upp b/uppsrc/plugin/ndisasm/ndisasm.upp
new file mode 100644
index 000000000..26b8364dc
--- /dev/null
+++ b/uppsrc/plugin/ndisasm/ndisasm.upp
@@ -0,0 +1,25 @@
+description "Disassembler (GPL license - used in TheIDE)";
+
+uses
+	Core;
+
+file
+	ndisasm.h,
+	ndisupp.cpp,
+	lib/ndisasm readonly separator,
+	lib\disasm.c tabsize 8,
+	lib\disasm.h,
+	lib\insns.h,
+	lib\insnsd.c tabsize 8,
+	lib\insnsi.h,
+	lib\nasm.h,
+	lib\nasmlib.c tabsize 8,
+	lib\nasmlib.h,
+	lib\regs.c tabsize 8,
+	lib\regs.h,
+	lib\sync.c tabsize 8,
+	lib\sync.h,
+	lib\version.h,
+	lib\AUTHORS,
+	lib\COPYING;
+
diff --git a/uppsrc/plugin/ndisasm/ndisupp.cpp b/uppsrc/plugin/ndisasm/ndisupp.cpp
new file mode 100644
index 000000000..41b963eb3
--- /dev/null
+++ b/uppsrc/plugin/ndisasm/ndisupp.cpp
@@ -0,0 +1,37 @@
+#include <Core/Core.h>
+
+#include "ndisasm.h"
+
+extern "C" {
+#include "lib/disasm.h"
+}
+
+NAMESPACE_UPP
+#ifdef CPU_32
+int NDisassemble(char *output, const byte *data, long offset)// returns instruction length
+#else
+int NDisassemble(char *output, const byte *data, int64 offset)// returns instruction length
+#endif
+{
+	unsigned preferences = 0; // see lib/insns.h(84)
+	long len = (long)disasm(const_cast<unsigned char *>(data), output, 32, offset, false, preferences);
+	if(len <= 0) {
+		eatbyte(const_cast<unsigned char *>(data), output);
+		len = 1;
+	}
+	return (int)len;
+}
+
+#ifdef flagMAIN
+CONSOLE_APP_MAIN
+{
+	long start = 0x4012f8, end = start + 256;
+	while(start < end) {
+		char line[NDISASM_OUTBUF_SIZE];
+		start += NDisassemble(line, (const byte *)start, start);
+		puts(line);
+	}
+}
+#endif
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/plugin/pcre/Pcre.h b/uppsrc/plugin/pcre/Pcre.h
new file mode 100644
index 000000000..560a285f3
--- /dev/null
+++ b/uppsrc/plugin/pcre/Pcre.h
@@ -0,0 +1,13 @@
+#ifndef _plugin_pcre_pcre_h_
+#define _plugin_pcre_pcre_h_
+
+#include <Core/Core.h>
+#include "lib/pcre.h"
+
+NAMESPACE_UPP
+
+#include "RegExp.h"
+
+END_UPP_NAMESPACE
+
+#endif
diff --git a/uppsrc/plugin/pcre/RegExp.cpp b/uppsrc/plugin/pcre/RegExp.cpp
new file mode 100644
index 000000000..631794555
--- /dev/null
+++ b/uppsrc/plugin/pcre/RegExp.cpp
@@ -0,0 +1,148 @@
+#include "Pcre.h"
+
+
+NAMESPACE_UPP
+
+
+RegExp::RegExp(int options)
+{
+	Clear();
+	SetOptions(options);
+}
+
+RegExp::RegExp(const char * p, int options)
+{
+	Clear();
+	SetOptions(options);
+	SetPattern(p);
+}
+
+RegExp::RegExp(const String &p, int options)
+{
+	Clear();
+	SetOptions(options);
+	SetPattern(p);
+}
+
+RegExp::~RegExp()
+{
+	Clear(true);
+}
+
+void RegExp::Clear(bool freemem)
+{
+	if(freemem && cpattern)
+		pcre_free(cpattern);
+
+	first = false;
+	cpattern = NULL;
+	rc = 0;
+	compile_options = 0;
+	execute_options = 0;
+	error_code = 0;
+}
+
+void RegExp::SetOptions(int options)
+{
+	if(options & UNICODE)
+		compile_options |= UNICODE;
+	if(options & CASELESS)
+		compile_options |= CASELESS;
+	if(options & UNGREEDY)
+		compile_options |= UNGREEDY;
+	if(options & MULTILINE)
+		compile_options |= MULTILINE;
+	if(options & PARTIAL)
+		execute_options = PARTIAL;
+}
+
+void RegExp::SetPattern(const char * p)
+{
+	pattern = p;
+}
+
+void RegExp::SetPattern(const String &p)
+{
+	pattern = p;
+}
+
+bool RegExp::Compile(bool recompile)
+{
+	if(cpattern)
+	{
+		if(recompile)
+			pcre_free(cpattern);
+		else
+			return true;
+	}
+	cpattern = pcre_compile2(pattern, compile_options, &error_code, &error_string, &error_offset, NULL);
+	return error_code == 0;
+}
+
+int RegExp::Execute(const String &t, int offset)
+{
+	rc = pcre_exec(cpattern, NULL, t, t.GetLength(), offset, execute_options, pos, 30);
+	if(rc <= 0)
+		first = false;
+	return rc;
+}
+
+bool RegExp::Match(const String &t, bool copy)
+{
+	if(copy)
+		text = t;
+	if(!Compile())
+		return false;
+	return Execute(t) > 0;
+}
+
+bool RegExp::FastMatch(const String &t)
+{
+	return Match(t, false);
+}
+
+bool RegExp::GlobalMatch(const String &t)
+{
+	if(!first)
+	{
+		first = true;
+		return Match(t);
+	}
+	int offset = pos[1];
+	if(pos[0] == pos[1])
+	{
+		if(pos[0] == t.GetLength())
+		{
+			first = false;
+			return false;
+		}
+		execute_options |= PCRE_NOTEMPTY | PCRE_ANCHORED;
+	}
+	return Execute(t, offset) > 0;
+}
+
+String RegExp::operator[](const int i)
+{
+	return GetString(i);
+}
+
+int RegExp::GetCount()
+{
+	return rc - 1;
+}
+
+Vector<String> RegExp::GetStrings()
+{
+	Vector<String> subs;
+	for(int i = 0; i < GetCount(); i++)
+		subs.Add(GetString(i));
+	return subs;
+}
+
+String RegExp::GetString(int i)
+{
+	i = 2 * (i + 1);
+	return text.Mid(pos[i], pos[i + 1] - pos[i]);
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/plugin/pcre/RegExp.h b/uppsrc/plugin/pcre/RegExp.h
new file mode 100644
index 000000000..3a0b61866
--- /dev/null
+++ b/uppsrc/plugin/pcre/RegExp.h
@@ -0,0 +1,56 @@
+#ifndef _PcreTest_RegExp_h_
+#define _PcreTest_RegExp_h_
+
+//#include <Core/Core.h>
+
+class RegExp : public Moveable<RegExp> {
+public:
+	enum
+	{
+		PARTIAL   = PCRE_PARTIAL,
+		/* compile options */
+		UNICODE   = PCRE_UTF8,
+		CASELESS  = PCRE_CASELESS,
+		MULTILINE = PCRE_MULTILINE,
+		UNGREEDY  = PCRE_UNGREEDY
+	};
+
+private:
+	String pattern;
+	String text;
+	pcre * cpattern;
+	const char * error_string;
+	int error_offset;
+	int error_code;
+	int pos[30];
+	int rc;
+	bool first;
+	int compile_options;
+	int execute_options;
+
+public:
+	RegExp(int options = UNICODE);
+	RegExp(const char * p, int options = UNICODE);
+	RegExp(const String &p, int options = UNICODE);
+	~RegExp();
+
+	void Clear(bool freemem = false);
+	void SetOptions(int options);
+	void SetPattern(const char * p);
+	void SetPattern(const String &p);
+	bool Compile(bool recompile = false);
+	int  Execute(const String &t, int offset = 0);
+	bool Match(const String &t, bool copy = true);
+	bool FastMatch(const String &t);
+	bool GlobalMatch(const String &t);
+	String operator[](const int i);
+	int GetCount();
+	Vector<String> GetStrings();
+	String GetString(int i);
+
+	bool IsError() { return error_code != 0; }
+	const char * GetError() { return error_string; }
+	int GetErrorCode() { return error_code; }
+};
+
+#endif
diff --git a/uppsrc/plugin/pcre/lib/config.h b/uppsrc/plugin/pcre/lib/config.h
new file mode 100644
index 000000000..dc769f800
--- /dev/null
+++ b/uppsrc/plugin/pcre/lib/config.h
@@ -0,0 +1,309 @@
+/* config.h.  Generated from config.h.in by configure.  */
+/* config.h.in.  Generated from configure.ac by autoheader.  */
+
+
+/* On Unix-like systems config.h.in is converted by "configure" into config.h.
+Some other environments also support the use of "configure". PCRE is written in
+Standard C, but there are a few non-standard things it can cope with, allowing
+it to run on SunOS4 and other "close to standard" systems.
+
+If you are going to build PCRE "by hand" on a system without "configure" you
+should copy the distributed config.h.generic to config.h, and then set up the
+macro definitions the way you need them. You must then add -DHAVE_CONFIG_H to
+all of your compile commands, so that config.h is included at the start of
+every source.
+
+Alternatively, you can avoid editing by using -D on the compiler command line
+to set the macro values. In this case, you do not have to set -DHAVE_CONFIG_H.
+
+PCRE uses memmove() if HAVE_MEMMOVE is set to 1; otherwise it uses bcopy() if
+HAVE_BCOPY is set to 1. If your system has neither bcopy() nor memmove(), set
+them both to 0; an emulation function will be used. */
+
+/* By default, the \R escape sequence matches any Unicode line ending
+   character or sequence of characters. If BSR_ANYCRLF is defined, this is
+   changed so that backslash-R matches only CR, LF, or CRLF. The build- time
+   default can be overridden by the user of PCRE at runtime. On systems that
+   support it, "configure" can be used to override the default. */
+/* #undef BSR_ANYCRLF */
+
+/* If you are compiling for a system that uses EBCDIC instead of ASCII
+   character codes, define this macro as 1. On systems that can use
+   "configure", this can be done via --enable-ebcdic. */
+/* #undef EBCDIC */
+
+/* Define to 1 if you have the `bcopy' function. */
+#ifndef HAVE_BCOPY
+#define HAVE_BCOPY 1
+#endif
+
+/* Define to 1 if you have the <bits/type_traits.h> header file. */
+/* #undef HAVE_BITS_TYPE_TRAITS_H */
+
+/* Define to 1 if you have the <bzlib.h> header file. */
+#ifndef HAVE_BZLIB_H
+#define HAVE_BZLIB_H 1
+#endif
+
+/* Define to 1 if you have the <dirent.h> header file. */
+#ifndef HAVE_DIRENT_H
+#define HAVE_DIRENT_H 1
+#endif
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#ifndef HAVE_DLFCN_H
+#define HAVE_DLFCN_H 1
+#endif
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#ifndef HAVE_INTTYPES_H
+#define HAVE_INTTYPES_H 1
+#endif
+
+/* Define to 1 if you have the <limits.h> header file. */
+#ifndef HAVE_LIMITS_H
+#define HAVE_LIMITS_H 1
+#endif
+
+/* Define to 1 if the system has the type `long long'. */
+#ifndef HAVE_LONG_LONG
+#define HAVE_LONG_LONG 1
+#endif
+
+/* Define to 1 if you have the `memmove' function. */
+#ifndef HAVE_MEMMOVE
+#define HAVE_MEMMOVE 1
+#endif
+
+/* Define to 1 if you have the <memory.h> header file. */
+#ifndef HAVE_MEMORY_H
+#define HAVE_MEMORY_H 1
+#endif
+
+/* Define to 1 if you have the <readline/history.h> header file. */
+#ifndef HAVE_READLINE_HISTORY_H
+#define HAVE_READLINE_HISTORY_H 1
+#endif
+
+/* Define to 1 if you have the <readline/readline.h> header file. */
+#ifndef HAVE_READLINE_READLINE_H
+#define HAVE_READLINE_READLINE_H 1
+#endif
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#ifndef HAVE_STDINT_H
+#define HAVE_STDINT_H 1
+#endif
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#ifndef HAVE_STDLIB_H
+#define HAVE_STDLIB_H 1
+#endif
+
+/* Define to 1 if you have the `strerror' function. */
+#ifndef HAVE_STRERROR
+#define HAVE_STRERROR 1
+#endif
+
+/* Define to 1 if you have the <string> header file. */
+#ifndef HAVE_STRING
+#define HAVE_STRING 1
+#endif
+
+/* Define to 1 if you have the <strings.h> header file. */
+#ifndef HAVE_STRINGS_H
+#define HAVE_STRINGS_H 1
+#endif
+
+/* Define to 1 if you have the <string.h> header file. */
+#ifndef HAVE_STRING_H
+#define HAVE_STRING_H 1
+#endif
+
+/* Define to 1 if you have the `strtoll' function. */
+#ifndef HAVE_STRTOLL
+#define HAVE_STRTOLL 1
+#endif
+
+/* Define to 1 if you have the `strtoq' function. */
+#ifndef HAVE_STRTOQ
+#define HAVE_STRTOQ 1
+#endif
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#ifndef HAVE_SYS_STAT_H
+#define HAVE_SYS_STAT_H 1
+#endif
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#ifndef HAVE_SYS_TYPES_H
+#define HAVE_SYS_TYPES_H 1
+#endif
+
+/* Define to 1 if you have the <type_traits.h> header file. */
+/* #undef HAVE_TYPE_TRAITS_H */
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#ifndef HAVE_UNISTD_H
+#define HAVE_UNISTD_H 1
+#endif
+
+/* Define to 1 if the system has the type `unsigned long long'. */
+#ifndef HAVE_UNSIGNED_LONG_LONG
+#define HAVE_UNSIGNED_LONG_LONG 1
+#endif
+
+/* Define to 1 if you have the <windows.h> header file. */
+/* #undef HAVE_WINDOWS_H */
+
+/* Define to 1 if you have the <zlib.h> header file. */
+#ifndef HAVE_ZLIB_H
+#define HAVE_ZLIB_H 1
+#endif
+
+/* Define to 1 if you have the `_strtoi64' function. */
+/* #undef HAVE__STRTOI64 */
+
+/* The value of LINK_SIZE determines the number of bytes used to store links
+   as offsets within the compiled regex. The default is 2, which allows for
+   compiled patterns up to 64K long. This covers the vast majority of cases.
+   However, PCRE can also be compiled to use 3 or 4 bytes instead. This allows
+   for longer patterns in extreme cases. On systems that support it,
+   "configure" can be used to override this default. */
+#ifndef LINK_SIZE
+#define LINK_SIZE 2
+#endif
+
+/* The value of MATCH_LIMIT determines the default number of times the
+   internal match() function can be called during a single execution of
+   pcre_exec(). There is a runtime interface for setting a different limit.
+   The limit exists in order to catch runaway regular expressions that take
+   for ever to determine that they do not match. The default is set very large
+   so that it does not accidentally catch legitimate cases. On systems that
+   support it, "configure" can be used to override this default default. */
+#ifndef MATCH_LIMIT
+#define MATCH_LIMIT 10000000
+#endif
+
+/* The above limit applies to all calls of match(), whether or not they
+   increase the recursion depth. In some environments it is desirable to limit
+   the depth of recursive calls of match() more strictly, in order to restrict
+   the maximum amount of stack (or heap, if NO_RECURSE is defined) that is
+   used. The value of MATCH_LIMIT_RECURSION applies only to recursive calls of
+   match(). To have any useful effect, it must be less than the value of
+   MATCH_LIMIT. The default is to use the same value as MATCH_LIMIT. There is
+   a runtime method for setting a different limit. On systems that support it,
+   "configure" can be used to override the default. */
+#ifndef MATCH_LIMIT_RECURSION
+#define MATCH_LIMIT_RECURSION MATCH_LIMIT
+#endif
+
+/* This limit is parameterized just in case anybody ever wants to change it.
+   Care must be taken if it is increased, because it guards against integer
+   overflow caused by enormously large patterns. */
+#ifndef MAX_NAME_COUNT
+#define MAX_NAME_COUNT 10000
+#endif
+
+/* This limit is parameterized just in case anybody ever wants to change it.
+   Care must be taken if it is increased, because it guards against integer
+   overflow caused by enormously large patterns. */
+#ifndef MAX_NAME_SIZE
+#define MAX_NAME_SIZE 32
+#endif
+
+/* The value of NEWLINE determines the newline character sequence. On systems
+   that support it, "configure" can be used to override the default, which is
+   10. The possible values are 10 (LF), 13 (CR), 3338 (CRLF), -1 (ANY), or -2
+   (ANYCRLF). */
+#ifndef NEWLINE
+#define NEWLINE 10
+#endif
+
+/* PCRE uses recursive function calls to handle backtracking while matching.
+   This can sometimes be a problem on systems that have stacks of limited
+   size. Define NO_RECURSE to get a version that doesn't use recursion in the
+   match() function; instead it creates its own stack by steam using
+   pcre_recurse_malloc() to obtain memory from the heap. For more detail, see
+   the comments and other stuff just above the match() function. On systems
+   that support it, "configure" can be used to set this in the Makefile (use
+   --disable-stack-for-recursion). */
+/* #undef NO_RECURSE */
+
+/* Name of package */
+#define PACKAGE "pcre"
+
+/* Define to the address where bug reports for this package should be sent. */
+#define PACKAGE_BUGREPORT ""
+
+/* Define to the full name of this package. */
+#define PACKAGE_NAME "PCRE"
+
+/* Define to the full name and version of this package. */
+#define PACKAGE_STRING "PCRE 7.6"
+
+/* Define to the one symbol short name of this package. */
+#define PACKAGE_TARNAME "pcre"
+
+/* Define to the version of this package. */
+#define PACKAGE_VERSION "7.6"
+
+
+/* If you are compiling for a system other than a Unix-like system or
+   Win32, and it needs some magic to be inserted before the definition
+   of a function that is exported by the library, define this macro to
+   contain the relevant magic. If you do not define this macro, it
+   defaults to "extern" for a C compiler and "extern C" for a C++
+   compiler on non-Win32 systems. This macro apears at the start of
+   every exported function that is part of the external API. It does
+   not appear on functions that are "external" in the C sense, but
+   which are internal to the library. */
+/* #undef PCRE_EXP_DEFN */
+
+/* Define if linking statically (TODO: make nice with Libtool) */
+/* #undef PCRE_STATIC */
+
+/* When calling PCRE via the POSIX interface, additional working storage is
+   required for holding the pointers to capturing substrings because PCRE
+   requires three integers per substring, whereas the POSIX interface provides
+   only two. If the number of expected substrings is small, the wrapper
+   function uses space on the stack, because this is faster than using
+   malloc() for each call. The threshold above which the stack is no longer
+   used is defined by POSIX_MALLOC_THRESHOLD. On systems that support it,
+   "configure" can be used to override this default. */
+#ifndef POSIX_MALLOC_THRESHOLD
+#define POSIX_MALLOC_THRESHOLD 10
+#endif
+
+/* Define to 1 if you have the ANSI C header files. */
+#ifndef STDC_HEADERS
+#define STDC_HEADERS 1
+#endif
+
+/* Define to allow pcregrep to be linked with libbz2, so that it is able to
+   handle .bz2 files. */
+/* #undef SUPPORT_LIBBZ2 */
+
+/* Define to allow pcretest to be linked with libreadline. */
+/* #undef SUPPORT_LIBREADLINE */
+
+/* Define to allow pcregrep to be linked with libz, so that it is able to
+   handle .gz files. */
+/* #undef SUPPORT_LIBZ */
+
+/* Define to enable support for Unicode properties */
+/* #undef SUPPORT_UCP */
+
+/* Define to enable support for the UTF-8 Unicode encoding. */
+/* #undef SUPPORT_UTF8 */
+
+/* Version number of package */
+#ifndef VERSION
+#define VERSION "7.6"
+#endif
+
+/* Define to empty if `const' does not conform to ANSI C. */
+/* #undef const */
+
+/* Define to `unsigned int' if <sys/types.h> does not define. */
+/* #undef size_t */
diff --git a/uppsrc/plugin/pcre/lib/dftables.c b/uppsrc/plugin/pcre/lib/dftables.c
new file mode 100644
index 000000000..12e1af148
--- /dev/null
+++ b/uppsrc/plugin/pcre/lib/dftables.c
@@ -0,0 +1,199 @@
+/*************************************************
+*      Perl-Compatible Regular Expressions       *
+*************************************************/
+
+/* PCRE is a library of functions to support regular expressions whose syntax
+and semantics are as close as possible to those of the Perl 5 language.
+
+                       Written by Philip Hazel
+           Copyright (c) 1997-2008 University of Cambridge
+
+-----------------------------------------------------------------------------
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+
+    * Neither the name of the University of Cambridge nor the names of its
+      contributors may be used to endorse or promote products derived from
+      this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+-----------------------------------------------------------------------------
+*/
+
+
+/* This is a freestanding support program to generate a file containing
+character tables for PCRE. The tables are built according to the current
+locale. Now that pcre_maketables is a function visible to the outside world, we
+make use of its code from here in order to be consistent. */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <ctype.h>
+#include <stdio.h>
+#include <string.h>
+#include <locale.h>
+
+#include "pcre_internal.h"
+
+#define DFTABLES          /* pcre_maketables.c notices this */
+#include "pcre_maketables.c"
+
+
+int main(int argc, char **argv)
+{
+FILE *f;
+int i = 1;
+const unsigned char *tables;
+const unsigned char *base_of_tables;
+
+/* By default, the default C locale is used rather than what the building user
+happens to have set. However, if the -L option is given, set the locale from
+the LC_xxx environment variables. */
+
+if (argc > 1 && strcmp(argv[1], "-L") == 0)
+  {
+  setlocale(LC_ALL, "");        /* Set from environment variables */
+  i++;
+  }
+
+if (argc < i + 1)
+  {
+  fprintf(stderr, "dftables: one filename argument is required\n");
+  return 1;
+  }
+
+tables = pcre_maketables();
+base_of_tables = tables;
+
+f = fopen(argv[i], "wb");
+if (f == NULL)
+  {
+  fprintf(stderr, "dftables: failed to open %s for writing\n", argv[1]);
+  return 1;
+  }
+
+/* There are several fprintf() calls here, because gcc in pedantic mode
+complains about the very long string otherwise. */
+
+fprintf(f,
+  "/*************************************************\n"
+  "*      Perl-Compatible Regular Expressions       *\n"
+  "*************************************************/\n\n"
+  "/* This file was automatically written by the dftables auxiliary\n"
+  "program. It contains character tables that are used when no external\n"
+  "tables are passed to PCRE by the application that calls it. The tables\n"
+  "are used only for characters whose code values are less than 256.\n\n");
+fprintf(f,
+  "The following #includes are present because without them gcc 4.x may remove\n"
+  "the array definition from the final binary if PCRE is built into a static\n"
+  "library and dead code stripping is activated. This leads to link errors.\n"
+  "Pulling in the header ensures that the array gets flagged as \"someone\n"
+  "outside this compilation unit might reference this\" and so it will always\n"
+  "be supplied to the linker. */\n\n"
+  "#ifdef HAVE_CONFIG_H\n"
+  "#include \"config.h\"\n"
+  "#endif\n\n"
+  "#include \"pcre_internal.h\"\n\n");
+fprintf(f,
+  "const unsigned char _pcre_default_tables[] = {\n\n"
+  "/* This table is a lower casing table. */\n\n");
+
+fprintf(f, "  ");
+for (i = 0; i < 256; i++)
+  {
+  if ((i & 7) == 0 && i != 0) fprintf(f, "\n  ");
+  fprintf(f, "%3d", *tables++);
+  if (i != 255) fprintf(f, ",");
+  }
+fprintf(f, ",\n\n");
+
+fprintf(f, "/* This table is a case flipping table. */\n\n");
+
+fprintf(f, "  ");
+for (i = 0; i < 256; i++)
+  {
+  if ((i & 7) == 0 && i != 0) fprintf(f, "\n  ");
+  fprintf(f, "%3d", *tables++);
+  if (i != 255) fprintf(f, ",");
+  }
+fprintf(f, ",\n\n");
+
+fprintf(f,
+  "/* This table contains bit maps for various character classes.\n"
+  "Each map is 32 bytes long and the bits run from the least\n"
+  "significant end of each byte. The classes that have their own\n"
+  "maps are: space, xdigit, digit, upper, lower, word, graph\n"
+  "print, punct, and cntrl. Other classes are built from combinations. */\n\n");
+
+fprintf(f, "  ");
+for (i = 0; i < cbit_length; i++)
+  {
+  if ((i & 7) == 0 && i != 0)
+    {
+    if ((i & 31) == 0) fprintf(f, "\n");
+    fprintf(f, "\n  ");
+    }
+  fprintf(f, "0x%02x", *tables++);
+  if (i != cbit_length - 1) fprintf(f, ",");
+  }
+fprintf(f, ",\n\n");
+
+fprintf(f,
+  "/* This table identifies various classes of character by individual bits:\n"
+  "  0x%02x   white space character\n"
+  "  0x%02x   letter\n"
+  "  0x%02x   decimal digit\n"
+  "  0x%02x   hexadecimal digit\n"
+  "  0x%02x   alphanumeric or '_'\n"
+  "  0x%02x   regular expression metacharacter or binary zero\n*/\n\n",
+  ctype_space, ctype_letter, ctype_digit, ctype_xdigit, ctype_word,
+  ctype_meta);
+
+fprintf(f, "  ");
+for (i = 0; i < 256; i++)
+  {
+  if ((i & 7) == 0 && i != 0)
+    {
+    fprintf(f, " /* ");
+    if (isprint(i-8)) fprintf(f, " %c -", i-8);
+      else fprintf(f, "%3d-", i-8);
+    if (isprint(i-1)) fprintf(f, " %c ", i-1);
+      else fprintf(f, "%3d", i-1);
+    fprintf(f, " */\n  ");
+    }
+  fprintf(f, "0x%02x", *tables++);
+  if (i != 255) fprintf(f, ",");
+  }
+
+fprintf(f, "};/* ");
+if (isprint(i-8)) fprintf(f, " %c -", i-8);
+  else fprintf(f, "%3d-", i-8);
+if (isprint(i-1)) fprintf(f, " %c ", i-1);
+  else fprintf(f, "%3d", i-1);
+fprintf(f, " */\n\n/* End of pcre_chartables.c */\n");
+
+fclose(f);
+free((void *)base_of_tables);
+return 0;
+}
+
+/* End of dftables.c */
diff --git a/uppsrc/plugin/pcre/lib/make_tables.bat b/uppsrc/plugin/pcre/lib/make_tables.bat
new file mode 100644
index 000000000..0b40c6d84
--- /dev/null
+++ b/uppsrc/plugin/pcre/lib/make_tables.bat
@@ -0,0 +1,2 @@
+cl -DSUPPORT_UTF8 -DSUPPORT_UCP -DHAVE_CONFIG_H dftables.c
+dftables.exe pcre_chartables.c
diff --git a/uppsrc/plugin/pcre/lib/pcre.h b/uppsrc/plugin/pcre/lib/pcre.h
new file mode 100644
index 000000000..b082d0c40
--- /dev/null
+++ b/uppsrc/plugin/pcre/lib/pcre.h
@@ -0,0 +1,303 @@
+/*************************************************
+*       Perl-Compatible Regular Expressions      *
+*************************************************/
+
+/* This is the public header file for the PCRE library, to be #included by
+applications that call the PCRE functions.
+
+           Copyright (c) 1997-2008 University of Cambridge
+
+-----------------------------------------------------------------------------
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+
+    * Neither the name of the University of Cambridge nor the names of its
+      contributors may be used to endorse or promote products derived from
+      this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+-----------------------------------------------------------------------------
+*/
+
+#ifndef _PCRE_H
+#define _PCRE_H
+
+/* The current PCRE version information. */
+
+#define PCRE_MAJOR          7
+#define PCRE_MINOR          6
+#define PCRE_PRERELEASE
+#define PCRE_DATE           2008-01-28
+
+/* When an application links to a PCRE DLL in Windows, the symbols that are
+imported have to be identified as such. When building PCRE, the appropriate
+export setting is defined in pcre_internal.h, which includes this file. So we
+don't change existing definitions of PCRE_EXP_DECL and PCRECPP_EXP_DECL. */
+
+#if defined(_WIN32) && !defined(PCRE_STATIC)
+#  ifndef PCRE_EXP_DECL
+#    define PCRE_EXP_DECL  extern __declspec(dllimport)
+#  endif
+#  ifdef __cplusplus
+#    ifndef PCRECPP_EXP_DECL
+#      define PCRECPP_EXP_DECL  extern __declspec(dllimport)
+#    endif
+#    ifndef PCRECPP_EXP_DEFN
+#      define PCRECPP_EXP_DEFN  __declspec(dllimport)
+#    endif
+#  endif
+#endif
+
+/* By default, we use the standard "extern" declarations. */
+
+#ifndef PCRE_EXP_DECL
+#  ifdef __cplusplus
+#    define PCRE_EXP_DECL  extern "C"
+#  else
+#    define PCRE_EXP_DECL  extern
+#  endif
+#endif
+
+#ifdef __cplusplus
+#  ifndef PCRECPP_EXP_DECL
+#    define PCRECPP_EXP_DECL  extern
+#  endif
+#  ifndef PCRECPP_EXP_DEFN
+#    define PCRECPP_EXP_DEFN
+#  endif
+#endif
+
+/* Have to include stdlib.h in order to ensure that size_t is defined;
+it is needed here for malloc. */
+
+#include <stdlib.h>
+
+/* Allow for C++ users */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Options */
+
+#define PCRE_CASELESS           0x00000001
+#define PCRE_MULTILINE          0x00000002
+#define PCRE_DOTALL             0x00000004
+#define PCRE_EXTENDED           0x00000008
+#define PCRE_ANCHORED           0x00000010
+#define PCRE_DOLLAR_ENDONLY     0x00000020
+#define PCRE_EXTRA              0x00000040
+#define PCRE_NOTBOL             0x00000080
+#define PCRE_NOTEOL             0x00000100
+#define PCRE_UNGREEDY           0x00000200
+#define PCRE_NOTEMPTY           0x00000400
+#define PCRE_UTF8               0x00000800
+#define PCRE_NO_AUTO_CAPTURE    0x00001000
+#define PCRE_NO_UTF8_CHECK      0x00002000
+#define PCRE_AUTO_CALLOUT       0x00004000
+#define PCRE_PARTIAL            0x00008000
+#define PCRE_DFA_SHORTEST       0x00010000
+#define PCRE_DFA_RESTART        0x00020000
+#define PCRE_FIRSTLINE          0x00040000
+#define PCRE_DUPNAMES           0x00080000
+#define PCRE_NEWLINE_CR         0x00100000
+#define PCRE_NEWLINE_LF         0x00200000
+#define PCRE_NEWLINE_CRLF       0x00300000
+#define PCRE_NEWLINE_ANY        0x00400000
+#define PCRE_NEWLINE_ANYCRLF    0x00500000
+#define PCRE_BSR_ANYCRLF        0x00800000
+#define PCRE_BSR_UNICODE        0x01000000
+
+/* Exec-time and get/set-time error codes */
+
+#define PCRE_ERROR_NOMATCH         (-1)
+#define PCRE_ERROR_NULL            (-2)
+#define PCRE_ERROR_BADOPTION       (-3)
+#define PCRE_ERROR_BADMAGIC        (-4)
+#define PCRE_ERROR_UNKNOWN_OPCODE  (-5)
+#define PCRE_ERROR_UNKNOWN_NODE    (-5)  /* For backward compatibility */
+#define PCRE_ERROR_NOMEMORY        (-6)
+#define PCRE_ERROR_NOSUBSTRING     (-7)
+#define PCRE_ERROR_MATCHLIMIT      (-8)
+#define PCRE_ERROR_CALLOUT         (-9)  /* Never used by PCRE itself */
+#define PCRE_ERROR_BADUTF8        (-10)
+#define PCRE_ERROR_BADUTF8_OFFSET (-11)
+#define PCRE_ERROR_PARTIAL        (-12)
+#define PCRE_ERROR_BADPARTIAL     (-13)
+#define PCRE_ERROR_INTERNAL       (-14)
+#define PCRE_ERROR_BADCOUNT       (-15)
+#define PCRE_ERROR_DFA_UITEM      (-16)
+#define PCRE_ERROR_DFA_UCOND      (-17)
+#define PCRE_ERROR_DFA_UMLIMIT    (-18)
+#define PCRE_ERROR_DFA_WSSIZE     (-19)
+#define PCRE_ERROR_DFA_RECURSE    (-20)
+#define PCRE_ERROR_RECURSIONLIMIT (-21)
+#define PCRE_ERROR_NULLWSLIMIT    (-22)  /* No longer actually used */
+#define PCRE_ERROR_BADNEWLINE     (-23)
+
+/* Request types for pcre_fullinfo() */
+
+#define PCRE_INFO_OPTIONS            0
+#define PCRE_INFO_SIZE               1
+#define PCRE_INFO_CAPTURECOUNT       2
+#define PCRE_INFO_BACKREFMAX         3
+#define PCRE_INFO_FIRSTBYTE          4
+#define PCRE_INFO_FIRSTCHAR          4  /* For backwards compatibility */
+#define PCRE_INFO_FIRSTTABLE         5
+#define PCRE_INFO_LASTLITERAL        6
+#define PCRE_INFO_NAMEENTRYSIZE      7
+#define PCRE_INFO_NAMECOUNT          8
+#define PCRE_INFO_NAMETABLE          9
+#define PCRE_INFO_STUDYSIZE         10
+#define PCRE_INFO_DEFAULT_TABLES    11
+#define PCRE_INFO_OKPARTIAL         12
+#define PCRE_INFO_JCHANGED          13
+#define PCRE_INFO_HASCRORLF         14
+
+/* Request types for pcre_config(). Do not re-arrange, in order to remain
+compatible. */
+
+#define PCRE_CONFIG_UTF8                    0
+#define PCRE_CONFIG_NEWLINE                 1
+#define PCRE_CONFIG_LINK_SIZE               2
+#define PCRE_CONFIG_POSIX_MALLOC_THRESHOLD  3
+#define PCRE_CONFIG_MATCH_LIMIT             4
+#define PCRE_CONFIG_STACKRECURSE            5
+#define PCRE_CONFIG_UNICODE_PROPERTIES      6
+#define PCRE_CONFIG_MATCH_LIMIT_RECURSION   7
+#define PCRE_CONFIG_BSR                     8
+
+/* Bit flags for the pcre_extra structure. Do not re-arrange or redefine
+these bits, just add new ones on the end, in order to remain compatible. */
+
+#define PCRE_EXTRA_STUDY_DATA             0x0001
+#define PCRE_EXTRA_MATCH_LIMIT            0x0002
+#define PCRE_EXTRA_CALLOUT_DATA           0x0004
+#define PCRE_EXTRA_TABLES                 0x0008
+#define PCRE_EXTRA_MATCH_LIMIT_RECURSION  0x0010
+
+/* Types */
+
+struct real_pcre;                 /* declaration; the definition is private  */
+typedef struct real_pcre pcre;
+
+/* When PCRE is compiled as a C++ library, the subject pointer type can be
+replaced with a custom type. For conventional use, the public interface is a
+const char *. */
+
+#ifndef PCRE_SPTR
+#define PCRE_SPTR const char *
+#endif
+
+/* The structure for passing additional data to pcre_exec(). This is defined in
+such as way as to be extensible. Always add new fields at the end, in order to
+remain compatible. */
+
+typedef struct pcre_extra {
+  unsigned long int flags;        /* Bits for which fields are set */
+  void *study_data;               /* Opaque data from pcre_study() */
+  unsigned long int match_limit;  /* Maximum number of calls to match() */
+  void *callout_data;             /* Data passed back in callouts */
+  const unsigned char *tables;    /* Pointer to character tables */
+  unsigned long int match_limit_recursion; /* Max recursive calls to match() */
+} pcre_extra;
+
+/* The structure for passing out data via the pcre_callout_function. We use a
+structure so that new fields can be added on the end in future versions,
+without changing the API of the function, thereby allowing old clients to work
+without modification. */
+
+typedef struct pcre_callout_block {
+  int          version;           /* Identifies version of block */
+  /* ------------------------ Version 0 ------------------------------- */
+  int          callout_number;    /* Number compiled into pattern */
+  int         *offset_vector;     /* The offset vector */
+  PCRE_SPTR    subject;           /* The subject being matched */
+  int          subject_length;    /* The length of the subject */
+  int          start_match;       /* Offset to start of this match attempt */
+  int          current_position;  /* Where we currently are in the subject */
+  int          capture_top;       /* Max current capture */
+  int          capture_last;      /* Most recently closed capture */
+  void        *callout_data;      /* Data passed in with the call */
+  /* ------------------- Added for Version 1 -------------------------- */
+  int          pattern_position;  /* Offset to next item in the pattern */
+  int          next_item_length;  /* Length of next item in the pattern */
+  /* ------------------------------------------------------------------ */
+} pcre_callout_block;
+
+/* Indirection for store get and free functions. These can be set to
+alternative malloc/free functions if required. Special ones are used in the
+non-recursive case for "frames". There is also an optional callout function
+that is triggered by the (?) regex item. For Virtual Pascal, these definitions
+have to take another form. */
+
+#ifndef VPCOMPAT
+PCRE_EXP_DECL void *(*pcre_malloc)(size_t);
+PCRE_EXP_DECL void  (*pcre_free)(void *);
+PCRE_EXP_DECL void *(*pcre_stack_malloc)(size_t);
+PCRE_EXP_DECL void  (*pcre_stack_free)(void *);
+PCRE_EXP_DECL int   (*pcre_callout)(pcre_callout_block *);
+#else   /* VPCOMPAT */
+PCRE_EXP_DECL void *pcre_malloc(size_t);
+PCRE_EXP_DECL void  pcre_free(void *);
+PCRE_EXP_DECL void *pcre_stack_malloc(size_t);
+PCRE_EXP_DECL void  pcre_stack_free(void *);
+PCRE_EXP_DECL int   pcre_callout(pcre_callout_block *);
+#endif  /* VPCOMPAT */
+
+/* Exported PCRE functions */
+
+PCRE_EXP_DECL pcre *pcre_compile(const char *, int, const char **, int *,
+                  const unsigned char *);
+PCRE_EXP_DECL pcre *pcre_compile2(const char *, int, int *, const char **,
+                  int *, const unsigned char *);
+PCRE_EXP_DECL int  pcre_config(int, void *);
+PCRE_EXP_DECL int  pcre_copy_named_substring(const pcre *, const char *,
+                  int *, int, const char *, char *, int);
+PCRE_EXP_DECL int  pcre_copy_substring(const char *, int *, int, int, char *,
+                  int);
+PCRE_EXP_DECL int  pcre_dfa_exec(const pcre *, const pcre_extra *,
+                  const char *, int, int, int, int *, int , int *, int);
+PCRE_EXP_DECL int  pcre_exec(const pcre *, const pcre_extra *, PCRE_SPTR,
+                   int, int, int, int *, int);
+PCRE_EXP_DECL void pcre_free_substring(const char *);
+PCRE_EXP_DECL void pcre_free_substring_list(const char **);
+PCRE_EXP_DECL int  pcre_fullinfo(const pcre *, const pcre_extra *, int,
+                  void *);
+PCRE_EXP_DECL int  pcre_get_named_substring(const pcre *, const char *,
+                  int *, int, const char *, const char **);
+PCRE_EXP_DECL int  pcre_get_stringnumber(const pcre *, const char *);
+PCRE_EXP_DECL int  pcre_get_stringtable_entries(const pcre *, const char *,
+                  char **, char **);
+PCRE_EXP_DECL int  pcre_get_substring(const char *, int *, int, int,
+                  const char **);
+PCRE_EXP_DECL int  pcre_get_substring_list(const char *, int *, int,
+                  const char ***);
+PCRE_EXP_DECL int  pcre_info(const pcre *, int *, int *);
+PCRE_EXP_DECL const unsigned char *pcre_maketables(void);
+PCRE_EXP_DECL int  pcre_refcount(pcre *, int);
+PCRE_EXP_DECL pcre_extra *pcre_study(const pcre *, int, const char **);
+PCRE_EXP_DECL const char *pcre_version(void);
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#endif /* End of pcre.h */
diff --git a/uppsrc/plugin/pcre/lib/pcre_chartables.c b/uppsrc/plugin/pcre/lib/pcre_chartables.c
new file mode 100644
index 000000000..36a7959ef
--- /dev/null
+++ b/uppsrc/plugin/pcre/lib/pcre_chartables.c
@@ -0,0 +1,193 @@
+/*************************************************
+*      Perl-Compatible Regular Expressions       *
+*************************************************/
+
+/* This file was automatically written by the dftables auxiliary
+program. It contains character tables that are used when no external
+tables are passed to PCRE by the application that calls it. The tables
+are used only for characters whose code values are less than 256.
+
+The following #includes are present because without them gcc 4.x may remove
+the array definition from the final binary if PCRE is built into a static
+library and dead code stripping is activated. This leads to link errors.
+Pulling in the header ensures that the array gets flagged as "someone
+outside this compilation unit might reference this" and so it will always
+be supplied to the linker. */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "pcre_internal.h"
+
+const unsigned char _pcre_default_tables[] = {
+
+/* This table is a lower casing table. */
+
+    0,  1,  2,  3,  4,  5,  6,  7,
+    8,  9, 10, 11, 12, 13, 14, 15,
+   16, 17, 18, 19, 20, 21, 22, 23,
+   24, 25, 26, 27, 28, 29, 30, 31,
+   32, 33, 34, 35, 36, 37, 38, 39,
+   40, 41, 42, 43, 44, 45, 46, 47,
+   48, 49, 50, 51, 52, 53, 54, 55,
+   56, 57, 58, 59, 60, 61, 62, 63,
+   64, 97, 98, 99,100,101,102,103,
+  104,105,106,107,108,109,110,111,
+  112,113,114,115,116,117,118,119,
+  120,121,122, 91, 92, 93, 94, 95,
+   96, 97, 98, 99,100,101,102,103,
+  104,105,106,107,108,109,110,111,
+  112,113,114,115,116,117,118,119,
+  120,121,122,123,124,125,126,127,
+  128,129,130,131,132,133,134,135,
+  136,137,138,139,140,141,142,143,
+  144,145,146,147,148,149,150,151,
+  152,153,154,155,156,157,158,159,
+  160,161,162,163,164,165,166,167,
+  168,169,170,171,172,173,174,175,
+  176,177,178,179,180,181,182,183,
+  184,185,186,187,188,189,190,191,
+  192,193,194,195,196,197,198,199,
+  200,201,202,203,204,205,206,207,
+  208,209,210,211,212,213,214,215,
+  216,217,218,219,220,221,222,223,
+  224,225,226,227,228,229,230,231,
+  232,233,234,235,236,237,238,239,
+  240,241,242,243,244,245,246,247,
+  248,249,250,251,252,253,254,255,
+
+/* This table is a case flipping table. */
+
+    0,  1,  2,  3,  4,  5,  6,  7,
+    8,  9, 10, 11, 12, 13, 14, 15,
+   16, 17, 18, 19, 20, 21, 22, 23,
+   24, 25, 26, 27, 28, 29, 30, 31,
+   32, 33, 34, 35, 36, 37, 38, 39,
+   40, 41, 42, 43, 44, 45, 46, 47,
+   48, 49, 50, 51, 52, 53, 54, 55,
+   56, 57, 58, 59, 60, 61, 62, 63,
+   64, 97, 98, 99,100,101,102,103,
+  104,105,106,107,108,109,110,111,
+  112,113,114,115,116,117,118,119,
+  120,121,122, 91, 92, 93, 94, 95,
+   96, 65, 66, 67, 68, 69, 70, 71,
+   72, 73, 74, 75, 76, 77, 78, 79,
+   80, 81, 82, 83, 84, 85, 86, 87,
+   88, 89, 90,123,124,125,126,127,
+  128,129,130,131,132,133,134,135,
+  136,137,138,139,140,141,142,143,
+  144,145,146,147,148,149,150,151,
+  152,153,154,155,156,157,158,159,
+  160,161,162,163,164,165,166,167,
+  168,169,170,171,172,173,174,175,
+  176,177,178,179,180,181,182,183,
+  184,185,186,187,188,189,190,191,
+  192,193,194,195,196,197,198,199,
+  200,201,202,203,204,205,206,207,
+  208,209,210,211,212,213,214,215,
+  216,217,218,219,220,221,222,223,
+  224,225,226,227,228,229,230,231,
+  232,233,234,235,236,237,238,239,
+  240,241,242,243,244,245,246,247,
+  248,249,250,251,252,253,254,255,
+
+/* This table contains bit maps for various character classes.
+Each map is 32 bytes long and the bits run from the least
+significant end of each byte. The classes that have their own
+maps are: space, xdigit, digit, upper, lower, word, graph
+print, punct, and cntrl. Other classes are built from combinations. */
+
+  0x00,0x3e,0x00,0x00,0x01,0x00,0x00,0x00,
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+  0x00,0x00,0x00,0x00,0x00,0x00,0xff,0x03,
+  0x7e,0x00,0x00,0x00,0x7e,0x00,0x00,0x00,
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+  0x00,0x00,0x00,0x00,0x00,0x00,0xff,0x03,
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+  0xfe,0xff,0xff,0x07,0x00,0x00,0x00,0x00,
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+  0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0x07,
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+  0x00,0x00,0x00,0x00,0x00,0x00,0xff,0x03,
+  0xfe,0xff,0xff,0x87,0xfe,0xff,0xff,0x07,
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+  0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,
+  0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x7f,
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+  0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,
+  0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x7f,
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+  0x00,0x00,0x00,0x00,0xfe,0xff,0x00,0xfc,
+  0x01,0x00,0x00,0xf8,0x01,0x00,0x00,0x78,
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+  0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+/* This table identifies various classes of character by individual bits:
+  0x01   white space character
+  0x02   letter
+  0x04   decimal digit
+  0x08   hexadecimal digit
+  0x10   alphanumeric or '_'
+  0x80   regular expression metacharacter or binary zero
+*/
+
+  0x80,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*   0-  7 */
+  0x00,0x01,0x01,0x00,0x01,0x01,0x00,0x00, /*   8- 15 */
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  16- 23 */
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  24- 31 */
+  0x01,0x00,0x00,0x00,0x80,0x00,0x00,0x00, /*    - '  */
+  0x80,0x80,0x80,0x80,0x00,0x00,0x80,0x00, /*  ( - /  */
+  0x1c,0x1c,0x1c,0x1c,0x1c,0x1c,0x1c,0x1c, /*  0 - 7  */
+  0x1c,0x1c,0x00,0x00,0x00,0x00,0x00,0x80, /*  8 - ?  */
+  0x00,0x1a,0x1a,0x1a,0x1a,0x1a,0x1a,0x12, /*  @ - G  */
+  0x12,0x12,0x12,0x12,0x12,0x12,0x12,0x12, /*  H - O  */
+  0x12,0x12,0x12,0x12,0x12,0x12,0x12,0x12, /*  P - W  */
+  0x12,0x12,0x12,0x80,0x80,0x00,0x80,0x10, /*  X - _  */
+  0x00,0x1a,0x1a,0x1a,0x1a,0x1a,0x1a,0x12, /*  ` - g  */
+  0x12,0x12,0x12,0x12,0x12,0x12,0x12,0x12, /*  h - o  */
+  0x12,0x12,0x12,0x12,0x12,0x12,0x12,0x12, /*  p - w  */
+  0x12,0x12,0x12,0x80,0x80,0x00,0x00,0x00, /*  x -127 */
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 128-135 */
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 136-143 */
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 144-151 */
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 152-159 */
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 160-167 */
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 168-175 */
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 176-183 */
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 184-191 */
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 192-199 */
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 200-207 */
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 208-215 */
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 216-223 */
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 224-231 */
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 232-239 */
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 240-247 */
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};/* 248-255 */
+
+/* End of pcre_chartables.c */
diff --git a/uppsrc/plugin/pcre/lib/pcre_compile.c b/uppsrc/plugin/pcre/lib/pcre_compile.c
new file mode 100644
index 000000000..799f47cc9
--- /dev/null
+++ b/uppsrc/plugin/pcre/lib/pcre_compile.c
@@ -0,0 +1,6221 @@
+/*************************************************
+*      Perl-Compatible Regular Expressions       *
+*************************************************/
+
+/* PCRE is a library of functions to support regular expressions whose syntax
+and semantics are as close as possible to those of the Perl 5 language.
+
+                       Written by Philip Hazel
+           Copyright (c) 1997-2008 University of Cambridge
+
+-----------------------------------------------------------------------------
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+
+    * Neither the name of the University of Cambridge nor the names of its
+      contributors may be used to endorse or promote products derived from
+      this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+-----------------------------------------------------------------------------
+*/
+
+
+/* This module contains the external function pcre_compile(), along with
+supporting internal functions that are not used by other modules. */
+
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#define NLBLOCK cd             /* Block containing newline information */
+#define PSSTART start_pattern  /* Field containing processed string start */
+#define PSEND   end_pattern    /* Field containing processed string end */
+
+#include "pcre_internal.h"
+
+
+/* When DEBUG is defined, we need the pcre_printint() function, which is also
+used by pcretest. DEBUG is not defined when building a production library. */
+
+#ifdef DEBUG
+#include "pcre_printint.src"
+#endif
+
+
+/* Macro for setting individual bits in class bitmaps. */
+
+#define SETBIT(a,b) a[b/8] |= (1 << (b%8))
+
+/* Maximum length value to check against when making sure that the integer that
+holds the compiled pattern length does not overflow. We make it a bit less than
+INT_MAX to allow for adding in group terminating bytes, so that we don't have
+to check them every time. */
+
+#define OFLOW_MAX (INT_MAX - 20)
+
+
+/*************************************************
+*      Code parameters and static tables         *
+*************************************************/
+
+/* This value specifies the size of stack workspace that is used during the
+first pre-compile phase that determines how much memory is required. The regex
+is partly compiled into this space, but the compiled parts are discarded as
+soon as they can be, so that hopefully there will never be an overrun. The code
+does, however, check for an overrun. The largest amount I've seen used is 218,
+so this number is very generous.
+
+The same workspace is used during the second, actual compile phase for
+remembering forward references to groups so that they can be filled in at the
+end. Each entry in this list occupies LINK_SIZE bytes, so even when LINK_SIZE
+is 4 there is plenty of room. */
+
+#define COMPILE_WORK_SIZE (4096)
+
+
+/* Table for handling escaped characters in the range '0'-'z'. Positive returns
+are simple data values; negative values are for special things like \d and so
+on. Zero means further processing is needed (for things like \x), or the escape
+is invalid. */
+
+#ifndef EBCDIC  /* This is the "normal" table for ASCII systems */
+static const short int escapes[] = {
+     0,      0,      0,      0,      0,      0,      0,      0,   /* 0 - 7 */
+     0,      0,    ':',    ';',    '<',    '=',    '>',    '?',   /* 8 - ? */
+   '@', -ESC_A, -ESC_B, -ESC_C, -ESC_D, -ESC_E,      0, -ESC_G,   /* @ - G */
+-ESC_H,      0,      0, -ESC_K,      0,      0,      0,      0,   /* H - O */
+-ESC_P, -ESC_Q, -ESC_R, -ESC_S,      0,      0, -ESC_V, -ESC_W,   /* P - W */
+-ESC_X,      0, -ESC_Z,    '[',   '\\',    ']',    '^',    '_',   /* X - _ */
+   '`',      7, -ESC_b,      0, -ESC_d,  ESC_e,  ESC_f,      0,   /* ` - g */
+-ESC_h,      0,      0, -ESC_k,      0,      0,  ESC_n,      0,   /* h - o */
+-ESC_p,      0,  ESC_r, -ESC_s,  ESC_tee,    0, -ESC_v, -ESC_w,   /* p - w */
+     0,      0, -ESC_z                                            /* x - z */
+};
+
+#else           /* This is the "abnormal" table for EBCDIC systems */
+static const short int escapes[] = {
+/*  48 */     0,     0,      0,     '.',    '<',   '(',    '+',    '|',
+/*  50 */   '&',     0,      0,       0,      0,     0,      0,      0,
+/*  58 */     0,     0,    '!',     '$',    '*',   ')',    ';',    '~',
+/*  60 */   '-',   '/',      0,       0,      0,     0,      0,      0,
+/*  68 */     0,     0,    '|',     ',',    '%',   '_',    '>',    '?',
+/*  70 */     0,     0,      0,       0,      0,     0,      0,      0,
+/*  78 */     0,   '`',    ':',     '#',    '@',  '\'',    '=',    '"',
+/*  80 */     0,     7, -ESC_b,       0, -ESC_d, ESC_e,  ESC_f,      0,
+/*  88 */-ESC_h,     0,      0,     '{',      0,     0,      0,      0,
+/*  90 */     0,     0, -ESC_k,     'l',      0, ESC_n,      0, -ESC_p,
+/*  98 */     0, ESC_r,      0,     '}',      0,     0,      0,      0,
+/*  A0 */     0,   '~', -ESC_s, ESC_tee,      0,-ESC_v, -ESC_w,      0,
+/*  A8 */     0,-ESC_z,      0,       0,      0,   '[',      0,      0,
+/*  B0 */     0,     0,      0,       0,      0,     0,      0,      0,
+/*  B8 */     0,     0,      0,       0,      0,   ']',    '=',    '-',
+/*  C0 */   '{',-ESC_A, -ESC_B,  -ESC_C, -ESC_D,-ESC_E,      0, -ESC_G,
+/*  C8 */-ESC_H,     0,      0,       0,      0,     0,      0,      0,
+/*  D0 */   '}',     0, -ESC_K,       0,      0,     0,      0, -ESC_P,
+/*  D8 */-ESC_Q,-ESC_R,      0,       0,      0,     0,      0,      0,
+/*  E0 */  '\\',     0, -ESC_S,       0,      0,-ESC_V, -ESC_W, -ESC_X,
+/*  E8 */     0,-ESC_Z,      0,       0,      0,     0,      0,      0,
+/*  F0 */     0,     0,      0,       0,      0,     0,      0,      0,
+/*  F8 */     0,     0,      0,       0,      0,     0,      0,      0
+};
+#endif
+
+
+/* Table of special "verbs" like (*PRUNE). This is a short table, so it is
+searched linearly. Put all the names into a single string, in order to reduce
+the number of relocations when a shared library is dynamically linked. */
+
+typedef struct verbitem {
+  int   len;
+  int   op;
+} verbitem;
+
+static const char verbnames[] =
+  "ACCEPT\0"
+  "COMMIT\0"
+  "F\0"
+  "FAIL\0"
+  "PRUNE\0"
+  "SKIP\0"
+  "THEN";
+
+static verbitem verbs[] = {
+  { 6, OP_ACCEPT },
+  { 6, OP_COMMIT },
+  { 1, OP_FAIL },
+  { 4, OP_FAIL },
+  { 5, OP_PRUNE },
+  { 4, OP_SKIP  },
+  { 4, OP_THEN  }
+};
+
+static int verbcount = sizeof(verbs)/sizeof(verbitem);
+
+
+/* Tables of names of POSIX character classes and their lengths. The names are
+now all in a single string, to reduce the number of relocations when a shared
+library is dynamically loaded. The list of lengths is terminated by a zero
+length entry. The first three must be alpha, lower, upper, as this is assumed
+for handling case independence. */
+
+static const char posix_names[] =
+  "alpha\0"  "lower\0"  "upper\0"  "alnum\0"  "ascii\0"  "blank\0"
+  "cntrl\0"  "digit\0"  "graph\0"  "print\0"  "punct\0"  "space\0"
+  "word\0"   "xdigit";
+
+static const uschar posix_name_lengths[] = {
+  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 4, 6, 0 };
+
+/* Table of class bit maps for each POSIX class. Each class is formed from a
+base map, with an optional addition or removal of another map. Then, for some
+classes, there is some additional tweaking: for [:blank:] the vertical space
+characters are removed, and for [:alpha:] and [:alnum:] the underscore
+character is removed. The triples in the table consist of the base map offset,
+second map offset or -1 if no second map, and a non-negative value for map
+addition or a negative value for map subtraction (if there are two maps). The
+absolute value of the third field has these meanings: 0 => no tweaking, 1 =>
+remove vertical space characters, 2 => remove underscore. */
+
+static const int posix_class_maps[] = {
+  cbit_word,  cbit_digit, -2,             /* alpha */
+  cbit_lower, -1,          0,             /* lower */
+  cbit_upper, -1,          0,             /* upper */
+  cbit_word,  -1,          2,             /* alnum - word without underscore */
+  cbit_print, cbit_cntrl,  0,             /* ascii */
+  cbit_space, -1,          1,             /* blank - a GNU extension */
+  cbit_cntrl, -1,          0,             /* cntrl */
+  cbit_digit, -1,          0,             /* digit */
+  cbit_graph, -1,          0,             /* graph */
+  cbit_print, -1,          0,             /* print */
+  cbit_punct, -1,          0,             /* punct */
+  cbit_space, -1,          0,             /* space */
+  cbit_word,  -1,          0,             /* word - a Perl extension */
+  cbit_xdigit,-1,          0              /* xdigit */
+};
+
+
+#define STRING(a)  # a
+#define XSTRING(s) STRING(s)
+
+/* The texts of compile-time error messages. These are "char *" because they
+are passed to the outside world. Do not ever re-use any error number, because
+they are documented. Always add a new error instead. Messages marked DEAD below
+are no longer used. This used to be a table of strings, but in order to reduce
+the number of relocations needed when a shared library is loaded dynamically,
+it is now one long string. We cannot use a table of offsets, because the
+lengths of inserts such as XSTRING(MAX_NAME_SIZE) are not known. Instead, we
+simply count through to the one we want - this isn't a performance issue
+because these strings are used only when there is a compilation error. */
+
+static const char error_texts[] =
+  "no error\0"
+  "\\ at end of pattern\0"
+  "\\c at end of pattern\0"
+  "unrecognized character follows \\\0"
+  "numbers out of order in {} quantifier\0"
+  /* 5 */
+  "number too big in {} quantifier\0"
+  "missing terminating ] for character class\0"
+  "invalid escape sequence in character class\0"
+  "range out of order in character class\0"
+  "nothing to repeat\0"
+  /* 10 */
+  "operand of unlimited repeat could match the empty string\0"  /** DEAD **/
+  "internal error: unexpected repeat\0"
+  "unrecognized character after (? or (?-\0"
+  "POSIX named classes are supported only within a class\0"
+  "missing )\0"
+  /* 15 */
+  "reference to non-existent subpattern\0"
+  "erroffset passed as NULL\0"
+  "unknown option bit(s) set\0"
+  "missing ) after comment\0"
+  "parentheses nested too deeply\0"  /** DEAD **/
+  /* 20 */
+  "regular expression is too large\0"
+  "failed to get memory\0"
+  "unmatched parentheses\0"
+  "internal error: code overflow\0"
+  "unrecognized character after (?<\0"
+  /* 25 */
+  "lookbehind assertion is not fixed length\0"
+  "malformed number or name after (?(\0"
+  "conditional group contains more than two branches\0"
+  "assertion expected after (?(\0"
+  "(?R or (?[+-]digits must be followed by )\0"
+  /* 30 */
+  "unknown POSIX class name\0"
+  "POSIX collating elements are not supported\0"
+  "this version of PCRE is not compiled with PCRE_UTF8 support\0"
+  "spare error\0"  /** DEAD **/
+  "character value in \\x{...} sequence is too large\0"
+  /* 35 */
+  "invalid condition (?(0)\0"
+  "\\C not allowed in lookbehind assertion\0"
+  "PCRE does not support \\L, \\l, \\N, \\U, or \\u\0"
+  "number after (?C is > 255\0"
+  "closing ) for (?C expected\0"
+  /* 40 */
+  "recursive call could loop indefinitely\0"
+  "unrecognized character after (?P\0"
+  "syntax error in subpattern name (missing terminator)\0"
+  "two named subpatterns have the same name\0"
+  "invalid UTF-8 string\0"
+  /* 45 */
+  "support for \\P, \\p, and \\X has not been compiled\0"
+  "malformed \\P or \\p sequence\0"
+  "unknown property name after \\P or \\p\0"
+  "subpattern name is too long (maximum " XSTRING(MAX_NAME_SIZE) " characters)\0"
+  "too many named subpatterns (maximum " XSTRING(MAX_NAME_COUNT) ")\0"
+  /* 50 */
+  "repeated subpattern is too long\0"    /** DEAD **/
+  "octal value is greater than \\377 (not in UTF-8 mode)\0"
+  "internal error: overran compiling workspace\0"
+  "internal error: previously-checked referenced subpattern not found\0"
+  "DEFINE group contains more than one branch\0"
+  /* 55 */
+  "repeating a DEFINE group is not allowed\0"
+  "inconsistent NEWLINE options\0"
+  "\\g is not followed by a braced name or an optionally braced non-zero number\0"
+  "(?+ or (?- or (?(+ or (?(- must be followed by a non-zero number\0"
+  "(*VERB) with an argument is not supported\0"
+  /* 60 */
+  "(*VERB) not recognized\0"
+  "number is too big\0"
+  "subpattern name expected\0"
+  "digit expected after (?+";
+
+
+/* Table to identify digits and hex digits. This is used when compiling
+patterns. Note that the tables in chartables are dependent on the locale, and
+may mark arbitrary characters as digits - but the PCRE compiling code expects
+to handle only 0-9, a-z, and A-Z as digits when compiling. That is why we have
+a private table here. It costs 256 bytes, but it is a lot faster than doing
+character value tests (at least in some simple cases I timed), and in some
+applications one wants PCRE to compile efficiently as well as match
+efficiently.
+
+For convenience, we use the same bit definitions as in chartables:
+
+  0x04   decimal digit
+  0x08   hexadecimal digit
+
+Then we can use ctype_digit and ctype_xdigit in the code. */
+
+#ifndef EBCDIC  /* This is the "normal" case, for ASCII systems */
+static const unsigned char digitab[] =
+  {
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*   0-  7 */
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*   8- 15 */
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  16- 23 */
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  24- 31 */
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*    - '  */
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  ( - /  */
+  0x0c,0x0c,0x0c,0x0c,0x0c,0x0c,0x0c,0x0c, /*  0 - 7  */
+  0x0c,0x0c,0x00,0x00,0x00,0x00,0x00,0x00, /*  8 - ?  */
+  0x00,0x08,0x08,0x08,0x08,0x08,0x08,0x00, /*  @ - G  */
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  H - O  */
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  P - W  */
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  X - _  */
+  0x00,0x08,0x08,0x08,0x08,0x08,0x08,0x00, /*  ` - g  */
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  h - o  */
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  p - w  */
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  x -127 */
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 128-135 */
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 136-143 */
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 144-151 */
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 152-159 */
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 160-167 */
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 168-175 */
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 176-183 */
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 184-191 */
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 192-199 */
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 200-207 */
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 208-215 */
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 216-223 */
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 224-231 */
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 232-239 */
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 240-247 */
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};/* 248-255 */
+
+#else           /* This is the "abnormal" case, for EBCDIC systems */
+static const unsigned char digitab[] =
+  {
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*   0-  7  0 */
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*   8- 15    */
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  16- 23 10 */
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  24- 31    */
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  32- 39 20 */
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  40- 47    */
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  48- 55 30 */
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  56- 63    */
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*    - 71 40 */
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  72- |     */
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  & - 87 50 */
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  88- 95    */
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  - -103 60 */
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 104- ?     */
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 112-119 70 */
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 120- "     */
+  0x00,0x08,0x08,0x08,0x08,0x08,0x08,0x00, /* 128- g  80 */
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  h -143    */
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 144- p  90 */
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  q -159    */
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 160- x  A0 */
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  y -175    */
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  ^ -183 B0 */
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 184-191    */
+  0x00,0x08,0x08,0x08,0x08,0x08,0x08,0x00, /*  { - G  C0 */
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  H -207    */
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  } - P  D0 */
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  Q -223    */
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  \ - X  E0 */
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  Y -239    */
+  0x0c,0x0c,0x0c,0x0c,0x0c,0x0c,0x0c,0x0c, /*  0 - 7  F0 */
+  0x0c,0x0c,0x00,0x00,0x00,0x00,0x00,0x00};/*  8 -255    */
+
+static const unsigned char ebcdic_chartab[] = { /* chartable partial dup */
+  0x80,0x00,0x00,0x00,0x00,0x01,0x00,0x00, /*   0-  7 */
+  0x00,0x00,0x00,0x00,0x01,0x01,0x00,0x00, /*   8- 15 */
+  0x00,0x00,0x00,0x00,0x00,0x01,0x00,0x00, /*  16- 23 */
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  24- 31 */
+  0x00,0x00,0x00,0x00,0x00,0x01,0x00,0x00, /*  32- 39 */
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  40- 47 */
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  48- 55 */
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  56- 63 */
+  0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*    - 71 */
+  0x00,0x00,0x00,0x80,0x00,0x80,0x80,0x80, /*  72- |  */
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  & - 87 */
+  0x00,0x00,0x00,0x80,0x80,0x80,0x00,0x00, /*  88- 95 */
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  - -103 */
+  0x00,0x00,0x00,0x00,0x00,0x10,0x00,0x80, /* 104- ?  */
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 112-119 */
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 120- "  */
+  0x00,0x1a,0x1a,0x1a,0x1a,0x1a,0x1a,0x12, /* 128- g  */
+  0x12,0x12,0x00,0x00,0x00,0x00,0x00,0x00, /*  h -143 */
+  0x00,0x12,0x12,0x12,0x12,0x12,0x12,0x12, /* 144- p  */
+  0x12,0x12,0x00,0x00,0x00,0x00,0x00,0x00, /*  q -159 */
+  0x00,0x00,0x12,0x12,0x12,0x12,0x12,0x12, /* 160- x  */
+  0x12,0x12,0x00,0x00,0x00,0x00,0x00,0x00, /*  y -175 */
+  0x80,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  ^ -183 */
+  0x00,0x00,0x80,0x00,0x00,0x00,0x00,0x00, /* 184-191 */
+  0x80,0x1a,0x1a,0x1a,0x1a,0x1a,0x1a,0x12, /*  { - G  */
+  0x12,0x12,0x00,0x00,0x00,0x00,0x00,0x00, /*  H -207 */
+  0x00,0x12,0x12,0x12,0x12,0x12,0x12,0x12, /*  } - P  */
+  0x12,0x12,0x00,0x00,0x00,0x00,0x00,0x00, /*  Q -223 */
+  0x00,0x00,0x12,0x12,0x12,0x12,0x12,0x12, /*  \ - X  */
+  0x12,0x12,0x00,0x00,0x00,0x00,0x00,0x00, /*  Y -239 */
+  0x1c,0x1c,0x1c,0x1c,0x1c,0x1c,0x1c,0x1c, /*  0 - 7  */
+  0x1c,0x1c,0x00,0x00,0x00,0x00,0x00,0x00};/*  8 -255 */
+#endif
+
+
+/* Definition to allow mutual recursion */
+
+static BOOL
+  compile_regex(int, int, uschar **, const uschar **, int *, BOOL, BOOL, int,
+    int *, int *, branch_chain *, compile_data *, int *);
+
+
+
+/*************************************************
+*            Find an error text                  *
+*************************************************/
+
+/* The error texts are now all in one long string, to save on relocations. As
+some of the text is of unknown length, we can't use a table of offsets.
+Instead, just count through the strings. This is not a performance issue
+because it happens only when there has been a compilation error.
+
+Argument:   the error number
+Returns:    pointer to the error string
+*/
+
+static const char *
+find_error_text(int n)
+{
+const char *s = error_texts;
+for (; n > 0; n--) while (*s++ != 0);
+return s;
+}
+
+
+/*************************************************
+*            Handle escapes                      *
+*************************************************/
+
+/* This function is called when a \ has been encountered. It either returns a
+positive value for a simple escape such as \n, or a negative value which
+encodes one of the more complicated things such as \d. A backreference to group
+n is returned as -(ESC_REF + n); ESC_REF is the highest ESC_xxx macro. When
+UTF-8 is enabled, a positive value greater than 255 may be returned. On entry,
+ptr is pointing at the \. On exit, it is on the final character of the escape
+sequence.
+
+Arguments:
+  ptrptr         points to the pattern position pointer
+  errorcodeptr   points to the errorcode variable
+  bracount       number of previous extracting brackets
+  options        the options bits
+  isclass        TRUE if inside a character class
+
+Returns:         zero or positive => a data character
+                 negative => a special escape sequence
+                 on error, errorcodeptr is set
+*/
+
+static int
+check_escape(const uschar **ptrptr, int *errorcodeptr, int bracount,
+  int options, BOOL isclass)
+{
+BOOL utf8 = (options & PCRE_UTF8) != 0;
+const uschar *ptr = *ptrptr + 1;
+int c, i;
+
+GETCHARINCTEST(c, ptr);           /* Get character value, increment pointer */
+ptr--;                            /* Set pointer back to the last byte */
+
+/* If backslash is at the end of the pattern, it's an error. */
+
+if (c == 0) *errorcodeptr = ERR1;
+
+/* Non-alphanumerics are literals. For digits or letters, do an initial lookup
+in a table. A non-zero result is something that can be returned immediately.
+Otherwise further processing may be required. */
+
+#ifndef EBCDIC  /* ASCII coding */
+else if (c < '0' || c > 'z') {}                           /* Not alphanumeric */
+else if ((i = escapes[c - '0']) != 0) c = i;
+
+#else           /* EBCDIC coding */
+else if (c < 'a' || (ebcdic_chartab[c] & 0x0E) == 0) {}   /* Not alphanumeric */
+else if ((i = escapes[c - 0x48]) != 0)  c = i;
+#endif
+
+/* Escapes that need further processing, or are illegal. */
+
+else
+  {
+  const uschar *oldptr;
+  BOOL braced, negated;
+
+  switch (c)
+    {
+    /* A number of Perl escapes are not handled by PCRE. We give an explicit
+    error. */
+
+    case 'l':
+    case 'L':
+    case 'N':
+    case 'u':
+    case 'U':
+    *errorcodeptr = ERR37;
+    break;
+
+    /* \g must be followed by a number, either plain or braced. If positive, it
+    is an absolute backreference. If negative, it is a relative backreference.
+    This is a Perl 5.10 feature. Perl 5.10 also supports \g{name} as a
+    reference to a named group. This is part of Perl's movement towards a
+    unified syntax for back references. As this is synonymous with \k{name}, we
+    fudge it up by pretending it really was \k. */
+
+    case 'g':
+    if (ptr[1] == '{')
+      {
+      const uschar *p;
+      for (p = ptr+2; *p != 0 && *p != '}'; p++)
+        if (*p != '-' && (digitab[*p] & ctype_digit) == 0) break;
+      if (*p != 0 && *p != '}')
+        {
+        c = -ESC_k;
+        break;
+        }
+      braced = TRUE;
+      ptr++;
+      }
+    else braced = FALSE;
+
+    if (ptr[1] == '-')
+      {
+      negated = TRUE;
+      ptr++;
+      }
+    else negated = FALSE;
+
+    c = 0;
+    while ((digitab[ptr[1]] & ctype_digit) != 0)
+      c = c * 10 + *(++ptr) - '0';
+
+    if (c < 0)
+      {
+      *errorcodeptr = ERR61;
+      break;
+      }
+
+    if (c == 0 || (braced && *(++ptr) != '}'))
+      {
+      *errorcodeptr = ERR57;
+      break;
+      }
+
+    if (negated)
+      {
+      if (c > bracount)
+        {
+        *errorcodeptr = ERR15;
+        break;
+        }
+      c = bracount - (c - 1);
+      }
+
+    c = -(ESC_REF + c);
+    break;
+
+    /* The handling of escape sequences consisting of a string of digits
+    starting with one that is not zero is not straightforward. By experiment,
+    the way Perl works seems to be as follows:
+
+    Outside a character class, the digits are read as a decimal number. If the
+    number is less than 10, or if there are that many previous extracting
+    left brackets, then it is a back reference. Otherwise, up to three octal
+    digits are read to form an escaped byte. Thus \123 is likely to be octal
+    123 (cf \0123, which is octal 012 followed by the literal 3). If the octal
+    value is greater than 377, the least significant 8 bits are taken. Inside a
+    character class, \ followed by a digit is always an octal number. */
+
+    case '1': case '2': case '3': case '4': case '5':
+    case '6': case '7': case '8': case '9':
+
+    if (!isclass)
+      {
+      oldptr = ptr;
+      c -= '0';
+      while ((digitab[ptr[1]] & ctype_digit) != 0)
+        c = c * 10 + *(++ptr) - '0';
+      if (c < 0)
+        {
+        *errorcodeptr = ERR61;
+        break;
+        }
+      if (c < 10 || c <= bracount)
+        {
+        c = -(ESC_REF + c);
+        break;
+        }
+      ptr = oldptr;      /* Put the pointer back and fall through */
+      }
+
+    /* Handle an octal number following \. If the first digit is 8 or 9, Perl
+    generates a binary zero byte and treats the digit as a following literal.
+    Thus we have to pull back the pointer by one. */
+
+    if ((c = *ptr) >= '8')
+      {
+      ptr--;
+      c = 0;
+      break;
+      }
+
+    /* \0 always starts an octal number, but we may drop through to here with a
+    larger first octal digit. The original code used just to take the least
+    significant 8 bits of octal numbers (I think this is what early Perls used
+    to do). Nowadays we allow for larger numbers in UTF-8 mode, but no more
+    than 3 octal digits. */
+
+    case '0':
+    c -= '0';
+    while(i++ < 2 && ptr[1] >= '0' && ptr[1] <= '7')
+        c = c * 8 + *(++ptr) - '0';
+    if (!utf8 && c > 255) *errorcodeptr = ERR51;
+    break;
+
+    /* \x is complicated. \x{ddd} is a character number which can be greater
+    than 0xff in utf8 mode, but only if the ddd are hex digits. If not, { is
+    treated as a data character. */
+
+    case 'x':
+    if (ptr[1] == '{')
+      {
+      const uschar *pt = ptr + 2;
+      int count = 0;
+
+      c = 0;
+      while ((digitab[*pt] & ctype_xdigit) != 0)
+        {
+        register int cc = *pt++;
+        if (c == 0 && cc == '0') continue;     /* Leading zeroes */
+        count++;
+
+#ifndef EBCDIC  /* ASCII coding */
+        if (cc >= 'a') cc -= 32;               /* Convert to upper case */
+        c = (c << 4) + cc - ((cc < 'A')? '0' : ('A' - 10));
+#else           /* EBCDIC coding */
+        if (cc >= 'a' && cc <= 'z') cc += 64;  /* Convert to upper case */
+        c = (c << 4) + cc - ((cc >= '0')? '0' : ('A' - 10));
+#endif
+        }
+
+      if (*pt == '}')
+        {
+        if (c < 0 || count > (utf8? 8 : 2)) *errorcodeptr = ERR34;
+        ptr = pt;
+        break;
+        }
+
+      /* If the sequence of hex digits does not end with '}', then we don't
+      recognize this construct; fall through to the normal \x handling. */
+      }
+
+    /* Read just a single-byte hex-defined char */
+
+    c = 0;
+    while (i++ < 2 && (digitab[ptr[1]] & ctype_xdigit) != 0)
+      {
+      int cc;                               /* Some compilers don't like ++ */
+      cc = *(++ptr);                        /* in initializers */
+#ifndef EBCDIC  /* ASCII coding */
+      if (cc >= 'a') cc -= 32;              /* Convert to upper case */
+      c = c * 16 + cc - ((cc < 'A')? '0' : ('A' - 10));
+#else           /* EBCDIC coding */
+      if (cc <= 'z') cc += 64;              /* Convert to upper case */
+      c = c * 16 + cc - ((cc >= '0')? '0' : ('A' - 10));
+#endif
+      }
+    break;
+
+    /* For \c, a following letter is upper-cased; then the 0x40 bit is flipped.
+    This coding is ASCII-specific, but then the whole concept of \cx is
+    ASCII-specific. (However, an EBCDIC equivalent has now been added.) */
+
+    case 'c':
+    c = *(++ptr);
+    if (c == 0)
+      {
+      *errorcodeptr = ERR2;
+      break;
+      }
+
+#ifndef EBCDIC  /* ASCII coding */
+    if (c >= 'a' && c <= 'z') c -= 32;
+    c ^= 0x40;
+#else           /* EBCDIC coding */
+    if (c >= 'a' && c <= 'z') c += 64;
+    c ^= 0xC0;
+#endif
+    break;
+
+    /* PCRE_EXTRA enables extensions to Perl in the matter of escapes. Any
+    other alphanumeric following \ is an error if PCRE_EXTRA was set;
+    otherwise, for Perl compatibility, it is a literal. This code looks a bit
+    odd, but there used to be some cases other than the default, and there may
+    be again in future, so I haven't "optimized" it. */
+
+    default:
+    if ((options & PCRE_EXTRA) != 0) switch(c)
+      {
+      default:
+      *errorcodeptr = ERR3;
+      break;
+      }
+    break;
+    }
+  }
+
+*ptrptr = ptr;
+return c;
+}
+
+
+
+#ifdef SUPPORT_UCP
+/*************************************************
+*               Handle \P and \p                 *
+*************************************************/
+
+/* This function is called after \P or \p has been encountered, provided that
+PCRE is compiled with support for Unicode properties. On entry, ptrptr is
+pointing at the P or p. On exit, it is pointing at the final character of the
+escape sequence.
+
+Argument:
+  ptrptr         points to the pattern position pointer
+  negptr         points to a boolean that is set TRUE for negation else FALSE
+  dptr           points to an int that is set to the detailed property value
+  errorcodeptr   points to the error code variable
+
+Returns:         type value from ucp_type_table, or -1 for an invalid type
+*/
+
+static int
+get_ucp(const uschar **ptrptr, BOOL *negptr, int *dptr, int *errorcodeptr)
+{
+int c, i, bot, top;
+const uschar *ptr = *ptrptr;
+char name[32];
+
+c = *(++ptr);
+if (c == 0) goto ERROR_RETURN;
+
+*negptr = FALSE;
+
+/* \P or \p can be followed by a name in {}, optionally preceded by ^ for
+negation. */
+
+if (c == '{')
+  {
+  if (ptr[1] == '^')
+    {
+    *negptr = TRUE;
+    ptr++;
+    }
+  for (i = 0; i < (int)sizeof(name) - 1; i++)
+    {
+    c = *(++ptr);
+    if (c == 0) goto ERROR_RETURN;
+    if (c == '}') break;
+    name[i] = c;
+    }
+  if (c !='}') goto ERROR_RETURN;
+  name[i] = 0;
+  }
+
+/* Otherwise there is just one following character */
+
+else
+  {
+  name[0] = c;
+  name[1] = 0;
+  }
+
+*ptrptr = ptr;
+
+/* Search for a recognized property name using binary chop */
+
+bot = 0;
+top = _pcre_utt_size;
+
+while (bot < top)
+  {
+  i = (bot + top) >> 1;
+  c = strcmp(name, _pcre_utt_names + _pcre_utt[i].name_offset);
+  if (c == 0)
+    {
+    *dptr = _pcre_utt[i].value;
+    return _pcre_utt[i].type;
+    }
+  if (c > 0) bot = i + 1; else top = i;
+  }
+
+*errorcodeptr = ERR47;
+*ptrptr = ptr;
+return -1;
+
+ERROR_RETURN:
+*errorcodeptr = ERR46;
+*ptrptr = ptr;
+return -1;
+}
+#endif
+
+
+
+
+/*************************************************
+*            Check for counted repeat            *
+*************************************************/
+
+/* This function is called when a '{' is encountered in a place where it might
+start a quantifier. It looks ahead to see if it really is a quantifier or not.
+It is only a quantifier if it is one of the forms {ddd} {ddd,} or {ddd,ddd}
+where the ddds are digits.
+
+Arguments:
+  p         pointer to the first char after '{'
+
+Returns:    TRUE or FALSE
+*/
+
+static BOOL
+is_counted_repeat(const uschar *p)
+{
+if ((digitab[*p++] & ctype_digit) == 0) return FALSE;
+while ((digitab[*p] & ctype_digit) != 0) p++;
+if (*p == '}') return TRUE;
+
+if (*p++ != ',') return FALSE;
+if (*p == '}') return TRUE;
+
+if ((digitab[*p++] & ctype_digit) == 0) return FALSE;
+while ((digitab[*p] & ctype_digit) != 0) p++;
+
+return (*p == '}');
+}
+
+
+
+/*************************************************
+*         Read repeat counts                     *
+*************************************************/
+
+/* Read an item of the form {n,m} and return the values. This is called only
+after is_counted_repeat() has confirmed that a repeat-count quantifier exists,
+so the syntax is guaranteed to be correct, but we need to check the values.
+
+Arguments:
+  p              pointer to first char after '{'
+  minp           pointer to int for min
+  maxp           pointer to int for max
+                 returned as -1 if no max
+  errorcodeptr   points to error code variable
+
+Returns:         pointer to '}' on success;
+                 current ptr on error, with errorcodeptr set non-zero
+*/
+
+static const uschar *
+read_repeat_counts(const uschar *p, int *minp, int *maxp, int *errorcodeptr)
+{
+int min = 0;
+int max = -1;
+
+/* Read the minimum value and do a paranoid check: a negative value indicates
+an integer overflow. */
+
+while ((digitab[*p] & ctype_digit) != 0) min = min * 10 + *p++ - '0';
+if (min < 0 || min > 65535)
+  {
+  *errorcodeptr = ERR5;
+  return p;
+  }
+
+/* Read the maximum value if there is one, and again do a paranoid on its size.
+Also, max must not be less than min. */
+
+if (*p == '}') max = min; else
+  {
+  if (*(++p) != '}')
+    {
+    max = 0;
+    while((digitab[*p] & ctype_digit) != 0) max = max * 10 + *p++ - '0';
+    if (max < 0 || max > 65535)
+      {
+      *errorcodeptr = ERR5;
+      return p;
+      }
+    if (max < min)
+      {
+      *errorcodeptr = ERR4;
+      return p;
+      }
+    }
+  }
+
+/* Fill in the required variables, and pass back the pointer to the terminating
+'}'. */
+
+*minp = min;
+*maxp = max;
+return p;
+}
+
+
+
+/*************************************************
+*       Find forward referenced subpattern       *
+*************************************************/
+
+/* This function scans along a pattern's text looking for capturing
+subpatterns, and counting them. If it finds a named pattern that matches the
+name it is given, it returns its number. Alternatively, if the name is NULL, it
+returns when it reaches a given numbered subpattern. This is used for forward
+references to subpatterns. We know that if (?P< is encountered, the name will
+be terminated by '>' because that is checked in the first pass.
+
+Arguments:
+  ptr          current position in the pattern
+  count        current count of capturing parens so far encountered
+  name         name to seek, or NULL if seeking a numbered subpattern
+  lorn         name length, or subpattern number if name is NULL
+  xmode        TRUE if we are in /x mode
+
+Returns:       the number of the named subpattern, or -1 if not found
+*/
+
+static int
+find_parens(const uschar *ptr, int count, const uschar *name, int lorn,
+  BOOL xmode)
+{
+const uschar *thisname;
+
+for (; *ptr != 0; ptr++)
+  {
+  int term;
+
+  /* Skip over backslashed characters and also entire \Q...\E */
+
+  if (*ptr == '\\')
+    {
+    if (*(++ptr) == 0) return -1;
+    if (*ptr == 'Q') for (;;)
+      {
+      while (*(++ptr) != 0 && *ptr != '\\');
+      if (*ptr == 0) return -1;
+      if (*(++ptr) == 'E') break;
+      }
+    continue;
+    }
+
+  /* Skip over character classes */
+
+  if (*ptr == '[')
+    {
+    while (*(++ptr) != ']')
+      {
+      if (*ptr == 0) return -1;
+      if (*ptr == '\\')
+        {
+        if (*(++ptr) == 0) return -1;
+        if (*ptr == 'Q') for (;;)
+          {
+          while (*(++ptr) != 0 && *ptr != '\\');
+          if (*ptr == 0) return -1;
+          if (*(++ptr) == 'E') break;
+          }
+        continue;
+        }
+      }
+    continue;
+    }
+
+  /* Skip comments in /x mode */
+
+  if (xmode && *ptr == '#')
+    {
+    while (*(++ptr) != 0 && *ptr != '\n');
+    if (*ptr == 0) return -1;
+    continue;
+    }
+
+  /* An opening parens must now be a real metacharacter */
+
+  if (*ptr != '(') continue;
+  if (ptr[1] != '?' && ptr[1] != '*')
+    {
+    count++;
+    if (name == NULL && count == lorn) return count;
+    continue;
+    }
+
+  ptr += 2;
+  if (*ptr == 'P') ptr++;                      /* Allow optional P */
+
+  /* We have to disambiguate (?<! and (?<= from (?<name> */
+
+  if ((*ptr != '<' || ptr[1] == '!' || ptr[1] == '=') &&
+       *ptr != '\'')
+    continue;
+
+  count++;
+
+  if (name == NULL && count == lorn) return count;
+  term = *ptr++;
+  if (term == '<') term = '>';
+  thisname = ptr;
+  while (*ptr != term) ptr++;
+  if (name != NULL && lorn == ptr - thisname &&
+      strncmp((const char *)name, (const char *)thisname, lorn) == 0)
+    return count;
+  }
+
+return -1;
+}
+
+
+
+/*************************************************
+*      Find first significant op code            *
+*************************************************/
+
+/* This is called by several functions that scan a compiled expression looking
+for a fixed first character, or an anchoring op code etc. It skips over things
+that do not influence this. For some calls, a change of option is important.
+For some calls, it makes sense to skip negative forward and all backward
+assertions, and also the \b assertion; for others it does not.
+
+Arguments:
+  code         pointer to the start of the group
+  options      pointer to external options
+  optbit       the option bit whose changing is significant, or
+                 zero if none are
+  skipassert   TRUE if certain assertions are to be skipped
+
+Returns:       pointer to the first significant opcode
+*/
+
+static const uschar*
+first_significant_code(const uschar *code, int *options, int optbit,
+  BOOL skipassert)
+{
+for (;;)
+  {
+  switch ((int)*code)
+    {
+    case OP_OPT:
+    if (optbit > 0 && ((int)code[1] & optbit) != (*options & optbit))
+      *options = (int)code[1];
+    code += 2;
+    break;
+
+    case OP_ASSERT_NOT:
+    case OP_ASSERTBACK:
+    case OP_ASSERTBACK_NOT:
+    if (!skipassert) return code;
+    do code += GET(code, 1); while (*code == OP_ALT);
+    code += _pcre_OP_lengths[*code];
+    break;
+
+    case OP_WORD_BOUNDARY:
+    case OP_NOT_WORD_BOUNDARY:
+    if (!skipassert) return code;
+    /* Fall through */
+
+    case OP_CALLOUT:
+    case OP_CREF:
+    case OP_RREF:
+    case OP_DEF:
+    code += _pcre_OP_lengths[*code];
+    break;
+
+    default:
+    return code;
+    }
+  }
+/* Control never reaches here */
+}
+
+
+
+
+/*************************************************
+*        Find the fixed length of a pattern      *
+*************************************************/
+
+/* Scan a pattern and compute the fixed length of subject that will match it,
+if the length is fixed. This is needed for dealing with backward assertions.
+In UTF8 mode, the result is in characters rather than bytes.
+
+Arguments:
+  code     points to the start of the pattern (the bracket)
+  options  the compiling options
+
+Returns:   the fixed length, or -1 if there is no fixed length,
+             or -2 if \C was encountered
+*/
+
+static int
+find_fixedlength(uschar *code, int options)
+{
+int length = -1;
+
+register int branchlength = 0;
+register uschar *cc = code + 1 + LINK_SIZE;
+
+/* Scan along the opcodes for this branch. If we get to the end of the
+branch, check the length against that of the other branches. */
+
+for (;;)
+  {
+  int d;
+  register int op = *cc;
+  switch (op)
+    {
+    case OP_CBRA:
+    case OP_BRA:
+    case OP_ONCE:
+    case OP_COND:
+    d = find_fixedlength(cc + ((op == OP_CBRA)? 2:0), options);
+    if (d < 0) return d;
+    branchlength += d;
+    do cc += GET(cc, 1); while (*cc == OP_ALT);
+    cc += 1 + LINK_SIZE;
+    break;
+
+    /* Reached end of a branch; if it's a ket it is the end of a nested
+    call. If it's ALT it is an alternation in a nested call. If it is
+    END it's the end of the outer call. All can be handled by the same code. */
+
+    case OP_ALT:
+    case OP_KET:
+    case OP_KETRMAX:
+    case OP_KETRMIN:
+    case OP_END:
+    if (length < 0) length = branchlength;
+      else if (length != branchlength) return -1;
+    if (*cc != OP_ALT) return length;
+    cc += 1 + LINK_SIZE;
+    branchlength = 0;
+    break;
+
+    /* Skip over assertive subpatterns */
+
+    case OP_ASSERT:
+    case OP_ASSERT_NOT:
+    case OP_ASSERTBACK:
+    case OP_ASSERTBACK_NOT:
+    do cc += GET(cc, 1); while (*cc == OP_ALT);
+    /* Fall through */
+
+    /* Skip over things that don't match chars */
+
+    case OP_REVERSE:
+    case OP_CREF:
+    case OP_RREF:
+    case OP_DEF:
+    case OP_OPT:
+    case OP_CALLOUT:
+    case OP_SOD:
+    case OP_SOM:
+    case OP_EOD:
+    case OP_EODN:
+    case OP_CIRC:
+    case OP_DOLL:
+    case OP_NOT_WORD_BOUNDARY:
+    case OP_WORD_BOUNDARY:
+    cc += _pcre_OP_lengths[*cc];
+    break;
+
+    /* Handle literal characters */
+
+    case OP_CHAR:
+    case OP_CHARNC:
+    case OP_NOT:
+    branchlength++;
+    cc += 2;
+#ifdef SUPPORT_UTF8
+    if ((options & PCRE_UTF8) != 0)
+      {
+      while ((*cc & 0xc0) == 0x80) cc++;
+      }
+#endif
+    break;
+
+    /* Handle exact repetitions. The count is already in characters, but we
+    need to skip over a multibyte character in UTF8 mode.  */
+
+    case OP_EXACT:
+    branchlength += GET2(cc,1);
+    cc += 4;
+#ifdef SUPPORT_UTF8
+    if ((options & PCRE_UTF8) != 0)
+      {
+      while((*cc & 0x80) == 0x80) cc++;
+      }
+#endif
+    break;
+
+    case OP_TYPEEXACT:
+    branchlength += GET2(cc,1);
+    if (cc[3] == OP_PROP || cc[3] == OP_NOTPROP) cc += 2;
+    cc += 4;
+    break;
+
+    /* Handle single-char matchers */
+
+    case OP_PROP:
+    case OP_NOTPROP:
+    cc += 2;
+    /* Fall through */
+
+    case OP_NOT_DIGIT:
+    case OP_DIGIT:
+    case OP_NOT_WHITESPACE:
+    case OP_WHITESPACE:
+    case OP_NOT_WORDCHAR:
+    case OP_WORDCHAR:
+    case OP_ANY:
+    branchlength++;
+    cc++;
+    break;
+
+    /* The single-byte matcher isn't allowed */
+
+    case OP_ANYBYTE:
+    return -2;
+
+    /* Check a class for variable quantification */
+
+#ifdef SUPPORT_UTF8
+    case OP_XCLASS:
+    cc += GET(cc, 1) - 33;
+    /* Fall through */
+#endif
+
+    case OP_CLASS:
+    case OP_NCLASS:
+    cc += 33;
+
+    switch (*cc)
+      {
+      case OP_CRSTAR:
+      case OP_CRMINSTAR:
+      case OP_CRQUERY:
+      case OP_CRMINQUERY:
+      return -1;
+
+      case OP_CRRANGE:
+      case OP_CRMINRANGE:
+      if (GET2(cc,1) != GET2(cc,3)) return -1;
+      branchlength += GET2(cc,1);
+      cc += 5;
+      break;
+
+      default:
+      branchlength++;
+      }
+    break;
+
+    /* Anything else is variable length */
+
+    default:
+    return -1;
+    }
+  }
+/* Control never gets here */
+}
+
+
+
+
+/*************************************************
+*    Scan compiled regex for numbered bracket    *
+*************************************************/
+
+/* This little function scans through a compiled pattern until it finds a
+capturing bracket with the given number.
+
+Arguments:
+  code        points to start of expression
+  utf8        TRUE in UTF-8 mode
+  number      the required bracket number
+
+Returns:      pointer to the opcode for the bracket, or NULL if not found
+*/
+
+static const uschar *
+find_bracket(const uschar *code, BOOL utf8, int number)
+{
+for (;;)
+  {
+  register int c = *code;
+  if (c == OP_END) return NULL;
+
+  /* XCLASS is used for classes that cannot be represented just by a bit
+  map. This includes negated single high-valued characters. The length in
+  the table is zero; the actual length is stored in the compiled code. */
+
+  if (c == OP_XCLASS) code += GET(code, 1);
+
+  /* Handle capturing bracket */
+
+  else if (c == OP_CBRA)
+    {
+    int n = GET2(code, 1+LINK_SIZE);
+    if (n == number) return (uschar *)code;
+    code += _pcre_OP_lengths[c];
+    }
+
+  /* Otherwise, we can get the item's length from the table, except that for
+  repeated character types, we have to test for \p and \P, which have an extra
+  two bytes of parameters. */
+
+  else
+    {
+    switch(c)
+      {
+      case OP_TYPESTAR:
+      case OP_TYPEMINSTAR:
+      case OP_TYPEPLUS:
+      case OP_TYPEMINPLUS:
+      case OP_TYPEQUERY:
+      case OP_TYPEMINQUERY:
+      case OP_TYPEPOSSTAR:
+      case OP_TYPEPOSPLUS:
+      case OP_TYPEPOSQUERY:
+      if (code[1] == OP_PROP || code[1] == OP_NOTPROP) code += 2;
+      break;
+
+      case OP_TYPEUPTO:
+      case OP_TYPEMINUPTO:
+      case OP_TYPEEXACT:
+      case OP_TYPEPOSUPTO:
+      if (code[3] == OP_PROP || code[3] == OP_NOTPROP) code += 2;
+      break;
+      }
+
+    /* Add in the fixed length from the table */
+
+    code += _pcre_OP_lengths[c];
+
+  /* In UTF-8 mode, opcodes that are followed by a character may be followed by
+  a multi-byte character. The length in the table is a minimum, so we have to
+  arrange to skip the extra bytes. */
+
+#ifdef SUPPORT_UTF8
+    if (utf8) switch(c)
+      {
+      case OP_CHAR:
+      case OP_CHARNC:
+      case OP_EXACT:
+      case OP_UPTO:
+      case OP_MINUPTO:
+      case OP_POSUPTO:
+      case OP_STAR:
+      case OP_MINSTAR:
+      case OP_POSSTAR:
+      case OP_PLUS:
+      case OP_MINPLUS:
+      case OP_POSPLUS:
+      case OP_QUERY:
+      case OP_MINQUERY:
+      case OP_POSQUERY:
+      if (code[-1] >= 0xc0) code += _pcre_utf8_table4[code[-1] & 0x3f];
+      break;
+      }
+#endif
+    }
+  }
+}
+
+
+
+/*************************************************
+*   Scan compiled regex for recursion reference  *
+*************************************************/
+
+/* This little function scans through a compiled pattern until it finds an
+instance of OP_RECURSE.
+
+Arguments:
+  code        points to start of expression
+  utf8        TRUE in UTF-8 mode
+
+Returns:      pointer to the opcode for OP_RECURSE, or NULL if not found
+*/
+
+static const uschar *
+find_recurse(const uschar *code, BOOL utf8)
+{
+for (;;)
+  {
+  register int c = *code;
+  if (c == OP_END) return NULL;
+  if (c == OP_RECURSE) return code;
+
+  /* XCLASS is used for classes that cannot be represented just by a bit
+  map. This includes negated single high-valued characters. The length in
+  the table is zero; the actual length is stored in the compiled code. */
+
+  if (c == OP_XCLASS) code += GET(code, 1);
+
+  /* Otherwise, we can get the item's length from the table, except that for
+  repeated character types, we have to test for \p and \P, which have an extra
+  two bytes of parameters. */
+
+  else
+    {
+    switch(c)
+      {
+      case OP_TYPESTAR:
+      case OP_TYPEMINSTAR:
+      case OP_TYPEPLUS:
+      case OP_TYPEMINPLUS:
+      case OP_TYPEQUERY:
+      case OP_TYPEMINQUERY:
+      case OP_TYPEPOSSTAR:
+      case OP_TYPEPOSPLUS:
+      case OP_TYPEPOSQUERY:
+      if (code[1] == OP_PROP || code[1] == OP_NOTPROP) code += 2;
+      break;
+
+      case OP_TYPEPOSUPTO:
+      case OP_TYPEUPTO:
+      case OP_TYPEMINUPTO:
+      case OP_TYPEEXACT:
+      if (code[3] == OP_PROP || code[3] == OP_NOTPROP) code += 2;
+      break;
+      }
+
+    /* Add in the fixed length from the table */
+
+    code += _pcre_OP_lengths[c];
+
+    /* In UTF-8 mode, opcodes that are followed by a character may be followed
+    by a multi-byte character. The length in the table is a minimum, so we have
+    to arrange to skip the extra bytes. */
+
+#ifdef SUPPORT_UTF8
+    if (utf8) switch(c)
+      {
+      case OP_CHAR:
+      case OP_CHARNC:
+      case OP_EXACT:
+      case OP_UPTO:
+      case OP_MINUPTO:
+      case OP_POSUPTO:
+      case OP_STAR:
+      case OP_MINSTAR:
+      case OP_POSSTAR:
+      case OP_PLUS:
+      case OP_MINPLUS:
+      case OP_POSPLUS:
+      case OP_QUERY:
+      case OP_MINQUERY:
+      case OP_POSQUERY:
+      if (code[-1] >= 0xc0) code += _pcre_utf8_table4[code[-1] & 0x3f];
+      break;
+      }
+#endif
+    }
+  }
+}
+
+
+
+/*************************************************
+*    Scan compiled branch for non-emptiness      *
+*************************************************/
+
+/* This function scans through a branch of a compiled pattern to see whether it
+can match the empty string or not. It is called from could_be_empty()
+below and from compile_branch() when checking for an unlimited repeat of a
+group that can match nothing. Note that first_significant_code() skips over
+backward and negative forward assertions when its final argument is TRUE. If we
+hit an unclosed bracket, we return "empty" - this means we've struck an inner
+bracket whose current branch will already have been scanned.
+
+Arguments:
+  code        points to start of search
+  endcode     points to where to stop
+  utf8        TRUE if in UTF8 mode
+
+Returns:      TRUE if what is matched could be empty
+*/
+
+static BOOL
+could_be_empty_branch(const uschar *code, const uschar *endcode, BOOL utf8)
+{
+register int c;
+for (code = first_significant_code(code + _pcre_OP_lengths[*code], NULL, 0, TRUE);
+     code < endcode;
+     code = first_significant_code(code + _pcre_OP_lengths[c], NULL, 0, TRUE))
+  {
+  const uschar *ccode;
+
+  c = *code;
+
+  /* Skip over forward assertions; the other assertions are skipped by
+  first_significant_code() with a TRUE final argument. */
+
+  if (c == OP_ASSERT)
+    {
+    do code += GET(code, 1); while (*code == OP_ALT);
+    c = *code;
+    continue;
+    }
+
+  /* Groups with zero repeats can of course be empty; skip them. */
+
+  if (c == OP_BRAZERO || c == OP_BRAMINZERO)
+    {
+    code += _pcre_OP_lengths[c];
+    do code += GET(code, 1); while (*code == OP_ALT);
+    c = *code;
+    continue;
+    }
+
+  /* For other groups, scan the branches. */
+
+  if (c == OP_BRA || c == OP_CBRA || c == OP_ONCE || c == OP_COND)
+    {
+    BOOL empty_branch;
+    if (GET(code, 1) == 0) return TRUE;    /* Hit unclosed bracket */
+
+    /* Scan a closed bracket */
+
+    empty_branch = FALSE;
+    do
+      {
+      if (!empty_branch && could_be_empty_branch(code, endcode, utf8))
+        empty_branch = TRUE;
+      code += GET(code, 1);
+      }
+    while (*code == OP_ALT);
+    if (!empty_branch) return FALSE;   /* All branches are non-empty */
+    c = *code;
+    continue;
+    }
+
+  /* Handle the other opcodes */
+
+  switch (c)
+    {
+    /* Check for quantifiers after a class. XCLASS is used for classes that
+    cannot be represented just by a bit map. This includes negated single
+    high-valued characters. The length in _pcre_OP_lengths[] is zero; the
+    actual length is stored in the compiled code, so we must update "code"
+    here. */
+
+#ifdef SUPPORT_UTF8
+    case OP_XCLASS:
+    ccode = code += GET(code, 1);
+    goto CHECK_CLASS_REPEAT;
+#endif
+
+    case OP_CLASS:
+    case OP_NCLASS:
+    ccode = code + 33;
+
+#ifdef SUPPORT_UTF8
+    CHECK_CLASS_REPEAT:
+#endif
+
+    switch (*ccode)
+      {
+      case OP_CRSTAR:            /* These could be empty; continue */
+      case OP_CRMINSTAR:
+      case OP_CRQUERY:
+      case OP_CRMINQUERY:
+      break;
+
+      default:                   /* Non-repeat => class must match */
+      case OP_CRPLUS:            /* These repeats aren't empty */
+      case OP_CRMINPLUS:
+      return FALSE;
+
+      case OP_CRRANGE:
+      case OP_CRMINRANGE:
+      if (GET2(ccode, 1) > 0) return FALSE;  /* Minimum > 0 */
+      break;
+      }
+    break;
+
+    /* Opcodes that must match a character */
+
+    case OP_PROP:
+    case OP_NOTPROP:
+    case OP_EXTUNI:
+    case OP_NOT_DIGIT:
+    case OP_DIGIT:
+    case OP_NOT_WHITESPACE:
+    case OP_WHITESPACE:
+    case OP_NOT_WORDCHAR:
+    case OP_WORDCHAR:
+    case OP_ANY:
+    case OP_ANYBYTE:
+    case OP_CHAR:
+    case OP_CHARNC:
+    case OP_NOT:
+    case OP_PLUS:
+    case OP_MINPLUS:
+    case OP_POSPLUS:
+    case OP_EXACT:
+    case OP_NOTPLUS:
+    case OP_NOTMINPLUS:
+    case OP_NOTPOSPLUS:
+    case OP_NOTEXACT:
+    case OP_TYPEPLUS:
+    case OP_TYPEMINPLUS:
+    case OP_TYPEPOSPLUS:
+    case OP_TYPEEXACT:
+    return FALSE;
+
+    /* These are going to continue, as they may be empty, but we have to
+    fudge the length for the \p and \P cases. */
+
+    case OP_TYPESTAR:
+    case OP_TYPEMINSTAR:
+    case OP_TYPEPOSSTAR:
+    case OP_TYPEQUERY:
+    case OP_TYPEMINQUERY:
+    case OP_TYPEPOSQUERY:
+    if (code[1] == OP_PROP || code[1] == OP_NOTPROP) code += 2;
+    break;
+
+    /* Same for these */
+
+    case OP_TYPEUPTO:
+    case OP_TYPEMINUPTO:
+    case OP_TYPEPOSUPTO:
+    if (code[3] == OP_PROP || code[3] == OP_NOTPROP) code += 2;
+    break;
+
+    /* End of branch */
+
+    case OP_KET:
+    case OP_KETRMAX:
+    case OP_KETRMIN:
+    case OP_ALT:
+    return TRUE;
+
+    /* In UTF-8 mode, STAR, MINSTAR, POSSTAR, QUERY, MINQUERY, POSQUERY, UPTO,
+    MINUPTO, and POSUPTO may be followed by a multibyte character */
+
+#ifdef SUPPORT_UTF8
+    case OP_STAR:
+    case OP_MINSTAR:
+    case OP_POSSTAR:
+    case OP_QUERY:
+    case OP_MINQUERY:
+    case OP_POSQUERY:
+    case OP_UPTO:
+    case OP_MINUPTO:
+    case OP_POSUPTO:
+    if (utf8) while ((code[2] & 0xc0) == 0x80) code++;
+    break;
+#endif
+    }
+  }
+
+return TRUE;
+}
+
+
+
+/*************************************************
+*    Scan compiled regex for non-emptiness       *
+*************************************************/
+
+/* This function is called to check for left recursive calls. We want to check
+the current branch of the current pattern to see if it could match the empty
+string. If it could, we must look outwards for branches at other levels,
+stopping when we pass beyond the bracket which is the subject of the recursion.
+
+Arguments:
+  code        points to start of the recursion
+  endcode     points to where to stop (current RECURSE item)
+  bcptr       points to the chain of current (unclosed) branch starts
+  utf8        TRUE if in UTF-8 mode
+
+Returns:      TRUE if what is matched could be empty
+*/
+
+static BOOL
+could_be_empty(const uschar *code, const uschar *endcode, branch_chain *bcptr,
+  BOOL utf8)
+{
+while (bcptr != NULL && bcptr->current >= code)
+  {
+  if (!could_be_empty_branch(bcptr->current, endcode, utf8)) return FALSE;
+  bcptr = bcptr->outer;
+  }
+return TRUE;
+}
+
+
+
+/*************************************************
+*           Check for POSIX class syntax         *
+*************************************************/
+
+/* This function is called when the sequence "[:" or "[." or "[=" is
+encountered in a character class. It checks whether this is followed by a
+sequence of characters terminated by a matching ":]" or ".]" or "=]". If we
+reach an unescaped ']' without the special preceding character, return FALSE.
+
+Originally, this function only recognized a sequence of letters between the
+terminators, but it seems that Perl recognizes any sequence of characters,
+though of course unknown POSIX names are subsequently rejected. Perl gives an
+"Unknown POSIX class" error for [:f\oo:] for example, where previously PCRE
+didn't consider this to be a POSIX class. Likewise for [:1234:].
+
+The problem in trying to be exactly like Perl is in the handling of escapes. We
+have to be sure that [abc[:x\]pqr] is *not* treated as containing a POSIX
+class, but [abc[:x\]pqr:]] is (so that an error can be generated). The code
+below handles the special case of \], but does not try to do any other escape
+processing. This makes it different from Perl for cases such as [:l\ower:]
+where Perl recognizes it as the POSIX class "lower" but PCRE does not recognize
+"l\ower". This is a lesser evil that not diagnosing bad classes when Perl does,
+I think.
+
+Arguments:
+  ptr      pointer to the initial [
+  endptr   where to return the end pointer
+
+Returns:   TRUE or FALSE
+*/
+
+static BOOL
+check_posix_syntax(const uschar *ptr, const uschar **endptr)
+{
+int terminator;          /* Don't combine these lines; the Solaris cc */
+terminator = *(++ptr);   /* compiler warns about "non-constant" initializer. */
+for (++ptr; *ptr != 0; ptr++)
+  {
+  if (*ptr == '\\' && ptr[1] == ']') ptr++; else
+    {
+    if (*ptr == ']') return FALSE;
+    if (*ptr == terminator && ptr[1] == ']')
+      {
+      *endptr = ptr;
+      return TRUE;
+      }
+    }
+  }
+return FALSE;
+}
+
+
+
+
+/*************************************************
+*          Check POSIX class name                *
+*************************************************/
+
+/* This function is called to check the name given in a POSIX-style class entry
+such as [:alnum:].
+
+Arguments:
+  ptr        points to the first letter
+  len        the length of the name
+
+Returns:     a value representing the name, or -1 if unknown
+*/
+
+static int
+check_posix_name(const uschar *ptr, int len)
+{
+const char *pn = posix_names;
+register int yield = 0;
+while (posix_name_lengths[yield] != 0)
+  {
+  if (len == posix_name_lengths[yield] &&
+    strncmp((const char *)ptr, pn, len) == 0) return yield;
+  pn += posix_name_lengths[yield] + 1;
+  yield++;
+  }
+return -1;
+}
+
+
+/*************************************************
+*    Adjust OP_RECURSE items in repeated group   *
+*************************************************/
+
+/* OP_RECURSE items contain an offset from the start of the regex to the group
+that is referenced. This means that groups can be replicated for fixed
+repetition simply by copying (because the recursion is allowed to refer to
+earlier groups that are outside the current group). However, when a group is
+optional (i.e. the minimum quantifier is zero), OP_BRAZERO is inserted before
+it, after it has been compiled. This means that any OP_RECURSE items within it
+that refer to the group itself or any contained groups have to have their
+offsets adjusted. That one of the jobs of this function. Before it is called,
+the partially compiled regex must be temporarily terminated with OP_END.
+
+This function has been extended with the possibility of forward references for
+recursions and subroutine calls. It must also check the list of such references
+for the group we are dealing with. If it finds that one of the recursions in
+the current group is on this list, it adjusts the offset in the list, not the
+value in the reference (which is a group number).
+
+Arguments:
+  group      points to the start of the group
+  adjust     the amount by which the group is to be moved
+  utf8       TRUE in UTF-8 mode
+  cd         contains pointers to tables etc.
+  save_hwm   the hwm forward reference pointer at the start of the group
+
+Returns:     nothing
+*/
+
+static void
+adjust_recurse(uschar *group, int adjust, BOOL utf8, compile_data *cd,
+  uschar *save_hwm)
+{
+uschar *ptr = group;
+
+while ((ptr = (uschar *)find_recurse(ptr, utf8)) != NULL)
+  {
+  int offset;
+  uschar *hc;
+
+  /* See if this recursion is on the forward reference list. If so, adjust the
+  reference. */
+
+  for (hc = save_hwm; hc < cd->hwm; hc += LINK_SIZE)
+    {
+    offset = GET(hc, 0);
+    if (cd->start_code + offset == ptr + 1)
+      {
+      PUT(hc, 0, offset + adjust);
+      break;
+      }
+    }
+
+  /* Otherwise, adjust the recursion offset if it's after the start of this
+  group. */
+
+  if (hc >= cd->hwm)
+    {
+    offset = GET(ptr, 1);
+    if (cd->start_code + offset >= group) PUT(ptr, 1, offset + adjust);
+    }
+
+  ptr += 1 + LINK_SIZE;
+  }
+}
+
+
+
+/*************************************************
+*        Insert an automatic callout point       *
+*************************************************/
+
+/* This function is called when the PCRE_AUTO_CALLOUT option is set, to insert
+callout points before each pattern item.
+
+Arguments:
+  code           current code pointer
+  ptr            current pattern pointer
+  cd             pointers to tables etc
+
+Returns:         new code pointer
+*/
+
+static uschar *
+auto_callout(uschar *code, const uschar *ptr, compile_data *cd)
+{
+*code++ = OP_CALLOUT;
+*code++ = 255;
+PUT(code, 0, ptr - cd->start_pattern);  /* Pattern offset */
+PUT(code, LINK_SIZE, 0);                /* Default length */
+return code + 2*LINK_SIZE;
+}
+
+
+
+/*************************************************
+*         Complete a callout item                *
+*************************************************/
+
+/* A callout item contains the length of the next item in the pattern, which
+we can't fill in till after we have reached the relevant point. This is used
+for both automatic and manual callouts.
+
+Arguments:
+  previous_callout   points to previous callout item
+  ptr                current pattern pointer
+  cd                 pointers to tables etc
+
+Returns:             nothing
+*/
+
+static void
+complete_callout(uschar *previous_callout, const uschar *ptr, compile_data *cd)
+{
+int length = ptr - cd->start_pattern - GET(previous_callout, 2);
+PUT(previous_callout, 2 + LINK_SIZE, length);
+}
+
+
+
+#ifdef SUPPORT_UCP
+/*************************************************
+*           Get othercase range                  *
+*************************************************/
+
+/* This function is passed the start and end of a class range, in UTF-8 mode
+with UCP support. It searches up the characters, looking for internal ranges of
+characters in the "other" case. Each call returns the next one, updating the
+start address.
+
+Arguments:
+  cptr        points to starting character value; updated
+  d           end value
+  ocptr       where to put start of othercase range
+  odptr       where to put end of othercase range
+
+Yield:        TRUE when range returned; FALSE when no more
+*/
+
+static BOOL
+get_othercase_range(unsigned int *cptr, unsigned int d, unsigned int *ocptr,
+  unsigned int *odptr)
+{
+unsigned int c, othercase, next;
+
+for (c = *cptr; c <= d; c++)
+  { if ((othercase = _pcre_ucp_othercase(c)) != NOTACHAR) break; }
+
+if (c > d) return FALSE;
+
+*ocptr = othercase;
+next = othercase + 1;
+
+for (++c; c <= d; c++)
+  {
+  if (_pcre_ucp_othercase(c) != next) break;
+  next++;
+  }
+
+*odptr = next - 1;
+*cptr = c;
+
+return TRUE;
+}
+#endif  /* SUPPORT_UCP */
+
+
+
+/*************************************************
+*     Check if auto-possessifying is possible    *
+*************************************************/
+
+/* This function is called for unlimited repeats of certain items, to see
+whether the next thing could possibly match the repeated item. If not, it makes
+sense to automatically possessify the repeated item.
+
+Arguments:
+  op_code       the repeated op code
+  this          data for this item, depends on the opcode
+  utf8          TRUE in UTF-8 mode
+  utf8_char     used for utf8 character bytes, NULL if not relevant
+  ptr           next character in pattern
+  options       options bits
+  cd            contains pointers to tables etc.
+
+Returns:        TRUE if possessifying is wanted
+*/
+
+static BOOL
+check_auto_possessive(int op_code, int item, BOOL utf8, uschar *utf8_char,
+  const uschar *ptr, int options, compile_data *cd)
+{
+int next;
+
+/* Skip whitespace and comments in extended mode */
+
+if ((options & PCRE_EXTENDED) != 0)
+  {
+  for (;;)
+    {
+    while ((cd->ctypes[*ptr] & ctype_space) != 0) ptr++;
+    if (*ptr == '#')
+      {
+      while (*(++ptr) != 0)
+        if (IS_NEWLINE(ptr)) { ptr += cd->nllen; break; }
+      }
+    else break;
+    }
+  }
+
+/* If the next item is one that we can handle, get its value. A non-negative
+value is a character, a negative value is an escape value. */
+
+if (*ptr == '\\')
+  {
+  int temperrorcode = 0;
+  next = check_escape(&ptr, &temperrorcode, cd->bracount, options, FALSE);
+  if (temperrorcode != 0) return FALSE;
+  ptr++;    /* Point after the escape sequence */
+  }
+
+else if ((cd->ctypes[*ptr] & ctype_meta) == 0)
+  {
+#ifdef SUPPORT_UTF8
+  if (utf8) { GETCHARINC(next, ptr); } else
+#endif
+  next = *ptr++;
+  }
+
+else return FALSE;
+
+/* Skip whitespace and comments in extended mode */
+
+if ((options & PCRE_EXTENDED) != 0)
+  {
+  for (;;)
+    {
+    while ((cd->ctypes[*ptr] & ctype_space) != 0) ptr++;
+    if (*ptr == '#')
+      {
+      while (*(++ptr) != 0)
+        if (IS_NEWLINE(ptr)) { ptr += cd->nllen; break; }
+      }
+    else break;
+    }
+  }
+
+/* If the next thing is itself optional, we have to give up. */
+
+if (*ptr == '*' || *ptr == '?' || strncmp((char *)ptr, "{0,", 3) == 0)
+  return FALSE;
+
+/* Now compare the next item with the previous opcode. If the previous is a
+positive single character match, "item" either contains the character or, if
+"item" is greater than 127 in utf8 mode, the character's bytes are in
+utf8_char. */
+
+
+/* Handle cases when the next item is a character. */
+
+if (next >= 0) switch(op_code)
+  {
+  case OP_CHAR:
+#ifdef SUPPORT_UTF8
+  if (utf8 && item > 127) { GETCHAR(item, utf8_char); }
+#endif
+  return item != next;
+
+  /* For CHARNC (caseless character) we must check the other case. If we have
+  Unicode property support, we can use it to test the other case of
+  high-valued characters. */
+
+  case OP_CHARNC:
+#ifdef SUPPORT_UTF8
+  if (utf8 && item > 127) { GETCHAR(item, utf8_char); }
+#endif
+  if (item == next) return FALSE;
+#ifdef SUPPORT_UTF8
+  if (utf8)
+    {
+    unsigned int othercase;
+    if (next < 128) othercase = cd->fcc[next]; else
+#ifdef SUPPORT_UCP
+    othercase = _pcre_ucp_othercase((unsigned int)next);
+#else
+    othercase = NOTACHAR;
+#endif
+    return (unsigned int)item != othercase;
+    }
+  else
+#endif  /* SUPPORT_UTF8 */
+  return (item != cd->fcc[next]);  /* Non-UTF-8 mode */
+
+  /* For OP_NOT, "item" must be a single-byte character. */
+
+  case OP_NOT:
+  if (next < 0) return FALSE;  /* Not a character */
+  if (item == next) return TRUE;
+  if ((options & PCRE_CASELESS) == 0) return FALSE;
+#ifdef SUPPORT_UTF8
+  if (utf8)
+    {
+    unsigned int othercase;
+    if (next < 128) othercase = cd->fcc[next]; else
+#ifdef SUPPORT_UCP
+    othercase = _pcre_ucp_othercase(next);
+#else
+    othercase = NOTACHAR;
+#endif
+    return (unsigned int)item == othercase;
+    }
+  else
+#endif  /* SUPPORT_UTF8 */
+  return (item == cd->fcc[next]);  /* Non-UTF-8 mode */
+
+  case OP_DIGIT:
+  return next > 127 || (cd->ctypes[next] & ctype_digit) == 0;
+
+  case OP_NOT_DIGIT:
+  return next <= 127 && (cd->ctypes[next] & ctype_digit) != 0;
+
+  case OP_WHITESPACE:
+  return next > 127 || (cd->ctypes[next] & ctype_space) == 0;
+
+  case OP_NOT_WHITESPACE:
+  return next <= 127 && (cd->ctypes[next] & ctype_space) != 0;
+
+  case OP_WORDCHAR:
+  return next > 127 || (cd->ctypes[next] & ctype_word) == 0;
+
+  case OP_NOT_WORDCHAR:
+  return next <= 127 && (cd->ctypes[next] & ctype_word) != 0;
+
+  case OP_HSPACE:
+  case OP_NOT_HSPACE:
+  switch(next)
+    {
+    case 0x09:
+    case 0x20:
+    case 0xa0:
+    case 0x1680:
+    case 0x180e:
+    case 0x2000:
+    case 0x2001:
+    case 0x2002:
+    case 0x2003:
+    case 0x2004:
+    case 0x2005:
+    case 0x2006:
+    case 0x2007:
+    case 0x2008:
+    case 0x2009:
+    case 0x200A:
+    case 0x202f:
+    case 0x205f:
+    case 0x3000:
+    return op_code != OP_HSPACE;
+    default:
+    return op_code == OP_HSPACE;
+    }
+
+  case OP_VSPACE:
+  case OP_NOT_VSPACE:
+  switch(next)
+    {
+    case 0x0a:
+    case 0x0b:
+    case 0x0c:
+    case 0x0d:
+    case 0x85:
+    case 0x2028:
+    case 0x2029:
+    return op_code != OP_VSPACE;
+    default:
+    return op_code == OP_VSPACE;
+    }
+
+  default:
+  return FALSE;
+  }
+
+
+/* Handle the case when the next item is \d, \s, etc. */
+
+switch(op_code)
+  {
+  case OP_CHAR:
+  case OP_CHARNC:
+#ifdef SUPPORT_UTF8
+  if (utf8 && item > 127) { GETCHAR(item, utf8_char); }
+#endif
+  switch(-next)
+    {
+    case ESC_d:
+    return item > 127 || (cd->ctypes[item] & ctype_digit) == 0;
+
+    case ESC_D:
+    return item <= 127 && (cd->ctypes[item] & ctype_digit) != 0;
+
+    case ESC_s:
+    return item > 127 || (cd->ctypes[item] & ctype_space) == 0;
+
+    case ESC_S:
+    return item <= 127 && (cd->ctypes[item] & ctype_space) != 0;
+
+    case ESC_w:
+    return item > 127 || (cd->ctypes[item] & ctype_word) == 0;
+
+    case ESC_W:
+    return item <= 127 && (cd->ctypes[item] & ctype_word) != 0;
+
+    case ESC_h:
+    case ESC_H:
+    switch(item)
+      {
+      case 0x09:
+      case 0x20:
+      case 0xa0:
+      case 0x1680:
+      case 0x180e:
+      case 0x2000:
+      case 0x2001:
+      case 0x2002:
+      case 0x2003:
+      case 0x2004:
+      case 0x2005:
+      case 0x2006:
+      case 0x2007:
+      case 0x2008:
+      case 0x2009:
+      case 0x200A:
+      case 0x202f:
+      case 0x205f:
+      case 0x3000:
+      return -next != ESC_h;
+      default:
+      return -next == ESC_h;
+      }
+
+    case ESC_v:
+    case ESC_V:
+    switch(item)
+      {
+      case 0x0a:
+      case 0x0b:
+      case 0x0c:
+      case 0x0d:
+      case 0x85:
+      case 0x2028:
+      case 0x2029:
+      return -next != ESC_v;
+      default:
+      return -next == ESC_v;
+      }
+
+    default:
+    return FALSE;
+    }
+
+  case OP_DIGIT:
+  return next == -ESC_D || next == -ESC_s || next == -ESC_W ||
+         next == -ESC_h || next == -ESC_v;
+
+  case OP_NOT_DIGIT:
+  return next == -ESC_d;
+
+  case OP_WHITESPACE:
+  return next == -ESC_S || next == -ESC_d || next == -ESC_w;
+
+  case OP_NOT_WHITESPACE:
+  return next == -ESC_s || next == -ESC_h || next == -ESC_v;
+
+  case OP_HSPACE:
+  return next == -ESC_S || next == -ESC_H || next == -ESC_d || next == -ESC_w;
+
+  case OP_NOT_HSPACE:
+  return next == -ESC_h;
+
+  /* Can't have \S in here because VT matches \S (Perl anomaly) */
+  case OP_VSPACE:
+  return next == -ESC_V || next == -ESC_d || next == -ESC_w;
+
+  case OP_NOT_VSPACE:
+  return next == -ESC_v;
+
+  case OP_WORDCHAR:
+  return next == -ESC_W || next == -ESC_s || next == -ESC_h || next == -ESC_v;
+
+  case OP_NOT_WORDCHAR:
+  return next == -ESC_w || next == -ESC_d;
+
+  default:
+  return FALSE;
+  }
+
+/* Control does not reach here */
+}
+
+
+
+/*************************************************
+*           Compile one branch                   *
+*************************************************/
+
+/* Scan the pattern, compiling it into the a vector. If the options are
+changed during the branch, the pointer is used to change the external options
+bits. This function is used during the pre-compile phase when we are trying
+to find out the amount of memory needed, as well as during the real compile
+phase. The value of lengthptr distinguishes the two phases.
+
+Arguments:
+  optionsptr     pointer to the option bits
+  codeptr        points to the pointer to the current code point
+  ptrptr         points to the current pattern pointer
+  errorcodeptr   points to error code variable
+  firstbyteptr   set to initial literal character, or < 0 (REQ_UNSET, REQ_NONE)
+  reqbyteptr     set to the last literal character required, else < 0
+  bcptr          points to current branch chain
+  cd             contains pointers to tables etc.
+  lengthptr      NULL during the real compile phase
+                 points to length accumulator during pre-compile phase
+
+Returns:         TRUE on success
+                 FALSE, with *errorcodeptr set non-zero on error
+*/
+
+static BOOL
+compile_branch(int *optionsptr, uschar **codeptr, const uschar **ptrptr,
+  int *errorcodeptr, int *firstbyteptr, int *reqbyteptr, branch_chain *bcptr,
+  compile_data *cd, int *lengthptr)
+{
+int repeat_type, op_type;
+int repeat_min = 0, repeat_max = 0;      /* To please picky compilers */
+int bravalue = 0;
+int greedy_default, greedy_non_default;
+int firstbyte, reqbyte;
+int zeroreqbyte, zerofirstbyte;
+int req_caseopt, reqvary, tempreqvary;
+int options = *optionsptr;
+int after_manual_callout = 0;
+int length_prevgroup = 0;
+register int c;
+register uschar *code = *codeptr;
+uschar *last_code = code;
+uschar *orig_code = code;
+uschar *tempcode;
+BOOL inescq = FALSE;
+BOOL groupsetfirstbyte = FALSE;
+const uschar *ptr = *ptrptr;
+const uschar *tempptr;
+uschar *previous = NULL;
+uschar *previous_callout = NULL;
+uschar *save_hwm = NULL;
+uschar classbits[32];
+
+#ifdef SUPPORT_UTF8
+BOOL class_utf8;
+BOOL utf8 = (options & PCRE_UTF8) != 0;
+uschar *class_utf8data;
+uschar *class_utf8data_base;
+uschar utf8_char[6];
+#else
+BOOL utf8 = FALSE;
+uschar *utf8_char = NULL;
+#endif
+
+#ifdef DEBUG
+if (lengthptr != NULL) DPRINTF((">> start branch\n"));
+#endif
+
+/* Set up the default and non-default settings for greediness */
+
+greedy_default = ((options & PCRE_UNGREEDY) != 0);
+greedy_non_default = greedy_default ^ 1;
+
+/* Initialize no first byte, no required byte. REQ_UNSET means "no char
+matching encountered yet". It gets changed to REQ_NONE if we hit something that
+matches a non-fixed char first char; reqbyte just remains unset if we never
+find one.
+
+When we hit a repeat whose minimum is zero, we may have to adjust these values
+to take the zero repeat into account. This is implemented by setting them to
+zerofirstbyte and zeroreqbyte when such a repeat is encountered. The individual
+item types that can be repeated set these backoff variables appropriately. */
+
+firstbyte = reqbyte = zerofirstbyte = zeroreqbyte = REQ_UNSET;
+
+/* The variable req_caseopt contains either the REQ_CASELESS value or zero,
+according to the current setting of the caseless flag. REQ_CASELESS is a bit
+value > 255. It is added into the firstbyte or reqbyte variables to record the
+case status of the value. This is used only for ASCII characters. */
+
+req_caseopt = ((options & PCRE_CASELESS) != 0)? REQ_CASELESS : 0;
+
+/* Switch on next character until the end of the branch */
+
+for (;; ptr++)
+  {
+  BOOL negate_class;
+  BOOL should_flip_negation;
+  BOOL possessive_quantifier;
+  BOOL is_quantifier;
+  BOOL is_recurse;
+  BOOL reset_bracount;
+  int class_charcount;
+  int class_lastchar;
+  int newoptions;
+  int recno;
+  int refsign;
+  int skipbytes;
+  int subreqbyte;
+  int subfirstbyte;
+  int terminator;
+  int mclength;
+  uschar mcbuffer[8];
+
+  /* Get next byte in the pattern */
+
+  c = *ptr;
+
+  /* If we are in the pre-compile phase, accumulate the length used for the
+  previous cycle of this loop. */
+
+  if (lengthptr != NULL)
+    {
+#ifdef DEBUG
+    if (code > cd->hwm) cd->hwm = code;                 /* High water info */
+#endif
+    if (code > cd->start_workspace + COMPILE_WORK_SIZE) /* Check for overrun */
+      {
+      *errorcodeptr = ERR52;
+      goto FAILED;
+      }
+
+    /* There is at least one situation where code goes backwards: this is the
+    case of a zero quantifier after a class (e.g. [ab]{0}). At compile time,
+    the class is simply eliminated. However, it is created first, so we have to
+    allow memory for it. Therefore, don't ever reduce the length at this point.
+    */
+
+    if (code < last_code) code = last_code;
+
+    /* Paranoid check for integer overflow */
+
+    if (OFLOW_MAX - *lengthptr < code - last_code)
+      {
+      *errorcodeptr = ERR20;
+      goto FAILED;
+      }
+
+    *lengthptr += code - last_code;
+    DPRINTF(("length=%d added %d c=%c\n", *lengthptr, code - last_code, c));
+
+    /* If "previous" is set and it is not at the start of the work space, move
+    it back to there, in order to avoid filling up the work space. Otherwise,
+    if "previous" is NULL, reset the current code pointer to the start. */
+
+    if (previous != NULL)
+      {
+      if (previous > orig_code)
+        {
+        memmove(orig_code, previous, code - previous);
+        code -= previous - orig_code;
+        previous = orig_code;
+        }
+      }
+    else code = orig_code;
+
+    /* Remember where this code item starts so we can pick up the length
+    next time round. */
+
+    last_code = code;
+    }
+
+  /* In the real compile phase, just check the workspace used by the forward
+  reference list. */
+
+  else if (cd->hwm > cd->start_workspace + COMPILE_WORK_SIZE)
+    {
+    *errorcodeptr = ERR52;
+    goto FAILED;
+    }
+
+  /* If in \Q...\E, check for the end; if not, we have a literal */
+
+  if (inescq && c != 0)
+    {
+    if (c == '\\' && ptr[1] == 'E')
+      {
+      inescq = FALSE;
+      ptr++;
+      continue;
+      }
+    else
+      {
+      if (previous_callout != NULL)
+        {
+        if (lengthptr == NULL)  /* Don't attempt in pre-compile phase */
+          complete_callout(previous_callout, ptr, cd);
+        previous_callout = NULL;
+        }
+      if ((options & PCRE_AUTO_CALLOUT) != 0)
+        {
+        previous_callout = code;
+        code = auto_callout(code, ptr, cd);
+        }
+      goto NORMAL_CHAR;
+      }
+    }
+
+  /* Fill in length of a previous callout, except when the next thing is
+  a quantifier. */
+
+  is_quantifier = c == '*' || c == '+' || c == '?' ||
+    (c == '{' && is_counted_repeat(ptr+1));
+
+  if (!is_quantifier && previous_callout != NULL &&
+       after_manual_callout-- <= 0)
+    {
+    if (lengthptr == NULL)      /* Don't attempt in pre-compile phase */
+      complete_callout(previous_callout, ptr, cd);
+    previous_callout = NULL;
+    }
+
+  /* In extended mode, skip white space and comments */
+
+  if ((options & PCRE_EXTENDED) != 0)
+    {
+    if ((cd->ctypes[c] & ctype_space) != 0) continue;
+    if (c == '#')
+      {
+      while (*(++ptr) != 0)
+        {
+        if (IS_NEWLINE(ptr)) { ptr += cd->nllen - 1; break; }
+        }
+      if (*ptr != 0) continue;
+
+      /* Else fall through to handle end of string */
+      c = 0;
+      }
+    }
+
+  /* No auto callout for quantifiers. */
+
+  if ((options & PCRE_AUTO_CALLOUT) != 0 && !is_quantifier)
+    {
+    previous_callout = code;
+    code = auto_callout(code, ptr, cd);
+    }
+
+  switch(c)
+    {
+    /* ===================================================================*/
+    case 0:                        /* The branch terminates at string end */
+    case '|':                      /* or | or ) */
+    case ')':
+    *firstbyteptr = firstbyte;
+    *reqbyteptr = reqbyte;
+    *codeptr = code;
+    *ptrptr = ptr;
+    if (lengthptr != NULL)
+      {
+      if (OFLOW_MAX - *lengthptr < code - last_code)
+        {
+        *errorcodeptr = ERR20;
+        goto FAILED;
+        }
+      *lengthptr += code - last_code;   /* To include callout length */
+      DPRINTF((">> end branch\n"));
+      }
+    return TRUE;
+
+
+    /* ===================================================================*/
+    /* Handle single-character metacharacters. In multiline mode, ^ disables
+    the setting of any following char as a first character. */
+
+    case '^':
+    if ((options & PCRE_MULTILINE) != 0)
+      {
+      if (firstbyte == REQ_UNSET) firstbyte = REQ_NONE;
+      }
+    previous = NULL;
+    *code++ = OP_CIRC;
+    break;
+
+    case '$':
+    previous = NULL;
+    *code++ = OP_DOLL;
+    break;
+
+    /* There can never be a first char if '.' is first, whatever happens about
+    repeats. The value of reqbyte doesn't change either. */
+
+    case '.':
+    if (firstbyte == REQ_UNSET) firstbyte = REQ_NONE;
+    zerofirstbyte = firstbyte;
+    zeroreqbyte = reqbyte;
+    previous = code;
+    *code++ = OP_ANY;
+    break;
+
+
+    /* ===================================================================*/
+    /* Character classes. If the included characters are all < 256, we build a
+    32-byte bitmap of the permitted characters, except in the special case
+    where there is only one such character. For negated classes, we build the
+    map as usual, then invert it at the end. However, we use a different opcode
+    so that data characters > 255 can be handled correctly.
+
+    If the class contains characters outside the 0-255 range, a different
+    opcode is compiled. It may optionally have a bit map for characters < 256,
+    but those above are are explicitly listed afterwards. A flag byte tells
+    whether the bitmap is present, and whether this is a negated class or not.
+    */
+
+    case '[':
+    previous = code;
+
+    /* PCRE supports POSIX class stuff inside a class. Perl gives an error if
+    they are encountered at the top level, so we'll do that too. */
+
+    if ((ptr[1] == ':' || ptr[1] == '.' || ptr[1] == '=') &&
+        check_posix_syntax(ptr, &tempptr))
+      {
+      *errorcodeptr = (ptr[1] == ':')? ERR13 : ERR31;
+      goto FAILED;
+      }
+
+    /* If the first character is '^', set the negation flag and skip it. Also,
+    if the first few characters (either before or after ^) are \Q\E or \E we
+    skip them too. This makes for compatibility with Perl. */
+
+    negate_class = FALSE;
+    for (;;)
+      {
+      c = *(++ptr);
+      if (c == '\\')
+        {
+        if (ptr[1] == 'E') ptr++;
+          else if (strncmp((const char *)ptr+1, "Q\\E", 3) == 0) ptr += 3;
+            else break;
+        }
+      else if (!negate_class && c == '^')
+        negate_class = TRUE;
+      else break;
+      }
+
+    /* If a class contains a negative special such as \S, we need to flip the
+    negation flag at the end, so that support for characters > 255 works
+    correctly (they are all included in the class). */
+
+    should_flip_negation = FALSE;
+
+    /* Keep a count of chars with values < 256 so that we can optimize the case
+    of just a single character (as long as it's < 256). However, For higher
+    valued UTF-8 characters, we don't yet do any optimization. */
+
+    class_charcount = 0;
+    class_lastchar = -1;
+
+    /* Initialize the 32-char bit map to all zeros. We build the map in a
+    temporary bit of memory, in case the class contains only 1 character (less
+    than 256), because in that case the compiled code doesn't use the bit map.
+    */
+
+    memset(classbits, 0, 32 * sizeof(uschar));
+
+#ifdef SUPPORT_UTF8
+    class_utf8 = FALSE;                       /* No chars >= 256 */
+    class_utf8data = code + LINK_SIZE + 2;    /* For UTF-8 items */
+    class_utf8data_base = class_utf8data;     /* For resetting in pass 1 */
+#endif
+
+    /* Process characters until ] is reached. By writing this as a "do" it
+    means that an initial ] is taken as a data character. At the start of the
+    loop, c contains the first byte of the character. */
+
+    if (c != 0) do
+      {
+      const uschar *oldptr;
+
+#ifdef SUPPORT_UTF8
+      if (utf8 && c > 127)
+        {                           /* Braces are required because the */
+        GETCHARLEN(c, ptr, ptr);    /* macro generates multiple statements */
+        }
+
+      /* In the pre-compile phase, accumulate the length of any UTF-8 extra
+      data and reset the pointer. This is so that very large classes that
+      contain a zillion UTF-8 characters no longer overwrite the work space
+      (which is on the stack). */
+
+      if (lengthptr != NULL)
+        {
+        *lengthptr += class_utf8data - class_utf8data_base;
+        class_utf8data = class_utf8data_base;
+        }
+
+#endif
+
+      /* Inside \Q...\E everything is literal except \E */
+
+      if (inescq)
+        {
+        if (c == '\\' && ptr[1] == 'E')     /* If we are at \E */
+          {
+          inescq = FALSE;                   /* Reset literal state */
+          ptr++;                            /* Skip the 'E' */
+          continue;                         /* Carry on with next */
+          }
+        goto CHECK_RANGE;                   /* Could be range if \E follows */
+        }
+
+      /* Handle POSIX class names. Perl allows a negation extension of the
+      form [:^name:]. A square bracket that doesn't match the syntax is
+      treated as a literal. We also recognize the POSIX constructions
+      [.ch.] and [=ch=] ("collating elements") and fault them, as Perl
+      5.6 and 5.8 do. */
+
+      if (c == '[' &&
+          (ptr[1] == ':' || ptr[1] == '.' || ptr[1] == '=') &&
+          check_posix_syntax(ptr, &tempptr))
+        {
+        BOOL local_negate = FALSE;
+        int posix_class, taboffset, tabopt;
+        register const uschar *cbits = cd->cbits;
+        uschar pbits[32];
+
+        if (ptr[1] != ':')
+          {
+          *errorcodeptr = ERR31;
+          goto FAILED;
+          }
+
+        ptr += 2;
+        if (*ptr == '^')
+          {
+          local_negate = TRUE;
+          should_flip_negation = TRUE;  /* Note negative special */
+          ptr++;
+          }
+
+        posix_class = check_posix_name(ptr, tempptr - ptr);
+        if (posix_class < 0)
+          {
+          *errorcodeptr = ERR30;
+          goto FAILED;
+          }
+
+        /* If matching is caseless, upper and lower are converted to
+        alpha. This relies on the fact that the class table starts with
+        alpha, lower, upper as the first 3 entries. */
+
+        if ((options & PCRE_CASELESS) != 0 && posix_class <= 2)
+          posix_class = 0;
+
+        /* We build the bit map for the POSIX class in a chunk of local store
+        because we may be adding and subtracting from it, and we don't want to
+        subtract bits that may be in the main map already. At the end we or the
+        result into the bit map that is being built. */
+
+        posix_class *= 3;
+
+        /* Copy in the first table (always present) */
+
+        memcpy(pbits, cbits + posix_class_maps[posix_class],
+          32 * sizeof(uschar));
+
+        /* If there is a second table, add or remove it as required. */
+
+        taboffset = posix_class_maps[posix_class + 1];
+        tabopt = posix_class_maps[posix_class + 2];
+
+        if (taboffset >= 0)
+          {
+          if (tabopt >= 0)
+            for (c = 0; c < 32; c++) pbits[c] |= cbits[c + taboffset];
+          else
+            for (c = 0; c < 32; c++) pbits[c] &= ~cbits[c + taboffset];
+          }
+
+        /* Not see if we need to remove any special characters. An option
+        value of 1 removes vertical space and 2 removes underscore. */
+
+        if (tabopt < 0) tabopt = -tabopt;
+        if (tabopt == 1) pbits[1] &= ~0x3c;
+          else if (tabopt == 2) pbits[11] &= 0x7f;
+
+        /* Add the POSIX table or its complement into the main table that is
+        being built and we are done. */
+
+        if (local_negate)
+          for (c = 0; c < 32; c++) classbits[c] |= ~pbits[c];
+        else
+          for (c = 0; c < 32; c++) classbits[c] |= pbits[c];
+
+        ptr = tempptr + 1;
+        class_charcount = 10;  /* Set > 1; assumes more than 1 per class */
+        continue;    /* End of POSIX syntax handling */
+        }
+
+      /* Backslash may introduce a single character, or it may introduce one
+      of the specials, which just set a flag. The sequence \b is a special
+      case. Inside a class (and only there) it is treated as backspace.
+      Elsewhere it marks a word boundary. Other escapes have preset maps ready
+      to 'or' into the one we are building. We assume they have more than one
+      character in them, so set class_charcount bigger than one. */
+
+      if (c == '\\')
+        {
+        c = check_escape(&ptr, errorcodeptr, cd->bracount, options, TRUE);
+        if (*errorcodeptr != 0) goto FAILED;
+
+        if (-c == ESC_b) c = '\b';       /* \b is backspace in a class */
+        else if (-c == ESC_X) c = 'X';   /* \X is literal X in a class */
+        else if (-c == ESC_R) c = 'R';   /* \R is literal R in a class */
+        else if (-c == ESC_Q)            /* Handle start of quoted string */
+          {
+          if (ptr[1] == '\\' && ptr[2] == 'E')
+            {
+            ptr += 2; /* avoid empty string */
+            }
+          else inescq = TRUE;
+          continue;
+          }
+        else if (-c == ESC_E) continue;  /* Ignore orphan \E */
+
+        if (c < 0)
+          {
+          register const uschar *cbits = cd->cbits;
+          class_charcount += 2;     /* Greater than 1 is what matters */
+
+          /* Save time by not doing this in the pre-compile phase. */
+
+          if (lengthptr == NULL) switch (-c)
+            {
+            case ESC_d:
+            for (c = 0; c < 32; c++) classbits[c] |= cbits[c+cbit_digit];
+            continue;
+
+            case ESC_D:
+            should_flip_negation = TRUE;
+            for (c = 0; c < 32; c++) classbits[c] |= ~cbits[c+cbit_digit];
+            continue;
+
+            case ESC_w:
+            for (c = 0; c < 32; c++) classbits[c] |= cbits[c+cbit_word];
+            continue;
+
+            case ESC_W:
+            should_flip_negation = TRUE;
+            for (c = 0; c < 32; c++) classbits[c] |= ~cbits[c+cbit_word];
+            continue;
+
+            case ESC_s:
+            for (c = 0; c < 32; c++) classbits[c] |= cbits[c+cbit_space];
+            classbits[1] &= ~0x08;   /* Perl 5.004 onwards omits VT from \s */
+            continue;
+
+            case ESC_S:
+            should_flip_negation = TRUE;
+            for (c = 0; c < 32; c++) classbits[c] |= ~cbits[c+cbit_space];
+            classbits[1] |= 0x08;    /* Perl 5.004 onwards omits VT from \s */
+            continue;
+
+            default:    /* Not recognized; fall through */
+            break;      /* Need "default" setting to stop compiler warning. */
+            }
+
+          /* In the pre-compile phase, just do the recognition. */
+
+          else if (c == -ESC_d || c == -ESC_D || c == -ESC_w ||
+                   c == -ESC_W || c == -ESC_s || c == -ESC_S) continue;
+
+          /* We need to deal with \H, \h, \V, and \v in both phases because
+          they use extra memory. */
+
+          if (-c == ESC_h)
+            {
+            SETBIT(classbits, 0x09); /* VT */
+            SETBIT(classbits, 0x20); /* SPACE */
+            SETBIT(classbits, 0xa0); /* NSBP */
+#ifdef SUPPORT_UTF8
+            if (utf8)
+              {
+              class_utf8 = TRUE;
+              *class_utf8data++ = XCL_SINGLE;
+              class_utf8data += _pcre_ord2utf8(0x1680, class_utf8data);
+              *class_utf8data++ = XCL_SINGLE;
+              class_utf8data += _pcre_ord2utf8(0x180e, class_utf8data);
+              *class_utf8data++ = XCL_RANGE;
+              class_utf8data += _pcre_ord2utf8(0x2000, class_utf8data);
+              class_utf8data += _pcre_ord2utf8(0x200A, class_utf8data);
+              *class_utf8data++ = XCL_SINGLE;
+              class_utf8data += _pcre_ord2utf8(0x202f, class_utf8data);
+              *class_utf8data++ = XCL_SINGLE;
+              class_utf8data += _pcre_ord2utf8(0x205f, class_utf8data);
+              *class_utf8data++ = XCL_SINGLE;
+              class_utf8data += _pcre_ord2utf8(0x3000, class_utf8data);
+              }
+#endif
+            continue;
+            }
+
+          if (-c == ESC_H)
+            {
+            for (c = 0; c < 32; c++)
+              {
+              int x = 0xff;
+              switch (c)
+                {
+                case 0x09/8: x ^= 1 << (0x09%8); break;
+                case 0x20/8: x ^= 1 << (0x20%8); break;
+                case 0xa0/8: x ^= 1 << (0xa0%8); break;
+                default: break;
+                }
+              classbits[c] |= x;
+              }
+
+#ifdef SUPPORT_UTF8
+            if (utf8)
+              {
+              class_utf8 = TRUE;
+              *class_utf8data++ = XCL_RANGE;
+              class_utf8data += _pcre_ord2utf8(0x0100, class_utf8data);
+              class_utf8data += _pcre_ord2utf8(0x167f, class_utf8data);
+              *class_utf8data++ = XCL_RANGE;
+              class_utf8data += _pcre_ord2utf8(0x1681, class_utf8data);
+              class_utf8data += _pcre_ord2utf8(0x180d, class_utf8data);
+              *class_utf8data++ = XCL_RANGE;
+              class_utf8data += _pcre_ord2utf8(0x180f, class_utf8data);
+              class_utf8data += _pcre_ord2utf8(0x1fff, class_utf8data);
+              *class_utf8data++ = XCL_RANGE;
+              class_utf8data += _pcre_ord2utf8(0x200B, class_utf8data);
+              class_utf8data += _pcre_ord2utf8(0x202e, class_utf8data);
+              *class_utf8data++ = XCL_RANGE;
+              class_utf8data += _pcre_ord2utf8(0x2030, class_utf8data);
+              class_utf8data += _pcre_ord2utf8(0x205e, class_utf8data);
+              *class_utf8data++ = XCL_RANGE;
+              class_utf8data += _pcre_ord2utf8(0x2060, class_utf8data);
+              class_utf8data += _pcre_ord2utf8(0x2fff, class_utf8data);
+              *class_utf8data++ = XCL_RANGE;
+              class_utf8data += _pcre_ord2utf8(0x3001, class_utf8data);
+              class_utf8data += _pcre_ord2utf8(0x7fffffff, class_utf8data);
+              }
+#endif
+            continue;
+            }
+
+          if (-c == ESC_v)
+            {
+            SETBIT(classbits, 0x0a); /* LF */
+            SETBIT(classbits, 0x0b); /* VT */
+            SETBIT(classbits, 0x0c); /* FF */
+            SETBIT(classbits, 0x0d); /* CR */
+            SETBIT(classbits, 0x85); /* NEL */
+#ifdef SUPPORT_UTF8
+            if (utf8)
+              {
+              class_utf8 = TRUE;
+              *class_utf8data++ = XCL_RANGE;
+              class_utf8data += _pcre_ord2utf8(0x2028, class_utf8data);
+              class_utf8data += _pcre_ord2utf8(0x2029, class_utf8data);
+              }
+#endif
+            continue;
+            }
+
+          if (-c == ESC_V)
+            {
+            for (c = 0; c < 32; c++)
+              {
+              int x = 0xff;
+              switch (c)
+                {
+                case 0x0a/8: x ^= 1 << (0x0a%8);
+                             x ^= 1 << (0x0b%8);
+                             x ^= 1 << (0x0c%8);
+                             x ^= 1 << (0x0d%8);
+                             break;
+                case 0x85/8: x ^= 1 << (0x85%8); break;
+                default: break;
+                }
+              classbits[c] |= x;
+              }
+
+#ifdef SUPPORT_UTF8
+            if (utf8)
+              {
+              class_utf8 = TRUE;
+              *class_utf8data++ = XCL_RANGE;
+              class_utf8data += _pcre_ord2utf8(0x0100, class_utf8data);
+              class_utf8data += _pcre_ord2utf8(0x2027, class_utf8data);
+              *class_utf8data++ = XCL_RANGE;
+              class_utf8data += _pcre_ord2utf8(0x2029, class_utf8data);
+              class_utf8data += _pcre_ord2utf8(0x7fffffff, class_utf8data);
+              }
+#endif
+            continue;
+            }
+
+          /* We need to deal with \P and \p in both phases. */
+
+#ifdef SUPPORT_UCP
+          if (-c == ESC_p || -c == ESC_P)
+            {
+            BOOL negated;
+            int pdata;
+            int ptype = get_ucp(&ptr, &negated, &pdata, errorcodeptr);
+            if (ptype < 0) goto FAILED;
+            class_utf8 = TRUE;
+            *class_utf8data++ = ((-c == ESC_p) != negated)?
+              XCL_PROP : XCL_NOTPROP;
+            *class_utf8data++ = ptype;
+            *class_utf8data++ = pdata;
+            class_charcount -= 2;   /* Not a < 256 character */
+            continue;
+            }
+#endif
+          /* Unrecognized escapes are faulted if PCRE is running in its
+          strict mode. By default, for compatibility with Perl, they are
+          treated as literals. */
+
+          if ((options & PCRE_EXTRA) != 0)
+            {
+            *errorcodeptr = ERR7;
+            goto FAILED;
+            }
+
+          class_charcount -= 2;  /* Undo the default count from above */
+          c = *ptr;              /* Get the final character and fall through */
+          }
+
+        /* Fall through if we have a single character (c >= 0). This may be
+        greater than 256 in UTF-8 mode. */
+
+        }   /* End of backslash handling */
+
+      /* A single character may be followed by '-' to form a range. However,
+      Perl does not permit ']' to be the end of the range. A '-' character
+      at the end is treated as a literal. Perl ignores orphaned \E sequences
+      entirely. The code for handling \Q and \E is messy. */
+
+      CHECK_RANGE:
+      while (ptr[1] == '\\' && ptr[2] == 'E')
+        {
+        inescq = FALSE;
+        ptr += 2;
+        }
+
+      oldptr = ptr;
+
+      /* Remember \r or \n */
+
+      if (c == '\r' || c == '\n') cd->external_flags |= PCRE_HASCRORLF;
+
+      /* Check for range */
+
+      if (!inescq && ptr[1] == '-')
+        {
+        int d;
+        ptr += 2;
+        while (*ptr == '\\' && ptr[1] == 'E') ptr += 2;
+
+        /* If we hit \Q (not followed by \E) at this point, go into escaped
+        mode. */
+
+        while (*ptr == '\\' && ptr[1] == 'Q')
+          {
+          ptr += 2;
+          if (*ptr == '\\' && ptr[1] == 'E') { ptr += 2; continue; }
+          inescq = TRUE;
+          break;
+          }
+
+        if (*ptr == 0 || (!inescq && *ptr == ']'))
+          {
+          ptr = oldptr;
+          goto LONE_SINGLE_CHARACTER;
+          }
+
+#ifdef SUPPORT_UTF8
+        if (utf8)
+          {                           /* Braces are required because the */
+          GETCHARLEN(d, ptr, ptr);    /* macro generates multiple statements */
+          }
+        else
+#endif
+        d = *ptr;  /* Not UTF-8 mode */
+
+        /* The second part of a range can be a single-character escape, but
+        not any of the other escapes. Perl 5.6 treats a hyphen as a literal
+        in such circumstances. */
+
+        if (!inescq && d == '\\')
+          {
+          d = check_escape(&ptr, errorcodeptr, cd->bracount, options, TRUE);
+          if (*errorcodeptr != 0) goto FAILED;
+
+          /* \b is backspace; \X is literal X; \R is literal R; any other
+          special means the '-' was literal */
+
+          if (d < 0)
+            {
+            if (d == -ESC_b) d = '\b';
+            else if (d == -ESC_X) d = 'X';
+            else if (d == -ESC_R) d = 'R'; else
+              {
+              ptr = oldptr;
+              goto LONE_SINGLE_CHARACTER;  /* A few lines below */
+              }
+            }
+          }
+
+        /* Check that the two values are in the correct order. Optimize
+        one-character ranges */
+
+        if (d < c)
+          {
+          *errorcodeptr = ERR8;
+          goto FAILED;
+          }
+
+        if (d == c) goto LONE_SINGLE_CHARACTER;  /* A few lines below */
+
+        /* Remember \r or \n */
+
+        if (d == '\r' || d == '\n') cd->external_flags |= PCRE_HASCRORLF;
+
+        /* In UTF-8 mode, if the upper limit is > 255, or > 127 for caseless
+        matching, we have to use an XCLASS with extra data items. Caseless
+        matching for characters > 127 is available only if UCP support is
+        available. */
+
+#ifdef SUPPORT_UTF8
+        if (utf8 && (d > 255 || ((options & PCRE_CASELESS) != 0 && d > 127)))
+          {
+          class_utf8 = TRUE;
+
+          /* With UCP support, we can find the other case equivalents of
+          the relevant characters. There may be several ranges. Optimize how
+          they fit with the basic range. */
+
+#ifdef SUPPORT_UCP
+          if ((options & PCRE_CASELESS) != 0)
+            {
+            unsigned int occ, ocd;
+            unsigned int cc = c;
+            unsigned int origd = d;
+            while (get_othercase_range(&cc, origd, &occ, &ocd))
+              {
+              if (occ >= (unsigned int)c &&
+                  ocd <= (unsigned int)d)
+                continue;                          /* Skip embedded ranges */
+
+              if (occ < (unsigned int)c  &&
+                  ocd >= (unsigned int)c - 1)      /* Extend the basic range */
+                {                                  /* if there is overlap,   */
+                c = occ;                           /* noting that if occ < c */
+                continue;                          /* we can't have ocd > d  */
+                }                                  /* because a subrange is  */
+              if (ocd > (unsigned int)d &&
+                  occ <= (unsigned int)d + 1)      /* always shorter than    */
+                {                                  /* the basic range.       */
+                d = ocd;
+                continue;
+                }
+
+              if (occ == ocd)
+                {
+                *class_utf8data++ = XCL_SINGLE;
+                }
+              else
+                {
+                *class_utf8data++ = XCL_RANGE;
+                class_utf8data += _pcre_ord2utf8(occ, class_utf8data);
+                }
+              class_utf8data += _pcre_ord2utf8(ocd, class_utf8data);
+              }
+            }
+#endif  /* SUPPORT_UCP */
+
+          /* Now record the original range, possibly modified for UCP caseless
+          overlapping ranges. */
+
+          *class_utf8data++ = XCL_RANGE;
+          class_utf8data += _pcre_ord2utf8(c, class_utf8data);
+          class_utf8data += _pcre_ord2utf8(d, class_utf8data);
+
+          /* With UCP support, we are done. Without UCP support, there is no
+          caseless matching for UTF-8 characters > 127; we can use the bit map
+          for the smaller ones. */
+
+#ifdef SUPPORT_UCP
+          continue;    /* With next character in the class */
+#else
+          if ((options & PCRE_CASELESS) == 0 || c > 127) continue;
+
+          /* Adjust upper limit and fall through to set up the map */
+
+          d = 127;
+
+#endif  /* SUPPORT_UCP */
+          }
+#endif  /* SUPPORT_UTF8 */
+
+        /* We use the bit map for all cases when not in UTF-8 mode; else
+        ranges that lie entirely within 0-127 when there is UCP support; else
+        for partial ranges without UCP support. */
+
+        class_charcount += d - c + 1;
+        class_lastchar = d;
+
+        /* We can save a bit of time by skipping this in the pre-compile. */
+
+        if (lengthptr == NULL) for (; c <= d; c++)
+          {
+          classbits[c/8] |= (1 << (c&7));
+          if ((options & PCRE_CASELESS) != 0)
+            {
+            int uc = cd->fcc[c];           /* flip case */
+            classbits[uc/8] |= (1 << (uc&7));
+            }
+          }
+
+        continue;   /* Go get the next char in the class */
+        }
+
+      /* Handle a lone single character - we can get here for a normal
+      non-escape char, or after \ that introduces a single character or for an
+      apparent range that isn't. */
+
+      LONE_SINGLE_CHARACTER:
+
+      /* Handle a character that cannot go in the bit map */
+
+#ifdef SUPPORT_UTF8
+      if (utf8 && (c > 255 || ((options & PCRE_CASELESS) != 0 && c > 127)))
+        {
+        class_utf8 = TRUE;
+        *class_utf8data++ = XCL_SINGLE;
+        class_utf8data += _pcre_ord2utf8(c, class_utf8data);
+
+#ifdef SUPPORT_UCP
+        if ((options & PCRE_CASELESS) != 0)
+          {
+          unsigned int othercase;
+          if ((othercase = _pcre_ucp_othercase(c)) != NOTACHAR)
+            {
+            *class_utf8data++ = XCL_SINGLE;
+            class_utf8data += _pcre_ord2utf8(othercase, class_utf8data);
+            }
+          }
+#endif  /* SUPPORT_UCP */
+
+        }
+      else
+#endif  /* SUPPORT_UTF8 */
+
+      /* Handle a single-byte character */
+        {
+        classbits[c/8] |= (1 << (c&7));
+        if ((options & PCRE_CASELESS) != 0)
+          {
+          c = cd->fcc[c];   /* flip case */
+          classbits[c/8] |= (1 << (c&7));
+          }
+        class_charcount++;
+        class_lastchar = c;
+        }
+      }
+
+    /* Loop until ']' reached. This "while" is the end of the "do" above. */
+
+    while ((c = *(++ptr)) != 0 && (c != ']' || inescq));
+
+    if (c == 0)                          /* Missing terminating ']' */
+      {
+      *errorcodeptr = ERR6;
+      goto FAILED;
+      }
+
+
+/* This code has been disabled because it would mean that \s counts as
+an explicit \r or \n reference, and that's not really what is wanted. Now
+we set the flag only if there is a literal "\r" or "\n" in the class. */
+
+#if 0
+    /* Remember whether \r or \n are in this class */
+
+    if (negate_class)
+      {
+      if ((classbits[1] & 0x24) != 0x24) cd->external_flags |= PCRE_HASCRORLF;
+      }
+    else
+      {
+      if ((classbits[1] & 0x24) != 0) cd->external_flags |= PCRE_HASCRORLF;
+      }
+#endif
+
+
+    /* If class_charcount is 1, we saw precisely one character whose value is
+    less than 256. As long as there were no characters >= 128 and there was no
+    use of \p or \P, in other words, no use of any XCLASS features, we can
+    optimize.
+
+    In UTF-8 mode, we can optimize the negative case only if there were no
+    characters >= 128 because OP_NOT and the related opcodes like OP_NOTSTAR
+    operate on single-bytes only. This is an historical hangover. Maybe one day
+    we can tidy these opcodes to handle multi-byte characters.
+
+    The optimization throws away the bit map. We turn the item into a
+    1-character OP_CHAR[NC] if it's positive, or OP_NOT if it's negative. Note
+    that OP_NOT does not support multibyte characters. In the positive case, it
+    can cause firstbyte to be set. Otherwise, there can be no first char if
+    this item is first, whatever repeat count may follow. In the case of
+    reqbyte, save the previous value for reinstating. */
+
+#ifdef SUPPORT_UTF8
+    if (class_charcount == 1 && !class_utf8 &&
+      (!utf8 || !negate_class || class_lastchar < 128))
+#else
+    if (class_charcount == 1)
+#endif
+      {
+      zeroreqbyte = reqbyte;
+
+      /* The OP_NOT opcode works on one-byte characters only. */
+
+      if (negate_class)
+        {
+        if (firstbyte == REQ_UNSET) firstbyte = REQ_NONE;
+        zerofirstbyte = firstbyte;
+        *code++ = OP_NOT;
+        *code++ = class_lastchar;
+        break;
+        }
+
+      /* For a single, positive character, get the value into mcbuffer, and
+      then we can handle this with the normal one-character code. */
+
+#ifdef SUPPORT_UTF8
+      if (utf8 && class_lastchar > 127)
+        mclength = _pcre_ord2utf8(class_lastchar, mcbuffer);
+      else
+#endif
+        {
+        mcbuffer[0] = class_lastchar;
+        mclength = 1;
+        }
+      goto ONE_CHAR;
+      }       /* End of 1-char optimization */
+
+    /* The general case - not the one-char optimization. If this is the first
+    thing in the branch, there can be no first char setting, whatever the
+    repeat count. Any reqbyte setting must remain unchanged after any kind of
+    repeat. */
+
+    if (firstbyte == REQ_UNSET) firstbyte = REQ_NONE;
+    zerofirstbyte = firstbyte;
+    zeroreqbyte = reqbyte;
+
+    /* If there are characters with values > 255, we have to compile an
+    extended class, with its own opcode, unless there was a negated special
+    such as \S in the class, because in that case all characters > 255 are in
+    the class, so any that were explicitly given as well can be ignored. If
+    (when there are explicit characters > 255 that must be listed) there are no
+    characters < 256, we can omit the bitmap in the actual compiled code. */
+
+#ifdef SUPPORT_UTF8
+    if (class_utf8 && !should_flip_negation)
+      {
+      *class_utf8data++ = XCL_END;    /* Marks the end of extra data */
+      *code++ = OP_XCLASS;
+      code += LINK_SIZE;
+      *code = negate_class? XCL_NOT : 0;
+
+      /* If the map is required, move up the extra data to make room for it;
+      otherwise just move the code pointer to the end of the extra data. */
+
+      if (class_charcount > 0)
+        {
+        *code++ |= XCL_MAP;
+        memmove(code + 32, code, class_utf8data - code);
+        memcpy(code, classbits, 32);
+        code = class_utf8data + 32;
+        }
+      else code = class_utf8data;
+
+      /* Now fill in the complete length of the item */
+
+      PUT(previous, 1, code - previous);
+      break;   /* End of class handling */
+      }
+#endif
+
+    /* If there are no characters > 255, set the opcode to OP_CLASS or
+    OP_NCLASS, depending on whether the whole class was negated and whether
+    there were negative specials such as \S in the class. Then copy the 32-byte
+    map into the code vector, negating it if necessary. */
+
+    *code++ = (negate_class == should_flip_negation) ? OP_CLASS : OP_NCLASS;
+    if (negate_class)
+      {
+      if (lengthptr == NULL)    /* Save time in the pre-compile phase */
+        for (c = 0; c < 32; c++) code[c] = ~classbits[c];
+      }
+    else
+      {
+      memcpy(code, classbits, 32);
+      }
+    code += 32;
+    break;
+
+
+    /* ===================================================================*/
+    /* Various kinds of repeat; '{' is not necessarily a quantifier, but this
+    has been tested above. */
+
+    case '{':
+    if (!is_quantifier) goto NORMAL_CHAR;
+    ptr = read_repeat_counts(ptr+1, &repeat_min, &repeat_max, errorcodeptr);
+    if (*errorcodeptr != 0) goto FAILED;
+    goto REPEAT;
+
+    case '*':
+    repeat_min = 0;
+    repeat_max = -1;
+    goto REPEAT;
+
+    case '+':
+    repeat_min = 1;
+    repeat_max = -1;
+    goto REPEAT;
+
+    case '?':
+    repeat_min = 0;
+    repeat_max = 1;
+
+    REPEAT:
+    if (previous == NULL)
+      {
+      *errorcodeptr = ERR9;
+      goto FAILED;
+      }
+
+    if (repeat_min == 0)
+      {
+      firstbyte = zerofirstbyte;    /* Adjust for zero repeat */
+      reqbyte = zeroreqbyte;        /* Ditto */
+      }
+
+    /* Remember whether this is a variable length repeat */
+
+    reqvary = (repeat_min == repeat_max)? 0 : REQ_VARY;
+
+    op_type = 0;                    /* Default single-char op codes */
+    possessive_quantifier = FALSE;  /* Default not possessive quantifier */
+
+    /* Save start of previous item, in case we have to move it up to make space
+    for an inserted OP_ONCE for the additional '+' extension. */
+
+    tempcode = previous;
+
+    /* If the next character is '+', we have a possessive quantifier. This
+    implies greediness, whatever the setting of the PCRE_UNGREEDY option.
+    If the next character is '?' this is a minimizing repeat, by default,
+    but if PCRE_UNGREEDY is set, it works the other way round. We change the
+    repeat type to the non-default. */
+
+    if (ptr[1] == '+')
+      {
+      repeat_type = 0;                  /* Force greedy */
+      possessive_quantifier = TRUE;
+      ptr++;
+      }
+    else if (ptr[1] == '?')
+      {
+      repeat_type = greedy_non_default;
+      ptr++;
+      }
+    else repeat_type = greedy_default;
+
+    /* If previous was a character match, abolish the item and generate a
+    repeat item instead. If a char item has a minumum of more than one, ensure
+    that it is set in reqbyte - it might not be if a sequence such as x{3} is
+    the first thing in a branch because the x will have gone into firstbyte
+    instead.  */
+
+    if (*previous == OP_CHAR || *previous == OP_CHARNC)
+      {
+      /* Deal with UTF-8 characters that take up more than one byte. It's
+      easier to write this out separately than try to macrify it. Use c to
+      hold the length of the character in bytes, plus 0x80 to flag that it's a
+      length rather than a small character. */
+
+#ifdef SUPPORT_UTF8
+      if (utf8 && (code[-1] & 0x80) != 0)
+        {
+        uschar *lastchar = code - 1;
+        while((*lastchar & 0xc0) == 0x80) lastchar--;
+        c = code - lastchar;            /* Length of UTF-8 character */
+        memcpy(utf8_char, lastchar, c); /* Save the char */
+        c |= 0x80;                      /* Flag c as a length */
+        }
+      else
+#endif
+
+      /* Handle the case of a single byte - either with no UTF8 support, or
+      with UTF-8 disabled, or for a UTF-8 character < 128. */
+
+        {
+        c = code[-1];
+        if (repeat_min > 1) reqbyte = c | req_caseopt | cd->req_varyopt;
+        }
+
+      /* If the repetition is unlimited, it pays to see if the next thing on
+      the line is something that cannot possibly match this character. If so,
+      automatically possessifying this item gains some performance in the case
+      where the match fails. */
+
+      if (!possessive_quantifier &&
+          repeat_max < 0 &&
+          check_auto_possessive(*previous, c, utf8, utf8_char, ptr + 1,
+            options, cd))
+        {
+        repeat_type = 0;    /* Force greedy */
+        possessive_quantifier = TRUE;
+        }
+
+      goto OUTPUT_SINGLE_REPEAT;   /* Code shared with single character types */
+      }
+
+    /* If previous was a single negated character ([^a] or similar), we use
+    one of the special opcodes, replacing it. The code is shared with single-
+    character repeats by setting opt_type to add a suitable offset into
+    repeat_type. We can also test for auto-possessification. OP_NOT is
+    currently used only for single-byte chars. */
+
+    else if (*previous == OP_NOT)
+      {
+      op_type = OP_NOTSTAR - OP_STAR;  /* Use "not" opcodes */
+      c = previous[1];
+      if (!possessive_quantifier &&
+          repeat_max < 0 &&
+          check_auto_possessive(OP_NOT, c, utf8, NULL, ptr + 1, options, cd))
+        {
+        repeat_type = 0;    /* Force greedy */
+        possessive_quantifier = TRUE;
+        }
+      goto OUTPUT_SINGLE_REPEAT;
+      }
+
+    /* If previous was a character type match (\d or similar), abolish it and
+    create a suitable repeat item. The code is shared with single-character
+    repeats by setting op_type to add a suitable offset into repeat_type. Note
+    the the Unicode property types will be present only when SUPPORT_UCP is
+    defined, but we don't wrap the little bits of code here because it just
+    makes it horribly messy. */
+
+    else if (*previous < OP_EODN)
+      {
+      uschar *oldcode;
+      int prop_type, prop_value;
+      op_type = OP_TYPESTAR - OP_STAR;  /* Use type opcodes */
+      c = *previous;
+
+      if (!possessive_quantifier &&
+          repeat_max < 0 &&
+          check_auto_possessive(c, 0, utf8, NULL, ptr + 1, options, cd))
+        {
+        repeat_type = 0;    /* Force greedy */
+        possessive_quantifier = TRUE;
+        }
+
+      OUTPUT_SINGLE_REPEAT:
+      if (*previous == OP_PROP || *previous == OP_NOTPROP)
+        {
+        prop_type = previous[1];
+        prop_value = previous[2];
+        }
+      else prop_type = prop_value = -1;
+
+      oldcode = code;
+      code = previous;                  /* Usually overwrite previous item */
+
+      /* If the maximum is zero then the minimum must also be zero; Perl allows
+      this case, so we do too - by simply omitting the item altogether. */
+
+      if (repeat_max == 0) goto END_REPEAT;
+
+      /* All real repeats make it impossible to handle partial matching (maybe
+      one day we will be able to remove this restriction). */
+
+      if (repeat_max != 1) cd->external_flags |= PCRE_NOPARTIAL;
+
+      /* Combine the op_type with the repeat_type */
+
+      repeat_type += op_type;
+
+      /* A minimum of zero is handled either as the special case * or ?, or as
+      an UPTO, with the maximum given. */
+
+      if (repeat_min == 0)
+        {
+        if (repeat_max == -1) *code++ = OP_STAR + repeat_type;
+          else if (repeat_max == 1) *code++ = OP_QUERY + repeat_type;
+        else
+          {
+          *code++ = OP_UPTO + repeat_type;
+          PUT2INC(code, 0, repeat_max);
+          }
+        }
+
+      /* A repeat minimum of 1 is optimized into some special cases. If the
+      maximum is unlimited, we use OP_PLUS. Otherwise, the original item is
+      left in place and, if the maximum is greater than 1, we use OP_UPTO with
+      one less than the maximum. */
+
+      else if (repeat_min == 1)
+        {
+        if (repeat_max == -1)
+          *code++ = OP_PLUS + repeat_type;
+        else
+          {
+          code = oldcode;                 /* leave previous item in place */
+          if (repeat_max == 1) goto END_REPEAT;
+          *code++ = OP_UPTO + repeat_type;
+          PUT2INC(code, 0, repeat_max - 1);
+          }
+        }
+
+      /* The case {n,n} is just an EXACT, while the general case {n,m} is
+      handled as an EXACT followed by an UPTO. */
+
+      else
+        {
+        *code++ = OP_EXACT + op_type;  /* NB EXACT doesn't have repeat_type */
+        PUT2INC(code, 0, repeat_min);
+
+        /* If the maximum is unlimited, insert an OP_STAR. Before doing so,
+        we have to insert the character for the previous code. For a repeated
+        Unicode property match, there are two extra bytes that define the
+        required property. In UTF-8 mode, long characters have their length in
+        c, with the 0x80 bit as a flag. */
+
+        if (repeat_max < 0)
+          {
+#ifdef SUPPORT_UTF8
+          if (utf8 && c >= 128)
+            {
+            memcpy(code, utf8_char, c & 7);
+            code += c & 7;
+            }
+          else
+#endif
+            {
+            *code++ = c;
+            if (prop_type >= 0)
+              {
+              *code++ = prop_type;
+              *code++ = prop_value;
+              }
+            }
+          *code++ = OP_STAR + repeat_type;
+          }
+
+        /* Else insert an UPTO if the max is greater than the min, again
+        preceded by the character, for the previously inserted code. If the
+        UPTO is just for 1 instance, we can use QUERY instead. */
+
+        else if (repeat_max != repeat_min)
+          {
+#ifdef SUPPORT_UTF8
+          if (utf8 && c >= 128)
+            {
+            memcpy(code, utf8_char, c & 7);
+            code += c & 7;
+            }
+          else
+#endif
+          *code++ = c;
+          if (prop_type >= 0)
+            {
+            *code++ = prop_type;
+            *code++ = prop_value;
+            }
+          repeat_max -= repeat_min;
+
+          if (repeat_max == 1)
+            {
+            *code++ = OP_QUERY + repeat_type;
+            }
+          else
+            {
+            *code++ = OP_UPTO + repeat_type;
+            PUT2INC(code, 0, repeat_max);
+            }
+          }
+        }
+
+      /* The character or character type itself comes last in all cases. */
+
+#ifdef SUPPORT_UTF8
+      if (utf8 && c >= 128)
+        {
+        memcpy(code, utf8_char, c & 7);
+        code += c & 7;
+        }
+      else
+#endif
+      *code++ = c;
+
+      /* For a repeated Unicode property match, there are two extra bytes that
+      define the required property. */
+
+#ifdef SUPPORT_UCP
+      if (prop_type >= 0)
+        {
+        *code++ = prop_type;
+        *code++ = prop_value;
+        }
+#endif
+      }
+
+    /* If previous was a character class or a back reference, we put the repeat
+    stuff after it, but just skip the item if the repeat was {0,0}. */
+
+    else if (*previous == OP_CLASS ||
+             *previous == OP_NCLASS ||
+#ifdef SUPPORT_UTF8
+             *previous == OP_XCLASS ||
+#endif
+             *previous == OP_REF)
+      {
+      if (repeat_max == 0)
+        {
+        code = previous;
+        goto END_REPEAT;
+        }
+
+      /* All real repeats make it impossible to handle partial matching (maybe
+      one day we will be able to remove this restriction). */
+
+      if (repeat_max != 1) cd->external_flags |= PCRE_NOPARTIAL;
+
+      if (repeat_min == 0 && repeat_max == -1)
+        *code++ = OP_CRSTAR + repeat_type;
+      else if (repeat_min == 1 && repeat_max == -1)
+        *code++ = OP_CRPLUS + repeat_type;
+      else if (repeat_min == 0 && repeat_max == 1)
+        *code++ = OP_CRQUERY + repeat_type;
+      else
+        {
+        *code++ = OP_CRRANGE + repeat_type;
+        PUT2INC(code, 0, repeat_min);
+        if (repeat_max == -1) repeat_max = 0;  /* 2-byte encoding for max */
+        PUT2INC(code, 0, repeat_max);
+        }
+      }
+
+    /* If previous was a bracket group, we may have to replicate it in certain
+    cases. */
+
+    else if (*previous == OP_BRA  || *previous == OP_CBRA ||
+             *previous == OP_ONCE || *previous == OP_COND)
+      {
+      register int i;
+      int ketoffset = 0;
+      int len = code - previous;
+      uschar *bralink = NULL;
+
+      /* Repeating a DEFINE group is pointless */
+
+      if (*previous == OP_COND && previous[LINK_SIZE+1] == OP_DEF)
+        {
+        *errorcodeptr = ERR55;
+        goto FAILED;
+        }
+
+      /* If the maximum repeat count is unlimited, find the end of the bracket
+      by scanning through from the start, and compute the offset back to it
+      from the current code pointer. There may be an OP_OPT setting following
+      the final KET, so we can't find the end just by going back from the code
+      pointer. */
+
+      if (repeat_max == -1)
+        {
+        register uschar *ket = previous;
+        do ket += GET(ket, 1); while (*ket != OP_KET);
+        ketoffset = code - ket;
+        }
+
+      /* The case of a zero minimum is special because of the need to stick
+      OP_BRAZERO in front of it, and because the group appears once in the
+      data, whereas in other cases it appears the minimum number of times. For
+      this reason, it is simplest to treat this case separately, as otherwise
+      the code gets far too messy. There are several special subcases when the
+      minimum is zero. */
+
+      if (repeat_min == 0)
+        {
+        /* If the maximum is also zero, we just omit the group from the output
+        altogether. */
+
+        if (repeat_max == 0)
+          {
+          code = previous;
+          goto END_REPEAT;
+          }
+
+        /* If the maximum is 1 or unlimited, we just have to stick in the
+        BRAZERO and do no more at this point. However, we do need to adjust
+        any OP_RECURSE calls inside the group that refer to the group itself or
+        any internal or forward referenced group, because the offset is from
+        the start of the whole regex. Temporarily terminate the pattern while
+        doing this. */
+
+        if (repeat_max <= 1)
+          {
+          *code = OP_END;
+          adjust_recurse(previous, 1, utf8, cd, save_hwm);
+          memmove(previous+1, previous, len);
+          code++;
+          *previous++ = OP_BRAZERO + repeat_type;
+          }
+
+        /* If the maximum is greater than 1 and limited, we have to replicate
+        in a nested fashion, sticking OP_BRAZERO before each set of brackets.
+        The first one has to be handled carefully because it's the original
+        copy, which has to be moved up. The remainder can be handled by code
+        that is common with the non-zero minimum case below. We have to
+        adjust the value or repeat_max, since one less copy is required. Once
+        again, we may have to adjust any OP_RECURSE calls inside the group. */
+
+        else
+          {
+          int offset;
+          *code = OP_END;
+          adjust_recurse(previous, 2 + LINK_SIZE, utf8, cd, save_hwm);
+          memmove(previous + 2 + LINK_SIZE, previous, len);
+          code += 2 + LINK_SIZE;
+          *previous++ = OP_BRAZERO + repeat_type;
+          *previous++ = OP_BRA;
+
+          /* We chain together the bracket offset fields that have to be
+          filled in later when the ends of the brackets are reached. */
+
+          offset = (bralink == NULL)? 0 : previous - bralink;
+          bralink = previous;
+          PUTINC(previous, 0, offset);
+          }
+
+        repeat_max--;
+        }
+
+      /* If the minimum is greater than zero, replicate the group as many
+      times as necessary, and adjust the maximum to the number of subsequent
+      copies that we need. If we set a first char from the group, and didn't
+      set a required char, copy the latter from the former. If there are any
+      forward reference subroutine calls in the group, there will be entries on
+      the workspace list; replicate these with an appropriate increment. */
+
+      else
+        {
+        if (repeat_min > 1)
+          {
+          /* In the pre-compile phase, we don't actually do the replication. We
+          just adjust the length as if we had. Do some paranoid checks for
+          potential integer overflow. */
+
+          if (lengthptr != NULL)
+            {
+            int delta = (repeat_min - 1)*length_prevgroup;
+            if ((double)(repeat_min - 1)*(double)length_prevgroup >
+                                                            (double)INT_MAX ||
+                OFLOW_MAX - *lengthptr < delta)
+              {
+              *errorcodeptr = ERR20;
+              goto FAILED;
+              }
+            *lengthptr += delta;
+            }
+
+          /* This is compiling for real */
+
+          else
+            {
+            if (groupsetfirstbyte && reqbyte < 0) reqbyte = firstbyte;
+            for (i = 1; i < repeat_min; i++)
+              {
+              uschar *hc;
+              uschar *this_hwm = cd->hwm;
+              memcpy(code, previous, len);
+              for (hc = save_hwm; hc < this_hwm; hc += LINK_SIZE)
+                {
+                PUT(cd->hwm, 0, GET(hc, 0) + len);
+                cd->hwm += LINK_SIZE;
+                }
+              save_hwm = this_hwm;
+              code += len;
+              }
+            }
+          }
+
+        if (repeat_max > 0) repeat_max -= repeat_min;
+        }
+
+      /* This code is common to both the zero and non-zero minimum cases. If
+      the maximum is limited, it replicates the group in a nested fashion,
+      remembering the bracket starts on a stack. In the case of a zero minimum,
+      the first one was set up above. In all cases the repeat_max now specifies
+      the number of additional copies needed. Again, we must remember to
+      replicate entries on the forward reference list. */
+
+      if (repeat_max >= 0)
+        {
+        /* In the pre-compile phase, we don't actually do the replication. We
+        just adjust the length as if we had. For each repetition we must add 1
+        to the length for BRAZERO and for all but the last repetition we must
+        add 2 + 2*LINKSIZE to allow for the nesting that occurs. Do some
+        paranoid checks to avoid integer overflow. */
+
+        if (lengthptr != NULL && repeat_max > 0)
+          {
+          int delta = repeat_max * (length_prevgroup + 1 + 2 + 2*LINK_SIZE) -
+                      2 - 2*LINK_SIZE;   /* Last one doesn't nest */
+          if ((double)repeat_max *
+                (double)(length_prevgroup + 1 + 2 + 2*LINK_SIZE)
+                  > (double)INT_MAX ||
+              OFLOW_MAX - *lengthptr < delta)
+            {
+            *errorcodeptr = ERR20;
+            goto FAILED;
+            }
+          *lengthptr += delta;
+          }
+
+        /* This is compiling for real */
+
+        else for (i = repeat_max - 1; i >= 0; i--)
+          {
+          uschar *hc;
+          uschar *this_hwm = cd->hwm;
+
+          *code++ = OP_BRAZERO + repeat_type;
+
+          /* All but the final copy start a new nesting, maintaining the
+          chain of brackets outstanding. */
+
+          if (i != 0)
+            {
+            int offset;
+            *code++ = OP_BRA;
+            offset = (bralink == NULL)? 0 : code - bralink;
+            bralink = code;
+            PUTINC(code, 0, offset);
+            }
+
+          memcpy(code, previous, len);
+          for (hc = save_hwm; hc < this_hwm; hc += LINK_SIZE)
+            {
+            PUT(cd->hwm, 0, GET(hc, 0) + len + ((i != 0)? 2+LINK_SIZE : 1));
+            cd->hwm += LINK_SIZE;
+            }
+          save_hwm = this_hwm;
+          code += len;
+          }
+
+        /* Now chain through the pending brackets, and fill in their length
+        fields (which are holding the chain links pro tem). */
+
+        while (bralink != NULL)
+          {
+          int oldlinkoffset;
+          int offset = code - bralink + 1;
+          uschar *bra = code - offset;
+          oldlinkoffset = GET(bra, 1);
+          bralink = (oldlinkoffset == 0)? NULL : bralink - oldlinkoffset;
+          *code++ = OP_KET;
+          PUTINC(code, 0, offset);
+          PUT(bra, 1, offset);
+          }
+        }
+
+      /* If the maximum is unlimited, set a repeater in the final copy. We
+      can't just offset backwards from the current code point, because we
+      don't know if there's been an options resetting after the ket. The
+      correct offset was computed above.
+
+      Then, when we are doing the actual compile phase, check to see whether
+      this group is a non-atomic one that could match an empty string. If so,
+      convert the initial operator to the S form (e.g. OP_BRA -> OP_SBRA) so
+      that runtime checking can be done. [This check is also applied to
+      atomic groups at runtime, but in a different way.] */
+
+      else
+        {
+        uschar *ketcode = code - ketoffset;
+        uschar *bracode = ketcode - GET(ketcode, 1);
+        *ketcode = OP_KETRMAX + repeat_type;
+        if (lengthptr == NULL && *bracode != OP_ONCE)
+          {
+          uschar *scode = bracode;
+          do
+            {
+            if (could_be_empty_branch(scode, ketcode, utf8))
+              {
+              *bracode += OP_SBRA - OP_BRA;
+              break;
+              }
+            scode += GET(scode, 1);
+            }
+          while (*scode == OP_ALT);
+          }
+        }
+      }
+
+    /* Else there's some kind of shambles */
+
+    else
+      {
+      *errorcodeptr = ERR11;
+      goto FAILED;
+      }
+
+    /* If the character following a repeat is '+', or if certain optimization
+    tests above succeeded, possessive_quantifier is TRUE. For some of the
+    simpler opcodes, there is an special alternative opcode for this. For
+    anything else, we wrap the entire repeated item inside OP_ONCE brackets.
+    The '+' notation is just syntactic sugar, taken from Sun's Java package,
+    but the special opcodes can optimize it a bit. The repeated item starts at
+    tempcode, not at previous, which might be the first part of a string whose
+    (former) last char we repeated.
+
+    Possessifying an 'exact' quantifier has no effect, so we can ignore it. But
+    an 'upto' may follow. We skip over an 'exact' item, and then test the
+    length of what remains before proceeding. */
+
+    if (possessive_quantifier)
+      {
+      int len;
+      if (*tempcode == OP_EXACT || *tempcode == OP_TYPEEXACT ||
+          *tempcode == OP_NOTEXACT)
+        tempcode += _pcre_OP_lengths[*tempcode] +
+          ((*tempcode == OP_TYPEEXACT &&
+             (tempcode[3] == OP_PROP || tempcode[3] == OP_NOTPROP))? 2:0);
+      len = code - tempcode;
+      if (len > 0) switch (*tempcode)
+        {
+        case OP_STAR:  *tempcode = OP_POSSTAR; break;
+        case OP_PLUS:  *tempcode = OP_POSPLUS; break;
+        case OP_QUERY: *tempcode = OP_POSQUERY; break;
+        case OP_UPTO:  *tempcode = OP_POSUPTO; break;
+
+        case OP_TYPESTAR:  *tempcode = OP_TYPEPOSSTAR; break;
+        case OP_TYPEPLUS:  *tempcode = OP_TYPEPOSPLUS; break;
+        case OP_TYPEQUERY: *tempcode = OP_TYPEPOSQUERY; break;
+        case OP_TYPEUPTO:  *tempcode = OP_TYPEPOSUPTO; break;
+
+        case OP_NOTSTAR:  *tempcode = OP_NOTPOSSTAR; break;
+        case OP_NOTPLUS:  *tempcode = OP_NOTPOSPLUS; break;
+        case OP_NOTQUERY: *tempcode = OP_NOTPOSQUERY; break;
+        case OP_NOTUPTO:  *tempcode = OP_NOTPOSUPTO; break;
+
+        default:
+        memmove(tempcode + 1+LINK_SIZE, tempcode, len);
+        code += 1 + LINK_SIZE;
+        len += 1 + LINK_SIZE;
+        tempcode[0] = OP_ONCE;
+        *code++ = OP_KET;
+        PUTINC(code, 0, len);
+        PUT(tempcode, 1, len);
+        break;
+        }
+      }
+
+    /* In all case we no longer have a previous item. We also set the
+    "follows varying string" flag for subsequently encountered reqbytes if
+    it isn't already set and we have just passed a varying length item. */
+
+    END_REPEAT:
+    previous = NULL;
+    cd->req_varyopt |= reqvary;
+    break;
+
+
+    /* ===================================================================*/
+    /* Start of nested parenthesized sub-expression, or comment or lookahead or
+    lookbehind or option setting or condition or all the other extended
+    parenthesis forms.  */
+
+    case '(':
+    newoptions = options;
+    skipbytes = 0;
+    bravalue = OP_CBRA;
+    save_hwm = cd->hwm;
+    reset_bracount = FALSE;
+
+    /* First deal with various "verbs" that can be introduced by '*'. */
+
+    if (*(++ptr) == '*' && (cd->ctypes[ptr[1]] & ctype_letter) != 0)
+      {
+      int i, namelen;
+      const char *vn = verbnames;
+      const uschar *name = ++ptr;
+      previous = NULL;
+      while ((cd->ctypes[*++ptr] & ctype_letter) != 0);
+      if (*ptr == ':')
+        {
+        *errorcodeptr = ERR59;   /* Not supported */
+        goto FAILED;
+        }
+      if (*ptr != ')')
+        {
+        *errorcodeptr = ERR60;
+        goto FAILED;
+        }
+      namelen = ptr - name;
+      for (i = 0; i < verbcount; i++)
+        {
+        if (namelen == verbs[i].len &&
+            strncmp((char *)name, vn, namelen) == 0)
+          {
+          *code = verbs[i].op;
+          if (*code++ == OP_ACCEPT) cd->had_accept = TRUE;
+          break;
+          }
+        vn += verbs[i].len + 1;
+        }
+      if (i < verbcount) continue;
+      *errorcodeptr = ERR60;
+      goto FAILED;
+      }
+
+    /* Deal with the extended parentheses; all are introduced by '?', and the
+    appearance of any of them means that this is not a capturing group. */
+
+    else if (*ptr == '?')
+      {
+      int i, set, unset, namelen;
+      int *optset;
+      const uschar *name;
+      uschar *slot;
+
+      switch (*(++ptr))
+        {
+        case '#':                 /* Comment; skip to ket */
+        ptr++;
+        while (*ptr != 0 && *ptr != ')') ptr++;
+        if (*ptr == 0)
+          {
+          *errorcodeptr = ERR18;
+          goto FAILED;
+          }
+        continue;
+
+
+        /* ------------------------------------------------------------ */
+        case '|':                 /* Reset capture count for each branch */
+        reset_bracount = TRUE;
+        /* Fall through */
+
+        /* ------------------------------------------------------------ */
+        case ':':                 /* Non-capturing bracket */
+        bravalue = OP_BRA;
+        ptr++;
+        break;
+
+
+        /* ------------------------------------------------------------ */
+        case '(':
+        bravalue = OP_COND;       /* Conditional group */
+
+        /* A condition can be an assertion, a number (referring to a numbered
+        group), a name (referring to a named group), or 'R', referring to
+        recursion. R<digits> and R&name are also permitted for recursion tests.
+
+        There are several syntaxes for testing a named group: (?(name)) is used
+        by Python; Perl 5.10 onwards uses (?(<name>) or (?('name')).
+
+        There are two unfortunate ambiguities, caused by history. (a) 'R' can
+        be the recursive thing or the name 'R' (and similarly for 'R' followed
+        by digits), and (b) a number could be a name that consists of digits.
+        In both cases, we look for a name first; if not found, we try the other
+        cases. */
+
+        /* For conditions that are assertions, check the syntax, and then exit
+        the switch. This will take control down to where bracketed groups,
+        including assertions, are processed. */
+
+        if (ptr[1] == '?' && (ptr[2] == '=' || ptr[2] == '!' || ptr[2] == '<'))
+          break;
+
+        /* Most other conditions use OP_CREF (a couple change to OP_RREF
+        below), and all need to skip 3 bytes at the start of the group. */
+
+        code[1+LINK_SIZE] = OP_CREF;
+        skipbytes = 3;
+        refsign = -1;
+
+        /* Check for a test for recursion in a named group. */
+
+        if (ptr[1] == 'R' && ptr[2] == '&')
+          {
+          terminator = -1;
+          ptr += 2;
+          code[1+LINK_SIZE] = OP_RREF;    /* Change the type of test */
+          }
+
+        /* Check for a test for a named group's having been set, using the Perl
+        syntax (?(<name>) or (?('name') */
+
+        else if (ptr[1] == '<')
+          {
+          terminator = '>';
+          ptr++;
+          }
+        else if (ptr[1] == '\'')
+          {
+          terminator = '\'';
+          ptr++;
+          }
+        else
+          {
+          terminator = 0;
+          if (ptr[1] == '-' || ptr[1] == '+') refsign = *(++ptr);
+          }
+
+        /* We now expect to read a name; any thing else is an error */
+
+        if ((cd->ctypes[ptr[1]] & ctype_word) == 0)
+          {
+          ptr += 1;  /* To get the right offset */
+          *errorcodeptr = ERR28;
+          goto FAILED;
+          }
+
+        /* Read the name, but also get it as a number if it's all digits */
+
+        recno = 0;
+        name = ++ptr;
+        while ((cd->ctypes[*ptr] & ctype_word) != 0)
+          {
+          if (recno >= 0)
+            recno = ((digitab[*ptr] & ctype_digit) != 0)?
+              recno * 10 + *ptr - '0' : -1;
+          ptr++;
+          }
+        namelen = ptr - name;
+
+        if ((terminator > 0 && *ptr++ != terminator) || *ptr++ != ')')
+          {
+          ptr--;      /* Error offset */
+          *errorcodeptr = ERR26;
+          goto FAILED;
+          }
+
+        /* Do no further checking in the pre-compile phase. */
+
+        if (lengthptr != NULL) break;
+
+        /* In the real compile we do the work of looking for the actual
+        reference. If the string started with "+" or "-" we require the rest to
+        be digits, in which case recno will be set. */
+
+        if (refsign > 0)
+          {
+          if (recno <= 0)
+            {
+            *errorcodeptr = ERR58;
+            goto FAILED;
+            }
+          recno = (refsign == '-')?
+            cd->bracount - recno + 1 : recno +cd->bracount;
+          if (recno <= 0 || recno > cd->final_bracount)
+            {
+            *errorcodeptr = ERR15;
+            goto FAILED;
+            }
+          PUT2(code, 2+LINK_SIZE, recno);
+          break;
+          }
+
+        /* Otherwise (did not start with "+" or "-"), start by looking for the
+        name. */
+
+        slot = cd->name_table;
+        for (i = 0; i < cd->names_found; i++)
+          {
+          if (strncmp((char *)name, (char *)slot+2, namelen) == 0) break;
+          slot += cd->name_entry_size;
+          }
+
+        /* Found a previous named subpattern */
+
+        if (i < cd->names_found)
+          {
+          recno = GET2(slot, 0);
+          PUT2(code, 2+LINK_SIZE, recno);
+          }
+
+        /* Search the pattern for a forward reference */
+
+        else if ((i = find_parens(ptr, cd->bracount, name, namelen,
+                        (options & PCRE_EXTENDED) != 0)) > 0)
+          {
+          PUT2(code, 2+LINK_SIZE, i);
+          }
+
+        /* If terminator == 0 it means that the name followed directly after
+        the opening parenthesis [e.g. (?(abc)...] and in this case there are
+        some further alternatives to try. For the cases where terminator != 0
+        [things like (?(<name>... or (?('name')... or (?(R&name)... ] we have
+        now checked all the possibilities, so give an error. */
+
+        else if (terminator != 0)
+          {
+          *errorcodeptr = ERR15;
+          goto FAILED;
+          }
+
+        /* Check for (?(R) for recursion. Allow digits after R to specify a
+        specific group number. */
+
+        else if (*name == 'R')
+          {
+          recno = 0;
+          for (i = 1; i < namelen; i++)
+            {
+            if ((digitab[name[i]] & ctype_digit) == 0)
+              {
+              *errorcodeptr = ERR15;
+              goto FAILED;
+              }
+            recno = recno * 10 + name[i] - '0';
+            }
+          if (recno == 0) recno = RREF_ANY;
+          code[1+LINK_SIZE] = OP_RREF;      /* Change test type */
+          PUT2(code, 2+LINK_SIZE, recno);
+          }
+
+        /* Similarly, check for the (?(DEFINE) "condition", which is always
+        false. */
+
+        else if (namelen == 6 && strncmp((char *)name, "DEFINE", 6) == 0)
+          {
+          code[1+LINK_SIZE] = OP_DEF;
+          skipbytes = 1;
+          }
+
+        /* Check for the "name" actually being a subpattern number. We are
+        in the second pass here, so final_bracount is set. */
+
+        else if (recno > 0 && recno <= cd->final_bracount)
+          {
+          PUT2(code, 2+LINK_SIZE, recno);
+          }
+
+        /* Either an unidentified subpattern, or a reference to (?(0) */
+
+        else
+          {
+          *errorcodeptr = (recno == 0)? ERR35: ERR15;
+          goto FAILED;
+          }
+        break;
+
+
+        /* ------------------------------------------------------------ */
+        case '=':                 /* Positive lookahead */
+        bravalue = OP_ASSERT;
+        ptr++;
+        break;
+
+
+        /* ------------------------------------------------------------ */
+        case '!':                 /* Negative lookahead */
+        ptr++;
+        if (*ptr == ')')          /* Optimize (?!) */
+          {
+          *code++ = OP_FAIL;
+          previous = NULL;
+          continue;
+          }
+        bravalue = OP_ASSERT_NOT;
+        break;
+
+
+        /* ------------------------------------------------------------ */
+        case '<':                 /* Lookbehind or named define */
+        switch (ptr[1])
+          {
+          case '=':               /* Positive lookbehind */
+          bravalue = OP_ASSERTBACK;
+          ptr += 2;
+          break;
+
+          case '!':               /* Negative lookbehind */
+          bravalue = OP_ASSERTBACK_NOT;
+          ptr += 2;
+          break;
+
+          default:                /* Could be name define, else bad */
+          if ((cd->ctypes[ptr[1]] & ctype_word) != 0) goto DEFINE_NAME;
+          ptr++;                  /* Correct offset for error */
+          *errorcodeptr = ERR24;
+          goto FAILED;
+          }
+        break;
+
+
+        /* ------------------------------------------------------------ */
+        case '>':                 /* One-time brackets */
+        bravalue = OP_ONCE;
+        ptr++;
+        break;
+
+
+        /* ------------------------------------------------------------ */
+        case 'C':                 /* Callout - may be followed by digits; */
+        previous_callout = code;  /* Save for later completion */
+        after_manual_callout = 1; /* Skip one item before completing */
+        *code++ = OP_CALLOUT;
+          {
+          int n = 0;
+          while ((digitab[*(++ptr)] & ctype_digit) != 0)
+            n = n * 10 + *ptr - '0';
+          if (*ptr != ')')
+            {
+            *errorcodeptr = ERR39;
+            goto FAILED;
+            }
+          if (n > 255)
+            {
+            *errorcodeptr = ERR38;
+            goto FAILED;
+            }
+          *code++ = n;
+          PUT(code, 0, ptr - cd->start_pattern + 1);  /* Pattern offset */
+          PUT(code, LINK_SIZE, 0);                    /* Default length */
+          code += 2 * LINK_SIZE;
+          }
+        previous = NULL;
+        continue;
+
+
+        /* ------------------------------------------------------------ */
+        case 'P':                 /* Python-style named subpattern handling */
+        if (*(++ptr) == '=' || *ptr == '>')  /* Reference or recursion */
+          {
+          is_recurse = *ptr == '>';
+          terminator = ')';
+          goto NAMED_REF_OR_RECURSE;
+          }
+        else if (*ptr != '<')    /* Test for Python-style definition */
+          {
+          *errorcodeptr = ERR41;
+          goto FAILED;
+          }
+        /* Fall through to handle (?P< as (?< is handled */
+
+
+        /* ------------------------------------------------------------ */
+        DEFINE_NAME:    /* Come here from (?< handling */
+        case '\'':
+          {
+          terminator = (*ptr == '<')? '>' : '\'';
+          name = ++ptr;
+
+          while ((cd->ctypes[*ptr] & ctype_word) != 0) ptr++;
+          namelen = ptr - name;
+
+          /* In the pre-compile phase, just do a syntax check. */
+
+          if (lengthptr != NULL)
+            {
+            if (*ptr != terminator)
+              {
+              *errorcodeptr = ERR42;
+              goto FAILED;
+              }
+            if (cd->names_found >= MAX_NAME_COUNT)
+              {
+              *errorcodeptr = ERR49;
+              goto FAILED;
+              }
+            if (namelen + 3 > cd->name_entry_size)
+              {
+              cd->name_entry_size = namelen + 3;
+              if (namelen > MAX_NAME_SIZE)
+                {
+                *errorcodeptr = ERR48;
+                goto FAILED;
+                }
+              }
+            }
+
+          /* In the real compile, create the entry in the table */
+
+          else
+            {
+            slot = cd->name_table;
+            for (i = 0; i < cd->names_found; i++)
+              {
+              int crc = memcmp(name, slot+2, namelen);
+              if (crc == 0)
+                {
+                if (slot[2+namelen] == 0)
+                  {
+                  if ((options & PCRE_DUPNAMES) == 0)
+                    {
+                    *errorcodeptr = ERR43;
+                    goto FAILED;
+                    }
+                  }
+                else crc = -1;      /* Current name is substring */
+                }
+              if (crc < 0)
+                {
+                memmove(slot + cd->name_entry_size, slot,
+                  (cd->names_found - i) * cd->name_entry_size);
+                break;
+                }
+              slot += cd->name_entry_size;
+              }
+
+            PUT2(slot, 0, cd->bracount + 1);
+            memcpy(slot + 2, name, namelen);
+            slot[2+namelen] = 0;
+            }
+          }
+
+        /* In both cases, count the number of names we've encountered. */
+
+        ptr++;                    /* Move past > or ' */
+        cd->names_found++;
+        goto NUMBERED_GROUP;
+
+
+        /* ------------------------------------------------------------ */
+        case '&':                 /* Perl recursion/subroutine syntax */
+        terminator = ')';
+        is_recurse = TRUE;
+        /* Fall through */
+
+        /* We come here from the Python syntax above that handles both
+        references (?P=name) and recursion (?P>name), as well as falling
+        through from the Perl recursion syntax (?&name). We also come here from
+        the Perl \k<name> or \k'name' back reference syntax and the \k{name}
+        .NET syntax. */
+
+        NAMED_REF_OR_RECURSE:
+        name = ++ptr;
+        while ((cd->ctypes[*ptr] & ctype_word) != 0) ptr++;
+        namelen = ptr - name;
+
+        /* In the pre-compile phase, do a syntax check and set a dummy
+        reference number. */
+
+        if (lengthptr != NULL)
+          {
+          if (namelen == 0)
+            {
+            *errorcodeptr = ERR62;
+            goto FAILED;
+            }
+          if (*ptr != terminator)
+            {
+            *errorcodeptr = ERR42;
+            goto FAILED;
+            }
+          if (namelen > MAX_NAME_SIZE)
+            {
+            *errorcodeptr = ERR48;
+            goto FAILED;
+            }
+          recno = 0;
+          }
+
+        /* In the real compile, seek the name in the table. We check the name
+        first, and then check that we have reached the end of the name in the
+        table. That way, if the name that is longer than any in the table,
+        the comparison will fail without reading beyond the table entry. */
+
+        else
+          {
+          slot = cd->name_table;
+          for (i = 0; i < cd->names_found; i++)
+            {
+            if (strncmp((char *)name, (char *)slot+2, namelen) == 0 &&
+                slot[2+namelen] == 0)
+              break;
+            slot += cd->name_entry_size;
+            }
+
+          if (i < cd->names_found)         /* Back reference */
+            {
+            recno = GET2(slot, 0);
+            }
+          else if ((recno =                /* Forward back reference */
+                    find_parens(ptr, cd->bracount, name, namelen,
+                      (options & PCRE_EXTENDED) != 0)) <= 0)
+            {
+            *errorcodeptr = ERR15;
+            goto FAILED;
+            }
+          }
+
+        /* In both phases, we can now go to the code than handles numerical
+        recursion or backreferences. */
+
+        if (is_recurse) goto HANDLE_RECURSION;
+          else goto HANDLE_REFERENCE;
+
+
+        /* ------------------------------------------------------------ */
+        case 'R':                 /* Recursion */
+        ptr++;                    /* Same as (?0)      */
+        /* Fall through */
+
+
+        /* ------------------------------------------------------------ */
+        case '-': case '+':
+        case '0': case '1': case '2': case '3': case '4':   /* Recursion or */
+        case '5': case '6': case '7': case '8': case '9':   /* subroutine */
+          {
+          const uschar *called;
+
+          if ((refsign = *ptr) == '+')
+            {
+            ptr++;
+            if ((digitab[*ptr] & ctype_digit) == 0)
+              {
+              *errorcodeptr = ERR63;
+              goto FAILED;
+              }
+            }
+          else if (refsign == '-')
+            {
+            if ((digitab[ptr[1]] & ctype_digit) == 0)
+              goto OTHER_CHAR_AFTER_QUERY;
+            ptr++;
+            }
+
+          recno = 0;
+          while((digitab[*ptr] & ctype_digit) != 0)
+            recno = recno * 10 + *ptr++ - '0';
+
+          if (*ptr != ')')
+            {
+            *errorcodeptr = ERR29;
+            goto FAILED;
+            }
+
+          if (refsign == '-')
+            {
+            if (recno == 0)
+              {
+              *errorcodeptr = ERR58;
+              goto FAILED;
+              }
+            recno = cd->bracount - recno + 1;
+            if (recno <= 0)
+              {
+              *errorcodeptr = ERR15;
+              goto FAILED;
+              }
+            }
+          else if (refsign == '+')
+            {
+            if (recno == 0)
+              {
+              *errorcodeptr = ERR58;
+              goto FAILED;
+              }
+            recno += cd->bracount;
+            }
+
+          /* Come here from code above that handles a named recursion */
+
+          HANDLE_RECURSION:
+
+          previous = code;
+          called = cd->start_code;
+
+          /* When we are actually compiling, find the bracket that is being
+          referenced. Temporarily end the regex in case it doesn't exist before
+          this point. If we end up with a forward reference, first check that
+          the bracket does occur later so we can give the error (and position)
+          now. Then remember this forward reference in the workspace so it can
+          be filled in at the end. */
+
+          if (lengthptr == NULL)
+            {
+            *code = OP_END;
+            if (recno != 0) called = find_bracket(cd->start_code, utf8, recno);
+
+            /* Forward reference */
+
+            if (called == NULL)
+              {
+              if (find_parens(ptr, cd->bracount, NULL, recno,
+                   (options & PCRE_EXTENDED) != 0) < 0)
+                {
+                *errorcodeptr = ERR15;
+                goto FAILED;
+                }
+              called = cd->start_code + recno;
+              PUTINC(cd->hwm, 0, code + 2 + LINK_SIZE - cd->start_code);
+              }
+
+            /* If not a forward reference, and the subpattern is still open,
+            this is a recursive call. We check to see if this is a left
+            recursion that could loop for ever, and diagnose that case. */
+
+            else if (GET(called, 1) == 0 &&
+                     could_be_empty(called, code, bcptr, utf8))
+              {
+              *errorcodeptr = ERR40;
+              goto FAILED;
+              }
+            }
+
+          /* Insert the recursion/subroutine item, automatically wrapped inside
+          "once" brackets. Set up a "previous group" length so that a
+          subsequent quantifier will work. */
+
+          *code = OP_ONCE;
+          PUT(code, 1, 2 + 2*LINK_SIZE);
+          code += 1 + LINK_SIZE;
+
+          *code = OP_RECURSE;
+          PUT(code, 1, called - cd->start_code);
+          code += 1 + LINK_SIZE;
+
+          *code = OP_KET;
+          PUT(code, 1, 2 + 2*LINK_SIZE);
+          code += 1 + LINK_SIZE;
+
+          length_prevgroup = 3 + 3*LINK_SIZE;
+          }
+
+        /* Can't determine a first byte now */
+
+        if (firstbyte == REQ_UNSET) firstbyte = REQ_NONE;
+        continue;
+
+
+        /* ------------------------------------------------------------ */
+        default:              /* Other characters: check option setting */
+        OTHER_CHAR_AFTER_QUERY:
+        set = unset = 0;
+        optset = &set;
+
+        while (*ptr != ')' && *ptr != ':')
+          {
+          switch (*ptr++)
+            {
+            case '-': optset = &unset; break;
+
+            case 'J':    /* Record that it changed in the external options */
+            *optset |= PCRE_DUPNAMES;
+            cd->external_flags |= PCRE_JCHANGED;
+            break;
+
+            case 'i': *optset |= PCRE_CASELESS; break;
+            case 'm': *optset |= PCRE_MULTILINE; break;
+            case 's': *optset |= PCRE_DOTALL; break;
+            case 'x': *optset |= PCRE_EXTENDED; break;
+            case 'U': *optset |= PCRE_UNGREEDY; break;
+            case 'X': *optset |= PCRE_EXTRA; break;
+
+            default:  *errorcodeptr = ERR12;
+                      ptr--;    /* Correct the offset */
+                      goto FAILED;
+            }
+          }
+
+        /* Set up the changed option bits, but don't change anything yet. */
+
+        newoptions = (options | set) & (~unset);
+
+        /* If the options ended with ')' this is not the start of a nested
+        group with option changes, so the options change at this level. If this
+        item is right at the start of the pattern, the options can be
+        abstracted and made external in the pre-compile phase, and ignored in
+        the compile phase. This can be helpful when matching -- for instance in
+        caseless checking of required bytes.
+
+        If the code pointer is not (cd->start_code + 1 + LINK_SIZE), we are
+        definitely *not* at the start of the pattern because something has been
+        compiled. In the pre-compile phase, however, the code pointer can have
+        that value after the start, because it gets reset as code is discarded
+        during the pre-compile. However, this can happen only at top level - if
+        we are within parentheses, the starting BRA will still be present. At
+        any parenthesis level, the length value can be used to test if anything
+        has been compiled at that level. Thus, a test for both these conditions
+        is necessary to ensure we correctly detect the start of the pattern in
+        both phases.
+
+        If we are not at the pattern start, compile code to change the ims
+        options if this setting actually changes any of them. We also pass the
+        new setting back so that it can be put at the start of any following
+        branches, and when this group ends (if we are in a group), a resetting
+        item can be compiled. */
+
+        if (*ptr == ')')
+          {
+          if (code == cd->start_code + 1 + LINK_SIZE &&
+               (lengthptr == NULL || *lengthptr == 2 + 2*LINK_SIZE))
+            {
+            cd->external_options = newoptions;
+            options = newoptions;
+            }
+         else
+            {
+            if ((options & PCRE_IMS) != (newoptions & PCRE_IMS))
+              {
+              *code++ = OP_OPT;
+              *code++ = newoptions & PCRE_IMS;
+              }
+
+            /* Change options at this level, and pass them back for use
+            in subsequent branches. Reset the greedy defaults and the case
+            value for firstbyte and reqbyte. */
+
+            *optionsptr = options = newoptions;
+            greedy_default = ((newoptions & PCRE_UNGREEDY) != 0);
+            greedy_non_default = greedy_default ^ 1;
+            req_caseopt = ((options & PCRE_CASELESS) != 0)? REQ_CASELESS : 0;
+            }
+
+          previous = NULL;       /* This item can't be repeated */
+          continue;              /* It is complete */
+          }
+
+        /* If the options ended with ':' we are heading into a nested group
+        with possible change of options. Such groups are non-capturing and are
+        not assertions of any kind. All we need to do is skip over the ':';
+        the newoptions value is handled below. */
+
+        bravalue = OP_BRA;
+        ptr++;
+        }     /* End of switch for character following (? */
+      }       /* End of (? handling */
+
+    /* Opening parenthesis not followed by '?'. If PCRE_NO_AUTO_CAPTURE is set,
+    all unadorned brackets become non-capturing and behave like (?:...)
+    brackets. */
+
+    else if ((options & PCRE_NO_AUTO_CAPTURE) != 0)
+      {
+      bravalue = OP_BRA;
+      }
+
+    /* Else we have a capturing group. */
+
+    else
+      {
+      NUMBERED_GROUP:
+      cd->bracount += 1;
+      PUT2(code, 1+LINK_SIZE, cd->bracount);
+      skipbytes = 2;
+      }
+
+    /* Process nested bracketed regex. Assertions may not be repeated, but
+    other kinds can be. All their opcodes are >= OP_ONCE. We copy code into a
+    non-register variable in order to be able to pass its address because some
+    compilers complain otherwise. Pass in a new setting for the ims options if
+    they have changed. */
+
+    previous = (bravalue >= OP_ONCE)? code : NULL;
+    *code = bravalue;
+    tempcode = code;
+    tempreqvary = cd->req_varyopt;     /* Save value before bracket */
+    length_prevgroup = 0;              /* Initialize for pre-compile phase */
+
+    if (!compile_regex(
+         newoptions,                   /* The complete new option state */
+         options & PCRE_IMS,           /* The previous ims option state */
+         &tempcode,                    /* Where to put code (updated) */
+         &ptr,                         /* Input pointer (updated) */
+         errorcodeptr,                 /* Where to put an error message */
+         (bravalue == OP_ASSERTBACK ||
+          bravalue == OP_ASSERTBACK_NOT), /* TRUE if back assert */
+         reset_bracount,               /* True if (?| group */
+         skipbytes,                    /* Skip over bracket number */
+         &subfirstbyte,                /* For possible first char */
+         &subreqbyte,                  /* For possible last char */
+         bcptr,                        /* Current branch chain */
+         cd,                           /* Tables block */
+         (lengthptr == NULL)? NULL :   /* Actual compile phase */
+           &length_prevgroup           /* Pre-compile phase */
+         ))
+      goto FAILED;
+
+    /* At the end of compiling, code is still pointing to the start of the
+    group, while tempcode has been updated to point past the end of the group
+    and any option resetting that may follow it. The pattern pointer (ptr)
+    is on the bracket. */
+
+    /* If this is a conditional bracket, check that there are no more than
+    two branches in the group, or just one if it's a DEFINE group. We do this
+    in the real compile phase, not in the pre-pass, where the whole group may
+    not be available. */
+
+    if (bravalue == OP_COND && lengthptr == NULL)
+      {
+      uschar *tc = code;
+      int condcount = 0;
+
+      do {
+         condcount++;
+         tc += GET(tc,1);
+         }
+      while (*tc != OP_KET);
+
+      /* A DEFINE group is never obeyed inline (the "condition" is always
+      false). It must have only one branch. */
+
+      if (code[LINK_SIZE+1] == OP_DEF)
+        {
+        if (condcount > 1)
+          {
+          *errorcodeptr = ERR54;
+          goto FAILED;
+          }
+        bravalue = OP_DEF;   /* Just a flag to suppress char handling below */
+        }
+
+      /* A "normal" conditional group. If there is just one branch, we must not
+      make use of its firstbyte or reqbyte, because this is equivalent to an
+      empty second branch. */
+
+      else
+        {
+        if (condcount > 2)
+          {
+          *errorcodeptr = ERR27;
+          goto FAILED;
+          }
+        if (condcount == 1) subfirstbyte = subreqbyte = REQ_NONE;
+        }
+      }
+
+    /* Error if hit end of pattern */
+
+    if (*ptr != ')')
+      {
+      *errorcodeptr = ERR14;
+      goto FAILED;
+      }
+
+    /* In the pre-compile phase, update the length by the length of the group,
+    less the brackets at either end. Then reduce the compiled code to just a
+    set of non-capturing brackets so that it doesn't use much memory if it is
+    duplicated by a quantifier.*/
+
+    if (lengthptr != NULL)
+      {
+      if (OFLOW_MAX - *lengthptr < length_prevgroup - 2 - 2*LINK_SIZE)
+        {
+        *errorcodeptr = ERR20;
+        goto FAILED;
+        }
+      *lengthptr += length_prevgroup - 2 - 2*LINK_SIZE;
+      *code++ = OP_BRA;
+      PUTINC(code, 0, 1 + LINK_SIZE);
+      *code++ = OP_KET;
+      PUTINC(code, 0, 1 + LINK_SIZE);
+      break;    /* No need to waste time with special character handling */
+      }
+
+    /* Otherwise update the main code pointer to the end of the group. */
+
+    code = tempcode;
+
+    /* For a DEFINE group, required and first character settings are not
+    relevant. */
+
+    if (bravalue == OP_DEF) break;
+
+    /* Handle updating of the required and first characters for other types of
+    group. Update for normal brackets of all kinds, and conditions with two
+    branches (see code above). If the bracket is followed by a quantifier with
+    zero repeat, we have to back off. Hence the definition of zeroreqbyte and
+    zerofirstbyte outside the main loop so that they can be accessed for the
+    back off. */
+
+    zeroreqbyte = reqbyte;
+    zerofirstbyte = firstbyte;
+    groupsetfirstbyte = FALSE;
+
+    if (bravalue >= OP_ONCE)
+      {
+      /* If we have not yet set a firstbyte in this branch, take it from the
+      subpattern, remembering that it was set here so that a repeat of more
+      than one can replicate it as reqbyte if necessary. If the subpattern has
+      no firstbyte, set "none" for the whole branch. In both cases, a zero
+      repeat forces firstbyte to "none". */
+
+      if (firstbyte == REQ_UNSET)
+        {
+        if (subfirstbyte >= 0)
+          {
+          firstbyte = subfirstbyte;
+          groupsetfirstbyte = TRUE;
+          }
+        else firstbyte = REQ_NONE;
+        zerofirstbyte = REQ_NONE;
+        }
+
+      /* If firstbyte was previously set, convert the subpattern's firstbyte
+      into reqbyte if there wasn't one, using the vary flag that was in
+      existence beforehand. */
+
+      else if (subfirstbyte >= 0 && subreqbyte < 0)
+        subreqbyte = subfirstbyte | tempreqvary;
+
+      /* If the subpattern set a required byte (or set a first byte that isn't
+      really the first byte - see above), set it. */
+
+      if (subreqbyte >= 0) reqbyte = subreqbyte;
+      }
+
+    /* For a forward assertion, we take the reqbyte, if set. This can be
+    helpful if the pattern that follows the assertion doesn't set a different
+    char. For example, it's useful for /(?=abcde).+/. We can't set firstbyte
+    for an assertion, however because it leads to incorrect effect for patterns
+    such as /(?=a)a.+/ when the "real" "a" would then become a reqbyte instead
+    of a firstbyte. This is overcome by a scan at the end if there's no
+    firstbyte, looking for an asserted first char. */
+
+    else if (bravalue == OP_ASSERT && subreqbyte >= 0) reqbyte = subreqbyte;
+    break;     /* End of processing '(' */
+
+
+    /* ===================================================================*/
+    /* Handle metasequences introduced by \. For ones like \d, the ESC_ values
+    are arranged to be the negation of the corresponding OP_values. For the
+    back references, the values are ESC_REF plus the reference number. Only
+    back references and those types that consume a character may be repeated.
+    We can test for values between ESC_b and ESC_Z for the latter; this may
+    have to change if any new ones are ever created. */
+
+    case '\\':
+    tempptr = ptr;
+    c = check_escape(&ptr, errorcodeptr, cd->bracount, options, FALSE);
+    if (*errorcodeptr != 0) goto FAILED;
+
+    if (c < 0)
+      {
+      if (-c == ESC_Q)            /* Handle start of quoted string */
+        {
+        if (ptr[1] == '\\' && ptr[2] == 'E') ptr += 2; /* avoid empty string */
+          else inescq = TRUE;
+        continue;
+        }
+
+      if (-c == ESC_E) continue;  /* Perl ignores an orphan \E */
+
+      /* For metasequences that actually match a character, we disable the
+      setting of a first character if it hasn't already been set. */
+
+      if (firstbyte == REQ_UNSET && -c > ESC_b && -c < ESC_Z)
+        firstbyte = REQ_NONE;
+
+      /* Set values to reset to if this is followed by a zero repeat. */
+
+      zerofirstbyte = firstbyte;
+      zeroreqbyte = reqbyte;
+
+      /* \k<name> or \k'name' is a back reference by name (Perl syntax).
+      We also support \k{name} (.NET syntax) */
+
+      if (-c == ESC_k && (ptr[1] == '<' || ptr[1] == '\'' || ptr[1] == '{'))
+        {
+        is_recurse = FALSE;
+        terminator = (*(++ptr) == '<')? '>' : (*ptr == '\'')? '\'' : '}';
+        goto NAMED_REF_OR_RECURSE;
+        }
+
+      /* Back references are handled specially; must disable firstbyte if
+      not set to cope with cases like (?=(\w+))\1: which would otherwise set
+      ':' later. */
+
+      if (-c >= ESC_REF)
+        {
+        recno = -c - ESC_REF;
+
+        HANDLE_REFERENCE:    /* Come here from named backref handling */
+        if (firstbyte == REQ_UNSET) firstbyte = REQ_NONE;
+        previous = code;
+        *code++ = OP_REF;
+        PUT2INC(code, 0, recno);
+        cd->backref_map |= (recno < 32)? (1 << recno) : 1;
+        if (recno > cd->top_backref) cd->top_backref = recno;
+        }
+
+      /* So are Unicode property matches, if supported. */
+
+#ifdef SUPPORT_UCP
+      else if (-c == ESC_P || -c == ESC_p)
+        {
+        BOOL negated;
+        int pdata;
+        int ptype = get_ucp(&ptr, &negated, &pdata, errorcodeptr);
+        if (ptype < 0) goto FAILED;
+        previous = code;
+        *code++ = ((-c == ESC_p) != negated)? OP_PROP : OP_NOTPROP;
+        *code++ = ptype;
+        *code++ = pdata;
+        }
+#else
+
+      /* If Unicode properties are not supported, \X, \P, and \p are not
+      allowed. */
+
+      else if (-c == ESC_X || -c == ESC_P || -c == ESC_p)
+        {
+        *errorcodeptr = ERR45;
+        goto FAILED;
+        }
+#endif
+
+      /* For the rest (including \X when Unicode properties are supported), we
+      can obtain the OP value by negating the escape value. */
+
+      else
+        {
+        previous = (-c > ESC_b && -c < ESC_Z)? code : NULL;
+        *code++ = -c;
+        }
+      continue;
+      }
+
+    /* We have a data character whose value is in c. In UTF-8 mode it may have
+    a value > 127. We set its representation in the length/buffer, and then
+    handle it as a data character. */
+
+#ifdef SUPPORT_UTF8
+    if (utf8 && c > 127)
+      mclength = _pcre_ord2utf8(c, mcbuffer);
+    else
+#endif
+
+     {
+     mcbuffer[0] = c;
+     mclength = 1;
+     }
+    goto ONE_CHAR;
+
+
+    /* ===================================================================*/
+    /* Handle a literal character. It is guaranteed not to be whitespace or #
+    when the extended flag is set. If we are in UTF-8 mode, it may be a
+    multi-byte literal character. */
+
+    default:
+    NORMAL_CHAR:
+    mclength = 1;
+    mcbuffer[0] = c;
+
+#ifdef SUPPORT_UTF8
+    if (utf8 && c >= 0xc0)
+      {
+      while ((ptr[1] & 0xc0) == 0x80)
+        mcbuffer[mclength++] = *(++ptr);
+      }
+#endif
+
+    /* At this point we have the character's bytes in mcbuffer, and the length
+    in mclength. When not in UTF-8 mode, the length is always 1. */
+
+    ONE_CHAR:
+    previous = code;
+    *code++ = ((options & PCRE_CASELESS) != 0)? OP_CHARNC : OP_CHAR;
+    for (c = 0; c < mclength; c++) *code++ = mcbuffer[c];
+
+    /* Remember if \r or \n were seen */
+
+    if (mcbuffer[0] == '\r' || mcbuffer[0] == '\n')
+      cd->external_flags |= PCRE_HASCRORLF;
+
+    /* Set the first and required bytes appropriately. If no previous first
+    byte, set it from this character, but revert to none on a zero repeat.
+    Otherwise, leave the firstbyte value alone, and don't change it on a zero
+    repeat. */
+
+    if (firstbyte == REQ_UNSET)
+      {
+      zerofirstbyte = REQ_NONE;
+      zeroreqbyte = reqbyte;
+
+      /* If the character is more than one byte long, we can set firstbyte
+      only if it is not to be matched caselessly. */
+
+      if (mclength == 1 || req_caseopt == 0)
+        {
+        firstbyte = mcbuffer[0] | req_caseopt;
+        if (mclength != 1) reqbyte = code[-1] | cd->req_varyopt;
+        }
+      else firstbyte = reqbyte = REQ_NONE;
+      }
+
+    /* firstbyte was previously set; we can set reqbyte only the length is
+    1 or the matching is caseful. */
+
+    else
+      {
+      zerofirstbyte = firstbyte;
+      zeroreqbyte = reqbyte;
+      if (mclength == 1 || req_caseopt == 0)
+        reqbyte = code[-1] | req_caseopt | cd->req_varyopt;
+      }
+
+    break;            /* End of literal character handling */
+    }
+  }                   /* end of big loop */
+
+
+/* Control never reaches here by falling through, only by a goto for all the
+error states. Pass back the position in the pattern so that it can be displayed
+to the user for diagnosing the error. */
+
+FAILED:
+*ptrptr = ptr;
+return FALSE;
+}
+
+
+
+
+/*************************************************
+*     Compile sequence of alternatives           *
+*************************************************/
+
+/* On entry, ptr is pointing past the bracket character, but on return it
+points to the closing bracket, or vertical bar, or end of string. The code
+variable is pointing at the byte into which the BRA operator has been stored.
+If the ims options are changed at the start (for a (?ims: group) or during any
+branch, we need to insert an OP_OPT item at the start of every following branch
+to ensure they get set correctly at run time, and also pass the new options
+into every subsequent branch compile.
+
+This function is used during the pre-compile phase when we are trying to find
+out the amount of memory needed, as well as during the real compile phase. The
+value of lengthptr distinguishes the two phases.
+
+Arguments:
+  options        option bits, including any changes for this subpattern
+  oldims         previous settings of ims option bits
+  codeptr        -> the address of the current code pointer
+  ptrptr         -> the address of the current pattern pointer
+  errorcodeptr   -> pointer to error code variable
+  lookbehind     TRUE if this is a lookbehind assertion
+  reset_bracount TRUE to reset the count for each branch
+  skipbytes      skip this many bytes at start (for brackets and OP_COND)
+  firstbyteptr   place to put the first required character, or a negative number
+  reqbyteptr     place to put the last required character, or a negative number
+  bcptr          pointer to the chain of currently open branches
+  cd             points to the data block with tables pointers etc.
+  lengthptr      NULL during the real compile phase
+                 points to length accumulator during pre-compile phase
+
+Returns:         TRUE on success
+*/
+
+static BOOL
+compile_regex(int options, int oldims, uschar **codeptr, const uschar **ptrptr,
+  int *errorcodeptr, BOOL lookbehind, BOOL reset_bracount, int skipbytes,
+  int *firstbyteptr, int *reqbyteptr, branch_chain *bcptr, compile_data *cd,
+  int *lengthptr)
+{
+const uschar *ptr = *ptrptr;
+uschar *code = *codeptr;
+uschar *last_branch = code;
+uschar *start_bracket = code;
+uschar *reverse_count = NULL;
+int firstbyte, reqbyte;
+int branchfirstbyte, branchreqbyte;
+int length;
+int orig_bracount;
+int max_bracount;
+branch_chain bc;
+
+bc.outer = bcptr;
+bc.current = code;
+
+firstbyte = reqbyte = REQ_UNSET;
+
+/* Accumulate the length for use in the pre-compile phase. Start with the
+length of the BRA and KET and any extra bytes that are required at the
+beginning. We accumulate in a local variable to save frequent testing of
+lenthptr for NULL. We cannot do this by looking at the value of code at the
+start and end of each alternative, because compiled items are discarded during
+the pre-compile phase so that the work space is not exceeded. */
+
+length = 2 + 2*LINK_SIZE + skipbytes;
+
+/* WARNING: If the above line is changed for any reason, you must also change
+the code that abstracts option settings at the start of the pattern and makes
+them global. It tests the value of length for (2 + 2*LINK_SIZE) in the
+pre-compile phase to find out whether anything has yet been compiled or not. */
+
+/* Offset is set zero to mark that this bracket is still open */
+
+PUT(code, 1, 0);
+code += 1 + LINK_SIZE + skipbytes;
+
+/* Loop for each alternative branch */
+
+orig_bracount = max_bracount = cd->bracount;
+for (;;)
+  {
+  /* For a (?| group, reset the capturing bracket count so that each branch
+  uses the same numbers. */
+
+  if (reset_bracount) cd->bracount = orig_bracount;
+
+  /* Handle a change of ims options at the start of the branch */
+
+  if ((options & PCRE_IMS) != oldims)
+    {
+    *code++ = OP_OPT;
+    *code++ = options & PCRE_IMS;
+    length += 2;
+    }
+
+  /* Set up dummy OP_REVERSE if lookbehind assertion */
+
+  if (lookbehind)
+    {
+    *code++ = OP_REVERSE;
+    reverse_count = code;
+    PUTINC(code, 0, 0);
+    length += 1 + LINK_SIZE;
+    }
+
+  /* Now compile the branch; in the pre-compile phase its length gets added
+  into the length. */
+
+  if (!compile_branch(&options, &code, &ptr, errorcodeptr, &branchfirstbyte,
+        &branchreqbyte, &bc, cd, (lengthptr == NULL)? NULL : &length))
+    {
+    *ptrptr = ptr;
+    return FALSE;
+    }
+
+  /* Keep the highest bracket count in case (?| was used and some branch
+  has fewer than the rest. */
+
+  if (cd->bracount > max_bracount) max_bracount = cd->bracount;
+
+  /* In the real compile phase, there is some post-processing to be done. */
+
+  if (lengthptr == NULL)
+    {
+    /* If this is the first branch, the firstbyte and reqbyte values for the
+    branch become the values for the regex. */
+
+    if (*last_branch != OP_ALT)
+      {
+      firstbyte = branchfirstbyte;
+      reqbyte = branchreqbyte;
+      }
+
+    /* If this is not the first branch, the first char and reqbyte have to
+    match the values from all the previous branches, except that if the
+    previous value for reqbyte didn't have REQ_VARY set, it can still match,
+    and we set REQ_VARY for the regex. */
+
+    else
+      {
+      /* If we previously had a firstbyte, but it doesn't match the new branch,
+      we have to abandon the firstbyte for the regex, but if there was
+      previously no reqbyte, it takes on the value of the old firstbyte. */
+
+      if (firstbyte >= 0 && firstbyte != branchfirstbyte)
+        {
+        if (reqbyte < 0) reqbyte = firstbyte;
+        firstbyte = REQ_NONE;
+        }
+
+      /* If we (now or from before) have no firstbyte, a firstbyte from the
+      branch becomes a reqbyte if there isn't a branch reqbyte. */
+
+      if (firstbyte < 0 && branchfirstbyte >= 0 && branchreqbyte < 0)
+          branchreqbyte = branchfirstbyte;
+
+      /* Now ensure that the reqbytes match */
+
+      if ((reqbyte & ~REQ_VARY) != (branchreqbyte & ~REQ_VARY))
+        reqbyte = REQ_NONE;
+      else reqbyte |= branchreqbyte;   /* To "or" REQ_VARY */
+      }
+
+    /* If lookbehind, check that this branch matches a fixed-length string, and
+    put the length into the OP_REVERSE item. Temporarily mark the end of the
+    branch with OP_END. */
+
+    if (lookbehind)
+      {
+      int fixed_length;
+      *code = OP_END;
+      fixed_length = find_fixedlength(last_branch, options);
+      DPRINTF(("fixed length = %d\n", fixed_length));
+      if (fixed_length < 0)
+        {
+        *errorcodeptr = (fixed_length == -2)? ERR36 : ERR25;
+        *ptrptr = ptr;
+        return FALSE;
+        }
+      PUT(reverse_count, 0, fixed_length);
+      }
+    }
+
+  /* Reached end of expression, either ')' or end of pattern. In the real
+  compile phase, go back through the alternative branches and reverse the chain
+  of offsets, with the field in the BRA item now becoming an offset to the
+  first alternative. If there are no alternatives, it points to the end of the
+  group. The length in the terminating ket is always the length of the whole
+  bracketed item. If any of the ims options were changed inside the group,
+  compile a resetting op-code following, except at the very end of the pattern.
+  Return leaving the pointer at the terminating char. */
+
+  if (*ptr != '|')
+    {
+    if (lengthptr == NULL)
+      {
+      int branch_length = code - last_branch;
+      do
+        {
+        int prev_length = GET(last_branch, 1);
+        PUT(last_branch, 1, branch_length);
+        branch_length = prev_length;
+        last_branch -= branch_length;
+        }
+      while (branch_length > 0);
+      }
+
+    /* Fill in the ket */
+
+    *code = OP_KET;
+    PUT(code, 1, code - start_bracket);
+    code += 1 + LINK_SIZE;
+
+    /* Resetting option if needed */
+
+    if ((options & PCRE_IMS) != oldims && *ptr == ')')
+      {
+      *code++ = OP_OPT;
+      *code++ = oldims;
+      length += 2;
+      }
+
+    /* Retain the highest bracket number, in case resetting was used. */
+
+    cd->bracount = max_bracount;
+
+    /* Set values to pass back */
+
+    *codeptr = code;
+    *ptrptr = ptr;
+    *firstbyteptr = firstbyte;
+    *reqbyteptr = reqbyte;
+    if (lengthptr != NULL)
+      {
+      if (OFLOW_MAX - *lengthptr < length)
+        {
+        *errorcodeptr = ERR20;
+        return FALSE;
+        }
+      *lengthptr += length;
+      }
+    return TRUE;
+    }
+
+  /* Another branch follows. In the pre-compile phase, we can move the code
+  pointer back to where it was for the start of the first branch. (That is,
+  pretend that each branch is the only one.)
+
+  In the real compile phase, insert an ALT node. Its length field points back
+  to the previous branch while the bracket remains open. At the end the chain
+  is reversed. It's done like this so that the start of the bracket has a
+  zero offset until it is closed, making it possible to detect recursion. */
+
+  if (lengthptr != NULL)
+    {
+    code = *codeptr + 1 + LINK_SIZE + skipbytes;
+    length += 1 + LINK_SIZE;
+    }
+  else
+    {
+    *code = OP_ALT;
+    PUT(code, 1, code - last_branch);
+    bc.current = last_branch = code;
+    code += 1 + LINK_SIZE;
+    }
+
+  ptr++;
+  }
+/* Control never reaches here */
+}
+
+
+
+
+/*************************************************
+*          Check for anchored expression         *
+*************************************************/
+
+/* Try to find out if this is an anchored regular expression. Consider each
+alternative branch. If they all start with OP_SOD or OP_CIRC, or with a bracket
+all of whose alternatives start with OP_SOD or OP_CIRC (recurse ad lib), then
+it's anchored. However, if this is a multiline pattern, then only OP_SOD
+counts, since OP_CIRC can match in the middle.
+
+We can also consider a regex to be anchored if OP_SOM starts all its branches.
+This is the code for \G, which means "match at start of match position, taking
+into account the match offset".
+
+A branch is also implicitly anchored if it starts with .* and DOTALL is set,
+because that will try the rest of the pattern at all possible matching points,
+so there is no point trying again.... er ....
+
+.... except when the .* appears inside capturing parentheses, and there is a
+subsequent back reference to those parentheses. We haven't enough information
+to catch that case precisely.
+
+At first, the best we could do was to detect when .* was in capturing brackets
+and the highest back reference was greater than or equal to that level.
+However, by keeping a bitmap of the first 31 back references, we can catch some
+of the more common cases more precisely.
+
+Arguments:
+  code           points to start of expression (the bracket)
+  options        points to the options setting
+  bracket_map    a bitmap of which brackets we are inside while testing; this
+                  handles up to substring 31; after that we just have to take
+                  the less precise approach
+  backref_map    the back reference bitmap
+
+Returns:     TRUE or FALSE
+*/
+
+static BOOL
+is_anchored(register const uschar *code, int *options, unsigned int bracket_map,
+  unsigned int backref_map)
+{
+do {
+   const uschar *scode = first_significant_code(code + _pcre_OP_lengths[*code],
+     options, PCRE_MULTILINE, FALSE);
+   register int op = *scode;
+
+   /* Non-capturing brackets */
+
+   if (op == OP_BRA)
+     {
+     if (!is_anchored(scode, options, bracket_map, backref_map)) return FALSE;
+     }
+
+   /* Capturing brackets */
+
+   else if (op == OP_CBRA)
+     {
+     int n = GET2(scode, 1+LINK_SIZE);
+     int new_map = bracket_map | ((n < 32)? (1 << n) : 1);
+     if (!is_anchored(scode, options, new_map, backref_map)) return FALSE;
+     }
+
+   /* Other brackets */
+
+   else if (op == OP_ASSERT || op == OP_ONCE || op == OP_COND)
+     {
+     if (!is_anchored(scode, options, bracket_map, backref_map)) return FALSE;
+     }
+
+   /* .* is not anchored unless DOTALL is set and it isn't in brackets that
+   are or may be referenced. */
+
+   else if ((op == OP_TYPESTAR || op == OP_TYPEMINSTAR ||
+             op == OP_TYPEPOSSTAR) &&
+            (*options & PCRE_DOTALL) != 0)
+     {
+     if (scode[1] != OP_ANY || (bracket_map & backref_map) != 0) return FALSE;
+     }
+
+   /* Check for explicit anchoring */
+
+   else if (op != OP_SOD && op != OP_SOM &&
+           ((*options & PCRE_MULTILINE) != 0 || op != OP_CIRC))
+     return FALSE;
+   code += GET(code, 1);
+   }
+while (*code == OP_ALT);   /* Loop for each alternative */
+return TRUE;
+}
+
+
+
+/*************************************************
+*         Check for starting with ^ or .*        *
+*************************************************/
+
+/* This is called to find out if every branch starts with ^ or .* so that
+"first char" processing can be done to speed things up in multiline
+matching and for non-DOTALL patterns that start with .* (which must start at
+the beginning or after \n). As in the case of is_anchored() (see above), we
+have to take account of back references to capturing brackets that contain .*
+because in that case we can't make the assumption.
+
+Arguments:
+  code           points to start of expression (the bracket)
+  bracket_map    a bitmap of which brackets we are inside while testing; this
+                  handles up to substring 31; after that we just have to take
+                  the less precise approach
+  backref_map    the back reference bitmap
+
+Returns:         TRUE or FALSE
+*/
+
+static BOOL
+is_startline(const uschar *code, unsigned int bracket_map,
+  unsigned int backref_map)
+{
+do {
+   const uschar *scode = first_significant_code(code + _pcre_OP_lengths[*code],
+     NULL, 0, FALSE);
+   register int op = *scode;
+
+   /* Non-capturing brackets */
+
+   if (op == OP_BRA)
+     {
+     if (!is_startline(scode, bracket_map, backref_map)) return FALSE;
+     }
+
+   /* Capturing brackets */
+
+   else if (op == OP_CBRA)
+     {
+     int n = GET2(scode, 1+LINK_SIZE);
+     int new_map = bracket_map | ((n < 32)? (1 << n) : 1);
+     if (!is_startline(scode, new_map, backref_map)) return FALSE;
+     }
+
+   /* Other brackets */
+
+   else if (op == OP_ASSERT || op == OP_ONCE || op == OP_COND)
+     { if (!is_startline(scode, bracket_map, backref_map)) return FALSE; }
+
+   /* .* means "start at start or after \n" if it isn't in brackets that
+   may be referenced. */
+
+   else if (op == OP_TYPESTAR || op == OP_TYPEMINSTAR || op == OP_TYPEPOSSTAR)
+     {
+     if (scode[1] != OP_ANY || (bracket_map & backref_map) != 0) return FALSE;
+     }
+
+   /* Check for explicit circumflex */
+
+   else if (op != OP_CIRC) return FALSE;
+
+   /* Move on to the next alternative */
+
+   code += GET(code, 1);
+   }
+while (*code == OP_ALT);  /* Loop for each alternative */
+return TRUE;
+}
+
+
+
+/*************************************************
+*       Check for asserted fixed first char      *
+*************************************************/
+
+/* During compilation, the "first char" settings from forward assertions are
+discarded, because they can cause conflicts with actual literals that follow.
+However, if we end up without a first char setting for an unanchored pattern,
+it is worth scanning the regex to see if there is an initial asserted first
+char. If all branches start with the same asserted char, or with a bracket all
+of whose alternatives start with the same asserted char (recurse ad lib), then
+we return that char, otherwise -1.
+
+Arguments:
+  code       points to start of expression (the bracket)
+  options    pointer to the options (used to check casing changes)
+  inassert   TRUE if in an assertion
+
+Returns:     -1 or the fixed first char
+*/
+
+static int
+find_firstassertedchar(const uschar *code, int *options, BOOL inassert)
+{
+register int c = -1;
+do {
+   int d;
+   const uschar *scode =
+     first_significant_code(code + 1+LINK_SIZE, options, PCRE_CASELESS, TRUE);
+   register int op = *scode;
+
+   switch(op)
+     {
+     default:
+     return -1;
+
+     case OP_BRA:
+     case OP_CBRA:
+     case OP_ASSERT:
+     case OP_ONCE:
+     case OP_COND:
+     if ((d = find_firstassertedchar(scode, options, op == OP_ASSERT)) < 0)
+       return -1;
+     if (c < 0) c = d; else if (c != d) return -1;
+     break;
+
+     case OP_EXACT:       /* Fall through */
+     scode += 2;
+
+     case OP_CHAR:
+     case OP_CHARNC:
+     case OP_PLUS:
+     case OP_MINPLUS:
+     case OP_POSPLUS:
+     if (!inassert) return -1;
+     if (c < 0)
+       {
+       c = scode[1];
+       if ((*options & PCRE_CASELESS) != 0) c |= REQ_CASELESS;
+       }
+     else if (c != scode[1]) return -1;
+     break;
+     }
+
+   code += GET(code, 1);
+   }
+while (*code == OP_ALT);
+return c;
+}
+
+
+
+/*************************************************
+*        Compile a Regular Expression            *
+*************************************************/
+
+/* This function takes a string and returns a pointer to a block of store
+holding a compiled version of the expression. The original API for this
+function had no error code return variable; it is retained for backwards
+compatibility. The new function is given a new name.
+
+Arguments:
+  pattern       the regular expression
+  options       various option bits
+  errorcodeptr  pointer to error code variable (pcre_compile2() only)
+                  can be NULL if you don't want a code value
+  errorptr      pointer to pointer to error text
+  erroroffset   ptr offset in pattern where error was detected
+  tables        pointer to character tables or NULL
+
+Returns:        pointer to compiled data block, or NULL on error,
+                with errorptr and erroroffset set
+*/
+
+PCRE_EXP_DEFN pcre *
+pcre_compile(const char *pattern, int options, const char **errorptr,
+  int *erroroffset, const unsigned char *tables)
+{
+return pcre_compile2(pattern, options, NULL, errorptr, erroroffset, tables);
+}
+
+
+PCRE_EXP_DEFN pcre *
+pcre_compile2(const char *pattern, int options, int *errorcodeptr,
+  const char **errorptr, int *erroroffset, const unsigned char *tables)
+{
+real_pcre *re;
+int length = 1;  /* For final END opcode */
+int firstbyte, reqbyte, newline;
+int errorcode = 0;
+int skipatstart = 0;
+#ifdef SUPPORT_UTF8
+BOOL utf8;
+#endif
+size_t size;
+uschar *code;
+const uschar *codestart;
+const uschar *ptr;
+compile_data compile_block;
+compile_data *cd = &compile_block;
+
+/* This space is used for "compiling" into during the first phase, when we are
+computing the amount of memory that is needed. Compiled items are thrown away
+as soon as possible, so that a fairly large buffer should be sufficient for
+this purpose. The same space is used in the second phase for remembering where
+to fill in forward references to subpatterns. */
+
+uschar cworkspace[COMPILE_WORK_SIZE];
+
+/* Set this early so that early errors get offset 0. */
+
+ptr = (const uschar *)pattern;
+
+/* We can't pass back an error message if errorptr is NULL; I guess the best we
+can do is just return NULL, but we can set a code value if there is a code
+pointer. */
+
+if (errorptr == NULL)
+  {
+  if (errorcodeptr != NULL) *errorcodeptr = 99;
+  return NULL;
+  }
+
+*errorptr = NULL;
+if (errorcodeptr != NULL) *errorcodeptr = ERR0;
+
+/* However, we can give a message for this error */
+
+if (erroroffset == NULL)
+  {
+  errorcode = ERR16;
+  goto PCRE_EARLY_ERROR_RETURN2;
+  }
+
+*erroroffset = 0;
+
+/* Can't support UTF8 unless PCRE has been compiled to include the code. */
+
+#ifdef SUPPORT_UTF8
+utf8 = (options & PCRE_UTF8) != 0;
+if (utf8 && (options & PCRE_NO_UTF8_CHECK) == 0 &&
+     (*erroroffset = _pcre_valid_utf8((uschar *)pattern, -1)) >= 0)
+  {
+  errorcode = ERR44;
+  goto PCRE_EARLY_ERROR_RETURN2;
+  }
+#else
+if ((options & PCRE_UTF8) != 0)
+  {
+  errorcode = ERR32;
+  goto PCRE_EARLY_ERROR_RETURN;
+  }
+#endif
+
+if ((options & ~PUBLIC_OPTIONS) != 0)
+  {
+  errorcode = ERR17;
+  goto PCRE_EARLY_ERROR_RETURN;
+  }
+
+/* Set up pointers to the individual character tables */
+
+if (tables == NULL) tables = _pcre_default_tables;
+cd->lcc = tables + lcc_offset;
+cd->fcc = tables + fcc_offset;
+cd->cbits = tables + cbits_offset;
+cd->ctypes = tables + ctypes_offset;
+
+/* Check for global one-time settings at the start of the pattern, and remember
+the offset for later. */
+
+while (ptr[skipatstart] == '(' && ptr[skipatstart+1] == '*')
+  {
+  int newnl = 0;
+  int newbsr = 0;
+
+  if (strncmp((char *)(ptr+skipatstart+2), "CR)", 3) == 0)
+    { skipatstart += 5; newnl = PCRE_NEWLINE_CR; }
+  else if (strncmp((char *)(ptr+skipatstart+2), "LF)", 3)  == 0)
+    { skipatstart += 5; newnl = PCRE_NEWLINE_LF; }
+  else if (strncmp((char *)(ptr+skipatstart+2), "CRLF)", 5)  == 0)
+    { skipatstart += 7; newnl = PCRE_NEWLINE_CR + PCRE_NEWLINE_LF; }
+  else if (strncmp((char *)(ptr+skipatstart+2), "ANY)", 4) == 0)
+    { skipatstart += 6; newnl = PCRE_NEWLINE_ANY; }
+  else if (strncmp((char *)(ptr+skipatstart+2), "ANYCRLF)", 8)  == 0)
+    { skipatstart += 10; newnl = PCRE_NEWLINE_ANYCRLF; }
+
+  else if (strncmp((char *)(ptr+skipatstart+2), "BSR_ANYCRLF)", 12) == 0)
+    { skipatstart += 14; newbsr = PCRE_BSR_ANYCRLF; }
+  else if (strncmp((char *)(ptr+skipatstart+2), "BSR_UNICODE)", 12) == 0)
+    { skipatstart += 14; newbsr = PCRE_BSR_UNICODE; }
+
+  if (newnl != 0)
+    options = (options & ~PCRE_NEWLINE_BITS) | newnl;
+  else if (newbsr != 0)
+    options = (options & ~(PCRE_BSR_ANYCRLF|PCRE_BSR_UNICODE)) | newbsr;
+  else break;
+  }
+
+/* Check validity of \R options. */
+
+switch (options & (PCRE_BSR_ANYCRLF|PCRE_BSR_UNICODE))
+  {
+  case 0:
+  case PCRE_BSR_ANYCRLF:
+  case PCRE_BSR_UNICODE:
+  break;
+  default: errorcode = ERR56; goto PCRE_EARLY_ERROR_RETURN;
+  }
+
+/* Handle different types of newline. The three bits give seven cases. The
+current code allows for fixed one- or two-byte sequences, plus "any" and
+"anycrlf". */
+
+switch (options & PCRE_NEWLINE_BITS)
+  {
+  case 0: newline = NEWLINE; break;   /* Build-time default */
+  case PCRE_NEWLINE_CR: newline = '\r'; break;
+  case PCRE_NEWLINE_LF: newline = '\n'; break;
+  case PCRE_NEWLINE_CR+
+       PCRE_NEWLINE_LF: newline = ('\r' << 8) | '\n'; break;
+  case PCRE_NEWLINE_ANY: newline = -1; break;
+  case PCRE_NEWLINE_ANYCRLF: newline = -2; break;
+  default: errorcode = ERR56; goto PCRE_EARLY_ERROR_RETURN;
+  }
+
+if (newline == -2)
+  {
+  cd->nltype = NLTYPE_ANYCRLF;
+  }
+else if (newline < 0)
+  {
+  cd->nltype = NLTYPE_ANY;
+  }
+else
+  {
+  cd->nltype = NLTYPE_FIXED;
+  if (newline > 255)
+    {
+    cd->nllen = 2;
+    cd->nl[0] = (newline >> 8) & 255;
+    cd->nl[1] = newline & 255;
+    }
+  else
+    {
+    cd->nllen = 1;
+    cd->nl[0] = newline;
+    }
+  }
+
+/* Maximum back reference and backref bitmap. The bitmap records up to 31 back
+references to help in deciding whether (.*) can be treated as anchored or not.
+*/
+
+cd->top_backref = 0;
+cd->backref_map = 0;
+
+/* Reflect pattern for debugging output */
+
+DPRINTF(("------------------------------------------------------------------\n"));
+DPRINTF(("%s\n", pattern));
+
+/* Pretend to compile the pattern while actually just accumulating the length
+of memory required. This behaviour is triggered by passing a non-NULL final
+argument to compile_regex(). We pass a block of workspace (cworkspace) for it
+to compile parts of the pattern into; the compiled code is discarded when it is
+no longer needed, so hopefully this workspace will never overflow, though there
+is a test for its doing so. */
+
+cd->bracount = cd->final_bracount = 0;
+cd->names_found = 0;
+cd->name_entry_size = 0;
+cd->name_table = NULL;
+cd->start_workspace = cworkspace;
+cd->start_code = cworkspace;
+cd->hwm = cworkspace;
+cd->start_pattern = (const uschar *)pattern;
+cd->end_pattern = (const uschar *)(pattern + strlen(pattern));
+cd->req_varyopt = 0;
+cd->external_options = options;
+cd->external_flags = 0;
+
+/* Now do the pre-compile. On error, errorcode will be set non-zero, so we
+don't need to look at the result of the function here. The initial options have
+been put into the cd block so that they can be changed if an option setting is
+found within the regex right at the beginning. Bringing initial option settings
+outside can help speed up starting point checks. */
+
+ptr += skipatstart;
+code = cworkspace;
+*code = OP_BRA;
+(void)compile_regex(cd->external_options, cd->external_options & PCRE_IMS,
+  &code, &ptr, &errorcode, FALSE, FALSE, 0, &firstbyte, &reqbyte, NULL, cd,
+  &length);
+if (errorcode != 0) goto PCRE_EARLY_ERROR_RETURN;
+
+DPRINTF(("end pre-compile: length=%d workspace=%d\n", length,
+  cd->hwm - cworkspace));
+
+if (length > MAX_PATTERN_SIZE)
+  {
+  errorcode = ERR20;
+  goto PCRE_EARLY_ERROR_RETURN;
+  }
+
+/* Compute the size of data block needed and get it, either from malloc or
+externally provided function. Integer overflow should no longer be possible
+because nowadays we limit the maximum value of cd->names_found and
+cd->name_entry_size. */
+
+size = length + sizeof(real_pcre) + cd->names_found * (cd->name_entry_size + 3);
+re = (real_pcre *)(pcre_malloc)(size);
+
+if (re == NULL)
+  {
+  errorcode = ERR21;
+  goto PCRE_EARLY_ERROR_RETURN;
+  }
+
+/* Put in the magic number, and save the sizes, initial options, internal
+flags, and character table pointer. NULL is used for the default character
+tables. The nullpad field is at the end; it's there to help in the case when a
+regex compiled on a system with 4-byte pointers is run on another with 8-byte
+pointers. */
+
+re->magic_number = MAGIC_NUMBER;
+re->size = size;
+re->options = cd->external_options;
+re->flags = cd->external_flags;
+re->dummy1 = 0;
+re->first_byte = 0;
+re->req_byte = 0;
+re->name_table_offset = sizeof(real_pcre);
+re->name_entry_size = cd->name_entry_size;
+re->name_count = cd->names_found;
+re->ref_count = 0;
+re->tables = (tables == _pcre_default_tables)? NULL : tables;
+re->nullpad = NULL;
+
+/* The starting points of the name/number translation table and of the code are
+passed around in the compile data block. The start/end pattern and initial
+options are already set from the pre-compile phase, as is the name_entry_size
+field. Reset the bracket count and the names_found field. Also reset the hwm
+field; this time it's used for remembering forward references to subpatterns.
+*/
+
+cd->final_bracount = cd->bracount;  /* Save for checking forward references */
+cd->bracount = 0;
+cd->names_found = 0;
+cd->name_table = (uschar *)re + re->name_table_offset;
+codestart = cd->name_table + re->name_entry_size * re->name_count;
+cd->start_code = codestart;
+cd->hwm = cworkspace;
+cd->req_varyopt = 0;
+cd->had_accept = FALSE;
+
+/* Set up a starting, non-extracting bracket, then compile the expression. On
+error, errorcode will be set non-zero, so we don't need to look at the result
+of the function here. */
+
+ptr = (const uschar *)pattern + skipatstart;
+code = (uschar *)codestart;
+*code = OP_BRA;
+(void)compile_regex(re->options, re->options & PCRE_IMS, &code, &ptr,
+  &errorcode, FALSE, FALSE, 0, &firstbyte, &reqbyte, NULL, cd, NULL);
+re->top_bracket = cd->bracount;
+re->top_backref = cd->top_backref;
+re->flags = cd->external_flags;
+
+if (cd->had_accept) reqbyte = -1;   /* Must disable after (*ACCEPT) */
+
+/* If not reached end of pattern on success, there's an excess bracket. */
+
+if (errorcode == 0 && *ptr != 0) errorcode = ERR22;
+
+/* Fill in the terminating state and check for disastrous overflow, but
+if debugging, leave the test till after things are printed out. */
+
+*code++ = OP_END;
+
+#ifndef DEBUG
+if (code - codestart > length) errorcode = ERR23;
+#endif
+
+/* Fill in any forward references that are required. */
+
+while (errorcode == 0 && cd->hwm > cworkspace)
+  {
+  int offset, recno;
+  const uschar *groupptr;
+  cd->hwm -= LINK_SIZE;
+  offset = GET(cd->hwm, 0);
+  recno = GET(codestart, offset);
+  groupptr = find_bracket(codestart, (re->options & PCRE_UTF8) != 0, recno);
+  if (groupptr == NULL) errorcode = ERR53;
+    else PUT(((uschar *)codestart), offset, groupptr - codestart);
+  }
+
+/* Give an error if there's back reference to a non-existent capturing
+subpattern. */
+
+if (errorcode == 0 && re->top_backref > re->top_bracket) errorcode = ERR15;
+
+/* Failed to compile, or error while post-processing */
+
+if (errorcode != 0)
+  {
+  (pcre_free)(re);
+  PCRE_EARLY_ERROR_RETURN:
+  *erroroffset = ptr - (const uschar *)pattern;
+  PCRE_EARLY_ERROR_RETURN2:
+  *errorptr = find_error_text(errorcode);
+  if (errorcodeptr != NULL) *errorcodeptr = errorcode;
+  return NULL;
+  }
+
+/* If the anchored option was not passed, set the flag if we can determine that
+the pattern is anchored by virtue of ^ characters or \A or anything else (such
+as starting with .* when DOTALL is set).
+
+Otherwise, if we know what the first byte has to be, save it, because that
+speeds up unanchored matches no end. If not, see if we can set the
+PCRE_STARTLINE flag. This is helpful for multiline matches when all branches
+start with ^. and also when all branches start with .* for non-DOTALL matches.
+*/
+
+if ((re->options & PCRE_ANCHORED) == 0)
+  {
+  int temp_options = re->options;   /* May get changed during these scans */
+  if (is_anchored(codestart, &temp_options, 0, cd->backref_map))
+    re->options |= PCRE_ANCHORED;
+  else
+    {
+    if (firstbyte < 0)
+      firstbyte = find_firstassertedchar(codestart, &temp_options, FALSE);
+    if (firstbyte >= 0)   /* Remove caseless flag for non-caseable chars */
+      {
+      int ch = firstbyte & 255;
+      re->first_byte = ((firstbyte & REQ_CASELESS) != 0 &&
+         cd->fcc[ch] == ch)? ch : firstbyte;
+      re->flags |= PCRE_FIRSTSET;
+      }
+    else if (is_startline(codestart, 0, cd->backref_map))
+      re->flags |= PCRE_STARTLINE;
+    }
+  }
+
+/* For an anchored pattern, we use the "required byte" only if it follows a
+variable length item in the regex. Remove the caseless flag for non-caseable
+bytes. */
+
+if (reqbyte >= 0 &&
+     ((re->options & PCRE_ANCHORED) == 0 || (reqbyte & REQ_VARY) != 0))
+  {
+  int ch = reqbyte & 255;
+  re->req_byte = ((reqbyte & REQ_CASELESS) != 0 &&
+    cd->fcc[ch] == ch)? (reqbyte & ~REQ_CASELESS) : reqbyte;
+  re->flags |= PCRE_REQCHSET;
+  }
+
+/* Print out the compiled data if debugging is enabled. This is never the
+case when building a production library. */
+
+#ifdef DEBUG
+
+printf("Length = %d top_bracket = %d top_backref = %d\n",
+  length, re->top_bracket, re->top_backref);
+
+printf("Options=%08x\n", re->options);
+
+if ((re->flags & PCRE_FIRSTSET) != 0)
+  {
+  int ch = re->first_byte & 255;
+  const char *caseless = ((re->first_byte & REQ_CASELESS) == 0)?
+    "" : " (caseless)";
+  if (isprint(ch)) printf("First char = %c%s\n", ch, caseless);
+    else printf("First char = \\x%02x%s\n", ch, caseless);
+  }
+
+if ((re->flags & PCRE_REQCHSET) != 0)
+  {
+  int ch = re->req_byte & 255;
+  const char *caseless = ((re->req_byte & REQ_CASELESS) == 0)?
+    "" : " (caseless)";
+  if (isprint(ch)) printf("Req char = %c%s\n", ch, caseless);
+    else printf("Req char = \\x%02x%s\n", ch, caseless);
+  }
+
+pcre_printint(re, stdout, TRUE);
+
+/* This check is done here in the debugging case so that the code that
+was compiled can be seen. */
+
+if (code - codestart > length)
+  {
+  (pcre_free)(re);
+  *errorptr = find_error_text(ERR23);
+  *erroroffset = ptr - (uschar *)pattern;
+  if (errorcodeptr != NULL) *errorcodeptr = ERR23;
+  return NULL;
+  }
+#endif   /* DEBUG */
+
+return (pcre *)re;
+}
+
+/* End of pcre_compile.c */
diff --git a/uppsrc/plugin/pcre/lib/pcre_config.c b/uppsrc/plugin/pcre/lib/pcre_config.c
new file mode 100644
index 000000000..454fed98d
--- /dev/null
+++ b/uppsrc/plugin/pcre/lib/pcre_config.c
@@ -0,0 +1,128 @@
+/*************************************************
+*      Perl-Compatible Regular Expressions       *
+*************************************************/
+
+/* PCRE is a library of functions to support regular expressions whose syntax
+and semantics are as close as possible to those of the Perl 5 language.
+
+                       Written by Philip Hazel
+           Copyright (c) 1997-2008 University of Cambridge
+
+-----------------------------------------------------------------------------
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+
+    * Neither the name of the University of Cambridge nor the names of its
+      contributors may be used to endorse or promote products derived from
+      this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+-----------------------------------------------------------------------------
+*/
+
+
+/* This module contains the external function pcre_config(). */
+
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "pcre_internal.h"
+
+
+/*************************************************
+* Return info about what features are configured *
+*************************************************/
+
+/* This function has an extensible interface so that additional items can be
+added compatibly.
+
+Arguments:
+  what             what information is required
+  where            where to put the information
+
+Returns:           0 if data returned, negative on error
+*/
+
+PCRE_EXP_DEFN int
+pcre_config(int what, void *where)
+{
+switch (what)
+  {
+  case PCRE_CONFIG_UTF8:
+#ifdef SUPPORT_UTF8
+  *((int *)where) = 1;
+#else
+  *((int *)where) = 0;
+#endif
+  break;
+
+  case PCRE_CONFIG_UNICODE_PROPERTIES:
+#ifdef SUPPORT_UCP
+  *((int *)where) = 1;
+#else
+  *((int *)where) = 0;
+#endif
+  break;
+
+  case PCRE_CONFIG_NEWLINE:
+  *((int *)where) = NEWLINE;
+  break;
+
+  case PCRE_CONFIG_BSR:
+#ifdef BSR_ANYCRLF
+  *((int *)where) = 1;
+#else
+  *((int *)where) = 0;
+#endif
+  break;
+
+  case PCRE_CONFIG_LINK_SIZE:
+  *((int *)where) = LINK_SIZE;
+  break;
+
+  case PCRE_CONFIG_POSIX_MALLOC_THRESHOLD:
+  *((int *)where) = POSIX_MALLOC_THRESHOLD;
+  break;
+
+  case PCRE_CONFIG_MATCH_LIMIT:
+  *((unsigned int *)where) = MATCH_LIMIT;
+  break;
+
+  case PCRE_CONFIG_MATCH_LIMIT_RECURSION:
+  *((unsigned int *)where) = MATCH_LIMIT_RECURSION;
+  break;
+
+  case PCRE_CONFIG_STACKRECURSE:
+#ifdef NO_RECURSE
+  *((int *)where) = 0;
+#else
+  *((int *)where) = 1;
+#endif
+  break;
+
+  default: return PCRE_ERROR_BADOPTION;
+  }
+
+return 0;
+}
+
+/* End of pcre_config.c */
diff --git a/uppsrc/plugin/pcre/lib/pcre_dfa_exec.c b/uppsrc/plugin/pcre/lib/pcre_dfa_exec.c
new file mode 100644
index 000000000..6283ff781
--- /dev/null
+++ b/uppsrc/plugin/pcre/lib/pcre_dfa_exec.c
@@ -0,0 +1,2896 @@
+/*************************************************
+*      Perl-Compatible Regular Expressions       *
+*************************************************/
+
+/* PCRE is a library of functions to support regular expressions whose syntax
+and semantics are as close as possible to those of the Perl 5 language.
+
+                       Written by Philip Hazel
+           Copyright (c) 1997-2008 University of Cambridge
+
+-----------------------------------------------------------------------------
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+
+    * Neither the name of the University of Cambridge nor the names of its
+      contributors may be used to endorse or promote products derived from
+      this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+-----------------------------------------------------------------------------
+*/
+
+
+/* This module contains the external function pcre_dfa_exec(), which is an
+alternative matching function that uses a sort of DFA algorithm (not a true
+FSM). This is NOT Perl- compatible, but it has advantages in certain
+applications. */
+
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#define NLBLOCK md             /* Block containing newline information */
+#define PSSTART start_subject  /* Field containing processed string start */
+#define PSEND   end_subject    /* Field containing processed string end */
+
+#include "pcre_internal.h"
+
+
+/* For use to indent debugging output */
+
+#define SP "                   "
+
+
+
+/*************************************************
+*      Code parameters and static tables         *
+*************************************************/
+
+/* These are offsets that are used to turn the OP_TYPESTAR and friends opcodes
+into others, under special conditions. A gap of 20 between the blocks should be
+enough. The resulting opcodes don't have to be less than 256 because they are
+never stored, so we push them well clear of the normal opcodes. */
+
+#define OP_PROP_EXTRA       300
+#define OP_EXTUNI_EXTRA     320
+#define OP_ANYNL_EXTRA      340
+#define OP_HSPACE_EXTRA     360
+#define OP_VSPACE_EXTRA     380
+
+
+/* This table identifies those opcodes that are followed immediately by a
+character that is to be tested in some way. This makes is possible to
+centralize the loading of these characters. In the case of Type * etc, the
+"character" is the opcode for \D, \d, \S, \s, \W, or \w, which will always be a
+small value. ***NOTE*** If the start of this table is modified, the two tables
+that follow must also be modified. */
+
+static uschar coptable[] = {
+  0,                             /* End                                    */
+  0, 0, 0, 0, 0,                 /* \A, \G, \K, \B, \b                     */
+  0, 0, 0, 0, 0, 0,              /* \D, \d, \S, \s, \W, \w                 */
+  0, 0,                          /* Any, Anybyte                           */
+  0, 0, 0,                       /* NOTPROP, PROP, EXTUNI                  */
+  0, 0, 0, 0, 0,                 /* \R, \H, \h, \V, \v                     */
+  0, 0, 0, 0, 0,                 /* \Z, \z, Opt, ^, $                      */
+  1,                             /* Char                                   */
+  1,                             /* Charnc                                 */
+  1,                             /* not                                    */
+  /* Positive single-char repeats                                          */
+  1, 1, 1, 1, 1, 1,              /* *, *?, +, +?, ?, ??                    */
+  3, 3, 3,                       /* upto, minupto, exact                   */
+  1, 1, 1, 3,                    /* *+, ++, ?+, upto+                      */
+  /* Negative single-char repeats - only for chars < 256                   */
+  1, 1, 1, 1, 1, 1,              /* NOT *, *?, +, +?, ?, ??                */
+  3, 3, 3,                       /* NOT upto, minupto, exact               */
+  1, 1, 1, 3,                    /* NOT *+, ++, ?+, updo+                  */
+  /* Positive type repeats                                                 */
+  1, 1, 1, 1, 1, 1,              /* Type *, *?, +, +?, ?, ??               */
+  3, 3, 3,                       /* Type upto, minupto, exact              */
+  1, 1, 1, 3,                    /* Type *+, ++, ?+, upto+                 */
+  /* Character class & ref repeats                                         */
+  0, 0, 0, 0, 0, 0,              /* *, *?, +, +?, ?, ??                    */
+  0, 0,                          /* CRRANGE, CRMINRANGE                    */
+  0,                             /* CLASS                                  */
+  0,                             /* NCLASS                                 */
+  0,                             /* XCLASS - variable length               */
+  0,                             /* REF                                    */
+  0,                             /* RECURSE                                */
+  0,                             /* CALLOUT                                */
+  0,                             /* Alt                                    */
+  0,                             /* Ket                                    */
+  0,                             /* KetRmax                                */
+  0,                             /* KetRmin                                */
+  0,                             /* Assert                                 */
+  0,                             /* Assert not                             */
+  0,                             /* Assert behind                          */
+  0,                             /* Assert behind not                      */
+  0,                             /* Reverse                                */
+  0, 0, 0, 0,                    /* ONCE, BRA, CBRA, COND                  */
+  0, 0, 0,                       /* SBRA, SCBRA, SCOND                     */
+  0,                             /* CREF                                   */
+  0,                             /* RREF                                   */
+  0,                             /* DEF                                    */
+  0, 0,                          /* BRAZERO, BRAMINZERO                    */
+  0, 0, 0, 0,                    /* PRUNE, SKIP, THEN, COMMIT              */
+  0, 0                           /* FAIL, ACCEPT                           */
+};
+
+/* These 2 tables allow for compact code for testing for \D, \d, \S, \s, \W,
+and \w */
+
+static uschar toptable1[] = {
+  0, 0, 0, 0, 0, 0,
+  ctype_digit, ctype_digit,
+  ctype_space, ctype_space,
+  ctype_word,  ctype_word,
+  0                               /* OP_ANY */
+};
+
+static uschar toptable2[] = {
+  0, 0, 0, 0, 0, 0,
+  ctype_digit, 0,
+  ctype_space, 0,
+  ctype_word,  0,
+  1                               /* OP_ANY */
+};
+
+
+/* Structure for holding data about a particular state, which is in effect the
+current data for an active path through the match tree. It must consist
+entirely of ints because the working vector we are passed, and which we put
+these structures in, is a vector of ints. */
+
+typedef struct stateblock {
+  int offset;                     /* Offset to opcode */
+  int count;                      /* Count for repeats */
+  int ims;                        /* ims flag bits */
+  int data;                       /* Some use extra data */
+} stateblock;
+
+#define INTS_PER_STATEBLOCK  (sizeof(stateblock)/sizeof(int))
+
+
+#ifdef DEBUG
+/*************************************************
+*             Print character string             *
+*************************************************/
+
+/* Character string printing function for debugging.
+
+Arguments:
+  p            points to string
+  length       number of bytes
+  f            where to print
+
+Returns:       nothing
+*/
+
+static void
+pchars(unsigned char *p, int length, FILE *f)
+{
+int c;
+while (length-- > 0)
+  {
+  if (isprint(c = *(p++)))
+    fprintf(f, "%c", c);
+  else
+    fprintf(f, "\\x%02x", c);
+  }
+}
+#endif
+
+
+
+/*************************************************
+*    Execute a Regular Expression - DFA engine   *
+*************************************************/
+
+/* This internal function applies a compiled pattern to a subject string,
+starting at a given point, using a DFA engine. This function is called from the
+external one, possibly multiple times if the pattern is not anchored. The
+function calls itself recursively for some kinds of subpattern.
+
+Arguments:
+  md                the match_data block with fixed information
+  this_start_code   the opening bracket of this subexpression's code
+  current_subject   where we currently are in the subject string
+  start_offset      start offset in the subject string
+  offsets           vector to contain the matching string offsets
+  offsetcount       size of same
+  workspace         vector of workspace
+  wscount           size of same
+  ims               the current ims flags
+  rlevel            function call recursion level
+  recursing         regex recursive call level
+
+Returns:            > 0 =>
+                    = 0 =>
+                     -1 => failed to match
+                   < -1 => some kind of unexpected problem
+
+The following macros are used for adding states to the two state vectors (one
+for the current character, one for the following character). */
+
+#define ADD_ACTIVE(x,y) \
+  if (active_count++ < wscount) \
+    { \
+    next_active_state->offset = (x); \
+    next_active_state->count  = (y); \
+    next_active_state->ims    = ims; \
+    next_active_state++; \
+    DPRINTF(("%.*sADD_ACTIVE(%d,%d)\n", rlevel*2-2, SP, (x), (y))); \
+    } \
+  else return PCRE_ERROR_DFA_WSSIZE
+
+#define ADD_ACTIVE_DATA(x,y,z) \
+  if (active_count++ < wscount) \
+    { \
+    next_active_state->offset = (x); \
+    next_active_state->count  = (y); \
+    next_active_state->ims    = ims; \
+    next_active_state->data   = (z); \
+    next_active_state++; \
+    DPRINTF(("%.*sADD_ACTIVE_DATA(%d,%d,%d)\n", rlevel*2-2, SP, (x), (y), (z))); \
+    } \
+  else return PCRE_ERROR_DFA_WSSIZE
+
+#define ADD_NEW(x,y) \
+  if (new_count++ < wscount) \
+    { \
+    next_new_state->offset = (x); \
+    next_new_state->count  = (y); \
+    next_new_state->ims    = ims; \
+    next_new_state++; \
+    DPRINTF(("%.*sADD_NEW(%d,%d)\n", rlevel*2-2, SP, (x), (y))); \
+    } \
+  else return PCRE_ERROR_DFA_WSSIZE
+
+#define ADD_NEW_DATA(x,y,z) \
+  if (new_count++ < wscount) \
+    { \
+    next_new_state->offset = (x); \
+    next_new_state->count  = (y); \
+    next_new_state->ims    = ims; \
+    next_new_state->data   = (z); \
+    next_new_state++; \
+    DPRINTF(("%.*sADD_NEW_DATA(%d,%d,%d)\n", rlevel*2-2, SP, (x), (y), (z))); \
+    } \
+  else return PCRE_ERROR_DFA_WSSIZE
+
+/* And now, here is the code */
+
+static int
+internal_dfa_exec(
+  dfa_match_data *md,
+  const uschar *this_start_code,
+  const uschar *current_subject,
+  int start_offset,
+  int *offsets,
+  int offsetcount,
+  int *workspace,
+  int wscount,
+  int ims,
+  int  rlevel,
+  int  recursing)
+{
+stateblock *active_states, *new_states, *temp_states;
+stateblock *next_active_state, *next_new_state;
+
+const uschar *ctypes, *lcc, *fcc;
+const uschar *ptr;
+const uschar *end_code, *first_op;
+
+int active_count, new_count, match_count;
+
+/* Some fields in the md block are frequently referenced, so we load them into
+independent variables in the hope that this will perform better. */
+
+const uschar *start_subject = md->start_subject;
+const uschar *end_subject = md->end_subject;
+const uschar *start_code = md->start_code;
+
+#ifdef SUPPORT_UTF8
+BOOL utf8 = (md->poptions & PCRE_UTF8) != 0;
+#else
+BOOL utf8 = FALSE;
+#endif
+
+rlevel++;
+offsetcount &= (-2);
+
+wscount -= 2;
+wscount = (wscount - (wscount % (INTS_PER_STATEBLOCK * 2))) /
+          (2 * INTS_PER_STATEBLOCK);
+
+DPRINTF(("\n%.*s---------------------\n"
+  "%.*sCall to internal_dfa_exec f=%d r=%d\n",
+  rlevel*2-2, SP, rlevel*2-2, SP, rlevel, recursing));
+
+ctypes = md->tables + ctypes_offset;
+lcc = md->tables + lcc_offset;
+fcc = md->tables + fcc_offset;
+
+match_count = PCRE_ERROR_NOMATCH;   /* A negative number */
+
+active_states = (stateblock *)(workspace + 2);
+next_new_state = new_states = active_states + wscount;
+new_count = 0;
+
+first_op = this_start_code + 1 + LINK_SIZE +
+  ((*this_start_code == OP_CBRA || *this_start_code == OP_SCBRA)? 2:0);
+
+/* The first thing in any (sub) pattern is a bracket of some sort. Push all
+the alternative states onto the list, and find out where the end is. This
+makes is possible to use this function recursively, when we want to stop at a
+matching internal ket rather than at the end.
+
+If the first opcode in the first alternative is OP_REVERSE, we are dealing with
+a backward assertion. In that case, we have to find out the maximum amount to
+move back, and set up each alternative appropriately. */
+
+if (*first_op == OP_REVERSE)
+  {
+  int max_back = 0;
+  int gone_back;
+
+  end_code = this_start_code;
+  do
+    {
+    int back = GET(end_code, 2+LINK_SIZE);
+    if (back > max_back) max_back = back;
+    end_code += GET(end_code, 1);
+    }
+  while (*end_code == OP_ALT);
+
+  /* If we can't go back the amount required for the longest lookbehind
+  pattern, go back as far as we can; some alternatives may still be viable. */
+
+#ifdef SUPPORT_UTF8
+  /* In character mode we have to step back character by character */
+
+  if (utf8)
+    {
+    for (gone_back = 0; gone_back < max_back; gone_back++)
+      {
+      if (current_subject <= start_subject) break;
+      current_subject--;
+      while (current_subject > start_subject &&
+             (*current_subject & 0xc0) == 0x80)
+        current_subject--;
+      }
+    }
+  else
+#endif
+
+  /* In byte-mode we can do this quickly. */
+
+    {
+    gone_back = (current_subject - max_back < start_subject)?
+      current_subject - start_subject : max_back;
+    current_subject -= gone_back;
+    }
+
+  /* Now we can process the individual branches. */
+
+  end_code = this_start_code;
+  do
+    {
+    int back = GET(end_code, 2+LINK_SIZE);
+    if (back <= gone_back)
+      {
+      int bstate = end_code - start_code + 2 + 2*LINK_SIZE;
+      ADD_NEW_DATA(-bstate, 0, gone_back - back);
+      }
+    end_code += GET(end_code, 1);
+    }
+  while (*end_code == OP_ALT);
+ }
+
+/* This is the code for a "normal" subpattern (not a backward assertion). The
+start of a whole pattern is always one of these. If we are at the top level,
+we may be asked to restart matching from the same point that we reached for a
+previous partial match. We still have to scan through the top-level branches to
+find the end state. */
+
+else
+  {
+  end_code = this_start_code;
+
+  /* Restarting */
+
+  if (rlevel == 1 && (md->moptions & PCRE_DFA_RESTART) != 0)
+    {
+    do { end_code += GET(end_code, 1); } while (*end_code == OP_ALT);
+    new_count = workspace[1];
+    if (!workspace[0])
+      memcpy(new_states, active_states, new_count * sizeof(stateblock));
+    }
+
+  /* Not restarting */
+
+  else
+    {
+    int length = 1 + LINK_SIZE +
+      ((*this_start_code == OP_CBRA || *this_start_code == OP_SCBRA)? 2:0);
+    do
+      {
+      ADD_NEW(end_code - start_code + length, 0);
+      end_code += GET(end_code, 1);
+      length = 1 + LINK_SIZE;
+      }
+    while (*end_code == OP_ALT);
+    }
+  }
+
+workspace[0] = 0;    /* Bit indicating which vector is current */
+
+DPRINTF(("%.*sEnd state = %d\n", rlevel*2-2, SP, end_code - start_code));
+
+/* Loop for scanning the subject */
+
+ptr = current_subject;
+for (;;)
+  {
+  int i, j;
+  int clen, dlen;
+  unsigned int c, d;
+
+  /* Make the new state list into the active state list and empty the
+  new state list. */
+
+  temp_states = active_states;
+  active_states = new_states;
+  new_states = temp_states;
+  active_count = new_count;
+  new_count = 0;
+
+  workspace[0] ^= 1;              /* Remember for the restarting feature */
+  workspace[1] = active_count;
+
+#ifdef DEBUG
+  printf("%.*sNext character: rest of subject = \"", rlevel*2-2, SP);
+  pchars((uschar *)ptr, strlen((char *)ptr), stdout);
+  printf("\"\n");
+
+  printf("%.*sActive states: ", rlevel*2-2, SP);
+  for (i = 0; i < active_count; i++)
+    printf("%d/%d ", active_states[i].offset, active_states[i].count);
+  printf("\n");
+#endif
+
+  /* Set the pointers for adding new states */
+
+  next_active_state = active_states + active_count;
+  next_new_state = new_states;
+
+  /* Load the current character from the subject outside the loop, as many
+  different states may want to look at it, and we assume that at least one
+  will. */
+
+  if (ptr < end_subject)
+    {
+    clen = 1;        /* Number of bytes in the character */
+#ifdef SUPPORT_UTF8
+    if (utf8) { GETCHARLEN(c, ptr, clen); } else
+#endif  /* SUPPORT_UTF8 */
+    c = *ptr;
+    }
+  else
+    {
+    clen = 0;        /* This indicates the end of the subject */
+    c = NOTACHAR;    /* This value should never actually be used */
+    }
+
+  /* Scan up the active states and act on each one. The result of an action
+  may be to add more states to the currently active list (e.g. on hitting a
+  parenthesis) or it may be to put states on the new list, for considering
+  when we move the character pointer on. */
+
+  for (i = 0; i < active_count; i++)
+    {
+    stateblock *current_state = active_states + i;
+    const uschar *code;
+    int state_offset = current_state->offset;
+    int count, codevalue;
+#ifdef SUPPORT_UCP
+    int chartype, script;
+#endif
+
+#ifdef DEBUG
+    printf ("%.*sProcessing state %d c=", rlevel*2-2, SP, state_offset);
+    if (clen == 0) printf("EOL\n");
+      else if (c > 32 && c < 127) printf("'%c'\n", c);
+        else printf("0x%02x\n", c);
+#endif
+
+    /* This variable is referred to implicity in the ADD_xxx macros. */
+
+    ims = current_state->ims;
+
+    /* A negative offset is a special case meaning "hold off going to this
+    (negated) state until the number of characters in the data field have
+    been skipped". */
+
+    if (state_offset < 0)
+      {
+      if (current_state->data > 0)
+        {
+        DPRINTF(("%.*sSkipping this character\n", rlevel*2-2, SP));
+        ADD_NEW_DATA(state_offset, current_state->count,
+          current_state->data - 1);
+        continue;
+        }
+      else
+        {
+        current_state->offset = state_offset = -state_offset;
+        }
+      }
+
+    /* Check for a duplicate state with the same count, and skip if found. */
+
+    for (j = 0; j < i; j++)
+      {
+      if (active_states[j].offset == state_offset &&
+          active_states[j].count == current_state->count)
+        {
+        DPRINTF(("%.*sDuplicate state: skipped\n", rlevel*2-2, SP));
+        goto NEXT_ACTIVE_STATE;
+        }
+      }
+
+    /* The state offset is the offset to the opcode */
+
+    code = start_code + state_offset;
+    codevalue = *code;
+
+    /* If this opcode is followed by an inline character, load it. It is
+    tempting to test for the presence of a subject character here, but that
+    is wrong, because sometimes zero repetitions of the subject are
+    permitted.
+
+    We also use this mechanism for opcodes such as OP_TYPEPLUS that take an
+    argument that is not a data character - but is always one byte long. We
+    have to take special action to deal with  \P, \p, \H, \h, \V, \v and \X in
+    this case. To keep the other cases fast, convert these ones to new opcodes.
+    */
+
+    if (coptable[codevalue] > 0)
+      {
+      dlen = 1;
+#ifdef SUPPORT_UTF8
+      if (utf8) { GETCHARLEN(d, (code + coptable[codevalue]), dlen); } else
+#endif  /* SUPPORT_UTF8 */
+      d = code[coptable[codevalue]];
+      if (codevalue >= OP_TYPESTAR)
+        {
+        switch(d)
+          {
+          case OP_ANYBYTE: return PCRE_ERROR_DFA_UITEM;
+          case OP_NOTPROP:
+          case OP_PROP: codevalue += OP_PROP_EXTRA; break;
+          case OP_ANYNL: codevalue += OP_ANYNL_EXTRA; break;
+          case OP_EXTUNI: codevalue += OP_EXTUNI_EXTRA; break;
+          case OP_NOT_HSPACE:
+          case OP_HSPACE: codevalue += OP_HSPACE_EXTRA; break;
+          case OP_NOT_VSPACE:
+          case OP_VSPACE: codevalue += OP_VSPACE_EXTRA; break;
+          default: break;
+          }
+        }
+      }
+    else
+      {
+      dlen = 0;         /* Not strictly necessary, but compilers moan */
+      d = NOTACHAR;     /* if these variables are not set. */
+      }
+
+
+    /* Now process the individual opcodes */
+
+    switch (codevalue)
+      {
+
+/* ========================================================================== */
+      /* Reached a closing bracket. If not at the end of the pattern, carry
+      on with the next opcode. Otherwise, unless we have an empty string and
+      PCRE_NOTEMPTY is set, save the match data, shifting up all previous
+      matches so we always have the longest first. */
+
+      case OP_KET:
+      case OP_KETRMIN:
+      case OP_KETRMAX:
+      if (code != end_code)
+        {
+        ADD_ACTIVE(state_offset + 1 + LINK_SIZE, 0);
+        if (codevalue != OP_KET)
+          {
+          ADD_ACTIVE(state_offset - GET(code, 1), 0);
+          }
+        }
+      else if (ptr > current_subject || (md->moptions & PCRE_NOTEMPTY) == 0)
+        {
+        if (match_count < 0) match_count = (offsetcount >= 2)? 1 : 0;
+          else if (match_count > 0 && ++match_count * 2 >= offsetcount)
+            match_count = 0;
+        count = ((match_count == 0)? offsetcount : match_count * 2) - 2;
+        if (count > 0) memmove(offsets + 2, offsets, count * sizeof(int));
+        if (offsetcount >= 2)
+          {
+          offsets[0] = current_subject - start_subject;
+          offsets[1] = ptr - start_subject;
+          DPRINTF(("%.*sSet matched string = \"%.*s\"\n", rlevel*2-2, SP,
+            offsets[1] - offsets[0], current_subject));
+          }
+        if ((md->moptions & PCRE_DFA_SHORTEST) != 0)
+          {
+          DPRINTF(("%.*sEnd of internal_dfa_exec %d: returning %d\n"
+            "%.*s---------------------\n\n", rlevel*2-2, SP, rlevel,
+            match_count, rlevel*2-2, SP));
+          return match_count;
+          }
+        }
+      break;
+
+/* ========================================================================== */
+      /* These opcodes add to the current list of states without looking
+      at the current character. */
+
+      /*-----------------------------------------------------------------*/
+      case OP_ALT:
+      do { code += GET(code, 1); } while (*code == OP_ALT);
+      ADD_ACTIVE(code - start_code, 0);
+      break;
+
+      /*-----------------------------------------------------------------*/
+      case OP_BRA:
+      case OP_SBRA:
+      do
+        {
+        ADD_ACTIVE(code - start_code + 1 + LINK_SIZE, 0);
+        code += GET(code, 1);
+        }
+      while (*code == OP_ALT);
+      break;
+
+      /*-----------------------------------------------------------------*/
+      case OP_CBRA:
+      case OP_SCBRA:
+      ADD_ACTIVE(code - start_code + 3 + LINK_SIZE,  0);
+      code += GET(code, 1);
+      while (*code == OP_ALT)
+        {
+        ADD_ACTIVE(code - start_code + 1 + LINK_SIZE,  0);
+        code += GET(code, 1);
+        }
+      break;
+
+      /*-----------------------------------------------------------------*/
+      case OP_BRAZERO:
+      case OP_BRAMINZERO:
+      ADD_ACTIVE(state_offset + 1, 0);
+      code += 1 + GET(code, 2);
+      while (*code == OP_ALT) code += GET(code, 1);
+      ADD_ACTIVE(code - start_code + 1 + LINK_SIZE, 0);
+      break;
+
+      /*-----------------------------------------------------------------*/
+      case OP_CIRC:
+      if ((ptr == start_subject && (md->moptions & PCRE_NOTBOL) == 0) ||
+          ((ims & PCRE_MULTILINE) != 0 &&
+            ptr != end_subject &&
+            WAS_NEWLINE(ptr)))
+        { ADD_ACTIVE(state_offset + 1, 0); }
+      break;
+
+      /*-----------------------------------------------------------------*/
+      case OP_EOD:
+      if (ptr >= end_subject) { ADD_ACTIVE(state_offset + 1, 0); }
+      break;
+
+      /*-----------------------------------------------------------------*/
+      case OP_OPT:
+      ims = code[1];
+      ADD_ACTIVE(state_offset + 2, 0);
+      break;
+
+      /*-----------------------------------------------------------------*/
+      case OP_SOD:
+      if (ptr == start_subject) { ADD_ACTIVE(state_offset + 1, 0); }
+      break;
+
+      /*-----------------------------------------------------------------*/
+      case OP_SOM:
+      if (ptr == start_subject + start_offset) { ADD_ACTIVE(state_offset + 1, 0); }
+      break;
+
+
+/* ========================================================================== */
+      /* These opcodes inspect the next subject character, and sometimes
+      the previous one as well, but do not have an argument. The variable
+      clen contains the length of the current character and is zero if we are
+      at the end of the subject. */
+
+      /*-----------------------------------------------------------------*/
+      case OP_ANY:
+      if (clen > 0 && ((ims & PCRE_DOTALL) != 0 || !IS_NEWLINE(ptr)))
+        { ADD_NEW(state_offset + 1, 0); }
+      break;
+
+      /*-----------------------------------------------------------------*/
+      case OP_EODN:
+      if (clen == 0 || (IS_NEWLINE(ptr) && ptr == end_subject - md->nllen))
+        { ADD_ACTIVE(state_offset + 1, 0); }
+      break;
+
+      /*-----------------------------------------------------------------*/
+      case OP_DOLL:
+      if ((md->moptions & PCRE_NOTEOL) == 0)
+        {
+        if (clen == 0 ||
+            (IS_NEWLINE(ptr) &&
+               ((ims & PCRE_MULTILINE) != 0 || ptr == end_subject - md->nllen)
+            ))
+          { ADD_ACTIVE(state_offset + 1, 0); }
+        }
+      else if ((ims & PCRE_MULTILINE) != 0 && IS_NEWLINE(ptr))
+        { ADD_ACTIVE(state_offset + 1, 0); }
+      break;
+
+      /*-----------------------------------------------------------------*/
+
+      case OP_DIGIT:
+      case OP_WHITESPACE:
+      case OP_WORDCHAR:
+      if (clen > 0 && c < 256 &&
+            ((ctypes[c] & toptable1[codevalue]) ^ toptable2[codevalue]) != 0)
+        { ADD_NEW(state_offset + 1, 0); }
+      break;
+
+      /*-----------------------------------------------------------------*/
+      case OP_NOT_DIGIT:
+      case OP_NOT_WHITESPACE:
+      case OP_NOT_WORDCHAR:
+      if (clen > 0 && (c >= 256 ||
+            ((ctypes[c] & toptable1[codevalue]) ^ toptable2[codevalue]) != 0))
+        { ADD_NEW(state_offset + 1, 0); }
+      break;
+
+      /*-----------------------------------------------------------------*/
+      case OP_WORD_BOUNDARY:
+      case OP_NOT_WORD_BOUNDARY:
+        {
+        int left_word, right_word;
+
+        if (ptr > start_subject)
+          {
+          const uschar *temp = ptr - 1;
+#ifdef SUPPORT_UTF8
+          if (utf8) BACKCHAR(temp);
+#endif
+          GETCHARTEST(d, temp);
+          left_word = d < 256 && (ctypes[d] & ctype_word) != 0;
+          }
+        else left_word = 0;
+
+        if (clen > 0) right_word = c < 256 && (ctypes[c] & ctype_word) != 0;
+          else right_word = 0;
+
+        if ((left_word == right_word) == (codevalue == OP_NOT_WORD_BOUNDARY))
+          { ADD_ACTIVE(state_offset + 1, 0); }
+        }
+      break;
+
+
+      /*-----------------------------------------------------------------*/
+      /* Check the next character by Unicode property. We will get here only
+      if the support is in the binary; otherwise a compile-time error occurs.
+      */
+
+#ifdef SUPPORT_UCP
+      case OP_PROP:
+      case OP_NOTPROP:
+      if (clen > 0)
+        {
+        BOOL OK;
+        int category = _pcre_ucp_findprop(c, &chartype, &script);
+        switch(code[1])
+          {
+          case PT_ANY:
+          OK = TRUE;
+          break;
+
+          case PT_LAMP:
+          OK = chartype == ucp_Lu || chartype == ucp_Ll || chartype == ucp_Lt;
+          break;
+
+          case PT_GC:
+          OK = category == code[2];
+          break;
+
+          case PT_PC:
+          OK = chartype == code[2];
+          break;
+
+          case PT_SC:
+          OK = script == code[2];
+          break;
+
+          /* Should never occur, but keep compilers from grumbling. */
+
+          default:
+          OK = codevalue != OP_PROP;
+          break;
+          }
+
+        if (OK == (codevalue == OP_PROP)) { ADD_NEW(state_offset + 3, 0); }
+        }
+      break;
+#endif
+
+
+
+/* ========================================================================== */
+      /* These opcodes likewise inspect the subject character, but have an
+      argument that is not a data character. It is one of these opcodes:
+      OP_ANY, OP_DIGIT, OP_NOT_DIGIT, OP_WHITESPACE, OP_NOT_SPACE, OP_WORDCHAR,
+      OP_NOT_WORDCHAR. The value is loaded into d. */
+
+      case OP_TYPEPLUS:
+      case OP_TYPEMINPLUS:
+      case OP_TYPEPOSPLUS:
+      count = current_state->count;  /* Already matched */
+      if (count > 0) { ADD_ACTIVE(state_offset + 2, 0); }
+      if (clen > 0)
+        {
+        if ((c >= 256 && d != OP_DIGIT && d != OP_WHITESPACE && d != OP_WORDCHAR) ||
+            (c < 256 &&
+              (d != OP_ANY ||
+               (ims & PCRE_DOTALL) != 0 ||
+               !IS_NEWLINE(ptr)
+              ) &&
+              ((ctypes[c] & toptable1[d]) ^ toptable2[d]) != 0))
+          {
+          if (count > 0 && codevalue == OP_TYPEPOSPLUS)
+            {
+            active_count--;            /* Remove non-match possibility */
+            next_active_state--;
+            }
+          count++;
+          ADD_NEW(state_offset, count);
+          }
+        }
+      break;
+
+      /*-----------------------------------------------------------------*/
+      case OP_TYPEQUERY:
+      case OP_TYPEMINQUERY:
+      case OP_TYPEPOSQUERY:
+      ADD_ACTIVE(state_offset + 2, 0);
+      if (clen > 0)
+        {
+        if ((c >= 256 && d != OP_DIGIT && d != OP_WHITESPACE && d != OP_WORDCHAR) ||
+            (c < 256 &&
+              (d != OP_ANY ||
+               (ims & PCRE_DOTALL) != 0 ||
+               !IS_NEWLINE(ptr)
+              ) &&
+              ((ctypes[c] & toptable1[d]) ^ toptable2[d]) != 0))
+          {
+          if (codevalue == OP_TYPEPOSQUERY)
+            {
+            active_count--;            /* Remove non-match possibility */
+            next_active_state--;
+            }
+          ADD_NEW(state_offset + 2, 0);
+          }
+        }
+      break;
+
+      /*-----------------------------------------------------------------*/
+      case OP_TYPESTAR:
+      case OP_TYPEMINSTAR:
+      case OP_TYPEPOSSTAR:
+      ADD_ACTIVE(state_offset + 2, 0);
+      if (clen > 0)
+        {
+        if ((c >= 256 && d != OP_DIGIT && d != OP_WHITESPACE && d != OP_WORDCHAR) ||
+            (c < 256 &&
+              (d != OP_ANY ||
+               (ims & PCRE_DOTALL) != 0 ||
+               !IS_NEWLINE(ptr)
+              ) &&
+              ((ctypes[c] & toptable1[d]) ^ toptable2[d]) != 0))
+          {
+          if (codevalue == OP_TYPEPOSSTAR)
+            {
+            active_count--;            /* Remove non-match possibility */
+            next_active_state--;
+            }
+          ADD_NEW(state_offset, 0);
+          }
+        }
+      break;
+
+      /*-----------------------------------------------------------------*/
+      case OP_TYPEEXACT:
+      count = current_state->count;  /* Number already matched */
+      if (clen > 0)
+        {
+        if ((c >= 256 && d != OP_DIGIT && d != OP_WHITESPACE && d != OP_WORDCHAR) ||
+            (c < 256 &&
+              (d != OP_ANY ||
+               (ims & PCRE_DOTALL) != 0 ||
+               !IS_NEWLINE(ptr)
+              ) &&
+              ((ctypes[c] & toptable1[d]) ^ toptable2[d]) != 0))
+          {
+          if (++count >= GET2(code, 1))
+            { ADD_NEW(state_offset + 4, 0); }
+          else
+            { ADD_NEW(state_offset, count); }
+          }
+        }
+      break;
+
+      /*-----------------------------------------------------------------*/
+      case OP_TYPEUPTO:
+      case OP_TYPEMINUPTO:
+      case OP_TYPEPOSUPTO:
+      ADD_ACTIVE(state_offset + 4, 0);
+      count = current_state->count;  /* Number already matched */
+      if (clen > 0)
+        {
+        if ((c >= 256 && d != OP_DIGIT && d != OP_WHITESPACE && d != OP_WORDCHAR) ||
+            (c < 256 &&
+              (d != OP_ANY ||
+               (ims & PCRE_DOTALL) != 0 ||
+               !IS_NEWLINE(ptr)
+              ) &&
+              ((ctypes[c] & toptable1[d]) ^ toptable2[d]) != 0))
+          {
+          if (codevalue == OP_TYPEPOSUPTO)
+            {
+            active_count--;           /* Remove non-match possibility */
+            next_active_state--;
+            }
+          if (++count >= GET2(code, 1))
+            { ADD_NEW(state_offset + 4, 0); }
+          else
+            { ADD_NEW(state_offset, count); }
+          }
+        }
+      break;
+
+/* ========================================================================== */
+      /* These are virtual opcodes that are used when something like
+      OP_TYPEPLUS has OP_PROP, OP_NOTPROP, OP_ANYNL, or OP_EXTUNI as its
+      argument. It keeps the code above fast for the other cases. The argument
+      is in the d variable. */
+
+#ifdef SUPPORT_UCP
+      case OP_PROP_EXTRA + OP_TYPEPLUS:
+      case OP_PROP_EXTRA + OP_TYPEMINPLUS:
+      case OP_PROP_EXTRA + OP_TYPEPOSPLUS:
+      count = current_state->count;           /* Already matched */
+      if (count > 0) { ADD_ACTIVE(state_offset + 4, 0); }
+      if (clen > 0)
+        {
+        BOOL OK;
+        int category = _pcre_ucp_findprop(c, &chartype, &script);
+        switch(code[2])
+          {
+          case PT_ANY:
+          OK = TRUE;
+          break;
+
+          case PT_LAMP:
+          OK = chartype == ucp_Lu || chartype == ucp_Ll || chartype == ucp_Lt;
+          break;
+
+          case PT_GC:
+          OK = category == code[3];
+          break;
+
+          case PT_PC:
+          OK = chartype == code[3];
+          break;
+
+          case PT_SC:
+          OK = script == code[3];
+          break;
+
+          /* Should never occur, but keep compilers from grumbling. */
+
+          default:
+          OK = codevalue != OP_PROP;
+          break;
+          }
+
+        if (OK == (d == OP_PROP))
+          {
+          if (count > 0 && codevalue == OP_PROP_EXTRA + OP_TYPEPOSPLUS)
+            {
+            active_count--;           /* Remove non-match possibility */
+            next_active_state--;
+            }
+          count++;
+          ADD_NEW(state_offset, count);
+          }
+        }
+      break;
+
+      /*-----------------------------------------------------------------*/
+      case OP_EXTUNI_EXTRA + OP_TYPEPLUS:
+      case OP_EXTUNI_EXTRA + OP_TYPEMINPLUS:
+      case OP_EXTUNI_EXTRA + OP_TYPEPOSPLUS:
+      count = current_state->count;  /* Already matched */
+      if (count > 0) { ADD_ACTIVE(state_offset + 2, 0); }
+      if (clen > 0 && _pcre_ucp_findprop(c, &chartype, &script) != ucp_M)
+        {
+        const uschar *nptr = ptr + clen;
+        int ncount = 0;
+        if (count > 0 && codevalue == OP_EXTUNI_EXTRA + OP_TYPEPOSPLUS)
+          {
+          active_count--;           /* Remove non-match possibility */
+          next_active_state--;
+          }
+        while (nptr < end_subject)
+          {
+          int nd;
+          int ndlen = 1;
+          GETCHARLEN(nd, nptr, ndlen);
+          if (_pcre_ucp_findprop(nd, &chartype, &script) != ucp_M) break;
+          ncount++;
+          nptr += ndlen;
+          }
+        count++;
+        ADD_NEW_DATA(-state_offset, count, ncount);
+        }
+      break;
+#endif
+
+      /*-----------------------------------------------------------------*/
+      case OP_ANYNL_EXTRA + OP_TYPEPLUS:
+      case OP_ANYNL_EXTRA + OP_TYPEMINPLUS:
+      case OP_ANYNL_EXTRA + OP_TYPEPOSPLUS:
+      count = current_state->count;  /* Already matched */
+      if (count > 0) { ADD_ACTIVE(state_offset + 2, 0); }
+      if (clen > 0)
+        {
+        int ncount = 0;
+        switch (c)
+          {
+          case 0x000b:
+          case 0x000c:
+          case 0x0085:
+          case 0x2028:
+          case 0x2029:
+          if ((md->moptions & PCRE_BSR_ANYCRLF) != 0) break;
+          goto ANYNL01;
+
+          case 0x000d:
+          if (ptr + 1 < end_subject && ptr[1] == 0x0a) ncount = 1;
+          /* Fall through */
+
+          ANYNL01:
+          case 0x000a:
+          if (count > 0 && codevalue == OP_ANYNL_EXTRA + OP_TYPEPOSPLUS)
+            {
+            active_count--;           /* Remove non-match possibility */
+            next_active_state--;
+            }
+          count++;
+          ADD_NEW_DATA(-state_offset, count, ncount);
+          break;
+
+          default:
+          break;
+          }
+        }
+      break;
+
+      /*-----------------------------------------------------------------*/
+      case OP_VSPACE_EXTRA + OP_TYPEPLUS:
+      case OP_VSPACE_EXTRA + OP_TYPEMINPLUS:
+      case OP_VSPACE_EXTRA + OP_TYPEPOSPLUS:
+      count = current_state->count;  /* Already matched */
+      if (count > 0) { ADD_ACTIVE(state_offset + 2, 0); }
+      if (clen > 0)
+        {
+        BOOL OK;
+        switch (c)
+          {
+          case 0x000a:
+          case 0x000b:
+          case 0x000c:
+          case 0x000d:
+          case 0x0085:
+          case 0x2028:
+          case 0x2029:
+          OK = TRUE;
+          break;
+
+          default:
+          OK = FALSE;
+          break;
+          }
+
+        if (OK == (d == OP_VSPACE))
+          {
+          if (count > 0 && codevalue == OP_VSPACE_EXTRA + OP_TYPEPOSPLUS)
+            {
+            active_count--;           /* Remove non-match possibility */
+            next_active_state--;
+            }
+          count++;
+          ADD_NEW_DATA(-state_offset, count, 0);
+          }
+        }
+      break;
+
+      /*-----------------------------------------------------------------*/
+      case OP_HSPACE_EXTRA + OP_TYPEPLUS:
+      case OP_HSPACE_EXTRA + OP_TYPEMINPLUS:
+      case OP_HSPACE_EXTRA + OP_TYPEPOSPLUS:
+      count = current_state->count;  /* Already matched */
+      if (count > 0) { ADD_ACTIVE(state_offset + 2, 0); }
+      if (clen > 0)
+        {
+        BOOL OK;
+        switch (c)
+          {
+          case 0x09:      /* HT */
+          case 0x20:      /* SPACE */
+          case 0xa0:      /* NBSP */
+          case 0x1680:    /* OGHAM SPACE MARK */
+          case 0x180e:    /* MONGOLIAN VOWEL SEPARATOR */
+          case 0x2000:    /* EN QUAD */
+          case 0x2001:    /* EM QUAD */
+          case 0x2002:    /* EN SPACE */
+          case 0x2003:    /* EM SPACE */
+          case 0x2004:    /* THREE-PER-EM SPACE */
+          case 0x2005:    /* FOUR-PER-EM SPACE */
+          case 0x2006:    /* SIX-PER-EM SPACE */
+          case 0x2007:    /* FIGURE SPACE */
+          case 0x2008:    /* PUNCTUATION SPACE */
+          case 0x2009:    /* THIN SPACE */
+          case 0x200A:    /* HAIR SPACE */
+          case 0x202f:    /* NARROW NO-BREAK SPACE */
+          case 0x205f:    /* MEDIUM MATHEMATICAL SPACE */
+          case 0x3000:    /* IDEOGRAPHIC SPACE */
+          OK = TRUE;
+          break;
+
+          default:
+          OK = FALSE;
+          break;
+          }
+
+        if (OK == (d == OP_HSPACE))
+          {
+          if (count > 0 && codevalue == OP_HSPACE_EXTRA + OP_TYPEPOSPLUS)
+            {
+            active_count--;           /* Remove non-match possibility */
+            next_active_state--;
+            }
+          count++;
+          ADD_NEW_DATA(-state_offset, count, 0);
+          }
+        }
+      break;
+
+      /*-----------------------------------------------------------------*/
+#ifdef SUPPORT_UCP
+      case OP_PROP_EXTRA + OP_TYPEQUERY:
+      case OP_PROP_EXTRA + OP_TYPEMINQUERY:
+      case OP_PROP_EXTRA + OP_TYPEPOSQUERY:
+      count = 4;
+      goto QS1;
+
+      case OP_PROP_EXTRA + OP_TYPESTAR:
+      case OP_PROP_EXTRA + OP_TYPEMINSTAR:
+      case OP_PROP_EXTRA + OP_TYPEPOSSTAR:
+      count = 0;
+
+      QS1:
+
+      ADD_ACTIVE(state_offset + 4, 0);
+      if (clen > 0)
+        {
+        BOOL OK;
+        int category = _pcre_ucp_findprop(c, &chartype, &script);
+        switch(code[2])
+          {
+          case PT_ANY:
+          OK = TRUE;
+          break;
+
+          case PT_LAMP:
+          OK = chartype == ucp_Lu || chartype == ucp_Ll || chartype == ucp_Lt;
+          break;
+
+          case PT_GC:
+          OK = category == code[3];
+          break;
+
+          case PT_PC:
+          OK = chartype == code[3];
+          break;
+
+          case PT_SC:
+          OK = script == code[3];
+          break;
+
+          /* Should never occur, but keep compilers from grumbling. */
+
+          default:
+          OK = codevalue != OP_PROP;
+          break;
+          }
+
+        if (OK == (d == OP_PROP))
+          {
+          if (codevalue == OP_PROP_EXTRA + OP_TYPEPOSSTAR ||
+              codevalue == OP_PROP_EXTRA + OP_TYPEPOSQUERY)
+            {
+            active_count--;           /* Remove non-match possibility */
+            next_active_state--;
+            }
+          ADD_NEW(state_offset + count, 0);
+          }
+        }
+      break;
+
+      /*-----------------------------------------------------------------*/
+      case OP_EXTUNI_EXTRA + OP_TYPEQUERY:
+      case OP_EXTUNI_EXTRA + OP_TYPEMINQUERY:
+      case OP_EXTUNI_EXTRA + OP_TYPEPOSQUERY:
+      count = 2;
+      goto QS2;
+
+      case OP_EXTUNI_EXTRA + OP_TYPESTAR:
+      case OP_EXTUNI_EXTRA + OP_TYPEMINSTAR:
+      case OP_EXTUNI_EXTRA + OP_TYPEPOSSTAR:
+      count = 0;
+
+      QS2:
+
+      ADD_ACTIVE(state_offset + 2, 0);
+      if (clen > 0 && _pcre_ucp_findprop(c, &chartype, &script) != ucp_M)
+        {
+        const uschar *nptr = ptr + clen;
+        int ncount = 0;
+        if (codevalue == OP_EXTUNI_EXTRA + OP_TYPEPOSSTAR ||
+            codevalue == OP_EXTUNI_EXTRA + OP_TYPEPOSQUERY)
+          {
+          active_count--;           /* Remove non-match possibility */
+          next_active_state--;
+          }
+        while (nptr < end_subject)
+          {
+          int nd;
+          int ndlen = 1;
+          GETCHARLEN(nd, nptr, ndlen);
+          if (_pcre_ucp_findprop(nd, &chartype, &script) != ucp_M) break;
+          ncount++;
+          nptr += ndlen;
+          }
+        ADD_NEW_DATA(-(state_offset + count), 0, ncount);
+        }
+      break;
+#endif
+
+      /*-----------------------------------------------------------------*/
+      case OP_ANYNL_EXTRA + OP_TYPEQUERY:
+      case OP_ANYNL_EXTRA + OP_TYPEMINQUERY:
+      case OP_ANYNL_EXTRA + OP_TYPEPOSQUERY:
+      count = 2;
+      goto QS3;
+
+      case OP_ANYNL_EXTRA + OP_TYPESTAR:
+      case OP_ANYNL_EXTRA + OP_TYPEMINSTAR:
+      case OP_ANYNL_EXTRA + OP_TYPEPOSSTAR:
+      count = 0;
+
+      QS3:
+      ADD_ACTIVE(state_offset + 2, 0);
+      if (clen > 0)
+        {
+        int ncount = 0;
+        switch (c)
+          {
+          case 0x000b:
+          case 0x000c:
+          case 0x0085:
+          case 0x2028:
+          case 0x2029:
+          if ((md->moptions & PCRE_BSR_ANYCRLF) != 0) break;
+          goto ANYNL02;
+
+          case 0x000d:
+          if (ptr + 1 < end_subject && ptr[1] == 0x0a) ncount = 1;
+          /* Fall through */
+
+          ANYNL02:
+          case 0x000a:
+          if (codevalue == OP_ANYNL_EXTRA + OP_TYPEPOSSTAR ||
+              codevalue == OP_ANYNL_EXTRA + OP_TYPEPOSQUERY)
+            {
+            active_count--;           /* Remove non-match possibility */
+            next_active_state--;
+            }
+          ADD_NEW_DATA(-(state_offset + count), 0, ncount);
+          break;
+
+          default:
+          break;
+          }
+        }
+      break;
+
+      /*-----------------------------------------------------------------*/
+      case OP_VSPACE_EXTRA + OP_TYPEQUERY:
+      case OP_VSPACE_EXTRA + OP_TYPEMINQUERY:
+      case OP_VSPACE_EXTRA + OP_TYPEPOSQUERY:
+      count = 2;
+      goto QS4;
+
+      case OP_VSPACE_EXTRA + OP_TYPESTAR:
+      case OP_VSPACE_EXTRA + OP_TYPEMINSTAR:
+      case OP_VSPACE_EXTRA + OP_TYPEPOSSTAR:
+      count = 0;
+
+      QS4:
+      ADD_ACTIVE(state_offset + 2, 0);
+      if (clen > 0)
+        {
+        BOOL OK;
+        switch (c)
+          {
+          case 0x000a:
+          case 0x000b:
+          case 0x000c:
+          case 0x000d:
+          case 0x0085:
+          case 0x2028:
+          case 0x2029:
+          OK = TRUE;
+          break;
+
+          default:
+          OK = FALSE;
+          break;
+          }
+        if (OK == (d == OP_VSPACE))
+          {
+          if (codevalue == OP_VSPACE_EXTRA + OP_TYPEPOSSTAR ||
+              codevalue == OP_VSPACE_EXTRA + OP_TYPEPOSQUERY)
+            {
+            active_count--;           /* Remove non-match possibility */
+            next_active_state--;
+            }
+          ADD_NEW_DATA(-(state_offset + count), 0, 0);
+          }
+        }
+      break;
+
+      /*-----------------------------------------------------------------*/
+      case OP_HSPACE_EXTRA + OP_TYPEQUERY:
+      case OP_HSPACE_EXTRA + OP_TYPEMINQUERY:
+      case OP_HSPACE_EXTRA + OP_TYPEPOSQUERY:
+      count = 2;
+      goto QS5;
+
+      case OP_HSPACE_EXTRA + OP_TYPESTAR:
+      case OP_HSPACE_EXTRA + OP_TYPEMINSTAR:
+      case OP_HSPACE_EXTRA + OP_TYPEPOSSTAR:
+      count = 0;
+
+      QS5:
+      ADD_ACTIVE(state_offset + 2, 0);
+      if (clen > 0)
+        {
+        BOOL OK;
+        switch (c)
+          {
+          case 0x09:      /* HT */
+          case 0x20:      /* SPACE */
+          case 0xa0:      /* NBSP */
+          case 0x1680:    /* OGHAM SPACE MARK */
+          case 0x180e:    /* MONGOLIAN VOWEL SEPARATOR */
+          case 0x2000:    /* EN QUAD */
+          case 0x2001:    /* EM QUAD */
+          case 0x2002:    /* EN SPACE */
+          case 0x2003:    /* EM SPACE */
+          case 0x2004:    /* THREE-PER-EM SPACE */
+          case 0x2005:    /* FOUR-PER-EM SPACE */
+          case 0x2006:    /* SIX-PER-EM SPACE */
+          case 0x2007:    /* FIGURE SPACE */
+          case 0x2008:    /* PUNCTUATION SPACE */
+          case 0x2009:    /* THIN SPACE */
+          case 0x200A:    /* HAIR SPACE */
+          case 0x202f:    /* NARROW NO-BREAK SPACE */
+          case 0x205f:    /* MEDIUM MATHEMATICAL SPACE */
+          case 0x3000:    /* IDEOGRAPHIC SPACE */
+          OK = TRUE;
+          break;
+
+          default:
+          OK = FALSE;
+          break;
+          }
+
+        if (OK == (d == OP_HSPACE))
+          {
+          if (codevalue == OP_HSPACE_EXTRA + OP_TYPEPOSSTAR ||
+              codevalue == OP_HSPACE_EXTRA + OP_TYPEPOSQUERY)
+            {
+            active_count--;           /* Remove non-match possibility */
+            next_active_state--;
+            }
+          ADD_NEW_DATA(-(state_offset + count), 0, 0);
+          }
+        }
+      break;
+
+      /*-----------------------------------------------------------------*/
+#ifdef SUPPORT_UCP
+      case OP_PROP_EXTRA + OP_TYPEEXACT:
+      case OP_PROP_EXTRA + OP_TYPEUPTO:
+      case OP_PROP_EXTRA + OP_TYPEMINUPTO:
+      case OP_PROP_EXTRA + OP_TYPEPOSUPTO:
+      if (codevalue != OP_PROP_EXTRA + OP_TYPEEXACT)
+        { ADD_ACTIVE(state_offset + 6, 0); }
+      count = current_state->count;  /* Number already matched */
+      if (clen > 0)
+        {
+        BOOL OK;
+        int category = _pcre_ucp_findprop(c, &chartype, &script);
+        switch(code[4])
+          {
+          case PT_ANY:
+          OK = TRUE;
+          break;
+
+          case PT_LAMP:
+          OK = chartype == ucp_Lu || chartype == ucp_Ll || chartype == ucp_Lt;
+          break;
+
+          case PT_GC:
+          OK = category == code[5];
+          break;
+
+          case PT_PC:
+          OK = chartype == code[5];
+          break;
+
+          case PT_SC:
+          OK = script == code[5];
+          break;
+
+          /* Should never occur, but keep compilers from grumbling. */
+
+          default:
+          OK = codevalue != OP_PROP;
+          break;
+          }
+
+        if (OK == (d == OP_PROP))
+          {
+          if (codevalue == OP_PROP_EXTRA + OP_TYPEPOSUPTO)
+            {
+            active_count--;           /* Remove non-match possibility */
+            next_active_state--;
+            }
+          if (++count >= GET2(code, 1))
+            { ADD_NEW(state_offset + 6, 0); }
+          else
+            { ADD_NEW(state_offset, count); }
+          }
+        }
+      break;
+
+      /*-----------------------------------------------------------------*/
+      case OP_EXTUNI_EXTRA + OP_TYPEEXACT:
+      case OP_EXTUNI_EXTRA + OP_TYPEUPTO:
+      case OP_EXTUNI_EXTRA + OP_TYPEMINUPTO:
+      case OP_EXTUNI_EXTRA + OP_TYPEPOSUPTO:
+      if (codevalue != OP_EXTUNI_EXTRA + OP_TYPEEXACT)
+        { ADD_ACTIVE(state_offset + 4, 0); }
+      count = current_state->count;  /* Number already matched */
+      if (clen > 0 && _pcre_ucp_findprop(c, &chartype, &script) != ucp_M)
+        {
+        const uschar *nptr = ptr + clen;
+        int ncount = 0;
+        if (codevalue == OP_EXTUNI_EXTRA + OP_TYPEPOSUPTO)
+          {
+          active_count--;           /* Remove non-match possibility */
+          next_active_state--;
+          }
+        while (nptr < end_subject)
+          {
+          int nd;
+          int ndlen = 1;
+          GETCHARLEN(nd, nptr, ndlen);
+          if (_pcre_ucp_findprop(nd, &chartype, &script) != ucp_M) break;
+          ncount++;
+          nptr += ndlen;
+          }
+        if (++count >= GET2(code, 1))
+          { ADD_NEW_DATA(-(state_offset + 4), 0, ncount); }
+        else
+          { ADD_NEW_DATA(-state_offset, count, ncount); }
+        }
+      break;
+#endif
+
+      /*-----------------------------------------------------------------*/
+      case OP_ANYNL_EXTRA + OP_TYPEEXACT:
+      case OP_ANYNL_EXTRA + OP_TYPEUPTO:
+      case OP_ANYNL_EXTRA + OP_TYPEMINUPTO:
+      case OP_ANYNL_EXTRA + OP_TYPEPOSUPTO:
+      if (codevalue != OP_ANYNL_EXTRA + OP_TYPEEXACT)
+        { ADD_ACTIVE(state_offset + 4, 0); }
+      count = current_state->count;  /* Number already matched */
+      if (clen > 0)
+        {
+        int ncount = 0;
+        switch (c)
+          {
+          case 0x000b:
+          case 0x000c:
+          case 0x0085:
+          case 0x2028:
+          case 0x2029:
+          if ((md->moptions & PCRE_BSR_ANYCRLF) != 0) break;
+          goto ANYNL03;
+
+          case 0x000d:
+          if (ptr + 1 < end_subject && ptr[1] == 0x0a) ncount = 1;
+          /* Fall through */
+
+          ANYNL03:
+          case 0x000a:
+          if (codevalue == OP_ANYNL_EXTRA + OP_TYPEPOSUPTO)
+            {
+            active_count--;           /* Remove non-match possibility */
+            next_active_state--;
+            }
+          if (++count >= GET2(code, 1))
+            { ADD_NEW_DATA(-(state_offset + 4), 0, ncount); }
+          else
+            { ADD_NEW_DATA(-state_offset, count, ncount); }
+          break;
+
+          default:
+          break;
+          }
+        }
+      break;
+
+      /*-----------------------------------------------------------------*/
+      case OP_VSPACE_EXTRA + OP_TYPEEXACT:
+      case OP_VSPACE_EXTRA + OP_TYPEUPTO:
+      case OP_VSPACE_EXTRA + OP_TYPEMINUPTO:
+      case OP_VSPACE_EXTRA + OP_TYPEPOSUPTO:
+      if (codevalue != OP_VSPACE_EXTRA + OP_TYPEEXACT)
+        { ADD_ACTIVE(state_offset + 4, 0); }
+      count = current_state->count;  /* Number already matched */
+      if (clen > 0)
+        {
+        BOOL OK;
+        switch (c)
+          {
+          case 0x000a:
+          case 0x000b:
+          case 0x000c:
+          case 0x000d:
+          case 0x0085:
+          case 0x2028:
+          case 0x2029:
+          OK = TRUE;
+          break;
+
+          default:
+          OK = FALSE;
+          }
+
+        if (OK == (d == OP_VSPACE))
+          {
+          if (codevalue == OP_VSPACE_EXTRA + OP_TYPEPOSUPTO)
+            {
+            active_count--;           /* Remove non-match possibility */
+            next_active_state--;
+            }
+          if (++count >= GET2(code, 1))
+            { ADD_NEW_DATA(-(state_offset + 4), 0, 0); }
+          else
+            { ADD_NEW_DATA(-state_offset, count, 0); }
+          }
+        }
+      break;
+
+      /*-----------------------------------------------------------------*/
+      case OP_HSPACE_EXTRA + OP_TYPEEXACT:
+      case OP_HSPACE_EXTRA + OP_TYPEUPTO:
+      case OP_HSPACE_EXTRA + OP_TYPEMINUPTO:
+      case OP_HSPACE_EXTRA + OP_TYPEPOSUPTO:
+      if (codevalue != OP_HSPACE_EXTRA + OP_TYPEEXACT)
+        { ADD_ACTIVE(state_offset + 4, 0); }
+      count = current_state->count;  /* Number already matched */
+      if (clen > 0)
+        {
+        BOOL OK;
+        switch (c)
+          {
+          case 0x09:      /* HT */
+          case 0x20:      /* SPACE */
+          case 0xa0:      /* NBSP */
+          case 0x1680:    /* OGHAM SPACE MARK */
+          case 0x180e:    /* MONGOLIAN VOWEL SEPARATOR */
+          case 0x2000:    /* EN QUAD */
+          case 0x2001:    /* EM QUAD */
+          case 0x2002:    /* EN SPACE */
+          case 0x2003:    /* EM SPACE */
+          case 0x2004:    /* THREE-PER-EM SPACE */
+          case 0x2005:    /* FOUR-PER-EM SPACE */
+          case 0x2006:    /* SIX-PER-EM SPACE */
+          case 0x2007:    /* FIGURE SPACE */
+          case 0x2008:    /* PUNCTUATION SPACE */
+          case 0x2009:    /* THIN SPACE */
+          case 0x200A:    /* HAIR SPACE */
+          case 0x202f:    /* NARROW NO-BREAK SPACE */
+          case 0x205f:    /* MEDIUM MATHEMATICAL SPACE */
+          case 0x3000:    /* IDEOGRAPHIC SPACE */
+          OK = TRUE;
+          break;
+
+          default:
+          OK = FALSE;
+          break;
+          }
+
+        if (OK == (d == OP_HSPACE))
+          {
+          if (codevalue == OP_HSPACE_EXTRA + OP_TYPEPOSUPTO)
+            {
+            active_count--;           /* Remove non-match possibility */
+            next_active_state--;
+            }
+          if (++count >= GET2(code, 1))
+            { ADD_NEW_DATA(-(state_offset + 4), 0, 0); }
+          else
+            { ADD_NEW_DATA(-state_offset, count, 0); }
+          }
+        }
+      break;
+
+/* ========================================================================== */
+      /* These opcodes are followed by a character that is usually compared
+      to the current subject character; it is loaded into d. We still get
+      here even if there is no subject character, because in some cases zero
+      repetitions are permitted. */
+
+      /*-----------------------------------------------------------------*/
+      case OP_CHAR:
+      if (clen > 0 && c == d) { ADD_NEW(state_offset + dlen + 1, 0); }
+      break;
+
+      /*-----------------------------------------------------------------*/
+      case OP_CHARNC:
+      if (clen == 0) break;
+
+#ifdef SUPPORT_UTF8
+      if (utf8)
+        {
+        if (c == d) { ADD_NEW(state_offset + dlen + 1, 0); } else
+          {
+          unsigned int othercase;
+          if (c < 128) othercase = fcc[c]; else
+
+          /* If we have Unicode property support, we can use it to test the
+          other case of the character. */
+
+#ifdef SUPPORT_UCP
+          othercase = _pcre_ucp_othercase(c);
+#else
+          othercase = NOTACHAR;
+#endif
+
+          if (d == othercase) { ADD_NEW(state_offset + dlen + 1, 0); }
+          }
+        }
+      else
+#endif  /* SUPPORT_UTF8 */
+
+      /* Non-UTF-8 mode */
+        {
+        if (lcc[c] == lcc[d]) { ADD_NEW(state_offset + 2, 0); }
+        }
+      break;
+
+
+#ifdef SUPPORT_UCP
+      /*-----------------------------------------------------------------*/
+      /* This is a tricky one because it can match more than one character.
+      Find out how many characters to skip, and then set up a negative state
+      to wait for them to pass before continuing. */
+
+      case OP_EXTUNI:
+      if (clen > 0 && _pcre_ucp_findprop(c, &chartype, &script) != ucp_M)
+        {
+        const uschar *nptr = ptr + clen;
+        int ncount = 0;
+        while (nptr < end_subject)
+          {
+          int nclen = 1;
+          GETCHARLEN(c, nptr, nclen);
+          if (_pcre_ucp_findprop(c, &chartype, &script) != ucp_M) break;
+          ncount++;
+          nptr += nclen;
+          }
+        ADD_NEW_DATA(-(state_offset + 1), 0, ncount);
+        }
+      break;
+#endif
+
+      /*-----------------------------------------------------------------*/
+      /* This is a tricky like EXTUNI because it too can match more than one
+      character (when CR is followed by LF). In this case, set up a negative
+      state to wait for one character to pass before continuing. */
+
+      case OP_ANYNL:
+      if (clen > 0) switch(c)
+        {
+        case 0x000b:
+        case 0x000c:
+        case 0x0085:
+        case 0x2028:
+        case 0x2029:
+        if ((md->moptions & PCRE_BSR_ANYCRLF) != 0) break;
+
+        case 0x000a:
+        ADD_NEW(state_offset + 1, 0);
+        break;
+
+        case 0x000d:
+        if (ptr + 1 < end_subject && ptr[1] == 0x0a)
+          {
+          ADD_NEW_DATA(-(state_offset + 1), 0, 1);
+          }
+        else
+          {
+          ADD_NEW(state_offset + 1, 0);
+          }
+        break;
+        }
+      break;
+
+      /*-----------------------------------------------------------------*/
+      case OP_NOT_VSPACE:
+      if (clen > 0) switch(c)
+        {
+        case 0x000a:
+        case 0x000b:
+        case 0x000c:
+        case 0x000d:
+        case 0x0085:
+        case 0x2028:
+        case 0x2029:
+        break;
+
+        default:
+        ADD_NEW(state_offset + 1, 0);
+        break;
+        }
+      break;
+
+      /*-----------------------------------------------------------------*/
+      case OP_VSPACE:
+      if (clen > 0) switch(c)
+        {
+        case 0x000a:
+        case 0x000b:
+        case 0x000c:
+        case 0x000d:
+        case 0x0085:
+        case 0x2028:
+        case 0x2029:
+        ADD_NEW(state_offset + 1, 0);
+        break;
+
+        default: break;
+        }
+      break;
+
+      /*-----------------------------------------------------------------*/
+      case OP_NOT_HSPACE:
+      if (clen > 0) switch(c)
+        {
+        case 0x09:      /* HT */
+        case 0x20:      /* SPACE */
+        case 0xa0:      /* NBSP */
+        case 0x1680:    /* OGHAM SPACE MARK */
+        case 0x180e:    /* MONGOLIAN VOWEL SEPARATOR */
+        case 0x2000:    /* EN QUAD */
+        case 0x2001:    /* EM QUAD */
+        case 0x2002:    /* EN SPACE */
+        case 0x2003:    /* EM SPACE */
+        case 0x2004:    /* THREE-PER-EM SPACE */
+        case 0x2005:    /* FOUR-PER-EM SPACE */
+        case 0x2006:    /* SIX-PER-EM SPACE */
+        case 0x2007:    /* FIGURE SPACE */
+        case 0x2008:    /* PUNCTUATION SPACE */
+        case 0x2009:    /* THIN SPACE */
+        case 0x200A:    /* HAIR SPACE */
+        case 0x202f:    /* NARROW NO-BREAK SPACE */
+        case 0x205f:    /* MEDIUM MATHEMATICAL SPACE */
+        case 0x3000:    /* IDEOGRAPHIC SPACE */
+        break;
+
+        default:
+        ADD_NEW(state_offset + 1, 0);
+        break;
+        }
+      break;
+
+      /*-----------------------------------------------------------------*/
+      case OP_HSPACE:
+      if (clen > 0) switch(c)
+        {
+        case 0x09:      /* HT */
+        case 0x20:      /* SPACE */
+        case 0xa0:      /* NBSP */
+        case 0x1680:    /* OGHAM SPACE MARK */
+        case 0x180e:    /* MONGOLIAN VOWEL SEPARATOR */
+        case 0x2000:    /* EN QUAD */
+        case 0x2001:    /* EM QUAD */
+        case 0x2002:    /* EN SPACE */
+        case 0x2003:    /* EM SPACE */
+        case 0x2004:    /* THREE-PER-EM SPACE */
+        case 0x2005:    /* FOUR-PER-EM SPACE */
+        case 0x2006:    /* SIX-PER-EM SPACE */
+        case 0x2007:    /* FIGURE SPACE */
+        case 0x2008:    /* PUNCTUATION SPACE */
+        case 0x2009:    /* THIN SPACE */
+        case 0x200A:    /* HAIR SPACE */
+        case 0x202f:    /* NARROW NO-BREAK SPACE */
+        case 0x205f:    /* MEDIUM MATHEMATICAL SPACE */
+        case 0x3000:    /* IDEOGRAPHIC SPACE */
+        ADD_NEW(state_offset + 1, 0);
+        break;
+        }
+      break;
+
+      /*-----------------------------------------------------------------*/
+      /* Match a negated single character. This is only used for one-byte
+      characters, that is, we know that d < 256. The character we are
+      checking (c) can be multibyte. */
+
+      case OP_NOT:
+      if (clen > 0)
+        {
+        unsigned int otherd = ((ims & PCRE_CASELESS) != 0)? fcc[d] : d;
+        if (c != d && c != otherd) { ADD_NEW(state_offset + dlen + 1, 0); }
+        }
+      break;
+
+      /*-----------------------------------------------------------------*/
+      case OP_PLUS:
+      case OP_MINPLUS:
+      case OP_POSPLUS:
+      case OP_NOTPLUS:
+      case OP_NOTMINPLUS:
+      case OP_NOTPOSPLUS:
+      count = current_state->count;  /* Already matched */
+      if (count > 0) { ADD_ACTIVE(state_offset + dlen + 1, 0); }
+      if (clen > 0)
+        {
+        unsigned int otherd = NOTACHAR;
+        if ((ims & PCRE_CASELESS) != 0)
+          {
+#ifdef SUPPORT_UTF8
+          if (utf8 && d >= 128)
+            {
+#ifdef SUPPORT_UCP
+            otherd = _pcre_ucp_othercase(d);
+#endif  /* SUPPORT_UCP */
+            }
+          else
+#endif  /* SUPPORT_UTF8 */
+          otherd = fcc[d];
+          }
+        if ((c == d || c == otherd) == (codevalue < OP_NOTSTAR))
+          {
+          if (count > 0 &&
+              (codevalue == OP_POSPLUS || codevalue == OP_NOTPOSPLUS))
+            {
+            active_count--;             /* Remove non-match possibility */
+            next_active_state--;
+            }
+          count++;
+          ADD_NEW(state_offset, count);
+          }
+        }
+      break;
+
+      /*-----------------------------------------------------------------*/
+      case OP_QUERY:
+      case OP_MINQUERY:
+      case OP_POSQUERY:
+      case OP_NOTQUERY:
+      case OP_NOTMINQUERY:
+      case OP_NOTPOSQUERY:
+      ADD_ACTIVE(state_offset + dlen + 1, 0);
+      if (clen > 0)
+        {
+        unsigned int otherd = NOTACHAR;
+        if ((ims & PCRE_CASELESS) != 0)
+          {
+#ifdef SUPPORT_UTF8
+          if (utf8 && d >= 128)
+            {
+#ifdef SUPPORT_UCP
+            otherd = _pcre_ucp_othercase(d);
+#endif  /* SUPPORT_UCP */
+            }
+          else
+#endif  /* SUPPORT_UTF8 */
+          otherd = fcc[d];
+          }
+        if ((c == d || c == otherd) == (codevalue < OP_NOTSTAR))
+          {
+          if (codevalue == OP_POSQUERY || codevalue == OP_NOTPOSQUERY)
+            {
+            active_count--;            /* Remove non-match possibility */
+            next_active_state--;
+            }
+          ADD_NEW(state_offset + dlen + 1, 0);
+          }
+        }
+      break;
+
+      /*-----------------------------------------------------------------*/
+      case OP_STAR:
+      case OP_MINSTAR:
+      case OP_POSSTAR:
+      case OP_NOTSTAR:
+      case OP_NOTMINSTAR:
+      case OP_NOTPOSSTAR:
+      ADD_ACTIVE(state_offset + dlen + 1, 0);
+      if (clen > 0)
+        {
+        unsigned int otherd = NOTACHAR;
+        if ((ims & PCRE_CASELESS) != 0)
+          {
+#ifdef SUPPORT_UTF8
+          if (utf8 && d >= 128)
+            {
+#ifdef SUPPORT_UCP
+            otherd = _pcre_ucp_othercase(d);
+#endif  /* SUPPORT_UCP */
+            }
+          else
+#endif  /* SUPPORT_UTF8 */
+          otherd = fcc[d];
+          }
+        if ((c == d || c == otherd) == (codevalue < OP_NOTSTAR))
+          {
+          if (codevalue == OP_POSSTAR || codevalue == OP_NOTPOSSTAR)
+            {
+            active_count--;            /* Remove non-match possibility */
+            next_active_state--;
+            }
+          ADD_NEW(state_offset, 0);
+          }
+        }
+      break;
+
+      /*-----------------------------------------------------------------*/
+      case OP_EXACT:
+      case OP_NOTEXACT:
+      count = current_state->count;  /* Number already matched */
+      if (clen > 0)
+        {
+        unsigned int otherd = NOTACHAR;
+        if ((ims & PCRE_CASELESS) != 0)
+          {
+#ifdef SUPPORT_UTF8
+          if (utf8 && d >= 128)
+            {
+#ifdef SUPPORT_UCP
+            otherd = _pcre_ucp_othercase(d);
+#endif  /* SUPPORT_UCP */
+            }
+          else
+#endif  /* SUPPORT_UTF8 */
+          otherd = fcc[d];
+          }
+        if ((c == d || c == otherd) == (codevalue < OP_NOTSTAR))
+          {
+          if (++count >= GET2(code, 1))
+            { ADD_NEW(state_offset + dlen + 3, 0); }
+          else
+            { ADD_NEW(state_offset, count); }
+          }
+        }
+      break;
+
+      /*-----------------------------------------------------------------*/
+      case OP_UPTO:
+      case OP_MINUPTO:
+      case OP_POSUPTO:
+      case OP_NOTUPTO:
+      case OP_NOTMINUPTO:
+      case OP_NOTPOSUPTO:
+      ADD_ACTIVE(state_offset + dlen + 3, 0);
+      count = current_state->count;  /* Number already matched */
+      if (clen > 0)
+        {
+        unsigned int otherd = NOTACHAR;
+        if ((ims & PCRE_CASELESS) != 0)
+          {
+#ifdef SUPPORT_UTF8
+          if (utf8 && d >= 128)
+            {
+#ifdef SUPPORT_UCP
+            otherd = _pcre_ucp_othercase(d);
+#endif  /* SUPPORT_UCP */
+            }
+          else
+#endif  /* SUPPORT_UTF8 */
+          otherd = fcc[d];
+          }
+        if ((c == d || c == otherd) == (codevalue < OP_NOTSTAR))
+          {
+          if (codevalue == OP_POSUPTO || codevalue == OP_NOTPOSUPTO)
+            {
+            active_count--;             /* Remove non-match possibility */
+            next_active_state--;
+            }
+          if (++count >= GET2(code, 1))
+            { ADD_NEW(state_offset + dlen + 3, 0); }
+          else
+            { ADD_NEW(state_offset, count); }
+          }
+        }
+      break;
+
+
+/* ========================================================================== */
+      /* These are the class-handling opcodes */
+
+      case OP_CLASS:
+      case OP_NCLASS:
+      case OP_XCLASS:
+        {
+        BOOL isinclass = FALSE;
+        int next_state_offset;
+        const uschar *ecode;
+
+        /* For a simple class, there is always just a 32-byte table, and we
+        can set isinclass from it. */
+
+        if (codevalue != OP_XCLASS)
+          {
+          ecode = code + 33;
+          if (clen > 0)
+            {
+            isinclass = (c > 255)? (codevalue == OP_NCLASS) :
+              ((code[1 + c/8] & (1 << (c&7))) != 0);
+            }
+          }
+
+        /* An extended class may have a table or a list of single characters,
+        ranges, or both, and it may be positive or negative. There's a
+        function that sorts all this out. */
+
+        else
+         {
+         ecode = code + GET(code, 1);
+         if (clen > 0) isinclass = _pcre_xclass(c, code + 1 + LINK_SIZE);
+         }
+
+        /* At this point, isinclass is set for all kinds of class, and ecode
+        points to the byte after the end of the class. If there is a
+        quantifier, this is where it will be. */
+
+        next_state_offset = ecode - start_code;
+
+        switch (*ecode)
+          {
+          case OP_CRSTAR:
+          case OP_CRMINSTAR:
+          ADD_ACTIVE(next_state_offset + 1, 0);
+          if (isinclass) { ADD_NEW(state_offset, 0); }
+          break;
+
+          case OP_CRPLUS:
+          case OP_CRMINPLUS:
+          count = current_state->count;  /* Already matched */
+          if (count > 0) { ADD_ACTIVE(next_state_offset + 1, 0); }
+          if (isinclass) { count++; ADD_NEW(state_offset, count); }
+          break;
+
+          case OP_CRQUERY:
+          case OP_CRMINQUERY:
+          ADD_ACTIVE(next_state_offset + 1, 0);
+          if (isinclass) { ADD_NEW(next_state_offset + 1, 0); }
+          break;
+
+          case OP_CRRANGE:
+          case OP_CRMINRANGE:
+          count = current_state->count;  /* Already matched */
+          if (count >= GET2(ecode, 1))
+            { ADD_ACTIVE(next_state_offset + 5, 0); }
+          if (isinclass)
+            {
+            int max = GET2(ecode, 3);
+            if (++count >= max && max != 0)   /* Max 0 => no limit */
+              { ADD_NEW(next_state_offset + 5, 0); }
+            else
+              { ADD_NEW(state_offset, count); }
+            }
+          break;
+
+          default:
+          if (isinclass) { ADD_NEW(next_state_offset, 0); }
+          break;
+          }
+        }
+      break;
+
+/* ========================================================================== */
+      /* These are the opcodes for fancy brackets of various kinds. We have
+      to use recursion in order to handle them. */
+
+      case OP_ASSERT:
+      case OP_ASSERT_NOT:
+      case OP_ASSERTBACK:
+      case OP_ASSERTBACK_NOT:
+        {
+        int rc;
+        int local_offsets[2];
+        int local_workspace[1000];
+        const uschar *endasscode = code + GET(code, 1);
+
+        while (*endasscode == OP_ALT) endasscode += GET(endasscode, 1);
+
+        rc = internal_dfa_exec(
+          md,                                   /* static match data */
+          code,                                 /* this subexpression's code */
+          ptr,                                  /* where we currently are */
+          ptr - start_subject,                  /* start offset */
+          local_offsets,                        /* offset vector */
+          sizeof(local_offsets)/sizeof(int),    /* size of same */
+          local_workspace,                      /* workspace vector */
+          sizeof(local_workspace)/sizeof(int),  /* size of same */
+          ims,                                  /* the current ims flags */
+          rlevel,                               /* function recursion level */
+          recursing);                           /* pass on regex recursion */
+
+        if ((rc >= 0) == (codevalue == OP_ASSERT || codevalue == OP_ASSERTBACK))
+            { ADD_ACTIVE(endasscode + LINK_SIZE + 1 - start_code, 0); }
+        }
+      break;
+
+      /*-----------------------------------------------------------------*/
+      case OP_COND:
+      case OP_SCOND:
+        {
+        int local_offsets[1000];
+        int local_workspace[1000];
+        int condcode = code[LINK_SIZE+1];
+
+        /* Back reference conditions are not supported */
+
+        if (condcode == OP_CREF) return PCRE_ERROR_DFA_UCOND;
+
+        /* The DEFINE condition is always false */
+
+        if (condcode == OP_DEF)
+          {
+          ADD_ACTIVE(state_offset + GET(code, 1) + LINK_SIZE + 1, 0);
+          }
+
+        /* The only supported version of OP_RREF is for the value RREF_ANY,
+        which means "test if in any recursion". We can't test for specifically
+        recursed groups. */
+
+        else if (condcode == OP_RREF)
+          {
+          int value = GET2(code, LINK_SIZE+2);
+          if (value != RREF_ANY) return PCRE_ERROR_DFA_UCOND;
+          if (recursing > 0) { ADD_ACTIVE(state_offset + LINK_SIZE + 4, 0); }
+            else { ADD_ACTIVE(state_offset + GET(code, 1) + LINK_SIZE + 1, 0); }
+          }
+
+        /* Otherwise, the condition is an assertion */
+
+        else
+          {
+          int rc;
+          const uschar *asscode = code + LINK_SIZE + 1;
+          const uschar *endasscode = asscode + GET(asscode, 1);
+
+          while (*endasscode == OP_ALT) endasscode += GET(endasscode, 1);
+
+          rc = internal_dfa_exec(
+            md,                                   /* fixed match data */
+            asscode,                              /* this subexpression's code */
+            ptr,                                  /* where we currently are */
+            ptr - start_subject,                  /* start offset */
+            local_offsets,                        /* offset vector */
+            sizeof(local_offsets)/sizeof(int),    /* size of same */
+            local_workspace,                      /* workspace vector */
+            sizeof(local_workspace)/sizeof(int),  /* size of same */
+            ims,                                  /* the current ims flags */
+            rlevel,                               /* function recursion level */
+            recursing);                           /* pass on regex recursion */
+
+          if ((rc >= 0) ==
+                (condcode == OP_ASSERT || condcode == OP_ASSERTBACK))
+            { ADD_ACTIVE(endasscode + LINK_SIZE + 1 - start_code, 0); }
+          else
+            { ADD_ACTIVE(state_offset + GET(code, 1) + LINK_SIZE + 1, 0); }
+          }
+        }
+      break;
+
+      /*-----------------------------------------------------------------*/
+      case OP_RECURSE:
+        {
+        int local_offsets[1000];
+        int local_workspace[1000];
+        int rc;
+
+        DPRINTF(("%.*sStarting regex recursion %d\n", rlevel*2-2, SP,
+          recursing + 1));
+
+        rc = internal_dfa_exec(
+          md,                                   /* fixed match data */
+          start_code + GET(code, 1),            /* this subexpression's code */
+          ptr,                                  /* where we currently are */
+          ptr - start_subject,                  /* start offset */
+          local_offsets,                        /* offset vector */
+          sizeof(local_offsets)/sizeof(int),    /* size of same */
+          local_workspace,                      /* workspace vector */
+          sizeof(local_workspace)/sizeof(int),  /* size of same */
+          ims,                                  /* the current ims flags */
+          rlevel,                               /* function recursion level */
+          recursing + 1);                       /* regex recurse level */
+
+        DPRINTF(("%.*sReturn from regex recursion %d: rc=%d\n", rlevel*2-2, SP,
+          recursing + 1, rc));
+
+        /* Ran out of internal offsets */
+
+        if (rc == 0) return PCRE_ERROR_DFA_RECURSE;
+
+        /* For each successful matched substring, set up the next state with a
+        count of characters to skip before trying it. Note that the count is in
+        characters, not bytes. */
+
+        if (rc > 0)
+          {
+          for (rc = rc*2 - 2; rc >= 0; rc -= 2)
+            {
+            const uschar *p = start_subject + local_offsets[rc];
+            const uschar *pp = start_subject + local_offsets[rc+1];
+            int charcount = local_offsets[rc+1] - local_offsets[rc];
+            while (p < pp) if ((*p++ & 0xc0) == 0x80) charcount--;
+            if (charcount > 0)
+              {
+              ADD_NEW_DATA(-(state_offset + LINK_SIZE + 1), 0, (charcount - 1));
+              }
+            else
+              {
+              ADD_ACTIVE(state_offset + LINK_SIZE + 1, 0);
+              }
+            }
+          }
+        else if (rc != PCRE_ERROR_NOMATCH) return rc;
+        }
+      break;
+
+      /*-----------------------------------------------------------------*/
+      case OP_ONCE:
+        {
+        int local_offsets[2];
+        int local_workspace[1000];
+
+        int rc = internal_dfa_exec(
+          md,                                   /* fixed match data */
+          code,                                 /* this subexpression's code */
+          ptr,                                  /* where we currently are */
+          ptr - start_subject,                  /* start offset */
+          local_offsets,                        /* offset vector */
+          sizeof(local_offsets)/sizeof(int),    /* size of same */
+          local_workspace,                      /* workspace vector */
+          sizeof(local_workspace)/sizeof(int),  /* size of same */
+          ims,                                  /* the current ims flags */
+          rlevel,                               /* function recursion level */
+          recursing);                           /* pass on regex recursion */
+
+        if (rc >= 0)
+          {
+          const uschar *end_subpattern = code;
+          int charcount = local_offsets[1] - local_offsets[0];
+          int next_state_offset, repeat_state_offset;
+
+          do { end_subpattern += GET(end_subpattern, 1); }
+            while (*end_subpattern == OP_ALT);
+          next_state_offset = end_subpattern - start_code + LINK_SIZE + 1;
+
+          /* If the end of this subpattern is KETRMAX or KETRMIN, we must
+          arrange for the repeat state also to be added to the relevant list.
+          Calculate the offset, or set -1 for no repeat. */
+
+          repeat_state_offset = (*end_subpattern == OP_KETRMAX ||
+                                 *end_subpattern == OP_KETRMIN)?
+            end_subpattern - start_code - GET(end_subpattern, 1) : -1;
+
+          /* If we have matched an empty string, add the next state at the
+          current character pointer. This is important so that the duplicate
+          checking kicks in, which is what breaks infinite loops that match an
+          empty string. */
+
+          if (charcount == 0)
+            {
+            ADD_ACTIVE(next_state_offset, 0);
+            }
+
+          /* Optimization: if there are no more active states, and there
+          are no new states yet set up, then skip over the subject string
+          right here, to save looping. Otherwise, set up the new state to swing
+          into action when the end of the substring is reached. */
+
+          else if (i + 1 >= active_count && new_count == 0)
+            {
+            ptr += charcount;
+            clen = 0;
+            ADD_NEW(next_state_offset, 0);
+
+            /* If we are adding a repeat state at the new character position,
+            we must fudge things so that it is the only current state.
+            Otherwise, it might be a duplicate of one we processed before, and
+            that would cause it to be skipped. */
+
+            if (repeat_state_offset >= 0)
+              {
+              next_active_state = active_states;
+              active_count = 0;
+              i = -1;
+              ADD_ACTIVE(repeat_state_offset, 0);
+              }
+            }
+          else
+            {
+            const uschar *p = start_subject + local_offsets[0];
+            const uschar *pp = start_subject + local_offsets[1];
+            while (p < pp) if ((*p++ & 0xc0) == 0x80) charcount--;
+            ADD_NEW_DATA(-next_state_offset, 0, (charcount - 1));
+            if (repeat_state_offset >= 0)
+              { ADD_NEW_DATA(-repeat_state_offset, 0, (charcount - 1)); }
+            }
+
+          }
+        else if (rc != PCRE_ERROR_NOMATCH) return rc;
+        }
+      break;
+
+
+/* ========================================================================== */
+      /* Handle callouts */
+
+      case OP_CALLOUT:
+      if (pcre_callout != NULL)
+        {
+        int rrc;
+        pcre_callout_block cb;
+        cb.version          = 1;   /* Version 1 of the callout block */
+        cb.callout_number   = code[1];
+        cb.offset_vector    = offsets;
+        cb.subject          = (PCRE_SPTR)start_subject;
+        cb.subject_length   = end_subject - start_subject;
+        cb.start_match      = current_subject - start_subject;
+        cb.current_position = ptr - start_subject;
+        cb.pattern_position = GET(code, 2);
+        cb.next_item_length = GET(code, 2 + LINK_SIZE);
+        cb.capture_top      = 1;
+        cb.capture_last     = -1;
+        cb.callout_data     = md->callout_data;
+        if ((rrc = (*pcre_callout)(&cb)) < 0) return rrc;   /* Abandon */
+        if (rrc == 0) { ADD_ACTIVE(state_offset + 2 + 2*LINK_SIZE, 0); }
+        }
+      break;
+
+
+/* ========================================================================== */
+      default:        /* Unsupported opcode */
+      return PCRE_ERROR_DFA_UITEM;
+      }
+
+    NEXT_ACTIVE_STATE: continue;
+
+    }      /* End of loop scanning active states */
+
+  /* We have finished the processing at the current subject character. If no
+  new states have been set for the next character, we have found all the
+  matches that we are going to find. If we are at the top level and partial
+  matching has been requested, check for appropriate conditions. */
+
+  if (new_count <= 0)
+    {
+    if (match_count < 0 &&                     /* No matches found */
+        rlevel == 1 &&                         /* Top level match function */
+        (md->moptions & PCRE_PARTIAL) != 0 &&  /* Want partial matching */
+        ptr >= end_subject &&                  /* Reached end of subject */
+        ptr > current_subject)                 /* Matched non-empty string */
+      {
+      if (offsetcount >= 2)
+        {
+        offsets[0] = current_subject - start_subject;
+        offsets[1] = end_subject - start_subject;
+        }
+      match_count = PCRE_ERROR_PARTIAL;
+      }
+
+    DPRINTF(("%.*sEnd of internal_dfa_exec %d: returning %d\n"
+      "%.*s---------------------\n\n", rlevel*2-2, SP, rlevel, match_count,
+      rlevel*2-2, SP));
+    break;        /* In effect, "return", but see the comment below */
+    }
+
+  /* One or more states are active for the next character. */
+
+  ptr += clen;    /* Advance to next subject character */
+  }               /* Loop to move along the subject string */
+
+/* Control gets here from "break" a few lines above. We do it this way because
+if we use "return" above, we have compiler trouble. Some compilers warn if
+there's nothing here because they think the function doesn't return a value. On
+the other hand, if we put a dummy statement here, some more clever compilers
+complain that it can't be reached. Sigh. */
+
+return match_count;
+}
+
+
+
+
+/*************************************************
+*    Execute a Regular Expression - DFA engine   *
+*************************************************/
+
+/* This external function applies a compiled re to a subject string using a DFA
+engine. This function calls the internal function multiple times if the pattern
+is not anchored.
+
+Arguments:
+  argument_re     points to the compiled expression
+  extra_data      points to extra data or is NULL
+  subject         points to the subject string
+  length          length of subject string (may contain binary zeros)
+  start_offset    where to start in the subject string
+  options         option bits
+  offsets         vector of match offsets
+  offsetcount     size of same
+  workspace       workspace vector
+  wscount         size of same
+
+Returns:          > 0 => number of match offset pairs placed in offsets
+                  = 0 => offsets overflowed; longest matches are present
+                   -1 => failed to match
+                 < -1 => some kind of unexpected problem
+*/
+
+PCRE_EXP_DEFN int
+pcre_dfa_exec(const pcre *argument_re, const pcre_extra *extra_data,
+  const char *subject, int length, int start_offset, int options, int *offsets,
+  int offsetcount, int *workspace, int wscount)
+{
+real_pcre *re = (real_pcre *)argument_re;
+dfa_match_data match_block;
+dfa_match_data *md = &match_block;
+BOOL utf8, anchored, startline, firstline;
+const uschar *current_subject, *end_subject, *lcc;
+
+pcre_study_data internal_study;
+const pcre_study_data *study = NULL;
+real_pcre internal_re;
+
+const uschar *req_byte_ptr;
+const uschar *start_bits = NULL;
+BOOL first_byte_caseless = FALSE;
+BOOL req_byte_caseless = FALSE;
+int first_byte = -1;
+int req_byte = -1;
+int req_byte2 = -1;
+int newline;
+
+/* Plausibility checks */
+
+if ((options & ~PUBLIC_DFA_EXEC_OPTIONS) != 0) return PCRE_ERROR_BADOPTION;
+if (re == NULL || subject == NULL || workspace == NULL ||
+   (offsets == NULL && offsetcount > 0)) return PCRE_ERROR_NULL;
+if (offsetcount < 0) return PCRE_ERROR_BADCOUNT;
+if (wscount < 20) return PCRE_ERROR_DFA_WSSIZE;
+
+/* We need to find the pointer to any study data before we test for byte
+flipping, so we scan the extra_data block first. This may set two fields in the
+match block, so we must initialize them beforehand. However, the other fields
+in the match block must not be set until after the byte flipping. */
+
+md->tables = re->tables;
+md->callout_data = NULL;
+
+if (extra_data != NULL)
+  {
+  unsigned int flags = extra_data->flags;
+  if ((flags & PCRE_EXTRA_STUDY_DATA) != 0)
+    study = (const pcre_study_data *)extra_data->study_data;
+  if ((flags & PCRE_EXTRA_MATCH_LIMIT) != 0) return PCRE_ERROR_DFA_UMLIMIT;
+  if ((flags & PCRE_EXTRA_MATCH_LIMIT_RECURSION) != 0)
+    return PCRE_ERROR_DFA_UMLIMIT;
+  if ((flags & PCRE_EXTRA_CALLOUT_DATA) != 0)
+    md->callout_data = extra_data->callout_data;
+  if ((flags & PCRE_EXTRA_TABLES) != 0)
+    md->tables = extra_data->tables;
+  }
+
+/* Check that the first field in the block is the magic number. If it is not,
+test for a regex that was compiled on a host of opposite endianness. If this is
+the case, flipped values are put in internal_re and internal_study if there was
+study data too. */
+
+if (re->magic_number != MAGIC_NUMBER)
+  {
+  re = _pcre_try_flipped(re, &internal_re, study, &internal_study);
+  if (re == NULL) return PCRE_ERROR_BADMAGIC;
+  if (study != NULL) study = &internal_study;
+  }
+
+/* Set some local values */
+
+current_subject = (const unsigned char *)subject + start_offset;
+end_subject = (const unsigned char *)subject + length;
+req_byte_ptr = current_subject - 1;
+
+#ifdef SUPPORT_UTF8
+utf8 = (re->options & PCRE_UTF8) != 0;
+#else
+utf8 = FALSE;
+#endif
+
+anchored = (options & (PCRE_ANCHORED|PCRE_DFA_RESTART)) != 0 ||
+  (re->options & PCRE_ANCHORED) != 0;
+
+/* The remaining fixed data for passing around. */
+
+md->start_code = (const uschar *)argument_re +
+    re->name_table_offset + re->name_count * re->name_entry_size;
+md->start_subject = (const unsigned char *)subject;
+md->end_subject = end_subject;
+md->moptions = options;
+md->poptions = re->options;
+
+/* If the BSR option is not set at match time, copy what was set
+at compile time. */
+
+if ((md->moptions & (PCRE_BSR_ANYCRLF|PCRE_BSR_UNICODE)) == 0)
+  {
+  if ((re->options & (PCRE_BSR_ANYCRLF|PCRE_BSR_UNICODE)) != 0)
+    md->moptions |= re->options & (PCRE_BSR_ANYCRLF|PCRE_BSR_UNICODE);
+#ifdef BSR_ANYCRLF
+  else md->moptions |= PCRE_BSR_ANYCRLF;
+#endif
+  }
+
+/* Handle different types of newline. The three bits give eight cases. If
+nothing is set at run time, whatever was used at compile time applies. */
+
+switch ((((options & PCRE_NEWLINE_BITS) == 0)? re->options : (pcre_uint32)options) &
+         PCRE_NEWLINE_BITS)
+  {
+  case 0: newline = NEWLINE; break;   /* Compile-time default */
+  case PCRE_NEWLINE_CR: newline = '\r'; break;
+  case PCRE_NEWLINE_LF: newline = '\n'; break;
+  case PCRE_NEWLINE_CR+
+       PCRE_NEWLINE_LF: newline = ('\r' << 8) | '\n'; break;
+  case PCRE_NEWLINE_ANY: newline = -1; break;
+  case PCRE_NEWLINE_ANYCRLF: newline = -2; break;
+  default: return PCRE_ERROR_BADNEWLINE;
+  }
+
+if (newline == -2)
+  {
+  md->nltype = NLTYPE_ANYCRLF;
+  }
+else if (newline < 0)
+  {
+  md->nltype = NLTYPE_ANY;
+  }
+else
+  {
+  md->nltype = NLTYPE_FIXED;
+  if (newline > 255)
+    {
+    md->nllen = 2;
+    md->nl[0] = (newline >> 8) & 255;
+    md->nl[1] = newline & 255;
+    }
+  else
+    {
+    md->nllen = 1;
+    md->nl[0] = newline;
+    }
+  }
+
+/* Check a UTF-8 string if required. Unfortunately there's no way of passing
+back the character offset. */
+
+#ifdef SUPPORT_UTF8
+if (utf8 && (options & PCRE_NO_UTF8_CHECK) == 0)
+  {
+  if (_pcre_valid_utf8((uschar *)subject, length) >= 0)
+    return PCRE_ERROR_BADUTF8;
+  if (start_offset > 0 && start_offset < length)
+    {
+    int tb = ((uschar *)subject)[start_offset];
+    if (tb > 127)
+      {
+      tb &= 0xc0;
+      if (tb != 0 && tb != 0xc0) return PCRE_ERROR_BADUTF8_OFFSET;
+      }
+    }
+  }
+#endif
+
+/* If the exec call supplied NULL for tables, use the inbuilt ones. This
+is a feature that makes it possible to save compiled regex and re-use them
+in other programs later. */
+
+if (md->tables == NULL) md->tables = _pcre_default_tables;
+
+/* The lower casing table and the "must be at the start of a line" flag are
+used in a loop when finding where to start. */
+
+lcc = md->tables + lcc_offset;
+startline = (re->flags & PCRE_STARTLINE) != 0;
+firstline = (re->options & PCRE_FIRSTLINE) != 0;
+
+/* Set up the first character to match, if available. The first_byte value is
+never set for an anchored regular expression, but the anchoring may be forced
+at run time, so we have to test for anchoring. The first char may be unset for
+an unanchored pattern, of course. If there's no first char and the pattern was
+studied, there may be a bitmap of possible first characters. */
+
+if (!anchored)
+  {
+  if ((re->flags & PCRE_FIRSTSET) != 0)
+    {
+    first_byte = re->first_byte & 255;
+    if ((first_byte_caseless = ((re->first_byte & REQ_CASELESS) != 0)) == TRUE)
+      first_byte = lcc[first_byte];
+    }
+  else
+    {
+    if (startline && study != NULL &&
+         (study->options & PCRE_STUDY_MAPPED) != 0)
+      start_bits = study->start_bits;
+    }
+  }
+
+/* For anchored or unanchored matches, there may be a "last known required
+character" set. */
+
+if ((re->flags & PCRE_REQCHSET) != 0)
+  {
+  req_byte = re->req_byte & 255;
+  req_byte_caseless = (re->req_byte & REQ_CASELESS) != 0;
+  req_byte2 = (md->tables + fcc_offset)[req_byte];  /* case flipped */
+  }
+
+/* Call the main matching function, looping for a non-anchored regex after a
+failed match. Unless restarting, optimize by moving to the first match
+character if possible, when not anchored. Then unless wanting a partial match,
+check for a required later character. */
+
+for (;;)
+  {
+  int rc;
+
+  if ((options & PCRE_DFA_RESTART) == 0)
+    {
+    const uschar *save_end_subject = end_subject;
+
+    /* Advance to a unique first char if possible. If firstline is TRUE, the
+    start of the match is constrained to the first line of a multiline string.
+    Implement this by temporarily adjusting end_subject so that we stop
+    scanning at a newline. If the match fails at the newline, later code breaks
+    this loop. */
+
+    if (firstline)
+      {
+      const uschar *t = current_subject;
+      while (t < md->end_subject && !IS_NEWLINE(t)) t++;
+      end_subject = t;
+      }
+
+    if (first_byte >= 0)
+      {
+      if (first_byte_caseless)
+        while (current_subject < end_subject &&
+               lcc[*current_subject] != first_byte)
+          current_subject++;
+      else
+        while (current_subject < end_subject && *current_subject != first_byte)
+          current_subject++;
+      }
+
+    /* Or to just after a linebreak for a multiline match if possible */
+
+    else if (startline)
+      {
+      if (current_subject > md->start_subject + start_offset)
+        {
+        while (current_subject <= end_subject && !WAS_NEWLINE(current_subject))
+          current_subject++;
+
+        /* If we have just passed a CR and the newline option is ANY or
+        ANYCRLF, and we are now at a LF, advance the match position by one more
+        character. */
+
+        if (current_subject[-1] == '\r' &&
+             (md->nltype == NLTYPE_ANY || md->nltype == NLTYPE_ANYCRLF) &&
+             current_subject < end_subject &&
+             *current_subject == '\n')
+          current_subject++;
+        }
+      }
+
+    /* Or to a non-unique first char after study */
+
+    else if (start_bits != NULL)
+      {
+      while (current_subject < end_subject)
+        {
+        register unsigned int c = *current_subject;
+        if ((start_bits[c/8] & (1 << (c&7))) == 0) current_subject++;
+          else break;
+        }
+      }
+
+    /* Restore fudged end_subject */
+
+    end_subject = save_end_subject;
+    }
+
+  /* If req_byte is set, we know that that character must appear in the subject
+  for the match to succeed. If the first character is set, req_byte must be
+  later in the subject; otherwise the test starts at the match point. This
+  optimization can save a huge amount of work in patterns with nested unlimited
+  repeats that aren't going to match. Writing separate code for cased/caseless
+  versions makes it go faster, as does using an autoincrement and backing off
+  on a match.
+
+  HOWEVER: when the subject string is very, very long, searching to its end can
+  take a long time, and give bad performance on quite ordinary patterns. This
+  showed up when somebody was matching /^C/ on a 32-megabyte string... so we
+  don't do this when the string is sufficiently long.
+
+  ALSO: this processing is disabled when partial matching is requested.
+  */
+
+  if (req_byte >= 0 &&
+      end_subject - current_subject < REQ_BYTE_MAX &&
+      (options & PCRE_PARTIAL) == 0)
+    {
+    register const uschar *p = current_subject + ((first_byte >= 0)? 1 : 0);
+
+    /* We don't need to repeat the search if we haven't yet reached the
+    place we found it at last time. */
+
+    if (p > req_byte_ptr)
+      {
+      if (req_byte_caseless)
+        {
+        while (p < end_subject)
+          {
+          register int pp = *p++;
+          if (pp == req_byte || pp == req_byte2) { p--; break; }
+          }
+        }
+      else
+        {
+        while (p < end_subject)
+          {
+          if (*p++ == req_byte) { p--; break; }
+          }
+        }
+
+      /* If we can't find the required character, break the matching loop,
+      which will cause a return or PCRE_ERROR_NOMATCH. */
+
+      if (p >= end_subject) break;
+
+      /* If we have found the required character, save the point where we
+      found it, so that we don't search again next time round the loop if
+      the start hasn't passed this character yet. */
+
+      req_byte_ptr = p;
+      }
+    }
+
+  /* OK, now we can do the business */
+
+  rc = internal_dfa_exec(
+    md,                                /* fixed match data */
+    md->start_code,                    /* this subexpression's code */
+    current_subject,                   /* where we currently are */
+    start_offset,                      /* start offset in subject */
+    offsets,                           /* offset vector */
+    offsetcount,                       /* size of same */
+    workspace,                         /* workspace vector */
+    wscount,                           /* size of same */
+    re->options & (PCRE_CASELESS|PCRE_MULTILINE|PCRE_DOTALL), /* ims flags */
+    0,                                 /* function recurse level */
+    0);                                /* regex recurse level */
+
+  /* Anything other than "no match" means we are done, always; otherwise, carry
+  on only if not anchored. */
+
+  if (rc != PCRE_ERROR_NOMATCH || anchored) return rc;
+
+  /* Advance to the next subject character unless we are at the end of a line
+  and firstline is set. */
+
+  if (firstline && IS_NEWLINE(current_subject)) break;
+  current_subject++;
+  if (utf8)
+    {
+    while (current_subject < end_subject && (*current_subject & 0xc0) == 0x80)
+      current_subject++;
+    }
+  if (current_subject > end_subject) break;
+
+  /* If we have just passed a CR and we are now at a LF, and the pattern does
+  not contain any explicit matches for \r or \n, and the newline option is CRLF
+  or ANY or ANYCRLF, advance the match position by one more character. */
+
+  if (current_subject[-1] == '\r' &&
+      current_subject < end_subject &&
+      *current_subject == '\n' &&
+      (re->flags & PCRE_HASCRORLF) == 0 &&
+        (md->nltype == NLTYPE_ANY ||
+         md->nltype == NLTYPE_ANYCRLF ||
+         md->nllen == 2))
+    current_subject++;
+
+  }   /* "Bumpalong" loop */
+
+return PCRE_ERROR_NOMATCH;
+}
+
+/* End of pcre_dfa_exec.c */
diff --git a/uppsrc/plugin/pcre/lib/pcre_exec.c b/uppsrc/plugin/pcre/lib/pcre_exec.c
new file mode 100644
index 000000000..56739915e
--- /dev/null
+++ b/uppsrc/plugin/pcre/lib/pcre_exec.c
@@ -0,0 +1,4940 @@
+/*************************************************
+*      Perl-Compatible Regular Expressions       *
+*************************************************/
+
+/* PCRE is a library of functions to support regular expressions whose syntax
+and semantics are as close as possible to those of the Perl 5 language.
+
+                       Written by Philip Hazel
+           Copyright (c) 1997-2008 University of Cambridge
+
+-----------------------------------------------------------------------------
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+
+    * Neither the name of the University of Cambridge nor the names of its
+      contributors may be used to endorse or promote products derived from
+      this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+-----------------------------------------------------------------------------
+*/
+
+
+/* This module contains pcre_exec(), the externally visible function that does
+pattern matching using an NFA algorithm, trying to mimic Perl as closely as
+possible. There are also some static supporting functions. */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#define NLBLOCK md             /* Block containing newline information */
+#define PSSTART start_subject  /* Field containing processed string start */
+#define PSEND   end_subject    /* Field containing processed string end */
+
+#include "pcre_internal.h"
+
+/* Undefine some potentially clashing cpp symbols */
+
+#undef min
+#undef max
+
+/* Flag bits for the match() function */
+
+#define match_condassert     0x01  /* Called to check a condition assertion */
+#define match_cbegroup       0x02  /* Could-be-empty unlimited repeat group */
+
+/* Non-error returns from the match() function. Error returns are externally
+defined PCRE_ERROR_xxx codes, which are all negative. */
+
+#define MATCH_MATCH        1
+#define MATCH_NOMATCH      0
+
+/* Special internal returns from the match() function. Make them sufficiently
+negative to avoid the external error codes. */
+
+#define MATCH_COMMIT       (-999)
+#define MATCH_PRUNE        (-998)
+#define MATCH_SKIP         (-997)
+#define MATCH_THEN         (-996)
+
+/* Maximum number of ints of offset to save on the stack for recursive calls.
+If the offset vector is bigger, malloc is used. This should be a multiple of 3,
+because the offset vector is always a multiple of 3 long. */
+
+#define REC_STACK_SAVE_MAX 30
+
+/* Min and max values for the common repeats; for the maxima, 0 => infinity */
+
+static const char rep_min[] = { 0, 0, 1, 1, 0, 0 };
+static const char rep_max[] = { 0, 0, 0, 0, 1, 1 };
+
+
+
+#ifdef DEBUG
+/*************************************************
+*        Debugging function to print chars       *
+*************************************************/
+
+/* Print a sequence of chars in printable format, stopping at the end of the
+subject if the requested.
+
+Arguments:
+  p           points to characters
+  length      number to print
+  is_subject  TRUE if printing from within md->start_subject
+  md          pointer to matching data block, if is_subject is TRUE
+
+Returns:     nothing
+*/
+
+static void
+pchars(const uschar *p, int length, BOOL is_subject, match_data *md)
+{
+unsigned int c;
+if (is_subject && length > md->end_subject - p) length = md->end_subject - p;
+while (length-- > 0)
+  if (isprint(c = *(p++))) printf("%c", c); else printf("\\x%02x", c);
+}
+#endif
+
+
+
+/*************************************************
+*          Match a back-reference                *
+*************************************************/
+
+/* If a back reference hasn't been set, the length that is passed is greater
+than the number of characters left in the string, so the match fails.
+
+Arguments:
+  offset      index into the offset vector
+  eptr        points into the subject
+  length      length to be matched
+  md          points to match data block
+  ims         the ims flags
+
+Returns:      TRUE if matched
+*/
+
+static BOOL
+match_ref(int offset, register USPTR eptr, int length, match_data *md,
+  unsigned long int ims)
+{
+USPTR p = md->start_subject + md->offset_vector[offset];
+
+#ifdef DEBUG
+if (eptr >= md->end_subject)
+  printf("matching subject <null>");
+else
+  {
+  printf("matching subject ");
+  pchars(eptr, length, TRUE, md);
+  }
+printf(" against backref ");
+pchars(p, length, FALSE, md);
+printf("\n");
+#endif
+
+/* Always fail if not enough characters left */
+
+if (length > md->end_subject - eptr) return FALSE;
+
+/* Separate the caselesss case for speed */
+
+if ((ims & PCRE_CASELESS) != 0)
+  {
+  while (length-- > 0)
+    if (md->lcc[*p++] != md->lcc[*eptr++]) return FALSE;
+  }
+else
+  { while (length-- > 0) if (*p++ != *eptr++) return FALSE; }
+
+return TRUE;
+}
+
+
+
+/***************************************************************************
+****************************************************************************
+                   RECURSION IN THE match() FUNCTION
+
+The match() function is highly recursive, though not every recursive call
+increases the recursive depth. Nevertheless, some regular expressions can cause
+it to recurse to a great depth. I was writing for Unix, so I just let it call
+itself recursively. This uses the stack for saving everything that has to be
+saved for a recursive call. On Unix, the stack can be large, and this works
+fine.
+
+It turns out that on some non-Unix-like systems there are problems with
+programs that use a lot of stack. (This despite the fact that every last chip
+has oodles of memory these days, and techniques for extending the stack have
+been known for decades.) So....
+
+There is a fudge, triggered by defining NO_RECURSE, which avoids recursive
+calls by keeping local variables that need to be preserved in blocks of memory
+obtained from malloc() instead instead of on the stack. Macros are used to
+achieve this so that the actual code doesn't look very different to what it
+always used to.
+
+The original heap-recursive code used longjmp(). However, it seems that this
+can be very slow on some operating systems. Following a suggestion from Stan
+Switzer, the use of longjmp() has been abolished, at the cost of having to
+provide a unique number for each call to RMATCH. There is no way of generating
+a sequence of numbers at compile time in C. I have given them names, to make
+them stand out more clearly.
+
+Crude tests on x86 Linux show a small speedup of around 5-8%. However, on
+FreeBSD, avoiding longjmp() more than halves the time taken to run the standard
+tests. Furthermore, not using longjmp() means that local dynamic variables
+don't have indeterminate values; this has meant that the frame size can be
+reduced because the result can be "passed back" by straight setting of the
+variable instead of being passed in the frame.
+****************************************************************************
+***************************************************************************/
+
+/* Numbers for RMATCH calls. When this list is changed, the code at HEAP_RETURN
+below must be updated in sync.  */
+
+enum { RM1=1, RM2,  RM3,  RM4,  RM5,  RM6,  RM7,  RM8,  RM9,  RM10,
+       RM11,  RM12, RM13, RM14, RM15, RM16, RM17, RM18, RM19, RM20,
+       RM21,  RM22, RM23, RM24, RM25, RM26, RM27, RM28, RM29, RM30,
+       RM31,  RM32, RM33, RM34, RM35, RM36, RM37, RM38, RM39, RM40,
+       RM41,  RM42, RM43, RM44, RM45, RM46, RM47, RM48, RM49, RM50,
+       RM51,  RM52, RM53, RM54 };
+
+/* These versions of the macros use the stack, as normal. There are debugging
+versions and production versions. Note that the "rw" argument of RMATCH isn't
+actuall used in this definition. */
+
+#ifndef NO_RECURSE
+#define REGISTER register
+
+#ifdef DEBUG
+#define RMATCH(ra,rb,rc,rd,re,rf,rg,rw) \
+  { \
+  printf("match() called in line %d\n", __LINE__); \
+  rrc = match(ra,rb,mstart,rc,rd,re,rf,rg,rdepth+1); \
+  printf("to line %d\n", __LINE__); \
+  }
+#define RRETURN(ra) \
+  { \
+  printf("match() returned %d from line %d ", ra, __LINE__); \
+  return ra; \
+  }
+#else
+#define RMATCH(ra,rb,rc,rd,re,rf,rg,rw) \
+  rrc = match(ra,rb,mstart,rc,rd,re,rf,rg,rdepth+1)
+#define RRETURN(ra) return ra
+#endif
+
+#else
+
+
+/* These versions of the macros manage a private stack on the heap. Note that
+the "rd" argument of RMATCH isn't actually used in this definition. It's the md
+argument of match(), which never changes. */
+
+#define REGISTER
+
+#define RMATCH(ra,rb,rc,rd,re,rf,rg,rw)\
+  {\
+  heapframe *newframe = (pcre_stack_malloc)(sizeof(heapframe));\
+  frame->Xwhere = rw; \
+  newframe->Xeptr = ra;\
+  newframe->Xecode = rb;\
+  newframe->Xmstart = mstart;\
+  newframe->Xoffset_top = rc;\
+  newframe->Xims = re;\
+  newframe->Xeptrb = rf;\
+  newframe->Xflags = rg;\
+  newframe->Xrdepth = frame->Xrdepth + 1;\
+  newframe->Xprevframe = frame;\
+  frame = newframe;\
+  DPRINTF(("restarting from line %d\n", __LINE__));\
+  goto HEAP_RECURSE;\
+  L_##rw:\
+  DPRINTF(("jumped back to line %d\n", __LINE__));\
+  }
+
+#define RRETURN(ra)\
+  {\
+  heapframe *newframe = frame;\
+  frame = newframe->Xprevframe;\
+  (pcre_stack_free)(newframe);\
+  if (frame != NULL)\
+    {\
+    rrc = ra;\
+    goto HEAP_RETURN;\
+    }\
+  return ra;\
+  }
+
+
+/* Structure for remembering the local variables in a private frame */
+
+typedef struct heapframe {
+  struct heapframe *Xprevframe;
+
+  /* Function arguments that may change */
+
+  const uschar *Xeptr;
+  const uschar *Xecode;
+  const uschar *Xmstart;
+  int Xoffset_top;
+  long int Xims;
+  eptrblock *Xeptrb;
+  int Xflags;
+  unsigned int Xrdepth;
+
+  /* Function local variables */
+
+  const uschar *Xcallpat;
+  const uschar *Xcharptr;
+  const uschar *Xdata;
+  const uschar *Xnext;
+  const uschar *Xpp;
+  const uschar *Xprev;
+  const uschar *Xsaved_eptr;
+
+  recursion_info Xnew_recursive;
+
+  BOOL Xcur_is_word;
+  BOOL Xcondition;
+  BOOL Xprev_is_word;
+
+  unsigned long int Xoriginal_ims;
+
+#ifdef SUPPORT_UCP
+  int Xprop_type;
+  int Xprop_value;
+  int Xprop_fail_result;
+  int Xprop_category;
+  int Xprop_chartype;
+  int Xprop_script;
+  int Xoclength;
+  uschar Xocchars[8];
+#endif
+
+  int Xctype;
+  unsigned int Xfc;
+  int Xfi;
+  int Xlength;
+  int Xmax;
+  int Xmin;
+  int Xnumber;
+  int Xoffset;
+  int Xop;
+  int Xsave_capture_last;
+  int Xsave_offset1, Xsave_offset2, Xsave_offset3;
+  int Xstacksave[REC_STACK_SAVE_MAX];
+
+  eptrblock Xnewptrb;
+
+  /* Where to jump back to */
+
+  int Xwhere;
+
+} heapframe;
+
+#endif
+
+
+/***************************************************************************
+***************************************************************************/
+
+
+
+/*************************************************
+*         Match from current position            *
+*************************************************/
+
+/* This function is called recursively in many circumstances. Whenever it
+returns a negative (error) response, the outer incarnation must also return the
+same response.
+
+Performance note: It might be tempting to extract commonly used fields from the
+md structure (e.g. utf8, end_subject) into individual variables to improve
+performance. Tests using gcc on a SPARC disproved this; in the first case, it
+made performance worse.
+
+Arguments:
+   eptr        pointer to current character in subject
+   ecode       pointer to current position in compiled code
+   mstart      pointer to the current match start position (can be modified
+                 by encountering \K)
+   offset_top  current top pointer
+   md          pointer to "static" info for the match
+   ims         current /i, /m, and /s options
+   eptrb       pointer to chain of blocks containing eptr at start of
+                 brackets - for testing for empty matches
+   flags       can contain
+                 match_condassert - this is an assertion condition
+                 match_cbegroup - this is the start of an unlimited repeat
+                   group that can match an empty string
+   rdepth      the recursion depth
+
+Returns:       MATCH_MATCH if matched            )  these values are >= 0
+               MATCH_NOMATCH if failed to match  )
+               a negative PCRE_ERROR_xxx value if aborted by an error condition
+                 (e.g. stopped by repeated call or recursion limit)
+*/
+
+static int
+match(REGISTER USPTR eptr, REGISTER const uschar *ecode, const uschar *mstart,
+  int offset_top, match_data *md, unsigned long int ims, eptrblock *eptrb,
+  int flags, unsigned int rdepth)
+{
+/* These variables do not need to be preserved over recursion in this function,
+so they can be ordinary variables in all cases. Mark some of them with
+"register" because they are used a lot in loops. */
+
+register int  rrc;         /* Returns from recursive calls */
+register int  i;           /* Used for loops not involving calls to RMATCH() */
+register unsigned int c;   /* Character values not kept over RMATCH() calls */
+register BOOL utf8;        /* Local copy of UTF-8 flag for speed */
+
+BOOL minimize, possessive; /* Quantifier options */
+
+/* When recursion is not being used, all "local" variables that have to be
+preserved over calls to RMATCH() are part of a "frame" which is obtained from
+heap storage. Set up the top-level frame here; others are obtained from the
+heap whenever RMATCH() does a "recursion". See the macro definitions above. */
+
+#ifdef NO_RECURSE
+heapframe *frame = (pcre_stack_malloc)(sizeof(heapframe));
+frame->Xprevframe = NULL;            /* Marks the top level */
+
+/* Copy in the original argument variables */
+
+frame->Xeptr = eptr;
+frame->Xecode = ecode;
+frame->Xmstart = mstart;
+frame->Xoffset_top = offset_top;
+frame->Xims = ims;
+frame->Xeptrb = eptrb;
+frame->Xflags = flags;
+frame->Xrdepth = rdepth;
+
+/* This is where control jumps back to to effect "recursion" */
+
+HEAP_RECURSE:
+
+/* Macros make the argument variables come from the current frame */
+
+#define eptr               frame->Xeptr
+#define ecode              frame->Xecode
+#define mstart             frame->Xmstart
+#define offset_top         frame->Xoffset_top
+#define ims                frame->Xims
+#define eptrb              frame->Xeptrb
+#define flags              frame->Xflags
+#define rdepth             frame->Xrdepth
+
+/* Ditto for the local variables */
+
+#ifdef SUPPORT_UTF8
+#define charptr            frame->Xcharptr
+#endif
+#define callpat            frame->Xcallpat
+#define data               frame->Xdata
+#define next               frame->Xnext
+#define pp                 frame->Xpp
+#define prev               frame->Xprev
+#define saved_eptr         frame->Xsaved_eptr
+
+#define new_recursive      frame->Xnew_recursive
+
+#define cur_is_word        frame->Xcur_is_word
+#define condition          frame->Xcondition
+#define prev_is_word       frame->Xprev_is_word
+
+#define original_ims       frame->Xoriginal_ims
+
+#ifdef SUPPORT_UCP
+#define prop_type          frame->Xprop_type
+#define prop_value         frame->Xprop_value
+#define prop_fail_result   frame->Xprop_fail_result
+#define prop_category      frame->Xprop_category
+#define prop_chartype      frame->Xprop_chartype
+#define prop_script        frame->Xprop_script
+#define oclength           frame->Xoclength
+#define occhars            frame->Xocchars
+#endif
+
+#define ctype              frame->Xctype
+#define fc                 frame->Xfc
+#define fi                 frame->Xfi
+#define length             frame->Xlength
+#define max                frame->Xmax
+#define min                frame->Xmin
+#define number             frame->Xnumber
+#define offset             frame->Xoffset
+#define op                 frame->Xop
+#define save_capture_last  frame->Xsave_capture_last
+#define save_offset1       frame->Xsave_offset1
+#define save_offset2       frame->Xsave_offset2
+#define save_offset3       frame->Xsave_offset3
+#define stacksave          frame->Xstacksave
+
+#define newptrb            frame->Xnewptrb
+
+/* When recursion is being used, local variables are allocated on the stack and
+get preserved during recursion in the normal way. In this environment, fi and
+i, and fc and c, can be the same variables. */
+
+#else         /* NO_RECURSE not defined */
+#define fi i
+#define fc c
+
+
+#ifdef SUPPORT_UTF8                /* Many of these variables are used only  */
+const uschar *charptr;             /* in small blocks of the code. My normal */
+#endif                             /* style of coding would have declared    */
+const uschar *callpat;             /* them within each of those blocks.      */
+const uschar *data;                /* However, in order to accommodate the   */
+const uschar *next;                /* version of this code that uses an      */
+USPTR         pp;                  /* external "stack" implemented on the    */
+const uschar *prev;                /* heap, it is easier to declare them all */
+USPTR         saved_eptr;          /* here, so the declarations can be cut   */
+                                   /* out in a block. The only declarations  */
+recursion_info new_recursive;      /* within blocks below are for variables  */
+                                   /* that do not have to be preserved over  */
+BOOL cur_is_word;                  /* a recursive call to RMATCH().          */
+BOOL condition;
+BOOL prev_is_word;
+
+unsigned long int original_ims;
+
+#ifdef SUPPORT_UCP
+int prop_type;
+int prop_value;
+int prop_fail_result;
+int prop_category;
+int prop_chartype;
+int prop_script;
+int oclength;
+uschar occhars[8];
+#endif
+
+int ctype;
+int length;
+int max;
+int min;
+int number;
+int offset;
+int op;
+int save_capture_last;
+int save_offset1, save_offset2, save_offset3;
+int stacksave[REC_STACK_SAVE_MAX];
+
+eptrblock newptrb;
+#endif     /* NO_RECURSE */
+
+/* These statements are here to stop the compiler complaining about unitialized
+variables. */
+
+#ifdef SUPPORT_UCP
+prop_value = 0;
+prop_fail_result = 0;
+#endif
+
+
+/* This label is used for tail recursion, which is used in a few cases even
+when NO_RECURSE is not defined, in order to reduce the amount of stack that is
+used. Thanks to Ian Taylor for noticing this possibility and sending the
+original patch. */
+
+TAIL_RECURSE:
+
+/* OK, now we can get on with the real code of the function. Recursive calls
+are specified by the macro RMATCH and RRETURN is used to return. When
+NO_RECURSE is *not* defined, these just turn into a recursive call to match()
+and a "return", respectively (possibly with some debugging if DEBUG is
+defined). However, RMATCH isn't like a function call because it's quite a
+complicated macro. It has to be used in one particular way. This shouldn't,
+however, impact performance when true recursion is being used. */
+
+#ifdef SUPPORT_UTF8
+utf8 = md->utf8;       /* Local copy of the flag */
+#else
+utf8 = FALSE;
+#endif
+
+/* First check that we haven't called match() too many times, or that we
+haven't exceeded the recursive call limit. */
+
+if (md->match_call_count++ >= md->match_limit) RRETURN(PCRE_ERROR_MATCHLIMIT);
+if (rdepth >= md->match_limit_recursion) RRETURN(PCRE_ERROR_RECURSIONLIMIT);
+
+original_ims = ims;    /* Save for resetting on ')' */
+
+/* At the start of a group with an unlimited repeat that may match an empty
+string, the match_cbegroup flag is set. When this is the case, add the current
+subject pointer to the chain of such remembered pointers, to be checked when we
+hit the closing ket, in order to break infinite loops that match no characters.
+When match() is called in other circumstances, don't add to the chain. The
+match_cbegroup flag must NOT be used with tail recursion, because the memory
+block that is used is on the stack, so a new one may be required for each
+match(). */
+
+if ((flags & match_cbegroup) != 0)
+  {
+  newptrb.epb_saved_eptr = eptr;
+  newptrb.epb_prev = eptrb;
+  eptrb = &newptrb;
+  }
+
+/* Now start processing the opcodes. */
+
+for (;;)
+  {
+  minimize = possessive = FALSE;
+  op = *ecode;
+
+  /* For partial matching, remember if we ever hit the end of the subject after
+  matching at least one subject character. */
+
+  if (md->partial &&
+      eptr >= md->end_subject &&
+      eptr > mstart)
+    md->hitend = TRUE;
+
+  switch(op)
+    {
+    case OP_FAIL:
+    RRETURN(MATCH_NOMATCH);
+
+    case OP_PRUNE:
+    RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md,
+      ims, eptrb, flags, RM51);
+    if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+    RRETURN(MATCH_PRUNE);
+
+    case OP_COMMIT:
+    RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md,
+      ims, eptrb, flags, RM52);
+    if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+    RRETURN(MATCH_COMMIT);
+
+    case OP_SKIP:
+    RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md,
+      ims, eptrb, flags, RM53);
+    if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+    md->start_match_ptr = eptr;   /* Pass back current position */
+    RRETURN(MATCH_SKIP);
+
+    case OP_THEN:
+    RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md,
+      ims, eptrb, flags, RM54);
+    if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+    RRETURN(MATCH_THEN);
+
+    /* Handle a capturing bracket. If there is space in the offset vector, save
+    the current subject position in the working slot at the top of the vector.
+    We mustn't change the current values of the data slot, because they may be
+    set from a previous iteration of this group, and be referred to by a
+    reference inside the group.
+
+    If the bracket fails to match, we need to restore this value and also the
+    values of the final offsets, in case they were set by a previous iteration
+    of the same bracket.
+
+    If there isn't enough space in the offset vector, treat this as if it were
+    a non-capturing bracket. Don't worry about setting the flag for the error
+    case here; that is handled in the code for KET. */
+
+    case OP_CBRA:
+    case OP_SCBRA:
+    number = GET2(ecode, 1+LINK_SIZE);
+    offset = number << 1;
+
+#ifdef DEBUG
+    printf("start bracket %d\n", number);
+    printf("subject=");
+    pchars(eptr, 16, TRUE, md);
+    printf("\n");
+#endif
+
+    if (offset < md->offset_max)
+      {
+      save_offset1 = md->offset_vector[offset];
+      save_offset2 = md->offset_vector[offset+1];
+      save_offset3 = md->offset_vector[md->offset_end - number];
+      save_capture_last = md->capture_last;
+
+      DPRINTF(("saving %d %d %d\n", save_offset1, save_offset2, save_offset3));
+      md->offset_vector[md->offset_end - number] = eptr - md->start_subject;
+
+      flags = (op == OP_SCBRA)? match_cbegroup : 0;
+      do
+        {
+        RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md,
+          ims, eptrb, flags, RM1);
+        if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN) RRETURN(rrc);
+        md->capture_last = save_capture_last;
+        ecode += GET(ecode, 1);
+        }
+      while (*ecode == OP_ALT);
+
+      DPRINTF(("bracket %d failed\n", number));
+
+      md->offset_vector[offset] = save_offset1;
+      md->offset_vector[offset+1] = save_offset2;
+      md->offset_vector[md->offset_end - number] = save_offset3;
+
+      RRETURN(MATCH_NOMATCH);
+      }
+
+    /* FALL THROUGH ... Insufficient room for saving captured contents. Treat
+    as a non-capturing bracket. */
+
+    /* VVVVVVVVVVVVVVVVVVVVVVVVV */
+    /* VVVVVVVVVVVVVVVVVVVVVVVVV */
+
+    DPRINTF(("insufficient capture room: treat as non-capturing\n"));
+
+    /* VVVVVVVVVVVVVVVVVVVVVVVVV */
+    /* VVVVVVVVVVVVVVVVVVVVVVVVV */
+
+    /* Non-capturing bracket. Loop for all the alternatives. When we get to the
+    final alternative within the brackets, we would return the result of a
+    recursive call to match() whatever happened. We can reduce stack usage by
+    turning this into a tail recursion, except in the case when match_cbegroup
+    is set.*/
+
+    case OP_BRA:
+    case OP_SBRA:
+    DPRINTF(("start non-capturing bracket\n"));
+    flags = (op >= OP_SBRA)? match_cbegroup : 0;
+    for (;;)
+      {
+      if (ecode[GET(ecode, 1)] != OP_ALT)   /* Final alternative */
+        {
+        if (flags == 0)    /* Not a possibly empty group */
+          {
+          ecode += _pcre_OP_lengths[*ecode];
+          DPRINTF(("bracket 0 tail recursion\n"));
+          goto TAIL_RECURSE;
+          }
+
+        /* Possibly empty group; can't use tail recursion. */
+
+        RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md, ims,
+          eptrb, flags, RM48);
+        RRETURN(rrc);
+        }
+
+      /* For non-final alternatives, continue the loop for a NOMATCH result;
+      otherwise return. */
+
+      RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md, ims,
+        eptrb, flags, RM2);
+      if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN) RRETURN(rrc);
+      ecode += GET(ecode, 1);
+      }
+    /* Control never reaches here. */
+
+    /* Conditional group: compilation checked that there are no more than
+    two branches. If the condition is false, skipping the first branch takes us
+    past the end if there is only one branch, but that's OK because that is
+    exactly what going to the ket would do. As there is only one branch to be
+    obeyed, we can use tail recursion to avoid using another stack frame. */
+
+    case OP_COND:
+    case OP_SCOND:
+    if (ecode[LINK_SIZE+1] == OP_RREF)         /* Recursion test */
+      {
+      offset = GET2(ecode, LINK_SIZE + 2);     /* Recursion group number*/
+      condition = md->recursive != NULL &&
+        (offset == RREF_ANY || offset == md->recursive->group_num);
+      ecode += condition? 3 : GET(ecode, 1);
+      }
+
+    else if (ecode[LINK_SIZE+1] == OP_CREF)    /* Group used test */
+      {
+      offset = GET2(ecode, LINK_SIZE+2) << 1;  /* Doubled ref number */
+      condition = offset < offset_top && md->offset_vector[offset] >= 0;
+      ecode += condition? 3 : GET(ecode, 1);
+      }
+
+    else if (ecode[LINK_SIZE+1] == OP_DEF)     /* DEFINE - always false */
+      {
+      condition = FALSE;
+      ecode += GET(ecode, 1);
+      }
+
+    /* The condition is an assertion. Call match() to evaluate it - setting
+    the final argument match_condassert causes it to stop at the end of an
+    assertion. */
+
+    else
+      {
+      RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, ims, NULL,
+          match_condassert, RM3);
+      if (rrc == MATCH_MATCH)
+        {
+        condition = TRUE;
+        ecode += 1 + LINK_SIZE + GET(ecode, LINK_SIZE + 2);
+        while (*ecode == OP_ALT) ecode += GET(ecode, 1);
+        }
+      else if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN)
+        {
+        RRETURN(rrc);         /* Need braces because of following else */
+        }
+      else
+        {
+        condition = FALSE;
+        ecode += GET(ecode, 1);
+        }
+      }
+
+    /* We are now at the branch that is to be obeyed. As there is only one,
+    we can use tail recursion to avoid using another stack frame, except when
+    match_cbegroup is required for an unlimited repeat of a possibly empty
+    group. If the second alternative doesn't exist, we can just plough on. */
+
+    if (condition || *ecode == OP_ALT)
+      {
+      ecode += 1 + LINK_SIZE;
+      if (op == OP_SCOND)        /* Possibly empty group */
+        {
+        RMATCH(eptr, ecode, offset_top, md, ims, eptrb, match_cbegroup, RM49);
+        RRETURN(rrc);
+        }
+      else                       /* Group must match something */
+        {
+        flags = 0;
+        goto TAIL_RECURSE;
+        }
+      }
+    else                         /* Condition false & no 2nd alternative */
+      {
+      ecode += 1 + LINK_SIZE;
+      }
+    break;
+
+
+    /* End of the pattern, either real or forced. If we are in a top-level
+    recursion, we should restore the offsets appropriately and continue from
+    after the call. */
+
+    case OP_ACCEPT:
+    case OP_END:
+    if (md->recursive != NULL && md->recursive->group_num == 0)
+      {
+      recursion_info *rec = md->recursive;
+      DPRINTF(("End of pattern in a (?0) recursion\n"));
+      md->recursive = rec->prevrec;
+      memmove(md->offset_vector, rec->offset_save,
+        rec->saved_max * sizeof(int));
+      mstart = rec->save_start;
+      ims = original_ims;
+      ecode = rec->after_call;
+      break;
+      }
+
+    /* Otherwise, if PCRE_NOTEMPTY is set, fail if we have matched an empty
+    string - backtracking will then try other alternatives, if any. */
+
+    if (md->notempty && eptr == mstart) RRETURN(MATCH_NOMATCH);
+    md->end_match_ptr = eptr;           /* Record where we ended */
+    md->end_offset_top = offset_top;    /* and how many extracts were taken */
+    md->start_match_ptr = mstart;       /* and the start (\K can modify) */
+    RRETURN(MATCH_MATCH);
+
+    /* Change option settings */
+
+    case OP_OPT:
+    ims = ecode[1];
+    ecode += 2;
+    DPRINTF(("ims set to %02lx\n", ims));
+    break;
+
+    /* Assertion brackets. Check the alternative branches in turn - the
+    matching won't pass the KET for an assertion. If any one branch matches,
+    the assertion is true. Lookbehind assertions have an OP_REVERSE item at the
+    start of each branch to move the current point backwards, so the code at
+    this level is identical to the lookahead case. */
+
+    case OP_ASSERT:
+    case OP_ASSERTBACK:
+    do
+      {
+      RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, ims, NULL, 0,
+        RM4);
+      if (rrc == MATCH_MATCH) break;
+      if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN) RRETURN(rrc);
+      ecode += GET(ecode, 1);
+      }
+    while (*ecode == OP_ALT);
+    if (*ecode == OP_KET) RRETURN(MATCH_NOMATCH);
+
+    /* If checking an assertion for a condition, return MATCH_MATCH. */
+
+    if ((flags & match_condassert) != 0) RRETURN(MATCH_MATCH);
+
+    /* Continue from after the assertion, updating the offsets high water
+    mark, since extracts may have been taken during the assertion. */
+
+    do ecode += GET(ecode,1); while (*ecode == OP_ALT);
+    ecode += 1 + LINK_SIZE;
+    offset_top = md->end_offset_top;
+    continue;
+
+    /* Negative assertion: all branches must fail to match */
+
+    case OP_ASSERT_NOT:
+    case OP_ASSERTBACK_NOT:
+    do
+      {
+      RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, ims, NULL, 0,
+        RM5);
+      if (rrc == MATCH_MATCH) RRETURN(MATCH_NOMATCH);
+      if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN) RRETURN(rrc);
+      ecode += GET(ecode,1);
+      }
+    while (*ecode == OP_ALT);
+
+    if ((flags & match_condassert) != 0) RRETURN(MATCH_MATCH);
+
+    ecode += 1 + LINK_SIZE;
+    continue;
+
+    /* Move the subject pointer back. This occurs only at the start of
+    each branch of a lookbehind assertion. If we are too close to the start to
+    move back, this match function fails. When working with UTF-8 we move
+    back a number of characters, not bytes. */
+
+    case OP_REVERSE:
+#ifdef SUPPORT_UTF8
+    if (utf8)
+      {
+      i = GET(ecode, 1);
+      while (i-- > 0)
+        {
+        eptr--;
+        if (eptr < md->start_subject) RRETURN(MATCH_NOMATCH);
+        BACKCHAR(eptr);
+        }
+      }
+    else
+#endif
+
+    /* No UTF-8 support, or not in UTF-8 mode: count is byte count */
+
+      {
+      eptr -= GET(ecode, 1);
+      if (eptr < md->start_subject) RRETURN(MATCH_NOMATCH);
+      }
+
+    /* Skip to next op code */
+
+    ecode += 1 + LINK_SIZE;
+    break;
+
+    /* The callout item calls an external function, if one is provided, passing
+    details of the match so far. This is mainly for debugging, though the
+    function is able to force a failure. */
+
+    case OP_CALLOUT:
+    if (pcre_callout != NULL)
+      {
+      pcre_callout_block cb;
+      cb.version          = 1;   /* Version 1 of the callout block */
+      cb.callout_number   = ecode[1];
+      cb.offset_vector    = md->offset_vector;
+      cb.subject          = (PCRE_SPTR)md->start_subject;
+      cb.subject_length   = md->end_subject - md->start_subject;
+      cb.start_match      = mstart - md->start_subject;
+      cb.current_position = eptr - md->start_subject;
+      cb.pattern_position = GET(ecode, 2);
+      cb.next_item_length = GET(ecode, 2 + LINK_SIZE);
+      cb.capture_top      = offset_top/2;
+      cb.capture_last     = md->capture_last;
+      cb.callout_data     = md->callout_data;
+      if ((rrc = (*pcre_callout)(&cb)) > 0) RRETURN(MATCH_NOMATCH);
+      if (rrc < 0) RRETURN(rrc);
+      }
+    ecode += 2 + 2*LINK_SIZE;
+    break;
+
+    /* Recursion either matches the current regex, or some subexpression. The
+    offset data is the offset to the starting bracket from the start of the
+    whole pattern. (This is so that it works from duplicated subpatterns.)
+
+    If there are any capturing brackets started but not finished, we have to
+    save their starting points and reinstate them after the recursion. However,
+    we don't know how many such there are (offset_top records the completed
+    total) so we just have to save all the potential data. There may be up to
+    65535 such values, which is too large to put on the stack, but using malloc
+    for small numbers seems expensive. As a compromise, the stack is used when
+    there are no more than REC_STACK_SAVE_MAX values to store; otherwise malloc
+    is used. A problem is what to do if the malloc fails ... there is no way of
+    returning to the top level with an error. Save the top REC_STACK_SAVE_MAX
+    values on the stack, and accept that the rest may be wrong.
+
+    There are also other values that have to be saved. We use a chained
+    sequence of blocks that actually live on the stack. Thanks to Robin Houston
+    for the original version of this logic. */
+
+    case OP_RECURSE:
+      {
+      callpat = md->start_code + GET(ecode, 1);
+      new_recursive.group_num = (callpat == md->start_code)? 0 :
+        GET2(callpat, 1 + LINK_SIZE);
+
+      /* Add to "recursing stack" */
+
+      new_recursive.prevrec = md->recursive;
+      md->recursive = &new_recursive;
+
+      /* Find where to continue from afterwards */
+
+      ecode += 1 + LINK_SIZE;
+      new_recursive.after_call = ecode;
+
+      /* Now save the offset data. */
+
+      new_recursive.saved_max = md->offset_end;
+      if (new_recursive.saved_max <= REC_STACK_SAVE_MAX)
+        new_recursive.offset_save = stacksave;
+      else
+        {
+        new_recursive.offset_save =
+          (int *)(pcre_malloc)(new_recursive.saved_max * sizeof(int));
+        if (new_recursive.offset_save == NULL) RRETURN(PCRE_ERROR_NOMEMORY);
+        }
+
+      memcpy(new_recursive.offset_save, md->offset_vector,
+            new_recursive.saved_max * sizeof(int));
+      new_recursive.save_start = mstart;
+      mstart = eptr;
+
+      /* OK, now we can do the recursion. For each top-level alternative we
+      restore the offset and recursion data. */
+
+      DPRINTF(("Recursing into group %d\n", new_recursive.group_num));
+      flags = (*callpat >= OP_SBRA)? match_cbegroup : 0;
+      do
+        {
+        RMATCH(eptr, callpat + _pcre_OP_lengths[*callpat], offset_top,
+          md, ims, eptrb, flags, RM6);
+        if (rrc == MATCH_MATCH)
+          {
+          DPRINTF(("Recursion matched\n"));
+          md->recursive = new_recursive.prevrec;
+          if (new_recursive.offset_save != stacksave)
+            (pcre_free)(new_recursive.offset_save);
+          RRETURN(MATCH_MATCH);
+          }
+        else if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN)
+          {
+          DPRINTF(("Recursion gave error %d\n", rrc));
+          RRETURN(rrc);
+          }
+
+        md->recursive = &new_recursive;
+        memcpy(md->offset_vector, new_recursive.offset_save,
+            new_recursive.saved_max * sizeof(int));
+        callpat += GET(callpat, 1);
+        }
+      while (*callpat == OP_ALT);
+
+      DPRINTF(("Recursion didn't match\n"));
+      md->recursive = new_recursive.prevrec;
+      if (new_recursive.offset_save != stacksave)
+        (pcre_free)(new_recursive.offset_save);
+      RRETURN(MATCH_NOMATCH);
+      }
+    /* Control never reaches here */
+
+    /* "Once" brackets are like assertion brackets except that after a match,
+    the point in the subject string is not moved back. Thus there can never be
+    a move back into the brackets. Friedl calls these "atomic" subpatterns.
+    Check the alternative branches in turn - the matching won't pass the KET
+    for this kind of subpattern. If any one branch matches, we carry on as at
+    the end of a normal bracket, leaving the subject pointer. */
+
+    case OP_ONCE:
+    prev = ecode;
+    saved_eptr = eptr;
+
+    do
+      {
+      RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, ims, eptrb, 0, RM7);
+      if (rrc == MATCH_MATCH) break;
+      if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN) RRETURN(rrc);
+      ecode += GET(ecode,1);
+      }
+    while (*ecode == OP_ALT);
+
+    /* If hit the end of the group (which could be repeated), fail */
+
+    if (*ecode != OP_ONCE && *ecode != OP_ALT) RRETURN(MATCH_NOMATCH);
+
+    /* Continue as from after the assertion, updating the offsets high water
+    mark, since extracts may have been taken. */
+
+    do ecode += GET(ecode, 1); while (*ecode == OP_ALT);
+
+    offset_top = md->end_offset_top;
+    eptr = md->end_match_ptr;
+
+    /* For a non-repeating ket, just continue at this level. This also
+    happens for a repeating ket if no characters were matched in the group.
+    This is the forcible breaking of infinite loops as implemented in Perl
+    5.005. If there is an options reset, it will get obeyed in the normal
+    course of events. */
+
+    if (*ecode == OP_KET || eptr == saved_eptr)
+      {
+      ecode += 1+LINK_SIZE;
+      break;
+      }
+
+    /* The repeating kets try the rest of the pattern or restart from the
+    preceding bracket, in the appropriate order. The second "call" of match()
+    uses tail recursion, to avoid using another stack frame. We need to reset
+    any options that changed within the bracket before re-running it, so
+    check the next opcode. */
+
+    if (ecode[1+LINK_SIZE] == OP_OPT)
+      {
+      ims = (ims & ~PCRE_IMS) | ecode[4];
+      DPRINTF(("ims set to %02lx at group repeat\n", ims));
+      }
+
+    if (*ecode == OP_KETRMIN)
+      {
+      RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, ims, eptrb, 0, RM8);
+      if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+      ecode = prev;
+      flags = 0;
+      goto TAIL_RECURSE;
+      }
+    else  /* OP_KETRMAX */
+      {
+      RMATCH(eptr, prev, offset_top, md, ims, eptrb, match_cbegroup, RM9);
+      if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+      ecode += 1 + LINK_SIZE;
+      flags = 0;
+      goto TAIL_RECURSE;
+      }
+    /* Control never gets here */
+
+    /* An alternation is the end of a branch; scan along to find the end of the
+    bracketed group and go to there. */
+
+    case OP_ALT:
+    do ecode += GET(ecode,1); while (*ecode == OP_ALT);
+    break;
+
+    /* BRAZERO and BRAMINZERO occur just before a bracket group, indicating
+    that it may occur zero times. It may repeat infinitely, or not at all -
+    i.e. it could be ()* or ()? in the pattern. Brackets with fixed upper
+    repeat limits are compiled as a number of copies, with the optional ones
+    preceded by BRAZERO or BRAMINZERO. */
+
+    case OP_BRAZERO:
+      {
+      next = ecode+1;
+      RMATCH(eptr, next, offset_top, md, ims, eptrb, 0, RM10);
+      if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+      do next += GET(next,1); while (*next == OP_ALT);
+      ecode = next + 1 + LINK_SIZE;
+      }
+    break;
+
+    case OP_BRAMINZERO:
+      {
+      next = ecode+1;
+      do next += GET(next, 1); while (*next == OP_ALT);
+      RMATCH(eptr, next + 1+LINK_SIZE, offset_top, md, ims, eptrb, 0, RM11);
+      if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+      ecode++;
+      }
+    break;
+
+    /* End of a group, repeated or non-repeating. */
+
+    case OP_KET:
+    case OP_KETRMIN:
+    case OP_KETRMAX:
+    prev = ecode - GET(ecode, 1);
+
+    /* If this was a group that remembered the subject start, in order to break
+    infinite repeats of empty string matches, retrieve the subject start from
+    the chain. Otherwise, set it NULL. */
+
+    if (*prev >= OP_SBRA)
+      {
+      saved_eptr = eptrb->epb_saved_eptr;   /* Value at start of group */
+      eptrb = eptrb->epb_prev;              /* Backup to previous group */
+      }
+    else saved_eptr = NULL;
+
+    /* If we are at the end of an assertion group, stop matching and return
+    MATCH_MATCH, but record the current high water mark for use by positive
+    assertions. Do this also for the "once" (atomic) groups. */
+
+    if (*prev == OP_ASSERT || *prev == OP_ASSERT_NOT ||
+        *prev == OP_ASSERTBACK || *prev == OP_ASSERTBACK_NOT ||
+        *prev == OP_ONCE)
+      {
+      md->end_match_ptr = eptr;      /* For ONCE */
+      md->end_offset_top = offset_top;
+      RRETURN(MATCH_MATCH);
+      }
+
+    /* For capturing groups we have to check the group number back at the start
+    and if necessary complete handling an extraction by setting the offsets and
+    bumping the high water mark. Note that whole-pattern recursion is coded as
+    a recurse into group 0, so it won't be picked up here. Instead, we catch it
+    when the OP_END is reached. Other recursion is handled here. */
+
+    if (*prev == OP_CBRA || *prev == OP_SCBRA)
+      {
+      number = GET2(prev, 1+LINK_SIZE);
+      offset = number << 1;
+
+#ifdef DEBUG
+      printf("end bracket %d", number);
+      printf("\n");
+#endif
+
+      md->capture_last = number;
+      if (offset >= md->offset_max) md->offset_overflow = TRUE; else
+        {
+        md->offset_vector[offset] =
+          md->offset_vector[md->offset_end - number];
+        md->offset_vector[offset+1] = eptr - md->start_subject;
+        if (offset_top <= offset) offset_top = offset + 2;
+        }
+
+      /* Handle a recursively called group. Restore the offsets
+      appropriately and continue from after the call. */
+
+      if (md->recursive != NULL && md->recursive->group_num == number)
+        {
+        recursion_info *rec = md->recursive;
+        DPRINTF(("Recursion (%d) succeeded - continuing\n", number));
+        md->recursive = rec->prevrec;
+        mstart = rec->save_start;
+        memcpy(md->offset_vector, rec->offset_save,
+          rec->saved_max * sizeof(int));
+        ecode = rec->after_call;
+        ims = original_ims;
+        break;
+        }
+      }
+
+    /* For both capturing and non-capturing groups, reset the value of the ims
+    flags, in case they got changed during the group. */
+
+    ims = original_ims;
+    DPRINTF(("ims reset to %02lx\n", ims));
+
+    /* For a non-repeating ket, just continue at this level. This also
+    happens for a repeating ket if no characters were matched in the group.
+    This is the forcible breaking of infinite loops as implemented in Perl
+    5.005. If there is an options reset, it will get obeyed in the normal
+    course of events. */
+
+    if (*ecode == OP_KET || eptr == saved_eptr)
+      {
+      ecode += 1 + LINK_SIZE;
+      break;
+      }
+
+    /* The repeating kets try the rest of the pattern or restart from the
+    preceding bracket, in the appropriate order. In the second case, we can use
+    tail recursion to avoid using another stack frame, unless we have an
+    unlimited repeat of a group that can match an empty string. */
+
+    flags = (*prev >= OP_SBRA)? match_cbegroup : 0;
+
+    if (*ecode == OP_KETRMIN)
+      {
+      RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, ims, eptrb, 0, RM12);
+      if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+      if (flags != 0)    /* Could match an empty string */
+        {
+        RMATCH(eptr, prev, offset_top, md, ims, eptrb, flags, RM50);
+        RRETURN(rrc);
+        }
+      ecode = prev;
+      goto TAIL_RECURSE;
+      }
+    else  /* OP_KETRMAX */
+      {
+      RMATCH(eptr, prev, offset_top, md, ims, eptrb, flags, RM13);
+      if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+      ecode += 1 + LINK_SIZE;
+      flags = 0;
+      goto TAIL_RECURSE;
+      }
+    /* Control never gets here */
+
+    /* Start of subject unless notbol, or after internal newline if multiline */
+
+    case OP_CIRC:
+    if (md->notbol && eptr == md->start_subject) RRETURN(MATCH_NOMATCH);
+    if ((ims & PCRE_MULTILINE) != 0)
+      {
+      if (eptr != md->start_subject &&
+          (eptr == md->end_subject || !WAS_NEWLINE(eptr)))
+        RRETURN(MATCH_NOMATCH);
+      ecode++;
+      break;
+      }
+    /* ... else fall through */
+
+    /* Start of subject assertion */
+
+    case OP_SOD:
+    if (eptr != md->start_subject) RRETURN(MATCH_NOMATCH);
+    ecode++;
+    break;
+
+    /* Start of match assertion */
+
+    case OP_SOM:
+    if (eptr != md->start_subject + md->start_offset) RRETURN(MATCH_NOMATCH);
+    ecode++;
+    break;
+
+    /* Reset the start of match point */
+
+    case OP_SET_SOM:
+    mstart = eptr;
+    ecode++;
+    break;
+
+    /* Assert before internal newline if multiline, or before a terminating
+    newline unless endonly is set, else end of subject unless noteol is set. */
+
+    case OP_DOLL:
+    if ((ims & PCRE_MULTILINE) != 0)
+      {
+      if (eptr < md->end_subject)
+        { if (!IS_NEWLINE(eptr)) RRETURN(MATCH_NOMATCH); }
+      else
+        { if (md->noteol) RRETURN(MATCH_NOMATCH); }
+      ecode++;
+      break;
+      }
+    else
+      {
+      if (md->noteol) RRETURN(MATCH_NOMATCH);
+      if (!md->endonly)
+        {
+        if (eptr != md->end_subject &&
+            (!IS_NEWLINE(eptr) || eptr != md->end_subject - md->nllen))
+          RRETURN(MATCH_NOMATCH);
+        ecode++;
+        break;
+        }
+      }
+    /* ... else fall through for endonly */
+
+    /* End of subject assertion (\z) */
+
+    case OP_EOD:
+    if (eptr < md->end_subject) RRETURN(MATCH_NOMATCH);
+    ecode++;
+    break;
+
+    /* End of subject or ending \n assertion (\Z) */
+
+    case OP_EODN:
+    if (eptr != md->end_subject &&
+        (!IS_NEWLINE(eptr) || eptr != md->end_subject - md->nllen))
+      RRETURN(MATCH_NOMATCH);
+    ecode++;
+    break;
+
+    /* Word boundary assertions */
+
+    case OP_NOT_WORD_BOUNDARY:
+    case OP_WORD_BOUNDARY:
+      {
+
+      /* Find out if the previous and current characters are "word" characters.
+      It takes a bit more work in UTF-8 mode. Characters > 255 are assumed to
+      be "non-word" characters. */
+
+#ifdef SUPPORT_UTF8
+      if (utf8)
+        {
+        if (eptr == md->start_subject) prev_is_word = FALSE; else
+          {
+          const uschar *lastptr = eptr - 1;
+          while((*lastptr & 0xc0) == 0x80) lastptr--;
+          GETCHAR(c, lastptr);
+          prev_is_word = c < 256 && (md->ctypes[c] & ctype_word) != 0;
+          }
+        if (eptr >= md->end_subject) cur_is_word = FALSE; else
+          {
+          GETCHAR(c, eptr);
+          cur_is_word = c < 256 && (md->ctypes[c] & ctype_word) != 0;
+          }
+        }
+      else
+#endif
+
+      /* More streamlined when not in UTF-8 mode */
+
+        {
+        prev_is_word = (eptr != md->start_subject) &&
+          ((md->ctypes[eptr[-1]] & ctype_word) != 0);
+        cur_is_word = (eptr < md->end_subject) &&
+          ((md->ctypes[*eptr] & ctype_word) != 0);
+        }
+
+      /* Now see if the situation is what we want */
+
+      if ((*ecode++ == OP_WORD_BOUNDARY)?
+           cur_is_word == prev_is_word : cur_is_word != prev_is_word)
+        RRETURN(MATCH_NOMATCH);
+      }
+    break;
+
+    /* Match a single character type; inline for speed */
+
+    case OP_ANY:
+    if ((ims & PCRE_DOTALL) == 0)
+      {
+      if (IS_NEWLINE(eptr)) RRETURN(MATCH_NOMATCH);
+      }
+    if (eptr++ >= md->end_subject) RRETURN(MATCH_NOMATCH);
+    if (utf8)
+      while (eptr < md->end_subject && (*eptr & 0xc0) == 0x80) eptr++;
+    ecode++;
+    break;
+
+    /* Match a single byte, even in UTF-8 mode. This opcode really does match
+    any byte, even newline, independent of the setting of PCRE_DOTALL. */
+
+    case OP_ANYBYTE:
+    if (eptr++ >= md->end_subject) RRETURN(MATCH_NOMATCH);
+    ecode++;
+    break;
+
+    case OP_NOT_DIGIT:
+    if (eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
+    GETCHARINCTEST(c, eptr);
+    if (
+#ifdef SUPPORT_UTF8
+       c < 256 &&
+#endif
+       (md->ctypes[c] & ctype_digit) != 0
+       )
+      RRETURN(MATCH_NOMATCH);
+    ecode++;
+    break;
+
+    case OP_DIGIT:
+    if (eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
+    GETCHARINCTEST(c, eptr);
+    if (
+#ifdef SUPPORT_UTF8
+       c >= 256 ||
+#endif
+       (md->ctypes[c] & ctype_digit) == 0
+       )
+      RRETURN(MATCH_NOMATCH);
+    ecode++;
+    break;
+
+    case OP_NOT_WHITESPACE:
+    if (eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
+    GETCHARINCTEST(c, eptr);
+    if (
+#ifdef SUPPORT_UTF8
+       c < 256 &&
+#endif
+       (md->ctypes[c] & ctype_space) != 0
+       )
+      RRETURN(MATCH_NOMATCH);
+    ecode++;
+    break;
+
+    case OP_WHITESPACE:
+    if (eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
+    GETCHARINCTEST(c, eptr);
+    if (
+#ifdef SUPPORT_UTF8
+       c >= 256 ||
+#endif
+       (md->ctypes[c] & ctype_space) == 0
+       )
+      RRETURN(MATCH_NOMATCH);
+    ecode++;
+    break;
+
+    case OP_NOT_WORDCHAR:
+    if (eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
+    GETCHARINCTEST(c, eptr);
+    if (
+#ifdef SUPPORT_UTF8
+       c < 256 &&
+#endif
+       (md->ctypes[c] & ctype_word) != 0
+       )
+      RRETURN(MATCH_NOMATCH);
+    ecode++;
+    break;
+
+    case OP_WORDCHAR:
+    if (eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
+    GETCHARINCTEST(c, eptr);
+    if (
+#ifdef SUPPORT_UTF8
+       c >= 256 ||
+#endif
+       (md->ctypes[c] & ctype_word) == 0
+       )
+      RRETURN(MATCH_NOMATCH);
+    ecode++;
+    break;
+
+    case OP_ANYNL:
+    if (eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
+    GETCHARINCTEST(c, eptr);
+    switch(c)
+      {
+      default: RRETURN(MATCH_NOMATCH);
+      case 0x000d:
+      if (eptr < md->end_subject && *eptr == 0x0a) eptr++;
+      break;
+
+      case 0x000a:
+      break;
+
+      case 0x000b:
+      case 0x000c:
+      case 0x0085:
+      case 0x2028:
+      case 0x2029:
+      if (md->bsr_anycrlf) RRETURN(MATCH_NOMATCH);
+      break;
+      }
+    ecode++;
+    break;
+
+    case OP_NOT_HSPACE:
+    if (eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
+    GETCHARINCTEST(c, eptr);
+    switch(c)
+      {
+      default: break;
+      case 0x09:      /* HT */
+      case 0x20:      /* SPACE */
+      case 0xa0:      /* NBSP */
+      case 0x1680:    /* OGHAM SPACE MARK */
+      case 0x180e:    /* MONGOLIAN VOWEL SEPARATOR */
+      case 0x2000:    /* EN QUAD */
+      case 0x2001:    /* EM QUAD */
+      case 0x2002:    /* EN SPACE */
+      case 0x2003:    /* EM SPACE */
+      case 0x2004:    /* THREE-PER-EM SPACE */
+      case 0x2005:    /* FOUR-PER-EM SPACE */
+      case 0x2006:    /* SIX-PER-EM SPACE */
+      case 0x2007:    /* FIGURE SPACE */
+      case 0x2008:    /* PUNCTUATION SPACE */
+      case 0x2009:    /* THIN SPACE */
+      case 0x200A:    /* HAIR SPACE */
+      case 0x202f:    /* NARROW NO-BREAK SPACE */
+      case 0x205f:    /* MEDIUM MATHEMATICAL SPACE */
+      case 0x3000:    /* IDEOGRAPHIC SPACE */
+      RRETURN(MATCH_NOMATCH);
+      }
+    ecode++;
+    break;
+
+    case OP_HSPACE:
+    if (eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
+    GETCHARINCTEST(c, eptr);
+    switch(c)
+      {
+      default: RRETURN(MATCH_NOMATCH);
+      case 0x09:      /* HT */
+      case 0x20:      /* SPACE */
+      case 0xa0:      /* NBSP */
+      case 0x1680:    /* OGHAM SPACE MARK */
+      case 0x180e:    /* MONGOLIAN VOWEL SEPARATOR */
+      case 0x2000:    /* EN QUAD */
+      case 0x2001:    /* EM QUAD */
+      case 0x2002:    /* EN SPACE */
+      case 0x2003:    /* EM SPACE */
+      case 0x2004:    /* THREE-PER-EM SPACE */
+      case 0x2005:    /* FOUR-PER-EM SPACE */
+      case 0x2006:    /* SIX-PER-EM SPACE */
+      case 0x2007:    /* FIGURE SPACE */
+      case 0x2008:    /* PUNCTUATION SPACE */
+      case 0x2009:    /* THIN SPACE */
+      case 0x200A:    /* HAIR SPACE */
+      case 0x202f:    /* NARROW NO-BREAK SPACE */
+      case 0x205f:    /* MEDIUM MATHEMATICAL SPACE */
+      case 0x3000:    /* IDEOGRAPHIC SPACE */
+      break;
+      }
+    ecode++;
+    break;
+
+    case OP_NOT_VSPACE:
+    if (eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
+    GETCHARINCTEST(c, eptr);
+    switch(c)
+      {
+      default: break;
+      case 0x0a:      /* LF */
+      case 0x0b:      /* VT */
+      case 0x0c:      /* FF */
+      case 0x0d:      /* CR */
+      case 0x85:      /* NEL */
+      case 0x2028:    /* LINE SEPARATOR */
+      case 0x2029:    /* PARAGRAPH SEPARATOR */
+      RRETURN(MATCH_NOMATCH);
+      }
+    ecode++;
+    break;
+
+    case OP_VSPACE:
+    if (eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
+    GETCHARINCTEST(c, eptr);
+    switch(c)
+      {
+      default: RRETURN(MATCH_NOMATCH);
+      case 0x0a:      /* LF */
+      case 0x0b:      /* VT */
+      case 0x0c:      /* FF */
+      case 0x0d:      /* CR */
+      case 0x85:      /* NEL */
+      case 0x2028:    /* LINE SEPARATOR */
+      case 0x2029:    /* PARAGRAPH SEPARATOR */
+      break;
+      }
+    ecode++;
+    break;
+
+#ifdef SUPPORT_UCP
+    /* Check the next character by Unicode property. We will get here only
+    if the support is in the binary; otherwise a compile-time error occurs. */
+
+    case OP_PROP:
+    case OP_NOTPROP:
+    if (eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
+    GETCHARINCTEST(c, eptr);
+      {
+      int chartype, script;
+      int category = _pcre_ucp_findprop(c, &chartype, &script);
+
+      switch(ecode[1])
+        {
+        case PT_ANY:
+        if (op == OP_NOTPROP) RRETURN(MATCH_NOMATCH);
+        break;
+
+        case PT_LAMP:
+        if ((chartype == ucp_Lu ||
+             chartype == ucp_Ll ||
+             chartype == ucp_Lt) == (op == OP_NOTPROP))
+          RRETURN(MATCH_NOMATCH);
+         break;
+
+        case PT_GC:
+        if ((ecode[2] != category) == (op == OP_PROP))
+          RRETURN(MATCH_NOMATCH);
+        break;
+
+        case PT_PC:
+        if ((ecode[2] != chartype) == (op == OP_PROP))
+          RRETURN(MATCH_NOMATCH);
+        break;
+
+        case PT_SC:
+        if ((ecode[2] != script) == (op == OP_PROP))
+          RRETURN(MATCH_NOMATCH);
+        break;
+
+        default:
+        RRETURN(PCRE_ERROR_INTERNAL);
+        }
+
+      ecode += 3;
+      }
+    break;
+
+    /* Match an extended Unicode sequence. We will get here only if the support
+    is in the binary; otherwise a compile-time error occurs. */
+
+    case OP_EXTUNI:
+    if (eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
+    GETCHARINCTEST(c, eptr);
+      {
+      int chartype, script;
+      int category = _pcre_ucp_findprop(c, &chartype, &script);
+      if (category == ucp_M) RRETURN(MATCH_NOMATCH);
+      while (eptr < md->end_subject)
+        {
+        int len = 1;
+        if (!utf8) c = *eptr; else
+          {
+          GETCHARLEN(c, eptr, len);
+          }
+        category = _pcre_ucp_findprop(c, &chartype, &script);
+        if (category != ucp_M) break;
+        eptr += len;
+        }
+      }
+    ecode++;
+    break;
+#endif
+
+
+    /* Match a back reference, possibly repeatedly. Look past the end of the
+    item to see if there is repeat information following. The code is similar
+    to that for character classes, but repeated for efficiency. Then obey
+    similar code to character type repeats - written out again for speed.
+    However, if the referenced string is the empty string, always treat
+    it as matched, any number of times (otherwise there could be infinite
+    loops). */
+
+    case OP_REF:
+      {
+      offset = GET2(ecode, 1) << 1;               /* Doubled ref number */
+      ecode += 3;                                 /* Advance past item */
+
+      /* If the reference is unset, set the length to be longer than the amount
+      of subject left; this ensures that every attempt at a match fails. We
+      can't just fail here, because of the possibility of quantifiers with zero
+      minima. */
+
+      length = (offset >= offset_top || md->offset_vector[offset] < 0)?
+        md->end_subject - eptr + 1 :
+        md->offset_vector[offset+1] - md->offset_vector[offset];
+
+      /* Set up for repetition, or handle the non-repeated case */
+
+      switch (*ecode)
+        {
+        case OP_CRSTAR:
+        case OP_CRMINSTAR:
+        case OP_CRPLUS:
+        case OP_CRMINPLUS:
+        case OP_CRQUERY:
+        case OP_CRMINQUERY:
+        c = *ecode++ - OP_CRSTAR;
+        minimize = (c & 1) != 0;
+        min = rep_min[c];                 /* Pick up values from tables; */
+        max = rep_max[c];                 /* zero for max => infinity */
+        if (max == 0) max = INT_MAX;
+        break;
+
+        case OP_CRRANGE:
+        case OP_CRMINRANGE:
+        minimize = (*ecode == OP_CRMINRANGE);
+        min = GET2(ecode, 1);
+        max = GET2(ecode, 3);
+        if (max == 0) max = INT_MAX;
+        ecode += 5;
+        break;
+
+        default:               /* No repeat follows */
+        if (!match_ref(offset, eptr, length, md, ims)) RRETURN(MATCH_NOMATCH);
+        eptr += length;
+        continue;              /* With the main loop */
+        }
+
+      /* If the length of the reference is zero, just continue with the
+      main loop. */
+
+      if (length == 0) continue;
+
+      /* First, ensure the minimum number of matches are present. We get back
+      the length of the reference string explicitly rather than passing the
+      address of eptr, so that eptr can be a register variable. */
+
+      for (i = 1; i <= min; i++)
+        {
+        if (!match_ref(offset, eptr, length, md, ims)) RRETURN(MATCH_NOMATCH);
+        eptr += length;
+        }
+
+      /* If min = max, continue at the same level without recursion.
+      They are not both allowed to be zero. */
+
+      if (min == max) continue;
+
+      /* If minimizing, keep trying and advancing the pointer */
+
+      if (minimize)
+        {
+        for (fi = min;; fi++)
+          {
+          RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM14);
+          if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+          if (fi >= max || !match_ref(offset, eptr, length, md, ims))
+            RRETURN(MATCH_NOMATCH);
+          eptr += length;
+          }
+        /* Control never gets here */
+        }
+
+      /* If maximizing, find the longest string and work backwards */
+
+      else
+        {
+        pp = eptr;
+        for (i = min; i < max; i++)
+          {
+          if (!match_ref(offset, eptr, length, md, ims)) break;
+          eptr += length;
+          }
+        while (eptr >= pp)
+          {
+          RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM15);
+          if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+          eptr -= length;
+          }
+        RRETURN(MATCH_NOMATCH);
+        }
+      }
+    /* Control never gets here */
+
+
+
+    /* Match a bit-mapped character class, possibly repeatedly. This op code is
+    used when all the characters in the class have values in the range 0-255,
+    and either the matching is caseful, or the characters are in the range
+    0-127 when UTF-8 processing is enabled. The only difference between
+    OP_CLASS and OP_NCLASS occurs when a data character outside the range is
+    encountered.
+
+    First, look past the end of the item to see if there is repeat information
+    following. Then obey similar code to character type repeats - written out
+    again for speed. */
+
+    case OP_NCLASS:
+    case OP_CLASS:
+      {
+      data = ecode + 1;                /* Save for matching */
+      ecode += 33;                     /* Advance past the item */
+
+      switch (*ecode)
+        {
+        case OP_CRSTAR:
+        case OP_CRMINSTAR:
+        case OP_CRPLUS:
+        case OP_CRMINPLUS:
+        case OP_CRQUERY:
+        case OP_CRMINQUERY:
+        c = *ecode++ - OP_CRSTAR;
+        minimize = (c & 1) != 0;
+        min = rep_min[c];                 /* Pick up values from tables; */
+        max = rep_max[c];                 /* zero for max => infinity */
+        if (max == 0) max = INT_MAX;
+        break;
+
+        case OP_CRRANGE:
+        case OP_CRMINRANGE:
+        minimize = (*ecode == OP_CRMINRANGE);
+        min = GET2(ecode, 1);
+        max = GET2(ecode, 3);
+        if (max == 0) max = INT_MAX;
+        ecode += 5;
+        break;
+
+        default:               /* No repeat follows */
+        min = max = 1;
+        break;
+        }
+
+      /* First, ensure the minimum number of matches are present. */
+
+#ifdef SUPPORT_UTF8
+      /* UTF-8 mode */
+      if (utf8)
+        {
+        for (i = 1; i <= min; i++)
+          {
+          if (eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
+          GETCHARINC(c, eptr);
+          if (c > 255)
+            {
+            if (op == OP_CLASS) RRETURN(MATCH_NOMATCH);
+            }
+          else
+            {
+            if ((data[c/8] & (1 << (c&7))) == 0) RRETURN(MATCH_NOMATCH);
+            }
+          }
+        }
+      else
+#endif
+      /* Not UTF-8 mode */
+        {
+        for (i = 1; i <= min; i++)
+          {
+          if (eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
+          c = *eptr++;
+          if ((data[c/8] & (1 << (c&7))) == 0) RRETURN(MATCH_NOMATCH);
+          }
+        }
+
+      /* If max == min we can continue with the main loop without the
+      need to recurse. */
+
+      if (min == max) continue;
+
+      /* If minimizing, keep testing the rest of the expression and advancing
+      the pointer while it matches the class. */
+
+      if (minimize)
+        {
+#ifdef SUPPORT_UTF8
+        /* UTF-8 mode */
+        if (utf8)
+          {
+          for (fi = min;; fi++)
+            {
+            RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM16);
+            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+            if (fi >= max || eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
+            GETCHARINC(c, eptr);
+            if (c > 255)
+              {
+              if (op == OP_CLASS) RRETURN(MATCH_NOMATCH);
+              }
+            else
+              {
+              if ((data[c/8] & (1 << (c&7))) == 0) RRETURN(MATCH_NOMATCH);
+              }
+            }
+          }
+        else
+#endif
+        /* Not UTF-8 mode */
+          {
+          for (fi = min;; fi++)
+            {
+            RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM17);
+            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+            if (fi >= max || eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
+            c = *eptr++;
+            if ((data[c/8] & (1 << (c&7))) == 0) RRETURN(MATCH_NOMATCH);
+            }
+          }
+        /* Control never gets here */
+        }
+
+      /* If maximizing, find the longest possible run, then work backwards. */
+
+      else
+        {
+        pp = eptr;
+
+#ifdef SUPPORT_UTF8
+        /* UTF-8 mode */
+        if (utf8)
+          {
+          for (i = min; i < max; i++)
+            {
+            int len = 1;
+            if (eptr >= md->end_subject) break;
+            GETCHARLEN(c, eptr, len);
+            if (c > 255)
+              {
+              if (op == OP_CLASS) break;
+              }
+            else
+              {
+              if ((data[c/8] & (1 << (c&7))) == 0) break;
+              }
+            eptr += len;
+            }
+          for (;;)
+            {
+            RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM18);
+            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+            if (eptr-- == pp) break;        /* Stop if tried at original pos */
+            BACKCHAR(eptr);
+            }
+          }
+        else
+#endif
+          /* Not UTF-8 mode */
+          {
+          for (i = min; i < max; i++)
+            {
+            if (eptr >= md->end_subject) break;
+            c = *eptr;
+            if ((data[c/8] & (1 << (c&7))) == 0) break;
+            eptr++;
+            }
+          while (eptr >= pp)
+            {
+            RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM19);
+            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+            eptr--;
+            }
+          }
+
+        RRETURN(MATCH_NOMATCH);
+        }
+      }
+    /* Control never gets here */
+
+
+    /* Match an extended character class. This opcode is encountered only
+    in UTF-8 mode, because that's the only time it is compiled. */
+
+#ifdef SUPPORT_UTF8
+    case OP_XCLASS:
+      {
+      data = ecode + 1 + LINK_SIZE;                /* Save for matching */
+      ecode += GET(ecode, 1);                      /* Advance past the item */
+
+      switch (*ecode)
+        {
+        case OP_CRSTAR:
+        case OP_CRMINSTAR:
+        case OP_CRPLUS:
+        case OP_CRMINPLUS:
+        case OP_CRQUERY:
+        case OP_CRMINQUERY:
+        c = *ecode++ - OP_CRSTAR;
+        minimize = (c & 1) != 0;
+        min = rep_min[c];                 /* Pick up values from tables; */
+        max = rep_max[c];                 /* zero for max => infinity */
+        if (max == 0) max = INT_MAX;
+        break;
+
+        case OP_CRRANGE:
+        case OP_CRMINRANGE:
+        minimize = (*ecode == OP_CRMINRANGE);
+        min = GET2(ecode, 1);
+        max = GET2(ecode, 3);
+        if (max == 0) max = INT_MAX;
+        ecode += 5;
+        break;
+
+        default:               /* No repeat follows */
+        min = max = 1;
+        break;
+        }
+
+      /* First, ensure the minimum number of matches are present. */
+
+      for (i = 1; i <= min; i++)
+        {
+        if (eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
+        GETCHARINC(c, eptr);
+        if (!_pcre_xclass(c, data)) RRETURN(MATCH_NOMATCH);
+        }
+
+      /* If max == min we can continue with the main loop without the
+      need to recurse. */
+
+      if (min == max) continue;
+
+      /* If minimizing, keep testing the rest of the expression and advancing
+      the pointer while it matches the class. */
+
+      if (minimize)
+        {
+        for (fi = min;; fi++)
+          {
+          RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM20);
+          if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+          if (fi >= max || eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
+          GETCHARINC(c, eptr);
+          if (!_pcre_xclass(c, data)) RRETURN(MATCH_NOMATCH);
+          }
+        /* Control never gets here */
+        }
+
+      /* If maximizing, find the longest possible run, then work backwards. */
+
+      else
+        {
+        pp = eptr;
+        for (i = min; i < max; i++)
+          {
+          int len = 1;
+          if (eptr >= md->end_subject) break;
+          GETCHARLEN(c, eptr, len);
+          if (!_pcre_xclass(c, data)) break;
+          eptr += len;
+          }
+        for(;;)
+          {
+          RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM21);
+          if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+          if (eptr-- == pp) break;        /* Stop if tried at original pos */
+          if (utf8) BACKCHAR(eptr);
+          }
+        RRETURN(MATCH_NOMATCH);
+        }
+
+      /* Control never gets here */
+      }
+#endif    /* End of XCLASS */
+
+    /* Match a single character, casefully */
+
+    case OP_CHAR:
+#ifdef SUPPORT_UTF8
+    if (utf8)
+      {
+      length = 1;
+      ecode++;
+      GETCHARLEN(fc, ecode, length);
+      if (length > md->end_subject - eptr) RRETURN(MATCH_NOMATCH);
+      while (length-- > 0) if (*ecode++ != *eptr++) RRETURN(MATCH_NOMATCH);
+      }
+    else
+#endif
+
+    /* Non-UTF-8 mode */
+      {
+      if (md->end_subject - eptr < 1) RRETURN(MATCH_NOMATCH);
+      if (ecode[1] != *eptr++) RRETURN(MATCH_NOMATCH);
+      ecode += 2;
+      }
+    break;
+
+    /* Match a single character, caselessly */
+
+    case OP_CHARNC:
+#ifdef SUPPORT_UTF8
+    if (utf8)
+      {
+      length = 1;
+      ecode++;
+      GETCHARLEN(fc, ecode, length);
+
+      if (length > md->end_subject - eptr) RRETURN(MATCH_NOMATCH);
+
+      /* If the pattern character's value is < 128, we have only one byte, and
+      can use the fast lookup table. */
+
+      if (fc < 128)
+        {
+        if (md->lcc[*ecode++] != md->lcc[*eptr++]) RRETURN(MATCH_NOMATCH);
+        }
+
+      /* Otherwise we must pick up the subject character */
+
+      else
+        {
+        unsigned int dc;
+        GETCHARINC(dc, eptr);
+        ecode += length;
+
+        /* If we have Unicode property support, we can use it to test the other
+        case of the character, if there is one. */
+
+        if (fc != dc)
+          {
+#ifdef SUPPORT_UCP
+          if (dc != _pcre_ucp_othercase(fc))
+#endif
+            RRETURN(MATCH_NOMATCH);
+          }
+        }
+      }
+    else
+#endif   /* SUPPORT_UTF8 */
+
+    /* Non-UTF-8 mode */
+      {
+      if (md->end_subject - eptr < 1) RRETURN(MATCH_NOMATCH);
+      if (md->lcc[ecode[1]] != md->lcc[*eptr++]) RRETURN(MATCH_NOMATCH);
+      ecode += 2;
+      }
+    break;
+
+    /* Match a single character repeatedly. */
+
+    case OP_EXACT:
+    min = max = GET2(ecode, 1);
+    ecode += 3;
+    goto REPEATCHAR;
+
+    case OP_POSUPTO:
+    possessive = TRUE;
+    /* Fall through */
+
+    case OP_UPTO:
+    case OP_MINUPTO:
+    min = 0;
+    max = GET2(ecode, 1);
+    minimize = *ecode == OP_MINUPTO;
+    ecode += 3;
+    goto REPEATCHAR;
+
+    case OP_POSSTAR:
+    possessive = TRUE;
+    min = 0;
+    max = INT_MAX;
+    ecode++;
+    goto REPEATCHAR;
+
+    case OP_POSPLUS:
+    possessive = TRUE;
+    min = 1;
+    max = INT_MAX;
+    ecode++;
+    goto REPEATCHAR;
+
+    case OP_POSQUERY:
+    possessive = TRUE;
+    min = 0;
+    max = 1;
+    ecode++;
+    goto REPEATCHAR;
+
+    case OP_STAR:
+    case OP_MINSTAR:
+    case OP_PLUS:
+    case OP_MINPLUS:
+    case OP_QUERY:
+    case OP_MINQUERY:
+    c = *ecode++ - OP_STAR;
+    minimize = (c & 1) != 0;
+    min = rep_min[c];                 /* Pick up values from tables; */
+    max = rep_max[c];                 /* zero for max => infinity */
+    if (max == 0) max = INT_MAX;
+
+    /* Common code for all repeated single-character matches. We can give
+    up quickly if there are fewer than the minimum number of characters left in
+    the subject. */
+
+    REPEATCHAR:
+#ifdef SUPPORT_UTF8
+    if (utf8)
+      {
+      length = 1;
+      charptr = ecode;
+      GETCHARLEN(fc, ecode, length);
+      if (min * length > md->end_subject - eptr) RRETURN(MATCH_NOMATCH);
+      ecode += length;
+
+      /* Handle multibyte character matching specially here. There is
+      support for caseless matching if UCP support is present. */
+
+      if (length > 1)
+        {
+#ifdef SUPPORT_UCP
+        unsigned int othercase;
+        if ((ims & PCRE_CASELESS) != 0 &&
+            (othercase = _pcre_ucp_othercase(fc)) != NOTACHAR)
+          oclength = _pcre_ord2utf8(othercase, occhars);
+        else oclength = 0;
+#endif  /* SUPPORT_UCP */
+
+        for (i = 1; i <= min; i++)
+          {
+          if (memcmp(eptr, charptr, length) == 0) eptr += length;
+#ifdef SUPPORT_UCP
+          /* Need braces because of following else */
+          else if (oclength == 0) { RRETURN(MATCH_NOMATCH); }
+          else
+            {
+            if (memcmp(eptr, occhars, oclength) != 0) RRETURN(MATCH_NOMATCH);
+            eptr += oclength;
+            }
+#else   /* without SUPPORT_UCP */
+          else { RRETURN(MATCH_NOMATCH); }
+#endif  /* SUPPORT_UCP */
+          }
+
+        if (min == max) continue;
+
+        if (minimize)
+          {
+          for (fi = min;; fi++)
+            {
+            RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM22);
+            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+            if (fi >= max || eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
+            if (memcmp(eptr, charptr, length) == 0) eptr += length;
+#ifdef SUPPORT_UCP
+            /* Need braces because of following else */
+            else if (oclength == 0) { RRETURN(MATCH_NOMATCH); }
+            else
+              {
+              if (memcmp(eptr, occhars, oclength) != 0) RRETURN(MATCH_NOMATCH);
+              eptr += oclength;
+              }
+#else   /* without SUPPORT_UCP */
+            else { RRETURN (MATCH_NOMATCH); }
+#endif  /* SUPPORT_UCP */
+            }
+          /* Control never gets here */
+          }
+
+        else  /* Maximize */
+          {
+          pp = eptr;
+          for (i = min; i < max; i++)
+            {
+            if (eptr > md->end_subject - length) break;
+            if (memcmp(eptr, charptr, length) == 0) eptr += length;
+#ifdef SUPPORT_UCP
+            else if (oclength == 0) break;
+            else
+              {
+              if (memcmp(eptr, occhars, oclength) != 0) break;
+              eptr += oclength;
+              }
+#else   /* without SUPPORT_UCP */
+            else break;
+#endif  /* SUPPORT_UCP */
+            }
+
+          if (possessive) continue;
+          for(;;)
+           {
+           RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM23);
+           if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+           if (eptr == pp) RRETURN(MATCH_NOMATCH);
+#ifdef SUPPORT_UCP
+           eptr--;
+           BACKCHAR(eptr);
+#else   /* without SUPPORT_UCP */
+           eptr -= length;
+#endif  /* SUPPORT_UCP */
+           }
+          }
+        /* Control never gets here */
+        }
+
+      /* If the length of a UTF-8 character is 1, we fall through here, and
+      obey the code as for non-UTF-8 characters below, though in this case the
+      value of fc will always be < 128. */
+      }
+    else
+#endif  /* SUPPORT_UTF8 */
+
+    /* When not in UTF-8 mode, load a single-byte character. */
+      {
+      if (min > md->end_subject - eptr) RRETURN(MATCH_NOMATCH);
+      fc = *ecode++;
+      }
+
+    /* The value of fc at this point is always less than 256, though we may or
+    may not be in UTF-8 mode. The code is duplicated for the caseless and
+    caseful cases, for speed, since matching characters is likely to be quite
+    common. First, ensure the minimum number of matches are present. If min =
+    max, continue at the same level without recursing. Otherwise, if
+    minimizing, keep trying the rest of the expression and advancing one
+    matching character if failing, up to the maximum. Alternatively, if
+    maximizing, find the maximum number of characters and work backwards. */
+
+    DPRINTF(("matching %c{%d,%d} against subject %.*s\n", fc, min, max,
+      max, eptr));
+
+    if ((ims & PCRE_CASELESS) != 0)
+      {
+      fc = md->lcc[fc];
+      for (i = 1; i <= min; i++)
+        if (fc != md->lcc[*eptr++]) RRETURN(MATCH_NOMATCH);
+      if (min == max) continue;
+      if (minimize)
+        {
+        for (fi = min;; fi++)
+          {
+          RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM24);
+          if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+          if (fi >= max || eptr >= md->end_subject ||
+              fc != md->lcc[*eptr++])
+            RRETURN(MATCH_NOMATCH);
+          }
+        /* Control never gets here */
+        }
+      else  /* Maximize */
+        {
+        pp = eptr;
+        for (i = min; i < max; i++)
+          {
+          if (eptr >= md->end_subject || fc != md->lcc[*eptr]) break;
+          eptr++;
+          }
+        if (possessive) continue;
+        while (eptr >= pp)
+          {
+          RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM25);
+          eptr--;
+          if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+          }
+        RRETURN(MATCH_NOMATCH);
+        }
+      /* Control never gets here */
+      }
+
+    /* Caseful comparisons (includes all multi-byte characters) */
+
+    else
+      {
+      for (i = 1; i <= min; i++) if (fc != *eptr++) RRETURN(MATCH_NOMATCH);
+      if (min == max) continue;
+      if (minimize)
+        {
+        for (fi = min;; fi++)
+          {
+          RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM26);
+          if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+          if (fi >= max || eptr >= md->end_subject || fc != *eptr++)
+            RRETURN(MATCH_NOMATCH);
+          }
+        /* Control never gets here */
+        }
+      else  /* Maximize */
+        {
+        pp = eptr;
+        for (i = min; i < max; i++)
+          {
+          if (eptr >= md->end_subject || fc != *eptr) break;
+          eptr++;
+          }
+        if (possessive) continue;
+        while (eptr >= pp)
+          {
+          RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM27);
+          eptr--;
+          if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+          }
+        RRETURN(MATCH_NOMATCH);
+        }
+      }
+    /* Control never gets here */
+
+    /* Match a negated single one-byte character. The character we are
+    checking can be multibyte. */
+
+    case OP_NOT:
+    if (eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
+    ecode++;
+    GETCHARINCTEST(c, eptr);
+    if ((ims & PCRE_CASELESS) != 0)
+      {
+#ifdef SUPPORT_UTF8
+      if (c < 256)
+#endif
+      c = md->lcc[c];
+      if (md->lcc[*ecode++] == c) RRETURN(MATCH_NOMATCH);
+      }
+    else
+      {
+      if (*ecode++ == c) RRETURN(MATCH_NOMATCH);
+      }
+    break;
+
+    /* Match a negated single one-byte character repeatedly. This is almost a
+    repeat of the code for a repeated single character, but I haven't found a
+    nice way of commoning these up that doesn't require a test of the
+    positive/negative option for each character match. Maybe that wouldn't add
+    very much to the time taken, but character matching *is* what this is all
+    about... */
+
+    case OP_NOTEXACT:
+    min = max = GET2(ecode, 1);
+    ecode += 3;
+    goto REPEATNOTCHAR;
+
+    case OP_NOTUPTO:
+    case OP_NOTMINUPTO:
+    min = 0;
+    max = GET2(ecode, 1);
+    minimize = *ecode == OP_NOTMINUPTO;
+    ecode += 3;
+    goto REPEATNOTCHAR;
+
+    case OP_NOTPOSSTAR:
+    possessive = TRUE;
+    min = 0;
+    max = INT_MAX;
+    ecode++;
+    goto REPEATNOTCHAR;
+
+    case OP_NOTPOSPLUS:
+    possessive = TRUE;
+    min = 1;
+    max = INT_MAX;
+    ecode++;
+    goto REPEATNOTCHAR;
+
+    case OP_NOTPOSQUERY:
+    possessive = TRUE;
+    min = 0;
+    max = 1;
+    ecode++;
+    goto REPEATNOTCHAR;
+
+    case OP_NOTPOSUPTO:
+    possessive = TRUE;
+    min = 0;
+    max = GET2(ecode, 1);
+    ecode += 3;
+    goto REPEATNOTCHAR;
+
+    case OP_NOTSTAR:
+    case OP_NOTMINSTAR:
+    case OP_NOTPLUS:
+    case OP_NOTMINPLUS:
+    case OP_NOTQUERY:
+    case OP_NOTMINQUERY:
+    c = *ecode++ - OP_NOTSTAR;
+    minimize = (c & 1) != 0;
+    min = rep_min[c];                 /* Pick up values from tables; */
+    max = rep_max[c];                 /* zero for max => infinity */
+    if (max == 0) max = INT_MAX;
+
+    /* Common code for all repeated single-byte matches. We can give up quickly
+    if there are fewer than the minimum number of bytes left in the
+    subject. */
+
+    REPEATNOTCHAR:
+    if (min > md->end_subject - eptr) RRETURN(MATCH_NOMATCH);
+    fc = *ecode++;
+
+    /* The code is duplicated for the caseless and caseful cases, for speed,
+    since matching characters is likely to be quite common. First, ensure the
+    minimum number of matches are present. If min = max, continue at the same
+    level without recursing. Otherwise, if minimizing, keep trying the rest of
+    the expression and advancing one matching character if failing, up to the
+    maximum. Alternatively, if maximizing, find the maximum number of
+    characters and work backwards. */
+
+    DPRINTF(("negative matching %c{%d,%d} against subject %.*s\n", fc, min, max,
+      max, eptr));
+
+    if ((ims & PCRE_CASELESS) != 0)
+      {
+      fc = md->lcc[fc];
+
+#ifdef SUPPORT_UTF8
+      /* UTF-8 mode */
+      if (utf8)
+        {
+        register unsigned int d;
+        for (i = 1; i <= min; i++)
+          {
+          GETCHARINC(d, eptr);
+          if (d < 256) d = md->lcc[d];
+          if (fc == d) RRETURN(MATCH_NOMATCH);
+          }
+        }
+      else
+#endif
+
+      /* Not UTF-8 mode */
+        {
+        for (i = 1; i <= min; i++)
+          if (fc == md->lcc[*eptr++]) RRETURN(MATCH_NOMATCH);
+        }
+
+      if (min == max) continue;
+
+      if (minimize)
+        {
+#ifdef SUPPORT_UTF8
+        /* UTF-8 mode */
+        if (utf8)
+          {
+          register unsigned int d;
+          for (fi = min;; fi++)
+            {
+            RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM28);
+            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+            GETCHARINC(d, eptr);
+            if (d < 256) d = md->lcc[d];
+            if (fi >= max || eptr >= md->end_subject || fc == d)
+              RRETURN(MATCH_NOMATCH);
+            }
+          }
+        else
+#endif
+        /* Not UTF-8 mode */
+          {
+          for (fi = min;; fi++)
+            {
+            RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM29);
+            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+            if (fi >= max || eptr >= md->end_subject || fc == md->lcc[*eptr++])
+              RRETURN(MATCH_NOMATCH);
+            }
+          }
+        /* Control never gets here */
+        }
+
+      /* Maximize case */
+
+      else
+        {
+        pp = eptr;
+
+#ifdef SUPPORT_UTF8
+        /* UTF-8 mode */
+        if (utf8)
+          {
+          register unsigned int d;
+          for (i = min; i < max; i++)
+            {
+            int len = 1;
+            if (eptr >= md->end_subject) break;
+            GETCHARLEN(d, eptr, len);
+            if (d < 256) d = md->lcc[d];
+            if (fc == d) break;
+            eptr += len;
+            }
+        if (possessive) continue;
+        for(;;)
+            {
+            RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM30);
+            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+            if (eptr-- == pp) break;        /* Stop if tried at original pos */
+            BACKCHAR(eptr);
+            }
+          }
+        else
+#endif
+        /* Not UTF-8 mode */
+          {
+          for (i = min; i < max; i++)
+            {
+            if (eptr >= md->end_subject || fc == md->lcc[*eptr]) break;
+            eptr++;
+            }
+          if (possessive) continue;
+          while (eptr >= pp)
+            {
+            RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM31);
+            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+            eptr--;
+            }
+          }
+
+        RRETURN(MATCH_NOMATCH);
+        }
+      /* Control never gets here */
+      }
+
+    /* Caseful comparisons */
+
+    else
+      {
+#ifdef SUPPORT_UTF8
+      /* UTF-8 mode */
+      if (utf8)
+        {
+        register unsigned int d;
+        for (i = 1; i <= min; i++)
+          {
+          GETCHARINC(d, eptr);
+          if (fc == d) RRETURN(MATCH_NOMATCH);
+          }
+        }
+      else
+#endif
+      /* Not UTF-8 mode */
+        {
+        for (i = 1; i <= min; i++)
+          if (fc == *eptr++) RRETURN(MATCH_NOMATCH);
+        }
+
+      if (min == max) continue;
+
+      if (minimize)
+        {
+#ifdef SUPPORT_UTF8
+        /* UTF-8 mode */
+        if (utf8)
+          {
+          register unsigned int d;
+          for (fi = min;; fi++)
+            {
+            RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM32);
+            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+            GETCHARINC(d, eptr);
+            if (fi >= max || eptr >= md->end_subject || fc == d)
+              RRETURN(MATCH_NOMATCH);
+            }
+          }
+        else
+#endif
+        /* Not UTF-8 mode */
+          {
+          for (fi = min;; fi++)
+            {
+            RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM33);
+            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+            if (fi >= max || eptr >= md->end_subject || fc == *eptr++)
+              RRETURN(MATCH_NOMATCH);
+            }
+          }
+        /* Control never gets here */
+        }
+
+      /* Maximize case */
+
+      else
+        {
+        pp = eptr;
+
+#ifdef SUPPORT_UTF8
+        /* UTF-8 mode */
+        if (utf8)
+          {
+          register unsigned int d;
+          for (i = min; i < max; i++)
+            {
+            int len = 1;
+            if (eptr >= md->end_subject) break;
+            GETCHARLEN(d, eptr, len);
+            if (fc == d) break;
+            eptr += len;
+            }
+          if (possessive) continue;
+          for(;;)
+            {
+            RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM34);
+            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+            if (eptr-- == pp) break;        /* Stop if tried at original pos */
+            BACKCHAR(eptr);
+            }
+          }
+        else
+#endif
+        /* Not UTF-8 mode */
+          {
+          for (i = min; i < max; i++)
+            {
+            if (eptr >= md->end_subject || fc == *eptr) break;
+            eptr++;
+            }
+          if (possessive) continue;
+          while (eptr >= pp)
+            {
+            RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM35);
+            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+            eptr--;
+            }
+          }
+
+        RRETURN(MATCH_NOMATCH);
+        }
+      }
+    /* Control never gets here */
+
+    /* Match a single character type repeatedly; several different opcodes
+    share code. This is very similar to the code for single characters, but we
+    repeat it in the interests of efficiency. */
+
+    case OP_TYPEEXACT:
+    min = max = GET2(ecode, 1);
+    minimize = TRUE;
+    ecode += 3;
+    goto REPEATTYPE;
+
+    case OP_TYPEUPTO:
+    case OP_TYPEMINUPTO:
+    min = 0;
+    max = GET2(ecode, 1);
+    minimize = *ecode == OP_TYPEMINUPTO;
+    ecode += 3;
+    goto REPEATTYPE;
+
+    case OP_TYPEPOSSTAR:
+    possessive = TRUE;
+    min = 0;
+    max = INT_MAX;
+    ecode++;
+    goto REPEATTYPE;
+
+    case OP_TYPEPOSPLUS:
+    possessive = TRUE;
+    min = 1;
+    max = INT_MAX;
+    ecode++;
+    goto REPEATTYPE;
+
+    case OP_TYPEPOSQUERY:
+    possessive = TRUE;
+    min = 0;
+    max = 1;
+    ecode++;
+    goto REPEATTYPE;
+
+    case OP_TYPEPOSUPTO:
+    possessive = TRUE;
+    min = 0;
+    max = GET2(ecode, 1);
+    ecode += 3;
+    goto REPEATTYPE;
+
+    case OP_TYPESTAR:
+    case OP_TYPEMINSTAR:
+    case OP_TYPEPLUS:
+    case OP_TYPEMINPLUS:
+    case OP_TYPEQUERY:
+    case OP_TYPEMINQUERY:
+    c = *ecode++ - OP_TYPESTAR;
+    minimize = (c & 1) != 0;
+    min = rep_min[c];                 /* Pick up values from tables; */
+    max = rep_max[c];                 /* zero for max => infinity */
+    if (max == 0) max = INT_MAX;
+
+    /* Common code for all repeated single character type matches. Note that
+    in UTF-8 mode, '.' matches a character of any length, but for the other
+    character types, the valid characters are all one-byte long. */
+
+    REPEATTYPE:
+    ctype = *ecode++;      /* Code for the character type */
+
+#ifdef SUPPORT_UCP
+    if (ctype == OP_PROP || ctype == OP_NOTPROP)
+      {
+      prop_fail_result = ctype == OP_NOTPROP;
+      prop_type = *ecode++;
+      prop_value = *ecode++;
+      }
+    else prop_type = -1;
+#endif
+
+    /* First, ensure the minimum number of matches are present. Use inline
+    code for maximizing the speed, and do the type test once at the start
+    (i.e. keep it out of the loop). Also we can test that there are at least
+    the minimum number of bytes before we start. This isn't as effective in
+    UTF-8 mode, but it does no harm. Separate the UTF-8 code completely as that
+    is tidier. Also separate the UCP code, which can be the same for both UTF-8
+    and single-bytes. */
+
+    if (min > md->end_subject - eptr) RRETURN(MATCH_NOMATCH);
+    if (min > 0)
+      {
+#ifdef SUPPORT_UCP
+      if (prop_type >= 0)
+        {
+        switch(prop_type)
+          {
+          case PT_ANY:
+          if (prop_fail_result) RRETURN(MATCH_NOMATCH);
+          for (i = 1; i <= min; i++)
+            {
+            if (eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
+            GETCHARINCTEST(c, eptr);
+            }
+          break;
+
+          case PT_LAMP:
+          for (i = 1; i <= min; i++)
+            {
+            if (eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
+            GETCHARINCTEST(c, eptr);
+            prop_category = _pcre_ucp_findprop(c, &prop_chartype, &prop_script);
+            if ((prop_chartype == ucp_Lu ||
+                 prop_chartype == ucp_Ll ||
+                 prop_chartype == ucp_Lt) == prop_fail_result)
+              RRETURN(MATCH_NOMATCH);
+            }
+          break;
+
+          case PT_GC:
+          for (i = 1; i <= min; i++)
+            {
+            if (eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
+            GETCHARINCTEST(c, eptr);
+            prop_category = _pcre_ucp_findprop(c, &prop_chartype, &prop_script);
+            if ((prop_category == prop_value) == prop_fail_result)
+              RRETURN(MATCH_NOMATCH);
+            }
+          break;
+
+          case PT_PC:
+          for (i = 1; i <= min; i++)
+            {
+            if (eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
+            GETCHARINCTEST(c, eptr);
+            prop_category = _pcre_ucp_findprop(c, &prop_chartype, &prop_script);
+            if ((prop_chartype == prop_value) == prop_fail_result)
+              RRETURN(MATCH_NOMATCH);
+            }
+          break;
+
+          case PT_SC:
+          for (i = 1; i <= min; i++)
+            {
+            if (eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
+            GETCHARINCTEST(c, eptr);
+            prop_category = _pcre_ucp_findprop(c, &prop_chartype, &prop_script);
+            if ((prop_script == prop_value) == prop_fail_result)
+              RRETURN(MATCH_NOMATCH);
+            }
+          break;
+
+          default:
+          RRETURN(PCRE_ERROR_INTERNAL);
+          }
+        }
+
+      /* Match extended Unicode sequences. We will get here only if the
+      support is in the binary; otherwise a compile-time error occurs. */
+
+      else if (ctype == OP_EXTUNI)
+        {
+        for (i = 1; i <= min; i++)
+          {
+          GETCHARINCTEST(c, eptr);
+          prop_category = _pcre_ucp_findprop(c, &prop_chartype, &prop_script);
+          if (prop_category == ucp_M) RRETURN(MATCH_NOMATCH);
+          while (eptr < md->end_subject)
+            {
+            int len = 1;
+            if (!utf8) c = *eptr; else
+              {
+              GETCHARLEN(c, eptr, len);
+              }
+            prop_category = _pcre_ucp_findprop(c, &prop_chartype, &prop_script);
+            if (prop_category != ucp_M) break;
+            eptr += len;
+            }
+          }
+        }
+
+      else
+#endif     /* SUPPORT_UCP */
+
+/* Handle all other cases when the coding is UTF-8 */
+
+#ifdef SUPPORT_UTF8
+      if (utf8) switch(ctype)
+        {
+        case OP_ANY:
+        for (i = 1; i <= min; i++)
+          {
+          if (eptr >= md->end_subject ||
+               ((ims & PCRE_DOTALL) == 0 && IS_NEWLINE(eptr)))
+            RRETURN(MATCH_NOMATCH);
+          eptr++;
+          while (eptr < md->end_subject && (*eptr & 0xc0) == 0x80) eptr++;
+          }
+        break;
+
+        case OP_ANYBYTE:
+        eptr += min;
+        break;
+
+        case OP_ANYNL:
+        for (i = 1; i <= min; i++)
+          {
+          if (eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
+          GETCHARINC(c, eptr);
+          switch(c)
+            {
+            default: RRETURN(MATCH_NOMATCH);
+            case 0x000d:
+            if (eptr < md->end_subject && *eptr == 0x0a) eptr++;
+            break;
+
+            case 0x000a:
+            break;
+
+            case 0x000b:
+            case 0x000c:
+            case 0x0085:
+            case 0x2028:
+            case 0x2029:
+            if (md->bsr_anycrlf) RRETURN(MATCH_NOMATCH);
+            break;
+            }
+          }
+        break;
+
+        case OP_NOT_HSPACE:
+        for (i = 1; i <= min; i++)
+          {
+          if (eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
+          GETCHARINC(c, eptr);
+          switch(c)
+            {
+            default: break;
+            case 0x09:      /* HT */
+            case 0x20:      /* SPACE */
+            case 0xa0:      /* NBSP */
+            case 0x1680:    /* OGHAM SPACE MARK */
+            case 0x180e:    /* MONGOLIAN VOWEL SEPARATOR */
+            case 0x2000:    /* EN QUAD */
+            case 0x2001:    /* EM QUAD */
+            case 0x2002:    /* EN SPACE */
+            case 0x2003:    /* EM SPACE */
+            case 0x2004:    /* THREE-PER-EM SPACE */
+            case 0x2005:    /* FOUR-PER-EM SPACE */
+            case 0x2006:    /* SIX-PER-EM SPACE */
+            case 0x2007:    /* FIGURE SPACE */
+            case 0x2008:    /* PUNCTUATION SPACE */
+            case 0x2009:    /* THIN SPACE */
+            case 0x200A:    /* HAIR SPACE */
+            case 0x202f:    /* NARROW NO-BREAK SPACE */
+            case 0x205f:    /* MEDIUM MATHEMATICAL SPACE */
+            case 0x3000:    /* IDEOGRAPHIC SPACE */
+            RRETURN(MATCH_NOMATCH);
+            }
+          }
+        break;
+
+        case OP_HSPACE:
+        for (i = 1; i <= min; i++)
+          {
+          if (eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
+          GETCHARINC(c, eptr);
+          switch(c)
+            {
+            default: RRETURN(MATCH_NOMATCH);
+            case 0x09:      /* HT */
+            case 0x20:      /* SPACE */
+            case 0xa0:      /* NBSP */
+            case 0x1680:    /* OGHAM SPACE MARK */
+            case 0x180e:    /* MONGOLIAN VOWEL SEPARATOR */
+            case 0x2000:    /* EN QUAD */
+            case 0x2001:    /* EM QUAD */
+            case 0x2002:    /* EN SPACE */
+            case 0x2003:    /* EM SPACE */
+            case 0x2004:    /* THREE-PER-EM SPACE */
+            case 0x2005:    /* FOUR-PER-EM SPACE */
+            case 0x2006:    /* SIX-PER-EM SPACE */
+            case 0x2007:    /* FIGURE SPACE */
+            case 0x2008:    /* PUNCTUATION SPACE */
+            case 0x2009:    /* THIN SPACE */
+            case 0x200A:    /* HAIR SPACE */
+            case 0x202f:    /* NARROW NO-BREAK SPACE */
+            case 0x205f:    /* MEDIUM MATHEMATICAL SPACE */
+            case 0x3000:    /* IDEOGRAPHIC SPACE */
+            break;
+            }
+          }
+        break;
+
+        case OP_NOT_VSPACE:
+        for (i = 1; i <= min; i++)
+          {
+          if (eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
+          GETCHARINC(c, eptr);
+          switch(c)
+            {
+            default: break;
+            case 0x0a:      /* LF */
+            case 0x0b:      /* VT */
+            case 0x0c:      /* FF */
+            case 0x0d:      /* CR */
+            case 0x85:      /* NEL */
+            case 0x2028:    /* LINE SEPARATOR */
+            case 0x2029:    /* PARAGRAPH SEPARATOR */
+            RRETURN(MATCH_NOMATCH);
+            }
+          }
+        break;
+
+        case OP_VSPACE:
+        for (i = 1; i <= min; i++)
+          {
+          if (eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
+          GETCHARINC(c, eptr);
+          switch(c)
+            {
+            default: RRETURN(MATCH_NOMATCH);
+            case 0x0a:      /* LF */
+            case 0x0b:      /* VT */
+            case 0x0c:      /* FF */
+            case 0x0d:      /* CR */
+            case 0x85:      /* NEL */
+            case 0x2028:    /* LINE SEPARATOR */
+            case 0x2029:    /* PARAGRAPH SEPARATOR */
+            break;
+            }
+          }
+        break;
+
+        case OP_NOT_DIGIT:
+        for (i = 1; i <= min; i++)
+          {
+          if (eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
+          GETCHARINC(c, eptr);
+          if (c < 128 && (md->ctypes[c] & ctype_digit) != 0)
+            RRETURN(MATCH_NOMATCH);
+          }
+        break;
+
+        case OP_DIGIT:
+        for (i = 1; i <= min; i++)
+          {
+          if (eptr >= md->end_subject ||
+             *eptr >= 128 || (md->ctypes[*eptr++] & ctype_digit) == 0)
+            RRETURN(MATCH_NOMATCH);
+          /* No need to skip more bytes - we know it's a 1-byte character */
+          }
+        break;
+
+        case OP_NOT_WHITESPACE:
+        for (i = 1; i <= min; i++)
+          {
+          if (eptr >= md->end_subject ||
+             (*eptr < 128 && (md->ctypes[*eptr] & ctype_space) != 0))
+            RRETURN(MATCH_NOMATCH);
+          while (++eptr < md->end_subject && (*eptr & 0xc0) == 0x80);
+          }
+        break;
+
+        case OP_WHITESPACE:
+        for (i = 1; i <= min; i++)
+          {
+          if (eptr >= md->end_subject ||
+             *eptr >= 128 || (md->ctypes[*eptr++] & ctype_space) == 0)
+            RRETURN(MATCH_NOMATCH);
+          /* No need to skip more bytes - we know it's a 1-byte character */
+          }
+        break;
+
+        case OP_NOT_WORDCHAR:
+        for (i = 1; i <= min; i++)
+          {
+          if (eptr >= md->end_subject ||
+             (*eptr < 128 && (md->ctypes[*eptr] & ctype_word) != 0))
+            RRETURN(MATCH_NOMATCH);
+          while (++eptr < md->end_subject && (*eptr & 0xc0) == 0x80);
+          }
+        break;
+
+        case OP_WORDCHAR:
+        for (i = 1; i <= min; i++)
+          {
+          if (eptr >= md->end_subject ||
+             *eptr >= 128 || (md->ctypes[*eptr++] & ctype_word) == 0)
+            RRETURN(MATCH_NOMATCH);
+          /* No need to skip more bytes - we know it's a 1-byte character */
+          }
+        break;
+
+        default:
+        RRETURN(PCRE_ERROR_INTERNAL);
+        }  /* End switch(ctype) */
+
+      else
+#endif     /* SUPPORT_UTF8 */
+
+      /* Code for the non-UTF-8 case for minimum matching of operators other
+      than OP_PROP and OP_NOTPROP. We can assume that there are the minimum
+      number of bytes present, as this was tested above. */
+
+      switch(ctype)
+        {
+        case OP_ANY:
+        if ((ims & PCRE_DOTALL) == 0)
+          {
+          for (i = 1; i <= min; i++)
+            {
+            if (IS_NEWLINE(eptr)) RRETURN(MATCH_NOMATCH);
+            eptr++;
+            }
+          }
+        else eptr += min;
+        break;
+
+        case OP_ANYBYTE:
+        eptr += min;
+        break;
+
+        /* Because of the CRLF case, we can't assume the minimum number of
+        bytes are present in this case. */
+
+        case OP_ANYNL:
+        for (i = 1; i <= min; i++)
+          {
+          if (eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
+          switch(*eptr++)
+            {
+            default: RRETURN(MATCH_NOMATCH);
+            case 0x000d:
+            if (eptr < md->end_subject && *eptr == 0x0a) eptr++;
+            break;
+            case 0x000a:
+            break;
+
+            case 0x000b:
+            case 0x000c:
+            case 0x0085:
+            if (md->bsr_anycrlf) RRETURN(MATCH_NOMATCH);
+            break;
+            }
+          }
+        break;
+
+        case OP_NOT_HSPACE:
+        for (i = 1; i <= min; i++)
+          {
+          if (eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
+          switch(*eptr++)
+            {
+            default: break;
+            case 0x09:      /* HT */
+            case 0x20:      /* SPACE */
+            case 0xa0:      /* NBSP */
+            RRETURN(MATCH_NOMATCH);
+            }
+          }
+        break;
+
+        case OP_HSPACE:
+        for (i = 1; i <= min; i++)
+          {
+          if (eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
+          switch(*eptr++)
+            {
+            default: RRETURN(MATCH_NOMATCH);
+            case 0x09:      /* HT */
+            case 0x20:      /* SPACE */
+            case 0xa0:      /* NBSP */
+            break;
+            }
+          }
+        break;
+
+        case OP_NOT_VSPACE:
+        for (i = 1; i <= min; i++)
+          {
+          if (eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
+          switch(*eptr++)
+            {
+            default: break;
+            case 0x0a:      /* LF */
+            case 0x0b:      /* VT */
+            case 0x0c:      /* FF */
+            case 0x0d:      /* CR */
+            case 0x85:      /* NEL */
+            RRETURN(MATCH_NOMATCH);
+            }
+          }
+        break;
+
+        case OP_VSPACE:
+        for (i = 1; i <= min; i++)
+          {
+          if (eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
+          switch(*eptr++)
+            {
+            default: RRETURN(MATCH_NOMATCH);
+            case 0x0a:      /* LF */
+            case 0x0b:      /* VT */
+            case 0x0c:      /* FF */
+            case 0x0d:      /* CR */
+            case 0x85:      /* NEL */
+            break;
+            }
+          }
+        break;
+
+        case OP_NOT_DIGIT:
+        for (i = 1; i <= min; i++)
+          if ((md->ctypes[*eptr++] & ctype_digit) != 0) RRETURN(MATCH_NOMATCH);
+        break;
+
+        case OP_DIGIT:
+        for (i = 1; i <= min; i++)
+          if ((md->ctypes[*eptr++] & ctype_digit) == 0) RRETURN(MATCH_NOMATCH);
+        break;
+
+        case OP_NOT_WHITESPACE:
+        for (i = 1; i <= min; i++)
+          if ((md->ctypes[*eptr++] & ctype_space) != 0) RRETURN(MATCH_NOMATCH);
+        break;
+
+        case OP_WHITESPACE:
+        for (i = 1; i <= min; i++)
+          if ((md->ctypes[*eptr++] & ctype_space) == 0) RRETURN(MATCH_NOMATCH);
+        break;
+
+        case OP_NOT_WORDCHAR:
+        for (i = 1; i <= min; i++)
+          if ((md->ctypes[*eptr++] & ctype_word) != 0)
+            RRETURN(MATCH_NOMATCH);
+        break;
+
+        case OP_WORDCHAR:
+        for (i = 1; i <= min; i++)
+          if ((md->ctypes[*eptr++] & ctype_word) == 0)
+            RRETURN(MATCH_NOMATCH);
+        break;
+
+        default:
+        RRETURN(PCRE_ERROR_INTERNAL);
+        }
+      }
+
+    /* If min = max, continue at the same level without recursing */
+
+    if (min == max) continue;
+
+    /* If minimizing, we have to test the rest of the pattern before each
+    subsequent match. Again, separate the UTF-8 case for speed, and also
+    separate the UCP cases. */
+
+    if (minimize)
+      {
+#ifdef SUPPORT_UCP
+      if (prop_type >= 0)
+        {
+        switch(prop_type)
+          {
+          case PT_ANY:
+          for (fi = min;; fi++)
+            {
+            RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM36);
+            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+            if (fi >= max || eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
+            GETCHARINC(c, eptr);
+            if (prop_fail_result) RRETURN(MATCH_NOMATCH);
+            }
+          /* Control never gets here */
+
+          case PT_LAMP:
+          for (fi = min;; fi++)
+            {
+            RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM37);
+            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+            if (fi >= max || eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
+            GETCHARINC(c, eptr);
+            prop_category = _pcre_ucp_findprop(c, &prop_chartype, &prop_script);
+            if ((prop_chartype == ucp_Lu ||
+                 prop_chartype == ucp_Ll ||
+                 prop_chartype == ucp_Lt) == prop_fail_result)
+              RRETURN(MATCH_NOMATCH);
+            }
+          /* Control never gets here */
+
+          case PT_GC:
+          for (fi = min;; fi++)
+            {
+            RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM38);
+            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+            if (fi >= max || eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
+            GETCHARINC(c, eptr);
+            prop_category = _pcre_ucp_findprop(c, &prop_chartype, &prop_script);
+            if ((prop_category == prop_value) == prop_fail_result)
+              RRETURN(MATCH_NOMATCH);
+            }
+          /* Control never gets here */
+
+          case PT_PC:
+          for (fi = min;; fi++)
+            {
+            RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM39);
+            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+            if (fi >= max || eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
+            GETCHARINC(c, eptr);
+            prop_category = _pcre_ucp_findprop(c, &prop_chartype, &prop_script);
+            if ((prop_chartype == prop_value) == prop_fail_result)
+              RRETURN(MATCH_NOMATCH);
+            }
+          /* Control never gets here */
+
+          case PT_SC:
+          for (fi = min;; fi++)
+            {
+            RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM40);
+            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+            if (fi >= max || eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
+            GETCHARINC(c, eptr);
+            prop_category = _pcre_ucp_findprop(c, &prop_chartype, &prop_script);
+            if ((prop_script == prop_value) == prop_fail_result)
+              RRETURN(MATCH_NOMATCH);
+            }
+          /* Control never gets here */
+
+          default:
+          RRETURN(PCRE_ERROR_INTERNAL);
+          }
+        }
+
+      /* Match extended Unicode sequences. We will get here only if the
+      support is in the binary; otherwise a compile-time error occurs. */
+
+      else if (ctype == OP_EXTUNI)
+        {
+        for (fi = min;; fi++)
+          {
+          RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM41);
+          if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+          if (fi >= max || eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
+          GETCHARINCTEST(c, eptr);
+          prop_category = _pcre_ucp_findprop(c, &prop_chartype, &prop_script);
+          if (prop_category == ucp_M) RRETURN(MATCH_NOMATCH);
+          while (eptr < md->end_subject)
+            {
+            int len = 1;
+            if (!utf8) c = *eptr; else
+              {
+              GETCHARLEN(c, eptr, len);
+              }
+            prop_category = _pcre_ucp_findprop(c, &prop_chartype, &prop_script);
+            if (prop_category != ucp_M) break;
+            eptr += len;
+            }
+          }
+        }
+
+      else
+#endif     /* SUPPORT_UCP */
+
+#ifdef SUPPORT_UTF8
+      /* UTF-8 mode */
+      if (utf8)
+        {
+        for (fi = min;; fi++)
+          {
+          RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM42);
+          if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+          if (fi >= max || eptr >= md->end_subject ||
+               (ctype == OP_ANY && (ims & PCRE_DOTALL) == 0 &&
+                IS_NEWLINE(eptr)))
+            RRETURN(MATCH_NOMATCH);
+
+          GETCHARINC(c, eptr);
+          switch(ctype)
+            {
+            case OP_ANY:        /* This is the DOTALL case */
+            break;
+
+            case OP_ANYBYTE:
+            break;
+
+            case OP_ANYNL:
+            switch(c)
+              {
+              default: RRETURN(MATCH_NOMATCH);
+              case 0x000d:
+              if (eptr < md->end_subject && *eptr == 0x0a) eptr++;
+              break;
+              case 0x000a:
+              break;
+
+              case 0x000b:
+              case 0x000c:
+              case 0x0085:
+              case 0x2028:
+              case 0x2029:
+              if (md->bsr_anycrlf) RRETURN(MATCH_NOMATCH);
+              break;
+              }
+            break;
+
+            case OP_NOT_HSPACE:
+            switch(c)
+              {
+              default: break;
+              case 0x09:      /* HT */
+              case 0x20:      /* SPACE */
+              case 0xa0:      /* NBSP */
+              case 0x1680:    /* OGHAM SPACE MARK */
+              case 0x180e:    /* MONGOLIAN VOWEL SEPARATOR */
+              case 0x2000:    /* EN QUAD */
+              case 0x2001:    /* EM QUAD */
+              case 0x2002:    /* EN SPACE */
+              case 0x2003:    /* EM SPACE */
+              case 0x2004:    /* THREE-PER-EM SPACE */
+              case 0x2005:    /* FOUR-PER-EM SPACE */
+              case 0x2006:    /* SIX-PER-EM SPACE */
+              case 0x2007:    /* FIGURE SPACE */
+              case 0x2008:    /* PUNCTUATION SPACE */
+              case 0x2009:    /* THIN SPACE */
+              case 0x200A:    /* HAIR SPACE */
+              case 0x202f:    /* NARROW NO-BREAK SPACE */
+              case 0x205f:    /* MEDIUM MATHEMATICAL SPACE */
+              case 0x3000:    /* IDEOGRAPHIC SPACE */
+              RRETURN(MATCH_NOMATCH);
+              }
+            break;
+
+            case OP_HSPACE:
+            switch(c)
+              {
+              default: RRETURN(MATCH_NOMATCH);
+              case 0x09:      /* HT */
+              case 0x20:      /* SPACE */
+              case 0xa0:      /* NBSP */
+              case 0x1680:    /* OGHAM SPACE MARK */
+              case 0x180e:    /* MONGOLIAN VOWEL SEPARATOR */
+              case 0x2000:    /* EN QUAD */
+              case 0x2001:    /* EM QUAD */
+              case 0x2002:    /* EN SPACE */
+              case 0x2003:    /* EM SPACE */
+              case 0x2004:    /* THREE-PER-EM SPACE */
+              case 0x2005:    /* FOUR-PER-EM SPACE */
+              case 0x2006:    /* SIX-PER-EM SPACE */
+              case 0x2007:    /* FIGURE SPACE */
+              case 0x2008:    /* PUNCTUATION SPACE */
+              case 0x2009:    /* THIN SPACE */
+              case 0x200A:    /* HAIR SPACE */
+              case 0x202f:    /* NARROW NO-BREAK SPACE */
+              case 0x205f:    /* MEDIUM MATHEMATICAL SPACE */
+              case 0x3000:    /* IDEOGRAPHIC SPACE */
+              break;
+              }
+            break;
+
+            case OP_NOT_VSPACE:
+            switch(c)
+              {
+              default: break;
+              case 0x0a:      /* LF */
+              case 0x0b:      /* VT */
+              case 0x0c:      /* FF */
+              case 0x0d:      /* CR */
+              case 0x85:      /* NEL */
+              case 0x2028:    /* LINE SEPARATOR */
+              case 0x2029:    /* PARAGRAPH SEPARATOR */
+              RRETURN(MATCH_NOMATCH);
+              }
+            break;
+
+            case OP_VSPACE:
+            switch(c)
+              {
+              default: RRETURN(MATCH_NOMATCH);
+              case 0x0a:      /* LF */
+              case 0x0b:      /* VT */
+              case 0x0c:      /* FF */
+              case 0x0d:      /* CR */
+              case 0x85:      /* NEL */
+              case 0x2028:    /* LINE SEPARATOR */
+              case 0x2029:    /* PARAGRAPH SEPARATOR */
+              break;
+              }
+            break;
+
+            case OP_NOT_DIGIT:
+            if (c < 256 && (md->ctypes[c] & ctype_digit) != 0)
+              RRETURN(MATCH_NOMATCH);
+            break;
+
+            case OP_DIGIT:
+            if (c >= 256 || (md->ctypes[c] & ctype_digit) == 0)
+              RRETURN(MATCH_NOMATCH);
+            break;
+
+            case OP_NOT_WHITESPACE:
+            if (c < 256 && (md->ctypes[c] & ctype_space) != 0)
+              RRETURN(MATCH_NOMATCH);
+            break;
+
+            case OP_WHITESPACE:
+            if  (c >= 256 || (md->ctypes[c] & ctype_space) == 0)
+              RRETURN(MATCH_NOMATCH);
+            break;
+
+            case OP_NOT_WORDCHAR:
+            if (c < 256 && (md->ctypes[c] & ctype_word) != 0)
+              RRETURN(MATCH_NOMATCH);
+            break;
+
+            case OP_WORDCHAR:
+            if (c >= 256 || (md->ctypes[c] & ctype_word) == 0)
+              RRETURN(MATCH_NOMATCH);
+            break;
+
+            default:
+            RRETURN(PCRE_ERROR_INTERNAL);
+            }
+          }
+        }
+      else
+#endif
+      /* Not UTF-8 mode */
+        {
+        for (fi = min;; fi++)
+          {
+          RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM43);
+          if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+          if (fi >= max || eptr >= md->end_subject ||
+               ((ims & PCRE_DOTALL) == 0 && IS_NEWLINE(eptr)))
+            RRETURN(MATCH_NOMATCH);
+
+          c = *eptr++;
+          switch(ctype)
+            {
+            case OP_ANY:   /* This is the DOTALL case */
+            break;
+
+            case OP_ANYBYTE:
+            break;
+
+            case OP_ANYNL:
+            switch(c)
+              {
+              default: RRETURN(MATCH_NOMATCH);
+              case 0x000d:
+              if (eptr < md->end_subject && *eptr == 0x0a) eptr++;
+              break;
+
+              case 0x000a:
+              break;
+
+              case 0x000b:
+              case 0x000c:
+              case 0x0085:
+              if (md->bsr_anycrlf) RRETURN(MATCH_NOMATCH);
+              break;
+              }
+            break;
+
+            case OP_NOT_HSPACE:
+            switch(c)
+              {
+              default: break;
+              case 0x09:      /* HT */
+              case 0x20:      /* SPACE */
+              case 0xa0:      /* NBSP */
+              RRETURN(MATCH_NOMATCH);
+              }
+            break;
+
+            case OP_HSPACE:
+            switch(c)
+              {
+              default: RRETURN(MATCH_NOMATCH);
+              case 0x09:      /* HT */
+              case 0x20:      /* SPACE */
+              case 0xa0:      /* NBSP */
+              break;
+              }
+            break;
+
+            case OP_NOT_VSPACE:
+            switch(c)
+              {
+              default: break;
+              case 0x0a:      /* LF */
+              case 0x0b:      /* VT */
+              case 0x0c:      /* FF */
+              case 0x0d:      /* CR */
+              case 0x85:      /* NEL */
+              RRETURN(MATCH_NOMATCH);
+              }
+            break;
+
+            case OP_VSPACE:
+            switch(c)
+              {
+              default: RRETURN(MATCH_NOMATCH);
+              case 0x0a:      /* LF */
+              case 0x0b:      /* VT */
+              case 0x0c:      /* FF */
+              case 0x0d:      /* CR */
+              case 0x85:      /* NEL */
+              break;
+              }
+            break;
+
+            case OP_NOT_DIGIT:
+            if ((md->ctypes[c] & ctype_digit) != 0) RRETURN(MATCH_NOMATCH);
+            break;
+
+            case OP_DIGIT:
+            if ((md->ctypes[c] & ctype_digit) == 0) RRETURN(MATCH_NOMATCH);
+            break;
+
+            case OP_NOT_WHITESPACE:
+            if ((md->ctypes[c] & ctype_space) != 0) RRETURN(MATCH_NOMATCH);
+            break;
+
+            case OP_WHITESPACE:
+            if  ((md->ctypes[c] & ctype_space) == 0) RRETURN(MATCH_NOMATCH);
+            break;
+
+            case OP_NOT_WORDCHAR:
+            if ((md->ctypes[c] & ctype_word) != 0) RRETURN(MATCH_NOMATCH);
+            break;
+
+            case OP_WORDCHAR:
+            if ((md->ctypes[c] & ctype_word) == 0) RRETURN(MATCH_NOMATCH);
+            break;
+
+            default:
+            RRETURN(PCRE_ERROR_INTERNAL);
+            }
+          }
+        }
+      /* Control never gets here */
+      }
+
+    /* If maximizing, it is worth using inline code for speed, doing the type
+    test once at the start (i.e. keep it out of the loop). Again, keep the
+    UTF-8 and UCP stuff separate. */
+
+    else
+      {
+      pp = eptr;  /* Remember where we started */
+
+#ifdef SUPPORT_UCP
+      if (prop_type >= 0)
+        {
+        switch(prop_type)
+          {
+          case PT_ANY:
+          for (i = min; i < max; i++)
+            {
+            int len = 1;
+            if (eptr >= md->end_subject) break;
+            GETCHARLEN(c, eptr, len);
+            if (prop_fail_result) break;
+            eptr+= len;
+            }
+          break;
+
+          case PT_LAMP:
+          for (i = min; i < max; i++)
+            {
+            int len = 1;
+            if (eptr >= md->end_subject) break;
+            GETCHARLEN(c, eptr, len);
+            prop_category = _pcre_ucp_findprop(c, &prop_chartype, &prop_script);
+            if ((prop_chartype == ucp_Lu ||
+                 prop_chartype == ucp_Ll ||
+                 prop_chartype == ucp_Lt) == prop_fail_result)
+              break;
+            eptr+= len;
+            }
+          break;
+
+          case PT_GC:
+          for (i = min; i < max; i++)
+            {
+            int len = 1;
+            if (eptr >= md->end_subject) break;
+            GETCHARLEN(c, eptr, len);
+            prop_category = _pcre_ucp_findprop(c, &prop_chartype, &prop_script);
+            if ((prop_category == prop_value) == prop_fail_result)
+              break;
+            eptr+= len;
+            }
+          break;
+
+          case PT_PC:
+          for (i = min; i < max; i++)
+            {
+            int len = 1;
+            if (eptr >= md->end_subject) break;
+            GETCHARLEN(c, eptr, len);
+            prop_category = _pcre_ucp_findprop(c, &prop_chartype, &prop_script);
+            if ((prop_chartype == prop_value) == prop_fail_result)
+              break;
+            eptr+= len;
+            }
+          break;
+
+          case PT_SC:
+          for (i = min; i < max; i++)
+            {
+            int len = 1;
+            if (eptr >= md->end_subject) break;
+            GETCHARLEN(c, eptr, len);
+            prop_category = _pcre_ucp_findprop(c, &prop_chartype, &prop_script);
+            if ((prop_script == prop_value) == prop_fail_result)
+              break;
+            eptr+= len;
+            }
+          break;
+          }
+
+        /* eptr is now past the end of the maximum run */
+
+        if (possessive) continue;
+        for(;;)
+          {
+          RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM44);
+          if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+          if (eptr-- == pp) break;        /* Stop if tried at original pos */
+          if (utf8) BACKCHAR(eptr);
+          }
+        }
+
+      /* Match extended Unicode sequences. We will get here only if the
+      support is in the binary; otherwise a compile-time error occurs. */
+
+      else if (ctype == OP_EXTUNI)
+        {
+        for (i = min; i < max; i++)
+          {
+          if (eptr >= md->end_subject) break;
+          GETCHARINCTEST(c, eptr);
+          prop_category = _pcre_ucp_findprop(c, &prop_chartype, &prop_script);
+          if (prop_category == ucp_M) break;
+          while (eptr < md->end_subject)
+            {
+            int len = 1;
+            if (!utf8) c = *eptr; else
+              {
+              GETCHARLEN(c, eptr, len);
+              }
+            prop_category = _pcre_ucp_findprop(c, &prop_chartype, &prop_script);
+            if (prop_category != ucp_M) break;
+            eptr += len;
+            }
+          }
+
+        /* eptr is now past the end of the maximum run */
+
+        if (possessive) continue;
+        for(;;)
+          {
+          RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM45);
+          if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+          if (eptr-- == pp) break;        /* Stop if tried at original pos */
+          for (;;)                        /* Move back over one extended */
+            {
+            int len = 1;
+            if (!utf8) c = *eptr; else
+              {
+              BACKCHAR(eptr);
+              GETCHARLEN(c, eptr, len);
+              }
+            prop_category = _pcre_ucp_findprop(c, &prop_chartype, &prop_script);
+            if (prop_category != ucp_M) break;
+            eptr--;
+            }
+          }
+        }
+
+      else
+#endif   /* SUPPORT_UCP */
+
+#ifdef SUPPORT_UTF8
+      /* UTF-8 mode */
+
+      if (utf8)
+        {
+        switch(ctype)
+          {
+          case OP_ANY:
+          if (max < INT_MAX)
+            {
+            if ((ims & PCRE_DOTALL) == 0)
+              {
+              for (i = min; i < max; i++)
+                {
+                if (eptr >= md->end_subject || IS_NEWLINE(eptr)) break;
+                eptr++;
+                while (eptr < md->end_subject && (*eptr & 0xc0) == 0x80) eptr++;
+                }
+              }
+            else
+              {
+              for (i = min; i < max; i++)
+                {
+                if (eptr >= md->end_subject) break;
+                eptr++;
+                while (eptr < md->end_subject && (*eptr & 0xc0) == 0x80) eptr++;
+                }
+              }
+            }
+
+          /* Handle unlimited UTF-8 repeat */
+
+          else
+            {
+            if ((ims & PCRE_DOTALL) == 0)
+              {
+              for (i = min; i < max; i++)
+                {
+                if (eptr >= md->end_subject || IS_NEWLINE(eptr)) break;
+                eptr++;
+                while (eptr < md->end_subject && (*eptr & 0xc0) == 0x80) eptr++;
+                }
+              }
+            else
+              {
+              eptr = md->end_subject;
+              }
+            }
+          break;
+
+          /* The byte case is the same as non-UTF8 */
+
+          case OP_ANYBYTE:
+          c = max - min;
+          if (c > (unsigned int)(md->end_subject - eptr))
+            c = md->end_subject - eptr;
+          eptr += c;
+          break;
+
+          case OP_ANYNL:
+          for (i = min; i < max; i++)
+            {
+            int len = 1;
+            if (eptr >= md->end_subject) break;
+            GETCHARLEN(c, eptr, len);
+            if (c == 0x000d)
+              {
+              if (++eptr >= md->end_subject) break;
+              if (*eptr == 0x000a) eptr++;
+              }
+            else
+              {
+              if (c != 0x000a &&
+                  (md->bsr_anycrlf ||
+                   (c != 0x000b && c != 0x000c &&
+                    c != 0x0085 && c != 0x2028 && c != 0x2029)))
+                break;
+              eptr += len;
+              }
+            }
+          break;
+
+          case OP_NOT_HSPACE:
+          case OP_HSPACE:
+          for (i = min; i < max; i++)
+            {
+            BOOL gotspace;
+            int len = 1;
+            if (eptr >= md->end_subject) break;
+            GETCHARLEN(c, eptr, len);
+            switch(c)
+              {
+              default: gotspace = FALSE; break;
+              case 0x09:      /* HT */
+              case 0x20:      /* SPACE */
+              case 0xa0:      /* NBSP */
+              case 0x1680:    /* OGHAM SPACE MARK */
+              case 0x180e:    /* MONGOLIAN VOWEL SEPARATOR */
+              case 0x2000:    /* EN QUAD */
+              case 0x2001:    /* EM QUAD */
+              case 0x2002:    /* EN SPACE */
+              case 0x2003:    /* EM SPACE */
+              case 0x2004:    /* THREE-PER-EM SPACE */
+              case 0x2005:    /* FOUR-PER-EM SPACE */
+              case 0x2006:    /* SIX-PER-EM SPACE */
+              case 0x2007:    /* FIGURE SPACE */
+              case 0x2008:    /* PUNCTUATION SPACE */
+              case 0x2009:    /* THIN SPACE */
+              case 0x200A:    /* HAIR SPACE */
+              case 0x202f:    /* NARROW NO-BREAK SPACE */
+              case 0x205f:    /* MEDIUM MATHEMATICAL SPACE */
+              case 0x3000:    /* IDEOGRAPHIC SPACE */
+              gotspace = TRUE;
+              break;
+              }
+            if (gotspace == (ctype == OP_NOT_HSPACE)) break;
+            eptr += len;
+            }
+          break;
+
+          case OP_NOT_VSPACE:
+          case OP_VSPACE:
+          for (i = min; i < max; i++)
+            {
+            BOOL gotspace;
+            int len = 1;
+            if (eptr >= md->end_subject) break;
+            GETCHARLEN(c, eptr, len);
+            switch(c)
+              {
+              default: gotspace = FALSE; break;
+              case 0x0a:      /* LF */
+              case 0x0b:      /* VT */
+              case 0x0c:      /* FF */
+              case 0x0d:      /* CR */
+              case 0x85:      /* NEL */
+              case 0x2028:    /* LINE SEPARATOR */
+              case 0x2029:    /* PARAGRAPH SEPARATOR */
+              gotspace = TRUE;
+              break;
+              }
+            if (gotspace == (ctype == OP_NOT_VSPACE)) break;
+            eptr += len;
+            }
+          break;
+
+          case OP_NOT_DIGIT:
+          for (i = min; i < max; i++)
+            {
+            int len = 1;
+            if (eptr >= md->end_subject) break;
+            GETCHARLEN(c, eptr, len);
+            if (c < 256 && (md->ctypes[c] & ctype_digit) != 0) break;
+            eptr+= len;
+            }
+          break;
+
+          case OP_DIGIT:
+          for (i = min; i < max; i++)
+            {
+            int len = 1;
+            if (eptr >= md->end_subject) break;
+            GETCHARLEN(c, eptr, len);
+            if (c >= 256 ||(md->ctypes[c] & ctype_digit) == 0) break;
+            eptr+= len;
+            }
+          break;
+
+          case OP_NOT_WHITESPACE:
+          for (i = min; i < max; i++)
+            {
+            int len = 1;
+            if (eptr >= md->end_subject) break;
+            GETCHARLEN(c, eptr, len);
+            if (c < 256 && (md->ctypes[c] & ctype_space) != 0) break;
+            eptr+= len;
+            }
+          break;
+
+          case OP_WHITESPACE:
+          for (i = min; i < max; i++)
+            {
+            int len = 1;
+            if (eptr >= md->end_subject) break;
+            GETCHARLEN(c, eptr, len);
+            if (c >= 256 ||(md->ctypes[c] & ctype_space) == 0) break;
+            eptr+= len;
+            }
+          break;
+
+          case OP_NOT_WORDCHAR:
+          for (i = min; i < max; i++)
+            {
+            int len = 1;
+            if (eptr >= md->end_subject) break;
+            GETCHARLEN(c, eptr, len);
+            if (c < 256 && (md->ctypes[c] & ctype_word) != 0) break;
+            eptr+= len;
+            }
+          break;
+
+          case OP_WORDCHAR:
+          for (i = min; i < max; i++)
+            {
+            int len = 1;
+            if (eptr >= md->end_subject) break;
+            GETCHARLEN(c, eptr, len);
+            if (c >= 256 || (md->ctypes[c] & ctype_word) == 0) break;
+            eptr+= len;
+            }
+          break;
+
+          default:
+          RRETURN(PCRE_ERROR_INTERNAL);
+          }
+
+        /* eptr is now past the end of the maximum run */
+
+        if (possessive) continue;
+        for(;;)
+          {
+          RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM46);
+          if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+          if (eptr-- == pp) break;        /* Stop if tried at original pos */
+          BACKCHAR(eptr);
+          }
+        }
+      else
+#endif  /* SUPPORT_UTF8 */
+
+      /* Not UTF-8 mode */
+        {
+        switch(ctype)
+          {
+          case OP_ANY:
+          if ((ims & PCRE_DOTALL) == 0)
+            {
+            for (i = min; i < max; i++)
+              {
+              if (eptr >= md->end_subject || IS_NEWLINE(eptr)) break;
+              eptr++;
+              }
+            break;
+            }
+          /* For DOTALL case, fall through and treat as \C */
+
+          case OP_ANYBYTE:
+          c = max - min;
+          if (c > (unsigned int)(md->end_subject - eptr))
+            c = md->end_subject - eptr;
+          eptr += c;
+          break;
+
+          case OP_ANYNL:
+          for (i = min; i < max; i++)
+            {
+            if (eptr >= md->end_subject) break;
+            c = *eptr;
+            if (c == 0x000d)
+              {
+              if (++eptr >= md->end_subject) break;
+              if (*eptr == 0x000a) eptr++;
+              }
+            else
+              {
+              if (c != 0x000a &&
+                  (md->bsr_anycrlf ||
+                    (c != 0x000b && c != 0x000c && c != 0x0085)))
+                break;
+              eptr++;
+              }
+            }
+          break;
+
+          case OP_NOT_HSPACE:
+          for (i = min; i < max; i++)
+            {
+            if (eptr >= md->end_subject) break;
+            c = *eptr;
+            if (c == 0x09 || c == 0x20 || c == 0xa0) break;
+            eptr++;
+            }
+          break;
+
+          case OP_HSPACE:
+          for (i = min; i < max; i++)
+            {
+            if (eptr >= md->end_subject) break;
+            c = *eptr;
+            if (c != 0x09 && c != 0x20 && c != 0xa0) break;
+            eptr++;
+            }
+          break;
+
+          case OP_NOT_VSPACE:
+          for (i = min; i < max; i++)
+            {
+            if (eptr >= md->end_subject) break;
+            c = *eptr;
+            if (c == 0x0a || c == 0x0b || c == 0x0c || c == 0x0d || c == 0x85)
+              break;
+            eptr++;
+            }
+          break;
+
+          case OP_VSPACE:
+          for (i = min; i < max; i++)
+            {
+            if (eptr >= md->end_subject) break;
+            c = *eptr;
+            if (c != 0x0a && c != 0x0b && c != 0x0c && c != 0x0d && c != 0x85)
+              break;
+            eptr++;
+            }
+          break;
+
+          case OP_NOT_DIGIT:
+          for (i = min; i < max; i++)
+            {
+            if (eptr >= md->end_subject || (md->ctypes[*eptr] & ctype_digit) != 0)
+              break;
+            eptr++;
+            }
+          break;
+
+          case OP_DIGIT:
+          for (i = min; i < max; i++)
+            {
+            if (eptr >= md->end_subject || (md->ctypes[*eptr] & ctype_digit) == 0)
+              break;
+            eptr++;
+            }
+          break;
+
+          case OP_NOT_WHITESPACE:
+          for (i = min; i < max; i++)
+            {
+            if (eptr >= md->end_subject || (md->ctypes[*eptr] & ctype_space) != 0)
+              break;
+            eptr++;
+            }
+          break;
+
+          case OP_WHITESPACE:
+          for (i = min; i < max; i++)
+            {
+            if (eptr >= md->end_subject || (md->ctypes[*eptr] & ctype_space) == 0)
+              break;
+            eptr++;
+            }
+          break;
+
+          case OP_NOT_WORDCHAR:
+          for (i = min; i < max; i++)
+            {
+            if (eptr >= md->end_subject || (md->ctypes[*eptr] & ctype_word) != 0)
+              break;
+            eptr++;
+            }
+          break;
+
+          case OP_WORDCHAR:
+          for (i = min; i < max; i++)
+            {
+            if (eptr >= md->end_subject || (md->ctypes[*eptr] & ctype_word) == 0)
+              break;
+            eptr++;
+            }
+          break;
+
+          default:
+          RRETURN(PCRE_ERROR_INTERNAL);
+          }
+
+        /* eptr is now past the end of the maximum run */
+
+        if (possessive) continue;
+        while (eptr >= pp)
+          {
+          RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM47);
+          eptr--;
+          if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+          }
+        }
+
+      /* Get here if we can't make it match with any permitted repetitions */
+
+      RRETURN(MATCH_NOMATCH);
+      }
+    /* Control never gets here */
+
+    /* There's been some horrible disaster. Arrival here can only mean there is
+    something seriously wrong in the code above or the OP_xxx definitions. */
+
+    default:
+    DPRINTF(("Unknown opcode %d\n", *ecode));
+    RRETURN(PCRE_ERROR_UNKNOWN_OPCODE);
+    }
+
+  /* Do not stick any code in here without much thought; it is assumed
+  that "continue" in the code above comes out to here to repeat the main
+  loop. */
+
+  }             /* End of main loop */
+/* Control never reaches here */
+
+
+/* When compiling to use the heap rather than the stack for recursive calls to
+match(), the RRETURN() macro jumps here. The number that is saved in
+frame->Xwhere indicates which label we actually want to return to. */
+
+#ifdef NO_RECURSE
+#define LBL(val) case val: goto L_RM##val;
+HEAP_RETURN:
+switch (frame->Xwhere)
+  {
+  LBL( 1) LBL( 2) LBL( 3) LBL( 4) LBL( 5) LBL( 6) LBL( 7) LBL( 8)
+  LBL( 9) LBL(10) LBL(11) LBL(12) LBL(13) LBL(14) LBL(15) LBL(17)
+  LBL(19) LBL(24) LBL(25) LBL(26) LBL(27) LBL(29) LBL(31) LBL(33)
+  LBL(35) LBL(43) LBL(47) LBL(48) LBL(49) LBL(50) LBL(51) LBL(52)
+  LBL(53) LBL(54)
+#ifdef SUPPORT_UTF8
+  LBL(16) LBL(18) LBL(20) LBL(21) LBL(22) LBL(23) LBL(28) LBL(30)
+  LBL(32) LBL(34) LBL(42) LBL(46)
+#ifdef SUPPORT_UCP
+  LBL(36) LBL(37) LBL(38) LBL(39) LBL(40) LBL(41) LBL(44) LBL(45)
+#endif  /* SUPPORT_UCP */
+#endif  /* SUPPORT_UTF8 */
+  default:
+  DPRINTF(("jump error in pcre match: label %d non-existent\n", frame->Xwhere));
+  return PCRE_ERROR_INTERNAL;
+  }
+#undef LBL
+#endif  /* NO_RECURSE */
+}
+
+
+/***************************************************************************
+****************************************************************************
+                   RECURSION IN THE match() FUNCTION
+
+Undefine all the macros that were defined above to handle this. */
+
+#ifdef NO_RECURSE
+#undef eptr
+#undef ecode
+#undef mstart
+#undef offset_top
+#undef ims
+#undef eptrb
+#undef flags
+
+#undef callpat
+#undef charptr
+#undef data
+#undef next
+#undef pp
+#undef prev
+#undef saved_eptr
+
+#undef new_recursive
+
+#undef cur_is_word
+#undef condition
+#undef prev_is_word
+
+#undef original_ims
+
+#undef ctype
+#undef length
+#undef max
+#undef min
+#undef number
+#undef offset
+#undef op
+#undef save_capture_last
+#undef save_offset1
+#undef save_offset2
+#undef save_offset3
+#undef stacksave
+
+#undef newptrb
+
+#endif
+
+/* These two are defined as macros in both cases */
+
+#undef fc
+#undef fi
+
+/***************************************************************************
+***************************************************************************/
+
+
+
+/*************************************************
+*         Execute a Regular Expression           *
+*************************************************/
+
+/* This function applies a compiled re to a subject string and picks out
+portions of the string if it matches. Two elements in the vector are set for
+each substring: the offsets to the start and end of the substring.
+
+Arguments:
+  argument_re     points to the compiled expression
+  extra_data      points to extra data or is NULL
+  subject         points to the subject string
+  length          length of subject string (may contain binary zeros)
+  start_offset    where to start in the subject string
+  options         option bits
+  offsets         points to a vector of ints to be filled in with offsets
+  offsetcount     the number of elements in the vector
+
+Returns:          > 0 => success; value is the number of elements filled in
+                  = 0 => success, but offsets is not big enough
+                   -1 => failed to match
+                 < -1 => some kind of unexpected problem
+*/
+
+PCRE_EXP_DEFN int
+pcre_exec(const pcre *argument_re, const pcre_extra *extra_data,
+  PCRE_SPTR subject, int length, int start_offset, int options, int *offsets,
+  int offsetcount)
+{
+int rc, resetcount, ocount;
+int first_byte = -1;
+int req_byte = -1;
+int req_byte2 = -1;
+int newline;
+unsigned long int ims;
+BOOL using_temporary_offsets = FALSE;
+BOOL anchored;
+BOOL startline;
+BOOL firstline;
+BOOL first_byte_caseless = FALSE;
+BOOL req_byte_caseless = FALSE;
+BOOL utf8;
+match_data match_block;
+match_data *md = &match_block;
+const uschar *tables;
+const uschar *start_bits = NULL;
+USPTR start_match = (USPTR)subject + start_offset;
+USPTR end_subject;
+USPTR req_byte_ptr = start_match - 1;
+
+pcre_study_data internal_study;
+const pcre_study_data *study;
+
+real_pcre internal_re;
+const real_pcre *external_re = (const real_pcre *)argument_re;
+const real_pcre *re = external_re;
+
+/* Plausibility checks */
+
+if ((options & ~PUBLIC_EXEC_OPTIONS) != 0) return PCRE_ERROR_BADOPTION;
+if (re == NULL || subject == NULL ||
+   (offsets == NULL && offsetcount > 0)) return PCRE_ERROR_NULL;
+if (offsetcount < 0) return PCRE_ERROR_BADCOUNT;
+
+/* Fish out the optional data from the extra_data structure, first setting
+the default values. */
+
+study = NULL;
+md->match_limit = MATCH_LIMIT;
+md->match_limit_recursion = MATCH_LIMIT_RECURSION;
+md->callout_data = NULL;
+
+/* The table pointer is always in native byte order. */
+
+tables = external_re->tables;
+
+if (extra_data != NULL)
+  {
+  register unsigned int flags = extra_data->flags;
+  if ((flags & PCRE_EXTRA_STUDY_DATA) != 0)
+    study = (const pcre_study_data *)extra_data->study_data;
+  if ((flags & PCRE_EXTRA_MATCH_LIMIT) != 0)
+    md->match_limit = extra_data->match_limit;
+  if ((flags & PCRE_EXTRA_MATCH_LIMIT_RECURSION) != 0)
+    md->match_limit_recursion = extra_data->match_limit_recursion;
+  if ((flags & PCRE_EXTRA_CALLOUT_DATA) != 0)
+    md->callout_data = extra_data->callout_data;
+  if ((flags & PCRE_EXTRA_TABLES) != 0) tables = extra_data->tables;
+  }
+
+/* If the exec call supplied NULL for tables, use the inbuilt ones. This
+is a feature that makes it possible to save compiled regex and re-use them
+in other programs later. */
+
+if (tables == NULL) tables = _pcre_default_tables;
+
+/* Check that the first field in the block is the magic number. If it is not,
+test for a regex that was compiled on a host of opposite endianness. If this is
+the case, flipped values are put in internal_re and internal_study if there was
+study data too. */
+
+if (re->magic_number != MAGIC_NUMBER)
+  {
+  re = _pcre_try_flipped(re, &internal_re, study, &internal_study);
+  if (re == NULL) return PCRE_ERROR_BADMAGIC;
+  if (study != NULL) study = &internal_study;
+  }
+
+/* Set up other data */
+
+anchored = ((re->options | options) & PCRE_ANCHORED) != 0;
+startline = (re->flags & PCRE_STARTLINE) != 0;
+firstline = (re->options & PCRE_FIRSTLINE) != 0;
+
+/* The code starts after the real_pcre block and the capture name table. */
+
+md->start_code = (const uschar *)external_re + re->name_table_offset +
+  re->name_count * re->name_entry_size;
+
+md->start_subject = (USPTR)subject;
+md->start_offset = start_offset;
+md->end_subject = md->start_subject + length;
+end_subject = md->end_subject;
+
+md->endonly = (re->options & PCRE_DOLLAR_ENDONLY) != 0;
+utf8 = md->utf8 = (re->options & PCRE_UTF8) != 0;
+
+md->notbol = (options & PCRE_NOTBOL) != 0;
+md->noteol = (options & PCRE_NOTEOL) != 0;
+md->notempty = (options & PCRE_NOTEMPTY) != 0;
+md->partial = (options & PCRE_PARTIAL) != 0;
+md->hitend = FALSE;
+
+md->recursive = NULL;                   /* No recursion at top level */
+
+md->lcc = tables + lcc_offset;
+md->ctypes = tables + ctypes_offset;
+
+/* Handle different \R options. */
+
+switch (options & (PCRE_BSR_ANYCRLF|PCRE_BSR_UNICODE))
+  {
+  case 0:
+  if ((re->options & (PCRE_BSR_ANYCRLF|PCRE_BSR_UNICODE)) != 0)
+    md->bsr_anycrlf = (re->options & PCRE_BSR_ANYCRLF) != 0;
+  else
+#ifdef BSR_ANYCRLF
+  md->bsr_anycrlf = TRUE;
+#else
+  md->bsr_anycrlf = FALSE;
+#endif
+  break;
+
+  case PCRE_BSR_ANYCRLF:
+  md->bsr_anycrlf = TRUE;
+  break;
+
+  case PCRE_BSR_UNICODE:
+  md->bsr_anycrlf = FALSE;
+  break;
+
+  default: return PCRE_ERROR_BADNEWLINE;
+  }
+
+/* Handle different types of newline. The three bits give eight cases. If
+nothing is set at run time, whatever was used at compile time applies. */
+
+switch ((((options & PCRE_NEWLINE_BITS) == 0)? re->options :
+        (pcre_uint32)options) & PCRE_NEWLINE_BITS)
+  {
+  case 0: newline = NEWLINE; break;   /* Compile-time default */
+  case PCRE_NEWLINE_CR: newline = '\r'; break;
+  case PCRE_NEWLINE_LF: newline = '\n'; break;
+  case PCRE_NEWLINE_CR+
+       PCRE_NEWLINE_LF: newline = ('\r' << 8) | '\n'; break;
+  case PCRE_NEWLINE_ANY: newline = -1; break;
+  case PCRE_NEWLINE_ANYCRLF: newline = -2; break;
+  default: return PCRE_ERROR_BADNEWLINE;
+  }
+
+if (newline == -2)
+  {
+  md->nltype = NLTYPE_ANYCRLF;
+  }
+else if (newline < 0)
+  {
+  md->nltype = NLTYPE_ANY;
+  }
+else
+  {
+  md->nltype = NLTYPE_FIXED;
+  if (newline > 255)
+    {
+    md->nllen = 2;
+    md->nl[0] = (newline >> 8) & 255;
+    md->nl[1] = newline & 255;
+    }
+  else
+    {
+    md->nllen = 1;
+    md->nl[0] = newline;
+    }
+  }
+
+/* Partial matching is supported only for a restricted set of regexes at the
+moment. */
+
+if (md->partial && (re->flags & PCRE_NOPARTIAL) != 0)
+  return PCRE_ERROR_BADPARTIAL;
+
+/* Check a UTF-8 string if required. Unfortunately there's no way of passing
+back the character offset. */
+
+#ifdef SUPPORT_UTF8
+if (utf8 && (options & PCRE_NO_UTF8_CHECK) == 0)
+  {
+  if (_pcre_valid_utf8((uschar *)subject, length) >= 0)
+    return PCRE_ERROR_BADUTF8;
+  if (start_offset > 0 && start_offset < length)
+    {
+    int tb = ((uschar *)subject)[start_offset];
+    if (tb > 127)
+      {
+      tb &= 0xc0;
+      if (tb != 0 && tb != 0xc0) return PCRE_ERROR_BADUTF8_OFFSET;
+      }
+    }
+  }
+#endif
+
+/* The ims options can vary during the matching as a result of the presence
+of (?ims) items in the pattern. They are kept in a local variable so that
+restoring at the exit of a group is easy. */
+
+ims = re->options & (PCRE_CASELESS|PCRE_MULTILINE|PCRE_DOTALL);
+
+/* If the expression has got more back references than the offsets supplied can
+hold, we get a temporary chunk of working store to use during the matching.
+Otherwise, we can use the vector supplied, rounding down its size to a multiple
+of 3. */
+
+ocount = offsetcount - (offsetcount % 3);
+
+if (re->top_backref > 0 && re->top_backref >= ocount/3)
+  {
+  ocount = re->top_backref * 3 + 3;
+  md->offset_vector = (int *)(pcre_malloc)(ocount * sizeof(int));
+  if (md->offset_vector == NULL) return PCRE_ERROR_NOMEMORY;
+  using_temporary_offsets = TRUE;
+  DPRINTF(("Got memory to hold back references\n"));
+  }
+else md->offset_vector = offsets;
+
+md->offset_end = ocount;
+md->offset_max = (2*ocount)/3;
+md->offset_overflow = FALSE;
+md->capture_last = -1;
+
+/* Compute the minimum number of offsets that we need to reset each time. Doing
+this makes a huge difference to execution time when there aren't many brackets
+in the pattern. */
+
+resetcount = 2 + re->top_bracket * 2;
+if (resetcount > offsetcount) resetcount = ocount;
+
+/* Reset the working variable associated with each extraction. These should
+never be used unless previously set, but they get saved and restored, and so we
+initialize them to avoid reading uninitialized locations. */
+
+if (md->offset_vector != NULL)
+  {
+  register int *iptr = md->offset_vector + ocount;
+  register int *iend = iptr - resetcount/2 + 1;
+  while (--iptr >= iend) *iptr = -1;
+  }
+
+/* Set up the first character to match, if available. The first_byte value is
+never set for an anchored regular expression, but the anchoring may be forced
+at run time, so we have to test for anchoring. The first char may be unset for
+an unanchored pattern, of course. If there's no first char and the pattern was
+studied, there may be a bitmap of possible first characters. */
+
+if (!anchored)
+  {
+  if ((re->flags & PCRE_FIRSTSET) != 0)
+    {
+    first_byte = re->first_byte & 255;
+    if ((first_byte_caseless = ((re->first_byte & REQ_CASELESS) != 0)) == TRUE)
+      first_byte = md->lcc[first_byte];
+    }
+  else
+    if (!startline && study != NULL &&
+      (study->options & PCRE_STUDY_MAPPED) != 0)
+        start_bits = study->start_bits;
+  }
+
+/* For anchored or unanchored matches, there may be a "last known required
+character" set. */
+
+if ((re->flags & PCRE_REQCHSET) != 0)
+  {
+  req_byte = re->req_byte & 255;
+  req_byte_caseless = (re->req_byte & REQ_CASELESS) != 0;
+  req_byte2 = (tables + fcc_offset)[req_byte];  /* case flipped */
+  }
+
+
+/* ==========================================================================*/
+
+/* Loop for handling unanchored repeated matching attempts; for anchored regexs
+the loop runs just once. */
+
+for(;;)
+  {
+  USPTR save_end_subject = end_subject;
+  USPTR new_start_match;
+
+  /* Reset the maximum number of extractions we might see. */
+
+  if (md->offset_vector != NULL)
+    {
+    register int *iptr = md->offset_vector;
+    register int *iend = iptr + resetcount;
+    while (iptr < iend) *iptr++ = -1;
+    }
+
+  /* Advance to a unique first char if possible. If firstline is TRUE, the
+  start of the match is constrained to the first line of a multiline string.
+  That is, the match must be before or at the first newline. Implement this by
+  temporarily adjusting end_subject so that we stop scanning at a newline. If
+  the match fails at the newline, later code breaks this loop. */
+
+  if (firstline)
+    {
+    USPTR t = start_match;
+    while (t < md->end_subject && !IS_NEWLINE(t)) t++;
+    end_subject = t;
+    }
+
+  /* Now test for a unique first byte */
+
+  if (first_byte >= 0)
+    {
+    if (first_byte_caseless)
+      while (start_match < end_subject &&
+             md->lcc[*start_match] != first_byte)
+        { NEXTCHAR(start_match); }
+    else
+      while (start_match < end_subject && *start_match != first_byte)
+        { NEXTCHAR(start_match); }
+    }
+
+  /* Or to just after a linebreak for a multiline match if possible */
+
+  else if (startline)
+    {
+    if (start_match > md->start_subject + start_offset)
+      {
+      while (start_match <= end_subject && !WAS_NEWLINE(start_match))
+        { NEXTCHAR(start_match); }
+
+      /* If we have just passed a CR and the newline option is ANY or ANYCRLF,
+      and we are now at a LF, advance the match position by one more character.
+      */
+
+      if (start_match[-1] == '\r' &&
+           (md->nltype == NLTYPE_ANY || md->nltype == NLTYPE_ANYCRLF) &&
+           start_match < end_subject &&
+           *start_match == '\n')
+        start_match++;
+      }
+    }
+
+  /* Or to a non-unique first char after study */
+
+  else if (start_bits != NULL)
+    {
+    while (start_match < end_subject)
+      {
+      register unsigned int c = *start_match;
+      if ((start_bits[c/8] & (1 << (c&7))) == 0)
+        { NEXTCHAR(start_match); }
+      else break;
+      }
+    }
+
+  /* Restore fudged end_subject */
+
+  end_subject = save_end_subject;
+
+#ifdef DEBUG  /* Sigh. Some compilers never learn. */
+  printf(">>>> Match against: ");
+  pchars(start_match, end_subject - start_match, TRUE, md);
+  printf("\n");
+#endif
+
+  /* If req_byte is set, we know that that character must appear in the subject
+  for the match to succeed. If the first character is set, req_byte must be
+  later in the subject; otherwise the test starts at the match point. This
+  optimization can save a huge amount of backtracking in patterns with nested
+  unlimited repeats that aren't going to match. Writing separate code for
+  cased/caseless versions makes it go faster, as does using an autoincrement
+  and backing off on a match.
+
+  HOWEVER: when the subject string is very, very long, searching to its end can
+  take a long time, and give bad performance on quite ordinary patterns. This
+  showed up when somebody was matching something like /^\d+C/ on a 32-megabyte
+  string... so we don't do this when the string is sufficiently long.
+
+  ALSO: this processing is disabled when partial matching is requested.
+  */
+
+  if (req_byte >= 0 &&
+      end_subject - start_match < REQ_BYTE_MAX &&
+      !md->partial)
+    {
+    register USPTR p = start_match + ((first_byte >= 0)? 1 : 0);
+
+    /* We don't need to repeat the search if we haven't yet reached the
+    place we found it at last time. */
+
+    if (p > req_byte_ptr)
+      {
+      if (req_byte_caseless)
+        {
+        while (p < end_subject)
+          {
+          register int pp = *p++;
+          if (pp == req_byte || pp == req_byte2) { p--; break; }
+          }
+        }
+      else
+        {
+        while (p < end_subject)
+          {
+          if (*p++ == req_byte) { p--; break; }
+          }
+        }
+
+      /* If we can't find the required character, break the matching loop,
+      forcing a match failure. */
+
+      if (p >= end_subject)
+        {
+        rc = MATCH_NOMATCH;
+        break;
+        }
+
+      /* If we have found the required character, save the point where we
+      found it, so that we don't search again next time round the loop if
+      the start hasn't passed this character yet. */
+
+      req_byte_ptr = p;
+      }
+    }
+
+  /* OK, we can now run the match. */
+
+  md->start_match_ptr = start_match;
+  md->match_call_count = 0;
+  rc = match(start_match, md->start_code, start_match, 2, md, ims, NULL, 0, 0);
+
+  switch(rc)
+    {
+    /* NOMATCH and PRUNE advance by one character. THEN at this level acts
+    exactly like PRUNE. */
+
+    case MATCH_NOMATCH:
+    case MATCH_PRUNE:
+    case MATCH_THEN:
+    new_start_match = start_match + 1;
+#ifdef SUPPORT_UTF8
+    if (utf8)
+      while(new_start_match < end_subject && (*new_start_match & 0xc0) == 0x80)
+        new_start_match++;
+#endif
+    break;
+
+    /* SKIP passes back the next starting point explicitly. */
+
+    case MATCH_SKIP:
+    new_start_match = md->start_match_ptr;
+    break;
+
+    /* COMMIT disables the bumpalong, but otherwise behaves as NOMATCH. */
+
+    case MATCH_COMMIT:
+    rc = MATCH_NOMATCH;
+    goto ENDLOOP;
+
+    /* Any other return is some kind of error. */
+
+    default:
+    goto ENDLOOP;
+    }
+
+  /* Control reaches here for the various types of "no match at this point"
+  result. Reset the code to MATCH_NOMATCH for subsequent checking. */
+
+  rc = MATCH_NOMATCH;
+
+  /* If PCRE_FIRSTLINE is set, the match must happen before or at the first
+  newline in the subject (though it may continue over the newline). Therefore,
+  if we have just failed to match, starting at a newline, do not continue. */
+
+  if (firstline && IS_NEWLINE(start_match)) break;
+
+  /* Advance to new matching position */
+
+  start_match = new_start_match;
+
+  /* Break the loop if the pattern is anchored or if we have passed the end of
+  the subject. */
+
+  if (anchored || start_match > end_subject) break;
+
+  /* If we have just passed a CR and we are now at a LF, and the pattern does
+  not contain any explicit matches for \r or \n, and the newline option is CRLF
+  or ANY or ANYCRLF, advance the match position by one more character. */
+
+  if (start_match[-1] == '\r' &&
+      start_match < end_subject &&
+      *start_match == '\n' &&
+      (re->flags & PCRE_HASCRORLF) == 0 &&
+        (md->nltype == NLTYPE_ANY ||
+         md->nltype == NLTYPE_ANYCRLF ||
+         md->nllen == 2))
+    start_match++;
+
+  }   /* End of for(;;) "bumpalong" loop */
+
+/* ==========================================================================*/
+
+/* We reach here when rc is not MATCH_NOMATCH, or if one of the stopping
+conditions is true:
+
+(1) The pattern is anchored or the match was failed by (*COMMIT);
+
+(2) We are past the end of the subject;
+
+(3) PCRE_FIRSTLINE is set and we have failed to match at a newline, because
+    this option requests that a match occur at or before the first newline in
+    the subject.
+
+When we have a match and the offset vector is big enough to deal with any
+backreferences, captured substring offsets will already be set up. In the case
+where we had to get some local store to hold offsets for backreference
+processing, copy those that we can. In this case there need not be overflow if
+certain parts of the pattern were not used, even though there are more
+capturing parentheses than vector slots. */
+
+ENDLOOP:
+
+if (rc == MATCH_MATCH)
+  {
+  if (using_temporary_offsets)
+    {
+    if (offsetcount >= 4)
+      {
+      memcpy(offsets + 2, md->offset_vector + 2,
+        (offsetcount - 2) * sizeof(int));
+      DPRINTF(("Copied offsets from temporary memory\n"));
+      }
+    if (md->end_offset_top > offsetcount) md->offset_overflow = TRUE;
+    DPRINTF(("Freeing temporary memory\n"));
+    (pcre_free)(md->offset_vector);
+    }
+
+  /* Set the return code to the number of captured strings, or 0 if there are
+  too many to fit into the vector. */
+
+  rc = md->offset_overflow? 0 : md->end_offset_top/2;
+
+  /* If there is space, set up the whole thing as substring 0. The value of
+  md->start_match_ptr might be modified if \K was encountered on the success
+  matching path. */
+
+  if (offsetcount < 2) rc = 0; else
+    {
+    offsets[0] = md->start_match_ptr - md->start_subject;
+    offsets[1] = md->end_match_ptr - md->start_subject;
+    }
+
+  DPRINTF((">>>> returning %d\n", rc));
+  return rc;
+  }
+
+/* Control gets here if there has been an error, or if the overall match
+attempt has failed at all permitted starting positions. */
+
+if (using_temporary_offsets)
+  {
+  DPRINTF(("Freeing temporary memory\n"));
+  (pcre_free)(md->offset_vector);
+  }
+
+if (rc != MATCH_NOMATCH)
+  {
+  DPRINTF((">>>> error: returning %d\n", rc));
+  return rc;
+  }
+else if (md->partial && md->hitend)
+  {
+  DPRINTF((">>>> returning PCRE_ERROR_PARTIAL\n"));
+  return PCRE_ERROR_PARTIAL;
+  }
+else
+  {
+  DPRINTF((">>>> returning PCRE_ERROR_NOMATCH\n"));
+  return PCRE_ERROR_NOMATCH;
+  }
+}
+
+/* End of pcre_exec.c */
diff --git a/uppsrc/plugin/pcre/lib/pcre_fullinfo.c b/uppsrc/plugin/pcre/lib/pcre_fullinfo.c
new file mode 100644
index 000000000..7b001c60b
--- /dev/null
+++ b/uppsrc/plugin/pcre/lib/pcre_fullinfo.c
@@ -0,0 +1,165 @@
+/*************************************************
+*      Perl-Compatible Regular Expressions       *
+*************************************************/
+
+/* PCRE is a library of functions to support regular expressions whose syntax
+and semantics are as close as possible to those of the Perl 5 language.
+
+                       Written by Philip Hazel
+           Copyright (c) 1997-2008 University of Cambridge
+
+-----------------------------------------------------------------------------
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+
+    * Neither the name of the University of Cambridge nor the names of its
+      contributors may be used to endorse or promote products derived from
+      this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+-----------------------------------------------------------------------------
+*/
+
+
+/* This module contains the external function pcre_fullinfo(), which returns
+information about a compiled pattern. */
+
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "pcre_internal.h"
+
+
+/*************************************************
+*        Return info about compiled pattern      *
+*************************************************/
+
+/* This is a newer "info" function which has an extensible interface so
+that additional items can be added compatibly.
+
+Arguments:
+  argument_re      points to compiled code
+  extra_data       points extra data, or NULL
+  what             what information is required
+  where            where to put the information
+
+Returns:           0 if data returned, negative on error
+*/
+
+PCRE_EXP_DEFN int
+pcre_fullinfo(const pcre *argument_re, const pcre_extra *extra_data, int what,
+  void *where)
+{
+real_pcre internal_re;
+pcre_study_data internal_study;
+const real_pcre *re = (const real_pcre *)argument_re;
+const pcre_study_data *study = NULL;
+
+if (re == NULL || where == NULL) return PCRE_ERROR_NULL;
+
+if (extra_data != NULL && (extra_data->flags & PCRE_EXTRA_STUDY_DATA) != 0)
+  study = (const pcre_study_data *)extra_data->study_data;
+
+if (re->magic_number != MAGIC_NUMBER)
+  {
+  re = _pcre_try_flipped(re, &internal_re, study, &internal_study);
+  if (re == NULL) return PCRE_ERROR_BADMAGIC;
+  if (study != NULL) study = &internal_study;
+  }
+
+switch (what)
+  {
+  case PCRE_INFO_OPTIONS:
+  *((unsigned long int *)where) = re->options & PUBLIC_OPTIONS;
+  break;
+
+  case PCRE_INFO_SIZE:
+  *((size_t *)where) = re->size;
+  break;
+
+  case PCRE_INFO_STUDYSIZE:
+  *((size_t *)where) = (study == NULL)? 0 : study->size;
+  break;
+
+  case PCRE_INFO_CAPTURECOUNT:
+  *((int *)where) = re->top_bracket;
+  break;
+
+  case PCRE_INFO_BACKREFMAX:
+  *((int *)where) = re->top_backref;
+  break;
+
+  case PCRE_INFO_FIRSTBYTE:
+  *((int *)where) =
+    ((re->flags & PCRE_FIRSTSET) != 0)? re->first_byte :
+    ((re->flags & PCRE_STARTLINE) != 0)? -1 : -2;
+  break;
+
+  /* Make sure we pass back the pointer to the bit vector in the external
+  block, not the internal copy (with flipped integer fields). */
+
+  case PCRE_INFO_FIRSTTABLE:
+  *((const uschar **)where) =
+    (study != NULL && (study->options & PCRE_STUDY_MAPPED) != 0)?
+      ((const pcre_study_data *)extra_data->study_data)->start_bits : NULL;
+  break;
+
+  case PCRE_INFO_LASTLITERAL:
+  *((int *)where) =
+    ((re->flags & PCRE_REQCHSET) != 0)? re->req_byte : -1;
+  break;
+
+  case PCRE_INFO_NAMEENTRYSIZE:
+  *((int *)where) = re->name_entry_size;
+  break;
+
+  case PCRE_INFO_NAMECOUNT:
+  *((int *)where) = re->name_count;
+  break;
+
+  case PCRE_INFO_NAMETABLE:
+  *((const uschar **)where) = (const uschar *)re + re->name_table_offset;
+  break;
+
+  case PCRE_INFO_DEFAULT_TABLES:
+  *((const uschar **)where) = (const uschar *)(_pcre_default_tables);
+  break;
+
+  case PCRE_INFO_OKPARTIAL:
+  *((int *)where) = (re->flags & PCRE_NOPARTIAL) == 0;
+  break;
+
+  case PCRE_INFO_JCHANGED:
+  *((int *)where) = (re->flags & PCRE_JCHANGED) != 0;
+  break;
+
+  case PCRE_INFO_HASCRORLF:
+  *((int *)where) = (re->flags & PCRE_HASCRORLF) != 0;
+  break;
+
+  default: return PCRE_ERROR_BADOPTION;
+  }
+
+return 0;
+}
+
+/* End of pcre_fullinfo.c */
diff --git a/uppsrc/plugin/pcre/lib/pcre_get.c b/uppsrc/plugin/pcre/lib/pcre_get.c
new file mode 100644
index 000000000..68b8de47b
--- /dev/null
+++ b/uppsrc/plugin/pcre/lib/pcre_get.c
@@ -0,0 +1,465 @@
+/*************************************************
+*      Perl-Compatible Regular Expressions       *
+*************************************************/
+
+/* PCRE is a library of functions to support regular expressions whose syntax
+and semantics are as close as possible to those of the Perl 5 language.
+
+                       Written by Philip Hazel
+           Copyright (c) 1997-2008 University of Cambridge
+
+-----------------------------------------------------------------------------
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+
+    * Neither the name of the University of Cambridge nor the names of its
+      contributors may be used to endorse or promote products derived from
+      this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+-----------------------------------------------------------------------------
+*/
+
+
+/* This module contains some convenience functions for extracting substrings
+from the subject string after a regex match has succeeded. The original idea
+for these functions came from Scott Wimer. */
+
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "pcre_internal.h"
+
+
+/*************************************************
+*           Find number for named string         *
+*************************************************/
+
+/* This function is used by the get_first_set() function below, as well
+as being generally available. It assumes that names are unique.
+
+Arguments:
+  code        the compiled regex
+  stringname  the name whose number is required
+
+Returns:      the number of the named parentheses, or a negative number
+                (PCRE_ERROR_NOSUBSTRING) if not found
+*/
+
+int
+pcre_get_stringnumber(const pcre *code, const char *stringname)
+{
+int rc;
+int entrysize;
+int top, bot;
+uschar *nametable;
+
+if ((rc = pcre_fullinfo(code, NULL, PCRE_INFO_NAMECOUNT, &top)) != 0)
+  return rc;
+if (top <= 0) return PCRE_ERROR_NOSUBSTRING;
+
+if ((rc = pcre_fullinfo(code, NULL, PCRE_INFO_NAMEENTRYSIZE, &entrysize)) != 0)
+  return rc;
+if ((rc = pcre_fullinfo(code, NULL, PCRE_INFO_NAMETABLE, &nametable)) != 0)
+  return rc;
+
+bot = 0;
+while (top > bot)
+  {
+  int mid = (top + bot) / 2;
+  uschar *entry = nametable + entrysize*mid;
+  int c = strcmp(stringname, (char *)(entry + 2));
+  if (c == 0) return (entry[0] << 8) + entry[1];
+  if (c > 0) bot = mid + 1; else top = mid;
+  }
+
+return PCRE_ERROR_NOSUBSTRING;
+}
+
+
+
+/*************************************************
+*     Find (multiple) entries for named string   *
+*************************************************/
+
+/* This is used by the get_first_set() function below, as well as being
+generally available. It is used when duplicated names are permitted.
+
+Arguments:
+  code        the compiled regex
+  stringname  the name whose entries required
+  firstptr    where to put the pointer to the first entry
+  lastptr     where to put the pointer to the last entry
+
+Returns:      the length of each entry, or a negative number
+                (PCRE_ERROR_NOSUBSTRING) if not found
+*/
+
+int
+pcre_get_stringtable_entries(const pcre *code, const char *stringname,
+  char **firstptr, char **lastptr)
+{
+int rc;
+int entrysize;
+int top, bot;
+uschar *nametable, *lastentry;
+
+if ((rc = pcre_fullinfo(code, NULL, PCRE_INFO_NAMECOUNT, &top)) != 0)
+  return rc;
+if (top <= 0) return PCRE_ERROR_NOSUBSTRING;
+
+if ((rc = pcre_fullinfo(code, NULL, PCRE_INFO_NAMEENTRYSIZE, &entrysize)) != 0)
+  return rc;
+if ((rc = pcre_fullinfo(code, NULL, PCRE_INFO_NAMETABLE, &nametable)) != 0)
+  return rc;
+
+lastentry = nametable + entrysize * (top - 1);
+bot = 0;
+while (top > bot)
+  {
+  int mid = (top + bot) / 2;
+  uschar *entry = nametable + entrysize*mid;
+  int c = strcmp(stringname, (char *)(entry + 2));
+  if (c == 0)
+    {
+    uschar *first = entry;
+    uschar *last = entry;
+    while (first > nametable)
+      {
+      if (strcmp(stringname, (char *)(first - entrysize + 2)) != 0) break;
+      first -= entrysize;
+      }
+    while (last < lastentry)
+      {
+      if (strcmp(stringname, (char *)(last + entrysize + 2)) != 0) break;
+      last += entrysize;
+      }
+    *firstptr = (char *)first;
+    *lastptr = (char *)last;
+    return entrysize;
+    }
+  if (c > 0) bot = mid + 1; else top = mid;
+  }
+
+return PCRE_ERROR_NOSUBSTRING;
+}
+
+
+
+/*************************************************
+*    Find first set of multiple named strings    *
+*************************************************/
+
+/* This function allows for duplicate names in the table of named substrings.
+It returns the number of the first one that was set in a pattern match.
+
+Arguments:
+  code         the compiled regex
+  stringname   the name of the capturing substring
+  ovector      the vector of matched substrings
+
+Returns:       the number of the first that is set,
+               or the number of the last one if none are set,
+               or a negative number on error
+*/
+
+static int
+get_first_set(const pcre *code, const char *stringname, int *ovector)
+{
+const real_pcre *re = (const real_pcre *)code;
+int entrysize;
+char *first, *last;
+uschar *entry;
+if ((re->options & PCRE_DUPNAMES) == 0 && (re->flags & PCRE_JCHANGED) == 0)
+  return pcre_get_stringnumber(code, stringname);
+entrysize = pcre_get_stringtable_entries(code, stringname, &first, &last);
+if (entrysize <= 0) return entrysize;
+for (entry = (uschar *)first; entry <= (uschar *)last; entry += entrysize)
+  {
+  int n = (entry[0] << 8) + entry[1];
+  if (ovector[n*2] >= 0) return n;
+  }
+return (first[0] << 8) + first[1];
+}
+
+
+
+
+/*************************************************
+*      Copy captured string to given buffer      *
+*************************************************/
+
+/* This function copies a single captured substring into a given buffer.
+Note that we use memcpy() rather than strncpy() in case there are binary zeros
+in the string.
+
+Arguments:
+  subject        the subject string that was matched
+  ovector        pointer to the offsets table
+  stringcount    the number of substrings that were captured
+                   (i.e. the yield of the pcre_exec call, unless
+                   that was zero, in which case it should be 1/3
+                   of the offset table size)
+  stringnumber   the number of the required substring
+  buffer         where to put the substring
+  size           the size of the buffer
+
+Returns:         if successful:
+                   the length of the copied string, not including the zero
+                   that is put on the end; can be zero
+                 if not successful:
+                   PCRE_ERROR_NOMEMORY (-6) buffer too small
+                   PCRE_ERROR_NOSUBSTRING (-7) no such captured substring
+*/
+
+int
+pcre_copy_substring(const char *subject, int *ovector, int stringcount,
+  int stringnumber, char *buffer, int size)
+{
+int yield;
+if (stringnumber < 0 || stringnumber >= stringcount)
+  return PCRE_ERROR_NOSUBSTRING;
+stringnumber *= 2;
+yield = ovector[stringnumber+1] - ovector[stringnumber];
+if (size < yield + 1) return PCRE_ERROR_NOMEMORY;
+memcpy(buffer, subject + ovector[stringnumber], yield);
+buffer[yield] = 0;
+return yield;
+}
+
+
+
+/*************************************************
+*   Copy named captured string to given buffer   *
+*************************************************/
+
+/* This function copies a single captured substring into a given buffer,
+identifying it by name. If the regex permits duplicate names, the first
+substring that is set is chosen.
+
+Arguments:
+  code           the compiled regex
+  subject        the subject string that was matched
+  ovector        pointer to the offsets table
+  stringcount    the number of substrings that were captured
+                   (i.e. the yield of the pcre_exec call, unless
+                   that was zero, in which case it should be 1/3
+                   of the offset table size)
+  stringname     the name of the required substring
+  buffer         where to put the substring
+  size           the size of the buffer
+
+Returns:         if successful:
+                   the length of the copied string, not including the zero
+                   that is put on the end; can be zero
+                 if not successful:
+                   PCRE_ERROR_NOMEMORY (-6) buffer too small
+                   PCRE_ERROR_NOSUBSTRING (-7) no such captured substring
+*/
+
+int
+pcre_copy_named_substring(const pcre *code, const char *subject, int *ovector,
+  int stringcount, const char *stringname, char *buffer, int size)
+{
+int n = get_first_set(code, stringname, ovector);
+if (n <= 0) return n;
+return pcre_copy_substring(subject, ovector, stringcount, n, buffer, size);
+}
+
+
+
+/*************************************************
+*      Copy all captured strings to new store    *
+*************************************************/
+
+/* This function gets one chunk of store and builds a list of pointers and all
+of the captured substrings in it. A NULL pointer is put on the end of the list.
+
+Arguments:
+  subject        the subject string that was matched
+  ovector        pointer to the offsets table
+  stringcount    the number of substrings that were captured
+                   (i.e. the yield of the pcre_exec call, unless
+                   that was zero, in which case it should be 1/3
+                   of the offset table size)
+  listptr        set to point to the list of pointers
+
+Returns:         if successful: 0
+                 if not successful:
+                   PCRE_ERROR_NOMEMORY (-6) failed to get store
+*/
+
+int
+pcre_get_substring_list(const char *subject, int *ovector, int stringcount,
+  const char ***listptr)
+{
+int i;
+int size = sizeof(char *);
+int double_count = stringcount * 2;
+char **stringlist;
+char *p;
+
+for (i = 0; i < double_count; i += 2)
+  size += sizeof(char *) + ovector[i+1] - ovector[i] + 1;
+
+stringlist = (char **)(pcre_malloc)(size);
+if (stringlist == NULL) return PCRE_ERROR_NOMEMORY;
+
+*listptr = (const char **)stringlist;
+p = (char *)(stringlist + stringcount + 1);
+
+for (i = 0; i < double_count; i += 2)
+  {
+  int len = ovector[i+1] - ovector[i];
+  memcpy(p, subject + ovector[i], len);
+  *stringlist++ = p;
+  p += len;
+  *p++ = 0;
+  }
+
+*stringlist = NULL;
+return 0;
+}
+
+
+
+/*************************************************
+*   Free store obtained by get_substring_list    *
+*************************************************/
+
+/* This function exists for the benefit of people calling PCRE from non-C
+programs that can call its functions, but not free() or (pcre_free)() directly.
+
+Argument:   the result of a previous pcre_get_substring_list()
+Returns:    nothing
+*/
+
+void
+pcre_free_substring_list(const char **pointer)
+{
+(pcre_free)((void *)pointer);
+}
+
+
+
+/*************************************************
+*      Copy captured string to new store         *
+*************************************************/
+
+/* This function copies a single captured substring into a piece of new
+store
+
+Arguments:
+  subject        the subject string that was matched
+  ovector        pointer to the offsets table
+  stringcount    the number of substrings that were captured
+                   (i.e. the yield of the pcre_exec call, unless
+                   that was zero, in which case it should be 1/3
+                   of the offset table size)
+  stringnumber   the number of the required substring
+  stringptr      where to put a pointer to the substring
+
+Returns:         if successful:
+                   the length of the string, not including the zero that
+                   is put on the end; can be zero
+                 if not successful:
+                   PCRE_ERROR_NOMEMORY (-6) failed to get store
+                   PCRE_ERROR_NOSUBSTRING (-7) substring not present
+*/
+
+int
+pcre_get_substring(const char *subject, int *ovector, int stringcount,
+  int stringnumber, const char **stringptr)
+{
+int yield;
+char *substring;
+if (stringnumber < 0 || stringnumber >= stringcount)
+  return PCRE_ERROR_NOSUBSTRING;
+stringnumber *= 2;
+yield = ovector[stringnumber+1] - ovector[stringnumber];
+substring = (char *)(pcre_malloc)(yield + 1);
+if (substring == NULL) return PCRE_ERROR_NOMEMORY;
+memcpy(substring, subject + ovector[stringnumber], yield);
+substring[yield] = 0;
+*stringptr = substring;
+return yield;
+}
+
+
+
+/*************************************************
+*   Copy named captured string to new store      *
+*************************************************/
+
+/* This function copies a single captured substring, identified by name, into
+new store. If the regex permits duplicate names, the first substring that is
+set is chosen.
+
+Arguments:
+  code           the compiled regex
+  subject        the subject string that was matched
+  ovector        pointer to the offsets table
+  stringcount    the number of substrings that were captured
+                   (i.e. the yield of the pcre_exec call, unless
+                   that was zero, in which case it should be 1/3
+                   of the offset table size)
+  stringname     the name of the required substring
+  stringptr      where to put the pointer
+
+Returns:         if successful:
+                   the length of the copied string, not including the zero
+                   that is put on the end; can be zero
+                 if not successful:
+                   PCRE_ERROR_NOMEMORY (-6) couldn't get memory
+                   PCRE_ERROR_NOSUBSTRING (-7) no such captured substring
+*/
+
+int
+pcre_get_named_substring(const pcre *code, const char *subject, int *ovector,
+  int stringcount, const char *stringname, const char **stringptr)
+{
+int n = get_first_set(code, stringname, ovector);
+if (n <= 0) return n;
+return pcre_get_substring(subject, ovector, stringcount, n, stringptr);
+}
+
+
+
+
+/*************************************************
+*       Free store obtained by get_substring     *
+*************************************************/
+
+/* This function exists for the benefit of people calling PCRE from non-C
+programs that can call its functions, but not free() or (pcre_free)() directly.
+
+Argument:   the result of a previous pcre_get_substring()
+Returns:    nothing
+*/
+
+void
+pcre_free_substring(const char *pointer)
+{
+(pcre_free)((void *)pointer);
+}
+
+/* End of pcre_get.c */
diff --git a/uppsrc/plugin/pcre/lib/pcre_globals.c b/uppsrc/plugin/pcre/lib/pcre_globals.c
new file mode 100644
index 000000000..24ed03d39
--- /dev/null
+++ b/uppsrc/plugin/pcre/lib/pcre_globals.c
@@ -0,0 +1,63 @@
+/*************************************************
+*      Perl-Compatible Regular Expressions       *
+*************************************************/
+
+/* PCRE is a library of functions to support regular expressions whose syntax
+and semantics are as close as possible to those of the Perl 5 language.
+
+                       Written by Philip Hazel
+           Copyright (c) 1997-2008 University of Cambridge
+
+-----------------------------------------------------------------------------
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+
+    * Neither the name of the University of Cambridge nor the names of its
+      contributors may be used to endorse or promote products derived from
+      this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+-----------------------------------------------------------------------------
+*/
+
+
+/* This module contains global variables that are exported by the PCRE library.
+PCRE is thread-clean and doesn't use any global variables in the normal sense.
+However, it calls memory allocation and freeing functions via the four
+indirections below, and it can optionally do callouts, using the fifth
+indirection. These values can be changed by the caller, but are shared between
+all threads. However, when compiling for Virtual Pascal, things are done
+differently, and global variables are not used (see pcre.in). */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "pcre_internal.h"
+
+#ifndef VPCOMPAT
+PCRE_EXP_DATA_DEFN void *(*pcre_malloc)(size_t) = malloc;
+PCRE_EXP_DATA_DEFN void  (*pcre_free)(void *) = free;
+PCRE_EXP_DATA_DEFN void *(*pcre_stack_malloc)(size_t) = malloc;
+PCRE_EXP_DATA_DEFN void  (*pcre_stack_free)(void *) = free;
+PCRE_EXP_DATA_DEFN int   (*pcre_callout)(pcre_callout_block *) = NULL;
+#endif
+
+/* End of pcre_globals.c */
diff --git a/uppsrc/plugin/pcre/lib/pcre_info.c b/uppsrc/plugin/pcre/lib/pcre_info.c
new file mode 100644
index 000000000..638a47531
--- /dev/null
+++ b/uppsrc/plugin/pcre/lib/pcre_info.c
@@ -0,0 +1,93 @@
+/*************************************************
+*      Perl-Compatible Regular Expressions       *
+*************************************************/
+
+/* PCRE is a library of functions to support regular expressions whose syntax
+and semantics are as close as possible to those of the Perl 5 language.
+
+                       Written by Philip Hazel
+           Copyright (c) 1997-2008 University of Cambridge
+
+-----------------------------------------------------------------------------
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+
+    * Neither the name of the University of Cambridge nor the names of its
+      contributors may be used to endorse or promote products derived from
+      this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+-----------------------------------------------------------------------------
+*/
+
+
+/* This module contains the external function pcre_info(), which gives some
+information about a compiled pattern. However, use of this function is now
+deprecated, as it has been superseded by pcre_fullinfo(). */
+
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "pcre_internal.h"
+
+
+/*************************************************
+* (Obsolete) Return info about compiled pattern  *
+*************************************************/
+
+/* This is the original "info" function. It picks potentially useful data out
+of the private structure, but its interface was too rigid. It remains for
+backwards compatibility. The public options are passed back in an int - though
+the re->options field has been expanded to a long int, all the public options
+at the low end of it, and so even on 16-bit systems this will still be OK.
+Therefore, I haven't changed the API for pcre_info().
+
+Arguments:
+  argument_re   points to compiled code
+  optptr        where to pass back the options
+  first_byte    where to pass back the first character,
+                or -1 if multiline and all branches start ^,
+                or -2 otherwise
+
+Returns:        number of capturing subpatterns
+                or negative values on error
+*/
+
+PCRE_EXP_DEFN int
+pcre_info(const pcre *argument_re, int *optptr, int *first_byte)
+{
+real_pcre internal_re;
+const real_pcre *re = (const real_pcre *)argument_re;
+if (re == NULL) return PCRE_ERROR_NULL;
+if (re->magic_number != MAGIC_NUMBER)
+  {
+  re = _pcre_try_flipped(re, &internal_re, NULL, NULL);
+  if (re == NULL) return PCRE_ERROR_BADMAGIC;
+  }
+if (optptr != NULL) *optptr = (int)(re->options & PUBLIC_OPTIONS);
+if (first_byte != NULL)
+  *first_byte = ((re->flags & PCRE_FIRSTSET) != 0)? re->first_byte :
+     ((re->flags & PCRE_STARTLINE) != 0)? -1 : -2;
+return re->top_bracket;
+}
+
+/* End of pcre_info.c */
diff --git a/uppsrc/plugin/pcre/lib/pcre_internal.h b/uppsrc/plugin/pcre/lib/pcre_internal.h
new file mode 100644
index 000000000..caf7b831d
--- /dev/null
+++ b/uppsrc/plugin/pcre/lib/pcre_internal.h
@@ -0,0 +1,1126 @@
+/*************************************************
+*      Perl-Compatible Regular Expressions       *
+*************************************************/
+
+
+/* PCRE is a library of functions to support regular expressions whose syntax
+and semantics are as close as possible to those of the Perl 5 language.
+
+                       Written by Philip Hazel
+           Copyright (c) 1997-2008 University of Cambridge
+
+-----------------------------------------------------------------------------
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+
+    * Neither the name of the University of Cambridge nor the names of its
+      contributors may be used to endorse or promote products derived from
+      this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+-----------------------------------------------------------------------------
+*/
+
+/* This header contains definitions that are shared between the different
+modules, but which are not relevant to the exported API. This includes some
+functions whose names all begin with "_pcre_". */
+
+#ifndef PCRE_INTERNAL_H
+#define PCRE_INTERNAL_H
+
+/* Define DEBUG to get debugging output on stdout. */
+
+#if 0
+#define DEBUG
+#endif
+
+/* Use a macro for debugging printing, 'cause that eliminates the use of #ifdef
+inline, and there are *still* stupid compilers about that don't like indented
+pre-processor statements, or at least there were when I first wrote this. After
+all, it had only been about 10 years then...
+
+It turns out that the Mac Debugging.h header also defines the macro DPRINTF, so
+be absolutely sure we get our version. */
+
+#undef DPRINTF
+#ifdef DEBUG
+#define DPRINTF(p) printf p
+#else
+#define DPRINTF(p) /* Nothing */
+#endif
+
+
+/* Standard C headers plus the external interface definition. The only time
+setjmp and stdarg are used is when NO_RECURSE is set. */
+
+#include <ctype.h>
+#include <limits.h>
+#include <setjmp.h>
+#include <stdarg.h>
+#include <stddef.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+/* When compiling a DLL for Windows, the exported symbols have to be declared
+using some MS magic. I found some useful information on this web page:
+http://msdn2.microsoft.com/en-us/library/y4h7bcy6(VS.80).aspx. According to the
+information there, using __declspec(dllexport) without "extern" we have a
+definition; with "extern" we have a declaration. The settings here override the
+setting in pcre.h (which is included below); it defines only PCRE_EXP_DECL,
+which is all that is needed for applications (they just import the symbols). We
+use:
+
+  PCRE_EXP_DECL       for declarations
+  PCRE_EXP_DEFN       for definitions of exported functions
+  PCRE_EXP_DATA_DEFN  for definitions of exported variables
+
+The reason for the two DEFN macros is that in non-Windows environments, one
+does not want to have "extern" before variable definitions because it leads to
+compiler warnings. So we distinguish between functions and variables. In
+Windows, the two should always be the same.
+
+The reason for wrapping this in #ifndef PCRE_EXP_DECL is so that pcretest,
+which is an application, but needs to import this file in order to "peek" at
+internals, can #include pcre.h first to get an application's-eye view.
+
+In principle, people compiling for non-Windows, non-Unix-like (i.e. uncommon,
+special-purpose environments) might want to stick other stuff in front of
+exported symbols. That's why, in the non-Windows case, we set PCRE_EXP_DEFN and
+PCRE_EXP_DATA_DEFN only if they are not already set. */
+
+#ifndef PCRE_EXP_DECL
+#  ifdef _WIN32
+#    ifndef PCRE_STATIC
+#      define PCRE_EXP_DECL       extern __declspec(dllexport)
+#      define PCRE_EXP_DEFN       __declspec(dllexport)
+#      define PCRE_EXP_DATA_DEFN  __declspec(dllexport)
+#    else
+#      define PCRE_EXP_DECL       extern
+#      define PCRE_EXP_DEFN
+#      define PCRE_EXP_DATA_DEFN
+#    endif
+#  else
+#    ifdef __cplusplus
+#      define PCRE_EXP_DECL       extern "C"
+#    else
+#      define PCRE_EXP_DECL       extern
+#    endif
+#    ifndef PCRE_EXP_DEFN
+#      define PCRE_EXP_DEFN       PCRE_EXP_DECL
+#    endif
+#    ifndef PCRE_EXP_DATA_DEFN
+#      define PCRE_EXP_DATA_DEFN
+#    endif
+#  endif
+#endif
+
+/* We need to have types that specify unsigned 16-bit and 32-bit integers. We
+cannot determine these outside the compilation (e.g. by running a program as
+part of "configure") because PCRE is often cross-compiled for use on other
+systems. Instead we make use of the maximum sizes that are available at
+preprocessor time in standard C environments. */
+
+#if USHRT_MAX == 65535
+  typedef unsigned short pcre_uint16;
+#elif UINT_MAX == 65535
+  typedef unsigned int pcre_uint16;
+#else
+  #error Cannot determine a type for 16-bit unsigned integers
+#endif
+
+#if UINT_MAX == 4294967295
+  typedef unsigned int pcre_uint32;
+#elif ULONG_MAX == 4294967295
+  typedef unsigned long int pcre_uint32;
+#else
+  #error Cannot determine a type for 32-bit unsigned integers
+#endif
+
+/* All character handling must be done as unsigned characters. Otherwise there
+are problems with top-bit-set characters and functions such as isspace().
+However, we leave the interface to the outside world as char *, because that
+should make things easier for callers. We define a short type for unsigned char
+to save lots of typing. I tried "uchar", but it causes problems on Digital
+Unix, where it is defined in sys/types, so use "uschar" instead. */
+
+typedef unsigned char uschar;
+
+/* This is an unsigned int value that no character can ever have. UTF-8
+characters only go up to 0x7fffffff (though Unicode doesn't go beyond
+0x0010ffff). */
+
+#define NOTACHAR 0xffffffff
+
+/* PCRE is able to support several different kinds of newline (CR, LF, CRLF,
+"any" and "anycrlf" at present). The following macros are used to package up
+testing for newlines. NLBLOCK, PSSTART, and PSEND are defined in the various
+modules to indicate in which datablock the parameters exist, and what the
+start/end of string field names are. */
+
+#define NLTYPE_FIXED    0     /* Newline is a fixed length string */
+#define NLTYPE_ANY      1     /* Newline is any Unicode line ending */
+#define NLTYPE_ANYCRLF  2     /* Newline is CR, LF, or CRLF */
+
+/* This macro checks for a newline at the given position */
+
+#define IS_NEWLINE(p) \
+  ((NLBLOCK->nltype != NLTYPE_FIXED)? \
+    ((p) < NLBLOCK->PSEND && \
+     _pcre_is_newline((p), NLBLOCK->nltype, NLBLOCK->PSEND, &(NLBLOCK->nllen),\
+       utf8)) \
+    : \
+    ((p) <= NLBLOCK->PSEND - NLBLOCK->nllen && \
+     (p)[0] == NLBLOCK->nl[0] && \
+     (NLBLOCK->nllen == 1 || (p)[1] == NLBLOCK->nl[1]) \
+    ) \
+  )
+
+/* This macro checks for a newline immediately preceding the given position */
+
+#define WAS_NEWLINE(p) \
+  ((NLBLOCK->nltype != NLTYPE_FIXED)? \
+    ((p) > NLBLOCK->PSSTART && \
+     _pcre_was_newline((p), NLBLOCK->nltype, NLBLOCK->PSSTART, \
+       &(NLBLOCK->nllen), utf8)) \
+    : \
+    ((p) >= NLBLOCK->PSSTART + NLBLOCK->nllen && \
+     (p)[-NLBLOCK->nllen] == NLBLOCK->nl[0] && \
+     (NLBLOCK->nllen == 1 || (p)[-NLBLOCK->nllen+1] == NLBLOCK->nl[1]) \
+    ) \
+  )
+
+/* When PCRE is compiled as a C++ library, the subject pointer can be replaced
+with a custom type. This makes it possible, for example, to allow pcre_exec()
+to process subject strings that are discontinuous by using a smart pointer
+class. It must always be possible to inspect all of the subject string in
+pcre_exec() because of the way it backtracks. Two macros are required in the
+normal case, for sign-unspecified and unsigned char pointers. The former is
+used for the external interface and appears in pcre.h, which is why its name
+must begin with PCRE_. */
+
+#ifdef CUSTOM_SUBJECT_PTR
+#define PCRE_SPTR CUSTOM_SUBJECT_PTR
+#define USPTR CUSTOM_SUBJECT_PTR
+#else
+#define PCRE_SPTR const char *
+#define USPTR const unsigned char *
+#endif
+
+
+
+/* Include the public PCRE header and the definitions of UCP character property
+values. */
+
+#include "pcre.h"
+#include "ucp.h"
+
+/* When compiling for use with the Virtual Pascal compiler, these functions
+need to have their names changed. PCRE must be compiled with the -DVPCOMPAT
+option on the command line. */
+
+#ifdef VPCOMPAT
+#define strlen(s)        _strlen(s)
+#define strncmp(s1,s2,m) _strncmp(s1,s2,m)
+#define memcmp(s,c,n)    _memcmp(s,c,n)
+#define memcpy(d,s,n)    _memcpy(d,s,n)
+#define memmove(d,s,n)   _memmove(d,s,n)
+#define memset(s,c,n)    _memset(s,c,n)
+#else  /* VPCOMPAT */
+
+/* To cope with SunOS4 and other systems that lack memmove() but have bcopy(),
+define a macro for memmove() if HAVE_MEMMOVE is false, provided that HAVE_BCOPY
+is set. Otherwise, include an emulating function for those systems that have
+neither (there some non-Unix environments where this is the case). */
+
+#ifndef HAVE_MEMMOVE
+#undef  memmove        /* some systems may have a macro */
+#ifdef HAVE_BCOPY
+#define memmove(a, b, c) bcopy(b, a, c)
+#else  /* HAVE_BCOPY */
+static void *
+pcre_memmove(void *d, const void *s, size_t n)
+{
+size_t i;
+unsigned char *dest = (unsigned char *)d;
+const unsigned char *src = (const unsigned char *)s;
+if (dest > src)
+  {
+  dest += n;
+  src += n;
+  for (i = 0; i < n; ++i) *(--dest) = *(--src);
+  return (void *)dest;
+  }
+else
+  {
+  for (i = 0; i < n; ++i) *dest++ = *src++;
+  return (void *)(dest - n);
+  }
+}
+#define memmove(a, b, c) pcre_memmove(a, b, c)
+#endif   /* not HAVE_BCOPY */
+#endif   /* not HAVE_MEMMOVE */
+#endif   /* not VPCOMPAT */
+
+
+/* PCRE keeps offsets in its compiled code as 2-byte quantities (always stored
+in big-endian order) by default. These are used, for example, to link from the
+start of a subpattern to its alternatives and its end. The use of 2 bytes per
+offset limits the size of the compiled regex to around 64K, which is big enough
+for almost everybody. However, I received a request for an even bigger limit.
+For this reason, and also to make the code easier to maintain, the storing and
+loading of offsets from the byte string is now handled by the macros that are
+defined here.
+
+The macros are controlled by the value of LINK_SIZE. This defaults to 2 in
+the config.h file, but can be overridden by using -D on the command line. This
+is automated on Unix systems via the "configure" command. */
+
+#if LINK_SIZE == 2
+
+#define PUT(a,n,d)   \
+  (a[n] = (d) >> 8), \
+  (a[(n)+1] = (d) & 255)
+
+#define GET(a,n) \
+  (((a)[n] << 8) | (a)[(n)+1])
+
+#define MAX_PATTERN_SIZE (1 << 16)
+
+
+#elif LINK_SIZE == 3
+
+#define PUT(a,n,d)       \
+  (a[n] = (d) >> 16),    \
+  (a[(n)+1] = (d) >> 8), \
+  (a[(n)+2] = (d) & 255)
+
+#define GET(a,n) \
+  (((a)[n] << 16) | ((a)[(n)+1] << 8) | (a)[(n)+2])
+
+#define MAX_PATTERN_SIZE (1 << 24)
+
+
+#elif LINK_SIZE == 4
+
+#define PUT(a,n,d)        \
+  (a[n] = (d) >> 24),     \
+  (a[(n)+1] = (d) >> 16), \
+  (a[(n)+2] = (d) >> 8),  \
+  (a[(n)+3] = (d) & 255)
+
+#define GET(a,n) \
+  (((a)[n] << 24) | ((a)[(n)+1] << 16) | ((a)[(n)+2] << 8) | (a)[(n)+3])
+
+#define MAX_PATTERN_SIZE (1 << 30)   /* Keep it positive */
+
+
+#else
+#error LINK_SIZE must be either 2, 3, or 4
+#endif
+
+
+/* Convenience macro defined in terms of the others */
+
+#define PUTINC(a,n,d)   PUT(a,n,d), a += LINK_SIZE
+
+
+/* PCRE uses some other 2-byte quantities that do not change when the size of
+offsets changes. There are used for repeat counts and for other things such as
+capturing parenthesis numbers in back references. */
+
+#define PUT2(a,n,d)   \
+  a[n] = (d) >> 8; \
+  a[(n)+1] = (d) & 255
+
+#define GET2(a,n) \
+  (((a)[n] << 8) | (a)[(n)+1])
+
+#define PUT2INC(a,n,d)  PUT2(a,n,d), a += 2
+
+
+/* When UTF-8 encoding is being used, a character is no longer just a single
+byte. The macros for character handling generate simple sequences when used in
+byte-mode, and more complicated ones for UTF-8 characters. BACKCHAR should
+never be called in byte mode. To make sure it can never even appear when UTF-8
+support is omitted, we don't even define it. */
+
+#ifndef SUPPORT_UTF8
+#define NEXTCHAR(p) p++;
+#define GETCHAR(c, eptr) c = *eptr;
+#define GETCHARTEST(c, eptr) c = *eptr;
+#define GETCHARINC(c, eptr) c = *eptr++;
+#define GETCHARINCTEST(c, eptr) c = *eptr++;
+#define GETCHARLEN(c, eptr, len) c = *eptr;
+/* #define BACKCHAR(eptr) */
+
+#else   /* SUPPORT_UTF8 */
+
+/* Advance a character pointer one byte in non-UTF-8 mode and by one character
+in UTF-8 mode. */
+
+#define NEXTCHAR(p) \
+  p++; \
+  if (utf8) { while((*p & 0xc0) == 0x80) p++; }
+
+/* Get the next UTF-8 character, not advancing the pointer. This is called when
+we know we are in UTF-8 mode. */
+
+#define GETCHAR(c, eptr) \
+  c = *eptr; \
+  if (c >= 0xc0) \
+    { \
+    int gcii; \
+    int gcaa = _pcre_utf8_table4[c & 0x3f];  /* Number of additional bytes */ \
+    int gcss = 6*gcaa; \
+    c = (c & _pcre_utf8_table3[gcaa]) << gcss; \
+    for (gcii = 1; gcii <= gcaa; gcii++) \
+      { \
+      gcss -= 6; \
+      c |= (eptr[gcii] & 0x3f) << gcss; \
+      } \
+    }
+
+/* Get the next UTF-8 character, testing for UTF-8 mode, and not advancing the
+pointer. */
+
+#define GETCHARTEST(c, eptr) \
+  c = *eptr; \
+  if (utf8 && c >= 0xc0) \
+    { \
+    int gcii; \
+    int gcaa = _pcre_utf8_table4[c & 0x3f];  /* Number of additional bytes */ \
+    int gcss = 6*gcaa; \
+    c = (c & _pcre_utf8_table3[gcaa]) << gcss; \
+    for (gcii = 1; gcii <= gcaa; gcii++) \
+      { \
+      gcss -= 6; \
+      c |= (eptr[gcii] & 0x3f) << gcss; \
+      } \
+    }
+
+/* Get the next UTF-8 character, advancing the pointer. This is called when we
+know we are in UTF-8 mode. */
+
+#define GETCHARINC(c, eptr) \
+  c = *eptr++; \
+  if (c >= 0xc0) \
+    { \
+    int gcaa = _pcre_utf8_table4[c & 0x3f];  /* Number of additional bytes */ \
+    int gcss = 6*gcaa; \
+    c = (c & _pcre_utf8_table3[gcaa]) << gcss; \
+    while (gcaa-- > 0) \
+      { \
+      gcss -= 6; \
+      c |= (*eptr++ & 0x3f) << gcss; \
+      } \
+    }
+
+/* Get the next character, testing for UTF-8 mode, and advancing the pointer */
+
+#define GETCHARINCTEST(c, eptr) \
+  c = *eptr++; \
+  if (utf8 && c >= 0xc0) \
+    { \
+    int gcaa = _pcre_utf8_table4[c & 0x3f];  /* Number of additional bytes */ \
+    int gcss = 6*gcaa; \
+    c = (c & _pcre_utf8_table3[gcaa]) << gcss; \
+    while (gcaa-- > 0) \
+      { \
+      gcss -= 6; \
+      c |= (*eptr++ & 0x3f) << gcss; \
+      } \
+    }
+
+/* Get the next UTF-8 character, not advancing the pointer, incrementing length
+if there are extra bytes. This is called when we know we are in UTF-8 mode. */
+
+#define GETCHARLEN(c, eptr, len) \
+  c = *eptr; \
+  if (c >= 0xc0) \
+    { \
+    int gcii; \
+    int gcaa = _pcre_utf8_table4[c & 0x3f];  /* Number of additional bytes */ \
+    int gcss = 6*gcaa; \
+    c = (c & _pcre_utf8_table3[gcaa]) << gcss; \
+    for (gcii = 1; gcii <= gcaa; gcii++) \
+      { \
+      gcss -= 6; \
+      c |= (eptr[gcii] & 0x3f) << gcss; \
+      } \
+    len += gcaa; \
+    }
+
+/* If the pointer is not at the start of a character, move it back until
+it is. This is called only in UTF-8 mode - we don't put a test within the macro
+because almost all calls are already within a block of UTF-8 only code. */
+
+#define BACKCHAR(eptr) while((*eptr & 0xc0) == 0x80) eptr--
+
+#endif
+
+
+/* In case there is no definition of offsetof() provided - though any proper
+Standard C system should have one. */
+
+#ifndef offsetof
+#define offsetof(p_type,field) ((size_t)&(((p_type *)0)->field))
+#endif
+
+
+/* These are the public options that can change during matching. */
+
+#define PCRE_IMS (PCRE_CASELESS|PCRE_MULTILINE|PCRE_DOTALL)
+
+/* Private flags containing information about the compiled regex. They used to
+live at the top end of the options word, but that got almost full, so now they
+are in a 16-bit flags word. */
+
+#define PCRE_NOPARTIAL     0x0001  /* can't use partial with this regex */
+#define PCRE_FIRSTSET      0x0002  /* first_byte is set */
+#define PCRE_REQCHSET      0x0004  /* req_byte is set */
+#define PCRE_STARTLINE     0x0008  /* start after \n for multiline */
+#define PCRE_JCHANGED      0x0010  /* j option used in regex */
+#define PCRE_HASCRORLF     0x0020  /* explicit \r or \n in pattern */
+
+/* Options for the "extra" block produced by pcre_study(). */
+
+#define PCRE_STUDY_MAPPED   0x01     /* a map of starting chars exists */
+
+/* Masks for identifying the public options that are permitted at compile
+time, run time, or study time, respectively. */
+
+#define PCRE_NEWLINE_BITS (PCRE_NEWLINE_CR|PCRE_NEWLINE_LF|PCRE_NEWLINE_ANY| \
+                           PCRE_NEWLINE_ANYCRLF)
+
+#define PUBLIC_OPTIONS \
+  (PCRE_CASELESS|PCRE_EXTENDED|PCRE_ANCHORED|PCRE_MULTILINE| \
+   PCRE_DOTALL|PCRE_DOLLAR_ENDONLY|PCRE_EXTRA|PCRE_UNGREEDY|PCRE_UTF8| \
+   PCRE_NO_AUTO_CAPTURE|PCRE_NO_UTF8_CHECK|PCRE_AUTO_CALLOUT|PCRE_FIRSTLINE| \
+   PCRE_DUPNAMES|PCRE_NEWLINE_BITS|PCRE_BSR_ANYCRLF|PCRE_BSR_UNICODE)
+
+#define PUBLIC_EXEC_OPTIONS \
+  (PCRE_ANCHORED|PCRE_NOTBOL|PCRE_NOTEOL|PCRE_NOTEMPTY|PCRE_NO_UTF8_CHECK| \
+   PCRE_PARTIAL|PCRE_NEWLINE_BITS|PCRE_BSR_ANYCRLF|PCRE_BSR_UNICODE)
+
+#define PUBLIC_DFA_EXEC_OPTIONS \
+  (PCRE_ANCHORED|PCRE_NOTBOL|PCRE_NOTEOL|PCRE_NOTEMPTY|PCRE_NO_UTF8_CHECK| \
+   PCRE_PARTIAL|PCRE_DFA_SHORTEST|PCRE_DFA_RESTART|PCRE_NEWLINE_BITS| \
+   PCRE_BSR_ANYCRLF|PCRE_BSR_UNICODE)
+
+#define PUBLIC_STUDY_OPTIONS 0   /* None defined */
+
+/* Magic number to provide a small check against being handed junk. Also used
+to detect whether a pattern was compiled on a host of different endianness. */
+
+#define MAGIC_NUMBER  0x50435245UL   /* 'PCRE' */
+
+/* Negative values for the firstchar and reqchar variables */
+
+#define REQ_UNSET (-2)
+#define REQ_NONE  (-1)
+
+/* The maximum remaining length of subject we are prepared to search for a
+req_byte match. */
+
+#define REQ_BYTE_MAX 1000
+
+/* Flags added to firstbyte or reqbyte; a "non-literal" item is either a
+variable-length repeat, or a anything other than literal characters. */
+
+#define REQ_CASELESS 0x0100    /* indicates caselessness */
+#define REQ_VARY     0x0200    /* reqbyte followed non-literal item */
+
+/* Miscellaneous definitions */
+
+typedef int BOOL;
+
+#define FALSE   0
+#define TRUE    1
+
+/* Escape items that are just an encoding of a particular data value. */
+
+#ifndef ESC_e
+#define ESC_e 27
+#endif
+
+#ifndef ESC_f
+#define ESC_f '\f'
+#endif
+
+#ifndef ESC_n
+#define ESC_n '\n'
+#endif
+
+#ifndef ESC_r
+#define ESC_r '\r'
+#endif
+
+/* We can't officially use ESC_t because it is a POSIX reserved identifier
+(presumably because of all the others like size_t). */
+
+#ifndef ESC_tee
+#define ESC_tee '\t'
+#endif
+
+/* Codes for different types of Unicode property */
+
+#define PT_ANY        0    /* Any property - matches all chars */
+#define PT_LAMP       1    /* L& - the union of Lu, Ll, Lt */
+#define PT_GC         2    /* General characteristic (e.g. L) */
+#define PT_PC         3    /* Particular characteristic (e.g. Lu) */
+#define PT_SC         4    /* Script (e.g. Han) */
+
+/* Flag bits and data types for the extended class (OP_XCLASS) for classes that
+contain UTF-8 characters with values greater than 255. */
+
+#define XCL_NOT    0x01    /* Flag: this is a negative class */
+#define XCL_MAP    0x02    /* Flag: a 32-byte map is present */
+
+#define XCL_END       0    /* Marks end of individual items */
+#define XCL_SINGLE    1    /* Single item (one multibyte char) follows */
+#define XCL_RANGE     2    /* A range (two multibyte chars) follows */
+#define XCL_PROP      3    /* Unicode property (2-byte property code follows) */
+#define XCL_NOTPROP   4    /* Unicode inverted property (ditto) */
+
+/* These are escaped items that aren't just an encoding of a particular data
+value such as \n. They must have non-zero values, as check_escape() returns
+their negation. Also, they must appear in the same order as in the opcode
+definitions below, up to ESC_z. There's a dummy for OP_ANY because it
+corresponds to "." rather than an escape sequence. The final one must be
+ESC_REF as subsequent values are used for backreferences (\1, \2, \3, etc).
+There are two tests in the code for an escape greater than ESC_b and less than
+ESC_Z to detect the types that may be repeated. These are the types that
+consume characters. If any new escapes are put in between that don't consume a
+character, that code will have to change. */
+
+enum { ESC_A = 1, ESC_G, ESC_K, ESC_B, ESC_b, ESC_D, ESC_d, ESC_S, ESC_s,
+       ESC_W, ESC_w, ESC_dum1, ESC_C, ESC_P, ESC_p, ESC_R, ESC_H, ESC_h,
+       ESC_V, ESC_v, ESC_X, ESC_Z, ESC_z, ESC_E, ESC_Q, ESC_k, ESC_REF };
+
+
+/* Opcode table: Starting from 1 (i.e. after OP_END), the values up to
+OP_EOD must correspond in order to the list of escapes immediately above.
+
+*** NOTE NOTE NOTE *** Whenever this list is updated, the two macro definitions
+that follow must also be updated to match. There is also a table called
+"coptable" in pcre_dfa_exec.c that must be updated. */
+
+enum {
+  OP_END,            /* 0 End of pattern */
+
+  /* Values corresponding to backslashed metacharacters */
+
+  OP_SOD,            /* 1 Start of data: \A */
+  OP_SOM,            /* 2 Start of match (subject + offset): \G */
+  OP_SET_SOM,        /* 3 Set start of match (\K) */
+  OP_NOT_WORD_BOUNDARY,  /*  4 \B */
+  OP_WORD_BOUNDARY,      /*  5 \b */
+  OP_NOT_DIGIT,          /*  6 \D */
+  OP_DIGIT,              /*  7 \d */
+  OP_NOT_WHITESPACE,     /*  8 \S */
+  OP_WHITESPACE,         /*  9 \s */
+  OP_NOT_WORDCHAR,       /* 10 \W */
+  OP_WORDCHAR,           /* 11 \w */
+  OP_ANY,            /* 12 Match any character */
+  OP_ANYBYTE,        /* 13 Match any byte (\C); different to OP_ANY for UTF-8 */
+  OP_NOTPROP,        /* 14 \P (not Unicode property) */
+  OP_PROP,           /* 15 \p (Unicode property) */
+  OP_ANYNL,          /* 16 \R (any newline sequence) */
+  OP_NOT_HSPACE,     /* 17 \H (not horizontal whitespace) */
+  OP_HSPACE,         /* 18 \h (horizontal whitespace) */
+  OP_NOT_VSPACE,     /* 19 \V (not vertical whitespace) */
+  OP_VSPACE,         /* 20 \v (vertical whitespace) */
+  OP_EXTUNI,         /* 21 \X (extended Unicode sequence */
+  OP_EODN,           /* 22 End of data or \n at end of data: \Z. */
+  OP_EOD,            /* 23 End of data: \z */
+
+  OP_OPT,            /* 24 Set runtime options */
+  OP_CIRC,           /* 25 Start of line - varies with multiline switch */
+  OP_DOLL,           /* 26 End of line - varies with multiline switch */
+  OP_CHAR,           /* 27 Match one character, casefully */
+  OP_CHARNC,         /* 28 Match one character, caselessly */
+  OP_NOT,            /* 29 Match one character, not the following one */
+
+  OP_STAR,           /* 30 The maximizing and minimizing versions of */
+  OP_MINSTAR,        /* 31 these six opcodes must come in pairs, with */
+  OP_PLUS,           /* 32 the minimizing one second. */
+  OP_MINPLUS,        /* 33 This first set applies to single characters.*/
+  OP_QUERY,          /* 34 */
+  OP_MINQUERY,       /* 35 */
+
+  OP_UPTO,           /* 36 From 0 to n matches */
+  OP_MINUPTO,        /* 37 */
+  OP_EXACT,          /* 38 Exactly n matches */
+
+  OP_POSSTAR,        /* 39 Possessified star */
+  OP_POSPLUS,        /* 40 Possessified plus */
+  OP_POSQUERY,       /* 41 Posesssified query */
+  OP_POSUPTO,        /* 42 Possessified upto */
+
+  OP_NOTSTAR,        /* 43 The maximizing and minimizing versions of */
+  OP_NOTMINSTAR,     /* 44 these six opcodes must come in pairs, with */
+  OP_NOTPLUS,        /* 45 the minimizing one second. They must be in */
+  OP_NOTMINPLUS,     /* 46 exactly the same order as those above. */
+  OP_NOTQUERY,       /* 47 This set applies to "not" single characters. */
+  OP_NOTMINQUERY,    /* 48 */
+
+  OP_NOTUPTO,        /* 49 From 0 to n matches */
+  OP_NOTMINUPTO,     /* 50 */
+  OP_NOTEXACT,       /* 51 Exactly n matches */
+
+  OP_NOTPOSSTAR,     /* 52 Possessified versions */
+  OP_NOTPOSPLUS,     /* 53 */
+  OP_NOTPOSQUERY,    /* 54 */
+  OP_NOTPOSUPTO,     /* 55 */
+
+  OP_TYPESTAR,       /* 56 The maximizing and minimizing versions of */
+  OP_TYPEMINSTAR,    /* 57 these six opcodes must come in pairs, with */
+  OP_TYPEPLUS,       /* 58 the minimizing one second. These codes must */
+  OP_TYPEMINPLUS,    /* 59 be in exactly the same order as those above. */
+  OP_TYPEQUERY,      /* 60 This set applies to character types such as \d */
+  OP_TYPEMINQUERY,   /* 61 */
+
+  OP_TYPEUPTO,       /* 62 From 0 to n matches */
+  OP_TYPEMINUPTO,    /* 63 */
+  OP_TYPEEXACT,      /* 64 Exactly n matches */
+
+  OP_TYPEPOSSTAR,    /* 65 Possessified versions */
+  OP_TYPEPOSPLUS,    /* 66 */
+  OP_TYPEPOSQUERY,   /* 67 */
+  OP_TYPEPOSUPTO,    /* 68 */
+
+  OP_CRSTAR,         /* 69 The maximizing and minimizing versions of */
+  OP_CRMINSTAR,      /* 70 all these opcodes must come in pairs, with */
+  OP_CRPLUS,         /* 71 the minimizing one second. These codes must */
+  OP_CRMINPLUS,      /* 72 be in exactly the same order as those above. */
+  OP_CRQUERY,        /* 73 These are for character classes and back refs */
+  OP_CRMINQUERY,     /* 74 */
+  OP_CRRANGE,        /* 75 These are different to the three sets above. */
+  OP_CRMINRANGE,     /* 76 */
+
+  OP_CLASS,          /* 77 Match a character class, chars < 256 only */
+  OP_NCLASS,         /* 78 Same, but the bitmap was created from a negative
+                           class - the difference is relevant only when a UTF-8
+                           character > 255 is encountered. */
+
+  OP_XCLASS,         /* 79 Extended class for handling UTF-8 chars within the
+                           class. This does both positive and negative. */
+
+  OP_REF,            /* 80 Match a back reference */
+  OP_RECURSE,        /* 81 Match a numbered subpattern (possibly recursive) */
+  OP_CALLOUT,        /* 82 Call out to external function if provided */
+
+  OP_ALT,            /* 83 Start of alternation */
+  OP_KET,            /* 84 End of group that doesn't have an unbounded repeat */
+  OP_KETRMAX,        /* 85 These two must remain together and in this */
+  OP_KETRMIN,        /* 86 order. They are for groups the repeat for ever. */
+
+  /* The assertions must come before BRA, CBRA, ONCE, and COND.*/
+
+  OP_ASSERT,         /* 87 Positive lookahead */
+  OP_ASSERT_NOT,     /* 88 Negative lookahead */
+  OP_ASSERTBACK,     /* 89 Positive lookbehind */
+  OP_ASSERTBACK_NOT, /* 90 Negative lookbehind */
+  OP_REVERSE,        /* 91 Move pointer back - used in lookbehind assertions */
+
+  /* ONCE, BRA, CBRA, and COND must come after the assertions, with ONCE first,
+  as there's a test for >= ONCE for a subpattern that isn't an assertion. */
+
+  OP_ONCE,           /* 92 Atomic group */
+  OP_BRA,            /* 93 Start of non-capturing bracket */
+  OP_CBRA,           /* 94 Start of capturing bracket */
+  OP_COND,           /* 95 Conditional group */
+
+  /* These three must follow the previous three, in the same order. There's a
+  check for >= SBRA to distinguish the two sets. */
+
+  OP_SBRA,           /* 96 Start of non-capturing bracket, check empty  */
+  OP_SCBRA,          /* 97 Start of capturing bracket, check empty */
+  OP_SCOND,          /* 98 Conditional group, check empty */
+
+  OP_CREF,           /* 99 Used to hold a capture number as condition */
+  OP_RREF,           /* 100 Used to hold a recursion number as condition */
+  OP_DEF,            /* 101 The DEFINE condition */
+
+  OP_BRAZERO,        /* 102 These two must remain together and in this */
+  OP_BRAMINZERO,     /* 103 order. */
+
+  /* These are backtracking control verbs */
+
+  OP_PRUNE,          /* 104 */
+  OP_SKIP,           /* 105 */
+  OP_THEN,           /* 106 */
+  OP_COMMIT,         /* 107 */
+
+  /* These are forced failure and success verbs */
+
+  OP_FAIL,           /* 108 */
+  OP_ACCEPT          /* 109 */
+};
+
+
+/* This macro defines textual names for all the opcodes. These are used only
+for debugging. The macro is referenced only in pcre_printint.c. */
+
+#define OP_NAME_LIST \
+  "End", "\\A", "\\G", "\\K", "\\B", "\\b", "\\D", "\\d",         \
+  "\\S", "\\s", "\\W", "\\w", "Any", "Anybyte",                   \
+  "notprop", "prop", "\\R", "\\H", "\\h", "\\V", "\\v",           \
+  "extuni",  "\\Z", "\\z",                                        \
+  "Opt", "^", "$", "char", "charnc", "not",                       \
+  "*", "*?", "+", "+?", "?", "??", "{", "{", "{",                 \
+  "*+","++", "?+", "{",                                           \
+  "*", "*?", "+", "+?", "?", "??", "{", "{", "{",                 \
+  "*+","++", "?+", "{",                                           \
+  "*", "*?", "+", "+?", "?", "??", "{", "{", "{",                 \
+  "*+","++", "?+", "{",                                           \
+  "*", "*?", "+", "+?", "?", "??", "{", "{",                      \
+  "class", "nclass", "xclass", "Ref", "Recurse", "Callout",       \
+  "Alt", "Ket", "KetRmax", "KetRmin", "Assert", "Assert not",     \
+  "AssertB", "AssertB not", "Reverse",                            \
+  "Once", "Bra", "CBra", "Cond", "SBra", "SCBra", "SCond",        \
+  "Cond ref", "Cond rec", "Cond def", "Brazero", "Braminzero",    \
+  "*PRUNE", "*SKIP", "*THEN", "*COMMIT", "*FAIL", "*ACCEPT"
+
+
+/* This macro defines the length of fixed length operations in the compiled
+regex. The lengths are used when searching for specific things, and also in the
+debugging printing of a compiled regex. We use a macro so that it can be
+defined close to the definitions of the opcodes themselves.
+
+As things have been extended, some of these are no longer fixed lenths, but are
+minima instead. For example, the length of a single-character repeat may vary
+in UTF-8 mode. The code that uses this table must know about such things. */
+
+#define OP_LENGTHS \
+  1,                             /* End                                    */ \
+  1, 1, 1, 1, 1,                 /* \A, \G, \K, \B, \b                     */ \
+  1, 1, 1, 1, 1, 1,              /* \D, \d, \S, \s, \W, \w                 */ \
+  1, 1,                          /* Any, Anybyte                           */ \
+  3, 3, 1,                       /* NOTPROP, PROP, EXTUNI                  */ \
+  1, 1, 1, 1, 1,                 /* \R, \H, \h, \V, \v                     */ \
+  1, 1, 2, 1, 1,                 /* \Z, \z, Opt, ^, $                      */ \
+  2,                             /* Char  - the minimum length             */ \
+  2,                             /* Charnc  - the minimum length           */ \
+  2,                             /* not                                    */ \
+  /* Positive single-char repeats                            ** These are  */ \
+  2, 2, 2, 2, 2, 2,              /* *, *?, +, +?, ?, ??      ** minima in  */ \
+  4, 4, 4,                       /* upto, minupto, exact     ** UTF-8 mode */ \
+  2, 2, 2, 4,                    /* *+, ++, ?+, upto+                      */ \
+  /* Negative single-char repeats - only for chars < 256                   */ \
+  2, 2, 2, 2, 2, 2,              /* NOT *, *?, +, +?, ?, ??                */ \
+  4, 4, 4,                       /* NOT upto, minupto, exact               */ \
+  2, 2, 2, 4,                    /* Possessive *, +, ?, upto               */ \
+  /* Positive type repeats                                                 */ \
+  2, 2, 2, 2, 2, 2,              /* Type *, *?, +, +?, ?, ??               */ \
+  4, 4, 4,                       /* Type upto, minupto, exact              */ \
+  2, 2, 2, 4,                    /* Possessive *+, ++, ?+, upto+           */ \
+  /* Character class & ref repeats                                         */ \
+  1, 1, 1, 1, 1, 1,              /* *, *?, +, +?, ?, ??                    */ \
+  5, 5,                          /* CRRANGE, CRMINRANGE                    */ \
+ 33,                             /* CLASS                                  */ \
+ 33,                             /* NCLASS                                 */ \
+  0,                             /* XCLASS - variable length               */ \
+  3,                             /* REF                                    */ \
+  1+LINK_SIZE,                   /* RECURSE                                */ \
+  2+2*LINK_SIZE,                 /* CALLOUT                                */ \
+  1+LINK_SIZE,                   /* Alt                                    */ \
+  1+LINK_SIZE,                   /* Ket                                    */ \
+  1+LINK_SIZE,                   /* KetRmax                                */ \
+  1+LINK_SIZE,                   /* KetRmin                                */ \
+  1+LINK_SIZE,                   /* Assert                                 */ \
+  1+LINK_SIZE,                   /* Assert not                             */ \
+  1+LINK_SIZE,                   /* Assert behind                          */ \
+  1+LINK_SIZE,                   /* Assert behind not                      */ \
+  1+LINK_SIZE,                   /* Reverse                                */ \
+  1+LINK_SIZE,                   /* ONCE                                   */ \
+  1+LINK_SIZE,                   /* BRA                                    */ \
+  3+LINK_SIZE,                   /* CBRA                                   */ \
+  1+LINK_SIZE,                   /* COND                                   */ \
+  1+LINK_SIZE,                   /* SBRA                                   */ \
+  3+LINK_SIZE,                   /* SCBRA                                  */ \
+  1+LINK_SIZE,                   /* SCOND                                  */ \
+  3,                             /* CREF                                   */ \
+  3,                             /* RREF                                   */ \
+  1,                             /* DEF                                    */ \
+  1, 1,                          /* BRAZERO, BRAMINZERO                    */ \
+  1, 1, 1, 1,                    /* PRUNE, SKIP, THEN, COMMIT,             */ \
+  1, 1                           /* FAIL, ACCEPT                           */
+
+
+/* A magic value for OP_RREF to indicate the "any recursion" condition. */
+
+#define RREF_ANY  0xffff
+
+/* Error code numbers. They are given names so that they can more easily be
+tracked. */
+
+enum { ERR0,  ERR1,  ERR2,  ERR3,  ERR4,  ERR5,  ERR6,  ERR7,  ERR8,  ERR9,
+       ERR10, ERR11, ERR12, ERR13, ERR14, ERR15, ERR16, ERR17, ERR18, ERR19,
+       ERR20, ERR21, ERR22, ERR23, ERR24, ERR25, ERR26, ERR27, ERR28, ERR29,
+       ERR30, ERR31, ERR32, ERR33, ERR34, ERR35, ERR36, ERR37, ERR38, ERR39,
+       ERR40, ERR41, ERR42, ERR43, ERR44, ERR45, ERR46, ERR47, ERR48, ERR49,
+       ERR50, ERR51, ERR52, ERR53, ERR54, ERR55, ERR56, ERR57, ERR58, ERR59,
+       ERR60, ERR61, ERR62, ERR63 };
+
+/* The real format of the start of the pcre block; the index of names and the
+code vector run on as long as necessary after the end. We store an explicit
+offset to the name table so that if a regex is compiled on one host, saved, and
+then run on another where the size of pointers is different, all might still
+be well. For the case of compiled-on-4 and run-on-8, we include an extra
+pointer that is always NULL. For future-proofing, a few dummy fields were
+originally included - even though you can never get this planning right - but
+there is only one left now.
+
+NOTE NOTE NOTE:
+Because people can now save and re-use compiled patterns, any additions to this
+structure should be made at the end, and something earlier (e.g. a new
+flag in the options or one of the dummy fields) should indicate that the new
+fields are present. Currently PCRE always sets the dummy fields to zero.
+NOTE NOTE NOTE:
+*/
+
+typedef struct real_pcre {
+  pcre_uint32 magic_number;
+  pcre_uint32 size;               /* Total that was malloced */
+  pcre_uint32 options;            /* Public options */
+  pcre_uint16 flags;              /* Private flags */
+  pcre_uint16 dummy1;             /* For future use */
+  pcre_uint16 top_bracket;
+  pcre_uint16 top_backref;
+  pcre_uint16 first_byte;
+  pcre_uint16 req_byte;
+  pcre_uint16 name_table_offset;  /* Offset to name table that follows */
+  pcre_uint16 name_entry_size;    /* Size of any name items */
+  pcre_uint16 name_count;         /* Number of name items */
+  pcre_uint16 ref_count;          /* Reference count */
+
+  const unsigned char *tables;    /* Pointer to tables or NULL for std */
+  const unsigned char *nullpad;   /* NULL padding */
+} real_pcre;
+
+/* The format of the block used to store data from pcre_study(). The same
+remark (see NOTE above) about extending this structure applies. */
+
+typedef struct pcre_study_data {
+  pcre_uint32 size;               /* Total that was malloced */
+  pcre_uint32 options;
+  uschar start_bits[32];
+} pcre_study_data;
+
+/* Structure for passing "static" information around between the functions
+doing the compiling, so that they are thread-safe. */
+
+typedef struct compile_data {
+  const uschar *lcc;            /* Points to lower casing table */
+  const uschar *fcc;            /* Points to case-flipping table */
+  const uschar *cbits;          /* Points to character type table */
+  const uschar *ctypes;         /* Points to table of type maps */
+  const uschar *start_workspace;/* The start of working space */
+  const uschar *start_code;     /* The start of the compiled code */
+  const uschar *start_pattern;  /* The start of the pattern */
+  const uschar *end_pattern;    /* The end of the pattern */
+  uschar *hwm;                  /* High watermark of workspace */
+  uschar *name_table;           /* The name/number table */
+  int  names_found;             /* Number of entries so far */
+  int  name_entry_size;         /* Size of each entry */
+  int  bracount;                /* Count of capturing parens as we compile */
+  int  final_bracount;          /* Saved value after first pass */
+  int  top_backref;             /* Maximum back reference */
+  unsigned int backref_map;     /* Bitmap of low back refs */
+  int  external_options;        /* External (initial) options */
+  int  external_flags;          /* External flag bits to be set */
+  int  req_varyopt;             /* "After variable item" flag for reqbyte */
+  BOOL had_accept;              /* (*ACCEPT) encountered */
+  int  nltype;                  /* Newline type */
+  int  nllen;                   /* Newline string length */
+  uschar nl[4];                 /* Newline string when fixed length */
+} compile_data;
+
+/* Structure for maintaining a chain of pointers to the currently incomplete
+branches, for testing for left recursion. */
+
+typedef struct branch_chain {
+  struct branch_chain *outer;
+  uschar *current;
+} branch_chain;
+
+/* Structure for items in a linked list that represents an explicit recursive
+call within the pattern. */
+
+typedef struct recursion_info {
+  struct recursion_info *prevrec; /* Previous recursion record (or NULL) */
+  int group_num;                /* Number of group that was called */
+  const uschar *after_call;     /* "Return value": points after the call in the expr */
+  USPTR save_start;             /* Old value of mstart */
+  int *offset_save;             /* Pointer to start of saved offsets */
+  int saved_max;                /* Number of saved offsets */
+} recursion_info;
+
+/* Structure for building a chain of data for holding the values of the subject
+pointer at the start of each subpattern, so as to detect when an empty string
+has been matched by a subpattern - to break infinite loops. */
+
+typedef struct eptrblock {
+  struct eptrblock *epb_prev;
+  USPTR epb_saved_eptr;
+} eptrblock;
+
+
+/* Structure for passing "static" information around between the functions
+doing traditional NFA matching, so that they are thread-safe. */
+
+typedef struct match_data {
+  unsigned long int match_call_count;      /* As it says */
+  unsigned long int match_limit;           /* As it says */
+  unsigned long int match_limit_recursion; /* As it says */
+  int   *offset_vector;         /* Offset vector */
+  int    offset_end;            /* One past the end */
+  int    offset_max;            /* The maximum usable for return data */
+  int    nltype;                /* Newline type */
+  int    nllen;                 /* Newline string length */
+  uschar nl[4];                 /* Newline string when fixed */
+  const uschar *lcc;            /* Points to lower casing table */
+  const uschar *ctypes;         /* Points to table of type maps */
+  BOOL   offset_overflow;       /* Set if too many extractions */
+  BOOL   notbol;                /* NOTBOL flag */
+  BOOL   noteol;                /* NOTEOL flag */
+  BOOL   utf8;                  /* UTF8 flag */
+  BOOL   endonly;               /* Dollar not before final \n */
+  BOOL   notempty;              /* Empty string match not wanted */
+  BOOL   partial;               /* PARTIAL flag */
+  BOOL   hitend;                /* Hit the end of the subject at some point */
+  BOOL   bsr_anycrlf;           /* \R is just any CRLF, not full Unicode */
+  const uschar *start_code;     /* For use when recursing */
+  USPTR  start_subject;         /* Start of the subject string */
+  USPTR  end_subject;           /* End of the subject string */
+  USPTR  start_match_ptr;       /* Start of matched string */
+  USPTR  end_match_ptr;         /* Subject position at end match */
+  int    end_offset_top;        /* Highwater mark at end of match */
+  int    capture_last;          /* Most recent capture number */
+  int    start_offset;          /* The start offset value */
+  eptrblock *eptrchain;         /* Chain of eptrblocks for tail recursions */
+  int    eptrn;                 /* Next free eptrblock */
+  recursion_info *recursive;    /* Linked list of recursion data */
+  void  *callout_data;          /* To pass back to callouts */
+} match_data;
+
+/* A similar structure is used for the same purpose by the DFA matching
+functions. */
+
+typedef struct dfa_match_data {
+  const uschar *start_code;     /* Start of the compiled pattern */
+  const uschar *start_subject;  /* Start of the subject string */
+  const uschar *end_subject;    /* End of subject string */
+  const uschar *tables;         /* Character tables */
+  int   moptions;               /* Match options */
+  int   poptions;               /* Pattern options */
+  int    nltype;                /* Newline type */
+  int    nllen;                 /* Newline string length */
+  uschar nl[4];                 /* Newline string when fixed */
+  void  *callout_data;          /* To pass back to callouts */
+} dfa_match_data;
+
+/* Bit definitions for entries in the pcre_ctypes table. */
+
+#define ctype_space   0x01
+#define ctype_letter  0x02
+#define ctype_digit   0x04
+#define ctype_xdigit  0x08
+#define ctype_word    0x10   /* alphanumeric or '_' */
+#define ctype_meta    0x80   /* regexp meta char or zero (end pattern) */
+
+/* Offsets for the bitmap tables in pcre_cbits. Each table contains a set
+of bits for a class map. Some classes are built by combining these tables. */
+
+#define cbit_space     0      /* [:space:] or \s */
+#define cbit_xdigit   32      /* [:xdigit:] */
+#define cbit_digit    64      /* [:digit:] or \d */
+#define cbit_upper    96      /* [:upper:] */
+#define cbit_lower   128      /* [:lower:] */
+#define cbit_word    160      /* [:word:] or \w */
+#define cbit_graph   192      /* [:graph:] */
+#define cbit_print   224      /* [:print:] */
+#define cbit_punct   256      /* [:punct:] */
+#define cbit_cntrl   288      /* [:cntrl:] */
+#define cbit_length  320      /* Length of the cbits table */
+
+/* Offsets of the various tables from the base tables pointer, and
+total length. */
+
+#define lcc_offset      0
+#define fcc_offset    256
+#define cbits_offset  512
+#define ctypes_offset (cbits_offset + cbit_length)
+#define tables_length (ctypes_offset + 256)
+
+/* Layout of the UCP type table that translates property names into types and
+codes. Each entry used to point directly to a name, but to reduce the number of
+relocations in shared libraries, it now has an offset into a single string
+instead. */
+
+typedef struct {
+  pcre_uint16 name_offset;
+  pcre_uint16 type;
+  pcre_uint16 value;
+} ucp_type_table;
+
+
+/* Internal shared data tables. These are tables that are used by more than one
+of the exported public functions. They have to be "external" in the C sense,
+but are not part of the PCRE public API. The data for these tables is in the
+pcre_tables.c module. */
+
+extern const int    _pcre_utf8_table1[];
+extern const int    _pcre_utf8_table2[];
+extern const int    _pcre_utf8_table3[];
+extern const uschar _pcre_utf8_table4[];
+
+extern const int    _pcre_utf8_table1_size;
+
+extern const char   _pcre_utt_names[];
+extern const ucp_type_table _pcre_utt[];
+extern const int _pcre_utt_size;
+
+extern const uschar _pcre_default_tables[];
+
+extern const uschar _pcre_OP_lengths[];
+
+
+/* Internal shared functions. These are functions that are used by more than
+one of the exported public functions. They have to be "external" in the C
+sense, but are not part of the PCRE public API. */
+
+extern BOOL         _pcre_is_newline(const uschar *, int, const uschar *,
+                      int *, BOOL);
+extern int          _pcre_ord2utf8(int, uschar *);
+extern real_pcre   *_pcre_try_flipped(const real_pcre *, real_pcre *,
+                      const pcre_study_data *, pcre_study_data *);
+extern int          _pcre_ucp_findprop(const unsigned int, int *, int *);
+extern unsigned int _pcre_ucp_othercase(const unsigned int);
+extern int          _pcre_valid_utf8(const uschar *, int);
+extern BOOL         _pcre_was_newline(const uschar *, int, const uschar *,
+                      int *, BOOL);
+extern BOOL         _pcre_xclass(int, const uschar *);
+
+#endif
+
+/* End of pcre_internal.h */
diff --git a/uppsrc/plugin/pcre/lib/pcre_maketables.c b/uppsrc/plugin/pcre/lib/pcre_maketables.c
new file mode 100644
index 000000000..219973e37
--- /dev/null
+++ b/uppsrc/plugin/pcre/lib/pcre_maketables.c
@@ -0,0 +1,143 @@
+/*************************************************
+*      Perl-Compatible Regular Expressions       *
+*************************************************/
+
+/* PCRE is a library of functions to support regular expressions whose syntax
+and semantics are as close as possible to those of the Perl 5 language.
+
+                       Written by Philip Hazel
+           Copyright (c) 1997-2008 University of Cambridge
+
+-----------------------------------------------------------------------------
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+
+    * Neither the name of the University of Cambridge nor the names of its
+      contributors may be used to endorse or promote products derived from
+      this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+-----------------------------------------------------------------------------
+*/
+
+
+/* This module contains the external function pcre_maketables(), which builds
+character tables for PCRE in the current locale. The file is compiled on its
+own as part of the PCRE library. However, it is also included in the
+compilation of dftables.c, in which case the macro DFTABLES is defined. */
+
+
+#ifndef DFTABLES
+#  ifdef HAVE_CONFIG_H
+#  include "config.h"
+#  endif
+#  include "pcre_internal.h"
+#endif
+
+
+/*************************************************
+*           Create PCRE character tables         *
+*************************************************/
+
+/* This function builds a set of character tables for use by PCRE and returns
+a pointer to them. They are build using the ctype functions, and consequently
+their contents will depend upon the current locale setting. When compiled as
+part of the library, the store is obtained via pcre_malloc(), but when compiled
+inside dftables, use malloc().
+
+Arguments:   none
+Returns:     pointer to the contiguous block of data
+*/
+
+const unsigned char *
+pcre_maketables(void)
+{
+unsigned char *yield, *p;
+int i;
+
+#ifndef DFTABLES
+yield = (unsigned char*)(pcre_malloc)(tables_length);
+#else
+yield = (unsigned char*)malloc(tables_length);
+#endif
+
+if (yield == NULL) return NULL;
+p = yield;
+
+/* First comes the lower casing table */
+
+for (i = 0; i < 256; i++) *p++ = tolower(i);
+
+/* Next the case-flipping table */
+
+for (i = 0; i < 256; i++) *p++ = islower(i)? toupper(i) : tolower(i);
+
+/* Then the character class tables. Don't try to be clever and save effort on
+exclusive ones - in some locales things may be different. Note that the table
+for "space" includes everything "isspace" gives, including VT in the default
+locale. This makes it work for the POSIX class [:space:]. Note also that it is
+possible for a character to be alnum or alpha without being lower or upper,
+such as "male and female ordinals" (\xAA and \xBA) in the fr_FR locale (at
+least under Debian Linux's locales as of 12/2005). So we must test for alnum
+specially. */
+
+memset(p, 0, cbit_length);
+for (i = 0; i < 256; i++)
+  {
+  if (isdigit(i)) p[cbit_digit  + i/8] |= 1 << (i&7);
+  if (isupper(i)) p[cbit_upper  + i/8] |= 1 << (i&7);
+  if (islower(i)) p[cbit_lower  + i/8] |= 1 << (i&7);
+  if (isalnum(i)) p[cbit_word   + i/8] |= 1 << (i&7);
+  if (i == '_')   p[cbit_word   + i/8] |= 1 << (i&7);
+  if (isspace(i)) p[cbit_space  + i/8] |= 1 << (i&7);
+  if (isxdigit(i))p[cbit_xdigit + i/8] |= 1 << (i&7);
+  if (isgraph(i)) p[cbit_graph  + i/8] |= 1 << (i&7);
+  if (isprint(i)) p[cbit_print  + i/8] |= 1 << (i&7);
+  if (ispunct(i)) p[cbit_punct  + i/8] |= 1 << (i&7);
+  if (iscntrl(i)) p[cbit_cntrl  + i/8] |= 1 << (i&7);
+  }
+p += cbit_length;
+
+/* Finally, the character type table. In this, we exclude VT from the white
+space chars, because Perl doesn't recognize it as such for \s and for comments
+within regexes. */
+
+for (i = 0; i < 256; i++)
+  {
+  int x = 0;
+  if (i != 0x0b && isspace(i)) x += ctype_space;
+  if (isalpha(i)) x += ctype_letter;
+  if (isdigit(i)) x += ctype_digit;
+  if (isxdigit(i)) x += ctype_xdigit;
+  if (isalnum(i) || i == '_') x += ctype_word;
+
+  /* Note: strchr includes the terminating zero in the characters it considers.
+  In this instance, that is ok because we want binary zero to be flagged as a
+  meta-character, which in this sense is any character that terminates a run
+  of data characters. */
+
+  if (strchr("\\*+?{^.$|()[", i) != 0) x += ctype_meta;
+  *p++ = x;
+  }
+
+return yield;
+}
+
+/* End of pcre_maketables.c */
diff --git a/uppsrc/plugin/pcre/lib/pcre_newline.c b/uppsrc/plugin/pcre/lib/pcre_newline.c
new file mode 100644
index 000000000..58885760e
--- /dev/null
+++ b/uppsrc/plugin/pcre/lib/pcre_newline.c
@@ -0,0 +1,164 @@
+/*************************************************
+*      Perl-Compatible Regular Expressions       *
+*************************************************/
+
+/* PCRE is a library of functions to support regular expressions whose syntax
+and semantics are as close as possible to those of the Perl 5 language.
+
+                       Written by Philip Hazel
+           Copyright (c) 1997-2008 University of Cambridge
+
+-----------------------------------------------------------------------------
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+
+    * Neither the name of the University of Cambridge nor the names of its
+      contributors may be used to endorse or promote products derived from
+      this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+-----------------------------------------------------------------------------
+*/
+
+
+/* This module contains internal functions for testing newlines when more than
+one kind of newline is to be recognized. When a newline is found, its length is
+returned. In principle, we could implement several newline "types", each
+referring to a different set of newline characters. At present, PCRE supports
+only NLTYPE_FIXED, which gets handled without these functions, NLTYPE_ANYCRLF,
+and NLTYPE_ANY. The full list of Unicode newline characters is taken from
+http://unicode.org/unicode/reports/tr18/. */
+
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "pcre_internal.h"
+
+
+
+/*************************************************
+*      Check for newline at given position       *
+*************************************************/
+
+/* It is guaranteed that the initial value of ptr is less than the end of the
+string that is being processed.
+
+Arguments:
+  ptr          pointer to possible newline
+  type         the newline type
+  endptr       pointer to the end of the string
+  lenptr       where to return the length
+  utf8         TRUE if in utf8 mode
+
+Returns:       TRUE or FALSE
+*/
+
+BOOL
+_pcre_is_newline(const uschar *ptr, int type, const uschar *endptr,
+  int *lenptr, BOOL utf8)
+{
+int c;
+if (utf8) { GETCHAR(c, ptr); } else c = *ptr;
+
+if (type == NLTYPE_ANYCRLF) switch(c)
+  {
+  case 0x000a: *lenptr = 1; return TRUE;             /* LF */
+  case 0x000d: *lenptr = (ptr < endptr - 1 && ptr[1] == 0x0a)? 2 : 1;
+               return TRUE;                          /* CR */
+  default: return FALSE;
+  }
+
+/* NLTYPE_ANY */
+
+else switch(c)
+  {
+  case 0x000a:                                       /* LF */
+  case 0x000b:                                       /* VT */
+  case 0x000c: *lenptr = 1; return TRUE;             /* FF */
+  case 0x000d: *lenptr = (ptr < endptr - 1 && ptr[1] == 0x0a)? 2 : 1;
+               return TRUE;                          /* CR */
+  case 0x0085: *lenptr = utf8? 2 : 1; return TRUE;   /* NEL */
+  case 0x2028:                                       /* LS */
+  case 0x2029: *lenptr = 3; return TRUE;             /* PS */
+  default: return FALSE;
+  }
+}
+
+
+
+/*************************************************
+*     Check for newline at previous position     *
+*************************************************/
+
+/* It is guaranteed that the initial value of ptr is greater than the start of
+the string that is being processed.
+
+Arguments:
+  ptr          pointer to possible newline
+  type         the newline type
+  startptr     pointer to the start of the string
+  lenptr       where to return the length
+  utf8         TRUE if in utf8 mode
+
+Returns:       TRUE or FALSE
+*/
+
+BOOL
+_pcre_was_newline(const uschar *ptr, int type, const uschar *startptr,
+  int *lenptr, BOOL utf8)
+{
+int c;
+ptr--;
+#ifdef SUPPORT_UTF8
+if (utf8)
+  {
+  BACKCHAR(ptr);
+  GETCHAR(c, ptr);
+  }
+else c = *ptr;
+#else   /* no UTF-8 support */
+c = *ptr;
+#endif  /* SUPPORT_UTF8 */
+
+if (type == NLTYPE_ANYCRLF) switch(c)
+  {
+  case 0x000a: *lenptr = (ptr > startptr && ptr[-1] == 0x0d)? 2 : 1;
+               return TRUE;                         /* LF */
+  case 0x000d: *lenptr = 1; return TRUE;            /* CR */
+  default: return FALSE;
+  }
+
+else switch(c)
+  {
+  case 0x000a: *lenptr = (ptr > startptr && ptr[-1] == 0x0d)? 2 : 1;
+               return TRUE;                         /* LF */
+  case 0x000b:                                      /* VT */
+  case 0x000c:                                      /* FF */
+  case 0x000d: *lenptr = 1; return TRUE;            /* CR */
+  case 0x0085: *lenptr = utf8? 2 : 1; return TRUE;  /* NEL */
+  case 0x2028:                                      /* LS */
+  case 0x2029: *lenptr = 3; return TRUE;            /* PS */
+  default: return FALSE;
+  }
+}
+
+/* End of pcre_newline.c */
diff --git a/uppsrc/plugin/pcre/lib/pcre_ord2utf8.c b/uppsrc/plugin/pcre/lib/pcre_ord2utf8.c
new file mode 100644
index 000000000..0fdc512a0
--- /dev/null
+++ b/uppsrc/plugin/pcre/lib/pcre_ord2utf8.c
@@ -0,0 +1,85 @@
+/*************************************************
+*      Perl-Compatible Regular Expressions       *
+*************************************************/
+
+/* PCRE is a library of functions to support regular expressions whose syntax
+and semantics are as close as possible to those of the Perl 5 language.
+
+                       Written by Philip Hazel
+           Copyright (c) 1997-2008 University of Cambridge
+
+-----------------------------------------------------------------------------
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+
+    * Neither the name of the University of Cambridge nor the names of its
+      contributors may be used to endorse or promote products derived from
+      this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+-----------------------------------------------------------------------------
+*/
+
+
+/* This file contains a private PCRE function that converts an ordinal
+character value into a UTF8 string. */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "pcre_internal.h"
+
+
+/*************************************************
+*       Convert character value to UTF-8         *
+*************************************************/
+
+/* This function takes an integer value in the range 0 - 0x7fffffff
+and encodes it as a UTF-8 character in 0 to 6 bytes.
+
+Arguments:
+  cvalue     the character value
+  buffer     pointer to buffer for result - at least 6 bytes long
+
+Returns:     number of characters placed in the buffer
+*/
+
+int
+_pcre_ord2utf8(int cvalue, uschar *buffer)
+{
+#ifdef SUPPORT_UTF8
+register int i, j;
+for (i = 0; i < _pcre_utf8_table1_size; i++)
+  if (cvalue <= _pcre_utf8_table1[i]) break;
+buffer += i;
+for (j = i; j > 0; j--)
+ {
+ *buffer-- = 0x80 | (cvalue & 0x3f);
+ cvalue >>= 6;
+ }
+*buffer = _pcre_utf8_table2[i] | cvalue;
+return i + 1;
+#else
+return 0;   /* Keep compiler happy; this function won't ever be */
+#endif      /* called when SUPPORT_UTF8 is not defined. */
+}
+
+/* End of pcre_ord2utf8.c */
diff --git a/uppsrc/plugin/pcre/lib/pcre_refcount.c b/uppsrc/plugin/pcre/lib/pcre_refcount.c
new file mode 100644
index 000000000..eeb2897c8
--- /dev/null
+++ b/uppsrc/plugin/pcre/lib/pcre_refcount.c
@@ -0,0 +1,82 @@
+/*************************************************
+*      Perl-Compatible Regular Expressions       *
+*************************************************/
+
+/* PCRE is a library of functions to support regular expressions whose syntax
+and semantics are as close as possible to those of the Perl 5 language.
+
+                       Written by Philip Hazel
+           Copyright (c) 1997-2008 University of Cambridge
+
+-----------------------------------------------------------------------------
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+
+    * Neither the name of the University of Cambridge nor the names of its
+      contributors may be used to endorse or promote products derived from
+      this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+-----------------------------------------------------------------------------
+*/
+
+
+/* This module contains the external function pcre_refcount(), which is an
+auxiliary function that can be used to maintain a reference count in a compiled
+pattern data block. This might be helpful in applications where the block is
+shared by different users. */
+
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "pcre_internal.h"
+
+
+/*************************************************
+*           Maintain reference count             *
+*************************************************/
+
+/* The reference count is a 16-bit field, initialized to zero. It is not
+possible to transfer a non-zero count from one host to a different host that
+has a different byte order - though I can't see why anyone in their right mind
+would ever want to do that!
+
+Arguments:
+  argument_re   points to compiled code
+  adjust        value to add to the count
+
+Returns:        the (possibly updated) count value (a non-negative number), or
+                a negative error number
+*/
+
+PCRE_EXP_DEFN int
+pcre_refcount(pcre *argument_re, int adjust)
+{
+real_pcre *re = (real_pcre *)argument_re;
+if (re == NULL) return PCRE_ERROR_NULL;
+re->ref_count = (-adjust > re->ref_count)? 0 :
+                (adjust + re->ref_count > 65535)? 65535 :
+                re->ref_count + adjust;
+return re->ref_count;
+}
+
+/* End of pcre_refcount.c */
diff --git a/uppsrc/plugin/pcre/lib/pcre_study.c b/uppsrc/plugin/pcre/lib/pcre_study.c
new file mode 100644
index 000000000..ff1f260ec
--- /dev/null
+++ b/uppsrc/plugin/pcre/lib/pcre_study.c
@@ -0,0 +1,579 @@
+/*************************************************
+*      Perl-Compatible Regular Expressions       *
+*************************************************/
+
+/* PCRE is a library of functions to support regular expressions whose syntax
+and semantics are as close as possible to those of the Perl 5 language.
+
+                       Written by Philip Hazel
+           Copyright (c) 1997-2008 University of Cambridge
+
+-----------------------------------------------------------------------------
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+
+    * Neither the name of the University of Cambridge nor the names of its
+      contributors may be used to endorse or promote products derived from
+      this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+-----------------------------------------------------------------------------
+*/
+
+
+/* This module contains the external function pcre_study(), along with local
+supporting functions. */
+
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "pcre_internal.h"
+
+
+/* Returns from set_start_bits() */
+
+enum { SSB_FAIL, SSB_DONE, SSB_CONTINUE };
+
+
+/*************************************************
+*      Set a bit and maybe its alternate case    *
+*************************************************/
+
+/* Given a character, set its bit in the table, and also the bit for the other
+version of a letter if we are caseless.
+
+Arguments:
+  start_bits    points to the bit map
+  c             is the character
+  caseless      the caseless flag
+  cd            the block with char table pointers
+
+Returns:        nothing
+*/
+
+static void
+set_bit(uschar *start_bits, unsigned int c, BOOL caseless, compile_data *cd)
+{
+start_bits[c/8] |= (1 << (c&7));
+if (caseless && (cd->ctypes[c] & ctype_letter) != 0)
+  start_bits[cd->fcc[c]/8] |= (1 << (cd->fcc[c]&7));
+}
+
+
+
+/*************************************************
+*          Create bitmap of starting bytes       *
+*************************************************/
+
+/* This function scans a compiled unanchored expression recursively and
+attempts to build a bitmap of the set of possible starting bytes. As time goes
+by, we may be able to get more clever at doing this. The SSB_CONTINUE return is
+useful for parenthesized groups in patterns such as (a*)b where the group
+provides some optional starting bytes but scanning must continue at the outer
+level to find at least one mandatory byte. At the outermost level, this
+function fails unless the result is SSB_DONE.
+
+Arguments:
+  code         points to an expression
+  start_bits   points to a 32-byte table, initialized to 0
+  caseless     the current state of the caseless flag
+  utf8         TRUE if in UTF-8 mode
+  cd           the block with char table pointers
+
+Returns:       SSB_FAIL     => Failed to find any starting bytes
+               SSB_DONE     => Found mandatory starting bytes
+               SSB_CONTINUE => Found optional starting bytes
+*/
+
+static int
+set_start_bits(const uschar *code, uschar *start_bits, BOOL caseless,
+  BOOL utf8, compile_data *cd)
+{
+register int c;
+int yield = SSB_DONE;
+
+#if 0
+/* ========================================================================= */
+/* The following comment and code was inserted in January 1999. In May 2006,
+when it was observed to cause compiler warnings about unused values, I took it
+out again. If anybody is still using OS/2, they will have to put it back
+manually. */
+
+/* This next statement and the later reference to dummy are here in order to
+trick the optimizer of the IBM C compiler for OS/2 into generating correct
+code. Apparently IBM isn't going to fix the problem, and we would rather not
+disable optimization (in this module it actually makes a big difference, and
+the pcre module can use all the optimization it can get). */
+
+volatile int dummy;
+/* ========================================================================= */
+#endif
+
+do
+  {
+  const uschar *tcode = code + (((int)*code == OP_CBRA)? 3:1) + LINK_SIZE;
+  BOOL try_next = TRUE;
+
+  while (try_next)    /* Loop for items in this branch */
+    {
+    int rc;
+    switch(*tcode)
+      {
+      /* Fail if we reach something we don't understand */
+
+      default:
+      return SSB_FAIL;
+
+      /* If we hit a bracket or a positive lookahead assertion, recurse to set
+      bits from within the subpattern. If it can't find anything, we have to
+      give up. If it finds some mandatory character(s), we are done for this
+      branch. Otherwise, carry on scanning after the subpattern. */
+
+      case OP_BRA:
+      case OP_SBRA:
+      case OP_CBRA:
+      case OP_SCBRA:
+      case OP_ONCE:
+      case OP_ASSERT:
+      rc = set_start_bits(tcode, start_bits, caseless, utf8, cd);
+      if (rc == SSB_FAIL) return SSB_FAIL;
+      if (rc == SSB_DONE) try_next = FALSE; else
+        {
+        do tcode += GET(tcode, 1); while (*tcode == OP_ALT);
+        tcode += 1 + LINK_SIZE;
+        }
+      break;
+
+      /* If we hit ALT or KET, it means we haven't found anything mandatory in
+      this branch, though we might have found something optional. For ALT, we
+      continue with the next alternative, but we have to arrange that the final
+      result from subpattern is SSB_CONTINUE rather than SSB_DONE. For KET,
+      return SSB_CONTINUE: if this is the top level, that indicates failure,
+      but after a nested subpattern, it causes scanning to continue. */
+
+      case OP_ALT:
+      yield = SSB_CONTINUE;
+      try_next = FALSE;
+      break;
+
+      case OP_KET:
+      case OP_KETRMAX:
+      case OP_KETRMIN:
+      return SSB_CONTINUE;
+
+      /* Skip over callout */
+
+      case OP_CALLOUT:
+      tcode += 2 + 2*LINK_SIZE;
+      break;
+
+      /* Skip over lookbehind and negative lookahead assertions */
+
+      case OP_ASSERT_NOT:
+      case OP_ASSERTBACK:
+      case OP_ASSERTBACK_NOT:
+      do tcode += GET(tcode, 1); while (*tcode == OP_ALT);
+      tcode += 1 + LINK_SIZE;
+      break;
+
+      /* Skip over an option setting, changing the caseless flag */
+
+      case OP_OPT:
+      caseless = (tcode[1] & PCRE_CASELESS) != 0;
+      tcode += 2;
+      break;
+
+      /* BRAZERO does the bracket, but carries on. */
+
+      case OP_BRAZERO:
+      case OP_BRAMINZERO:
+      if (set_start_bits(++tcode, start_bits, caseless, utf8, cd) == SSB_FAIL)
+        return SSB_FAIL;
+/* =========================================================================
+      See the comment at the head of this function concerning the next line,
+      which was an old fudge for the benefit of OS/2.
+      dummy = 1;
+  ========================================================================= */
+      do tcode += GET(tcode,1); while (*tcode == OP_ALT);
+      tcode += 1 + LINK_SIZE;
+      break;
+
+      /* Single-char * or ? sets the bit and tries the next item */
+
+      case OP_STAR:
+      case OP_MINSTAR:
+      case OP_POSSTAR:
+      case OP_QUERY:
+      case OP_MINQUERY:
+      case OP_POSQUERY:
+      set_bit(start_bits, tcode[1], caseless, cd);
+      tcode += 2;
+#ifdef SUPPORT_UTF8
+      if (utf8 && tcode[-1] >= 0xc0)
+        tcode += _pcre_utf8_table4[tcode[-1] & 0x3f];
+#endif
+      break;
+
+      /* Single-char upto sets the bit and tries the next */
+
+      case OP_UPTO:
+      case OP_MINUPTO:
+      case OP_POSUPTO:
+      set_bit(start_bits, tcode[3], caseless, cd);
+      tcode += 4;
+#ifdef SUPPORT_UTF8
+      if (utf8 && tcode[-1] >= 0xc0)
+        tcode += _pcre_utf8_table4[tcode[-1] & 0x3f];
+#endif
+      break;
+
+      /* At least one single char sets the bit and stops */
+
+      case OP_EXACT:       /* Fall through */
+      tcode += 2;
+
+      case OP_CHAR:
+      case OP_CHARNC:
+      case OP_PLUS:
+      case OP_MINPLUS:
+      case OP_POSPLUS:
+      set_bit(start_bits, tcode[1], caseless, cd);
+      try_next = FALSE;
+      break;
+
+      /* Single character type sets the bits and stops */
+
+      case OP_NOT_DIGIT:
+      for (c = 0; c < 32; c++)
+        start_bits[c] |= ~cd->cbits[c+cbit_digit];
+      try_next = FALSE;
+      break;
+
+      case OP_DIGIT:
+      for (c = 0; c < 32; c++)
+        start_bits[c] |= cd->cbits[c+cbit_digit];
+      try_next = FALSE;
+      break;
+
+      /* The cbit_space table has vertical tab as whitespace; we have to
+      discard it. */
+
+      case OP_NOT_WHITESPACE:
+      for (c = 0; c < 32; c++)
+        {
+        int d = cd->cbits[c+cbit_space];
+        if (c == 1) d &= ~0x08;
+        start_bits[c] |= ~d;
+        }
+      try_next = FALSE;
+      break;
+
+      /* The cbit_space table has vertical tab as whitespace; we have to
+      discard it. */
+
+      case OP_WHITESPACE:
+      for (c = 0; c < 32; c++)
+        {
+        int d = cd->cbits[c+cbit_space];
+        if (c == 1) d &= ~0x08;
+        start_bits[c] |= d;
+        }
+      try_next = FALSE;
+      break;
+
+      case OP_NOT_WORDCHAR:
+      for (c = 0; c < 32; c++)
+        start_bits[c] |= ~cd->cbits[c+cbit_word];
+      try_next = FALSE;
+      break;
+
+      case OP_WORDCHAR:
+      for (c = 0; c < 32; c++)
+        start_bits[c] |= cd->cbits[c+cbit_word];
+      try_next = FALSE;
+      break;
+
+      /* One or more character type fudges the pointer and restarts, knowing
+      it will hit a single character type and stop there. */
+
+      case OP_TYPEPLUS:
+      case OP_TYPEMINPLUS:
+      tcode++;
+      break;
+
+      case OP_TYPEEXACT:
+      tcode += 3;
+      break;
+
+      /* Zero or more repeats of character types set the bits and then
+      try again. */
+
+      case OP_TYPEUPTO:
+      case OP_TYPEMINUPTO:
+      case OP_TYPEPOSUPTO:
+      tcode += 2;               /* Fall through */
+
+      case OP_TYPESTAR:
+      case OP_TYPEMINSTAR:
+      case OP_TYPEPOSSTAR:
+      case OP_TYPEQUERY:
+      case OP_TYPEMINQUERY:
+      case OP_TYPEPOSQUERY:
+      switch(tcode[1])
+        {
+        case OP_ANY:
+        return SSB_FAIL;
+
+        case OP_NOT_DIGIT:
+        for (c = 0; c < 32; c++)
+          start_bits[c] |= ~cd->cbits[c+cbit_digit];
+        break;
+
+        case OP_DIGIT:
+        for (c = 0; c < 32; c++)
+          start_bits[c] |= cd->cbits[c+cbit_digit];
+        break;
+
+        /* The cbit_space table has vertical tab as whitespace; we have to
+        discard it. */
+
+        case OP_NOT_WHITESPACE:
+        for (c = 0; c < 32; c++)
+          {
+          int d = cd->cbits[c+cbit_space];
+          if (c == 1) d &= ~0x08;
+          start_bits[c] |= ~d;
+          }
+        break;
+
+        /* The cbit_space table has vertical tab as whitespace; we have to
+        discard it. */
+
+        case OP_WHITESPACE:
+        for (c = 0; c < 32; c++)
+          {
+          int d = cd->cbits[c+cbit_space];
+          if (c == 1) d &= ~0x08;
+          start_bits[c] |= d;
+          }
+        break;
+
+        case OP_NOT_WORDCHAR:
+        for (c = 0; c < 32; c++)
+          start_bits[c] |= ~cd->cbits[c+cbit_word];
+        break;
+
+        case OP_WORDCHAR:
+        for (c = 0; c < 32; c++)
+          start_bits[c] |= cd->cbits[c+cbit_word];
+        break;
+        }
+
+      tcode += 2;
+      break;
+
+      /* Character class where all the information is in a bit map: set the
+      bits and either carry on or not, according to the repeat count. If it was
+      a negative class, and we are operating with UTF-8 characters, any byte
+      with a value >= 0xc4 is a potentially valid starter because it starts a
+      character with a value > 255. */
+
+      case OP_NCLASS:
+#ifdef SUPPORT_UTF8
+      if (utf8)
+        {
+        start_bits[24] |= 0xf0;              /* Bits for 0xc4 - 0xc8 */
+        memset(start_bits+25, 0xff, 7);      /* Bits for 0xc9 - 0xff */
+        }
+#endif
+      /* Fall through */
+
+      case OP_CLASS:
+        {
+        tcode++;
+
+        /* In UTF-8 mode, the bits in a bit map correspond to character
+        values, not to byte values. However, the bit map we are constructing is
+        for byte values. So we have to do a conversion for characters whose
+        value is > 127. In fact, there are only two possible starting bytes for
+        characters in the range 128 - 255. */
+
+#ifdef SUPPORT_UTF8
+        if (utf8)
+          {
+          for (c = 0; c < 16; c++) start_bits[c] |= tcode[c];
+          for (c = 128; c < 256; c++)
+            {
+            if ((tcode[c/8] && (1 << (c&7))) != 0)
+              {
+              int d = (c >> 6) | 0xc0;            /* Set bit for this starter */
+              start_bits[d/8] |= (1 << (d&7));    /* and then skip on to the */
+              c = (c & 0xc0) + 0x40 - 1;          /* next relevant character. */
+              }
+            }
+          }
+
+        /* In non-UTF-8 mode, the two bit maps are completely compatible. */
+
+        else
+#endif
+          {
+          for (c = 0; c < 32; c++) start_bits[c] |= tcode[c];
+          }
+
+        /* Advance past the bit map, and act on what follows */
+
+        tcode += 32;
+        switch (*tcode)
+          {
+          case OP_CRSTAR:
+          case OP_CRMINSTAR:
+          case OP_CRQUERY:
+          case OP_CRMINQUERY:
+          tcode++;
+          break;
+
+          case OP_CRRANGE:
+          case OP_CRMINRANGE:
+          if (((tcode[1] << 8) + tcode[2]) == 0) tcode += 5;
+            else try_next = FALSE;
+          break;
+
+          default:
+          try_next = FALSE;
+          break;
+          }
+        }
+      break; /* End of bitmap class handling */
+
+      }      /* End of switch */
+    }        /* End of try_next loop */
+
+  code += GET(code, 1);   /* Advance to next branch */
+  }
+while (*code == OP_ALT);
+return yield;
+}
+
+
+
+/*************************************************
+*          Study a compiled expression           *
+*************************************************/
+
+/* This function is handed a compiled expression that it must study to produce
+information that will speed up the matching. It returns a pcre_extra block
+which then gets handed back to pcre_exec().
+
+Arguments:
+  re        points to the compiled expression
+  options   contains option bits
+  errorptr  points to where to place error messages;
+            set NULL unless error
+
+Returns:    pointer to a pcre_extra block, with study_data filled in and the
+              appropriate flag set;
+            NULL on error or if no optimization possible
+*/
+
+PCRE_EXP_DEFN pcre_extra *
+pcre_study(const pcre *external_re, int options, const char **errorptr)
+{
+uschar start_bits[32];
+pcre_extra *extra;
+pcre_study_data *study;
+const uschar *tables;
+uschar *code;
+compile_data compile_block;
+const real_pcre *re = (const real_pcre *)external_re;
+
+*errorptr = NULL;
+
+if (re == NULL || re->magic_number != MAGIC_NUMBER)
+  {
+  *errorptr = "argument is not a compiled regular expression";
+  return NULL;
+  }
+
+if ((options & ~PUBLIC_STUDY_OPTIONS) != 0)
+  {
+  *errorptr = "unknown or incorrect option bit(s) set";
+  return NULL;
+  }
+
+code = (uschar *)re + re->name_table_offset +
+  (re->name_count * re->name_entry_size);
+
+/* For an anchored pattern, or an unanchored pattern that has a first char, or
+a multiline pattern that matches only at "line starts", no further processing
+at present. */
+
+if ((re->options & PCRE_ANCHORED) != 0 ||
+    (re->flags & (PCRE_FIRSTSET|PCRE_STARTLINE)) != 0)
+  return NULL;
+
+/* Set the character tables in the block that is passed around */
+
+tables = re->tables;
+if (tables == NULL)
+  (void)pcre_fullinfo(external_re, NULL, PCRE_INFO_DEFAULT_TABLES,
+  (void *)(&tables));
+
+compile_block.lcc = tables + lcc_offset;
+compile_block.fcc = tables + fcc_offset;
+compile_block.cbits = tables + cbits_offset;
+compile_block.ctypes = tables + ctypes_offset;
+
+/* See if we can find a fixed set of initial characters for the pattern. */
+
+memset(start_bits, 0, 32 * sizeof(uschar));
+if (set_start_bits(code, start_bits, (re->options & PCRE_CASELESS) != 0,
+  (re->options & PCRE_UTF8) != 0, &compile_block) != SSB_DONE) return NULL;
+
+/* Get a pcre_extra block and a pcre_study_data block. The study data is put in
+the latter, which is pointed to by the former, which may also get additional
+data set later by the calling program. At the moment, the size of
+pcre_study_data is fixed. We nevertheless save it in a field for returning via
+the pcre_fullinfo() function so that if it becomes variable in the future, we
+don't have to change that code. */
+
+extra = (pcre_extra *)(pcre_malloc)
+  (sizeof(pcre_extra) + sizeof(pcre_study_data));
+
+if (extra == NULL)
+  {
+  *errorptr = "failed to get memory";
+  return NULL;
+  }
+
+study = (pcre_study_data *)((char *)extra + sizeof(pcre_extra));
+extra->flags = PCRE_EXTRA_STUDY_DATA;
+extra->study_data = study;
+
+study->size = sizeof(pcre_study_data);
+study->options = PCRE_STUDY_MAPPED;
+memcpy(study->start_bits, start_bits, sizeof(start_bits));
+
+return extra;
+}
+
+/* End of pcre_study.c */
diff --git a/uppsrc/plugin/pcre/lib/pcre_tables.c b/uppsrc/plugin/pcre/lib/pcre_tables.c
new file mode 100644
index 000000000..e37dcb629
--- /dev/null
+++ b/uppsrc/plugin/pcre/lib/pcre_tables.c
@@ -0,0 +1,318 @@
+/*************************************************
+*      Perl-Compatible Regular Expressions       *
+*************************************************/
+
+/* PCRE is a library of functions to support regular expressions whose syntax
+and semantics are as close as possible to those of the Perl 5 language.
+
+                       Written by Philip Hazel
+           Copyright (c) 1997-2008 University of Cambridge
+
+-----------------------------------------------------------------------------
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+
+    * Neither the name of the University of Cambridge nor the names of its
+      contributors may be used to endorse or promote products derived from
+      this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+-----------------------------------------------------------------------------
+*/
+
+
+/* This module contains some fixed tables that are used by more than one of the
+PCRE code modules. The tables are also #included by the pcretest program, which
+uses macros to change their names from _pcre_xxx to xxxx, thereby avoiding name
+clashes with the library. */
+
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "pcre_internal.h"
+
+
+/* Table of sizes for the fixed-length opcodes. It's defined in a macro so that
+the definition is next to the definition of the opcodes in pcre_internal.h. */
+
+const uschar _pcre_OP_lengths[] = { OP_LENGTHS };
+
+
+
+/*************************************************
+*           Tables for UTF-8 support             *
+*************************************************/
+
+/* These are the breakpoints for different numbers of bytes in a UTF-8
+character. */
+
+#ifdef SUPPORT_UTF8
+
+const int _pcre_utf8_table1[] =
+  { 0x7f, 0x7ff, 0xffff, 0x1fffff, 0x3ffffff, 0x7fffffff};
+
+const int _pcre_utf8_table1_size = sizeof(_pcre_utf8_table1)/sizeof(int);
+
+/* These are the indicator bits and the mask for the data bits to set in the
+first byte of a character, indexed by the number of additional bytes. */
+
+const int _pcre_utf8_table2[] = { 0,    0xc0, 0xe0, 0xf0, 0xf8, 0xfc};
+const int _pcre_utf8_table3[] = { 0xff, 0x1f, 0x0f, 0x07, 0x03, 0x01};
+
+/* Table of the number of extra bytes, indexed by the first byte masked with
+0x3f. The highest number for a valid UTF-8 first byte is in fact 0x3d. */
+
+const uschar _pcre_utf8_table4[] = {
+  1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+  1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+  2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
+  3,3,3,3,3,3,3,3,4,4,4,4,5,5,5,5 };
+
+/* The pcre_utt[] table below translates Unicode property names into type and
+code values. It is searched by binary chop, so must be in collating sequence of
+name. Originally, the table contained pointers to the name strings in the first
+field of each entry. However, that leads to a large number of relocations when
+a shared library is dynamically loaded. A significant reduction is made by
+putting all the names into a single, large string and then using offsets in the
+table itself. Maintenance is more error-prone, but frequent changes to this
+data is unlikely. */
+
+const char _pcre_utt_names[] =
+  "Any\0"
+  "Arabic\0"
+  "Armenian\0"
+  "Balinese\0"
+  "Bengali\0"
+  "Bopomofo\0"
+  "Braille\0"
+  "Buginese\0"
+  "Buhid\0"
+  "C\0"
+  "Canadian_Aboriginal\0"
+  "Cc\0"
+  "Cf\0"
+  "Cherokee\0"
+  "Cn\0"
+  "Co\0"
+  "Common\0"
+  "Coptic\0"
+  "Cs\0"
+  "Cuneiform\0"
+  "Cypriot\0"
+  "Cyrillic\0"
+  "Deseret\0"
+  "Devanagari\0"
+  "Ethiopic\0"
+  "Georgian\0"
+  "Glagolitic\0"
+  "Gothic\0"
+  "Greek\0"
+  "Gujarati\0"
+  "Gurmukhi\0"
+  "Han\0"
+  "Hangul\0"
+  "Hanunoo\0"
+  "Hebrew\0"
+  "Hiragana\0"
+  "Inherited\0"
+  "Kannada\0"
+  "Katakana\0"
+  "Kharoshthi\0"
+  "Khmer\0"
+  "L\0"
+  "L&\0"
+  "Lao\0"
+  "Latin\0"
+  "Limbu\0"
+  "Linear_B\0"
+  "Ll\0"
+  "Lm\0"
+  "Lo\0"
+  "Lt\0"
+  "Lu\0"
+  "M\0"
+  "Malayalam\0"
+  "Mc\0"
+  "Me\0"
+  "Mn\0"
+  "Mongolian\0"
+  "Myanmar\0"
+  "N\0"
+  "Nd\0"
+  "New_Tai_Lue\0"
+  "Nko\0"
+  "Nl\0"
+  "No\0"
+  "Ogham\0"
+  "Old_Italic\0"
+  "Old_Persian\0"
+  "Oriya\0"
+  "Osmanya\0"
+  "P\0"
+  "Pc\0"
+  "Pd\0"
+  "Pe\0"
+  "Pf\0"
+  "Phags_Pa\0"
+  "Phoenician\0"
+  "Pi\0"
+  "Po\0"
+  "Ps\0"
+  "Runic\0"
+  "S\0"
+  "Sc\0"
+  "Shavian\0"
+  "Sinhala\0"
+  "Sk\0"
+  "Sm\0"
+  "So\0"
+  "Syloti_Nagri\0"
+  "Syriac\0"
+  "Tagalog\0"
+  "Tagbanwa\0"
+  "Tai_Le\0"
+  "Tamil\0"
+  "Telugu\0"
+  "Thaana\0"
+  "Thai\0"
+  "Tibetan\0"
+  "Tifinagh\0"
+  "Ugaritic\0"
+  "Yi\0"
+  "Z\0"
+  "Zl\0"
+  "Zp\0"
+  "Zs\0";
+
+const ucp_type_table _pcre_utt[] = {
+  { 0,   PT_ANY, 0 },
+  { 4,   PT_SC, ucp_Arabic },
+  { 11,  PT_SC, ucp_Armenian },
+  { 20,  PT_SC, ucp_Balinese },
+  { 29,  PT_SC, ucp_Bengali },
+  { 37,  PT_SC, ucp_Bopomofo },
+  { 46,  PT_SC, ucp_Braille },
+  { 54,  PT_SC, ucp_Buginese },
+  { 63,  PT_SC, ucp_Buhid },
+  { 69,  PT_GC, ucp_C },
+  { 71,  PT_SC, ucp_Canadian_Aboriginal },
+  { 91,  PT_PC, ucp_Cc },
+  { 94,  PT_PC, ucp_Cf },
+  { 97,  PT_SC, ucp_Cherokee },
+  { 106, PT_PC, ucp_Cn },
+  { 109, PT_PC, ucp_Co },
+  { 112, PT_SC, ucp_Common },
+  { 119, PT_SC, ucp_Coptic },
+  { 126, PT_PC, ucp_Cs },
+  { 129, PT_SC, ucp_Cuneiform },
+  { 139, PT_SC, ucp_Cypriot },
+  { 147, PT_SC, ucp_Cyrillic },
+  { 156, PT_SC, ucp_Deseret },
+  { 164, PT_SC, ucp_Devanagari },
+  { 175, PT_SC, ucp_Ethiopic },
+  { 184, PT_SC, ucp_Georgian },
+  { 193, PT_SC, ucp_Glagolitic },
+  { 204, PT_SC, ucp_Gothic },
+  { 211, PT_SC, ucp_Greek },
+  { 217, PT_SC, ucp_Gujarati },
+  { 226, PT_SC, ucp_Gurmukhi },
+  { 235, PT_SC, ucp_Han },
+  { 239, PT_SC, ucp_Hangul },
+  { 246, PT_SC, ucp_Hanunoo },
+  { 254, PT_SC, ucp_Hebrew },
+  { 261, PT_SC, ucp_Hiragana },
+  { 270, PT_SC, ucp_Inherited },
+  { 280, PT_SC, ucp_Kannada },
+  { 288, PT_SC, ucp_Katakana },
+  { 297, PT_SC, ucp_Kharoshthi },
+  { 308, PT_SC, ucp_Khmer },
+  { 314, PT_GC, ucp_L },
+  { 316, PT_LAMP, 0 },
+  { 319, PT_SC, ucp_Lao },
+  { 323, PT_SC, ucp_Latin },
+  { 329, PT_SC, ucp_Limbu },
+  { 335, PT_SC, ucp_Linear_B },
+  { 344, PT_PC, ucp_Ll },
+  { 347, PT_PC, ucp_Lm },
+  { 350, PT_PC, ucp_Lo },
+  { 353, PT_PC, ucp_Lt },
+  { 356, PT_PC, ucp_Lu },
+  { 359, PT_GC, ucp_M },
+  { 361, PT_SC, ucp_Malayalam },
+  { 371, PT_PC, ucp_Mc },
+  { 374, PT_PC, ucp_Me },
+  { 377, PT_PC, ucp_Mn },
+  { 380, PT_SC, ucp_Mongolian },
+  { 390, PT_SC, ucp_Myanmar },
+  { 398, PT_GC, ucp_N },
+  { 400, PT_PC, ucp_Nd },
+  { 403, PT_SC, ucp_New_Tai_Lue },
+  { 415, PT_SC, ucp_Nko },
+  { 419, PT_PC, ucp_Nl },
+  { 422, PT_PC, ucp_No },
+  { 425, PT_SC, ucp_Ogham },
+  { 431, PT_SC, ucp_Old_Italic },
+  { 442, PT_SC, ucp_Old_Persian },
+  { 454, PT_SC, ucp_Oriya },
+  { 460, PT_SC, ucp_Osmanya },
+  { 468, PT_GC, ucp_P },
+  { 470, PT_PC, ucp_Pc },
+  { 473, PT_PC, ucp_Pd },
+  { 476, PT_PC, ucp_Pe },
+  { 479, PT_PC, ucp_Pf },
+  { 482, PT_SC, ucp_Phags_Pa },
+  { 491, PT_SC, ucp_Phoenician },
+  { 502, PT_PC, ucp_Pi },
+  { 505, PT_PC, ucp_Po },
+  { 508, PT_PC, ucp_Ps },
+  { 511, PT_SC, ucp_Runic },
+  { 517, PT_GC, ucp_S },
+  { 519, PT_PC, ucp_Sc },
+  { 522, PT_SC, ucp_Shavian },
+  { 530, PT_SC, ucp_Sinhala },
+  { 538, PT_PC, ucp_Sk },
+  { 541, PT_PC, ucp_Sm },
+  { 544, PT_PC, ucp_So },
+  { 547, PT_SC, ucp_Syloti_Nagri },
+  { 560, PT_SC, ucp_Syriac },
+  { 567, PT_SC, ucp_Tagalog },
+  { 575, PT_SC, ucp_Tagbanwa },
+  { 584, PT_SC, ucp_Tai_Le },
+  { 591, PT_SC, ucp_Tamil },
+  { 597, PT_SC, ucp_Telugu },
+  { 604, PT_SC, ucp_Thaana },
+  { 611, PT_SC, ucp_Thai },
+  { 616, PT_SC, ucp_Tibetan },
+  { 624, PT_SC, ucp_Tifinagh },
+  { 633, PT_SC, ucp_Ugaritic },
+  { 642, PT_SC, ucp_Yi },
+  { 645, PT_GC, ucp_Z },
+  { 647, PT_PC, ucp_Zl },
+  { 650, PT_PC, ucp_Zp },
+  { 653, PT_PC, ucp_Zs }
+};
+
+const int _pcre_utt_size = sizeof(_pcre_utt)/sizeof(ucp_type_table);
+
+#endif  /* SUPPORT_UTF8 */
+
+/* End of pcre_tables.c */
diff --git a/uppsrc/plugin/pcre/lib/pcre_try_flipped.c b/uppsrc/plugin/pcre/lib/pcre_try_flipped.c
new file mode 100644
index 000000000..0d2f3a2d3
--- /dev/null
+++ b/uppsrc/plugin/pcre/lib/pcre_try_flipped.c
@@ -0,0 +1,137 @@
+/*************************************************
+*      Perl-Compatible Regular Expressions       *
+*************************************************/
+
+/* PCRE is a library of functions to support regular expressions whose syntax
+and semantics are as close as possible to those of the Perl 5 language.
+
+                       Written by Philip Hazel
+           Copyright (c) 1997-2008 University of Cambridge
+
+-----------------------------------------------------------------------------
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+
+    * Neither the name of the University of Cambridge nor the names of its
+      contributors may be used to endorse or promote products derived from
+      this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+-----------------------------------------------------------------------------
+*/
+
+
+/* This module contains an internal function that tests a compiled pattern to
+see if it was compiled with the opposite endianness. If so, it uses an
+auxiliary local function to flip the appropriate bytes. */
+
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "pcre_internal.h"
+
+
+/*************************************************
+*         Flip bytes in an integer               *
+*************************************************/
+
+/* This function is called when the magic number in a regex doesn't match, in
+order to flip its bytes to see if we are dealing with a pattern that was
+compiled on a host of different endianness. If so, this function is used to
+flip other byte values.
+
+Arguments:
+  value        the number to flip
+  n            the number of bytes to flip (assumed to be 2 or 4)
+
+Returns:       the flipped value
+*/
+
+static unsigned long int
+byteflip(unsigned long int value, int n)
+{
+if (n == 2) return ((value & 0x00ff) << 8) | ((value & 0xff00) >> 8);
+return ((value & 0x000000ff) << 24) |
+       ((value & 0x0000ff00) <<  8) |
+       ((value & 0x00ff0000) >>  8) |
+       ((value & 0xff000000) >> 24);
+}
+
+
+
+/*************************************************
+*       Test for a byte-flipped compiled regex   *
+*************************************************/
+
+/* This function is called from pcre_exec(), pcre_dfa_exec(), and also from
+pcre_fullinfo(). Its job is to test whether the regex is byte-flipped - that
+is, it was compiled on a system of opposite endianness. The function is called
+only when the native MAGIC_NUMBER test fails. If the regex is indeed flipped,
+we flip all the relevant values into a different data block, and return it.
+
+Arguments:
+  re               points to the regex
+  study            points to study data, or NULL
+  internal_re      points to a new regex block
+  internal_study   points to a new study block
+
+Returns:           the new block if is is indeed a byte-flipped regex
+                   NULL if it is not
+*/
+
+real_pcre *
+_pcre_try_flipped(const real_pcre *re, real_pcre *internal_re,
+  const pcre_study_data *study, pcre_study_data *internal_study)
+{
+if (byteflip(re->magic_number, sizeof(re->magic_number)) != MAGIC_NUMBER)
+  return NULL;
+
+*internal_re = *re;           /* To copy other fields */
+internal_re->size = byteflip(re->size, sizeof(re->size));
+internal_re->options = byteflip(re->options, sizeof(re->options));
+internal_re->flags = (pcre_uint16)byteflip(re->flags, sizeof(re->flags));
+internal_re->top_bracket =
+  (pcre_uint16)byteflip(re->top_bracket, sizeof(re->top_bracket));
+internal_re->top_backref =
+  (pcre_uint16)byteflip(re->top_backref, sizeof(re->top_backref));
+internal_re->first_byte =
+  (pcre_uint16)byteflip(re->first_byte, sizeof(re->first_byte));
+internal_re->req_byte =
+  (pcre_uint16)byteflip(re->req_byte, sizeof(re->req_byte));
+internal_re->name_table_offset =
+  (pcre_uint16)byteflip(re->name_table_offset, sizeof(re->name_table_offset));
+internal_re->name_entry_size =
+  (pcre_uint16)byteflip(re->name_entry_size, sizeof(re->name_entry_size));
+internal_re->name_count =
+  (pcre_uint16)byteflip(re->name_count, sizeof(re->name_count));
+
+if (study != NULL)
+  {
+  *internal_study = *study;   /* To copy other fields */
+  internal_study->size = byteflip(study->size, sizeof(study->size));
+  internal_study->options = byteflip(study->options, sizeof(study->options));
+  }
+
+return internal_re;
+}
+
+/* End of pcre_tryflipped.c */
diff --git a/uppsrc/plugin/pcre/lib/pcre_ucp_searchfuncs.c b/uppsrc/plugin/pcre/lib/pcre_ucp_searchfuncs.c
new file mode 100644
index 000000000..461ca4377
--- /dev/null
+++ b/uppsrc/plugin/pcre/lib/pcre_ucp_searchfuncs.c
@@ -0,0 +1,179 @@
+/*************************************************
+*      Perl-Compatible Regular Expressions       *
+*************************************************/
+
+/* PCRE is a library of functions to support regular expressions whose syntax
+and semantics are as close as possible to those of the Perl 5 language.
+
+                       Written by Philip Hazel
+           Copyright (c) 1997-2008 University of Cambridge
+
+-----------------------------------------------------------------------------
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+
+    * Neither the name of the University of Cambridge nor the names of its
+      contributors may be used to endorse or promote products derived from
+      this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+-----------------------------------------------------------------------------
+*/
+
+
+/* This module contains code for searching the table of Unicode character
+properties. */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "pcre_internal.h"
+
+#include "ucp.h"               /* Category definitions */
+#include "ucpinternal.h"       /* Internal table details */
+#include "ucptable.h"          /* The table itself */
+
+
+/* Table to translate from particular type value to the general value. */
+
+static const int ucp_gentype[] = {
+  ucp_C, ucp_C, ucp_C, ucp_C, ucp_C,  /* Cc, Cf, Cn, Co, Cs */
+  ucp_L, ucp_L, ucp_L, ucp_L, ucp_L,  /* Ll, Lu, Lm, Lo, Lt */
+  ucp_M, ucp_M, ucp_M,                /* Mc, Me, Mn */
+  ucp_N, ucp_N, ucp_N,                /* Nd, Nl, No */
+  ucp_P, ucp_P, ucp_P, ucp_P, ucp_P,  /* Pc, Pd, Pe, Pf, Pi */
+  ucp_P, ucp_P,                       /* Ps, Po */
+  ucp_S, ucp_S, ucp_S, ucp_S,         /* Sc, Sk, Sm, So */
+  ucp_Z, ucp_Z, ucp_Z                 /* Zl, Zp, Zs */
+};
+
+
+
+/*************************************************
+*         Search table and return type           *
+*************************************************/
+
+/* Three values are returned: the category is ucp_C, ucp_L, etc. The detailed
+character type is ucp_Lu, ucp_Nd, etc. The script is ucp_Latin, etc.
+
+Arguments:
+  c           the character value
+  type_ptr    the detailed character type is returned here
+  script_ptr  the script is returned here
+
+Returns:      the character type category
+*/
+
+int
+_pcre_ucp_findprop(const unsigned int c, int *type_ptr, int *script_ptr)
+{
+int bot = 0;
+int top = sizeof(ucp_table)/sizeof(cnode);
+int mid;
+
+/* The table is searched using a binary chop. You might think that using
+intermediate variables to hold some of the common expressions would speed
+things up, but tests with gcc 3.4.4 on Linux showed that, on the contrary, it
+makes things a lot slower. */
+
+for (;;)
+  {
+  if (top <= bot)
+    {
+    *type_ptr = ucp_Cn;
+    *script_ptr = ucp_Common;
+    return ucp_C;
+    }
+  mid = (bot + top) >> 1;
+  if (c == (ucp_table[mid].f0 & f0_charmask)) break;
+  if (c < (ucp_table[mid].f0 & f0_charmask)) top = mid;
+  else
+    {
+    if ((ucp_table[mid].f0 & f0_rangeflag) != 0 &&
+        c <= (ucp_table[mid].f0 & f0_charmask) +
+             (ucp_table[mid].f1 & f1_rangemask)) break;
+    bot = mid + 1;
+    }
+  }
+
+/* Found an entry in the table. Set the script and detailed type values, and
+return the general type. */
+
+*script_ptr = (ucp_table[mid].f0 & f0_scriptmask) >> f0_scriptshift;
+*type_ptr = (ucp_table[mid].f1 & f1_typemask) >> f1_typeshift;
+
+return ucp_gentype[*type_ptr];
+}
+
+
+
+/*************************************************
+*       Search table and return other case       *
+*************************************************/
+
+/* If the given character is a letter, and there is another case for the
+letter, return the other case. Otherwise, return -1.
+
+Arguments:
+  c           the character value
+
+Returns:      the other case or NOTACHAR if none
+*/
+
+unsigned int
+_pcre_ucp_othercase(const unsigned int c)
+{
+int bot = 0;
+int top = sizeof(ucp_table)/sizeof(cnode);
+int mid, offset;
+
+/* The table is searched using a binary chop. You might think that using
+intermediate variables to hold some of the common expressions would speed
+things up, but tests with gcc 3.4.4 on Linux showed that, on the contrary, it
+makes things a lot slower. */
+
+for (;;)
+  {
+  if (top <= bot) return -1;
+  mid = (bot + top) >> 1;
+  if (c == (ucp_table[mid].f0 & f0_charmask)) break;
+  if (c < (ucp_table[mid].f0 & f0_charmask)) top = mid;
+  else
+    {
+    if ((ucp_table[mid].f0 & f0_rangeflag) != 0 &&
+        c <= (ucp_table[mid].f0 & f0_charmask) +
+             (ucp_table[mid].f1 & f1_rangemask)) break;
+    bot = mid + 1;
+    }
+  }
+
+/* Found an entry in the table. Return NOTACHAR for a range entry. Otherwise
+return the other case if there is one, else NOTACHAR. */
+
+if ((ucp_table[mid].f0 & f0_rangeflag) != 0) return NOTACHAR;
+
+offset = ucp_table[mid].f1 & f1_casemask;
+if ((offset & f1_caseneg) != 0) offset |= f1_caseneg;
+return (offset == 0)? NOTACHAR : c + offset;
+}
+
+
+/* End of pcre_ucp_searchfuncs.c */
diff --git a/uppsrc/plugin/pcre/lib/pcre_valid_utf8.c b/uppsrc/plugin/pcre/lib/pcre_valid_utf8.c
new file mode 100644
index 000000000..bc3bc8f3d
--- /dev/null
+++ b/uppsrc/plugin/pcre/lib/pcre_valid_utf8.c
@@ -0,0 +1,162 @@
+/*************************************************
+*      Perl-Compatible Regular Expressions       *
+*************************************************/
+
+/* PCRE is a library of functions to support regular expressions whose syntax
+and semantics are as close as possible to those of the Perl 5 language.
+
+                       Written by Philip Hazel
+           Copyright (c) 1997-2008 University of Cambridge
+
+-----------------------------------------------------------------------------
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+
+    * Neither the name of the University of Cambridge nor the names of its
+      contributors may be used to endorse or promote products derived from
+      this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+-----------------------------------------------------------------------------
+*/
+
+
+/* This module contains an internal function for validating UTF-8 character
+strings. */
+
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "pcre_internal.h"
+
+
+/*************************************************
+*         Validate a UTF-8 string                *
+*************************************************/
+
+/* This function is called (optionally) at the start of compile or match, to
+validate that a supposed UTF-8 string is actually valid. The early check means
+that subsequent code can assume it is dealing with a valid string. The check
+can be turned off for maximum performance, but the consequences of supplying
+an invalid string are then undefined.
+
+Originally, this function checked according to RFC 2279, allowing for values in
+the range 0 to 0x7fffffff, up to 6 bytes long, but ensuring that they were in
+the canonical format. Once somebody had pointed out RFC 3629 to me (it
+obsoletes 2279), additional restrictions were applied. The values are now
+limited to be between 0 and 0x0010ffff, no more than 4 bytes long, and the
+subrange 0xd000 to 0xdfff is excluded.
+
+Arguments:
+  string       points to the string
+  length       length of string, or -1 if the string is zero-terminated
+
+Returns:       < 0    if the string is a valid UTF-8 string
+               >= 0   otherwise; the value is the offset of the bad byte
+*/
+
+int
+_pcre_valid_utf8(const uschar *string, int length)
+{
+#ifdef SUPPORT_UTF8
+register const uschar *p;
+
+if (length < 0)
+  {
+  for (p = string; *p != 0; p++);
+  length = p - string;
+  }
+
+for (p = string; length-- > 0; p++)
+  {
+  register int ab;
+  register int c = *p;
+  if (c < 128) continue;
+  if (c < 0xc0) return p - string;
+  ab = _pcre_utf8_table4[c & 0x3f];     /* Number of additional bytes */
+  if (length < ab || ab > 3) return p - string;
+  length -= ab;
+
+  /* Check top bits in the second byte */
+  if ((*(++p) & 0xc0) != 0x80) return p - string;
+
+  /* Check for overlong sequences for each different length, and for the
+  excluded range 0xd000 to 0xdfff.  */
+
+  switch (ab)
+    {
+    /* Check for xx00 000x (overlong sequence) */
+
+    case 1:
+    if ((c & 0x3e) == 0) return p - string;
+    continue;   /* We know there aren't any more bytes to check */
+
+    /* Check for 1110 0000, xx0x xxxx (overlong sequence) or
+                 1110 1101, 1010 xxxx (0xd000 - 0xdfff) */
+
+    case 2:
+    if ((c == 0xe0 && (*p & 0x20) == 0) ||
+        (c == 0xed && *p >= 0xa0))
+      return p - string;
+    break;
+
+    /* Check for 1111 0000, xx00 xxxx (overlong sequence) or
+       greater than 0x0010ffff (f4 8f bf bf) */
+
+    case 3:
+    if ((c == 0xf0 && (*p & 0x30) == 0) ||
+        (c > 0xf4 ) ||
+        (c == 0xf4 && *p > 0x8f))
+      return p - string;
+    break;
+
+#if 0
+    /* These cases can no longer occur, as we restrict to a maximum of four
+    bytes nowadays. Leave the code here in case we ever want to add an option
+    for longer sequences. */
+
+    /* Check for 1111 1000, xx00 0xxx */
+    case 4:
+    if (c == 0xf8 && (*p & 0x38) == 0) return p - string;
+    break;
+
+    /* Check for leading 0xfe or 0xff, and then for 1111 1100, xx00 00xx */
+    case 5:
+    if (c == 0xfe || c == 0xff ||
+       (c == 0xfc && (*p & 0x3c) == 0)) return p - string;
+    break;
+#endif
+
+    }
+
+  /* Check for valid bytes after the 2nd, if any; all must start 10 */
+  while (--ab > 0)
+    {
+    if ((*(++p) & 0xc0) != 0x80) return p - string;
+    }
+  }
+#endif
+
+return -1;
+}
+
+/* End of pcre_valid_utf8.c */
diff --git a/uppsrc/plugin/pcre/lib/pcre_version.c b/uppsrc/plugin/pcre/lib/pcre_version.c
new file mode 100644
index 000000000..697b44b39
--- /dev/null
+++ b/uppsrc/plugin/pcre/lib/pcre_version.c
@@ -0,0 +1,90 @@
+/*************************************************
+*      Perl-Compatible Regular Expressions       *
+*************************************************/
+
+/* PCRE is a library of functions to support regular expressions whose syntax
+and semantics are as close as possible to those of the Perl 5 language.
+
+                       Written by Philip Hazel
+           Copyright (c) 1997-2008 University of Cambridge
+
+-----------------------------------------------------------------------------
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+
+    * Neither the name of the University of Cambridge nor the names of its
+      contributors may be used to endorse or promote products derived from
+      this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+-----------------------------------------------------------------------------
+*/
+
+
+/* This module contains the external function pcre_version(), which returns a
+string that identifies the PCRE version that is in use. */
+
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "pcre_internal.h"
+
+
+/*************************************************
+*          Return version string                 *
+*************************************************/
+
+/* These macros are the standard way of turning unquoted text into C strings.
+They allow macros like PCRE_MAJOR to be defined without quotes, which is
+convenient for user programs that want to test its value. */
+
+#define STRING(a)  # a
+#define XSTRING(s) STRING(s)
+
+/* A problem turned up with PCRE_PRERELEASE, which is defined empty for
+production releases. Originally, it was used naively in this code:
+
+  return XSTRING(PCRE_MAJOR)
+         "." XSTRING(PCRE_MINOR)
+             XSTRING(PCRE_PRERELEASE)
+         " " XSTRING(PCRE_DATE);
+
+However, when PCRE_PRERELEASE is empty, this leads to an attempted expansion of
+STRING(). The C standard states: "If (before argument substitution) any
+argument consists of no preprocessing tokens, the behavior is undefined." It
+turns out the gcc treats this case as a single empty string - which is what we
+really want - but Visual C grumbles about the lack of an argument for the
+macro. Unfortunately, both are within their rights. To cope with both ways of
+handling this, I had resort to some messy hackery that does a test at run time.
+I could find no way of detecting that a macro is defined as an empty string at
+pre-processor time. This hack uses a standard trick for avoiding calling
+the STRING macro with an empty argument when doing the test. */
+
+PCRE_EXP_DEFN const char *
+pcre_version(void)
+{
+return (XSTRING(Z PCRE_PRERELEASE)[1] == 0)?
+  XSTRING(PCRE_MAJOR.PCRE_MINOR PCRE_DATE) :
+  XSTRING(PCRE_MAJOR.PCRE_MINOR) XSTRING(PCRE_PRERELEASE PCRE_DATE);
+}
+
+/* End of pcre_version.c */
diff --git a/uppsrc/plugin/pcre/lib/pcre_xclass.c b/uppsrc/plugin/pcre/lib/pcre_xclass.c
new file mode 100644
index 000000000..cfb5a77b5
--- /dev/null
+++ b/uppsrc/plugin/pcre/lib/pcre_xclass.c
@@ -0,0 +1,148 @@
+/*************************************************
+*      Perl-Compatible Regular Expressions       *
+*************************************************/
+
+/* PCRE is a library of functions to support regular expressions whose syntax
+and semantics are as close as possible to those of the Perl 5 language.
+
+                       Written by Philip Hazel
+           Copyright (c) 1997-2008 University of Cambridge
+
+-----------------------------------------------------------------------------
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+
+    * Neither the name of the University of Cambridge nor the names of its
+      contributors may be used to endorse or promote products derived from
+      this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+-----------------------------------------------------------------------------
+*/
+
+
+/* This module contains an internal function that is used to match an extended
+class (one that contains characters whose values are > 255). It is used by both
+pcre_exec() and pcre_def_exec(). */
+
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "pcre_internal.h"
+
+
+/*************************************************
+*       Match character against an XCLASS        *
+*************************************************/
+
+/* This function is called to match a character against an extended class that
+might contain values > 255.
+
+Arguments:
+  c           the character
+  data        points to the flag byte of the XCLASS data
+
+Returns:      TRUE if character matches, else FALSE
+*/
+
+BOOL
+_pcre_xclass(int c, const uschar *data)
+{
+int t;
+BOOL negated = (*data & XCL_NOT) != 0;
+
+/* Character values < 256 are matched against a bitmap, if one is present. If
+not, we still carry on, because there may be ranges that start below 256 in the
+additional data. */
+
+if (c < 256)
+  {
+  if ((*data & XCL_MAP) != 0 && (data[1 + c/8] & (1 << (c&7))) != 0)
+    return !negated;   /* char found */
+  }
+
+/* First skip the bit map if present. Then match against the list of Unicode
+properties or large chars or ranges that end with a large char. We won't ever
+encounter XCL_PROP or XCL_NOTPROP when UCP support is not compiled. */
+
+if ((*data++ & XCL_MAP) != 0) data += 32;
+
+while ((t = *data++) != XCL_END)
+  {
+  int x, y;
+  if (t == XCL_SINGLE)
+    {
+    GETCHARINC(x, data);
+    if (c == x) return !negated;
+    }
+  else if (t == XCL_RANGE)
+    {
+    GETCHARINC(x, data);
+    GETCHARINC(y, data);
+    if (c >= x && c <= y) return !negated;
+    }
+
+#ifdef SUPPORT_UCP
+  else  /* XCL_PROP & XCL_NOTPROP */
+    {
+    int chartype, script;
+    int category = _pcre_ucp_findprop(c, &chartype, &script);
+
+    switch(*data)
+      {
+      case PT_ANY:
+      if (t == XCL_PROP) return !negated;
+      break;
+
+      case PT_LAMP:
+      if ((chartype == ucp_Lu || chartype == ucp_Ll || chartype == ucp_Lt) ==
+          (t == XCL_PROP)) return !negated;
+      break;
+
+      case PT_GC:
+      if ((data[1] == category) == (t == XCL_PROP)) return !negated;
+      break;
+
+      case PT_PC:
+      if ((data[1] == chartype) == (t == XCL_PROP)) return !negated;
+      break;
+
+      case PT_SC:
+      if ((data[1] == script) == (t == XCL_PROP)) return !negated;
+      break;
+
+      /* This should never occur, but compilers may mutter if there is no
+      default. */
+
+      default:
+      return FALSE;
+      }
+
+    data += 2;
+    }
+#endif  /* SUPPORT_UCP */
+  }
+
+return negated;   /* char did not match */
+}
+
+/* End of pcre_xclass.c */
diff --git a/uppsrc/plugin/pcre/lib/ucp.h b/uppsrc/plugin/pcre/lib/ucp.h
new file mode 100644
index 000000000..3a4179b76
--- /dev/null
+++ b/uppsrc/plugin/pcre/lib/ucp.h
@@ -0,0 +1,133 @@
+/*************************************************
+*          Unicode Property Table handler        *
+*************************************************/
+
+#ifndef _UCP_H
+#define _UCP_H
+
+/* This file contains definitions of the property values that are returned by
+the function _pcre_ucp_findprop(). New values that are added for new releases
+of Unicode should always be at the end of each enum, for backwards
+compatibility. */
+
+/* These are the general character categories. */
+
+enum {
+  ucp_C,     /* Other */
+  ucp_L,     /* Letter */
+  ucp_M,     /* Mark */
+  ucp_N,     /* Number */
+  ucp_P,     /* Punctuation */
+  ucp_S,     /* Symbol */
+  ucp_Z      /* Separator */
+};
+
+/* These are the particular character types. */
+
+enum {
+  ucp_Cc,    /* Control */
+  ucp_Cf,    /* Format */
+  ucp_Cn,    /* Unassigned */
+  ucp_Co,    /* Private use */
+  ucp_Cs,    /* Surrogate */
+  ucp_Ll,    /* Lower case letter */
+  ucp_Lm,    /* Modifier letter */
+  ucp_Lo,    /* Other letter */
+  ucp_Lt,    /* Title case letter */
+  ucp_Lu,    /* Upper case letter */
+  ucp_Mc,    /* Spacing mark */
+  ucp_Me,    /* Enclosing mark */
+  ucp_Mn,    /* Non-spacing mark */
+  ucp_Nd,    /* Decimal number */
+  ucp_Nl,    /* Letter number */
+  ucp_No,    /* Other number */
+  ucp_Pc,    /* Connector punctuation */
+  ucp_Pd,    /* Dash punctuation */
+  ucp_Pe,    /* Close punctuation */
+  ucp_Pf,    /* Final punctuation */
+  ucp_Pi,    /* Initial punctuation */
+  ucp_Po,    /* Other punctuation */
+  ucp_Ps,    /* Open punctuation */
+  ucp_Sc,    /* Currency symbol */
+  ucp_Sk,    /* Modifier symbol */
+  ucp_Sm,    /* Mathematical symbol */
+  ucp_So,    /* Other symbol */
+  ucp_Zl,    /* Line separator */
+  ucp_Zp,    /* Paragraph separator */
+  ucp_Zs     /* Space separator */
+};
+
+/* These are the script identifications. */
+
+enum {
+  ucp_Arabic,
+  ucp_Armenian,
+  ucp_Bengali,
+  ucp_Bopomofo,
+  ucp_Braille,
+  ucp_Buginese,
+  ucp_Buhid,
+  ucp_Canadian_Aboriginal,
+  ucp_Cherokee,
+  ucp_Common,
+  ucp_Coptic,
+  ucp_Cypriot,
+  ucp_Cyrillic,
+  ucp_Deseret,
+  ucp_Devanagari,
+  ucp_Ethiopic,
+  ucp_Georgian,
+  ucp_Glagolitic,
+  ucp_Gothic,
+  ucp_Greek,
+  ucp_Gujarati,
+  ucp_Gurmukhi,
+  ucp_Han,
+  ucp_Hangul,
+  ucp_Hanunoo,
+  ucp_Hebrew,
+  ucp_Hiragana,
+  ucp_Inherited,
+  ucp_Kannada,
+  ucp_Katakana,
+  ucp_Kharoshthi,
+  ucp_Khmer,
+  ucp_Lao,
+  ucp_Latin,
+  ucp_Limbu,
+  ucp_Linear_B,
+  ucp_Malayalam,
+  ucp_Mongolian,
+  ucp_Myanmar,
+  ucp_New_Tai_Lue,
+  ucp_Ogham,
+  ucp_Old_Italic,
+  ucp_Old_Persian,
+  ucp_Oriya,
+  ucp_Osmanya,
+  ucp_Runic,
+  ucp_Shavian,
+  ucp_Sinhala,
+  ucp_Syloti_Nagri,
+  ucp_Syriac,
+  ucp_Tagalog,
+  ucp_Tagbanwa,
+  ucp_Tai_Le,
+  ucp_Tamil,
+  ucp_Telugu,
+  ucp_Thaana,
+  ucp_Thai,
+  ucp_Tibetan,
+  ucp_Tifinagh,
+  ucp_Ugaritic,
+  ucp_Yi,
+  ucp_Balinese,      /* New for Unicode 5.0.0 */
+  ucp_Cuneiform,     /* New for Unicode 5.0.0 */
+  ucp_Nko,           /* New for Unicode 5.0.0 */
+  ucp_Phags_Pa,      /* New for Unicode 5.0.0 */
+  ucp_Phoenician     /* New for Unicode 5.0.0 */
+};
+
+#endif
+
+/* End of ucp.h */
diff --git a/uppsrc/plugin/pcre/lib/ucpinternal.h b/uppsrc/plugin/pcre/lib/ucpinternal.h
new file mode 100644
index 000000000..811a373c8
--- /dev/null
+++ b/uppsrc/plugin/pcre/lib/ucpinternal.h
@@ -0,0 +1,92 @@
+/*************************************************
+*           Unicode Property Table handler       *
+*************************************************/
+
+#ifndef _UCPINTERNAL_H
+#define _UCPINTERNAL_H
+
+/* Internal header file defining the layout of the bits in each pair of 32-bit
+words that form a data item in the table. */
+
+typedef struct cnode {
+  pcre_uint32 f0;
+  pcre_uint32 f1;
+} cnode;
+
+/* Things for the f0 field */
+
+#define f0_scriptmask   0xff000000  /* Mask for script field */
+#define f0_scriptshift          24  /* Shift for script value */
+#define f0_rangeflag    0x00f00000  /* Flag for a range item */
+#define f0_charmask     0x001fffff  /* Mask for code point value */
+
+/* Things for the f1 field */
+
+#define f1_typemask     0xfc000000  /* Mask for char type field */
+#define f1_typeshift            26  /* Shift for the type field */
+#define f1_rangemask    0x0000ffff  /* Mask for a range offset */
+#define f1_casemask     0x0000ffff  /* Mask for a case offset */
+#define f1_caseneg      0xffff8000  /* Bits for negation */
+
+/* The data consists of a vector of structures of type cnode. The two unsigned
+32-bit integers are used as follows:
+
+(f0) (1) The most significant byte holds the script number. The numbers are
+         defined by the enum in ucp.h.
+
+     (2) The 0x00800000 bit is set if this entry defines a range of characters.
+         It is not set if this entry defines a single character
+
+     (3) The 0x00600000 bits are spare.
+
+     (4) The 0x001fffff bits contain the code point. No Unicode code point will
+         ever be greater than 0x0010ffff, so this should be OK for ever.
+
+(f1) (1) The 0xfc000000 bits contain the character type number. The numbers are
+         defined by an enum in ucp.h.
+
+     (2) The 0x03ff0000 bits are spare.
+
+     (3) The 0x0000ffff bits contain EITHER the unsigned offset to the top of
+         range if this entry defines a range, OR the *signed* offset to the
+         character's "other case" partner if this entry defines a single
+         character. There is no partner if the value is zero.
+
+-------------------------------------------------------------------------------
+| script (8) |.|.|.| codepoint (21) || type (6) |.|.| spare (8) | offset (16) |
+-------------------------------------------------------------------------------
+              | | |                              | |
+              | | |-> spare                      | |-> spare
+              | |                                |
+              | |-> spare                        |-> spare
+              |
+              |-> range flag
+
+The upper/lower casing information is set only for characters that come in
+pairs. The non-one-to-one mappings in the Unicode data are ignored.
+
+When searching the data, proceed as follows:
+
+(1) Set up for a binary chop search.
+
+(2) If the top is not greater than the bottom, the character is not in the
+    table. Its type must therefore be "Cn" ("Undefined").
+
+(3) Find the middle vector element.
+
+(4) Extract the code point and compare. If equal, we are done.
+
+(5) If the test character is smaller, set the top to the current point, and
+    goto (2).
+
+(6) If the current entry defines a range, compute the last character by adding
+    the offset, and see if the test character is within the range. If it is,
+    we are done.
+
+(7) Otherwise, set the bottom to one element past the current point and goto
+    (2).
+*/
+
+#endif /* _UCPINTERNAL_H */
+
+/* End of ucpinternal.h */
diff --git a/uppsrc/plugin/pcre/lib/ucptable.h b/uppsrc/plugin/pcre/lib/ucptable.h
new file mode 100644
index 000000000..a274d443e
--- /dev/null
+++ b/uppsrc/plugin/pcre/lib/ucptable.h
@@ -0,0 +1,3088 @@
+/* This source module is automatically generated from the Unicode
+property table. See ucpinternal.h for a description of the layout.
+This version was made from the Unicode 5.0.0 tables. */
+
+static const cnode ucp_table[] = {
+  { 0x09800000, 0x0000001f },
+  { 0x09000020, 0x74000000 },
+  { 0x09800021, 0x54000002 },
+  { 0x09000024, 0x5c000000 },
+  { 0x09800025, 0x54000002 },
+  { 0x09000028, 0x58000000 },
+  { 0x09000029, 0x48000000 },
+  { 0x0900002a, 0x54000000 },
+  { 0x0900002b, 0x64000000 },
+  { 0x0900002c, 0x54000000 },
+  { 0x0900002d, 0x44000000 },
+  { 0x0980002e, 0x54000001 },
+  { 0x09800030, 0x34000009 },
+  { 0x0980003a, 0x54000001 },
+  { 0x0980003c, 0x64000002 },
+  { 0x0980003f, 0x54000001 },
+  { 0x21000041, 0x24000020 },
+  { 0x21000042, 0x24000020 },
+  { 0x21000043, 0x24000020 },
+  { 0x21000044, 0x24000020 },
+  { 0x21000045, 0x24000020 },
+  { 0x21000046, 0x24000020 },
+  { 0x21000047, 0x24000020 },
+  { 0x21000048, 0x24000020 },
+  { 0x21000049, 0x24000020 },
+  { 0x2100004a, 0x24000020 },
+  { 0x2100004b, 0x24000020 },
+  { 0x2100004c, 0x24000020 },
+  { 0x2100004d, 0x24000020 },
+  { 0x2100004e, 0x24000020 },
+  { 0x2100004f, 0x24000020 },
+  { 0x21000050, 0x24000020 },
+  { 0x21000051, 0x24000020 },
+  { 0x21000052, 0x24000020 },
+  { 0x21000053, 0x24000020 },
+  { 0x21000054, 0x24000020 },
+  { 0x21000055, 0x24000020 },
+  { 0x21000056, 0x24000020 },
+  { 0x21000057, 0x24000020 },
+  { 0x21000058, 0x24000020 },
+  { 0x21000059, 0x24000020 },
+  { 0x2100005a, 0x24000020 },
+  { 0x0900005b, 0x58000000 },
+  { 0x0900005c, 0x54000000 },
+  { 0x0900005d, 0x48000000 },
+  { 0x0900005e, 0x60000000 },
+  { 0x0900005f, 0x40000000 },
+  { 0x09000060, 0x60000000 },
+  { 0x21000061, 0x1400ffe0 },
+  { 0x21000062, 0x1400ffe0 },
+  { 0x21000063, 0x1400ffe0 },
+  { 0x21000064, 0x1400ffe0 },
+  { 0x21000065, 0x1400ffe0 },
+  { 0x21000066, 0x1400ffe0 },
+  { 0x21000067, 0x1400ffe0 },
+  { 0x21000068, 0x1400ffe0 },
+  { 0x21000069, 0x1400ffe0 },
+  { 0x2100006a, 0x1400ffe0 },
+  { 0x2100006b, 0x1400ffe0 },
+  { 0x2100006c, 0x1400ffe0 },
+  { 0x2100006d, 0x1400ffe0 },
+  { 0x2100006e, 0x1400ffe0 },
+  { 0x2100006f, 0x1400ffe0 },
+  { 0x21000070, 0x1400ffe0 },
+  { 0x21000071, 0x1400ffe0 },
+  { 0x21000072, 0x1400ffe0 },
+  { 0x21000073, 0x1400ffe0 },
+  { 0x21000074, 0x1400ffe0 },
+  { 0x21000075, 0x1400ffe0 },
+  { 0x21000076, 0x1400ffe0 },
+  { 0x21000077, 0x1400ffe0 },
+  { 0x21000078, 0x1400ffe0 },
+  { 0x21000079, 0x1400ffe0 },
+  { 0x2100007a, 0x1400ffe0 },
+  { 0x0900007b, 0x58000000 },
+  { 0x0900007c, 0x64000000 },
+  { 0x0900007d, 0x48000000 },
+  { 0x0900007e, 0x64000000 },
+  { 0x0980007f, 0x00000020 },
+  { 0x090000a0, 0x74000000 },
+  { 0x090000a1, 0x54000000 },
+  { 0x098000a2, 0x5c000003 },
+  { 0x098000a6, 0x68000001 },
+  { 0x090000a8, 0x60000000 },
+  { 0x090000a9, 0x68000000 },
+  { 0x210000aa, 0x14000000 },
+  { 0x090000ab, 0x50000000 },
+  { 0x090000ac, 0x64000000 },
+  { 0x090000ad, 0x04000000 },
+  { 0x090000ae, 0x68000000 },
+  { 0x090000af, 0x60000000 },
+  { 0x090000b0, 0x68000000 },
+  { 0x090000b1, 0x64000000 },
+  { 0x098000b2, 0x3c000001 },
+  { 0x090000b4, 0x60000000 },
+  { 0x090000b5, 0x140002e7 },
+  { 0x090000b6, 0x68000000 },
+  { 0x090000b7, 0x54000000 },
+  { 0x090000b8, 0x60000000 },
+  { 0x090000b9, 0x3c000000 },
+  { 0x210000ba, 0x14000000 },
+  { 0x090000bb, 0x4c000000 },
+  { 0x098000bc, 0x3c000002 },
+  { 0x090000bf, 0x54000000 },
+  { 0x210000c0, 0x24000020 },
+  { 0x210000c1, 0x24000020 },
+  { 0x210000c2, 0x24000020 },
+  { 0x210000c3, 0x24000020 },
+  { 0x210000c4, 0x24000020 },
+  { 0x210000c5, 0x24000020 },
+  { 0x210000c6, 0x24000020 },
+  { 0x210000c7, 0x24000020 },
+  { 0x210000c8, 0x24000020 },
+  { 0x210000c9, 0x24000020 },
+  { 0x210000ca, 0x24000020 },
+  { 0x210000cb, 0x24000020 },
+  { 0x210000cc, 0x24000020 },
+  { 0x210000cd, 0x24000020 },
+  { 0x210000ce, 0x24000020 },
+  { 0x210000cf, 0x24000020 },
+  { 0x210000d0, 0x24000020 },
+  { 0x210000d1, 0x24000020 },
+  { 0x210000d2, 0x24000020 },
+  { 0x210000d3, 0x24000020 },
+  { 0x210000d4, 0x24000020 },
+  { 0x210000d5, 0x24000020 },
+  { 0x210000d6, 0x24000020 },
+  { 0x090000d7, 0x64000000 },
+  { 0x210000d8, 0x24000020 },
+  { 0x210000d9, 0x24000020 },
+  { 0x210000da, 0x24000020 },
+  { 0x210000db, 0x24000020 },
+  { 0x210000dc, 0x24000020 },
+  { 0x210000dd, 0x24000020 },
+  { 0x210000de, 0x24000020 },
+  { 0x210000df, 0x14000000 },
+  { 0x210000e0, 0x1400ffe0 },
+  { 0x210000e1, 0x1400ffe0 },
+  { 0x210000e2, 0x1400ffe0 },
+  { 0x210000e3, 0x1400ffe0 },
+  { 0x210000e4, 0x1400ffe0 },
+  { 0x210000e5, 0x1400ffe0 },
+  { 0x210000e6, 0x1400ffe0 },
+  { 0x210000e7, 0x1400ffe0 },
+  { 0x210000e8, 0x1400ffe0 },
+  { 0x210000e9, 0x1400ffe0 },
+  { 0x210000ea, 0x1400ffe0 },
+  { 0x210000eb, 0x1400ffe0 },
+  { 0x210000ec, 0x1400ffe0 },
+  { 0x210000ed, 0x1400ffe0 },
+  { 0x210000ee, 0x1400ffe0 },
+  { 0x210000ef, 0x1400ffe0 },
+  { 0x210000f0, 0x1400ffe0 },
+  { 0x210000f1, 0x1400ffe0 },
+  { 0x210000f2, 0x1400ffe0 },
+  { 0x210000f3, 0x1400ffe0 },
+  { 0x210000f4, 0x1400ffe0 },
+  { 0x210000f5, 0x1400ffe0 },
+  { 0x210000f6, 0x1400ffe0 },
+  { 0x090000f7, 0x64000000 },
+  { 0x210000f8, 0x1400ffe0 },
+  { 0x210000f9, 0x1400ffe0 },
+  { 0x210000fa, 0x1400ffe0 },
+  { 0x210000fb, 0x1400ffe0 },
+  { 0x210000fc, 0x1400ffe0 },
+  { 0x210000fd, 0x1400ffe0 },
+  { 0x210000fe, 0x1400ffe0 },
+  { 0x210000ff, 0x14000079 },
+  { 0x21000100, 0x24000001 },
+  { 0x21000101, 0x1400ffff },
+  { 0x21000102, 0x24000001 },
+  { 0x21000103, 0x1400ffff },
+  { 0x21000104, 0x24000001 },
+  { 0x21000105, 0x1400ffff },
+  { 0x21000106, 0x24000001 },
+  { 0x21000107, 0x1400ffff },
+  { 0x21000108, 0x24000001 },
+  { 0x21000109, 0x1400ffff },
+  { 0x2100010a, 0x24000001 },
+  { 0x2100010b, 0x1400ffff },
+  { 0x2100010c, 0x24000001 },
+  { 0x2100010d, 0x1400ffff },
+  { 0x2100010e, 0x24000001 },
+  { 0x2100010f, 0x1400ffff },
+  { 0x21000110, 0x24000001 },
+  { 0x21000111, 0x1400ffff },
+  { 0x21000112, 0x24000001 },
+  { 0x21000113, 0x1400ffff },
+  { 0x21000114, 0x24000001 },
+  { 0x21000115, 0x1400ffff },
+  { 0x21000116, 0x24000001 },
+  { 0x21000117, 0x1400ffff },
+  { 0x21000118, 0x24000001 },
+  { 0x21000119, 0x1400ffff },
+  { 0x2100011a, 0x24000001 },
+  { 0x2100011b, 0x1400ffff },
+  { 0x2100011c, 0x24000001 },
+  { 0x2100011d, 0x1400ffff },
+  { 0x2100011e, 0x24000001 },
+  { 0x2100011f, 0x1400ffff },
+  { 0x21000120, 0x24000001 },
+  { 0x21000121, 0x1400ffff },
+  { 0x21000122, 0x24000001 },
+  { 0x21000123, 0x1400ffff },
+  { 0x21000124, 0x24000001 },
+  { 0x21000125, 0x1400ffff },
+  { 0x21000126, 0x24000001 },
+  { 0x21000127, 0x1400ffff },
+  { 0x21000128, 0x24000001 },
+  { 0x21000129, 0x1400ffff },
+  { 0x2100012a, 0x24000001 },
+  { 0x2100012b, 0x1400ffff },
+  { 0x2100012c, 0x24000001 },
+  { 0x2100012d, 0x1400ffff },
+  { 0x2100012e, 0x24000001 },
+  { 0x2100012f, 0x1400ffff },
+  { 0x21000130, 0x2400ff39 },
+  { 0x21000131, 0x1400ff18 },
+  { 0x21000132, 0x24000001 },
+  { 0x21000133, 0x1400ffff },
+  { 0x21000134, 0x24000001 },
+  { 0x21000135, 0x1400ffff },
+  { 0x21000136, 0x24000001 },
+  { 0x21000137, 0x1400ffff },
+  { 0x21000138, 0x14000000 },
+  { 0x21000139, 0x24000001 },
+  { 0x2100013a, 0x1400ffff },
+  { 0x2100013b, 0x24000001 },
+  { 0x2100013c, 0x1400ffff },
+  { 0x2100013d, 0x24000001 },
+  { 0x2100013e, 0x1400ffff },
+  { 0x2100013f, 0x24000001 },
+  { 0x21000140, 0x1400ffff },
+  { 0x21000141, 0x24000001 },
+  { 0x21000142, 0x1400ffff },
+  { 0x21000143, 0x24000001 },
+  { 0x21000144, 0x1400ffff },
+  { 0x21000145, 0x24000001 },
+  { 0x21000146, 0x1400ffff },
+  { 0x21000147, 0x24000001 },
+  { 0x21000148, 0x1400ffff },
+  { 0x21000149, 0x14000000 },
+  { 0x2100014a, 0x24000001 },
+  { 0x2100014b, 0x1400ffff },
+  { 0x2100014c, 0x24000001 },
+  { 0x2100014d, 0x1400ffff },
+  { 0x2100014e, 0x24000001 },
+  { 0x2100014f, 0x1400ffff },
+  { 0x21000150, 0x24000001 },
+  { 0x21000151, 0x1400ffff },
+  { 0x21000152, 0x24000001 },
+  { 0x21000153, 0x1400ffff },
+  { 0x21000154, 0x24000001 },
+  { 0x21000155, 0x1400ffff },
+  { 0x21000156, 0x24000001 },
+  { 0x21000157, 0x1400ffff },
+  { 0x21000158, 0x24000001 },
+  { 0x21000159, 0x1400ffff },
+  { 0x2100015a, 0x24000001 },
+  { 0x2100015b, 0x1400ffff },
+  { 0x2100015c, 0x24000001 },
+  { 0x2100015d, 0x1400ffff },
+  { 0x2100015e, 0x24000001 },
+  { 0x2100015f, 0x1400ffff },
+  { 0x21000160, 0x24000001 },
+  { 0x21000161, 0x1400ffff },
+  { 0x21000162, 0x24000001 },
+  { 0x21000163, 0x1400ffff },
+  { 0x21000164, 0x24000001 },
+  { 0x21000165, 0x1400ffff },
+  { 0x21000166, 0x24000001 },
+  { 0x21000167, 0x1400ffff },
+  { 0x21000168, 0x24000001 },
+  { 0x21000169, 0x1400ffff },
+  { 0x2100016a, 0x24000001 },
+  { 0x2100016b, 0x1400ffff },
+  { 0x2100016c, 0x24000001 },
+  { 0x2100016d, 0x1400ffff },
+  { 0x2100016e, 0x24000001 },
+  { 0x2100016f, 0x1400ffff },
+  { 0x21000170, 0x24000001 },
+  { 0x21000171, 0x1400ffff },
+  { 0x21000172, 0x24000001 },
+  { 0x21000173, 0x1400ffff },
+  { 0x21000174, 0x24000001 },
+  { 0x21000175, 0x1400ffff },
+  { 0x21000176, 0x24000001 },
+  { 0x21000177, 0x1400ffff },
+  { 0x21000178, 0x2400ff87 },
+  { 0x21000179, 0x24000001 },
+  { 0x2100017a, 0x1400ffff },
+  { 0x2100017b, 0x24000001 },
+  { 0x2100017c, 0x1400ffff },
+  { 0x2100017d, 0x24000001 },
+  { 0x2100017e, 0x1400ffff },
+  { 0x2100017f, 0x1400fed4 },
+  { 0x21000180, 0x140000c3 },
+  { 0x21000181, 0x240000d2 },
+  { 0x21000182, 0x24000001 },
+  { 0x21000183, 0x1400ffff },
+  { 0x21000184, 0x24000001 },
+  { 0x21000185, 0x1400ffff },
+  { 0x21000186, 0x240000ce },
+  { 0x21000187, 0x24000001 },
+  { 0x21000188, 0x1400ffff },
+  { 0x21000189, 0x240000cd },
+  { 0x2100018a, 0x240000cd },
+  { 0x2100018b, 0x24000001 },
+  { 0x2100018c, 0x1400ffff },
+  { 0x2100018d, 0x14000000 },
+  { 0x2100018e, 0x2400004f },
+  { 0x2100018f, 0x240000ca },
+  { 0x21000190, 0x240000cb },
+  { 0x21000191, 0x24000001 },
+  { 0x21000192, 0x1400ffff },
+  { 0x21000193, 0x240000cd },
+  { 0x21000194, 0x240000cf },
+  { 0x21000195, 0x14000061 },
+  { 0x21000196, 0x240000d3 },
+  { 0x21000197, 0x240000d1 },
+  { 0x21000198, 0x24000001 },
+  { 0x21000199, 0x1400ffff },
+  { 0x2100019a, 0x140000a3 },
+  { 0x2100019b, 0x14000000 },
+  { 0x2100019c, 0x240000d3 },
+  { 0x2100019d, 0x240000d5 },
+  { 0x2100019e, 0x14000082 },
+  { 0x2100019f, 0x240000d6 },
+  { 0x210001a0, 0x24000001 },
+  { 0x210001a1, 0x1400ffff },
+  { 0x210001a2, 0x24000001 },
+  { 0x210001a3, 0x1400ffff },
+  { 0x210001a4, 0x24000001 },
+  { 0x210001a5, 0x1400ffff },
+  { 0x210001a6, 0x240000da },
+  { 0x210001a7, 0x24000001 },
+  { 0x210001a8, 0x1400ffff },
+  { 0x210001a9, 0x240000da },
+  { 0x218001aa, 0x14000001 },
+  { 0x210001ac, 0x24000001 },
+  { 0x210001ad, 0x1400ffff },
+  { 0x210001ae, 0x240000da },
+  { 0x210001af, 0x24000001 },
+  { 0x210001b0, 0x1400ffff },
+  { 0x210001b1, 0x240000d9 },
+  { 0x210001b2, 0x240000d9 },
+  { 0x210001b3, 0x24000001 },
+  { 0x210001b4, 0x1400ffff },
+  { 0x210001b5, 0x24000001 },
+  { 0x210001b6, 0x1400ffff },
+  { 0x210001b7, 0x240000db },
+  { 0x210001b8, 0x24000001 },
+  { 0x210001b9, 0x1400ffff },
+  { 0x210001ba, 0x14000000 },
+  { 0x210001bb, 0x1c000000 },
+  { 0x210001bc, 0x24000001 },
+  { 0x210001bd, 0x1400ffff },
+  { 0x210001be, 0x14000000 },
+  { 0x210001bf, 0x14000038 },
+  { 0x218001c0, 0x1c000003 },
+  { 0x210001c4, 0x24000002 },
+  { 0x210001c5, 0x2000ffff },
+  { 0x210001c6, 0x1400fffe },
+  { 0x210001c7, 0x24000002 },
+  { 0x210001c8, 0x2000ffff },
+  { 0x210001c9, 0x1400fffe },
+  { 0x210001ca, 0x24000002 },
+  { 0x210001cb, 0x2000ffff },
+  { 0x210001cc, 0x1400fffe },
+  { 0x210001cd, 0x24000001 },
+  { 0x210001ce, 0x1400ffff },
+  { 0x210001cf, 0x24000001 },
+  { 0x210001d0, 0x1400ffff },
+  { 0x210001d1, 0x24000001 },
+  { 0x210001d2, 0x1400ffff },
+  { 0x210001d3, 0x24000001 },
+  { 0x210001d4, 0x1400ffff },
+  { 0x210001d5, 0x24000001 },
+  { 0x210001d6, 0x1400ffff },
+  { 0x210001d7, 0x24000001 },
+  { 0x210001d8, 0x1400ffff },
+  { 0x210001d9, 0x24000001 },
+  { 0x210001da, 0x1400ffff },
+  { 0x210001db, 0x24000001 },
+  { 0x210001dc, 0x1400ffff },
+  { 0x210001dd, 0x1400ffb1 },
+  { 0x210001de, 0x24000001 },
+  { 0x210001df, 0x1400ffff },
+  { 0x210001e0, 0x24000001 },
+  { 0x210001e1, 0x1400ffff },
+  { 0x210001e2, 0x24000001 },
+  { 0x210001e3, 0x1400ffff },
+  { 0x210001e4, 0x24000001 },
+  { 0x210001e5, 0x1400ffff },
+  { 0x210001e6, 0x24000001 },
+  { 0x210001e7, 0x1400ffff },
+  { 0x210001e8, 0x24000001 },
+  { 0x210001e9, 0x1400ffff },
+  { 0x210001ea, 0x24000001 },
+  { 0x210001eb, 0x1400ffff },
+  { 0x210001ec, 0x24000001 },
+  { 0x210001ed, 0x1400ffff },
+  { 0x210001ee, 0x24000001 },
+  { 0x210001ef, 0x1400ffff },
+  { 0x210001f0, 0x14000000 },
+  { 0x210001f1, 0x24000002 },
+  { 0x210001f2, 0x2000ffff },
+  { 0x210001f3, 0x1400fffe },
+  { 0x210001f4, 0x24000001 },
+  { 0x210001f5, 0x1400ffff },
+  { 0x210001f6, 0x2400ff9f },
+  { 0x210001f7, 0x2400ffc8 },
+  { 0x210001f8, 0x24000001 },
+  { 0x210001f9, 0x1400ffff },
+  { 0x210001fa, 0x24000001 },
+  { 0x210001fb, 0x1400ffff },
+  { 0x210001fc, 0x24000001 },
+  { 0x210001fd, 0x1400ffff },
+  { 0x210001fe, 0x24000001 },
+  { 0x210001ff, 0x1400ffff },
+  { 0x21000200, 0x24000001 },
+  { 0x21000201, 0x1400ffff },
+  { 0x21000202, 0x24000001 },
+  { 0x21000203, 0x1400ffff },
+  { 0x21000204, 0x24000001 },
+  { 0x21000205, 0x1400ffff },
+  { 0x21000206, 0x24000001 },
+  { 0x21000207, 0x1400ffff },
+  { 0x21000208, 0x24000001 },
+  { 0x21000209, 0x1400ffff },
+  { 0x2100020a, 0x24000001 },
+  { 0x2100020b, 0x1400ffff },
+  { 0x2100020c, 0x24000001 },
+  { 0x2100020d, 0x1400ffff },
+  { 0x2100020e, 0x24000001 },
+  { 0x2100020f, 0x1400ffff },
+  { 0x21000210, 0x24000001 },
+  { 0x21000211, 0x1400ffff },
+  { 0x21000212, 0x24000001 },
+  { 0x21000213, 0x1400ffff },
+  { 0x21000214, 0x24000001 },
+  { 0x21000215, 0x1400ffff },
+  { 0x21000216, 0x24000001 },
+  { 0x21000217, 0x1400ffff },
+  { 0x21000218, 0x24000001 },
+  { 0x21000219, 0x1400ffff },
+  { 0x2100021a, 0x24000001 },
+  { 0x2100021b, 0x1400ffff },
+  { 0x2100021c, 0x24000001 },
+  { 0x2100021d, 0x1400ffff },
+  { 0x2100021e, 0x24000001 },
+  { 0x2100021f, 0x1400ffff },
+  { 0x21000220, 0x2400ff7e },
+  { 0x21000221, 0x14000000 },
+  { 0x21000222, 0x24000001 },
+  { 0x21000223, 0x1400ffff },
+  { 0x21000224, 0x24000001 },
+  { 0x21000225, 0x1400ffff },
+  { 0x21000226, 0x24000001 },
+  { 0x21000227, 0x1400ffff },
+  { 0x21000228, 0x24000001 },
+  { 0x21000229, 0x1400ffff },
+  { 0x2100022a, 0x24000001 },
+  { 0x2100022b, 0x1400ffff },
+  { 0x2100022c, 0x24000001 },
+  { 0x2100022d, 0x1400ffff },
+  { 0x2100022e, 0x24000001 },
+  { 0x2100022f, 0x1400ffff },
+  { 0x21000230, 0x24000001 },
+  { 0x21000231, 0x1400ffff },
+  { 0x21000232, 0x24000001 },
+  { 0x21000233, 0x1400ffff },
+  { 0x21800234, 0x14000005 },
+  { 0x2100023a, 0x24002a2b },
+  { 0x2100023b, 0x24000001 },
+  { 0x2100023c, 0x1400ffff },
+  { 0x2100023d, 0x2400ff5d },
+  { 0x2100023e, 0x24002a28 },
+  { 0x2180023f, 0x14000001 },
+  { 0x21000241, 0x24000001 },
+  { 0x21000242, 0x1400ffff },
+  { 0x21000243, 0x2400ff3d },
+  { 0x21000244, 0x24000045 },
+  { 0x21000245, 0x24000047 },
+  { 0x21000246, 0x24000001 },
+  { 0x21000247, 0x1400ffff },
+  { 0x21000248, 0x24000001 },
+  { 0x21000249, 0x1400ffff },
+  { 0x2100024a, 0x24000001 },
+  { 0x2100024b, 0x1400ffff },
+  { 0x2100024c, 0x24000001 },
+  { 0x2100024d, 0x1400ffff },
+  { 0x2100024e, 0x24000001 },
+  { 0x2100024f, 0x1400ffff },
+  { 0x21800250, 0x14000002 },
+  { 0x21000253, 0x1400ff2e },
+  { 0x21000254, 0x1400ff32 },
+  { 0x21000255, 0x14000000 },
+  { 0x21000256, 0x1400ff33 },
+  { 0x21000257, 0x1400ff33 },
+  { 0x21000258, 0x14000000 },
+  { 0x21000259, 0x1400ff36 },
+  { 0x2100025a, 0x14000000 },
+  { 0x2100025b, 0x1400ff35 },
+  { 0x2180025c, 0x14000003 },
+  { 0x21000260, 0x1400ff33 },
+  { 0x21800261, 0x14000001 },
+  { 0x21000263, 0x1400ff31 },
+  { 0x21800264, 0x14000003 },
+  { 0x21000268, 0x1400ff2f },
+  { 0x21000269, 0x1400ff2d },
+  { 0x2100026a, 0x14000000 },
+  { 0x2100026b, 0x140029f7 },
+  { 0x2180026c, 0x14000002 },
+  { 0x2100026f, 0x1400ff2d },
+  { 0x21800270, 0x14000001 },
+  { 0x21000272, 0x1400ff2b },
+  { 0x21800273, 0x14000001 },
+  { 0x21000275, 0x1400ff2a },
+  { 0x21800276, 0x14000006 },
+  { 0x2100027d, 0x140029e7 },
+  { 0x2180027e, 0x14000001 },
+  { 0x21000280, 0x1400ff26 },
+  { 0x21800281, 0x14000001 },
+  { 0x21000283, 0x1400ff26 },
+  { 0x21800284, 0x14000003 },
+  { 0x21000288, 0x1400ff26 },
+  { 0x21000289, 0x1400ffbb },
+  { 0x2100028a, 0x1400ff27 },
+  { 0x2100028b, 0x1400ff27 },
+  { 0x2100028c, 0x1400ffb9 },
+  { 0x2180028d, 0x14000004 },
+  { 0x21000292, 0x1400ff25 },
+  { 0x21000293, 0x14000000 },
+  { 0x21000294, 0x1c000000 },
+  { 0x21800295, 0x1400001a },
+  { 0x218002b0, 0x18000008 },
+  { 0x098002b9, 0x18000008 },
+  { 0x098002c2, 0x60000003 },
+  { 0x098002c6, 0x1800000b },
+  { 0x098002d2, 0x6000000d },
+  { 0x218002e0, 0x18000004 },
+  { 0x098002e5, 0x60000008 },
+  { 0x090002ee, 0x18000000 },
+  { 0x098002ef, 0x60000010 },
+  { 0x1b800300, 0x30000044 },
+  { 0x1b000345, 0x30000054 },
+  { 0x1b800346, 0x30000029 },
+  { 0x13800374, 0x60000001 },
+  { 0x1300037a, 0x18000000 },
+  { 0x1300037b, 0x14000082 },
+  { 0x1300037c, 0x14000082 },
+  { 0x1300037d, 0x14000082 },
+  { 0x0900037e, 0x54000000 },
+  { 0x13800384, 0x60000001 },
+  { 0x13000386, 0x24000026 },
+  { 0x09000387, 0x54000000 },
+  { 0x13000388, 0x24000025 },
+  { 0x13000389, 0x24000025 },
+  { 0x1300038a, 0x24000025 },
+  { 0x1300038c, 0x24000040 },
+  { 0x1300038e, 0x2400003f },
+  { 0x1300038f, 0x2400003f },
+  { 0x13000390, 0x14000000 },
+  { 0x13000391, 0x24000020 },
+  { 0x13000392, 0x24000020 },
+  { 0x13000393, 0x24000020 },
+  { 0x13000394, 0x24000020 },
+  { 0x13000395, 0x24000020 },
+  { 0x13000396, 0x24000020 },
+  { 0x13000397, 0x24000020 },
+  { 0x13000398, 0x24000020 },
+  { 0x13000399, 0x24000020 },
+  { 0x1300039a, 0x24000020 },
+  { 0x1300039b, 0x24000020 },
+  { 0x1300039c, 0x24000020 },
+  { 0x1300039d, 0x24000020 },
+  { 0x1300039e, 0x24000020 },
+  { 0x1300039f, 0x24000020 },
+  { 0x130003a0, 0x24000020 },
+  { 0x130003a1, 0x24000020 },
+  { 0x130003a3, 0x24000020 },
+  { 0x130003a4, 0x24000020 },
+  { 0x130003a5, 0x24000020 },
+  { 0x130003a6, 0x24000020 },
+  { 0x130003a7, 0x24000020 },
+  { 0x130003a8, 0x24000020 },
+  { 0x130003a9, 0x24000020 },
+  { 0x130003aa, 0x24000020 },
+  { 0x130003ab, 0x24000020 },
+  { 0x130003ac, 0x1400ffda },
+  { 0x130003ad, 0x1400ffdb },
+  { 0x130003ae, 0x1400ffdb },
+  { 0x130003af, 0x1400ffdb },
+  { 0x130003b0, 0x14000000 },
+  { 0x130003b1, 0x1400ffe0 },
+  { 0x130003b2, 0x1400ffe0 },
+  { 0x130003b3, 0x1400ffe0 },
+  { 0x130003b4, 0x1400ffe0 },
+  { 0x130003b5, 0x1400ffe0 },
+  { 0x130003b6, 0x1400ffe0 },
+  { 0x130003b7, 0x1400ffe0 },
+  { 0x130003b8, 0x1400ffe0 },
+  { 0x130003b9, 0x1400ffe0 },
+  { 0x130003ba, 0x1400ffe0 },
+  { 0x130003bb, 0x1400ffe0 },
+  { 0x130003bc, 0x1400ffe0 },
+  { 0x130003bd, 0x1400ffe0 },
+  { 0x130003be, 0x1400ffe0 },
+  { 0x130003bf, 0x1400ffe0 },
+  { 0x130003c0, 0x1400ffe0 },
+  { 0x130003c1, 0x1400ffe0 },
+  { 0x130003c2, 0x1400ffe1 },
+  { 0x130003c3, 0x1400ffe0 },
+  { 0x130003c4, 0x1400ffe0 },
+  { 0x130003c5, 0x1400ffe0 },
+  { 0x130003c6, 0x1400ffe0 },
+  { 0x130003c7, 0x1400ffe0 },
+  { 0x130003c8, 0x1400ffe0 },
+  { 0x130003c9, 0x1400ffe0 },
+  { 0x130003ca, 0x1400ffe0 },
+  { 0x130003cb, 0x1400ffe0 },
+  { 0x130003cc, 0x1400ffc0 },
+  { 0x130003cd, 0x1400ffc1 },
+  { 0x130003ce, 0x1400ffc1 },
+  { 0x130003d0, 0x1400ffc2 },
+  { 0x130003d1, 0x1400ffc7 },
+  { 0x138003d2, 0x24000002 },
+  { 0x130003d5, 0x1400ffd1 },
+  { 0x130003d6, 0x1400ffca },
+  { 0x130003d7, 0x14000000 },
+  { 0x130003d8, 0x24000001 },
+  { 0x130003d9, 0x1400ffff },
+  { 0x130003da, 0x24000001 },
+  { 0x130003db, 0x1400ffff },
+  { 0x130003dc, 0x24000001 },
+  { 0x130003dd, 0x1400ffff },
+  { 0x130003de, 0x24000001 },
+  { 0x130003df, 0x1400ffff },
+  { 0x130003e0, 0x24000001 },
+  { 0x130003e1, 0x1400ffff },
+  { 0x0a0003e2, 0x24000001 },
+  { 0x0a0003e3, 0x1400ffff },
+  { 0x0a0003e4, 0x24000001 },
+  { 0x0a0003e5, 0x1400ffff },
+  { 0x0a0003e6, 0x24000001 },
+  { 0x0a0003e7, 0x1400ffff },
+  { 0x0a0003e8, 0x24000001 },
+  { 0x0a0003e9, 0x1400ffff },
+  { 0x0a0003ea, 0x24000001 },
+  { 0x0a0003eb, 0x1400ffff },
+  { 0x0a0003ec, 0x24000001 },
+  { 0x0a0003ed, 0x1400ffff },
+  { 0x0a0003ee, 0x24000001 },
+  { 0x0a0003ef, 0x1400ffff },
+  { 0x130003f0, 0x1400ffaa },
+  { 0x130003f1, 0x1400ffb0 },
+  { 0x130003f2, 0x14000007 },
+  { 0x130003f3, 0x14000000 },
+  { 0x130003f4, 0x2400ffc4 },
+  { 0x130003f5, 0x1400ffa0 },
+  { 0x130003f6, 0x64000000 },
+  { 0x130003f7, 0x24000001 },
+  { 0x130003f8, 0x1400ffff },
+  { 0x130003f9, 0x2400fff9 },
+  { 0x130003fa, 0x24000001 },
+  { 0x130003fb, 0x1400ffff },
+  { 0x130003fc, 0x14000000 },
+  { 0x130003fd, 0x2400ff7e },
+  { 0x130003fe, 0x2400ff7e },
+  { 0x130003ff, 0x2400ff7e },
+  { 0x0c000400, 0x24000050 },
+  { 0x0c000401, 0x24000050 },
+  { 0x0c000402, 0x24000050 },
+  { 0x0c000403, 0x24000050 },
+  { 0x0c000404, 0x24000050 },
+  { 0x0c000405, 0x24000050 },
+  { 0x0c000406, 0x24000050 },
+  { 0x0c000407, 0x24000050 },
+  { 0x0c000408, 0x24000050 },
+  { 0x0c000409, 0x24000050 },
+  { 0x0c00040a, 0x24000050 },
+  { 0x0c00040b, 0x24000050 },
+  { 0x0c00040c, 0x24000050 },
+  { 0x0c00040d, 0x24000050 },
+  { 0x0c00040e, 0x24000050 },
+  { 0x0c00040f, 0x24000050 },
+  { 0x0c000410, 0x24000020 },
+  { 0x0c000411, 0x24000020 },
+  { 0x0c000412, 0x24000020 },
+  { 0x0c000413, 0x24000020 },
+  { 0x0c000414, 0x24000020 },
+  { 0x0c000415, 0x24000020 },
+  { 0x0c000416, 0x24000020 },
+  { 0x0c000417, 0x24000020 },
+  { 0x0c000418, 0x24000020 },
+  { 0x0c000419, 0x24000020 },
+  { 0x0c00041a, 0x24000020 },
+  { 0x0c00041b, 0x24000020 },
+  { 0x0c00041c, 0x24000020 },
+  { 0x0c00041d, 0x24000020 },
+  { 0x0c00041e, 0x24000020 },
+  { 0x0c00041f, 0x24000020 },
+  { 0x0c000420, 0x24000020 },
+  { 0x0c000421, 0x24000020 },
+  { 0x0c000422, 0x24000020 },
+  { 0x0c000423, 0x24000020 },
+  { 0x0c000424, 0x24000020 },
+  { 0x0c000425, 0x24000020 },
+  { 0x0c000426, 0x24000020 },
+  { 0x0c000427, 0x24000020 },
+  { 0x0c000428, 0x24000020 },
+  { 0x0c000429, 0x24000020 },
+  { 0x0c00042a, 0x24000020 },
+  { 0x0c00042b, 0x24000020 },
+  { 0x0c00042c, 0x24000020 },
+  { 0x0c00042d, 0x24000020 },
+  { 0x0c00042e, 0x24000020 },
+  { 0x0c00042f, 0x24000020 },
+  { 0x0c000430, 0x1400ffe0 },
+  { 0x0c000431, 0x1400ffe0 },
+  { 0x0c000432, 0x1400ffe0 },
+  { 0x0c000433, 0x1400ffe0 },
+  { 0x0c000434, 0x1400ffe0 },
+  { 0x0c000435, 0x1400ffe0 },
+  { 0x0c000436, 0x1400ffe0 },
+  { 0x0c000437, 0x1400ffe0 },
+  { 0x0c000438, 0x1400ffe0 },
+  { 0x0c000439, 0x1400ffe0 },
+  { 0x0c00043a, 0x1400ffe0 },
+  { 0x0c00043b, 0x1400ffe0 },
+  { 0x0c00043c, 0x1400ffe0 },
+  { 0x0c00043d, 0x1400ffe0 },
+  { 0x0c00043e, 0x1400ffe0 },
+  { 0x0c00043f, 0x1400ffe0 },
+  { 0x0c000440, 0x1400ffe0 },
+  { 0x0c000441, 0x1400ffe0 },
+  { 0x0c000442, 0x1400ffe0 },
+  { 0x0c000443, 0x1400ffe0 },
+  { 0x0c000444, 0x1400ffe0 },
+  { 0x0c000445, 0x1400ffe0 },
+  { 0x0c000446, 0x1400ffe0 },
+  { 0x0c000447, 0x1400ffe0 },
+  { 0x0c000448, 0x1400ffe0 },
+  { 0x0c000449, 0x1400ffe0 },
+  { 0x0c00044a, 0x1400ffe0 },
+  { 0x0c00044b, 0x1400ffe0 },
+  { 0x0c00044c, 0x1400ffe0 },
+  { 0x0c00044d, 0x1400ffe0 },
+  { 0x0c00044e, 0x1400ffe0 },
+  { 0x0c00044f, 0x1400ffe0 },
+  { 0x0c000450, 0x1400ffb0 },
+  { 0x0c000451, 0x1400ffb0 },
+  { 0x0c000452, 0x1400ffb0 },
+  { 0x0c000453, 0x1400ffb0 },
+  { 0x0c000454, 0x1400ffb0 },
+  { 0x0c000455, 0x1400ffb0 },
+  { 0x0c000456, 0x1400ffb0 },
+  { 0x0c000457, 0x1400ffb0 },
+  { 0x0c000458, 0x1400ffb0 },
+  { 0x0c000459, 0x1400ffb0 },
+  { 0x0c00045a, 0x1400ffb0 },
+  { 0x0c00045b, 0x1400ffb0 },
+  { 0x0c00045c, 0x1400ffb0 },
+  { 0x0c00045d, 0x1400ffb0 },
+  { 0x0c00045e, 0x1400ffb0 },
+  { 0x0c00045f, 0x1400ffb0 },
+  { 0x0c000460, 0x24000001 },
+  { 0x0c000461, 0x1400ffff },
+  { 0x0c000462, 0x24000001 },
+  { 0x0c000463, 0x1400ffff },
+  { 0x0c000464, 0x24000001 },
+  { 0x0c000465, 0x1400ffff },
+  { 0x0c000466, 0x24000001 },
+  { 0x0c000467, 0x1400ffff },
+  { 0x0c000468, 0x24000001 },
+  { 0x0c000469, 0x1400ffff },
+  { 0x0c00046a, 0x24000001 },
+  { 0x0c00046b, 0x1400ffff },
+  { 0x0c00046c, 0x24000001 },
+  { 0x0c00046d, 0x1400ffff },
+  { 0x0c00046e, 0x24000001 },
+  { 0x0c00046f, 0x1400ffff },
+  { 0x0c000470, 0x24000001 },
+  { 0x0c000471, 0x1400ffff },
+  { 0x0c000472, 0x24000001 },
+  { 0x0c000473, 0x1400ffff },
+  { 0x0c000474, 0x24000001 },
+  { 0x0c000475, 0x1400ffff },
+  { 0x0c000476, 0x24000001 },
+  { 0x0c000477, 0x1400ffff },
+  { 0x0c000478, 0x24000001 },
+  { 0x0c000479, 0x1400ffff },
+  { 0x0c00047a, 0x24000001 },
+  { 0x0c00047b, 0x1400ffff },
+  { 0x0c00047c, 0x24000001 },
+  { 0x0c00047d, 0x1400ffff },
+  { 0x0c00047e, 0x24000001 },
+  { 0x0c00047f, 0x1400ffff },
+  { 0x0c000480, 0x24000001 },
+  { 0x0c000481, 0x1400ffff },
+  { 0x0c000482, 0x68000000 },
+  { 0x0c800483, 0x30000003 },
+  { 0x0c800488, 0x2c000001 },
+  { 0x0c00048a, 0x24000001 },
+  { 0x0c00048b, 0x1400ffff },
+  { 0x0c00048c, 0x24000001 },
+  { 0x0c00048d, 0x1400ffff },
+  { 0x0c00048e, 0x24000001 },
+  { 0x0c00048f, 0x1400ffff },
+  { 0x0c000490, 0x24000001 },
+  { 0x0c000491, 0x1400ffff },
+  { 0x0c000492, 0x24000001 },
+  { 0x0c000493, 0x1400ffff },
+  { 0x0c000494, 0x24000001 },
+  { 0x0c000495, 0x1400ffff },
+  { 0x0c000496, 0x24000001 },
+  { 0x0c000497, 0x1400ffff },
+  { 0x0c000498, 0x24000001 },
+  { 0x0c000499, 0x1400ffff },
+  { 0x0c00049a, 0x24000001 },
+  { 0x0c00049b, 0x1400ffff },
+  { 0x0c00049c, 0x24000001 },
+  { 0x0c00049d, 0x1400ffff },
+  { 0x0c00049e, 0x24000001 },
+  { 0x0c00049f, 0x1400ffff },
+  { 0x0c0004a0, 0x24000001 },
+  { 0x0c0004a1, 0x1400ffff },
+  { 0x0c0004a2, 0x24000001 },
+  { 0x0c0004a3, 0x1400ffff },
+  { 0x0c0004a4, 0x24000001 },
+  { 0x0c0004a5, 0x1400ffff },
+  { 0x0c0004a6, 0x24000001 },
+  { 0x0c0004a7, 0x1400ffff },
+  { 0x0c0004a8, 0x24000001 },
+  { 0x0c0004a9, 0x1400ffff },
+  { 0x0c0004aa, 0x24000001 },
+  { 0x0c0004ab, 0x1400ffff },
+  { 0x0c0004ac, 0x24000001 },
+  { 0x0c0004ad, 0x1400ffff },
+  { 0x0c0004ae, 0x24000001 },
+  { 0x0c0004af, 0x1400ffff },
+  { 0x0c0004b0, 0x24000001 },
+  { 0x0c0004b1, 0x1400ffff },
+  { 0x0c0004b2, 0x24000001 },
+  { 0x0c0004b3, 0x1400ffff },
+  { 0x0c0004b4, 0x24000001 },
+  { 0x0c0004b5, 0x1400ffff },
+  { 0x0c0004b6, 0x24000001 },
+  { 0x0c0004b7, 0x1400ffff },
+  { 0x0c0004b8, 0x24000001 },
+  { 0x0c0004b9, 0x1400ffff },
+  { 0x0c0004ba, 0x24000001 },
+  { 0x0c0004bb, 0x1400ffff },
+  { 0x0c0004bc, 0x24000001 },
+  { 0x0c0004bd, 0x1400ffff },
+  { 0x0c0004be, 0x24000001 },
+  { 0x0c0004bf, 0x1400ffff },
+  { 0x0c0004c0, 0x2400000f },
+  { 0x0c0004c1, 0x24000001 },
+  { 0x0c0004c2, 0x1400ffff },
+  { 0x0c0004c3, 0x24000001 },
+  { 0x0c0004c4, 0x1400ffff },
+  { 0x0c0004c5, 0x24000001 },
+  { 0x0c0004c6, 0x1400ffff },
+  { 0x0c0004c7, 0x24000001 },
+  { 0x0c0004c8, 0x1400ffff },
+  { 0x0c0004c9, 0x24000001 },
+  { 0x0c0004ca, 0x1400ffff },
+  { 0x0c0004cb, 0x24000001 },
+  { 0x0c0004cc, 0x1400ffff },
+  { 0x0c0004cd, 0x24000001 },
+  { 0x0c0004ce, 0x1400ffff },
+  { 0x0c0004cf, 0x1400fff1 },
+  { 0x0c0004d0, 0x24000001 },
+  { 0x0c0004d1, 0x1400ffff },
+  { 0x0c0004d2, 0x24000001 },
+  { 0x0c0004d3, 0x1400ffff },
+  { 0x0c0004d4, 0x24000001 },
+  { 0x0c0004d5, 0x1400ffff },
+  { 0x0c0004d6, 0x24000001 },
+  { 0x0c0004d7, 0x1400ffff },
+  { 0x0c0004d8, 0x24000001 },
+  { 0x0c0004d9, 0x1400ffff },
+  { 0x0c0004da, 0x24000001 },
+  { 0x0c0004db, 0x1400ffff },
+  { 0x0c0004dc, 0x24000001 },
+  { 0x0c0004dd, 0x1400ffff },
+  { 0x0c0004de, 0x24000001 },
+  { 0x0c0004df, 0x1400ffff },
+  { 0x0c0004e0, 0x24000001 },
+  { 0x0c0004e1, 0x1400ffff },
+  { 0x0c0004e2, 0x24000001 },
+  { 0x0c0004e3, 0x1400ffff },
+  { 0x0c0004e4, 0x24000001 },
+  { 0x0c0004e5, 0x1400ffff },
+  { 0x0c0004e6, 0x24000001 },
+  { 0x0c0004e7, 0x1400ffff },
+  { 0x0c0004e8, 0x24000001 },
+  { 0x0c0004e9, 0x1400ffff },
+  { 0x0c0004ea, 0x24000001 },
+  { 0x0c0004eb, 0x1400ffff },
+  { 0x0c0004ec, 0x24000001 },
+  { 0x0c0004ed, 0x1400ffff },
+  { 0x0c0004ee, 0x24000001 },
+  { 0x0c0004ef, 0x1400ffff },
+  { 0x0c0004f0, 0x24000001 },
+  { 0x0c0004f1, 0x1400ffff },
+  { 0x0c0004f2, 0x24000001 },
+  { 0x0c0004f3, 0x1400ffff },
+  { 0x0c0004f4, 0x24000001 },
+  { 0x0c0004f5, 0x1400ffff },
+  { 0x0c0004f6, 0x24000001 },
+  { 0x0c0004f7, 0x1400ffff },
+  { 0x0c0004f8, 0x24000001 },
+  { 0x0c0004f9, 0x1400ffff },
+  { 0x0c0004fa, 0x24000001 },
+  { 0x0c0004fb, 0x1400ffff },
+  { 0x0c0004fc, 0x24000001 },
+  { 0x0c0004fd, 0x1400ffff },
+  { 0x0c0004fe, 0x24000001 },
+  { 0x0c0004ff, 0x1400ffff },
+  { 0x0c000500, 0x24000001 },
+  { 0x0c000501, 0x1400ffff },
+  { 0x0c000502, 0x24000001 },
+  { 0x0c000503, 0x1400ffff },
+  { 0x0c000504, 0x24000001 },
+  { 0x0c000505, 0x1400ffff },
+  { 0x0c000506, 0x24000001 },
+  { 0x0c000507, 0x1400ffff },
+  { 0x0c000508, 0x24000001 },
+  { 0x0c000509, 0x1400ffff },
+  { 0x0c00050a, 0x24000001 },
+  { 0x0c00050b, 0x1400ffff },
+  { 0x0c00050c, 0x24000001 },
+  { 0x0c00050d, 0x1400ffff },
+  { 0x0c00050e, 0x24000001 },
+  { 0x0c00050f, 0x1400ffff },
+  { 0x0c000510, 0x24000001 },
+  { 0x0c000511, 0x1400ffff },
+  { 0x0c000512, 0x24000001 },
+  { 0x0c000513, 0x1400ffff },
+  { 0x01000531, 0x24000030 },
+  { 0x01000532, 0x24000030 },
+  { 0x01000533, 0x24000030 },
+  { 0x01000534, 0x24000030 },
+  { 0x01000535, 0x24000030 },
+  { 0x01000536, 0x24000030 },
+  { 0x01000537, 0x24000030 },
+  { 0x01000538, 0x24000030 },
+  { 0x01000539, 0x24000030 },
+  { 0x0100053a, 0x24000030 },
+  { 0x0100053b, 0x24000030 },
+  { 0x0100053c, 0x24000030 },
+  { 0x0100053d, 0x24000030 },
+  { 0x0100053e, 0x24000030 },
+  { 0x0100053f, 0x24000030 },
+  { 0x01000540, 0x24000030 },
+  { 0x01000541, 0x24000030 },
+  { 0x01000542, 0x24000030 },
+  { 0x01000543, 0x24000030 },
+  { 0x01000544, 0x24000030 },
+  { 0x01000545, 0x24000030 },
+  { 0x01000546, 0x24000030 },
+  { 0x01000547, 0x24000030 },
+  { 0x01000548, 0x24000030 },
+  { 0x01000549, 0x24000030 },
+  { 0x0100054a, 0x24000030 },
+  { 0x0100054b, 0x24000030 },
+  { 0x0100054c, 0x24000030 },
+  { 0x0100054d, 0x24000030 },
+  { 0x0100054e, 0x24000030 },
+  { 0x0100054f, 0x24000030 },
+  { 0x01000550, 0x24000030 },
+  { 0x01000551, 0x24000030 },
+  { 0x01000552, 0x24000030 },
+  { 0x01000553, 0x24000030 },
+  { 0x01000554, 0x24000030 },
+  { 0x01000555, 0x24000030 },
+  { 0x01000556, 0x24000030 },
+  { 0x01000559, 0x18000000 },
+  { 0x0180055a, 0x54000005 },
+  { 0x01000561, 0x1400ffd0 },
+  { 0x01000562, 0x1400ffd0 },
+  { 0x01000563, 0x1400ffd0 },
+  { 0x01000564, 0x1400ffd0 },
+  { 0x01000565, 0x1400ffd0 },
+  { 0x01000566, 0x1400ffd0 },
+  { 0x01000567, 0x1400ffd0 },
+  { 0x01000568, 0x1400ffd0 },
+  { 0x01000569, 0x1400ffd0 },
+  { 0x0100056a, 0x1400ffd0 },
+  { 0x0100056b, 0x1400ffd0 },
+  { 0x0100056c, 0x1400ffd0 },
+  { 0x0100056d, 0x1400ffd0 },
+  { 0x0100056e, 0x1400ffd0 },
+  { 0x0100056f, 0x1400ffd0 },
+  { 0x01000570, 0x1400ffd0 },
+  { 0x01000571, 0x1400ffd0 },
+  { 0x01000572, 0x1400ffd0 },
+  { 0x01000573, 0x1400ffd0 },
+  { 0x01000574, 0x1400ffd0 },
+  { 0x01000575, 0x1400ffd0 },
+  { 0x01000576, 0x1400ffd0 },
+  { 0x01000577, 0x1400ffd0 },
+  { 0x01000578, 0x1400ffd0 },
+  { 0x01000579, 0x1400ffd0 },
+  { 0x0100057a, 0x1400ffd0 },
+  { 0x0100057b, 0x1400ffd0 },
+  { 0x0100057c, 0x1400ffd0 },
+  { 0x0100057d, 0x1400ffd0 },
+  { 0x0100057e, 0x1400ffd0 },
+  { 0x0100057f, 0x1400ffd0 },
+  { 0x01000580, 0x1400ffd0 },
+  { 0x01000581, 0x1400ffd0 },
+  { 0x01000582, 0x1400ffd0 },
+  { 0x01000583, 0x1400ffd0 },
+  { 0x01000584, 0x1400ffd0 },
+  { 0x01000585, 0x1400ffd0 },
+  { 0x01000586, 0x1400ffd0 },
+  { 0x01000587, 0x14000000 },
+  { 0x09000589, 0x54000000 },
+  { 0x0100058a, 0x44000000 },
+  { 0x19800591, 0x3000002c },
+  { 0x190005be, 0x54000000 },
+  { 0x190005bf, 0x30000000 },
+  { 0x190005c0, 0x54000000 },
+  { 0x198005c1, 0x30000001 },
+  { 0x190005c3, 0x54000000 },
+  { 0x198005c4, 0x30000001 },
+  { 0x190005c6, 0x54000000 },
+  { 0x190005c7, 0x30000000 },
+  { 0x198005d0, 0x1c00001a },
+  { 0x198005f0, 0x1c000002 },
+  { 0x198005f3, 0x54000001 },
+  { 0x09800600, 0x04000003 },
+  { 0x0000060b, 0x5c000000 },
+  { 0x0900060c, 0x54000000 },
+  { 0x0000060d, 0x54000000 },
+  { 0x0080060e, 0x68000001 },
+  { 0x00800610, 0x30000005 },
+  { 0x0900061b, 0x54000000 },
+  { 0x0000061e, 0x54000000 },
+  { 0x0900061f, 0x54000000 },
+  { 0x00800621, 0x1c000019 },
+  { 0x09000640, 0x18000000 },
+  { 0x00800641, 0x1c000009 },
+  { 0x1b80064b, 0x3000000a },
+  { 0x00800656, 0x30000008 },
+  { 0x09800660, 0x34000009 },
+  { 0x0080066a, 0x54000003 },
+  { 0x0080066e, 0x1c000001 },
+  { 0x1b000670, 0x30000000 },
+  { 0x00800671, 0x1c000062 },
+  { 0x000006d4, 0x54000000 },
+  { 0x000006d5, 0x1c000000 },
+  { 0x008006d6, 0x30000006 },
+  { 0x090006dd, 0x04000000 },
+  { 0x000006de, 0x2c000000 },
+  { 0x008006df, 0x30000005 },
+  { 0x008006e5, 0x18000001 },
+  { 0x008006e7, 0x30000001 },
+  { 0x000006e9, 0x68000000 },
+  { 0x008006ea, 0x30000003 },
+  { 0x008006ee, 0x1c000001 },
+  { 0x008006f0, 0x34000009 },
+  { 0x008006fa, 0x1c000002 },
+  { 0x008006fd, 0x68000001 },
+  { 0x000006ff, 0x1c000000 },
+  { 0x31800700, 0x5400000d },
+  { 0x3100070f, 0x04000000 },
+  { 0x31000710, 0x1c000000 },
+  { 0x31000711, 0x30000000 },
+  { 0x31800712, 0x1c00001d },
+  { 0x31800730, 0x3000001a },
+  { 0x3180074d, 0x1c000002 },
+  { 0x00800750, 0x1c00001d },
+  { 0x37800780, 0x1c000025 },
+  { 0x378007a6, 0x3000000a },
+  { 0x370007b1, 0x1c000000 },
+  { 0x3f8007c0, 0x34000009 },
+  { 0x3f8007ca, 0x1c000020 },
+  { 0x3f8007eb, 0x30000008 },
+  { 0x3f8007f4, 0x18000001 },
+  { 0x3f0007f6, 0x68000000 },
+  { 0x3f8007f7, 0x54000002 },
+  { 0x3f0007fa, 0x18000000 },
+  { 0x0e800901, 0x30000001 },
+  { 0x0e000903, 0x28000000 },
+  { 0x0e800904, 0x1c000035 },
+  { 0x0e00093c, 0x30000000 },
+  { 0x0e00093d, 0x1c000000 },
+  { 0x0e80093e, 0x28000002 },
+  { 0x0e800941, 0x30000007 },
+  { 0x0e800949, 0x28000003 },
+  { 0x0e00094d, 0x30000000 },
+  { 0x0e000950, 0x1c000000 },
+  { 0x0e800951, 0x30000003 },
+  { 0x0e800958, 0x1c000009 },
+  { 0x0e800962, 0x30000001 },
+  { 0x09800964, 0x54000001 },
+  { 0x0e800966, 0x34000009 },
+  { 0x09000970, 0x54000000 },
+  { 0x0e80097b, 0x1c000004 },
+  { 0x02000981, 0x30000000 },
+  { 0x02800982, 0x28000001 },
+  { 0x02800985, 0x1c000007 },
+  { 0x0280098f, 0x1c000001 },
+  { 0x02800993, 0x1c000015 },
+  { 0x028009aa, 0x1c000006 },
+  { 0x020009b2, 0x1c000000 },
+  { 0x028009b6, 0x1c000003 },
+  { 0x020009bc, 0x30000000 },
+  { 0x020009bd, 0x1c000000 },
+  { 0x028009be, 0x28000002 },
+  { 0x028009c1, 0x30000003 },
+  { 0x028009c7, 0x28000001 },
+  { 0x028009cb, 0x28000001 },
+  { 0x020009cd, 0x30000000 },
+  { 0x020009ce, 0x1c000000 },
+  { 0x020009d7, 0x28000000 },
+  { 0x028009dc, 0x1c000001 },
+  { 0x028009df, 0x1c000002 },
+  { 0x028009e2, 0x30000001 },
+  { 0x028009e6, 0x34000009 },
+  { 0x028009f0, 0x1c000001 },
+  { 0x028009f2, 0x5c000001 },
+  { 0x028009f4, 0x3c000005 },
+  { 0x020009fa, 0x68000000 },
+  { 0x15800a01, 0x30000001 },
+  { 0x15000a03, 0x28000000 },
+  { 0x15800a05, 0x1c000005 },
+  { 0x15800a0f, 0x1c000001 },
+  { 0x15800a13, 0x1c000015 },
+  { 0x15800a2a, 0x1c000006 },
+  { 0x15800a32, 0x1c000001 },
+  { 0x15800a35, 0x1c000001 },
+  { 0x15800a38, 0x1c000001 },
+  { 0x15000a3c, 0x30000000 },
+  { 0x15800a3e, 0x28000002 },
+  { 0x15800a41, 0x30000001 },
+  { 0x15800a47, 0x30000001 },
+  { 0x15800a4b, 0x30000002 },
+  { 0x15800a59, 0x1c000003 },
+  { 0x15000a5e, 0x1c000000 },
+  { 0x15800a66, 0x34000009 },
+  { 0x15800a70, 0x30000001 },
+  { 0x15800a72, 0x1c000002 },
+  { 0x14800a81, 0x30000001 },
+  { 0x14000a83, 0x28000000 },
+  { 0x14800a85, 0x1c000008 },
+  { 0x14800a8f, 0x1c000002 },
+  { 0x14800a93, 0x1c000015 },
+  { 0x14800aaa, 0x1c000006 },
+  { 0x14800ab2, 0x1c000001 },
+  { 0x14800ab5, 0x1c000004 },
+  { 0x14000abc, 0x30000000 },
+  { 0x14000abd, 0x1c000000 },
+  { 0x14800abe, 0x28000002 },
+  { 0x14800ac1, 0x30000004 },
+  { 0x14800ac7, 0x30000001 },
+  { 0x14000ac9, 0x28000000 },
+  { 0x14800acb, 0x28000001 },
+  { 0x14000acd, 0x30000000 },
+  { 0x14000ad0, 0x1c000000 },
+  { 0x14800ae0, 0x1c000001 },
+  { 0x14800ae2, 0x30000001 },
+  { 0x14800ae6, 0x34000009 },
+  { 0x14000af1, 0x5c000000 },
+  { 0x2b000b01, 0x30000000 },
+  { 0x2b800b02, 0x28000001 },
+  { 0x2b800b05, 0x1c000007 },
+  { 0x2b800b0f, 0x1c000001 },
+  { 0x2b800b13, 0x1c000015 },
+  { 0x2b800b2a, 0x1c000006 },
+  { 0x2b800b32, 0x1c000001 },
+  { 0x2b800b35, 0x1c000004 },
+  { 0x2b000b3c, 0x30000000 },
+  { 0x2b000b3d, 0x1c000000 },
+  { 0x2b000b3e, 0x28000000 },
+  { 0x2b000b3f, 0x30000000 },
+  { 0x2b000b40, 0x28000000 },
+  { 0x2b800b41, 0x30000002 },
+  { 0x2b800b47, 0x28000001 },
+  { 0x2b800b4b, 0x28000001 },
+  { 0x2b000b4d, 0x30000000 },
+  { 0x2b000b56, 0x30000000 },
+  { 0x2b000b57, 0x28000000 },
+  { 0x2b800b5c, 0x1c000001 },
+  { 0x2b800b5f, 0x1c000002 },
+  { 0x2b800b66, 0x34000009 },
+  { 0x2b000b70, 0x68000000 },
+  { 0x2b000b71, 0x1c000000 },
+  { 0x35000b82, 0x30000000 },
+  { 0x35000b83, 0x1c000000 },
+  { 0x35800b85, 0x1c000005 },
+  { 0x35800b8e, 0x1c000002 },
+  { 0x35800b92, 0x1c000003 },
+  { 0x35800b99, 0x1c000001 },
+  { 0x35000b9c, 0x1c000000 },
+  { 0x35800b9e, 0x1c000001 },
+  { 0x35800ba3, 0x1c000001 },
+  { 0x35800ba8, 0x1c000002 },
+  { 0x35800bae, 0x1c00000b },
+  { 0x35800bbe, 0x28000001 },
+  { 0x35000bc0, 0x30000000 },
+  { 0x35800bc1, 0x28000001 },
+  { 0x35800bc6, 0x28000002 },
+  { 0x35800bca, 0x28000002 },
+  { 0x35000bcd, 0x30000000 },
+  { 0x35000bd7, 0x28000000 },
+  { 0x35800be6, 0x34000009 },
+  { 0x35800bf0, 0x3c000002 },
+  { 0x35800bf3, 0x68000005 },
+  { 0x35000bf9, 0x5c000000 },
+  { 0x35000bfa, 0x68000000 },
+  { 0x36800c01, 0x28000002 },
+  { 0x36800c05, 0x1c000007 },
+  { 0x36800c0e, 0x1c000002 },
+  { 0x36800c12, 0x1c000016 },
+  { 0x36800c2a, 0x1c000009 },
+  { 0x36800c35, 0x1c000004 },
+  { 0x36800c3e, 0x30000002 },
+  { 0x36800c41, 0x28000003 },
+  { 0x36800c46, 0x30000002 },
+  { 0x36800c4a, 0x30000003 },
+  { 0x36800c55, 0x30000001 },
+  { 0x36800c60, 0x1c000001 },
+  { 0x36800c66, 0x34000009 },
+  { 0x1c800c82, 0x28000001 },
+  { 0x1c800c85, 0x1c000007 },
+  { 0x1c800c8e, 0x1c000002 },
+  { 0x1c800c92, 0x1c000016 },
+  { 0x1c800caa, 0x1c000009 },
+  { 0x1c800cb5, 0x1c000004 },
+  { 0x1c000cbc, 0x30000000 },
+  { 0x1c000cbd, 0x1c000000 },
+  { 0x1c000cbe, 0x28000000 },
+  { 0x1c000cbf, 0x30000000 },
+  { 0x1c800cc0, 0x28000004 },
+  { 0x1c000cc6, 0x30000000 },
+  { 0x1c800cc7, 0x28000001 },
+  { 0x1c800cca, 0x28000001 },
+  { 0x1c800ccc, 0x30000001 },
+  { 0x1c800cd5, 0x28000001 },
+  { 0x1c000cde, 0x1c000000 },
+  { 0x1c800ce0, 0x1c000001 },
+  { 0x1c800ce2, 0x30000001 },
+  { 0x1c800ce6, 0x34000009 },
+  { 0x1c800cf1, 0x68000001 },
+  { 0x24800d02, 0x28000001 },
+  { 0x24800d05, 0x1c000007 },
+  { 0x24800d0e, 0x1c000002 },
+  { 0x24800d12, 0x1c000016 },
+  { 0x24800d2a, 0x1c00000f },
+  { 0x24800d3e, 0x28000002 },
+  { 0x24800d41, 0x30000002 },
+  { 0x24800d46, 0x28000002 },
+  { 0x24800d4a, 0x28000002 },
+  { 0x24000d4d, 0x30000000 },
+  { 0x24000d57, 0x28000000 },
+  { 0x24800d60, 0x1c000001 },
+  { 0x24800d66, 0x34000009 },
+  { 0x2f800d82, 0x28000001 },
+  { 0x2f800d85, 0x1c000011 },
+  { 0x2f800d9a, 0x1c000017 },
+  { 0x2f800db3, 0x1c000008 },
+  { 0x2f000dbd, 0x1c000000 },
+  { 0x2f800dc0, 0x1c000006 },
+  { 0x2f000dca, 0x30000000 },
+  { 0x2f800dcf, 0x28000002 },
+  { 0x2f800dd2, 0x30000002 },
+  { 0x2f000dd6, 0x30000000 },
+  { 0x2f800dd8, 0x28000007 },
+  { 0x2f800df2, 0x28000001 },
+  { 0x2f000df4, 0x54000000 },
+  { 0x38800e01, 0x1c00002f },
+  { 0x38000e31, 0x30000000 },
+  { 0x38800e32, 0x1c000001 },
+  { 0x38800e34, 0x30000006 },
+  { 0x09000e3f, 0x5c000000 },
+  { 0x38800e40, 0x1c000005 },
+  { 0x38000e46, 0x18000000 },
+  { 0x38800e47, 0x30000007 },
+  { 0x38000e4f, 0x54000000 },
+  { 0x38800e50, 0x34000009 },
+  { 0x38800e5a, 0x54000001 },
+  { 0x20800e81, 0x1c000001 },
+  { 0x20000e84, 0x1c000000 },
+  { 0x20800e87, 0x1c000001 },
+  { 0x20000e8a, 0x1c000000 },
+  { 0x20000e8d, 0x1c000000 },
+  { 0x20800e94, 0x1c000003 },
+  { 0x20800e99, 0x1c000006 },
+  { 0x20800ea1, 0x1c000002 },
+  { 0x20000ea5, 0x1c000000 },
+  { 0x20000ea7, 0x1c000000 },
+  { 0x20800eaa, 0x1c000001 },
+  { 0x20800ead, 0x1c000003 },
+  { 0x20000eb1, 0x30000000 },
+  { 0x20800eb2, 0x1c000001 },
+  { 0x20800eb4, 0x30000005 },
+  { 0x20800ebb, 0x30000001 },
+  { 0x20000ebd, 0x1c000000 },
+  { 0x20800ec0, 0x1c000004 },
+  { 0x20000ec6, 0x18000000 },
+  { 0x20800ec8, 0x30000005 },
+  { 0x20800ed0, 0x34000009 },
+  { 0x20800edc, 0x1c000001 },
+  { 0x39000f00, 0x1c000000 },
+  { 0x39800f01, 0x68000002 },
+  { 0x39800f04, 0x5400000e },
+  { 0x39800f13, 0x68000004 },
+  { 0x39800f18, 0x30000001 },
+  { 0x39800f1a, 0x68000005 },
+  { 0x39800f20, 0x34000009 },
+  { 0x39800f2a, 0x3c000009 },
+  { 0x39000f34, 0x68000000 },
+  { 0x39000f35, 0x30000000 },
+  { 0x39000f36, 0x68000000 },
+  { 0x39000f37, 0x30000000 },
+  { 0x39000f38, 0x68000000 },
+  { 0x39000f39, 0x30000000 },
+  { 0x39000f3a, 0x58000000 },
+  { 0x39000f3b, 0x48000000 },
+  { 0x39000f3c, 0x58000000 },
+  { 0x39000f3d, 0x48000000 },
+  { 0x39800f3e, 0x28000001 },
+  { 0x39800f40, 0x1c000007 },
+  { 0x39800f49, 0x1c000021 },
+  { 0x39800f71, 0x3000000d },
+  { 0x39000f7f, 0x28000000 },
+  { 0x39800f80, 0x30000004 },
+  { 0x39000f85, 0x54000000 },
+  { 0x39800f86, 0x30000001 },
+  { 0x39800f88, 0x1c000003 },
+  { 0x39800f90, 0x30000007 },
+  { 0x39800f99, 0x30000023 },
+  { 0x39800fbe, 0x68000007 },
+  { 0x39000fc6, 0x30000000 },
+  { 0x39800fc7, 0x68000005 },
+  { 0x39000fcf, 0x68000000 },
+  { 0x39800fd0, 0x54000001 },
+  { 0x26801000, 0x1c000021 },
+  { 0x26801023, 0x1c000004 },
+  { 0x26801029, 0x1c000001 },
+  { 0x2600102c, 0x28000000 },
+  { 0x2680102d, 0x30000003 },
+  { 0x26001031, 0x28000000 },
+  { 0x26001032, 0x30000000 },
+  { 0x26801036, 0x30000001 },
+  { 0x26001038, 0x28000000 },
+  { 0x26001039, 0x30000000 },
+  { 0x26801040, 0x34000009 },
+  { 0x2680104a, 0x54000005 },
+  { 0x26801050, 0x1c000005 },
+  { 0x26801056, 0x28000001 },
+  { 0x26801058, 0x30000001 },
+  { 0x100010a0, 0x24001c60 },
+  { 0x100010a1, 0x24001c60 },
+  { 0x100010a2, 0x24001c60 },
+  { 0x100010a3, 0x24001c60 },
+  { 0x100010a4, 0x24001c60 },
+  { 0x100010a5, 0x24001c60 },
+  { 0x100010a6, 0x24001c60 },
+  { 0x100010a7, 0x24001c60 },
+  { 0x100010a8, 0x24001c60 },
+  { 0x100010a9, 0x24001c60 },
+  { 0x100010aa, 0x24001c60 },
+  { 0x100010ab, 0x24001c60 },
+  { 0x100010ac, 0x24001c60 },
+  { 0x100010ad, 0x24001c60 },
+  { 0x100010ae, 0x24001c60 },
+  { 0x100010af, 0x24001c60 },
+  { 0x100010b0, 0x24001c60 },
+  { 0x100010b1, 0x24001c60 },
+  { 0x100010b2, 0x24001c60 },
+  { 0x100010b3, 0x24001c60 },
+  { 0x100010b4, 0x24001c60 },
+  { 0x100010b5, 0x24001c60 },
+  { 0x100010b6, 0x24001c60 },
+  { 0x100010b7, 0x24001c60 },
+  { 0x100010b8, 0x24001c60 },
+  { 0x100010b9, 0x24001c60 },
+  { 0x100010ba, 0x24001c60 },
+  { 0x100010bb, 0x24001c60 },
+  { 0x100010bc, 0x24001c60 },
+  { 0x100010bd, 0x24001c60 },
+  { 0x100010be, 0x24001c60 },
+  { 0x100010bf, 0x24001c60 },
+  { 0x100010c0, 0x24001c60 },
+  { 0x100010c1, 0x24001c60 },
+  { 0x100010c2, 0x24001c60 },
+  { 0x100010c3, 0x24001c60 },
+  { 0x100010c4, 0x24001c60 },
+  { 0x100010c5, 0x24001c60 },
+  { 0x108010d0, 0x1c00002a },
+  { 0x090010fb, 0x54000000 },
+  { 0x100010fc, 0x18000000 },
+  { 0x17801100, 0x1c000059 },
+  { 0x1780115f, 0x1c000043 },
+  { 0x178011a8, 0x1c000051 },
+  { 0x0f801200, 0x1c000048 },
+  { 0x0f80124a, 0x1c000003 },
+  { 0x0f801250, 0x1c000006 },
+  { 0x0f001258, 0x1c000000 },
+  { 0x0f80125a, 0x1c000003 },
+  { 0x0f801260, 0x1c000028 },
+  { 0x0f80128a, 0x1c000003 },
+  { 0x0f801290, 0x1c000020 },
+  { 0x0f8012b2, 0x1c000003 },
+  { 0x0f8012b8, 0x1c000006 },
+  { 0x0f0012c0, 0x1c000000 },
+  { 0x0f8012c2, 0x1c000003 },
+  { 0x0f8012c8, 0x1c00000e },
+  { 0x0f8012d8, 0x1c000038 },
+  { 0x0f801312, 0x1c000003 },
+  { 0x0f801318, 0x1c000042 },
+  { 0x0f00135f, 0x30000000 },
+  { 0x0f001360, 0x68000000 },
+  { 0x0f801361, 0x54000007 },
+  { 0x0f801369, 0x3c000013 },
+  { 0x0f801380, 0x1c00000f },
+  { 0x0f801390, 0x68000009 },
+  { 0x088013a0, 0x1c000054 },
+  { 0x07801401, 0x1c00026b },
+  { 0x0780166d, 0x54000001 },
+  { 0x0780166f, 0x1c000007 },
+  { 0x28001680, 0x74000000 },
+  { 0x28801681, 0x1c000019 },
+  { 0x2800169b, 0x58000000 },
+  { 0x2800169c, 0x48000000 },
+  { 0x2d8016a0, 0x1c00004a },
+  { 0x098016eb, 0x54000002 },
+  { 0x2d8016ee, 0x38000002 },
+  { 0x32801700, 0x1c00000c },
+  { 0x3280170e, 0x1c000003 },
+  { 0x32801712, 0x30000002 },
+  { 0x18801720, 0x1c000011 },
+  { 0x18801732, 0x30000002 },
+  { 0x09801735, 0x54000001 },
+  { 0x06801740, 0x1c000011 },
+  { 0x06801752, 0x30000001 },
+  { 0x33801760, 0x1c00000c },
+  { 0x3380176e, 0x1c000002 },
+  { 0x33801772, 0x30000001 },
+  { 0x1f801780, 0x1c000033 },
+  { 0x1f8017b4, 0x04000001 },
+  { 0x1f0017b6, 0x28000000 },
+  { 0x1f8017b7, 0x30000006 },
+  { 0x1f8017be, 0x28000007 },
+  { 0x1f0017c6, 0x30000000 },
+  { 0x1f8017c7, 0x28000001 },
+  { 0x1f8017c9, 0x3000000a },
+  { 0x1f8017d4, 0x54000002 },
+  { 0x1f0017d7, 0x18000000 },
+  { 0x1f8017d8, 0x54000002 },
+  { 0x1f0017db, 0x5c000000 },
+  { 0x1f0017dc, 0x1c000000 },
+  { 0x1f0017dd, 0x30000000 },
+  { 0x1f8017e0, 0x34000009 },
+  { 0x1f8017f0, 0x3c000009 },
+  { 0x25801800, 0x54000001 },
+  { 0x09801802, 0x54000001 },
+  { 0x25001804, 0x54000000 },
+  { 0x09001805, 0x54000000 },
+  { 0x25001806, 0x44000000 },
+  { 0x25801807, 0x54000003 },
+  { 0x2580180b, 0x30000002 },
+  { 0x2500180e, 0x74000000 },
+  { 0x25801810, 0x34000009 },
+  { 0x25801820, 0x1c000022 },
+  { 0x25001843, 0x18000000 },
+  { 0x25801844, 0x1c000033 },
+  { 0x25801880, 0x1c000028 },
+  { 0x250018a9, 0x30000000 },
+  { 0x22801900, 0x1c00001c },
+  { 0x22801920, 0x30000002 },
+  { 0x22801923, 0x28000003 },
+  { 0x22801927, 0x30000001 },
+  { 0x22801929, 0x28000002 },
+  { 0x22801930, 0x28000001 },
+  { 0x22001932, 0x30000000 },
+  { 0x22801933, 0x28000005 },
+  { 0x22801939, 0x30000002 },
+  { 0x22001940, 0x68000000 },
+  { 0x22801944, 0x54000001 },
+  { 0x22801946, 0x34000009 },
+  { 0x34801950, 0x1c00001d },
+  { 0x34801970, 0x1c000004 },
+  { 0x27801980, 0x1c000029 },
+  { 0x278019b0, 0x28000010 },
+  { 0x278019c1, 0x1c000006 },
+  { 0x278019c8, 0x28000001 },
+  { 0x278019d0, 0x34000009 },
+  { 0x278019de, 0x54000001 },
+  { 0x1f8019e0, 0x6800001f },
+  { 0x05801a00, 0x1c000016 },
+  { 0x05801a17, 0x30000001 },
+  { 0x05801a19, 0x28000002 },
+  { 0x05801a1e, 0x54000001 },
+  { 0x3d801b00, 0x30000003 },
+  { 0x3d001b04, 0x28000000 },
+  { 0x3d801b05, 0x1c00002e },
+  { 0x3d001b34, 0x30000000 },
+  { 0x3d001b35, 0x28000000 },
+  { 0x3d801b36, 0x30000004 },
+  { 0x3d001b3b, 0x28000000 },
+  { 0x3d001b3c, 0x30000000 },
+  { 0x3d801b3d, 0x28000004 },
+  { 0x3d001b42, 0x30000000 },
+  { 0x3d801b43, 0x28000001 },
+  { 0x3d801b45, 0x1c000006 },
+  { 0x3d801b50, 0x34000009 },
+  { 0x3d801b5a, 0x54000006 },
+  { 0x3d801b61, 0x68000009 },
+  { 0x3d801b6b, 0x30000008 },
+  { 0x3d801b74, 0x68000008 },
+  { 0x21801d00, 0x14000025 },
+  { 0x13801d26, 0x14000004 },
+  { 0x0c001d2b, 0x14000000 },
+  { 0x21801d2c, 0x18000030 },
+  { 0x13801d5d, 0x18000004 },
+  { 0x21801d62, 0x14000003 },
+  { 0x13801d66, 0x14000004 },
+  { 0x21801d6b, 0x1400000c },
+  { 0x0c001d78, 0x18000000 },
+  { 0x21801d79, 0x14000003 },
+  { 0x21001d7d, 0x14000ee6 },
+  { 0x21801d7e, 0x1400001c },
+  { 0x21801d9b, 0x18000023 },
+  { 0x13001dbf, 0x18000000 },
+  { 0x1b801dc0, 0x3000000a },
+  { 0x1b801dfe, 0x30000001 },
+  { 0x21001e00, 0x24000001 },
+  { 0x21001e01, 0x1400ffff },
+  { 0x21001e02, 0x24000001 },
+  { 0x21001e03, 0x1400ffff },
+  { 0x21001e04, 0x24000001 },
+  { 0x21001e05, 0x1400ffff },
+  { 0x21001e06, 0x24000001 },
+  { 0x21001e07, 0x1400ffff },
+  { 0x21001e08, 0x24000001 },
+  { 0x21001e09, 0x1400ffff },
+  { 0x21001e0a, 0x24000001 },
+  { 0x21001e0b, 0x1400ffff },
+  { 0x21001e0c, 0x24000001 },
+  { 0x21001e0d, 0x1400ffff },
+  { 0x21001e0e, 0x24000001 },
+  { 0x21001e0f, 0x1400ffff },
+  { 0x21001e10, 0x24000001 },
+  { 0x21001e11, 0x1400ffff },
+  { 0x21001e12, 0x24000001 },
+  { 0x21001e13, 0x1400ffff },
+  { 0x21001e14, 0x24000001 },
+  { 0x21001e15, 0x1400ffff },
+  { 0x21001e16, 0x24000001 },
+  { 0x21001e17, 0x1400ffff },
+  { 0x21001e18, 0x24000001 },
+  { 0x21001e19, 0x1400ffff },
+  { 0x21001e1a, 0x24000001 },
+  { 0x21001e1b, 0x1400ffff },
+  { 0x21001e1c, 0x24000001 },
+  { 0x21001e1d, 0x1400ffff },
+  { 0x21001e1e, 0x24000001 },
+  { 0x21001e1f, 0x1400ffff },
+  { 0x21001e20, 0x24000001 },
+  { 0x21001e21, 0x1400ffff },
+  { 0x21001e22, 0x24000001 },
+  { 0x21001e23, 0x1400ffff },
+  { 0x21001e24, 0x24000001 },
+  { 0x21001e25, 0x1400ffff },
+  { 0x21001e26, 0x24000001 },
+  { 0x21001e27, 0x1400ffff },
+  { 0x21001e28, 0x24000001 },
+  { 0x21001e29, 0x1400ffff },
+  { 0x21001e2a, 0x24000001 },
+  { 0x21001e2b, 0x1400ffff },
+  { 0x21001e2c, 0x24000001 },
+  { 0x21001e2d, 0x1400ffff },
+  { 0x21001e2e, 0x24000001 },
+  { 0x21001e2f, 0x1400ffff },
+  { 0x21001e30, 0x24000001 },
+  { 0x21001e31, 0x1400ffff },
+  { 0x21001e32, 0x24000001 },
+  { 0x21001e33, 0x1400ffff },
+  { 0x21001e34, 0x24000001 },
+  { 0x21001e35, 0x1400ffff },
+  { 0x21001e36, 0x24000001 },
+  { 0x21001e37, 0x1400ffff },
+  { 0x21001e38, 0x24000001 },
+  { 0x21001e39, 0x1400ffff },
+  { 0x21001e3a, 0x24000001 },
+  { 0x21001e3b, 0x1400ffff },
+  { 0x21001e3c, 0x24000001 },
+  { 0x21001e3d, 0x1400ffff },
+  { 0x21001e3e, 0x24000001 },
+  { 0x21001e3f, 0x1400ffff },
+  { 0x21001e40, 0x24000001 },
+  { 0x21001e41, 0x1400ffff },
+  { 0x21001e42, 0x24000001 },
+  { 0x21001e43, 0x1400ffff },
+  { 0x21001e44, 0x24000001 },
+  { 0x21001e45, 0x1400ffff },
+  { 0x21001e46, 0x24000001 },
+  { 0x21001e47, 0x1400ffff },
+  { 0x21001e48, 0x24000001 },
+  { 0x21001e49, 0x1400ffff },
+  { 0x21001e4a, 0x24000001 },
+  { 0x21001e4b, 0x1400ffff },
+  { 0x21001e4c, 0x24000001 },
+  { 0x21001e4d, 0x1400ffff },
+  { 0x21001e4e, 0x24000001 },
+  { 0x21001e4f, 0x1400ffff },
+  { 0x21001e50, 0x24000001 },
+  { 0x21001e51, 0x1400ffff },
+  { 0x21001e52, 0x24000001 },
+  { 0x21001e53, 0x1400ffff },
+  { 0x21001e54, 0x24000001 },
+  { 0x21001e55, 0x1400ffff },
+  { 0x21001e56, 0x24000001 },
+  { 0x21001e57, 0x1400ffff },
+  { 0x21001e58, 0x24000001 },
+  { 0x21001e59, 0x1400ffff },
+  { 0x21001e5a, 0x24000001 },
+  { 0x21001e5b, 0x1400ffff },
+  { 0x21001e5c, 0x24000001 },
+  { 0x21001e5d, 0x1400ffff },
+  { 0x21001e5e, 0x24000001 },
+  { 0x21001e5f, 0x1400ffff },
+  { 0x21001e60, 0x24000001 },
+  { 0x21001e61, 0x1400ffff },
+  { 0x21001e62, 0x24000001 },
+  { 0x21001e63, 0x1400ffff },
+  { 0x21001e64, 0x24000001 },
+  { 0x21001e65, 0x1400ffff },
+  { 0x21001e66, 0x24000001 },
+  { 0x21001e67, 0x1400ffff },
+  { 0x21001e68, 0x24000001 },
+  { 0x21001e69, 0x1400ffff },
+  { 0x21001e6a, 0x24000001 },
+  { 0x21001e6b, 0x1400ffff },
+  { 0x21001e6c, 0x24000001 },
+  { 0x21001e6d, 0x1400ffff },
+  { 0x21001e6e, 0x24000001 },
+  { 0x21001e6f, 0x1400ffff },
+  { 0x21001e70, 0x24000001 },
+  { 0x21001e71, 0x1400ffff },
+  { 0x21001e72, 0x24000001 },
+  { 0x21001e73, 0x1400ffff },
+  { 0x21001e74, 0x24000001 },
+  { 0x21001e75, 0x1400ffff },
+  { 0x21001e76, 0x24000001 },
+  { 0x21001e77, 0x1400ffff },
+  { 0x21001e78, 0x24000001 },
+  { 0x21001e79, 0x1400ffff },
+  { 0x21001e7a, 0x24000001 },
+  { 0x21001e7b, 0x1400ffff },
+  { 0x21001e7c, 0x24000001 },
+  { 0x21001e7d, 0x1400ffff },
+  { 0x21001e7e, 0x24000001 },
+  { 0x21001e7f, 0x1400ffff },
+  { 0x21001e80, 0x24000001 },
+  { 0x21001e81, 0x1400ffff },
+  { 0x21001e82, 0x24000001 },
+  { 0x21001e83, 0x1400ffff },
+  { 0x21001e84, 0x24000001 },
+  { 0x21001e85, 0x1400ffff },
+  { 0x21001e86, 0x24000001 },
+  { 0x21001e87, 0x1400ffff },
+  { 0x21001e88, 0x24000001 },
+  { 0x21001e89, 0x1400ffff },
+  { 0x21001e8a, 0x24000001 },
+  { 0x21001e8b, 0x1400ffff },
+  { 0x21001e8c, 0x24000001 },
+  { 0x21001e8d, 0x1400ffff },
+  { 0x21001e8e, 0x24000001 },
+  { 0x21001e8f, 0x1400ffff },
+  { 0x21001e90, 0x24000001 },
+  { 0x21001e91, 0x1400ffff },
+  { 0x21001e92, 0x24000001 },
+  { 0x21001e93, 0x1400ffff },
+  { 0x21001e94, 0x24000001 },
+  { 0x21001e95, 0x1400ffff },
+  { 0x21801e96, 0x14000004 },
+  { 0x21001e9b, 0x1400ffc5 },
+  { 0x21001ea0, 0x24000001 },
+  { 0x21001ea1, 0x1400ffff },
+  { 0x21001ea2, 0x24000001 },
+  { 0x21001ea3, 0x1400ffff },
+  { 0x21001ea4, 0x24000001 },
+  { 0x21001ea5, 0x1400ffff },
+  { 0x21001ea6, 0x24000001 },
+  { 0x21001ea7, 0x1400ffff },
+  { 0x21001ea8, 0x24000001 },
+  { 0x21001ea9, 0x1400ffff },
+  { 0x21001eaa, 0x24000001 },
+  { 0x21001eab, 0x1400ffff },
+  { 0x21001eac, 0x24000001 },
+  { 0x21001ead, 0x1400ffff },
+  { 0x21001eae, 0x24000001 },
+  { 0x21001eaf, 0x1400ffff },
+  { 0x21001eb0, 0x24000001 },
+  { 0x21001eb1, 0x1400ffff },
+  { 0x21001eb2, 0x24000001 },
+  { 0x21001eb3, 0x1400ffff },
+  { 0x21001eb4, 0x24000001 },
+  { 0x21001eb5, 0x1400ffff },
+  { 0x21001eb6, 0x24000001 },
+  { 0x21001eb7, 0x1400ffff },
+  { 0x21001eb8, 0x24000001 },
+  { 0x21001eb9, 0x1400ffff },
+  { 0x21001eba, 0x24000001 },
+  { 0x21001ebb, 0x1400ffff },
+  { 0x21001ebc, 0x24000001 },
+  { 0x21001ebd, 0x1400ffff },
+  { 0x21001ebe, 0x24000001 },
+  { 0x21001ebf, 0x1400ffff },
+  { 0x21001ec0, 0x24000001 },
+  { 0x21001ec1, 0x1400ffff },
+  { 0x21001ec2, 0x24000001 },
+  { 0x21001ec3, 0x1400ffff },
+  { 0x21001ec4, 0x24000001 },
+  { 0x21001ec5, 0x1400ffff },
+  { 0x21001ec6, 0x24000001 },
+  { 0x21001ec7, 0x1400ffff },
+  { 0x21001ec8, 0x24000001 },
+  { 0x21001ec9, 0x1400ffff },
+  { 0x21001eca, 0x24000001 },
+  { 0x21001ecb, 0x1400ffff },
+  { 0x21001ecc, 0x24000001 },
+  { 0x21001ecd, 0x1400ffff },
+  { 0x21001ece, 0x24000001 },
+  { 0x21001ecf, 0x1400ffff },
+  { 0x21001ed0, 0x24000001 },
+  { 0x21001ed1, 0x1400ffff },
+  { 0x21001ed2, 0x24000001 },
+  { 0x21001ed3, 0x1400ffff },
+  { 0x21001ed4, 0x24000001 },
+  { 0x21001ed5, 0x1400ffff },
+  { 0x21001ed6, 0x24000001 },
+  { 0x21001ed7, 0x1400ffff },
+  { 0x21001ed8, 0x24000001 },
+  { 0x21001ed9, 0x1400ffff },
+  { 0x21001eda, 0x24000001 },
+  { 0x21001edb, 0x1400ffff },
+  { 0x21001edc, 0x24000001 },
+  { 0x21001edd, 0x1400ffff },
+  { 0x21001ede, 0x24000001 },
+  { 0x21001edf, 0x1400ffff },
+  { 0x21001ee0, 0x24000001 },
+  { 0x21001ee1, 0x1400ffff },
+  { 0x21001ee2, 0x24000001 },
+  { 0x21001ee3, 0x1400ffff },
+  { 0x21001ee4, 0x24000001 },
+  { 0x21001ee5, 0x1400ffff },
+  { 0x21001ee6, 0x24000001 },
+  { 0x21001ee7, 0x1400ffff },
+  { 0x21001ee8, 0x24000001 },
+  { 0x21001ee9, 0x1400ffff },
+  { 0x21001eea, 0x24000001 },
+  { 0x21001eeb, 0x1400ffff },
+  { 0x21001eec, 0x24000001 },
+  { 0x21001eed, 0x1400ffff },
+  { 0x21001eee, 0x24000001 },
+  { 0x21001eef, 0x1400ffff },
+  { 0x21001ef0, 0x24000001 },
+  { 0x21001ef1, 0x1400ffff },
+  { 0x21001ef2, 0x24000001 },
+  { 0x21001ef3, 0x1400ffff },
+  { 0x21001ef4, 0x24000001 },
+  { 0x21001ef5, 0x1400ffff },
+  { 0x21001ef6, 0x24000001 },
+  { 0x21001ef7, 0x1400ffff },
+  { 0x21001ef8, 0x24000001 },
+  { 0x21001ef9, 0x1400ffff },
+  { 0x13001f00, 0x14000008 },
+  { 0x13001f01, 0x14000008 },
+  { 0x13001f02, 0x14000008 },
+  { 0x13001f03, 0x14000008 },
+  { 0x13001f04, 0x14000008 },
+  { 0x13001f05, 0x14000008 },
+  { 0x13001f06, 0x14000008 },
+  { 0x13001f07, 0x14000008 },
+  { 0x13001f08, 0x2400fff8 },
+  { 0x13001f09, 0x2400fff8 },
+  { 0x13001f0a, 0x2400fff8 },
+  { 0x13001f0b, 0x2400fff8 },
+  { 0x13001f0c, 0x2400fff8 },
+  { 0x13001f0d, 0x2400fff8 },
+  { 0x13001f0e, 0x2400fff8 },
+  { 0x13001f0f, 0x2400fff8 },
+  { 0x13001f10, 0x14000008 },
+  { 0x13001f11, 0x14000008 },
+  { 0x13001f12, 0x14000008 },
+  { 0x13001f13, 0x14000008 },
+  { 0x13001f14, 0x14000008 },
+  { 0x13001f15, 0x14000008 },
+  { 0x13001f18, 0x2400fff8 },
+  { 0x13001f19, 0x2400fff8 },
+  { 0x13001f1a, 0x2400fff8 },
+  { 0x13001f1b, 0x2400fff8 },
+  { 0x13001f1c, 0x2400fff8 },
+  { 0x13001f1d, 0x2400fff8 },
+  { 0x13001f20, 0x14000008 },
+  { 0x13001f21, 0x14000008 },
+  { 0x13001f22, 0x14000008 },
+  { 0x13001f23, 0x14000008 },
+  { 0x13001f24, 0x14000008 },
+  { 0x13001f25, 0x14000008 },
+  { 0x13001f26, 0x14000008 },
+  { 0x13001f27, 0x14000008 },
+  { 0x13001f28, 0x2400fff8 },
+  { 0x13001f29, 0x2400fff8 },
+  { 0x13001f2a, 0x2400fff8 },
+  { 0x13001f2b, 0x2400fff8 },
+  { 0x13001f2c, 0x2400fff8 },
+  { 0x13001f2d, 0x2400fff8 },
+  { 0x13001f2e, 0x2400fff8 },
+  { 0x13001f2f, 0x2400fff8 },
+  { 0x13001f30, 0x14000008 },
+  { 0x13001f31, 0x14000008 },
+  { 0x13001f32, 0x14000008 },
+  { 0x13001f33, 0x14000008 },
+  { 0x13001f34, 0x14000008 },
+  { 0x13001f35, 0x14000008 },
+  { 0x13001f36, 0x14000008 },
+  { 0x13001f37, 0x14000008 },
+  { 0x13001f38, 0x2400fff8 },
+  { 0x13001f39, 0x2400fff8 },
+  { 0x13001f3a, 0x2400fff8 },
+  { 0x13001f3b, 0x2400fff8 },
+  { 0x13001f3c, 0x2400fff8 },
+  { 0x13001f3d, 0x2400fff8 },
+  { 0x13001f3e, 0x2400fff8 },
+  { 0x13001f3f, 0x2400fff8 },
+  { 0x13001f40, 0x14000008 },
+  { 0x13001f41, 0x14000008 },
+  { 0x13001f42, 0x14000008 },
+  { 0x13001f43, 0x14000008 },
+  { 0x13001f44, 0x14000008 },
+  { 0x13001f45, 0x14000008 },
+  { 0x13001f48, 0x2400fff8 },
+  { 0x13001f49, 0x2400fff8 },
+  { 0x13001f4a, 0x2400fff8 },
+  { 0x13001f4b, 0x2400fff8 },
+  { 0x13001f4c, 0x2400fff8 },
+  { 0x13001f4d, 0x2400fff8 },
+  { 0x13001f50, 0x14000000 },
+  { 0x13001f51, 0x14000008 },
+  { 0x13001f52, 0x14000000 },
+  { 0x13001f53, 0x14000008 },
+  { 0x13001f54, 0x14000000 },
+  { 0x13001f55, 0x14000008 },
+  { 0x13001f56, 0x14000000 },
+  { 0x13001f57, 0x14000008 },
+  { 0x13001f59, 0x2400fff8 },
+  { 0x13001f5b, 0x2400fff8 },
+  { 0x13001f5d, 0x2400fff8 },
+  { 0x13001f5f, 0x2400fff8 },
+  { 0x13001f60, 0x14000008 },
+  { 0x13001f61, 0x14000008 },
+  { 0x13001f62, 0x14000008 },
+  { 0x13001f63, 0x14000008 },
+  { 0x13001f64, 0x14000008 },
+  { 0x13001f65, 0x14000008 },
+  { 0x13001f66, 0x14000008 },
+  { 0x13001f67, 0x14000008 },
+  { 0x13001f68, 0x2400fff8 },
+  { 0x13001f69, 0x2400fff8 },
+  { 0x13001f6a, 0x2400fff8 },
+  { 0x13001f6b, 0x2400fff8 },
+  { 0x13001f6c, 0x2400fff8 },
+  { 0x13001f6d, 0x2400fff8 },
+  { 0x13001f6e, 0x2400fff8 },
+  { 0x13001f6f, 0x2400fff8 },
+  { 0x13001f70, 0x1400004a },
+  { 0x13001f71, 0x1400004a },
+  { 0x13001f72, 0x14000056 },
+  { 0x13001f73, 0x14000056 },
+  { 0x13001f74, 0x14000056 },
+  { 0x13001f75, 0x14000056 },
+  { 0x13001f76, 0x14000064 },
+  { 0x13001f77, 0x14000064 },
+  { 0x13001f78, 0x14000080 },
+  { 0x13001f79, 0x14000080 },
+  { 0x13001f7a, 0x14000070 },
+  { 0x13001f7b, 0x14000070 },
+  { 0x13001f7c, 0x1400007e },
+  { 0x13001f7d, 0x1400007e },
+  { 0x13001f80, 0x14000008 },
+  { 0x13001f81, 0x14000008 },
+  { 0x13001f82, 0x14000008 },
+  { 0x13001f83, 0x14000008 },
+  { 0x13001f84, 0x14000008 },
+  { 0x13001f85, 0x14000008 },
+  { 0x13001f86, 0x14000008 },
+  { 0x13001f87, 0x14000008 },
+  { 0x13001f88, 0x2000fff8 },
+  { 0x13001f89, 0x2000fff8 },
+  { 0x13001f8a, 0x2000fff8 },
+  { 0x13001f8b, 0x2000fff8 },
+  { 0x13001f8c, 0x2000fff8 },
+  { 0x13001f8d, 0x2000fff8 },
+  { 0x13001f8e, 0x2000fff8 },
+  { 0x13001f8f, 0x2000fff8 },
+  { 0x13001f90, 0x14000008 },
+  { 0x13001f91, 0x14000008 },
+  { 0x13001f92, 0x14000008 },
+  { 0x13001f93, 0x14000008 },
+  { 0x13001f94, 0x14000008 },
+  { 0x13001f95, 0x14000008 },
+  { 0x13001f96, 0x14000008 },
+  { 0x13001f97, 0x14000008 },
+  { 0x13001f98, 0x2000fff8 },
+  { 0x13001f99, 0x2000fff8 },
+  { 0x13001f9a, 0x2000fff8 },
+  { 0x13001f9b, 0x2000fff8 },
+  { 0x13001f9c, 0x2000fff8 },
+  { 0x13001f9d, 0x2000fff8 },
+  { 0x13001f9e, 0x2000fff8 },
+  { 0x13001f9f, 0x2000fff8 },
+  { 0x13001fa0, 0x14000008 },
+  { 0x13001fa1, 0x14000008 },
+  { 0x13001fa2, 0x14000008 },
+  { 0x13001fa3, 0x14000008 },
+  { 0x13001fa4, 0x14000008 },
+  { 0x13001fa5, 0x14000008 },
+  { 0x13001fa6, 0x14000008 },
+  { 0x13001fa7, 0x14000008 },
+  { 0x13001fa8, 0x2000fff8 },
+  { 0x13001fa9, 0x2000fff8 },
+  { 0x13001faa, 0x2000fff8 },
+  { 0x13001fab, 0x2000fff8 },
+  { 0x13001fac, 0x2000fff8 },
+  { 0x13001fad, 0x2000fff8 },
+  { 0x13001fae, 0x2000fff8 },
+  { 0x13001faf, 0x2000fff8 },
+  { 0x13001fb0, 0x14000008 },
+  { 0x13001fb1, 0x14000008 },
+  { 0x13001fb2, 0x14000000 },
+  { 0x13001fb3, 0x14000009 },
+  { 0x13001fb4, 0x14000000 },
+  { 0x13801fb6, 0x14000001 },
+  { 0x13001fb8, 0x2400fff8 },
+  { 0x13001fb9, 0x2400fff8 },
+  { 0x13001fba, 0x2400ffb6 },
+  { 0x13001fbb, 0x2400ffb6 },
+  { 0x13001fbc, 0x2000fff7 },
+  { 0x13001fbd, 0x60000000 },
+  { 0x13001fbe, 0x1400e3db },
+  { 0x13801fbf, 0x60000002 },
+  { 0x13001fc2, 0x14000000 },
+  { 0x13001fc3, 0x14000009 },
+  { 0x13001fc4, 0x14000000 },
+  { 0x13801fc6, 0x14000001 },
+  { 0x13001fc8, 0x2400ffaa },
+  { 0x13001fc9, 0x2400ffaa },
+  { 0x13001fca, 0x2400ffaa },
+  { 0x13001fcb, 0x2400ffaa },
+  { 0x13001fcc, 0x2000fff7 },
+  { 0x13801fcd, 0x60000002 },
+  { 0x13001fd0, 0x14000008 },
+  { 0x13001fd1, 0x14000008 },
+  { 0x13801fd2, 0x14000001 },
+  { 0x13801fd6, 0x14000001 },
+  { 0x13001fd8, 0x2400fff8 },
+  { 0x13001fd9, 0x2400fff8 },
+  { 0x13001fda, 0x2400ff9c },
+  { 0x13001fdb, 0x2400ff9c },
+  { 0x13801fdd, 0x60000002 },
+  { 0x13001fe0, 0x14000008 },
+  { 0x13001fe1, 0x14000008 },
+  { 0x13801fe2, 0x14000002 },
+  { 0x13001fe5, 0x14000007 },
+  { 0x13801fe6, 0x14000001 },
+  { 0x13001fe8, 0x2400fff8 },
+  { 0x13001fe9, 0x2400fff8 },
+  { 0x13001fea, 0x2400ff90 },
+  { 0x13001feb, 0x2400ff90 },
+  { 0x13001fec, 0x2400fff9 },
+  { 0x13801fed, 0x60000002 },
+  { 0x13001ff2, 0x14000000 },
+  { 0x13001ff3, 0x14000009 },
+  { 0x13001ff4, 0x14000000 },
+  { 0x13801ff6, 0x14000001 },
+  { 0x13001ff8, 0x2400ff80 },
+  { 0x13001ff9, 0x2400ff80 },
+  { 0x13001ffa, 0x2400ff82 },
+  { 0x13001ffb, 0x2400ff82 },
+  { 0x13001ffc, 0x2000fff7 },
+  { 0x13801ffd, 0x60000001 },
+  { 0x09802000, 0x7400000a },
+  { 0x0900200b, 0x04000000 },
+  { 0x1b80200c, 0x04000001 },
+  { 0x0980200e, 0x04000001 },
+  { 0x09802010, 0x44000005 },
+  { 0x09802016, 0x54000001 },
+  { 0x09002018, 0x50000000 },
+  { 0x09002019, 0x4c000000 },
+  { 0x0900201a, 0x58000000 },
+  { 0x0980201b, 0x50000001 },
+  { 0x0900201d, 0x4c000000 },
+  { 0x0900201e, 0x58000000 },
+  { 0x0900201f, 0x50000000 },
+  { 0x09802020, 0x54000007 },
+  { 0x09002028, 0x6c000000 },
+  { 0x09002029, 0x70000000 },
+  { 0x0980202a, 0x04000004 },
+  { 0x0900202f, 0x74000000 },
+  { 0x09802030, 0x54000008 },
+  { 0x09002039, 0x50000000 },
+  { 0x0900203a, 0x4c000000 },
+  { 0x0980203b, 0x54000003 },
+  { 0x0980203f, 0x40000001 },
+  { 0x09802041, 0x54000002 },
+  { 0x09002044, 0x64000000 },
+  { 0x09002045, 0x58000000 },
+  { 0x09002046, 0x48000000 },
+  { 0x09802047, 0x5400000a },
+  { 0x09002052, 0x64000000 },
+  { 0x09002053, 0x54000000 },
+  { 0x09002054, 0x40000000 },
+  { 0x09802055, 0x54000009 },
+  { 0x0900205f, 0x74000000 },
+  { 0x09802060, 0x04000003 },
+  { 0x0980206a, 0x04000005 },
+  { 0x09002070, 0x3c000000 },
+  { 0x21002071, 0x14000000 },
+  { 0x09802074, 0x3c000005 },
+  { 0x0980207a, 0x64000002 },
+  { 0x0900207d, 0x58000000 },
+  { 0x0900207e, 0x48000000 },
+  { 0x2100207f, 0x14000000 },
+  { 0x09802080, 0x3c000009 },
+  { 0x0980208a, 0x64000002 },
+  { 0x0900208d, 0x58000000 },
+  { 0x0900208e, 0x48000000 },
+  { 0x21802090, 0x18000004 },
+  { 0x098020a0, 0x5c000015 },
+  { 0x1b8020d0, 0x3000000c },
+  { 0x1b8020dd, 0x2c000003 },
+  { 0x1b0020e1, 0x30000000 },
+  { 0x1b8020e2, 0x2c000002 },
+  { 0x1b8020e5, 0x3000000a },
+  { 0x09802100, 0x68000001 },
+  { 0x09002102, 0x24000000 },
+  { 0x09802103, 0x68000003 },
+  { 0x09002107, 0x24000000 },
+  { 0x09802108, 0x68000001 },
+  { 0x0900210a, 0x14000000 },
+  { 0x0980210b, 0x24000002 },
+  { 0x0980210e, 0x14000001 },
+  { 0x09802110, 0x24000002 },
+  { 0x09002113, 0x14000000 },
+  { 0x09002114, 0x68000000 },
+  { 0x09002115, 0x24000000 },
+  { 0x09802116, 0x68000002 },
+  { 0x09802119, 0x24000004 },
+  { 0x0980211e, 0x68000005 },
+  { 0x09002124, 0x24000000 },
+  { 0x09002125, 0x68000000 },
+  { 0x13002126, 0x2400e2a3 },
+  { 0x09002127, 0x68000000 },
+  { 0x09002128, 0x24000000 },
+  { 0x09002129, 0x68000000 },
+  { 0x2100212a, 0x2400df41 },
+  { 0x2100212b, 0x2400dfba },
+  { 0x0980212c, 0x24000001 },
+  { 0x0900212e, 0x68000000 },
+  { 0x0900212f, 0x14000000 },
+  { 0x09802130, 0x24000001 },
+  { 0x21002132, 0x2400001c },
+  { 0x09002133, 0x24000000 },
+  { 0x09002134, 0x14000000 },
+  { 0x09802135, 0x1c000003 },
+  { 0x09002139, 0x14000000 },
+  { 0x0980213a, 0x68000001 },
+  { 0x0980213c, 0x14000001 },
+  { 0x0980213e, 0x24000001 },
+  { 0x09802140, 0x64000004 },
+  { 0x09002145, 0x24000000 },
+  { 0x09802146, 0x14000003 },
+  { 0x0900214a, 0x68000000 },
+  { 0x0900214b, 0x64000000 },
+  { 0x0980214c, 0x68000001 },
+  { 0x2100214e, 0x1400ffe4 },
+  { 0x09802153, 0x3c00000c },
+  { 0x09002160, 0x38000010 },
+  { 0x09002161, 0x38000010 },
+  { 0x09002162, 0x38000010 },
+  { 0x09002163, 0x38000010 },
+  { 0x09002164, 0x38000010 },
+  { 0x09002165, 0x38000010 },
+  { 0x09002166, 0x38000010 },
+  { 0x09002167, 0x38000010 },
+  { 0x09002168, 0x38000010 },
+  { 0x09002169, 0x38000010 },
+  { 0x0900216a, 0x38000010 },
+  { 0x0900216b, 0x38000010 },
+  { 0x0900216c, 0x38000010 },
+  { 0x0900216d, 0x38000010 },
+  { 0x0900216e, 0x38000010 },
+  { 0x0900216f, 0x38000010 },
+  { 0x09002170, 0x3800fff0 },
+  { 0x09002171, 0x3800fff0 },
+  { 0x09002172, 0x3800fff0 },
+  { 0x09002173, 0x3800fff0 },
+  { 0x09002174, 0x3800fff0 },
+  { 0x09002175, 0x3800fff0 },
+  { 0x09002176, 0x3800fff0 },
+  { 0x09002177, 0x3800fff0 },
+  { 0x09002178, 0x3800fff0 },
+  { 0x09002179, 0x3800fff0 },
+  { 0x0900217a, 0x3800fff0 },
+  { 0x0900217b, 0x3800fff0 },
+  { 0x0900217c, 0x3800fff0 },
+  { 0x0900217d, 0x3800fff0 },
+  { 0x0900217e, 0x3800fff0 },
+  { 0x0900217f, 0x3800fff0 },
+  { 0x09802180, 0x38000002 },
+  { 0x09002183, 0x24000001 },
+  { 0x21002184, 0x1400ffff },
+  { 0x09802190, 0x64000004 },
+  { 0x09802195, 0x68000004 },
+  { 0x0980219a, 0x64000001 },
+  { 0x0980219c, 0x68000003 },
+  { 0x090021a0, 0x64000000 },
+  { 0x098021a1, 0x68000001 },
+  { 0x090021a3, 0x64000000 },
+  { 0x098021a4, 0x68000001 },
+  { 0x090021a6, 0x64000000 },
+  { 0x098021a7, 0x68000006 },
+  { 0x090021ae, 0x64000000 },
+  { 0x098021af, 0x6800001e },
+  { 0x098021ce, 0x64000001 },
+  { 0x098021d0, 0x68000001 },
+  { 0x090021d2, 0x64000000 },
+  { 0x090021d3, 0x68000000 },
+  { 0x090021d4, 0x64000000 },
+  { 0x098021d5, 0x6800001e },
+  { 0x098021f4, 0x6400010b },
+  { 0x09802300, 0x68000007 },
+  { 0x09802308, 0x64000003 },
+  { 0x0980230c, 0x68000013 },
+  { 0x09802320, 0x64000001 },
+  { 0x09802322, 0x68000006 },
+  { 0x09002329, 0x58000000 },
+  { 0x0900232a, 0x48000000 },
+  { 0x0980232b, 0x68000050 },
+  { 0x0900237c, 0x64000000 },
+  { 0x0980237d, 0x6800001d },
+  { 0x0980239b, 0x64000018 },
+  { 0x098023b4, 0x68000027 },
+  { 0x098023dc, 0x64000005 },
+  { 0x098023e2, 0x68000005 },
+  { 0x09802400, 0x68000026 },
+  { 0x09802440, 0x6800000a },
+  { 0x09802460, 0x3c00003b },
+  { 0x0980249c, 0x68000019 },
+  { 0x090024b6, 0x6800001a },
+  { 0x090024b7, 0x6800001a },
+  { 0x090024b8, 0x6800001a },
+  { 0x090024b9, 0x6800001a },
+  { 0x090024ba, 0x6800001a },
+  { 0x090024bb, 0x6800001a },
+  { 0x090024bc, 0x6800001a },
+  { 0x090024bd, 0x6800001a },
+  { 0x090024be, 0x6800001a },
+  { 0x090024bf, 0x6800001a },
+  { 0x090024c0, 0x6800001a },
+  { 0x090024c1, 0x6800001a },
+  { 0x090024c2, 0x6800001a },
+  { 0x090024c3, 0x6800001a },
+  { 0x090024c4, 0x6800001a },
+  { 0x090024c5, 0x6800001a },
+  { 0x090024c6, 0x6800001a },
+  { 0x090024c7, 0x6800001a },
+  { 0x090024c8, 0x6800001a },
+  { 0x090024c9, 0x6800001a },
+  { 0x090024ca, 0x6800001a },
+  { 0x090024cb, 0x6800001a },
+  { 0x090024cc, 0x6800001a },
+  { 0x090024cd, 0x6800001a },
+  { 0x090024ce, 0x6800001a },
+  { 0x090024cf, 0x6800001a },
+  { 0x090024d0, 0x6800ffe6 },
+  { 0x090024d1, 0x6800ffe6 },
+  { 0x090024d2, 0x6800ffe6 },
+  { 0x090024d3, 0x6800ffe6 },
+  { 0x090024d4, 0x6800ffe6 },
+  { 0x090024d5, 0x6800ffe6 },
+  { 0x090024d6, 0x6800ffe6 },
+  { 0x090024d7, 0x6800ffe6 },
+  { 0x090024d8, 0x6800ffe6 },
+  { 0x090024d9, 0x6800ffe6 },
+  { 0x090024da, 0x6800ffe6 },
+  { 0x090024db, 0x6800ffe6 },
+  { 0x090024dc, 0x6800ffe6 },
+  { 0x090024dd, 0x6800ffe6 },
+  { 0x090024de, 0x6800ffe6 },
+  { 0x090024df, 0x6800ffe6 },
+  { 0x090024e0, 0x6800ffe6 },
+  { 0x090024e1, 0x6800ffe6 },
+  { 0x090024e2, 0x6800ffe6 },
+  { 0x090024e3, 0x6800ffe6 },
+  { 0x090024e4, 0x6800ffe6 },
+  { 0x090024e5, 0x6800ffe6 },
+  { 0x090024e6, 0x6800ffe6 },
+  { 0x090024e7, 0x6800ffe6 },
+  { 0x090024e8, 0x6800ffe6 },
+  { 0x090024e9, 0x6800ffe6 },
+  { 0x098024ea, 0x3c000015 },
+  { 0x09802500, 0x680000b6 },
+  { 0x090025b7, 0x64000000 },
+  { 0x098025b8, 0x68000008 },
+  { 0x090025c1, 0x64000000 },
+  { 0x098025c2, 0x68000035 },
+  { 0x098025f8, 0x64000007 },
+  { 0x09802600, 0x6800006e },
+  { 0x0900266f, 0x64000000 },
+  { 0x09802670, 0x6800002c },
+  { 0x098026a0, 0x68000012 },
+  { 0x09802701, 0x68000003 },
+  { 0x09802706, 0x68000003 },
+  { 0x0980270c, 0x6800001b },
+  { 0x09802729, 0x68000022 },
+  { 0x0900274d, 0x68000000 },
+  { 0x0980274f, 0x68000003 },
+  { 0x09002756, 0x68000000 },
+  { 0x09802758, 0x68000006 },
+  { 0x09802761, 0x68000006 },
+  { 0x09002768, 0x58000000 },
+  { 0x09002769, 0x48000000 },
+  { 0x0900276a, 0x58000000 },
+  { 0x0900276b, 0x48000000 },
+  { 0x0900276c, 0x58000000 },
+  { 0x0900276d, 0x48000000 },
+  { 0x0900276e, 0x58000000 },
+  { 0x0900276f, 0x48000000 },
+  { 0x09002770, 0x58000000 },
+  { 0x09002771, 0x48000000 },
+  { 0x09002772, 0x58000000 },
+  { 0x09002773, 0x48000000 },
+  { 0x09002774, 0x58000000 },
+  { 0x09002775, 0x48000000 },
+  { 0x09802776, 0x3c00001d },
+  { 0x09002794, 0x68000000 },
+  { 0x09802798, 0x68000017 },
+  { 0x098027b1, 0x6800000d },
+  { 0x098027c0, 0x64000004 },
+  { 0x090027c5, 0x58000000 },
+  { 0x090027c6, 0x48000000 },
+  { 0x098027c7, 0x64000003 },
+  { 0x098027d0, 0x64000015 },
+  { 0x090027e6, 0x58000000 },
+  { 0x090027e7, 0x48000000 },
+  { 0x090027e8, 0x58000000 },
+  { 0x090027e9, 0x48000000 },
+  { 0x090027ea, 0x58000000 },
+  { 0x090027eb, 0x48000000 },
+  { 0x098027f0, 0x6400000f },
+  { 0x04802800, 0x680000ff },
+  { 0x09802900, 0x64000082 },
+  { 0x09002983, 0x58000000 },
+  { 0x09002984, 0x48000000 },
+  { 0x09002985, 0x58000000 },
+  { 0x09002986, 0x48000000 },
+  { 0x09002987, 0x58000000 },
+  { 0x09002988, 0x48000000 },
+  { 0x09002989, 0x58000000 },
+  { 0x0900298a, 0x48000000 },
+  { 0x0900298b, 0x58000000 },
+  { 0x0900298c, 0x48000000 },
+  { 0x0900298d, 0x58000000 },
+  { 0x0900298e, 0x48000000 },
+  { 0x0900298f, 0x58000000 },
+  { 0x09002990, 0x48000000 },
+  { 0x09002991, 0x58000000 },
+  { 0x09002992, 0x48000000 },
+  { 0x09002993, 0x58000000 },
+  { 0x09002994, 0x48000000 },
+  { 0x09002995, 0x58000000 },
+  { 0x09002996, 0x48000000 },
+  { 0x09002997, 0x58000000 },
+  { 0x09002998, 0x48000000 },
+  { 0x09802999, 0x6400003e },
+  { 0x090029d8, 0x58000000 },
+  { 0x090029d9, 0x48000000 },
+  { 0x090029da, 0x58000000 },
+  { 0x090029db, 0x48000000 },
+  { 0x098029dc, 0x6400001f },
+  { 0x090029fc, 0x58000000 },
+  { 0x090029fd, 0x48000000 },
+  { 0x098029fe, 0x64000101 },
+  { 0x09802b00, 0x6800001a },
+  { 0x09802b20, 0x68000003 },
+  { 0x11002c00, 0x24000030 },
+  { 0x11002c01, 0x24000030 },
+  { 0x11002c02, 0x24000030 },
+  { 0x11002c03, 0x24000030 },
+  { 0x11002c04, 0x24000030 },
+  { 0x11002c05, 0x24000030 },
+  { 0x11002c06, 0x24000030 },
+  { 0x11002c07, 0x24000030 },
+  { 0x11002c08, 0x24000030 },
+  { 0x11002c09, 0x24000030 },
+  { 0x11002c0a, 0x24000030 },
+  { 0x11002c0b, 0x24000030 },
+  { 0x11002c0c, 0x24000030 },
+  { 0x11002c0d, 0x24000030 },
+  { 0x11002c0e, 0x24000030 },
+  { 0x11002c0f, 0x24000030 },
+  { 0x11002c10, 0x24000030 },
+  { 0x11002c11, 0x24000030 },
+  { 0x11002c12, 0x24000030 },
+  { 0x11002c13, 0x24000030 },
+  { 0x11002c14, 0x24000030 },
+  { 0x11002c15, 0x24000030 },
+  { 0x11002c16, 0x24000030 },
+  { 0x11002c17, 0x24000030 },
+  { 0x11002c18, 0x24000030 },
+  { 0x11002c19, 0x24000030 },
+  { 0x11002c1a, 0x24000030 },
+  { 0x11002c1b, 0x24000030 },
+  { 0x11002c1c, 0x24000030 },
+  { 0x11002c1d, 0x24000030 },
+  { 0x11002c1e, 0x24000030 },
+  { 0x11002c1f, 0x24000030 },
+  { 0x11002c20, 0x24000030 },
+  { 0x11002c21, 0x24000030 },
+  { 0x11002c22, 0x24000030 },
+  { 0x11002c23, 0x24000030 },
+  { 0x11002c24, 0x24000030 },
+  { 0x11002c25, 0x24000030 },
+  { 0x11002c26, 0x24000030 },
+  { 0x11002c27, 0x24000030 },
+  { 0x11002c28, 0x24000030 },
+  { 0x11002c29, 0x24000030 },
+  { 0x11002c2a, 0x24000030 },
+  { 0x11002c2b, 0x24000030 },
+  { 0x11002c2c, 0x24000030 },
+  { 0x11002c2d, 0x24000030 },
+  { 0x11002c2e, 0x24000030 },
+  { 0x11002c30, 0x1400ffd0 },
+  { 0x11002c31, 0x1400ffd0 },
+  { 0x11002c32, 0x1400ffd0 },
+  { 0x11002c33, 0x1400ffd0 },
+  { 0x11002c34, 0x1400ffd0 },
+  { 0x11002c35, 0x1400ffd0 },
+  { 0x11002c36, 0x1400ffd0 },
+  { 0x11002c37, 0x1400ffd0 },
+  { 0x11002c38, 0x1400ffd0 },
+  { 0x11002c39, 0x1400ffd0 },
+  { 0x11002c3a, 0x1400ffd0 },
+  { 0x11002c3b, 0x1400ffd0 },
+  { 0x11002c3c, 0x1400ffd0 },
+  { 0x11002c3d, 0x1400ffd0 },
+  { 0x11002c3e, 0x1400ffd0 },
+  { 0x11002c3f, 0x1400ffd0 },
+  { 0x11002c40, 0x1400ffd0 },
+  { 0x11002c41, 0x1400ffd0 },
+  { 0x11002c42, 0x1400ffd0 },
+  { 0x11002c43, 0x1400ffd0 },
+  { 0x11002c44, 0x1400ffd0 },
+  { 0x11002c45, 0x1400ffd0 },
+  { 0x11002c46, 0x1400ffd0 },
+  { 0x11002c47, 0x1400ffd0 },
+  { 0x11002c48, 0x1400ffd0 },
+  { 0x11002c49, 0x1400ffd0 },
+  { 0x11002c4a, 0x1400ffd0 },
+  { 0x11002c4b, 0x1400ffd0 },
+  { 0x11002c4c, 0x1400ffd0 },
+  { 0x11002c4d, 0x1400ffd0 },
+  { 0x11002c4e, 0x1400ffd0 },
+  { 0x11002c4f, 0x1400ffd0 },
+  { 0x11002c50, 0x1400ffd0 },
+  { 0x11002c51, 0x1400ffd0 },
+  { 0x11002c52, 0x1400ffd0 },
+  { 0x11002c53, 0x1400ffd0 },
+  { 0x11002c54, 0x1400ffd0 },
+  { 0x11002c55, 0x1400ffd0 },
+  { 0x11002c56, 0x1400ffd0 },
+  { 0x11002c57, 0x1400ffd0 },
+  { 0x11002c58, 0x1400ffd0 },
+  { 0x11002c59, 0x1400ffd0 },
+  { 0x11002c5a, 0x1400ffd0 },
+  { 0x11002c5b, 0x1400ffd0 },
+  { 0x11002c5c, 0x1400ffd0 },
+  { 0x11002c5d, 0x1400ffd0 },
+  { 0x11002c5e, 0x1400ffd0 },
+  { 0x21002c60, 0x24000001 },
+  { 0x21002c61, 0x1400ffff },
+  { 0x21002c62, 0x2400d609 },
+  { 0x21002c63, 0x2400f11a },
+  { 0x21002c64, 0x2400d619 },
+  { 0x21002c65, 0x1400d5d5 },
+  { 0x21002c66, 0x1400d5d8 },
+  { 0x21002c67, 0x24000001 },
+  { 0x21002c68, 0x1400ffff },
+  { 0x21002c69, 0x24000001 },
+  { 0x21002c6a, 0x1400ffff },
+  { 0x21002c6b, 0x24000001 },
+  { 0x21002c6c, 0x1400ffff },
+  { 0x21002c74, 0x14000000 },
+  { 0x21002c75, 0x24000001 },
+  { 0x21002c76, 0x1400ffff },
+  { 0x21002c77, 0x14000000 },
+  { 0x0a002c80, 0x24000001 },
+  { 0x0a002c81, 0x1400ffff },
+  { 0x0a002c82, 0x24000001 },
+  { 0x0a002c83, 0x1400ffff },
+  { 0x0a002c84, 0x24000001 },
+  { 0x0a002c85, 0x1400ffff },
+  { 0x0a002c86, 0x24000001 },
+  { 0x0a002c87, 0x1400ffff },
+  { 0x0a002c88, 0x24000001 },
+  { 0x0a002c89, 0x1400ffff },
+  { 0x0a002c8a, 0x24000001 },
+  { 0x0a002c8b, 0x1400ffff },
+  { 0x0a002c8c, 0x24000001 },
+  { 0x0a002c8d, 0x1400ffff },
+  { 0x0a002c8e, 0x24000001 },
+  { 0x0a002c8f, 0x1400ffff },
+  { 0x0a002c90, 0x24000001 },
+  { 0x0a002c91, 0x1400ffff },
+  { 0x0a002c92, 0x24000001 },
+  { 0x0a002c93, 0x1400ffff },
+  { 0x0a002c94, 0x24000001 },
+  { 0x0a002c95, 0x1400ffff },
+  { 0x0a002c96, 0x24000001 },
+  { 0x0a002c97, 0x1400ffff },
+  { 0x0a002c98, 0x24000001 },
+  { 0x0a002c99, 0x1400ffff },
+  { 0x0a002c9a, 0x24000001 },
+  { 0x0a002c9b, 0x1400ffff },
+  { 0x0a002c9c, 0x24000001 },
+  { 0x0a002c9d, 0x1400ffff },
+  { 0x0a002c9e, 0x24000001 },
+  { 0x0a002c9f, 0x1400ffff },
+  { 0x0a002ca0, 0x24000001 },
+  { 0x0a002ca1, 0x1400ffff },
+  { 0x0a002ca2, 0x24000001 },
+  { 0x0a002ca3, 0x1400ffff },
+  { 0x0a002ca4, 0x24000001 },
+  { 0x0a002ca5, 0x1400ffff },
+  { 0x0a002ca6, 0x24000001 },
+  { 0x0a002ca7, 0x1400ffff },
+  { 0x0a002ca8, 0x24000001 },
+  { 0x0a002ca9, 0x1400ffff },
+  { 0x0a002caa, 0x24000001 },
+  { 0x0a002cab, 0x1400ffff },
+  { 0x0a002cac, 0x24000001 },
+  { 0x0a002cad, 0x1400ffff },
+  { 0x0a002cae, 0x24000001 },
+  { 0x0a002caf, 0x1400ffff },
+  { 0x0a002cb0, 0x24000001 },
+  { 0x0a002cb1, 0x1400ffff },
+  { 0x0a002cb2, 0x24000001 },
+  { 0x0a002cb3, 0x1400ffff },
+  { 0x0a002cb4, 0x24000001 },
+  { 0x0a002cb5, 0x1400ffff },
+  { 0x0a002cb6, 0x24000001 },
+  { 0x0a002cb7, 0x1400ffff },
+  { 0x0a002cb8, 0x24000001 },
+  { 0x0a002cb9, 0x1400ffff },
+  { 0x0a002cba, 0x24000001 },
+  { 0x0a002cbb, 0x1400ffff },
+  { 0x0a002cbc, 0x24000001 },
+  { 0x0a002cbd, 0x1400ffff },
+  { 0x0a002cbe, 0x24000001 },
+  { 0x0a002cbf, 0x1400ffff },
+  { 0x0a002cc0, 0x24000001 },
+  { 0x0a002cc1, 0x1400ffff },
+  { 0x0a002cc2, 0x24000001 },
+  { 0x0a002cc3, 0x1400ffff },
+  { 0x0a002cc4, 0x24000001 },
+  { 0x0a002cc5, 0x1400ffff },
+  { 0x0a002cc6, 0x24000001 },
+  { 0x0a002cc7, 0x1400ffff },
+  { 0x0a002cc8, 0x24000001 },
+  { 0x0a002cc9, 0x1400ffff },
+  { 0x0a002cca, 0x24000001 },
+  { 0x0a002ccb, 0x1400ffff },
+  { 0x0a002ccc, 0x24000001 },
+  { 0x0a002ccd, 0x1400ffff },
+  { 0x0a002cce, 0x24000001 },
+  { 0x0a002ccf, 0x1400ffff },
+  { 0x0a002cd0, 0x24000001 },
+  { 0x0a002cd1, 0x1400ffff },
+  { 0x0a002cd2, 0x24000001 },
+  { 0x0a002cd3, 0x1400ffff },
+  { 0x0a002cd4, 0x24000001 },
+  { 0x0a002cd5, 0x1400ffff },
+  { 0x0a002cd6, 0x24000001 },
+  { 0x0a002cd7, 0x1400ffff },
+  { 0x0a002cd8, 0x24000001 },
+  { 0x0a002cd9, 0x1400ffff },
+  { 0x0a002cda, 0x24000001 },
+  { 0x0a002cdb, 0x1400ffff },
+  { 0x0a002cdc, 0x24000001 },
+  { 0x0a002cdd, 0x1400ffff },
+  { 0x0a002cde, 0x24000001 },
+  { 0x0a002cdf, 0x1400ffff },
+  { 0x0a002ce0, 0x24000001 },
+  { 0x0a002ce1, 0x1400ffff },
+  { 0x0a002ce2, 0x24000001 },
+  { 0x0a002ce3, 0x1400ffff },
+  { 0x0a002ce4, 0x14000000 },
+  { 0x0a802ce5, 0x68000005 },
+  { 0x0a802cf9, 0x54000003 },
+  { 0x0a002cfd, 0x3c000000 },
+  { 0x0a802cfe, 0x54000001 },
+  { 0x10002d00, 0x1400e3a0 },
+  { 0x10002d01, 0x1400e3a0 },
+  { 0x10002d02, 0x1400e3a0 },
+  { 0x10002d03, 0x1400e3a0 },
+  { 0x10002d04, 0x1400e3a0 },
+  { 0x10002d05, 0x1400e3a0 },
+  { 0x10002d06, 0x1400e3a0 },
+  { 0x10002d07, 0x1400e3a0 },
+  { 0x10002d08, 0x1400e3a0 },
+  { 0x10002d09, 0x1400e3a0 },
+  { 0x10002d0a, 0x1400e3a0 },
+  { 0x10002d0b, 0x1400e3a0 },
+  { 0x10002d0c, 0x1400e3a0 },
+  { 0x10002d0d, 0x1400e3a0 },
+  { 0x10002d0e, 0x1400e3a0 },
+  { 0x10002d0f, 0x1400e3a0 },
+  { 0x10002d10, 0x1400e3a0 },
+  { 0x10002d11, 0x1400e3a0 },
+  { 0x10002d12, 0x1400e3a0 },
+  { 0x10002d13, 0x1400e3a0 },
+  { 0x10002d14, 0x1400e3a0 },
+  { 0x10002d15, 0x1400e3a0 },
+  { 0x10002d16, 0x1400e3a0 },
+  { 0x10002d17, 0x1400e3a0 },
+  { 0x10002d18, 0x1400e3a0 },
+  { 0x10002d19, 0x1400e3a0 },
+  { 0x10002d1a, 0x1400e3a0 },
+  { 0x10002d1b, 0x1400e3a0 },
+  { 0x10002d1c, 0x1400e3a0 },
+  { 0x10002d1d, 0x1400e3a0 },
+  { 0x10002d1e, 0x1400e3a0 },
+  { 0x10002d1f, 0x1400e3a0 },
+  { 0x10002d20, 0x1400e3a0 },
+  { 0x10002d21, 0x1400e3a0 },
+  { 0x10002d22, 0x1400e3a0 },
+  { 0x10002d23, 0x1400e3a0 },
+  { 0x10002d24, 0x1400e3a0 },
+  { 0x10002d25, 0x1400e3a0 },
+  { 0x3a802d30, 0x1c000035 },
+  { 0x3a002d6f, 0x18000000 },
+  { 0x0f802d80, 0x1c000016 },
+  { 0x0f802da0, 0x1c000006 },
+  { 0x0f802da8, 0x1c000006 },
+  { 0x0f802db0, 0x1c000006 },
+  { 0x0f802db8, 0x1c000006 },
+  { 0x0f802dc0, 0x1c000006 },
+  { 0x0f802dc8, 0x1c000006 },
+  { 0x0f802dd0, 0x1c000006 },
+  { 0x0f802dd8, 0x1c000006 },
+  { 0x09802e00, 0x54000001 },
+  { 0x09002e02, 0x50000000 },
+  { 0x09002e03, 0x4c000000 },
+  { 0x09002e04, 0x50000000 },
+  { 0x09002e05, 0x4c000000 },
+  { 0x09802e06, 0x54000002 },
+  { 0x09002e09, 0x50000000 },
+  { 0x09002e0a, 0x4c000000 },
+  { 0x09002e0b, 0x54000000 },
+  { 0x09002e0c, 0x50000000 },
+  { 0x09002e0d, 0x4c000000 },
+  { 0x09802e0e, 0x54000008 },
+  { 0x09002e17, 0x44000000 },
+  { 0x09002e1c, 0x50000000 },
+  { 0x09002e1d, 0x4c000000 },
+  { 0x16802e80, 0x68000019 },
+  { 0x16802e9b, 0x68000058 },
+  { 0x16802f00, 0x680000d5 },
+  { 0x09802ff0, 0x6800000b },
+  { 0x09003000, 0x74000000 },
+  { 0x09803001, 0x54000002 },
+  { 0x09003004, 0x68000000 },
+  { 0x16003005, 0x18000000 },
+  { 0x09003006, 0x1c000000 },
+  { 0x16003007, 0x38000000 },
+  { 0x09003008, 0x58000000 },
+  { 0x09003009, 0x48000000 },
+  { 0x0900300a, 0x58000000 },
+  { 0x0900300b, 0x48000000 },
+  { 0x0900300c, 0x58000000 },
+  { 0x0900300d, 0x48000000 },
+  { 0x0900300e, 0x58000000 },
+  { 0x0900300f, 0x48000000 },
+  { 0x09003010, 0x58000000 },
+  { 0x09003011, 0x48000000 },
+  { 0x09803012, 0x68000001 },
+  { 0x09003014, 0x58000000 },
+  { 0x09003015, 0x48000000 },
+  { 0x09003016, 0x58000000 },
+  { 0x09003017, 0x48000000 },
+  { 0x09003018, 0x58000000 },
+  { 0x09003019, 0x48000000 },
+  { 0x0900301a, 0x58000000 },
+  { 0x0900301b, 0x48000000 },
+  { 0x0900301c, 0x44000000 },
+  { 0x0900301d, 0x58000000 },
+  { 0x0980301e, 0x48000001 },
+  { 0x09003020, 0x68000000 },
+  { 0x16803021, 0x38000008 },
+  { 0x1b80302a, 0x30000005 },
+  { 0x09003030, 0x44000000 },
+  { 0x09803031, 0x18000004 },
+  { 0x09803036, 0x68000001 },
+  { 0x16803038, 0x38000002 },
+  { 0x1600303b, 0x18000000 },
+  { 0x0900303c, 0x1c000000 },
+  { 0x0900303d, 0x54000000 },
+  { 0x0980303e, 0x68000001 },
+  { 0x1a803041, 0x1c000055 },
+  { 0x1b803099, 0x30000001 },
+  { 0x0980309b, 0x60000001 },
+  { 0x1a80309d, 0x18000001 },
+  { 0x1a00309f, 0x1c000000 },
+  { 0x090030a0, 0x44000000 },
+  { 0x1d8030a1, 0x1c000059 },
+  { 0x090030fb, 0x54000000 },
+  { 0x090030fc, 0x18000000 },
+  { 0x1d8030fd, 0x18000001 },
+  { 0x1d0030ff, 0x1c000000 },
+  { 0x03803105, 0x1c000027 },
+  { 0x17803131, 0x1c00005d },
+  { 0x09803190, 0x68000001 },
+  { 0x09803192, 0x3c000003 },
+  { 0x09803196, 0x68000009 },
+  { 0x038031a0, 0x1c000017 },
+  { 0x098031c0, 0x6800000f },
+  { 0x1d8031f0, 0x1c00000f },
+  { 0x17803200, 0x6800001e },
+  { 0x09803220, 0x3c000009 },
+  { 0x0980322a, 0x68000019 },
+  { 0x09003250, 0x68000000 },
+  { 0x09803251, 0x3c00000e },
+  { 0x17803260, 0x6800001d },
+  { 0x0980327e, 0x68000001 },
+  { 0x09803280, 0x3c000009 },
+  { 0x0980328a, 0x68000026 },
+  { 0x098032b1, 0x3c00000e },
+  { 0x098032c0, 0x6800003e },
+  { 0x09803300, 0x680000ff },
+  { 0x16803400, 0x1c0019b5 },
+  { 0x09804dc0, 0x6800003f },
+  { 0x16804e00, 0x1c0051bb },
+  { 0x3c80a000, 0x1c000014 },
+  { 0x3c00a015, 0x18000000 },
+  { 0x3c80a016, 0x1c000476 },
+  { 0x3c80a490, 0x68000036 },
+  { 0x0980a700, 0x60000016 },
+  { 0x0980a717, 0x18000003 },
+  { 0x0980a720, 0x60000001 },
+  { 0x3080a800, 0x1c000001 },
+  { 0x3000a802, 0x28000000 },
+  { 0x3080a803, 0x1c000002 },
+  { 0x3000a806, 0x30000000 },
+  { 0x3080a807, 0x1c000003 },
+  { 0x3000a80b, 0x30000000 },
+  { 0x3080a80c, 0x1c000016 },
+  { 0x3080a823, 0x28000001 },
+  { 0x3080a825, 0x30000001 },
+  { 0x3000a827, 0x28000000 },
+  { 0x3080a828, 0x68000003 },
+  { 0x4080a840, 0x1c000033 },
+  { 0x4080a874, 0x54000003 },
+  { 0x1780ac00, 0x1c002ba3 },
+  { 0x0980d800, 0x1000037f },
+  { 0x0980db80, 0x1000007f },
+  { 0x0980dc00, 0x100003ff },
+  { 0x0980e000, 0x0c0018ff },
+  { 0x1680f900, 0x1c00012d },
+  { 0x1680fa30, 0x1c00003a },
+  { 0x1680fa70, 0x1c000069 },
+  { 0x2180fb00, 0x14000006 },
+  { 0x0180fb13, 0x14000004 },
+  { 0x1900fb1d, 0x1c000000 },
+  { 0x1900fb1e, 0x30000000 },
+  { 0x1980fb1f, 0x1c000009 },
+  { 0x1900fb29, 0x64000000 },
+  { 0x1980fb2a, 0x1c00000c },
+  { 0x1980fb38, 0x1c000004 },
+  { 0x1900fb3e, 0x1c000000 },
+  { 0x1980fb40, 0x1c000001 },
+  { 0x1980fb43, 0x1c000001 },
+  { 0x1980fb46, 0x1c000009 },
+  { 0x0080fb50, 0x1c000061 },
+  { 0x0080fbd3, 0x1c00016a },
+  { 0x0900fd3e, 0x58000000 },
+  { 0x0900fd3f, 0x48000000 },
+  { 0x0080fd50, 0x1c00003f },
+  { 0x0080fd92, 0x1c000035 },
+  { 0x0080fdf0, 0x1c00000b },
+  { 0x0000fdfc, 0x5c000000 },
+  { 0x0900fdfd, 0x68000000 },
+  { 0x1b80fe00, 0x3000000f },
+  { 0x0980fe10, 0x54000006 },
+  { 0x0900fe17, 0x58000000 },
+  { 0x0900fe18, 0x48000000 },
+  { 0x0900fe19, 0x54000000 },
+  { 0x1b80fe20, 0x30000003 },
+  { 0x0900fe30, 0x54000000 },
+  { 0x0980fe31, 0x44000001 },
+  { 0x0980fe33, 0x40000001 },
+  { 0x0900fe35, 0x58000000 },
+  { 0x0900fe36, 0x48000000 },
+  { 0x0900fe37, 0x58000000 },
+  { 0x0900fe38, 0x48000000 },
+  { 0x0900fe39, 0x58000000 },
+  { 0x0900fe3a, 0x48000000 },
+  { 0x0900fe3b, 0x58000000 },
+  { 0x0900fe3c, 0x48000000 },
+  { 0x0900fe3d, 0x58000000 },
+  { 0x0900fe3e, 0x48000000 },
+  { 0x0900fe3f, 0x58000000 },
+  { 0x0900fe40, 0x48000000 },
+  { 0x0900fe41, 0x58000000 },
+  { 0x0900fe42, 0x48000000 },
+  { 0x0900fe43, 0x58000000 },
+  { 0x0900fe44, 0x48000000 },
+  { 0x0980fe45, 0x54000001 },
+  { 0x0900fe47, 0x58000000 },
+  { 0x0900fe48, 0x48000000 },
+  { 0x0980fe49, 0x54000003 },
+  { 0x0980fe4d, 0x40000002 },
+  { 0x0980fe50, 0x54000002 },
+  { 0x0980fe54, 0x54000003 },
+  { 0x0900fe58, 0x44000000 },
+  { 0x0900fe59, 0x58000000 },
+  { 0x0900fe5a, 0x48000000 },
+  { 0x0900fe5b, 0x58000000 },
+  { 0x0900fe5c, 0x48000000 },
+  { 0x0900fe5d, 0x58000000 },
+  { 0x0900fe5e, 0x48000000 },
+  { 0x0980fe5f, 0x54000002 },
+  { 0x0900fe62, 0x64000000 },
+  { 0x0900fe63, 0x44000000 },
+  { 0x0980fe64, 0x64000002 },
+  { 0x0900fe68, 0x54000000 },
+  { 0x0900fe69, 0x5c000000 },
+  { 0x0980fe6a, 0x54000001 },
+  { 0x0080fe70, 0x1c000004 },
+  { 0x0080fe76, 0x1c000086 },
+  { 0x0900feff, 0x04000000 },
+  { 0x0980ff01, 0x54000002 },
+  { 0x0900ff04, 0x5c000000 },
+  { 0x0980ff05, 0x54000002 },
+  { 0x0900ff08, 0x58000000 },
+  { 0x0900ff09, 0x48000000 },
+  { 0x0900ff0a, 0x54000000 },
+  { 0x0900ff0b, 0x64000000 },
+  { 0x0900ff0c, 0x54000000 },
+  { 0x0900ff0d, 0x44000000 },
+  { 0x0980ff0e, 0x54000001 },
+  { 0x0980ff10, 0x34000009 },
+  { 0x0980ff1a, 0x54000001 },
+  { 0x0980ff1c, 0x64000002 },
+  { 0x0980ff1f, 0x54000001 },
+  { 0x2100ff21, 0x24000020 },
+  { 0x2100ff22, 0x24000020 },
+  { 0x2100ff23, 0x24000020 },
+  { 0x2100ff24, 0x24000020 },
+  { 0x2100ff25, 0x24000020 },
+  { 0x2100ff26, 0x24000020 },
+  { 0x2100ff27, 0x24000020 },
+  { 0x2100ff28, 0x24000020 },
+  { 0x2100ff29, 0x24000020 },
+  { 0x2100ff2a, 0x24000020 },
+  { 0x2100ff2b, 0x24000020 },
+  { 0x2100ff2c, 0x24000020 },
+  { 0x2100ff2d, 0x24000020 },
+  { 0x2100ff2e, 0x24000020 },
+  { 0x2100ff2f, 0x24000020 },
+  { 0x2100ff30, 0x24000020 },
+  { 0x2100ff31, 0x24000020 },
+  { 0x2100ff32, 0x24000020 },
+  { 0x2100ff33, 0x24000020 },
+  { 0x2100ff34, 0x24000020 },
+  { 0x2100ff35, 0x24000020 },
+  { 0x2100ff36, 0x24000020 },
+  { 0x2100ff37, 0x24000020 },
+  { 0x2100ff38, 0x24000020 },
+  { 0x2100ff39, 0x24000020 },
+  { 0x2100ff3a, 0x24000020 },
+  { 0x0900ff3b, 0x58000000 },
+  { 0x0900ff3c, 0x54000000 },
+  { 0x0900ff3d, 0x48000000 },
+  { 0x0900ff3e, 0x60000000 },
+  { 0x0900ff3f, 0x40000000 },
+  { 0x0900ff40, 0x60000000 },
+  { 0x2100ff41, 0x1400ffe0 },
+  { 0x2100ff42, 0x1400ffe0 },
+  { 0x2100ff43, 0x1400ffe0 },
+  { 0x2100ff44, 0x1400ffe0 },
+  { 0x2100ff45, 0x1400ffe0 },
+  { 0x2100ff46, 0x1400ffe0 },
+  { 0x2100ff47, 0x1400ffe0 },
+  { 0x2100ff48, 0x1400ffe0 },
+  { 0x2100ff49, 0x1400ffe0 },
+  { 0x2100ff4a, 0x1400ffe0 },
+  { 0x2100ff4b, 0x1400ffe0 },
+  { 0x2100ff4c, 0x1400ffe0 },
+  { 0x2100ff4d, 0x1400ffe0 },
+  { 0x2100ff4e, 0x1400ffe0 },
+  { 0x2100ff4f, 0x1400ffe0 },
+  { 0x2100ff50, 0x1400ffe0 },
+  { 0x2100ff51, 0x1400ffe0 },
+  { 0x2100ff52, 0x1400ffe0 },
+  { 0x2100ff53, 0x1400ffe0 },
+  { 0x2100ff54, 0x1400ffe0 },
+  { 0x2100ff55, 0x1400ffe0 },
+  { 0x2100ff56, 0x1400ffe0 },
+  { 0x2100ff57, 0x1400ffe0 },
+  { 0x2100ff58, 0x1400ffe0 },
+  { 0x2100ff59, 0x1400ffe0 },
+  { 0x2100ff5a, 0x1400ffe0 },
+  { 0x0900ff5b, 0x58000000 },
+  { 0x0900ff5c, 0x64000000 },
+  { 0x0900ff5d, 0x48000000 },
+  { 0x0900ff5e, 0x64000000 },
+  { 0x0900ff5f, 0x58000000 },
+  { 0x0900ff60, 0x48000000 },
+  { 0x0900ff61, 0x54000000 },
+  { 0x0900ff62, 0x58000000 },
+  { 0x0900ff63, 0x48000000 },
+  { 0x0980ff64, 0x54000001 },
+  { 0x1d80ff66, 0x1c000009 },
+  { 0x0900ff70, 0x18000000 },
+  { 0x1d80ff71, 0x1c00002c },
+  { 0x0980ff9e, 0x18000001 },
+  { 0x1780ffa0, 0x1c00001e },
+  { 0x1780ffc2, 0x1c000005 },
+  { 0x1780ffca, 0x1c000005 },
+  { 0x1780ffd2, 0x1c000005 },
+  { 0x1780ffda, 0x1c000002 },
+  { 0x0980ffe0, 0x5c000001 },
+  { 0x0900ffe2, 0x64000000 },
+  { 0x0900ffe3, 0x60000000 },
+  { 0x0900ffe4, 0x68000000 },
+  { 0x0980ffe5, 0x5c000001 },
+  { 0x0900ffe8, 0x68000000 },
+  { 0x0980ffe9, 0x64000003 },
+  { 0x0980ffed, 0x68000001 },
+  { 0x0980fff9, 0x04000002 },
+  { 0x0980fffc, 0x68000001 },
+  { 0x23810000, 0x1c00000b },
+  { 0x2381000d, 0x1c000019 },
+  { 0x23810028, 0x1c000012 },
+  { 0x2381003c, 0x1c000001 },
+  { 0x2381003f, 0x1c00000e },
+  { 0x23810050, 0x1c00000d },
+  { 0x23810080, 0x1c00007a },
+  { 0x09810100, 0x54000001 },
+  { 0x09010102, 0x68000000 },
+  { 0x09810107, 0x3c00002c },
+  { 0x09810137, 0x68000008 },
+  { 0x13810140, 0x38000034 },
+  { 0x13810175, 0x3c000003 },
+  { 0x13810179, 0x68000010 },
+  { 0x1301018a, 0x3c000000 },
+  { 0x29810300, 0x1c00001e },
+  { 0x29810320, 0x3c000003 },
+  { 0x12810330, 0x1c000010 },
+  { 0x12010341, 0x38000000 },
+  { 0x12810342, 0x1c000007 },
+  { 0x1201034a, 0x38000000 },
+  { 0x3b810380, 0x1c00001d },
+  { 0x3b01039f, 0x54000000 },
+  { 0x2a8103a0, 0x1c000023 },
+  { 0x2a8103c8, 0x1c000007 },
+  { 0x2a0103d0, 0x54000000 },
+  { 0x2a8103d1, 0x38000004 },
+  { 0x0d010400, 0x24000028 },
+  { 0x0d010401, 0x24000028 },
+  { 0x0d010402, 0x24000028 },
+  { 0x0d010403, 0x24000028 },
+  { 0x0d010404, 0x24000028 },
+  { 0x0d010405, 0x24000028 },
+  { 0x0d010406, 0x24000028 },
+  { 0x0d010407, 0x24000028 },
+  { 0x0d010408, 0x24000028 },
+  { 0x0d010409, 0x24000028 },
+  { 0x0d01040a, 0x24000028 },
+  { 0x0d01040b, 0x24000028 },
+  { 0x0d01040c, 0x24000028 },
+  { 0x0d01040d, 0x24000028 },
+  { 0x0d01040e, 0x24000028 },
+  { 0x0d01040f, 0x24000028 },
+  { 0x0d010410, 0x24000028 },
+  { 0x0d010411, 0x24000028 },
+  { 0x0d010412, 0x24000028 },
+  { 0x0d010413, 0x24000028 },
+  { 0x0d010414, 0x24000028 },
+  { 0x0d010415, 0x24000028 },
+  { 0x0d010416, 0x24000028 },
+  { 0x0d010417, 0x24000028 },
+  { 0x0d010418, 0x24000028 },
+  { 0x0d010419, 0x24000028 },
+  { 0x0d01041a, 0x24000028 },
+  { 0x0d01041b, 0x24000028 },
+  { 0x0d01041c, 0x24000028 },
+  { 0x0d01041d, 0x24000028 },
+  { 0x0d01041e, 0x24000028 },
+  { 0x0d01041f, 0x24000028 },
+  { 0x0d010420, 0x24000028 },
+  { 0x0d010421, 0x24000028 },
+  { 0x0d010422, 0x24000028 },
+  { 0x0d010423, 0x24000028 },
+  { 0x0d010424, 0x24000028 },
+  { 0x0d010425, 0x24000028 },
+  { 0x0d010426, 0x24000028 },
+  { 0x0d010427, 0x24000028 },
+  { 0x0d010428, 0x1400ffd8 },
+  { 0x0d010429, 0x1400ffd8 },
+  { 0x0d01042a, 0x1400ffd8 },
+  { 0x0d01042b, 0x1400ffd8 },
+  { 0x0d01042c, 0x1400ffd8 },
+  { 0x0d01042d, 0x1400ffd8 },
+  { 0x0d01042e, 0x1400ffd8 },
+  { 0x0d01042f, 0x1400ffd8 },
+  { 0x0d010430, 0x1400ffd8 },
+  { 0x0d010431, 0x1400ffd8 },
+  { 0x0d010432, 0x1400ffd8 },
+  { 0x0d010433, 0x1400ffd8 },
+  { 0x0d010434, 0x1400ffd8 },
+  { 0x0d010435, 0x1400ffd8 },
+  { 0x0d010436, 0x1400ffd8 },
+  { 0x0d010437, 0x1400ffd8 },
+  { 0x0d010438, 0x1400ffd8 },
+  { 0x0d010439, 0x1400ffd8 },
+  { 0x0d01043a, 0x1400ffd8 },
+  { 0x0d01043b, 0x1400ffd8 },
+  { 0x0d01043c, 0x1400ffd8 },
+  { 0x0d01043d, 0x1400ffd8 },
+  { 0x0d01043e, 0x1400ffd8 },
+  { 0x0d01043f, 0x1400ffd8 },
+  { 0x0d010440, 0x1400ffd8 },
+  { 0x0d010441, 0x1400ffd8 },
+  { 0x0d010442, 0x1400ffd8 },
+  { 0x0d010443, 0x1400ffd8 },
+  { 0x0d010444, 0x1400ffd8 },
+  { 0x0d010445, 0x1400ffd8 },
+  { 0x0d010446, 0x1400ffd8 },
+  { 0x0d010447, 0x1400ffd8 },
+  { 0x0d010448, 0x1400ffd8 },
+  { 0x0d010449, 0x1400ffd8 },
+  { 0x0d01044a, 0x1400ffd8 },
+  { 0x0d01044b, 0x1400ffd8 },
+  { 0x0d01044c, 0x1400ffd8 },
+  { 0x0d01044d, 0x1400ffd8 },
+  { 0x0d01044e, 0x1400ffd8 },
+  { 0x0d01044f, 0x1400ffd8 },
+  { 0x2e810450, 0x1c00002f },
+  { 0x2c810480, 0x1c00001d },
+  { 0x2c8104a0, 0x34000009 },
+  { 0x0b810800, 0x1c000005 },
+  { 0x0b010808, 0x1c000000 },
+  { 0x0b81080a, 0x1c00002b },
+  { 0x0b810837, 0x1c000001 },
+  { 0x0b01083c, 0x1c000000 },
+  { 0x0b01083f, 0x1c000000 },
+  { 0x41810900, 0x1c000015 },
+  { 0x41810916, 0x3c000003 },
+  { 0x4101091f, 0x54000000 },
+  { 0x1e010a00, 0x1c000000 },
+  { 0x1e810a01, 0x30000002 },
+  { 0x1e810a05, 0x30000001 },
+  { 0x1e810a0c, 0x30000003 },
+  { 0x1e810a10, 0x1c000003 },
+  { 0x1e810a15, 0x1c000002 },
+  { 0x1e810a19, 0x1c00001a },
+  { 0x1e810a38, 0x30000002 },
+  { 0x1e010a3f, 0x30000000 },
+  { 0x1e810a40, 0x3c000007 },
+  { 0x1e810a50, 0x54000008 },
+  { 0x3e812000, 0x1c00036e },
+  { 0x3e812400, 0x38000062 },
+  { 0x3e812470, 0x54000003 },
+  { 0x0981d000, 0x680000f5 },
+  { 0x0981d100, 0x68000026 },
+  { 0x0981d12a, 0x6800003a },
+  { 0x0981d165, 0x28000001 },
+  { 0x1b81d167, 0x30000002 },
+  { 0x0981d16a, 0x68000002 },
+  { 0x0981d16d, 0x28000005 },
+  { 0x0981d173, 0x04000007 },
+  { 0x1b81d17b, 0x30000007 },
+  { 0x0981d183, 0x68000001 },
+  { 0x1b81d185, 0x30000006 },
+  { 0x0981d18c, 0x6800001d },
+  { 0x1b81d1aa, 0x30000003 },
+  { 0x0981d1ae, 0x6800002f },
+  { 0x1381d200, 0x68000041 },
+  { 0x1381d242, 0x30000002 },
+  { 0x1301d245, 0x68000000 },
+  { 0x0981d300, 0x68000056 },
+  { 0x0981d360, 0x3c000011 },
+  { 0x0981d400, 0x24000019 },
+  { 0x0981d41a, 0x14000019 },
+  { 0x0981d434, 0x24000019 },
+  { 0x0981d44e, 0x14000006 },
+  { 0x0981d456, 0x14000011 },
+  { 0x0981d468, 0x24000019 },
+  { 0x0981d482, 0x14000019 },
+  { 0x0901d49c, 0x24000000 },
+  { 0x0981d49e, 0x24000001 },
+  { 0x0901d4a2, 0x24000000 },
+  { 0x0981d4a5, 0x24000001 },
+  { 0x0981d4a9, 0x24000003 },
+  { 0x0981d4ae, 0x24000007 },
+  { 0x0981d4b6, 0x14000003 },
+  { 0x0901d4bb, 0x14000000 },
+  { 0x0981d4bd, 0x14000006 },
+  { 0x0981d4c5, 0x1400000a },
+  { 0x0981d4d0, 0x24000019 },
+  { 0x0981d4ea, 0x14000019 },
+  { 0x0981d504, 0x24000001 },
+  { 0x0981d507, 0x24000003 },
+  { 0x0981d50d, 0x24000007 },
+  { 0x0981d516, 0x24000006 },
+  { 0x0981d51e, 0x14000019 },
+  { 0x0981d538, 0x24000001 },
+  { 0x0981d53b, 0x24000003 },
+  { 0x0981d540, 0x24000004 },
+  { 0x0901d546, 0x24000000 },
+  { 0x0981d54a, 0x24000006 },
+  { 0x0981d552, 0x14000019 },
+  { 0x0981d56c, 0x24000019 },
+  { 0x0981d586, 0x14000019 },
+  { 0x0981d5a0, 0x24000019 },
+  { 0x0981d5ba, 0x14000019 },
+  { 0x0981d5d4, 0x24000019 },
+  { 0x0981d5ee, 0x14000019 },
+  { 0x0981d608, 0x24000019 },
+  { 0x0981d622, 0x14000019 },
+  { 0x0981d63c, 0x24000019 },
+  { 0x0981d656, 0x14000019 },
+  { 0x0981d670, 0x24000019 },
+  { 0x0981d68a, 0x1400001b },
+  { 0x0981d6a8, 0x24000018 },
+  { 0x0901d6c1, 0x64000000 },
+  { 0x0981d6c2, 0x14000018 },
+  { 0x0901d6db, 0x64000000 },
+  { 0x0981d6dc, 0x14000005 },
+  { 0x0981d6e2, 0x24000018 },
+  { 0x0901d6fb, 0x64000000 },
+  { 0x0981d6fc, 0x14000018 },
+  { 0x0901d715, 0x64000000 },
+  { 0x0981d716, 0x14000005 },
+  { 0x0981d71c, 0x24000018 },
+  { 0x0901d735, 0x64000000 },
+  { 0x0981d736, 0x14000018 },
+  { 0x0901d74f, 0x64000000 },
+  { 0x0981d750, 0x14000005 },
+  { 0x0981d756, 0x24000018 },
+  { 0x0901d76f, 0x64000000 },
+  { 0x0981d770, 0x14000018 },
+  { 0x0901d789, 0x64000000 },
+  { 0x0981d78a, 0x14000005 },
+  { 0x0981d790, 0x24000018 },
+  { 0x0901d7a9, 0x64000000 },
+  { 0x0981d7aa, 0x14000018 },
+  { 0x0901d7c3, 0x64000000 },
+  { 0x0981d7c4, 0x14000005 },
+  { 0x0901d7ca, 0x24000000 },
+  { 0x0901d7cb, 0x14000000 },
+  { 0x0981d7ce, 0x34000031 },
+  { 0x16820000, 0x1c00a6d6 },
+  { 0x1682f800, 0x1c00021d },
+  { 0x090e0001, 0x04000000 },
+  { 0x098e0020, 0x0400005f },
+  { 0x1b8e0100, 0x300000ef },
+  { 0x098f0000, 0x0c00fffd },
+  { 0x09900000, 0x0c00fffd },
+};
diff --git a/uppsrc/plugin/pcre/pcre.upp b/uppsrc/plugin/pcre/pcre.upp
new file mode 100644
index 000000000..bdb5d5ff8
--- /dev/null
+++ b/uppsrc/plugin/pcre/pcre.upp
@@ -0,0 +1,37 @@
+options
+	"-DSUPPORT_UTF8 -DSUPPORT_UCP -DHAVE_CONFIG_H",
+	-Ilib;
+
+options(GCC) -DPCRE_STATIC;
+
+file
+	Pcre.h,
+	RegExp.h,
+	RegExp.cpp,
+	PCRE readonly separator,
+	lib\config.h,
+	lib\pcre.h,
+	lib\pcre_chartables.c,
+	lib\pcre_compile.c,
+	lib\pcre_config.c,
+	lib\pcre_dfa_exec.c,
+	lib\pcre_exec.c,
+	lib\pcre_fullinfo.c,
+	lib\pcre_get.c,
+	lib\pcre_globals.c,
+	lib\pcre_info.c,
+	lib\pcre_internal.h,
+	lib\pcre_maketables.c,
+	lib\pcre_newline.c,
+	lib\pcre_ord2utf8.c,
+	lib\pcre_refcount.c,
+	lib\pcre_study.c,
+	lib\pcre_tables.c,
+	lib\pcre_try_flipped.c,
+	lib\pcre_ucp_searchfuncs.c,
+	lib\pcre_valid_utf8.c,
+	lib\pcre_version.c,
+	lib\pcre_xclass.c,
+	lib\ucp.h,
+	lib\ucpinternal.h,
+	lib\ucptable.h;
diff --git a/uppsrc/plugin/pcx/init b/uppsrc/plugin/pcx/init
new file mode 100644
index 000000000..2e8ecac30
--- /dev/null
+++ b/uppsrc/plugin/pcx/init
@@ -0,0 +1,4 @@
+#ifndef _plugin_pcx_icpp_init_stub
+#define _plugin_pcx_icpp_init_stub
+#include "pcxreg.icpp"
+#endif
diff --git a/uppsrc/plugin/pcx/pcx.cpp b/uppsrc/plugin/pcx/pcx.cpp
new file mode 100644
index 000000000..d3c22243d
--- /dev/null
+++ b/uppsrc/plugin/pcx/pcx.cpp
@@ -0,0 +1,181 @@
+#include "pcx.h"
+
+NAMESPACE_UPP
+
+static Size GetDotSize(Size pixel_size, int xpm, int ypm)
+{
+	if(!xpm || !ypm)
+		return Size(0, 0);
+	static const double DOTS_PER_METER = 60000 / 2.54;
+	return Size(fround(pixel_size.cx * DOTS_PER_METER / xpm), fround(pixel_size.cy * DOTS_PER_METER / ypm));
+}
+
+int sFd(int x)
+{
+	return x > 0 ? x : 120;
+}
+
+bool PCXRaster::Create()
+{
+	Stream& stream = GetStream();
+	size = Size(0, 0);
+	if(!stream.IsOpen()) {
+		SetError();
+		return false;
+	}
+	ASSERT(stream.IsLoading());
+
+	if(!stream.GetAll(&header, sizeof(PCXHeader))) {
+		SetError();
+		return false;
+	}
+	header.SwapEndian();
+	if(header.manufacturer != 10) {
+		SetError();
+		return false;
+	}
+
+	if(header.bitsPerPixel == 8 && header.planes == 3)
+		fmt.Set24le(0x0000ff, 0x00ff00, 0xff0000);
+	else
+	if(header.bitsPerPixel == 1 || header.bitsPerPixel == 4 || header.bitsPerPixel == 8)
+		fmt.Set8();
+	else {
+		SetError();
+		return false;
+	}
+	size = Size(header.maxX - header.minX + 1, header.maxY - header.minY + 1);
+	info.kind = IMAGE_OPAQUE;
+	info.bpp = header.bitsPerPixel;
+	info.dots = Size(size.cx * 600 / sFd(header.horzDpi), size.cy * 600 / sFd(header.vertDpi));
+	info.hotspot = Point(0, 0);
+	info.colors = fmt.GetColorCount();
+	int colors = 1 << (header.planes * header.bitsPerPixel);
+	palette.Alloc(colors);
+	if(colors <= 16)
+		for(int i = 0; i < colors; i++) {
+			palette[i].r = header.palette[i].r;
+			palette[i].g = header.palette[i].g;
+			palette[i].b = header.palette[i].b;
+			palette[i].a = 255;
+		}
+	else {
+		if(stream.GetLeft() < 768) {
+			SetError();
+			return false;
+		}
+		stream.SeekEnd(-768);
+		for(int i = 0; i < 256; i++) {
+			palette[i].r = stream.Get();
+			palette[i].g = stream.Get();
+			palette[i].b = stream.Get();
+			palette[i].a = 255;
+		}
+		stream.Seek(sizeof(PCXHeader));
+	}
+
+	row_bytes = fmt.GetByteCount(size.cx);
+	scanline.Alloc(row_bytes);
+	buffer.Alloc(header.bytesPerLine * header.planes);
+	return true;
+}
+
+Size PCXRaster::GetSize()
+{
+	return size;
+}
+
+Raster::Info PCXRaster::GetInfo()
+{
+	return info;
+}
+
+Raster::Line PCXRaster::GetLine(int line)
+{
+	Stream& stream = GetStream();
+	byte *ptr = new byte[row_bytes];
+	if(!IsError()) {
+		byte *t = buffer;
+		byte *e = buffer + header.bytesPerLine * header.planes;
+		while(t < e) {
+			byte b = stream.Get();
+			if((b & 0xc0) == 0xc0) {
+				int n = b & 0x3f;
+				if(t + n > e)
+					break;
+				memset(t, stream.Get(), n);
+				t += n;
+			}
+			else
+				*t++ = b;
+		}
+		byte *bs = buffer;
+		t = ptr;
+		e = ptr + row_bytes;
+		if(header.bitsPerPixel == 1)
+			for(int i = 0; i < header.bytesPerLine; i++) {
+				byte h[8];
+				memset(h, 0, 8);
+				byte *s = bs;
+				for(int plane = 0; plane < header.planes; plane++) {
+					byte sb = *s;
+					byte bit = 1 << plane;
+					for(int j = 0; j < 8; j++)
+						if(sb & (0x80 >> j))
+							h[j] |= bit;
+					s += header.bytesPerLine;
+				}
+				for(int q = 0; q < 8; q++) {
+					if(t >= e)
+						break;
+					*t++ = h[q];
+				}
+				bs++;
+			}
+		else
+		if(header.bitsPerPixel == 8 && header.planes == 3) {
+			for(int i = 0; i < size.cx; i++) {
+				*t++ = buffer[i];
+				*t++ = buffer[i + header.bytesPerLine];
+				*t++ = buffer[i + 2 * header.bytesPerLine];
+			}
+		}
+		else
+		if(header.bitsPerPixel == 4) {
+			for(;;) {
+				if(t >= e) break;
+				byte b = *bs++;
+				*t++ = (b & 0xf0) >> 4;
+				if(t >= e) break;
+				*t++ = b & 0x0f;
+			}
+		}
+		else
+		if(header.bitsPerPixel == 8)
+			memcpy(t, bs, row_bytes);
+		else
+			goto error;
+		return Line(ptr, this, true);
+	}
+error:
+	SetError();
+	memset(ptr, 0, row_bytes);
+	return Line(ptr, this, true);
+}
+
+int PCXRaster::GetPaletteCount()
+{
+	return fmt.GetPaletteCount();
+}
+
+RGBA *PCXRaster::GetPalette()
+{
+	return fmt.GetPaletteCount() ? ~palette : NULL;
+}
+
+const RasterFormat *PCXRaster::GetFormat()
+{
+	return &fmt;
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/plugin/pcx/pcx.h b/uppsrc/plugin/pcx/pcx.h
new file mode 100644
index 000000000..fea7087c0
--- /dev/null
+++ b/uppsrc/plugin/pcx/pcx.h
@@ -0,0 +1,33 @@
+#ifndef _plugin_pcx_pcx_h_
+#define _plugin_pcx_pcx_h_
+
+#include <Draw/Draw.h>
+
+NAMESPACE_UPP
+
+#include "pcxhdr.h"
+
+class PCXRaster : public StreamRaster {
+	PCXHeader        header;
+	Size             size;
+	int              row_bytes;
+	Buffer<RGBA>     palette;
+	Buffer<byte>     scanline;
+	Buffer<byte>     buffer;
+	RasterFormat     fmt;
+	Raster::Info     info;
+	One<ImageRaster> rle;
+
+public:
+	virtual bool    Create();
+	virtual Info    GetInfo();
+	virtual Size    GetSize();
+	virtual Line    GetLine(int line);
+	virtual int     GetPaletteCount();
+	virtual RGBA   *GetPalette();
+	virtual const RasterFormat *GetFormat();
+};
+
+END_UPP_NAMESPACE
+
+#endif
diff --git a/uppsrc/plugin/pcx/pcx.upp b/uppsrc/plugin/pcx/pcx.upp
new file mode 100644
index 000000000..98d2c9bc2
--- /dev/null
+++ b/uppsrc/plugin/pcx/pcx.upp
@@ -0,0 +1,5 @@
+file
+	pcx.h,
+	pcxhdr.h,
+	pcx.cpp,
+	pcxreg.icpp;
diff --git a/uppsrc/plugin/pcx/pcxhdr.h b/uppsrc/plugin/pcx/pcxhdr.h
new file mode 100644
index 000000000..d1490b15a
--- /dev/null
+++ b/uppsrc/plugin/pcx/pcxhdr.h
@@ -0,0 +1,67 @@
+#ifndef _plugin_pcx_pcxhdr_h_
+#define _plugin_pcx_pcxhdr_h_
+
+#ifdef COMPILER_MSC
+#pragma pack(push, 1)
+#endif
+
+struct PCXRGB {
+	byte r, g, b;
+}
+#ifdef COMPILER_GCC
+__attribute__((packed))
+#endif
+;
+
+struct PCXHeader {
+	byte    manufacturer;  // 10 == ZSoft
+	byte    version;       // 0 = Paintbrush 2.5
+	                       // 2 = 2.8 with palette
+	                       // 3 = 2.8 without palette
+	                       // 4 = PC Paintbrush for Windows
+	                       // 5 = Version 3.0+ and Publishers Paintbrush */
+	byte    encode;        // 1 = PCX RLE
+	byte    bitsPerPixel;  // 1, 2, 4, or 8
+	short   minX;
+	short   minY;
+	short   maxX;
+	short   maxY;
+	short   horzDpi;
+	short   vertDpi;
+	PCXRGB  palette[16];
+	byte    junk;
+	byte    planes;
+	short   bytesPerLine;
+	short   paltype;
+	short   hScreenSize;
+	short   vScreenSize;
+	byte	filler[54];
+
+	void    SwapEndian()
+	{
+#ifdef CPU_BIG_ENDIAN
+		biSize = UPP::SwapEndian(biSize);
+		biWidth = UPP::SwapEndian(biWidth);
+		biHeight = UPP::SwapEndian(biHeight);
+		biPlanes = UPP::SwapEndian(biPlanes);
+		biBitCount = UPP::SwapEndian(biBitCount);
+		biCompression = UPP::SwapEndian(biCompression);
+		biSizeImage = UPP::SwapEndian(biSizeImage);
+		biXPelsPerMeter = UPP::SwapEndian(biXPelsPerMeter);
+		biYPelsPerMeter = UPP::SwapEndian(biYPelsPerMeter);
+		biClrUsed = UPP::SwapEndian(biClrUsed);
+		biClrImportant = UPP::SwapEndian(biClrImportant);
+#endif
+	}
+
+}
+#ifdef COMPILER_GCC
+__attribute__((packed))
+#endif
+;
+
+#ifdef COMPILER_MSC
+#pragma pack(pop)
+#endif
+
+#endif
diff --git a/uppsrc/plugin/pcx/pcxreg.icpp b/uppsrc/plugin/pcx/pcxreg.icpp
new file mode 100644
index 000000000..82459384e
--- /dev/null
+++ b/uppsrc/plugin/pcx/pcxreg.icpp
@@ -0,0 +1,9 @@
+#include "pcx.h"
+
+NAMESPACE_UPP
+
+INITBLOCK {
+	StreamRaster::Register<PCXRaster>();
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/plugin/png/init b/uppsrc/plugin/png/init
new file mode 100644
index 000000000..00baea3c9
--- /dev/null
+++ b/uppsrc/plugin/png/init
@@ -0,0 +1,5 @@
+#ifndef _plugin_png_icpp_init_stub
+#define _plugin_png_icpp_init_stub
+#include "Core/init"
+#include "pngreg.icpp"
+#endif
diff --git a/uppsrc/plugin/png/lib/CHANGES b/uppsrc/plugin/png/lib/CHANGES
new file mode 100644
index 000000000..032de76c6
--- /dev/null
+++ b/uppsrc/plugin/png/lib/CHANGES
@@ -0,0 +1,1995 @@
+
+CHANGES - changes for libpng
+
+version 0.2
+  added reader into png.h
+  fixed small problems in stub file
+
+version 0.3
+  added pull reader
+  split up pngwrite.c to several files
+  added pnglib.txt
+  added example.c
+  cleaned up writer, adding a few new transformations
+  fixed some bugs in writer
+  interfaced with zlib 0.5
+  added K&R support
+  added check for 64 KB blocks for 16 bit machines
+
+version 0.4
+  cleaned up code and commented code
+  simplified time handling into png_time
+  created png_color_16 and png_color_8 to handle color needs
+  cleaned up color type defines
+  fixed various bugs
+  made various names more consistent
+  interfaced with zlib 0.71
+  cleaned up zTXt reader and writer (using zlib's Reset functions)
+  split transformations into pngrtran.c and pngwtran.c
+
+version 0.5
+  interfaced with zlib 0.8
+  fixed many reading and writing bugs
+  saved using 3 spaces instead of tabs
+
+version 0.6
+  added png_large_malloc() and png_large_free()
+  added png_size_t
+  cleaned up some compiler warnings
+  added png_start_read_image()
+
+version 0.7
+  cleaned up lots of bugs
+  finished dithering and other stuff
+  added test program
+  changed name from pnglib to libpng
+
+version 0.71 [June, 1995]
+  changed pngtest.png for zlib 0.93
+  fixed error in libpng.txt and example.c
+
+version 0.8
+  cleaned up some bugs
+  added png_set_filler()
+  split up pngstub.c into pngmem.c, pngio.c, and pngerror.c
+  added #define's to remove unwanted code
+  moved png_info_init() to png.c
+  added old_size into png_realloc()
+  added functions to manually set filtering and compression info
+  changed compression parameters based on image type
+  optimized filter selection code
+  added version info
+  changed external functions passing floats to doubles (k&r problems?)
+  put all the configurable stuff in pngconf.h
+  enabled png_set_shift to work with paletted images on read
+  added png_read_update_info() - updates info structure with
+     transformations
+
+version 0.81 [August, 1995]
+  incorporated Tim Wegner's medium model code (thanks, Tim)
+
+version 0.82 [September, 1995]
+  [unspecified changes]
+
+version 0.85 [December, 1995]
+  added more medium model code (almost everything's a far)
+  added i/o, error, and memory callback functions
+  fixed some bugs (16 bit, 4 bit interlaced, etc.)
+  added first run progressive reader (barely tested)
+
+version 0.86 [January, 1996]
+  fixed bugs
+  improved documentation
+
+version 0.87 [January, 1996]
+  fixed medium model bugs
+  fixed other bugs introduced in 0.85 and 0.86
+  added some minor documentation
+
+version 0.88 [January, 1996]
+  fixed progressive bugs
+  replaced tabs with spaces
+  cleaned up documentation
+  added callbacks for read/write and warning/error functions
+
+version 0.89 [July, 1996]
+  added new initialization API to make libpng work better with shared libs
+     we now have png_create_read_struct(), png_create_write_struct(),
+     png_create_info_struct(), png_destroy_read_struct(), and
+     png_destroy_write_struct() instead of the separate calls to
+     malloc and png_read_init(), png_info_init(), and png_write_init()
+  changed warning/error callback functions to fix bug - this means you
+     should use the new initialization API if you were using the old
+     png_set_message_fn() calls, and that the old API no longer exists
+     so that people are aware that they need to change their code
+  changed filter selection API to allow selection of multiple filters
+     since it didn't work in previous versions of libpng anyways
+  optimized filter selection code
+  fixed png_set_background() to allow using an arbitrary RGB color for
+     paletted images
+  fixed gamma and background correction for paletted images, so
+     png_correct_palette is not needed unless you are correcting an
+     external palette (you will need to #define PNG_CORRECT_PALETTE_SUPPORTED
+     in pngconf.h) - if nobody uses this, it may disappear in the future.
+  fixed bug with Borland 64K memory allocation (Alexander Lehmann)
+  fixed bug in interlace handling (Smarasderagd, I think)
+  added more error checking for writing and image to reduce invalid files
+  separated read and write functions so that they won't both be linked
+     into a binary when only reading or writing functionality is used
+  new pngtest image also has interlacing and zTXt
+  updated documentation to reflect new API
+
+version 0.90 [January, 1997]
+  made CRC errors/warnings on critical and ancillary chunks configurable
+  libpng will use the zlib CRC routines by (compile-time) default
+  changed DOS small/medium model memory support - needs zlib 1.04 (Tim Wegner)
+  added external C++ wrapper statements to png.h (Gilles Dauphin)
+  allow PNG file to be read when some or all of file signature has already
+     been read from the beginning of the stream.  ****This affects the size
+     of info_struct and invalidates all programs that use a shared libpng****
+  fixed png_filler() declarations
+  fixed? background color conversions
+  fixed order of error function pointers to match documentation
+  current chunk name is now available in png_struct to reduce the number
+     of nearly identical error messages (will simplify multi-lingual
+     support when available)
+  try to get ready for unknown-chunk callback functions:
+     - previously read critical chunks are flagged, so the chunk handling
+       routines can determine if the chunk is in the right place
+     - all chunk handling routines have the same prototypes, so we will
+       be able to handle all chunks via a callback mechanism
+  try to fix Linux "setjmp" buffer size problems
+  removed png_large_malloc, png_large_free, and png_realloc functions.
+
+version 0.95 [March, 1997]
+  fixed bug in pngwutil.c allocating "up_row" twice and "avg_row" never
+  fixed bug in PNG file signature compares when start != 0
+  changed parameter type of png_set_filler(...filler...) from png_byte
+     to png_uint_32
+  added test for MACOS to ensure that both math.h and fp.h are not #included
+  added macros for libpng to be compiled as a Windows DLL (Andreas Kupries)
+  added "packswap" transformation, which changes the endianness of
+     packed-pixel bytes (Kevin Bracey)
+  added "strip_alpha" transformation, which removes the alpha channel of
+     input images without using it (not necessarily a good idea)
+  added "swap_alpha" transformation, which puts the alpha channel in front
+     of the color bytes instead of after
+  removed all implicit variable tests which assume NULL == 0 (I think)
+  changed several variables to "png_size_t" to show 16/32-bit limitations
+  added new pCAL chunk read/write support
+  added experimental filter selection weighting (Greg Roelofs)
+  removed old png_set_rgbx() and png_set_xrgb() functions that have been
+     obsolete for about 2 years now (use png_set_filler() instead)
+  added macros to read 16- and 32-bit ints directly from buffer, to be
+     used only on those systems that support it (namely PowerPC and 680x0)
+     With some testing, this may become the default for MACOS/PPC systems.
+  only calculate CRC on data if we are going to use it
+  added macros for zTXt compression type PNG_zTXt_COMPRESSION_???
+  added macros for simple libpng debugging output selectable at compile time
+  removed PNG_READ_END_MODE in progressive reader (Smarasderagd)
+  more description of info_struct in libpng.txt and png.h
+  more instructions in example.c
+  more chunk types tested in pngtest.c
+  renamed pngrcb.c to pngset.c, and all png_read_<chunk> functions to be
+     png_set_<chunk>.  We now have corresponding png_get_<chunk>
+     functions in pngget.c to get information in info_ptr.  This isolates
+     the application from the internal organization of png_info_struct
+     (good for shared library implementations).
+
+version 0.96 [May, 1997]
+  fixed serious bug with < 8bpp images introduced in 0.95
+  fixed 256-color transparency bug (Greg Roelofs)
+  fixed up documentation (Greg Roelofs, Laszlo Nyul)
+  fixed "error" in pngconf.h for Linux setjmp() behaviour
+  fixed DOS medium model support (Tim Wegner)
+  fixed png_check_keyword() for case with error in static string text
+  added read of CRC after IEND chunk for embedded PNGs (Laszlo Nyul)
+  added typecasts to quiet compiler errors
+  added more debugging info
+
+version 0.97 [January, 1998]
+  removed PNG_USE_OWN_CRC capability
+  relocated png_set_crc_action from pngrutil.c to pngrtran.c
+  fixed typecasts of "new_key", etc. (Andreas Dilger)
+  added RFC 1152 [sic] date support
+  fixed bug in gamma handling of 4-bit grayscale
+  added 2-bit grayscale gamma handling (Glenn R-P)
+  added more typecasts. 65536L becomes (png_uint_32)65536L, etc. (Glenn R-P)
+  minor corrections in libpng.txt
+  added simple sRGB support (Glenn R-P)
+  easier conditional compiling, e.g. define PNG_READ/WRITE_NOT_FULLY_SUPPORTED;
+     all configurable options can be selected from command-line instead
+     of having to edit pngconf.h (Glenn R-P)
+  fixed memory leak in pngwrite.c (free info_ptr->text) (Glenn R-P)
+  added more conditions for png_do_background, to avoid changing
+     black pixels to background when a background is supplied and
+     no pixels are transparent
+  repaired PNG_NO_STDIO behaviour
+  tested NODIV support and made it default behaviour (Greg Roelofs)
+  added "-m" option and PNGTEST_DEBUG_MEMORY to pngtest (John Bowler)
+  regularized version numbering scheme and bumped shared-library major
+     version number to 2 to avoid problems with libpng 0.89 apps (Greg Roelofs)
+
+version 0.98 [January, 1998]
+  cleaned up some typos in libpng.txt and in code documentation
+  fixed memory leaks in pCAL chunk processing (Glenn R-P and John Bowler)
+  cosmetic change "display_gamma" to "screen_gamma" in pngrtran.c
+  changed recommendation about file_gamma for PC images to .51 from .45,
+     in example.c and libpng.txt, added comments to distinguish between
+     screen_gamma, viewing_gamma, and display_gamma.
+  changed all references to RFC1152 to read RFC1123 and changed the
+     PNG_TIME_RFC1152_SUPPORTED macro to PNG_TIME_RFC1123_SUPPORTED
+  added png_invert_alpha capability (Glenn R-P -- suggestion by Jon Vincent)
+  changed srgb_intent from png_byte to int to avoid compiler bugs
+
+version 0.99 [January 30, 1998]
+  free info_ptr->text instead of end_info_ptr->text in pngread.c (John Bowler)
+  fixed a longstanding "packswap" bug in pngtrans.c
+  fixed some inconsistencies in pngconf.h that prevented compiling with
+     PNG_READ_GAMMA_SUPPORTED and PNG_READ_hIST_SUPPORTED undefined
+  fixed some typos and made other minor rearrangement of libpng.txt (Andreas)
+  changed recommendation about file_gamma for PC images to .50 from .51 in
+     example.c and libpng.txt, and changed file_gamma for sRGB images to .45
+  added a number of functions to access information from the png structure
+     png_get_image_height(), etc. (Glenn R-P, suggestion by Brad Pettit)
+  added TARGET_MACOS similar to zlib-1.0.8
+  define PNG_ALWAYS_EXTERN when __MWERKS__ && WIN32 are defined
+  added type casting to all png_malloc() function calls
+version 0.99a [January 31, 1998]
+  Added type casts and parentheses to all returns that return a value.(Tim W.)
+version 0.99b [February 4, 1998]
+  Added type cast png_uint_32 on malloc function calls where needed.
+  Changed type of num_hist from png_uint_32 to int (same as num_palette).
+  Added checks for rowbytes overflow, in case png_size_t is less than 32 bits.
+  Renamed makefile.elf to makefile.lnx.
+version 0.99c [February 7, 1998]
+  More type casting.  Removed erroneous overflow test in pngmem.c.
+  Added png_buffered_memcpy() and png_buffered_memset(), apply them to rowbytes.
+  Added UNIX manual pages libpng.3 (incorporating libpng.txt) and  png.5.
+version 0.99d [February 11, 1998]
+  Renamed "far_to_near()" "png_far_to_near()"
+  Revised libpng.3
+  Version 99c "buffered" operations didn't work as intended.  Replaced them
+    with png_memcpy_check() and png_memset_check().
+  Added many "if (png_ptr == NULL) return" to quell compiler warnings about
+    unused png_ptr, mostly in pngget.c and pngset.c.
+  Check for overlength tRNS chunk present when indexed-color PLTE is read.
+  Cleaned up spelling errors in libpng.3/libpng.txt
+  Corrected a problem with png_get_tRNS() which returned undefined trans array
+version 0.99e [February 28, 1998]
+  Corrected png_get_tRNS() again.
+  Add parentheses for easier reading of pngget.c, fixed "||" should be "&&".
+  Touched up example.c to make more of it compileable, although the entire
+    file still can't be compiled (Willem van Schaik)
+  Fixed a bug in png_do_shift() (Bryan Tsai)
+  Added a space in png.h prototype for png_write_chunk_start()
+  Replaced pngtest.png with one created with zlib 1.1.1
+  Changed pngtest to report PASS even when file size is different (Jean-loup G.)
+  Corrected some logic errors in png_do_invert_alpha() (Chris Patterson)
+version 0.99f [March 5, 1998]
+  Corrected a bug in pngpread() introduced in version 99c (Kevin Bracey)
+  Moved makefiles into a "scripts" directory, and added INSTALL instruction file
+  Added makefile.os2 and pngos2.def (A. Zabolotny) and makefile.s2x (W. Sebok)
+  Added pointers to "note on libpng versions" in makefile.lnx and README
+  Added row callback feature when reading and writing nonprogressive rows
+     and added a test of this feature in pngtest.c
+  Added user transform callbacks, with test of the feature in pngtest.c
+version 0.99g [March 6, 1998, morning]
+  Minor changes to pngtest.c to suppress compiler warnings.
+  Removed "beta" language from documentation.
+version 0.99h [March 6, 1998, evening]
+  Minor changes to previous minor changes to pngtest.c
+  Changed PNG_READ_NOT_FULLY_SUPPORTED to PNG_READ_TRANSFORMS_NOT_SUPPORTED
+  and added PNG_PROGRESSIVE_READ_NOT_SUPPORTED macro
+  Added user transform capability
+
+version 1.00 [March 7, 1998]
+  Changed several typedefs in pngrutil.c
+  Added makefile.wat (Pawel Mrochen), updated makefile.tc3 (Willem van Schaik)
+  replaced "while(1)" with "for(;;)"
+  added PNGARG() to prototypes in pngtest.c and removed some prototypes
+  updated some of the makefiles (Tom Lane)
+  changed some typedefs (s_start, etc.) in pngrutil.c
+  fixed dimensions of "short_months" array in pngwrite.c
+  Replaced ansi2knr.c with the one from jpeg-v6
+
+version 1.0.0 [March 8, 1998]
+  Changed name from 1.00 to 1.0.0 (Adam Costello)
+  Added smakefile.ppc (with SCOPTIONS.ppc) for Amiga PPC (Andreas Kleinert)
+version 1.0.0a [March 9, 1998]
+  Fixed three bugs in pngrtran.c to make gamma+background handling consistent
+  (Greg Roelofs)
+  Changed format of the PNG_LIBPNG_VER integer to xyyzz instead of xyz
+  for major, minor, and bugfix releases.  This is 10001. (Adam Costello,
+  Tom Lane)
+  Make months range from 1-12 in png_convert_to_rfc1123
+version 1.0.0b [March 13, 1998]
+  Quieted compiler complaints about two empty "for" loops in pngrutil.c
+  Minor changes to makefile.s2x
+  Removed #ifdef/#endif around a png_free() in pngread.c
+
+version 1.0.1 [March 14, 1998]
+  Changed makefile.s2x to reduce security risk of using a relative pathname
+  Fixed some typos in the documentation (Greg).
+  Fixed a problem with value of "channels" returned by png_read_update_info()
+version 1.0.1a [April 21, 1998]
+  Optimized Paeth calculations by replacing abs() function calls with intrinsics
+  plus other loop optimizations. Improves avg decoding speed by about 20%.
+  Commented out i386istic "align" compiler flags in makefile.lnx.
+  Reduced the default warning level in some makefiles, to make them consistent.
+  Removed references to IJG and JPEG in the ansi2knr.c copyright statement.
+  Fixed a bug in png_do_strip_filler with XXRRGGBB => RRGGBB transformation.
+  Added grayscale and 16-bit capability to png_do_read_filler().
+  Fixed a bug in pngset.c, introduced in version 0.99c, that sets rowbytes
+    too large when writing an image with bit_depth < 8 (Bob Dellaca).
+  Corrected some bugs in the experimental weighted filtering heuristics.
+  Moved a misplaced pngrutil code block that truncates tRNS if it has more
+    than num_palette entries -- test was done before num_palette was defined.
+  Fixed a png_convert_to_rfc1123() bug that converts day 31 to 0 (Steve Eddins).
+  Changed compiler flags in makefile.wat for better optimization (Pawel Mrochen).
+version 1.0.1b [May 2, 1998]
+  Relocated png_do_gray_to_rgb() within png_do_read_transformations() (Greg).
+  Relocated the png_composite macros from pngrtran.c to png.h (Greg).
+  Added makefile.sco (contributed by Mike Hopkirk).
+  Fixed two bugs (missing definitions of "istop") introduced in libpng-1.0.1a.
+  Fixed a bug in pngrtran.c that would set channels=5 under some circumstances.
+  More work on the Paeth-filtering, achieving imperceptible speedup (A Kleinert).
+  More work on loop optimization which may help when compiled with C++ compilers.
+  Added warnings when people try to use transforms they've defined out.
+  Collapsed 4 "i" and "c" loops into single "i" loops in pngrtran and pngwtran.
+  Revised paragraph about png_set_expand() in libpng.txt and libpng.3 (Greg)
+version 1.0.1c [May 11, 1998]
+  Fixed a bug in pngrtran.c (introduced in libpng-1.0.1a) where the masks for
+    filler bytes should have been 0xff instead of 0xf.
+  Added max_pixel_depth=32 in pngrutil.c when using FILLER with palette images.
+  Moved PNG_WRITE_WEIGHTED_FILTER_SUPPORTED and PNG_WRITE_FLUSH_SUPPORTED
+    out of the PNG_WRITE_TRANSFORMS_NOT_SUPPORTED block of pngconf.h
+  Added "PNG_NO_WRITE_TRANSFORMS" etc., as alternatives for *_NOT_SUPPORTED,
+    for consistency, in pngconf.h
+  Added individual "ifndef PNG_NO_[CAPABILITY]" in pngconf.h to make it easier
+    to remove unwanted capabilities via the compile line
+  Made some corrections to grammar (which, it's) in documentation (Greg).
+  Corrected example.c, use of row_pointers in png_write_image().
+version 1.0.1d [May 24, 1998]
+  Corrected several statements that used side effects illegally in pngrutil.c
+    and pngtrans.c, that were introduced in version 1.0.1b
+  Revised png_read_rows() to avoid repeated if-testing for NULL (A Kleinert)
+  More corrections to example.c, use of row_pointers in png_write_image()
+    and png_read_rows().
+  Added pngdll.mak and pngdef.pas to scripts directory, contributed by
+    Bob Dellaca, to make a png32bd.dll with Borland C++ 4.5
+  Fixed error in example.c with png_set_text: num_text is 3, not 2 (Guido V.)
+  Changed several loops from count-down to count-up, for consistency.
+version 1.0.1e [June 6, 1998]
+  Revised libpng.txt and libpng.3 description of png_set_read|write_fn(), and
+    added warnings when people try to set png_read_fn and png_write_fn in
+    the same structure.
+  Added a test such that png_do_gamma will be done when num_trans==0
+    for truecolor images that have defined a background.  This corrects an
+    error that was introduced in libpng-0.90 that can cause gamma processing
+    to be skipped.
+  Added tests in png.h to include "trans" and "trans_values" in structures
+    when PNG_READ_BACKGROUND_SUPPORTED or PNG_READ_EXPAND_SUPPORTED is defined.
+  Add png_free(png_ptr->time_buffer) in png_destroy_read_struct()
+  Moved png_convert_to_rfc_1123() from pngwrite.c to png.c
+  Added capability for user-provided malloc_fn() and free_fn() functions,
+    and revised pngtest.c to demonstrate their use, replacing the
+    PNGTEST_DEBUG_MEM feature.
+  Added makefile.w32, for Microsoft C++ 4.0 and later (Tim Wegner).
+
+version 1.0.2 [June 14, 1998]
+  Fixed two bugs in makefile.bor .
+version 1.0.2a [December 30, 1998]
+  Replaced and extended code that was removed from png_set_filler() in 1.0.1a.
+  Fixed a bug in png_do_filler() that made it fail to write filler bytes in
+    the left-most pixel of each row (Kevin Bracey).
+  Changed "static pngcharp tIME_string" to "static char tIME_string[30]"
+    in pngtest.c (Duncan Simpson).
+  Fixed a bug in pngtest.c that caused pngtest to try to write a tIME chunk
+    even when no tIME chunk was present in the source file.
+  Fixed a problem in pngrutil.c: gray_to_rgb didn't always work with 16-bit.
+  Fixed a problem in png_read_push_finish_row(), which would not skip some
+    passes that it should skip, for images that are less than 3 pixels high.
+  Interchanged the order of calls to png_do_swap() and png_do_shift()
+    in pngwtran.c (John Cromer).
+  Added #ifdef PNG_DEBUG/#endif surrounding use of PNG_DEBUG in png.h .
+  Changed "bad adaptive filter type" from error to warning in pngrutil.c .
+  Fixed a documentation error about default filtering with 8-bit indexed-color.
+  Separated the PNG_NO_STDIO macro into PNG_NO_STDIO and PNG_NO_CONSOLE_IO
+    (L. Peter Deutsch).
+  Added png_set_rgb_to_gray() and png_get_rgb_to_gray_status() functions.
+  Added png_get_copyright() and png_get_header_version() functions.
+  Revised comments on png_set_progressive_read_fn() in libpng.txt and example.c
+  Added information about debugging in libpng.txt and libpng.3 .
+  Changed "ln -sf" to "ln -s -f" in makefile.s2x, makefile.lnx, and makefile.sco.
+  Removed lines after Dynamic Dependencies" in makefile.aco .
+  Revised makefile.dec to make a shared library (Jeremie Petit).
+  Removed trailing blanks from all files.
+version 1.0.2a [January 6, 1999]
+  Removed misplaced #endif and #ifdef PNG_NO_EXTERN near the end of png.h
+  Added "if" tests to silence complaints about unused png_ptr in png.h and png.c
+  Changed "check_if_png" function in example.c to return true (nonzero) if PNG.
+  Changed libpng.txt to demonstrate png_sig_cmp() instead of png_check_sig()
+    which is obsolete.
+
+version 1.0.3 [January 14, 1999]
+  Added makefile.hux, for Hewlett Packard HPUX 10.20 and 11.00 (Jim Rice)
+  Added a statement of Y2K compliance in png.h, libpng.3, and Y2KINFO.
+version 1.0.3a [August 12, 1999]
+  Added check for PNG_READ_INTERLACE_SUPPORTED in pngread.c; issue a warning
+     if an attempt is made to read an interlaced image when it's not supported.
+  Added check if png_ptr->trans is defined before freeing it in pngread.c
+  Modified the Y2K statement to include versions back to version 0.71
+  Fixed a bug in the check for valid IHDR bit_depth/color_types in pngrutil.c
+  Modified makefile.wat (added -zp8 flag, ".symbolic", changed some comments)
+  Replaced leading blanks with tab characters in makefile.hux
+  Changed "dworkin.wustl.edu" to "ccrc.wustl.edu" in various documents.
+  Changed (float)red and (float)green to (double)red, (double)green
+     in png_set_rgb_to_gray() to avoid "promotion" problems in AIX.
+  Fixed a bug in pngconf.h that omitted <stdio.h> when PNG_DEBUG==0 (K Bracey).
+  Reformatted libpng.3 and libpngpf.3 with proper fonts (script by J. vanZandt).
+  Updated documentation to refer to the PNG-1.2 specification.
+  Removed ansi2knr.c and left pointers to the latest source for ansi2knr.c
+    in makefile.knr, INSTALL, and README (L. Peter Deutsch)
+  Fixed bugs in calculation of the length of rowbytes when adding alpha
+    channels to 16-bit images, in pngrtran.c (Chris Nokleberg)
+  Added function png_set_user_transform_info() to store user_transform_ptr,
+    user_depth, and user_channels into the png_struct, and a function
+    png_get_user_transform_ptr() to retrieve the pointer (Chris Nokleberg)
+  Added function png_set_empty_plte_permitted() to make libpng useable
+    in MNG applications.
+  Corrected the typedef for png_free_ptr in png.h (Jesse Jones).
+  Correct gamma with srgb is 45455 instead of 45000 in pngrutil.c, to be
+    consistent with PNG-1.2, and allow variance of 500 before complaining.
+  Added assembler code contributed by Intel in file pngvcrd.c and modified
+    makefile.w32 to use it (Nirav Chhatrapati, INTEL Corporation, Gilles Vollant)
+  Changed "ln -s -f" to "ln -f -s" in the makefiles to make Solaris happy.
+  Added some aliases for png_set_expand() in pngrtran.c, namely
+    png_set_expand_PLTE(), png_set_expand_depth(), and png_set_expand_tRNS()
+    (Greg Roelofs, in "PNG: The Definitive Guide").
+  Added makefile.beo for BEOS on X86, contributed by Sander Stok.
+version 1.0.3b [August 26, 1999]
+  Replaced 2147483647L several places with PNG_MAX_UINT macro, defined in png.h
+  Changed leading blanks to tabs in all makefiles.
+  Define PNG_USE_PNGVCRD in makefile.w32, to get MMX assembler code.
+  Made alternate versions of  png_set_expand() in pngrtran.c, namely
+    png_set_gray_1_2_4_to_8, png_set_palette_to_rgb, and png_set_tRNS_to_alpha
+    (Greg Roelofs, in "PNG: The Definitive Guide").  Deleted the 1.0.3a aliases.
+  Relocated start of 'extern "C"' block in png.h so it doesn't include pngconf.h
+  Revised calculation of num_blocks in pngmem.c to avoid a potentially
+    negative shift distance, whose results are undefined in the C language.
+  Added a check in pngset.c to prevent writing multiple tIME chunks.
+  Added a check in pngwrite.c to detect invalid small window_bits sizes.
+version 1.0.3d [September 4, 1999]
+  Fixed type casting of igamma in pngrutil.c
+  Added new png_expand functions to scripts/pngdef.pas and pngos2.def
+  Added a demo read_user_transform_fn that examines the row filters in pngtest.c
+
+version 1.0.4 [September 24, 1999]
+  Define PNG_ALWAYS_EXTERN in pngconf.h if __STDC__ is defined
+  Delete #define PNG_INTERNAL and include "png.h" from pngasmrd.h
+  Made several minor corrections to pngtest.c
+  Renamed the makefiles with longer but more user friendly extensions.
+  Copied the PNG copyright and license to a separate LICENSE file.
+  Revised documentation, png.h, and example.c to remove reference to
+    "viewing_gamma" which no longer appears in the PNG specification.
+  Revised pngvcrd.c to use MMX code for interlacing only on the final pass.
+  Updated pngvcrd.c to use the faster C filter algorithms from libpng-1.0.1a
+  Split makefile.win32vc into two versions, makefile.vcawin32 (uses MMX
+    assembler code) and makefile.vcwin32 (doesn't).
+  Added a CPU timing report to pngtest.c (enabled by defining PNGTEST_TIMING)
+  Added a copy of pngnow.png to the distribution.
+version 1.0.4a [September 25, 1999]
+  Increase max_pixel_depth in pngrutil.c if a user transform needs it.
+  Changed several division operations to right-shifts in pngvcrd.c
+version 1.0.4b [September 30, 1999]
+  Added parentheses in line 3732 of pngvcrd.c
+  Added a comment in makefile.linux warning about buggy -O3 in pgcc 2.95.1
+version 1.0.4c [October 1, 1999]
+  Added a "png_check_version" function in png.c and pngtest.c that will generate
+    a helpful compiler error if an old png.h is found in the search path.
+  Changed type of png_user_transform_depth|channels from int to png_byte.
+version 1.0.4d [October 6, 1999]
+  Changed 0.45 to 0.45455 in png_set_sRGB()
+  Removed unused PLTE entries from pngnow.png
+  Re-enabled some parts of pngvcrd.c (png_combine_row) that work properly.
+version 1.0.4e [October 10, 1999]
+  Fixed sign error in pngvcrd.c (Greg Roelofs)
+  Replaced some instances of memcpy with simple assignments in pngvcrd (GR-P)
+version 1.0.4f [October 15, 1999]
+  Surrounded example.c code with #if 0 .. #endif to prevent people from
+    inadvertently trying to compile it.
+  Changed png_get_header_version() from a function to a macro in png.h
+  Added type casting mostly in pngrtran.c and pngwtran.c
+  Removed some pointless "ptr = NULL" in pngmem.c
+  Added a "contrib" directory containing the source code from Greg's book.
+
+version 1.0.5 [October 15, 1999]
+  Minor editing of the INSTALL and README files.
+version 1.0.5a [October 23, 1999]
+  Added contrib/pngsuite and contrib/pngminus (Willem van Schaik)
+  Fixed a typo in the png_set_sRGB() function call in example.c (Jan Nijtmans)
+  Further optimization and bugfix of pngvcrd.c
+  Revised pngset.c so that it does not allocate or free memory in the user's
+    text_ptr structure.  Instead, it makes its own copy.
+  Created separate write_end_info_struct in pngtest.c for a more severe test.
+  Added code in pngwrite.c to free info_ptr->text[i].key to stop a memory leak.
+version 1.0.5b [November 23, 1999]
+  Moved PNG_FLAG_HAVE_CHUNK_HEADER, PNG_FLAG_BACKGROUND_IS_GRAY and
+    PNG_FLAG_WROTE_tIME from flags to mode.
+  Added png_write_info_before_PLTE() function.
+  Fixed some typecasting in contrib/gregbook/*.c
+  Updated scripts/makevms.com and added makevms.com to contrib/gregbook
+    and contrib/pngminus (Martin Zinser)
+version 1.0.5c [November 26, 1999]
+  Moved png_get_header_version from png.h to png.c, to accommodate ansi2knr.
+  Removed all global arrays (according to PNG_NO_GLOBAL_ARRAYS macro), to
+    accommodate making DLL's: Moved usr_png_ver from global variable to function
+    png_get_header_ver() in png.c.  Moved png_sig to png_sig_bytes in png.c and
+    eliminated use of png_sig in pngwutil.c.  Moved the various png_CHNK arrays
+    into pngtypes.h.  Eliminated use of global png_pass arrays.  Declared the
+    png_CHNK and png_pass arrays to be "const".  Made the global arrays
+    available to applications (although none are used in libpng itself) when
+    PNG_NO_GLOBAL_ARRAYS is not defined or when PNG_GLOBAL_ARRAYS is defined.
+  Removed some extraneous "-I" from contrib/pngminus/makefile.std
+  Changed the PNG_sRGB_INTENT macros in png.h to be consistent with PNG-1.2.
+  Change PNG_SRGB_INTENT to PNG_sRGB_INTENT in libpng.txt and libpng.3
+version 1.0.5d [November 29, 1999]
+  Add type cast (png_const_charp) two places in png.c
+  Eliminated pngtypes.h; use macros instead to declare PNG_CHNK arrays.
+  Renamed "PNG_GLOBAL_ARRAYS" to "PNG_USE_GLOBAL_ARRAYS" and made available
+    to applications a macro "PNG_USE_LOCAL_ARRAYS".
+  #ifdef out all the new declarations when PNG_USE_GLOBAL_ARRAYS is defined.
+  Added PNG_EXPORT_VAR macro to accommodate making DLL's.
+version 1.0.5e [November 30, 1999]
+  Added iCCP, iTXt, and sPLT support; added "lang" member to the png_text
+    structure; refactored the inflate/deflate support to make adding new chunks
+    with trailing compressed parts easier in the future, and added new functions
+    png_free_iCCP, png_free_pCAL, png_free_sPLT, png_free_text, png_get_iCCP,
+    png_get_spalettes, png_set_iCCP, png_set_spalettes (Eric S. Raymond).
+  NOTE: Applications that write text chunks MUST define png_text->lang
+    before calling png_set_text(). It must be set to NULL if you want to
+    write tEXt or zTXt chunks.  If you want your application to be able to
+    run with older versions of libpng, use
+
+      #ifdef PNG_iTXt_SUPPORTED
+         png_text[i].lang = NULL;
+      #endif
+
+  Changed png_get_oFFs() and png_set_oFFs() to use signed rather than unsigned
+    offsets (Eric S. Raymond).
+  Combined PNG_READ_cHNK_SUPPORTED and PNG_WRITE_cHNK_SUPPORTED macros into
+    PNG_cHNK_SUPPORTED and combined the three types of PNG_text_SUPPORTED
+    macros, leaving the separate macros also available.
+  Removed comments on #endifs at the end of many short, non-nested #if-blocks.
+version 1.0.5f [December 6, 1999]
+  Changed makefile.solaris to issue a warning about potential problems when
+    the ucb "ld" is in the path ahead of the ccs "ld".
+  Removed "- [date]" from the "synopsis" line in libpng.3 and libpngpf.3.
+  Added sCAL chunk support (Eric S. Raymond).
+version 1.0.5g [December 7, 1999]
+  Fixed "png_free_spallettes" typo in png.h
+  Added code to handle new chunks in pngpread.c
+  Moved PNG_CHNK string macro definitions outside of PNG_NO_EXTERN block
+  Added "translated_key" to png_text structure and png_write_iTXt().
+  Added code in pngwrite.c to work around a newly discovered zlib bug.
+version 1.0.5h [December 10, 1999]
+  NOTE: regarding the note for version 1.0.5e, the following must also
+    be included in your code:
+        png_text[i].translated_key = NULL;
+  Unknown chunk handling is now supported.
+  Option to eliminate all floating point support was added.  Some new
+    fixed-point functions such as png_set_gAMA_fixed() were added.
+  Expanded tabs and removed trailing blanks in source files.
+version 1.0.5i [December 13, 1999]
+  Added some type casts to silence compiler warnings.
+  Renamed "png_free_spalette" to "png_free_spalettes" for consistency.
+  Removed leading blanks from a #define in pngvcrd.c
+  Added some parameters to the new png_set_keep_unknown_chunks() function.
+  Added a test for up->location != 0 in the first instance of writing
+    unknown chunks in pngwrite.c
+  Changed "num" to "i" in png_free_spalettes() and png_free_unknowns() to
+    prevent recursion.
+  Added png_free_hIST() function.
+  Various patches to fix bugs in the sCAL and integer cHRM processing,
+    and to add some convenience macros for use with sCAL.
+version 1.0.5j [December 21, 1999]
+  Changed "unit" parameter of png_write_sCAL from png_byte to int, to work
+    around buggy compilers.
+  Added new type "png_fixed_point" for integers that hold float*100000 values
+  Restored backward compatibility of tEXt/zTXt chunk processing:
+    Restored the first four members of png_text to the same order as v.1.0.5d.
+    Added members "lang_key" and "itxt_length" to png_text struct.  Set
+    text_length=0 when "text" contains iTXt data.  Use the "compression"
+    member to distinguish among tEXt/zTXt/iTXt types.  Added
+    PNG_ITXT_COMPRESSION_NONE (1) and PNG_ITXT_COMPRESSION_zTXt(2) macros.
+    The "Note" above, about backward incompatibility of libpng-1.0.5e, no
+    longer applies.
+  Fixed png_read|write_iTXt() to read|write parameters in the right order,
+    and to write the iTXt chunk after IDAT if it appears in the end_ptr.
+  Added pnggccrd.c, version of pngvcrd.c Intel assembler for gcc (Greg Roelofs)
+  Reversed the order of trying to write floating-point and fixed-point gAMA.
+version 1.0.5k [December 27, 1999]
+  Added many parentheses, e.g., "if (a && b & c)" becomes "if (a && (b & c))"
+  Added png_handle_as_unknown() function (Glenn)
+  Added png_free_chunk_list() function and chunk_list and num_chunk_list members
+    of png_ptr.
+  Eliminated erroneous warnings about multiple sPLT chunks and sPLT-after-PLTE.
+  Fixed a libpng-1.0.5h bug in pngrutil.c that was issuing erroneous warnings
+    about ignoring incorrect gAMA with sRGB (gAMA was in fact not ignored)
+  Added png_free_tRNS(); png_set_tRNS() now malloc's its own trans array (ESR).
+  Define png_get_int_32 when oFFs chunk is supported as well as when pCAL is.
+  Changed type of proflen from png_int_32 to png_uint_32 in png_get_iCCP().
+version 1.0.5l [January 1, 2000]
+  Added functions png_set_read_user_chunk_fn() and png_get_user_chunk_ptr()
+    for setting a callback function to handle unknown chunks and for
+    retrieving the associated user pointer (Glenn).
+version 1.0.5m [January 7, 2000]
+  Added high-level functions png_read_png(), png_write_png(), png_free_pixels().
+version 1.0.5n [January 9, 2000]
+  Added png_free_PLTE() function, and modified png_set_PLTE() to malloc its
+    own memory for info_ptr->palette.  This makes it safe for the calling
+    application to free its copy of the palette any time after it calls
+    png_set_PLTE().
+version 1.0.5o [January 20, 2000]
+  Cosmetic changes only (removed some trailing blanks and TABs)
+version 1.0.5p [January 31, 2000]
+  Renamed pngdll.mak to makefile.bd32
+  Cosmetic changes in pngtest.c
+version 1.0.5q [February 5, 2000]
+  Relocated the makefile.solaris warning about PATH problems.
+  Fixed pngvcrd.c bug by pushing/popping registers in mmxsupport (Bruce Oberg)
+  Revised makefile.gcmmx
+  Added PNG_SETJMP_SUPPORTED, PNG_SETJMP_NOT_SUPPORTED, and PNG_ABORT() macros
+version 1.0.5r [February 7, 2000]
+  Removed superfluous prototype for png_get_itxt from png.h
+  Fixed a bug in pngrtran.c that improperly expanded the background color.
+  Return *num_text=0 from png_get_text() when appropriate, and fix documentation
+    of png_get_text() in libpng.txt/libpng.3.
+version 1.0.5s [February 18, 2000]
+  Added "png_jmp_env()" macro to pngconf.h, to help people migrate to the
+    new error handler that's planned for the next libpng release, and changed
+    example.c, pngtest.c, and contrib programs to use this macro.
+  Revised some of the DLL-export macros in pngconf.h (Greg Roelofs)
+  Fixed a bug in png_read_png() that caused it to fail to expand some images
+    that it should have expanded.
+  Fixed some mistakes in the unused and undocumented INCH_CONVERSIONS functions
+    in pngget.c
+  Changed the allocation of palette, history, and trans arrays back to
+    the version 1.0.5 method (linking instead of copying) which restores
+    backward compatibility with version 1.0.5.  Added some remarks about
+    that in example.c.  Added "free_me" member to info_ptr and png_ptr
+    and added png_free_data() function.
+  Updated makefile.linux and makefile.gccmmx to make directories conditionally.
+  Made cosmetic changes to pngasmrd.h
+  Added png_set_rows() and png_get_rows(), for use with png_read|write_png().
+  Modified png_read_png() to allocate info_ptr->row_pointers only if it
+    hasn't already been allocated.
+version 1.0.5t [March 4, 2000]
+  Changed png_jmp_env() migration aiding macro to png_jmpbuf().
+  Fixed "interlace" typo (should be "interlaced") in contrib/gregbook/read2-x.c
+  Fixed bug with use of PNG_BEFORE_IHDR bit in png_ptr->mode, introduced when
+    PNG_FLAG_HAVE_CHUNK_HEADER was moved into png_ptr->mode in version 1.0.5b
+  Files in contrib/gregbook were revised to use png_jmpbuf() and to select
+    a 24-bit visual if one is available, and to allow abbreviated options.
+  Files in contrib/pngminus were revised to use the png_jmpbuf() macro.
+  Removed spaces in makefile.linux and makefile.gcmmx, introduced in 1.0.5s
+version 1.0.5u [March 5, 2000]
+  Simplified the code that detects old png.h in png.c and pngtest.c
+  Renamed png_spalette (_p, _pp) to png_sPLT_t (_tp, _tpp)
+  Increased precision of rgb_to_gray calculations from 8 to 15 bits and
+    added png_set_rgb_to_gray_fixed() function.
+  Added makefile.bc32 (32-bit Borland C++, C mode)
+version 1.0.5v [March 11, 2000]
+  Added some parentheses to the png_jmpbuf macro definition.
+  Updated references to the zlib home page, which has moved to freesoftware.com.
+  Corrected bugs in documentation regarding png_read_row() and png_write_row().
+  Updated documentation of png_rgb_to_gray calculations in libpng.3/libpng.txt.
+  Renamed makefile.borland,turboc3 back to makefile.bor,tc3 as in version 1.0.3,
+    revised borland makefiles; added makefile.ibmvac3 and makefile.gcc (Cosmin)
+
+version 1.0.6 [March 20, 2000]
+  Minor revisions of makefile.bor, libpng.txt, and gregbook/rpng2-win.c
+  Added makefile.sggcc (SGI IRIX with gcc)
+version 1.0.6d [April 7, 2000]
+  Changed sprintf() to strcpy() in png_write_sCAL_s() to work without STDIO
+  Added data_length parameter to png_decompress_chunk() function
+  Revised documentation to remove reference to abandoned png_free_chnk functions
+  Fixed an error in png_rgb_to_gray_fixed()
+  Revised example.c, usage of png_destroy_write_struct().
+  Renamed makefile.ibmvac3 to makefile.ibmc, added libpng.icc IBM project file
+  Added a check for info_ptr->free_me&PNG_FREE_TEXT when freeing text in png.c
+  Simplify png_sig_bytes() function to remove use of non-ISO-C strdup().
+version 1.0.6e [April 9, 2000]
+  Added png_data_freer() function.
+  In the code that checks for over-length tRNS chunks, added check of
+    info_ptr->num_trans as well as png_ptr->num_trans (Matthias Benckmann)
+  Minor revisions of libpng.txt/libpng.3.
+  Check for existing data and free it if the free_me flag is set, in png_set_*()
+    and png_handle_*().
+  Only define PNG_WEIGHTED_FILTERS_SUPPORTED when PNG_FLOATING_POINT_SUPPORTED
+    is defined.
+  Changed several instances of PNG_NO_CONSOLE_ID to PNG_NO_STDIO in pngrutil.c
+    and mentioned the purposes of the two macros in libpng.txt/libpng.3.
+version 1.0.6f [April 14, 2000]
+  Revised png_set_iCCP() and png_set_rows() to avoid prematurely freeing data.
+  Add checks in png_set_text() for NULL members of the input text structure.
+  Revised libpng.txt/libpng.3.
+  Removed superfluous prototype for png_set_itxt from png.h
+  Removed "else" from pngread.c, after png_error(), and changed "0" to "length".
+  Changed several png_errors about malformed ancillary chunks to png_warnings.
+version 1.0.6g [April 24, 2000]
+  Added png_pass-* arrays to pnggccrd.c when PNG_USE_LOCAL_ARRAYS is defined.
+  Relocated paragraph about png_set_background() in libpng.3/libpng.txt
+    and other revisions (Matthias Benckmann)
+  Relocated info_ptr->free_me, png_ptr->free_me, and other info_ptr and
+    png_ptr members to restore binary compatibility with libpng-1.0.5
+    (breaks compatibility with libpng-1.0.6).
+version 1.0.6h [April 24, 2000]
+  Changed shared library so-number pattern from 2.x.y.z to xy.z (this builds
+    libpng.so.10 & libpng.so.10.6h instead of libpng.so.2 & libpng.so.2.1.0.6h)
+    This is a temporary change for test purposes.
+version 1.0.6i [May 2, 2000]
+  Rearranged some members at the end of png_info and png_struct, to put
+    unknown_chunks_num and free_me within the original size of the png_structs
+    and free_me, png_read_user_fn, and png_free_fn within the original png_info,
+    because some old applications allocate the structs directly instead of
+    using png_create_*().
+  Added documentation of user memory functions in libpng.txt/libpng.3
+  Modified png_read_png so that it will use user_allocated row_pointers
+    if present, unless free_me directs that it be freed, and added description
+    of the use of png_set_rows() and png_get_rows() in libpng.txt/libpng.3.
+  Added PNG_LEGACY_SUPPORTED macro, and #ifdef out all new (since version
+    1.00) members of png_struct and png_info, to regain binary compatibility
+    when you define this macro.  Capabilities lost in this event
+    are user transforms (new in version 1.0.0),the user transform pointer
+    (new in version 1.0.2), rgb_to_gray (new in 1.0.5), iCCP, sCAL, sPLT,
+    the high-level interface, and unknown chunks support (all new in 1.0.6).
+    This was necessary because of old applications that allocate the structs
+    directly as authors were instructed to do in libpng-0.88 and earlier,
+    instead of using png_create_*().
+  Added modes PNG_CREATED_READ_STRUCT and PNG_CREATED_WRITE_STRUCT which
+    can be used to detect codes that directly allocate the structs, and
+    code to check these modes in png_read_init() and png_write_init() and
+    generate a libpng error if the modes aren't set and PNG_LEGACY_SUPPORTED
+    was not defined.
+  Added makefile.intel and updated makefile.watcom (Pawel Mrochen)
+version 1.0.6j [May 3, 2000]
+  Overloaded png_read_init() and png_write_init() with macros that convert
+    calls to png_read_init_2() or png_write_init_2() that check the version
+    and structure sizes.
+version 1.0.7beta11 [May 7, 2000]
+  Removed the new PNG_CREATED_READ_STRUCT and PNG_CREATED_WRITE_STRUCT modes
+    which are no longer used.
+  Eliminated the three new members of png_text when PNG_LEGACY_SUPPORTED is
+    defined or when neither PNG_READ_iTXt_SUPPORTED nor PNG_WRITE_iTXT_SUPPORTED
+    is defined.
+  Made PNG_NO_READ|WRITE_iTXt the default setting, to avoid memory
+    overrun when old applications fill the info_ptr->text structure directly.
+  Added PNGAPI macro, and added it to the definitions of all exported functions.
+  Relocated version macro definitions ahead of the includes of zlib.h and
+    pngconf.h in png.h.
+version 1.0.7beta12 [May 12, 2000]
+  Revised pngset.c to avoid a problem with expanding the png_debug macro.
+  Deleted some extraneous defines from pngconf.h
+  Made PNG_NO_CONSOLE_IO the default condition when PNG_BUILD_DLL is defined.
+  Use MSC _RPTn debugging instead of fprintf if _MSC_VER is defined.
+  Added png_access_version_number() function.
+  Check for mask&PNG_FREE_CHNK (for TEXT, SCAL, PCAL) in png_free_data().
+  Expanded libpng.3/libpng.txt information about png_data_freer().
+version 1.0.7beta14 [May 17, 2000] (beta13 was not published)
+  Changed pnggccrd.c and pngvcrd.c to handle bad adaptive filter types as
+    warnings instead of errors, as pngrutil.c does.
+  Set the PNG_INFO_IDAT valid flag in png_set_rows() so png_write_png()
+    will actually write IDATs.
+  Made the default PNG_USE_LOCAL_ARRAYS depend on PNG_DLL instead of WIN32.
+  Make png_free_data() ignore its final parameter except when freeing data
+    that can have multiple instances (text, sPLT, unknowns).
+  Fixed a new bug in png_set_rows().
+  Removed info_ptr->valid tests from png_free_data(), as in version 1.0.5.
+  Added png_set_invalid() function.
+  Fixed incorrect illustrations of png_destroy_write_struct() in example.c.
+version 1.0.7beta15 [May 30, 2000]
+  Revised the deliberately erroneous Linux setjmp code in pngconf.h to produce
+    fewer error messages.
+  Rearranged checks for Z_OK to check the most likely path first in pngpread.c
+    and pngwutil.c.
+  Added checks in pngtest.c for png_create_*() returning NULL, and mentioned
+    in libpng.txt/libpng.3 the need for applications to check this.
+  Changed names of png_default_*() functions in pngtest to pngtest_*().
+  Changed return type of png_get_x|y_offset_*() from png_uint_32 to png_int_32.
+  Fixed some bugs in the unused PNG_INCH_CONVERSIONS functions in pngget.c
+  Set each pointer to NULL after freeing it in png_free_data().
+  Worked around a problem in pngconf.h; AIX's strings.h defines an "index"
+    macro that conflicts with libpng's png_color_16.index. (Dimitri Papadapoulos)
+  Added "msvc" directory with MSVC++ project files (Simon-Pierre Cadieux).
+version 1.0.7beta16 [June 4, 2000]
+  Revised the workaround of AIX string.h "index" bug.
+  Added a check for overlength PLTE chunk in pngrutil.c.
+  Added PNG_NO_POINTER_INDEXING macro to use array-indexing instead of pointer
+    indexing in pngrutil.c and pngwutil.c to accommodate a buggy compiler.
+  Added a warning in png_decompress_chunk() when it runs out of data, e.g.
+    when it tries to read an erroneous PhotoShop iCCP chunk.
+  Added PNG_USE_DLL macro.
+  Revised the copyright/disclaimer/license notice.
+  Added contrib/msvctest directory
+version 1.0.7rc1 [June 9, 2000]
+  Corrected the definition of PNG_TRANSFORM_INVERT_ALPHA  (0x0400 not 0x0200)
+  Added contrib/visupng directory (Willem van Schaik)
+version 1.0.7beta18 [June 23, 2000]
+  Revised PNGAPI definition, and pngvcrd.c to work with __GCC__
+    and do not redefine PNGAPI if it is passed in via a compiler directive.
+  Revised visupng/PngFile.c to remove returns from within the Try block.
+  Removed leading underscores from "_PNG_H" and "_PNG_SAVE_BSD_SOURCE" macros.
+  Updated contrib/visupng/cexcept.h to version 1.0.0.
+  Fixed bugs in pngwrite.c and pngwutil.c that prevented writing iCCP chunks.
+version 1.0.7rc2 [June 28, 2000]
+  Updated license to include disclaimers required by UCITA.
+  Fixed "DJBPP" typo in pnggccrd.c introduced in beta18.
+
+version 1.0.7 [July 1, 2000]
+  Revised the definition of "trans_values" in libpng.3/libpng.txt
+version 1.0.8beta1 [July 8, 2000]
+  Added png_free(png_ptr, key) two places in pngpread.c to stop memory leaks.
+  Changed PNG_NO_STDIO to PNG_NO_CONSOLE_IO, several places in pngrutil.c and
+     pngwutil.c.
+  Changed PNG_EXPORT_VAR to use PNG_IMPEXP, in pngconf.h.
+  Removed unused "#include <assert.h>" from png.c
+  Added WindowsCE support.
+  Revised pnggccrd.c to work with gcc-2.95.2 and in the Cygwin environment.
+version 1.0.8beta2 [July 10, 2000]
+  Added project files to the wince directory and made further revisions
+     of pngtest.c, pngrio.c, and pngwio.c in support of WindowsCE.
+version 1.0.8beta3 [July 11, 2000]
+  Only set the PNG_FLAG_FREE_TRNS or PNG_FREE_TRNS flag in png_handle_tRNS()
+     for indexed-color input files to avoid potential double-freeing trans array
+     under some unusual conditions; problem was introduced in version 1.0.6f.
+  Further revisions to pngtest.c and files in the wince subdirectory.
+version 1.0.8beta4 [July 14, 2000]
+  Added the files pngbar.png and pngbar.jpg to the distribution.
+  Added makefile.cygwin, and cygwin support in pngconf.h
+  Added PNG_NO_ZALLOC_ZERO macro (makes png_zalloc skip zeroing memory)
+version 1.0.8rc1 [July 16, 2000]
+  Revised png_debug() macros and statements to eliminate compiler warnings.
+
+version 1.0.8 [July 24, 2000]
+  Added png_flush() in pngwrite.c, after png_write_IEND().
+  Updated makefile.hpux to build a shared library.
+version 1.0.9beta1 [November 10, 2000]
+  Fixed typo in scripts/makefile.hpux
+  Updated makevms.com in scripts and contrib/* and contrib/* (Martin Zinser)
+  Fixed seqence-point bug in contrib/pngminus/png2pnm (Martin Zinser)
+  Changed "cdrom.com" in documentation to "libpng.org"
+  Revised pnggccrd.c to get it all working, and updated makefile.gcmmx (Greg).
+  Changed type of "params" from voidp to png_voidp in png_read|write_png().
+  Make sure PNGAPI and PNG_IMPEXP are defined in pngconf.h.
+  Revised the 3 instances of WRITEFILE in pngtest.c.
+  Relocated "msvc" and "wince" project subdirectories into "dll" subdirectory.
+  Updated png.rc in dll/msvc project
+  Revised makefile.dec to define and use LIBPATH and INCPATH
+  Increased size of global png_libpng_ver[] array from 12 to 18 chars.
+  Made global png_libpng_ver[], png_sig[] and png_pass_*[] arrays const.
+  Removed duplicate png_crc_finish() from png_handle_bKGD() function.
+  Added a warning when application calls png_read_update_info() multiple times.
+  Revised makefile.cygwin
+  Fixed bugs in iCCP support in pngrutil.c and pngwutil.c.
+  Replaced png_set_empty_plte_permitted() with png_permit_mng_features().
+version 1.0.9beta2 [November 19, 2000]
+  Renamed the "dll" subdirectory "projects".
+  Added borland project files to "projects" subdirectory.
+  Set VS_FF_PRERELEASE and VS_FF_PATCHED flags in msvc/png.rc when appropriate.
+  Add error message in png_set_compression_buffer_size() when malloc fails.
+version 1.0.9beta3 [November 23, 2000]
+  Revised PNG_LIBPNG_BUILD_TYPE macro in png.h, used in the msvc project.
+  Removed the png_flush() in pngwrite.c that crashes some applications
+    that don't set png_output_flush_fn.
+  Added makefile.macosx and makefile.aix to scripts directory.
+version 1.0.9beta4 [December 1, 2000]
+  Change png_chunk_warning to png_warning in png_check_keyword().
+  Increased the first part of msg buffer from 16 to 18 in png_chunk_error().
+version 1.0.9beta5 [December 15, 2000]
+  Added support for filter method 64 (for PNG datastreams embedded in MNG).
+version 1.0.9beta6 [December 18, 2000]
+  Revised png_set_filter() to accept filter method 64 when appropriate.
+  Added new PNG_HAVE_PNG_SIGNATURE bit to png_ptr->mode and use it to
+    help prevent applications from using MNG features in PNG datastreams.
+  Added png_permit_mng_features() function.
+  Revised libpng.3/libpng.txt.  Changed "filter type" to "filter method".
+version 1.0.9rc1 [December 23, 2000]
+  Revised test for PNG_HAVE_PNG_SIGNATURE in pngrutil.c
+  Fixed error handling of unknown compression type in png_decompress_chunk().
+  In pngconf.h, define __cdecl when _MSC_VER is defined.
+version 1.0.9beta7 [December 28, 2000]
+  Changed PNG_TEXT_COMPRESSION_zTXt to PNG_COMPRESSION_TYPE_BASE several places.
+  Revised memory management in png_set_hIST and png_handle_hIST in a backward
+    compatible manner.  PLTE and tRNS were revised similarly.
+  Revised the iCCP chunk reader to ignore trailing garbage.
+version 1.0.9beta8 [January 12, 2001]
+  Moved pngasmrd.h into pngconf.h.
+  Improved handling of out-of-spec garbage iCCP chunks generated by PhotoShop.
+version 1.0.9beta9 [January 15, 2001]
+  Added png_set_invalid, png_permit_mng_features, and png_mmx_supported to
+    wince and msvc project module definition files.
+  Minor revision of makefile.cygwin.
+  Fixed bug with progressive reading of narrow interlaced images in pngpread.c
+version 1.0.9beta10 [January 16, 2001]
+  Do not typedef png_FILE_p in pngconf.h when PNG_NO_STDIO is defined.
+  Fixed "png_mmx_supported" typo in project definition files.
+version 1.0.9beta11 [January 19, 2001]
+  Updated makefile.sgi to make shared library.
+  Removed png_mmx_support() function and disabled PNG_MNG_FEATURES_SUPPORTED
+    by default, for the benefit of DLL forward compatibility.  These will
+    be re-enabled in version 1.2.0.
+version 1.0.9rc2 [January 22, 2001]
+  Revised cygwin support.
+
+version 1.0.9 [January 31, 2001]
+  Added check of cygwin's ALL_STATIC in pngconf.h
+  Added "-nommx" parameter to contrib/gregbook/rpng2-win and rpng2-x demos.
+version 1.0.10beta1 [March 14, 2001]
+  Revised makefile.dec, makefile.sgi, and makefile.sggcc; added makefile.hpgcc.
+  Reformatted libpng.3 to eliminate bad line breaks.
+  Added checks for _mmx_supported in the read_filter_row function of pnggccrd.c
+  Added prototype for png_mmx_support() near the top of pnggccrd.c
+  Moved some error checking from png_handle_IHDR to png_set_IHDR.
+  Added PNG_NO_READ_SUPPORTED and PNG_NO_WRITE_SUPPORTED macros.
+  Revised png_mmx_support() function in pnggccrd.c
+  Restored version 1.0.8 PNG_WRITE_EMPTY_PLTE_SUPPORTED behavior in pngwutil.c
+  Fixed memory leak in contrib/visupng/PngFile.c
+  Fixed bugs in png_combine_row() in pnggccrd.c and pngvcrd.c (C version)
+  Added warnings when retrieving or setting gamma=0.
+  Increased the first part of msg buffer from 16 to 18 in png_chunk_warning().
+version 1.0.10rc1 [March 23, 2001]
+  Changed all instances of memcpy, strcpy, and strlen to png_memcpy, png_strcpy,
+    and png_strlen.
+  Revised png_mmx_supported() function in pnggccrd.c to return proper value.
+  Fixed bug in progressive reading (pngpread.c) with small images (height < 8).
+
+version 1.0.10 [March 30, 2001]
+  Deleted extraneous space (introduced in 1.0.9) from line 42 of makefile.cygwin
+  Added beos project files (Chris Herborth)
+version 1.0.11beta1 [April 3, 2001]
+  Added type casts on several png_malloc() calls (Dimitri Papadapoulos).
+  Removed a no-longer needed AIX work-around from pngconf.h
+  Changed several "//" single-line comments to C-style in pnggccrd.c
+version 1.0.11beta2 [April 11, 2001]
+  Removed PNGAPI from several functions whose prototypes did not have PNGAPI.
+  Updated scripts/pngos2.def
+version 1.0.11beta3 [April 14, 2001]
+  Added checking the results of many instances of png_malloc() for NULL
+version 1.0.11beta4 [April 20, 2001]
+  Undid the changes from version 1.0.11beta3.  Added a check for NULL return
+    from user's malloc_fn().
+  Removed some useless type casts of the NULL pointer.
+  Added makefile.netbsd
+
+version 1.0.11 [April 27, 2001]
+  Revised makefile.netbsd
+version 1.0.12beta1 [May 14, 2001]
+  Test for Windows platform in pngconf.h when including malloc.h (Emmanuel Blot)
+  Updated makefile.cygwin and handling of Cygwin's ALL_STATIC in pngconf.h
+  Added some never-to-be-executed code in pnggccrd.c to quiet compiler warnings.
+  Eliminated the png_error about apps using png_read|write_init().  Instead,
+    libpng will reallocate the png_struct and info_struct if they are too small.
+    This retains future binary compatibility for old applications written for
+    libpng-0.88 and earlier.
+version 1.2.0beta1 [May 6, 2001]
+  Bumped DLLNUM to 2.
+  Re-enabled PNG_MNG_FEATURES_SUPPORTED and enabled PNG_ASSEMBLER_CODE_SUPPORTED
+    by default.
+  Added runtime selection of MMX features.
+  Added png_set_strip_error_numbers function and related macros.
+version 1.2.0beta2 [May 7, 2001]
+  Finished merging 1.2.0beta1 with version 1.0.11
+  Added a check for attempts to read or write PLTE in grayscale PNG datastreams.
+version 1.2.0beta3 [May 17, 2001]
+  Enabled user memory function by default.
+  Modified png_create_struct so it passes user mem_ptr to user memory allocator.
+  Increased png_mng_features flag from png_byte to png_uint_32.
+  Bumped shared-library (so-number) and dll-number to 3.
+version 1.2.0beta4 [June 23, 2001]
+  Check for missing profile length field in iCCP chunk and free chunk_data
+     in case of truncated iCCP chunk.
+  Bumped shared-library number to 3 in makefile.sgi and makefile.sggcc
+  Bumped dll-number from 2 to 3 in makefile.cygwin
+  Revised contrib/gregbook/rpng*-x.c to avoid a memory leak and to exit cleanly
+     if user attempts to run it on an 8-bit display.
+  Updated contrib/gregbook
+  Use png_malloc instead of png_zalloc to allocate palette in pngset.c
+  Updated makefile.ibmc
+  Added some typecasts to eliminate gcc 3.0 warnings.  Changed prototypes
+     of png_write_oFFS width and height from png_uint_32 to png_int_32.
+  Updated example.c
+  Revised prototypes for png_debug_malloc and png_debug_free in pngtest.c
+version 1.2.0beta5 [August 8, 2001]
+  Revised contrib/gregbook
+  Revised makefile.gcmmx
+  Revised pnggccrd.c to conditionally compile some thread-unsafe code only
+     when PNG_THREAD_UNSAFE_OK is defined.
+  Added tests to prevent pngwutil.c from writing a bKGD or tRNS chunk with
+     value exceeding 2^bit_depth-1
+  Revised makefile.sgi and makefile.sggcc
+  Replaced calls to fprintf(stderr,...) with png_warning() in pnggccrd.c
+  Removed restriction that do_invert_mono only operate on 1-bit opaque files
+
+version 1.2.0 [September 1, 2001]
+  Changed a png_warning() to png_debug() in pnggccrd.c
+  Fixed contrib/gregbook/rpng-x.c, rpng2-x.c to avoid crash with XFreeGC().
+version 1.2.1beta1 [October 19, 2001]
+  Revised makefile.std in contrib/pngminus
+  Include background_1 in png_struct regardless of gamma support.
+  Revised makefile.netbsd and makefile.macosx, added makefile.darwin.
+  Revised example.c to provide more details about using row_callback().
+version 1.2.1beta2 [October 25, 2001]
+  Added type cast to each NULL appearing in a function call, except for
+    WINCE functions.
+  Added makefile.so9.
+version 1.2.1beta3 [October 27, 2001]
+  Removed type casts from all NULLs.
+  Simplified png_create_struct_2().
+version 1.2.1beta4 [November 7, 2001]
+  Revised png_create_info_struct() and png_creat_struct_2().
+  Added error message if png_write_info() was omitted.
+  Type cast NULLs appearing in function calls when _NO_PROTO or
+    PNG_TYPECAST_NULL is defined.
+version 1.2.1rc1 [November 24, 2001]
+  Type cast NULLs appearing in function calls except when PNG_NO_TYPECAST_NULL
+    is defined.
+  Changed typecast of "size" argument to png_size_t in pngmem.c calls to
+    the user malloc_fn, to agree with the prototype in png.h
+  Added a pop/push operation to pnggccrd.c, to preserve Eflag (Maxim Sobolev)
+  Updated makefile.sgi to recognize LIBPATH and INCPATH.
+  Updated various makefiles so "make clean" does not remove previous major
+    version of the shared library.
+version 1.2.1rc2 [December 4, 2001]
+  Always allocate 256-entry internal palette, hist, and trans arrays, to
+    avoid out-of-bounds memory reference caused by invalid PNG datastreams.
+  Added a check for prefix_length > data_length in iCCP chunk handler.
+
+version 1.2.1 [December 7, 2001]
+  None.
+version 1.2.2beta1 [February 22, 2002]
+  Fixed a bug with reading the length of iCCP profiles (Larry Reeves).
+  Revised makefile.linux, makefile.gcmmx, and makefile.sgi to generate
+    libpng.a, libpng12.so (not libpng.so.3), and libpng12/png.h
+  Revised makefile.darwin to remove "-undefined suppress" option.
+  Added checks for gamma and chromaticity values over 21474.83, which exceed
+    the limit for PNG unsigned 32-bit integers when encoded.
+  Revised calls to png_create_read_struct() and png_create_write_struct()
+    for simpler debugging.
+  Revised png_zalloc() so zlib handles errors (uses PNG_FLAG_MALLOC_NULL_MEM_OK)
+version 1.2.2beta2 [February 23, 2002]
+  Check chunk_length and idat_size for invalid (over PNG_MAX_UINT) lengths.
+  Check for invalid image dimensions in png_get_IHDR.
+  Added missing "fi;" in the install target of the SGI makefiles.
+  Added install-static to all makefiles that make shared libraries.
+  Always do gamma compensation when image is partially transparent.
+version 1.2.2beta3 [March 7, 2002]
+  Compute background.gray and background_1.gray even when color_type is RGB
+    in case image gets reduced to gray later.
+  Modified shared-library makefiles to install pkgconfig/libpngNN.pc.
+  Export (with PNGAPI) png_zalloc, png_zfree, and png_handle_as_unknown
+  Removed unused png_write_destroy_info prototype from png.h
+  Eliminated incorrect use of width_mmx from pnggccrd.c in pixel_bytes == 8 case
+  Added install-shared target to all makefiles that make shared libraries.
+  Stopped a double free of palette, hist, and trans when not using free_me.
+  Added makefile.32sunu for Sun Ultra 32 and makefile.64sunu for Sun Ultra 64.
+version 1.2.2beta4 [March 8, 2002]
+  Compute background.gray and background_1.gray even when color_type is RGB
+    in case image gets reduced to gray later (Jason Summers).
+  Relocated a misplaced /bin/rm in the "install-shared" makefile targets
+  Added PNG_1_0_X macro which can be used to build a 1.0.x-compatible library.
+version 1.2.2beta5 [March 26, 2002]
+  Added missing PNGAPI to several function definitions.
+  Check for invalid bit_depth or color_type in png_get_IHDR(), and
+    check for missing PLTE or IHDR in png_push_read_chunk() (Matthias Clasen).
+  Revised iTXt support to accept NULL for lang and lang_key.
+  Compute gamma for color components of background even when color_type is gray.
+  Changed "()" to "{}" in scripts/libpng.pc.in.
+  Revised makefiles to put png.h and pngconf.h only in $prefix/include/libpngNN
+  Revised makefiles to make symlink to libpng.so.NN in addition to libpngNN.so
+version 1.2.2beta6 [March 31, 2002]
+version 1.0.13beta1 [March 31, 2002]
+  Prevent png_zalloc() from trying to memset memory that it failed to acquire.
+  Add typecasts of PNG_MAX_UINT in pngset_cHRM_fixed() (Matt Holgate).
+  Ensure that the right function (user or default) is used to free the
+    png_struct after an error in png_create_read_struct_2().
+version 1.2.2rc1 [April 7, 2002]
+version 1.0.13rc1 [April 7, 2002]
+  Save the ebx register in pnggccrd.c (Sami Farin)
+  Add "mem_ptr = png_ptr->mem_ptr" in png_destroy_write_struct() (Paul Gardner).
+  Updated makefiles to put headers in include/libpng and remove old include/*.h.
+
+version 1.2.2 [April 15, 2002]
+version 1.0.13 [April 15, 2002]
+  Revised description of png_set_filter() in libpng.3/libpng.txt.
+  Revised makefile.netbsd and added makefile.neNNbsd and makefile.freebsd
+version 1.0.13patch01 [April 17, 2002]
+version 1.2.2patch01 [April 17, 2002]
+  Changed ${PNGMAJ}.${PNGVER} bug to ${PNGVER} in makefile.sgi and makefile.sggcc
+  Fixed VER -> PNGVER typo in makefile.macosx and added install-static to install
+  Added install: target to makefile.32sunu and makefile.64sunu
+version 1.0.13patch03 [April 18, 2002]
+version 1.2.2patch03 [April 18, 2002]
+  Revised 15 makefiles to link libpng.a to libpngNN.a and the include libpng
+  subdirectory to libpngNN subdirectory without the full pathname.
+  Moved generation of libpng.pc from "install" to "all" in 15 makefiles.
+version 1.2.3rc1 [April 28, 2002]
+  Added install-man target to 15 makefiles (Dimitri Papadopolous-Orfanos).
+  Added $(DESTDIR) feature to 24 makefiles (Tim Mooney)
+  Fixed bug with $prefix, should be $(prefix) in makefile.hpux.
+  Updated cygwin-specific portion of pngconf.h and revised makefile.cygwin
+  Added a link from libpngNN.pc to libpng.pc in 15 makefiles.
+  Added links from include/libpngNN/*.h to include/*.h in 24 makefiles.
+  Revised makefile.darwin to make relative links without full pathname.
+  Added setjmp() at the end of png_create_*_struct_2() in case user forgets
+    to put one in their application.
+  Restored png_zalloc() and png_zfree() prototypes to version 1.2.1 and
+    removed them from module definition files.
+version 1.2.3rc2 [May 1, 2002]
+  Fixed bug in reporting number of channels in pngget.c and pngset.c,
+    that was introduced in version 1.2.2beta5.
+  Exported png_zalloc(), png_zfree(), png_default_read(), png_default_write(),
+    png_default_flush(), and png_push_fill_buffer() and included them in
+    module definition files.
+  Added "libpng.pc" dependency to the "install-shared" target in 15 makefiles.
+version 1.2.3rc3 [May 1, 2002]
+  Revised prototype for png_default_flush()
+  Remove old libpng.pc and libpngNN.pc before installing new ones.
+version 1.2.3rc4 [May 2, 2002]
+  Typos in *.def files (png_default_read|write -> png_default_read|write_data)
+  In makefiles, changed rm libpng.NN.pc to rm libpngNN.pc
+  Added libpng-config and libpngNN-config and modified makefiles to install them.
+  Changed $(MANPATH) to $(DESTDIR)$(MANPATH) in makefiles
+  Added "Win32 DLL VB" configuration to projects/msvc/libpng.dsp
+version 1.2.3rc5 [May 11, 2002]
+  Changed "error" and "message" in prototypes to "error_message" and
+    "warning_message" to avoid namespace conflict.
+  Revised 15 makefiles to build libpng-config from libpng-config-*.in
+  Once more restored png_zalloc and png_zfree to regular nonexported form.
+  Restored png_default_read|write_data, png_default_flush, png_read_fill_buffer
+    to nonexported form, but with PNGAPI, and removed them from module def files.
+version 1.2.3rc6 [May 14, 2002]
+  Removed "PNGAPI" from png_zalloc() and png_zfree() in png.c
+  Changed "Gz" to "Gd" in projects/msvc/libpng.dsp and zlib.dsp.
+  Removed leftover libpng-config "sed" script from four makefiles.
+  Revised libpng-config creating script in 16 makefiles.
+
+version 1.2.3 [May 22, 2002]
+  Revised libpng-config target in makefile.cygwin.
+  Removed description of png_set_mem_fn() from documentation.
+  Revised makefile.freebsd.
+  Minor cosmetic changes to 15 makefiles, e.g., $(DI) = $(DESTDIR)/$(INCDIR).
+  Revised projects/msvc/README.txt
+  Changed -lpng to -lpngNN in LDFLAGS in several makefiles.
+version 1.2.4beta1 [May 24, 2002]
+  Added libpng.pc and libpng-config to "all:" target in 16 makefiles.
+  Fixed bug in 16 makefiles: $(DESTDIR)/$(LIBPATH) to $(DESTDIR)$(LIBPATH)
+  Added missing "\" before closing double quote in makefile.gcmmx.
+  Plugged various memory leaks; added png_malloc_warn() and png_set_text_2()
+    functions.
+version 1.2.4beta2 [June 25, 2002]
+  Plugged memory leak of png_ptr->current_text (Matt Holgate).
+  Check for buffer overflow before reading CRC in pngpread.c (Warwick Allison)
+  Added -soname to the loader flags in makefile.dec, makefile.sgi, and
+    makefile.sggcc.
+  Added "test-installed" target to makefile.linux, makefile.gcmmx,
+    makefile.sgi, and makefile.sggcc.
+version 1.2.4beta3 [June 28, 2002]
+  Plugged memory leak of row_buf in pngtest.c when there is a png_error().
+  Detect buffer overflow in pngpread.c when IDAT is corrupted with extra data.
+  Added "test-installed" target to makefile.32sunu, makefile.64sunu,
+    makefile.beos, makefile.darwin, makefile.dec, makefile.macosx,
+    makefile.solaris, makefile.hpux, makefile.hpgcc, and makefile.so9.
+version 1.2.4rc1 and 1.0.14rc1 [July 2, 2002]
+  Added "test-installed" target to makefile.cygwin and makefile.sco.
+  Revised pnggccrd.c to be able to back out version 1.0.x via PNG_1_0_X macro.
+
+version 1.2.4 and 1.0.14 [July 8, 2002]
+  Changed png_warning() to png_error() when width is too large to process.
+version 1.2.4patch01 [July 20, 2002]
+  Revised makefile.cygwin to use DLL number 12 instead of 13.
+version 1.2.5beta1 [August 6, 2002]
+  Added code to contrib/gregbook/readpng2.c to ignore unused chunks.
+  Replaced toucan.png in contrib/gregbook (it has been corrupt since 1.0.11)
+  Removed some stray *.o files from contrib/gregbook.
+  Changed png_error() to png_warning() about "Too much data" in pngpread.c
+    and about "Extra compressed data" in pngrutil.c.
+  Prevent png_ptr->pass from exceeding 7 in png_push_finish_row().
+  Updated makefile.hpgcc
+  Updated png.c and pnggccrd.c handling of return from png_mmx_support()
+version 1.2.5beta2 [August 15, 2002]
+  Only issue png_warning() about "Too much data" in pngpread.c when avail_in
+    is nonzero.
+  Updated makefiles to install a separate libpng.so.3 with its own rpath.
+version 1.2.5rc1 and 1.0.15rc1 [August 24, 2002]
+  Revised makefiles to not remove previous minor versions of shared libraries.
+version 1.2.5rc2 and 1.0.15rc2 [September 16, 2002]
+  Revised 13 makefiles to remove "-lz" and "-L$(ZLIBLIB)", etc., from shared
+    library loader directive.
+  Added missing "$OBJSDLL" line to makefile.gcmmx.
+  Added missing "; fi" to makefile.32sunu.
+version 1.2.5rc3 and 1.0.15rc3 [September 18, 2002]
+  Revised libpng-config script.
+
+version 1.2.5 and 1.0.15 [October 3, 2002]
+  Revised makefile.macosx, makefile.darwin, makefile.hpgcc, and makefile.hpux,
+    and makefile.aix.
+  Relocated two misplaced PNGAPI lines in pngtest.c
+version 1.2.6beta1 [October 22, 2002]
+  Commented out warning about uninitialized mmx_support in pnggccrd.c.
+  Changed "IBMCPP__" flag to "__IBMCPP__" in pngconf.h.
+  Relocated two more misplaced PNGAPI lines in pngtest.c
+  Fixed memory overrun bug in png_do_read_filler() with 16-bit datastreams,
+    introduced in version 1.0.2.
+  Revised makefile.macosx, makefile.dec, makefile.aix, and makefile.32sunu.
+version 1.2.6beta2 [November 1, 2002]
+  Added libpng-config "--ldopts" output.
+  Added "AR=ar" and "ARFLAGS=rc" and changed "ar rc" to "$(AR) $(ARFLAGS)"
+    in makefiles.
+version 1.2.6beta3 [July 18, 2004]
+  Reverted makefile changes from version 1.2.6beta2 and some of the changes
+    from version 1.2.6beta1; these will be postponed until version 1.2.7.
+    Version 1.2.6 is going to be a simple bugfix release.
+  Changed the one instance of "ln -sf" to "ln -f -s" in each Sun makefile.
+  Fixed potential overrun in pngerror.c by using strncpy instead of memcpy.
+  Added "#!/bin/sh" at the top of configure, for recognition of the
+    'x' flag under Cygwin (Cosmin).
+  Optimized vacuous tests that silence compiler warnings, in png.c (Cosmin).
+  Added support for PNG_USER_CONFIG, in pngconf.h (Cosmin).
+  Fixed the special memory handler for Borland C under DOS, in pngmem.c
+    (Cosmin).
+  Removed some spurious assignments in pngrutil.c (Cosmin).
+  Replaced 65536 with 65536L, and 0xffff with 0xffffL, to silence warnings
+    on 16-bit platforms (Cosmin).
+  Enclosed shift op expressions in parentheses, to silence warnings (Cosmin).
+  Used proper type png_fixed_point, to avoid problems on 16-bit platforms,
+    in png_handle_sRGB() (Cosmin).
+  Added compression_type to png_struct, and optimized the window size
+    inside the deflate stream (Cosmin).
+  Fixed definition of isnonalpha(), in pngerror.c and pngrutil.c (Cosmin).
+  Fixed handling of unknown chunks that come after IDAT (Cosmin).
+  Allowed png_error() and png_warning() to work even if png_ptr == NULL
+    (Cosmin).
+  Replaced row_info->rowbytes with row_bytes in png_write_find_filter()
+    (Cosmin).
+  Fixed definition of PNG_LIBPNG_VER_DLLNUM (Simon-Pierre).
+  Used PNG_LIBPNG_VER and PNG_LIBPNG_VER_STRING instead of the hardcoded
+    values in png.c (Simon-Pierre, Cosmin).
+  Initialized png_libpng_ver[] with PNG_LIBPNG_VER_STRING (Simon-Pierre).
+  Replaced PNG_LIBPNG_VER_MAJOR with PNG_LIBPNG_VER_DLLNUM in png.rc
+    (Simon-Pierre).
+  Moved the definition of PNG_HEADER_VERSION_STRING near the definitions
+    of the other PNG_LIBPNG_VER_... symbols in png.h (Cosmin).
+  Relocated #ifndef PNGAPI guards in pngconf.h (Simon-Pierre, Cosmin).
+  Updated scripts/makefile.vc(a)win32 (Cosmin).
+  Updated the MSVC project (Simon-Pierre, Cosmin).
+  Updated the Borland C++ Builder project (Cosmin).
+  Avoided access to asm_flags in pngvcrd.c, if PNG_1_0_X is defined (Cosmin).
+  Commented out warning about uninitialized mmx_support in pngvcrd.c (Cosmin).
+  Removed scripts/makefile.bd32 and scripts/pngdef.pas (Cosmin).
+  Added extra guard around inclusion of Turbo C memory headers, in pngconf.h
+    (Cosmin).
+  Renamed projects/msvc/ to projects/visualc6/, and projects/borland/ to
+    projects/cbuilder5/ (Cosmin).
+  Moved projects/visualc6/png32ms.def to scripts/pngw32.def,
+    and projects/visualc6/png.rc to scripts/pngw32.rc (Cosmin).
+  Added projects/visualc6/pngtest.dsp; removed contrib/msvctest/ (Cosmin).
+  Changed line endings to DOS style in cbuilder5 and visualc6 files, even
+    in the tar.* distributions (Cosmin).
+  Updated contrib/visupng/VisualPng.dsp (Cosmin).
+  Updated contrib/visupng/cexcept.h to version 2.0.0 (Cosmin).
+  Added a separate distribution with "configure" and supporting files (Junichi).
+version 1.2.6beta4 [July 28, 2004]
+  Added user ability to change png_size_t via a PNG_SIZE_T macro.
+  Added png_sizeof() and png_convert_size() functions.
+  Added PNG_SIZE_MAX (maximum value of a png_size_t variable.
+  Added check in png_malloc_default() for (size_t)size != (png_uint_32)size
+    which would indicate an overflow.
+  Changed sPLT failure action from png_error to png_warning and abandon chunk.
+  Changed sCAL and iCCP failures from png_error to png_warning and abandon.
+  Added png_get_uint_31(png_ptr, buf) function.
+  Added PNG_UINT_32_MAX macro.
+  Renamed PNG_MAX_UINT to PNG_UINT_31_MAX.
+  Made png_zalloc() issue a png_warning and return NULL on potential
+    overflow.
+  Turn on PNG_NO_ZALLOC_ZERO by default in version 1.2.x
+  Revised "clobber list" in pnggccrd.c so it will compile under gcc-3.4.
+  Revised Borland portion of png_malloc() to return NULL or issue
+    png_error() according to setting of PNG_FLAG_MALLOC_NULL_MEM_OK.
+  Added PNG_NO_SEQUENTIAL_READ_SUPPORTED macro to conditionally remove
+    sequential read support.
+  Added some "#if PNG_WRITE_SUPPORTED" blocks.
+  #ifdef'ed out some redundancy in png_malloc_default().
+  Use png_malloc instead of png_zalloc to allocate the pallete.
+version 1.0.16rc1 and 1.2.6rc1 [August 4, 2004]
+  Fixed buffer overflow vulnerability in png_handle_tRNS()
+  Fixed integer arithmetic overflow vulnerability in png_read_png().
+  Fixed some harmless bugs in png_handle_sBIT, etc, that would cause
+    duplicate chunk types to go undetected.
+  Fixed some timestamps in the -config version
+  Rearranged order of processing of color types in png_handle_tRNS().
+  Added ROWBYTES macro to calculate rowbytes without integer overflow.
+  Updated makefile.darwin and removed makefile.macosx from scripts directory.
+  Imposed default one million column, one-million row limits on the image
+    dimensions, and added png_set_user_limits() function to override them.
+  Revised use of PNG_SET_USER_LIMITS_SUPPORTED macro.
+  Fixed wrong cast of returns from png_get_user_width|height_max().
+  Changed some "keep the compiler happy" from empty statements to returns,
+  Revised libpng.txt to remove 1.2.x stuff from the 1.0.x distribution
+version 1.0.16rc2 and 1.2.6rc2 [August 7, 2004]
+  Revised makefile.darwin and makefile.solaris.  Removed makefile.macosx.
+  Revised pngtest's png_debug_malloc() to use png_malloc() instead of
+    png_malloc_default() which is not supposed to be exported.
+  Fixed off-by-one error in one of the conversions to PNG_ROWBYTES() in
+    pngpread.c.  Bug was introduced in 1.2.6rc1.
+  Fixed bug in RGB to RGBX transformation introduced in 1.2.6rc1.
+  Fixed old bug in RGB to Gray transformation.
+  Fixed problem with 64-bit compilers by casting arguments to abs()
+    to png_int_32.
+  Changed "ln -sf" to "ln -f -s" in three makefiles (solaris, sco, so9).
+  Changed "HANDLE_CHUNK_*" to "PNG_HANDLE_CHUNK_*" (Cosmin)
+  Added "-@/bin/rm -f $(DL)/$(LIBNAME).so.$(PNGMAJ)" to 15 *NIX makefiles.
+  Added code to update the row_info->colortype in png_do_read_filler() (MSB).
+version 1.0.16rc3 and 1.2.6rc3 [August 9, 2004]
+  Eliminated use of "abs()" in testing cHRM and gAMA values, to avoid
+    trouble with some 64-bit compilers.  Created PNG_OUT_OF_RANGE() macro.
+  Revised documentation of png_set_keep_unknown_chunks().
+  Check handle_as_unknown status in pngpread.c, as in pngread.c previously.
+  Moved  "PNG_HANDLE_CHUNK_*" macros out of PNG_INTERNAL section of png.h
+  Added "rim" definitions for CONST4 and CONST6 in pnggccrd.c
+version 1.0.16rc4 and 1.2.6rc4 [August 10, 2004]
+  Fixed mistake in pngtest.c introduced in 1.2.6rc2 (declaration of
+    "pinfo" was out of place).
+version 1.0.16rc5 and 1.2.6rc5 [August 10, 2004]
+  Moved  "PNG_HANDLE_CHUNK_*" macros out of PNG_ASSEMBLER_CODE_SUPPORTED
+     section of png.h where they were inadvertently placed in version rc3.
+
+version 1.2.6 and 1.0.16 [August 15, 2004]
+  Revised pngtest so memory allocation testing is only done when PNG_DEBUG==1.
+version 1.2.7beta1 [August 26, 2004]
+  Removed unused pngasmrd.h file.
+  Removed references to uu.net for archived files.  Added references to
+    PNG Spec (second edition) and the PNG ISO/IEC Standard.
+  Added "test-dd" target in 15 makefiles, to run pngtest in DESTDIR.
+  Fixed bug with "optimized window size" in the IDAT datastream, that
+    causes libpng to write PNG files with incorrect zlib header bytes.
+version 1.2.7beta2 [August 28, 2004]
+  Fixed bug with sCAL chunk and big-endian machines (David Munro).
+  Undid new code added in 1.2.6rc2 to update the color_type in
+    png_set_filler().
+  Added png_set_add_alpha() that updates color type.
+version 1.0.17rc1 and 1.2.7rc1 [September 4, 2004]
+  Revised png_set_strip_filler() to not remove alpha if color_type has alpha.
+
+version 1.2.7 and 1.0.17 [September 12, 2004]
+  Added makefile.hp64
+  Changed projects/msvc/png32ms.def to scripts/png32ms.def in makefile.cygwin
+version 1.2.8beta1 [November 1, 2004]
+  Fixed bug in png_text_compress() that would fail to complete a large block.
+  Fixed bug, introduced in libpng-1.2.7, that overruns a buffer during
+    strip alpha operation in png_do_strip_filler().
+  Added PNG_1_2_X definition in pngconf.h
+  #ifdef out png_info_init in png.c and png_read_init in pngread.c (as of 1.3.0)
+version 1.2.8beta2 [November 2, 2004]
+  Reduce color_type to a nonalpha type after strip alpha operation in
+    png_do_strip_filler().
+version 1.2.8beta3 [November 3, 2004]
+  Revised definitions of PNG_MAX_UINT_32, PNG_MAX_SIZE, and PNG_MAXSUM
+version 1.2.8beta4 [November 12, 2004]
+  Fixed (again) definition of PNG_LIBPNG_VER_DLLNUM in png.h (Cosmin).
+  Added PNG_LIBPNG_BUILD_PRIVATE in png.h (Cosmin).
+  Set png_ptr->zstream.data_type to Z_BINARY, to avoid unnecessary detection
+    of data type in deflate (Cosmin).
+  Deprecated but continue to support SPECIALBUILD and PRIVATEBUILD in favor of
+    PNG_LIBPNG_BUILD_SPECIAL_STRING and PNG_LIBPNG_BUILD_PRIVATE_STRING.
+version 1.2.8beta5 [November 20, 2004]
+  Use png_ptr->flags instead of png_ptr->transformations to pass
+    PNG_STRIP_ALPHA info to png_do_strip_filler(), to preserve ABI
+    compatibility.
+  Revised handling of SPECIALBUILD, PRIVATEBUILD,
+    PNG_LIBPNG_BUILD_SPECIAL_STRING and PNG_LIBPNG_BUILD_PRIVATE_STRING.
+version 1.2.8rc1 [November 24, 2004]
+  Moved handling of BUILD macros from pngconf.h to png.h
+  Added definition of PNG_LIBPNG_BASE_TYPE in png.h, inadvertently
+    omitted from beta5.
+  Revised scripts/pngw32.rc
+  Despammed mailing addresses by masking "@" with "at".
+  Inadvertently installed a supposedly faster test version of pngrutil.c
+version 1.2.8rc2 [November 26, 2004]
+  Added two missing "\" in png.h
+  Change tests in pngread.c and pngpread.c to
+    if (png_ptr->transformations || (png_ptr->flags&PNG_FLAG_STRIP_ALPHA))
+       png_do_read_transformations(png_ptr);
+version 1.2.8rc3 [November 28, 2004]
+  Reverted pngrutil.c to version libpng-1.2.8beta5.
+  Added scripts/makefile.elf with supporting code in pngconf.h for symbol
+    versioning (John Bowler).
+version 1.2.8rc4 [November 29, 2004]
+  Added projects/visualc7 (Simon-pierre).
+version 1.2.8rc5 [November 29, 2004]
+  Fixed new typo in scripts/pngw32.rc
+
+version 1.2.8 [December 3, 2004]
+  Removed projects/visualc7, added projects/visualc71.
+
+version 1.2.9beta1 [February 21, 2006]
+
+  Initialized some structure members in pngwutil.c to avoid gcc-4.0.0 complaints
+  Revised man page and libpng.txt to make it clear that one should not call
+    png_read_end or png_write_end after png_read_png or png_write_png.
+  Updated references to png-mng-implement mailing list.
+  Fixed an incorrect typecast in pngrutil.c
+  Added PNG_NO_READ_SUPPORTED conditional for making a write-only library.
+  Added PNG_NO_WRITE_INTERLACING_SUPPORTED conditional.
+  Optimized alpha-inversion loops in pngwtran.c
+  Moved test for nonzero gamma outside of png_build_gamma_table() in pngrtran.c
+  Make sure num_trans is <= 256 before copying data in png_set_tRNS().
+  Make sure num_palette is <= 256 before copying data in png_set_PLTE().
+  Interchanged order of write_swap_alpha and write_invert_alpha transforms.
+  Added parentheses in the definition of PNG_LIBPNG_BUILD_TYPE (Cosmin).
+  Optimized zlib window flag (CINFO) in contrib/pngsuite/*.png (Cosmin).
+  Updated scripts/makefile.bc32 for Borland C++ 5.6 (Cosmin).
+  Exported png_get_uint_32, png_save_uint_32, png_get_uint_16, png_save_uint_16,
+    png_get_int_32, png_save_int_32, png_get_uint_31 (Cosmin).
+  Added type cast (png_byte) in png_write_sCAL() (Cosmin).
+  Fixed scripts/makefile.cygwin (Christian Biesinger, Cosmin).
+  Default iTXt support was inadvertently enabled.
+
+version 1.2.9beta2 [February 21, 2006]
+
+  Check for png_rgb_to_gray and png_gray_to_rgb read transformations before
+    checking for png_read_dither in pngrtran.c
+  Revised checking of chromaticity limits to accommodate extended RGB
+    colorspace (John Denker).
+  Changed line endings in some of the project files to CRLF, even in the
+    "Unix" tar distributions (Cosmin).
+  Made png_get_int_32 and png_save_int_32 always available (Cosmin).
+  Updated scripts/pngos2.def, scripts/pngw32.def and projects/wince/png32ce.def
+    with the newly exported functions.
+  Eliminated distributions without the "configure" script.
+  Updated INSTALL instructions.
+
+version 1.2.9beta3 [February 24, 2006]
+
+  Fixed CRCRLF line endings in contrib/visupng/VisualPng.dsp
+  Made libpng.pc respect EXEC_PREFIX (D. P. Kreil, J. Bowler)
+  Removed reference to pngasmrd.h from Makefile.am
+  Renamed CHANGES to ChangeLog.
+  Renamed LICENSE to COPYING.
+  Renamed ANNOUNCE to NEWS.
+  Created AUTHORS file.
+
+version 1.2.9beta4 [March 3, 2006]
+
+  Changed definition of PKGCONFIG from $prefix/lib to $libdir in configure.ac
+  Reverted to filenames LICENSE and ANNOUNCE; removed AUTHORS and COPYING.
+  Removed newline from the end of some error and warning messages.
+  Removed test for sqrt() from configure.ac and configure.
+  Made swap tables in pngtrans.c PNG_CONST (Carlo Bramix).
+  Disabled default iTXt support that was inadvertently enabled in
+    libpng-1.2.9beta1.
+  Added "OS2" to list of systems that don't need underscores, in pnggccrd.c
+  Removed libpng version and date from *.c files.
+
+version 1.2.9beta5 [March 4, 2006]
+  Removed trailing blanks from source files.
+  Put version and date of latest change in each source file, and changed
+    copyright year accordingly.
+  More cleanup of configure.ac, Makefile.ac, and associated scripts.
+  Restored scripts/makefile.elf which was inadvertently deleted.
+
+version 1.2.9beta6 [March 6, 2006]
+  Fixed typo (22) in configuration files.
+
+version 1.2.9beta7 [March 7, 2006]
+  Removed libpng.vers and libpng.sym from libpng12_la_SOURCES in Makefile.am
+  Fixed inconsistent #ifdef's around png_sig_bytes() and png_set_sCAL_s()
+    in png.h.
+  Updated makefile.elf as suggested by debian.
+  Made cosmetic changes to some makefiles, adding LN_SF and other macros.
+  Made some makefiles accept "exec_prefix".
+
+version 1.2.9beta8 [March 9, 2006]
+  Fixed some "#if defined (..." which should be "#if defined(..."
+    Bug introduced in libpng-1.2.8.
+  Fixed inconsistency in definition of png_default_read_data()
+  Restored blank that was lost from makefile.sggcc "clean" target in beta7.
+  Revised calculation of "current" and "major" for irix in ltmain.sh
+  Changed "mkdir" to "MKDIR_P" in some makefiles.
+  Separated PNG_EXPAND and PNG_EXPAND_tRNS.
+  Added png_set_expand_gray_1_2_4_to_8() and deprecated
+    png_set_gray_1_2_4_to_8() which also expands tRNS to alpha.
+
+version 1.2.9beta9 [March 10, 2006]
+  Include "config.h" in pngconf.h when available.
+  Added some checks for NULL png_ptr or NULL info_ptr (timeless)
+
+version 1.2.9beta10 [March 20, 2006]
+  Removed extra CR from contrib/visualpng/VisualPng.dsw (Cosmin)
+  Made pnggccrd.c PIC-compliant (Christian Aichinger).
+  Added makefile.mingw (Wolfgang Glas).
+  Revised pngconf.h MMX checking.
+
+version 1.2.9beta11 [March 22, 2006]
+  Fixed out-of-order declaration in pngwrite.c that was introduced in beta9
+  Simplified some makefiles by using LIBSO, LIBSOMAJ, and LIBSOVER macros.
+
+version 1.2.9rc1 [March 31, 2006]
+  Defined PNG_USER_PRIVATEBUILD when including "pngusr.h" (Cosmin).
+  Removed nonsensical assertion check from pngtest.c (Cosmin).
+
+version 1.2.9 [April 14, 2006]
+  Revised makefile.beos and added "none" selector in ltmain.sh
+
+version 1.2.10beta1 [April 15, 2006]
+  Renamed "config.h" to "png_conf.h" and revised Makefile.am to add
+    -DPNG_BUILDING_LIBPNG to compile directive, and modified pngconf.h
+    to include png_conf.h only when PNG_BUILDING_LIBPNG is defined.
+
+version 1.2.10beta2 [April 15, 2006]
+  Manually updated Makefile.in and configure.  Changed png_conf.h.in
+    back to config.h.
+
+version 1.2.10beta3 [April 15, 2006]
+  Change png_conf.h back to config.h in pngconf.h.
+
+version 1.2.10beta4 [April 16, 2006]
+  Change PNG_BUILDING_LIBPNG to PNG_CONFIGURE_LIBPNG in config/Makefile*.
+
+version 1.2.10beta5 [April 16, 2006]
+  Added a configure check for compiling assembler code in pnggccrd.c
+
+version 1.2.10beta6 [April 17, 2006]
+  Revised the configure check for pnggccrd.c
+  Moved -DPNG_CONFIGURE_LIBPNG into @LIBPNG_DEFINES@
+  Added @LIBPNG_DEFINES@ to arguments when building libpng.sym
+
+version 1.2.10beta7 [April 18, 2006]
+  Change "exec_prefix=$prefix" to "exec_prefix=$(prefix)" in makefiles.
+
+version 1.2.10rc1 [April 19, 2006]
+  Ensure pngconf.h doesn't define both PNG_USE_PNGGCCRD and PNG_USE_PNGVCRD
+  Fixed "LN_FS" typo in makefile.sco and makefile.solaris.
+
+version 1.2.10rc2 [April 20, 2006]
+  Added a backslash between -DPNG_CONFIGURE_LIBPNG and -DPNG_NO_ASSEMBLER_CODE
+   in configure.ac and configure
+  Made the configure warning about versioned symbols less arrogant.
+
+version 1.2.10rc3 [April 21, 2006]
+  Added a note in libpng.txt that png_set_sig_bytes(8) can be used when
+    writing an embedded PNG without the 8-byte signature.
+  Revised makefiles and configure to avoid making links to libpng.so.*
+
+version 1.2.10 [April 23, 2006]
+  Reverted configure to "rc2" state.
+
+version 1.2.11beta1 [May 31, 2006]
+  scripts/libpng.pc.in contained "configure" style version info and would
+    not work with makefiles.
+  The shared-library makefiles were linking to libpng.so.0 instead of
+    libpng.so.3 compatibility as the library.
+
+version 1.2.11beta2 [June 2, 2006]
+  Increased sprintf buffer from 50 to 52 chars in pngrutil.c to avoid
+    buffer overflow.
+  Fixed bug in example.c (png_set_palette_rgb -> png_set_palette_to_rgb)
+
+version 1.2.11beta3 [June 5, 2006]
+  Prepended "#! /bin/sh" to ltmail.sh and contrib/pngminus/*.sh (Cosmin).
+  Removed the accidental leftover Makefile.in~ (Cosmin).
+  Avoided potential buffer overflow and optimized buffer in
+    png_write_sCAL(), png_write_sCAL_s() (Cosmin).
+  Removed the include directories and libraries from CFLAGS and LDFLAGS
+    in scripts/makefile.gcc (Nelson A. de Oliveira, Cosmin).
+
+version 1.2.11beta4 [June 6, 2006]
+  Allow zero-length IDAT chunks after the entire zlib datastream, but not
+    after another intervening chunk type.
+
+version 1.0.19rc1, 1.2.11rc1 [June 13, 2006]
+  Deleted extraneous square brackets from [config.h] in configure.ac
+
+version 1.0.19rc2, 1.2.11rc2 [June 14, 2006]
+  Added prototypes for PNG_INCH_CONVERSIONS functions to png.h
+  Revised INSTALL and autogen.sh
+  Fixed typo in several makefiles (-W1 should be -Wl)
+  Added typedef for png_int_32 and png_uint_32 on 64-bit systems.
+
+version 1.0.19rc3, 1.2.11rc3 [June 15, 2006]
+  Removed the new typedefs for 64-bit systems (delay until version 1.4.0)
+  Added one zero element to png_gamma_shift[] array in pngrtran.c to avoid
+    reading out of bounds.
+
+version 1.0.19rc4, 1.2.11rc4 [June 15, 2006]
+  Really removed the new typedefs for 64-bit systems.
+
+version 1.0.19rc5, 1.2.11rc5 [June 22, 2006]
+  Removed png_sig_bytes entry from scripts/pngw32.def
+
+version 1.0.19, 1.2.11 [June 26, 2006]
+  None.
+
+version 1.0.20, 1.2.12 [June 27, 2006]
+  Really increased sprintf buffer from 50 to 52 chars in pngrutil.c to avoid
+    buffer overflow.
+
+version 1.2.13beta1 [October 2, 2006]
+  Removed AC_FUNC_MALLOC from configure.ac
+  Work around Intel-Mac compiler bug by setting PNG_NO_MMX_CODE in pngconf.h
+  Change "logical" to "bitwise" throughout documentation.
+  Detect and fix attempt to write wrong iCCP profile length.
+
+version 1.0.21, 1.2.13 [November 14, 2006]
+  Fix potential buffer overflow in sPLT chunk handler.
+  Fix Makefile.am to not try to link to noexistent files.
+  Check all exported functions for NULL png_ptr.
+
+version 1.2.14beta1 [November 17, 2006]
+  Relocated three misplaced tests for NULL png_ptr.
+  Built Makefile.in with automake-1.9.6 instead of 1.9.2.
+  Build configure with autoconf-2.60 instead of 2.59
+
+version 1.2.14beta2 [November 17, 2006]
+  Added some typecasts in png_zalloc().
+
+version 1.2.14rc1 [November 20, 2006]
+  Changed "strtod" to "png_strtod" in pngrutil.c
+
+version 1.0.22, 1.2.14    [November 27, 2006]
+  Added missing "$(srcdir)" in Makefile.am and Makefile.in
+
+version 1.2.15beta1 [December 3, 2006]
+  Generated configure with autoconf-2.61 instead of 2.60
+  Revised configure.ac to update libpng.pc and libpng-config.
+
+version 1.2.15beta2 [December 3, 2006]
+  Always export MMX asm functions, just stubs if not building pnggccrd.c
+
+version 1.2.15beta3 [December 4, 2006]
+  Add "png_bytep" typecast to profile while calculating length in pngwutil.c
+
+version 1.2.15beta4 [December 7, 2006]
+  Added scripts/CMakeLists.txt
+  Changed PNG_NO_ASSEMBLER_CODE to PNG_NO_MMX_CODE in scripts, like 1.4.0beta
+
+version 1.2.15beta5 [December 7, 2006]
+  Changed some instances of PNG_ASSEMBLER_* to PNG_MMX_* in pnggccrd.c
+  Revised scripts/CMakeLists.txt
+
+version 1.2.15beta6 [December 13, 2006]
+  Revised scripts/CMakeLists.txt and configure.ac
+
+version 1.2.15rc1 [December 18, 2006]
+  Revised scripts/CMakeLists.txt
+
+version 1.2.15rc2 [December 21, 2006]
+  Added conditional #undef jmpbuf in pngtest.c to undo #define in AIX headers.
+  Added scripts/makefile.nommx
+
+version 1.2.15rc3 [December 25, 2006]
+  Fixed shared library numbering error that was intruduced in 1.2.15beta6.
+
+version 1.2.15rc4 [December 27, 2006]
+  Fixed handling of rgb_to_gray when png_ptr->color.gray isn't set.
+
+version 1.2.15rc5 [December 31, 2006]
+  Revised handling of rgb_to_gray.
+
+version 1.0.23, 1.2.15 [January 5, 2007]
+  Added some (unsigned long) typecasts in pngtest.c to avoid printing errors.
+
+version 1.2.16beta1 [January 6, 2007]
+  Fix bugs in makefile.nommx
+
+version 1.2.16beta2 [January 16, 2007]
+  Revised scripts/CMakeLists.txt
+
+version 1.0.24, 1.2.16 [January 31, 2007]
+  No changes.
+
+version 1.2.17beta1 [March 6, 2007]
+  Revised scripts/CMakeLists.txt to install both shared and static libraries.
+  Deleted a redundant line from pngset.c.
+
+version 1.2.17beta2 [April 26, 2007]
+  Relocated misplaced test for png_ptr == NULL in pngpread.c
+  Change "==" to "&" for testing PNG_RGB_TO_GRAY_ERR & PNG_RGB_TO_GRAY_WARN
+    flags.
+  Changed remaining instances of PNG_ASSEMBLER_* to PNG_MMX_*
+  Added pngerror() when write_IHDR fails in deflateInit2().
+  Added "const" to some array declarations.
+  Mention examples of libpng usage in the libpng*.txt and libpng.3 documents.
+
+version 1.2.17rc1 [May 4, 2007]
+  No changes.
+
+version 1.2.17rc2 [May 8, 2007]
+  Moved several PNG_HAVE_* macros out of PNG_INTERNAL because applications
+    calling set_unknown_chunk_location() need them.
+  Changed transformation flag from PNG_EXPAND_tRNS to PNG_EXPAND in
+    png_set_expand_gray_1_2_4_to_8().
+  Added png_ptr->unknown_chunk to hold working unknown chunk data, so it
+    can be free'ed in case of error.  Revised unknown chunk handling in
+    pngrutil.c and pngpread.c to use this structure.
+
+version 1.2.17rc3 [May 8, 2007]
+  Revised symbol-handling in configure script.
+
+version 1.2.17rc4 [May 10, 2007]
+  Revised unknown chunk handling to avoid storing unknown critical chunks.
+
+version 1.0.25 [May 15, 2007]
+version 1.2.17 [May 15, 2007]
+  Added "png_ptr->num_trans=0" before error return in png_handle_tRNS,
+    to eliminate a vulnerability (CVE-2007-2445, CERT VU#684664)
+
+version 1.0.26 [May 15, 2007]
+version 1.2.18 [May 15, 2007]
+  Reverted the libpng-1.2.17rc3 change to symbol-handling in configure script
+
+version 1.2.19beta1 [May 18, 2007]
+  Changed "const static" to "static PNG_CONST" everywhere, mostly undoing
+    change of libpng-1.2.17beta2.  Changed other "const" to "PNG_CONST"
+  Changed some handling of unused parameters, to avoid compiler warnings.
+    "if (unused == NULL) return;" becomes "unused = unused".
+
+version 1.2.19beta2 [May 18, 2007]
+  Only use the valid bits of tRNS value in png_do_expand() (Brian Cartier)
+
+version 1.2.19beta3 [May 19, 2007]
+  Add some "png_byte" typecasts in png_check_keyword() and write new_key
+  instead of key in zTXt chunk (Kevin Ryde).
+
+version 1.2.19beta4 [May 21, 2007]
+  Add png_snprintf() function and use it in place of sprint() for improved
+    defense against buffer overflows.
+
+version 1.2.19beta5 [May 21, 2007]
+  Fixed png_handle_tRNS() to only use the valid bits of tRNS value.
+  Changed handling of more unused parameters, to avoid compiler warnings.
+  Removed some PNG_CONST in pngwutil.c to avoid compiler warnings.
+
+version 1.2.19beta6 [May 22, 2007]
+  Added some #ifdef PNG_MMX_CODE_SUPPORTED where needed in pngvcrd.c
+  Added a special "_MSC_VER" case that defines png_snprintf to _snprintf
+
+version 1.2.19beta7 [May 22, 2007]
+  Squelched png_squelch_warnings() in pnggccrd.c and added an
+    #ifdef PNG_MMX_CODE_SUPPORTED block around the declarations that caused
+    the warnings that png_squelch_warnings was squelching.
+
+version 1.2.19beta8 [May 22, 2007]
+  Removed __MMX__ from test in pngconf.h.
+
+version 1.2.19beta9 [May 23, 2007]
+  Made png_squelch_warnings() available via PNG_SQUELCH_WARNINGS macro.
+  Revised png_squelch_warnings() so it might work.
+  Updated makefile.sgcc and makefile.solaris; added makefile.solaris-x86.
+
+version 1.2.19beta10 [May 24, 2007]
+  Resquelched png_squelch_warnings(), use "__attribute__((used))" instead.
+
+version 1.2.19beta11 [May 28, 2007]
+  Return 0 from png_get_sPLT() and png_get_unknown_chunks() if png_ptr is NULL;
+    changed three remaining instances of png_strcpy() to png_strncpy() (David
+    Hill).
+  Make test for NULL row_buf at the beginning of png_do_read_transformations
+    unconditional.
+
+version 1.2.19beta12 [May 28, 2007]
+  Revised pnggccrd.c.
+
+version 1.2.19beta13 [June 14, 2007]
+  Prefer PNG_USE_PNGVCRD when _MSC_VER is defined in pngconf.h
+
+version 1.2.19beta14 [June 16, 2007]
+  Fix bug with handling of 16-bit transparency, introduced in 1.2.19beta2
+
+version 1.2.19beta15 [June 17, 2007]
+  Revised pnggccrd.c.
+
+version 1.2.19beta16 [June 18, 2007]
+  Revised pnggccrd.c again.
+  Updated contrib/gregbook.
+  Changed '#include "pnggccrd.c"' to 'include "$srcdir/pnggccrd.c"'
+    in configure.ac
+
+version 1.2.19beta17 [June 19, 2007]
+  Revised many of the makefiles, to set -DPNG_NO_MMX_CODE where needed
+    and to not use -O3 unless -DPNG_NO_MMX_CODE is also set.
+
+version 1.2.19beta18 [June 23, 2007]
+  Replaced some C++ style comments with C style comments in pnggccrd.c.
+  Copied optimized C code from pnggccrd.c to pngrutil.c, removed dependency
+    on pnggccrd.o from many makefiles.
+  Added sl and dylib to list of extensions be installed by Makefile.am
+
+version 1.2.19beta19 [June 28, 2007]
+  Fixed testing PNG_RGB_TO_GRAY_ERR & PNG_RGB_TO_GRAY_WARN in pngrtran.c
+  More cleanup of pnggccrd.c and pngvcrd.c
+
+version 1.2.19beta20 [June 29, 2007]
+  Rebuilt Makefile.in and configure using libtool-1.5.24.
+  Fixed typo in pnggccrd.c
+
+version 1.2.19beta21 [June 30, 2007]
+  More revision of pnggccrd.c
+  Added "test" target to Makefile.in and Makefile.am
+
+version 1.2.19beta22 [July 3, 2007]
+  Added info about pngrutil/pnggccrd/pngvcrd to png_get_header_version()
+  Fix type definition of dummy_value_a, b in pnggccrd.c
+
+version 1.2.19beta23 [July 10, 2007]
+  Revert change to type definition of dummy_value_a, b in pnggccrd.c
+  Make sure __PIC__ is defined in pnggccrd.c when PIC is defined.
+  Require gcc-4.1 or better to use PNG_HAVE_MMX_FILTER_ROW on x86_64 platforms
+
+version 1.2.19beta24 [July 14, 2007]
+  Added PNG_NO_READ_FILTER, PNG_NO_WRITE_FILTER, PNG_NO_WARNING macros.
+  Added contrib/pngminim to demonstrate building minimal encoder and decoder
+
+version 1.2.19beta25 [July 15, 2007]
+  Removed the new PNG_NO_READ_FILTER macro since it would make the library
+    unable to read valid PNG files, and filtering is at the heart of the
+    PNG format.
+
+version 1.2.19beta26 [July 16, 2007]
+  Changed "png_free(str)" to "png_free(png_ptr,str)" in pngrutil.c WinCE
+    code (Yves Piguet).  This bug was introduced in libpng-1.2.14.
+  Updated scripts/CMakeLists.txt
+  Relocated a misplaced #endif in pnggccrd.c
+
+version 1.2.19beta27 [July 17, 2007]
+  Fixed incorrect stride and number of bytes copied (was 4 instead of
+    6 bytes) in the cleanup loop of pnggccrd.c and pngvcrd.c for handling
+    the end of 48-bit interlaced rows (Glenn R-P).
+
+version 1.2.19beta28 [July 19, 2007]
+  Removed requirement for gcc-4.1 or better to use PNG_HAVE_MMX_FILTER_ROW
+    on x86_64 platforms
+  Added png_warning() in pngrutil.c for short iCCP, iTXt, sPLT, or zTXT chunks.
+  Revised pngtest.c so warnings are displayed regardless of PNG_NO_STDIO.
+
+version 1.2.19beta29 [July 20, 2007]
+  Fix typo in pnggccrd.c (%%eax should be %%ax in secondloop48)
+
+version 1.2.19beta30 [July 26, 2007]
+  Revised pnggccrd.c
+
+version 1.2.19beta31 [July 27, 2007]
+  Fix typos in pnggccrd.c
+
+version 1.0.27rc1 and 1.2.19rc1 [July 31, 2007]
+  Disable PNG_MMX_CODE_SUPPORTED when PNG_ASSEMBLER_CODE_SUPPORTED is off.
+  Enable PNG_MMX_READ_FILTER_* by default, except when gcc-3.x is being
+    used (they were inadvertently disabled in libpng-1.2.19beta23).
+  Fix some debugging statements in pnggccrd.c and pngrutil.c
+  Added information about disabling the MMX code in libpng documentation.
+
+version 1.0.27rc2 and 1.2.19rc2 [August 4, 2007]
+  Removed some "#if 0" blocks.
+  Made a global struct local in pngvcrd.c to make it thread safe.
+  Issue a png_error() if application attempts to transform a row tht
+    has not been initialized.
+
+version 1.0.27rc3 and 1.2.19rc3 [August 9, 2007]
+  Slightly revised pngvcrd.c
+
+version 1.0.27rc4 and 1.2.19rc4 [August 9, 2007]
+  Revised pnggccrd.c debugging change of rc1, which was broken.
+  Revised scripts/CMakeLists.txt
+  Change default to PNG_NO_GLOBAL_ARRAYS for MSVC.
+  Turn off PNG_FLAG_ROW_INIT flag when setting transforms that expand pixels.
+
+version 1.0.27rc5 and 1.2.19rc5 [August 10, 2007]
+  Fix typo (missing '"') in pnggccrd.c
+  Revise handling of png_strtod in recent versions of WINCE
+
+version 1.0.27rc6 and 1.2.19rc6 [August 15, 2007]
+  Fix typo (missing ',') in contrib/gregbook/readpng2.c
+  Undid row initialization error exit added to rc2 and rc4.
+
+version 1.0.27 and 1.2.19 [August 18, 2007]
+  Conditionally restored row initialization error exit.
+
+version 1.2.20beta01 [August 19, 2007]
+  Fixed problem with compiling pnggccrd.c on Intel-Apple platforms.
+  Added PNG_NO_ERROR_TEXT feature, with demo in contrib/pngminim
+  Removed define PNG_WARN_UNINITIALIZED_ROW 1 /* 0: warning; 1: error */
+    because it caused some trouble.
+
+version 1.2.20beta02 [August 20, 2007]
+  Avoid compiling pnggccrd.c on Intel-Apple platforms.
+
+version 1.2.20beta03 [August 20, 2007]
+  Added "/D PNG_NO_MMX_CODE" to the non-mmx builds of projects/visualc6
+    and visualc71.
+
+version 1.2.20beta04 [August 21, 2007]
+  Revised pngvcrd.c for improved efficiency (Steve Snyder).
+
+version 1.2.20rc1 [August 23, 2007]
+  Revised pngconf.h to set PNG_NO_MMX_CODE for gcc-3.x compilers.
+
+version 1.2.20rc2 [August 27, 2007]
+  Revised scripts/CMakeLists.txt
+  Revised #ifdefs to ensure one and only one of pnggccrd.c, pngvcrd.c,
+    or part of pngrutil.c is selected.
+
+version 1.2.20rc3 [August 30, 2007]
+  Remove a little more code in pngwutil.c when PNG_NO_WRITE_FILTER is selected.
+  Added /D _CRT_SECURE_NO_WARNINGS to visual6c and visualc71 projects.
+  Compile png_mmx_support() in png.c even when PNG_NO_MMX_CODE is defined.
+  Restored a "superfluous" #ifdef that was removed from 1.2.20rc2 pnggccrd.c,
+    breaking the png_mmx_support() function.
+
+version 1.2.20rc4 [September 1, 2007]
+  Removed Intel contributions (MMX, Optimized C).
+
+version 1.2.20rc5 [September 2, 2007]
+  Restored configure and Makefile.in to rc3 and put a snippet of code in
+    pnggccrd.c, to ensure configure makes the same PNG_NO_MMX_CODE selection
+
+version 1.2.20rc6 [September 2, 2007]
+  Fixed bugs in scripts/CMakeLists.txt
+  Removed pngvcrd.c references from msvc projects.
+
+version 1.0.28 and 1.2.20 [September 8, 2007]
+  Removed "(NO READ SUPPORT)" from png_get_header_version() string.
+
+version 1.2.21beta1 [September 14, 2007]
+  Fixed various mistakes reported by George Cook and Jeff Phillips:
+  logical vs bitwise NOT in pngrtran.c, bug introduced in 1.2.19rc2
+  16-bit cheap transparency expansion, bug introduced in 1.2.19beta2
+  errors with sizeof(unknown_chunk.name), bugs introduced in 1.2.19beta11
+  <= compare with unsigned var in pngset.c, should be ==.
+
+version 1.2.21beta2 [September 18, 2007]
+  Removed some extraneous typecasts.
+
+version 1.2.21rc1 [September 25, 2007]
+  Fixed potential out-of-bounds reads in png_handle_pCAL() and
+    png_handle_ztXt() ("flayer" results reported by Tavis Ormandy).
+
+version 1.2.21rc2 [September 26, 2007]
+  Fixed potential out-of-bounds reads in png_handle_sCAL(),
+    png_handle_iTXt(), and png_push_read_tEXt().
+  Remove some PNG_CONST declarations from pngwutil.c to avoid compiler warnings
+  Revised makefiles to update paths in libpng.pc properly.
+
+version 1.2.21rc3 [September 27, 2007]
+  Revised makefiles to update "Libs" in libpng.pc properly.
+
+version 1.0.29 and 1.2.21rc3 [October 4, 2007]
+  No changes.
+
+version 1.2.22beta1 [October 4, 2007]
+  Again, fixed logical vs bitwise NOT in pngrtran.c, bug introduced
+    in 1.2.19rc2
+
+version 1.2.22beta2 [October 5, 2007]
+  Fixed string length error in pngset.c (caused crashes while decoding iCCP)
+  Add terminating NULL after each instance of png_strncpy().
+
+version 1.2.22beta3 [October 6, 2007]
+  Fix two off-by-one terminating NULL after png_strncpy().
+
+version 1.2.22beta4 [October 7, 2007]
+  Changed some 0 to '\0'.
+
+version 1.0.30rc1 and 1.2.22rc1 [October 8, 2007]
+  No changes.
+
+version 1.0.30 and 1.2.22 [October 13, 2007]
+  No changes.
+
+Send comments/corrections/commendations to png-mng-implement at lists.sf.net
+(subscription required; visit
+https://lists.sourceforge.net/lists/listinfo/png-mng-implement
+to subscribe)
+or to glennrp at users.sourceforge.net
+
+Glenn R-P
diff --git a/uppsrc/plugin/png/lib/INSTALL b/uppsrc/plugin/png/lib/INSTALL
new file mode 100644
index 000000000..be564b10f
--- /dev/null
+++ b/uppsrc/plugin/png/lib/INSTALL
@@ -0,0 +1,199 @@
+
+Installing libpng version 1.2.22 - October 13, 2007
+
+On Unix/Linux and similar systems, you can simply type
+
+    ./configure [--prefix=/path]
+    make check
+    make install
+
+and ignore the rest of this document.
+
+If configure does not work on your system and you have a reasonably
+up-to-date set of tools, running ./autogen.sh before running ./configure
+may fix the problem.  You can also run the individual commands in
+autogen.sh with the --force option, if supported by your version of
+the tools.  If you run 'libtoolize --force', though, this will replace
+the distributed, patched, version of ltmain.sh with an unpatched version
+and your shared library builds may fail to produce libraries with the
+correct version numbers.
+
+Instead, you can use one of the custom-built makefiles in the
+"scripts" directory
+
+    cp scripts/makefile.system makefile
+    make test
+    make install
+
+Or you can use one of the "projects" in the "projects" directory.
+
+If you want to use "cmake" (see www.cmake.org), copy CMakeLists.txt
+from the "scripts" directory to this directory and type
+
+   cmake . [-DPNG_MMX=YES] -DCMAKE_INSTALL_PREFIX=/path
+   make
+   make install
+
+Before installing libpng, you must first install zlib, if it
+is not already on your system.  zlib can usually be found
+wherever you got libpng.  zlib can be placed in another directory,
+at the same level as libpng.
+
+If your system already has a preinstalled zlib you will still need
+to have access to the zlib.h and zconf.h include files that
+correspond to the version of zlib that's installed.
+
+You can rename the directories that you downloaded (they
+might be called "libpng-1.2.22" or "lpng109" and "zlib-1.2.1"
+or "zlib121") so that you have directories called "zlib" and "libpng".
+
+Your directory structure should look like this:
+
+   ..       (the parent directory)
+      libpng  (this directory)
+          INSTALL (this file)
+          README
+          *.h
+          *.c
+          contrib
+             gregbook
+             pngminus
+             pngsuite
+             visupng
+          projects
+             beos
+             c5builder (Borland)
+             visualc6 (msvc)
+             netware.txt
+             wince.txt
+          scripts
+             makefile.*
+          pngtest.png
+          etc.
+      zlib
+          README
+          *.h
+          *.c
+          contrib
+          etc.
+
+If the line endings in the files look funny, you may wish to get the other
+distribution of libpng.  It is available in both tar.gz (UNIX style line
+endings) and zip (DOS style line endings) formats.
+
+If you are building libpng with MSVC, you can enter the
+libpng projects\visualc6 directory and follow the instructions in
+projects\visualc6\README.txt.
+
+You can build libpng for WindowsCE by downloading and installing
+the projects\wince directory as instructed in the projects\wince.txt file, and
+then following the instructions in the README* files.  Similarly, you can
+build libpng for Netware or Beos as instructed in projects\netware.txt
+or projects\beos.
+
+Else enter the zlib directory and follow the instructions in zlib/README,
+then come back here and run "configure" or choose the appropriate
+makefile.sys in the scripts directory.
+
+The files that are presently available in the scripts directory
+include
+
+ CMakeLists.txt    =>  "cmake" script
+ makefile.std      =>  Generic UNIX makefile (cc, creates static libpng.a)
+ makefile.elf      =>  Linux/ELF makefile symbol versioning,
+                       gcc, creates libpng12.so.0.1.2.22)
+ makefile.linux    =>  Linux/ELF makefile
+                       (gcc, creates libpng12.so.0.1.2.22)
+ makefile.gcc      =>  Generic makefile (gcc, creates static libpng.a)
+ makefile.knr      =>  Archaic UNIX Makefile that converts files with
+                       ansi2knr (Requires ansi2knr.c from
+                       ftp://ftp.cs.wisc.edu/ghost)
+ makefile.aix      =>  AIX/gcc makefile
+ makefile.cygwin   =>  Cygwin/gcc makefile
+ makefile.darwin   =>  Darwin makefile, can use on MacosX
+ makefile.dec      =>  DEC Alpha UNIX makefile
+ makefile.freebsd  =>  FreeBSD makefile
+ makefile.hpgcc    =>  HPUX makefile using gcc
+ makefile.hpux     =>  HPUX (10.20 and 11.00) makefile
+ makefile.hp64     =>  HPUX (10.20 and 11.00) makefile, 64-bit
+ makefile.ibmc     =>  IBM C/C++ version 3.x for Win32 and OS/2 (static)
+ makefile.intel    =>  Intel C/C++ version 4.0 and later
+ libpng.icc        =>  Project file for IBM VisualAge/C++ version 4.0 or later
+ makefile.netbsd   =>  NetBSD/cc makefile, uses PNGGCCRD, makes libpng.so.
+ makefile.ne12bsd  =>  NetBSD/cc makefile, uses PNGGCCRD,
+                       makes libpng12.so
+ makefile.openbsd  =>  OpenBSD makefile
+ makefile.sgi      =>  Silicon Graphics IRIX makefile (cc, creates static lib)
+ makefile.sggcc    =>  Silicon Graphics (gcc,
+                       creates libpng12.so.0.1.2.22)
+ makefile.sunos    =>  Sun makefile
+ makefile.solaris  =>  Solaris 2.X makefile (gcc,
+                       creates libpng12.so.0.1.2.22)
+ makefile.solaris-x86 =>  Solaris/intelMMX 2.X makefile (gcc,
+                       creates libpng12.so.0.1.2.22)
+ makefile.so9      =>  Solaris 9 makefile (gcc,
+                       creates libpng12.so.0.1.2.22)
+ makefile.32sunu   =>  Sun Ultra 32-bit makefile
+ makefile.64sunu   =>  Sun Ultra 64-bit makefile
+ makefile.sco      =>  For SCO OSr5  ELF and Unixware 7 with Native cc
+ makefile.mips     =>  MIPS makefile
+ makefile.acorn    =>  Acorn makefile
+ makefile.amiga    =>  Amiga makefile
+ smakefile.ppc     =>  AMIGA smakefile for SAS C V6.58/7.00 PPC compiler
+                       (Requires SCOPTIONS, copied from scripts/SCOPTIONS.ppc)
+ makefile.atari    =>  Atari makefile
+ makefile.beos     =>  BEOS makefile for X86
+ makefile.bor      =>  Borland makefile (uses bcc)
+ makefile.bc32     =>  32-bit Borland C++ (all modules compiled in C mode)
+ makefile.tc3      =>  Turbo C 3.0 makefile
+ makefile.dj2      =>  DJGPP 2 makefile
+ makefile.msc      =>  Microsoft C makefile
+ makefile.vcwin32  =>  makefile for Microsoft Visual C++ 4.0 and later
+ makefile.os2      =>  OS/2 Makefile (gcc and emx, requires pngos2.def)
+ pngos2.def        =>  OS/2 module definition file used by makefile.os2
+ makefile.watcom   =>  Watcom 10a+ Makefile, 32-bit flat memory model
+ makevms.com       =>  VMS build script
+ descrip.mms       =>  VMS makefile for MMS or MMK
+ SCOPTIONS.ppc     =>  Used with smakefile.ppc
+
+Copy the file (or files) that you need from the
+scripts directory into this directory, for example
+
+   MSDOS example: copy scripts\makefile.msc makefile
+   UNIX example:    cp scripts/makefile.std makefile
+
+Read the makefile to see if you need to change any source or
+target directories to match your preferences.
+
+Then read pngconf.h to see if you want to make any configuration
+changes.
+
+Then just run "make" which will create the libpng library in
+this directory and "make test" which will run a quick test that reads
+the "pngtest.png" file and writes a "pngout.png" file that should be
+identical to it.  Look for "9782 zero samples" in the output of the
+test.  For more confidence, you can run another test by typing
+"pngtest pngnow.png" and looking for "289 zero samples" in the output.
+Also, you can run "pngtest -m contrib/pngsuite/*.png" and compare
+your output with the result shown in contrib/pngsuite/README.
+
+Most of the makefiles will allow you to run "make install" to
+put the library in its final resting place (if you want to
+do that, run "make install" in the zlib directory first if necessary).
+Some also allow you to run "make test-installed" after you have
+run "make install".
+
+If you encounter a compiler error message complaining about the
+lines
+      __png.h__ already includes setjmp.h;
+      __dont__ include it again.;
+This means you have compiled another module that includes setjmp.h,
+which is hazardous because the two modules might not include exactly
+the same setjmp.h.  If you are sure that you know what you are doing
+and that they are exactly the same, then you can comment out or
+delete the two lines.  Better yet, use the cexcept interface
+instead, as demonstrated in contrib/visupng of the libpng distribution.
+
+Further information can be found in the README and libpng.txt
+files, in the individual makefiles, in png.h, and the manual pages
+libpng.3 and png.5.
diff --git a/uppsrc/plugin/png/lib/KNOWNBUG b/uppsrc/plugin/png/lib/KNOWNBUG
new file mode 100644
index 000000000..6cd3c4f06
--- /dev/null
+++ b/uppsrc/plugin/png/lib/KNOWNBUG
@@ -0,0 +1,21 @@
+
+Known bugs in libpng version 1.2.22
+
+1. February 23, 2006: The custom makefiles don't build libpng with -lz.
+
+   STATUS: This is a subject of debate. The change will probably be made
+   as a part of a major overhaul of the makefiles in libpng version 1.3.0.
+
+2. February 24, 2006: The Makefile generated by the "configure" script
+   fails to install symbolic links
+   libpng12.so => libpng12.so.0.1.2.9betaN
+   that are generated by the custom makefiles.
+
+3. September 4, 2007:  There is a report that pngtest crashes on MacOS 10.
+
+   STATUS: workarounds are
+      1) Compile without optimization (crashes are observed with
+         -arch i386 and -O2 or -O3, using gcc-4.0.1.
+      2) Compile pngtest.c with PNG_DEBUG defined (the bug goes away if
+         you try to look at it).
+      3) Ignore the crash.  The library itself seems to be OK.
diff --git a/uppsrc/plugin/png/lib/LICENSE b/uppsrc/plugin/png/lib/LICENSE
new file mode 100644
index 000000000..2640ec98f
--- /dev/null
+++ b/uppsrc/plugin/png/lib/LICENSE
@@ -0,0 +1,109 @@
+
+This copy of the libpng notices is provided for your convenience.  In case of
+any discrepancy between this copy and the notices in the file png.h that is
+included in the libpng distribution, the latter shall prevail.
+
+COPYRIGHT NOTICE, DISCLAIMER, and LICENSE:
+
+If you modify libpng you may insert additional notices immediately following
+this sentence.
+
+libpng versions 1.2.6, August 15, 2004, through 1.2.22, October 13, 2007, are
+Copyright (c) 2004, 2006-2007 Glenn Randers-Pehrson, and are
+distributed according to the same disclaimer and license as libpng-1.2.5
+with the following individual added to the list of Contributing Authors
+
+   Cosmin Truta
+
+libpng versions 1.0.7, July 1, 2000, through 1.2.5 - October 3, 2002, are
+Copyright (c) 2000-2002 Glenn Randers-Pehrson, and are
+distributed according to the same disclaimer and license as libpng-1.0.6
+with the following individuals added to the list of Contributing Authors
+
+   Simon-Pierre Cadieux
+   Eric S. Raymond
+   Gilles Vollant
+
+and with the following additions to the disclaimer:
+
+   There is no warranty against interference with your enjoyment of the
+   library or against infringement.  There is no warranty that our
+   efforts or the library will fulfill any of your particular purposes
+   or needs.  This library is provided with all faults, and the entire
+   risk of satisfactory quality, performance, accuracy, and effort is with
+   the user.
+
+libpng versions 0.97, January 1998, through 1.0.6, March 20, 2000, are
+Copyright (c) 1998, 1999 Glenn Randers-Pehrson, and are
+distributed according to the same disclaimer and license as libpng-0.96,
+with the following individuals added to the list of Contributing Authors:
+
+   Tom Lane
+   Glenn Randers-Pehrson
+   Willem van Schaik
+
+libpng versions 0.89, June 1996, through 0.96, May 1997, are
+Copyright (c) 1996, 1997 Andreas Dilger
+Distributed according to the same disclaimer and license as libpng-0.88,
+with the following individuals added to the list of Contributing Authors:
+
+   John Bowler
+   Kevin Bracey
+   Sam Bushell
+   Magnus Holmgren
+   Greg Roelofs
+   Tom Tanner
+
+libpng versions 0.5, May 1995, through 0.88, January 1996, are
+Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.
+
+For the purposes of this copyright and license, "Contributing Authors"
+is defined as the following set of individuals:
+
+   Andreas Dilger
+   Dave Martindale
+   Guy Eric Schalnat
+   Paul Schmidt
+   Tim Wegner
+
+The PNG Reference Library is supplied "AS IS".  The Contributing Authors
+and Group 42, Inc. disclaim all warranties, expressed or implied,
+including, without limitation, the warranties of merchantability and of
+fitness for any purpose.  The Contributing Authors and Group 42, Inc.
+assume no liability for direct, indirect, incidental, special, exemplary,
+or consequential damages, which may result from the use of the PNG
+Reference Library, even if advised of the possibility of such damage.
+
+Permission is hereby granted to use, copy, modify, and distribute this
+source code, or portions hereof, for any purpose, without fee, subject
+to the following restrictions:
+
+1. The origin of this source code must not be misrepresented.
+
+2. Altered versions must be plainly marked as such and must not
+   be misrepresented as being the original source.
+
+3. This Copyright notice may not be removed or altered from any
+   source or altered source distribution.
+
+The Contributing Authors and Group 42, Inc. specifically permit, without
+fee, and encourage the use of this source code as a component to
+supporting the PNG file format in commercial products.  If you use this
+source code in a product, acknowledgment is not required but would be
+appreciated.
+
+
+A "png_get_copyright" function is available, for convenient use in "about"
+boxes and the like:
+
+   printf("%s",png_get_copyright(NULL));
+
+Also, the PNG logo (in PNG format, of course) is supplied in the
+files "pngbar.png" and "pngbar.jpg (88x31) and "pngnow.png" (98x31).
+
+Libpng is OSI Certified Open Source Software.  OSI Certified Open Source is a
+certification mark of the Open Source Initiative.
+
+Glenn Randers-Pehrson
+glennrp at users.sourceforge.net
+October 13, 2007
diff --git a/uppsrc/plugin/png/lib/README b/uppsrc/plugin/png/lib/README
new file mode 100644
index 000000000..c410305f1
--- /dev/null
+++ b/uppsrc/plugin/png/lib/README
@@ -0,0 +1,263 @@
+README for libpng version 1.2.22 - October 13, 2007 (shared library 12.0)
+See the note about version numbers near the top of png.h
+
+See INSTALL for instructions on how to install libpng.
+
+Libpng comes in several distribution formats.  Get libpng-*.tar.gz
+or libpng-*.tar.bz2 if you want UNIX-style line endings in the text
+files, or lpng*.zip if you want DOS-style line endings.
+
+Version 0.89 was the first official release of libpng.  Don't let the
+fact that it's the first release fool you.  The libpng library has been in
+extensive use and testing since mid-1995.  By late 1997 it had
+finally gotten to the stage where there hadn't been significant
+changes to the API in some time, and people have a bad feeling about
+libraries with versions < 1.0.  Version 1.0.0 was released in
+March 1998.
+
+****
+Note that some of the changes to the png_info structure render this
+version of the library binary incompatible with libpng-0.89 or
+earlier versions if you are using a shared library.  The type of the
+"filler" parameter for png_set_filler() has changed from png_byte to
+png_uint_32, which will affect shared-library applications that use
+this function.
+
+To avoid problems with changes to the internals of png_info_struct,
+new APIs have been made available in 0.95 to avoid direct application
+access to info_ptr.  These functions are the png_set_<chunk> and
+png_get_<chunk> functions.  These functions should be used when
+accessing/storing the info_struct data, rather than manipulating it
+directly, to avoid such problems in the future.
+
+It is important to note that the APIs do not make current programs
+that access the info struct directly incompatible with the new
+library.  However, it is strongly suggested that new programs use
+the new APIs (as shown in example.c and pngtest.c), and older programs
+be converted to the new format, to facilitate upgrades in the future.
+****
+
+Additions since 0.90 include the ability to compile libpng as a
+Windows DLL, and new APIs for accessing data in the info struct.
+Experimental functions include the ability to set weighting and cost
+factors for row filter selection, direct reads of integers from buffers
+on big-endian processors that support misaligned data access, faster
+methods of doing alpha composition, and more accurate 16->8 bit color
+conversion.
+
+The additions since 0.89 include the ability to read from a PNG stream
+which has had some (or all) of the signature bytes read by the calling
+application.  This also allows the reading of embedded PNG streams that
+do not have the PNG file signature.  As well, it is now possible to set
+the library action on the detection of chunk CRC errors.  It is possible
+to set different actions based on whether the CRC error occurred in a
+critical or an ancillary chunk.
+
+The changes made to the library, and bugs fixed are based on discussions
+on the PNG-implement mailing list
+and not on material submitted privately to Guy, Andreas, or Glenn.  They will
+forward any good suggestions to the list.
+
+For a detailed description on using libpng, read libpng.txt.  For
+examples of libpng in a program, see example.c and pngtest.c.  For usage
+information and restrictions (what little they are) on libpng, see
+png.h.  For a description on using zlib (the compression library used by
+libpng) and zlib's restrictions, see zlib.h
+
+I have included a general makefile, as well as several machine and
+compiler specific ones, but you may have to modify one for your own needs.
+
+You should use zlib 1.0.4 or later to run this, but it MAY work with
+versions as old as zlib 0.95.  Even so, there are bugs in older zlib
+versions which can cause the output of invalid compression streams for
+some images.  You will definitely need zlib 1.0.4 or later if you are
+taking advantage of the MS-DOS "far" structure allocation for the small
+and medium memory models.  You should also note that zlib is a
+compression library that is useful for more things than just PNG files.
+You can use zlib as a drop-in replacement for fread() and fwrite() if
+you are so inclined.
+
+zlib should be available at the same place that libpng is, or at.
+ftp://ftp.info-zip.org/pub/infozip/zlib
+
+You may also want a copy of the PNG specification.  It is available
+as an RFC, a W3C Recommendation, and an ISO/IEC Standard.  You can find
+these at http://www.libpng.org/pub/png/documents/
+
+This code is currently being archived at libpng.sf.net in the
+[DOWNLOAD] area, and on CompuServe, Lib 20 (PNG SUPPORT)
+at GO GRAPHSUP.  If you can't find it in any of those places,
+e-mail me, and I'll help you find it.
+
+If you have any code changes, requests, problems, etc., please e-mail
+them to me.  Also, I'd appreciate any make files or project files,
+and any modifications you needed to make to get libpng to compile,
+along with a #define variable to tell what compiler/system you are on.
+If you needed to add transformations to libpng, or wish libpng would
+provide the image in a different way, drop me a note (and code, if
+possible), so I can consider supporting the transformation.
+Finally, if you get any warning messages when compiling libpng
+(note: not zlib), and they are easy to fix, I'd appreciate the
+fix.  Please mention "libpng" somewhere in the subject line.  Thanks.
+
+This release was created and will be supported by myself (of course
+based in a large way on Guy's and Andreas' earlier work), and the PNG group.
+
+Send comments/corrections/commendations to png-mng-implement at lists.sf.net
+(subscription required; visit
+https://lists.sourceforge.net/lists/listinfo/png-mng-implement
+to subscribe) or to glennrp at users.sourceforge.net
+
+You can't reach Guy, the original libpng author, at the addresses
+given in previous versions of this document.  He and Andreas will read mail
+addressed to the png-implement list, however.
+
+Please do not send general questions about PNG.  Send them to
+the (png-list at ccrc.wustl.edu, subscription required, write to
+majordomo at ccrc.wustl.edu with "subscribe png-list" in your message).
+On the other hand,
+please do not send libpng questions to that address, send them to me
+or to the png-implement list.  I'll
+get them in the end anyway.  If you have a question about something
+in the PNG specification that is related to using libpng, send it
+to me.  Send me any questions that start with "I was using libpng,
+and ...".  If in doubt, send questions to me.  I'll bounce them
+to others, if necessary.
+
+Please do not send suggestions on how to change PNG.  We have
+been discussing PNG for nine years now, and it is official and
+finished.  If you have suggestions for libpng, however, I'll
+gladly listen.  Even if your suggestion is not used immediately,
+it may be used later.
+
+Files in this distribution:
+
+      ANNOUNCE      =>  Announcement of this version, with recent changes
+      CHANGES       =>  Description of changes between libpng versions
+      KNOWNBUG      =>  List of known bugs and deficiencies
+      LICENSE       =>  License to use and redistribute libpng
+      README        =>  This file
+      TODO          =>  Things not implemented in the current library
+      Y2KINFO       =>  Statement of Y2K compliance
+      example.c     =>  Example code for using libpng functions
+      libpng-*-*-diff.txt => Diff from previous release
+      libpng.3      =>  manual page for libpng (includes libpng.txt)
+      libpng.txt    =>  Description of libpng and its functions
+      libpngpf.3    =>  manual page for libpng's private functions
+      png.5         =>  manual page for the PNG format
+      png.c         =>  Basic interface functions common to library
+      png.h         =>  Library function and interface declarations
+      pngconf.h     =>  System specific library configuration
+      pngerror.c    =>  Error/warning message I/O functions
+      pngget.c      =>  Functions for retrieving info from struct
+      pngmem.c      =>  Memory handling functions
+      pngbar.png    =>  PNG logo, 88x31
+      pngnow.png    =>  PNG logo, 98x31
+      pngpread.c    =>  Progressive reading functions
+      pngread.c     =>  Read data/helper high-level functions
+      pngrio.c      =>  Lowest-level data read I/O functions
+      pngrtran.c    =>  Read data transformation functions
+      pngrutil.c    =>  Read data utility functions
+      pngset.c      =>  Functions for storing data into the info_struct
+      pngtest.c     =>  Library test program
+      pngtest.png   =>  Library test sample image
+      pngtrans.c    =>  Common data transformation functions
+      pngwio.c      =>  Lowest-level write I/O functions
+      pngwrite.c    =>  High-level write functions
+      pngwtran.c    =>  Write data transformations
+      pngwutil.c    =>  Write utility functions
+      contrib       =>  Contributions
+       gregbook         =>  source code for PNG reading and writing, from
+                            Greg Roelofs' "PNG: The Definitive Guide",
+                            O'Reilly, 1999
+       msvctest     =>  Builds and runs pngtest using a MSVC workspace
+       pngminus     =>  Simple pnm2png and png2pnm programs
+       pngsuite     =>  Test images
+       visupng      =>  Contains a MSVC workspace for VisualPng
+      projects      =>  Contains project files and workspaces for building DLL
+       beos             =>  Contains a Beos workspace for building libpng
+       c5builder        =>  Contains a Borland workspace for building libpng
+                            and zlib
+       visualc6         =>  Contains a Microsoft Visual C++ (MSVC) workspace
+                            for building libpng and zlib
+       netware.txt      =>  Contains instructions for downloading a set of
+                            project files for building libpng and zlib on
+                            Netware.
+       wince.txt        =>  Contains instructions for downloading a Microsoft
+                            Visual C++ (Windows CD Toolkit) workspace for
+                            building libpng and zlib on WindowsCE
+      scripts       =>  Directory containing scripts for building libpng:
+       descrip.mms      =>  VMS makefile for MMS or MMK
+       makefile.std     =>  Generic UNIX makefile (cc, creates static libpng.a)
+       makefile.elf     =>  Linux/ELF makefile symbol versioning,
+                            gcc, creates libpng12.so.0.1.2.22)
+       makefile.linux   =>  Linux/ELF makefile
+                            (gcc, creates libpng12.so.0.1.2.22)
+       makefile.gcmmx   =>  Linux/ELF makefile
+                            (gcc, creates libpng12.so.0.1.2.22,
+                            uses assembler code tuned for Intel MMX platform)
+       makefile.gcc     =>  Generic makefile (gcc, creates static libpng.a)
+       makefile.knr     =>  Archaic UNIX Makefile that converts files with
+                            ansi2knr (Requires ansi2knr.c from
+                            ftp://ftp.cs.wisc.edu/ghost)
+       makefile.aix     =>  AIX makefile
+       makefile.cygwin  =>  Cygwin/gcc makefile
+       makefile.darwin  =>  Darwin makefile
+       makefile.dec     =>  DEC Alpha UNIX makefile
+       makefile.freebsd =>  FreeBSD makefile
+       makefile.hpgcc   =>  HPUX makefile using gcc
+       makefile.hpux    =>  HPUX (10.20 and 11.00) makefile
+       makefile.hp64    =>  HPUX (10.20 and 11.00) makefile, 64 bit
+       makefile.ibmc    =>  IBM C/C++ version 3.x for Win32 and OS/2 (static)
+       makefile.intel   =>  Intel C/C++ version 4.0 and later
+       libpng.icc       =>  Project file, IBM VisualAge/C++ 4.0 or later
+       makefile.netbsd  =>  NetBSD/cc makefile, PNGGCCRD, makes libpng.so.
+       makefile.ne12bsd  =>  NetBSD/cc makefile, PNGGCCRD, makes libpng12.so
+       makefile.openbsd =>  OpenBSD makefile
+       makefile.sgi     =>  Silicon Graphics IRIX (cc, creates static lib)
+       makefile.sggcc   =>  Silicon Graphics
+                            (gcc, creates libpng12.so.0.1.2.22)
+       makefile.sunos   =>  Sun makefile
+       makefile.solaris =>  Solaris 2.X makefile
+                            (gcc, creates libpng12.so.0.1.2.22)
+       makefile.so9     =>  Solaris 9 makefile
+                            (gcc, creates libpng12.so.0.1.2.22)
+       makefile.32sunu  =>  Sun Ultra 32-bit makefile
+       makefile.64sunu  =>  Sun Ultra 64-bit makefile
+       makefile.sco     =>  For SCO OSr5  ELF and Unixware 7 with Native cc
+       makefile.mips    =>  MIPS makefile
+       makefile.acorn   =>  Acorn makefile
+       makefile.amiga   =>  Amiga makefile
+       smakefile.ppc    =>  AMIGA smakefile for SAS C V6.58/7.00 PPC
+                            compiler (Requires SCOPTIONS, copied from
+                            scripts/SCOPTIONS.ppc)
+       makefile.atari   =>  Atari makefile
+       makefile.beos    =>  BEOS makefile for X86
+       makefile.bor     =>  Borland makefile (uses bcc)
+       makefile.bc32    =>  32-bit Borland C++ (all modules compiled in C mode)
+       makefile.tc3     =>  Turbo C 3.0 makefile
+       makefile.dj2     =>  DJGPP 2 makefile
+       makefile.msc     =>  Microsoft C makefile
+       makefile.vcawin32=>  makefile for Microsoft Visual C++ 5.0 and
+                            later (uses assembler code tuned for Intel MMX
+                            platform)
+       makefile.vcwin32 =>  makefile for Microsoft Visual C++ 4.0 and
+                            later (does not use assembler code)
+       makefile.os2     =>  OS/2 Makefile (gcc and emx, requires pngos2.def)
+       pngos2.def       =>  OS/2 module definition file used by makefile.os2
+       makefile.watcom  =>  Watcom 10a+ Makefile, 32-bit flat memory model
+       makevms.com      =>  VMS build script
+       SCOPTIONS.ppc    =>  Used with smakefile.ppc
+
+Good luck, and happy coding.
+
+-Glenn Randers-Pehrson (current maintainer)
+ Internet: glennrp at users.sourceforge.net
+
+-Andreas Eric Dilger (former maintainer, 1996-1997)
+ Internet: adilger at enel.ucalgary.ca
+ Web: http://www-mddsp.enel.ucalgary.ca/People/adilger/
+
+-Guy Eric Schalnat (original author and former maintainer, 1995-1996)
+ (formerly of Group 42, Inc)
+ Internet: gschal at infinet.com
diff --git a/uppsrc/plugin/png/lib/example.c b/uppsrc/plugin/png/lib/example.c
new file mode 100644
index 000000000..08158731a
--- /dev/null
+++ b/uppsrc/plugin/png/lib/example.c
@@ -0,0 +1,814 @@
+
+#if 0 /* in case someone actually tries to compile this */
+
+/* example.c - an example of using libpng
+ * Last changed in libpng 1.2.1 December 7, 2001.
+ * This file has been placed in the public domain by the authors.
+ * Maintained 1998-2007 Glenn Randers-Pehrson
+ * Maintained 1996, 1997 Andreas Dilger)
+ * Written 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
+ */
+
+/* This is an example of how to use libpng to read and write PNG files.
+ * The file libpng.txt is much more verbose then this.  If you have not
+ * read it, do so first.  This was designed to be a starting point of an
+ * implementation.  This is not officially part of libpng, is hereby placed
+ * in the public domain, and therefore does not require a copyright notice.
+ *
+ * This file does not currently compile, because it is missing certain
+ * parts, like allocating memory to hold an image.  You will have to
+ * supply these parts to get it to compile.  For an example of a minimal
+ * working PNG reader/writer, see pngtest.c, included in this distribution;
+ * see also the programs in the contrib directory.
+ */
+
+#include "png.h"
+
+ /* The png_jmpbuf() macro, used in error handling, became available in
+  * libpng version 1.0.6.  If you want to be able to run your code with older
+  * versions of libpng, you must define the macro yourself (but only if it
+  * is not already defined by libpng!).
+  */
+
+#ifndef png_jmpbuf
+#  define png_jmpbuf(png_ptr) ((png_ptr)->jmpbuf)
+#endif
+
+/* Check to see if a file is a PNG file using png_sig_cmp().  png_sig_cmp()
+ * returns zero if the image is a PNG and nonzero if it isn't a PNG.
+ *
+ * The function check_if_png() shown here, but not used, returns nonzero (true)
+ * if the file can be opened and is a PNG, 0 (false) otherwise.
+ *
+ * If this call is successful, and you are going to keep the file open,
+ * you should call png_set_sig_bytes(png_ptr, PNG_BYTES_TO_CHECK); once
+ * you have created the png_ptr, so that libpng knows your application
+ * has read that many bytes from the start of the file.  Make sure you
+ * don't call png_set_sig_bytes() with more than 8 bytes read or give it
+ * an incorrect number of bytes read, or you will either have read too
+ * many bytes (your fault), or you are telling libpng to read the wrong
+ * number of magic bytes (also your fault).
+ *
+ * Many applications already read the first 2 or 4 bytes from the start
+ * of the image to determine the file type, so it would be easiest just
+ * to pass the bytes to png_sig_cmp() or even skip that if you know
+ * you have a PNG file, and call png_set_sig_bytes().
+ */
+#define PNG_BYTES_TO_CHECK 4
+int check_if_png(char *file_name, FILE **fp)
+{
+   char buf[PNG_BYTES_TO_CHECK];
+
+   /* Open the prospective PNG file. */
+   if ((*fp = fopen(file_name, "rb")) == NULL)
+      return 0;
+
+   /* Read in some of the signature bytes */
+   if (fread(buf, 1, PNG_BYTES_TO_CHECK, *fp) != PNG_BYTES_TO_CHECK)
+      return 0;
+
+   /* Compare the first PNG_BYTES_TO_CHECK bytes of the signature.
+      Return nonzero (true) if they match */
+
+   return(!png_sig_cmp(buf, (png_size_t)0, PNG_BYTES_TO_CHECK));
+}
+
+/* Read a PNG file.  You may want to return an error code if the read
+ * fails (depending upon the failure).  There are two "prototypes" given
+ * here - one where we are given the filename, and we need to open the
+ * file, and the other where we are given an open file (possibly with
+ * some or all of the magic bytes read - see comments above).
+ */
+#ifdef open_file /* prototype 1 */
+void read_png(char *file_name)  /* We need to open the file */
+{
+   png_structp png_ptr;
+   png_infop info_ptr;
+   unsigned int sig_read = 0;
+   png_uint_32 width, height;
+   int bit_depth, color_type, interlace_type;
+   FILE *fp;
+
+   if ((fp = fopen(file_name, "rb")) == NULL)
+      return (ERROR);
+#else no_open_file /* prototype 2 */
+void read_png(FILE *fp, unsigned int sig_read)  /* file is already open */
+{
+   png_structp png_ptr;
+   png_infop info_ptr;
+   png_uint_32 width, height;
+   int bit_depth, color_type, interlace_type;
+#endif no_open_file /* only use one prototype! */
+
+   /* Create and initialize the png_struct with the desired error handler
+    * functions.  If you want to use the default stderr and longjump method,
+    * you can supply NULL for the last three parameters.  We also supply the
+    * the compiler header file version, so that we know if the application
+    * was compiled with a compatible version of the library.  REQUIRED
+    */
+   png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING,
+      png_voidp user_error_ptr, user_error_fn, user_warning_fn);
+
+   if (png_ptr == NULL)
+   {
+      fclose(fp);
+      return (ERROR);
+   }
+
+   /* Allocate/initialize the memory for image information.  REQUIRED. */
+   info_ptr = png_create_info_struct(png_ptr);
+   if (info_ptr == NULL)
+   {
+      fclose(fp);
+      png_destroy_read_struct(&png_ptr, png_infopp_NULL, png_infopp_NULL);
+      return (ERROR);
+   }
+
+   /* Set error handling if you are using the setjmp/longjmp method (this is
+    * the normal method of doing things with libpng).  REQUIRED unless you
+    * set up your own error handlers in the png_create_read_struct() earlier.
+    */
+
+   if (setjmp(png_jmpbuf(png_ptr)))
+   {
+      /* Free all of the memory associated with the png_ptr and info_ptr */
+      png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL);
+      fclose(fp);
+      /* If we get here, we had a problem reading the file */
+      return (ERROR);
+   }
+
+   /* One of the following I/O initialization methods is REQUIRED */
+#ifdef streams /* PNG file I/O method 1 */
+   /* Set up the input control if you are using standard C streams */
+   png_init_io(png_ptr, fp);
+
+#else no_streams /* PNG file I/O method 2 */
+   /* If you are using replacement read functions, instead of calling
+    * png_init_io() here you would call:
+    */
+   png_set_read_fn(png_ptr, (void *)user_io_ptr, user_read_fn);
+   /* where user_io_ptr is a structure you want available to the callbacks */
+#endif no_streams /* Use only one I/O method! */
+
+   /* If we have already read some of the signature */
+   png_set_sig_bytes(png_ptr, sig_read);
+
+#ifdef hilevel
+   /*
+    * If you have enough memory to read in the entire image at once,
+    * and you need to specify only transforms that can be controlled
+    * with one of the PNG_TRANSFORM_* bits (this presently excludes
+    * dithering, filling, setting background, and doing gamma
+    * adjustment), then you can read the entire image (including
+    * pixels) into the info structure with this call:
+    */
+   png_read_png(png_ptr, info_ptr, png_transforms, png_voidp_NULL);
+#else
+   /* OK, you're doing it the hard way, with the lower-level functions */
+
+   /* The call to png_read_info() gives us all of the information from the
+    * PNG file before the first IDAT (image data chunk).  REQUIRED
+    */
+   png_read_info(png_ptr, info_ptr);
+
+   png_get_IHDR(png_ptr, info_ptr, &width, &height, &bit_depth, &color_type,
+       &interlace_type, int_p_NULL, int_p_NULL);
+
+/* Set up the data transformations you want.  Note that these are all
+ * optional.  Only call them if you want/need them.  Many of the
+ * transformations only work on specific types of images, and many
+ * are mutually exclusive.
+ */
+
+   /* tell libpng to strip 16 bit/color files down to 8 bits/color */
+   png_set_strip_16(png_ptr);
+
+   /* Strip alpha bytes from the input data without combining with the
+    * background (not recommended).
+    */
+   png_set_strip_alpha(png_ptr);
+
+   /* Extract multiple pixels with bit depths of 1, 2, and 4 from a single
+    * byte into separate bytes (useful for paletted and grayscale images).
+    */
+   png_set_packing(png_ptr);
+
+   /* Change the order of packed pixels to least significant bit first
+    * (not useful if you are using png_set_packing). */
+   png_set_packswap(png_ptr);
+
+   /* Expand paletted colors into true RGB triplets */
+   if (color_type == PNG_COLOR_TYPE_PALETTE)
+      png_set_palette_to_rgb(png_ptr);
+
+   /* Expand grayscale images to the full 8 bits from 1, 2, or 4 bits/pixel */
+   if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8)
+      png_set_gray_1_2_4_to_8(png_ptr);
+
+   /* Expand paletted or RGB images with transparency to full alpha channels
+    * so the data will be available as RGBA quartets.
+    */
+   if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS))
+      png_set_tRNS_to_alpha(png_ptr);
+
+   /* Set the background color to draw transparent and alpha images over.
+    * It is possible to set the red, green, and blue components directly
+    * for paletted images instead of supplying a palette index.  Note that
+    * even if the PNG file supplies a background, you are not required to
+    * use it - you should use the (solid) application background if it has one.
+    */
+
+   png_color_16 my_background, *image_background;
+
+   if (png_get_bKGD(png_ptr, info_ptr, &image_background))
+      png_set_background(png_ptr, image_background,
+                         PNG_BACKGROUND_GAMMA_FILE, 1, 1.0);
+   else
+      png_set_background(png_ptr, &my_background,
+                         PNG_BACKGROUND_GAMMA_SCREEN, 0, 1.0);
+
+   /* Some suggestions as to how to get a screen gamma value */
+
+   /* Note that screen gamma is the display_exponent, which includes
+    * the CRT_exponent and any correction for viewing conditions */
+   if (/* We have a user-defined screen gamma value */)
+   {
+      screen_gamma = user-defined screen_gamma;
+   }
+   /* This is one way that applications share the same screen gamma value */
+   else if ((gamma_str = getenv("SCREEN_GAMMA")) != NULL)
+   {
+      screen_gamma = atof(gamma_str);
+   }
+   /* If we don't have another value */
+   else
+   {
+      screen_gamma = 2.2;  /* A good guess for a PC monitors in a dimly
+                              lit room */
+      screen_gamma = 1.7 or 1.0;  /* A good guess for Mac systems */
+   }
+
+   /* Tell libpng to handle the gamma conversion for you.  The final call
+    * is a good guess for PC generated images, but it should be configurable
+    * by the user at run time by the user.  It is strongly suggested that
+    * your application support gamma correction.
+    */
+
+   int intent;
+
+   if (png_get_sRGB(png_ptr, info_ptr, &intent))
+      png_set_gamma(png_ptr, screen_gamma, 0.45455);
+   else
+   {
+      double image_gamma;
+      if (png_get_gAMA(png_ptr, info_ptr, &image_gamma))
+         png_set_gamma(png_ptr, screen_gamma, image_gamma);
+      else
+         png_set_gamma(png_ptr, screen_gamma, 0.45455);
+   }
+
+   /* Dither RGB files down to 8 bit palette or reduce palettes
+    * to the number of colors available on your screen.
+    */
+   if (color_type & PNG_COLOR_MASK_COLOR)
+   {
+      int num_palette;
+      png_colorp palette;
+
+      /* This reduces the image to the application supplied palette */
+      if (/* we have our own palette */)
+      {
+         /* An array of colors to which the image should be dithered */
+         png_color std_color_cube[MAX_SCREEN_COLORS];
+
+         png_set_dither(png_ptr, std_color_cube, MAX_SCREEN_COLORS,
+            MAX_SCREEN_COLORS, png_uint_16p_NULL, 0);
+      }
+      /* This reduces the image to the palette supplied in the file */
+      else if (png_get_PLTE(png_ptr, info_ptr, &palette, &num_palette))
+      {
+         png_uint_16p histogram = NULL;
+
+         png_get_hIST(png_ptr, info_ptr, &histogram);
+
+         png_set_dither(png_ptr, palette, num_palette,
+                        max_screen_colors, histogram, 0);
+      }
+   }
+
+   /* invert monochrome files to have 0 as white and 1 as black */
+   png_set_invert_mono(png_ptr);
+
+   /* If you want to shift the pixel values from the range [0,255] or
+    * [0,65535] to the original [0,7] or [0,31], or whatever range the
+    * colors were originally in:
+    */
+   if (png_get_valid(png_ptr, info_ptr, PNG_INFO_sBIT))
+   {
+      png_color_8p sig_bit;
+
+      png_get_sBIT(png_ptr, info_ptr, &sig_bit);
+      png_set_shift(png_ptr, sig_bit);
+   }
+
+   /* flip the RGB pixels to BGR (or RGBA to BGRA) */
+   if (color_type & PNG_COLOR_MASK_COLOR)
+      png_set_bgr(png_ptr);
+
+   /* swap the RGBA or GA data to ARGB or AG (or BGRA to ABGR) */
+   png_set_swap_alpha(png_ptr);
+
+   /* swap bytes of 16 bit files to least significant byte first */
+   png_set_swap(png_ptr);
+
+   /* Add filler (or alpha) byte (before/after each RGB triplet) */
+   png_set_filler(png_ptr, 0xff, PNG_FILLER_AFTER);
+
+   /* Turn on interlace handling.  REQUIRED if you are not using
+    * png_read_image().  To see how to handle interlacing passes,
+    * see the png_read_row() method below:
+    */
+   number_passes = png_set_interlace_handling(png_ptr);
+
+   /* Optional call to gamma correct and add the background to the palette
+    * and update info structure.  REQUIRED if you are expecting libpng to
+    * update the palette for you (ie you selected such a transform above).
+    */
+   png_read_update_info(png_ptr, info_ptr);
+
+   /* Allocate the memory to hold the image using the fields of info_ptr. */
+
+   /* The easiest way to read the image: */
+   png_bytep row_pointers[height];
+
+   for (row = 0; row < height; row++)
+   {
+      row_pointers[row] = png_malloc(png_ptr, png_get_rowbytes(png_ptr,
+         info_ptr));
+   }
+
+   /* Now it's time to read the image.  One of these methods is REQUIRED */
+#ifdef entire /* Read the entire image in one go */
+   png_read_image(png_ptr, row_pointers);
+
+#else no_entire /* Read the image one or more scanlines at a time */
+   /* The other way to read images - deal with interlacing: */
+
+   for (pass = 0; pass < number_passes; pass++)
+   {
+#ifdef single /* Read the image a single row at a time */
+      for (y = 0; y < height; y++)
+      {
+         png_read_rows(png_ptr, &row_pointers[y], png_bytepp_NULL, 1);
+      }
+
+#else no_single /* Read the image several rows at a time */
+      for (y = 0; y < height; y += number_of_rows)
+      {
+#ifdef sparkle /* Read the image using the "sparkle" effect. */
+         png_read_rows(png_ptr, &row_pointers[y], png_bytepp_NULL,
+            number_of_rows);
+#else no_sparkle /* Read the image using the "rectangle" effect */
+         png_read_rows(png_ptr, png_bytepp_NULL, &row_pointers[y],
+            number_of_rows);
+#endif no_sparkle /* use only one of these two methods */
+      }
+
+      /* if you want to display the image after every pass, do
+         so here */
+#endif no_single /* use only one of these two methods */
+   }
+#endif no_entire /* use only one of these two methods */
+
+   /* read rest of file, and get additional chunks in info_ptr - REQUIRED */
+   png_read_end(png_ptr, info_ptr);
+#endif hilevel
+
+   /* At this point you have read the entire image */
+
+   /* clean up after the read, and free any memory allocated - REQUIRED */
+   png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL);
+
+   /* close the file */
+   fclose(fp);
+
+   /* that's it */
+   return (OK);
+}
+
+/* progressively read a file */
+
+int
+initialize_png_reader(png_structp *png_ptr, png_infop *info_ptr)
+{
+   /* Create and initialize the png_struct with the desired error handler
+    * functions.  If you want to use the default stderr and longjump method,
+    * you can supply NULL for the last three parameters.  We also check that
+    * the library version is compatible in case we are using dynamically
+    * linked libraries.
+    */
+   *png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING,
+       png_voidp user_error_ptr, user_error_fn, user_warning_fn);
+
+   if (*png_ptr == NULL)
+   {
+      *info_ptr = NULL;
+      return (ERROR);
+   }
+
+   *info_ptr = png_create_info_struct(png_ptr);
+
+   if (*info_ptr == NULL)
+   {
+      png_destroy_read_struct(png_ptr, info_ptr, png_infopp_NULL);
+      return (ERROR);
+   }
+
+   if (setjmp(png_jmpbuf((*png_ptr))))
+   {
+      png_destroy_read_struct(png_ptr, info_ptr, png_infopp_NULL);
+      return (ERROR);
+   }
+
+   /* This one's new.  You will need to provide all three
+    * function callbacks, even if you aren't using them all.
+    * If you aren't using all functions, you can specify NULL
+    * parameters.  Even when all three functions are NULL,
+    * you need to call png_set_progressive_read_fn().
+    * These functions shouldn't be dependent on global or
+    * static variables if you are decoding several images
+    * simultaneously.  You should store stream specific data
+    * in a separate struct, given as the second parameter,
+    * and retrieve the pointer from inside the callbacks using
+    * the function png_get_progressive_ptr(png_ptr).
+    */
+   png_set_progressive_read_fn(*png_ptr, (void *)stream_data,
+      info_callback, row_callback, end_callback);
+
+   return (OK);
+}
+
+int
+process_data(png_structp *png_ptr, png_infop *info_ptr,
+   png_bytep buffer, png_uint_32 length)
+{
+   if (setjmp(png_jmpbuf((*png_ptr))))
+   {
+      /* Free the png_ptr and info_ptr memory on error */
+      png_destroy_read_struct(png_ptr, info_ptr, png_infopp_NULL);
+      return (ERROR);
+   }
+
+   /* This one's new also.  Simply give it chunks of data as
+    * they arrive from the data stream (in order, of course).
+    * On Segmented machines, don't give it any more than 64K.
+    * The library seems to run fine with sizes of 4K, although
+    * you can give it much less if necessary (I assume you can
+    * give it chunks of 1 byte, but I haven't tried with less
+    * than 256 bytes yet).  When this function returns, you may
+    * want to display any rows that were generated in the row
+    * callback, if you aren't already displaying them there.
+    */
+   png_process_data(*png_ptr, *info_ptr, buffer, length);
+   return (OK);
+}
+
+info_callback(png_structp png_ptr, png_infop info)
+{
+/* do any setup here, including setting any of the transformations
+ * mentioned in the Reading PNG files section.  For now, you _must_
+ * call either png_start_read_image() or png_read_update_info()
+ * after all the transformations are set (even if you don't set
+ * any).  You may start getting rows before png_process_data()
+ * returns, so this is your last chance to prepare for that.
+ */
+}
+
+row_callback(png_structp png_ptr, png_bytep new_row,
+   png_uint_32 row_num, int pass)
+{
+/*
+ * This function is called for every row in the image.  If the
+ * image is interlaced, and you turned on the interlace handler,
+ * this function will be called for every row in every pass.
+ *
+ * In this function you will receive a pointer to new row data from
+ * libpng called new_row that is to replace a corresponding row (of
+ * the same data format) in a buffer allocated by your application.
+ *
+ * The new row data pointer new_row may be NULL, indicating there is
+ * no new data to be replaced (in cases of interlace loading).
+ *
+ * If new_row is not NULL then you need to call
+ * png_progressive_combine_row() to replace the corresponding row as
+ * shown below:
+ */
+   /* Check if row_num is in bounds. */
+   if((row_num >= 0) && (row_num < height))
+   {
+     /* Get pointer to corresponding row in our
+      * PNG read buffer.
+      */
+     png_bytep old_row = ((png_bytep *)our_data)[row_num];
+
+     /* If both rows are allocated then copy the new row
+      * data to the corresponding row data.
+      */
+     if((old_row != NULL) && (new_row != NULL))
+     png_progressive_combine_row(png_ptr, old_row, new_row);
+   }
+/*
+ * The rows and passes are called in order, so you don't really
+ * need the row_num and pass, but I'm supplying them because it
+ * may make your life easier.
+ *
+ * For the non-NULL rows of interlaced images, you must call
+ * png_progressive_combine_row() passing in the new row and the
+ * old row, as demonstrated above.  You can call this function for
+ * NULL rows (it will just return) and for non-interlaced images
+ * (it just does the png_memcpy for you) if it will make the code
+ * easier.  Thus, you can just do this for all cases:
+ */
+
+   png_progressive_combine_row(png_ptr, old_row, new_row);
+
+/* where old_row is what was displayed for previous rows.  Note
+ * that the first pass (pass == 0 really) will completely cover
+ * the old row, so the rows do not have to be initialized.  After
+ * the first pass (and only for interlaced images), you will have
+ * to pass the current row as new_row, and the function will combine
+ * the old row and the new row.
+ */
+}
+
+end_callback(png_structp png_ptr, png_infop info)
+{
+/* this function is called when the whole image has been read,
+ * including any chunks after the image (up to and including
+ * the IEND).  You will usually have the same info chunk as you
+ * had in the header, although some data may have been added
+ * to the comments and time fields.
+ *
+ * Most people won't do much here, perhaps setting a flag that
+ * marks the image as finished.
+ */
+}
+
+/* write a png file */
+void write_png(char *file_name /* , ... other image information ... */)
+{
+   FILE *fp;
+   png_structp png_ptr;
+   png_infop info_ptr;
+   png_colorp palette;
+
+   /* open the file */
+   fp = fopen(file_name, "wb");
+   if (fp == NULL)
+      return (ERROR);
+
+   /* Create and initialize the png_struct with the desired error handler
+    * functions.  If you want to use the default stderr and longjump method,
+    * you can supply NULL for the last three parameters.  We also check that
+    * the library version is compatible with the one used at compile time,
+    * in case we are using dynamically linked libraries.  REQUIRED.
+    */
+   png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING,
+      png_voidp user_error_ptr, user_error_fn, user_warning_fn);
+
+   if (png_ptr == NULL)
+   {
+      fclose(fp);
+      return (ERROR);
+   }
+
+   /* Allocate/initialize the image information data.  REQUIRED */
+   info_ptr = png_create_info_struct(png_ptr);
+   if (info_ptr == NULL)
+   {
+      fclose(fp);
+      png_destroy_write_struct(&png_ptr,  png_infopp_NULL);
+      return (ERROR);
+   }
+
+   /* Set error handling.  REQUIRED if you aren't supplying your own
+    * error handling functions in the png_create_write_struct() call.
+    */
+   if (setjmp(png_jmpbuf(png_ptr)))
+   {
+      /* If we get here, we had a problem reading the file */
+      fclose(fp);
+      png_destroy_write_struct(&png_ptr, &info_ptr);
+      return (ERROR);
+   }
+
+   /* One of the following I/O initialization functions is REQUIRED */
+#ifdef streams /* I/O initialization method 1 */
+   /* set up the output control if you are using standard C streams */
+   png_init_io(png_ptr, fp);
+#else no_streams /* I/O initialization method 2 */
+   /* If you are using replacement read functions, instead of calling
+    * png_init_io() here you would call */
+   png_set_write_fn(png_ptr, (void *)user_io_ptr, user_write_fn,
+      user_IO_flush_function);
+   /* where user_io_ptr is a structure you want available to the callbacks */
+#endif no_streams /* only use one initialization method */
+
+#ifdef hilevel
+   /* This is the easy way.  Use it if you already have all the
+    * image info living info in the structure.  You could "|" many
+    * PNG_TRANSFORM flags into the png_transforms integer here.
+    */
+   png_write_png(png_ptr, info_ptr, png_transforms, png_voidp_NULL);
+#else
+   /* This is the hard way */
+
+   /* Set the image information here.  Width and height are up to 2^31,
+    * bit_depth is one of 1, 2, 4, 8, or 16, but valid values also depend on
+    * the color_type selected. color_type is one of PNG_COLOR_TYPE_GRAY,
+    * PNG_COLOR_TYPE_GRAY_ALPHA, PNG_COLOR_TYPE_PALETTE, PNG_COLOR_TYPE_RGB,
+    * or PNG_COLOR_TYPE_RGB_ALPHA.  interlace is either PNG_INTERLACE_NONE or
+    * PNG_INTERLACE_ADAM7, and the compression_type and filter_type MUST
+    * currently be PNG_COMPRESSION_TYPE_BASE and PNG_FILTER_TYPE_BASE. REQUIRED
+    */
+   png_set_IHDR(png_ptr, info_ptr, width, height, bit_depth, PNG_COLOR_TYPE_???,
+      PNG_INTERLACE_????, PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE);
+
+   /* set the palette if there is one.  REQUIRED for indexed-color images */
+   palette = (png_colorp)png_malloc(png_ptr, PNG_MAX_PALETTE_LENGTH
+             * png_sizeof (png_color));
+   /* ... set palette colors ... */
+   png_set_PLTE(png_ptr, info_ptr, palette, PNG_MAX_PALETTE_LENGTH);
+   /* You must not free palette here, because png_set_PLTE only makes a link to
+      the palette that you malloced.  Wait until you are about to destroy
+      the png structure. */
+
+   /* optional significant bit chunk */
+   /* if we are dealing with a grayscale image then */
+   sig_bit.gray = true_bit_depth;
+   /* otherwise, if we are dealing with a color image then */
+   sig_bit.red = true_red_bit_depth;
+   sig_bit.green = true_green_bit_depth;
+   sig_bit.blue = true_blue_bit_depth;
+   /* if the image has an alpha channel then */
+   sig_bit.alpha = true_alpha_bit_depth;
+   png_set_sBIT(png_ptr, info_ptr, sig_bit);
+
+
+   /* Optional gamma chunk is strongly suggested if you have any guess
+    * as to the correct gamma of the image.
+    */
+   png_set_gAMA(png_ptr, info_ptr, gamma);
+
+   /* Optionally write comments into the image */
+   text_ptr[0].key = "Title";
+   text_ptr[0].text = "Mona Lisa";
+   text_ptr[0].compression = PNG_TEXT_COMPRESSION_NONE;
+   text_ptr[1].key = "Author";
+   text_ptr[1].text = "Leonardo DaVinci";
+   text_ptr[1].compression = PNG_TEXT_COMPRESSION_NONE;
+   text_ptr[2].key = "Description";
+   text_ptr[2].text = "<long text>";
+   text_ptr[2].compression = PNG_TEXT_COMPRESSION_zTXt;
+#ifdef PNG_iTXt_SUPPORTED
+   text_ptr[0].lang = NULL;
+   text_ptr[1].lang = NULL;
+   text_ptr[2].lang = NULL;
+#endif
+   png_set_text(png_ptr, info_ptr, text_ptr, 3);
+
+   /* other optional chunks like cHRM, bKGD, tRNS, tIME, oFFs, pHYs, */
+   /* note that if sRGB is present the gAMA and cHRM chunks must be ignored
+    * on read and must be written in accordance with the sRGB profile */
+
+   /* Write the file header information.  REQUIRED */
+   png_write_info(png_ptr, info_ptr);
+
+   /* If you want, you can write the info in two steps, in case you need to
+    * write your private chunk ahead of PLTE:
+    *
+    *   png_write_info_before_PLTE(write_ptr, write_info_ptr);
+    *   write_my_chunk();
+    *   png_write_info(png_ptr, info_ptr);
+    *
+    * However, given the level of known- and unknown-chunk support in 1.1.0
+    * and up, this should no longer be necessary.
+    */
+
+   /* Once we write out the header, the compression type on the text
+    * chunks gets changed to PNG_TEXT_COMPRESSION_NONE_WR or
+    * PNG_TEXT_COMPRESSION_zTXt_WR, so it doesn't get written out again
+    * at the end.
+    */
+
+   /* set up the transformations you want.  Note that these are
+    * all optional.  Only call them if you want them.
+    */
+
+   /* invert monochrome pixels */
+   png_set_invert_mono(png_ptr);
+
+   /* Shift the pixels up to a legal bit depth and fill in
+    * as appropriate to correctly scale the image.
+    */
+   png_set_shift(png_ptr, &sig_bit);
+
+   /* pack pixels into bytes */
+   png_set_packing(png_ptr);
+
+   /* swap location of alpha bytes from ARGB to RGBA */
+   png_set_swap_alpha(png_ptr);
+
+   /* Get rid of filler (OR ALPHA) bytes, pack XRGB/RGBX/ARGB/RGBA into
+    * RGB (4 channels -> 3 channels). The second parameter is not used.
+    */
+   png_set_filler(png_ptr, 0, PNG_FILLER_BEFORE);
+
+   /* flip BGR pixels to RGB */
+   png_set_bgr(png_ptr);
+
+   /* swap bytes of 16-bit files to most significant byte first */
+   png_set_swap(png_ptr);
+
+   /* swap bits of 1, 2, 4 bit packed pixel formats */
+   png_set_packswap(png_ptr);
+
+   /* turn on interlace handling if you are not using png_write_image() */
+   if (interlacing)
+      number_passes = png_set_interlace_handling(png_ptr);
+   else
+      number_passes = 1;
+
+   /* The easiest way to write the image (you may have a different memory
+    * layout, however, so choose what fits your needs best).  You need to
+    * use the first method if you aren't handling interlacing yourself.
+    */
+   png_uint_32 k, height, width;
+   png_byte image[height][width*bytes_per_pixel];
+   png_bytep row_pointers[height];
+
+   if (height > PNG_UINT_32_MAX/png_sizeof(png_bytep))
+     png_error (png_ptr, "Image is too tall to process in memory");
+
+   for (k = 0; k < height; k++)
+     row_pointers[k] = image + k*width*bytes_per_pixel;
+
+   /* One of the following output methods is REQUIRED */
+#ifdef entire /* write out the entire image data in one call */
+   png_write_image(png_ptr, row_pointers);
+
+   /* the other way to write the image - deal with interlacing */
+
+#else no_entire /* write out the image data by one or more scanlines */
+   /* The number of passes is either 1 for non-interlaced images,
+    * or 7 for interlaced images.
+    */
+   for (pass = 0; pass < number_passes; pass++)
+   {
+      /* Write a few rows at a time. */
+      png_write_rows(png_ptr, &row_pointers[first_row], number_of_rows);
+
+      /* If you are only writing one row at a time, this works */
+      for (y = 0; y < height; y++)
+      {
+         png_write_rows(png_ptr, &row_pointers[y], 1);
+      }
+   }
+#endif no_entire /* use only one output method */
+
+   /* You can write optional chunks like tEXt, zTXt, and tIME at the end
+    * as well.  Shouldn't be necessary in 1.1.0 and up as all the public
+    * chunks are supported and you can use png_set_unknown_chunks() to
+    * register unknown chunks into the info structure to be written out.
+    */
+
+   /* It is REQUIRED to call this to finish writing the rest of the file */
+   png_write_end(png_ptr, info_ptr);
+#endif hilevel
+
+   /* If you png_malloced a palette, free it here (don't free info_ptr->palette,
+      as recommended in versions 1.0.5m and earlier of this example; if
+      libpng mallocs info_ptr->palette, libpng will free it).  If you
+      allocated it with malloc() instead of png_malloc(), use free() instead
+      of png_free(). */
+   png_free(png_ptr, palette);
+   palette=NULL;
+
+   /* Similarly, if you png_malloced any data that you passed in with
+      png_set_something(), such as a hist or trans array, free it here,
+      when you can be sure that libpng is through with it. */
+   png_free(png_ptr, trans);
+   trans=NULL;
+
+   /* clean up after the write, and free any memory allocated */
+   png_destroy_write_struct(&png_ptr, &info_ptr);
+
+   /* close the file */
+   fclose(fp);
+
+   /* that's it */
+   return (OK);
+}
+
+#endif /* if 0 */
diff --git a/uppsrc/plugin/png/lib/libpng-1.2.22.txt b/uppsrc/plugin/png/lib/libpng-1.2.22.txt
new file mode 100644
index 000000000..fff7412bd
--- /dev/null
+++ b/uppsrc/plugin/png/lib/libpng-1.2.22.txt
@@ -0,0 +1,2851 @@
+libpng.txt - A description on how to use and modify libpng
+
+ libpng version 1.2.22 - October 13, 2007
+ Updated and distributed by Glenn Randers-Pehrson
+ <glennrp at users.sourceforge.net>
+ Copyright (c) 1998-2007 Glenn Randers-Pehrson
+ For conditions of distribution and use, see copyright
+ notice in png.h.
+
+ based on:
+
+ libpng 1.0 beta 6  version 0.96 May 28, 1997
+ Updated and distributed by Andreas Dilger
+ Copyright (c) 1996, 1997 Andreas Dilger
+
+ libpng 1.0 beta 2 - version 0.88  January 26, 1996
+ For conditions of distribution and use, see copyright
+ notice in png.h. Copyright (c) 1995, 1996 Guy Eric
+ Schalnat, Group 42, Inc.
+
+ Updated/rewritten per request in the libpng FAQ
+ Copyright (c) 1995, 1996 Frank J. T. Wojcik
+ December 18, 1995 & January 20, 1996
+
+I. Introduction
+
+This file describes how to use and modify the PNG reference library
+(known as libpng) for your own use.  There are five sections to this
+file: introduction, structures, reading, writing, and modification and
+configuration notes for various special platforms.  In addition to this
+file, example.c is a good starting point for using the library, as
+it is heavily commented and should include everything most people
+will need.  We assume that libpng is already installed; see the
+INSTALL file for instructions on how to install libpng.
+
+For examples of libpng usage, see the files "example.c", "pngtest.c",
+and the files in the "contrib" directory, all of which are included in the
+libpng distribution.
+
+Libpng was written as a companion to the PNG specification, as a way
+of reducing the amount of time and effort it takes to support the PNG
+file format in application programs.
+
+The PNG specification (second edition), November 2003, is available as
+a W3C Recommendation and as an ISO Standard (ISO/IEC 15948:2003 (E)) at
+<http://www.w3.org/TR/2003/REC-PNG-20031110/
+The W3C and ISO documents have identical technical content.
+
+The PNG-1.2 specification is available at
+<http://www.libpng.org/pub/png/documents/>
+
+The PNG-1.0 specification is available
+as RFC 2083 <http://www.libpng.org/pub/png/documents/> and as a
+W3C Recommendation <http://www.w3.org/TR/REC.png.html>. Some
+additional chunks are described in the special-purpose public chunks
+documents at <http://www.libpng.org/pub/png/documents/>.
+
+Other information
+about PNG, and the latest version of libpng, can be found at the PNG home
+page, <http://www.libpng.org/pub/png/>.
+
+Most users will not have to modify the library significantly; advanced
+users may want to modify it more.  All attempts were made to make it as
+complete as possible, while keeping the code easy to understand.
+Currently, this library only supports C.  Support for other languages
+is being considered.
+
+Libpng has been designed to handle multiple sessions at one time,
+to be easily modifiable, to be portable to the vast majority of
+machines (ANSI, K&R, 16-, 32-, and 64-bit) available, and to be easy
+to use.  The ultimate goal of libpng is to promote the acceptance of
+the PNG file format in whatever way possible.  While there is still
+work to be done (see the TODO file), libpng should cover the
+majority of the needs of its users.
+
+Libpng uses zlib for its compression and decompression of PNG files.
+Further information about zlib, and the latest version of zlib, can
+be found at the zlib home page, <http://www.info-zip.org/pub/infozip/zlib/>.
+The zlib compression utility is a general purpose utility that is
+useful for more than PNG files, and can be used without libpng.
+See the documentation delivered with zlib for more details.
+You can usually find the source files for the zlib utility wherever you
+find the libpng source files.
+
+Libpng is thread safe, provided the threads are using different
+instances of the structures.  Each thread should have its own
+png_struct and png_info instances, and thus its own image.
+Libpng does not protect itself against two threads using the
+same instance of a structure.
+
+II. Structures
+
+There are two main structures that are important to libpng, png_struct
+and png_info.  The first, png_struct, is an internal structure that
+will not, for the most part, be used by a user except as the first
+variable passed to every libpng function call.
+
+The png_info structure is designed to provide information about the
+PNG file.  At one time, the fields of png_info were intended to be
+directly accessible to the user.  However, this tended to cause problems
+with applications using dynamically loaded libraries, and as a result
+a set of interface functions for png_info (the png_get_*() and png_set_*()
+functions) was developed.  The fields of png_info are still available for
+older applications, but it is suggested that applications use the new
+interfaces if at all possible.
+
+Applications that do make direct access to the members of png_struct (except
+for png_ptr->jmpbuf) must be recompiled whenever the library is updated,
+and applications that make direct access to the members of png_info must
+be recompiled if they were compiled or loaded with libpng version 1.0.6,
+in which the members were in a different order.  In version 1.0.7, the
+members of the png_info structure reverted to the old order, as they were
+in versions 0.97c through 1.0.5.  Starting with version 2.0.0, both
+structures are going to be hidden, and the contents of the structures will
+only be accessible through the png_get/png_set functions.
+
+The png.h header file is an invaluable reference for programming with libpng.
+And while I'm on the topic, make sure you include the libpng header file:
+
+#include <png.h>
+
+III. Reading
+
+We'll now walk you through the possible functions to call when reading
+in a PNG file sequentially, briefly explaining the syntax and purpose
+of each one.  See example.c and png.h for more detail.  While
+progressive reading is covered in the next section, you will still
+need some of the functions discussed in this section to read a PNG
+file.
+
+Setup
+
+You will want to do the I/O initialization(*) before you get into libpng,
+so if it doesn't work, you don't have much to undo.  Of course, you
+will also want to insure that you are, in fact, dealing with a PNG
+file.  Libpng provides a simple check to see if a file is a PNG file.
+To use it, pass in the first 1 to 8 bytes of the file to the function
+png_sig_cmp(), and it will return 0 if the bytes match the corresponding
+bytes of the PNG signature, or nonzero otherwise.  Of course, the more bytes
+you pass in, the greater the accuracy of the prediction.
+
+If you are intending to keep the file pointer open for use in libpng,
+you must ensure you don't read more than 8 bytes from the beginning
+of the file, and you also have to make a call to png_set_sig_bytes_read()
+with the number of bytes you read from the beginning.  Libpng will
+then only check the bytes (if any) that your program didn't read.
+
+(*): If you are not using the standard I/O functions, you will need
+to replace them with custom functions.  See the discussion under
+Customizing libpng.
+
+
+    FILE *fp = fopen(file_name, "rb");
+    if (!fp)
+    {
+        return (ERROR);
+    }
+    fread(header, 1, number, fp);
+    is_png = !png_sig_cmp(header, 0, number);
+    if (!is_png)
+    {
+        return (NOT_PNG);
+    }
+
+
+Next, png_struct and png_info need to be allocated and initialized.  In
+order to ensure that the size of these structures is correct even with a
+dynamically linked libpng, there are functions to initialize and
+allocate the structures.  We also pass the library version, optional
+pointers to error handling functions, and a pointer to a data struct for
+use by the error functions, if necessary (the pointer and functions can
+be NULL if the default error handlers are to be used).  See the section
+on Changes to Libpng below regarding the old initialization functions.
+The structure allocation functions quietly return NULL if they fail to
+create the structure, so your application should check for that.
+
+    png_structp png_ptr = png_create_read_struct
+       (PNG_LIBPNG_VER_STRING, (png_voidp)user_error_ptr,
+        user_error_fn, user_warning_fn);
+    if (!png_ptr)
+        return (ERROR);
+
+    png_infop info_ptr = png_create_info_struct(png_ptr);
+    if (!info_ptr)
+    {
+        png_destroy_read_struct(&png_ptr,
+           (png_infopp)NULL, (png_infopp)NULL);
+        return (ERROR);
+    }
+
+    png_infop end_info = png_create_info_struct(png_ptr);
+    if (!end_info)
+    {
+        png_destroy_read_struct(&png_ptr, &info_ptr,
+          (png_infopp)NULL);
+        return (ERROR);
+    }
+
+If you want to use your own memory allocation routines,
+define PNG_USER_MEM_SUPPORTED and use
+png_create_read_struct_2() instead of png_create_read_struct():
+
+    png_structp png_ptr = png_create_read_struct_2
+       (PNG_LIBPNG_VER_STRING, (png_voidp)user_error_ptr,
+        user_error_fn, user_warning_fn, (png_voidp)
+        user_mem_ptr, user_malloc_fn, user_free_fn);
+
+The error handling routines passed to png_create_read_struct()
+and the memory alloc/free routines passed to png_create_struct_2()
+are only necessary if you are not using the libpng supplied error
+handling and memory alloc/free functions.
+
+When libpng encounters an error, it expects to longjmp back
+to your routine.  Therefore, you will need to call setjmp and pass
+your png_jmpbuf(png_ptr).  If you read the file from different
+routines, you will need to update the jmpbuf field every time you enter
+a new routine that will call a png_*() function.
+
+See your documentation of setjmp/longjmp for your compiler for more
+information on setjmp/longjmp.  See the discussion on libpng error
+handling in the Customizing Libpng section below for more information
+on the libpng error handling.  If an error occurs, and libpng longjmp's
+back to your setjmp, you will want to call png_destroy_read_struct() to
+free any memory.
+
+    if (setjmp(png_jmpbuf(png_ptr)))
+    {
+        png_destroy_read_struct(&png_ptr, &info_ptr,
+           &end_info);
+        fclose(fp);
+        return (ERROR);
+    }
+
+If you would rather avoid the complexity of setjmp/longjmp issues,
+you can compile libpng with PNG_SETJMP_NOT_SUPPORTED, in which case
+errors will result in a call to PNG_ABORT() which defaults to abort().
+
+Now you need to set up the input code.  The default for libpng is to
+use the C function fread().  If you use this, you will need to pass a
+valid FILE * in the function png_init_io().  Be sure that the file is
+opened in binary mode.  If you wish to handle reading data in another
+way, you need not call the png_init_io() function, but you must then
+implement the libpng I/O methods discussed in the Customizing Libpng
+section below.
+
+    png_init_io(png_ptr, fp);
+
+If you had previously opened the file and read any of the signature from
+the beginning in order to see if this was a PNG file, you need to let
+libpng know that there are some bytes missing from the start of the file.
+
+    png_set_sig_bytes(png_ptr, number);
+
+Setting up callback code
+
+You can set up a callback function to handle any unknown chunks in the
+input stream. You must supply the function
+
+    read_chunk_callback(png_ptr ptr,
+         png_unknown_chunkp chunk);
+    {
+       /* The unknown chunk structure contains your
+          chunk data: */
+           png_byte name[5];
+           png_byte *data;
+           png_size_t size;
+       /* Note that libpng has already taken care of
+          the CRC handling */
+
+       /* put your code here.  Return one of the
+          following: */
+
+       return (-n); /* chunk had an error */
+       return (0); /* did not recognize */
+       return (n); /* success */
+    }
+
+(You can give your function another name that you like instead of
+"read_chunk_callback")
+
+To inform libpng about your function, use
+
+    png_set_read_user_chunk_fn(png_ptr, user_chunk_ptr,
+        read_chunk_callback);
+
+This names not only the callback function, but also a user pointer that
+you can retrieve with
+
+    png_get_user_chunk_ptr(png_ptr);
+
+At this point, you can set up a callback function that will be
+called after each row has been read, which you can use to control
+a progress meter or the like.  It's demonstrated in pngtest.c.
+You must supply a function
+
+    void read_row_callback(png_ptr ptr, png_uint_32 row,
+       int pass);
+    {
+      /* put your code here */
+    }
+
+(You can give it another name that you like instead of "read_row_callback")
+
+To inform libpng about your function, use
+
+    png_set_read_status_fn(png_ptr, read_row_callback);
+
+Width and height limits
+
+The PNG specification allows the width and height of an image to be as
+large as 2^31-1 (0x7fffffff), or about 2.147 billion rows and columns.
+Since very few applications really need to process such large images,
+we have imposed an arbitrary 1-million limit on rows and columns.
+Larger images will be rejected immediately with a png_error() call. If
+you wish to override this limit, you can use
+
+   png_set_user_limits(png_ptr, width_max, height_max);
+
+to set your own limits, or use width_max = height_max = 0x7fffffffL
+to allow all valid dimensions (libpng may reject some very large images
+anyway because of potential buffer overflow conditions).
+
+You should put this statement after you create the PNG structure and
+before calling png_read_info(), png_read_png(), or png_process_data().
+If you need to retrieve the limits that are being applied, use
+
+   width_max = png_get_user_width_max(png_ptr);
+   height_max = png_get_user_height_max(png_ptr);
+
+Unknown-chunk handling
+
+Now you get to set the way the library processes unknown chunks in the
+input PNG stream. Both known and unknown chunks will be read.  Normal
+behavior is that known chunks will be parsed into information in
+various info_ptr members; unknown chunks will be discarded. To change
+this, you can call:
+
+    png_set_keep_unknown_chunks(png_ptr, keep,
+        chunk_list, num_chunks);
+    keep       - 0: do not handle as unknown
+                 1: do not keep
+                 2: keep only if safe-to-copy
+                 3: keep even if unsafe-to-copy
+               You can use these definitions:
+                 PNG_HANDLE_CHUNK_AS_DEFAULT   0
+                 PNG_HANDLE_CHUNK_NEVER        1
+                 PNG_HANDLE_CHUNK_IF_SAFE      2
+                 PNG_HANDLE_CHUNK_ALWAYS       3
+    chunk_list - list of chunks affected (a byte string,
+                 five bytes per chunk, NULL or '\0' if
+                 num_chunks is 0)
+    num_chunks - number of chunks affected; if 0, all
+                 unknown chunks are affected.  If nonzero,
+                 only the chunks in the list are affected
+
+Unknown chunks declared in this way will be saved as raw data onto a
+list of png_unknown_chunk structures.  If a chunk that is normally
+known to libpng is named in the list, it will be handled as unknown,
+according to the "keep" directive.  If a chunk is named in successive
+instances of png_set_keep_unknown_chunks(), the final instance will
+take precedence.  The IHDR and IEND chunks should not be named in
+chunk_list; if they are, libpng will process them normally anyway.
+
+The high-level read interface
+
+At this point there are two ways to proceed; through the high-level
+read interface, or through a sequence of low-level read operations.
+You can use the high-level interface if (a) you are willing to read
+the entire image into memory, and (b) the input transformations
+you want to do are limited to the following set:
+
+    PNG_TRANSFORM_IDENTITY      No transformation
+    PNG_TRANSFORM_STRIP_16      Strip 16-bit samples to
+                                8 bits
+    PNG_TRANSFORM_STRIP_ALPHA   Discard the alpha channel
+    PNG_TRANSFORM_PACKING       Expand 1, 2 and 4-bit
+                                samples to bytes
+    PNG_TRANSFORM_PACKSWAP      Change order of packed
+                                pixels to LSB first
+    PNG_TRANSFORM_EXPAND        Perform set_expand()
+    PNG_TRANSFORM_INVERT_MONO   Invert monochrome images
+    PNG_TRANSFORM_SHIFT         Normalize pixels to the
+                                sBIT depth
+    PNG_TRANSFORM_BGR           Flip RGB to BGR, RGBA
+                                to BGRA
+    PNG_TRANSFORM_SWAP_ALPHA    Flip RGBA to ARGB or GA
+                                to AG
+    PNG_TRANSFORM_INVERT_ALPHA  Change alpha from opacity
+                                to transparency
+    PNG_TRANSFORM_SWAP_ENDIAN   Byte-swap 16-bit samples
+
+(This excludes setting a background color, doing gamma transformation,
+dithering, and setting filler.)  If this is the case, simply do this:
+
+    png_read_png(png_ptr, info_ptr, png_transforms, NULL)
+
+where png_transforms is an integer containing the bitwise OR of
+some set of transformation flags.  This call is equivalent to png_read_info(),
+followed the set of transformations indicated by the transform mask,
+then png_read_image(), and finally png_read_end().
+
+(The final parameter of this call is not yet used.  Someday it might point
+to transformation parameters required by some future input transform.)
+
+You must use png_transforms and not call any png_set_transform() functions
+when you use png_read_png().
+
+After you have called png_read_png(), you can retrieve the image data
+with
+
+   row_pointers = png_get_rows(png_ptr, info_ptr);
+
+where row_pointers is an array of pointers to the pixel data for each row:
+
+   png_bytep row_pointers[height];
+
+If you know your image size and pixel size ahead of time, you can allocate
+row_pointers prior to calling png_read_png() with
+
+   if (height > PNG_UINT_32_MAX/png_sizeof(png_byte))
+      png_error (png_ptr,
+         "Image is too tall to process in memory");
+   if (width > PNG_UINT_32_MAX/pixel_size)
+      png_error (png_ptr,
+         "Image is too wide to process in memory");
+   row_pointers = png_malloc(png_ptr,
+      height*png_sizeof(png_bytep));
+   for (int i=0; i<height, i++)
+      row_pointers[i]=png_malloc(png_ptr,
+         width*pixel_size);
+   png_set_rows(png_ptr, info_ptr, &row_pointers);
+
+Alternatively you could allocate your image in one big block and define
+row_pointers[i] to point into the proper places in your block.
+
+If you use png_set_rows(), the application is responsible for freeing
+row_pointers (and row_pointers[i], if they were separately allocated).
+
+If you don't allocate row_pointers ahead of time, png_read_png() will
+do it, and it'll be free'ed when you call png_destroy_*().
+
+The low-level read interface
+
+If you are going the low-level route, you are now ready to read all
+the file information up to the actual image data.  You do this with a
+call to png_read_info().
+
+    png_read_info(png_ptr, info_ptr);
+
+This will process all chunks up to but not including the image data.
+
+Querying the info structure
+
+Functions are used to get the information from the info_ptr once it
+has been read.  Note that these fields may not be completely filled
+in until png_read_end() has read the chunk data following the image.
+
+    png_get_IHDR(png_ptr, info_ptr, &width, &height,
+       &bit_depth, &color_type, &interlace_type,
+       &compression_type, &filter_method);
+
+    width          - holds the width of the image
+                     in pixels (up to 2^31).
+    height         - holds the height of the image
+                     in pixels (up to 2^31).
+    bit_depth      - holds the bit depth of one of the
+                     image channels.  (valid values are
+                     1, 2, 4, 8, 16 and depend also on
+                     the color_type.  See also
+                     significant bits (sBIT) below).
+    color_type     - describes which color/alpha channels
+                         are present.
+                     PNG_COLOR_TYPE_GRAY
+                        (bit depths 1, 2, 4, 8, 16)
+                     PNG_COLOR_TYPE_GRAY_ALPHA
+                        (bit depths 8, 16)
+                     PNG_COLOR_TYPE_PALETTE
+                        (bit depths 1, 2, 4, 8)
+                     PNG_COLOR_TYPE_RGB
+                        (bit_depths 8, 16)
+                     PNG_COLOR_TYPE_RGB_ALPHA
+                        (bit_depths 8, 16)
+
+                     PNG_COLOR_MASK_PALETTE
+                     PNG_COLOR_MASK_COLOR
+                     PNG_COLOR_MASK_ALPHA
+
+    filter_method  - (must be PNG_FILTER_TYPE_BASE
+                     for PNG 1.0, and can also be
+                     PNG_INTRAPIXEL_DIFFERENCING if
+                     the PNG datastream is embedded in
+                     a MNG-1.0 datastream)
+    compression_type - (must be PNG_COMPRESSION_TYPE_BASE
+                     for PNG 1.0)
+    interlace_type - (PNG_INTERLACE_NONE or
+                     PNG_INTERLACE_ADAM7)
+    Any or all of interlace_type, compression_type, of
+    filter_method can be NULL if you are
+    not interested in their values.
+
+    channels = png_get_channels(png_ptr, info_ptr);
+    channels       - number of channels of info for the
+                     color type (valid values are 1 (GRAY,
+                     PALETTE), 2 (GRAY_ALPHA), 3 (RGB),
+                     4 (RGB_ALPHA or RGB + filler byte))
+    rowbytes = png_get_rowbytes(png_ptr, info_ptr);
+    rowbytes       - number of bytes needed to hold a row
+
+    signature = png_get_signature(png_ptr, info_ptr);
+    signature      - holds the signature read from the
+                     file (if any).  The data is kept in
+                     the same offset it would be if the
+                     whole signature were read (i.e. if an
+                     application had already read in 4
+                     bytes of signature before starting
+                     libpng, the remaining 4 bytes would
+                     be in signature[4] through signature[7]
+                     (see png_set_sig_bytes())).
+
+
+    width            = png_get_image_width(png_ptr,
+                         info_ptr);
+    height           = png_get_image_height(png_ptr,
+                         info_ptr);
+    bit_depth        = png_get_bit_depth(png_ptr,
+                         info_ptr);
+    color_type       = png_get_color_type(png_ptr,
+                         info_ptr);
+    filter_method    = png_get_filter_type(png_ptr,
+                         info_ptr);
+    compression_type = png_get_compression_type(png_ptr,
+                         info_ptr);
+    interlace_type   = png_get_interlace_type(png_ptr,
+                         info_ptr);
+
+
+These are also important, but their validity depends on whether the chunk
+has been read.  The png_get_valid(png_ptr, info_ptr, PNG_INFO_<chunk>) and
+png_get_<chunk>(png_ptr, info_ptr, ...) functions return non-zero if the
+data has been read, or zero if it is missing.  The parameters to the
+png_get_<chunk> are set directly if they are simple data types, or a pointer
+into the info_ptr is returned for any complex types.
+
+    png_get_PLTE(png_ptr, info_ptr, &palette,
+                     &num_palette);
+    palette        - the palette for the file
+                     (array of png_color)
+    num_palette    - number of entries in the palette
+
+    png_get_gAMA(png_ptr, info_ptr, &gamma);
+    gamma          - the gamma the file is written
+                     at (PNG_INFO_gAMA)
+
+    png_get_sRGB(png_ptr, info_ptr, &srgb_intent);
+    srgb_intent    - the rendering intent (PNG_INFO_sRGB)
+                     The presence of the sRGB chunk
+                     means that the pixel data is in the
+                     sRGB color space.  This chunk also
+                     implies specific values of gAMA and
+                     cHRM.
+
+    png_get_iCCP(png_ptr, info_ptr, &name,
+       &compression_type, &profile, &proflen);
+    name            - The profile name.
+    compression     - The compression type; always
+                      PNG_COMPRESSION_TYPE_BASE for PNG 1.0.
+                      You may give NULL to this argument to
+                      ignore it.
+    profile         - International Color Consortium color
+                      profile data. May contain NULs.
+    proflen         - length of profile data in bytes.
+
+    png_get_sBIT(png_ptr, info_ptr, &sig_bit);
+    sig_bit        - the number of significant bits for
+                     (PNG_INFO_sBIT) each of the gray,
+                     red, green, and blue channels,
+                     whichever are appropriate for the
+                     given color type (png_color_16)
+
+    png_get_tRNS(png_ptr, info_ptr, &trans, &num_trans,
+                     &trans_values);
+    trans          - array of transparent entries for
+                     palette (PNG_INFO_tRNS)
+    trans_values   - graylevel or color sample values of
+                     the single transparent color for
+                     non-paletted images (PNG_INFO_tRNS)
+    num_trans      - number of transparent entries
+                     (PNG_INFO_tRNS)
+
+    png_get_hIST(png_ptr, info_ptr, &hist);
+                     (PNG_INFO_hIST)
+    hist           - histogram of palette (array of
+                     png_uint_16)
+
+    png_get_tIME(png_ptr, info_ptr, &mod_time);
+    mod_time       - time image was last modified
+                    (PNG_VALID_tIME)
+
+    png_get_bKGD(png_ptr, info_ptr, &background);
+    background     - background color (PNG_VALID_bKGD)
+                     valid 16-bit red, green and blue
+                     values, regardless of color_type
+
+    num_comments   = png_get_text(png_ptr, info_ptr,
+                     &text_ptr, &num_text);
+    num_comments   - number of comments
+    text_ptr       - array of png_text holding image
+                     comments
+    text_ptr[i].compression - type of compression used
+                 on "text" PNG_TEXT_COMPRESSION_NONE
+                           PNG_TEXT_COMPRESSION_zTXt
+                           PNG_ITXT_COMPRESSION_NONE
+                           PNG_ITXT_COMPRESSION_zTXt
+    text_ptr[i].key   - keyword for comment.  Must contain
+                         1-79 characters.
+    text_ptr[i].text  - text comments for current
+                         keyword.  Can be empty.
+    text_ptr[i].text_length - length of text string,
+                 after decompression, 0 for iTXt
+    text_ptr[i].itxt_length - length of itxt string,
+                 after decompression, 0 for tEXt/zTXt
+    text_ptr[i].lang  - language of comment (empty
+                         string for unknown).
+    text_ptr[i].lang_key  - keyword in UTF-8
+                         (empty string for unknown).
+    num_text       - number of comments (same as
+                     num_comments; you can put NULL here
+                     to avoid the duplication)
+    Note while png_set_text() will accept text, language,
+    and translated keywords that can be NULL pointers, the
+    structure returned by png_get_text will always contain
+    regular zero-terminated C strings.  They might be
+    empty strings but they will never be NULL pointers.
+
+    num_spalettes = png_get_sPLT(png_ptr, info_ptr,
+       &palette_ptr);
+    palette_ptr    - array of palette structures holding
+                     contents of one or more sPLT chunks
+                     read.
+    num_spalettes  - number of sPLT chunks read.
+
+    png_get_oFFs(png_ptr, info_ptr, &offset_x, &offset_y,
+       &unit_type);
+    offset_x       - positive offset from the left edge
+                     of the screen
+    offset_y       - positive offset from the top edge
+                     of the screen
+    unit_type      - PNG_OFFSET_PIXEL, PNG_OFFSET_MICROMETER
+
+    png_get_pHYs(png_ptr, info_ptr, &res_x, &res_y,
+       &unit_type);
+    res_x          - pixels/unit physical resolution in
+                     x direction
+    res_y          - pixels/unit physical resolution in
+                     x direction
+    unit_type      - PNG_RESOLUTION_UNKNOWN,
+                     PNG_RESOLUTION_METER
+
+    png_get_sCAL(png_ptr, info_ptr, &unit, &width,
+       &height)
+    unit        - physical scale units (an integer)
+    width       - width of a pixel in physical scale units
+    height      - height of a pixel in physical scale units
+                 (width and height are doubles)
+
+    png_get_sCAL_s(png_ptr, info_ptr, &unit, &width,
+       &height)
+    unit        - physical scale units (an integer)
+    width       - width of a pixel in physical scale units
+    height      - height of a pixel in physical scale units
+                 (width and height are strings like "2.54")
+
+    num_unknown_chunks = png_get_unknown_chunks(png_ptr,
+       info_ptr, &unknowns)
+    unknowns          - array of png_unknown_chunk
+                        structures holding unknown chunks
+    unknowns[i].name  - name of unknown chunk
+    unknowns[i].data  - data of unknown chunk
+    unknowns[i].size  - size of unknown chunk's data
+    unknowns[i].location - position of chunk in file
+
+    The value of "i" corresponds to the order in which the
+    chunks were read from the PNG file or inserted with the
+    png_set_unknown_chunks() function.
+
+The data from the pHYs chunk can be retrieved in several convenient
+forms:
+
+    res_x = png_get_x_pixels_per_meter(png_ptr,
+       info_ptr)
+    res_y = png_get_y_pixels_per_meter(png_ptr,
+       info_ptr)
+    res_x_and_y = png_get_pixels_per_meter(png_ptr,
+       info_ptr)
+    res_x = png_get_x_pixels_per_inch(png_ptr,
+       info_ptr)
+    res_y = png_get_y_pixels_per_inch(png_ptr,
+       info_ptr)
+    res_x_and_y = png_get_pixels_per_inch(png_ptr,
+       info_ptr)
+    aspect_ratio = png_get_pixel_aspect_ratio(png_ptr,
+       info_ptr)
+
+   (Each of these returns 0 [signifying "unknown"] if
+       the data is not present or if res_x is 0;
+       res_x_and_y is 0 if res_x != res_y)
+
+The data from the oFFs chunk can be retrieved in several convenient
+forms:
+
+    x_offset = png_get_x_offset_microns(png_ptr, info_ptr);
+    y_offset = png_get_y_offset_microns(png_ptr, info_ptr);
+    x_offset = png_get_x_offset_inches(png_ptr, info_ptr);
+    y_offset = png_get_y_offset_inches(png_ptr, info_ptr);
+
+   (Each of these returns 0 [signifying "unknown" if both
+       x and y are 0] if the data is not present or if the
+       chunk is present but the unit is the pixel)
+
+For more information, see the png_info definition in png.h and the
+PNG specification for chunk contents.  Be careful with trusting
+rowbytes, as some of the transformations could increase the space
+needed to hold a row (expand, filler, gray_to_rgb, etc.).
+See png_read_update_info(), below.
+
+A quick word about text_ptr and num_text.  PNG stores comments in
+keyword/text pairs, one pair per chunk, with no limit on the number
+of text chunks, and a 2^31 byte limit on their size.  While there are
+suggested keywords, there is no requirement to restrict the use to these
+strings.  It is strongly suggested that keywords and text be sensible
+to humans (that's the point), so don't use abbreviations.  Non-printing
+symbols are not allowed.  See the PNG specification for more details.
+There is also no requirement to have text after the keyword.
+
+Keywords should be limited to 79 Latin-1 characters without leading or
+trailing spaces, but non-consecutive spaces are allowed within the
+keyword.  It is possible to have the same keyword any number of times.
+The text_ptr is an array of png_text structures, each holding a
+pointer to a language string, a pointer to a keyword and a pointer to
+a text string.  The text string, language code, and translated
+keyword may be empty or NULL pointers.  The keyword/text
+pairs are put into the array in the order that they are received.
+However, some or all of the text chunks may be after the image, so, to
+make sure you have read all the text chunks, don't mess with these
+until after you read the stuff after the image.  This will be
+mentioned again below in the discussion that goes with png_read_end().
+
+Input transformations
+
+After you've read the header information, you can set up the library
+to handle any special transformations of the image data.  The various
+ways to transform the data will be described in the order that they
+should occur.  This is important, as some of these change the color
+type and/or bit depth of the data, and some others only work on
+certain color types and bit depths.  Even though each transformation
+checks to see if it has data that it can do something with, you should
+make sure to only enable a transformation if it will be valid for the
+data.  For example, don't swap red and blue on grayscale data.
+
+The colors used for the background and transparency values should be
+supplied in the same format/depth as the current image data.  They
+are stored in the same format/depth as the image data in a bKGD or tRNS
+chunk, so this is what libpng expects for this data.  The colors are
+transformed to keep in sync with the image data when an application
+calls the png_read_update_info() routine (see below).
+
+Data will be decoded into the supplied row buffers packed into bytes
+unless the library has been told to transform it into another format.
+For example, 4 bit/pixel paletted or grayscale data will be returned
+2 pixels/byte with the leftmost pixel in the high-order bits of the
+byte, unless png_set_packing() is called.  8-bit RGB data will be stored
+in RGB RGB RGB format unless png_set_filler() or png_set_add_alpha()
+is called to insert filler bytes, either before or after each RGB triplet.
+16-bit RGB data will be returned RRGGBB RRGGBB, with the most significant
+byte of the color value first, unless png_set_strip_16() is called to
+transform it to regular RGB RGB triplets, or png_set_filler() or
+png_set_add alpha() is called to insert filler bytes, either before or
+after each RRGGBB triplet.  Similarly, 8-bit or 16-bit grayscale data can
+be modified with
+png_set_filler(), png_set_add_alpha(), or png_set_strip_16().
+
+The following code transforms grayscale images of less than 8 to 8 bits,
+changes paletted images to RGB, and adds a full alpha channel if there is
+transparency information in a tRNS chunk.  This is most useful on
+grayscale images with bit depths of 2 or 4 or if there is a multiple-image
+viewing application that wishes to treat all images in the same way.
+
+    if (color_type == PNG_COLOR_TYPE_PALETTE)
+        png_set_palette_to_rgb(png_ptr);
+
+    if (color_type == PNG_COLOR_TYPE_GRAY &&
+        bit_depth < 8) png_set_expand_gray_1_2_4_to_8(png_ptr);
+
+    if (png_get_valid(png_ptr, info_ptr,
+        PNG_INFO_tRNS)) png_set_tRNS_to_alpha(png_ptr);
+
+These three functions are actually aliases for png_set_expand(), added
+in libpng version 1.0.4, with the function names expanded to improve code
+readability.  In some future version they may actually do different
+things.
+
+As of libpng version 1.2.9, png_set_expand_gray_1_2_4_to_8() was
+added.  It expands the sample depth without changing tRNS to alpha.
+At the same time, png_set_gray_1_2_4_to_8() was deprecated, and it
+will be removed from a future version.
+
+PNG can have files with 16 bits per channel.  If you only can handle
+8 bits per channel, this will strip the pixels down to 8 bit.
+
+    if (bit_depth == 16)
+        png_set_strip_16(png_ptr);
+
+If, for some reason, you don't need the alpha channel on an image,
+and you want to remove it rather than combining it with the background
+(but the image author certainly had in mind that you *would* combine
+it with the background, so that's what you should probably do):
+
+    if (color_type & PNG_COLOR_MASK_ALPHA)
+        png_set_strip_alpha(png_ptr);
+
+In PNG files, the alpha channel in an image
+is the level of opacity.  If you need the alpha channel in an image to
+be the level of transparency instead of opacity, you can invert the
+alpha channel (or the tRNS chunk data) after it's read, so that 0 is
+fully opaque and 255 (in 8-bit or paletted images) or 65535 (in 16-bit
+images) is fully transparent, with
+
+    png_set_invert_alpha(png_ptr);
+
+PNG files pack pixels of bit depths 1, 2, and 4 into bytes as small as
+they can, resulting in, for example, 8 pixels per byte for 1 bit
+files.  This code expands to 1 pixel per byte without changing the
+values of the pixels:
+
+    if (bit_depth < 8)
+        png_set_packing(png_ptr);
+
+PNG files have possible bit depths of 1, 2, 4, 8, and 16.  All pixels
+stored in a PNG image have been "scaled" or "shifted" up to the next
+higher possible bit depth (e.g. from 5 bits/sample in the range [0,31] to
+8 bits/sample in the range [0, 255]).  However, it is also possible to
+convert the PNG pixel data back to the original bit depth of the image.
+This call reduces the pixels back down to the original bit depth:
+
+    png_color_8p sig_bit;
+
+    if (png_get_sBIT(png_ptr, info_ptr, &sig_bit))
+        png_set_shift(png_ptr, sig_bit);
+
+PNG files store 3-color pixels in red, green, blue order.  This code
+changes the storage of the pixels to blue, green, red:
+
+    if (color_type == PNG_COLOR_TYPE_RGB ||
+        color_type == PNG_COLOR_TYPE_RGB_ALPHA)
+        png_set_bgr(png_ptr);
+
+PNG files store RGB pixels packed into 3 or 6 bytes. This code expands them
+into 4 or 8 bytes for windowing systems that need them in this format:
+
+    if (color_type == PNG_COLOR_TYPE_RGB)
+        png_set_filler(png_ptr, filler, PNG_FILLER_BEFORE);
+
+where "filler" is the 8 or 16-bit number to fill with, and the location is
+either PNG_FILLER_BEFORE or PNG_FILLER_AFTER, depending upon whether
+you want the filler before the RGB or after.  This transformation
+does not affect images that already have full alpha channels.  To add an
+opaque alpha channel, use filler=0xff or 0xffff and PNG_FILLER_AFTER which
+will generate RGBA pixels.
+
+Note that png_set_filler() does not change the color type.  If you want
+to do that, you can add a true alpha channel with
+
+    if (color_type == PNG_COLOR_TYPE_RGB ||
+           color_type == PNG_COLOR_TYPE_GRAY)
+    png_set_add_alpha(png_ptr, filler, PNG_FILLER_AFTER);
+
+where "filler" contains the alpha value to assign to each pixel.
+This function was added in libpng-1.2.7.
+
+If you are reading an image with an alpha channel, and you need the
+data as ARGB instead of the normal PNG format RGBA:
+
+    if (color_type == PNG_COLOR_TYPE_RGB_ALPHA)
+        png_set_swap_alpha(png_ptr);
+
+For some uses, you may want a grayscale image to be represented as
+RGB.  This code will do that conversion:
+
+    if (color_type == PNG_COLOR_TYPE_GRAY ||
+        color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
+          png_set_gray_to_rgb(png_ptr);
+
+Conversely, you can convert an RGB or RGBA image to grayscale or grayscale
+with alpha.
+
+    if (color_type == PNG_COLOR_TYPE_RGB ||
+        color_type == PNG_COLOR_TYPE_RGB_ALPHA)
+          png_set_rgb_to_gray_fixed(png_ptr, error_action,
+             int red_weight, int green_weight);
+
+    error_action = 1: silently do the conversion
+    error_action = 2: issue a warning if the original
+                      image has any pixel where
+                      red != green or red != blue
+    error_action = 3: issue an error and abort the
+                      conversion if the original
+                      image has any pixel where
+                      red != green or red != blue
+
+    red_weight:       weight of red component times 100000
+    green_weight:     weight of green component times 100000
+                      If either weight is negative, default
+                      weights (21268, 71514) are used.
+
+If you have set error_action = 1 or 2, you can
+later check whether the image really was gray, after processing
+the image rows, with the png_get_rgb_to_gray_status(png_ptr) function.
+It will return a png_byte that is zero if the image was gray or
+1 if there were any non-gray pixels.  bKGD and sBIT data
+will be silently converted to grayscale, using the green channel
+data, regardless of the error_action setting.
+
+With red_weight+green_weight<=100000,
+the normalized graylevel is computed:
+
+    int rw = red_weight * 65536;
+    int gw = green_weight * 65536;
+    int bw = 65536 - (rw + gw);
+    gray = (rw*red + gw*green + bw*blue)/65536;
+
+The default values approximate those recommended in the Charles
+Poynton's Color FAQ, <http://www.inforamp.net/~poynton/>
+Copyright (c) 1998-01-04 Charles Poynton <poynton at inforamp.net>
+
+    Y = 0.212671 * R + 0.715160 * G + 0.072169 * B
+
+Libpng approximates this with
+
+    Y = 0.21268 * R    + 0.7151 * G    + 0.07217 * B
+
+which can be expressed with integers as
+
+    Y = (6969 * R + 23434 * G + 2365 * B)/32768
+
+The calculation is done in a linear colorspace, if the image gamma
+is known.
+
+If you have a grayscale and you are using png_set_expand_depth(),
+png_set_expand(), or png_set_gray_to_rgb to change to truecolor or to
+a higher bit-depth, you must either supply the background color as a gray
+value at the original file bit-depth (need_expand = 1) or else supply the
+background color as an RGB triplet at the final, expanded bit depth
+(need_expand = 0).  Similarly, if you are reading a paletted image, you
+must either supply the background color as a palette index (need_expand = 1)
+or as an RGB triplet that may or may not be in the palette (need_expand = 0).
+
+    png_color_16 my_background;
+    png_color_16p image_background;
+
+    if (png_get_bKGD(png_ptr, info_ptr, &image_background))
+        png_set_background(png_ptr, image_background,
+          PNG_BACKGROUND_GAMMA_FILE, 1, 1.0);
+    else
+        png_set_background(png_ptr, &my_background,
+          PNG_BACKGROUND_GAMMA_SCREEN, 0, 1.0);
+
+The png_set_background() function tells libpng to composite images
+with alpha or simple transparency against the supplied background
+color.  If the PNG file contains a bKGD chunk (PNG_INFO_bKGD valid),
+you may use this color, or supply another color more suitable for
+the current display (e.g., the background color from a web page).  You
+need to tell libpng whether the color is in the gamma space of the
+display (PNG_BACKGROUND_GAMMA_SCREEN for colors you supply), the file
+(PNG_BACKGROUND_GAMMA_FILE for colors from the bKGD chunk), or one
+that is neither of these gammas (PNG_BACKGROUND_GAMMA_UNIQUE - I don't
+know why anyone would use this, but it's here).
+
+To properly display PNG images on any kind of system, the application needs
+to know what the display gamma is.  Ideally, the user will know this, and
+the application will allow them to set it.  One method of allowing the user
+to set the display gamma separately for each system is to check for a
+SCREEN_GAMMA or DISPLAY_GAMMA environment variable, which will hopefully be
+correctly set.
+
+Note that display_gamma is the overall gamma correction required to produce
+pleasing results, which depends on the lighting conditions in the surrounding
+environment.  In a dim or brightly lit room, no compensation other than
+the physical gamma exponent of the monitor is needed, while in a dark room
+a slightly smaller exponent is better.
+
+   double gamma, screen_gamma;
+
+   if (/* We have a user-defined screen
+       gamma value */)
+   {
+      screen_gamma = user_defined_screen_gamma;
+   }
+   /* One way that applications can share the same
+      screen gamma value */
+   else if ((gamma_str = getenv("SCREEN_GAMMA"))
+      != NULL)
+   {
+      screen_gamma = (double)atof(gamma_str);
+   }
+   /* If we don't have another value */
+   else
+   {
+      screen_gamma = 2.2; /* A good guess for a
+           PC monitor in a bright office or a dim room */
+      screen_gamma = 2.0; /* A good guess for a
+           PC monitor in a dark room */
+      screen_gamma = 1.7 or 1.0;  /* A good
+           guess for Mac systems */
+   }
+
+The png_set_gamma() function handles gamma transformations of the data.
+Pass both the file gamma and the current screen_gamma.  If the file does
+not have a gamma value, you can pass one anyway if you have an idea what
+it is (usually 0.45455 is a good guess for GIF images on PCs).  Note
+that file gammas are inverted from screen gammas.  See the discussions
+on gamma in the PNG specification for an excellent description of what
+gamma is, and why all applications should support it.  It is strongly
+recommended that PNG viewers support gamma correction.
+
+   if (png_get_gAMA(png_ptr, info_ptr, &gamma))
+      png_set_gamma(png_ptr, screen_gamma, gamma);
+   else
+      png_set_gamma(png_ptr, screen_gamma, 0.45455);
+
+If you need to reduce an RGB file to a paletted file, or if a paletted
+file has more entries then will fit on your screen, png_set_dither()
+will do that.  Note that this is a simple match dither that merely
+finds the closest color available.  This should work fairly well with
+optimized palettes, and fairly badly with linear color cubes.  If you
+pass a palette that is larger then maximum_colors, the file will
+reduce the number of colors in the palette so it will fit into
+maximum_colors.  If there is a histogram, it will use it to make
+more intelligent choices when reducing the palette.  If there is no
+histogram, it may not do as good a job.
+
+   if (color_type & PNG_COLOR_MASK_COLOR)
+   {
+      if (png_get_valid(png_ptr, info_ptr,
+         PNG_INFO_PLTE))
+      {
+         png_uint_16p histogram = NULL;
+
+         png_get_hIST(png_ptr, info_ptr,
+            &histogram);
+         png_set_dither(png_ptr, palette, num_palette,
+            max_screen_colors, histogram, 1);
+      }
+      else
+      {
+         png_color std_color_cube[MAX_SCREEN_COLORS] =
+            { ... colors ... };
+
+         png_set_dither(png_ptr, std_color_cube,
+            MAX_SCREEN_COLORS, MAX_SCREEN_COLORS,
+            NULL,0);
+      }
+   }
+
+PNG files describe monochrome as black being zero and white being one.
+The following code will reverse this (make black be one and white be
+zero):
+
+   if (bit_depth == 1 && color_type == PNG_COLOR_TYPE_GRAY)
+      png_set_invert_mono(png_ptr);
+
+This function can also be used to invert grayscale and gray-alpha images:
+
+   if (color_type == PNG_COLOR_TYPE_GRAY ||
+        color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
+      png_set_invert_mono(png_ptr);
+
+PNG files store 16 bit pixels in network byte order (big-endian,
+ie. most significant bits first).  This code changes the storage to the
+other way (little-endian, i.e. least significant bits first, the
+way PCs store them):
+
+    if (bit_depth == 16)
+        png_set_swap(png_ptr);
+
+If you are using packed-pixel images (1, 2, or 4 bits/pixel), and you
+need to change the order the pixels are packed into bytes, you can use:
+
+    if (bit_depth < 8)
+       png_set_packswap(png_ptr);
+
+Finally, you can write your own transformation function if none of
+the existing ones meets your needs.  This is done by setting a callback
+with
+
+    png_set_read_user_transform_fn(png_ptr,
+       read_transform_fn);
+
+You must supply the function
+
+    void read_transform_fn(png_ptr ptr, row_info_ptr
+       row_info, png_bytep data)
+
+See pngtest.c for a working example.  Your function will be called
+after all of the other transformations have been processed.
+
+You can also set up a pointer to a user structure for use by your
+callback function, and you can inform libpng that your transform
+function will change the number of channels or bit depth with the
+function
+
+    png_set_user_transform_info(png_ptr, user_ptr,
+       user_depth, user_channels);
+
+The user's application, not libpng, is responsible for allocating and
+freeing any memory required for the user structure.
+
+You can retrieve the pointer via the function
+png_get_user_transform_ptr().  For example:
+
+    voidp read_user_transform_ptr =
+       png_get_user_transform_ptr(png_ptr);
+
+The last thing to handle is interlacing; this is covered in detail below,
+but you must call the function here if you want libpng to handle expansion
+of the interlaced image.
+
+    number_of_passes = png_set_interlace_handling(png_ptr);
+
+After setting the transformations, libpng can update your png_info
+structure to reflect any transformations you've requested with this
+call.  This is most useful to update the info structure's rowbytes
+field so you can use it to allocate your image memory.  This function
+will also update your palette with the correct screen_gamma and
+background if these have been given with the calls above.
+
+    png_read_update_info(png_ptr, info_ptr);
+
+After you call png_read_update_info(), you can allocate any
+memory you need to hold the image.  The row data is simply
+raw byte data for all forms of images.  As the actual allocation
+varies among applications, no example will be given.  If you
+are allocating one large chunk, you will need to build an
+array of pointers to each row, as it will be needed for some
+of the functions below.
+
+Reading image data
+
+After you've allocated memory, you can read the image data.
+The simplest way to do this is in one function call.  If you are
+allocating enough memory to hold the whole image, you can just
+call png_read_image() and libpng will read in all the image data
+and put it in the memory area supplied.  You will need to pass in
+an array of pointers to each row.
+
+This function automatically handles interlacing, so you don't need
+to call png_set_interlace_handling() or call this function multiple
+times, or any of that other stuff necessary with png_read_rows().
+
+   png_read_image(png_ptr, row_pointers);
+
+where row_pointers is:
+
+   png_bytep row_pointers[height];
+
+You can point to void or char or whatever you use for pixels.
+
+If you don't want to read in the whole image at once, you can
+use png_read_rows() instead.  If there is no interlacing (check
+interlace_type == PNG_INTERLACE_NONE), this is simple:
+
+    png_read_rows(png_ptr, row_pointers, NULL,
+       number_of_rows);
+
+where row_pointers is the same as in the png_read_image() call.
+
+If you are doing this just one row at a time, you can do this with
+a single row_pointer instead of an array of row_pointers:
+
+    png_bytep row_pointer = row;
+    png_read_row(png_ptr, row_pointer, NULL);
+
+If the file is interlaced (interlace_type != 0 in the IHDR chunk), things
+get somewhat harder.  The only current (PNG Specification version 1.2)
+interlacing type for PNG is (interlace_type == PNG_INTERLACE_ADAM7)
+is a somewhat complicated 2D interlace scheme, known as Adam7, that
+breaks down an image into seven smaller images of varying size, based
+on an 8x8 grid.
+
+libpng can fill out those images or it can give them to you "as is".
+If you want them filled out, there are two ways to do that.  The one
+mentioned in the PNG specification is to expand each pixel to cover
+those pixels that have not been read yet (the "rectangle" method).
+This results in a blocky image for the first pass, which gradually
+smooths out as more pixels are read.  The other method is the "sparkle"
+method, where pixels are drawn only in their final locations, with the
+rest of the image remaining whatever colors they were initialized to
+before the start of the read.  The first method usually looks better,
+but tends to be slower, as there are more pixels to put in the rows.
+
+If you don't want libpng to handle the interlacing details, just call
+png_read_rows() seven times to read in all seven images.  Each of the
+images is a valid image by itself, or they can all be combined on an
+8x8 grid to form a single image (although if you intend to combine them
+you would be far better off using the libpng interlace handling).
+
+The first pass will return an image 1/8 as wide as the entire image
+(every 8th column starting in column 0) and 1/8 as high as the original
+(every 8th row starting in row 0), the second will be 1/8 as wide
+(starting in column 4) and 1/8 as high (also starting in row 0).  The
+third pass will be 1/4 as wide (every 4th pixel starting in column 0) and
+1/8 as high (every 8th row starting in row 4), and the fourth pass will
+be 1/4 as wide and 1/4 as high (every 4th column starting in column 2,
+and every 4th row starting in row 0).  The fifth pass will return an
+image 1/2 as wide, and 1/4 as high (starting at column 0 and row 2),
+while the sixth pass will be 1/2 as wide and 1/2 as high as the original
+(starting in column 1 and row 0).  The seventh and final pass will be as
+wide as the original, and 1/2 as high, containing all of the odd
+numbered scanlines.  Phew!
+
+If you want libpng to expand the images, call this before calling
+png_start_read_image() or png_read_update_info():
+
+    if (interlace_type == PNG_INTERLACE_ADAM7)
+        number_of_passes
+           = png_set_interlace_handling(png_ptr);
+
+This will return the number of passes needed.  Currently, this
+is seven, but may change if another interlace type is added.
+This function can be called even if the file is not interlaced,
+where it will return one pass.
+
+If you are not going to display the image after each pass, but are
+going to wait until the entire image is read in, use the sparkle
+effect.  This effect is faster and the end result of either method
+is exactly the same.  If you are planning on displaying the image
+after each pass, the "rectangle" effect is generally considered the
+better looking one.
+
+If you only want the "sparkle" effect, just call png_read_rows() as
+normal, with the third parameter NULL.  Make sure you make pass over
+the image number_of_passes times, and you don't change the data in the
+rows between calls.  You can change the locations of the data, just
+not the data.  Each pass only writes the pixels appropriate for that
+pass, and assumes the data from previous passes is still valid.
+
+    png_read_rows(png_ptr, row_pointers, NULL,
+       number_of_rows);
+
+If you only want the first effect (the rectangles), do the same as
+before except pass the row buffer in the third parameter, and leave
+the second parameter NULL.
+
+    png_read_rows(png_ptr, NULL, row_pointers,
+       number_of_rows);
+
+Finishing a sequential read
+
+After you are finished reading the image through the
+low-level interface, you can finish reading the file.  If you are
+interested in comments or time, which may be stored either before or
+after the image data, you should pass the separate png_info struct if
+you want to keep the comments from before and after the image
+separate.  If you are not interested, you can pass NULL.
+
+   png_read_end(png_ptr, end_info);
+
+When you are done, you can free all memory allocated by libpng like this:
+
+   png_destroy_read_struct(&png_ptr, &info_ptr,
+       &end_info);
+
+It is also possible to individually free the info_ptr members that
+point to libpng-allocated storage with the following function:
+
+    png_free_data(png_ptr, info_ptr, mask, seq)
+    mask - identifies data to be freed, a mask
+           containing the bitwise OR of one or
+           more of
+             PNG_FREE_PLTE, PNG_FREE_TRNS,
+             PNG_FREE_HIST, PNG_FREE_ICCP,
+             PNG_FREE_PCAL, PNG_FREE_ROWS,
+             PNG_FREE_SCAL, PNG_FREE_SPLT,
+             PNG_FREE_TEXT, PNG_FREE_UNKN,
+           or simply PNG_FREE_ALL
+    seq  - sequence number of item to be freed
+           (-1 for all items)
+
+This function may be safely called when the relevant storage has
+already been freed, or has not yet been allocated, or was allocated
+by the user and not by libpng,  and will in those
+cases do nothing.  The "seq" parameter is ignored if only one item
+of the selected data type, such as PLTE, is allowed.  If "seq" is not
+-1, and multiple items are allowed for the data type identified in
+the mask, such as text or sPLT, only the n'th item in the structure
+is freed, where n is "seq".
+
+The default behavior is only to free data that was allocated internally
+by libpng.  This can be changed, so that libpng will not free the data,
+or so that it will free data that was allocated by the user with png_malloc()
+or png_zalloc() and passed in via a png_set_*() function, with
+
+    png_data_freer(png_ptr, info_ptr, freer, mask)
+    mask   - which data elements are affected
+             same choices as in png_free_data()
+    freer  - one of
+               PNG_DESTROY_WILL_FREE_DATA
+               PNG_SET_WILL_FREE_DATA
+               PNG_USER_WILL_FREE_DATA
+
+This function only affects data that has already been allocated.
+You can call this function after reading the PNG data but before calling
+any png_set_*() functions, to control whether the user or the png_set_*()
+function is responsible for freeing any existing data that might be present,
+and again after the png_set_*() functions to control whether the user
+or png_destroy_*() is supposed to free the data.  When the user assumes
+responsibility for libpng-allocated data, the application must use
+png_free() to free it, and when the user transfers responsibility to libpng
+for data that the user has allocated, the user must have used png_malloc()
+or png_zalloc() to allocate it.
+
+If you allocated your row_pointers in a single block, as suggested above in
+the description of the high level read interface, you must not transfer
+responsibility for freeing it to the png_set_rows or png_read_destroy function,
+because they would also try to free the individual row_pointers[i].
+
+If you allocated text_ptr.text, text_ptr.lang, and text_ptr.translated_keyword
+separately, do not transfer responsibility for freeing text_ptr to libpng,
+because when libpng fills a png_text structure it combines these members with
+the key member, and png_free_data() will free only text_ptr.key.  Similarly,
+if you transfer responsibility for free'ing text_ptr from libpng to your
+application, your application must not separately free those members.
+
+The png_free_data() function will turn off the "valid" flag for anything
+it frees.  If you need to turn the flag off for a chunk that was freed by your
+application instead of by libpng, you can use
+
+    png_set_invalid(png_ptr, info_ptr, mask);
+    mask - identifies the chunks to be made invalid,
+           containing the bitwise OR of one or
+           more of
+             PNG_INFO_gAMA, PNG_INFO_sBIT,
+             PNG_INFO_cHRM, PNG_INFO_PLTE,
+             PNG_INFO_tRNS, PNG_INFO_bKGD,
+             PNG_INFO_hIST, PNG_INFO_pHYs,
+             PNG_INFO_oFFs, PNG_INFO_tIME,
+             PNG_INFO_pCAL, PNG_INFO_sRGB,
+             PNG_INFO_iCCP, PNG_INFO_sPLT,
+             PNG_INFO_sCAL, PNG_INFO_IDAT
+
+For a more compact example of reading a PNG image, see the file example.c.
+
+Reading PNG files progressively
+
+The progressive reader is slightly different then the non-progressive
+reader.  Instead of calling png_read_info(), png_read_rows(), and
+png_read_end(), you make one call to png_process_data(), which calls
+callbacks when it has the info, a row, or the end of the image.  You
+set up these callbacks with png_set_progressive_read_fn().  You don't
+have to worry about the input/output functions of libpng, as you are
+giving the library the data directly in png_process_data().  I will
+assume that you have read the section on reading PNG files above,
+so I will only highlight the differences (although I will show
+all of the code).
+
+png_structp png_ptr;
+png_infop info_ptr;
+
+ /*  An example code fragment of how you would
+     initialize the progressive reader in your
+     application. */
+ int
+ initialize_png_reader()
+ {
+    png_ptr = png_create_read_struct
+        (PNG_LIBPNG_VER_STRING, (png_voidp)user_error_ptr,
+         user_error_fn, user_warning_fn);
+    if (!png_ptr)
+        return (ERROR);
+    info_ptr = png_create_info_struct(png_ptr);
+    if (!info_ptr)
+    {
+        png_destroy_read_struct(&png_ptr, (png_infopp)NULL,
+           (png_infopp)NULL);
+        return (ERROR);
+    }
+
+    if (setjmp(png_jmpbuf(png_ptr)))
+    {
+        png_destroy_read_struct(&png_ptr, &info_ptr,
+           (png_infopp)NULL);
+        return (ERROR);
+    }
+
+    /* This one's new.  You can provide functions
+       to be called when the header info is valid,
+       when each row is completed, and when the image
+       is finished.  If you aren't using all functions,
+       you can specify NULL parameters.  Even when all
+       three functions are NULL, you need to call
+       png_set_progressive_read_fn().  You can use
+       any struct as the user_ptr (cast to a void pointer
+       for the function call), and retrieve the pointer
+       from inside the callbacks using the function
+
+          png_get_progressive_ptr(png_ptr);
+
+       which will return a void pointer, which you have
+       to cast appropriately.
+     */
+    png_set_progressive_read_fn(png_ptr, (void *)user_ptr,
+        info_callback, row_callback, end_callback);
+
+    return 0;
+ }
+
+ /* A code fragment that you call as you receive blocks
+   of data */
+ int
+ process_data(png_bytep buffer, png_uint_32 length)
+ {
+    if (setjmp(png_jmpbuf(png_ptr)))
+    {
+        png_destroy_read_struct(&png_ptr, &info_ptr,
+           (png_infopp)NULL);
+        return (ERROR);
+    }
+
+    /* This one's new also.  Simply give it a chunk
+       of data from the file stream (in order, of
+       course).  On machines with segmented memory
+       models machines, don't give it any more than
+       64K.  The library seems to run fine with sizes
+       of 4K. Although you can give it much less if
+       necessary (I assume you can give it chunks of
+       1 byte, I haven't tried less then 256 bytes
+       yet).  When this function returns, you may
+       want to display any rows that were generated
+       in the row callback if you don't already do
+       so there.
+     */
+    png_process_data(png_ptr, info_ptr, buffer, length);
+    return 0;
+ }
+
+ /* This function is called (as set by
+    png_set_progressive_read_fn() above) when enough data
+    has been supplied so all of the header has been
+    read.
+ */
+ void
+ info_callback(png_structp png_ptr, png_infop info)
+ {
+    /* Do any setup here, including setting any of
+       the transformations mentioned in the Reading
+       PNG files section.  For now, you _must_ call
+       either png_start_read_image() or
+       png_read_update_info() after all the
+       transformations are set (even if you don't set
+       any).  You may start getting rows before
+       png_process_data() returns, so this is your
+       last chance to prepare for that.
+     */
+ }
+
+ /* This function is called when each row of image
+    data is complete */
+ void
+ row_callback(png_structp png_ptr, png_bytep new_row,
+    png_uint_32 row_num, int pass)
+ {
+    /* If the image is interlaced, and you turned
+       on the interlace handler, this function will
+       be called for every row in every pass.  Some
+       of these rows will not be changed from the
+       previous pass.  When the row is not changed,
+       the new_row variable will be NULL.  The rows
+       and passes are called in order, so you don't
+       really need the row_num and pass, but I'm
+       supplying them because it may make your life
+       easier.
+
+       For the non-NULL rows of interlaced images,
+       you must call png_progressive_combine_row()
+       passing in the row and the old row.  You can
+       call this function for NULL rows (it will just
+       return) and for non-interlaced images (it just
+       does the memcpy for you) if it will make the
+       code easier.  Thus, you can just do this for
+       all cases:
+     */
+
+        png_progressive_combine_row(png_ptr, old_row,
+          new_row);
+
+    /* where old_row is what was displayed for
+       previously for the row.  Note that the first
+       pass (pass == 0, really) will completely cover
+       the old row, so the rows do not have to be
+       initialized.  After the first pass (and only
+       for interlaced images), you will have to pass
+       the current row, and the function will combine
+       the old row and the new row.
+    */
+ }
+
+ void
+ end_callback(png_structp png_ptr, png_infop info)
+ {
+    /* This function is called after the whole image
+       has been read, including any chunks after the
+       image (up to and including the IEND).  You
+       will usually have the same info chunk as you
+       had in the header, although some data may have
+       been added to the comments and time fields.
+
+       Most people won't do much here, perhaps setting
+       a flag that marks the image as finished.
+     */
+ }
+
+
+
+IV. Writing
+
+Much of this is very similar to reading.  However, everything of
+importance is repeated here, so you won't have to constantly look
+back up in the reading section to understand writing.
+
+Setup
+
+You will want to do the I/O initialization before you get into libpng,
+so if it doesn't work, you don't have anything to undo. If you are not
+using the standard I/O functions, you will need to replace them with
+custom writing functions.  See the discussion under Customizing libpng.
+
+    FILE *fp = fopen(file_name, "wb");
+    if (!fp)
+    {
+       return (ERROR);
+    }
+
+Next, png_struct and png_info need to be allocated and initialized.
+As these can be both relatively large, you may not want to store these
+on the stack, unless you have stack space to spare.  Of course, you
+will want to check if they return NULL.  If you are also reading,
+you won't want to name your read structure and your write structure
+both "png_ptr"; you can call them anything you like, such as
+"read_ptr" and "write_ptr".  Look at pngtest.c, for example.
+
+    png_structp png_ptr = png_create_write_struct
+       (PNG_LIBPNG_VER_STRING, (png_voidp)user_error_ptr,
+        user_error_fn, user_warning_fn);
+    if (!png_ptr)
+       return (ERROR);
+
+    png_infop info_ptr = png_create_info_struct(png_ptr);
+    if (!info_ptr)
+    {
+       png_destroy_write_struct(&png_ptr,
+         (png_infopp)NULL);
+       return (ERROR);
+    }
+
+If you want to use your own memory allocation routines,
+define PNG_USER_MEM_SUPPORTED and use
+png_create_write_struct_2() instead of png_create_write_struct():
+
+    png_structp png_ptr = png_create_write_struct_2
+       (PNG_LIBPNG_VER_STRING, (png_voidp)user_error_ptr,
+        user_error_fn, user_warning_fn, (png_voidp)
+        user_mem_ptr, user_malloc_fn, user_free_fn);
+
+After you have these structures, you will need to set up the
+error handling.  When libpng encounters an error, it expects to
+longjmp() back to your routine.  Therefore, you will need to call
+setjmp() and pass the png_jmpbuf(png_ptr).  If you
+write the file from different routines, you will need to update
+the png_jmpbuf(png_ptr) every time you enter a new routine that will
+call a png_*() function.  See your documentation of setjmp/longjmp
+for your compiler for more information on setjmp/longjmp.  See
+the discussion on libpng error handling in the Customizing Libpng
+section below for more information on the libpng error handling.
+
+    if (setjmp(png_jmpbuf(png_ptr)))
+    {
+       png_destroy_write_struct(&png_ptr, &info_ptr);
+       fclose(fp);
+       return (ERROR);
+    }
+    ...
+    return;
+
+If you would rather avoid the complexity of setjmp/longjmp issues,
+you can compile libpng with PNG_SETJMP_NOT_SUPPORTED, in which case
+errors will result in a call to PNG_ABORT() which defaults to abort().
+
+Now you need to set up the output code.  The default for libpng is to
+use the C function fwrite().  If you use this, you will need to pass a
+valid FILE * in the function png_init_io().  Be sure that the file is
+opened in binary mode.  Again, if you wish to handle writing data in
+another way, see the discussion on libpng I/O handling in the Customizing
+Libpng section below.
+
+    png_init_io(png_ptr, fp);
+
+If you are embedding your PNG into a datastream such as MNG, and don't
+want libpng to write the 8-byte signature, or if you have already
+written the signature in your application, use
+
+    png_set_sig_bytes(png_ptr, 8);
+
+to inform libpng that it should not write a signature.
+
+Write callbacks
+
+At this point, you can set up a callback function that will be
+called after each row has been written, which you can use to control
+a progress meter or the like.  It's demonstrated in pngtest.c.
+You must supply a function
+
+    void write_row_callback(png_ptr, png_uint_32 row,
+       int pass);
+    {
+      /* put your code here */
+    }
+
+(You can give it another name that you like instead of "write_row_callback")
+
+To inform libpng about your function, use
+
+    png_set_write_status_fn(png_ptr, write_row_callback);
+
+You now have the option of modifying how the compression library will
+run.  The following functions are mainly for testing, but may be useful
+in some cases, like if you need to write PNG files extremely fast and
+are willing to give up some compression, or if you want to get the
+maximum possible compression at the expense of slower writing.  If you
+have no special needs in this area, let the library do what it wants by
+not calling this function at all, as it has been tuned to deliver a good
+speed/compression ratio. The second parameter to png_set_filter() is
+the filter method, for which the only valid values are 0 (as of the
+July 1999 PNG specification, version 1.2) or 64 (if you are writing
+a PNG datastream that is to be embedded in a MNG datastream).  The third
+parameter is a flag that indicates which filter type(s) are to be tested
+for each scanline.  See the PNG specification for details on the specific filter
+types.
+
+
+    /* turn on or off filtering, and/or choose
+       specific filters.  You can use either a single
+       PNG_FILTER_VALUE_NAME or the bitwise OR of one
+       or more PNG_FILTER_NAME masks. */
+    png_set_filter(png_ptr, 0,
+       PNG_FILTER_NONE  | PNG_FILTER_VALUE_NONE |
+       PNG_FILTER_SUB   | PNG_FILTER_VALUE_SUB  |
+       PNG_FILTER_UP    | PNG_FILTER_VALUE_UP   |
+       PNG_FILTER_AVE   | PNG_FILTER_VALUE_AVE  |
+       PNG_FILTER_PAETH | PNG_FILTER_VALUE_PAETH|
+       PNG_ALL_FILTERS);
+
+If an application
+wants to start and stop using particular filters during compression,
+it should start out with all of the filters (to ensure that the previous
+row of pixels will be stored in case it's needed later), and then add
+and remove them after the start of compression.
+
+If you are writing a PNG datastream that is to be embedded in a MNG
+datastream, the second parameter can be either 0 or 64.
+
+The png_set_compression_*() functions interface to the zlib compression
+library, and should mostly be ignored unless you really know what you are
+doing.  The only generally useful call is png_set_compression_level()
+which changes how much time zlib spends on trying to compress the image
+data.  See the Compression Library (zlib.h and algorithm.txt, distributed
+with zlib) for details on the compression levels.
+
+    /* set the zlib compression level */
+    png_set_compression_level(png_ptr,
+        Z_BEST_COMPRESSION);
+
+    /* set other zlib parameters */
+    png_set_compression_mem_level(png_ptr, 8);
+    png_set_compression_strategy(png_ptr,
+        Z_DEFAULT_STRATEGY);
+    png_set_compression_window_bits(png_ptr, 15);
+    png_set_compression_method(png_ptr, 8);
+    png_set_compression_buffer_size(png_ptr, 8192)
+
+extern PNG_EXPORT(void,png_set_zbuf_size)
+
+Setting the contents of info for output
+
+You now need to fill in the png_info structure with all the data you
+wish to write before the actual image.  Note that the only thing you
+are allowed to write after the image is the text chunks and the time
+chunk (as of PNG Specification 1.2, anyway).  See png_write_end() and
+the latest PNG specification for more information on that.  If you
+wish to write them before the image, fill them in now, and flag that
+data as being valid.  If you want to wait until after the data, don't
+fill them until png_write_end().  For all the fields in png_info and
+their data types, see png.h.  For explanations of what the fields
+contain, see the PNG specification.
+
+Some of the more important parts of the png_info are:
+
+    png_set_IHDR(png_ptr, info_ptr, width, height,
+       bit_depth, color_type, interlace_type,
+       compression_type, filter_method)
+    width          - holds the width of the image
+                     in pixels (up to 2^31).
+    height         - holds the height of the image
+                     in pixels (up to 2^31).
+    bit_depth      - holds the bit depth of one of the
+                     image channels.
+                     (valid values are 1, 2, 4, 8, 16
+                     and depend also on the
+                     color_type.  See also significant
+                     bits (sBIT) below).
+    color_type     - describes which color/alpha
+                     channels are present.
+                     PNG_COLOR_TYPE_GRAY
+                        (bit depths 1, 2, 4, 8, 16)
+                     PNG_COLOR_TYPE_GRAY_ALPHA
+                        (bit depths 8, 16)
+                     PNG_COLOR_TYPE_PALETTE
+                        (bit depths 1, 2, 4, 8)
+                     PNG_COLOR_TYPE_RGB
+                        (bit_depths 8, 16)
+                     PNG_COLOR_TYPE_RGB_ALPHA
+                        (bit_depths 8, 16)
+
+                     PNG_COLOR_MASK_PALETTE
+                     PNG_COLOR_MASK_COLOR
+                     PNG_COLOR_MASK_ALPHA
+
+    interlace_type - PNG_INTERLACE_NONE or
+                     PNG_INTERLACE_ADAM7
+    compression_type - (must be
+                     PNG_COMPRESSION_TYPE_DEFAULT)
+    filter_method  - (must be PNG_FILTER_TYPE_DEFAULT
+                     or, if you are writing a PNG to
+                     be embedded in a MNG datastream,
+                     can also be
+                     PNG_INTRAPIXEL_DIFFERENCING)
+
+    png_set_PLTE(png_ptr, info_ptr, palette,
+       num_palette);
+    palette        - the palette for the file
+                     (array of png_color)
+    num_palette    - number of entries in the palette
+
+    png_set_gAMA(png_ptr, info_ptr, gamma);
+    gamma          - the gamma the image was created
+                     at (PNG_INFO_gAMA)
+
+    png_set_sRGB(png_ptr, info_ptr, srgb_intent);
+    srgb_intent    - the rendering intent
+                     (PNG_INFO_sRGB) The presence of
+                     the sRGB chunk means that the pixel
+                     data is in the sRGB color space.
+                     This chunk also implies specific
+                     values of gAMA and cHRM.  Rendering
+                     intent is the CSS-1 property that
+                     has been defined by the International
+                     Color Consortium
+                     (http://www.color.org).
+                     It can be one of
+                     PNG_sRGB_INTENT_SATURATION,
+                     PNG_sRGB_INTENT_PERCEPTUAL,
+                     PNG_sRGB_INTENT_ABSOLUTE, or
+                     PNG_sRGB_INTENT_RELATIVE.
+
+
+    png_set_sRGB_gAMA_and_cHRM(png_ptr, info_ptr,
+       srgb_intent);
+    srgb_intent    - the rendering intent
+                     (PNG_INFO_sRGB) The presence of the
+                     sRGB chunk means that the pixel
+                     data is in the sRGB color space.
+                     This function also causes gAMA and
+                     cHRM chunks with the specific values
+                     that are consistent with sRGB to be
+                     written.
+
+    png_set_iCCP(png_ptr, info_ptr, name, compression_type,
+                      profile, proflen);
+    name            - The profile name.
+    compression     - The compression type; always
+                      PNG_COMPRESSION_TYPE_BASE for PNG 1.0.
+                      You may give NULL to this argument to
+                      ignore it.
+    profile         - International Color Consortium color
+                      profile data. May contain NULs.
+    proflen         - length of profile data in bytes.
+
+    png_set_sBIT(png_ptr, info_ptr, sig_bit);
+    sig_bit        - the number of significant bits for
+                     (PNG_INFO_sBIT) each of the gray, red,
+                     green, and blue channels, whichever are
+                     appropriate for the given color type
+                     (png_color_16)
+
+    png_set_tRNS(png_ptr, info_ptr, trans, num_trans,
+       trans_values);
+    trans          - array of transparent entries for
+                     palette (PNG_INFO_tRNS)
+    trans_values   - graylevel or color sample values of
+                     the single transparent color for
+                     non-paletted images (PNG_INFO_tRNS)
+    num_trans      - number of transparent entries
+                     (PNG_INFO_tRNS)
+
+    png_set_hIST(png_ptr, info_ptr, hist);
+                    (PNG_INFO_hIST)
+    hist           - histogram of palette (array of
+                     png_uint_16)
+
+    png_set_tIME(png_ptr, info_ptr, mod_time);
+    mod_time       - time image was last modified
+                     (PNG_VALID_tIME)
+
+    png_set_bKGD(png_ptr, info_ptr, background);
+    background     - background color (PNG_VALID_bKGD)
+
+    png_set_text(png_ptr, info_ptr, text_ptr, num_text);
+    text_ptr       - array of png_text holding image
+                     comments
+    text_ptr[i].compression - type of compression used
+                 on "text" PNG_TEXT_COMPRESSION_NONE
+                           PNG_TEXT_COMPRESSION_zTXt
+                           PNG_ITXT_COMPRESSION_NONE
+                           PNG_ITXT_COMPRESSION_zTXt
+    text_ptr[i].key   - keyword for comment.  Must contain
+                 1-79 characters.
+    text_ptr[i].text  - text comments for current
+                         keyword.  Can be NULL or empty.
+    text_ptr[i].text_length - length of text string,
+                 after decompression, 0 for iTXt
+    text_ptr[i].itxt_length - length of itxt string,
+                 after decompression, 0 for tEXt/zTXt
+    text_ptr[i].lang  - language of comment (NULL or
+                         empty for unknown).
+    text_ptr[i].translated_keyword  - keyword in UTF-8 (NULL
+                         or empty for unknown).
+    num_text       - number of comments
+
+    png_set_sPLT(png_ptr, info_ptr, &palette_ptr,
+       num_spalettes);
+    palette_ptr    - array of png_sPLT_struct structures
+                     to be added to the list of palettes
+                     in the info structure.
+    num_spalettes  - number of palette structures to be
+                     added.
+
+    png_set_oFFs(png_ptr, info_ptr, offset_x, offset_y,
+        unit_type);
+    offset_x  - positive offset from the left
+                     edge of the screen
+    offset_y  - positive offset from the top
+                     edge of the screen
+    unit_type - PNG_OFFSET_PIXEL, PNG_OFFSET_MICROMETER
+
+    png_set_pHYs(png_ptr, info_ptr, res_x, res_y,
+        unit_type);
+    res_x       - pixels/unit physical resolution
+                  in x direction
+    res_y       - pixels/unit physical resolution
+                  in y direction
+    unit_type   - PNG_RESOLUTION_UNKNOWN,
+                  PNG_RESOLUTION_METER
+
+    png_set_sCAL(png_ptr, info_ptr, unit, width, height)
+    unit        - physical scale units (an integer)
+    width       - width of a pixel in physical scale units
+    height      - height of a pixel in physical scale units
+                  (width and height are doubles)
+
+    png_set_sCAL_s(png_ptr, info_ptr, unit, width, height)
+    unit        - physical scale units (an integer)
+    width       - width of a pixel in physical scale units
+    height      - height of a pixel in physical scale units
+                 (width and height are strings like "2.54")
+
+    png_set_unknown_chunks(png_ptr, info_ptr, &unknowns,
+       num_unknowns)
+    unknowns          - array of png_unknown_chunk
+                        structures holding unknown chunks
+    unknowns[i].name  - name of unknown chunk
+    unknowns[i].data  - data of unknown chunk
+    unknowns[i].size  - size of unknown chunk's data
+    unknowns[i].location - position to write chunk in file
+                           0: do not write chunk
+                           PNG_HAVE_IHDR: before PLTE
+                           PNG_HAVE_PLTE: before IDAT
+                           PNG_AFTER_IDAT: after IDAT
+
+The "location" member is set automatically according to
+what part of the output file has already been written.
+You can change its value after calling png_set_unknown_chunks()
+as demonstrated in pngtest.c.  Within each of the "locations",
+the chunks are sequenced according to their position in the
+structure (that is, the value of "i", which is the order in which
+the chunk was either read from the input file or defined with
+png_set_unknown_chunks).
+
+A quick word about text and num_text.  text is an array of png_text
+structures.  num_text is the number of valid structures in the array.
+Each png_text structure holds a language code, a keyword, a text value,
+and a compression type.
+
+The compression types have the same valid numbers as the compression
+types of the image data.  Currently, the only valid number is zero.
+However, you can store text either compressed or uncompressed, unlike
+images, which always have to be compressed.  So if you don't want the
+text compressed, set the compression type to PNG_TEXT_COMPRESSION_NONE.
+Because tEXt and zTXt chunks don't have a language field, if you
+specify PNG_TEXT_COMPRESSION_NONE or PNG_TEXT_COMPRESSION_zTXt
+any language code or translated keyword will not be written out.
+
+Until text gets around 1000 bytes, it is not worth compressing it.
+After the text has been written out to the file, the compression type
+is set to PNG_TEXT_COMPRESSION_NONE_WR or PNG_TEXT_COMPRESSION_zTXt_WR,
+so that it isn't written out again at the end (in case you are calling
+png_write_end() with the same struct.
+
+The keywords that are given in the PNG Specification are:
+
+    Title            Short (one line) title or
+                     caption for image
+    Author           Name of image's creator
+    Description      Description of image (possibly long)
+    Copyright        Copyright notice
+    Creation Time    Time of original image creation
+                     (usually RFC 1123 format, see below)
+    Software         Software used to create the image
+    Disclaimer       Legal disclaimer
+    Warning          Warning of nature of content
+    Source           Device used to create the image
+    Comment          Miscellaneous comment; conversion
+                     from other image format
+
+The keyword-text pairs work like this.  Keywords should be short
+simple descriptions of what the comment is about.  Some typical
+keywords are found in the PNG specification, as is some recommendations
+on keywords.  You can repeat keywords in a file.  You can even write
+some text before the image and some after.  For example, you may want
+to put a description of the image before the image, but leave the
+disclaimer until after, so viewers working over modem connections
+don't have to wait for the disclaimer to go over the modem before
+they start seeing the image.  Finally, keywords should be full
+words, not abbreviations.  Keywords and text are in the ISO 8859-1
+(Latin-1) character set (a superset of regular ASCII) and can not
+contain NUL characters, and should not contain control or other
+unprintable characters.  To make the comments widely readable, stick
+with basic ASCII, and avoid machine specific character set extensions
+like the IBM-PC character set.  The keyword must be present, but
+you can leave off the text string on non-compressed pairs.
+Compressed pairs must have a text string, as only the text string
+is compressed anyway, so the compression would be meaningless.
+
+PNG supports modification time via the png_time structure.  Two
+conversion routines are provided, png_convert_from_time_t() for
+time_t and png_convert_from_struct_tm() for struct tm.  The
+time_t routine uses gmtime().  You don't have to use either of
+these, but if you wish to fill in the png_time structure directly,
+you should provide the time in universal time (GMT) if possible
+instead of your local time.  Note that the year number is the full
+year (e.g. 1998, rather than 98 - PNG is year 2000 compliant!), and
+that months start with 1.
+
+If you want to store the time of the original image creation, you should
+use a plain tEXt chunk with the "Creation Time" keyword.  This is
+necessary because the "creation time" of a PNG image is somewhat vague,
+depending on whether you mean the PNG file, the time the image was
+created in a non-PNG format, a still photo from which the image was
+scanned, or possibly the subject matter itself.  In order to facilitate
+machine-readable dates, it is recommended that the "Creation Time"
+tEXt chunk use RFC 1123 format dates (e.g. "22 May 1997 18:07:10 GMT"),
+although this isn't a requirement.  Unlike the tIME chunk, the
+"Creation Time" tEXt chunk is not expected to be automatically changed
+by the software.  To facilitate the use of RFC 1123 dates, a function
+png_convert_to_rfc1123(png_timep) is provided to convert from PNG
+time to an RFC 1123 format string.
+
+Writing unknown chunks
+
+You can use the png_set_unknown_chunks function to queue up chunks
+for writing.  You give it a chunk name, raw data, and a size; that's
+all there is to it.  The chunks will be written by the next following
+png_write_info_before_PLTE, png_write_info, or png_write_end function.
+Any chunks previously read into the info structure's unknown-chunk
+list will also be written out in a sequence that satisfies the PNG
+specification's ordering rules.
+
+The high-level write interface
+
+At this point there are two ways to proceed; through the high-level
+write interface, or through a sequence of low-level write operations.
+You can use the high-level interface if your image data is present
+in the info structure.  All defined output
+transformations are permitted, enabled by the following masks.
+
+    PNG_TRANSFORM_IDENTITY      No transformation
+    PNG_TRANSFORM_PACKING       Pack 1, 2 and 4-bit samples
+    PNG_TRANSFORM_PACKSWAP      Change order of packed
+                                pixels to LSB first
+    PNG_TRANSFORM_INVERT_MONO   Invert monochrome images
+    PNG_TRANSFORM_SHIFT         Normalize pixels to the
+                                sBIT depth
+    PNG_TRANSFORM_BGR           Flip RGB to BGR, RGBA
+                                to BGRA
+    PNG_TRANSFORM_SWAP_ALPHA    Flip RGBA to ARGB or GA
+                                to AG
+    PNG_TRANSFORM_INVERT_ALPHA  Change alpha from opacity
+                                to transparency
+    PNG_TRANSFORM_SWAP_ENDIAN   Byte-swap 16-bit samples
+    PNG_TRANSFORM_STRIP_FILLER  Strip out filler bytes.
+
+If you have valid image data in the info structure (you can use
+png_set_rows() to put image data in the info structure), simply do this:
+
+    png_write_png(png_ptr, info_ptr, png_transforms, NULL)
+
+where png_transforms is an integer containing the bitwise OR of some set of
+transformation flags.  This call is equivalent to png_write_info(),
+followed the set of transformations indicated by the transform mask,
+then png_write_image(), and finally png_write_end().
+
+(The final parameter of this call is not yet used.  Someday it might point
+to transformation parameters required by some future output transform.)
+
+You must use png_transforms and not call any png_set_transform() functions
+when you use png_write_png().
+
+The low-level write interface
+
+If you are going the low-level route instead, you are now ready to
+write all the file information up to the actual image data.  You do
+this with a call to png_write_info().
+
+    png_write_info(png_ptr, info_ptr);
+
+Note that there is one transformation you may need to do before
+png_write_info().  In PNG files, the alpha channel in an image is the
+level of opacity.  If your data is supplied as a level of
+transparency, you can invert the alpha channel before you write it, so
+that 0 is fully transparent and 255 (in 8-bit or paletted images) or
+65535 (in 16-bit images) is fully opaque, with
+
+    png_set_invert_alpha(png_ptr);
+
+This must appear before png_write_info() instead of later with the
+other transformations because in the case of paletted images the tRNS
+chunk data has to be inverted before the tRNS chunk is written.  If
+your image is not a paletted image, the tRNS data (which in such cases
+represents a single color to be rendered as transparent) won't need to
+be changed, and you can safely do this transformation after your
+png_write_info() call.
+
+If you need to write a private chunk that you want to appear before
+the PLTE chunk when PLTE is present, you can write the PNG info in
+two steps, and insert code to write your own chunk between them:
+
+    png_write_info_before_PLTE(png_ptr, info_ptr);
+    png_set_unknown_chunks(png_ptr, info_ptr, ...);
+    png_write_info(png_ptr, info_ptr);
+
+After you've written the file information, you can set up the library
+to handle any special transformations of the image data.  The various
+ways to transform the data will be described in the order that they
+should occur.  This is important, as some of these change the color
+type and/or bit depth of the data, and some others only work on
+certain color types and bit depths.  Even though each transformation
+checks to see if it has data that it can do something with, you should
+make sure to only enable a transformation if it will be valid for the
+data.  For example, don't swap red and blue on grayscale data.
+
+PNG files store RGB pixels packed into 3 or 6 bytes.  This code tells
+the library to strip input data that has 4 or 8 bytes per pixel down
+to 3 or 6 bytes (or strip 2 or 4-byte grayscale+filler data to 1 or 2
+bytes per pixel).
+
+    png_set_filler(png_ptr, 0, PNG_FILLER_BEFORE);
+
+where the 0 is unused, and the location is either PNG_FILLER_BEFORE or
+PNG_FILLER_AFTER, depending upon whether the filler byte in the pixel
+is stored XRGB or RGBX.
+
+PNG files pack pixels of bit depths 1, 2, and 4 into bytes as small as
+they can, resulting in, for example, 8 pixels per byte for 1 bit files.
+If the data is supplied at 1 pixel per byte, use this code, which will
+correctly pack the pixels into a single byte:
+
+    png_set_packing(png_ptr);
+
+PNG files reduce possible bit depths to 1, 2, 4, 8, and 16.  If your
+data is of another bit depth, you can write an sBIT chunk into the
+file so that decoders can recover the original data if desired.
+
+    /* Set the true bit depth of the image data */
+    if (color_type & PNG_COLOR_MASK_COLOR)
+    {
+        sig_bit.red = true_bit_depth;
+        sig_bit.green = true_bit_depth;
+        sig_bit.blue = true_bit_depth;
+    }
+    else
+    {
+        sig_bit.gray = true_bit_depth;
+    }
+    if (color_type & PNG_COLOR_MASK_ALPHA)
+    {
+        sig_bit.alpha = true_bit_depth;
+    }
+
+    png_set_sBIT(png_ptr, info_ptr, &sig_bit);
+
+If the data is stored in the row buffer in a bit depth other than
+one supported by PNG (e.g. 3 bit data in the range 0-7 for a 4-bit PNG),
+this will scale the values to appear to be the correct bit depth as
+is required by PNG.
+
+    png_set_shift(png_ptr, &sig_bit);
+
+PNG files store 16 bit pixels in network byte order (big-endian,
+ie. most significant bits first).  This code would be used if they are
+supplied the other way (little-endian, i.e. least significant bits
+first, the way PCs store them):
+
+    if (bit_depth > 8)
+       png_set_swap(png_ptr);
+
+If you are using packed-pixel images (1, 2, or 4 bits/pixel), and you
+need to change the order the pixels are packed into bytes, you can use:
+
+    if (bit_depth < 8)
+       png_set_packswap(png_ptr);
+
+PNG files store 3 color pixels in red, green, blue order.  This code
+would be used if they are supplied as blue, green, red:
+
+    png_set_bgr(png_ptr);
+
+PNG files describe monochrome as black being zero and white being
+one. This code would be used if the pixels are supplied with this reversed
+(black being one and white being zero):
+
+    png_set_invert_mono(png_ptr);
+
+Finally, you can write your own transformation function if none of
+the existing ones meets your needs.  This is done by setting a callback
+with
+
+    png_set_write_user_transform_fn(png_ptr,
+       write_transform_fn);
+
+You must supply the function
+
+    void write_transform_fn(png_ptr ptr, row_info_ptr
+       row_info, png_bytep data)
+
+See pngtest.c for a working example.  Your function will be called
+before any of the other transformations are processed.
+
+You can also set up a pointer to a user structure for use by your
+callback function.
+
+    png_set_user_transform_info(png_ptr, user_ptr, 0, 0);
+
+The user_channels and user_depth parameters of this function are ignored
+when writing; you can set them to zero as shown.
+
+You can retrieve the pointer via the function png_get_user_transform_ptr().
+For example:
+
+    voidp write_user_transform_ptr =
+       png_get_user_transform_ptr(png_ptr);
+
+It is possible to have libpng flush any pending output, either manually,
+or automatically after a certain number of lines have been written.  To
+flush the output stream a single time call:
+
+    png_write_flush(png_ptr);
+
+and to have libpng flush the output stream periodically after a certain
+number of scanlines have been written, call:
+
+    png_set_flush(png_ptr, nrows);
+
+Note that the distance between rows is from the last time png_write_flush()
+was called, or the first row of the image if it has never been called.
+So if you write 50 lines, and then png_set_flush 25, it will flush the
+output on the next scanline, and every 25 lines thereafter, unless
+png_write_flush() is called before 25 more lines have been written.
+If nrows is too small (less than about 10 lines for a 640 pixel wide
+RGB image) the image compression may decrease noticeably (although this
+may be acceptable for real-time applications).  Infrequent flushing will
+only degrade the compression performance by a few percent over images
+that do not use flushing.
+
+Writing the image data
+
+That's it for the transformations.  Now you can write the image data.
+The simplest way to do this is in one function call.  If you have the
+whole image in memory, you can just call png_write_image() and libpng
+will write the image.  You will need to pass in an array of pointers to
+each row.  This function automatically handles interlacing, so you don't
+need to call png_set_interlace_handling() or call this function multiple
+times, or any of that other stuff necessary with png_write_rows().
+
+    png_write_image(png_ptr, row_pointers);
+
+where row_pointers is:
+
+    png_byte *row_pointers[height];
+
+You can point to void or char or whatever you use for pixels.
+
+If you don't want to write the whole image at once, you can
+use png_write_rows() instead.  If the file is not interlaced,
+this is simple:
+
+    png_write_rows(png_ptr, row_pointers,
+       number_of_rows);
+
+row_pointers is the same as in the png_write_image() call.
+
+If you are just writing one row at a time, you can do this with
+a single row_pointer instead of an array of row_pointers:
+
+    png_bytep row_pointer = row;
+
+    png_write_row(png_ptr, row_pointer);
+
+When the file is interlaced, things can get a good deal more
+complicated.  The only currently (as of the PNG Specification
+version 1.2, dated July 1999) defined interlacing scheme for PNG files
+is the "Adam7" interlace scheme, that breaks down an
+image into seven smaller images of varying size.  libpng will build
+these images for you, or you can do them yourself.  If you want to
+build them yourself, see the PNG specification for details of which
+pixels to write when.
+
+If you don't want libpng to handle the interlacing details, just
+use png_set_interlace_handling() and call png_write_rows() the
+correct number of times to write all seven sub-images.
+
+If you want libpng to build the sub-images, call this before you start
+writing any rows:
+
+    number_of_passes =
+       png_set_interlace_handling(png_ptr);
+
+This will return the number of passes needed.  Currently, this
+is seven, but may change if another interlace type is added.
+
+Then write the complete image number_of_passes times.
+
+    png_write_rows(png_ptr, row_pointers,
+       number_of_rows);
+
+As some of these rows are not used, and thus return immediately,
+you may want to read about interlacing in the PNG specification,
+and only update the rows that are actually used.
+
+Finishing a sequential write
+
+After you are finished writing the image, you should finish writing
+the file.  If you are interested in writing comments or time, you should
+pass an appropriately filled png_info pointer.  If you are not interested,
+you can pass NULL.
+
+    png_write_end(png_ptr, info_ptr);
+
+When you are done, you can free all memory used by libpng like this:
+
+    png_destroy_write_struct(&png_ptr, &info_ptr);
+
+It is also possible to individually free the info_ptr members that
+point to libpng-allocated storage with the following function:
+
+    png_free_data(png_ptr, info_ptr, mask, seq)
+    mask  - identifies data to be freed, a mask
+            containing the bitwise OR of one or
+            more of
+              PNG_FREE_PLTE, PNG_FREE_TRNS,
+              PNG_FREE_HIST, PNG_FREE_ICCP,
+              PNG_FREE_PCAL, PNG_FREE_ROWS,
+              PNG_FREE_SCAL, PNG_FREE_SPLT,
+              PNG_FREE_TEXT, PNG_FREE_UNKN,
+            or simply PNG_FREE_ALL
+    seq   - sequence number of item to be freed
+            (-1 for all items)
+
+This function may be safely called when the relevant storage has
+already been freed, or has not yet been allocated, or was allocated
+by the user  and not by libpng,  and will in those
+cases do nothing.  The "seq" parameter is ignored if only one item
+of the selected data type, such as PLTE, is allowed.  If "seq" is not
+-1, and multiple items are allowed for the data type identified in
+the mask, such as text or sPLT, only the n'th item in the structure
+is freed, where n is "seq".
+
+If you allocated data such as a palette that you passed
+in to libpng with png_set_*, you must not free it until just before the call to
+png_destroy_write_struct().
+
+The default behavior is only to free data that was allocated internally
+by libpng.  This can be changed, so that libpng will not free the data,
+or so that it will free data that was allocated by the user with png_malloc()
+or png_zalloc() and passed in via a png_set_*() function, with
+
+    png_data_freer(png_ptr, info_ptr, freer, mask)
+    mask   - which data elements are affected
+             same choices as in png_free_data()
+    freer  - one of
+               PNG_DESTROY_WILL_FREE_DATA
+               PNG_SET_WILL_FREE_DATA
+               PNG_USER_WILL_FREE_DATA
+
+For example, to transfer responsibility for some data from a read structure
+to a write structure, you could use
+
+    png_data_freer(read_ptr, read_info_ptr,
+       PNG_USER_WILL_FREE_DATA,
+       PNG_FREE_PLTE|PNG_FREE_tRNS|PNG_FREE_hIST)
+    png_data_freer(write_ptr, write_info_ptr,
+       PNG_DESTROY_WILL_FREE_DATA,
+       PNG_FREE_PLTE|PNG_FREE_tRNS|PNG_FREE_hIST)
+
+thereby briefly reassigning responsibility for freeing to the user but
+immediately afterwards reassigning it once more to the write_destroy
+function.  Having done this, it would then be safe to destroy the read
+structure and continue to use the PLTE, tRNS, and hIST data in the write
+structure.
+
+This function only affects data that has already been allocated.
+You can call this function before calling after the png_set_*() functions
+to control whether the user or png_destroy_*() is supposed to free the data.
+When the user assumes responsibility for libpng-allocated data, the
+application must use
+png_free() to free it, and when the user transfers responsibility to libpng
+for data that the user has allocated, the user must have used png_malloc()
+or png_zalloc() to allocate it.
+
+If you allocated text_ptr.text, text_ptr.lang, and text_ptr.translated_keyword
+separately, do not transfer responsibility for freeing text_ptr to libpng,
+because when libpng fills a png_text structure it combines these members with
+the key member, and png_free_data() will free only text_ptr.key.  Similarly,
+if you transfer responsibility for free'ing text_ptr from libpng to your
+application, your application must not separately free those members.
+For a more compact example of writing a PNG image, see the file example.c.
+
+V. Modifying/Customizing libpng:
+
+There are two issues here.  The first is changing how libpng does
+standard things like memory allocation, input/output, and error handling.
+The second deals with more complicated things like adding new chunks,
+adding new transformations, and generally changing how libpng works.
+Both of those are compile-time issues; that is, they are generally
+determined at the time the code is written, and there is rarely a need
+to provide the user with a means of changing them.
+
+Memory allocation, input/output, and error handling
+
+All of the memory allocation, input/output, and error handling in libpng
+goes through callbacks that are user-settable.  The default routines are
+in pngmem.c, pngrio.c, pngwio.c, and pngerror.c, respectively.  To change
+these functions, call the appropriate png_set_*_fn() function.
+
+Memory allocation is done through the functions png_malloc()
+and png_free().  These currently just call the standard C functions.  If
+your pointers can't access more then 64K at a time, you will want to set
+MAXSEG_64K in zlib.h.  Since it is unlikely that the method of handling
+memory allocation on a platform will change between applications, these
+functions must be modified in the library at compile time.  If you prefer
+to use a different method of allocating and freeing data, you can use
+png_create_read_struct_2() or png_create_write_struct_2() to register
+your own functions as described above.
+These functions also provide a void pointer that can be retrieved via
+
+    mem_ptr=png_get_mem_ptr(png_ptr);
+
+Your replacement memory functions must have prototypes as follows:
+
+    png_voidp malloc_fn(png_structp png_ptr,
+       png_size_t size);
+    void free_fn(png_structp png_ptr, png_voidp ptr);
+
+Your malloc_fn() must return NULL in case of failure.  The png_malloc()
+function will normally call png_error() if it receives a NULL from the
+system memory allocator or from your replacement malloc_fn().
+
+Input/Output in libpng is done through png_read() and png_write(),
+which currently just call fread() and fwrite().  The FILE * is stored in
+png_struct and is initialized via png_init_io().  If you wish to change
+the method of I/O, the library supplies callbacks that you can set
+through the function png_set_read_fn() and png_set_write_fn() at run
+time, instead of calling the png_init_io() function.  These functions
+also provide a void pointer that can be retrieved via the function
+png_get_io_ptr().  For example:
+
+    png_set_read_fn(png_structp read_ptr,
+        voidp read_io_ptr, png_rw_ptr read_data_fn)
+
+    png_set_write_fn(png_structp write_ptr,
+        voidp write_io_ptr, png_rw_ptr write_data_fn,
+        png_flush_ptr output_flush_fn);
+
+    voidp read_io_ptr = png_get_io_ptr(read_ptr);
+    voidp write_io_ptr = png_get_io_ptr(write_ptr);
+
+The replacement I/O functions must have prototypes as follows:
+
+    void user_read_data(png_structp png_ptr,
+        png_bytep data, png_size_t length);
+    void user_write_data(png_structp png_ptr,
+        png_bytep data, png_size_t length);
+    void user_flush_data(png_structp png_ptr);
+
+Supplying NULL for the read, write, or flush functions sets them back
+to using the default C stream functions.  It is an error to read from
+a write stream, and vice versa.
+
+Error handling in libpng is done through png_error() and png_warning().
+Errors handled through png_error() are fatal, meaning that png_error()
+should never return to its caller.  Currently, this is handled via
+setjmp() and longjmp() (unless you have compiled libpng with
+PNG_SETJMP_NOT_SUPPORTED, in which case it is handled via PNG_ABORT()),
+but you could change this to do things like exit() if you should wish.
+
+On non-fatal errors, png_warning() is called
+to print a warning message, and then control returns to the calling code.
+By default png_error() and png_warning() print a message on stderr via
+fprintf() unless the library is compiled with PNG_NO_CONSOLE_IO defined
+(because you don't want the messages) or PNG_NO_STDIO defined (because
+fprintf() isn't available).  If you wish to change the behavior of the error
+functions, you will need to set up your own message callbacks.  These
+functions are normally supplied at the time that the png_struct is created.
+It is also possible to redirect errors and warnings to your own replacement
+functions after png_create_*_struct() has been called by calling:
+
+    png_set_error_fn(png_structp png_ptr,
+        png_voidp error_ptr, png_error_ptr error_fn,
+        png_error_ptr warning_fn);
+
+    png_voidp error_ptr = png_get_error_ptr(png_ptr);
+
+If NULL is supplied for either error_fn or warning_fn, then the libpng
+default function will be used, calling fprintf() and/or longjmp() if a
+problem is encountered.  The replacement error functions should have
+parameters as follows:
+
+    void user_error_fn(png_structp png_ptr,
+        png_const_charp error_msg);
+    void user_warning_fn(png_structp png_ptr,
+        png_const_charp warning_msg);
+
+The motivation behind using setjmp() and longjmp() is the C++ throw and
+catch exception handling methods.  This makes the code much easier to write,
+as there is no need to check every return code of every function call.
+However, there are some uncertainties about the status of local variables
+after a longjmp, so the user may want to be careful about doing anything after
+setjmp returns non-zero besides returning itself.  Consult your compiler
+documentation for more details.  For an alternative approach, you may wish
+to use the "cexcept" facility (see http://cexcept.sourceforge.net).
+
+Custom chunks
+
+If you need to read or write custom chunks, you may need to get deeper
+into the libpng code.  The library now has mechanisms for storing
+and writing chunks of unknown type; you can even declare callbacks
+for custom chunks.  However, this may not be good enough if the
+library code itself needs to know about interactions between your
+chunk and existing `intrinsic' chunks.
+
+If you need to write a new intrinsic chunk, first read the PNG
+specification. Acquire a first level of
+understanding of how it works.  Pay particular attention to the
+sections that describe chunk names, and look at how other chunks were
+designed, so you can do things similarly.  Second, check out the
+sections of libpng that read and write chunks.  Try to find a chunk
+that is similar to yours and use it as a template.  More details can
+be found in the comments inside the code.  It is best to handle unknown
+chunks in a generic method, via callback functions, instead of by
+modifying libpng functions.
+
+If you wish to write your own transformation for the data, look through
+the part of the code that does the transformations, and check out some of
+the simpler ones to get an idea of how they work.  Try to find a similar
+transformation to the one you want to add and copy off of it.  More details
+can be found in the comments inside the code itself.
+
+Configuring for 16 bit platforms
+
+You will want to look into zconf.h to tell zlib (and thus libpng) that
+it cannot allocate more then 64K at a time.  Even if you can, the memory
+won't be accessible.  So limit zlib and libpng to 64K by defining MAXSEG_64K.
+
+Configuring for DOS
+
+For DOS users who only have access to the lower 640K, you will
+have to limit zlib's memory usage via a png_set_compression_mem_level()
+call.  See zlib.h or zconf.h in the zlib library for more information.
+
+Configuring for Medium Model
+
+Libpng's support for medium model has been tested on most of the popular
+compilers.  Make sure MAXSEG_64K gets defined, USE_FAR_KEYWORD gets
+defined, and FAR gets defined to far in pngconf.h, and you should be
+all set.  Everything in the library (except for zlib's structure) is
+expecting far data.  You must use the typedefs with the p or pp on
+the end for pointers (or at least look at them and be careful).  Make
+note that the rows of data are defined as png_bytepp, which is an
+unsigned char far * far *.
+
+Configuring for gui/windowing platforms:
+
+You will need to write new error and warning functions that use the GUI
+interface, as described previously, and set them to be the error and
+warning functions at the time that png_create_*_struct() is called,
+in order to have them available during the structure initialization.
+They can be changed later via png_set_error_fn().  On some compilers,
+you may also have to change the memory allocators (png_malloc, etc.).
+
+Configuring for compiler xxx:
+
+All includes for libpng are in pngconf.h.  If you need to add/change/delete
+an include, this is the place to do it.  The includes that are not
+needed outside libpng are protected by the PNG_INTERNAL definition,
+which is only defined for those routines inside libpng itself.  The
+files in libpng proper only include png.h, which includes pngconf.h.
+
+Configuring zlib:
+
+There are special functions to configure the compression.  Perhaps the
+most useful one changes the compression level, which currently uses
+input compression values in the range 0 - 9.  The library normally
+uses the default compression level (Z_DEFAULT_COMPRESSION = 6).  Tests
+have shown that for a large majority of images, compression values in
+the range 3-6 compress nearly as well as higher levels, and do so much
+faster.  For online applications it may be desirable to have maximum speed
+(Z_BEST_SPEED = 1).  With versions of zlib after v0.99, you can also
+specify no compression (Z_NO_COMPRESSION = 0), but this would create
+files larger than just storing the raw bitmap.  You can specify the
+compression level by calling:
+
+    png_set_compression_level(png_ptr, level);
+
+Another useful one is to reduce the memory level used by the library.
+The memory level defaults to 8, but it can be lowered if you are
+short on memory (running DOS, for example, where you only have 640K).
+Note that the memory level does have an effect on compression; among
+other things, lower levels will result in sections of incompressible
+data being emitted in smaller stored blocks, with a correspondingly
+larger relative overhead of up to 15% in the worst case.
+
+    png_set_compression_mem_level(png_ptr, level);
+
+The other functions are for configuring zlib.  They are not recommended
+for normal use and may result in writing an invalid PNG file.  See
+zlib.h for more information on what these mean.
+
+    png_set_compression_strategy(png_ptr,
+        strategy);
+    png_set_compression_window_bits(png_ptr,
+        window_bits);
+    png_set_compression_method(png_ptr, method);
+    png_set_compression_buffer_size(png_ptr, size);
+
+Controlling row filtering
+
+If you want to control whether libpng uses filtering or not, which
+filters are used, and how it goes about picking row filters, you
+can call one of these functions.  The selection and configuration
+of row filters can have a significant impact on the size and
+encoding speed and a somewhat lesser impact on the decoding speed
+of an image.  Filtering is enabled by default for RGB and grayscale
+images (with and without alpha), but not for paletted images nor
+for any images with bit depths less than 8 bits/pixel.
+
+The 'method' parameter sets the main filtering method, which is
+currently only '0' in the PNG 1.2 specification.  The 'filters'
+parameter sets which filter(s), if any, should be used for each
+scanline.  Possible values are PNG_ALL_FILTERS and PNG_NO_FILTERS
+to turn filtering on and off, respectively.
+
+Individual filter types are PNG_FILTER_NONE, PNG_FILTER_SUB,
+PNG_FILTER_UP, PNG_FILTER_AVG, PNG_FILTER_PAETH, which can be bitwise
+ORed together with '|' to specify one or more filters to use.
+These filters are described in more detail in the PNG specification.
+If you intend to change the filter type during the course of writing
+the image, you should start with flags set for all of the filters
+you intend to use so that libpng can initialize its internal
+structures appropriately for all of the filter types.  (Note that this
+means the first row must always be adaptively filtered, because libpng
+currently does not allocate the filter buffers until png_write_row()
+is called for the first time.)
+
+    filters = PNG_FILTER_NONE | PNG_FILTER_SUB
+              PNG_FILTER_UP | PNG_FILTER_AVE |
+              PNG_FILTER_PAETH | PNG_ALL_FILTERS;
+
+    png_set_filter(png_ptr, PNG_FILTER_TYPE_BASE,
+       filters);
+              The second parameter can also be
+              PNG_INTRAPIXEL_DIFFERENCING if you are
+              writing a PNG to be embedded in a MNG
+              datastream.  This parameter must be the
+              same as the value of filter_method used
+              in png_set_IHDR().
+
+It is also possible to influence how libpng chooses from among the
+available filters.  This is done in one or both of two ways - by
+telling it how important it is to keep the same filter for successive
+rows, and by telling it the relative computational costs of the filters.
+
+    double weights[3] = {1.5, 1.3, 1.1},
+       costs[PNG_FILTER_VALUE_LAST] =
+       {1.0, 1.3, 1.3, 1.5, 1.7};
+
+    png_set_filter_heuristics(png_ptr,
+       PNG_FILTER_HEURISTIC_WEIGHTED, 3,
+       weights, costs);
+
+The weights are multiplying factors that indicate to libpng that the
+row filter should be the same for successive rows unless another row filter
+is that many times better than the previous filter.  In the above example,
+if the previous 3 filters were SUB, SUB, NONE, the SUB filter could have a
+"sum of absolute differences" 1.5 x 1.3 times higher than other filters
+and still be chosen, while the NONE filter could have a sum 1.1 times
+higher than other filters and still be chosen.  Unspecified weights are
+taken to be 1.0, and the specified weights should probably be declining
+like those above in order to emphasize recent filters over older filters.
+
+The filter costs specify for each filter type a relative decoding cost
+to be considered when selecting row filters.  This means that filters
+with higher costs are less likely to be chosen over filters with lower
+costs, unless their "sum of absolute differences" is that much smaller.
+The costs do not necessarily reflect the exact computational speeds of
+the various filters, since this would unduly influence the final image
+size.
+
+Note that the numbers above were invented purely for this example and
+are given only to help explain the function usage.  Little testing has
+been done to find optimum values for either the costs or the weights.
+
+Removing unwanted object code
+
+There are a bunch of #define's in pngconf.h that control what parts of
+libpng are compiled.  All the defines end in _SUPPORTED.  If you are
+never going to use a capability, you can change the #define to #undef
+before recompiling libpng and save yourself code and data space, or
+you can turn off individual capabilities with defines that begin with
+PNG_NO_.
+
+You can also turn all of the transforms and ancillary chunk capabilities
+off en masse with compiler directives that define
+PNG_NO_READ[or WRITE]_TRANSFORMS, or PNG_NO_READ[or WRITE]_ANCILLARY_CHUNKS,
+or all four,
+along with directives to turn on any of the capabilities that you do
+want.  The PNG_NO_READ[or WRITE]_TRANSFORMS directives disable
+the extra transformations but still leave the library fully capable of reading
+and writing PNG files with all known public chunks
+Use of the PNG_NO_READ[or WRITE]_ANCILLARY_CHUNKS directive
+produces a library that is incapable of reading or writing ancillary chunks.
+If you are not using the progressive reading capability, you can
+turn that off with PNG_NO_PROGRESSIVE_READ (don't confuse
+this with the INTERLACING capability, which you'll still have).
+
+All the reading and writing specific code are in separate files, so the
+linker should only grab the files it needs.  However, if you want to
+make sure, or if you are building a stand alone library, all the
+reading files start with pngr and all the writing files start with
+pngw.  The files that don't match either (like png.c, pngtrans.c, etc.)
+are used for both reading and writing, and always need to be included.
+The progressive reader is in pngpread.c
+
+If you are creating or distributing a dynamically linked library (a .so
+or DLL file), you should not remove or disable any parts of the library,
+as this will cause applications linked with different versions of the
+library to fail if they call functions not available in your library.
+The size of the library itself should not be an issue, because only
+those sections that are actually used will be loaded into memory.
+
+Requesting debug printout
+
+The macro definition PNG_DEBUG can be used to request debugging
+printout.  Set it to an integer value in the range 0 to 3.  Higher
+numbers result in increasing amounts of debugging information.  The
+information is printed to the "stderr" file, unless another file
+name is specified in the PNG_DEBUG_FILE macro definition.
+
+When PNG_DEBUG > 0, the following functions (macros) become available:
+
+   png_debug(level, message)
+   png_debug1(level, message, p1)
+   png_debug2(level, message, p1, p2)
+
+in which "level" is compared to PNG_DEBUG to decide whether to print
+the message, "message" is the formatted string to be printed,
+and p1 and p2 are parameters that are to be embedded in the string
+according to printf-style formatting directives.  For example,
+
+   png_debug1(2, "foo=%d\n", foo);
+
+is expanded to
+
+   if(PNG_DEBUG > 2)
+     fprintf(PNG_DEBUG_FILE, "foo=%d\n", foo);
+
+When PNG_DEBUG is defined but is zero, the macros aren't defined, but you
+can still use PNG_DEBUG to control your own debugging:
+
+   #ifdef PNG_DEBUG
+       fprintf(stderr, ...
+   #endif
+
+When PNG_DEBUG = 1, the macros are defined, but only png_debug statements
+having level = 0 will be printed.  There aren't any such statements in
+this version of libpng, but if you insert some they will be printed.
+
+VII.  MNG support
+
+The MNG specification (available at http://www.libpng.org/pub/mng) allows
+certain extensions to PNG for PNG images that are embedded in MNG datastreams.
+Libpng can support some of these extensions.  To enable them, use the
+png_permit_mng_features() function:
+
+   feature_set = png_permit_mng_features(png_ptr, mask)
+   mask is a png_uint_32 containing the bitwise OR of the
+        features you want to enable.  These include
+        PNG_FLAG_MNG_EMPTY_PLTE
+        PNG_FLAG_MNG_FILTER_64
+        PNG_ALL_MNG_FEATURES
+   feature_set is a png_uint_32 that is the bitwise AND of
+      your mask with the set of MNG features that is
+      supported by the version of libpng that you are using.
+
+It is an error to use this function when reading or writing a standalone
+PNG file with the PNG 8-byte signature.  The PNG datastream must be wrapped
+in a MNG datastream.  As a minimum, it must have the MNG 8-byte signature
+and the MHDR and MEND chunks.  Libpng does not provide support for these
+or any other MNG chunks; your application must provide its own support for
+them.  You may wish to consider using libmng (available at
+http://www.libmng.com) instead.
+
+VIII.  Changes to Libpng from version 0.88
+
+It should be noted that versions of libpng later than 0.96 are not
+distributed by the original libpng author, Guy Schalnat, nor by
+Andreas Dilger, who had taken over from Guy during 1996 and 1997, and
+distributed versions 0.89 through 0.96, but rather by another member
+of the original PNG Group, Glenn Randers-Pehrson.  Guy and Andreas are
+still alive and well, but they have moved on to other things.
+
+The old libpng functions png_read_init(), png_write_init(),
+png_info_init(), png_read_destroy(), and png_write_destroy() have been
+moved to PNG_INTERNAL in version 0.95 to discourage their use.  These
+functions will be removed from libpng version 2.0.0.
+
+The preferred method of creating and initializing the libpng structures is
+via the png_create_read_struct(), png_create_write_struct(), and
+png_create_info_struct() because they isolate the size of the structures
+from the application, allow version error checking, and also allow the
+use of custom error handling routines during the initialization, which
+the old functions do not.  The functions png_read_destroy() and
+png_write_destroy() do not actually free the memory that libpng
+allocated for these structs, but just reset the data structures, so they
+can be used instead of png_destroy_read_struct() and
+png_destroy_write_struct() if you feel there is too much system overhead
+allocating and freeing the png_struct for each image read.
+
+Setting the error callbacks via png_set_message_fn() before
+png_read_init() as was suggested in libpng-0.88 is no longer supported
+because this caused applications that do not use custom error functions
+to fail if the png_ptr was not initialized to zero.  It is still possible
+to set the error callbacks AFTER png_read_init(), or to change them with
+png_set_error_fn(), which is essentially the same function, but with a new
+name to force compilation errors with applications that try to use the old
+method.
+
+Starting with version 1.0.7, you can find out which version of the library
+you are using at run-time:
+
+   png_uint_32 libpng_vn = png_access_version_number();
+
+The number libpng_vn is constructed from the major version, minor
+version with leading zero, and release number with leading zero,
+(e.g., libpng_vn for version 1.0.7 is 10007).
+
+You can also check which version of png.h you used when compiling your
+application:
+
+   png_uint_32 application_vn = PNG_LIBPNG_VER;
+
+IX. Y2K Compliance in libpng
+
+October 13, 2007
+
+Since the PNG Development group is an ad-hoc body, we can't make
+an official declaration.
+
+This is your unofficial assurance that libpng from version 0.71 and
+upward through 1.2.22 are Y2K compliant.  It is my belief that earlier
+versions were also Y2K compliant.
+
+Libpng only has three year fields.  One is a 2-byte unsigned integer that
+will hold years up to 65535.  The other two hold the date in text
+format, and will hold years up to 9999.
+
+The integer is
+    "png_uint_16 year" in png_time_struct.
+
+The strings are
+    "png_charp time_buffer" in png_struct and
+    "near_time_buffer", which is a local character string in png.c.
+
+There are seven time-related functions:
+
+    png_convert_to_rfc_1123() in png.c
+      (formerly png_convert_to_rfc_1152() in error)
+    png_convert_from_struct_tm() in pngwrite.c, called
+      in pngwrite.c
+    png_convert_from_time_t() in pngwrite.c
+    png_get_tIME() in pngget.c
+    png_handle_tIME() in pngrutil.c, called in pngread.c
+    png_set_tIME() in pngset.c
+    png_write_tIME() in pngwutil.c, called in pngwrite.c
+
+All appear to handle dates properly in a Y2K environment.  The
+png_convert_from_time_t() function calls gmtime() to convert from system
+clock time, which returns (year - 1900), which we properly convert to
+the full 4-digit year.  There is a possibility that applications using
+libpng are not passing 4-digit years into the png_convert_to_rfc_1123()
+function, or that they are incorrectly passing only a 2-digit year
+instead of "year - 1900" into the png_convert_from_struct_tm() function,
+but this is not under our control.  The libpng documentation has always
+stated that it works with 4-digit years, and the APIs have been
+documented as such.
+
+The tIME chunk itself is also Y2K compliant.  It uses a 2-byte unsigned
+integer to hold the year, and can hold years as large as 65535.
+
+zlib, upon which libpng depends, is also Y2K compliant.  It contains
+no date-related code.
+
+
+   Glenn Randers-Pehrson
+   libpng maintainer
+   PNG Development Group
diff --git a/uppsrc/plugin/png/lib/libpng.3 b/uppsrc/plugin/png/lib/libpng.3
new file mode 100644
index 000000000..13a284522
--- /dev/null
+++ b/uppsrc/plugin/png/lib/libpng.3
@@ -0,0 +1,3600 @@
+.TH LIBPNG 3 "October 13, 2007"
+.SH NAME
+libpng \- Portable Network Graphics (PNG) Reference Library 1.2.22
+.SH SYNOPSIS
+\fB
+#include <png.h>\fP
+
+\fBpng_uint_32 png_access_version_number \fI(void\fP\fB);\fP
+
+\fBint png_check_sig (png_bytep \fP\fIsig\fP\fB, int \fInum\fP\fB);\fP
+
+\fBvoid png_chunk_error (png_structp \fP\fIpng_ptr\fP\fB, png_const_charp \fIerror\fP\fB);\fP
+
+\fBvoid png_chunk_warning (png_structp \fP\fIpng_ptr\fP\fB, png_const_charp \fImessage\fP\fB);\fP
+
+\fBvoid png_convert_from_struct_tm (png_timep \fP\fIptime\fP\fB, struct tm FAR * \fIttime\fP\fB);\fP
+
+\fBvoid png_convert_from_time_t (png_timep \fP\fIptime\fP\fB, time_t \fIttime\fP\fB);\fP
+
+\fBpng_charp png_convert_to_rfc1123 (png_structp \fP\fIpng_ptr\fP\fB, png_timep \fIptime\fP\fB);\fP
+
+\fBpng_infop png_create_info_struct (png_structp \fIpng_ptr\fP\fB);\fP
+
+\fBpng_structp png_create_read_struct (png_const_charp \fP\fIuser_png_ver\fP\fB, png_voidp \fP\fIerror_ptr\fP\fB, png_error_ptr \fP\fIerror_fn\fP\fB, png_error_ptr \fIwarn_fn\fP\fB);\fP
+
+\fBpng_structp png_create_read_struct_2(png_const_charp \fP\fIuser_png_ver\fP\fB, png_voidp \fP\fIerror_ptr\fP\fB, png_error_ptr \fP\fIerror_fn\fP\fB, png_error_ptr \fP\fIwarn_fn\fP\fB, png_voidp \fP\fImem_ptr\fP\fB, png_malloc_ptr \fP\fImalloc_fn\fP\fB, png_free_ptr \fIfree_fn\fP\fB);\fP
+
+\fBpng_structp png_create_write_struct (png_const_charp \fP\fIuser_png_ver\fP\fB, png_voidp \fP\fIerror_ptr\fP\fB, png_error_ptr \fP\fIerror_fn\fP\fB, png_error_ptr \fIwarn_fn\fP\fB);\fP
+
+\fBpng_structp png_create_write_struct_2(png_const_charp \fP\fIuser_png_ver\fP\fB, png_voidp \fP\fIerror_ptr\fP\fB, png_error_ptr \fP\fIerror_fn\fP\fB, png_error_ptr \fP\fIwarn_fn\fP\fB, png_voidp \fP\fImem_ptr\fP\fB, png_malloc_ptr \fP\fImalloc_fn\fP\fB, png_free_ptr \fIfree_fn\fP\fB);\fP
+
+\fBint png_debug(int \fP\fIlevel\fP\fB, png_const_charp \fImessage\fP\fB);\fP
+
+\fBint png_debug1(int \fP\fIlevel\fP\fB, png_const_charp \fP\fImessage\fP\fB, \fIp1\fP\fB);\fP
+
+\fBint png_debug2(int \fP\fIlevel\fP\fB, png_const_charp \fP\fImessage\fP\fB, \fP\fIp1\fP\fB, \fIp2\fP\fB);\fP
+
+\fBvoid png_destroy_info_struct (png_structp \fP\fIpng_ptr\fP\fB, png_infopp \fIinfo_ptr_ptr\fP\fB);\fP
+
+\fBvoid png_destroy_read_struct (png_structpp \fP\fIpng_ptr_ptr\fP\fB, png_infopp \fP\fIinfo_ptr_ptr\fP\fB, png_infopp \fIend_info_ptr_ptr\fP\fB);\fP
+
+\fBvoid png_destroy_write_struct (png_structpp \fP\fIpng_ptr_ptr\fP\fB, png_infopp \fIinfo_ptr_ptr\fP\fB);\fP
+
+\fBvoid png_error (png_structp \fP\fIpng_ptr\fP\fB, png_const_charp \fIerror\fP\fB);\fP
+
+\fBvoid png_free (png_structp \fP\fIpng_ptr\fP\fB, png_voidp \fIptr\fP\fB);\fP
+
+\fBvoid png_free_chunk_list (png_structp \fIpng_ptr\fP\fB);\fP
+
+\fBvoid png_free_default(png_structp \fP\fIpng_ptr\fP\fB, png_voidp \fIptr\fP\fB);\fP
+
+\fBvoid png_free_data (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, int \fInum\fP\fB);\fP
+
+\fBpng_byte png_get_bit_depth (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
+
+\fBpng_uint_32 png_get_bKGD (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_color_16p \fI*background\fP\fB);\fP
+
+\fBpng_byte png_get_channels (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
+
+\fBpng_uint_32 png_get_cHRM (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, double \fP\fI*white_x\fP\fB, double \fP\fI*white_y\fP\fB, double \fP\fI*red_x\fP\fB, double \fP\fI*red_y\fP\fB, double \fP\fI*green_x\fP\fB, double \fP\fI*green_y\fP\fB, double \fP\fI*blue_x\fP\fB, double \fI*blue_y\fP\fB);\fP
+
+\fBpng_uint_32 png_get_cHRM_fixed (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fP\fI*white_x\fP\fB, png_uint_32 \fP\fI*white_y\fP\fB, png_uint_32 \fP\fI*red_x\fP\fB, png_uint_32 \fP\fI*red_y\fP\fB, png_uint_32 \fP\fI*green_x\fP\fB, png_uint_32 \fP\fI*green_y\fP\fB, png_uint_32 \fP\fI*blue_x\fP\fB, png_uint_32 \fI*blue_y\fP\fB);\fP
+
+\fBpng_byte png_get_color_type (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
+
+\fBpng_byte png_get_compression_type (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
+
+\fBpng_byte png_get_copyright (png_structp \fIpng_ptr\fP\fB);\fP
+
+\fBpng_voidp png_get_error_ptr (png_structp \fIpng_ptr\fP\fB);\fP
+
+\fBpng_byte png_get_filter_type (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
+
+\fBpng_uint_32 png_get_gAMA (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, double \fI*file_gamma\fP\fB);\fP
+
+\fBpng_uint_32 png_get_gAMA_fixed (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fI*int_file_gamma\fP\fB);\fP
+
+\fBpng_byte png_get_header_ver (png_structp \fIpng_ptr\fP\fB);\fP
+
+\fBpng_byte png_get_header_version (png_structp \fIpng_ptr\fP\fB);\fP
+
+\fBpng_uint_32 png_get_hIST (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_16p \fI*hist\fP\fB);\fP
+
+\fBpng_uint_32 png_get_iCCP (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_charpp \fP\fIname\fP\fB, int \fP\fI*compression_type\fP\fB, png_charpp \fP\fIprofile\fP\fB, png_uint_32 \fI*proflen\fP\fB);\fP
+
+\fBpng_uint_32 png_get_IHDR (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fP\fI*width\fP\fB, png_uint_32 \fP\fI*height\fP\fB, int \fP\fI*bit_depth\fP\fB, int \fP\fI*color_type\fP\fB, int \fP\fI*interlace_type\fP\fB, int \fP\fI*compression_type\fP\fB, int \fI*filter_type\fP\fB);\fP
+
+\fBpng_uint_32 png_get_image_height (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
+
+\fBpng_uint_32 png_get_image_width (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
+
+\fB#if !defined(PNG_1_0_X) png_int_32 png_get_int_32 (png_bytep buf); \fI#endif
+
+\fBpng_byte png_get_interlace_type (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
+
+\fBpng_voidp png_get_io_ptr (png_structp \fIpng_ptr\fP\fB);\fP
+
+\fBpng_byte png_get_libpng_ver (png_structp \fIpng_ptr\fP\fB);\fP
+
+\fBpng_voidp png_get_mem_ptr(png_structp \fIpng_ptr\fP\fB);\fP
+
+\fBpng_uint_32 png_get_oFFs (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fP\fI*offset_x\fP\fB, png_uint_32 \fP\fI*offset_y\fP\fB, int \fI*unit_type\fP\fB);\fP
+
+\fBpng_uint_32 png_get_pCAL (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_charp \fP\fI*purpose\fP\fB, png_int_32 \fP\fI*X0\fP\fB, png_int_32 \fP\fI*X1\fP\fB, int \fP\fI*type\fP\fB, int \fP\fI*nparams\fP\fB, png_charp \fP\fI*units\fP\fB, png_charpp \fI*params\fP\fB);\fP
+
+\fBpng_uint_32 png_get_pHYs (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fP\fI*res_x\fP\fB, png_uint_32 \fP\fI*res_y\fP\fB, int \fI*unit_type\fP\fB);\fP
+
+\fBfloat png_get_pixel_aspect_ratio (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
+
+\fBpng_uint_32 png_get_pixels_per_meter (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
+
+\fBpng_voidp png_get_progressive_ptr (png_structp \fIpng_ptr\fP\fB);\fP
+
+\fBpng_uint_32 png_get_PLTE (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_colorp \fP\fI*palette\fP\fB, int \fI*num_palette\fP\fB);\fP
+
+\fBpng_byte png_get_rgb_to_gray_status (png_structp png_ptr) png_uint_32 png_get_rowbytes (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
+
+\fBpng_bytepp png_get_rows (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
+
+\fBpng_uint_32 png_get_sBIT (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_color_8p \fI*sig_bit\fP\fB);\fP
+
+\fBpng_bytep png_get_signature (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
+
+\fBpng_uint_32 png_get_sPLT (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_spalette_p \fI*splt_ptr\fP\fB);\fP
+
+\fBpng_uint_32 png_get_sRGB (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, int \fI*intent\fP\fB);\fP
+
+\fBpng_uint_32 png_get_text (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_textp \fP\fI*text_ptr\fP\fB, int \fI*num_text\fP\fB);\fP
+
+\fBpng_uint_32 png_get_tIME (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_timep \fI*mod_time\fP\fB);\fP
+
+\fBpng_uint_32 png_get_tRNS (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_bytep \fP\fI*trans\fP\fB, int \fP\fI*num_trans\fP\fB, png_color_16p \fI*trans_values\fP\fB);\fP
+
+\fB#if !defined(PNG_1_0_X) png_uint_16 png_get_uint_16 (png_bytep \fIbuf\fP\fB);\fP
+
+\fBpng_uint_32 png_get_uint_31 (png_bytep \fIbuf\fP\fB);\fP
+
+\fBpng_uint_32 png_get_uint_32 (png_bytep buf); \fI#endif
+
+\fBpng_uint_32 png_get_unknown_chunks (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_unknown_chunkpp \fIunknowns\fP\fB);\fP
+
+\fBpng_voidp png_get_user_chunk_ptr (png_structp \fIpng_ptr\fP\fB);\fP
+
+\fBpng_uint_32 png_get_user_height_max( png_structp \fIpng_ptr\fP\fB);\fP
+
+\fBpng_voidp png_get_user_transform_ptr (png_structp \fIpng_ptr\fP\fB);\fP
+
+\fBpng_uint_32 png_get_user_width_max (png_structp \fIpng_ptr\fP\fB);\fP
+
+\fBpng_uint_32 png_get_valid (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIflag\fP\fB);\fP
+
+\fBpng_int_32 png_get_x_offset_microns (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
+
+\fBpng_int_32 png_get_x_offset_pixels (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
+
+\fBpng_uint_32 png_get_x_pixels_per_meter (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
+
+\fBpng_int_32 png_get_y_offset_microns (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
+
+\fBpng_int_32 png_get_y_offset_pixels (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
+
+\fBpng_uint_32 png_get_y_pixels_per_meter (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
+
+\fBpng_uint_32 png_get_compression_buffer_size (png_structp \fIpng_ptr\fP\fB);\fP
+
+\fBint png_handle_as_unknown (png_structp \fP\fIpng_ptr\fP\fB, png_bytep \fIchunk_name\fP\fB);\fP
+
+\fBvoid png_init_io (png_structp \fP\fIpng_ptr\fP\fB, FILE \fI*fp\fP\fB);\fP
+
+\fBDEPRECATED: void png_info_init (png_infop \fIinfo_ptr\fP\fB);\fP
+
+\fBDEPRECATED: void png_info_init_2 (png_infopp \fP\fIptr_ptr\fP\fB, png_size_t \fIpng_info_struct_size\fP\fB);\fP
+
+\fBpng_voidp png_malloc (png_structp \fP\fIpng_ptr\fP\fB, png_uint_32 \fIsize\fP\fB);\fP
+
+\fBpng_voidp png_malloc_default(png_structp \fP\fIpng_ptr\fP\fB, png_uint_32 \fIsize\fP\fB);\fP
+
+\fBvoidp png_memcpy (png_voidp \fP\fIs1\fP\fB, png_voidp \fP\fIs2\fP\fB, png_size_t \fIsize\fP\fB);\fP
+
+\fBpng_voidp png_memcpy_check (png_structp \fP\fIpng_ptr\fP\fB, png_voidp \fP\fIs1\fP\fB, png_voidp \fP\fIs2\fP\fB, png_uint_32 \fIsize\fP\fB);\fP
+
+\fBvoidp png_memset (png_voidp \fP\fIs1\fP\fB, int \fP\fIvalue\fP\fB, png_size_t \fIsize\fP\fB);\fP
+
+\fBpng_voidp png_memset_check (png_structp \fP\fIpng_ptr\fP\fB, png_voidp \fP\fIs1\fP\fB, int \fP\fIvalue\fP\fB, png_uint_32 \fIsize\fP\fB);\fP
+
+\fBDEPRECATED: void png_permit_empty_plte (png_structp \fP\fIpng_ptr\fP\fB, int \fIempty_plte_permitted\fP\fB);\fP
+
+\fBvoid png_process_data (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_bytep \fP\fIbuffer\fP\fB, png_size_t \fIbuffer_size\fP\fB);\fP
+
+\fBvoid png_progressive_combine_row (png_structp \fP\fIpng_ptr\fP\fB, png_bytep \fP\fIold_row\fP\fB, png_bytep \fInew_row\fP\fB);\fP
+
+\fBvoid png_read_destroy (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_infop \fIend_info_ptr\fP\fB);\fP
+
+\fBvoid png_read_end (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
+
+\fBvoid png_read_image (png_structp \fP\fIpng_ptr\fP\fB, png_bytepp \fIimage\fP\fB);\fP
+
+\fBDEPRECATED: void png_read_init (png_structp \fIpng_ptr\fP\fB);\fP
+
+\fBDEPRECATED: void png_read_init_2 (png_structpp \fP\fIptr_ptr\fP\fB, png_const_charp \fP\fIuser_png_ver\fP\fB, png_size_t \fP\fIpng_struct_size\fP\fB, png_size_t \fIpng_info_size\fP\fB);\fP
+
+\fBvoid png_read_info (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
+
+\fBvoid png_read_png (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, int \fP\fItransforms\fP\fB, png_voidp \fIparams\fP\fB);\fP
+
+\fBvoid png_read_row (png_structp \fP\fIpng_ptr\fP\fB, png_bytep \fP\fIrow\fP\fB, png_bytep \fIdisplay_row\fP\fB);\fP
+
+\fBvoid png_read_rows (png_structp \fP\fIpng_ptr\fP\fB, png_bytepp \fP\fIrow\fP\fB, png_bytepp \fP\fIdisplay_row\fP\fB, png_uint_32 \fInum_rows\fP\fB);\fP
+
+\fBvoid png_read_update_info (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
+
+\fB#if !defined(PNG_1_0_X) png_save_int_32 (png_bytep \fP\fIbuf\fP\fB, png_int_32 \fIi\fP\fB);\fP
+
+\fBvoid png_save_uint_16 (png_bytep \fP\fIbuf\fP\fB, unsigned int \fIi\fP\fB);\fP
+
+\fBvoid png_save_uint_32 (png_bytep \fP\fIbuf\fP\fB, png_uint_32 \fIi\fP\fB);\fP
+
+\fBvoid png_set_add_alpha (png_structp \fP\fIpng_ptr\fP\fB, png_uint_32 \fP\fIfiller\fP\fB, int flags); \fI#endif
+
+\fBvoid png_set_background (png_structp \fP\fIpng_ptr\fP\fB, png_color_16p \fP\fIbackground_color\fP\fB, int \fP\fIbackground_gamma_code\fP\fB, int \fP\fIneed_expand\fP\fB, double \fIbackground_gamma\fP\fB);\fP
+
+\fBvoid png_set_bgr (png_structp \fIpng_ptr\fP\fB);\fP
+
+\fBvoid png_set_bKGD (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_color_16p \fIbackground\fP\fB);\fP
+
+\fBvoid png_set_cHRM (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, double \fP\fIwhite_x\fP\fB, double \fP\fIwhite_y\fP\fB, double \fP\fIred_x\fP\fB, double \fP\fIred_y\fP\fB, double \fP\fIgreen_x\fP\fB, double \fP\fIgreen_y\fP\fB, double \fP\fIblue_x\fP\fB, double \fIblue_y\fP\fB);\fP
+
+\fBvoid png_set_cHRM_fixed (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fP\fIwhite_x\fP\fB, png_uint_32 \fP\fIwhite_y\fP\fB, png_uint_32 \fP\fIred_x\fP\fB, png_uint_32 \fP\fIred_y\fP\fB, png_uint_32 \fP\fIgreen_x\fP\fB, png_uint_32 \fP\fIgreen_y\fP\fB, png_uint_32 \fP\fIblue_x\fP\fB, png_uint_32 \fIblue_y\fP\fB);\fP
+
+\fBvoid png_set_compression_level (png_structp \fP\fIpng_ptr\fP\fB, int \fIlevel\fP\fB);\fP
+
+\fBvoid png_set_compression_mem_level (png_structp \fP\fIpng_ptr\fP\fB, int \fImem_level\fP\fB);\fP
+
+\fBvoid png_set_compression_method (png_structp \fP\fIpng_ptr\fP\fB, int \fImethod\fP\fB);\fP
+
+\fBvoid png_set_compression_strategy (png_structp \fP\fIpng_ptr\fP\fB, int \fIstrategy\fP\fB);\fP
+
+\fBvoid png_set_compression_window_bits (png_structp \fP\fIpng_ptr\fP\fB, int \fIwindow_bits\fP\fB);\fP
+
+\fBvoid png_set_crc_action (png_structp \fP\fIpng_ptr\fP\fB, int \fP\fIcrit_action\fP\fB, int \fIancil_action\fP\fB);\fP
+
+\fBvoid png_set_dither (png_structp \fP\fIpng_ptr\fP\fB, png_colorp \fP\fIpalette\fP\fB, int \fP\fInum_palette\fP\fB, int \fP\fImaximum_colors\fP\fB, png_uint_16p \fP\fIhistogram\fP\fB, int \fIfull_dither\fP\fB);\fP
+
+\fBvoid png_set_error_fn (png_structp \fP\fIpng_ptr\fP\fB, png_voidp \fP\fIerror_ptr\fP\fB, png_error_ptr \fP\fIerror_fn\fP\fB, png_error_ptr \fIwarning_fn\fP\fB);\fP
+
+\fBvoid png_set_expand (png_structp \fIpng_ptr\fP\fB);\fP
+
+\fBvoid png_set_expand_gray_1_2_4_to_8(png_structp \fIpng_ptr\fP\fB);\fP
+
+\fBvoid png_set_filler (png_structp \fP\fIpng_ptr\fP\fB, png_uint_32 \fP\fIfiller\fP\fB, int \fIflags\fP\fB);\fP
+
+\fBvoid png_set_filter (png_structp \fP\fIpng_ptr\fP\fB, int \fP\fImethod\fP\fB, int \fIfilters\fP\fB);\fP
+
+\fBvoid png_set_filter_heuristics (png_structp \fP\fIpng_ptr\fP\fB, int \fP\fIheuristic_method\fP\fB, int \fP\fInum_weights\fP\fB, png_doublep \fP\fIfilter_weights\fP\fB, png_doublep \fIfilter_costs\fP\fB);\fP
+
+\fBvoid png_set_flush (png_structp \fP\fIpng_ptr\fP\fB, int \fInrows\fP\fB);\fP
+
+\fBvoid png_set_gamma (png_structp \fP\fIpng_ptr\fP\fB, double \fP\fIscreen_gamma\fP\fB, double \fIdefault_file_gamma\fP\fB);\fP
+
+\fBvoid png_set_gAMA (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, double \fIfile_gamma\fP\fB);\fP
+
+\fBvoid png_set_gAMA_fixed (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIfile_gamma\fP\fB);\fP
+
+\fBvoid png_set_gray_1_2_4_to_8(png_structp \fIpng_ptr\fP\fB);\fP
+
+\fBvoid png_set_gray_to_rgb (png_structp \fIpng_ptr\fP\fB);\fP
+
+\fBvoid png_set_hIST (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_16p \fIhist\fP\fB);\fP
+
+\fBvoid png_set_iCCP (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_charp \fP\fIname\fP\fB, int \fP\fIcompression_type\fP\fB, png_charp \fP\fIprofile\fP\fB, png_uint_32 \fIproflen\fP\fB);\fP
+
+\fBint png_set_interlace_handling (png_structp \fIpng_ptr\fP\fB);\fP
+
+\fBvoid png_set_invalid (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, int \fImask\fP\fB);\fP
+
+\fBvoid png_set_invert_alpha (png_structp \fIpng_ptr\fP\fB);\fP
+
+\fBvoid png_set_invert_mono (png_structp \fIpng_ptr\fP\fB);\fP
+
+\fBvoid png_set_IHDR (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fP\fIwidth\fP\fB, png_uint_32 \fP\fIheight\fP\fB, int \fP\fIbit_depth\fP\fB, int \fP\fIcolor_type\fP\fB, int \fP\fIinterlace_type\fP\fB, int \fP\fIcompression_type\fP\fB, int \fIfilter_type\fP\fB);\fP
+
+\fBvoid png_set_keep_unknown_chunks (png_structp \fP\fIpng_ptr\fP\fB, int \fP\fIkeep\fP\fB, png_bytep \fP\fIchunk_list\fP\fB, int \fInum_chunks\fP\fB);\fP
+
+\fBvoid png_set_mem_fn(png_structp \fP\fIpng_ptr\fP\fB, png_voidp \fP\fImem_ptr\fP\fB, png_malloc_ptr \fP\fImalloc_fn\fP\fB, png_free_ptr \fIfree_fn\fP\fB);\fP
+
+\fBvoid png_set_oFFs (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fP\fIoffset_x\fP\fB, png_uint_32 \fP\fIoffset_y\fP\fB, int \fIunit_type\fP\fB);\fP
+
+\fBvoid png_set_packing (png_structp \fIpng_ptr\fP\fB);\fP
+
+\fBvoid png_set_packswap (png_structp \fIpng_ptr\fP\fB);\fP
+
+\fBvoid png_set_palette_to_rgb(png_structp \fIpng_ptr\fP\fB);\fP
+
+\fBvoid png_set_pCAL (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_charp \fP\fIpurpose\fP\fB, png_int_32 \fP\fIX0\fP\fB, png_int_32 \fP\fIX1\fP\fB, int \fP\fItype\fP\fB, int \fP\fInparams\fP\fB, png_charp \fP\fIunits\fP\fB, png_charpp \fIparams\fP\fB);\fP
+
+\fBvoid png_set_pHYs (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fP\fIres_x\fP\fB, png_uint_32 \fP\fIres_y\fP\fB, int \fIunit_type\fP\fB);\fP
+
+\fBvoid png_set_progressive_read_fn (png_structp \fP\fIpng_ptr\fP\fB, png_voidp \fP\fIprogressive_ptr\fP\fB, png_progressive_info_ptr \fP\fIinfo_fn\fP\fB, png_progressive_row_ptr \fP\fIrow_fn\fP\fB, png_progressive_end_ptr \fIend_fn\fP\fB);\fP
+
+\fBvoid png_set_PLTE (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_colorp \fP\fIpalette\fP\fB, int \fInum_palette\fP\fB);\fP
+
+\fBvoid png_set_read_fn (png_structp \fP\fIpng_ptr\fP\fB, png_voidp \fP\fIio_ptr\fP\fB, png_rw_ptr \fIread_data_fn\fP\fB);\fP
+
+\fBvoid png_set_read_status_fn (png_structp \fP\fIpng_ptr\fP\fB, png_read_status_ptr \fIread_row_fn\fP\fB);\fP
+
+\fBvoid png_set_read_user_transform_fn (png_structp \fP\fIpng_ptr\fP\fB, png_user_transform_ptr \fIread_user_transform_fn\fP\fB);\fP
+
+\fBvoid png_set_rgb_to_gray (png_structp \fP\fIpng_ptr\fP\fB, int \fP\fIerror_action\fP\fB, double \fP\fIred\fP\fB, double \fIgreen\fP\fB);\fP
+
+\fBvoid png_set_rgb_to_gray_fixed (png_structp \fP\fIpng_ptr\fP\fB, int error_action png_fixed_point \fP\fIred\fP\fB, png_fixed_point \fIgreen\fP\fB);\fP
+
+\fBvoid png_set_rows (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_bytepp \fIrow_pointers\fP\fB);\fP
+
+\fBvoid png_set_sBIT (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_color_8p \fIsig_bit\fP\fB);\fP
+
+\fBvoid png_set_sCAL (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_charp \fP\fIunit\fP\fB, double \fP\fIwidth\fP\fB, double \fIheight\fP\fB);\fP
+
+\fBvoid png_set_shift (png_structp \fP\fIpng_ptr\fP\fB, png_color_8p \fItrue_bits\fP\fB);\fP
+
+\fBvoid png_set_sig_bytes (png_structp \fP\fIpng_ptr\fP\fB, int \fInum_bytes\fP\fB);\fP
+
+\fBvoid png_set_sPLT (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_spalette_p \fP\fIsplt_ptr\fP\fB, int \fInum_spalettes\fP\fB);\fP
+
+\fBvoid png_set_sRGB (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, int \fIintent\fP\fB);\fP
+
+\fBvoid png_set_sRGB_gAMA_and_cHRM (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, int \fIintent\fP\fB);\fP
+
+\fBvoid png_set_strip_16 (png_structp \fIpng_ptr\fP\fB);\fP
+
+\fBvoid png_set_strip_alpha (png_structp \fIpng_ptr\fP\fB);\fP
+
+\fBvoid png_set_swap (png_structp \fIpng_ptr\fP\fB);\fP
+
+\fBvoid png_set_swap_alpha (png_structp \fIpng_ptr\fP\fB);\fP
+
+\fBvoid png_set_text (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_textp \fP\fItext_ptr\fP\fB, int \fInum_text\fP\fB);\fP
+
+\fBvoid png_set_tIME (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_timep \fImod_time\fP\fB);\fP
+
+\fBvoid png_set_tRNS (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_bytep \fP\fItrans\fP\fB, int \fP\fInum_trans\fP\fB, png_color_16p \fItrans_values\fP\fB);\fP
+
+\fBvoid png_set_tRNS_to_alpha(png_structp \fIpng_ptr\fP\fB);\fP
+
+\fBpng_uint_32 png_set_unknown_chunks (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_unknown_chunkp \fP\fIunknowns\fP\fB, int \fP\fInum\fP\fB, int \fIlocation\fP\fB);\fP
+
+\fBvoid png_set_unknown_chunk_location(png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, int \fP\fIchunk\fP\fB, int \fIlocation\fP\fB);\fP
+
+\fBvoid png_set_read_user_chunk_fn (png_structp \fP\fIpng_ptr\fP\fB, png_voidp \fP\fIuser_chunk_ptr\fP\fB, png_user_chunk_ptr \fIread_user_chunk_fn\fP\fB);\fP
+
+\fBvoid png_set_user_limits (png_structp \fP\fIpng_ptr\fP\fB, png_uint_32 \fP\fIuser_width_max\fP\fB, png_uint_32 \fIuser_height_max\fP\fB);\fP
+
+\fBvoid png_set_user_transform_info (png_structp \fP\fIpng_ptr\fP\fB, png_voidp \fP\fIuser_transform_ptr\fP\fB, int \fP\fIuser_transform_depth\fP\fB, int \fIuser_transform_channels\fP\fB);\fP
+
+\fBvoid png_set_write_fn (png_structp \fP\fIpng_ptr\fP\fB, png_voidp \fP\fIio_ptr\fP\fB, png_rw_ptr \fP\fIwrite_data_fn\fP\fB, png_flush_ptr \fIoutput_flush_fn\fP\fB);\fP
+
+\fBvoid png_set_write_status_fn (png_structp \fP\fIpng_ptr\fP\fB, png_write_status_ptr \fIwrite_row_fn\fP\fB);\fP
+
+\fBvoid png_set_write_user_transform_fn (png_structp \fP\fIpng_ptr\fP\fB, png_user_transform_ptr \fIwrite_user_transform_fn\fP\fB);\fP
+
+\fBvoid png_set_compression_buffer_size(png_structp \fP\fIpng_ptr\fP\fB, png_uint_32 \fIsize\fP\fB);\fP
+
+\fBint png_sig_cmp (png_bytep \fP\fIsig\fP\fB, png_size_t \fP\fIstart\fP\fB, png_size_t \fInum_to_check\fP\fB);\fP
+
+\fBvoid png_start_read_image (png_structp \fIpng_ptr\fP\fB);\fP
+
+\fBvoid png_warning (png_structp \fP\fIpng_ptr\fP\fB, png_const_charp \fImessage\fP\fB);\fP
+
+\fBvoid png_write_chunk (png_structp \fP\fIpng_ptr\fP\fB, png_bytep \fP\fIchunk_name\fP\fB, png_bytep \fP\fIdata\fP\fB, png_size_t \fIlength\fP\fB);\fP
+
+\fBvoid png_write_chunk_data (png_structp \fP\fIpng_ptr\fP\fB, png_bytep \fP\fIdata\fP\fB, png_size_t \fIlength\fP\fB);\fP
+
+\fBvoid png_write_chunk_end (png_structp \fIpng_ptr\fP\fB);\fP
+
+\fBvoid png_write_chunk_start (png_structp \fP\fIpng_ptr\fP\fB, png_bytep \fP\fIchunk_name\fP\fB, png_uint_32 \fIlength\fP\fB);\fP
+
+\fBvoid png_write_destroy (png_structp \fIpng_ptr\fP\fB);\fP
+
+\fBvoid png_write_end (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
+
+\fBvoid png_write_flush (png_structp \fIpng_ptr\fP\fB);\fP
+
+\fBvoid png_write_image (png_structp \fP\fIpng_ptr\fP\fB, png_bytepp \fIimage\fP\fB);\fP
+
+\fBDEPRECATED: void png_write_init (png_structp \fIpng_ptr\fP\fB);\fP
+
+\fBDEPRECATED: void png_write_init_2 (png_structpp \fP\fIptr_ptr\fP\fB, png_const_charp \fP\fIuser_png_ver\fP\fB, png_size_t \fP\fIpng_struct_size\fP\fB, png_size_t \fIpng_info_size\fP\fB);\fP
+
+\fBvoid png_write_info (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
+
+\fBvoid png_write_info_before_PLTE (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
+
+\fBvoid png_write_png (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, int \fP\fItransforms\fP\fB, png_voidp \fIparams\fP\fB);\fP
+
+\fBvoid png_write_row (png_structp \fP\fIpng_ptr\fP\fB, png_bytep \fIrow\fP\fB);\fP
+
+\fBvoid png_write_rows (png_structp \fP\fIpng_ptr\fP\fB, png_bytepp \fP\fIrow\fP\fB, png_uint_32 \fInum_rows\fP\fB);\fP
+
+\fBvoidpf png_zalloc (voidpf \fP\fIpng_ptr\fP\fB, uInt \fP\fIitems\fP\fB, uInt \fIsize\fP\fB);\fP
+
+\fBvoid png_zfree (voidpf \fP\fIpng_ptr\fP\fB, voidpf \fIptr\fP\fB);\fP
+
+.SH DESCRIPTION
+The
+.I libpng
+library supports encoding, decoding, and various manipulations of
+the Portable Network Graphics (PNG) format image files.  It uses the
+.IR zlib(3)
+compression library.
+Following is a copy of the libpng.txt file that accompanies libpng.
+.SH LIBPNG.TXT
+libpng.txt - A description on how to use and modify libpng
+
+ libpng version 1.2.22 - October 13, 2007
+ Updated and distributed by Glenn Randers-Pehrson
+ <glennrp at users.sourceforge.net>
+ Copyright (c) 1998-2007 Glenn Randers-Pehrson
+ For conditions of distribution and use, see copyright
+ notice in png.h.
+
+ based on:
+
+ libpng 1.0 beta 6  version 0.96 May 28, 1997
+ Updated and distributed by Andreas Dilger
+ Copyright (c) 1996, 1997 Andreas Dilger
+
+ libpng 1.0 beta 2 - version 0.88  January 26, 1996
+ For conditions of distribution and use, see copyright
+ notice in png.h. Copyright (c) 1995, 1996 Guy Eric
+ Schalnat, Group 42, Inc.
+
+ Updated/rewritten per request in the libpng FAQ
+ Copyright (c) 1995, 1996 Frank J. T. Wojcik
+ December 18, 1995 & January 20, 1996
+
+.SH I. Introduction
+
+This file describes how to use and modify the PNG reference library
+(known as libpng) for your own use.  There are five sections to this
+file: introduction, structures, reading, writing, and modification and
+configuration notes for various special platforms.  In addition to this
+file, example.c is a good starting point for using the library, as
+it is heavily commented and should include everything most people
+will need.  We assume that libpng is already installed; see the
+INSTALL file for instructions on how to install libpng.
+
+For examples of libpng usage, see the files "example.c", "pngtest.c",
+and the files in the "contrib" directory, all of which are included in the
+libpng distribution.
+
+Libpng was written as a companion to the PNG specification, as a way
+of reducing the amount of time and effort it takes to support the PNG
+file format in application programs.
+
+The PNG specification (second edition), November 2003, is available as
+a W3C Recommendation and as an ISO Standard (ISO/IEC 15948:2003 (E)) at
+<http://www.w3.org/TR/2003/REC-PNG-20031110/
+The W3C and ISO documents have identical technical content.
+
+The PNG-1.2 specification is available at
+<http://www.libpng.org/pub/png/documents/>
+
+The PNG-1.0 specification is available
+as RFC 2083 <http://www.libpng.org/pub/png/documents/> and as a
+W3C Recommendation <http://www.w3.org/TR/REC.png.html>. Some
+additional chunks are described in the special-purpose public chunks
+documents at <http://www.libpng.org/pub/png/documents/>.
+
+Other information
+about PNG, and the latest version of libpng, can be found at the PNG home
+page, <http://www.libpng.org/pub/png/>.
+
+Most users will not have to modify the library significantly; advanced
+users may want to modify it more.  All attempts were made to make it as
+complete as possible, while keeping the code easy to understand.
+Currently, this library only supports C.  Support for other languages
+is being considered.
+
+Libpng has been designed to handle multiple sessions at one time,
+to be easily modifiable, to be portable to the vast majority of
+machines (ANSI, K&R, 16-, 32-, and 64-bit) available, and to be easy
+to use.  The ultimate goal of libpng is to promote the acceptance of
+the PNG file format in whatever way possible.  While there is still
+work to be done (see the TODO file), libpng should cover the
+majority of the needs of its users.
+
+Libpng uses zlib for its compression and decompression of PNG files.
+Further information about zlib, and the latest version of zlib, can
+be found at the zlib home page, <http://www.info-zip.org/pub/infozip/zlib/>.
+The zlib compression utility is a general purpose utility that is
+useful for more than PNG files, and can be used without libpng.
+See the documentation delivered with zlib for more details.
+You can usually find the source files for the zlib utility wherever you
+find the libpng source files.
+
+Libpng is thread safe, provided the threads are using different
+instances of the structures.  Each thread should have its own
+png_struct and png_info instances, and thus its own image.
+Libpng does not protect itself against two threads using the
+same instance of a structure.
+
+.SH II. Structures
+
+There are two main structures that are important to libpng, png_struct
+and png_info.  The first, png_struct, is an internal structure that
+will not, for the most part, be used by a user except as the first
+variable passed to every libpng function call.
+
+The png_info structure is designed to provide information about the
+PNG file.  At one time, the fields of png_info were intended to be
+directly accessible to the user.  However, this tended to cause problems
+with applications using dynamically loaded libraries, and as a result
+a set of interface functions for png_info (the png_get_*() and png_set_*()
+functions) was developed.  The fields of png_info are still available for
+older applications, but it is suggested that applications use the new
+interfaces if at all possible.
+
+Applications that do make direct access to the members of png_struct (except
+for png_ptr->jmpbuf) must be recompiled whenever the library is updated,
+and applications that make direct access to the members of png_info must
+be recompiled if they were compiled or loaded with libpng version 1.0.6,
+in which the members were in a different order.  In version 1.0.7, the
+members of the png_info structure reverted to the old order, as they were
+in versions 0.97c through 1.0.5.  Starting with version 2.0.0, both
+structures are going to be hidden, and the contents of the structures will
+only be accessible through the png_get/png_set functions.
+
+The png.h header file is an invaluable reference for programming with libpng.
+And while I'm on the topic, make sure you include the libpng header file:
+
+#include <png.h>
+
+.SH III. Reading
+
+We'll now walk you through the possible functions to call when reading
+in a PNG file sequentially, briefly explaining the syntax and purpose
+of each one.  See example.c and png.h for more detail.  While
+progressive reading is covered in the next section, you will still
+need some of the functions discussed in this section to read a PNG
+file.
+
+.SS Setup
+
+You will want to do the I/O initialization(*) before you get into libpng,
+so if it doesn't work, you don't have much to undo.  Of course, you
+will also want to insure that you are, in fact, dealing with a PNG
+file.  Libpng provides a simple check to see if a file is a PNG file.
+To use it, pass in the first 1 to 8 bytes of the file to the function
+png_sig_cmp(), and it will return 0 if the bytes match the corresponding
+bytes of the PNG signature, or nonzero otherwise.  Of course, the more bytes
+you pass in, the greater the accuracy of the prediction.
+
+If you are intending to keep the file pointer open for use in libpng,
+you must ensure you don't read more than 8 bytes from the beginning
+of the file, and you also have to make a call to png_set_sig_bytes_read()
+with the number of bytes you read from the beginning.  Libpng will
+then only check the bytes (if any) that your program didn't read.
+
+(*): If you are not using the standard I/O functions, you will need
+to replace them with custom functions.  See the discussion under
+Customizing libpng.
+
+
+    FILE *fp = fopen(file_name, "rb");
+    if (!fp)
+    {
+        return (ERROR);
+    }
+    fread(header, 1, number, fp);
+    is_png = !png_sig_cmp(header, 0, number);
+    if (!is_png)
+    {
+        return (NOT_PNG);
+    }
+
+
+Next, png_struct and png_info need to be allocated and initialized.  In
+order to ensure that the size of these structures is correct even with a
+dynamically linked libpng, there are functions to initialize and
+allocate the structures.  We also pass the library version, optional
+pointers to error handling functions, and a pointer to a data struct for
+use by the error functions, if necessary (the pointer and functions can
+be NULL if the default error handlers are to be used).  See the section
+on Changes to Libpng below regarding the old initialization functions.
+The structure allocation functions quietly return NULL if they fail to
+create the structure, so your application should check for that.
+
+    png_structp png_ptr = png_create_read_struct
+       (PNG_LIBPNG_VER_STRING, (png_voidp)user_error_ptr,
+        user_error_fn, user_warning_fn);
+    if (!png_ptr)
+        return (ERROR);
+
+    png_infop info_ptr = png_create_info_struct(png_ptr);
+    if (!info_ptr)
+    {
+        png_destroy_read_struct(&png_ptr,
+           (png_infopp)NULL, (png_infopp)NULL);
+        return (ERROR);
+    }
+
+    png_infop end_info = png_create_info_struct(png_ptr);
+    if (!end_info)
+    {
+        png_destroy_read_struct(&png_ptr, &info_ptr,
+          (png_infopp)NULL);
+        return (ERROR);
+    }
+
+If you want to use your own memory allocation routines,
+define PNG_USER_MEM_SUPPORTED and use
+png_create_read_struct_2() instead of png_create_read_struct():
+
+    png_structp png_ptr = png_create_read_struct_2
+       (PNG_LIBPNG_VER_STRING, (png_voidp)user_error_ptr,
+        user_error_fn, user_warning_fn, (png_voidp)
+        user_mem_ptr, user_malloc_fn, user_free_fn);
+
+The error handling routines passed to png_create_read_struct()
+and the memory alloc/free routines passed to png_create_struct_2()
+are only necessary if you are not using the libpng supplied error
+handling and memory alloc/free functions.
+
+When libpng encounters an error, it expects to longjmp back
+to your routine.  Therefore, you will need to call setjmp and pass
+your png_jmpbuf(png_ptr).  If you read the file from different
+routines, you will need to update the jmpbuf field every time you enter
+a new routine that will call a png_*() function.
+
+See your documentation of setjmp/longjmp for your compiler for more
+information on setjmp/longjmp.  See the discussion on libpng error
+handling in the Customizing Libpng section below for more information
+on the libpng error handling.  If an error occurs, and libpng longjmp's
+back to your setjmp, you will want to call png_destroy_read_struct() to
+free any memory.
+
+    if (setjmp(png_jmpbuf(png_ptr)))
+    {
+        png_destroy_read_struct(&png_ptr, &info_ptr,
+           &end_info);
+        fclose(fp);
+        return (ERROR);
+    }
+
+If you would rather avoid the complexity of setjmp/longjmp issues,
+you can compile libpng with PNG_SETJMP_NOT_SUPPORTED, in which case
+errors will result in a call to PNG_ABORT() which defaults to abort().
+
+Now you need to set up the input code.  The default for libpng is to
+use the C function fread().  If you use this, you will need to pass a
+valid FILE * in the function png_init_io().  Be sure that the file is
+opened in binary mode.  If you wish to handle reading data in another
+way, you need not call the png_init_io() function, but you must then
+implement the libpng I/O methods discussed in the Customizing Libpng
+section below.
+
+    png_init_io(png_ptr, fp);
+
+If you had previously opened the file and read any of the signature from
+the beginning in order to see if this was a PNG file, you need to let
+libpng know that there are some bytes missing from the start of the file.
+
+    png_set_sig_bytes(png_ptr, number);
+
+.SS Setting up callback code
+
+You can set up a callback function to handle any unknown chunks in the
+input stream. You must supply the function
+
+    read_chunk_callback(png_ptr ptr,
+         png_unknown_chunkp chunk);
+    {
+       /* The unknown chunk structure contains your
+          chunk data: */
+           png_byte name[5];
+           png_byte *data;
+           png_size_t size;
+       /* Note that libpng has already taken care of
+          the CRC handling */
+
+       /* put your code here.  Return one of the
+          following: */
+
+       return (-n); /* chunk had an error */
+       return (0); /* did not recognize */
+       return (n); /* success */
+    }
+
+(You can give your function another name that you like instead of
+"read_chunk_callback")
+
+To inform libpng about your function, use
+
+    png_set_read_user_chunk_fn(png_ptr, user_chunk_ptr,
+        read_chunk_callback);
+
+This names not only the callback function, but also a user pointer that
+you can retrieve with
+
+    png_get_user_chunk_ptr(png_ptr);
+
+At this point, you can set up a callback function that will be
+called after each row has been read, which you can use to control
+a progress meter or the like.  It's demonstrated in pngtest.c.
+You must supply a function
+
+    void read_row_callback(png_ptr ptr, png_uint_32 row,
+       int pass);
+    {
+      /* put your code here */
+    }
+
+(You can give it another name that you like instead of "read_row_callback")
+
+To inform libpng about your function, use
+
+    png_set_read_status_fn(png_ptr, read_row_callback);
+
+.SS Width and height limits
+
+The PNG specification allows the width and height of an image to be as
+large as 2^31-1 (0x7fffffff), or about 2.147 billion rows and columns.
+Since very few applications really need to process such large images,
+we have imposed an arbitrary 1-million limit on rows and columns.
+Larger images will be rejected immediately with a png_error() call. If
+you wish to override this limit, you can use
+
+   png_set_user_limits(png_ptr, width_max, height_max);
+
+to set your own limits, or use width_max = height_max = 0x7fffffffL
+to allow all valid dimensions (libpng may reject some very large images
+anyway because of potential buffer overflow conditions).
+
+You should put this statement after you create the PNG structure and
+before calling png_read_info(), png_read_png(), or png_process_data().
+If you need to retrieve the limits that are being applied, use
+
+   width_max = png_get_user_width_max(png_ptr);
+   height_max = png_get_user_height_max(png_ptr);
+
+.SS Unknown-chunk handling
+
+Now you get to set the way the library processes unknown chunks in the
+input PNG stream. Both known and unknown chunks will be read.  Normal
+behavior is that known chunks will be parsed into information in
+various info_ptr members; unknown chunks will be discarded. To change
+this, you can call:
+
+    png_set_keep_unknown_chunks(png_ptr, keep,
+        chunk_list, num_chunks);
+    keep       - 0: do not handle as unknown
+                 1: do not keep
+                 2: keep only if safe-to-copy
+                 3: keep even if unsafe-to-copy
+               You can use these definitions:
+                 PNG_HANDLE_CHUNK_AS_DEFAULT   0
+                 PNG_HANDLE_CHUNK_NEVER        1
+                 PNG_HANDLE_CHUNK_IF_SAFE      2
+                 PNG_HANDLE_CHUNK_ALWAYS       3
+    chunk_list - list of chunks affected (a byte string,
+                 five bytes per chunk, NULL or '\0' if
+                 num_chunks is 0)
+    num_chunks - number of chunks affected; if 0, all
+                 unknown chunks are affected.  If nonzero,
+                 only the chunks in the list are affected
+
+Unknown chunks declared in this way will be saved as raw data onto a
+list of png_unknown_chunk structures.  If a chunk that is normally
+known to libpng is named in the list, it will be handled as unknown,
+according to the "keep" directive.  If a chunk is named in successive
+instances of png_set_keep_unknown_chunks(), the final instance will
+take precedence.  The IHDR and IEND chunks should not be named in
+chunk_list; if they are, libpng will process them normally anyway.
+
+.SS The high-level read interface
+
+At this point there are two ways to proceed; through the high-level
+read interface, or through a sequence of low-level read operations.
+You can use the high-level interface if (a) you are willing to read
+the entire image into memory, and (b) the input transformations
+you want to do are limited to the following set:
+
+    PNG_TRANSFORM_IDENTITY      No transformation
+    PNG_TRANSFORM_STRIP_16      Strip 16-bit samples to
+                                8 bits
+    PNG_TRANSFORM_STRIP_ALPHA   Discard the alpha channel
+    PNG_TRANSFORM_PACKING       Expand 1, 2 and 4-bit
+                                samples to bytes
+    PNG_TRANSFORM_PACKSWAP      Change order of packed
+                                pixels to LSB first
+    PNG_TRANSFORM_EXPAND        Perform set_expand()
+    PNG_TRANSFORM_INVERT_MONO   Invert monochrome images
+    PNG_TRANSFORM_SHIFT         Normalize pixels to the
+                                sBIT depth
+    PNG_TRANSFORM_BGR           Flip RGB to BGR, RGBA
+                                to BGRA
+    PNG_TRANSFORM_SWAP_ALPHA    Flip RGBA to ARGB or GA
+                                to AG
+    PNG_TRANSFORM_INVERT_ALPHA  Change alpha from opacity
+                                to transparency
+    PNG_TRANSFORM_SWAP_ENDIAN   Byte-swap 16-bit samples
+
+(This excludes setting a background color, doing gamma transformation,
+dithering, and setting filler.)  If this is the case, simply do this:
+
+    png_read_png(png_ptr, info_ptr, png_transforms, NULL)
+
+where png_transforms is an integer containing the bitwise OR of
+some set of transformation flags.  This call is equivalent to png_read_info(),
+followed the set of transformations indicated by the transform mask,
+then png_read_image(), and finally png_read_end().
+
+(The final parameter of this call is not yet used.  Someday it might point
+to transformation parameters required by some future input transform.)
+
+You must use png_transforms and not call any png_set_transform() functions
+when you use png_read_png().
+
+After you have called png_read_png(), you can retrieve the image data
+with
+
+   row_pointers = png_get_rows(png_ptr, info_ptr);
+
+where row_pointers is an array of pointers to the pixel data for each row:
+
+   png_bytep row_pointers[height];
+
+If you know your image size and pixel size ahead of time, you can allocate
+row_pointers prior to calling png_read_png() with
+
+   if (height > PNG_UINT_32_MAX/png_sizeof(png_byte))
+      png_error (png_ptr,
+         "Image is too tall to process in memory");
+   if (width > PNG_UINT_32_MAX/pixel_size)
+      png_error (png_ptr,
+         "Image is too wide to process in memory");
+   row_pointers = png_malloc(png_ptr,
+      height*png_sizeof(png_bytep));
+   for (int i=0; i<height, i++)
+      row_pointers[i]=png_malloc(png_ptr,
+         width*pixel_size);
+   png_set_rows(png_ptr, info_ptr, &row_pointers);
+
+Alternatively you could allocate your image in one big block and define
+row_pointers[i] to point into the proper places in your block.
+
+If you use png_set_rows(), the application is responsible for freeing
+row_pointers (and row_pointers[i], if they were separately allocated).
+
+If you don't allocate row_pointers ahead of time, png_read_png() will
+do it, and it'll be free'ed when you call png_destroy_*().
+
+.SS The low-level read interface
+
+If you are going the low-level route, you are now ready to read all
+the file information up to the actual image data.  You do this with a
+call to png_read_info().
+
+    png_read_info(png_ptr, info_ptr);
+
+This will process all chunks up to but not including the image data.
+
+.SS Querying the info structure
+
+Functions are used to get the information from the info_ptr once it
+has been read.  Note that these fields may not be completely filled
+in until png_read_end() has read the chunk data following the image.
+
+    png_get_IHDR(png_ptr, info_ptr, &width, &height,
+       &bit_depth, &color_type, &interlace_type,
+       &compression_type, &filter_method);
+
+    width          - holds the width of the image
+                     in pixels (up to 2^31).
+    height         - holds the height of the image
+                     in pixels (up to 2^31).
+    bit_depth      - holds the bit depth of one of the
+                     image channels.  (valid values are
+                     1, 2, 4, 8, 16 and depend also on
+                     the color_type.  See also
+                     significant bits (sBIT) below).
+    color_type     - describes which color/alpha channels
+                         are present.
+                     PNG_COLOR_TYPE_GRAY
+                        (bit depths 1, 2, 4, 8, 16)
+                     PNG_COLOR_TYPE_GRAY_ALPHA
+                        (bit depths 8, 16)
+                     PNG_COLOR_TYPE_PALETTE
+                        (bit depths 1, 2, 4, 8)
+                     PNG_COLOR_TYPE_RGB
+                        (bit_depths 8, 16)
+                     PNG_COLOR_TYPE_RGB_ALPHA
+                        (bit_depths 8, 16)
+
+                     PNG_COLOR_MASK_PALETTE
+                     PNG_COLOR_MASK_COLOR
+                     PNG_COLOR_MASK_ALPHA
+
+    filter_method  - (must be PNG_FILTER_TYPE_BASE
+                     for PNG 1.0, and can also be
+                     PNG_INTRAPIXEL_DIFFERENCING if
+                     the PNG datastream is embedded in
+                     a MNG-1.0 datastream)
+    compression_type - (must be PNG_COMPRESSION_TYPE_BASE
+                     for PNG 1.0)
+    interlace_type - (PNG_INTERLACE_NONE or
+                     PNG_INTERLACE_ADAM7)
+    Any or all of interlace_type, compression_type, of
+    filter_method can be NULL if you are
+    not interested in their values.
+
+    channels = png_get_channels(png_ptr, info_ptr);
+    channels       - number of channels of info for the
+                     color type (valid values are 1 (GRAY,
+                     PALETTE), 2 (GRAY_ALPHA), 3 (RGB),
+                     4 (RGB_ALPHA or RGB + filler byte))
+    rowbytes = png_get_rowbytes(png_ptr, info_ptr);
+    rowbytes       - number of bytes needed to hold a row
+
+    signature = png_get_signature(png_ptr, info_ptr);
+    signature      - holds the signature read from the
+                     file (if any).  The data is kept in
+                     the same offset it would be if the
+                     whole signature were read (i.e. if an
+                     application had already read in 4
+                     bytes of signature before starting
+                     libpng, the remaining 4 bytes would
+                     be in signature[4] through signature[7]
+                     (see png_set_sig_bytes())).
+
+
+    width            = png_get_image_width(png_ptr,
+                         info_ptr);
+    height           = png_get_image_height(png_ptr,
+                         info_ptr);
+    bit_depth        = png_get_bit_depth(png_ptr,
+                         info_ptr);
+    color_type       = png_get_color_type(png_ptr,
+                         info_ptr);
+    filter_method    = png_get_filter_type(png_ptr,
+                         info_ptr);
+    compression_type = png_get_compression_type(png_ptr,
+                         info_ptr);
+    interlace_type   = png_get_interlace_type(png_ptr,
+                         info_ptr);
+
+
+These are also important, but their validity depends on whether the chunk
+has been read.  The png_get_valid(png_ptr, info_ptr, PNG_INFO_<chunk>) and
+png_get_<chunk>(png_ptr, info_ptr, ...) functions return non-zero if the
+data has been read, or zero if it is missing.  The parameters to the
+png_get_<chunk> are set directly if they are simple data types, or a pointer
+into the info_ptr is returned for any complex types.
+
+    png_get_PLTE(png_ptr, info_ptr, &palette,
+                     &num_palette);
+    palette        - the palette for the file
+                     (array of png_color)
+    num_palette    - number of entries in the palette
+
+    png_get_gAMA(png_ptr, info_ptr, &gamma);
+    gamma          - the gamma the file is written
+                     at (PNG_INFO_gAMA)
+
+    png_get_sRGB(png_ptr, info_ptr, &srgb_intent);
+    srgb_intent    - the rendering intent (PNG_INFO_sRGB)
+                     The presence of the sRGB chunk
+                     means that the pixel data is in the
+                     sRGB color space.  This chunk also
+                     implies specific values of gAMA and
+                     cHRM.
+
+    png_get_iCCP(png_ptr, info_ptr, &name,
+       &compression_type, &profile, &proflen);
+    name            - The profile name.
+    compression     - The compression type; always
+                      PNG_COMPRESSION_TYPE_BASE for PNG 1.0.
+                      You may give NULL to this argument to
+                      ignore it.
+    profile         - International Color Consortium color
+                      profile data. May contain NULs.
+    proflen         - length of profile data in bytes.
+
+    png_get_sBIT(png_ptr, info_ptr, &sig_bit);
+    sig_bit        - the number of significant bits for
+                     (PNG_INFO_sBIT) each of the gray,
+                     red, green, and blue channels,
+                     whichever are appropriate for the
+                     given color type (png_color_16)
+
+    png_get_tRNS(png_ptr, info_ptr, &trans, &num_trans,
+                     &trans_values);
+    trans          - array of transparent entries for
+                     palette (PNG_INFO_tRNS)
+    trans_values   - graylevel or color sample values of
+                     the single transparent color for
+                     non-paletted images (PNG_INFO_tRNS)
+    num_trans      - number of transparent entries
+                     (PNG_INFO_tRNS)
+
+    png_get_hIST(png_ptr, info_ptr, &hist);
+                     (PNG_INFO_hIST)
+    hist           - histogram of palette (array of
+                     png_uint_16)
+
+    png_get_tIME(png_ptr, info_ptr, &mod_time);
+    mod_time       - time image was last modified
+                    (PNG_VALID_tIME)
+
+    png_get_bKGD(png_ptr, info_ptr, &background);
+    background     - background color (PNG_VALID_bKGD)
+                     valid 16-bit red, green and blue
+                     values, regardless of color_type
+
+    num_comments   = png_get_text(png_ptr, info_ptr,
+                     &text_ptr, &num_text);
+    num_comments   - number of comments
+    text_ptr       - array of png_text holding image
+                     comments
+    text_ptr[i].compression - type of compression used
+                 on "text" PNG_TEXT_COMPRESSION_NONE
+                           PNG_TEXT_COMPRESSION_zTXt
+                           PNG_ITXT_COMPRESSION_NONE
+                           PNG_ITXT_COMPRESSION_zTXt
+    text_ptr[i].key   - keyword for comment.  Must contain
+                         1-79 characters.
+    text_ptr[i].text  - text comments for current
+                         keyword.  Can be empty.
+    text_ptr[i].text_length - length of text string,
+                 after decompression, 0 for iTXt
+    text_ptr[i].itxt_length - length of itxt string,
+                 after decompression, 0 for tEXt/zTXt
+    text_ptr[i].lang  - language of comment (empty
+                         string for unknown).
+    text_ptr[i].lang_key  - keyword in UTF-8
+                         (empty string for unknown).
+    num_text       - number of comments (same as
+                     num_comments; you can put NULL here
+                     to avoid the duplication)
+    Note while png_set_text() will accept text, language,
+    and translated keywords that can be NULL pointers, the
+    structure returned by png_get_text will always contain
+    regular zero-terminated C strings.  They might be
+    empty strings but they will never be NULL pointers.
+
+    num_spalettes = png_get_sPLT(png_ptr, info_ptr,
+       &palette_ptr);
+    palette_ptr    - array of palette structures holding
+                     contents of one or more sPLT chunks
+                     read.
+    num_spalettes  - number of sPLT chunks read.
+
+    png_get_oFFs(png_ptr, info_ptr, &offset_x, &offset_y,
+       &unit_type);
+    offset_x       - positive offset from the left edge
+                     of the screen
+    offset_y       - positive offset from the top edge
+                     of the screen
+    unit_type      - PNG_OFFSET_PIXEL, PNG_OFFSET_MICROMETER
+
+    png_get_pHYs(png_ptr, info_ptr, &res_x, &res_y,
+       &unit_type);
+    res_x          - pixels/unit physical resolution in
+                     x direction
+    res_y          - pixels/unit physical resolution in
+                     x direction
+    unit_type      - PNG_RESOLUTION_UNKNOWN,
+                     PNG_RESOLUTION_METER
+
+    png_get_sCAL(png_ptr, info_ptr, &unit, &width,
+       &height)
+    unit        - physical scale units (an integer)
+    width       - width of a pixel in physical scale units
+    height      - height of a pixel in physical scale units
+                 (width and height are doubles)
+
+    png_get_sCAL_s(png_ptr, info_ptr, &unit, &width,
+       &height)
+    unit        - physical scale units (an integer)
+    width       - width of a pixel in physical scale units
+    height      - height of a pixel in physical scale units
+                 (width and height are strings like "2.54")
+
+    num_unknown_chunks = png_get_unknown_chunks(png_ptr,
+       info_ptr, &unknowns)
+    unknowns          - array of png_unknown_chunk
+                        structures holding unknown chunks
+    unknowns[i].name  - name of unknown chunk
+    unknowns[i].data  - data of unknown chunk
+    unknowns[i].size  - size of unknown chunk's data
+    unknowns[i].location - position of chunk in file
+
+    The value of "i" corresponds to the order in which the
+    chunks were read from the PNG file or inserted with the
+    png_set_unknown_chunks() function.
+
+The data from the pHYs chunk can be retrieved in several convenient
+forms:
+
+    res_x = png_get_x_pixels_per_meter(png_ptr,
+       info_ptr)
+    res_y = png_get_y_pixels_per_meter(png_ptr,
+       info_ptr)
+    res_x_and_y = png_get_pixels_per_meter(png_ptr,
+       info_ptr)
+    res_x = png_get_x_pixels_per_inch(png_ptr,
+       info_ptr)
+    res_y = png_get_y_pixels_per_inch(png_ptr,
+       info_ptr)
+    res_x_and_y = png_get_pixels_per_inch(png_ptr,
+       info_ptr)
+    aspect_ratio = png_get_pixel_aspect_ratio(png_ptr,
+       info_ptr)
+
+   (Each of these returns 0 [signifying "unknown"] if
+       the data is not present or if res_x is 0;
+       res_x_and_y is 0 if res_x != res_y)
+
+The data from the oFFs chunk can be retrieved in several convenient
+forms:
+
+    x_offset = png_get_x_offset_microns(png_ptr, info_ptr);
+    y_offset = png_get_y_offset_microns(png_ptr, info_ptr);
+    x_offset = png_get_x_offset_inches(png_ptr, info_ptr);
+    y_offset = png_get_y_offset_inches(png_ptr, info_ptr);
+
+   (Each of these returns 0 [signifying "unknown" if both
+       x and y are 0] if the data is not present or if the
+       chunk is present but the unit is the pixel)
+
+For more information, see the png_info definition in png.h and the
+PNG specification for chunk contents.  Be careful with trusting
+rowbytes, as some of the transformations could increase the space
+needed to hold a row (expand, filler, gray_to_rgb, etc.).
+See png_read_update_info(), below.
+
+A quick word about text_ptr and num_text.  PNG stores comments in
+keyword/text pairs, one pair per chunk, with no limit on the number
+of text chunks, and a 2^31 byte limit on their size.  While there are
+suggested keywords, there is no requirement to restrict the use to these
+strings.  It is strongly suggested that keywords and text be sensible
+to humans (that's the point), so don't use abbreviations.  Non-printing
+symbols are not allowed.  See the PNG specification for more details.
+There is also no requirement to have text after the keyword.
+
+Keywords should be limited to 79 Latin-1 characters without leading or
+trailing spaces, but non-consecutive spaces are allowed within the
+keyword.  It is possible to have the same keyword any number of times.
+The text_ptr is an array of png_text structures, each holding a
+pointer to a language string, a pointer to a keyword and a pointer to
+a text string.  The text string, language code, and translated
+keyword may be empty or NULL pointers.  The keyword/text
+pairs are put into the array in the order that they are received.
+However, some or all of the text chunks may be after the image, so, to
+make sure you have read all the text chunks, don't mess with these
+until after you read the stuff after the image.  This will be
+mentioned again below in the discussion that goes with png_read_end().
+
+.SS Input transformations
+
+After you've read the header information, you can set up the library
+to handle any special transformations of the image data.  The various
+ways to transform the data will be described in the order that they
+should occur.  This is important, as some of these change the color
+type and/or bit depth of the data, and some others only work on
+certain color types and bit depths.  Even though each transformation
+checks to see if it has data that it can do something with, you should
+make sure to only enable a transformation if it will be valid for the
+data.  For example, don't swap red and blue on grayscale data.
+
+The colors used for the background and transparency values should be
+supplied in the same format/depth as the current image data.  They
+are stored in the same format/depth as the image data in a bKGD or tRNS
+chunk, so this is what libpng expects for this data.  The colors are
+transformed to keep in sync with the image data when an application
+calls the png_read_update_info() routine (see below).
+
+Data will be decoded into the supplied row buffers packed into bytes
+unless the library has been told to transform it into another format.
+For example, 4 bit/pixel paletted or grayscale data will be returned
+2 pixels/byte with the leftmost pixel in the high-order bits of the
+byte, unless png_set_packing() is called.  8-bit RGB data will be stored
+in RGB RGB RGB format unless png_set_filler() or png_set_add_alpha()
+is called to insert filler bytes, either before or after each RGB triplet.
+16-bit RGB data will be returned RRGGBB RRGGBB, with the most significant
+byte of the color value first, unless png_set_strip_16() is called to
+transform it to regular RGB RGB triplets, or png_set_filler() or
+png_set_add alpha() is called to insert filler bytes, either before or
+after each RRGGBB triplet.  Similarly, 8-bit or 16-bit grayscale data can
+be modified with
+png_set_filler(), png_set_add_alpha(), or png_set_strip_16().
+
+The following code transforms grayscale images of less than 8 to 8 bits,
+changes paletted images to RGB, and adds a full alpha channel if there is
+transparency information in a tRNS chunk.  This is most useful on
+grayscale images with bit depths of 2 or 4 or if there is a multiple-image
+viewing application that wishes to treat all images in the same way.
+
+    if (color_type == PNG_COLOR_TYPE_PALETTE)
+        png_set_palette_to_rgb(png_ptr);
+
+    if (color_type == PNG_COLOR_TYPE_GRAY &&
+        bit_depth < 8) png_set_expand_gray_1_2_4_to_8(png_ptr);
+
+    if (png_get_valid(png_ptr, info_ptr,
+        PNG_INFO_tRNS)) png_set_tRNS_to_alpha(png_ptr);
+
+These three functions are actually aliases for png_set_expand(), added
+in libpng version 1.0.4, with the function names expanded to improve code
+readability.  In some future version they may actually do different
+things.
+
+As of libpng version 1.2.9, png_set_expand_gray_1_2_4_to_8() was
+added.  It expands the sample depth without changing tRNS to alpha.
+At the same time, png_set_gray_1_2_4_to_8() was deprecated, and it
+will be removed from a future version.
+
+PNG can have files with 16 bits per channel.  If you only can handle
+8 bits per channel, this will strip the pixels down to 8 bit.
+
+    if (bit_depth == 16)
+        png_set_strip_16(png_ptr);
+
+If, for some reason, you don't need the alpha channel on an image,
+and you want to remove it rather than combining it with the background
+(but the image author certainly had in mind that you *would* combine
+it with the background, so that's what you should probably do):
+
+    if (color_type & PNG_COLOR_MASK_ALPHA)
+        png_set_strip_alpha(png_ptr);
+
+In PNG files, the alpha channel in an image
+is the level of opacity.  If you need the alpha channel in an image to
+be the level of transparency instead of opacity, you can invert the
+alpha channel (or the tRNS chunk data) after it's read, so that 0 is
+fully opaque and 255 (in 8-bit or paletted images) or 65535 (in 16-bit
+images) is fully transparent, with
+
+    png_set_invert_alpha(png_ptr);
+
+PNG files pack pixels of bit depths 1, 2, and 4 into bytes as small as
+they can, resulting in, for example, 8 pixels per byte for 1 bit
+files.  This code expands to 1 pixel per byte without changing the
+values of the pixels:
+
+    if (bit_depth < 8)
+        png_set_packing(png_ptr);
+
+PNG files have possible bit depths of 1, 2, 4, 8, and 16.  All pixels
+stored in a PNG image have been "scaled" or "shifted" up to the next
+higher possible bit depth (e.g. from 5 bits/sample in the range [0,31] to
+8 bits/sample in the range [0, 255]).  However, it is also possible to
+convert the PNG pixel data back to the original bit depth of the image.
+This call reduces the pixels back down to the original bit depth:
+
+    png_color_8p sig_bit;
+
+    if (png_get_sBIT(png_ptr, info_ptr, &sig_bit))
+        png_set_shift(png_ptr, sig_bit);
+
+PNG files store 3-color pixels in red, green, blue order.  This code
+changes the storage of the pixels to blue, green, red:
+
+    if (color_type == PNG_COLOR_TYPE_RGB ||
+        color_type == PNG_COLOR_TYPE_RGB_ALPHA)
+        png_set_bgr(png_ptr);
+
+PNG files store RGB pixels packed into 3 or 6 bytes. This code expands them
+into 4 or 8 bytes for windowing systems that need them in this format:
+
+    if (color_type == PNG_COLOR_TYPE_RGB)
+        png_set_filler(png_ptr, filler, PNG_FILLER_BEFORE);
+
+where "filler" is the 8 or 16-bit number to fill with, and the location is
+either PNG_FILLER_BEFORE or PNG_FILLER_AFTER, depending upon whether
+you want the filler before the RGB or after.  This transformation
+does not affect images that already have full alpha channels.  To add an
+opaque alpha channel, use filler=0xff or 0xffff and PNG_FILLER_AFTER which
+will generate RGBA pixels.
+
+Note that png_set_filler() does not change the color type.  If you want
+to do that, you can add a true alpha channel with
+
+    if (color_type == PNG_COLOR_TYPE_RGB ||
+           color_type == PNG_COLOR_TYPE_GRAY)
+    png_set_add_alpha(png_ptr, filler, PNG_FILLER_AFTER);
+
+where "filler" contains the alpha value to assign to each pixel.
+This function was added in libpng-1.2.7.
+
+If you are reading an image with an alpha channel, and you need the
+data as ARGB instead of the normal PNG format RGBA:
+
+    if (color_type == PNG_COLOR_TYPE_RGB_ALPHA)
+        png_set_swap_alpha(png_ptr);
+
+For some uses, you may want a grayscale image to be represented as
+RGB.  This code will do that conversion:
+
+    if (color_type == PNG_COLOR_TYPE_GRAY ||
+        color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
+          png_set_gray_to_rgb(png_ptr);
+
+Conversely, you can convert an RGB or RGBA image to grayscale or grayscale
+with alpha.
+
+    if (color_type == PNG_COLOR_TYPE_RGB ||
+        color_type == PNG_COLOR_TYPE_RGB_ALPHA)
+          png_set_rgb_to_gray_fixed(png_ptr, error_action,
+             int red_weight, int green_weight);
+
+    error_action = 1: silently do the conversion
+    error_action = 2: issue a warning if the original
+                      image has any pixel where
+                      red != green or red != blue
+    error_action = 3: issue an error and abort the
+                      conversion if the original
+                      image has any pixel where
+                      red != green or red != blue
+
+    red_weight:       weight of red component times 100000
+    green_weight:     weight of green component times 100000
+                      If either weight is negative, default
+                      weights (21268, 71514) are used.
+
+If you have set error_action = 1 or 2, you can
+later check whether the image really was gray, after processing
+the image rows, with the png_get_rgb_to_gray_status(png_ptr) function.
+It will return a png_byte that is zero if the image was gray or
+1 if there were any non-gray pixels.  bKGD and sBIT data
+will be silently converted to grayscale, using the green channel
+data, regardless of the error_action setting.
+
+With red_weight+green_weight<=100000,
+the normalized graylevel is computed:
+
+    int rw = red_weight * 65536;
+    int gw = green_weight * 65536;
+    int bw = 65536 - (rw + gw);
+    gray = (rw*red + gw*green + bw*blue)/65536;
+
+The default values approximate those recommended in the Charles
+Poynton's Color FAQ, <http://www.inforamp.net/~poynton/>
+Copyright (c) 1998-01-04 Charles Poynton <poynton at inforamp.net>
+
+    Y = 0.212671 * R + 0.715160 * G + 0.072169 * B
+
+Libpng approximates this with
+
+    Y = 0.21268 * R    + 0.7151 * G    + 0.07217 * B
+
+which can be expressed with integers as
+
+    Y = (6969 * R + 23434 * G + 2365 * B)/32768
+
+The calculation is done in a linear colorspace, if the image gamma
+is known.
+
+If you have a grayscale and you are using png_set_expand_depth(),
+png_set_expand(), or png_set_gray_to_rgb to change to truecolor or to
+a higher bit-depth, you must either supply the background color as a gray
+value at the original file bit-depth (need_expand = 1) or else supply the
+background color as an RGB triplet at the final, expanded bit depth
+(need_expand = 0).  Similarly, if you are reading a paletted image, you
+must either supply the background color as a palette index (need_expand = 1)
+or as an RGB triplet that may or may not be in the palette (need_expand = 0).
+
+    png_color_16 my_background;
+    png_color_16p image_background;
+
+    if (png_get_bKGD(png_ptr, info_ptr, &image_background))
+        png_set_background(png_ptr, image_background,
+          PNG_BACKGROUND_GAMMA_FILE, 1, 1.0);
+    else
+        png_set_background(png_ptr, &my_background,
+          PNG_BACKGROUND_GAMMA_SCREEN, 0, 1.0);
+
+The png_set_background() function tells libpng to composite images
+with alpha or simple transparency against the supplied background
+color.  If the PNG file contains a bKGD chunk (PNG_INFO_bKGD valid),
+you may use this color, or supply another color more suitable for
+the current display (e.g., the background color from a web page).  You
+need to tell libpng whether the color is in the gamma space of the
+display (PNG_BACKGROUND_GAMMA_SCREEN for colors you supply), the file
+(PNG_BACKGROUND_GAMMA_FILE for colors from the bKGD chunk), or one
+that is neither of these gammas (PNG_BACKGROUND_GAMMA_UNIQUE - I don't
+know why anyone would use this, but it's here).
+
+To properly display PNG images on any kind of system, the application needs
+to know what the display gamma is.  Ideally, the user will know this, and
+the application will allow them to set it.  One method of allowing the user
+to set the display gamma separately for each system is to check for a
+SCREEN_GAMMA or DISPLAY_GAMMA environment variable, which will hopefully be
+correctly set.
+
+Note that display_gamma is the overall gamma correction required to produce
+pleasing results, which depends on the lighting conditions in the surrounding
+environment.  In a dim or brightly lit room, no compensation other than
+the physical gamma exponent of the monitor is needed, while in a dark room
+a slightly smaller exponent is better.
+
+   double gamma, screen_gamma;
+
+   if (/* We have a user-defined screen
+       gamma value */)
+   {
+      screen_gamma = user_defined_screen_gamma;
+   }
+   /* One way that applications can share the same
+      screen gamma value */
+   else if ((gamma_str = getenv("SCREEN_GAMMA"))
+      != NULL)
+   {
+      screen_gamma = (double)atof(gamma_str);
+   }
+   /* If we don't have another value */
+   else
+   {
+      screen_gamma = 2.2; /* A good guess for a
+           PC monitor in a bright office or a dim room */
+      screen_gamma = 2.0; /* A good guess for a
+           PC monitor in a dark room */
+      screen_gamma = 1.7 or 1.0;  /* A good
+           guess for Mac systems */
+   }
+
+The png_set_gamma() function handles gamma transformations of the data.
+Pass both the file gamma and the current screen_gamma.  If the file does
+not have a gamma value, you can pass one anyway if you have an idea what
+it is (usually 0.45455 is a good guess for GIF images on PCs).  Note
+that file gammas are inverted from screen gammas.  See the discussions
+on gamma in the PNG specification for an excellent description of what
+gamma is, and why all applications should support it.  It is strongly
+recommended that PNG viewers support gamma correction.
+
+   if (png_get_gAMA(png_ptr, info_ptr, &gamma))
+      png_set_gamma(png_ptr, screen_gamma, gamma);
+   else
+      png_set_gamma(png_ptr, screen_gamma, 0.45455);
+
+If you need to reduce an RGB file to a paletted file, or if a paletted
+file has more entries then will fit on your screen, png_set_dither()
+will do that.  Note that this is a simple match dither that merely
+finds the closest color available.  This should work fairly well with
+optimized palettes, and fairly badly with linear color cubes.  If you
+pass a palette that is larger then maximum_colors, the file will
+reduce the number of colors in the palette so it will fit into
+maximum_colors.  If there is a histogram, it will use it to make
+more intelligent choices when reducing the palette.  If there is no
+histogram, it may not do as good a job.
+
+   if (color_type & PNG_COLOR_MASK_COLOR)
+   {
+      if (png_get_valid(png_ptr, info_ptr,
+         PNG_INFO_PLTE))
+      {
+         png_uint_16p histogram = NULL;
+
+         png_get_hIST(png_ptr, info_ptr,
+            &histogram);
+         png_set_dither(png_ptr, palette, num_palette,
+            max_screen_colors, histogram, 1);
+      }
+      else
+      {
+         png_color std_color_cube[MAX_SCREEN_COLORS] =
+            { ... colors ... };
+
+         png_set_dither(png_ptr, std_color_cube,
+            MAX_SCREEN_COLORS, MAX_SCREEN_COLORS,
+            NULL,0);
+      }
+   }
+
+PNG files describe monochrome as black being zero and white being one.
+The following code will reverse this (make black be one and white be
+zero):
+
+   if (bit_depth == 1 && color_type == PNG_COLOR_TYPE_GRAY)
+      png_set_invert_mono(png_ptr);
+
+This function can also be used to invert grayscale and gray-alpha images:
+
+   if (color_type == PNG_COLOR_TYPE_GRAY ||
+        color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
+      png_set_invert_mono(png_ptr);
+
+PNG files store 16 bit pixels in network byte order (big-endian,
+ie. most significant bits first).  This code changes the storage to the
+other way (little-endian, i.e. least significant bits first, the
+way PCs store them):
+
+    if (bit_depth == 16)
+        png_set_swap(png_ptr);
+
+If you are using packed-pixel images (1, 2, or 4 bits/pixel), and you
+need to change the order the pixels are packed into bytes, you can use:
+
+    if (bit_depth < 8)
+       png_set_packswap(png_ptr);
+
+Finally, you can write your own transformation function if none of
+the existing ones meets your needs.  This is done by setting a callback
+with
+
+    png_set_read_user_transform_fn(png_ptr,
+       read_transform_fn);
+
+You must supply the function
+
+    void read_transform_fn(png_ptr ptr, row_info_ptr
+       row_info, png_bytep data)
+
+See pngtest.c for a working example.  Your function will be called
+after all of the other transformations have been processed.
+
+You can also set up a pointer to a user structure for use by your
+callback function, and you can inform libpng that your transform
+function will change the number of channels or bit depth with the
+function
+
+    png_set_user_transform_info(png_ptr, user_ptr,
+       user_depth, user_channels);
+
+The user's application, not libpng, is responsible for allocating and
+freeing any memory required for the user structure.
+
+You can retrieve the pointer via the function
+png_get_user_transform_ptr().  For example:
+
+    voidp read_user_transform_ptr =
+       png_get_user_transform_ptr(png_ptr);
+
+The last thing to handle is interlacing; this is covered in detail below,
+but you must call the function here if you want libpng to handle expansion
+of the interlaced image.
+
+    number_of_passes = png_set_interlace_handling(png_ptr);
+
+After setting the transformations, libpng can update your png_info
+structure to reflect any transformations you've requested with this
+call.  This is most useful to update the info structure's rowbytes
+field so you can use it to allocate your image memory.  This function
+will also update your palette with the correct screen_gamma and
+background if these have been given with the calls above.
+
+    png_read_update_info(png_ptr, info_ptr);
+
+After you call png_read_update_info(), you can allocate any
+memory you need to hold the image.  The row data is simply
+raw byte data for all forms of images.  As the actual allocation
+varies among applications, no example will be given.  If you
+are allocating one large chunk, you will need to build an
+array of pointers to each row, as it will be needed for some
+of the functions below.
+
+.SS Reading image data
+
+After you've allocated memory, you can read the image data.
+The simplest way to do this is in one function call.  If you are
+allocating enough memory to hold the whole image, you can just
+call png_read_image() and libpng will read in all the image data
+and put it in the memory area supplied.  You will need to pass in
+an array of pointers to each row.
+
+This function automatically handles interlacing, so you don't need
+to call png_set_interlace_handling() or call this function multiple
+times, or any of that other stuff necessary with png_read_rows().
+
+   png_read_image(png_ptr, row_pointers);
+
+where row_pointers is:
+
+   png_bytep row_pointers[height];
+
+You can point to void or char or whatever you use for pixels.
+
+If you don't want to read in the whole image at once, you can
+use png_read_rows() instead.  If there is no interlacing (check
+interlace_type == PNG_INTERLACE_NONE), this is simple:
+
+    png_read_rows(png_ptr, row_pointers, NULL,
+       number_of_rows);
+
+where row_pointers is the same as in the png_read_image() call.
+
+If you are doing this just one row at a time, you can do this with
+a single row_pointer instead of an array of row_pointers:
+
+    png_bytep row_pointer = row;
+    png_read_row(png_ptr, row_pointer, NULL);
+
+If the file is interlaced (interlace_type != 0 in the IHDR chunk), things
+get somewhat harder.  The only current (PNG Specification version 1.2)
+interlacing type for PNG is (interlace_type == PNG_INTERLACE_ADAM7)
+is a somewhat complicated 2D interlace scheme, known as Adam7, that
+breaks down an image into seven smaller images of varying size, based
+on an 8x8 grid.
+
+libpng can fill out those images or it can give them to you "as is".
+If you want them filled out, there are two ways to do that.  The one
+mentioned in the PNG specification is to expand each pixel to cover
+those pixels that have not been read yet (the "rectangle" method).
+This results in a blocky image for the first pass, which gradually
+smooths out as more pixels are read.  The other method is the "sparkle"
+method, where pixels are drawn only in their final locations, with the
+rest of the image remaining whatever colors they were initialized to
+before the start of the read.  The first method usually looks better,
+but tends to be slower, as there are more pixels to put in the rows.
+
+If you don't want libpng to handle the interlacing details, just call
+png_read_rows() seven times to read in all seven images.  Each of the
+images is a valid image by itself, or they can all be combined on an
+8x8 grid to form a single image (although if you intend to combine them
+you would be far better off using the libpng interlace handling).
+
+The first pass will return an image 1/8 as wide as the entire image
+(every 8th column starting in column 0) and 1/8 as high as the original
+(every 8th row starting in row 0), the second will be 1/8 as wide
+(starting in column 4) and 1/8 as high (also starting in row 0).  The
+third pass will be 1/4 as wide (every 4th pixel starting in column 0) and
+1/8 as high (every 8th row starting in row 4), and the fourth pass will
+be 1/4 as wide and 1/4 as high (every 4th column starting in column 2,
+and every 4th row starting in row 0).  The fifth pass will return an
+image 1/2 as wide, and 1/4 as high (starting at column 0 and row 2),
+while the sixth pass will be 1/2 as wide and 1/2 as high as the original
+(starting in column 1 and row 0).  The seventh and final pass will be as
+wide as the original, and 1/2 as high, containing all of the odd
+numbered scanlines.  Phew!
+
+If you want libpng to expand the images, call this before calling
+png_start_read_image() or png_read_update_info():
+
+    if (interlace_type == PNG_INTERLACE_ADAM7)
+        number_of_passes
+           = png_set_interlace_handling(png_ptr);
+
+This will return the number of passes needed.  Currently, this
+is seven, but may change if another interlace type is added.
+This function can be called even if the file is not interlaced,
+where it will return one pass.
+
+If you are not going to display the image after each pass, but are
+going to wait until the entire image is read in, use the sparkle
+effect.  This effect is faster and the end result of either method
+is exactly the same.  If you are planning on displaying the image
+after each pass, the "rectangle" effect is generally considered the
+better looking one.
+
+If you only want the "sparkle" effect, just call png_read_rows() as
+normal, with the third parameter NULL.  Make sure you make pass over
+the image number_of_passes times, and you don't change the data in the
+rows between calls.  You can change the locations of the data, just
+not the data.  Each pass only writes the pixels appropriate for that
+pass, and assumes the data from previous passes is still valid.
+
+    png_read_rows(png_ptr, row_pointers, NULL,
+       number_of_rows);
+
+If you only want the first effect (the rectangles), do the same as
+before except pass the row buffer in the third parameter, and leave
+the second parameter NULL.
+
+    png_read_rows(png_ptr, NULL, row_pointers,
+       number_of_rows);
+
+.SS Finishing a sequential read
+
+After you are finished reading the image through the
+low-level interface, you can finish reading the file.  If you are
+interested in comments or time, which may be stored either before or
+after the image data, you should pass the separate png_info struct if
+you want to keep the comments from before and after the image
+separate.  If you are not interested, you can pass NULL.
+
+   png_read_end(png_ptr, end_info);
+
+When you are done, you can free all memory allocated by libpng like this:
+
+   png_destroy_read_struct(&png_ptr, &info_ptr,
+       &end_info);
+
+It is also possible to individually free the info_ptr members that
+point to libpng-allocated storage with the following function:
+
+    png_free_data(png_ptr, info_ptr, mask, seq)
+    mask - identifies data to be freed, a mask
+           containing the bitwise OR of one or
+           more of
+             PNG_FREE_PLTE, PNG_FREE_TRNS,
+             PNG_FREE_HIST, PNG_FREE_ICCP,
+             PNG_FREE_PCAL, PNG_FREE_ROWS,
+             PNG_FREE_SCAL, PNG_FREE_SPLT,
+             PNG_FREE_TEXT, PNG_FREE_UNKN,
+           or simply PNG_FREE_ALL
+    seq  - sequence number of item to be freed
+           (-1 for all items)
+
+This function may be safely called when the relevant storage has
+already been freed, or has not yet been allocated, or was allocated
+by the user and not by libpng,  and will in those
+cases do nothing.  The "seq" parameter is ignored if only one item
+of the selected data type, such as PLTE, is allowed.  If "seq" is not
+-1, and multiple items are allowed for the data type identified in
+the mask, such as text or sPLT, only the n'th item in the structure
+is freed, where n is "seq".
+
+The default behavior is only to free data that was allocated internally
+by libpng.  This can be changed, so that libpng will not free the data,
+or so that it will free data that was allocated by the user with png_malloc()
+or png_zalloc() and passed in via a png_set_*() function, with
+
+    png_data_freer(png_ptr, info_ptr, freer, mask)
+    mask   - which data elements are affected
+             same choices as in png_free_data()
+    freer  - one of
+               PNG_DESTROY_WILL_FREE_DATA
+               PNG_SET_WILL_FREE_DATA
+               PNG_USER_WILL_FREE_DATA
+
+This function only affects data that has already been allocated.
+You can call this function after reading the PNG data but before calling
+any png_set_*() functions, to control whether the user or the png_set_*()
+function is responsible for freeing any existing data that might be present,
+and again after the png_set_*() functions to control whether the user
+or png_destroy_*() is supposed to free the data.  When the user assumes
+responsibility for libpng-allocated data, the application must use
+png_free() to free it, and when the user transfers responsibility to libpng
+for data that the user has allocated, the user must have used png_malloc()
+or png_zalloc() to allocate it.
+
+If you allocated your row_pointers in a single block, as suggested above in
+the description of the high level read interface, you must not transfer
+responsibility for freeing it to the png_set_rows or png_read_destroy function,
+because they would also try to free the individual row_pointers[i].
+
+If you allocated text_ptr.text, text_ptr.lang, and text_ptr.translated_keyword
+separately, do not transfer responsibility for freeing text_ptr to libpng,
+because when libpng fills a png_text structure it combines these members with
+the key member, and png_free_data() will free only text_ptr.key.  Similarly,
+if you transfer responsibility for free'ing text_ptr from libpng to your
+application, your application must not separately free those members.
+
+The png_free_data() function will turn off the "valid" flag for anything
+it frees.  If you need to turn the flag off for a chunk that was freed by your
+application instead of by libpng, you can use
+
+    png_set_invalid(png_ptr, info_ptr, mask);
+    mask - identifies the chunks to be made invalid,
+           containing the bitwise OR of one or
+           more of
+             PNG_INFO_gAMA, PNG_INFO_sBIT,
+             PNG_INFO_cHRM, PNG_INFO_PLTE,
+             PNG_INFO_tRNS, PNG_INFO_bKGD,
+             PNG_INFO_hIST, PNG_INFO_pHYs,
+             PNG_INFO_oFFs, PNG_INFO_tIME,
+             PNG_INFO_pCAL, PNG_INFO_sRGB,
+             PNG_INFO_iCCP, PNG_INFO_sPLT,
+             PNG_INFO_sCAL, PNG_INFO_IDAT
+
+For a more compact example of reading a PNG image, see the file example.c.
+
+.SS Reading PNG files progressively
+
+The progressive reader is slightly different then the non-progressive
+reader.  Instead of calling png_read_info(), png_read_rows(), and
+png_read_end(), you make one call to png_process_data(), which calls
+callbacks when it has the info, a row, or the end of the image.  You
+set up these callbacks with png_set_progressive_read_fn().  You don't
+have to worry about the input/output functions of libpng, as you are
+giving the library the data directly in png_process_data().  I will
+assume that you have read the section on reading PNG files above,
+so I will only highlight the differences (although I will show
+all of the code).
+
+png_structp png_ptr;
+png_infop info_ptr;
+
+ /*  An example code fragment of how you would
+     initialize the progressive reader in your
+     application. */
+ int
+ initialize_png_reader()
+ {
+    png_ptr = png_create_read_struct
+        (PNG_LIBPNG_VER_STRING, (png_voidp)user_error_ptr,
+         user_error_fn, user_warning_fn);
+    if (!png_ptr)
+        return (ERROR);
+    info_ptr = png_create_info_struct(png_ptr);
+    if (!info_ptr)
+    {
+        png_destroy_read_struct(&png_ptr, (png_infopp)NULL,
+           (png_infopp)NULL);
+        return (ERROR);
+    }
+
+    if (setjmp(png_jmpbuf(png_ptr)))
+    {
+        png_destroy_read_struct(&png_ptr, &info_ptr,
+           (png_infopp)NULL);
+        return (ERROR);
+    }
+
+    /* This one's new.  You can provide functions
+       to be called when the header info is valid,
+       when each row is completed, and when the image
+       is finished.  If you aren't using all functions,
+       you can specify NULL parameters.  Even when all
+       three functions are NULL, you need to call
+       png_set_progressive_read_fn().  You can use
+       any struct as the user_ptr (cast to a void pointer
+       for the function call), and retrieve the pointer
+       from inside the callbacks using the function
+
+          png_get_progressive_ptr(png_ptr);
+
+       which will return a void pointer, which you have
+       to cast appropriately.
+     */
+    png_set_progressive_read_fn(png_ptr, (void *)user_ptr,
+        info_callback, row_callback, end_callback);
+
+    return 0;
+ }
+
+ /* A code fragment that you call as you receive blocks
+   of data */
+ int
+ process_data(png_bytep buffer, png_uint_32 length)
+ {
+    if (setjmp(png_jmpbuf(png_ptr)))
+    {
+        png_destroy_read_struct(&png_ptr, &info_ptr,
+           (png_infopp)NULL);
+        return (ERROR);
+    }
+
+    /* This one's new also.  Simply give it a chunk
+       of data from the file stream (in order, of
+       course).  On machines with segmented memory
+       models machines, don't give it any more than
+       64K.  The library seems to run fine with sizes
+       of 4K. Although you can give it much less if
+       necessary (I assume you can give it chunks of
+       1 byte, I haven't tried less then 256 bytes
+       yet).  When this function returns, you may
+       want to display any rows that were generated
+       in the row callback if you don't already do
+       so there.
+     */
+    png_process_data(png_ptr, info_ptr, buffer, length);
+    return 0;
+ }
+
+ /* This function is called (as set by
+    png_set_progressive_read_fn() above) when enough data
+    has been supplied so all of the header has been
+    read.
+ */
+ void
+ info_callback(png_structp png_ptr, png_infop info)
+ {
+    /* Do any setup here, including setting any of
+       the transformations mentioned in the Reading
+       PNG files section.  For now, you _must_ call
+       either png_start_read_image() or
+       png_read_update_info() after all the
+       transformations are set (even if you don't set
+       any).  You may start getting rows before
+       png_process_data() returns, so this is your
+       last chance to prepare for that.
+     */
+ }
+
+ /* This function is called when each row of image
+    data is complete */
+ void
+ row_callback(png_structp png_ptr, png_bytep new_row,
+    png_uint_32 row_num, int pass)
+ {
+    /* If the image is interlaced, and you turned
+       on the interlace handler, this function will
+       be called for every row in every pass.  Some
+       of these rows will not be changed from the
+       previous pass.  When the row is not changed,
+       the new_row variable will be NULL.  The rows
+       and passes are called in order, so you don't
+       really need the row_num and pass, but I'm
+       supplying them because it may make your life
+       easier.
+
+       For the non-NULL rows of interlaced images,
+       you must call png_progressive_combine_row()
+       passing in the row and the old row.  You can
+       call this function for NULL rows (it will just
+       return) and for non-interlaced images (it just
+       does the memcpy for you) if it will make the
+       code easier.  Thus, you can just do this for
+       all cases:
+     */
+
+        png_progressive_combine_row(png_ptr, old_row,
+          new_row);
+
+    /* where old_row is what was displayed for
+       previously for the row.  Note that the first
+       pass (pass == 0, really) will completely cover
+       the old row, so the rows do not have to be
+       initialized.  After the first pass (and only
+       for interlaced images), you will have to pass
+       the current row, and the function will combine
+       the old row and the new row.
+    */
+ }
+
+ void
+ end_callback(png_structp png_ptr, png_infop info)
+ {
+    /* This function is called after the whole image
+       has been read, including any chunks after the
+       image (up to and including the IEND).  You
+       will usually have the same info chunk as you
+       had in the header, although some data may have
+       been added to the comments and time fields.
+
+       Most people won't do much here, perhaps setting
+       a flag that marks the image as finished.
+     */
+ }
+
+
+
+.SH IV. Writing
+
+Much of this is very similar to reading.  However, everything of
+importance is repeated here, so you won't have to constantly look
+back up in the reading section to understand writing.
+
+.SS Setup
+
+You will want to do the I/O initialization before you get into libpng,
+so if it doesn't work, you don't have anything to undo. If you are not
+using the standard I/O functions, you will need to replace them with
+custom writing functions.  See the discussion under Customizing libpng.
+
+    FILE *fp = fopen(file_name, "wb");
+    if (!fp)
+    {
+       return (ERROR);
+    }
+
+Next, png_struct and png_info need to be allocated and initialized.
+As these can be both relatively large, you may not want to store these
+on the stack, unless you have stack space to spare.  Of course, you
+will want to check if they return NULL.  If you are also reading,
+you won't want to name your read structure and your write structure
+both "png_ptr"; you can call them anything you like, such as
+"read_ptr" and "write_ptr".  Look at pngtest.c, for example.
+
+    png_structp png_ptr = png_create_write_struct
+       (PNG_LIBPNG_VER_STRING, (png_voidp)user_error_ptr,
+        user_error_fn, user_warning_fn);
+    if (!png_ptr)
+       return (ERROR);
+
+    png_infop info_ptr = png_create_info_struct(png_ptr);
+    if (!info_ptr)
+    {
+       png_destroy_write_struct(&png_ptr,
+         (png_infopp)NULL);
+       return (ERROR);
+    }
+
+If you want to use your own memory allocation routines,
+define PNG_USER_MEM_SUPPORTED and use
+png_create_write_struct_2() instead of png_create_write_struct():
+
+    png_structp png_ptr = png_create_write_struct_2
+       (PNG_LIBPNG_VER_STRING, (png_voidp)user_error_ptr,
+        user_error_fn, user_warning_fn, (png_voidp)
+        user_mem_ptr, user_malloc_fn, user_free_fn);
+
+After you have these structures, you will need to set up the
+error handling.  When libpng encounters an error, it expects to
+longjmp() back to your routine.  Therefore, you will need to call
+setjmp() and pass the png_jmpbuf(png_ptr).  If you
+write the file from different routines, you will need to update
+the png_jmpbuf(png_ptr) every time you enter a new routine that will
+call a png_*() function.  See your documentation of setjmp/longjmp
+for your compiler for more information on setjmp/longjmp.  See
+the discussion on libpng error handling in the Customizing Libpng
+section below for more information on the libpng error handling.
+
+    if (setjmp(png_jmpbuf(png_ptr)))
+    {
+       png_destroy_write_struct(&png_ptr, &info_ptr);
+       fclose(fp);
+       return (ERROR);
+    }
+    ...
+    return;
+
+If you would rather avoid the complexity of setjmp/longjmp issues,
+you can compile libpng with PNG_SETJMP_NOT_SUPPORTED, in which case
+errors will result in a call to PNG_ABORT() which defaults to abort().
+
+Now you need to set up the output code.  The default for libpng is to
+use the C function fwrite().  If you use this, you will need to pass a
+valid FILE * in the function png_init_io().  Be sure that the file is
+opened in binary mode.  Again, if you wish to handle writing data in
+another way, see the discussion on libpng I/O handling in the Customizing
+Libpng section below.
+
+    png_init_io(png_ptr, fp);
+
+If you are embedding your PNG into a datastream such as MNG, and don't
+want libpng to write the 8-byte signature, or if you have already
+written the signature in your application, use
+
+    png_set_sig_bytes(png_ptr, 8);
+
+to inform libpng that it should not write a signature.
+
+.SS Write callbacks
+
+At this point, you can set up a callback function that will be
+called after each row has been written, which you can use to control
+a progress meter or the like.  It's demonstrated in pngtest.c.
+You must supply a function
+
+    void write_row_callback(png_ptr, png_uint_32 row,
+       int pass);
+    {
+      /* put your code here */
+    }
+
+(You can give it another name that you like instead of "write_row_callback")
+
+To inform libpng about your function, use
+
+    png_set_write_status_fn(png_ptr, write_row_callback);
+
+You now have the option of modifying how the compression library will
+run.  The following functions are mainly for testing, but may be useful
+in some cases, like if you need to write PNG files extremely fast and
+are willing to give up some compression, or if you want to get the
+maximum possible compression at the expense of slower writing.  If you
+have no special needs in this area, let the library do what it wants by
+not calling this function at all, as it has been tuned to deliver a good
+speed/compression ratio. The second parameter to png_set_filter() is
+the filter method, for which the only valid values are 0 (as of the
+July 1999 PNG specification, version 1.2) or 64 (if you are writing
+a PNG datastream that is to be embedded in a MNG datastream).  The third
+parameter is a flag that indicates which filter type(s) are to be tested
+for each scanline.  See the PNG specification for details on the specific filter
+types.
+
+
+    /* turn on or off filtering, and/or choose
+       specific filters.  You can use either a single
+       PNG_FILTER_VALUE_NAME or the bitwise OR of one
+       or more PNG_FILTER_NAME masks. */
+    png_set_filter(png_ptr, 0,
+       PNG_FILTER_NONE  | PNG_FILTER_VALUE_NONE |
+       PNG_FILTER_SUB   | PNG_FILTER_VALUE_SUB  |
+       PNG_FILTER_UP    | PNG_FILTER_VALUE_UP   |
+       PNG_FILTER_AVE   | PNG_FILTER_VALUE_AVE  |
+       PNG_FILTER_PAETH | PNG_FILTER_VALUE_PAETH|
+       PNG_ALL_FILTERS);
+
+If an application
+wants to start and stop using particular filters during compression,
+it should start out with all of the filters (to ensure that the previous
+row of pixels will be stored in case it's needed later), and then add
+and remove them after the start of compression.
+
+If you are writing a PNG datastream that is to be embedded in a MNG
+datastream, the second parameter can be either 0 or 64.
+
+The png_set_compression_*() functions interface to the zlib compression
+library, and should mostly be ignored unless you really know what you are
+doing.  The only generally useful call is png_set_compression_level()
+which changes how much time zlib spends on trying to compress the image
+data.  See the Compression Library (zlib.h and algorithm.txt, distributed
+with zlib) for details on the compression levels.
+
+    /* set the zlib compression level */
+    png_set_compression_level(png_ptr,
+        Z_BEST_COMPRESSION);
+
+    /* set other zlib parameters */
+    png_set_compression_mem_level(png_ptr, 8);
+    png_set_compression_strategy(png_ptr,
+        Z_DEFAULT_STRATEGY);
+    png_set_compression_window_bits(png_ptr, 15);
+    png_set_compression_method(png_ptr, 8);
+    png_set_compression_buffer_size(png_ptr, 8192)
+
+extern PNG_EXPORT(void,png_set_zbuf_size)
+
+.SS Setting the contents of info for output
+
+You now need to fill in the png_info structure with all the data you
+wish to write before the actual image.  Note that the only thing you
+are allowed to write after the image is the text chunks and the time
+chunk (as of PNG Specification 1.2, anyway).  See png_write_end() and
+the latest PNG specification for more information on that.  If you
+wish to write them before the image, fill them in now, and flag that
+data as being valid.  If you want to wait until after the data, don't
+fill them until png_write_end().  For all the fields in png_info and
+their data types, see png.h.  For explanations of what the fields
+contain, see the PNG specification.
+
+Some of the more important parts of the png_info are:
+
+    png_set_IHDR(png_ptr, info_ptr, width, height,
+       bit_depth, color_type, interlace_type,
+       compression_type, filter_method)
+    width          - holds the width of the image
+                     in pixels (up to 2^31).
+    height         - holds the height of the image
+                     in pixels (up to 2^31).
+    bit_depth      - holds the bit depth of one of the
+                     image channels.
+                     (valid values are 1, 2, 4, 8, 16
+                     and depend also on the
+                     color_type.  See also significant
+                     bits (sBIT) below).
+    color_type     - describes which color/alpha
+                     channels are present.
+                     PNG_COLOR_TYPE_GRAY
+                        (bit depths 1, 2, 4, 8, 16)
+                     PNG_COLOR_TYPE_GRAY_ALPHA
+                        (bit depths 8, 16)
+                     PNG_COLOR_TYPE_PALETTE
+                        (bit depths 1, 2, 4, 8)
+                     PNG_COLOR_TYPE_RGB
+                        (bit_depths 8, 16)
+                     PNG_COLOR_TYPE_RGB_ALPHA
+                        (bit_depths 8, 16)
+
+                     PNG_COLOR_MASK_PALETTE
+                     PNG_COLOR_MASK_COLOR
+                     PNG_COLOR_MASK_ALPHA
+
+    interlace_type - PNG_INTERLACE_NONE or
+                     PNG_INTERLACE_ADAM7
+    compression_type - (must be
+                     PNG_COMPRESSION_TYPE_DEFAULT)
+    filter_method  - (must be PNG_FILTER_TYPE_DEFAULT
+                     or, if you are writing a PNG to
+                     be embedded in a MNG datastream,
+                     can also be
+                     PNG_INTRAPIXEL_DIFFERENCING)
+
+    png_set_PLTE(png_ptr, info_ptr, palette,
+       num_palette);
+    palette        - the palette for the file
+                     (array of png_color)
+    num_palette    - number of entries in the palette
+
+    png_set_gAMA(png_ptr, info_ptr, gamma);
+    gamma          - the gamma the image was created
+                     at (PNG_INFO_gAMA)
+
+    png_set_sRGB(png_ptr, info_ptr, srgb_intent);
+    srgb_intent    - the rendering intent
+                     (PNG_INFO_sRGB) The presence of
+                     the sRGB chunk means that the pixel
+                     data is in the sRGB color space.
+                     This chunk also implies specific
+                     values of gAMA and cHRM.  Rendering
+                     intent is the CSS-1 property that
+                     has been defined by the International
+                     Color Consortium
+                     (http://www.color.org).
+                     It can be one of
+                     PNG_sRGB_INTENT_SATURATION,
+                     PNG_sRGB_INTENT_PERCEPTUAL,
+                     PNG_sRGB_INTENT_ABSOLUTE, or
+                     PNG_sRGB_INTENT_RELATIVE.
+
+
+    png_set_sRGB_gAMA_and_cHRM(png_ptr, info_ptr,
+       srgb_intent);
+    srgb_intent    - the rendering intent
+                     (PNG_INFO_sRGB) The presence of the
+                     sRGB chunk means that the pixel
+                     data is in the sRGB color space.
+                     This function also causes gAMA and
+                     cHRM chunks with the specific values
+                     that are consistent with sRGB to be
+                     written.
+
+    png_set_iCCP(png_ptr, info_ptr, name, compression_type,
+                      profile, proflen);
+    name            - The profile name.
+    compression     - The compression type; always
+                      PNG_COMPRESSION_TYPE_BASE for PNG 1.0.
+                      You may give NULL to this argument to
+                      ignore it.
+    profile         - International Color Consortium color
+                      profile data. May contain NULs.
+    proflen         - length of profile data in bytes.
+
+    png_set_sBIT(png_ptr, info_ptr, sig_bit);
+    sig_bit        - the number of significant bits for
+                     (PNG_INFO_sBIT) each of the gray, red,
+                     green, and blue channels, whichever are
+                     appropriate for the given color type
+                     (png_color_16)
+
+    png_set_tRNS(png_ptr, info_ptr, trans, num_trans,
+       trans_values);
+    trans          - array of transparent entries for
+                     palette (PNG_INFO_tRNS)
+    trans_values   - graylevel or color sample values of
+                     the single transparent color for
+                     non-paletted images (PNG_INFO_tRNS)
+    num_trans      - number of transparent entries
+                     (PNG_INFO_tRNS)
+
+    png_set_hIST(png_ptr, info_ptr, hist);
+                    (PNG_INFO_hIST)
+    hist           - histogram of palette (array of
+                     png_uint_16)
+
+    png_set_tIME(png_ptr, info_ptr, mod_time);
+    mod_time       - time image was last modified
+                     (PNG_VALID_tIME)
+
+    png_set_bKGD(png_ptr, info_ptr, background);
+    background     - background color (PNG_VALID_bKGD)
+
+    png_set_text(png_ptr, info_ptr, text_ptr, num_text);
+    text_ptr       - array of png_text holding image
+                     comments
+    text_ptr[i].compression - type of compression used
+                 on "text" PNG_TEXT_COMPRESSION_NONE
+                           PNG_TEXT_COMPRESSION_zTXt
+                           PNG_ITXT_COMPRESSION_NONE
+                           PNG_ITXT_COMPRESSION_zTXt
+    text_ptr[i].key   - keyword for comment.  Must contain
+                 1-79 characters.
+    text_ptr[i].text  - text comments for current
+                         keyword.  Can be NULL or empty.
+    text_ptr[i].text_length - length of text string,
+                 after decompression, 0 for iTXt
+    text_ptr[i].itxt_length - length of itxt string,
+                 after decompression, 0 for tEXt/zTXt
+    text_ptr[i].lang  - language of comment (NULL or
+                         empty for unknown).
+    text_ptr[i].translated_keyword  - keyword in UTF-8 (NULL
+                         or empty for unknown).
+    num_text       - number of comments
+
+    png_set_sPLT(png_ptr, info_ptr, &palette_ptr,
+       num_spalettes);
+    palette_ptr    - array of png_sPLT_struct structures
+                     to be added to the list of palettes
+                     in the info structure.
+    num_spalettes  - number of palette structures to be
+                     added.
+
+    png_set_oFFs(png_ptr, info_ptr, offset_x, offset_y,
+        unit_type);
+    offset_x  - positive offset from the left
+                     edge of the screen
+    offset_y  - positive offset from the top
+                     edge of the screen
+    unit_type - PNG_OFFSET_PIXEL, PNG_OFFSET_MICROMETER
+
+    png_set_pHYs(png_ptr, info_ptr, res_x, res_y,
+        unit_type);
+    res_x       - pixels/unit physical resolution
+                  in x direction
+    res_y       - pixels/unit physical resolution
+                  in y direction
+    unit_type   - PNG_RESOLUTION_UNKNOWN,
+                  PNG_RESOLUTION_METER
+
+    png_set_sCAL(png_ptr, info_ptr, unit, width, height)
+    unit        - physical scale units (an integer)
+    width       - width of a pixel in physical scale units
+    height      - height of a pixel in physical scale units
+                  (width and height are doubles)
+
+    png_set_sCAL_s(png_ptr, info_ptr, unit, width, height)
+    unit        - physical scale units (an integer)
+    width       - width of a pixel in physical scale units
+    height      - height of a pixel in physical scale units
+                 (width and height are strings like "2.54")
+
+    png_set_unknown_chunks(png_ptr, info_ptr, &unknowns,
+       num_unknowns)
+    unknowns          - array of png_unknown_chunk
+                        structures holding unknown chunks
+    unknowns[i].name  - name of unknown chunk
+    unknowns[i].data  - data of unknown chunk
+    unknowns[i].size  - size of unknown chunk's data
+    unknowns[i].location - position to write chunk in file
+                           0: do not write chunk
+                           PNG_HAVE_IHDR: before PLTE
+                           PNG_HAVE_PLTE: before IDAT
+                           PNG_AFTER_IDAT: after IDAT
+
+The "location" member is set automatically according to
+what part of the output file has already been written.
+You can change its value after calling png_set_unknown_chunks()
+as demonstrated in pngtest.c.  Within each of the "locations",
+the chunks are sequenced according to their position in the
+structure (that is, the value of "i", which is the order in which
+the chunk was either read from the input file or defined with
+png_set_unknown_chunks).
+
+A quick word about text and num_text.  text is an array of png_text
+structures.  num_text is the number of valid structures in the array.
+Each png_text structure holds a language code, a keyword, a text value,
+and a compression type.
+
+The compression types have the same valid numbers as the compression
+types of the image data.  Currently, the only valid number is zero.
+However, you can store text either compressed or uncompressed, unlike
+images, which always have to be compressed.  So if you don't want the
+text compressed, set the compression type to PNG_TEXT_COMPRESSION_NONE.
+Because tEXt and zTXt chunks don't have a language field, if you
+specify PNG_TEXT_COMPRESSION_NONE or PNG_TEXT_COMPRESSION_zTXt
+any language code or translated keyword will not be written out.
+
+Until text gets around 1000 bytes, it is not worth compressing it.
+After the text has been written out to the file, the compression type
+is set to PNG_TEXT_COMPRESSION_NONE_WR or PNG_TEXT_COMPRESSION_zTXt_WR,
+so that it isn't written out again at the end (in case you are calling
+png_write_end() with the same struct.
+
+The keywords that are given in the PNG Specification are:
+
+    Title            Short (one line) title or
+                     caption for image
+    Author           Name of image's creator
+    Description      Description of image (possibly long)
+    Copyright        Copyright notice
+    Creation Time    Time of original image creation
+                     (usually RFC 1123 format, see below)
+    Software         Software used to create the image
+    Disclaimer       Legal disclaimer
+    Warning          Warning of nature of content
+    Source           Device used to create the image
+    Comment          Miscellaneous comment; conversion
+                     from other image format
+
+The keyword-text pairs work like this.  Keywords should be short
+simple descriptions of what the comment is about.  Some typical
+keywords are found in the PNG specification, as is some recommendations
+on keywords.  You can repeat keywords in a file.  You can even write
+some text before the image and some after.  For example, you may want
+to put a description of the image before the image, but leave the
+disclaimer until after, so viewers working over modem connections
+don't have to wait for the disclaimer to go over the modem before
+they start seeing the image.  Finally, keywords should be full
+words, not abbreviations.  Keywords and text are in the ISO 8859-1
+(Latin-1) character set (a superset of regular ASCII) and can not
+contain NUL characters, and should not contain control or other
+unprintable characters.  To make the comments widely readable, stick
+with basic ASCII, and avoid machine specific character set extensions
+like the IBM-PC character set.  The keyword must be present, but
+you can leave off the text string on non-compressed pairs.
+Compressed pairs must have a text string, as only the text string
+is compressed anyway, so the compression would be meaningless.
+
+PNG supports modification time via the png_time structure.  Two
+conversion routines are provided, png_convert_from_time_t() for
+time_t and png_convert_from_struct_tm() for struct tm.  The
+time_t routine uses gmtime().  You don't have to use either of
+these, but if you wish to fill in the png_time structure directly,
+you should provide the time in universal time (GMT) if possible
+instead of your local time.  Note that the year number is the full
+year (e.g. 1998, rather than 98 - PNG is year 2000 compliant!), and
+that months start with 1.
+
+If you want to store the time of the original image creation, you should
+use a plain tEXt chunk with the "Creation Time" keyword.  This is
+necessary because the "creation time" of a PNG image is somewhat vague,
+depending on whether you mean the PNG file, the time the image was
+created in a non-PNG format, a still photo from which the image was
+scanned, or possibly the subject matter itself.  In order to facilitate
+machine-readable dates, it is recommended that the "Creation Time"
+tEXt chunk use RFC 1123 format dates (e.g. "22 May 1997 18:07:10 GMT"),
+although this isn't a requirement.  Unlike the tIME chunk, the
+"Creation Time" tEXt chunk is not expected to be automatically changed
+by the software.  To facilitate the use of RFC 1123 dates, a function
+png_convert_to_rfc1123(png_timep) is provided to convert from PNG
+time to an RFC 1123 format string.
+
+.SS Writing unknown chunks
+
+You can use the png_set_unknown_chunks function to queue up chunks
+for writing.  You give it a chunk name, raw data, and a size; that's
+all there is to it.  The chunks will be written by the next following
+png_write_info_before_PLTE, png_write_info, or png_write_end function.
+Any chunks previously read into the info structure's unknown-chunk
+list will also be written out in a sequence that satisfies the PNG
+specification's ordering rules.
+
+.SS The high-level write interface
+
+At this point there are two ways to proceed; through the high-level
+write interface, or through a sequence of low-level write operations.
+You can use the high-level interface if your image data is present
+in the info structure.  All defined output
+transformations are permitted, enabled by the following masks.
+
+    PNG_TRANSFORM_IDENTITY      No transformation
+    PNG_TRANSFORM_PACKING       Pack 1, 2 and 4-bit samples
+    PNG_TRANSFORM_PACKSWAP      Change order of packed
+                                pixels to LSB first
+    PNG_TRANSFORM_INVERT_MONO   Invert monochrome images
+    PNG_TRANSFORM_SHIFT         Normalize pixels to the
+                                sBIT depth
+    PNG_TRANSFORM_BGR           Flip RGB to BGR, RGBA
+                                to BGRA
+    PNG_TRANSFORM_SWAP_ALPHA    Flip RGBA to ARGB or GA
+                                to AG
+    PNG_TRANSFORM_INVERT_ALPHA  Change alpha from opacity
+                                to transparency
+    PNG_TRANSFORM_SWAP_ENDIAN   Byte-swap 16-bit samples
+    PNG_TRANSFORM_STRIP_FILLER  Strip out filler bytes.
+
+If you have valid image data in the info structure (you can use
+png_set_rows() to put image data in the info structure), simply do this:
+
+    png_write_png(png_ptr, info_ptr, png_transforms, NULL)
+
+where png_transforms is an integer containing the bitwise OR of some set of
+transformation flags.  This call is equivalent to png_write_info(),
+followed the set of transformations indicated by the transform mask,
+then png_write_image(), and finally png_write_end().
+
+(The final parameter of this call is not yet used.  Someday it might point
+to transformation parameters required by some future output transform.)
+
+You must use png_transforms and not call any png_set_transform() functions
+when you use png_write_png().
+
+.SS The low-level write interface
+
+If you are going the low-level route instead, you are now ready to
+write all the file information up to the actual image data.  You do
+this with a call to png_write_info().
+
+    png_write_info(png_ptr, info_ptr);
+
+Note that there is one transformation you may need to do before
+png_write_info().  In PNG files, the alpha channel in an image is the
+level of opacity.  If your data is supplied as a level of
+transparency, you can invert the alpha channel before you write it, so
+that 0 is fully transparent and 255 (in 8-bit or paletted images) or
+65535 (in 16-bit images) is fully opaque, with
+
+    png_set_invert_alpha(png_ptr);
+
+This must appear before png_write_info() instead of later with the
+other transformations because in the case of paletted images the tRNS
+chunk data has to be inverted before the tRNS chunk is written.  If
+your image is not a paletted image, the tRNS data (which in such cases
+represents a single color to be rendered as transparent) won't need to
+be changed, and you can safely do this transformation after your
+png_write_info() call.
+
+If you need to write a private chunk that you want to appear before
+the PLTE chunk when PLTE is present, you can write the PNG info in
+two steps, and insert code to write your own chunk between them:
+
+    png_write_info_before_PLTE(png_ptr, info_ptr);
+    png_set_unknown_chunks(png_ptr, info_ptr, ...);
+    png_write_info(png_ptr, info_ptr);
+
+After you've written the file information, you can set up the library
+to handle any special transformations of the image data.  The various
+ways to transform the data will be described in the order that they
+should occur.  This is important, as some of these change the color
+type and/or bit depth of the data, and some others only work on
+certain color types and bit depths.  Even though each transformation
+checks to see if it has data that it can do something with, you should
+make sure to only enable a transformation if it will be valid for the
+data.  For example, don't swap red and blue on grayscale data.
+
+PNG files store RGB pixels packed into 3 or 6 bytes.  This code tells
+the library to strip input data that has 4 or 8 bytes per pixel down
+to 3 or 6 bytes (or strip 2 or 4-byte grayscale+filler data to 1 or 2
+bytes per pixel).
+
+    png_set_filler(png_ptr, 0, PNG_FILLER_BEFORE);
+
+where the 0 is unused, and the location is either PNG_FILLER_BEFORE or
+PNG_FILLER_AFTER, depending upon whether the filler byte in the pixel
+is stored XRGB or RGBX.
+
+PNG files pack pixels of bit depths 1, 2, and 4 into bytes as small as
+they can, resulting in, for example, 8 pixels per byte for 1 bit files.
+If the data is supplied at 1 pixel per byte, use this code, which will
+correctly pack the pixels into a single byte:
+
+    png_set_packing(png_ptr);
+
+PNG files reduce possible bit depths to 1, 2, 4, 8, and 16.  If your
+data is of another bit depth, you can write an sBIT chunk into the
+file so that decoders can recover the original data if desired.
+
+    /* Set the true bit depth of the image data */
+    if (color_type & PNG_COLOR_MASK_COLOR)
+    {
+        sig_bit.red = true_bit_depth;
+        sig_bit.green = true_bit_depth;
+        sig_bit.blue = true_bit_depth;
+    }
+    else
+    {
+        sig_bit.gray = true_bit_depth;
+    }
+    if (color_type & PNG_COLOR_MASK_ALPHA)
+    {
+        sig_bit.alpha = true_bit_depth;
+    }
+
+    png_set_sBIT(png_ptr, info_ptr, &sig_bit);
+
+If the data is stored in the row buffer in a bit depth other than
+one supported by PNG (e.g. 3 bit data in the range 0-7 for a 4-bit PNG),
+this will scale the values to appear to be the correct bit depth as
+is required by PNG.
+
+    png_set_shift(png_ptr, &sig_bit);
+
+PNG files store 16 bit pixels in network byte order (big-endian,
+ie. most significant bits first).  This code would be used if they are
+supplied the other way (little-endian, i.e. least significant bits
+first, the way PCs store them):
+
+    if (bit_depth > 8)
+       png_set_swap(png_ptr);
+
+If you are using packed-pixel images (1, 2, or 4 bits/pixel), and you
+need to change the order the pixels are packed into bytes, you can use:
+
+    if (bit_depth < 8)
+       png_set_packswap(png_ptr);
+
+PNG files store 3 color pixels in red, green, blue order.  This code
+would be used if they are supplied as blue, green, red:
+
+    png_set_bgr(png_ptr);
+
+PNG files describe monochrome as black being zero and white being
+one. This code would be used if the pixels are supplied with this reversed
+(black being one and white being zero):
+
+    png_set_invert_mono(png_ptr);
+
+Finally, you can write your own transformation function if none of
+the existing ones meets your needs.  This is done by setting a callback
+with
+
+    png_set_write_user_transform_fn(png_ptr,
+       write_transform_fn);
+
+You must supply the function
+
+    void write_transform_fn(png_ptr ptr, row_info_ptr
+       row_info, png_bytep data)
+
+See pngtest.c for a working example.  Your function will be called
+before any of the other transformations are processed.
+
+You can also set up a pointer to a user structure for use by your
+callback function.
+
+    png_set_user_transform_info(png_ptr, user_ptr, 0, 0);
+
+The user_channels and user_depth parameters of this function are ignored
+when writing; you can set them to zero as shown.
+
+You can retrieve the pointer via the function png_get_user_transform_ptr().
+For example:
+
+    voidp write_user_transform_ptr =
+       png_get_user_transform_ptr(png_ptr);
+
+It is possible to have libpng flush any pending output, either manually,
+or automatically after a certain number of lines have been written.  To
+flush the output stream a single time call:
+
+    png_write_flush(png_ptr);
+
+and to have libpng flush the output stream periodically after a certain
+number of scanlines have been written, call:
+
+    png_set_flush(png_ptr, nrows);
+
+Note that the distance between rows is from the last time png_write_flush()
+was called, or the first row of the image if it has never been called.
+So if you write 50 lines, and then png_set_flush 25, it will flush the
+output on the next scanline, and every 25 lines thereafter, unless
+png_write_flush() is called before 25 more lines have been written.
+If nrows is too small (less than about 10 lines for a 640 pixel wide
+RGB image) the image compression may decrease noticeably (although this
+may be acceptable for real-time applications).  Infrequent flushing will
+only degrade the compression performance by a few percent over images
+that do not use flushing.
+
+.SS Writing the image data
+
+That's it for the transformations.  Now you can write the image data.
+The simplest way to do this is in one function call.  If you have the
+whole image in memory, you can just call png_write_image() and libpng
+will write the image.  You will need to pass in an array of pointers to
+each row.  This function automatically handles interlacing, so you don't
+need to call png_set_interlace_handling() or call this function multiple
+times, or any of that other stuff necessary with png_write_rows().
+
+    png_write_image(png_ptr, row_pointers);
+
+where row_pointers is:
+
+    png_byte *row_pointers[height];
+
+You can point to void or char or whatever you use for pixels.
+
+If you don't want to write the whole image at once, you can
+use png_write_rows() instead.  If the file is not interlaced,
+this is simple:
+
+    png_write_rows(png_ptr, row_pointers,
+       number_of_rows);
+
+row_pointers is the same as in the png_write_image() call.
+
+If you are just writing one row at a time, you can do this with
+a single row_pointer instead of an array of row_pointers:
+
+    png_bytep row_pointer = row;
+
+    png_write_row(png_ptr, row_pointer);
+
+When the file is interlaced, things can get a good deal more
+complicated.  The only currently (as of the PNG Specification
+version 1.2, dated July 1999) defined interlacing scheme for PNG files
+is the "Adam7" interlace scheme, that breaks down an
+image into seven smaller images of varying size.  libpng will build
+these images for you, or you can do them yourself.  If you want to
+build them yourself, see the PNG specification for details of which
+pixels to write when.
+
+If you don't want libpng to handle the interlacing details, just
+use png_set_interlace_handling() and call png_write_rows() the
+correct number of times to write all seven sub-images.
+
+If you want libpng to build the sub-images, call this before you start
+writing any rows:
+
+    number_of_passes =
+       png_set_interlace_handling(png_ptr);
+
+This will return the number of passes needed.  Currently, this
+is seven, but may change if another interlace type is added.
+
+Then write the complete image number_of_passes times.
+
+    png_write_rows(png_ptr, row_pointers,
+       number_of_rows);
+
+As some of these rows are not used, and thus return immediately,
+you may want to read about interlacing in the PNG specification,
+and only update the rows that are actually used.
+
+.SS Finishing a sequential write
+
+After you are finished writing the image, you should finish writing
+the file.  If you are interested in writing comments or time, you should
+pass an appropriately filled png_info pointer.  If you are not interested,
+you can pass NULL.
+
+    png_write_end(png_ptr, info_ptr);
+
+When you are done, you can free all memory used by libpng like this:
+
+    png_destroy_write_struct(&png_ptr, &info_ptr);
+
+It is also possible to individually free the info_ptr members that
+point to libpng-allocated storage with the following function:
+
+    png_free_data(png_ptr, info_ptr, mask, seq)
+    mask  - identifies data to be freed, a mask
+            containing the bitwise OR of one or
+            more of
+              PNG_FREE_PLTE, PNG_FREE_TRNS,
+              PNG_FREE_HIST, PNG_FREE_ICCP,
+              PNG_FREE_PCAL, PNG_FREE_ROWS,
+              PNG_FREE_SCAL, PNG_FREE_SPLT,
+              PNG_FREE_TEXT, PNG_FREE_UNKN,
+            or simply PNG_FREE_ALL
+    seq   - sequence number of item to be freed
+            (-1 for all items)
+
+This function may be safely called when the relevant storage has
+already been freed, or has not yet been allocated, or was allocated
+by the user  and not by libpng,  and will in those
+cases do nothing.  The "seq" parameter is ignored if only one item
+of the selected data type, such as PLTE, is allowed.  If "seq" is not
+-1, and multiple items are allowed for the data type identified in
+the mask, such as text or sPLT, only the n'th item in the structure
+is freed, where n is "seq".
+
+If you allocated data such as a palette that you passed
+in to libpng with png_set_*, you must not free it until just before the call to
+png_destroy_write_struct().
+
+The default behavior is only to free data that was allocated internally
+by libpng.  This can be changed, so that libpng will not free the data,
+or so that it will free data that was allocated by the user with png_malloc()
+or png_zalloc() and passed in via a png_set_*() function, with
+
+    png_data_freer(png_ptr, info_ptr, freer, mask)
+    mask   - which data elements are affected
+             same choices as in png_free_data()
+    freer  - one of
+               PNG_DESTROY_WILL_FREE_DATA
+               PNG_SET_WILL_FREE_DATA
+               PNG_USER_WILL_FREE_DATA
+
+For example, to transfer responsibility for some data from a read structure
+to a write structure, you could use
+
+    png_data_freer(read_ptr, read_info_ptr,
+       PNG_USER_WILL_FREE_DATA,
+       PNG_FREE_PLTE|PNG_FREE_tRNS|PNG_FREE_hIST)
+    png_data_freer(write_ptr, write_info_ptr,
+       PNG_DESTROY_WILL_FREE_DATA,
+       PNG_FREE_PLTE|PNG_FREE_tRNS|PNG_FREE_hIST)
+
+thereby briefly reassigning responsibility for freeing to the user but
+immediately afterwards reassigning it once more to the write_destroy
+function.  Having done this, it would then be safe to destroy the read
+structure and continue to use the PLTE, tRNS, and hIST data in the write
+structure.
+
+This function only affects data that has already been allocated.
+You can call this function before calling after the png_set_*() functions
+to control whether the user or png_destroy_*() is supposed to free the data.
+When the user assumes responsibility for libpng-allocated data, the
+application must use
+png_free() to free it, and when the user transfers responsibility to libpng
+for data that the user has allocated, the user must have used png_malloc()
+or png_zalloc() to allocate it.
+
+If you allocated text_ptr.text, text_ptr.lang, and text_ptr.translated_keyword
+separately, do not transfer responsibility for freeing text_ptr to libpng,
+because when libpng fills a png_text structure it combines these members with
+the key member, and png_free_data() will free only text_ptr.key.  Similarly,
+if you transfer responsibility for free'ing text_ptr from libpng to your
+application, your application must not separately free those members.
+For a more compact example of writing a PNG image, see the file example.c.
+
+.SH V. Modifying/Customizing libpng:
+
+There are two issues here.  The first is changing how libpng does
+standard things like memory allocation, input/output, and error handling.
+The second deals with more complicated things like adding new chunks,
+adding new transformations, and generally changing how libpng works.
+Both of those are compile-time issues; that is, they are generally
+determined at the time the code is written, and there is rarely a need
+to provide the user with a means of changing them.
+
+Memory allocation, input/output, and error handling
+
+All of the memory allocation, input/output, and error handling in libpng
+goes through callbacks that are user-settable.  The default routines are
+in pngmem.c, pngrio.c, pngwio.c, and pngerror.c, respectively.  To change
+these functions, call the appropriate png_set_*_fn() function.
+
+Memory allocation is done through the functions png_malloc()
+and png_free().  These currently just call the standard C functions.  If
+your pointers can't access more then 64K at a time, you will want to set
+MAXSEG_64K in zlib.h.  Since it is unlikely that the method of handling
+memory allocation on a platform will change between applications, these
+functions must be modified in the library at compile time.  If you prefer
+to use a different method of allocating and freeing data, you can use
+png_create_read_struct_2() or png_create_write_struct_2() to register
+your own functions as described above.
+These functions also provide a void pointer that can be retrieved via
+
+    mem_ptr=png_get_mem_ptr(png_ptr);
+
+Your replacement memory functions must have prototypes as follows:
+
+    png_voidp malloc_fn(png_structp png_ptr,
+       png_size_t size);
+    void free_fn(png_structp png_ptr, png_voidp ptr);
+
+Your malloc_fn() must return NULL in case of failure.  The png_malloc()
+function will normally call png_error() if it receives a NULL from the
+system memory allocator or from your replacement malloc_fn().
+
+Input/Output in libpng is done through png_read() and png_write(),
+which currently just call fread() and fwrite().  The FILE * is stored in
+png_struct and is initialized via png_init_io().  If you wish to change
+the method of I/O, the library supplies callbacks that you can set
+through the function png_set_read_fn() and png_set_write_fn() at run
+time, instead of calling the png_init_io() function.  These functions
+also provide a void pointer that can be retrieved via the function
+png_get_io_ptr().  For example:
+
+    png_set_read_fn(png_structp read_ptr,
+        voidp read_io_ptr, png_rw_ptr read_data_fn)
+
+    png_set_write_fn(png_structp write_ptr,
+        voidp write_io_ptr, png_rw_ptr write_data_fn,
+        png_flush_ptr output_flush_fn);
+
+    voidp read_io_ptr = png_get_io_ptr(read_ptr);
+    voidp write_io_ptr = png_get_io_ptr(write_ptr);
+
+The replacement I/O functions must have prototypes as follows:
+
+    void user_read_data(png_structp png_ptr,
+        png_bytep data, png_size_t length);
+    void user_write_data(png_structp png_ptr,
+        png_bytep data, png_size_t length);
+    void user_flush_data(png_structp png_ptr);
+
+Supplying NULL for the read, write, or flush functions sets them back
+to using the default C stream functions.  It is an error to read from
+a write stream, and vice versa.
+
+Error handling in libpng is done through png_error() and png_warning().
+Errors handled through png_error() are fatal, meaning that png_error()
+should never return to its caller.  Currently, this is handled via
+setjmp() and longjmp() (unless you have compiled libpng with
+PNG_SETJMP_NOT_SUPPORTED, in which case it is handled via PNG_ABORT()),
+but you could change this to do things like exit() if you should wish.
+
+On non-fatal errors, png_warning() is called
+to print a warning message, and then control returns to the calling code.
+By default png_error() and png_warning() print a message on stderr via
+fprintf() unless the library is compiled with PNG_NO_CONSOLE_IO defined
+(because you don't want the messages) or PNG_NO_STDIO defined (because
+fprintf() isn't available).  If you wish to change the behavior of the error
+functions, you will need to set up your own message callbacks.  These
+functions are normally supplied at the time that the png_struct is created.
+It is also possible to redirect errors and warnings to your own replacement
+functions after png_create_*_struct() has been called by calling:
+
+    png_set_error_fn(png_structp png_ptr,
+        png_voidp error_ptr, png_error_ptr error_fn,
+        png_error_ptr warning_fn);
+
+    png_voidp error_ptr = png_get_error_ptr(png_ptr);
+
+If NULL is supplied for either error_fn or warning_fn, then the libpng
+default function will be used, calling fprintf() and/or longjmp() if a
+problem is encountered.  The replacement error functions should have
+parameters as follows:
+
+    void user_error_fn(png_structp png_ptr,
+        png_const_charp error_msg);
+    void user_warning_fn(png_structp png_ptr,
+        png_const_charp warning_msg);
+
+The motivation behind using setjmp() and longjmp() is the C++ throw and
+catch exception handling methods.  This makes the code much easier to write,
+as there is no need to check every return code of every function call.
+However, there are some uncertainties about the status of local variables
+after a longjmp, so the user may want to be careful about doing anything after
+setjmp returns non-zero besides returning itself.  Consult your compiler
+documentation for more details.  For an alternative approach, you may wish
+to use the "cexcept" facility (see http://cexcept.sourceforge.net).
+
+.SS Custom chunks
+
+If you need to read or write custom chunks, you may need to get deeper
+into the libpng code.  The library now has mechanisms for storing
+and writing chunks of unknown type; you can even declare callbacks
+for custom chunks.  However, this may not be good enough if the
+library code itself needs to know about interactions between your
+chunk and existing `intrinsic' chunks.
+
+If you need to write a new intrinsic chunk, first read the PNG
+specification. Acquire a first level of
+understanding of how it works.  Pay particular attention to the
+sections that describe chunk names, and look at how other chunks were
+designed, so you can do things similarly.  Second, check out the
+sections of libpng that read and write chunks.  Try to find a chunk
+that is similar to yours and use it as a template.  More details can
+be found in the comments inside the code.  It is best to handle unknown
+chunks in a generic method, via callback functions, instead of by
+modifying libpng functions.
+
+If you wish to write your own transformation for the data, look through
+the part of the code that does the transformations, and check out some of
+the simpler ones to get an idea of how they work.  Try to find a similar
+transformation to the one you want to add and copy off of it.  More details
+can be found in the comments inside the code itself.
+
+.SS Configuring for 16 bit platforms
+
+You will want to look into zconf.h to tell zlib (and thus libpng) that
+it cannot allocate more then 64K at a time.  Even if you can, the memory
+won't be accessible.  So limit zlib and libpng to 64K by defining MAXSEG_64K.
+
+.SS Configuring for DOS
+
+For DOS users who only have access to the lower 640K, you will
+have to limit zlib's memory usage via a png_set_compression_mem_level()
+call.  See zlib.h or zconf.h in the zlib library for more information.
+
+.SS Configuring for Medium Model
+
+Libpng's support for medium model has been tested on most of the popular
+compilers.  Make sure MAXSEG_64K gets defined, USE_FAR_KEYWORD gets
+defined, and FAR gets defined to far in pngconf.h, and you should be
+all set.  Everything in the library (except for zlib's structure) is
+expecting far data.  You must use the typedefs with the p or pp on
+the end for pointers (or at least look at them and be careful).  Make
+note that the rows of data are defined as png_bytepp, which is an
+unsigned char far * far *.
+
+.SS Configuring for gui/windowing platforms:
+
+You will need to write new error and warning functions that use the GUI
+interface, as described previously, and set them to be the error and
+warning functions at the time that png_create_*_struct() is called,
+in order to have them available during the structure initialization.
+They can be changed later via png_set_error_fn().  On some compilers,
+you may also have to change the memory allocators (png_malloc, etc.).
+
+.SS Configuring for compiler xxx:
+
+All includes for libpng are in pngconf.h.  If you need to add/change/delete
+an include, this is the place to do it.  The includes that are not
+needed outside libpng are protected by the PNG_INTERNAL definition,
+which is only defined for those routines inside libpng itself.  The
+files in libpng proper only include png.h, which includes pngconf.h.
+
+.SS Configuring zlib:
+
+There are special functions to configure the compression.  Perhaps the
+most useful one changes the compression level, which currently uses
+input compression values in the range 0 - 9.  The library normally
+uses the default compression level (Z_DEFAULT_COMPRESSION = 6).  Tests
+have shown that for a large majority of images, compression values in
+the range 3-6 compress nearly as well as higher levels, and do so much
+faster.  For online applications it may be desirable to have maximum speed
+(Z_BEST_SPEED = 1).  With versions of zlib after v0.99, you can also
+specify no compression (Z_NO_COMPRESSION = 0), but this would create
+files larger than just storing the raw bitmap.  You can specify the
+compression level by calling:
+
+    png_set_compression_level(png_ptr, level);
+
+Another useful one is to reduce the memory level used by the library.
+The memory level defaults to 8, but it can be lowered if you are
+short on memory (running DOS, for example, where you only have 640K).
+Note that the memory level does have an effect on compression; among
+other things, lower levels will result in sections of incompressible
+data being emitted in smaller stored blocks, with a correspondingly
+larger relative overhead of up to 15% in the worst case.
+
+    png_set_compression_mem_level(png_ptr, level);
+
+The other functions are for configuring zlib.  They are not recommended
+for normal use and may result in writing an invalid PNG file.  See
+zlib.h for more information on what these mean.
+
+    png_set_compression_strategy(png_ptr,
+        strategy);
+    png_set_compression_window_bits(png_ptr,
+        window_bits);
+    png_set_compression_method(png_ptr, method);
+    png_set_compression_buffer_size(png_ptr, size);
+
+.SS Controlling row filtering
+
+If you want to control whether libpng uses filtering or not, which
+filters are used, and how it goes about picking row filters, you
+can call one of these functions.  The selection and configuration
+of row filters can have a significant impact on the size and
+encoding speed and a somewhat lesser impact on the decoding speed
+of an image.  Filtering is enabled by default for RGB and grayscale
+images (with and without alpha), but not for paletted images nor
+for any images with bit depths less than 8 bits/pixel.
+
+The 'method' parameter sets the main filtering method, which is
+currently only '0' in the PNG 1.2 specification.  The 'filters'
+parameter sets which filter(s), if any, should be used for each
+scanline.  Possible values are PNG_ALL_FILTERS and PNG_NO_FILTERS
+to turn filtering on and off, respectively.
+
+Individual filter types are PNG_FILTER_NONE, PNG_FILTER_SUB,
+PNG_FILTER_UP, PNG_FILTER_AVG, PNG_FILTER_PAETH, which can be bitwise
+ORed together with '|' to specify one or more filters to use.
+These filters are described in more detail in the PNG specification.
+If you intend to change the filter type during the course of writing
+the image, you should start with flags set for all of the filters
+you intend to use so that libpng can initialize its internal
+structures appropriately for all of the filter types.  (Note that this
+means the first row must always be adaptively filtered, because libpng
+currently does not allocate the filter buffers until png_write_row()
+is called for the first time.)
+
+    filters = PNG_FILTER_NONE | PNG_FILTER_SUB
+              PNG_FILTER_UP | PNG_FILTER_AVE |
+              PNG_FILTER_PAETH | PNG_ALL_FILTERS;
+
+    png_set_filter(png_ptr, PNG_FILTER_TYPE_BASE,
+       filters);
+              The second parameter can also be
+              PNG_INTRAPIXEL_DIFFERENCING if you are
+              writing a PNG to be embedded in a MNG
+              datastream.  This parameter must be the
+              same as the value of filter_method used
+              in png_set_IHDR().
+
+It is also possible to influence how libpng chooses from among the
+available filters.  This is done in one or both of two ways - by
+telling it how important it is to keep the same filter for successive
+rows, and by telling it the relative computational costs of the filters.
+
+    double weights[3] = {1.5, 1.3, 1.1},
+       costs[PNG_FILTER_VALUE_LAST] =
+       {1.0, 1.3, 1.3, 1.5, 1.7};
+
+    png_set_filter_heuristics(png_ptr,
+       PNG_FILTER_HEURISTIC_WEIGHTED, 3,
+       weights, costs);
+
+The weights are multiplying factors that indicate to libpng that the
+row filter should be the same for successive rows unless another row filter
+is that many times better than the previous filter.  In the above example,
+if the previous 3 filters were SUB, SUB, NONE, the SUB filter could have a
+"sum of absolute differences" 1.5 x 1.3 times higher than other filters
+and still be chosen, while the NONE filter could have a sum 1.1 times
+higher than other filters and still be chosen.  Unspecified weights are
+taken to be 1.0, and the specified weights should probably be declining
+like those above in order to emphasize recent filters over older filters.
+
+The filter costs specify for each filter type a relative decoding cost
+to be considered when selecting row filters.  This means that filters
+with higher costs are less likely to be chosen over filters with lower
+costs, unless their "sum of absolute differences" is that much smaller.
+The costs do not necessarily reflect the exact computational speeds of
+the various filters, since this would unduly influence the final image
+size.
+
+Note that the numbers above were invented purely for this example and
+are given only to help explain the function usage.  Little testing has
+been done to find optimum values for either the costs or the weights.
+
+.SS Removing unwanted object code
+
+There are a bunch of #define's in pngconf.h that control what parts of
+libpng are compiled.  All the defines end in _SUPPORTED.  If you are
+never going to use a capability, you can change the #define to #undef
+before recompiling libpng and save yourself code and data space, or
+you can turn off individual capabilities with defines that begin with
+PNG_NO_.
+
+You can also turn all of the transforms and ancillary chunk capabilities
+off en masse with compiler directives that define
+PNG_NO_READ[or WRITE]_TRANSFORMS, or PNG_NO_READ[or WRITE]_ANCILLARY_CHUNKS,
+or all four,
+along with directives to turn on any of the capabilities that you do
+want.  The PNG_NO_READ[or WRITE]_TRANSFORMS directives disable
+the extra transformations but still leave the library fully capable of reading
+and writing PNG files with all known public chunks
+Use of the PNG_NO_READ[or WRITE]_ANCILLARY_CHUNKS directive
+produces a library that is incapable of reading or writing ancillary chunks.
+If you are not using the progressive reading capability, you can
+turn that off with PNG_NO_PROGRESSIVE_READ (don't confuse
+this with the INTERLACING capability, which you'll still have).
+
+All the reading and writing specific code are in separate files, so the
+linker should only grab the files it needs.  However, if you want to
+make sure, or if you are building a stand alone library, all the
+reading files start with pngr and all the writing files start with
+pngw.  The files that don't match either (like png.c, pngtrans.c, etc.)
+are used for both reading and writing, and always need to be included.
+The progressive reader is in pngpread.c
+
+If you are creating or distributing a dynamically linked library (a .so
+or DLL file), you should not remove or disable any parts of the library,
+as this will cause applications linked with different versions of the
+library to fail if they call functions not available in your library.
+The size of the library itself should not be an issue, because only
+those sections that are actually used will be loaded into memory.
+
+.SS Requesting debug printout
+
+The macro definition PNG_DEBUG can be used to request debugging
+printout.  Set it to an integer value in the range 0 to 3.  Higher
+numbers result in increasing amounts of debugging information.  The
+information is printed to the "stderr" file, unless another file
+name is specified in the PNG_DEBUG_FILE macro definition.
+
+When PNG_DEBUG > 0, the following functions (macros) become available:
+
+   png_debug(level, message)
+   png_debug1(level, message, p1)
+   png_debug2(level, message, p1, p2)
+
+in which "level" is compared to PNG_DEBUG to decide whether to print
+the message, "message" is the formatted string to be printed,
+and p1 and p2 are parameters that are to be embedded in the string
+according to printf-style formatting directives.  For example,
+
+   png_debug1(2, "foo=%d\n", foo);
+
+is expanded to
+
+   if(PNG_DEBUG > 2)
+     fprintf(PNG_DEBUG_FILE, "foo=%d\n", foo);
+
+When PNG_DEBUG is defined but is zero, the macros aren't defined, but you
+can still use PNG_DEBUG to control your own debugging:
+
+   #ifdef PNG_DEBUG
+       fprintf(stderr, ...
+   #endif
+
+When PNG_DEBUG = 1, the macros are defined, but only png_debug statements
+having level = 0 will be printed.  There aren't any such statements in
+this version of libpng, but if you insert some they will be printed.
+
+.SH VII.  MNG support
+
+The MNG specification (available at http://www.libpng.org/pub/mng) allows
+certain extensions to PNG for PNG images that are embedded in MNG datastreams.
+Libpng can support some of these extensions.  To enable them, use the
+png_permit_mng_features() function:
+
+   feature_set = png_permit_mng_features(png_ptr, mask)
+   mask is a png_uint_32 containing the bitwise OR of the
+        features you want to enable.  These include
+        PNG_FLAG_MNG_EMPTY_PLTE
+        PNG_FLAG_MNG_FILTER_64
+        PNG_ALL_MNG_FEATURES
+   feature_set is a png_uint_32 that is the bitwise AND of
+      your mask with the set of MNG features that is
+      supported by the version of libpng that you are using.
+
+It is an error to use this function when reading or writing a standalone
+PNG file with the PNG 8-byte signature.  The PNG datastream must be wrapped
+in a MNG datastream.  As a minimum, it must have the MNG 8-byte signature
+and the MHDR and MEND chunks.  Libpng does not provide support for these
+or any other MNG chunks; your application must provide its own support for
+them.  You may wish to consider using libmng (available at
+http://www.libmng.com) instead.
+
+.SH VIII.  Changes to Libpng from version 0.88
+
+It should be noted that versions of libpng later than 0.96 are not
+distributed by the original libpng author, Guy Schalnat, nor by
+Andreas Dilger, who had taken over from Guy during 1996 and 1997, and
+distributed versions 0.89 through 0.96, but rather by another member
+of the original PNG Group, Glenn Randers-Pehrson.  Guy and Andreas are
+still alive and well, but they have moved on to other things.
+
+The old libpng functions png_read_init(), png_write_init(),
+png_info_init(), png_read_destroy(), and png_write_destroy() have been
+moved to PNG_INTERNAL in version 0.95 to discourage their use.  These
+functions will be removed from libpng version 2.0.0.
+
+The preferred method of creating and initializing the libpng structures is
+via the png_create_read_struct(), png_create_write_struct(), and
+png_create_info_struct() because they isolate the size of the structures
+from the application, allow version error checking, and also allow the
+use of custom error handling routines during the initialization, which
+the old functions do not.  The functions png_read_destroy() and
+png_write_destroy() do not actually free the memory that libpng
+allocated for these structs, but just reset the data structures, so they
+can be used instead of png_destroy_read_struct() and
+png_destroy_write_struct() if you feel there is too much system overhead
+allocating and freeing the png_struct for each image read.
+
+Setting the error callbacks via png_set_message_fn() before
+png_read_init() as was suggested in libpng-0.88 is no longer supported
+because this caused applications that do not use custom error functions
+to fail if the png_ptr was not initialized to zero.  It is still possible
+to set the error callbacks AFTER png_read_init(), or to change them with
+png_set_error_fn(), which is essentially the same function, but with a new
+name to force compilation errors with applications that try to use the old
+method.
+
+Starting with version 1.0.7, you can find out which version of the library
+you are using at run-time:
+
+   png_uint_32 libpng_vn = png_access_version_number();
+
+The number libpng_vn is constructed from the major version, minor
+version with leading zero, and release number with leading zero,
+(e.g., libpng_vn for version 1.0.7 is 10007).
+
+You can also check which version of png.h you used when compiling your
+application:
+
+   png_uint_32 application_vn = PNG_LIBPNG_VER;
+
+.SH IX. Y2K Compliance in libpng
+
+October 13, 2007
+
+Since the PNG Development group is an ad-hoc body, we can't make
+an official declaration.
+
+This is your unofficial assurance that libpng from version 0.71 and
+upward through 1.2.22 are Y2K compliant.  It is my belief that earlier
+versions were also Y2K compliant.
+
+Libpng only has three year fields.  One is a 2-byte unsigned integer that
+will hold years up to 65535.  The other two hold the date in text
+format, and will hold years up to 9999.
+
+The integer is
+    "png_uint_16 year" in png_time_struct.
+
+The strings are
+    "png_charp time_buffer" in png_struct and
+    "near_time_buffer", which is a local character string in png.c.
+
+There are seven time-related functions:
+
+    png_convert_to_rfc_1123() in png.c
+      (formerly png_convert_to_rfc_1152() in error)
+    png_convert_from_struct_tm() in pngwrite.c, called
+      in pngwrite.c
+    png_convert_from_time_t() in pngwrite.c
+    png_get_tIME() in pngget.c
+    png_handle_tIME() in pngrutil.c, called in pngread.c
+    png_set_tIME() in pngset.c
+    png_write_tIME() in pngwutil.c, called in pngwrite.c
+
+All appear to handle dates properly in a Y2K environment.  The
+png_convert_from_time_t() function calls gmtime() to convert from system
+clock time, which returns (year - 1900), which we properly convert to
+the full 4-digit year.  There is a possibility that applications using
+libpng are not passing 4-digit years into the png_convert_to_rfc_1123()
+function, or that they are incorrectly passing only a 2-digit year
+instead of "year - 1900" into the png_convert_from_struct_tm() function,
+but this is not under our control.  The libpng documentation has always
+stated that it works with 4-digit years, and the APIs have been
+documented as such.
+
+The tIME chunk itself is also Y2K compliant.  It uses a 2-byte unsigned
+integer to hold the year, and can hold years as large as 65535.
+
+zlib, upon which libpng depends, is also Y2K compliant.  It contains
+no date-related code.
+
+
+   Glenn Randers-Pehrson
+   libpng maintainer
+   PNG Development Group
+
+.SH NOTE
+
+Note about libpng version numbers:
+
+Due to various miscommunications, unforeseen code incompatibilities
+and occasional factors outside the authors' control, version numbering
+on the library has not always been consistent and straightforward.
+The following table summarizes matters since version 0.89c, which was
+the first widely used release:
+
+ source             png.h  png.h  shared-lib
+ version            string   int  version
+ -------            ------  ----- ----------
+ 0.89c ("beta 3")  0.89       89  1.0.89
+ 0.90  ("beta 4")  0.90       90  0.90
+ 0.95  ("beta 5")  0.95       95  0.95
+ 0.96  ("beta 6")  0.96       96  0.96
+ 0.97b ("beta 7")  1.00.97    97  1.0.1
+ 0.97c             0.97       97  2.0.97
+ 0.98              0.98       98  2.0.98
+ 0.99              0.99       98  2.0.99
+ 0.99a-m           0.99       99  2.0.99
+ 1.00              1.00      100  2.1.0
+ 1.0.0             1.0.0     100  2.1.0
+ 1.0.0   (from here on, the  100  2.1.0
+ 1.0.1    png.h string is  10001  2.1.0
+ 1.0.1a-e identical to the 10002  from here on, the
+ 1.0.2    source version)  10002  shared library is 2.V
+ 1.0.2a-b                  10003  where V is the source
+ 1.0.1                     10001  code version except as
+ 1.0.1a-e                  10002  2.1.0.1a-e   noted.
+ 1.0.2                     10002  2.1.0.2
+ 1.0.2a-b                  10003  2.1.0.2a-b
+ 1.0.3                     10003  2.1.0.3
+ 1.0.3a-d                  10004  2.1.0.3a-d
+ 1.0.4                     10004  2.1.0.4
+ 1.0.4a-f                  10005  2.1.0.4a-f
+ 1.0.5 (+ 2 patches)       10005  2.1.0.5
+ 1.0.5a-d                  10006  2.1.0.5a-d
+ 1.0.5e-r                  10100  2.1.0.5e-r
+ 1.0.5s-v                  10006  2.1.0.5s-v
+ 1.0.6 (+ 3 patches)       10006  2.1.0.6
+ 1.0.6d-g                  10007  2.1.0.6d-g
+ 1.0.6h                    10007  10.6h
+ 1.0.6i                    10007  10.6i
+ 1.0.6j                    10007  2.1.0.6j
+ 1.0.7beta11-14    DLLNUM  10007  2.1.0.7beta11-14
+ 1.0.7beta15-18       1    10007  2.1.0.7beta15-18
+ 1.0.7rc1-2           1    10007  2.1.0.7rc1-2
+ 1.0.7                1    10007  2.1.0.7
+ 1.0.8beta1-4         1    10008  2.1.0.8beta1-4
+ 1.0.8rc1             1    10008  2.1.0.8rc1
+ 1.0.8                1    10008  2.1.0.8
+ 1.0.9beta1-6         1    10009  2.1.0.9beta1-6
+ 1.0.9rc1             1    10009  2.1.0.9rc1
+ 1.0.9beta7-10        1    10009  2.1.0.9beta7-10
+ 1.0.9rc2             1    10009  2.1.0.9rc2
+ 1.0.9                1    10009  2.1.0.9
+ 1.0.10beta1          1    10010  2.1.0.10beta1
+ 1.0.10rc1            1    10010  2.1.0.10rc1
+ 1.0.10               1    10010  2.1.0.10
+ 1.0.11beta1-3        1    10011  2.1.0.11beta1-3
+ 1.0.11rc1            1    10011  2.1.0.11rc1
+ 1.0.11               1    10011  2.1.0.11
+ 1.0.12beta1-2        2    10012  2.1.0.12beta1-2
+ 1.0.12rc1            2    10012  2.1.0.12rc1
+ 1.0.12               2    10012  2.1.0.12
+ 1.1.0a-f             -    10100  2.1.1.0a-f abandoned
+ 1.2.0beta1-2         2    10200  2.1.2.0beta1-2
+ 1.2.0beta3-5         3    10200  3.1.2.0beta3-5
+ 1.2.0rc1             3    10200  3.1.2.0rc1
+ 1.2.0                3    10200  3.1.2.0
+ 1.2.1beta-4          3    10201  3.1.2.1beta1-4
+ 1.2.1rc1-2           3    10201  3.1.2.1rc1-2
+ 1.2.1                3    10201  3.1.2.1
+ 1.2.2beta1-6        12    10202  12.so.0.1.2.2beta1-6
+ 1.0.13beta1         10    10013  10.so.0.1.0.13beta1
+ 1.0.13rc1           10    10013  10.so.0.1.0.13rc1
+ 1.2.2rc1            12    10202  12.so.0.1.2.2rc1
+ 1.0.13              10    10013  10.so.0.1.0.13
+ 1.2.2               12    10202  12.so.0.1.2.2
+ 1.2.3rc1-6          12    10203  12.so.0.1.2.3rc1-6
+ 1.2.3               12    10203  12.so.0.1.2.3
+ 1.2.4beta1-3        13    10204  12.so.0.1.2.4beta1-3
+ 1.2.4rc1            13    10204  12.so.0.1.2.4rc1
+ 1.0.14              10    10014  10.so.0.1.0.14
+ 1.2.4               13    10204  12.so.0.1.2.4
+ 1.2.5beta1-2        13    10205  12.so.0.1.2.5beta1-2
+ 1.0.15rc1           10    10015  10.so.0.1.0.15rc1
+ 1.0.15              10    10015  10.so.0.1.0.15
+ 1.2.5               13    10205  12.so.0.1.2.5
+ 1.2.6beta1-4        13    10206  12.so.0.1.2.6beta1-4
+ 1.2.6rc1-5          13    10206  12.so.0.1.2.6rc1-5
+ 1.0.16              10    10016  10.so.0.1.0.16
+ 1.2.6               13    10206  12.so.0.1.2.6
+ 1.2.7beta1-2        13    10207  12.so.0.1.2.7beta1-2
+ 1.0.17rc1           10    10017  10.so.0.1.0.17rc1
+ 1.2.7rc1            13    10207  12.so.0.1.2.7rc1
+ 1.0.17              10    10017  10.so.0.1.0.17
+ 1.2.7               13    10207  12.so.0.1.2.7
+ 1.2.8beta1-5        13    10208  12.so.0.1.2.8beta1-5
+ 1.0.18rc1-5         10    10018  10.so.0.1.0.18rc1-5
+ 1.2.8rc1-5          13    10208  12.so.0.1.2.8rc1-5
+ 1.0.18              10    10018  10.so.0.1.0.18
+ 1.2.8               13    10208  12.so.0.1.2.8
+ 1.2.9beta1-3        13    10209  12.so.0.1.2.9beta1-3
+ 1.2.9beta4-11       13    10209  12.so.0.9[.0]
+ 1.2.9rc1            13    10209  12.so.0.9[.0]
+ 1.2.9               13    10209  12.so.0.9[.0]
+ 1.2.10beta1-8       13    10210  12.so.0.10[.0]
+ 1.2.10rc1-3         13    10210  12.so.0.10[.0]
+ 1.2.10              13    10210  12.so.0.10[.0]
+ 1.2.11beta1-4       13    10211  12.so.0.11[.0]
+ 1.0.19rc1-5         10    10019  10.so.0.19[.0]
+ 1.2.11rc1-5         13    10211  12.so.0.11[.0]
+ 1.0.19              10    10019  10.so.0.19[.0]
+ 1.2.11              13    10211  12.so.0.11[.0]
+ 1.0.20              10    10020  10.so.0.20[.0]
+ 1.2.12              13    10212  12.so.0.12[.0]
+ 1.2.13beta1         13    10213  12.so.0.13[.0]
+ 1.0.21              10    10021  10.so.0.21[.0]
+ 1.2.13              13    10213  12.so.0.13[.0]
+ 1.2.14beta1-2       13    10214  12.so.0.14[.0]
+ 1.0.22rc1           10    10022  10.so.0.22[.0]
+ 1.2.14rc1           13    10214  12.so.0.14[.0]
+ 1.2.15beta1-6       13    10215  12.so.0.15[.0]
+ 1.0.23rc1-5         10    10023  10.so.0.23[.0]
+ 1.2.15rc1-5         13    10215  12.so.0.15[.0]
+ 1.0.23              10    10023  10.so.0.23[.0]
+ 1.2.15              13    10215  12.so.0.15[.0]
+ 1.2.16beta1-2       13    10216  12.so.0.16[.0]
+ 1.2.16rc1           13    10216  12.so.0.16[.0]
+ 1.0.24              10    10024  10.so.0.24[.0]
+ 1.2.16              13    10216  12.so.0.16[.0]
+ 1.2.17beta1-2       13    10217  12.so.0.17[.0]
+ 1.0.25rc1           10    10025  10.so.0.25[.0]
+ 1.2.17rc1-3         13    10217  12.so.0.17[.0]
+ 1.0.25              10    10025  10.so.0.25[.0]
+ 1.2.17              13    10217  12.so.0.17[.0]
+ 1.0.26              10    10026  10.so.0.26[.0]
+ 1.2.18              13    10218  12.so.0.18[.0]
+ 1.2.19beta1-31      13    10219  12.so.0.19[.0]
+ 1.0.27rc1-6         10    10027  10.so.0.27[.0]
+ 1.2.19rc1-6         13    10219  12.so.0.19[.0]
+ 1.0.27              10    10027  10.so.0.27[.0]
+ 1.2.19              13    10219  12.so.0.19[.0]
+ 1.2.20beta01-04     13    10220  12.so.0.20[.0]
+ 1.0.28rc1-6         10    10028  10.so.0.28[.0]
+ 1.2.20rc1-6         13    10220  12.so.0.20[.0]
+ 1.0.28              10    10028  10.so.0.28[.0]
+ 1.2.20              13    10220  12.so.0.20[.0]
+ 1.2.21beta1-2       13    10221  12.so.0.21[.0]
+ 1.2.21rc1-3         13    10221  12.so.0.21[.0]
+ 1.0.29              10    10029  10.so.0.29[.0]
+ 1.2.21              13    10221  12.so.0.21[.0]
+ 1.2.22beta1-4       13    10222  12.so.0.22[.0]
+ 1.0.30rc1           13    10030  10.so.0.30[.0]
+ 1.2.22rc1           13    10222  12.so.0.22[.0]
+ 1.0.30              10    10030  10.so.0.30[.0]
+ 1.2.22              13    10222  12.so.0.22[.0]
+
+Henceforth the source version will match the shared-library minor
+and patch numbers; the shared-library major version number will be
+used for changes in backward compatibility, as it is intended.  The
+PNG_PNGLIB_VER macro, which is not used within libpng but is available
+for applications, is an unsigned integer of the form xyyzz corresponding
+to the source version x.y.z (leading zeros in y and z).  Beta versions
+were given the previous public release number plus a letter, until
+version 1.0.6j; from then on they were given the upcoming public
+release number plus "betaNN" or "rcN".
+
+.SH "SEE ALSO"
+.IR libpngpf(3) ", " png(5)
+.LP
+.IR libpng :
+.IP
+http://libpng.sourceforge.net (follow the [DOWNLOAD] link)
+http://www.libpng.org/pub/png
+
+.LP
+.IR zlib :
+.IP
+(generally) at the same location as
+.I libpng
+or at
+.br
+ftp://ftp.info-zip.org/pub/infozip/zlib
+
+.LP
+.IR PNG specification: RFC 2083
+.IP
+(generally) at the same location as
+.I libpng
+or at
+.br
+ftp://ds.internic.net/rfc/rfc2083.txt
+.br
+or (as a W3C Recommendation) at
+.br
+http://www.w3.org/TR/REC-png.html
+
+.LP
+In the case of any inconsistency between the PNG specification
+and this library, the specification takes precedence.
+
+.SH AUTHORS
+This man page: Glenn Randers-Pehrson
+<glennrp at users.sourceforge.net>
+
+The contributing authors would like to thank all those who helped
+with testing, bug fixes, and patience.  This wouldn't have been
+possible without all of you.
+
+Thanks to Frank J. T. Wojcik for helping with the documentation.
+
+Libpng version 1.2.22 - October 13, 2007:
+Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc.
+Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net).
+
+Supported by the PNG development group
+.br
+png-mng-implement at lists.sf.net
+(subscription required; visit
+png-mng-implement at lists.sourceforge.net (subscription required; visit
+https://lists.sourceforge.net/lists/listinfo/png-mng-implement
+to subscribe).
+
+.SH COPYRIGHT NOTICE, DISCLAIMER, and LICENSE:
+
+(This copy of the libpng notices is provided for your convenience.  In case of
+any discrepancy between this copy and the notices in the file png.h that is
+included in the libpng distribution, the latter shall prevail.)
+
+If you modify libpng you may insert additional notices immediately following
+this sentence.
+
+libpng versions 1.2.6, August 15, 2004, through 1.2.22, October 13, 2007, are
+Copyright (c) 2004,2006-2007 Glenn Randers-Pehrson, and are
+distributed according to the same disclaimer and license as libpng-1.2.5
+with the following individual added to the list of Contributing Authors
+
+   Cosmin Truta
+
+libpng versions 1.0.7, July 1, 2000, through 1.2.5 - October 3, 2002, are
+Copyright (c) 2000-2002 Glenn Randers-Pehrson, and are
+distributed according to the same disclaimer and license as libpng-1.0.6
+with the following individuals added to the list of Contributing Authors
+
+   Simon-Pierre Cadieux
+   Eric S. Raymond
+   Gilles Vollant
+
+and with the following additions to the disclaimer:
+
+   There is no warranty against interference with your
+   enjoyment of the library or against infringement.
+   There is no warranty that our efforts or the library
+   will fulfill any of your particular purposes or needs.
+   This library is provided with all faults, and the entire
+   risk of satisfactory quality, performance, accuracy, and
+   effort is with the user.
+
+libpng versions 0.97, January 1998, through 1.0.6, March 20, 2000, are
+Copyright (c) 1998, 1999 Glenn Randers-Pehrson
+Distributed according to the same disclaimer and license as libpng-0.96,
+with the following individuals added to the list of Contributing Authors:
+
+   Tom Lane
+   Glenn Randers-Pehrson
+   Willem van Schaik
+
+libpng versions 0.89, June 1996, through 0.96, May 1997, are
+Copyright (c) 1996, 1997 Andreas Dilger
+Distributed according to the same disclaimer and license as libpng-0.88,
+with the following individuals added to the list of Contributing Authors:
+
+   John Bowler
+   Kevin Bracey
+   Sam Bushell
+   Magnus Holmgren
+   Greg Roelofs
+   Tom Tanner
+
+libpng versions 0.5, May 1995, through 0.88, January 1996, are
+Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.
+
+For the purposes of this copyright and license, "Contributing Authors"
+is defined as the following set of individuals:
+
+   Andreas Dilger
+   Dave Martindale
+   Guy Eric Schalnat
+   Paul Schmidt
+   Tim Wegner
+
+The PNG Reference Library is supplied "AS IS".  The Contributing Authors
+and Group 42, Inc. disclaim all warranties, expressed or implied,
+including, without limitation, the warranties of merchantability and of
+fitness for any purpose.  The Contributing Authors and Group 42, Inc.
+assume no liability for direct, indirect, incidental, special, exemplary,
+or consequential damages, which may result from the use of the PNG
+Reference Library, even if advised of the possibility of such damage.
+
+Permission is hereby granted to use, copy, modify, and distribute this
+source code, or portions hereof, for any purpose, without fee, subject
+to the following restrictions:
+
+1. The origin of this source code must not be misrepresented.
+
+2. Altered versions must be plainly marked as such and
+   must not be misrepresented as being the original source.
+
+3. This Copyright notice may not be removed or altered from
+   any source or altered source distribution.
+
+The Contributing Authors and Group 42, Inc. specifically permit, without
+fee, and encourage the use of this source code as a component to
+supporting the PNG file format in commercial products.  If you use this
+source code in a product, acknowledgment is not required but would be
+appreciated.
+
+
+A "png_get_copyright" function is available, for convenient use in "about"
+boxes and the like:
+
+   printf("%s",png_get_copyright(NULL));
+
+Also, the PNG logo (in PNG format, of course) is supplied in the
+files "pngbar.png" and "pngbar.jpg (88x31) and "pngnow.png" (98x31).
+
+Libpng is OSI Certified Open Source Software.  OSI Certified Open Source is a
+certification mark of the Open Source Initiative.
+
+Glenn Randers-Pehrson
+glennrp at users.sourceforge.net
+October 13, 2007
+
+.\" end of man page
diff --git a/uppsrc/plugin/png/lib/libpngpf.3 b/uppsrc/plugin/png/lib/libpngpf.3
new file mode 100644
index 000000000..ef37c14a7
--- /dev/null
+++ b/uppsrc/plugin/png/lib/libpngpf.3
@@ -0,0 +1,274 @@
+.TH LIBPNGPF 3 "October 13, 2007"
+.SH NAME
+libpng \- Portable Network Graphics (PNG) Reference Library 1.2.22
+(private functions)
+.SH SYNOPSIS
+\fB#include <png.h>\fP
+
+\fBvoid png_build_gamma_table (png_structp \fIpng_ptr\fP\fB);\fP
+
+\fBvoid png_build_grayscale_palette (int \fP\fIbit_depth\fP\fB, png_colorp \fIpalette\fP\fB);\fP
+
+\fBvoid png_calculate_crc (png_structp \fP\fIpng_ptr\fP\fB, png_bytep \fP\fIptr\fP\fB, png_size_t \fIlength\fP\fB);\fP
+
+\fBvoid png_check_chunk_name (png_structp \fP\fIpng_ptr\fP\fB, png_bytep \fIchunk_name\fP\fB);\fP
+
+\fBpng_size_t png_check_keyword (png_structp \fP\fIpng_ptr\fP\fB, png_charp \fP\fIkey\fP\fB, png_charpp \fInew_key\fP\fB);\fP
+
+\fBvoid png_combine_row (png_structp \fP\fIpng_ptr\fP\fB, png_bytep \fP\fIrow\fP\fB, int \fImask\fP\fB);\fP
+
+\fBvoid png_correct_palette (png_structp \fP\fIpng_ptr\fP\fB, png_colorp \fP\fIpalette\fP\fB, int \fInum_palette\fP\fB);\fP
+
+\fBint png_crc_error (png_structp \fIpng_ptr\fP\fB);\fP
+
+\fBint png_crc_finish (png_structp \fP\fIpng_ptr\fP\fB, png_uint_32 \fIskip\fP\fB);\fP
+
+\fBvoid png_crc_read (png_structp \fP\fIpng_ptr\fP\fB, png_bytep \fP\fIbuf\fP\fB, png_size_t \fIlength\fP\fB);\fP
+
+\fBpng_voidp png_create_struct (int \fItype\fP\fB);\fP
+
+\fBpng_voidp png_create_struct_2 (int \fP\fItype\fP\fB, png_malloc_ptr \fP\fImalloc_fn\fP\fB, png_voidp \fImem_ptr\fP\fB);\fP
+
+\fBpng_charp png_decompress_chunk (png_structp \fP\fIpng_ptr\fP\fB, int \fP\fIcomp_type\fP\fB, png_charp \fP\fIchunkdata\fP\fB, png_size_t \fP\fIchunklength\fP\fB, png_size_t \fP\fIprefix_length\fP\fB, png_size_t \fI*data_length\fP\fB);\fP
+
+\fBvoid png_destroy_struct (png_voidp \fIstruct_ptr\fP\fB);\fP
+
+\fBvoid png_destroy_struct_2 (png_voidp \fP\fIstruct_ptr\fP\fB, png_free_ptr \fP\fIfree_fn\fP\fB, png_voidp \fImem_ptr\fP\fB);\fP
+
+\fBvoid png_do_background (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fP\fIrow\fP\fB, png_color_16p \fP\fItrans_values\fP\fB, png_color_16p \fP\fIbackground\fP\fB, png_color_16p \fP\fIbackground_1\fP\fB, png_bytep \fP\fIgamma_table\fP\fB, png_bytep \fP\fIgamma_from_1\fP\fB, png_bytep \fP\fIgamma_to_1\fP\fB, png_uint_16pp \fP\fIgamma_16\fP\fB, png_uint_16pp \fP\fIgamma_16_from_1\fP\fB, png_uint_16pp \fP\fIgamma_16_to_1\fP\fB, int \fIgamma_shift\fP\fB);\fP
+
+\fBvoid png_do_bgr (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fIrow\fP\fB);\fP
+
+\fBvoid png_do_chop (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fIrow\fP\fB);\fP
+
+\fBvoid png_do_dither (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fP\fIrow\fP\fB, png_bytep \fP\fIpalette_lookup\fP\fB, png_bytep \fIdither_lookup\fP\fB);\fP
+
+\fBvoid png_do_expand (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fP\fIrow\fP\fB, png_color_16p \fItrans_value\fP\fB);\fP
+
+\fBvoid png_do_expand_palette (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fP\fIrow\fP\fB, png_colorp \fP\fIpalette\fP\fB, png_bytep \fP\fItrans\fP\fB, int \fInum_trans\fP\fB);\fP
+
+\fBvoid png_do_gamma (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fP\fIrow\fP\fB, png_bytep \fP\fIgamma_table\fP\fB, png_uint_16pp \fP\fIgamma_16_table\fP\fB, int \fIgamma_shift\fP\fB);\fP
+
+\fBvoid png_do_gray_to_rgb (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fIrow\fP\fB);\fP
+
+\fBvoid png_do_invert (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fIrow\fP\fB);\fP
+
+\fBvoid png_do_pack (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fP\fIrow\fP\fB, png_uint_32 \fIbit_depth\fP\fB);\fP
+
+\fBvoid png_do_packswap (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fIrow\fP\fB);\fP
+
+\fBvoid png_do_read_filler (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fP\fIrow\fP\fB, png_uint_32 \fP\fIfiller\fP\fB, png_uint_32 \fIflags\fP\fB);\fP
+
+\fBvoid png_do_read_interlace (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fP\fIrow\fP\fB, int \fP\fIpass\fP\fB, png_uint_32 \fItransformations\fP\fB);\fP
+
+\fBvoid png_do_read_invert_alpha (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fIrow\fP\fB);\fP
+
+\fBvoid png_do_read_swap_alpha (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fIrow\fP\fB);\fP
+
+\fBvoid png_do_read_transformations (png_structp \fIpng_ptr\fP\fB);\fP
+
+\fBint png_do_rgb_to_gray (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fIrow\fP\fB);\fP
+
+\fBvoid png_do_shift (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fP\fIrow\fP\fB, png_color_8p \fIbit_depth\fP\fB);\fP
+
+\fBvoid png_do_strip_filler (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fP\fIrow\fP\fB, png_uint_32 \fIflags\fP\fB);\fP
+
+\fBvoid png_do_swap (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fIrow\fP\fB);\fP
+
+\fBvoid png_do_unpack (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fIrow\fP\fB);\fP
+
+\fBvoid png_do_unshift (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fP\fIrow\fP\fB, png_color_8p \fIsig_bits\fP\fB);\fP
+
+\fBvoid png_do_write_interlace (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fP\fIrow\fP\fB, int \fIpass\fP\fB);\fP
+
+\fBvoid png_do_write_invert_alpha (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fIrow\fP\fB);\fP
+
+\fBvoid png_do_write_swap_alpha (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fIrow\fP\fB);\fP
+
+\fBvoid png_do_write_transformations (png_structp \fIpng_ptr\fP\fB);\fP
+
+\fBvoid *png_far_to_near (png_structp png_ptr,png_voidp \fP\fIptr\fP\fB, int \fIcheck\fP\fB);\fP
+
+\fBvoid png_flush (png_structp \fIpng_ptr\fP\fB);\fP
+
+\fBvoid png_handle_bKGD (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP
+
+\fBvoid png_handle_cHRM (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP
+
+\fBvoid png_handle_gAMA (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP
+
+\fBvoid png_handle_hIST (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP
+
+\fBvoid png_handle_IEND (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP
+
+\fBvoid png_handle_IHDR (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP
+
+\fBvoid png_handle_iCCP (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP
+
+\fBvoid png_handle_iTXt (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP
+
+\fBvoid png_handle_oFFs (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP
+
+\fBvoid png_handle_pCAL (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP
+
+\fBvoid png_handle_pHYs (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP
+
+\fBvoid png_handle_PLTE (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP
+
+\fBvoid png_handle_sBIT (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP
+
+\fBvoid png_handle_sCAL (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP
+
+\fBvoid png_handle_sPLT (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP
+
+\fBvoid png_handle_sRGB (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP
+
+\fBvoid png_handle_tEXt (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP
+
+\fBvoid png_handle_tIME (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP
+
+\fBvoid png_handle_tRNS (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP
+
+\fBvoid png_handle_unknown (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP
+
+\fBvoid png_handle_zTXt (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP
+
+\fBvoid png_info_destroy (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
+
+\fBvoid png_init_mmx_flags (png_structp \fIpng_ptr\fP\fB);\fP
+
+\fBvoid png_init_read_transformations (png_structp \fIpng_ptr\fP\fB);\fP
+
+\fBvoid png_process_IDAT_data (png_structp \fP\fIpng_ptr\fP\fB, png_bytep \fP\fIbuffer\fP\fB, png_size_t \fIbuffer_length\fP\fB);\fP
+
+\fBvoid png_process_some_data (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
+
+\fBvoid png_push_check_crc (png_structp \fIpng_ptr\fP\fB);\fP
+
+\fBvoid png_push_crc_finish (png_structp \fIpng_ptr\fP\fB);\fP
+
+\fBvoid png_push_crc_skip (png_structp \fP\fIpng_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP
+
+\fBvoid png_push_fill_buffer (png_structp \fP\fIpng_ptr\fP\fB, png_bytep \fP\fIbuffer\fP\fB, png_size_t \fIlength\fP\fB);\fP
+
+\fBvoid png_push_handle_tEXt (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP
+
+\fBvoid png_push_handle_unknown (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP
+
+\fBvoid png_push_handle_zTXt (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP
+
+\fBvoid png_push_have_end (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
+
+\fBvoid png_push_have_info (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
+
+\fBvoid png_push_have_row (png_structp \fP\fIpng_ptr\fP\fB, png_bytep \fIrow\fP\fB);\fP
+
+\fBvoid png_push_process_row (png_structp \fIpng_ptr\fP\fB);\fP
+
+\fBvoid png_push_read_chunk (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
+
+\fBvoid png_push_read_end (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
+
+\fBvoid png_push_read_IDAT (png_structp \fIpng_ptr\fP\fB);\fP
+
+\fBvoid png_push_read_sig (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
+
+\fBvoid png_push_read_tEXt (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
+
+\fBvoid png_push_read_zTXt (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
+
+\fBvoid png_push_restore_buffer (png_structp \fP\fIpng_ptr\fP\fB, png_bytep \fP\fIbuffer\fP\fB, png_size_t \fIbuffer_length\fP\fB);\fP
+
+\fBvoid png_push_save_buffer (png_structp \fIpng_ptr\fP\fB);\fP
+
+\fBvoid png_read_data (png_structp \fP\fIpng_ptr\fP\fB, png_bytep \fP\fIdata\fP\fB, png_size_t \fIlength\fP\fB);\fP
+
+\fBvoid png_read_filter_row (png_structp \fP\fIpng_ptr\fP\fB, png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fP\fIrow\fP\fB, png_bytep \fP\fIprev_row\fP\fB, int \fIfilter\fP\fB);\fP
+
+\fBvoid png_read_finish_row (png_structp \fIpng_ptr\fP\fB);\fP
+
+\fBvoid png_read_push_finish_row (png_structp \fIpng_ptr\fP\fB);\fP
+
+\fBvoid png_read_start_row (png_structp \fIpng_ptr\fP\fB);\fP
+
+\fBvoid png_read_transform_info (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
+
+\fBvoid png_reset_crc (png_structp \fIpng_ptr\fP\fB);\fP
+
+\fBint png_set_text_2 (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_textp \fP\fItext_ptr\fP\fB, int \fInum_text\fP\fB);\fP
+
+\fBvoid png_write_cHRM (png_structp \fP\fIpng_ptr\fP\fB, double \fP\fIwhite_x\fP\fB, double \fP\fIwhite_y\fP\fB, double \fP\fIred_x\fP\fB, double \fP\fIred_y\fP\fB, double \fP\fIgreen_x\fP\fB, double \fP\fIgreen_y\fP\fB, double \fP\fIblue_x\fP\fB, double \fIblue_y\fP\fB);\fP
+
+\fBvoid png_write_cHRM_fixed (png_structp \fP\fIpng_ptr\fP\fB, png_uint_32 \fP\fIwhite_x\fP\fB, png_uint_32 \fP\fIwhite_y\fP\fB, png_uint_32 \fP\fIred_x\fP\fB, png_uint_32 \fP\fIred_y\fP\fB, png_uint_32 \fP\fIgreen_x\fP\fB, png_uint_32 \fP\fIgreen_y\fP\fB, png_uint_32 \fP\fIblue_x\fP\fB, png_uint_32 \fIblue_y\fP\fB);\fP
+
+\fBvoid png_write_data (png_structp \fP\fIpng_ptr\fP\fB, png_bytep \fP\fIdata\fP\fB, png_size_t \fIlength\fP\fB);\fP
+
+\fBvoid png_write_filtered_row (png_structp \fP\fIpng_ptr\fP\fB, png_bytep \fIfiltered_row\fP\fB);\fP
+
+\fBvoid png_write_find_filter (png_structp \fP\fIpng_ptr\fP\fB, png_row_infop \fIrow_info\fP\fB);\fP
+
+\fBvoid png_write_finish_row (png_structp \fIpng_ptr\fP\fB);\fP
+
+\fBvoid png_write_gAMA (png_structp \fP\fIpng_ptr\fP\fB, double \fIfile_gamma\fP\fB);\fP
+
+\fBvoid png_write_gAMA_fixed (png_structp \fP\fIpng_ptr\fP\fB, png_uint_32 \fIint_file_gamma\fP\fB);\fP
+
+\fBvoid png_write_hIST (png_structp \fP\fIpng_ptr\fP\fB, png_uint_16p \fP\fIhist\fP\fB, int \fInum_hist\fP\fB);\fP
+
+\fBvoid png_write_iCCP (png_structp \fP\fIpng_ptr\fP\fB, png_charp \fP\fIname\fP\fB, int \fP\fIcompression_type\fP\fB, png_charp \fP\fIprofile\fP\fB, int \fIproflen\fP\fB);\fP
+
+\fBvoid png_write_IDAT (png_structp \fP\fIpng_ptr\fP\fB, png_bytep \fP\fIdata\fP\fB, png_size_t \fIlength\fP\fB);\fP
+
+\fBvoid png_write_IEND (png_structp \fIpng_ptr\fP\fB);\fP
+
+\fBvoid png_write_IHDR (png_structp \fP\fIpng_ptr\fP\fB, png_uint_32 \fP\fIwidth\fP\fB, png_uint_32 \fP\fIheight\fP\fB, int \fP\fIbit_depth\fP\fB, int \fP\fIcolor_type\fP\fB, int \fP\fIcompression_type\fP\fB, int \fP\fIfilter_type\fP\fB, int \fIinterlace_type\fP\fB);\fP
+
+\fBvoid png_write_iTXt (png_structp \fP\fIpng_ptr\fP\fB, int \fP\fIcompression\fP\fB, png_charp \fP\fIkey\fP\fB, png_charp \fP\fIlang\fP\fB, png_charp \fP\fItranslated_key\fP\fB, png_charp \fItext\fP\fB);\fP
+
+\fBvoid png_write_oFFs (png_structp \fP\fIpng_ptr\fP\fB, png_uint_32 \fP\fIx_offset\fP\fB, png_uint_32 \fP\fIy_offset\fP\fB, int \fIunit_type\fP\fB);\fP
+
+\fBvoid png_write_pCAL (png_structp \fP\fIpng_ptr\fP\fB, png_charp \fP\fIpurpose\fP\fB, png_int_32 \fP\fIX0\fP\fB, png_int_32 \fP\fIX1\fP\fB, int \fP\fItype\fP\fB, int \fP\fInparams\fP\fB, png_charp \fP\fIunits\fP\fB, png_charpp \fIparams\fP\fB);\fP
+
+\fBvoid png_write_pHYs (png_structp \fP\fIpng_ptr\fP\fB, png_uint_32 \fP\fIx_pixels_per_unit\fP\fB, png_uint_32 \fP\fIy_pixels_per_unit\fP\fB, int \fIunit_type\fP\fB);\fP
+
+\fBvoid png_write_PLTE (png_structp \fP\fIpng_ptr\fP\fB, png_colorp \fP\fIpalette\fP\fB, png_uint_32 \fInum_pal\fP\fB);\fP
+
+\fBvoid png_write_sBIT (png_structp \fP\fIpng_ptr\fP\fB, png_color_8p \fP\fIsbit\fP\fB, int \fIcolor_type\fP\fB);\fP
+
+\fBvoid png_write_sCAL (png_structp \fP\fIpng_ptr\fP\fB, png_charp \fP\fIunit\fP\fB, double \fP\fIwidth\fP\fB, double \fIheight\fP\fB);\fP
+
+\fBvoid png_write_sCAL_s (png_structp \fP\fIpng_ptr\fP\fB, png_charp \fP\fIunit\fP\fB, png_charp \fP\fIwidth\fP\fB, png_charp \fIheight\fP\fB);\fP
+
+\fBvoid png_write_sig (png_structp \fIpng_ptr\fP\fB);\fP
+
+\fBvoid png_write_sRGB (png_structp \fP\fIpng_ptr\fP\fB, int \fIintent\fP\fB);\fP
+
+\fBvoid png_write_sPLT (png_structp \fP\fIpng_ptr\fP\fB, png_spalette_p \fIpalette\fP\fB);\fP
+
+\fBvoid png_write_start_row (png_structp \fIpng_ptr\fP\fB);\fP
+
+\fBvoid png_write_tEXt (png_structp \fP\fIpng_ptr\fP\fB, png_charp \fP\fIkey\fP\fB, png_charp \fP\fItext\fP\fB, png_size_t \fItext_len\fP\fB);\fP
+
+\fBvoid png_write_tIME (png_structp \fP\fIpng_ptr\fP\fB, png_timep \fImod_time\fP\fB);\fP
+
+\fBvoid png_write_tRNS (png_structp \fP\fIpng_ptr\fP\fB, png_bytep \fP\fItrans\fP\fB, png_color_16p \fP\fIvalues\fP\fB, int \fP\fInumber\fP\fB, int \fIcolor_type\fP\fB);\fP
+
+\fBvoid png_write_zTXt (png_structp \fP\fIpng_ptr\fP\fB, png_charp \fP\fIkey\fP\fB, png_charp \fP\fItext\fP\fB, png_size_t \fP\fItext_len\fP\fB, int \fIcompression\fP\fB);\fP
+
+\fBvoidpf png_zalloc (voidpf \fP\fIpng_ptr\fP\fB, uInt \fP\fIitems\fP\fB, uInt \fIsize\fP\fB);\fP
+
+\fBvoid png_zfree (voidpf \fP\fIpng_ptr\fP\fB, voidpf \fIptr\fP\fB);\fP
+
+\fI\fB
+
+.SH DESCRIPTION
+The functions listed above are used privately by libpng
+and are not recommended for use by applications.  They are
+not "exported" to applications using shared libraries.  They
+are listed alphabetically here as an aid to libpng maintainers.
+See png.h for more information on these functions.
+
+.SH SEE ALSO
+.IR libpng(3) ", " png(5)
+.SH AUTHOR
+Glenn Randers-Pehrson
diff --git a/uppsrc/plugin/png/lib/png.5 b/uppsrc/plugin/png/lib/png.5
new file mode 100644
index 000000000..edc6d7801
--- /dev/null
+++ b/uppsrc/plugin/png/lib/png.5
@@ -0,0 +1,73 @@
+.TH PNG 5 "October 13, 2007"
+.SH NAME
+png \- Portable Network Graphics (PNG) format
+.SH DESCRIPTION
+PNG (Portable Network Graphics) is an extensible file format for the
+lossless, portable, well-compressed storage of raster images. PNG provides
+a patent-free replacement for GIF and can also replace many
+common uses of TIFF. Indexed-color, grayscale, and truecolor images are
+supported, plus an optional alpha channel. Sample depths range from
+1 to 16 bits.
+.br
+
+PNG is designed to work well in online viewing applications, such as the
+World Wide Web, so it is fully streamable with a progressive display
+option. PNG is robust, providing both full file integrity checking and
+fast, simple detection of common transmission errors. Also, PNG can store
+gamma and chromaticity data for improved color matching on heterogeneous
+platforms.
+
+.SH "SEE ALSO"
+.IR libpng(3) ", " zlib(3) ", " deflate(5) ", and " zlib(5)
+.LP
+PNG specification (second edition), November 2003:
+.IP
+.br
+  <http://www.w3.org/TR/2003/REC-PNG-20031110/
+PNG 1.2 specification, July 1999:
+.IP
+.br
+http://www.libpng.org/pub/png
+.LP
+PNG 1.0 specification, October 1996:
+.IP
+.br
+RFC 2083
+.IP
+.br
+ftp://ds.internic.net/rfc/rfc2083.txt
+.br
+or (as a W3C Recommendation) at
+.br
+http://www.w3.org/TR/REC-png.html
+.SH AUTHORS
+This man page: Glenn Randers-Pehrson
+.LP
+Portable Network Graphics (PNG) Specification (Second Edition)
+Information technology - Computer graphics and image processing -
+Portable Network Graphics (PNG): Functional specification.
+ISO/IEC 15948:2003 (E) (November 10, 2003): David Duce and others.
+.LP
+Portable Network Graphics (PNG) Specification Version 1.2 (July 8, 1999):
+Glenn Randers-Pehrson and others (png-list).
+.LP
+Portable Network Graphics (PNG) Specification Version 1.0 (October 1, 1996):
+Thomas Boutell and others (png-list).
+.LP
+
+
+.SH COPYRIGHT NOTICE
+.LP
+This man page is Copyright (c) 1998-2006 Glenn Randers-Pehrson.  See png.h
+for conditions of use and distribution.
+.LP
+The PNG Specification (Second Edition) is
+Copyright (c) 2003 W3C. (MIT, ERCIM, Keio), All Rights Reserved.
+.LP
+The PNG-1.2 specification is copyright (c) 1999 Glenn Randers-Pehrson.
+See the specification for conditions of use and distribution.
+.LP
+The PNG-1.0 specification is copyright (c) 1996 Massachusetts Institute of
+Technology.  See the specification for conditions of use and distribution.
+.LP
+.\" end of man page
diff --git a/uppsrc/plugin/png/lib/png.c b/uppsrc/plugin/png/lib/png.c
new file mode 100644
index 000000000..40dd854a2
--- /dev/null
+++ b/uppsrc/plugin/png/lib/png.c
@@ -0,0 +1,798 @@
+
+/* png.c - location for general purpose libpng functions
+ *
+ * Last changed in libpng 1.2.21 October 4, 2007
+ * For conditions of distribution and use, see copyright notice in png.h
+ * Copyright (c) 1998-2007 Glenn Randers-Pehrson
+ * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
+ * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
+ */
+
+#define PNG_INTERNAL
+#define PNG_NO_EXTERN
+#include "png.h"
+
+/* Generate a compiler error if there is an old png.h in the search path. */
+typedef version_1_2_22 Your_png_h_is_not_version_1_2_22;
+
+/* Version information for C files.  This had better match the version
+ * string defined in png.h.  */
+
+#ifdef PNG_USE_GLOBAL_ARRAYS
+/* png_libpng_ver was changed to a function in version 1.0.5c */
+PNG_CONST char png_libpng_ver[18] = PNG_LIBPNG_VER_STRING;
+
+#ifdef PNG_READ_SUPPORTED
+
+/* png_sig was changed to a function in version 1.0.5c */
+/* Place to hold the signature string for a PNG file. */
+PNG_CONST png_byte FARDATA png_sig[8] = {137, 80, 78, 71, 13, 10, 26, 10};
+#endif /* PNG_READ_SUPPORTED */
+
+/* Invoke global declarations for constant strings for known chunk types */
+PNG_IHDR;
+PNG_IDAT;
+PNG_IEND;
+PNG_PLTE;
+PNG_bKGD;
+PNG_cHRM;
+PNG_gAMA;
+PNG_hIST;
+PNG_iCCP;
+PNG_iTXt;
+PNG_oFFs;
+PNG_pCAL;
+PNG_sCAL;
+PNG_pHYs;
+PNG_sBIT;
+PNG_sPLT;
+PNG_sRGB;
+PNG_tEXt;
+PNG_tIME;
+PNG_tRNS;
+PNG_zTXt;
+
+#ifdef PNG_READ_SUPPORTED
+/* arrays to facilitate easy interlacing - use pass (0 - 6) as index */
+
+/* start of interlace block */
+PNG_CONST int FARDATA png_pass_start[] = {0, 4, 0, 2, 0, 1, 0};
+
+/* offset to next interlace block */
+PNG_CONST int FARDATA png_pass_inc[] = {8, 8, 4, 4, 2, 2, 1};
+
+/* start of interlace block in the y direction */
+PNG_CONST int FARDATA png_pass_ystart[] = {0, 0, 4, 0, 2, 0, 1};
+
+/* offset to next interlace block in the y direction */
+PNG_CONST int FARDATA png_pass_yinc[] = {8, 8, 8, 4, 4, 2, 2};
+
+/* Height of interlace block.  This is not currently used - if you need
+ * it, uncomment it here and in png.h
+PNG_CONST int FARDATA png_pass_height[] = {8, 8, 4, 4, 2, 2, 1};
+*/
+
+/* Mask to determine which pixels are valid in a pass */
+PNG_CONST int FARDATA png_pass_mask[] = {0x80, 0x08, 0x88, 0x22, 0xaa, 0x55, 0xff};
+
+/* Mask to determine which pixels to overwrite while displaying */
+PNG_CONST int FARDATA png_pass_dsp_mask[]
+   = {0xff, 0x0f, 0xff, 0x33, 0xff, 0x55, 0xff};
+
+#endif /* PNG_READ_SUPPORTED */
+#endif /* PNG_USE_GLOBAL_ARRAYS */
+
+/* Tells libpng that we have already handled the first "num_bytes" bytes
+ * of the PNG file signature.  If the PNG data is embedded into another
+ * stream we can set num_bytes = 8 so that libpng will not attempt to read
+ * or write any of the magic bytes before it starts on the IHDR.
+ */
+
+#ifdef PNG_READ_SUPPORTED
+void PNGAPI
+png_set_sig_bytes(png_structp png_ptr, int num_bytes)
+{
+   if(png_ptr == NULL) return;
+   png_debug(1, "in png_set_sig_bytes\n");
+   if (num_bytes > 8)
+      png_error(png_ptr, "Too many bytes for PNG signature.");
+
+   png_ptr->sig_bytes = (png_byte)(num_bytes < 0 ? 0 : num_bytes);
+}
+
+/* Checks whether the supplied bytes match the PNG signature.  We allow
+ * checking less than the full 8-byte signature so that those apps that
+ * already read the first few bytes of a file to determine the file type
+ * can simply check the remaining bytes for extra assurance.  Returns
+ * an integer less than, equal to, or greater than zero if sig is found,
+ * respectively, to be less than, to match, or be greater than the correct
+ * PNG signature (this is the same behaviour as strcmp, memcmp, etc).
+ */
+int PNGAPI
+png_sig_cmp(png_bytep sig, png_size_t start, png_size_t num_to_check)
+{
+   png_byte png_signature[8] = {137, 80, 78, 71, 13, 10, 26, 10};
+   if (num_to_check > 8)
+      num_to_check = 8;
+   else if (num_to_check < 1)
+      return (-1);
+
+   if (start > 7)
+      return (-1);
+
+   if (start + num_to_check > 8)
+      num_to_check = 8 - start;
+
+   return ((int)(png_memcmp(&sig[start], &png_signature[start], num_to_check)));
+}
+
+#if defined(PNG_1_0_X) || defined(PNG_1_2_X)
+/* (Obsolete) function to check signature bytes.  It does not allow one
+ * to check a partial signature.  This function might be removed in the
+ * future - use png_sig_cmp().  Returns true (nonzero) if the file is PNG.
+ */
+int PNGAPI
+png_check_sig(png_bytep sig, int num)
+{
+  return ((int)!png_sig_cmp(sig, (png_size_t)0, (png_size_t)num));
+}
+#endif
+#endif /* PNG_READ_SUPPORTED */
+
+#if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED)
+/* Function to allocate memory for zlib and clear it to 0. */
+#ifdef PNG_1_0_X
+voidpf PNGAPI
+#else
+voidpf /* private */
+#endif
+png_zalloc(voidpf png_ptr, uInt items, uInt size)
+{
+   png_voidp ptr;
+   png_structp p=(png_structp)png_ptr;
+   png_uint_32 save_flags=p->flags;
+   png_uint_32 num_bytes;
+
+   if(png_ptr == NULL) return (NULL);
+   if (items > PNG_UINT_32_MAX/size)
+   {
+     png_warning (p, "Potential overflow in png_zalloc()");
+     return (NULL);
+   }
+   num_bytes = (png_uint_32)items * size;
+
+   p->flags|=PNG_FLAG_MALLOC_NULL_MEM_OK;
+   ptr = (png_voidp)png_malloc((png_structp)png_ptr, num_bytes);
+   p->flags=save_flags;
+
+#if defined(PNG_1_0_X) && !defined(PNG_NO_ZALLOC_ZERO)
+   if (ptr == NULL)
+       return ((voidpf)ptr);
+
+   if (num_bytes > (png_uint_32)0x8000L)
+   {
+      png_memset(ptr, 0, (png_size_t)0x8000L);
+      png_memset((png_bytep)ptr + (png_size_t)0x8000L, 0,
+         (png_size_t)(num_bytes - (png_uint_32)0x8000L));
+   }
+   else
+   {
+      png_memset(ptr, 0, (png_size_t)num_bytes);
+   }
+#endif
+   return ((voidpf)ptr);
+}
+
+/* function to free memory for zlib */
+#ifdef PNG_1_0_X
+void PNGAPI
+#else
+void /* private */
+#endif
+png_zfree(voidpf png_ptr, voidpf ptr)
+{
+   png_free((png_structp)png_ptr, (png_voidp)ptr);
+}
+
+/* Reset the CRC variable to 32 bits of 1's.  Care must be taken
+ * in case CRC is > 32 bits to leave the top bits 0.
+ */
+void /* PRIVATE */
+png_reset_crc(png_structp png_ptr)
+{
+   png_ptr->crc = crc32(0, Z_NULL, 0);
+}
+
+/* Calculate the CRC over a section of data.  We can only pass as
+ * much data to this routine as the largest single buffer size.  We
+ * also check that this data will actually be used before going to the
+ * trouble of calculating it.
+ */
+void /* PRIVATE */
+png_calculate_crc(png_structp png_ptr, png_bytep ptr, png_size_t length)
+{
+   int need_crc = 1;
+
+   if (png_ptr->chunk_name[0] & 0x20)                     /* ancillary */
+   {
+      if ((png_ptr->flags & PNG_FLAG_CRC_ANCILLARY_MASK) ==
+          (PNG_FLAG_CRC_ANCILLARY_USE | PNG_FLAG_CRC_ANCILLARY_NOWARN))
+         need_crc = 0;
+   }
+   else                                                    /* critical */
+   {
+      if (png_ptr->flags & PNG_FLAG_CRC_CRITICAL_IGNORE)
+         need_crc = 0;
+   }
+
+   if (need_crc)
+      png_ptr->crc = crc32(png_ptr->crc, ptr, (uInt)length);
+}
+
+/* Allocate the memory for an info_struct for the application.  We don't
+ * really need the png_ptr, but it could potentially be useful in the
+ * future.  This should be used in favour of malloc(png_sizeof(png_info))
+ * and png_info_init() so that applications that want to use a shared
+ * libpng don't have to be recompiled if png_info changes size.
+ */
+png_infop PNGAPI
+png_create_info_struct(png_structp png_ptr)
+{
+   png_infop info_ptr;
+
+   png_debug(1, "in png_create_info_struct\n");
+   if(png_ptr == NULL) return (NULL);
+#ifdef PNG_USER_MEM_SUPPORTED
+   info_ptr = (png_infop)png_create_struct_2(PNG_STRUCT_INFO,
+      png_ptr->malloc_fn, png_ptr->mem_ptr);
+#else
+   info_ptr = (png_infop)png_create_struct(PNG_STRUCT_INFO);
+#endif
+   if (info_ptr != NULL)
+      png_info_init_3(&info_ptr, png_sizeof(png_info));
+
+   return (info_ptr);
+}
+
+/* This function frees the memory associated with a single info struct.
+ * Normally, one would use either png_destroy_read_struct() or
+ * png_destroy_write_struct() to free an info struct, but this may be
+ * useful for some applications.
+ */
+void PNGAPI
+png_destroy_info_struct(png_structp png_ptr, png_infopp info_ptr_ptr)
+{
+   png_infop info_ptr = NULL;
+   if(png_ptr == NULL) return;
+
+   png_debug(1, "in png_destroy_info_struct\n");
+   if (info_ptr_ptr != NULL)
+      info_ptr = *info_ptr_ptr;
+
+   if (info_ptr != NULL)
+   {
+      png_info_destroy(png_ptr, info_ptr);
+
+#ifdef PNG_USER_MEM_SUPPORTED
+      png_destroy_struct_2((png_voidp)info_ptr, png_ptr->free_fn,
+          png_ptr->mem_ptr);
+#else
+      png_destroy_struct((png_voidp)info_ptr);
+#endif
+      *info_ptr_ptr = NULL;
+   }
+}
+
+/* Initialize the info structure.  This is now an internal function (0.89)
+ * and applications using it are urged to use png_create_info_struct()
+ * instead.
+ */
+#if defined(PNG_1_0_X) || defined(PNG_1_2_X)
+#undef png_info_init
+void PNGAPI
+png_info_init(png_infop info_ptr)
+{
+   /* We only come here via pre-1.0.12-compiled applications */
+   png_info_init_3(&info_ptr, 0);
+}
+#endif
+
+void PNGAPI
+png_info_init_3(png_infopp ptr_ptr, png_size_t png_info_struct_size)
+{
+   png_infop info_ptr = *ptr_ptr;
+
+   if(info_ptr == NULL) return;
+
+   png_debug(1, "in png_info_init_3\n");
+
+   if(png_sizeof(png_info) > png_info_struct_size)
+     {
+       png_destroy_struct(info_ptr);
+       info_ptr = (png_infop)png_create_struct(PNG_STRUCT_INFO);
+       *ptr_ptr = info_ptr;
+     }
+
+   /* set everything to 0 */
+   png_memset(info_ptr, 0, png_sizeof (png_info));
+}
+
+#ifdef PNG_FREE_ME_SUPPORTED
+void PNGAPI
+png_data_freer(png_structp png_ptr, png_infop info_ptr,
+   int freer, png_uint_32 mask)
+{
+   png_debug(1, "in png_data_freer\n");
+   if (png_ptr == NULL || info_ptr == NULL)
+      return;
+   if(freer == PNG_DESTROY_WILL_FREE_DATA)
+      info_ptr->free_me |= mask;
+   else if(freer == PNG_USER_WILL_FREE_DATA)
+      info_ptr->free_me &= ~mask;
+   else
+      png_warning(png_ptr,
+         "Unknown freer parameter in png_data_freer.");
+}
+#endif
+
+void PNGAPI
+png_free_data(png_structp png_ptr, png_infop info_ptr, png_uint_32 mask,
+   int num)
+{
+   png_debug(1, "in png_free_data\n");
+   if (png_ptr == NULL || info_ptr == NULL)
+      return;
+
+#if defined(PNG_TEXT_SUPPORTED)
+/* free text item num or (if num == -1) all text items */
+#ifdef PNG_FREE_ME_SUPPORTED
+if ((mask & PNG_FREE_TEXT) & info_ptr->free_me)
+#else
+if (mask & PNG_FREE_TEXT)
+#endif
+{
+   if (num != -1)
+   {
+     if (info_ptr->text && info_ptr->text[num].key)
+     {
+         png_free(png_ptr, info_ptr->text[num].key);
+         info_ptr->text[num].key = NULL;
+     }
+   }
+   else
+   {
+       int i;
+       for (i = 0; i < info_ptr->num_text; i++)
+           png_free_data(png_ptr, info_ptr, PNG_FREE_TEXT, i);
+       png_free(png_ptr, info_ptr->text);
+       info_ptr->text = NULL;
+       info_ptr->num_text=0;
+   }
+}
+#endif
+
+#if defined(PNG_tRNS_SUPPORTED)
+/* free any tRNS entry */
+#ifdef PNG_FREE_ME_SUPPORTED
+if ((mask & PNG_FREE_TRNS) & info_ptr->free_me)
+#else
+if ((mask & PNG_FREE_TRNS) && (png_ptr->flags & PNG_FLAG_FREE_TRNS))
+#endif
+{
+    png_free(png_ptr, info_ptr->trans);
+    info_ptr->valid &= ~PNG_INFO_tRNS;
+#ifndef PNG_FREE_ME_SUPPORTED
+    png_ptr->flags &= ~PNG_FLAG_FREE_TRNS;
+#endif
+    info_ptr->trans = NULL;
+}
+#endif
+
+#if defined(PNG_sCAL_SUPPORTED)
+/* free any sCAL entry */
+#ifdef PNG_FREE_ME_SUPPORTED
+if ((mask & PNG_FREE_SCAL) & info_ptr->free_me)
+#else
+if (mask & PNG_FREE_SCAL)
+#endif
+{
+#if defined(PNG_FIXED_POINT_SUPPORTED) && !defined(PNG_FLOATING_POINT_SUPPORTED)
+    png_free(png_ptr, info_ptr->scal_s_width);
+    png_free(png_ptr, info_ptr->scal_s_height);
+    info_ptr->scal_s_width = NULL;
+    info_ptr->scal_s_height = NULL;
+#endif
+    info_ptr->valid &= ~PNG_INFO_sCAL;
+}
+#endif
+
+#if defined(PNG_pCAL_SUPPORTED)
+/* free any pCAL entry */
+#ifdef PNG_FREE_ME_SUPPORTED
+if ((mask & PNG_FREE_PCAL) & info_ptr->free_me)
+#else
+if (mask & PNG_FREE_PCAL)
+#endif
+{
+    png_free(png_ptr, info_ptr->pcal_purpose);
+    png_free(png_ptr, info_ptr->pcal_units);
+    info_ptr->pcal_purpose = NULL;
+    info_ptr->pcal_units = NULL;
+    if (info_ptr->pcal_params != NULL)
+    {
+        int i;
+        for (i = 0; i < (int)info_ptr->pcal_nparams; i++)
+        {
+          png_free(png_ptr, info_ptr->pcal_params[i]);
+          info_ptr->pcal_params[i]=NULL;
+        }
+        png_free(png_ptr, info_ptr->pcal_params);
+        info_ptr->pcal_params = NULL;
+    }
+    info_ptr->valid &= ~PNG_INFO_pCAL;
+}
+#endif
+
+#if defined(PNG_iCCP_SUPPORTED)
+/* free any iCCP entry */
+#ifdef PNG_FREE_ME_SUPPORTED
+if ((mask & PNG_FREE_ICCP) & info_ptr->free_me)
+#else
+if (mask & PNG_FREE_ICCP)
+#endif
+{
+    png_free(png_ptr, info_ptr->iccp_name);
+    png_free(png_ptr, info_ptr->iccp_profile);
+    info_ptr->iccp_name = NULL;
+    info_ptr->iccp_profile = NULL;
+    info_ptr->valid &= ~PNG_INFO_iCCP;
+}
+#endif
+
+#if defined(PNG_sPLT_SUPPORTED)
+/* free a given sPLT entry, or (if num == -1) all sPLT entries */
+#ifdef PNG_FREE_ME_SUPPORTED
+if ((mask & PNG_FREE_SPLT) & info_ptr->free_me)
+#else
+if (mask & PNG_FREE_SPLT)
+#endif
+{
+   if (num != -1)
+   {
+      if(info_ptr->splt_palettes)
+      {
+          png_free(png_ptr, info_ptr->splt_palettes[num].name);
+          png_free(png_ptr, info_ptr->splt_palettes[num].entries);
+          info_ptr->splt_palettes[num].name = NULL;
+          info_ptr->splt_palettes[num].entries = NULL;
+      }
+   }
+   else
+   {
+       if(info_ptr->splt_palettes_num)
+       {
+         int i;
+         for (i = 0; i < (int)info_ptr->splt_palettes_num; i++)
+            png_free_data(png_ptr, info_ptr, PNG_FREE_SPLT, i);
+
+         png_free(png_ptr, info_ptr->splt_palettes);
+         info_ptr->splt_palettes = NULL;
+         info_ptr->splt_palettes_num = 0;
+       }
+       info_ptr->valid &= ~PNG_INFO_sPLT;
+   }
+}
+#endif
+
+#if defined(PNG_UNKNOWN_CHUNKS_SUPPORTED)
+  if(png_ptr->unknown_chunk.data)
+  {
+    png_free(png_ptr, png_ptr->unknown_chunk.data);
+    png_ptr->unknown_chunk.data = NULL;
+  }
+#ifdef PNG_FREE_ME_SUPPORTED
+if ((mask & PNG_FREE_UNKN) & info_ptr->free_me)
+#else
+if (mask & PNG_FREE_UNKN)
+#endif
+{
+   if (num != -1)
+   {
+       if(info_ptr->unknown_chunks)
+       {
+          png_free(png_ptr, info_ptr->unknown_chunks[num].data);
+          info_ptr->unknown_chunks[num].data = NULL;
+       }
+   }
+   else
+   {
+       int i;
+
+       if(info_ptr->unknown_chunks_num)
+       {
+         for (i = 0; i < (int)info_ptr->unknown_chunks_num; i++)
+            png_free_data(png_ptr, info_ptr, PNG_FREE_UNKN, i);
+
+         png_free(png_ptr, info_ptr->unknown_chunks);
+         info_ptr->unknown_chunks = NULL;
+         info_ptr->unknown_chunks_num = 0;
+       }
+   }
+}
+#endif
+
+#if defined(PNG_hIST_SUPPORTED)
+/* free any hIST entry */
+#ifdef PNG_FREE_ME_SUPPORTED
+if ((mask & PNG_FREE_HIST)  & info_ptr->free_me)
+#else
+if ((mask & PNG_FREE_HIST) && (png_ptr->flags & PNG_FLAG_FREE_HIST))
+#endif
+{
+    png_free(png_ptr, info_ptr->hist);
+    info_ptr->hist = NULL;
+    info_ptr->valid &= ~PNG_INFO_hIST;
+#ifndef PNG_FREE_ME_SUPPORTED
+    png_ptr->flags &= ~PNG_FLAG_FREE_HIST;
+#endif
+}
+#endif
+
+/* free any PLTE entry that was internally allocated */
+#ifdef PNG_FREE_ME_SUPPORTED
+if ((mask & PNG_FREE_PLTE) & info_ptr->free_me)
+#else
+if ((mask & PNG_FREE_PLTE) && (png_ptr->flags & PNG_FLAG_FREE_PLTE))
+#endif
+{
+    png_zfree(png_ptr, info_ptr->palette);
+    info_ptr->palette = NULL;
+    info_ptr->valid &= ~PNG_INFO_PLTE;
+#ifndef PNG_FREE_ME_SUPPORTED
+    png_ptr->flags &= ~PNG_FLAG_FREE_PLTE;
+#endif
+    info_ptr->num_palette = 0;
+}
+
+#if defined(PNG_INFO_IMAGE_SUPPORTED)
+/* free any image bits attached to the info structure */
+#ifdef PNG_FREE_ME_SUPPORTED
+if ((mask & PNG_FREE_ROWS) & info_ptr->free_me)
+#else
+if (mask & PNG_FREE_ROWS)
+#endif
+{
+    if(info_ptr->row_pointers)
+    {
+       int row;
+       for (row = 0; row < (int)info_ptr->height; row++)
+       {
+          png_free(png_ptr, info_ptr->row_pointers[row]);
+          info_ptr->row_pointers[row]=NULL;
+       }
+       png_free(png_ptr, info_ptr->row_pointers);
+       info_ptr->row_pointers=NULL;
+    }
+    info_ptr->valid &= ~PNG_INFO_IDAT;
+}
+#endif
+
+#ifdef PNG_FREE_ME_SUPPORTED
+   if(num == -1)
+     info_ptr->free_me &= ~mask;
+   else
+     info_ptr->free_me &= ~(mask & ~PNG_FREE_MUL);
+#endif
+}
+
+/* This is an internal routine to free any memory that the info struct is
+ * pointing to before re-using it or freeing the struct itself.  Recall
+ * that png_free() checks for NULL pointers for us.
+ */
+void /* PRIVATE */
+png_info_destroy(png_structp png_ptr, png_infop info_ptr)
+{
+   png_debug(1, "in png_info_destroy\n");
+
+   png_free_data(png_ptr, info_ptr, PNG_FREE_ALL, -1);
+
+#if defined(PNG_UNKNOWN_CHUNKS_SUPPORTED)
+   if (png_ptr->num_chunk_list)
+   {
+       png_free(png_ptr, png_ptr->chunk_list);
+       png_ptr->chunk_list=NULL;
+       png_ptr->num_chunk_list=0;
+   }
+#endif
+
+   png_info_init_3(&info_ptr, png_sizeof(png_info));
+}
+#endif /* defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED) */
+
+/* This function returns a pointer to the io_ptr associated with the user
+ * functions.  The application should free any memory associated with this
+ * pointer before png_write_destroy() or png_read_destroy() are called.
+ */
+png_voidp PNGAPI
+png_get_io_ptr(png_structp png_ptr)
+{
+   if(png_ptr == NULL) return (NULL);
+   return (png_ptr->io_ptr);
+}
+
+#if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED)
+#if !defined(PNG_NO_STDIO)
+/* Initialize the default input/output functions for the PNG file.  If you
+ * use your own read or write routines, you can call either png_set_read_fn()
+ * or png_set_write_fn() instead of png_init_io().  If you have defined
+ * PNG_NO_STDIO, you must use a function of your own because "FILE *" isn't
+ * necessarily available.
+ */
+void PNGAPI
+png_init_io(png_structp png_ptr, png_FILE_p fp)
+{
+   png_debug(1, "in png_init_io\n");
+   if(png_ptr == NULL) return;
+   png_ptr->io_ptr = (png_voidp)fp;
+}
+#endif
+
+#if defined(PNG_TIME_RFC1123_SUPPORTED)
+/* Convert the supplied time into an RFC 1123 string suitable for use in
+ * a "Creation Time" or other text-based time string.
+ */
+png_charp PNGAPI
+png_convert_to_rfc1123(png_structp png_ptr, png_timep ptime)
+{
+   static PNG_CONST char short_months[12][4] =
+        {"Jan", "Feb", "Mar", "Apr", "May", "Jun",
+         "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"};
+
+   if(png_ptr == NULL) return (NULL);
+   if (png_ptr->time_buffer == NULL)
+   {
+      png_ptr->time_buffer = (png_charp)png_malloc(png_ptr, (png_uint_32)(29*
+         png_sizeof(char)));
+   }
+
+#if defined(_WIN32_WCE)
+   {
+      wchar_t time_buf[29];
+      wsprintf(time_buf, TEXT("%d %S %d %02d:%02d:%02d +0000"),
+          ptime->day % 32, short_months[(ptime->month - 1) % 12],
+        ptime->year, ptime->hour % 24, ptime->minute % 60,
+          ptime->second % 61);
+      WideCharToMultiByte(CP_ACP, 0, time_buf, -1, png_ptr->time_buffer, 29,
+          NULL, NULL);
+   }
+#else
+#ifdef USE_FAR_KEYWORD
+   {
+      char near_time_buf[29];
+      png_snprintf6(near_time_buf,29,"%d %s %d %02d:%02d:%02d +0000",
+          ptime->day % 32, short_months[(ptime->month - 1) % 12],
+          ptime->year, ptime->hour % 24, ptime->minute % 60,
+          ptime->second % 61);
+      png_memcpy(png_ptr->time_buffer, near_time_buf,
+          29*png_sizeof(char));
+   }
+#else
+   png_snprintf6(png_ptr->time_buffer,29,"%d %s %d %02d:%02d:%02d +0000",
+       ptime->day % 32, short_months[(ptime->month - 1) % 12],
+       ptime->year, ptime->hour % 24, ptime->minute % 60,
+       ptime->second % 61);
+#endif
+#endif /* _WIN32_WCE */
+   return ((png_charp)png_ptr->time_buffer);
+}
+#endif /* PNG_TIME_RFC1123_SUPPORTED */
+
+#endif /* defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED) */
+
+png_charp PNGAPI
+png_get_copyright(png_structp png_ptr)
+{
+   png_ptr = png_ptr;  /* silence compiler warning about unused png_ptr */
+   return ((png_charp) "\n libpng version 1.2.22 - October 13, 2007\n\
+   Copyright (c) 1998-2007 Glenn Randers-Pehrson\n\
+   Copyright (c) 1996-1997 Andreas Dilger\n\
+   Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.\n");
+}
+
+/* The following return the library version as a short string in the
+ * format 1.0.0 through 99.99.99zz.  To get the version of *.h files
+ * used with your application, print out PNG_LIBPNG_VER_STRING, which
+ * is defined in png.h.
+ * Note: now there is no difference between png_get_libpng_ver() and
+ * png_get_header_ver().  Due to the version_nn_nn_nn typedef guard,
+ * it is guaranteed that png.c uses the correct version of png.h.
+ */
+png_charp PNGAPI
+png_get_libpng_ver(png_structp png_ptr)
+{
+   /* Version of *.c files used when building libpng */
+   png_ptr = png_ptr;  /* silence compiler warning about unused png_ptr */
+   return ((png_charp) PNG_LIBPNG_VER_STRING);
+}
+
+png_charp PNGAPI
+png_get_header_ver(png_structp png_ptr)
+{
+   /* Version of *.h files used when building libpng */
+   png_ptr = png_ptr;  /* silence compiler warning about unused png_ptr */
+   return ((png_charp) PNG_LIBPNG_VER_STRING);
+}
+
+png_charp PNGAPI
+png_get_header_version(png_structp png_ptr)
+{
+   /* Returns longer string containing both version and date */
+   png_ptr = png_ptr;  /* silence compiler warning about unused png_ptr */
+   return ((png_charp) PNG_HEADER_VERSION_STRING
+#ifndef PNG_READ_SUPPORTED
+   "     (NO READ SUPPORT)"
+#endif
+   "\n");
+}
+
+#if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED)
+#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
+int PNGAPI
+png_handle_as_unknown(png_structp png_ptr, png_bytep chunk_name)
+{
+   /* check chunk_name and return "keep" value if it's on the list, else 0 */
+   int i;
+   png_bytep p;
+   if(png_ptr == NULL || chunk_name == NULL || png_ptr->num_chunk_list<=0)
+      return 0;
+   p=png_ptr->chunk_list+png_ptr->num_chunk_list*5-5;
+   for (i = png_ptr->num_chunk_list; i; i--, p-=5)
+      if (!png_memcmp(chunk_name, p, 4))
+        return ((int)*(p+4));
+   return 0;
+}
+#endif
+
+/* This function, added to libpng-1.0.6g, is untested. */
+int PNGAPI
+png_reset_zstream(png_structp png_ptr)
+{
+   if (png_ptr == NULL) return Z_STREAM_ERROR;
+   return (inflateReset(&png_ptr->zstream));
+}
+#endif /* defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED) */
+
+/* This function was added to libpng-1.0.7 */
+png_uint_32 PNGAPI
+png_access_version_number(void)
+{
+   /* Version of *.c files used when building libpng */
+   return((png_uint_32) PNG_LIBPNG_VER);
+}
+
+
+#if defined(PNG_READ_SUPPORTED) && defined(PNG_ASSEMBLER_CODE_SUPPORTED)
+#if !defined(PNG_1_0_X)
+/* this function was added to libpng 1.2.0 */
+int PNGAPI
+png_mmx_support(void)
+{
+   /* obsolete, to be removed from libpng-1.4.0 */
+    return -1;
+}
+#endif /* PNG_1_0_X */
+#endif /* PNG_READ_SUPPORTED && PNG_ASSEMBLER_CODE_SUPPORTED */
+
+#if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED)
+#ifdef PNG_SIZE_T
+/* Added at libpng version 1.2.6 */
+   PNG_EXTERN png_size_t PNGAPI png_convert_size PNGARG((size_t size));
+png_size_t PNGAPI
+png_convert_size(size_t size)
+{
+  if (size > (png_size_t)-1)
+     PNG_ABORT();  /* We haven't got access to png_ptr, so no png_error() */
+  return ((png_size_t)size);
+}
+#endif /* PNG_SIZE_T */
+#endif /* defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED) */
diff --git a/uppsrc/plugin/png/lib/png.h b/uppsrc/plugin/png/lib/png.h
new file mode 100644
index 000000000..732f6c11c
--- /dev/null
+++ b/uppsrc/plugin/png/lib/png.h
@@ -0,0 +1,3540 @@
+
+/* png.h - header file for PNG reference library
+ *
+ * libpng version 1.2.22 - October 13, 2007
+ * Copyright (c) 1998-2007 Glenn Randers-Pehrson
+ * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
+ * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
+ *
+ * Authors and maintainers:
+ *  libpng versions 0.71, May 1995, through 0.88, January 1996: Guy Schalnat
+ *  libpng versions 0.89c, June 1996, through 0.96, May 1997: Andreas Dilger
+ *  libpng versions 0.97, January 1998, through 1.2.22 - October 13, 2007: Glenn
+ *  See also "Contributing Authors", below.
+ *
+ * Note about libpng version numbers:
+ *
+ *    Due to various miscommunications, unforeseen code incompatibilities
+ *    and occasional factors outside the authors' control, version numbering
+ *    on the library has not always been consistent and straightforward.
+ *    The following table summarizes matters since version 0.89c, which was
+ *    the first widely used release:
+ *
+ *    source                 png.h  png.h  shared-lib
+ *    version                string   int  version
+ *    -------                ------ -----  ----------
+ *    0.89c "1.0 beta 3"     0.89      89  1.0.89
+ *    0.90  "1.0 beta 4"     0.90      90  0.90  [should have been 2.0.90]
+ *    0.95  "1.0 beta 5"     0.95      95  0.95  [should have been 2.0.95]
+ *    0.96  "1.0 beta 6"     0.96      96  0.96  [should have been 2.0.96]
+ *    0.97b "1.00.97 beta 7" 1.00.97   97  1.0.1 [should have been 2.0.97]
+ *    0.97c                  0.97      97  2.0.97
+ *    0.98                   0.98      98  2.0.98
+ *    0.99                   0.99      98  2.0.99
+ *    0.99a-m                0.99      99  2.0.99
+ *    1.00                   1.00     100  2.1.0 [100 should be 10000]
+ *    1.0.0      (from here on, the   100  2.1.0 [100 should be 10000]
+ *    1.0.1       png.h string is   10001  2.1.0
+ *    1.0.1a-e    identical to the  10002  from here on, the shared library
+ *    1.0.2       source version)   10002  is 2.V where V is the source code
+ *    1.0.2a-b                      10003  version, except as noted.
+ *    1.0.3                         10003
+ *    1.0.3a-d                      10004
+ *    1.0.4                         10004
+ *    1.0.4a-f                      10005
+ *    1.0.5 (+ 2 patches)           10005
+ *    1.0.5a-d                      10006
+ *    1.0.5e-r                      10100 (not source compatible)
+ *    1.0.5s-v                      10006 (not binary compatible)
+ *    1.0.6 (+ 3 patches)           10006 (still binary incompatible)
+ *    1.0.6d-f                      10007 (still binary incompatible)
+ *    1.0.6g                        10007
+ *    1.0.6h                        10007  10.6h (testing xy.z so-numbering)
+ *    1.0.6i                        10007  10.6i
+ *    1.0.6j                        10007  2.1.0.6j (incompatible with 1.0.0)
+ *    1.0.7beta11-14        DLLNUM  10007  2.1.0.7beta11-14 (binary compatible)
+ *    1.0.7beta15-18           1    10007  2.1.0.7beta15-18 (binary compatible)
+ *    1.0.7rc1-2               1    10007  2.1.0.7rc1-2 (binary compatible)
+ *    1.0.7                    1    10007  (still compatible)
+ *    1.0.8beta1-4             1    10008  2.1.0.8beta1-4
+ *    1.0.8rc1                 1    10008  2.1.0.8rc1
+ *    1.0.8                    1    10008  2.1.0.8
+ *    1.0.9beta1-6             1    10009  2.1.0.9beta1-6
+ *    1.0.9rc1                 1    10009  2.1.0.9rc1
+ *    1.0.9beta7-10            1    10009  2.1.0.9beta7-10
+ *    1.0.9rc2                 1    10009  2.1.0.9rc2
+ *    1.0.9                    1    10009  2.1.0.9
+ *    1.0.10beta1              1    10010  2.1.0.10beta1
+ *    1.0.10rc1                1    10010  2.1.0.10rc1
+ *    1.0.10                   1    10010  2.1.0.10
+ *    1.0.11beta1-3            1    10011  2.1.0.11beta1-3
+ *    1.0.11rc1                1    10011  2.1.0.11rc1
+ *    1.0.11                   1    10011  2.1.0.11
+ *    1.0.12beta1-2            2    10012  2.1.0.12beta1-2
+ *    1.0.12rc1                2    10012  2.1.0.12rc1
+ *    1.0.12                   2    10012  2.1.0.12
+ *    1.1.0a-f                 -    10100  2.1.1.0a-f (branch abandoned)
+ *    1.2.0beta1-2             2    10200  2.1.2.0beta1-2
+ *    1.2.0beta3-5             3    10200  3.1.2.0beta3-5
+ *    1.2.0rc1                 3    10200  3.1.2.0rc1
+ *    1.2.0                    3    10200  3.1.2.0
+ *    1.2.1beta1-4             3    10201  3.1.2.1beta1-4
+ *    1.2.1rc1-2               3    10201  3.1.2.1rc1-2
+ *    1.2.1                    3    10201  3.1.2.1
+ *    1.2.2beta1-6            12    10202  12.so.0.1.2.2beta1-6
+ *    1.0.13beta1             10    10013  10.so.0.1.0.13beta1
+ *    1.0.13rc1               10    10013  10.so.0.1.0.13rc1
+ *    1.2.2rc1                12    10202  12.so.0.1.2.2rc1
+ *    1.0.13                  10    10013  10.so.0.1.0.13
+ *    1.2.2                   12    10202  12.so.0.1.2.2
+ *    1.2.3rc1-6              12    10203  12.so.0.1.2.3rc1-6
+ *    1.2.3                   12    10203  12.so.0.1.2.3
+ *    1.2.4beta1-3            13    10204  12.so.0.1.2.4beta1-3
+ *    1.0.14rc1               13    10014  10.so.0.1.0.14rc1
+ *    1.2.4rc1                13    10204  12.so.0.1.2.4rc1
+ *    1.0.14                  10    10014  10.so.0.1.0.14
+ *    1.2.4                   13    10204  12.so.0.1.2.4
+ *    1.2.5beta1-2            13    10205  12.so.0.1.2.5beta1-2
+ *    1.0.15rc1-3             10    10015  10.so.0.1.0.15rc1-3
+ *    1.2.5rc1-3              13    10205  12.so.0.1.2.5rc1-3
+ *    1.0.15                  10    10015  10.so.0.1.0.15
+ *    1.2.5                   13    10205  12.so.0.1.2.5
+ *    1.2.6beta1-4            13    10206  12.so.0.1.2.6beta1-4
+ *    1.0.16                  10    10016  10.so.0.1.0.16
+ *    1.2.6                   13    10206  12.so.0.1.2.6
+ *    1.2.7beta1-2            13    10207  12.so.0.1.2.7beta1-2
+ *    1.0.17rc1               10    10017  10.so.0.1.0.17rc1
+ *    1.2.7rc1                13    10207  12.so.0.1.2.7rc1
+ *    1.0.17                  10    10017  10.so.0.1.0.17
+ *    1.2.7                   13    10207  12.so.0.1.2.7
+ *    1.2.8beta1-5            13    10208  12.so.0.1.2.8beta1-5
+ *    1.0.18rc1-5             10    10018  10.so.0.1.0.18rc1-5
+ *    1.2.8rc1-5              13    10208  12.so.0.1.2.8rc1-5
+ *    1.0.18                  10    10018  10.so.0.1.0.18
+ *    1.2.8                   13    10208  12.so.0.1.2.8
+ *    1.2.9beta1-3            13    10209  12.so.0.1.2.9beta1-3
+ *    1.2.9beta4-11           13    10209  12.so.0.9[.0]
+ *    1.2.9rc1                13    10209  12.so.0.9[.0]
+ *    1.2.9                   13    10209  12.so.0.9[.0]
+ *    1.2.10beta1-8           13    10210  12.so.0.10[.0]
+ *    1.2.10rc1-3             13    10210  12.so.0.10[.0]
+ *    1.2.10                  13    10210  12.so.0.10[.0]
+ *    1.2.11beta1-4           13    10211  12.so.0.11[.0]
+ *    1.0.19rc1-5             10    10019  10.so.0.19[.0]
+ *    1.2.11rc1-5             13    10211  12.so.0.11[.0]
+ *    1.0.19                  10    10019  10.so.0.19[.0]
+ *    1.2.11                  13    10211  12.so.0.11[.0]
+ *    1.0.20                  10    10020  10.so.0.20[.0]
+ *    1.2.12                  13    10212  12.so.0.12[.0]
+ *    1.2.13beta1             13    10213  12.so.0.13[.0]
+ *    1.0.21                  10    10021  10.so.0.21[.0]
+ *    1.2.13                  13    10213  12.so.0.13[.0]
+ *    1.2.14beta1-2           13    10214  12.so.0.14[.0]
+ *    1.0.22rc1               10    10022  10.so.0.22[.0]
+ *    1.2.14rc1               13    10214  12.so.0.14[.0]
+ *    1.0.22                  10    10022  10.so.0.22[.0]
+ *    1.2.14                  13    10214  12.so.0.14[.0]
+ *    1.2.15beta1-6           13    10215  12.so.0.15[.0]
+ *    1.0.23rc1-5             10    10023  10.so.0.23[.0]
+ *    1.2.15rc1-5             13    10215  12.so.0.15[.0]
+ *    1.0.23                  10    10023  10.so.0.23[.0]
+ *    1.2.15                  13    10215  12.so.0.15[.0]
+ *    1.2.16beta1-2           13    10216  12.so.0.16[.0]
+ *    1.2.16rc1               13    10216  12.so.0.16[.0]
+ *    1.0.24                  10    10024  10.so.0.24[.0]
+ *    1.2.16                  13    10216  12.so.0.16[.0]
+ *    1.2.17beta1-2           13    10217  12.so.0.17[.0]
+ *    1.0.25rc1               10    10025  10.so.0.25[.0]
+ *    1.2.17rc1-3             13    10217  12.so.0.17[.0]
+ *    1.0.25                  10    10025  10.so.0.25[.0]
+ *    1.2.17                  13    10217  12.so.0.17[.0]
+ *    1.0.26                  10    10026  10.so.0.26[.0]
+ *    1.2.18                  13    10218  12.so.0.18[.0]
+ *    1.2.19beta1-31          13    10219  12.so.0.19[.0]
+ *    1.0.27rc1-6             10    10027  10.so.0.27[.0]
+ *    1.2.19rc1-6             13    10219  12.so.0.19[.0]
+ *    1.0.27                  10    10027  10.so.0.27[.0]
+ *    1.2.19                  13    10219  12.so.0.19[.0]
+ *    1.2.20beta01-04         13    10220  12.so.0.20[.0]
+ *    1.0.28rc1-6             10    10028  10.so.0.28[.0]
+ *    1.2.20rc1-6             13    10220  12.so.0.20[.0]
+ *    1.0.28                  10    10028  10.so.0.28[.0]
+ *    1.2.20                  13    10220  12.so.0.20[.0]
+ *    1.2.21beta1-2           13    10221  12.so.0.21[.0]
+ *    1.2.21rc1-3             13    10221  12.so.0.21[.0]
+ *    1.0.29                  10    10029  10.so.0.29[.0]
+ *    1.2.21                  13    10221  12.so.0.21[.0]
+ *    1.2.22beta1-4           13    10222  12.so.0.22[.0]
+ *    1.0.30rc1               10    10030  10.so.0.30[.0]
+ *    1.2.22rc1               13    10222  12.so.0.22[.0]
+ *    1.0.30                  10    10030  10.so.0.30[.0]
+ *    1.2.22                  13    10222  12.so.0.22[.0]
+ *
+ *    Henceforth the source version will match the shared-library major
+ *    and minor numbers; the shared-library major version number will be
+ *    used for changes in backward compatibility, as it is intended.  The
+ *    PNG_LIBPNG_VER macro, which is not used within libpng but is available
+ *    for applications, is an unsigned integer of the form xyyzz corresponding
+ *    to the source version x.y.z (leading zeros in y and z).  Beta versions
+ *    were given the previous public release number plus a letter, until
+ *    version 1.0.6j; from then on they were given the upcoming public
+ *    release number plus "betaNN" or "rcN".
+ *
+ *    Binary incompatibility exists only when applications make direct access
+ *    to the info_ptr or png_ptr members through png.h, and the compiled
+ *    application is loaded with a different version of the library.
+ *
+ *    DLLNUM will change each time there are forward or backward changes
+ *    in binary compatibility (e.g., when a new feature is added).
+ *
+ * See libpng.txt or libpng.3 for more information.  The PNG specification
+ * is available as a W3C Recommendation and as an ISO Specification,
+ * <http://www.w3.org/TR/2003/REC-PNG-20031110/
+ */
+
+/*
+ * COPYRIGHT NOTICE, DISCLAIMER, and LICENSE:
+ *
+ * If you modify libpng you may insert additional notices immediately following
+ * this sentence.
+ *
+ * libpng versions 1.2.6, August 15, 2004, through 1.2.22, October 13, 2007, are
+ * Copyright (c) 2004, 2006-2007 Glenn Randers-Pehrson, and are
+ * distributed according to the same disclaimer and license as libpng-1.2.5
+ * with the following individual added to the list of Contributing Authors:
+ *
+ *    Cosmin Truta
+ *
+ * libpng versions 1.0.7, July 1, 2000, through 1.2.5, October 3, 2002, are
+ * Copyright (c) 2000-2002 Glenn Randers-Pehrson, and are
+ * distributed according to the same disclaimer and license as libpng-1.0.6
+ * with the following individuals added to the list of Contributing Authors:
+ *
+ *    Simon-Pierre Cadieux
+ *    Eric S. Raymond
+ *    Gilles Vollant
+ *
+ * and with the following additions to the disclaimer:
+ *
+ *    There is no warranty against interference with your enjoyment of the
+ *    library or against infringement.  There is no warranty that our
+ *    efforts or the library will fulfill any of your particular purposes
+ *    or needs.  This library is provided with all faults, and the entire
+ *    risk of satisfactory quality, performance, accuracy, and effort is with
+ *    the user.
+ *
+ * libpng versions 0.97, January 1998, through 1.0.6, March 20, 2000, are
+ * Copyright (c) 1998, 1999, 2000 Glenn Randers-Pehrson, and are
+ * distributed according to the same disclaimer and license as libpng-0.96,
+ * with the following individuals added to the list of Contributing Authors:
+ *
+ *    Tom Lane
+ *    Glenn Randers-Pehrson
+ *    Willem van Schaik
+ *
+ * libpng versions 0.89, June 1996, through 0.96, May 1997, are
+ * Copyright (c) 1996, 1997 Andreas Dilger
+ * Distributed according to the same disclaimer and license as libpng-0.88,
+ * with the following individuals added to the list of Contributing Authors:
+ *
+ *    John Bowler
+ *    Kevin Bracey
+ *    Sam Bushell
+ *    Magnus Holmgren
+ *    Greg Roelofs
+ *    Tom Tanner
+ *
+ * libpng versions 0.5, May 1995, through 0.88, January 1996, are
+ * Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.
+ *
+ * For the purposes of this copyright and license, "Contributing Authors"
+ * is defined as the following set of individuals:
+ *
+ *    Andreas Dilger
+ *    Dave Martindale
+ *    Guy Eric Schalnat
+ *    Paul Schmidt
+ *    Tim Wegner
+ *
+ * The PNG Reference Library is supplied "AS IS".  The Contributing Authors
+ * and Group 42, Inc. disclaim all warranties, expressed or implied,
+ * including, without limitation, the warranties of merchantability and of
+ * fitness for any purpose.  The Contributing Authors and Group 42, Inc.
+ * assume no liability for direct, indirect, incidental, special, exemplary,
+ * or consequential damages, which may result from the use of the PNG
+ * Reference Library, even if advised of the possibility of such damage.
+ *
+ * Permission is hereby granted to use, copy, modify, and distribute this
+ * source code, or portions hereof, for any purpose, without fee, subject
+ * to the following restrictions:
+ *
+ * 1. The origin of this source code must not be misrepresented.
+ *
+ * 2. Altered versions must be plainly marked as such and
+ * must not be misrepresented as being the original source.
+ *
+ * 3. This Copyright notice may not be removed or altered from
+ *    any source or altered source distribution.
+ *
+ * The Contributing Authors and Group 42, Inc. specifically permit, without
+ * fee, and encourage the use of this source code as a component to
+ * supporting the PNG file format in commercial products.  If you use this
+ * source code in a product, acknowledgment is not required but would be
+ * appreciated.
+ */
+
+/*
+ * A "png_get_copyright" function is available, for convenient use in "about"
+ * boxes and the like:
+ *
+ * printf("%s",png_get_copyright(NULL));
+ *
+ * Also, the PNG logo (in PNG format, of course) is supplied in the
+ * files "pngbar.png" and "pngbar.jpg (88x31) and "pngnow.png" (98x31).
+ */
+
+/*
+ * Libpng is OSI Certified Open Source Software.  OSI Certified is a
+ * certification mark of the Open Source Initiative.
+ */
+
+/*
+ * The contributing authors would like to thank all those who helped
+ * with testing, bug fixes, and patience.  This wouldn't have been
+ * possible without all of you.
+ *
+ * Thanks to Frank J. T. Wojcik for helping with the documentation.
+ */
+
+/*
+ * Y2K compliance in libpng:
+ * =========================
+ *
+ *    October 13, 2007
+ *
+ *    Since the PNG Development group is an ad-hoc body, we can't make
+ *    an official declaration.
+ *
+ *    This is your unofficial assurance that libpng from version 0.71 and
+ *    upward through 1.2.22 are Y2K compliant.  It is my belief that earlier
+ *    versions were also Y2K compliant.
+ *
+ *    Libpng only has three year fields.  One is a 2-byte unsigned integer
+ *    that will hold years up to 65535.  The other two hold the date in text
+ *    format, and will hold years up to 9999.
+ *
+ *    The integer is
+ *        "png_uint_16 year" in png_time_struct.
+ *
+ *    The strings are
+ *        "png_charp time_buffer" in png_struct and
+ *        "near_time_buffer", which is a local character string in png.c.
+ *
+ *    There are seven time-related functions:
+ *        png.c: png_convert_to_rfc_1123() in png.c
+ *          (formerly png_convert_to_rfc_1152() in error)
+ *        png_convert_from_struct_tm() in pngwrite.c, called in pngwrite.c
+ *        png_convert_from_time_t() in pngwrite.c
+ *        png_get_tIME() in pngget.c
+ *        png_handle_tIME() in pngrutil.c, called in pngread.c
+ *        png_set_tIME() in pngset.c
+ *        png_write_tIME() in pngwutil.c, called in pngwrite.c
+ *
+ *    All handle dates properly in a Y2K environment.  The
+ *    png_convert_from_time_t() function calls gmtime() to convert from system
+ *    clock time, which returns (year - 1900), which we properly convert to
+ *    the full 4-digit year.  There is a possibility that applications using
+ *    libpng are not passing 4-digit years into the png_convert_to_rfc_1123()
+ *    function, or that they are incorrectly passing only a 2-digit year
+ *    instead of "year - 1900" into the png_convert_from_struct_tm() function,
+ *    but this is not under our control.  The libpng documentation has always
+ *    stated that it works with 4-digit years, and the APIs have been
+ *    documented as such.
+ *
+ *    The tIME chunk itself is also Y2K compliant.  It uses a 2-byte unsigned
+ *    integer to hold the year, and can hold years as large as 65535.
+ *
+ *    zlib, upon which libpng depends, is also Y2K compliant.  It contains
+ *    no date-related code.
+ *
+ *       Glenn Randers-Pehrson
+ *       libpng maintainer
+ *       PNG Development Group
+ */
+
+#ifndef PNG_H
+#define PNG_H
+
+/* This is not the place to learn how to use libpng.  The file libpng.txt
+ * describes how to use libpng, and the file example.c summarizes it
+ * with some code on which to build.  This file is useful for looking
+ * at the actual function definitions and structure components.
+ */
+
+/* Version information for png.h - this should match the version in png.c */
+#define PNG_LIBPNG_VER_STRING "1.2.22"
+#define PNG_HEADER_VERSION_STRING \
+   " libpng version 1.2.22 - October 13, 2007\n"
+
+#define PNG_LIBPNG_VER_SONUM   0
+#define PNG_LIBPNG_VER_DLLNUM  13
+
+/* These should match the first 3 components of PNG_LIBPNG_VER_STRING: */
+#define PNG_LIBPNG_VER_MAJOR   1
+#define PNG_LIBPNG_VER_MINOR   2
+#define PNG_LIBPNG_VER_RELEASE 22
+/* This should match the numeric part of the final component of
+ * PNG_LIBPNG_VER_STRING, omitting any leading zero: */
+
+#define PNG_LIBPNG_VER_BUILD  0
+
+/* Release Status */
+#define PNG_LIBPNG_BUILD_ALPHA    1
+#define PNG_LIBPNG_BUILD_BETA     2
+#define PNG_LIBPNG_BUILD_RC       3
+#define PNG_LIBPNG_BUILD_STABLE   4
+#define PNG_LIBPNG_BUILD_RELEASE_STATUS_MASK 7
+
+/* Release-Specific Flags */
+#define PNG_LIBPNG_BUILD_PATCH    8 /* Can be OR'ed with
+                                       PNG_LIBPNG_BUILD_STABLE only */
+#define PNG_LIBPNG_BUILD_PRIVATE 16 /* Cannot be OR'ed with
+                                       PNG_LIBPNG_BUILD_SPECIAL */
+#define PNG_LIBPNG_BUILD_SPECIAL 32 /* Cannot be OR'ed with
+                                       PNG_LIBPNG_BUILD_PRIVATE */
+
+#define PNG_LIBPNG_BUILD_BASE_TYPE PNG_LIBPNG_BUILD_STABLE
+
+/* Careful here.  At one time, Guy wanted to use 082, but that would be octal.
+ * We must not include leading zeros.
+ * Versions 0.7 through 1.0.0 were in the range 0 to 100 here (only
+ * version 1.0.0 was mis-numbered 100 instead of 10000).  From
+ * version 1.0.1 it's    xxyyzz, where x=major, y=minor, z=release */
+#define PNG_LIBPNG_VER 10222 /* 1.2.22 */
+
+#ifndef PNG_VERSION_INFO_ONLY
+/* include the compression library's header */
+#include <plugin/z/lib/zlib.h>
+#endif
+
+/* include all user configurable info, including optional assembler routines */
+#include "pngconf.h"
+
+/*
+ * Added at libpng-1.2.8 */
+/* Ref MSDN: Private as priority over Special
+ * VS_FF_PRIVATEBUILD File *was not* built using standard release
+ * procedures. If this value is given, the StringFileInfo block must
+ * contain a PrivateBuild string.
+ *
+ * VS_FF_SPECIALBUILD File *was* built by the original company using
+ * standard release procedures but is a variation of the standard
+ * file of the same version number. If this value is given, the
+ * StringFileInfo block must contain a SpecialBuild string.
+ */
+
+#if defined(PNG_USER_PRIVATEBUILD)
+#  define PNG_LIBPNG_BUILD_TYPE \
+          (PNG_LIBPNG_BUILD_BASE_TYPE | PNG_LIBPNG_BUILD_PRIVATE)
+#else
+#  if defined(PNG_LIBPNG_SPECIALBUILD)
+#    define PNG_LIBPNG_BUILD_TYPE \
+            (PNG_LIBPNG_BUILD_BASE_TYPE | PNG_LIBPNG_BUILD_SPECIAL)
+#  else
+#    define PNG_LIBPNG_BUILD_TYPE (PNG_LIBPNG_BUILD_BASE_TYPE)
+#  endif
+#endif
+
+#ifndef PNG_VERSION_INFO_ONLY
+
+/* Inhibit C++ name-mangling for libpng functions but not for system calls. */
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+/* This file is arranged in several sections.  The first section contains
+ * structure and type definitions.  The second section contains the external
+ * library functions, while the third has the internal library functions,
+ * which applications aren't expected to use directly.
+ */
+
+#ifndef PNG_NO_TYPECAST_NULL
+#define int_p_NULL                (int *)NULL
+#define png_bytep_NULL            (png_bytep)NULL
+#define png_bytepp_NULL           (png_bytepp)NULL
+#define png_doublep_NULL          (png_doublep)NULL
+#define png_error_ptr_NULL        (png_error_ptr)NULL
+#define png_flush_ptr_NULL        (png_flush_ptr)NULL
+#define png_free_ptr_NULL         (png_free_ptr)NULL
+#define png_infopp_NULL           (png_infopp)NULL
+#define png_malloc_ptr_NULL       (png_malloc_ptr)NULL
+#define png_read_status_ptr_NULL  (png_read_status_ptr)NULL
+#define png_rw_ptr_NULL           (png_rw_ptr)NULL
+#define png_structp_NULL          (png_structp)NULL
+#define png_uint_16p_NULL         (png_uint_16p)NULL
+#define png_voidp_NULL            (png_voidp)NULL
+#define png_write_status_ptr_NULL (png_write_status_ptr)NULL
+#else
+#define int_p_NULL                NULL
+#define png_bytep_NULL            NULL
+#define png_bytepp_NULL           NULL
+#define png_doublep_NULL          NULL
+#define png_error_ptr_NULL        NULL
+#define png_flush_ptr_NULL        NULL
+#define png_free_ptr_NULL         NULL
+#define png_infopp_NULL           NULL
+#define png_malloc_ptr_NULL       NULL
+#define png_read_status_ptr_NULL  NULL
+#define png_rw_ptr_NULL           NULL
+#define png_structp_NULL          NULL
+#define png_uint_16p_NULL         NULL
+#define png_voidp_NULL            NULL
+#define png_write_status_ptr_NULL NULL
+#endif
+
+/* variables declared in png.c - only it needs to define PNG_NO_EXTERN */
+#if !defined(PNG_NO_EXTERN) || defined(PNG_ALWAYS_EXTERN)
+/* Version information for C files, stored in png.c.  This had better match
+ * the version above.
+ */
+#ifdef PNG_USE_GLOBAL_ARRAYS
+PNG_EXPORT_VAR (PNG_CONST char) png_libpng_ver[18];
+  /* need room for 99.99.99beta99z */
+#else
+#define png_libpng_ver png_get_header_ver(NULL)
+#endif
+
+#ifdef PNG_USE_GLOBAL_ARRAYS
+/* This was removed in version 1.0.5c */
+/* Structures to facilitate easy interlacing.  See png.c for more details */
+PNG_EXPORT_VAR (PNG_CONST int FARDATA) png_pass_start[7];
+PNG_EXPORT_VAR (PNG_CONST int FARDATA) png_pass_inc[7];
+PNG_EXPORT_VAR (PNG_CONST int FARDATA) png_pass_ystart[7];
+PNG_EXPORT_VAR (PNG_CONST int FARDATA) png_pass_yinc[7];
+PNG_EXPORT_VAR (PNG_CONST int FARDATA) png_pass_mask[7];
+PNG_EXPORT_VAR (PNG_CONST int FARDATA) png_pass_dsp_mask[7];
+/* This isn't currently used.  If you need it, see png.c for more details.
+PNG_EXPORT_VAR (PNG_CONST int FARDATA) png_pass_height[7];
+*/
+#endif
+
+#endif /* PNG_NO_EXTERN */
+
+/* Three color definitions.  The order of the red, green, and blue, (and the
+ * exact size) is not important, although the size of the fields need to
+ * be png_byte or png_uint_16 (as defined below).
+ */
+typedef struct png_color_struct
+{
+   png_byte red;
+   png_byte green;
+   png_byte blue;
+} png_color;
+typedef png_color FAR * png_colorp;
+typedef png_color FAR * FAR * png_colorpp;
+
+typedef struct png_color_16_struct
+{
+   png_byte index;    /* used for palette files */
+   png_uint_16 red;   /* for use in red green blue files */
+   png_uint_16 green;
+   png_uint_16 blue;
+   png_uint_16 gray;  /* for use in grayscale files */
+} png_color_16;
+typedef png_color_16 FAR * png_color_16p;
+typedef png_color_16 FAR * FAR * png_color_16pp;
+
+typedef struct png_color_8_struct
+{
+   png_byte red;   /* for use in red green blue files */
+   png_byte green;
+   png_byte blue;
+   png_byte gray;  /* for use in grayscale files */
+   png_byte alpha; /* for alpha channel files */
+} png_color_8;
+typedef png_color_8 FAR * png_color_8p;
+typedef png_color_8 FAR * FAR * png_color_8pp;
+
+/*
+ * The following two structures are used for the in-core representation
+ * of sPLT chunks.
+ */
+typedef struct png_sPLT_entry_struct
+{
+   png_uint_16 red;
+   png_uint_16 green;
+   png_uint_16 blue;
+   png_uint_16 alpha;
+   png_uint_16 frequency;
+} png_sPLT_entry;
+typedef png_sPLT_entry FAR * png_sPLT_entryp;
+typedef png_sPLT_entry FAR * FAR * png_sPLT_entrypp;
+
+/*  When the depth of the sPLT palette is 8 bits, the color and alpha samples
+ *  occupy the LSB of their respective members, and the MSB of each member
+ *  is zero-filled.  The frequency member always occupies the full 16 bits.
+ */
+
+typedef struct png_sPLT_struct
+{
+   png_charp name;           /* palette name */
+   png_byte depth;           /* depth of palette samples */
+   png_sPLT_entryp entries;  /* palette entries */
+   png_int_32 nentries;      /* number of palette entries */
+} png_sPLT_t;
+typedef png_sPLT_t FAR * png_sPLT_tp;
+typedef png_sPLT_t FAR * FAR * png_sPLT_tpp;
+
+#ifdef PNG_TEXT_SUPPORTED
+/* png_text holds the contents of a text/ztxt/itxt chunk in a PNG file,
+ * and whether that contents is compressed or not.  The "key" field
+ * points to a regular zero-terminated C string.  The "text", "lang", and
+ * "lang_key" fields can be regular C strings, empty strings, or NULL pointers.
+ * However, the * structure returned by png_get_text() will always contain
+ * regular zero-terminated C strings (possibly empty), never NULL pointers,
+ * so they can be safely used in printf() and other string-handling functions.
+ */
+typedef struct png_text_struct
+{
+   int  compression;       /* compression value:
+                             -1: tEXt, none
+                              0: zTXt, deflate
+                              1: iTXt, none
+                              2: iTXt, deflate  */
+   png_charp key;          /* keyword, 1-79 character description of "text" */
+   png_charp text;         /* comment, may be an empty string (ie "")
+                              or a NULL pointer */
+   png_size_t text_length; /* length of the text string */
+#ifdef PNG_iTXt_SUPPORTED
+   png_size_t itxt_length; /* length of the itxt string */
+   png_charp lang;         /* language code, 0-79 characters
+                              or a NULL pointer */
+   png_charp lang_key;     /* keyword translated UTF-8 string, 0 or more
+                              chars or a NULL pointer */
+#endif
+} png_text;
+typedef png_text FAR * png_textp;
+typedef png_text FAR * FAR * png_textpp;
+#endif
+
+/* Supported compression types for text in PNG files (tEXt, and zTXt).
+ * The values of the PNG_TEXT_COMPRESSION_ defines should NOT be changed. */
+#define PNG_TEXT_COMPRESSION_NONE_WR -3
+#define PNG_TEXT_COMPRESSION_zTXt_WR -2
+#define PNG_TEXT_COMPRESSION_NONE    -1
+#define PNG_TEXT_COMPRESSION_zTXt     0
+#define PNG_ITXT_COMPRESSION_NONE     1
+#define PNG_ITXT_COMPRESSION_zTXt     2
+#define PNG_TEXT_COMPRESSION_LAST     3  /* Not a valid value */
+
+/* png_time is a way to hold the time in an machine independent way.
+ * Two conversions are provided, both from time_t and struct tm.  There
+ * is no portable way to convert to either of these structures, as far
+ * as I know.  If you know of a portable way, send it to me.  As a side
+ * note - PNG has always been Year 2000 compliant!
+ */
+typedef struct png_time_struct
+{
+   png_uint_16 year; /* full year, as in, 1995 */
+   png_byte month;   /* month of year, 1 - 12 */
+   png_byte day;     /* day of month, 1 - 31 */
+   png_byte hour;    /* hour of day, 0 - 23 */
+   png_byte minute;  /* minute of hour, 0 - 59 */
+   png_byte second;  /* second of minute, 0 - 60 (for leap seconds) */
+} png_time;
+typedef png_time FAR * png_timep;
+typedef png_time FAR * FAR * png_timepp;
+
+#if defined(PNG_UNKNOWN_CHUNKS_SUPPORTED)
+/* png_unknown_chunk is a structure to hold queued chunks for which there is
+ * no specific support.  The idea is that we can use this to queue
+ * up private chunks for output even though the library doesn't actually
+ * know about their semantics.
+ */
+typedef struct png_unknown_chunk_t
+{
+    png_byte name[5];
+    png_byte *data;
+    png_size_t size;
+
+    /* libpng-using applications should NOT directly modify this byte. */
+    png_byte location; /* mode of operation at read time */
+}
+png_unknown_chunk;
+typedef png_unknown_chunk FAR * png_unknown_chunkp;
+typedef png_unknown_chunk FAR * FAR * png_unknown_chunkpp;
+#endif
+
+/* png_info is a structure that holds the information in a PNG file so
+ * that the application can find out the characteristics of the image.
+ * If you are reading the file, this structure will tell you what is
+ * in the PNG file.  If you are writing the file, fill in the information
+ * you want to put into the PNG file, then call png_write_info().
+ * The names chosen should be very close to the PNG specification, so
+ * consult that document for information about the meaning of each field.
+ *
+ * With libpng < 0.95, it was only possible to directly set and read the
+ * the values in the png_info_struct, which meant that the contents and
+ * order of the values had to remain fixed.  With libpng 0.95 and later,
+ * however, there are now functions that abstract the contents of
+ * png_info_struct from the application, so this makes it easier to use
+ * libpng with dynamic libraries, and even makes it possible to use
+ * libraries that don't have all of the libpng ancillary chunk-handing
+ * functionality.
+ *
+ * In any case, the order of the parameters in png_info_struct should NOT
+ * be changed for as long as possible to keep compatibility with applications
+ * that use the old direct-access method with png_info_struct.
+ *
+ * The following members may have allocated storage attached that should be
+ * cleaned up before the structure is discarded: palette, trans, text,
+ * pcal_purpose, pcal_units, pcal_params, hist, iccp_name, iccp_profile,
+ * splt_palettes, scal_unit, row_pointers, and unknowns.   By default, these
+ * are automatically freed when the info structure is deallocated, if they were
+ * allocated internally by libpng.  This behavior can be changed by means
+ * of the png_data_freer() function.
+ *
+ * More allocation details: all the chunk-reading functions that
+ * change these members go through the corresponding png_set_*
+ * functions.  A function to clear these members is available: see
+ * png_free_data().  The png_set_* functions do not depend on being
+ * able to point info structure members to any of the storage they are
+ * passed (they make their own copies), EXCEPT that the png_set_text
+ * functions use the same storage passed to them in the text_ptr or
+ * itxt_ptr structure argument, and the png_set_rows and png_set_unknowns
+ * functions do not make their own copies.
+ */
+typedef struct png_info_struct
+{
+   /* the following are necessary for every PNG file */
+   png_uint_32 width;       /* width of image in pixels (from IHDR) */
+   png_uint_32 height;      /* height of image in pixels (from IHDR) */
+   png_uint_32 valid;       /* valid chunk data (see PNG_INFO_ below) */
+   png_uint_32 rowbytes;    /* bytes needed to hold an untransformed row */
+   png_colorp palette;      /* array of color values (valid & PNG_INFO_PLTE) */
+   png_uint_16 num_palette; /* number of color entries in "palette" (PLTE) */
+   png_uint_16 num_trans;   /* number of transparent palette color (tRNS) */
+   png_byte bit_depth;      /* 1, 2, 4, 8, or 16 bits/channel (from IHDR) */
+   png_byte color_type;     /* see PNG_COLOR_TYPE_ below (from IHDR) */
+   /* The following three should have been named *_method not *_type */
+   png_byte compression_type; /* must be PNG_COMPRESSION_TYPE_BASE (IHDR) */
+   png_byte filter_type;    /* must be PNG_FILTER_TYPE_BASE (from IHDR) */
+   png_byte interlace_type; /* One of PNG_INTERLACE_NONE, PNG_INTERLACE_ADAM7 */
+
+   /* The following is informational only on read, and not used on writes. */
+   png_byte channels;       /* number of data channels per pixel (1, 2, 3, 4) */
+   png_byte pixel_depth;    /* number of bits per pixel */
+   png_byte spare_byte;     /* to align the data, and for future use */
+   png_byte signature[8];   /* magic bytes read by libpng from start of file */
+
+   /* The rest of the data is optional.  If you are reading, check the
+    * valid field to see if the information in these are valid.  If you
+    * are writing, set the valid field to those chunks you want written,
+    * and initialize the appropriate fields below.
+    */
+
+#if defined(PNG_gAMA_SUPPORTED) && defined(PNG_FLOATING_POINT_SUPPORTED)
+   /* The gAMA chunk describes the gamma characteristics of the system
+    * on which the image was created, normally in the range [1.0, 2.5].
+    * Data is valid if (valid & PNG_INFO_gAMA) is non-zero.
+    */
+   float gamma; /* gamma value of image, if (valid & PNG_INFO_gAMA) */
+#endif
+
+#if defined(PNG_sRGB_SUPPORTED)
+    /* GR-P, 0.96a */
+    /* Data valid if (valid & PNG_INFO_sRGB) non-zero. */
+   png_byte srgb_intent; /* sRGB rendering intent [0, 1, 2, or 3] */
+#endif
+
+#if defined(PNG_TEXT_SUPPORTED)
+   /* The tEXt, and zTXt chunks contain human-readable textual data in
+    * uncompressed, compressed, and optionally compressed forms, respectively.
+    * The data in "text" is an array of pointers to uncompressed,
+    * null-terminated C strings. Each chunk has a keyword that describes the
+    * textual data contained in that chunk.  Keywords are not required to be
+    * unique, and the text string may be empty.  Any number of text chunks may
+    * be in an image.
+    */
+   int num_text; /* number of comments read/to write */
+   int max_text; /* current size of text array */
+   png_textp text; /* array of comments read/to write */
+#endif /* PNG_TEXT_SUPPORTED */
+
+#if defined(PNG_tIME_SUPPORTED)
+   /* The tIME chunk holds the last time the displayed image data was
+    * modified.  See the png_time struct for the contents of this struct.
+    */
+   png_time mod_time;
+#endif
+
+#if defined(PNG_sBIT_SUPPORTED)
+   /* The sBIT chunk specifies the number of significant high-order bits
+    * in the pixel data.  Values are in the range [1, bit_depth], and are
+    * only specified for the channels in the pixel data.  The contents of
+    * the low-order bits is not specified.  Data is valid if
+    * (valid & PNG_INFO_sBIT) is non-zero.
+    */
+   png_color_8 sig_bit; /* significant bits in color channels */
+#endif
+
+#if defined(PNG_tRNS_SUPPORTED) || defined(PNG_READ_EXPAND_SUPPORTED) || \
+defined(PNG_READ_BACKGROUND_SUPPORTED)
+   /* The tRNS chunk supplies transparency data for paletted images and
+    * other image types that don't need a full alpha channel.  There are
+    * "num_trans" transparency values for a paletted image, stored in the
+    * same order as the palette colors, starting from index 0.  Values
+    * for the data are in the range [0, 255], ranging from fully transparent
+    * to fully opaque, respectively.  For non-paletted images, there is a
+    * single color specified that should be treated as fully transparent.
+    * Data is valid if (valid & PNG_INFO_tRNS) is non-zero.
+    */
+   png_bytep trans; /* transparent values for paletted image */
+   png_color_16 trans_values; /* transparent color for non-palette image */
+#endif
+
+#if defined(PNG_bKGD_SUPPORTED) || defined(PNG_READ_BACKGROUND_SUPPORTED)
+   /* The bKGD chunk gives the suggested image background color if the
+    * display program does not have its own background color and the image
+    * is needs to composited onto a background before display.  The colors
+    * in "background" are normally in the same color space/depth as the
+    * pixel data.  Data is valid if (valid & PNG_INFO_bKGD) is non-zero.
+    */
+   png_color_16 background;
+#endif
+
+#if defined(PNG_oFFs_SUPPORTED)
+   /* The oFFs chunk gives the offset in "offset_unit_type" units rightwards
+    * and downwards from the top-left corner of the display, page, or other
+    * application-specific co-ordinate space.  See the PNG_OFFSET_ defines
+    * below for the unit types.  Valid if (valid & PNG_INFO_oFFs) non-zero.
+    */
+   png_int_32 x_offset; /* x offset on page */
+   png_int_32 y_offset; /* y offset on page */
+   png_byte offset_unit_type; /* offset units type */
+#endif
+
+#if defined(PNG_pHYs_SUPPORTED)
+   /* The pHYs chunk gives the physical pixel density of the image for
+    * display or printing in "phys_unit_type" units (see PNG_RESOLUTION_
+    * defines below).  Data is valid if (valid & PNG_INFO_pHYs) is non-zero.
+    */
+   png_uint_32 x_pixels_per_unit; /* horizontal pixel density */
+   png_uint_32 y_pixels_per_unit; /* vertical pixel density */
+   png_byte phys_unit_type; /* resolution type (see PNG_RESOLUTION_ below) */
+#endif
+
+#if defined(PNG_hIST_SUPPORTED)
+   /* The hIST chunk contains the relative frequency or importance of the
+    * various palette entries, so that a viewer can intelligently select a
+    * reduced-color palette, if required.  Data is an array of "num_palette"
+    * values in the range [0,65535]. Data valid if (valid & PNG_INFO_hIST)
+    * is non-zero.
+    */
+   png_uint_16p hist;
+#endif
+
+#ifdef PNG_cHRM_SUPPORTED
+   /* The cHRM chunk describes the CIE color characteristics of the monitor
+    * on which the PNG was created.  This data allows the viewer to do gamut
+    * mapping of the input image to ensure that the viewer sees the same
+    * colors in the image as the creator.  Values are in the range
+    * [0.0, 0.8].  Data valid if (valid & PNG_INFO_cHRM) non-zero.
+    */
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+   float x_white;
+   float y_white;
+   float x_red;
+   float y_red;
+   float x_green;
+   float y_green;
+   float x_blue;
+   float y_blue;
+#endif
+#endif
+
+#if defined(PNG_pCAL_SUPPORTED)
+   /* The pCAL chunk describes a transformation between the stored pixel
+    * values and original physical data values used to create the image.
+    * The integer range [0, 2^bit_depth - 1] maps to the floating-point
+    * range given by [pcal_X0, pcal_X1], and are further transformed by a
+    * (possibly non-linear) transformation function given by "pcal_type"
+    * and "pcal_params" into "pcal_units".  Please see the PNG_EQUATION_
+    * defines below, and the PNG-Group's PNG extensions document for a
+    * complete description of the transformations and how they should be
+    * implemented, and for a description of the ASCII parameter strings.
+    * Data values are valid if (valid & PNG_INFO_pCAL) non-zero.
+    */
+   png_charp pcal_purpose;  /* pCAL chunk description string */
+   png_int_32 pcal_X0;      /* minimum value */
+   png_int_32 pcal_X1;      /* maximum value */
+   png_charp pcal_units;    /* Latin-1 string giving physical units */
+   png_charpp pcal_params;  /* ASCII strings containing parameter values */
+   png_byte pcal_type;      /* equation type (see PNG_EQUATION_ below) */
+   png_byte pcal_nparams;   /* number of parameters given in pcal_params */
+#endif
+
+/* New members added in libpng-1.0.6 */
+#ifdef PNG_FREE_ME_SUPPORTED
+   png_uint_32 free_me;     /* flags items libpng is responsible for freeing */
+#endif
+
+#if defined(PNG_UNKNOWN_CHUNKS_SUPPORTED)
+   /* storage for unknown chunks that the library doesn't recognize. */
+   png_unknown_chunkp unknown_chunks;
+   png_size_t unknown_chunks_num;
+#endif
+
+#if defined(PNG_iCCP_SUPPORTED)
+   /* iCCP chunk data. */
+   png_charp iccp_name;     /* profile name */
+   png_charp iccp_profile;  /* International Color Consortium profile data */
+                            /* Note to maintainer: should be png_bytep */
+   png_uint_32 iccp_proflen;  /* ICC profile data length */
+   png_byte iccp_compression; /* Always zero */
+#endif
+
+#if defined(PNG_sPLT_SUPPORTED)
+   /* data on sPLT chunks (there may be more than one). */
+   png_sPLT_tp splt_palettes;
+   png_uint_32 splt_palettes_num;
+#endif
+
+#if defined(PNG_sCAL_SUPPORTED)
+   /* The sCAL chunk describes the actual physical dimensions of the
+    * subject matter of the graphic.  The chunk contains a unit specification
+    * a byte value, and two ASCII strings representing floating-point
+    * values.  The values are width and height corresponsing to one pixel
+    * in the image.  This external representation is converted to double
+    * here.  Data values are valid if (valid & PNG_INFO_sCAL) is non-zero.
+    */
+   png_byte scal_unit;         /* unit of physical scale */
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+   double scal_pixel_width;    /* width of one pixel */
+   double scal_pixel_height;   /* height of one pixel */
+#endif
+#ifdef PNG_FIXED_POINT_SUPPORTED
+   png_charp scal_s_width;     /* string containing height */
+   png_charp scal_s_height;    /* string containing width */
+#endif
+#endif
+
+#if defined(PNG_INFO_IMAGE_SUPPORTED)
+   /* Memory has been allocated if (valid & PNG_ALLOCATED_INFO_ROWS) non-zero */
+   /* Data valid if (valid & PNG_INFO_IDAT) non-zero */
+   png_bytepp row_pointers;        /* the image bits */
+#endif
+
+#if defined(PNG_FIXED_POINT_SUPPORTED) && defined(PNG_gAMA_SUPPORTED)
+   png_fixed_point int_gamma; /* gamma of image, if (valid & PNG_INFO_gAMA) */
+#endif
+
+#if defined(PNG_cHRM_SUPPORTED) && defined(PNG_FIXED_POINT_SUPPORTED)
+   png_fixed_point int_x_white;
+   png_fixed_point int_y_white;
+   png_fixed_point int_x_red;
+   png_fixed_point int_y_red;
+   png_fixed_point int_x_green;
+   png_fixed_point int_y_green;
+   png_fixed_point int_x_blue;
+   png_fixed_point int_y_blue;
+#endif
+
+} png_info;
+
+typedef png_info FAR * png_infop;
+typedef png_info FAR * FAR * png_infopp;
+
+/* Maximum positive integer used in PNG is (2^31)-1 */
+#define PNG_UINT_31_MAX ((png_uint_32)0x7fffffffL)
+#define PNG_UINT_32_MAX ((png_uint_32)(-1))
+#define PNG_SIZE_MAX ((png_size_t)(-1))
+#if defined(PNG_1_0_X) || defined (PNG_1_2_X)
+/* PNG_MAX_UINT is deprecated; use PNG_UINT_31_MAX instead. */
+#define PNG_MAX_UINT PNG_UINT_31_MAX
+#endif
+
+/* These describe the color_type field in png_info. */
+/* color type masks */
+#define PNG_COLOR_MASK_PALETTE    1
+#define PNG_COLOR_MASK_COLOR      2
+#define PNG_COLOR_MASK_ALPHA      4
+
+/* color types.  Note that not all combinations are legal */
+#define PNG_COLOR_TYPE_GRAY 0
+#define PNG_COLOR_TYPE_PALETTE  (PNG_COLOR_MASK_COLOR | PNG_COLOR_MASK_PALETTE)
+#define PNG_COLOR_TYPE_RGB        (PNG_COLOR_MASK_COLOR)
+#define PNG_COLOR_TYPE_RGB_ALPHA  (PNG_COLOR_MASK_COLOR | PNG_COLOR_MASK_ALPHA)
+#define PNG_COLOR_TYPE_GRAY_ALPHA (PNG_COLOR_MASK_ALPHA)
+/* aliases */
+#define PNG_COLOR_TYPE_RGBA  PNG_COLOR_TYPE_RGB_ALPHA
+#define PNG_COLOR_TYPE_GA  PNG_COLOR_TYPE_GRAY_ALPHA
+
+/* This is for compression type. PNG 1.0-1.2 only define the single type. */
+#define PNG_COMPRESSION_TYPE_BASE 0 /* Deflate method 8, 32K window */
+#define PNG_COMPRESSION_TYPE_DEFAULT PNG_COMPRESSION_TYPE_BASE
+
+/* This is for filter type. PNG 1.0-1.2 only define the single type. */
+#define PNG_FILTER_TYPE_BASE      0 /* Single row per-byte filtering */
+#define PNG_INTRAPIXEL_DIFFERENCING 64 /* Used only in MNG datastreams */
+#define PNG_FILTER_TYPE_DEFAULT   PNG_FILTER_TYPE_BASE
+
+/* These are for the interlacing type.  These values should NOT be changed. */
+#define PNG_INTERLACE_NONE        0 /* Non-interlaced image */
+#define PNG_INTERLACE_ADAM7       1 /* Adam7 interlacing */
+#define PNG_INTERLACE_LAST        2 /* Not a valid value */
+
+/* These are for the oFFs chunk.  These values should NOT be changed. */
+#define PNG_OFFSET_PIXEL          0 /* Offset in pixels */
+#define PNG_OFFSET_MICROMETER     1 /* Offset in micrometers (1/10^6 meter) */
+#define PNG_OFFSET_LAST           2 /* Not a valid value */
+
+/* These are for the pCAL chunk.  These values should NOT be changed. */
+#define PNG_EQUATION_LINEAR       0 /* Linear transformation */
+#define PNG_EQUATION_BASE_E       1 /* Exponential base e transform */
+#define PNG_EQUATION_ARBITRARY    2 /* Arbitrary base exponential transform */
+#define PNG_EQUATION_HYPERBOLIC   3 /* Hyperbolic sine transformation */
+#define PNG_EQUATION_LAST         4 /* Not a valid value */
+
+/* These are for the sCAL chunk.  These values should NOT be changed. */
+#define PNG_SCALE_UNKNOWN         0 /* unknown unit (image scale) */
+#define PNG_SCALE_METER           1 /* meters per pixel */
+#define PNG_SCALE_RADIAN          2 /* radians per pixel */
+#define PNG_SCALE_LAST            3 /* Not a valid value */
+
+/* These are for the pHYs chunk.  These values should NOT be changed. */
+#define PNG_RESOLUTION_UNKNOWN    0 /* pixels/unknown unit (aspect ratio) */
+#define PNG_RESOLUTION_METER      1 /* pixels/meter */
+#define PNG_RESOLUTION_LAST       2 /* Not a valid value */
+
+/* These are for the sRGB chunk.  These values should NOT be changed. */
+#define PNG_sRGB_INTENT_PERCEPTUAL 0
+#define PNG_sRGB_INTENT_RELATIVE   1
+#define PNG_sRGB_INTENT_SATURATION 2
+#define PNG_sRGB_INTENT_ABSOLUTE   3
+#define PNG_sRGB_INTENT_LAST       4 /* Not a valid value */
+
+/* This is for text chunks */
+#define PNG_KEYWORD_MAX_LENGTH     79
+
+/* Maximum number of entries in PLTE/sPLT/tRNS arrays */
+#define PNG_MAX_PALETTE_LENGTH    256
+
+/* These determine if an ancillary chunk's data has been successfully read
+ * from the PNG header, or if the application has filled in the corresponding
+ * data in the info_struct to be written into the output file.  The values
+ * of the PNG_INFO_<chunk> defines should NOT be changed.
+ */
+#define PNG_INFO_gAMA 0x0001
+#define PNG_INFO_sBIT 0x0002
+#define PNG_INFO_cHRM 0x0004
+#define PNG_INFO_PLTE 0x0008
+#define PNG_INFO_tRNS 0x0010
+#define PNG_INFO_bKGD 0x0020
+#define PNG_INFO_hIST 0x0040
+#define PNG_INFO_pHYs 0x0080
+#define PNG_INFO_oFFs 0x0100
+#define PNG_INFO_tIME 0x0200
+#define PNG_INFO_pCAL 0x0400
+#define PNG_INFO_sRGB 0x0800   /* GR-P, 0.96a */
+#define PNG_INFO_iCCP 0x1000   /* ESR, 1.0.6 */
+#define PNG_INFO_sPLT 0x2000   /* ESR, 1.0.6 */
+#define PNG_INFO_sCAL 0x4000   /* ESR, 1.0.6 */
+#define PNG_INFO_IDAT 0x8000L  /* ESR, 1.0.6 */
+
+/* This is used for the transformation routines, as some of them
+ * change these values for the row.  It also should enable using
+ * the routines for other purposes.
+ */
+typedef struct png_row_info_struct
+{
+   png_uint_32 width; /* width of row */
+   png_uint_32 rowbytes; /* number of bytes in row */
+   png_byte color_type; /* color type of row */
+   png_byte bit_depth; /* bit depth of row */
+   png_byte channels; /* number of channels (1, 2, 3, or 4) */
+   png_byte pixel_depth; /* bits per pixel (depth * channels) */
+} png_row_info;
+
+typedef png_row_info FAR * png_row_infop;
+typedef png_row_info FAR * FAR * png_row_infopp;
+
+/* These are the function types for the I/O functions and for the functions
+ * that allow the user to override the default I/O functions with his or her
+ * own.  The png_error_ptr type should match that of user-supplied warning
+ * and error functions, while the png_rw_ptr type should match that of the
+ * user read/write data functions.
+ */
+typedef struct png_struct_def png_struct;
+typedef png_struct FAR * png_structp;
+
+typedef void (PNGAPI *png_error_ptr) PNGARG((png_structp, png_const_charp));
+typedef void (PNGAPI *png_rw_ptr) PNGARG((png_structp, png_bytep, png_size_t));
+typedef void (PNGAPI *png_flush_ptr) PNGARG((png_structp));
+typedef void (PNGAPI *png_read_status_ptr) PNGARG((png_structp, png_uint_32,
+   int));
+typedef void (PNGAPI *png_write_status_ptr) PNGARG((png_structp, png_uint_32,
+   int));
+
+#ifdef PNG_PROGRESSIVE_READ_SUPPORTED
+typedef void (PNGAPI *png_progressive_info_ptr) PNGARG((png_structp, png_infop));
+typedef void (PNGAPI *png_progressive_end_ptr) PNGARG((png_structp, png_infop));
+typedef void (PNGAPI *png_progressive_row_ptr) PNGARG((png_structp, png_bytep,
+   png_uint_32, int));
+#endif
+
+#if defined(PNG_READ_USER_TRANSFORM_SUPPORTED) || \
+    defined(PNG_WRITE_USER_TRANSFORM_SUPPORTED) || \
+    defined(PNG_LEGACY_SUPPORTED)
+typedef void (PNGAPI *png_user_transform_ptr) PNGARG((png_structp,
+    png_row_infop, png_bytep));
+#endif
+
+#if defined(PNG_USER_CHUNKS_SUPPORTED)
+typedef int (PNGAPI *png_user_chunk_ptr) PNGARG((png_structp, png_unknown_chunkp));
+#endif
+#if defined(PNG_UNKNOWN_CHUNKS_SUPPORTED)
+typedef void (PNGAPI *png_unknown_chunk_ptr) PNGARG((png_structp));
+#endif
+
+/* Transform masks for the high-level interface */
+#define PNG_TRANSFORM_IDENTITY       0x0000    /* read and write */
+#define PNG_TRANSFORM_STRIP_16       0x0001    /* read only */
+#define PNG_TRANSFORM_STRIP_ALPHA    0x0002    /* read only */
+#define PNG_TRANSFORM_PACKING        0x0004    /* read and write */
+#define PNG_TRANSFORM_PACKSWAP       0x0008    /* read and write */
+#define PNG_TRANSFORM_EXPAND         0x0010    /* read only */
+#define PNG_TRANSFORM_INVERT_MONO    0x0020    /* read and write */
+#define PNG_TRANSFORM_SHIFT          0x0040    /* read and write */
+#define PNG_TRANSFORM_BGR            0x0080    /* read and write */
+#define PNG_TRANSFORM_SWAP_ALPHA     0x0100    /* read and write */
+#define PNG_TRANSFORM_SWAP_ENDIAN    0x0200    /* read and write */
+#define PNG_TRANSFORM_INVERT_ALPHA   0x0400    /* read and write */
+#define PNG_TRANSFORM_STRIP_FILLER   0x0800    /* WRITE only */
+
+/* Flags for MNG supported features */
+#define PNG_FLAG_MNG_EMPTY_PLTE     0x01
+#define PNG_FLAG_MNG_FILTER_64      0x04
+#define PNG_ALL_MNG_FEATURES        0x05
+
+typedef png_voidp (*png_malloc_ptr) PNGARG((png_structp, png_size_t));
+typedef void (*png_free_ptr) PNGARG((png_structp, png_voidp));
+
+/* The structure that holds the information to read and write PNG files.
+ * The only people who need to care about what is inside of this are the
+ * people who will be modifying the library for their own special needs.
+ * It should NOT be accessed directly by an application, except to store
+ * the jmp_buf.
+ */
+
+struct png_struct_def
+{
+#ifdef PNG_SETJMP_SUPPORTED
+   jmp_buf jmpbuf;            /* used in png_error */
+#endif
+   png_error_ptr error_fn;    /* function for printing errors and aborting */
+   png_error_ptr warning_fn;  /* function for printing warnings */
+   png_voidp error_ptr;       /* user supplied struct for error functions */
+   png_rw_ptr write_data_fn;  /* function for writing output data */
+   png_rw_ptr read_data_fn;   /* function for reading input data */
+   png_voidp io_ptr;          /* ptr to application struct for I/O functions */
+
+#if defined(PNG_READ_USER_TRANSFORM_SUPPORTED)
+   png_user_transform_ptr read_user_transform_fn; /* user read transform */
+#endif
+
+#if defined(PNG_WRITE_USER_TRANSFORM_SUPPORTED)
+   png_user_transform_ptr write_user_transform_fn; /* user write transform */
+#endif
+
+/* These were added in libpng-1.0.2 */
+#if defined(PNG_USER_TRANSFORM_PTR_SUPPORTED)
+#if defined(PNG_READ_USER_TRANSFORM_SUPPORTED) || \
+    defined(PNG_WRITE_USER_TRANSFORM_SUPPORTED)
+   png_voidp user_transform_ptr; /* user supplied struct for user transform */
+   png_byte user_transform_depth;    /* bit depth of user transformed pixels */
+   png_byte user_transform_channels; /* channels in user transformed pixels */
+#endif
+#endif
+
+   png_uint_32 mode;          /* tells us where we are in the PNG file */
+   png_uint_32 flags;         /* flags indicating various things to libpng */
+   png_uint_32 transformations; /* which transformations to perform */
+
+   z_stream zstream;          /* pointer to decompression structure (below) */
+   png_bytep zbuf;            /* buffer for zlib */
+   png_size_t zbuf_size;      /* size of zbuf */
+   int zlib_level;            /* holds zlib compression level */
+   int zlib_method;           /* holds zlib compression method */
+   int zlib_window_bits;      /* holds zlib compression window bits */
+   int zlib_mem_level;        /* holds zlib compression memory level */
+   int zlib_strategy;         /* holds zlib compression strategy */
+
+   png_uint_32 width;         /* width of image in pixels */
+   png_uint_32 height;        /* height of image in pixels */
+   png_uint_32 num_rows;      /* number of rows in current pass */
+   png_uint_32 usr_width;     /* width of row at start of write */
+   png_uint_32 rowbytes;      /* size of row in bytes */
+   png_uint_32 irowbytes;     /* size of current interlaced row in bytes */
+   png_uint_32 iwidth;        /* width of current interlaced row in pixels */
+   png_uint_32 row_number;    /* current row in interlace pass */
+   png_bytep prev_row;        /* buffer to save previous (unfiltered) row */
+   png_bytep row_buf;         /* buffer to save current (unfiltered) row */
+   png_bytep sub_row;         /* buffer to save "sub" row when filtering */
+   png_bytep up_row;          /* buffer to save "up" row when filtering */
+   png_bytep avg_row;         /* buffer to save "avg" row when filtering */
+   png_bytep paeth_row;       /* buffer to save "Paeth" row when filtering */
+   png_row_info row_info;     /* used for transformation routines */
+
+   png_uint_32 idat_size;     /* current IDAT size for read */
+   png_uint_32 crc;           /* current chunk CRC value */
+   png_colorp palette;        /* palette from the input file */
+   png_uint_16 num_palette;   /* number of color entries in palette */
+   png_uint_16 num_trans;     /* number of transparency values */
+   png_byte chunk_name[5];    /* null-terminated name of current chunk */
+   png_byte compression;      /* file compression type (always 0) */
+   png_byte filter;           /* file filter type (always 0) */
+   png_byte interlaced;       /* PNG_INTERLACE_NONE, PNG_INTERLACE_ADAM7 */
+   png_byte pass;             /* current interlace pass (0 - 6) */
+   png_byte do_filter;        /* row filter flags (see PNG_FILTER_ below ) */
+   png_byte color_type;       /* color type of file */
+   png_byte bit_depth;        /* bit depth of file */
+   png_byte usr_bit_depth;    /* bit depth of users row */
+   png_byte pixel_depth;      /* number of bits per pixel */
+   png_byte channels;         /* number of channels in file */
+   png_byte usr_channels;     /* channels at start of write */
+   png_byte sig_bytes;        /* magic bytes read/written from start of file */
+
+#if defined(PNG_READ_FILLER_SUPPORTED) || defined(PNG_WRITE_FILLER_SUPPORTED)
+#ifdef PNG_LEGACY_SUPPORTED
+   png_byte filler;           /* filler byte for pixel expansion */
+#else
+   png_uint_16 filler;           /* filler bytes for pixel expansion */
+#endif
+#endif
+
+#if defined(PNG_bKGD_SUPPORTED)
+   png_byte background_gamma_type;
+#  ifdef PNG_FLOATING_POINT_SUPPORTED
+   float background_gamma;
+#  endif
+   png_color_16 background;   /* background color in screen gamma space */
+#if defined(PNG_READ_GAMMA_SUPPORTED)
+   png_color_16 background_1; /* background normalized to gamma 1.0 */
+#endif
+#endif /* PNG_bKGD_SUPPORTED */
+
+#if defined(PNG_WRITE_FLUSH_SUPPORTED)
+   png_flush_ptr output_flush_fn;/* Function for flushing output */
+   png_uint_32 flush_dist;    /* how many rows apart to flush, 0 - no flush */
+   png_uint_32 flush_rows;    /* number of rows written since last flush */
+#endif
+
+#if defined(PNG_READ_GAMMA_SUPPORTED) || defined(PNG_READ_BACKGROUND_SUPPORTED)
+   int gamma_shift;      /* number of "insignificant" bits 16-bit gamma */
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+   float gamma;          /* file gamma value */
+   float screen_gamma;   /* screen gamma value (display_exponent) */
+#endif
+#endif
+
+#if defined(PNG_READ_GAMMA_SUPPORTED) || defined(PNG_READ_BACKGROUND_SUPPORTED)
+   png_bytep gamma_table;     /* gamma table for 8-bit depth files */
+   png_bytep gamma_from_1;    /* converts from 1.0 to screen */
+   png_bytep gamma_to_1;      /* converts from file to 1.0 */
+   png_uint_16pp gamma_16_table; /* gamma table for 16-bit depth files */
+   png_uint_16pp gamma_16_from_1; /* converts from 1.0 to screen */
+   png_uint_16pp gamma_16_to_1; /* converts from file to 1.0 */
+#endif
+
+#if defined(PNG_READ_GAMMA_SUPPORTED) || defined(PNG_sBIT_SUPPORTED)
+   png_color_8 sig_bit;       /* significant bits in each available channel */
+#endif
+
+#if defined(PNG_READ_SHIFT_SUPPORTED) || defined(PNG_WRITE_SHIFT_SUPPORTED)
+   png_color_8 shift;         /* shift for significant bit tranformation */
+#endif
+
+#if defined(PNG_tRNS_SUPPORTED) || defined(PNG_READ_BACKGROUND_SUPPORTED) \
+ || defined(PNG_READ_EXPAND_SUPPORTED) || defined(PNG_READ_BACKGROUND_SUPPORTED)
+   png_bytep trans;           /* transparency values for paletted files */
+   png_color_16 trans_values; /* transparency values for non-paletted files */
+#endif
+
+   png_read_status_ptr read_row_fn;   /* called after each row is decoded */
+   png_write_status_ptr write_row_fn; /* called after each row is encoded */
+#ifdef PNG_PROGRESSIVE_READ_SUPPORTED
+   png_progressive_info_ptr info_fn; /* called after header data fully read */
+   png_progressive_row_ptr row_fn;   /* called after each prog. row is decoded */
+   png_progressive_end_ptr end_fn;   /* called after image is complete */
+   png_bytep save_buffer_ptr;        /* current location in save_buffer */
+   png_bytep save_buffer;            /* buffer for previously read data */
+   png_bytep current_buffer_ptr;     /* current location in current_buffer */
+   png_bytep current_buffer;         /* buffer for recently used data */
+   png_uint_32 push_length;          /* size of current input chunk */
+   png_uint_32 skip_length;          /* bytes to skip in input data */
+   png_size_t save_buffer_size;      /* amount of data now in save_buffer */
+   png_size_t save_buffer_max;       /* total size of save_buffer */
+   png_size_t buffer_size;           /* total amount of available input data */
+   png_size_t current_buffer_size;   /* amount of data now in current_buffer */
+   int process_mode;                 /* what push library is currently doing */
+   int cur_palette;                  /* current push library palette index */
+
+#  if defined(PNG_TEXT_SUPPORTED)
+     png_size_t current_text_size;   /* current size of text input data */
+     png_size_t current_text_left;   /* how much text left to read in input */
+     png_charp current_text;         /* current text chunk buffer */
+     png_charp current_text_ptr;     /* current location in current_text */
+#  endif /* PNG_TEXT_SUPPORTED */
+#endif /* PNG_PROGRESSIVE_READ_SUPPORTED */
+
+#if defined(__TURBOC__) && !defined(_Windows) && !defined(__FLAT__)
+/* for the Borland special 64K segment handler */
+   png_bytepp offset_table_ptr;
+   png_bytep offset_table;
+   png_uint_16 offset_table_number;
+   png_uint_16 offset_table_count;
+   png_uint_16 offset_table_count_free;
+#endif
+
+#if defined(PNG_READ_DITHER_SUPPORTED)
+   png_bytep palette_lookup;         /* lookup table for dithering */
+   png_bytep dither_index;           /* index translation for palette files */
+#endif
+
+#if defined(PNG_READ_DITHER_SUPPORTED) || defined(PNG_hIST_SUPPORTED)
+   png_uint_16p hist;                /* histogram */
+#endif
+
+#if defined(PNG_WRITE_WEIGHTED_FILTER_SUPPORTED)
+   png_byte heuristic_method;        /* heuristic for row filter selection */
+   png_byte num_prev_filters;        /* number of weights for previous rows */
+   png_bytep prev_filters;           /* filter type(s) of previous row(s) */
+   png_uint_16p filter_weights;      /* weight(s) for previous line(s) */
+   png_uint_16p inv_filter_weights;  /* 1/weight(s) for previous line(s) */
+   png_uint_16p filter_costs;        /* relative filter calculation cost */
+   png_uint_16p inv_filter_costs;    /* 1/relative filter calculation cost */
+#endif
+
+#if defined(PNG_TIME_RFC1123_SUPPORTED)
+   png_charp time_buffer;            /* String to hold RFC 1123 time text */
+#endif
+
+/* New members added in libpng-1.0.6 */
+
+#ifdef PNG_FREE_ME_SUPPORTED
+   png_uint_32 free_me;       /* flags items libpng is responsible for freeing */
+#endif
+
+#if defined(PNG_USER_CHUNKS_SUPPORTED)
+   png_voidp user_chunk_ptr;
+   png_user_chunk_ptr read_user_chunk_fn; /* user read chunk handler */
+#endif
+
+#if defined(PNG_UNKNOWN_CHUNKS_SUPPORTED)
+   int num_chunk_list;
+   png_bytep chunk_list;
+#endif
+
+/* New members added in libpng-1.0.3 */
+#if defined(PNG_READ_RGB_TO_GRAY_SUPPORTED)
+   png_byte rgb_to_gray_status;
+   /* These were changed from png_byte in libpng-1.0.6 */
+   png_uint_16 rgb_to_gray_red_coeff;
+   png_uint_16 rgb_to_gray_green_coeff;
+   png_uint_16 rgb_to_gray_blue_coeff;
+#endif
+
+/* New member added in libpng-1.0.4 (renamed in 1.0.9) */
+#if defined(PNG_MNG_FEATURES_SUPPORTED) || \
+    defined(PNG_READ_EMPTY_PLTE_SUPPORTED) || \
+    defined(PNG_WRITE_EMPTY_PLTE_SUPPORTED)
+/* changed from png_byte to png_uint_32 at version 1.2.0 */
+#ifdef PNG_1_0_X
+   png_byte mng_features_permitted;
+#else
+   png_uint_32 mng_features_permitted;
+#endif /* PNG_1_0_X */
+#endif
+
+/* New member added in libpng-1.0.7 */
+#if defined(PNG_READ_GAMMA_SUPPORTED) || defined(PNG_READ_BACKGROUND_SUPPORTED)
+   png_fixed_point int_gamma;
+#endif
+
+/* New member added in libpng-1.0.9, ifdef'ed out in 1.0.12, enabled in 1.2.0 */
+#if defined(PNG_MNG_FEATURES_SUPPORTED)
+   png_byte filter_type;
+#endif
+
+#if defined(PNG_1_0_X)
+/* New member added in libpng-1.0.10, ifdef'ed out in 1.2.0 */
+   png_uint_32 row_buf_size;
+#endif
+
+/* New members added in libpng-1.2.0 */
+#if defined(PNG_ASSEMBLER_CODE_SUPPORTED)
+#  if !defined(PNG_1_0_X)
+#    if defined(PNG_MMX_CODE_SUPPORTED)
+   png_byte     mmx_bitdepth_threshold;
+   png_uint_32  mmx_rowbytes_threshold;
+#    endif
+   png_uint_32  asm_flags;
+#  endif
+#endif
+
+/* New members added in libpng-1.0.2 but first enabled by default in 1.2.0 */
+#ifdef PNG_USER_MEM_SUPPORTED
+   png_voidp mem_ptr;                /* user supplied struct for mem functions */
+   png_malloc_ptr malloc_fn;         /* function for allocating memory */
+   png_free_ptr free_fn;             /* function for freeing memory */
+#endif
+
+/* New member added in libpng-1.0.13 and 1.2.0 */
+   png_bytep big_row_buf;         /* buffer to save current (unfiltered) row */
+
+#if defined(PNG_READ_DITHER_SUPPORTED)
+/* The following three members were added at version 1.0.14 and 1.2.4 */
+   png_bytep dither_sort;            /* working sort array */
+   png_bytep index_to_palette;       /* where the original index currently is */
+                                     /* in the palette */
+   png_bytep palette_to_index;       /* which original index points to this */
+                                     /* palette color */
+#endif
+
+/* New members added in libpng-1.0.16 and 1.2.6 */
+   png_byte compression_type;
+
+#ifdef PNG_SET_USER_LIMITS_SUPPORTED
+   png_uint_32 user_width_max;
+   png_uint_32 user_height_max;
+#endif
+
+/* New member added in libpng-1.0.25 and 1.2.17 */
+#if defined(PNG_UNKNOWN_CHUNKS_SUPPORTED)
+   /* storage for unknown chunk that the library doesn't recognize. */
+   png_unknown_chunk unknown_chunk;
+#endif
+};
+
+
+/* This triggers a compiler error in png.c, if png.c and png.h
+ * do not agree upon the version number.
+ */
+typedef png_structp version_1_2_22;
+
+typedef png_struct FAR * FAR * png_structpp;
+
+/* Here are the function definitions most commonly used.  This is not
+ * the place to find out how to use libpng.  See libpng.txt for the
+ * full explanation, see example.c for the summary.  This just provides
+ * a simple one line description of the use of each function.
+ */
+
+/* Returns the version number of the library */
+extern PNG_EXPORT(png_uint_32,png_access_version_number) PNGARG((void));
+
+/* Tell lib we have already handled the first <num_bytes> magic bytes.
+ * Handling more than 8 bytes from the beginning of the file is an error.
+ */
+extern PNG_EXPORT(void,png_set_sig_bytes) PNGARG((png_structp png_ptr,
+   int num_bytes));
+
+/* Check sig[start] through sig[start + num_to_check - 1] to see if it's a
+ * PNG file.  Returns zero if the supplied bytes match the 8-byte PNG
+ * signature, and non-zero otherwise.  Having num_to_check == 0 or
+ * start > 7 will always fail (ie return non-zero).
+ */
+extern PNG_EXPORT(int,png_sig_cmp) PNGARG((png_bytep sig, png_size_t start,
+   png_size_t num_to_check));
+
+/* Simple signature checking function.  This is the same as calling
+ * png_check_sig(sig, n) := !png_sig_cmp(sig, 0, n).
+ */
+extern PNG_EXPORT(int,png_check_sig) PNGARG((png_bytep sig, int num));
+
+/* Allocate and initialize png_ptr struct for reading, and any other memory. */
+extern PNG_EXPORT(png_structp,png_create_read_struct)
+   PNGARG((png_const_charp user_png_ver, png_voidp error_ptr,
+   png_error_ptr error_fn, png_error_ptr warn_fn));
+
+/* Allocate and initialize png_ptr struct for writing, and any other memory */
+extern PNG_EXPORT(png_structp,png_create_write_struct)
+   PNGARG((png_const_charp user_png_ver, png_voidp error_ptr,
+   png_error_ptr error_fn, png_error_ptr warn_fn));
+
+#ifdef PNG_WRITE_SUPPORTED
+extern PNG_EXPORT(png_uint_32,png_get_compression_buffer_size)
+   PNGARG((png_structp png_ptr));
+#endif
+
+#ifdef PNG_WRITE_SUPPORTED
+extern PNG_EXPORT(void,png_set_compression_buffer_size)
+   PNGARG((png_structp png_ptr, png_uint_32 size));
+#endif
+
+/* Reset the compression stream */
+extern PNG_EXPORT(int,png_reset_zstream) PNGARG((png_structp png_ptr));
+
+/* New functions added in libpng-1.0.2 (not enabled by default until 1.2.0) */
+#ifdef PNG_USER_MEM_SUPPORTED
+extern PNG_EXPORT(png_structp,png_create_read_struct_2)
+   PNGARG((png_const_charp user_png_ver, png_voidp error_ptr,
+   png_error_ptr error_fn, png_error_ptr warn_fn, png_voidp mem_ptr,
+   png_malloc_ptr malloc_fn, png_free_ptr free_fn));
+extern PNG_EXPORT(png_structp,png_create_write_struct_2)
+   PNGARG((png_const_charp user_png_ver, png_voidp error_ptr,
+   png_error_ptr error_fn, png_error_ptr warn_fn, png_voidp mem_ptr,
+   png_malloc_ptr malloc_fn, png_free_ptr free_fn));
+#endif
+
+/* Write a PNG chunk - size, type, (optional) data, CRC. */
+extern PNG_EXPORT(void,png_write_chunk) PNGARG((png_structp png_ptr,
+   png_bytep chunk_name, png_bytep data, png_size_t length));
+
+/* Write the start of a PNG chunk - length and chunk name. */
+extern PNG_EXPORT(void,png_write_chunk_start) PNGARG((png_structp png_ptr,
+   png_bytep chunk_name, png_uint_32 length));
+
+/* Write the data of a PNG chunk started with png_write_chunk_start(). */
+extern PNG_EXPORT(void,png_write_chunk_data) PNGARG((png_structp png_ptr,
+   png_bytep data, png_size_t length));
+
+/* Finish a chunk started with png_write_chunk_start() (includes CRC). */
+extern PNG_EXPORT(void,png_write_chunk_end) PNGARG((png_structp png_ptr));
+
+/* Allocate and initialize the info structure */
+extern PNG_EXPORT(png_infop,png_create_info_struct)
+   PNGARG((png_structp png_ptr));
+
+#if defined(PNG_1_0_X) || defined (PNG_1_2_X)
+/* Initialize the info structure (old interface - DEPRECATED) */
+extern PNG_EXPORT(void,png_info_init) PNGARG((png_infop info_ptr));
+#undef png_info_init
+#define png_info_init(info_ptr) png_info_init_3(&info_ptr,\
+    png_sizeof(png_info));
+#endif
+
+extern PNG_EXPORT(void,png_info_init_3) PNGARG((png_infopp info_ptr,
+    png_size_t png_info_struct_size));
+
+/* Writes all the PNG information before the image. */
+extern PNG_EXPORT(void,png_write_info_before_PLTE) PNGARG((png_structp png_ptr,
+   png_infop info_ptr));
+extern PNG_EXPORT(void,png_write_info) PNGARG((png_structp png_ptr,
+   png_infop info_ptr));
+
+#ifndef PNG_NO_SEQUENTIAL_READ_SUPPORTED
+/* read the information before the actual image data. */
+extern PNG_EXPORT(void,png_read_info) PNGARG((png_structp png_ptr,
+   png_infop info_ptr));
+#endif
+
+#if defined(PNG_TIME_RFC1123_SUPPORTED)
+extern PNG_EXPORT(png_charp,png_convert_to_rfc1123)
+   PNGARG((png_structp png_ptr, png_timep ptime));
+#endif
+
+#if !defined(_WIN32_WCE)
+/* "time.h" functions are not supported on WindowsCE */
+#if defined(PNG_WRITE_tIME_SUPPORTED)
+/* convert from a struct tm to png_time */
+extern PNG_EXPORT(void,png_convert_from_struct_tm) PNGARG((png_timep ptime,
+   struct tm FAR * ttime));
+
+/* convert from time_t to png_time.  Uses gmtime() */
+extern PNG_EXPORT(void,png_convert_from_time_t) PNGARG((png_timep ptime,
+   time_t ttime));
+#endif /* PNG_WRITE_tIME_SUPPORTED */
+#endif /* _WIN32_WCE */
+
+#if defined(PNG_READ_EXPAND_SUPPORTED)
+/* Expand data to 24-bit RGB, or 8-bit grayscale, with alpha if available. */
+extern PNG_EXPORT(void,png_set_expand) PNGARG((png_structp png_ptr));
+#if !defined(PNG_1_0_X)
+extern PNG_EXPORT(void,png_set_expand_gray_1_2_4_to_8) PNGARG((png_structp
+  png_ptr));
+#endif
+extern PNG_EXPORT(void,png_set_palette_to_rgb) PNGARG((png_structp png_ptr));
+extern PNG_EXPORT(void,png_set_tRNS_to_alpha) PNGARG((png_structp png_ptr));
+#if defined(PNG_1_0_X) || defined (PNG_1_2_X)
+/* Deprecated */
+extern PNG_EXPORT(void,png_set_gray_1_2_4_to_8) PNGARG((png_structp png_ptr));
+#endif
+#endif
+
+#if defined(PNG_READ_BGR_SUPPORTED) || defined(PNG_WRITE_BGR_SUPPORTED)
+/* Use blue, green, red order for pixels. */
+extern PNG_EXPORT(void,png_set_bgr) PNGARG((png_structp png_ptr));
+#endif
+
+#if defined(PNG_READ_GRAY_TO_RGB_SUPPORTED)
+/* Expand the grayscale to 24-bit RGB if necessary. */
+extern PNG_EXPORT(void,png_set_gray_to_rgb) PNGARG((png_structp png_ptr));
+#endif
+
+#if defined(PNG_READ_RGB_TO_GRAY_SUPPORTED)
+/* Reduce RGB to grayscale. */
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+extern PNG_EXPORT(void,png_set_rgb_to_gray) PNGARG((png_structp png_ptr,
+   int error_action, double red, double green ));
+#endif
+extern PNG_EXPORT(void,png_set_rgb_to_gray_fixed) PNGARG((png_structp png_ptr,
+   int error_action, png_fixed_point red, png_fixed_point green ));
+extern PNG_EXPORT(png_byte,png_get_rgb_to_gray_status) PNGARG((png_structp
+   png_ptr));
+#endif
+
+extern PNG_EXPORT(void,png_build_grayscale_palette) PNGARG((int bit_depth,
+   png_colorp palette));
+
+#if defined(PNG_READ_STRIP_ALPHA_SUPPORTED)
+extern PNG_EXPORT(void,png_set_strip_alpha) PNGARG((png_structp png_ptr));
+#endif
+
+#if defined(PNG_READ_SWAP_ALPHA_SUPPORTED) || \
+    defined(PNG_WRITE_SWAP_ALPHA_SUPPORTED)
+extern PNG_EXPORT(void,png_set_swap_alpha) PNGARG((png_structp png_ptr));
+#endif
+
+#if defined(PNG_READ_INVERT_ALPHA_SUPPORTED) || \
+    defined(PNG_WRITE_INVERT_ALPHA_SUPPORTED)
+extern PNG_EXPORT(void,png_set_invert_alpha) PNGARG((png_structp png_ptr));
+#endif
+
+#if defined(PNG_READ_FILLER_SUPPORTED) || defined(PNG_WRITE_FILLER_SUPPORTED)
+/* Add a filler byte to 8-bit Gray or 24-bit RGB images. */
+extern PNG_EXPORT(void,png_set_filler) PNGARG((png_structp png_ptr,
+   png_uint_32 filler, int flags));
+/* The values of the PNG_FILLER_ defines should NOT be changed */
+#define PNG_FILLER_BEFORE 0
+#define PNG_FILLER_AFTER 1
+/* Add an alpha byte to 8-bit Gray or 24-bit RGB images. */
+#if !defined(PNG_1_0_X)
+extern PNG_EXPORT(void,png_set_add_alpha) PNGARG((png_structp png_ptr,
+   png_uint_32 filler, int flags));
+#endif
+#endif /* PNG_READ_FILLER_SUPPORTED || PNG_WRITE_FILLER_SUPPORTED */
+
+#if defined(PNG_READ_SWAP_SUPPORTED) || defined(PNG_WRITE_SWAP_SUPPORTED)
+/* Swap bytes in 16-bit depth files. */
+extern PNG_EXPORT(void,png_set_swap) PNGARG((png_structp png_ptr));
+#endif
+
+#if defined(PNG_READ_PACK_SUPPORTED) || defined(PNG_WRITE_PACK_SUPPORTED)
+/* Use 1 byte per pixel in 1, 2, or 4-bit depth files. */
+extern PNG_EXPORT(void,png_set_packing) PNGARG((png_structp png_ptr));
+#endif
+
+#if defined(PNG_READ_PACKSWAP_SUPPORTED) || defined(PNG_WRITE_PACKSWAP_SUPPORTED)
+/* Swap packing order of pixels in bytes. */
+extern PNG_EXPORT(void,png_set_packswap) PNGARG((png_structp png_ptr));
+#endif
+
+#if defined(PNG_READ_SHIFT_SUPPORTED) || defined(PNG_WRITE_SHIFT_SUPPORTED)
+/* Converts files to legal bit depths. */
+extern PNG_EXPORT(void,png_set_shift) PNGARG((png_structp png_ptr,
+   png_color_8p true_bits));
+#endif
+
+#if defined(PNG_READ_INTERLACING_SUPPORTED) || \
+    defined(PNG_WRITE_INTERLACING_SUPPORTED)
+/* Have the code handle the interlacing.  Returns the number of passes. */
+extern PNG_EXPORT(int,png_set_interlace_handling) PNGARG((png_structp png_ptr));
+#endif
+
+#if defined(PNG_READ_INVERT_SUPPORTED) || defined(PNG_WRITE_INVERT_SUPPORTED)
+/* Invert monochrome files */
+extern PNG_EXPORT(void,png_set_invert_mono) PNGARG((png_structp png_ptr));
+#endif
+
+#if defined(PNG_READ_BACKGROUND_SUPPORTED)
+/* Handle alpha and tRNS by replacing with a background color. */
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+extern PNG_EXPORT(void,png_set_background) PNGARG((png_structp png_ptr,
+   png_color_16p background_color, int background_gamma_code,
+   int need_expand, double background_gamma));
+#endif
+#define PNG_BACKGROUND_GAMMA_UNKNOWN 0
+#define PNG_BACKGROUND_GAMMA_SCREEN  1
+#define PNG_BACKGROUND_GAMMA_FILE    2
+#define PNG_BACKGROUND_GAMMA_UNIQUE  3
+#endif
+
+#if defined(PNG_READ_16_TO_8_SUPPORTED)
+/* strip the second byte of information from a 16-bit depth file. */
+extern PNG_EXPORT(void,png_set_strip_16) PNGARG((png_structp png_ptr));
+#endif
+
+#if defined(PNG_READ_DITHER_SUPPORTED)
+/* Turn on dithering, and reduce the palette to the number of colors available. */
+extern PNG_EXPORT(void,png_set_dither) PNGARG((png_structp png_ptr,
+   png_colorp palette, int num_palette, int maximum_colors,
+   png_uint_16p histogram, int full_dither));
+#endif
+
+#if defined(PNG_READ_GAMMA_SUPPORTED)
+/* Handle gamma correction. Screen_gamma=(display_exponent) */
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+extern PNG_EXPORT(void,png_set_gamma) PNGARG((png_structp png_ptr,
+   double screen_gamma, double default_file_gamma));
+#endif
+#endif
+
+#if defined(PNG_1_0_X) || defined (PNG_1_2_X)
+#if defined(PNG_READ_EMPTY_PLTE_SUPPORTED) || \
+    defined(PNG_WRITE_EMPTY_PLTE_SUPPORTED)
+/* Permit or disallow empty PLTE (0: not permitted, 1: permitted) */
+/* Deprecated and will be removed.  Use png_permit_mng_features() instead. */
+extern PNG_EXPORT(void,png_permit_empty_plte) PNGARG((png_structp png_ptr,
+   int empty_plte_permitted));
+#endif
+#endif
+
+#if defined(PNG_WRITE_FLUSH_SUPPORTED)
+/* Set how many lines between output flushes - 0 for no flushing */
+extern PNG_EXPORT(void,png_set_flush) PNGARG((png_structp png_ptr, int nrows));
+/* Flush the current PNG output buffer */
+extern PNG_EXPORT(void,png_write_flush) PNGARG((png_structp png_ptr));
+#endif
+
+/* optional update palette with requested transformations */
+extern PNG_EXPORT(void,png_start_read_image) PNGARG((png_structp png_ptr));
+
+/* optional call to update the users info structure */
+extern PNG_EXPORT(void,png_read_update_info) PNGARG((png_structp png_ptr,
+   png_infop info_ptr));
+
+#ifndef PNG_NO_SEQUENTIAL_READ_SUPPORTED
+/* read one or more rows of image data. */
+extern PNG_EXPORT(void,png_read_rows) PNGARG((png_structp png_ptr,
+   png_bytepp row, png_bytepp display_row, png_uint_32 num_rows));
+#endif
+
+#ifndef PNG_NO_SEQUENTIAL_READ_SUPPORTED
+/* read a row of data. */
+extern PNG_EXPORT(void,png_read_row) PNGARG((png_structp png_ptr,
+   png_bytep row,
+   png_bytep display_row));
+#endif
+
+#ifndef PNG_NO_SEQUENTIAL_READ_SUPPORTED
+/* read the whole image into memory at once. */
+extern PNG_EXPORT(void,png_read_image) PNGARG((png_structp png_ptr,
+   png_bytepp image));
+#endif
+
+/* write a row of image data */
+extern PNG_EXPORT(void,png_write_row) PNGARG((png_structp png_ptr,
+   png_bytep row));
+
+/* write a few rows of image data */
+extern PNG_EXPORT(void,png_write_rows) PNGARG((png_structp png_ptr,
+   png_bytepp row, png_uint_32 num_rows));
+
+/* write the image data */
+extern PNG_EXPORT(void,png_write_image) PNGARG((png_structp png_ptr,
+   png_bytepp image));
+
+/* writes the end of the PNG file. */
+extern PNG_EXPORT(void,png_write_end) PNGARG((png_structp png_ptr,
+   png_infop info_ptr));
+
+#ifndef PNG_NO_SEQUENTIAL_READ_SUPPORTED
+/* read the end of the PNG file. */
+extern PNG_EXPORT(void,png_read_end) PNGARG((png_structp png_ptr,
+   png_infop info_ptr));
+#endif
+
+/* free any memory associated with the png_info_struct */
+extern PNG_EXPORT(void,png_destroy_info_struct) PNGARG((png_structp png_ptr,
+   png_infopp info_ptr_ptr));
+
+/* free any memory associated with the png_struct and the png_info_structs */
+extern PNG_EXPORT(void,png_destroy_read_struct) PNGARG((png_structpp
+   png_ptr_ptr, png_infopp info_ptr_ptr, png_infopp end_info_ptr_ptr));
+
+/* free all memory used by the read (old method - NOT DLL EXPORTED) */
+extern void png_read_destroy PNGARG((png_structp png_ptr, png_infop info_ptr,
+   png_infop end_info_ptr));
+
+/* free any memory associated with the png_struct and the png_info_structs */
+extern PNG_EXPORT(void,png_destroy_write_struct)
+   PNGARG((png_structpp png_ptr_ptr, png_infopp info_ptr_ptr));
+
+/* free any memory used in png_ptr struct (old method - NOT DLL EXPORTED) */
+extern void png_write_destroy PNGARG((png_structp png_ptr));
+
+/* set the libpng method of handling chunk CRC errors */
+extern PNG_EXPORT(void,png_set_crc_action) PNGARG((png_structp png_ptr,
+   int crit_action, int ancil_action));
+
+/* Values for png_set_crc_action() to say how to handle CRC errors in
+ * ancillary and critical chunks, and whether to use the data contained
+ * therein.  Note that it is impossible to "discard" data in a critical
+ * chunk.  For versions prior to 0.90, the action was always error/quit,
+ * whereas in version 0.90 and later, the action for CRC errors in ancillary
+ * chunks is warn/discard.  These values should NOT be changed.
+ *
+ *      value                       action:critical     action:ancillary
+ */
+#define PNG_CRC_DEFAULT       0  /* error/quit          warn/discard data */
+#define PNG_CRC_ERROR_QUIT    1  /* error/quit          error/quit        */
+#define PNG_CRC_WARN_DISCARD  2  /* (INVALID)           warn/discard data */
+#define PNG_CRC_WARN_USE      3  /* warn/use data       warn/use data     */
+#define PNG_CRC_QUIET_USE     4  /* quiet/use data      quiet/use data    */
+#define PNG_CRC_NO_CHANGE     5  /* use current value   use current value */
+
+/* These functions give the user control over the scan-line filtering in
+ * libpng and the compression methods used by zlib.  These functions are
+ * mainly useful for testing, as the defaults should work with most users.
+ * Those users who are tight on memory or want faster performance at the
+ * expense of compression can modify them.  See the compression library
+ * header file (zlib.h) for an explination of the compression functions.
+ */
+
+/* set the filtering method(s) used by libpng.  Currently, the only valid
+ * value for "method" is 0.
+ */
+extern PNG_EXPORT(void,png_set_filter) PNGARG((png_structp png_ptr, int method,
+   int filters));
+
+/* Flags for png_set_filter() to say which filters to use.  The flags
+ * are chosen so that they don't conflict with real filter types
+ * below, in case they are supplied instead of the #defined constants.
+ * These values should NOT be changed.
+ */
+#define PNG_NO_FILTERS     0x00
+#define PNG_FILTER_NONE    0x08
+#define PNG_FILTER_SUB     0x10
+#define PNG_FILTER_UP      0x20
+#define PNG_FILTER_AVG     0x40
+#define PNG_FILTER_PAETH   0x80
+#define PNG_ALL_FILTERS (PNG_FILTER_NONE | PNG_FILTER_SUB | PNG_FILTER_UP | \
+                         PNG_FILTER_AVG | PNG_FILTER_PAETH)
+
+/* Filter values (not flags) - used in pngwrite.c, pngwutil.c for now.
+ * These defines should NOT be changed.
+ */
+#define PNG_FILTER_VALUE_NONE  0
+#define PNG_FILTER_VALUE_SUB   1
+#define PNG_FILTER_VALUE_UP    2
+#define PNG_FILTER_VALUE_AVG   3
+#define PNG_FILTER_VALUE_PAETH 4
+#define PNG_FILTER_VALUE_LAST  5
+
+#if defined(PNG_WRITE_WEIGHTED_FILTER_SUPPORTED) /* EXPERIMENTAL */
+/* The "heuristic_method" is given by one of the PNG_FILTER_HEURISTIC_
+ * defines, either the default (minimum-sum-of-absolute-differences), or
+ * the experimental method (weighted-minimum-sum-of-absolute-differences).
+ *
+ * Weights are factors >= 1.0, indicating how important it is to keep the
+ * filter type consistent between rows.  Larger numbers mean the current
+ * filter is that many times as likely to be the same as the "num_weights"
+ * previous filters.  This is cumulative for each previous row with a weight.
+ * There needs to be "num_weights" values in "filter_weights", or it can be
+ * NULL if the weights aren't being specified.  Weights have no influence on
+ * the selection of the first row filter.  Well chosen weights can (in theory)
+ * improve the compression for a given image.
+ *
+ * Costs are factors >= 1.0 indicating the relative decoding costs of a
+ * filter type.  Higher costs indicate more decoding expense, and are
+ * therefore less likely to be selected over a filter with lower computational
+ * costs.  There needs to be a value in "filter_costs" for each valid filter
+ * type (given by PNG_FILTER_VALUE_LAST), or it can be NULL if you aren't
+ * setting the costs.  Costs try to improve the speed of decompression without
+ * unduly increasing the compressed image size.
+ *
+ * A negative weight or cost indicates the default value is to be used, and
+ * values in the range [0.0, 1.0) indicate the value is to remain unchanged.
+ * The default values for both weights and costs are currently 1.0, but may
+ * change if good general weighting/cost heuristics can be found.  If both
+ * the weights and costs are set to 1.0, this degenerates the WEIGHTED method
+ * to the UNWEIGHTED method, but with added encoding time/computation.
+ */
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+extern PNG_EXPORT(void,png_set_filter_heuristics) PNGARG((png_structp png_ptr,
+   int heuristic_method, int num_weights, png_doublep filter_weights,
+   png_doublep filter_costs));
+#endif
+#endif /*  PNG_WRITE_WEIGHTED_FILTER_SUPPORTED */
+
+/* Heuristic used for row filter selection.  These defines should NOT be
+ * changed.
+ */
+#define PNG_FILTER_HEURISTIC_DEFAULT    0  /* Currently "UNWEIGHTED" */
+#define PNG_FILTER_HEURISTIC_UNWEIGHTED 1  /* Used by libpng < 0.95 */
+#define PNG_FILTER_HEURISTIC_WEIGHTED   2  /* Experimental feature */
+#define PNG_FILTER_HEURISTIC_LAST       3  /* Not a valid value */
+
+/* Set the library compression level.  Currently, valid values range from
+ * 0 - 9, corresponding directly to the zlib compression levels 0 - 9
+ * (0 - no compression, 9 - "maximal" compression).  Note that tests have
+ * shown that zlib compression levels 3-6 usually perform as well as level 9
+ * for PNG images, and do considerably fewer caclulations.  In the future,
+ * these values may not correspond directly to the zlib compression levels.
+ */
+extern PNG_EXPORT(void,png_set_compression_level) PNGARG((png_structp png_ptr,
+   int level));
+
+extern PNG_EXPORT(void,png_set_compression_mem_level)
+   PNGARG((png_structp png_ptr, int mem_level));
+
+extern PNG_EXPORT(void,png_set_compression_strategy)
+   PNGARG((png_structp png_ptr, int strategy));
+
+extern PNG_EXPORT(void,png_set_compression_window_bits)
+   PNGARG((png_structp png_ptr, int window_bits));
+
+extern PNG_EXPORT(void,png_set_compression_method) PNGARG((png_structp png_ptr,
+   int method));
+
+/* These next functions are called for input/output, memory, and error
+ * handling.  They are in the file pngrio.c, pngwio.c, and pngerror.c,
+ * and call standard C I/O routines such as fread(), fwrite(), and
+ * fprintf().  These functions can be made to use other I/O routines
+ * at run time for those applications that need to handle I/O in a
+ * different manner by calling png_set_???_fn().  See libpng.txt for
+ * more information.
+ */
+
+#if !defined(PNG_NO_STDIO)
+/* Initialize the input/output for the PNG file to the default functions. */
+extern PNG_EXPORT(void,png_init_io) PNGARG((png_structp png_ptr, png_FILE_p fp));
+#endif
+
+/* Replace the (error and abort), and warning functions with user
+ * supplied functions.  If no messages are to be printed you must still
+ * write and use replacement functions. The replacement error_fn should
+ * still do a longjmp to the last setjmp location if you are using this
+ * method of error handling.  If error_fn or warning_fn is NULL, the
+ * default function will be used.
+ */
+
+extern PNG_EXPORT(void,png_set_error_fn) PNGARG((png_structp png_ptr,
+   png_voidp error_ptr, png_error_ptr error_fn, png_error_ptr warning_fn));
+
+/* Return the user pointer associated with the error functions */
+extern PNG_EXPORT(png_voidp,png_get_error_ptr) PNGARG((png_structp png_ptr));
+
+/* Replace the default data output functions with a user supplied one(s).
+ * If buffered output is not used, then output_flush_fn can be set to NULL.
+ * If PNG_WRITE_FLUSH_SUPPORTED is not defined at libpng compile time
+ * output_flush_fn will be ignored (and thus can be NULL).
+ */
+extern PNG_EXPORT(void,png_set_write_fn) PNGARG((png_structp png_ptr,
+   png_voidp io_ptr, png_rw_ptr write_data_fn, png_flush_ptr output_flush_fn));
+
+/* Replace the default data input function with a user supplied one. */
+extern PNG_EXPORT(void,png_set_read_fn) PNGARG((png_structp png_ptr,
+   png_voidp io_ptr, png_rw_ptr read_data_fn));
+
+/* Return the user pointer associated with the I/O functions */
+extern PNG_EXPORT(png_voidp,png_get_io_ptr) PNGARG((png_structp png_ptr));
+
+extern PNG_EXPORT(void,png_set_read_status_fn) PNGARG((png_structp png_ptr,
+   png_read_status_ptr read_row_fn));
+
+extern PNG_EXPORT(void,png_set_write_status_fn) PNGARG((png_structp png_ptr,
+   png_write_status_ptr write_row_fn));
+
+#ifdef PNG_USER_MEM_SUPPORTED
+/* Replace the default memory allocation functions with user supplied one(s). */
+extern PNG_EXPORT(void,png_set_mem_fn) PNGARG((png_structp png_ptr,
+   png_voidp mem_ptr, png_malloc_ptr malloc_fn, png_free_ptr free_fn));
+/* Return the user pointer associated with the memory functions */
+extern PNG_EXPORT(png_voidp,png_get_mem_ptr) PNGARG((png_structp png_ptr));
+#endif
+
+#if defined(PNG_READ_USER_TRANSFORM_SUPPORTED) || \
+    defined(PNG_LEGACY_SUPPORTED)
+extern PNG_EXPORT(void,png_set_read_user_transform_fn) PNGARG((png_structp
+   png_ptr, png_user_transform_ptr read_user_transform_fn));
+#endif
+
+#if defined(PNG_WRITE_USER_TRANSFORM_SUPPORTED) || \
+    defined(PNG_LEGACY_SUPPORTED)
+extern PNG_EXPORT(void,png_set_write_user_transform_fn) PNGARG((png_structp
+   png_ptr, png_user_transform_ptr write_user_transform_fn));
+#endif
+
+#if defined(PNG_READ_USER_TRANSFORM_SUPPORTED) || \
+    defined(PNG_WRITE_USER_TRANSFORM_SUPPORTED) || \
+    defined(PNG_LEGACY_SUPPORTED)
+extern PNG_EXPORT(void,png_set_user_transform_info) PNGARG((png_structp
+   png_ptr, png_voidp user_transform_ptr, int user_transform_depth,
+   int user_transform_channels));
+/* Return the user pointer associated with the user transform functions */
+extern PNG_EXPORT(png_voidp,png_get_user_transform_ptr)
+   PNGARG((png_structp png_ptr));
+#endif
+
+#ifdef PNG_USER_CHUNKS_SUPPORTED
+extern PNG_EXPORT(void,png_set_read_user_chunk_fn) PNGARG((png_structp png_ptr,
+   png_voidp user_chunk_ptr, png_user_chunk_ptr read_user_chunk_fn));
+extern PNG_EXPORT(png_voidp,png_get_user_chunk_ptr) PNGARG((png_structp
+   png_ptr));
+#endif
+
+#ifdef PNG_PROGRESSIVE_READ_SUPPORTED
+/* Sets the function callbacks for the push reader, and a pointer to a
+ * user-defined structure available to the callback functions.
+ */
+extern PNG_EXPORT(void,png_set_progressive_read_fn) PNGARG((png_structp png_ptr,
+   png_voidp progressive_ptr,
+   png_progressive_info_ptr info_fn, png_progressive_row_ptr row_fn,
+   png_progressive_end_ptr end_fn));
+
+/* returns the user pointer associated with the push read functions */
+extern PNG_EXPORT(png_voidp,png_get_progressive_ptr)
+   PNGARG((png_structp png_ptr));
+
+/* function to be called when data becomes available */
+extern PNG_EXPORT(void,png_process_data) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_bytep buffer, png_size_t buffer_size));
+
+/* function that combines rows.  Not very much different than the
+ * png_combine_row() call.  Is this even used?????
+ */
+extern PNG_EXPORT(void,png_progressive_combine_row) PNGARG((png_structp png_ptr,
+   png_bytep old_row, png_bytep new_row));
+#endif /* PNG_PROGRESSIVE_READ_SUPPORTED */
+
+extern PNG_EXPORT(png_voidp,png_malloc) PNGARG((png_structp png_ptr,
+   png_uint_32 size));
+
+#if defined(PNG_1_0_X)
+#  define png_malloc_warn png_malloc
+#else
+/* Added at libpng version 1.2.4 */
+extern PNG_EXPORT(png_voidp,png_malloc_warn) PNGARG((png_structp png_ptr,
+   png_uint_32 size));
+#endif
+
+/* frees a pointer allocated by png_malloc() */
+extern PNG_EXPORT(void,png_free) PNGARG((png_structp png_ptr, png_voidp ptr));
+
+#if defined(PNG_1_0_X)
+/* Function to allocate memory for zlib. */
+extern PNG_EXPORT(voidpf,png_zalloc) PNGARG((voidpf png_ptr, uInt items,
+   uInt size));
+
+/* Function to free memory for zlib */
+extern PNG_EXPORT(void,png_zfree) PNGARG((voidpf png_ptr, voidpf ptr));
+#endif
+
+/* Free data that was allocated internally */
+extern PNG_EXPORT(void,png_free_data) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_uint_32 free_me, int num));
+#ifdef PNG_FREE_ME_SUPPORTED
+/* Reassign responsibility for freeing existing data, whether allocated
+ * by libpng or by the application */
+extern PNG_EXPORT(void,png_data_freer) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, int freer, png_uint_32 mask));
+#endif
+/* assignments for png_data_freer */
+#define PNG_DESTROY_WILL_FREE_DATA 1
+#define PNG_SET_WILL_FREE_DATA 1
+#define PNG_USER_WILL_FREE_DATA 2
+/* Flags for png_ptr->free_me and info_ptr->free_me */
+#define PNG_FREE_HIST 0x0008
+#define PNG_FREE_ICCP 0x0010
+#define PNG_FREE_SPLT 0x0020
+#define PNG_FREE_ROWS 0x0040
+#define PNG_FREE_PCAL 0x0080
+#define PNG_FREE_SCAL 0x0100
+#define PNG_FREE_UNKN 0x0200
+#define PNG_FREE_LIST 0x0400
+#define PNG_FREE_PLTE 0x1000
+#define PNG_FREE_TRNS 0x2000
+#define PNG_FREE_TEXT 0x4000
+#define PNG_FREE_ALL  0x7fff
+#define PNG_FREE_MUL  0x4220 /* PNG_FREE_SPLT|PNG_FREE_TEXT|PNG_FREE_UNKN */
+
+#ifdef PNG_USER_MEM_SUPPORTED
+extern PNG_EXPORT(png_voidp,png_malloc_default) PNGARG((png_structp png_ptr,
+   png_uint_32 size));
+extern PNG_EXPORT(void,png_free_default) PNGARG((png_structp png_ptr,
+   png_voidp ptr));
+#endif
+
+extern PNG_EXPORT(png_voidp,png_memcpy_check) PNGARG((png_structp png_ptr,
+   png_voidp s1, png_voidp s2, png_uint_32 size));
+
+extern PNG_EXPORT(png_voidp,png_memset_check) PNGARG((png_structp png_ptr,
+   png_voidp s1, int value, png_uint_32 size));
+
+#if defined(USE_FAR_KEYWORD)  /* memory model conversion function */
+extern void *png_far_to_near PNGARG((png_structp png_ptr,png_voidp ptr,
+   int check));
+#endif /* USE_FAR_KEYWORD */
+
+#ifndef PNG_NO_ERROR_TEXT
+/* Fatal error in PNG image of libpng - can't continue */
+extern PNG_EXPORT(void,png_error) PNGARG((png_structp png_ptr,
+   png_const_charp error_message));
+
+/* The same, but the chunk name is prepended to the error string. */
+extern PNG_EXPORT(void,png_chunk_error) PNGARG((png_structp png_ptr,
+   png_const_charp error_message));
+#else
+/* Fatal error in PNG image of libpng - can't continue */
+extern PNG_EXPORT(void,png_err) PNGARG((png_structp png_ptr));
+#endif
+
+#ifndef PNG_NO_WARNINGS
+/* Non-fatal error in libpng.  Can continue, but may have a problem. */
+extern PNG_EXPORT(void,png_warning) PNGARG((png_structp png_ptr,
+   png_const_charp warning_message));
+
+#ifdef PNG_READ_SUPPORTED
+/* Non-fatal error in libpng, chunk name is prepended to message. */
+extern PNG_EXPORT(void,png_chunk_warning) PNGARG((png_structp png_ptr,
+   png_const_charp warning_message));
+#endif /* PNG_READ_SUPPORTED */
+#endif /* PNG_NO_WARNINGS */
+
+/* The png_set_<chunk> functions are for storing values in the png_info_struct.
+ * Similarly, the png_get_<chunk> calls are used to read values from the
+ * png_info_struct, either storing the parameters in the passed variables, or
+ * setting pointers into the png_info_struct where the data is stored.  The
+ * png_get_<chunk> functions return a non-zero value if the data was available
+ * in info_ptr, or return zero and do not change any of the parameters if the
+ * data was not available.
+ *
+ * These functions should be used instead of directly accessing png_info
+ * to avoid problems with future changes in the size and internal layout of
+ * png_info_struct.
+ */
+/* Returns "flag" if chunk data is valid in info_ptr. */
+extern PNG_EXPORT(png_uint_32,png_get_valid) PNGARG((png_structp png_ptr,
+png_infop info_ptr, png_uint_32 flag));
+
+/* Returns number of bytes needed to hold a transformed row. */
+extern PNG_EXPORT(png_uint_32,png_get_rowbytes) PNGARG((png_structp png_ptr,
+png_infop info_ptr));
+
+#if defined(PNG_INFO_IMAGE_SUPPORTED)
+/* Returns row_pointers, which is an array of pointers to scanlines that was
+returned from png_read_png(). */
+extern PNG_EXPORT(png_bytepp,png_get_rows) PNGARG((png_structp png_ptr,
+png_infop info_ptr));
+/* Set row_pointers, which is an array of pointers to scanlines for use
+by png_write_png(). */
+extern PNG_EXPORT(void,png_set_rows) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_bytepp row_pointers));
+#endif
+
+/* Returns number of color channels in image. */
+extern PNG_EXPORT(png_byte,png_get_channels) PNGARG((png_structp png_ptr,
+png_infop info_ptr));
+
+#ifdef PNG_EASY_ACCESS_SUPPORTED
+/* Returns image width in pixels. */
+extern PNG_EXPORT(png_uint_32, png_get_image_width) PNGARG((png_structp
+png_ptr, png_infop info_ptr));
+
+/* Returns image height in pixels. */
+extern PNG_EXPORT(png_uint_32, png_get_image_height) PNGARG((png_structp
+png_ptr, png_infop info_ptr));
+
+/* Returns image bit_depth. */
+extern PNG_EXPORT(png_byte, png_get_bit_depth) PNGARG((png_structp
+png_ptr, png_infop info_ptr));
+
+/* Returns image color_type. */
+extern PNG_EXPORT(png_byte, png_get_color_type) PNGARG((png_structp
+png_ptr, png_infop info_ptr));
+
+/* Returns image filter_type. */
+extern PNG_EXPORT(png_byte, png_get_filter_type) PNGARG((png_structp
+png_ptr, png_infop info_ptr));
+
+/* Returns image interlace_type. */
+extern PNG_EXPORT(png_byte, png_get_interlace_type) PNGARG((png_structp
+png_ptr, png_infop info_ptr));
+
+/* Returns image compression_type. */
+extern PNG_EXPORT(png_byte, png_get_compression_type) PNGARG((png_structp
+png_ptr, png_infop info_ptr));
+
+/* Returns image resolution in pixels per meter, from pHYs chunk data. */
+extern PNG_EXPORT(png_uint_32, png_get_pixels_per_meter) PNGARG((png_structp
+png_ptr, png_infop info_ptr));
+extern PNG_EXPORT(png_uint_32, png_get_x_pixels_per_meter) PNGARG((png_structp
+png_ptr, png_infop info_ptr));
+extern PNG_EXPORT(png_uint_32, png_get_y_pixels_per_meter) PNGARG((png_structp
+png_ptr, png_infop info_ptr));
+
+/* Returns pixel aspect ratio, computed from pHYs chunk data.  */
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+extern PNG_EXPORT(float, png_get_pixel_aspect_ratio) PNGARG((png_structp
+png_ptr, png_infop info_ptr));
+#endif
+
+/* Returns image x, y offset in pixels or microns, from oFFs chunk data. */
+extern PNG_EXPORT(png_int_32, png_get_x_offset_pixels) PNGARG((png_structp
+png_ptr, png_infop info_ptr));
+extern PNG_EXPORT(png_int_32, png_get_y_offset_pixels) PNGARG((png_structp
+png_ptr, png_infop info_ptr));
+extern PNG_EXPORT(png_int_32, png_get_x_offset_microns) PNGARG((png_structp
+png_ptr, png_infop info_ptr));
+extern PNG_EXPORT(png_int_32, png_get_y_offset_microns) PNGARG((png_structp
+png_ptr, png_infop info_ptr));
+
+#endif /* PNG_EASY_ACCESS_SUPPORTED */
+
+/* Returns pointer to signature string read from PNG header */
+extern PNG_EXPORT(png_bytep,png_get_signature) PNGARG((png_structp png_ptr,
+png_infop info_ptr));
+
+#if defined(PNG_bKGD_SUPPORTED)
+extern PNG_EXPORT(png_uint_32,png_get_bKGD) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_color_16p *background));
+#endif
+
+#if defined(PNG_bKGD_SUPPORTED)
+extern PNG_EXPORT(void,png_set_bKGD) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_color_16p background));
+#endif
+
+#if defined(PNG_cHRM_SUPPORTED)
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+extern PNG_EXPORT(png_uint_32,png_get_cHRM) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, double *white_x, double *white_y, double *red_x,
+   double *red_y, double *green_x, double *green_y, double *blue_x,
+   double *blue_y));
+#endif
+#ifdef PNG_FIXED_POINT_SUPPORTED
+extern PNG_EXPORT(png_uint_32,png_get_cHRM_fixed) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_fixed_point *int_white_x, png_fixed_point
+   *int_white_y, png_fixed_point *int_red_x, png_fixed_point *int_red_y,
+   png_fixed_point *int_green_x, png_fixed_point *int_green_y, png_fixed_point
+   *int_blue_x, png_fixed_point *int_blue_y));
+#endif
+#endif
+
+#if defined(PNG_cHRM_SUPPORTED)
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+extern PNG_EXPORT(void,png_set_cHRM) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, double white_x, double white_y, double red_x,
+   double red_y, double green_x, double green_y, double blue_x, double blue_y));
+#endif
+#ifdef PNG_FIXED_POINT_SUPPORTED
+extern PNG_EXPORT(void,png_set_cHRM_fixed) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_fixed_point int_white_x, png_fixed_point int_white_y,
+   png_fixed_point int_red_x, png_fixed_point int_red_y, png_fixed_point
+   int_green_x, png_fixed_point int_green_y, png_fixed_point int_blue_x,
+   png_fixed_point int_blue_y));
+#endif
+#endif
+
+#if defined(PNG_gAMA_SUPPORTED)
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+extern PNG_EXPORT(png_uint_32,png_get_gAMA) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, double *file_gamma));
+#endif
+extern PNG_EXPORT(png_uint_32,png_get_gAMA_fixed) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_fixed_point *int_file_gamma));
+#endif
+
+#if defined(PNG_gAMA_SUPPORTED)
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+extern PNG_EXPORT(void,png_set_gAMA) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, double file_gamma));
+#endif
+extern PNG_EXPORT(void,png_set_gAMA_fixed) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_fixed_point int_file_gamma));
+#endif
+
+#if defined(PNG_hIST_SUPPORTED)
+extern PNG_EXPORT(png_uint_32,png_get_hIST) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_uint_16p *hist));
+#endif
+
+#if defined(PNG_hIST_SUPPORTED)
+extern PNG_EXPORT(void,png_set_hIST) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_uint_16p hist));
+#endif
+
+extern PNG_EXPORT(png_uint_32,png_get_IHDR) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_uint_32 *width, png_uint_32 *height,
+   int *bit_depth, int *color_type, int *interlace_method,
+   int *compression_method, int *filter_method));
+
+extern PNG_EXPORT(void,png_set_IHDR) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_uint_32 width, png_uint_32 height, int bit_depth,
+   int color_type, int interlace_method, int compression_method,
+   int filter_method));
+
+#if defined(PNG_oFFs_SUPPORTED)
+extern PNG_EXPORT(png_uint_32,png_get_oFFs) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_int_32 *offset_x, png_int_32 *offset_y,
+   int *unit_type));
+#endif
+
+#if defined(PNG_oFFs_SUPPORTED)
+extern PNG_EXPORT(void,png_set_oFFs) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_int_32 offset_x, png_int_32 offset_y,
+   int unit_type));
+#endif
+
+#if defined(PNG_pCAL_SUPPORTED)
+extern PNG_EXPORT(png_uint_32,png_get_pCAL) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_charp *purpose, png_int_32 *X0, png_int_32 *X1,
+   int *type, int *nparams, png_charp *units, png_charpp *params));
+#endif
+
+#if defined(PNG_pCAL_SUPPORTED)
+extern PNG_EXPORT(void,png_set_pCAL) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_charp purpose, png_int_32 X0, png_int_32 X1,
+   int type, int nparams, png_charp units, png_charpp params));
+#endif
+
+#if defined(PNG_pHYs_SUPPORTED)
+extern PNG_EXPORT(png_uint_32,png_get_pHYs) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_uint_32 *res_x, png_uint_32 *res_y, int *unit_type));
+#endif
+
+#if defined(PNG_pHYs_SUPPORTED)
+extern PNG_EXPORT(void,png_set_pHYs) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_uint_32 res_x, png_uint_32 res_y, int unit_type));
+#endif
+
+extern PNG_EXPORT(png_uint_32,png_get_PLTE) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_colorp *palette, int *num_palette));
+
+extern PNG_EXPORT(void,png_set_PLTE) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_colorp palette, int num_palette));
+
+#if defined(PNG_sBIT_SUPPORTED)
+extern PNG_EXPORT(png_uint_32,png_get_sBIT) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_color_8p *sig_bit));
+#endif
+
+#if defined(PNG_sBIT_SUPPORTED)
+extern PNG_EXPORT(void,png_set_sBIT) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_color_8p sig_bit));
+#endif
+
+#if defined(PNG_sRGB_SUPPORTED)
+extern PNG_EXPORT(png_uint_32,png_get_sRGB) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, int *intent));
+#endif
+
+#if defined(PNG_sRGB_SUPPORTED)
+extern PNG_EXPORT(void,png_set_sRGB) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, int intent));
+extern PNG_EXPORT(void,png_set_sRGB_gAMA_and_cHRM) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, int intent));
+#endif
+
+#if defined(PNG_iCCP_SUPPORTED)
+extern PNG_EXPORT(png_uint_32,png_get_iCCP) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_charpp name, int *compression_type,
+   png_charpp profile, png_uint_32 *proflen));
+   /* Note to maintainer: profile should be png_bytepp */
+#endif
+
+#if defined(PNG_iCCP_SUPPORTED)
+extern PNG_EXPORT(void,png_set_iCCP) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_charp name, int compression_type,
+   png_charp profile, png_uint_32 proflen));
+   /* Note to maintainer: profile should be png_bytep */
+#endif
+
+#if defined(PNG_sPLT_SUPPORTED)
+extern PNG_EXPORT(png_uint_32,png_get_sPLT) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_sPLT_tpp entries));
+#endif
+
+#if defined(PNG_sPLT_SUPPORTED)
+extern PNG_EXPORT(void,png_set_sPLT) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_sPLT_tp entries, int nentries));
+#endif
+
+#if defined(PNG_TEXT_SUPPORTED)
+/* png_get_text also returns the number of text chunks in *num_text */
+extern PNG_EXPORT(png_uint_32,png_get_text) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_textp *text_ptr, int *num_text));
+#endif
+
+/*
+ *  Note while png_set_text() will accept a structure whose text,
+ *  language, and  translated keywords are NULL pointers, the structure
+ *  returned by png_get_text will always contain regular
+ *  zero-terminated C strings.  They might be empty strings but
+ *  they will never be NULL pointers.
+ */
+
+#if defined(PNG_TEXT_SUPPORTED)
+extern PNG_EXPORT(void,png_set_text) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_textp text_ptr, int num_text));
+#endif
+
+#if defined(PNG_tIME_SUPPORTED)
+extern PNG_EXPORT(png_uint_32,png_get_tIME) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_timep *mod_time));
+#endif
+
+#if defined(PNG_tIME_SUPPORTED)
+extern PNG_EXPORT(void,png_set_tIME) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_timep mod_time));
+#endif
+
+#if defined(PNG_tRNS_SUPPORTED)
+extern PNG_EXPORT(png_uint_32,png_get_tRNS) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_bytep *trans, int *num_trans,
+   png_color_16p *trans_values));
+#endif
+
+#if defined(PNG_tRNS_SUPPORTED)
+extern PNG_EXPORT(void,png_set_tRNS) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_bytep trans, int num_trans,
+   png_color_16p trans_values));
+#endif
+
+#if defined(PNG_tRNS_SUPPORTED)
+#endif
+
+#if defined(PNG_sCAL_SUPPORTED)
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+extern PNG_EXPORT(png_uint_32,png_get_sCAL) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, int *unit, double *width, double *height));
+#else
+#ifdef PNG_FIXED_POINT_SUPPORTED
+extern PNG_EXPORT(png_uint_32,png_get_sCAL_s) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, int *unit, png_charpp swidth, png_charpp sheight));
+#endif
+#endif
+#endif /* PNG_sCAL_SUPPORTED */
+
+#if defined(PNG_sCAL_SUPPORTED)
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+extern PNG_EXPORT(void,png_set_sCAL) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, int unit, double width, double height));
+#else
+#ifdef PNG_FIXED_POINT_SUPPORTED
+extern PNG_EXPORT(void,png_set_sCAL_s) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, int unit, png_charp swidth, png_charp sheight));
+#endif
+#endif
+#endif /* PNG_sCAL_SUPPORTED || PNG_WRITE_sCAL_SUPPORTED */
+
+#if defined(PNG_UNKNOWN_CHUNKS_SUPPORTED)
+/* provide a list of chunks and how they are to be handled, if the built-in
+   handling or default unknown chunk handling is not desired.  Any chunks not
+   listed will be handled in the default manner.  The IHDR and IEND chunks
+   must not be listed.
+      keep = 0: follow default behaviour
+           = 1: do not keep
+           = 2: keep only if safe-to-copy
+           = 3: keep even if unsafe-to-copy
+*/
+extern PNG_EXPORT(void, png_set_keep_unknown_chunks) PNGARG((png_structp
+   png_ptr, int keep, png_bytep chunk_list, int num_chunks));
+extern PNG_EXPORT(void, png_set_unknown_chunks) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_unknown_chunkp unknowns, int num_unknowns));
+extern PNG_EXPORT(void, png_set_unknown_chunk_location)
+   PNGARG((png_structp png_ptr, png_infop info_ptr, int chunk, int location));
+extern PNG_EXPORT(png_uint_32,png_get_unknown_chunks) PNGARG((png_structp
+   png_ptr, png_infop info_ptr, png_unknown_chunkpp entries));
+#endif
+#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
+PNG_EXPORT(int,png_handle_as_unknown) PNGARG((png_structp png_ptr, png_bytep
+   chunk_name));
+#endif
+
+/* Png_free_data() will turn off the "valid" flag for anything it frees.
+   If you need to turn it off for a chunk that your application has freed,
+   you can use png_set_invalid(png_ptr, info_ptr, PNG_INFO_CHNK); */
+extern PNG_EXPORT(void, png_set_invalid) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, int mask));
+
+#if defined(PNG_INFO_IMAGE_SUPPORTED)
+/* The "params" pointer is currently not used and is for future expansion. */
+extern PNG_EXPORT(void, png_read_png) PNGARG((png_structp png_ptr,
+                        png_infop info_ptr,
+                        int transforms,
+                        png_voidp params));
+extern PNG_EXPORT(void, png_write_png) PNGARG((png_structp png_ptr,
+                        png_infop info_ptr,
+                        int transforms,
+                        png_voidp params));
+#endif
+
+/* Define PNG_DEBUG at compile time for debugging information.  Higher
+ * numbers for PNG_DEBUG mean more debugging information.  This has
+ * only been added since version 0.95 so it is not implemented throughout
+ * libpng yet, but more support will be added as needed.
+ */
+#ifdef PNG_DEBUG
+#if (PNG_DEBUG > 0)
+#if !defined(PNG_DEBUG_FILE) && defined(_MSC_VER)
+#include <crtdbg.h>
+#if (PNG_DEBUG > 1)
+#define png_debug(l,m)  _RPT0(_CRT_WARN,m)
+#define png_debug1(l,m,p1)  _RPT1(_CRT_WARN,m,p1)
+#define png_debug2(l,m,p1,p2) _RPT2(_CRT_WARN,m,p1,p2)
+#endif
+#else /* PNG_DEBUG_FILE || !_MSC_VER */
+#ifndef PNG_DEBUG_FILE
+#define PNG_DEBUG_FILE stderr
+#endif /* PNG_DEBUG_FILE */
+#if (PNG_DEBUG > 1)
+#define png_debug(l,m) \
+{ \
+     int num_tabs=l; \
+     fprintf(PNG_DEBUG_FILE,"%s"m,(num_tabs==1 ? "\t" : \
+       (num_tabs==2 ? "\t\t":(num_tabs>2 ? "\t\t\t":"")))); \
+}
+#define png_debug1(l,m,p1) \
+{ \
+     int num_tabs=l; \
+     fprintf(PNG_DEBUG_FILE,"%s"m,(num_tabs==1 ? "\t" : \
+       (num_tabs==2 ? "\t\t":(num_tabs>2 ? "\t\t\t":""))),p1); \
+}
+#define png_debug2(l,m,p1,p2) \
+{ \
+     int num_tabs=l; \
+     fprintf(PNG_DEBUG_FILE,"%s"m,(num_tabs==1 ? "\t" : \
+       (num_tabs==2 ? "\t\t":(num_tabs>2 ? "\t\t\t":""))),p1,p2); \
+}
+#endif /* (PNG_DEBUG > 1) */
+#endif /* _MSC_VER */
+#endif /* (PNG_DEBUG > 0) */
+#endif /* PNG_DEBUG */
+#ifndef png_debug
+#define png_debug(l, m)
+#endif
+#ifndef png_debug1
+#define png_debug1(l, m, p1)
+#endif
+#ifndef png_debug2
+#define png_debug2(l, m, p1, p2)
+#endif
+
+extern PNG_EXPORT(png_charp,png_get_copyright) PNGARG((png_structp png_ptr));
+extern PNG_EXPORT(png_charp,png_get_header_ver) PNGARG((png_structp png_ptr));
+extern PNG_EXPORT(png_charp,png_get_header_version) PNGARG((png_structp png_ptr));
+extern PNG_EXPORT(png_charp,png_get_libpng_ver) PNGARG((png_structp png_ptr));
+
+#ifdef PNG_MNG_FEATURES_SUPPORTED
+extern PNG_EXPORT(png_uint_32,png_permit_mng_features) PNGARG((png_structp
+   png_ptr, png_uint_32 mng_features_permitted));
+#endif
+
+/* For use in png_set_keep_unknown, added to version 1.2.6 */
+#define PNG_HANDLE_CHUNK_AS_DEFAULT   0
+#define PNG_HANDLE_CHUNK_NEVER        1
+#define PNG_HANDLE_CHUNK_IF_SAFE      2
+#define PNG_HANDLE_CHUNK_ALWAYS       3
+
+/* Added to version 1.2.0 */
+#if defined(PNG_ASSEMBLER_CODE_SUPPORTED)
+#if defined(PNG_MMX_CODE_SUPPORTED)
+#define PNG_ASM_FLAG_MMX_SUPPORT_COMPILED  0x01  /* not user-settable */
+#define PNG_ASM_FLAG_MMX_SUPPORT_IN_CPU    0x02  /* not user-settable */
+#define PNG_ASM_FLAG_MMX_READ_COMBINE_ROW  0x04
+#define PNG_ASM_FLAG_MMX_READ_INTERLACE    0x08
+#define PNG_ASM_FLAG_MMX_READ_FILTER_SUB   0x10
+#define PNG_ASM_FLAG_MMX_READ_FILTER_UP    0x20
+#define PNG_ASM_FLAG_MMX_READ_FILTER_AVG   0x40
+#define PNG_ASM_FLAG_MMX_READ_FILTER_PAETH 0x80
+#define PNG_ASM_FLAGS_INITIALIZED          0x80000000  /* not user-settable */
+
+#define PNG_MMX_READ_FLAGS ( PNG_ASM_FLAG_MMX_READ_COMBINE_ROW  \
+                           | PNG_ASM_FLAG_MMX_READ_INTERLACE    \
+                           | PNG_ASM_FLAG_MMX_READ_FILTER_SUB   \
+                           | PNG_ASM_FLAG_MMX_READ_FILTER_UP    \
+                           | PNG_ASM_FLAG_MMX_READ_FILTER_AVG   \
+                           | PNG_ASM_FLAG_MMX_READ_FILTER_PAETH )
+#define PNG_MMX_WRITE_FLAGS ( 0 )
+
+#define PNG_MMX_FLAGS ( PNG_ASM_FLAG_MMX_SUPPORT_COMPILED \
+                      | PNG_ASM_FLAG_MMX_SUPPORT_IN_CPU   \
+                      | PNG_MMX_READ_FLAGS                \
+                      | PNG_MMX_WRITE_FLAGS )
+
+#define PNG_SELECT_READ   1
+#define PNG_SELECT_WRITE  2
+#endif /* PNG_MMX_CODE_SUPPORTED */
+
+#if !defined(PNG_1_0_X)
+/* pngget.c */
+extern PNG_EXPORT(png_uint_32,png_get_mmx_flagmask)
+   PNGARG((int flag_select, int *compilerID));
+
+/* pngget.c */
+extern PNG_EXPORT(png_uint_32,png_get_asm_flagmask)
+   PNGARG((int flag_select));
+
+/* pngget.c */
+extern PNG_EXPORT(png_uint_32,png_get_asm_flags)
+   PNGARG((png_structp png_ptr));
+
+/* pngget.c */
+extern PNG_EXPORT(png_byte,png_get_mmx_bitdepth_threshold)
+   PNGARG((png_structp png_ptr));
+
+/* pngget.c */
+extern PNG_EXPORT(png_uint_32,png_get_mmx_rowbytes_threshold)
+   PNGARG((png_structp png_ptr));
+
+/* pngset.c */
+extern PNG_EXPORT(void,png_set_asm_flags)
+   PNGARG((png_structp png_ptr, png_uint_32 asm_flags));
+
+/* pngset.c */
+extern PNG_EXPORT(void,png_set_mmx_thresholds)
+   PNGARG((png_structp png_ptr, png_byte mmx_bitdepth_threshold,
+   png_uint_32 mmx_rowbytes_threshold));
+
+#endif /* PNG_1_0_X */
+
+#if !defined(PNG_1_0_X)
+/* png.c, pnggccrd.c, or pngvcrd.c */
+extern PNG_EXPORT(int,png_mmx_support) PNGARG((void));
+#endif /* PNG_ASSEMBLER_CODE_SUPPORTED */
+
+/* Strip the prepended error numbers ("#nnn ") from error and warning
+ * messages before passing them to the error or warning handler. */
+#ifdef PNG_ERROR_NUMBERS_SUPPORTED
+extern PNG_EXPORT(void,png_set_strip_error_numbers) PNGARG((png_structp
+   png_ptr, png_uint_32 strip_mode));
+#endif
+
+#endif /* PNG_1_0_X */
+
+/* Added at libpng-1.2.6 */
+#ifdef PNG_SET_USER_LIMITS_SUPPORTED
+extern PNG_EXPORT(void,png_set_user_limits) PNGARG((png_structp
+   png_ptr, png_uint_32 user_width_max, png_uint_32 user_height_max));
+extern PNG_EXPORT(png_uint_32,png_get_user_width_max) PNGARG((png_structp
+   png_ptr));
+extern PNG_EXPORT(png_uint_32,png_get_user_height_max) PNGARG((png_structp
+   png_ptr));
+#endif
+
+/* Maintainer: Put new public prototypes here ^, in libpng.3, and project defs */
+
+#ifdef PNG_READ_COMPOSITE_NODIV_SUPPORTED
+/* With these routines we avoid an integer divide, which will be slower on
+ * most machines.  However, it does take more operations than the corresponding
+ * divide method, so it may be slower on a few RISC systems.  There are two
+ * shifts (by 8 or 16 bits) and an addition, versus a single integer divide.
+ *
+ * Note that the rounding factors are NOT supposed to be the same!  128 and
+ * 32768 are correct for the NODIV code; 127 and 32767 are correct for the
+ * standard method.
+ *
+ * [Optimized code by Greg Roelofs and Mark Adler...blame us for bugs. :-) ]
+ */
+
+ /* fg and bg should be in `gamma 1.0' space; alpha is the opacity          */
+
+#  define png_composite(composite, fg, alpha, bg)                            \
+     { png_uint_16 temp = (png_uint_16)((png_uint_16)(fg) * (png_uint_16)(alpha) \
+                        +        (png_uint_16)(bg)*(png_uint_16)(255 -       \
+                        (png_uint_16)(alpha)) + (png_uint_16)128);           \
+       (composite) = (png_byte)((temp + (temp >> 8)) >> 8); }
+
+#  define png_composite_16(composite, fg, alpha, bg)                         \
+     { png_uint_32 temp = (png_uint_32)((png_uint_32)(fg) * (png_uint_32)(alpha) \
+                        + (png_uint_32)(bg)*(png_uint_32)(65535L -           \
+                        (png_uint_32)(alpha)) + (png_uint_32)32768L);        \
+       (composite) = (png_uint_16)((temp + (temp >> 16)) >> 16); }
+
+#else  /* standard method using integer division */
+
+#  define png_composite(composite, fg, alpha, bg)                            \
+     (composite) = (png_byte)(((png_uint_16)(fg) * (png_uint_16)(alpha) +    \
+       (png_uint_16)(bg) * (png_uint_16)(255 - (png_uint_16)(alpha)) +       \
+       (png_uint_16)127) / 255)
+
+#  define png_composite_16(composite, fg, alpha, bg)                         \
+     (composite) = (png_uint_16)(((png_uint_32)(fg) * (png_uint_32)(alpha) + \
+       (png_uint_32)(bg)*(png_uint_32)(65535L - (png_uint_32)(alpha)) +      \
+       (png_uint_32)32767) / (png_uint_32)65535L)
+
+#endif /* PNG_READ_COMPOSITE_NODIV_SUPPORTED */
+
+/* Inline macros to do direct reads of bytes from the input buffer.  These
+ * require that you are using an architecture that uses PNG byte ordering
+ * (MSB first) and supports unaligned data storage.  I think that PowerPC
+ * in big-endian mode and 680x0 are the only ones that will support this.
+ * The x86 line of processors definitely do not.  The png_get_int_32()
+ * routine also assumes we are using two's complement format for negative
+ * values, which is almost certainly true.
+ */
+#if defined(PNG_READ_BIG_ENDIAN_SUPPORTED)
+#  define png_get_uint_32(buf) ( *((png_uint_32p) (buf)))
+#  define png_get_uint_16(buf) ( *((png_uint_16p) (buf)))
+#  define png_get_int_32(buf)  ( *((png_int_32p)  (buf)))
+#else
+extern PNG_EXPORT(png_uint_32,png_get_uint_32) PNGARG((png_bytep buf));
+extern PNG_EXPORT(png_uint_16,png_get_uint_16) PNGARG((png_bytep buf));
+extern PNG_EXPORT(png_int_32,png_get_int_32) PNGARG((png_bytep buf));
+#endif /* !PNG_READ_BIG_ENDIAN_SUPPORTED */
+extern PNG_EXPORT(png_uint_32,png_get_uint_31)
+  PNGARG((png_structp png_ptr, png_bytep buf));
+/* No png_get_int_16 -- may be added if there's a real need for it. */
+
+/* Place a 32-bit number into a buffer in PNG byte order (big-endian).
+ */
+extern PNG_EXPORT(void,png_save_uint_32)
+   PNGARG((png_bytep buf, png_uint_32 i));
+extern PNG_EXPORT(void,png_save_int_32)
+   PNGARG((png_bytep buf, png_int_32 i));
+
+/* Place a 16-bit number into a buffer in PNG byte order.
+ * The parameter is declared unsigned int, not png_uint_16,
+ * just to avoid potential problems on pre-ANSI C compilers.
+ */
+extern PNG_EXPORT(void,png_save_uint_16)
+   PNGARG((png_bytep buf, unsigned int i));
+/* No png_save_int_16 -- may be added if there's a real need for it. */
+
+/* ************************************************************************* */
+
+/* These next functions are used internally in the code.  They generally
+ * shouldn't be used unless you are writing code to add or replace some
+ * functionality in libpng.  More information about most functions can
+ * be found in the files where the functions are located.
+ */
+
+
+/* Various modes of operation, that are visible to applications because
+ * they are used for unknown chunk location.
+ */
+#define PNG_HAVE_IHDR               0x01
+#define PNG_HAVE_PLTE               0x02
+#define PNG_HAVE_IDAT               0x04
+#define PNG_AFTER_IDAT              0x08 /* Have complete zlib datastream */
+#define PNG_HAVE_IEND               0x10
+
+#if defined(PNG_INTERNAL)
+
+/* More modes of operation.  Note that after an init, mode is set to
+ * zero automatically when the structure is created.
+ */
+#define PNG_HAVE_gAMA               0x20
+#define PNG_HAVE_cHRM               0x40
+#define PNG_HAVE_sRGB               0x80
+#define PNG_HAVE_CHUNK_HEADER      0x100
+#define PNG_WROTE_tIME             0x200
+#define PNG_WROTE_INFO_BEFORE_PLTE 0x400
+#define PNG_BACKGROUND_IS_GRAY     0x800
+#define PNG_HAVE_PNG_SIGNATURE    0x1000
+#define PNG_HAVE_CHUNK_AFTER_IDAT 0x2000 /* Have another chunk after IDAT */
+
+/* flags for the transformations the PNG library does on the image data */
+#define PNG_BGR                0x0001
+#define PNG_INTERLACE          0x0002
+#define PNG_PACK               0x0004
+#define PNG_SHIFT              0x0008
+#define PNG_SWAP_BYTES         0x0010
+#define PNG_INVERT_MONO        0x0020
+#define PNG_DITHER             0x0040
+#define PNG_BACKGROUND         0x0080
+#define PNG_BACKGROUND_EXPAND  0x0100
+                          /*   0x0200 unused */
+#define PNG_16_TO_8            0x0400
+#define PNG_RGBA               0x0800
+#define PNG_EXPAND             0x1000
+#define PNG_GAMMA              0x2000
+#define PNG_GRAY_TO_RGB        0x4000
+#define PNG_FILLER             0x8000L
+#define PNG_PACKSWAP          0x10000L
+#define PNG_SWAP_ALPHA        0x20000L
+#define PNG_STRIP_ALPHA       0x40000L
+#define PNG_INVERT_ALPHA      0x80000L
+#define PNG_USER_TRANSFORM   0x100000L
+#define PNG_RGB_TO_GRAY_ERR  0x200000L
+#define PNG_RGB_TO_GRAY_WARN 0x400000L
+#define PNG_RGB_TO_GRAY      0x600000L  /* two bits, RGB_TO_GRAY_ERR|WARN */
+                       /*    0x800000L     Unused */
+#define PNG_ADD_ALPHA       0x1000000L  /* Added to libpng-1.2.7 */
+#define PNG_EXPAND_tRNS     0x2000000L  /* Added to libpng-1.2.9 */
+                       /*   0x4000000L  unused */
+                       /*   0x8000000L  unused */
+                       /*  0x10000000L  unused */
+                       /*  0x20000000L  unused */
+                       /*  0x40000000L  unused */
+
+/* flags for png_create_struct */
+#define PNG_STRUCT_PNG   0x0001
+#define PNG_STRUCT_INFO  0x0002
+
+/* Scaling factor for filter heuristic weighting calculations */
+#define PNG_WEIGHT_SHIFT 8
+#define PNG_WEIGHT_FACTOR (1<<(PNG_WEIGHT_SHIFT))
+#define PNG_COST_SHIFT 3
+#define PNG_COST_FACTOR (1<<(PNG_COST_SHIFT))
+
+/* flags for the png_ptr->flags rather than declaring a byte for each one */
+#define PNG_FLAG_ZLIB_CUSTOM_STRATEGY     0x0001
+#define PNG_FLAG_ZLIB_CUSTOM_LEVEL        0x0002
+#define PNG_FLAG_ZLIB_CUSTOM_MEM_LEVEL    0x0004
+#define PNG_FLAG_ZLIB_CUSTOM_WINDOW_BITS  0x0008
+#define PNG_FLAG_ZLIB_CUSTOM_METHOD       0x0010
+#define PNG_FLAG_ZLIB_FINISHED            0x0020
+#define PNG_FLAG_ROW_INIT                 0x0040
+#define PNG_FLAG_FILLER_AFTER             0x0080
+#define PNG_FLAG_CRC_ANCILLARY_USE        0x0100
+#define PNG_FLAG_CRC_ANCILLARY_NOWARN     0x0200
+#define PNG_FLAG_CRC_CRITICAL_USE         0x0400
+#define PNG_FLAG_CRC_CRITICAL_IGNORE      0x0800
+#define PNG_FLAG_FREE_PLTE                0x1000
+#define PNG_FLAG_FREE_TRNS                0x2000
+#define PNG_FLAG_FREE_HIST                0x4000
+#define PNG_FLAG_KEEP_UNKNOWN_CHUNKS      0x8000L
+#define PNG_FLAG_KEEP_UNSAFE_CHUNKS       0x10000L
+#define PNG_FLAG_LIBRARY_MISMATCH         0x20000L
+#define PNG_FLAG_STRIP_ERROR_NUMBERS      0x40000L
+#define PNG_FLAG_STRIP_ERROR_TEXT         0x80000L
+#define PNG_FLAG_MALLOC_NULL_MEM_OK       0x100000L
+#define PNG_FLAG_ADD_ALPHA                0x200000L  /* Added to libpng-1.2.8 */
+#define PNG_FLAG_STRIP_ALPHA              0x400000L  /* Added to libpng-1.2.8 */
+                                  /*      0x800000L  unused */
+                                  /*     0x1000000L  unused */
+                                  /*     0x2000000L  unused */
+                                  /*     0x4000000L  unused */
+                                  /*     0x8000000L  unused */
+                                  /*    0x10000000L  unused */
+                                  /*    0x20000000L  unused */
+                                  /*    0x40000000L  unused */
+
+#define PNG_FLAG_CRC_ANCILLARY_MASK (PNG_FLAG_CRC_ANCILLARY_USE | \
+                                     PNG_FLAG_CRC_ANCILLARY_NOWARN)
+
+#define PNG_FLAG_CRC_CRITICAL_MASK  (PNG_FLAG_CRC_CRITICAL_USE | \
+                                     PNG_FLAG_CRC_CRITICAL_IGNORE)
+
+#define PNG_FLAG_CRC_MASK           (PNG_FLAG_CRC_ANCILLARY_MASK | \
+                                     PNG_FLAG_CRC_CRITICAL_MASK)
+
+/* save typing and make code easier to understand */
+
+#define PNG_COLOR_DIST(c1, c2) (abs((int)((c1).red) - (int)((c2).red)) + \
+   abs((int)((c1).green) - (int)((c2).green)) + \
+   abs((int)((c1).blue) - (int)((c2).blue)))
+
+/* Added to libpng-1.2.6 JB */
+#define PNG_ROWBYTES(pixel_bits, width) \
+    ((pixel_bits) >= 8 ? \
+    ((width) * (((png_uint_32)(pixel_bits)) >> 3)) : \
+    (( ((width) * ((png_uint_32)(pixel_bits))) + 7) >> 3) )
+
+/* PNG_OUT_OF_RANGE returns true if value is outside the range
+   ideal-delta..ideal+delta.  Each argument is evaluated twice.
+   "ideal" and "delta" should be constants, normally simple
+   integers, "value" a variable. Added to libpng-1.2.6 JB */
+#define PNG_OUT_OF_RANGE(value, ideal, delta) \
+        ( (value) < (ideal)-(delta) || (value) > (ideal)+(delta) )
+
+/* variables declared in png.c - only it needs to define PNG_NO_EXTERN */
+#if !defined(PNG_NO_EXTERN) || defined(PNG_ALWAYS_EXTERN)
+/* place to hold the signature string for a PNG file. */
+#ifdef PNG_USE_GLOBAL_ARRAYS
+   PNG_EXPORT_VAR (PNG_CONST png_byte FARDATA) png_sig[8];
+#else
+#endif
+#endif /* PNG_NO_EXTERN */
+
+/* Constant strings for known chunk types.  If you need to add a chunk,
+ * define the name here, and add an invocation of the macro in png.c and
+ * wherever it's needed.
+ */
+#define PNG_IHDR png_byte png_IHDR[5] = { 73,  72,  68,  82, '\0'}
+#define PNG_IDAT png_byte png_IDAT[5] = { 73,  68,  65,  84, '\0'}
+#define PNG_IEND png_byte png_IEND[5] = { 73,  69,  78,  68, '\0'}
+#define PNG_PLTE png_byte png_PLTE[5] = { 80,  76,  84,  69, '\0'}
+#define PNG_bKGD png_byte png_bKGD[5] = { 98,  75,  71,  68, '\0'}
+#define PNG_cHRM png_byte png_cHRM[5] = { 99,  72,  82,  77, '\0'}
+#define PNG_gAMA png_byte png_gAMA[5] = {103,  65,  77,  65, '\0'}
+#define PNG_hIST png_byte png_hIST[5] = {104,  73,  83,  84, '\0'}
+#define PNG_iCCP png_byte png_iCCP[5] = {105,  67,  67,  80, '\0'}
+#define PNG_iTXt png_byte png_iTXt[5] = {105,  84,  88, 116, '\0'}
+#define PNG_oFFs png_byte png_oFFs[5] = {111,  70,  70, 115, '\0'}
+#define PNG_pCAL png_byte png_pCAL[5] = {112,  67,  65,  76, '\0'}
+#define PNG_sCAL png_byte png_sCAL[5] = {115,  67,  65,  76, '\0'}
+#define PNG_pHYs png_byte png_pHYs[5] = {112,  72,  89, 115, '\0'}
+#define PNG_sBIT png_byte png_sBIT[5] = {115,  66,  73,  84, '\0'}
+#define PNG_sPLT png_byte png_sPLT[5] = {115,  80,  76,  84, '\0'}
+#define PNG_sRGB png_byte png_sRGB[5] = {115,  82,  71,  66, '\0'}
+#define PNG_tEXt png_byte png_tEXt[5] = {116,  69,  88, 116, '\0'}
+#define PNG_tIME png_byte png_tIME[5] = {116,  73,  77,  69, '\0'}
+#define PNG_tRNS png_byte png_tRNS[5] = {116,  82,  78,  83, '\0'}
+#define PNG_zTXt png_byte png_zTXt[5] = {122,  84,  88, 116, '\0'}
+
+#ifdef PNG_USE_GLOBAL_ARRAYS
+PNG_EXPORT_VAR (png_byte FARDATA) png_IHDR[5];
+PNG_EXPORT_VAR (png_byte FARDATA) png_IDAT[5];
+PNG_EXPORT_VAR (png_byte FARDATA) png_IEND[5];
+PNG_EXPORT_VAR (png_byte FARDATA) png_PLTE[5];
+PNG_EXPORT_VAR (png_byte FARDATA) png_bKGD[5];
+PNG_EXPORT_VAR (png_byte FARDATA) png_cHRM[5];
+PNG_EXPORT_VAR (png_byte FARDATA) png_gAMA[5];
+PNG_EXPORT_VAR (png_byte FARDATA) png_hIST[5];
+PNG_EXPORT_VAR (png_byte FARDATA) png_iCCP[5];
+PNG_EXPORT_VAR (png_byte FARDATA) png_iTXt[5];
+PNG_EXPORT_VAR (png_byte FARDATA) png_oFFs[5];
+PNG_EXPORT_VAR (png_byte FARDATA) png_pCAL[5];
+PNG_EXPORT_VAR (png_byte FARDATA) png_sCAL[5];
+PNG_EXPORT_VAR (png_byte FARDATA) png_pHYs[5];
+PNG_EXPORT_VAR (png_byte FARDATA) png_sBIT[5];
+PNG_EXPORT_VAR (png_byte FARDATA) png_sPLT[5];
+PNG_EXPORT_VAR (png_byte FARDATA) png_sRGB[5];
+PNG_EXPORT_VAR (png_byte FARDATA) png_tEXt[5];
+PNG_EXPORT_VAR (png_byte FARDATA) png_tIME[5];
+PNG_EXPORT_VAR (png_byte FARDATA) png_tRNS[5];
+PNG_EXPORT_VAR (png_byte FARDATA) png_zTXt[5];
+#endif /* PNG_USE_GLOBAL_ARRAYS */
+
+#if defined(PNG_1_0_X) || defined (PNG_1_2_X)
+/* Initialize png_ptr struct for reading, and allocate any other memory.
+ * (old interface - DEPRECATED - use png_create_read_struct instead).
+ */
+extern PNG_EXPORT(void,png_read_init) PNGARG((png_structp png_ptr));
+#undef png_read_init
+#define png_read_init(png_ptr) png_read_init_3(&png_ptr, \
+    PNG_LIBPNG_VER_STRING,  png_sizeof(png_struct));
+#endif
+
+extern PNG_EXPORT(void,png_read_init_3) PNGARG((png_structpp ptr_ptr,
+    png_const_charp user_png_ver, png_size_t png_struct_size));
+#if defined(PNG_1_0_X) || defined (PNG_1_2_X)
+extern PNG_EXPORT(void,png_read_init_2) PNGARG((png_structp png_ptr,
+    png_const_charp user_png_ver, png_size_t png_struct_size, png_size_t
+    png_info_size));
+#endif
+
+#if defined(PNG_1_0_X) || defined (PNG_1_2_X)
+/* Initialize png_ptr struct for writing, and allocate any other memory.
+ * (old interface - DEPRECATED - use png_create_write_struct instead).
+ */
+extern PNG_EXPORT(void,png_write_init) PNGARG((png_structp png_ptr));
+#undef png_write_init
+#define png_write_init(png_ptr) png_write_init_3(&png_ptr, \
+    PNG_LIBPNG_VER_STRING, png_sizeof(png_struct));
+#endif
+
+extern PNG_EXPORT(void,png_write_init_3) PNGARG((png_structpp ptr_ptr,
+    png_const_charp user_png_ver, png_size_t png_struct_size));
+extern PNG_EXPORT(void,png_write_init_2) PNGARG((png_structp png_ptr,
+    png_const_charp user_png_ver, png_size_t png_struct_size, png_size_t
+    png_info_size));
+
+/* Allocate memory for an internal libpng struct */
+PNG_EXTERN png_voidp png_create_struct PNGARG((int type));
+
+/* Free memory from internal libpng struct */
+PNG_EXTERN void png_destroy_struct PNGARG((png_voidp struct_ptr));
+
+PNG_EXTERN png_voidp png_create_struct_2 PNGARG((int type, png_malloc_ptr
+  malloc_fn, png_voidp mem_ptr));
+PNG_EXTERN void png_destroy_struct_2 PNGARG((png_voidp struct_ptr,
+   png_free_ptr free_fn, png_voidp mem_ptr));
+
+/* Free any memory that info_ptr points to and reset struct. */
+PNG_EXTERN void png_info_destroy PNGARG((png_structp png_ptr,
+   png_infop info_ptr));
+
+#ifndef PNG_1_0_X
+/* Function to allocate memory for zlib. */
+PNG_EXTERN voidpf png_zalloc PNGARG((voidpf png_ptr, uInt items, uInt size));
+
+/* Function to free memory for zlib */
+PNG_EXTERN void png_zfree PNGARG((voidpf png_ptr, voidpf ptr));
+
+#ifdef PNG_SIZE_T
+/* Function to convert a sizeof an item to png_sizeof item */
+   PNG_EXTERN png_size_t PNGAPI png_convert_size PNGARG((size_t size));
+#endif
+
+/* Next four functions are used internally as callbacks.  PNGAPI is required
+ * but not PNG_EXPORT.  PNGAPI added at libpng version 1.2.3. */
+
+PNG_EXTERN void PNGAPI png_default_read_data PNGARG((png_structp png_ptr,
+   png_bytep data, png_size_t length));
+
+#ifdef PNG_PROGRESSIVE_READ_SUPPORTED
+PNG_EXTERN void PNGAPI png_push_fill_buffer PNGARG((png_structp png_ptr,
+   png_bytep buffer, png_size_t length));
+#endif
+
+PNG_EXTERN void PNGAPI png_default_write_data PNGARG((png_structp png_ptr,
+   png_bytep data, png_size_t length));
+
+#if defined(PNG_WRITE_FLUSH_SUPPORTED)
+#if !defined(PNG_NO_STDIO)
+PNG_EXTERN void PNGAPI png_default_flush PNGARG((png_structp png_ptr));
+#endif
+#endif
+#else /* PNG_1_0_X */
+#ifdef PNG_PROGRESSIVE_READ_SUPPORTED
+PNG_EXTERN void png_push_fill_buffer PNGARG((png_structp png_ptr,
+   png_bytep buffer, png_size_t length));
+#endif
+#endif /* PNG_1_0_X */
+
+/* Reset the CRC variable */
+PNG_EXTERN void png_reset_crc PNGARG((png_structp png_ptr));
+
+/* Write the "data" buffer to whatever output you are using. */
+PNG_EXTERN void png_write_data PNGARG((png_structp png_ptr, png_bytep data,
+   png_size_t length));
+
+/* Read data from whatever input you are using into the "data" buffer */
+PNG_EXTERN void png_read_data PNGARG((png_structp png_ptr, png_bytep data,
+   png_size_t length));
+
+/* Read bytes into buf, and update png_ptr->crc */
+PNG_EXTERN void png_crc_read PNGARG((png_structp png_ptr, png_bytep buf,
+   png_size_t length));
+
+/* Decompress data in a chunk that uses compression */
+#if defined(PNG_zTXt_SUPPORTED) || defined(PNG_iTXt_SUPPORTED) || \
+    defined(PNG_iCCP_SUPPORTED) || defined(PNG_sPLT_SUPPORTED)
+PNG_EXTERN png_charp png_decompress_chunk PNGARG((png_structp png_ptr,
+   int comp_type, png_charp chunkdata, png_size_t chunklength,
+   png_size_t prefix_length, png_size_t *data_length));
+#endif
+
+/* Read "skip" bytes, read the file crc, and (optionally) verify png_ptr->crc */
+PNG_EXTERN int png_crc_finish PNGARG((png_structp png_ptr, png_uint_32 skip));
+
+/* Read the CRC from the file and compare it to the libpng calculated CRC */
+PNG_EXTERN int png_crc_error PNGARG((png_structp png_ptr));
+
+/* Calculate the CRC over a section of data.  Note that we are only
+ * passing a maximum of 64K on systems that have this as a memory limit,
+ * since this is the maximum buffer size we can specify.
+ */
+PNG_EXTERN void png_calculate_crc PNGARG((png_structp png_ptr, png_bytep ptr,
+   png_size_t length));
+
+#if defined(PNG_WRITE_FLUSH_SUPPORTED)
+PNG_EXTERN void png_flush PNGARG((png_structp png_ptr));
+#endif
+
+/* simple function to write the signature */
+PNG_EXTERN void png_write_sig PNGARG((png_structp png_ptr));
+
+/* write various chunks */
+
+/* Write the IHDR chunk, and update the png_struct with the necessary
+ * information.
+ */
+PNG_EXTERN void png_write_IHDR PNGARG((png_structp png_ptr, png_uint_32 width,
+   png_uint_32 height,
+   int bit_depth, int color_type, int compression_method, int filter_method,
+   int interlace_method));
+
+PNG_EXTERN void png_write_PLTE PNGARG((png_structp png_ptr, png_colorp palette,
+   png_uint_32 num_pal));
+
+PNG_EXTERN void png_write_IDAT PNGARG((png_structp png_ptr, png_bytep data,
+   png_size_t length));
+
+PNG_EXTERN void png_write_IEND PNGARG((png_structp png_ptr));
+
+#if defined(PNG_WRITE_gAMA_SUPPORTED)
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+PNG_EXTERN void png_write_gAMA PNGARG((png_structp png_ptr, double file_gamma));
+#endif
+#ifdef PNG_FIXED_POINT_SUPPORTED
+PNG_EXTERN void png_write_gAMA_fixed PNGARG((png_structp png_ptr, png_fixed_point
+    file_gamma));
+#endif
+#endif
+
+#if defined(PNG_WRITE_sBIT_SUPPORTED)
+PNG_EXTERN void png_write_sBIT PNGARG((png_structp png_ptr, png_color_8p sbit,
+   int color_type));
+#endif
+
+#if defined(PNG_WRITE_cHRM_SUPPORTED)
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+PNG_EXTERN void png_write_cHRM PNGARG((png_structp png_ptr,
+   double white_x, double white_y,
+   double red_x, double red_y, double green_x, double green_y,
+   double blue_x, double blue_y));
+#endif
+#ifdef PNG_FIXED_POINT_SUPPORTED
+PNG_EXTERN void png_write_cHRM_fixed PNGARG((png_structp png_ptr,
+   png_fixed_point int_white_x, png_fixed_point int_white_y,
+   png_fixed_point int_red_x, png_fixed_point int_red_y, png_fixed_point
+   int_green_x, png_fixed_point int_green_y, png_fixed_point int_blue_x,
+   png_fixed_point int_blue_y));
+#endif
+#endif
+
+#if defined(PNG_WRITE_sRGB_SUPPORTED)
+PNG_EXTERN void png_write_sRGB PNGARG((png_structp png_ptr,
+   int intent));
+#endif
+
+#if defined(PNG_WRITE_iCCP_SUPPORTED)
+PNG_EXTERN void png_write_iCCP PNGARG((png_structp png_ptr,
+   png_charp name, int compression_type,
+   png_charp profile, int proflen));
+   /* Note to maintainer: profile should be png_bytep */
+#endif
+
+#if defined(PNG_WRITE_sPLT_SUPPORTED)
+PNG_EXTERN void png_write_sPLT PNGARG((png_structp png_ptr,
+   png_sPLT_tp palette));
+#endif
+
+#if defined(PNG_WRITE_tRNS_SUPPORTED)
+PNG_EXTERN void png_write_tRNS PNGARG((png_structp png_ptr, png_bytep trans,
+   png_color_16p values, int number, int color_type));
+#endif
+
+#if defined(PNG_WRITE_bKGD_SUPPORTED)
+PNG_EXTERN void png_write_bKGD PNGARG((png_structp png_ptr,
+   png_color_16p values, int color_type));
+#endif
+
+#if defined(PNG_WRITE_hIST_SUPPORTED)
+PNG_EXTERN void png_write_hIST PNGARG((png_structp png_ptr, png_uint_16p hist,
+   int num_hist));
+#endif
+
+#if defined(PNG_WRITE_TEXT_SUPPORTED) || defined(PNG_WRITE_pCAL_SUPPORTED) || \
+    defined(PNG_WRITE_iCCP_SUPPORTED) || defined(PNG_WRITE_sPLT_SUPPORTED)
+PNG_EXTERN png_size_t png_check_keyword PNGARG((png_structp png_ptr,
+   png_charp key, png_charpp new_key));
+#endif
+
+#if defined(PNG_WRITE_tEXt_SUPPORTED)
+PNG_EXTERN void png_write_tEXt PNGARG((png_structp png_ptr, png_charp key,
+   png_charp text, png_size_t text_len));
+#endif
+
+#if defined(PNG_WRITE_zTXt_SUPPORTED)
+PNG_EXTERN void png_write_zTXt PNGARG((png_structp png_ptr, png_charp key,
+   png_charp text, png_size_t text_len, int compression));
+#endif
+
+#if defined(PNG_WRITE_iTXt_SUPPORTED)
+PNG_EXTERN void png_write_iTXt PNGARG((png_structp png_ptr,
+   int compression, png_charp key, png_charp lang, png_charp lang_key,
+   png_charp text));
+#endif
+
+#if defined(PNG_TEXT_SUPPORTED)  /* Added at version 1.0.14 and 1.2.4 */
+PNG_EXTERN int png_set_text_2 PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_textp text_ptr, int num_text));
+#endif
+
+#if defined(PNG_WRITE_oFFs_SUPPORTED)
+PNG_EXTERN void png_write_oFFs PNGARG((png_structp png_ptr,
+   png_int_32 x_offset, png_int_32 y_offset, int unit_type));
+#endif
+
+#if defined(PNG_WRITE_pCAL_SUPPORTED)
+PNG_EXTERN void png_write_pCAL PNGARG((png_structp png_ptr, png_charp purpose,
+   png_int_32 X0, png_int_32 X1, int type, int nparams,
+   png_charp units, png_charpp params));
+#endif
+
+#if defined(PNG_WRITE_pHYs_SUPPORTED)
+PNG_EXTERN void png_write_pHYs PNGARG((png_structp png_ptr,
+   png_uint_32 x_pixels_per_unit, png_uint_32 y_pixels_per_unit,
+   int unit_type));
+#endif
+
+#if defined(PNG_WRITE_tIME_SUPPORTED)
+PNG_EXTERN void png_write_tIME PNGARG((png_structp png_ptr,
+   png_timep mod_time));
+#endif
+
+#if defined(PNG_WRITE_sCAL_SUPPORTED)
+#if defined(PNG_FLOATING_POINT_SUPPORTED) && !defined(PNG_NO_STDIO)
+PNG_EXTERN void png_write_sCAL PNGARG((png_structp png_ptr,
+   int unit, double width, double height));
+#else
+#ifdef PNG_FIXED_POINT_SUPPORTED
+PNG_EXTERN void png_write_sCAL_s PNGARG((png_structp png_ptr,
+   int unit, png_charp width, png_charp height));
+#endif
+#endif
+#endif
+
+/* Called when finished processing a row of data */
+PNG_EXTERN void png_write_finish_row PNGARG((png_structp png_ptr));
+
+/* Internal use only.   Called before first row of data */
+PNG_EXTERN void png_write_start_row PNGARG((png_structp png_ptr));
+
+#if defined(PNG_READ_GAMMA_SUPPORTED)
+PNG_EXTERN void png_build_gamma_table PNGARG((png_structp png_ptr));
+#endif
+
+/* combine a row of data, dealing with alpha, etc. if requested */
+PNG_EXTERN void png_combine_row PNGARG((png_structp png_ptr, png_bytep row,
+   int mask));
+
+#if defined(PNG_READ_INTERLACING_SUPPORTED)
+/* expand an interlaced row */
+/* OLD pre-1.0.9 interface:
+PNG_EXTERN void png_do_read_interlace PNGARG((png_row_infop row_info,
+   png_bytep row, int pass, png_uint_32 transformations));
+ */
+PNG_EXTERN void png_do_read_interlace PNGARG((png_structp png_ptr));
+#endif
+
+/* GRR TO DO (2.0 or whenever):  simplify other internal calling interfaces */
+
+#if defined(PNG_WRITE_INTERLACING_SUPPORTED)
+/* grab pixels out of a row for an interlaced pass */
+PNG_EXTERN void png_do_write_interlace PNGARG((png_row_infop row_info,
+   png_bytep row, int pass));
+#endif
+
+/* unfilter a row */
+PNG_EXTERN void png_read_filter_row PNGARG((png_structp png_ptr,
+   png_row_infop row_info, png_bytep row, png_bytep prev_row, int filter));
+
+/* Choose the best filter to use and filter the row data */
+PNG_EXTERN void png_write_find_filter PNGARG((png_structp png_ptr,
+   png_row_infop row_info));
+
+/* Write out the filtered row. */
+PNG_EXTERN void png_write_filtered_row PNGARG((png_structp png_ptr,
+   png_bytep filtered_row));
+/* finish a row while reading, dealing with interlacing passes, etc. */
+PNG_EXTERN void png_read_finish_row PNGARG((png_structp png_ptr));
+
+/* initialize the row buffers, etc. */
+PNG_EXTERN void png_read_start_row PNGARG((png_structp png_ptr));
+/* optional call to update the users info structure */
+PNG_EXTERN void png_read_transform_info PNGARG((png_structp png_ptr,
+   png_infop info_ptr));
+
+/* these are the functions that do the transformations */
+#if defined(PNG_READ_FILLER_SUPPORTED)
+PNG_EXTERN void png_do_read_filler PNGARG((png_row_infop row_info,
+   png_bytep row, png_uint_32 filler, png_uint_32 flags));
+#endif
+
+#if defined(PNG_READ_SWAP_ALPHA_SUPPORTED)
+PNG_EXTERN void png_do_read_swap_alpha PNGARG((png_row_infop row_info,
+   png_bytep row));
+#endif
+
+#if defined(PNG_WRITE_SWAP_ALPHA_SUPPORTED)
+PNG_EXTERN void png_do_write_swap_alpha PNGARG((png_row_infop row_info,
+   png_bytep row));
+#endif
+
+#if defined(PNG_READ_INVERT_ALPHA_SUPPORTED)
+PNG_EXTERN void png_do_read_invert_alpha PNGARG((png_row_infop row_info,
+   png_bytep row));
+#endif
+
+#if defined(PNG_WRITE_INVERT_ALPHA_SUPPORTED)
+PNG_EXTERN void png_do_write_invert_alpha PNGARG((png_row_infop row_info,
+   png_bytep row));
+#endif
+
+#if defined(PNG_WRITE_FILLER_SUPPORTED) || \
+    defined(PNG_READ_STRIP_ALPHA_SUPPORTED)
+PNG_EXTERN void png_do_strip_filler PNGARG((png_row_infop row_info,
+   png_bytep row, png_uint_32 flags));
+#endif
+
+#if defined(PNG_READ_SWAP_SUPPORTED) || defined(PNG_WRITE_SWAP_SUPPORTED)
+PNG_EXTERN void png_do_swap PNGARG((png_row_infop row_info, png_bytep row));
+#endif
+
+#if defined(PNG_READ_PACKSWAP_SUPPORTED) || defined(PNG_WRITE_PACKSWAP_SUPPORTED)
+PNG_EXTERN void png_do_packswap PNGARG((png_row_infop row_info, png_bytep row));
+#endif
+
+#if defined(PNG_READ_RGB_TO_GRAY_SUPPORTED)
+PNG_EXTERN int png_do_rgb_to_gray PNGARG((png_structp png_ptr, png_row_infop
+   row_info, png_bytep row));
+#endif
+
+#if defined(PNG_READ_GRAY_TO_RGB_SUPPORTED)
+PNG_EXTERN void png_do_gray_to_rgb PNGARG((png_row_infop row_info,
+   png_bytep row));
+#endif
+
+#if defined(PNG_READ_PACK_SUPPORTED)
+PNG_EXTERN void png_do_unpack PNGARG((png_row_infop row_info, png_bytep row));
+#endif
+
+#if defined(PNG_READ_SHIFT_SUPPORTED)
+PNG_EXTERN void png_do_unshift PNGARG((png_row_infop row_info, png_bytep row,
+   png_color_8p sig_bits));
+#endif
+
+#if defined(PNG_READ_INVERT_SUPPORTED) || defined(PNG_WRITE_INVERT_SUPPORTED)
+PNG_EXTERN void png_do_invert PNGARG((png_row_infop row_info, png_bytep row));
+#endif
+
+#if defined(PNG_READ_16_TO_8_SUPPORTED)
+PNG_EXTERN void png_do_chop PNGARG((png_row_infop row_info, png_bytep row));
+#endif
+
+#if defined(PNG_READ_DITHER_SUPPORTED)
+PNG_EXTERN void png_do_dither PNGARG((png_row_infop row_info,
+   png_bytep row, png_bytep palette_lookup, png_bytep dither_lookup));
+
+#  if defined(PNG_CORRECT_PALETTE_SUPPORTED)
+PNG_EXTERN void png_correct_palette PNGARG((png_structp png_ptr,
+   png_colorp palette, int num_palette));
+#  endif
+#endif
+
+#if defined(PNG_READ_BGR_SUPPORTED) || defined(PNG_WRITE_BGR_SUPPORTED)
+PNG_EXTERN void png_do_bgr PNGARG((png_row_infop row_info, png_bytep row));
+#endif
+
+#if defined(PNG_WRITE_PACK_SUPPORTED)
+PNG_EXTERN void png_do_pack PNGARG((png_row_infop row_info,
+   png_bytep row, png_uint_32 bit_depth));
+#endif
+
+#if defined(PNG_WRITE_SHIFT_SUPPORTED)
+PNG_EXTERN void png_do_shift PNGARG((png_row_infop row_info, png_bytep row,
+   png_color_8p bit_depth));
+#endif
+
+#if defined(PNG_READ_BACKGROUND_SUPPORTED)
+#if defined(PNG_READ_GAMMA_SUPPORTED)
+PNG_EXTERN void png_do_background PNGARG((png_row_infop row_info, png_bytep row,
+   png_color_16p trans_values, png_color_16p background,
+   png_color_16p background_1,
+   png_bytep gamma_table, png_bytep gamma_from_1, png_bytep gamma_to_1,
+   png_uint_16pp gamma_16, png_uint_16pp gamma_16_from_1,
+   png_uint_16pp gamma_16_to_1, int gamma_shift));
+#else
+PNG_EXTERN void png_do_background PNGARG((png_row_infop row_info, png_bytep row,
+   png_color_16p trans_values, png_color_16p background));
+#endif
+#endif
+
+#if defined(PNG_READ_GAMMA_SUPPORTED)
+PNG_EXTERN void png_do_gamma PNGARG((png_row_infop row_info, png_bytep row,
+   png_bytep gamma_table, png_uint_16pp gamma_16_table,
+   int gamma_shift));
+#endif
+
+#if defined(PNG_READ_EXPAND_SUPPORTED)
+PNG_EXTERN void png_do_expand_palette PNGARG((png_row_infop row_info,
+   png_bytep row, png_colorp palette, png_bytep trans, int num_trans));
+PNG_EXTERN void png_do_expand PNGARG((png_row_infop row_info,
+   png_bytep row, png_color_16p trans_value));
+#endif
+
+/* The following decodes the appropriate chunks, and does error correction,
+ * then calls the appropriate callback for the chunk if it is valid.
+ */
+
+/* decode the IHDR chunk */
+PNG_EXTERN void png_handle_IHDR PNGARG((png_structp png_ptr, png_infop info_ptr,
+   png_uint_32 length));
+PNG_EXTERN void png_handle_PLTE PNGARG((png_structp png_ptr, png_infop info_ptr,
+   png_uint_32 length));
+PNG_EXTERN void png_handle_IEND PNGARG((png_structp png_ptr, png_infop info_ptr,
+   png_uint_32 length));
+
+#if defined(PNG_READ_bKGD_SUPPORTED)
+PNG_EXTERN void png_handle_bKGD PNGARG((png_structp png_ptr, png_infop info_ptr,
+   png_uint_32 length));
+#endif
+
+#if defined(PNG_READ_cHRM_SUPPORTED)
+PNG_EXTERN void png_handle_cHRM PNGARG((png_structp png_ptr, png_infop info_ptr,
+   png_uint_32 length));
+#endif
+
+#if defined(PNG_READ_gAMA_SUPPORTED)
+PNG_EXTERN void png_handle_gAMA PNGARG((png_structp png_ptr, png_infop info_ptr,
+   png_uint_32 length));
+#endif
+
+#if defined(PNG_READ_hIST_SUPPORTED)
+PNG_EXTERN void png_handle_hIST PNGARG((png_structp png_ptr, png_infop info_ptr,
+   png_uint_32 length));
+#endif
+
+#if defined(PNG_READ_iCCP_SUPPORTED)
+extern void png_handle_iCCP PNGARG((png_structp png_ptr, png_infop info_ptr,
+   png_uint_32 length));
+#endif /* PNG_READ_iCCP_SUPPORTED */
+
+#if defined(PNG_READ_iTXt_SUPPORTED)
+PNG_EXTERN void png_handle_iTXt PNGARG((png_structp png_ptr, png_infop info_ptr,
+   png_uint_32 length));
+#endif
+
+#if defined(PNG_READ_oFFs_SUPPORTED)
+PNG_EXTERN void png_handle_oFFs PNGARG((png_structp png_ptr, png_infop info_ptr,
+   png_uint_32 length));
+#endif
+
+#if defined(PNG_READ_pCAL_SUPPORTED)
+PNG_EXTERN void png_handle_pCAL PNGARG((png_structp png_ptr, png_infop info_ptr,
+   png_uint_32 length));
+#endif
+
+#if defined(PNG_READ_pHYs_SUPPORTED)
+PNG_EXTERN void png_handle_pHYs PNGARG((png_structp png_ptr, png_infop info_ptr,
+   png_uint_32 length));
+#endif
+
+#if defined(PNG_READ_sBIT_SUPPORTED)
+PNG_EXTERN void png_handle_sBIT PNGARG((png_structp png_ptr, png_infop info_ptr,
+   png_uint_32 length));
+#endif
+
+#if defined(PNG_READ_sCAL_SUPPORTED)
+PNG_EXTERN void png_handle_sCAL PNGARG((png_structp png_ptr, png_infop info_ptr,
+   png_uint_32 length));
+#endif
+
+#if defined(PNG_READ_sPLT_SUPPORTED)
+extern void png_handle_sPLT PNGARG((png_structp png_ptr, png_infop info_ptr,
+   png_uint_32 length));
+#endif /* PNG_READ_sPLT_SUPPORTED */
+
+#if defined(PNG_READ_sRGB_SUPPORTED)
+PNG_EXTERN void png_handle_sRGB PNGARG((png_structp png_ptr, png_infop info_ptr,
+   png_uint_32 length));
+#endif
+
+#if defined(PNG_READ_tEXt_SUPPORTED)
+PNG_EXTERN void png_handle_tEXt PNGARG((png_structp png_ptr, png_infop info_ptr,
+   png_uint_32 length));
+#endif
+
+#if defined(PNG_READ_tIME_SUPPORTED)
+PNG_EXTERN void png_handle_tIME PNGARG((png_structp png_ptr, png_infop info_ptr,
+   png_uint_32 length));
+#endif
+
+#if defined(PNG_READ_tRNS_SUPPORTED)
+PNG_EXTERN void png_handle_tRNS PNGARG((png_structp png_ptr, png_infop info_ptr,
+   png_uint_32 length));
+#endif
+
+#if defined(PNG_READ_zTXt_SUPPORTED)
+PNG_EXTERN void png_handle_zTXt PNGARG((png_structp png_ptr, png_infop info_ptr,
+   png_uint_32 length));
+#endif
+
+PNG_EXTERN void png_handle_unknown PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_uint_32 length));
+
+PNG_EXTERN void png_check_chunk_name PNGARG((png_structp png_ptr,
+   png_bytep chunk_name));
+
+/* handle the transformations for reading and writing */
+PNG_EXTERN void png_do_read_transformations PNGARG((png_structp png_ptr));
+PNG_EXTERN void png_do_write_transformations PNGARG((png_structp png_ptr));
+
+PNG_EXTERN void png_init_read_transformations PNGARG((png_structp png_ptr));
+
+#ifdef PNG_PROGRESSIVE_READ_SUPPORTED
+PNG_EXTERN void png_push_read_chunk PNGARG((png_structp png_ptr,
+   png_infop info_ptr));
+PNG_EXTERN void png_push_read_sig PNGARG((png_structp png_ptr,
+   png_infop info_ptr));
+PNG_EXTERN void png_push_check_crc PNGARG((png_structp png_ptr));
+PNG_EXTERN void png_push_crc_skip PNGARG((png_structp png_ptr,
+   png_uint_32 length));
+PNG_EXTERN void png_push_crc_finish PNGARG((png_structp png_ptr));
+PNG_EXTERN void png_push_save_buffer PNGARG((png_structp png_ptr));
+PNG_EXTERN void png_push_restore_buffer PNGARG((png_structp png_ptr,
+   png_bytep buffer, png_size_t buffer_length));
+PNG_EXTERN void png_push_read_IDAT PNGARG((png_structp png_ptr));
+PNG_EXTERN void png_process_IDAT_data PNGARG((png_structp png_ptr,
+   png_bytep buffer, png_size_t buffer_length));
+PNG_EXTERN void png_push_process_row PNGARG((png_structp png_ptr));
+PNG_EXTERN void png_push_handle_unknown PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_uint_32 length));
+PNG_EXTERN void png_push_have_info PNGARG((png_structp png_ptr,
+   png_infop info_ptr));
+PNG_EXTERN void png_push_have_end PNGARG((png_structp png_ptr,
+   png_infop info_ptr));
+PNG_EXTERN void png_push_have_row PNGARG((png_structp png_ptr, png_bytep row));
+PNG_EXTERN void png_push_read_end PNGARG((png_structp png_ptr,
+   png_infop info_ptr));
+PNG_EXTERN void png_process_some_data PNGARG((png_structp png_ptr,
+   png_infop info_ptr));
+PNG_EXTERN void png_read_push_finish_row PNGARG((png_structp png_ptr));
+#if defined(PNG_READ_tEXt_SUPPORTED)
+PNG_EXTERN void png_push_handle_tEXt PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_uint_32 length));
+PNG_EXTERN void png_push_read_tEXt PNGARG((png_structp png_ptr,
+   png_infop info_ptr));
+#endif
+#if defined(PNG_READ_zTXt_SUPPORTED)
+PNG_EXTERN void png_push_handle_zTXt PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_uint_32 length));
+PNG_EXTERN void png_push_read_zTXt PNGARG((png_structp png_ptr,
+   png_infop info_ptr));
+#endif
+#if defined(PNG_READ_iTXt_SUPPORTED)
+PNG_EXTERN void png_push_handle_iTXt PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_uint_32 length));
+PNG_EXTERN void png_push_read_iTXt PNGARG((png_structp png_ptr,
+   png_infop info_ptr));
+#endif
+
+#endif /* PNG_PROGRESSIVE_READ_SUPPORTED */
+
+#ifdef PNG_MNG_FEATURES_SUPPORTED
+PNG_EXTERN void png_do_read_intrapixel PNGARG((png_row_infop row_info,
+   png_bytep row));
+PNG_EXTERN void png_do_write_intrapixel PNGARG((png_row_infop row_info,
+   png_bytep row));
+#endif
+
+#if defined(PNG_ASSEMBLER_CODE_SUPPORTED)
+#if defined(PNG_MMX_CODE_SUPPORTED)
+/* png.c */ /* PRIVATE */
+PNG_EXTERN void png_init_mmx_flags PNGARG((png_structp png_ptr));
+#endif
+#endif
+
+#if defined(PNG_INCH_CONVERSIONS) && defined(PNG_FLOATING_POINT_SUPPORTED)
+PNG_EXTERN png_uint_32 png_get_pixels_per_inch PNGARG((png_structp png_ptr,
+png_infop info_ptr));
+
+PNG_EXTERN png_uint_32 png_get_x_pixels_per_inch PNGARG((png_structp png_ptr,
+png_infop info_ptr));
+
+PNG_EXTERN png_uint_32 png_get_y_pixels_per_inch PNGARG((png_structp png_ptr,
+png_infop info_ptr));
+
+PNG_EXTERN float png_get_x_offset_inches PNGARG((png_structp png_ptr,
+png_infop info_ptr));
+
+PNG_EXTERN float png_get_y_offset_inches PNGARG((png_structp png_ptr,
+png_infop info_ptr));
+
+#if defined(PNG_pHYs_SUPPORTED)
+PNG_EXTERN png_uint_32 png_get_pHYs_dpi PNGARG((png_structp png_ptr,
+png_infop info_ptr, png_uint_32 *res_x, png_uint_32 *res_y, int *unit_type));
+#endif /* PNG_pHYs_SUPPORTED */
+#endif  /* PNG_INCH_CONVERSIONS && PNG_FLOATING_POINT_SUPPORTED */
+
+/* Maintainer: Put new private prototypes here ^ and in libpngpf.3 */
+
+#endif /* PNG_INTERNAL */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* PNG_VERSION_INFO_ONLY */
+/* do not put anything past this line */
+#endif /* PNG_H */
diff --git a/uppsrc/plugin/png/lib/pngconf.h b/uppsrc/plugin/png/lib/pngconf.h
new file mode 100644
index 000000000..fde1995a4
--- /dev/null
+++ b/uppsrc/plugin/png/lib/pngconf.h
@@ -0,0 +1,1483 @@
+
+/* pngconf.h - machine configurable file for libpng
+ *
+ * libpng version 1.2.22 - October 13, 2007
+ * For conditions of distribution and use, see copyright notice in png.h
+ * Copyright (c) 1998-2007 Glenn Randers-Pehrson
+ * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
+ * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
+ */
+
+/* Any machine specific code is near the front of this file, so if you
+ * are configuring libpng for a machine, you may want to read the section
+ * starting here down to where it starts to typedef png_color, png_text,
+ * and png_info.
+ */
+
+#ifndef PNGCONF_H
+#define PNGCONF_H
+
+#define PNG_1_2_X
+
+/*
+ * PNG_USER_CONFIG has to be defined on the compiler command line. This
+ * includes the resource compiler for Windows DLL configurations.
+ */
+#ifdef PNG_USER_CONFIG
+#  ifndef PNG_USER_PRIVATEBUILD
+#    define PNG_USER_PRIVATEBUILD
+#  endif
+#include "pngusr.h"
+#endif
+
+/* PNG_CONFIGURE_LIBPNG is set by the "configure" script. */
+#ifdef PNG_CONFIGURE_LIBPNG
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+#endif
+
+/*
+ * Added at libpng-1.2.8
+ *
+ * If you create a private DLL you need to define in "pngusr.h" the followings:
+ * #define PNG_USER_PRIVATEBUILD <Describes by whom and why this version of
+ *        the DLL was built>
+ *  e.g. #define PNG_USER_PRIVATEBUILD "Build by MyCompany for xyz reasons."
+ * #define PNG_USER_DLLFNAME_POSTFIX <two-letter postfix that serve to
+ *        distinguish your DLL from those of the official release. These
+ *        correspond to the trailing letters that come after the version
+ *        number and must match your private DLL name>
+ *  e.g. // private DLL "libpng13gx.dll"
+ *       #define PNG_USER_DLLFNAME_POSTFIX "gx"
+ *
+ * The following macros are also at your disposal if you want to complete the
+ * DLL VERSIONINFO structure.
+ * - PNG_USER_VERSIONINFO_COMMENTS
+ * - PNG_USER_VERSIONINFO_COMPANYNAME
+ * - PNG_USER_VERSIONINFO_LEGALTRADEMARKS
+ */
+
+#ifdef __STDC__
+#ifdef SPECIALBUILD
+#  pragma message("PNG_LIBPNG_SPECIALBUILD (and deprecated SPECIALBUILD)\
+ are now LIBPNG reserved macros. Use PNG_USER_PRIVATEBUILD instead.")
+#endif
+
+#ifdef PRIVATEBUILD
+# pragma message("PRIVATEBUILD is deprecated.\
+ Use PNG_USER_PRIVATEBUILD instead.")
+# define PNG_USER_PRIVATEBUILD PRIVATEBUILD
+#endif
+#endif /* __STDC__ */
+
+#ifndef PNG_VERSION_INFO_ONLY
+
+/* End of material added to libpng-1.2.8 */
+
+/* Added at libpng-1.2.19, removed at libpng-1.2.20 because it caused trouble
+   Restored at libpng-1.2.21 */
+#if !defined(PNG_NO_WARN_UNINITIALIZED_ROW) && \
+    !defined(PNG_WARN_UNINITIALIZED_ROW)
+#  define PNG_WARN_UNINITIALIZED_ROW 1
+#endif
+/* End of material added at libpng-1.2.19/1.2.21 */
+
+/* This is the size of the compression buffer, and thus the size of
+ * an IDAT chunk.  Make this whatever size you feel is best for your
+ * machine.  One of these will be allocated per png_struct.  When this
+ * is full, it writes the data to the disk, and does some other
+ * calculations.  Making this an extremely small size will slow
+ * the library down, but you may want to experiment to determine
+ * where it becomes significant, if you are concerned with memory
+ * usage.  Note that zlib allocates at least 32Kb also.  For readers,
+ * this describes the size of the buffer available to read the data in.
+ * Unless this gets smaller than the size of a row (compressed),
+ * it should not make much difference how big this is.
+ */
+
+#ifndef PNG_ZBUF_SIZE
+#  define PNG_ZBUF_SIZE 8192
+#endif
+
+/* Enable if you want a write-only libpng */
+
+#ifndef PNG_NO_READ_SUPPORTED
+#  define PNG_READ_SUPPORTED
+#endif
+
+/* Enable if you want a read-only libpng */
+
+#ifndef PNG_NO_WRITE_SUPPORTED
+#  define PNG_WRITE_SUPPORTED
+#endif
+
+/* Enabled by default in 1.2.0.  You can disable this if you don't need to
+   support PNGs that are embedded in MNG datastreams */
+#if !defined(PNG_1_0_X) && !defined(PNG_NO_MNG_FEATURES)
+#  ifndef PNG_MNG_FEATURES_SUPPORTED
+#    define PNG_MNG_FEATURES_SUPPORTED
+#  endif
+#endif
+
+#ifndef PNG_NO_FLOATING_POINT_SUPPORTED
+#  ifndef PNG_FLOATING_POINT_SUPPORTED
+#    define PNG_FLOATING_POINT_SUPPORTED
+#  endif
+#endif
+
+/* If you are running on a machine where you cannot allocate more
+ * than 64K of memory at once, uncomment this.  While libpng will not
+ * normally need that much memory in a chunk (unless you load up a very
+ * large file), zlib needs to know how big of a chunk it can use, and
+ * libpng thus makes sure to check any memory allocation to verify it
+ * will fit into memory.
+#define PNG_MAX_MALLOC_64K
+ */
+#if defined(MAXSEG_64K) && !defined(PNG_MAX_MALLOC_64K)
+#  define PNG_MAX_MALLOC_64K
+#endif
+
+/* Special munging to support doing things the 'cygwin' way:
+ * 'Normal' png-on-win32 defines/defaults:
+ *   PNG_BUILD_DLL -- building dll
+ *   PNG_USE_DLL   -- building an application, linking to dll
+ *   (no define)   -- building static library, or building an
+ *                    application and linking to the static lib
+ * 'Cygwin' defines/defaults:
+ *   PNG_BUILD_DLL -- (ignored) building the dll
+ *   (no define)   -- (ignored) building an application, linking to the dll
+ *   PNG_STATIC    -- (ignored) building the static lib, or building an
+ *                    application that links to the static lib.
+ *   ALL_STATIC    -- (ignored) building various static libs, or building an
+ *                    application that links to the static libs.
+ * Thus,
+ * a cygwin user should define either PNG_BUILD_DLL or PNG_STATIC, and
+ * this bit of #ifdefs will define the 'correct' config variables based on
+ * that. If a cygwin user *wants* to define 'PNG_USE_DLL' that's okay, but
+ * unnecessary.
+ *
+ * Also, the precedence order is:
+ *   ALL_STATIC (since we can't #undef something outside our namespace)
+ *   PNG_BUILD_DLL
+ *   PNG_STATIC
+ *   (nothing) == PNG_USE_DLL
+ *
+ * CYGWIN (2002-01-20): The preceding is now obsolete. With the advent
+ *   of auto-import in binutils, we no longer need to worry about
+ *   __declspec(dllexport) / __declspec(dllimport) and friends.  Therefore,
+ *   we don't need to worry about PNG_STATIC or ALL_STATIC when it comes
+ *   to __declspec() stuff.  However, we DO need to worry about
+ *   PNG_BUILD_DLL and PNG_STATIC because those change some defaults
+ *   such as CONSOLE_IO and whether GLOBAL_ARRAYS are allowed.
+ */
+#if defined(__CYGWIN__)
+#  if defined(ALL_STATIC)
+#    if defined(PNG_BUILD_DLL)
+#      undef PNG_BUILD_DLL
+#    endif
+#    if defined(PNG_USE_DLL)
+#      undef PNG_USE_DLL
+#    endif
+#    if defined(PNG_DLL)
+#      undef PNG_DLL
+#    endif
+#    if !defined(PNG_STATIC)
+#      define PNG_STATIC
+#    endif
+#  else
+#    if defined (PNG_BUILD_DLL)
+#      if defined(PNG_STATIC)
+#        undef PNG_STATIC
+#      endif
+#      if defined(PNG_USE_DLL)
+#        undef PNG_USE_DLL
+#      endif
+#      if !defined(PNG_DLL)
+#        define PNG_DLL
+#      endif
+#    else
+#      if defined(PNG_STATIC)
+#        if defined(PNG_USE_DLL)
+#          undef PNG_USE_DLL
+#        endif
+#        if defined(PNG_DLL)
+#          undef PNG_DLL
+#        endif
+#      else
+#        if !defined(PNG_USE_DLL)
+#          define PNG_USE_DLL
+#        endif
+#        if !defined(PNG_DLL)
+#          define PNG_DLL
+#        endif
+#      endif
+#    endif
+#  endif
+#endif
+
+/* This protects us against compilers that run on a windowing system
+ * and thus don't have or would rather us not use the stdio types:
+ * stdin, stdout, and stderr.  The only one currently used is stderr
+ * in png_error() and png_warning().  #defining PNG_NO_CONSOLE_IO will
+ * prevent these from being compiled and used. #defining PNG_NO_STDIO
+ * will also prevent these, plus will prevent the entire set of stdio
+ * macros and functions (FILE *, printf, etc.) from being compiled and used,
+ * unless (PNG_DEBUG > 0) has been #defined.
+ *
+ * #define PNG_NO_CONSOLE_IO
+ * #define PNG_NO_STDIO
+ */
+
+#if defined(_WIN32_WCE)
+#  include <windows.h>
+   /* Console I/O functions are not supported on WindowsCE */
+#  define PNG_NO_CONSOLE_IO
+#  ifdef PNG_DEBUG
+#    undef PNG_DEBUG
+#  endif
+#endif
+
+#ifdef PNG_BUILD_DLL
+#  ifndef PNG_CONSOLE_IO_SUPPORTED
+#    ifndef PNG_NO_CONSOLE_IO
+#      define PNG_NO_CONSOLE_IO
+#    endif
+#  endif
+#endif
+
+#  ifdef PNG_NO_STDIO
+#    ifndef PNG_NO_CONSOLE_IO
+#      define PNG_NO_CONSOLE_IO
+#    endif
+#    ifdef PNG_DEBUG
+#      if (PNG_DEBUG > 0)
+#        include <stdio.h>
+#      endif
+#    endif
+#  else
+#    if !defined(_WIN32_WCE)
+/* "stdio.h" functions are not supported on WindowsCE */
+#      include <stdio.h>
+#    endif
+#  endif
+
+/* This macro protects us against machines that don't have function
+ * prototypes (ie K&R style headers).  If your compiler does not handle
+ * function prototypes, define this macro and use the included ansi2knr.
+ * I've always been able to use _NO_PROTO as the indicator, but you may
+ * need to drag the empty declaration out in front of here, or change the
+ * ifdef to suit your own needs.
+ */
+#ifndef PNGARG
+
+#ifdef OF /* zlib prototype munger */
+#  define PNGARG(arglist) OF(arglist)
+#else
+
+#ifdef _NO_PROTO
+#  define PNGARG(arglist) ()
+#  ifndef PNG_TYPECAST_NULL
+#     define PNG_TYPECAST_NULL
+#  endif
+#else
+#  define PNGARG(arglist) arglist
+#endif /* _NO_PROTO */
+
+
+#endif /* OF */
+
+#endif /* PNGARG */
+
+/* Try to determine if we are compiling on a Mac.  Note that testing for
+ * just __MWERKS__ is not good enough, because the Codewarrior is now used
+ * on non-Mac platforms.
+ */
+#ifndef MACOS
+#  if (defined(__MWERKS__) && defined(macintosh)) || defined(applec) || \
+      defined(THINK_C) || defined(__SC__) || defined(TARGET_OS_MAC)
+#    define MACOS
+#  endif
+#endif
+
+/* enough people need this for various reasons to include it here */
+#if !defined(MACOS) && !defined(RISCOS) && !defined(_WIN32_WCE)
+#  include <sys/types.h>
+#endif
+
+#if !defined(PNG_SETJMP_NOT_SUPPORTED) && !defined(PNG_NO_SETJMP_SUPPORTED)
+#  define PNG_SETJMP_SUPPORTED
+#endif
+
+#ifdef PNG_SETJMP_SUPPORTED
+/* This is an attempt to force a single setjmp behaviour on Linux.  If
+ * the X config stuff didn't define _BSD_SOURCE we wouldn't need this.
+ */
+
+#  ifdef __linux__
+#    ifdef _BSD_SOURCE
+#      define PNG_SAVE_BSD_SOURCE
+#      undef _BSD_SOURCE
+#    endif
+#    ifdef _SETJMP_H
+     /* If you encounter a compiler error here, see the explanation
+      * near the end of INSTALL.
+      */
+         __png.h__ already includes setjmp.h;
+         __dont__ include it again.;
+#    endif
+#  endif /* __linux__ */
+
+   /* include setjmp.h for error handling */
+#  include <setjmp.h>
+
+#  ifdef __linux__
+#    ifdef PNG_SAVE_BSD_SOURCE
+#      define _BSD_SOURCE
+#      undef PNG_SAVE_BSD_SOURCE
+#    endif
+#  endif /* __linux__ */
+#endif /* PNG_SETJMP_SUPPORTED */
+
+#ifdef BSD
+#  include <strings.h>
+#else
+#  include <string.h>
+#endif
+
+/* Other defines for things like memory and the like can go here.  */
+#ifdef PNG_INTERNAL
+
+#include <stdlib.h>
+
+/* The functions exported by PNG_EXTERN are PNG_INTERNAL functions, which
+ * aren't usually used outside the library (as far as I know), so it is
+ * debatable if they should be exported at all.  In the future, when it is
+ * possible to have run-time registry of chunk-handling functions, some of
+ * these will be made available again.
+#define PNG_EXTERN extern
+ */
+#define PNG_EXTERN
+
+/* Other defines specific to compilers can go here.  Try to keep
+ * them inside an appropriate ifdef/endif pair for portability.
+ */
+
+#if defined(PNG_FLOATING_POINT_SUPPORTED)
+#  if defined(MACOS)
+     /* We need to check that <math.h> hasn't already been included earlier
+      * as it seems it doesn't agree with <fp.h>, yet we should really use
+      * <fp.h> if possible.
+      */
+#    if !defined(__MATH_H__) && !defined(__MATH_H) && !defined(__cmath__)
+#      include <fp.h>
+#    endif
+#  else
+#    include <math.h>
+#  endif
+#  if defined(_AMIGA) && defined(__SASC) && defined(_M68881)
+     /* Amiga SAS/C: We must include builtin FPU functions when compiling using
+      * MATH=68881
+      */
+#    include <m68881.h>
+#  endif
+#endif
+
+/* Codewarrior on NT has linking problems without this. */
+#if (defined(__MWERKS__) && defined(WIN32)) || defined(__STDC__)
+#  define PNG_ALWAYS_EXTERN
+#endif
+
+/* This provides the non-ANSI (far) memory allocation routines. */
+#if defined(__TURBOC__) && defined(__MSDOS__)
+#  include <mem.h>
+#  include <alloc.h>
+#endif
+
+/* I have no idea why is this necessary... */
+#if defined(_MSC_VER) && (defined(WIN32) || defined(_Windows) || \
+    defined(_WINDOWS) || defined(_WIN32) || defined(__WIN32__))
+#  include <malloc.h>
+#endif
+
+/* This controls how fine the dithering gets.  As this allocates
+ * a largish chunk of memory (32K), those who are not as concerned
+ * with dithering quality can decrease some or all of these.
+ */
+#ifndef PNG_DITHER_RED_BITS
+#  define PNG_DITHER_RED_BITS 5
+#endif
+#ifndef PNG_DITHER_GREEN_BITS
+#  define PNG_DITHER_GREEN_BITS 5
+#endif
+#ifndef PNG_DITHER_BLUE_BITS
+#  define PNG_DITHER_BLUE_BITS 5
+#endif
+
+/* This controls how fine the gamma correction becomes when you
+ * are only interested in 8 bits anyway.  Increasing this value
+ * results in more memory being used, and more pow() functions
+ * being called to fill in the gamma tables.  Don't set this value
+ * less then 8, and even that may not work (I haven't tested it).
+ */
+
+#ifndef PNG_MAX_GAMMA_8
+#  define PNG_MAX_GAMMA_8 11
+#endif
+
+/* This controls how much a difference in gamma we can tolerate before
+ * we actually start doing gamma conversion.
+ */
+#ifndef PNG_GAMMA_THRESHOLD
+#  define PNG_GAMMA_THRESHOLD 0.05
+#endif
+
+#endif /* PNG_INTERNAL */
+
+/* The following uses const char * instead of char * for error
+ * and warning message functions, so some compilers won't complain.
+ * If you do not want to use const, define PNG_NO_CONST here.
+ */
+
+#ifndef PNG_NO_CONST
+#  define PNG_CONST const
+#else
+#  define PNG_CONST
+#endif
+
+/* The following defines give you the ability to remove code from the
+ * library that you will not be using.  I wish I could figure out how to
+ * automate this, but I can't do that without making it seriously hard
+ * on the users.  So if you are not using an ability, change the #define
+ * to and #undef, and that part of the library will not be compiled.  If
+ * your linker can't find a function, you may want to make sure the
+ * ability is defined here.  Some of these depend upon some others being
+ * defined.  I haven't figured out all the interactions here, so you may
+ * have to experiment awhile to get everything to compile.  If you are
+ * creating or using a shared library, you probably shouldn't touch this,
+ * as it will affect the size of the structures, and this will cause bad
+ * things to happen if the library and/or application ever change.
+ */
+
+/* Any features you will not be using can be undef'ed here */
+
+/* GR-P, 0.96a: Set "*TRANSFORMS_SUPPORTED as default but allow user
+ * to turn it off with "*TRANSFORMS_NOT_SUPPORTED" or *PNG_NO_*_TRANSFORMS
+ * on the compile line, then pick and choose which ones to define without
+ * having to edit this file. It is safe to use the *TRANSFORMS_NOT_SUPPORTED
+ * if you only want to have a png-compliant reader/writer but don't need
+ * any of the extra transformations.  This saves about 80 kbytes in a
+ * typical installation of the library. (PNG_NO_* form added in version
+ * 1.0.1c, for consistency)
+ */
+
+/* The size of the png_text structure changed in libpng-1.0.6 when
+ * iTXt support was added.  iTXt support was turned off by default through
+ * libpng-1.2.x, to support old apps that malloc the png_text structure
+ * instead of calling png_set_text() and letting libpng malloc it.  It
+ * was turned on by default in libpng-1.3.0.
+ */
+
+#if defined(PNG_1_0_X) || defined (PNG_1_2_X)
+#  ifndef PNG_NO_iTXt_SUPPORTED
+#    define PNG_NO_iTXt_SUPPORTED
+#  endif
+#  ifndef PNG_NO_READ_iTXt
+#    define PNG_NO_READ_iTXt
+#  endif
+#  ifndef PNG_NO_WRITE_iTXt
+#    define PNG_NO_WRITE_iTXt
+#  endif
+#endif
+
+#if !defined(PNG_NO_iTXt_SUPPORTED)
+#  if !defined(PNG_READ_iTXt_SUPPORTED) && !defined(PNG_NO_READ_iTXt)
+#    define PNG_READ_iTXt
+#  endif
+#  if !defined(PNG_WRITE_iTXt_SUPPORTED) && !defined(PNG_NO_WRITE_iTXt)
+#    define PNG_WRITE_iTXt
+#  endif
+#endif
+
+/* The following support, added after version 1.0.0, can be turned off here en
+ * masse by defining PNG_LEGACY_SUPPORTED in case you need binary compatibility
+ * with old applications that require the length of png_struct and png_info
+ * to remain unchanged.
+ */
+
+#ifdef PNG_LEGACY_SUPPORTED
+#  define PNG_NO_FREE_ME
+#  define PNG_NO_READ_UNKNOWN_CHUNKS
+#  define PNG_NO_WRITE_UNKNOWN_CHUNKS
+#  define PNG_NO_READ_USER_CHUNKS
+#  define PNG_NO_READ_iCCP
+#  define PNG_NO_WRITE_iCCP
+#  define PNG_NO_READ_iTXt
+#  define PNG_NO_WRITE_iTXt
+#  define PNG_NO_READ_sCAL
+#  define PNG_NO_WRITE_sCAL
+#  define PNG_NO_READ_sPLT
+#  define PNG_NO_WRITE_sPLT
+#  define PNG_NO_INFO_IMAGE
+#  define PNG_NO_READ_RGB_TO_GRAY
+#  define PNG_NO_READ_USER_TRANSFORM
+#  define PNG_NO_WRITE_USER_TRANSFORM
+#  define PNG_NO_USER_MEM
+#  define PNG_NO_READ_EMPTY_PLTE
+#  define PNG_NO_MNG_FEATURES
+#  define PNG_NO_FIXED_POINT_SUPPORTED
+#endif
+
+/* Ignore attempt to turn off both floating and fixed point support */
+#if !defined(PNG_FLOATING_POINT_SUPPORTED) || \
+    !defined(PNG_NO_FIXED_POINT_SUPPORTED)
+#  define PNG_FIXED_POINT_SUPPORTED
+#endif
+
+#ifndef PNG_NO_FREE_ME
+#  define PNG_FREE_ME_SUPPORTED
+#endif
+
+#if defined(PNG_READ_SUPPORTED)
+
+#if !defined(PNG_READ_TRANSFORMS_NOT_SUPPORTED) && \
+      !defined(PNG_NO_READ_TRANSFORMS)
+#  define PNG_READ_TRANSFORMS_SUPPORTED
+#endif
+
+#ifdef PNG_READ_TRANSFORMS_SUPPORTED
+#  ifndef PNG_NO_READ_EXPAND
+#    define PNG_READ_EXPAND_SUPPORTED
+#  endif
+#  ifndef PNG_NO_READ_SHIFT
+#    define PNG_READ_SHIFT_SUPPORTED
+#  endif
+#  ifndef PNG_NO_READ_PACK
+#    define PNG_READ_PACK_SUPPORTED
+#  endif
+#  ifndef PNG_NO_READ_BGR
+#    define PNG_READ_BGR_SUPPORTED
+#  endif
+#  ifndef PNG_NO_READ_SWAP
+#    define PNG_READ_SWAP_SUPPORTED
+#  endif
+#  ifndef PNG_NO_READ_PACKSWAP
+#    define PNG_READ_PACKSWAP_SUPPORTED
+#  endif
+#  ifndef PNG_NO_READ_INVERT
+#    define PNG_READ_INVERT_SUPPORTED
+#  endif
+#  ifndef PNG_NO_READ_DITHER
+#    define PNG_READ_DITHER_SUPPORTED
+#  endif
+#  ifndef PNG_NO_READ_BACKGROUND
+#    define PNG_READ_BACKGROUND_SUPPORTED
+#  endif
+#  ifndef PNG_NO_READ_16_TO_8
+#    define PNG_READ_16_TO_8_SUPPORTED
+#  endif
+#  ifndef PNG_NO_READ_FILLER
+#    define PNG_READ_FILLER_SUPPORTED
+#  endif
+#  ifndef PNG_NO_READ_GAMMA
+#    define PNG_READ_GAMMA_SUPPORTED
+#  endif
+#  ifndef PNG_NO_READ_GRAY_TO_RGB
+#    define PNG_READ_GRAY_TO_RGB_SUPPORTED
+#  endif
+#  ifndef PNG_NO_READ_SWAP_ALPHA
+#    define PNG_READ_SWAP_ALPHA_SUPPORTED
+#  endif
+#  ifndef PNG_NO_READ_INVERT_ALPHA
+#    define PNG_READ_INVERT_ALPHA_SUPPORTED
+#  endif
+#  ifndef PNG_NO_READ_STRIP_ALPHA
+#    define PNG_READ_STRIP_ALPHA_SUPPORTED
+#  endif
+#  ifndef PNG_NO_READ_USER_TRANSFORM
+#    define PNG_READ_USER_TRANSFORM_SUPPORTED
+#  endif
+#  ifndef PNG_NO_READ_RGB_TO_GRAY
+#    define PNG_READ_RGB_TO_GRAY_SUPPORTED
+#  endif
+#endif /* PNG_READ_TRANSFORMS_SUPPORTED */
+
+#if !defined(PNG_NO_PROGRESSIVE_READ) && \
+ !defined(PNG_PROGRESSIVE_READ_SUPPORTED) /* if you don't do progressive   */
+#  define PNG_PROGRESSIVE_READ_SUPPORTED  /* reading.  This is not talking */
+#endif                            /* about interlacing capability!  You'll */
+           /* still have interlacing unless you change the following line: */
+
+#define PNG_READ_INTERLACING_SUPPORTED /* required in PNG-compliant decoders */
+
+#ifndef PNG_NO_READ_COMPOSITE_NODIV
+#  ifndef PNG_NO_READ_COMPOSITED_NODIV  /* libpng-1.0.x misspelling */
+#    define PNG_READ_COMPOSITE_NODIV_SUPPORTED  /* well tested on Intel, SGI */
+#  endif
+#endif
+
+#if defined(PNG_1_0_X) || defined (PNG_1_2_X)
+/* Deprecated, will be removed from version 2.0.0.
+   Use PNG_MNG_FEATURES_SUPPORTED instead. */
+#ifndef PNG_NO_READ_EMPTY_PLTE
+#  define PNG_READ_EMPTY_PLTE_SUPPORTED
+#endif
+#endif
+
+#endif /* PNG_READ_SUPPORTED */
+
+#if defined(PNG_WRITE_SUPPORTED)
+
+# if !defined(PNG_WRITE_TRANSFORMS_NOT_SUPPORTED) && \
+    !defined(PNG_NO_WRITE_TRANSFORMS)
+#  define PNG_WRITE_TRANSFORMS_SUPPORTED
+#endif
+
+#ifdef PNG_WRITE_TRANSFORMS_SUPPORTED
+#  ifndef PNG_NO_WRITE_SHIFT
+#    define PNG_WRITE_SHIFT_SUPPORTED
+#  endif
+#  ifndef PNG_NO_WRITE_PACK
+#    define PNG_WRITE_PACK_SUPPORTED
+#  endif
+#  ifndef PNG_NO_WRITE_BGR
+#    define PNG_WRITE_BGR_SUPPORTED
+#  endif
+#  ifndef PNG_NO_WRITE_SWAP
+#    define PNG_WRITE_SWAP_SUPPORTED
+#  endif
+#  ifndef PNG_NO_WRITE_PACKSWAP
+#    define PNG_WRITE_PACKSWAP_SUPPORTED
+#  endif
+#  ifndef PNG_NO_WRITE_INVERT
+#    define PNG_WRITE_INVERT_SUPPORTED
+#  endif
+#  ifndef PNG_NO_WRITE_FILLER
+#    define PNG_WRITE_FILLER_SUPPORTED   /* same as WRITE_STRIP_ALPHA */
+#  endif
+#  ifndef PNG_NO_WRITE_SWAP_ALPHA
+#    define PNG_WRITE_SWAP_ALPHA_SUPPORTED
+#  endif
+#  ifndef PNG_NO_WRITE_INVERT_ALPHA
+#    define PNG_WRITE_INVERT_ALPHA_SUPPORTED
+#  endif
+#  ifndef PNG_NO_WRITE_USER_TRANSFORM
+#    define PNG_WRITE_USER_TRANSFORM_SUPPORTED
+#  endif
+#endif /* PNG_WRITE_TRANSFORMS_SUPPORTED */
+
+#if !defined(PNG_NO_WRITE_INTERLACING_SUPPORTED) && \
+    !defined(PNG_WRITE_INTERLACING_SUPPORTED)
+#define PNG_WRITE_INTERLACING_SUPPORTED  /* not required for PNG-compliant
+                                            encoders, but can cause trouble
+                                            if left undefined */
+#endif
+
+#if !defined(PNG_NO_WRITE_WEIGHTED_FILTER) && \
+    !defined(PNG_WRITE_WEIGHTED_FILTER) && \
+     defined(PNG_FLOATING_POINT_SUPPORTED)
+#  define PNG_WRITE_WEIGHTED_FILTER_SUPPORTED
+#endif
+
+#ifndef PNG_NO_WRITE_FLUSH
+#  define PNG_WRITE_FLUSH_SUPPORTED
+#endif
+
+#if defined(PNG_1_0_X) || defined (PNG_1_2_X)
+/* Deprecated, see PNG_MNG_FEATURES_SUPPORTED, above */
+#ifndef PNG_NO_WRITE_EMPTY_PLTE
+#  define PNG_WRITE_EMPTY_PLTE_SUPPORTED
+#endif
+#endif
+
+#endif /* PNG_WRITE_SUPPORTED */
+
+#ifndef PNG_1_0_X
+#  ifndef PNG_NO_ERROR_NUMBERS
+#    define PNG_ERROR_NUMBERS_SUPPORTED
+#  endif
+#endif /* PNG_1_0_X */
+
+#if defined(PNG_READ_USER_TRANSFORM_SUPPORTED) || \
+    defined(PNG_WRITE_USER_TRANSFORM_SUPPORTED)
+#  ifndef PNG_NO_USER_TRANSFORM_PTR
+#    define PNG_USER_TRANSFORM_PTR_SUPPORTED
+#  endif
+#endif
+
+#ifndef PNG_NO_STDIO
+#  define PNG_TIME_RFC1123_SUPPORTED
+#endif
+
+/* This adds extra functions in pngget.c for accessing data from the
+ * info pointer (added in version 0.99)
+ * png_get_image_width()
+ * png_get_image_height()
+ * png_get_bit_depth()
+ * png_get_color_type()
+ * png_get_compression_type()
+ * png_get_filter_type()
+ * png_get_interlace_type()
+ * png_get_pixel_aspect_ratio()
+ * png_get_pixels_per_meter()
+ * png_get_x_offset_pixels()
+ * png_get_y_offset_pixels()
+ * png_get_x_offset_microns()
+ * png_get_y_offset_microns()
+ */
+#if !defined(PNG_NO_EASY_ACCESS) && !defined(PNG_EASY_ACCESS_SUPPORTED)
+#  define PNG_EASY_ACCESS_SUPPORTED
+#endif
+
+/* PNG_ASSEMBLER_CODE was enabled by default in version 1.2.0
+ * and removed from version 1.2.20.  The following will be removed
+ * from libpng-1.4.0
+*/
+
+#if defined(PNG_READ_SUPPORTED) && !defined(PNG_NO_OPTIMIZED_CODE)
+#  ifndef PNG_OPTIMIZED_CODE_SUPPORTED
+#    define PNG_OPTIMIZED_CODE_SUPPORTED
+#  endif
+#endif
+
+#if defined(PNG_READ_SUPPORTED) && !defined(PNG_NO_ASSEMBLER_CODE)
+#  ifndef PNG_ASSEMBLER_CODE_SUPPORTED
+#    define PNG_ASSEMBLER_CODE_SUPPORTED
+#  endif
+
+#  if defined(__GNUC__) && defined(__x86_64__) && (__GNUC__ < 4)
+     /* work around 64-bit gcc compiler bugs in gcc-3.x */
+#    if !defined(PNG_MMX_CODE_SUPPORTED) && !defined(PNG_NO_MMX_CODE)
+#      define PNG_NO_MMX_CODE
+#    endif
+#  endif
+
+#  if defined(__APPLE__)
+#    if !defined(PNG_MMX_CODE_SUPPORTED) && !defined(PNG_NO_MMX_CODE)
+#      define PNG_NO_MMX_CODE
+#    endif
+#  endif
+
+#  if (defined(__MWERKS__) && ((__MWERKS__ < 0x0900) || macintosh))
+#    if !defined(PNG_MMX_CODE_SUPPORTED) && !defined(PNG_NO_MMX_CODE)
+#      define PNG_NO_MMX_CODE
+#    endif
+#  endif
+
+#  if !defined(PNG_MMX_CODE_SUPPORTED) && !defined(PNG_NO_MMX_CODE)
+#    define PNG_MMX_CODE_SUPPORTED
+#  endif
+
+#endif
+/* end of obsolete code to be removed from libpng-1.4.0 */
+
+#if !defined(PNG_1_0_X)
+#if !defined(PNG_NO_USER_MEM) && !defined(PNG_USER_MEM_SUPPORTED)
+#  define PNG_USER_MEM_SUPPORTED
+#endif
+#endif /* PNG_1_0_X */
+
+/* Added at libpng-1.2.6 */
+#if !defined(PNG_1_0_X)
+#ifndef PNG_SET_USER_LIMITS_SUPPORTED
+#if !defined(PNG_NO_SET_USER_LIMITS) && !defined(PNG_SET_USER_LIMITS_SUPPORTED)
+#  define PNG_SET_USER_LIMITS_SUPPORTED
+#endif
+#endif
+#endif /* PNG_1_0_X */
+
+/* Added at libpng-1.0.16 and 1.2.6.  To accept all valid PNGS no matter
+ * how large, set these limits to 0x7fffffffL
+ */
+#ifndef PNG_USER_WIDTH_MAX
+#  define PNG_USER_WIDTH_MAX 1000000L
+#endif
+#ifndef PNG_USER_HEIGHT_MAX
+#  define PNG_USER_HEIGHT_MAX 1000000L
+#endif
+
+/* These are currently experimental features, define them if you want */
+
+/* very little testing */
+/*
+#ifdef PNG_READ_SUPPORTED
+#  ifndef PNG_READ_16_TO_8_ACCURATE_SCALE_SUPPORTED
+#    define PNG_READ_16_TO_8_ACCURATE_SCALE_SUPPORTED
+#  endif
+#endif
+*/
+
+/* This is only for PowerPC big-endian and 680x0 systems */
+/* some testing */
+/*
+#ifndef PNG_READ_BIG_ENDIAN_SUPPORTED
+#  define PNG_READ_BIG_ENDIAN_SUPPORTED
+#endif
+*/
+
+/* Buggy compilers (e.g., gcc 2.7.2.2) need this */
+/*
+#define PNG_NO_POINTER_INDEXING
+*/
+
+/* These functions are turned off by default, as they will be phased out. */
+/*
+#define  PNG_USELESS_TESTS_SUPPORTED
+#define  PNG_CORRECT_PALETTE_SUPPORTED
+*/
+
+/* Any chunks you are not interested in, you can undef here.  The
+ * ones that allocate memory may be expecially important (hIST,
+ * tEXt, zTXt, tRNS, pCAL).  Others will just save time and make png_info
+ * a bit smaller.
+ */
+
+#if defined(PNG_READ_SUPPORTED) && \
+    !defined(PNG_READ_ANCILLARY_CHUNKS_NOT_SUPPORTED) && \
+    !defined(PNG_NO_READ_ANCILLARY_CHUNKS)
+#  define PNG_READ_ANCILLARY_CHUNKS_SUPPORTED
+#endif
+
+#if defined(PNG_WRITE_SUPPORTED) && \
+    !defined(PNG_WRITE_ANCILLARY_CHUNKS_NOT_SUPPORTED) && \
+    !defined(PNG_NO_WRITE_ANCILLARY_CHUNKS)
+#  define PNG_WRITE_ANCILLARY_CHUNKS_SUPPORTED
+#endif
+
+#ifdef PNG_READ_ANCILLARY_CHUNKS_SUPPORTED
+
+#ifdef PNG_NO_READ_TEXT
+#  define PNG_NO_READ_iTXt
+#  define PNG_NO_READ_tEXt
+#  define PNG_NO_READ_zTXt
+#endif
+#ifndef PNG_NO_READ_bKGD
+#  define PNG_READ_bKGD_SUPPORTED
+#  define PNG_bKGD_SUPPORTED
+#endif
+#ifndef PNG_NO_READ_cHRM
+#  define PNG_READ_cHRM_SUPPORTED
+#  define PNG_cHRM_SUPPORTED
+#endif
+#ifndef PNG_NO_READ_gAMA
+#  define PNG_READ_gAMA_SUPPORTED
+#  define PNG_gAMA_SUPPORTED
+#endif
+#ifndef PNG_NO_READ_hIST
+#  define PNG_READ_hIST_SUPPORTED
+#  define PNG_hIST_SUPPORTED
+#endif
+#ifndef PNG_NO_READ_iCCP
+#  define PNG_READ_iCCP_SUPPORTED
+#  define PNG_iCCP_SUPPORTED
+#endif
+#ifndef PNG_NO_READ_iTXt
+#  ifndef PNG_READ_iTXt_SUPPORTED
+#    define PNG_READ_iTXt_SUPPORTED
+#  endif
+#  ifndef PNG_iTXt_SUPPORTED
+#    define PNG_iTXt_SUPPORTED
+#  endif
+#endif
+#ifndef PNG_NO_READ_oFFs
+#  define PNG_READ_oFFs_SUPPORTED
+#  define PNG_oFFs_SUPPORTED
+#endif
+#ifndef PNG_NO_READ_pCAL
+#  define PNG_READ_pCAL_SUPPORTED
+#  define PNG_pCAL_SUPPORTED
+#endif
+#ifndef PNG_NO_READ_sCAL
+#  define PNG_READ_sCAL_SUPPORTED
+#  define PNG_sCAL_SUPPORTED
+#endif
+#ifndef PNG_NO_READ_pHYs
+#  define PNG_READ_pHYs_SUPPORTED
+#  define PNG_pHYs_SUPPORTED
+#endif
+#ifndef PNG_NO_READ_sBIT
+#  define PNG_READ_sBIT_SUPPORTED
+#  define PNG_sBIT_SUPPORTED
+#endif
+#ifndef PNG_NO_READ_sPLT
+#  define PNG_READ_sPLT_SUPPORTED
+#  define PNG_sPLT_SUPPORTED
+#endif
+#ifndef PNG_NO_READ_sRGB
+#  define PNG_READ_sRGB_SUPPORTED
+#  define PNG_sRGB_SUPPORTED
+#endif
+#ifndef PNG_NO_READ_tEXt
+#  define PNG_READ_tEXt_SUPPORTED
+#  define PNG_tEXt_SUPPORTED
+#endif
+#ifndef PNG_NO_READ_tIME
+#  define PNG_READ_tIME_SUPPORTED
+#  define PNG_tIME_SUPPORTED
+#endif
+#ifndef PNG_NO_READ_tRNS
+#  define PNG_READ_tRNS_SUPPORTED
+#  define PNG_tRNS_SUPPORTED
+#endif
+#ifndef PNG_NO_READ_zTXt
+#  define PNG_READ_zTXt_SUPPORTED
+#  define PNG_zTXt_SUPPORTED
+#endif
+#ifndef PNG_NO_READ_UNKNOWN_CHUNKS
+#  define PNG_READ_UNKNOWN_CHUNKS_SUPPORTED
+#  ifndef PNG_UNKNOWN_CHUNKS_SUPPORTED
+#    define PNG_UNKNOWN_CHUNKS_SUPPORTED
+#  endif
+#  ifndef PNG_NO_HANDLE_AS_UNKNOWN
+#    define PNG_HANDLE_AS_UNKNOWN_SUPPORTED
+#  endif
+#endif
+#if !defined(PNG_NO_READ_USER_CHUNKS) && \
+     defined(PNG_READ_UNKNOWN_CHUNKS_SUPPORTED)
+#  define PNG_READ_USER_CHUNKS_SUPPORTED
+#  define PNG_USER_CHUNKS_SUPPORTED
+#  ifdef PNG_NO_READ_UNKNOWN_CHUNKS
+#    undef PNG_NO_READ_UNKNOWN_CHUNKS
+#  endif
+#  ifdef PNG_NO_HANDLE_AS_UNKNOWN
+#    undef PNG_NO_HANDLE_AS_UNKNOWN
+#  endif
+#endif
+#ifndef PNG_NO_READ_OPT_PLTE
+#  define PNG_READ_OPT_PLTE_SUPPORTED /* only affects support of the */
+#endif                      /* optional PLTE chunk in RGB and RGBA images */
+#if defined(PNG_READ_iTXt_SUPPORTED) || defined(PNG_READ_tEXt_SUPPORTED) || \
+    defined(PNG_READ_zTXt_SUPPORTED)
+#  define PNG_READ_TEXT_SUPPORTED
+#  define PNG_TEXT_SUPPORTED
+#endif
+
+#endif /* PNG_READ_ANCILLARY_CHUNKS_SUPPORTED */
+
+#ifdef PNG_WRITE_ANCILLARY_CHUNKS_SUPPORTED
+
+#ifdef PNG_NO_WRITE_TEXT
+#  define PNG_NO_WRITE_iTXt
+#  define PNG_NO_WRITE_tEXt
+#  define PNG_NO_WRITE_zTXt
+#endif
+#ifndef PNG_NO_WRITE_bKGD
+#  define PNG_WRITE_bKGD_SUPPORTED
+#  ifndef PNG_bKGD_SUPPORTED
+#    define PNG_bKGD_SUPPORTED
+#  endif
+#endif
+#ifndef PNG_NO_WRITE_cHRM
+#  define PNG_WRITE_cHRM_SUPPORTED
+#  ifndef PNG_cHRM_SUPPORTED
+#    define PNG_cHRM_SUPPORTED
+#  endif
+#endif
+#ifndef PNG_NO_WRITE_gAMA
+#  define PNG_WRITE_gAMA_SUPPORTED
+#  ifndef PNG_gAMA_SUPPORTED
+#    define PNG_gAMA_SUPPORTED
+#  endif
+#endif
+#ifndef PNG_NO_WRITE_hIST
+#  define PNG_WRITE_hIST_SUPPORTED
+#  ifndef PNG_hIST_SUPPORTED
+#    define PNG_hIST_SUPPORTED
+#  endif
+#endif
+#ifndef PNG_NO_WRITE_iCCP
+#  define PNG_WRITE_iCCP_SUPPORTED
+#  ifndef PNG_iCCP_SUPPORTED
+#    define PNG_iCCP_SUPPORTED
+#  endif
+#endif
+#ifndef PNG_NO_WRITE_iTXt
+#  ifndef PNG_WRITE_iTXt_SUPPORTED
+#    define PNG_WRITE_iTXt_SUPPORTED
+#  endif
+#  ifndef PNG_iTXt_SUPPORTED
+#    define PNG_iTXt_SUPPORTED
+#  endif
+#endif
+#ifndef PNG_NO_WRITE_oFFs
+#  define PNG_WRITE_oFFs_SUPPORTED
+#  ifndef PNG_oFFs_SUPPORTED
+#    define PNG_oFFs_SUPPORTED
+#  endif
+#endif
+#ifndef PNG_NO_WRITE_pCAL
+#  define PNG_WRITE_pCAL_SUPPORTED
+#  ifndef PNG_pCAL_SUPPORTED
+#    define PNG_pCAL_SUPPORTED
+#  endif
+#endif
+#ifndef PNG_NO_WRITE_sCAL
+#  define PNG_WRITE_sCAL_SUPPORTED
+#  ifndef PNG_sCAL_SUPPORTED
+#    define PNG_sCAL_SUPPORTED
+#  endif
+#endif
+#ifndef PNG_NO_WRITE_pHYs
+#  define PNG_WRITE_pHYs_SUPPORTED
+#  ifndef PNG_pHYs_SUPPORTED
+#    define PNG_pHYs_SUPPORTED
+#  endif
+#endif
+#ifndef PNG_NO_WRITE_sBIT
+#  define PNG_WRITE_sBIT_SUPPORTED
+#  ifndef PNG_sBIT_SUPPORTED
+#    define PNG_sBIT_SUPPORTED
+#  endif
+#endif
+#ifndef PNG_NO_WRITE_sPLT
+#  define PNG_WRITE_sPLT_SUPPORTED
+#  ifndef PNG_sPLT_SUPPORTED
+#    define PNG_sPLT_SUPPORTED
+#  endif
+#endif
+#ifndef PNG_NO_WRITE_sRGB
+#  define PNG_WRITE_sRGB_SUPPORTED
+#  ifndef PNG_sRGB_SUPPORTED
+#    define PNG_sRGB_SUPPORTED
+#  endif
+#endif
+#ifndef PNG_NO_WRITE_tEXt
+#  define PNG_WRITE_tEXt_SUPPORTED
+#  ifndef PNG_tEXt_SUPPORTED
+#    define PNG_tEXt_SUPPORTED
+#  endif
+#endif
+#ifndef PNG_NO_WRITE_tIME
+#  define PNG_WRITE_tIME_SUPPORTED
+#  ifndef PNG_tIME_SUPPORTED
+#    define PNG_tIME_SUPPORTED
+#  endif
+#endif
+#ifndef PNG_NO_WRITE_tRNS
+#  define PNG_WRITE_tRNS_SUPPORTED
+#  ifndef PNG_tRNS_SUPPORTED
+#    define PNG_tRNS_SUPPORTED
+#  endif
+#endif
+#ifndef PNG_NO_WRITE_zTXt
+#  define PNG_WRITE_zTXt_SUPPORTED
+#  ifndef PNG_zTXt_SUPPORTED
+#    define PNG_zTXt_SUPPORTED
+#  endif
+#endif
+#ifndef PNG_NO_WRITE_UNKNOWN_CHUNKS
+#  define PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED
+#  ifndef PNG_UNKNOWN_CHUNKS_SUPPORTED
+#    define PNG_UNKNOWN_CHUNKS_SUPPORTED
+#  endif
+#  ifndef PNG_NO_HANDLE_AS_UNKNOWN
+#     ifndef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
+#       define PNG_HANDLE_AS_UNKNOWN_SUPPORTED
+#     endif
+#  endif
+#endif
+#if defined(PNG_WRITE_iTXt_SUPPORTED) || defined(PNG_WRITE_tEXt_SUPPORTED) || \
+    defined(PNG_WRITE_zTXt_SUPPORTED)
+#  define PNG_WRITE_TEXT_SUPPORTED
+#  ifndef PNG_TEXT_SUPPORTED
+#    define PNG_TEXT_SUPPORTED
+#  endif
+#endif
+
+#endif /* PNG_WRITE_ANCILLARY_CHUNKS_SUPPORTED */
+
+/* Turn this off to disable png_read_png() and
+ * png_write_png() and leave the row_pointers member
+ * out of the info structure.
+ */
+#ifndef PNG_NO_INFO_IMAGE
+#  define PNG_INFO_IMAGE_SUPPORTED
+#endif
+
+/* need the time information for reading tIME chunks */
+#if defined(PNG_tIME_SUPPORTED)
+#  if !defined(_WIN32_WCE)
+     /* "time.h" functions are not supported on WindowsCE */
+#    include <time.h>
+#  endif
+#endif
+
+/* Some typedefs to get us started.  These should be safe on most of the
+ * common platforms.  The typedefs should be at least as large as the
+ * numbers suggest (a png_uint_32 must be at least 32 bits long), but they
+ * don't have to be exactly that size.  Some compilers dislike passing
+ * unsigned shorts as function parameters, so you may be better off using
+ * unsigned int for png_uint_16.  Likewise, for 64-bit systems, you may
+ * want to have unsigned int for png_uint_32 instead of unsigned long.
+ */
+
+typedef unsigned long png_uint_32;
+typedef long png_int_32;
+typedef unsigned short png_uint_16;
+typedef short png_int_16;
+typedef unsigned char png_byte;
+
+/* This is usually size_t.  It is typedef'ed just in case you need it to
+   change (I'm not sure if you will or not, so I thought I'd be safe) */
+#ifdef PNG_SIZE_T
+   typedef PNG_SIZE_T png_size_t;
+#  define png_sizeof(x) png_convert_size(sizeof (x))
+#else
+   typedef size_t png_size_t;
+#  define png_sizeof(x) sizeof (x)
+#endif
+
+/* The following is needed for medium model support.  It cannot be in the
+ * PNG_INTERNAL section.  Needs modification for other compilers besides
+ * MSC.  Model independent support declares all arrays and pointers to be
+ * large using the far keyword.  The zlib version used must also support
+ * model independent data.  As of version zlib 1.0.4, the necessary changes
+ * have been made in zlib.  The USE_FAR_KEYWORD define triggers other
+ * changes that are needed. (Tim Wegner)
+ */
+
+/* Separate compiler dependencies (problem here is that zlib.h always
+   defines FAR. (SJT) */
+#ifdef __BORLANDC__
+#  if defined(__LARGE__) || defined(__HUGE__) || defined(__COMPACT__)
+#    define LDATA 1
+#  else
+#    define LDATA 0
+#  endif
+   /* GRR:  why is Cygwin in here?  Cygwin is not Borland C... */
+#  if !defined(__WIN32__) && !defined(__FLAT__) && !defined(__CYGWIN__)
+#    define PNG_MAX_MALLOC_64K
+#    if (LDATA != 1)
+#      ifndef FAR
+#        define FAR __far
+#      endif
+#      define USE_FAR_KEYWORD
+#    endif   /* LDATA != 1 */
+     /* Possibly useful for moving data out of default segment.
+      * Uncomment it if you want. Could also define FARDATA as
+      * const if your compiler supports it. (SJT)
+#    define FARDATA FAR
+      */
+#  endif  /* __WIN32__, __FLAT__, __CYGWIN__ */
+#endif   /* __BORLANDC__ */
+
+
+/* Suggest testing for specific compiler first before testing for
+ * FAR.  The Watcom compiler defines both __MEDIUM__ and M_I86MM,
+ * making reliance oncertain keywords suspect. (SJT)
+ */
+
+/* MSC Medium model */
+#if defined(FAR)
+#  if defined(M_I86MM)
+#    define USE_FAR_KEYWORD
+#    define FARDATA FAR
+#    include <dos.h>
+#  endif
+#endif
+
+/* SJT: default case */
+#ifndef FAR
+#  define FAR
+#endif
+
+/* At this point FAR is always defined */
+#ifndef FARDATA
+#  define FARDATA
+#endif
+
+/* Typedef for floating-point numbers that are converted
+   to fixed-point with a multiple of 100,000, e.g., int_gamma */
+typedef png_int_32 png_fixed_point;
+
+/* Add typedefs for pointers */
+typedef void            FAR * png_voidp;
+typedef png_byte        FAR * png_bytep;
+typedef png_uint_32     FAR * png_uint_32p;
+typedef png_int_32      FAR * png_int_32p;
+typedef png_uint_16     FAR * png_uint_16p;
+typedef png_int_16      FAR * png_int_16p;
+typedef PNG_CONST char  FAR * png_const_charp;
+typedef char            FAR * png_charp;
+typedef png_fixed_point FAR * png_fixed_point_p;
+
+#ifndef PNG_NO_STDIO
+#if defined(_WIN32_WCE)
+typedef HANDLE                png_FILE_p;
+#else
+typedef FILE                * png_FILE_p;
+#endif
+#endif
+
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+typedef double          FAR * png_doublep;
+#endif
+
+/* Pointers to pointers; i.e. arrays */
+typedef png_byte        FAR * FAR * png_bytepp;
+typedef png_uint_32     FAR * FAR * png_uint_32pp;
+typedef png_int_32      FAR * FAR * png_int_32pp;
+typedef png_uint_16     FAR * FAR * png_uint_16pp;
+typedef png_int_16      FAR * FAR * png_int_16pp;
+typedef PNG_CONST char  FAR * FAR * png_const_charpp;
+typedef char            FAR * FAR * png_charpp;
+typedef png_fixed_point FAR * FAR * png_fixed_point_pp;
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+typedef double          FAR * FAR * png_doublepp;
+#endif
+
+/* Pointers to pointers to pointers; i.e., pointer to array */
+typedef char            FAR * FAR * FAR * png_charppp;
+
+#if defined(PNG_1_0_X) || defined(PNG_1_2_X)
+/* SPC -  Is this stuff deprecated? */
+/* It'll be removed as of libpng-1.3.0 - GR-P */
+/* libpng typedefs for types in zlib. If zlib changes
+ * or another compression library is used, then change these.
+ * Eliminates need to change all the source files.
+ */
+typedef charf *         png_zcharp;
+typedef charf * FAR *   png_zcharpp;
+typedef z_stream FAR *  png_zstreamp;
+#endif /* (PNG_1_0_X) || defined(PNG_1_2_X) */
+
+/*
+ * Define PNG_BUILD_DLL if the module being built is a Windows
+ * LIBPNG DLL.
+ *
+ * Define PNG_USE_DLL if you want to *link* to the Windows LIBPNG DLL.
+ * It is equivalent to Microsoft predefined macro _DLL that is
+ * automatically defined when you compile using the share
+ * version of the CRT (C Run-Time library)
+ *
+ * The cygwin mods make this behavior a little different:
+ * Define PNG_BUILD_DLL if you are building a dll for use with cygwin
+ * Define PNG_STATIC if you are building a static library for use with cygwin,
+ *   -or- if you are building an application that you want to link to the
+ *   static library.
+ * PNG_USE_DLL is defined by default (no user action needed) unless one of
+ *   the other flags is defined.
+ */
+
+#if !defined(PNG_DLL) && (defined(PNG_BUILD_DLL) || defined(PNG_USE_DLL))
+#  define PNG_DLL
+#endif
+/* If CYGWIN, then disallow GLOBAL ARRAYS unless building a static lib.
+ * When building a static lib, default to no GLOBAL ARRAYS, but allow
+ * command-line override
+ */
+#if defined(__CYGWIN__)
+#  if !defined(PNG_STATIC)
+#    if defined(PNG_USE_GLOBAL_ARRAYS)
+#      undef PNG_USE_GLOBAL_ARRAYS
+#    endif
+#    if !defined(PNG_USE_LOCAL_ARRAYS)
+#      define PNG_USE_LOCAL_ARRAYS
+#    endif
+#  else
+#    if defined(PNG_USE_LOCAL_ARRAYS) || defined(PNG_NO_GLOBAL_ARRAYS)
+#      if defined(PNG_USE_GLOBAL_ARRAYS)
+#        undef PNG_USE_GLOBAL_ARRAYS
+#      endif
+#    endif
+#  endif
+#  if !defined(PNG_USE_LOCAL_ARRAYS) && !defined(PNG_USE_GLOBAL_ARRAYS)
+#    define PNG_USE_LOCAL_ARRAYS
+#  endif
+#endif
+
+/* Do not use global arrays (helps with building DLL's)
+ * They are no longer used in libpng itself, since version 1.0.5c,
+ * but might be required for some pre-1.0.5c applications.
+ */
+#if !defined(PNG_USE_LOCAL_ARRAYS) && !defined(PNG_USE_GLOBAL_ARRAYS)
+#  if defined(PNG_NO_GLOBAL_ARRAYS) || \
+      (defined(__GNUC__) && defined(PNG_DLL)) || defined(_MSC_VER)
+#    define PNG_USE_LOCAL_ARRAYS
+#  else
+#    define PNG_USE_GLOBAL_ARRAYS
+#  endif
+#endif
+
+#if defined(__CYGWIN__)
+#  undef PNGAPI
+#  define PNGAPI __cdecl
+#  undef PNG_IMPEXP
+#  define PNG_IMPEXP
+#endif
+
+/* If you define PNGAPI, e.g., with compiler option "-DPNGAPI=__stdcall",
+ * you may get warnings regarding the linkage of png_zalloc and png_zfree.
+ * Don't ignore those warnings; you must also reset the default calling
+ * convention in your compiler to match your PNGAPI, and you must build
+ * zlib and your applications the same way you build libpng.
+ */
+
+#if defined(__MINGW32__) && !defined(PNG_MODULEDEF)
+#  ifndef PNG_NO_MODULEDEF
+#    define PNG_NO_MODULEDEF
+#  endif
+#endif
+
+#if !defined(PNG_IMPEXP) && defined(PNG_BUILD_DLL) && !defined(PNG_NO_MODULEDEF)
+#  define PNG_IMPEXP
+#endif
+
+#if defined(PNG_DLL) || defined(_DLL) || defined(__DLL__ ) || \
+    (( defined(_Windows) || defined(_WINDOWS) || \
+       defined(WIN32) || defined(_WIN32) || defined(__WIN32__) ))
+
+#  ifndef PNGAPI
+#     if defined(__GNUC__) || (defined (_MSC_VER) && (_MSC_VER >= 800))
+#        define PNGAPI __cdecl
+#     else
+#        define PNGAPI _cdecl
+#     endif
+#  endif
+
+#  if !defined(PNG_IMPEXP) && (!defined(PNG_DLL) || \
+       0 /* WINCOMPILER_WITH_NO_SUPPORT_FOR_DECLIMPEXP */)
+#     define PNG_IMPEXP
+#  endif
+
+#  if !defined(PNG_IMPEXP)
+
+#     define PNG_EXPORT_TYPE1(type,symbol)  PNG_IMPEXP type PNGAPI symbol
+#     define PNG_EXPORT_TYPE2(type,symbol)  type PNG_IMPEXP PNGAPI symbol
+
+      /* Borland/Microsoft */
+#     if defined(_MSC_VER) || defined(__BORLANDC__)
+#        if (_MSC_VER >= 800) || (__BORLANDC__ >= 0x500)
+#           define PNG_EXPORT PNG_EXPORT_TYPE1
+#        else
+#           define PNG_EXPORT PNG_EXPORT_TYPE2
+#           if defined(PNG_BUILD_DLL)
+#              define PNG_IMPEXP __export
+#           else
+#              define PNG_IMPEXP /*__import */ /* doesn't exist AFAIK in
+                                                 VC++ */
+#           endif                             /* Exists in Borland C++ for
+                                                 C++ classes (== huge) */
+#        endif
+#     endif
+
+#     if !defined(PNG_IMPEXP)
+#        if defined(PNG_BUILD_DLL)
+#           define PNG_IMPEXP __declspec(dllexport)
+#        else
+#           define PNG_IMPEXP __declspec(dllimport)
+#        endif
+#     endif
+#  endif  /* PNG_IMPEXP */
+#else /* !(DLL || non-cygwin WINDOWS) */
+#   if (defined(__IBMC__) || defined(__IBMCPP__)) && defined(__OS2__)
+#      ifndef PNGAPI
+#         define PNGAPI _System
+#      endif
+#   else
+#      if 0 /* ... other platforms, with other meanings */
+#      endif
+#   endif
+#endif
+
+#ifndef PNGAPI
+#  define PNGAPI
+#endif
+#ifndef PNG_IMPEXP
+#  define PNG_IMPEXP
+#endif
+
+#ifdef PNG_BUILDSYMS
+#  ifndef PNG_EXPORT
+#    define PNG_EXPORT(type,symbol) PNG_FUNCTION_EXPORT symbol END
+#  endif
+#  ifdef PNG_USE_GLOBAL_ARRAYS
+#    ifndef PNG_EXPORT_VAR
+#      define PNG_EXPORT_VAR(type) PNG_DATA_EXPORT
+#    endif
+#  endif
+#endif
+
+#ifndef PNG_EXPORT
+#  define PNG_EXPORT(type,symbol) PNG_IMPEXP type PNGAPI symbol
+#endif
+
+#ifdef PNG_USE_GLOBAL_ARRAYS
+#  ifndef PNG_EXPORT_VAR
+#    define PNG_EXPORT_VAR(type) extern PNG_IMPEXP type
+#  endif
+#endif
+
+/* User may want to use these so they are not in PNG_INTERNAL. Any library
+ * functions that are passed far data must be model independent.
+ */
+
+#ifndef PNG_ABORT
+#  define PNG_ABORT() abort()
+#endif
+
+#ifdef PNG_SETJMP_SUPPORTED
+#  define png_jmpbuf(png_ptr) ((png_ptr)->jmpbuf)
+#else
+#  define png_jmpbuf(png_ptr) \
+   (LIBPNG_WAS_COMPILED_WITH__PNG_SETJMP_NOT_SUPPORTED)
+#endif
+
+#if defined(USE_FAR_KEYWORD)  /* memory model independent fns */
+/* use this to make far-to-near assignments */
+#  define CHECK   1
+#  define NOCHECK 0
+#  define CVT_PTR(ptr) (png_far_to_near(png_ptr,ptr,CHECK))
+#  define CVT_PTR_NOCHECK(ptr) (png_far_to_near(png_ptr,ptr,NOCHECK))
+#  define png_snprintf _fsnprintf   /* Added to v 1.2.19 */
+#  define png_strcpy  _fstrcpy
+#  define png_strncpy _fstrncpy   /* Added to v 1.2.6 */
+#  define png_strlen  _fstrlen
+#  define png_memcmp  _fmemcmp    /* SJT: added */
+#  define png_memcpy  _fmemcpy
+#  define png_memset  _fmemset
+#else /* use the usual functions */
+#  define CVT_PTR(ptr)         (ptr)
+#  define CVT_PTR_NOCHECK(ptr) (ptr)
+#  ifndef PNG_NO_SNPRINTF
+#    ifdef _MSC_VER
+#      define png_snprintf _snprintf   /* Added to v 1.2.19 */
+#      define png_snprintf2 _snprintf
+#      define png_snprintf6 _snprintf
+#    else
+#      define png_snprintf snprintf   /* Added to v 1.2.19 */
+#      define png_snprintf2 snprintf
+#      define png_snprintf6 snprintf
+#    endif
+#  else
+     /* You don't have or don't want to use snprintf().  Caution: Using
+      * sprintf instead of snprintf exposes your application to accidental
+      * or malevolent buffer overflows.  If you don't have snprintf()
+      * as a general rule you should provide one (you can get one from
+      * Portable OpenSSH). */
+#    define png_snprintf(s1,n,fmt,x1) sprintf(s1,fmt,x1)
+#    define png_snprintf2(s1,n,fmt,x1,x2) sprintf(s1,fmt,x1,x2)
+#    define png_snprintf6(s1,n,fmt,x1,x2,x3,x4,x5,x6) \
+        sprintf(s1,fmt,x1,x2,x3,x4,x5,x6)
+#  endif
+#  define png_strcpy  strcpy
+#  define png_strncpy strncpy     /* Added to v 1.2.6 */
+#  define png_strlen  strlen
+#  define png_memcmp  memcmp      /* SJT: added */
+#  define png_memcpy  memcpy
+#  define png_memset  memset
+#endif
+/* End of memory model independent support */
+
+/* Just a little check that someone hasn't tried to define something
+ * contradictory.
+ */
+#if (PNG_ZBUF_SIZE > 65536L) && defined(PNG_MAX_MALLOC_64K)
+#  undef PNG_ZBUF_SIZE
+#  define PNG_ZBUF_SIZE 65536L
+#endif
+
+/* Added at libpng-1.2.8 */
+#endif /* PNG_VERSION_INFO_ONLY */
+
+#endif /* PNGCONF_H */
diff --git a/uppsrc/plugin/png/lib/pngerror.c b/uppsrc/plugin/png/lib/pngerror.c
new file mode 100644
index 000000000..bdafdc290
--- /dev/null
+++ b/uppsrc/plugin/png/lib/pngerror.c
@@ -0,0 +1,341 @@
+
+/* pngerror.c - stub functions for i/o and memory allocation
+ *
+ * Last changed in libpng 1.2.22 [October 13, 2007]
+ * For conditions of distribution and use, see copyright notice in png.h
+ * Copyright (c) 1998-2007 Glenn Randers-Pehrson
+ * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
+ * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
+ *
+ * This file provides a location for all error handling.  Users who
+ * need special error handling are expected to write replacement functions
+ * and use png_set_error_fn() to use those functions.  See the instructions
+ * at each function.
+ */
+
+#define PNG_INTERNAL
+#include "png.h"
+
+#if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED)
+static void /* PRIVATE */
+png_default_error PNGARG((png_structp png_ptr,
+  png_const_charp error_message));
+#ifndef PNG_NO_WARNINGS
+static void /* PRIVATE */
+png_default_warning PNGARG((png_structp png_ptr,
+  png_const_charp warning_message));
+#endif /* PNG_NO_WARNINGS */
+
+/* This function is called whenever there is a fatal error.  This function
+ * should not be changed.  If there is a need to handle errors differently,
+ * you should supply a replacement error function and use png_set_error_fn()
+ * to replace the error function at run-time.
+ */
+#ifndef PNG_NO_ERROR_TEXT
+void PNGAPI
+png_error(png_structp png_ptr, png_const_charp error_message)
+{
+#ifdef PNG_ERROR_NUMBERS_SUPPORTED
+   char msg[16];
+   if (png_ptr != NULL)
+   {
+     if (png_ptr->flags&
+       (PNG_FLAG_STRIP_ERROR_NUMBERS|PNG_FLAG_STRIP_ERROR_TEXT))
+     {
+       if (*error_message == '#')
+       {
+           int offset;
+           for (offset=1; offset<15; offset++)
+              if (*(error_message+offset) == ' ')
+                  break;
+           if (png_ptr->flags&PNG_FLAG_STRIP_ERROR_TEXT)
+           {
+              int i;
+              for (i=0; i<offset-1; i++)
+                 msg[i]=error_message[i+1];
+              msg[i]='\0';
+              error_message=msg;
+           }
+           else
+              error_message+=offset;
+       }
+       else
+       {
+           if (png_ptr->flags&PNG_FLAG_STRIP_ERROR_TEXT)
+           {
+              msg[0]='0';
+              msg[1]='\0';
+              error_message=msg;
+           }
+       }
+     }
+   }
+#endif
+   if (png_ptr != NULL && png_ptr->error_fn != NULL)
+      (*(png_ptr->error_fn))(png_ptr, error_message);
+
+   /* If the custom handler doesn't exist, or if it returns,
+      use the default handler, which will not return. */
+   png_default_error(png_ptr, error_message);
+}
+#else
+void PNGAPI
+png_err(png_structp png_ptr)
+{
+   if (png_ptr != NULL && png_ptr->error_fn != NULL)
+      (*(png_ptr->error_fn))(png_ptr, '\0');
+
+   /* If the custom handler doesn't exist, or if it returns,
+      use the default handler, which will not return. */
+   png_default_error(png_ptr, '\0');
+}
+#endif /* PNG_NO_ERROR_TEXT */
+
+#ifndef PNG_NO_WARNINGS
+/* This function is called whenever there is a non-fatal error.  This function
+ * should not be changed.  If there is a need to handle warnings differently,
+ * you should supply a replacement warning function and use
+ * png_set_error_fn() to replace the warning function at run-time.
+ */
+void PNGAPI
+png_warning(png_structp png_ptr, png_const_charp warning_message)
+{
+   int offset = 0;
+   if (png_ptr != NULL)
+   {
+#ifdef PNG_ERROR_NUMBERS_SUPPORTED
+   if (png_ptr->flags&
+     (PNG_FLAG_STRIP_ERROR_NUMBERS|PNG_FLAG_STRIP_ERROR_TEXT))
+#endif
+     {
+       if (*warning_message == '#')
+       {
+           for (offset=1; offset<15; offset++)
+              if (*(warning_message+offset) == ' ')
+                  break;
+       }
+     }
+     if (png_ptr != NULL && png_ptr->warning_fn != NULL)
+        (*(png_ptr->warning_fn))(png_ptr, warning_message+offset);
+   }
+   else
+      png_default_warning(png_ptr, warning_message+offset);
+}
+#endif /* PNG_NO_WARNINGS */
+
+
+/* These utilities are used internally to build an error message that relates
+ * to the current chunk.  The chunk name comes from png_ptr->chunk_name,
+ * this is used to prefix the message.  The message is limited in length
+ * to 63 bytes, the name characters are output as hex digits wrapped in []
+ * if the character is invalid.
+ */
+#define isnonalpha(c) ((c) < 65 || (c) > 122 || ((c) > 90 && (c) < 97))
+static PNG_CONST char png_digit[16] = {
+   '0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
+   'A', 'B', 'C', 'D', 'E', 'F'
+};
+
+#if !defined(PNG_NO_WARNINGS) || !defined(PNG_NO_ERROR_TEXT)
+static void /* PRIVATE */
+png_format_buffer(png_structp png_ptr, png_charp buffer, png_const_charp
+   error_message)
+{
+   int iout = 0, iin = 0;
+
+   while (iin < 4)
+   {
+      int c = png_ptr->chunk_name[iin++];
+      if (isnonalpha(c))
+      {
+         buffer[iout++] = '[';
+         buffer[iout++] = png_digit[(c & 0xf0) >> 4];
+         buffer[iout++] = png_digit[c & 0x0f];
+         buffer[iout++] = ']';
+      }
+      else
+      {
+         buffer[iout++] = (png_byte)c;
+      }
+   }
+
+   if (error_message == NULL)
+      buffer[iout] = '\0';
+   else
+   {
+      buffer[iout++] = ':';
+      buffer[iout++] = ' ';
+      png_strncpy(buffer+iout, error_message, 63);
+      buffer[iout+63] = '\0';
+   }
+}
+
+#ifdef PNG_READ_SUPPORTED
+void PNGAPI
+png_chunk_error(png_structp png_ptr, png_const_charp error_message)
+{
+   char msg[18+64];
+   if (png_ptr == NULL)
+     png_error(png_ptr, error_message);
+   else
+   {
+     png_format_buffer(png_ptr, msg, error_message);
+     png_error(png_ptr, msg);
+   }
+}
+#endif /* PNG_READ_SUPPORTED */
+#endif /* !defined(PNG_NO_WARNINGS) || !defined(PNG_NO_ERROR_TEXT) */
+
+#ifndef PNG_NO_WARNINGS
+void PNGAPI
+png_chunk_warning(png_structp png_ptr, png_const_charp warning_message)
+{
+   char msg[18+64];
+   if (png_ptr == NULL)
+     png_warning(png_ptr, warning_message);
+   else
+   {
+     png_format_buffer(png_ptr, msg, warning_message);
+     png_warning(png_ptr, msg);
+   }
+}
+#endif /* PNG_NO_WARNINGS */
+
+
+/* This is the default error handling function.  Note that replacements for
+ * this function MUST NOT RETURN, or the program will likely crash.  This
+ * function is used by default, or if the program supplies NULL for the
+ * error function pointer in png_set_error_fn().
+ */
+static void /* PRIVATE */
+png_default_error(png_structp png_ptr, png_const_charp error_message)
+{
+#ifndef PNG_NO_CONSOLE_IO
+#ifdef PNG_ERROR_NUMBERS_SUPPORTED
+   if (*error_message == '#')
+   {
+     int offset;
+     char error_number[16];
+     for (offset=0; offset<15; offset++)
+     {
+         error_number[offset] = *(error_message+offset+1);
+         if (*(error_message+offset) == ' ')
+             break;
+     }
+     if((offset > 1) && (offset < 15))
+     {
+       error_number[offset-1]='\0';
+       fprintf(stderr, "libpng error no. %s: %s\n", error_number,
+          error_message+offset);
+     }
+     else
+       fprintf(stderr, "libpng error: %s, offset=%d\n", error_message,offset);
+   }
+   else
+#endif
+   fprintf(stderr, "libpng error: %s\n", error_message);
+#endif
+
+#ifdef PNG_SETJMP_SUPPORTED
+   if (png_ptr)
+   {
+#  ifdef USE_FAR_KEYWORD
+   {
+      jmp_buf jmpbuf;
+      png_memcpy(jmpbuf, png_ptr->jmpbuf, png_sizeof(jmp_buf));
+      longjmp(jmpbuf, 1);
+   }
+#  else
+   longjmp(png_ptr->jmpbuf, 1);
+#  endif
+   }
+#else
+   PNG_ABORT();
+#endif
+#ifdef PNG_NO_CONSOLE_IO
+   error_message = error_message; /* make compiler happy */
+#endif
+}
+
+#ifndef PNG_NO_WARNINGS
+/* This function is called when there is a warning, but the library thinks
+ * it can continue anyway.  Replacement functions don't have to do anything
+ * here if you don't want them to.  In the default configuration, png_ptr is
+ * not used, but it is passed in case it may be useful.
+ */
+static void /* PRIVATE */
+png_default_warning(png_structp png_ptr, png_const_charp warning_message)
+{
+#ifndef PNG_NO_CONSOLE_IO
+#  ifdef PNG_ERROR_NUMBERS_SUPPORTED
+   if (*warning_message == '#')
+   {
+     int offset;
+     char warning_number[16];
+     for (offset=0; offset<15; offset++)
+     {
+        warning_number[offset]=*(warning_message+offset+1);
+        if (*(warning_message+offset) == ' ')
+            break;
+     }
+     if((offset > 1) && (offset < 15))
+     {
+       warning_number[offset-1]='\0';
+       fprintf(stderr, "libpng warning no. %s: %s\n", warning_number,
+          warning_message+offset);
+     }
+     else
+       fprintf(stderr, "libpng warning: %s\n", warning_message);
+   }
+   else
+#  endif
+     fprintf(stderr, "libpng warning: %s\n", warning_message);
+#else
+   warning_message = warning_message; /* make compiler happy */
+#endif
+   png_ptr = png_ptr; /* make compiler happy */
+}
+#endif /* PNG_NO_WARNINGS */
+
+/* This function is called when the application wants to use another method
+ * of handling errors and warnings.  Note that the error function MUST NOT
+ * return to the calling routine or serious problems will occur.  The return
+ * method used in the default routine calls longjmp(png_ptr->jmpbuf, 1)
+ */
+void PNGAPI
+png_set_error_fn(png_structp png_ptr, png_voidp error_ptr,
+   png_error_ptr error_fn, png_error_ptr warning_fn)
+{
+   if (png_ptr == NULL)
+      return;
+   png_ptr->error_ptr = error_ptr;
+   png_ptr->error_fn = error_fn;
+   png_ptr->warning_fn = warning_fn;
+}
+
+
+/* This function returns a pointer to the error_ptr associated with the user
+ * functions.  The application should free any memory associated with this
+ * pointer before png_write_destroy and png_read_destroy are called.
+ */
+png_voidp PNGAPI
+png_get_error_ptr(png_structp png_ptr)
+{
+   if (png_ptr == NULL)
+      return NULL;
+   return ((png_voidp)png_ptr->error_ptr);
+}
+
+
+#ifdef PNG_ERROR_NUMBERS_SUPPORTED
+void PNGAPI
+png_set_strip_error_numbers(png_structp png_ptr, png_uint_32 strip_mode)
+{
+   if(png_ptr != NULL)
+   {
+     png_ptr->flags &=
+       ((~(PNG_FLAG_STRIP_ERROR_NUMBERS|PNG_FLAG_STRIP_ERROR_TEXT))&strip_mode);
+   }
+}
+#endif
+#endif /* PNG_READ_SUPPORTED || PNG_WRITE_SUPPORTED */
diff --git a/uppsrc/plugin/png/lib/pnggccrd.c b/uppsrc/plugin/png/lib/pnggccrd.c
new file mode 100644
index 000000000..a7248d6ca
--- /dev/null
+++ b/uppsrc/plugin/png/lib/pnggccrd.c
@@ -0,0 +1,101 @@
+/* pnggccrd.c was removed from libpng-1.2.20. */
+
+/* This code snippet is for use by configure's compilation test. */
+
+#if defined(PNG_ASSEMBLER_CODE_SUPPORTED) && \
+    defined(PNG_MMX_CODE_SUPPORTED)
+int PNGAPI png_dummy_mmx_support(void);
+
+static int _mmx_supported = 2; // 0: no MMX; 1: MMX supported; 2: not tested
+
+int PNGAPI
+png_dummy_mmx_support(void) __attribute__((noinline));
+
+int PNGAPI
+png_dummy_mmx_support(void)
+{
+   int result;
+#if defined(PNG_MMX_CODE_SUPPORTED)  // superfluous, but what the heck
+    __asm__ __volatile__ (
+#if defined(__x86_64__)
+        "pushq %%rbx          \n\t"  // rbx gets clobbered by CPUID instruction
+        "pushq %%rcx          \n\t"  // so does rcx...
+        "pushq %%rdx          \n\t"  // ...and rdx (but rcx & rdx safe on Linux)
+        "pushfq               \n\t"  // save Eflag to stack
+        "popq %%rax           \n\t"  // get Eflag from stack into rax
+        "movq %%rax, %%rcx    \n\t"  // make another copy of Eflag in rcx
+        "xorl $0x200000, %%eax \n\t" // toggle ID bit in Eflag (i.e., bit 21)
+        "pushq %%rax          \n\t"  // save modified Eflag back to stack
+        "popfq                \n\t"  // restore modified value to Eflag reg
+        "pushfq               \n\t"  // save Eflag to stack
+        "popq %%rax           \n\t"  // get Eflag from stack
+        "pushq %%rcx          \n\t"  // save original Eflag to stack
+        "popfq                \n\t"  // restore original Eflag
+#else
+        "pushl %%ebx          \n\t"  // ebx gets clobbered by CPUID instruction
+        "pushl %%ecx          \n\t"  // so does ecx...
+        "pushl %%edx          \n\t"  // ...and edx (but ecx & edx safe on Linux)
+        "pushfl               \n\t"  // save Eflag to stack
+        "popl %%eax           \n\t"  // get Eflag from stack into eax
+        "movl %%eax, %%ecx    \n\t"  // make another copy of Eflag in ecx
+        "xorl $0x200000, %%eax \n\t" // toggle ID bit in Eflag (i.e., bit 21)
+        "pushl %%eax          \n\t"  // save modified Eflag back to stack
+        "popfl                \n\t"  // restore modified value to Eflag reg
+        "pushfl               \n\t"  // save Eflag to stack
+        "popl %%eax           \n\t"  // get Eflag from stack
+        "pushl %%ecx          \n\t"  // save original Eflag to stack
+        "popfl                \n\t"  // restore original Eflag
+#endif
+        "xorl %%ecx, %%eax    \n\t"  // compare new Eflag with original Eflag
+        "jz 0f                \n\t"  // if same, CPUID instr. is not supported
+
+        "xorl %%eax, %%eax    \n\t"  // set eax to zero
+//      ".byte  0x0f, 0xa2    \n\t"  // CPUID instruction (two-byte opcode)
+        "cpuid                \n\t"  // get the CPU identification info
+        "cmpl $1, %%eax       \n\t"  // make sure eax return non-zero value
+        "jl 0f                \n\t"  // if eax is zero, MMX is not supported
+
+        "xorl %%eax, %%eax    \n\t"  // set eax to zero and...
+        "incl %%eax           \n\t"  // ...increment eax to 1.  This pair is
+                                     // faster than the instruction "mov eax, 1"
+        "cpuid                \n\t"  // get the CPU identification info again
+        "andl $0x800000, %%edx \n\t" // mask out all bits but MMX bit (23)
+        "cmpl $0, %%edx       \n\t"  // 0 = MMX not supported
+        "jz 0f                \n\t"  // non-zero = yes, MMX IS supported
+
+        "movl $1, %%eax       \n\t"  // set return value to 1
+        "jmp  1f              \n\t"  // DONE:  have MMX support
+
+    "0:                       \n\t"  // .NOT_SUPPORTED: target label for jump instructions
+        "movl $0, %%eax       \n\t"  // set return value to 0
+    "1:                       \n\t"  // .RETURN: target label for jump instructions
+#if defined(__x86_64__)
+        "popq %%rdx           \n\t"  // restore rdx
+        "popq %%rcx           \n\t"  // restore rcx
+        "popq %%rbx           \n\t"  // restore rbx
+#else
+        "popl %%edx           \n\t"  // restore edx
+        "popl %%ecx           \n\t"  // restore ecx
+        "popl %%ebx           \n\t"  // restore ebx
+#endif
+
+//      "ret                  \n\t"  // DONE:  no MMX support
+                                     // (fall through to standard C "ret")
+
+        : "=a" (result)              // output list
+
+        :                            // any variables used on input (none)
+
+                                     // no clobber list
+//      , "%ebx", "%ecx", "%edx"     // GRR:  we handle these manually
+//      , "memory"   // if write to a variable gcc thought was in a reg
+//      , "cc"       // "condition codes" (flag bits)
+    );
+    _mmx_supported = result;
+#else
+    _mmx_supported = 0;
+#endif /* PNG_MMX_CODE_SUPPORTED */
+
+    return _mmx_supported;
+}
+#endif
diff --git a/uppsrc/plugin/png/lib/pngget.c b/uppsrc/plugin/png/lib/pngget.c
new file mode 100644
index 000000000..0b2a69515
--- /dev/null
+++ b/uppsrc/plugin/png/lib/pngget.c
@@ -0,0 +1,901 @@
+
+/* pngget.c - retrieval of values from info struct
+ *
+ * Last changed in libpng 1.2.15 January 5, 2007
+ * For conditions of distribution and use, see copyright notice in png.h
+ * Copyright (c) 1998-2007 Glenn Randers-Pehrson
+ * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
+ * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
+ */
+
+#define PNG_INTERNAL
+#include "png.h"
+
+#if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED)
+
+png_uint_32 PNGAPI
+png_get_valid(png_structp png_ptr, png_infop info_ptr, png_uint_32 flag)
+{
+   if (png_ptr != NULL && info_ptr != NULL)
+      return(info_ptr->valid & flag);
+   else
+      return(0);
+}
+
+png_uint_32 PNGAPI
+png_get_rowbytes(png_structp png_ptr, png_infop info_ptr)
+{
+   if (png_ptr != NULL && info_ptr != NULL)
+      return(info_ptr->rowbytes);
+   else
+      return(0);
+}
+
+#if defined(PNG_INFO_IMAGE_SUPPORTED)
+png_bytepp PNGAPI
+png_get_rows(png_structp png_ptr, png_infop info_ptr)
+{
+   if (png_ptr != NULL && info_ptr != NULL)
+      return(info_ptr->row_pointers);
+   else
+      return(0);
+}
+#endif
+
+#ifdef PNG_EASY_ACCESS_SUPPORTED
+/* easy access to info, added in libpng-0.99 */
+png_uint_32 PNGAPI
+png_get_image_width(png_structp png_ptr, png_infop info_ptr)
+{
+   if (png_ptr != NULL && info_ptr != NULL)
+   {
+      return info_ptr->width;
+   }
+   return (0);
+}
+
+png_uint_32 PNGAPI
+png_get_image_height(png_structp png_ptr, png_infop info_ptr)
+{
+   if (png_ptr != NULL && info_ptr != NULL)
+   {
+      return info_ptr->height;
+   }
+   return (0);
+}
+
+png_byte PNGAPI
+png_get_bit_depth(png_structp png_ptr, png_infop info_ptr)
+{
+   if (png_ptr != NULL && info_ptr != NULL)
+   {
+      return info_ptr->bit_depth;
+   }
+   return (0);
+}
+
+png_byte PNGAPI
+png_get_color_type(png_structp png_ptr, png_infop info_ptr)
+{
+   if (png_ptr != NULL && info_ptr != NULL)
+   {
+      return info_ptr->color_type;
+   }
+   return (0);
+}
+
+png_byte PNGAPI
+png_get_filter_type(png_structp png_ptr, png_infop info_ptr)
+{
+   if (png_ptr != NULL && info_ptr != NULL)
+   {
+      return info_ptr->filter_type;
+   }
+   return (0);
+}
+
+png_byte PNGAPI
+png_get_interlace_type(png_structp png_ptr, png_infop info_ptr)
+{
+   if (png_ptr != NULL && info_ptr != NULL)
+   {
+      return info_ptr->interlace_type;
+   }
+   return (0);
+}
+
+png_byte PNGAPI
+png_get_compression_type(png_structp png_ptr, png_infop info_ptr)
+{
+   if (png_ptr != NULL && info_ptr != NULL)
+   {
+      return info_ptr->compression_type;
+   }
+   return (0);
+}
+
+png_uint_32 PNGAPI
+png_get_x_pixels_per_meter(png_structp png_ptr, png_infop info_ptr)
+{
+   if (png_ptr != NULL && info_ptr != NULL)
+#if defined(PNG_pHYs_SUPPORTED)
+   if (info_ptr->valid & PNG_INFO_pHYs)
+   {
+      png_debug1(1, "in %s retrieval function\n", "png_get_x_pixels_per_meter");
+      if(info_ptr->phys_unit_type != PNG_RESOLUTION_METER)
+          return (0);
+      else return (info_ptr->x_pixels_per_unit);
+   }
+#else
+   return (0);
+#endif
+   return (0);
+}
+
+png_uint_32 PNGAPI
+png_get_y_pixels_per_meter(png_structp png_ptr, png_infop info_ptr)
+{
+   if (png_ptr != NULL && info_ptr != NULL)
+#if defined(PNG_pHYs_SUPPORTED)
+   if (info_ptr->valid & PNG_INFO_pHYs)
+   {
+      png_debug1(1, "in %s retrieval function\n", "png_get_y_pixels_per_meter");
+      if(info_ptr->phys_unit_type != PNG_RESOLUTION_METER)
+          return (0);
+      else return (info_ptr->y_pixels_per_unit);
+   }
+#else
+   return (0);
+#endif
+   return (0);
+}
+
+png_uint_32 PNGAPI
+png_get_pixels_per_meter(png_structp png_ptr, png_infop info_ptr)
+{
+   if (png_ptr != NULL && info_ptr != NULL)
+#if defined(PNG_pHYs_SUPPORTED)
+   if (info_ptr->valid & PNG_INFO_pHYs)
+   {
+      png_debug1(1, "in %s retrieval function\n", "png_get_pixels_per_meter");
+      if(info_ptr->phys_unit_type != PNG_RESOLUTION_METER ||
+         info_ptr->x_pixels_per_unit != info_ptr->y_pixels_per_unit)
+          return (0);
+      else return (info_ptr->x_pixels_per_unit);
+   }
+#else
+   return (0);
+#endif
+   return (0);
+}
+
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+float PNGAPI
+png_get_pixel_aspect_ratio(png_structp png_ptr, png_infop info_ptr)
+   {
+   if (png_ptr != NULL && info_ptr != NULL)
+#if defined(PNG_pHYs_SUPPORTED)
+   if (info_ptr->valid & PNG_INFO_pHYs)
+   {
+      png_debug1(1, "in %s retrieval function\n", "png_get_aspect_ratio");
+      if (info_ptr->x_pixels_per_unit == 0)
+         return ((float)0.0);
+      else
+         return ((float)((float)info_ptr->y_pixels_per_unit
+            /(float)info_ptr->x_pixels_per_unit));
+   }
+#else
+   return (0.0);
+#endif
+   return ((float)0.0);
+}
+#endif
+
+png_int_32 PNGAPI
+png_get_x_offset_microns(png_structp png_ptr, png_infop info_ptr)
+{
+   if (png_ptr != NULL && info_ptr != NULL)
+#if defined(PNG_oFFs_SUPPORTED)
+   if (info_ptr->valid & PNG_INFO_oFFs)
+   {
+      png_debug1(1, "in %s retrieval function\n", "png_get_x_offset_microns");
+      if(info_ptr->offset_unit_type != PNG_OFFSET_MICROMETER)
+          return (0);
+      else return (info_ptr->x_offset);
+   }
+#else
+   return (0);
+#endif
+   return (0);
+}
+
+png_int_32 PNGAPI
+png_get_y_offset_microns(png_structp png_ptr, png_infop info_ptr)
+{
+   if (png_ptr != NULL && info_ptr != NULL)
+#if defined(PNG_oFFs_SUPPORTED)
+   if (info_ptr->valid & PNG_INFO_oFFs)
+   {
+      png_debug1(1, "in %s retrieval function\n", "png_get_y_offset_microns");
+      if(info_ptr->offset_unit_type != PNG_OFFSET_MICROMETER)
+          return (0);
+      else return (info_ptr->y_offset);
+   }
+#else
+   return (0);
+#endif
+   return (0);
+}
+
+png_int_32 PNGAPI
+png_get_x_offset_pixels(png_structp png_ptr, png_infop info_ptr)
+{
+   if (png_ptr != NULL && info_ptr != NULL)
+#if defined(PNG_oFFs_SUPPORTED)
+   if (info_ptr->valid & PNG_INFO_oFFs)
+   {
+      png_debug1(1, "in %s retrieval function\n", "png_get_x_offset_microns");
+      if(info_ptr->offset_unit_type != PNG_OFFSET_PIXEL)
+          return (0);
+      else return (info_ptr->x_offset);
+   }
+#else
+   return (0);
+#endif
+   return (0);
+}
+
+png_int_32 PNGAPI
+png_get_y_offset_pixels(png_structp png_ptr, png_infop info_ptr)
+{
+   if (png_ptr != NULL && info_ptr != NULL)
+#if defined(PNG_oFFs_SUPPORTED)
+   if (info_ptr->valid & PNG_INFO_oFFs)
+   {
+      png_debug1(1, "in %s retrieval function\n", "png_get_y_offset_microns");
+      if(info_ptr->offset_unit_type != PNG_OFFSET_PIXEL)
+          return (0);
+      else return (info_ptr->y_offset);
+   }
+#else
+   return (0);
+#endif
+   return (0);
+}
+
+#if defined(PNG_INCH_CONVERSIONS) && defined(PNG_FLOATING_POINT_SUPPORTED)
+png_uint_32 PNGAPI
+png_get_pixels_per_inch(png_structp png_ptr, png_infop info_ptr)
+{
+   return ((png_uint_32)((float)png_get_pixels_per_meter(png_ptr, info_ptr)
+     *.0254 +.5));
+}
+
+png_uint_32 PNGAPI
+png_get_x_pixels_per_inch(png_structp png_ptr, png_infop info_ptr)
+{
+   return ((png_uint_32)((float)png_get_x_pixels_per_meter(png_ptr, info_ptr)
+     *.0254 +.5));
+}
+
+png_uint_32 PNGAPI
+png_get_y_pixels_per_inch(png_structp png_ptr, png_infop info_ptr)
+{
+   return ((png_uint_32)((float)png_get_y_pixels_per_meter(png_ptr, info_ptr)
+     *.0254 +.5));
+}
+
+float PNGAPI
+png_get_x_offset_inches(png_structp png_ptr, png_infop info_ptr)
+{
+   return ((float)png_get_x_offset_microns(png_ptr, info_ptr)
+     *.00003937);
+}
+
+float PNGAPI
+png_get_y_offset_inches(png_structp png_ptr, png_infop info_ptr)
+{
+   return ((float)png_get_y_offset_microns(png_ptr, info_ptr)
+     *.00003937);
+}
+
+#if defined(PNG_pHYs_SUPPORTED)
+png_uint_32 PNGAPI
+png_get_pHYs_dpi(png_structp png_ptr, png_infop info_ptr,
+   png_uint_32 *res_x, png_uint_32 *res_y, int *unit_type)
+{
+   png_uint_32 retval = 0;
+
+   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_pHYs))
+   {
+      png_debug1(1, "in %s retrieval function\n", "pHYs");
+      if (res_x != NULL)
+      {
+         *res_x = info_ptr->x_pixels_per_unit;
+         retval |= PNG_INFO_pHYs;
+      }
+      if (res_y != NULL)
+      {
+         *res_y = info_ptr->y_pixels_per_unit;
+         retval |= PNG_INFO_pHYs;
+      }
+      if (unit_type != NULL)
+      {
+         *unit_type = (int)info_ptr->phys_unit_type;
+         retval |= PNG_INFO_pHYs;
+         if(*unit_type == 1)
+         {
+            if (res_x != NULL) *res_x = (png_uint_32)(*res_x * .0254 + .50);
+            if (res_y != NULL) *res_y = (png_uint_32)(*res_y * .0254 + .50);
+         }
+      }
+   }
+   return (retval);
+}
+#endif /* PNG_pHYs_SUPPORTED */
+#endif  /* PNG_INCH_CONVERSIONS && PNG_FLOATING_POINT_SUPPORTED */
+
+/* png_get_channels really belongs in here, too, but it's been around longer */
+
+#endif  /* PNG_EASY_ACCESS_SUPPORTED */
+
+png_byte PNGAPI
+png_get_channels(png_structp png_ptr, png_infop info_ptr)
+{
+   if (png_ptr != NULL && info_ptr != NULL)
+      return(info_ptr->channels);
+   else
+      return (0);
+}
+
+png_bytep PNGAPI
+png_get_signature(png_structp png_ptr, png_infop info_ptr)
+{
+   if (png_ptr != NULL && info_ptr != NULL)
+      return(info_ptr->signature);
+   else
+      return (NULL);
+}
+
+#if defined(PNG_bKGD_SUPPORTED)
+png_uint_32 PNGAPI
+png_get_bKGD(png_structp png_ptr, png_infop info_ptr,
+   png_color_16p *background)
+{
+   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_bKGD)
+      && background != NULL)
+   {
+      png_debug1(1, "in %s retrieval function\n", "bKGD");
+      *background = &(info_ptr->background);
+      return (PNG_INFO_bKGD);
+   }
+   return (0);
+}
+#endif
+
+#if defined(PNG_cHRM_SUPPORTED)
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+png_uint_32 PNGAPI
+png_get_cHRM(png_structp png_ptr, png_infop info_ptr,
+   double *white_x, double *white_y, double *red_x, double *red_y,
+   double *green_x, double *green_y, double *blue_x, double *blue_y)
+{
+   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_cHRM))
+   {
+      png_debug1(1, "in %s retrieval function\n", "cHRM");
+      if (white_x != NULL)
+         *white_x = (double)info_ptr->x_white;
+      if (white_y != NULL)
+         *white_y = (double)info_ptr->y_white;
+      if (red_x != NULL)
+         *red_x = (double)info_ptr->x_red;
+      if (red_y != NULL)
+         *red_y = (double)info_ptr->y_red;
+      if (green_x != NULL)
+         *green_x = (double)info_ptr->x_green;
+      if (green_y != NULL)
+         *green_y = (double)info_ptr->y_green;
+      if (blue_x != NULL)
+         *blue_x = (double)info_ptr->x_blue;
+      if (blue_y != NULL)
+         *blue_y = (double)info_ptr->y_blue;
+      return (PNG_INFO_cHRM);
+   }
+   return (0);
+}
+#endif
+#ifdef PNG_FIXED_POINT_SUPPORTED
+png_uint_32 PNGAPI
+png_get_cHRM_fixed(png_structp png_ptr, png_infop info_ptr,
+   png_fixed_point *white_x, png_fixed_point *white_y, png_fixed_point *red_x,
+   png_fixed_point *red_y, png_fixed_point *green_x, png_fixed_point *green_y,
+   png_fixed_point *blue_x, png_fixed_point *blue_y)
+{
+   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_cHRM))
+   {
+      png_debug1(1, "in %s retrieval function\n", "cHRM");
+      if (white_x != NULL)
+         *white_x = info_ptr->int_x_white;
+      if (white_y != NULL)
+         *white_y = info_ptr->int_y_white;
+      if (red_x != NULL)
+         *red_x = info_ptr->int_x_red;
+      if (red_y != NULL)
+         *red_y = info_ptr->int_y_red;
+      if (green_x != NULL)
+         *green_x = info_ptr->int_x_green;
+      if (green_y != NULL)
+         *green_y = info_ptr->int_y_green;
+      if (blue_x != NULL)
+         *blue_x = info_ptr->int_x_blue;
+      if (blue_y != NULL)
+         *blue_y = info_ptr->int_y_blue;
+      return (PNG_INFO_cHRM);
+   }
+   return (0);
+}
+#endif
+#endif
+
+#if defined(PNG_gAMA_SUPPORTED)
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+png_uint_32 PNGAPI
+png_get_gAMA(png_structp png_ptr, png_infop info_ptr, double *file_gamma)
+{
+   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_gAMA)
+      && file_gamma != NULL)
+   {
+      png_debug1(1, "in %s retrieval function\n", "gAMA");
+      *file_gamma = (double)info_ptr->gamma;
+      return (PNG_INFO_gAMA);
+   }
+   return (0);
+}
+#endif
+#ifdef PNG_FIXED_POINT_SUPPORTED
+png_uint_32 PNGAPI
+png_get_gAMA_fixed(png_structp png_ptr, png_infop info_ptr,
+    png_fixed_point *int_file_gamma)
+{
+   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_gAMA)
+      && int_file_gamma != NULL)
+   {
+      png_debug1(1, "in %s retrieval function\n", "gAMA");
+      *int_file_gamma = info_ptr->int_gamma;
+      return (PNG_INFO_gAMA);
+   }
+   return (0);
+}
+#endif
+#endif
+
+#if defined(PNG_sRGB_SUPPORTED)
+png_uint_32 PNGAPI
+png_get_sRGB(png_structp png_ptr, png_infop info_ptr, int *file_srgb_intent)
+{
+   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_sRGB)
+      && file_srgb_intent != NULL)
+   {
+      png_debug1(1, "in %s retrieval function\n", "sRGB");
+      *file_srgb_intent = (int)info_ptr->srgb_intent;
+      return (PNG_INFO_sRGB);
+   }
+   return (0);
+}
+#endif
+
+#if defined(PNG_iCCP_SUPPORTED)
+png_uint_32 PNGAPI
+png_get_iCCP(png_structp png_ptr, png_infop info_ptr,
+             png_charpp name, int *compression_type,
+             png_charpp profile, png_uint_32 *proflen)
+{
+   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_iCCP)
+      && name != NULL && profile != NULL && proflen != NULL)
+   {
+      png_debug1(1, "in %s retrieval function\n", "iCCP");
+      *name = info_ptr->iccp_name;
+      *profile = info_ptr->iccp_profile;
+      /* compression_type is a dummy so the API won't have to change
+         if we introduce multiple compression types later. */
+      *proflen = (int)info_ptr->iccp_proflen;
+      *compression_type = (int)info_ptr->iccp_compression;
+      return (PNG_INFO_iCCP);
+   }
+   return (0);
+}
+#endif
+
+#if defined(PNG_sPLT_SUPPORTED)
+png_uint_32 PNGAPI
+png_get_sPLT(png_structp png_ptr, png_infop info_ptr,
+             png_sPLT_tpp spalettes)
+{
+   if (png_ptr != NULL && info_ptr != NULL && spalettes != NULL)
+   {
+     *spalettes = info_ptr->splt_palettes;
+     return ((png_uint_32)info_ptr->splt_palettes_num);
+   }
+   return (0);
+}
+#endif
+
+#if defined(PNG_hIST_SUPPORTED)
+png_uint_32 PNGAPI
+png_get_hIST(png_structp png_ptr, png_infop info_ptr, png_uint_16p *hist)
+{
+   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_hIST)
+      && hist != NULL)
+   {
+      png_debug1(1, "in %s retrieval function\n", "hIST");
+      *hist = info_ptr->hist;
+      return (PNG_INFO_hIST);
+   }
+   return (0);
+}
+#endif
+
+png_uint_32 PNGAPI
+png_get_IHDR(png_structp png_ptr, png_infop info_ptr,
+   png_uint_32 *width, png_uint_32 *height, int *bit_depth,
+   int *color_type, int *interlace_type, int *compression_type,
+   int *filter_type)
+
+{
+   if (png_ptr != NULL && info_ptr != NULL && width != NULL && height != NULL &&
+      bit_depth != NULL && color_type != NULL)
+   {
+      png_debug1(1, "in %s retrieval function\n", "IHDR");
+      *width = info_ptr->width;
+      *height = info_ptr->height;
+      *bit_depth = info_ptr->bit_depth;
+      if (info_ptr->bit_depth < 1 || info_ptr->bit_depth > 16)
+        png_error(png_ptr, "Invalid bit depth");
+      *color_type = info_ptr->color_type;
+      if (info_ptr->color_type > 6)
+        png_error(png_ptr, "Invalid color type");
+      if (compression_type != NULL)
+         *compression_type = info_ptr->compression_type;
+      if (filter_type != NULL)
+         *filter_type = info_ptr->filter_type;
+      if (interlace_type != NULL)
+         *interlace_type = info_ptr->interlace_type;
+
+      /* check for potential overflow of rowbytes */
+      if (*width == 0 || *width > PNG_UINT_31_MAX)
+        png_error(png_ptr, "Invalid image width");
+      if (*height == 0 || *height > PNG_UINT_31_MAX)
+        png_error(png_ptr, "Invalid image height");
+      if (info_ptr->width > (PNG_UINT_32_MAX
+                 >> 3)      /* 8-byte RGBA pixels */
+                 - 64       /* bigrowbuf hack */
+                 - 1        /* filter byte */
+                 - 7*8      /* rounding of width to multiple of 8 pixels */
+                 - 8)       /* extra max_pixel_depth pad */
+      {
+         png_warning(png_ptr,
+            "Width too large for libpng to process image data.");
+      }
+      return (1);
+   }
+   return (0);
+}
+
+#if defined(PNG_oFFs_SUPPORTED)
+png_uint_32 PNGAPI
+png_get_oFFs(png_structp png_ptr, png_infop info_ptr,
+   png_int_32 *offset_x, png_int_32 *offset_y, int *unit_type)
+{
+   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_oFFs)
+      && offset_x != NULL && offset_y != NULL && unit_type != NULL)
+   {
+      png_debug1(1, "in %s retrieval function\n", "oFFs");
+      *offset_x = info_ptr->x_offset;
+      *offset_y = info_ptr->y_offset;
+      *unit_type = (int)info_ptr->offset_unit_type;
+      return (PNG_INFO_oFFs);
+   }
+   return (0);
+}
+#endif
+
+#if defined(PNG_pCAL_SUPPORTED)
+png_uint_32 PNGAPI
+png_get_pCAL(png_structp png_ptr, png_infop info_ptr,
+   png_charp *purpose, png_int_32 *X0, png_int_32 *X1, int *type, int *nparams,
+   png_charp *units, png_charpp *params)
+{
+   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_pCAL)
+      && purpose != NULL && X0 != NULL && X1 != NULL && type != NULL &&
+      nparams != NULL && units != NULL && params != NULL)
+   {
+      png_debug1(1, "in %s retrieval function\n", "pCAL");
+      *purpose = info_ptr->pcal_purpose;
+      *X0 = info_ptr->pcal_X0;
+      *X1 = info_ptr->pcal_X1;
+      *type = (int)info_ptr->pcal_type;
+      *nparams = (int)info_ptr->pcal_nparams;
+      *units = info_ptr->pcal_units;
+      *params = info_ptr->pcal_params;
+      return (PNG_INFO_pCAL);
+   }
+   return (0);
+}
+#endif
+
+#if defined(PNG_sCAL_SUPPORTED)
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+png_uint_32 PNGAPI
+png_get_sCAL(png_structp png_ptr, png_infop info_ptr,
+             int *unit, double *width, double *height)
+{
+    if (png_ptr != NULL && info_ptr != NULL &&
+       (info_ptr->valid & PNG_INFO_sCAL))
+    {
+        *unit = info_ptr->scal_unit;
+        *width = info_ptr->scal_pixel_width;
+        *height = info_ptr->scal_pixel_height;
+        return (PNG_INFO_sCAL);
+    }
+    return(0);
+}
+#else
+#ifdef PNG_FIXED_POINT_SUPPORTED
+png_uint_32 PNGAPI
+png_get_sCAL_s(png_structp png_ptr, png_infop info_ptr,
+             int *unit, png_charpp width, png_charpp height)
+{
+    if (png_ptr != NULL && info_ptr != NULL &&
+       (info_ptr->valid & PNG_INFO_sCAL))
+    {
+        *unit = info_ptr->scal_unit;
+        *width = info_ptr->scal_s_width;
+        *height = info_ptr->scal_s_height;
+        return (PNG_INFO_sCAL);
+    }
+    return(0);
+}
+#endif
+#endif
+#endif
+
+#if defined(PNG_pHYs_SUPPORTED)
+png_uint_32 PNGAPI
+png_get_pHYs(png_structp png_ptr, png_infop info_ptr,
+   png_uint_32 *res_x, png_uint_32 *res_y, int *unit_type)
+{
+   png_uint_32 retval = 0;
+
+   if (png_ptr != NULL && info_ptr != NULL &&
+      (info_ptr->valid & PNG_INFO_pHYs))
+   {
+      png_debug1(1, "in %s retrieval function\n", "pHYs");
+      if (res_x != NULL)
+      {
+         *res_x = info_ptr->x_pixels_per_unit;
+         retval |= PNG_INFO_pHYs;
+      }
+      if (res_y != NULL)
+      {
+         *res_y = info_ptr->y_pixels_per_unit;
+         retval |= PNG_INFO_pHYs;
+      }
+      if (unit_type != NULL)
+      {
+         *unit_type = (int)info_ptr->phys_unit_type;
+         retval |= PNG_INFO_pHYs;
+      }
+   }
+   return (retval);
+}
+#endif
+
+png_uint_32 PNGAPI
+png_get_PLTE(png_structp png_ptr, png_infop info_ptr, png_colorp *palette,
+   int *num_palette)
+{
+   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_PLTE)
+       && palette != NULL)
+   {
+      png_debug1(1, "in %s retrieval function\n", "PLTE");
+      *palette = info_ptr->palette;
+      *num_palette = info_ptr->num_palette;
+      png_debug1(3, "num_palette = %d\n", *num_palette);
+      return (PNG_INFO_PLTE);
+   }
+   return (0);
+}
+
+#if defined(PNG_sBIT_SUPPORTED)
+png_uint_32 PNGAPI
+png_get_sBIT(png_structp png_ptr, png_infop info_ptr, png_color_8p *sig_bit)
+{
+   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_sBIT)
+      && sig_bit != NULL)
+   {
+      png_debug1(1, "in %s retrieval function\n", "sBIT");
+      *sig_bit = &(info_ptr->sig_bit);
+      return (PNG_INFO_sBIT);
+   }
+   return (0);
+}
+#endif
+
+#if defined(PNG_TEXT_SUPPORTED)
+png_uint_32 PNGAPI
+png_get_text(png_structp png_ptr, png_infop info_ptr, png_textp *text_ptr,
+   int *num_text)
+{
+   if (png_ptr != NULL && info_ptr != NULL && info_ptr->num_text > 0)
+   {
+      png_debug1(1, "in %s retrieval function\n",
+         (png_ptr->chunk_name[0] == '\0' ? "text"
+             : (png_const_charp)png_ptr->chunk_name));
+      if (text_ptr != NULL)
+         *text_ptr = info_ptr->text;
+      if (num_text != NULL)
+         *num_text = info_ptr->num_text;
+      return ((png_uint_32)info_ptr->num_text);
+   }
+   if (num_text != NULL)
+     *num_text = 0;
+   return(0);
+}
+#endif
+
+#if defined(PNG_tIME_SUPPORTED)
+png_uint_32 PNGAPI
+png_get_tIME(png_structp png_ptr, png_infop info_ptr, png_timep *mod_time)
+{
+   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_tIME)
+       && mod_time != NULL)
+   {
+      png_debug1(1, "in %s retrieval function\n", "tIME");
+      *mod_time = &(info_ptr->mod_time);
+      return (PNG_INFO_tIME);
+   }
+   return (0);
+}
+#endif
+
+#if defined(PNG_tRNS_SUPPORTED)
+png_uint_32 PNGAPI
+png_get_tRNS(png_structp png_ptr, png_infop info_ptr,
+   png_bytep *trans, int *num_trans, png_color_16p *trans_values)
+{
+   png_uint_32 retval = 0;
+   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_tRNS))
+   {
+      png_debug1(1, "in %s retrieval function\n", "tRNS");
+      if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
+      {
+          if (trans != NULL)
+          {
+             *trans = info_ptr->trans;
+             retval |= PNG_INFO_tRNS;
+          }
+          if (trans_values != NULL)
+             *trans_values = &(info_ptr->trans_values);
+      }
+      else /* if (info_ptr->color_type != PNG_COLOR_TYPE_PALETTE) */
+      {
+          if (trans_values != NULL)
+          {
+             *trans_values = &(info_ptr->trans_values);
+             retval |= PNG_INFO_tRNS;
+          }
+          if(trans != NULL)
+             *trans = NULL;
+      }
+      if(num_trans != NULL)
+      {
+         *num_trans = info_ptr->num_trans;
+         retval |= PNG_INFO_tRNS;
+      }
+   }
+   return (retval);
+}
+#endif
+
+#if defined(PNG_UNKNOWN_CHUNKS_SUPPORTED)
+png_uint_32 PNGAPI
+png_get_unknown_chunks(png_structp png_ptr, png_infop info_ptr,
+             png_unknown_chunkpp unknowns)
+{
+   if (png_ptr != NULL && info_ptr != NULL && unknowns != NULL)
+   {
+     *unknowns = info_ptr->unknown_chunks;
+     return ((png_uint_32)info_ptr->unknown_chunks_num);
+   }
+   return (0);
+}
+#endif
+
+#if defined(PNG_READ_RGB_TO_GRAY_SUPPORTED)
+png_byte PNGAPI
+png_get_rgb_to_gray_status (png_structp png_ptr)
+{
+   return (png_byte)(png_ptr? png_ptr->rgb_to_gray_status : 0);
+}
+#endif
+
+#if defined(PNG_USER_CHUNKS_SUPPORTED)
+png_voidp PNGAPI
+png_get_user_chunk_ptr(png_structp png_ptr)
+{
+   return (png_ptr? png_ptr->user_chunk_ptr : NULL);
+}
+#endif
+
+#ifdef PNG_WRITE_SUPPORTED
+png_uint_32 PNGAPI
+png_get_compression_buffer_size(png_structp png_ptr)
+{
+   return (png_uint_32)(png_ptr? png_ptr->zbuf_size : 0L);
+}
+#endif
+
+#ifdef PNG_ASSEMBLER_CODE_SUPPORTED
+#ifndef PNG_1_0_X
+/* this function was added to libpng 1.2.0 and should exist by default */
+png_uint_32 PNGAPI
+png_get_asm_flags (png_structp png_ptr)
+{
+    /* obsolete, to be removed from libpng-1.4.0 */
+    return (png_ptr? 0L: 0L);
+}
+
+/* this function was added to libpng 1.2.0 and should exist by default */
+png_uint_32 PNGAPI
+png_get_asm_flagmask (int flag_select)
+{
+    /* obsolete, to be removed from libpng-1.4.0 */
+    flag_select=flag_select;
+    return 0L;
+}
+
+    /* GRR:  could add this:   && defined(PNG_MMX_CODE_SUPPORTED) */
+/* this function was added to libpng 1.2.0 */
+png_uint_32 PNGAPI
+png_get_mmx_flagmask (int flag_select, int *compilerID)
+{
+    /* obsolete, to be removed from libpng-1.4.0 */
+    flag_select=flag_select;
+    *compilerID = -1;   /* unknown (i.e., no asm/MMX code compiled) */
+    return 0L;
+}
+
+/* this function was added to libpng 1.2.0 */
+png_byte PNGAPI
+png_get_mmx_bitdepth_threshold (png_structp png_ptr)
+{
+    /* obsolete, to be removed from libpng-1.4.0 */
+    return (png_ptr? 0: 0);
+}
+
+/* this function was added to libpng 1.2.0 */
+png_uint_32 PNGAPI
+png_get_mmx_rowbytes_threshold (png_structp png_ptr)
+{
+    /* obsolete, to be removed from libpng-1.4.0 */
+    return (png_ptr? 0L: 0L);
+}
+#endif /* ?PNG_1_0_X */
+#endif /* ?PNG_ASSEMBLER_CODE_SUPPORTED */
+
+#ifdef PNG_SET_USER_LIMITS_SUPPORTED
+/* these functions were added to libpng 1.2.6 */
+png_uint_32 PNGAPI
+png_get_user_width_max (png_structp png_ptr)
+{
+    return (png_ptr? png_ptr->user_width_max : 0);
+}
+png_uint_32 PNGAPI
+png_get_user_height_max (png_structp png_ptr)
+{
+    return (png_ptr? png_ptr->user_height_max : 0);
+}
+#endif /* ?PNG_SET_USER_LIMITS_SUPPORTED */
+
+
+#endif /* PNG_READ_SUPPORTED || PNG_WRITE_SUPPORTED */
diff --git a/uppsrc/plugin/png/lib/pngmem.c b/uppsrc/plugin/png/lib/pngmem.c
new file mode 100644
index 000000000..248060f38
--- /dev/null
+++ b/uppsrc/plugin/png/lib/pngmem.c
@@ -0,0 +1,608 @@
+
+/* pngmem.c - stub functions for memory allocation
+ *
+ * Last changed in libpng 1.2.13 November 13, 2006
+ * For conditions of distribution and use, see copyright notice in png.h
+ * Copyright (c) 1998-2006 Glenn Randers-Pehrson
+ * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
+ * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
+ *
+ * This file provides a location for all memory allocation.  Users who
+ * need special memory handling are expected to supply replacement
+ * functions for png_malloc() and png_free(), and to use
+ * png_create_read_struct_2() and png_create_write_struct_2() to
+ * identify the replacement functions.
+ */
+
+#define PNG_INTERNAL
+#include "png.h"
+
+#if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED)
+
+/* Borland DOS special memory handler */
+#if defined(__TURBOC__) && !defined(_Windows) && !defined(__FLAT__)
+/* if you change this, be sure to change the one in png.h also */
+
+/* Allocate memory for a png_struct.  The malloc and memset can be replaced
+   by a single call to calloc() if this is thought to improve performance. */
+png_voidp /* PRIVATE */
+png_create_struct(int type)
+{
+#ifdef PNG_USER_MEM_SUPPORTED
+   return (png_create_struct_2(type, png_malloc_ptr_NULL, png_voidp_NULL));
+}
+
+/* Alternate version of png_create_struct, for use with user-defined malloc. */
+png_voidp /* PRIVATE */
+png_create_struct_2(int type, png_malloc_ptr malloc_fn, png_voidp mem_ptr)
+{
+#endif /* PNG_USER_MEM_SUPPORTED */
+   png_size_t size;
+   png_voidp struct_ptr;
+
+   if (type == PNG_STRUCT_INFO)
+     size = png_sizeof(png_info);
+   else if (type == PNG_STRUCT_PNG)
+     size = png_sizeof(png_struct);
+   else
+     return (png_get_copyright(NULL));
+
+#ifdef PNG_USER_MEM_SUPPORTED
+   if(malloc_fn != NULL)
+   {
+      png_struct dummy_struct;
+      png_structp png_ptr = &dummy_struct;
+      png_ptr->mem_ptr=mem_ptr;
+      struct_ptr = (*(malloc_fn))(png_ptr, (png_uint_32)size);
+   }
+   else
+#endif /* PNG_USER_MEM_SUPPORTED */
+      struct_ptr = (png_voidp)farmalloc(size);
+   if (struct_ptr != NULL)
+      png_memset(struct_ptr, 0, size);
+   return (struct_ptr);
+}
+
+/* Free memory allocated by a png_create_struct() call */
+void /* PRIVATE */
+png_destroy_struct(png_voidp struct_ptr)
+{
+#ifdef PNG_USER_MEM_SUPPORTED
+   png_destroy_struct_2(struct_ptr, png_free_ptr_NULL, png_voidp_NULL);
+}
+
+/* Free memory allocated by a png_create_struct() call */
+void /* PRIVATE */
+png_destroy_struct_2(png_voidp struct_ptr, png_free_ptr free_fn,
+    png_voidp mem_ptr)
+{
+#endif
+   if (struct_ptr != NULL)
+   {
+#ifdef PNG_USER_MEM_SUPPORTED
+      if(free_fn != NULL)
+      {
+         png_struct dummy_struct;
+         png_structp png_ptr = &dummy_struct;
+         png_ptr->mem_ptr=mem_ptr;
+         (*(free_fn))(png_ptr, struct_ptr);
+         return;
+      }
+#endif /* PNG_USER_MEM_SUPPORTED */
+      farfree (struct_ptr);
+   }
+}
+
+/* Allocate memory.  For reasonable files, size should never exceed
+ * 64K.  However, zlib may allocate more then 64K if you don't tell
+ * it not to.  See zconf.h and png.h for more information. zlib does
+ * need to allocate exactly 64K, so whatever you call here must
+ * have the ability to do that.
+ *
+ * Borland seems to have a problem in DOS mode for exactly 64K.
+ * It gives you a segment with an offset of 8 (perhaps to store its
+ * memory stuff).  zlib doesn't like this at all, so we have to
+ * detect and deal with it.  This code should not be needed in
+ * Windows or OS/2 modes, and only in 16 bit mode.  This code has
+ * been updated by Alexander Lehmann for version 0.89 to waste less
+ * memory.
+ *
+ * Note that we can't use png_size_t for the "size" declaration,
+ * since on some systems a png_size_t is a 16-bit quantity, and as a
+ * result, we would be truncating potentially larger memory requests
+ * (which should cause a fatal error) and introducing major problems.
+ */
+
+png_voidp PNGAPI
+png_malloc(png_structp png_ptr, png_uint_32 size)
+{
+   png_voidp ret;
+
+   if (png_ptr == NULL || size == 0)
+      return (NULL);
+
+#ifdef PNG_USER_MEM_SUPPORTED
+   if(png_ptr->malloc_fn != NULL)
+       ret = ((png_voidp)(*(png_ptr->malloc_fn))(png_ptr, (png_size_t)size));
+   else
+       ret = (png_malloc_default(png_ptr, size));
+   if (ret == NULL && (png_ptr->flags&PNG_FLAG_MALLOC_NULL_MEM_OK) == 0)
+       png_error(png_ptr, "Out of memory!");
+   return (ret);
+}
+
+png_voidp PNGAPI
+png_malloc_default(png_structp png_ptr, png_uint_32 size)
+{
+   png_voidp ret;
+#endif /* PNG_USER_MEM_SUPPORTED */
+
+   if (png_ptr == NULL || size == 0)
+      return (NULL);
+
+#ifdef PNG_MAX_MALLOC_64K
+   if (size > (png_uint_32)65536L)
+   {
+      png_warning(png_ptr, "Cannot Allocate > 64K");
+      ret = NULL;
+   }
+   else
+#endif
+
+   if (size != (size_t)size)
+     ret = NULL;
+   else if (size == (png_uint_32)65536L)
+   {
+      if (png_ptr->offset_table == NULL)
+      {
+         /* try to see if we need to do any of this fancy stuff */
+         ret = farmalloc(size);
+         if (ret == NULL || ((png_size_t)ret & 0xffff))
+         {
+            int num_blocks;
+            png_uint_32 total_size;
+            png_bytep table;
+            int i;
+            png_byte huge * hptr;
+
+            if (ret != NULL)
+            {
+               farfree(ret);
+               ret = NULL;
+            }
+
+            if(png_ptr->zlib_window_bits > 14)
+               num_blocks = (int)(1 << (png_ptr->zlib_window_bits - 14));
+            else
+               num_blocks = 1;
+            if (png_ptr->zlib_mem_level >= 7)
+               num_blocks += (int)(1 << (png_ptr->zlib_mem_level - 7));
+            else
+               num_blocks++;
+
+            total_size = ((png_uint_32)65536L) * (png_uint_32)num_blocks+16;
+
+            table = farmalloc(total_size);
+
+            if (table == NULL)
+            {
+#ifndef PNG_USER_MEM_SUPPORTED
+               if ((png_ptr->flags&PNG_FLAG_MALLOC_NULL_MEM_OK) == 0)
+                  png_error(png_ptr, "Out Of Memory."); /* Note "O" and "M" */
+               else
+                  png_warning(png_ptr, "Out Of Memory.");
+#endif
+               return (NULL);
+            }
+
+            if ((png_size_t)table & 0xfff0)
+            {
+#ifndef PNG_USER_MEM_SUPPORTED
+               if ((png_ptr->flags&PNG_FLAG_MALLOC_NULL_MEM_OK) == 0)
+                  png_error(png_ptr,
+                    "Farmalloc didn't return normalized pointer");
+               else
+                  png_warning(png_ptr,
+                    "Farmalloc didn't return normalized pointer");
+#endif
+               return (NULL);
+            }
+
+            png_ptr->offset_table = table;
+            png_ptr->offset_table_ptr = farmalloc(num_blocks *
+               png_sizeof (png_bytep));
+
+            if (png_ptr->offset_table_ptr == NULL)
+            {
+#ifndef PNG_USER_MEM_SUPPORTED
+               if ((png_ptr->flags&PNG_FLAG_MALLOC_NULL_MEM_OK) == 0)
+                  png_error(png_ptr, "Out Of memory."); /* Note "O" and "M" */
+               else
+                  png_warning(png_ptr, "Out Of memory.");
+#endif
+               return (NULL);
+            }
+
+            hptr = (png_byte huge *)table;
+            if ((png_size_t)hptr & 0xf)
+            {
+               hptr = (png_byte huge *)((long)(hptr) & 0xfffffff0L);
+               hptr = hptr + 16L;  /* "hptr += 16L" fails on Turbo C++ 3.0 */
+            }
+            for (i = 0; i < num_blocks; i++)
+            {
+               png_ptr->offset_table_ptr[i] = (png_bytep)hptr;
+               hptr = hptr + (png_uint_32)65536L;  /* "+=" fails on TC++3.0 */
+            }
+
+            png_ptr->offset_table_number = num_blocks;
+            png_ptr->offset_table_count = 0;
+            png_ptr->offset_table_count_free = 0;
+         }
+      }
+
+      if (png_ptr->offset_table_count >= png_ptr->offset_table_number)
+      {
+#ifndef PNG_USER_MEM_SUPPORTED
+         if ((png_ptr->flags&PNG_FLAG_MALLOC_NULL_MEM_OK) == 0)
+            png_error(png_ptr, "Out of Memory."); /* Note "o" and "M" */
+         else
+            png_warning(png_ptr, "Out of Memory.");
+#endif
+         return (NULL);
+      }
+
+      ret = png_ptr->offset_table_ptr[png_ptr->offset_table_count++];
+   }
+   else
+      ret = farmalloc(size);
+
+#ifndef PNG_USER_MEM_SUPPORTED
+   if (ret == NULL)
+   {
+      if ((png_ptr->flags&PNG_FLAG_MALLOC_NULL_MEM_OK) == 0)
+         png_error(png_ptr, "Out of memory."); /* Note "o" and "m" */
+      else
+         png_warning(png_ptr, "Out of memory."); /* Note "o" and "m" */
+   }
+#endif
+
+   return (ret);
+}
+
+/* free a pointer allocated by png_malloc().  In the default
+   configuration, png_ptr is not used, but is passed in case it
+   is needed.  If ptr is NULL, return without taking any action. */
+void PNGAPI
+png_free(png_structp png_ptr, png_voidp ptr)
+{
+   if (png_ptr == NULL || ptr == NULL)
+      return;
+
+#ifdef PNG_USER_MEM_SUPPORTED
+   if (png_ptr->free_fn != NULL)
+   {
+      (*(png_ptr->free_fn))(png_ptr, ptr);
+      return;
+   }
+   else png_free_default(png_ptr, ptr);
+}
+
+void PNGAPI
+png_free_default(png_structp png_ptr, png_voidp ptr)
+{
+#endif /* PNG_USER_MEM_SUPPORTED */
+
+   if(png_ptr == NULL) return;
+
+   if (png_ptr->offset_table != NULL)
+   {
+      int i;
+
+      for (i = 0; i < png_ptr->offset_table_count; i++)
+      {
+         if (ptr == png_ptr->offset_table_ptr[i])
+         {
+            ptr = NULL;
+            png_ptr->offset_table_count_free++;
+            break;
+         }
+      }
+      if (png_ptr->offset_table_count_free == png_ptr->offset_table_count)
+      {
+         farfree(png_ptr->offset_table);
+         farfree(png_ptr->offset_table_ptr);
+         png_ptr->offset_table = NULL;
+         png_ptr->offset_table_ptr = NULL;
+      }
+   }
+
+   if (ptr != NULL)
+   {
+      farfree(ptr);
+   }
+}
+
+#else /* Not the Borland DOS special memory handler */
+
+/* Allocate memory for a png_struct or a png_info.  The malloc and
+   memset can be replaced by a single call to calloc() if this is thought
+   to improve performance noticably. */
+png_voidp /* PRIVATE */
+png_create_struct(int type)
+{
+#ifdef PNG_USER_MEM_SUPPORTED
+   return (png_create_struct_2(type, png_malloc_ptr_NULL, png_voidp_NULL));
+}
+
+/* Allocate memory for a png_struct or a png_info.  The malloc and
+   memset can be replaced by a single call to calloc() if this is thought
+   to improve performance noticably. */
+png_voidp /* PRIVATE */
+png_create_struct_2(int type, png_malloc_ptr malloc_fn, png_voidp mem_ptr)
+{
+#endif /* PNG_USER_MEM_SUPPORTED */
+   png_size_t size;
+   png_voidp struct_ptr;
+
+   if (type == PNG_STRUCT_INFO)
+      size = png_sizeof(png_info);
+   else if (type == PNG_STRUCT_PNG)
+      size = png_sizeof(png_struct);
+   else
+      return (NULL);
+
+#ifdef PNG_USER_MEM_SUPPORTED
+   if(malloc_fn != NULL)
+   {
+      png_struct dummy_struct;
+      png_structp png_ptr = &dummy_struct;
+      png_ptr->mem_ptr=mem_ptr;
+      struct_ptr = (*(malloc_fn))(png_ptr, size);
+      if (struct_ptr != NULL)
+         png_memset(struct_ptr, 0, size);
+      return (struct_ptr);
+   }
+#endif /* PNG_USER_MEM_SUPPORTED */
+
+#if defined(__TURBOC__) && !defined(__FLAT__)
+   struct_ptr = (png_voidp)farmalloc(size);
+#else
+# if defined(_MSC_VER) && defined(MAXSEG_64K)
+   struct_ptr = (png_voidp)halloc(size,1);
+# else
+   struct_ptr = (png_voidp)malloc(size);
+# endif
+#endif
+   if (struct_ptr != NULL)
+      png_memset(struct_ptr, 0, size);
+
+   return (struct_ptr);
+}
+
+
+/* Free memory allocated by a png_create_struct() call */
+void /* PRIVATE */
+png_destroy_struct(png_voidp struct_ptr)
+{
+#ifdef PNG_USER_MEM_SUPPORTED
+   png_destroy_struct_2(struct_ptr, png_free_ptr_NULL, png_voidp_NULL);
+}
+
+/* Free memory allocated by a png_create_struct() call */
+void /* PRIVATE */
+png_destroy_struct_2(png_voidp struct_ptr, png_free_ptr free_fn,
+    png_voidp mem_ptr)
+{
+#endif /* PNG_USER_MEM_SUPPORTED */
+   if (struct_ptr != NULL)
+   {
+#ifdef PNG_USER_MEM_SUPPORTED
+      if(free_fn != NULL)
+      {
+         png_struct dummy_struct;
+         png_structp png_ptr = &dummy_struct;
+         png_ptr->mem_ptr=mem_ptr;
+         (*(free_fn))(png_ptr, struct_ptr);
+         return;
+      }
+#endif /* PNG_USER_MEM_SUPPORTED */
+#if defined(__TURBOC__) && !defined(__FLAT__)
+      farfree(struct_ptr);
+#else
+# if defined(_MSC_VER) && defined(MAXSEG_64K)
+      hfree(struct_ptr);
+# else
+      free(struct_ptr);
+# endif
+#endif
+   }
+}
+
+/* Allocate memory.  For reasonable files, size should never exceed
+   64K.  However, zlib may allocate more then 64K if you don't tell
+   it not to.  See zconf.h and png.h for more information.  zlib does
+   need to allocate exactly 64K, so whatever you call here must
+   have the ability to do that. */
+
+png_voidp PNGAPI
+png_malloc(png_structp png_ptr, png_uint_32 size)
+{
+   png_voidp ret;
+
+#ifdef PNG_USER_MEM_SUPPORTED
+   if (png_ptr == NULL || size == 0)
+      return (NULL);
+
+   if(png_ptr->malloc_fn != NULL)
+       ret = ((png_voidp)(*(png_ptr->malloc_fn))(png_ptr, (png_size_t)size));
+   else
+       ret = (png_malloc_default(png_ptr, size));
+   if (ret == NULL && (png_ptr->flags&PNG_FLAG_MALLOC_NULL_MEM_OK) == 0)
+       png_error(png_ptr, "Out of Memory!");
+   return (ret);
+}
+
+png_voidp PNGAPI
+png_malloc_default(png_structp png_ptr, png_uint_32 size)
+{
+   png_voidp ret;
+#endif /* PNG_USER_MEM_SUPPORTED */
+
+   if (png_ptr == NULL || size == 0)
+      return (NULL);
+
+#ifdef PNG_MAX_MALLOC_64K
+   if (size > (png_uint_32)65536L)
+   {
+#ifndef PNG_USER_MEM_SUPPORTED
+      if(png_ptr->flags&PNG_FLAG_MALLOC_NULL_MEM_OK) == 0)
+         png_error(png_ptr, "Cannot Allocate > 64K");
+      else
+#endif
+         return NULL;
+   }
+#endif
+
+ /* Check for overflow */
+#if defined(__TURBOC__) && !defined(__FLAT__)
+ if (size != (unsigned long)size)
+   ret = NULL;
+ else
+   ret = farmalloc(size);
+#else
+# if defined(_MSC_VER) && defined(MAXSEG_64K)
+ if (size != (unsigned long)size)
+   ret = NULL;
+ else
+   ret = halloc(size, 1);
+# else
+ if (size != (size_t)size)
+   ret = NULL;
+ else
+   ret = malloc((size_t)size);
+# endif
+#endif
+
+#ifndef PNG_USER_MEM_SUPPORTED
+   if (ret == NULL && (png_ptr->flags&PNG_FLAG_MALLOC_NULL_MEM_OK) == 0)
+      png_error(png_ptr, "Out of Memory");
+#endif
+
+   return (ret);
+}
+
+/* Free a pointer allocated by png_malloc().  If ptr is NULL, return
+   without taking any action. */
+void PNGAPI
+png_free(png_structp png_ptr, png_voidp ptr)
+{
+   if (png_ptr == NULL || ptr == NULL)
+      return;
+
+#ifdef PNG_USER_MEM_SUPPORTED
+   if (png_ptr->free_fn != NULL)
+   {
+      (*(png_ptr->free_fn))(png_ptr, ptr);
+      return;
+   }
+   else png_free_default(png_ptr, ptr);
+}
+void PNGAPI
+png_free_default(png_structp png_ptr, png_voidp ptr)
+{
+   if (png_ptr == NULL || ptr == NULL)
+      return;
+
+#endif /* PNG_USER_MEM_SUPPORTED */
+
+#if defined(__TURBOC__) && !defined(__FLAT__)
+   farfree(ptr);
+#else
+# if defined(_MSC_VER) && defined(MAXSEG_64K)
+   hfree(ptr);
+# else
+   free(ptr);
+# endif
+#endif
+}
+
+#endif /* Not Borland DOS special memory handler */
+
+#if defined(PNG_1_0_X)
+#  define png_malloc_warn png_malloc
+#else
+/* This function was added at libpng version 1.2.3.  The png_malloc_warn()
+ * function will set up png_malloc() to issue a png_warning and return NULL
+ * instead of issuing a png_error, if it fails to allocate the requested
+ * memory.
+ */
+png_voidp PNGAPI
+png_malloc_warn(png_structp png_ptr, png_uint_32 size)
+{
+   png_voidp ptr;
+   png_uint_32 save_flags;
+   if(png_ptr == NULL) return (NULL);
+
+   save_flags=png_ptr->flags;
+   png_ptr->flags|=PNG_FLAG_MALLOC_NULL_MEM_OK;
+   ptr = (png_voidp)png_malloc((png_structp)png_ptr, size);
+   png_ptr->flags=save_flags;
+   return(ptr);
+}
+#endif
+
+png_voidp PNGAPI
+png_memcpy_check (png_structp png_ptr, png_voidp s1, png_voidp s2,
+   png_uint_32 length)
+{
+   png_size_t size;
+
+   size = (png_size_t)length;
+   if ((png_uint_32)size != length)
+      png_error(png_ptr,"Overflow in png_memcpy_check.");
+
+   return(png_memcpy (s1, s2, size));
+}
+
+png_voidp PNGAPI
+png_memset_check (png_structp png_ptr, png_voidp s1, int value,
+   png_uint_32 length)
+{
+   png_size_t size;
+
+   size = (png_size_t)length;
+   if ((png_uint_32)size != length)
+      png_error(png_ptr,"Overflow in png_memset_check.");
+
+   return (png_memset (s1, value, size));
+
+}
+
+#ifdef PNG_USER_MEM_SUPPORTED
+/* This function is called when the application wants to use another method
+ * of allocating and freeing memory.
+ */
+void PNGAPI
+png_set_mem_fn(png_structp png_ptr, png_voidp mem_ptr, png_malloc_ptr
+  malloc_fn, png_free_ptr free_fn)
+{
+   if(png_ptr != NULL) {
+   png_ptr->mem_ptr = mem_ptr;
+   png_ptr->malloc_fn = malloc_fn;
+   png_ptr->free_fn = free_fn;
+   }
+}
+
+/* This function returns a pointer to the mem_ptr associated with the user
+ * functions.  The application should free any memory associated with this
+ * pointer before png_write_destroy and png_read_destroy are called.
+ */
+png_voidp PNGAPI
+png_get_mem_ptr(png_structp png_ptr)
+{
+   if(png_ptr == NULL) return (NULL);
+   return ((png_voidp)png_ptr->mem_ptr);
+}
+#endif /* PNG_USER_MEM_SUPPORTED */
+#endif /* PNG_READ_SUPPORTED || PNG_WRITE_SUPPORTED */
diff --git a/uppsrc/plugin/png/lib/pngpread.c b/uppsrc/plugin/png/lib/pngpread.c
new file mode 100644
index 000000000..cb6f6d3d8
--- /dev/null
+++ b/uppsrc/plugin/png/lib/pngpread.c
@@ -0,0 +1,1584 @@
+
+/* pngpread.c - read a png file in push mode
+ *
+ * Last changed in libpng 1.2.22 [October 13, 2007]
+ * For conditions of distribution and use, see copyright notice in png.h
+ * Copyright (c) 1998-2007 Glenn Randers-Pehrson
+ * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
+ * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
+ */
+
+#define PNG_INTERNAL
+#include "png.h"
+
+#ifdef PNG_PROGRESSIVE_READ_SUPPORTED
+
+/* push model modes */
+#define PNG_READ_SIG_MODE   0
+#define PNG_READ_CHUNK_MODE 1
+#define PNG_READ_IDAT_MODE  2
+#define PNG_SKIP_MODE       3
+#define PNG_READ_tEXt_MODE  4
+#define PNG_READ_zTXt_MODE  5
+#define PNG_READ_DONE_MODE  6
+#define PNG_READ_iTXt_MODE  7
+#define PNG_ERROR_MODE      8
+
+void PNGAPI
+png_process_data(png_structp png_ptr, png_infop info_ptr,
+   png_bytep buffer, png_size_t buffer_size)
+{
+   if(png_ptr == NULL) return;
+   png_push_restore_buffer(png_ptr, buffer, buffer_size);
+
+   while (png_ptr->buffer_size)
+   {
+      png_process_some_data(png_ptr, info_ptr);
+   }
+}
+
+/* What we do with the incoming data depends on what we were previously
+ * doing before we ran out of data...
+ */
+void /* PRIVATE */
+png_process_some_data(png_structp png_ptr, png_infop info_ptr)
+{
+   if(png_ptr == NULL) return;
+   switch (png_ptr->process_mode)
+   {
+      case PNG_READ_SIG_MODE:
+      {
+         png_push_read_sig(png_ptr, info_ptr);
+         break;
+      }
+      case PNG_READ_CHUNK_MODE:
+      {
+         png_push_read_chunk(png_ptr, info_ptr);
+         break;
+      }
+      case PNG_READ_IDAT_MODE:
+      {
+         png_push_read_IDAT(png_ptr);
+         break;
+      }
+#if defined(PNG_READ_tEXt_SUPPORTED)
+      case PNG_READ_tEXt_MODE:
+      {
+         png_push_read_tEXt(png_ptr, info_ptr);
+         break;
+      }
+#endif
+#if defined(PNG_READ_zTXt_SUPPORTED)
+      case PNG_READ_zTXt_MODE:
+      {
+         png_push_read_zTXt(png_ptr, info_ptr);
+         break;
+      }
+#endif
+#if defined(PNG_READ_iTXt_SUPPORTED)
+      case PNG_READ_iTXt_MODE:
+      {
+         png_push_read_iTXt(png_ptr, info_ptr);
+         break;
+      }
+#endif
+      case PNG_SKIP_MODE:
+      {
+         png_push_crc_finish(png_ptr);
+         break;
+      }
+      default:
+      {
+         png_ptr->buffer_size = 0;
+         break;
+      }
+   }
+}
+
+/* Read any remaining signature bytes from the stream and compare them with
+ * the correct PNG signature.  It is possible that this routine is called
+ * with bytes already read from the signature, either because they have been
+ * checked by the calling application, or because of multiple calls to this
+ * routine.
+ */
+void /* PRIVATE */
+png_push_read_sig(png_structp png_ptr, png_infop info_ptr)
+{
+   png_size_t num_checked = png_ptr->sig_bytes,
+             num_to_check = 8 - num_checked;
+
+   if (png_ptr->buffer_size < num_to_check)
+   {
+      num_to_check = png_ptr->buffer_size;
+   }
+
+   png_push_fill_buffer(png_ptr, &(info_ptr->signature[num_checked]),
+      num_to_check);
+   png_ptr->sig_bytes = (png_byte)(png_ptr->sig_bytes+num_to_check);
+
+   if (png_sig_cmp(info_ptr->signature, num_checked, num_to_check))
+   {
+      if (num_checked < 4 &&
+          png_sig_cmp(info_ptr->signature, num_checked, num_to_check - 4))
+         png_error(png_ptr, "Not a PNG file");
+      else
+         png_error(png_ptr, "PNG file corrupted by ASCII conversion");
+   }
+   else
+   {
+      if (png_ptr->sig_bytes >= 8)
+      {
+         png_ptr->process_mode = PNG_READ_CHUNK_MODE;
+      }
+   }
+}
+
+void /* PRIVATE */
+png_push_read_chunk(png_structp png_ptr, png_infop info_ptr)
+{
+#ifdef PNG_USE_LOCAL_ARRAYS
+      PNG_CONST PNG_IHDR;
+      PNG_CONST PNG_IDAT;
+      PNG_CONST PNG_IEND;
+      PNG_CONST PNG_PLTE;
+#if defined(PNG_READ_bKGD_SUPPORTED)
+      PNG_CONST PNG_bKGD;
+#endif
+#if defined(PNG_READ_cHRM_SUPPORTED)
+      PNG_CONST PNG_cHRM;
+#endif
+#if defined(PNG_READ_gAMA_SUPPORTED)
+      PNG_CONST PNG_gAMA;
+#endif
+#if defined(PNG_READ_hIST_SUPPORTED)
+      PNG_CONST PNG_hIST;
+#endif
+#if defined(PNG_READ_iCCP_SUPPORTED)
+      PNG_CONST PNG_iCCP;
+#endif
+#if defined(PNG_READ_iTXt_SUPPORTED)
+      PNG_CONST PNG_iTXt;
+#endif
+#if defined(PNG_READ_oFFs_SUPPORTED)
+      PNG_CONST PNG_oFFs;
+#endif
+#if defined(PNG_READ_pCAL_SUPPORTED)
+      PNG_CONST PNG_pCAL;
+#endif
+#if defined(PNG_READ_pHYs_SUPPORTED)
+      PNG_CONST PNG_pHYs;
+#endif
+#if defined(PNG_READ_sBIT_SUPPORTED)
+      PNG_CONST PNG_sBIT;
+#endif
+#if defined(PNG_READ_sCAL_SUPPORTED)
+      PNG_CONST PNG_sCAL;
+#endif
+#if defined(PNG_READ_sRGB_SUPPORTED)
+      PNG_CONST PNG_sRGB;
+#endif
+#if defined(PNG_READ_sPLT_SUPPORTED)
+      PNG_CONST PNG_sPLT;
+#endif
+#if defined(PNG_READ_tEXt_SUPPORTED)
+      PNG_CONST PNG_tEXt;
+#endif
+#if defined(PNG_READ_tIME_SUPPORTED)
+      PNG_CONST PNG_tIME;
+#endif
+#if defined(PNG_READ_tRNS_SUPPORTED)
+      PNG_CONST PNG_tRNS;
+#endif
+#if defined(PNG_READ_zTXt_SUPPORTED)
+      PNG_CONST PNG_zTXt;
+#endif
+#endif /* PNG_USE_LOCAL_ARRAYS */
+   /* First we make sure we have enough data for the 4 byte chunk name
+    * and the 4 byte chunk length before proceeding with decoding the
+    * chunk data.  To fully decode each of these chunks, we also make
+    * sure we have enough data in the buffer for the 4 byte CRC at the
+    * end of every chunk (except IDAT, which is handled separately).
+    */
+   if (!(png_ptr->mode & PNG_HAVE_CHUNK_HEADER))
+   {
+      png_byte chunk_length[4];
+
+      if (png_ptr->buffer_size < 8)
+      {
+         png_push_save_buffer(png_ptr);
+         return;
+      }
+
+      png_push_fill_buffer(png_ptr, chunk_length, 4);
+      png_ptr->push_length = png_get_uint_31(png_ptr,chunk_length);
+      png_reset_crc(png_ptr);
+      png_crc_read(png_ptr, png_ptr->chunk_name, 4);
+      png_ptr->mode |= PNG_HAVE_CHUNK_HEADER;
+   }
+
+   if (!png_memcmp(png_ptr->chunk_name, png_IDAT, 4))
+     if(png_ptr->mode & PNG_AFTER_IDAT)
+        png_ptr->mode |= PNG_HAVE_CHUNK_AFTER_IDAT;
+
+   if (!png_memcmp(png_ptr->chunk_name, png_IHDR, 4))
+   {
+      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
+      {
+         png_push_save_buffer(png_ptr);
+         return;
+      }
+      png_handle_IHDR(png_ptr, info_ptr, png_ptr->push_length);
+   }
+   else if (!png_memcmp(png_ptr->chunk_name, png_IEND, 4))
+   {
+      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
+      {
+         png_push_save_buffer(png_ptr);
+         return;
+      }
+      png_handle_IEND(png_ptr, info_ptr, png_ptr->push_length);
+
+      png_ptr->process_mode = PNG_READ_DONE_MODE;
+      png_push_have_end(png_ptr, info_ptr);
+   }
+#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
+   else if (png_handle_as_unknown(png_ptr, png_ptr->chunk_name))
+   {
+      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
+      {
+         png_push_save_buffer(png_ptr);
+         return;
+      }
+      if (!png_memcmp(png_ptr->chunk_name, png_IDAT, 4))
+         png_ptr->mode |= PNG_HAVE_IDAT;
+      png_handle_unknown(png_ptr, info_ptr, png_ptr->push_length);
+      if (!png_memcmp(png_ptr->chunk_name, png_PLTE, 4))
+         png_ptr->mode |= PNG_HAVE_PLTE;
+      else if (!png_memcmp(png_ptr->chunk_name, png_IDAT, 4))
+      {
+         if (!(png_ptr->mode & PNG_HAVE_IHDR))
+            png_error(png_ptr, "Missing IHDR before IDAT");
+         else if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE &&
+                  !(png_ptr->mode & PNG_HAVE_PLTE))
+            png_error(png_ptr, "Missing PLTE before IDAT");
+      }
+   }
+#endif
+   else if (!png_memcmp(png_ptr->chunk_name, png_PLTE, 4))
+   {
+      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
+      {
+         png_push_save_buffer(png_ptr);
+         return;
+      }
+      png_handle_PLTE(png_ptr, info_ptr, png_ptr->push_length);
+   }
+   else if (!png_memcmp(png_ptr->chunk_name, png_IDAT, 4))
+   {
+      /* If we reach an IDAT chunk, this means we have read all of the
+       * header chunks, and we can start reading the image (or if this
+       * is called after the image has been read - we have an error).
+       */
+     if (!(png_ptr->mode & PNG_HAVE_IHDR))
+       png_error(png_ptr, "Missing IHDR before IDAT");
+     else if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE &&
+         !(png_ptr->mode & PNG_HAVE_PLTE))
+       png_error(png_ptr, "Missing PLTE before IDAT");
+
+      if (png_ptr->mode & PNG_HAVE_IDAT)
+      {
+         if (!(png_ptr->mode & PNG_HAVE_CHUNK_AFTER_IDAT))
+           if (png_ptr->push_length == 0)
+              return;
+
+         if (png_ptr->mode & PNG_AFTER_IDAT)
+            png_error(png_ptr, "Too many IDAT's found");
+      }
+
+      png_ptr->idat_size = png_ptr->push_length;
+      png_ptr->mode |= PNG_HAVE_IDAT;
+      png_ptr->process_mode = PNG_READ_IDAT_MODE;
+      png_push_have_info(png_ptr, info_ptr);
+      png_ptr->zstream.avail_out = (uInt)png_ptr->irowbytes;
+      png_ptr->zstream.next_out = png_ptr->row_buf;
+      return;
+   }
+#if defined(PNG_READ_gAMA_SUPPORTED)
+   else if (!png_memcmp(png_ptr->chunk_name, png_gAMA, 4))
+   {
+      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
+      {
+         png_push_save_buffer(png_ptr);
+         return;
+      }
+      png_handle_gAMA(png_ptr, info_ptr, png_ptr->push_length);
+   }
+#endif
+#if defined(PNG_READ_sBIT_SUPPORTED)
+   else if (!png_memcmp(png_ptr->chunk_name, png_sBIT, 4))
+   {
+      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
+      {
+         png_push_save_buffer(png_ptr);
+         return;
+      }
+      png_handle_sBIT(png_ptr, info_ptr, png_ptr->push_length);
+   }
+#endif
+#if defined(PNG_READ_cHRM_SUPPORTED)
+   else if (!png_memcmp(png_ptr->chunk_name, png_cHRM, 4))
+   {
+      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
+      {
+         png_push_save_buffer(png_ptr);
+         return;
+      }
+      png_handle_cHRM(png_ptr, info_ptr, png_ptr->push_length);
+   }
+#endif
+#if defined(PNG_READ_sRGB_SUPPORTED)
+   else if (!png_memcmp(png_ptr->chunk_name, png_sRGB, 4))
+   {
+      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
+      {
+         png_push_save_buffer(png_ptr);
+         return;
+      }
+      png_handle_sRGB(png_ptr, info_ptr, png_ptr->push_length);
+   }
+#endif
+#if defined(PNG_READ_iCCP_SUPPORTED)
+   else if (!png_memcmp(png_ptr->chunk_name, png_iCCP, 4))
+   {
+      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
+      {
+         png_push_save_buffer(png_ptr);
+         return;
+      }
+      png_handle_iCCP(png_ptr, info_ptr, png_ptr->push_length);
+   }
+#endif
+#if defined(PNG_READ_sPLT_SUPPORTED)
+   else if (!png_memcmp(png_ptr->chunk_name, png_sPLT, 4))
+   {
+      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
+      {
+         png_push_save_buffer(png_ptr);
+         return;
+      }
+      png_handle_sPLT(png_ptr, info_ptr, png_ptr->push_length);
+   }
+#endif
+#if defined(PNG_READ_tRNS_SUPPORTED)
+   else if (!png_memcmp(png_ptr->chunk_name, png_tRNS, 4))
+   {
+      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
+      {
+         png_push_save_buffer(png_ptr);
+         return;
+      }
+      png_handle_tRNS(png_ptr, info_ptr, png_ptr->push_length);
+   }
+#endif
+#if defined(PNG_READ_bKGD_SUPPORTED)
+   else if (!png_memcmp(png_ptr->chunk_name, png_bKGD, 4))
+   {
+      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
+      {
+         png_push_save_buffer(png_ptr);
+         return;
+      }
+      png_handle_bKGD(png_ptr, info_ptr, png_ptr->push_length);
+   }
+#endif
+#if defined(PNG_READ_hIST_SUPPORTED)
+   else if (!png_memcmp(png_ptr->chunk_name, png_hIST, 4))
+   {
+      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
+      {
+         png_push_save_buffer(png_ptr);
+         return;
+      }
+      png_handle_hIST(png_ptr, info_ptr, png_ptr->push_length);
+   }
+#endif
+#if defined(PNG_READ_pHYs_SUPPORTED)
+   else if (!png_memcmp(png_ptr->chunk_name, png_pHYs, 4))
+   {
+      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
+      {
+         png_push_save_buffer(png_ptr);
+         return;
+      }
+      png_handle_pHYs(png_ptr, info_ptr, png_ptr->push_length);
+   }
+#endif
+#if defined(PNG_READ_oFFs_SUPPORTED)
+   else if (!png_memcmp(png_ptr->chunk_name, png_oFFs, 4))
+   {
+      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
+      {
+         png_push_save_buffer(png_ptr);
+         return;
+      }
+      png_handle_oFFs(png_ptr, info_ptr, png_ptr->push_length);
+   }
+#endif
+#if defined(PNG_READ_pCAL_SUPPORTED)
+   else if (!png_memcmp(png_ptr->chunk_name, png_pCAL, 4))
+   {
+      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
+      {
+         png_push_save_buffer(png_ptr);
+         return;
+      }
+      png_handle_pCAL(png_ptr, info_ptr, png_ptr->push_length);
+   }
+#endif
+#if defined(PNG_READ_sCAL_SUPPORTED)
+   else if (!png_memcmp(png_ptr->chunk_name, png_sCAL, 4))
+   {
+      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
+      {
+         png_push_save_buffer(png_ptr);
+         return;
+      }
+      png_handle_sCAL(png_ptr, info_ptr, png_ptr->push_length);
+   }
+#endif
+#if defined(PNG_READ_tIME_SUPPORTED)
+   else if (!png_memcmp(png_ptr->chunk_name, png_tIME, 4))
+   {
+      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
+      {
+         png_push_save_buffer(png_ptr);
+         return;
+      }
+      png_handle_tIME(png_ptr, info_ptr, png_ptr->push_length);
+   }
+#endif
+#if defined(PNG_READ_tEXt_SUPPORTED)
+   else if (!png_memcmp(png_ptr->chunk_name, png_tEXt, 4))
+   {
+      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
+      {
+         png_push_save_buffer(png_ptr);
+         return;
+      }
+      png_push_handle_tEXt(png_ptr, info_ptr, png_ptr->push_length);
+   }
+#endif
+#if defined(PNG_READ_zTXt_SUPPORTED)
+   else if (!png_memcmp(png_ptr->chunk_name, png_zTXt, 4))
+   {
+      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
+      {
+         png_push_save_buffer(png_ptr);
+         return;
+      }
+      png_push_handle_zTXt(png_ptr, info_ptr, png_ptr->push_length);
+   }
+#endif
+#if defined(PNG_READ_iTXt_SUPPORTED)
+   else if (!png_memcmp(png_ptr->chunk_name, png_iTXt, 4))
+   {
+      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
+      {
+         png_push_save_buffer(png_ptr);
+         return;
+      }
+      png_push_handle_iTXt(png_ptr, info_ptr, png_ptr->push_length);
+   }
+#endif
+   else
+   {
+      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
+      {
+         png_push_save_buffer(png_ptr);
+         return;
+      }
+      png_push_handle_unknown(png_ptr, info_ptr, png_ptr->push_length);
+   }
+
+   png_ptr->mode &= ~PNG_HAVE_CHUNK_HEADER;
+}
+
+void /* PRIVATE */
+png_push_crc_skip(png_structp png_ptr, png_uint_32 skip)
+{
+   png_ptr->process_mode = PNG_SKIP_MODE;
+   png_ptr->skip_length = skip;
+}
+
+void /* PRIVATE */
+png_push_crc_finish(png_structp png_ptr)
+{
+   if (png_ptr->skip_length && png_ptr->save_buffer_size)
+   {
+      png_size_t save_size;
+
+      if (png_ptr->skip_length < (png_uint_32)png_ptr->save_buffer_size)
+         save_size = (png_size_t)png_ptr->skip_length;
+      else
+         save_size = png_ptr->save_buffer_size;
+
+      png_calculate_crc(png_ptr, png_ptr->save_buffer_ptr, save_size);
+
+      png_ptr->skip_length -= save_size;
+      png_ptr->buffer_size -= save_size;
+      png_ptr->save_buffer_size -= save_size;
+      png_ptr->save_buffer_ptr += save_size;
+   }
+   if (png_ptr->skip_length && png_ptr->current_buffer_size)
+   {
+      png_size_t save_size;
+
+      if (png_ptr->skip_length < (png_uint_32)png_ptr->current_buffer_size)
+         save_size = (png_size_t)png_ptr->skip_length;
+      else
+         save_size = png_ptr->current_buffer_size;
+
+      png_calculate_crc(png_ptr, png_ptr->current_buffer_ptr, save_size);
+
+      png_ptr->skip_length -= save_size;
+      png_ptr->buffer_size -= save_size;
+      png_ptr->current_buffer_size -= save_size;
+      png_ptr->current_buffer_ptr += save_size;
+   }
+   if (!png_ptr->skip_length)
+   {
+      if (png_ptr->buffer_size < 4)
+      {
+         png_push_save_buffer(png_ptr);
+         return;
+      }
+
+      png_crc_finish(png_ptr, 0);
+      png_ptr->process_mode = PNG_READ_CHUNK_MODE;
+   }
+}
+
+void PNGAPI
+png_push_fill_buffer(png_structp png_ptr, png_bytep buffer, png_size_t length)
+{
+   png_bytep ptr;
+
+   if(png_ptr == NULL) return;
+   ptr = buffer;
+   if (png_ptr->save_buffer_size)
+   {
+      png_size_t save_size;
+
+      if (length < png_ptr->save_buffer_size)
+         save_size = length;
+      else
+         save_size = png_ptr->save_buffer_size;
+
+      png_memcpy(ptr, png_ptr->save_buffer_ptr, save_size);
+      length -= save_size;
+      ptr += save_size;
+      png_ptr->buffer_size -= save_size;
+      png_ptr->save_buffer_size -= save_size;
+      png_ptr->save_buffer_ptr += save_size;
+   }
+   if (length && png_ptr->current_buffer_size)
+   {
+      png_size_t save_size;
+
+      if (length < png_ptr->current_buffer_size)
+         save_size = length;
+      else
+         save_size = png_ptr->current_buffer_size;
+
+      png_memcpy(ptr, png_ptr->current_buffer_ptr, save_size);
+      png_ptr->buffer_size -= save_size;
+      png_ptr->current_buffer_size -= save_size;
+      png_ptr->current_buffer_ptr += save_size;
+   }
+}
+
+void /* PRIVATE */
+png_push_save_buffer(png_structp png_ptr)
+{
+   if (png_ptr->save_buffer_size)
+   {
+      if (png_ptr->save_buffer_ptr != png_ptr->save_buffer)
+      {
+         png_size_t i,istop;
+         png_bytep sp;
+         png_bytep dp;
+
+         istop = png_ptr->save_buffer_size;
+         for (i = 0, sp = png_ptr->save_buffer_ptr, dp = png_ptr->save_buffer;
+            i < istop; i++, sp++, dp++)
+         {
+            *dp = *sp;
+         }
+      }
+   }
+   if (png_ptr->save_buffer_size + png_ptr->current_buffer_size >
+      png_ptr->save_buffer_max)
+   {
+      png_size_t new_max;
+      png_bytep old_buffer;
+
+      if (png_ptr->save_buffer_size > PNG_SIZE_MAX -
+         (png_ptr->current_buffer_size + 256))
+      {
+        png_error(png_ptr, "Potential overflow of save_buffer");
+      }
+      new_max = png_ptr->save_buffer_size + png_ptr->current_buffer_size + 256;
+      old_buffer = png_ptr->save_buffer;
+      png_ptr->save_buffer = (png_bytep)png_malloc(png_ptr,
+         (png_uint_32)new_max);
+      png_memcpy(png_ptr->save_buffer, old_buffer, png_ptr->save_buffer_size);
+      png_free(png_ptr, old_buffer);
+      png_ptr->save_buffer_max = new_max;
+   }
+   if (png_ptr->current_buffer_size)
+   {
+      png_memcpy(png_ptr->save_buffer + png_ptr->save_buffer_size,
+         png_ptr->current_buffer_ptr, png_ptr->current_buffer_size);
+      png_ptr->save_buffer_size += png_ptr->current_buffer_size;
+      png_ptr->current_buffer_size = 0;
+   }
+   png_ptr->save_buffer_ptr = png_ptr->save_buffer;
+   png_ptr->buffer_size = 0;
+}
+
+void /* PRIVATE */
+png_push_restore_buffer(png_structp png_ptr, png_bytep buffer,
+   png_size_t buffer_length)
+{
+   png_ptr->current_buffer = buffer;
+   png_ptr->current_buffer_size = buffer_length;
+   png_ptr->buffer_size = buffer_length + png_ptr->save_buffer_size;
+   png_ptr->current_buffer_ptr = png_ptr->current_buffer;
+}
+
+void /* PRIVATE */
+png_push_read_IDAT(png_structp png_ptr)
+{
+#ifdef PNG_USE_LOCAL_ARRAYS
+   PNG_CONST PNG_IDAT;
+#endif
+   if (!(png_ptr->mode & PNG_HAVE_CHUNK_HEADER))
+   {
+      png_byte chunk_length[4];
+
+      if (png_ptr->buffer_size < 8)
+      {
+         png_push_save_buffer(png_ptr);
+         return;
+      }
+
+      png_push_fill_buffer(png_ptr, chunk_length, 4);
+      png_ptr->push_length = png_get_uint_31(png_ptr,chunk_length);
+      png_reset_crc(png_ptr);
+      png_crc_read(png_ptr, png_ptr->chunk_name, 4);
+      png_ptr->mode |= PNG_HAVE_CHUNK_HEADER;
+
+      if (png_memcmp(png_ptr->chunk_name, png_IDAT, 4))
+      {
+         png_ptr->process_mode = PNG_READ_CHUNK_MODE;
+         if (!(png_ptr->flags & PNG_FLAG_ZLIB_FINISHED))
+            png_error(png_ptr, "Not enough compressed data");
+         return;
+      }
+
+      png_ptr->idat_size = png_ptr->push_length;
+   }
+   if (png_ptr->idat_size && png_ptr->save_buffer_size)
+   {
+      png_size_t save_size;
+
+      if (png_ptr->idat_size < (png_uint_32)png_ptr->save_buffer_size)
+      {
+         save_size = (png_size_t)png_ptr->idat_size;
+         /* check for overflow */
+         if((png_uint_32)save_size != png_ptr->idat_size)
+            png_error(png_ptr, "save_size overflowed in pngpread");
+      }
+      else
+         save_size = png_ptr->save_buffer_size;
+
+      png_calculate_crc(png_ptr, png_ptr->save_buffer_ptr, save_size);
+      if (!(png_ptr->flags & PNG_FLAG_ZLIB_FINISHED))
+         png_process_IDAT_data(png_ptr, png_ptr->save_buffer_ptr, save_size);
+      png_ptr->idat_size -= save_size;
+      png_ptr->buffer_size -= save_size;
+      png_ptr->save_buffer_size -= save_size;
+      png_ptr->save_buffer_ptr += save_size;
+   }
+   if (png_ptr->idat_size && png_ptr->current_buffer_size)
+   {
+      png_size_t save_size;
+
+      if (png_ptr->idat_size < (png_uint_32)png_ptr->current_buffer_size)
+      {
+         save_size = (png_size_t)png_ptr->idat_size;
+         /* check for overflow */
+         if((png_uint_32)save_size != png_ptr->idat_size)
+            png_error(png_ptr, "save_size overflowed in pngpread");
+      }
+      else
+         save_size = png_ptr->current_buffer_size;
+
+      png_calculate_crc(png_ptr, png_ptr->current_buffer_ptr, save_size);
+      if (!(png_ptr->flags & PNG_FLAG_ZLIB_FINISHED))
+        png_process_IDAT_data(png_ptr, png_ptr->current_buffer_ptr, save_size);
+
+      png_ptr->idat_size -= save_size;
+      png_ptr->buffer_size -= save_size;
+      png_ptr->current_buffer_size -= save_size;
+      png_ptr->current_buffer_ptr += save_size;
+   }
+   if (!png_ptr->idat_size)
+   {
+      if (png_ptr->buffer_size < 4)
+      {
+         png_push_save_buffer(png_ptr);
+         return;
+      }
+
+      png_crc_finish(png_ptr, 0);
+      png_ptr->mode &= ~PNG_HAVE_CHUNK_HEADER;
+      png_ptr->mode |= PNG_AFTER_IDAT;
+   }
+}
+
+void /* PRIVATE */
+png_process_IDAT_data(png_structp png_ptr, png_bytep buffer,
+   png_size_t buffer_length)
+{
+   int ret;
+
+   if ((png_ptr->flags & PNG_FLAG_ZLIB_FINISHED) && buffer_length)
+      png_error(png_ptr, "Extra compression data");
+
+   png_ptr->zstream.next_in = buffer;
+   png_ptr->zstream.avail_in = (uInt)buffer_length;
+   for(;;)
+   {
+      ret = inflate(&png_ptr->zstream, Z_PARTIAL_FLUSH);
+      if (ret != Z_OK)
+      {
+         if (ret == Z_STREAM_END)
+         {
+            if (png_ptr->zstream.avail_in)
+               png_error(png_ptr, "Extra compressed data");
+            if (!(png_ptr->zstream.avail_out))
+            {
+               png_push_process_row(png_ptr);
+            }
+
+            png_ptr->mode |= PNG_AFTER_IDAT;
+            png_ptr->flags |= PNG_FLAG_ZLIB_FINISHED;
+            break;
+         }
+         else if (ret == Z_BUF_ERROR)
+            break;
+         else
+            png_error(png_ptr, "Decompression Error");
+      }
+      if (!(png_ptr->zstream.avail_out))
+      {
+         if ((
+#if defined(PNG_READ_INTERLACING_SUPPORTED)
+             png_ptr->interlaced && png_ptr->pass > 6) ||
+             (!png_ptr->interlaced &&
+#endif
+             png_ptr->row_number == png_ptr->num_rows))
+         {
+           if (png_ptr->zstream.avail_in)
+             png_warning(png_ptr, "Too much data in IDAT chunks");
+           png_ptr->flags |= PNG_FLAG_ZLIB_FINISHED;
+           break;
+         }
+         png_push_process_row(png_ptr);
+         png_ptr->zstream.avail_out = (uInt)png_ptr->irowbytes;
+         png_ptr->zstream.next_out = png_ptr->row_buf;
+      }
+      else
+         break;
+   }
+}
+
+void /* PRIVATE */
+png_push_process_row(png_structp png_ptr)
+{
+   png_ptr->row_info.color_type = png_ptr->color_type;
+   png_ptr->row_info.width = png_ptr->iwidth;
+   png_ptr->row_info.channels = png_ptr->channels;
+   png_ptr->row_info.bit_depth = png_ptr->bit_depth;
+   png_ptr->row_info.pixel_depth = png_ptr->pixel_depth;
+
+   png_ptr->row_info.rowbytes = PNG_ROWBYTES(png_ptr->row_info.pixel_depth,
+       png_ptr->row_info.width);
+
+   png_read_filter_row(png_ptr, &(png_ptr->row_info),
+      png_ptr->row_buf + 1, png_ptr->prev_row + 1,
+      (int)(png_ptr->row_buf[0]));
+
+   png_memcpy_check(png_ptr, png_ptr->prev_row, png_ptr->row_buf,
+      png_ptr->rowbytes + 1);
+
+   if (png_ptr->transformations || (png_ptr->flags&PNG_FLAG_STRIP_ALPHA))
+      png_do_read_transformations(png_ptr);
+
+#if defined(PNG_READ_INTERLACING_SUPPORTED)
+   /* blow up interlaced rows to full size */
+   if (png_ptr->interlaced && (png_ptr->transformations & PNG_INTERLACE))
+   {
+      if (png_ptr->pass < 6)
+/*       old interface (pre-1.0.9):
+         png_do_read_interlace(&(png_ptr->row_info),
+            png_ptr->row_buf + 1, png_ptr->pass, png_ptr->transformations);
+ */
+         png_do_read_interlace(png_ptr);
+
+    switch (png_ptr->pass)
+    {
+         case 0:
+         {
+            int i;
+            for (i = 0; i < 8 && png_ptr->pass == 0; i++)
+            {
+               png_push_have_row(png_ptr, png_ptr->row_buf + 1);
+               png_read_push_finish_row(png_ptr); /* updates png_ptr->pass */
+            }
+            if (png_ptr->pass == 2) /* pass 1 might be empty */
+            {
+               for (i = 0; i < 4 && png_ptr->pass == 2; i++)
+               {
+                  png_push_have_row(png_ptr, png_bytep_NULL);
+                  png_read_push_finish_row(png_ptr);
+               }
+            }
+            if (png_ptr->pass == 4 && png_ptr->height <= 4)
+            {
+               for (i = 0; i < 2 && png_ptr->pass == 4; i++)
+               {
+                  png_push_have_row(png_ptr, png_bytep_NULL);
+                  png_read_push_finish_row(png_ptr);
+               }
+            }
+            if (png_ptr->pass == 6 && png_ptr->height <= 4)
+            {
+                png_push_have_row(png_ptr, png_bytep_NULL);
+                png_read_push_finish_row(png_ptr);
+            }
+            break;
+         }
+         case 1:
+         {
+            int i;
+            for (i = 0; i < 8 && png_ptr->pass == 1; i++)
+            {
+               png_push_have_row(png_ptr, png_ptr->row_buf + 1);
+               png_read_push_finish_row(png_ptr);
+            }
+            if (png_ptr->pass == 2) /* skip top 4 generated rows */
+            {
+               for (i = 0; i < 4 && png_ptr->pass == 2; i++)
+               {
+                  png_push_have_row(png_ptr, png_bytep_NULL);
+                  png_read_push_finish_row(png_ptr);
+               }
+            }
+            break;
+         }
+         case 2:
+         {
+            int i;
+            for (i = 0; i < 4 && png_ptr->pass == 2; i++)
+            {
+               png_push_have_row(png_ptr, png_ptr->row_buf + 1);
+               png_read_push_finish_row(png_ptr);
+            }
+            for (i = 0; i < 4 && png_ptr->pass == 2; i++)
+            {
+               png_push_have_row(png_ptr, png_bytep_NULL);
+               png_read_push_finish_row(png_ptr);
+            }
+            if (png_ptr->pass == 4) /* pass 3 might be empty */
+            {
+               for (i = 0; i < 2 && png_ptr->pass == 4; i++)
+               {
+                  png_push_have_row(png_ptr, png_bytep_NULL);
+                  png_read_push_finish_row(png_ptr);
+               }
+            }
+            break;
+         }
+         case 3:
+         {
+            int i;
+            for (i = 0; i < 4 && png_ptr->pass == 3; i++)
+            {
+               png_push_have_row(png_ptr, png_ptr->row_buf + 1);
+               png_read_push_finish_row(png_ptr);
+            }
+            if (png_ptr->pass == 4) /* skip top two generated rows */
+            {
+               for (i = 0; i < 2 && png_ptr->pass == 4; i++)
+               {
+                  png_push_have_row(png_ptr, png_bytep_NULL);
+                  png_read_push_finish_row(png_ptr);
+               }
+            }
+            break;
+         }
+         case 4:
+         {
+            int i;
+            for (i = 0; i < 2 && png_ptr->pass == 4; i++)
+            {
+               png_push_have_row(png_ptr, png_ptr->row_buf + 1);
+               png_read_push_finish_row(png_ptr);
+            }
+            for (i = 0; i < 2 && png_ptr->pass == 4; i++)
+            {
+               png_push_have_row(png_ptr, png_bytep_NULL);
+               png_read_push_finish_row(png_ptr);
+            }
+            if (png_ptr->pass == 6) /* pass 5 might be empty */
+            {
+               png_push_have_row(png_ptr, png_bytep_NULL);
+               png_read_push_finish_row(png_ptr);
+            }
+            break;
+         }
+         case 5:
+         {
+            int i;
+            for (i = 0; i < 2 && png_ptr->pass == 5; i++)
+            {
+               png_push_have_row(png_ptr, png_ptr->row_buf + 1);
+               png_read_push_finish_row(png_ptr);
+            }
+            if (png_ptr->pass == 6) /* skip top generated row */
+            {
+               png_push_have_row(png_ptr, png_bytep_NULL);
+               png_read_push_finish_row(png_ptr);
+            }
+            break;
+         }
+         case 6:
+         {
+            png_push_have_row(png_ptr, png_ptr->row_buf + 1);
+            png_read_push_finish_row(png_ptr);
+            if (png_ptr->pass != 6)
+               break;
+            png_push_have_row(png_ptr, png_bytep_NULL);
+            png_read_push_finish_row(png_ptr);
+         }
+      }
+   }
+   else
+#endif
+   {
+      png_push_have_row(png_ptr, png_ptr->row_buf + 1);
+      png_read_push_finish_row(png_ptr);
+   }
+}
+
+void /* PRIVATE */
+png_read_push_finish_row(png_structp png_ptr)
+{
+#ifdef PNG_USE_LOCAL_ARRAYS
+   /* arrays to facilitate easy interlacing - use pass (0 - 6) as index */
+
+   /* start of interlace block */
+   PNG_CONST int FARDATA png_pass_start[] = {0, 4, 0, 2, 0, 1, 0};
+
+   /* offset to next interlace block */
+   PNG_CONST int FARDATA png_pass_inc[] = {8, 8, 4, 4, 2, 2, 1};
+
+   /* start of interlace block in the y direction */
+   PNG_CONST int FARDATA png_pass_ystart[] = {0, 0, 4, 0, 2, 0, 1};
+
+   /* offset to next interlace block in the y direction */
+   PNG_CONST int FARDATA png_pass_yinc[] = {8, 8, 8, 4, 4, 2, 2};
+
+   /* Height of interlace block.  This is not currently used - if you need
+    * it, uncomment it here and in png.h
+   PNG_CONST int FARDATA png_pass_height[] = {8, 8, 4, 4, 2, 2, 1};
+   */
+#endif
+
+   png_ptr->row_number++;
+   if (png_ptr->row_number < png_ptr->num_rows)
+      return;
+
+   if (png_ptr->interlaced)
+   {
+      png_ptr->row_number = 0;
+      png_memset_check(png_ptr, png_ptr->prev_row, 0,
+         png_ptr->rowbytes + 1);
+      do
+      {
+         png_ptr->pass++;
+         if ((png_ptr->pass == 1 && png_ptr->width < 5) ||
+             (png_ptr->pass == 3 && png_ptr->width < 3) ||
+             (png_ptr->pass == 5 && png_ptr->width < 2))
+           png_ptr->pass++;
+
+         if (png_ptr->pass > 7)
+            png_ptr->pass--;
+         if (png_ptr->pass >= 7)
+            break;
+
+         png_ptr->iwidth = (png_ptr->width +
+            png_pass_inc[png_ptr->pass] - 1 -
+            png_pass_start[png_ptr->pass]) /
+            png_pass_inc[png_ptr->pass];
+
+         png_ptr->irowbytes = PNG_ROWBYTES(png_ptr->pixel_depth,
+            png_ptr->iwidth) + 1;
+
+         if (png_ptr->transformations & PNG_INTERLACE)
+            break;
+
+         png_ptr->num_rows = (png_ptr->height +
+            png_pass_yinc[png_ptr->pass] - 1 -
+            png_pass_ystart[png_ptr->pass]) /
+            png_pass_yinc[png_ptr->pass];
+
+      } while (png_ptr->iwidth == 0 || png_ptr->num_rows == 0);
+   }
+}
+
+#if defined(PNG_READ_tEXt_SUPPORTED)
+void /* PRIVATE */
+png_push_handle_tEXt(png_structp png_ptr, png_infop info_ptr, png_uint_32
+   length)
+{
+   if (!(png_ptr->mode & PNG_HAVE_IHDR) || (png_ptr->mode & PNG_HAVE_IEND))
+      {
+         png_error(png_ptr, "Out of place tEXt");
+         info_ptr = info_ptr; /* to quiet some compiler warnings */
+      }
+
+#ifdef PNG_MAX_MALLOC_64K
+   png_ptr->skip_length = 0;  /* This may not be necessary */
+
+   if (length > (png_uint_32)65535L) /* Can't hold entire string in memory */
+   {
+      png_warning(png_ptr, "tEXt chunk too large to fit in memory");
+      png_ptr->skip_length = length - (png_uint_32)65535L;
+      length = (png_uint_32)65535L;
+   }
+#endif
+
+   png_ptr->current_text = (png_charp)png_malloc(png_ptr,
+         (png_uint_32)(length+1));
+   png_ptr->current_text[length] = '\0';
+   png_ptr->current_text_ptr = png_ptr->current_text;
+   png_ptr->current_text_size = (png_size_t)length;
+   png_ptr->current_text_left = (png_size_t)length;
+   png_ptr->process_mode = PNG_READ_tEXt_MODE;
+}
+
+void /* PRIVATE */
+png_push_read_tEXt(png_structp png_ptr, png_infop info_ptr)
+{
+   if (png_ptr->buffer_size && png_ptr->current_text_left)
+   {
+      png_size_t text_size;
+
+      if (png_ptr->buffer_size < png_ptr->current_text_left)
+         text_size = png_ptr->buffer_size;
+      else
+         text_size = png_ptr->current_text_left;
+      png_crc_read(png_ptr, (png_bytep)png_ptr->current_text_ptr, text_size);
+      png_ptr->current_text_left -= text_size;
+      png_ptr->current_text_ptr += text_size;
+   }
+   if (!(png_ptr->current_text_left))
+   {
+      png_textp text_ptr;
+      png_charp text;
+      png_charp key;
+      int ret;
+
+      if (png_ptr->buffer_size < 4)
+      {
+         png_push_save_buffer(png_ptr);
+         return;
+      }
+
+      png_push_crc_finish(png_ptr);
+
+#if defined(PNG_MAX_MALLOC_64K)
+      if (png_ptr->skip_length)
+         return;
+#endif
+
+      key = png_ptr->current_text;
+
+      for (text = key; *text; text++)
+         /* empty loop */ ;
+
+      if (text < key + png_ptr->current_text_size)
+         text++;
+
+      text_ptr = (png_textp)png_malloc(png_ptr,
+         (png_uint_32)png_sizeof(png_text));
+      text_ptr->compression = PNG_TEXT_COMPRESSION_NONE;
+      text_ptr->key = key;
+#ifdef PNG_iTXt_SUPPORTED
+      text_ptr->lang = NULL;
+      text_ptr->lang_key = NULL;
+#endif
+      text_ptr->text = text;
+
+      ret = png_set_text_2(png_ptr, info_ptr, text_ptr, 1);
+
+      png_free(png_ptr, key);
+      png_free(png_ptr, text_ptr);
+      png_ptr->current_text = NULL;
+
+      if (ret)
+        png_warning(png_ptr, "Insufficient memory to store text chunk.");
+   }
+}
+#endif
+
+#if defined(PNG_READ_zTXt_SUPPORTED)
+void /* PRIVATE */
+png_push_handle_zTXt(png_structp png_ptr, png_infop info_ptr, png_uint_32
+   length)
+{
+   if (!(png_ptr->mode & PNG_HAVE_IHDR) || (png_ptr->mode & PNG_HAVE_IEND))
+      {
+         png_error(png_ptr, "Out of place zTXt");
+         info_ptr = info_ptr; /* to quiet some compiler warnings */
+      }
+
+#ifdef PNG_MAX_MALLOC_64K
+   /* We can't handle zTXt chunks > 64K, since we don't have enough space
+    * to be able to store the uncompressed data.  Actually, the threshold
+    * is probably around 32K, but it isn't as definite as 64K is.
+    */
+   if (length > (png_uint_32)65535L)
+   {
+      png_warning(png_ptr, "zTXt chunk too large to fit in memory");
+      png_push_crc_skip(png_ptr, length);
+      return;
+   }
+#endif
+
+   png_ptr->current_text = (png_charp)png_malloc(png_ptr,
+       (png_uint_32)(length+1));
+   png_ptr->current_text[length] = '\0';
+   png_ptr->current_text_ptr = png_ptr->current_text;
+   png_ptr->current_text_size = (png_size_t)length;
+   png_ptr->current_text_left = (png_size_t)length;
+   png_ptr->process_mode = PNG_READ_zTXt_MODE;
+}
+
+void /* PRIVATE */
+png_push_read_zTXt(png_structp png_ptr, png_infop info_ptr)
+{
+   if (png_ptr->buffer_size && png_ptr->current_text_left)
+   {
+      png_size_t text_size;
+
+      if (png_ptr->buffer_size < (png_uint_32)png_ptr->current_text_left)
+         text_size = png_ptr->buffer_size;
+      else
+         text_size = png_ptr->current_text_left;
+      png_crc_read(png_ptr, (png_bytep)png_ptr->current_text_ptr, text_size);
+      png_ptr->current_text_left -= text_size;
+      png_ptr->current_text_ptr += text_size;
+   }
+   if (!(png_ptr->current_text_left))
+   {
+      png_textp text_ptr;
+      png_charp text;
+      png_charp key;
+      int ret;
+      png_size_t text_size, key_size;
+
+      if (png_ptr->buffer_size < 4)
+      {
+         png_push_save_buffer(png_ptr);
+         return;
+      }
+
+      png_push_crc_finish(png_ptr);
+
+      key = png_ptr->current_text;
+
+      for (text = key; *text; text++)
+         /* empty loop */ ;
+
+      /* zTXt can't have zero text */
+      if (text >= key + png_ptr->current_text_size)
+      {
+         png_ptr->current_text = NULL;
+         png_free(png_ptr, key);
+         return;
+      }
+
+      text++;
+
+      if (*text != PNG_TEXT_COMPRESSION_zTXt) /* check compression byte */
+      {
+         png_ptr->current_text = NULL;
+         png_free(png_ptr, key);
+         return;
+      }
+
+      text++;
+
+      png_ptr->zstream.next_in = (png_bytep )text;
+      png_ptr->zstream.avail_in = (uInt)(png_ptr->current_text_size -
+         (text - key));
+      png_ptr->zstream.next_out = png_ptr->zbuf;
+      png_ptr->zstream.avail_out = (uInt)png_ptr->zbuf_size;
+
+      key_size = text - key;
+      text_size = 0;
+      text = NULL;
+      ret = Z_STREAM_END;
+
+      while (png_ptr->zstream.avail_in)
+      {
+         ret = inflate(&png_ptr->zstream, Z_PARTIAL_FLUSH);
+         if (ret != Z_OK && ret != Z_STREAM_END)
+         {
+            inflateReset(&png_ptr->zstream);
+            png_ptr->zstream.avail_in = 0;
+            png_ptr->current_text = NULL;
+            png_free(png_ptr, key);
+            png_free(png_ptr, text);
+            return;
+         }
+         if (!(png_ptr->zstream.avail_out) || ret == Z_STREAM_END)
+         {
+            if (text == NULL)
+            {
+               text = (png_charp)png_malloc(png_ptr,
+                  (png_uint_32)(png_ptr->zbuf_size - png_ptr->zstream.avail_out
+                     + key_size + 1));
+               png_memcpy(text + key_size, png_ptr->zbuf,
+                  png_ptr->zbuf_size - png_ptr->zstream.avail_out);
+               png_memcpy(text, key, key_size);
+               text_size = key_size + png_ptr->zbuf_size -
+                  png_ptr->zstream.avail_out;
+               *(text + text_size) = '\0';
+            }
+            else
+            {
+               png_charp tmp;
+
+               tmp = text;
+               text = (png_charp)png_malloc(png_ptr, text_size +
+                  (png_uint_32)(png_ptr->zbuf_size - png_ptr->zstream.avail_out
+                   + 1));
+               png_memcpy(text, tmp, text_size);
+               png_free(png_ptr, tmp);
+               png_memcpy(text + text_size, png_ptr->zbuf,
+                  png_ptr->zbuf_size - png_ptr->zstream.avail_out);
+               text_size += png_ptr->zbuf_size - png_ptr->zstream.avail_out;
+               *(text + text_size) = '\0';
+            }
+            if (ret != Z_STREAM_END)
+            {
+               png_ptr->zstream.next_out = png_ptr->zbuf;
+               png_ptr->zstream.avail_out = (uInt)png_ptr->zbuf_size;
+            }
+         }
+         else
+         {
+            break;
+         }
+
+         if (ret == Z_STREAM_END)
+            break;
+      }
+
+      inflateReset(&png_ptr->zstream);
+      png_ptr->zstream.avail_in = 0;
+
+      if (ret != Z_STREAM_END)
+      {
+         png_ptr->current_text = NULL;
+         png_free(png_ptr, key);
+         png_free(png_ptr, text);
+         return;
+      }
+
+      png_ptr->current_text = NULL;
+      png_free(png_ptr, key);
+      key = text;
+      text += key_size;
+
+      text_ptr = (png_textp)png_malloc(png_ptr,
+          (png_uint_32)png_sizeof(png_text));
+      text_ptr->compression = PNG_TEXT_COMPRESSION_zTXt;
+      text_ptr->key = key;
+#ifdef PNG_iTXt_SUPPORTED
+      text_ptr->lang = NULL;
+      text_ptr->lang_key = NULL;
+#endif
+      text_ptr->text = text;
+
+      ret = png_set_text_2(png_ptr, info_ptr, text_ptr, 1);
+
+      png_free(png_ptr, key);
+      png_free(png_ptr, text_ptr);
+
+      if (ret)
+        png_warning(png_ptr, "Insufficient memory to store text chunk.");
+   }
+}
+#endif
+
+#if defined(PNG_READ_iTXt_SUPPORTED)
+void /* PRIVATE */
+png_push_handle_iTXt(png_structp png_ptr, png_infop info_ptr, png_uint_32
+   length)
+{
+   if (!(png_ptr->mode & PNG_HAVE_IHDR) || (png_ptr->mode & PNG_HAVE_IEND))
+      {
+         png_error(png_ptr, "Out of place iTXt");
+         info_ptr = info_ptr; /* to quiet some compiler warnings */
+      }
+
+#ifdef PNG_MAX_MALLOC_64K
+   png_ptr->skip_length = 0;  /* This may not be necessary */
+
+   if (length > (png_uint_32)65535L) /* Can't hold entire string in memory */
+   {
+      png_warning(png_ptr, "iTXt chunk too large to fit in memory");
+      png_ptr->skip_length = length - (png_uint_32)65535L;
+      length = (png_uint_32)65535L;
+   }
+#endif
+
+   png_ptr->current_text = (png_charp)png_malloc(png_ptr,
+         (png_uint_32)(length+1));
+   png_ptr->current_text[length] = '\0';
+   png_ptr->current_text_ptr = png_ptr->current_text;
+   png_ptr->current_text_size = (png_size_t)length;
+   png_ptr->current_text_left = (png_size_t)length;
+   png_ptr->process_mode = PNG_READ_iTXt_MODE;
+}
+
+void /* PRIVATE */
+png_push_read_iTXt(png_structp png_ptr, png_infop info_ptr)
+{
+
+   if (png_ptr->buffer_size && png_ptr->current_text_left)
+   {
+      png_size_t text_size;
+
+      if (png_ptr->buffer_size < png_ptr->current_text_left)
+         text_size = png_ptr->buffer_size;
+      else
+         text_size = png_ptr->current_text_left;
+      png_crc_read(png_ptr, (png_bytep)png_ptr->current_text_ptr, text_size);
+      png_ptr->current_text_left -= text_size;
+      png_ptr->current_text_ptr += text_size;
+   }
+   if (!(png_ptr->current_text_left))
+   {
+      png_textp text_ptr;
+      png_charp key;
+      int comp_flag;
+      png_charp lang;
+      png_charp lang_key;
+      png_charp text;
+      int ret;
+
+      if (png_ptr->buffer_size < 4)
+      {
+         png_push_save_buffer(png_ptr);
+         return;
+      }
+
+      png_push_crc_finish(png_ptr);
+
+#if defined(PNG_MAX_MALLOC_64K)
+      if (png_ptr->skip_length)
+         return;
+#endif
+
+      key = png_ptr->current_text;
+
+      for (lang = key; *lang; lang++)
+         /* empty loop */ ;
+
+      if (lang < key + png_ptr->current_text_size - 3)
+         lang++;
+
+      comp_flag = *lang++;
+      lang++;     /* skip comp_type, always zero */
+
+      for (lang_key = lang; *lang_key; lang_key++)
+         /* empty loop */ ;
+      lang_key++;        /* skip NUL separator */
+
+      text=lang_key;
+      if (lang_key < key + png_ptr->current_text_size - 1)
+      {
+        for (; *text; text++)
+           /* empty loop */ ;
+      }
+
+      if (text < key + png_ptr->current_text_size)
+         text++;
+
+      text_ptr = (png_textp)png_malloc(png_ptr,
+         (png_uint_32)png_sizeof(png_text));
+      text_ptr->compression = comp_flag + 2;
+      text_ptr->key = key;
+      text_ptr->lang = lang;
+      text_ptr->lang_key = lang_key;
+      text_ptr->text = text;
+      text_ptr->text_length = 0;
+      text_ptr->itxt_length = png_strlen(text);
+
+      ret = png_set_text_2(png_ptr, info_ptr, text_ptr, 1);
+
+      png_ptr->current_text = NULL;
+
+      png_free(png_ptr, text_ptr);
+      if (ret)
+        png_warning(png_ptr, "Insufficient memory to store iTXt chunk.");
+   }
+}
+#endif
+
+/* This function is called when we haven't found a handler for this
+ * chunk.  If there isn't a problem with the chunk itself (ie a bad chunk
+ * name or a critical chunk), the chunk is (currently) silently ignored.
+ */
+void /* PRIVATE */
+png_push_handle_unknown(png_structp png_ptr, png_infop info_ptr, png_uint_32
+   length)
+{
+   png_uint_32 skip=0;
+   png_check_chunk_name(png_ptr, png_ptr->chunk_name);
+
+   if (!(png_ptr->chunk_name[0] & 0x20))
+   {
+#if defined(PNG_READ_UNKNOWN_CHUNKS_SUPPORTED)
+     if(png_handle_as_unknown(png_ptr, png_ptr->chunk_name) !=
+          PNG_HANDLE_CHUNK_ALWAYS
+#if defined(PNG_READ_USER_CHUNKS_SUPPORTED)
+          && png_ptr->read_user_chunk_fn == NULL
+#endif
+        )
+#endif
+        png_chunk_error(png_ptr, "unknown critical chunk");
+
+     info_ptr = info_ptr; /* to quiet some compiler warnings */
+   }
+
+#if defined(PNG_READ_UNKNOWN_CHUNKS_SUPPORTED)
+   if (png_ptr->flags & PNG_FLAG_KEEP_UNKNOWN_CHUNKS)
+   {
+#ifdef PNG_MAX_MALLOC_64K
+      if (length > (png_uint_32)65535L)
+      {
+          png_warning(png_ptr, "unknown chunk too large to fit in memory");
+          skip = length - (png_uint_32)65535L;
+          length = (png_uint_32)65535L;
+      }
+#endif
+      png_strncpy((png_charp)png_ptr->unknown_chunk.name,
+	 (png_charp)png_ptr->chunk_name, 4);
+      png_ptr->unknown_chunk.name[4] = '\0';
+      png_ptr->unknown_chunk.data = (png_bytep)png_malloc(png_ptr, length);
+      png_ptr->unknown_chunk.size = (png_size_t)length;
+      png_crc_read(png_ptr, (png_bytep)png_ptr->unknown_chunk.data, length);
+#if defined(PNG_READ_USER_CHUNKS_SUPPORTED)
+      if(png_ptr->read_user_chunk_fn != NULL)
+      {
+         /* callback to user unknown chunk handler */
+         int ret;
+         ret = (*(png_ptr->read_user_chunk_fn))
+           (png_ptr, &png_ptr->unknown_chunk);
+         if (ret < 0)
+            png_chunk_error(png_ptr, "error in user chunk");
+         if (ret == 0)
+         {
+            if (!(png_ptr->chunk_name[0] & 0x20))
+               if(png_handle_as_unknown(png_ptr, png_ptr->chunk_name) !=
+                    PNG_HANDLE_CHUNK_ALWAYS)
+                  png_chunk_error(png_ptr, "unknown critical chunk");
+            png_set_unknown_chunks(png_ptr, info_ptr,
+               &png_ptr->unknown_chunk, 1);
+         }
+      }
+#else
+      png_set_unknown_chunks(png_ptr, info_ptr, &png_ptr->unknown_chunk, 1);
+#endif
+      png_free(png_ptr, png_ptr->unknown_chunk.data);
+      png_ptr->unknown_chunk.data = NULL;
+   }
+   else
+#endif
+      skip=length;
+   png_push_crc_skip(png_ptr, skip);
+}
+
+void /* PRIVATE */
+png_push_have_info(png_structp png_ptr, png_infop info_ptr)
+{
+   if (png_ptr->info_fn != NULL)
+      (*(png_ptr->info_fn))(png_ptr, info_ptr);
+}
+
+void /* PRIVATE */
+png_push_have_end(png_structp png_ptr, png_infop info_ptr)
+{
+   if (png_ptr->end_fn != NULL)
+      (*(png_ptr->end_fn))(png_ptr, info_ptr);
+}
+
+void /* PRIVATE */
+png_push_have_row(png_structp png_ptr, png_bytep row)
+{
+   if (png_ptr->row_fn != NULL)
+      (*(png_ptr->row_fn))(png_ptr, row, png_ptr->row_number,
+         (int)png_ptr->pass);
+}
+
+void PNGAPI
+png_progressive_combine_row (png_structp png_ptr,
+   png_bytep old_row, png_bytep new_row)
+{
+#ifdef PNG_USE_LOCAL_ARRAYS
+   PNG_CONST int FARDATA png_pass_dsp_mask[7] =
+      {0xff, 0x0f, 0xff, 0x33, 0xff, 0x55, 0xff};
+#endif
+   if(png_ptr == NULL) return;
+   if (new_row != NULL)    /* new_row must == png_ptr->row_buf here. */
+      png_combine_row(png_ptr, old_row, png_pass_dsp_mask[png_ptr->pass]);
+}
+
+void PNGAPI
+png_set_progressive_read_fn(png_structp png_ptr, png_voidp progressive_ptr,
+   png_progressive_info_ptr info_fn, png_progressive_row_ptr row_fn,
+   png_progressive_end_ptr end_fn)
+{
+   if(png_ptr == NULL) return;
+   png_ptr->info_fn = info_fn;
+   png_ptr->row_fn = row_fn;
+   png_ptr->end_fn = end_fn;
+
+   png_set_read_fn(png_ptr, progressive_ptr, png_push_fill_buffer);
+}
+
+png_voidp PNGAPI
+png_get_progressive_ptr(png_structp png_ptr)
+{
+   if(png_ptr == NULL) return (NULL);
+   return png_ptr->io_ptr;
+}
+#endif /* PNG_PROGRESSIVE_READ_SUPPORTED */
diff --git a/uppsrc/plugin/png/lib/pngread.c b/uppsrc/plugin/png/lib/pngread.c
new file mode 100644
index 000000000..02efb0dbb
--- /dev/null
+++ b/uppsrc/plugin/png/lib/pngread.c
@@ -0,0 +1,1472 @@
+
+/* pngread.c - read a PNG file
+ *
+ * Last changed in libpng 1.2.20 September 7, 2007
+ * For conditions of distribution and use, see copyright notice in png.h
+ * Copyright (c) 1998-2007 Glenn Randers-Pehrson
+ * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
+ * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
+ *
+ * This file contains routines that an application calls directly to
+ * read a PNG file or stream.
+ */
+
+#define PNG_INTERNAL
+#include "png.h"
+
+#if defined(PNG_READ_SUPPORTED)
+
+/* Create a PNG structure for reading, and allocate any memory needed. */
+png_structp PNGAPI
+png_create_read_struct(png_const_charp user_png_ver, png_voidp error_ptr,
+   png_error_ptr error_fn, png_error_ptr warn_fn)
+{
+
+#ifdef PNG_USER_MEM_SUPPORTED
+   return (png_create_read_struct_2(user_png_ver, error_ptr, error_fn,
+      warn_fn, png_voidp_NULL, png_malloc_ptr_NULL, png_free_ptr_NULL));
+}
+
+/* Alternate create PNG structure for reading, and allocate any memory needed. */
+png_structp PNGAPI
+png_create_read_struct_2(png_const_charp user_png_ver, png_voidp error_ptr,
+   png_error_ptr error_fn, png_error_ptr warn_fn, png_voidp mem_ptr,
+   png_malloc_ptr malloc_fn, png_free_ptr free_fn)
+{
+#endif /* PNG_USER_MEM_SUPPORTED */
+
+   png_structp png_ptr;
+
+#ifdef PNG_SETJMP_SUPPORTED
+#ifdef USE_FAR_KEYWORD
+   jmp_buf jmpbuf;
+#endif
+#endif
+
+   int i;
+
+   png_debug(1, "in png_create_read_struct\n");
+#ifdef PNG_USER_MEM_SUPPORTED
+   png_ptr = (png_structp)png_create_struct_2(PNG_STRUCT_PNG,
+      (png_malloc_ptr)malloc_fn, (png_voidp)mem_ptr);
+#else
+   png_ptr = (png_structp)png_create_struct(PNG_STRUCT_PNG);
+#endif
+   if (png_ptr == NULL)
+      return (NULL);
+
+   /* added at libpng-1.2.6 */
+#ifdef PNG_SET_USER_LIMITS_SUPPORTED
+   png_ptr->user_width_max=PNG_USER_WIDTH_MAX;
+   png_ptr->user_height_max=PNG_USER_HEIGHT_MAX;
+#endif
+
+#ifdef PNG_SETJMP_SUPPORTED
+#ifdef USE_FAR_KEYWORD
+   if (setjmp(jmpbuf))
+#else
+   if (setjmp(png_ptr->jmpbuf))
+#endif
+   {
+      png_free(png_ptr, png_ptr->zbuf);
+      png_ptr->zbuf=NULL;
+#ifdef PNG_USER_MEM_SUPPORTED
+      png_destroy_struct_2((png_voidp)png_ptr,
+         (png_free_ptr)free_fn, (png_voidp)mem_ptr);
+#else
+      png_destroy_struct((png_voidp)png_ptr);
+#endif
+      return (NULL);
+   }
+#ifdef USE_FAR_KEYWORD
+   png_memcpy(png_ptr->jmpbuf,jmpbuf,png_sizeof(jmp_buf));
+#endif
+#endif
+
+#ifdef PNG_USER_MEM_SUPPORTED
+   png_set_mem_fn(png_ptr, mem_ptr, malloc_fn, free_fn);
+#endif
+
+   png_set_error_fn(png_ptr, error_ptr, error_fn, warn_fn);
+
+   i=0;
+   do
+   {
+     if(user_png_ver[i] != png_libpng_ver[i])
+        png_ptr->flags |= PNG_FLAG_LIBRARY_MISMATCH;
+   } while (png_libpng_ver[i++]);
+
+   if (png_ptr->flags & PNG_FLAG_LIBRARY_MISMATCH)
+   {
+     /* Libpng 0.90 and later are binary incompatible with libpng 0.89, so
+      * we must recompile any applications that use any older library version.
+      * For versions after libpng 1.0, we will be compatible, so we need
+      * only check the first digit.
+      */
+     if (user_png_ver == NULL || user_png_ver[0] != png_libpng_ver[0] ||
+         (user_png_ver[0] == '1' && user_png_ver[2] != png_libpng_ver[2]) ||
+         (user_png_ver[0] == '0' && user_png_ver[2] < '9'))
+     {
+#if !defined(PNG_NO_STDIO) && !defined(_WIN32_WCE)
+        char msg[80];
+        if (user_png_ver)
+        {
+          png_snprintf(msg, 80,
+             "Application was compiled with png.h from libpng-%.20s",
+             user_png_ver);
+          png_warning(png_ptr, msg);
+        }
+        png_snprintf(msg, 80,
+             "Application  is  running with png.c from libpng-%.20s",
+           png_libpng_ver);
+        png_warning(png_ptr, msg);
+#endif
+#ifdef PNG_ERROR_NUMBERS_SUPPORTED
+        png_ptr->flags=0;
+#endif
+        png_error(png_ptr,
+           "Incompatible libpng version in application and library");
+     }
+   }
+
+   /* initialize zbuf - compression buffer */
+   png_ptr->zbuf_size = PNG_ZBUF_SIZE;
+   png_ptr->zbuf = (png_bytep)png_malloc(png_ptr,
+     (png_uint_32)png_ptr->zbuf_size);
+   png_ptr->zstream.zalloc = png_zalloc;
+   png_ptr->zstream.zfree = png_zfree;
+   png_ptr->zstream.opaque = (voidpf)png_ptr;
+
+   switch (inflateInit(&png_ptr->zstream))
+   {
+     case Z_OK: /* Do nothing */ break;
+     case Z_MEM_ERROR:
+     case Z_STREAM_ERROR: png_error(png_ptr, "zlib memory error"); break;
+     case Z_VERSION_ERROR: png_error(png_ptr, "zlib version error"); break;
+     default: png_error(png_ptr, "Unknown zlib error");
+   }
+
+   png_ptr->zstream.next_out = png_ptr->zbuf;
+   png_ptr->zstream.avail_out = (uInt)png_ptr->zbuf_size;
+
+   png_set_read_fn(png_ptr, png_voidp_NULL, png_rw_ptr_NULL);
+
+#ifdef PNG_SETJMP_SUPPORTED
+/* Applications that neglect to set up their own setjmp() and then encounter
+   a png_error() will longjmp here.  Since the jmpbuf is then meaningless we
+   abort instead of returning. */
+#ifdef USE_FAR_KEYWORD
+   if (setjmp(jmpbuf))
+      PNG_ABORT();
+   png_memcpy(png_ptr->jmpbuf,jmpbuf,png_sizeof(jmp_buf));
+#else
+   if (setjmp(png_ptr->jmpbuf))
+      PNG_ABORT();
+#endif
+#endif
+   return (png_ptr);
+}
+
+#if defined(PNG_1_0_X) || defined(PNG_1_2_X)
+/* Initialize PNG structure for reading, and allocate any memory needed.
+   This interface is deprecated in favour of the png_create_read_struct(),
+   and it will disappear as of libpng-1.3.0. */
+#undef png_read_init
+void PNGAPI
+png_read_init(png_structp png_ptr)
+{
+   /* We only come here via pre-1.0.7-compiled applications */
+   png_read_init_2(png_ptr, "1.0.6 or earlier", 0, 0);
+}
+
+void PNGAPI
+png_read_init_2(png_structp png_ptr, png_const_charp user_png_ver,
+   png_size_t png_struct_size, png_size_t png_info_size)
+{
+   /* We only come here via pre-1.0.12-compiled applications */
+   if(png_ptr == NULL) return;
+#if !defined(PNG_NO_STDIO) && !defined(_WIN32_WCE)
+   if(png_sizeof(png_struct) > png_struct_size ||
+      png_sizeof(png_info) > png_info_size)
+   {
+      char msg[80];
+      png_ptr->warning_fn=NULL;
+      if (user_png_ver)
+      {
+        png_snprintf(msg, 80,
+           "Application was compiled with png.h from libpng-%.20s",
+           user_png_ver);
+        png_warning(png_ptr, msg);
+      }
+      png_snprintf(msg, 80,
+         "Application  is  running with png.c from libpng-%.20s",
+         png_libpng_ver);
+      png_warning(png_ptr, msg);
+   }
+#endif
+   if(png_sizeof(png_struct) > png_struct_size)
+     {
+       png_ptr->error_fn=NULL;
+#ifdef PNG_ERROR_NUMBERS_SUPPORTED
+       png_ptr->flags=0;
+#endif
+       png_error(png_ptr,
+       "The png struct allocated by the application for reading is too small.");
+     }
+   if(png_sizeof(png_info) > png_info_size)
+     {
+       png_ptr->error_fn=NULL;
+#ifdef PNG_ERROR_NUMBERS_SUPPORTED
+       png_ptr->flags=0;
+#endif
+       png_error(png_ptr,
+         "The info struct allocated by application for reading is too small.");
+     }
+   png_read_init_3(&png_ptr, user_png_ver, png_struct_size);
+}
+#endif /* PNG_1_0_X || PNG_1_2_X */
+
+void PNGAPI
+png_read_init_3(png_structpp ptr_ptr, png_const_charp user_png_ver,
+   png_size_t png_struct_size)
+{
+#ifdef PNG_SETJMP_SUPPORTED
+   jmp_buf tmp_jmp;  /* to save current jump buffer */
+#endif
+
+   int i=0;
+
+   png_structp png_ptr=*ptr_ptr;
+
+   if(png_ptr == NULL) return;
+
+   do
+   {
+     if(user_png_ver[i] != png_libpng_ver[i])
+     {
+#ifdef PNG_LEGACY_SUPPORTED
+       png_ptr->flags |= PNG_FLAG_LIBRARY_MISMATCH;
+#else
+       png_ptr->warning_fn=NULL;
+       png_warning(png_ptr,
+        "Application uses deprecated png_read_init() and should be recompiled.");
+       break;
+#endif
+     }
+   } while (png_libpng_ver[i++]);
+
+   png_debug(1, "in png_read_init_3\n");
+
+#ifdef PNG_SETJMP_SUPPORTED
+   /* save jump buffer and error functions */
+   png_memcpy(tmp_jmp, png_ptr->jmpbuf, png_sizeof (jmp_buf));
+#endif
+
+   if(png_sizeof(png_struct) > png_struct_size)
+     {
+       png_destroy_struct(png_ptr);
+       *ptr_ptr = (png_structp)png_create_struct(PNG_STRUCT_PNG);
+       png_ptr = *ptr_ptr;
+     }
+
+   /* reset all variables to 0 */
+   png_memset(png_ptr, 0, png_sizeof (png_struct));
+
+#ifdef PNG_SETJMP_SUPPORTED
+   /* restore jump buffer */
+   png_memcpy(png_ptr->jmpbuf, tmp_jmp, png_sizeof (jmp_buf));
+#endif
+
+   /* added at libpng-1.2.6 */
+#ifdef PNG_SET_USER_LIMITS_SUPPORTED
+   png_ptr->user_width_max=PNG_USER_WIDTH_MAX;
+   png_ptr->user_height_max=PNG_USER_HEIGHT_MAX;
+#endif
+
+   /* initialize zbuf - compression buffer */
+   png_ptr->zbuf_size = PNG_ZBUF_SIZE;
+   png_ptr->zbuf = (png_bytep)png_malloc(png_ptr,
+     (png_uint_32)png_ptr->zbuf_size);
+   png_ptr->zstream.zalloc = png_zalloc;
+   png_ptr->zstream.zfree = png_zfree;
+   png_ptr->zstream.opaque = (voidpf)png_ptr;
+
+   switch (inflateInit(&png_ptr->zstream))
+   {
+     case Z_OK: /* Do nothing */ break;
+     case Z_MEM_ERROR:
+     case Z_STREAM_ERROR: png_error(png_ptr, "zlib memory"); break;
+     case Z_VERSION_ERROR: png_error(png_ptr, "zlib version"); break;
+     default: png_error(png_ptr, "Unknown zlib error");
+   }
+
+   png_ptr->zstream.next_out = png_ptr->zbuf;
+   png_ptr->zstream.avail_out = (uInt)png_ptr->zbuf_size;
+
+   png_set_read_fn(png_ptr, png_voidp_NULL, png_rw_ptr_NULL);
+}
+
+#ifndef PNG_NO_SEQUENTIAL_READ_SUPPORTED
+/* Read the information before the actual image data.  This has been
+ * changed in v0.90 to allow reading a file that already has the magic
+ * bytes read from the stream.  You can tell libpng how many bytes have
+ * been read from the beginning of the stream (up to the maximum of 8)
+ * via png_set_sig_bytes(), and we will only check the remaining bytes
+ * here.  The application can then have access to the signature bytes we
+ * read if it is determined that this isn't a valid PNG file.
+ */
+void PNGAPI
+png_read_info(png_structp png_ptr, png_infop info_ptr)
+{
+   if(png_ptr == NULL) return;
+   png_debug(1, "in png_read_info\n");
+   /* If we haven't checked all of the PNG signature bytes, do so now. */
+   if (png_ptr->sig_bytes < 8)
+   {
+      png_size_t num_checked = png_ptr->sig_bytes,
+                 num_to_check = 8 - num_checked;
+
+      png_read_data(png_ptr, &(info_ptr->signature[num_checked]), num_to_check);
+      png_ptr->sig_bytes = 8;
+
+      if (png_sig_cmp(info_ptr->signature, num_checked, num_to_check))
+      {
+         if (num_checked < 4 &&
+             png_sig_cmp(info_ptr->signature, num_checked, num_to_check - 4))
+            png_error(png_ptr, "Not a PNG file");
+         else
+            png_error(png_ptr, "PNG file corrupted by ASCII conversion");
+      }
+      if (num_checked < 3)
+         png_ptr->mode |= PNG_HAVE_PNG_SIGNATURE;
+   }
+
+   for(;;)
+   {
+#ifdef PNG_USE_LOCAL_ARRAYS
+      PNG_CONST PNG_IHDR;
+      PNG_CONST PNG_IDAT;
+      PNG_CONST PNG_IEND;
+      PNG_CONST PNG_PLTE;
+#if defined(PNG_READ_bKGD_SUPPORTED)
+      PNG_CONST PNG_bKGD;
+#endif
+#if defined(PNG_READ_cHRM_SUPPORTED)
+      PNG_CONST PNG_cHRM;
+#endif
+#if defined(PNG_READ_gAMA_SUPPORTED)
+      PNG_CONST PNG_gAMA;
+#endif
+#if defined(PNG_READ_hIST_SUPPORTED)
+      PNG_CONST PNG_hIST;
+#endif
+#if defined(PNG_READ_iCCP_SUPPORTED)
+      PNG_CONST PNG_iCCP;
+#endif
+#if defined(PNG_READ_iTXt_SUPPORTED)
+      PNG_CONST PNG_iTXt;
+#endif
+#if defined(PNG_READ_oFFs_SUPPORTED)
+      PNG_CONST PNG_oFFs;
+#endif
+#if defined(PNG_READ_pCAL_SUPPORTED)
+      PNG_CONST PNG_pCAL;
+#endif
+#if defined(PNG_READ_pHYs_SUPPORTED)
+      PNG_CONST PNG_pHYs;
+#endif
+#if defined(PNG_READ_sBIT_SUPPORTED)
+      PNG_CONST PNG_sBIT;
+#endif
+#if defined(PNG_READ_sCAL_SUPPORTED)
+      PNG_CONST PNG_sCAL;
+#endif
+#if defined(PNG_READ_sPLT_SUPPORTED)
+      PNG_CONST PNG_sPLT;
+#endif
+#if defined(PNG_READ_sRGB_SUPPORTED)
+      PNG_CONST PNG_sRGB;
+#endif
+#if defined(PNG_READ_tEXt_SUPPORTED)
+      PNG_CONST PNG_tEXt;
+#endif
+#if defined(PNG_READ_tIME_SUPPORTED)
+      PNG_CONST PNG_tIME;
+#endif
+#if defined(PNG_READ_tRNS_SUPPORTED)
+      PNG_CONST PNG_tRNS;
+#endif
+#if defined(PNG_READ_zTXt_SUPPORTED)
+      PNG_CONST PNG_zTXt;
+#endif
+#endif /* PNG_USE_LOCAL_ARRAYS */
+      png_byte chunk_length[4];
+      png_uint_32 length;
+
+      png_read_data(png_ptr, chunk_length, 4);
+      length = png_get_uint_31(png_ptr,chunk_length);
+
+      png_reset_crc(png_ptr);
+      png_crc_read(png_ptr, png_ptr->chunk_name, 4);
+
+      png_debug2(0, "Reading %s chunk, length=%lu.\n", png_ptr->chunk_name,
+         length);
+
+      /* This should be a binary subdivision search or a hash for
+       * matching the chunk name rather than a linear search.
+       */
+      if (!png_memcmp(png_ptr->chunk_name, png_IDAT, 4))
+        if(png_ptr->mode & PNG_AFTER_IDAT)
+          png_ptr->mode |= PNG_HAVE_CHUNK_AFTER_IDAT;
+
+      if (!png_memcmp(png_ptr->chunk_name, png_IHDR, 4))
+         png_handle_IHDR(png_ptr, info_ptr, length);
+      else if (!png_memcmp(png_ptr->chunk_name, png_IEND, 4))
+         png_handle_IEND(png_ptr, info_ptr, length);
+#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
+      else if (png_handle_as_unknown(png_ptr, png_ptr->chunk_name))
+      {
+         if (!png_memcmp(png_ptr->chunk_name, png_IDAT, 4))
+            png_ptr->mode |= PNG_HAVE_IDAT;
+         png_handle_unknown(png_ptr, info_ptr, length);
+         if (!png_memcmp(png_ptr->chunk_name, png_PLTE, 4))
+            png_ptr->mode |= PNG_HAVE_PLTE;
+         else if (!png_memcmp(png_ptr->chunk_name, png_IDAT, 4))
+         {
+            if (!(png_ptr->mode & PNG_HAVE_IHDR))
+               png_error(png_ptr, "Missing IHDR before IDAT");
+            else if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE &&
+                     !(png_ptr->mode & PNG_HAVE_PLTE))
+               png_error(png_ptr, "Missing PLTE before IDAT");
+            break;
+         }
+      }
+#endif
+      else if (!png_memcmp(png_ptr->chunk_name, png_PLTE, 4))
+         png_handle_PLTE(png_ptr, info_ptr, length);
+      else if (!png_memcmp(png_ptr->chunk_name, png_IDAT, 4))
+      {
+         if (!(png_ptr->mode & PNG_HAVE_IHDR))
+            png_error(png_ptr, "Missing IHDR before IDAT");
+         else if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE &&
+                  !(png_ptr->mode & PNG_HAVE_PLTE))
+            png_error(png_ptr, "Missing PLTE before IDAT");
+
+         png_ptr->idat_size = length;
+         png_ptr->mode |= PNG_HAVE_IDAT;
+         break;
+      }
+#if defined(PNG_READ_bKGD_SUPPORTED)
+      else if (!png_memcmp(png_ptr->chunk_name, png_bKGD, 4))
+         png_handle_bKGD(png_ptr, info_ptr, length);
+#endif
+#if defined(PNG_READ_cHRM_SUPPORTED)
+      else if (!png_memcmp(png_ptr->chunk_name, png_cHRM, 4))
+         png_handle_cHRM(png_ptr, info_ptr, length);
+#endif
+#if defined(PNG_READ_gAMA_SUPPORTED)
+      else if (!png_memcmp(png_ptr->chunk_name, png_gAMA, 4))
+         png_handle_gAMA(png_ptr, info_ptr, length);
+#endif
+#if defined(PNG_READ_hIST_SUPPORTED)
+      else if (!png_memcmp(png_ptr->chunk_name, png_hIST, 4))
+         png_handle_hIST(png_ptr, info_ptr, length);
+#endif
+#if defined(PNG_READ_oFFs_SUPPORTED)
+      else if (!png_memcmp(png_ptr->chunk_name, png_oFFs, 4))
+         png_handle_oFFs(png_ptr, info_ptr, length);
+#endif
+#if defined(PNG_READ_pCAL_SUPPORTED)
+      else if (!png_memcmp(png_ptr->chunk_name, png_pCAL, 4))
+         png_handle_pCAL(png_ptr, info_ptr, length);
+#endif
+#if defined(PNG_READ_sCAL_SUPPORTED)
+      else if (!png_memcmp(png_ptr->chunk_name, png_sCAL, 4))
+         png_handle_sCAL(png_ptr, info_ptr, length);
+#endif
+#if defined(PNG_READ_pHYs_SUPPORTED)
+      else if (!png_memcmp(png_ptr->chunk_name, png_pHYs, 4))
+         png_handle_pHYs(png_ptr, info_ptr, length);
+#endif
+#if defined(PNG_READ_sBIT_SUPPORTED)
+      else if (!png_memcmp(png_ptr->chunk_name, png_sBIT, 4))
+         png_handle_sBIT(png_ptr, info_ptr, length);
+#endif
+#if defined(PNG_READ_sRGB_SUPPORTED)
+      else if (!png_memcmp(png_ptr->chunk_name, png_sRGB, 4))
+         png_handle_sRGB(png_ptr, info_ptr, length);
+#endif
+#if defined(PNG_READ_iCCP_SUPPORTED)
+      else if (!png_memcmp(png_ptr->chunk_name, png_iCCP, 4))
+         png_handle_iCCP(png_ptr, info_ptr, length);
+#endif
+#if defined(PNG_READ_sPLT_SUPPORTED)
+      else if (!png_memcmp(png_ptr->chunk_name, png_sPLT, 4))
+         png_handle_sPLT(png_ptr, info_ptr, length);
+#endif
+#if defined(PNG_READ_tEXt_SUPPORTED)
+      else if (!png_memcmp(png_ptr->chunk_name, png_tEXt, 4))
+         png_handle_tEXt(png_ptr, info_ptr, length);
+#endif
+#if defined(PNG_READ_tIME_SUPPORTED)
+      else if (!png_memcmp(png_ptr->chunk_name, png_tIME, 4))
+         png_handle_tIME(png_ptr, info_ptr, length);
+#endif
+#if defined(PNG_READ_tRNS_SUPPORTED)
+      else if (!png_memcmp(png_ptr->chunk_name, png_tRNS, 4))
+         png_handle_tRNS(png_ptr, info_ptr, length);
+#endif
+#if defined(PNG_READ_zTXt_SUPPORTED)
+      else if (!png_memcmp(png_ptr->chunk_name, png_zTXt, 4))
+         png_handle_zTXt(png_ptr, info_ptr, length);
+#endif
+#if defined(PNG_READ_iTXt_SUPPORTED)
+      else if (!png_memcmp(png_ptr->chunk_name, png_iTXt, 4))
+         png_handle_iTXt(png_ptr, info_ptr, length);
+#endif
+      else
+         png_handle_unknown(png_ptr, info_ptr, length);
+   }
+}
+#endif /* PNG_NO_SEQUENTIAL_READ_SUPPORTED */
+
+/* optional call to update the users info_ptr structure */
+void PNGAPI
+png_read_update_info(png_structp png_ptr, png_infop info_ptr)
+{
+   png_debug(1, "in png_read_update_info\n");
+   if(png_ptr == NULL) return;
+   if (!(png_ptr->flags & PNG_FLAG_ROW_INIT))
+      png_read_start_row(png_ptr);
+   else
+      png_warning(png_ptr,
+      "Ignoring extra png_read_update_info() call; row buffer not reallocated");
+   png_read_transform_info(png_ptr, info_ptr);
+}
+
+#ifndef PNG_NO_SEQUENTIAL_READ_SUPPORTED
+/* Initialize palette, background, etc, after transformations
+ * are set, but before any reading takes place.  This allows
+ * the user to obtain a gamma-corrected palette, for example.
+ * If the user doesn't call this, we will do it ourselves.
+ */
+void PNGAPI
+png_start_read_image(png_structp png_ptr)
+{
+   png_debug(1, "in png_start_read_image\n");
+   if(png_ptr == NULL) return;
+   if (!(png_ptr->flags & PNG_FLAG_ROW_INIT))
+      png_read_start_row(png_ptr);
+}
+#endif /* PNG_NO_SEQUENTIAL_READ_SUPPORTED */
+
+#ifndef PNG_NO_SEQUENTIAL_READ_SUPPORTED
+void PNGAPI
+png_read_row(png_structp png_ptr, png_bytep row, png_bytep dsp_row)
+{
+#ifdef PNG_USE_LOCAL_ARRAYS
+   PNG_CONST PNG_IDAT;
+   PNG_CONST int png_pass_dsp_mask[7] = {0xff, 0x0f, 0xff, 0x33, 0xff, 0x55,
+     0xff};
+   PNG_CONST int png_pass_mask[7] = {0x80, 0x08, 0x88, 0x22, 0xaa, 0x55, 0xff};
+#endif
+   int ret;
+   if(png_ptr == NULL) return;
+   png_debug2(1, "in png_read_row (row %lu, pass %d)\n",
+      png_ptr->row_number, png_ptr->pass);
+   if (!(png_ptr->flags & PNG_FLAG_ROW_INIT))
+      png_read_start_row(png_ptr);
+   if (png_ptr->row_number == 0 && png_ptr->pass == 0)
+   {
+   /* check for transforms that have been set but were defined out */
+#if defined(PNG_WRITE_INVERT_SUPPORTED) && !defined(PNG_READ_INVERT_SUPPORTED)
+   if (png_ptr->transformations & PNG_INVERT_MONO)
+      png_warning(png_ptr, "PNG_READ_INVERT_SUPPORTED is not defined.");
+#endif
+#if defined(PNG_WRITE_FILLER_SUPPORTED) && !defined(PNG_READ_FILLER_SUPPORTED)
+   if (png_ptr->transformations & PNG_FILLER)
+      png_warning(png_ptr, "PNG_READ_FILLER_SUPPORTED is not defined.");
+#endif
+#if defined(PNG_WRITE_PACKSWAP_SUPPORTED) && !defined(PNG_READ_PACKSWAP_SUPPORTED)
+   if (png_ptr->transformations & PNG_PACKSWAP)
+      png_warning(png_ptr, "PNG_READ_PACKSWAP_SUPPORTED is not defined.");
+#endif
+#if defined(PNG_WRITE_PACK_SUPPORTED) && !defined(PNG_READ_PACK_SUPPORTED)
+   if (png_ptr->transformations & PNG_PACK)
+      png_warning(png_ptr, "PNG_READ_PACK_SUPPORTED is not defined.");
+#endif
+#if defined(PNG_WRITE_SHIFT_SUPPORTED) && !defined(PNG_READ_SHIFT_SUPPORTED)
+   if (png_ptr->transformations & PNG_SHIFT)
+      png_warning(png_ptr, "PNG_READ_SHIFT_SUPPORTED is not defined.");
+#endif
+#if defined(PNG_WRITE_BGR_SUPPORTED) && !defined(PNG_READ_BGR_SUPPORTED)
+   if (png_ptr->transformations & PNG_BGR)
+      png_warning(png_ptr, "PNG_READ_BGR_SUPPORTED is not defined.");
+#endif
+#if defined(PNG_WRITE_SWAP_SUPPORTED) && !defined(PNG_READ_SWAP_SUPPORTED)
+   if (png_ptr->transformations & PNG_SWAP_BYTES)
+      png_warning(png_ptr, "PNG_READ_SWAP_SUPPORTED is not defined.");
+#endif
+   }
+
+#if defined(PNG_READ_INTERLACING_SUPPORTED)
+   /* if interlaced and we do not need a new row, combine row and return */
+   if (png_ptr->interlaced && (png_ptr->transformations & PNG_INTERLACE))
+   {
+      switch (png_ptr->pass)
+      {
+         case 0:
+            if (png_ptr->row_number & 0x07)
+            {
+               if (dsp_row != NULL)
+                  png_combine_row(png_ptr, dsp_row,
+                     png_pass_dsp_mask[png_ptr->pass]);
+               png_read_finish_row(png_ptr);
+               return;
+            }
+            break;
+         case 1:
+            if ((png_ptr->row_number & 0x07) || png_ptr->width < 5)
+            {
+               if (dsp_row != NULL)
+                  png_combine_row(png_ptr, dsp_row,
+                     png_pass_dsp_mask[png_ptr->pass]);
+               png_read_finish_row(png_ptr);
+               return;
+            }
+            break;
+         case 2:
+            if ((png_ptr->row_number & 0x07) != 4)
+            {
+               if (dsp_row != NULL && (png_ptr->row_number & 4))
+                  png_combine_row(png_ptr, dsp_row,
+                     png_pass_dsp_mask[png_ptr->pass]);
+               png_read_finish_row(png_ptr);
+               return;
+            }
+            break;
+         case 3:
+            if ((png_ptr->row_number & 3) || png_ptr->width < 3)
+            {
+               if (dsp_row != NULL)
+                  png_combine_row(png_ptr, dsp_row,
+                     png_pass_dsp_mask[png_ptr->pass]);
+               png_read_finish_row(png_ptr);
+               return;
+            }
+            break;
+         case 4:
+            if ((png_ptr->row_number & 3) != 2)
+            {
+               if (dsp_row != NULL && (png_ptr->row_number & 2))
+                  png_combine_row(png_ptr, dsp_row,
+                     png_pass_dsp_mask[png_ptr->pass]);
+               png_read_finish_row(png_ptr);
+               return;
+            }
+            break;
+         case 5:
+            if ((png_ptr->row_number & 1) || png_ptr->width < 2)
+            {
+               if (dsp_row != NULL)
+                  png_combine_row(png_ptr, dsp_row,
+                     png_pass_dsp_mask[png_ptr->pass]);
+               png_read_finish_row(png_ptr);
+               return;
+            }
+            break;
+         case 6:
+            if (!(png_ptr->row_number & 1))
+            {
+               png_read_finish_row(png_ptr);
+               return;
+            }
+            break;
+      }
+   }
+#endif
+
+   if (!(png_ptr->mode & PNG_HAVE_IDAT))
+      png_error(png_ptr, "Invalid attempt to read row data");
+
+   png_ptr->zstream.next_out = png_ptr->row_buf;
+   png_ptr->zstream.avail_out = (uInt)png_ptr->irowbytes;
+   do
+   {
+      if (!(png_ptr->zstream.avail_in))
+      {
+         while (!png_ptr->idat_size)
+         {
+            png_byte chunk_length[4];
+
+            png_crc_finish(png_ptr, 0);
+
+            png_read_data(png_ptr, chunk_length, 4);
+            png_ptr->idat_size = png_get_uint_31(png_ptr,chunk_length);
+
+            png_reset_crc(png_ptr);
+            png_crc_read(png_ptr, png_ptr->chunk_name, 4);
+            if (png_memcmp(png_ptr->chunk_name, png_IDAT, 4))
+               png_error(png_ptr, "Not enough image data");
+         }
+         png_ptr->zstream.avail_in = (uInt)png_ptr->zbuf_size;
+         png_ptr->zstream.next_in = png_ptr->zbuf;
+         if (png_ptr->zbuf_size > png_ptr->idat_size)
+            png_ptr->zstream.avail_in = (uInt)png_ptr->idat_size;
+         png_crc_read(png_ptr, png_ptr->zbuf,
+            (png_size_t)png_ptr->zstream.avail_in);
+         png_ptr->idat_size -= png_ptr->zstream.avail_in;
+      }
+      ret = inflate(&png_ptr->zstream, Z_PARTIAL_FLUSH);
+      if (ret == Z_STREAM_END)
+      {
+         if (png_ptr->zstream.avail_out || png_ptr->zstream.avail_in ||
+            png_ptr->idat_size)
+            png_error(png_ptr, "Extra compressed data");
+         png_ptr->mode |= PNG_AFTER_IDAT;
+         png_ptr->flags |= PNG_FLAG_ZLIB_FINISHED;
+         break;
+      }
+      if (ret != Z_OK)
+         png_error(png_ptr, png_ptr->zstream.msg ? png_ptr->zstream.msg :
+                   "Decompression error");
+
+   } while (png_ptr->zstream.avail_out);
+
+   png_ptr->row_info.color_type = png_ptr->color_type;
+   png_ptr->row_info.width = png_ptr->iwidth;
+   png_ptr->row_info.channels = png_ptr->channels;
+   png_ptr->row_info.bit_depth = png_ptr->bit_depth;
+   png_ptr->row_info.pixel_depth = png_ptr->pixel_depth;
+   png_ptr->row_info.rowbytes = PNG_ROWBYTES(png_ptr->row_info.pixel_depth,
+       png_ptr->row_info.width);
+
+   if(png_ptr->row_buf[0])
+   png_read_filter_row(png_ptr, &(png_ptr->row_info),
+      png_ptr->row_buf + 1, png_ptr->prev_row + 1,
+      (int)(png_ptr->row_buf[0]));
+
+   png_memcpy_check(png_ptr, png_ptr->prev_row, png_ptr->row_buf,
+      png_ptr->rowbytes + 1);
+
+#if defined(PNG_MNG_FEATURES_SUPPORTED)
+   if((png_ptr->mng_features_permitted & PNG_FLAG_MNG_FILTER_64) &&
+      (png_ptr->filter_type == PNG_INTRAPIXEL_DIFFERENCING))
+   {
+      /* Intrapixel differencing */
+      png_do_read_intrapixel(&(png_ptr->row_info), png_ptr->row_buf + 1);
+   }
+#endif
+
+
+   if (png_ptr->transformations || (png_ptr->flags&PNG_FLAG_STRIP_ALPHA))
+      png_do_read_transformations(png_ptr);
+
+#if defined(PNG_READ_INTERLACING_SUPPORTED)
+   /* blow up interlaced rows to full size */
+   if (png_ptr->interlaced &&
+      (png_ptr->transformations & PNG_INTERLACE))
+   {
+      if (png_ptr->pass < 6)
+/*       old interface (pre-1.0.9):
+         png_do_read_interlace(&(png_ptr->row_info),
+            png_ptr->row_buf + 1, png_ptr->pass, png_ptr->transformations);
+ */
+         png_do_read_interlace(png_ptr);
+
+      if (dsp_row != NULL)
+         png_combine_row(png_ptr, dsp_row,
+            png_pass_dsp_mask[png_ptr->pass]);
+      if (row != NULL)
+         png_combine_row(png_ptr, row,
+            png_pass_mask[png_ptr->pass]);
+   }
+   else
+#endif
+   {
+      if (row != NULL)
+         png_combine_row(png_ptr, row, 0xff);
+      if (dsp_row != NULL)
+         png_combine_row(png_ptr, dsp_row, 0xff);
+   }
+   png_read_finish_row(png_ptr);
+
+   if (png_ptr->read_row_fn != NULL)
+      (*(png_ptr->read_row_fn))(png_ptr, png_ptr->row_number, png_ptr->pass);
+}
+#endif /* PNG_NO_SEQUENTIAL_READ_SUPPORTED */
+
+#ifndef PNG_NO_SEQUENTIAL_READ_SUPPORTED
+/* Read one or more rows of image data.  If the image is interlaced,
+ * and png_set_interlace_handling() has been called, the rows need to
+ * contain the contents of the rows from the previous pass.  If the
+ * image has alpha or transparency, and png_handle_alpha()[*] has been
+ * called, the rows contents must be initialized to the contents of the
+ * screen.
+ *
+ * "row" holds the actual image, and pixels are placed in it
+ * as they arrive.  If the image is displayed after each pass, it will
+ * appear to "sparkle" in.  "display_row" can be used to display a
+ * "chunky" progressive image, with finer detail added as it becomes
+ * available.  If you do not want this "chunky" display, you may pass
+ * NULL for display_row.  If you do not want the sparkle display, and
+ * you have not called png_handle_alpha(), you may pass NULL for rows.
+ * If you have called png_handle_alpha(), and the image has either an
+ * alpha channel or a transparency chunk, you must provide a buffer for
+ * rows.  In this case, you do not have to provide a display_row buffer
+ * also, but you may.  If the image is not interlaced, or if you have
+ * not called png_set_interlace_handling(), the display_row buffer will
+ * be ignored, so pass NULL to it.
+ *
+ * [*] png_handle_alpha() does not exist yet, as of this version of libpng
+ */
+
+void PNGAPI
+png_read_rows(png_structp png_ptr, png_bytepp row,
+   png_bytepp display_row, png_uint_32 num_rows)
+{
+   png_uint_32 i;
+   png_bytepp rp;
+   png_bytepp dp;
+
+   png_debug(1, "in png_read_rows\n");
+   if(png_ptr == NULL) return;
+   rp = row;
+   dp = display_row;
+   if (rp != NULL && dp != NULL)
+      for (i = 0; i < num_rows; i++)
+      {
+         png_bytep rptr = *rp++;
+         png_bytep dptr = *dp++;
+
+         png_read_row(png_ptr, rptr, dptr);
+      }
+   else if(rp != NULL)
+      for (i = 0; i < num_rows; i++)
+      {
+         png_bytep rptr = *rp;
+         png_read_row(png_ptr, rptr, png_bytep_NULL);
+         rp++;
+      }
+   else if(dp != NULL)
+      for (i = 0; i < num_rows; i++)
+      {
+         png_bytep dptr = *dp;
+         png_read_row(png_ptr, png_bytep_NULL, dptr);
+         dp++;
+      }
+}
+#endif /* PNG_NO_SEQUENTIAL_READ_SUPPORTED */
+
+#ifndef PNG_NO_SEQUENTIAL_READ_SUPPORTED
+/* Read the entire image.  If the image has an alpha channel or a tRNS
+ * chunk, and you have called png_handle_alpha()[*], you will need to
+ * initialize the image to the current image that PNG will be overlaying.
+ * We set the num_rows again here, in case it was incorrectly set in
+ * png_read_start_row() by a call to png_read_update_info() or
+ * png_start_read_image() if png_set_interlace_handling() wasn't called
+ * prior to either of these functions like it should have been.  You can
+ * only call this function once.  If you desire to have an image for
+ * each pass of a interlaced image, use png_read_rows() instead.
+ *
+ * [*] png_handle_alpha() does not exist yet, as of this version of libpng
+ */
+void PNGAPI
+png_read_image(png_structp png_ptr, png_bytepp image)
+{
+   png_uint_32 i,image_height;
+   int pass, j;
+   png_bytepp rp;
+
+   png_debug(1, "in png_read_image\n");
+   if(png_ptr == NULL) return;
+
+#ifdef PNG_READ_INTERLACING_SUPPORTED
+   pass = png_set_interlace_handling(png_ptr);
+#else
+   if (png_ptr->interlaced)
+      png_error(png_ptr,
+        "Cannot read interlaced image -- interlace handler disabled.");
+   pass = 1;
+#endif
+
+
+   image_height=png_ptr->height;
+   png_ptr->num_rows = image_height; /* Make sure this is set correctly */
+
+   for (j = 0; j < pass; j++)
+   {
+      rp = image;
+      for (i = 0; i < image_height; i++)
+      {
+         png_read_row(png_ptr, *rp, png_bytep_NULL);
+         rp++;
+      }
+   }
+}
+#endif /* PNG_NO_SEQUENTIAL_READ_SUPPORTED */
+
+#ifndef PNG_NO_SEQUENTIAL_READ_SUPPORTED
+/* Read the end of the PNG file.  Will not read past the end of the
+ * file, will verify the end is accurate, and will read any comments
+ * or time information at the end of the file, if info is not NULL.
+ */
+void PNGAPI
+png_read_end(png_structp png_ptr, png_infop info_ptr)
+{
+   png_byte chunk_length[4];
+   png_uint_32 length;
+
+   png_debug(1, "in png_read_end\n");
+   if(png_ptr == NULL) return;
+   png_crc_finish(png_ptr, 0); /* Finish off CRC from last IDAT chunk */
+
+   do
+   {
+#ifdef PNG_USE_LOCAL_ARRAYS
+      PNG_CONST PNG_IHDR;
+      PNG_CONST PNG_IDAT;
+      PNG_CONST PNG_IEND;
+      PNG_CONST PNG_PLTE;
+#if defined(PNG_READ_bKGD_SUPPORTED)
+      PNG_CONST PNG_bKGD;
+#endif
+#if defined(PNG_READ_cHRM_SUPPORTED)
+      PNG_CONST PNG_cHRM;
+#endif
+#if defined(PNG_READ_gAMA_SUPPORTED)
+      PNG_CONST PNG_gAMA;
+#endif
+#if defined(PNG_READ_hIST_SUPPORTED)
+      PNG_CONST PNG_hIST;
+#endif
+#if defined(PNG_READ_iCCP_SUPPORTED)
+      PNG_CONST PNG_iCCP;
+#endif
+#if defined(PNG_READ_iTXt_SUPPORTED)
+      PNG_CONST PNG_iTXt;
+#endif
+#if defined(PNG_READ_oFFs_SUPPORTED)
+      PNG_CONST PNG_oFFs;
+#endif
+#if defined(PNG_READ_pCAL_SUPPORTED)
+      PNG_CONST PNG_pCAL;
+#endif
+#if defined(PNG_READ_pHYs_SUPPORTED)
+      PNG_CONST PNG_pHYs;
+#endif
+#if defined(PNG_READ_sBIT_SUPPORTED)
+      PNG_CONST PNG_sBIT;
+#endif
+#if defined(PNG_READ_sCAL_SUPPORTED)
+      PNG_CONST PNG_sCAL;
+#endif
+#if defined(PNG_READ_sPLT_SUPPORTED)
+      PNG_CONST PNG_sPLT;
+#endif
+#if defined(PNG_READ_sRGB_SUPPORTED)
+      PNG_CONST PNG_sRGB;
+#endif
+#if defined(PNG_READ_tEXt_SUPPORTED)
+      PNG_CONST PNG_tEXt;
+#endif
+#if defined(PNG_READ_tIME_SUPPORTED)
+      PNG_CONST PNG_tIME;
+#endif
+#if defined(PNG_READ_tRNS_SUPPORTED)
+      PNG_CONST PNG_tRNS;
+#endif
+#if defined(PNG_READ_zTXt_SUPPORTED)
+      PNG_CONST PNG_zTXt;
+#endif
+#endif /* PNG_USE_LOCAL_ARRAYS */
+
+      png_read_data(png_ptr, chunk_length, 4);
+      length = png_get_uint_31(png_ptr,chunk_length);
+
+      png_reset_crc(png_ptr);
+      png_crc_read(png_ptr, png_ptr->chunk_name, 4);
+
+      png_debug1(0, "Reading %s chunk.\n", png_ptr->chunk_name);
+
+      if (!png_memcmp(png_ptr->chunk_name, png_IHDR, 4))
+         png_handle_IHDR(png_ptr, info_ptr, length);
+      else if (!png_memcmp(png_ptr->chunk_name, png_IEND, 4))
+         png_handle_IEND(png_ptr, info_ptr, length);
+#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
+      else if (png_handle_as_unknown(png_ptr, png_ptr->chunk_name))
+      {
+         if (!png_memcmp(png_ptr->chunk_name, png_IDAT, 4))
+         {
+            if ((length > 0) || (png_ptr->mode & PNG_HAVE_CHUNK_AFTER_IDAT))
+               png_error(png_ptr, "Too many IDAT's found");
+         }
+         png_handle_unknown(png_ptr, info_ptr, length);
+         if (!png_memcmp(png_ptr->chunk_name, png_PLTE, 4))
+            png_ptr->mode |= PNG_HAVE_PLTE;
+      }
+#endif
+      else if (!png_memcmp(png_ptr->chunk_name, png_IDAT, 4))
+      {
+         /* Zero length IDATs are legal after the last IDAT has been
+          * read, but not after other chunks have been read.
+          */
+         if ((length > 0) || (png_ptr->mode & PNG_HAVE_CHUNK_AFTER_IDAT))
+            png_error(png_ptr, "Too many IDAT's found");
+         png_crc_finish(png_ptr, length);
+      }
+      else if (!png_memcmp(png_ptr->chunk_name, png_PLTE, 4))
+         png_handle_PLTE(png_ptr, info_ptr, length);
+#if defined(PNG_READ_bKGD_SUPPORTED)
+      else if (!png_memcmp(png_ptr->chunk_name, png_bKGD, 4))
+         png_handle_bKGD(png_ptr, info_ptr, length);
+#endif
+#if defined(PNG_READ_cHRM_SUPPORTED)
+      else if (!png_memcmp(png_ptr->chunk_name, png_cHRM, 4))
+         png_handle_cHRM(png_ptr, info_ptr, length);
+#endif
+#if defined(PNG_READ_gAMA_SUPPORTED)
+      else if (!png_memcmp(png_ptr->chunk_name, png_gAMA, 4))
+         png_handle_gAMA(png_ptr, info_ptr, length);
+#endif
+#if defined(PNG_READ_hIST_SUPPORTED)
+      else if (!png_memcmp(png_ptr->chunk_name, png_hIST, 4))
+         png_handle_hIST(png_ptr, info_ptr, length);
+#endif
+#if defined(PNG_READ_oFFs_SUPPORTED)
+      else if (!png_memcmp(png_ptr->chunk_name, png_oFFs, 4))
+         png_handle_oFFs(png_ptr, info_ptr, length);
+#endif
+#if defined(PNG_READ_pCAL_SUPPORTED)
+      else if (!png_memcmp(png_ptr->chunk_name, png_pCAL, 4))
+         png_handle_pCAL(png_ptr, info_ptr, length);
+#endif
+#if defined(PNG_READ_sCAL_SUPPORTED)
+      else if (!png_memcmp(png_ptr->chunk_name, png_sCAL, 4))
+         png_handle_sCAL(png_ptr, info_ptr, length);
+#endif
+#if defined(PNG_READ_pHYs_SUPPORTED)
+      else if (!png_memcmp(png_ptr->chunk_name, png_pHYs, 4))
+         png_handle_pHYs(png_ptr, info_ptr, length);
+#endif
+#if defined(PNG_READ_sBIT_SUPPORTED)
+      else if (!png_memcmp(png_ptr->chunk_name, png_sBIT, 4))
+         png_handle_sBIT(png_ptr, info_ptr, length);
+#endif
+#if defined(PNG_READ_sRGB_SUPPORTED)
+      else if (!png_memcmp(png_ptr->chunk_name, png_sRGB, 4))
+         png_handle_sRGB(png_ptr, info_ptr, length);
+#endif
+#if defined(PNG_READ_iCCP_SUPPORTED)
+      else if (!png_memcmp(png_ptr->chunk_name, png_iCCP, 4))
+         png_handle_iCCP(png_ptr, info_ptr, length);
+#endif
+#if defined(PNG_READ_sPLT_SUPPORTED)
+      else if (!png_memcmp(png_ptr->chunk_name, png_sPLT, 4))
+         png_handle_sPLT(png_ptr, info_ptr, length);
+#endif
+#if defined(PNG_READ_tEXt_SUPPORTED)
+      else if (!png_memcmp(png_ptr->chunk_name, png_tEXt, 4))
+         png_handle_tEXt(png_ptr, info_ptr, length);
+#endif
+#if defined(PNG_READ_tIME_SUPPORTED)
+      else if (!png_memcmp(png_ptr->chunk_name, png_tIME, 4))
+         png_handle_tIME(png_ptr, info_ptr, length);
+#endif
+#if defined(PNG_READ_tRNS_SUPPORTED)
+      else if (!png_memcmp(png_ptr->chunk_name, png_tRNS, 4))
+         png_handle_tRNS(png_ptr, info_ptr, length);
+#endif
+#if defined(PNG_READ_zTXt_SUPPORTED)
+      else if (!png_memcmp(png_ptr->chunk_name, png_zTXt, 4))
+         png_handle_zTXt(png_ptr, info_ptr, length);
+#endif
+#if defined(PNG_READ_iTXt_SUPPORTED)
+      else if (!png_memcmp(png_ptr->chunk_name, png_iTXt, 4))
+         png_handle_iTXt(png_ptr, info_ptr, length);
+#endif
+      else
+         png_handle_unknown(png_ptr, info_ptr, length);
+   } while (!(png_ptr->mode & PNG_HAVE_IEND));
+}
+#endif /* PNG_NO_SEQUENTIAL_READ_SUPPORTED */
+
+/* free all memory used by the read */
+void PNGAPI
+png_destroy_read_struct(png_structpp png_ptr_ptr, png_infopp info_ptr_ptr,
+   png_infopp end_info_ptr_ptr)
+{
+   png_structp png_ptr = NULL;
+   png_infop info_ptr = NULL, end_info_ptr = NULL;
+#ifdef PNG_USER_MEM_SUPPORTED
+   png_free_ptr free_fn;
+   png_voidp mem_ptr;
+#endif
+
+   png_debug(1, "in png_destroy_read_struct\n");
+   if (png_ptr_ptr != NULL)
+      png_ptr = *png_ptr_ptr;
+
+   if (info_ptr_ptr != NULL)
+      info_ptr = *info_ptr_ptr;
+
+   if (end_info_ptr_ptr != NULL)
+      end_info_ptr = *end_info_ptr_ptr;
+
+#ifdef PNG_USER_MEM_SUPPORTED
+   free_fn = png_ptr->free_fn;
+   mem_ptr = png_ptr->mem_ptr;
+#endif
+
+   png_read_destroy(png_ptr, info_ptr, end_info_ptr);
+
+   if (info_ptr != NULL)
+   {
+#if defined(PNG_TEXT_SUPPORTED)
+      png_free_data(png_ptr, info_ptr, PNG_FREE_TEXT, -1);
+#endif
+
+#ifdef PNG_USER_MEM_SUPPORTED
+      png_destroy_struct_2((png_voidp)info_ptr, (png_free_ptr)free_fn,
+          (png_voidp)mem_ptr);
+#else
+      png_destroy_struct((png_voidp)info_ptr);
+#endif
+      *info_ptr_ptr = NULL;
+   }
+
+   if (end_info_ptr != NULL)
+   {
+#if defined(PNG_READ_TEXT_SUPPORTED)
+      png_free_data(png_ptr, end_info_ptr, PNG_FREE_TEXT, -1);
+#endif
+#ifdef PNG_USER_MEM_SUPPORTED
+      png_destroy_struct_2((png_voidp)end_info_ptr, (png_free_ptr)free_fn,
+         (png_voidp)mem_ptr);
+#else
+      png_destroy_struct((png_voidp)end_info_ptr);
+#endif
+      *end_info_ptr_ptr = NULL;
+   }
+
+   if (png_ptr != NULL)
+   {
+#ifdef PNG_USER_MEM_SUPPORTED
+      png_destroy_struct_2((png_voidp)png_ptr, (png_free_ptr)free_fn,
+          (png_voidp)mem_ptr);
+#else
+      png_destroy_struct((png_voidp)png_ptr);
+#endif
+      *png_ptr_ptr = NULL;
+   }
+}
+
+/* free all memory used by the read (old method) */
+void /* PRIVATE */
+png_read_destroy(png_structp png_ptr, png_infop info_ptr, png_infop end_info_ptr)
+{
+#ifdef PNG_SETJMP_SUPPORTED
+   jmp_buf tmp_jmp;
+#endif
+   png_error_ptr error_fn;
+   png_error_ptr warning_fn;
+   png_voidp error_ptr;
+#ifdef PNG_USER_MEM_SUPPORTED
+   png_free_ptr free_fn;
+#endif
+
+   png_debug(1, "in png_read_destroy\n");
+   if (info_ptr != NULL)
+      png_info_destroy(png_ptr, info_ptr);
+
+   if (end_info_ptr != NULL)
+      png_info_destroy(png_ptr, end_info_ptr);
+
+   png_free(png_ptr, png_ptr->zbuf);
+   png_free(png_ptr, png_ptr->big_row_buf);
+   png_free(png_ptr, png_ptr->prev_row);
+#if defined(PNG_READ_DITHER_SUPPORTED)
+   png_free(png_ptr, png_ptr->palette_lookup);
+   png_free(png_ptr, png_ptr->dither_index);
+#endif
+#if defined(PNG_READ_GAMMA_SUPPORTED)
+   png_free(png_ptr, png_ptr->gamma_table);
+#endif
+#if defined(PNG_READ_BACKGROUND_SUPPORTED)
+   png_free(png_ptr, png_ptr->gamma_from_1);
+   png_free(png_ptr, png_ptr->gamma_to_1);
+#endif
+#ifdef PNG_FREE_ME_SUPPORTED
+   if (png_ptr->free_me & PNG_FREE_PLTE)
+      png_zfree(png_ptr, png_ptr->palette);
+   png_ptr->free_me &= ~PNG_FREE_PLTE;
+#else
+   if (png_ptr->flags & PNG_FLAG_FREE_PLTE)
+      png_zfree(png_ptr, png_ptr->palette);
+   png_ptr->flags &= ~PNG_FLAG_FREE_PLTE;
+#endif
+#if defined(PNG_tRNS_SUPPORTED) || \
+    defined(PNG_READ_EXPAND_SUPPORTED) || defined(PNG_READ_BACKGROUND_SUPPORTED)
+#ifdef PNG_FREE_ME_SUPPORTED
+   if (png_ptr->free_me & PNG_FREE_TRNS)
+      png_free(png_ptr, png_ptr->trans);
+   png_ptr->free_me &= ~PNG_FREE_TRNS;
+#else
+   if (png_ptr->flags & PNG_FLAG_FREE_TRNS)
+      png_free(png_ptr, png_ptr->trans);
+   png_ptr->flags &= ~PNG_FLAG_FREE_TRNS;
+#endif
+#endif
+#if defined(PNG_READ_hIST_SUPPORTED)
+#ifdef PNG_FREE_ME_SUPPORTED
+   if (png_ptr->free_me & PNG_FREE_HIST)
+      png_free(png_ptr, png_ptr->hist);
+   png_ptr->free_me &= ~PNG_FREE_HIST;
+#else
+   if (png_ptr->flags & PNG_FLAG_FREE_HIST)
+      png_free(png_ptr, png_ptr->hist);
+   png_ptr->flags &= ~PNG_FLAG_FREE_HIST;
+#endif
+#endif
+#if defined(PNG_READ_GAMMA_SUPPORTED)
+   if (png_ptr->gamma_16_table != NULL)
+   {
+      int i;
+      int istop = (1 << (8 - png_ptr->gamma_shift));
+      for (i = 0; i < istop; i++)
+      {
+         png_free(png_ptr, png_ptr->gamma_16_table[i]);
+      }
+   png_free(png_ptr, png_ptr->gamma_16_table);
+   }
+#if defined(PNG_READ_BACKGROUND_SUPPORTED)
+   if (png_ptr->gamma_16_from_1 != NULL)
+   {
+      int i;
+      int istop = (1 << (8 - png_ptr->gamma_shift));
+      for (i = 0; i < istop; i++)
+      {
+         png_free(png_ptr, png_ptr->gamma_16_from_1[i]);
+      }
+   png_free(png_ptr, png_ptr->gamma_16_from_1);
+   }
+   if (png_ptr->gamma_16_to_1 != NULL)
+   {
+      int i;
+      int istop = (1 << (8 - png_ptr->gamma_shift));
+      for (i = 0; i < istop; i++)
+      {
+         png_free(png_ptr, png_ptr->gamma_16_to_1[i]);
+      }
+   png_free(png_ptr, png_ptr->gamma_16_to_1);
+   }
+#endif
+#endif
+#if defined(PNG_TIME_RFC1123_SUPPORTED)
+   png_free(png_ptr, png_ptr->time_buffer);
+#endif
+
+   inflateEnd(&png_ptr->zstream);
+#ifdef PNG_PROGRESSIVE_READ_SUPPORTED
+   png_free(png_ptr, png_ptr->save_buffer);
+#endif
+
+#ifdef PNG_PROGRESSIVE_READ_SUPPORTED
+#ifdef PNG_TEXT_SUPPORTED
+   png_free(png_ptr, png_ptr->current_text);
+#endif /* PNG_TEXT_SUPPORTED */
+#endif /* PNG_PROGRESSIVE_READ_SUPPORTED */
+
+   /* Save the important info out of the png_struct, in case it is
+    * being used again.
+    */
+#ifdef PNG_SETJMP_SUPPORTED
+   png_memcpy(tmp_jmp, png_ptr->jmpbuf, png_sizeof (jmp_buf));
+#endif
+
+   error_fn = png_ptr->error_fn;
+   warning_fn = png_ptr->warning_fn;
+   error_ptr = png_ptr->error_ptr;
+#ifdef PNG_USER_MEM_SUPPORTED
+   free_fn = png_ptr->free_fn;
+#endif
+
+   png_memset(png_ptr, 0, png_sizeof (png_struct));
+
+   png_ptr->error_fn = error_fn;
+   png_ptr->warning_fn = warning_fn;
+   png_ptr->error_ptr = error_ptr;
+#ifdef PNG_USER_MEM_SUPPORTED
+   png_ptr->free_fn = free_fn;
+#endif
+
+#ifdef PNG_SETJMP_SUPPORTED
+   png_memcpy(png_ptr->jmpbuf, tmp_jmp, png_sizeof (jmp_buf));
+#endif
+
+}
+
+void PNGAPI
+png_set_read_status_fn(png_structp png_ptr, png_read_status_ptr read_row_fn)
+{
+   if(png_ptr == NULL) return;
+   png_ptr->read_row_fn = read_row_fn;
+}
+
+
+#ifndef PNG_NO_SEQUENTIAL_READ_SUPPORTED
+#if defined(PNG_INFO_IMAGE_SUPPORTED)
+void PNGAPI
+png_read_png(png_structp png_ptr, png_infop info_ptr,
+                           int transforms,
+                           voidp params)
+{
+   int row;
+
+   if(png_ptr == NULL) return;
+#if defined(PNG_READ_INVERT_ALPHA_SUPPORTED)
+   /* invert the alpha channel from opacity to transparency
+    */
+   if (transforms & PNG_TRANSFORM_INVERT_ALPHA)
+       png_set_invert_alpha(png_ptr);
+#endif
+
+   /* png_read_info() gives us all of the information from the
+    * PNG file before the first IDAT (image data chunk).
+    */
+   png_read_info(png_ptr, info_ptr);
+   if (info_ptr->height > PNG_UINT_32_MAX/png_sizeof(png_bytep))
+      png_error(png_ptr,"Image is too high to process with png_read_png()");
+
+   /* -------------- image transformations start here ------------------- */
+
+#if defined(PNG_READ_16_TO_8_SUPPORTED)
+   /* tell libpng to strip 16 bit/color files down to 8 bits per color
+    */
+   if (transforms & PNG_TRANSFORM_STRIP_16)
+       png_set_strip_16(png_ptr);
+#endif
+
+#if defined(PNG_READ_STRIP_ALPHA_SUPPORTED)
+   /* Strip alpha bytes from the input data without combining with
+    * the background (not recommended).
+    */
+   if (transforms & PNG_TRANSFORM_STRIP_ALPHA)
+       png_set_strip_alpha(png_ptr);
+#endif
+
+#if defined(PNG_READ_PACK_SUPPORTED) && !defined(PNG_READ_EXPAND_SUPPORTED)
+   /* Extract multiple pixels with bit depths of 1, 2, or 4 from a single
+    * byte into separate bytes (useful for paletted and grayscale images).
+    */
+   if (transforms & PNG_TRANSFORM_PACKING)
+       png_set_packing(png_ptr);
+#endif
+
+#if defined(PNG_READ_PACKSWAP_SUPPORTED)
+   /* Change the order of packed pixels to least significant bit first
+    * (not useful if you are using png_set_packing).
+    */
+   if (transforms & PNG_TRANSFORM_PACKSWAP)
+       png_set_packswap(png_ptr);
+#endif
+
+#if defined(PNG_READ_EXPAND_SUPPORTED)
+   /* Expand paletted colors into true RGB triplets
+    * Expand grayscale images to full 8 bits from 1, 2, or 4 bits/pixel
+    * Expand paletted or RGB images with transparency to full alpha
+    * channels so the data will be available as RGBA quartets.
+    */
+   if (transforms & PNG_TRANSFORM_EXPAND)
+       if ((png_ptr->bit_depth < 8) ||
+           (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE) ||
+           (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)))
+         png_set_expand(png_ptr);
+#endif
+
+   /* We don't handle background color or gamma transformation or dithering.
+    */
+
+#if defined(PNG_READ_INVERT_SUPPORTED)
+   /* invert monochrome files to have 0 as white and 1 as black
+    */
+   if (transforms & PNG_TRANSFORM_INVERT_MONO)
+       png_set_invert_mono(png_ptr);
+#endif
+
+#if defined(PNG_READ_SHIFT_SUPPORTED)
+   /* If you want to shift the pixel values from the range [0,255] or
+    * [0,65535] to the original [0,7] or [0,31], or whatever range the
+    * colors were originally in:
+    */
+   if ((transforms & PNG_TRANSFORM_SHIFT)
+       && png_get_valid(png_ptr, info_ptr, PNG_INFO_sBIT))
+   {
+      png_color_8p sig_bit;
+
+      png_get_sBIT(png_ptr, info_ptr, &sig_bit);
+      png_set_shift(png_ptr, sig_bit);
+   }
+#endif
+
+#if defined(PNG_READ_BGR_SUPPORTED)
+   /* flip the RGB pixels to BGR (or RGBA to BGRA)
+    */
+   if (transforms & PNG_TRANSFORM_BGR)
+       png_set_bgr(png_ptr);
+#endif
+
+#if defined(PNG_READ_SWAP_ALPHA_SUPPORTED)
+   /* swap the RGBA or GA data to ARGB or AG (or BGRA to ABGR)
+    */
+   if (transforms & PNG_TRANSFORM_SWAP_ALPHA)
+       png_set_swap_alpha(png_ptr);
+#endif
+
+#if defined(PNG_READ_SWAP_SUPPORTED)
+   /* swap bytes of 16 bit files to least significant byte first
+    */
+   if (transforms & PNG_TRANSFORM_SWAP_ENDIAN)
+       png_set_swap(png_ptr);
+#endif
+
+   /* We don't handle adding filler bytes */
+
+   /* Optional call to gamma correct and add the background to the palette
+    * and update info structure.  REQUIRED if you are expecting libpng to
+    * update the palette for you (i.e., you selected such a transform above).
+    */
+   png_read_update_info(png_ptr, info_ptr);
+
+   /* -------------- image transformations end here ------------------- */
+
+#ifdef PNG_FREE_ME_SUPPORTED
+   png_free_data(png_ptr, info_ptr, PNG_FREE_ROWS, 0);
+#endif
+   if(info_ptr->row_pointers == NULL)
+   {
+      info_ptr->row_pointers = (png_bytepp)png_malloc(png_ptr,
+         info_ptr->height * png_sizeof(png_bytep));
+#ifdef PNG_FREE_ME_SUPPORTED
+      info_ptr->free_me |= PNG_FREE_ROWS;
+#endif
+      for (row = 0; row < (int)info_ptr->height; row++)
+      {
+         info_ptr->row_pointers[row] = (png_bytep)png_malloc(png_ptr,
+            png_get_rowbytes(png_ptr, info_ptr));
+      }
+   }
+
+   png_read_image(png_ptr, info_ptr->row_pointers);
+   info_ptr->valid |= PNG_INFO_IDAT;
+
+   /* read rest of file, and get additional chunks in info_ptr - REQUIRED */
+   png_read_end(png_ptr, info_ptr);
+
+   transforms = transforms; /* quiet compiler warnings */
+   params = params;
+
+}
+#endif /* PNG_INFO_IMAGE_SUPPORTED */
+#endif /* PNG_NO_SEQUENTIAL_READ_SUPPORTED */
+#endif /* PNG_READ_SUPPORTED */
diff --git a/uppsrc/plugin/png/lib/pngrio.c b/uppsrc/plugin/png/lib/pngrio.c
new file mode 100644
index 000000000..7d2522f1f
--- /dev/null
+++ b/uppsrc/plugin/png/lib/pngrio.c
@@ -0,0 +1,167 @@
+
+/* pngrio.c - functions for data input
+ *
+ * Last changed in libpng 1.2.13 November 13, 2006
+ * For conditions of distribution and use, see copyright notice in png.h
+ * Copyright (c) 1998-2006 Glenn Randers-Pehrson
+ * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
+ * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
+ *
+ * This file provides a location for all input.  Users who need
+ * special handling are expected to write a function that has the same
+ * arguments as this and performs a similar function, but that possibly
+ * has a different input method.  Note that you shouldn't change this
+ * function, but rather write a replacement function and then make
+ * libpng use it at run time with png_set_read_fn(...).
+ */
+
+#define PNG_INTERNAL
+#include "png.h"
+
+#if defined(PNG_READ_SUPPORTED)
+
+/* Read the data from whatever input you are using.  The default routine
+   reads from a file pointer.  Note that this routine sometimes gets called
+   with very small lengths, so you should implement some kind of simple
+   buffering if you are using unbuffered reads.  This should never be asked
+   to read more then 64K on a 16 bit machine. */
+void /* PRIVATE */
+png_read_data(png_structp png_ptr, png_bytep data, png_size_t length)
+{
+   png_debug1(4,"reading %d bytes\n", (int)length);
+   if (png_ptr->read_data_fn != NULL)
+      (*(png_ptr->read_data_fn))(png_ptr, data, length);
+   else
+      png_error(png_ptr, "Call to NULL read function");
+}
+
+#if !defined(PNG_NO_STDIO)
+/* This is the function that does the actual reading of data.  If you are
+   not reading from a standard C stream, you should create a replacement
+   read_data function and use it at run time with png_set_read_fn(), rather
+   than changing the library. */
+#ifndef USE_FAR_KEYWORD
+void PNGAPI
+png_default_read_data(png_structp png_ptr, png_bytep data, png_size_t length)
+{
+   png_size_t check;
+
+   if(png_ptr == NULL) return;
+   /* fread() returns 0 on error, so it is OK to store this in a png_size_t
+    * instead of an int, which is what fread() actually returns.
+    */
+#if defined(_WIN32_WCE)
+   if ( !ReadFile((HANDLE)(png_ptr->io_ptr), data, length, &check, NULL) )
+      check = 0;
+#else
+   check = (png_size_t)fread(data, (png_size_t)1, length,
+      (png_FILE_p)png_ptr->io_ptr);
+#endif
+
+   if (check != length)
+      png_error(png_ptr, "Read Error");
+}
+#else
+/* this is the model-independent version. Since the standard I/O library
+   can't handle far buffers in the medium and small models, we have to copy
+   the data.
+*/
+
+#define NEAR_BUF_SIZE 1024
+#define MIN(a,b) (a <= b ? a : b)
+
+static void PNGAPI
+png_default_read_data(png_structp png_ptr, png_bytep data, png_size_t length)
+{
+   int check;
+   png_byte *n_data;
+   png_FILE_p io_ptr;
+
+   if(png_ptr == NULL) return;
+   /* Check if data really is near. If so, use usual code. */
+   n_data = (png_byte *)CVT_PTR_NOCHECK(data);
+   io_ptr = (png_FILE_p)CVT_PTR(png_ptr->io_ptr);
+   if ((png_bytep)n_data == data)
+   {
+#if defined(_WIN32_WCE)
+      if ( !ReadFile((HANDLE)(png_ptr->io_ptr), data, length, &check, NULL) )
+         check = 0;
+#else
+      check = fread(n_data, 1, length, io_ptr);
+#endif
+   }
+   else
+   {
+      png_byte buf[NEAR_BUF_SIZE];
+      png_size_t read, remaining, err;
+      check = 0;
+      remaining = length;
+      do
+      {
+         read = MIN(NEAR_BUF_SIZE, remaining);
+#if defined(_WIN32_WCE)
+         if ( !ReadFile((HANDLE)(io_ptr), buf, read, &err, NULL) )
+            err = 0;
+#else
+         err = fread(buf, (png_size_t)1, read, io_ptr);
+#endif
+         png_memcpy(data, buf, read); /* copy far buffer to near buffer */
+         if(err != read)
+            break;
+         else
+            check += err;
+         data += read;
+         remaining -= read;
+      }
+      while (remaining != 0);
+   }
+   if ((png_uint_32)check != (png_uint_32)length)
+      png_error(png_ptr, "read Error");
+}
+#endif
+#endif
+
+/* This function allows the application to supply a new input function
+   for libpng if standard C streams aren't being used.
+
+   This function takes as its arguments:
+   png_ptr      - pointer to a png input data structure
+   io_ptr       - pointer to user supplied structure containing info about
+                  the input functions.  May be NULL.
+   read_data_fn - pointer to a new input function that takes as its
+                  arguments a pointer to a png_struct, a pointer to
+                  a location where input data can be stored, and a 32-bit
+                  unsigned int that is the number of bytes to be read.
+                  To exit and output any fatal error messages the new write
+                  function should call png_error(png_ptr, "Error msg"). */
+void PNGAPI
+png_set_read_fn(png_structp png_ptr, png_voidp io_ptr,
+   png_rw_ptr read_data_fn)
+{
+   if(png_ptr == NULL) return;
+   png_ptr->io_ptr = io_ptr;
+
+#if !defined(PNG_NO_STDIO)
+   if (read_data_fn != NULL)
+      png_ptr->read_data_fn = read_data_fn;
+   else
+      png_ptr->read_data_fn = png_default_read_data;
+#else
+   png_ptr->read_data_fn = read_data_fn;
+#endif
+
+   /* It is an error to write to a read device */
+   if (png_ptr->write_data_fn != NULL)
+   {
+      png_ptr->write_data_fn = NULL;
+      png_warning(png_ptr,
+         "It's an error to set both read_data_fn and write_data_fn in the ");
+      png_warning(png_ptr,
+         "same structure.  Resetting write_data_fn to NULL.");
+   }
+
+#if defined(PNG_WRITE_FLUSH_SUPPORTED)
+   png_ptr->output_flush_fn = NULL;
+#endif
+}
+#endif /* PNG_READ_SUPPORTED */
diff --git a/uppsrc/plugin/png/lib/pngrtran.c b/uppsrc/plugin/png/lib/pngrtran.c
new file mode 100644
index 000000000..96ca4a146
--- /dev/null
+++ b/uppsrc/plugin/png/lib/pngrtran.c
@@ -0,0 +1,4284 @@
+
+/* pngrtran.c - transforms the data in a row for PNG readers
+ *
+ * Last changed in libpng 1.2.22 [October 13, 2007]
+ * For conditions of distribution and use, see copyright notice in png.h
+ * Copyright (c) 1998-2007 Glenn Randers-Pehrson
+ * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
+ * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
+ *
+ * This file contains functions optionally called by an application
+ * in order to tell libpng how to handle data when reading a PNG.
+ * Transformations that are used in both reading and writing are
+ * in pngtrans.c.
+ */
+
+#define PNG_INTERNAL
+#include "png.h"
+
+#if defined(PNG_READ_SUPPORTED)
+
+/* Set the action on getting a CRC error for an ancillary or critical chunk. */
+void PNGAPI
+png_set_crc_action(png_structp png_ptr, int crit_action, int ancil_action)
+{
+   png_debug(1, "in png_set_crc_action\n");
+   /* Tell libpng how we react to CRC errors in critical chunks */
+   if(png_ptr == NULL) return;
+   switch (crit_action)
+   {
+      case PNG_CRC_NO_CHANGE:                        /* leave setting as is */
+         break;
+      case PNG_CRC_WARN_USE:                               /* warn/use data */
+         png_ptr->flags &= ~PNG_FLAG_CRC_CRITICAL_MASK;
+         png_ptr->flags |= PNG_FLAG_CRC_CRITICAL_USE;
+         break;
+      case PNG_CRC_QUIET_USE:                             /* quiet/use data */
+         png_ptr->flags &= ~PNG_FLAG_CRC_CRITICAL_MASK;
+         png_ptr->flags |= PNG_FLAG_CRC_CRITICAL_USE |
+                           PNG_FLAG_CRC_CRITICAL_IGNORE;
+         break;
+      case PNG_CRC_WARN_DISCARD:    /* not a valid action for critical data */
+         png_warning(png_ptr, "Can't discard critical data on CRC error.");
+      case PNG_CRC_ERROR_QUIT:                                /* error/quit */
+      case PNG_CRC_DEFAULT:
+      default:
+         png_ptr->flags &= ~PNG_FLAG_CRC_CRITICAL_MASK;
+         break;
+   }
+
+   switch (ancil_action)
+   {
+      case PNG_CRC_NO_CHANGE:                       /* leave setting as is */
+         break;
+      case PNG_CRC_WARN_USE:                              /* warn/use data */
+         png_ptr->flags &= ~PNG_FLAG_CRC_ANCILLARY_MASK;
+         png_ptr->flags |= PNG_FLAG_CRC_ANCILLARY_USE;
+         break;
+      case PNG_CRC_QUIET_USE:                            /* quiet/use data */
+         png_ptr->flags &= ~PNG_FLAG_CRC_ANCILLARY_MASK;
+         png_ptr->flags |= PNG_FLAG_CRC_ANCILLARY_USE |
+                           PNG_FLAG_CRC_ANCILLARY_NOWARN;
+         break;
+      case PNG_CRC_ERROR_QUIT:                               /* error/quit */
+         png_ptr->flags &= ~PNG_FLAG_CRC_ANCILLARY_MASK;
+         png_ptr->flags |= PNG_FLAG_CRC_ANCILLARY_NOWARN;
+         break;
+      case PNG_CRC_WARN_DISCARD:                      /* warn/discard data */
+      case PNG_CRC_DEFAULT:
+      default:
+         png_ptr->flags &= ~PNG_FLAG_CRC_ANCILLARY_MASK;
+         break;
+   }
+}
+
+#if defined(PNG_READ_BACKGROUND_SUPPORTED) && \
+    defined(PNG_FLOATING_POINT_SUPPORTED)
+/* handle alpha and tRNS via a background color */
+void PNGAPI
+png_set_background(png_structp png_ptr,
+   png_color_16p background_color, int background_gamma_code,
+   int need_expand, double background_gamma)
+{
+   png_debug(1, "in png_set_background\n");
+   if(png_ptr == NULL) return;
+   if (background_gamma_code == PNG_BACKGROUND_GAMMA_UNKNOWN)
+   {
+      png_warning(png_ptr, "Application must supply a known background gamma");
+      return;
+   }
+
+   png_ptr->transformations |= PNG_BACKGROUND;
+   png_memcpy(&(png_ptr->background), background_color,
+      png_sizeof(png_color_16));
+   png_ptr->background_gamma = (float)background_gamma;
+   png_ptr->background_gamma_type = (png_byte)(background_gamma_code);
+   png_ptr->transformations |= (need_expand ? PNG_BACKGROUND_EXPAND : 0);
+}
+#endif
+
+#if defined(PNG_READ_16_TO_8_SUPPORTED)
+/* strip 16 bit depth files to 8 bit depth */
+void PNGAPI
+png_set_strip_16(png_structp png_ptr)
+{
+   png_debug(1, "in png_set_strip_16\n");
+   if(png_ptr == NULL) return;
+   png_ptr->transformations |= PNG_16_TO_8;
+}
+#endif
+
+#if defined(PNG_READ_STRIP_ALPHA_SUPPORTED)
+void PNGAPI
+png_set_strip_alpha(png_structp png_ptr)
+{
+   png_debug(1, "in png_set_strip_alpha\n");
+   if(png_ptr == NULL) return;
+   png_ptr->flags |= PNG_FLAG_STRIP_ALPHA;
+}
+#endif
+
+#if defined(PNG_READ_DITHER_SUPPORTED)
+/* Dither file to 8 bit.  Supply a palette, the current number
+ * of elements in the palette, the maximum number of elements
+ * allowed, and a histogram if possible.  If the current number
+ * of colors is greater then the maximum number, the palette will be
+ * modified to fit in the maximum number.  "full_dither" indicates
+ * whether we need a dithering cube set up for RGB images, or if we
+ * simply are reducing the number of colors in a paletted image.
+ */
+
+typedef struct png_dsort_struct
+{
+   struct png_dsort_struct FAR * next;
+   png_byte left;
+   png_byte right;
+} png_dsort;
+typedef png_dsort FAR *       png_dsortp;
+typedef png_dsort FAR * FAR * png_dsortpp;
+
+void PNGAPI
+png_set_dither(png_structp png_ptr, png_colorp palette,
+   int num_palette, int maximum_colors, png_uint_16p histogram,
+   int full_dither)
+{
+   png_debug(1, "in png_set_dither\n");
+   if(png_ptr == NULL) return;
+   png_ptr->transformations |= PNG_DITHER;
+
+   if (!full_dither)
+   {
+      int i;
+
+      png_ptr->dither_index = (png_bytep)png_malloc(png_ptr,
+         (png_uint_32)(num_palette * png_sizeof (png_byte)));
+      for (i = 0; i < num_palette; i++)
+         png_ptr->dither_index[i] = (png_byte)i;
+   }
+
+   if (num_palette > maximum_colors)
+   {
+      if (histogram != NULL)
+      {
+         /* This is easy enough, just throw out the least used colors.
+            Perhaps not the best solution, but good enough. */
+
+         int i;
+
+         /* initialize an array to sort colors */
+         png_ptr->dither_sort = (png_bytep)png_malloc(png_ptr,
+            (png_uint_32)(num_palette * png_sizeof (png_byte)));
+
+         /* initialize the dither_sort array */
+         for (i = 0; i < num_palette; i++)
+            png_ptr->dither_sort[i] = (png_byte)i;
+
+         /* Find the least used palette entries by starting a
+            bubble sort, and running it until we have sorted
+            out enough colors.  Note that we don't care about
+            sorting all the colors, just finding which are
+            least used. */
+
+         for (i = num_palette - 1; i >= maximum_colors; i--)
+         {
+            int done; /* to stop early if the list is pre-sorted */
+            int j;
+
+            done = 1;
+            for (j = 0; j < i; j++)
+            {
+               if (histogram[png_ptr->dither_sort[j]]
+                   < histogram[png_ptr->dither_sort[j + 1]])
+               {
+                  png_byte t;
+
+                  t = png_ptr->dither_sort[j];
+                  png_ptr->dither_sort[j] = png_ptr->dither_sort[j + 1];
+                  png_ptr->dither_sort[j + 1] = t;
+                  done = 0;
+               }
+            }
+            if (done)
+               break;
+         }
+
+         /* swap the palette around, and set up a table, if necessary */
+         if (full_dither)
+         {
+            int j = num_palette;
+
+            /* put all the useful colors within the max, but don't
+               move the others */
+            for (i = 0; i < maximum_colors; i++)
+            {
+               if ((int)png_ptr->dither_sort[i] >= maximum_colors)
+               {
+                  do
+                     j--;
+                  while ((int)png_ptr->dither_sort[j] >= maximum_colors);
+                  palette[i] = palette[j];
+               }
+            }
+         }
+         else
+         {
+            int j = num_palette;
+
+            /* move all the used colors inside the max limit, and
+               develop a translation table */
+            for (i = 0; i < maximum_colors; i++)
+            {
+               /* only move the colors we need to */
+               if ((int)png_ptr->dither_sort[i] >= maximum_colors)
+               {
+                  png_color tmp_color;
+
+                  do
+                     j--;
+                  while ((int)png_ptr->dither_sort[j] >= maximum_colors);
+
+                  tmp_color = palette[j];
+                  palette[j] = palette[i];
+                  palette[i] = tmp_color;
+                  /* indicate where the color went */
+                  png_ptr->dither_index[j] = (png_byte)i;
+                  png_ptr->dither_index[i] = (png_byte)j;
+               }
+            }
+
+            /* find closest color for those colors we are not using */
+            for (i = 0; i < num_palette; i++)
+            {
+               if ((int)png_ptr->dither_index[i] >= maximum_colors)
+               {
+                  int min_d, k, min_k, d_index;
+
+                  /* find the closest color to one we threw out */
+                  d_index = png_ptr->dither_index[i];
+                  min_d = PNG_COLOR_DIST(palette[d_index], palette[0]);
+                  for (k = 1, min_k = 0; k < maximum_colors; k++)
+                  {
+                     int d;
+
+                     d = PNG_COLOR_DIST(palette[d_index], palette[k]);
+
+                     if (d < min_d)
+                     {
+                        min_d = d;
+                        min_k = k;
+                     }
+                  }
+                  /* point to closest color */
+                  png_ptr->dither_index[i] = (png_byte)min_k;
+               }
+            }
+         }
+         png_free(png_ptr, png_ptr->dither_sort);
+         png_ptr->dither_sort=NULL;
+      }
+      else
+      {
+         /* This is much harder to do simply (and quickly).  Perhaps
+            we need to go through a median cut routine, but those
+            don't always behave themselves with only a few colors
+            as input.  So we will just find the closest two colors,
+            and throw out one of them (chosen somewhat randomly).
+            [We don't understand this at all, so if someone wants to
+             work on improving it, be our guest - AED, GRP]
+            */
+         int i;
+         int max_d;
+         int num_new_palette;
+         png_dsortp t;
+         png_dsortpp hash;
+
+         t=NULL;
+
+         /* initialize palette index arrays */
+         png_ptr->index_to_palette = (png_bytep)png_malloc(png_ptr,
+            (png_uint_32)(num_palette * png_sizeof (png_byte)));
+         png_ptr->palette_to_index = (png_bytep)png_malloc(png_ptr,
+            (png_uint_32)(num_palette * png_sizeof (png_byte)));
+
+         /* initialize the sort array */
+         for (i = 0; i < num_palette; i++)
+         {
+            png_ptr->index_to_palette[i] = (png_byte)i;
+            png_ptr->palette_to_index[i] = (png_byte)i;
+         }
+
+         hash = (png_dsortpp)png_malloc(png_ptr, (png_uint_32)(769 *
+            png_sizeof (png_dsortp)));
+         for (i = 0; i < 769; i++)
+            hash[i] = NULL;
+/*         png_memset(hash, 0, 769 * png_sizeof (png_dsortp)); */
+
+         num_new_palette = num_palette;
+
+         /* initial wild guess at how far apart the farthest pixel
+            pair we will be eliminating will be.  Larger
+            numbers mean more areas will be allocated, Smaller
+            numbers run the risk of not saving enough data, and
+            having to do this all over again.
+
+            I have not done extensive checking on this number.
+            */
+         max_d = 96;
+
+         while (num_new_palette > maximum_colors)
+         {
+            for (i = 0; i < num_new_palette - 1; i++)
+            {
+               int j;
+
+               for (j = i + 1; j < num_new_palette; j++)
+               {
+                  int d;
+
+                  d = PNG_COLOR_DIST(palette[i], palette[j]);
+
+                  if (d <= max_d)
+                  {
+
+                     t = (png_dsortp)png_malloc_warn(png_ptr,
+                         (png_uint_32)(png_sizeof(png_dsort)));
+                     if (t == NULL)
+                         break;
+                     t->next = hash[d];
+                     t->left = (png_byte)i;
+                     t->right = (png_byte)j;
+                     hash[d] = t;
+                  }
+               }
+               if (t == NULL)
+                  break;
+            }
+
+            if (t != NULL)
+            for (i = 0; i <= max_d; i++)
+            {
+               if (hash[i] != NULL)
+               {
+                  png_dsortp p;
+
+                  for (p = hash[i]; p; p = p->next)
+                  {
+                     if ((int)png_ptr->index_to_palette[p->left]
+                        < num_new_palette &&
+                        (int)png_ptr->index_to_palette[p->right]
+                        < num_new_palette)
+                     {
+                        int j, next_j;
+
+                        if (num_new_palette & 0x01)
+                        {
+                           j = p->left;
+                           next_j = p->right;
+                        }
+                        else
+                        {
+                           j = p->right;
+                           next_j = p->left;
+                        }
+
+                        num_new_palette--;
+                        palette[png_ptr->index_to_palette[j]]
+                          = palette[num_new_palette];
+                        if (!full_dither)
+                        {
+                           int k;
+
+                           for (k = 0; k < num_palette; k++)
+                           {
+                              if (png_ptr->dither_index[k] ==
+                                 png_ptr->index_to_palette[j])
+                                 png_ptr->dither_index[k] =
+                                    png_ptr->index_to_palette[next_j];
+                              if ((int)png_ptr->dither_index[k] ==
+                                 num_new_palette)
+                                 png_ptr->dither_index[k] =
+                                    png_ptr->index_to_palette[j];
+                           }
+                        }
+
+                        png_ptr->index_to_palette[png_ptr->palette_to_index
+                           [num_new_palette]] = png_ptr->index_to_palette[j];
+                        png_ptr->palette_to_index[png_ptr->index_to_palette[j]]
+                           = png_ptr->palette_to_index[num_new_palette];
+
+                        png_ptr->index_to_palette[j] = (png_byte)num_new_palette;
+                        png_ptr->palette_to_index[num_new_palette] = (png_byte)j;
+                     }
+                     if (num_new_palette <= maximum_colors)
+                        break;
+                  }
+                  if (num_new_palette <= maximum_colors)
+                     break;
+               }
+            }
+
+            for (i = 0; i < 769; i++)
+            {
+               if (hash[i] != NULL)
+               {
+                  png_dsortp p = hash[i];
+                  while (p)
+                  {
+                     t = p->next;
+                     png_free(png_ptr, p);
+                     p = t;
+                  }
+               }
+               hash[i] = 0;
+            }
+            max_d += 96;
+         }
+         png_free(png_ptr, hash);
+         png_free(png_ptr, png_ptr->palette_to_index);
+         png_free(png_ptr, png_ptr->index_to_palette);
+         png_ptr->palette_to_index=NULL;
+         png_ptr->index_to_palette=NULL;
+      }
+      num_palette = maximum_colors;
+   }
+   if (png_ptr->palette == NULL)
+   {
+      png_ptr->palette = palette;
+   }
+   png_ptr->num_palette = (png_uint_16)num_palette;
+
+   if (full_dither)
+   {
+      int i;
+      png_bytep distance;
+      int total_bits = PNG_DITHER_RED_BITS + PNG_DITHER_GREEN_BITS +
+         PNG_DITHER_BLUE_BITS;
+      int num_red = (1 << PNG_DITHER_RED_BITS);
+      int num_green = (1 << PNG_DITHER_GREEN_BITS);
+      int num_blue = (1 << PNG_DITHER_BLUE_BITS);
+      png_size_t num_entries = ((png_size_t)1 << total_bits);
+
+      png_ptr->palette_lookup = (png_bytep )png_malloc(png_ptr,
+         (png_uint_32)(num_entries * png_sizeof (png_byte)));
+
+      png_memset(png_ptr->palette_lookup, 0, num_entries *
+         png_sizeof (png_byte));
+
+      distance = (png_bytep)png_malloc(png_ptr, (png_uint_32)(num_entries *
+         png_sizeof(png_byte)));
+
+      png_memset(distance, 0xff, num_entries * png_sizeof(png_byte));
+
+      for (i = 0; i < num_palette; i++)
+      {
+         int ir, ig, ib;
+         int r = (palette[i].red >> (8 - PNG_DITHER_RED_BITS));
+         int g = (palette[i].green >> (8 - PNG_DITHER_GREEN_BITS));
+         int b = (palette[i].blue >> (8 - PNG_DITHER_BLUE_BITS));
+
+         for (ir = 0; ir < num_red; ir++)
+         {
+            /* int dr = abs(ir - r); */
+            int dr = ((ir > r) ? ir - r : r - ir);
+            int index_r = (ir << (PNG_DITHER_BLUE_BITS + PNG_DITHER_GREEN_BITS));
+
+            for (ig = 0; ig < num_green; ig++)
+            {
+               /* int dg = abs(ig - g); */
+               int dg = ((ig > g) ? ig - g : g - ig);
+               int dt = dr + dg;
+               int dm = ((dr > dg) ? dr : dg);
+               int index_g = index_r | (ig << PNG_DITHER_BLUE_BITS);
+
+               for (ib = 0; ib < num_blue; ib++)
+               {
+                  int d_index = index_g | ib;
+                  /* int db = abs(ib - b); */
+                  int db = ((ib > b) ? ib - b : b - ib);
+                  int dmax = ((dm > db) ? dm : db);
+                  int d = dmax + dt + db;
+
+                  if (d < (int)distance[d_index])
+                  {
+                     distance[d_index] = (png_byte)d;
+                     png_ptr->palette_lookup[d_index] = (png_byte)i;
+                  }
+               }
+            }
+         }
+      }
+
+      png_free(png_ptr, distance);
+   }
+}
+#endif
+
+#if defined(PNG_READ_GAMMA_SUPPORTED) && defined(PNG_FLOATING_POINT_SUPPORTED)
+/* Transform the image from the file_gamma to the screen_gamma.  We
+ * only do transformations on images where the file_gamma and screen_gamma
+ * are not close reciprocals, otherwise it slows things down slightly, and
+ * also needlessly introduces small errors.
+ *
+ * We will turn off gamma transformation later if no semitransparent entries
+ * are present in the tRNS array for palette images.  We can't do it here
+ * because we don't necessarily have the tRNS chunk yet.
+ */
+void PNGAPI
+png_set_gamma(png_structp png_ptr, double scrn_gamma, double file_gamma)
+{
+   png_debug(1, "in png_set_gamma\n");
+   if(png_ptr == NULL) return;
+   if ((fabs(scrn_gamma * file_gamma - 1.0) > PNG_GAMMA_THRESHOLD) ||
+       (png_ptr->color_type & PNG_COLOR_MASK_ALPHA) ||
+       (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE))
+     png_ptr->transformations |= PNG_GAMMA;
+   png_ptr->gamma = (float)file_gamma;
+   png_ptr->screen_gamma = (float)scrn_gamma;
+}
+#endif
+
+#if defined(PNG_READ_EXPAND_SUPPORTED)
+/* Expand paletted images to RGB, expand grayscale images of
+ * less than 8-bit depth to 8-bit depth, and expand tRNS chunks
+ * to alpha channels.
+ */
+void PNGAPI
+png_set_expand(png_structp png_ptr)
+{
+   png_debug(1, "in png_set_expand\n");
+   if(png_ptr == NULL) return;
+   png_ptr->transformations |= (PNG_EXPAND | PNG_EXPAND_tRNS);
+#ifdef PNG_WARN_UNINITIALIZED_ROW
+   png_ptr->flags &= ~PNG_FLAG_ROW_INIT;
+#endif
+}
+
+/* GRR 19990627:  the following three functions currently are identical
+ *  to png_set_expand().  However, it is entirely reasonable that someone
+ *  might wish to expand an indexed image to RGB but *not* expand a single,
+ *  fully transparent palette entry to a full alpha channel--perhaps instead
+ *  convert tRNS to the grayscale/RGB format (16-bit RGB value), or replace
+ *  the transparent color with a particular RGB value, or drop tRNS entirely.
+ *  IOW, a future version of the library may make the transformations flag
+ *  a bit more fine-grained, with separate bits for each of these three
+ *  functions.
+ *
+ *  More to the point, these functions make it obvious what libpng will be
+ *  doing, whereas "expand" can (and does) mean any number of things.
+ *
+ *  GRP 20060307: In libpng-1.4.0, png_set_gray_1_2_4_to_8() was modified
+ *  to expand only the sample depth but not to expand the tRNS to alpha.
+ */
+
+/* Expand paletted images to RGB. */
+void PNGAPI
+png_set_palette_to_rgb(png_structp png_ptr)
+{
+   png_debug(1, "in png_set_palette_to_rgb\n");
+   if(png_ptr == NULL) return;
+   png_ptr->transformations |= (PNG_EXPAND | PNG_EXPAND_tRNS);
+#ifdef PNG_WARN_UNINITIALIZED_ROW
+   png_ptr->flags &= ~PNG_FLAG_ROW_INIT;
+#endif
+}
+
+#if !defined(PNG_1_0_X)
+/* Expand grayscale images of less than 8-bit depth to 8 bits. */
+void PNGAPI
+png_set_expand_gray_1_2_4_to_8(png_structp png_ptr)
+{
+   png_debug(1, "in png_set_expand_gray_1_2_4_to_8\n");
+   if(png_ptr == NULL) return;
+   png_ptr->transformations |= PNG_EXPAND;
+#ifdef PNG_WARN_UNINITIALIZED_ROW
+   png_ptr->flags &= ~PNG_FLAG_ROW_INIT;
+#endif
+}
+#endif
+
+#if defined(PNG_1_0_X) || defined(PNG_1_2_X)
+/* Expand grayscale images of less than 8-bit depth to 8 bits. */
+/* Deprecated as of libpng-1.2.9 */
+void PNGAPI
+png_set_gray_1_2_4_to_8(png_structp png_ptr)
+{
+   png_debug(1, "in png_set_gray_1_2_4_to_8\n");
+   if(png_ptr == NULL) return;
+   png_ptr->transformations |= (PNG_EXPAND | PNG_EXPAND_tRNS);
+}
+#endif
+
+
+/* Expand tRNS chunks to alpha channels. */
+void PNGAPI
+png_set_tRNS_to_alpha(png_structp png_ptr)
+{
+   png_debug(1, "in png_set_tRNS_to_alpha\n");
+   png_ptr->transformations |= (PNG_EXPAND | PNG_EXPAND_tRNS);
+#ifdef PNG_WARN_UNINITIALIZED_ROW
+   png_ptr->flags &= ~PNG_FLAG_ROW_INIT;
+#endif
+}
+#endif /* defined(PNG_READ_EXPAND_SUPPORTED) */
+
+#if defined(PNG_READ_GRAY_TO_RGB_SUPPORTED)
+void PNGAPI
+png_set_gray_to_rgb(png_structp png_ptr)
+{
+   png_debug(1, "in png_set_gray_to_rgb\n");
+   png_ptr->transformations |= PNG_GRAY_TO_RGB;
+#ifdef PNG_WARN_UNINITIALIZED_ROW
+   png_ptr->flags &= ~PNG_FLAG_ROW_INIT;
+#endif
+}
+#endif
+
+#if defined(PNG_READ_RGB_TO_GRAY_SUPPORTED)
+#if defined(PNG_FLOATING_POINT_SUPPORTED)
+/* Convert a RGB image to a grayscale of the same width.  This allows us,
+ * for example, to convert a 24 bpp RGB image into an 8 bpp grayscale image.
+ */
+
+void PNGAPI
+png_set_rgb_to_gray(png_structp png_ptr, int error_action, double red,
+   double green)
+{
+      int red_fixed = (int)((float)red*100000.0 + 0.5);
+      int green_fixed = (int)((float)green*100000.0 + 0.5);
+      if(png_ptr == NULL) return;
+      png_set_rgb_to_gray_fixed(png_ptr, error_action, red_fixed, green_fixed);
+}
+#endif
+
+void PNGAPI
+png_set_rgb_to_gray_fixed(png_structp png_ptr, int error_action,
+   png_fixed_point red, png_fixed_point green)
+{
+   png_debug(1, "in png_set_rgb_to_gray\n");
+   if(png_ptr == NULL) return;
+   switch(error_action)
+   {
+      case 1: png_ptr->transformations |= PNG_RGB_TO_GRAY;
+              break;
+      case 2: png_ptr->transformations |= PNG_RGB_TO_GRAY_WARN;
+              break;
+      case 3: png_ptr->transformations |= PNG_RGB_TO_GRAY_ERR;
+   }
+   if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
+#if defined(PNG_READ_EXPAND_SUPPORTED)
+      png_ptr->transformations |= PNG_EXPAND;
+#else
+   {
+      png_warning(png_ptr, "Cannot do RGB_TO_GRAY without EXPAND_SUPPORTED.");
+      png_ptr->transformations &= ~PNG_RGB_TO_GRAY;
+   }
+#endif
+   {
+      png_uint_16 red_int, green_int;
+      if(red < 0 || green < 0)
+      {
+         red_int   =  6968; /* .212671 * 32768 + .5 */
+         green_int = 23434; /* .715160 * 32768 + .5 */
+      }
+      else if(red + green < 100000L)
+      {
+        red_int = (png_uint_16)(((png_uint_32)red*32768L)/100000L);
+        green_int = (png_uint_16)(((png_uint_32)green*32768L)/100000L);
+      }
+      else
+      {
+         png_warning(png_ptr, "ignoring out of range rgb_to_gray coefficients");
+         red_int   =  6968;
+         green_int = 23434;
+      }
+      png_ptr->rgb_to_gray_red_coeff   = red_int;
+      png_ptr->rgb_to_gray_green_coeff = green_int;
+      png_ptr->rgb_to_gray_blue_coeff  = (png_uint_16)(32768-red_int-green_int);
+   }
+}
+#endif
+
+#if defined(PNG_READ_USER_TRANSFORM_SUPPORTED) || \
+    defined(PNG_WRITE_USER_TRANSFORM_SUPPORTED) || \
+    defined(PNG_LEGACY_SUPPORTED)
+void PNGAPI
+png_set_read_user_transform_fn(png_structp png_ptr, png_user_transform_ptr
+   read_user_transform_fn)
+{
+   png_debug(1, "in png_set_read_user_transform_fn\n");
+   if(png_ptr == NULL) return;
+#if defined(PNG_READ_USER_TRANSFORM_SUPPORTED)
+   png_ptr->transformations |= PNG_USER_TRANSFORM;
+   png_ptr->read_user_transform_fn = read_user_transform_fn;
+#endif
+#ifdef PNG_LEGACY_SUPPORTED
+   if(read_user_transform_fn)
+      png_warning(png_ptr,
+        "This version of libpng does not support user transforms");
+#endif
+}
+#endif
+
+/* Initialize everything needed for the read.  This includes modifying
+ * the palette.
+ */
+void /* PRIVATE */
+png_init_read_transformations(png_structp png_ptr)
+{
+   png_debug(1, "in png_init_read_transformations\n");
+#if defined(PNG_USELESS_TESTS_SUPPORTED)
+   if(png_ptr != NULL)
+#endif
+  {
+#if defined(PNG_READ_BACKGROUND_SUPPORTED) || defined(PNG_READ_SHIFT_SUPPORTED) \
+ || defined(PNG_READ_GAMMA_SUPPORTED)
+   int color_type = png_ptr->color_type;
+#endif
+
+#if defined(PNG_READ_EXPAND_SUPPORTED) && defined(PNG_READ_BACKGROUND_SUPPORTED)
+
+#if defined(PNG_READ_GRAY_TO_RGB_SUPPORTED)
+   /* Detect gray background and attempt to enable optimization
+    * for gray --> RGB case */
+   /* Note:  if PNG_BACKGROUND_EXPAND is set and color_type is either RGB or
+    * RGB_ALPHA (in which case need_expand is superfluous anyway), the
+    * background color might actually be gray yet not be flagged as such.
+    * This is not a problem for the current code, which uses
+    * PNG_BACKGROUND_IS_GRAY only to decide when to do the
+    * png_do_gray_to_rgb() transformation.
+    */
+   if ((png_ptr->transformations & PNG_BACKGROUND_EXPAND) &&
+       !(color_type & PNG_COLOR_MASK_COLOR))
+   {
+          png_ptr->mode |= PNG_BACKGROUND_IS_GRAY;
+   } else if ((png_ptr->transformations & PNG_BACKGROUND) &&
+              !(png_ptr->transformations & PNG_BACKGROUND_EXPAND) &&
+              (png_ptr->transformations & PNG_GRAY_TO_RGB) &&
+              png_ptr->background.red == png_ptr->background.green &&
+              png_ptr->background.red == png_ptr->background.blue)
+   {
+          png_ptr->mode |= PNG_BACKGROUND_IS_GRAY;
+          png_ptr->background.gray = png_ptr->background.red;
+   }
+#endif
+
+   if ((png_ptr->transformations & PNG_BACKGROUND_EXPAND) &&
+       (png_ptr->transformations & PNG_EXPAND))
+   {
+      if (!(color_type & PNG_COLOR_MASK_COLOR))  /* i.e., GRAY or GRAY_ALPHA */
+      {
+         /* expand background and tRNS chunks */
+         switch (png_ptr->bit_depth)
+         {
+            case 1:
+               png_ptr->background.gray *= (png_uint_16)0xff;
+               png_ptr->background.red = png_ptr->background.green
+                 =  png_ptr->background.blue = png_ptr->background.gray;
+               if (!(png_ptr->transformations & PNG_EXPAND_tRNS))
+               {
+                 png_ptr->trans_values.gray *= (png_uint_16)0xff;
+                 png_ptr->trans_values.red = png_ptr->trans_values.green
+                   = png_ptr->trans_values.blue = png_ptr->trans_values.gray;
+               }
+               break;
+            case 2:
+               png_ptr->background.gray *= (png_uint_16)0x55;
+               png_ptr->background.red = png_ptr->background.green
+                 = png_ptr->background.blue = png_ptr->background.gray;
+               if (!(png_ptr->transformations & PNG_EXPAND_tRNS))
+               {
+                 png_ptr->trans_values.gray *= (png_uint_16)0x55;
+                 png_ptr->trans_values.red = png_ptr->trans_values.green
+                   = png_ptr->trans_values.blue = png_ptr->trans_values.gray;
+               }
+               break;
+            case 4:
+               png_ptr->background.gray *= (png_uint_16)0x11;
+               png_ptr->background.red = png_ptr->background.green
+                 = png_ptr->background.blue = png_ptr->background.gray;
+               if (!(png_ptr->transformations & PNG_EXPAND_tRNS))
+               {
+                 png_ptr->trans_values.gray *= (png_uint_16)0x11;
+                 png_ptr->trans_values.red = png_ptr->trans_values.green
+                   = png_ptr->trans_values.blue = png_ptr->trans_values.gray;
+               }
+               break;
+            case 8:
+            case 16:
+               png_ptr->background.red = png_ptr->background.green
+                 = png_ptr->background.blue = png_ptr->background.gray;
+               break;
+         }
+      }
+      else if (color_type == PNG_COLOR_TYPE_PALETTE)
+      {
+         png_ptr->background.red   =
+            png_ptr->palette[png_ptr->background.index].red;
+         png_ptr->background.green =
+            png_ptr->palette[png_ptr->background.index].green;
+         png_ptr->background.blue  =
+            png_ptr->palette[png_ptr->background.index].blue;
+
+#if defined(PNG_READ_INVERT_ALPHA_SUPPORTED)
+        if (png_ptr->transformations & PNG_INVERT_ALPHA)
+        {
+#if defined(PNG_READ_EXPAND_SUPPORTED)
+           if (!(png_ptr->transformations & PNG_EXPAND_tRNS))
+#endif
+           {
+           /* invert the alpha channel (in tRNS) unless the pixels are
+              going to be expanded, in which case leave it for later */
+              int i,istop;
+              istop=(int)png_ptr->num_trans;
+              for (i=0; i<istop; i++)
+                 png_ptr->trans[i] = (png_byte)(255 - png_ptr->trans[i]);
+           }
+        }
+#endif
+
+      }
+   }
+#endif
+
+#if defined(PNG_READ_BACKGROUND_SUPPORTED) && defined(PNG_READ_GAMMA_SUPPORTED)
+   png_ptr->background_1 = png_ptr->background;
+#endif
+#if defined(PNG_READ_GAMMA_SUPPORTED) && defined(PNG_FLOATING_POINT_SUPPORTED)
+
+   if ((color_type == PNG_COLOR_TYPE_PALETTE && png_ptr->num_trans != 0)
+       && (fabs(png_ptr->screen_gamma * png_ptr->gamma - 1.0)
+         < PNG_GAMMA_THRESHOLD))
+   {
+    int i,k;
+    k=0;
+    for (i=0; i<png_ptr->num_trans; i++)
+    {
+      if (png_ptr->trans[i] != 0 && png_ptr->trans[i] != 0xff)
+        k=1; /* partial transparency is present */
+    }
+    if (k == 0)
+      png_ptr->transformations &= ~PNG_GAMMA;
+   }
+
+   if ((png_ptr->transformations & (PNG_GAMMA | PNG_RGB_TO_GRAY)) &&
+        png_ptr->gamma != 0.0)
+   {
+      png_build_gamma_table(png_ptr);
+#if defined(PNG_READ_BACKGROUND_SUPPORTED)
+      if (png_ptr->transformations & PNG_BACKGROUND)
+      {
+         if (color_type == PNG_COLOR_TYPE_PALETTE)
+         {
+           /* could skip if no transparency and
+           */
+            png_color back, back_1;
+            png_colorp palette = png_ptr->palette;
+            int num_palette = png_ptr->num_palette;
+            int i;
+            if (png_ptr->background_gamma_type == PNG_BACKGROUND_GAMMA_FILE)
+            {
+               back.red = png_ptr->gamma_table[png_ptr->background.red];
+               back.green = png_ptr->gamma_table[png_ptr->background.green];
+               back.blue = png_ptr->gamma_table[png_ptr->background.blue];
+
+               back_1.red = png_ptr->gamma_to_1[png_ptr->background.red];
+               back_1.green = png_ptr->gamma_to_1[png_ptr->background.green];
+               back_1.blue = png_ptr->gamma_to_1[png_ptr->background.blue];
+            }
+            else
+            {
+               double g, gs;
+
+               switch (png_ptr->background_gamma_type)
+               {
+                  case PNG_BACKGROUND_GAMMA_SCREEN:
+                     g = (png_ptr->screen_gamma);
+                     gs = 1.0;
+                     break;
+                  case PNG_BACKGROUND_GAMMA_FILE:
+                     g = 1.0 / (png_ptr->gamma);
+                     gs = 1.0 / (png_ptr->gamma * png_ptr->screen_gamma);
+                     break;
+                  case PNG_BACKGROUND_GAMMA_UNIQUE:
+                     g = 1.0 / (png_ptr->background_gamma);
+                     gs = 1.0 / (png_ptr->background_gamma *
+                                 png_ptr->screen_gamma);
+                     break;
+                  default:
+                     g = 1.0;    /* back_1 */
+                     gs = 1.0;   /* back */
+               }
+
+               if ( fabs(gs - 1.0) < PNG_GAMMA_THRESHOLD)
+               {
+                  back.red   = (png_byte)png_ptr->background.red;
+                  back.green = (png_byte)png_ptr->background.green;
+                  back.blue  = (png_byte)png_ptr->background.blue;
+               }
+               else
+               {
+                  back.red = (png_byte)(pow(
+                     (double)png_ptr->background.red/255, gs) * 255.0 + .5);
+                  back.green = (png_byte)(pow(
+                     (double)png_ptr->background.green/255, gs) * 255.0 + .5);
+                  back.blue = (png_byte)(pow(
+                     (double)png_ptr->background.blue/255, gs) * 255.0 + .5);
+               }
+
+               back_1.red = (png_byte)(pow(
+                  (double)png_ptr->background.red/255, g) * 255.0 + .5);
+               back_1.green = (png_byte)(pow(
+                  (double)png_ptr->background.green/255, g) * 255.0 + .5);
+               back_1.blue = (png_byte)(pow(
+                  (double)png_ptr->background.blue/255, g) * 255.0 + .5);
+            }
+            for (i = 0; i < num_palette; i++)
+            {
+               if (i < (int)png_ptr->num_trans && png_ptr->trans[i] != 0xff)
+               {
+                  if (png_ptr->trans[i] == 0)
+                  {
+                     palette[i] = back;
+                  }
+                  else /* if (png_ptr->trans[i] != 0xff) */
+                  {
+                     png_byte v, w;
+
+                     v = png_ptr->gamma_to_1[palette[i].red];
+                     png_composite(w, v, png_ptr->trans[i], back_1.red);
+                     palette[i].red = png_ptr->gamma_from_1[w];
+
+                     v = png_ptr->gamma_to_1[palette[i].green];
+                     png_composite(w, v, png_ptr->trans[i], back_1.green);
+                     palette[i].green = png_ptr->gamma_from_1[w];
+
+                     v = png_ptr->gamma_to_1[palette[i].blue];
+                     png_composite(w, v, png_ptr->trans[i], back_1.blue);
+                     palette[i].blue = png_ptr->gamma_from_1[w];
+                  }
+               }
+               else
+               {
+                  palette[i].red = png_ptr->gamma_table[palette[i].red];
+                  palette[i].green = png_ptr->gamma_table[palette[i].green];
+                  palette[i].blue = png_ptr->gamma_table[palette[i].blue];
+               }
+            }
+         }
+         /* if (png_ptr->background_gamma_type!=PNG_BACKGROUND_GAMMA_UNKNOWN) */
+         else
+         /* color_type != PNG_COLOR_TYPE_PALETTE */
+         {
+            double m = (double)(((png_uint_32)1 << png_ptr->bit_depth) - 1);
+            double g = 1.0;
+            double gs = 1.0;
+
+            switch (png_ptr->background_gamma_type)
+            {
+               case PNG_BACKGROUND_GAMMA_SCREEN:
+                  g = (png_ptr->screen_gamma);
+                  gs = 1.0;
+                  break;
+               case PNG_BACKGROUND_GAMMA_FILE:
+                  g = 1.0 / (png_ptr->gamma);
+                  gs = 1.0 / (png_ptr->gamma * png_ptr->screen_gamma);
+                  break;
+               case PNG_BACKGROUND_GAMMA_UNIQUE:
+                  g = 1.0 / (png_ptr->background_gamma);
+                  gs = 1.0 / (png_ptr->background_gamma *
+                     png_ptr->screen_gamma);
+                  break;
+            }
+
+            png_ptr->background_1.gray = (png_uint_16)(pow(
+               (double)png_ptr->background.gray / m, g) * m + .5);
+            png_ptr->background.gray = (png_uint_16)(pow(
+               (double)png_ptr->background.gray / m, gs) * m + .5);
+
+            if ((png_ptr->background.red != png_ptr->background.green) ||
+                (png_ptr->background.red != png_ptr->background.blue) ||
+                (png_ptr->background.red != png_ptr->background.gray))
+            {
+               /* RGB or RGBA with color background */
+               png_ptr->background_1.red = (png_uint_16)(pow(
+                  (double)png_ptr->background.red / m, g) * m + .5);
+               png_ptr->background_1.green = (png_uint_16)(pow(
+                  (double)png_ptr->background.green / m, g) * m + .5);
+               png_ptr->background_1.blue = (png_uint_16)(pow(
+                  (double)png_ptr->background.blue / m, g) * m + .5);
+               png_ptr->background.red = (png_uint_16)(pow(
+                  (double)png_ptr->background.red / m, gs) * m + .5);
+               png_ptr->background.green = (png_uint_16)(pow(
+                  (double)png_ptr->background.green / m, gs) * m + .5);
+               png_ptr->background.blue = (png_uint_16)(pow(
+                  (double)png_ptr->background.blue / m, gs) * m + .5);
+            }
+            else
+            {
+               /* GRAY, GRAY ALPHA, RGB, or RGBA with gray background */
+               png_ptr->background_1.red = png_ptr->background_1.green
+                 = png_ptr->background_1.blue = png_ptr->background_1.gray;
+               png_ptr->background.red = png_ptr->background.green
+                 = png_ptr->background.blue = png_ptr->background.gray;
+            }
+         }
+      }
+      else
+      /* transformation does not include PNG_BACKGROUND */
+#endif /* PNG_READ_BACKGROUND_SUPPORTED */
+      if (color_type == PNG_COLOR_TYPE_PALETTE)
+      {
+         png_colorp palette = png_ptr->palette;
+         int num_palette = png_ptr->num_palette;
+         int i;
+
+         for (i = 0; i < num_palette; i++)
+         {
+            palette[i].red = png_ptr->gamma_table[palette[i].red];
+            palette[i].green = png_ptr->gamma_table[palette[i].green];
+            palette[i].blue = png_ptr->gamma_table[palette[i].blue];
+         }
+      }
+   }
+#if defined(PNG_READ_BACKGROUND_SUPPORTED)
+   else
+#endif
+#endif /* PNG_READ_GAMMA_SUPPORTED && PNG_FLOATING_POINT_SUPPORTED */
+#if defined(PNG_READ_BACKGROUND_SUPPORTED)
+   /* No GAMMA transformation */
+   if ((png_ptr->transformations & PNG_BACKGROUND) &&
+       (color_type == PNG_COLOR_TYPE_PALETTE))
+   {
+      int i;
+      int istop = (int)png_ptr->num_trans;
+      png_color back;
+      png_colorp palette = png_ptr->palette;
+
+      back.red   = (png_byte)png_ptr->background.red;
+      back.green = (png_byte)png_ptr->background.green;
+      back.blue  = (png_byte)png_ptr->background.blue;
+
+      for (i = 0; i < istop; i++)
+      {
+         if (png_ptr->trans[i] == 0)
+         {
+            palette[i] = back;
+         }
+         else if (png_ptr->trans[i] != 0xff)
+         {
+            /* The png_composite() macro is defined in png.h */
+            png_composite(palette[i].red, palette[i].red,
+               png_ptr->trans[i], back.red);
+            png_composite(palette[i].green, palette[i].green,
+               png_ptr->trans[i], back.green);
+            png_composite(palette[i].blue, palette[i].blue,
+               png_ptr->trans[i], back.blue);
+         }
+      }
+   }
+#endif /* PNG_READ_BACKGROUND_SUPPORTED */
+
+#if defined(PNG_READ_SHIFT_SUPPORTED)
+   if ((png_ptr->transformations & PNG_SHIFT) &&
+      (color_type == PNG_COLOR_TYPE_PALETTE))
+   {
+      png_uint_16 i;
+      png_uint_16 istop = png_ptr->num_palette;
+      int sr = 8 - png_ptr->sig_bit.red;
+      int sg = 8 - png_ptr->sig_bit.green;
+      int sb = 8 - png_ptr->sig_bit.blue;
+
+      if (sr < 0 || sr > 8)
+         sr = 0;
+      if (sg < 0 || sg > 8)
+         sg = 0;
+      if (sb < 0 || sb > 8)
+         sb = 0;
+      for (i = 0; i < istop; i++)
+      {
+         png_ptr->palette[i].red >>= sr;
+         png_ptr->palette[i].green >>= sg;
+         png_ptr->palette[i].blue >>= sb;
+      }
+   }
+#endif  /* PNG_READ_SHIFT_SUPPORTED */
+ }
+#if !defined(PNG_READ_GAMMA_SUPPORTED) && !defined(PNG_READ_SHIFT_SUPPORTED) \
+ && !defined(PNG_READ_BACKGROUND_SUPPORTED)
+   if(png_ptr)
+      return;
+#endif
+}
+
+/* Modify the info structure to reflect the transformations.  The
+ * info should be updated so a PNG file could be written with it,
+ * assuming the transformations result in valid PNG data.
+ */
+void /* PRIVATE */
+png_read_transform_info(png_structp png_ptr, png_infop info_ptr)
+{
+   png_debug(1, "in png_read_transform_info\n");
+#if defined(PNG_READ_EXPAND_SUPPORTED)
+   if (png_ptr->transformations & PNG_EXPAND)
+   {
+      if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
+      {
+         if (png_ptr->num_trans && (png_ptr->transformations & PNG_EXPAND_tRNS))
+            info_ptr->color_type = PNG_COLOR_TYPE_RGB_ALPHA;
+         else
+            info_ptr->color_type = PNG_COLOR_TYPE_RGB;
+         info_ptr->bit_depth = 8;
+         info_ptr->num_trans = 0;
+      }
+      else
+      {
+         if (png_ptr->num_trans)
+         {
+            if (png_ptr->transformations & PNG_EXPAND_tRNS)
+              info_ptr->color_type |= PNG_COLOR_MASK_ALPHA;
+            else
+              info_ptr->color_type |= PNG_COLOR_MASK_COLOR;
+         }
+         if (info_ptr->bit_depth < 8)
+            info_ptr->bit_depth = 8;
+         info_ptr->num_trans = 0;
+      }
+   }
+#endif
+
+#if defined(PNG_READ_BACKGROUND_SUPPORTED)
+   if (png_ptr->transformations & PNG_BACKGROUND)
+   {
+      info_ptr->color_type &= ~PNG_COLOR_MASK_ALPHA;
+      info_ptr->num_trans = 0;
+      info_ptr->background = png_ptr->background;
+   }
+#endif
+
+#if defined(PNG_READ_GAMMA_SUPPORTED)
+   if (png_ptr->transformations & PNG_GAMMA)
+   {
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+      info_ptr->gamma = png_ptr->gamma;
+#endif
+#ifdef PNG_FIXED_POINT_SUPPORTED
+      info_ptr->int_gamma = png_ptr->int_gamma;
+#endif
+   }
+#endif
+
+#if defined(PNG_READ_16_TO_8_SUPPORTED)
+   if ((png_ptr->transformations & PNG_16_TO_8) && (info_ptr->bit_depth == 16))
+      info_ptr->bit_depth = 8;
+#endif
+
+#if defined(PNG_READ_GRAY_TO_RGB_SUPPORTED)
+   if (png_ptr->transformations & PNG_GRAY_TO_RGB)
+      info_ptr->color_type |= PNG_COLOR_MASK_COLOR;
+#endif
+
+#if defined(PNG_READ_RGB_TO_GRAY_SUPPORTED)
+   if (png_ptr->transformations & PNG_RGB_TO_GRAY)
+      info_ptr->color_type &= ~PNG_COLOR_MASK_COLOR;
+#endif
+
+#if defined(PNG_READ_DITHER_SUPPORTED)
+   if (png_ptr->transformations & PNG_DITHER)
+   {
+      if (((info_ptr->color_type == PNG_COLOR_TYPE_RGB) ||
+         (info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA)) &&
+         png_ptr->palette_lookup && info_ptr->bit_depth == 8)
+      {
+         info_ptr->color_type = PNG_COLOR_TYPE_PALETTE;
+      }
+   }
+#endif
+
+#if defined(PNG_READ_PACK_SUPPORTED)
+   if ((png_ptr->transformations & PNG_PACK) && (info_ptr->bit_depth < 8))
+      info_ptr->bit_depth = 8;
+#endif
+
+   if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
+      info_ptr->channels = 1;
+   else if (info_ptr->color_type & PNG_COLOR_MASK_COLOR)
+      info_ptr->channels = 3;
+   else
+      info_ptr->channels = 1;
+
+#if defined(PNG_READ_STRIP_ALPHA_SUPPORTED)
+   if (png_ptr->flags & PNG_FLAG_STRIP_ALPHA)
+      info_ptr->color_type &= ~PNG_COLOR_MASK_ALPHA;
+#endif
+
+   if (info_ptr->color_type & PNG_COLOR_MASK_ALPHA)
+      info_ptr->channels++;
+
+#if defined(PNG_READ_FILLER_SUPPORTED)
+   /* STRIP_ALPHA and FILLER allowed:  MASK_ALPHA bit stripped above */
+   if ((png_ptr->transformations & PNG_FILLER) &&
+       ((info_ptr->color_type == PNG_COLOR_TYPE_RGB) ||
+       (info_ptr->color_type == PNG_COLOR_TYPE_GRAY)))
+   {
+      info_ptr->channels++;
+      /* if adding a true alpha channel not just filler */
+#if !defined(PNG_1_0_X)
+      if (png_ptr->transformations & PNG_ADD_ALPHA)
+        info_ptr->color_type |= PNG_COLOR_MASK_ALPHA;
+#endif
+   }
+#endif
+
+#if defined(PNG_USER_TRANSFORM_PTR_SUPPORTED) && \
+defined(PNG_READ_USER_TRANSFORM_SUPPORTED)
+   if(png_ptr->transformations & PNG_USER_TRANSFORM)
+     {
+       if(info_ptr->bit_depth < png_ptr->user_transform_depth)
+         info_ptr->bit_depth = png_ptr->user_transform_depth;
+       if(info_ptr->channels < png_ptr->user_transform_channels)
+         info_ptr->channels = png_ptr->user_transform_channels;
+     }
+#endif
+
+   info_ptr->pixel_depth = (png_byte)(info_ptr->channels *
+      info_ptr->bit_depth);
+
+   info_ptr->rowbytes = PNG_ROWBYTES(info_ptr->pixel_depth,info_ptr->width);
+
+#if !defined(PNG_READ_EXPAND_SUPPORTED)
+   if(png_ptr)
+      return;
+#endif
+}
+
+/* Transform the row.  The order of transformations is significant,
+ * and is very touchy.  If you add a transformation, take care to
+ * decide how it fits in with the other transformations here.
+ */
+void /* PRIVATE */
+png_do_read_transformations(png_structp png_ptr)
+{
+   png_debug(1, "in png_do_read_transformations\n");
+   if (png_ptr->row_buf == NULL)
+   {
+#if !defined(PNG_NO_STDIO) && !defined(_WIN32_WCE)
+      char msg[50];
+
+      png_snprintf2(msg, 50,
+         "NULL row buffer for row %ld, pass %d", png_ptr->row_number,
+         png_ptr->pass);
+      png_error(png_ptr, msg);
+#else
+      png_error(png_ptr, "NULL row buffer");
+#endif
+   }
+#ifdef PNG_WARN_UNINITIALIZED_ROW
+   if (!(png_ptr->flags & PNG_FLAG_ROW_INIT))
+      /* Application has failed to call either png_read_start_image()
+       * or png_read_update_info() after setting transforms that expand
+       * pixels.  This check added to libpng-1.2.19 */
+#if (PNG_WARN_UNINITIALIZED_ROW==1)
+      png_error(png_ptr, "Uninitialized row");
+#else
+      png_warning(png_ptr, "Uninitialized row");
+#endif
+#endif
+
+#if defined(PNG_READ_EXPAND_SUPPORTED)
+   if (png_ptr->transformations & PNG_EXPAND)
+   {
+      if (png_ptr->row_info.color_type == PNG_COLOR_TYPE_PALETTE)
+      {
+         png_do_expand_palette(&(png_ptr->row_info), png_ptr->row_buf + 1,
+            png_ptr->palette, png_ptr->trans, png_ptr->num_trans);
+      }
+      else
+      {
+         if (png_ptr->num_trans &&
+             (png_ptr->transformations & PNG_EXPAND_tRNS))
+            png_do_expand(&(png_ptr->row_info), png_ptr->row_buf + 1,
+               &(png_ptr->trans_values));
+         else
+            png_do_expand(&(png_ptr->row_info), png_ptr->row_buf + 1,
+               NULL);
+      }
+   }
+#endif
+
+#if defined(PNG_READ_STRIP_ALPHA_SUPPORTED)
+   if (png_ptr->flags & PNG_FLAG_STRIP_ALPHA)
+      png_do_strip_filler(&(png_ptr->row_info), png_ptr->row_buf + 1,
+         PNG_FLAG_FILLER_AFTER | (png_ptr->flags & PNG_FLAG_STRIP_ALPHA));
+#endif
+
+#if defined(PNG_READ_RGB_TO_GRAY_SUPPORTED)
+   if (png_ptr->transformations & PNG_RGB_TO_GRAY)
+   {
+      int rgb_error =
+         png_do_rgb_to_gray(png_ptr, &(png_ptr->row_info), png_ptr->row_buf + 1);
+      if(rgb_error)
+      {
+         png_ptr->rgb_to_gray_status=1;
+         if((png_ptr->transformations & PNG_RGB_TO_GRAY) ==
+             PNG_RGB_TO_GRAY_WARN)
+            png_warning(png_ptr, "png_do_rgb_to_gray found nongray pixel");
+         if((png_ptr->transformations & PNG_RGB_TO_GRAY) ==
+             PNG_RGB_TO_GRAY_ERR)
+            png_error(png_ptr, "png_do_rgb_to_gray found nongray pixel");
+      }
+   }
+#endif
+
+/*
+From Andreas Dilger e-mail to png-implement, 26 March 1998:
+
+  In most cases, the "simple transparency" should be done prior to doing
+  gray-to-RGB, or you will have to test 3x as many bytes to check if a
+  pixel is transparent.  You would also need to make sure that the
+  transparency information is upgraded to RGB.
+
+  To summarize, the current flow is:
+  - Gray + simple transparency -> compare 1 or 2 gray bytes and composite
+                                  with background "in place" if transparent,
+                                  convert to RGB if necessary
+  - Gray + alpha -> composite with gray background and remove alpha bytes,
+                                  convert to RGB if necessary
+
+  To support RGB backgrounds for gray images we need:
+  - Gray + simple transparency -> convert to RGB + simple transparency, compare
+                                  3 or 6 bytes and composite with background
+                                  "in place" if transparent (3x compare/pixel
+                                  compared to doing composite with gray bkgrnd)
+  - Gray + alpha -> convert to RGB + alpha, composite with background and
+                                  remove alpha bytes (3x float operations/pixel
+                                  compared with composite on gray background)
+
+  Greg's change will do this.  The reason it wasn't done before is for
+  performance, as this increases the per-pixel operations.  If we would check
+  in advance if the background was gray or RGB, and position the gray-to-RGB
+  transform appropriately, then it would save a lot of work/time.
+ */
+
+#if defined(PNG_READ_GRAY_TO_RGB_SUPPORTED)
+   /* if gray -> RGB, do so now only if background is non-gray; else do later
+    * for performance reasons */
+   if ((png_ptr->transformations & PNG_GRAY_TO_RGB) &&
+       !(png_ptr->mode & PNG_BACKGROUND_IS_GRAY))
+      png_do_gray_to_rgb(&(png_ptr->row_info), png_ptr->row_buf + 1);
+#endif
+
+#if defined(PNG_READ_BACKGROUND_SUPPORTED)
+   if ((png_ptr->transformations & PNG_BACKGROUND) &&
+      ((png_ptr->num_trans != 0 ) ||
+      (png_ptr->color_type & PNG_COLOR_MASK_ALPHA)))
+      png_do_background(&(png_ptr->row_info), png_ptr->row_buf + 1,
+         &(png_ptr->trans_values), &(png_ptr->background)
+#if defined(PNG_READ_GAMMA_SUPPORTED)
+         , &(png_ptr->background_1),
+         png_ptr->gamma_table, png_ptr->gamma_from_1,
+         png_ptr->gamma_to_1, png_ptr->gamma_16_table,
+         png_ptr->gamma_16_from_1, png_ptr->gamma_16_to_1,
+         png_ptr->gamma_shift
+#endif
+);
+#endif
+
+#if defined(PNG_READ_GAMMA_SUPPORTED)
+   if ((png_ptr->transformations & PNG_GAMMA) &&
+#if defined(PNG_READ_BACKGROUND_SUPPORTED)
+      !((png_ptr->transformations & PNG_BACKGROUND) &&
+      ((png_ptr->num_trans != 0) ||
+      (png_ptr->color_type & PNG_COLOR_MASK_ALPHA))) &&
+#endif
+      (png_ptr->color_type != PNG_COLOR_TYPE_PALETTE))
+      png_do_gamma(&(png_ptr->row_info), png_ptr->row_buf + 1,
+         png_ptr->gamma_table, png_ptr->gamma_16_table,
+         png_ptr->gamma_shift);
+#endif
+
+#if defined(PNG_READ_16_TO_8_SUPPORTED)
+   if (png_ptr->transformations & PNG_16_TO_8)
+      png_do_chop(&(png_ptr->row_info), png_ptr->row_buf + 1);
+#endif
+
+#if defined(PNG_READ_DITHER_SUPPORTED)
+   if (png_ptr->transformations & PNG_DITHER)
+   {
+      png_do_dither((png_row_infop)&(png_ptr->row_info), png_ptr->row_buf + 1,
+         png_ptr->palette_lookup, png_ptr->dither_index);
+      if(png_ptr->row_info.rowbytes == (png_uint_32)0)
+         png_error(png_ptr, "png_do_dither returned rowbytes=0");
+   }
+#endif
+
+#if defined(PNG_READ_INVERT_SUPPORTED)
+   if (png_ptr->transformations & PNG_INVERT_MONO)
+      png_do_invert(&(png_ptr->row_info), png_ptr->row_buf + 1);
+#endif
+
+#if defined(PNG_READ_SHIFT_SUPPORTED)
+   if (png_ptr->transformations & PNG_SHIFT)
+      png_do_unshift(&(png_ptr->row_info), png_ptr->row_buf + 1,
+         &(png_ptr->shift));
+#endif
+
+#if defined(PNG_READ_PACK_SUPPORTED)
+   if (png_ptr->transformations & PNG_PACK)
+      png_do_unpack(&(png_ptr->row_info), png_ptr->row_buf + 1);
+#endif
+
+#if defined(PNG_READ_BGR_SUPPORTED)
+   if (png_ptr->transformations & PNG_BGR)
+      png_do_bgr(&(png_ptr->row_info), png_ptr->row_buf + 1);
+#endif
+
+#if defined(PNG_READ_PACKSWAP_SUPPORTED)
+   if (png_ptr->transformations & PNG_PACKSWAP)
+      png_do_packswap(&(png_ptr->row_info), png_ptr->row_buf + 1);
+#endif
+
+#if defined(PNG_READ_GRAY_TO_RGB_SUPPORTED)
+   /* if gray -> RGB, do so now only if we did not do so above */
+   if ((png_ptr->transformations & PNG_GRAY_TO_RGB) &&
+       (png_ptr->mode & PNG_BACKGROUND_IS_GRAY))
+      png_do_gray_to_rgb(&(png_ptr->row_info), png_ptr->row_buf + 1);
+#endif
+
+#if defined(PNG_READ_FILLER_SUPPORTED)
+   if (png_ptr->transformations & PNG_FILLER)
+      png_do_read_filler(&(png_ptr->row_info), png_ptr->row_buf + 1,
+         (png_uint_32)png_ptr->filler, png_ptr->flags);
+#endif
+
+#if defined(PNG_READ_INVERT_ALPHA_SUPPORTED)
+   if (png_ptr->transformations & PNG_INVERT_ALPHA)
+      png_do_read_invert_alpha(&(png_ptr->row_info), png_ptr->row_buf + 1);
+#endif
+
+#if defined(PNG_READ_SWAP_ALPHA_SUPPORTED)
+   if (png_ptr->transformations & PNG_SWAP_ALPHA)
+      png_do_read_swap_alpha(&(png_ptr->row_info), png_ptr->row_buf + 1);
+#endif
+
+#if defined(PNG_READ_SWAP_SUPPORTED)
+   if (png_ptr->transformations & PNG_SWAP_BYTES)
+      png_do_swap(&(png_ptr->row_info), png_ptr->row_buf + 1);
+#endif
+
+#if defined(PNG_READ_USER_TRANSFORM_SUPPORTED)
+   if (png_ptr->transformations & PNG_USER_TRANSFORM)
+    {
+      if(png_ptr->read_user_transform_fn != NULL)
+        (*(png_ptr->read_user_transform_fn)) /* user read transform function */
+          (png_ptr,                    /* png_ptr */
+           &(png_ptr->row_info),       /* row_info:     */
+             /*  png_uint_32 width;          width of row */
+             /*  png_uint_32 rowbytes;       number of bytes in row */
+             /*  png_byte color_type;        color type of pixels */
+             /*  png_byte bit_depth;         bit depth of samples */
+             /*  png_byte channels;          number of channels (1-4) */
+             /*  png_byte pixel_depth;       bits per pixel (depth*channels) */
+           png_ptr->row_buf + 1);      /* start of pixel data for row */
+#if defined(PNG_USER_TRANSFORM_PTR_SUPPORTED)
+      if(png_ptr->user_transform_depth)
+         png_ptr->row_info.bit_depth = png_ptr->user_transform_depth;
+      if(png_ptr->user_transform_channels)
+         png_ptr->row_info.channels = png_ptr->user_transform_channels;
+#endif
+      png_ptr->row_info.pixel_depth = (png_byte)(png_ptr->row_info.bit_depth *
+         png_ptr->row_info.channels);
+      png_ptr->row_info.rowbytes = PNG_ROWBYTES(png_ptr->row_info.pixel_depth,
+         png_ptr->row_info.width);
+   }
+#endif
+
+}
+
+#if defined(PNG_READ_PACK_SUPPORTED)
+/* Unpack pixels of 1, 2, or 4 bits per pixel into 1 byte per pixel,
+ * without changing the actual values.  Thus, if you had a row with
+ * a bit depth of 1, you would end up with bytes that only contained
+ * the numbers 0 or 1.  If you would rather they contain 0 and 255, use
+ * png_do_shift() after this.
+ */
+void /* PRIVATE */
+png_do_unpack(png_row_infop row_info, png_bytep row)
+{
+   png_debug(1, "in png_do_unpack\n");
+#if defined(PNG_USELESS_TESTS_SUPPORTED)
+   if (row != NULL && row_info != NULL && row_info->bit_depth < 8)
+#else
+   if (row_info->bit_depth < 8)
+#endif
+   {
+      png_uint_32 i;
+      png_uint_32 row_width=row_info->width;
+
+      switch (row_info->bit_depth)
+      {
+         case 1:
+         {
+            png_bytep sp = row + (png_size_t)((row_width - 1) >> 3);
+            png_bytep dp = row + (png_size_t)row_width - 1;
+            png_uint_32 shift = 7 - (int)((row_width + 7) & 0x07);
+            for (i = 0; i < row_width; i++)
+            {
+               *dp = (png_byte)((*sp >> shift) & 0x01);
+               if (shift == 7)
+               {
+                  shift = 0;
+                  sp--;
+               }
+               else
+                  shift++;
+
+               dp--;
+            }
+            break;
+         }
+         case 2:
+         {
+
+            png_bytep sp = row + (png_size_t)((row_width - 1) >> 2);
+            png_bytep dp = row + (png_size_t)row_width - 1;
+            png_uint_32 shift = (int)((3 - ((row_width + 3) & 0x03)) << 1);
+            for (i = 0; i < row_width; i++)
+            {
+               *dp = (png_byte)((*sp >> shift) & 0x03);
+               if (shift == 6)
+               {
+                  shift = 0;
+                  sp--;
+               }
+               else
+                  shift += 2;
+
+               dp--;
+            }
+            break;
+         }
+         case 4:
+         {
+            png_bytep sp = row + (png_size_t)((row_width - 1) >> 1);
+            png_bytep dp = row + (png_size_t)row_width - 1;
+            png_uint_32 shift = (int)((1 - ((row_width + 1) & 0x01)) << 2);
+            for (i = 0; i < row_width; i++)
+            {
+               *dp = (png_byte)((*sp >> shift) & 0x0f);
+               if (shift == 4)
+               {
+                  shift = 0;
+                  sp--;
+               }
+               else
+                  shift = 4;
+
+               dp--;
+            }
+            break;
+         }
+      }
+      row_info->bit_depth = 8;
+      row_info->pixel_depth = (png_byte)(8 * row_info->channels);
+      row_info->rowbytes = row_width * row_info->channels;
+   }
+}
+#endif
+
+#if defined(PNG_READ_SHIFT_SUPPORTED)
+/* Reverse the effects of png_do_shift.  This routine merely shifts the
+ * pixels back to their significant bits values.  Thus, if you have
+ * a row of bit depth 8, but only 5 are significant, this will shift
+ * the values back to 0 through 31.
+ */
+void /* PRIVATE */
+png_do_unshift(png_row_infop row_info, png_bytep row, png_color_8p sig_bits)
+{
+   png_debug(1, "in png_do_unshift\n");
+   if (
+#if defined(PNG_USELESS_TESTS_SUPPORTED)
+       row != NULL && row_info != NULL && sig_bits != NULL &&
+#endif
+       row_info->color_type != PNG_COLOR_TYPE_PALETTE)
+   {
+      int shift[4];
+      int channels = 0;
+      int c;
+      png_uint_16 value = 0;
+      png_uint_32 row_width = row_info->width;
+
+      if (row_info->color_type & PNG_COLOR_MASK_COLOR)
+      {
+         shift[channels++] = row_info->bit_depth - sig_bits->red;
+         shift[channels++] = row_info->bit_depth - sig_bits->green;
+         shift[channels++] = row_info->bit_depth - sig_bits->blue;
+      }
+      else
+      {
+         shift[channels++] = row_info->bit_depth - sig_bits->gray;
+      }
+      if (row_info->color_type & PNG_COLOR_MASK_ALPHA)
+      {
+         shift[channels++] = row_info->bit_depth - sig_bits->alpha;
+      }
+
+      for (c = 0; c < channels; c++)
+      {
+         if (shift[c] <= 0)
+            shift[c] = 0;
+         else
+            value = 1;
+      }
+
+      if (!value)
+         return;
+
+      switch (row_info->bit_depth)
+      {
+         case 2:
+         {
+            png_bytep bp;
+            png_uint_32 i;
+            png_uint_32 istop = row_info->rowbytes;
+
+            for (bp = row, i = 0; i < istop; i++)
+            {
+               *bp >>= 1;
+               *bp++ &= 0x55;
+            }
+            break;
+         }
+         case 4:
+         {
+            png_bytep bp = row;
+            png_uint_32 i;
+            png_uint_32 istop = row_info->rowbytes;
+            png_byte mask = (png_byte)((((int)0xf0 >> shift[0]) & (int)0xf0) |
+               (png_byte)((int)0xf >> shift[0]));
+
+            for (i = 0; i < istop; i++)
+            {
+               *bp >>= shift[0];
+               *bp++ &= mask;
+            }
+            break;
+         }
+         case 8:
+         {
+            png_bytep bp = row;
+            png_uint_32 i;
+            png_uint_32 istop = row_width * channels;
+
+            for (i = 0; i < istop; i++)
+            {
+               *bp++ >>= shift[i%channels];
+            }
+            break;
+         }
+         case 16:
+         {
+            png_bytep bp = row;
+            png_uint_32 i;
+            png_uint_32 istop = channels * row_width;
+
+            for (i = 0; i < istop; i++)
+            {
+               value = (png_uint_16)((*bp << 8) + *(bp + 1));
+               value >>= shift[i%channels];
+               *bp++ = (png_byte)(value >> 8);
+               *bp++ = (png_byte)(value & 0xff);
+            }
+            break;
+         }
+      }
+   }
+}
+#endif
+
+#if defined(PNG_READ_16_TO_8_SUPPORTED)
+/* chop rows of bit depth 16 down to 8 */
+void /* PRIVATE */
+png_do_chop(png_row_infop row_info, png_bytep row)
+{
+   png_debug(1, "in png_do_chop\n");
+#if defined(PNG_USELESS_TESTS_SUPPORTED)
+   if (row != NULL && row_info != NULL && row_info->bit_depth == 16)
+#else
+   if (row_info->bit_depth == 16)
+#endif
+   {
+      png_bytep sp = row;
+      png_bytep dp = row;
+      png_uint_32 i;
+      png_uint_32 istop = row_info->width * row_info->channels;
+
+      for (i = 0; i<istop; i++, sp += 2, dp++)
+      {
+#if defined(PNG_READ_16_TO_8_ACCURATE_SCALE_SUPPORTED)
+      /* This does a more accurate scaling of the 16-bit color
+       * value, rather than a simple low-byte truncation.
+       *
+       * What the ideal calculation should be:
+       *   *dp = (((((png_uint_32)(*sp) << 8) |
+       *          (png_uint_32)(*(sp + 1))) * 255 + 127) / (png_uint_32)65535L;
+       *
+       * GRR: no, I think this is what it really should be:
+       *   *dp = (((((png_uint_32)(*sp) << 8) |
+       *           (png_uint_32)(*(sp + 1))) + 128L) / (png_uint_32)257L;
+       *
+       * GRR: here's the exact calculation with shifts:
+       *   temp = (((png_uint_32)(*sp) << 8) | (png_uint_32)(*(sp + 1))) + 128L;
+       *   *dp = (temp - (temp >> 8)) >> 8;
+       *
+       * Approximate calculation with shift/add instead of multiply/divide:
+       *   *dp = ((((png_uint_32)(*sp) << 8) |
+       *          (png_uint_32)((int)(*(sp + 1)) - *sp)) + 128) >> 8;
+       *
+       * What we actually do to avoid extra shifting and conversion:
+       */
+
+         *dp = *sp + ((((int)(*(sp + 1)) - *sp) > 128) ? 1 : 0);
+#else
+       /* Simply discard the low order byte */
+         *dp = *sp;
+#endif
+      }
+      row_info->bit_depth = 8;
+      row_info->pixel_depth = (png_byte)(8 * row_info->channels);
+      row_info->rowbytes = row_info->width * row_info->channels;
+   }
+}
+#endif
+
+#if defined(PNG_READ_SWAP_ALPHA_SUPPORTED)
+void /* PRIVATE */
+png_do_read_swap_alpha(png_row_infop row_info, png_bytep row)
+{
+   png_debug(1, "in png_do_read_swap_alpha\n");
+#if defined(PNG_USELESS_TESTS_SUPPORTED)
+   if (row != NULL && row_info != NULL)
+#endif
+   {
+      png_uint_32 row_width = row_info->width;
+      if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
+      {
+         /* This converts from RGBA to ARGB */
+         if (row_info->bit_depth == 8)
+         {
+            png_bytep sp = row + row_info->rowbytes;
+            png_bytep dp = sp;
+            png_byte save;
+            png_uint_32 i;
+
+            for (i = 0; i < row_width; i++)
+            {
+               save = *(--sp);
+               *(--dp) = *(--sp);
+               *(--dp) = *(--sp);
+               *(--dp) = *(--sp);
+               *(--dp) = save;
+            }
+         }
+         /* This converts from RRGGBBAA to AARRGGBB */
+         else
+         {
+            png_bytep sp = row + row_info->rowbytes;
+            png_bytep dp = sp;
+            png_byte save[2];
+            png_uint_32 i;
+
+            for (i = 0; i < row_width; i++)
+            {
+               save[0] = *(--sp);
+               save[1] = *(--sp);
+               *(--dp) = *(--sp);
+               *(--dp) = *(--sp);
+               *(--dp) = *(--sp);
+               *(--dp) = *(--sp);
+               *(--dp) = *(--sp);
+               *(--dp) = *(--sp);
+               *(--dp) = save[0];
+               *(--dp) = save[1];
+            }
+         }
+      }
+      else if (row_info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
+      {
+         /* This converts from GA to AG */
+         if (row_info->bit_depth == 8)
+         {
+            png_bytep sp = row + row_info->rowbytes;
+            png_bytep dp = sp;
+            png_byte save;
+            png_uint_32 i;
+
+            for (i = 0; i < row_width; i++)
+            {
+               save = *(--sp);
+               *(--dp) = *(--sp);
+               *(--dp) = save;
+            }
+         }
+         /* This converts from GGAA to AAGG */
+         else
+         {
+            png_bytep sp = row + row_info->rowbytes;
+            png_bytep dp = sp;
+            png_byte save[2];
+            png_uint_32 i;
+
+            for (i = 0; i < row_width; i++)
+            {
+               save[0] = *(--sp);
+               save[1] = *(--sp);
+               *(--dp) = *(--sp);
+               *(--dp) = *(--sp);
+               *(--dp) = save[0];
+               *(--dp) = save[1];
+            }
+         }
+      }
+   }
+}
+#endif
+
+#if defined(PNG_READ_INVERT_ALPHA_SUPPORTED)
+void /* PRIVATE */
+png_do_read_invert_alpha(png_row_infop row_info, png_bytep row)
+{
+   png_debug(1, "in png_do_read_invert_alpha\n");
+#if defined(PNG_USELESS_TESTS_SUPPORTED)
+   if (row != NULL && row_info != NULL)
+#endif
+   {
+      png_uint_32 row_width = row_info->width;
+      if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
+      {
+         /* This inverts the alpha channel in RGBA */
+         if (row_info->bit_depth == 8)
+         {
+            png_bytep sp = row + row_info->rowbytes;
+            png_bytep dp = sp;
+            png_uint_32 i;
+
+            for (i = 0; i < row_width; i++)
+            {
+               *(--dp) = (png_byte)(255 - *(--sp));
+
+/*             This does nothing:
+               *(--dp) = *(--sp);
+               *(--dp) = *(--sp);
+               *(--dp) = *(--sp);
+               We can replace it with:
+*/
+               sp-=3;
+               dp=sp;
+            }
+         }
+         /* This inverts the alpha channel in RRGGBBAA */
+         else
+         {
+            png_bytep sp = row + row_info->rowbytes;
+            png_bytep dp = sp;
+            png_uint_32 i;
+
+            for (i = 0; i < row_width; i++)
+            {
+               *(--dp) = (png_byte)(255 - *(--sp));
+               *(--dp) = (png_byte)(255 - *(--sp));
+
+/*             This does nothing:
+               *(--dp) = *(--sp);
+               *(--dp) = *(--sp);
+               *(--dp) = *(--sp);
+               *(--dp) = *(--sp);
+               *(--dp) = *(--sp);
+               *(--dp) = *(--sp);
+               We can replace it with:
+*/
+               sp-=6;
+               dp=sp;
+            }
+         }
+      }
+      else if (row_info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
+      {
+         /* This inverts the alpha channel in GA */
+         if (row_info->bit_depth == 8)
+         {
+            png_bytep sp = row + row_info->rowbytes;
+            png_bytep dp = sp;
+            png_uint_32 i;
+
+            for (i = 0; i < row_width; i++)
+            {
+               *(--dp) = (png_byte)(255 - *(--sp));
+               *(--dp) = *(--sp);
+            }
+         }
+         /* This inverts the alpha channel in GGAA */
+         else
+         {
+            png_bytep sp  = row + row_info->rowbytes;
+            png_bytep dp = sp;
+            png_uint_32 i;
+
+            for (i = 0; i < row_width; i++)
+            {
+               *(--dp) = (png_byte)(255 - *(--sp));
+               *(--dp) = (png_byte)(255 - *(--sp));
+/*
+               *(--dp) = *(--sp);
+               *(--dp) = *(--sp);
+*/
+               sp-=2;
+               dp=sp;
+            }
+         }
+      }
+   }
+}
+#endif
+
+#if defined(PNG_READ_FILLER_SUPPORTED)
+/* Add filler channel if we have RGB color */
+void /* PRIVATE */
+png_do_read_filler(png_row_infop row_info, png_bytep row,
+   png_uint_32 filler, png_uint_32 flags)
+{
+   png_uint_32 i;
+   png_uint_32 row_width = row_info->width;
+
+   png_byte hi_filler = (png_byte)((filler>>8) & 0xff);
+   png_byte lo_filler = (png_byte)(filler & 0xff);
+
+   png_debug(1, "in png_do_read_filler\n");
+   if (
+#if defined(PNG_USELESS_TESTS_SUPPORTED)
+       row != NULL  && row_info != NULL &&
+#endif
+       row_info->color_type == PNG_COLOR_TYPE_GRAY)
+   {
+      if(row_info->bit_depth == 8)
+      {
+         /* This changes the data from G to GX */
+         if (flags & PNG_FLAG_FILLER_AFTER)
+         {
+            png_bytep sp = row + (png_size_t)row_width;
+            png_bytep dp =  sp + (png_size_t)row_width;
+            for (i = 1; i < row_width; i++)
+            {
+               *(--dp) = lo_filler;
+               *(--dp) = *(--sp);
+            }
+            *(--dp) = lo_filler;
+            row_info->channels = 2;
+            row_info->pixel_depth = 16;
+            row_info->rowbytes = row_width * 2;
+         }
+      /* This changes the data from G to XG */
+         else
+         {
+            png_bytep sp = row + (png_size_t)row_width;
+            png_bytep dp = sp  + (png_size_t)row_width;
+            for (i = 0; i < row_width; i++)
+            {
+               *(--dp) = *(--sp);
+               *(--dp) = lo_filler;
+            }
+            row_info->channels = 2;
+            row_info->pixel_depth = 16;
+            row_info->rowbytes = row_width * 2;
+         }
+      }
+      else if(row_info->bit_depth == 16)
+      {
+         /* This changes the data from GG to GGXX */
+         if (flags & PNG_FLAG_FILLER_AFTER)
+         {
+            png_bytep sp = row + (png_size_t)row_width * 2;
+            png_bytep dp = sp  + (png_size_t)row_width * 2;
+            for (i = 1; i < row_width; i++)
+            {
+               *(--dp) = hi_filler;
+               *(--dp) = lo_filler;
+               *(--dp) = *(--sp);
+               *(--dp) = *(--sp);
+            }
+            *(--dp) = hi_filler;
+            *(--dp) = lo_filler;
+            row_info->channels = 2;
+            row_info->pixel_depth = 32;
+            row_info->rowbytes = row_width * 4;
+         }
+         /* This changes the data from GG to XXGG */
+         else
+         {
+            png_bytep sp = row + (png_size_t)row_width * 2;
+            png_bytep dp = sp  + (png_size_t)row_width * 2;
+            for (i = 0; i < row_width; i++)
+            {
+               *(--dp) = *(--sp);
+               *(--dp) = *(--sp);
+               *(--dp) = hi_filler;
+               *(--dp) = lo_filler;
+            }
+            row_info->channels = 2;
+            row_info->pixel_depth = 32;
+            row_info->rowbytes = row_width * 4;
+         }
+      }
+   } /* COLOR_TYPE == GRAY */
+   else if (row_info->color_type == PNG_COLOR_TYPE_RGB)
+   {
+      if(row_info->bit_depth == 8)
+      {
+         /* This changes the data from RGB to RGBX */
+         if (flags & PNG_FLAG_FILLER_AFTER)
+         {
+            png_bytep sp = row + (png_size_t)row_width * 3;
+            png_bytep dp = sp  + (png_size_t)row_width;
+            for (i = 1; i < row_width; i++)
+            {
+               *(--dp) = lo_filler;
+               *(--dp) = *(--sp);
+               *(--dp) = *(--sp);
+               *(--dp) = *(--sp);
+            }
+            *(--dp) = lo_filler;
+            row_info->channels = 4;
+            row_info->pixel_depth = 32;
+            row_info->rowbytes = row_width * 4;
+         }
+      /* This changes the data from RGB to XRGB */
+         else
+         {
+            png_bytep sp = row + (png_size_t)row_width * 3;
+            png_bytep dp = sp + (png_size_t)row_width;
+            for (i = 0; i < row_width; i++)
+            {
+               *(--dp) = *(--sp);
+               *(--dp) = *(--sp);
+               *(--dp) = *(--sp);
+               *(--dp) = lo_filler;
+            }
+            row_info->channels = 4;
+            row_info->pixel_depth = 32;
+            row_info->rowbytes = row_width * 4;
+         }
+      }
+      else if(row_info->bit_depth == 16)
+      {
+         /* This changes the data from RRGGBB to RRGGBBXX */
+         if (flags & PNG_FLAG_FILLER_AFTER)
+         {
+            png_bytep sp = row + (png_size_t)row_width * 6;
+            png_bytep dp = sp  + (png_size_t)row_width * 2;
+            for (i = 1; i < row_width; i++)
+            {
+               *(--dp) = hi_filler;
+               *(--dp) = lo_filler;
+               *(--dp) = *(--sp);
+               *(--dp) = *(--sp);
+               *(--dp) = *(--sp);
+               *(--dp) = *(--sp);
+               *(--dp) = *(--sp);
+               *(--dp) = *(--sp);
+            }
+            *(--dp) = hi_filler;
+            *(--dp) = lo_filler;
+            row_info->channels = 4;
+            row_info->pixel_depth = 64;
+            row_info->rowbytes = row_width * 8;
+         }
+         /* This changes the data from RRGGBB to XXRRGGBB */
+         else
+         {
+            png_bytep sp = row + (png_size_t)row_width * 6;
+            png_bytep dp = sp  + (png_size_t)row_width * 2;
+            for (i = 0; i < row_width; i++)
+            {
+               *(--dp) = *(--sp);
+               *(--dp) = *(--sp);
+               *(--dp) = *(--sp);
+               *(--dp) = *(--sp);
+               *(--dp) = *(--sp);
+               *(--dp) = *(--sp);
+               *(--dp) = hi_filler;
+               *(--dp) = lo_filler;
+            }
+            row_info->channels = 4;
+            row_info->pixel_depth = 64;
+            row_info->rowbytes = row_width * 8;
+         }
+      }
+   } /* COLOR_TYPE == RGB */
+}
+#endif
+
+#if defined(PNG_READ_GRAY_TO_RGB_SUPPORTED)
+/* expand grayscale files to RGB, with or without alpha */
+void /* PRIVATE */
+png_do_gray_to_rgb(png_row_infop row_info, png_bytep row)
+{
+   png_uint_32 i;
+   png_uint_32 row_width = row_info->width;
+
+   png_debug(1, "in png_do_gray_to_rgb\n");
+   if (row_info->bit_depth >= 8 &&
+#if defined(PNG_USELESS_TESTS_SUPPORTED)
+       row != NULL && row_info != NULL &&
+#endif
+      !(row_info->color_type & PNG_COLOR_MASK_COLOR))
+   {
+      if (row_info->color_type == PNG_COLOR_TYPE_GRAY)
+      {
+         if (row_info->bit_depth == 8)
+         {
+            png_bytep sp = row + (png_size_t)row_width - 1;
+            png_bytep dp = sp  + (png_size_t)row_width * 2;
+            for (i = 0; i < row_width; i++)
+            {
+               *(dp--) = *sp;
+               *(dp--) = *sp;
+               *(dp--) = *(sp--);
+            }
+         }
+         else
+         {
+            png_bytep sp = row + (png_size_t)row_width * 2 - 1;
+            png_bytep dp = sp  + (png_size_t)row_width * 4;
+            for (i = 0; i < row_width; i++)
+            {
+               *(dp--) = *sp;
+               *(dp--) = *(sp - 1);
+               *(dp--) = *sp;
+               *(dp--) = *(sp - 1);
+               *(dp--) = *(sp--);
+               *(dp--) = *(sp--);
+            }
+         }
+      }
+      else if (row_info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
+      {
+         if (row_info->bit_depth == 8)
+         {
+            png_bytep sp = row + (png_size_t)row_width * 2 - 1;
+            png_bytep dp = sp  + (png_size_t)row_width * 2;
+            for (i = 0; i < row_width; i++)
+            {
+               *(dp--) = *(sp--);
+               *(dp--) = *sp;
+               *(dp--) = *sp;
+               *(dp--) = *(sp--);
+            }
+         }
+         else
+         {
+            png_bytep sp = row + (png_size_t)row_width * 4 - 1;
+            png_bytep dp = sp  + (png_size_t)row_width * 4;
+            for (i = 0; i < row_width; i++)
+            {
+               *(dp--) = *(sp--);
+               *(dp--) = *(sp--);
+               *(dp--) = *sp;
+               *(dp--) = *(sp - 1);
+               *(dp--) = *sp;
+               *(dp--) = *(sp - 1);
+               *(dp--) = *(sp--);
+               *(dp--) = *(sp--);
+            }
+         }
+      }
+      row_info->channels += (png_byte)2;
+      row_info->color_type |= PNG_COLOR_MASK_COLOR;
+      row_info->pixel_depth = (png_byte)(row_info->channels *
+         row_info->bit_depth);
+      row_info->rowbytes = PNG_ROWBYTES(row_info->pixel_depth,row_width);
+   }
+}
+#endif
+
+#if defined(PNG_READ_RGB_TO_GRAY_SUPPORTED)
+/* reduce RGB files to grayscale, with or without alpha
+ * using the equation given in Poynton's ColorFAQ at
+ * <http://www.inforamp.net/~poynton/>
+ * Copyright (c) 1998-01-04 Charles Poynton poynton at inforamp.net
+ *
+ *     Y = 0.212671 * R + 0.715160 * G + 0.072169 * B
+ *
+ *  We approximate this with
+ *
+ *     Y = 0.21268 * R    + 0.7151 * G    + 0.07217 * B
+ *
+ *  which can be expressed with integers as
+ *
+ *     Y = (6969 * R + 23434 * G + 2365 * B)/32768
+ *
+ *  The calculation is to be done in a linear colorspace.
+ *
+ *  Other integer coefficents can be used via png_set_rgb_to_gray().
+ */
+int /* PRIVATE */
+png_do_rgb_to_gray(png_structp png_ptr, png_row_infop row_info, png_bytep row)
+
+{
+   png_uint_32 i;
+
+   png_uint_32 row_width = row_info->width;
+   int rgb_error = 0;
+
+   png_debug(1, "in png_do_rgb_to_gray\n");
+   if (
+#if defined(PNG_USELESS_TESTS_SUPPORTED)
+       row != NULL && row_info != NULL &&
+#endif
+      (row_info->color_type & PNG_COLOR_MASK_COLOR))
+   {
+      png_uint_32 rc = png_ptr->rgb_to_gray_red_coeff;
+      png_uint_32 gc = png_ptr->rgb_to_gray_green_coeff;
+      png_uint_32 bc = png_ptr->rgb_to_gray_blue_coeff;
+
+      if (row_info->color_type == PNG_COLOR_TYPE_RGB)
+      {
+         if (row_info->bit_depth == 8)
+         {
+#if defined(PNG_READ_GAMMA_SUPPORTED) || defined(PNG_READ_BACKGROUND_SUPPORTED)
+            if (png_ptr->gamma_from_1 != NULL && png_ptr->gamma_to_1 != NULL)
+            {
+               png_bytep sp = row;
+               png_bytep dp = row;
+
+               for (i = 0; i < row_width; i++)
+               {
+                  png_byte red   = png_ptr->gamma_to_1[*(sp++)];
+                  png_byte green = png_ptr->gamma_to_1[*(sp++)];
+                  png_byte blue  = png_ptr->gamma_to_1[*(sp++)];
+                  if(red != green || red != blue)
+                  {
+                     rgb_error |= 1;
+                     *(dp++) = png_ptr->gamma_from_1[
+                       (rc*red+gc*green+bc*blue)>>15];
+                  }
+                  else
+                     *(dp++) = *(sp-1);
+               }
+            }
+            else
+#endif
+            {
+               png_bytep sp = row;
+               png_bytep dp = row;
+               for (i = 0; i < row_width; i++)
+               {
+                  png_byte red   = *(sp++);
+                  png_byte green = *(sp++);
+                  png_byte blue  = *(sp++);
+                  if(red != green || red != blue)
+                  {
+                     rgb_error |= 1;
+                     *(dp++) = (png_byte)((rc*red+gc*green+bc*blue)>>15);
+                  }
+                  else
+                     *(dp++) = *(sp-1);
+               }
+            }
+         }
+
+         else /* RGB bit_depth == 16 */
+         {
+#if defined(PNG_READ_GAMMA_SUPPORTED) || defined(PNG_READ_BACKGROUND_SUPPORTED)
+            if (png_ptr->gamma_16_to_1 != NULL &&
+                png_ptr->gamma_16_from_1 != NULL)
+            {
+               png_bytep sp = row;
+               png_bytep dp = row;
+               for (i = 0; i < row_width; i++)
+               {
+                  png_uint_16 red, green, blue, w;
+
+                  red   = (png_uint_16)(((*(sp))<<8) | *(sp+1)); sp+=2;
+                  green = (png_uint_16)(((*(sp))<<8) | *(sp+1)); sp+=2;
+                  blue  = (png_uint_16)(((*(sp))<<8) | *(sp+1)); sp+=2;
+
+                  if(red == green && red == blue)
+                     w = red;
+                  else
+                  {
+                     png_uint_16 red_1   = png_ptr->gamma_16_to_1[(red&0xff) >>
+                                  png_ptr->gamma_shift][red>>8];
+                     png_uint_16 green_1 = png_ptr->gamma_16_to_1[(green&0xff) >>
+                                  png_ptr->gamma_shift][green>>8];
+                     png_uint_16 blue_1  = png_ptr->gamma_16_to_1[(blue&0xff) >>
+                                  png_ptr->gamma_shift][blue>>8];
+                     png_uint_16 gray16  = (png_uint_16)((rc*red_1 + gc*green_1
+                                  + bc*blue_1)>>15);
+                     w = png_ptr->gamma_16_from_1[(gray16&0xff) >>
+                         png_ptr->gamma_shift][gray16 >> 8];
+                     rgb_error |= 1;
+                  }
+
+                  *(dp++) = (png_byte)((w>>8) & 0xff);
+                  *(dp++) = (png_byte)(w & 0xff);
+               }
+            }
+            else
+#endif
+            {
+               png_bytep sp = row;
+               png_bytep dp = row;
+               for (i = 0; i < row_width; i++)
+               {
+                  png_uint_16 red, green, blue, gray16;
+
+                  red   = (png_uint_16)(((*(sp))<<8) | *(sp+1)); sp+=2;
+                  green = (png_uint_16)(((*(sp))<<8) | *(sp+1)); sp+=2;
+                  blue  = (png_uint_16)(((*(sp))<<8) | *(sp+1)); sp+=2;
+
+                  if(red != green || red != blue)
+                     rgb_error |= 1;
+                  gray16  = (png_uint_16)((rc*red + gc*green + bc*blue)>>15);
+                  *(dp++) = (png_byte)((gray16>>8) & 0xff);
+                  *(dp++) = (png_byte)(gray16 & 0xff);
+               }
+            }
+         }
+      }
+      if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
+      {
+         if (row_info->bit_depth == 8)
+         {
+#if defined(PNG_READ_GAMMA_SUPPORTED) || defined(PNG_READ_BACKGROUND_SUPPORTED)
+            if (png_ptr->gamma_from_1 != NULL && png_ptr->gamma_to_1 != NULL)
+            {
+               png_bytep sp = row;
+               png_bytep dp = row;
+               for (i = 0; i < row_width; i++)
+               {
+                  png_byte red   = png_ptr->gamma_to_1[*(sp++)];
+                  png_byte green = png_ptr->gamma_to_1[*(sp++)];
+                  png_byte blue  = png_ptr->gamma_to_1[*(sp++)];
+                  if(red != green || red != blue)
+                     rgb_error |= 1;
+                  *(dp++) =  png_ptr->gamma_from_1
+                             [(rc*red + gc*green + bc*blue)>>15];
+                  *(dp++) = *(sp++);  /* alpha */
+               }
+            }
+            else
+#endif
+            {
+               png_bytep sp = row;
+               png_bytep dp = row;
+               for (i = 0; i < row_width; i++)
+               {
+                  png_byte red   = *(sp++);
+                  png_byte green = *(sp++);
+                  png_byte blue  = *(sp++);
+                  if(red != green || red != blue)
+                     rgb_error |= 1;
+                  *(dp++) =  (png_byte)((rc*red + gc*green + bc*blue)>>15);
+                  *(dp++) = *(sp++);  /* alpha */
+               }
+            }
+         }
+         else /* RGBA bit_depth == 16 */
+         {
+#if defined(PNG_READ_GAMMA_SUPPORTED) || defined(PNG_READ_BACKGROUND_SUPPORTED)
+            if (png_ptr->gamma_16_to_1 != NULL &&
+                png_ptr->gamma_16_from_1 != NULL)
+            {
+               png_bytep sp = row;
+               png_bytep dp = row;
+               for (i = 0; i < row_width; i++)
+               {
+                  png_uint_16 red, green, blue, w;
+
+                  red   = (png_uint_16)(((*(sp))<<8) | *(sp+1)); sp+=2;
+                  green = (png_uint_16)(((*(sp))<<8) | *(sp+1)); sp+=2;
+                  blue  = (png_uint_16)(((*(sp))<<8) | *(sp+1)); sp+=2;
+
+                  if(red == green && red == blue)
+                     w = red;
+                  else
+                  {
+                     png_uint_16 red_1   = png_ptr->gamma_16_to_1[(red&0xff) >>
+                                  png_ptr->gamma_shift][red>>8];
+                     png_uint_16 green_1 = png_ptr->gamma_16_to_1[(green&0xff) >>
+                                  png_ptr->gamma_shift][green>>8];
+                     png_uint_16 blue_1  = png_ptr->gamma_16_to_1[(blue&0xff) >>
+                                  png_ptr->gamma_shift][blue>>8];
+                     png_uint_16 gray16  = (png_uint_16)((rc * red_1
+                                  + gc * green_1 + bc * blue_1)>>15);
+                     w = png_ptr->gamma_16_from_1[(gray16&0xff) >>
+                         png_ptr->gamma_shift][gray16 >> 8];
+                     rgb_error |= 1;
+                  }
+
+                  *(dp++) = (png_byte)((w>>8) & 0xff);
+                  *(dp++) = (png_byte)(w & 0xff);
+                  *(dp++) = *(sp++);  /* alpha */
+                  *(dp++) = *(sp++);
+               }
+            }
+            else
+#endif
+            {
+               png_bytep sp = row;
+               png_bytep dp = row;
+               for (i = 0; i < row_width; i++)
+               {
+                  png_uint_16 red, green, blue, gray16;
+                  red   = (png_uint_16)((*(sp)<<8) | *(sp+1)); sp+=2;
+                  green = (png_uint_16)((*(sp)<<8) | *(sp+1)); sp+=2;
+                  blue  = (png_uint_16)((*(sp)<<8) | *(sp+1)); sp+=2;
+                  if(red != green || red != blue)
+                     rgb_error |= 1;
+                  gray16  = (png_uint_16)((rc*red + gc*green + bc*blue)>>15);
+                  *(dp++) = (png_byte)((gray16>>8) & 0xff);
+                  *(dp++) = (png_byte)(gray16 & 0xff);
+                  *(dp++) = *(sp++);  /* alpha */
+                  *(dp++) = *(sp++);
+               }
+            }
+         }
+      }
+   row_info->channels -= (png_byte)2;
+      row_info->color_type &= ~PNG_COLOR_MASK_COLOR;
+      row_info->pixel_depth = (png_byte)(row_info->channels *
+         row_info->bit_depth);
+      row_info->rowbytes = PNG_ROWBYTES(row_info->pixel_depth,row_width);
+   }
+   return rgb_error;
+}
+#endif
+
+/* Build a grayscale palette.  Palette is assumed to be 1 << bit_depth
+ * large of png_color.  This lets grayscale images be treated as
+ * paletted.  Most useful for gamma correction and simplification
+ * of code.
+ */
+void PNGAPI
+png_build_grayscale_palette(int bit_depth, png_colorp palette)
+{
+   int num_palette;
+   int color_inc;
+   int i;
+   int v;
+
+   png_debug(1, "in png_do_build_grayscale_palette\n");
+   if (palette == NULL)
+      return;
+
+   switch (bit_depth)
+   {
+      case 1:
+         num_palette = 2;
+         color_inc = 0xff;
+         break;
+      case 2:
+         num_palette = 4;
+         color_inc = 0x55;
+         break;
+      case 4:
+         num_palette = 16;
+         color_inc = 0x11;
+         break;
+      case 8:
+         num_palette = 256;
+         color_inc = 1;
+         break;
+      default:
+         num_palette = 0;
+         color_inc = 0;
+         break;
+   }
+
+   for (i = 0, v = 0; i < num_palette; i++, v += color_inc)
+   {
+      palette[i].red = (png_byte)v;
+      palette[i].green = (png_byte)v;
+      palette[i].blue = (png_byte)v;
+   }
+}
+
+/* This function is currently unused.  Do we really need it? */
+#if defined(PNG_READ_DITHER_SUPPORTED) && defined(PNG_CORRECT_PALETTE_SUPPORTED)
+void /* PRIVATE */
+png_correct_palette(png_structp png_ptr, png_colorp palette,
+   int num_palette)
+{
+   png_debug(1, "in png_correct_palette\n");
+#if defined(PNG_READ_BACKGROUND_SUPPORTED) && \
+    defined(PNG_READ_GAMMA_SUPPORTED) && defined(PNG_FLOATING_POINT_SUPPORTED)
+   if (png_ptr->transformations & (PNG_GAMMA | PNG_BACKGROUND))
+   {
+      png_color back, back_1;
+
+      if (png_ptr->background_gamma_type == PNG_BACKGROUND_GAMMA_FILE)
+      {
+         back.red = png_ptr->gamma_table[png_ptr->background.red];
+         back.green = png_ptr->gamma_table[png_ptr->background.green];
+         back.blue = png_ptr->gamma_table[png_ptr->background.blue];
+
+         back_1.red = png_ptr->gamma_to_1[png_ptr->background.red];
+         back_1.green = png_ptr->gamma_to_1[png_ptr->background.green];
+         back_1.blue = png_ptr->gamma_to_1[png_ptr->background.blue];
+      }
+      else
+      {
+         double g;
+
+         g = 1.0 / (png_ptr->background_gamma * png_ptr->screen_gamma);
+
+         if (png_ptr->background_gamma_type == PNG_BACKGROUND_GAMMA_SCREEN ||
+             fabs(g - 1.0) < PNG_GAMMA_THRESHOLD)
+         {
+            back.red = png_ptr->background.red;
+            back.green = png_ptr->background.green;
+            back.blue = png_ptr->background.blue;
+         }
+         else
+         {
+            back.red =
+               (png_byte)(pow((double)png_ptr->background.red/255, g) *
+                255.0 + 0.5);
+            back.green =
+               (png_byte)(pow((double)png_ptr->background.green/255, g) *
+                255.0 + 0.5);
+            back.blue =
+               (png_byte)(pow((double)png_ptr->background.blue/255, g) *
+                255.0 + 0.5);
+         }
+
+         g = 1.0 / png_ptr->background_gamma;
+
+         back_1.red =
+            (png_byte)(pow((double)png_ptr->background.red/255, g) *
+             255.0 + 0.5);
+         back_1.green =
+            (png_byte)(pow((double)png_ptr->background.green/255, g) *
+             255.0 + 0.5);
+         back_1.blue =
+            (png_byte)(pow((double)png_ptr->background.blue/255, g) *
+             255.0 + 0.5);
+      }
+
+      if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
+      {
+         png_uint_32 i;
+
+         for (i = 0; i < (png_uint_32)num_palette; i++)
+         {
+            if (i < png_ptr->num_trans && png_ptr->trans[i] == 0)
+            {
+               palette[i] = back;
+            }
+            else if (i < png_ptr->num_trans && png_ptr->trans[i] != 0xff)
+            {
+               png_byte v, w;
+
+               v = png_ptr->gamma_to_1[png_ptr->palette[i].red];
+               png_composite(w, v, png_ptr->trans[i], back_1.red);
+               palette[i].red = png_ptr->gamma_from_1[w];
+
+               v = png_ptr->gamma_to_1[png_ptr->palette[i].green];
+               png_composite(w, v, png_ptr->trans[i], back_1.green);
+               palette[i].green = png_ptr->gamma_from_1[w];
+
+               v = png_ptr->gamma_to_1[png_ptr->palette[i].blue];
+               png_composite(w, v, png_ptr->trans[i], back_1.blue);
+               palette[i].blue = png_ptr->gamma_from_1[w];
+            }
+            else
+            {
+               palette[i].red = png_ptr->gamma_table[palette[i].red];
+               palette[i].green = png_ptr->gamma_table[palette[i].green];
+               palette[i].blue = png_ptr->gamma_table[palette[i].blue];
+            }
+         }
+      }
+      else
+      {
+         int i;
+
+         for (i = 0; i < num_palette; i++)
+         {
+            if (palette[i].red == (png_byte)png_ptr->trans_values.gray)
+            {
+               palette[i] = back;
+            }
+            else
+            {
+               palette[i].red = png_ptr->gamma_table[palette[i].red];
+               palette[i].green = png_ptr->gamma_table[palette[i].green];
+               palette[i].blue = png_ptr->gamma_table[palette[i].blue];
+            }
+         }
+      }
+   }
+   else
+#endif
+#if defined(PNG_READ_GAMMA_SUPPORTED)
+   if (png_ptr->transformations & PNG_GAMMA)
+   {
+      int i;
+
+      for (i = 0; i < num_palette; i++)
+      {
+         palette[i].red = png_ptr->gamma_table[palette[i].red];
+         palette[i].green = png_ptr->gamma_table[palette[i].green];
+         palette[i].blue = png_ptr->gamma_table[palette[i].blue];
+      }
+   }
+#if defined(PNG_READ_BACKGROUND_SUPPORTED)
+   else
+#endif
+#endif
+#if defined(PNG_READ_BACKGROUND_SUPPORTED)
+   if (png_ptr->transformations & PNG_BACKGROUND)
+   {
+      if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
+      {
+         png_color back;
+
+         back.red   = (png_byte)png_ptr->background.red;
+         back.green = (png_byte)png_ptr->background.green;
+         back.blue  = (png_byte)png_ptr->background.blue;
+
+         for (i = 0; i < (int)png_ptr->num_trans; i++)
+         {
+            if (png_ptr->trans[i] == 0)
+            {
+               palette[i].red = back.red;
+               palette[i].green = back.green;
+               palette[i].blue = back.blue;
+            }
+            else if (png_ptr->trans[i] != 0xff)
+            {
+               png_composite(palette[i].red, png_ptr->palette[i].red,
+                  png_ptr->trans[i], back.red);
+               png_composite(palette[i].green, png_ptr->palette[i].green,
+                  png_ptr->trans[i], back.green);
+               png_composite(palette[i].blue, png_ptr->palette[i].blue,
+                  png_ptr->trans[i], back.blue);
+            }
+         }
+      }
+      else /* assume grayscale palette (what else could it be?) */
+      {
+         int i;
+
+         for (i = 0; i < num_palette; i++)
+         {
+            if (i == (png_byte)png_ptr->trans_values.gray)
+            {
+               palette[i].red = (png_byte)png_ptr->background.red;
+               palette[i].green = (png_byte)png_ptr->background.green;
+               palette[i].blue = (png_byte)png_ptr->background.blue;
+            }
+         }
+      }
+   }
+#endif
+}
+#endif
+
+#if defined(PNG_READ_BACKGROUND_SUPPORTED)
+/* Replace any alpha or transparency with the supplied background color.
+ * "background" is already in the screen gamma, while "background_1" is
+ * at a gamma of 1.0.  Paletted files have already been taken care of.
+ */
+void /* PRIVATE */
+png_do_background(png_row_infop row_info, png_bytep row,
+   png_color_16p trans_values, png_color_16p background
+#if defined(PNG_READ_GAMMA_SUPPORTED)
+   , png_color_16p background_1,
+   png_bytep gamma_table, png_bytep gamma_from_1, png_bytep gamma_to_1,
+   png_uint_16pp gamma_16, png_uint_16pp gamma_16_from_1,
+   png_uint_16pp gamma_16_to_1, int gamma_shift
+#endif
+   )
+{
+   png_bytep sp, dp;
+   png_uint_32 i;
+   png_uint_32 row_width=row_info->width;
+   int shift;
+
+   png_debug(1, "in png_do_background\n");
+   if (background != NULL &&
+#if defined(PNG_USELESS_TESTS_SUPPORTED)
+       row != NULL && row_info != NULL &&
+#endif
+      (!(row_info->color_type & PNG_COLOR_MASK_ALPHA) ||
+      (row_info->color_type != PNG_COLOR_TYPE_PALETTE && trans_values)))
+   {
+      switch (row_info->color_type)
+      {
+         case PNG_COLOR_TYPE_GRAY:
+         {
+            switch (row_info->bit_depth)
+            {
+               case 1:
+               {
+                  sp = row;
+                  shift = 7;
+                  for (i = 0; i < row_width; i++)
+                  {
+                     if ((png_uint_16)((*sp >> shift) & 0x01)
+                        == trans_values->gray)
+                     {
+                        *sp &= (png_byte)((0x7f7f >> (7 - shift)) & 0xff);
+                        *sp |= (png_byte)(background->gray << shift);
+                     }
+                     if (!shift)
+                     {
+                        shift = 7;
+                        sp++;
+                     }
+                     else
+                        shift--;
+                  }
+                  break;
+               }
+               case 2:
+               {
+#if defined(PNG_READ_GAMMA_SUPPORTED)
+                  if (gamma_table != NULL)
+                  {
+                     sp = row;
+                     shift = 6;
+                     for (i = 0; i < row_width; i++)
+                     {
+                        if ((png_uint_16)((*sp >> shift) & 0x03)
+                            == trans_values->gray)
+                        {
+                           *sp &= (png_byte)((0x3f3f >> (6 - shift)) & 0xff);
+                           *sp |= (png_byte)(background->gray << shift);
+                        }
+                        else
+                        {
+                           png_byte p = (png_byte)((*sp >> shift) & 0x03);
+                           png_byte g = (png_byte)((gamma_table [p | (p << 2) |
+                               (p << 4) | (p << 6)] >> 6) & 0x03);
+                           *sp &= (png_byte)((0x3f3f >> (6 - shift)) & 0xff);
+                           *sp |= (png_byte)(g << shift);
+                        }
+                        if (!shift)
+                        {
+                           shift = 6;
+                           sp++;
+                        }
+                        else
+                           shift -= 2;
+                     }
+                  }
+                  else
+#endif
+                  {
+                     sp = row;
+                     shift = 6;
+                     for (i = 0; i < row_width; i++)
+                     {
+                        if ((png_uint_16)((*sp >> shift) & 0x03)
+                            == trans_values->gray)
+                        {
+                           *sp &= (png_byte)((0x3f3f >> (6 - shift)) & 0xff);
+                           *sp |= (png_byte)(background->gray << shift);
+                        }
+                        if (!shift)
+                        {
+                           shift = 6;
+                           sp++;
+                        }
+                        else
+                           shift -= 2;
+                     }
+                  }
+                  break;
+               }
+               case 4:
+               {
+#if defined(PNG_READ_GAMMA_SUPPORTED)
+                  if (gamma_table != NULL)
+                  {
+                     sp = row;
+                     shift = 4;
+                     for (i = 0; i < row_width; i++)
+                     {
+                        if ((png_uint_16)((*sp >> shift) & 0x0f)
+                            == trans_values->gray)
+                        {
+                           *sp &= (png_byte)((0xf0f >> (4 - shift)) & 0xff);
+                           *sp |= (png_byte)(background->gray << shift);
+                        }
+                        else
+                        {
+                           png_byte p = (png_byte)((*sp >> shift) & 0x0f);
+                           png_byte g = (png_byte)((gamma_table[p |
+                             (p << 4)] >> 4) & 0x0f);
+                           *sp &= (png_byte)((0xf0f >> (4 - shift)) & 0xff);
+                           *sp |= (png_byte)(g << shift);
+                        }
+                        if (!shift)
+                        {
+                           shift = 4;
+                           sp++;
+                        }
+                        else
+                           shift -= 4;
+                     }
+                  }
+                  else
+#endif
+                  {
+                     sp = row;
+                     shift = 4;
+                     for (i = 0; i < row_width; i++)
+                     {
+                        if ((png_uint_16)((*sp >> shift) & 0x0f)
+                            == trans_values->gray)
+                        {
+                           *sp &= (png_byte)((0xf0f >> (4 - shift)) & 0xff);
+                           *sp |= (png_byte)(background->gray << shift);
+                        }
+                        if (!shift)
+                        {
+                           shift = 4;
+                           sp++;
+                        }
+                        else
+                           shift -= 4;
+                     }
+                  }
+                  break;
+               }
+               case 8:
+               {
+#if defined(PNG_READ_GAMMA_SUPPORTED)
+                  if (gamma_table != NULL)
+                  {
+                     sp = row;
+                     for (i = 0; i < row_width; i++, sp++)
+                     {
+                        if (*sp == trans_values->gray)
+                        {
+                           *sp = (png_byte)background->gray;
+                        }
+                        else
+                        {
+                           *sp = gamma_table[*sp];
+                        }
+                     }
+                  }
+                  else
+#endif
+                  {
+                     sp = row;
+                     for (i = 0; i < row_width; i++, sp++)
+                     {
+                        if (*sp == trans_values->gray)
+                        {
+                           *sp = (png_byte)background->gray;
+                        }
+                     }
+                  }
+                  break;
+               }
+               case 16:
+               {
+#if defined(PNG_READ_GAMMA_SUPPORTED)
+                  if (gamma_16 != NULL)
+                  {
+                     sp = row;
+                     for (i = 0; i < row_width; i++, sp += 2)
+                     {
+                        png_uint_16 v;
+
+                        v = (png_uint_16)(((*sp) << 8) + *(sp + 1));
+                        if (v == trans_values->gray)
+                        {
+                           /* background is already in screen gamma */
+                           *sp = (png_byte)((background->gray >> 8) & 0xff);
+                           *(sp + 1) = (png_byte)(background->gray & 0xff);
+                        }
+                        else
+                        {
+                           v = gamma_16[*(sp + 1) >> gamma_shift][*sp];
+                           *sp = (png_byte)((v >> 8) & 0xff);
+                           *(sp + 1) = (png_byte)(v & 0xff);
+                        }
+                     }
+                  }
+                  else
+#endif
+                  {
+                     sp = row;
+                     for (i = 0; i < row_width; i++, sp += 2)
+                     {
+                        png_uint_16 v;
+
+                        v = (png_uint_16)(((*sp) << 8) + *(sp + 1));
+                        if (v == trans_values->gray)
+                        {
+                           *sp = (png_byte)((background->gray >> 8) & 0xff);
+                           *(sp + 1) = (png_byte)(background->gray & 0xff);
+                        }
+                     }
+                  }
+                  break;
+               }
+            }
+            break;
+         }
+         case PNG_COLOR_TYPE_RGB:
+         {
+            if (row_info->bit_depth == 8)
+            {
+#if defined(PNG_READ_GAMMA_SUPPORTED)
+               if (gamma_table != NULL)
+               {
+                  sp = row;
+                  for (i = 0; i < row_width; i++, sp += 3)
+                  {
+                     if (*sp == trans_values->red &&
+                        *(sp + 1) == trans_values->green &&
+                        *(sp + 2) == trans_values->blue)
+                     {
+                        *sp = (png_byte)background->red;
+                        *(sp + 1) = (png_byte)background->green;
+                        *(sp + 2) = (png_byte)background->blue;
+                     }
+                     else
+                     {
+                        *sp = gamma_table[*sp];
+                        *(sp + 1) = gamma_table[*(sp + 1)];
+                        *(sp + 2) = gamma_table[*(sp + 2)];
+                     }
+                  }
+               }
+               else
+#endif
+               {
+                  sp = row;
+                  for (i = 0; i < row_width; i++, sp += 3)
+                  {
+                     if (*sp == trans_values->red &&
+                        *(sp + 1) == trans_values->green &&
+                        *(sp + 2) == trans_values->blue)
+                     {
+                        *sp = (png_byte)background->red;
+                        *(sp + 1) = (png_byte)background->green;
+                        *(sp + 2) = (png_byte)background->blue;
+                     }
+                  }
+               }
+            }
+            else /* if (row_info->bit_depth == 16) */
+            {
+#if defined(PNG_READ_GAMMA_SUPPORTED)
+               if (gamma_16 != NULL)
+               {
+                  sp = row;
+                  for (i = 0; i < row_width; i++, sp += 6)
+                  {
+                     png_uint_16 r = (png_uint_16)(((*sp) << 8) + *(sp + 1));
+                     png_uint_16 g = (png_uint_16)(((*(sp+2)) << 8) + *(sp+3));
+                     png_uint_16 b = (png_uint_16)(((*(sp+4)) << 8) + *(sp+5));
+                     if (r == trans_values->red && g == trans_values->green &&
+                        b == trans_values->blue)
+                     {
+                        /* background is already in screen gamma */
+                        *sp = (png_byte)((background->red >> 8) & 0xff);
+                        *(sp + 1) = (png_byte)(background->red & 0xff);
+                        *(sp + 2) = (png_byte)((background->green >> 8) & 0xff);
+                        *(sp + 3) = (png_byte)(background->green & 0xff);
+                        *(sp + 4) = (png_byte)((background->blue >> 8) & 0xff);
+                        *(sp + 5) = (png_byte)(background->blue & 0xff);
+                     }
+                     else
+                     {
+                        png_uint_16 v = gamma_16[*(sp + 1) >> gamma_shift][*sp];
+                        *sp = (png_byte)((v >> 8) & 0xff);
+                        *(sp + 1) = (png_byte)(v & 0xff);
+                        v = gamma_16[*(sp + 3) >> gamma_shift][*(sp + 2)];
+                        *(sp + 2) = (png_byte)((v >> 8) & 0xff);
+                        *(sp + 3) = (png_byte)(v & 0xff);
+                        v = gamma_16[*(sp + 5) >> gamma_shift][*(sp + 4)];
+                        *(sp + 4) = (png_byte)((v >> 8) & 0xff);
+                        *(sp + 5) = (png_byte)(v & 0xff);
+                     }
+                  }
+               }
+               else
+#endif
+               {
+                  sp = row;
+                  for (i = 0; i < row_width; i++, sp += 6)
+                  {
+                     png_uint_16 r = (png_uint_16)(((*sp) << 8) + *(sp+1));
+                     png_uint_16 g = (png_uint_16)(((*(sp+2)) << 8) + *(sp+3));
+                     png_uint_16 b = (png_uint_16)(((*(sp+4)) << 8) + *(sp+5));
+
+                     if (r == trans_values->red && g == trans_values->green &&
+                        b == trans_values->blue)
+                     {
+                        *sp = (png_byte)((background->red >> 8) & 0xff);
+                        *(sp + 1) = (png_byte)(background->red & 0xff);
+                        *(sp + 2) = (png_byte)((background->green >> 8) & 0xff);
+                        *(sp + 3) = (png_byte)(background->green & 0xff);
+                        *(sp + 4) = (png_byte)((background->blue >> 8) & 0xff);
+                        *(sp + 5) = (png_byte)(background->blue & 0xff);
+                     }
+                  }
+               }
+            }
+            break;
+         }
+         case PNG_COLOR_TYPE_GRAY_ALPHA:
+         {
+            if (row_info->bit_depth == 8)
+            {
+#if defined(PNG_READ_GAMMA_SUPPORTED)
+               if (gamma_to_1 != NULL && gamma_from_1 != NULL &&
+                   gamma_table != NULL)
+               {
+                  sp = row;
+                  dp = row;
+                  for (i = 0; i < row_width; i++, sp += 2, dp++)
+                  {
+                     png_uint_16 a = *(sp + 1);
+
+                     if (a == 0xff)
+                     {
+                        *dp = gamma_table[*sp];
+                     }
+                     else if (a == 0)
+                     {
+                        /* background is already in screen gamma */
+                        *dp = (png_byte)background->gray;
+                     }
+                     else
+                     {
+                        png_byte v, w;
+
+                        v = gamma_to_1[*sp];
+                        png_composite(w, v, a, background_1->gray);
+                        *dp = gamma_from_1[w];
+                     }
+                  }
+               }
+               else
+#endif
+               {
+                  sp = row;
+                  dp = row;
+                  for (i = 0; i < row_width; i++, sp += 2, dp++)
+                  {
+                     png_byte a = *(sp + 1);
+
+                     if (a == 0xff)
+                     {
+                        *dp = *sp;
+                     }
+#if defined(PNG_READ_GAMMA_SUPPORTED)
+                     else if (a == 0)
+                     {
+                        *dp = (png_byte)background->gray;
+                     }
+                     else
+                     {
+                        png_composite(*dp, *sp, a, background_1->gray);
+                     }
+#else
+                     *dp = (png_byte)background->gray;
+#endif
+                  }
+               }
+            }
+            else /* if (png_ptr->bit_depth == 16) */
+            {
+#if defined(PNG_READ_GAMMA_SUPPORTED)
+               if (gamma_16 != NULL && gamma_16_from_1 != NULL &&
+                   gamma_16_to_1 != NULL)
+               {
+                  sp = row;
+                  dp = row;
+                  for (i = 0; i < row_width; i++, sp += 4, dp += 2)
+                  {
+                     png_uint_16 a = (png_uint_16)(((*(sp+2)) << 8) + *(sp+3));
+
+                     if (a == (png_uint_16)0xffff)
+                     {
+                        png_uint_16 v;
+
+                        v = gamma_16[*(sp + 1) >> gamma_shift][*sp];
+                        *dp = (png_byte)((v >> 8) & 0xff);
+                        *(dp + 1) = (png_byte)(v & 0xff);
+                     }
+#if defined(PNG_READ_GAMMA_SUPPORTED)
+                     else if (a == 0)
+#else
+                     else
+#endif
+                     {
+                        /* background is already in screen gamma */
+                        *dp = (png_byte)((background->gray >> 8) & 0xff);
+                        *(dp + 1) = (png_byte)(background->gray & 0xff);
+                     }
+#if defined(PNG_READ_GAMMA_SUPPORTED)
+                     else
+                     {
+                        png_uint_16 g, v, w;
+
+                        g = gamma_16_to_1[*(sp + 1) >> gamma_shift][*sp];
+                        png_composite_16(v, g, a, background_1->gray);
+                        w = gamma_16_from_1[(v&0xff) >> gamma_shift][v >> 8];
+                        *dp = (png_byte)((w >> 8) & 0xff);
+                        *(dp + 1) = (png_byte)(w & 0xff);
+                     }
+#endif
+                  }
+               }
+               else
+#endif
+               {
+                  sp = row;
+                  dp = row;
+                  for (i = 0; i < row_width; i++, sp += 4, dp += 2)
+                  {
+                     png_uint_16 a = (png_uint_16)(((*(sp+2)) << 8) + *(sp+3));
+                     if (a == (png_uint_16)0xffff)
+                     {
+                        png_memcpy(dp, sp, 2);
+                     }
+#if defined(PNG_READ_GAMMA_SUPPORTED)
+                     else if (a == 0)
+#else
+                     else
+#endif
+                     {
+                        *dp = (png_byte)((background->gray >> 8) & 0xff);
+                        *(dp + 1) = (png_byte)(background->gray & 0xff);
+                     }
+#if defined(PNG_READ_GAMMA_SUPPORTED)
+                     else
+                     {
+                        png_uint_16 g, v;
+
+                        g = (png_uint_16)(((*sp) << 8) + *(sp + 1));
+                        png_composite_16(v, g, a, background_1->gray);
+                        *dp = (png_byte)((v >> 8) & 0xff);
+                        *(dp + 1) = (png_byte)(v & 0xff);
+                     }
+#endif
+                  }
+               }
+            }
+            break;
+         }
+         case PNG_COLOR_TYPE_RGB_ALPHA:
+         {
+            if (row_info->bit_depth == 8)
+            {
+#if defined(PNG_READ_GAMMA_SUPPORTED)
+               if (gamma_to_1 != NULL && gamma_from_1 != NULL &&
+                   gamma_table != NULL)
+               {
+                  sp = row;
+                  dp = row;
+                  for (i = 0; i < row_width; i++, sp += 4, dp += 3)
+                  {
+                     png_byte a = *(sp + 3);
+
+                     if (a == 0xff)
+                     {
+                        *dp = gamma_table[*sp];
+                        *(dp + 1) = gamma_table[*(sp + 1)];
+                        *(dp + 2) = gamma_table[*(sp + 2)];
+                     }
+                     else if (a == 0)
+                     {
+                        /* background is already in screen gamma */
+                        *dp = (png_byte)background->red;
+                        *(dp + 1) = (png_byte)background->green;
+                        *(dp + 2) = (png_byte)background->blue;
+                     }
+                     else
+                     {
+                        png_byte v, w;
+
+                        v = gamma_to_1[*sp];
+                        png_composite(w, v, a, background_1->red);
+                        *dp = gamma_from_1[w];
+                        v = gamma_to_1[*(sp + 1)];
+                        png_composite(w, v, a, background_1->green);
+                        *(dp + 1) = gamma_from_1[w];
+                        v = gamma_to_1[*(sp + 2)];
+                        png_composite(w, v, a, background_1->blue);
+                        *(dp + 2) = gamma_from_1[w];
+                     }
+                  }
+               }
+               else
+#endif
+               {
+                  sp = row;
+                  dp = row;
+                  for (i = 0; i < row_width; i++, sp += 4, dp += 3)
+                  {
+                     png_byte a = *(sp + 3);
+
+                     if (a == 0xff)
+                     {
+                        *dp = *sp;
+                        *(dp + 1) = *(sp + 1);
+                        *(dp + 2) = *(sp + 2);
+                     }
+                     else if (a == 0)
+                     {
+                        *dp = (png_byte)background->red;
+                        *(dp + 1) = (png_byte)background->green;
+                        *(dp + 2) = (png_byte)background->blue;
+                     }
+                     else
+                     {
+                        png_composite(*dp, *sp, a, background->red);
+                        png_composite(*(dp + 1), *(sp + 1), a,
+                           background->green);
+                        png_composite(*(dp + 2), *(sp + 2), a,
+                           background->blue);
+                     }
+                  }
+               }
+            }
+            else /* if (row_info->bit_depth == 16) */
+            {
+#if defined(PNG_READ_GAMMA_SUPPORTED)
+               if (gamma_16 != NULL && gamma_16_from_1 != NULL &&
+                   gamma_16_to_1 != NULL)
+               {
+                  sp = row;
+                  dp = row;
+                  for (i = 0; i < row_width; i++, sp += 8, dp += 6)
+                  {
+                     png_uint_16 a = (png_uint_16)(((png_uint_16)(*(sp + 6))
+                         << 8) + (png_uint_16)(*(sp + 7)));
+                     if (a == (png_uint_16)0xffff)
+                     {
+                        png_uint_16 v;
+
+                        v = gamma_16[*(sp + 1) >> gamma_shift][*sp];
+                        *dp = (png_byte)((v >> 8) & 0xff);
+                        *(dp + 1) = (png_byte)(v & 0xff);
+                        v = gamma_16[*(sp + 3) >> gamma_shift][*(sp + 2)];
+                        *(dp + 2) = (png_byte)((v >> 8) & 0xff);
+                        *(dp + 3) = (png_byte)(v & 0xff);
+                        v = gamma_16[*(sp + 5) >> gamma_shift][*(sp + 4)];
+                        *(dp + 4) = (png_byte)((v >> 8) & 0xff);
+                        *(dp + 5) = (png_byte)(v & 0xff);
+                     }
+                     else if (a == 0)
+                     {
+                        /* background is already in screen gamma */
+                        *dp = (png_byte)((background->red >> 8) & 0xff);
+                        *(dp + 1) = (png_byte)(background->red & 0xff);
+                        *(dp + 2) = (png_byte)((background->green >> 8) & 0xff);
+                        *(dp + 3) = (png_byte)(background->green & 0xff);
+                        *(dp + 4) = (png_byte)((background->blue >> 8) & 0xff);
+                        *(dp + 5) = (png_byte)(background->blue & 0xff);
+                     }
+                     else
+                     {
+                        png_uint_16 v, w, x;
+
+                        v = gamma_16_to_1[*(sp + 1) >> gamma_shift][*sp];
+                        png_composite_16(w, v, a, background_1->red);
+                        x = gamma_16_from_1[((w&0xff) >> gamma_shift)][w >> 8];
+                        *dp = (png_byte)((x >> 8) & 0xff);
+                        *(dp + 1) = (png_byte)(x & 0xff);
+                        v = gamma_16_to_1[*(sp + 3) >> gamma_shift][*(sp + 2)];
+                        png_composite_16(w, v, a, background_1->green);
+                        x = gamma_16_from_1[((w&0xff) >> gamma_shift)][w >> 8];
+                        *(dp + 2) = (png_byte)((x >> 8) & 0xff);
+                        *(dp + 3) = (png_byte)(x & 0xff);
+                        v = gamma_16_to_1[*(sp + 5) >> gamma_shift][*(sp + 4)];
+                        png_composite_16(w, v, a, background_1->blue);
+                        x = gamma_16_from_1[(w & 0xff) >> gamma_shift][w >> 8];
+                        *(dp + 4) = (png_byte)((x >> 8) & 0xff);
+                        *(dp + 5) = (png_byte)(x & 0xff);
+                     }
+                  }
+               }
+               else
+#endif
+               {
+                  sp = row;
+                  dp = row;
+                  for (i = 0; i < row_width; i++, sp += 8, dp += 6)
+                  {
+                     png_uint_16 a = (png_uint_16)(((png_uint_16)(*(sp + 6))
+                        << 8) + (png_uint_16)(*(sp + 7)));
+                     if (a == (png_uint_16)0xffff)
+                     {
+                        png_memcpy(dp, sp, 6);
+                     }
+                     else if (a == 0)
+                     {
+                        *dp = (png_byte)((background->red >> 8) & 0xff);
+                        *(dp + 1) = (png_byte)(background->red & 0xff);
+                        *(dp + 2) = (png_byte)((background->green >> 8) & 0xff);
+                        *(dp + 3) = (png_byte)(background->green & 0xff);
+                        *(dp + 4) = (png_byte)((background->blue >> 8) & 0xff);
+                        *(dp + 5) = (png_byte)(background->blue & 0xff);
+                     }
+                     else
+                     {
+                        png_uint_16 v;
+
+                        png_uint_16 r = (png_uint_16)(((*sp) << 8) + *(sp + 1));
+                        png_uint_16 g = (png_uint_16)(((*(sp + 2)) << 8)
+                            + *(sp + 3));
+                        png_uint_16 b = (png_uint_16)(((*(sp + 4)) << 8)
+                            + *(sp + 5));
+
+                        png_composite_16(v, r, a, background->red);
+                        *dp = (png_byte)((v >> 8) & 0xff);
+                        *(dp + 1) = (png_byte)(v & 0xff);
+                        png_composite_16(v, g, a, background->green);
+                        *(dp + 2) = (png_byte)((v >> 8) & 0xff);
+                        *(dp + 3) = (png_byte)(v & 0xff);
+                        png_composite_16(v, b, a, background->blue);
+                        *(dp + 4) = (png_byte)((v >> 8) & 0xff);
+                        *(dp + 5) = (png_byte)(v & 0xff);
+                     }
+                  }
+               }
+            }
+            break;
+         }
+      }
+
+      if (row_info->color_type & PNG_COLOR_MASK_ALPHA)
+      {
+         row_info->color_type &= ~PNG_COLOR_MASK_ALPHA;
+         row_info->channels--;
+         row_info->pixel_depth = (png_byte)(row_info->channels *
+            row_info->bit_depth);
+         row_info->rowbytes = PNG_ROWBYTES(row_info->pixel_depth,row_width);
+      }
+   }
+}
+#endif
+
+#if defined(PNG_READ_GAMMA_SUPPORTED)
+/* Gamma correct the image, avoiding the alpha channel.  Make sure
+ * you do this after you deal with the transparency issue on grayscale
+ * or RGB images. If your bit depth is 8, use gamma_table, if it
+ * is 16, use gamma_16_table and gamma_shift.  Build these with
+ * build_gamma_table().
+ */
+void /* PRIVATE */
+png_do_gamma(png_row_infop row_info, png_bytep row,
+   png_bytep gamma_table, png_uint_16pp gamma_16_table,
+   int gamma_shift)
+{
+   png_bytep sp;
+   png_uint_32 i;
+   png_uint_32 row_width=row_info->width;
+
+   png_debug(1, "in png_do_gamma\n");
+   if (
+#if defined(PNG_USELESS_TESTS_SUPPORTED)
+       row != NULL && row_info != NULL &&
+#endif
+       ((row_info->bit_depth <= 8 && gamma_table != NULL) ||
+        (row_info->bit_depth == 16 && gamma_16_table != NULL)))
+   {
+      switch (row_info->color_type)
+      {
+         case PNG_COLOR_TYPE_RGB:
+         {
+            if (row_info->bit_depth == 8)
+            {
+               sp = row;
+               for (i = 0; i < row_width; i++)
+               {
+                  *sp = gamma_table[*sp];
+                  sp++;
+                  *sp = gamma_table[*sp];
+                  sp++;
+                  *sp = gamma_table[*sp];
+                  sp++;
+               }
+            }
+            else /* if (row_info->bit_depth == 16) */
+            {
+               sp = row;
+               for (i = 0; i < row_width; i++)
+               {
+                  png_uint_16 v;
+
+                  v = gamma_16_table[*(sp + 1) >> gamma_shift][*sp];
+                  *sp = (png_byte)((v >> 8) & 0xff);
+                  *(sp + 1) = (png_byte)(v & 0xff);
+                  sp += 2;
+                  v = gamma_16_table[*(sp + 1) >> gamma_shift][*sp];
+                  *sp = (png_byte)((v >> 8) & 0xff);
+                  *(sp + 1) = (png_byte)(v & 0xff);
+                  sp += 2;
+                  v = gamma_16_table[*(sp + 1) >> gamma_shift][*sp];
+                  *sp = (png_byte)((v >> 8) & 0xff);
+                  *(sp + 1) = (png_byte)(v & 0xff);
+                  sp += 2;
+               }
+            }
+            break;
+         }
+         case PNG_COLOR_TYPE_RGB_ALPHA:
+         {
+            if (row_info->bit_depth == 8)
+            {
+               sp = row;
+               for (i = 0; i < row_width; i++)
+               {
+                  *sp = gamma_table[*sp];
+                  sp++;
+                  *sp = gamma_table[*sp];
+                  sp++;
+                  *sp = gamma_table[*sp];
+                  sp++;
+                  sp++;
+               }
+            }
+            else /* if (row_info->bit_depth == 16) */
+            {
+               sp = row;
+               for (i = 0; i < row_width; i++)
+               {
+                  png_uint_16 v = gamma_16_table[*(sp + 1) >> gamma_shift][*sp];
+                  *sp = (png_byte)((v >> 8) & 0xff);
+                  *(sp + 1) = (png_byte)(v & 0xff);
+                  sp += 2;
+                  v = gamma_16_table[*(sp + 1) >> gamma_shift][*sp];
+                  *sp = (png_byte)((v >> 8) & 0xff);
+                  *(sp + 1) = (png_byte)(v & 0xff);
+                  sp += 2;
+                  v = gamma_16_table[*(sp + 1) >> gamma_shift][*sp];
+                  *sp = (png_byte)((v >> 8) & 0xff);
+                  *(sp + 1) = (png_byte)(v & 0xff);
+                  sp += 4;
+               }
+            }
+            break;
+         }
+         case PNG_COLOR_TYPE_GRAY_ALPHA:
+         {
+            if (row_info->bit_depth == 8)
+            {
+               sp = row;
+               for (i = 0; i < row_width; i++)
+               {
+                  *sp = gamma_table[*sp];
+                  sp += 2;
+               }
+            }
+            else /* if (row_info->bit_depth == 16) */
+            {
+               sp = row;
+               for (i = 0; i < row_width; i++)
+               {
+                  png_uint_16 v = gamma_16_table[*(sp + 1) >> gamma_shift][*sp];
+                  *sp = (png_byte)((v >> 8) & 0xff);
+                  *(sp + 1) = (png_byte)(v & 0xff);
+                  sp += 4;
+               }
+            }
+            break;
+         }
+         case PNG_COLOR_TYPE_GRAY:
+         {
+            if (row_info->bit_depth == 2)
+            {
+               sp = row;
+               for (i = 0; i < row_width; i += 4)
+               {
+                  int a = *sp & 0xc0;
+                  int b = *sp & 0x30;
+                  int c = *sp & 0x0c;
+                  int d = *sp & 0x03;
+
+                  *sp = (png_byte)(
+                        ((((int)gamma_table[a|(a>>2)|(a>>4)|(a>>6)])   ) & 0xc0)|
+                        ((((int)gamma_table[(b<<2)|b|(b>>2)|(b>>4)])>>2) & 0x30)|
+                        ((((int)gamma_table[(c<<4)|(c<<2)|c|(c>>2)])>>4) & 0x0c)|
+                        ((((int)gamma_table[(d<<6)|(d<<4)|(d<<2)|d])>>6) ));
+                  sp++;
+               }
+            }
+            if (row_info->bit_depth == 4)
+            {
+               sp = row;
+               for (i = 0; i < row_width; i += 2)
+               {
+                  int msb = *sp & 0xf0;
+                  int lsb = *sp & 0x0f;
+
+                  *sp = (png_byte)((((int)gamma_table[msb | (msb >> 4)]) & 0xf0)
+                          | (((int)gamma_table[(lsb << 4) | lsb]) >> 4));
+                  sp++;
+               }
+            }
+            else if (row_info->bit_depth == 8)
+            {
+               sp = row;
+               for (i = 0; i < row_width; i++)
+               {
+                  *sp = gamma_table[*sp];
+                  sp++;
+               }
+            }
+            else if (row_info->bit_depth == 16)
+            {
+               sp = row;
+               for (i = 0; i < row_width; i++)
+               {
+                  png_uint_16 v = gamma_16_table[*(sp + 1) >> gamma_shift][*sp];
+                  *sp = (png_byte)((v >> 8) & 0xff);
+                  *(sp + 1) = (png_byte)(v & 0xff);
+                  sp += 2;
+               }
+            }
+            break;
+         }
+      }
+   }
+}
+#endif
+
+#if defined(PNG_READ_EXPAND_SUPPORTED)
+/* Expands a palette row to an RGB or RGBA row depending
+ * upon whether you supply trans and num_trans.
+ */
+void /* PRIVATE */
+png_do_expand_palette(png_row_infop row_info, png_bytep row,
+   png_colorp palette, png_bytep trans, int num_trans)
+{
+   int shift, value;
+   png_bytep sp, dp;
+   png_uint_32 i;
+   png_uint_32 row_width=row_info->width;
+
+   png_debug(1, "in png_do_expand_palette\n");
+   if (
+#if defined(PNG_USELESS_TESTS_SUPPORTED)
+       row != NULL && row_info != NULL &&
+#endif
+       row_info->color_type == PNG_COLOR_TYPE_PALETTE)
+   {
+      if (row_info->bit_depth < 8)
+      {
+         switch (row_info->bit_depth)
+         {
+            case 1:
+            {
+               sp = row + (png_size_t)((row_width - 1) >> 3);
+               dp = row + (png_size_t)row_width - 1;
+               shift = 7 - (int)((row_width + 7) & 0x07);
+               for (i = 0; i < row_width; i++)
+               {
+                  if ((*sp >> shift) & 0x01)
+                     *dp = 1;
+                  else
+                     *dp = 0;
+                  if (shift == 7)
+                  {
+                     shift = 0;
+                     sp--;
+                  }
+                  else
+                     shift++;
+
+                  dp--;
+               }
+               break;
+            }
+            case 2:
+            {
+               sp = row + (png_size_t)((row_width - 1) >> 2);
+               dp = row + (png_size_t)row_width - 1;
+               shift = (int)((3 - ((row_width + 3) & 0x03)) << 1);
+               for (i = 0; i < row_width; i++)
+               {
+                  value = (*sp >> shift) & 0x03;
+                  *dp = (png_byte)value;
+                  if (shift == 6)
+                  {
+                     shift = 0;
+                     sp--;
+                  }
+                  else
+                     shift += 2;
+
+                  dp--;
+               }
+               break;
+            }
+            case 4:
+            {
+               sp = row + (png_size_t)((row_width - 1) >> 1);
+               dp = row + (png_size_t)row_width - 1;
+               shift = (int)((row_width & 0x01) << 2);
+               for (i = 0; i < row_width; i++)
+               {
+                  value = (*sp >> shift) & 0x0f;
+                  *dp = (png_byte)value;
+                  if (shift == 4)
+                  {
+                     shift = 0;
+                     sp--;
+                  }
+                  else
+                     shift += 4;
+
+                  dp--;
+               }
+               break;
+            }
+         }
+         row_info->bit_depth = 8;
+         row_info->pixel_depth = 8;
+         row_info->rowbytes = row_width;
+      }
+      switch (row_info->bit_depth)
+      {
+         case 8:
+         {
+            if (trans != NULL)
+            {
+               sp = row + (png_size_t)row_width - 1;
+               dp = row + (png_size_t)(row_width << 2) - 1;
+
+               for (i = 0; i < row_width; i++)
+               {
+                  if ((int)(*sp) >= num_trans)
+                     *dp-- = 0xff;
+                  else
+                     *dp-- = trans[*sp];
+                  *dp-- = palette[*sp].blue;
+                  *dp-- = palette[*sp].green;
+                  *dp-- = palette[*sp].red;
+                  sp--;
+               }
+               row_info->bit_depth = 8;
+               row_info->pixel_depth = 32;
+               row_info->rowbytes = row_width * 4;
+               row_info->color_type = 6;
+               row_info->channels = 4;
+            }
+            else
+            {
+               sp = row + (png_size_t)row_width - 1;
+               dp = row + (png_size_t)(row_width * 3) - 1;
+
+               for (i = 0; i < row_width; i++)
+               {
+                  *dp-- = palette[*sp].blue;
+                  *dp-- = palette[*sp].green;
+                  *dp-- = palette[*sp].red;
+                  sp--;
+               }
+               row_info->bit_depth = 8;
+               row_info->pixel_depth = 24;
+               row_info->rowbytes = row_width * 3;
+               row_info->color_type = 2;
+               row_info->channels = 3;
+            }
+            break;
+         }
+      }
+   }
+}
+
+/* If the bit depth < 8, it is expanded to 8.  Also, if the already
+ * expanded transparency value is supplied, an alpha channel is built.
+ */
+void /* PRIVATE */
+png_do_expand(png_row_infop row_info, png_bytep row,
+   png_color_16p trans_value)
+{
+   int shift, value;
+   png_bytep sp, dp;
+   png_uint_32 i;
+   png_uint_32 row_width=row_info->width;
+
+   png_debug(1, "in png_do_expand\n");
+#if defined(PNG_USELESS_TESTS_SUPPORTED)
+   if (row != NULL && row_info != NULL)
+#endif
+   {
+      if (row_info->color_type == PNG_COLOR_TYPE_GRAY)
+      {
+         png_uint_16 gray = (png_uint_16)(trans_value ? trans_value->gray : 0);
+
+         if (row_info->bit_depth < 8)
+         {
+            switch (row_info->bit_depth)
+            {
+               case 1:
+               {
+                  gray = (png_uint_16)((gray&0x01)*0xff);
+                  sp = row + (png_size_t)((row_width - 1) >> 3);
+                  dp = row + (png_size_t)row_width - 1;
+                  shift = 7 - (int)((row_width + 7) & 0x07);
+                  for (i = 0; i < row_width; i++)
+                  {
+                     if ((*sp >> shift) & 0x01)
+                        *dp = 0xff;
+                     else
+                        *dp = 0;
+                     if (shift == 7)
+                     {
+                        shift = 0;
+                        sp--;
+                     }
+                     else
+                        shift++;
+
+                     dp--;
+                  }
+                  break;
+               }
+               case 2:
+               {
+                  gray = (png_uint_16)((gray&0x03)*0x55);
+                  sp = row + (png_size_t)((row_width - 1) >> 2);
+                  dp = row + (png_size_t)row_width - 1;
+                  shift = (int)((3 - ((row_width + 3) & 0x03)) << 1);
+                  for (i = 0; i < row_width; i++)
+                  {
+                     value = (*sp >> shift) & 0x03;
+                     *dp = (png_byte)(value | (value << 2) | (value << 4) |
+                        (value << 6));
+                     if (shift == 6)
+                     {
+                        shift = 0;
+                        sp--;
+                     }
+                     else
+                        shift += 2;
+
+                     dp--;
+                  }
+                  break;
+               }
+               case 4:
+               {
+                  gray = (png_uint_16)((gray&0x0f)*0x11);
+                  sp = row + (png_size_t)((row_width - 1) >> 1);
+                  dp = row + (png_size_t)row_width - 1;
+                  shift = (int)((1 - ((row_width + 1) & 0x01)) << 2);
+                  for (i = 0; i < row_width; i++)
+                  {
+                     value = (*sp >> shift) & 0x0f;
+                     *dp = (png_byte)(value | (value << 4));
+                     if (shift == 4)
+                     {
+                        shift = 0;
+                        sp--;
+                     }
+                     else
+                        shift = 4;
+
+                     dp--;
+                  }
+                  break;
+               }
+            }
+            row_info->bit_depth = 8;
+            row_info->pixel_depth = 8;
+            row_info->rowbytes = row_width;
+         }
+
+         if (trans_value != NULL)
+         {
+            if (row_info->bit_depth == 8)
+            {
+               gray = gray & 0xff;
+               sp = row + (png_size_t)row_width - 1;
+               dp = row + (png_size_t)(row_width << 1) - 1;
+               for (i = 0; i < row_width; i++)
+               {
+                  if (*sp == gray)
+                     *dp-- = 0;
+                  else
+                     *dp-- = 0xff;
+                  *dp-- = *sp--;
+               }
+            }
+            else if (row_info->bit_depth == 16)
+            {
+               png_byte gray_high = (gray >> 8) & 0xff;
+               png_byte gray_low = gray & 0xff;
+               sp = row + row_info->rowbytes - 1;
+               dp = row + (row_info->rowbytes << 1) - 1;
+               for (i = 0; i < row_width; i++)
+               {
+                  if (*(sp-1) == gray_high && *(sp) == gray_low)
+                  {
+                     *dp-- = 0;
+                     *dp-- = 0;
+                  }
+                  else
+                  {
+                     *dp-- = 0xff;
+                     *dp-- = 0xff;
+                  }
+                  *dp-- = *sp--;
+                  *dp-- = *sp--;
+               }
+            }
+            row_info->color_type = PNG_COLOR_TYPE_GRAY_ALPHA;
+            row_info->channels = 2;
+            row_info->pixel_depth = (png_byte)(row_info->bit_depth << 1);
+            row_info->rowbytes = PNG_ROWBYTES(row_info->pixel_depth,
+               row_width);
+         }
+      }
+      else if (row_info->color_type == PNG_COLOR_TYPE_RGB && trans_value)
+      {
+         if (row_info->bit_depth == 8)
+         {
+            png_byte red = trans_value->red & 0xff;
+            png_byte green = trans_value->green & 0xff;
+            png_byte blue = trans_value->blue & 0xff;
+            sp = row + (png_size_t)row_info->rowbytes - 1;
+            dp = row + (png_size_t)(row_width << 2) - 1;
+            for (i = 0; i < row_width; i++)
+            {
+               if (*(sp - 2) == red && *(sp - 1) == green && *(sp) == blue)
+                  *dp-- = 0;
+               else
+                  *dp-- = 0xff;
+               *dp-- = *sp--;
+               *dp-- = *sp--;
+               *dp-- = *sp--;
+            }
+         }
+         else if (row_info->bit_depth == 16)
+         {
+            png_byte red_high = (trans_value->red >> 8) & 0xff;
+            png_byte green_high = (trans_value->green >> 8) & 0xff;
+            png_byte blue_high = (trans_value->blue >> 8) & 0xff;
+            png_byte red_low = trans_value->red & 0xff;
+            png_byte green_low = trans_value->green & 0xff;
+            png_byte blue_low = trans_value->blue & 0xff;
+            sp = row + row_info->rowbytes - 1;
+            dp = row + (png_size_t)(row_width << 3) - 1;
+            for (i = 0; i < row_width; i++)
+            {
+               if (*(sp - 5) == red_high &&
+                  *(sp - 4) == red_low &&
+                  *(sp - 3) == green_high &&
+                  *(sp - 2) == green_low &&
+                  *(sp - 1) == blue_high &&
+                  *(sp    ) == blue_low)
+               {
+                  *dp-- = 0;
+                  *dp-- = 0;
+               }
+               else
+               {
+                  *dp-- = 0xff;
+                  *dp-- = 0xff;
+               }
+               *dp-- = *sp--;
+               *dp-- = *sp--;
+               *dp-- = *sp--;
+               *dp-- = *sp--;
+               *dp-- = *sp--;
+               *dp-- = *sp--;
+            }
+         }
+         row_info->color_type = PNG_COLOR_TYPE_RGB_ALPHA;
+         row_info->channels = 4;
+         row_info->pixel_depth = (png_byte)(row_info->bit_depth << 2);
+         row_info->rowbytes = PNG_ROWBYTES(row_info->pixel_depth,row_width);
+      }
+   }
+}
+#endif
+
+#if defined(PNG_READ_DITHER_SUPPORTED)
+void /* PRIVATE */
+png_do_dither(png_row_infop row_info, png_bytep row,
+    png_bytep palette_lookup, png_bytep dither_lookup)
+{
+   png_bytep sp, dp;
+   png_uint_32 i;
+   png_uint_32 row_width=row_info->width;
+
+   png_debug(1, "in png_do_dither\n");
+#if defined(PNG_USELESS_TESTS_SUPPORTED)
+   if (row != NULL && row_info != NULL)
+#endif
+   {
+      if (row_info->color_type == PNG_COLOR_TYPE_RGB &&
+         palette_lookup && row_info->bit_depth == 8)
+      {
+         int r, g, b, p;
+         sp = row;
+         dp = row;
+         for (i = 0; i < row_width; i++)
+         {
+            r = *sp++;
+            g = *sp++;
+            b = *sp++;
+
+            /* this looks real messy, but the compiler will reduce
+               it down to a reasonable formula.  For example, with
+               5 bits per color, we get:
+               p = (((r >> 3) & 0x1f) << 10) |
+                  (((g >> 3) & 0x1f) << 5) |
+                  ((b >> 3) & 0x1f);
+               */
+            p = (((r >> (8 - PNG_DITHER_RED_BITS)) &
+               ((1 << PNG_DITHER_RED_BITS) - 1)) <<
+               (PNG_DITHER_GREEN_BITS + PNG_DITHER_BLUE_BITS)) |
+               (((g >> (8 - PNG_DITHER_GREEN_BITS)) &
+               ((1 << PNG_DITHER_GREEN_BITS) - 1)) <<
+               (PNG_DITHER_BLUE_BITS)) |
+               ((b >> (8 - PNG_DITHER_BLUE_BITS)) &
+               ((1 << PNG_DITHER_BLUE_BITS) - 1));
+
+            *dp++ = palette_lookup[p];
+         }
+         row_info->color_type = PNG_COLOR_TYPE_PALETTE;
+         row_info->channels = 1;
+         row_info->pixel_depth = row_info->bit_depth;
+         row_info->rowbytes = PNG_ROWBYTES(row_info->pixel_depth,row_width);
+      }
+      else if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA &&
+         palette_lookup != NULL && row_info->bit_depth == 8)
+      {
+         int r, g, b, p;
+         sp = row;
+         dp = row;
+         for (i = 0; i < row_width; i++)
+         {
+            r = *sp++;
+            g = *sp++;
+            b = *sp++;
+            sp++;
+
+            p = (((r >> (8 - PNG_DITHER_RED_BITS)) &
+               ((1 << PNG_DITHER_RED_BITS) - 1)) <<
+               (PNG_DITHER_GREEN_BITS + PNG_DITHER_BLUE_BITS)) |
+               (((g >> (8 - PNG_DITHER_GREEN_BITS)) &
+               ((1 << PNG_DITHER_GREEN_BITS) - 1)) <<
+               (PNG_DITHER_BLUE_BITS)) |
+               ((b >> (8 - PNG_DITHER_BLUE_BITS)) &
+               ((1 << PNG_DITHER_BLUE_BITS) - 1));
+
+            *dp++ = palette_lookup[p];
+         }
+         row_info->color_type = PNG_COLOR_TYPE_PALETTE;
+         row_info->channels = 1;
+         row_info->pixel_depth = row_info->bit_depth;
+         row_info->rowbytes = PNG_ROWBYTES(row_info->pixel_depth,row_width);
+      }
+      else if (row_info->color_type == PNG_COLOR_TYPE_PALETTE &&
+         dither_lookup && row_info->bit_depth == 8)
+      {
+         sp = row;
+         for (i = 0; i < row_width; i++, sp++)
+         {
+            *sp = dither_lookup[*sp];
+         }
+      }
+   }
+}
+#endif
+
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+#if defined(PNG_READ_GAMMA_SUPPORTED)
+static PNG_CONST int png_gamma_shift[] =
+   {0x10, 0x21, 0x42, 0x84, 0x110, 0x248, 0x550, 0xff0, 0x00};
+
+/* We build the 8- or 16-bit gamma tables here.  Note that for 16-bit
+ * tables, we don't make a full table if we are reducing to 8-bit in
+ * the future.  Note also how the gamma_16 tables are segmented so that
+ * we don't need to allocate > 64K chunks for a full 16-bit table.
+ */
+void /* PRIVATE */
+png_build_gamma_table(png_structp png_ptr)
+{
+  png_debug(1, "in png_build_gamma_table\n");
+
+  if (png_ptr->bit_depth <= 8)
+  {
+     int i;
+     double g;
+
+     if (png_ptr->screen_gamma > .000001)
+        g = 1.0 / (png_ptr->gamma * png_ptr->screen_gamma);
+     else
+        g = 1.0;
+
+     png_ptr->gamma_table = (png_bytep)png_malloc(png_ptr,
+        (png_uint_32)256);
+
+     for (i = 0; i < 256; i++)
+     {
+        png_ptr->gamma_table[i] = (png_byte)(pow((double)i / 255.0,
+           g) * 255.0 + .5);
+     }
+
+#if defined(PNG_READ_BACKGROUND_SUPPORTED) || \
+   defined(PNG_READ_RGB_TO_GRAY_SUPPORTED)
+     if (png_ptr->transformations & ((PNG_BACKGROUND) | PNG_RGB_TO_GRAY))
+     {
+
+        g = 1.0 / (png_ptr->gamma);
+
+        png_ptr->gamma_to_1 = (png_bytep)png_malloc(png_ptr,
+           (png_uint_32)256);
+
+        for (i = 0; i < 256; i++)
+        {
+           png_ptr->gamma_to_1[i] = (png_byte)(pow((double)i / 255.0,
+              g) * 255.0 + .5);
+        }
+
+
+        png_ptr->gamma_from_1 = (png_bytep)png_malloc(png_ptr,
+           (png_uint_32)256);
+
+        if(png_ptr->screen_gamma > 0.000001)
+           g = 1.0 / png_ptr->screen_gamma;
+        else
+           g = png_ptr->gamma;   /* probably doing rgb_to_gray */
+
+        for (i = 0; i < 256; i++)
+        {
+           png_ptr->gamma_from_1[i] = (png_byte)(pow((double)i / 255.0,
+              g) * 255.0 + .5);
+
+        }
+     }
+#endif /* PNG_READ_BACKGROUND_SUPPORTED || PNG_RGB_TO_GRAY_SUPPORTED */
+  }
+  else
+  {
+     double g;
+     int i, j, shift, num;
+     int sig_bit;
+     png_uint_32 ig;
+
+     if (png_ptr->color_type & PNG_COLOR_MASK_COLOR)
+     {
+        sig_bit = (int)png_ptr->sig_bit.red;
+        if ((int)png_ptr->sig_bit.green > sig_bit)
+           sig_bit = png_ptr->sig_bit.green;
+        if ((int)png_ptr->sig_bit.blue > sig_bit)
+           sig_bit = png_ptr->sig_bit.blue;
+     }
+     else
+     {
+        sig_bit = (int)png_ptr->sig_bit.gray;
+     }
+
+     if (sig_bit > 0)
+        shift = 16 - sig_bit;
+     else
+        shift = 0;
+
+     if (png_ptr->transformations & PNG_16_TO_8)
+     {
+        if (shift < (16 - PNG_MAX_GAMMA_8))
+           shift = (16 - PNG_MAX_GAMMA_8);
+     }
+
+     if (shift > 8)
+        shift = 8;
+     if (shift < 0)
+        shift = 0;
+
+     png_ptr->gamma_shift = (png_byte)shift;
+
+     num = (1 << (8 - shift));
+
+     if (png_ptr->screen_gamma > .000001)
+        g = 1.0 / (png_ptr->gamma * png_ptr->screen_gamma);
+     else
+        g = 1.0;
+
+     png_ptr->gamma_16_table = (png_uint_16pp)png_malloc(png_ptr,
+        (png_uint_32)(num * png_sizeof (png_uint_16p)));
+
+     if (png_ptr->transformations & (PNG_16_TO_8 | PNG_BACKGROUND))
+     {
+        double fin, fout;
+        png_uint_32 last, max;
+
+        for (i = 0; i < num; i++)
+        {
+           png_ptr->gamma_16_table[i] = (png_uint_16p)png_malloc(png_ptr,
+              (png_uint_32)(256 * png_sizeof (png_uint_16)));
+        }
+
+        g = 1.0 / g;
+        last = 0;
+        for (i = 0; i < 256; i++)
+        {
+           fout = ((double)i + 0.5) / 256.0;
+           fin = pow(fout, g);
+           max = (png_uint_32)(fin * (double)((png_uint_32)num << 8));
+           while (last <= max)
+           {
+              png_ptr->gamma_16_table[(int)(last & (0xff >> shift))]
+                 [(int)(last >> (8 - shift))] = (png_uint_16)(
+                 (png_uint_16)i | ((png_uint_16)i << 8));
+              last++;
+           }
+        }
+        while (last < ((png_uint_32)num << 8))
+        {
+           png_ptr->gamma_16_table[(int)(last & (0xff >> shift))]
+              [(int)(last >> (8 - shift))] = (png_uint_16)65535L;
+           last++;
+        }
+     }
+     else
+     {
+        for (i = 0; i < num; i++)
+        {
+           png_ptr->gamma_16_table[i] = (png_uint_16p)png_malloc(png_ptr,
+              (png_uint_32)(256 * png_sizeof (png_uint_16)));
+
+           ig = (((png_uint_32)i * (png_uint_32)png_gamma_shift[shift]) >> 4);
+           for (j = 0; j < 256; j++)
+           {
+              png_ptr->gamma_16_table[i][j] =
+                 (png_uint_16)(pow((double)(ig + ((png_uint_32)j << 8)) /
+                    65535.0, g) * 65535.0 + .5);
+           }
+        }
+     }
+
+#if defined(PNG_READ_BACKGROUND_SUPPORTED) || \
+   defined(PNG_READ_RGB_TO_GRAY_SUPPORTED)
+     if (png_ptr->transformations & (PNG_BACKGROUND | PNG_RGB_TO_GRAY))
+     {
+
+        g = 1.0 / (png_ptr->gamma);
+
+        png_ptr->gamma_16_to_1 = (png_uint_16pp)png_malloc(png_ptr,
+           (png_uint_32)(num * png_sizeof (png_uint_16p )));
+
+        for (i = 0; i < num; i++)
+        {
+           png_ptr->gamma_16_to_1[i] = (png_uint_16p)png_malloc(png_ptr,
+              (png_uint_32)(256 * png_sizeof (png_uint_16)));
+
+           ig = (((png_uint_32)i *
+              (png_uint_32)png_gamma_shift[shift]) >> 4);
+           for (j = 0; j < 256; j++)
+           {
+              png_ptr->gamma_16_to_1[i][j] =
+                 (png_uint_16)(pow((double)(ig + ((png_uint_32)j << 8)) /
+                    65535.0, g) * 65535.0 + .5);
+           }
+        }
+
+        if(png_ptr->screen_gamma > 0.000001)
+           g = 1.0 / png_ptr->screen_gamma;
+        else
+           g = png_ptr->gamma;   /* probably doing rgb_to_gray */
+
+        png_ptr->gamma_16_from_1 = (png_uint_16pp)png_malloc(png_ptr,
+           (png_uint_32)(num * png_sizeof (png_uint_16p)));
+
+        for (i = 0; i < num; i++)
+        {
+           png_ptr->gamma_16_from_1[i] = (png_uint_16p)png_malloc(png_ptr,
+              (png_uint_32)(256 * png_sizeof (png_uint_16)));
+
+           ig = (((png_uint_32)i *
+              (png_uint_32)png_gamma_shift[shift]) >> 4);
+           for (j = 0; j < 256; j++)
+           {
+              png_ptr->gamma_16_from_1[i][j] =
+                 (png_uint_16)(pow((double)(ig + ((png_uint_32)j << 8)) /
+                    65535.0, g) * 65535.0 + .5);
+           }
+        }
+     }
+#endif /* PNG_READ_BACKGROUND_SUPPORTED || PNG_RGB_TO_GRAY_SUPPORTED */
+  }
+}
+#endif
+/* To do: install integer version of png_build_gamma_table here */
+#endif
+
+#if defined(PNG_MNG_FEATURES_SUPPORTED)
+/* undoes intrapixel differencing  */
+void /* PRIVATE */
+png_do_read_intrapixel(png_row_infop row_info, png_bytep row)
+{
+   png_debug(1, "in png_do_read_intrapixel\n");
+   if (
+#if defined(PNG_USELESS_TESTS_SUPPORTED)
+       row != NULL && row_info != NULL &&
+#endif
+       (row_info->color_type & PNG_COLOR_MASK_COLOR))
+   {
+      int bytes_per_pixel;
+      png_uint_32 row_width = row_info->width;
+      if (row_info->bit_depth == 8)
+      {
+         png_bytep rp;
+         png_uint_32 i;
+
+         if (row_info->color_type == PNG_COLOR_TYPE_RGB)
+            bytes_per_pixel = 3;
+         else if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
+            bytes_per_pixel = 4;
+         else
+            return;
+
+         for (i = 0, rp = row; i < row_width; i++, rp += bytes_per_pixel)
+         {
+            *(rp) = (png_byte)((256 + *rp + *(rp+1))&0xff);
+            *(rp+2) = (png_byte)((256 + *(rp+2) + *(rp+1))&0xff);
+         }
+      }
+      else if (row_info->bit_depth == 16)
+      {
+         png_bytep rp;
+         png_uint_32 i;
+
+         if (row_info->color_type == PNG_COLOR_TYPE_RGB)
+            bytes_per_pixel = 6;
+         else if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
+            bytes_per_pixel = 8;
+         else
+            return;
+
+         for (i = 0, rp = row; i < row_width; i++, rp += bytes_per_pixel)
+         {
+            png_uint_32 s0   = (*(rp  ) << 8) | *(rp+1);
+            png_uint_32 s1   = (*(rp+2) << 8) | *(rp+3);
+            png_uint_32 s2   = (*(rp+4) << 8) | *(rp+5);
+            png_uint_32 red  = (png_uint_32)((s0+s1+65536L) & 0xffffL);
+            png_uint_32 blue = (png_uint_32)((s2+s1+65536L) & 0xffffL);
+            *(rp  ) = (png_byte)((red >> 8) & 0xff);
+            *(rp+1) = (png_byte)(red & 0xff);
+            *(rp+4) = (png_byte)((blue >> 8) & 0xff);
+            *(rp+5) = (png_byte)(blue & 0xff);
+         }
+      }
+   }
+}
+#endif /* PNG_MNG_FEATURES_SUPPORTED */
+#endif /* PNG_READ_SUPPORTED */
diff --git a/uppsrc/plugin/png/lib/pngrutil.c b/uppsrc/plugin/png/lib/pngrutil.c
new file mode 100644
index 000000000..ad4f1a957
--- /dev/null
+++ b/uppsrc/plugin/png/lib/pngrutil.c
@@ -0,0 +1,3163 @@
+
+/* pngrutil.c - utilities to read a PNG file
+ *
+ * Last changed in libpng 1.2.22 [October 13, 2007]
+ * For conditions of distribution and use, see copyright notice in png.h
+ * Copyright (c) 1998-2007 Glenn Randers-Pehrson
+ * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
+ * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
+ *
+ * This file contains routines that are only called from within
+ * libpng itself during the course of reading an image.
+ */
+
+#define PNG_INTERNAL
+#include "png.h"
+
+#if defined(PNG_READ_SUPPORTED)
+
+#if defined(_WIN32_WCE) && (_WIN32_WCE<0x500)
+#  define WIN32_WCE_OLD
+#endif
+
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+#  if defined(WIN32_WCE_OLD)
+/* strtod() function is not supported on WindowsCE */
+__inline double png_strtod(png_structp png_ptr, PNG_CONST char *nptr, char **endptr)
+{
+   double result = 0;
+   int len;
+   wchar_t *str, *end;
+
+   len = MultiByteToWideChar(CP_ACP, 0, nptr, -1, NULL, 0);
+   str = (wchar_t *)png_malloc(png_ptr, len * sizeof(wchar_t));
+   if ( NULL != str )
+   {
+      MultiByteToWideChar(CP_ACP, 0, nptr, -1, str, len);
+      result = wcstod(str, &end);
+      len = WideCharToMultiByte(CP_ACP, 0, end, -1, NULL, 0, NULL, NULL);
+      *endptr = (char *)nptr + (png_strlen(nptr) - len + 1);
+      png_free(png_ptr, str);
+   }
+   return result;
+}
+#  else
+#    define png_strtod(p,a,b) strtod(a,b)
+#  endif
+#endif
+
+png_uint_32 PNGAPI
+png_get_uint_31(png_structp png_ptr, png_bytep buf)
+{
+   png_uint_32 i = png_get_uint_32(buf);
+   if (i > PNG_UINT_31_MAX)
+     png_error(png_ptr, "PNG unsigned integer out of range.");
+   return (i);
+}
+#ifndef PNG_READ_BIG_ENDIAN_SUPPORTED
+/* Grab an unsigned 32-bit integer from a buffer in big-endian format. */
+png_uint_32 PNGAPI
+png_get_uint_32(png_bytep buf)
+{
+   png_uint_32 i = ((png_uint_32)(*buf) << 24) +
+      ((png_uint_32)(*(buf + 1)) << 16) +
+      ((png_uint_32)(*(buf + 2)) << 8) +
+      (png_uint_32)(*(buf + 3));
+
+   return (i);
+}
+
+/* Grab a signed 32-bit integer from a buffer in big-endian format.  The
+ * data is stored in the PNG file in two's complement format, and it is
+ * assumed that the machine format for signed integers is the same. */
+png_int_32 PNGAPI
+png_get_int_32(png_bytep buf)
+{
+   png_int_32 i = ((png_int_32)(*buf) << 24) +
+      ((png_int_32)(*(buf + 1)) << 16) +
+      ((png_int_32)(*(buf + 2)) << 8) +
+      (png_int_32)(*(buf + 3));
+
+   return (i);
+}
+
+/* Grab an unsigned 16-bit integer from a buffer in big-endian format. */
+png_uint_16 PNGAPI
+png_get_uint_16(png_bytep buf)
+{
+   png_uint_16 i = (png_uint_16)(((png_uint_16)(*buf) << 8) +
+      (png_uint_16)(*(buf + 1)));
+
+   return (i);
+}
+#endif /* PNG_READ_BIG_ENDIAN_SUPPORTED */
+
+/* Read data, and (optionally) run it through the CRC. */
+void /* PRIVATE */
+png_crc_read(png_structp png_ptr, png_bytep buf, png_size_t length)
+{
+   if(png_ptr == NULL) return;
+   png_read_data(png_ptr, buf, length);
+   png_calculate_crc(png_ptr, buf, length);
+}
+
+/* Optionally skip data and then check the CRC.  Depending on whether we
+   are reading a ancillary or critical chunk, and how the program has set
+   things up, we may calculate the CRC on the data and print a message.
+   Returns '1' if there was a CRC error, '0' otherwise. */
+int /* PRIVATE */
+png_crc_finish(png_structp png_ptr, png_uint_32 skip)
+{
+   png_size_t i;
+   png_size_t istop = png_ptr->zbuf_size;
+
+   for (i = (png_size_t)skip; i > istop; i -= istop)
+   {
+      png_crc_read(png_ptr, png_ptr->zbuf, png_ptr->zbuf_size);
+   }
+   if (i)
+   {
+      png_crc_read(png_ptr, png_ptr->zbuf, i);
+   }
+
+   if (png_crc_error(png_ptr))
+   {
+      if (((png_ptr->chunk_name[0] & 0x20) &&                /* Ancillary */
+           !(png_ptr->flags & PNG_FLAG_CRC_ANCILLARY_NOWARN)) ||
+          (!(png_ptr->chunk_name[0] & 0x20) &&             /* Critical  */
+          (png_ptr->flags & PNG_FLAG_CRC_CRITICAL_USE)))
+      {
+         png_chunk_warning(png_ptr, "CRC error");
+      }
+      else
+      {
+         png_chunk_error(png_ptr, "CRC error");
+      }
+      return (1);
+   }
+
+   return (0);
+}
+
+/* Compare the CRC stored in the PNG file with that calculated by libpng from
+   the data it has read thus far. */
+int /* PRIVATE */
+png_crc_error(png_structp png_ptr)
+{
+   png_byte crc_bytes[4];
+   png_uint_32 crc;
+   int need_crc = 1;
+
+   if (png_ptr->chunk_name[0] & 0x20)                     /* ancillary */
+   {
+      if ((png_ptr->flags & PNG_FLAG_CRC_ANCILLARY_MASK) ==
+          (PNG_FLAG_CRC_ANCILLARY_USE | PNG_FLAG_CRC_ANCILLARY_NOWARN))
+         need_crc = 0;
+   }
+   else                                                    /* critical */
+   {
+      if (png_ptr->flags & PNG_FLAG_CRC_CRITICAL_IGNORE)
+         need_crc = 0;
+   }
+
+   png_read_data(png_ptr, crc_bytes, 4);
+
+   if (need_crc)
+   {
+      crc = png_get_uint_32(crc_bytes);
+      return ((int)(crc != png_ptr->crc));
+   }
+   else
+      return (0);
+}
+
+#if defined(PNG_READ_zTXt_SUPPORTED) || defined(PNG_READ_iTXt_SUPPORTED) || \
+    defined(PNG_READ_iCCP_SUPPORTED)
+/*
+ * Decompress trailing data in a chunk.  The assumption is that chunkdata
+ * points at an allocated area holding the contents of a chunk with a
+ * trailing compressed part.  What we get back is an allocated area
+ * holding the original prefix part and an uncompressed version of the
+ * trailing part (the malloc area passed in is freed).
+ */
+png_charp /* PRIVATE */
+png_decompress_chunk(png_structp png_ptr, int comp_type,
+                              png_charp chunkdata, png_size_t chunklength,
+                              png_size_t prefix_size, png_size_t *newlength)
+{
+   static PNG_CONST char msg[] = "Error decoding compressed text";
+   png_charp text;
+   png_size_t text_size;
+
+   if (comp_type == PNG_COMPRESSION_TYPE_BASE)
+   {
+      int ret = Z_OK;
+      png_ptr->zstream.next_in = (png_bytep)(chunkdata + prefix_size);
+      png_ptr->zstream.avail_in = (uInt)(chunklength - prefix_size);
+      png_ptr->zstream.next_out = png_ptr->zbuf;
+      png_ptr->zstream.avail_out = (uInt)png_ptr->zbuf_size;
+
+      text_size = 0;
+      text = NULL;
+
+      while (png_ptr->zstream.avail_in)
+      {
+         ret = inflate(&png_ptr->zstream, Z_PARTIAL_FLUSH);
+         if (ret != Z_OK && ret != Z_STREAM_END)
+         {
+            if (png_ptr->zstream.msg != NULL)
+               png_warning(png_ptr, png_ptr->zstream.msg);
+            else
+               png_warning(png_ptr, msg);
+            inflateReset(&png_ptr->zstream);
+            png_ptr->zstream.avail_in = 0;
+
+            if (text ==  NULL)
+            {
+               text_size = prefix_size + png_sizeof(msg) + 1;
+               text = (png_charp)png_malloc_warn(png_ptr, text_size);
+               if (text ==  NULL)
+                 {
+                    png_free(png_ptr,chunkdata);
+                    png_error(png_ptr,"Not enough memory to decompress chunk");
+                 }
+               png_memcpy(text, chunkdata, prefix_size);
+            }
+
+            text[text_size - 1] = 0x00;
+
+            /* Copy what we can of the error message into the text chunk */
+            text_size = (png_size_t)(chunklength - (text - chunkdata) - 1);
+            text_size = png_sizeof(msg) > text_size ? text_size :
+               png_sizeof(msg);
+            png_memcpy(text + prefix_size, msg, text_size + 1);
+            break;
+         }
+         if (!png_ptr->zstream.avail_out || ret == Z_STREAM_END)
+         {
+            if (text == NULL)
+            {
+               text_size = prefix_size +
+                   png_ptr->zbuf_size - png_ptr->zstream.avail_out;
+               text = (png_charp)png_malloc_warn(png_ptr, text_size + 1);
+               if (text ==  NULL)
+                 {
+                    png_free(png_ptr,chunkdata);
+                    png_error(png_ptr,"Not enough memory to decompress chunk.");
+                 }
+               png_memcpy(text + prefix_size, png_ptr->zbuf,
+                    text_size - prefix_size);
+               png_memcpy(text, chunkdata, prefix_size);
+               *(text + text_size) = 0x00;
+            }
+            else
+            {
+               png_charp tmp;
+
+               tmp = text;
+               text = (png_charp)png_malloc_warn(png_ptr,
+                  (png_uint_32)(text_size +
+                  png_ptr->zbuf_size - png_ptr->zstream.avail_out + 1));
+               if (text == NULL)
+               {
+                  png_free(png_ptr, tmp);
+                  png_free(png_ptr, chunkdata);
+                  png_error(png_ptr,"Not enough memory to decompress chunk..");
+               }
+               png_memcpy(text, tmp, text_size);
+               png_free(png_ptr, tmp);
+               png_memcpy(text + text_size, png_ptr->zbuf,
+                  (png_ptr->zbuf_size - png_ptr->zstream.avail_out));
+               text_size += png_ptr->zbuf_size - png_ptr->zstream.avail_out;
+               *(text + text_size) = 0x00;
+            }
+            if (ret == Z_STREAM_END)
+               break;
+            else
+            {
+               png_ptr->zstream.next_out = png_ptr->zbuf;
+               png_ptr->zstream.avail_out = (uInt)png_ptr->zbuf_size;
+            }
+         }
+      }
+      if (ret != Z_STREAM_END)
+      {
+#if !defined(PNG_NO_STDIO) && !defined(_WIN32_WCE)
+         char umsg[52];
+
+         if (ret == Z_BUF_ERROR)
+            png_snprintf(umsg, 52,
+                "Buffer error in compressed datastream in %s chunk",
+                png_ptr->chunk_name);
+         else if (ret == Z_DATA_ERROR)
+            png_snprintf(umsg, 52,
+                "Data error in compressed datastream in %s chunk",
+                png_ptr->chunk_name);
+         else
+            png_snprintf(umsg, 52,
+                "Incomplete compressed datastream in %s chunk",
+                png_ptr->chunk_name);
+         png_warning(png_ptr, umsg);
+#else
+         png_warning(png_ptr,
+            "Incomplete compressed datastream in chunk other than IDAT");
+#endif
+         text_size=prefix_size;
+         if (text ==  NULL)
+         {
+            text = (png_charp)png_malloc_warn(png_ptr, text_size+1);
+            if (text == NULL)
+              {
+                png_free(png_ptr, chunkdata);
+                png_error(png_ptr,"Not enough memory for text.");
+              }
+            png_memcpy(text, chunkdata, prefix_size);
+         }
+         *(text + text_size) = 0x00;
+      }
+
+      inflateReset(&png_ptr->zstream);
+      png_ptr->zstream.avail_in = 0;
+
+      png_free(png_ptr, chunkdata);
+      chunkdata = text;
+      *newlength=text_size;
+   }
+   else /* if (comp_type != PNG_COMPRESSION_TYPE_BASE) */
+   {
+#if !defined(PNG_NO_STDIO) && !defined(_WIN32_WCE)
+      char umsg[50];
+
+      png_snprintf(umsg, 50,
+         "Unknown zTXt compression type %d", comp_type);
+      png_warning(png_ptr, umsg);
+#else
+      png_warning(png_ptr, "Unknown zTXt compression type");
+#endif
+
+      *(chunkdata + prefix_size) = 0x00;
+      *newlength=prefix_size;
+   }
+
+   return chunkdata;
+}
+#endif
+
+/* read and check the IDHR chunk */
+void /* PRIVATE */
+png_handle_IHDR(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
+{
+   png_byte buf[13];
+   png_uint_32 width, height;
+   int bit_depth, color_type, compression_type, filter_type;
+   int interlace_type;
+
+   png_debug(1, "in png_handle_IHDR\n");
+
+   if (png_ptr->mode & PNG_HAVE_IHDR)
+      png_error(png_ptr, "Out of place IHDR");
+
+   /* check the length */
+   if (length != 13)
+      png_error(png_ptr, "Invalid IHDR chunk");
+
+   png_ptr->mode |= PNG_HAVE_IHDR;
+
+   png_crc_read(png_ptr, buf, 13);
+   png_crc_finish(png_ptr, 0);
+
+   width = png_get_uint_31(png_ptr, buf);
+   height = png_get_uint_31(png_ptr, buf + 4);
+   bit_depth = buf[8];
+   color_type = buf[9];
+   compression_type = buf[10];
+   filter_type = buf[11];
+   interlace_type = buf[12];
+
+   /* set internal variables */
+   png_ptr->width = width;
+   png_ptr->height = height;
+   png_ptr->bit_depth = (png_byte)bit_depth;
+   png_ptr->interlaced = (png_byte)interlace_type;
+   png_ptr->color_type = (png_byte)color_type;
+#if defined(PNG_MNG_FEATURES_SUPPORTED)
+   png_ptr->filter_type = (png_byte)filter_type;
+#endif
+   png_ptr->compression_type = (png_byte)compression_type;
+
+   /* find number of channels */
+   switch (png_ptr->color_type)
+   {
+      case PNG_COLOR_TYPE_GRAY:
+      case PNG_COLOR_TYPE_PALETTE:
+         png_ptr->channels = 1;
+         break;
+      case PNG_COLOR_TYPE_RGB:
+         png_ptr->channels = 3;
+         break;
+      case PNG_COLOR_TYPE_GRAY_ALPHA:
+         png_ptr->channels = 2;
+         break;
+      case PNG_COLOR_TYPE_RGB_ALPHA:
+         png_ptr->channels = 4;
+         break;
+   }
+
+   /* set up other useful info */
+   png_ptr->pixel_depth = (png_byte)(png_ptr->bit_depth *
+   png_ptr->channels);
+   png_ptr->rowbytes = PNG_ROWBYTES(png_ptr->pixel_depth,png_ptr->width);
+   png_debug1(3,"bit_depth = %d\n", png_ptr->bit_depth);
+   png_debug1(3,"channels = %d\n", png_ptr->channels);
+   png_debug1(3,"rowbytes = %lu\n", png_ptr->rowbytes);
+   png_set_IHDR(png_ptr, info_ptr, width, height, bit_depth,
+      color_type, interlace_type, compression_type, filter_type);
+}
+
+/* read and check the palette */
+void /* PRIVATE */
+png_handle_PLTE(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
+{
+   png_color palette[PNG_MAX_PALETTE_LENGTH];
+   int num, i;
+#ifndef PNG_NO_POINTER_INDEXING
+   png_colorp pal_ptr;
+#endif
+
+   png_debug(1, "in png_handle_PLTE\n");
+
+   if (!(png_ptr->mode & PNG_HAVE_IHDR))
+      png_error(png_ptr, "Missing IHDR before PLTE");
+   else if (png_ptr->mode & PNG_HAVE_IDAT)
+   {
+      png_warning(png_ptr, "Invalid PLTE after IDAT");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+   else if (png_ptr->mode & PNG_HAVE_PLTE)
+      png_error(png_ptr, "Duplicate PLTE chunk");
+
+   png_ptr->mode |= PNG_HAVE_PLTE;
+
+   if (!(png_ptr->color_type&PNG_COLOR_MASK_COLOR))
+   {
+      png_warning(png_ptr,
+        "Ignoring PLTE chunk in grayscale PNG");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+#if !defined(PNG_READ_OPT_PLTE_SUPPORTED)
+   if (png_ptr->color_type != PNG_COLOR_TYPE_PALETTE)
+   {
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+#endif
+
+   if (length > 3*PNG_MAX_PALETTE_LENGTH || length % 3)
+   {
+      if (png_ptr->color_type != PNG_COLOR_TYPE_PALETTE)
+      {
+         png_warning(png_ptr, "Invalid palette chunk");
+         png_crc_finish(png_ptr, length);
+         return;
+      }
+      else
+      {
+         png_error(png_ptr, "Invalid palette chunk");
+      }
+   }
+
+   num = (int)length / 3;
+
+#ifndef PNG_NO_POINTER_INDEXING
+   for (i = 0, pal_ptr = palette; i < num; i++, pal_ptr++)
+   {
+      png_byte buf[3];
+
+      png_crc_read(png_ptr, buf, 3);
+      pal_ptr->red = buf[0];
+      pal_ptr->green = buf[1];
+      pal_ptr->blue = buf[2];
+   }
+#else
+   for (i = 0; i < num; i++)
+   {
+      png_byte buf[3];
+
+      png_crc_read(png_ptr, buf, 3);
+      /* don't depend upon png_color being any order */
+      palette[i].red = buf[0];
+      palette[i].green = buf[1];
+      palette[i].blue = buf[2];
+   }
+#endif
+
+   /* If we actually NEED the PLTE chunk (ie for a paletted image), we do
+      whatever the normal CRC configuration tells us.  However, if we
+      have an RGB image, the PLTE can be considered ancillary, so
+      we will act as though it is. */
+#if !defined(PNG_READ_OPT_PLTE_SUPPORTED)
+   if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
+#endif
+   {
+      png_crc_finish(png_ptr, 0);
+   }
+#if !defined(PNG_READ_OPT_PLTE_SUPPORTED)
+   else if (png_crc_error(png_ptr))  /* Only if we have a CRC error */
+   {
+      /* If we don't want to use the data from an ancillary chunk,
+         we have two options: an error abort, or a warning and we
+         ignore the data in this chunk (which should be OK, since
+         it's considered ancillary for a RGB or RGBA image). */
+      if (!(png_ptr->flags & PNG_FLAG_CRC_ANCILLARY_USE))
+      {
+         if (png_ptr->flags & PNG_FLAG_CRC_ANCILLARY_NOWARN)
+         {
+            png_chunk_error(png_ptr, "CRC error");
+         }
+         else
+         {
+            png_chunk_warning(png_ptr, "CRC error");
+            return;
+         }
+      }
+      /* Otherwise, we (optionally) emit a warning and use the chunk. */
+      else if (!(png_ptr->flags & PNG_FLAG_CRC_ANCILLARY_NOWARN))
+      {
+         png_chunk_warning(png_ptr, "CRC error");
+      }
+   }
+#endif
+
+   png_set_PLTE(png_ptr, info_ptr, palette, num);
+
+#if defined(PNG_READ_tRNS_SUPPORTED)
+   if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
+   {
+      if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_tRNS))
+      {
+         if (png_ptr->num_trans > (png_uint_16)num)
+         {
+            png_warning(png_ptr, "Truncating incorrect tRNS chunk length");
+            png_ptr->num_trans = (png_uint_16)num;
+         }
+         if (info_ptr->num_trans > (png_uint_16)num)
+         {
+            png_warning(png_ptr, "Truncating incorrect info tRNS chunk length");
+            info_ptr->num_trans = (png_uint_16)num;
+         }
+      }
+   }
+#endif
+
+}
+
+void /* PRIVATE */
+png_handle_IEND(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
+{
+   png_debug(1, "in png_handle_IEND\n");
+
+   if (!(png_ptr->mode & PNG_HAVE_IHDR) || !(png_ptr->mode & PNG_HAVE_IDAT))
+   {
+      png_error(png_ptr, "No image in file");
+   }
+
+   png_ptr->mode |= (PNG_AFTER_IDAT | PNG_HAVE_IEND);
+
+   if (length != 0)
+   {
+      png_warning(png_ptr, "Incorrect IEND chunk length");
+   }
+   png_crc_finish(png_ptr, length);
+
+   info_ptr =info_ptr; /* quiet compiler warnings about unused info_ptr */
+}
+
+#if defined(PNG_READ_gAMA_SUPPORTED)
+void /* PRIVATE */
+png_handle_gAMA(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
+{
+   png_fixed_point igamma;
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+   float file_gamma;
+#endif
+   png_byte buf[4];
+
+   png_debug(1, "in png_handle_gAMA\n");
+
+   if (!(png_ptr->mode & PNG_HAVE_IHDR))
+      png_error(png_ptr, "Missing IHDR before gAMA");
+   else if (png_ptr->mode & PNG_HAVE_IDAT)
+   {
+      png_warning(png_ptr, "Invalid gAMA after IDAT");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+   else if (png_ptr->mode & PNG_HAVE_PLTE)
+      /* Should be an error, but we can cope with it */
+      png_warning(png_ptr, "Out of place gAMA chunk");
+
+   if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_gAMA)
+#if defined(PNG_READ_sRGB_SUPPORTED)
+      && !(info_ptr->valid & PNG_INFO_sRGB)
+#endif
+      )
+   {
+      png_warning(png_ptr, "Duplicate gAMA chunk");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+
+   if (length != 4)
+   {
+      png_warning(png_ptr, "Incorrect gAMA chunk length");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+
+   png_crc_read(png_ptr, buf, 4);
+   if (png_crc_finish(png_ptr, 0))
+      return;
+
+   igamma = (png_fixed_point)png_get_uint_32(buf);
+   /* check for zero gamma */
+   if (igamma == 0)
+      {
+         png_warning(png_ptr,
+           "Ignoring gAMA chunk with gamma=0");
+         return;
+      }
+
+#if defined(PNG_READ_sRGB_SUPPORTED)
+   if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_sRGB))
+      if (PNG_OUT_OF_RANGE(igamma, 45500L, 500))
+      {
+         png_warning(png_ptr,
+           "Ignoring incorrect gAMA value when sRGB is also present");
+#ifndef PNG_NO_CONSOLE_IO
+         fprintf(stderr, "gamma = (%d/100000)\n", (int)igamma);
+#endif
+         return;
+      }
+#endif /* PNG_READ_sRGB_SUPPORTED */
+
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+   file_gamma = (float)igamma / (float)100000.0;
+#  ifdef PNG_READ_GAMMA_SUPPORTED
+     png_ptr->gamma = file_gamma;
+#  endif
+     png_set_gAMA(png_ptr, info_ptr, file_gamma);
+#endif
+#ifdef PNG_FIXED_POINT_SUPPORTED
+   png_set_gAMA_fixed(png_ptr, info_ptr, igamma);
+#endif
+}
+#endif
+
+#if defined(PNG_READ_sBIT_SUPPORTED)
+void /* PRIVATE */
+png_handle_sBIT(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
+{
+   png_size_t truelen;
+   png_byte buf[4];
+
+   png_debug(1, "in png_handle_sBIT\n");
+
+   buf[0] = buf[1] = buf[2] = buf[3] = 0;
+
+   if (!(png_ptr->mode & PNG_HAVE_IHDR))
+      png_error(png_ptr, "Missing IHDR before sBIT");
+   else if (png_ptr->mode & PNG_HAVE_IDAT)
+   {
+      png_warning(png_ptr, "Invalid sBIT after IDAT");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+   else if (png_ptr->mode & PNG_HAVE_PLTE)
+   {
+      /* Should be an error, but we can cope with it */
+      png_warning(png_ptr, "Out of place sBIT chunk");
+   }
+   if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_sBIT))
+   {
+      png_warning(png_ptr, "Duplicate sBIT chunk");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+
+   if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
+      truelen = 3;
+   else
+      truelen = (png_size_t)png_ptr->channels;
+
+   if (length != truelen || length > 4)
+   {
+      png_warning(png_ptr, "Incorrect sBIT chunk length");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+
+   png_crc_read(png_ptr, buf, truelen);
+   if (png_crc_finish(png_ptr, 0))
+      return;
+
+   if (png_ptr->color_type & PNG_COLOR_MASK_COLOR)
+   {
+      png_ptr->sig_bit.red = buf[0];
+      png_ptr->sig_bit.green = buf[1];
+      png_ptr->sig_bit.blue = buf[2];
+      png_ptr->sig_bit.alpha = buf[3];
+   }
+   else
+   {
+      png_ptr->sig_bit.gray = buf[0];
+      png_ptr->sig_bit.red = buf[0];
+      png_ptr->sig_bit.green = buf[0];
+      png_ptr->sig_bit.blue = buf[0];
+      png_ptr->sig_bit.alpha = buf[1];
+   }
+   png_set_sBIT(png_ptr, info_ptr, &(png_ptr->sig_bit));
+}
+#endif
+
+#if defined(PNG_READ_cHRM_SUPPORTED)
+void /* PRIVATE */
+png_handle_cHRM(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
+{
+   png_byte buf[4];
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+   float white_x, white_y, red_x, red_y, green_x, green_y, blue_x, blue_y;
+#endif
+   png_fixed_point int_x_white, int_y_white, int_x_red, int_y_red, int_x_green,
+      int_y_green, int_x_blue, int_y_blue;
+
+   png_uint_32 uint_x, uint_y;
+
+   png_debug(1, "in png_handle_cHRM\n");
+
+   if (!(png_ptr->mode & PNG_HAVE_IHDR))
+      png_error(png_ptr, "Missing IHDR before cHRM");
+   else if (png_ptr->mode & PNG_HAVE_IDAT)
+   {
+      png_warning(png_ptr, "Invalid cHRM after IDAT");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+   else if (png_ptr->mode & PNG_HAVE_PLTE)
+      /* Should be an error, but we can cope with it */
+      png_warning(png_ptr, "Missing PLTE before cHRM");
+
+   if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_cHRM)
+#if defined(PNG_READ_sRGB_SUPPORTED)
+      && !(info_ptr->valid & PNG_INFO_sRGB)
+#endif
+      )
+   {
+      png_warning(png_ptr, "Duplicate cHRM chunk");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+
+   if (length != 32)
+   {
+      png_warning(png_ptr, "Incorrect cHRM chunk length");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+
+   png_crc_read(png_ptr, buf, 4);
+   uint_x = png_get_uint_32(buf);
+
+   png_crc_read(png_ptr, buf, 4);
+   uint_y = png_get_uint_32(buf);
+
+   if (uint_x > 80000L || uint_y > 80000L ||
+      uint_x + uint_y > 100000L)
+   {
+      png_warning(png_ptr, "Invalid cHRM white point");
+      png_crc_finish(png_ptr, 24);
+      return;
+   }
+   int_x_white = (png_fixed_point)uint_x;
+   int_y_white = (png_fixed_point)uint_y;
+
+   png_crc_read(png_ptr, buf, 4);
+   uint_x = png_get_uint_32(buf);
+
+   png_crc_read(png_ptr, buf, 4);
+   uint_y = png_get_uint_32(buf);
+
+   if (uint_x + uint_y > 100000L)
+   {
+      png_warning(png_ptr, "Invalid cHRM red point");
+      png_crc_finish(png_ptr, 16);
+      return;
+   }
+   int_x_red = (png_fixed_point)uint_x;
+   int_y_red = (png_fixed_point)uint_y;
+
+   png_crc_read(png_ptr, buf, 4);
+   uint_x = png_get_uint_32(buf);
+
+   png_crc_read(png_ptr, buf, 4);
+   uint_y = png_get_uint_32(buf);
+
+   if (uint_x + uint_y > 100000L)
+   {
+      png_warning(png_ptr, "Invalid cHRM green point");
+      png_crc_finish(png_ptr, 8);
+      return;
+   }
+   int_x_green = (png_fixed_point)uint_x;
+   int_y_green = (png_fixed_point)uint_y;
+
+   png_crc_read(png_ptr, buf, 4);
+   uint_x = png_get_uint_32(buf);
+
+   png_crc_read(png_ptr, buf, 4);
+   uint_y = png_get_uint_32(buf);
+
+   if (uint_x + uint_y > 100000L)
+   {
+      png_warning(png_ptr, "Invalid cHRM blue point");
+      png_crc_finish(png_ptr, 0);
+      return;
+   }
+   int_x_blue = (png_fixed_point)uint_x;
+   int_y_blue = (png_fixed_point)uint_y;
+
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+   white_x = (float)int_x_white / (float)100000.0;
+   white_y = (float)int_y_white / (float)100000.0;
+   red_x   = (float)int_x_red   / (float)100000.0;
+   red_y   = (float)int_y_red   / (float)100000.0;
+   green_x = (float)int_x_green / (float)100000.0;
+   green_y = (float)int_y_green / (float)100000.0;
+   blue_x  = (float)int_x_blue  / (float)100000.0;
+   blue_y  = (float)int_y_blue  / (float)100000.0;
+#endif
+
+#if defined(PNG_READ_sRGB_SUPPORTED)
+   if ((info_ptr != NULL) && (info_ptr->valid & PNG_INFO_sRGB))
+      {
+      if (PNG_OUT_OF_RANGE(int_x_white, 31270,  1000) ||
+          PNG_OUT_OF_RANGE(int_y_white, 32900,  1000) ||
+          PNG_OUT_OF_RANGE(int_x_red,   64000L, 1000) ||
+          PNG_OUT_OF_RANGE(int_y_red,   33000,  1000) ||
+          PNG_OUT_OF_RANGE(int_x_green, 30000,  1000) ||
+          PNG_OUT_OF_RANGE(int_y_green, 60000L, 1000) ||
+          PNG_OUT_OF_RANGE(int_x_blue,  15000,  1000) ||
+          PNG_OUT_OF_RANGE(int_y_blue,   6000,  1000))
+         {
+            png_warning(png_ptr,
+              "Ignoring incorrect cHRM value when sRGB is also present");
+#ifndef PNG_NO_CONSOLE_IO
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+            fprintf(stderr,"wx=%f, wy=%f, rx=%f, ry=%f\n",
+               white_x, white_y, red_x, red_y);
+            fprintf(stderr,"gx=%f, gy=%f, bx=%f, by=%f\n",
+               green_x, green_y, blue_x, blue_y);
+#else
+            fprintf(stderr,"wx=%ld, wy=%ld, rx=%ld, ry=%ld\n",
+               int_x_white, int_y_white, int_x_red, int_y_red);
+            fprintf(stderr,"gx=%ld, gy=%ld, bx=%ld, by=%ld\n",
+               int_x_green, int_y_green, int_x_blue, int_y_blue);
+#endif
+#endif /* PNG_NO_CONSOLE_IO */
+         }
+         png_crc_finish(png_ptr, 0);
+         return;
+      }
+#endif /* PNG_READ_sRGB_SUPPORTED */
+
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+   png_set_cHRM(png_ptr, info_ptr,
+      white_x, white_y, red_x, red_y, green_x, green_y, blue_x, blue_y);
+#endif
+#ifdef PNG_FIXED_POINT_SUPPORTED
+   png_set_cHRM_fixed(png_ptr, info_ptr,
+      int_x_white, int_y_white, int_x_red, int_y_red, int_x_green,
+      int_y_green, int_x_blue, int_y_blue);
+#endif
+   if (png_crc_finish(png_ptr, 0))
+      return;
+}
+#endif
+
+#if defined(PNG_READ_sRGB_SUPPORTED)
+void /* PRIVATE */
+png_handle_sRGB(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
+{
+   int intent;
+   png_byte buf[1];
+
+   png_debug(1, "in png_handle_sRGB\n");
+
+   if (!(png_ptr->mode & PNG_HAVE_IHDR))
+      png_error(png_ptr, "Missing IHDR before sRGB");
+   else if (png_ptr->mode & PNG_HAVE_IDAT)
+   {
+      png_warning(png_ptr, "Invalid sRGB after IDAT");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+   else if (png_ptr->mode & PNG_HAVE_PLTE)
+      /* Should be an error, but we can cope with it */
+      png_warning(png_ptr, "Out of place sRGB chunk");
+
+   if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_sRGB))
+   {
+      png_warning(png_ptr, "Duplicate sRGB chunk");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+
+   if (length != 1)
+   {
+      png_warning(png_ptr, "Incorrect sRGB chunk length");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+
+   png_crc_read(png_ptr, buf, 1);
+   if (png_crc_finish(png_ptr, 0))
+      return;
+
+   intent = buf[0];
+   /* check for bad intent */
+   if (intent >= PNG_sRGB_INTENT_LAST)
+   {
+      png_warning(png_ptr, "Unknown sRGB intent");
+      return;
+   }
+
+#if defined(PNG_READ_gAMA_SUPPORTED) && defined(PNG_READ_GAMMA_SUPPORTED)
+   if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_gAMA))
+   {
+   png_fixed_point igamma;
+#ifdef PNG_FIXED_POINT_SUPPORTED
+      igamma=info_ptr->int_gamma;
+#else
+#  ifdef PNG_FLOATING_POINT_SUPPORTED
+      igamma=(png_fixed_point)(info_ptr->gamma * 100000.);
+#  endif
+#endif
+      if (PNG_OUT_OF_RANGE(igamma, 45500L, 500))
+      {
+         png_warning(png_ptr,
+           "Ignoring incorrect gAMA value when sRGB is also present");
+#ifndef PNG_NO_CONSOLE_IO
+#  ifdef PNG_FIXED_POINT_SUPPORTED
+         fprintf(stderr,"incorrect gamma=(%d/100000)\n",(int)png_ptr->int_gamma);
+#  else
+#    ifdef PNG_FLOATING_POINT_SUPPORTED
+         fprintf(stderr,"incorrect gamma=%f\n",png_ptr->gamma);
+#    endif
+#  endif
+#endif
+      }
+   }
+#endif /* PNG_READ_gAMA_SUPPORTED */
+
+#ifdef PNG_READ_cHRM_SUPPORTED
+#ifdef PNG_FIXED_POINT_SUPPORTED
+   if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_cHRM))
+      if (PNG_OUT_OF_RANGE(info_ptr->int_x_white, 31270,  1000) ||
+          PNG_OUT_OF_RANGE(info_ptr->int_y_white, 32900,  1000) ||
+          PNG_OUT_OF_RANGE(info_ptr->int_x_red,   64000L, 1000) ||
+          PNG_OUT_OF_RANGE(info_ptr->int_y_red,   33000,  1000) ||
+          PNG_OUT_OF_RANGE(info_ptr->int_x_green, 30000,  1000) ||
+          PNG_OUT_OF_RANGE(info_ptr->int_y_green, 60000L, 1000) ||
+          PNG_OUT_OF_RANGE(info_ptr->int_x_blue,  15000,  1000) ||
+          PNG_OUT_OF_RANGE(info_ptr->int_y_blue,   6000,  1000))
+         {
+            png_warning(png_ptr,
+              "Ignoring incorrect cHRM value when sRGB is also present");
+         }
+#endif /* PNG_FIXED_POINT_SUPPORTED */
+#endif /* PNG_READ_cHRM_SUPPORTED */
+
+   png_set_sRGB_gAMA_and_cHRM(png_ptr, info_ptr, intent);
+}
+#endif /* PNG_READ_sRGB_SUPPORTED */
+
+#if defined(PNG_READ_iCCP_SUPPORTED)
+void /* PRIVATE */
+png_handle_iCCP(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
+/* Note: this does not properly handle chunks that are > 64K under DOS */
+{
+   png_charp chunkdata;
+   png_byte compression_type;
+   png_bytep pC;
+   png_charp profile;
+   png_uint_32 skip = 0;
+   png_uint_32 profile_size, profile_length;
+   png_size_t slength, prefix_length, data_length;
+
+   png_debug(1, "in png_handle_iCCP\n");
+
+   if (!(png_ptr->mode & PNG_HAVE_IHDR))
+      png_error(png_ptr, "Missing IHDR before iCCP");
+   else if (png_ptr->mode & PNG_HAVE_IDAT)
+   {
+      png_warning(png_ptr, "Invalid iCCP after IDAT");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+   else if (png_ptr->mode & PNG_HAVE_PLTE)
+      /* Should be an error, but we can cope with it */
+      png_warning(png_ptr, "Out of place iCCP chunk");
+
+   if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_iCCP))
+   {
+      png_warning(png_ptr, "Duplicate iCCP chunk");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+
+#ifdef PNG_MAX_MALLOC_64K
+   if (length > (png_uint_32)65535L)
+   {
+      png_warning(png_ptr, "iCCP chunk too large to fit in memory");
+      skip = length - (png_uint_32)65535L;
+      length = (png_uint_32)65535L;
+   }
+#endif
+
+   chunkdata = (png_charp)png_malloc(png_ptr, length + 1);
+   slength = (png_size_t)length;
+   png_crc_read(png_ptr, (png_bytep)chunkdata, slength);
+
+   if (png_crc_finish(png_ptr, skip))
+   {
+      png_free(png_ptr, chunkdata);
+      return;
+   }
+
+   chunkdata[slength] = 0x00;
+
+   for (profile = chunkdata; *profile; profile++)
+      /* empty loop to find end of name */ ;
+
+   ++profile;
+
+   /* there should be at least one zero (the compression type byte)
+      following the separator, and we should be on it  */
+   if ( profile >= chunkdata + slength - 1)
+   {
+      png_free(png_ptr, chunkdata);
+      png_warning(png_ptr, "Malformed iCCP chunk");
+      return;
+   }
+
+   /* compression_type should always be zero */
+   compression_type = *profile++;
+   if (compression_type)
+   {
+      png_warning(png_ptr, "Ignoring nonzero compression type in iCCP chunk");
+      compression_type=0x00;  /* Reset it to zero (libpng-1.0.6 through 1.0.8
+                                 wrote nonzero) */
+   }
+
+   prefix_length = profile - chunkdata;
+   chunkdata = png_decompress_chunk(png_ptr, compression_type, chunkdata,
+                                    slength, prefix_length, &data_length);
+
+   profile_length = data_length - prefix_length;
+
+   if ( prefix_length > data_length || profile_length < 4)
+   {
+      png_free(png_ptr, chunkdata);
+      png_warning(png_ptr, "Profile size field missing from iCCP chunk");
+      return;
+   }
+
+   /* Check the profile_size recorded in the first 32 bits of the ICC profile */
+   pC = (png_bytep)(chunkdata+prefix_length);
+   profile_size = ((*(pC  ))<<24) |
+                  ((*(pC+1))<<16) |
+                  ((*(pC+2))<< 8) |
+                  ((*(pC+3))    );
+
+   if(profile_size < profile_length)
+      profile_length = profile_size;
+
+   if(profile_size > profile_length)
+   {
+      png_free(png_ptr, chunkdata);
+      png_warning(png_ptr, "Ignoring truncated iCCP profile.");
+      return;
+   }
+
+   png_set_iCCP(png_ptr, info_ptr, chunkdata, compression_type,
+                chunkdata + prefix_length, profile_length);
+   png_free(png_ptr, chunkdata);
+}
+#endif /* PNG_READ_iCCP_SUPPORTED */
+
+#if defined(PNG_READ_sPLT_SUPPORTED)
+void /* PRIVATE */
+png_handle_sPLT(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
+/* Note: this does not properly handle chunks that are > 64K under DOS */
+{
+   png_bytep chunkdata;
+   png_bytep entry_start;
+   png_sPLT_t new_palette;
+#ifdef PNG_NO_POINTER_INDEXING
+   png_sPLT_entryp pp;
+#endif
+   int data_length, entry_size, i;
+   png_uint_32 skip = 0;
+   png_size_t slength;
+
+   png_debug(1, "in png_handle_sPLT\n");
+
+   if (!(png_ptr->mode & PNG_HAVE_IHDR))
+      png_error(png_ptr, "Missing IHDR before sPLT");
+   else if (png_ptr->mode & PNG_HAVE_IDAT)
+   {
+      png_warning(png_ptr, "Invalid sPLT after IDAT");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+
+#ifdef PNG_MAX_MALLOC_64K
+   if (length > (png_uint_32)65535L)
+   {
+      png_warning(png_ptr, "sPLT chunk too large to fit in memory");
+      skip = length - (png_uint_32)65535L;
+      length = (png_uint_32)65535L;
+   }
+#endif
+
+   chunkdata = (png_bytep)png_malloc(png_ptr, length + 1);
+   slength = (png_size_t)length;
+   png_crc_read(png_ptr, (png_bytep)chunkdata, slength);
+
+   if (png_crc_finish(png_ptr, skip))
+   {
+      png_free(png_ptr, chunkdata);
+      return;
+   }
+
+   chunkdata[slength] = 0x00;
+
+   for (entry_start = chunkdata; *entry_start; entry_start++)
+      /* empty loop to find end of name */ ;
+   ++entry_start;
+
+   /* a sample depth should follow the separator, and we should be on it  */
+   if (entry_start > chunkdata + slength - 2)
+   {
+      png_free(png_ptr, chunkdata);
+      png_warning(png_ptr, "malformed sPLT chunk");
+      return;
+   }
+
+   new_palette.depth = *entry_start++;
+   entry_size = (new_palette.depth == 8 ? 6 : 10);
+   data_length = (slength - (entry_start - chunkdata));
+
+   /* integrity-check the data length */
+   if (data_length % entry_size)
+   {
+      png_free(png_ptr, chunkdata);
+      png_warning(png_ptr, "sPLT chunk has bad length");
+      return;
+   }
+
+   new_palette.nentries = (png_int_32) ( data_length / entry_size);
+   if ((png_uint_32) new_palette.nentries > (png_uint_32) (PNG_SIZE_MAX /
+       png_sizeof(png_sPLT_entry)))
+   {
+       png_warning(png_ptr, "sPLT chunk too long");
+       return;
+   }
+   new_palette.entries = (png_sPLT_entryp)png_malloc_warn(
+       png_ptr, new_palette.nentries * png_sizeof(png_sPLT_entry));
+   if (new_palette.entries == NULL)
+   {
+       png_warning(png_ptr, "sPLT chunk requires too much memory");
+       return;
+   }
+
+#ifndef PNG_NO_POINTER_INDEXING
+   for (i = 0; i < new_palette.nentries; i++)
+   {
+      png_sPLT_entryp pp = new_palette.entries + i;
+
+      if (new_palette.depth == 8)
+      {
+          pp->red = *entry_start++;
+          pp->green = *entry_start++;
+          pp->blue = *entry_start++;
+          pp->alpha = *entry_start++;
+      }
+      else
+      {
+          pp->red   = png_get_uint_16(entry_start); entry_start += 2;
+          pp->green = png_get_uint_16(entry_start); entry_start += 2;
+          pp->blue  = png_get_uint_16(entry_start); entry_start += 2;
+          pp->alpha = png_get_uint_16(entry_start); entry_start += 2;
+      }
+      pp->frequency = png_get_uint_16(entry_start); entry_start += 2;
+   }
+#else
+   pp = new_palette.entries;
+   for (i = 0; i < new_palette.nentries; i++)
+   {
+
+      if (new_palette.depth == 8)
+      {
+          pp[i].red   = *entry_start++;
+          pp[i].green = *entry_start++;
+          pp[i].blue  = *entry_start++;
+          pp[i].alpha = *entry_start++;
+      }
+      else
+      {
+          pp[i].red   = png_get_uint_16(entry_start); entry_start += 2;
+          pp[i].green = png_get_uint_16(entry_start); entry_start += 2;
+          pp[i].blue  = png_get_uint_16(entry_start); entry_start += 2;
+          pp[i].alpha = png_get_uint_16(entry_start); entry_start += 2;
+      }
+      pp->frequency = png_get_uint_16(entry_start); entry_start += 2;
+   }
+#endif
+
+   /* discard all chunk data except the name and stash that */
+   new_palette.name = (png_charp)chunkdata;
+
+   png_set_sPLT(png_ptr, info_ptr, &new_palette, 1);
+
+   png_free(png_ptr, chunkdata);
+   png_free(png_ptr, new_palette.entries);
+}
+#endif /* PNG_READ_sPLT_SUPPORTED */
+
+#if defined(PNG_READ_tRNS_SUPPORTED)
+void /* PRIVATE */
+png_handle_tRNS(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
+{
+   png_byte readbuf[PNG_MAX_PALETTE_LENGTH];
+   int bit_mask;
+
+   png_debug(1, "in png_handle_tRNS\n");
+
+   /* For non-indexed color, mask off any bits in the tRNS value that
+    * exceed the bit depth.  Some creators were writing extra bits there.
+    * This is not needed for indexed color. */
+   bit_mask = (1 << png_ptr->bit_depth) - 1;
+
+   if (!(png_ptr->mode & PNG_HAVE_IHDR))
+      png_error(png_ptr, "Missing IHDR before tRNS");
+   else if (png_ptr->mode & PNG_HAVE_IDAT)
+   {
+      png_warning(png_ptr, "Invalid tRNS after IDAT");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+   else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_tRNS))
+   {
+      png_warning(png_ptr, "Duplicate tRNS chunk");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+
+   if (png_ptr->color_type == PNG_COLOR_TYPE_GRAY)
+   {
+      png_byte buf[2];
+
+      if (length != 2)
+      {
+         png_warning(png_ptr, "Incorrect tRNS chunk length");
+         png_crc_finish(png_ptr, length);
+         return;
+      }
+
+      png_crc_read(png_ptr, buf, 2);
+      png_ptr->num_trans = 1;
+      png_ptr->trans_values.gray = png_get_uint_16(buf) & bit_mask;
+   }
+   else if (png_ptr->color_type == PNG_COLOR_TYPE_RGB)
+   {
+      png_byte buf[6];
+
+      if (length != 6)
+      {
+         png_warning(png_ptr, "Incorrect tRNS chunk length");
+         png_crc_finish(png_ptr, length);
+         return;
+      }
+      png_crc_read(png_ptr, buf, (png_size_t)length);
+      png_ptr->num_trans = 1;
+      png_ptr->trans_values.red = png_get_uint_16(buf) & bit_mask;
+      png_ptr->trans_values.green = png_get_uint_16(buf + 2) & bit_mask;
+      png_ptr->trans_values.blue = png_get_uint_16(buf + 4) & bit_mask;
+   }
+   else if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
+   {
+      if (!(png_ptr->mode & PNG_HAVE_PLTE))
+      {
+         /* Should be an error, but we can cope with it. */
+         png_warning(png_ptr, "Missing PLTE before tRNS");
+      }
+      if (length > (png_uint_32)png_ptr->num_palette ||
+          length > PNG_MAX_PALETTE_LENGTH)
+      {
+         png_warning(png_ptr, "Incorrect tRNS chunk length");
+         png_crc_finish(png_ptr, length);
+         return;
+      }
+      if (length == 0)
+      {
+         png_warning(png_ptr, "Zero length tRNS chunk");
+         png_crc_finish(png_ptr, length);
+         return;
+      }
+      png_crc_read(png_ptr, readbuf, (png_size_t)length);
+      png_ptr->num_trans = (png_uint_16)length;
+   }
+   else
+   {
+      png_warning(png_ptr, "tRNS chunk not allowed with alpha channel");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+
+   if (png_crc_finish(png_ptr, 0))
+   {
+      png_ptr->num_trans = 0;
+      return;
+   }
+
+   png_set_tRNS(png_ptr, info_ptr, readbuf, png_ptr->num_trans,
+      &(png_ptr->trans_values));
+}
+#endif
+
+#if defined(PNG_READ_bKGD_SUPPORTED)
+void /* PRIVATE */
+png_handle_bKGD(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
+{
+   png_size_t truelen;
+   png_byte buf[6];
+
+   png_debug(1, "in png_handle_bKGD\n");
+
+   if (!(png_ptr->mode & PNG_HAVE_IHDR))
+      png_error(png_ptr, "Missing IHDR before bKGD");
+   else if (png_ptr->mode & PNG_HAVE_IDAT)
+   {
+      png_warning(png_ptr, "Invalid bKGD after IDAT");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+   else if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE &&
+            !(png_ptr->mode & PNG_HAVE_PLTE))
+   {
+      png_warning(png_ptr, "Missing PLTE before bKGD");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+   else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_bKGD))
+   {
+      png_warning(png_ptr, "Duplicate bKGD chunk");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+
+   if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
+      truelen = 1;
+   else if (png_ptr->color_type & PNG_COLOR_MASK_COLOR)
+      truelen = 6;
+   else
+      truelen = 2;
+
+   if (length != truelen)
+   {
+      png_warning(png_ptr, "Incorrect bKGD chunk length");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+
+   png_crc_read(png_ptr, buf, truelen);
+   if (png_crc_finish(png_ptr, 0))
+      return;
+
+   /* We convert the index value into RGB components so that we can allow
+    * arbitrary RGB values for background when we have transparency, and
+    * so it is easy to determine the RGB values of the background color
+    * from the info_ptr struct. */
+   if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
+   {
+      png_ptr->background.index = buf[0];
+      if(info_ptr->num_palette)
+      {
+          if(buf[0] > info_ptr->num_palette)
+          {
+             png_warning(png_ptr, "Incorrect bKGD chunk index value");
+             return;
+          }
+          png_ptr->background.red =
+             (png_uint_16)png_ptr->palette[buf[0]].red;
+          png_ptr->background.green =
+             (png_uint_16)png_ptr->palette[buf[0]].green;
+          png_ptr->background.blue =
+             (png_uint_16)png_ptr->palette[buf[0]].blue;
+      }
+   }
+   else if (!(png_ptr->color_type & PNG_COLOR_MASK_COLOR)) /* GRAY */
+   {
+      png_ptr->background.red =
+      png_ptr->background.green =
+      png_ptr->background.blue =
+      png_ptr->background.gray = png_get_uint_16(buf);
+   }
+   else
+   {
+      png_ptr->background.red = png_get_uint_16(buf);
+      png_ptr->background.green = png_get_uint_16(buf + 2);
+      png_ptr->background.blue = png_get_uint_16(buf + 4);
+   }
+
+   png_set_bKGD(png_ptr, info_ptr, &(png_ptr->background));
+}
+#endif
+
+#if defined(PNG_READ_hIST_SUPPORTED)
+void /* PRIVATE */
+png_handle_hIST(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
+{
+   unsigned int num, i;
+   png_uint_16 readbuf[PNG_MAX_PALETTE_LENGTH];
+
+   png_debug(1, "in png_handle_hIST\n");
+
+   if (!(png_ptr->mode & PNG_HAVE_IHDR))
+      png_error(png_ptr, "Missing IHDR before hIST");
+   else if (png_ptr->mode & PNG_HAVE_IDAT)
+   {
+      png_warning(png_ptr, "Invalid hIST after IDAT");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+   else if (!(png_ptr->mode & PNG_HAVE_PLTE))
+   {
+      png_warning(png_ptr, "Missing PLTE before hIST");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+   else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_hIST))
+   {
+      png_warning(png_ptr, "Duplicate hIST chunk");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+
+   num = length / 2 ;
+   if (num != (unsigned int) png_ptr->num_palette || num >
+      (unsigned int) PNG_MAX_PALETTE_LENGTH)
+   {
+      png_warning(png_ptr, "Incorrect hIST chunk length");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+
+   for (i = 0; i < num; i++)
+   {
+      png_byte buf[2];
+
+      png_crc_read(png_ptr, buf, 2);
+      readbuf[i] = png_get_uint_16(buf);
+   }
+
+   if (png_crc_finish(png_ptr, 0))
+      return;
+
+   png_set_hIST(png_ptr, info_ptr, readbuf);
+}
+#endif
+
+#if defined(PNG_READ_pHYs_SUPPORTED)
+void /* PRIVATE */
+png_handle_pHYs(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
+{
+   png_byte buf[9];
+   png_uint_32 res_x, res_y;
+   int unit_type;
+
+   png_debug(1, "in png_handle_pHYs\n");
+
+   if (!(png_ptr->mode & PNG_HAVE_IHDR))
+      png_error(png_ptr, "Missing IHDR before pHYs");
+   else if (png_ptr->mode & PNG_HAVE_IDAT)
+   {
+      png_warning(png_ptr, "Invalid pHYs after IDAT");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+   else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_pHYs))
+   {
+      png_warning(png_ptr, "Duplicate pHYs chunk");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+
+   if (length != 9)
+   {
+      png_warning(png_ptr, "Incorrect pHYs chunk length");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+
+   png_crc_read(png_ptr, buf, 9);
+   if (png_crc_finish(png_ptr, 0))
+      return;
+
+   res_x = png_get_uint_32(buf);
+   res_y = png_get_uint_32(buf + 4);
+   unit_type = buf[8];
+   png_set_pHYs(png_ptr, info_ptr, res_x, res_y, unit_type);
+}
+#endif
+
+#if defined(PNG_READ_oFFs_SUPPORTED)
+void /* PRIVATE */
+png_handle_oFFs(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
+{
+   png_byte buf[9];
+   png_int_32 offset_x, offset_y;
+   int unit_type;
+
+   png_debug(1, "in png_handle_oFFs\n");
+
+   if (!(png_ptr->mode & PNG_HAVE_IHDR))
+      png_error(png_ptr, "Missing IHDR before oFFs");
+   else if (png_ptr->mode & PNG_HAVE_IDAT)
+   {
+      png_warning(png_ptr, "Invalid oFFs after IDAT");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+   else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_oFFs))
+   {
+      png_warning(png_ptr, "Duplicate oFFs chunk");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+
+   if (length != 9)
+   {
+      png_warning(png_ptr, "Incorrect oFFs chunk length");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+
+   png_crc_read(png_ptr, buf, 9);
+   if (png_crc_finish(png_ptr, 0))
+      return;
+
+   offset_x = png_get_int_32(buf);
+   offset_y = png_get_int_32(buf + 4);
+   unit_type = buf[8];
+   png_set_oFFs(png_ptr, info_ptr, offset_x, offset_y, unit_type);
+}
+#endif
+
+#if defined(PNG_READ_pCAL_SUPPORTED)
+/* read the pCAL chunk (described in the PNG Extensions document) */
+void /* PRIVATE */
+png_handle_pCAL(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
+{
+   png_charp purpose;
+   png_int_32 X0, X1;
+   png_byte type, nparams;
+   png_charp buf, units, endptr;
+   png_charpp params;
+   png_size_t slength;
+   int i;
+
+   png_debug(1, "in png_handle_pCAL\n");
+
+   if (!(png_ptr->mode & PNG_HAVE_IHDR))
+      png_error(png_ptr, "Missing IHDR before pCAL");
+   else if (png_ptr->mode & PNG_HAVE_IDAT)
+   {
+      png_warning(png_ptr, "Invalid pCAL after IDAT");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+   else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_pCAL))
+   {
+      png_warning(png_ptr, "Duplicate pCAL chunk");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+
+   png_debug1(2, "Allocating and reading pCAL chunk data (%lu bytes)\n",
+      length + 1);
+   purpose = (png_charp)png_malloc_warn(png_ptr, length + 1);
+   if (purpose == NULL)
+     {
+       png_warning(png_ptr, "No memory for pCAL purpose.");
+       return;
+     }
+   slength = (png_size_t)length;
+   png_crc_read(png_ptr, (png_bytep)purpose, slength);
+
+   if (png_crc_finish(png_ptr, 0))
+   {
+      png_free(png_ptr, purpose);
+      return;
+   }
+
+   purpose[slength] = 0x00; /* null terminate the last string */
+
+   png_debug(3, "Finding end of pCAL purpose string\n");
+   for (buf = purpose; *buf; buf++)
+      /* empty loop */ ;
+
+   endptr = purpose + slength;
+
+   /* We need to have at least 12 bytes after the purpose string
+      in order to get the parameter information. */
+   if (endptr <= buf + 12)
+   {
+      png_warning(png_ptr, "Invalid pCAL data");
+      png_free(png_ptr, purpose);
+      return;
+   }
+
+   png_debug(3, "Reading pCAL X0, X1, type, nparams, and units\n");
+   X0 = png_get_int_32((png_bytep)buf+1);
+   X1 = png_get_int_32((png_bytep)buf+5);
+   type = buf[9];
+   nparams = buf[10];
+   units = buf + 11;
+
+   png_debug(3, "Checking pCAL equation type and number of parameters\n");
+   /* Check that we have the right number of parameters for known
+      equation types. */
+   if ((type == PNG_EQUATION_LINEAR && nparams != 2) ||
+       (type == PNG_EQUATION_BASE_E && nparams != 3) ||
+       (type == PNG_EQUATION_ARBITRARY && nparams != 3) ||
+       (type == PNG_EQUATION_HYPERBOLIC && nparams != 4))
+   {
+      png_warning(png_ptr, "Invalid pCAL parameters for equation type");
+      png_free(png_ptr, purpose);
+      return;
+   }
+   else if (type >= PNG_EQUATION_LAST)
+   {
+      png_warning(png_ptr, "Unrecognized equation type for pCAL chunk");
+   }
+
+   for (buf = units; *buf; buf++)
+      /* Empty loop to move past the units string. */ ;
+
+   png_debug(3, "Allocating pCAL parameters array\n");
+   params = (png_charpp)png_malloc_warn(png_ptr, (png_uint_32)(nparams
+      *png_sizeof(png_charp))) ;
+   if (params == NULL)
+     {
+       png_free(png_ptr, purpose);
+       png_warning(png_ptr, "No memory for pCAL params.");
+       return;
+     }
+
+   /* Get pointers to the start of each parameter string. */
+   for (i = 0; i < (int)nparams; i++)
+   {
+      buf++; /* Skip the null string terminator from previous parameter. */
+
+      png_debug1(3, "Reading pCAL parameter %d\n", i);
+      for (params[i] = buf; buf <= endptr && *buf != 0x00; buf++)
+         /* Empty loop to move past each parameter string */ ;
+
+      /* Make sure we haven't run out of data yet */
+      if (buf > endptr)
+      {
+         png_warning(png_ptr, "Invalid pCAL data");
+         png_free(png_ptr, purpose);
+         png_free(png_ptr, params);
+         return;
+      }
+   }
+
+   png_set_pCAL(png_ptr, info_ptr, purpose, X0, X1, type, nparams,
+      units, params);
+
+   png_free(png_ptr, purpose);
+   png_free(png_ptr, params);
+}
+#endif
+
+#if defined(PNG_READ_sCAL_SUPPORTED)
+/* read the sCAL chunk */
+void /* PRIVATE */
+png_handle_sCAL(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
+{
+   png_charp buffer, ep;
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+   double width, height;
+   png_charp vp;
+#else
+#ifdef PNG_FIXED_POINT_SUPPORTED
+   png_charp swidth, sheight;
+#endif
+#endif
+   png_size_t slength;
+
+   png_debug(1, "in png_handle_sCAL\n");
+
+   if (!(png_ptr->mode & PNG_HAVE_IHDR))
+      png_error(png_ptr, "Missing IHDR before sCAL");
+   else if (png_ptr->mode & PNG_HAVE_IDAT)
+   {
+      png_warning(png_ptr, "Invalid sCAL after IDAT");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+   else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_sCAL))
+   {
+      png_warning(png_ptr, "Duplicate sCAL chunk");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+
+   png_debug1(2, "Allocating and reading sCAL chunk data (%lu bytes)\n",
+      length + 1);
+   buffer = (png_charp)png_malloc_warn(png_ptr, length + 1);
+   if (buffer == NULL)
+     {
+       png_warning(png_ptr, "Out of memory while processing sCAL chunk");
+       return;
+     }
+   slength = (png_size_t)length;
+   png_crc_read(png_ptr, (png_bytep)buffer, slength);
+
+   if (png_crc_finish(png_ptr, 0))
+   {
+      png_free(png_ptr, buffer);
+      return;
+   }
+
+   buffer[slength] = 0x00; /* null terminate the last string */
+
+   ep = buffer + 1;        /* skip unit byte */
+
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+   width = png_strtod(png_ptr, ep, &vp);
+   if (*vp)
+   {
+       png_warning(png_ptr, "malformed width string in sCAL chunk");
+       return;
+   }
+#else
+#ifdef PNG_FIXED_POINT_SUPPORTED
+   swidth = (png_charp)png_malloc_warn(png_ptr, png_strlen(ep) + 1);
+   if (swidth == NULL)
+     {
+       png_warning(png_ptr, "Out of memory while processing sCAL chunk width");
+       return;
+     }
+   png_memcpy(swidth, ep, (png_size_t)png_strlen(ep));
+#endif
+#endif
+
+   for (ep = buffer; *ep; ep++)
+      /* empty loop */ ;
+   ep++;
+
+   if (buffer + slength < ep)
+   {
+       png_warning(png_ptr, "Truncated sCAL chunk");
+#if defined(PNG_FIXED_POINT_SUPPORTED) && \
+    !defined(PNG_FLOATING_POINT_SUPPORTED)
+       png_free(png_ptr, swidth);
+#endif
+      png_free(png_ptr, buffer);
+       return;
+   }
+
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+   height = png_strtod(png_ptr, ep, &vp);
+   if (*vp)
+   {
+       png_warning(png_ptr, "malformed height string in sCAL chunk");
+       return;
+   }
+#else
+#ifdef PNG_FIXED_POINT_SUPPORTED
+   sheight = (png_charp)png_malloc_warn(png_ptr, png_strlen(ep) + 1);
+   if (swidth == NULL)
+     {
+       png_warning(png_ptr, "Out of memory while processing sCAL chunk height");
+       return;
+     }
+   png_memcpy(sheight, ep, (png_size_t)png_strlen(ep));
+#endif
+#endif
+
+   if (buffer + slength < ep
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+      || width <= 0. || height <= 0.
+#endif
+      )
+   {
+      png_warning(png_ptr, "Invalid sCAL data");
+      png_free(png_ptr, buffer);
+#if defined(PNG_FIXED_POINT_SUPPORTED) && !defined(PNG_FLOATING_POINT_SUPPORTED)
+      png_free(png_ptr, swidth);
+      png_free(png_ptr, sheight);
+#endif
+      return;
+   }
+
+
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+   png_set_sCAL(png_ptr, info_ptr, buffer[0], width, height);
+#else
+#ifdef PNG_FIXED_POINT_SUPPORTED
+   png_set_sCAL_s(png_ptr, info_ptr, buffer[0], swidth, sheight);
+#endif
+#endif
+
+   png_free(png_ptr, buffer);
+#if defined(PNG_FIXED_POINT_SUPPORTED) && !defined(PNG_FLOATING_POINT_SUPPORTED)
+   png_free(png_ptr, swidth);
+   png_free(png_ptr, sheight);
+#endif
+}
+#endif
+
+#if defined(PNG_READ_tIME_SUPPORTED)
+void /* PRIVATE */
+png_handle_tIME(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
+{
+   png_byte buf[7];
+   png_time mod_time;
+
+   png_debug(1, "in png_handle_tIME\n");
+
+   if (!(png_ptr->mode & PNG_HAVE_IHDR))
+      png_error(png_ptr, "Out of place tIME chunk");
+   else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_tIME))
+   {
+      png_warning(png_ptr, "Duplicate tIME chunk");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+
+   if (png_ptr->mode & PNG_HAVE_IDAT)
+      png_ptr->mode |= PNG_AFTER_IDAT;
+
+   if (length != 7)
+   {
+      png_warning(png_ptr, "Incorrect tIME chunk length");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+
+   png_crc_read(png_ptr, buf, 7);
+   if (png_crc_finish(png_ptr, 0))
+      return;
+
+   mod_time.second = buf[6];
+   mod_time.minute = buf[5];
+   mod_time.hour = buf[4];
+   mod_time.day = buf[3];
+   mod_time.month = buf[2];
+   mod_time.year = png_get_uint_16(buf);
+
+   png_set_tIME(png_ptr, info_ptr, &mod_time);
+}
+#endif
+
+#if defined(PNG_READ_tEXt_SUPPORTED)
+/* Note: this does not properly handle chunks that are > 64K under DOS */
+void /* PRIVATE */
+png_handle_tEXt(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
+{
+   png_textp text_ptr;
+   png_charp key;
+   png_charp text;
+   png_uint_32 skip = 0;
+   png_size_t slength;
+   int ret;
+
+   png_debug(1, "in png_handle_tEXt\n");
+
+   if (!(png_ptr->mode & PNG_HAVE_IHDR))
+      png_error(png_ptr, "Missing IHDR before tEXt");
+
+   if (png_ptr->mode & PNG_HAVE_IDAT)
+      png_ptr->mode |= PNG_AFTER_IDAT;
+
+#ifdef PNG_MAX_MALLOC_64K
+   if (length > (png_uint_32)65535L)
+   {
+      png_warning(png_ptr, "tEXt chunk too large to fit in memory");
+      skip = length - (png_uint_32)65535L;
+      length = (png_uint_32)65535L;
+   }
+#endif
+
+   key = (png_charp)png_malloc_warn(png_ptr, length + 1);
+   if (key == NULL)
+   {
+     png_warning(png_ptr, "No memory to process text chunk.");
+     return;
+   }
+   slength = (png_size_t)length;
+   png_crc_read(png_ptr, (png_bytep)key, slength);
+
+   if (png_crc_finish(png_ptr, skip))
+   {
+      png_free(png_ptr, key);
+      return;
+   }
+
+   key[slength] = 0x00;
+
+   for (text = key; *text; text++)
+      /* empty loop to find end of key */ ;
+
+   if (text != key + slength)
+      text++;
+
+   text_ptr = (png_textp)png_malloc_warn(png_ptr,
+      (png_uint_32)png_sizeof(png_text));
+   if (text_ptr == NULL)
+   {
+     png_warning(png_ptr, "Not enough memory to process text chunk.");
+     png_free(png_ptr, key);
+     return;
+   }
+   text_ptr->compression = PNG_TEXT_COMPRESSION_NONE;
+   text_ptr->key = key;
+#ifdef PNG_iTXt_SUPPORTED
+   text_ptr->lang = NULL;
+   text_ptr->lang_key = NULL;
+   text_ptr->itxt_length = 0;
+#endif
+   text_ptr->text = text;
+   text_ptr->text_length = png_strlen(text);
+
+   ret=png_set_text_2(png_ptr, info_ptr, text_ptr, 1);
+
+   png_free(png_ptr, key);
+   png_free(png_ptr, text_ptr);
+   if (ret)
+     png_warning(png_ptr, "Insufficient memory to process text chunk.");
+}
+#endif
+
+#if defined(PNG_READ_zTXt_SUPPORTED)
+/* note: this does not correctly handle chunks that are > 64K under DOS */
+void /* PRIVATE */
+png_handle_zTXt(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
+{
+   png_textp text_ptr;
+   png_charp chunkdata;
+   png_charp text;
+   int comp_type;
+   int ret;
+   png_size_t slength, prefix_len, data_len;
+
+   png_debug(1, "in png_handle_zTXt\n");
+   if (!(png_ptr->mode & PNG_HAVE_IHDR))
+      png_error(png_ptr, "Missing IHDR before zTXt");
+
+   if (png_ptr->mode & PNG_HAVE_IDAT)
+      png_ptr->mode |= PNG_AFTER_IDAT;
+
+#ifdef PNG_MAX_MALLOC_64K
+   /* We will no doubt have problems with chunks even half this size, but
+      there is no hard and fast rule to tell us where to stop. */
+   if (length > (png_uint_32)65535L)
+   {
+     png_warning(png_ptr,"zTXt chunk too large to fit in memory");
+     png_crc_finish(png_ptr, length);
+     return;
+   }
+#endif
+
+   chunkdata = (png_charp)png_malloc_warn(png_ptr, length + 1);
+   if (chunkdata == NULL)
+   {
+     png_warning(png_ptr,"Out of memory processing zTXt chunk.");
+     return;
+   }
+   slength = (png_size_t)length;
+   png_crc_read(png_ptr, (png_bytep)chunkdata, slength);
+   if (png_crc_finish(png_ptr, 0))
+   {
+      png_free(png_ptr, chunkdata);
+      return;
+   }
+
+   chunkdata[slength] = 0x00;
+
+   for (text = chunkdata; *text; text++)
+      /* empty loop */ ;
+
+   /* zTXt must have some text after the chunkdataword */
+   if (text >= chunkdata + slength - 2)
+   {
+      png_warning(png_ptr, "Truncated zTXt chunk");
+      png_free(png_ptr, chunkdata);
+      return;
+   }
+   else
+   {
+       comp_type = *(++text);
+       if (comp_type != PNG_TEXT_COMPRESSION_zTXt)
+       {
+          png_warning(png_ptr, "Unknown compression type in zTXt chunk");
+          comp_type = PNG_TEXT_COMPRESSION_zTXt;
+       }
+       text++;        /* skip the compression_method byte */
+   }
+   prefix_len = text - chunkdata;
+
+   chunkdata = (png_charp)png_decompress_chunk(png_ptr, comp_type, chunkdata,
+                                    (png_size_t)length, prefix_len, &data_len);
+
+   text_ptr = (png_textp)png_malloc_warn(png_ptr,
+     (png_uint_32)png_sizeof(png_text));
+   if (text_ptr == NULL)
+   {
+     png_warning(png_ptr,"Not enough memory to process zTXt chunk.");
+     png_free(png_ptr, chunkdata);
+     return;
+   }
+   text_ptr->compression = comp_type;
+   text_ptr->key = chunkdata;
+#ifdef PNG_iTXt_SUPPORTED
+   text_ptr->lang = NULL;
+   text_ptr->lang_key = NULL;
+   text_ptr->itxt_length = 0;
+#endif
+   text_ptr->text = chunkdata + prefix_len;
+   text_ptr->text_length = data_len;
+
+   ret=png_set_text_2(png_ptr, info_ptr, text_ptr, 1);
+
+   png_free(png_ptr, text_ptr);
+   png_free(png_ptr, chunkdata);
+   if (ret)
+     png_error(png_ptr, "Insufficient memory to store zTXt chunk.");
+}
+#endif
+
+#if defined(PNG_READ_iTXt_SUPPORTED)
+/* note: this does not correctly handle chunks that are > 64K under DOS */
+void /* PRIVATE */
+png_handle_iTXt(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
+{
+   png_textp text_ptr;
+   png_charp chunkdata;
+   png_charp key, lang, text, lang_key;
+   int comp_flag;
+   int comp_type = 0;
+   int ret;
+   png_size_t slength, prefix_len, data_len;
+
+   png_debug(1, "in png_handle_iTXt\n");
+
+   if (!(png_ptr->mode & PNG_HAVE_IHDR))
+      png_error(png_ptr, "Missing IHDR before iTXt");
+
+   if (png_ptr->mode & PNG_HAVE_IDAT)
+      png_ptr->mode |= PNG_AFTER_IDAT;
+
+#ifdef PNG_MAX_MALLOC_64K
+   /* We will no doubt have problems with chunks even half this size, but
+      there is no hard and fast rule to tell us where to stop. */
+   if (length > (png_uint_32)65535L)
+   {
+     png_warning(png_ptr,"iTXt chunk too large to fit in memory");
+     png_crc_finish(png_ptr, length);
+     return;
+   }
+#endif
+
+   chunkdata = (png_charp)png_malloc_warn(png_ptr, length + 1);
+   if (chunkdata == NULL)
+   {
+     png_warning(png_ptr, "No memory to process iTXt chunk.");
+     return;
+   }
+   slength = (png_size_t)length;
+   png_crc_read(png_ptr, (png_bytep)chunkdata, slength);
+   if (png_crc_finish(png_ptr, 0))
+   {
+      png_free(png_ptr, chunkdata);
+      return;
+   }
+
+   chunkdata[slength] = 0x00;
+
+   for (lang = chunkdata; *lang; lang++)
+      /* empty loop */ ;
+   lang++;        /* skip NUL separator */
+
+   /* iTXt must have a language tag (possibly empty), two compression bytes,
+      translated keyword (possibly empty), and possibly some text after the
+      keyword */
+
+   if (lang >= chunkdata + slength - 3)
+   {
+      png_warning(png_ptr, "Truncated iTXt chunk");
+      png_free(png_ptr, chunkdata);
+      return;
+   }
+   else
+   {
+       comp_flag = *lang++;
+       comp_type = *lang++;
+   }
+
+   for (lang_key = lang; *lang_key; lang_key++)
+      /* empty loop */ ;
+   lang_key++;        /* skip NUL separator */
+
+   if (lang_key >= chunkdata + slength)
+   {
+      png_warning(png_ptr, "Truncated iTXt chunk");
+      png_free(png_ptr, chunkdata);
+      return;
+   }
+
+   for (text = lang_key; *text; text++)
+      /* empty loop */ ;
+   text++;        /* skip NUL separator */
+   if (text >= chunkdata + slength)
+   {
+      png_warning(png_ptr, "Malformed iTXt chunk");
+      png_free(png_ptr, chunkdata);
+      return;
+   }
+
+   prefix_len = text - chunkdata;
+
+   key=chunkdata;
+   if (comp_flag)
+       chunkdata = png_decompress_chunk(png_ptr, comp_type, chunkdata,
+          (size_t)length, prefix_len, &data_len);
+   else
+       data_len=png_strlen(chunkdata + prefix_len);
+   text_ptr = (png_textp)png_malloc_warn(png_ptr,
+      (png_uint_32)png_sizeof(png_text));
+   if (text_ptr == NULL)
+   {
+     png_warning(png_ptr,"Not enough memory to process iTXt chunk.");
+     png_free(png_ptr, chunkdata);
+     return;
+   }
+   text_ptr->compression = (int)comp_flag + 1;
+   text_ptr->lang_key = chunkdata+(lang_key-key);
+   text_ptr->lang = chunkdata+(lang-key);
+   text_ptr->itxt_length = data_len;
+   text_ptr->text_length = 0;
+   text_ptr->key = chunkdata;
+   text_ptr->text = chunkdata + prefix_len;
+
+   ret=png_set_text_2(png_ptr, info_ptr, text_ptr, 1);
+
+   png_free(png_ptr, text_ptr);
+   png_free(png_ptr, chunkdata);
+   if (ret)
+     png_error(png_ptr, "Insufficient memory to store iTXt chunk.");
+}
+#endif
+
+/* This function is called when we haven't found a handler for a
+   chunk.  If there isn't a problem with the chunk itself (ie bad
+   chunk name, CRC, or a critical chunk), the chunk is silently ignored
+   -- unless the PNG_FLAG_UNKNOWN_CHUNKS_SUPPORTED flag is on in which
+   case it will be saved away to be written out later. */
+void /* PRIVATE */
+png_handle_unknown(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
+{
+   png_uint_32 skip = 0;
+
+   png_debug(1, "in png_handle_unknown\n");
+
+   if (png_ptr->mode & PNG_HAVE_IDAT)
+   {
+#ifdef PNG_USE_LOCAL_ARRAYS
+      PNG_CONST PNG_IDAT;
+#endif
+      if (png_memcmp(png_ptr->chunk_name, png_IDAT, 4))  /* not an IDAT */
+         png_ptr->mode |= PNG_AFTER_IDAT;
+   }
+
+   png_check_chunk_name(png_ptr, png_ptr->chunk_name);
+
+   if (!(png_ptr->chunk_name[0] & 0x20))
+   {
+#if defined(PNG_READ_UNKNOWN_CHUNKS_SUPPORTED)
+      if(png_handle_as_unknown(png_ptr, png_ptr->chunk_name) !=
+           PNG_HANDLE_CHUNK_ALWAYS
+#if defined(PNG_READ_USER_CHUNKS_SUPPORTED)
+           && png_ptr->read_user_chunk_fn == NULL
+#endif
+        )
+#endif
+          png_chunk_error(png_ptr, "unknown critical chunk");
+   }
+
+#if defined(PNG_READ_UNKNOWN_CHUNKS_SUPPORTED)
+   if ((png_ptr->flags & PNG_FLAG_KEEP_UNKNOWN_CHUNKS) ||
+       (png_ptr->read_user_chunk_fn != NULL))
+   {
+#ifdef PNG_MAX_MALLOC_64K
+       if (length > (png_uint_32)65535L)
+       {
+           png_warning(png_ptr, "unknown chunk too large to fit in memory");
+           skip = length - (png_uint_32)65535L;
+           length = (png_uint_32)65535L;
+       }
+#endif
+       png_strncpy((png_charp)png_ptr->unknown_chunk.name,
+	 (png_charp)png_ptr->chunk_name, 4);
+       png_ptr->unknown_chunk.name[4] = '\0';
+       png_ptr->unknown_chunk.data = (png_bytep)png_malloc(png_ptr, length);
+       png_ptr->unknown_chunk.size = (png_size_t)length;
+       png_crc_read(png_ptr, (png_bytep)png_ptr->unknown_chunk.data, length);
+#if defined(PNG_READ_USER_CHUNKS_SUPPORTED)
+       if(png_ptr->read_user_chunk_fn != NULL)
+       {
+          /* callback to user unknown chunk handler */
+          int ret;
+          ret = (*(png_ptr->read_user_chunk_fn))
+            (png_ptr, &png_ptr->unknown_chunk);
+          if (ret < 0)
+             png_chunk_error(png_ptr, "error in user chunk");
+          if (ret == 0)
+          {
+             if (!(png_ptr->chunk_name[0] & 0x20))
+                if(png_handle_as_unknown(png_ptr, png_ptr->chunk_name) !=
+                     PNG_HANDLE_CHUNK_ALWAYS)
+                   png_chunk_error(png_ptr, "unknown critical chunk");
+             png_set_unknown_chunks(png_ptr, info_ptr,
+               &png_ptr->unknown_chunk, 1);
+          }
+       }
+#else
+       png_set_unknown_chunks(png_ptr, info_ptr, &png_ptr->unknown_chunk, 1);
+#endif
+       png_free(png_ptr, png_ptr->unknown_chunk.data);
+       png_ptr->unknown_chunk.data = NULL;
+   }
+   else
+#endif
+      skip = length;
+
+   png_crc_finish(png_ptr, skip);
+
+#if !defined(PNG_READ_USER_CHUNKS_SUPPORTED)
+   info_ptr = info_ptr; /* quiet compiler warnings about unused info_ptr */
+#endif
+}
+
+/* This function is called to verify that a chunk name is valid.
+   This function can't have the "critical chunk check" incorporated
+   into it, since in the future we will need to be able to call user
+   functions to handle unknown critical chunks after we check that
+   the chunk name itself is valid. */
+
+#define isnonalpha(c) ((c) < 65 || (c) > 122 || ((c) > 90 && (c) < 97))
+
+void /* PRIVATE */
+png_check_chunk_name(png_structp png_ptr, png_bytep chunk_name)
+{
+   png_debug(1, "in png_check_chunk_name\n");
+   if (isnonalpha(chunk_name[0]) || isnonalpha(chunk_name[1]) ||
+       isnonalpha(chunk_name[2]) || isnonalpha(chunk_name[3]))
+   {
+      png_chunk_error(png_ptr, "invalid chunk type");
+   }
+}
+
+/* Combines the row recently read in with the existing pixels in the
+   row.  This routine takes care of alpha and transparency if requested.
+   This routine also handles the two methods of progressive display
+   of interlaced images, depending on the mask value.
+   The mask value describes which pixels are to be combined with
+   the row.  The pattern always repeats every 8 pixels, so just 8
+   bits are needed.  A one indicates the pixel is to be combined,
+   a zero indicates the pixel is to be skipped.  This is in addition
+   to any alpha or transparency value associated with the pixel.  If
+   you want all pixels to be combined, pass 0xff (255) in mask.  */
+
+void /* PRIVATE */
+png_combine_row(png_structp png_ptr, png_bytep row, int mask)
+{
+   png_debug(1,"in png_combine_row\n");
+   if (mask == 0xff)
+   {
+      png_memcpy(row, png_ptr->row_buf + 1,
+         PNG_ROWBYTES(png_ptr->row_info.pixel_depth, png_ptr->width));
+   }
+   else
+   {
+      switch (png_ptr->row_info.pixel_depth)
+      {
+         case 1:
+         {
+            png_bytep sp = png_ptr->row_buf + 1;
+            png_bytep dp = row;
+            int s_inc, s_start, s_end;
+            int m = 0x80;
+            int shift;
+            png_uint_32 i;
+            png_uint_32 row_width = png_ptr->width;
+
+#if defined(PNG_READ_PACKSWAP_SUPPORTED)
+            if (png_ptr->transformations & PNG_PACKSWAP)
+            {
+                s_start = 0;
+                s_end = 7;
+                s_inc = 1;
+            }
+            else
+#endif
+            {
+                s_start = 7;
+                s_end = 0;
+                s_inc = -1;
+            }
+
+            shift = s_start;
+
+            for (i = 0; i < row_width; i++)
+            {
+               if (m & mask)
+               {
+                  int value;
+
+                  value = (*sp >> shift) & 0x01;
+                  *dp &= (png_byte)((0x7f7f >> (7 - shift)) & 0xff);
+                  *dp |= (png_byte)(value << shift);
+               }
+
+               if (shift == s_end)
+               {
+                  shift = s_start;
+                  sp++;
+                  dp++;
+               }
+               else
+                  shift += s_inc;
+
+               if (m == 1)
+                  m = 0x80;
+               else
+                  m >>= 1;
+            }
+            break;
+         }
+         case 2:
+         {
+            png_bytep sp = png_ptr->row_buf + 1;
+            png_bytep dp = row;
+            int s_start, s_end, s_inc;
+            int m = 0x80;
+            int shift;
+            png_uint_32 i;
+            png_uint_32 row_width = png_ptr->width;
+            int value;
+
+#if defined(PNG_READ_PACKSWAP_SUPPORTED)
+            if (png_ptr->transformations & PNG_PACKSWAP)
+            {
+               s_start = 0;
+               s_end = 6;
+               s_inc = 2;
+            }
+            else
+#endif
+            {
+               s_start = 6;
+               s_end = 0;
+               s_inc = -2;
+            }
+
+            shift = s_start;
+
+            for (i = 0; i < row_width; i++)
+            {
+               if (m & mask)
+               {
+                  value = (*sp >> shift) & 0x03;
+                  *dp &= (png_byte)((0x3f3f >> (6 - shift)) & 0xff);
+                  *dp |= (png_byte)(value << shift);
+               }
+
+               if (shift == s_end)
+               {
+                  shift = s_start;
+                  sp++;
+                  dp++;
+               }
+               else
+                  shift += s_inc;
+               if (m == 1)
+                  m = 0x80;
+               else
+                  m >>= 1;
+            }
+            break;
+         }
+         case 4:
+         {
+            png_bytep sp = png_ptr->row_buf + 1;
+            png_bytep dp = row;
+            int s_start, s_end, s_inc;
+            int m = 0x80;
+            int shift;
+            png_uint_32 i;
+            png_uint_32 row_width = png_ptr->width;
+            int value;
+
+#if defined(PNG_READ_PACKSWAP_SUPPORTED)
+            if (png_ptr->transformations & PNG_PACKSWAP)
+            {
+               s_start = 0;
+               s_end = 4;
+               s_inc = 4;
+            }
+            else
+#endif
+            {
+               s_start = 4;
+               s_end = 0;
+               s_inc = -4;
+            }
+            shift = s_start;
+
+            for (i = 0; i < row_width; i++)
+            {
+               if (m & mask)
+               {
+                  value = (*sp >> shift) & 0xf;
+                  *dp &= (png_byte)((0xf0f >> (4 - shift)) & 0xff);
+                  *dp |= (png_byte)(value << shift);
+               }
+
+               if (shift == s_end)
+               {
+                  shift = s_start;
+                  sp++;
+                  dp++;
+               }
+               else
+                  shift += s_inc;
+               if (m == 1)
+                  m = 0x80;
+               else
+                  m >>= 1;
+            }
+            break;
+         }
+         default:
+         {
+            png_bytep sp = png_ptr->row_buf + 1;
+            png_bytep dp = row;
+            png_size_t pixel_bytes = (png_ptr->row_info.pixel_depth >> 3);
+            png_uint_32 i;
+            png_uint_32 row_width = png_ptr->width;
+            png_byte m = 0x80;
+
+
+            for (i = 0; i < row_width; i++)
+            {
+               if (m & mask)
+               {
+                  png_memcpy(dp, sp, pixel_bytes);
+               }
+
+               sp += pixel_bytes;
+               dp += pixel_bytes;
+
+               if (m == 1)
+                  m = 0x80;
+               else
+                  m >>= 1;
+            }
+            break;
+         }
+      }
+   }
+}
+
+#ifdef PNG_READ_INTERLACING_SUPPORTED
+/* OLD pre-1.0.9 interface:
+void png_do_read_interlace(png_row_infop row_info, png_bytep row, int pass,
+   png_uint_32 transformations)
+ */
+void /* PRIVATE */
+png_do_read_interlace(png_structp png_ptr)
+{
+   png_row_infop row_info = &(png_ptr->row_info);
+   png_bytep row = png_ptr->row_buf + 1;
+   int pass = png_ptr->pass;
+   png_uint_32 transformations = png_ptr->transformations;
+#ifdef PNG_USE_LOCAL_ARRAYS
+   /* arrays to facilitate easy interlacing - use pass (0 - 6) as index */
+   /* offset to next interlace block */
+   PNG_CONST int png_pass_inc[7] = {8, 8, 4, 4, 2, 2, 1};
+#endif
+
+   png_debug(1,"in png_do_read_interlace\n");
+   if (row != NULL && row_info != NULL)
+   {
+      png_uint_32 final_width;
+
+      final_width = row_info->width * png_pass_inc[pass];
+
+      switch (row_info->pixel_depth)
+      {
+         case 1:
+         {
+            png_bytep sp = row + (png_size_t)((row_info->width - 1) >> 3);
+            png_bytep dp = row + (png_size_t)((final_width - 1) >> 3);
+            int sshift, dshift;
+            int s_start, s_end, s_inc;
+            int jstop = png_pass_inc[pass];
+            png_byte v;
+            png_uint_32 i;
+            int j;
+
+#if defined(PNG_READ_PACKSWAP_SUPPORTED)
+            if (transformations & PNG_PACKSWAP)
+            {
+                sshift = (int)((row_info->width + 7) & 0x07);
+                dshift = (int)((final_width + 7) & 0x07);
+                s_start = 7;
+                s_end = 0;
+                s_inc = -1;
+            }
+            else
+#endif
+            {
+                sshift = 7 - (int)((row_info->width + 7) & 0x07);
+                dshift = 7 - (int)((final_width + 7) & 0x07);
+                s_start = 0;
+                s_end = 7;
+                s_inc = 1;
+            }
+
+            for (i = 0; i < row_info->width; i++)
+            {
+               v = (png_byte)((*sp >> sshift) & 0x01);
+               for (j = 0; j < jstop; j++)
+               {
+                  *dp &= (png_byte)((0x7f7f >> (7 - dshift)) & 0xff);
+                  *dp |= (png_byte)(v << dshift);
+                  if (dshift == s_end)
+                  {
+                     dshift = s_start;
+                     dp--;
+                  }
+                  else
+                     dshift += s_inc;
+               }
+               if (sshift == s_end)
+               {
+                  sshift = s_start;
+                  sp--;
+               }
+               else
+                  sshift += s_inc;
+            }
+            break;
+         }
+         case 2:
+         {
+            png_bytep sp = row + (png_uint_32)((row_info->width - 1) >> 2);
+            png_bytep dp = row + (png_uint_32)((final_width - 1) >> 2);
+            int sshift, dshift;
+            int s_start, s_end, s_inc;
+            int jstop = png_pass_inc[pass];
+            png_uint_32 i;
+
+#if defined(PNG_READ_PACKSWAP_SUPPORTED)
+            if (transformations & PNG_PACKSWAP)
+            {
+               sshift = (int)(((row_info->width + 3) & 0x03) << 1);
+               dshift = (int)(((final_width + 3) & 0x03) << 1);
+               s_start = 6;
+               s_end = 0;
+               s_inc = -2;
+            }
+            else
+#endif
+            {
+               sshift = (int)((3 - ((row_info->width + 3) & 0x03)) << 1);
+               dshift = (int)((3 - ((final_width + 3) & 0x03)) << 1);
+               s_start = 0;
+               s_end = 6;
+               s_inc = 2;
+            }
+
+            for (i = 0; i < row_info->width; i++)
+            {
+               png_byte v;
+               int j;
+
+               v = (png_byte)((*sp >> sshift) & 0x03);
+               for (j = 0; j < jstop; j++)
+               {
+                  *dp &= (png_byte)((0x3f3f >> (6 - dshift)) & 0xff);
+                  *dp |= (png_byte)(v << dshift);
+                  if (dshift == s_end)
+                  {
+                     dshift = s_start;
+                     dp--;
+                  }
+                  else
+                     dshift += s_inc;
+               }
+               if (sshift == s_end)
+               {
+                  sshift = s_start;
+                  sp--;
+               }
+               else
+                  sshift += s_inc;
+            }
+            break;
+         }
+         case 4:
+         {
+            png_bytep sp = row + (png_size_t)((row_info->width - 1) >> 1);
+            png_bytep dp = row + (png_size_t)((final_width - 1) >> 1);
+            int sshift, dshift;
+            int s_start, s_end, s_inc;
+            png_uint_32 i;
+            int jstop = png_pass_inc[pass];
+
+#if defined(PNG_READ_PACKSWAP_SUPPORTED)
+            if (transformations & PNG_PACKSWAP)
+            {
+               sshift = (int)(((row_info->width + 1) & 0x01) << 2);
+               dshift = (int)(((final_width + 1) & 0x01) << 2);
+               s_start = 4;
+               s_end = 0;
+               s_inc = -4;
+            }
+            else
+#endif
+            {
+               sshift = (int)((1 - ((row_info->width + 1) & 0x01)) << 2);
+               dshift = (int)((1 - ((final_width + 1) & 0x01)) << 2);
+               s_start = 0;
+               s_end = 4;
+               s_inc = 4;
+            }
+
+            for (i = 0; i < row_info->width; i++)
+            {
+               png_byte v = (png_byte)((*sp >> sshift) & 0xf);
+               int j;
+
+               for (j = 0; j < jstop; j++)
+               {
+                  *dp &= (png_byte)((0xf0f >> (4 - dshift)) & 0xff);
+                  *dp |= (png_byte)(v << dshift);
+                  if (dshift == s_end)
+                  {
+                     dshift = s_start;
+                     dp--;
+                  }
+                  else
+                     dshift += s_inc;
+               }
+               if (sshift == s_end)
+               {
+                  sshift = s_start;
+                  sp--;
+               }
+               else
+                  sshift += s_inc;
+            }
+            break;
+         }
+         default:
+         {
+            png_size_t pixel_bytes = (row_info->pixel_depth >> 3);
+            png_bytep sp = row + (png_size_t)(row_info->width - 1) * pixel_bytes;
+            png_bytep dp = row + (png_size_t)(final_width - 1) * pixel_bytes;
+
+            int jstop = png_pass_inc[pass];
+            png_uint_32 i;
+
+            for (i = 0; i < row_info->width; i++)
+            {
+               png_byte v[8];
+               int j;
+
+               png_memcpy(v, sp, pixel_bytes);
+               for (j = 0; j < jstop; j++)
+               {
+                  png_memcpy(dp, v, pixel_bytes);
+                  dp -= pixel_bytes;
+               }
+               sp -= pixel_bytes;
+            }
+            break;
+         }
+      }
+      row_info->width = final_width;
+      row_info->rowbytes = PNG_ROWBYTES(row_info->pixel_depth,final_width);
+   }
+#if !defined(PNG_READ_PACKSWAP_SUPPORTED)
+   transformations = transformations; /* silence compiler warning */
+#endif
+}
+#endif /* PNG_READ_INTERLACING_SUPPORTED */
+
+void /* PRIVATE */
+png_read_filter_row(png_structp png_ptr, png_row_infop row_info, png_bytep row,
+   png_bytep prev_row, int filter)
+{
+   png_debug(1, "in png_read_filter_row\n");
+   png_debug2(2,"row = %lu, filter = %d\n", png_ptr->row_number, filter);
+   switch (filter)
+   {
+      case PNG_FILTER_VALUE_NONE:
+         break;
+      case PNG_FILTER_VALUE_SUB:
+      {
+         png_uint_32 i;
+         png_uint_32 istop = row_info->rowbytes;
+         png_uint_32 bpp = (row_info->pixel_depth + 7) >> 3;
+         png_bytep rp = row + bpp;
+         png_bytep lp = row;
+
+         for (i = bpp; i < istop; i++)
+         {
+            *rp = (png_byte)(((int)(*rp) + (int)(*lp++)) & 0xff);
+            rp++;
+         }
+         break;
+      }
+      case PNG_FILTER_VALUE_UP:
+      {
+         png_uint_32 i;
+         png_uint_32 istop = row_info->rowbytes;
+         png_bytep rp = row;
+         png_bytep pp = prev_row;
+
+         for (i = 0; i < istop; i++)
+         {
+            *rp = (png_byte)(((int)(*rp) + (int)(*pp++)) & 0xff);
+            rp++;
+         }
+         break;
+      }
+      case PNG_FILTER_VALUE_AVG:
+      {
+         png_uint_32 i;
+         png_bytep rp = row;
+         png_bytep pp = prev_row;
+         png_bytep lp = row;
+         png_uint_32 bpp = (row_info->pixel_depth + 7) >> 3;
+         png_uint_32 istop = row_info->rowbytes - bpp;
+
+         for (i = 0; i < bpp; i++)
+         {
+            *rp = (png_byte)(((int)(*rp) +
+               ((int)(*pp++) / 2 )) & 0xff);
+            rp++;
+         }
+
+         for (i = 0; i < istop; i++)
+         {
+            *rp = (png_byte)(((int)(*rp) +
+               (int)(*pp++ + *lp++) / 2 ) & 0xff);
+            rp++;
+         }
+         break;
+      }
+      case PNG_FILTER_VALUE_PAETH:
+      {
+         png_uint_32 i;
+         png_bytep rp = row;
+         png_bytep pp = prev_row;
+         png_bytep lp = row;
+         png_bytep cp = prev_row;
+         png_uint_32 bpp = (row_info->pixel_depth + 7) >> 3;
+         png_uint_32 istop=row_info->rowbytes - bpp;
+
+         for (i = 0; i < bpp; i++)
+         {
+            *rp = (png_byte)(((int)(*rp) + (int)(*pp++)) & 0xff);
+            rp++;
+         }
+
+         for (i = 0; i < istop; i++)   /* use leftover rp,pp */
+         {
+            int a, b, c, pa, pb, pc, p;
+
+            a = *lp++;
+            b = *pp++;
+            c = *cp++;
+
+            p = b - c;
+            pc = a - c;
+
+#ifdef PNG_USE_ABS
+            pa = abs(p);
+            pb = abs(pc);
+            pc = abs(p + pc);
+#else
+            pa = p < 0 ? -p : p;
+            pb = pc < 0 ? -pc : pc;
+            pc = (p + pc) < 0 ? -(p + pc) : p + pc;
+#endif
+
+            /*
+               if (pa <= pb && pa <= pc)
+                  p = a;
+               else if (pb <= pc)
+                  p = b;
+               else
+                  p = c;
+             */
+
+            p = (pa <= pb && pa <=pc) ? a : (pb <= pc) ? b : c;
+
+            *rp = (png_byte)(((int)(*rp) + p) & 0xff);
+            rp++;
+         }
+         break;
+      }
+      default:
+         png_warning(png_ptr, "Ignoring bad adaptive filter type");
+         *row=0;
+         break;
+   }
+}
+
+void /* PRIVATE */
+png_read_finish_row(png_structp png_ptr)
+{
+#ifdef PNG_USE_LOCAL_ARRAYS
+   /* arrays to facilitate easy interlacing - use pass (0 - 6) as index */
+
+   /* start of interlace block */
+   PNG_CONST int png_pass_start[7] = {0, 4, 0, 2, 0, 1, 0};
+
+   /* offset to next interlace block */
+   PNG_CONST int png_pass_inc[7] = {8, 8, 4, 4, 2, 2, 1};
+
+   /* start of interlace block in the y direction */
+   PNG_CONST int png_pass_ystart[7] = {0, 0, 4, 0, 2, 0, 1};
+
+   /* offset to next interlace block in the y direction */
+   PNG_CONST int png_pass_yinc[7] = {8, 8, 8, 4, 4, 2, 2};
+#endif
+
+   png_debug(1, "in png_read_finish_row\n");
+   png_ptr->row_number++;
+   if (png_ptr->row_number < png_ptr->num_rows)
+      return;
+
+   if (png_ptr->interlaced)
+   {
+      png_ptr->row_number = 0;
+      png_memset_check(png_ptr, png_ptr->prev_row, 0,
+         png_ptr->rowbytes + 1);
+      do
+      {
+         png_ptr->pass++;
+         if (png_ptr->pass >= 7)
+            break;
+         png_ptr->iwidth = (png_ptr->width +
+            png_pass_inc[png_ptr->pass] - 1 -
+            png_pass_start[png_ptr->pass]) /
+            png_pass_inc[png_ptr->pass];
+
+         png_ptr->irowbytes = PNG_ROWBYTES(png_ptr->pixel_depth,
+            png_ptr->iwidth) + 1;
+
+         if (!(png_ptr->transformations & PNG_INTERLACE))
+         {
+            png_ptr->num_rows = (png_ptr->height +
+               png_pass_yinc[png_ptr->pass] - 1 -
+               png_pass_ystart[png_ptr->pass]) /
+               png_pass_yinc[png_ptr->pass];
+            if (!(png_ptr->num_rows))
+               continue;
+         }
+         else  /* if (png_ptr->transformations & PNG_INTERLACE) */
+            break;
+      } while (png_ptr->iwidth == 0);
+
+      if (png_ptr->pass < 7)
+         return;
+   }
+
+   if (!(png_ptr->flags & PNG_FLAG_ZLIB_FINISHED))
+   {
+#ifdef PNG_USE_LOCAL_ARRAYS
+      PNG_CONST PNG_IDAT;
+#endif
+      char extra;
+      int ret;
+
+      png_ptr->zstream.next_out = (Byte *)&extra;
+      png_ptr->zstream.avail_out = (uInt)1;
+      for(;;)
+      {
+         if (!(png_ptr->zstream.avail_in))
+         {
+            while (!png_ptr->idat_size)
+            {
+               png_byte chunk_length[4];
+
+               png_crc_finish(png_ptr, 0);
+
+               png_read_data(png_ptr, chunk_length, 4);
+               png_ptr->idat_size = png_get_uint_31(png_ptr, chunk_length);
+               png_reset_crc(png_ptr);
+               png_crc_read(png_ptr, png_ptr->chunk_name, 4);
+               if (png_memcmp(png_ptr->chunk_name, png_IDAT, 4))
+                  png_error(png_ptr, "Not enough image data");
+
+            }
+            png_ptr->zstream.avail_in = (uInt)png_ptr->zbuf_size;
+            png_ptr->zstream.next_in = png_ptr->zbuf;
+            if (png_ptr->zbuf_size > png_ptr->idat_size)
+               png_ptr->zstream.avail_in = (uInt)png_ptr->idat_size;
+            png_crc_read(png_ptr, png_ptr->zbuf, png_ptr->zstream.avail_in);
+            png_ptr->idat_size -= png_ptr->zstream.avail_in;
+         }
+         ret = inflate(&png_ptr->zstream, Z_PARTIAL_FLUSH);
+         if (ret == Z_STREAM_END)
+         {
+            if (!(png_ptr->zstream.avail_out) || png_ptr->zstream.avail_in ||
+               png_ptr->idat_size)
+               png_warning(png_ptr, "Extra compressed data");
+            png_ptr->mode |= PNG_AFTER_IDAT;
+            png_ptr->flags |= PNG_FLAG_ZLIB_FINISHED;
+            break;
+         }
+         if (ret != Z_OK)
+            png_error(png_ptr, png_ptr->zstream.msg ? png_ptr->zstream.msg :
+                      "Decompression Error");
+
+         if (!(png_ptr->zstream.avail_out))
+         {
+            png_warning(png_ptr, "Extra compressed data.");
+            png_ptr->mode |= PNG_AFTER_IDAT;
+            png_ptr->flags |= PNG_FLAG_ZLIB_FINISHED;
+            break;
+         }
+
+      }
+      png_ptr->zstream.avail_out = 0;
+   }
+
+   if (png_ptr->idat_size || png_ptr->zstream.avail_in)
+      png_warning(png_ptr, "Extra compression data");
+
+   inflateReset(&png_ptr->zstream);
+
+   png_ptr->mode |= PNG_AFTER_IDAT;
+}
+
+void /* PRIVATE */
+png_read_start_row(png_structp png_ptr)
+{
+#ifdef PNG_USE_LOCAL_ARRAYS
+   /* arrays to facilitate easy interlacing - use pass (0 - 6) as index */
+
+   /* start of interlace block */
+   PNG_CONST int png_pass_start[7] = {0, 4, 0, 2, 0, 1, 0};
+
+   /* offset to next interlace block */
+   PNG_CONST int png_pass_inc[7] = {8, 8, 4, 4, 2, 2, 1};
+
+   /* start of interlace block in the y direction */
+   PNG_CONST int png_pass_ystart[7] = {0, 0, 4, 0, 2, 0, 1};
+
+   /* offset to next interlace block in the y direction */
+   PNG_CONST int png_pass_yinc[7] = {8, 8, 8, 4, 4, 2, 2};
+#endif
+
+   int max_pixel_depth;
+   png_uint_32 row_bytes;
+
+   png_debug(1, "in png_read_start_row\n");
+   png_ptr->zstream.avail_in = 0;
+   png_init_read_transformations(png_ptr);
+   if (png_ptr->interlaced)
+   {
+      if (!(png_ptr->transformations & PNG_INTERLACE))
+         png_ptr->num_rows = (png_ptr->height + png_pass_yinc[0] - 1 -
+            png_pass_ystart[0]) / png_pass_yinc[0];
+      else
+         png_ptr->num_rows = png_ptr->height;
+
+      png_ptr->iwidth = (png_ptr->width +
+         png_pass_inc[png_ptr->pass] - 1 -
+         png_pass_start[png_ptr->pass]) /
+         png_pass_inc[png_ptr->pass];
+
+         row_bytes = PNG_ROWBYTES(png_ptr->pixel_depth,png_ptr->iwidth) + 1;
+
+         png_ptr->irowbytes = (png_size_t)row_bytes;
+         if((png_uint_32)png_ptr->irowbytes != row_bytes)
+            png_error(png_ptr, "Rowbytes overflow in png_read_start_row");
+   }
+   else
+   {
+      png_ptr->num_rows = png_ptr->height;
+      png_ptr->iwidth = png_ptr->width;
+      png_ptr->irowbytes = png_ptr->rowbytes + 1;
+   }
+   max_pixel_depth = png_ptr->pixel_depth;
+
+#if defined(PNG_READ_PACK_SUPPORTED)
+   if ((png_ptr->transformations & PNG_PACK) && png_ptr->bit_depth < 8)
+      max_pixel_depth = 8;
+#endif
+
+#if defined(PNG_READ_EXPAND_SUPPORTED)
+   if (png_ptr->transformations & PNG_EXPAND)
+   {
+      if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
+      {
+         if (png_ptr->num_trans)
+            max_pixel_depth = 32;
+         else
+            max_pixel_depth = 24;
+      }
+      else if (png_ptr->color_type == PNG_COLOR_TYPE_GRAY)
+      {
+         if (max_pixel_depth < 8)
+            max_pixel_depth = 8;
+         if (png_ptr->num_trans)
+            max_pixel_depth *= 2;
+      }
+      else if (png_ptr->color_type == PNG_COLOR_TYPE_RGB)
+      {
+         if (png_ptr->num_trans)
+         {
+            max_pixel_depth *= 4;
+            max_pixel_depth /= 3;
+         }
+      }
+   }
+#endif
+
+#if defined(PNG_READ_FILLER_SUPPORTED)
+   if (png_ptr->transformations & (PNG_FILLER))
+   {
+      if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
+         max_pixel_depth = 32;
+      else if (png_ptr->color_type == PNG_COLOR_TYPE_GRAY)
+      {
+         if (max_pixel_depth <= 8)
+            max_pixel_depth = 16;
+         else
+            max_pixel_depth = 32;
+      }
+      else if (png_ptr->color_type == PNG_COLOR_TYPE_RGB)
+      {
+         if (max_pixel_depth <= 32)
+            max_pixel_depth = 32;
+         else
+            max_pixel_depth = 64;
+      }
+   }
+#endif
+
+#if defined(PNG_READ_GRAY_TO_RGB_SUPPORTED)
+   if (png_ptr->transformations & PNG_GRAY_TO_RGB)
+   {
+      if (
+#if defined(PNG_READ_EXPAND_SUPPORTED)
+        (png_ptr->num_trans && (png_ptr->transformations & PNG_EXPAND)) ||
+#endif
+#if defined(PNG_READ_FILLER_SUPPORTED)
+        (png_ptr->transformations & (PNG_FILLER)) ||
+#endif
+        png_ptr->color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
+      {
+         if (max_pixel_depth <= 16)
+            max_pixel_depth = 32;
+         else
+            max_pixel_depth = 64;
+      }
+      else
+      {
+         if (max_pixel_depth <= 8)
+           {
+             if (png_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
+               max_pixel_depth = 32;
+             else
+               max_pixel_depth = 24;
+           }
+         else if (png_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
+            max_pixel_depth = 64;
+         else
+            max_pixel_depth = 48;
+      }
+   }
+#endif
+
+#if defined(PNG_READ_USER_TRANSFORM_SUPPORTED) && \
+defined(PNG_USER_TRANSFORM_PTR_SUPPORTED)
+   if(png_ptr->transformations & PNG_USER_TRANSFORM)
+     {
+       int user_pixel_depth=png_ptr->user_transform_depth*
+         png_ptr->user_transform_channels;
+       if(user_pixel_depth > max_pixel_depth)
+         max_pixel_depth=user_pixel_depth;
+     }
+#endif
+
+   /* align the width on the next larger 8 pixels.  Mainly used
+      for interlacing */
+   row_bytes = ((png_ptr->width + 7) & ~((png_uint_32)7));
+   /* calculate the maximum bytes needed, adding a byte and a pixel
+      for safety's sake */
+   row_bytes = PNG_ROWBYTES(max_pixel_depth,row_bytes) +
+      1 + ((max_pixel_depth + 7) >> 3);
+#ifdef PNG_MAX_MALLOC_64K
+   if (row_bytes > (png_uint_32)65536L)
+      png_error(png_ptr, "This image requires a row greater than 64KB");
+#endif
+   png_ptr->big_row_buf = (png_bytep)png_malloc(png_ptr, row_bytes+64);
+   png_ptr->row_buf = png_ptr->big_row_buf+32;
+
+#ifdef PNG_MAX_MALLOC_64K
+   if ((png_uint_32)png_ptr->rowbytes + 1 > (png_uint_32)65536L)
+      png_error(png_ptr, "This image requires a row greater than 64KB");
+#endif
+   if ((png_uint_32)png_ptr->rowbytes > (png_uint_32)(PNG_SIZE_MAX - 1))
+      png_error(png_ptr, "Row has too many bytes to allocate in memory.");
+   png_ptr->prev_row = (png_bytep)png_malloc(png_ptr, (png_uint_32)(
+      png_ptr->rowbytes + 1));
+
+   png_memset_check(png_ptr, png_ptr->prev_row, 0, png_ptr->rowbytes + 1);
+
+   png_debug1(3, "width = %lu,\n", png_ptr->width);
+   png_debug1(3, "height = %lu,\n", png_ptr->height);
+   png_debug1(3, "iwidth = %lu,\n", png_ptr->iwidth);
+   png_debug1(3, "num_rows = %lu\n", png_ptr->num_rows);
+   png_debug1(3, "rowbytes = %lu,\n", png_ptr->rowbytes);
+   png_debug1(3, "irowbytes = %lu,\n", png_ptr->irowbytes);
+
+   png_ptr->flags |= PNG_FLAG_ROW_INIT;
+}
+#endif /* PNG_READ_SUPPORTED */
diff --git a/uppsrc/plugin/png/lib/pngset.c b/uppsrc/plugin/png/lib/pngset.c
new file mode 100644
index 000000000..b54a11189
--- /dev/null
+++ b/uppsrc/plugin/png/lib/pngset.c
@@ -0,0 +1,1246 @@
+
+/* pngset.c - storage of image information into info struct
+ *
+ * Last changed in libpng 1.2.22 [October 13, 2007]
+ * For conditions of distribution and use, see copyright notice in png.h
+ * Copyright (c) 1998-2007 Glenn Randers-Pehrson
+ * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
+ * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
+ *
+ * The functions here are used during reads to store data from the file
+ * into the info struct, and during writes to store application data
+ * into the info struct for writing into the file.  This abstracts the
+ * info struct and allows us to change the structure in the future.
+ */
+
+#define PNG_INTERNAL
+#include "png.h"
+
+#if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED)
+
+#if defined(PNG_bKGD_SUPPORTED)
+void PNGAPI
+png_set_bKGD(png_structp png_ptr, png_infop info_ptr, png_color_16p background)
+{
+   png_debug1(1, "in %s storage function\n", "bKGD");
+   if (png_ptr == NULL || info_ptr == NULL)
+      return;
+
+   png_memcpy(&(info_ptr->background), background, png_sizeof(png_color_16));
+   info_ptr->valid |= PNG_INFO_bKGD;
+}
+#endif
+
+#if defined(PNG_cHRM_SUPPORTED)
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+void PNGAPI
+png_set_cHRM(png_structp png_ptr, png_infop info_ptr,
+   double white_x, double white_y, double red_x, double red_y,
+   double green_x, double green_y, double blue_x, double blue_y)
+{
+   png_debug1(1, "in %s storage function\n", "cHRM");
+   if (png_ptr == NULL || info_ptr == NULL)
+      return;
+
+   if (white_x < 0.0 || white_y < 0.0 ||
+         red_x < 0.0 ||   red_y < 0.0 ||
+       green_x < 0.0 || green_y < 0.0 ||
+        blue_x < 0.0 ||  blue_y < 0.0)
+   {
+      png_warning(png_ptr,
+        "Ignoring attempt to set negative chromaticity value");
+      return;
+   }
+   if (white_x > 21474.83 || white_y > 21474.83 ||
+         red_x > 21474.83 ||   red_y > 21474.83 ||
+       green_x > 21474.83 || green_y > 21474.83 ||
+        blue_x > 21474.83 ||  blue_y > 21474.83)
+   {
+      png_warning(png_ptr,
+        "Ignoring attempt to set chromaticity value exceeding 21474.83");
+      return;
+   }
+
+   info_ptr->x_white = (float)white_x;
+   info_ptr->y_white = (float)white_y;
+   info_ptr->x_red   = (float)red_x;
+   info_ptr->y_red   = (float)red_y;
+   info_ptr->x_green = (float)green_x;
+   info_ptr->y_green = (float)green_y;
+   info_ptr->x_blue  = (float)blue_x;
+   info_ptr->y_blue  = (float)blue_y;
+#ifdef PNG_FIXED_POINT_SUPPORTED
+   info_ptr->int_x_white = (png_fixed_point)(white_x*100000.+0.5);
+   info_ptr->int_y_white = (png_fixed_point)(white_y*100000.+0.5);
+   info_ptr->int_x_red   = (png_fixed_point)(  red_x*100000.+0.5);
+   info_ptr->int_y_red   = (png_fixed_point)(  red_y*100000.+0.5);
+   info_ptr->int_x_green = (png_fixed_point)(green_x*100000.+0.5);
+   info_ptr->int_y_green = (png_fixed_point)(green_y*100000.+0.5);
+   info_ptr->int_x_blue  = (png_fixed_point)( blue_x*100000.+0.5);
+   info_ptr->int_y_blue  = (png_fixed_point)( blue_y*100000.+0.5);
+#endif
+   info_ptr->valid |= PNG_INFO_cHRM;
+}
+#endif
+#ifdef PNG_FIXED_POINT_SUPPORTED
+void PNGAPI
+png_set_cHRM_fixed(png_structp png_ptr, png_infop info_ptr,
+   png_fixed_point white_x, png_fixed_point white_y, png_fixed_point red_x,
+   png_fixed_point red_y, png_fixed_point green_x, png_fixed_point green_y,
+   png_fixed_point blue_x, png_fixed_point blue_y)
+{
+   png_debug1(1, "in %s storage function\n", "cHRM");
+   if (png_ptr == NULL || info_ptr == NULL)
+      return;
+
+   if (white_x < 0 || white_y < 0 ||
+         red_x < 0 ||   red_y < 0 ||
+       green_x < 0 || green_y < 0 ||
+        blue_x < 0 ||  blue_y < 0)
+   {
+      png_warning(png_ptr,
+        "Ignoring attempt to set negative chromaticity value");
+      return;
+   }
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+   if (white_x > (double) PNG_UINT_31_MAX ||
+       white_y > (double) PNG_UINT_31_MAX ||
+         red_x > (double) PNG_UINT_31_MAX ||
+         red_y > (double) PNG_UINT_31_MAX ||
+       green_x > (double) PNG_UINT_31_MAX ||
+       green_y > (double) PNG_UINT_31_MAX ||
+        blue_x > (double) PNG_UINT_31_MAX ||
+        blue_y > (double) PNG_UINT_31_MAX)
+#else
+   if (white_x > (png_fixed_point) PNG_UINT_31_MAX/100000L ||
+       white_y > (png_fixed_point) PNG_UINT_31_MAX/100000L ||
+         red_x > (png_fixed_point) PNG_UINT_31_MAX/100000L ||
+         red_y > (png_fixed_point) PNG_UINT_31_MAX/100000L ||
+       green_x > (png_fixed_point) PNG_UINT_31_MAX/100000L ||
+       green_y > (png_fixed_point) PNG_UINT_31_MAX/100000L ||
+        blue_x > (png_fixed_point) PNG_UINT_31_MAX/100000L ||
+        blue_y > (png_fixed_point) PNG_UINT_31_MAX/100000L)
+#endif
+   {
+      png_warning(png_ptr,
+        "Ignoring attempt to set chromaticity value exceeding 21474.83");
+      return;
+   }
+   info_ptr->int_x_white = white_x;
+   info_ptr->int_y_white = white_y;
+   info_ptr->int_x_red   = red_x;
+   info_ptr->int_y_red   = red_y;
+   info_ptr->int_x_green = green_x;
+   info_ptr->int_y_green = green_y;
+   info_ptr->int_x_blue  = blue_x;
+   info_ptr->int_y_blue  = blue_y;
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+   info_ptr->x_white = (float)(white_x/100000.);
+   info_ptr->y_white = (float)(white_y/100000.);
+   info_ptr->x_red   = (float)(  red_x/100000.);
+   info_ptr->y_red   = (float)(  red_y/100000.);
+   info_ptr->x_green = (float)(green_x/100000.);
+   info_ptr->y_green = (float)(green_y/100000.);
+   info_ptr->x_blue  = (float)( blue_x/100000.);
+   info_ptr->y_blue  = (float)( blue_y/100000.);
+#endif
+   info_ptr->valid |= PNG_INFO_cHRM;
+}
+#endif
+#endif
+
+#if defined(PNG_gAMA_SUPPORTED)
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+void PNGAPI
+png_set_gAMA(png_structp png_ptr, png_infop info_ptr, double file_gamma)
+{
+   double gamma;
+   png_debug1(1, "in %s storage function\n", "gAMA");
+   if (png_ptr == NULL || info_ptr == NULL)
+      return;
+
+   /* Check for overflow */
+   if (file_gamma > 21474.83)
+   {
+      png_warning(png_ptr, "Limiting gamma to 21474.83");
+      gamma=21474.83;
+   }
+   else
+      gamma=file_gamma;
+   info_ptr->gamma = (float)gamma;
+#ifdef PNG_FIXED_POINT_SUPPORTED
+   info_ptr->int_gamma = (int)(gamma*100000.+.5);
+#endif
+   info_ptr->valid |= PNG_INFO_gAMA;
+   if(gamma == 0.0)
+      png_warning(png_ptr, "Setting gamma=0");
+}
+#endif
+void PNGAPI
+png_set_gAMA_fixed(png_structp png_ptr, png_infop info_ptr, png_fixed_point
+   int_gamma)
+{
+   png_fixed_point gamma;
+
+   png_debug1(1, "in %s storage function\n", "gAMA");
+   if (png_ptr == NULL || info_ptr == NULL)
+      return;
+
+   if (int_gamma > (png_fixed_point) PNG_UINT_31_MAX)
+   {
+     png_warning(png_ptr, "Limiting gamma to 21474.83");
+     gamma=PNG_UINT_31_MAX;
+   }
+   else
+   {
+     if (int_gamma < 0)
+     {
+       png_warning(png_ptr, "Setting negative gamma to zero");
+       gamma=0;
+     }
+     else
+       gamma=int_gamma;
+   }
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+   info_ptr->gamma = (float)(gamma/100000.);
+#endif
+#ifdef PNG_FIXED_POINT_SUPPORTED
+   info_ptr->int_gamma = gamma;
+#endif
+   info_ptr->valid |= PNG_INFO_gAMA;
+   if(gamma == 0)
+      png_warning(png_ptr, "Setting gamma=0");
+}
+#endif
+
+#if defined(PNG_hIST_SUPPORTED)
+void PNGAPI
+png_set_hIST(png_structp png_ptr, png_infop info_ptr, png_uint_16p hist)
+{
+   int i;
+
+   png_debug1(1, "in %s storage function\n", "hIST");
+   if (png_ptr == NULL || info_ptr == NULL)
+      return;
+   if (info_ptr->num_palette == 0 || info_ptr->num_palette
+       > PNG_MAX_PALETTE_LENGTH)
+   {
+       png_warning(png_ptr,
+          "Invalid palette size, hIST allocation skipped.");
+       return;
+   }
+
+#ifdef PNG_FREE_ME_SUPPORTED
+   png_free_data(png_ptr, info_ptr, PNG_FREE_HIST, 0);
+#endif
+   /* Changed from info->num_palette to PNG_MAX_PALETTE_LENGTH in version
+      1.2.1 */
+   png_ptr->hist = (png_uint_16p)png_malloc_warn(png_ptr,
+      (png_uint_32)(PNG_MAX_PALETTE_LENGTH * png_sizeof (png_uint_16)));
+   if (png_ptr->hist == NULL)
+     {
+       png_warning(png_ptr, "Insufficient memory for hIST chunk data.");
+       return;
+     }
+
+   for (i = 0; i < info_ptr->num_palette; i++)
+       png_ptr->hist[i] = hist[i];
+   info_ptr->hist = png_ptr->hist;
+   info_ptr->valid |= PNG_INFO_hIST;
+
+#ifdef PNG_FREE_ME_SUPPORTED
+   info_ptr->free_me |= PNG_FREE_HIST;
+#else
+   png_ptr->flags |= PNG_FLAG_FREE_HIST;
+#endif
+}
+#endif
+
+void PNGAPI
+png_set_IHDR(png_structp png_ptr, png_infop info_ptr,
+   png_uint_32 width, png_uint_32 height, int bit_depth,
+   int color_type, int interlace_type, int compression_type,
+   int filter_type)
+{
+   png_debug1(1, "in %s storage function\n", "IHDR");
+   if (png_ptr == NULL || info_ptr == NULL)
+      return;
+
+   /* check for width and height valid values */
+   if (width == 0 || height == 0)
+      png_error(png_ptr, "Image width or height is zero in IHDR");
+#ifdef PNG_SET_USER_LIMITS_SUPPORTED
+   if (width > png_ptr->user_width_max || height > png_ptr->user_height_max)
+      png_error(png_ptr, "image size exceeds user limits in IHDR");
+#else
+   if (width > PNG_USER_WIDTH_MAX || height > PNG_USER_HEIGHT_MAX)
+      png_error(png_ptr, "image size exceeds user limits in IHDR");
+#endif
+   if (width > PNG_UINT_31_MAX || height > PNG_UINT_31_MAX)
+      png_error(png_ptr, "Invalid image size in IHDR");
+   if ( width > (PNG_UINT_32_MAX
+                 >> 3)      /* 8-byte RGBA pixels */
+                 - 64       /* bigrowbuf hack */
+                 - 1        /* filter byte */
+                 - 7*8      /* rounding of width to multiple of 8 pixels */
+                 - 8)       /* extra max_pixel_depth pad */
+      png_warning(png_ptr, "Width is too large for libpng to process pixels");
+
+   /* check other values */
+   if (bit_depth != 1 && bit_depth != 2 && bit_depth != 4 &&
+      bit_depth != 8 && bit_depth != 16)
+      png_error(png_ptr, "Invalid bit depth in IHDR");
+
+   if (color_type < 0 || color_type == 1 ||
+      color_type == 5 || color_type > 6)
+      png_error(png_ptr, "Invalid color type in IHDR");
+
+   if (((color_type == PNG_COLOR_TYPE_PALETTE) && bit_depth > 8) ||
+       ((color_type == PNG_COLOR_TYPE_RGB ||
+         color_type == PNG_COLOR_TYPE_GRAY_ALPHA ||
+         color_type == PNG_COLOR_TYPE_RGB_ALPHA) && bit_depth < 8))
+      png_error(png_ptr, "Invalid color type/bit depth combination in IHDR");
+
+   if (interlace_type >= PNG_INTERLACE_LAST)
+      png_error(png_ptr, "Unknown interlace method in IHDR");
+
+   if (compression_type != PNG_COMPRESSION_TYPE_BASE)
+      png_error(png_ptr, "Unknown compression method in IHDR");
+
+#if defined(PNG_MNG_FEATURES_SUPPORTED)
+   /* Accept filter_method 64 (intrapixel differencing) only if
+    * 1. Libpng was compiled with PNG_MNG_FEATURES_SUPPORTED and
+    * 2. Libpng did not read a PNG signature (this filter_method is only
+    *    used in PNG datastreams that are embedded in MNG datastreams) and
+    * 3. The application called png_permit_mng_features with a mask that
+    *    included PNG_FLAG_MNG_FILTER_64 and
+    * 4. The filter_method is 64 and
+    * 5. The color_type is RGB or RGBA
+    */
+   if((png_ptr->mode&PNG_HAVE_PNG_SIGNATURE)&&png_ptr->mng_features_permitted)
+      png_warning(png_ptr,"MNG features are not allowed in a PNG datastream");
+   if(filter_type != PNG_FILTER_TYPE_BASE)
+   {
+     if(!((png_ptr->mng_features_permitted & PNG_FLAG_MNG_FILTER_64) &&
+        (filter_type == PNG_INTRAPIXEL_DIFFERENCING) &&
+        ((png_ptr->mode&PNG_HAVE_PNG_SIGNATURE) == 0) &&
+        (color_type == PNG_COLOR_TYPE_RGB ||
+         color_type == PNG_COLOR_TYPE_RGB_ALPHA)))
+        png_error(png_ptr, "Unknown filter method in IHDR");
+     if(png_ptr->mode&PNG_HAVE_PNG_SIGNATURE)
+        png_warning(png_ptr, "Invalid filter method in IHDR");
+   }
+#else
+   if(filter_type != PNG_FILTER_TYPE_BASE)
+      png_error(png_ptr, "Unknown filter method in IHDR");
+#endif
+
+   info_ptr->width = width;
+   info_ptr->height = height;
+   info_ptr->bit_depth = (png_byte)bit_depth;
+   info_ptr->color_type =(png_byte) color_type;
+   info_ptr->compression_type = (png_byte)compression_type;
+   info_ptr->filter_type = (png_byte)filter_type;
+   info_ptr->interlace_type = (png_byte)interlace_type;
+   if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
+      info_ptr->channels = 1;
+   else if (info_ptr->color_type & PNG_COLOR_MASK_COLOR)
+      info_ptr->channels = 3;
+   else
+      info_ptr->channels = 1;
+   if (info_ptr->color_type & PNG_COLOR_MASK_ALPHA)
+      info_ptr->channels++;
+   info_ptr->pixel_depth = (png_byte)(info_ptr->channels * info_ptr->bit_depth);
+
+   /* check for potential overflow */
+   if (width > (PNG_UINT_32_MAX
+                 >> 3)      /* 8-byte RGBA pixels */
+                 - 64       /* bigrowbuf hack */
+                 - 1        /* filter byte */
+                 - 7*8      /* rounding of width to multiple of 8 pixels */
+                 - 8)       /* extra max_pixel_depth pad */
+      info_ptr->rowbytes = (png_size_t)0;
+   else
+      info_ptr->rowbytes = PNG_ROWBYTES(info_ptr->pixel_depth,width);
+}
+
+#if defined(PNG_oFFs_SUPPORTED)
+void PNGAPI
+png_set_oFFs(png_structp png_ptr, png_infop info_ptr,
+   png_int_32 offset_x, png_int_32 offset_y, int unit_type)
+{
+   png_debug1(1, "in %s storage function\n", "oFFs");
+   if (png_ptr == NULL || info_ptr == NULL)
+      return;
+
+   info_ptr->x_offset = offset_x;
+   info_ptr->y_offset = offset_y;
+   info_ptr->offset_unit_type = (png_byte)unit_type;
+   info_ptr->valid |= PNG_INFO_oFFs;
+}
+#endif
+
+#if defined(PNG_pCAL_SUPPORTED)
+void PNGAPI
+png_set_pCAL(png_structp png_ptr, png_infop info_ptr,
+   png_charp purpose, png_int_32 X0, png_int_32 X1, int type, int nparams,
+   png_charp units, png_charpp params)
+{
+   png_uint_32 length;
+   int i;
+
+   png_debug1(1, "in %s storage function\n", "pCAL");
+   if (png_ptr == NULL || info_ptr == NULL)
+      return;
+
+   length = png_strlen(purpose) + 1;
+   png_debug1(3, "allocating purpose for info (%lu bytes)\n", length);
+   info_ptr->pcal_purpose = (png_charp)png_malloc_warn(png_ptr, length);
+   if (info_ptr->pcal_purpose == NULL)
+     {
+       png_warning(png_ptr, "Insufficient memory for pCAL purpose.");
+       return;
+     }
+   png_memcpy(info_ptr->pcal_purpose, purpose, (png_size_t)length);
+
+   png_debug(3, "storing X0, X1, type, and nparams in info\n");
+   info_ptr->pcal_X0 = X0;
+   info_ptr->pcal_X1 = X1;
+   info_ptr->pcal_type = (png_byte)type;
+   info_ptr->pcal_nparams = (png_byte)nparams;
+
+   length = png_strlen(units) + 1;
+   png_debug1(3, "allocating units for info (%lu bytes)\n", length);
+   info_ptr->pcal_units = (png_charp)png_malloc_warn(png_ptr, length);
+   if (info_ptr->pcal_units == NULL)
+     {
+       png_warning(png_ptr, "Insufficient memory for pCAL units.");
+       return;
+     }
+   png_memcpy(info_ptr->pcal_units, units, (png_size_t)length);
+
+   info_ptr->pcal_params = (png_charpp)png_malloc_warn(png_ptr,
+      (png_uint_32)((nparams + 1) * png_sizeof(png_charp)));
+   if (info_ptr->pcal_params == NULL)
+     {
+       png_warning(png_ptr, "Insufficient memory for pCAL params.");
+       return;
+     }
+
+   info_ptr->pcal_params[nparams] = NULL;
+
+   for (i = 0; i < nparams; i++)
+   {
+      length = png_strlen(params[i]) + 1;
+      png_debug2(3, "allocating parameter %d for info (%lu bytes)\n", i, length);
+      info_ptr->pcal_params[i] = (png_charp)png_malloc_warn(png_ptr, length);
+      if (info_ptr->pcal_params[i] == NULL)
+        {
+          png_warning(png_ptr, "Insufficient memory for pCAL parameter.");
+          return;
+        }
+      png_memcpy(info_ptr->pcal_params[i], params[i], (png_size_t)length);
+   }
+
+   info_ptr->valid |= PNG_INFO_pCAL;
+#ifdef PNG_FREE_ME_SUPPORTED
+   info_ptr->free_me |= PNG_FREE_PCAL;
+#endif
+}
+#endif
+
+#if defined(PNG_READ_sCAL_SUPPORTED) || defined(PNG_WRITE_sCAL_SUPPORTED)
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+void PNGAPI
+png_set_sCAL(png_structp png_ptr, png_infop info_ptr,
+             int unit, double width, double height)
+{
+   png_debug1(1, "in %s storage function\n", "sCAL");
+   if (png_ptr == NULL || info_ptr == NULL)
+      return;
+
+   info_ptr->scal_unit = (png_byte)unit;
+   info_ptr->scal_pixel_width = width;
+   info_ptr->scal_pixel_height = height;
+
+   info_ptr->valid |= PNG_INFO_sCAL;
+}
+#else
+#ifdef PNG_FIXED_POINT_SUPPORTED
+void PNGAPI
+png_set_sCAL_s(png_structp png_ptr, png_infop info_ptr,
+             int unit, png_charp swidth, png_charp sheight)
+{
+   png_uint_32 length;
+
+   png_debug1(1, "in %s storage function\n", "sCAL");
+   if (png_ptr == NULL || info_ptr == NULL)
+      return;
+
+   info_ptr->scal_unit = (png_byte)unit;
+
+   length = png_strlen(swidth) + 1;
+   png_debug1(3, "allocating unit for info (%d bytes)\n", length);
+   info_ptr->scal_s_width = (png_charp)png_malloc_warn(png_ptr, length);
+   if (info_ptr->scal_s_width == NULL)
+   {
+      png_warning(png_ptr,
+       "Memory allocation failed while processing sCAL.");
+   }
+   png_memcpy(info_ptr->scal_s_width, swidth, (png_size_t)length);
+
+   length = png_strlen(sheight) + 1;
+   png_debug1(3, "allocating unit for info (%d bytes)\n", length);
+   info_ptr->scal_s_height = (png_charp)png_malloc_warn(png_ptr, length);
+   if (info_ptr->scal_s_height == NULL)
+   {
+      png_free (png_ptr, info_ptr->scal_s_width);
+      png_warning(png_ptr,
+       "Memory allocation failed while processing sCAL.");
+   }
+   png_memcpy(info_ptr->scal_s_height, sheight, (png_size_t)length);
+
+   info_ptr->valid |= PNG_INFO_sCAL;
+#ifdef PNG_FREE_ME_SUPPORTED
+   info_ptr->free_me |= PNG_FREE_SCAL;
+#endif
+}
+#endif
+#endif
+#endif
+
+#if defined(PNG_pHYs_SUPPORTED)
+void PNGAPI
+png_set_pHYs(png_structp png_ptr, png_infop info_ptr,
+   png_uint_32 res_x, png_uint_32 res_y, int unit_type)
+{
+   png_debug1(1, "in %s storage function\n", "pHYs");
+   if (png_ptr == NULL || info_ptr == NULL)
+      return;
+
+   info_ptr->x_pixels_per_unit = res_x;
+   info_ptr->y_pixels_per_unit = res_y;
+   info_ptr->phys_unit_type = (png_byte)unit_type;
+   info_ptr->valid |= PNG_INFO_pHYs;
+}
+#endif
+
+void PNGAPI
+png_set_PLTE(png_structp png_ptr, png_infop info_ptr,
+   png_colorp palette, int num_palette)
+{
+
+   png_debug1(1, "in %s storage function\n", "PLTE");
+   if (png_ptr == NULL || info_ptr == NULL)
+      return;
+
+   if (num_palette < 0 || num_palette > PNG_MAX_PALETTE_LENGTH)
+     {
+       if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
+         png_error(png_ptr, "Invalid palette length");
+       else
+       {
+         png_warning(png_ptr, "Invalid palette length");
+         return;
+       }
+     }
+
+   /*
+    * It may not actually be necessary to set png_ptr->palette here;
+    * we do it for backward compatibility with the way the png_handle_tRNS
+    * function used to do the allocation.
+    */
+#ifdef PNG_FREE_ME_SUPPORTED
+   png_free_data(png_ptr, info_ptr, PNG_FREE_PLTE, 0);
+#endif
+
+   /* Changed in libpng-1.2.1 to allocate PNG_MAX_PALETTE_LENGTH instead
+      of num_palette entries,
+      in case of an invalid PNG file that has too-large sample values. */
+   png_ptr->palette = (png_colorp)png_malloc(png_ptr,
+      PNG_MAX_PALETTE_LENGTH * png_sizeof(png_color));
+   png_memset(png_ptr->palette, 0, PNG_MAX_PALETTE_LENGTH *
+      png_sizeof(png_color));
+   png_memcpy(png_ptr->palette, palette, num_palette * png_sizeof (png_color));
+   info_ptr->palette = png_ptr->palette;
+   info_ptr->num_palette = png_ptr->num_palette = (png_uint_16)num_palette;
+
+#ifdef PNG_FREE_ME_SUPPORTED
+   info_ptr->free_me |= PNG_FREE_PLTE;
+#else
+   png_ptr->flags |= PNG_FLAG_FREE_PLTE;
+#endif
+
+   info_ptr->valid |= PNG_INFO_PLTE;
+}
+
+#if defined(PNG_sBIT_SUPPORTED)
+void PNGAPI
+png_set_sBIT(png_structp png_ptr, png_infop info_ptr,
+   png_color_8p sig_bit)
+{
+   png_debug1(1, "in %s storage function\n", "sBIT");
+   if (png_ptr == NULL || info_ptr == NULL)
+      return;
+
+   png_memcpy(&(info_ptr->sig_bit), sig_bit, png_sizeof (png_color_8));
+   info_ptr->valid |= PNG_INFO_sBIT;
+}
+#endif
+
+#if defined(PNG_sRGB_SUPPORTED)
+void PNGAPI
+png_set_sRGB(png_structp png_ptr, png_infop info_ptr, int intent)
+{
+   png_debug1(1, "in %s storage function\n", "sRGB");
+   if (png_ptr == NULL || info_ptr == NULL)
+      return;
+
+   info_ptr->srgb_intent = (png_byte)intent;
+   info_ptr->valid |= PNG_INFO_sRGB;
+}
+
+void PNGAPI
+png_set_sRGB_gAMA_and_cHRM(png_structp png_ptr, png_infop info_ptr,
+   int intent)
+{
+#if defined(PNG_gAMA_SUPPORTED)
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+   float file_gamma;
+#endif
+#ifdef PNG_FIXED_POINT_SUPPORTED
+   png_fixed_point int_file_gamma;
+#endif
+#endif
+#if defined(PNG_cHRM_SUPPORTED)
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+   float white_x, white_y, red_x, red_y, green_x, green_y, blue_x, blue_y;
+#endif
+#ifdef PNG_FIXED_POINT_SUPPORTED
+   png_fixed_point int_white_x, int_white_y, int_red_x, int_red_y, int_green_x,
+      int_green_y, int_blue_x, int_blue_y;
+#endif
+#endif
+   png_debug1(1, "in %s storage function\n", "sRGB_gAMA_and_cHRM");
+   if (png_ptr == NULL || info_ptr == NULL)
+      return;
+
+   png_set_sRGB(png_ptr, info_ptr, intent);
+
+#if defined(PNG_gAMA_SUPPORTED)
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+   file_gamma = (float).45455;
+   png_set_gAMA(png_ptr, info_ptr, file_gamma);
+#endif
+#ifdef PNG_FIXED_POINT_SUPPORTED
+   int_file_gamma = 45455L;
+   png_set_gAMA_fixed(png_ptr, info_ptr, int_file_gamma);
+#endif
+#endif
+
+#if defined(PNG_cHRM_SUPPORTED)
+#ifdef PNG_FIXED_POINT_SUPPORTED
+   int_white_x = 31270L;
+   int_white_y = 32900L;
+   int_red_x   = 64000L;
+   int_red_y   = 33000L;
+   int_green_x = 30000L;
+   int_green_y = 60000L;
+   int_blue_x  = 15000L;
+   int_blue_y  =  6000L;
+
+   png_set_cHRM_fixed(png_ptr, info_ptr,
+      int_white_x, int_white_y, int_red_x, int_red_y, int_green_x, int_green_y,
+      int_blue_x, int_blue_y);
+#endif
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+   white_x = (float).3127;
+   white_y = (float).3290;
+   red_x   = (float).64;
+   red_y   = (float).33;
+   green_x = (float).30;
+   green_y = (float).60;
+   blue_x  = (float).15;
+   blue_y  = (float).06;
+
+   png_set_cHRM(png_ptr, info_ptr,
+      white_x, white_y, red_x, red_y, green_x, green_y, blue_x, blue_y);
+#endif
+#endif
+}
+#endif
+
+
+#if defined(PNG_iCCP_SUPPORTED)
+void PNGAPI
+png_set_iCCP(png_structp png_ptr, png_infop info_ptr,
+             png_charp name, int compression_type,
+             png_charp profile, png_uint_32 proflen)
+{
+   png_charp new_iccp_name;
+   png_charp new_iccp_profile;
+
+   png_debug1(1, "in %s storage function\n", "iCCP");
+   if (png_ptr == NULL || info_ptr == NULL || name == NULL || profile == NULL)
+      return;
+
+   new_iccp_name = (png_charp)png_malloc_warn(png_ptr, png_strlen(name)+1);
+   if (new_iccp_name == NULL)
+   {
+      png_warning(png_ptr, "Insufficient memory to process iCCP chunk.");
+      return;
+   }
+   png_strncpy(new_iccp_name, name, png_strlen(name));
+   new_iccp_name[png_strlen(name)] = '\0';
+   new_iccp_profile = (png_charp)png_malloc_warn(png_ptr, proflen);
+   if (new_iccp_profile == NULL)
+   {
+      png_free (png_ptr, new_iccp_name);
+      png_warning(png_ptr, "Insufficient memory to process iCCP profile.");
+      return;
+   }
+   png_memcpy(new_iccp_profile, profile, (png_size_t)proflen);
+
+   png_free_data(png_ptr, info_ptr, PNG_FREE_ICCP, 0);
+
+   info_ptr->iccp_proflen = proflen;
+   info_ptr->iccp_name = new_iccp_name;
+   info_ptr->iccp_profile = new_iccp_profile;
+   /* Compression is always zero but is here so the API and info structure
+    * does not have to change if we introduce multiple compression types */
+   info_ptr->iccp_compression = (png_byte)compression_type;
+#ifdef PNG_FREE_ME_SUPPORTED
+   info_ptr->free_me |= PNG_FREE_ICCP;
+#endif
+   info_ptr->valid |= PNG_INFO_iCCP;
+}
+#endif
+
+#if defined(PNG_TEXT_SUPPORTED)
+void PNGAPI
+png_set_text(png_structp png_ptr, png_infop info_ptr, png_textp text_ptr,
+   int num_text)
+{
+   int ret;
+   ret=png_set_text_2(png_ptr, info_ptr, text_ptr, num_text);
+   if (ret)
+     png_error(png_ptr, "Insufficient memory to store text");
+}
+
+int /* PRIVATE */
+png_set_text_2(png_structp png_ptr, png_infop info_ptr, png_textp text_ptr,
+   int num_text)
+{
+   int i;
+
+   png_debug1(1, "in %s storage function\n", (png_ptr->chunk_name[0] == '\0' ?
+      "text" : (png_const_charp)png_ptr->chunk_name));
+
+   if (png_ptr == NULL || info_ptr == NULL || num_text == 0)
+      return(0);
+
+   /* Make sure we have enough space in the "text" array in info_struct
+    * to hold all of the incoming text_ptr objects.
+    */
+   if (info_ptr->num_text + num_text > info_ptr->max_text)
+   {
+      if (info_ptr->text != NULL)
+      {
+         png_textp old_text;
+         int old_max;
+
+         old_max = info_ptr->max_text;
+         info_ptr->max_text = info_ptr->num_text + num_text + 8;
+         old_text = info_ptr->text;
+         info_ptr->text = (png_textp)png_malloc_warn(png_ptr,
+            (png_uint_32)(info_ptr->max_text * png_sizeof (png_text)));
+         if (info_ptr->text == NULL)
+           {
+             png_free(png_ptr, old_text);
+             return(1);
+           }
+         png_memcpy(info_ptr->text, old_text, (png_size_t)(old_max *
+            png_sizeof(png_text)));
+         png_free(png_ptr, old_text);
+      }
+      else
+      {
+         info_ptr->max_text = num_text + 8;
+         info_ptr->num_text = 0;
+         info_ptr->text = (png_textp)png_malloc_warn(png_ptr,
+            (png_uint_32)(info_ptr->max_text * png_sizeof (png_text)));
+         if (info_ptr->text == NULL)
+           return(1);
+#ifdef PNG_FREE_ME_SUPPORTED
+         info_ptr->free_me |= PNG_FREE_TEXT;
+#endif
+      }
+      png_debug1(3, "allocated %d entries for info_ptr->text\n",
+         info_ptr->max_text);
+   }
+   for (i = 0; i < num_text; i++)
+   {
+      png_size_t text_length,key_len;
+      png_size_t lang_len,lang_key_len;
+      png_textp textp = &(info_ptr->text[info_ptr->num_text]);
+
+      if (text_ptr[i].key == NULL)
+          continue;
+
+      key_len = png_strlen(text_ptr[i].key);
+
+      if(text_ptr[i].compression <= 0)
+      {
+        lang_len = 0;
+        lang_key_len = 0;
+      }
+      else
+#ifdef PNG_iTXt_SUPPORTED
+      {
+        /* set iTXt data */
+        if (text_ptr[i].lang != NULL)
+          lang_len = png_strlen(text_ptr[i].lang);
+        else
+          lang_len = 0;
+        if (text_ptr[i].lang_key != NULL)
+          lang_key_len = png_strlen(text_ptr[i].lang_key);
+        else
+          lang_key_len = 0;
+      }
+#else
+      {
+        png_warning(png_ptr, "iTXt chunk not supported.");
+        continue;
+      }
+#endif
+
+      if (text_ptr[i].text == NULL || text_ptr[i].text[0] == '\0')
+      {
+         text_length = 0;
+#ifdef PNG_iTXt_SUPPORTED
+         if(text_ptr[i].compression > 0)
+            textp->compression = PNG_ITXT_COMPRESSION_NONE;
+         else
+#endif
+            textp->compression = PNG_TEXT_COMPRESSION_NONE;
+      }
+      else
+      {
+         text_length = png_strlen(text_ptr[i].text);
+         textp->compression = text_ptr[i].compression;
+      }
+
+      textp->key = (png_charp)png_malloc_warn(png_ptr,
+         (png_uint_32)(key_len + text_length + lang_len + lang_key_len + 4));
+      if (textp->key == NULL)
+        return(1);
+      png_debug2(2, "Allocated %lu bytes at %x in png_set_text\n",
+         (png_uint_32)(key_len + lang_len + lang_key_len + text_length + 4),
+         (int)textp->key);
+
+      png_memcpy(textp->key, text_ptr[i].key,
+         (png_size_t)(key_len));
+      *(textp->key+key_len) = '\0';
+#ifdef PNG_iTXt_SUPPORTED
+      if (text_ptr[i].compression > 0)
+      {
+         textp->lang=textp->key + key_len + 1;
+         png_memcpy(textp->lang, text_ptr[i].lang, lang_len);
+         *(textp->lang+lang_len) = '\0';
+         textp->lang_key=textp->lang + lang_len + 1;
+         png_memcpy(textp->lang_key, text_ptr[i].lang_key, lang_key_len);
+         *(textp->lang_key+lang_key_len) = '\0';
+         textp->text=textp->lang_key + lang_key_len + 1;
+      }
+      else
+#endif
+      {
+#ifdef PNG_iTXt_SUPPORTED
+         textp->lang=NULL;
+         textp->lang_key=NULL;
+#endif
+         textp->text=textp->key + key_len + 1;
+      }
+      if(text_length)
+         png_memcpy(textp->text, text_ptr[i].text,
+            (png_size_t)(text_length));
+      *(textp->text+text_length) = '\0';
+
+#ifdef PNG_iTXt_SUPPORTED
+      if(textp->compression > 0)
+      {
+         textp->text_length = 0;
+         textp->itxt_length = text_length;
+      }
+      else
+#endif
+      {
+         textp->text_length = text_length;
+#ifdef PNG_iTXt_SUPPORTED
+         textp->itxt_length = 0;
+#endif
+      }
+      info_ptr->num_text++;
+      png_debug1(3, "transferred text chunk %d\n", info_ptr->num_text);
+   }
+   return(0);
+}
+#endif
+
+#if defined(PNG_tIME_SUPPORTED)
+void PNGAPI
+png_set_tIME(png_structp png_ptr, png_infop info_ptr, png_timep mod_time)
+{
+   png_debug1(1, "in %s storage function\n", "tIME");
+   if (png_ptr == NULL || info_ptr == NULL ||
+       (png_ptr->mode & PNG_WROTE_tIME))
+      return;
+
+   png_memcpy(&(info_ptr->mod_time), mod_time, png_sizeof (png_time));
+   info_ptr->valid |= PNG_INFO_tIME;
+}
+#endif
+
+#if defined(PNG_tRNS_SUPPORTED)
+void PNGAPI
+png_set_tRNS(png_structp png_ptr, png_infop info_ptr,
+   png_bytep trans, int num_trans, png_color_16p trans_values)
+{
+   png_debug1(1, "in %s storage function\n", "tRNS");
+   if (png_ptr == NULL || info_ptr == NULL)
+      return;
+
+   if (trans != NULL)
+   {
+       /*
+        * It may not actually be necessary to set png_ptr->trans here;
+        * we do it for backward compatibility with the way the png_handle_tRNS
+        * function used to do the allocation.
+        */
+#ifdef PNG_FREE_ME_SUPPORTED
+       png_free_data(png_ptr, info_ptr, PNG_FREE_TRNS, 0);
+#endif
+       /* Changed from num_trans to PNG_MAX_PALETTE_LENGTH in version 1.2.1 */
+       png_ptr->trans = info_ptr->trans = (png_bytep)png_malloc(png_ptr,
+           (png_uint_32)PNG_MAX_PALETTE_LENGTH);
+       if (num_trans <= PNG_MAX_PALETTE_LENGTH)
+         png_memcpy(info_ptr->trans, trans, (png_size_t)num_trans);
+#ifdef PNG_FREE_ME_SUPPORTED
+       info_ptr->free_me |= PNG_FREE_TRNS;
+#else
+       png_ptr->flags |= PNG_FLAG_FREE_TRNS;
+#endif
+   }
+
+   if (trans_values != NULL)
+   {
+      png_memcpy(&(info_ptr->trans_values), trans_values,
+         png_sizeof(png_color_16));
+      if (num_trans == 0)
+        num_trans = 1;
+   }
+   info_ptr->num_trans = (png_uint_16)num_trans;
+   info_ptr->valid |= PNG_INFO_tRNS;
+}
+#endif
+
+#if defined(PNG_sPLT_SUPPORTED)
+void PNGAPI
+png_set_sPLT(png_structp png_ptr,
+             png_infop info_ptr, png_sPLT_tp entries, int nentries)
+{
+    png_sPLT_tp np;
+    int i;
+
+    if (png_ptr == NULL || info_ptr == NULL)
+       return;
+
+    np = (png_sPLT_tp)png_malloc_warn(png_ptr,
+        (info_ptr->splt_palettes_num + nentries) * png_sizeof(png_sPLT_t));
+    if (np == NULL)
+    {
+      png_warning(png_ptr, "No memory for sPLT palettes.");
+      return;
+    }
+
+    png_memcpy(np, info_ptr->splt_palettes,
+           info_ptr->splt_palettes_num * png_sizeof(png_sPLT_t));
+    png_free(png_ptr, info_ptr->splt_palettes);
+    info_ptr->splt_palettes=NULL;
+
+    for (i = 0; i < nentries; i++)
+    {
+        png_sPLT_tp to = np + info_ptr->splt_palettes_num + i;
+        png_sPLT_tp from = entries + i;
+
+        to->name = (png_charp)png_malloc_warn(png_ptr,
+          png_strlen(from->name) + 1);
+        if (to->name == NULL)
+        {
+           png_warning(png_ptr,
+             "Out of memory while processing sPLT chunk");
+        }
+        /* TODO: use png_malloc_warn */
+        png_strncpy(to->name, from->name, png_strlen(from->name));
+        to->name[png_strlen(from->name)] = '\0';
+        to->entries = (png_sPLT_entryp)png_malloc_warn(png_ptr,
+            from->nentries * png_sizeof(png_sPLT_entry));
+        /* TODO: use png_malloc_warn */
+        png_memcpy(to->entries, from->entries,
+            from->nentries * png_sizeof(png_sPLT_entry));
+        if (to->entries == NULL)
+        {
+           png_warning(png_ptr,
+             "Out of memory while processing sPLT chunk");
+           png_free(png_ptr,to->name);
+           to->name = NULL;
+        }
+        to->nentries = from->nentries;
+        to->depth = from->depth;
+    }
+
+    info_ptr->splt_palettes = np;
+    info_ptr->splt_palettes_num += nentries;
+    info_ptr->valid |= PNG_INFO_sPLT;
+#ifdef PNG_FREE_ME_SUPPORTED
+    info_ptr->free_me |= PNG_FREE_SPLT;
+#endif
+}
+#endif /* PNG_sPLT_SUPPORTED */
+
+#if defined(PNG_UNKNOWN_CHUNKS_SUPPORTED)
+void PNGAPI
+png_set_unknown_chunks(png_structp png_ptr,
+   png_infop info_ptr, png_unknown_chunkp unknowns, int num_unknowns)
+{
+    png_unknown_chunkp np;
+    int i;
+
+    if (png_ptr == NULL || info_ptr == NULL || num_unknowns == 0)
+        return;
+
+    np = (png_unknown_chunkp)png_malloc_warn(png_ptr,
+        (info_ptr->unknown_chunks_num + num_unknowns) *
+        png_sizeof(png_unknown_chunk));
+    if (np == NULL)
+    {
+       png_warning(png_ptr,
+          "Out of memory while processing unknown chunk.");
+       return;
+    }
+
+    png_memcpy(np, info_ptr->unknown_chunks,
+           info_ptr->unknown_chunks_num * png_sizeof(png_unknown_chunk));
+    png_free(png_ptr, info_ptr->unknown_chunks);
+    info_ptr->unknown_chunks=NULL;
+
+    for (i = 0; i < num_unknowns; i++)
+    {
+        png_unknown_chunkp to = np + info_ptr->unknown_chunks_num + i;
+        png_unknown_chunkp from = unknowns + i;
+
+        png_strncpy((png_charp)to->name, (png_charp)from->name, 4);
+        to->name[4] = '\0';
+        to->data = (png_bytep)png_malloc_warn(png_ptr, from->size);
+        if (to->data == NULL)
+        {
+           png_warning(png_ptr,
+              "Out of memory while processing unknown chunk.");
+        }
+        else
+        {
+           png_memcpy(to->data, from->data, from->size);
+           to->size = from->size;
+
+           /* note our location in the read or write sequence */
+           to->location = (png_byte)(png_ptr->mode & 0xff);
+        }
+    }
+
+    info_ptr->unknown_chunks = np;
+    info_ptr->unknown_chunks_num += num_unknowns;
+#ifdef PNG_FREE_ME_SUPPORTED
+    info_ptr->free_me |= PNG_FREE_UNKN;
+#endif
+}
+void PNGAPI
+png_set_unknown_chunk_location(png_structp png_ptr, png_infop info_ptr,
+   int chunk, int location)
+{
+   if(png_ptr != NULL && info_ptr != NULL && chunk >= 0 && chunk <
+         (int)info_ptr->unknown_chunks_num)
+      info_ptr->unknown_chunks[chunk].location = (png_byte)location;
+}
+#endif
+
+#if defined(PNG_1_0_X) || defined(PNG_1_2_X)
+#if defined(PNG_READ_EMPTY_PLTE_SUPPORTED) || \
+    defined(PNG_WRITE_EMPTY_PLTE_SUPPORTED)
+void PNGAPI
+png_permit_empty_plte (png_structp png_ptr, int empty_plte_permitted)
+{
+   /* This function is deprecated in favor of png_permit_mng_features()
+      and will be removed from libpng-1.3.0 */
+   png_debug(1, "in png_permit_empty_plte, DEPRECATED.\n");
+   if (png_ptr == NULL)
+      return;
+   png_ptr->mng_features_permitted = (png_byte)
+     ((png_ptr->mng_features_permitted & (~PNG_FLAG_MNG_EMPTY_PLTE)) |
+     ((empty_plte_permitted & PNG_FLAG_MNG_EMPTY_PLTE)));
+}
+#endif
+#endif
+
+#if defined(PNG_MNG_FEATURES_SUPPORTED)
+png_uint_32 PNGAPI
+png_permit_mng_features (png_structp png_ptr, png_uint_32 mng_features)
+{
+   png_debug(1, "in png_permit_mng_features\n");
+   if (png_ptr == NULL)
+      return (png_uint_32)0;
+   png_ptr->mng_features_permitted =
+     (png_byte)(mng_features & PNG_ALL_MNG_FEATURES);
+   return (png_uint_32)png_ptr->mng_features_permitted;
+}
+#endif
+
+#if defined(PNG_UNKNOWN_CHUNKS_SUPPORTED)
+void PNGAPI
+png_set_keep_unknown_chunks(png_structp png_ptr, int keep, png_bytep
+   chunk_list, int num_chunks)
+{
+    png_bytep new_list, p;
+    int i, old_num_chunks;
+    if (png_ptr == NULL)
+       return;
+    if (num_chunks == 0)
+    {
+      if(keep == PNG_HANDLE_CHUNK_ALWAYS || keep == PNG_HANDLE_CHUNK_IF_SAFE)
+        png_ptr->flags |= PNG_FLAG_KEEP_UNKNOWN_CHUNKS;
+      else
+        png_ptr->flags &= ~PNG_FLAG_KEEP_UNKNOWN_CHUNKS;
+
+      if(keep == PNG_HANDLE_CHUNK_ALWAYS)
+        png_ptr->flags |= PNG_FLAG_KEEP_UNSAFE_CHUNKS;
+      else
+        png_ptr->flags &= ~PNG_FLAG_KEEP_UNSAFE_CHUNKS;
+      return;
+    }
+    if (chunk_list == NULL)
+      return;
+    old_num_chunks=png_ptr->num_chunk_list;
+    new_list=(png_bytep)png_malloc(png_ptr,
+       (png_uint_32)(5*(num_chunks+old_num_chunks)));
+    if(png_ptr->chunk_list != NULL)
+    {
+       png_memcpy(new_list, png_ptr->chunk_list,
+          (png_size_t)(5*old_num_chunks));
+       png_free(png_ptr, png_ptr->chunk_list);
+       png_ptr->chunk_list=NULL;
+    }
+    png_memcpy(new_list+5*old_num_chunks, chunk_list,
+       (png_size_t)(5*num_chunks));
+    for (p=new_list+5*old_num_chunks+4, i=0; i<num_chunks; i++, p+=5)
+       *p=(png_byte)keep;
+    png_ptr->num_chunk_list=old_num_chunks+num_chunks;
+    png_ptr->chunk_list=new_list;
+#ifdef PNG_FREE_ME_SUPPORTED
+    png_ptr->free_me |= PNG_FREE_LIST;
+#endif
+}
+#endif
+
+#if defined(PNG_READ_USER_CHUNKS_SUPPORTED)
+void PNGAPI
+png_set_read_user_chunk_fn(png_structp png_ptr, png_voidp user_chunk_ptr,
+   png_user_chunk_ptr read_user_chunk_fn)
+{
+   png_debug(1, "in png_set_read_user_chunk_fn\n");
+   if (png_ptr == NULL)
+      return;
+   png_ptr->read_user_chunk_fn = read_user_chunk_fn;
+   png_ptr->user_chunk_ptr = user_chunk_ptr;
+}
+#endif
+
+#if defined(PNG_INFO_IMAGE_SUPPORTED)
+void PNGAPI
+png_set_rows(png_structp png_ptr, png_infop info_ptr, png_bytepp row_pointers)
+{
+   png_debug1(1, "in %s storage function\n", "rows");
+
+   if (png_ptr == NULL || info_ptr == NULL)
+      return;
+
+   if(info_ptr->row_pointers && (info_ptr->row_pointers != row_pointers))
+      png_free_data(png_ptr, info_ptr, PNG_FREE_ROWS, 0);
+   info_ptr->row_pointers = row_pointers;
+   if(row_pointers)
+      info_ptr->valid |= PNG_INFO_IDAT;
+}
+#endif
+
+#ifdef PNG_WRITE_SUPPORTED
+void PNGAPI
+png_set_compression_buffer_size(png_structp png_ptr, png_uint_32 size)
+{
+    if (png_ptr == NULL)
+       return;
+    if(png_ptr->zbuf)
+       png_free(png_ptr, png_ptr->zbuf);
+    png_ptr->zbuf_size = (png_size_t)size;
+    png_ptr->zbuf = (png_bytep)png_malloc(png_ptr, size);
+    png_ptr->zstream.next_out = png_ptr->zbuf;
+    png_ptr->zstream.avail_out = (uInt)png_ptr->zbuf_size;
+}
+#endif
+
+void PNGAPI
+png_set_invalid(png_structp png_ptr, png_infop info_ptr, int mask)
+{
+   if (png_ptr && info_ptr)
+      info_ptr->valid &= ~mask;
+}
+
+
+#ifndef PNG_1_0_X
+#ifdef PNG_ASSEMBLER_CODE_SUPPORTED
+/* function was added to libpng 1.2.0 and should always exist by default */
+void PNGAPI
+png_set_asm_flags (png_structp png_ptr, png_uint_32 asm_flags)
+{
+/* Obsolete as of libpng-1.2.20 and will be removed from libpng-1.4.0 */
+    if (png_ptr != NULL)
+    png_ptr->asm_flags = 0;
+}
+
+/* this function was added to libpng 1.2.0 */
+void PNGAPI
+png_set_mmx_thresholds (png_structp png_ptr,
+                        png_byte mmx_bitdepth_threshold,
+                        png_uint_32 mmx_rowbytes_threshold)
+{
+/* Obsolete as of libpng-1.2.20 and will be removed from libpng-1.4.0 */
+    if (png_ptr == NULL)
+       return;
+}
+#endif /* ?PNG_ASSEMBLER_CODE_SUPPORTED */
+
+#ifdef PNG_SET_USER_LIMITS_SUPPORTED
+/* this function was added to libpng 1.2.6 */
+void PNGAPI
+png_set_user_limits (png_structp png_ptr, png_uint_32 user_width_max,
+    png_uint_32 user_height_max)
+{
+    /* Images with dimensions larger than these limits will be
+     * rejected by png_set_IHDR().  To accept any PNG datastream
+     * regardless of dimensions, set both limits to 0x7ffffffL.
+     */
+    if(png_ptr == NULL) return;
+    png_ptr->user_width_max = user_width_max;
+    png_ptr->user_height_max = user_height_max;
+}
+#endif /* ?PNG_SET_USER_LIMITS_SUPPORTED */
+
+#endif /* ?PNG_1_0_X */
+#endif /* PNG_READ_SUPPORTED || PNG_WRITE_SUPPORTED */
diff --git a/uppsrc/plugin/png/lib/pngtest.c b/uppsrc/plugin/png/lib/pngtest.c
new file mode 100644
index 000000000..6ab5e046b
--- /dev/null
+++ b/uppsrc/plugin/png/lib/pngtest.c
@@ -0,0 +1,1553 @@
+
+/* pngtest.c - a simple test program to test libpng
+ *
+ * Last changed in libpng 1.2.22 - [October 13, 2007]
+ * For conditions of distribution and use, see copyright notice in png.h
+ * Copyright (c) 1998-2004 Glenn Randers-Pehrson
+ * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
+ * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
+ *
+ * This program reads in a PNG image, writes it out again, and then
+ * compares the two files.  If the files are identical, this shows that
+ * the basic chunk handling, filtering, and (de)compression code is working
+ * properly.  It does not currently test all of the transforms, although
+ * it probably should.
+ *
+ * The program will report "FAIL" in certain legitimate cases:
+ * 1) when the compression level or filter selection method is changed.
+ * 2) when the maximum IDAT size (PNG_ZBUF_SIZE in pngconf.h) is not 8192.
+ * 3) unknown unsafe-to-copy ancillary chunks or unknown critical chunks
+ *    exist in the input file.
+ * 4) others not listed here...
+ * In these cases, it is best to check with another tool such as "pngcheck"
+ * to see what the differences between the two files are.
+ *
+ * If a filename is given on the command-line, then this file is used
+ * for the input, rather than the default "pngtest.png".  This allows
+ * testing a wide variety of files easily.  You can also test a number
+ * of files at once by typing "pngtest -m file1.png file2.png ..."
+ */
+
+#include "png.h"
+
+#if defined(_WIN32_WCE)
+#  if _WIN32_WCE < 211
+     __error__ (f|w)printf functions are not supported on old WindowsCE.;
+#  endif
+#  include <windows.h>
+#  include <stdlib.h>
+#  define READFILE(file, data, length, check) \
+     if (ReadFile(file, data, length, &check,NULL)) check = 0
+#  define WRITEFILE(file, data, length, check)) \
+     if (WriteFile(file, data, length, &check, NULL)) check = 0
+#  define FCLOSE(file) CloseHandle(file)
+#else
+#  include <stdio.h>
+#  include <stdlib.h>
+#  define READFILE(file, data, length, check) \
+     check=(png_size_t)fread(data,(png_size_t)1,length,file)
+#  define WRITEFILE(file, data, length, check) \
+     check=(png_size_t)fwrite(data,(png_size_t)1, length, file)
+#  define FCLOSE(file) fclose(file)
+#endif
+
+#if defined(PNG_NO_STDIO)
+#  if defined(_WIN32_WCE)
+     typedef HANDLE                png_FILE_p;
+#  else
+     typedef FILE                * png_FILE_p;
+#  endif
+#endif
+
+/* Makes pngtest verbose so we can find problems (needs to be before png.h) */
+#ifndef PNG_DEBUG
+#  define PNG_DEBUG 0
+#endif
+
+#if !PNG_DEBUG
+#  define SINGLE_ROWBUF_ALLOC  /* makes buffer overruns easier to nail */
+#endif
+
+/* Turn on CPU timing
+#define PNGTEST_TIMING
+*/
+
+#ifdef PNG_NO_FLOATING_POINT_SUPPORTED
+#undef PNGTEST_TIMING
+#endif
+
+#ifdef PNGTEST_TIMING
+static float t_start, t_stop, t_decode, t_encode, t_misc;
+#include <time.h>
+#endif
+
+#if defined(PNG_TIME_RFC1123_SUPPORTED)
+static int tIME_chunk_present=0;
+static char tIME_string[30] = "no tIME chunk present in file";
+#endif
+
+static int verbose = 0;
+
+int test_one_file PNGARG((PNG_CONST char *inname, PNG_CONST char *outname));
+
+#ifdef __TURBOC__
+#include <mem.h>
+#endif
+
+/* defined so I can write to a file on gui/windowing platforms */
+/*  #define STDERR stderr  */
+#define STDERR stdout   /* for DOS */
+
+/* example of using row callbacks to make a simple progress meter */
+static int status_pass=1;
+static int status_dots_requested=0;
+static int status_dots=1;
+
+/* In case a system header (e.g., on AIX) defined jmpbuf */
+#ifdef jmpbuf
+#  undef jmpbuf
+#endif
+
+/* Define png_jmpbuf() in case we are using a pre-1.0.6 version of libpng */
+#ifndef png_jmpbuf
+#  define png_jmpbuf(png_ptr) png_ptr->jmpbuf
+#endif
+
+void
+#ifdef PNG_1_0_X
+PNGAPI
+#endif
+read_row_callback(png_structp png_ptr, png_uint_32 row_number, int pass);
+void
+#ifdef PNG_1_0_X
+PNGAPI
+#endif
+read_row_callback(png_structp png_ptr, png_uint_32 row_number, int pass)
+{
+    if(png_ptr == NULL || row_number > PNG_UINT_31_MAX) return;
+    if(status_pass != pass)
+    {
+       fprintf(stdout,"\n Pass %d: ",pass);
+       status_pass = pass;
+       status_dots = 31;
+    }
+    status_dots--;
+    if(status_dots == 0)
+    {
+       fprintf(stdout, "\n         ");
+       status_dots=30;
+    }
+    fprintf(stdout, "r");
+}
+
+void
+#ifdef PNG_1_0_X
+PNGAPI
+#endif
+write_row_callback(png_structp png_ptr, png_uint_32 row_number, int pass);
+void
+#ifdef PNG_1_0_X
+PNGAPI
+#endif
+write_row_callback(png_structp png_ptr, png_uint_32 row_number, int pass)
+{
+    if(png_ptr == NULL || row_number > PNG_UINT_31_MAX || pass > 7) return;
+    fprintf(stdout, "w");
+}
+
+
+#if defined(PNG_READ_USER_TRANSFORM_SUPPORTED)
+/* Example of using user transform callback (we don't transform anything,
+   but merely examine the row filters.  We set this to 256 rather than
+   5 in case illegal filter values are present.) */
+static png_uint_32 filters_used[256];
+void
+#ifdef PNG_1_0_X
+PNGAPI
+#endif
+count_filters(png_structp png_ptr, png_row_infop row_info, png_bytep data);
+void
+#ifdef PNG_1_0_X
+PNGAPI
+#endif
+count_filters(png_structp png_ptr, png_row_infop row_info, png_bytep data)
+{
+    if(png_ptr != NULL && row_info != NULL)
+      ++filters_used[*(data-1)];
+}
+#endif
+
+#if defined(PNG_WRITE_USER_TRANSFORM_SUPPORTED)
+/* example of using user transform callback (we don't transform anything,
+   but merely count the zero samples) */
+
+static png_uint_32 zero_samples;
+
+void
+#ifdef PNG_1_0_X
+PNGAPI
+#endif
+count_zero_samples(png_structp png_ptr, png_row_infop row_info, png_bytep data);
+void
+#ifdef PNG_1_0_X
+PNGAPI
+#endif
+count_zero_samples(png_structp png_ptr, png_row_infop row_info, png_bytep data)
+{
+   png_bytep dp = data;
+   if(png_ptr == NULL)return;
+
+   /* contents of row_info:
+    *  png_uint_32 width      width of row
+    *  png_uint_32 rowbytes   number of bytes in row
+    *  png_byte color_type    color type of pixels
+    *  png_byte bit_depth     bit depth of samples
+    *  png_byte channels      number of channels (1-4)
+    *  png_byte pixel_depth   bits per pixel (depth*channels)
+    */
+
+
+    /* counts the number of zero samples (or zero pixels if color_type is 3 */
+
+    if(row_info->color_type == 0 || row_info->color_type == 3)
+    {
+       int pos=0;
+       png_uint_32 n, nstop;
+       for (n=0, nstop=row_info->width; n<nstop; n++)
+       {
+          if(row_info->bit_depth == 1)
+          {
+             if(((*dp << pos++ ) & 0x80) == 0) zero_samples++;
+             if(pos == 8)
+             {
+                pos = 0;
+                dp++;
+             }
+          }
+          if(row_info->bit_depth == 2)
+          {
+             if(((*dp << (pos+=2)) & 0xc0) == 0) zero_samples++;
+             if(pos == 8)
+             {
+                pos = 0;
+                dp++;
+             }
+          }
+          if(row_info->bit_depth == 4)
+          {
+             if(((*dp << (pos+=4)) & 0xf0) == 0) zero_samples++;
+             if(pos == 8)
+             {
+                pos = 0;
+                dp++;
+             }
+          }
+          if(row_info->bit_depth == 8)
+             if(*dp++ == 0) zero_samples++;
+          if(row_info->bit_depth == 16)
+          {
+             if((*dp | *(dp+1)) == 0) zero_samples++;
+             dp+=2;
+          }
+       }
+    }
+    else /* other color types */
+    {
+       png_uint_32 n, nstop;
+       int channel;
+       int color_channels = row_info->channels;
+       if(row_info->color_type > 3)color_channels--;
+
+       for (n=0, nstop=row_info->width; n<nstop; n++)
+       {
+          for (channel = 0; channel < color_channels; channel++)
+          {
+             if(row_info->bit_depth == 8)
+                if(*dp++ == 0) zero_samples++;
+             if(row_info->bit_depth == 16)
+             {
+                if((*dp | *(dp+1)) == 0) zero_samples++;
+                dp+=2;
+             }
+          }
+          if(row_info->color_type > 3)
+          {
+             dp++;
+             if(row_info->bit_depth == 16)dp++;
+          }
+       }
+    }
+}
+#endif /* PNG_WRITE_USER_TRANSFORM_SUPPORTED */
+
+static int wrote_question = 0;
+
+#if defined(PNG_NO_STDIO)
+/* START of code to validate stdio-free compilation */
+/* These copies of the default read/write functions come from pngrio.c and */
+/* pngwio.c.  They allow "don't include stdio" testing of the library. */
+/* This is the function that does the actual reading of data.  If you are
+   not reading from a standard C stream, you should create a replacement
+   read_data function and use it at run time with png_set_read_fn(), rather
+   than changing the library. */
+
+#ifndef USE_FAR_KEYWORD
+static void
+pngtest_read_data(png_structp png_ptr, png_bytep data, png_size_t length)
+{
+   png_size_t check;
+
+   /* fread() returns 0 on error, so it is OK to store this in a png_size_t
+    * instead of an int, which is what fread() actually returns.
+    */
+   READFILE((png_FILE_p)png_ptr->io_ptr, data, length, check);
+
+   if (check != length)
+   {
+      png_error(png_ptr, "Read Error!");
+   }
+}
+#else
+/* this is the model-independent version. Since the standard I/O library
+   can't handle far buffers in the medium and small models, we have to copy
+   the data.
+*/
+
+#define NEAR_BUF_SIZE 1024
+#define MIN(a,b) (a <= b ? a : b)
+
+static void
+pngtest_read_data(png_structp png_ptr, png_bytep data, png_size_t length)
+{
+   int check;
+   png_byte *n_data;
+   png_FILE_p io_ptr;
+
+   /* Check if data really is near. If so, use usual code. */
+   n_data = (png_byte *)CVT_PTR_NOCHECK(data);
+   io_ptr = (png_FILE_p)CVT_PTR(png_ptr->io_ptr);
+   if ((png_bytep)n_data == data)
+   {
+      READFILE(io_ptr, n_data, length, check);
+   }
+   else
+   {
+      png_byte buf[NEAR_BUF_SIZE];
+      png_size_t read, remaining, err;
+      check = 0;
+      remaining = length;
+      do
+      {
+         read = MIN(NEAR_BUF_SIZE, remaining);
+         READFILE(io_ptr, buf, 1, err);
+         png_memcpy(data, buf, read); /* copy far buffer to near buffer */
+         if(err != read)
+            break;
+         else
+            check += err;
+         data += read;
+         remaining -= read;
+      }
+      while (remaining != 0);
+   }
+   if (check != length)
+   {
+      png_error(png_ptr, "read Error");
+   }
+}
+#endif /* USE_FAR_KEYWORD */
+
+#if defined(PNG_WRITE_FLUSH_SUPPORTED)
+static void
+pngtest_flush(png_structp png_ptr)
+{
+#if !defined(_WIN32_WCE)
+   png_FILE_p io_ptr;
+   io_ptr = (png_FILE_p)CVT_PTR((png_ptr->io_ptr));
+   if (io_ptr != NULL)
+      fflush(io_ptr);
+#endif
+}
+#endif
+
+/* This is the function that does the actual writing of data.  If you are
+   not writing to a standard C stream, you should create a replacement
+   write_data function and use it at run time with png_set_write_fn(), rather
+   than changing the library. */
+#ifndef USE_FAR_KEYWORD
+static void
+pngtest_write_data(png_structp png_ptr, png_bytep data, png_size_t length)
+{
+   png_uint_32 check;
+
+   WRITEFILE((png_FILE_p)png_ptr->io_ptr,  data, length, check);
+   if (check != length)
+   {
+      png_error(png_ptr, "Write Error");
+   }
+}
+#else
+/* this is the model-independent version. Since the standard I/O library
+   can't handle far buffers in the medium and small models, we have to copy
+   the data.
+*/
+
+#define NEAR_BUF_SIZE 1024
+#define MIN(a,b) (a <= b ? a : b)
+
+static void
+pngtest_write_data(png_structp png_ptr, png_bytep data, png_size_t length)
+{
+   png_uint_32 check;
+   png_byte *near_data;  /* Needs to be "png_byte *" instead of "png_bytep" */
+   png_FILE_p io_ptr;
+
+   /* Check if data really is near. If so, use usual code. */
+   near_data = (png_byte *)CVT_PTR_NOCHECK(data);
+   io_ptr = (png_FILE_p)CVT_PTR(png_ptr->io_ptr);
+   if ((png_bytep)near_data == data)
+   {
+      WRITEFILE(io_ptr, near_data, length, check);
+   }
+   else
+   {
+      png_byte buf[NEAR_BUF_SIZE];
+      png_size_t written, remaining, err;
+      check = 0;
+      remaining = length;
+      do
+      {
+         written = MIN(NEAR_BUF_SIZE, remaining);
+         png_memcpy(buf, data, written); /* copy far buffer to near buffer */
+         WRITEFILE(io_ptr, buf, written, err);
+         if (err != written)
+            break;
+         else
+            check += err;
+         data += written;
+         remaining -= written;
+      }
+      while (remaining != 0);
+   }
+   if (check != length)
+   {
+      png_error(png_ptr, "Write Error");
+   }
+}
+#endif /* USE_FAR_KEYWORD */
+#endif /* PNG_NO_STDIO */
+/* END of code to validate stdio-free compilation */
+
+/* This function is called when there is a warning, but the library thinks
+ * it can continue anyway.  Replacement functions don't have to do anything
+ * here if you don't want to.  In the default configuration, png_ptr is
+ * not used, but it is passed in case it may be useful.
+ */
+static void
+pngtest_warning(png_structp png_ptr, png_const_charp message)
+{
+   PNG_CONST char *name = "UNKNOWN (ERROR!)";
+   if (png_ptr != NULL && png_ptr->error_ptr != NULL)
+      name = png_ptr->error_ptr;
+   fprintf(STDERR, "%s: libpng warning: %s\n", name, message);
+}
+
+/* This is the default error handling function.  Note that replacements for
+ * this function MUST NOT RETURN, or the program will likely crash.  This
+ * function is used by default, or if the program supplies NULL for the
+ * error function pointer in png_set_error_fn().
+ */
+static void
+pngtest_error(png_structp png_ptr, png_const_charp message)
+{
+   pngtest_warning(png_ptr, message);
+   /* We can return because png_error calls the default handler, which is
+    * actually OK in this case. */
+}
+
+/* START of code to validate memory allocation and deallocation */
+#if defined(PNG_USER_MEM_SUPPORTED) && PNG_DEBUG
+
+/* Allocate memory.  For reasonable files, size should never exceed
+   64K.  However, zlib may allocate more then 64K if you don't tell
+   it not to.  See zconf.h and png.h for more information.  zlib does
+   need to allocate exactly 64K, so whatever you call here must
+   have the ability to do that.
+
+   This piece of code can be compiled to validate max 64K allocations
+   by setting MAXSEG_64K in zlib zconf.h *or* PNG_MAX_MALLOC_64K. */
+typedef struct memory_information
+{
+   png_uint_32               size;
+   png_voidp                 pointer;
+   struct memory_information FAR *next;
+} memory_information;
+typedef memory_information FAR *memory_infop;
+
+static memory_infop pinformation = NULL;
+static int current_allocation = 0;
+static int maximum_allocation = 0;
+static int total_allocation = 0;
+static int num_allocations = 0;
+
+png_voidp png_debug_malloc PNGARG((png_structp png_ptr, png_uint_32 size));
+void png_debug_free PNGARG((png_structp png_ptr, png_voidp ptr));
+
+png_voidp
+png_debug_malloc(png_structp png_ptr, png_uint_32 size)
+{
+
+   /* png_malloc has already tested for NULL; png_create_struct calls
+      png_debug_malloc directly, with png_ptr == NULL which is OK */
+
+   if (size == 0)
+      return (NULL);
+
+   /* This calls the library allocator twice, once to get the requested
+      buffer and once to get a new free list entry. */
+   {
+      /* Disable malloc_fn and free_fn */
+      memory_infop pinfo;
+      png_set_mem_fn(png_ptr, NULL, NULL, NULL);
+      pinfo = (memory_infop)png_malloc(png_ptr,
+         (png_uint_32)png_sizeof (*pinfo));
+      pinfo->size = size;
+      current_allocation += size;
+      total_allocation += size;
+      num_allocations ++;
+      if (current_allocation > maximum_allocation)
+         maximum_allocation = current_allocation;
+      pinfo->pointer = (png_voidp)png_malloc(png_ptr, size);
+      /* Restore malloc_fn and free_fn */
+      png_set_mem_fn(png_ptr, png_voidp_NULL, (png_malloc_ptr)png_debug_malloc,
+         (png_free_ptr)png_debug_free);
+      if (size != 0 && pinfo->pointer == NULL)
+      {
+         current_allocation -= size;
+         total_allocation -= size;
+         png_error(png_ptr,
+           "out of memory in pngtest->png_debug_malloc.");
+      }
+      pinfo->next = pinformation;
+      pinformation = pinfo;
+      /* Make sure the caller isn't assuming zeroed memory. */
+      png_memset(pinfo->pointer, 0xdd, pinfo->size);
+      if(verbose)
+         printf("png_malloc %lu bytes at %x\n",(unsigned long)size,
+          pinfo->pointer);
+      return (png_voidp)(pinfo->pointer);
+   }
+}
+
+/* Free a pointer.  It is removed from the list at the same time. */
+void
+png_debug_free(png_structp png_ptr, png_voidp ptr)
+{
+   if (png_ptr == NULL)
+      fprintf(STDERR, "NULL pointer to png_debug_free.\n");
+   if (ptr == 0)
+   {
+#if 0 /* This happens all the time. */
+      fprintf(STDERR, "WARNING: freeing NULL pointer\n");
+#endif
+      return;
+   }
+
+   /* Unlink the element from the list. */
+   {
+      memory_infop FAR *ppinfo = &pinformation;
+      for (;;)
+      {
+         memory_infop pinfo = *ppinfo;
+         if (pinfo->pointer == ptr)
+         {
+            *ppinfo = pinfo->next;
+            current_allocation -= pinfo->size;
+            if (current_allocation < 0)
+               fprintf(STDERR, "Duplicate free of memory\n");
+            /* We must free the list element too, but first kill
+               the memory that is to be freed. */
+            png_memset(ptr, 0x55, pinfo->size);
+            png_free_default(png_ptr, pinfo);
+            pinfo=NULL;
+            break;
+         }
+         if (pinfo->next == NULL)
+         {
+            fprintf(STDERR, "Pointer %x not found\n", (unsigned int)ptr);
+            break;
+         }
+         ppinfo = &pinfo->next;
+      }
+   }
+
+   /* Finally free the data. */
+   if(verbose)
+      printf("Freeing %x\n",ptr);
+   png_free_default(png_ptr, ptr);
+   ptr=NULL;
+}
+#endif /* PNG_USER_MEM_SUPPORTED && PNG_DEBUG */
+/* END of code to test memory allocation/deallocation */
+
+/* Test one file */
+int
+test_one_file(PNG_CONST char *inname, PNG_CONST char *outname)
+{
+   static png_FILE_p fpin;
+   static png_FILE_p fpout;  /* "static" prevents setjmp corruption */
+   png_structp read_ptr;
+   png_infop read_info_ptr, end_info_ptr;
+#ifdef PNG_WRITE_SUPPORTED
+   png_structp write_ptr;
+   png_infop write_info_ptr;
+   png_infop write_end_info_ptr;
+#else
+   png_structp write_ptr = NULL;
+   png_infop write_info_ptr = NULL;
+   png_infop write_end_info_ptr = NULL;
+#endif
+   png_bytep row_buf;
+   png_uint_32 y;
+   png_uint_32 width, height;
+   int num_pass, pass;
+   int bit_depth, color_type;
+#ifdef PNG_SETJMP_SUPPORTED
+#ifdef USE_FAR_KEYWORD
+   jmp_buf jmpbuf;
+#endif
+#endif
+
+#if defined(_WIN32_WCE)
+   TCHAR path[MAX_PATH];
+#endif
+   char inbuf[256], outbuf[256];
+
+   row_buf = NULL;
+
+#if defined(_WIN32_WCE)
+   MultiByteToWideChar(CP_ACP, 0, inname, -1, path, MAX_PATH);
+   if ((fpin = CreateFile(path, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, NULL)) == INVALID_HANDLE_VALUE)
+#else
+   if ((fpin = fopen(inname, "rb")) == NULL)
+#endif
+   {
+      fprintf(STDERR, "Could not find input file %s\n", inname);
+      return (1);
+   }
+
+#if defined(_WIN32_WCE)
+   MultiByteToWideChar(CP_ACP, 0, outname, -1, path, MAX_PATH);
+   if ((fpout = CreateFile(path, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL)) == INVALID_HANDLE_VALUE)
+#else
+   if ((fpout = fopen(outname, "wb")) == NULL)
+#endif
+   {
+      fprintf(STDERR, "Could not open output file %s\n", outname);
+      FCLOSE(fpin);
+      return (1);
+   }
+
+   png_debug(0, "Allocating read and write structures\n");
+#if defined(PNG_USER_MEM_SUPPORTED) && PNG_DEBUG
+   read_ptr = png_create_read_struct_2(PNG_LIBPNG_VER_STRING, png_voidp_NULL,
+      png_error_ptr_NULL, png_error_ptr_NULL, png_voidp_NULL,
+      (png_malloc_ptr)png_debug_malloc, (png_free_ptr)png_debug_free);
+#else
+   read_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, png_voidp_NULL,
+      png_error_ptr_NULL, png_error_ptr_NULL);
+#endif
+   png_set_error_fn(read_ptr, (png_voidp)inname, pngtest_error,
+       pngtest_warning);
+#ifdef PNG_WRITE_SUPPORTED
+#if defined(PNG_USER_MEM_SUPPORTED) && PNG_DEBUG
+   write_ptr = png_create_write_struct_2(PNG_LIBPNG_VER_STRING, png_voidp_NULL,
+      png_error_ptr_NULL, png_error_ptr_NULL, png_voidp_NULL,
+      (png_malloc_ptr)png_debug_malloc, (png_free_ptr)png_debug_free);
+#else
+   write_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, png_voidp_NULL,
+      png_error_ptr_NULL, png_error_ptr_NULL);
+#endif
+   png_set_error_fn(write_ptr, (png_voidp)inname, pngtest_error,
+       pngtest_warning);
+#endif
+   png_debug(0, "Allocating read_info, write_info and end_info structures\n");
+   read_info_ptr = png_create_info_struct(read_ptr);
+   end_info_ptr = png_create_info_struct(read_ptr);
+#ifdef PNG_WRITE_SUPPORTED
+   write_info_ptr = png_create_info_struct(write_ptr);
+   write_end_info_ptr = png_create_info_struct(write_ptr);
+#endif
+
+#ifdef PNG_SETJMP_SUPPORTED
+   png_debug(0, "Setting jmpbuf for read struct\n");
+#ifdef USE_FAR_KEYWORD
+   if (setjmp(jmpbuf))
+#else
+   if (setjmp(png_jmpbuf(read_ptr)))
+#endif
+   {
+      fprintf(STDERR, "%s -> %s: libpng read error\n", inname, outname);
+      if (row_buf)
+         png_free(read_ptr, row_buf);
+      png_destroy_read_struct(&read_ptr, &read_info_ptr, &end_info_ptr);
+#ifdef PNG_WRITE_SUPPORTED
+      png_destroy_info_struct(write_ptr, &write_end_info_ptr);
+      png_destroy_write_struct(&write_ptr, &write_info_ptr);
+#endif
+      FCLOSE(fpin);
+      FCLOSE(fpout);
+      return (1);
+   }
+#ifdef USE_FAR_KEYWORD
+   png_memcpy(png_jmpbuf(read_ptr),jmpbuf,png_sizeof(jmp_buf));
+#endif
+
+#ifdef PNG_WRITE_SUPPORTED
+   png_debug(0, "Setting jmpbuf for write struct\n");
+#ifdef USE_FAR_KEYWORD
+   if (setjmp(jmpbuf))
+#else
+   if (setjmp(png_jmpbuf(write_ptr)))
+#endif
+   {
+      fprintf(STDERR, "%s -> %s: libpng write error\n", inname, outname);
+      png_destroy_read_struct(&read_ptr, &read_info_ptr, &end_info_ptr);
+      png_destroy_info_struct(write_ptr, &write_end_info_ptr);
+#ifdef PNG_WRITE_SUPPORTED
+      png_destroy_write_struct(&write_ptr, &write_info_ptr);
+#endif
+      FCLOSE(fpin);
+      FCLOSE(fpout);
+      return (1);
+   }
+#ifdef USE_FAR_KEYWORD
+   png_memcpy(png_jmpbuf(write_ptr),jmpbuf,png_sizeof(jmp_buf));
+#endif
+#endif
+#endif
+
+   png_debug(0, "Initializing input and output streams\n");
+#if !defined(PNG_NO_STDIO)
+   png_init_io(read_ptr, fpin);
+#  ifdef PNG_WRITE_SUPPORTED
+   png_init_io(write_ptr, fpout);
+#  endif
+#else
+   png_set_read_fn(read_ptr, (png_voidp)fpin, pngtest_read_data);
+#  ifdef PNG_WRITE_SUPPORTED
+   png_set_write_fn(write_ptr, (png_voidp)fpout,  pngtest_write_data,
+#    if defined(PNG_WRITE_FLUSH_SUPPORTED)
+      pngtest_flush);
+#    else
+      NULL);
+#    endif
+#  endif
+#endif
+   if(status_dots_requested == 1)
+   {
+#ifdef PNG_WRITE_SUPPORTED
+      png_set_write_status_fn(write_ptr, write_row_callback);
+#endif
+      png_set_read_status_fn(read_ptr, read_row_callback);
+   }
+   else
+   {
+#ifdef PNG_WRITE_SUPPORTED
+      png_set_write_status_fn(write_ptr, png_write_status_ptr_NULL);
+#endif
+      png_set_read_status_fn(read_ptr, png_read_status_ptr_NULL);
+   }
+
+#if defined(PNG_READ_USER_TRANSFORM_SUPPORTED)
+   {
+     int i;
+     for(i=0; i<256; i++)
+        filters_used[i]=0;
+     png_set_read_user_transform_fn(read_ptr, count_filters);
+   }
+#endif
+#if defined(PNG_WRITE_USER_TRANSFORM_SUPPORTED)
+   zero_samples=0;
+   png_set_write_user_transform_fn(write_ptr, count_zero_samples);
+#endif
+
+#if defined(PNG_READ_UNKNOWN_CHUNKS_SUPPORTED)
+#  ifndef PNG_HANDLE_CHUNK_ALWAYS
+#    define PNG_HANDLE_CHUNK_ALWAYS       3
+#  endif
+   png_set_keep_unknown_chunks(read_ptr, PNG_HANDLE_CHUNK_ALWAYS,
+      png_bytep_NULL, 0);
+#endif
+#if defined(PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED)
+#  ifndef PNG_HANDLE_CHUNK_IF_SAFE
+#    define PNG_HANDLE_CHUNK_IF_SAFE      2
+#  endif
+   png_set_keep_unknown_chunks(write_ptr, PNG_HANDLE_CHUNK_IF_SAFE,
+      png_bytep_NULL, 0);
+#endif
+
+   png_debug(0, "Reading info struct\n");
+   png_read_info(read_ptr, read_info_ptr);
+
+   png_debug(0, "Transferring info struct\n");
+   {
+      int interlace_type, compression_type, filter_type;
+
+      if (png_get_IHDR(read_ptr, read_info_ptr, &width, &height, &bit_depth,
+          &color_type, &interlace_type, &compression_type, &filter_type))
+      {
+         png_set_IHDR(write_ptr, write_info_ptr, width, height, bit_depth,
+#if defined(PNG_WRITE_INTERLACING_SUPPORTED)
+            color_type, interlace_type, compression_type, filter_type);
+#else
+            color_type, PNG_INTERLACE_NONE, compression_type, filter_type);
+#endif
+      }
+   }
+#if defined(PNG_FIXED_POINT_SUPPORTED)
+#if defined(PNG_cHRM_SUPPORTED)
+   {
+      png_fixed_point white_x, white_y, red_x, red_y, green_x, green_y, blue_x,
+         blue_y;
+      if (png_get_cHRM_fixed(read_ptr, read_info_ptr, &white_x, &white_y, &red_x,
+         &red_y, &green_x, &green_y, &blue_x, &blue_y))
+      {
+         png_set_cHRM_fixed(write_ptr, write_info_ptr, white_x, white_y, red_x,
+            red_y, green_x, green_y, blue_x, blue_y);
+      }
+   }
+#endif
+#if defined(PNG_gAMA_SUPPORTED)
+   {
+      png_fixed_point gamma;
+
+      if (png_get_gAMA_fixed(read_ptr, read_info_ptr, &gamma))
+      {
+         png_set_gAMA_fixed(write_ptr, write_info_ptr, gamma);
+      }
+   }
+#endif
+#else /* Use floating point versions */
+#if defined(PNG_FLOATING_POINT_SUPPORTED)
+#if defined(PNG_cHRM_SUPPORTED)
+   {
+      double white_x, white_y, red_x, red_y, green_x, green_y, blue_x,
+         blue_y;
+      if (png_get_cHRM(read_ptr, read_info_ptr, &white_x, &white_y, &red_x,
+         &red_y, &green_x, &green_y, &blue_x, &blue_y))
+      {
+         png_set_cHRM(write_ptr, write_info_ptr, white_x, white_y, red_x,
+            red_y, green_x, green_y, blue_x, blue_y);
+      }
+   }
+#endif
+#if defined(PNG_gAMA_SUPPORTED)
+   {
+      double gamma;
+
+      if (png_get_gAMA(read_ptr, read_info_ptr, &gamma))
+      {
+         png_set_gAMA(write_ptr, write_info_ptr, gamma);
+      }
+   }
+#endif
+#endif /* floating point */
+#endif /* fixed point */
+#if defined(PNG_iCCP_SUPPORTED)
+   {
+      png_charp name;
+      png_charp profile;
+      png_uint_32 proflen;
+      int compression_type;
+
+      if (png_get_iCCP(read_ptr, read_info_ptr, &name, &compression_type,
+                      &profile, &proflen))
+      {
+         png_set_iCCP(write_ptr, write_info_ptr, name, compression_type,
+                      profile, proflen);
+      }
+   }
+#endif
+#if defined(PNG_sRGB_SUPPORTED)
+   {
+      int intent;
+
+      if (png_get_sRGB(read_ptr, read_info_ptr, &intent))
+      {
+         png_set_sRGB(write_ptr, write_info_ptr, intent);
+      }
+   }
+#endif
+   {
+      png_colorp palette;
+      int num_palette;
+
+      if (png_get_PLTE(read_ptr, read_info_ptr, &palette, &num_palette))
+      {
+         png_set_PLTE(write_ptr, write_info_ptr, palette, num_palette);
+      }
+   }
+#if defined(PNG_bKGD_SUPPORTED)
+   {
+      png_color_16p background;
+
+      if (png_get_bKGD(read_ptr, read_info_ptr, &background))
+      {
+         png_set_bKGD(write_ptr, write_info_ptr, background);
+      }
+   }
+#endif
+#if defined(PNG_hIST_SUPPORTED)
+   {
+      png_uint_16p hist;
+
+      if (png_get_hIST(read_ptr, read_info_ptr, &hist))
+      {
+         png_set_hIST(write_ptr, write_info_ptr, hist);
+      }
+   }
+#endif
+#if defined(PNG_oFFs_SUPPORTED)
+   {
+      png_int_32 offset_x, offset_y;
+      int unit_type;
+
+      if (png_get_oFFs(read_ptr, read_info_ptr,&offset_x,&offset_y,&unit_type))
+      {
+         png_set_oFFs(write_ptr, write_info_ptr, offset_x, offset_y, unit_type);
+      }
+   }
+#endif
+#if defined(PNG_pCAL_SUPPORTED)
+   {
+      png_charp purpose, units;
+      png_charpp params;
+      png_int_32 X0, X1;
+      int type, nparams;
+
+      if (png_get_pCAL(read_ptr, read_info_ptr, &purpose, &X0, &X1, &type,
+         &nparams, &units, &params))
+      {
+         png_set_pCAL(write_ptr, write_info_ptr, purpose, X0, X1, type,
+            nparams, units, params);
+      }
+   }
+#endif
+#if defined(PNG_pHYs_SUPPORTED)
+   {
+      png_uint_32 res_x, res_y;
+      int unit_type;
+
+      if (png_get_pHYs(read_ptr, read_info_ptr, &res_x, &res_y, &unit_type))
+      {
+         png_set_pHYs(write_ptr, write_info_ptr, res_x, res_y, unit_type);
+      }
+   }
+#endif
+#if defined(PNG_sBIT_SUPPORTED)
+   {
+      png_color_8p sig_bit;
+
+      if (png_get_sBIT(read_ptr, read_info_ptr, &sig_bit))
+      {
+         png_set_sBIT(write_ptr, write_info_ptr, sig_bit);
+      }
+   }
+#endif
+#if defined(PNG_sCAL_SUPPORTED)
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+   {
+      int unit;
+      double scal_width, scal_height;
+
+      if (png_get_sCAL(read_ptr, read_info_ptr, &unit, &scal_width,
+         &scal_height))
+      {
+         png_set_sCAL(write_ptr, write_info_ptr, unit, scal_width, scal_height);
+      }
+   }
+#else
+#ifdef PNG_FIXED_POINT_SUPPORTED
+   {
+      int unit;
+      png_charp scal_width, scal_height;
+
+      if (png_get_sCAL_s(read_ptr, read_info_ptr, &unit, &scal_width,
+          &scal_height))
+      {
+         png_set_sCAL_s(write_ptr, write_info_ptr, unit, scal_width, scal_height);
+      }
+   }
+#endif
+#endif
+#endif
+#if defined(PNG_TEXT_SUPPORTED)
+   {
+      png_textp text_ptr;
+      int num_text;
+
+      if (png_get_text(read_ptr, read_info_ptr, &text_ptr, &num_text) > 0)
+      {
+         png_debug1(0, "Handling %d iTXt/tEXt/zTXt chunks\n", num_text);
+         png_set_text(write_ptr, write_info_ptr, text_ptr, num_text);
+      }
+   }
+#endif
+#if defined(PNG_tIME_SUPPORTED)
+   {
+      png_timep mod_time;
+
+      if (png_get_tIME(read_ptr, read_info_ptr, &mod_time))
+      {
+         png_set_tIME(write_ptr, write_info_ptr, mod_time);
+#if defined(PNG_TIME_RFC1123_SUPPORTED)
+         /* we have to use png_strncpy instead of "=" because the string
+            pointed to by png_convert_to_rfc1123() gets free'ed before
+            we use it */
+         png_strncpy(tIME_string,png_convert_to_rfc1123(read_ptr,
+            mod_time),29);
+         tIME_string[29] = '\0';
+         tIME_chunk_present++;
+#endif /* PNG_TIME_RFC1123_SUPPORTED */
+      }
+   }
+#endif
+#if defined(PNG_tRNS_SUPPORTED)
+   {
+      png_bytep trans;
+      int num_trans;
+      png_color_16p trans_values;
+
+      if (png_get_tRNS(read_ptr, read_info_ptr, &trans, &num_trans,
+         &trans_values))
+      {
+         png_set_tRNS(write_ptr, write_info_ptr, trans, num_trans,
+            trans_values);
+      }
+   }
+#endif
+#if defined(PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED)
+   {
+      png_unknown_chunkp unknowns;
+      int num_unknowns = (int)png_get_unknown_chunks(read_ptr, read_info_ptr,
+         &unknowns);
+      if (num_unknowns)
+      {
+         png_size_t i;
+         png_set_unknown_chunks(write_ptr, write_info_ptr, unknowns,
+           num_unknowns);
+         /* copy the locations from the read_info_ptr.  The automatically
+            generated locations in write_info_ptr are wrong because we
+            haven't written anything yet */
+         for (i = 0; i < (png_size_t)num_unknowns; i++)
+           png_set_unknown_chunk_location(write_ptr, write_info_ptr, i,
+             unknowns[i].location);
+      }
+   }
+#endif
+
+#ifdef PNG_WRITE_SUPPORTED
+   png_debug(0, "\nWriting info struct\n");
+
+/* If we wanted, we could write info in two steps:
+   png_write_info_before_PLTE(write_ptr, write_info_ptr);
+ */
+   png_write_info(write_ptr, write_info_ptr);
+#endif
+
+#ifdef SINGLE_ROWBUF_ALLOC
+   png_debug(0, "\nAllocating row buffer...");
+   row_buf = (png_bytep)png_malloc(read_ptr,
+      png_get_rowbytes(read_ptr, read_info_ptr));
+   png_debug1(0, "0x%08lx\n\n", (unsigned long)row_buf);
+#endif /* SINGLE_ROWBUF_ALLOC */
+   png_debug(0, "Writing row data\n");
+
+#if defined(PNG_READ_INTERLACING_SUPPORTED) || \
+  defined(PNG_WRITE_INTERLACING_SUPPORTED)
+   num_pass = png_set_interlace_handling(read_ptr);
+#  ifdef PNG_WRITE_SUPPORTED
+   png_set_interlace_handling(write_ptr);
+#  endif
+#else
+   num_pass=1;
+#endif
+
+#ifdef PNGTEST_TIMING
+   t_stop = (float)clock();
+   t_misc += (t_stop - t_start);
+   t_start = t_stop;
+#endif
+   for (pass = 0; pass < num_pass; pass++)
+   {
+      png_debug1(0, "Writing row data for pass %d\n",pass);
+      for (y = 0; y < height; y++)
+      {
+#ifndef SINGLE_ROWBUF_ALLOC
+         png_debug2(0, "\nAllocating row buffer (pass %d, y = %ld)...", pass,y);
+         row_buf = (png_bytep)png_malloc(read_ptr,
+            png_get_rowbytes(read_ptr, read_info_ptr));
+         png_debug2(0, "0x%08lx (%ld bytes)\n", (unsigned long)row_buf,
+            png_get_rowbytes(read_ptr, read_info_ptr));
+#endif /* !SINGLE_ROWBUF_ALLOC */
+         png_read_rows(read_ptr, (png_bytepp)&row_buf, png_bytepp_NULL, 1);
+
+#ifdef PNG_WRITE_SUPPORTED
+#ifdef PNGTEST_TIMING
+         t_stop = (float)clock();
+         t_decode += (t_stop - t_start);
+         t_start = t_stop;
+#endif
+         png_write_rows(write_ptr, (png_bytepp)&row_buf, 1);
+#ifdef PNGTEST_TIMING
+         t_stop = (float)clock();
+         t_encode += (t_stop - t_start);
+         t_start = t_stop;
+#endif
+#endif /* PNG_WRITE_SUPPORTED */
+
+#ifndef SINGLE_ROWBUF_ALLOC
+         png_debug2(0, "Freeing row buffer (pass %d, y = %ld)\n\n", pass, y);
+         png_free(read_ptr, row_buf);
+#endif /* !SINGLE_ROWBUF_ALLOC */
+      }
+   }
+
+#if defined(PNG_READ_UNKNOWN_CHUNKS_SUPPORTED)
+   png_free_data(read_ptr, read_info_ptr, PNG_FREE_UNKN, -1);
+#endif
+#if defined(PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED)
+   png_free_data(write_ptr, write_info_ptr, PNG_FREE_UNKN, -1);
+#endif
+
+   png_debug(0, "Reading and writing end_info data\n");
+
+   png_read_end(read_ptr, end_info_ptr);
+#if defined(PNG_TEXT_SUPPORTED)
+   {
+      png_textp text_ptr;
+      int num_text;
+
+      if (png_get_text(read_ptr, end_info_ptr, &text_ptr, &num_text) > 0)
+      {
+         png_debug1(0, "Handling %d iTXt/tEXt/zTXt chunks\n", num_text);
+         png_set_text(write_ptr, write_end_info_ptr, text_ptr, num_text);
+      }
+   }
+#endif
+#if defined(PNG_tIME_SUPPORTED)
+   {
+      png_timep mod_time;
+
+      if (png_get_tIME(read_ptr, end_info_ptr, &mod_time))
+      {
+         png_set_tIME(write_ptr, write_end_info_ptr, mod_time);
+#if defined(PNG_TIME_RFC1123_SUPPORTED)
+         /* we have to use png_strncpy instead of "=" because the string
+            pointed to by png_convert_to_rfc1123() gets free'ed before
+            we use it */
+         png_strncpy(tIME_string,png_convert_to_rfc1123(read_ptr,
+            mod_time),29);
+         tIME_string[29] = '\0';
+         tIME_chunk_present++;
+#endif /* PNG_TIME_RFC1123_SUPPORTED */
+      }
+   }
+#endif
+#if defined(PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED)
+   {
+      png_unknown_chunkp unknowns;
+      int num_unknowns;
+      num_unknowns = (int)png_get_unknown_chunks(read_ptr, end_info_ptr,
+         &unknowns);
+      if (num_unknowns)
+      {
+         png_size_t i;
+         png_set_unknown_chunks(write_ptr, write_end_info_ptr, unknowns,
+           num_unknowns);
+         /* copy the locations from the read_info_ptr.  The automatically
+            generated locations in write_end_info_ptr are wrong because we
+            haven't written the end_info yet */
+         for (i = 0; i < (png_size_t)num_unknowns; i++)
+           png_set_unknown_chunk_location(write_ptr, write_end_info_ptr, i,
+             unknowns[i].location);
+      }
+   }
+#endif
+#ifdef PNG_WRITE_SUPPORTED
+   png_write_end(write_ptr, write_end_info_ptr);
+#endif
+
+#ifdef PNG_EASY_ACCESS_SUPPORTED
+   if(verbose)
+   {
+      png_uint_32 iwidth, iheight;
+      iwidth = png_get_image_width(write_ptr, write_info_ptr);
+      iheight = png_get_image_height(write_ptr, write_info_ptr);
+      fprintf(STDERR, "Image width = %lu, height = %lu\n",
+         (unsigned long)iwidth, (unsigned long)iheight);
+   }
+#endif
+
+   png_debug(0, "Destroying data structs\n");
+#ifdef SINGLE_ROWBUF_ALLOC
+   png_debug(1, "destroying row_buf for read_ptr\n");
+   png_free(read_ptr, row_buf);
+   row_buf=NULL;
+#endif /* SINGLE_ROWBUF_ALLOC */
+   png_debug(1, "destroying read_ptr, read_info_ptr, end_info_ptr\n");
+   png_destroy_read_struct(&read_ptr, &read_info_ptr, &end_info_ptr);
+#ifdef PNG_WRITE_SUPPORTED
+   png_debug(1, "destroying write_end_info_ptr\n");
+   png_destroy_info_struct(write_ptr, &write_end_info_ptr);
+   png_debug(1, "destroying write_ptr, write_info_ptr\n");
+   png_destroy_write_struct(&write_ptr, &write_info_ptr);
+#endif
+   png_debug(0, "Destruction complete.\n");
+
+   FCLOSE(fpin);
+   FCLOSE(fpout);
+
+   png_debug(0, "Opening files for comparison\n");
+#if defined(_WIN32_WCE)
+   MultiByteToWideChar(CP_ACP, 0, inname, -1, path, MAX_PATH);
+   if ((fpin = CreateFile(path, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, NULL)) == INVALID_HANDLE_VALUE)
+#else
+   if ((fpin = fopen(inname, "rb")) == NULL)
+#endif
+   {
+      fprintf(STDERR, "Could not find file %s\n", inname);
+      return (1);
+   }
+
+#if defined(_WIN32_WCE)
+   MultiByteToWideChar(CP_ACP, 0, outname, -1, path, MAX_PATH);
+   if ((fpout = CreateFile(path, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, NULL)) == INVALID_HANDLE_VALUE)
+#else
+   if ((fpout = fopen(outname, "rb")) == NULL)
+#endif
+   {
+      fprintf(STDERR, "Could not find file %s\n", outname);
+      FCLOSE(fpin);
+      return (1);
+   }
+
+   for(;;)
+   {
+      png_size_t num_in, num_out;
+
+      READFILE(fpin, inbuf, 1, num_in);
+      READFILE(fpout, outbuf, 1, num_out);
+
+      if (num_in != num_out)
+      {
+         fprintf(STDERR, "\nFiles %s and %s are of a different size\n",
+                 inname, outname);
+         if(wrote_question == 0)
+         {
+            fprintf(STDERR,
+         "   Was %s written with the same maximum IDAT chunk size (%d bytes),",
+              inname,PNG_ZBUF_SIZE);
+            fprintf(STDERR,
+              "\n   filtering heuristic (libpng default), compression");
+            fprintf(STDERR,
+              " level (zlib default),\n   and zlib version (%s)?\n\n",
+              ZLIB_VERSION);
+            wrote_question=1;
+         }
+         FCLOSE(fpin);
+         FCLOSE(fpout);
+         return (0);
+      }
+
+      if (!num_in)
+         break;
+
+      if (png_memcmp(inbuf, outbuf, num_in))
+      {
+         fprintf(STDERR, "\nFiles %s and %s are different\n", inname, outname);
+         if(wrote_question == 0)
+         {
+            fprintf(STDERR,
+         "   Was %s written with the same maximum IDAT chunk size (%d bytes),",
+                 inname,PNG_ZBUF_SIZE);
+            fprintf(STDERR,
+              "\n   filtering heuristic (libpng default), compression");
+            fprintf(STDERR,
+              " level (zlib default),\n   and zlib version (%s)?\n\n",
+              ZLIB_VERSION);
+            wrote_question=1;
+         }
+         FCLOSE(fpin);
+         FCLOSE(fpout);
+         return (0);
+      }
+   }
+
+   FCLOSE(fpin);
+   FCLOSE(fpout);
+
+   return (0);
+}
+
+/* input and output filenames */
+#ifdef RISCOS
+static PNG_CONST char *inname = "pngtest/png";
+static PNG_CONST char *outname = "pngout/png";
+#else
+static PNG_CONST char *inname = "pngtest.png";
+static PNG_CONST char *outname = "pngout.png";
+#endif
+
+int
+main(int argc, char *argv[])
+{
+   int multiple = 0;
+   int ierror = 0;
+
+   fprintf(STDERR, "Testing libpng version %s\n", PNG_LIBPNG_VER_STRING);
+   fprintf(STDERR, "   with zlib   version %s\n", ZLIB_VERSION);
+   fprintf(STDERR,"%s",png_get_copyright(NULL));
+   /* Show the version of libpng used in building the library */
+   fprintf(STDERR," library (%lu):%s",
+      (unsigned long)png_access_version_number(),
+      png_get_header_version(NULL));
+   /* Show the version of libpng used in building the application */
+   fprintf(STDERR," pngtest (%lu):%s", (unsigned long)PNG_LIBPNG_VER,
+      PNG_HEADER_VERSION_STRING);
+   fprintf(STDERR," png_sizeof(png_struct)=%ld, png_sizeof(png_info)=%ld\n",
+                    (long)png_sizeof(png_struct), (long)png_sizeof(png_info));
+
+   /* Do some consistency checking on the memory allocation settings, I'm
+      not sure this matters, but it is nice to know, the first of these
+      tests should be impossible because of the way the macros are set
+      in pngconf.h */
+#if defined(MAXSEG_64K) && !defined(PNG_MAX_MALLOC_64K)
+      fprintf(STDERR, " NOTE: Zlib compiled for max 64k, libpng not\n");
+#endif
+   /* I think the following can happen. */
+#if !defined(MAXSEG_64K) && defined(PNG_MAX_MALLOC_64K)
+      fprintf(STDERR, " NOTE: libpng compiled for max 64k, zlib not\n");
+#endif
+
+   if (strcmp(png_libpng_ver, PNG_LIBPNG_VER_STRING))
+   {
+      fprintf(STDERR,
+         "Warning: versions are different between png.h and png.c\n");
+      fprintf(STDERR, "  png.h version: %s\n", PNG_LIBPNG_VER_STRING);
+      fprintf(STDERR, "  png.c version: %s\n\n", png_libpng_ver);
+      ++ierror;
+   }
+
+   if (argc > 1)
+   {
+      if (strcmp(argv[1], "-m") == 0)
+      {
+         multiple = 1;
+         status_dots_requested = 0;
+      }
+      else if (strcmp(argv[1], "-mv") == 0 ||
+               strcmp(argv[1], "-vm") == 0 )
+      {
+         multiple = 1;
+         verbose = 1;
+         status_dots_requested = 1;
+      }
+      else if (strcmp(argv[1], "-v") == 0)
+      {
+         verbose = 1;
+         status_dots_requested = 1;
+         inname = argv[2];
+      }
+      else
+      {
+         inname = argv[1];
+         status_dots_requested = 0;
+      }
+   }
+
+   if (!multiple && argc == 3+verbose)
+     outname = argv[2+verbose];
+
+   if ((!multiple && argc > 3+verbose) || (multiple && argc < 2))
+   {
+     fprintf(STDERR,
+       "usage: %s [infile.png] [outfile.png]\n\t%s -m {infile.png}\n",
+        argv[0], argv[0]);
+     fprintf(STDERR,
+       "  reads/writes one PNG file (without -m) or multiple files (-m)\n");
+     fprintf(STDERR,
+       "  with -m %s is used as a temporary file\n", outname);
+     exit(1);
+   }
+
+   if (multiple)
+   {
+      int i;
+#if defined(PNG_USER_MEM_SUPPORTED) && PNG_DEBUG
+      int allocation_now = current_allocation;
+#endif
+      for (i=2; i<argc; ++i)
+      {
+#if defined(PNG_READ_USER_TRANSFORM_SUPPORTED)
+         int k;
+#endif
+         int kerror;
+         fprintf(STDERR, "Testing %s:",argv[i]);
+         kerror = test_one_file(argv[i], outname);
+         if (kerror == 0)
+         {
+#if defined(PNG_WRITE_USER_TRANSFORM_SUPPORTED)
+            fprintf(STDERR, "\n PASS (%lu zero samples)\n",
+               (unsigned long)zero_samples);
+#else
+            fprintf(STDERR, " PASS\n");
+#endif
+#if defined(PNG_READ_USER_TRANSFORM_SUPPORTED)
+            for (k=0; k<256; k++)
+               if(filters_used[k])
+                  fprintf(STDERR, " Filter %d was used %lu times\n",
+                     k,(unsigned long)filters_used[k]);
+#endif
+#if defined(PNG_TIME_RFC1123_SUPPORTED)
+         if(tIME_chunk_present != 0)
+            fprintf(STDERR, " tIME = %s\n",tIME_string);
+         tIME_chunk_present = 0;
+#endif /* PNG_TIME_RFC1123_SUPPORTED */
+         }
+         else
+         {
+            fprintf(STDERR, " FAIL\n");
+            ierror += kerror;
+         }
+#if defined(PNG_USER_MEM_SUPPORTED) && PNG_DEBUG
+         if (allocation_now != current_allocation)
+            fprintf(STDERR, "MEMORY ERROR: %d bytes lost\n",
+               current_allocation-allocation_now);
+         if (current_allocation != 0)
+         {
+            memory_infop pinfo = pinformation;
+
+            fprintf(STDERR, "MEMORY ERROR: %d bytes still allocated\n",
+               current_allocation);
+            while (pinfo != NULL)
+            {
+               fprintf(STDERR, " %lu bytes at %x\n", (unsigned long)pinfo->size,
+                 (unsigned int) pinfo->pointer);
+               pinfo = pinfo->next;
+            }
+         }
+#endif
+      }
+#if defined(PNG_USER_MEM_SUPPORTED) && PNG_DEBUG
+         fprintf(STDERR, " Current memory allocation: %10d bytes\n",
+            current_allocation);
+         fprintf(STDERR, " Maximum memory allocation: %10d bytes\n",
+            maximum_allocation);
+         fprintf(STDERR, " Total   memory allocation: %10d bytes\n",
+            total_allocation);
+         fprintf(STDERR, "     Number of allocations: %10d\n",
+            num_allocations);
+#endif
+   }
+   else
+   {
+      int i;
+      for (i=0; i<3; ++i)
+      {
+         int kerror;
+#if defined(PNG_USER_MEM_SUPPORTED) && PNG_DEBUG
+         int allocation_now = current_allocation;
+#endif
+         if (i == 1) status_dots_requested = 1;
+         else if(verbose == 0)status_dots_requested = 0;
+         if (i == 0 || verbose == 1 || ierror != 0)
+            fprintf(STDERR, "Testing %s:",inname);
+         kerror = test_one_file(inname, outname);
+         if(kerror == 0)
+         {
+            if(verbose == 1 || i == 2)
+            {
+#if defined(PNG_READ_USER_TRANSFORM_SUPPORTED)
+                int k;
+#endif
+#if defined(PNG_WRITE_USER_TRANSFORM_SUPPORTED)
+                fprintf(STDERR, "\n PASS (%lu zero samples)\n",
+                   (unsigned long)zero_samples);
+#else
+                fprintf(STDERR, " PASS\n");
+#endif
+#if defined(PNG_READ_USER_TRANSFORM_SUPPORTED)
+                for (k=0; k<256; k++)
+                   if(filters_used[k])
+                      fprintf(STDERR, " Filter %d was used %lu times\n",
+                         k,(unsigned long)filters_used[k]);
+#endif
+#if defined(PNG_TIME_RFC1123_SUPPORTED)
+             if(tIME_chunk_present != 0)
+                fprintf(STDERR, " tIME = %s\n",tIME_string);
+#endif /* PNG_TIME_RFC1123_SUPPORTED */
+            }
+         }
+         else
+         {
+            if(verbose == 0 && i != 2)
+               fprintf(STDERR, "Testing %s:",inname);
+            fprintf(STDERR, " FAIL\n");
+            ierror += kerror;
+         }
+#if defined(PNG_USER_MEM_SUPPORTED) && PNG_DEBUG
+         if (allocation_now != current_allocation)
+             fprintf(STDERR, "MEMORY ERROR: %d bytes lost\n",
+               current_allocation-allocation_now);
+         if (current_allocation != 0)
+         {
+             memory_infop pinfo = pinformation;
+
+             fprintf(STDERR, "MEMORY ERROR: %d bytes still allocated\n",
+                current_allocation);
+             while (pinfo != NULL)
+             {
+                fprintf(STDERR," %lu bytes at %x\n",
+                   (unsigned long)pinfo->size, (unsigned int)pinfo->pointer);
+                pinfo = pinfo->next;
+             }
+          }
+#endif
+       }
+#if defined(PNG_USER_MEM_SUPPORTED) && PNG_DEBUG
+       fprintf(STDERR, " Current memory allocation: %10d bytes\n",
+          current_allocation);
+       fprintf(STDERR, " Maximum memory allocation: %10d bytes\n",
+          maximum_allocation);
+       fprintf(STDERR, " Total   memory allocation: %10d bytes\n",
+          total_allocation);
+       fprintf(STDERR, "     Number of allocations: %10d\n",
+            num_allocations);
+#endif
+   }
+
+#ifdef PNGTEST_TIMING
+   t_stop = (float)clock();
+   t_misc += (t_stop - t_start);
+   t_start = t_stop;
+   fprintf(STDERR," CPU time used = %.3f seconds",
+      (t_misc+t_decode+t_encode)/(float)CLOCKS_PER_SEC);
+   fprintf(STDERR," (decoding %.3f,\n",
+      t_decode/(float)CLOCKS_PER_SEC);
+   fprintf(STDERR,"        encoding %.3f ,",
+      t_encode/(float)CLOCKS_PER_SEC);
+   fprintf(STDERR," other %.3f seconds)\n\n",
+      t_misc/(float)CLOCKS_PER_SEC);
+#endif
+
+   if (ierror == 0)
+      fprintf(STDERR, "libpng passes test\n");
+   else
+      fprintf(STDERR, "libpng FAILS test\n");
+   return (int)(ierror != 0);
+}
+
+/* Generate a compiler error if there is an old png.h in the search path. */
+typedef version_1_2_22 your_png_h_is_not_version_1_2_22;
diff --git a/uppsrc/plugin/png/lib/pngtrans.c b/uppsrc/plugin/png/lib/pngtrans.c
new file mode 100644
index 000000000..164009502
--- /dev/null
+++ b/uppsrc/plugin/png/lib/pngtrans.c
@@ -0,0 +1,662 @@
+
+/* pngtrans.c - transforms the data in a row (used by both readers and writers)
+ *
+ * Last changed in libpng 1.2.17 May 15, 2007
+ * For conditions of distribution and use, see copyright notice in png.h
+ * Copyright (c) 1998-2007 Glenn Randers-Pehrson
+ * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
+ * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
+ */
+
+#define PNG_INTERNAL
+#include "png.h"
+
+#if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED)
+#if defined(PNG_READ_BGR_SUPPORTED) || defined(PNG_WRITE_BGR_SUPPORTED)
+/* turn on BGR-to-RGB mapping */
+void PNGAPI
+png_set_bgr(png_structp png_ptr)
+{
+   png_debug(1, "in png_set_bgr\n");
+   if(png_ptr == NULL) return;
+   png_ptr->transformations |= PNG_BGR;
+}
+#endif
+
+#if defined(PNG_READ_SWAP_SUPPORTED) || defined(PNG_WRITE_SWAP_SUPPORTED)
+/* turn on 16 bit byte swapping */
+void PNGAPI
+png_set_swap(png_structp png_ptr)
+{
+   png_debug(1, "in png_set_swap\n");
+   if(png_ptr == NULL) return;
+   if (png_ptr->bit_depth == 16)
+      png_ptr->transformations |= PNG_SWAP_BYTES;
+}
+#endif
+
+#if defined(PNG_READ_PACK_SUPPORTED) || defined(PNG_WRITE_PACK_SUPPORTED)
+/* turn on pixel packing */
+void PNGAPI
+png_set_packing(png_structp png_ptr)
+{
+   png_debug(1, "in png_set_packing\n");
+   if(png_ptr == NULL) return;
+   if (png_ptr->bit_depth < 8)
+   {
+      png_ptr->transformations |= PNG_PACK;
+      png_ptr->usr_bit_depth = 8;
+   }
+}
+#endif
+
+#if defined(PNG_READ_PACKSWAP_SUPPORTED)||defined(PNG_WRITE_PACKSWAP_SUPPORTED)
+/* turn on packed pixel swapping */
+void PNGAPI
+png_set_packswap(png_structp png_ptr)
+{
+   png_debug(1, "in png_set_packswap\n");
+   if(png_ptr == NULL) return;
+   if (png_ptr->bit_depth < 8)
+      png_ptr->transformations |= PNG_PACKSWAP;
+}
+#endif
+
+#if defined(PNG_READ_SHIFT_SUPPORTED) || defined(PNG_WRITE_SHIFT_SUPPORTED)
+void PNGAPI
+png_set_shift(png_structp png_ptr, png_color_8p true_bits)
+{
+   png_debug(1, "in png_set_shift\n");
+   if(png_ptr == NULL) return;
+   png_ptr->transformations |= PNG_SHIFT;
+   png_ptr->shift = *true_bits;
+}
+#endif
+
+#if defined(PNG_READ_INTERLACING_SUPPORTED) || \
+    defined(PNG_WRITE_INTERLACING_SUPPORTED)
+int PNGAPI
+png_set_interlace_handling(png_structp png_ptr)
+{
+   png_debug(1, "in png_set_interlace handling\n");
+   if (png_ptr && png_ptr->interlaced)
+   {
+      png_ptr->transformations |= PNG_INTERLACE;
+      return (7);
+   }
+
+   return (1);
+}
+#endif
+
+#if defined(PNG_READ_FILLER_SUPPORTED) || defined(PNG_WRITE_FILLER_SUPPORTED)
+/* Add a filler byte on read, or remove a filler or alpha byte on write.
+ * The filler type has changed in v0.95 to allow future 2-byte fillers
+ * for 48-bit input data, as well as to avoid problems with some compilers
+ * that don't like bytes as parameters.
+ */
+void PNGAPI
+png_set_filler(png_structp png_ptr, png_uint_32 filler, int filler_loc)
+{
+   png_debug(1, "in png_set_filler\n");
+   if(png_ptr == NULL) return;
+   png_ptr->transformations |= PNG_FILLER;
+   png_ptr->filler = (png_byte)filler;
+   if (filler_loc == PNG_FILLER_AFTER)
+      png_ptr->flags |= PNG_FLAG_FILLER_AFTER;
+   else
+      png_ptr->flags &= ~PNG_FLAG_FILLER_AFTER;
+
+   /* This should probably go in the "do_read_filler" routine.
+    * I attempted to do that in libpng-1.0.1a but that caused problems
+    * so I restored it in libpng-1.0.2a
+   */
+
+   if (png_ptr->color_type == PNG_COLOR_TYPE_RGB)
+   {
+      png_ptr->usr_channels = 4;
+   }
+
+   /* Also I added this in libpng-1.0.2a (what happens when we expand
+    * a less-than-8-bit grayscale to GA? */
+
+   if (png_ptr->color_type == PNG_COLOR_TYPE_GRAY && png_ptr->bit_depth >= 8)
+   {
+      png_ptr->usr_channels = 2;
+   }
+}
+
+#if !defined(PNG_1_0_X)
+/* Added to libpng-1.2.7 */
+void PNGAPI
+png_set_add_alpha(png_structp png_ptr, png_uint_32 filler, int filler_loc)
+{
+   png_debug(1, "in png_set_add_alpha\n");
+   if(png_ptr == NULL) return;
+   png_set_filler(png_ptr, filler, filler_loc);
+   png_ptr->transformations |= PNG_ADD_ALPHA;
+}
+#endif
+
+#endif
+
+#if defined(PNG_READ_SWAP_ALPHA_SUPPORTED) || \
+    defined(PNG_WRITE_SWAP_ALPHA_SUPPORTED)
+void PNGAPI
+png_set_swap_alpha(png_structp png_ptr)
+{
+   png_debug(1, "in png_set_swap_alpha\n");
+   if(png_ptr == NULL) return;
+   png_ptr->transformations |= PNG_SWAP_ALPHA;
+}
+#endif
+
+#if defined(PNG_READ_INVERT_ALPHA_SUPPORTED) || \
+    defined(PNG_WRITE_INVERT_ALPHA_SUPPORTED)
+void PNGAPI
+png_set_invert_alpha(png_structp png_ptr)
+{
+   png_debug(1, "in png_set_invert_alpha\n");
+   if(png_ptr == NULL) return;
+   png_ptr->transformations |= PNG_INVERT_ALPHA;
+}
+#endif
+
+#if defined(PNG_READ_INVERT_SUPPORTED) || defined(PNG_WRITE_INVERT_SUPPORTED)
+void PNGAPI
+png_set_invert_mono(png_structp png_ptr)
+{
+   png_debug(1, "in png_set_invert_mono\n");
+   if(png_ptr == NULL) return;
+   png_ptr->transformations |= PNG_INVERT_MONO;
+}
+
+/* invert monochrome grayscale data */
+void /* PRIVATE */
+png_do_invert(png_row_infop row_info, png_bytep row)
+{
+   png_debug(1, "in png_do_invert\n");
+  /* This test removed from libpng version 1.0.13 and 1.2.0:
+   *   if (row_info->bit_depth == 1 &&
+   */
+#if defined(PNG_USELESS_TESTS_SUPPORTED)
+   if (row == NULL || row_info == NULL)
+     return;
+#endif
+   if (row_info->color_type == PNG_COLOR_TYPE_GRAY)
+   {
+      png_bytep rp = row;
+      png_uint_32 i;
+      png_uint_32 istop = row_info->rowbytes;
+
+      for (i = 0; i < istop; i++)
+      {
+         *rp = (png_byte)(~(*rp));
+         rp++;
+      }
+   }
+   else if (row_info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA &&
+      row_info->bit_depth == 8)
+   {
+      png_bytep rp = row;
+      png_uint_32 i;
+      png_uint_32 istop = row_info->rowbytes;
+
+      for (i = 0; i < istop; i+=2)
+      {
+         *rp = (png_byte)(~(*rp));
+         rp+=2;
+      }
+   }
+   else if (row_info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA &&
+      row_info->bit_depth == 16)
+   {
+      png_bytep rp = row;
+      png_uint_32 i;
+      png_uint_32 istop = row_info->rowbytes;
+
+      for (i = 0; i < istop; i+=4)
+      {
+         *rp = (png_byte)(~(*rp));
+         *(rp+1) = (png_byte)(~(*(rp+1)));
+         rp+=4;
+      }
+   }
+}
+#endif
+
+#if defined(PNG_READ_SWAP_SUPPORTED) || defined(PNG_WRITE_SWAP_SUPPORTED)
+/* swaps byte order on 16 bit depth images */
+void /* PRIVATE */
+png_do_swap(png_row_infop row_info, png_bytep row)
+{
+   png_debug(1, "in png_do_swap\n");
+   if (
+#if defined(PNG_USELESS_TESTS_SUPPORTED)
+       row != NULL && row_info != NULL &&
+#endif
+       row_info->bit_depth == 16)
+   {
+      png_bytep rp = row;
+      png_uint_32 i;
+      png_uint_32 istop= row_info->width * row_info->channels;
+
+      for (i = 0; i < istop; i++, rp += 2)
+      {
+         png_byte t = *rp;
+         *rp = *(rp + 1);
+         *(rp + 1) = t;
+      }
+   }
+}
+#endif
+
+#if defined(PNG_READ_PACKSWAP_SUPPORTED)||defined(PNG_WRITE_PACKSWAP_SUPPORTED)
+static PNG_CONST png_byte onebppswaptable[256] = {
+   0x00, 0x80, 0x40, 0xC0, 0x20, 0xA0, 0x60, 0xE0,
+   0x10, 0x90, 0x50, 0xD0, 0x30, 0xB0, 0x70, 0xF0,
+   0x08, 0x88, 0x48, 0xC8, 0x28, 0xA8, 0x68, 0xE8,
+   0x18, 0x98, 0x58, 0xD8, 0x38, 0xB8, 0x78, 0xF8,
+   0x04, 0x84, 0x44, 0xC4, 0x24, 0xA4, 0x64, 0xE4,
+   0x14, 0x94, 0x54, 0xD4, 0x34, 0xB4, 0x74, 0xF4,
+   0x0C, 0x8C, 0x4C, 0xCC, 0x2C, 0xAC, 0x6C, 0xEC,
+   0x1C, 0x9C, 0x5C, 0xDC, 0x3C, 0xBC, 0x7C, 0xFC,
+   0x02, 0x82, 0x42, 0xC2, 0x22, 0xA2, 0x62, 0xE2,
+   0x12, 0x92, 0x52, 0xD2, 0x32, 0xB2, 0x72, 0xF2,
+   0x0A, 0x8A, 0x4A, 0xCA, 0x2A, 0xAA, 0x6A, 0xEA,
+   0x1A, 0x9A, 0x5A, 0xDA, 0x3A, 0xBA, 0x7A, 0xFA,
+   0x06, 0x86, 0x46, 0xC6, 0x26, 0xA6, 0x66, 0xE6,
+   0x16, 0x96, 0x56, 0xD6, 0x36, 0xB6, 0x76, 0xF6,
+   0x0E, 0x8E, 0x4E, 0xCE, 0x2E, 0xAE, 0x6E, 0xEE,
+   0x1E, 0x9E, 0x5E, 0xDE, 0x3E, 0xBE, 0x7E, 0xFE,
+   0x01, 0x81, 0x41, 0xC1, 0x21, 0xA1, 0x61, 0xE1,
+   0x11, 0x91, 0x51, 0xD1, 0x31, 0xB1, 0x71, 0xF1,
+   0x09, 0x89, 0x49, 0xC9, 0x29, 0xA9, 0x69, 0xE9,
+   0x19, 0x99, 0x59, 0xD9, 0x39, 0xB9, 0x79, 0xF9,
+   0x05, 0x85, 0x45, 0xC5, 0x25, 0xA5, 0x65, 0xE5,
+   0x15, 0x95, 0x55, 0xD5, 0x35, 0xB5, 0x75, 0xF5,
+   0x0D, 0x8D, 0x4D, 0xCD, 0x2D, 0xAD, 0x6D, 0xED,
+   0x1D, 0x9D, 0x5D, 0xDD, 0x3D, 0xBD, 0x7D, 0xFD,
+   0x03, 0x83, 0x43, 0xC3, 0x23, 0xA3, 0x63, 0xE3,
+   0x13, 0x93, 0x53, 0xD3, 0x33, 0xB3, 0x73, 0xF3,
+   0x0B, 0x8B, 0x4B, 0xCB, 0x2B, 0xAB, 0x6B, 0xEB,
+   0x1B, 0x9B, 0x5B, 0xDB, 0x3B, 0xBB, 0x7B, 0xFB,
+   0x07, 0x87, 0x47, 0xC7, 0x27, 0xA7, 0x67, 0xE7,
+   0x17, 0x97, 0x57, 0xD7, 0x37, 0xB7, 0x77, 0xF7,
+   0x0F, 0x8F, 0x4F, 0xCF, 0x2F, 0xAF, 0x6F, 0xEF,
+   0x1F, 0x9F, 0x5F, 0xDF, 0x3F, 0xBF, 0x7F, 0xFF
+};
+
+static PNG_CONST png_byte twobppswaptable[256] = {
+   0x00, 0x40, 0x80, 0xC0, 0x10, 0x50, 0x90, 0xD0,
+   0x20, 0x60, 0xA0, 0xE0, 0x30, 0x70, 0xB0, 0xF0,
+   0x04, 0x44, 0x84, 0xC4, 0x14, 0x54, 0x94, 0xD4,
+   0x24, 0x64, 0xA4, 0xE4, 0x34, 0x74, 0xB4, 0xF4,
+   0x08, 0x48, 0x88, 0xC8, 0x18, 0x58, 0x98, 0xD8,
+   0x28, 0x68, 0xA8, 0xE8, 0x38, 0x78, 0xB8, 0xF8,
+   0x0C, 0x4C, 0x8C, 0xCC, 0x1C, 0x5C, 0x9C, 0xDC,
+   0x2C, 0x6C, 0xAC, 0xEC, 0x3C, 0x7C, 0xBC, 0xFC,
+   0x01, 0x41, 0x81, 0xC1, 0x11, 0x51, 0x91, 0xD1,
+   0x21, 0x61, 0xA1, 0xE1, 0x31, 0x71, 0xB1, 0xF1,
+   0x05, 0x45, 0x85, 0xC5, 0x15, 0x55, 0x95, 0xD5,
+   0x25, 0x65, 0xA5, 0xE5, 0x35, 0x75, 0xB5, 0xF5,
+   0x09, 0x49, 0x89, 0xC9, 0x19, 0x59, 0x99, 0xD9,
+   0x29, 0x69, 0xA9, 0xE9, 0x39, 0x79, 0xB9, 0xF9,
+   0x0D, 0x4D, 0x8D, 0xCD, 0x1D, 0x5D, 0x9D, 0xDD,
+   0x2D, 0x6D, 0xAD, 0xED, 0x3D, 0x7D, 0xBD, 0xFD,
+   0x02, 0x42, 0x82, 0xC2, 0x12, 0x52, 0x92, 0xD2,
+   0x22, 0x62, 0xA2, 0xE2, 0x32, 0x72, 0xB2, 0xF2,
+   0x06, 0x46, 0x86, 0xC6, 0x16, 0x56, 0x96, 0xD6,
+   0x26, 0x66, 0xA6, 0xE6, 0x36, 0x76, 0xB6, 0xF6,
+   0x0A, 0x4A, 0x8A, 0xCA, 0x1A, 0x5A, 0x9A, 0xDA,
+   0x2A, 0x6A, 0xAA, 0xEA, 0x3A, 0x7A, 0xBA, 0xFA,
+   0x0E, 0x4E, 0x8E, 0xCE, 0x1E, 0x5E, 0x9E, 0xDE,
+   0x2E, 0x6E, 0xAE, 0xEE, 0x3E, 0x7E, 0xBE, 0xFE,
+   0x03, 0x43, 0x83, 0xC3, 0x13, 0x53, 0x93, 0xD3,
+   0x23, 0x63, 0xA3, 0xE3, 0x33, 0x73, 0xB3, 0xF3,
+   0x07, 0x47, 0x87, 0xC7, 0x17, 0x57, 0x97, 0xD7,
+   0x27, 0x67, 0xA7, 0xE7, 0x37, 0x77, 0xB7, 0xF7,
+   0x0B, 0x4B, 0x8B, 0xCB, 0x1B, 0x5B, 0x9B, 0xDB,
+   0x2B, 0x6B, 0xAB, 0xEB, 0x3B, 0x7B, 0xBB, 0xFB,
+   0x0F, 0x4F, 0x8F, 0xCF, 0x1F, 0x5F, 0x9F, 0xDF,
+   0x2F, 0x6F, 0xAF, 0xEF, 0x3F, 0x7F, 0xBF, 0xFF
+};
+
+static PNG_CONST png_byte fourbppswaptable[256] = {
+   0x00, 0x10, 0x20, 0x30, 0x40, 0x50, 0x60, 0x70,
+   0x80, 0x90, 0xA0, 0xB0, 0xC0, 0xD0, 0xE0, 0xF0,
+   0x01, 0x11, 0x21, 0x31, 0x41, 0x51, 0x61, 0x71,
+   0x81, 0x91, 0xA1, 0xB1, 0xC1, 0xD1, 0xE1, 0xF1,
+   0x02, 0x12, 0x22, 0x32, 0x42, 0x52, 0x62, 0x72,
+   0x82, 0x92, 0xA2, 0xB2, 0xC2, 0xD2, 0xE2, 0xF2,
+   0x03, 0x13, 0x23, 0x33, 0x43, 0x53, 0x63, 0x73,
+   0x83, 0x93, 0xA3, 0xB3, 0xC3, 0xD3, 0xE3, 0xF3,
+   0x04, 0x14, 0x24, 0x34, 0x44, 0x54, 0x64, 0x74,
+   0x84, 0x94, 0xA4, 0xB4, 0xC4, 0xD4, 0xE4, 0xF4,
+   0x05, 0x15, 0x25, 0x35, 0x45, 0x55, 0x65, 0x75,
+   0x85, 0x95, 0xA5, 0xB5, 0xC5, 0xD5, 0xE5, 0xF5,
+   0x06, 0x16, 0x26, 0x36, 0x46, 0x56, 0x66, 0x76,
+   0x86, 0x96, 0xA6, 0xB6, 0xC6, 0xD6, 0xE6, 0xF6,
+   0x07, 0x17, 0x27, 0x37, 0x47, 0x57, 0x67, 0x77,
+   0x87, 0x97, 0xA7, 0xB7, 0xC7, 0xD7, 0xE7, 0xF7,
+   0x08, 0x18, 0x28, 0x38, 0x48, 0x58, 0x68, 0x78,
+   0x88, 0x98, 0xA8, 0xB8, 0xC8, 0xD8, 0xE8, 0xF8,
+   0x09, 0x19, 0x29, 0x39, 0x49, 0x59, 0x69, 0x79,
+   0x89, 0x99, 0xA9, 0xB9, 0xC9, 0xD9, 0xE9, 0xF9,
+   0x0A, 0x1A, 0x2A, 0x3A, 0x4A, 0x5A, 0x6A, 0x7A,
+   0x8A, 0x9A, 0xAA, 0xBA, 0xCA, 0xDA, 0xEA, 0xFA,
+   0x0B, 0x1B, 0x2B, 0x3B, 0x4B, 0x5B, 0x6B, 0x7B,
+   0x8B, 0x9B, 0xAB, 0xBB, 0xCB, 0xDB, 0xEB, 0xFB,
+   0x0C, 0x1C, 0x2C, 0x3C, 0x4C, 0x5C, 0x6C, 0x7C,
+   0x8C, 0x9C, 0xAC, 0xBC, 0xCC, 0xDC, 0xEC, 0xFC,
+   0x0D, 0x1D, 0x2D, 0x3D, 0x4D, 0x5D, 0x6D, 0x7D,
+   0x8D, 0x9D, 0xAD, 0xBD, 0xCD, 0xDD, 0xED, 0xFD,
+   0x0E, 0x1E, 0x2E, 0x3E, 0x4E, 0x5E, 0x6E, 0x7E,
+   0x8E, 0x9E, 0xAE, 0xBE, 0xCE, 0xDE, 0xEE, 0xFE,
+   0x0F, 0x1F, 0x2F, 0x3F, 0x4F, 0x5F, 0x6F, 0x7F,
+   0x8F, 0x9F, 0xAF, 0xBF, 0xCF, 0xDF, 0xEF, 0xFF
+};
+
+/* swaps pixel packing order within bytes */
+void /* PRIVATE */
+png_do_packswap(png_row_infop row_info, png_bytep row)
+{
+   png_debug(1, "in png_do_packswap\n");
+   if (
+#if defined(PNG_USELESS_TESTS_SUPPORTED)
+       row != NULL && row_info != NULL &&
+#endif
+       row_info->bit_depth < 8)
+   {
+      png_bytep rp, end, table;
+
+      end = row + row_info->rowbytes;
+
+      if (row_info->bit_depth == 1)
+         table = (png_bytep)onebppswaptable;
+      else if (row_info->bit_depth == 2)
+         table = (png_bytep)twobppswaptable;
+      else if (row_info->bit_depth == 4)
+         table = (png_bytep)fourbppswaptable;
+      else
+         return;
+
+      for (rp = row; rp < end; rp++)
+         *rp = table[*rp];
+   }
+}
+#endif /* PNG_READ_PACKSWAP_SUPPORTED or PNG_WRITE_PACKSWAP_SUPPORTED */
+
+#if defined(PNG_WRITE_FILLER_SUPPORTED) || \
+    defined(PNG_READ_STRIP_ALPHA_SUPPORTED)
+/* remove filler or alpha byte(s) */
+void /* PRIVATE */
+png_do_strip_filler(png_row_infop row_info, png_bytep row, png_uint_32 flags)
+{
+   png_debug(1, "in png_do_strip_filler\n");
+#if defined(PNG_USELESS_TESTS_SUPPORTED)
+   if (row != NULL && row_info != NULL)
+#endif
+   {
+      png_bytep sp=row;
+      png_bytep dp=row;
+      png_uint_32 row_width=row_info->width;
+      png_uint_32 i;
+
+      if ((row_info->color_type == PNG_COLOR_TYPE_RGB ||
+         (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA &&
+         (flags & PNG_FLAG_STRIP_ALPHA))) &&
+         row_info->channels == 4)
+      {
+         if (row_info->bit_depth == 8)
+         {
+            /* This converts from RGBX or RGBA to RGB */
+            if (flags & PNG_FLAG_FILLER_AFTER)
+            {
+               dp+=3; sp+=4;
+               for (i = 1; i < row_width; i++)
+               {
+                  *dp++ = *sp++;
+                  *dp++ = *sp++;
+                  *dp++ = *sp++;
+                  sp++;
+               }
+            }
+            /* This converts from XRGB or ARGB to RGB */
+            else
+            {
+               for (i = 0; i < row_width; i++)
+               {
+                  sp++;
+                  *dp++ = *sp++;
+                  *dp++ = *sp++;
+                  *dp++ = *sp++;
+               }
+            }
+            row_info->pixel_depth = 24;
+            row_info->rowbytes = row_width * 3;
+         }
+         else /* if (row_info->bit_depth == 16) */
+         {
+            if (flags & PNG_FLAG_FILLER_AFTER)
+            {
+               /* This converts from RRGGBBXX or RRGGBBAA to RRGGBB */
+               sp += 8; dp += 6;
+               for (i = 1; i < row_width; i++)
+               {
+                  /* This could be (although png_memcpy is probably slower):
+                  png_memcpy(dp, sp, 6);
+                  sp += 8;
+                  dp += 6;
+                  */
+
+                  *dp++ = *sp++;
+                  *dp++ = *sp++;
+                  *dp++ = *sp++;
+                  *dp++ = *sp++;
+                  *dp++ = *sp++;
+                  *dp++ = *sp++;
+                  sp += 2;
+               }
+            }
+            else
+            {
+               /* This converts from XXRRGGBB or AARRGGBB to RRGGBB */
+               for (i = 0; i < row_width; i++)
+               {
+                  /* This could be (although png_memcpy is probably slower):
+                  png_memcpy(dp, sp, 6);
+                  sp += 8;
+                  dp += 6;
+                  */
+
+                  sp+=2;
+                  *dp++ = *sp++;
+                  *dp++ = *sp++;
+                  *dp++ = *sp++;
+                  *dp++ = *sp++;
+                  *dp++ = *sp++;
+                  *dp++ = *sp++;
+               }
+            }
+            row_info->pixel_depth = 48;
+            row_info->rowbytes = row_width * 6;
+         }
+         row_info->channels = 3;
+      }
+      else if ((row_info->color_type == PNG_COLOR_TYPE_GRAY ||
+         (row_info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA &&
+         (flags & PNG_FLAG_STRIP_ALPHA))) &&
+          row_info->channels == 2)
+      {
+         if (row_info->bit_depth == 8)
+         {
+            /* This converts from GX or GA to G */
+            if (flags & PNG_FLAG_FILLER_AFTER)
+            {
+               for (i = 0; i < row_width; i++)
+               {
+                  *dp++ = *sp++;
+                  sp++;
+               }
+            }
+            /* This converts from XG or AG to G */
+            else
+            {
+               for (i = 0; i < row_width; i++)
+               {
+                  sp++;
+                  *dp++ = *sp++;
+               }
+            }
+            row_info->pixel_depth = 8;
+            row_info->rowbytes = row_width;
+         }
+         else /* if (row_info->bit_depth == 16) */
+         {
+            if (flags & PNG_FLAG_FILLER_AFTER)
+            {
+               /* This converts from GGXX or GGAA to GG */
+               sp += 4; dp += 2;
+               for (i = 1; i < row_width; i++)
+               {
+                  *dp++ = *sp++;
+                  *dp++ = *sp++;
+                  sp += 2;
+               }
+            }
+            else
+            {
+               /* This converts from XXGG or AAGG to GG */
+               for (i = 0; i < row_width; i++)
+               {
+                  sp += 2;
+                  *dp++ = *sp++;
+                  *dp++ = *sp++;
+               }
+            }
+            row_info->pixel_depth = 16;
+            row_info->rowbytes = row_width * 2;
+         }
+         row_info->channels = 1;
+      }
+      if (flags & PNG_FLAG_STRIP_ALPHA)
+        row_info->color_type &= ~PNG_COLOR_MASK_ALPHA;
+   }
+}
+#endif
+
+#if defined(PNG_READ_BGR_SUPPORTED) || defined(PNG_WRITE_BGR_SUPPORTED)
+/* swaps red and blue bytes within a pixel */
+void /* PRIVATE */
+png_do_bgr(png_row_infop row_info, png_bytep row)
+{
+   png_debug(1, "in png_do_bgr\n");
+   if (
+#if defined(PNG_USELESS_TESTS_SUPPORTED)
+       row != NULL && row_info != NULL &&
+#endif
+       (row_info->color_type & PNG_COLOR_MASK_COLOR))
+   {
+      png_uint_32 row_width = row_info->width;
+      if (row_info->bit_depth == 8)
+      {
+         if (row_info->color_type == PNG_COLOR_TYPE_RGB)
+         {
+            png_bytep rp;
+            png_uint_32 i;
+
+            for (i = 0, rp = row; i < row_width; i++, rp += 3)
+            {
+               png_byte save = *rp;
+               *rp = *(rp + 2);
+               *(rp + 2) = save;
+            }
+         }
+         else if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
+         {
+            png_bytep rp;
+            png_uint_32 i;
+
+            for (i = 0, rp = row; i < row_width; i++, rp += 4)
+            {
+               png_byte save = *rp;
+               *rp = *(rp + 2);
+               *(rp + 2) = save;
+            }
+         }
+      }
+      else if (row_info->bit_depth == 16)
+      {
+         if (row_info->color_type == PNG_COLOR_TYPE_RGB)
+         {
+            png_bytep rp;
+            png_uint_32 i;
+
+            for (i = 0, rp = row; i < row_width; i++, rp += 6)
+            {
+               png_byte save = *rp;
+               *rp = *(rp + 4);
+               *(rp + 4) = save;
+               save = *(rp + 1);
+               *(rp + 1) = *(rp + 5);
+               *(rp + 5) = save;
+            }
+         }
+         else if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
+         {
+            png_bytep rp;
+            png_uint_32 i;
+
+            for (i = 0, rp = row; i < row_width; i++, rp += 8)
+            {
+               png_byte save = *rp;
+               *rp = *(rp + 4);
+               *(rp + 4) = save;
+               save = *(rp + 1);
+               *(rp + 1) = *(rp + 5);
+               *(rp + 5) = save;
+            }
+         }
+      }
+   }
+}
+#endif /* PNG_READ_BGR_SUPPORTED or PNG_WRITE_BGR_SUPPORTED */
+
+#if defined(PNG_READ_USER_TRANSFORM_SUPPORTED) || \
+    defined(PNG_WRITE_USER_TRANSFORM_SUPPORTED) || \
+    defined(PNG_LEGACY_SUPPORTED)
+void PNGAPI
+png_set_user_transform_info(png_structp png_ptr, png_voidp
+   user_transform_ptr, int user_transform_depth, int user_transform_channels)
+{
+   png_debug(1, "in png_set_user_transform_info\n");
+   if(png_ptr == NULL) return;
+#if defined(PNG_USER_TRANSFORM_PTR_SUPPORTED)
+   png_ptr->user_transform_ptr = user_transform_ptr;
+   png_ptr->user_transform_depth = (png_byte)user_transform_depth;
+   png_ptr->user_transform_channels = (png_byte)user_transform_channels;
+#else
+   if(user_transform_ptr || user_transform_depth || user_transform_channels)
+      png_warning(png_ptr,
+        "This version of libpng does not support user transform info");
+#endif
+}
+#endif
+
+/* This function returns a pointer to the user_transform_ptr associated with
+ * the user transform functions.  The application should free any memory
+ * associated with this pointer before png_write_destroy and png_read_destroy
+ * are called.
+ */
+png_voidp PNGAPI
+png_get_user_transform_ptr(png_structp png_ptr)
+{
+#if defined(PNG_USER_TRANSFORM_PTR_SUPPORTED)
+   if (png_ptr == NULL) return (NULL);
+   return ((png_voidp)png_ptr->user_transform_ptr);
+#else
+   return (NULL);
+#endif
+}
+#endif /* PNG_READ_SUPPORTED || PNG_WRITE_SUPPORTED */
diff --git a/uppsrc/plugin/png/lib/pngvcrd.c b/uppsrc/plugin/png/lib/pngvcrd.c
new file mode 100644
index 000000000..ce4233efe
--- /dev/null
+++ b/uppsrc/plugin/png/lib/pngvcrd.c
@@ -0,0 +1 @@
+/* pnggvrd.c was removed from libpng-1.2.20. */
diff --git a/uppsrc/plugin/png/lib/pngwio.c b/uppsrc/plugin/png/lib/pngwio.c
new file mode 100644
index 000000000..371a4fad6
--- /dev/null
+++ b/uppsrc/plugin/png/lib/pngwio.c
@@ -0,0 +1,234 @@
+
+/* pngwio.c - functions for data output
+ *
+ * Last changed in libpng 1.2.13 November 13, 2006
+ * For conditions of distribution and use, see copyright notice in png.h
+ * Copyright (c) 1998-2006 Glenn Randers-Pehrson
+ * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
+ * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
+ *
+ * This file provides a location for all output.  Users who need
+ * special handling are expected to write functions that have the same
+ * arguments as these and perform similar functions, but that possibly
+ * use different output methods.  Note that you shouldn't change these
+ * functions, but rather write replacement functions and then change
+ * them at run time with png_set_write_fn(...).
+ */
+
+#define PNG_INTERNAL
+#include "png.h"
+#ifdef PNG_WRITE_SUPPORTED
+
+/* Write the data to whatever output you are using.  The default routine
+   writes to a file pointer.  Note that this routine sometimes gets called
+   with very small lengths, so you should implement some kind of simple
+   buffering if you are using unbuffered writes.  This should never be asked
+   to write more than 64K on a 16 bit machine.  */
+
+void /* PRIVATE */
+png_write_data(png_structp png_ptr, png_bytep data, png_size_t length)
+{
+   if (png_ptr->write_data_fn != NULL )
+      (*(png_ptr->write_data_fn))(png_ptr, data, length);
+   else
+      png_error(png_ptr, "Call to NULL write function");
+}
+
+#if !defined(PNG_NO_STDIO)
+/* This is the function that does the actual writing of data.  If you are
+   not writing to a standard C stream, you should create a replacement
+   write_data function and use it at run time with png_set_write_fn(), rather
+   than changing the library. */
+#ifndef USE_FAR_KEYWORD
+void PNGAPI
+png_default_write_data(png_structp png_ptr, png_bytep data, png_size_t length)
+{
+   png_uint_32 check;
+
+   if(png_ptr == NULL) return;
+#if defined(_WIN32_WCE)
+   if ( !WriteFile((HANDLE)(png_ptr->io_ptr), data, length, &check, NULL) )
+      check = 0;
+#else
+   check = fwrite(data, 1, length, (png_FILE_p)(png_ptr->io_ptr));
+#endif
+   if (check != length)
+      png_error(png_ptr, "Write Error");
+}
+#else
+/* this is the model-independent version. Since the standard I/O library
+   can't handle far buffers in the medium and small models, we have to copy
+   the data.
+*/
+
+#define NEAR_BUF_SIZE 1024
+#define MIN(a,b) (a <= b ? a : b)
+
+void PNGAPI
+png_default_write_data(png_structp png_ptr, png_bytep data, png_size_t length)
+{
+   png_uint_32 check;
+   png_byte *near_data;  /* Needs to be "png_byte *" instead of "png_bytep" */
+   png_FILE_p io_ptr;
+
+   if(png_ptr == NULL) return;
+   /* Check if data really is near. If so, use usual code. */
+   near_data = (png_byte *)CVT_PTR_NOCHECK(data);
+   io_ptr = (png_FILE_p)CVT_PTR(png_ptr->io_ptr);
+   if ((png_bytep)near_data == data)
+   {
+#if defined(_WIN32_WCE)
+      if ( !WriteFile(io_ptr, near_data, length, &check, NULL) )
+         check = 0;
+#else
+      check = fwrite(near_data, 1, length, io_ptr);
+#endif
+   }
+   else
+   {
+      png_byte buf[NEAR_BUF_SIZE];
+      png_size_t written, remaining, err;
+      check = 0;
+      remaining = length;
+      do
+      {
+         written = MIN(NEAR_BUF_SIZE, remaining);
+         png_memcpy(buf, data, written); /* copy far buffer to near buffer */
+#if defined(_WIN32_WCE)
+         if ( !WriteFile(io_ptr, buf, written, &err, NULL) )
+            err = 0;
+#else
+         err = fwrite(buf, 1, written, io_ptr);
+#endif
+         if (err != written)
+            break;
+         else
+            check += err;
+         data += written;
+         remaining -= written;
+      }
+      while (remaining != 0);
+   }
+   if (check != length)
+      png_error(png_ptr, "Write Error");
+}
+
+#endif
+#endif
+
+/* This function is called to output any data pending writing (normally
+   to disk).  After png_flush is called, there should be no data pending
+   writing in any buffers. */
+#if defined(PNG_WRITE_FLUSH_SUPPORTED)
+void /* PRIVATE */
+png_flush(png_structp png_ptr)
+{
+   if (png_ptr->output_flush_fn != NULL)
+      (*(png_ptr->output_flush_fn))(png_ptr);
+}
+
+#if !defined(PNG_NO_STDIO)
+void PNGAPI
+png_default_flush(png_structp png_ptr)
+{
+#if !defined(_WIN32_WCE)
+   png_FILE_p io_ptr;
+#endif
+   if(png_ptr == NULL) return;
+#if !defined(_WIN32_WCE)
+   io_ptr = (png_FILE_p)CVT_PTR((png_ptr->io_ptr));
+   if (io_ptr != NULL)
+      fflush(io_ptr);
+#endif
+}
+#endif
+#endif
+
+/* This function allows the application to supply new output functions for
+   libpng if standard C streams aren't being used.
+
+   This function takes as its arguments:
+   png_ptr       - pointer to a png output data structure
+   io_ptr        - pointer to user supplied structure containing info about
+                   the output functions.  May be NULL.
+   write_data_fn - pointer to a new output function that takes as its
+                   arguments a pointer to a png_struct, a pointer to
+                   data to be written, and a 32-bit unsigned int that is
+                   the number of bytes to be written.  The new write
+                   function should call png_error(png_ptr, "Error msg")
+                   to exit and output any fatal error messages.
+   flush_data_fn - pointer to a new flush function that takes as its
+                   arguments a pointer to a png_struct.  After a call to
+                   the flush function, there should be no data in any buffers
+                   or pending transmission.  If the output method doesn't do
+                   any buffering of ouput, a function prototype must still be
+                   supplied although it doesn't have to do anything.  If
+                   PNG_WRITE_FLUSH_SUPPORTED is not defined at libpng compile
+                   time, output_flush_fn will be ignored, although it must be
+                   supplied for compatibility. */
+void PNGAPI
+png_set_write_fn(png_structp png_ptr, png_voidp io_ptr,
+   png_rw_ptr write_data_fn, png_flush_ptr output_flush_fn)
+{
+   if(png_ptr == NULL) return;
+   png_ptr->io_ptr = io_ptr;
+
+#if !defined(PNG_NO_STDIO)
+   if (write_data_fn != NULL)
+      png_ptr->write_data_fn = write_data_fn;
+   else
+      png_ptr->write_data_fn = png_default_write_data;
+#else
+   png_ptr->write_data_fn = write_data_fn;
+#endif
+
+#if defined(PNG_WRITE_FLUSH_SUPPORTED)
+#if !defined(PNG_NO_STDIO)
+   if (output_flush_fn != NULL)
+      png_ptr->output_flush_fn = output_flush_fn;
+   else
+      png_ptr->output_flush_fn = png_default_flush;
+#else
+   png_ptr->output_flush_fn = output_flush_fn;
+#endif
+#endif /* PNG_WRITE_FLUSH_SUPPORTED */
+
+   /* It is an error to read while writing a png file */
+   if (png_ptr->read_data_fn != NULL)
+   {
+      png_ptr->read_data_fn = NULL;
+      png_warning(png_ptr,
+         "Attempted to set both read_data_fn and write_data_fn in");
+      png_warning(png_ptr,
+         "the same structure.  Resetting read_data_fn to NULL.");
+   }
+}
+
+#if defined(USE_FAR_KEYWORD)
+#if defined(_MSC_VER)
+void *png_far_to_near(png_structp png_ptr,png_voidp ptr, int check)
+{
+   void *near_ptr;
+   void FAR *far_ptr;
+   FP_OFF(near_ptr) = FP_OFF(ptr);
+   far_ptr = (void FAR *)near_ptr;
+   if(check != 0)
+      if(FP_SEG(ptr) != FP_SEG(far_ptr))
+         png_error(png_ptr,"segment lost in conversion");
+   return(near_ptr);
+}
+#  else
+void *png_far_to_near(png_structp png_ptr,png_voidp ptr, int check)
+{
+   void *near_ptr;
+   void FAR *far_ptr;
+   near_ptr = (void FAR *)ptr;
+   far_ptr = (void FAR *)near_ptr;
+   if(check != 0)
+      if(far_ptr != ptr)
+         png_error(png_ptr,"segment lost in conversion");
+   return(near_ptr);
+}
+#   endif
+#   endif
+#endif /* PNG_WRITE_SUPPORTED */
diff --git a/uppsrc/plugin/png/lib/pngwrite.c b/uppsrc/plugin/png/lib/pngwrite.c
new file mode 100644
index 000000000..c6df1ef34
--- /dev/null
+++ b/uppsrc/plugin/png/lib/pngwrite.c
@@ -0,0 +1,1514 @@
+
+/* pngwrite.c - general routines to write a PNG file
+ *
+ * Last changed in libpng 1.2.15 January 5, 2007
+ * For conditions of distribution and use, see copyright notice in png.h
+ * Copyright (c) 1998-2007 Glenn Randers-Pehrson
+ * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
+ * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
+ */
+
+/* get internal access to png.h */
+#define PNG_INTERNAL
+#include "png.h"
+#ifdef PNG_WRITE_SUPPORTED
+
+/* Writes all the PNG information.  This is the suggested way to use the
+ * library.  If you have a new chunk to add, make a function to write it,
+ * and put it in the correct location here.  If you want the chunk written
+ * after the image data, put it in png_write_end().  I strongly encourage
+ * you to supply a PNG_INFO_ flag, and check info_ptr->valid before writing
+ * the chunk, as that will keep the code from breaking if you want to just
+ * write a plain PNG file.  If you have long comments, I suggest writing
+ * them in png_write_end(), and compressing them.
+ */
+void PNGAPI
+png_write_info_before_PLTE(png_structp png_ptr, png_infop info_ptr)
+{
+   png_debug(1, "in png_write_info_before_PLTE\n");
+   if (png_ptr == NULL || info_ptr == NULL)
+      return;
+   if (!(png_ptr->mode & PNG_WROTE_INFO_BEFORE_PLTE))
+   {
+   png_write_sig(png_ptr); /* write PNG signature */
+#if defined(PNG_MNG_FEATURES_SUPPORTED)
+   if((png_ptr->mode&PNG_HAVE_PNG_SIGNATURE)&&(png_ptr->mng_features_permitted))
+   {
+      png_warning(png_ptr,"MNG features are not allowed in a PNG datastream");
+      png_ptr->mng_features_permitted=0;
+   }
+#endif
+   /* write IHDR information. */
+   png_write_IHDR(png_ptr, info_ptr->width, info_ptr->height,
+      info_ptr->bit_depth, info_ptr->color_type, info_ptr->compression_type,
+      info_ptr->filter_type,
+#if defined(PNG_WRITE_INTERLACING_SUPPORTED)
+      info_ptr->interlace_type);
+#else
+      0);
+#endif
+   /* the rest of these check to see if the valid field has the appropriate
+      flag set, and if it does, writes the chunk. */
+#if defined(PNG_WRITE_gAMA_SUPPORTED)
+   if (info_ptr->valid & PNG_INFO_gAMA)
+   {
+#  ifdef PNG_FLOATING_POINT_SUPPORTED
+      png_write_gAMA(png_ptr, info_ptr->gamma);
+#else
+#ifdef PNG_FIXED_POINT_SUPPORTED
+      png_write_gAMA_fixed(png_ptr, info_ptr->int_gamma);
+#  endif
+#endif
+   }
+#endif
+#if defined(PNG_WRITE_sRGB_SUPPORTED)
+   if (info_ptr->valid & PNG_INFO_sRGB)
+      png_write_sRGB(png_ptr, (int)info_ptr->srgb_intent);
+#endif
+#if defined(PNG_WRITE_iCCP_SUPPORTED)
+   if (info_ptr->valid & PNG_INFO_iCCP)
+      png_write_iCCP(png_ptr, info_ptr->iccp_name, PNG_COMPRESSION_TYPE_BASE,
+                     info_ptr->iccp_profile, (int)info_ptr->iccp_proflen);
+#endif
+#if defined(PNG_WRITE_sBIT_SUPPORTED)
+   if (info_ptr->valid & PNG_INFO_sBIT)
+      png_write_sBIT(png_ptr, &(info_ptr->sig_bit), info_ptr->color_type);
+#endif
+#if defined(PNG_WRITE_cHRM_SUPPORTED)
+   if (info_ptr->valid & PNG_INFO_cHRM)
+   {
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+      png_write_cHRM(png_ptr,
+         info_ptr->x_white, info_ptr->y_white,
+         info_ptr->x_red, info_ptr->y_red,
+         info_ptr->x_green, info_ptr->y_green,
+         info_ptr->x_blue, info_ptr->y_blue);
+#else
+#  ifdef PNG_FIXED_POINT_SUPPORTED
+      png_write_cHRM_fixed(png_ptr,
+         info_ptr->int_x_white, info_ptr->int_y_white,
+         info_ptr->int_x_red, info_ptr->int_y_red,
+         info_ptr->int_x_green, info_ptr->int_y_green,
+         info_ptr->int_x_blue, info_ptr->int_y_blue);
+#  endif
+#endif
+   }
+#endif
+#if defined(PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED)
+   if (info_ptr->unknown_chunks_num)
+   {
+       png_unknown_chunk *up;
+
+       png_debug(5, "writing extra chunks\n");
+
+       for (up = info_ptr->unknown_chunks;
+            up < info_ptr->unknown_chunks + info_ptr->unknown_chunks_num;
+            up++)
+       {
+         int keep=png_handle_as_unknown(png_ptr, up->name);
+         if (keep != PNG_HANDLE_CHUNK_NEVER &&
+            up->location && !(up->location & PNG_HAVE_PLTE) &&
+            !(up->location & PNG_HAVE_IDAT) &&
+            ((up->name[3] & 0x20) || keep == PNG_HANDLE_CHUNK_ALWAYS ||
+            (png_ptr->flags & PNG_FLAG_KEEP_UNSAFE_CHUNKS)))
+         {
+            png_write_chunk(png_ptr, up->name, up->data, up->size);
+         }
+       }
+   }
+#endif
+      png_ptr->mode |= PNG_WROTE_INFO_BEFORE_PLTE;
+   }
+}
+
+void PNGAPI
+png_write_info(png_structp png_ptr, png_infop info_ptr)
+{
+#if defined(PNG_WRITE_TEXT_SUPPORTED) || defined(PNG_WRITE_sPLT_SUPPORTED)
+   int i;
+#endif
+
+   png_debug(1, "in png_write_info\n");
+
+   if (png_ptr == NULL || info_ptr == NULL)
+      return;
+
+   png_write_info_before_PLTE(png_ptr, info_ptr);
+
+   if (info_ptr->valid & PNG_INFO_PLTE)
+      png_write_PLTE(png_ptr, info_ptr->palette,
+         (png_uint_32)info_ptr->num_palette);
+   else if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
+      png_error(png_ptr, "Valid palette required for paletted images");
+
+#if defined(PNG_WRITE_tRNS_SUPPORTED)
+   if (info_ptr->valid & PNG_INFO_tRNS)
+      {
+#if defined(PNG_WRITE_INVERT_ALPHA_SUPPORTED)
+         /* invert the alpha channel (in tRNS) */
+         if ((png_ptr->transformations & PNG_INVERT_ALPHA) &&
+            info_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
+         {
+            int j;
+            for (j=0; j<(int)info_ptr->num_trans; j++)
+               info_ptr->trans[j] = (png_byte)(255 - info_ptr->trans[j]);
+         }
+#endif
+      png_write_tRNS(png_ptr, info_ptr->trans, &(info_ptr->trans_values),
+         info_ptr->num_trans, info_ptr->color_type);
+      }
+#endif
+#if defined(PNG_WRITE_bKGD_SUPPORTED)
+   if (info_ptr->valid & PNG_INFO_bKGD)
+      png_write_bKGD(png_ptr, &(info_ptr->background), info_ptr->color_type);
+#endif
+#if defined(PNG_WRITE_hIST_SUPPORTED)
+   if (info_ptr->valid & PNG_INFO_hIST)
+      png_write_hIST(png_ptr, info_ptr->hist, info_ptr->num_palette);
+#endif
+#if defined(PNG_WRITE_oFFs_SUPPORTED)
+   if (info_ptr->valid & PNG_INFO_oFFs)
+      png_write_oFFs(png_ptr, info_ptr->x_offset, info_ptr->y_offset,
+         info_ptr->offset_unit_type);
+#endif
+#if defined(PNG_WRITE_pCAL_SUPPORTED)
+   if (info_ptr->valid & PNG_INFO_pCAL)
+      png_write_pCAL(png_ptr, info_ptr->pcal_purpose, info_ptr->pcal_X0,
+         info_ptr->pcal_X1, info_ptr->pcal_type, info_ptr->pcal_nparams,
+         info_ptr->pcal_units, info_ptr->pcal_params);
+#endif
+#if defined(PNG_WRITE_sCAL_SUPPORTED)
+   if (info_ptr->valid & PNG_INFO_sCAL)
+#if defined(PNG_FLOATING_POINT_SUPPORTED) && !defined(PNG_NO_STDIO)
+      png_write_sCAL(png_ptr, (int)info_ptr->scal_unit,
+          info_ptr->scal_pixel_width, info_ptr->scal_pixel_height);
+#else
+#ifdef PNG_FIXED_POINT_SUPPORTED
+      png_write_sCAL_s(png_ptr, (int)info_ptr->scal_unit,
+          info_ptr->scal_s_width, info_ptr->scal_s_height);
+#else
+      png_warning(png_ptr,
+          "png_write_sCAL not supported; sCAL chunk not written.");
+#endif
+#endif
+#endif
+#if defined(PNG_WRITE_pHYs_SUPPORTED)
+   if (info_ptr->valid & PNG_INFO_pHYs)
+      png_write_pHYs(png_ptr, info_ptr->x_pixels_per_unit,
+         info_ptr->y_pixels_per_unit, info_ptr->phys_unit_type);
+#endif
+#if defined(PNG_WRITE_tIME_SUPPORTED)
+   if (info_ptr->valid & PNG_INFO_tIME)
+   {
+      png_write_tIME(png_ptr, &(info_ptr->mod_time));
+      png_ptr->mode |= PNG_WROTE_tIME;
+   }
+#endif
+#if defined(PNG_WRITE_sPLT_SUPPORTED)
+   if (info_ptr->valid & PNG_INFO_sPLT)
+     for (i = 0; i < (int)info_ptr->splt_palettes_num; i++)
+       png_write_sPLT(png_ptr, info_ptr->splt_palettes + i);
+#endif
+#if defined(PNG_WRITE_TEXT_SUPPORTED)
+   /* Check to see if we need to write text chunks */
+   for (i = 0; i < info_ptr->num_text; i++)
+   {
+      png_debug2(2, "Writing header text chunk %d, type %d\n", i,
+         info_ptr->text[i].compression);
+      /* an internationalized chunk? */
+      if (info_ptr->text[i].compression > 0)
+      {
+#if defined(PNG_WRITE_iTXt_SUPPORTED)
+          /* write international chunk */
+          png_write_iTXt(png_ptr,
+                         info_ptr->text[i].compression,
+                         info_ptr->text[i].key,
+                         info_ptr->text[i].lang,
+                         info_ptr->text[i].lang_key,
+                         info_ptr->text[i].text);
+#else
+          png_warning(png_ptr, "Unable to write international text");
+#endif
+          /* Mark this chunk as written */
+          info_ptr->text[i].compression = PNG_TEXT_COMPRESSION_NONE_WR;
+      }
+      /* If we want a compressed text chunk */
+      else if (info_ptr->text[i].compression == PNG_TEXT_COMPRESSION_zTXt)
+      {
+#if defined(PNG_WRITE_zTXt_SUPPORTED)
+         /* write compressed chunk */
+         png_write_zTXt(png_ptr, info_ptr->text[i].key,
+            info_ptr->text[i].text, 0,
+            info_ptr->text[i].compression);
+#else
+         png_warning(png_ptr, "Unable to write compressed text");
+#endif
+         /* Mark this chunk as written */
+         info_ptr->text[i].compression = PNG_TEXT_COMPRESSION_zTXt_WR;
+      }
+      else if (info_ptr->text[i].compression == PNG_TEXT_COMPRESSION_NONE)
+      {
+#if defined(PNG_WRITE_tEXt_SUPPORTED)
+         /* write uncompressed chunk */
+         png_write_tEXt(png_ptr, info_ptr->text[i].key,
+                         info_ptr->text[i].text,
+                         0);
+#else
+         png_warning(png_ptr, "Unable to write uncompressed text");
+#endif
+         /* Mark this chunk as written */
+         info_ptr->text[i].compression = PNG_TEXT_COMPRESSION_NONE_WR;
+      }
+   }
+#endif
+#if defined(PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED)
+   if (info_ptr->unknown_chunks_num)
+   {
+       png_unknown_chunk *up;
+
+       png_debug(5, "writing extra chunks\n");
+
+       for (up = info_ptr->unknown_chunks;
+            up < info_ptr->unknown_chunks + info_ptr->unknown_chunks_num;
+            up++)
+       {
+         int keep=png_handle_as_unknown(png_ptr, up->name);
+         if (keep != PNG_HANDLE_CHUNK_NEVER &&
+            up->location && (up->location & PNG_HAVE_PLTE) &&
+            !(up->location & PNG_HAVE_IDAT) &&
+            ((up->name[3] & 0x20) || keep == PNG_HANDLE_CHUNK_ALWAYS ||
+            (png_ptr->flags & PNG_FLAG_KEEP_UNSAFE_CHUNKS)))
+         {
+            png_write_chunk(png_ptr, up->name, up->data, up->size);
+         }
+       }
+   }
+#endif
+}
+
+/* Writes the end of the PNG file.  If you don't want to write comments or
+ * time information, you can pass NULL for info.  If you already wrote these
+ * in png_write_info(), do not write them again here.  If you have long
+ * comments, I suggest writing them here, and compressing them.
+ */
+void PNGAPI
+png_write_end(png_structp png_ptr, png_infop info_ptr)
+{
+   png_debug(1, "in png_write_end\n");
+   if (png_ptr == NULL)
+      return;
+   if (!(png_ptr->mode & PNG_HAVE_IDAT))
+      png_error(png_ptr, "No IDATs written into file");
+
+   /* see if user wants us to write information chunks */
+   if (info_ptr != NULL)
+   {
+#if defined(PNG_WRITE_TEXT_SUPPORTED)
+      int i; /* local index variable */
+#endif
+#if defined(PNG_WRITE_tIME_SUPPORTED)
+      /* check to see if user has supplied a time chunk */
+      if ((info_ptr->valid & PNG_INFO_tIME) &&
+         !(png_ptr->mode & PNG_WROTE_tIME))
+         png_write_tIME(png_ptr, &(info_ptr->mod_time));
+#endif
+#if defined(PNG_WRITE_TEXT_SUPPORTED)
+      /* loop through comment chunks */
+      for (i = 0; i < info_ptr->num_text; i++)
+      {
+         png_debug2(2, "Writing trailer text chunk %d, type %d\n", i,
+            info_ptr->text[i].compression);
+         /* an internationalized chunk? */
+         if (info_ptr->text[i].compression > 0)
+         {
+#if defined(PNG_WRITE_iTXt_SUPPORTED)
+             /* write international chunk */
+             png_write_iTXt(png_ptr,
+                         info_ptr->text[i].compression,
+                         info_ptr->text[i].key,
+                         info_ptr->text[i].lang,
+                         info_ptr->text[i].lang_key,
+                         info_ptr->text[i].text);
+#else
+             png_warning(png_ptr, "Unable to write international text");
+#endif
+             /* Mark this chunk as written */
+             info_ptr->text[i].compression = PNG_TEXT_COMPRESSION_NONE_WR;
+         }
+         else if (info_ptr->text[i].compression >= PNG_TEXT_COMPRESSION_zTXt)
+         {
+#if defined(PNG_WRITE_zTXt_SUPPORTED)
+            /* write compressed chunk */
+            png_write_zTXt(png_ptr, info_ptr->text[i].key,
+               info_ptr->text[i].text, 0,
+               info_ptr->text[i].compression);
+#else
+            png_warning(png_ptr, "Unable to write compressed text");
+#endif
+            /* Mark this chunk as written */
+            info_ptr->text[i].compression = PNG_TEXT_COMPRESSION_zTXt_WR;
+         }
+         else if (info_ptr->text[i].compression == PNG_TEXT_COMPRESSION_NONE)
+         {
+#if defined(PNG_WRITE_tEXt_SUPPORTED)
+            /* write uncompressed chunk */
+            png_write_tEXt(png_ptr, info_ptr->text[i].key,
+               info_ptr->text[i].text, 0);
+#else
+            png_warning(png_ptr, "Unable to write uncompressed text");
+#endif
+
+            /* Mark this chunk as written */
+            info_ptr->text[i].compression = PNG_TEXT_COMPRESSION_NONE_WR;
+         }
+      }
+#endif
+#if defined(PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED)
+   if (info_ptr->unknown_chunks_num)
+   {
+       png_unknown_chunk *up;
+
+       png_debug(5, "writing extra chunks\n");
+
+       for (up = info_ptr->unknown_chunks;
+            up < info_ptr->unknown_chunks + info_ptr->unknown_chunks_num;
+            up++)
+       {
+         int keep=png_handle_as_unknown(png_ptr, up->name);
+         if (keep != PNG_HANDLE_CHUNK_NEVER &&
+            up->location && (up->location & PNG_AFTER_IDAT) &&
+            ((up->name[3] & 0x20) || keep == PNG_HANDLE_CHUNK_ALWAYS ||
+            (png_ptr->flags & PNG_FLAG_KEEP_UNSAFE_CHUNKS)))
+         {
+            png_write_chunk(png_ptr, up->name, up->data, up->size);
+         }
+       }
+   }
+#endif
+   }
+
+   png_ptr->mode |= PNG_AFTER_IDAT;
+
+   /* write end of PNG file */
+   png_write_IEND(png_ptr);
+}
+
+#if defined(PNG_WRITE_tIME_SUPPORTED)
+#if !defined(_WIN32_WCE)
+/* "time.h" functions are not supported on WindowsCE */
+void PNGAPI
+png_convert_from_struct_tm(png_timep ptime, struct tm FAR * ttime)
+{
+   png_debug(1, "in png_convert_from_struct_tm\n");
+   ptime->year = (png_uint_16)(1900 + ttime->tm_year);
+   ptime->month = (png_byte)(ttime->tm_mon + 1);
+   ptime->day = (png_byte)ttime->tm_mday;
+   ptime->hour = (png_byte)ttime->tm_hour;
+   ptime->minute = (png_byte)ttime->tm_min;
+   ptime->second = (png_byte)ttime->tm_sec;
+}
+
+void PNGAPI
+png_convert_from_time_t(png_timep ptime, time_t ttime)
+{
+   struct tm *tbuf;
+
+   png_debug(1, "in png_convert_from_time_t\n");
+   tbuf = gmtime(&ttime);
+   png_convert_from_struct_tm(ptime, tbuf);
+}
+#endif
+#endif
+
+/* Initialize png_ptr structure, and allocate any memory needed */
+png_structp PNGAPI
+png_create_write_struct(png_const_charp user_png_ver, png_voidp error_ptr,
+   png_error_ptr error_fn, png_error_ptr warn_fn)
+{
+#ifdef PNG_USER_MEM_SUPPORTED
+   return (png_create_write_struct_2(user_png_ver, error_ptr, error_fn,
+      warn_fn, png_voidp_NULL, png_malloc_ptr_NULL, png_free_ptr_NULL));
+}
+
+/* Alternate initialize png_ptr structure, and allocate any memory needed */
+png_structp PNGAPI
+png_create_write_struct_2(png_const_charp user_png_ver, png_voidp error_ptr,
+   png_error_ptr error_fn, png_error_ptr warn_fn, png_voidp mem_ptr,
+   png_malloc_ptr malloc_fn, png_free_ptr free_fn)
+{
+#endif /* PNG_USER_MEM_SUPPORTED */
+   png_structp png_ptr;
+#ifdef PNG_SETJMP_SUPPORTED
+#ifdef USE_FAR_KEYWORD
+   jmp_buf jmpbuf;
+#endif
+#endif
+   int i;
+   png_debug(1, "in png_create_write_struct\n");
+#ifdef PNG_USER_MEM_SUPPORTED
+   png_ptr = (png_structp)png_create_struct_2(PNG_STRUCT_PNG,
+      (png_malloc_ptr)malloc_fn, (png_voidp)mem_ptr);
+#else
+   png_ptr = (png_structp)png_create_struct(PNG_STRUCT_PNG);
+#endif /* PNG_USER_MEM_SUPPORTED */
+   if (png_ptr == NULL)
+      return (NULL);
+
+   /* added at libpng-1.2.6 */
+#ifdef PNG_SET_USER_LIMITS_SUPPORTED
+   png_ptr->user_width_max=PNG_USER_WIDTH_MAX;
+   png_ptr->user_height_max=PNG_USER_HEIGHT_MAX;
+#endif
+
+#ifdef PNG_SETJMP_SUPPORTED
+#ifdef USE_FAR_KEYWORD
+   if (setjmp(jmpbuf))
+#else
+   if (setjmp(png_ptr->jmpbuf))
+#endif
+   {
+      png_free(png_ptr, png_ptr->zbuf);
+      png_ptr->zbuf=NULL;
+      png_destroy_struct(png_ptr);
+      return (NULL);
+   }
+#ifdef USE_FAR_KEYWORD
+   png_memcpy(png_ptr->jmpbuf,jmpbuf,png_sizeof(jmp_buf));
+#endif
+#endif
+
+#ifdef PNG_USER_MEM_SUPPORTED
+   png_set_mem_fn(png_ptr, mem_ptr, malloc_fn, free_fn);
+#endif /* PNG_USER_MEM_SUPPORTED */
+   png_set_error_fn(png_ptr, error_ptr, error_fn, warn_fn);
+
+   i=0;
+   do
+   {
+     if(user_png_ver[i] != png_libpng_ver[i])
+        png_ptr->flags |= PNG_FLAG_LIBRARY_MISMATCH;
+   } while (png_libpng_ver[i++]);
+
+   if (png_ptr->flags & PNG_FLAG_LIBRARY_MISMATCH)
+   {
+     /* Libpng 0.90 and later are binary incompatible with libpng 0.89, so
+      * we must recompile any applications that use any older library version.
+      * For versions after libpng 1.0, we will be compatible, so we need
+      * only check the first digit.
+      */
+     if (user_png_ver == NULL || user_png_ver[0] != png_libpng_ver[0] ||
+         (user_png_ver[0] == '1' && user_png_ver[2] != png_libpng_ver[2]) ||
+         (user_png_ver[0] == '0' && user_png_ver[2] < '9'))
+     {
+#if !defined(PNG_NO_STDIO) && !defined(_WIN32_WCE)
+        char msg[80];
+        if (user_png_ver)
+        {
+          png_snprintf(msg, 80,
+             "Application was compiled with png.h from libpng-%.20s",
+             user_png_ver);
+          png_warning(png_ptr, msg);
+        }
+        png_snprintf(msg, 80,
+           "Application  is  running with png.c from libpng-%.20s",
+           png_libpng_ver);
+        png_warning(png_ptr, msg);
+#endif
+#ifdef PNG_ERROR_NUMBERS_SUPPORTED
+        png_ptr->flags=0;
+#endif
+        png_error(png_ptr,
+           "Incompatible libpng version in application and library");
+     }
+   }
+
+   /* initialize zbuf - compression buffer */
+   png_ptr->zbuf_size = PNG_ZBUF_SIZE;
+   png_ptr->zbuf = (png_bytep)png_malloc(png_ptr,
+      (png_uint_32)png_ptr->zbuf_size);
+
+   png_set_write_fn(png_ptr, png_voidp_NULL, png_rw_ptr_NULL,
+      png_flush_ptr_NULL);
+
+#if defined(PNG_WRITE_WEIGHTED_FILTER_SUPPORTED)
+   png_set_filter_heuristics(png_ptr, PNG_FILTER_HEURISTIC_DEFAULT,
+      1, png_doublep_NULL, png_doublep_NULL);
+#endif
+
+#ifdef PNG_SETJMP_SUPPORTED
+/* Applications that neglect to set up their own setjmp() and then encounter
+   a png_error() will longjmp here.  Since the jmpbuf is then meaningless we
+   abort instead of returning. */
+#ifdef USE_FAR_KEYWORD
+   if (setjmp(jmpbuf))
+      PNG_ABORT();
+   png_memcpy(png_ptr->jmpbuf,jmpbuf,png_sizeof(jmp_buf));
+#else
+   if (setjmp(png_ptr->jmpbuf))
+      PNG_ABORT();
+#endif
+#endif
+   return (png_ptr);
+}
+
+/* Initialize png_ptr structure, and allocate any memory needed */
+#if defined(PNG_1_0_X) || defined(PNG_1_2_X)
+/* Deprecated. */
+#undef png_write_init
+void PNGAPI
+png_write_init(png_structp png_ptr)
+{
+   /* We only come here via pre-1.0.7-compiled applications */
+   png_write_init_2(png_ptr, "1.0.6 or earlier", 0, 0);
+}
+
+void PNGAPI
+png_write_init_2(png_structp png_ptr, png_const_charp user_png_ver,
+   png_size_t png_struct_size, png_size_t png_info_size)
+{
+   /* We only come here via pre-1.0.12-compiled applications */
+   if(png_ptr == NULL) return;
+#if !defined(PNG_NO_STDIO) && !defined(_WIN32_WCE)
+   if(png_sizeof(png_struct) > png_struct_size ||
+      png_sizeof(png_info) > png_info_size)
+   {
+      char msg[80];
+      png_ptr->warning_fn=NULL;
+      if (user_png_ver)
+      {
+        png_snprintf(msg, 80,
+           "Application was compiled with png.h from libpng-%.20s",
+           user_png_ver);
+        png_warning(png_ptr, msg);
+      }
+      png_snprintf(msg, 80,
+         "Application  is  running with png.c from libpng-%.20s",
+         png_libpng_ver);
+      png_warning(png_ptr, msg);
+   }
+#endif
+   if(png_sizeof(png_struct) > png_struct_size)
+     {
+       png_ptr->error_fn=NULL;
+#ifdef PNG_ERROR_NUMBERS_SUPPORTED
+       png_ptr->flags=0;
+#endif
+       png_error(png_ptr,
+       "The png struct allocated by the application for writing is too small.");
+     }
+   if(png_sizeof(png_info) > png_info_size)
+     {
+       png_ptr->error_fn=NULL;
+#ifdef PNG_ERROR_NUMBERS_SUPPORTED
+       png_ptr->flags=0;
+#endif
+       png_error(png_ptr,
+       "The info struct allocated by the application for writing is too small.");
+     }
+   png_write_init_3(&png_ptr, user_png_ver, png_struct_size);
+}
+#endif /* PNG_1_0_X || PNG_1_2_X */
+
+
+void PNGAPI
+png_write_init_3(png_structpp ptr_ptr, png_const_charp user_png_ver,
+   png_size_t png_struct_size)
+{
+   png_structp png_ptr=*ptr_ptr;
+#ifdef PNG_SETJMP_SUPPORTED
+   jmp_buf tmp_jmp; /* to save current jump buffer */
+#endif
+
+   int i = 0;
+
+   if (png_ptr == NULL)
+      return;
+
+   do
+   {
+     if (user_png_ver[i] != png_libpng_ver[i])
+     {
+#ifdef PNG_LEGACY_SUPPORTED
+       png_ptr->flags |= PNG_FLAG_LIBRARY_MISMATCH;
+#else
+       png_ptr->warning_fn=NULL;
+       png_warning(png_ptr,
+     "Application uses deprecated png_write_init() and should be recompiled.");
+       break;
+#endif
+     }
+   } while (png_libpng_ver[i++]);
+
+   png_debug(1, "in png_write_init_3\n");
+
+#ifdef PNG_SETJMP_SUPPORTED
+   /* save jump buffer and error functions */
+   png_memcpy(tmp_jmp, png_ptr->jmpbuf, png_sizeof (jmp_buf));
+#endif
+
+   if (png_sizeof(png_struct) > png_struct_size)
+     {
+       png_destroy_struct(png_ptr);
+       png_ptr = (png_structp)png_create_struct(PNG_STRUCT_PNG);
+       *ptr_ptr = png_ptr;
+     }
+
+   /* reset all variables to 0 */
+   png_memset(png_ptr, 0, png_sizeof (png_struct));
+
+   /* added at libpng-1.2.6 */
+#ifdef PNG_SET_USER_LIMITS_SUPPORTED
+   png_ptr->user_width_max=PNG_USER_WIDTH_MAX;
+   png_ptr->user_height_max=PNG_USER_HEIGHT_MAX;
+#endif
+
+#ifdef PNG_SETJMP_SUPPORTED
+   /* restore jump buffer */
+   png_memcpy(png_ptr->jmpbuf, tmp_jmp, png_sizeof (jmp_buf));
+#endif
+
+   png_set_write_fn(png_ptr, png_voidp_NULL, png_rw_ptr_NULL,
+      png_flush_ptr_NULL);
+
+   /* initialize zbuf - compression buffer */
+   png_ptr->zbuf_size = PNG_ZBUF_SIZE;
+   png_ptr->zbuf = (png_bytep)png_malloc(png_ptr,
+      (png_uint_32)png_ptr->zbuf_size);
+
+#if defined(PNG_WRITE_WEIGHTED_FILTER_SUPPORTED)
+   png_set_filter_heuristics(png_ptr, PNG_FILTER_HEURISTIC_DEFAULT,
+      1, png_doublep_NULL, png_doublep_NULL);
+#endif
+}
+
+/* Write a few rows of image data.  If the image is interlaced,
+ * either you will have to write the 7 sub images, or, if you
+ * have called png_set_interlace_handling(), you will have to
+ * "write" the image seven times.
+ */
+void PNGAPI
+png_write_rows(png_structp png_ptr, png_bytepp row,
+   png_uint_32 num_rows)
+{
+   png_uint_32 i; /* row counter */
+   png_bytepp rp; /* row pointer */
+
+   png_debug(1, "in png_write_rows\n");
+
+   if (png_ptr == NULL)
+      return;
+
+   /* loop through the rows */
+   for (i = 0, rp = row; i < num_rows; i++, rp++)
+   {
+      png_write_row(png_ptr, *rp);
+   }
+}
+
+/* Write the image.  You only need to call this function once, even
+ * if you are writing an interlaced image.
+ */
+void PNGAPI
+png_write_image(png_structp png_ptr, png_bytepp image)
+{
+   png_uint_32 i; /* row index */
+   int pass, num_pass; /* pass variables */
+   png_bytepp rp; /* points to current row */
+
+   if (png_ptr == NULL)
+      return;
+
+   png_debug(1, "in png_write_image\n");
+#if defined(PNG_WRITE_INTERLACING_SUPPORTED)
+   /* intialize interlace handling.  If image is not interlaced,
+      this will set pass to 1 */
+   num_pass = png_set_interlace_handling(png_ptr);
+#else
+   num_pass = 1;
+#endif
+   /* loop through passes */
+   for (pass = 0; pass < num_pass; pass++)
+   {
+      /* loop through image */
+      for (i = 0, rp = image; i < png_ptr->height; i++, rp++)
+      {
+         png_write_row(png_ptr, *rp);
+      }
+   }
+}
+
+/* called by user to write a row of image data */
+void PNGAPI
+png_write_row(png_structp png_ptr, png_bytep row)
+{
+   if (png_ptr == NULL)
+      return;
+   png_debug2(1, "in png_write_row (row %ld, pass %d)\n",
+      png_ptr->row_number, png_ptr->pass);
+
+   /* initialize transformations and other stuff if first time */
+   if (png_ptr->row_number == 0 && png_ptr->pass == 0)
+   {
+   /* make sure we wrote the header info */
+   if (!(png_ptr->mode & PNG_WROTE_INFO_BEFORE_PLTE))
+      png_error(png_ptr,
+         "png_write_info was never called before png_write_row.");
+
+   /* check for transforms that have been set but were defined out */
+#if !defined(PNG_WRITE_INVERT_SUPPORTED) && defined(PNG_READ_INVERT_SUPPORTED)
+   if (png_ptr->transformations & PNG_INVERT_MONO)
+      png_warning(png_ptr, "PNG_WRITE_INVERT_SUPPORTED is not defined.");
+#endif
+#if !defined(PNG_WRITE_FILLER_SUPPORTED) && defined(PNG_READ_FILLER_SUPPORTED)
+   if (png_ptr->transformations & PNG_FILLER)
+      png_warning(png_ptr, "PNG_WRITE_FILLER_SUPPORTED is not defined.");
+#endif
+#if !defined(PNG_WRITE_PACKSWAP_SUPPORTED) && defined(PNG_READ_PACKSWAP_SUPPORTED)
+   if (png_ptr->transformations & PNG_PACKSWAP)
+      png_warning(png_ptr, "PNG_WRITE_PACKSWAP_SUPPORTED is not defined.");
+#endif
+#if !defined(PNG_WRITE_PACK_SUPPORTED) && defined(PNG_READ_PACK_SUPPORTED)
+   if (png_ptr->transformations & PNG_PACK)
+      png_warning(png_ptr, "PNG_WRITE_PACK_SUPPORTED is not defined.");
+#endif
+#if !defined(PNG_WRITE_SHIFT_SUPPORTED) && defined(PNG_READ_SHIFT_SUPPORTED)
+   if (png_ptr->transformations & PNG_SHIFT)
+      png_warning(png_ptr, "PNG_WRITE_SHIFT_SUPPORTED is not defined.");
+#endif
+#if !defined(PNG_WRITE_BGR_SUPPORTED) && defined(PNG_READ_BGR_SUPPORTED)
+   if (png_ptr->transformations & PNG_BGR)
+      png_warning(png_ptr, "PNG_WRITE_BGR_SUPPORTED is not defined.");
+#endif
+#if !defined(PNG_WRITE_SWAP_SUPPORTED) && defined(PNG_READ_SWAP_SUPPORTED)
+   if (png_ptr->transformations & PNG_SWAP_BYTES)
+      png_warning(png_ptr, "PNG_WRITE_SWAP_SUPPORTED is not defined.");
+#endif
+
+      png_write_start_row(png_ptr);
+   }
+
+#if defined(PNG_WRITE_INTERLACING_SUPPORTED)
+   /* if interlaced and not interested in row, return */
+   if (png_ptr->interlaced && (png_ptr->transformations & PNG_INTERLACE))
+   {
+      switch (png_ptr->pass)
+      {
+         case 0:
+            if (png_ptr->row_number & 0x07)
+            {
+               png_write_finish_row(png_ptr);
+               return;
+            }
+            break;
+         case 1:
+            if ((png_ptr->row_number & 0x07) || png_ptr->width < 5)
+            {
+               png_write_finish_row(png_ptr);
+               return;
+            }
+            break;
+         case 2:
+            if ((png_ptr->row_number & 0x07) != 4)
+            {
+               png_write_finish_row(png_ptr);
+               return;
+            }
+            break;
+         case 3:
+            if ((png_ptr->row_number & 0x03) || png_ptr->width < 3)
+            {
+               png_write_finish_row(png_ptr);
+               return;
+            }
+            break;
+         case 4:
+            if ((png_ptr->row_number & 0x03) != 2)
+            {
+               png_write_finish_row(png_ptr);
+               return;
+            }
+            break;
+         case 5:
+            if ((png_ptr->row_number & 0x01) || png_ptr->width < 2)
+            {
+               png_write_finish_row(png_ptr);
+               return;
+            }
+            break;
+         case 6:
+            if (!(png_ptr->row_number & 0x01))
+            {
+               png_write_finish_row(png_ptr);
+               return;
+            }
+            break;
+      }
+   }
+#endif
+
+   /* set up row info for transformations */
+   png_ptr->row_info.color_type = png_ptr->color_type;
+   png_ptr->row_info.width = png_ptr->usr_width;
+   png_ptr->row_info.channels = png_ptr->usr_channels;
+   png_ptr->row_info.bit_depth = png_ptr->usr_bit_depth;
+   png_ptr->row_info.pixel_depth = (png_byte)(png_ptr->row_info.bit_depth *
+      png_ptr->row_info.channels);
+
+   png_ptr->row_info.rowbytes = PNG_ROWBYTES(png_ptr->row_info.pixel_depth,
+      png_ptr->row_info.width);
+
+   png_debug1(3, "row_info->color_type = %d\n", png_ptr->row_info.color_type);
+   png_debug1(3, "row_info->width = %lu\n", png_ptr->row_info.width);
+   png_debug1(3, "row_info->channels = %d\n", png_ptr->row_info.channels);
+   png_debug1(3, "row_info->bit_depth = %d\n", png_ptr->row_info.bit_depth);
+   png_debug1(3, "row_info->pixel_depth = %d\n", png_ptr->row_info.pixel_depth);
+   png_debug1(3, "row_info->rowbytes = %lu\n", png_ptr->row_info.rowbytes);
+
+   /* Copy user's row into buffer, leaving room for filter byte. */
+   png_memcpy_check(png_ptr, png_ptr->row_buf + 1, row,
+      png_ptr->row_info.rowbytes);
+
+#if defined(PNG_WRITE_INTERLACING_SUPPORTED)
+   /* handle interlacing */
+   if (png_ptr->interlaced && png_ptr->pass < 6 &&
+      (png_ptr->transformations & PNG_INTERLACE))
+   {
+      png_do_write_interlace(&(png_ptr->row_info),
+         png_ptr->row_buf + 1, png_ptr->pass);
+      /* this should always get caught above, but still ... */
+      if (!(png_ptr->row_info.width))
+      {
+         png_write_finish_row(png_ptr);
+         return;
+      }
+   }
+#endif
+
+   /* handle other transformations */
+   if (png_ptr->transformations)
+      png_do_write_transformations(png_ptr);
+
+#if defined(PNG_MNG_FEATURES_SUPPORTED)
+   /* Write filter_method 64 (intrapixel differencing) only if
+    * 1. Libpng was compiled with PNG_MNG_FEATURES_SUPPORTED and
+    * 2. Libpng did not write a PNG signature (this filter_method is only
+    *    used in PNG datastreams that are embedded in MNG datastreams) and
+    * 3. The application called png_permit_mng_features with a mask that
+    *    included PNG_FLAG_MNG_FILTER_64 and
+    * 4. The filter_method is 64 and
+    * 5. The color_type is RGB or RGBA
+    */
+   if((png_ptr->mng_features_permitted & PNG_FLAG_MNG_FILTER_64) &&
+      (png_ptr->filter_type == PNG_INTRAPIXEL_DIFFERENCING))
+   {
+      /* Intrapixel differencing */
+      png_do_write_intrapixel(&(png_ptr->row_info), png_ptr->row_buf + 1);
+   }
+#endif
+
+   /* Find a filter if necessary, filter the row and write it out. */
+   png_write_find_filter(png_ptr, &(png_ptr->row_info));
+
+   if (png_ptr->write_row_fn != NULL)
+      (*(png_ptr->write_row_fn))(png_ptr, png_ptr->row_number, png_ptr->pass);
+}
+
+#if defined(PNG_WRITE_FLUSH_SUPPORTED)
+/* Set the automatic flush interval or 0 to turn flushing off */
+void PNGAPI
+png_set_flush(png_structp png_ptr, int nrows)
+{
+   png_debug(1, "in png_set_flush\n");
+   if (png_ptr == NULL)
+      return;
+   png_ptr->flush_dist = (nrows < 0 ? 0 : nrows);
+}
+
+/* flush the current output buffers now */
+void PNGAPI
+png_write_flush(png_structp png_ptr)
+{
+   int wrote_IDAT;
+
+   png_debug(1, "in png_write_flush\n");
+   if (png_ptr == NULL)
+      return;
+   /* We have already written out all of the data */
+   if (png_ptr->row_number >= png_ptr->num_rows)
+     return;
+
+   do
+   {
+      int ret;
+
+      /* compress the data */
+      ret = deflate(&png_ptr->zstream, Z_SYNC_FLUSH);
+      wrote_IDAT = 0;
+
+      /* check for compression errors */
+      if (ret != Z_OK)
+      {
+         if (png_ptr->zstream.msg != NULL)
+            png_error(png_ptr, png_ptr->zstream.msg);
+         else
+            png_error(png_ptr, "zlib error");
+      }
+
+      if (!(png_ptr->zstream.avail_out))
+      {
+         /* write the IDAT and reset the zlib output buffer */
+         png_write_IDAT(png_ptr, png_ptr->zbuf,
+                        png_ptr->zbuf_size);
+         png_ptr->zstream.next_out = png_ptr->zbuf;
+         png_ptr->zstream.avail_out = (uInt)png_ptr->zbuf_size;
+         wrote_IDAT = 1;
+      }
+   } while(wrote_IDAT == 1);
+
+   /* If there is any data left to be output, write it into a new IDAT */
+   if (png_ptr->zbuf_size != png_ptr->zstream.avail_out)
+   {
+      /* write the IDAT and reset the zlib output buffer */
+      png_write_IDAT(png_ptr, png_ptr->zbuf,
+                     png_ptr->zbuf_size - png_ptr->zstream.avail_out);
+      png_ptr->zstream.next_out = png_ptr->zbuf;
+      png_ptr->zstream.avail_out = (uInt)png_ptr->zbuf_size;
+   }
+   png_ptr->flush_rows = 0;
+   png_flush(png_ptr);
+}
+#endif /* PNG_WRITE_FLUSH_SUPPORTED */
+
+/* free all memory used by the write */
+void PNGAPI
+png_destroy_write_struct(png_structpp png_ptr_ptr, png_infopp info_ptr_ptr)
+{
+   png_structp png_ptr = NULL;
+   png_infop info_ptr = NULL;
+#ifdef PNG_USER_MEM_SUPPORTED
+   png_free_ptr free_fn = NULL;
+   png_voidp mem_ptr = NULL;
+#endif
+
+   png_debug(1, "in png_destroy_write_struct\n");
+   if (png_ptr_ptr != NULL)
+   {
+      png_ptr = *png_ptr_ptr;
+#ifdef PNG_USER_MEM_SUPPORTED
+      free_fn = png_ptr->free_fn;
+      mem_ptr = png_ptr->mem_ptr;
+#endif
+   }
+
+   if (info_ptr_ptr != NULL)
+      info_ptr = *info_ptr_ptr;
+
+   if (info_ptr != NULL)
+   {
+      png_free_data(png_ptr, info_ptr, PNG_FREE_ALL, -1);
+
+#if defined(PNG_UNKNOWN_CHUNKS_SUPPORTED)
+      if (png_ptr->num_chunk_list)
+      {
+         png_free(png_ptr, png_ptr->chunk_list);
+         png_ptr->chunk_list=NULL;
+         png_ptr->num_chunk_list=0;
+      }
+#endif
+
+#ifdef PNG_USER_MEM_SUPPORTED
+      png_destroy_struct_2((png_voidp)info_ptr, (png_free_ptr)free_fn,
+         (png_voidp)mem_ptr);
+#else
+      png_destroy_struct((png_voidp)info_ptr);
+#endif
+      *info_ptr_ptr = NULL;
+   }
+
+   if (png_ptr != NULL)
+   {
+      png_write_destroy(png_ptr);
+#ifdef PNG_USER_MEM_SUPPORTED
+      png_destroy_struct_2((png_voidp)png_ptr, (png_free_ptr)free_fn,
+         (png_voidp)mem_ptr);
+#else
+      png_destroy_struct((png_voidp)png_ptr);
+#endif
+      *png_ptr_ptr = NULL;
+   }
+}
+
+
+/* Free any memory used in png_ptr struct (old method) */
+void /* PRIVATE */
+png_write_destroy(png_structp png_ptr)
+{
+#ifdef PNG_SETJMP_SUPPORTED
+   jmp_buf tmp_jmp; /* save jump buffer */
+#endif
+   png_error_ptr error_fn;
+   png_error_ptr warning_fn;
+   png_voidp error_ptr;
+#ifdef PNG_USER_MEM_SUPPORTED
+   png_free_ptr free_fn;
+#endif
+
+   png_debug(1, "in png_write_destroy\n");
+   /* free any memory zlib uses */
+   deflateEnd(&png_ptr->zstream);
+
+   /* free our memory.  png_free checks NULL for us. */
+   png_free(png_ptr, png_ptr->zbuf);
+   png_free(png_ptr, png_ptr->row_buf);
+   png_free(png_ptr, png_ptr->prev_row);
+   png_free(png_ptr, png_ptr->sub_row);
+   png_free(png_ptr, png_ptr->up_row);
+   png_free(png_ptr, png_ptr->avg_row);
+   png_free(png_ptr, png_ptr->paeth_row);
+
+#if defined(PNG_TIME_RFC1123_SUPPORTED)
+   png_free(png_ptr, png_ptr->time_buffer);
+#endif
+
+#if defined(PNG_WRITE_WEIGHTED_FILTER_SUPPORTED)
+   png_free(png_ptr, png_ptr->prev_filters);
+   png_free(png_ptr, png_ptr->filter_weights);
+   png_free(png_ptr, png_ptr->inv_filter_weights);
+   png_free(png_ptr, png_ptr->filter_costs);
+   png_free(png_ptr, png_ptr->inv_filter_costs);
+#endif
+
+#ifdef PNG_SETJMP_SUPPORTED
+   /* reset structure */
+   png_memcpy(tmp_jmp, png_ptr->jmpbuf, png_sizeof (jmp_buf));
+#endif
+
+   error_fn = png_ptr->error_fn;
+   warning_fn = png_ptr->warning_fn;
+   error_ptr = png_ptr->error_ptr;
+#ifdef PNG_USER_MEM_SUPPORTED
+   free_fn = png_ptr->free_fn;
+#endif
+
+   png_memset(png_ptr, 0, png_sizeof (png_struct));
+
+   png_ptr->error_fn = error_fn;
+   png_ptr->warning_fn = warning_fn;
+   png_ptr->error_ptr = error_ptr;
+#ifdef PNG_USER_MEM_SUPPORTED
+   png_ptr->free_fn = free_fn;
+#endif
+
+#ifdef PNG_SETJMP_SUPPORTED
+   png_memcpy(png_ptr->jmpbuf, tmp_jmp, png_sizeof (jmp_buf));
+#endif
+}
+
+/* Allow the application to select one or more row filters to use. */
+void PNGAPI
+png_set_filter(png_structp png_ptr, int method, int filters)
+{
+   png_debug(1, "in png_set_filter\n");
+   if (png_ptr == NULL)
+      return;
+#if defined(PNG_MNG_FEATURES_SUPPORTED)
+   if((png_ptr->mng_features_permitted & PNG_FLAG_MNG_FILTER_64) &&
+      (method == PNG_INTRAPIXEL_DIFFERENCING))
+         method = PNG_FILTER_TYPE_BASE;
+#endif
+   if (method == PNG_FILTER_TYPE_BASE)
+   {
+      switch (filters & (PNG_ALL_FILTERS | 0x07))
+      {
+#ifndef PNG_NO_WRITE_FILTER
+         case 5:
+         case 6:
+         case 7: png_warning(png_ptr, "Unknown row filter for method 0");
+#endif /* PNG_NO_WRITE_FILTER */
+         case PNG_FILTER_VALUE_NONE:
+              png_ptr->do_filter=PNG_FILTER_NONE; break;
+#ifndef PNG_NO_WRITE_FILTER
+         case PNG_FILTER_VALUE_SUB:
+              png_ptr->do_filter=PNG_FILTER_SUB; break;
+         case PNG_FILTER_VALUE_UP:
+              png_ptr->do_filter=PNG_FILTER_UP; break;
+         case PNG_FILTER_VALUE_AVG:
+              png_ptr->do_filter=PNG_FILTER_AVG; break;
+         case PNG_FILTER_VALUE_PAETH:
+              png_ptr->do_filter=PNG_FILTER_PAETH; break;
+         default: png_ptr->do_filter = (png_byte)filters; break;
+#else
+         default: png_warning(png_ptr, "Unknown row filter for method 0");
+#endif /* PNG_NO_WRITE_FILTER */
+      }
+
+      /* If we have allocated the row_buf, this means we have already started
+       * with the image and we should have allocated all of the filter buffers
+       * that have been selected.  If prev_row isn't already allocated, then
+       * it is too late to start using the filters that need it, since we
+       * will be missing the data in the previous row.  If an application
+       * wants to start and stop using particular filters during compression,
+       * it should start out with all of the filters, and then add and
+       * remove them after the start of compression.
+       */
+      if (png_ptr->row_buf != NULL)
+      {
+#ifndef PNG_NO_WRITE_FILTER
+         if ((png_ptr->do_filter & PNG_FILTER_SUB) && png_ptr->sub_row == NULL)
+         {
+            png_ptr->sub_row = (png_bytep)png_malloc(png_ptr,
+              (png_ptr->rowbytes + 1));
+            png_ptr->sub_row[0] = PNG_FILTER_VALUE_SUB;
+         }
+
+         if ((png_ptr->do_filter & PNG_FILTER_UP) && png_ptr->up_row == NULL)
+         {
+            if (png_ptr->prev_row == NULL)
+            {
+               png_warning(png_ptr, "Can't add Up filter after starting");
+               png_ptr->do_filter &= ~PNG_FILTER_UP;
+            }
+            else
+            {
+               png_ptr->up_row = (png_bytep)png_malloc(png_ptr,
+                  (png_ptr->rowbytes + 1));
+               png_ptr->up_row[0] = PNG_FILTER_VALUE_UP;
+            }
+         }
+
+         if ((png_ptr->do_filter & PNG_FILTER_AVG) && png_ptr->avg_row == NULL)
+         {
+            if (png_ptr->prev_row == NULL)
+            {
+               png_warning(png_ptr, "Can't add Average filter after starting");
+               png_ptr->do_filter &= ~PNG_FILTER_AVG;
+            }
+            else
+            {
+               png_ptr->avg_row = (png_bytep)png_malloc(png_ptr,
+                  (png_ptr->rowbytes + 1));
+               png_ptr->avg_row[0] = PNG_FILTER_VALUE_AVG;
+            }
+         }
+
+         if ((png_ptr->do_filter & PNG_FILTER_PAETH) &&
+             png_ptr->paeth_row == NULL)
+         {
+            if (png_ptr->prev_row == NULL)
+            {
+               png_warning(png_ptr, "Can't add Paeth filter after starting");
+               png_ptr->do_filter &= (png_byte)(~PNG_FILTER_PAETH);
+            }
+            else
+            {
+               png_ptr->paeth_row = (png_bytep)png_malloc(png_ptr,
+                  (png_ptr->rowbytes + 1));
+               png_ptr->paeth_row[0] = PNG_FILTER_VALUE_PAETH;
+            }
+         }
+
+         if (png_ptr->do_filter == PNG_NO_FILTERS)
+#endif /* PNG_NO_WRITE_FILTER */
+            png_ptr->do_filter = PNG_FILTER_NONE;
+      }
+   }
+   else
+      png_error(png_ptr, "Unknown custom filter method");
+}
+
+/* This allows us to influence the way in which libpng chooses the "best"
+ * filter for the current scanline.  While the "minimum-sum-of-absolute-
+ * differences metric is relatively fast and effective, there is some
+ * question as to whether it can be improved upon by trying to keep the
+ * filtered data going to zlib more consistent, hopefully resulting in
+ * better compression.
+ */
+#if defined(PNG_WRITE_WEIGHTED_FILTER_SUPPORTED)      /* GRR 970116 */
+void PNGAPI
+png_set_filter_heuristics(png_structp png_ptr, int heuristic_method,
+   int num_weights, png_doublep filter_weights,
+   png_doublep filter_costs)
+{
+   int i;
+
+   png_debug(1, "in png_set_filter_heuristics\n");
+   if (png_ptr == NULL)
+      return;
+   if (heuristic_method >= PNG_FILTER_HEURISTIC_LAST)
+   {
+      png_warning(png_ptr, "Unknown filter heuristic method");
+      return;
+   }
+
+   if (heuristic_method == PNG_FILTER_HEURISTIC_DEFAULT)
+   {
+      heuristic_method = PNG_FILTER_HEURISTIC_UNWEIGHTED;
+   }
+
+   if (num_weights < 0 || filter_weights == NULL ||
+      heuristic_method == PNG_FILTER_HEURISTIC_UNWEIGHTED)
+   {
+      num_weights = 0;
+   }
+
+   png_ptr->num_prev_filters = (png_byte)num_weights;
+   png_ptr->heuristic_method = (png_byte)heuristic_method;
+
+   if (num_weights > 0)
+   {
+      if (png_ptr->prev_filters == NULL)
+      {
+         png_ptr->prev_filters = (png_bytep)png_malloc(png_ptr,
+            (png_uint_32)(png_sizeof(png_byte) * num_weights));
+
+         /* To make sure that the weighting starts out fairly */
+         for (i = 0; i < num_weights; i++)
+         {
+            png_ptr->prev_filters[i] = 255;
+         }
+      }
+
+      if (png_ptr->filter_weights == NULL)
+      {
+         png_ptr->filter_weights = (png_uint_16p)png_malloc(png_ptr,
+            (png_uint_32)(png_sizeof(png_uint_16) * num_weights));
+
+         png_ptr->inv_filter_weights = (png_uint_16p)png_malloc(png_ptr,
+            (png_uint_32)(png_sizeof(png_uint_16) * num_weights));
+         for (i = 0; i < num_weights; i++)
+         {
+            png_ptr->inv_filter_weights[i] =
+            png_ptr->filter_weights[i] = PNG_WEIGHT_FACTOR;
+         }
+      }
+
+      for (i = 0; i < num_weights; i++)
+      {
+         if (filter_weights[i] < 0.0)
+         {
+            png_ptr->inv_filter_weights[i] =
+            png_ptr->filter_weights[i] = PNG_WEIGHT_FACTOR;
+         }
+         else
+         {
+            png_ptr->inv_filter_weights[i] =
+               (png_uint_16)((double)PNG_WEIGHT_FACTOR*filter_weights[i]+0.5);
+            png_ptr->filter_weights[i] =
+               (png_uint_16)((double)PNG_WEIGHT_FACTOR/filter_weights[i]+0.5);
+         }
+      }
+   }
+
+   /* If, in the future, there are other filter methods, this would
+    * need to be based on png_ptr->filter.
+    */
+   if (png_ptr->filter_costs == NULL)
+   {
+      png_ptr->filter_costs = (png_uint_16p)png_malloc(png_ptr,
+         (png_uint_32)(png_sizeof(png_uint_16) * PNG_FILTER_VALUE_LAST));
+
+      png_ptr->inv_filter_costs = (png_uint_16p)png_malloc(png_ptr,
+         (png_uint_32)(png_sizeof(png_uint_16) * PNG_FILTER_VALUE_LAST));
+
+      for (i = 0; i < PNG_FILTER_VALUE_LAST; i++)
+      {
+         png_ptr->inv_filter_costs[i] =
+         png_ptr->filter_costs[i] = PNG_COST_FACTOR;
+      }
+   }
+
+   /* Here is where we set the relative costs of the different filters.  We
+    * should take the desired compression level into account when setting
+    * the costs, so that Paeth, for instance, has a high relative cost at low
+    * compression levels, while it has a lower relative cost at higher
+    * compression settings.  The filter types are in order of increasing
+    * relative cost, so it would be possible to do this with an algorithm.
+    */
+   for (i = 0; i < PNG_FILTER_VALUE_LAST; i++)
+   {
+      if (filter_costs == NULL || filter_costs[i] < 0.0)
+      {
+         png_ptr->inv_filter_costs[i] =
+         png_ptr->filter_costs[i] = PNG_COST_FACTOR;
+      }
+      else if (filter_costs[i] >= 1.0)
+      {
+         png_ptr->inv_filter_costs[i] =
+            (png_uint_16)((double)PNG_COST_FACTOR / filter_costs[i] + 0.5);
+         png_ptr->filter_costs[i] =
+            (png_uint_16)((double)PNG_COST_FACTOR * filter_costs[i] + 0.5);
+      }
+   }
+}
+#endif /* PNG_WRITE_WEIGHTED_FILTER_SUPPORTED */
+
+void PNGAPI
+png_set_compression_level(png_structp png_ptr, int level)
+{
+   png_debug(1, "in png_set_compression_level\n");
+   if (png_ptr == NULL)
+      return;
+   png_ptr->flags |= PNG_FLAG_ZLIB_CUSTOM_LEVEL;
+   png_ptr->zlib_level = level;
+}
+
+void PNGAPI
+png_set_compression_mem_level(png_structp png_ptr, int mem_level)
+{
+   png_debug(1, "in png_set_compression_mem_level\n");
+   if (png_ptr == NULL)
+      return;
+   png_ptr->flags |= PNG_FLAG_ZLIB_CUSTOM_MEM_LEVEL;
+   png_ptr->zlib_mem_level = mem_level;
+}
+
+void PNGAPI
+png_set_compression_strategy(png_structp png_ptr, int strategy)
+{
+   png_debug(1, "in png_set_compression_strategy\n");
+   if (png_ptr == NULL)
+      return;
+   png_ptr->flags |= PNG_FLAG_ZLIB_CUSTOM_STRATEGY;
+   png_ptr->zlib_strategy = strategy;
+}
+
+void PNGAPI
+png_set_compression_window_bits(png_structp png_ptr, int window_bits)
+{
+   if (png_ptr == NULL)
+      return;
+   if (window_bits > 15)
+      png_warning(png_ptr, "Only compression windows <= 32k supported by PNG");
+   else if (window_bits < 8)
+      png_warning(png_ptr, "Only compression windows >= 256 supported by PNG");
+#ifndef WBITS_8_OK
+   /* avoid libpng bug with 256-byte windows */
+   if (window_bits == 8)
+     {
+       png_warning(png_ptr, "Compression window is being reset to 512");
+       window_bits=9;
+     }
+#endif
+   png_ptr->flags |= PNG_FLAG_ZLIB_CUSTOM_WINDOW_BITS;
+   png_ptr->zlib_window_bits = window_bits;
+}
+
+void PNGAPI
+png_set_compression_method(png_structp png_ptr, int method)
+{
+   png_debug(1, "in png_set_compression_method\n");
+   if (png_ptr == NULL)
+      return;
+   if (method != 8)
+      png_warning(png_ptr, "Only compression method 8 is supported by PNG");
+   png_ptr->flags |= PNG_FLAG_ZLIB_CUSTOM_METHOD;
+   png_ptr->zlib_method = method;
+}
+
+void PNGAPI
+png_set_write_status_fn(png_structp png_ptr, png_write_status_ptr write_row_fn)
+{
+   if (png_ptr == NULL)
+      return;
+   png_ptr->write_row_fn = write_row_fn;
+}
+
+#if defined(PNG_WRITE_USER_TRANSFORM_SUPPORTED)
+void PNGAPI
+png_set_write_user_transform_fn(png_structp png_ptr, png_user_transform_ptr
+   write_user_transform_fn)
+{
+   png_debug(1, "in png_set_write_user_transform_fn\n");
+   if (png_ptr == NULL)
+      return;
+   png_ptr->transformations |= PNG_USER_TRANSFORM;
+   png_ptr->write_user_transform_fn = write_user_transform_fn;
+}
+#endif
+
+
+#if defined(PNG_INFO_IMAGE_SUPPORTED)
+void PNGAPI
+png_write_png(png_structp png_ptr, png_infop info_ptr,
+              int transforms, voidp params)
+{
+   if (png_ptr == NULL || info_ptr == NULL)
+      return;
+#if defined(PNG_WRITE_INVERT_ALPHA_SUPPORTED)
+   /* invert the alpha channel from opacity to transparency */
+   if (transforms & PNG_TRANSFORM_INVERT_ALPHA)
+       png_set_invert_alpha(png_ptr);
+#endif
+
+   /* Write the file header information. */
+   png_write_info(png_ptr, info_ptr);
+
+   /* ------ these transformations don't touch the info structure ------- */
+
+#if defined(PNG_WRITE_INVERT_SUPPORTED)
+   /* invert monochrome pixels */
+   if (transforms & PNG_TRANSFORM_INVERT_MONO)
+       png_set_invert_mono(png_ptr);
+#endif
+
+#if defined(PNG_WRITE_SHIFT_SUPPORTED)
+   /* Shift the pixels up to a legal bit depth and fill in
+    * as appropriate to correctly scale the image.
+    */
+   if ((transforms & PNG_TRANSFORM_SHIFT)
+               && (info_ptr->valid & PNG_INFO_sBIT))
+       png_set_shift(png_ptr, &info_ptr->sig_bit);
+#endif
+
+#if defined(PNG_WRITE_PACK_SUPPORTED)
+   /* pack pixels into bytes */
+   if (transforms & PNG_TRANSFORM_PACKING)
+       png_set_packing(png_ptr);
+#endif
+
+#if defined(PNG_WRITE_SWAP_ALPHA_SUPPORTED)
+   /* swap location of alpha bytes from ARGB to RGBA */
+   if (transforms & PNG_TRANSFORM_SWAP_ALPHA)
+       png_set_swap_alpha(png_ptr);
+#endif
+
+#if defined(PNG_WRITE_FILLER_SUPPORTED)
+   /* Get rid of filler (OR ALPHA) bytes, pack XRGB/RGBX/ARGB/RGBA into
+    * RGB (4 channels -> 3 channels). The second parameter is not used.
+    */
+   if (transforms & PNG_TRANSFORM_STRIP_FILLER)
+       png_set_filler(png_ptr, 0, PNG_FILLER_BEFORE);
+#endif
+
+#if defined(PNG_WRITE_BGR_SUPPORTED)
+   /* flip BGR pixels to RGB */
+   if (transforms & PNG_TRANSFORM_BGR)
+       png_set_bgr(png_ptr);
+#endif
+
+#if defined(PNG_WRITE_SWAP_SUPPORTED)
+   /* swap bytes of 16-bit files to most significant byte first */
+   if (transforms & PNG_TRANSFORM_SWAP_ENDIAN)
+       png_set_swap(png_ptr);
+#endif
+
+#if defined(PNG_WRITE_PACKSWAP_SUPPORTED)
+   /* swap bits of 1, 2, 4 bit packed pixel formats */
+   if (transforms & PNG_TRANSFORM_PACKSWAP)
+       png_set_packswap(png_ptr);
+#endif
+
+   /* ----------------------- end of transformations ------------------- */
+
+   /* write the bits */
+   if (info_ptr->valid & PNG_INFO_IDAT)
+       png_write_image(png_ptr, info_ptr->row_pointers);
+
+   /* It is REQUIRED to call this to finish writing the rest of the file */
+   png_write_end(png_ptr, info_ptr);
+
+   transforms = transforms; /* quiet compiler warnings */
+   params = params;
+}
+#endif
+#endif /* PNG_WRITE_SUPPORTED */
diff --git a/uppsrc/plugin/png/lib/pngwtran.c b/uppsrc/plugin/png/lib/pngwtran.c
new file mode 100644
index 000000000..0372fe656
--- /dev/null
+++ b/uppsrc/plugin/png/lib/pngwtran.c
@@ -0,0 +1,572 @@
+
+/* pngwtran.c - transforms the data in a row for PNG writers
+ *
+ * Last changed in libpng 1.2.9 April 14, 2006
+ * For conditions of distribution and use, see copyright notice in png.h
+ * Copyright (c) 1998-2006 Glenn Randers-Pehrson
+ * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
+ * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
+ */
+
+#define PNG_INTERNAL
+#include "png.h"
+#ifdef PNG_WRITE_SUPPORTED
+
+/* Transform the data according to the user's wishes.  The order of
+ * transformations is significant.
+ */
+void /* PRIVATE */
+png_do_write_transformations(png_structp png_ptr)
+{
+   png_debug(1, "in png_do_write_transformations\n");
+
+   if (png_ptr == NULL)
+      return;
+
+#if defined(PNG_WRITE_USER_TRANSFORM_SUPPORTED)
+   if (png_ptr->transformations & PNG_USER_TRANSFORM)
+      if(png_ptr->write_user_transform_fn != NULL)
+        (*(png_ptr->write_user_transform_fn)) /* user write transform function */
+          (png_ptr,                    /* png_ptr */
+           &(png_ptr->row_info),       /* row_info:     */
+             /*  png_uint_32 width;          width of row */
+             /*  png_uint_32 rowbytes;       number of bytes in row */
+             /*  png_byte color_type;        color type of pixels */
+             /*  png_byte bit_depth;         bit depth of samples */
+             /*  png_byte channels;          number of channels (1-4) */
+             /*  png_byte pixel_depth;       bits per pixel (depth*channels) */
+           png_ptr->row_buf + 1);      /* start of pixel data for row */
+#endif
+#if defined(PNG_WRITE_FILLER_SUPPORTED)
+   if (png_ptr->transformations & PNG_FILLER)
+      png_do_strip_filler(&(png_ptr->row_info), png_ptr->row_buf + 1,
+         png_ptr->flags);
+#endif
+#if defined(PNG_WRITE_PACKSWAP_SUPPORTED)
+   if (png_ptr->transformations & PNG_PACKSWAP)
+      png_do_packswap(&(png_ptr->row_info), png_ptr->row_buf + 1);
+#endif
+#if defined(PNG_WRITE_PACK_SUPPORTED)
+   if (png_ptr->transformations & PNG_PACK)
+      png_do_pack(&(png_ptr->row_info), png_ptr->row_buf + 1,
+         (png_uint_32)png_ptr->bit_depth);
+#endif
+#if defined(PNG_WRITE_SWAP_SUPPORTED)
+   if (png_ptr->transformations & PNG_SWAP_BYTES)
+      png_do_swap(&(png_ptr->row_info), png_ptr->row_buf + 1);
+#endif
+#if defined(PNG_WRITE_SHIFT_SUPPORTED)
+   if (png_ptr->transformations & PNG_SHIFT)
+      png_do_shift(&(png_ptr->row_info), png_ptr->row_buf + 1,
+         &(png_ptr->shift));
+#endif
+#if defined(PNG_WRITE_SWAP_ALPHA_SUPPORTED)
+   if (png_ptr->transformations & PNG_SWAP_ALPHA)
+      png_do_write_swap_alpha(&(png_ptr->row_info), png_ptr->row_buf + 1);
+#endif
+#if defined(PNG_WRITE_INVERT_ALPHA_SUPPORTED)
+   if (png_ptr->transformations & PNG_INVERT_ALPHA)
+      png_do_write_invert_alpha(&(png_ptr->row_info), png_ptr->row_buf + 1);
+#endif
+#if defined(PNG_WRITE_BGR_SUPPORTED)
+   if (png_ptr->transformations & PNG_BGR)
+      png_do_bgr(&(png_ptr->row_info), png_ptr->row_buf + 1);
+#endif
+#if defined(PNG_WRITE_INVERT_SUPPORTED)
+   if (png_ptr->transformations & PNG_INVERT_MONO)
+      png_do_invert(&(png_ptr->row_info), png_ptr->row_buf + 1);
+#endif
+}
+
+#if defined(PNG_WRITE_PACK_SUPPORTED)
+/* Pack pixels into bytes.  Pass the true bit depth in bit_depth.  The
+ * row_info bit depth should be 8 (one pixel per byte).  The channels
+ * should be 1 (this only happens on grayscale and paletted images).
+ */
+void /* PRIVATE */
+png_do_pack(png_row_infop row_info, png_bytep row, png_uint_32 bit_depth)
+{
+   png_debug(1, "in png_do_pack\n");
+   if (row_info->bit_depth == 8 &&
+#if defined(PNG_USELESS_TESTS_SUPPORTED)
+       row != NULL && row_info != NULL &&
+#endif
+      row_info->channels == 1)
+   {
+      switch ((int)bit_depth)
+      {
+         case 1:
+         {
+            png_bytep sp, dp;
+            int mask, v;
+            png_uint_32 i;
+            png_uint_32 row_width = row_info->width;
+
+            sp = row;
+            dp = row;
+            mask = 0x80;
+            v = 0;
+
+            for (i = 0; i < row_width; i++)
+            {
+               if (*sp != 0)
+                  v |= mask;
+               sp++;
+               if (mask > 1)
+                  mask >>= 1;
+               else
+               {
+                  mask = 0x80;
+                  *dp = (png_byte)v;
+                  dp++;
+                  v = 0;
+               }
+            }
+            if (mask != 0x80)
+               *dp = (png_byte)v;
+            break;
+         }
+         case 2:
+         {
+            png_bytep sp, dp;
+            int shift, v;
+            png_uint_32 i;
+            png_uint_32 row_width = row_info->width;
+
+            sp = row;
+            dp = row;
+            shift = 6;
+            v = 0;
+            for (i = 0; i < row_width; i++)
+            {
+               png_byte value;
+
+               value = (png_byte)(*sp & 0x03);
+               v |= (value << shift);
+               if (shift == 0)
+               {
+                  shift = 6;
+                  *dp = (png_byte)v;
+                  dp++;
+                  v = 0;
+               }
+               else
+                  shift -= 2;
+               sp++;
+            }
+            if (shift != 6)
+               *dp = (png_byte)v;
+            break;
+         }
+         case 4:
+         {
+            png_bytep sp, dp;
+            int shift, v;
+            png_uint_32 i;
+            png_uint_32 row_width = row_info->width;
+
+            sp = row;
+            dp = row;
+            shift = 4;
+            v = 0;
+            for (i = 0; i < row_width; i++)
+            {
+               png_byte value;
+
+               value = (png_byte)(*sp & 0x0f);
+               v |= (value << shift);
+
+               if (shift == 0)
+               {
+                  shift = 4;
+                  *dp = (png_byte)v;
+                  dp++;
+                  v = 0;
+               }
+               else
+                  shift -= 4;
+
+               sp++;
+            }
+            if (shift != 4)
+               *dp = (png_byte)v;
+            break;
+         }
+      }
+      row_info->bit_depth = (png_byte)bit_depth;
+      row_info->pixel_depth = (png_byte)(bit_depth * row_info->channels);
+      row_info->rowbytes = PNG_ROWBYTES(row_info->pixel_depth,
+         row_info->width);
+   }
+}
+#endif
+
+#if defined(PNG_WRITE_SHIFT_SUPPORTED)
+/* Shift pixel values to take advantage of whole range.  Pass the
+ * true number of bits in bit_depth.  The row should be packed
+ * according to row_info->bit_depth.  Thus, if you had a row of
+ * bit depth 4, but the pixels only had values from 0 to 7, you
+ * would pass 3 as bit_depth, and this routine would translate the
+ * data to 0 to 15.
+ */
+void /* PRIVATE */
+png_do_shift(png_row_infop row_info, png_bytep row, png_color_8p bit_depth)
+{
+   png_debug(1, "in png_do_shift\n");
+#if defined(PNG_USELESS_TESTS_SUPPORTED)
+   if (row != NULL && row_info != NULL &&
+#else
+   if (
+#endif
+      row_info->color_type != PNG_COLOR_TYPE_PALETTE)
+   {
+      int shift_start[4], shift_dec[4];
+      int channels = 0;
+
+      if (row_info->color_type & PNG_COLOR_MASK_COLOR)
+      {
+         shift_start[channels] = row_info->bit_depth - bit_depth->red;
+         shift_dec[channels] = bit_depth->red;
+         channels++;
+         shift_start[channels] = row_info->bit_depth - bit_depth->green;
+         shift_dec[channels] = bit_depth->green;
+         channels++;
+         shift_start[channels] = row_info->bit_depth - bit_depth->blue;
+         shift_dec[channels] = bit_depth->blue;
+         channels++;
+      }
+      else
+      {
+         shift_start[channels] = row_info->bit_depth - bit_depth->gray;
+         shift_dec[channels] = bit_depth->gray;
+         channels++;
+      }
+      if (row_info->color_type & PNG_COLOR_MASK_ALPHA)
+      {
+         shift_start[channels] = row_info->bit_depth - bit_depth->alpha;
+         shift_dec[channels] = bit_depth->alpha;
+         channels++;
+      }
+
+      /* with low row depths, could only be grayscale, so one channel */
+      if (row_info->bit_depth < 8)
+      {
+         png_bytep bp = row;
+         png_uint_32 i;
+         png_byte mask;
+         png_uint_32 row_bytes = row_info->rowbytes;
+
+         if (bit_depth->gray == 1 && row_info->bit_depth == 2)
+            mask = 0x55;
+         else if (row_info->bit_depth == 4 && bit_depth->gray == 3)
+            mask = 0x11;
+         else
+            mask = 0xff;
+
+         for (i = 0; i < row_bytes; i++, bp++)
+         {
+            png_uint_16 v;
+            int j;
+
+            v = *bp;
+            *bp = 0;
+            for (j = shift_start[0]; j > -shift_dec[0]; j -= shift_dec[0])
+            {
+               if (j > 0)
+                  *bp |= (png_byte)((v << j) & 0xff);
+               else
+                  *bp |= (png_byte)((v >> (-j)) & mask);
+            }
+         }
+      }
+      else if (row_info->bit_depth == 8)
+      {
+         png_bytep bp = row;
+         png_uint_32 i;
+         png_uint_32 istop = channels * row_info->width;
+
+         for (i = 0; i < istop; i++, bp++)
+         {
+
+            png_uint_16 v;
+            int j;
+            int c = (int)(i%channels);
+
+            v = *bp;
+            *bp = 0;
+            for (j = shift_start[c]; j > -shift_dec[c]; j -= shift_dec[c])
+            {
+               if (j > 0)
+                  *bp |= (png_byte)((v << j) & 0xff);
+               else
+                  *bp |= (png_byte)((v >> (-j)) & 0xff);
+            }
+         }
+      }
+      else
+      {
+         png_bytep bp;
+         png_uint_32 i;
+         png_uint_32 istop = channels * row_info->width;
+
+         for (bp = row, i = 0; i < istop; i++)
+         {
+            int c = (int)(i%channels);
+            png_uint_16 value, v;
+            int j;
+
+            v = (png_uint_16)(((png_uint_16)(*bp) << 8) + *(bp + 1));
+            value = 0;
+            for (j = shift_start[c]; j > -shift_dec[c]; j -= shift_dec[c])
+            {
+               if (j > 0)
+                  value |= (png_uint_16)((v << j) & (png_uint_16)0xffff);
+               else
+                  value |= (png_uint_16)((v >> (-j)) & (png_uint_16)0xffff);
+            }
+            *bp++ = (png_byte)(value >> 8);
+            *bp++ = (png_byte)(value & 0xff);
+         }
+      }
+   }
+}
+#endif
+
+#if defined(PNG_WRITE_SWAP_ALPHA_SUPPORTED)
+void /* PRIVATE */
+png_do_write_swap_alpha(png_row_infop row_info, png_bytep row)
+{
+   png_debug(1, "in png_do_write_swap_alpha\n");
+#if defined(PNG_USELESS_TESTS_SUPPORTED)
+   if (row != NULL && row_info != NULL)
+#endif
+   {
+      if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
+      {
+         /* This converts from ARGB to RGBA */
+         if (row_info->bit_depth == 8)
+         {
+            png_bytep sp, dp;
+            png_uint_32 i;
+            png_uint_32 row_width = row_info->width;
+            for (i = 0, sp = dp = row; i < row_width; i++)
+            {
+               png_byte save = *(sp++);
+               *(dp++) = *(sp++);
+               *(dp++) = *(sp++);
+               *(dp++) = *(sp++);
+               *(dp++) = save;
+            }
+         }
+         /* This converts from AARRGGBB to RRGGBBAA */
+         else
+         {
+            png_bytep sp, dp;
+            png_uint_32 i;
+            png_uint_32 row_width = row_info->width;
+
+            for (i = 0, sp = dp = row; i < row_width; i++)
+            {
+               png_byte save[2];
+               save[0] = *(sp++);
+               save[1] = *(sp++);
+               *(dp++) = *(sp++);
+               *(dp++) = *(sp++);
+               *(dp++) = *(sp++);
+               *(dp++) = *(sp++);
+               *(dp++) = *(sp++);
+               *(dp++) = *(sp++);
+               *(dp++) = save[0];
+               *(dp++) = save[1];
+            }
+         }
+      }
+      else if (row_info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
+      {
+         /* This converts from AG to GA */
+         if (row_info->bit_depth == 8)
+         {
+            png_bytep sp, dp;
+            png_uint_32 i;
+            png_uint_32 row_width = row_info->width;
+
+            for (i = 0, sp = dp = row; i < row_width; i++)
+            {
+               png_byte save = *(sp++);
+               *(dp++) = *(sp++);
+               *(dp++) = save;
+            }
+         }
+         /* This converts from AAGG to GGAA */
+         else
+         {
+            png_bytep sp, dp;
+            png_uint_32 i;
+            png_uint_32 row_width = row_info->width;
+
+            for (i = 0, sp = dp = row; i < row_width; i++)
+            {
+               png_byte save[2];
+               save[0] = *(sp++);
+               save[1] = *(sp++);
+               *(dp++) = *(sp++);
+               *(dp++) = *(sp++);
+               *(dp++) = save[0];
+               *(dp++) = save[1];
+            }
+         }
+      }
+   }
+}
+#endif
+
+#if defined(PNG_WRITE_INVERT_ALPHA_SUPPORTED)
+void /* PRIVATE */
+png_do_write_invert_alpha(png_row_infop row_info, png_bytep row)
+{
+   png_debug(1, "in png_do_write_invert_alpha\n");
+#if defined(PNG_USELESS_TESTS_SUPPORTED)
+   if (row != NULL && row_info != NULL)
+#endif
+   {
+      if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
+      {
+         /* This inverts the alpha channel in RGBA */
+         if (row_info->bit_depth == 8)
+         {
+            png_bytep sp, dp;
+            png_uint_32 i;
+            png_uint_32 row_width = row_info->width;
+            for (i = 0, sp = dp = row; i < row_width; i++)
+            {
+               /* does nothing
+               *(dp++) = *(sp++);
+               *(dp++) = *(sp++);
+               *(dp++) = *(sp++);
+               */
+               sp+=3; dp = sp;
+               *(dp++) = (png_byte)(255 - *(sp++));
+            }
+         }
+         /* This inverts the alpha channel in RRGGBBAA */
+         else
+         {
+            png_bytep sp, dp;
+            png_uint_32 i;
+            png_uint_32 row_width = row_info->width;
+
+            for (i = 0, sp = dp = row; i < row_width; i++)
+            {
+               /* does nothing
+               *(dp++) = *(sp++);
+               *(dp++) = *(sp++);
+               *(dp++) = *(sp++);
+               *(dp++) = *(sp++);
+               *(dp++) = *(sp++);
+               *(dp++) = *(sp++);
+               */
+               sp+=6; dp = sp;
+               *(dp++) = (png_byte)(255 - *(sp++));
+               *(dp++) = (png_byte)(255 - *(sp++));
+            }
+         }
+      }
+      else if (row_info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
+      {
+         /* This inverts the alpha channel in GA */
+         if (row_info->bit_depth == 8)
+         {
+            png_bytep sp, dp;
+            png_uint_32 i;
+            png_uint_32 row_width = row_info->width;
+
+            for (i = 0, sp = dp = row; i < row_width; i++)
+            {
+               *(dp++) = *(sp++);
+               *(dp++) = (png_byte)(255 - *(sp++));
+            }
+         }
+         /* This inverts the alpha channel in GGAA */
+         else
+         {
+            png_bytep sp, dp;
+            png_uint_32 i;
+            png_uint_32 row_width = row_info->width;
+
+            for (i = 0, sp = dp = row; i < row_width; i++)
+            {
+               /* does nothing
+               *(dp++) = *(sp++);
+               *(dp++) = *(sp++);
+               */
+               sp+=2; dp = sp;
+               *(dp++) = (png_byte)(255 - *(sp++));
+               *(dp++) = (png_byte)(255 - *(sp++));
+            }
+         }
+      }
+   }
+}
+#endif
+
+#if defined(PNG_MNG_FEATURES_SUPPORTED)
+/* undoes intrapixel differencing  */
+void /* PRIVATE */
+png_do_write_intrapixel(png_row_infop row_info, png_bytep row)
+{
+   png_debug(1, "in png_do_write_intrapixel\n");
+   if (
+#if defined(PNG_USELESS_TESTS_SUPPORTED)
+       row != NULL && row_info != NULL &&
+#endif
+       (row_info->color_type & PNG_COLOR_MASK_COLOR))
+   {
+      int bytes_per_pixel;
+      png_uint_32 row_width = row_info->width;
+      if (row_info->bit_depth == 8)
+      {
+         png_bytep rp;
+         png_uint_32 i;
+
+         if (row_info->color_type == PNG_COLOR_TYPE_RGB)
+            bytes_per_pixel = 3;
+         else if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
+            bytes_per_pixel = 4;
+         else
+            return;
+
+         for (i = 0, rp = row; i < row_width; i++, rp += bytes_per_pixel)
+         {
+            *(rp)   = (png_byte)((*rp     - *(rp+1))&0xff);
+            *(rp+2) = (png_byte)((*(rp+2) - *(rp+1))&0xff);
+         }
+      }
+      else if (row_info->bit_depth == 16)
+      {
+         png_bytep rp;
+         png_uint_32 i;
+
+         if (row_info->color_type == PNG_COLOR_TYPE_RGB)
+            bytes_per_pixel = 6;
+         else if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
+            bytes_per_pixel = 8;
+         else
+            return;
+
+         for (i = 0, rp = row; i < row_width; i++, rp += bytes_per_pixel)
+         {
+            png_uint_32 s0   = (*(rp  ) << 8) | *(rp+1);
+            png_uint_32 s1   = (*(rp+2) << 8) | *(rp+3);
+            png_uint_32 s2   = (*(rp+4) << 8) | *(rp+5);
+            png_uint_32 red  = (png_uint_32)((s0-s1) & 0xffffL);
+            png_uint_32 blue = (png_uint_32)((s2-s1) & 0xffffL);
+            *(rp  ) = (png_byte)((red >> 8) & 0xff);
+            *(rp+1) = (png_byte)(red & 0xff);
+            *(rp+4) = (png_byte)((blue >> 8) & 0xff);
+            *(rp+5) = (png_byte)(blue & 0xff);
+         }
+      }
+   }
+}
+#endif /* PNG_MNG_FEATURES_SUPPORTED */
+#endif /* PNG_WRITE_SUPPORTED */
diff --git a/uppsrc/plugin/png/lib/pngwutil.c b/uppsrc/plugin/png/lib/pngwutil.c
new file mode 100644
index 000000000..fef38aef9
--- /dev/null
+++ b/uppsrc/plugin/png/lib/pngwutil.c
@@ -0,0 +1,2792 @@
+
+/* pngwutil.c - utilities to write a PNG file
+ *
+ * Last changed in libpng 1.2.20 Septhember 3, 2007
+ * For conditions of distribution and use, see copyright notice in png.h
+ * Copyright (c) 1998-2007 Glenn Randers-Pehrson
+ * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
+ * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
+ */
+
+#define PNG_INTERNAL
+#include "png.h"
+#ifdef PNG_WRITE_SUPPORTED
+
+/* Place a 32-bit number into a buffer in PNG byte order.  We work
+ * with unsigned numbers for convenience, although one supported
+ * ancillary chunk uses signed (two's complement) numbers.
+ */
+void PNGAPI
+png_save_uint_32(png_bytep buf, png_uint_32 i)
+{
+   buf[0] = (png_byte)((i >> 24) & 0xff);
+   buf[1] = (png_byte)((i >> 16) & 0xff);
+   buf[2] = (png_byte)((i >> 8) & 0xff);
+   buf[3] = (png_byte)(i & 0xff);
+}
+
+/* The png_save_int_32 function assumes integers are stored in two's
+ * complement format.  If this isn't the case, then this routine needs to
+ * be modified to write data in two's complement format.
+ */
+void PNGAPI
+png_save_int_32(png_bytep buf, png_int_32 i)
+{
+   buf[0] = (png_byte)((i >> 24) & 0xff);
+   buf[1] = (png_byte)((i >> 16) & 0xff);
+   buf[2] = (png_byte)((i >> 8) & 0xff);
+   buf[3] = (png_byte)(i & 0xff);
+}
+
+/* Place a 16-bit number into a buffer in PNG byte order.
+ * The parameter is declared unsigned int, not png_uint_16,
+ * just to avoid potential problems on pre-ANSI C compilers.
+ */
+void PNGAPI
+png_save_uint_16(png_bytep buf, unsigned int i)
+{
+   buf[0] = (png_byte)((i >> 8) & 0xff);
+   buf[1] = (png_byte)(i & 0xff);
+}
+
+/* Write a PNG chunk all at once.  The type is an array of ASCII characters
+ * representing the chunk name.  The array must be at least 4 bytes in
+ * length, and does not need to be null terminated.  To be safe, pass the
+ * pre-defined chunk names here, and if you need a new one, define it
+ * where the others are defined.  The length is the length of the data.
+ * All the data must be present.  If that is not possible, use the
+ * png_write_chunk_start(), png_write_chunk_data(), and png_write_chunk_end()
+ * functions instead.
+ */
+void PNGAPI
+png_write_chunk(png_structp png_ptr, png_bytep chunk_name,
+   png_bytep data, png_size_t length)
+{
+   if(png_ptr == NULL) return;
+   png_write_chunk_start(png_ptr, chunk_name, (png_uint_32)length);
+   png_write_chunk_data(png_ptr, data, length);
+   png_write_chunk_end(png_ptr);
+}
+
+/* Write the start of a PNG chunk.  The type is the chunk type.
+ * The total_length is the sum of the lengths of all the data you will be
+ * passing in png_write_chunk_data().
+ */
+void PNGAPI
+png_write_chunk_start(png_structp png_ptr, png_bytep chunk_name,
+   png_uint_32 length)
+{
+   png_byte buf[4];
+   png_debug2(0, "Writing %s chunk (%lu bytes)\n", chunk_name, length);
+   if(png_ptr == NULL) return;
+
+   /* write the length */
+   png_save_uint_32(buf, length);
+   png_write_data(png_ptr, buf, (png_size_t)4);
+
+   /* write the chunk name */
+   png_write_data(png_ptr, chunk_name, (png_size_t)4);
+   /* reset the crc and run it over the chunk name */
+   png_reset_crc(png_ptr);
+   png_calculate_crc(png_ptr, chunk_name, (png_size_t)4);
+}
+
+/* Write the data of a PNG chunk started with png_write_chunk_start().
+ * Note that multiple calls to this function are allowed, and that the
+ * sum of the lengths from these calls *must* add up to the total_length
+ * given to png_write_chunk_start().
+ */
+void PNGAPI
+png_write_chunk_data(png_structp png_ptr, png_bytep data, png_size_t length)
+{
+   /* write the data, and run the CRC over it */
+   if(png_ptr == NULL) return;
+   if (data != NULL && length > 0)
+   {
+      png_calculate_crc(png_ptr, data, length);
+      png_write_data(png_ptr, data, length);
+   }
+}
+
+/* Finish a chunk started with png_write_chunk_start(). */
+void PNGAPI
+png_write_chunk_end(png_structp png_ptr)
+{
+   png_byte buf[4];
+
+   if(png_ptr == NULL) return;
+
+   /* write the crc */
+   png_save_uint_32(buf, png_ptr->crc);
+
+   png_write_data(png_ptr, buf, (png_size_t)4);
+}
+
+/* Simple function to write the signature.  If we have already written
+ * the magic bytes of the signature, or more likely, the PNG stream is
+ * being embedded into another stream and doesn't need its own signature,
+ * we should call png_set_sig_bytes() to tell libpng how many of the
+ * bytes have already been written.
+ */
+void /* PRIVATE */
+png_write_sig(png_structp png_ptr)
+{
+   png_byte png_signature[8] = {137, 80, 78, 71, 13, 10, 26, 10};
+   /* write the rest of the 8 byte signature */
+   png_write_data(png_ptr, &png_signature[png_ptr->sig_bytes],
+      (png_size_t)8 - png_ptr->sig_bytes);
+   if(png_ptr->sig_bytes < 3)
+      png_ptr->mode |= PNG_HAVE_PNG_SIGNATURE;
+}
+
+#if defined(PNG_WRITE_TEXT_SUPPORTED) || defined(PNG_WRITE_iCCP_SUPPORTED)
+/*
+ * This pair of functions encapsulates the operation of (a) compressing a
+ * text string, and (b) issuing it later as a series of chunk data writes.
+ * The compression_state structure is shared context for these functions
+ * set up by the caller in order to make the whole mess thread-safe.
+ */
+
+typedef struct
+{
+    char *input;   /* the uncompressed input data */
+    int input_len;   /* its length */
+    int num_output_ptr; /* number of output pointers used */
+    int max_output_ptr; /* size of output_ptr */
+    png_charpp output_ptr; /* array of pointers to output */
+} compression_state;
+
+/* compress given text into storage in the png_ptr structure */
+static int /* PRIVATE */
+png_text_compress(png_structp png_ptr,
+        png_charp text, png_size_t text_len, int compression,
+        compression_state *comp)
+{
+   int ret;
+
+   comp->num_output_ptr = 0;
+   comp->max_output_ptr = 0;
+   comp->output_ptr = NULL;
+   comp->input = NULL;
+   comp->input_len = 0;
+
+   /* we may just want to pass the text right through */
+   if (compression == PNG_TEXT_COMPRESSION_NONE)
+   {
+       comp->input = text;
+       comp->input_len = text_len;
+       return((int)text_len);
+   }
+
+   if (compression >= PNG_TEXT_COMPRESSION_LAST)
+   {
+#if !defined(PNG_NO_STDIO) && !defined(_WIN32_WCE)
+      char msg[50];
+      png_snprintf(msg, 50, "Unknown compression type %d", compression);
+      png_warning(png_ptr, msg);
+#else
+      png_warning(png_ptr, "Unknown compression type");
+#endif
+   }
+
+   /* We can't write the chunk until we find out how much data we have,
+    * which means we need to run the compressor first and save the
+    * output.  This shouldn't be a problem, as the vast majority of
+    * comments should be reasonable, but we will set up an array of
+    * malloc'd pointers to be sure.
+    *
+    * If we knew the application was well behaved, we could simplify this
+    * greatly by assuming we can always malloc an output buffer large
+    * enough to hold the compressed text ((1001 * text_len / 1000) + 12)
+    * and malloc this directly.  The only time this would be a bad idea is
+    * if we can't malloc more than 64K and we have 64K of random input
+    * data, or if the input string is incredibly large (although this
+    * wouldn't cause a failure, just a slowdown due to swapping).
+    */
+
+   /* set up the compression buffers */
+   png_ptr->zstream.avail_in = (uInt)text_len;
+   png_ptr->zstream.next_in = (Bytef *)text;
+   png_ptr->zstream.avail_out = (uInt)png_ptr->zbuf_size;
+   png_ptr->zstream.next_out = (Bytef *)png_ptr->zbuf;
+
+   /* this is the same compression loop as in png_write_row() */
+   do
+   {
+      /* compress the data */
+      ret = deflate(&png_ptr->zstream, Z_NO_FLUSH);
+      if (ret != Z_OK)
+      {
+         /* error */
+         if (png_ptr->zstream.msg != NULL)
+            png_error(png_ptr, png_ptr->zstream.msg);
+         else
+            png_error(png_ptr, "zlib error");
+      }
+      /* check to see if we need more room */
+      if (!(png_ptr->zstream.avail_out))
+      {
+         /* make sure the output array has room */
+         if (comp->num_output_ptr >= comp->max_output_ptr)
+         {
+            int old_max;
+
+            old_max = comp->max_output_ptr;
+            comp->max_output_ptr = comp->num_output_ptr + 4;
+            if (comp->output_ptr != NULL)
+            {
+               png_charpp old_ptr;
+
+               old_ptr = comp->output_ptr;
+               comp->output_ptr = (png_charpp)png_malloc(png_ptr,
+                  (png_uint_32)(comp->max_output_ptr *
+                  png_sizeof (png_charpp)));
+               png_memcpy(comp->output_ptr, old_ptr, old_max
+                  * png_sizeof (png_charp));
+               png_free(png_ptr, old_ptr);
+            }
+            else
+               comp->output_ptr = (png_charpp)png_malloc(png_ptr,
+                  (png_uint_32)(comp->max_output_ptr *
+                  png_sizeof (png_charp)));
+         }
+
+         /* save the data */
+         comp->output_ptr[comp->num_output_ptr] = (png_charp)png_malloc(png_ptr,
+            (png_uint_32)png_ptr->zbuf_size);
+         png_memcpy(comp->output_ptr[comp->num_output_ptr], png_ptr->zbuf,
+            png_ptr->zbuf_size);
+         comp->num_output_ptr++;
+
+         /* and reset the buffer */
+         png_ptr->zstream.avail_out = (uInt)png_ptr->zbuf_size;
+         png_ptr->zstream.next_out = png_ptr->zbuf;
+      }
+   /* continue until we don't have any more to compress */
+   } while (png_ptr->zstream.avail_in);
+
+   /* finish the compression */
+   do
+   {
+      /* tell zlib we are finished */
+      ret = deflate(&png_ptr->zstream, Z_FINISH);
+
+      if (ret == Z_OK)
+      {
+         /* check to see if we need more room */
+         if (!(png_ptr->zstream.avail_out))
+         {
+            /* check to make sure our output array has room */
+            if (comp->num_output_ptr >= comp->max_output_ptr)
+            {
+               int old_max;
+
+               old_max = comp->max_output_ptr;
+               comp->max_output_ptr = comp->num_output_ptr + 4;
+               if (comp->output_ptr != NULL)
+               {
+                  png_charpp old_ptr;
+
+                  old_ptr = comp->output_ptr;
+                  /* This could be optimized to realloc() */
+                  comp->output_ptr = (png_charpp)png_malloc(png_ptr,
+                     (png_uint_32)(comp->max_output_ptr *
+                     png_sizeof (png_charpp)));
+                  png_memcpy(comp->output_ptr, old_ptr,
+                     old_max * png_sizeof (png_charp));
+                  png_free(png_ptr, old_ptr);
+               }
+               else
+                  comp->output_ptr = (png_charpp)png_malloc(png_ptr,
+                     (png_uint_32)(comp->max_output_ptr *
+                     png_sizeof (png_charp)));
+            }
+
+            /* save off the data */
+            comp->output_ptr[comp->num_output_ptr] =
+               (png_charp)png_malloc(png_ptr, (png_uint_32)png_ptr->zbuf_size);
+            png_memcpy(comp->output_ptr[comp->num_output_ptr], png_ptr->zbuf,
+               png_ptr->zbuf_size);
+            comp->num_output_ptr++;
+
+            /* and reset the buffer pointers */
+            png_ptr->zstream.avail_out = (uInt)png_ptr->zbuf_size;
+            png_ptr->zstream.next_out = png_ptr->zbuf;
+         }
+      }
+      else if (ret != Z_STREAM_END)
+      {
+         /* we got an error */
+         if (png_ptr->zstream.msg != NULL)
+            png_error(png_ptr, png_ptr->zstream.msg);
+         else
+            png_error(png_ptr, "zlib error");
+      }
+   } while (ret != Z_STREAM_END);
+
+   /* text length is number of buffers plus last buffer */
+   text_len = png_ptr->zbuf_size * comp->num_output_ptr;
+   if (png_ptr->zstream.avail_out < png_ptr->zbuf_size)
+      text_len += png_ptr->zbuf_size - (png_size_t)png_ptr->zstream.avail_out;
+
+   return((int)text_len);
+}
+
+/* ship the compressed text out via chunk writes */
+static void /* PRIVATE */
+png_write_compressed_data_out(png_structp png_ptr, compression_state *comp)
+{
+   int i;
+
+   /* handle the no-compression case */
+   if (comp->input)
+   {
+       png_write_chunk_data(png_ptr, (png_bytep)comp->input,
+                            (png_size_t)comp->input_len);
+       return;
+   }
+
+   /* write saved output buffers, if any */
+   for (i = 0; i < comp->num_output_ptr; i++)
+   {
+      png_write_chunk_data(png_ptr,(png_bytep)comp->output_ptr[i],
+         png_ptr->zbuf_size);
+      png_free(png_ptr, comp->output_ptr[i]);
+      comp->output_ptr[i]=NULL;
+   }
+   if (comp->max_output_ptr != 0)
+      png_free(png_ptr, comp->output_ptr);
+      comp->output_ptr=NULL;
+   /* write anything left in zbuf */
+   if (png_ptr->zstream.avail_out < (png_uint_32)png_ptr->zbuf_size)
+      png_write_chunk_data(png_ptr, png_ptr->zbuf,
+         png_ptr->zbuf_size - png_ptr->zstream.avail_out);
+
+   /* reset zlib for another zTXt/iTXt or image data */
+   deflateReset(&png_ptr->zstream);
+   png_ptr->zstream.data_type = Z_BINARY;
+}
+#endif
+
+/* Write the IHDR chunk, and update the png_struct with the necessary
+ * information.  Note that the rest of this code depends upon this
+ * information being correct.
+ */
+void /* PRIVATE */
+png_write_IHDR(png_structp png_ptr, png_uint_32 width, png_uint_32 height,
+   int bit_depth, int color_type, int compression_type, int filter_type,
+   int interlace_type)
+{
+#ifdef PNG_USE_LOCAL_ARRAYS
+   PNG_IHDR;
+#endif
+   png_byte buf[13]; /* buffer to store the IHDR info */
+
+   png_debug(1, "in png_write_IHDR\n");
+   /* Check that we have valid input data from the application info */
+   switch (color_type)
+   {
+      case PNG_COLOR_TYPE_GRAY:
+         switch (bit_depth)
+         {
+            case 1:
+            case 2:
+            case 4:
+            case 8:
+            case 16: png_ptr->channels = 1; break;
+            default: png_error(png_ptr,"Invalid bit depth for grayscale image");
+         }
+         break;
+      case PNG_COLOR_TYPE_RGB:
+         if (bit_depth != 8 && bit_depth != 16)
+            png_error(png_ptr, "Invalid bit depth for RGB image");
+         png_ptr->channels = 3;
+         break;
+      case PNG_COLOR_TYPE_PALETTE:
+         switch (bit_depth)
+         {
+            case 1:
+            case 2:
+            case 4:
+            case 8: png_ptr->channels = 1; break;
+            default: png_error(png_ptr, "Invalid bit depth for paletted image");
+         }
+         break;
+      case PNG_COLOR_TYPE_GRAY_ALPHA:
+         if (bit_depth != 8 && bit_depth != 16)
+            png_error(png_ptr, "Invalid bit depth for grayscale+alpha image");
+         png_ptr->channels = 2;
+         break;
+      case PNG_COLOR_TYPE_RGB_ALPHA:
+         if (bit_depth != 8 && bit_depth != 16)
+            png_error(png_ptr, "Invalid bit depth for RGBA image");
+         png_ptr->channels = 4;
+         break;
+      default:
+         png_error(png_ptr, "Invalid image color type specified");
+   }
+
+   if (compression_type != PNG_COMPRESSION_TYPE_BASE)
+   {
+      png_warning(png_ptr, "Invalid compression type specified");
+      compression_type = PNG_COMPRESSION_TYPE_BASE;
+   }
+
+   /* Write filter_method 64 (intrapixel differencing) only if
+    * 1. Libpng was compiled with PNG_MNG_FEATURES_SUPPORTED and
+    * 2. Libpng did not write a PNG signature (this filter_method is only
+    *    used in PNG datastreams that are embedded in MNG datastreams) and
+    * 3. The application called png_permit_mng_features with a mask that
+    *    included PNG_FLAG_MNG_FILTER_64 and
+    * 4. The filter_method is 64 and
+    * 5. The color_type is RGB or RGBA
+    */
+   if (
+#if defined(PNG_MNG_FEATURES_SUPPORTED)
+      !((png_ptr->mng_features_permitted & PNG_FLAG_MNG_FILTER_64) &&
+      ((png_ptr->mode&PNG_HAVE_PNG_SIGNATURE) == 0) &&
+      (color_type == PNG_COLOR_TYPE_RGB ||
+       color_type == PNG_COLOR_TYPE_RGB_ALPHA) &&
+      (filter_type == PNG_INTRAPIXEL_DIFFERENCING)) &&
+#endif
+      filter_type != PNG_FILTER_TYPE_BASE)
+   {
+      png_warning(png_ptr, "Invalid filter type specified");
+      filter_type = PNG_FILTER_TYPE_BASE;
+   }
+
+#ifdef PNG_WRITE_INTERLACING_SUPPORTED
+   if (interlace_type != PNG_INTERLACE_NONE &&
+      interlace_type != PNG_INTERLACE_ADAM7)
+   {
+      png_warning(png_ptr, "Invalid interlace type specified");
+      interlace_type = PNG_INTERLACE_ADAM7;
+   }
+#else
+   interlace_type=PNG_INTERLACE_NONE;
+#endif
+
+   /* save off the relevent information */
+   png_ptr->bit_depth = (png_byte)bit_depth;
+   png_ptr->color_type = (png_byte)color_type;
+   png_ptr->interlaced = (png_byte)interlace_type;
+#if defined(PNG_MNG_FEATURES_SUPPORTED)
+   png_ptr->filter_type = (png_byte)filter_type;
+#endif
+   png_ptr->compression_type = (png_byte)compression_type;
+   png_ptr->width = width;
+   png_ptr->height = height;
+
+   png_ptr->pixel_depth = (png_byte)(bit_depth * png_ptr->channels);
+   png_ptr->rowbytes = PNG_ROWBYTES(png_ptr->pixel_depth, width);
+   /* set the usr info, so any transformations can modify it */
+   png_ptr->usr_width = png_ptr->width;
+   png_ptr->usr_bit_depth = png_ptr->bit_depth;
+   png_ptr->usr_channels = png_ptr->channels;
+
+   /* pack the header information into the buffer */
+   png_save_uint_32(buf, width);
+   png_save_uint_32(buf + 4, height);
+   buf[8] = (png_byte)bit_depth;
+   buf[9] = (png_byte)color_type;
+   buf[10] = (png_byte)compression_type;
+   buf[11] = (png_byte)filter_type;
+   buf[12] = (png_byte)interlace_type;
+
+   /* write the chunk */
+   png_write_chunk(png_ptr, png_IHDR, buf, (png_size_t)13);
+
+   /* initialize zlib with PNG info */
+   png_ptr->zstream.zalloc = png_zalloc;
+   png_ptr->zstream.zfree = png_zfree;
+   png_ptr->zstream.opaque = (voidpf)png_ptr;
+   if (!(png_ptr->do_filter))
+   {
+      if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE ||
+         png_ptr->bit_depth < 8)
+         png_ptr->do_filter = PNG_FILTER_NONE;
+      else
+         png_ptr->do_filter = PNG_ALL_FILTERS;
+   }
+   if (!(png_ptr->flags & PNG_FLAG_ZLIB_CUSTOM_STRATEGY))
+   {
+      if (png_ptr->do_filter != PNG_FILTER_NONE)
+         png_ptr->zlib_strategy = Z_FILTERED;
+      else
+         png_ptr->zlib_strategy = Z_DEFAULT_STRATEGY;
+   }
+   if (!(png_ptr->flags & PNG_FLAG_ZLIB_CUSTOM_LEVEL))
+      png_ptr->zlib_level = Z_DEFAULT_COMPRESSION;
+   if (!(png_ptr->flags & PNG_FLAG_ZLIB_CUSTOM_MEM_LEVEL))
+      png_ptr->zlib_mem_level = 8;
+   if (!(png_ptr->flags & PNG_FLAG_ZLIB_CUSTOM_WINDOW_BITS))
+      png_ptr->zlib_window_bits = 15;
+   if (!(png_ptr->flags & PNG_FLAG_ZLIB_CUSTOM_METHOD))
+      png_ptr->zlib_method = 8;
+   if (deflateInit2(&png_ptr->zstream, png_ptr->zlib_level,
+      png_ptr->zlib_method, png_ptr->zlib_window_bits,
+      png_ptr->zlib_mem_level, png_ptr->zlib_strategy) != Z_OK)
+       png_error(png_ptr, "zlib failed to initialize compressor");
+   png_ptr->zstream.next_out = png_ptr->zbuf;
+   png_ptr->zstream.avail_out = (uInt)png_ptr->zbuf_size;
+   /* libpng is not interested in zstream.data_type */
+   /* set it to a predefined value, to avoid its evaluation inside zlib */
+   png_ptr->zstream.data_type = Z_BINARY;
+
+   png_ptr->mode = PNG_HAVE_IHDR;
+}
+
+/* write the palette.  We are careful not to trust png_color to be in the
+ * correct order for PNG, so people can redefine it to any convenient
+ * structure.
+ */
+void /* PRIVATE */
+png_write_PLTE(png_structp png_ptr, png_colorp palette, png_uint_32 num_pal)
+{
+#ifdef PNG_USE_LOCAL_ARRAYS
+   PNG_PLTE;
+#endif
+   png_uint_32 i;
+   png_colorp pal_ptr;
+   png_byte buf[3];
+
+   png_debug(1, "in png_write_PLTE\n");
+   if ((
+#if defined(PNG_MNG_FEATURES_SUPPORTED)
+        !(png_ptr->mng_features_permitted & PNG_FLAG_MNG_EMPTY_PLTE) &&
+#endif
+        num_pal == 0) || num_pal > 256)
+   {
+     if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
+     {
+        png_error(png_ptr, "Invalid number of colors in palette");
+     }
+     else
+     {
+        png_warning(png_ptr, "Invalid number of colors in palette");
+        return;
+     }
+   }
+
+   if (!(png_ptr->color_type&PNG_COLOR_MASK_COLOR))
+   {
+      png_warning(png_ptr,
+        "Ignoring request to write a PLTE chunk in grayscale PNG");
+      return;
+   }
+
+   png_ptr->num_palette = (png_uint_16)num_pal;
+   png_debug1(3, "num_palette = %d\n", png_ptr->num_palette);
+
+   png_write_chunk_start(png_ptr, png_PLTE, num_pal * 3);
+#ifndef PNG_NO_POINTER_INDEXING
+   for (i = 0, pal_ptr = palette; i < num_pal; i++, pal_ptr++)
+   {
+      buf[0] = pal_ptr->red;
+      buf[1] = pal_ptr->green;
+      buf[2] = pal_ptr->blue;
+      png_write_chunk_data(png_ptr, buf, (png_size_t)3);
+   }
+#else
+   /* This is a little slower but some buggy compilers need to do this instead */
+   pal_ptr=palette;
+   for (i = 0; i < num_pal; i++)
+   {
+      buf[0] = pal_ptr[i].red;
+      buf[1] = pal_ptr[i].green;
+      buf[2] = pal_ptr[i].blue;
+      png_write_chunk_data(png_ptr, buf, (png_size_t)3);
+   }
+#endif
+   png_write_chunk_end(png_ptr);
+   png_ptr->mode |= PNG_HAVE_PLTE;
+}
+
+/* write an IDAT chunk */
+void /* PRIVATE */
+png_write_IDAT(png_structp png_ptr, png_bytep data, png_size_t length)
+{
+#ifdef PNG_USE_LOCAL_ARRAYS
+   PNG_IDAT;
+#endif
+   png_debug(1, "in png_write_IDAT\n");
+
+   /* Optimize the CMF field in the zlib stream. */
+   /* This hack of the zlib stream is compliant to the stream specification. */
+   if (!(png_ptr->mode & PNG_HAVE_IDAT) &&
+       png_ptr->compression_type == PNG_COMPRESSION_TYPE_BASE)
+   {
+      unsigned int z_cmf = data[0];  /* zlib compression method and flags */
+      if ((z_cmf & 0x0f) == 8 && (z_cmf & 0xf0) <= 0x70)
+      {
+         /* Avoid memory underflows and multiplication overflows. */
+         /* The conditions below are practically always satisfied;
+            however, they still must be checked. */
+         if (length >= 2 &&
+             png_ptr->height < 16384 && png_ptr->width < 16384)
+         {
+            png_uint_32 uncompressed_idat_size = png_ptr->height *
+               ((png_ptr->width *
+               png_ptr->channels * png_ptr->bit_depth + 15) >> 3);
+            unsigned int z_cinfo = z_cmf >> 4;
+            unsigned int half_z_window_size = 1 << (z_cinfo + 7);
+            while (uncompressed_idat_size <= half_z_window_size &&
+                   half_z_window_size >= 256)
+            {
+               z_cinfo--;
+               half_z_window_size >>= 1;
+            }
+            z_cmf = (z_cmf & 0x0f) | (z_cinfo << 4);
+            if (data[0] != (png_byte)z_cmf)
+            {
+               data[0] = (png_byte)z_cmf;
+               data[1] &= 0xe0;
+               data[1] += (png_byte)(0x1f - ((z_cmf << 8) + data[1]) % 0x1f);
+            }
+         }
+      }
+      else
+         png_error(png_ptr,
+            "Invalid zlib compression method or flags in IDAT");
+   }
+
+   png_write_chunk(png_ptr, png_IDAT, data, length);
+   png_ptr->mode |= PNG_HAVE_IDAT;
+}
+
+/* write an IEND chunk */
+void /* PRIVATE */
+png_write_IEND(png_structp png_ptr)
+{
+#ifdef PNG_USE_LOCAL_ARRAYS
+   PNG_IEND;
+#endif
+   png_debug(1, "in png_write_IEND\n");
+   png_write_chunk(png_ptr, png_IEND, png_bytep_NULL,
+     (png_size_t)0);
+   png_ptr->mode |= PNG_HAVE_IEND;
+}
+
+#if defined(PNG_WRITE_gAMA_SUPPORTED)
+/* write a gAMA chunk */
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+void /* PRIVATE */
+png_write_gAMA(png_structp png_ptr, double file_gamma)
+{
+#ifdef PNG_USE_LOCAL_ARRAYS
+   PNG_gAMA;
+#endif
+   png_uint_32 igamma;
+   png_byte buf[4];
+
+   png_debug(1, "in png_write_gAMA\n");
+   /* file_gamma is saved in 1/100,000ths */
+   igamma = (png_uint_32)(file_gamma * 100000.0 + 0.5);
+   png_save_uint_32(buf, igamma);
+   png_write_chunk(png_ptr, png_gAMA, buf, (png_size_t)4);
+}
+#endif
+#ifdef PNG_FIXED_POINT_SUPPORTED
+void /* PRIVATE */
+png_write_gAMA_fixed(png_structp png_ptr, png_fixed_point file_gamma)
+{
+#ifdef PNG_USE_LOCAL_ARRAYS
+   PNG_gAMA;
+#endif
+   png_byte buf[4];
+
+   png_debug(1, "in png_write_gAMA\n");
+   /* file_gamma is saved in 1/100,000ths */
+   png_save_uint_32(buf, (png_uint_32)file_gamma);
+   png_write_chunk(png_ptr, png_gAMA, buf, (png_size_t)4);
+}
+#endif
+#endif
+
+#if defined(PNG_WRITE_sRGB_SUPPORTED)
+/* write a sRGB chunk */
+void /* PRIVATE */
+png_write_sRGB(png_structp png_ptr, int srgb_intent)
+{
+#ifdef PNG_USE_LOCAL_ARRAYS
+   PNG_sRGB;
+#endif
+   png_byte buf[1];
+
+   png_debug(1, "in png_write_sRGB\n");
+   if(srgb_intent >= PNG_sRGB_INTENT_LAST)
+         png_warning(png_ptr,
+            "Invalid sRGB rendering intent specified");
+   buf[0]=(png_byte)srgb_intent;
+   png_write_chunk(png_ptr, png_sRGB, buf, (png_size_t)1);
+}
+#endif
+
+#if defined(PNG_WRITE_iCCP_SUPPORTED)
+/* write an iCCP chunk */
+void /* PRIVATE */
+png_write_iCCP(png_structp png_ptr, png_charp name, int compression_type,
+   png_charp profile, int profile_len)
+{
+#ifdef PNG_USE_LOCAL_ARRAYS
+   PNG_iCCP;
+#endif
+   png_size_t name_len;
+   png_charp new_name;
+   compression_state comp;
+   int embedded_profile_len = 0;
+
+   png_debug(1, "in png_write_iCCP\n");
+
+   comp.num_output_ptr = 0;
+   comp.max_output_ptr = 0;
+   comp.output_ptr = NULL;
+   comp.input = NULL;
+   comp.input_len = 0;
+
+   if (name == NULL || (name_len = png_check_keyword(png_ptr, name,
+      &new_name)) == 0)
+   {
+      png_warning(png_ptr, "Empty keyword in iCCP chunk");
+      return;
+   }
+
+   if (compression_type != PNG_COMPRESSION_TYPE_BASE)
+      png_warning(png_ptr, "Unknown compression type in iCCP chunk");
+
+   if (profile == NULL)
+      profile_len = 0;
+
+   if (profile_len > 3)
+      embedded_profile_len =
+          ((*( (png_bytep)profile  ))<<24) |
+          ((*( (png_bytep)profile+1))<<16) |
+          ((*( (png_bytep)profile+2))<< 8) |
+          ((*( (png_bytep)profile+3))    );
+
+   if (profile_len < embedded_profile_len)
+     {
+        png_warning(png_ptr,
+          "Embedded profile length too large in iCCP chunk");
+        return;
+     }
+
+   if (profile_len > embedded_profile_len)
+     {
+        png_warning(png_ptr,
+          "Truncating profile to actual length in iCCP chunk");
+        profile_len = embedded_profile_len;
+     }
+
+   if (profile_len)
+       profile_len = png_text_compress(png_ptr, profile, (png_size_t)profile_len,
+          PNG_COMPRESSION_TYPE_BASE, &comp);
+
+   /* make sure we include the NULL after the name and the compression type */
+   png_write_chunk_start(png_ptr, png_iCCP,
+          (png_uint_32)name_len+profile_len+2);
+   new_name[name_len+1]=0x00;
+   png_write_chunk_data(png_ptr, (png_bytep)new_name, name_len + 2);
+
+   if (profile_len)
+      png_write_compressed_data_out(png_ptr, &comp);
+
+   png_write_chunk_end(png_ptr);
+   png_free(png_ptr, new_name);
+}
+#endif
+
+#if defined(PNG_WRITE_sPLT_SUPPORTED)
+/* write a sPLT chunk */
+void /* PRIVATE */
+png_write_sPLT(png_structp png_ptr, png_sPLT_tp spalette)
+{
+#ifdef PNG_USE_LOCAL_ARRAYS
+   PNG_sPLT;
+#endif
+   png_size_t name_len;
+   png_charp new_name;
+   png_byte entrybuf[10];
+   int entry_size = (spalette->depth == 8 ? 6 : 10);
+   int palette_size = entry_size * spalette->nentries;
+   png_sPLT_entryp ep;
+#ifdef PNG_NO_POINTER_INDEXING
+   int i;
+#endif
+
+   png_debug(1, "in png_write_sPLT\n");
+   if (spalette->name == NULL || (name_len = png_check_keyword(png_ptr,
+      spalette->name, &new_name))==0)
+   {
+      png_warning(png_ptr, "Empty keyword in sPLT chunk");
+      return;
+   }
+
+   /* make sure we include the NULL after the name */
+   png_write_chunk_start(png_ptr, png_sPLT,
+          (png_uint_32)(name_len + 2 + palette_size));
+   png_write_chunk_data(png_ptr, (png_bytep)new_name, name_len + 1);
+   png_write_chunk_data(png_ptr, (png_bytep)&spalette->depth, 1);
+
+   /* loop through each palette entry, writing appropriately */
+#ifndef PNG_NO_POINTER_INDEXING
+   for (ep = spalette->entries; ep<spalette->entries+spalette->nentries; ep++)
+   {
+       if (spalette->depth == 8)
+       {
+           entrybuf[0] = (png_byte)ep->red;
+           entrybuf[1] = (png_byte)ep->green;
+           entrybuf[2] = (png_byte)ep->blue;
+           entrybuf[3] = (png_byte)ep->alpha;
+           png_save_uint_16(entrybuf + 4, ep->frequency);
+       }
+       else
+       {
+           png_save_uint_16(entrybuf + 0, ep->red);
+           png_save_uint_16(entrybuf + 2, ep->green);
+           png_save_uint_16(entrybuf + 4, ep->blue);
+           png_save_uint_16(entrybuf + 6, ep->alpha);
+           png_save_uint_16(entrybuf + 8, ep->frequency);
+       }
+       png_write_chunk_data(png_ptr, entrybuf, (png_size_t)entry_size);
+   }
+#else
+   ep=spalette->entries;
+   for (i=0; i>spalette->nentries; i++)
+   {
+       if (spalette->depth == 8)
+       {
+           entrybuf[0] = (png_byte)ep[i].red;
+           entrybuf[1] = (png_byte)ep[i].green;
+           entrybuf[2] = (png_byte)ep[i].blue;
+           entrybuf[3] = (png_byte)ep[i].alpha;
+           png_save_uint_16(entrybuf + 4, ep[i].frequency);
+       }
+       else
+       {
+           png_save_uint_16(entrybuf + 0, ep[i].red);
+           png_save_uint_16(entrybuf + 2, ep[i].green);
+           png_save_uint_16(entrybuf + 4, ep[i].blue);
+           png_save_uint_16(entrybuf + 6, ep[i].alpha);
+           png_save_uint_16(entrybuf + 8, ep[i].frequency);
+       }
+       png_write_chunk_data(png_ptr, entrybuf, entry_size);
+   }
+#endif
+
+   png_write_chunk_end(png_ptr);
+   png_free(png_ptr, new_name);
+}
+#endif
+
+#if defined(PNG_WRITE_sBIT_SUPPORTED)
+/* write the sBIT chunk */
+void /* PRIVATE */
+png_write_sBIT(png_structp png_ptr, png_color_8p sbit, int color_type)
+{
+#ifdef PNG_USE_LOCAL_ARRAYS
+   PNG_sBIT;
+#endif
+   png_byte buf[4];
+   png_size_t size;
+
+   png_debug(1, "in png_write_sBIT\n");
+   /* make sure we don't depend upon the order of PNG_COLOR_8 */
+   if (color_type & PNG_COLOR_MASK_COLOR)
+   {
+      png_byte maxbits;
+
+      maxbits = (png_byte)(color_type==PNG_COLOR_TYPE_PALETTE ? 8 :
+                png_ptr->usr_bit_depth);
+      if (sbit->red == 0 || sbit->red > maxbits ||
+          sbit->green == 0 || sbit->green > maxbits ||
+          sbit->blue == 0 || sbit->blue > maxbits)
+      {
+         png_warning(png_ptr, "Invalid sBIT depth specified");
+         return;
+      }
+      buf[0] = sbit->red;
+      buf[1] = sbit->green;
+      buf[2] = sbit->blue;
+      size = 3;
+   }
+   else
+   {
+      if (sbit->gray == 0 || sbit->gray > png_ptr->usr_bit_depth)
+      {
+         png_warning(png_ptr, "Invalid sBIT depth specified");
+         return;
+      }
+      buf[0] = sbit->gray;
+      size = 1;
+   }
+
+   if (color_type & PNG_COLOR_MASK_ALPHA)
+   {
+      if (sbit->alpha == 0 || sbit->alpha > png_ptr->usr_bit_depth)
+      {
+         png_warning(png_ptr, "Invalid sBIT depth specified");
+         return;
+      }
+      buf[size++] = sbit->alpha;
+   }
+
+   png_write_chunk(png_ptr, png_sBIT, buf, size);
+}
+#endif
+
+#if defined(PNG_WRITE_cHRM_SUPPORTED)
+/* write the cHRM chunk */
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+void /* PRIVATE */
+png_write_cHRM(png_structp png_ptr, double white_x, double white_y,
+   double red_x, double red_y, double green_x, double green_y,
+   double blue_x, double blue_y)
+{
+#ifdef PNG_USE_LOCAL_ARRAYS
+   PNG_cHRM;
+#endif
+   png_byte buf[32];
+   png_uint_32 itemp;
+
+   png_debug(1, "in png_write_cHRM\n");
+   /* each value is saved in 1/100,000ths */
+   if (white_x < 0 || white_x > 0.8 || white_y < 0 || white_y > 0.8 ||
+       white_x + white_y > 1.0)
+   {
+      png_warning(png_ptr, "Invalid cHRM white point specified");
+#if !defined(PNG_NO_CONSOLE_IO)
+      fprintf(stderr,"white_x=%f, white_y=%f\n",white_x, white_y);
+#endif
+      return;
+   }
+   itemp = (png_uint_32)(white_x * 100000.0 + 0.5);
+   png_save_uint_32(buf, itemp);
+   itemp = (png_uint_32)(white_y * 100000.0 + 0.5);
+   png_save_uint_32(buf + 4, itemp);
+
+   if (red_x < 0 ||  red_y < 0 || red_x + red_y > 1.0)
+   {
+      png_warning(png_ptr, "Invalid cHRM red point specified");
+      return;
+   }
+   itemp = (png_uint_32)(red_x * 100000.0 + 0.5);
+   png_save_uint_32(buf + 8, itemp);
+   itemp = (png_uint_32)(red_y * 100000.0 + 0.5);
+   png_save_uint_32(buf + 12, itemp);
+
+   if (green_x < 0 || green_y < 0 || green_x + green_y > 1.0)
+   {
+      png_warning(png_ptr, "Invalid cHRM green point specified");
+      return;
+   }
+   itemp = (png_uint_32)(green_x * 100000.0 + 0.5);
+   png_save_uint_32(buf + 16, itemp);
+   itemp = (png_uint_32)(green_y * 100000.0 + 0.5);
+   png_save_uint_32(buf + 20, itemp);
+
+   if (blue_x < 0 || blue_y < 0 || blue_x + blue_y > 1.0)
+   {
+      png_warning(png_ptr, "Invalid cHRM blue point specified");
+      return;
+   }
+   itemp = (png_uint_32)(blue_x * 100000.0 + 0.5);
+   png_save_uint_32(buf + 24, itemp);
+   itemp = (png_uint_32)(blue_y * 100000.0 + 0.5);
+   png_save_uint_32(buf + 28, itemp);
+
+   png_write_chunk(png_ptr, png_cHRM, buf, (png_size_t)32);
+}
+#endif
+#ifdef PNG_FIXED_POINT_SUPPORTED
+void /* PRIVATE */
+png_write_cHRM_fixed(png_structp png_ptr, png_fixed_point white_x,
+   png_fixed_point white_y, png_fixed_point red_x, png_fixed_point red_y,
+   png_fixed_point green_x, png_fixed_point green_y, png_fixed_point blue_x,
+   png_fixed_point blue_y)
+{
+#ifdef PNG_USE_LOCAL_ARRAYS
+   PNG_cHRM;
+#endif
+   png_byte buf[32];
+
+   png_debug(1, "in png_write_cHRM\n");
+   /* each value is saved in 1/100,000ths */
+   if (white_x > 80000L || white_y > 80000L || white_x + white_y > 100000L)
+   {
+      png_warning(png_ptr, "Invalid fixed cHRM white point specified");
+#if !defined(PNG_NO_CONSOLE_IO)
+      fprintf(stderr,"white_x=%ld, white_y=%ld\n",white_x, white_y);
+#endif
+      return;
+   }
+   png_save_uint_32(buf, (png_uint_32)white_x);
+   png_save_uint_32(buf + 4, (png_uint_32)white_y);
+
+   if (red_x + red_y > 100000L)
+   {
+      png_warning(png_ptr, "Invalid cHRM fixed red point specified");
+      return;
+   }
+   png_save_uint_32(buf + 8, (png_uint_32)red_x);
+   png_save_uint_32(buf + 12, (png_uint_32)red_y);
+
+   if (green_x + green_y > 100000L)
+   {
+      png_warning(png_ptr, "Invalid fixed cHRM green point specified");
+      return;
+   }
+   png_save_uint_32(buf + 16, (png_uint_32)green_x);
+   png_save_uint_32(buf + 20, (png_uint_32)green_y);
+
+   if (blue_x + blue_y > 100000L)
+   {
+      png_warning(png_ptr, "Invalid fixed cHRM blue point specified");
+      return;
+   }
+   png_save_uint_32(buf + 24, (png_uint_32)blue_x);
+   png_save_uint_32(buf + 28, (png_uint_32)blue_y);
+
+   png_write_chunk(png_ptr, png_cHRM, buf, (png_size_t)32);
+}
+#endif
+#endif
+
+#if defined(PNG_WRITE_tRNS_SUPPORTED)
+/* write the tRNS chunk */
+void /* PRIVATE */
+png_write_tRNS(png_structp png_ptr, png_bytep trans, png_color_16p tran,
+   int num_trans, int color_type)
+{
+#ifdef PNG_USE_LOCAL_ARRAYS
+   PNG_tRNS;
+#endif
+   png_byte buf[6];
+
+   png_debug(1, "in png_write_tRNS\n");
+   if (color_type == PNG_COLOR_TYPE_PALETTE)
+   {
+      if (num_trans <= 0 || num_trans > (int)png_ptr->num_palette)
+      {
+         png_warning(png_ptr,"Invalid number of transparent colors specified");
+         return;
+      }
+      /* write the chunk out as it is */
+      png_write_chunk(png_ptr, png_tRNS, trans, (png_size_t)num_trans);
+   }
+   else if (color_type == PNG_COLOR_TYPE_GRAY)
+   {
+      /* one 16 bit value */
+      if(tran->gray >= (1 << png_ptr->bit_depth))
+      {
+         png_warning(png_ptr,
+           "Ignoring attempt to write tRNS chunk out-of-range for bit_depth");
+         return;
+      }
+      png_save_uint_16(buf, tran->gray);
+      png_write_chunk(png_ptr, png_tRNS, buf, (png_size_t)2);
+   }
+   else if (color_type == PNG_COLOR_TYPE_RGB)
+   {
+      /* three 16 bit values */
+      png_save_uint_16(buf, tran->red);
+      png_save_uint_16(buf + 2, tran->green);
+      png_save_uint_16(buf + 4, tran->blue);
+      if(png_ptr->bit_depth == 8 && (buf[0] | buf[2] | buf[4]))
+         {
+            png_warning(png_ptr,
+              "Ignoring attempt to write 16-bit tRNS chunk when bit_depth is 8");
+            return;
+         }
+      png_write_chunk(png_ptr, png_tRNS, buf, (png_size_t)6);
+   }
+   else
+   {
+      png_warning(png_ptr, "Can't write tRNS with an alpha channel");
+   }
+}
+#endif
+
+#if defined(PNG_WRITE_bKGD_SUPPORTED)
+/* write the background chunk */
+void /* PRIVATE */
+png_write_bKGD(png_structp png_ptr, png_color_16p back, int color_type)
+{
+#ifdef PNG_USE_LOCAL_ARRAYS
+   PNG_bKGD;
+#endif
+   png_byte buf[6];
+
+   png_debug(1, "in png_write_bKGD\n");
+   if (color_type == PNG_COLOR_TYPE_PALETTE)
+   {
+      if (
+#if defined(PNG_MNG_FEATURES_SUPPORTED)
+          (png_ptr->num_palette ||
+          (!(png_ptr->mng_features_permitted & PNG_FLAG_MNG_EMPTY_PLTE))) &&
+#endif
+         back->index > png_ptr->num_palette)
+      {
+         png_warning(png_ptr, "Invalid background palette index");
+         return;
+      }
+      buf[0] = back->index;
+      png_write_chunk(png_ptr, png_bKGD, buf, (png_size_t)1);
+   }
+   else if (color_type & PNG_COLOR_MASK_COLOR)
+   {
+      png_save_uint_16(buf, back->red);
+      png_save_uint_16(buf + 2, back->green);
+      png_save_uint_16(buf + 4, back->blue);
+      if(png_ptr->bit_depth == 8 && (buf[0] | buf[2] | buf[4]))
+         {
+            png_warning(png_ptr,
+              "Ignoring attempt to write 16-bit bKGD chunk when bit_depth is 8");
+            return;
+         }
+      png_write_chunk(png_ptr, png_bKGD, buf, (png_size_t)6);
+   }
+   else
+   {
+      if(back->gray >= (1 << png_ptr->bit_depth))
+      {
+         png_warning(png_ptr,
+           "Ignoring attempt to write bKGD chunk out-of-range for bit_depth");
+         return;
+      }
+      png_save_uint_16(buf, back->gray);
+      png_write_chunk(png_ptr, png_bKGD, buf, (png_size_t)2);
+   }
+}
+#endif
+
+#if defined(PNG_WRITE_hIST_SUPPORTED)
+/* write the histogram */
+void /* PRIVATE */
+png_write_hIST(png_structp png_ptr, png_uint_16p hist, int num_hist)
+{
+#ifdef PNG_USE_LOCAL_ARRAYS
+   PNG_hIST;
+#endif
+   int i;
+   png_byte buf[3];
+
+   png_debug(1, "in png_write_hIST\n");
+   if (num_hist > (int)png_ptr->num_palette)
+   {
+      png_debug2(3, "num_hist = %d, num_palette = %d\n", num_hist,
+         png_ptr->num_palette);
+      png_warning(png_ptr, "Invalid number of histogram entries specified");
+      return;
+   }
+
+   png_write_chunk_start(png_ptr, png_hIST, (png_uint_32)(num_hist * 2));
+   for (i = 0; i < num_hist; i++)
+   {
+      png_save_uint_16(buf, hist[i]);
+      png_write_chunk_data(png_ptr, buf, (png_size_t)2);
+   }
+   png_write_chunk_end(png_ptr);
+}
+#endif
+
+#if defined(PNG_WRITE_TEXT_SUPPORTED) || defined(PNG_WRITE_pCAL_SUPPORTED) || \
+    defined(PNG_WRITE_iCCP_SUPPORTED) || defined(PNG_WRITE_sPLT_SUPPORTED)
+/* Check that the tEXt or zTXt keyword is valid per PNG 1.0 specification,
+ * and if invalid, correct the keyword rather than discarding the entire
+ * chunk.  The PNG 1.0 specification requires keywords 1-79 characters in
+ * length, forbids leading or trailing whitespace, multiple internal spaces,
+ * and the non-break space (0x80) from ISO 8859-1.  Returns keyword length.
+ *
+ * The new_key is allocated to hold the corrected keyword and must be freed
+ * by the calling routine.  This avoids problems with trying to write to
+ * static keywords without having to have duplicate copies of the strings.
+ */
+png_size_t /* PRIVATE */
+png_check_keyword(png_structp png_ptr, png_charp key, png_charpp new_key)
+{
+   png_size_t key_len;
+   png_charp kp, dp;
+   int kflag;
+   int kwarn=0;
+
+   png_debug(1, "in png_check_keyword\n");
+   *new_key = NULL;
+
+   if (key == NULL || (key_len = png_strlen(key)) == 0)
+   {
+      png_warning(png_ptr, "zero length keyword");
+      return ((png_size_t)0);
+   }
+
+   png_debug1(2, "Keyword to be checked is '%s'\n", key);
+
+   *new_key = (png_charp)png_malloc_warn(png_ptr, (png_uint_32)(key_len + 2));
+   if (*new_key == NULL)
+   {
+      png_warning(png_ptr, "Out of memory while procesing keyword");
+      return ((png_size_t)0);
+   }
+
+   /* Replace non-printing characters with a blank and print a warning */
+   for (kp = key, dp = *new_key; *kp != '\0'; kp++, dp++)
+   {
+      if ((png_byte)*kp < 0x20 ||
+         ((png_byte)*kp > 0x7E && (png_byte)*kp < 0xA1))
+      {
+#if !defined(PNG_NO_STDIO) && !defined(_WIN32_WCE)
+         char msg[40];
+
+         png_snprintf(msg, 40,
+           "invalid keyword character 0x%02X", (png_byte)*kp);
+         png_warning(png_ptr, msg);
+#else
+         png_warning(png_ptr, "invalid character in keyword");
+#endif
+         *dp = ' ';
+      }
+      else
+      {
+         *dp = *kp;
+      }
+   }
+   *dp = '\0';
+
+   /* Remove any trailing white space. */
+   kp = *new_key + key_len - 1;
+   if (*kp == ' ')
+   {
+      png_warning(png_ptr, "trailing spaces removed from keyword");
+
+      while (*kp == ' ')
+      {
+        *(kp--) = '\0';
+        key_len--;
+      }
+   }
+
+   /* Remove any leading white space. */
+   kp = *new_key;
+   if (*kp == ' ')
+   {
+      png_warning(png_ptr, "leading spaces removed from keyword");
+
+      while (*kp == ' ')
+      {
+        kp++;
+        key_len--;
+      }
+   }
+
+   png_debug1(2, "Checking for multiple internal spaces in '%s'\n", kp);
+
+   /* Remove multiple internal spaces. */
+   for (kflag = 0, dp = *new_key; *kp != '\0'; kp++)
+   {
+      if (*kp == ' ' && kflag == 0)
+      {
+         *(dp++) = *kp;
+         kflag = 1;
+      }
+      else if (*kp == ' ')
+      {
+         key_len--;
+         kwarn=1;
+      }
+      else
+      {
+         *(dp++) = *kp;
+         kflag = 0;
+      }
+   }
+   *dp = '\0';
+   if(kwarn)
+      png_warning(png_ptr, "extra interior spaces removed from keyword");
+
+   if (key_len == 0)
+   {
+      png_free(png_ptr, *new_key);
+      *new_key=NULL;
+      png_warning(png_ptr, "Zero length keyword");
+   }
+
+   if (key_len > 79)
+   {
+      png_warning(png_ptr, "keyword length must be 1 - 79 characters");
+      new_key[79] = '\0';
+      key_len = 79;
+   }
+
+   return (key_len);
+}
+#endif
+
+#if defined(PNG_WRITE_tEXt_SUPPORTED)
+/* write a tEXt chunk */
+void /* PRIVATE */
+png_write_tEXt(png_structp png_ptr, png_charp key, png_charp text,
+   png_size_t text_len)
+{
+#ifdef PNG_USE_LOCAL_ARRAYS
+   PNG_tEXt;
+#endif
+   png_size_t key_len;
+   png_charp new_key;
+
+   png_debug(1, "in png_write_tEXt\n");
+   if (key == NULL || (key_len = png_check_keyword(png_ptr, key, &new_key))==0)
+   {
+      png_warning(png_ptr, "Empty keyword in tEXt chunk");
+      return;
+   }
+
+   if (text == NULL || *text == '\0')
+      text_len = 0;
+   else
+      text_len = png_strlen(text);
+
+   /* make sure we include the 0 after the key */
+   png_write_chunk_start(png_ptr, png_tEXt, (png_uint_32)key_len+text_len+1);
+   /*
+    * We leave it to the application to meet PNG-1.0 requirements on the
+    * contents of the text.  PNG-1.0 through PNG-1.2 discourage the use of
+    * any non-Latin-1 characters except for NEWLINE.  ISO PNG will forbid them.
+    * The NUL character is forbidden by PNG-1.0 through PNG-1.2 and ISO PNG.
+    */
+   png_write_chunk_data(png_ptr, (png_bytep)new_key, key_len + 1);
+   if (text_len)
+      png_write_chunk_data(png_ptr, (png_bytep)text, text_len);
+
+   png_write_chunk_end(png_ptr);
+   png_free(png_ptr, new_key);
+}
+#endif
+
+#if defined(PNG_WRITE_zTXt_SUPPORTED)
+/* write a compressed text chunk */
+void /* PRIVATE */
+png_write_zTXt(png_structp png_ptr, png_charp key, png_charp text,
+   png_size_t text_len, int compression)
+{
+#ifdef PNG_USE_LOCAL_ARRAYS
+   PNG_zTXt;
+#endif
+   png_size_t key_len;
+   char buf[1];
+   png_charp new_key;
+   compression_state comp;
+
+   png_debug(1, "in png_write_zTXt\n");
+
+   comp.num_output_ptr = 0;
+   comp.max_output_ptr = 0;
+   comp.output_ptr = NULL;
+   comp.input = NULL;
+   comp.input_len = 0;
+
+   if (key == NULL || (key_len = png_check_keyword(png_ptr, key, &new_key))==0)
+   {
+      png_warning(png_ptr, "Empty keyword in zTXt chunk");
+      return;
+   }
+
+   if (text == NULL || *text == '\0' || compression==PNG_TEXT_COMPRESSION_NONE)
+   {
+      png_write_tEXt(png_ptr, new_key, text, (png_size_t)0);
+      png_free(png_ptr, new_key);
+      return;
+   }
+
+   text_len = png_strlen(text);
+
+   /* compute the compressed data; do it now for the length */
+   text_len = png_text_compress(png_ptr, text, text_len, compression,
+       &comp);
+
+   /* write start of chunk */
+   png_write_chunk_start(png_ptr, png_zTXt, (png_uint_32)
+      (key_len+text_len+2));
+   /* write key */
+   png_write_chunk_data(png_ptr, (png_bytep)new_key, key_len + 1);
+   png_free(png_ptr, new_key);
+
+   buf[0] = (png_byte)compression;
+   /* write compression */
+   png_write_chunk_data(png_ptr, (png_bytep)buf, (png_size_t)1);
+   /* write the compressed data */
+   png_write_compressed_data_out(png_ptr, &comp);
+
+   /* close the chunk */
+   png_write_chunk_end(png_ptr);
+}
+#endif
+
+#if defined(PNG_WRITE_iTXt_SUPPORTED)
+/* write an iTXt chunk */
+void /* PRIVATE */
+png_write_iTXt(png_structp png_ptr, int compression, png_charp key,
+    png_charp lang, png_charp lang_key, png_charp text)
+{
+#ifdef PNG_USE_LOCAL_ARRAYS
+   PNG_iTXt;
+#endif
+   png_size_t lang_len, key_len, lang_key_len, text_len;
+   png_charp new_lang, new_key;
+   png_byte cbuf[2];
+   compression_state comp;
+
+   png_debug(1, "in png_write_iTXt\n");
+
+   comp.num_output_ptr = 0;
+   comp.max_output_ptr = 0;
+   comp.output_ptr = NULL;
+   comp.input = NULL;
+
+   if (key == NULL || (key_len = png_check_keyword(png_ptr, key, &new_key))==0)
+   {
+      png_warning(png_ptr, "Empty keyword in iTXt chunk");
+      return;
+   }
+   if (lang == NULL || (lang_len = png_check_keyword(png_ptr, lang, &new_lang))==0)
+   {
+      png_warning(png_ptr, "Empty language field in iTXt chunk");
+      new_lang = NULL;
+      lang_len = 0;
+   }
+
+   if (lang_key == NULL)
+     lang_key_len = 0;
+   else
+     lang_key_len = png_strlen(lang_key);
+
+   if (text == NULL)
+      text_len = 0;
+   else
+     text_len = png_strlen(text);
+
+   /* compute the compressed data; do it now for the length */
+   text_len = png_text_compress(png_ptr, text, text_len, compression-2,
+      &comp);
+
+
+   /* make sure we include the compression flag, the compression byte,
+    * and the NULs after the key, lang, and lang_key parts */
+
+   png_write_chunk_start(png_ptr, png_iTXt,
+          (png_uint_32)(
+        5 /* comp byte, comp flag, terminators for key, lang and lang_key */
+        + key_len
+        + lang_len
+        + lang_key_len
+        + text_len));
+
+   /*
+    * We leave it to the application to meet PNG-1.0 requirements on the
+    * contents of the text.  PNG-1.0 through PNG-1.2 discourage the use of
+    * any non-Latin-1 characters except for NEWLINE.  ISO PNG will forbid them.
+    * The NUL character is forbidden by PNG-1.0 through PNG-1.2 and ISO PNG.
+    */
+   png_write_chunk_data(png_ptr, (png_bytep)new_key, key_len + 1);
+
+   /* set the compression flag */
+   if (compression == PNG_ITXT_COMPRESSION_NONE || \
+       compression == PNG_TEXT_COMPRESSION_NONE)
+       cbuf[0] = 0;
+   else /* compression == PNG_ITXT_COMPRESSION_zTXt */
+       cbuf[0] = 1;
+   /* set the compression method */
+   cbuf[1] = 0;
+   png_write_chunk_data(png_ptr, cbuf, 2);
+
+   cbuf[0] = 0;
+   png_write_chunk_data(png_ptr, (new_lang ? (png_bytep)new_lang : cbuf), lang_len + 1);
+   png_write_chunk_data(png_ptr, (lang_key ? (png_bytep)lang_key : cbuf), lang_key_len + 1);
+   png_write_compressed_data_out(png_ptr, &comp);
+
+   png_write_chunk_end(png_ptr);
+   png_free(png_ptr, new_key);
+   if (new_lang)
+     png_free(png_ptr, new_lang);
+}
+#endif
+
+#if defined(PNG_WRITE_oFFs_SUPPORTED)
+/* write the oFFs chunk */
+void /* PRIVATE */
+png_write_oFFs(png_structp png_ptr, png_int_32 x_offset, png_int_32 y_offset,
+   int unit_type)
+{
+#ifdef PNG_USE_LOCAL_ARRAYS
+   PNG_oFFs;
+#endif
+   png_byte buf[9];
+
+   png_debug(1, "in png_write_oFFs\n");
+   if (unit_type >= PNG_OFFSET_LAST)
+      png_warning(png_ptr, "Unrecognized unit type for oFFs chunk");
+
+   png_save_int_32(buf, x_offset);
+   png_save_int_32(buf + 4, y_offset);
+   buf[8] = (png_byte)unit_type;
+
+   png_write_chunk(png_ptr, png_oFFs, buf, (png_size_t)9);
+}
+#endif
+#if defined(PNG_WRITE_pCAL_SUPPORTED)
+/* write the pCAL chunk (described in the PNG extensions document) */
+void /* PRIVATE */
+png_write_pCAL(png_structp png_ptr, png_charp purpose, png_int_32 X0,
+   png_int_32 X1, int type, int nparams, png_charp units, png_charpp params)
+{
+#ifdef PNG_USE_LOCAL_ARRAYS
+   PNG_pCAL;
+#endif
+   png_size_t purpose_len, units_len, total_len;
+   png_uint_32p params_len;
+   png_byte buf[10];
+   png_charp new_purpose;
+   int i;
+
+   png_debug1(1, "in png_write_pCAL (%d parameters)\n", nparams);
+   if (type >= PNG_EQUATION_LAST)
+      png_warning(png_ptr, "Unrecognized equation type for pCAL chunk");
+
+   purpose_len = png_check_keyword(png_ptr, purpose, &new_purpose) + 1;
+   png_debug1(3, "pCAL purpose length = %d\n", (int)purpose_len);
+   units_len = png_strlen(units) + (nparams == 0 ? 0 : 1);
+   png_debug1(3, "pCAL units length = %d\n", (int)units_len);
+   total_len = purpose_len + units_len + 10;
+
+   params_len = (png_uint_32p)png_malloc(png_ptr, (png_uint_32)(nparams
+      *png_sizeof(png_uint_32)));
+
+   /* Find the length of each parameter, making sure we don't count the
+      null terminator for the last parameter. */
+   for (i = 0; i < nparams; i++)
+   {
+      params_len[i] = png_strlen(params[i]) + (i == nparams - 1 ? 0 : 1);
+      png_debug2(3, "pCAL parameter %d length = %lu\n", i, params_len[i]);
+      total_len += (png_size_t)params_len[i];
+   }
+
+   png_debug1(3, "pCAL total length = %d\n", (int)total_len);
+   png_write_chunk_start(png_ptr, png_pCAL, (png_uint_32)total_len);
+   png_write_chunk_data(png_ptr, (png_bytep)new_purpose, purpose_len);
+   png_save_int_32(buf, X0);
+   png_save_int_32(buf + 4, X1);
+   buf[8] = (png_byte)type;
+   buf[9] = (png_byte)nparams;
+   png_write_chunk_data(png_ptr, buf, (png_size_t)10);
+   png_write_chunk_data(png_ptr, (png_bytep)units, (png_size_t)units_len);
+
+   png_free(png_ptr, new_purpose);
+
+   for (i = 0; i < nparams; i++)
+   {
+      png_write_chunk_data(png_ptr, (png_bytep)params[i],
+         (png_size_t)params_len[i]);
+   }
+
+   png_free(png_ptr, params_len);
+   png_write_chunk_end(png_ptr);
+}
+#endif
+
+#if defined(PNG_WRITE_sCAL_SUPPORTED)
+/* write the sCAL chunk */
+#if defined(PNG_FLOATING_POINT_SUPPORTED) && !defined(PNG_NO_STDIO)
+void /* PRIVATE */
+png_write_sCAL(png_structp png_ptr, int unit, double width, double height)
+{
+#ifdef PNG_USE_LOCAL_ARRAYS
+   PNG_sCAL;
+#endif
+   char buf[64];
+   png_size_t total_len;
+
+   png_debug(1, "in png_write_sCAL\n");
+
+   buf[0] = (char)unit;
+#if defined(_WIN32_WCE)
+/* sprintf() function is not supported on WindowsCE */
+   {
+      wchar_t wc_buf[32];
+      size_t wc_len;
+      swprintf(wc_buf, TEXT("%12.12e"), width);
+      wc_len = wcslen(wc_buf);
+      WideCharToMultiByte(CP_ACP, 0, wc_buf, -1, buf + 1, wc_len, NULL, NULL);
+      total_len = wc_len + 2;
+      swprintf(wc_buf, TEXT("%12.12e"), height);
+      wc_len = wcslen(wc_buf);
+      WideCharToMultiByte(CP_ACP, 0, wc_buf, -1, buf + total_len, wc_len,
+         NULL, NULL);
+      total_len += wc_len;
+   }
+#else
+   png_snprintf(buf + 1, 63, "%12.12e", width);
+   total_len = 1 + png_strlen(buf + 1) + 1;
+   png_snprintf(buf + total_len, 64-total_len, "%12.12e", height);
+   total_len += png_strlen(buf + total_len);
+#endif
+
+   png_debug1(3, "sCAL total length = %u\n", (unsigned int)total_len);
+   png_write_chunk(png_ptr, png_sCAL, (png_bytep)buf, total_len);
+}
+#else
+#ifdef PNG_FIXED_POINT_SUPPORTED
+void /* PRIVATE */
+png_write_sCAL_s(png_structp png_ptr, int unit, png_charp width,
+   png_charp height)
+{
+#ifdef PNG_USE_LOCAL_ARRAYS
+   PNG_sCAL;
+#endif
+   png_byte buf[64];
+   png_size_t wlen, hlen, total_len;
+
+   png_debug(1, "in png_write_sCAL_s\n");
+
+   wlen = png_strlen(width);
+   hlen = png_strlen(height);
+   total_len = wlen + hlen + 2;
+   if (total_len > 64)
+   {
+      png_warning(png_ptr, "Can't write sCAL (buffer too small)");
+      return;
+   }
+
+   buf[0] = (png_byte)unit;
+   png_memcpy(buf + 1, width, wlen + 1);      /* append the '\0' here */
+   png_memcpy(buf + wlen + 2, height, hlen);  /* do NOT append the '\0' here */
+
+   png_debug1(3, "sCAL total length = %u\n", (unsigned int)total_len);
+   png_write_chunk(png_ptr, png_sCAL, buf, total_len);
+}
+#endif
+#endif
+#endif
+
+#if defined(PNG_WRITE_pHYs_SUPPORTED)
+/* write the pHYs chunk */
+void /* PRIVATE */
+png_write_pHYs(png_structp png_ptr, png_uint_32 x_pixels_per_unit,
+   png_uint_32 y_pixels_per_unit,
+   int unit_type)
+{
+#ifdef PNG_USE_LOCAL_ARRAYS
+   PNG_pHYs;
+#endif
+   png_byte buf[9];
+
+   png_debug(1, "in png_write_pHYs\n");
+   if (unit_type >= PNG_RESOLUTION_LAST)
+      png_warning(png_ptr, "Unrecognized unit type for pHYs chunk");
+
+   png_save_uint_32(buf, x_pixels_per_unit);
+   png_save_uint_32(buf + 4, y_pixels_per_unit);
+   buf[8] = (png_byte)unit_type;
+
+   png_write_chunk(png_ptr, png_pHYs, buf, (png_size_t)9);
+}
+#endif
+
+#if defined(PNG_WRITE_tIME_SUPPORTED)
+/* Write the tIME chunk.  Use either png_convert_from_struct_tm()
+ * or png_convert_from_time_t(), or fill in the structure yourself.
+ */
+void /* PRIVATE */
+png_write_tIME(png_structp png_ptr, png_timep mod_time)
+{
+#ifdef PNG_USE_LOCAL_ARRAYS
+   PNG_tIME;
+#endif
+   png_byte buf[7];
+
+   png_debug(1, "in png_write_tIME\n");
+   if (mod_time->month  > 12 || mod_time->month  < 1 ||
+       mod_time->day    > 31 || mod_time->day    < 1 ||
+       mod_time->hour   > 23 || mod_time->second > 60)
+   {
+      png_warning(png_ptr, "Invalid time specified for tIME chunk");
+      return;
+   }
+
+   png_save_uint_16(buf, mod_time->year);
+   buf[2] = mod_time->month;
+   buf[3] = mod_time->day;
+   buf[4] = mod_time->hour;
+   buf[5] = mod_time->minute;
+   buf[6] = mod_time->second;
+
+   png_write_chunk(png_ptr, png_tIME, buf, (png_size_t)7);
+}
+#endif
+
+/* initializes the row writing capability of libpng */
+void /* PRIVATE */
+png_write_start_row(png_structp png_ptr)
+{
+#ifdef PNG_WRITE_INTERLACING_SUPPORTED
+#ifdef PNG_USE_LOCAL_ARRAYS
+   /* arrays to facilitate easy interlacing - use pass (0 - 6) as index */
+
+   /* start of interlace block */
+   int png_pass_start[7] = {0, 4, 0, 2, 0, 1, 0};
+
+   /* offset to next interlace block */
+   int png_pass_inc[7] = {8, 8, 4, 4, 2, 2, 1};
+
+   /* start of interlace block in the y direction */
+   int png_pass_ystart[7] = {0, 0, 4, 0, 2, 0, 1};
+
+   /* offset to next interlace block in the y direction */
+   int png_pass_yinc[7] = {8, 8, 8, 4, 4, 2, 2};
+#endif
+#endif
+
+   png_size_t buf_size;
+
+   png_debug(1, "in png_write_start_row\n");
+   buf_size = (png_size_t)(PNG_ROWBYTES(
+      png_ptr->usr_channels*png_ptr->usr_bit_depth,png_ptr->width)+1);
+
+   /* set up row buffer */
+   png_ptr->row_buf = (png_bytep)png_malloc(png_ptr, (png_uint_32)buf_size);
+   png_ptr->row_buf[0] = PNG_FILTER_VALUE_NONE;
+
+#ifndef PNG_NO_WRITE_FILTERING
+   /* set up filtering buffer, if using this filter */
+   if (png_ptr->do_filter & PNG_FILTER_SUB)
+   {
+      png_ptr->sub_row = (png_bytep)png_malloc(png_ptr,
+         (png_ptr->rowbytes + 1));
+      png_ptr->sub_row[0] = PNG_FILTER_VALUE_SUB;
+   }
+
+   /* We only need to keep the previous row if we are using one of these. */
+   if (png_ptr->do_filter & (PNG_FILTER_AVG | PNG_FILTER_UP | PNG_FILTER_PAETH))
+   {
+     /* set up previous row buffer */
+      png_ptr->prev_row = (png_bytep)png_malloc(png_ptr, (png_uint_32)buf_size);
+      png_memset(png_ptr->prev_row, 0, buf_size);
+
+      if (png_ptr->do_filter & PNG_FILTER_UP)
+      {
+         png_ptr->up_row = (png_bytep)png_malloc(png_ptr,
+            (png_ptr->rowbytes + 1));
+         png_ptr->up_row[0] = PNG_FILTER_VALUE_UP;
+      }
+
+      if (png_ptr->do_filter & PNG_FILTER_AVG)
+      {
+         png_ptr->avg_row = (png_bytep)png_malloc(png_ptr,
+            (png_ptr->rowbytes + 1));
+         png_ptr->avg_row[0] = PNG_FILTER_VALUE_AVG;
+      }
+
+      if (png_ptr->do_filter & PNG_FILTER_PAETH)
+      {
+         png_ptr->paeth_row = (png_bytep)png_malloc(png_ptr,
+            (png_ptr->rowbytes + 1));
+         png_ptr->paeth_row[0] = PNG_FILTER_VALUE_PAETH;
+      }
+#endif /* PNG_NO_WRITE_FILTERING */
+   }
+
+#ifdef PNG_WRITE_INTERLACING_SUPPORTED
+   /* if interlaced, we need to set up width and height of pass */
+   if (png_ptr->interlaced)
+   {
+      if (!(png_ptr->transformations & PNG_INTERLACE))
+      {
+         png_ptr->num_rows = (png_ptr->height + png_pass_yinc[0] - 1 -
+            png_pass_ystart[0]) / png_pass_yinc[0];
+         png_ptr->usr_width = (png_ptr->width + png_pass_inc[0] - 1 -
+            png_pass_start[0]) / png_pass_inc[0];
+      }
+      else
+      {
+         png_ptr->num_rows = png_ptr->height;
+         png_ptr->usr_width = png_ptr->width;
+      }
+   }
+   else
+#endif
+   {
+      png_ptr->num_rows = png_ptr->height;
+      png_ptr->usr_width = png_ptr->width;
+   }
+   png_ptr->zstream.avail_out = (uInt)png_ptr->zbuf_size;
+   png_ptr->zstream.next_out = png_ptr->zbuf;
+}
+
+/* Internal use only.  Called when finished processing a row of data. */
+void /* PRIVATE */
+png_write_finish_row(png_structp png_ptr)
+{
+#ifdef PNG_WRITE_INTERLACING_SUPPORTED
+#ifdef PNG_USE_LOCAL_ARRAYS
+   /* arrays to facilitate easy interlacing - use pass (0 - 6) as index */
+
+   /* start of interlace block */
+   int png_pass_start[7] = {0, 4, 0, 2, 0, 1, 0};
+
+   /* offset to next interlace block */
+   int png_pass_inc[7] = {8, 8, 4, 4, 2, 2, 1};
+
+   /* start of interlace block in the y direction */
+   int png_pass_ystart[7] = {0, 0, 4, 0, 2, 0, 1};
+
+   /* offset to next interlace block in the y direction */
+   int png_pass_yinc[7] = {8, 8, 8, 4, 4, 2, 2};
+#endif
+#endif
+
+   int ret;
+
+   png_debug(1, "in png_write_finish_row\n");
+   /* next row */
+   png_ptr->row_number++;
+
+   /* see if we are done */
+   if (png_ptr->row_number < png_ptr->num_rows)
+      return;
+
+#ifdef PNG_WRITE_INTERLACING_SUPPORTED
+   /* if interlaced, go to next pass */
+   if (png_ptr->interlaced)
+   {
+      png_ptr->row_number = 0;
+      if (png_ptr->transformations & PNG_INTERLACE)
+      {
+         png_ptr->pass++;
+      }
+      else
+      {
+         /* loop until we find a non-zero width or height pass */
+         do
+         {
+            png_ptr->pass++;
+            if (png_ptr->pass >= 7)
+               break;
+            png_ptr->usr_width = (png_ptr->width +
+               png_pass_inc[png_ptr->pass] - 1 -
+               png_pass_start[png_ptr->pass]) /
+               png_pass_inc[png_ptr->pass];
+            png_ptr->num_rows = (png_ptr->height +
+               png_pass_yinc[png_ptr->pass] - 1 -
+               png_pass_ystart[png_ptr->pass]) /
+               png_pass_yinc[png_ptr->pass];
+            if (png_ptr->transformations & PNG_INTERLACE)
+               break;
+         } while (png_ptr->usr_width == 0 || png_ptr->num_rows == 0);
+
+      }
+
+      /* reset the row above the image for the next pass */
+      if (png_ptr->pass < 7)
+      {
+         if (png_ptr->prev_row != NULL)
+            png_memset(png_ptr->prev_row, 0,
+               (png_size_t)(PNG_ROWBYTES(png_ptr->usr_channels*
+               png_ptr->usr_bit_depth,png_ptr->width))+1);
+         return;
+      }
+   }
+#endif
+
+   /* if we get here, we've just written the last row, so we need
+      to flush the compressor */
+   do
+   {
+      /* tell the compressor we are done */
+      ret = deflate(&png_ptr->zstream, Z_FINISH);
+      /* check for an error */
+      if (ret == Z_OK)
+      {
+         /* check to see if we need more room */
+         if (!(png_ptr->zstream.avail_out))
+         {
+            png_write_IDAT(png_ptr, png_ptr->zbuf, png_ptr->zbuf_size);
+            png_ptr->zstream.next_out = png_ptr->zbuf;
+            png_ptr->zstream.avail_out = (uInt)png_ptr->zbuf_size;
+         }
+      }
+      else if (ret != Z_STREAM_END)
+      {
+         if (png_ptr->zstream.msg != NULL)
+            png_error(png_ptr, png_ptr->zstream.msg);
+         else
+            png_error(png_ptr, "zlib error");
+      }
+   } while (ret != Z_STREAM_END);
+
+   /* write any extra space */
+   if (png_ptr->zstream.avail_out < png_ptr->zbuf_size)
+   {
+      png_write_IDAT(png_ptr, png_ptr->zbuf, png_ptr->zbuf_size -
+         png_ptr->zstream.avail_out);
+   }
+
+   deflateReset(&png_ptr->zstream);
+   png_ptr->zstream.data_type = Z_BINARY;
+}
+
+#if defined(PNG_WRITE_INTERLACING_SUPPORTED)
+/* Pick out the correct pixels for the interlace pass.
+ * The basic idea here is to go through the row with a source
+ * pointer and a destination pointer (sp and dp), and copy the
+ * correct pixels for the pass.  As the row gets compacted,
+ * sp will always be >= dp, so we should never overwrite anything.
+ * See the default: case for the easiest code to understand.
+ */
+void /* PRIVATE */
+png_do_write_interlace(png_row_infop row_info, png_bytep row, int pass)
+{
+#ifdef PNG_USE_LOCAL_ARRAYS
+   /* arrays to facilitate easy interlacing - use pass (0 - 6) as index */
+
+   /* start of interlace block */
+   int png_pass_start[7] = {0, 4, 0, 2, 0, 1, 0};
+
+   /* offset to next interlace block */
+   int png_pass_inc[7] = {8, 8, 4, 4, 2, 2, 1};
+#endif
+
+   png_debug(1, "in png_do_write_interlace\n");
+   /* we don't have to do anything on the last pass (6) */
+#if defined(PNG_USELESS_TESTS_SUPPORTED)
+   if (row != NULL && row_info != NULL && pass < 6)
+#else
+   if (pass < 6)
+#endif
+   {
+      /* each pixel depth is handled separately */
+      switch (row_info->pixel_depth)
+      {
+         case 1:
+         {
+            png_bytep sp;
+            png_bytep dp;
+            int shift;
+            int d;
+            int value;
+            png_uint_32 i;
+            png_uint_32 row_width = row_info->width;
+
+            dp = row;
+            d = 0;
+            shift = 7;
+            for (i = png_pass_start[pass]; i < row_width;
+               i += png_pass_inc[pass])
+            {
+               sp = row + (png_size_t)(i >> 3);
+               value = (int)(*sp >> (7 - (int)(i & 0x07))) & 0x01;
+               d |= (value << shift);
+
+               if (shift == 0)
+               {
+                  shift = 7;
+                  *dp++ = (png_byte)d;
+                  d = 0;
+               }
+               else
+                  shift--;
+
+            }
+            if (shift != 7)
+               *dp = (png_byte)d;
+            break;
+         }
+         case 2:
+         {
+            png_bytep sp;
+            png_bytep dp;
+            int shift;
+            int d;
+            int value;
+            png_uint_32 i;
+            png_uint_32 row_width = row_info->width;
+
+            dp = row;
+            shift = 6;
+            d = 0;
+            for (i = png_pass_start[pass]; i < row_width;
+               i += png_pass_inc[pass])
+            {
+               sp = row + (png_size_t)(i >> 2);
+               value = (*sp >> ((3 - (int)(i & 0x03)) << 1)) & 0x03;
+               d |= (value << shift);
+
+               if (shift == 0)
+               {
+                  shift = 6;
+                  *dp++ = (png_byte)d;
+                  d = 0;
+               }
+               else
+                  shift -= 2;
+            }
+            if (shift != 6)
+                   *dp = (png_byte)d;
+            break;
+         }
+         case 4:
+         {
+            png_bytep sp;
+            png_bytep dp;
+            int shift;
+            int d;
+            int value;
+            png_uint_32 i;
+            png_uint_32 row_width = row_info->width;
+
+            dp = row;
+            shift = 4;
+            d = 0;
+            for (i = png_pass_start[pass]; i < row_width;
+               i += png_pass_inc[pass])
+            {
+               sp = row + (png_size_t)(i >> 1);
+               value = (*sp >> ((1 - (int)(i & 0x01)) << 2)) & 0x0f;
+               d |= (value << shift);
+
+               if (shift == 0)
+               {
+                  shift = 4;
+                  *dp++ = (png_byte)d;
+                  d = 0;
+               }
+               else
+                  shift -= 4;
+            }
+            if (shift != 4)
+               *dp = (png_byte)d;
+            break;
+         }
+         default:
+         {
+            png_bytep sp;
+            png_bytep dp;
+            png_uint_32 i;
+            png_uint_32 row_width = row_info->width;
+            png_size_t pixel_bytes;
+
+            /* start at the beginning */
+            dp = row;
+            /* find out how many bytes each pixel takes up */
+            pixel_bytes = (row_info->pixel_depth >> 3);
+            /* loop through the row, only looking at the pixels that
+               matter */
+            for (i = png_pass_start[pass]; i < row_width;
+               i += png_pass_inc[pass])
+            {
+               /* find out where the original pixel is */
+               sp = row + (png_size_t)i * pixel_bytes;
+               /* move the pixel */
+               if (dp != sp)
+                  png_memcpy(dp, sp, pixel_bytes);
+               /* next pixel */
+               dp += pixel_bytes;
+            }
+            break;
+         }
+      }
+      /* set new row width */
+      row_info->width = (row_info->width +
+         png_pass_inc[pass] - 1 -
+         png_pass_start[pass]) /
+         png_pass_inc[pass];
+         row_info->rowbytes = PNG_ROWBYTES(row_info->pixel_depth,
+            row_info->width);
+   }
+}
+#endif
+
+/* This filters the row, chooses which filter to use, if it has not already
+ * been specified by the application, and then writes the row out with the
+ * chosen filter.
+ */
+#define PNG_MAXSUM (((png_uint_32)(-1)) >> 1)
+#define PNG_HISHIFT 10
+#define PNG_LOMASK ((png_uint_32)0xffffL)
+#define PNG_HIMASK ((png_uint_32)(~PNG_LOMASK >> PNG_HISHIFT))
+void /* PRIVATE */
+png_write_find_filter(png_structp png_ptr, png_row_infop row_info)
+{
+   png_bytep best_row;
+#ifndef PNG_NO_WRITE_FILTER
+   png_bytep prev_row, row_buf;
+   png_uint_32 mins, bpp;
+   png_byte filter_to_do = png_ptr->do_filter;
+   png_uint_32 row_bytes = row_info->rowbytes;
+#if defined(PNG_WRITE_WEIGHTED_FILTER_SUPPORTED)
+   int num_p_filters = (int)png_ptr->num_prev_filters;
+#endif
+
+   png_debug(1, "in png_write_find_filter\n");
+   /* find out how many bytes offset each pixel is */
+   bpp = (row_info->pixel_depth + 7) >> 3;
+
+   prev_row = png_ptr->prev_row;
+#endif
+   best_row = png_ptr->row_buf;
+#ifndef PNG_NO_WRITE_FILTER
+   row_buf = best_row;
+   mins = PNG_MAXSUM;
+
+   /* The prediction method we use is to find which method provides the
+    * smallest value when summing the absolute values of the distances
+    * from zero, using anything >= 128 as negative numbers.  This is known
+    * as the "minimum sum of absolute differences" heuristic.  Other
+    * heuristics are the "weighted minimum sum of absolute differences"
+    * (experimental and can in theory improve compression), and the "zlib
+    * predictive" method (not implemented yet), which does test compressions
+    * of lines using different filter methods, and then chooses the
+    * (series of) filter(s) that give minimum compressed data size (VERY
+    * computationally expensive).
+    *
+    * GRR 980525:  consider also
+    *   (1) minimum sum of absolute differences from running average (i.e.,
+    *       keep running sum of non-absolute differences & count of bytes)
+    *       [track dispersion, too?  restart average if dispersion too large?]
+    *  (1b) minimum sum of absolute differences from sliding average, probably
+    *       with window size <= deflate window (usually 32K)
+    *   (2) minimum sum of squared differences from zero or running average
+    *       (i.e., ~ root-mean-square approach)
+    */
+
+
+   /* We don't need to test the 'no filter' case if this is the only filter
+    * that has been chosen, as it doesn't actually do anything to the data.
+    */
+   if ((filter_to_do & PNG_FILTER_NONE) &&
+       filter_to_do != PNG_FILTER_NONE)
+   {
+      png_bytep rp;
+      png_uint_32 sum = 0;
+      png_uint_32 i;
+      int v;
+
+      for (i = 0, rp = row_buf + 1; i < row_bytes; i++, rp++)
+      {
+         v = *rp;
+         sum += (v < 128) ? v : 256 - v;
+      }
+
+#if defined(PNG_WRITE_WEIGHTED_FILTER_SUPPORTED)
+      if (png_ptr->heuristic_method == PNG_FILTER_HEURISTIC_WEIGHTED)
+      {
+         png_uint_32 sumhi, sumlo;
+         int j;
+         sumlo = sum & PNG_LOMASK;
+         sumhi = (sum >> PNG_HISHIFT) & PNG_HIMASK; /* Gives us some footroom */
+
+         /* Reduce the sum if we match any of the previous rows */
+         for (j = 0; j < num_p_filters; j++)
+         {
+            if (png_ptr->prev_filters[j] == PNG_FILTER_VALUE_NONE)
+            {
+               sumlo = (sumlo * png_ptr->filter_weights[j]) >>
+                  PNG_WEIGHT_SHIFT;
+               sumhi = (sumhi * png_ptr->filter_weights[j]) >>
+                  PNG_WEIGHT_SHIFT;
+            }
+         }
+
+         /* Factor in the cost of this filter (this is here for completeness,
+          * but it makes no sense to have a "cost" for the NONE filter, as
+          * it has the minimum possible computational cost - none).
+          */
+         sumlo = (sumlo * png_ptr->filter_costs[PNG_FILTER_VALUE_NONE]) >>
+            PNG_COST_SHIFT;
+         sumhi = (sumhi * png_ptr->filter_costs[PNG_FILTER_VALUE_NONE]) >>
+            PNG_COST_SHIFT;
+
+         if (sumhi > PNG_HIMASK)
+            sum = PNG_MAXSUM;
+         else
+            sum = (sumhi << PNG_HISHIFT) + sumlo;
+      }
+#endif
+      mins = sum;
+   }
+
+   /* sub filter */
+   if (filter_to_do == PNG_FILTER_SUB)
+   /* it's the only filter so no testing is needed */
+   {
+      png_bytep rp, lp, dp;
+      png_uint_32 i;
+      for (i = 0, rp = row_buf + 1, dp = png_ptr->sub_row + 1; i < bpp;
+           i++, rp++, dp++)
+      {
+         *dp = *rp;
+      }
+      for (lp = row_buf + 1; i < row_bytes;
+         i++, rp++, lp++, dp++)
+      {
+         *dp = (png_byte)(((int)*rp - (int)*lp) & 0xff);
+      }
+      best_row = png_ptr->sub_row;
+   }
+
+   else if (filter_to_do & PNG_FILTER_SUB)
+   {
+      png_bytep rp, dp, lp;
+      png_uint_32 sum = 0, lmins = mins;
+      png_uint_32 i;
+      int v;
+
+#if defined(PNG_WRITE_WEIGHTED_FILTER_SUPPORTED)
+      /* We temporarily increase the "minimum sum" by the factor we
+       * would reduce the sum of this filter, so that we can do the
+       * early exit comparison without scaling the sum each time.
+       */
+      if (png_ptr->heuristic_method == PNG_FILTER_HEURISTIC_WEIGHTED)
+      {
+         int j;
+         png_uint_32 lmhi, lmlo;
+         lmlo = lmins & PNG_LOMASK;
+         lmhi = (lmins >> PNG_HISHIFT) & PNG_HIMASK;
+
+         for (j = 0; j < num_p_filters; j++)
+         {
+            if (png_ptr->prev_filters[j] == PNG_FILTER_VALUE_SUB)
+            {
+               lmlo = (lmlo * png_ptr->inv_filter_weights[j]) >>
+                  PNG_WEIGHT_SHIFT;
+               lmhi = (lmhi * png_ptr->inv_filter_weights[j]) >>
+                  PNG_WEIGHT_SHIFT;
+            }
+         }
+
+         lmlo = (lmlo * png_ptr->inv_filter_costs[PNG_FILTER_VALUE_SUB]) >>
+            PNG_COST_SHIFT;
+         lmhi = (lmhi * png_ptr->inv_filter_costs[PNG_FILTER_VALUE_SUB]) >>
+            PNG_COST_SHIFT;
+
+         if (lmhi > PNG_HIMASK)
+            lmins = PNG_MAXSUM;
+         else
+            lmins = (lmhi << PNG_HISHIFT) + lmlo;
+      }
+#endif
+
+      for (i = 0, rp = row_buf + 1, dp = png_ptr->sub_row + 1; i < bpp;
+           i++, rp++, dp++)
+      {
+         v = *dp = *rp;
+
+         sum += (v < 128) ? v : 256 - v;
+      }
+      for (lp = row_buf + 1; i < row_bytes;
+         i++, rp++, lp++, dp++)
+      {
+         v = *dp = (png_byte)(((int)*rp - (int)*lp) & 0xff);
+
+         sum += (v < 128) ? v : 256 - v;
+
+         if (sum > lmins)  /* We are already worse, don't continue. */
+            break;
+      }
+
+#if defined(PNG_WRITE_WEIGHTED_FILTER_SUPPORTED)
+      if (png_ptr->heuristic_method == PNG_FILTER_HEURISTIC_WEIGHTED)
+      {
+         int j;
+         png_uint_32 sumhi, sumlo;
+         sumlo = sum & PNG_LOMASK;
+         sumhi = (sum >> PNG_HISHIFT) & PNG_HIMASK;
+
+         for (j = 0; j < num_p_filters; j++)
+         {
+            if (png_ptr->prev_filters[j] == PNG_FILTER_VALUE_SUB)
+            {
+               sumlo = (sumlo * png_ptr->inv_filter_weights[j]) >>
+                  PNG_WEIGHT_SHIFT;
+               sumhi = (sumhi * png_ptr->inv_filter_weights[j]) >>
+                  PNG_WEIGHT_SHIFT;
+            }
+         }
+
+         sumlo = (sumlo * png_ptr->inv_filter_costs[PNG_FILTER_VALUE_SUB]) >>
+            PNG_COST_SHIFT;
+         sumhi = (sumhi * png_ptr->inv_filter_costs[PNG_FILTER_VALUE_SUB]) >>
+            PNG_COST_SHIFT;
+
+         if (sumhi > PNG_HIMASK)
+            sum = PNG_MAXSUM;
+         else
+            sum = (sumhi << PNG_HISHIFT) + sumlo;
+      }
+#endif
+
+      if (sum < mins)
+      {
+         mins = sum;
+         best_row = png_ptr->sub_row;
+      }
+   }
+
+   /* up filter */
+   if (filter_to_do == PNG_FILTER_UP)
+   {
+      png_bytep rp, dp, pp;
+      png_uint_32 i;
+
+      for (i = 0, rp = row_buf + 1, dp = png_ptr->up_row + 1,
+           pp = prev_row + 1; i < row_bytes;
+           i++, rp++, pp++, dp++)
+      {
+         *dp = (png_byte)(((int)*rp - (int)*pp) & 0xff);
+      }
+      best_row = png_ptr->up_row;
+   }
+
+   else if (filter_to_do & PNG_FILTER_UP)
+   {
+      png_bytep rp, dp, pp;
+      png_uint_32 sum = 0, lmins = mins;
+      png_uint_32 i;
+      int v;
+
+
+#if defined(PNG_WRITE_WEIGHTED_FILTER_SUPPORTED)
+      if (png_ptr->heuristic_method == PNG_FILTER_HEURISTIC_WEIGHTED)
+      {
+         int j;
+         png_uint_32 lmhi, lmlo;
+         lmlo = lmins & PNG_LOMASK;
+         lmhi = (lmins >> PNG_HISHIFT) & PNG_HIMASK;
+
+         for (j = 0; j < num_p_filters; j++)
+         {
+            if (png_ptr->prev_filters[j] == PNG_FILTER_VALUE_UP)
+            {
+               lmlo = (lmlo * png_ptr->inv_filter_weights[j]) >>
+                  PNG_WEIGHT_SHIFT;
+               lmhi = (lmhi * png_ptr->inv_filter_weights[j]) >>
+                  PNG_WEIGHT_SHIFT;
+            }
+         }
+
+         lmlo = (lmlo * png_ptr->inv_filter_costs[PNG_FILTER_VALUE_UP]) >>
+            PNG_COST_SHIFT;
+         lmhi = (lmhi * png_ptr->inv_filter_costs[PNG_FILTER_VALUE_UP]) >>
+            PNG_COST_SHIFT;
+
+         if (lmhi > PNG_HIMASK)
+            lmins = PNG_MAXSUM;
+         else
+            lmins = (lmhi << PNG_HISHIFT) + lmlo;
+      }
+#endif
+
+      for (i = 0, rp = row_buf + 1, dp = png_ptr->up_row + 1,
+           pp = prev_row + 1; i < row_bytes; i++)
+      {
+         v = *dp++ = (png_byte)(((int)*rp++ - (int)*pp++) & 0xff);
+
+         sum += (v < 128) ? v : 256 - v;
+
+         if (sum > lmins)  /* We are already worse, don't continue. */
+            break;
+      }
+
+#if defined(PNG_WRITE_WEIGHTED_FILTER_SUPPORTED)
+      if (png_ptr->heuristic_method == PNG_FILTER_HEURISTIC_WEIGHTED)
+      {
+         int j;
+         png_uint_32 sumhi, sumlo;
+         sumlo = sum & PNG_LOMASK;
+         sumhi = (sum >> PNG_HISHIFT) & PNG_HIMASK;
+
+         for (j = 0; j < num_p_filters; j++)
+         {
+            if (png_ptr->prev_filters[j] == PNG_FILTER_VALUE_UP)
+            {
+               sumlo = (sumlo * png_ptr->filter_weights[j]) >>
+                  PNG_WEIGHT_SHIFT;
+               sumhi = (sumhi * png_ptr->filter_weights[j]) >>
+                  PNG_WEIGHT_SHIFT;
+            }
+         }
+
+         sumlo = (sumlo * png_ptr->filter_costs[PNG_FILTER_VALUE_UP]) >>
+            PNG_COST_SHIFT;
+         sumhi = (sumhi * png_ptr->filter_costs[PNG_FILTER_VALUE_UP]) >>
+            PNG_COST_SHIFT;
+
+         if (sumhi > PNG_HIMASK)
+            sum = PNG_MAXSUM;
+         else
+            sum = (sumhi << PNG_HISHIFT) + sumlo;
+      }
+#endif
+
+      if (sum < mins)
+      {
+         mins = sum;
+         best_row = png_ptr->up_row;
+      }
+   }
+
+   /* avg filter */
+   if (filter_to_do == PNG_FILTER_AVG)
+   {
+      png_bytep rp, dp, pp, lp;
+      png_uint_32 i;
+      for (i = 0, rp = row_buf + 1, dp = png_ptr->avg_row + 1,
+           pp = prev_row + 1; i < bpp; i++)
+      {
+         *dp++ = (png_byte)(((int)*rp++ - ((int)*pp++ / 2)) & 0xff);
+      }
+      for (lp = row_buf + 1; i < row_bytes; i++)
+      {
+         *dp++ = (png_byte)(((int)*rp++ - (((int)*pp++ + (int)*lp++) / 2))
+                 & 0xff);
+      }
+      best_row = png_ptr->avg_row;
+   }
+
+   else if (filter_to_do & PNG_FILTER_AVG)
+   {
+      png_bytep rp, dp, pp, lp;
+      png_uint_32 sum = 0, lmins = mins;
+      png_uint_32 i;
+      int v;
+
+#if defined(PNG_WRITE_WEIGHTED_FILTER_SUPPORTED)
+      if (png_ptr->heuristic_method == PNG_FILTER_HEURISTIC_WEIGHTED)
+      {
+         int j;
+         png_uint_32 lmhi, lmlo;
+         lmlo = lmins & PNG_LOMASK;
+         lmhi = (lmins >> PNG_HISHIFT) & PNG_HIMASK;
+
+         for (j = 0; j < num_p_filters; j++)
+         {
+            if (png_ptr->prev_filters[j] == PNG_FILTER_VALUE_AVG)
+            {
+               lmlo = (lmlo * png_ptr->inv_filter_weights[j]) >>
+                  PNG_WEIGHT_SHIFT;
+               lmhi = (lmhi * png_ptr->inv_filter_weights[j]) >>
+                  PNG_WEIGHT_SHIFT;
+            }
+         }
+
+         lmlo = (lmlo * png_ptr->inv_filter_costs[PNG_FILTER_VALUE_AVG]) >>
+            PNG_COST_SHIFT;
+         lmhi = (lmhi * png_ptr->inv_filter_costs[PNG_FILTER_VALUE_AVG]) >>
+            PNG_COST_SHIFT;
+
+         if (lmhi > PNG_HIMASK)
+            lmins = PNG_MAXSUM;
+         else
+            lmins = (lmhi << PNG_HISHIFT) + lmlo;
+      }
+#endif
+
+      for (i = 0, rp = row_buf + 1, dp = png_ptr->avg_row + 1,
+           pp = prev_row + 1; i < bpp; i++)
+      {
+         v = *dp++ = (png_byte)(((int)*rp++ - ((int)*pp++ / 2)) & 0xff);
+
+         sum += (v < 128) ? v : 256 - v;
+      }
+      for (lp = row_buf + 1; i < row_bytes; i++)
+      {
+         v = *dp++ =
+          (png_byte)(((int)*rp++ - (((int)*pp++ + (int)*lp++) / 2)) & 0xff);
+
+         sum += (v < 128) ? v : 256 - v;
+
+         if (sum > lmins)  /* We are already worse, don't continue. */
+            break;
+      }
+
+#if defined(PNG_WRITE_WEIGHTED_FILTER_SUPPORTED)
+      if (png_ptr->heuristic_method == PNG_FILTER_HEURISTIC_WEIGHTED)
+      {
+         int j;
+         png_uint_32 sumhi, sumlo;
+         sumlo = sum & PNG_LOMASK;
+         sumhi = (sum >> PNG_HISHIFT) & PNG_HIMASK;
+
+         for (j = 0; j < num_p_filters; j++)
+         {
+            if (png_ptr->prev_filters[j] == PNG_FILTER_VALUE_NONE)
+            {
+               sumlo = (sumlo * png_ptr->filter_weights[j]) >>
+                  PNG_WEIGHT_SHIFT;
+               sumhi = (sumhi * png_ptr->filter_weights[j]) >>
+                  PNG_WEIGHT_SHIFT;
+            }
+         }
+
+         sumlo = (sumlo * png_ptr->filter_costs[PNG_FILTER_VALUE_AVG]) >>
+            PNG_COST_SHIFT;
+         sumhi = (sumhi * png_ptr->filter_costs[PNG_FILTER_VALUE_AVG]) >>
+            PNG_COST_SHIFT;
+
+         if (sumhi > PNG_HIMASK)
+            sum = PNG_MAXSUM;
+         else
+            sum = (sumhi << PNG_HISHIFT) + sumlo;
+      }
+#endif
+
+      if (sum < mins)
+      {
+         mins = sum;
+         best_row = png_ptr->avg_row;
+      }
+   }
+
+   /* Paeth filter */
+   if (filter_to_do == PNG_FILTER_PAETH)
+   {
+      png_bytep rp, dp, pp, cp, lp;
+      png_uint_32 i;
+      for (i = 0, rp = row_buf + 1, dp = png_ptr->paeth_row + 1,
+           pp = prev_row + 1; i < bpp; i++)
+      {
+         *dp++ = (png_byte)(((int)*rp++ - (int)*pp++) & 0xff);
+      }
+
+      for (lp = row_buf + 1, cp = prev_row + 1; i < row_bytes; i++)
+      {
+         int a, b, c, pa, pb, pc, p;
+
+         b = *pp++;
+         c = *cp++;
+         a = *lp++;
+
+         p = b - c;
+         pc = a - c;
+
+#ifdef PNG_USE_ABS
+         pa = abs(p);
+         pb = abs(pc);
+         pc = abs(p + pc);
+#else
+         pa = p < 0 ? -p : p;
+         pb = pc < 0 ? -pc : pc;
+         pc = (p + pc) < 0 ? -(p + pc) : p + pc;
+#endif
+
+         p = (pa <= pb && pa <=pc) ? a : (pb <= pc) ? b : c;
+
+         *dp++ = (png_byte)(((int)*rp++ - p) & 0xff);
+      }
+      best_row = png_ptr->paeth_row;
+   }
+
+   else if (filter_to_do & PNG_FILTER_PAETH)
+   {
+      png_bytep rp, dp, pp, cp, lp;
+      png_uint_32 sum = 0, lmins = mins;
+      png_uint_32 i;
+      int v;
+
+#if defined(PNG_WRITE_WEIGHTED_FILTER_SUPPORTED)
+      if (png_ptr->heuristic_method == PNG_FILTER_HEURISTIC_WEIGHTED)
+      {
+         int j;
+         png_uint_32 lmhi, lmlo;
+         lmlo = lmins & PNG_LOMASK;
+         lmhi = (lmins >> PNG_HISHIFT) & PNG_HIMASK;
+
+         for (j = 0; j < num_p_filters; j++)
+         {
+            if (png_ptr->prev_filters[j] == PNG_FILTER_VALUE_PAETH)
+            {
+               lmlo = (lmlo * png_ptr->inv_filter_weights[j]) >>
+                  PNG_WEIGHT_SHIFT;
+               lmhi = (lmhi * png_ptr->inv_filter_weights[j]) >>
+                  PNG_WEIGHT_SHIFT;
+            }
+         }
+
+         lmlo = (lmlo * png_ptr->inv_filter_costs[PNG_FILTER_VALUE_PAETH]) >>
+            PNG_COST_SHIFT;
+         lmhi = (lmhi * png_ptr->inv_filter_costs[PNG_FILTER_VALUE_PAETH]) >>
+            PNG_COST_SHIFT;
+
+         if (lmhi > PNG_HIMASK)
+            lmins = PNG_MAXSUM;
+         else
+            lmins = (lmhi << PNG_HISHIFT) + lmlo;
+      }
+#endif
+
+      for (i = 0, rp = row_buf + 1, dp = png_ptr->paeth_row + 1,
+           pp = prev_row + 1; i < bpp; i++)
+      {
+         v = *dp++ = (png_byte)(((int)*rp++ - (int)*pp++) & 0xff);
+
+         sum += (v < 128) ? v : 256 - v;
+      }
+
+      for (lp = row_buf + 1, cp = prev_row + 1; i < row_bytes; i++)
+      {
+         int a, b, c, pa, pb, pc, p;
+
+         b = *pp++;
+         c = *cp++;
+         a = *lp++;
+
+#ifndef PNG_SLOW_PAETH
+         p = b - c;
+         pc = a - c;
+#ifdef PNG_USE_ABS
+         pa = abs(p);
+         pb = abs(pc);
+         pc = abs(p + pc);
+#else
+         pa = p < 0 ? -p : p;
+         pb = pc < 0 ? -pc : pc;
+         pc = (p + pc) < 0 ? -(p + pc) : p + pc;
+#endif
+         p = (pa <= pb && pa <=pc) ? a : (pb <= pc) ? b : c;
+#else /* PNG_SLOW_PAETH */
+         p = a + b - c;
+         pa = abs(p - a);
+         pb = abs(p - b);
+         pc = abs(p - c);
+         if (pa <= pb && pa <= pc)
+            p = a;
+         else if (pb <= pc)
+            p = b;
+         else
+            p = c;
+#endif /* PNG_SLOW_PAETH */
+
+         v = *dp++ = (png_byte)(((int)*rp++ - p) & 0xff);
+
+         sum += (v < 128) ? v : 256 - v;
+
+         if (sum > lmins)  /* We are already worse, don't continue. */
+            break;
+      }
+
+#if defined(PNG_WRITE_WEIGHTED_FILTER_SUPPORTED)
+      if (png_ptr->heuristic_method == PNG_FILTER_HEURISTIC_WEIGHTED)
+      {
+         int j;
+         png_uint_32 sumhi, sumlo;
+         sumlo = sum & PNG_LOMASK;
+         sumhi = (sum >> PNG_HISHIFT) & PNG_HIMASK;
+
+         for (j = 0; j < num_p_filters; j++)
+         {
+            if (png_ptr->prev_filters[j] == PNG_FILTER_VALUE_PAETH)
+            {
+               sumlo = (sumlo * png_ptr->filter_weights[j]) >>
+                  PNG_WEIGHT_SHIFT;
+               sumhi = (sumhi * png_ptr->filter_weights[j]) >>
+                  PNG_WEIGHT_SHIFT;
+            }
+         }
+
+         sumlo = (sumlo * png_ptr->filter_costs[PNG_FILTER_VALUE_PAETH]) >>
+            PNG_COST_SHIFT;
+         sumhi = (sumhi * png_ptr->filter_costs[PNG_FILTER_VALUE_PAETH]) >>
+            PNG_COST_SHIFT;
+
+         if (sumhi > PNG_HIMASK)
+            sum = PNG_MAXSUM;
+         else
+            sum = (sumhi << PNG_HISHIFT) + sumlo;
+      }
+#endif
+
+      if (sum < mins)
+      {
+         best_row = png_ptr->paeth_row;
+      }
+   }
+#endif /* PNG_NO_WRITE_FILTER */
+   /* Do the actual writing of the filtered row data from the chosen filter. */
+
+   png_write_filtered_row(png_ptr, best_row);
+
+#ifndef PNG_NO_WRITE_FILTER
+#if defined(PNG_WRITE_WEIGHTED_FILTER_SUPPORTED)
+   /* Save the type of filter we picked this time for future calculations */
+   if (png_ptr->num_prev_filters > 0)
+   {
+      int j;
+      for (j = 1; j < num_p_filters; j++)
+      {
+         png_ptr->prev_filters[j] = png_ptr->prev_filters[j - 1];
+      }
+      png_ptr->prev_filters[j] = best_row[0];
+   }
+#endif
+#endif /* PNG_NO_WRITE_FILTER */
+}
+
+
+/* Do the actual writing of a previously filtered row. */
+void /* PRIVATE */
+png_write_filtered_row(png_structp png_ptr, png_bytep filtered_row)
+{
+   png_debug(1, "in png_write_filtered_row\n");
+   png_debug1(2, "filter = %d\n", filtered_row[0]);
+   /* set up the zlib input buffer */
+
+   png_ptr->zstream.next_in = filtered_row;
+   png_ptr->zstream.avail_in = (uInt)png_ptr->row_info.rowbytes + 1;
+   /* repeat until we have compressed all the data */
+   do
+   {
+      int ret; /* return of zlib */
+
+      /* compress the data */
+      ret = deflate(&png_ptr->zstream, Z_NO_FLUSH);
+      /* check for compression errors */
+      if (ret != Z_OK)
+      {
+         if (png_ptr->zstream.msg != NULL)
+            png_error(png_ptr, png_ptr->zstream.msg);
+         else
+            png_error(png_ptr, "zlib error");
+      }
+
+      /* see if it is time to write another IDAT */
+      if (!(png_ptr->zstream.avail_out))
+      {
+         /* write the IDAT and reset the zlib output buffer */
+         png_write_IDAT(png_ptr, png_ptr->zbuf, png_ptr->zbuf_size);
+         png_ptr->zstream.next_out = png_ptr->zbuf;
+         png_ptr->zstream.avail_out = (uInt)png_ptr->zbuf_size;
+      }
+   /* repeat until all data has been compressed */
+   } while (png_ptr->zstream.avail_in);
+
+   /* swap the current and previous rows */
+   if (png_ptr->prev_row != NULL)
+   {
+      png_bytep tptr;
+
+      tptr = png_ptr->prev_row;
+      png_ptr->prev_row = png_ptr->row_buf;
+      png_ptr->row_buf = tptr;
+   }
+
+   /* finish row - updates counters and flushes zlib if last row */
+   png_write_finish_row(png_ptr);
+
+#if defined(PNG_WRITE_FLUSH_SUPPORTED)
+   png_ptr->flush_rows++;
+
+   if (png_ptr->flush_dist > 0 &&
+       png_ptr->flush_rows >= png_ptr->flush_dist)
+   {
+      png_write_flush(png_ptr);
+   }
+#endif
+}
+#endif /* PNG_WRITE_SUPPORTED */
diff --git a/uppsrc/plugin/png/png.h b/uppsrc/plugin/png/png.h
new file mode 100644
index 000000000..21f99fb54
--- /dev/null
+++ b/uppsrc/plugin/png/png.h
@@ -0,0 +1,50 @@
+#ifndef __nDraw_plugin_png__
+#define __nDraw_plugin_png__
+
+#include <Draw/Draw.h>
+
+NAMESPACE_UPP
+
+class PNGRaster : public StreamRaster {
+	class Data;
+	One<Data> data;
+
+public:
+	PNGRaster();
+	~PNGRaster();
+
+	virtual bool    Create();
+	virtual Size    GetSize();
+	virtual Info    GetInfo();
+	virtual Line    GetLine(int line);
+	virtual const RGBA *GetPalette();
+	virtual const RasterFormat *GetFormat();
+
+private:
+	bool            Init();
+};
+
+class PNGEncoder : public StreamRasterEncoder {
+	class Data;
+	One<Data> data;
+
+public:
+	PNGEncoder(int bpp = 32, ImageKind kind = IMAGE_UNKNOWN, bool interlace = false);
+	~PNGEncoder();
+
+	virtual int  GetPaletteCount();
+	virtual void Start(Size sz);
+	virtual void WriteLineRaw(const byte *data);
+
+	PNGEncoder&  Bpp(int b)                      { bpp = b; return *this; }
+	PNGEncoder&  Interlace(int b = true)         { interlace = b; return *this; }
+
+private:
+	int          bpp;
+	ImageKind    kind;
+	bool         interlace;
+};
+
+END_UPP_NAMESPACE
+
+#endif
diff --git a/uppsrc/plugin/png/png.upp b/uppsrc/plugin/png/png.upp
new file mode 100644
index 000000000..977d7c278
--- /dev/null
+++ b/uppsrc/plugin/png/png.upp
@@ -0,0 +1,63 @@
+description "PNG image file format U++ encapsulation";
+
+uses
+	Core;
+
+library(!WIN32) png;
+
+options
+	-DPNG_NO_READ_EXPAND,
+	-DPNG_NO_READ_SHIFT,
+	-DPNG_NO_READ_PACK,
+	-DPNG_NO_READ_SWAP,
+	-DPNG_NO_READ_PACKSWAP,
+	-DPNG_NO_READ_INVERT,
+	-DPNG_NO_READ_DITHER,
+	-DPNG_NO_READ_BACKGROUND,
+	-DPNG_NO_READ_FILLER,
+	-DPNG_NO_READ_GAMMA,
+	-DPNG_NO_READ_GRAY_TO_RGB,
+	-DPNG_NO_READ_SWAP_ALPHA,
+	-DPNG_NO_READ_INVERT_ALPHA,
+	-DPNG_NO_READ_STRIP_ALPHA,
+	-DPNG_NO_READ_USER_TRANSFORM,
+	-DPNG_NO_READ_RGB_TO_GRAY,
+	-DPNG_NO_PROGRESSIVE_READ,
+	-DPNG_NO_READ_COMPOSITE_NODIV,
+	-DPNG_NO_MNG_FEATURES,
+	-DPNG_NO_READ_EMPTY_PLTE,
+	-DPNG_NO_WRITE_SHIFT,
+	-DPNG_NO_WRITE_PACK,
+	-DPNG_NO_WRITE_SWAP,
+	-DPNG_NO_WRITE_PACKSWAP,
+	-DPNG_NO_WRITE_INVERT,
+	-DPNG_NO_WRITE_FILLER,
+	-DPNG_NO_WRITE_SWAP_ALPHA,
+	-DPNG_NO_WRITE_INVERT_ALPHA,
+	-DPNG_NO_WRITE_USER_TRANSFORM,
+	-DPNG_NO_USER_TRANSFORM_PTR,
+	-DPNG_NO_WRITE_EMPTY_PLTE,
+	-DPNG_NO_EASY_ACCESS,
+	-DPNG_NO_READ_bKGD,
+	-DPNG_NO_READ_cHRM,
+	-DPNG_NO_READ_gAMA,
+	-DPNG_NO_READ_iCCP,
+	-DPNG_NO_READ_oFFs,
+	-DPNG_NO_READ_pCAL,
+	-DPNG_NO_READ_sCAL,
+	-DPNG_NO_READ_sBIT,
+	-DPNG_NO_READ_sPLT,
+	-DPNG_NO_READ_sRGB,
+	-DPNG_NO_READ_tIME,
+	-DPNG_NO_READ_zTXt,
+	-DPNG_NO_READ_OPT_PLTE,
+	-DPNG_NO_INFO_IMAGE;
+
+options(MSC8ARM) "-D_WIN32_WCE -DARM -D_ARM_ -DUNDER_CE -DUNICODE -D_UNICODE";
+
+file
+	png.h,
+	pnglib.c,
+	pngupp.cpp,
+	pngreg.icpp;
+
diff --git a/uppsrc/plugin/png/pnglib.c b/uppsrc/plugin/png/pnglib.c
new file mode 100644
index 000000000..26cbde0f1
--- /dev/null
+++ b/uppsrc/plugin/png/pnglib.c
@@ -0,0 +1,24 @@
+#ifdef flagWIN32
+
+#define PNG_NO_MMX_CODE
+#define PNG_USE_GLOBAL_ARRAYS
+
+#include "lib/png.c"
+#include "lib/pngerror.c"
+#include "lib/pnggccrd.c"
+#include "lib/pngget.c"
+#include "lib/pngmem.c"
+#include "lib/pngpread.c"
+#include "lib/pngread.c"
+#include "lib/pngrio.c"
+#include "lib/pngrtran.c"
+#include "lib/pngrutil.c"
+#include "lib/pngset.c"
+#include "lib/pngtrans.c"
+#include "lib/pngvcrd.c"
+#include "lib/pngwio.c"
+#include "lib/pngwrite.c"
+#include "lib/pngwtran.c"
+#include "lib/pngwutil.c"
+
+#endif
diff --git a/uppsrc/plugin/png/pngreg.icpp b/uppsrc/plugin/png/pngreg.icpp
new file mode 100644
index 000000000..aa934fae7
--- /dev/null
+++ b/uppsrc/plugin/png/pngreg.icpp
@@ -0,0 +1,9 @@
+#include "png.h"
+
+NAMESPACE_UPP
+
+INITBLOCK {
+	StreamRaster::Register<PNGRaster>();
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/plugin/png/pngupp.cpp b/uppsrc/plugin/png/pngupp.cpp
new file mode 100644
index 000000000..b85838cd0
--- /dev/null
+++ b/uppsrc/plugin/png/pngupp.cpp
@@ -0,0 +1,497 @@
+#ifdef flagWIN32
+#include <plugin/png/lib/png.h>
+#else
+#include <png.h>
+#endif
+
+#include <Draw/Draw.h>
+#include "png.h"
+
+NAMESPACE_UPP
+
+#define LLOG(x)  // LOG(x)
+
+static void png_read_stream(png_structp png_ptr, png_bytep buffer, png_size_t length)
+{
+	Stream& stream = *reinterpret_cast<Stream *>(png_get_io_ptr(png_ptr));
+	if(!stream.GetAll(buffer, (int)length))
+		png_error(png_ptr, "Error reading input file!");
+}
+
+static void png_write_stream(png_structp png_ptr, png_bytep buffer, png_size_t length)
+{
+	Stream& stream = *reinterpret_cast<Stream *>(png_get_io_ptr(png_ptr));
+	stream.Put(buffer, (int)length);
+}
+
+static void png_flush_stream(png_structp png_ptr)
+{
+	Stream& stream = *reinterpret_cast<Stream *>(png_get_io_ptr(png_ptr));
+	stream.Flush();
+}
+
+static void png_user_error_fn(png_structp png_ptr, png_const_charp error_msg)
+{
+	LLOG("PNG error: " << error_msg);
+}
+
+static void png_user_warning_fn(png_structp png_ptr, png_const_charp warning_msg)
+{
+	LLOG("png warning: " << warning_msg);
+}
+
+NTL_MOVEABLE(png_color)
+
+static Size GetDotSize(Size pixel_size, png_uint_32 x_ppm, png_uint_32 y_ppm, int unit_type)
+{
+	if(unit_type != 1 || !x_ppm || !y_ppm)
+		return Size(0, 0);
+	static const double DOTS_PER_METER = 6e5 / 25.4;
+	return Size(
+		fround(pixel_size.cx * (DOTS_PER_METER / x_ppm)),
+		fround(pixel_size.cy * (DOTS_PER_METER / y_ppm)));
+}
+
+class PNGRaster::Data {
+public:
+	Data();
+	~Data();
+
+public:
+	png_structp  png_ptr;
+	png_infop    info_ptr;
+
+	Info         info;
+	Size         size;
+	RasterFormat fmt;
+	RGBA         palette[256];
+	int          out_bpp;
+	int          row_bytes;
+	Vector<byte> preimage;
+	Buffer<png_bytep> row_pointers;
+	bool         preload;
+	bool         loaded;
+	bool         strip16;
+	int          next_row;
+	int64        soff;
+};
+
+PNGRaster::Data::Data()
+{
+	png_ptr = NULL;
+	info_ptr = NULL;
+}
+
+PNGRaster::Data::~Data()
+{
+	png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
+}
+
+PNGRaster::PNGRaster()
+{
+}
+
+PNGRaster::~PNGRaster()
+{
+}
+
+bool PNGRaster::Init()
+{
+	if(!(data->png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING,
+	NULL, png_user_error_fn, png_user_warning_fn)))
+		return false;
+	if (setjmp(png_jmpbuf(data->png_ptr)))
+		return false;
+	if(!(data->info_ptr = png_create_info_struct(data->png_ptr)))
+		return false;
+	png_set_read_fn(data->png_ptr, &GetStream(), png_read_stream);
+	png_read_info(data->png_ptr, data->info_ptr);
+	return true;
+}
+
+bool PNGRaster::Create()
+{
+	data = new Data;
+
+	data->soff = GetStream().GetPos();
+	if(!Init()) {
+		data.Clear();
+		return false;
+	}
+	if (setjmp(png_jmpbuf(data->png_ptr))) {
+		data.Clear();
+		return false;
+	}
+	png_uint_32 width, height;
+	int bit_depth, color_type, interlace_type;
+	png_get_IHDR(data->png_ptr, data->info_ptr, &width, &height, &bit_depth, &color_type,
+		&interlace_type, NULL, NULL);
+
+	if(height <= 0 || width <= 0)
+		return false;
+	data->size.cx = width;
+	data->size.cy = height;
+
+	png_uint_32 x_ppm = 0, y_ppm = 0;
+	int unit_type = 0;
+	png_get_pHYs(data->png_ptr, data->info_ptr, &x_ppm, &y_ppm, &unit_type);
+	data->info.bpp = bit_depth;
+	data->info.colors = (bit_depth < 8 ? 1 << bit_depth : 0);
+	data->info.dots = GetDotSize(data->size, x_ppm, y_ppm, unit_type);
+	data->info.hotspot = Point(0, 0);
+	data->info.kind = IMAGE_OPAQUE;
+
+	data->out_bpp = bit_depth;
+
+	data->strip16 = (bit_depth > 8);
+	if(data->strip16) {
+		png_set_strip_16(data->png_ptr);
+		data->out_bpp = 8;
+	}
+
+	if(color_type == PNG_COLOR_TYPE_RGB || color_type == PNG_COLOR_TYPE_RGB_ALPHA) {
+		ASSERT(bit_depth >= 8);
+		data->out_bpp = 24;
+		png_set_bgr(data->png_ptr);
+		if(color_type == PNG_COLOR_TYPE_RGB_ALPHA) {
+			data->out_bpp = 32;
+			data->info.kind = IMAGE_ALPHA;
+		}
+	}
+
+	png_bytep trans_colors = 0;
+	png_color_16p trans_values = 0;
+	int num_trans = 0;
+
+	png_get_tRNS(data->png_ptr, data->info_ptr, &trans_colors, &num_trans, &trans_values);
+//	bool has_mask = (num_trans > 0);
+
+//	AlphaArray im(width, height, out_bpp, 4, NULL, Vector<Color>(), has_mask ? 8 : 0, 4);
+//	im.SetDotSize(GetDotSize(im.GetSize(), x_ppm, y_ppm, unit_type));
+//	ASSERT(im.GetRowBytes() >= png_get_rowbytes(png_ptr, info_ptr));
+
+//	if((color_type & PNG_COLOR_MASK_PALETTE) || !(color_type & PNG_COLOR_MASK_COLOR))
+	Fill(data->palette, RGBAZero(), 256);
+	if(color_type & PNG_COLOR_MASK_PALETTE) {
+		png_colorp ppal = 0;
+		int pal_count = 0;
+		png_get_PLTE(data->png_ptr, data->info_ptr, &ppal, &pal_count);
+		pal_count = min(pal_count, 1 << min(bit_depth, 8));
+		for(int i = 0; i < pal_count; i++) {
+			png_color c = ppal[i];
+			RGBA rgba;
+			rgba.r = c.red;
+			rgba.g = c.green;
+			rgba.b = c.blue;
+			rgba.a = 255;
+			data->palette[i] = rgba;
+		}
+		if(trans_colors) {
+			data->info.kind = IMAGE_MASK;
+			for(int i = 0; i < num_trans; i++)
+				data->palette[(int)trans_colors[i]] = RGBAZero();
+		}
+
+	}
+	else if(!(color_type & PNG_COLOR_MASK_COLOR)) { // grayscale
+		int colors = 1 << min(bit_depth, 8);
+		for(int i = 0; i < colors; i++) {
+			int level = i * 255 / (colors - 1);
+			RGBA rgba;
+			rgba.r = rgba.g = rgba.b = (byte)level;
+			rgba.a = 255;
+			data->palette[i] = rgba;
+		}
+		if(trans_colors) {
+			data->info.kind = IMAGE_MASK;
+			for(int i = 0; i < num_trans; i++)
+				data->palette[(int)trans_colors[i]] = RGBAZero();
+		}
+	}
+
+/*
+	if (setjmp(png_jmpbuf(png_ptr))) {
+		png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
+		return out;
+	}
+*/
+
+	data->row_bytes = png_get_rowbytes(data->png_ptr, data->info_ptr);
+	data->next_row = 0;
+	data->preload = (interlace_type != PNG_INTERLACE_NONE);
+	data->loaded = false;
+	switch(data->out_bpp) {
+		case 1:  data->fmt.Set1mf(); break;
+		case 2:  data->fmt.Set2mf(); break;
+		case 4:  data->fmt.Set4mf(); break;
+		case 8:  if(color_type & PNG_COLOR_MASK_ALPHA) data->fmt.Set8A(); else data->fmt.Set8(); break;
+		case 24: data->fmt.Set24le(0xFF0000, 0xFF00, 0xFF); break;
+		case 32: data->fmt.SetRGBAStraight(); break;
+		default: NEVER(); return false; // invalid bpp
+	}
+
+	return true;
+}
+
+Size PNGRaster::GetSize()
+{
+	return data ? data->size : Size(0, 0);
+}
+
+Raster::Info PNGRaster::GetInfo()
+{
+	return data ? data->info : Raster::Info();
+}
+
+Raster::Line PNGRaster::GetLine(int line)
+{
+	ASSERT(data && line >= 0 && line < data->size.cy);
+	byte *scanline = new byte[data->row_bytes];
+	if(setjmp(png_jmpbuf(data->png_ptr)))
+		return Raster::Line(scanline, this, true);
+	if(data->preload) {
+		delete[] scanline;
+		if(!data->loaded) {
+			data->loaded = true;
+			data->preimage.SetCount(data->row_bytes * data->size.cy);
+			data->row_pointers.Alloc(data->size.cy);
+			for(int i = 0; i < data->size.cy; i++)
+				data->row_pointers[i] = &data->preimage[i * data->row_bytes];
+			png_read_image(data->png_ptr, data->row_pointers);
+		}
+		const byte *rowdata = &data->preimage[data->row_bytes * line];
+		return Raster::Line(rowdata, this, false);
+	}
+	else {
+		if(line < data->next_row) {
+			png_destroy_read_struct(&data->png_ptr, &data->info_ptr, NULL);
+			GetStream().Seek(data->soff);
+			if(!Init()) {
+				NEVER();
+			}
+			if(data->strip16)
+				png_set_strip_16(data->png_ptr);
+			if(data->out_bpp > 8)
+				png_set_bgr(data->png_ptr);
+			data->next_row = 0;
+		}
+		while(data->next_row < line) {
+			png_read_row(data->png_ptr, scanline, NULL);
+			data->next_row++;
+		}
+		png_read_row(data->png_ptr, scanline, NULL);
+		data->next_row++;
+		return Raster::Line(scanline, this, true);
+	}
+}
+
+const RGBA *PNGRaster::GetPalette()
+{
+	ASSERT(data);
+	return data->palette;
+}
+
+const RasterFormat *PNGRaster::GetFormat()
+{
+	ASSERT(data);
+	return &data->fmt;
+}
+
+class PNGEncoder::Data {
+public:
+	Data(RasterFormat& format);
+	~Data();
+
+	void Start(Stream& stream, Size size, int bpp, ImageKind kind, bool interlace, const RGBA *palette);
+	void WriteLineRaw(const byte *data);
+
+private:
+	RasterFormat& format;
+
+	ImageKind kind;
+
+	png_structp png_ptr;
+	png_infop info_ptr;
+	bool interlace;
+	bool do_palette;
+	bool do_mask;
+	bool do_alpha;
+
+	Vector<byte> imagebuf;
+	Vector<byte> rowbuf;
+	Size size;
+	int rowbytes;
+	int linebytes;
+	int passes;
+
+	int line;
+};
+
+PNGEncoder::Data::Data(RasterFormat& format)
+:	format(format)
+{
+	png_ptr = NULL;
+	info_ptr = NULL;
+}
+
+PNGEncoder::Data::~Data()
+{
+	png_destroy_write_struct(&png_ptr, &info_ptr);
+}
+
+void PNGEncoder::Data::Start(Stream& stream, Size size_, int bpp, ImageKind kind_, bool interlace_,
+	const RGBA *imgpal)
+{
+	size = size_;
+	kind = kind_;
+	interlace = interlace_;
+
+	png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, NULL, png_user_error_fn, png_user_warning_fn);
+	if(!png_ptr) {
+		stream.SetError();
+		return;
+	}
+
+	/* Allocate/initialize the image information data.  REQUIRED */
+	info_ptr = png_create_info_struct(png_ptr);
+	if(!info_ptr) {
+		stream.SetError();
+		return;
+	}
+
+/*
+	if (setjmp(png_jmpbuf(png_ptr))) {
+		png_destroy_write_struct(&png_ptr, &info_ptr);
+		sptr -> SetError();
+		return;
+	}
+*/
+	png_set_write_fn(png_ptr, (void *)&stream, png_write_stream, png_flush_stream);
+
+	int color_type, bit_depth;
+	Vector<png_color> palette;
+
+	do_alpha = (kind != IMAGE_OPAQUE && bpp != 1);
+	do_mask = (do_alpha && kind == IMAGE_MASK);
+	do_palette = (bpp <= 8);
+
+	if(do_palette) {
+		switch(bpp) {
+			case 1: format.Set1mf(); break;
+			case 2: format.Set2mf(); break;
+			case 4: format.Set4mf(); break;
+			default: NEVER();
+			case 8: format.Set8(); break;
+		}
+		bit_depth = bpp;
+		color_type = PNG_COLOR_TYPE_PALETTE;
+		palette.SetCount(1 << bpp);
+		for(int i = 0; i < palette.GetCount(); i++) {
+			png_color& c = palette[i];
+			c.red = imgpal[i].r;
+			c.green = imgpal[i].g;
+			c.blue = imgpal[i].b;
+		}
+		rowbytes = (size.cx * bpp + 31) >> 5 << 2;
+	}
+	else {
+		color_type = (do_alpha ? PNG_COLOR_TYPE_RGB_ALPHA : PNG_COLOR_TYPE_RGB);
+		bit_depth = 8;
+		if(do_alpha) {
+			format.Set32leStraight(0xFF << 16, 0xFF << 8, 0xFF, 0xFF << 24);
+			rowbytes = 4 * size.cx;
+		}
+		else {
+			format.Set24le(0xFF << 16, 0xFF << 8, 0xFF);
+			rowbytes = (3 * size.cx + 3) & -4;
+		}
+	}
+
+	png_set_IHDR(png_ptr, info_ptr, size.cx, size.cy, bit_depth, color_type,
+		interlace ? PNG_INTERLACE_ADAM7 : PNG_INTERLACE_NONE,
+		PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE);
+
+	if(!palette.IsEmpty())
+		png_set_PLTE(png_ptr, info_ptr, palette.Begin(), palette.GetCount());
+
+	byte transpal = (1 << bpp) - 1;
+	if(do_mask && do_palette) {
+		png_color_16 transrgb = { 0, 0, 0 };
+		png_set_tRNS(png_ptr, info_ptr, &transpal, 1, &transrgb);
+	}
+
+//	png_set_gAMA(png_ptr, info_ptr, gamma);
+
+	/* Optionally write comments into the image */
+//	text_ptr[0].key = "Title";
+//	text_ptr[0].text = "Mona Lisa";
+//	text_ptr[0].compression = PNG_TEXT_COMPRESSION_NONE;
+	#ifdef PNG_iTXt_SUPPORTED
+	text_ptr[0].lang = NULL;
+	#endif
+//	png_set_text(png_ptr, info_ptr, text_ptr, 1);
+
+	/* other optional chunks like cHRM, bKGD, tRNS, tIME, oFFs, pHYs, */
+	/* note that if sRGB is present the gAMA and cHRM chunks must be ignored
+	* on read and must be written in accordance with the sRGB profile */
+
+	/* Write the file header information.  REQUIRED */
+	png_write_info(png_ptr, info_ptr);
+
+	png_set_bgr(png_ptr);
+
+	passes = png_set_interlace_handling(png_ptr);
+	rowbuf.SetCount(rowbytes);
+	if(passes > 1)
+		imagebuf.SetCount(rowbytes * size.cy);
+
+	line = 0;
+	linebytes = format.GetByteCount(size.cx);
+}
+
+void PNGEncoder::Data::WriteLineRaw(const byte *s)
+{
+	byte *dest = (passes > 1 ? &imagebuf[line * rowbytes] : rowbuf.Begin());
+	memcpy(dest, s, linebytes);
+	png_write_row(png_ptr, dest);
+	if(++line >= size.cy) {
+		for(int p = 1; p < passes; p++)
+			for(int y = 0; y < size.cy; y++)
+				png_write_row(png_ptr, &imagebuf[y * rowbytes]);
+
+		/* You can write optional chunks like tEXt, zTXt, and tIME at the end
+		* as well.  Shouldn't be necessary in 1.1.0 and up as all the public
+		* chunks are supported and you can use png_set_unknown_chunks() to
+		* register unknown chunks into the info structure to be written out.
+		*/
+
+		png_write_end(png_ptr, info_ptr);
+	}
+}
+
+PNGEncoder::PNGEncoder(int bpp_, ImageKind kind_, bool interlace_)
+: bpp(bpp_), kind(kind_), interlace(interlace_)
+{
+}
+
+PNGEncoder::~PNGEncoder()
+{
+}
+
+int PNGEncoder::GetPaletteCount()
+{
+	return (bpp > 8 ? 0 : (1 << bpp) - (kind == IMAGE_OPAQUE || bpp == 1 ? 0 : 1));
+}
+
+void PNGEncoder::Start(Size sz)
+{
+	data = new Data(format);
+	data->Start(GetStream(), sz, bpp, kind, interlace, bpp > 8 ? NULL : GetPalette());
+}
+
+void PNGEncoder::WriteLineRaw(const byte *s)
+{
+	data->WriteLineRaw(s);
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/plugin/sqlite3/Sqlite3.h b/uppsrc/plugin/sqlite3/Sqlite3.h
new file mode 100644
index 000000000..31b35ac7e
--- /dev/null
+++ b/uppsrc/plugin/sqlite3/Sqlite3.h
@@ -0,0 +1,55 @@
+#ifndef __Plugin_Sqlite3__
+#define __Plugin_Sqlite3__
+
+#include <Sql/Sql.h>
+
+NAMESPACE_UPP
+
+bool Sqlite3PerformScript(const String& text,
+#ifdef NOAPPSQL
+	StatementExecutor& se,
+#else
+	StatementExecutor& se = SQLStatementExecutor(),
+#endif
+	Gate2<int, int> progress_canceled = false
+);
+
+class Sqlite3Session : public SqlSession {
+public:
+	virtual bool           IsOpen() const               { return NULL != db; }
+	virtual RunScript      GetRunScript() const         { return &Sqlite3PerformScript; }
+	virtual Vector<String> EnumUsers()                  { NEVER(); return Vector<String>(); } // No users in sqlite!
+	virtual Vector<String> EnumDatabases();	
+	virtual Vector<String> EnumTables(String database);
+	virtual Vector<String> EnumViews(String database);
+        virtual Vector<SqlColumnInfo> EnumColumns(String database, String table);
+
+	// Some opaque structures used by the sqlite3 library
+	typedef struct sqlite3 sqlite3;
+	typedef struct sqlite3_stmt sqlite3_stmt;
+
+protected:
+	virtual SqlConnection *CreateConnection();
+
+private:
+	sqlite3 *db;
+	String current_filename;
+	String current_dbname;
+
+public:
+	bool Open(const char *filename);
+	void Close();
+
+	operator sqlite3 *()   { return db; }
+
+	virtual void   Begin();
+	virtual void   Commit();
+	virtual void   Rollback();
+
+	Sqlite3Session()       { db = NULL; Dialect(SQLITE3); }
+	~Sqlite3Session()      { Close(); }
+};
+
+END_UPP_NAMESPACE
+
+#endif
diff --git a/uppsrc/plugin/sqlite3/Sqlite3Schema.h b/uppsrc/plugin/sqlite3/Sqlite3Schema.h
new file mode 100644
index 000000000..dd8b30fab
--- /dev/null
+++ b/uppsrc/plugin/sqlite3/Sqlite3Schema.h
@@ -0,0 +1,111 @@
+#define INT(x)                     COLUMN("integer", int, x, 0, 0)
+#define INT_ARRAY(x, items)        COLUMN_ARRAY("integer", int, x, 0, 0, items)
+#define INT_(x)                    COLUMN_("integer", int, x, 0, 0)
+#define INT_ARRAY_(x, items)       COLUMN_ARRAY_("integer", int, x, 0, 0, items)
+
+#define INT64(x)                   COLUMN("integer", int64, x, 0, 0)
+#define INT64_ARRAY(x, items)      COLUMN_ARRAY("integer", int64, x, 0, 0, items)
+#define INT64_(x)                  COLUMN_("integer", int64, x, 0, 0)
+#define INT64_ARRAY_(x, items)     COLUMN_ARRAY_("integer", int64, x, 0, 0, items)
+
+#define DOUBLE(x)                  COLUMN("real", double, x, 0, 0)
+#define DOUBLE_ARRAY(x, items)     COLUMN_ARRAY("real", double, x, 0, 0, items)
+#define DOUBLE_(x)                 COLUMN_("real", double, x, 0, 0)
+#define DOUBLE_ARRAY_(x, items)    COLUMN_ARRAY_("real", double, x, 0, 0, items)
+
+#define STRING(x, n)               COLUMN("text", String, x, 0, 0)
+#define STRING_ARRAY(x, n, items)  COLUMN_ARRAY("text", String, x, 0, 0, items)
+#define STRING_(x, n)              COLUMN_("text", String, x, 0, 0)
+#define STRING_ARRAY_(x, n, items) COLUMN_ARRAY_("text", String, x, 0, 0, items)
+
+#define DATE(x)                    COLUMN("date", Date, x, 0, 0)
+#define DATE_ARRAY(x, items)       COLUMN_ARRAY("date", Date, x, 0, 0, items)
+#define DATE_(x)                   COLUMN_("date", Date, x, 0, 0)
+#define DATE_ARRAY_(x, items)      COLUMN_ARRAY_("date", Date, x, 0, 0, items)
+
+#define TIME(x)                    COLUMN("date", Time, x, 0, 0)
+#define TIME_ARRAY(x, items)       COLUMN_ARRAY("date", Time, x, 0, 0, items)
+#define TIME_(x)                   COLUMN_("date", Time, x, 0, 0)
+#define TIME_ARRAY_(x, items)      COLUMN_ARRAY_("date", Time, x, 0, 0, items)
+
+#define BOOL(x)                    COLUMN("text", bool, x, 0, 0)
+#define BOOL_ARRAY(x, items)       COLUMN_ARRAY("text", bool, x, 0, 0, items)
+#define BOOL_(x)                   COLUMN_("text", bool, x, 0, 0)
+#define BOOL_ARRAY_(x, items)      COLUMN_ARRAY_("text", bool, x, 0, 0, items)
+
+#define BLOB(x)                    COLUMN("blob", String, x, 0, 0)
+#define BLOB_(x)                   COLUMN_("blob", String, x, 0, 0)
+
+#define PRIMARY_KEY                INLINE_ATTRIBUTE("primary key")
+#define AUTO_INCREMENT             INLINE_ATTRIBUTE("autoincrement")
+#define NOT_NULL                   INLINE_ATTRIBUTE("not null")
+
+#define INDEX                      ATTRIBUTE("create index IDX_@x on @t(@c);", \
+                                             "drop index IDX_@x;")
+#define UNIQUE                     ATTRIBUTE("create unique index IDX_@x on @t(@c);", \
+                                             "drop index IDX_@x;")
+
+#define REFERENCES(x)              ATTRIBUTE("alter table @t add (constraint FK_@x foreign key "\
+                                             "(@c) references " #x ");",\
+                                             "alter table @t drop constraint FK_@x;")
+#define REFERENCES_CASCADE(x)      ATTRIBUTE("alter table @t add (constraint FK_@x foreign key "\
+                                             "(@c) references " #x " on delete cascade);",\
+                                             "alter table @t drop constraint FK_@x;")
+#define REFERENCES_(n, x)          ATTRIBUTE("alter table @t add (constraint FK_@x$" #n " foreign key "\
+                                             "(@c) references " #x ");",\
+                                             "alter table @t drop constraint FK_@x$" #n ";")
+#define REFERENCES_CASCADE_(n, x)  ATTRIBUTE("alter table @t add (constraint FK_@x$" #n " foreign key "\
+                                             "(@c) references " #x " on delete cascade);",\
+                                             "alter table @t drop constraint FK_@x$" #n ";")
+
+#define DUAL_PRIMARY_KEY(k1, k2)   INLINE_ATTRIBUTE(", primary key (" #k1 ", " #k2 ")")
+
+#define DUAL_UNIQUE(k1, k2)        ATTRIBUTE("alter table @t add constraint DQ_@t unique "\
+                                             "(" #k1 ", " #k2 ");",\
+                                             "alter table @t drop constraint DQ_@t;")
+
+#define UNIQUE_LIST(u, l)          ATTRIBUTE("alter table @t add constraint UQ_@t$" #u " unique "\
+                                             "(" l ");",\
+                                             "alter table @t drop constraint UQ_@t$" #u ";")
+
+#define SQLCHECK(n, ct)            ATTRIBUTE("alter table @t add constraint CHK_@t$" #n " check "\
+                                             "(" ct ");",\
+                                             "alter table @t drop constraint CHK_@t$" #n ";")
+
+#define SQLDEFAULT(v)              INLINE_ATTRIBUTE("default " #v)
+
+#define TIMESTAMP(ts)              SCHEMA("-- " ts "\n\n", NULL)
+
+#define COMMENT(txt)               SCHEMA("-- " #txt "\n", NULL)
+
+
+#include <Sql/sch_model.h>
+
+
+#undef INT
+#undef INT_ARRAY
+#undef INT_
+#undef INT_ARRAY_
+
+#undef DOUBLE
+#undef DOUBLE_ARRAY
+#undef DOUBLE_
+#undef DOUBLE_ARRAY_
+
+#undef STRING
+#undef STRING_ARRAY
+#undef STRING_
+#undef STRING_ARRAY_
+
+#undef BLOB
+#undef BLOB_
+
+#undef PRIMARY_KEY
+#undef AUTO_INCREMENT
+#undef NOT_NULL
+
+#undef INDEX
+#undef UNIQUE
+
+#undef TIMESTAMP
+#undef COMMENT
diff --git a/uppsrc/plugin/sqlite3/Sqlite3upp.cpp b/uppsrc/plugin/sqlite3/Sqlite3upp.cpp
new file mode 100644
index 000000000..ba3c0f2ab
--- /dev/null
+++ b/uppsrc/plugin/sqlite3/Sqlite3upp.cpp
@@ -0,0 +1,425 @@
+#include <Core/Core.h>
+#include <Sql/Sql.h>
+#include "lib/sqlite3.h"
+#include "Sqlite3.h"
+
+NAMESPACE_UPP
+
+#define LLOG(x) // LOG(x)
+
+class Sqlite3Connection : public SqlConnection {
+protected:
+	virtual void        SetParam(int i, const Value& r);
+	virtual bool        Execute();
+	virtual int         GetRowsProcessed() const;
+	virtual Value       GetInsertedId() const;
+	virtual bool        Fetch();
+	virtual void        GetColumn(int i, Ref f) const;
+	virtual void        Cancel();
+	virtual SqlSession& GetSession() const;
+	virtual String      ToString() const;
+
+	typedef Sqlite3Session::sqlite3 sqlite3;
+	typedef Sqlite3Session::sqlite3_stmt sqlite3_stmt;
+
+private:
+	Sqlite3Session&  session;
+	sqlite3*         db;
+	Vector<Value>    param;
+
+	sqlite3_stmt*    current_stmt;
+	String           current_stmt_string;
+	bool             got_first_row;
+	bool             got_row_data;
+
+	friend class Sqlite3Session;
+	void             BindParam(int i, const Value& r);
+
+public:
+	Sqlite3Connection(Sqlite3Session& the_session, sqlite3 *the_db);
+	virtual ~Sqlite3Connection();
+};
+
+Sqlite3Connection::Sqlite3Connection(Sqlite3Session& the_session, sqlite3 *the_db)
+:	session(the_session), db(the_db), current_stmt(NULL), got_first_row(false), got_row_data(false)
+{}
+
+Sqlite3Connection::~Sqlite3Connection()
+{
+	Cancel();
+}
+
+void Sqlite3Connection::Cancel()
+{
+	if (current_stmt) {
+		if (sqlite3_reset(current_stmt) != SQLITE_OK)
+			session.SetError(sqlite3_errmsg(db), "Resetting statement: " + current_stmt_string);
+		if (sqlite3_finalize(current_stmt) != SQLITE_OK)
+			session.SetError(sqlite3_errmsg(db), "Finalizing statement: "+ current_stmt_string);
+		current_stmt = NULL;
+		current_stmt_string.Clear();
+	}
+}
+
+void Sqlite3Connection::SetParam(int i, const Value& r)
+{
+	LLOG(Format("SetParam(%d,%s)",i,r.ToString()));
+	param.At(i) = r;
+}
+
+void Sqlite3Connection::BindParam(int i, const Value& r) {
+	if (IsNull(r))
+		sqlite3_bind_null(current_stmt,i);
+	else switch (r.GetType()) {
+		case STRING_V:
+		case WSTRING_V: {
+			WString p = r;
+			sqlite3_bind_text16(current_stmt,i,p,2*p.GetLength(),SQLITE_TRANSIENT);
+			break;
+		}
+		case BOOL_V:
+		case INT_V:
+			sqlite3_bind_int(current_stmt, i, int(r));
+			break;
+		case INT64_V:
+			sqlite3_bind_int64(current_stmt, i, int64(r));
+			break;
+		case DOUBLE_V:
+			sqlite3_bind_double(current_stmt, i, double(r));
+			break;
+		case DATE_V: {
+				Date d = r;
+				String p = Format("%04d-%02d-%02d", d.year, d.month, d.day);
+				sqlite3_bind_text(current_stmt,i,p,p.GetLength(),SQLITE_TRANSIENT);
+			}
+			break;
+		case TIME_V: {
+				Time t = r;
+				String p = Format("%02d-%02d-%04d %02d:%02d:%02d",
+						   t.month, t.day, t.year, t.hour, t.minute, t.second);
+				sqlite3_bind_text(current_stmt,i,p,p.GetLength(),SQLITE_TRANSIENT);
+			}
+			break;
+		default:
+			NEVER();
+	}
+}
+
+int ParseForArgs(const char* sqlcmd)
+{
+	int numargs = 0;
+	const char* ptr = sqlcmd;
+	while (*ptr)
+		if(*ptr == '\'')
+			while(*++ptr && (*ptr != '\'' || *++ptr && *ptr == '\''))
+				;
+		else if(*ptr++ == '?')
+			++numargs;
+	return numargs;
+}
+
+bool Sqlite3Connection::Execute() {
+	Cancel();
+	if(statement.GetLength() == 0) {
+		session.SetError("Empty statement", String("Preparing: ") + statement);
+		return false;
+	}
+	if (SQLITE_OK != sqlite3_prepare(db,statement,statement.GetLength(),&current_stmt,NULL)) {
+		LLOG("Sqlite3Connection::Compile(" << statement << ") -> error");
+		session.SetError(sqlite3_errmsg(db), String("Preparing: ") + statement);
+		return false;
+	}
+	current_stmt_string = statement;
+	int nparams = ParseForArgs(current_stmt_string);
+	ASSERT(nparams == param.GetCount());
+	for (int i = 0; i < nparams; ++i)
+		BindParam(i+1,param[i]);
+	param.Clear();
+	// Make sure that compiling the statement never fails.
+	ASSERT(NULL != current_stmt);
+	int retcode = sqlite3_step(current_stmt);
+	if ((retcode != SQLITE_DONE) && (retcode != SQLITE_ROW)) {
+		session.SetError(sqlite3_errmsg(db), current_stmt_string);
+		return false;
+	}
+	got_first_row = got_row_data = (retcode==SQLITE_ROW);
+	if (got_row_data) {
+		int numfields = sqlite3_column_count(current_stmt);
+		info.SetCount(numfields);
+		for (int i = 0; i < numfields; ++i) {
+			SqlColumnInfo& field = info[i];
+			field.name = sqlite3_column_name(current_stmt,i);
+			String coltype = sqlite3_column_decltype(current_stmt,i);
+			switch (sqlite3_column_type(current_stmt,i)) {
+				case SQLITE_INTEGER:
+					field.type = INT_V;
+					break;
+				case SQLITE_FLOAT:
+					field.type = DOUBLE_V;
+					break;
+				case SQLITE_TEXT:
+					if(coltype == "date")
+						field.type = DATE_V;
+					else
+						field.type = WSTRING_V;
+					break;
+				case SQLITE_NULL:
+					field.type = VOID_V;
+					break;
+				case SQLITE_BLOB:
+					field.type = STRING_V;
+					break;
+				default:
+					NEVER();
+					break;
+			}
+		}
+	}
+	return true;
+}
+
+int Sqlite3Connection::GetRowsProcessed() const
+{
+	LLOG("GetRowsProcessed()");
+	return sqlite3_changes(db);
+}
+
+Value Sqlite3Connection::GetInsertedId() const
+{
+	LLOG("GetInsertedId()");
+	return sqlite3_last_insert_rowid(db);
+}
+
+bool Sqlite3Connection::Fetch() {
+	ASSERT(NULL != current_stmt);
+	if (!got_row_data)
+		return false;
+	if (got_first_row) {
+		got_first_row = false;
+		return true;
+	}
+	ASSERT(got_row_data);
+	int retcode = sqlite3_step(current_stmt);
+	if ((retcode != SQLITE_DONE) && (retcode != SQLITE_ROW))
+		session.SetError(sqlite3_errmsg(db), String("Fetching prepared statement: ")+current_stmt_string );
+	got_row_data = (retcode==SQLITE_ROW);
+	return got_row_data;
+}
+
+void Sqlite3Connection::GetColumn(int i, Ref f) const {
+	ASSERT(NULL != current_stmt);
+	if(i == -1) {
+		f = Value(sqlite3_last_insert_rowid(db));
+		return;
+	}
+
+	ASSERT(got_row_data);
+	String coltype = sqlite3_column_decltype(current_stmt,i);
+	String sdate;
+	switch (sqlite3_column_type(current_stmt,i)) {
+		case SQLITE_INTEGER:
+			f = sqlite3_column_int64(current_stmt,i);
+			break;
+		case SQLITE_FLOAT:
+			f = sqlite3_column_double(current_stmt,i);
+			break;
+		case SQLITE_TEXT:
+			if (coltype == "date"){
+				sdate = (const char *)sqlite3_column_text(current_stmt, i);
+				f = Value(Date(atoi(sdate.Mid(0, 4)), atoi(sdate.Mid(5, 2)),
+				               atoi(sdate.Mid(8, 2))));
+			}
+			else
+				f = Value(WString((const wchar*)sqlite3_column_text16(current_stmt,i)));
+			break;
+		case SQLITE_NULL:
+			f = Null;
+			break;
+		case SQLITE_BLOB:
+			f = Value(String( (const byte*)sqlite3_column_blob(current_stmt,i),
+			                  sqlite3_column_bytes(current_stmt,i)                ));
+			break;
+		default:
+			NEVER();
+			break;
+	}
+	return;
+}
+SqlSession& Sqlite3Connection::GetSession() const { return session; }
+String Sqlite3Connection::ToString() const {
+	return statement;
+}
+
+//////////////////////////////////////////////////////////////////////
+
+
+bool Sqlite3Session::Open(const char* filename) {
+	// Only open db once.
+	ASSERT(NULL == db);
+	current_filename = filename;
+	// By default, sqlite3 associates the opened db with "main.*"
+	// However, using the ATTACH sql command, it can connect to more databases.
+	// I don't know how to get the list of attached databases from the API
+	current_dbname = "main";
+	bool opened = (SQLITE_OK == sqlite3_open(filename, &db));
+	return opened;
+}
+void Sqlite3Session::Close() {
+	if (NULL != db) {
+		int retval;
+#ifndef flagNOAPPSQL
+		if(&SQL.GetSession() == this)
+			SQL.Cancel();
+#endif
+		retval = sqlite3_close(db);
+		// If this function fails, that means that some of the
+		// prepared statements have not been finalized.
+		// See lib/sqlite3.h:91
+		ASSERT(SQLITE_OK == retval);
+		db = NULL;
+	}
+}
+SqlConnection *Sqlite3Session::CreateConnection() {
+	return new Sqlite3Connection(*this, db);
+}
+void Sqlite3Session::Begin() {
+	static const char begin[] = "BEGIN;";
+	if(trace)
+		*trace << begin << "\n";
+	if(SQLITE_OK != sqlite3_exec(db,begin,NULL,NULL,NULL))
+		SetError(sqlite3_errmsg(db), begin);
+}
+void Sqlite3Session::Commit() {
+	static const char commit[] = "COMMIT;";
+	if(trace)
+		*trace << commit << "\n";
+	if(SQLITE_OK != sqlite3_exec(db,commit,NULL,NULL,NULL))
+		SetError(sqlite3_errmsg(db), commit);
+}
+void Sqlite3Session::Rollback() {
+	static const char rollback[] = "ROLLBACK;";
+	if(trace)
+		*trace << rollback << "\n";
+	if(SQLITE_OK != sqlite3_exec(db,rollback,NULL,NULL,NULL))
+		SetError(sqlite3_errmsg(db), rollback);
+}
+Vector<String> Sqlite3Session::EnumDatabases() {
+	Vector<String> out;
+	Sql sql(*this);
+	sql.Execute("PRAGMA database_list;");
+	while (sql.Fetch())
+		out.Add(sql[1]);  // sql[1] is database name, sql[2] is filename
+	return out;
+}
+
+Vector<String> Sqlite3Session::EnumTables(String database) {
+	Vector<String> out;
+	String dbn=database;
+	if(dbn.IsEmpty()) dbn=current_dbname; // for backward compatibility
+	Sql sql(*this);
+	sql.Execute("SELECT name FROM "+dbn+".sqlite_master WHERE type='table' AND name NOT LIKE 'sqlite_%' ORDER BY 1;");
+	while (sql.Fetch())
+		out.Add(sql[0]);
+	return out;
+}
+
+Vector<String> Sqlite3Session::EnumViews(String database) {
+	Vector<String> out;
+	String dbn=database;
+	if(dbn.IsEmpty()) dbn=current_dbname;
+	Sql sql(*this);
+	sql.Execute("SELECT name FROM "+dbn+".sqlite_master WHERE type='view' AND name NOT LIKE 'sqlite_%' ORDER BY 1;");
+	while (sql.Fetch())
+		out.Add(sql[0]);
+	return out;
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+
+Vector<SqlColumnInfo> Sqlite3Session::EnumColumns(String database, String table) {
+	Vector<SqlColumnInfo> out;
+	SqlColumnInfo info;
+	String ColType;
+	Sql sql(*this);
+	sql.Execute("PRAGMA table_info("+table+");");
+	while (sql.Fetch()) {
+		info.width = info.scale = info.precision = 0;
+		info.name = sql[1];
+		ColType   = sql[2];
+		if(ColType =="integer")
+			info.type = INT_V;
+		else
+		if(ColType =="real")
+			info.type = DOUBLE_V;
+		else
+		if (ColType =="date")
+			info.type = DATE_V; // is text
+		else
+			info.type = STRING_V;
+		out.Add(info);
+	}
+	return out;
+}
+
+
+//////////////////////////////////////////////////////////////////////
+
+const char *Sqlite3ReadString(const char *s, String& stmt) {
+	stmt.Cat(*s);
+	int c = *s++;
+	for(;;) {
+		if(*s == '\0') break;
+		else
+		if(*s == '\'' && s[1] == '\'') {
+			stmt.Cat('\'');
+			s += 2;
+		}
+		else
+		if(*s == c) {
+			stmt.Cat(c);
+			s++;
+			break;
+		}
+		else
+		if(*s == '\\') {
+			stmt.Cat('\\');
+			if(*++s)
+				stmt.Cat(*s++);
+		}
+		else
+			stmt.Cat(*s++);
+	}
+	return s;
+}
+
+bool Sqlite3PerformScript(const String& txt, StatementExecutor& se, Gate2<int, int> progress_canceled) {
+	const char *text = txt;
+	for(;;) {
+		String stmt;
+		while(*text <= 32 && *text > 0) text++;
+		if(*text == '\0') break;
+		for(;;) {
+			if(*text == '\0')
+				break;
+			if(*text == ';')
+				break;
+			else
+			if(*text == '\'')
+				text = Sqlite3ReadString(text, stmt);
+			else
+			if(*text == '\"')
+				text = Sqlite3ReadString(text, stmt);
+			else
+				stmt.Cat(*text++);
+		}
+		if(progress_canceled(text - txt.Begin(), txt.GetLength()))
+			return false;
+		if(!se.Execute(stmt))
+			return false;
+		if(*text) text++;
+	}
+	return true;
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/plugin/sqlite3/init b/uppsrc/plugin/sqlite3/init
new file mode 100644
index 000000000..25a5c4d45
--- /dev/null
+++ b/uppsrc/plugin/sqlite3/init
@@ -0,0 +1,4 @@
+#ifndef _plugin_sqlite3_icpp_init_stub
+#define _plugin_sqlite3_icpp_init_stub
+#include "Sql/init"
+#endif
diff --git a/uppsrc/plugin/sqlite3/lib/alter.c b/uppsrc/plugin/sqlite3/lib/alter.c
new file mode 100644
index 000000000..abd34d01b
--- /dev/null
+++ b/uppsrc/plugin/sqlite3/lib/alter.c
@@ -0,0 +1,630 @@
+/*
+** 2005 February 15
+**
+** The author disclaims copyright to this source code.  In place of
+** a legal notice, here is a blessing:
+**
+**    May you do good and not evil.
+**    May you find forgiveness for yourself and forgive others.
+**    May you share freely, never taking more than you give.
+**
+*************************************************************************
+** This file contains C code routines that used to generate VDBE code
+** that implements the ALTER TABLE command.
+**
+** $Id: alter.c,v 1.42 2008/02/09 14:30:30 drh Exp $
+*/
+#include "sqliteInt.h"
+#include <ctype.h>
+
+/*
+** The code in this file only exists if we are not omitting the
+** ALTER TABLE logic from the build.
+*/
+#ifndef SQLITE_OMIT_ALTERTABLE
+
+
+/*
+** This function is used by SQL generated to implement the
+** ALTER TABLE command. The first argument is the text of a CREATE TABLE or
+** CREATE INDEX command. The second is a table name. The table name in
+** the CREATE TABLE or CREATE INDEX statement is replaced with the third
+** argument and the result returned. Examples:
+**
+** sqlite_rename_table('CREATE TABLE abc(a, b, c)', 'def')
+**     -> 'CREATE TABLE def(a, b, c)'
+**
+** sqlite_rename_table('CREATE INDEX i ON abc(a)', 'def')
+**     -> 'CREATE INDEX i ON def(a, b, c)'
+*/
+static void renameTableFunc(
+  sqlite3_context *context,
+  int argc,
+  sqlite3_value **argv
+){
+  unsigned char const *zSql = sqlite3_value_text(argv[0]);
+  unsigned char const *zTableName = sqlite3_value_text(argv[1]);
+
+  int token;
+  Token tname;
+  unsigned char const *zCsr = zSql;
+  int len = 0;
+  char *zRet;
+
+  sqlite3 *db = sqlite3_user_data(context);
+
+  /* The principle used to locate the table name in the CREATE TABLE
+  ** statement is that the table name is the first token that is immediatedly
+  ** followed by a left parenthesis - TK_LP - or "USING" TK_USING.
+  */
+  if( zSql ){
+    do {
+      if( !*zCsr ){
+        /* Ran out of input before finding an opening bracket. Return NULL. */
+        return;
+      }
+
+      /* Store the token that zCsr points to in tname. */
+      tname.z = zCsr;
+      tname.n = len;
+
+      /* Advance zCsr to the next token. Store that token type in 'token',
+      ** and its length in 'len' (to be used next iteration of this loop).
+      */
+      do {
+        zCsr += len;
+        len = sqlite3GetToken(zCsr, &token);
+      } while( token==TK_SPACE );
+      assert( len>0 );
+    } while( token!=TK_LP && token!=TK_USING );
+
+    zRet = sqlite3MPrintf(db, "%.*s\"%w\"%s", tname.z - zSql, zSql,
+       zTableName, tname.z+tname.n);
+    sqlite3_result_text(context, zRet, -1, sqlite3_free);
+  }
+}
+
+#ifndef SQLITE_OMIT_TRIGGER
+/* This function is used by SQL generated to implement the
+** ALTER TABLE command. The first argument is the text of a CREATE TRIGGER
+** statement. The second is a table name. The table name in the CREATE
+** TRIGGER statement is replaced with the third argument and the result
+** returned. This is analagous to renameTableFunc() above, except for CREATE
+** TRIGGER, not CREATE INDEX and CREATE TABLE.
+*/
+static void renameTriggerFunc(
+  sqlite3_context *context,
+  int argc,
+  sqlite3_value **argv
+){
+  unsigned char const *zSql = sqlite3_value_text(argv[0]);
+  unsigned char const *zTableName = sqlite3_value_text(argv[1]);
+
+  int token;
+  Token tname;
+  int dist = 3;
+  unsigned char const *zCsr = zSql;
+  int len = 0;
+  char *zRet;
+
+  sqlite3 *db = sqlite3_user_data(context);
+
+  /* The principle used to locate the table name in the CREATE TRIGGER
+  ** statement is that the table name is the first token that is immediatedly
+  ** preceded by either TK_ON or TK_DOT and immediatedly followed by one
+  ** of TK_WHEN, TK_BEGIN or TK_FOR.
+  */
+  if( zSql ){
+    do {
+
+      if( !*zCsr ){
+        /* Ran out of input before finding the table name. Return NULL. */
+        return;
+      }
+
+      /* Store the token that zCsr points to in tname. */
+      tname.z = zCsr;
+      tname.n = len;
+
+      /* Advance zCsr to the next token. Store that token type in 'token',
+      ** and its length in 'len' (to be used next iteration of this loop).
+      */
+      do {
+        zCsr += len;
+        len = sqlite3GetToken(zCsr, &token);
+      }while( token==TK_SPACE );
+      assert( len>0 );
+
+      /* Variable 'dist' stores the number of tokens read since the most
+      ** recent TK_DOT or TK_ON. This means that when a WHEN, FOR or BEGIN
+      ** token is read and 'dist' equals 2, the condition stated above
+      ** to be met.
+      **
+      ** Note that ON cannot be a database, table or column name, so
+      ** there is no need to worry about syntax like
+      ** "CREATE TRIGGER ... ON ON.ON BEGIN ..." etc.
+      */
+      dist++;
+      if( token==TK_DOT || token==TK_ON ){
+        dist = 0;
+      }
+    } while( dist!=2 || (token!=TK_WHEN && token!=TK_FOR && token!=TK_BEGIN) );
+
+    /* Variable tname now contains the token that is the old table-name
+    ** in the CREATE TRIGGER statement.
+    */
+    zRet = sqlite3MPrintf(db, "%.*s\"%w\"%s", tname.z - zSql, zSql,
+       zTableName, tname.z+tname.n);
+    sqlite3_result_text(context, zRet, -1, sqlite3_free);
+  }
+}
+#endif   /* !SQLITE_OMIT_TRIGGER */
+
+/*
+** Register built-in functions used to help implement ALTER TABLE
+*/
+void sqlite3AlterFunctions(sqlite3 *db){
+  static const struct {
+     char *zName;
+     signed char nArg;
+     void (*xFunc)(sqlite3_context*,int,sqlite3_value **);
+  } aFuncs[] = {
+    { "sqlite_rename_table",    2, renameTableFunc},
+#ifndef SQLITE_OMIT_TRIGGER
+    { "sqlite_rename_trigger",  2, renameTriggerFunc},
+#endif
+  };
+  int i;
+
+  for(i=0; i<sizeof(aFuncs)/sizeof(aFuncs[0]); i++){
+    sqlite3CreateFunc(db, aFuncs[i].zName, aFuncs[i].nArg,
+        SQLITE_UTF8, (void *)db, aFuncs[i].xFunc, 0, 0);
+  }
+}
+
+/*
+** Generate the text of a WHERE expression which can be used to select all
+** temporary triggers on table pTab from the sqlite_temp_master table. If
+** table pTab has no temporary triggers, or is itself stored in the
+** temporary database, NULL is returned.
+*/
+static char *whereTempTriggers(Parse *pParse, Table *pTab){
+  Trigger *pTrig;
+  char *zWhere = 0;
+  char *tmp = 0;
+  const Schema *pTempSchema = pParse->db->aDb[1].pSchema; /* Temp db schema */
+
+  /* If the table is not located in the temp-db (in which case NULL is
+  ** returned, loop through the tables list of triggers. For each trigger
+  ** that is not part of the temp-db schema, add a clause to the WHERE
+  ** expression being built up in zWhere.
+  */
+  if( pTab->pSchema!=pTempSchema ){
+    sqlite3 *db = pParse->db;
+    for( pTrig=pTab->pTrigger; pTrig; pTrig=pTrig->pNext ){
+      if( pTrig->pSchema==pTempSchema ){
+        if( !zWhere ){
+          zWhere = sqlite3MPrintf(db, "name=%Q", pTrig->name);
+        }else{
+          tmp = zWhere;
+          zWhere = sqlite3MPrintf(db, "%s OR name=%Q", zWhere, pTrig->name);
+          sqlite3_free(tmp);
+        }
+      }
+    }
+  }
+  return zWhere;
+}
+
+/*
+** Generate code to drop and reload the internal representation of table
+** pTab from the database, including triggers and temporary triggers.
+** Argument zName is the name of the table in the database schema at
+** the time the generated code is executed. This can be different from
+** pTab->zName if this function is being called to code part of an
+** "ALTER TABLE RENAME TO" statement.
+*/
+static void reloadTableSchema(Parse *pParse, Table *pTab, const char *zName){
+  Vdbe *v;
+  char *zWhere;
+  int iDb;                   /* Index of database containing pTab */
+#ifndef SQLITE_OMIT_TRIGGER
+  Trigger *pTrig;
+#endif
+
+  v = sqlite3GetVdbe(pParse);
+  if( !v ) return;
+  assert( sqlite3BtreeHoldsAllMutexes(pParse->db) );
+  iDb = sqlite3SchemaToIndex(pParse->db, pTab->pSchema);
+  assert( iDb>=0 );
+
+#ifndef SQLITE_OMIT_TRIGGER
+  /* Drop any table triggers from the internal schema. */
+  for(pTrig=pTab->pTrigger; pTrig; pTrig=pTrig->pNext){
+    int iTrigDb = sqlite3SchemaToIndex(pParse->db, pTrig->pSchema);
+    assert( iTrigDb==iDb || iTrigDb==1 );
+    sqlite3VdbeAddOp4(v, OP_DropTrigger, iTrigDb, 0, 0, pTrig->name, 0);
+  }
+#endif
+
+  /* Drop the table and index from the internal schema */
+  sqlite3VdbeAddOp4(v, OP_DropTable, iDb, 0, 0, pTab->zName, 0);
+
+  /* Reload the table, index and permanent trigger schemas. */
+  zWhere = sqlite3MPrintf(pParse->db, "tbl_name=%Q", zName);
+  if( !zWhere ) return;
+  sqlite3VdbeAddOp4(v, OP_ParseSchema, iDb, 0, 0, zWhere, P4_DYNAMIC);
+
+#ifndef SQLITE_OMIT_TRIGGER
+  /* Now, if the table is not stored in the temp database, reload any temp
+  ** triggers. Don't use IN(...) in case SQLITE_OMIT_SUBQUERY is defined.
+  */
+  if( (zWhere=whereTempTriggers(pParse, pTab))!=0 ){
+    sqlite3VdbeAddOp4(v, OP_ParseSchema, 1, 0, 0, zWhere, P4_DYNAMIC);
+  }
+#endif
+}
+
+/*
+** Generate code to implement the "ALTER TABLE xxx RENAME TO yyy"
+** command.
+*/
+void sqlite3AlterRenameTable(
+  Parse *pParse,            /* Parser context. */
+  SrcList *pSrc,            /* The table to rename. */
+  Token *pName              /* The new table name. */
+){
+  int iDb;                  /* Database that contains the table */
+  char *zDb;                /* Name of database iDb */
+  Table *pTab;              /* Table being renamed */
+  char *zName = 0;          /* NULL-terminated version of pName */
+  sqlite3 *db = pParse->db; /* Database connection */
+  int nTabName;             /* Number of UTF-8 characters in zTabName */
+  const char *zTabName;     /* Original name of the table */
+  Vdbe *v;
+#ifndef SQLITE_OMIT_TRIGGER
+  char *zWhere = 0;         /* Where clause to locate temp triggers */
+#endif
+  int isVirtualRename = 0;  /* True if this is a v-table with an xRename() */
+
+  if( db->mallocFailed ) goto exit_rename_table;
+  assert( pSrc->nSrc==1 );
+  assert( sqlite3BtreeHoldsAllMutexes(pParse->db) );
+
+  pTab = sqlite3LocateTable(pParse, 0, pSrc->a[0].zName, pSrc->a[0].zDatabase);
+  if( !pTab ) goto exit_rename_table;
+  iDb = sqlite3SchemaToIndex(pParse->db, pTab->pSchema);
+  zDb = db->aDb[iDb].zName;
+
+  /* Get a NULL terminated version of the new table name. */
+  zName = sqlite3NameFromToken(db, pName);
+  if( !zName ) goto exit_rename_table;
+
+  /* Check that a table or index named 'zName' does not already exist
+  ** in database iDb. If so, this is an error.
+  */
+  if( sqlite3FindTable(db, zName, zDb) || sqlite3FindIndex(db, zName, zDb) ){
+    sqlite3ErrorMsg(pParse,
+        "there is already another table or index with this name: %s", zName);
+    goto exit_rename_table;
+  }
+
+  /* Make sure it is not a system table being altered, or a reserved name
+  ** that the table is being renamed to.
+  */
+  if( strlen(pTab->zName)>6 && 0==sqlite3StrNICmp(pTab->zName, "sqlite_", 7) ){
+    sqlite3ErrorMsg(pParse, "table %s may not be altered", pTab->zName);
+    goto exit_rename_table;
+  }
+  if( SQLITE_OK!=sqlite3CheckObjectName(pParse, zName) ){
+    goto exit_rename_table;
+  }
+
+#ifndef SQLITE_OMIT_VIEW
+  if( pTab->pSelect ){
+    sqlite3ErrorMsg(pParse, "view %s may not be altered", pTab->zName);
+    goto exit_rename_table;
+  }
+#endif
+
+#ifndef SQLITE_OMIT_AUTHORIZATION
+  /* Invoke the authorization callback. */
+  if( sqlite3AuthCheck(pParse, SQLITE_ALTER_TABLE, zDb, pTab->zName, 0) ){
+    goto exit_rename_table;
+  }
+#endif
+
+#ifndef SQLITE_OMIT_VIRTUALTABLE
+  if( sqlite3ViewGetColumnNames(pParse, pTab) ){
+    goto exit_rename_table;
+  }
+  if( IsVirtual(pTab) && pTab->pMod->pModule->xRename ){
+    isVirtualRename = 1;
+  }
+#endif
+
+  /* Begin a transaction and code the VerifyCookie for database iDb.
+  ** Then modify the schema cookie (since the ALTER TABLE modifies the
+  ** schema). Open a statement transaction if the table is a virtual
+  ** table.
+  */
+  v = sqlite3GetVdbe(pParse);
+  if( v==0 ){
+    goto exit_rename_table;
+  }
+  sqlite3BeginWriteOperation(pParse, isVirtualRename, iDb);
+  sqlite3ChangeCookie(pParse, iDb);
+
+  /* If this is a virtual table, invoke the xRename() function if
+  ** one is defined. The xRename() callback will modify the names
+  ** of any resources used by the v-table implementation (including other
+  ** SQLite tables) that are identified by the name of the virtual table.
+  */
+#ifndef SQLITE_OMIT_VIRTUALTABLE
+  if( isVirtualRename ){
+    int i = ++pParse->nMem;
+    sqlite3VdbeAddOp4(v, OP_String8, 0, i, 0, zName, 0);
+    sqlite3VdbeAddOp4(v, OP_VRename, i, 0, 0,(const char*)pTab->pVtab, P4_VTAB);
+  }
+#endif
+
+  /* figure out how many UTF-8 characters are in zName */
+  zTabName = pTab->zName;
+  nTabName = sqlite3Utf8CharLen(zTabName, -1);
+
+  /* Modify the sqlite_master table to use the new table name. */
+  sqlite3NestedParse(pParse,
+      "UPDATE %Q.%s SET "
+#ifdef SQLITE_OMIT_TRIGGER
+          "sql = sqlite_rename_table(sql, %Q), "
+#else
+          "sql = CASE "
+            "WHEN type = 'trigger' THEN sqlite_rename_trigger(sql, %Q)"
+            "ELSE sqlite_rename_table(sql, %Q) END, "
+#endif
+          "tbl_name = %Q, "
+          "name = CASE "
+            "WHEN type='table' THEN %Q "
+            "WHEN name LIKE 'sqlite_autoindex%%' AND type='index' THEN "
+             "'sqlite_autoindex_' || %Q || substr(name,%d+18) "
+            "ELSE name END "
+      "WHERE tbl_name=%Q AND "
+          "(type='table' OR type='index' OR type='trigger');",
+      zDb, SCHEMA_TABLE(iDb), zName, zName, zName,
+#ifndef SQLITE_OMIT_TRIGGER
+      zName,
+#endif
+      zName, nTabName, zTabName
+  );
+
+#ifndef SQLITE_OMIT_AUTOINCREMENT
+  /* If the sqlite_sequence table exists in this database, then update
+  ** it with the new table name.
+  */
+  if( sqlite3FindTable(db, "sqlite_sequence", zDb) ){
+    sqlite3NestedParse(pParse,
+        "UPDATE \"%w\".sqlite_sequence set name = %Q WHERE name = %Q",
+        zDb, zName, pTab->zName);
+  }
+#endif
+
+#ifndef SQLITE_OMIT_TRIGGER
+  /* If there are TEMP triggers on this table, modify the sqlite_temp_master
+  ** table. Don't do this if the table being ALTERed is itself located in
+  ** the temp database.
+  */
+  if( (zWhere=whereTempTriggers(pParse, pTab))!=0 ){
+    sqlite3NestedParse(pParse,
+        "UPDATE sqlite_temp_master SET "
+            "sql = sqlite_rename_trigger(sql, %Q), "
+            "tbl_name = %Q "
+            "WHERE %s;", zName, zName, zWhere);
+    sqlite3_free(zWhere);
+  }
+#endif
+
+  /* Drop and reload the internal table schema. */
+  reloadTableSchema(pParse, pTab, zName);
+
+exit_rename_table:
+  sqlite3SrcListDelete(pSrc);
+  sqlite3_free(zName);
+}
+
+
+/*
+** This function is called after an "ALTER TABLE ... ADD" statement
+** has been parsed. Argument pColDef contains the text of the new
+** column definition.
+**
+** The Table structure pParse->pNewTable was extended to include
+** the new column during parsing.
+*/
+void sqlite3AlterFinishAddColumn(Parse *pParse, Token *pColDef){
+  Table *pNew;              /* Copy of pParse->pNewTable */
+  Table *pTab;              /* Table being altered */
+  int iDb;                  /* Database number */
+  const char *zDb;          /* Database name */
+  const char *zTab;         /* Table name */
+  char *zCol;               /* Null-terminated column definition */
+  Column *pCol;             /* The new column */
+  Expr *pDflt;              /* Default value for the new column */
+  sqlite3 *db;              /* The database connection; */
+
+  if( pParse->nErr ) return;
+  pNew = pParse->pNewTable;
+  assert( pNew );
+
+  db = pParse->db;
+  assert( sqlite3BtreeHoldsAllMutexes(db) );
+  iDb = sqlite3SchemaToIndex(db, pNew->pSchema);
+  zDb = db->aDb[iDb].zName;
+  zTab = pNew->zName;
+  pCol = &pNew->aCol[pNew->nCol-1];
+  pDflt = pCol->pDflt;
+  pTab = sqlite3FindTable(db, zTab, zDb);
+  assert( pTab );
+
+#ifndef SQLITE_OMIT_AUTHORIZATION
+  /* Invoke the authorization callback. */
+  if( sqlite3AuthCheck(pParse, SQLITE_ALTER_TABLE, zDb, pTab->zName, 0) ){
+    return;
+  }
+#endif
+
+  /* If the default value for the new column was specified with a
+  ** literal NULL, then set pDflt to 0. This simplifies checking
+  ** for an SQL NULL default below.
+  */
+  if( pDflt && pDflt->op==TK_NULL ){
+    pDflt = 0;
+  }
+
+  /* Check that the new column is not specified as PRIMARY KEY or UNIQUE.
+  ** If there is a NOT NULL constraint, then the default value for the
+  ** column must not be NULL.
+  */
+  if( pCol->isPrimKey ){
+    sqlite3ErrorMsg(pParse, "Cannot add a PRIMARY KEY column");
+    return;
+  }
+  if( pNew->pIndex ){
+    sqlite3ErrorMsg(pParse, "Cannot add a UNIQUE column");
+    return;
+  }
+  if( pCol->notNull && !pDflt ){
+    sqlite3ErrorMsg(pParse,
+        "Cannot add a NOT NULL column with default value NULL");
+    return;
+  }
+
+  /* Ensure the default expression is something that sqlite3ValueFromExpr()
+  ** can handle (i.e. not CURRENT_TIME etc.)
+  */
+  if( pDflt ){
+    sqlite3_value *pVal;
+    if( sqlite3ValueFromExpr(db, pDflt, SQLITE_UTF8, SQLITE_AFF_NONE, &pVal) ){
+      db->mallocFailed = 1;
+      return;
+    }
+    if( !pVal ){
+      sqlite3ErrorMsg(pParse, "Cannot add a column with non-constant default");
+      return;
+    }
+    sqlite3ValueFree(pVal);
+  }
+
+  /* Modify the CREATE TABLE statement. */
+  zCol = sqlite3DbStrNDup(db, (char*)pColDef->z, pColDef->n);
+  if( zCol ){
+    char *zEnd = &zCol[pColDef->n-1];
+    while( (zEnd>zCol && *zEnd==';') || isspace(*(unsigned char *)zEnd) ){
+      *zEnd-- = '\0';
+    }
+    sqlite3NestedParse(pParse,
+        "UPDATE \"%w\".%s SET "
+          "sql = substr(sql,1,%d) || ', ' || %Q || substr(sql,%d) "
+        "WHERE type = 'table' AND name = %Q",
+      zDb, SCHEMA_TABLE(iDb), pNew->addColOffset, zCol, pNew->addColOffset+1,
+      zTab
+    );
+    sqlite3_free(zCol);
+  }
+
+  /* If the default value of the new column is NULL, then set the file
+  ** format to 2. If the default value of the new column is not NULL,
+  ** the file format becomes 3.
+  */
+  sqlite3MinimumFileFormat(pParse, iDb, pDflt ? 3 : 2);
+
+  /* Reload the schema of the modified table. */
+  reloadTableSchema(pParse, pTab, pTab->zName);
+}
+
+/*
+** This function is called by the parser after the table-name in
+** an "ALTER TABLE <table-name> ADD" statement is parsed. Argument
+** pSrc is the full-name of the table being altered.
+**
+** This routine makes a (partial) copy of the Table structure
+** for the table being altered and sets Parse.pNewTable to point
+** to it. Routines called by the parser as the column definition
+** is parsed (i.e. sqlite3AddColumn()) add the new Column data to
+** the copy. The copy of the Table structure is deleted by tokenize.c
+** after parsing is finished.
+**
+** Routine sqlite3AlterFinishAddColumn() will be called to complete
+** coding the "ALTER TABLE ... ADD" statement.
+*/
+void sqlite3AlterBeginAddColumn(Parse *pParse, SrcList *pSrc){
+  Table *pNew;
+  Table *pTab;
+  Vdbe *v;
+  int iDb;
+  int i;
+  int nAlloc;
+  sqlite3 *db = pParse->db;
+
+  /* Look up the table being altered. */
+  assert( pParse->pNewTable==0 );
+  assert( sqlite3BtreeHoldsAllMutexes(db) );
+  if( db->mallocFailed ) goto exit_begin_add_column;
+  pTab = sqlite3LocateTable(pParse, 0, pSrc->a[0].zName, pSrc->a[0].zDatabase);
+  if( !pTab ) goto exit_begin_add_column;
+
+#ifndef SQLITE_OMIT_VIRTUALTABLE
+  if( IsVirtual(pTab) ){
+    sqlite3ErrorMsg(pParse, "virtual tables may not be altered");
+    goto exit_begin_add_column;
+  }
+#endif
+
+  /* Make sure this is not an attempt to ALTER a view. */
+  if( pTab->pSelect ){
+    sqlite3ErrorMsg(pParse, "Cannot add a column to a view");
+    goto exit_begin_add_column;
+  }
+
+  assert( pTab->addColOffset>0 );
+  iDb = sqlite3SchemaToIndex(db, pTab->pSchema);
+
+  /* Put a copy of the Table struct in Parse.pNewTable for the
+  ** sqlite3AddColumn() function and friends to modify.
+  */
+  pNew = (Table*)sqlite3DbMallocZero(db, sizeof(Table));
+  if( !pNew ) goto exit_begin_add_column;
+  pParse->pNewTable = pNew;
+  pNew->nRef = 1;
+  pNew->nCol = pTab->nCol;
+  assert( pNew->nCol>0 );
+  nAlloc = (((pNew->nCol-1)/8)*8)+8;
+  assert( nAlloc>=pNew->nCol && nAlloc%8==0 && nAlloc-pNew->nCol<8 );
+  pNew->aCol = (Column*)sqlite3DbMallocZero(db, sizeof(Column)*nAlloc);
+  pNew->zName = sqlite3DbStrDup(db, pTab->zName);
+  if( !pNew->aCol || !pNew->zName ){
+    db->mallocFailed = 1;
+    goto exit_begin_add_column;
+  }
+  memcpy(pNew->aCol, pTab->aCol, sizeof(Column)*pNew->nCol);
+  for(i=0; i<pNew->nCol; i++){
+    Column *pCol = &pNew->aCol[i];
+    pCol->zName = sqlite3DbStrDup(db, pCol->zName);
+    pCol->zColl = 0;
+    pCol->zType = 0;
+    pCol->pDflt = 0;
+  }
+  pNew->pSchema = db->aDb[iDb].pSchema;
+  pNew->addColOffset = pTab->addColOffset;
+  pNew->nRef = 1;
+
+  /* Begin a transaction and increment the schema cookie.  */
+  sqlite3BeginWriteOperation(pParse, 0, iDb);
+  v = sqlite3GetVdbe(pParse);
+  if( !v ) goto exit_begin_add_column;
+  sqlite3ChangeCookie(pParse, iDb);
+
+exit_begin_add_column:
+  sqlite3SrcListDelete(pSrc);
+  return;
+}
+#endif  /* SQLITE_ALTER_TABLE */
diff --git a/uppsrc/plugin/sqlite3/lib/analyze.c b/uppsrc/plugin/sqlite3/lib/analyze.c
new file mode 100644
index 000000000..c894e608a
--- /dev/null
+++ b/uppsrc/plugin/sqlite3/lib/analyze.c
@@ -0,0 +1,425 @@
+/*
+** 2005 July 8
+**
+** The author disclaims copyright to this source code.  In place of
+** a legal notice, here is a blessing:
+**
+**    May you do good and not evil.
+**    May you find forgiveness for yourself and forgive others.
+**    May you share freely, never taking more than you give.
+**
+*************************************************************************
+** This file contains code associated with the ANALYZE command.
+**
+** @(#) $Id: analyze.c,v 1.41 2008/01/25 15:04:49 drh Exp $
+*/
+#ifndef SQLITE_OMIT_ANALYZE
+#include "sqliteInt.h"
+
+/*
+** This routine generates code that opens the sqlite_stat1 table on cursor
+** iStatCur.
+**
+** If the sqlite_stat1 tables does not previously exist, it is created.
+** If it does previously exist, all entires associated with table zWhere
+** are removed.  If zWhere==0 then all entries are removed.
+*/
+static void openStatTable(
+  Parse *pParse,          /* Parsing context */
+  int iDb,                /* The database we are looking in */
+  int iStatCur,           /* Open the sqlite_stat1 table on this cursor */
+  const char *zWhere      /* Delete entries associated with this table */
+){
+  sqlite3 *db = pParse->db;
+  Db *pDb;
+  int iRootPage;
+  int createStat1 = 0;
+  Table *pStat;
+  Vdbe *v = sqlite3GetVdbe(pParse);
+
+  if( v==0 ) return;
+  assert( sqlite3BtreeHoldsAllMutexes(db) );
+  assert( sqlite3VdbeDb(v)==db );
+  pDb = &db->aDb[iDb];
+  if( (pStat = sqlite3FindTable(db, "sqlite_stat1", pDb->zName))==0 ){
+    /* The sqlite_stat1 tables does not exist.  Create it.
+    ** Note that a side-effect of the CREATE TABLE statement is to leave
+    ** the rootpage of the new table in register pParse->regRoot.  This is
+    ** important because the OpenWrite opcode below will be needing it. */
+    sqlite3NestedParse(pParse,
+      "CREATE TABLE %Q.sqlite_stat1(tbl,idx,stat)",
+      pDb->zName
+    );
+    iRootPage = pParse->regRoot;
+    createStat1 = 1;  /* Cause rootpage to be taken from top of stack */
+  }else if( zWhere ){
+    /* The sqlite_stat1 table exists.  Delete all entries associated with
+    ** the table zWhere. */
+    sqlite3NestedParse(pParse,
+       "DELETE FROM %Q.sqlite_stat1 WHERE tbl=%Q",
+       pDb->zName, zWhere
+    );
+    iRootPage = pStat->tnum;
+  }else{
+    /* The sqlite_stat1 table already exists.  Delete all rows. */
+    iRootPage = pStat->tnum;
+    sqlite3VdbeAddOp2(v, OP_Clear, pStat->tnum, iDb);
+  }
+
+  /* Open the sqlite_stat1 table for writing. Unless it was created
+  ** by this vdbe program, lock it for writing at the shared-cache level.
+  ** If this vdbe did create the sqlite_stat1 table, then it must have
+  ** already obtained a schema-lock, making the write-lock redundant.
+  */
+  if( !createStat1 ){
+    sqlite3TableLock(pParse, iDb, iRootPage, 1, "sqlite_stat1");
+  }
+  sqlite3VdbeAddOp3(v, OP_OpenWrite, iStatCur, iRootPage, iDb);
+  sqlite3VdbeChangeP5(v, createStat1);
+  sqlite3VdbeAddOp2(v, OP_SetNumColumns, iStatCur, 3);
+}
+
+/*
+** Generate code to do an analysis of all indices associated with
+** a single table.
+*/
+static void analyzeOneTable(
+  Parse *pParse,   /* Parser context */
+  Table *pTab,     /* Table whose indices are to be analyzed */
+  int iStatCur,    /* Cursor that writes to the sqlite_stat1 table */
+  int iMem         /* Available memory locations begin here */
+){
+  Index *pIdx;     /* An index to being analyzed */
+  int iIdxCur;     /* Cursor number for index being analyzed */
+  int nCol;        /* Number of columns in the index */
+  Vdbe *v;         /* The virtual machine being built up */
+  int i;           /* Loop counter */
+  int topOfLoop;   /* The top of the loop */
+  int endOfLoop;   /* The end of the loop */
+  int addr;        /* The address of an instruction */
+  int iDb;         /* Index of database containing pTab */
+
+  v = sqlite3GetVdbe(pParse);
+  if( v==0 || pTab==0 || pTab->pIndex==0 ){
+    /* Do no analysis for tables that have no indices */
+    return;
+  }
+  assert( sqlite3BtreeHoldsAllMutexes(pParse->db) );
+  iDb = sqlite3SchemaToIndex(pParse->db, pTab->pSchema);
+  assert( iDb>=0 );
+#ifndef SQLITE_OMIT_AUTHORIZATION
+  if( sqlite3AuthCheck(pParse, SQLITE_ANALYZE, pTab->zName, 0,
+      pParse->db->aDb[iDb].zName ) ){
+    return;
+  }
+#endif
+
+  /* Establish a read-lock on the table at the shared-cache level. */
+  sqlite3TableLock(pParse, iDb, pTab->tnum, 0, pTab->zName);
+
+  iIdxCur = pParse->nTab;
+  for(pIdx=pTab->pIndex; pIdx; pIdx=pIdx->pNext){
+    KeyInfo *pKey = sqlite3IndexKeyinfo(pParse, pIdx);
+    int regFields;    /* Register block for building records */
+    int regRec;       /* Register holding completed record */
+    int regTemp;      /* Temporary use register */
+    int regCol;       /* Content of a column from the table being analyzed */
+    int regRowid;     /* Rowid for the inserted record */
+    int regF2;
+
+    /* Open a cursor to the index to be analyzed
+    */
+    assert( iDb==sqlite3SchemaToIndex(pParse->db, pIdx->pSchema) );
+    sqlite3VdbeAddOp4(v, OP_OpenRead, iIdxCur, pIdx->tnum, iDb,
+        (char *)pKey, P4_KEYINFO_HANDOFF);
+    VdbeComment((v, "%s", pIdx->zName));
+    nCol = pIdx->nColumn;
+    regFields = iMem+nCol*2;
+    regTemp = regRowid = regCol = regFields+3;
+    regRec = regCol+1;
+    if( regRec>pParse->nMem ){
+      pParse->nMem = regRec;
+    }
+    sqlite3VdbeAddOp2(v, OP_SetNumColumns, iIdxCur, nCol+1);
+
+    /* Memory cells are used as follows:
+    **
+    **    mem[iMem]:             The total number of rows in the table.
+    **    mem[iMem+1]:           Number of distinct values in column 1
+    **    ...
+    **    mem[iMem+nCol]:        Number of distinct values in column N
+    **    mem[iMem+nCol+1]       Last observed value of column 1
+    **    ...
+    **    mem[iMem+nCol+nCol]:   Last observed value of column N
+    **
+    ** Cells iMem through iMem+nCol are initialized to 0.  The others
+    ** are initialized to NULL.
+    */
+    for(i=0; i<=nCol; i++){
+      sqlite3VdbeAddOp2(v, OP_Integer, 0, iMem+i);
+    }
+    for(i=0; i<nCol; i++){
+      sqlite3VdbeAddOp2(v, OP_Null, 0, iMem+nCol+i+1);
+    }
+
+    /* Do the analysis.
+    */
+    endOfLoop = sqlite3VdbeMakeLabel(v);
+    sqlite3VdbeAddOp2(v, OP_Rewind, iIdxCur, endOfLoop);
+    topOfLoop = sqlite3VdbeCurrentAddr(v);
+    sqlite3VdbeAddOp2(v, OP_AddImm, iMem, 1);
+    for(i=0; i<nCol; i++){
+      sqlite3VdbeAddOp3(v, OP_Column, iIdxCur, i, regCol);
+      sqlite3VdbeAddOp3(v, OP_Ne, regCol, 0, iMem+nCol+i+1);
+      /**** TODO:  add collating sequence *****/
+      sqlite3VdbeChangeP5(v, SQLITE_JUMPIFNULL);
+    }
+    sqlite3VdbeAddOp2(v, OP_Goto, 0, endOfLoop);
+    for(i=0; i<nCol; i++){
+      sqlite3VdbeJumpHere(v, topOfLoop + 2*(i + 1));
+      sqlite3VdbeAddOp2(v, OP_AddImm, iMem+i+1, 1);
+      sqlite3VdbeAddOp3(v, OP_Column, iIdxCur, i, iMem+nCol+i+1);
+    }
+    sqlite3VdbeResolveLabel(v, endOfLoop);
+    sqlite3VdbeAddOp2(v, OP_Next, iIdxCur, topOfLoop);
+    sqlite3VdbeAddOp1(v, OP_Close, iIdxCur);
+
+    /* Store the results.
+    **
+    ** The result is a single row of the sqlite_stat1 table.  The first
+    ** two columns are the names of the table and index.  The third column
+    ** is a string composed of a list of integer statistics about the
+    ** index.  The first integer in the list is the total number of entires
+    ** in the index.  There is one additional integer in the list for each
+    ** column of the table.  This additional integer is a guess of how many
+    ** rows of the table the index will select.  If D is the count of distinct
+    ** values and K is the total number of rows, then the integer is computed
+    ** as:
+    **
+    **        I = (K+D-1)/D
+    **
+    ** If K==0 then no entry is made into the sqlite_stat1 table.
+    ** If K>0 then it is always the case the D>0 so division by zero
+    ** is never possible.
+    */
+    addr = sqlite3VdbeAddOp1(v, OP_IfNot, iMem);
+    sqlite3VdbeAddOp4(v, OP_String8, 0, regFields, 0, pTab->zName, 0);
+    sqlite3VdbeAddOp4(v, OP_String8, 0, regFields+1, 0, pIdx->zName, 0);
+    regF2 = regFields+2;
+    sqlite3VdbeAddOp2(v, OP_SCopy, iMem, regF2);
+    for(i=0; i<nCol; i++){
+      sqlite3VdbeAddOp4(v, OP_String8, 0, regTemp, 0, " ", 0);
+      sqlite3VdbeAddOp3(v, OP_Concat, regTemp, regF2, regF2);
+      sqlite3VdbeAddOp3(v, OP_Add, iMem, iMem+i+1, regTemp);
+      sqlite3VdbeAddOp2(v, OP_AddImm, regTemp, -1);
+      sqlite3VdbeAddOp3(v, OP_Divide, iMem+i+1, regTemp, regTemp);
+      sqlite3VdbeAddOp1(v, OP_ToInt, regTemp);
+      sqlite3VdbeAddOp3(v, OP_Concat, regTemp, regF2, regF2);
+    }
+    sqlite3VdbeAddOp4(v, OP_MakeRecord, regFields, 3, regRec, "aaa", 0);
+    sqlite3VdbeAddOp2(v, OP_NewRowid, iStatCur, regRowid);
+    sqlite3VdbeAddOp3(v, OP_Insert, iStatCur, regRec, regRowid);
+    sqlite3VdbeChangeP5(v, OPFLAG_APPEND);
+    sqlite3VdbeJumpHere(v, addr);
+  }
+}
+
+/*
+** Generate code that will cause the most recent index analysis to
+** be laoded into internal hash tables where is can be used.
+*/
+static void loadAnalysis(Parse *pParse, int iDb){
+  Vdbe *v = sqlite3GetVdbe(pParse);
+  if( v ){
+    sqlite3VdbeAddOp1(v, OP_LoadAnalysis, iDb);
+  }
+}
+
+/*
+** Generate code that will do an analysis of an entire database
+*/
+static void analyzeDatabase(Parse *pParse, int iDb){
+  sqlite3 *db = pParse->db;
+  Schema *pSchema = db->aDb[iDb].pSchema;    /* Schema of database iDb */
+  HashElem *k;
+  int iStatCur;
+  int iMem;
+
+  sqlite3BeginWriteOperation(pParse, 0, iDb);
+  iStatCur = pParse->nTab++;
+  openStatTable(pParse, iDb, iStatCur, 0);
+  iMem = pParse->nMem+1;
+  for(k=sqliteHashFirst(&pSchema->tblHash); k; k=sqliteHashNext(k)){
+    Table *pTab = (Table*)sqliteHashData(k);
+    analyzeOneTable(pParse, pTab, iStatCur, iMem);
+  }
+  loadAnalysis(pParse, iDb);
+}
+
+/*
+** Generate code that will do an analysis of a single table in
+** a database.
+*/
+static void analyzeTable(Parse *pParse, Table *pTab){
+  int iDb;
+  int iStatCur;
+
+  assert( pTab!=0 );
+  assert( sqlite3BtreeHoldsAllMutexes(pParse->db) );
+  iDb = sqlite3SchemaToIndex(pParse->db, pTab->pSchema);
+  sqlite3BeginWriteOperation(pParse, 0, iDb);
+  iStatCur = pParse->nTab++;
+  openStatTable(pParse, iDb, iStatCur, pTab->zName);
+  analyzeOneTable(pParse, pTab, iStatCur, pParse->nMem+1);
+  loadAnalysis(pParse, iDb);
+}
+
+/*
+** Generate code for the ANALYZE command.  The parser calls this routine
+** when it recognizes an ANALYZE command.
+**
+**        ANALYZE                            -- 1
+**        ANALYZE  <database>                -- 2
+**        ANALYZE  ?<database>.?<tablename>  -- 3
+**
+** Form 1 causes all indices in all attached databases to be analyzed.
+** Form 2 analyzes all indices the single database named.
+** Form 3 analyzes all indices associated with the named table.
+*/
+void sqlite3Analyze(Parse *pParse, Token *pName1, Token *pName2){
+  sqlite3 *db = pParse->db;
+  int iDb;
+  int i;
+  char *z, *zDb;
+  Table *pTab;
+  Token *pTableName;
+
+  /* Read the database schema. If an error occurs, leave an error message
+  ** and code in pParse and return NULL. */
+  assert( sqlite3BtreeHoldsAllMutexes(pParse->db) );
+  if( SQLITE_OK!=sqlite3ReadSchema(pParse) ){
+    return;
+  }
+
+  if( pName1==0 ){
+    /* Form 1:  Analyze everything */
+    for(i=0; i<db->nDb; i++){
+      if( i==1 ) continue;  /* Do not analyze the TEMP database */
+      analyzeDatabase(pParse, i);
+    }
+  }else if( pName2==0 || pName2->n==0 ){
+    /* Form 2:  Analyze the database or table named */
+    iDb = sqlite3FindDb(db, pName1);
+    if( iDb>=0 ){
+      analyzeDatabase(pParse, iDb);
+    }else{
+      z = sqlite3NameFromToken(db, pName1);
+      if( z ){
+        pTab = sqlite3LocateTable(pParse, 0, z, 0);
+        sqlite3_free(z);
+        if( pTab ){
+          analyzeTable(pParse, pTab);
+        }
+      }
+    }
+  }else{
+    /* Form 3: Analyze the fully qualified table name */
+    iDb = sqlite3TwoPartName(pParse, pName1, pName2, &pTableName);
+    if( iDb>=0 ){
+      zDb = db->aDb[iDb].zName;
+      z = sqlite3NameFromToken(db, pTableName);
+      if( z ){
+        pTab = sqlite3LocateTable(pParse, 0, z, zDb);
+        sqlite3_free(z);
+        if( pTab ){
+          analyzeTable(pParse, pTab);
+        }
+      }
+    }
+  }
+}
+
+/*
+** Used to pass information from the analyzer reader through to the
+** callback routine.
+*/
+typedef struct analysisInfo analysisInfo;
+struct analysisInfo {
+  sqlite3 *db;
+  const char *zDatabase;
+};
+
+/*
+** This callback is invoked once for each index when reading the
+** sqlite_stat1 table.
+**
+**     argv[0] = name of the index
+**     argv[1] = results of analysis - on integer for each column
+*/
+static int analysisLoader(void *pData, int argc, char **argv, char **azNotUsed){
+  analysisInfo *pInfo = (analysisInfo*)pData;
+  Index *pIndex;
+  int i, c;
+  unsigned int v;
+  const char *z;
+
+  assert( argc==2 );
+  if( argv==0 || argv[0]==0 || argv[1]==0 ){
+    return 0;
+  }
+  pIndex = sqlite3FindIndex(pInfo->db, argv[0], pInfo->zDatabase);
+  if( pIndex==0 ){
+    return 0;
+  }
+  z = argv[1];
+  for(i=0; *z && i<=pIndex->nColumn; i++){
+    v = 0;
+    while( (c=z[0])>='0' && c<='9' ){
+      v = v*10 + c - '0';
+      z++;
+    }
+    pIndex->aiRowEst[i] = v;
+    if( *z==' ' ) z++;
+  }
+  return 0;
+}
+
+/*
+** Load the content of the sqlite_stat1 table into the index hash tables.
+*/
+int sqlite3AnalysisLoad(sqlite3 *db, int iDb){
+  analysisInfo sInfo;
+  HashElem *i;
+  char *zSql;
+  int rc;
+
+  assert( iDb>=0 && iDb<db->nDb );
+  assert( db->aDb[iDb].pBt!=0 );
+  assert( sqlite3BtreeHoldsMutex(db->aDb[iDb].pBt) );
+
+  /* Clear any prior statistics */
+  for(i=sqliteHashFirst(&db->aDb[iDb].pSchema->idxHash);i;i=sqliteHashNext(i)){
+    Index *pIdx = sqliteHashData(i);
+    sqlite3DefaultRowEst(pIdx);
+  }
+
+  /* Check to make sure the sqlite_stat1 table existss */
+  sInfo.db = db;
+  sInfo.zDatabase = db->aDb[iDb].zName;
+  if( sqlite3FindTable(db, "sqlite_stat1", sInfo.zDatabase)==0 ){
+     return SQLITE_ERROR;
+  }
+
+
+  /* Load new statistics out of the sqlite_stat1 table */
+  zSql = sqlite3MPrintf(db, "SELECT idx, stat FROM %Q.sqlite_stat1",
+                        sInfo.zDatabase);
+  (void)sqlite3SafetyOff(db);
+  rc = sqlite3_exec(db, zSql, analysisLoader, &sInfo, 0);
+  (void)sqlite3SafetyOn(db);
+  sqlite3_free(zSql);
+  return rc;
+}
+
+
+#endif /* SQLITE_OMIT_ANALYZE */
diff --git a/uppsrc/plugin/sqlite3/lib/attach.c b/uppsrc/plugin/sqlite3/lib/attach.c
new file mode 100644
index 000000000..3b9caf65f
--- /dev/null
+++ b/uppsrc/plugin/sqlite3/lib/attach.c
@@ -0,0 +1,527 @@
+/*
+** 2003 April 6
+**
+** The author disclaims copyright to this source code.  In place of
+** a legal notice, here is a blessing:
+**
+**    May you do good and not evil.
+**    May you find forgiveness for yourself and forgive others.
+**    May you share freely, never taking more than you give.
+**
+*************************************************************************
+** This file contains code used to implement the ATTACH and DETACH commands.
+**
+** $Id: attach.c,v 1.72 2008/02/13 18:25:27 danielk1977 Exp $
+*/
+#include "sqliteInt.h"
+
+#ifndef SQLITE_OMIT_ATTACH
+/*
+** Resolve an expression that was part of an ATTACH or DETACH statement. This
+** is slightly different from resolving a normal SQL expression, because simple
+** identifiers are treated as strings, not possible column names or aliases.
+**
+** i.e. if the parser sees:
+**
+**     ATTACH DATABASE abc AS def
+**
+** it treats the two expressions as literal strings 'abc' and 'def' instead of
+** looking for columns of the same name.
+**
+** This only applies to the root node of pExpr, so the statement:
+**
+**     ATTACH DATABASE abc||def AS 'db2'
+**
+** will fail because neither abc or def can be resolved.
+*/
+static int resolveAttachExpr(NameContext *pName, Expr *pExpr)
+{
+  int rc = SQLITE_OK;
+  if( pExpr ){
+    if( pExpr->op!=TK_ID ){
+      rc = sqlite3ExprResolveNames(pName, pExpr);
+      if( rc==SQLITE_OK && !sqlite3ExprIsConstant(pExpr) ){
+        sqlite3ErrorMsg(pName->pParse, "invalid name: \"%T\"", &pExpr->span);
+        return SQLITE_ERROR;
+      }
+    }else{
+      pExpr->op = TK_STRING;
+    }
+  }
+  return rc;
+}
+
+/*
+** An SQL user-function registered to do the work of an ATTACH statement. The
+** three arguments to the function come directly from an attach statement:
+**
+**     ATTACH DATABASE x AS y KEY z
+**
+**     SELECT sqlite_attach(x, y, z)
+**
+** If the optional "KEY z" syntax is omitted, an SQL NULL is passed as the
+** third argument.
+*/
+static void attachFunc(
+  sqlite3_context *context,
+  int argc,
+  sqlite3_value **argv
+){
+  int i;
+  int rc = 0;
+  sqlite3 *db = sqlite3_user_data(context);
+  const char *zName;
+  const char *zFile;
+  Db *aNew;
+  char *zErrDyn = 0;
+  char zErr[128];
+
+  zFile = (const char *)sqlite3_value_text(argv[0]);
+  zName = (const char *)sqlite3_value_text(argv[1]);
+  if( zFile==0 ) zFile = "";
+  if( zName==0 ) zName = "";
+
+  /* Check for the following errors:
+  **
+  **     * Too many attached databases,
+  **     * Transaction currently open
+  **     * Specified database name already being used.
+  */
+  if( db->nDb>=SQLITE_MAX_ATTACHED+2 ){
+    sqlite3_snprintf(
+      sizeof(zErr), zErr, "too many attached databases - max %d",
+      SQLITE_MAX_ATTACHED
+    );
+    goto attach_error;
+  }
+  if( !db->autoCommit ){
+    sqlite3_snprintf(sizeof(zErr), zErr,
+                     "cannot ATTACH database within transaction");
+    goto attach_error;
+  }
+  for(i=0; i<db->nDb; i++){
+    char *z = db->aDb[i].zName;
+    if( z && zName && sqlite3StrICmp(z, zName)==0 ){
+      sqlite3_snprintf(sizeof(zErr), zErr,
+                       "database %s is already in use", zName);
+      goto attach_error;
+    }
+  }
+
+  /* Allocate the new entry in the db->aDb[] array and initialise the schema
+  ** hash tables.
+  */
+  if( db->aDb==db->aDbStatic ){
+    aNew = sqlite3_malloc( sizeof(db->aDb[0])*3 );
+    if( aNew==0 ){
+      db->mallocFailed = 1;
+      return;
+    }
+    memcpy(aNew, db->aDb, sizeof(db->aDb[0])*2);
+  }else{
+    aNew = sqlite3_realloc(db->aDb, sizeof(db->aDb[0])*(db->nDb+1) );
+    if( aNew==0 ){
+      db->mallocFailed = 1;
+      return;
+    }
+  }
+  db->aDb = aNew;
+  aNew = &db->aDb[db->nDb++];
+  memset(aNew, 0, sizeof(*aNew));
+
+  /* Open the database file. If the btree is successfully opened, use
+  ** it to obtain the database schema. At this point the schema may
+  ** or may not be initialised.
+  */
+  rc = sqlite3BtreeFactory(db, zFile, 0, SQLITE_DEFAULT_CACHE_SIZE,
+                           db->openFlags | SQLITE_OPEN_MAIN_DB,
+                           &aNew->pBt);
+  if( rc==SQLITE_OK ){
+    aNew->pSchema = sqlite3SchemaGet(db, aNew->pBt);
+    if( !aNew->pSchema ){
+      rc = SQLITE_NOMEM;
+    }else if( aNew->pSchema->file_format && aNew->pSchema->enc!=ENC(db) ){
+      sqlite3_snprintf(sizeof(zErr), zErr,
+        "attached databases must use the same text encoding as main database");
+      goto attach_error;
+    }
+    sqlite3PagerLockingMode(sqlite3BtreePager(aNew->pBt), db->dfltLockMode);
+  }
+  aNew->zName = sqlite3DbStrDup(db, zName);
+  aNew->safety_level = 3;
+
+#if SQLITE_HAS_CODEC
+  {
+    extern int sqlite3CodecAttach(sqlite3*, int, const void*, int);
+    extern void sqlite3CodecGetKey(sqlite3*, int, void**, int*);
+    int nKey;
+    char *zKey;
+    int t = sqlite3_value_type(argv[2]);
+    switch( t ){
+      case SQLITE_INTEGER:
+      case SQLITE_FLOAT:
+        zErrDyn = sqlite3DbStrDup(db, "Invalid key value");
+        rc = SQLITE_ERROR;
+        break;
+
+      case SQLITE_TEXT:
+      case SQLITE_BLOB:
+        nKey = sqlite3_value_bytes(argv[2]);
+        zKey = (char *)sqlite3_value_blob(argv[2]);
+        sqlite3CodecAttach(db, db->nDb-1, zKey, nKey);
+        break;
+
+      case SQLITE_NULL:
+        /* No key specified.  Use the key from the main database */
+        sqlite3CodecGetKey(db, 0, (void**)&zKey, &nKey);
+        sqlite3CodecAttach(db, db->nDb-1, zKey, nKey);
+        break;
+    }
+  }
+#endif
+
+  /* If the file was opened successfully, read the schema for the new database.
+  ** If this fails, or if opening the file failed, then close the file and
+  ** remove the entry from the db->aDb[] array. i.e. put everything back the way
+  ** we found it.
+  */
+  if( rc==SQLITE_OK ){
+    (void)sqlite3SafetyOn(db);
+    sqlite3BtreeEnterAll(db);
+    rc = sqlite3Init(db, &zErrDyn);
+    sqlite3BtreeLeaveAll(db);
+    (void)sqlite3SafetyOff(db);
+  }
+  if( rc ){
+    int iDb = db->nDb - 1;
+    assert( iDb>=2 );
+    if( db->aDb[iDb].pBt ){
+      sqlite3BtreeClose(db->aDb[iDb].pBt);
+      db->aDb[iDb].pBt = 0;
+      db->aDb[iDb].pSchema = 0;
+    }
+    sqlite3ResetInternalSchema(db, 0);
+    db->nDb = iDb;
+    if( rc==SQLITE_NOMEM || rc==SQLITE_IOERR_NOMEM ){
+      db->mallocFailed = 1;
+      sqlite3_snprintf(sizeof(zErr),zErr, "out of memory");
+    }else{
+      sqlite3_snprintf(sizeof(zErr),zErr, "unable to open database: %s", zFile);
+    }
+    goto attach_error;
+  }
+
+  return;
+
+attach_error:
+  /* Return an error if we get here */
+  if( zErrDyn ){
+    sqlite3_result_error(context, zErrDyn, -1);
+    sqlite3_free(zErrDyn);
+  }else{
+    zErr[sizeof(zErr)-1] = 0;
+    sqlite3_result_error(context, zErr, -1);
+  }
+  if( rc ) sqlite3_result_error_code(context, rc);
+}
+
+/*
+** An SQL user-function registered to do the work of an DETACH statement. The
+** three arguments to the function come directly from a detach statement:
+**
+**     DETACH DATABASE x
+**
+**     SELECT sqlite_detach(x)
+*/
+static void detachFunc(
+  sqlite3_context *context,
+  int argc,
+  sqlite3_value **argv
+){
+  const char *zName = (const char *)sqlite3_value_text(argv[0]);
+  sqlite3 *db = sqlite3_user_data(context);
+  int i;
+  Db *pDb = 0;
+  char zErr[128];
+
+  if( zName==0 ) zName = "";
+  for(i=0; i<db->nDb; i++){
+    pDb = &db->aDb[i];
+    if( pDb->pBt==0 ) continue;
+    if( sqlite3StrICmp(pDb->zName, zName)==0 ) break;
+  }
+
+  if( i>=db->nDb ){
+    sqlite3_snprintf(sizeof(zErr),zErr, "no such database: %s", zName);
+    goto detach_error;
+  }
+  if( i<2 ){
+    sqlite3_snprintf(sizeof(zErr),zErr, "cannot detach database %s", zName);
+    goto detach_error;
+  }
+  if( !db->autoCommit ){
+    sqlite3_snprintf(sizeof(zErr), zErr,
+                     "cannot DETACH database within transaction");
+    goto detach_error;
+  }
+  if( sqlite3BtreeIsInReadTrans(pDb->pBt) ){
+    sqlite3_snprintf(sizeof(zErr),zErr, "database %s is locked", zName);
+    goto detach_error;
+  }
+
+  sqlite3BtreeClose(pDb->pBt);
+  pDb->pBt = 0;
+  pDb->pSchema = 0;
+  sqlite3ResetInternalSchema(db, 0);
+  return;
+
+detach_error:
+  sqlite3_result_error(context, zErr, -1);
+}
+
+/*
+** This procedure generates VDBE code for a single invocation of either the
+** sqlite_detach() or sqlite_attach() SQL user functions.
+*/
+static void codeAttach(
+  Parse *pParse,       /* The parser context */
+  int type,            /* Either SQLITE_ATTACH or SQLITE_DETACH */
+  const char *zFunc,   /* Either "sqlite_attach" or "sqlite_detach */
+  int nFunc,           /* Number of args to pass to zFunc */
+  Expr *pAuthArg,      /* Expression to pass to authorization callback */
+  Expr *pFilename,     /* Name of database file */
+  Expr *pDbname,       /* Name of the database to use internally */
+  Expr *pKey           /* Database key for encryption extension */
+){
+  int rc;
+  NameContext sName;
+  Vdbe *v;
+  FuncDef *pFunc;
+  sqlite3* db = pParse->db;
+  int regArgs;
+
+#ifndef SQLITE_OMIT_AUTHORIZATION
+  assert( db->mallocFailed || pAuthArg );
+  if( pAuthArg ){
+    char *zAuthArg = sqlite3NameFromToken(db, &pAuthArg->span);
+    if( !zAuthArg ){
+      goto attach_end;
+    }
+    rc = sqlite3AuthCheck(pParse, type, zAuthArg, 0, 0);
+    sqlite3_free(zAuthArg);
+    if(rc!=SQLITE_OK ){
+      goto attach_end;
+    }
+  }
+#endif /* SQLITE_OMIT_AUTHORIZATION */
+
+  memset(&sName, 0, sizeof(NameContext));
+  sName.pParse = pParse;
+
+  if(
+      SQLITE_OK!=(rc = resolveAttachExpr(&sName, pFilename)) ||
+      SQLITE_OK!=(rc = resolveAttachExpr(&sName, pDbname)) ||
+      SQLITE_OK!=(rc = resolveAttachExpr(&sName, pKey))
+  ){
+    pParse->nErr++;
+    goto attach_end;
+  }
+
+  v = sqlite3GetVdbe(pParse);
+  regArgs = sqlite3GetTempRange(pParse, 4);
+  sqlite3ExprCode(pParse, pFilename, regArgs);
+  sqlite3ExprCode(pParse, pDbname, regArgs+1);
+  sqlite3ExprCode(pParse, pKey, regArgs+2);
+
+  assert( v || db->mallocFailed );
+  if( v ){
+    sqlite3VdbeAddOp3(v, OP_Function, 0, regArgs+3-nFunc, regArgs+3);
+    sqlite3VdbeChangeP5(v, nFunc);
+    pFunc = sqlite3FindFunction(db, zFunc, strlen(zFunc), nFunc, SQLITE_UTF8,0);
+    sqlite3VdbeChangeP4(v, -1, (char *)pFunc, P4_FUNCDEF);
+
+    /* Code an OP_Expire. For an ATTACH statement, set P1 to true (expire this
+    ** statement only). For DETACH, set it to false (expire all existing
+    ** statements).
+    */
+    sqlite3VdbeAddOp1(v, OP_Expire, (type==SQLITE_ATTACH));
+  }
+
+attach_end:
+  sqlite3ExprDelete(pFilename);
+  sqlite3ExprDelete(pDbname);
+  sqlite3ExprDelete(pKey);
+}
+
+/*
+** Called by the parser to compile a DETACH statement.
+**
+**     DETACH pDbname
+*/
+void sqlite3Detach(Parse *pParse, Expr *pDbname){
+  codeAttach(pParse, SQLITE_DETACH, "sqlite_detach", 1, pDbname, 0, 0, pDbname);
+}
+
+/*
+** Called by the parser to compile an ATTACH statement.
+**
+**     ATTACH p AS pDbname KEY pKey
+*/
+void sqlite3Attach(Parse *pParse, Expr *p, Expr *pDbname, Expr *pKey){
+  codeAttach(pParse, SQLITE_ATTACH, "sqlite_attach", 3, p, p, pDbname, pKey);
+}
+#endif /* SQLITE_OMIT_ATTACH */
+
+/*
+** Register the functions sqlite_attach and sqlite_detach.
+*/
+void sqlite3AttachFunctions(sqlite3 *db){
+#ifndef SQLITE_OMIT_ATTACH
+  static const int enc = SQLITE_UTF8;
+  sqlite3CreateFunc(db, "sqlite_attach", 3, enc, db, attachFunc, 0, 0);
+  sqlite3CreateFunc(db, "sqlite_detach", 1, enc, db, detachFunc, 0, 0);
+#endif
+}
+
+/*
+** Initialize a DbFixer structure.  This routine must be called prior
+** to passing the structure to one of the sqliteFixAAAA() routines below.
+**
+** The return value indicates whether or not fixation is required.  TRUE
+** means we do need to fix the database references, FALSE means we do not.
+*/
+int sqlite3FixInit(
+  DbFixer *pFix,      /* The fixer to be initialized */
+  Parse *pParse,      /* Error messages will be written here */
+  int iDb,            /* This is the database that must be used */
+  const char *zType,  /* "view", "trigger", or "index" */
+  const Token *pName  /* Name of the view, trigger, or index */
+){
+  sqlite3 *db;
+
+  if( iDb<0 || iDb==1 ) return 0;
+  db = pParse->db;
+  assert( db->nDb>iDb );
+  pFix->pParse = pParse;
+  pFix->zDb = db->aDb[iDb].zName;
+  pFix->zType = zType;
+  pFix->pName = pName;
+  return 1;
+}
+
+/*
+** The following set of routines walk through the parse tree and assign
+** a specific database to all table references where the database name
+** was left unspecified in the original SQL statement.  The pFix structure
+** must have been initialized by a prior call to sqlite3FixInit().
+**
+** These routines are used to make sure that an index, trigger, or
+** view in one database does not refer to objects in a different database.
+** (Exception: indices, triggers, and views in the TEMP database are
+** allowed to refer to anything.)  If a reference is explicitly made
+** to an object in a different database, an error message is added to
+** pParse->zErrMsg and these routines return non-zero.  If everything
+** checks out, these routines return 0.
+*/
+int sqlite3FixSrcList(
+  DbFixer *pFix,       /* Context of the fixation */
+  SrcList *pList       /* The Source list to check and modify */
+){
+  int i;
+  const char *zDb;
+  struct SrcList_item *pItem;
+
+  if( pList==0 ) return 0;
+  zDb = pFix->zDb;
+  for(i=0, pItem=pList->a; i<pList->nSrc; i++, pItem++){
+    if( pItem->zDatabase==0 ){
+      pItem->zDatabase = sqlite3DbStrDup(pFix->pParse->db, zDb);
+    }else if( sqlite3StrICmp(pItem->zDatabase,zDb)!=0 ){
+      sqlite3ErrorMsg(pFix->pParse,
+         "%s %T cannot reference objects in database %s",
+         pFix->zType, pFix->pName, pItem->zDatabase);
+      return 1;
+    }
+#if !defined(SQLITE_OMIT_VIEW) || !defined(SQLITE_OMIT_TRIGGER)
+    if( sqlite3FixSelect(pFix, pItem->pSelect) ) return 1;
+    if( sqlite3FixExpr(pFix, pItem->pOn) ) return 1;
+#endif
+  }
+  return 0;
+}
+#if !defined(SQLITE_OMIT_VIEW) || !defined(SQLITE_OMIT_TRIGGER)
+int sqlite3FixSelect(
+  DbFixer *pFix,       /* Context of the fixation */
+  Select *pSelect      /* The SELECT statement to be fixed to one database */
+){
+  while( pSelect ){
+    if( sqlite3FixExprList(pFix, pSelect->pEList) ){
+      return 1;
+    }
+    if( sqlite3FixSrcList(pFix, pSelect->pSrc) ){
+      return 1;
+    }
+    if( sqlite3FixExpr(pFix, pSelect->pWhere) ){
+      return 1;
+    }
+    if( sqlite3FixExpr(pFix, pSelect->pHaving) ){
+      return 1;
+    }
+    pSelect = pSelect->pPrior;
+  }
+  return 0;
+}
+int sqlite3FixExpr(
+  DbFixer *pFix,     /* Context of the fixation */
+  Expr *pExpr        /* The expression to be fixed to one database */
+){
+  while( pExpr ){
+    if( sqlite3FixSelect(pFix, pExpr->pSelect) ){
+      return 1;
+    }
+    if( sqlite3FixExprList(pFix, pExpr->pList) ){
+      return 1;
+    }
+    if( sqlite3FixExpr(pFix, pExpr->pRight) ){
+      return 1;
+    }
+    pExpr = pExpr->pLeft;
+  }
+  return 0;
+}
+int sqlite3FixExprList(
+  DbFixer *pFix,     /* Context of the fixation */
+  ExprList *pList    /* The expression to be fixed to one database */
+){
+  int i;
+  struct ExprList_item *pItem;
+  if( pList==0 ) return 0;
+  for(i=0, pItem=pList->a; i<pList->nExpr; i++, pItem++){
+    if( sqlite3FixExpr(pFix, pItem->pExpr) ){
+      return 1;
+    }
+  }
+  return 0;
+}
+#endif
+
+#ifndef SQLITE_OMIT_TRIGGER
+int sqlite3FixTriggerStep(
+  DbFixer *pFix,     /* Context of the fixation */
+  TriggerStep *pStep /* The trigger step be fixed to one database */
+){
+  while( pStep ){
+    if( sqlite3FixSelect(pFix, pStep->pSelect) ){
+      return 1;
+    }
+    if( sqlite3FixExpr(pFix, pStep->pWhere) ){
+      return 1;
+    }
+    if( sqlite3FixExprList(pFix, pStep->pExprList) ){
+      return 1;
+    }
+    pStep = pStep->pNext;
+  }
+  return 0;
+}
+#endif
diff --git a/uppsrc/plugin/sqlite3/lib/auth.c b/uppsrc/plugin/sqlite3/lib/auth.c
new file mode 100644
index 000000000..f16b8fffb
--- /dev/null
+++ b/uppsrc/plugin/sqlite3/lib/auth.c
@@ -0,0 +1,234 @@
+/*
+** 2003 January 11
+**
+** The author disclaims copyright to this source code.  In place of
+** a legal notice, here is a blessing:
+**
+**    May you do good and not evil.
+**    May you find forgiveness for yourself and forgive others.
+**    May you share freely, never taking more than you give.
+**
+*************************************************************************
+** This file contains code used to implement the sqlite3_set_authorizer()
+** API.  This facility is an optional feature of the library.  Embedded
+** systems that do not need this facility may omit it by recompiling
+** the library with -DSQLITE_OMIT_AUTHORIZATION=1
+**
+** $Id: auth.c,v 1.29 2007/09/18 15:55:07 drh Exp $
+*/
+#include "sqliteInt.h"
+
+/*
+** All of the code in this file may be omitted by defining a single
+** macro.
+*/
+#ifndef SQLITE_OMIT_AUTHORIZATION
+
+/*
+** Set or clear the access authorization function.
+**
+** The access authorization function is be called during the compilation
+** phase to verify that the user has read and/or write access permission on
+** various fields of the database.  The first argument to the auth function
+** is a copy of the 3rd argument to this routine.  The second argument
+** to the auth function is one of these constants:
+**
+**       SQLITE_CREATE_INDEX
+**       SQLITE_CREATE_TABLE
+**       SQLITE_CREATE_TEMP_INDEX
+**       SQLITE_CREATE_TEMP_TABLE
+**       SQLITE_CREATE_TEMP_TRIGGER
+**       SQLITE_CREATE_TEMP_VIEW
+**       SQLITE_CREATE_TRIGGER
+**       SQLITE_CREATE_VIEW
+**       SQLITE_DELETE
+**       SQLITE_DROP_INDEX
+**       SQLITE_DROP_TABLE
+**       SQLITE_DROP_TEMP_INDEX
+**       SQLITE_DROP_TEMP_TABLE
+**       SQLITE_DROP_TEMP_TRIGGER
+**       SQLITE_DROP_TEMP_VIEW
+**       SQLITE_DROP_TRIGGER
+**       SQLITE_DROP_VIEW
+**       SQLITE_INSERT
+**       SQLITE_PRAGMA
+**       SQLITE_READ
+**       SQLITE_SELECT
+**       SQLITE_TRANSACTION
+**       SQLITE_UPDATE
+**
+** The third and fourth arguments to the auth function are the name of
+** the table and the column that are being accessed.  The auth function
+** should return either SQLITE_OK, SQLITE_DENY, or SQLITE_IGNORE.  If
+** SQLITE_OK is returned, it means that access is allowed.  SQLITE_DENY
+** means that the SQL statement will never-run - the sqlite3_exec() call
+** will return with an error.  SQLITE_IGNORE means that the SQL statement
+** should run but attempts to read the specified column will return NULL
+** and attempts to write the column will be ignored.
+**
+** Setting the auth function to NULL disables this hook.  The default
+** setting of the auth function is NULL.
+*/
+int sqlite3_set_authorizer(
+  sqlite3 *db,
+  int (*xAuth)(void*,int,const char*,const char*,const char*,const char*),
+  void *pArg
+){
+  sqlite3_mutex_enter(db->mutex);
+  db->xAuth = xAuth;
+  db->pAuthArg = pArg;
+  sqlite3ExpirePreparedStatements(db);
+  sqlite3_mutex_leave(db->mutex);
+  return SQLITE_OK;
+}
+
+/*
+** Write an error message into pParse->zErrMsg that explains that the
+** user-supplied authorization function returned an illegal value.
+*/
+static void sqliteAuthBadReturnCode(Parse *pParse, int rc){
+  sqlite3ErrorMsg(pParse, "illegal return value (%d) from the "
+    "authorization function - should be SQLITE_OK, SQLITE_IGNORE, "
+    "or SQLITE_DENY", rc);
+  pParse->rc = SQLITE_ERROR;
+}
+
+/*
+** The pExpr should be a TK_COLUMN expression.  The table referred to
+** is in pTabList or else it is the NEW or OLD table of a trigger.
+** Check to see if it is OK to read this particular column.
+**
+** If the auth function returns SQLITE_IGNORE, change the TK_COLUMN
+** instruction into a TK_NULL.  If the auth function returns SQLITE_DENY,
+** then generate an error.
+*/
+void sqlite3AuthRead(
+  Parse *pParse,        /* The parser context */
+  Expr *pExpr,          /* The expression to check authorization on */
+  Schema *pSchema,      /* The schema of the expression */
+  SrcList *pTabList     /* All table that pExpr might refer to */
+){
+  sqlite3 *db = pParse->db;
+  int rc;
+  Table *pTab = 0;      /* The table being read */
+  const char *zCol;     /* Name of the column of the table */
+  int iSrc;             /* Index in pTabList->a[] of table being read */
+  const char *zDBase;   /* Name of database being accessed */
+  TriggerStack *pStack; /* The stack of current triggers */
+  int iDb;              /* The index of the database the expression refers to */
+
+  if( db->xAuth==0 ) return;
+  if( pExpr->op!=TK_COLUMN ) return;
+  iDb = sqlite3SchemaToIndex(pParse->db, pSchema);
+  if( iDb<0 ){
+    /* An attempt to read a column out of a subquery or other
+    ** temporary table. */
+    return;
+  }
+  for(iSrc=0; pTabList && iSrc<pTabList->nSrc; iSrc++){
+    if( pExpr->iTable==pTabList->a[iSrc].iCursor ) break;
+  }
+  if( iSrc>=0 && pTabList && iSrc<pTabList->nSrc ){
+    pTab = pTabList->a[iSrc].pTab;
+  }else if( (pStack = pParse->trigStack)!=0 ){
+    /* This must be an attempt to read the NEW or OLD pseudo-tables
+    ** of a trigger.
+    */
+    assert( pExpr->iTable==pStack->newIdx || pExpr->iTable==pStack->oldIdx );
+    pTab = pStack->pTab;
+  }
+  if( pTab==0 ) return;
+  if( pExpr->iColumn>=0 ){
+    assert( pExpr->iColumn<pTab->nCol );
+    zCol = pTab->aCol[pExpr->iColumn].zName;
+  }else if( pTab->iPKey>=0 ){
+    assert( pTab->iPKey<pTab->nCol );
+    zCol = pTab->aCol[pTab->iPKey].zName;
+  }else{
+    zCol = "ROWID";
+  }
+  assert( iDb>=0 && iDb<db->nDb );
+  zDBase = db->aDb[iDb].zName;
+  rc = db->xAuth(db->pAuthArg, SQLITE_READ, pTab->zName, zCol, zDBase,
+                 pParse->zAuthContext);
+  if( rc==SQLITE_IGNORE ){
+    pExpr->op = TK_NULL;
+  }else if( rc==SQLITE_DENY ){
+    if( db->nDb>2 || iDb!=0 ){
+      sqlite3ErrorMsg(pParse, "access to %s.%s.%s is prohibited",
+         zDBase, pTab->zName, zCol);
+    }else{
+      sqlite3ErrorMsg(pParse, "access to %s.%s is prohibited",pTab->zName,zCol);
+    }
+    pParse->rc = SQLITE_AUTH;
+  }else if( rc!=SQLITE_OK ){
+    sqliteAuthBadReturnCode(pParse, rc);
+  }
+}
+
+/*
+** Do an authorization check using the code and arguments given.  Return
+** either SQLITE_OK (zero) or SQLITE_IGNORE or SQLITE_DENY.  If SQLITE_DENY
+** is returned, then the error count and error message in pParse are
+** modified appropriately.
+*/
+int sqlite3AuthCheck(
+  Parse *pParse,
+  int code,
+  const char *zArg1,
+  const char *zArg2,
+  const char *zArg3
+){
+  sqlite3 *db = pParse->db;
+  int rc;
+
+  /* Don't do any authorization checks if the database is initialising
+  ** or if the parser is being invoked from within sqlite3_declare_vtab.
+  */
+  if( db->init.busy || IN_DECLARE_VTAB ){
+    return SQLITE_OK;
+  }
+
+  if( db->xAuth==0 ){
+    return SQLITE_OK;
+  }
+  rc = db->xAuth(db->pAuthArg, code, zArg1, zArg2, zArg3, pParse->zAuthContext);
+  if( rc==SQLITE_DENY ){
+    sqlite3ErrorMsg(pParse, "not authorized");
+    pParse->rc = SQLITE_AUTH;
+  }else if( rc!=SQLITE_OK && rc!=SQLITE_IGNORE ){
+    rc = SQLITE_DENY;
+    sqliteAuthBadReturnCode(pParse, rc);
+  }
+  return rc;
+}
+
+/*
+** Push an authorization context.  After this routine is called, the
+** zArg3 argument to authorization callbacks will be zContext until
+** popped.  Or if pParse==0, this routine is a no-op.
+*/
+void sqlite3AuthContextPush(
+  Parse *pParse,
+  AuthContext *pContext,
+  const char *zContext
+){
+  pContext->pParse = pParse;
+  if( pParse ){
+    pContext->zAuthContext = pParse->zAuthContext;
+    pParse->zAuthContext = zContext;
+  }
+}
+
+/*
+** Pop an authorization context that was previously pushed
+** by sqlite3AuthContextPush
+*/
+void sqlite3AuthContextPop(AuthContext *pContext){
+  if( pContext->pParse ){
+    pContext->pParse->zAuthContext = pContext->zAuthContext;
+    pContext->pParse = 0;
+  }
+}
+
+#endif /* SQLITE_OMIT_AUTHORIZATION */
diff --git a/uppsrc/plugin/sqlite3/lib/bitvec.c b/uppsrc/plugin/sqlite3/lib/bitvec.c
new file mode 100644
index 000000000..a80aef807
--- /dev/null
+++ b/uppsrc/plugin/sqlite3/lib/bitvec.c
@@ -0,0 +1,211 @@
+/*
+** 2008 February 16
+**
+** The author disclaims copyright to this source code.  In place of
+** a legal notice, here is a blessing:
+**
+**    May you do good and not evil.
+**    May you find forgiveness for yourself and forgive others.
+**    May you share freely, never taking more than you give.
+**
+*************************************************************************
+** This file implements an object that represents a fixed-length
+** bitmap.  Bits are numbered starting with 1.
+**
+** A bitmap is used to record what pages a database file have been
+** journalled during a transaction.  Usually only a few pages are
+** journalled.  So the bitmap is usually sparse and has low cardinality.
+** But sometimes (for example when during a DROP of a large table) most
+** or all of the pages get journalled.  In those cases, the bitmap becomes
+** dense.  The algorithm needs to handle both cases well.
+**
+** The size of the bitmap is fixed when the object is created.
+**
+** All bits are clear when the bitmap is created.  Individual bits
+** may be set or cleared one at a time.
+**
+** Test operations are about 100 times more common that set operations.
+** Clear operations are exceedingly rare.  There are usually between
+** 5 and 500 set operations per Bitvec object, though the number of sets can
+** sometimes grow into tens of thousands or larger.  The size of the
+** Bitvec object is the number of pages in the database file at the
+** start of a transaction, and is thus usually less than a few thousand,
+** but can be as large as 2 billion for a really big database.
+**
+** @(#) $Id: bitvec.c,v 1.2 2008/03/14 13:02:08 mlcreech Exp $
+*/
+#include "sqliteInt.h"
+
+#define BITVEC_SZ        512
+/* Round the union size down to the nearest pointer boundary, since that's how
+** it will be aligned within the Bitvec struct. */
+#define BITVEC_USIZE     (((BITVEC_SZ-12)/sizeof(Bitvec *))*sizeof(Bitvec *))
+#define BITVEC_NCHAR     BITVEC_USIZE
+#define BITVEC_NBIT      (BITVEC_NCHAR*8)
+#define BITVEC_NINT      (BITVEC_USIZE/4)
+#define BITVEC_MXHASH    (BITVEC_NINT/2)
+#define BITVEC_NPTR      (BITVEC_USIZE/sizeof(Bitvec *))
+
+#define BITVEC_HASH(X)   (((X)*37)%BITVEC_NINT)
+
+/*
+** A bitmap is an instance of the following structure.
+**
+** This bitmap records the existance of zero or more bits
+** with values between 1 and iSize, inclusive.
+**
+** There are three possible representations of the bitmap.
+** If iSize<=BITVEC_NBIT, then Bitvec.u.aBitmap[] is a straight
+** bitmap.  The least significant bit is bit 1.
+**
+** If iSize>BITVEC_NBIT and iDivisor==0 then Bitvec.u.aHash[] is
+** a hash table that will hold up to BITVEC_MXHASH distinct values.
+**
+** Otherwise, the value i is redirected into one of BITVEC_NPTR
+** sub-bitmaps pointed to by Bitvec.u.apSub[].  Each subbitmap
+** handles up to iDivisor separate values of i.  apSub[0] holds
+** values between 1 and iDivisor.  apSub[1] holds values between
+** iDivisor+1 and 2*iDivisor.  apSub[N] holds values between
+** N*iDivisor+1 and (N+1)*iDivisor.  Each subbitmap is normalized
+** to hold deal with values between 1 and iDivisor.
+*/
+struct Bitvec {
+  u32 iSize;      /* Maximum bit index */
+  u32 nSet;       /* Number of bits that are set */
+  u32 iDivisor;   /* Number of bits handled by each apSub[] entry */
+  union {
+    u8 aBitmap[BITVEC_NCHAR];    /* Bitmap representation */
+    u32 aHash[BITVEC_NINT];      /* Hash table representation */
+    Bitvec *apSub[BITVEC_NPTR];  /* Recursive representation */
+  } u;
+};
+
+/*
+** Create a new bitmap object able to handle bits between 0 and iSize,
+** inclusive.  Return a pointer to the new object.  Return NULL if
+** malloc fails.
+*/
+Bitvec *sqlite3BitvecCreate(u32 iSize){
+  Bitvec *p;
+  assert( sizeof(*p)==BITVEC_SZ );
+  p = sqlite3MallocZero( sizeof(*p) );
+  if( p ){
+    p->iSize = iSize;
+  }
+  return p;
+}
+
+/*
+** Check to see if the i-th bit is set.  Return true or false.
+** If p is NULL (if the bitmap has not been created) or if
+** i is out of range, then return false.
+*/
+int sqlite3BitvecTest(Bitvec *p, u32 i){
+  assert( i>0 );
+  if( p==0 ) return 0;
+  if( i>p->iSize ) return 0;
+  if( p->iSize<=BITVEC_NBIT ){
+    i--;
+    return (p->u.aBitmap[i/8] & (1<<(i&7)))!=0;
+  }
+  if( p->iDivisor>0 ){
+    u32 bin = (i-1)/p->iDivisor;
+    i = (i-1)%p->iDivisor + 1;
+    return sqlite3BitvecTest(p->u.apSub[bin], i);
+  }else{
+    u32 h = BITVEC_HASH(i);
+    while( p->u.aHash[h] ){
+      if( p->u.aHash[h]==i ) return 1;
+      h++;
+      if( h>=BITVEC_NINT ) h = 0;
+    }
+    return 0;
+  }
+}
+
+/*
+** Set the i-th bit.  Return 0 on success and an error code if
+** anything goes wrong.
+*/
+int sqlite3BitvecSet(Bitvec *p, u32 i){
+  u32 h;
+  assert( p!=0 );
+  if( p->iSize<=BITVEC_NBIT ){
+    i--;
+    p->u.aBitmap[i/8] |= 1 << (i&7);
+    return SQLITE_OK;
+  }
+  if( p->iDivisor ){
+    u32 bin = (i-1)/p->iDivisor;
+    i = (i-1)%p->iDivisor + 1;
+    if( p->u.apSub[bin]==0 ){
+      sqlite3FaultBenign(SQLITE_FAULTINJECTOR_MALLOC, 1);
+      p->u.apSub[bin] = sqlite3BitvecCreate( p->iDivisor );
+      sqlite3FaultBenign(SQLITE_FAULTINJECTOR_MALLOC, 0);
+      if( p->u.apSub[bin]==0 ) return SQLITE_NOMEM;
+    }
+    return sqlite3BitvecSet(p->u.apSub[bin], i);
+  }
+  h = BITVEC_HASH(i);
+  while( p->u.aHash[h] ){
+    if( p->u.aHash[h]==i ) return SQLITE_OK;
+    h++;
+    if( h==BITVEC_NINT ) h = 0;
+  }
+  p->nSet++;
+  if( p->nSet>=BITVEC_MXHASH ){
+    int j, rc;
+    u32 aiValues[BITVEC_NINT];
+    memcpy(aiValues, p->u.aHash, sizeof(aiValues));
+    memset(p->u.apSub, 0, sizeof(p->u.apSub[0])*BITVEC_NPTR);
+    p->iDivisor = (p->iSize + BITVEC_NPTR - 1)/BITVEC_NPTR;
+    sqlite3BitvecSet(p, i);
+    for(rc=j=0; j<BITVEC_NINT; j++){
+      if( aiValues[j] ) rc |= sqlite3BitvecSet(p, aiValues[j]);
+    }
+    return rc;
+  }
+  p->u.aHash[h] = i;
+  return SQLITE_OK;
+}
+
+/*
+** Clear the i-th bit.  Return 0 on success and an error code if
+** anything goes wrong.
+*/
+void sqlite3BitvecClear(Bitvec *p, u32 i){
+  assert( p!=0 );
+  if( p->iSize<=BITVEC_NBIT ){
+    i--;
+    p->u.aBitmap[i/8] &= ~(1 << (i&7));
+  }else if( p->iDivisor ){
+    u32 bin = (i-1)/p->iDivisor;
+    i = (i-1)%p->iDivisor + 1;
+    if( p->u.apSub[bin] ){
+      sqlite3BitvecClear(p->u.apSub[bin], i);
+    }
+  }else{
+    int j;
+    u32 aiValues[BITVEC_NINT];
+    memcpy(aiValues, p->u.aHash, sizeof(aiValues));
+    memset(p->u.aHash, 0, sizeof(p->u.aHash[0])*BITVEC_NINT);
+    p->nSet = 0;
+    for(j=0; j<BITVEC_NINT; j++){
+      if( aiValues[j] && aiValues[j]!=i ) sqlite3BitvecSet(p, aiValues[j]);
+    }
+  }
+}
+
+/*
+** Destroy a bitmap object.  Reclaim all memory used.
+*/
+void sqlite3BitvecDestroy(Bitvec *p){
+  if( p==0 ) return;
+  if( p->iDivisor ){
+    int i;
+    for(i=0; i<BITVEC_NPTR; i++){
+      sqlite3BitvecDestroy(p->u.apSub[i]);
+    }
+  }
+  sqlite3_free(p);
+}
diff --git a/uppsrc/plugin/sqlite3/lib/btmutex.c b/uppsrc/plugin/sqlite3/lib/btmutex.c
new file mode 100644
index 000000000..19d859dcf
--- /dev/null
+++ b/uppsrc/plugin/sqlite3/lib/btmutex.c
@@ -0,0 +1,317 @@
+/*
+** 2007 August 27
+**
+** The author disclaims copyright to this source code.  In place of
+** a legal notice, here is a blessing:
+**
+**    May you do good and not evil.
+**    May you find forgiveness for yourself and forgive others.
+**    May you share freely, never taking more than you give.
+**
+*************************************************************************
+**
+** $Id: btmutex.c,v 1.9 2008/01/23 12:52:41 drh Exp $
+**
+** This file contains code used to implement mutexes on Btree objects.
+** This code really belongs in btree.c.  But btree.c is getting too
+** big and we want to break it down some.  This packaged seemed like
+** a good breakout.
+*/
+#include "btreeInt.h"
+#if SQLITE_THREADSAFE && !defined(SQLITE_OMIT_SHARED_CACHE)
+
+
+/*
+** Enter a mutex on the given BTree object.
+**
+** If the object is not sharable, then no mutex is ever required
+** and this routine is a no-op.  The underlying mutex is non-recursive.
+** But we keep a reference count in Btree.wantToLock so the behavior
+** of this interface is recursive.
+**
+** To avoid deadlocks, multiple Btrees are locked in the same order
+** by all database connections.  The p->pNext is a list of other
+** Btrees belonging to the same database connection as the p Btree
+** which need to be locked after p.  If we cannot get a lock on
+** p, then first unlock all of the others on p->pNext, then wait
+** for the lock to become available on p, then relock all of the
+** subsequent Btrees that desire a lock.
+*/
+void sqlite3BtreeEnter(Btree *p){
+  Btree *pLater;
+
+  /* Some basic sanity checking on the Btree.  The list of Btrees
+  ** connected by pNext and pPrev should be in sorted order by
+  ** Btree.pBt value. All elements of the list should belong to
+  ** the same connection. Only shared Btrees are on the list. */
+  assert( p->pNext==0 || p->pNext->pBt>p->pBt );
+  assert( p->pPrev==0 || p->pPrev->pBt<p->pBt );
+  assert( p->pNext==0 || p->pNext->db==p->db );
+  assert( p->pPrev==0 || p->pPrev->db==p->db );
+  assert( p->sharable || (p->pNext==0 && p->pPrev==0) );
+
+  /* Check for locking consistency */
+  assert( !p->locked || p->wantToLock>0 );
+  assert( p->sharable || p->wantToLock==0 );
+
+  /* We should already hold a lock on the database connection */
+  assert( sqlite3_mutex_held(p->db->mutex) );
+
+  if( !p->sharable ) return;
+  p->wantToLock++;
+  if( p->locked ) return;
+
+#ifndef SQLITE_MUTEX_NOOP
+  /* In most cases, we should be able to acquire the lock we
+  ** want without having to go throught the ascending lock
+  ** procedure that follows.  Just be sure not to block.
+  */
+  if( sqlite3_mutex_try(p->pBt->mutex)==SQLITE_OK ){
+    p->locked = 1;
+    return;
+  }
+
+  /* To avoid deadlock, first release all locks with a larger
+  ** BtShared address.  Then acquire our lock.  Then reacquire
+  ** the other BtShared locks that we used to hold in ascending
+  ** order.
+  */
+  for(pLater=p->pNext; pLater; pLater=pLater->pNext){
+    assert( pLater->sharable );
+    assert( pLater->pNext==0 || pLater->pNext->pBt>pLater->pBt );
+    assert( !pLater->locked || pLater->wantToLock>0 );
+    if( pLater->locked ){
+      sqlite3_mutex_leave(pLater->pBt->mutex);
+      pLater->locked = 0;
+    }
+  }
+  sqlite3_mutex_enter(p->pBt->mutex);
+  p->locked = 1;
+  for(pLater=p->pNext; pLater; pLater=pLater->pNext){
+    if( pLater->wantToLock ){
+      sqlite3_mutex_enter(pLater->pBt->mutex);
+      pLater->locked = 1;
+    }
+  }
+#endif /* SQLITE_MUTEX_NOOP */
+}
+
+/*
+** Exit the recursive mutex on a Btree.
+*/
+void sqlite3BtreeLeave(Btree *p){
+  if( p->sharable ){
+    assert( p->wantToLock>0 );
+    p->wantToLock--;
+    if( p->wantToLock==0 ){
+      assert( p->locked );
+      sqlite3_mutex_leave(p->pBt->mutex);
+      p->locked = 0;
+    }
+  }
+}
+
+#ifndef NDEBUG
+/*
+** Return true if the BtShared mutex is held on the btree.
+**
+** This routine makes no determination one why or another if the
+** database connection mutex is held.
+**
+** This routine is used only from within assert() statements.
+*/
+int sqlite3BtreeHoldsMutex(Btree *p){
+  return (p->sharable==0 ||
+             (p->locked && p->wantToLock && sqlite3_mutex_held(p->pBt->mutex)));
+}
+#endif
+
+
+#ifndef SQLITE_OMIT_INCRBLOB
+/*
+** Enter and leave a mutex on a Btree given a cursor owned by that
+** Btree.  These entry points are used by incremental I/O and can be
+** omitted if that module is not used.
+*/
+void sqlite3BtreeEnterCursor(BtCursor *pCur){
+  sqlite3BtreeEnter(pCur->pBtree);
+}
+void sqlite3BtreeLeaveCursor(BtCursor *pCur){
+  sqlite3BtreeLeave(pCur->pBtree);
+}
+#endif /* SQLITE_OMIT_INCRBLOB */
+
+
+/*
+** Enter the mutex on every Btree associated with a database
+** connection.  This is needed (for example) prior to parsing
+** a statement since we will be comparing table and column names
+** against all schemas and we do not want those schemas being
+** reset out from under us.
+**
+** There is a corresponding leave-all procedures.
+**
+** Enter the mutexes in accending order by BtShared pointer address
+** to avoid the possibility of deadlock when two threads with
+** two or more btrees in common both try to lock all their btrees
+** at the same instant.
+*/
+void sqlite3BtreeEnterAll(sqlite3 *db){
+  int i;
+  Btree *p, *pLater;
+  assert( sqlite3_mutex_held(db->mutex) );
+  for(i=0; i<db->nDb; i++){
+    p = db->aDb[i].pBt;
+    if( p && p->sharable ){
+      p->wantToLock++;
+      if( !p->locked ){
+        assert( p->wantToLock==1 );
+        while( p->pPrev ) p = p->pPrev;
+        while( p->locked && p->pNext ) p = p->pNext;
+        for(pLater = p->pNext; pLater; pLater=pLater->pNext){
+          if( pLater->locked ){
+            sqlite3_mutex_leave(pLater->pBt->mutex);
+            pLater->locked = 0;
+          }
+        }
+        while( p ){
+          sqlite3_mutex_enter(p->pBt->mutex);
+          p->locked++;
+          p = p->pNext;
+        }
+      }
+    }
+  }
+}
+void sqlite3BtreeLeaveAll(sqlite3 *db){
+  int i;
+  Btree *p;
+  assert( sqlite3_mutex_held(db->mutex) );
+  for(i=0; i<db->nDb; i++){
+    p = db->aDb[i].pBt;
+    if( p && p->sharable ){
+      assert( p->wantToLock>0 );
+      p->wantToLock--;
+      if( p->wantToLock==0 ){
+        assert( p->locked );
+        sqlite3_mutex_leave(p->pBt->mutex);
+        p->locked = 0;
+      }
+    }
+  }
+}
+
+#ifndef NDEBUG
+/*
+** Return true if the current thread holds the database connection
+** mutex and all required BtShared mutexes.
+**
+** This routine is used inside assert() statements only.
+*/
+int sqlite3BtreeHoldsAllMutexes(sqlite3 *db){
+  int i;
+  if( !sqlite3_mutex_held(db->mutex) ){
+    return 0;
+  }
+  for(i=0; i<db->nDb; i++){
+    Btree *p;
+    p = db->aDb[i].pBt;
+    if( p && p->sharable &&
+         (p->wantToLock==0 || !sqlite3_mutex_held(p->pBt->mutex)) ){
+      return 0;
+    }
+  }
+  return 1;
+}
+#endif /* NDEBUG */
+
+/*
+** Potentially dd a new Btree pointer to a BtreeMutexArray.
+** Really only add the Btree if it can possibly be shared with
+** another database connection.
+**
+** The Btrees are kept in sorted order by pBtree->pBt.  That
+** way when we go to enter all the mutexes, we can enter them
+** in order without every having to backup and retry and without
+** worrying about deadlock.
+**
+** The number of shared btrees will always be small (usually 0 or 1)
+** so an insertion sort is an adequate algorithm here.
+*/
+void sqlite3BtreeMutexArrayInsert(BtreeMutexArray *pArray, Btree *pBtree){
+  int i, j;
+  BtShared *pBt;
+  if( pBtree==0 || pBtree->sharable==0 ) return;
+#ifndef NDEBUG
+  {
+    for(i=0; i<pArray->nMutex; i++){
+      assert( pArray->aBtree[i]!=pBtree );
+    }
+  }
+#endif
+  assert( pArray->nMutex>=0 );
+  assert( pArray->nMutex<sizeof(pArray->aBtree)/sizeof(pArray->aBtree[0])-1 );
+  pBt = pBtree->pBt;
+  for(i=0; i<pArray->nMutex; i++){
+    assert( pArray->aBtree[i]!=pBtree );
+    if( pArray->aBtree[i]->pBt>pBt ){
+      for(j=pArray->nMutex; j>i; j--){
+        pArray->aBtree[j] = pArray->aBtree[j-1];
+      }
+      pArray->aBtree[i] = pBtree;
+      pArray->nMutex++;
+      return;
+    }
+  }
+  pArray->aBtree[pArray->nMutex++] = pBtree;
+}
+
+/*
+** Enter the mutex of every btree in the array.  This routine is
+** called at the beginning of sqlite3VdbeExec().  The mutexes are
+** exited at the end of the same function.
+*/
+void sqlite3BtreeMutexArrayEnter(BtreeMutexArray *pArray){
+  int i;
+  for(i=0; i<pArray->nMutex; i++){
+    Btree *p = pArray->aBtree[i];
+    /* Some basic sanity checking */
+    assert( i==0 || pArray->aBtree[i-1]->pBt<p->pBt );
+    assert( !p->locked || p->wantToLock>0 );
+
+    /* We should already hold a lock on the database connection */
+    assert( sqlite3_mutex_held(p->db->mutex) );
+
+    p->wantToLock++;
+    if( !p->locked && p->sharable ){
+      sqlite3_mutex_enter(p->pBt->mutex);
+      p->locked = 1;
+    }
+  }
+}
+
+/*
+** Leave the mutex of every btree in the group.
+*/
+void sqlite3BtreeMutexArrayLeave(BtreeMutexArray *pArray){
+  int i;
+  for(i=0; i<pArray->nMutex; i++){
+    Btree *p = pArray->aBtree[i];
+    /* Some basic sanity checking */
+    assert( i==0 || pArray->aBtree[i-1]->pBt<p->pBt );
+    assert( p->locked || !p->sharable );
+    assert( p->wantToLock>0 );
+
+    /* We should already hold a lock on the database connection */
+    assert( sqlite3_mutex_held(p->db->mutex) );
+
+    p->wantToLock--;
+    if( p->wantToLock==0 && p->locked ){
+      sqlite3_mutex_leave(p->pBt->mutex);
+      p->locked = 0;
+    }
+  }
+}
+
+
+#endif  /* SQLITE_THREADSAFE && !SQLITE_OMIT_SHARED_CACHE */
diff --git a/uppsrc/plugin/sqlite3/lib/btree.c b/uppsrc/plugin/sqlite3/lib/btree.c
new file mode 100644
index 000000000..1fa4d634e
--- /dev/null
+++ b/uppsrc/plugin/sqlite3/lib/btree.c
@@ -0,0 +1,6943 @@
+/*
+** 2004 April 6
+**
+** The author disclaims copyright to this source code.  In place of
+** a legal notice, here is a blessing:
+**
+**    May you do good and not evil.
+**    May you find forgiveness for yourself and forgive others.
+**    May you share freely, never taking more than you give.
+**
+*************************************************************************
+** $Id: btree.c,v 1.440 2008/03/04 17:45:01 mlcreech Exp $
+**
+** This file implements a external (disk-based) database using BTrees.
+** See the header comment on "btreeInt.h" for additional information.
+** Including a description of file format and an overview of operation.
+*/
+#include "btreeInt.h"
+
+/*
+** The header string that appears at the beginning of every
+** SQLite database.
+*/
+static const char zMagicHeader[] = SQLITE_FILE_HEADER;
+
+/*
+** Set this global variable to 1 to enable tracing using the TRACE
+** macro.
+*/
+#if SQLITE_TEST
+int sqlite3BtreeTrace=0;  /* True to enable tracing */
+#endif
+
+
+
+#ifndef SQLITE_OMIT_SHARED_CACHE
+/*
+** A flag to indicate whether or not shared cache is enabled.  Also,
+** a list of BtShared objects that are eligible for participation
+** in shared cache.  The variables have file scope during normal builds,
+** but the test harness needs to access these variables so we make them
+** global for test builds.
+*/
+#ifdef SQLITE_TEST
+BtShared *sqlite3SharedCacheList = 0;
+int sqlite3SharedCacheEnabled = 0;
+#else
+static BtShared *sqlite3SharedCacheList = 0;
+static int sqlite3SharedCacheEnabled = 0;
+#endif
+#endif /* SQLITE_OMIT_SHARED_CACHE */
+
+#ifndef SQLITE_OMIT_SHARED_CACHE
+/*
+** Enable or disable the shared pager and schema features.
+**
+** This routine has no effect on existing database connections.
+** The shared cache setting effects only future calls to
+** sqlite3_open(), sqlite3_open16(), or sqlite3_open_v2().
+*/
+int sqlite3_enable_shared_cache(int enable){
+  sqlite3SharedCacheEnabled = enable;
+  return SQLITE_OK;
+}
+#endif
+
+
+/*
+** Forward declaration
+*/
+static int checkReadLocks(Btree*,Pgno,BtCursor*);
+
+
+#ifdef SQLITE_OMIT_SHARED_CACHE
+  /*
+  ** The functions queryTableLock(), lockTable() and unlockAllTables()
+  ** manipulate entries in the BtShared.pLock linked list used to store
+  ** shared-cache table level locks. If the library is compiled with the
+  ** shared-cache feature disabled, then there is only ever one user
+  ** of each BtShared structure and so this locking is not necessary.
+  ** So define the lock related functions as no-ops.
+  */
+  #define queryTableLock(a,b,c) SQLITE_OK
+  #define lockTable(a,b,c) SQLITE_OK
+  #define unlockAllTables(a)
+#endif
+
+#ifndef SQLITE_OMIT_SHARED_CACHE
+/*
+** Query to see if btree handle p may obtain a lock of type eLock
+** (READ_LOCK or WRITE_LOCK) on the table with root-page iTab. Return
+** SQLITE_OK if the lock may be obtained (by calling lockTable()), or
+** SQLITE_LOCKED if not.
+*/
+static int queryTableLock(Btree *p, Pgno iTab, u8 eLock){
+  BtShared *pBt = p->pBt;
+  BtLock *pIter;
+
+  assert( sqlite3BtreeHoldsMutex(p) );
+
+  /* This is a no-op if the shared-cache is not enabled */
+  if( !p->sharable ){
+    return SQLITE_OK;
+  }
+
+  /* If some other connection is holding an exclusive lock, the
+  ** requested lock may not be obtained.
+  */
+  if( pBt->pExclusive && pBt->pExclusive!=p ){
+    return SQLITE_LOCKED;
+  }
+
+  /* This (along with lockTable()) is where the ReadUncommitted flag is
+  ** dealt with. If the caller is querying for a read-lock and the flag is
+  ** set, it is unconditionally granted - even if there are write-locks
+  ** on the table. If a write-lock is requested, the ReadUncommitted flag
+  ** is not considered.
+  **
+  ** In function lockTable(), if a read-lock is demanded and the
+  ** ReadUncommitted flag is set, no entry is added to the locks list
+  ** (BtShared.pLock).
+  **
+  ** To summarize: If the ReadUncommitted flag is set, then read cursors do
+  ** not create or respect table locks. The locking procedure for a
+  ** write-cursor does not change.
+  */
+  if(
+    !p->db ||
+    0==(p->db->flags&SQLITE_ReadUncommitted) ||
+    eLock==WRITE_LOCK ||
+    iTab==MASTER_ROOT
+  ){
+    for(pIter=pBt->pLock; pIter; pIter=pIter->pNext){
+      if( pIter->pBtree!=p && pIter->iTable==iTab &&
+          (pIter->eLock!=eLock || eLock!=READ_LOCK) ){
+        return SQLITE_LOCKED;
+      }
+    }
+  }
+  return SQLITE_OK;
+}
+#endif /* !SQLITE_OMIT_SHARED_CACHE */
+
+#ifndef SQLITE_OMIT_SHARED_CACHE
+/*
+** Add a lock on the table with root-page iTable to the shared-btree used
+** by Btree handle p. Parameter eLock must be either READ_LOCK or
+** WRITE_LOCK.
+**
+** SQLITE_OK is returned if the lock is added successfully. SQLITE_BUSY and
+** SQLITE_NOMEM may also be returned.
+*/
+static int lockTable(Btree *p, Pgno iTable, u8 eLock){
+  BtShared *pBt = p->pBt;
+  BtLock *pLock = 0;
+  BtLock *pIter;
+
+  assert( sqlite3BtreeHoldsMutex(p) );
+
+  /* This is a no-op if the shared-cache is not enabled */
+  if( !p->sharable ){
+    return SQLITE_OK;
+  }
+
+  assert( SQLITE_OK==queryTableLock(p, iTable, eLock) );
+
+  /* If the read-uncommitted flag is set and a read-lock is requested,
+  ** return early without adding an entry to the BtShared.pLock list. See
+  ** comment in function queryTableLock() for more info on handling
+  ** the ReadUncommitted flag.
+  */
+  if(
+    (p->db) &&
+    (p->db->flags&SQLITE_ReadUncommitted) &&
+    (eLock==READ_LOCK) &&
+    iTable!=MASTER_ROOT
+  ){
+    return SQLITE_OK;
+  }
+
+  /* First search the list for an existing lock on this table. */
+  for(pIter=pBt->pLock; pIter; pIter=pIter->pNext){
+    if( pIter->iTable==iTable && pIter->pBtree==p ){
+      pLock = pIter;
+      break;
+    }
+  }
+
+  /* If the above search did not find a BtLock struct associating Btree p
+  ** with table iTable, allocate one and link it into the list.
+  */
+  if( !pLock ){
+    pLock = (BtLock *)sqlite3MallocZero(sizeof(BtLock));
+    if( !pLock ){
+      return SQLITE_NOMEM;
+    }
+    pLock->iTable = iTable;
+    pLock->pBtree = p;
+    pLock->pNext = pBt->pLock;
+    pBt->pLock = pLock;
+  }
+
+  /* Set the BtLock.eLock variable to the maximum of the current lock
+  ** and the requested lock. This means if a write-lock was already held
+  ** and a read-lock requested, we don't incorrectly downgrade the lock.
+  */
+  assert( WRITE_LOCK>READ_LOCK );
+  if( eLock>pLock->eLock ){
+    pLock->eLock = eLock;
+  }
+
+  return SQLITE_OK;
+}
+#endif /* !SQLITE_OMIT_SHARED_CACHE */
+
+#ifndef SQLITE_OMIT_SHARED_CACHE
+/*
+** Release all the table locks (locks obtained via calls to the lockTable()
+** procedure) held by Btree handle p.
+*/
+static void unlockAllTables(Btree *p){
+  BtShared *pBt = p->pBt;
+  BtLock **ppIter = &pBt->pLock;
+
+  assert( sqlite3BtreeHoldsMutex(p) );
+  assert( p->sharable || 0==*ppIter );
+
+  while( *ppIter ){
+    BtLock *pLock = *ppIter;
+    assert( pBt->pExclusive==0 || pBt->pExclusive==pLock->pBtree );
+    if( pLock->pBtree==p ){
+      *ppIter = pLock->pNext;
+      sqlite3_free(pLock);
+    }else{
+      ppIter = &pLock->pNext;
+    }
+  }
+
+  if( pBt->pExclusive==p ){
+    pBt->pExclusive = 0;
+  }
+}
+#endif /* SQLITE_OMIT_SHARED_CACHE */
+
+static void releasePage(MemPage *pPage);  /* Forward reference */
+
+/*
+** Verify that the cursor holds a mutex on the BtShared
+*/
+#ifndef NDEBUG
+static int cursorHoldsMutex(BtCursor *p){
+  return sqlite3_mutex_held(p->pBt->mutex);
+}
+#endif
+
+
+#ifndef SQLITE_OMIT_INCRBLOB
+/*
+** Invalidate the overflow page-list cache for cursor pCur, if any.
+*/
+static void invalidateOverflowCache(BtCursor *pCur){
+  assert( cursorHoldsMutex(pCur) );
+  sqlite3_free(pCur->aOverflow);
+  pCur->aOverflow = 0;
+}
+
+/*
+** Invalidate the overflow page-list cache for all cursors opened
+** on the shared btree structure pBt.
+*/
+static void invalidateAllOverflowCache(BtShared *pBt){
+  BtCursor *p;
+  assert( sqlite3_mutex_held(pBt->mutex) );
+  for(p=pBt->pCursor; p; p=p->pNext){
+    invalidateOverflowCache(p);
+  }
+}
+#else
+  #define invalidateOverflowCache(x)
+  #define invalidateAllOverflowCache(x)
+#endif
+
+/*
+** Save the current cursor position in the variables BtCursor.nKey
+** and BtCursor.pKey. The cursor's state is set to CURSOR_REQUIRESEEK.
+*/
+static int saveCursorPosition(BtCursor *pCur){
+  int rc;
+
+  assert( CURSOR_VALID==pCur->eState );
+  assert( 0==pCur->pKey );
+  assert( cursorHoldsMutex(pCur) );
+
+  rc = sqlite3BtreeKeySize(pCur, &pCur->nKey);
+
+  /* If this is an intKey table, then the above call to BtreeKeySize()
+  ** stores the integer key in pCur->nKey. In this case this value is
+  ** all that is required. Otherwise, if pCur is not open on an intKey
+  ** table, then malloc space for and store the pCur->nKey bytes of key
+  ** data.
+  */
+  if( rc==SQLITE_OK && 0==pCur->pPage->intKey){
+    void *pKey = sqlite3_malloc(pCur->nKey);
+    if( pKey ){
+      rc = sqlite3BtreeKey(pCur, 0, pCur->nKey, pKey);
+      if( rc==SQLITE_OK ){
+        pCur->pKey = pKey;
+      }else{
+        sqlite3_free(pKey);
+      }
+    }else{
+      rc = SQLITE_NOMEM;
+    }
+  }
+  assert( !pCur->pPage->intKey || !pCur->pKey );
+
+  if( rc==SQLITE_OK ){
+    releasePage(pCur->pPage);
+    pCur->pPage = 0;
+    pCur->eState = CURSOR_REQUIRESEEK;
+  }
+
+  invalidateOverflowCache(pCur);
+  return rc;
+}
+
+/*
+** Save the positions of all cursors except pExcept open on the table
+** with root-page iRoot. Usually, this is called just before cursor
+** pExcept is used to modify the table (BtreeDelete() or BtreeInsert()).
+*/
+static int saveAllCursors(BtShared *pBt, Pgno iRoot, BtCursor *pExcept){
+  BtCursor *p;
+  assert( sqlite3_mutex_held(pBt->mutex) );
+  assert( pExcept==0 || pExcept->pBt==pBt );
+  for(p=pBt->pCursor; p; p=p->pNext){
+    if( p!=pExcept && (0==iRoot || p->pgnoRoot==iRoot) &&
+        p->eState==CURSOR_VALID ){
+      int rc = saveCursorPosition(p);
+      if( SQLITE_OK!=rc ){
+        return rc;
+      }
+    }
+  }
+  return SQLITE_OK;
+}
+
+/*
+** Clear the current cursor position.
+*/
+static void clearCursorPosition(BtCursor *pCur){
+  assert( cursorHoldsMutex(pCur) );
+  sqlite3_free(pCur->pKey);
+  pCur->pKey = 0;
+  pCur->eState = CURSOR_INVALID;
+}
+
+/*
+** Restore the cursor to the position it was in (or as close to as possible)
+** when saveCursorPosition() was called. Note that this call deletes the
+** saved position info stored by saveCursorPosition(), so there can be
+** at most one effective restoreOrClearCursorPosition() call after each
+** saveCursorPosition().
+**
+** If the second argument argument - doSeek - is false, then instead of
+** returning the cursor to its saved position, any saved position is deleted
+** and the cursor state set to CURSOR_INVALID.
+*/
+int sqlite3BtreeRestoreOrClearCursorPosition(BtCursor *pCur){
+  int rc;
+  assert( cursorHoldsMutex(pCur) );
+  assert( pCur->eState>=CURSOR_REQUIRESEEK );
+  if( pCur->eState==CURSOR_FAULT ){
+    return pCur->skip;
+  }
+#ifndef SQLITE_OMIT_INCRBLOB
+  if( pCur->isIncrblobHandle ){
+    return SQLITE_ABORT;
+  }
+#endif
+  pCur->eState = CURSOR_INVALID;
+  rc = sqlite3BtreeMoveto(pCur, pCur->pKey, pCur->nKey, 0, &pCur->skip);
+  if( rc==SQLITE_OK ){
+    sqlite3_free(pCur->pKey);
+    pCur->pKey = 0;
+    assert( pCur->eState==CURSOR_VALID || pCur->eState==CURSOR_INVALID );
+  }
+  return rc;
+}
+
+#define restoreOrClearCursorPosition(p) \
+  (p->eState>=CURSOR_REQUIRESEEK ? \
+         sqlite3BtreeRestoreOrClearCursorPosition(p) : \
+         SQLITE_OK)
+
+#ifndef SQLITE_OMIT_AUTOVACUUM
+/*
+** Given a page number of a regular database page, return the page
+** number for the pointer-map page that contains the entry for the
+** input page number.
+*/
+static Pgno ptrmapPageno(BtShared *pBt, Pgno pgno){
+  int nPagesPerMapPage, iPtrMap, ret;
+  assert( sqlite3_mutex_held(pBt->mutex) );
+  nPagesPerMapPage = (pBt->usableSize/5)+1;
+  iPtrMap = (pgno-2)/nPagesPerMapPage;
+  ret = (iPtrMap*nPagesPerMapPage) + 2;
+  if( ret==PENDING_BYTE_PAGE(pBt) ){
+    ret++;
+  }
+  return ret;
+}
+
+/*
+** Write an entry into the pointer map.
+**
+** This routine updates the pointer map entry for page number 'key'
+** so that it maps to type 'eType' and parent page number 'pgno'.
+** An error code is returned if something goes wrong, otherwise SQLITE_OK.
+*/
+static int ptrmapPut(BtShared *pBt, Pgno key, u8 eType, Pgno parent){
+  DbPage *pDbPage;  /* The pointer map page */
+  u8 *pPtrmap;      /* The pointer map data */
+  Pgno iPtrmap;     /* The pointer map page number */
+  int offset;       /* Offset in pointer map page */
+  int rc;
+
+  assert( sqlite3_mutex_held(pBt->mutex) );
+  /* The master-journal page number must never be used as a pointer map page */
+  assert( 0==PTRMAP_ISPAGE(pBt, PENDING_BYTE_PAGE(pBt)) );
+
+  assert( pBt->autoVacuum );
+  if( key==0 ){
+    return SQLITE_CORRUPT_BKPT;
+  }
+  iPtrmap = PTRMAP_PAGENO(pBt, key);
+  rc = sqlite3PagerGet(pBt->pPager, iPtrmap, &pDbPage);
+  if( rc!=SQLITE_OK ){
+    return rc;
+  }
+  offset = PTRMAP_PTROFFSET(pBt, key);
+  pPtrmap = (u8 *)sqlite3PagerGetData(pDbPage);
+
+  if( eType!=pPtrmap[offset] || get4byte(&pPtrmap[offset+1])!=parent ){
+    TRACE(("PTRMAP_UPDATE: %d->(%d,%d)\n", key, eType, parent));
+    rc = sqlite3PagerWrite(pDbPage);
+    if( rc==SQLITE_OK ){
+      pPtrmap[offset] = eType;
+      put4byte(&pPtrmap[offset+1], parent);
+    }
+  }
+
+  sqlite3PagerUnref(pDbPage);
+  return rc;
+}
+
+/*
+** Read an entry from the pointer map.
+**
+** This routine retrieves the pointer map entry for page 'key', writing
+** the type and parent page number to *pEType and *pPgno respectively.
+** An error code is returned if something goes wrong, otherwise SQLITE_OK.
+*/
+static int ptrmapGet(BtShared *pBt, Pgno key, u8 *pEType, Pgno *pPgno){
+  DbPage *pDbPage;   /* The pointer map page */
+  int iPtrmap;       /* Pointer map page index */
+  u8 *pPtrmap;       /* Pointer map page data */
+  int offset;        /* Offset of entry in pointer map */
+  int rc;
+
+  assert( sqlite3_mutex_held(pBt->mutex) );
+
+  iPtrmap = PTRMAP_PAGENO(pBt, key);
+  rc = sqlite3PagerGet(pBt->pPager, iPtrmap, &pDbPage);
+  if( rc!=0 ){
+    return rc;
+  }
+  pPtrmap = (u8 *)sqlite3PagerGetData(pDbPage);
+
+  offset = PTRMAP_PTROFFSET(pBt, key);
+  assert( pEType!=0 );
+  *pEType = pPtrmap[offset];
+  if( pPgno ) *pPgno = get4byte(&pPtrmap[offset+1]);
+
+  sqlite3PagerUnref(pDbPage);
+  if( *pEType<1 || *pEType>5 ) return SQLITE_CORRUPT_BKPT;
+  return SQLITE_OK;
+}
+
+#endif /* SQLITE_OMIT_AUTOVACUUM */
+
+/*
+** Given a btree page and a cell index (0 means the first cell on
+** the page, 1 means the second cell, and so forth) return a pointer
+** to the cell content.
+**
+** This routine works only for pages that do not contain overflow cells.
+*/
+#define findCell(pPage, iCell) \
+  ((pPage)->aData + get2byte(&(pPage)->aData[(pPage)->cellOffset+2*(iCell)]))
+#ifdef SQLITE_TEST
+u8 *sqlite3BtreeFindCell(MemPage *pPage, int iCell){
+  assert( iCell>=0 );
+  assert( iCell<get2byte(&pPage->aData[pPage->hdrOffset+3]) );
+  return findCell(pPage, iCell);
+}
+#endif
+
+/*
+** This a more complex version of sqlite3BtreeFindCell() that works for
+** pages that do contain overflow cells.  See insert
+*/
+static u8 *findOverflowCell(MemPage *pPage, int iCell){
+  int i;
+  assert( sqlite3_mutex_held(pPage->pBt->mutex) );
+  for(i=pPage->nOverflow-1; i>=0; i--){
+    int k;
+    struct _OvflCell *pOvfl;
+    pOvfl = &pPage->aOvfl[i];
+    k = pOvfl->idx;
+    if( k<=iCell ){
+      if( k==iCell ){
+        return pOvfl->pCell;
+      }
+      iCell--;
+    }
+  }
+  return findCell(pPage, iCell);
+}
+
+/*
+** Parse a cell content block and fill in the CellInfo structure.  There
+** are two versions of this function.  sqlite3BtreeParseCell() takes a
+** cell index as the second argument and sqlite3BtreeParseCellPtr()
+** takes a pointer to the body of the cell as its second argument.
+**
+** Within this file, the parseCell() macro can be called instead of
+** sqlite3BtreeParseCellPtr(). Using some compilers, this will be faster.
+*/
+void sqlite3BtreeParseCellPtr(
+  MemPage *pPage,         /* Page containing the cell */
+  u8 *pCell,              /* Pointer to the cell text. */
+  CellInfo *pInfo         /* Fill in this structure */
+){
+  int n;                  /* Number bytes in cell content header */
+  u32 nPayload;           /* Number of bytes of cell payload */
+
+  assert( sqlite3_mutex_held(pPage->pBt->mutex) );
+
+  pInfo->pCell = pCell;
+  assert( pPage->leaf==0 || pPage->leaf==1 );
+  n = pPage->childPtrSize;
+  assert( n==4-4*pPage->leaf );
+  if( pPage->hasData ){
+    n += getVarint32(&pCell[n], &nPayload);
+  }else{
+    nPayload = 0;
+  }
+  pInfo->nData = nPayload;
+  if( pPage->intKey ){
+    n += getVarint(&pCell[n], (u64 *)&pInfo->nKey);
+  }else{
+    u32 x;
+    n += getVarint32(&pCell[n], &x);
+    pInfo->nKey = x;
+    nPayload += x;
+  }
+  pInfo->nPayload = nPayload;
+  pInfo->nHeader = n;
+  if( nPayload<=pPage->maxLocal ){
+    /* This is the (easy) common case where the entire payload fits
+    ** on the local page.  No overflow is required.
+    */
+    int nSize;          /* Total size of cell content in bytes */
+    pInfo->nLocal = nPayload;
+    pInfo->iOverflow = 0;
+    nSize = nPayload + n;
+    if( nSize<4 ){
+      nSize = 4;        /* Minimum cell size is 4 */
+    }
+    pInfo->nSize = nSize;
+  }else{
+    /* If the payload will not fit completely on the local page, we have
+    ** to decide how much to store locally and how much to spill onto
+    ** overflow pages.  The strategy is to minimize the amount of unused
+    ** space on overflow pages while keeping the amount of local storage
+    ** in between minLocal and maxLocal.
+    **
+    ** Warning:  changing the way overflow payload is distributed in any
+    ** way will result in an incompatible file format.
+    */
+    int minLocal;  /* Minimum amount of payload held locally */
+    int maxLocal;  /* Maximum amount of payload held locally */
+    int surplus;   /* Overflow payload available for local storage */
+
+    minLocal = pPage->minLocal;
+    maxLocal = pPage->maxLocal;
+    surplus = minLocal + (nPayload - minLocal)%(pPage->pBt->usableSize - 4);
+    if( surplus <= maxLocal ){
+      pInfo->nLocal = surplus;
+    }else{
+      pInfo->nLocal = minLocal;
+    }
+    pInfo->iOverflow = pInfo->nLocal + n;
+    pInfo->nSize = pInfo->iOverflow + 4;
+  }
+}
+#define parseCell(pPage, iCell, pInfo) \
+  sqlite3BtreeParseCellPtr((pPage), findCell((pPage), (iCell)), (pInfo))
+void sqlite3BtreeParseCell(
+  MemPage *pPage,         /* Page containing the cell */
+  int iCell,              /* The cell index.  First cell is 0 */
+  CellInfo *pInfo         /* Fill in this structure */
+){
+  parseCell(pPage, iCell, pInfo);
+}
+
+/*
+** Compute the total number of bytes that a Cell needs in the cell
+** data area of the btree-page.  The return number includes the cell
+** data header and the local payload, but not any overflow page or
+** the space used by the cell pointer.
+*/
+#ifndef NDEBUG
+static u16 cellSize(MemPage *pPage, int iCell){
+  CellInfo info;
+  sqlite3BtreeParseCell(pPage, iCell, &info);
+  return info.nSize;
+}
+#endif
+static u16 cellSizePtr(MemPage *pPage, u8 *pCell){
+  CellInfo info;
+  sqlite3BtreeParseCellPtr(pPage, pCell, &info);
+  return info.nSize;
+}
+
+#ifndef SQLITE_OMIT_AUTOVACUUM
+/*
+** If the cell pCell, part of page pPage contains a pointer
+** to an overflow page, insert an entry into the pointer-map
+** for the overflow page.
+*/
+static int ptrmapPutOvflPtr(MemPage *pPage, u8 *pCell){
+  if( pCell ){
+    CellInfo info;
+    sqlite3BtreeParseCellPtr(pPage, pCell, &info);
+    assert( (info.nData+(pPage->intKey?0:info.nKey))==info.nPayload );
+    if( (info.nData+(pPage->intKey?0:info.nKey))>info.nLocal ){
+      Pgno ovfl = get4byte(&pCell[info.iOverflow]);
+      return ptrmapPut(pPage->pBt, ovfl, PTRMAP_OVERFLOW1, pPage->pgno);
+    }
+  }
+  return SQLITE_OK;
+}
+/*
+** If the cell with index iCell on page pPage contains a pointer
+** to an overflow page, insert an entry into the pointer-map
+** for the overflow page.
+*/
+static int ptrmapPutOvfl(MemPage *pPage, int iCell){
+  u8 *pCell;
+  assert( sqlite3_mutex_held(pPage->pBt->mutex) );
+  pCell = findOverflowCell(pPage, iCell);
+  return ptrmapPutOvflPtr(pPage, pCell);
+}
+#endif
+
+
+/*
+** Defragment the page given.  All Cells are moved to the
+** end of the page and all free space is collected into one
+** big FreeBlk that occurs in between the header and cell
+** pointer array and the cell content area.
+*/
+static int defragmentPage(MemPage *pPage){
+  int i;                     /* Loop counter */
+  int pc;                    /* Address of a i-th cell */
+  int addr;                  /* Offset of first byte after cell pointer array */
+  int hdr;                   /* Offset to the page header */
+  int size;                  /* Size of a cell */
+  int usableSize;            /* Number of usable bytes on a page */
+  int cellOffset;            /* Offset to the cell pointer array */
+  int brk;                   /* Offset to the cell content area */
+  int nCell;                 /* Number of cells on the page */
+  unsigned char *data;       /* The page data */
+  unsigned char *temp;       /* Temp area for cell content */
+
+  assert( sqlite3PagerIswriteable(pPage->pDbPage) );
+  assert( pPage->pBt!=0 );
+  assert( pPage->pBt->usableSize <= SQLITE_MAX_PAGE_SIZE );
+  assert( pPage->nOverflow==0 );
+  assert( sqlite3_mutex_held(pPage->pBt->mutex) );
+  temp = sqlite3PagerTempSpace(pPage->pBt->pPager);
+  data = pPage->aData;
+  hdr = pPage->hdrOffset;
+  cellOffset = pPage->cellOffset;
+  nCell = pPage->nCell;
+  assert( nCell==get2byte(&data[hdr+3]) );
+  usableSize = pPage->pBt->usableSize;
+  brk = get2byte(&data[hdr+5]);
+  memcpy(&temp[brk], &data[brk], usableSize - brk);
+  brk = usableSize;
+  for(i=0; i<nCell; i++){
+    u8 *pAddr;     /* The i-th cell pointer */
+    pAddr = &data[cellOffset + i*2];
+    pc = get2byte(pAddr);
+    assert( pc<pPage->pBt->usableSize );
+    size = cellSizePtr(pPage, &temp[pc]);
+    brk -= size;
+    memcpy(&data[brk], &temp[pc], size);
+    put2byte(pAddr, brk);
+  }
+  assert( brk>=cellOffset+2*nCell );
+  put2byte(&data[hdr+5], brk);
+  data[hdr+1] = 0;
+  data[hdr+2] = 0;
+  data[hdr+7] = 0;
+  addr = cellOffset+2*nCell;
+  memset(&data[addr], 0, brk-addr);
+  return SQLITE_OK;
+}
+
+/*
+** Allocate nByte bytes of space on a page.
+**
+** Return the index into pPage->aData[] of the first byte of
+** the new allocation. Or return 0 if there is not enough free
+** space on the page to satisfy the allocation request.
+**
+** If the page contains nBytes of free space but does not contain
+** nBytes of contiguous free space, then this routine automatically
+** calls defragementPage() to consolidate all free space before
+** allocating the new chunk.
+*/
+static int allocateSpace(MemPage *pPage, int nByte){
+  int addr, pc, hdr;
+  int size;
+  int nFrag;
+  int top;
+  int nCell;
+  int cellOffset;
+  unsigned char *data;
+
+  data = pPage->aData;
+  assert( sqlite3PagerIswriteable(pPage->pDbPage) );
+  assert( pPage->pBt );
+  assert( sqlite3_mutex_held(pPage->pBt->mutex) );
+  if( nByte<4 ) nByte = 4;
+  if( pPage->nFree<nByte || pPage->nOverflow>0 ) return 0;
+  pPage->nFree -= nByte;
+  hdr = pPage->hdrOffset;
+
+  nFrag = data[hdr+7];
+  if( nFrag<60 ){
+    /* Search the freelist looking for a slot big enough to satisfy the
+    ** space request. */
+    addr = hdr+1;
+    while( (pc = get2byte(&data[addr]))>0 ){
+      size = get2byte(&data[pc+2]);
+      if( size>=nByte ){
+        if( size<nByte+4 ){
+          memcpy(&data[addr], &data[pc], 2);
+          data[hdr+7] = nFrag + size - nByte;
+          return pc;
+        }else{
+          put2byte(&data[pc+2], size-nByte);
+          return pc + size - nByte;
+        }
+      }
+      addr = pc;
+    }
+  }
+
+  /* Allocate memory from the gap in between the cell pointer array
+  ** and the cell content area.
+  */
+  top = get2byte(&data[hdr+5]);
+  nCell = get2byte(&data[hdr+3]);
+  cellOffset = pPage->cellOffset;
+  if( nFrag>=60 || cellOffset + 2*nCell > top - nByte ){
+    if( defragmentPage(pPage) ) return 0;
+    top = get2byte(&data[hdr+5]);
+  }
+  top -= nByte;
+  assert( cellOffset + 2*nCell <= top );
+  put2byte(&data[hdr+5], top);
+  return top;
+}
+
+/*
+** Return a section of the pPage->aData to the freelist.
+** The first byte of the new free block is pPage->aDisk[start]
+** and the size of the block is "size" bytes.
+**
+** Most of the effort here is involved in coalesing adjacent
+** free blocks into a single big free block.
+*/
+static void freeSpace(MemPage *pPage, int start, int size){
+  int addr, pbegin, hdr;
+  unsigned char *data = pPage->aData;
+
+  assert( pPage->pBt!=0 );
+  assert( sqlite3PagerIswriteable(pPage->pDbPage) );
+  assert( start>=pPage->hdrOffset+6+(pPage->leaf?0:4) );
+  assert( (start + size)<=pPage->pBt->usableSize );
+  assert( sqlite3_mutex_held(pPage->pBt->mutex) );
+  if( size<4 ) size = 4;
+
+#ifdef SQLITE_SECURE_DELETE
+  /* Overwrite deleted information with zeros when the SECURE_DELETE
+  ** option is enabled at compile-time */
+  memset(&data[start], 0, size);
+#endif
+
+  /* Add the space back into the linked list of freeblocks */
+  hdr = pPage->hdrOffset;
+  addr = hdr + 1;
+  while( (pbegin = get2byte(&data[addr]))<start && pbegin>0 ){
+    assert( pbegin<=pPage->pBt->usableSize-4 );
+    assert( pbegin>addr );
+    addr = pbegin;
+  }
+  assert( pbegin<=pPage->pBt->usableSize-4 );
+  assert( pbegin>addr || pbegin==0 );
+  put2byte(&data[addr], start);
+  put2byte(&data[start], pbegin);
+  put2byte(&data[start+2], size);
+  pPage->nFree += size;
+
+  /* Coalesce adjacent free blocks */
+  addr = pPage->hdrOffset + 1;
+  while( (pbegin = get2byte(&data[addr]))>0 ){
+    int pnext, psize;
+    assert( pbegin>addr );
+    assert( pbegin<=pPage->pBt->usableSize-4 );
+    pnext = get2byte(&data[pbegin]);
+    psize = get2byte(&data[pbegin+2]);
+    if( pbegin + psize + 3 >= pnext && pnext>0 ){
+      int frag = pnext - (pbegin+psize);
+      assert( frag<=data[pPage->hdrOffset+7] );
+      data[pPage->hdrOffset+7] -= frag;
+      put2byte(&data[pbegin], get2byte(&data[pnext]));
+      put2byte(&data[pbegin+2], pnext+get2byte(&data[pnext+2])-pbegin);
+    }else{
+      addr = pbegin;
+    }
+  }
+
+  /* If the cell content area begins with a freeblock, remove it. */
+  if( data[hdr+1]==data[hdr+5] && data[hdr+2]==data[hdr+6] ){
+    int top;
+    pbegin = get2byte(&data[hdr+1]);
+    memcpy(&data[hdr+1], &data[pbegin], 2);
+    top = get2byte(&data[hdr+5]);
+    put2byte(&data[hdr+5], top + get2byte(&data[pbegin+2]));
+  }
+}
+
+/*
+** Decode the flags byte (the first byte of the header) for a page
+** and initialize fields of the MemPage structure accordingly.
+*/
+static void decodeFlags(MemPage *pPage, int flagByte){
+  BtShared *pBt;     /* A copy of pPage->pBt */
+
+  assert( pPage->hdrOffset==(pPage->pgno==1 ? 100 : 0) );
+  assert( sqlite3_mutex_held(pPage->pBt->mutex) );
+  pPage->intKey = (flagByte & (PTF_INTKEY|PTF_LEAFDATA))!=0;
+  pPage->zeroData = (flagByte & PTF_ZERODATA)!=0;
+  pPage->leaf = (flagByte & PTF_LEAF)!=0;
+  pPage->childPtrSize = 4*(pPage->leaf==0);
+  pBt = pPage->pBt;
+  if( flagByte & PTF_LEAFDATA ){
+    pPage->leafData = 1;
+    pPage->maxLocal = pBt->maxLeaf;
+    pPage->minLocal = pBt->minLeaf;
+  }else{
+    pPage->leafData = 0;
+    pPage->maxLocal = pBt->maxLocal;
+    pPage->minLocal = pBt->minLocal;
+  }
+  pPage->hasData = !(pPage->zeroData || (!pPage->leaf && pPage->leafData));
+}
+
+/*
+** Initialize the auxiliary information for a disk block.
+**
+** The pParent parameter must be a pointer to the MemPage which
+** is the parent of the page being initialized.  The root of a
+** BTree has no parent and so for that page, pParent==NULL.
+**
+** Return SQLITE_OK on success.  If we see that the page does
+** not contain a well-formed database page, then return
+** SQLITE_CORRUPT.  Note that a return of SQLITE_OK does not
+** guarantee that the page is well-formed.  It only shows that
+** we failed to detect any corruption.
+*/
+int sqlite3BtreeInitPage(
+  MemPage *pPage,        /* The page to be initialized */
+  MemPage *pParent       /* The parent.  Might be NULL */
+){
+  int pc;            /* Address of a freeblock within pPage->aData[] */
+  int hdr;           /* Offset to beginning of page header */
+  u8 *data;          /* Equal to pPage->aData */
+  BtShared *pBt;        /* The main btree structure */
+  int usableSize;    /* Amount of usable space on each page */
+  int cellOffset;    /* Offset from start of page to first cell pointer */
+  int nFree;         /* Number of unused bytes on the page */
+  int top;           /* First byte of the cell content area */
+
+  pBt = pPage->pBt;
+  assert( pBt!=0 );
+  assert( pParent==0 || pParent->pBt==pBt );
+  assert( sqlite3_mutex_held(pBt->mutex) );
+  assert( pPage->pgno==sqlite3PagerPagenumber(pPage->pDbPage) );
+  assert( pPage == sqlite3PagerGetExtra(pPage->pDbPage) );
+  assert( pPage->aData == sqlite3PagerGetData(pPage->pDbPage) );
+  if( pPage->pParent!=pParent && (pPage->pParent!=0 || pPage->isInit) ){
+    /* The parent page should never change unless the file is corrupt */
+    return SQLITE_CORRUPT_BKPT;
+  }
+  if( pPage->isInit ) return SQLITE_OK;
+  if( pPage->pParent==0 && pParent!=0 ){
+    pPage->pParent = pParent;
+    sqlite3PagerRef(pParent->pDbPage);
+  }
+  hdr = pPage->hdrOffset;
+  data = pPage->aData;
+  decodeFlags(pPage, data[hdr]);
+  pPage->nOverflow = 0;
+  pPage->idxShift = 0;
+  usableSize = pBt->usableSize;
+  pPage->cellOffset = cellOffset = hdr + 12 - 4*pPage->leaf;
+  top = get2byte(&data[hdr+5]);
+  pPage->nCell = get2byte(&data[hdr+3]);
+  if( pPage->nCell>MX_CELL(pBt) ){
+    /* To many cells for a single page.  The page must be corrupt */
+    return SQLITE_CORRUPT_BKPT;
+  }
+  if( pPage->nCell==0 && pParent!=0 && pParent->pgno!=1 ){
+    /* All pages must have at least one cell, except for root pages */
+    return SQLITE_CORRUPT_BKPT;
+  }
+
+  /* Compute the total free space on the page */
+  pc = get2byte(&data[hdr+1]);
+  nFree = data[hdr+7] + top - (cellOffset + 2*pPage->nCell);
+  while( pc>0 ){
+    int next, size;
+    if( pc>usableSize-4 ){
+      /* Free block is off the page */
+      return SQLITE_CORRUPT_BKPT;
+    }
+    next = get2byte(&data[pc]);
+    size = get2byte(&data[pc+2]);
+    if( next>0 && next<=pc+size+3 ){
+      /* Free blocks must be in accending order */
+      return SQLITE_CORRUPT_BKPT;
+    }
+    nFree += size;
+    pc = next;
+  }
+  pPage->nFree = nFree;
+  if( nFree>=usableSize ){
+    /* Free space cannot exceed total page size */
+    return SQLITE_CORRUPT_BKPT;
+  }
+
+  pPage->isInit = 1;
+  return SQLITE_OK;
+}
+
+/*
+** Set up a raw page so that it looks like a database page holding
+** no entries.
+*/
+static void zeroPage(MemPage *pPage, int flags){
+  unsigned char *data = pPage->aData;
+  BtShared *pBt = pPage->pBt;
+  int hdr = pPage->hdrOffset;
+  int first;
+
+  assert( sqlite3PagerPagenumber(pPage->pDbPage)==pPage->pgno );
+  assert( sqlite3PagerGetExtra(pPage->pDbPage) == (void*)pPage );
+  assert( sqlite3PagerGetData(pPage->pDbPage) == data );
+  assert( sqlite3PagerIswriteable(pPage->pDbPage) );
+  assert( sqlite3_mutex_held(pBt->mutex) );
+  memset(&data[hdr], 0, pBt->usableSize - hdr);
+  data[hdr] = flags;
+  first = hdr + 8 + 4*((flags&PTF_LEAF)==0);
+  memset(&data[hdr+1], 0, 4);
+  data[hdr+7] = 0;
+  put2byte(&data[hdr+5], pBt->usableSize);
+  pPage->nFree = pBt->usableSize - first;
+  decodeFlags(pPage, flags);
+  pPage->hdrOffset = hdr;
+  pPage->cellOffset = first;
+  pPage->nOverflow = 0;
+  pPage->idxShift = 0;
+  pPage->nCell = 0;
+  pPage->isInit = 1;
+}
+
+/*
+** Get a page from the pager.  Initialize the MemPage.pBt and
+** MemPage.aData elements if needed.
+**
+** If the noContent flag is set, it means that we do not care about
+** the content of the page at this time.  So do not go to the disk
+** to fetch the content.  Just fill in the content with zeros for now.
+** If in the future we call sqlite3PagerWrite() on this page, that
+** means we have started to be concerned about content and the disk
+** read should occur at that point.
+*/
+int sqlite3BtreeGetPage(
+  BtShared *pBt,       /* The btree */
+  Pgno pgno,           /* Number of the page to fetch */
+  MemPage **ppPage,    /* Return the page in this parameter */
+  int noContent        /* Do not load page content if true */
+){
+  int rc;
+  MemPage *pPage;
+  DbPage *pDbPage;
+
+  assert( sqlite3_mutex_held(pBt->mutex) );
+  rc = sqlite3PagerAcquire(pBt->pPager, pgno, (DbPage**)&pDbPage, noContent);
+  if( rc ) return rc;
+  pPage = (MemPage *)sqlite3PagerGetExtra(pDbPage);
+  pPage->aData = sqlite3PagerGetData(pDbPage);
+  pPage->pDbPage = pDbPage;
+  pPage->pBt = pBt;
+  pPage->pgno = pgno;
+  pPage->hdrOffset = pPage->pgno==1 ? 100 : 0;
+  *ppPage = pPage;
+  return SQLITE_OK;
+}
+
+/*
+** Get a page from the pager and initialize it.  This routine
+** is just a convenience wrapper around separate calls to
+** sqlite3BtreeGetPage() and sqlite3BtreeInitPage().
+*/
+static int getAndInitPage(
+  BtShared *pBt,          /* The database file */
+  Pgno pgno,           /* Number of the page to get */
+  MemPage **ppPage,    /* Write the page pointer here */
+  MemPage *pParent     /* Parent of the page */
+){
+  int rc;
+  assert( sqlite3_mutex_held(pBt->mutex) );
+  if( pgno==0 ){
+    return SQLITE_CORRUPT_BKPT;
+  }
+  rc = sqlite3BtreeGetPage(pBt, pgno, ppPage, 0);
+  if( rc==SQLITE_OK && (*ppPage)->isInit==0 ){
+    rc = sqlite3BtreeInitPage(*ppPage, pParent);
+  }
+  return rc;
+}
+
+/*
+** Release a MemPage.  This should be called once for each prior
+** call to sqlite3BtreeGetPage.
+*/
+static void releasePage(MemPage *pPage){
+  if( pPage ){
+    assert( pPage->aData );
+    assert( pPage->pBt );
+    assert( sqlite3PagerGetExtra(pPage->pDbPage) == (void*)pPage );
+    assert( sqlite3PagerGetData(pPage->pDbPage)==pPage->aData );
+    assert( sqlite3_mutex_held(pPage->pBt->mutex) );
+    sqlite3PagerUnref(pPage->pDbPage);
+  }
+}
+
+/*
+** This routine is called when the reference count for a page
+** reaches zero.  We need to unref the pParent pointer when that
+** happens.
+*/
+static void pageDestructor(DbPage *pData, int pageSize){
+  MemPage *pPage;
+  assert( (pageSize & 7)==0 );
+  pPage = (MemPage *)sqlite3PagerGetExtra(pData);
+  assert( pPage->isInit==0 || sqlite3_mutex_held(pPage->pBt->mutex) );
+  if( pPage->pParent ){
+    MemPage *pParent = pPage->pParent;
+    assert( pParent->pBt==pPage->pBt );
+    pPage->pParent = 0;
+    releasePage(pParent);
+  }
+  pPage->isInit = 0;
+}
+
+/*
+** During a rollback, when the pager reloads information into the cache
+** so that the cache is restored to its original state at the start of
+** the transaction, for each page restored this routine is called.
+**
+** This routine needs to reset the extra data section at the end of the
+** page to agree with the restored data.
+*/
+static void pageReinit(DbPage *pData, int pageSize){
+  MemPage *pPage;
+  assert( (pageSize & 7)==0 );
+  pPage = (MemPage *)sqlite3PagerGetExtra(pData);
+  if( pPage->isInit ){
+    assert( sqlite3_mutex_held(pPage->pBt->mutex) );
+    pPage->isInit = 0;
+    sqlite3BtreeInitPage(pPage, pPage->pParent);
+  }
+}
+
+/*
+** Invoke the busy handler for a btree.
+*/
+static int sqlite3BtreeInvokeBusyHandler(void *pArg, int n){
+  BtShared *pBt = (BtShared*)pArg;
+  assert( pBt->db );
+  assert( sqlite3_mutex_held(pBt->db->mutex) );
+  return sqlite3InvokeBusyHandler(&pBt->db->busyHandler);
+}
+
+/*
+** Open a database file.
+**
+** zFilename is the name of the database file.  If zFilename is NULL
+** a new database with a random name is created.  This randomly named
+** database file will be deleted when sqlite3BtreeClose() is called.
+** If zFilename is ":memory:" then an in-memory database is created
+** that is automatically destroyed when it is closed.
+*/
+int sqlite3BtreeOpen(
+  const char *zFilename,  /* Name of the file containing the BTree database */
+  sqlite3 *db,            /* Associated database handle */
+  Btree **ppBtree,        /* Pointer to new Btree object written here */
+  int flags,              /* Options */
+  int vfsFlags            /* Flags passed through to sqlite3_vfs.xOpen() */
+){
+  sqlite3_vfs *pVfs;      /* The VFS to use for this btree */
+  BtShared *pBt = 0;      /* Shared part of btree structure */
+  Btree *p;               /* Handle to return */
+  int rc = SQLITE_OK;
+  int nReserve;
+  unsigned char zDbHeader[100];
+
+  /* Set the variable isMemdb to true for an in-memory database, or
+  ** false for a file-based database. This symbol is only required if
+  ** either of the shared-data or autovacuum features are compiled
+  ** into the library.
+  */
+#if !defined(SQLITE_OMIT_SHARED_CACHE) || !defined(SQLITE_OMIT_AUTOVACUUM)
+  #ifdef SQLITE_OMIT_MEMORYDB
+    const int isMemdb = 0;
+  #else
+    const int isMemdb = zFilename && !strcmp(zFilename, ":memory:");
+  #endif
+#endif
+
+  assert( db!=0 );
+  assert( sqlite3_mutex_held(db->mutex) );
+
+  pVfs = db->pVfs;
+  p = sqlite3MallocZero(sizeof(Btree));
+  if( !p ){
+    return SQLITE_NOMEM;
+  }
+  p->inTrans = TRANS_NONE;
+  p->db = db;
+
+#if !defined(SQLITE_OMIT_SHARED_CACHE) && !defined(SQLITE_OMIT_DISKIO)
+  /*
+  ** If this Btree is a candidate for shared cache, try to find an
+  ** existing BtShared object that we can share with
+  */
+  if( (flags & BTREE_PRIVATE)==0
+   && isMemdb==0
+   && (db->flags & SQLITE_Vtab)==0
+   && zFilename && zFilename[0]
+  ){
+    if( sqlite3SharedCacheEnabled ){
+      int nFullPathname = pVfs->mxPathname+1;
+      char *zFullPathname = (char *)sqlite3_malloc(nFullPathname);
+      sqlite3_mutex *mutexShared;
+      p->sharable = 1;
+      if( db ){
+        db->flags |= SQLITE_SharedCache;
+      }
+      if( !zFullPathname ){
+        sqlite3_free(p);
+        return SQLITE_NOMEM;
+      }
+      sqlite3OsFullPathname(pVfs, zFilename, nFullPathname, zFullPathname);
+      mutexShared = sqlite3_mutex_alloc(SQLITE_MUTEX_STATIC_MASTER);
+      sqlite3_mutex_enter(mutexShared);
+      for(pBt=sqlite3SharedCacheList; pBt; pBt=pBt->pNext){
+        assert( pBt->nRef>0 );
+        if( 0==strcmp(zFullPathname, sqlite3PagerFilename(pBt->pPager))
+                 && sqlite3PagerVfs(pBt->pPager)==pVfs ){
+          p->pBt = pBt;
+          pBt->nRef++;
+          break;
+        }
+      }
+      sqlite3_mutex_leave(mutexShared);
+      sqlite3_free(zFullPathname);
+    }
+#ifdef SQLITE_DEBUG
+    else{
+      /* In debug mode, we mark all persistent databases as sharable
+      ** even when they are not.  This exercises the locking code and
+      ** gives more opportunity for asserts(sqlite3_mutex_held())
+      ** statements to find locking problems.
+      */
+      p->sharable = 1;
+    }
+#endif
+  }
+#endif
+  if( pBt==0 ){
+    /*
+    ** The following asserts make sure that structures used by the btree are
+    ** the right size.  This is to guard against size changes that result
+    ** when compiling on a different architecture.
+    */
+    assert( sizeof(i64)==8 || sizeof(i64)==4 );
+    assert( sizeof(u64)==8 || sizeof(u64)==4 );
+    assert( sizeof(u32)==4 );
+    assert( sizeof(u16)==2 );
+    assert( sizeof(Pgno)==4 );
+
+    pBt = sqlite3MallocZero( sizeof(*pBt) );
+    if( pBt==0 ){
+      rc = SQLITE_NOMEM;
+      goto btree_open_out;
+    }
+    pBt->busyHdr.xFunc = sqlite3BtreeInvokeBusyHandler;
+    pBt->busyHdr.pArg = pBt;
+    rc = sqlite3PagerOpen(pVfs, &pBt->pPager, zFilename,
+                          EXTRA_SIZE, flags, vfsFlags);
+    if( rc==SQLITE_OK ){
+      rc = sqlite3PagerReadFileheader(pBt->pPager,sizeof(zDbHeader),zDbHeader);
+    }
+    if( rc!=SQLITE_OK ){
+      goto btree_open_out;
+    }
+    sqlite3PagerSetBusyhandler(pBt->pPager, &pBt->busyHdr);
+    p->pBt = pBt;
+
+    sqlite3PagerSetDestructor(pBt->pPager, pageDestructor);
+    sqlite3PagerSetReiniter(pBt->pPager, pageReinit);
+    pBt->pCursor = 0;
+    pBt->pPage1 = 0;
+    pBt->readOnly = sqlite3PagerIsreadonly(pBt->pPager);
+    pBt->pageSize = get2byte(&zDbHeader[16]);
+    if( pBt->pageSize<512 || pBt->pageSize>SQLITE_MAX_PAGE_SIZE
+         || ((pBt->pageSize-1)&pBt->pageSize)!=0 ){
+      pBt->pageSize = 0;
+      sqlite3PagerSetPagesize(pBt->pPager, &pBt->pageSize);
+      pBt->maxEmbedFrac = 64;   /* 25% */
+      pBt->minEmbedFrac = 32;   /* 12.5% */
+      pBt->minLeafFrac = 32;    /* 12.5% */
+#ifndef SQLITE_OMIT_AUTOVACUUM
+      /* If the magic name ":memory:" will create an in-memory database, then
+      ** leave the autoVacuum mode at 0 (do not auto-vacuum), even if
+      ** SQLITE_DEFAULT_AUTOVACUUM is true. On the other hand, if
+      ** SQLITE_OMIT_MEMORYDB has been defined, then ":memory:" is just a
+      ** regular file-name. In this case the auto-vacuum applies as per normal.
+      */
+      if( zFilename && !isMemdb ){
+        pBt->autoVacuum = (SQLITE_DEFAULT_AUTOVACUUM ? 1 : 0);
+        pBt->incrVacuum = (SQLITE_DEFAULT_AUTOVACUUM==2 ? 1 : 0);
+      }
+#endif
+      nReserve = 0;
+    }else{
+      nReserve = zDbHeader[20];
+      pBt->maxEmbedFrac = zDbHeader[21];
+      pBt->minEmbedFrac = zDbHeader[22];
+      pBt->minLeafFrac = zDbHeader[23];
+      pBt->pageSizeFixed = 1;
+#ifndef SQLITE_OMIT_AUTOVACUUM
+      pBt->autoVacuum = (get4byte(&zDbHeader[36 + 4*4])?1:0);
+      pBt->incrVacuum = (get4byte(&zDbHeader[36 + 7*4])?1:0);
+#endif
+    }
+    pBt->usableSize = pBt->pageSize - nReserve;
+    assert( (pBt->pageSize & 7)==0 );  /* 8-byte alignment of pageSize */
+    sqlite3PagerSetPagesize(pBt->pPager, &pBt->pageSize);
+
+#if !defined(SQLITE_OMIT_SHARED_CACHE) && !defined(SQLITE_OMIT_DISKIO)
+    /* Add the new BtShared object to the linked list sharable BtShareds.
+    */
+    if( p->sharable ){
+      sqlite3_mutex *mutexShared;
+      pBt->nRef = 1;
+      mutexShared = sqlite3_mutex_alloc(SQLITE_MUTEX_STATIC_MASTER);
+      if( SQLITE_THREADSAFE ){
+        pBt->mutex = sqlite3_mutex_alloc(SQLITE_MUTEX_FAST);
+        if( pBt->mutex==0 ){
+          rc = SQLITE_NOMEM;
+          db->mallocFailed = 0;
+          goto btree_open_out;
+        }
+      }
+      sqlite3_mutex_enter(mutexShared);
+      pBt->pNext = sqlite3SharedCacheList;
+      sqlite3SharedCacheList = pBt;
+      sqlite3_mutex_leave(mutexShared);
+    }
+#endif
+  }
+
+#if !defined(SQLITE_OMIT_SHARED_CACHE) && !defined(SQLITE_OMIT_DISKIO)
+  /* If the new Btree uses a sharable pBtShared, then link the new
+  ** Btree into the list of all sharable Btrees for the same connection.
+  ** The list is kept in ascending order by pBt address.
+  */
+  if( p->sharable ){
+    int i;
+    Btree *pSib;
+    for(i=0; i<db->nDb; i++){
+      if( (pSib = db->aDb[i].pBt)!=0 && pSib->sharable ){
+        while( pSib->pPrev ){ pSib = pSib->pPrev; }
+        if( p->pBt<pSib->pBt ){
+          p->pNext = pSib;
+          p->pPrev = 0;
+          pSib->pPrev = p;
+        }else{
+          while( pSib->pNext && pSib->pNext->pBt<p->pBt ){
+            pSib = pSib->pNext;
+          }
+          p->pNext = pSib->pNext;
+          p->pPrev = pSib;
+          if( p->pNext ){
+            p->pNext->pPrev = p;
+          }
+          pSib->pNext = p;
+        }
+        break;
+      }
+    }
+  }
+#endif
+  *ppBtree = p;
+
+btree_open_out:
+  if( rc!=SQLITE_OK ){
+    if( pBt && pBt->pPager ){
+      sqlite3PagerClose(pBt->pPager);
+    }
+    sqlite3_free(pBt);
+    sqlite3_free(p);
+    *ppBtree = 0;
+  }
+  return rc;
+}
+
+/*
+** Decrement the BtShared.nRef counter.  When it reaches zero,
+** remove the BtShared structure from the sharing list.  Return
+** true if the BtShared.nRef counter reaches zero and return
+** false if it is still positive.
+*/
+static int removeFromSharingList(BtShared *pBt){
+#ifndef SQLITE_OMIT_SHARED_CACHE
+  sqlite3_mutex *pMaster;
+  BtShared *pList;
+  int removed = 0;
+
+  assert( sqlite3_mutex_notheld(pBt->mutex) );
+  pMaster = sqlite3_mutex_alloc(SQLITE_MUTEX_STATIC_MASTER);
+  sqlite3_mutex_enter(pMaster);
+  pBt->nRef--;
+  if( pBt->nRef<=0 ){
+    if( sqlite3SharedCacheList==pBt ){
+      sqlite3SharedCacheList = pBt->pNext;
+    }else{
+      pList = sqlite3SharedCacheList;
+      while( pList && pList->pNext!=pBt ){
+        pList=pList->pNext;
+      }
+      if( pList ){
+        pList->pNext = pBt->pNext;
+      }
+    }
+    if( SQLITE_THREADSAFE ){
+      sqlite3_mutex_free(pBt->mutex);
+    }
+    removed = 1;
+  }
+  sqlite3_mutex_leave(pMaster);
+  return removed;
+#else
+  return 1;
+#endif
+}
+
+/*
+** Close an open database and invalidate all cursors.
+*/
+int sqlite3BtreeClose(Btree *p){
+  BtShared *pBt = p->pBt;
+  BtCursor *pCur;
+
+  /* Close all cursors opened via this handle.  */
+  assert( sqlite3_mutex_held(p->db->mutex) );
+  sqlite3BtreeEnter(p);
+  pBt->db = p->db;
+  pCur = pBt->pCursor;
+  while( pCur ){
+    BtCursor *pTmp = pCur;
+    pCur = pCur->pNext;
+    if( pTmp->pBtree==p ){
+      sqlite3BtreeCloseCursor(pTmp);
+    }
+  }
+
+  /* Rollback any active transaction and free the handle structure.
+  ** The call to sqlite3BtreeRollback() drops any table-locks held by
+  ** this handle.
+  */
+  sqlite3BtreeRollback(p);
+  sqlite3BtreeLeave(p);
+
+  /* If there are still other outstanding references to the shared-btree
+  ** structure, return now. The remainder of this procedure cleans
+  ** up the shared-btree.
+  */
+  assert( p->wantToLock==0 && p->locked==0 );
+  if( !p->sharable || removeFromSharingList(pBt) ){
+    /* The pBt is no longer on the sharing list, so we can access
+    ** it without having to hold the mutex.
+    **
+    ** Clean out and delete the BtShared object.
+    */
+    assert( !pBt->pCursor );
+    sqlite3PagerClose(pBt->pPager);
+    if( pBt->xFreeSchema && pBt->pSchema ){
+      pBt->xFreeSchema(pBt->pSchema);
+    }
+    sqlite3_free(pBt->pSchema);
+    sqlite3_free(pBt);
+  }
+
+#ifndef SQLITE_OMIT_SHARED_CACHE
+  assert( p->wantToLock==0 );
+  assert( p->locked==0 );
+  if( p->pPrev ) p->pPrev->pNext = p->pNext;
+  if( p->pNext ) p->pNext->pPrev = p->pPrev;
+#endif
+
+  sqlite3_free(p);
+  return SQLITE_OK;
+}
+
+/*
+** Change the limit on the number of pages allowed in the cache.
+**
+** The maximum number of cache pages is set to the absolute
+** value of mxPage.  If mxPage is negative, the pager will
+** operate asynchronously - it will not stop to do fsync()s
+** to insure data is written to the disk surface before
+** continuing.  Transactions still work if synchronous is off,
+** and the database cannot be corrupted if this program
+** crashes.  But if the operating system crashes or there is
+** an abrupt power failure when synchronous is off, the database
+** could be left in an inconsistent and unrecoverable state.
+** Synchronous is on by default so database corruption is not
+** normally a worry.
+*/
+int sqlite3BtreeSetCacheSize(Btree *p, int mxPage){
+  BtShared *pBt = p->pBt;
+  assert( sqlite3_mutex_held(p->db->mutex) );
+  sqlite3BtreeEnter(p);
+  sqlite3PagerSetCachesize(pBt->pPager, mxPage);
+  sqlite3BtreeLeave(p);
+  return SQLITE_OK;
+}
+
+/*
+** Change the way data is synced to disk in order to increase or decrease
+** how well the database resists damage due to OS crashes and power
+** failures.  Level 1 is the same as asynchronous (no syncs() occur and
+** there is a high probability of damage)  Level 2 is the default.  There
+** is a very low but non-zero probability of damage.  Level 3 reduces the
+** probability of damage to near zero but with a write performance reduction.
+*/
+#ifndef SQLITE_OMIT_PAGER_PRAGMAS
+int sqlite3BtreeSetSafetyLevel(Btree *p, int level, int fullSync){
+  BtShared *pBt = p->pBt;
+  assert( sqlite3_mutex_held(p->db->mutex) );
+  sqlite3BtreeEnter(p);
+  sqlite3PagerSetSafetyLevel(pBt->pPager, level, fullSync);
+  sqlite3BtreeLeave(p);
+  return SQLITE_OK;
+}
+#endif
+
+/*
+** Return TRUE if the given btree is set to safety level 1.  In other
+** words, return TRUE if no sync() occurs on the disk files.
+*/
+int sqlite3BtreeSyncDisabled(Btree *p){
+  BtShared *pBt = p->pBt;
+  int rc;
+  assert( sqlite3_mutex_held(p->db->mutex) );
+  sqlite3BtreeEnter(p);
+  assert( pBt && pBt->pPager );
+  rc = sqlite3PagerNosync(pBt->pPager);
+  sqlite3BtreeLeave(p);
+  return rc;
+}
+
+#if !defined(SQLITE_OMIT_PAGER_PRAGMAS) || !defined(SQLITE_OMIT_VACUUM)
+/*
+** Change the default pages size and the number of reserved bytes per page.
+**
+** The page size must be a power of 2 between 512 and 65536.  If the page
+** size supplied does not meet this constraint then the page size is not
+** changed.
+**
+** Page sizes are constrained to be a power of two so that the region
+** of the database file used for locking (beginning at PENDING_BYTE,
+** the first byte past the 1GB boundary, 0x40000000) needs to occur
+** at the beginning of a page.
+**
+** If parameter nReserve is less than zero, then the number of reserved
+** bytes per page is left unchanged.
+*/
+int sqlite3BtreeSetPageSize(Btree *p, int pageSize, int nReserve){
+  int rc = SQLITE_OK;
+  BtShared *pBt = p->pBt;
+  sqlite3BtreeEnter(p);
+  if( pBt->pageSizeFixed ){
+    sqlite3BtreeLeave(p);
+    return SQLITE_READONLY;
+  }
+  if( nReserve<0 ){
+    nReserve = pBt->pageSize - pBt->usableSize;
+  }
+  if( pageSize>=512 && pageSize<=SQLITE_MAX_PAGE_SIZE &&
+        ((pageSize-1)&pageSize)==0 ){
+    assert( (pageSize & 7)==0 );
+    assert( !pBt->pPage1 && !pBt->pCursor );
+    pBt->pageSize = pageSize;
+    rc = sqlite3PagerSetPagesize(pBt->pPager, &pBt->pageSize);
+  }
+  pBt->usableSize = pBt->pageSize - nReserve;
+  sqlite3BtreeLeave(p);
+  return rc;
+}
+
+/*
+** Return the currently defined page size
+*/
+int sqlite3BtreeGetPageSize(Btree *p){
+  return p->pBt->pageSize;
+}
+int sqlite3BtreeGetReserve(Btree *p){
+  int n;
+  sqlite3BtreeEnter(p);
+  n = p->pBt->pageSize - p->pBt->usableSize;
+  sqlite3BtreeLeave(p);
+  return n;
+}
+
+/*
+** Set the maximum page count for a database if mxPage is positive.
+** No changes are made if mxPage is 0 or negative.
+** Regardless of the value of mxPage, return the maximum page count.
+*/
+int sqlite3BtreeMaxPageCount(Btree *p, int mxPage){
+  int n;
+  sqlite3BtreeEnter(p);
+  n = sqlite3PagerMaxPageCount(p->pBt->pPager, mxPage);
+  sqlite3BtreeLeave(p);
+  return n;
+}
+#endif /* !defined(SQLITE_OMIT_PAGER_PRAGMAS) || !defined(SQLITE_OMIT_VACUUM) */
+
+/*
+** Change the 'auto-vacuum' property of the database. If the 'autoVacuum'
+** parameter is non-zero, then auto-vacuum mode is enabled. If zero, it
+** is disabled. The default value for the auto-vacuum property is
+** determined by the SQLITE_DEFAULT_AUTOVACUUM macro.
+*/
+int sqlite3BtreeSetAutoVacuum(Btree *p, int autoVacuum){
+#ifdef SQLITE_OMIT_AUTOVACUUM
+  return SQLITE_READONLY;
+#else
+  BtShared *pBt = p->pBt;
+  int rc = SQLITE_OK;
+  int av = (autoVacuum?1:0);
+
+  sqlite3BtreeEnter(p);
+  if( pBt->pageSizeFixed && av!=pBt->autoVacuum ){
+    rc = SQLITE_READONLY;
+  }else{
+    pBt->autoVacuum = av;
+  }
+  sqlite3BtreeLeave(p);
+  return rc;
+#endif
+}
+
+/*
+** Return the value of the 'auto-vacuum' property. If auto-vacuum is
+** enabled 1 is returned. Otherwise 0.
+*/
+int sqlite3BtreeGetAutoVacuum(Btree *p){
+#ifdef SQLITE_OMIT_AUTOVACUUM
+  return BTREE_AUTOVACUUM_NONE;
+#else
+  int rc;
+  sqlite3BtreeEnter(p);
+  rc = (
+    (!p->pBt->autoVacuum)?BTREE_AUTOVACUUM_NONE:
+    (!p->pBt->incrVacuum)?BTREE_AUTOVACUUM_FULL:
+    BTREE_AUTOVACUUM_INCR
+  );
+  sqlite3BtreeLeave(p);
+  return rc;
+#endif
+}
+
+
+/*
+** Get a reference to pPage1 of the database file.  This will
+** also acquire a readlock on that file.
+**
+** SQLITE_OK is returned on success.  If the file is not a
+** well-formed database file, then SQLITE_CORRUPT is returned.
+** SQLITE_BUSY is returned if the database is locked.  SQLITE_NOMEM
+** is returned if we run out of memory.
+*/
+static int lockBtree(BtShared *pBt){
+  int rc, pageSize;
+  MemPage *pPage1;
+
+  assert( sqlite3_mutex_held(pBt->mutex) );
+  if( pBt->pPage1 ) return SQLITE_OK;
+  rc = sqlite3BtreeGetPage(pBt, 1, &pPage1, 0);
+  if( rc!=SQLITE_OK ) return rc;
+
+
+  /* Do some checking to help insure the file we opened really is
+  ** a valid database file.
+  */
+  rc = SQLITE_NOTADB;
+  if( sqlite3PagerPagecount(pBt->pPager)>0 ){
+    u8 *page1 = pPage1->aData;
+    if( memcmp(page1, zMagicHeader, 16)!=0 ){
+      goto page1_init_failed;
+    }
+    if( page1[18]>1 ){
+      pBt->readOnly = 1;
+    }
+    if( page1[19]>1 ){
+      goto page1_init_failed;
+    }
+    pageSize = get2byte(&page1[16]);
+    if( ((pageSize-1)&pageSize)!=0 || pageSize<512 ||
+        (SQLITE_MAX_PAGE_SIZE<32768 && pageSize>SQLITE_MAX_PAGE_SIZE)
+    ){
+      goto page1_init_failed;
+    }
+    assert( (pageSize & 7)==0 );
+    pBt->pageSize = pageSize;
+    pBt->usableSize = pageSize - page1[20];
+    if( pBt->usableSize<500 ){
+      goto page1_init_failed;
+    }
+    pBt->maxEmbedFrac = page1[21];
+    pBt->minEmbedFrac = page1[22];
+    pBt->minLeafFrac = page1[23];
+#ifndef SQLITE_OMIT_AUTOVACUUM
+    pBt->autoVacuum = (get4byte(&page1[36 + 4*4])?1:0);
+    pBt->incrVacuum = (get4byte(&page1[36 + 7*4])?1:0);
+#endif
+  }
+
+  /* maxLocal is the maximum amount of payload to store locally for
+  ** a cell.  Make sure it is small enough so that at least minFanout
+  ** cells can will fit on one page.  We assume a 10-byte page header.
+  ** Besides the payload, the cell must store:
+  **     2-byte pointer to the cell
+  **     4-byte child pointer
+  **     9-byte nKey value
+  **     4-byte nData value
+  **     4-byte overflow page pointer
+  ** So a cell consists of a 2-byte poiner, a header which is as much as
+  ** 17 bytes long, 0 to N bytes of payload, and an optional 4 byte overflow
+  ** page pointer.
+  */
+  pBt->maxLocal = (pBt->usableSize-12)*pBt->maxEmbedFrac/255 - 23;
+  pBt->minLocal = (pBt->usableSize-12)*pBt->minEmbedFrac/255 - 23;
+  pBt->maxLeaf = pBt->usableSize - 35;
+  pBt->minLeaf = (pBt->usableSize-12)*pBt->minLeafFrac/255 - 23;
+  if( pBt->minLocal>pBt->maxLocal || pBt->maxLocal<0 ){
+    goto page1_init_failed;
+  }
+  assert( pBt->maxLeaf + 23 <= MX_CELL_SIZE(pBt) );
+  pBt->pPage1 = pPage1;
+  return SQLITE_OK;
+
+page1_init_failed:
+  releasePage(pPage1);
+  pBt->pPage1 = 0;
+  return rc;
+}
+
+/*
+** This routine works like lockBtree() except that it also invokes the
+** busy callback if there is lock contention.
+*/
+static int lockBtreeWithRetry(Btree *pRef){
+  int rc = SQLITE_OK;
+
+  assert( sqlite3BtreeHoldsMutex(pRef) );
+  if( pRef->inTrans==TRANS_NONE ){
+    u8 inTransaction = pRef->pBt->inTransaction;
+    btreeIntegrity(pRef);
+    rc = sqlite3BtreeBeginTrans(pRef, 0);
+    pRef->pBt->inTransaction = inTransaction;
+    pRef->inTrans = TRANS_NONE;
+    if( rc==SQLITE_OK ){
+      pRef->pBt->nTransaction--;
+    }
+    btreeIntegrity(pRef);
+  }
+  return rc;
+}
+
+
+/*
+** If there are no outstanding cursors and we are not in the middle
+** of a transaction but there is a read lock on the database, then
+** this routine unrefs the first page of the database file which
+** has the effect of releasing the read lock.
+**
+** If there are any outstanding cursors, this routine is a no-op.
+**
+** If there is a transaction in progress, this routine is a no-op.
+*/
+static void unlockBtreeIfUnused(BtShared *pBt){
+  assert( sqlite3_mutex_held(pBt->mutex) );
+  if( pBt->inTransaction==TRANS_NONE && pBt->pCursor==0 && pBt->pPage1!=0 ){
+    if( sqlite3PagerRefcount(pBt->pPager)>=1 ){
+      assert( pBt->pPage1->aData );
+#if 0
+      if( pBt->pPage1->aData==0 ){
+        MemPage *pPage = pBt->pPage1;
+        pPage->aData = sqlite3PagerGetData(pPage->pDbPage);
+        pPage->pBt = pBt;
+        pPage->pgno = 1;
+      }
+#endif
+      releasePage(pBt->pPage1);
+    }
+    pBt->pPage1 = 0;
+    pBt->inStmt = 0;
+  }
+}
+
+/*
+** Create a new database by initializing the first page of the
+** file.
+*/
+static int newDatabase(BtShared *pBt){
+  MemPage *pP1;
+  unsigned char *data;
+  int rc;
+
+  assert( sqlite3_mutex_held(pBt->mutex) );
+  if( sqlite3PagerPagecount(pBt->pPager)>0 ) return SQLITE_OK;
+  pP1 = pBt->pPage1;
+  assert( pP1!=0 );
+  data = pP1->aData;
+  rc = sqlite3PagerWrite(pP1->pDbPage);
+  if( rc ) return rc;
+  memcpy(data, zMagicHeader, sizeof(zMagicHeader));
+  assert( sizeof(zMagicHeader)==16 );
+  put2byte(&data[16], pBt->pageSize);
+  data[18] = 1;
+  data[19] = 1;
+  data[20] = pBt->pageSize - pBt->usableSize;
+  data[21] = pBt->maxEmbedFrac;
+  data[22] = pBt->minEmbedFrac;
+  data[23] = pBt->minLeafFrac;
+  memset(&data[24], 0, 100-24);
+  zeroPage(pP1, PTF_INTKEY|PTF_LEAF|PTF_LEAFDATA );
+  pBt->pageSizeFixed = 1;
+#ifndef SQLITE_OMIT_AUTOVACUUM
+  assert( pBt->autoVacuum==1 || pBt->autoVacuum==0 );
+  assert( pBt->incrVacuum==1 || pBt->incrVacuum==0 );
+  put4byte(&data[36 + 4*4], pBt->autoVacuum);
+  put4byte(&data[36 + 7*4], pBt->incrVacuum);
+#endif
+  return SQLITE_OK;
+}
+
+/*
+** Attempt to start a new transaction. A write-transaction
+** is started if the second argument is nonzero, otherwise a read-
+** transaction.  If the second argument is 2 or more and exclusive
+** transaction is started, meaning that no other process is allowed
+** to access the database.  A preexisting transaction may not be
+** upgraded to exclusive by calling this routine a second time - the
+** exclusivity flag only works for a new transaction.
+**
+** A write-transaction must be started before attempting any
+** changes to the database.  None of the following routines
+** will work unless a transaction is started first:
+**
+**      sqlite3BtreeCreateTable()
+**      sqlite3BtreeCreateIndex()
+**      sqlite3BtreeClearTable()
+**      sqlite3BtreeDropTable()
+**      sqlite3BtreeInsert()
+**      sqlite3BtreeDelete()
+**      sqlite3BtreeUpdateMeta()
+**
+** If an initial attempt to acquire the lock fails because of lock contention
+** and the database was previously unlocked, then invoke the busy handler
+** if there is one.  But if there was previously a read-lock, do not
+** invoke the busy handler - just return SQLITE_BUSY.  SQLITE_BUSY is
+** returned when there is already a read-lock in order to avoid a deadlock.
+**
+** Suppose there are two processes A and B.  A has a read lock and B has
+** a reserved lock.  B tries to promote to exclusive but is blocked because
+** of A's read lock.  A tries to promote to reserved but is blocked by B.
+** One or the other of the two processes must give way or there can be
+** no progress.  By returning SQLITE_BUSY and not invoking the busy callback
+** when A already has a read lock, we encourage A to give up and let B
+** proceed.
+*/
+int sqlite3BtreeBeginTrans(Btree *p, int wrflag){
+  BtShared *pBt = p->pBt;
+  int rc = SQLITE_OK;
+
+  sqlite3BtreeEnter(p);
+  pBt->db = p->db;
+  btreeIntegrity(p);
+
+  /* If the btree is already in a write-transaction, or it
+  ** is already in a read-transaction and a read-transaction
+  ** is requested, this is a no-op.
+  */
+  if( p->inTrans==TRANS_WRITE || (p->inTrans==TRANS_READ && !wrflag) ){
+    goto trans_begun;
+  }
+
+  /* Write transactions are not possible on a read-only database */
+  if( pBt->readOnly && wrflag ){
+    rc = SQLITE_READONLY;
+    goto trans_begun;
+  }
+
+  /* If another database handle has already opened a write transaction
+  ** on this shared-btree structure and a second write transaction is
+  ** requested, return SQLITE_BUSY.
+  */
+  if( pBt->inTransaction==TRANS_WRITE && wrflag ){
+    rc = SQLITE_BUSY;
+    goto trans_begun;
+  }
+
+#ifndef SQLITE_OMIT_SHARED_CACHE
+  if( wrflag>1 ){
+    BtLock *pIter;
+    for(pIter=pBt->pLock; pIter; pIter=pIter->pNext){
+      if( pIter->pBtree!=p ){
+        rc = SQLITE_BUSY;
+        goto trans_begun;
+      }
+    }
+  }
+#endif
+
+  do {
+    if( pBt->pPage1==0 ){
+      rc = lockBtree(pBt);
+    }
+
+    if( rc==SQLITE_OK && wrflag ){
+      if( pBt->readOnly ){
+        rc = SQLITE_READONLY;
+      }else{
+        rc = sqlite3PagerBegin(pBt->pPage1->pDbPage, wrflag>1);
+        if( rc==SQLITE_OK ){
+          rc = newDatabase(pBt);
+        }
+      }
+    }
+
+    if( rc==SQLITE_OK ){
+      if( wrflag ) pBt->inStmt = 0;
+    }else{
+      unlockBtreeIfUnused(pBt);
+    }
+  }while( rc==SQLITE_BUSY && pBt->inTransaction==TRANS_NONE &&
+          sqlite3BtreeInvokeBusyHandler(pBt, 0) );
+
+  if( rc==SQLITE_OK ){
+    if( p->inTrans==TRANS_NONE ){
+      pBt->nTransaction++;
+    }
+    p->inTrans = (wrflag?TRANS_WRITE:TRANS_READ);
+    if( p->inTrans>pBt->inTransaction ){
+      pBt->inTransaction = p->inTrans;
+    }
+#ifndef SQLITE_OMIT_SHARED_CACHE
+    if( wrflag>1 ){
+      assert( !pBt->pExclusive );
+      pBt->pExclusive = p;
+    }
+#endif
+  }
+
+
+trans_begun:
+  btreeIntegrity(p);
+  sqlite3BtreeLeave(p);
+  return rc;
+}
+
+#ifndef SQLITE_OMIT_AUTOVACUUM
+
+/*
+** Set the pointer-map entries for all children of page pPage. Also, if
+** pPage contains cells that point to overflow pages, set the pointer
+** map entries for the overflow pages as well.
+*/
+static int setChildPtrmaps(MemPage *pPage){
+  int i;                             /* Counter variable */
+  int nCell;                         /* Number of cells in page pPage */
+  int rc;                            /* Return code */
+  BtShared *pBt = pPage->pBt;
+  int isInitOrig = pPage->isInit;
+  Pgno pgno = pPage->pgno;
+
+  assert( sqlite3_mutex_held(pPage->pBt->mutex) );
+  rc = sqlite3BtreeInitPage(pPage, pPage->pParent);
+  if( rc!=SQLITE_OK ){
+    goto set_child_ptrmaps_out;
+  }
+  nCell = pPage->nCell;
+
+  for(i=0; i<nCell; i++){
+    u8 *pCell = findCell(pPage, i);
+
+    rc = ptrmapPutOvflPtr(pPage, pCell);
+    if( rc!=SQLITE_OK ){
+      goto set_child_ptrmaps_out;
+    }
+
+    if( !pPage->leaf ){
+      Pgno childPgno = get4byte(pCell);
+      rc = ptrmapPut(pBt, childPgno, PTRMAP_BTREE, pgno);
+      if( rc!=SQLITE_OK ) goto set_child_ptrmaps_out;
+    }
+  }
+
+  if( !pPage->leaf ){
+    Pgno childPgno = get4byte(&pPage->aData[pPage->hdrOffset+8]);
+    rc = ptrmapPut(pBt, childPgno, PTRMAP_BTREE, pgno);
+  }
+
+set_child_ptrmaps_out:
+  pPage->isInit = isInitOrig;
+  return rc;
+}
+
+/*
+** Somewhere on pPage, which is guarenteed to be a btree page, not an overflow
+** page, is a pointer to page iFrom. Modify this pointer so that it points to
+** iTo. Parameter eType describes the type of pointer to be modified, as
+** follows:
+**
+** PTRMAP_BTREE:     pPage is a btree-page. The pointer points at a child
+**                   page of pPage.
+**
+** PTRMAP_OVERFLOW1: pPage is a btree-page. The pointer points at an overflow
+**                   page pointed to by one of the cells on pPage.
+**
+** PTRMAP_OVERFLOW2: pPage is an overflow-page. The pointer points at the next
+**                   overflow page in the list.
+*/
+static int modifyPagePointer(MemPage *pPage, Pgno iFrom, Pgno iTo, u8 eType){
+  assert( sqlite3_mutex_held(pPage->pBt->mutex) );
+  if( eType==PTRMAP_OVERFLOW2 ){
+    /* The pointer is always the first 4 bytes of the page in this case.  */
+    if( get4byte(pPage->aData)!=iFrom ){
+      return SQLITE_CORRUPT_BKPT;
+    }
+    put4byte(pPage->aData, iTo);
+  }else{
+    int isInitOrig = pPage->isInit;
+    int i;
+    int nCell;
+
+    sqlite3BtreeInitPage(pPage, 0);
+    nCell = pPage->nCell;
+
+    for(i=0; i<nCell; i++){
+      u8 *pCell = findCell(pPage, i);
+      if( eType==PTRMAP_OVERFLOW1 ){
+        CellInfo info;
+        sqlite3BtreeParseCellPtr(pPage, pCell, &info);
+        if( info.iOverflow ){
+          if( iFrom==get4byte(&pCell[info.iOverflow]) ){
+            put4byte(&pCell[info.iOverflow], iTo);
+            break;
+          }
+        }
+      }else{
+        if( get4byte(pCell)==iFrom ){
+          put4byte(pCell, iTo);
+          break;
+        }
+      }
+    }
+
+    if( i==nCell ){
+      if( eType!=PTRMAP_BTREE ||
+          get4byte(&pPage->aData[pPage->hdrOffset+8])!=iFrom ){
+        return SQLITE_CORRUPT_BKPT;
+      }
+      put4byte(&pPage->aData[pPage->hdrOffset+8], iTo);
+    }
+
+    pPage->isInit = isInitOrig;
+  }
+  return SQLITE_OK;
+}
+
+
+/*
+** Move the open database page pDbPage to location iFreePage in the
+** database. The pDbPage reference remains valid.
+*/
+static int relocatePage(
+  BtShared *pBt,           /* Btree */
+  MemPage *pDbPage,        /* Open page to move */
+  u8 eType,                /* Pointer map 'type' entry for pDbPage */
+  Pgno iPtrPage,           /* Pointer map 'page-no' entry for pDbPage */
+  Pgno iFreePage           /* The location to move pDbPage to */
+){
+  MemPage *pPtrPage;   /* The page that contains a pointer to pDbPage */
+  Pgno iDbPage = pDbPage->pgno;
+  Pager *pPager = pBt->pPager;
+  int rc;
+
+  assert( eType==PTRMAP_OVERFLOW2 || eType==PTRMAP_OVERFLOW1 ||
+      eType==PTRMAP_BTREE || eType==PTRMAP_ROOTPAGE );
+  assert( sqlite3_mutex_held(pBt->mutex) );
+  assert( pDbPage->pBt==pBt );
+
+  /* Move page iDbPage from its current location to page number iFreePage */
+  TRACE(("AUTOVACUUM: Moving %d to free page %d (ptr page %d type %d)\n",
+      iDbPage, iFreePage, iPtrPage, eType));
+  rc = sqlite3PagerMovepage(pPager, pDbPage->pDbPage, iFreePage);
+  if( rc!=SQLITE_OK ){
+    return rc;
+  }
+  pDbPage->pgno = iFreePage;
+
+  /* If pDbPage was a btree-page, then it may have child pages and/or cells
+  ** that point to overflow pages. The pointer map entries for all these
+  ** pages need to be changed.
+  **
+  ** If pDbPage is an overflow page, then the first 4 bytes may store a
+  ** pointer to a subsequent overflow page. If this is the case, then
+  ** the pointer map needs to be updated for the subsequent overflow page.
+  */
+  if( eType==PTRMAP_BTREE || eType==PTRMAP_ROOTPAGE ){
+    rc = setChildPtrmaps(pDbPage);
+    if( rc!=SQLITE_OK ){
+      return rc;
+    }
+  }else{
+    Pgno nextOvfl = get4byte(pDbPage->aData);
+    if( nextOvfl!=0 ){
+      rc = ptrmapPut(pBt, nextOvfl, PTRMAP_OVERFLOW2, iFreePage);
+      if( rc!=SQLITE_OK ){
+        return rc;
+      }
+    }
+  }
+
+  /* Fix the database pointer on page iPtrPage that pointed at iDbPage so
+  ** that it points at iFreePage. Also fix the pointer map entry for
+  ** iPtrPage.
+  */
+  if( eType!=PTRMAP_ROOTPAGE ){
+    rc = sqlite3BtreeGetPage(pBt, iPtrPage, &pPtrPage, 0);
+    if( rc!=SQLITE_OK ){
+      return rc;
+    }
+    rc = sqlite3PagerWrite(pPtrPage->pDbPage);
+    if( rc!=SQLITE_OK ){
+      releasePage(pPtrPage);
+      return rc;
+    }
+    rc = modifyPagePointer(pPtrPage, iDbPage, iFreePage, eType);
+    releasePage(pPtrPage);
+    if( rc==SQLITE_OK ){
+      rc = ptrmapPut(pBt, iFreePage, eType, iPtrPage);
+    }
+  }
+  return rc;
+}
+
+/* Forward declaration required by incrVacuumStep(). */
+static int allocateBtreePage(BtShared *, MemPage **, Pgno *, Pgno, u8);
+
+/*
+** Perform a single step of an incremental-vacuum. If successful,
+** return SQLITE_OK. If there is no work to do (and therefore no
+** point in calling this function again), return SQLITE_DONE.
+**
+** More specificly, this function attempts to re-organize the
+** database so that the last page of the file currently in use
+** is no longer in use.
+**
+** If the nFin parameter is non-zero, the implementation assumes
+** that the caller will keep calling incrVacuumStep() until
+** it returns SQLITE_DONE or an error, and that nFin is the
+** number of pages the database file will contain after this
+** process is complete.
+*/
+static int incrVacuumStep(BtShared *pBt, Pgno nFin){
+  Pgno iLastPg;             /* Last page in the database */
+  Pgno nFreeList;           /* Number of pages still on the free-list */
+
+  assert( sqlite3_mutex_held(pBt->mutex) );
+  iLastPg = pBt->nTrunc;
+  if( iLastPg==0 ){
+    iLastPg = sqlite3PagerPagecount(pBt->pPager);
+  }
+
+  if( !PTRMAP_ISPAGE(pBt, iLastPg) && iLastPg!=PENDING_BYTE_PAGE(pBt) ){
+    int rc;
+    u8 eType;
+    Pgno iPtrPage;
+
+    nFreeList = get4byte(&pBt->pPage1->aData[36]);
+    if( nFreeList==0 || nFin==iLastPg ){
+      return SQLITE_DONE;
+    }
+
+    rc = ptrmapGet(pBt, iLastPg, &eType, &iPtrPage);
+    if( rc!=SQLITE_OK ){
+      return rc;
+    }
+    if( eType==PTRMAP_ROOTPAGE ){
+      return SQLITE_CORRUPT_BKPT;
+    }
+
+    if( eType==PTRMAP_FREEPAGE ){
+      if( nFin==0 ){
+        /* Remove the page from the files free-list. This is not required
+        ** if nFin is non-zero. In that case, the free-list will be
+        ** truncated to zero after this function returns, so it doesn't
+        ** matter if it still contains some garbage entries.
+        */
+        Pgno iFreePg;
+        MemPage *pFreePg;
+        rc = allocateBtreePage(pBt, &pFreePg, &iFreePg, iLastPg, 1);
+        if( rc!=SQLITE_OK ){
+          return rc;
+        }
+        assert( iFreePg==iLastPg );
+        releasePage(pFreePg);
+      }
+    } else {
+      Pgno iFreePg;             /* Index of free page to move pLastPg to */
+      MemPage *pLastPg;
+
+      rc = sqlite3BtreeGetPage(pBt, iLastPg, &pLastPg, 0);
+      if( rc!=SQLITE_OK ){
+        return rc;
+      }
+
+      /* If nFin is zero, this loop runs exactly once and page pLastPg
+      ** is swapped with the first free page pulled off the free list.
+      **
+      ** On the other hand, if nFin is greater than zero, then keep
+      ** looping until a free-page located within the first nFin pages
+      ** of the file is found.
+      */
+      do {
+        MemPage *pFreePg;
+        rc = allocateBtreePage(pBt, &pFreePg, &iFreePg, 0, 0);
+        if( rc!=SQLITE_OK ){
+          releasePage(pLastPg);
+          return rc;
+        }
+        releasePage(pFreePg);
+      }while( nFin!=0 && iFreePg>nFin );
+      assert( iFreePg<iLastPg );
+
+      rc = sqlite3PagerWrite(pLastPg->pDbPage);
+      if( rc==SQLITE_OK ){
+        rc = relocatePage(pBt, pLastPg, eType, iPtrPage, iFreePg);
+      }
+      releasePage(pLastPg);
+      if( rc!=SQLITE_OK ){
+        return rc;
+      }
+    }
+  }
+
+  pBt->nTrunc = iLastPg - 1;
+  while( pBt->nTrunc==PENDING_BYTE_PAGE(pBt)||PTRMAP_ISPAGE(pBt, pBt->nTrunc) ){
+    pBt->nTrunc--;
+  }
+  return SQLITE_OK;
+}
+
+/*
+** A write-transaction must be opened before calling this function.
+** It performs a single unit of work towards an incremental vacuum.
+**
+** If the incremental vacuum is finished after this function has run,
+** SQLITE_DONE is returned. If it is not finished, but no error occured,
+** SQLITE_OK is returned. Otherwise an SQLite error code.
+*/
+int sqlite3BtreeIncrVacuum(Btree *p){
+  int rc;
+  BtShared *pBt = p->pBt;
+
+  sqlite3BtreeEnter(p);
+  pBt->db = p->db;
+  assert( pBt->inTransaction==TRANS_WRITE && p->inTrans==TRANS_WRITE );
+  if( !pBt->autoVacuum ){
+    rc = SQLITE_DONE;
+  }else{
+    invalidateAllOverflowCache(pBt);
+    rc = incrVacuumStep(pBt, 0);
+  }
+  sqlite3BtreeLeave(p);
+  return rc;
+}
+
+/*
+** This routine is called prior to sqlite3PagerCommit when a transaction
+** is commited for an auto-vacuum database.
+**
+** If SQLITE_OK is returned, then *pnTrunc is set to the number of pages
+** the database file should be truncated to during the commit process.
+** i.e. the database has been reorganized so that only the first *pnTrunc
+** pages are in use.
+*/
+static int autoVacuumCommit(BtShared *pBt, Pgno *pnTrunc){
+  int rc = SQLITE_OK;
+  Pager *pPager = pBt->pPager;
+#ifndef NDEBUG
+  int nRef = sqlite3PagerRefcount(pPager);
+#endif
+
+  assert( sqlite3_mutex_held(pBt->mutex) );
+  invalidateAllOverflowCache(pBt);
+  assert(pBt->autoVacuum);
+  if( !pBt->incrVacuum ){
+    Pgno nFin = 0;
+
+    if( pBt->nTrunc==0 ){
+      Pgno nFree;
+      Pgno nPtrmap;
+      const int pgsz = pBt->pageSize;
+      Pgno nOrig = sqlite3PagerPagecount(pBt->pPager);
+
+      if( PTRMAP_ISPAGE(pBt, nOrig) ){
+        return SQLITE_CORRUPT_BKPT;
+      }
+      if( nOrig==PENDING_BYTE_PAGE(pBt) ){
+        nOrig--;
+      }
+      nFree = get4byte(&pBt->pPage1->aData[36]);
+      nPtrmap = (nFree-nOrig+PTRMAP_PAGENO(pBt, nOrig)+pgsz/5)/(pgsz/5);
+      nFin = nOrig - nFree - nPtrmap;
+      if( nOrig>PENDING_BYTE_PAGE(pBt) && nFin<=PENDING_BYTE_PAGE(pBt) ){
+        nFin--;
+      }
+      while( PTRMAP_ISPAGE(pBt, nFin) || nFin==PENDING_BYTE_PAGE(pBt) ){
+        nFin--;
+      }
+    }
+
+    while( rc==SQLITE_OK ){
+      rc = incrVacuumStep(pBt, nFin);
+    }
+    if( rc==SQLITE_DONE ){
+      assert(nFin==0 || pBt->nTrunc==0 || nFin<=pBt->nTrunc);
+      rc = SQLITE_OK;
+      if( pBt->nTrunc ){
+        rc = sqlite3PagerWrite(pBt->pPage1->pDbPage);
+        put4byte(&pBt->pPage1->aData[32], 0);
+        put4byte(&pBt->pPage1->aData[36], 0);
+        pBt->nTrunc = nFin;
+      }
+    }
+    if( rc!=SQLITE_OK ){
+      sqlite3PagerRollback(pPager);
+    }
+  }
+
+  if( rc==SQLITE_OK ){
+    *pnTrunc = pBt->nTrunc;
+    pBt->nTrunc = 0;
+  }
+  assert( nRef==sqlite3PagerRefcount(pPager) );
+  return rc;
+}
+
+#endif
+
+/*
+** This routine does the first phase of a two-phase commit.  This routine
+** causes a rollback journal to be created (if it does not already exist)
+** and populated with enough information so that if a power loss occurs
+** the database can be restored to its original state by playing back
+** the journal.  Then the contents of the journal are flushed out to
+** the disk.  After the journal is safely on oxide, the changes to the
+** database are written into the database file and flushed to oxide.
+** At the end of this call, the rollback journal still exists on the
+** disk and we are still holding all locks, so the transaction has not
+** committed.  See sqlite3BtreeCommit() for the second phase of the
+** commit process.
+**
+** This call is a no-op if no write-transaction is currently active on pBt.
+**
+** Otherwise, sync the database file for the btree pBt. zMaster points to
+** the name of a master journal file that should be written into the
+** individual journal file, or is NULL, indicating no master journal file
+** (single database transaction).
+**
+** When this is called, the master journal should already have been
+** created, populated with this journal pointer and synced to disk.
+**
+** Once this is routine has returned, the only thing required to commit
+** the write-transaction for this database file is to delete the journal.
+*/
+int sqlite3BtreeCommitPhaseOne(Btree *p, const char *zMaster){
+  int rc = SQLITE_OK;
+  if( p->inTrans==TRANS_WRITE ){
+    BtShared *pBt = p->pBt;
+    Pgno nTrunc = 0;
+    sqlite3BtreeEnter(p);
+    pBt->db = p->db;
+#ifndef SQLITE_OMIT_AUTOVACUUM
+    if( pBt->autoVacuum ){
+      rc = autoVacuumCommit(pBt, &nTrunc);
+      if( rc!=SQLITE_OK ){
+        sqlite3BtreeLeave(p);
+        return rc;
+      }
+    }
+#endif
+    rc = sqlite3PagerCommitPhaseOne(pBt->pPager, zMaster, nTrunc);
+    sqlite3BtreeLeave(p);
+  }
+  return rc;
+}
+
+/*
+** Commit the transaction currently in progress.
+**
+** This routine implements the second phase of a 2-phase commit.  The
+** sqlite3BtreeSync() routine does the first phase and should be invoked
+** prior to calling this routine.  The sqlite3BtreeSync() routine did
+** all the work of writing information out to disk and flushing the
+** contents so that they are written onto the disk platter.  All this
+** routine has to do is delete or truncate the rollback journal
+** (which causes the transaction to commit) and drop locks.
+**
+** This will release the write lock on the database file.  If there
+** are no active cursors, it also releases the read lock.
+*/
+int sqlite3BtreeCommitPhaseTwo(Btree *p){
+  BtShared *pBt = p->pBt;
+
+  sqlite3BtreeEnter(p);
+  pBt->db = p->db;
+  btreeIntegrity(p);
+
+  /* If the handle has a write-transaction open, commit the shared-btrees
+  ** transaction and set the shared state to TRANS_READ.
+  */
+  if( p->inTrans==TRANS_WRITE ){
+    int rc;
+    assert( pBt->inTransaction==TRANS_WRITE );
+    assert( pBt->nTransaction>0 );
+    rc = sqlite3PagerCommitPhaseTwo(pBt->pPager);
+    if( rc!=SQLITE_OK ){
+      sqlite3BtreeLeave(p);
+      return rc;
+    }
+    pBt->inTransaction = TRANS_READ;
+    pBt->inStmt = 0;
+  }
+  unlockAllTables(p);
+
+  /* If the handle has any kind of transaction open, decrement the transaction
+  ** count of the shared btree. If the transaction count reaches 0, set
+  ** the shared state to TRANS_NONE. The unlockBtreeIfUnused() call below
+  ** will unlock the pager.
+  */
+  if( p->inTrans!=TRANS_NONE ){
+    pBt->nTransaction--;
+    if( 0==pBt->nTransaction ){
+      pBt->inTransaction = TRANS_NONE;
+    }
+  }
+
+  /* Set the handles current transaction state to TRANS_NONE and unlock
+  ** the pager if this call closed the only read or write transaction.
+  */
+  p->inTrans = TRANS_NONE;
+  unlockBtreeIfUnused(pBt);
+
+  btreeIntegrity(p);
+  sqlite3BtreeLeave(p);
+  return SQLITE_OK;
+}
+
+/*
+** Do both phases of a commit.
+*/
+int sqlite3BtreeCommit(Btree *p){
+  int rc;
+  sqlite3BtreeEnter(p);
+  rc = sqlite3BtreeCommitPhaseOne(p, 0);
+  if( rc==SQLITE_OK ){
+    rc = sqlite3BtreeCommitPhaseTwo(p);
+  }
+  sqlite3BtreeLeave(p);
+  return rc;
+}
+
+#ifndef NDEBUG
+/*
+** Return the number of write-cursors open on this handle. This is for use
+** in assert() expressions, so it is only compiled if NDEBUG is not
+** defined.
+**
+** For the purposes of this routine, a write-cursor is any cursor that
+** is capable of writing to the databse.  That means the cursor was
+** originally opened for writing and the cursor has not be disabled
+** by having its state changed to CURSOR_FAULT.
+*/
+static int countWriteCursors(BtShared *pBt){
+  BtCursor *pCur;
+  int r = 0;
+  for(pCur=pBt->pCursor; pCur; pCur=pCur->pNext){
+    if( pCur->wrFlag && pCur->eState!=CURSOR_FAULT ) r++;
+  }
+  return r;
+}
+#endif
+
+/*
+** This routine sets the state to CURSOR_FAULT and the error
+** code to errCode for every cursor on BtShared that pBtree
+** references.
+**
+** Every cursor is tripped, including cursors that belong
+** to other database connections that happen to be sharing
+** the cache with pBtree.
+**
+** This routine gets called when a rollback occurs.
+** All cursors using the same cache must be tripped
+** to prevent them from trying to use the btree after
+** the rollback.  The rollback may have deleted tables
+** or moved root pages, so it is not sufficient to
+** save the state of the cursor.  The cursor must be
+** invalidated.
+*/
+void sqlite3BtreeTripAllCursors(Btree *pBtree, int errCode){
+  BtCursor *p;
+  sqlite3BtreeEnter(pBtree);
+  for(p=pBtree->pBt->pCursor; p; p=p->pNext){
+    clearCursorPosition(p);
+    p->eState = CURSOR_FAULT;
+    p->skip = errCode;
+  }
+  sqlite3BtreeLeave(pBtree);
+}
+
+/*
+** Rollback the transaction in progress.  All cursors will be
+** invalided by this operation.  Any attempt to use a cursor
+** that was open at the beginning of this operation will result
+** in an error.
+**
+** This will release the write lock on the database file.  If there
+** are no active cursors, it also releases the read lock.
+*/
+int sqlite3BtreeRollback(Btree *p){
+  int rc;
+  BtShared *pBt = p->pBt;
+  MemPage *pPage1;
+
+  sqlite3BtreeEnter(p);
+  pBt->db = p->db;
+  rc = saveAllCursors(pBt, 0, 0);
+#ifndef SQLITE_OMIT_SHARED_CACHE
+  if( rc!=SQLITE_OK ){
+    /* This is a horrible situation. An IO or malloc() error occured whilst
+    ** trying to save cursor positions. If this is an automatic rollback (as
+    ** the result of a constraint, malloc() failure or IO error) then
+    ** the cache may be internally inconsistent (not contain valid trees) so
+    ** we cannot simply return the error to the caller. Instead, abort
+    ** all queries that may be using any of the cursors that failed to save.
+    */
+    sqlite3BtreeTripAllCursors(p, rc);
+  }
+#endif
+  btreeIntegrity(p);
+  unlockAllTables(p);
+
+  if( p->inTrans==TRANS_WRITE ){
+    int rc2;
+
+#ifndef SQLITE_OMIT_AUTOVACUUM
+    pBt->nTrunc = 0;
+#endif
+
+    assert( TRANS_WRITE==pBt->inTransaction );
+    rc2 = sqlite3PagerRollback(pBt->pPager);
+    if( rc2!=SQLITE_OK ){
+      rc = rc2;
+    }
+
+    /* The rollback may have destroyed the pPage1->aData value.  So
+    ** call sqlite3BtreeGetPage() on page 1 again to make
+    ** sure pPage1->aData is set correctly. */
+    if( sqlite3BtreeGetPage(pBt, 1, &pPage1, 0)==SQLITE_OK ){
+      releasePage(pPage1);
+    }
+    assert( countWriteCursors(pBt)==0 );
+    pBt->inTransaction = TRANS_READ;
+  }
+
+  if( p->inTrans!=TRANS_NONE ){
+    assert( pBt->nTransaction>0 );
+    pBt->nTransaction--;
+    if( 0==pBt->nTransaction ){
+      pBt->inTransaction = TRANS_NONE;
+    }
+  }
+
+  p->inTrans = TRANS_NONE;
+  pBt->inStmt = 0;
+  unlockBtreeIfUnused(pBt);
+
+  btreeIntegrity(p);
+  sqlite3BtreeLeave(p);
+  return rc;
+}
+
+/*
+** Start a statement subtransaction.  The subtransaction can
+** can be rolled back independently of the main transaction.
+** You must start a transaction before starting a subtransaction.
+** The subtransaction is ended automatically if the main transaction
+** commits or rolls back.
+**
+** Only one subtransaction may be active at a time.  It is an error to try
+** to start a new subtransaction if another subtransaction is already active.
+**
+** Statement subtransactions are used around individual SQL statements
+** that are contained within a BEGIN...COMMIT block.  If a constraint
+** error occurs within the statement, the effect of that one statement
+** can be rolled back without having to rollback the entire transaction.
+*/
+int sqlite3BtreeBeginStmt(Btree *p){
+  int rc;
+  BtShared *pBt = p->pBt;
+  sqlite3BtreeEnter(p);
+  pBt->db = p->db;
+  if( (p->inTrans!=TRANS_WRITE) || pBt->inStmt ){
+    rc = pBt->readOnly ? SQLITE_READONLY : SQLITE_ERROR;
+  }else{
+    assert( pBt->inTransaction==TRANS_WRITE );
+    rc = pBt->readOnly ? SQLITE_OK : sqlite3PagerStmtBegin(pBt->pPager);
+    pBt->inStmt = 1;
+  }
+  sqlite3BtreeLeave(p);
+  return rc;
+}
+
+
+/*
+** Commit the statment subtransaction currently in progress.  If no
+** subtransaction is active, this is a no-op.
+*/
+int sqlite3BtreeCommitStmt(Btree *p){
+  int rc;
+  BtShared *pBt = p->pBt;
+  sqlite3BtreeEnter(p);
+  pBt->db = p->db;
+  if( pBt->inStmt && !pBt->readOnly ){
+    rc = sqlite3PagerStmtCommit(pBt->pPager);
+  }else{
+    rc = SQLITE_OK;
+  }
+  pBt->inStmt = 0;
+  sqlite3BtreeLeave(p);
+  return rc;
+}
+
+/*
+** Rollback the active statement subtransaction.  If no subtransaction
+** is active this routine is a no-op.
+**
+** All cursors will be invalidated by this operation.  Any attempt
+** to use a cursor that was open at the beginning of this operation
+** will result in an error.
+*/
+int sqlite3BtreeRollbackStmt(Btree *p){
+  int rc = SQLITE_OK;
+  BtShared *pBt = p->pBt;
+  sqlite3BtreeEnter(p);
+  pBt->db = p->db;
+  if( pBt->inStmt && !pBt->readOnly ){
+    rc = sqlite3PagerStmtRollback(pBt->pPager);
+    assert( countWriteCursors(pBt)==0 );
+    pBt->inStmt = 0;
+  }
+  sqlite3BtreeLeave(p);
+  return rc;
+}
+
+/*
+** Default key comparison function to be used if no comparison function
+** is specified on the sqlite3BtreeCursor() call.
+*/
+static int dfltCompare(
+  void *NotUsed,             /* User data is not used */
+  int n1, const void *p1,    /* First key to compare */
+  int n2, const void *p2     /* Second key to compare */
+){
+  int c;
+  c = memcmp(p1, p2, n1<n2 ? n1 : n2);
+  if( c==0 ){
+    c = n1 - n2;
+  }
+  return c;
+}
+
+/*
+** Create a new cursor for the BTree whose root is on the page
+** iTable.  The act of acquiring a cursor gets a read lock on
+** the database file.
+**
+** If wrFlag==0, then the cursor can only be used for reading.
+** If wrFlag==1, then the cursor can be used for reading or for
+** writing if other conditions for writing are also met.  These
+** are the conditions that must be met in order for writing to
+** be allowed:
+**
+** 1:  The cursor must have been opened with wrFlag==1
+**
+** 2:  Other database connections that share the same pager cache
+**     but which are not in the READ_UNCOMMITTED state may not have
+**     cursors open with wrFlag==0 on the same table.  Otherwise
+**     the changes made by this write cursor would be visible to
+**     the read cursors in the other database connection.
+**
+** 3:  The database must be writable (not on read-only media)
+**
+** 4:  There must be an active transaction.
+**
+** No checking is done to make sure that page iTable really is the
+** root page of a b-tree.  If it is not, then the cursor acquired
+** will not work correctly.
+**
+** The comparison function must be logically the same for every cursor
+** on a particular table.  Changing the comparison function will result
+** in incorrect operations.  If the comparison function is NULL, a
+** default comparison function is used.  The comparison function is
+** always ignored for INTKEY tables.
+*/
+static int btreeCursor(
+  Btree *p,                                   /* The btree */
+  int iTable,                                 /* Root page of table to open */
+  int wrFlag,                                 /* 1 to write. 0 read-only */
+  int (*xCmp)(void*,int,const void*,int,const void*), /* Key Comparison func */
+  void *pArg,                                 /* First arg to xCompare() */
+  BtCursor **ppCur                            /* Write new cursor here */
+){
+  int rc;
+  BtCursor *pCur;
+  BtShared *pBt = p->pBt;
+
+  assert( sqlite3BtreeHoldsMutex(p) );
+  *ppCur = 0;
+  if( wrFlag ){
+    if( pBt->readOnly ){
+      return SQLITE_READONLY;
+    }
+    if( checkReadLocks(p, iTable, 0) ){
+      return SQLITE_LOCKED;
+    }
+  }
+
+  if( pBt->pPage1==0 ){
+    rc = lockBtreeWithRetry(p);
+    if( rc!=SQLITE_OK ){
+      return rc;
+    }
+    if( pBt->readOnly && wrFlag ){
+      return SQLITE_READONLY;
+    }
+  }
+  pCur = sqlite3MallocZero( sizeof(*pCur) );
+  if( pCur==0 ){
+    rc = SQLITE_NOMEM;
+    goto create_cursor_exception;
+  }
+  pCur->pgnoRoot = (Pgno)iTable;
+  if( iTable==1 && sqlite3PagerPagecount(pBt->pPager)==0 ){
+    rc = SQLITE_EMPTY;
+    goto create_cursor_exception;
+  }
+  rc = getAndInitPage(pBt, pCur->pgnoRoot, &pCur->pPage, 0);
+  if( rc!=SQLITE_OK ){
+    goto create_cursor_exception;
+  }
+
+  /* Now that no other errors can occur, finish filling in the BtCursor
+  ** variables, link the cursor into the BtShared list and set *ppCur (the
+  ** output argument to this function).
+  */
+  pCur->xCompare = xCmp ? xCmp : dfltCompare;
+  pCur->pArg = pArg;
+  pCur->pBtree = p;
+  pCur->pBt = pBt;
+  pCur->wrFlag = wrFlag;
+  pCur->pNext = pBt->pCursor;
+  if( pCur->pNext ){
+    pCur->pNext->pPrev = pCur;
+  }
+  pBt->pCursor = pCur;
+  pCur->eState = CURSOR_INVALID;
+  *ppCur = pCur;
+
+  return SQLITE_OK;
+
+create_cursor_exception:
+  if( pCur ){
+    releasePage(pCur->pPage);
+    sqlite3_free(pCur);
+  }
+  unlockBtreeIfUnused(pBt);
+  return rc;
+}
+int sqlite3BtreeCursor(
+  Btree *p,                                   /* The btree */
+  int iTable,                                 /* Root page of table to open */
+  int wrFlag,                                 /* 1 to write. 0 read-only */
+  int (*xCmp)(void*,int,const void*,int,const void*), /* Key Comparison func */
+  void *pArg,                                 /* First arg to xCompare() */
+  BtCursor **ppCur                            /* Write new cursor here */
+){
+  int rc;
+  sqlite3BtreeEnter(p);
+  p->pBt->db = p->db;
+  rc = btreeCursor(p, iTable, wrFlag, xCmp, pArg, ppCur);
+  sqlite3BtreeLeave(p);
+  return rc;
+}
+
+
+/*
+** Close a cursor.  The read lock on the database file is released
+** when the last cursor is closed.
+*/
+int sqlite3BtreeCloseCursor(BtCursor *pCur){
+  BtShared *pBt = pCur->pBt;
+  Btree *pBtree = pCur->pBtree;
+
+  sqlite3BtreeEnter(pBtree);
+  pBt->db = pBtree->db;
+  clearCursorPosition(pCur);
+  if( pCur->pPrev ){
+    pCur->pPrev->pNext = pCur->pNext;
+  }else{
+    pBt->pCursor = pCur->pNext;
+  }
+  if( pCur->pNext ){
+    pCur->pNext->pPrev = pCur->pPrev;
+  }
+  releasePage(pCur->pPage);
+  unlockBtreeIfUnused(pBt);
+  invalidateOverflowCache(pCur);
+  sqlite3_free(pCur);
+  sqlite3BtreeLeave(pBtree);
+  return SQLITE_OK;
+}
+
+/*
+** Make a temporary cursor by filling in the fields of pTempCur.
+** The temporary cursor is not on the cursor list for the Btree.
+*/
+void sqlite3BtreeGetTempCursor(BtCursor *pCur, BtCursor *pTempCur){
+  assert( cursorHoldsMutex(pCur) );
+  memcpy(pTempCur, pCur, sizeof(*pCur));
+  pTempCur->pNext = 0;
+  pTempCur->pPrev = 0;
+  if( pTempCur->pPage ){
+    sqlite3PagerRef(pTempCur->pPage->pDbPage);
+  }
+}
+
+/*
+** Delete a temporary cursor such as was made by the CreateTemporaryCursor()
+** function above.
+*/
+void sqlite3BtreeReleaseTempCursor(BtCursor *pCur){
+  assert( cursorHoldsMutex(pCur) );
+  if( pCur->pPage ){
+    sqlite3PagerUnref(pCur->pPage->pDbPage);
+  }
+}
+
+/*
+** Make sure the BtCursor* given in the argument has a valid
+** BtCursor.info structure.  If it is not already valid, call
+** sqlite3BtreeParseCell() to fill it in.
+**
+** BtCursor.info is a cache of the information in the current cell.
+** Using this cache reduces the number of calls to sqlite3BtreeParseCell().
+**
+** 2007-06-25:  There is a bug in some versions of MSVC that cause the
+** compiler to crash when getCellInfo() is implemented as a macro.
+** But there is a measureable speed advantage to using the macro on gcc
+** (when less compiler optimizations like -Os or -O0 are used and the
+** compiler is not doing agressive inlining.)  So we use a real function
+** for MSVC and a macro for everything else.  Ticket #2457.
+*/
+#ifndef NDEBUG
+  static void assertCellInfo(BtCursor *pCur){
+    CellInfo info;
+    memset(&info, 0, sizeof(info));
+    sqlite3BtreeParseCell(pCur->pPage, pCur->idx, &info);
+    assert( memcmp(&info, &pCur->info, sizeof(info))==0 );
+  }
+#else
+  #define assertCellInfo(x)
+#endif
+#ifdef _MSC_VER
+  /* Use a real function in MSVC to work around bugs in that compiler. */
+  static void getCellInfo(BtCursor *pCur){
+    if( pCur->info.nSize==0 ){
+      sqlite3BtreeParseCell(pCur->pPage, pCur->idx, &pCur->info);
+    }else{
+      assertCellInfo(pCur);
+    }
+  }
+#else /* if not _MSC_VER */
+  /* Use a macro in all other compilers so that the function is inlined */
+#define getCellInfo(pCur)                                               \
+  if( pCur->info.nSize==0 ){                                            \
+    sqlite3BtreeParseCell(pCur->pPage, pCur->idx, &pCur->info);         \
+  }else{                                                                \
+    assertCellInfo(pCur);                                               \
+  }
+#endif /* _MSC_VER */
+
+/*
+** Set *pSize to the size of the buffer needed to hold the value of
+** the key for the current entry.  If the cursor is not pointing
+** to a valid entry, *pSize is set to 0.
+**
+** For a table with the INTKEY flag set, this routine returns the key
+** itself, not the number of bytes in the key.
+*/
+int sqlite3BtreeKeySize(BtCursor *pCur, i64 *pSize){
+  int rc;
+
+  assert( cursorHoldsMutex(pCur) );
+  rc = restoreOrClearCursorPosition(pCur);
+  if( rc==SQLITE_OK ){
+    assert( pCur->eState==CURSOR_INVALID || pCur->eState==CURSOR_VALID );
+    if( pCur->eState==CURSOR_INVALID ){
+      *pSize = 0;
+    }else{
+      getCellInfo(pCur);
+      *pSize = pCur->info.nKey;
+    }
+  }
+  return rc;
+}
+
+/*
+** Set *pSize to the number of bytes of data in the entry the
+** cursor currently points to.  Always return SQLITE_OK.
+** Failure is not possible.  If the cursor is not currently
+** pointing to an entry (which can happen, for example, if
+** the database is empty) then *pSize is set to 0.
+*/
+int sqlite3BtreeDataSize(BtCursor *pCur, u32 *pSize){
+  int rc;
+
+  assert( cursorHoldsMutex(pCur) );
+  rc = restoreOrClearCursorPosition(pCur);
+  if( rc==SQLITE_OK ){
+    assert( pCur->eState==CURSOR_INVALID || pCur->eState==CURSOR_VALID );
+    if( pCur->eState==CURSOR_INVALID ){
+      /* Not pointing at a valid entry - set *pSize to 0. */
+      *pSize = 0;
+    }else{
+      getCellInfo(pCur);
+      *pSize = pCur->info.nData;
+    }
+  }
+  return rc;
+}
+
+/*
+** Given the page number of an overflow page in the database (parameter
+** ovfl), this function finds the page number of the next page in the
+** linked list of overflow pages. If possible, it uses the auto-vacuum
+** pointer-map data instead of reading the content of page ovfl to do so.
+**
+** If an error occurs an SQLite error code is returned. Otherwise:
+**
+** Unless pPgnoNext is NULL, the page number of the next overflow
+** page in the linked list is written to *pPgnoNext. If page ovfl
+** is the last page in its linked list, *pPgnoNext is set to zero.
+**
+** If ppPage is not NULL, *ppPage is set to the MemPage* handle
+** for page ovfl. The underlying pager page may have been requested
+** with the noContent flag set, so the page data accessable via
+** this handle may not be trusted.
+*/
+static int getOverflowPage(
+  BtShared *pBt,
+  Pgno ovfl,                   /* Overflow page */
+  MemPage **ppPage,            /* OUT: MemPage handle */
+  Pgno *pPgnoNext              /* OUT: Next overflow page number */
+){
+  Pgno next = 0;
+  int rc;
+
+  assert( sqlite3_mutex_held(pBt->mutex) );
+  /* One of these must not be NULL. Otherwise, why call this function? */
+  assert(ppPage || pPgnoNext);
+
+  /* If pPgnoNext is NULL, then this function is being called to obtain
+  ** a MemPage* reference only. No page-data is required in this case.
+  */
+  if( !pPgnoNext ){
+    return sqlite3BtreeGetPage(pBt, ovfl, ppPage, 1);
+  }
+
+#ifndef SQLITE_OMIT_AUTOVACUUM
+  /* Try to find the next page in the overflow list using the
+  ** autovacuum pointer-map pages. Guess that the next page in
+  ** the overflow list is page number (ovfl+1). If that guess turns
+  ** out to be wrong, fall back to loading the data of page
+  ** number ovfl to determine the next page number.
+  */
+  if( pBt->autoVacuum ){
+    Pgno pgno;
+    Pgno iGuess = ovfl+1;
+    u8 eType;
+
+    while( PTRMAP_ISPAGE(pBt, iGuess) || iGuess==PENDING_BYTE_PAGE(pBt) ){
+      iGuess++;
+    }
+
+    if( iGuess<=sqlite3PagerPagecount(pBt->pPager) ){
+      rc = ptrmapGet(pBt, iGuess, &eType, &pgno);
+      if( rc!=SQLITE_OK ){
+        return rc;
+      }
+      if( eType==PTRMAP_OVERFLOW2 && pgno==ovfl ){
+        next = iGuess;
+      }
+    }
+  }
+#endif
+
+  if( next==0 || ppPage ){
+    MemPage *pPage = 0;
+
+    rc = sqlite3BtreeGetPage(pBt, ovfl, &pPage, next!=0);
+    assert(rc==SQLITE_OK || pPage==0);
+    if( next==0 && rc==SQLITE_OK ){
+      next = get4byte(pPage->aData);
+    }
+
+    if( ppPage ){
+      *ppPage = pPage;
+    }else{
+      releasePage(pPage);
+    }
+  }
+  *pPgnoNext = next;
+
+  return rc;
+}
+
+/*
+** Copy data from a buffer to a page, or from a page to a buffer.
+**
+** pPayload is a pointer to data stored on database page pDbPage.
+** If argument eOp is false, then nByte bytes of data are copied
+** from pPayload to the buffer pointed at by pBuf. If eOp is true,
+** then sqlite3PagerWrite() is called on pDbPage and nByte bytes
+** of data are copied from the buffer pBuf to pPayload.
+**
+** SQLITE_OK is returned on success, otherwise an error code.
+*/
+static int copyPayload(
+  void *pPayload,           /* Pointer to page data */
+  void *pBuf,               /* Pointer to buffer */
+  int nByte,                /* Number of bytes to copy */
+  int eOp,                  /* 0 -> copy from page, 1 -> copy to page */
+  DbPage *pDbPage           /* Page containing pPayload */
+){
+  if( eOp ){
+    /* Copy data from buffer to page (a write operation) */
+    int rc = sqlite3PagerWrite(pDbPage);
+    if( rc!=SQLITE_OK ){
+      return rc;
+    }
+    memcpy(pPayload, pBuf, nByte);
+  }else{
+    /* Copy data from page to buffer (a read operation) */
+    memcpy(pBuf, pPayload, nByte);
+  }
+  return SQLITE_OK;
+}
+
+/*
+** This function is used to read or overwrite payload information
+** for the entry that the pCur cursor is pointing to. If the eOp
+** parameter is 0, this is a read operation (data copied into
+** buffer pBuf). If it is non-zero, a write (data copied from
+** buffer pBuf).
+**
+** A total of "amt" bytes are read or written beginning at "offset".
+** Data is read to or from the buffer pBuf.
+**
+** This routine does not make a distinction between key and data.
+** It just reads or writes bytes from the payload area.  Data might
+** appear on the main page or be scattered out on multiple overflow
+** pages.
+**
+** If the BtCursor.isIncrblobHandle flag is set, and the current
+** cursor entry uses one or more overflow pages, this function
+** allocates space for and lazily popluates the overflow page-list
+** cache array (BtCursor.aOverflow). Subsequent calls use this
+** cache to make seeking to the supplied offset more efficient.
+**
+** Once an overflow page-list cache has been allocated, it may be
+** invalidated if some other cursor writes to the same table, or if
+** the cursor is moved to a different row. Additionally, in auto-vacuum
+** mode, the following events may invalidate an overflow page-list cache.
+**
+**   * An incremental vacuum,
+**   * A commit in auto_vacuum="full" mode,
+**   * Creating a table (may require moving an overflow page).
+*/
+static int accessPayload(
+  BtCursor *pCur,      /* Cursor pointing to entry to read from */
+  int offset,          /* Begin reading this far into payload */
+  int amt,             /* Read this many bytes */
+  unsigned char *pBuf, /* Write the bytes into this buffer */
+  int skipKey,         /* offset begins at data if this is true */
+  int eOp              /* zero to read. non-zero to write. */
+){
+  unsigned char *aPayload;
+  int rc = SQLITE_OK;
+  u32 nKey;
+  int iIdx = 0;
+  MemPage *pPage = pCur->pPage;     /* Btree page of current cursor entry */
+  BtShared *pBt;                   /* Btree this cursor belongs to */
+
+  assert( pPage );
+  assert( pCur->eState==CURSOR_VALID );
+  assert( pCur->idx>=0 && pCur->idx<pPage->nCell );
+  assert( offset>=0 );
+  assert( cursorHoldsMutex(pCur) );
+
+  getCellInfo(pCur);
+  aPayload = pCur->info.pCell + pCur->info.nHeader;
+  nKey = (pPage->intKey ? 0 : pCur->info.nKey);
+
+  if( skipKey ){
+    offset += nKey;
+  }
+  if( offset+amt > nKey+pCur->info.nData ){
+    /* Trying to read or write past the end of the data is an error */
+    return SQLITE_ERROR;
+  }
+
+  /* Check if data must be read/written to/from the btree page itself. */
+  if( offset<pCur->info.nLocal ){
+    int a = amt;
+    if( a+offset>pCur->info.nLocal ){
+      a = pCur->info.nLocal - offset;
+    }
+    rc = copyPayload(&aPayload[offset], pBuf, a, eOp, pPage->pDbPage);
+    offset = 0;
+    pBuf += a;
+    amt -= a;
+  }else{
+    offset -= pCur->info.nLocal;
+  }
+
+  pBt = pCur->pBt;
+  if( rc==SQLITE_OK && amt>0 ){
+    const int ovflSize = pBt->usableSize - 4;  /* Bytes content per ovfl page */
+    Pgno nextPage;
+
+    nextPage = get4byte(&aPayload[pCur->info.nLocal]);
+
+#ifndef SQLITE_OMIT_INCRBLOB
+    /* If the isIncrblobHandle flag is set and the BtCursor.aOverflow[]
+    ** has not been allocated, allocate it now. The array is sized at
+    ** one entry for each overflow page in the overflow chain. The
+    ** page number of the first overflow page is stored in aOverflow[0],
+    ** etc. A value of 0 in the aOverflow[] array means "not yet known"
+    ** (the cache is lazily populated).
+    */
+    if( pCur->isIncrblobHandle && !pCur->aOverflow ){
+      int nOvfl = (pCur->info.nPayload-pCur->info.nLocal+ovflSize-1)/ovflSize;
+      pCur->aOverflow = (Pgno *)sqlite3MallocZero(sizeof(Pgno)*nOvfl);
+      if( nOvfl && !pCur->aOverflow ){
+        rc = SQLITE_NOMEM;
+      }
+    }
+
+    /* If the overflow page-list cache has been allocated and the
+    ** entry for the first required overflow page is valid, skip
+    ** directly to it.
+    */
+    if( pCur->aOverflow && pCur->aOverflow[offset/ovflSize] ){
+      iIdx = (offset/ovflSize);
+      nextPage = pCur->aOverflow[iIdx];
+      offset = (offset%ovflSize);
+    }
+#endif
+
+    for( ; rc==SQLITE_OK && amt>0 && nextPage; iIdx++){
+
+#ifndef SQLITE_OMIT_INCRBLOB
+      /* If required, populate the overflow page-list cache. */
+      if( pCur->aOverflow ){
+        assert(!pCur->aOverflow[iIdx] || pCur->aOverflow[iIdx]==nextPage);
+        pCur->aOverflow[iIdx] = nextPage;
+      }
+#endif
+
+      if( offset>=ovflSize ){
+        /* The only reason to read this page is to obtain the page
+        ** number for the next page in the overflow chain. The page
+        ** data is not required. So first try to lookup the overflow
+        ** page-list cache, if any, then fall back to the getOverflowPage()
+        ** function.
+        */
+#ifndef SQLITE_OMIT_INCRBLOB
+        if( pCur->aOverflow && pCur->aOverflow[iIdx+1] ){
+          nextPage = pCur->aOverflow[iIdx+1];
+        } else
+#endif
+          rc = getOverflowPage(pBt, nextPage, 0, &nextPage);
+        offset -= ovflSize;
+      }else{
+        /* Need to read this page properly. It contains some of the
+        ** range of data that is being read (eOp==0) or written (eOp!=0).
+        */
+        DbPage *pDbPage;
+        int a = amt;
+        rc = sqlite3PagerGet(pBt->pPager, nextPage, &pDbPage);
+        if( rc==SQLITE_OK ){
+          aPayload = sqlite3PagerGetData(pDbPage);
+          nextPage = get4byte(aPayload);
+          if( a + offset > ovflSize ){
+            a = ovflSize - offset;
+          }
+          rc = copyPayload(&aPayload[offset+4], pBuf, a, eOp, pDbPage);
+          sqlite3PagerUnref(pDbPage);
+          offset = 0;
+          amt -= a;
+          pBuf += a;
+        }
+      }
+    }
+  }
+
+  if( rc==SQLITE_OK && amt>0 ){
+    return SQLITE_CORRUPT_BKPT;
+  }
+  return rc;
+}
+
+/*
+** Read part of the key associated with cursor pCur.  Exactly
+** "amt" bytes will be transfered into pBuf[].  The transfer
+** begins at "offset".
+**
+** Return SQLITE_OK on success or an error code if anything goes
+** wrong.  An error is returned if "offset+amt" is larger than
+** the available payload.
+*/
+int sqlite3BtreeKey(BtCursor *pCur, u32 offset, u32 amt, void *pBuf){
+  int rc;
+
+  assert( cursorHoldsMutex(pCur) );
+  rc = restoreOrClearCursorPosition(pCur);
+  if( rc==SQLITE_OK ){
+    assert( pCur->eState==CURSOR_VALID );
+    assert( pCur->pPage!=0 );
+    if( pCur->pPage->intKey ){
+      return SQLITE_CORRUPT_BKPT;
+    }
+    assert( pCur->pPage->intKey==0 );
+    assert( pCur->idx>=0 && pCur->idx<pCur->pPage->nCell );
+    rc = accessPayload(pCur, offset, amt, (unsigned char*)pBuf, 0, 0);
+  }
+  return rc;
+}
+
+/*
+** Read part of the data associated with cursor pCur.  Exactly
+** "amt" bytes will be transfered into pBuf[].  The transfer
+** begins at "offset".
+**
+** Return SQLITE_OK on success or an error code if anything goes
+** wrong.  An error is returned if "offset+amt" is larger than
+** the available payload.
+*/
+int sqlite3BtreeData(BtCursor *pCur, u32 offset, u32 amt, void *pBuf){
+  int rc;
+
+  assert( cursorHoldsMutex(pCur) );
+  rc = restoreOrClearCursorPosition(pCur);
+  if( rc==SQLITE_OK ){
+    assert( pCur->eState==CURSOR_VALID );
+    assert( pCur->pPage!=0 );
+    assert( pCur->idx>=0 && pCur->idx<pCur->pPage->nCell );
+    rc = accessPayload(pCur, offset, amt, pBuf, 1, 0);
+  }
+  return rc;
+}
+
+/*
+** Return a pointer to payload information from the entry that the
+** pCur cursor is pointing to.  The pointer is to the beginning of
+** the key if skipKey==0 and it points to the beginning of data if
+** skipKey==1.  The number of bytes of available key/data is written
+** into *pAmt.  If *pAmt==0, then the value returned will not be
+** a valid pointer.
+**
+** This routine is an optimization.  It is common for the entire key
+** and data to fit on the local page and for there to be no overflow
+** pages.  When that is so, this routine can be used to access the
+** key and data without making a copy.  If the key and/or data spills
+** onto overflow pages, then accessPayload() must be used to reassembly
+** the key/data and copy it into a preallocated buffer.
+**
+** The pointer returned by this routine looks directly into the cached
+** page of the database.  The data might change or move the next time
+** any btree routine is called.
+*/
+static const unsigned char *fetchPayload(
+  BtCursor *pCur,      /* Cursor pointing to entry to read from */
+  int *pAmt,           /* Write the number of available bytes here */
+  int skipKey          /* read beginning at data if this is true */
+){
+  unsigned char *aPayload;
+  MemPage *pPage;
+  u32 nKey;
+  int nLocal;
+
+  assert( pCur!=0 && pCur->pPage!=0 );
+  assert( pCur->eState==CURSOR_VALID );
+  assert( cursorHoldsMutex(pCur) );
+  pPage = pCur->pPage;
+  assert( pCur->idx>=0 && pCur->idx<pPage->nCell );
+  getCellInfo(pCur);
+  aPayload = pCur->info.pCell;
+  aPayload += pCur->info.nHeader;
+  if( pPage->intKey ){
+    nKey = 0;
+  }else{
+    nKey = pCur->info.nKey;
+  }
+  if( skipKey ){
+    aPayload += nKey;
+    nLocal = pCur->info.nLocal - nKey;
+  }else{
+    nLocal = pCur->info.nLocal;
+    if( nLocal>nKey ){
+      nLocal = nKey;
+    }
+  }
+  *pAmt = nLocal;
+  return aPayload;
+}
+
+
+/*
+** For the entry that cursor pCur is point to, return as
+** many bytes of the key or data as are available on the local
+** b-tree page.  Write the number of available bytes into *pAmt.
+**
+** The pointer returned is ephemeral.  The key/data may move
+** or be destroyed on the next call to any Btree routine,
+** including calls from other threads against the same cache.
+** Hence, a mutex on the BtShared should be held prior to calling
+** this routine.
+**
+** These routines is used to get quick access to key and data
+** in the common case where no overflow pages are used.
+*/
+const void *sqlite3BtreeKeyFetch(BtCursor *pCur, int *pAmt){
+  assert( cursorHoldsMutex(pCur) );
+  if( pCur->eState==CURSOR_VALID ){
+    return (const void*)fetchPayload(pCur, pAmt, 0);
+  }
+  return 0;
+}
+const void *sqlite3BtreeDataFetch(BtCursor *pCur, int *pAmt){
+  assert( cursorHoldsMutex(pCur) );
+  if( pCur->eState==CURSOR_VALID ){
+    return (const void*)fetchPayload(pCur, pAmt, 1);
+  }
+  return 0;
+}
+
+
+/*
+** Move the cursor down to a new child page.  The newPgno argument is the
+** page number of the child page to move to.
+*/
+static int moveToChild(BtCursor *pCur, u32 newPgno){
+  int rc;
+  MemPage *pNewPage;
+  MemPage *pOldPage;
+  BtShared *pBt = pCur->pBt;
+
+  assert( cursorHoldsMutex(pCur) );
+  assert( pCur->eState==CURSOR_VALID );
+  rc = getAndInitPage(pBt, newPgno, &pNewPage, pCur->pPage);
+  if( rc ) return rc;
+  pNewPage->idxParent = pCur->idx;
+  pOldPage = pCur->pPage;
+  pOldPage->idxShift = 0;
+  releasePage(pOldPage);
+  pCur->pPage = pNewPage;
+  pCur->idx = 0;
+  pCur->info.nSize = 0;
+  if( pNewPage->nCell<1 ){
+    return SQLITE_CORRUPT_BKPT;
+  }
+  return SQLITE_OK;
+}
+
+/*
+** Return true if the page is the virtual root of its table.
+**
+** The virtual root page is the root page for most tables.  But
+** for the table rooted on page 1, sometime the real root page
+** is empty except for the right-pointer.  In such cases the
+** virtual root page is the page that the right-pointer of page
+** 1 is pointing to.
+*/
+int sqlite3BtreeIsRootPage(MemPage *pPage){
+  MemPage *pParent;
+
+  assert( sqlite3_mutex_held(pPage->pBt->mutex) );
+  pParent = pPage->pParent;
+  if( pParent==0 ) return 1;
+  if( pParent->pgno>1 ) return 0;
+  if( get2byte(&pParent->aData[pParent->hdrOffset+3])==0 ) return 1;
+  return 0;
+}
+
+/*
+** Move the cursor up to the parent page.
+**
+** pCur->idx is set to the cell index that contains the pointer
+** to the page we are coming from.  If we are coming from the
+** right-most child page then pCur->idx is set to one more than
+** the largest cell index.
+*/
+void sqlite3BtreeMoveToParent(BtCursor *pCur){
+  MemPage *pParent;
+  MemPage *pPage;
+  int idxParent;
+
+  assert( cursorHoldsMutex(pCur) );
+  assert( pCur->eState==CURSOR_VALID );
+  pPage = pCur->pPage;
+  assert( pPage!=0 );
+  assert( !sqlite3BtreeIsRootPage(pPage) );
+  pParent = pPage->pParent;
+  assert( pParent!=0 );
+  idxParent = pPage->idxParent;
+  sqlite3PagerRef(pParent->pDbPage);
+  releasePage(pPage);
+  pCur->pPage = pParent;
+  pCur->info.nSize = 0;
+  assert( pParent->idxShift==0 );
+  pCur->idx = idxParent;
+}
+
+/*
+** Move the cursor to the root page
+*/
+static int moveToRoot(BtCursor *pCur){
+  MemPage *pRoot;
+  int rc = SQLITE_OK;
+  Btree *p = pCur->pBtree;
+  BtShared *pBt = p->pBt;
+
+  assert( cursorHoldsMutex(pCur) );
+  assert( CURSOR_INVALID < CURSOR_REQUIRESEEK );
+  assert( CURSOR_VALID   < CURSOR_REQUIRESEEK );
+  assert( CURSOR_FAULT   > CURSOR_REQUIRESEEK );
+  if( pCur->eState>=CURSOR_REQUIRESEEK ){
+    if( pCur->eState==CURSOR_FAULT ){
+      return pCur->skip;
+    }
+    clearCursorPosition(pCur);
+  }
+  pRoot = pCur->pPage;
+  if( pRoot && pRoot->pgno==pCur->pgnoRoot ){
+    assert( pRoot->isInit );
+  }else{
+    if(
+      SQLITE_OK!=(rc = getAndInitPage(pBt, pCur->pgnoRoot, &pRoot, 0))
+    ){
+      pCur->eState = CURSOR_INVALID;
+      return rc;
+    }
+    releasePage(pCur->pPage);
+    pCur->pPage = pRoot;
+  }
+  pCur->idx = 0;
+  pCur->info.nSize = 0;
+  if( pRoot->nCell==0 && !pRoot->leaf ){
+    Pgno subpage;
+    assert( pRoot->pgno==1 );
+    subpage = get4byte(&pRoot->aData[pRoot->hdrOffset+8]);
+    assert( subpage>0 );
+    pCur->eState = CURSOR_VALID;
+    rc = moveToChild(pCur, subpage);
+  }
+  pCur->eState = ((pCur->pPage->nCell>0)?CURSOR_VALID:CURSOR_INVALID);
+  return rc;
+}
+
+/*
+** Move the cursor down to the left-most leaf entry beneath the
+** entry to which it is currently pointing.
+**
+** The left-most leaf is the one with the smallest key - the first
+** in ascending order.
+*/
+static int moveToLeftmost(BtCursor *pCur){
+  Pgno pgno;
+  int rc = SQLITE_OK;
+  MemPage *pPage;
+
+  assert( cursorHoldsMutex(pCur) );
+  assert( pCur->eState==CURSOR_VALID );
+  while( rc==SQLITE_OK && !(pPage = pCur->pPage)->leaf ){
+    assert( pCur->idx>=0 && pCur->idx<pPage->nCell );
+    pgno = get4byte(findCell(pPage, pCur->idx));
+    rc = moveToChild(pCur, pgno);
+  }
+  return rc;
+}
+
+/*
+** Move the cursor down to the right-most leaf entry beneath the
+** page to which it is currently pointing.  Notice the difference
+** between moveToLeftmost() and moveToRightmost().  moveToLeftmost()
+** finds the left-most entry beneath the *entry* whereas moveToRightmost()
+** finds the right-most entry beneath the *page*.
+**
+** The right-most entry is the one with the largest key - the last
+** key in ascending order.
+*/
+static int moveToRightmost(BtCursor *pCur){
+  Pgno pgno;
+  int rc = SQLITE_OK;
+  MemPage *pPage;
+
+  assert( cursorHoldsMutex(pCur) );
+  assert( pCur->eState==CURSOR_VALID );
+  while( rc==SQLITE_OK && !(pPage = pCur->pPage)->leaf ){
+    pgno = get4byte(&pPage->aData[pPage->hdrOffset+8]);
+    pCur->idx = pPage->nCell;
+    rc = moveToChild(pCur, pgno);
+  }
+  if( rc==SQLITE_OK ){
+    pCur->idx = pPage->nCell - 1;
+    pCur->info.nSize = 0;
+  }
+  return SQLITE_OK;
+}
+
+/* Move the cursor to the first entry in the table.  Return SQLITE_OK
+** on success.  Set *pRes to 0 if the cursor actually points to something
+** or set *pRes to 1 if the table is empty.
+*/
+int sqlite3BtreeFirst(BtCursor *pCur, int *pRes){
+  int rc;
+
+  assert( cursorHoldsMutex(pCur) );
+  assert( sqlite3_mutex_held(pCur->pBtree->db->mutex) );
+  rc = moveToRoot(pCur);
+  if( rc==SQLITE_OK ){
+    if( pCur->eState==CURSOR_INVALID ){
+      assert( pCur->pPage->nCell==0 );
+      *pRes = 1;
+      rc = SQLITE_OK;
+    }else{
+      assert( pCur->pPage->nCell>0 );
+      *pRes = 0;
+      rc = moveToLeftmost(pCur);
+    }
+  }
+  return rc;
+}
+
+/* Move the cursor to the last entry in the table.  Return SQLITE_OK
+** on success.  Set *pRes to 0 if the cursor actually points to something
+** or set *pRes to 1 if the table is empty.
+*/
+int sqlite3BtreeLast(BtCursor *pCur, int *pRes){
+  int rc;
+
+  assert( cursorHoldsMutex(pCur) );
+  assert( sqlite3_mutex_held(pCur->pBtree->db->mutex) );
+  rc = moveToRoot(pCur);
+  if( rc==SQLITE_OK ){
+    if( CURSOR_INVALID==pCur->eState ){
+      assert( pCur->pPage->nCell==0 );
+      *pRes = 1;
+    }else{
+      assert( pCur->eState==CURSOR_VALID );
+      *pRes = 0;
+      rc = moveToRightmost(pCur);
+    }
+  }
+  return rc;
+}
+
+/* Move the cursor so that it points to an entry near pKey/nKey.
+** Return a success code.
+**
+** For INTKEY tables, only the nKey parameter is used.  pKey is
+** ignored.  For other tables, nKey is the number of bytes of data
+** in pKey.  The comparison function specified when the cursor was
+** created is used to compare keys.
+**
+** If an exact match is not found, then the cursor is always
+** left pointing at a leaf page which would hold the entry if it
+** were present.  The cursor might point to an entry that comes
+** before or after the key.
+**
+** The result of comparing the key with the entry to which the
+** cursor is written to *pRes if pRes!=NULL.  The meaning of
+** this value is as follows:
+**
+**     *pRes<0      The cursor is left pointing at an entry that
+**                  is smaller than pKey or if the table is empty
+**                  and the cursor is therefore left point to nothing.
+**
+**     *pRes==0     The cursor is left pointing at an entry that
+**                  exactly matches pKey.
+**
+**     *pRes>0      The cursor is left pointing at an entry that
+**                  is larger than pKey.
+**
+*/
+int sqlite3BtreeMoveto(
+  BtCursor *pCur,        /* The cursor to be moved */
+  const void *pKey,      /* The key content for indices.  Not used by tables */
+  i64 nKey,              /* Size of pKey.  Or the key for tables */
+  int biasRight,         /* If true, bias the search to the high end */
+  int *pRes              /* Search result flag */
+){
+  int rc;
+
+  assert( cursorHoldsMutex(pCur) );
+  assert( sqlite3_mutex_held(pCur->pBtree->db->mutex) );
+  rc = moveToRoot(pCur);
+  if( rc ){
+    return rc;
+  }
+  assert( pCur->pPage );
+  assert( pCur->pPage->isInit );
+  if( pCur->eState==CURSOR_INVALID ){
+    *pRes = -1;
+    assert( pCur->pPage->nCell==0 );
+    return SQLITE_OK;
+  }
+  for(;;){
+    int lwr, upr;
+    Pgno chldPg;
+    MemPage *pPage = pCur->pPage;
+    int c = -1;  /* pRes return if table is empty must be -1 */
+    lwr = 0;
+    upr = pPage->nCell-1;
+    if( !pPage->intKey && pKey==0 ){
+      return SQLITE_CORRUPT_BKPT;
+    }
+    if( biasRight ){
+      pCur->idx = upr;
+    }else{
+      pCur->idx = (upr+lwr)/2;
+    }
+    if( lwr<=upr ) for(;;){
+      void *pCellKey;
+      i64 nCellKey;
+      pCur->info.nSize = 0;
+      if( pPage->intKey ){
+        u8 *pCell;
+        pCell = findCell(pPage, pCur->idx) + pPage->childPtrSize;
+        if( pPage->hasData ){
+          u32 dummy;
+          pCell += getVarint32(pCell, &dummy);
+        }
+        getVarint(pCell, (u64 *)&nCellKey);
+        if( nCellKey<nKey ){
+          c = -1;
+        }else if( nCellKey>nKey ){
+          c = +1;
+        }else{
+          c = 0;
+        }
+      }else{
+        int available;
+        pCellKey = (void *)fetchPayload(pCur, &available, 0);
+        nCellKey = pCur->info.nKey;
+        if( available>=nCellKey ){
+          c = pCur->xCompare(pCur->pArg, nCellKey, pCellKey, nKey, pKey);
+        }else{
+          pCellKey = sqlite3_malloc( nCellKey );
+          if( pCellKey==0 ) return SQLITE_NOMEM;
+          rc = sqlite3BtreeKey(pCur, 0, nCellKey, (void *)pCellKey);
+          c = pCur->xCompare(pCur->pArg, nCellKey, pCellKey, nKey, pKey);
+          sqlite3_free(pCellKey);
+          if( rc ){
+            return rc;
+          }
+        }
+      }
+      if( c==0 ){
+        if( pPage->leafData && !pPage->leaf ){
+          lwr = pCur->idx;
+          upr = lwr - 1;
+          break;
+        }else{
+          if( pRes ) *pRes = 0;
+          return SQLITE_OK;
+        }
+      }
+      if( c<0 ){
+        lwr = pCur->idx+1;
+      }else{
+        upr = pCur->idx-1;
+      }
+      if( lwr>upr ){
+        break;
+      }
+      pCur->idx = (lwr+upr)/2;
+    }
+    assert( lwr==upr+1 );
+    assert( pPage->isInit );
+    if( pPage->leaf ){
+      chldPg = 0;
+    }else if( lwr>=pPage->nCell ){
+      chldPg = get4byte(&pPage->aData[pPage->hdrOffset+8]);
+    }else{
+      chldPg = get4byte(findCell(pPage, lwr));
+    }
+    if( chldPg==0 ){
+      assert( pCur->idx>=0 && pCur->idx<pCur->pPage->nCell );
+      if( pRes ) *pRes = c;
+      return SQLITE_OK;
+    }
+    pCur->idx = lwr;
+    pCur->info.nSize = 0;
+    rc = moveToChild(pCur, chldPg);
+    if( rc ){
+      return rc;
+    }
+  }
+  /* NOT REACHED */
+}
+
+
+/*
+** Return TRUE if the cursor is not pointing at an entry of the table.
+**
+** TRUE will be returned after a call to sqlite3BtreeNext() moves
+** past the last entry in the table or sqlite3BtreePrev() moves past
+** the first entry.  TRUE is also returned if the table is empty.
+*/
+int sqlite3BtreeEof(BtCursor *pCur){
+  /* TODO: What if the cursor is in CURSOR_REQUIRESEEK but all table entries
+  ** have been deleted? This API will need to change to return an error code
+  ** as well as the boolean result value.
+  */
+  return (CURSOR_VALID!=pCur->eState);
+}
+
+/*
+** Return the database connection handle for a cursor.
+*/
+sqlite3 *sqlite3BtreeCursorDb(const BtCursor *pCur){
+  assert( sqlite3_mutex_held(pCur->pBtree->db->mutex) );
+  return pCur->pBtree->db;
+}
+
+/*
+** Advance the cursor to the next entry in the database.  If
+** successful then set *pRes=0.  If the cursor
+** was already pointing to the last entry in the database before
+** this routine was called, then set *pRes=1.
+*/
+static int btreeNext(BtCursor *pCur, int *pRes){
+  int rc;
+  MemPage *pPage;
+
+  assert( cursorHoldsMutex(pCur) );
+  rc = restoreOrClearCursorPosition(pCur);
+  if( rc!=SQLITE_OK ){
+    return rc;
+  }
+  assert( pRes!=0 );
+  pPage = pCur->pPage;
+  if( CURSOR_INVALID==pCur->eState ){
+    *pRes = 1;
+    return SQLITE_OK;
+  }
+  if( pCur->skip>0 ){
+    pCur->skip = 0;
+    *pRes = 0;
+    return SQLITE_OK;
+  }
+  pCur->skip = 0;
+
+  assert( pPage->isInit );
+  assert( pCur->idx<pPage->nCell );
+
+  pCur->idx++;
+  pCur->info.nSize = 0;
+  if( pCur->idx>=pPage->nCell ){
+    if( !pPage->leaf ){
+      rc = moveToChild(pCur, get4byte(&pPage->aData[pPage->hdrOffset+8]));
+      if( rc ) return rc;
+      rc = moveToLeftmost(pCur);
+      *pRes = 0;
+      return rc;
+    }
+    do{
+      if( sqlite3BtreeIsRootPage(pPage) ){
+        *pRes = 1;
+        pCur->eState = CURSOR_INVALID;
+        return SQLITE_OK;
+      }
+      sqlite3BtreeMoveToParent(pCur);
+      pPage = pCur->pPage;
+    }while( pCur->idx>=pPage->nCell );
+    *pRes = 0;
+    if( pPage->leafData ){
+      rc = sqlite3BtreeNext(pCur, pRes);
+    }else{
+      rc = SQLITE_OK;
+    }
+    return rc;
+  }
+  *pRes = 0;
+  if( pPage->leaf ){
+    return SQLITE_OK;
+  }
+  rc = moveToLeftmost(pCur);
+  return rc;
+}
+int sqlite3BtreeNext(BtCursor *pCur, int *pRes){
+  int rc;
+  assert( cursorHoldsMutex(pCur) );
+  rc = btreeNext(pCur, pRes);
+  return rc;
+}
+
+
+/*
+** Step the cursor to the back to the previous entry in the database.  If
+** successful then set *pRes=0.  If the cursor
+** was already pointing to the first entry in the database before
+** this routine was called, then set *pRes=1.
+*/
+static int btreePrevious(BtCursor *pCur, int *pRes){
+  int rc;
+  Pgno pgno;
+  MemPage *pPage;
+
+  assert( cursorHoldsMutex(pCur) );
+  rc = restoreOrClearCursorPosition(pCur);
+  if( rc!=SQLITE_OK ){
+    return rc;
+  }
+  if( CURSOR_INVALID==pCur->eState ){
+    *pRes = 1;
+    return SQLITE_OK;
+  }
+  if( pCur->skip<0 ){
+    pCur->skip = 0;
+    *pRes = 0;
+    return SQLITE_OK;
+  }
+  pCur->skip = 0;
+
+  pPage = pCur->pPage;
+  assert( pPage->isInit );
+  assert( pCur->idx>=0 );
+  if( !pPage->leaf ){
+    pgno = get4byte( findCell(pPage, pCur->idx) );
+    rc = moveToChild(pCur, pgno);
+    if( rc ){
+      return rc;
+    }
+    rc = moveToRightmost(pCur);
+  }else{
+    while( pCur->idx==0 ){
+      if( sqlite3BtreeIsRootPage(pPage) ){
+        pCur->eState = CURSOR_INVALID;
+        *pRes = 1;
+        return SQLITE_OK;
+      }
+      sqlite3BtreeMoveToParent(pCur);
+      pPage = pCur->pPage;
+    }
+    pCur->idx--;
+    pCur->info.nSize = 0;
+    if( pPage->leafData && !pPage->leaf ){
+      rc = sqlite3BtreePrevious(pCur, pRes);
+    }else{
+      rc = SQLITE_OK;
+    }
+  }
+  *pRes = 0;
+  return rc;
+}
+int sqlite3BtreePrevious(BtCursor *pCur, int *pRes){
+  int rc;
+  assert( cursorHoldsMutex(pCur) );
+  rc = btreePrevious(pCur, pRes);
+  return rc;
+}
+
+/*
+** Allocate a new page from the database file.
+**
+** The new page is marked as dirty.  (In other words, sqlite3PagerWrite()
+** has already been called on the new page.)  The new page has also
+** been referenced and the calling routine is responsible for calling
+** sqlite3PagerUnref() on the new page when it is done.
+**
+** SQLITE_OK is returned on success.  Any other return value indicates
+** an error.  *ppPage and *pPgno are undefined in the event of an error.
+** Do not invoke sqlite3PagerUnref() on *ppPage if an error is returned.
+**
+** If the "nearby" parameter is not 0, then a (feeble) effort is made to
+** locate a page close to the page number "nearby".  This can be used in an
+** attempt to keep related pages close to each other in the database file,
+** which in turn can make database access faster.
+**
+** If the "exact" parameter is not 0, and the page-number nearby exists
+** anywhere on the free-list, then it is guarenteed to be returned. This
+** is only used by auto-vacuum databases when allocating a new table.
+*/
+static int allocateBtreePage(
+  BtShared *pBt,
+  MemPage **ppPage,
+  Pgno *pPgno,
+  Pgno nearby,
+  u8 exact
+){
+  MemPage *pPage1;
+  int rc;
+  int n;     /* Number of pages on the freelist */
+  int k;     /* Number of leaves on the trunk of the freelist */
+  MemPage *pTrunk = 0;
+  MemPage *pPrevTrunk = 0;
+
+  assert( sqlite3_mutex_held(pBt->mutex) );
+  pPage1 = pBt->pPage1;
+  n = get4byte(&pPage1->aData[36]);
+  if( n>0 ){
+    /* There are pages on the freelist.  Reuse one of those pages. */
+    Pgno iTrunk;
+    u8 searchList = 0; /* If the free-list must be searched for 'nearby' */
+
+    /* If the 'exact' parameter was true and a query of the pointer-map
+    ** shows that the page 'nearby' is somewhere on the free-list, then
+    ** the entire-list will be searched for that page.
+    */
+#ifndef SQLITE_OMIT_AUTOVACUUM
+    if( exact && nearby<=sqlite3PagerPagecount(pBt->pPager) ){
+      u8 eType;
+      assert( nearby>0 );
+      assert( pBt->autoVacuum );
+      rc = ptrmapGet(pBt, nearby, &eType, 0);
+      if( rc ) return rc;
+      if( eType==PTRMAP_FREEPAGE ){
+        searchList = 1;
+      }
+      *pPgno = nearby;
+    }
+#endif
+
+    /* Decrement the free-list count by 1. Set iTrunk to the index of the
+    ** first free-list trunk page. iPrevTrunk is initially 1.
+    */
+    rc = sqlite3PagerWrite(pPage1->pDbPage);
+    if( rc ) return rc;
+    put4byte(&pPage1->aData[36], n-1);
+
+    /* The code within this loop is run only once if the 'searchList' variable
+    ** is not true. Otherwise, it runs once for each trunk-page on the
+    ** free-list until the page 'nearby' is located.
+    */
+    do {
+      pPrevTrunk = pTrunk;
+      if( pPrevTrunk ){
+        iTrunk = get4byte(&pPrevTrunk->aData[0]);
+      }else{
+        iTrunk = get4byte(&pPage1->aData[32]);
+      }
+      rc = sqlite3BtreeGetPage(pBt, iTrunk, &pTrunk, 0);
+      if( rc ){
+        pTrunk = 0;
+        goto end_allocate_page;
+      }
+
+      k = get4byte(&pTrunk->aData[4]);
+      if( k==0 && !searchList ){
+        /* The trunk has no leaves and the list is not being searched.
+        ** So extract the trunk page itself and use it as the newly
+        ** allocated page */
+        assert( pPrevTrunk==0 );
+        rc = sqlite3PagerWrite(pTrunk->pDbPage);
+        if( rc ){
+          goto end_allocate_page;
+        }
+        *pPgno = iTrunk;
+        memcpy(&pPage1->aData[32], &pTrunk->aData[0], 4);
+        *ppPage = pTrunk;
+        pTrunk = 0;
+        TRACE(("ALLOCATE: %d trunk - %d free pages left\n", *pPgno, n-1));
+      }else if( k>pBt->usableSize/4 - 8 ){
+        /* Value of k is out of range.  Database corruption */
+        rc = SQLITE_CORRUPT_BKPT;
+        goto end_allocate_page;
+#ifndef SQLITE_OMIT_AUTOVACUUM
+      }else if( searchList && nearby==iTrunk ){
+        /* The list is being searched and this trunk page is the page
+        ** to allocate, regardless of whether it has leaves.
+        */
+        assert( *pPgno==iTrunk );
+        *ppPage = pTrunk;
+        searchList = 0;
+        rc = sqlite3PagerWrite(pTrunk->pDbPage);
+        if( rc ){
+          goto end_allocate_page;
+        }
+        if( k==0 ){
+          if( !pPrevTrunk ){
+            memcpy(&pPage1->aData[32], &pTrunk->aData[0], 4);
+          }else{
+            memcpy(&pPrevTrunk->aData[0], &pTrunk->aData[0], 4);
+          }
+        }else{
+          /* The trunk page is required by the caller but it contains
+          ** pointers to free-list leaves. The first leaf becomes a trunk
+          ** page in this case.
+          */
+          MemPage *pNewTrunk;
+          Pgno iNewTrunk = get4byte(&pTrunk->aData[8]);
+          rc = sqlite3BtreeGetPage(pBt, iNewTrunk, &pNewTrunk, 0);
+          if( rc!=SQLITE_OK ){
+            goto end_allocate_page;
+          }
+          rc = sqlite3PagerWrite(pNewTrunk->pDbPage);
+          if( rc!=SQLITE_OK ){
+            releasePage(pNewTrunk);
+            goto end_allocate_page;
+          }
+          memcpy(&pNewTrunk->aData[0], &pTrunk->aData[0], 4);
+          put4byte(&pNewTrunk->aData[4], k-1);
+          memcpy(&pNewTrunk->aData[8], &pTrunk->aData[12], (k-1)*4);
+          releasePage(pNewTrunk);
+          if( !pPrevTrunk ){
+            put4byte(&pPage1->aData[32], iNewTrunk);
+          }else{
+            rc = sqlite3PagerWrite(pPrevTrunk->pDbPage);
+            if( rc ){
+              goto end_allocate_page;
+            }
+            put4byte(&pPrevTrunk->aData[0], iNewTrunk);
+          }
+        }
+        pTrunk = 0;
+        TRACE(("ALLOCATE: %d trunk - %d free pages left\n", *pPgno, n-1));
+#endif
+      }else{
+        /* Extract a leaf from the trunk */
+        int closest;
+        Pgno iPage;
+        unsigned char *aData = pTrunk->aData;
+        rc = sqlite3PagerWrite(pTrunk->pDbPage);
+        if( rc ){
+          goto end_allocate_page;
+        }
+        if( nearby>0 ){
+          int i, dist;
+          closest = 0;
+          dist = get4byte(&aData[8]) - nearby;
+          if( dist<0 ) dist = -dist;
+          for(i=1; i<k; i++){
+            int d2 = get4byte(&aData[8+i*4]) - nearby;
+            if( d2<0 ) d2 = -d2;
+            if( d2<dist ){
+              closest = i;
+              dist = d2;
+            }
+          }
+        }else{
+          closest = 0;
+        }
+
+        iPage = get4byte(&aData[8+closest*4]);
+        if( !searchList || iPage==nearby ){
+          *pPgno = iPage;
+          if( *pPgno>sqlite3PagerPagecount(pBt->pPager) ){
+            /* Free page off the end of the file */
+            return SQLITE_CORRUPT_BKPT;
+          }
+          TRACE(("ALLOCATE: %d was leaf %d of %d on trunk %d"
+                 ": %d more free pages\n",
+                 *pPgno, closest+1, k, pTrunk->pgno, n-1));
+          if( closest<k-1 ){
+            memcpy(&aData[8+closest*4], &aData[4+k*4], 4);
+          }
+          put4byte(&aData[4], k-1);
+          rc = sqlite3BtreeGetPage(pBt, *pPgno, ppPage, 1);
+          if( rc==SQLITE_OK ){
+            sqlite3PagerDontRollback((*ppPage)->pDbPage);
+            rc = sqlite3PagerWrite((*ppPage)->pDbPage);
+            if( rc!=SQLITE_OK ){
+              releasePage(*ppPage);
+            }
+          }
+          searchList = 0;
+        }
+      }
+      releasePage(pPrevTrunk);
+      pPrevTrunk = 0;
+    }while( searchList );
+  }else{
+    /* There are no pages on the freelist, so create a new page at the
+    ** end of the file */
+    *pPgno = sqlite3PagerPagecount(pBt->pPager) + 1;
+
+#ifndef SQLITE_OMIT_AUTOVACUUM
+    if( pBt->nTrunc ){
+      /* An incr-vacuum has already run within this transaction. So the
+      ** page to allocate is not from the physical end of the file, but
+      ** at pBt->nTrunc.
+      */
+      *pPgno = pBt->nTrunc+1;
+      if( *pPgno==PENDING_BYTE_PAGE(pBt) ){
+        (*pPgno)++;
+      }
+    }
+    if( pBt->autoVacuum && PTRMAP_ISPAGE(pBt, *pPgno) ){
+      /* If *pPgno refers to a pointer-map page, allocate two new pages
+      ** at the end of the file instead of one. The first allocated page
+      ** becomes a new pointer-map page, the second is used by the caller.
+      */
+      TRACE(("ALLOCATE: %d from end of file (pointer-map page)\n", *pPgno));
+      assert( *pPgno!=PENDING_BYTE_PAGE(pBt) );
+      (*pPgno)++;
+      if( *pPgno==PENDING_BYTE_PAGE(pBt) ){ (*pPgno)++; }
+    }
+    if( pBt->nTrunc ){
+      pBt->nTrunc = *pPgno;
+    }
+#endif
+
+    assert( *pPgno!=PENDING_BYTE_PAGE(pBt) );
+    rc = sqlite3BtreeGetPage(pBt, *pPgno, ppPage, 0);
+    if( rc ) return rc;
+    rc = sqlite3PagerWrite((*ppPage)->pDbPage);
+    if( rc!=SQLITE_OK ){
+      releasePage(*ppPage);
+    }
+    TRACE(("ALLOCATE: %d from end of file\n", *pPgno));
+  }
+
+  assert( *pPgno!=PENDING_BYTE_PAGE(pBt) );
+
+end_allocate_page:
+  releasePage(pTrunk);
+  releasePage(pPrevTrunk);
+  return rc;
+}
+
+/*
+** Add a page of the database file to the freelist.
+**
+** sqlite3PagerUnref() is NOT called for pPage.
+*/
+static int freePage(MemPage *pPage){
+  BtShared *pBt = pPage->pBt;
+  MemPage *pPage1 = pBt->pPage1;
+  int rc, n, k;
+
+  /* Prepare the page for freeing */
+  assert( sqlite3_mutex_held(pPage->pBt->mutex) );
+  assert( pPage->pgno>1 );
+  pPage->isInit = 0;
+  releasePage(pPage->pParent);
+  pPage->pParent = 0;
+
+  /* Increment the free page count on pPage1 */
+  rc = sqlite3PagerWrite(pPage1->pDbPage);
+  if( rc ) return rc;
+  n = get4byte(&pPage1->aData[36]);
+  put4byte(&pPage1->aData[36], n+1);
+
+#ifdef SQLITE_SECURE_DELETE
+  /* If the SQLITE_SECURE_DELETE compile-time option is enabled, then
+  ** always fully overwrite deleted information with zeros.
+  */
+  rc = sqlite3PagerWrite(pPage->pDbPage);
+  if( rc ) return rc;
+  memset(pPage->aData, 0, pPage->pBt->pageSize);
+#endif
+
+#ifndef SQLITE_OMIT_AUTOVACUUM
+  /* If the database supports auto-vacuum, write an entry in the pointer-map
+  ** to indicate that the page is free.
+  */
+  if( pBt->autoVacuum ){
+    rc = ptrmapPut(pBt, pPage->pgno, PTRMAP_FREEPAGE, 0);
+    if( rc ) return rc;
+  }
+#endif
+
+  if( n==0 ){
+    /* This is the first free page */
+    rc = sqlite3PagerWrite(pPage->pDbPage);
+    if( rc ) return rc;
+    memset(pPage->aData, 0, 8);
+    put4byte(&pPage1->aData[32], pPage->pgno);
+    TRACE(("FREE-PAGE: %d first\n", pPage->pgno));
+  }else{
+    /* Other free pages already exist.  Retrive the first trunk page
+    ** of the freelist and find out how many leaves it has. */
+    MemPage *pTrunk;
+    rc = sqlite3BtreeGetPage(pBt, get4byte(&pPage1->aData[32]), &pTrunk, 0);
+    if( rc ) return rc;
+    k = get4byte(&pTrunk->aData[4]);
+    if( k>=pBt->usableSize/4 - 8 ){
+      /* The trunk is full.  Turn the page being freed into a new
+      ** trunk page with no leaves. */
+      rc = sqlite3PagerWrite(pPage->pDbPage);
+      if( rc==SQLITE_OK ){
+        put4byte(pPage->aData, pTrunk->pgno);
+        put4byte(&pPage->aData[4], 0);
+        put4byte(&pPage1->aData[32], pPage->pgno);
+        TRACE(("FREE-PAGE: %d new trunk page replacing %d\n",
+                pPage->pgno, pTrunk->pgno));
+      }
+    }else if( k<0 ){
+      rc = SQLITE_CORRUPT;
+    }else{
+      /* Add the newly freed page as a leaf on the current trunk */
+      rc = sqlite3PagerWrite(pTrunk->pDbPage);
+      if( rc==SQLITE_OK ){
+        put4byte(&pTrunk->aData[4], k+1);
+        put4byte(&pTrunk->aData[8+k*4], pPage->pgno);
+#ifndef SQLITE_SECURE_DELETE
+        sqlite3PagerDontWrite(pPage->pDbPage);
+#endif
+      }
+      TRACE(("FREE-PAGE: %d leaf on trunk page %d\n",pPage->pgno,pTrunk->pgno));
+    }
+    releasePage(pTrunk);
+  }
+  return rc;
+}
+
+/*
+** Free any overflow pages associated with the given Cell.
+*/
+static int clearCell(MemPage *pPage, unsigned char *pCell){
+  BtShared *pBt = pPage->pBt;
+  CellInfo info;
+  Pgno ovflPgno;
+  int rc;
+  int nOvfl;
+  int ovflPageSize;
+
+  assert( sqlite3_mutex_held(pPage->pBt->mutex) );
+  sqlite3BtreeParseCellPtr(pPage, pCell, &info);
+  if( info.iOverflow==0 ){
+    return SQLITE_OK;  /* No overflow pages. Return without doing anything */
+  }
+  ovflPgno = get4byte(&pCell[info.iOverflow]);
+  ovflPageSize = pBt->usableSize - 4;
+  nOvfl = (info.nPayload - info.nLocal + ovflPageSize - 1)/ovflPageSize;
+  assert( ovflPgno==0 || nOvfl>0 );
+  while( nOvfl-- ){
+    MemPage *pOvfl;
+    if( ovflPgno==0 || ovflPgno>sqlite3PagerPagecount(pBt->pPager) ){
+      return SQLITE_CORRUPT_BKPT;
+    }
+
+    rc = getOverflowPage(pBt, ovflPgno, &pOvfl, (nOvfl==0)?0:&ovflPgno);
+    if( rc ) return rc;
+    rc = freePage(pOvfl);
+    sqlite3PagerUnref(pOvfl->pDbPage);
+    if( rc ) return rc;
+  }
+  return SQLITE_OK;
+}
+
+/*
+** Create the byte sequence used to represent a cell on page pPage
+** and write that byte sequence into pCell[].  Overflow pages are
+** allocated and filled in as necessary.  The calling procedure
+** is responsible for making sure sufficient space has been allocated
+** for pCell[].
+**
+** Note that pCell does not necessary need to point to the pPage->aData
+** area.  pCell might point to some temporary storage.  The cell will
+** be constructed in this temporary area then copied into pPage->aData
+** later.
+*/
+static int fillInCell(
+  MemPage *pPage,                /* The page that contains the cell */
+  unsigned char *pCell,          /* Complete text of the cell */
+  const void *pKey, i64 nKey,    /* The key */
+  const void *pData,int nData,   /* The data */
+  int nZero,                     /* Extra zero bytes to append to pData */
+  int *pnSize                    /* Write cell size here */
+){
+  int nPayload;
+  const u8 *pSrc;
+  int nSrc, n, rc;
+  int spaceLeft;
+  MemPage *pOvfl = 0;
+  MemPage *pToRelease = 0;
+  unsigned char *pPrior;
+  unsigned char *pPayload;
+  BtShared *pBt = pPage->pBt;
+  Pgno pgnoOvfl = 0;
+  int nHeader;
+  CellInfo info;
+
+  assert( sqlite3_mutex_held(pPage->pBt->mutex) );
+
+  /* Fill in the header. */
+  nHeader = 0;
+  if( !pPage->leaf ){
+    nHeader += 4;
+  }
+  if( pPage->hasData ){
+    nHeader += putVarint(&pCell[nHeader], nData+nZero);
+  }else{
+    nData = nZero = 0;
+  }
+  nHeader += putVarint(&pCell[nHeader], *(u64*)&nKey);
+  sqlite3BtreeParseCellPtr(pPage, pCell, &info);
+  assert( info.nHeader==nHeader );
+  assert( info.nKey==nKey );
+  assert( info.nData==nData+nZero );
+
+  /* Fill in the payload */
+  nPayload = nData + nZero;
+  if( pPage->intKey ){
+    pSrc = pData;
+    nSrc = nData;
+    nData = 0;
+  }else{
+    nPayload += nKey;
+    pSrc = pKey;
+    nSrc = nKey;
+  }
+  *pnSize = info.nSize;
+  spaceLeft = info.nLocal;
+  pPayload = &pCell[nHeader];
+  pPrior = &pCell[info.iOverflow];
+
+  while( nPayload>0 ){
+    if( spaceLeft==0 ){
+      int isExact = 0;
+#ifndef SQLITE_OMIT_AUTOVACUUM
+      Pgno pgnoPtrmap = pgnoOvfl; /* Overflow page pointer-map entry page */
+      if( pBt->autoVacuum ){
+        do{
+          pgnoOvfl++;
+        } while(
+          PTRMAP_ISPAGE(pBt, pgnoOvfl) || pgnoOvfl==PENDING_BYTE_PAGE(pBt)
+        );
+        if( pgnoOvfl>1 ){
+          /* isExact = 1; */
+        }
+      }
+#endif
+      rc = allocateBtreePage(pBt, &pOvfl, &pgnoOvfl, pgnoOvfl, isExact);
+#ifndef SQLITE_OMIT_AUTOVACUUM
+      /* If the database supports auto-vacuum, and the second or subsequent
+      ** overflow page is being allocated, add an entry to the pointer-map
+      ** for that page now.
+      **
+      ** If this is the first overflow page, then write a partial entry
+      ** to the pointer-map. If we write nothing to this pointer-map slot,
+      ** then the optimistic overflow chain processing in clearCell()
+      ** may misinterpret the uninitialised values and delete the
+      ** wrong pages from the database.
+      */
+      if( pBt->autoVacuum && rc==SQLITE_OK ){
+        u8 eType = (pgnoPtrmap?PTRMAP_OVERFLOW2:PTRMAP_OVERFLOW1);
+        rc = ptrmapPut(pBt, pgnoOvfl, eType, pgnoPtrmap);
+        if( rc ){
+          releasePage(pOvfl);
+        }
+      }
+#endif
+      if( rc ){
+        releasePage(pToRelease);
+        return rc;
+      }
+      put4byte(pPrior, pgnoOvfl);
+      releasePage(pToRelease);
+      pToRelease = pOvfl;
+      pPrior = pOvfl->aData;
+      put4byte(pPrior, 0);
+      pPayload = &pOvfl->aData[4];
+      spaceLeft = pBt->usableSize - 4;
+    }
+    n = nPayload;
+    if( n>spaceLeft ) n = spaceLeft;
+    if( nSrc>0 ){
+      if( n>nSrc ) n = nSrc;
+      assert( pSrc );
+      memcpy(pPayload, pSrc, n);
+    }else{
+      memset(pPayload, 0, n);
+    }
+    nPayload -= n;
+    pPayload += n;
+    pSrc += n;
+    nSrc -= n;
+    spaceLeft -= n;
+    if( nSrc==0 ){
+      nSrc = nData;
+      pSrc = pData;
+    }
+  }
+  releasePage(pToRelease);
+  return SQLITE_OK;
+}
+
+/*
+** Change the MemPage.pParent pointer on the page whose number is
+** given in the second argument so that MemPage.pParent holds the
+** pointer in the third argument.
+*/
+static int reparentPage(BtShared *pBt, Pgno pgno, MemPage *pNewParent, int idx){
+  MemPage *pThis;
+  DbPage *pDbPage;
+
+  assert( sqlite3_mutex_held(pBt->mutex) );
+  assert( pNewParent!=0 );
+  if( pgno==0 ) return SQLITE_OK;
+  assert( pBt->pPager!=0 );
+  pDbPage = sqlite3PagerLookup(pBt->pPager, pgno);
+  if( pDbPage ){
+    pThis = (MemPage *)sqlite3PagerGetExtra(pDbPage);
+    if( pThis->isInit ){
+      assert( pThis->aData==sqlite3PagerGetData(pDbPage) );
+      if( pThis->pParent!=pNewParent ){
+        if( pThis->pParent ) sqlite3PagerUnref(pThis->pParent->pDbPage);
+        pThis->pParent = pNewParent;
+        sqlite3PagerRef(pNewParent->pDbPage);
+      }
+      pThis->idxParent = idx;
+    }
+    sqlite3PagerUnref(pDbPage);
+  }
+
+#ifndef SQLITE_OMIT_AUTOVACUUM
+  if( pBt->autoVacuum ){
+    return ptrmapPut(pBt, pgno, PTRMAP_BTREE, pNewParent->pgno);
+  }
+#endif
+  return SQLITE_OK;
+}
+
+
+
+/*
+** Change the pParent pointer of all children of pPage to point back
+** to pPage.
+**
+** In other words, for every child of pPage, invoke reparentPage()
+** to make sure that each child knows that pPage is its parent.
+**
+** This routine gets called after you memcpy() one page into
+** another.
+*/
+static int reparentChildPages(MemPage *pPage){
+  int i;
+  BtShared *pBt = pPage->pBt;
+  int rc = SQLITE_OK;
+
+  assert( sqlite3_mutex_held(pPage->pBt->mutex) );
+  if( pPage->leaf ) return SQLITE_OK;
+
+  for(i=0; i<pPage->nCell; i++){
+    u8 *pCell = findCell(pPage, i);
+    if( !pPage->leaf ){
+      rc = reparentPage(pBt, get4byte(pCell), pPage, i);
+      if( rc!=SQLITE_OK ) return rc;
+    }
+  }
+  if( !pPage->leaf ){
+    rc = reparentPage(pBt, get4byte(&pPage->aData[pPage->hdrOffset+8]),
+       pPage, i);
+    pPage->idxShift = 0;
+  }
+  return rc;
+}
+
+/*
+** Remove the i-th cell from pPage.  This routine effects pPage only.
+** The cell content is not freed or deallocated.  It is assumed that
+** the cell content has been copied someplace else.  This routine just
+** removes the reference to the cell from pPage.
+**
+** "sz" must be the number of bytes in the cell.
+*/
+static void dropCell(MemPage *pPage, int idx, int sz){
+  int i;          /* Loop counter */
+  int pc;         /* Offset to cell content of cell being deleted */
+  u8 *data;       /* pPage->aData */
+  u8 *ptr;        /* Used to move bytes around within data[] */
+
+  assert( idx>=0 && idx<pPage->nCell );
+  assert( sz==cellSize(pPage, idx) );
+  assert( sqlite3PagerIswriteable(pPage->pDbPage) );
+  assert( sqlite3_mutex_held(pPage->pBt->mutex) );
+  data = pPage->aData;
+  ptr = &data[pPage->cellOffset + 2*idx];
+  pc = get2byte(ptr);
+  assert( pc>10 && pc+sz<=pPage->pBt->usableSize );
+  freeSpace(pPage, pc, sz);
+  for(i=idx+1; i<pPage->nCell; i++, ptr+=2){
+    ptr[0] = ptr[2];
+    ptr[1] = ptr[3];
+  }
+  pPage->nCell--;
+  put2byte(&data[pPage->hdrOffset+3], pPage->nCell);
+  pPage->nFree += 2;
+  pPage->idxShift = 1;
+}
+
+/*
+** Insert a new cell on pPage at cell index "i".  pCell points to the
+** content of the cell.
+**
+** If the cell content will fit on the page, then put it there.  If it
+** will not fit, then make a copy of the cell content into pTemp if
+** pTemp is not null.  Regardless of pTemp, allocate a new entry
+** in pPage->aOvfl[] and make it point to the cell content (either
+** in pTemp or the original pCell) and also record its index.
+** Allocating a new entry in pPage->aCell[] implies that
+** pPage->nOverflow is incremented.
+**
+** If nSkip is non-zero, then do not copy the first nSkip bytes of the
+** cell. The caller will overwrite them after this function returns. If
+** nSkip is non-zero, then pCell may not point to an invalid memory location
+** (but pCell+nSkip is always valid).
+*/
+static int insertCell(
+  MemPage *pPage,   /* Page into which we are copying */
+  int i,            /* New cell becomes the i-th cell of the page */
+  u8 *pCell,        /* Content of the new cell */
+  int sz,           /* Bytes of content in pCell */
+  u8 *pTemp,        /* Temp storage space for pCell, if needed */
+  u8 nSkip          /* Do not write the first nSkip bytes of the cell */
+){
+  int idx;          /* Where to write new cell content in data[] */
+  int j;            /* Loop counter */
+  int top;          /* First byte of content for any cell in data[] */
+  int end;          /* First byte past the last cell pointer in data[] */
+  int ins;          /* Index in data[] where new cell pointer is inserted */
+  int hdr;          /* Offset into data[] of the page header */
+  int cellOffset;   /* Address of first cell pointer in data[] */
+  u8 *data;         /* The content of the whole page */
+  u8 *ptr;          /* Used for moving information around in data[] */
+
+  assert( i>=0 && i<=pPage->nCell+pPage->nOverflow );
+  assert( sz==cellSizePtr(pPage, pCell) );
+  assert( sqlite3_mutex_held(pPage->pBt->mutex) );
+  if( pPage->nOverflow || sz+2>pPage->nFree ){
+    if( pTemp ){
+      memcpy(pTemp+nSkip, pCell+nSkip, sz-nSkip);
+      pCell = pTemp;
+    }
+    j = pPage->nOverflow++;
+    assert( j<sizeof(pPage->aOvfl)/sizeof(pPage->aOvfl[0]) );
+    pPage->aOvfl[j].pCell = pCell;
+    pPage->aOvfl[j].idx = i;
+    pPage->nFree = 0;
+  }else{
+    int rc = sqlite3PagerWrite(pPage->pDbPage);
+    if( rc!=SQLITE_OK ){
+      return rc;
+    }
+    assert( sqlite3PagerIswriteable(pPage->pDbPage) );
+    data = pPage->aData;
+    hdr = pPage->hdrOffset;
+    top = get2byte(&data[hdr+5]);
+    cellOffset = pPage->cellOffset;
+    end = cellOffset + 2*pPage->nCell + 2;
+    ins = cellOffset + 2*i;
+    if( end > top - sz ){
+      rc = defragmentPage(pPage);
+      if( rc!=SQLITE_OK ) return rc;
+      top = get2byte(&data[hdr+5]);
+      assert( end + sz <= top );
+    }
+    idx = allocateSpace(pPage, sz);
+    assert( idx>0 );
+    assert( end <= get2byte(&data[hdr+5]) );
+    pPage->nCell++;
+    pPage->nFree -= 2;
+    memcpy(&data[idx+nSkip], pCell+nSkip, sz-nSkip);
+    for(j=end-2, ptr=&data[j]; j>ins; j-=2, ptr-=2){
+      ptr[0] = ptr[-2];
+      ptr[1] = ptr[-1];
+    }
+    put2byte(&data[ins], idx);
+    put2byte(&data[hdr+3], pPage->nCell);
+    pPage->idxShift = 1;
+#ifndef SQLITE_OMIT_AUTOVACUUM
+    if( pPage->pBt->autoVacuum ){
+      /* The cell may contain a pointer to an overflow page. If so, write
+      ** the entry for the overflow page into the pointer map.
+      */
+      CellInfo info;
+      sqlite3BtreeParseCellPtr(pPage, pCell, &info);
+      assert( (info.nData+(pPage->intKey?0:info.nKey))==info.nPayload );
+      if( (info.nData+(pPage->intKey?0:info.nKey))>info.nLocal ){
+        Pgno pgnoOvfl = get4byte(&pCell[info.iOverflow]);
+        rc = ptrmapPut(pPage->pBt, pgnoOvfl, PTRMAP_OVERFLOW1, pPage->pgno);
+        if( rc!=SQLITE_OK ) return rc;
+      }
+    }
+#endif
+  }
+
+  return SQLITE_OK;
+}
+
+/*
+** Add a list of cells to a page.  The page should be initially empty.
+** The cells are guaranteed to fit on the page.
+*/
+static void assemblePage(
+  MemPage *pPage,   /* The page to be assemblied */
+  int nCell,        /* The number of cells to add to this page */
+  u8 **apCell,      /* Pointers to cell bodies */
+  u16 *aSize        /* Sizes of the cells */
+){
+  int i;            /* Loop counter */
+  int totalSize;    /* Total size of all cells */
+  int hdr;          /* Index of page header */
+  int cellptr;      /* Address of next cell pointer */
+  int cellbody;     /* Address of next cell body */
+  u8 *data;         /* Data for the page */
+
+  assert( pPage->nOverflow==0 );
+  assert( sqlite3_mutex_held(pPage->pBt->mutex) );
+  totalSize = 0;
+  for(i=0; i<nCell; i++){
+    totalSize += aSize[i];
+  }
+  assert( totalSize+2*nCell<=pPage->nFree );
+  assert( pPage->nCell==0 );
+  cellptr = pPage->cellOffset;
+  data = pPage->aData;
+  hdr = pPage->hdrOffset;
+  put2byte(&data[hdr+3], nCell);
+  if( nCell ){
+    cellbody = allocateSpace(pPage, totalSize);
+    assert( cellbody>0 );
+    assert( pPage->nFree >= 2*nCell );
+    pPage->nFree -= 2*nCell;
+    for(i=0; i<nCell; i++){
+      put2byte(&data[cellptr], cellbody);
+      memcpy(&data[cellbody], apCell[i], aSize[i]);
+      cellptr += 2;
+      cellbody += aSize[i];
+    }
+    assert( cellbody==pPage->pBt->usableSize );
+  }
+  pPage->nCell = nCell;
+}
+
+/*
+** The following parameters determine how many adjacent pages get involved
+** in a balancing operation.  NN is the number of neighbors on either side
+** of the page that participate in the balancing operation.  NB is the
+** total number of pages that participate, including the target page and
+** NN neighbors on either side.
+**
+** The minimum value of NN is 1 (of course).  Increasing NN above 1
+** (to 2 or 3) gives a modest improvement in SELECT and DELETE performance
+** in exchange for a larger degradation in INSERT and UPDATE performance.
+** The value of NN appears to give the best results overall.
+*/
+#define NN 1             /* Number of neighbors on either side of pPage */
+#define NB (NN*2+1)      /* Total pages involved in the balance */
+
+/* Forward reference */
+static int balance(MemPage*, int);
+
+#ifndef SQLITE_OMIT_QUICKBALANCE
+/*
+** This version of balance() handles the common special case where
+** a new entry is being inserted on the extreme right-end of the
+** tree, in other words, when the new entry will become the largest
+** entry in the tree.
+**
+** Instead of trying balance the 3 right-most leaf pages, just add
+** a new page to the right-hand side and put the one new entry in
+** that page.  This leaves the right side of the tree somewhat
+** unbalanced.  But odds are that we will be inserting new entries
+** at the end soon afterwards so the nearly empty page will quickly
+** fill up.  On average.
+**
+** pPage is the leaf page which is the right-most page in the tree.
+** pParent is its parent.  pPage must have a single overflow entry
+** which is also the right-most entry on the page.
+*/
+static int balance_quick(MemPage *pPage, MemPage *pParent){
+  int rc;
+  MemPage *pNew;
+  Pgno pgnoNew;
+  u8 *pCell;
+  u16 szCell;
+  CellInfo info;
+  BtShared *pBt = pPage->pBt;
+  int parentIdx = pParent->nCell;   /* pParent new divider cell index */
+  int parentSize;                   /* Size of new divider cell */
+  u8 parentCell[64];                /* Space for the new divider cell */
+
+  assert( sqlite3_mutex_held(pPage->pBt->mutex) );
+
+  /* Allocate a new page. Insert the overflow cell from pPage
+  ** into it. Then remove the overflow cell from pPage.
+  */
+  rc = allocateBtreePage(pBt, &pNew, &pgnoNew, 0, 0);
+  if( rc!=SQLITE_OK ){
+    return rc;
+  }
+  pCell = pPage->aOvfl[0].pCell;
+  szCell = cellSizePtr(pPage, pCell);
+  zeroPage(pNew, pPage->aData[0]);
+  assemblePage(pNew, 1, &pCell, &szCell);
+  pPage->nOverflow = 0;
+
+  /* Set the parent of the newly allocated page to pParent. */
+  pNew->pParent = pParent;
+  sqlite3PagerRef(pParent->pDbPage);
+
+  /* pPage is currently the right-child of pParent. Change this
+  ** so that the right-child is the new page allocated above and
+  ** pPage is the next-to-right child.
+  */
+  assert( pPage->nCell>0 );
+  pCell = findCell(pPage, pPage->nCell-1);
+  sqlite3BtreeParseCellPtr(pPage, pCell, &info);
+  rc = fillInCell(pParent, parentCell, 0, info.nKey, 0, 0, 0, &parentSize);
+  if( rc!=SQLITE_OK ){
+    return rc;
+  }
+  assert( parentSize<64 );
+  rc = insertCell(pParent, parentIdx, parentCell, parentSize, 0, 4);
+  if( rc!=SQLITE_OK ){
+    return rc;
+  }
+  put4byte(findOverflowCell(pParent,parentIdx), pPage->pgno);
+  put4byte(&pParent->aData[pParent->hdrOffset+8], pgnoNew);
+
+#ifndef SQLITE_OMIT_AUTOVACUUM
+  /* If this is an auto-vacuum database, update the pointer map
+  ** with entries for the new page, and any pointer from the
+  ** cell on the page to an overflow page.
+  */
+  if( pBt->autoVacuum ){
+    rc = ptrmapPut(pBt, pgnoNew, PTRMAP_BTREE, pParent->pgno);
+    if( rc==SQLITE_OK ){
+      rc = ptrmapPutOvfl(pNew, 0);
+    }
+    if( rc!=SQLITE_OK ){
+      releasePage(pNew);
+      return rc;
+    }
+  }
+#endif
+
+  /* Release the reference to the new page and balance the parent page,
+  ** in case the divider cell inserted caused it to become overfull.
+  */
+  releasePage(pNew);
+  return balance(pParent, 0);
+}
+#endif /* SQLITE_OMIT_QUICKBALANCE */
+
+/*
+** This routine redistributes Cells on pPage and up to NN*2 siblings
+** of pPage so that all pages have about the same amount of free space.
+** Usually NN siblings on either side of pPage is used in the balancing,
+** though more siblings might come from one side if pPage is the first
+** or last child of its parent.  If pPage has fewer than 2*NN siblings
+** (something which can only happen if pPage is the root page or a
+** child of root) then all available siblings participate in the balancing.
+**
+** The number of siblings of pPage might be increased or decreased by one or
+** two in an effort to keep pages nearly full but not over full. The root page
+** is special and is allowed to be nearly empty. If pPage is
+** the root page, then the depth of the tree might be increased
+** or decreased by one, as necessary, to keep the root page from being
+** overfull or completely empty.
+**
+** Note that when this routine is called, some of the Cells on pPage
+** might not actually be stored in pPage->aData[].  This can happen
+** if the page is overfull.  Part of the job of this routine is to
+** make sure all Cells for pPage once again fit in pPage->aData[].
+**
+** In the course of balancing the siblings of pPage, the parent of pPage
+** might become overfull or underfull.  If that happens, then this routine
+** is called recursively on the parent.
+**
+** If this routine fails for any reason, it might leave the database
+** in a corrupted state.  So if this routine fails, the database should
+** be rolled back.
+*/
+static int balance_nonroot(MemPage *pPage){
+  MemPage *pParent;            /* The parent of pPage */
+  BtShared *pBt;               /* The whole database */
+  int nCell = 0;               /* Number of cells in apCell[] */
+  int nMaxCells = 0;           /* Allocated size of apCell, szCell, aFrom. */
+  int nOld;                    /* Number of pages in apOld[] */
+  int nNew;                    /* Number of pages in apNew[] */
+  int nDiv;                    /* Number of cells in apDiv[] */
+  int i, j, k;                 /* Loop counters */
+  int idx;                     /* Index of pPage in pParent->aCell[] */
+  int nxDiv;                   /* Next divider slot in pParent->aCell[] */
+  int rc;                      /* The return code */
+  int leafCorrection;          /* 4 if pPage is a leaf.  0 if not */
+  int leafData;                /* True if pPage is a leaf of a LEAFDATA tree */
+  int usableSpace;             /* Bytes in pPage beyond the header */
+  int pageFlags;               /* Value of pPage->aData[0] */
+  int subtotal;                /* Subtotal of bytes in cells on one page */
+  int iSpace = 0;              /* First unused byte of aSpace[] */
+  MemPage *apOld[NB];          /* pPage and up to two siblings */
+  Pgno pgnoOld[NB];            /* Page numbers for each page in apOld[] */
+  MemPage *apCopy[NB];         /* Private copies of apOld[] pages */
+  MemPage *apNew[NB+2];        /* pPage and up to NB siblings after balancing */
+  Pgno pgnoNew[NB+2];          /* Page numbers for each page in apNew[] */
+  u8 *apDiv[NB];               /* Divider cells in pParent */
+  int cntNew[NB+2];            /* Index in aCell[] of cell after i-th page */
+  int szNew[NB+2];             /* Combined size of cells place on i-th page */
+  u8 **apCell = 0;             /* All cells begin balanced */
+  u16 *szCell;                 /* Local size of all cells in apCell[] */
+  u8 *aCopy[NB];               /* Space for holding data of apCopy[] */
+  u8 *aSpace;                  /* Space to hold copies of dividers cells */
+#ifndef SQLITE_OMIT_AUTOVACUUM
+  u8 *aFrom = 0;
+#endif
+
+  assert( sqlite3_mutex_held(pPage->pBt->mutex) );
+
+  /*
+  ** Find the parent page.
+  */
+  assert( pPage->isInit );
+  assert( sqlite3PagerIswriteable(pPage->pDbPage) || pPage->nOverflow==1 );
+  pBt = pPage->pBt;
+  pParent = pPage->pParent;
+  assert( pParent );
+  if( SQLITE_OK!=(rc = sqlite3PagerWrite(pParent->pDbPage)) ){
+    return rc;
+  }
+  TRACE(("BALANCE: begin page %d child of %d\n", pPage->pgno, pParent->pgno));
+
+#ifndef SQLITE_OMIT_QUICKBALANCE
+  /*
+  ** A special case:  If a new entry has just been inserted into a
+  ** table (that is, a btree with integer keys and all data at the leaves)
+  ** and the new entry is the right-most entry in the tree (it has the
+  ** largest key) then use the special balance_quick() routine for
+  ** balancing.  balance_quick() is much faster and results in a tighter
+  ** packing of data in the common case.
+  */
+  if( pPage->leaf &&
+      pPage->intKey &&
+      pPage->leafData &&
+      pPage->nOverflow==1 &&
+      pPage->aOvfl[0].idx==pPage->nCell &&
+      pPage->pParent->pgno!=1 &&
+      get4byte(&pParent->aData[pParent->hdrOffset+8])==pPage->pgno
+  ){
+    /*
+    ** TODO: Check the siblings to the left of pPage. It may be that
+    ** they are not full and no new page is required.
+    */
+    return balance_quick(pPage, pParent);
+  }
+#endif
+
+  if( SQLITE_OK!=(rc = sqlite3PagerWrite(pPage->pDbPage)) ){
+    return rc;
+  }
+
+  /*
+  ** Find the cell in the parent page whose left child points back
+  ** to pPage.  The "idx" variable is the index of that cell.  If pPage
+  ** is the rightmost child of pParent then set idx to pParent->nCell
+  */
+  if( pParent->idxShift ){
+    Pgno pgno;
+    pgno = pPage->pgno;
+    assert( pgno==sqlite3PagerPagenumber(pPage->pDbPage) );
+    for(idx=0; idx<pParent->nCell; idx++){
+      if( get4byte(findCell(pParent, idx))==pgno ){
+        break;
+      }
+    }
+    assert( idx<pParent->nCell
+             || get4byte(&pParent->aData[pParent->hdrOffset+8])==pgno );
+  }else{
+    idx = pPage->idxParent;
+  }
+
+  /*
+  ** Initialize variables so that it will be safe to jump
+  ** directly to balance_cleanup at any moment.
+  */
+  nOld = nNew = 0;
+  sqlite3PagerRef(pParent->pDbPage);
+
+  /*
+  ** Find sibling pages to pPage and the cells in pParent that divide
+  ** the siblings.  An attempt is made to find NN siblings on either
+  ** side of pPage.  More siblings are taken from one side, however, if
+  ** pPage there are fewer than NN siblings on the other side.  If pParent
+  ** has NB or fewer children then all children of pParent are taken.
+  */
+  nxDiv = idx - NN;
+  if( nxDiv + NB > pParent->nCell ){
+    nxDiv = pParent->nCell - NB + 1;
+  }
+  if( nxDiv<0 ){
+    nxDiv = 0;
+  }
+  nDiv = 0;
+  for(i=0, k=nxDiv; i<NB; i++, k++){
+    if( k<pParent->nCell ){
+      apDiv[i] = findCell(pParent, k);
+      nDiv++;
+      assert( !pParent->leaf );
+      pgnoOld[i] = get4byte(apDiv[i]);
+    }else if( k==pParent->nCell ){
+      pgnoOld[i] = get4byte(&pParent->aData[pParent->hdrOffset+8]);
+    }else{
+      break;
+    }
+    rc = getAndInitPage(pBt, pgnoOld[i], &apOld[i], pParent);
+    if( rc ) goto balance_cleanup;
+    apOld[i]->idxParent = k;
+    apCopy[i] = 0;
+    assert( i==nOld );
+    nOld++;
+    nMaxCells += 1+apOld[i]->nCell+apOld[i]->nOverflow;
+  }
+
+  /* Make nMaxCells a multiple of 4 in order to preserve 8-byte
+  ** alignment */
+  nMaxCells = (nMaxCells + 3)&~3;
+
+  /*
+  ** Allocate space for memory structures
+  */
+  apCell = sqlite3_malloc(
+       nMaxCells*sizeof(u8*)                       /* apCell */
+     + nMaxCells*sizeof(u16)                       /* szCell */
+     + (ROUND8(sizeof(MemPage))+pBt->pageSize)*NB  /* aCopy */
+     + pBt->pageSize*5                             /* aSpace */
+     + (ISAUTOVACUUM ? nMaxCells : 0)              /* aFrom */
+  );
+  if( apCell==0 ){
+    rc = SQLITE_NOMEM;
+    goto balance_cleanup;
+  }
+  szCell = (u16*)&apCell[nMaxCells];
+  aCopy[0] = (u8*)&szCell[nMaxCells];
+  assert( ((aCopy[0] - (u8*)apCell) & 7)==0 ); /* 8-byte alignment required */
+  for(i=1; i<NB; i++){
+    aCopy[i] = &aCopy[i-1][pBt->pageSize+ROUND8(sizeof(MemPage))];
+    assert( ((aCopy[i] - (u8*)apCell) & 7)==0 ); /* 8-byte alignment required */
+  }
+  aSpace = &aCopy[NB-1][pBt->pageSize+ROUND8(sizeof(MemPage))];
+  assert( ((aSpace - (u8*)apCell) & 7)==0 ); /* 8-byte alignment required */
+#ifndef SQLITE_OMIT_AUTOVACUUM
+  if( pBt->autoVacuum ){
+    aFrom = &aSpace[5*pBt->pageSize];
+  }
+#endif
+
+  /*
+  ** Make copies of the content of pPage and its siblings into aOld[].
+  ** The rest of this function will use data from the copies rather
+  ** that the original pages since the original pages will be in the
+  ** process of being overwritten.
+  */
+  for(i=0; i<nOld; i++){
+    MemPage *p = apCopy[i] = (MemPage*)aCopy[i];
+    memcpy(p, apOld[i], sizeof(MemPage));
+    p->aData = (void*)&p[1];
+    memcpy(p->aData, apOld[i]->aData, pBt->pageSize);
+  }
+
+  /*
+  ** Load pointers to all cells on sibling pages and the divider cells
+  ** into the local apCell[] array.  Make copies of the divider cells
+  ** into space obtained form aSpace[] and remove the the divider Cells
+  ** from pParent.
+  **
+  ** If the siblings are on leaf pages, then the child pointers of the
+  ** divider cells are stripped from the cells before they are copied
+  ** into aSpace[].  In this way, all cells in apCell[] are without
+  ** child pointers.  If siblings are not leaves, then all cell in
+  ** apCell[] include child pointers.  Either way, all cells in apCell[]
+  ** are alike.
+  **
+  ** leafCorrection:  4 if pPage is a leaf.  0 if pPage is not a leaf.
+  **       leafData:  1 if pPage holds key+data and pParent holds only keys.
+  */
+  nCell = 0;
+  leafCorrection = pPage->leaf*4;
+  leafData = pPage->leafData && pPage->leaf;
+  for(i=0; i<nOld; i++){
+    MemPage *pOld = apCopy[i];
+    int limit = pOld->nCell+pOld->nOverflow;
+    for(j=0; j<limit; j++){
+      assert( nCell<nMaxCells );
+      apCell[nCell] = findOverflowCell(pOld, j);
+      szCell[nCell] = cellSizePtr(pOld, apCell[nCell]);
+#ifndef SQLITE_OMIT_AUTOVACUUM
+      if( pBt->autoVacuum ){
+        int a;
+        aFrom[nCell] = i;
+        for(a=0; a<pOld->nOverflow; a++){
+          if( pOld->aOvfl[a].pCell==apCell[nCell] ){
+            aFrom[nCell] = 0xFF;
+            break;
+          }
+        }
+      }
+#endif
+      nCell++;
+    }
+    if( i<nOld-1 ){
+      u16 sz = cellSizePtr(pParent, apDiv[i]);
+      if( leafData ){
+        /* With the LEAFDATA flag, pParent cells hold only INTKEYs that
+        ** are duplicates of keys on the child pages.  We need to remove
+        ** the divider cells from pParent, but the dividers cells are not
+        ** added to apCell[] because they are duplicates of child cells.
+        */
+        dropCell(pParent, nxDiv, sz);
+      }else{
+        u8 *pTemp;
+        assert( nCell<nMaxCells );
+        szCell[nCell] = sz;
+        pTemp = &aSpace[iSpace];
+        iSpace += sz;
+        assert( iSpace<=pBt->pageSize*5 );
+        memcpy(pTemp, apDiv[i], sz);
+        apCell[nCell] = pTemp+leafCorrection;
+#ifndef SQLITE_OMIT_AUTOVACUUM
+        if( pBt->autoVacuum ){
+          aFrom[nCell] = 0xFF;
+        }
+#endif
+        dropCell(pParent, nxDiv, sz);
+        szCell[nCell] -= leafCorrection;
+        assert( get4byte(pTemp)==pgnoOld[i] );
+        if( !pOld->leaf ){
+          assert( leafCorrection==0 );
+          /* The right pointer of the child page pOld becomes the left
+          ** pointer of the divider cell */
+          memcpy(apCell[nCell], &pOld->aData[pOld->hdrOffset+8], 4);
+        }else{
+          assert( leafCorrection==4 );
+          if( szCell[nCell]<4 ){
+            /* Do not allow any cells smaller than 4 bytes. */
+            szCell[nCell] = 4;
+          }
+        }
+        nCell++;
+      }
+    }
+  }
+
+  /*
+  ** Figure out the number of pages needed to hold all nCell cells.
+  ** Store this number in "k".  Also compute szNew[] which is the total
+  ** size of all cells on the i-th page and cntNew[] which is the index
+  ** in apCell[] of the cell that divides page i from page i+1.
+  ** cntNew[k] should equal nCell.
+  **
+  ** Values computed by this block:
+  **
+  **           k: The total number of sibling pages
+  **    szNew[i]: Spaced used on the i-th sibling page.
+  **   cntNew[i]: Index in apCell[] and szCell[] for the first cell to
+  **              the right of the i-th sibling page.
+  ** usableSpace: Number of bytes of space available on each sibling.
+  **
+  */
+  usableSpace = pBt->usableSize - 12 + leafCorrection;
+  for(subtotal=k=i=0; i<nCell; i++){
+    assert( i<nMaxCells );
+    subtotal += szCell[i] + 2;
+    if( subtotal > usableSpace ){
+      szNew[k] = subtotal - szCell[i];
+      cntNew[k] = i;
+      if( leafData ){ i--; }
+      subtotal = 0;
+      k++;
+    }
+  }
+  szNew[k] = subtotal;
+  cntNew[k] = nCell;
+  k++;
+
+  /*
+  ** The packing computed by the previous block is biased toward the siblings
+  ** on the left side.  The left siblings are always nearly full, while the
+  ** right-most sibling might be nearly empty.  This block of code attempts
+  ** to adjust the packing of siblings to get a better balance.
+  **
+  ** This adjustment is more than an optimization.  The packing above might
+  ** be so out of balance as to be illegal.  For example, the right-most
+  ** sibling might be completely empty.  This adjustment is not optional.
+  */
+  for(i=k-1; i>0; i--){
+    int szRight = szNew[i];  /* Size of sibling on the right */
+    int szLeft = szNew[i-1]; /* Size of sibling on the left */
+    int r;              /* Index of right-most cell in left sibling */
+    int d;              /* Index of first cell to the left of right sibling */
+
+    r = cntNew[i-1] - 1;
+    d = r + 1 - leafData;
+    assert( d<nMaxCells );
+    assert( r<nMaxCells );
+    while( szRight==0 || szRight+szCell[d]+2<=szLeft-(szCell[r]+2) ){
+      szRight += szCell[d] + 2;
+      szLeft -= szCell[r] + 2;
+      cntNew[i-1]--;
+      r = cntNew[i-1] - 1;
+      d = r + 1 - leafData;
+    }
+    szNew[i] = szRight;
+    szNew[i-1] = szLeft;
+  }
+
+  /* Either we found one or more cells (cntnew[0])>0) or we are the
+  ** a virtual root page.  A virtual root page is when the real root
+  ** page is page 1 and we are the only child of that page.
+  */
+  assert( cntNew[0]>0 || (pParent->pgno==1 && pParent->nCell==0) );
+
+  /*
+  ** Allocate k new pages.  Reuse old pages where possible.
+  */
+  assert( pPage->pgno>1 );
+  pageFlags = pPage->aData[0];
+  for(i=0; i<k; i++){
+    MemPage *pNew;
+    if( i<nOld ){
+      pNew = apNew[i] = apOld[i];
+      pgnoNew[i] = pgnoOld[i];
+      apOld[i] = 0;
+      rc = sqlite3PagerWrite(pNew->pDbPage);
+      nNew++;
+      if( rc ) goto balance_cleanup;
+    }else{
+      assert( i>0 );
+      rc = allocateBtreePage(pBt, &pNew, &pgnoNew[i], pgnoNew[i-1], 0);
+      if( rc ) goto balance_cleanup;
+      apNew[i] = pNew;
+      nNew++;
+    }
+    zeroPage(pNew, pageFlags);
+  }
+
+  /* Free any old pages that were not reused as new pages.
+  */
+  while( i<nOld ){
+    rc = freePage(apOld[i]);
+    if( rc ) goto balance_cleanup;
+    releasePage(apOld[i]);
+    apOld[i] = 0;
+    i++;
+  }
+
+  /*
+  ** Put the new pages in accending order.  This helps to
+  ** keep entries in the disk file in order so that a scan
+  ** of the table is a linear scan through the file.  That
+  ** in turn helps the operating system to deliver pages
+  ** from the disk more rapidly.
+  **
+  ** An O(n^2) insertion sort algorithm is used, but since
+  ** n is never more than NB (a small constant), that should
+  ** not be a problem.
+  **
+  ** When NB==3, this one optimization makes the database
+  ** about 25% faster for large insertions and deletions.
+  */
+  for(i=0; i<k-1; i++){
+    int minV = pgnoNew[i];
+    int minI = i;
+    for(j=i+1; j<k; j++){
+      if( pgnoNew[j]<(unsigned)minV ){
+        minI = j;
+        minV = pgnoNew[j];
+      }
+    }
+    if( minI>i ){
+      int t;
+      MemPage *pT;
+      t = pgnoNew[i];
+      pT = apNew[i];
+      pgnoNew[i] = pgnoNew[minI];
+      apNew[i] = apNew[minI];
+      pgnoNew[minI] = t;
+      apNew[minI] = pT;
+    }
+  }
+  TRACE(("BALANCE: old: %d %d %d  new: %d(%d) %d(%d) %d(%d) %d(%d) %d(%d)\n",
+    pgnoOld[0],
+    nOld>=2 ? pgnoOld[1] : 0,
+    nOld>=3 ? pgnoOld[2] : 0,
+    pgnoNew[0], szNew[0],
+    nNew>=2 ? pgnoNew[1] : 0, nNew>=2 ? szNew[1] : 0,
+    nNew>=3 ? pgnoNew[2] : 0, nNew>=3 ? szNew[2] : 0,
+    nNew>=4 ? pgnoNew[3] : 0, nNew>=4 ? szNew[3] : 0,
+    nNew>=5 ? pgnoNew[4] : 0, nNew>=5 ? szNew[4] : 0));
+
+  /*
+  ** Evenly distribute the data in apCell[] across the new pages.
+  ** Insert divider cells into pParent as necessary.
+  */
+  j = 0;
+  for(i=0; i<nNew; i++){
+    /* Assemble the new sibling page. */
+    MemPage *pNew = apNew[i];
+    assert( j<nMaxCells );
+    assert( pNew->pgno==pgnoNew[i] );
+    assemblePage(pNew, cntNew[i]-j, &apCell[j], &szCell[j]);
+    assert( pNew->nCell>0 || (nNew==1 && cntNew[0]==0) );
+    assert( pNew->nOverflow==0 );
+
+#ifndef SQLITE_OMIT_AUTOVACUUM
+    /* If this is an auto-vacuum database, update the pointer map entries
+    ** that point to the siblings that were rearranged. These can be: left
+    ** children of cells, the right-child of the page, or overflow pages
+    ** pointed to by cells.
+    */
+    if( pBt->autoVacuum ){
+      for(k=j; k<cntNew[i]; k++){
+        assert( k<nMaxCells );
+        if( aFrom[k]==0xFF || apCopy[aFrom[k]]->pgno!=pNew->pgno ){
+          rc = ptrmapPutOvfl(pNew, k-j);
+          if( rc!=SQLITE_OK ){
+            goto balance_cleanup;
+          }
+        }
+      }
+    }
+#endif
+
+    j = cntNew[i];
+
+    /* If the sibling page assembled above was not the right-most sibling,
+    ** insert a divider cell into the parent page.
+    */
+    if( i<nNew-1 && j<nCell ){
+      u8 *pCell;
+      u8 *pTemp;
+      int sz;
+
+      assert( j<nMaxCells );
+      pCell = apCell[j];
+      sz = szCell[j] + leafCorrection;
+      if( !pNew->leaf ){
+        memcpy(&pNew->aData[8], pCell, 4);
+        pTemp = 0;
+      }else if( leafData ){
+        /* If the tree is a leaf-data tree, and the siblings are leaves,
+        ** then there is no divider cell in apCell[]. Instead, the divider
+        ** cell consists of the integer key for the right-most cell of
+        ** the sibling-page assembled above only.
+        */
+        CellInfo info;
+        j--;
+        sqlite3BtreeParseCellPtr(pNew, apCell[j], &info);
+        pCell = &aSpace[iSpace];
+        fillInCell(pParent, pCell, 0, info.nKey, 0, 0, 0, &sz);
+        iSpace += sz;
+        assert( iSpace<=pBt->pageSize*5 );
+        pTemp = 0;
+      }else{
+        pCell -= 4;
+        pTemp = &aSpace[iSpace];
+        iSpace += sz;
+        assert( iSpace<=pBt->pageSize*5 );
+        /* Obscure case for non-leaf-data trees: If the cell at pCell was
+        ** previously stored on a leaf node, and its reported size was 4
+        ** bytes, then it may actually be smaller than this
+        ** (see sqlite3BtreeParseCellPtr(), 4 bytes is the minimum size of
+        ** any cell). But it is important to pass the correct size to
+        ** insertCell(), so reparse the cell now.
+        **
+        ** Note that this can never happen in an SQLite data file, as all
+        ** cells are at least 4 bytes. It only happens in b-trees used
+        ** to evaluate "IN (SELECT ...)" and similar clauses.
+        */
+        if( szCell[j]==4 ){
+          assert(leafCorrection==4);
+          sz = cellSizePtr(pParent, pCell);
+        }
+      }
+      rc = insertCell(pParent, nxDiv, pCell, sz, pTemp, 4);
+      if( rc!=SQLITE_OK ) goto balance_cleanup;
+      put4byte(findOverflowCell(pParent,nxDiv), pNew->pgno);
+#ifndef SQLITE_OMIT_AUTOVACUUM
+      /* If this is an auto-vacuum database, and not a leaf-data tree,
+      ** then update the pointer map with an entry for the overflow page
+      ** that the cell just inserted points to (if any).
+      */
+      if( pBt->autoVacuum && !leafData ){
+        rc = ptrmapPutOvfl(pParent, nxDiv);
+        if( rc!=SQLITE_OK ){
+          goto balance_cleanup;
+        }
+      }
+#endif
+      j++;
+      nxDiv++;
+    }
+  }
+  assert( j==nCell );
+  assert( nOld>0 );
+  assert( nNew>0 );
+  if( (pageFlags & PTF_LEAF)==0 ){
+    memcpy(&apNew[nNew-1]->aData[8], &apCopy[nOld-1]->aData[8], 4);
+  }
+  if( nxDiv==pParent->nCell+pParent->nOverflow ){
+    /* Right-most sibling is the right-most child of pParent */
+    put4byte(&pParent->aData[pParent->hdrOffset+8], pgnoNew[nNew-1]);
+  }else{
+    /* Right-most sibling is the left child of the first entry in pParent
+    ** past the right-most divider entry */
+    put4byte(findOverflowCell(pParent, nxDiv), pgnoNew[nNew-1]);
+  }
+
+  /*
+  ** Reparent children of all cells.
+  */
+  for(i=0; i<nNew; i++){
+    rc = reparentChildPages(apNew[i]);
+    if( rc!=SQLITE_OK ) goto balance_cleanup;
+  }
+  rc = reparentChildPages(pParent);
+  if( rc!=SQLITE_OK ) goto balance_cleanup;
+
+  /*
+  ** Balance the parent page.  Note that the current page (pPage) might
+  ** have been added to the freelist so it might no longer be initialized.
+  ** But the parent page will always be initialized.
+  */
+  assert( pParent->isInit );
+  rc = balance(pParent, 0);
+
+  /*
+  ** Cleanup before returning.
+  */
+balance_cleanup:
+  sqlite3_free(apCell);
+  for(i=0; i<nOld; i++){
+    releasePage(apOld[i]);
+  }
+  for(i=0; i<nNew; i++){
+    releasePage(apNew[i]);
+  }
+  releasePage(pParent);
+  TRACE(("BALANCE: finished with %d: old=%d new=%d cells=%d\n",
+          pPage->pgno, nOld, nNew, nCell));
+  return rc;
+}
+
+/*
+** This routine is called for the root page of a btree when the root
+** page contains no cells.  This is an opportunity to make the tree
+** shallower by one level.
+*/
+static int balance_shallower(MemPage *pPage){
+  MemPage *pChild;             /* The only child page of pPage */
+  Pgno pgnoChild;              /* Page number for pChild */
+  int rc = SQLITE_OK;          /* Return code from subprocedures */
+  BtShared *pBt;                  /* The main BTree structure */
+  int mxCellPerPage;           /* Maximum number of cells per page */
+  u8 **apCell;                 /* All cells from pages being balanced */
+  u16 *szCell;                 /* Local size of all cells */
+
+  assert( pPage->pParent==0 );
+  assert( pPage->nCell==0 );
+  assert( sqlite3_mutex_held(pPage->pBt->mutex) );
+  pBt = pPage->pBt;
+  mxCellPerPage = MX_CELL(pBt);
+  apCell = sqlite3_malloc( mxCellPerPage*(sizeof(u8*)+sizeof(u16)) );
+  if( apCell==0 ) return SQLITE_NOMEM;
+  szCell = (u16*)&apCell[mxCellPerPage];
+  if( pPage->leaf ){
+    /* The table is completely empty */
+    TRACE(("BALANCE: empty table %d\n", pPage->pgno));
+  }else{
+    /* The root page is empty but has one child.  Transfer the
+    ** information from that one child into the root page if it
+    ** will fit.  This reduces the depth of the tree by one.
+    **
+    ** If the root page is page 1, it has less space available than
+    ** its child (due to the 100 byte header that occurs at the beginning
+    ** of the database fle), so it might not be able to hold all of the
+    ** information currently contained in the child.  If this is the
+    ** case, then do not do the transfer.  Leave page 1 empty except
+    ** for the right-pointer to the child page.  The child page becomes
+    ** the virtual root of the tree.
+    */
+    pgnoChild = get4byte(&pPage->aData[pPage->hdrOffset+8]);
+    assert( pgnoChild>0 );
+    assert( pgnoChild<=sqlite3PagerPagecount(pPage->pBt->pPager) );
+    rc = sqlite3BtreeGetPage(pPage->pBt, pgnoChild, &pChild, 0);
+    if( rc ) goto end_shallow_balance;
+    if( pPage->pgno==1 ){
+      rc = sqlite3BtreeInitPage(pChild, pPage);
+      if( rc ) goto end_shallow_balance;
+      assert( pChild->nOverflow==0 );
+      if( pChild->nFree>=100 ){
+        /* The child information will fit on the root page, so do the
+        ** copy */
+        int i;
+        zeroPage(pPage, pChild->aData[0]);
+        for(i=0; i<pChild->nCell; i++){
+          apCell[i] = findCell(pChild,i);
+          szCell[i] = cellSizePtr(pChild, apCell[i]);
+        }
+        assemblePage(pPage, pChild->nCell, apCell, szCell);
+        /* Copy the right-pointer of the child to the parent. */
+        put4byte(&pPage->aData[pPage->hdrOffset+8],
+            get4byte(&pChild->aData[pChild->hdrOffset+8]));
+        freePage(pChild);
+        TRACE(("BALANCE: child %d transfer to page 1\n", pChild->pgno));
+      }else{
+        /* The child has more information that will fit on the root.
+        ** The tree is already balanced.  Do nothing. */
+        TRACE(("BALANCE: child %d will not fit on page 1\n", pChild->pgno));
+      }
+    }else{
+      memcpy(pPage->aData, pChild->aData, pPage->pBt->usableSize);
+      pPage->isInit = 0;
+      pPage->pParent = 0;
+      rc = sqlite3BtreeInitPage(pPage, 0);
+      assert( rc==SQLITE_OK );
+      freePage(pChild);
+      TRACE(("BALANCE: transfer child %d into root %d\n",
+              pChild->pgno, pPage->pgno));
+    }
+    rc = reparentChildPages(pPage);
+    assert( pPage->nOverflow==0 );
+#ifndef SQLITE_OMIT_AUTOVACUUM
+    if( pBt->autoVacuum ){
+      int i;
+      for(i=0; i<pPage->nCell; i++){
+        rc = ptrmapPutOvfl(pPage, i);
+        if( rc!=SQLITE_OK ){
+          goto end_shallow_balance;
+        }
+      }
+    }
+#endif
+    releasePage(pChild);
+  }
+end_shallow_balance:
+  sqlite3_free(apCell);
+  return rc;
+}
+
+
+/*
+** The root page is overfull
+**
+** When this happens, Create a new child page and copy the
+** contents of the root into the child.  Then make the root
+** page an empty page with rightChild pointing to the new
+** child.   Finally, call balance_internal() on the new child
+** to cause it to split.
+*/
+static int balance_deeper(MemPage *pPage){
+  int rc;             /* Return value from subprocedures */
+  MemPage *pChild;    /* Pointer to a new child page */
+  Pgno pgnoChild;     /* Page number of the new child page */
+  BtShared *pBt;         /* The BTree */
+  int usableSize;     /* Total usable size of a page */
+  u8 *data;           /* Content of the parent page */
+  u8 *cdata;          /* Content of the child page */
+  int hdr;            /* Offset to page header in parent */
+  int brk;            /* Offset to content of first cell in parent */
+
+  assert( pPage->pParent==0 );
+  assert( pPage->nOverflow>0 );
+  pBt = pPage->pBt;
+  assert( sqlite3_mutex_held(pBt->mutex) );
+  rc = allocateBtreePage(pBt, &pChild, &pgnoChild, pPage->pgno, 0);
+  if( rc ) return rc;
+  assert( sqlite3PagerIswriteable(pChild->pDbPage) );
+  usableSize = pBt->usableSize;
+  data = pPage->aData;
+  hdr = pPage->hdrOffset;
+  brk = get2byte(&data[hdr+5]);
+  cdata = pChild->aData;
+  memcpy(cdata, &data[hdr], pPage->cellOffset+2*pPage->nCell-hdr);
+  memcpy(&cdata[brk], &data[brk], usableSize-brk);
+  assert( pChild->isInit==0 );
+  rc = sqlite3BtreeInitPage(pChild, pPage);
+  if( rc ) goto balancedeeper_out;
+  memcpy(pChild->aOvfl, pPage->aOvfl, pPage->nOverflow*sizeof(pPage->aOvfl[0]));
+  pChild->nOverflow = pPage->nOverflow;
+  if( pChild->nOverflow ){
+    pChild->nFree = 0;
+  }
+  assert( pChild->nCell==pPage->nCell );
+  zeroPage(pPage, pChild->aData[0] & ~PTF_LEAF);
+  put4byte(&pPage->aData[pPage->hdrOffset+8], pgnoChild);
+  TRACE(("BALANCE: copy root %d into %d\n", pPage->pgno, pChild->pgno));
+#ifndef SQLITE_OMIT_AUTOVACUUM
+  if( pBt->autoVacuum ){
+    int i;
+    rc = ptrmapPut(pBt, pChild->pgno, PTRMAP_BTREE, pPage->pgno);
+    if( rc ) goto balancedeeper_out;
+    for(i=0; i<pChild->nCell; i++){
+      rc = ptrmapPutOvfl(pChild, i);
+      if( rc!=SQLITE_OK ){
+        return rc;
+      }
+    }
+  }
+#endif
+  rc = balance_nonroot(pChild);
+
+balancedeeper_out:
+  releasePage(pChild);
+  return rc;
+}
+
+/*
+** Decide if the page pPage needs to be balanced.  If balancing is
+** required, call the appropriate balancing routine.
+*/
+static int balance(MemPage *pPage, int insert){
+  int rc = SQLITE_OK;
+  assert( sqlite3_mutex_held(pPage->pBt->mutex) );
+  if( pPage->pParent==0 ){
+    rc = sqlite3PagerWrite(pPage->pDbPage);
+    if( rc==SQLITE_OK && pPage->nOverflow>0 ){
+      rc = balance_deeper(pPage);
+    }
+    if( rc==SQLITE_OK && pPage->nCell==0 ){
+      rc = balance_shallower(pPage);
+    }
+  }else{
+    if( pPage->nOverflow>0 ||
+        (!insert && pPage->nFree>pPage->pBt->usableSize*2/3) ){
+      rc = balance_nonroot(pPage);
+    }
+  }
+  return rc;
+}
+
+/*
+** This routine checks all cursors that point to table pgnoRoot.
+** If any of those cursors were opened with wrFlag==0 in a different
+** database connection (a database connection that shares the pager
+** cache with the current connection) and that other connection
+** is not in the ReadUncommmitted state, then this routine returns
+** SQLITE_LOCKED.
+**
+** In addition to checking for read-locks (where a read-lock
+** means a cursor opened with wrFlag==0) this routine also moves
+** all write cursors so that they are pointing to the
+** first Cell on the root page.  This is necessary because an insert
+** or delete might change the number of cells on a page or delete
+** a page entirely and we do not want to leave any cursors
+** pointing to non-existant pages or cells.
+*/
+static int checkReadLocks(Btree *pBtree, Pgno pgnoRoot, BtCursor *pExclude){
+  BtCursor *p;
+  BtShared *pBt = pBtree->pBt;
+  sqlite3 *db = pBtree->db;
+  assert( sqlite3BtreeHoldsMutex(pBtree) );
+  for(p=pBt->pCursor; p; p=p->pNext){
+    if( p==pExclude ) continue;
+    if( p->eState!=CURSOR_VALID ) continue;
+    if( p->pgnoRoot!=pgnoRoot ) continue;
+    if( p->wrFlag==0 ){
+      sqlite3 *dbOther = p->pBtree->db;
+      if( dbOther==0 ||
+         (dbOther!=db && (dbOther->flags & SQLITE_ReadUncommitted)==0) ){
+        return SQLITE_LOCKED;
+      }
+    }else if( p->pPage->pgno!=p->pgnoRoot ){
+      moveToRoot(p);
+    }
+  }
+  return SQLITE_OK;
+}
+
+/*
+** Insert a new record into the BTree.  The key is given by (pKey,nKey)
+** and the data is given by (pData,nData).  The cursor is used only to
+** define what table the record should be inserted into.  The cursor
+** is left pointing at a random location.
+**
+** For an INTKEY table, only the nKey value of the key is used.  pKey is
+** ignored.  For a ZERODATA table, the pData and nData are both ignored.
+*/
+int sqlite3BtreeInsert(
+  BtCursor *pCur,                /* Insert data into the table of this cursor */
+  const void *pKey, i64 nKey,    /* The key of the new record */
+  const void *pData, int nData,  /* The data of the new record */
+  int nZero,                     /* Number of extra 0 bytes to append to data */
+  int appendBias                 /* True if this is likely an append */
+){
+  int rc;
+  int loc;
+  int szNew;
+  MemPage *pPage;
+  Btree *p = pCur->pBtree;
+  BtShared *pBt = p->pBt;
+  unsigned char *oldCell;
+  unsigned char *newCell = 0;
+
+  assert( cursorHoldsMutex(pCur) );
+  if( pBt->inTransaction!=TRANS_WRITE ){
+    /* Must start a transaction before doing an insert */
+    rc = pBt->readOnly ? SQLITE_READONLY : SQLITE_ERROR;
+    return rc;
+  }
+  assert( !pBt->readOnly );
+  if( !pCur->wrFlag ){
+    return SQLITE_PERM;   /* Cursor not open for writing */
+  }
+  if( checkReadLocks(pCur->pBtree, pCur->pgnoRoot, pCur) ){
+    return SQLITE_LOCKED; /* The table pCur points to has a read lock */
+  }
+  if( pCur->eState==CURSOR_FAULT ){
+    return pCur->skip;
+  }
+
+  /* Save the positions of any other cursors open on this table */
+  clearCursorPosition(pCur);
+  if(
+    SQLITE_OK!=(rc = saveAllCursors(pBt, pCur->pgnoRoot, pCur)) ||
+    SQLITE_OK!=(rc = sqlite3BtreeMoveto(pCur, pKey, nKey, appendBias, &loc))
+  ){
+    return rc;
+  }
+
+  pPage = pCur->pPage;
+  assert( pPage->intKey || nKey>=0 );
+  assert( pPage->leaf || !pPage->leafData );
+  TRACE(("INSERT: table=%d nkey=%lld ndata=%d page=%d %s\n",
+          pCur->pgnoRoot, nKey, nData, pPage->pgno,
+          loc==0 ? "overwrite" : "new entry"));
+  assert( pPage->isInit );
+  newCell = sqlite3_malloc( MX_CELL_SIZE(pBt) );
+  if( newCell==0 ) return SQLITE_NOMEM;
+  rc = fillInCell(pPage, newCell, pKey, nKey, pData, nData, nZero, &szNew);
+  if( rc ) goto end_insert;
+  assert( szNew==cellSizePtr(pPage, newCell) );
+  assert( szNew<=MX_CELL_SIZE(pBt) );
+  if( loc==0 && CURSOR_VALID==pCur->eState ){
+    u16 szOld;
+    assert( pCur->idx>=0 && pCur->idx<pPage->nCell );
+    rc = sqlite3PagerWrite(pPage->pDbPage);
+    if( rc ){
+      goto end_insert;
+    }
+    oldCell = findCell(pPage, pCur->idx);
+    if( !pPage->leaf ){
+      memcpy(newCell, oldCell, 4);
+    }
+    szOld = cellSizePtr(pPage, oldCell);
+    rc = clearCell(pPage, oldCell);
+    if( rc ) goto end_insert;
+    dropCell(pPage, pCur->idx, szOld);
+  }else if( loc<0 && pPage->nCell>0 ){
+    assert( pPage->leaf );
+    pCur->idx++;
+    pCur->info.nSize = 0;
+  }else{
+    assert( pPage->leaf );
+  }
+  rc = insertCell(pPage, pCur->idx, newCell, szNew, 0, 0);
+  if( rc!=SQLITE_OK ) goto end_insert;
+  rc = balance(pPage, 1);
+  /* sqlite3BtreePageDump(pCur->pBt, pCur->pgnoRoot, 1); */
+  /* fflush(stdout); */
+  if( rc==SQLITE_OK ){
+    moveToRoot(pCur);
+  }
+end_insert:
+  sqlite3_free(newCell);
+  return rc;
+}
+
+/*
+** Delete the entry that the cursor is pointing to.  The cursor
+** is left pointing at a random location.
+*/
+int sqlite3BtreeDelete(BtCursor *pCur){
+  MemPage *pPage = pCur->pPage;
+  unsigned char *pCell;
+  int rc;
+  Pgno pgnoChild = 0;
+  Btree *p = pCur->pBtree;
+  BtShared *pBt = p->pBt;
+
+  assert( cursorHoldsMutex(pCur) );
+  assert( pPage->isInit );
+  if( pBt->inTransaction!=TRANS_WRITE ){
+    /* Must start a transaction before doing a delete */
+    rc = pBt->readOnly ? SQLITE_READONLY : SQLITE_ERROR;
+    return rc;
+  }
+  assert( !pBt->readOnly );
+  if( pCur->eState==CURSOR_FAULT ){
+    return pCur->skip;
+  }
+  if( pCur->idx >= pPage->nCell ){
+    return SQLITE_ERROR;  /* The cursor is not pointing to anything */
+  }
+  if( !pCur->wrFlag ){
+    return SQLITE_PERM;   /* Did not open this cursor for writing */
+  }
+  if( checkReadLocks(pCur->pBtree, pCur->pgnoRoot, pCur) ){
+    return SQLITE_LOCKED; /* The table pCur points to has a read lock */
+  }
+
+  /* Restore the current cursor position (a no-op if the cursor is not in
+  ** CURSOR_REQUIRESEEK state) and save the positions of any other cursors
+  ** open on the same table. Then call sqlite3PagerWrite() on the page
+  ** that the entry will be deleted from.
+  */
+  if(
+    (rc = restoreOrClearCursorPosition(pCur))!=0 ||
+    (rc = saveAllCursors(pBt, pCur->pgnoRoot, pCur))!=0 ||
+    (rc = sqlite3PagerWrite(pPage->pDbPage))!=0
+  ){
+    return rc;
+  }
+
+  /* Locate the cell within its page and leave pCell pointing to the
+  ** data. The clearCell() call frees any overflow pages associated with the
+  ** cell. The cell itself is still intact.
+  */
+  pCell = findCell(pPage, pCur->idx);
+  if( !pPage->leaf ){
+    pgnoChild = get4byte(pCell);
+  }
+  rc = clearCell(pPage, pCell);
+  if( rc ){
+    return rc;
+  }
+
+  if( !pPage->leaf ){
+    /*
+    ** The entry we are about to delete is not a leaf so if we do not
+    ** do something we will leave a hole on an internal page.
+    ** We have to fill the hole by moving in a cell from a leaf.  The
+    ** next Cell after the one to be deleted is guaranteed to exist and
+    ** to be a leaf so we can use it.
+    */
+    BtCursor leafCur;
+    unsigned char *pNext;
+    int notUsed;
+    unsigned char *tempCell = 0;
+    assert( !pPage->leafData );
+    sqlite3BtreeGetTempCursor(pCur, &leafCur);
+    rc = sqlite3BtreeNext(&leafCur, &notUsed);
+    if( rc==SQLITE_OK ){
+      rc = sqlite3PagerWrite(leafCur.pPage->pDbPage);
+    }
+    if( rc==SQLITE_OK ){
+      u16 szNext;
+      TRACE(("DELETE: table=%d delete internal from %d replace from leaf %d\n",
+         pCur->pgnoRoot, pPage->pgno, leafCur.pPage->pgno));
+      dropCell(pPage, pCur->idx, cellSizePtr(pPage, pCell));
+      pNext = findCell(leafCur.pPage, leafCur.idx);
+      szNext = cellSizePtr(leafCur.pPage, pNext);
+      assert( MX_CELL_SIZE(pBt)>=szNext+4 );
+      tempCell = sqlite3_malloc( MX_CELL_SIZE(pBt) );
+      if( tempCell==0 ){
+        rc = SQLITE_NOMEM;
+      }
+      if( rc==SQLITE_OK ){
+        rc = insertCell(pPage, pCur->idx, pNext-4, szNext+4, tempCell, 0);
+      }
+      if( rc==SQLITE_OK ){
+        put4byte(findOverflowCell(pPage, pCur->idx), pgnoChild);
+        rc = balance(pPage, 0);
+      }
+      if( rc==SQLITE_OK ){
+        dropCell(leafCur.pPage, leafCur.idx, szNext);
+        rc = balance(leafCur.pPage, 0);
+      }
+    }
+    sqlite3_free(tempCell);
+    sqlite3BtreeReleaseTempCursor(&leafCur);
+  }else{
+    TRACE(("DELETE: table=%d delete from leaf %d\n",
+       pCur->pgnoRoot, pPage->pgno));
+    dropCell(pPage, pCur->idx, cellSizePtr(pPage, pCell));
+    rc = balance(pPage, 0);
+  }
+  if( rc==SQLITE_OK ){
+    moveToRoot(pCur);
+  }
+  return rc;
+}
+
+/*
+** Create a new BTree table.  Write into *piTable the page
+** number for the root page of the new table.
+**
+** The type of type is determined by the flags parameter.  Only the
+** following values of flags are currently in use.  Other values for
+** flags might not work:
+**
+**     BTREE_INTKEY|BTREE_LEAFDATA     Used for SQL tables with rowid keys
+**     BTREE_ZERODATA                  Used for SQL indices
+*/
+static int btreeCreateTable(Btree *p, int *piTable, int flags){
+  BtShared *pBt = p->pBt;
+  MemPage *pRoot;
+  Pgno pgnoRoot;
+  int rc;
+
+  assert( sqlite3BtreeHoldsMutex(p) );
+  if( pBt->inTransaction!=TRANS_WRITE ){
+    /* Must start a transaction first */
+    rc = pBt->readOnly ? SQLITE_READONLY : SQLITE_ERROR;
+    return rc;
+  }
+  assert( !pBt->readOnly );
+
+#ifdef SQLITE_OMIT_AUTOVACUUM
+  rc = allocateBtreePage(pBt, &pRoot, &pgnoRoot, 1, 0);
+  if( rc ){
+    return rc;
+  }
+#else
+  if( pBt->autoVacuum ){
+    Pgno pgnoMove;      /* Move a page here to make room for the root-page */
+    MemPage *pPageMove; /* The page to move to. */
+
+    /* Creating a new table may probably require moving an existing database
+    ** to make room for the new tables root page. In case this page turns
+    ** out to be an overflow page, delete all overflow page-map caches
+    ** held by open cursors.
+    */
+    invalidateAllOverflowCache(pBt);
+
+    /* Read the value of meta[3] from the database to determine where the
+    ** root page of the new table should go. meta[3] is the largest root-page
+    ** created so far, so the new root-page is (meta[3]+1).
+    */
+    rc = sqlite3BtreeGetMeta(p, 4, &pgnoRoot);
+    if( rc!=SQLITE_OK ){
+      return rc;
+    }
+    pgnoRoot++;
+
+    /* The new root-page may not be allocated on a pointer-map page, or the
+    ** PENDING_BYTE page.
+    */
+    while( pgnoRoot==PTRMAP_PAGENO(pBt, pgnoRoot) ||
+        pgnoRoot==PENDING_BYTE_PAGE(pBt) ){
+      pgnoRoot++;
+    }
+    assert( pgnoRoot>=3 );
+
+    /* Allocate a page. The page that currently resides at pgnoRoot will
+    ** be moved to the allocated page (unless the allocated page happens
+    ** to reside at pgnoRoot).
+    */
+    rc = allocateBtreePage(pBt, &pPageMove, &pgnoMove, pgnoRoot, 1);
+    if( rc!=SQLITE_OK ){
+      return rc;
+    }
+
+    if( pgnoMove!=pgnoRoot ){
+      /* pgnoRoot is the page that will be used for the root-page of
+      ** the new table (assuming an error did not occur). But we were
+      ** allocated pgnoMove. If required (i.e. if it was not allocated
+      ** by extending the file), the current page at position pgnoMove
+      ** is already journaled.
+      */
+      u8 eType;
+      Pgno iPtrPage;
+
+      releasePage(pPageMove);
+
+      /* Move the page currently at pgnoRoot to pgnoMove. */
+      rc = sqlite3BtreeGetPage(pBt, pgnoRoot, &pRoot, 0);
+      if( rc!=SQLITE_OK ){
+        return rc;
+      }
+      rc = ptrmapGet(pBt, pgnoRoot, &eType, &iPtrPage);
+      if( rc!=SQLITE_OK || eType==PTRMAP_ROOTPAGE || eType==PTRMAP_FREEPAGE ){
+        releasePage(pRoot);
+        return rc;
+      }
+      assert( eType!=PTRMAP_ROOTPAGE );
+      assert( eType!=PTRMAP_FREEPAGE );
+      rc = sqlite3PagerWrite(pRoot->pDbPage);
+      if( rc!=SQLITE_OK ){
+        releasePage(pRoot);
+        return rc;
+      }
+      rc = relocatePage(pBt, pRoot, eType, iPtrPage, pgnoMove);
+      releasePage(pRoot);
+
+      /* Obtain the page at pgnoRoot */
+      if( rc!=SQLITE_OK ){
+        return rc;
+      }
+      rc = sqlite3BtreeGetPage(pBt, pgnoRoot, &pRoot, 0);
+      if( rc!=SQLITE_OK ){
+        return rc;
+      }
+      rc = sqlite3PagerWrite(pRoot->pDbPage);
+      if( rc!=SQLITE_OK ){
+        releasePage(pRoot);
+        return rc;
+      }
+    }else{
+      pRoot = pPageMove;
+    }
+
+    /* Update the pointer-map and meta-data with the new root-page number. */
+    rc = ptrmapPut(pBt, pgnoRoot, PTRMAP_ROOTPAGE, 0);
+    if( rc ){
+      releasePage(pRoot);
+      return rc;
+    }
+    rc = sqlite3BtreeUpdateMeta(p, 4, pgnoRoot);
+    if( rc ){
+      releasePage(pRoot);
+      return rc;
+    }
+
+  }else{
+    rc = allocateBtreePage(pBt, &pRoot, &pgnoRoot, 1, 0);
+    if( rc ) return rc;
+  }
+#endif
+  assert( sqlite3PagerIswriteable(pRoot->pDbPage) );
+  zeroPage(pRoot, flags | PTF_LEAF);
+  sqlite3PagerUnref(pRoot->pDbPage);
+  *piTable = (int)pgnoRoot;
+  return SQLITE_OK;
+}
+int sqlite3BtreeCreateTable(Btree *p, int *piTable, int flags){
+  int rc;
+  sqlite3BtreeEnter(p);
+  p->pBt->db = p->db;
+  rc = btreeCreateTable(p, piTable, flags);
+  sqlite3BtreeLeave(p);
+  return rc;
+}
+
+/*
+** Erase the given database page and all its children.  Return
+** the page to the freelist.
+*/
+static int clearDatabasePage(
+  BtShared *pBt,           /* The BTree that contains the table */
+  Pgno pgno,            /* Page number to clear */
+  MemPage *pParent,     /* Parent page.  NULL for the root */
+  int freePageFlag      /* Deallocate page if true */
+){
+  MemPage *pPage = 0;
+  int rc;
+  unsigned char *pCell;
+  int i;
+
+  assert( sqlite3_mutex_held(pBt->mutex) );
+  if( pgno>sqlite3PagerPagecount(pBt->pPager) ){
+    return SQLITE_CORRUPT_BKPT;
+  }
+
+  rc = getAndInitPage(pBt, pgno, &pPage, pParent);
+  if( rc ) goto cleardatabasepage_out;
+  for(i=0; i<pPage->nCell; i++){
+    pCell = findCell(pPage, i);
+    if( !pPage->leaf ){
+      rc = clearDatabasePage(pBt, get4byte(pCell), pPage->pParent, 1);
+      if( rc ) goto cleardatabasepage_out;
+    }
+    rc = clearCell(pPage, pCell);
+    if( rc ) goto cleardatabasepage_out;
+  }
+  if( !pPage->leaf ){
+    rc = clearDatabasePage(pBt, get4byte(&pPage->aData[8]), pPage->pParent, 1);
+    if( rc ) goto cleardatabasepage_out;
+  }
+  if( freePageFlag ){
+    rc = freePage(pPage);
+  }else if( (rc = sqlite3PagerWrite(pPage->pDbPage))==0 ){
+    zeroPage(pPage, pPage->aData[0] | PTF_LEAF);
+  }
+
+cleardatabasepage_out:
+  releasePage(pPage);
+  return rc;
+}
+
+/*
+** Delete all information from a single table in the database.  iTable is
+** the page number of the root of the table.  After this routine returns,
+** the root page is empty, but still exists.
+**
+** This routine will fail with SQLITE_LOCKED if there are any open
+** read cursors on the table.  Open write cursors are moved to the
+** root of the table.
+*/
+int sqlite3BtreeClearTable(Btree *p, int iTable){
+  int rc;
+  BtShared *pBt = p->pBt;
+  sqlite3BtreeEnter(p);
+  pBt->db = p->db;
+  if( p->inTrans!=TRANS_WRITE ){
+    rc = pBt->readOnly ? SQLITE_READONLY : SQLITE_ERROR;
+  }else if( (rc = checkReadLocks(p, iTable, 0))!=SQLITE_OK ){
+    /* nothing to do */
+  }else if( SQLITE_OK!=(rc = saveAllCursors(pBt, iTable, 0)) ){
+    /* nothing to do */
+  }else{
+    rc = clearDatabasePage(pBt, (Pgno)iTable, 0, 0);
+  }
+  sqlite3BtreeLeave(p);
+  return rc;
+}
+
+/*
+** Erase all information in a table and add the root of the table to
+** the freelist.  Except, the root of the principle table (the one on
+** page 1) is never added to the freelist.
+**
+** This routine will fail with SQLITE_LOCKED if there are any open
+** cursors on the table.
+**
+** If AUTOVACUUM is enabled and the page at iTable is not the last
+** root page in the database file, then the last root page
+** in the database file is moved into the slot formerly occupied by
+** iTable and that last slot formerly occupied by the last root page
+** is added to the freelist instead of iTable.  In this say, all
+** root pages are kept at the beginning of the database file, which
+** is necessary for AUTOVACUUM to work right.  *piMoved is set to the
+** page number that used to be the last root page in the file before
+** the move.  If no page gets moved, *piMoved is set to 0.
+** The last root page is recorded in meta[3] and the value of
+** meta[3] is updated by this procedure.
+*/
+static int btreeDropTable(Btree *p, int iTable, int *piMoved){
+  int rc;
+  MemPage *pPage = 0;
+  BtShared *pBt = p->pBt;
+
+  assert( sqlite3BtreeHoldsMutex(p) );
+  if( p->inTrans!=TRANS_WRITE ){
+    return pBt->readOnly ? SQLITE_READONLY : SQLITE_ERROR;
+  }
+
+  /* It is illegal to drop a table if any cursors are open on the
+  ** database. This is because in auto-vacuum mode the backend may
+  ** need to move another root-page to fill a gap left by the deleted
+  ** root page. If an open cursor was using this page a problem would
+  ** occur.
+  */
+  if( pBt->pCursor ){
+    return SQLITE_LOCKED;
+  }
+
+  rc = sqlite3BtreeGetPage(pBt, (Pgno)iTable, &pPage, 0);
+  if( rc ) return rc;
+  rc = sqlite3BtreeClearTable(p, iTable);
+  if( rc ){
+    releasePage(pPage);
+    return rc;
+  }
+
+  *piMoved = 0;
+
+  if( iTable>1 ){
+#ifdef SQLITE_OMIT_AUTOVACUUM
+    rc = freePage(pPage);
+    releasePage(pPage);
+#else
+    if( pBt->autoVacuum ){
+      Pgno maxRootPgno;
+      rc = sqlite3BtreeGetMeta(p, 4, &maxRootPgno);
+      if( rc!=SQLITE_OK ){
+        releasePage(pPage);
+        return rc;
+      }
+
+      if( iTable==maxRootPgno ){
+        /* If the table being dropped is the table with the largest root-page
+        ** number in the database, put the root page on the free list.
+        */
+        rc = freePage(pPage);
+        releasePage(pPage);
+        if( rc!=SQLITE_OK ){
+          return rc;
+        }
+      }else{
+        /* The table being dropped does not have the largest root-page
+        ** number in the database. So move the page that does into the
+        ** gap left by the deleted root-page.
+        */
+        MemPage *pMove;
+        releasePage(pPage);
+        rc = sqlite3BtreeGetPage(pBt, maxRootPgno, &pMove, 0);
+        if( rc!=SQLITE_OK ){
+          return rc;
+        }
+        rc = relocatePage(pBt, pMove, PTRMAP_ROOTPAGE, 0, iTable);
+        releasePage(pMove);
+        if( rc!=SQLITE_OK ){
+          return rc;
+        }
+        rc = sqlite3BtreeGetPage(pBt, maxRootPgno, &pMove, 0);
+        if( rc!=SQLITE_OK ){
+          return rc;
+        }
+        rc = freePage(pMove);
+        releasePage(pMove);
+        if( rc!=SQLITE_OK ){
+          return rc;
+        }
+        *piMoved = maxRootPgno;
+      }
+
+      /* Set the new 'max-root-page' value in the database header. This
+      ** is the old value less one, less one more if that happens to
+      ** be a root-page number, less one again if that is the
+      ** PENDING_BYTE_PAGE.
+      */
+      maxRootPgno--;
+      if( maxRootPgno==PENDING_BYTE_PAGE(pBt) ){
+        maxRootPgno--;
+      }
+      if( maxRootPgno==PTRMAP_PAGENO(pBt, maxRootPgno) ){
+        maxRootPgno--;
+      }
+      assert( maxRootPgno!=PENDING_BYTE_PAGE(pBt) );
+
+      rc = sqlite3BtreeUpdateMeta(p, 4, maxRootPgno);
+    }else{
+      rc = freePage(pPage);
+      releasePage(pPage);
+    }
+#endif
+  }else{
+    /* If sqlite3BtreeDropTable was called on page 1. */
+    zeroPage(pPage, PTF_INTKEY|PTF_LEAF );
+    releasePage(pPage);
+  }
+  return rc;
+}
+int sqlite3BtreeDropTable(Btree *p, int iTable, int *piMoved){
+  int rc;
+  sqlite3BtreeEnter(p);
+  p->pBt->db = p->db;
+  rc = btreeDropTable(p, iTable, piMoved);
+  sqlite3BtreeLeave(p);
+  return rc;
+}
+
+
+/*
+** Read the meta-information out of a database file.  Meta[0]
+** is the number of free pages currently in the database.  Meta[1]
+** through meta[15] are available for use by higher layers.  Meta[0]
+** is read-only, the others are read/write.
+**
+** The schema layer numbers meta values differently.  At the schema
+** layer (and the SetCookie and ReadCookie opcodes) the number of
+** free pages is not visible.  So Cookie[0] is the same as Meta[1].
+*/
+int sqlite3BtreeGetMeta(Btree *p, int idx, u32 *pMeta){
+  DbPage *pDbPage;
+  int rc;
+  unsigned char *pP1;
+  BtShared *pBt = p->pBt;
+
+  sqlite3BtreeEnter(p);
+  pBt->db = p->db;
+
+  /* Reading a meta-data value requires a read-lock on page 1 (and hence
+  ** the sqlite_master table. We grab this lock regardless of whether or
+  ** not the SQLITE_ReadUncommitted flag is set (the table rooted at page
+  ** 1 is treated as a special case by queryTableLock() and lockTable()).
+  */
+  rc = queryTableLock(p, 1, READ_LOCK);
+  if( rc!=SQLITE_OK ){
+    sqlite3BtreeLeave(p);
+    return rc;
+  }
+
+  assert( idx>=0 && idx<=15 );
+  rc = sqlite3PagerGet(pBt->pPager, 1, &pDbPage);
+  if( rc ){
+    sqlite3BtreeLeave(p);
+    return rc;
+  }
+  pP1 = (unsigned char *)sqlite3PagerGetData(pDbPage);
+  *pMeta = get4byte(&pP1[36 + idx*4]);
+  sqlite3PagerUnref(pDbPage);
+
+  /* If autovacuumed is disabled in this build but we are trying to
+  ** access an autovacuumed database, then make the database readonly.
+  */
+#ifdef SQLITE_OMIT_AUTOVACUUM
+  if( idx==4 && *pMeta>0 ) pBt->readOnly = 1;
+#endif
+
+  /* Grab the read-lock on page 1. */
+  rc = lockTable(p, 1, READ_LOCK);
+  sqlite3BtreeLeave(p);
+  return rc;
+}
+
+/*
+** Write meta-information back into the database.  Meta[0] is
+** read-only and may not be written.
+*/
+int sqlite3BtreeUpdateMeta(Btree *p, int idx, u32 iMeta){
+  BtShared *pBt = p->pBt;
+  unsigned char *pP1;
+  int rc;
+  assert( idx>=1 && idx<=15 );
+  sqlite3BtreeEnter(p);
+  pBt->db = p->db;
+  if( p->inTrans!=TRANS_WRITE ){
+    rc = pBt->readOnly ? SQLITE_READONLY : SQLITE_ERROR;
+  }else{
+    assert( pBt->pPage1!=0 );
+    pP1 = pBt->pPage1->aData;
+    rc = sqlite3PagerWrite(pBt->pPage1->pDbPage);
+    if( rc==SQLITE_OK ){
+      put4byte(&pP1[36 + idx*4], iMeta);
+#ifndef SQLITE_OMIT_AUTOVACUUM
+      if( idx==7 ){
+        assert( pBt->autoVacuum || iMeta==0 );
+        assert( iMeta==0 || iMeta==1 );
+        pBt->incrVacuum = iMeta;
+      }
+#endif
+    }
+  }
+  sqlite3BtreeLeave(p);
+  return rc;
+}
+
+/*
+** Return the flag byte at the beginning of the page that the cursor
+** is currently pointing to.
+*/
+int sqlite3BtreeFlags(BtCursor *pCur){
+  /* TODO: What about CURSOR_REQUIRESEEK state? Probably need to call
+  ** restoreOrClearCursorPosition() here.
+  */
+  MemPage *pPage;
+  restoreOrClearCursorPosition(pCur);
+  pPage = pCur->pPage;
+  assert( cursorHoldsMutex(pCur) );
+  assert( pPage->pBt==pCur->pBt );
+  return pPage ? pPage->aData[pPage->hdrOffset] : 0;
+}
+
+
+/*
+** Return the pager associated with a BTree.  This routine is used for
+** testing and debugging only.
+*/
+Pager *sqlite3BtreePager(Btree *p){
+  return p->pBt->pPager;
+}
+
+#ifndef SQLITE_OMIT_INTEGRITY_CHECK
+/*
+** Append a message to the error message string.
+*/
+static void checkAppendMsg(
+  IntegrityCk *pCheck,
+  char *zMsg1,
+  const char *zFormat,
+  ...
+){
+  va_list ap;
+  char *zMsg2;
+  if( !pCheck->mxErr ) return;
+  pCheck->mxErr--;
+  pCheck->nErr++;
+  va_start(ap, zFormat);
+  zMsg2 = sqlite3VMPrintf(0, zFormat, ap);
+  va_end(ap);
+  if( zMsg1==0 ) zMsg1 = "";
+  if( pCheck->zErrMsg ){
+    char *zOld = pCheck->zErrMsg;
+    pCheck->zErrMsg = 0;
+    sqlite3SetString(&pCheck->zErrMsg, zOld, "\n", zMsg1, zMsg2, (char*)0);
+    sqlite3_free(zOld);
+  }else{
+    sqlite3SetString(&pCheck->zErrMsg, zMsg1, zMsg2, (char*)0);
+  }
+  sqlite3_free(zMsg2);
+}
+#endif /* SQLITE_OMIT_INTEGRITY_CHECK */
+
+#ifndef SQLITE_OMIT_INTEGRITY_CHECK
+/*
+** Add 1 to the reference count for page iPage.  If this is the second
+** reference to the page, add an error message to pCheck->zErrMsg.
+** Return 1 if there are 2 ore more references to the page and 0 if
+** if this is the first reference to the page.
+**
+** Also check that the page number is in bounds.
+*/
+static int checkRef(IntegrityCk *pCheck, int iPage, char *zContext){
+  if( iPage==0 ) return 1;
+  if( iPage>pCheck->nPage || iPage<0 ){
+    checkAppendMsg(pCheck, zContext, "invalid page number %d", iPage);
+    return 1;
+  }
+  if( pCheck->anRef[iPage]==1 ){
+    checkAppendMsg(pCheck, zContext, "2nd reference to page %d", iPage);
+    return 1;
+  }
+  return  (pCheck->anRef[iPage]++)>1;
+}
+
+#ifndef SQLITE_OMIT_AUTOVACUUM
+/*
+** Check that the entry in the pointer-map for page iChild maps to
+** page iParent, pointer type ptrType. If not, append an error message
+** to pCheck.
+*/
+static void checkPtrmap(
+  IntegrityCk *pCheck,   /* Integrity check context */
+  Pgno iChild,           /* Child page number */
+  u8 eType,              /* Expected pointer map type */
+  Pgno iParent,          /* Expected pointer map parent page number */
+  char *zContext         /* Context description (used for error msg) */
+){
+  int rc;
+  u8 ePtrmapType;
+  Pgno iPtrmapParent;
+
+  rc = ptrmapGet(pCheck->pBt, iChild, &ePtrmapType, &iPtrmapParent);
+  if( rc!=SQLITE_OK ){
+    checkAppendMsg(pCheck, zContext, "Failed to read ptrmap key=%d", iChild);
+    return;
+  }
+
+  if( ePtrmapType!=eType || iPtrmapParent!=iParent ){
+    checkAppendMsg(pCheck, zContext,
+      "Bad ptr map entry key=%d expected=(%d,%d) got=(%d,%d)",
+      iChild, eType, iParent, ePtrmapType, iPtrmapParent);
+  }
+}
+#endif
+
+/*
+** Check the integrity of the freelist or of an overflow page list.
+** Verify that the number of pages on the list is N.
+*/
+static void checkList(
+  IntegrityCk *pCheck,  /* Integrity checking context */
+  int isFreeList,       /* True for a freelist.  False for overflow page list */
+  int iPage,            /* Page number for first page in the list */
+  int N,                /* Expected number of pages in the list */
+  char *zContext        /* Context for error messages */
+){
+  int i;
+  int expected = N;
+  int iFirst = iPage;
+  while( N-- > 0 && pCheck->mxErr ){
+    DbPage *pOvflPage;
+    unsigned char *pOvflData;
+    if( iPage<1 ){
+      checkAppendMsg(pCheck, zContext,
+         "%d of %d pages missing from overflow list starting at %d",
+          N+1, expected, iFirst);
+      break;
+    }
+    if( checkRef(pCheck, iPage, zContext) ) break;
+    if( sqlite3PagerGet(pCheck->pPager, (Pgno)iPage, &pOvflPage) ){
+      checkAppendMsg(pCheck, zContext, "failed to get page %d", iPage);
+      break;
+    }
+    pOvflData = (unsigned char *)sqlite3PagerGetData(pOvflPage);
+    if( isFreeList ){
+      int n = get4byte(&pOvflData[4]);
+#ifndef SQLITE_OMIT_AUTOVACUUM
+      if( pCheck->pBt->autoVacuum ){
+        checkPtrmap(pCheck, iPage, PTRMAP_FREEPAGE, 0, zContext);
+      }
+#endif
+      if( n>pCheck->pBt->usableSize/4-8 ){
+        checkAppendMsg(pCheck, zContext,
+           "freelist leaf count too big on page %d", iPage);
+        N--;
+      }else{
+        for(i=0; i<n; i++){
+          Pgno iFreePage = get4byte(&pOvflData[8+i*4]);
+#ifndef SQLITE_OMIT_AUTOVACUUM
+          if( pCheck->pBt->autoVacuum ){
+            checkPtrmap(pCheck, iFreePage, PTRMAP_FREEPAGE, 0, zContext);
+          }
+#endif
+          checkRef(pCheck, iFreePage, zContext);
+        }
+        N -= n;
+      }
+    }
+#ifndef SQLITE_OMIT_AUTOVACUUM
+    else{
+      /* If this database supports auto-vacuum and iPage is not the last
+      ** page in this overflow list, check that the pointer-map entry for
+      ** the following page matches iPage.
+      */
+      if( pCheck->pBt->autoVacuum && N>0 ){
+        i = get4byte(pOvflData);
+        checkPtrmap(pCheck, i, PTRMAP_OVERFLOW2, iPage, zContext);
+      }
+    }
+#endif
+    iPage = get4byte(pOvflData);
+    sqlite3PagerUnref(pOvflPage);
+  }
+}
+#endif /* SQLITE_OMIT_INTEGRITY_CHECK */
+
+#ifndef SQLITE_OMIT_INTEGRITY_CHECK
+/*
+** Do various sanity checks on a single page of a tree.  Return
+** the tree depth.  Root pages return 0.  Parents of root pages
+** return 1, and so forth.
+**
+** These checks are done:
+**
+**      1.  Make sure that cells and freeblocks do not overlap
+**          but combine to completely cover the page.
+**  NO  2.  Make sure cell keys are in order.
+**  NO  3.  Make sure no key is less than or equal to zLowerBound.
+**  NO  4.  Make sure no key is greater than or equal to zUpperBound.
+**      5.  Check the integrity of overflow pages.
+**      6.  Recursively call checkTreePage on all children.
+**      7.  Verify that the depth of all children is the same.
+**      8.  Make sure this page is at least 33% full or else it is
+**          the root of the tree.
+*/
+static int checkTreePage(
+  IntegrityCk *pCheck,  /* Context for the sanity check */
+  int iPage,            /* Page number of the page to check */
+  MemPage *pParent,     /* Parent page */
+  char *zParentContext  /* Parent context */
+){
+  MemPage *pPage;
+  int i, rc, depth, d2, pgno, cnt;
+  int hdr, cellStart;
+  int nCell;
+  u8 *data;
+  BtShared *pBt;
+  int usableSize;
+  char zContext[100];
+  char *hit;
+
+  sqlite3_snprintf(sizeof(zContext), zContext, "Page %d: ", iPage);
+
+  /* Check that the page exists
+  */
+  pBt = pCheck->pBt;
+  usableSize = pBt->usableSize;
+  if( iPage==0 ) return 0;
+  if( checkRef(pCheck, iPage, zParentContext) ) return 0;
+  if( (rc = sqlite3BtreeGetPage(pBt, (Pgno)iPage, &pPage, 0))!=0 ){
+    checkAppendMsg(pCheck, zContext,
+       "unable to get the page. error code=%d", rc);
+    return 0;
+  }
+  if( (rc = sqlite3BtreeInitPage(pPage, pParent))!=0 ){
+    checkAppendMsg(pCheck, zContext,
+                   "sqlite3BtreeInitPage() returns error code %d", rc);
+    releasePage(pPage);
+    return 0;
+  }
+
+  /* Check out all the cells.
+  */
+  depth = 0;
+  for(i=0; i<pPage->nCell && pCheck->mxErr; i++){
+    u8 *pCell;
+    int sz;
+    CellInfo info;
+
+    /* Check payload overflow pages
+    */
+    sqlite3_snprintf(sizeof(zContext), zContext,
+             "On tree page %d cell %d: ", iPage, i);
+    pCell = findCell(pPage,i);
+    sqlite3BtreeParseCellPtr(pPage, pCell, &info);
+    sz = info.nData;
+    if( !pPage->intKey ) sz += info.nKey;
+    assert( sz==info.nPayload );
+    if( sz>info.nLocal ){
+      int nPage = (sz - info.nLocal + usableSize - 5)/(usableSize - 4);
+      Pgno pgnoOvfl = get4byte(&pCell[info.iOverflow]);
+#ifndef SQLITE_OMIT_AUTOVACUUM
+      if( pBt->autoVacuum ){
+        checkPtrmap(pCheck, pgnoOvfl, PTRMAP_OVERFLOW1, iPage, zContext);
+      }
+#endif
+      checkList(pCheck, 0, pgnoOvfl, nPage, zContext);
+    }
+
+    /* Check sanity of left child page.
+    */
+    if( !pPage->leaf ){
+      pgno = get4byte(pCell);
+#ifndef SQLITE_OMIT_AUTOVACUUM
+      if( pBt->autoVacuum ){
+        checkPtrmap(pCheck, pgno, PTRMAP_BTREE, iPage, zContext);
+      }
+#endif
+      d2 = checkTreePage(pCheck,pgno,pPage,zContext);
+      if( i>0 && d2!=depth ){
+        checkAppendMsg(pCheck, zContext, "Child page depth differs");
+      }
+      depth = d2;
+    }
+  }
+  if( !pPage->leaf ){
+    pgno = get4byte(&pPage->aData[pPage->hdrOffset+8]);
+    sqlite3_snprintf(sizeof(zContext), zContext,
+                     "On page %d at right child: ", iPage);
+#ifndef SQLITE_OMIT_AUTOVACUUM
+    if( pBt->autoVacuum ){
+      checkPtrmap(pCheck, pgno, PTRMAP_BTREE, iPage, 0);
+    }
+#endif
+    checkTreePage(pCheck, pgno, pPage, zContext);
+  }
+
+  /* Check for complete coverage of the page
+  */
+  data = pPage->aData;
+  hdr = pPage->hdrOffset;
+  hit = sqlite3MallocZero( usableSize );
+  if( hit ){
+    memset(hit, 1, get2byte(&data[hdr+5]));
+    nCell = get2byte(&data[hdr+3]);
+    cellStart = hdr + 12 - 4*pPage->leaf;
+    for(i=0; i<nCell; i++){
+      int pc = get2byte(&data[cellStart+i*2]);
+      u16 size = cellSizePtr(pPage, &data[pc]);
+      int j;
+      if( (pc+size-1)>=usableSize || pc<0 ){
+        checkAppendMsg(pCheck, 0,
+            "Corruption detected in cell %d on page %d",i,iPage,0);
+      }else{
+        for(j=pc+size-1; j>=pc; j--) hit[j]++;
+      }
+    }
+    for(cnt=0, i=get2byte(&data[hdr+1]); i>0 && i<usableSize && cnt<10000;
+           cnt++){
+      int size = get2byte(&data[i+2]);
+      int j;
+      if( (i+size-1)>=usableSize || i<0 ){
+        checkAppendMsg(pCheck, 0,
+            "Corruption detected in cell %d on page %d",i,iPage,0);
+      }else{
+        for(j=i+size-1; j>=i; j--) hit[j]++;
+      }
+      i = get2byte(&data[i]);
+    }
+    for(i=cnt=0; i<usableSize; i++){
+      if( hit[i]==0 ){
+        cnt++;
+      }else if( hit[i]>1 ){
+        checkAppendMsg(pCheck, 0,
+          "Multiple uses for byte %d of page %d", i, iPage);
+        break;
+      }
+    }
+    if( cnt!=data[hdr+7] ){
+      checkAppendMsg(pCheck, 0,
+          "Fragmented space is %d byte reported as %d on page %d",
+          cnt, data[hdr+7], iPage);
+    }
+  }
+  sqlite3_free(hit);
+
+  releasePage(pPage);
+  return depth+1;
+}
+#endif /* SQLITE_OMIT_INTEGRITY_CHECK */
+
+#ifndef SQLITE_OMIT_INTEGRITY_CHECK
+/*
+** This routine does a complete check of the given BTree file.  aRoot[] is
+** an array of pages numbers were each page number is the root page of
+** a table.  nRoot is the number of entries in aRoot.
+**
+** If everything checks out, this routine returns NULL.  If something is
+** amiss, an error message is written into memory obtained from malloc()
+** and a pointer to that error message is returned.  The calling function
+** is responsible for freeing the error message when it is done.
+*/
+char *sqlite3BtreeIntegrityCheck(
+  Btree *p,     /* The btree to be checked */
+  int *aRoot,   /* An array of root pages numbers for individual trees */
+  int nRoot,    /* Number of entries in aRoot[] */
+  int mxErr,    /* Stop reporting errors after this many */
+  int *pnErr    /* Write number of errors seen to this variable */
+){
+  int i;
+  int nRef;
+  IntegrityCk sCheck;
+  BtShared *pBt = p->pBt;
+
+  sqlite3BtreeEnter(p);
+  pBt->db = p->db;
+  nRef = sqlite3PagerRefcount(pBt->pPager);
+  if( lockBtreeWithRetry(p)!=SQLITE_OK ){
+    sqlite3BtreeLeave(p);
+    return sqlite3StrDup("Unable to acquire a read lock on the database");
+  }
+  sCheck.pBt = pBt;
+  sCheck.pPager = pBt->pPager;
+  sCheck.nPage = sqlite3PagerPagecount(sCheck.pPager);
+  sCheck.mxErr = mxErr;
+  sCheck.nErr = 0;
+  *pnErr = 0;
+#ifndef SQLITE_OMIT_AUTOVACUUM
+  if( pBt->nTrunc!=0 ){
+    sCheck.nPage = pBt->nTrunc;
+  }
+#endif
+  if( sCheck.nPage==0 ){
+    unlockBtreeIfUnused(pBt);
+    sqlite3BtreeLeave(p);
+    return 0;
+  }
+  sCheck.anRef = sqlite3_malloc( (sCheck.nPage+1)*sizeof(sCheck.anRef[0]) );
+  if( !sCheck.anRef ){
+    unlockBtreeIfUnused(pBt);
+    *pnErr = 1;
+    sqlite3BtreeLeave(p);
+    return sqlite3MPrintf(p->db, "Unable to malloc %d bytes",
+        (sCheck.nPage+1)*sizeof(sCheck.anRef[0]));
+  }
+  for(i=0; i<=sCheck.nPage; i++){ sCheck.anRef[i] = 0; }
+  i = PENDING_BYTE_PAGE(pBt);
+  if( i<=sCheck.nPage ){
+    sCheck.anRef[i] = 1;
+  }
+  sCheck.zErrMsg = 0;
+
+  /* Check the integrity of the freelist
+  */
+  checkList(&sCheck, 1, get4byte(&pBt->pPage1->aData[32]),
+            get4byte(&pBt->pPage1->aData[36]), "Main freelist: ");
+
+  /* Check all the tables.
+  */
+  for(i=0; i<nRoot && sCheck.mxErr; i++){
+    if( aRoot[i]==0 ) continue;
+#ifndef SQLITE_OMIT_AUTOVACUUM
+    if( pBt->autoVacuum && aRoot[i]>1 ){
+      checkPtrmap(&sCheck, aRoot[i], PTRMAP_ROOTPAGE, 0, 0);
+    }
+#endif
+    checkTreePage(&sCheck, aRoot[i], 0, "List of tree roots: ");
+  }
+
+  /* Make sure every page in the file is referenced
+  */
+  for(i=1; i<=sCheck.nPage && sCheck.mxErr; i++){
+#ifdef SQLITE_OMIT_AUTOVACUUM
+    if( sCheck.anRef[i]==0 ){
+      checkAppendMsg(&sCheck, 0, "Page %d is never used", i);
+    }
+#else
+    /* If the database supports auto-vacuum, make sure no tables contain
+    ** references to pointer-map pages.
+    */
+    if( sCheck.anRef[i]==0 &&
+       (PTRMAP_PAGENO(pBt, i)!=i || !pBt->autoVacuum) ){
+      checkAppendMsg(&sCheck, 0, "Page %d is never used", i);
+    }
+    if( sCheck.anRef[i]!=0 &&
+       (PTRMAP_PAGENO(pBt, i)==i && pBt->autoVacuum) ){
+      checkAppendMsg(&sCheck, 0, "Pointer map page %d is referenced", i);
+    }
+#endif
+  }
+
+  /* Make sure this analysis did not leave any unref() pages
+  */
+  unlockBtreeIfUnused(pBt);
+  if( nRef != sqlite3PagerRefcount(pBt->pPager) ){
+    checkAppendMsg(&sCheck, 0,
+      "Outstanding page count goes from %d to %d during this analysis",
+      nRef, sqlite3PagerRefcount(pBt->pPager)
+    );
+  }
+
+  /* Clean  up and report errors.
+  */
+  sqlite3BtreeLeave(p);
+  sqlite3_free(sCheck.anRef);
+  *pnErr = sCheck.nErr;
+  return sCheck.zErrMsg;
+}
+#endif /* SQLITE_OMIT_INTEGRITY_CHECK */
+
+/*
+** Return the full pathname of the underlying database file.
+**
+** The pager filename is invariant as long as the pager is
+** open so it is safe to access without the BtShared mutex.
+*/
+const char *sqlite3BtreeGetFilename(Btree *p){
+  assert( p->pBt->pPager!=0 );
+  return sqlite3PagerFilename(p->pBt->pPager);
+}
+
+/*
+** Return the pathname of the directory that contains the database file.
+**
+** The pager directory name is invariant as long as the pager is
+** open so it is safe to access without the BtShared mutex.
+*/
+const char *sqlite3BtreeGetDirname(Btree *p){
+  assert( p->pBt->pPager!=0 );
+  return sqlite3PagerDirname(p->pBt->pPager);
+}
+
+/*
+** Return the pathname of the journal file for this database. The return
+** value of this routine is the same regardless of whether the journal file
+** has been created or not.
+**
+** The pager journal filename is invariant as long as the pager is
+** open so it is safe to access without the BtShared mutex.
+*/
+const char *sqlite3BtreeGetJournalname(Btree *p){
+  assert( p->pBt->pPager!=0 );
+  return sqlite3PagerJournalname(p->pBt->pPager);
+}
+
+#ifndef SQLITE_OMIT_VACUUM
+/*
+** Copy the complete content of pBtFrom into pBtTo.  A transaction
+** must be active for both files.
+**
+** The size of file pBtFrom may be reduced by this operation.
+** If anything goes wrong, the transaction on pBtFrom is rolled back.
+*/
+static int btreeCopyFile(Btree *pTo, Btree *pFrom){
+  int rc = SQLITE_OK;
+  Pgno i, nPage, nToPage, iSkip;
+
+  BtShared *pBtTo = pTo->pBt;
+  BtShared *pBtFrom = pFrom->pBt;
+  pBtTo->db = pTo->db;
+  pBtFrom->db = pFrom->db;
+
+
+  if( pTo->inTrans!=TRANS_WRITE || pFrom->inTrans!=TRANS_WRITE ){
+    return SQLITE_ERROR;
+  }
+  if( pBtTo->pCursor ) return SQLITE_BUSY;
+  nToPage = sqlite3PagerPagecount(pBtTo->pPager);
+  nPage = sqlite3PagerPagecount(pBtFrom->pPager);
+  iSkip = PENDING_BYTE_PAGE(pBtTo);
+  for(i=1; rc==SQLITE_OK && i<=nPage; i++){
+    DbPage *pDbPage;
+    if( i==iSkip ) continue;
+    rc = sqlite3PagerGet(pBtFrom->pPager, i, &pDbPage);
+    if( rc ) break;
+    rc = sqlite3PagerOverwrite(pBtTo->pPager, i, sqlite3PagerGetData(pDbPage));
+    sqlite3PagerUnref(pDbPage);
+  }
+
+  /* If the file is shrinking, journal the pages that are being truncated
+  ** so that they can be rolled back if the commit fails.
+  */
+  for(i=nPage+1; rc==SQLITE_OK && i<=nToPage; i++){
+    DbPage *pDbPage;
+    if( i==iSkip ) continue;
+    rc = sqlite3PagerGet(pBtTo->pPager, i, &pDbPage);
+    if( rc ) break;
+    rc = sqlite3PagerWrite(pDbPage);
+    sqlite3PagerDontWrite(pDbPage);
+    /* Yeah.  It seems wierd to call DontWrite() right after Write().  But
+    ** that is because the names of those procedures do not exactly
+    ** represent what they do.  Write() really means "put this page in the
+    ** rollback journal and mark it as dirty so that it will be written
+    ** to the database file later."  DontWrite() undoes the second part of
+    ** that and prevents the page from being written to the database.  The
+    ** page is still on the rollback journal, though.  And that is the whole
+    ** point of this loop: to put pages on the rollback journal. */
+    sqlite3PagerUnref(pDbPage);
+  }
+  if( !rc && nPage<nToPage ){
+    rc = sqlite3PagerTruncate(pBtTo->pPager, nPage);
+  }
+
+  if( rc ){
+    sqlite3BtreeRollback(pTo);
+  }
+  return rc;
+}
+int sqlite3BtreeCopyFile(Btree *pTo, Btree *pFrom){
+  int rc;
+  sqlite3BtreeEnter(pTo);
+  sqlite3BtreeEnter(pFrom);
+  rc = btreeCopyFile(pTo, pFrom);
+  sqlite3BtreeLeave(pFrom);
+  sqlite3BtreeLeave(pTo);
+  return rc;
+}
+
+#endif /* SQLITE_OMIT_VACUUM */
+
+/*
+** Return non-zero if a transaction is active.
+*/
+int sqlite3BtreeIsInTrans(Btree *p){
+  assert( p==0 || sqlite3_mutex_held(p->db->mutex) );
+  return (p && (p->inTrans==TRANS_WRITE));
+}
+
+/*
+** Return non-zero if a statement transaction is active.
+*/
+int sqlite3BtreeIsInStmt(Btree *p){
+  assert( sqlite3BtreeHoldsMutex(p) );
+  return (p->pBt && p->pBt->inStmt);
+}
+
+/*
+** Return non-zero if a read (or write) transaction is active.
+*/
+int sqlite3BtreeIsInReadTrans(Btree *p){
+  assert( sqlite3_mutex_held(p->db->mutex) );
+  return (p && (p->inTrans!=TRANS_NONE));
+}
+
+/*
+** This function returns a pointer to a blob of memory associated with
+** a single shared-btree. The memory is used by client code for its own
+** purposes (for example, to store a high-level schema associated with
+** the shared-btree). The btree layer manages reference counting issues.
+**
+** The first time this is called on a shared-btree, nBytes bytes of memory
+** are allocated, zeroed, and returned to the caller. For each subsequent
+** call the nBytes parameter is ignored and a pointer to the same blob
+** of memory returned.
+**
+** Just before the shared-btree is closed, the function passed as the
+** xFree argument when the memory allocation was made is invoked on the
+** blob of allocated memory. This function should not call sqlite3_free()
+** on the memory, the btree layer does that.
+*/
+void *sqlite3BtreeSchema(Btree *p, int nBytes, void(*xFree)(void *)){
+  BtShared *pBt = p->pBt;
+  sqlite3BtreeEnter(p);
+  if( !pBt->pSchema ){
+    pBt->pSchema = sqlite3MallocZero(nBytes);
+    pBt->xFreeSchema = xFree;
+  }
+  sqlite3BtreeLeave(p);
+  return pBt->pSchema;
+}
+
+/*
+** Return true if another user of the same shared btree as the argument
+** handle holds an exclusive lock on the sqlite_master table.
+*/
+int sqlite3BtreeSchemaLocked(Btree *p){
+  int rc;
+  assert( sqlite3_mutex_held(p->db->mutex) );
+  sqlite3BtreeEnter(p);
+  rc = (queryTableLock(p, MASTER_ROOT, READ_LOCK)!=SQLITE_OK);
+  sqlite3BtreeLeave(p);
+  return rc;
+}
+
+
+#ifndef SQLITE_OMIT_SHARED_CACHE
+/*
+** Obtain a lock on the table whose root page is iTab.  The
+** lock is a write lock if isWritelock is true or a read lock
+** if it is false.
+*/
+int sqlite3BtreeLockTable(Btree *p, int iTab, u8 isWriteLock){
+  int rc = SQLITE_OK;
+  u8 lockType = (isWriteLock?WRITE_LOCK:READ_LOCK);
+  sqlite3BtreeEnter(p);
+  rc = queryTableLock(p, iTab, lockType);
+  if( rc==SQLITE_OK ){
+    rc = lockTable(p, iTab, lockType);
+  }
+  sqlite3BtreeLeave(p);
+  return rc;
+}
+#endif
+
+#ifndef SQLITE_OMIT_INCRBLOB
+/*
+** Argument pCsr must be a cursor opened for writing on an
+** INTKEY table currently pointing at a valid table entry.
+** This function modifies the data stored as part of that entry.
+** Only the data content may only be modified, it is not possible
+** to change the length of the data stored.
+*/
+int sqlite3BtreePutData(BtCursor *pCsr, u32 offset, u32 amt, void *z){
+  assert( cursorHoldsMutex(pCsr) );
+  assert( sqlite3_mutex_held(pCsr->pBtree->db->mutex) );
+  assert(pCsr->isIncrblobHandle);
+  if( pCsr->eState>=CURSOR_REQUIRESEEK ){
+    if( pCsr->eState==CURSOR_FAULT ){
+      return pCsr->skip;
+    }else{
+      return SQLITE_ABORT;
+    }
+  }
+
+  /* Check some preconditions:
+  **   (a) the cursor is open for writing,
+  **   (b) there is no read-lock on the table being modified and
+  **   (c) the cursor points at a valid row of an intKey table.
+  */
+  if( !pCsr->wrFlag ){
+    return SQLITE_READONLY;
+  }
+  assert( !pCsr->pBt->readOnly
+          && pCsr->pBt->inTransaction==TRANS_WRITE );
+  if( checkReadLocks(pCsr->pBtree, pCsr->pgnoRoot, pCsr) ){
+    return SQLITE_LOCKED; /* The table pCur points to has a read lock */
+  }
+  if( pCsr->eState==CURSOR_INVALID || !pCsr->pPage->intKey ){
+    return SQLITE_ERROR;
+  }
+
+  return accessPayload(pCsr, offset, amt, (unsigned char *)z, 0, 1);
+}
+
+/*
+** Set a flag on this cursor to cache the locations of pages from the
+** overflow list for the current row. This is used by cursors opened
+** for incremental blob IO only.
+**
+** This function sets a flag only. The actual page location cache
+** (stored in BtCursor.aOverflow[]) is allocated and used by function
+** accessPayload() (the worker function for sqlite3BtreeData() and
+** sqlite3BtreePutData()).
+*/
+void sqlite3BtreeCacheOverflow(BtCursor *pCur){
+  assert( cursorHoldsMutex(pCur) );
+  assert( sqlite3_mutex_held(pCur->pBtree->db->mutex) );
+  assert(!pCur->isIncrblobHandle);
+  assert(!pCur->aOverflow);
+  pCur->isIncrblobHandle = 1;
+}
+#endif
diff --git a/uppsrc/plugin/sqlite3/lib/btree.h b/uppsrc/plugin/sqlite3/lib/btree.h
new file mode 100644
index 000000000..3bfebdb65
--- /dev/null
+++ b/uppsrc/plugin/sqlite3/lib/btree.h
@@ -0,0 +1,203 @@
+/*
+** 2001 September 15
+**
+** The author disclaims copyright to this source code.  In place of
+** a legal notice, here is a blessing:
+**
+**    May you do good and not evil.
+**    May you find forgiveness for yourself and forgive others.
+**    May you share freely, never taking more than you give.
+**
+*************************************************************************
+** This header file defines the interface that the sqlite B-Tree file
+** subsystem.  See comments in the source code for a detailed description
+** of what each interface routine does.
+**
+** @(#) $Id: btree.h,v 1.94 2007/12/07 18:55:28 drh Exp $
+*/
+#ifndef _BTREE_H_
+#define _BTREE_H_
+
+/* TODO: This definition is just included so other modules compile. It
+** needs to be revisited.
+*/
+#define SQLITE_N_BTREE_META 10
+
+/*
+** If defined as non-zero, auto-vacuum is enabled by default. Otherwise
+** it must be turned on for each database using "PRAGMA auto_vacuum = 1".
+*/
+#ifndef SQLITE_DEFAULT_AUTOVACUUM
+  #define SQLITE_DEFAULT_AUTOVACUUM 0
+#endif
+
+#define BTREE_AUTOVACUUM_NONE 0        /* Do not do auto-vacuum */
+#define BTREE_AUTOVACUUM_FULL 1        /* Do full auto-vacuum */
+#define BTREE_AUTOVACUUM_INCR 2        /* Incremental vacuum */
+
+/*
+** Forward declarations of structure
+*/
+typedef struct Btree Btree;
+typedef struct BtCursor BtCursor;
+typedef struct BtShared BtShared;
+typedef struct BtreeMutexArray BtreeMutexArray;
+
+/*
+** This structure records all of the Btrees that need to hold
+** a mutex before we enter sqlite3VdbeExec().  The Btrees are
+** are placed in aBtree[] in order of aBtree[]->pBt.  That way,
+** we can always lock and unlock them all quickly.
+*/
+struct BtreeMutexArray {
+  int nMutex;
+  Btree *aBtree[SQLITE_MAX_ATTACHED+1];
+};
+
+
+int sqlite3BtreeOpen(
+  const char *zFilename,   /* Name of database file to open */
+  sqlite3 *db,             /* Associated database connection */
+  Btree **,                /* Return open Btree* here */
+  int flags,               /* Flags */
+  int vfsFlags             /* Flags passed through to VFS open */
+);
+
+/* The flags parameter to sqlite3BtreeOpen can be the bitwise or of the
+** following values.
+**
+** NOTE:  These values must match the corresponding PAGER_ values in
+** pager.h.
+*/
+#define BTREE_OMIT_JOURNAL  1  /* Do not use journal.  No argument */
+#define BTREE_NO_READLOCK   2  /* Omit readlocks on readonly files */
+#define BTREE_MEMORY        4  /* In-memory DB.  No argument */
+#define BTREE_READONLY      8  /* Open the database in read-only mode */
+#define BTREE_READWRITE    16  /* Open for both reading and writing */
+#define BTREE_CREATE       32  /* Create the database if it does not exist */
+
+/* Additional values for the 4th argument of sqlite3BtreeOpen that
+** are not associated with PAGER_ values.
+*/
+#define BTREE_PRIVATE      64  /* Never share with other connections */
+
+int sqlite3BtreeClose(Btree*);
+int sqlite3BtreeSetCacheSize(Btree*,int);
+int sqlite3BtreeSetSafetyLevel(Btree*,int,int);
+int sqlite3BtreeSyncDisabled(Btree*);
+int sqlite3BtreeSetPageSize(Btree*,int,int);
+int sqlite3BtreeGetPageSize(Btree*);
+int sqlite3BtreeMaxPageCount(Btree*,int);
+int sqlite3BtreeGetReserve(Btree*);
+int sqlite3BtreeSetAutoVacuum(Btree *, int);
+int sqlite3BtreeGetAutoVacuum(Btree *);
+int sqlite3BtreeBeginTrans(Btree*,int);
+int sqlite3BtreeCommitPhaseOne(Btree*, const char *zMaster);
+int sqlite3BtreeCommitPhaseTwo(Btree*);
+int sqlite3BtreeCommit(Btree*);
+int sqlite3BtreeRollback(Btree*);
+int sqlite3BtreeBeginStmt(Btree*);
+int sqlite3BtreeCommitStmt(Btree*);
+int sqlite3BtreeRollbackStmt(Btree*);
+int sqlite3BtreeCreateTable(Btree*, int*, int flags);
+int sqlite3BtreeIsInTrans(Btree*);
+int sqlite3BtreeIsInStmt(Btree*);
+int sqlite3BtreeIsInReadTrans(Btree*);
+void *sqlite3BtreeSchema(Btree *, int, void(*)(void *));
+int sqlite3BtreeSchemaLocked(Btree *);
+int sqlite3BtreeLockTable(Btree *, int, u8);
+
+const char *sqlite3BtreeGetFilename(Btree *);
+const char *sqlite3BtreeGetDirname(Btree *);
+const char *sqlite3BtreeGetJournalname(Btree *);
+int sqlite3BtreeCopyFile(Btree *, Btree *);
+
+int sqlite3BtreeIncrVacuum(Btree *);
+
+/* The flags parameter to sqlite3BtreeCreateTable can be the bitwise OR
+** of the following flags:
+*/
+#define BTREE_INTKEY     1    /* Table has only 64-bit signed integer keys */
+#define BTREE_ZERODATA   2    /* Table has keys only - no data */
+#define BTREE_LEAFDATA   4    /* Data stored in leaves only.  Implies INTKEY */
+
+int sqlite3BtreeDropTable(Btree*, int, int*);
+int sqlite3BtreeClearTable(Btree*, int);
+int sqlite3BtreeGetMeta(Btree*, int idx, u32 *pValue);
+int sqlite3BtreeUpdateMeta(Btree*, int idx, u32 value);
+void sqlite3BtreeTripAllCursors(Btree*, int);
+
+int sqlite3BtreeCursor(
+  Btree*,                              /* BTree containing table to open */
+  int iTable,                          /* Index of root page */
+  int wrFlag,                          /* 1 for writing.  0 for read-only */
+  int(*)(void*,int,const void*,int,const void*),  /* Key comparison function */
+  void*,                               /* First argument to compare function */
+  BtCursor **ppCursor                  /* Returned cursor */
+);
+
+int sqlite3BtreeCloseCursor(BtCursor*);
+int sqlite3BtreeMoveto(BtCursor*,const void *pKey,i64 nKey,int bias,int *pRes);
+int sqlite3BtreeDelete(BtCursor*);
+int sqlite3BtreeInsert(BtCursor*, const void *pKey, i64 nKey,
+                                  const void *pData, int nData,
+                                  int nZero, int bias);
+int sqlite3BtreeFirst(BtCursor*, int *pRes);
+int sqlite3BtreeLast(BtCursor*, int *pRes);
+int sqlite3BtreeNext(BtCursor*, int *pRes);
+int sqlite3BtreeEof(BtCursor*);
+int sqlite3BtreeFlags(BtCursor*);
+int sqlite3BtreePrevious(BtCursor*, int *pRes);
+int sqlite3BtreeKeySize(BtCursor*, i64 *pSize);
+int sqlite3BtreeKey(BtCursor*, u32 offset, u32 amt, void*);
+sqlite3 *sqlite3BtreeCursorDb(const BtCursor*);
+const void *sqlite3BtreeKeyFetch(BtCursor*, int *pAmt);
+const void *sqlite3BtreeDataFetch(BtCursor*, int *pAmt);
+int sqlite3BtreeDataSize(BtCursor*, u32 *pSize);
+int sqlite3BtreeData(BtCursor*, u32 offset, u32 amt, void*);
+
+char *sqlite3BtreeIntegrityCheck(Btree*, int *aRoot, int nRoot, int, int*);
+struct Pager *sqlite3BtreePager(Btree*);
+
+int sqlite3BtreePutData(BtCursor*, u32 offset, u32 amt, void*);
+void sqlite3BtreeCacheOverflow(BtCursor *);
+
+#ifdef SQLITE_TEST
+int sqlite3BtreeCursorInfo(BtCursor*, int*, int);
+void sqlite3BtreeCursorList(Btree*);
+int sqlite3BtreePageDump(Btree*, int, int recursive);
+#endif
+
+/*
+** If we are not using shared cache, then there is no need to
+** use mutexes to access the BtShared structures.  So make the
+** Enter and Leave procedures no-ops.
+*/
+#if !defined(SQLITE_OMIT_SHARED_CACHE) && SQLITE_THREADSAFE
+  void sqlite3BtreeEnter(Btree*);
+  void sqlite3BtreeLeave(Btree*);
+  int sqlite3BtreeHoldsMutex(Btree*);
+  void sqlite3BtreeEnterCursor(BtCursor*);
+  void sqlite3BtreeLeaveCursor(BtCursor*);
+  void sqlite3BtreeEnterAll(sqlite3*);
+  void sqlite3BtreeLeaveAll(sqlite3*);
+  int sqlite3BtreeHoldsAllMutexes(sqlite3*);
+  void sqlite3BtreeMutexArrayEnter(BtreeMutexArray*);
+  void sqlite3BtreeMutexArrayLeave(BtreeMutexArray*);
+  void sqlite3BtreeMutexArrayInsert(BtreeMutexArray*, Btree*);
+#else
+# define sqlite3BtreeEnter(X)
+# define sqlite3BtreeLeave(X)
+# define sqlite3BtreeHoldsMutex(X) 1
+# define sqlite3BtreeEnterCursor(X)
+# define sqlite3BtreeLeaveCursor(X)
+# define sqlite3BtreeEnterAll(X)
+# define sqlite3BtreeLeaveAll(X)
+# define sqlite3BtreeHoldsAllMutexes(X) 1
+# define sqlite3BtreeMutexArrayEnter(X)
+# define sqlite3BtreeMutexArrayLeave(X)
+# define sqlite3BtreeMutexArrayInsert(X,Y)
+#endif
+
+
+#endif /* _BTREE_H_ */
diff --git a/uppsrc/plugin/sqlite3/lib/btreeInt.h b/uppsrc/plugin/sqlite3/lib/btreeInt.h
new file mode 100644
index 000000000..8f4c191da
--- /dev/null
+++ b/uppsrc/plugin/sqlite3/lib/btreeInt.h
@@ -0,0 +1,651 @@
+/*
+** 2004 April 6
+**
+** The author disclaims copyright to this source code.  In place of
+** a legal notice, here is a blessing:
+**
+**    May you do good and not evil.
+**    May you find forgiveness for yourself and forgive others.
+**    May you share freely, never taking more than you give.
+**
+*************************************************************************
+** $Id: btreeInt.h,v 1.17 2008/03/04 17:45:01 mlcreech Exp $
+**
+** This file implements a external (disk-based) database using BTrees.
+** For a detailed discussion of BTrees, refer to
+**
+**     Donald E. Knuth, THE ART OF COMPUTER PROGRAMMING, Volume 3:
+**     "Sorting And Searching", pages 473-480. Addison-Wesley
+**     Publishing Company, Reading, Massachusetts.
+**
+** The basic idea is that each page of the file contains N database
+** entries and N+1 pointers to subpages.
+**
+**   ----------------------------------------------------------------
+**   |  Ptr(0) | Key(0) | Ptr(1) | Key(1) | ... | Key(N-1) | Ptr(N) |
+**   ----------------------------------------------------------------
+**
+** All of the keys on the page that Ptr(0) points to have values less
+** than Key(0).  All of the keys on page Ptr(1) and its subpages have
+** values greater than Key(0) and less than Key(1).  All of the keys
+** on Ptr(N) and its subpages have values greater than Key(N-1).  And
+** so forth.
+**
+** Finding a particular key requires reading O(log(M)) pages from the
+** disk where M is the number of entries in the tree.
+**
+** In this implementation, a single file can hold one or more separate
+** BTrees.  Each BTree is identified by the index of its root page.  The
+** key and data for any entry are combined to form the "payload".  A
+** fixed amount of payload can be carried directly on the database
+** page.  If the payload is larger than the preset amount then surplus
+** bytes are stored on overflow pages.  The payload for an entry
+** and the preceding pointer are combined to form a "Cell".  Each
+** page has a small header which contains the Ptr(N) pointer and other
+** information such as the size of key and data.
+**
+** FORMAT DETAILS
+**
+** The file is divided into pages.  The first page is called page 1,
+** the second is page 2, and so forth.  A page number of zero indicates
+** "no such page".  The page size can be anything between 512 and 65536.
+** Each page can be either a btree page, a freelist page or an overflow
+** page.
+**
+** The first page is always a btree page.  The first 100 bytes of the first
+** page contain a special header (the "file header") that describes the file.
+** The format of the file header is as follows:
+**
+**   OFFSET   SIZE    DESCRIPTION
+**      0      16     Header string: "SQLite format 3\000"
+**     16       2     Page size in bytes.
+**     18       1     File format write version
+**     19       1     File format read version
+**     20       1     Bytes of unused space at the end of each page
+**     21       1     Max embedded payload fraction
+**     22       1     Min embedded payload fraction
+**     23       1     Min leaf payload fraction
+**     24       4     File change counter
+**     28       4     Reserved for future use
+**     32       4     First freelist page
+**     36       4     Number of freelist pages in the file
+**     40      60     15 4-byte meta values passed to higher layers
+**
+** All of the integer values are big-endian (most significant byte first).
+**
+** The file change counter is incremented when the database is changed
+** This counter allows other processes to know when the file has changed
+** and thus when they need to flush their cache.
+**
+** The max embedded payload fraction is the amount of the total usable
+** space in a page that can be consumed by a single cell for standard
+** B-tree (non-LEAFDATA) tables.  A value of 255 means 100%.  The default
+** is to limit the maximum cell size so that at least 4 cells will fit
+** on one page.  Thus the default max embedded payload fraction is 64.
+**
+** If the payload for a cell is larger than the max payload, then extra
+** payload is spilled to overflow pages.  Once an overflow page is allocated,
+** as many bytes as possible are moved into the overflow pages without letting
+** the cell size drop below the min embedded payload fraction.
+**
+** The min leaf payload fraction is like the min embedded payload fraction
+** except that it applies to leaf nodes in a LEAFDATA tree.  The maximum
+** payload fraction for a LEAFDATA tree is always 100% (or 255) and it
+** not specified in the header.
+**
+** Each btree pages is divided into three sections:  The header, the
+** cell pointer array, and the cell content area.  Page 1 also has a 100-byte
+** file header that occurs before the page header.
+**
+**      |----------------|
+**      | file header    |   100 bytes.  Page 1 only.
+**      |----------------|
+**      | page header    |   8 bytes for leaves.  12 bytes for interior nodes
+**      |----------------|
+**      | cell pointer   |   |  2 bytes per cell.  Sorted order.
+**      | array          |   |  Grows downward
+**      |                |   v
+**      |----------------|
+**      | unallocated    |
+**      | space          |
+**      |----------------|   ^  Grows upwards
+**      | cell content   |   |  Arbitrary order interspersed with freeblocks.
+**      | area           |   |  and free space fragments.
+**      |----------------|
+**
+** The page headers looks like this:
+**
+**   OFFSET   SIZE     DESCRIPTION
+**      0       1      Flags. 1: intkey, 2: zerodata, 4: leafdata, 8: leaf
+**      1       2      byte offset to the first freeblock
+**      3       2      number of cells on this page
+**      5       2      first byte of the cell content area
+**      7       1      number of fragmented free bytes
+**      8       4      Right child (the Ptr(N) value).  Omitted on leaves.
+**
+** The flags define the format of this btree page.  The leaf flag means that
+** this page has no children.  The zerodata flag means that this page carries
+** only keys and no data.  The intkey flag means that the key is a integer
+** which is stored in the key size entry of the cell header rather than in
+** the payload area.
+**
+** The cell pointer array begins on the first byte after the page header.
+** The cell pointer array contains zero or more 2-byte numbers which are
+** offsets from the beginning of the page to the cell content in the cell
+** content area.  The cell pointers occur in sorted order.  The system strives
+** to keep free space after the last cell pointer so that new cells can
+** be easily added without having to defragment the page.
+**
+** Cell content is stored at the very end of the page and grows toward the
+** beginning of the page.
+**
+** Unused space within the cell content area is collected into a linked list of
+** freeblocks.  Each freeblock is at least 4 bytes in size.  The byte offset
+** to the first freeblock is given in the header.  Freeblocks occur in
+** increasing order.  Because a freeblock must be at least 4 bytes in size,
+** any group of 3 or fewer unused bytes in the cell content area cannot
+** exist on the freeblock chain.  A group of 3 or fewer free bytes is called
+** a fragment.  The total number of bytes in all fragments is recorded.
+** in the page header at offset 7.
+**
+**    SIZE    DESCRIPTION
+**      2     Byte offset of the next freeblock
+**      2     Bytes in this freeblock
+**
+** Cells are of variable length.  Cells are stored in the cell content area at
+** the end of the page.  Pointers to the cells are in the cell pointer array
+** that immediately follows the page header.  Cells is not necessarily
+** contiguous or in order, but cell pointers are contiguous and in order.
+**
+** Cell content makes use of variable length integers.  A variable
+** length integer is 1 to 9 bytes where the lower 7 bits of each
+** byte are used.  The integer consists of all bytes that have bit 8 set and
+** the first byte with bit 8 clear.  The most significant byte of the integer
+** appears first.  A variable-length integer may not be more than 9 bytes long.
+** As a special case, all 8 bytes of the 9th byte are used as data.  This
+** allows a 64-bit integer to be encoded in 9 bytes.
+**
+**    0x00                      becomes  0x00000000
+**    0x7f                      becomes  0x0000007f
+**    0x81 0x00                 becomes  0x00000080
+**    0x82 0x00                 becomes  0x00000100
+**    0x80 0x7f                 becomes  0x0000007f
+**    0x8a 0x91 0xd1 0xac 0x78  becomes  0x12345678
+**    0x81 0x81 0x81 0x81 0x01  becomes  0x10204081
+**
+** Variable length integers are used for rowids and to hold the number of
+** bytes of key and data in a btree cell.
+**
+** The content of a cell looks like this:
+**
+**    SIZE    DESCRIPTION
+**      4     Page number of the left child. Omitted if leaf flag is set.
+**     var    Number of bytes of data. Omitted if the zerodata flag is set.
+**     var    Number of bytes of key. Or the key itself if intkey flag is set.
+**      *     Payload
+**      4     First page of the overflow chain.  Omitted if no overflow
+**
+** Overflow pages form a linked list.  Each page except the last is completely
+** filled with data (pagesize - 4 bytes).  The last page can have as little
+** as 1 byte of data.
+**
+**    SIZE    DESCRIPTION
+**      4     Page number of next overflow page
+**      *     Data
+**
+** Freelist pages come in two subtypes: trunk pages and leaf pages.  The
+** file header points to the first in a linked list of trunk page.  Each trunk
+** page points to multiple leaf pages.  The content of a leaf page is
+** unspecified.  A trunk page looks like this:
+**
+**    SIZE    DESCRIPTION
+**      4     Page number of next trunk page
+**      4     Number of leaf pointers on this page
+**      *     zero or more pages numbers of leaves
+*/
+#include "sqliteInt.h"
+#include "pager.h"
+#include "btree.h"
+#include "os.h"
+#include <assert.h>
+
+/* Round up a number to the next larger multiple of 8.  This is used
+** to force 8-byte alignment on 64-bit architectures.
+*/
+#define ROUND8(x)   ((x+7)&~7)
+
+
+/* The following value is the maximum cell size assuming a maximum page
+** size give above.
+*/
+#define MX_CELL_SIZE(pBt)  (pBt->pageSize-8)
+
+/* The maximum number of cells on a single page of the database.  This
+** assumes a minimum cell size of 6 bytes  (4 bytes for the cell itself
+** plus 2 bytes for the index to the cell in the page header).  Such
+** small cells will be rare, but they are possible.
+*/
+#define MX_CELL(pBt) ((pBt->pageSize-8)/6)
+
+/* Forward declarations */
+typedef struct MemPage MemPage;
+typedef struct BtLock BtLock;
+
+/*
+** This is a magic string that appears at the beginning of every
+** SQLite database in order to identify the file as a real database.
+**
+** You can change this value at compile-time by specifying a
+** -DSQLITE_FILE_HEADER="..." on the compiler command-line.  The
+** header must be exactly 16 bytes including the zero-terminator so
+** the string itself should be 15 characters long.  If you change
+** the header, then your custom library will not be able to read
+** databases generated by the standard tools and the standard tools
+** will not be able to read databases created by your custom library.
+*/
+#ifndef SQLITE_FILE_HEADER /* 123456789 123456 */
+#  define SQLITE_FILE_HEADER "SQLite format 3"
+#endif
+
+/*
+** Page type flags.  An ORed combination of these flags appear as the
+** first byte of on-disk image of every BTree page.
+*/
+#define PTF_INTKEY    0x01
+#define PTF_ZERODATA  0x02
+#define PTF_LEAFDATA  0x04
+#define PTF_LEAF      0x08
+
+/*
+** As each page of the file is loaded into memory, an instance of the following
+** structure is appended and initialized to zero.  This structure stores
+** information about the page that is decoded from the raw file page.
+**
+** The pParent field points back to the parent page.  This allows us to
+** walk up the BTree from any leaf to the root.  Care must be taken to
+** unref() the parent page pointer when this page is no longer referenced.
+** The pageDestructor() routine handles that chore.
+**
+** Access to all fields of this structure is controlled by the mutex
+** stored in MemPage.pBt->mutex.
+*/
+struct MemPage {
+  u8 isInit;           /* True if previously initialized. MUST BE FIRST! */
+  u8 idxShift;         /* True if Cell indices have changed */
+  u8 nOverflow;        /* Number of overflow cell bodies in aCell[] */
+  u8 intKey;           /* True if intkey flag is set */
+  u8 leaf;             /* True if leaf flag is set */
+  u8 zeroData;         /* True if table stores keys only */
+  u8 leafData;         /* True if tables stores data on leaves only */
+  u8 hasData;          /* True if this page stores data */
+  u8 hdrOffset;        /* 100 for page 1.  0 otherwise */
+  u8 childPtrSize;     /* 0 if leaf==1.  4 if leaf==0 */
+  u16 maxLocal;        /* Copy of BtShared.maxLocal or BtShared.maxLeaf */
+  u16 minLocal;        /* Copy of BtShared.minLocal or BtShared.minLeaf */
+  u16 cellOffset;      /* Index in aData of first cell pointer */
+  u16 idxParent;       /* Index in parent of this node */
+  u16 nFree;           /* Number of free bytes on the page */
+  u16 nCell;           /* Number of cells on this page, local and ovfl */
+  struct _OvflCell {   /* Cells that will not fit on aData[] */
+    u8 *pCell;          /* Pointers to the body of the overflow cell */
+    u16 idx;            /* Insert this cell before idx-th non-overflow cell */
+  } aOvfl[5];
+  BtShared *pBt;       /* Pointer to BtShared that this page is part of */
+  u8 *aData;           /* Pointer to disk image of the page data */
+  DbPage *pDbPage;     /* Pager page handle */
+  Pgno pgno;           /* Page number for this page */
+  MemPage *pParent;    /* The parent of this page.  NULL for root */
+};
+
+/*
+** The in-memory image of a disk page has the auxiliary information appended
+** to the end.  EXTRA_SIZE is the number of bytes of space needed to hold
+** that extra information.
+*/
+#define EXTRA_SIZE sizeof(MemPage)
+
+/* A Btree handle
+**
+** A database connection contains a pointer to an instance of
+** this object for every database file that it has open.  This structure
+** is opaque to the database connection.  The database connection cannot
+** see the internals of this structure and only deals with pointers to
+** this structure.
+**
+** For some database files, the same underlying database cache might be
+** shared between multiple connections.  In that case, each contection
+** has it own pointer to this object.  But each instance of this object
+** points to the same BtShared object.  The database cache and the
+** schema associated with the database file are all contained within
+** the BtShared object.
+**
+** All fields in this structure are accessed under sqlite3.mutex.
+** The pBt pointer itself may not be changed while there exists cursors
+** in the referenced BtShared that point back to this Btree since those
+** cursors have to do go through this Btree to find their BtShared and
+** they often do so without holding sqlite3.mutex.
+*/
+struct Btree {
+  sqlite3 *db;       /* The database connection holding this btree */
+  BtShared *pBt;     /* Sharable content of this btree */
+  u8 inTrans;        /* TRANS_NONE, TRANS_READ or TRANS_WRITE */
+  u8 sharable;       /* True if we can share pBt with another db */
+  u8 locked;         /* True if db currently has pBt locked */
+  int wantToLock;    /* Number of nested calls to sqlite3BtreeEnter() */
+  Btree *pNext;      /* List of other sharable Btrees from the same db */
+  Btree *pPrev;      /* Back pointer of the same list */
+};
+
+/*
+** Btree.inTrans may take one of the following values.
+**
+** If the shared-data extension is enabled, there may be multiple users
+** of the Btree structure. At most one of these may open a write transaction,
+** but any number may have active read transactions.
+*/
+#define TRANS_NONE  0
+#define TRANS_READ  1
+#define TRANS_WRITE 2
+
+/*
+** An instance of this object represents a single database file.
+**
+** A single database file can be in use as the same time by two
+** or more database connections.  When two or more connections are
+** sharing the same database file, each connection has it own
+** private Btree object for the file and each of those Btrees points
+** to this one BtShared object.  BtShared.nRef is the number of
+** connections currently sharing this database file.
+**
+** Fields in this structure are accessed under the BtShared.mutex
+** mutex, except for nRef and pNext which are accessed under the
+** global SQLITE_MUTEX_STATIC_MASTER mutex.  The pPager field
+** may not be modified once it is initially set as long as nRef>0.
+** The pSchema field may be set once under BtShared.mutex and
+** thereafter is unchanged as long as nRef>0.
+*/
+struct BtShared {
+  Pager *pPager;        /* The page cache */
+  sqlite3 *db;          /* Database connection currently using this Btree */
+  BtCursor *pCursor;    /* A list of all open cursors */
+  MemPage *pPage1;      /* First page of the database */
+  u8 inStmt;            /* True if we are in a statement subtransaction */
+  u8 readOnly;          /* True if the underlying file is readonly */
+  u8 maxEmbedFrac;      /* Maximum payload as % of total page size */
+  u8 minEmbedFrac;      /* Minimum payload as % of total page size */
+  u8 minLeafFrac;       /* Minimum leaf payload as % of total page size */
+  u8 pageSizeFixed;     /* True if the page size can no longer be changed */
+#ifndef SQLITE_OMIT_AUTOVACUUM
+  u8 autoVacuum;        /* True if auto-vacuum is enabled */
+  u8 incrVacuum;        /* True if incr-vacuum is enabled */
+  Pgno nTrunc;          /* Non-zero if the db will be truncated (incr vacuum) */
+#endif
+  u16 pageSize;         /* Total number of bytes on a page */
+  u16 usableSize;       /* Number of usable bytes on each page */
+  int maxLocal;         /* Maximum local payload in non-LEAFDATA tables */
+  int minLocal;         /* Minimum local payload in non-LEAFDATA tables */
+  int maxLeaf;          /* Maximum local payload in a LEAFDATA table */
+  int minLeaf;          /* Minimum local payload in a LEAFDATA table */
+  u8 inTransaction;     /* Transaction state */
+  int nTransaction;     /* Number of open transactions (read + write) */
+  void *pSchema;        /* Pointer to space allocated by sqlite3BtreeSchema() */
+  void (*xFreeSchema)(void*);  /* Destructor for BtShared.pSchema */
+  sqlite3_mutex *mutex; /* Non-recursive mutex required to access this struct */
+  BusyHandler busyHdr;  /* The busy handler for this btree */
+#ifndef SQLITE_OMIT_SHARED_CACHE
+  int nRef;             /* Number of references to this structure */
+  BtShared *pNext;      /* Next on a list of sharable BtShared structs */
+  BtLock *pLock;        /* List of locks held on this shared-btree struct */
+  Btree *pExclusive;    /* Btree with an EXCLUSIVE lock on the whole db */
+#endif
+};
+
+/*
+** An instance of the following structure is used to hold information
+** about a cell.  The parseCellPtr() function fills in this structure
+** based on information extract from the raw disk page.
+*/
+typedef struct CellInfo CellInfo;
+struct CellInfo {
+  u8 *pCell;     /* Pointer to the start of cell content */
+  i64 nKey;      /* The key for INTKEY tables, or number of bytes in key */
+  u32 nData;     /* Number of bytes of data */
+  u32 nPayload;  /* Total amount of payload */
+  u16 nHeader;   /* Size of the cell content header in bytes */
+  u16 nLocal;    /* Amount of payload held locally */
+  u16 iOverflow; /* Offset to overflow page number.  Zero if no overflow */
+  u16 nSize;     /* Size of the cell content on the main b-tree page */
+};
+
+/*
+** A cursor is a pointer to a particular entry within a particular
+** b-tree within a database file.
+**
+** The entry is identified by its MemPage and the index in
+** MemPage.aCell[] of the entry.
+**
+** When a single database file can shared by two more database connections,
+** but cursors cannot be shared.  Each cursor is associated with a
+** particular database connection identified BtCursor.pBtree.db.
+**
+** Fields in this structure are accessed under the BtShared.mutex
+** found at self->pBt->mutex.
+*/
+struct BtCursor {
+  Btree *pBtree;            /* The Btree to which this cursor belongs */
+  BtShared *pBt;            /* The BtShared this cursor points to */
+  BtCursor *pNext, *pPrev;  /* Forms a linked list of all cursors */
+  int (*xCompare)(void*,int,const void*,int,const void*); /* Key comp func */
+  void *pArg;               /* First arg to xCompare() */
+  Pgno pgnoRoot;            /* The root page of this tree */
+  MemPage *pPage;           /* Page that contains the entry */
+  int idx;                  /* Index of the entry in pPage->aCell[] */
+  CellInfo info;            /* A parse of the cell we are pointing at */
+  u8 wrFlag;                /* True if writable */
+  u8 eState;                /* One of the CURSOR_XXX constants (see below) */
+  void *pKey;      /* Saved key that was cursor's last known position */
+  i64 nKey;        /* Size of pKey, or last integer key */
+  int skip;        /* (skip<0) -> Prev() is a no-op. (skip>0) -> Next() is */
+#ifndef SQLITE_OMIT_INCRBLOB
+  u8 isIncrblobHandle;      /* True if this cursor is an incr. io handle */
+  Pgno *aOverflow;          /* Cache of overflow page locations */
+#endif
+};
+
+/*
+** Potential values for BtCursor.eState.
+**
+** CURSOR_VALID:
+**   Cursor points to a valid entry. getPayload() etc. may be called.
+**
+** CURSOR_INVALID:
+**   Cursor does not point to a valid entry. This can happen (for example)
+**   because the table is empty or because BtreeCursorFirst() has not been
+**   called.
+**
+** CURSOR_REQUIRESEEK:
+**   The table that this cursor was opened on still exists, but has been
+**   modified since the cursor was last used. The cursor position is saved
+**   in variables BtCursor.pKey and BtCursor.nKey. When a cursor is in
+**   this state, restoreOrClearCursorPosition() can be called to attempt to
+**   seek the cursor to the saved position.
+**
+** CURSOR_FAULT:
+**   A unrecoverable error (an I/O error or a malloc failure) has occurred
+**   on a different connection that shares the BtShared cache with this
+**   cursor.  The error has left the cache in an inconsistent state.
+**   Do nothing else with this cursor.  Any attempt to use the cursor
+**   should return the error code stored in BtCursor.skip
+*/
+#define CURSOR_INVALID           0
+#define CURSOR_VALID             1
+#define CURSOR_REQUIRESEEK       2
+#define CURSOR_FAULT             3
+
+/*
+** The TRACE macro will print high-level status information about the
+** btree operation when the global variable sqlite3BtreeTrace is
+** enabled.
+*/
+#if SQLITE_TEST
+# define TRACE(X)   if( sqlite3BtreeTrace ){ printf X; fflush(stdout); }
+#else
+# define TRACE(X)
+#endif
+
+/*
+** Routines to read and write variable-length integers.  These used to
+** be defined locally, but now we use the varint routines in the util.c
+** file.
+*/
+#define getVarint    sqlite3GetVarint
+#define getVarint32(A,B)  ((*B=*(A))<=0x7f?1:sqlite3GetVarint32(A,B))
+#define putVarint    sqlite3PutVarint
+
+/* The database page the PENDING_BYTE occupies. This page is never used.
+** TODO: This macro is very similary to PAGER_MJ_PGNO() in pager.c. They
+** should possibly be consolidated (presumably in pager.h).
+**
+** If disk I/O is omitted (meaning that the database is stored purely
+** in memory) then there is no pending byte.
+*/
+#ifdef SQLITE_OMIT_DISKIO
+# define PENDING_BYTE_PAGE(pBt)  0x7fffffff
+#else
+# define PENDING_BYTE_PAGE(pBt) ((PENDING_BYTE/(pBt)->pageSize)+1)
+#endif
+
+/*
+** A linked list of the following structures is stored at BtShared.pLock.
+** Locks are added (or upgraded from READ_LOCK to WRITE_LOCK) when a cursor
+** is opened on the table with root page BtShared.iTable. Locks are removed
+** from this list when a transaction is committed or rolled back, or when
+** a btree handle is closed.
+*/
+struct BtLock {
+  Btree *pBtree;        /* Btree handle holding this lock */
+  Pgno iTable;          /* Root page of table */
+  u8 eLock;             /* READ_LOCK or WRITE_LOCK */
+  BtLock *pNext;        /* Next in BtShared.pLock list */
+};
+
+/* Candidate values for BtLock.eLock */
+#define READ_LOCK     1
+#define WRITE_LOCK    2
+
+/*
+** These macros define the location of the pointer-map entry for a
+** database page. The first argument to each is the number of usable
+** bytes on each page of the database (often 1024). The second is the
+** page number to look up in the pointer map.
+**
+** PTRMAP_PAGENO returns the database page number of the pointer-map
+** page that stores the required pointer. PTRMAP_PTROFFSET returns
+** the offset of the requested map entry.
+**
+** If the pgno argument passed to PTRMAP_PAGENO is a pointer-map page,
+** then pgno is returned. So (pgno==PTRMAP_PAGENO(pgsz, pgno)) can be
+** used to test if pgno is a pointer-map page. PTRMAP_ISPAGE implements
+** this test.
+*/
+#define PTRMAP_PAGENO(pBt, pgno) ptrmapPageno(pBt, pgno)
+#define PTRMAP_PTROFFSET(pBt, pgno) (5*(pgno-ptrmapPageno(pBt, pgno)-1))
+#define PTRMAP_ISPAGE(pBt, pgno) (PTRMAP_PAGENO((pBt),(pgno))==(pgno))
+
+/*
+** The pointer map is a lookup table that identifies the parent page for
+** each child page in the database file.  The parent page is the page that
+** contains a pointer to the child.  Every page in the database contains
+** 0 or 1 parent pages.  (In this context 'database page' refers
+** to any page that is not part of the pointer map itself.)  Each pointer map
+** entry consists of a single byte 'type' and a 4 byte parent page number.
+** The PTRMAP_XXX identifiers below are the valid types.
+**
+** The purpose of the pointer map is to facility moving pages from one
+** position in the file to another as part of autovacuum.  When a page
+** is moved, the pointer in its parent must be updated to point to the
+** new location.  The pointer map is used to locate the parent page quickly.
+**
+** PTRMAP_ROOTPAGE: The database page is a root-page. The page-number is not
+**                  used in this case.
+**
+** PTRMAP_FREEPAGE: The database page is an unused (free) page. The page-number
+**                  is not used in this case.
+**
+** PTRMAP_OVERFLOW1: The database page is the first page in a list of
+**                   overflow pages. The page number identifies the page that
+**                   contains the cell with a pointer to this overflow page.
+**
+** PTRMAP_OVERFLOW2: The database page is the second or later page in a list of
+**                   overflow pages. The page-number identifies the previous
+**                   page in the overflow page list.
+**
+** PTRMAP_BTREE: The database page is a non-root btree page. The page number
+**               identifies the parent page in the btree.
+*/
+#define PTRMAP_ROOTPAGE 1
+#define PTRMAP_FREEPAGE 2
+#define PTRMAP_OVERFLOW1 3
+#define PTRMAP_OVERFLOW2 4
+#define PTRMAP_BTREE 5
+
+/* A bunch of assert() statements to check the transaction state variables
+** of handle p (type Btree*) are internally consistent.
+*/
+#define btreeIntegrity(p) \
+  assert( p->pBt->inTransaction!=TRANS_NONE || p->pBt->nTransaction==0 ); \
+  assert( p->pBt->inTransaction>=p->inTrans );
+
+
+/*
+** The ISAUTOVACUUM macro is used within balance_nonroot() to determine
+** if the database supports auto-vacuum or not. Because it is used
+** within an expression that is an argument to another macro
+** (sqliteMallocRaw), it is not possible to use conditional compilation.
+** So, this macro is defined instead.
+*/
+#ifndef SQLITE_OMIT_AUTOVACUUM
+#define ISAUTOVACUUM (pBt->autoVacuum)
+#else
+#define ISAUTOVACUUM 0
+#endif
+
+
+/*
+** This structure is passed around through all the sanity checking routines
+** in order to keep track of some global state information.
+*/
+typedef struct IntegrityCk IntegrityCk;
+struct IntegrityCk {
+  BtShared *pBt;    /* The tree being checked out */
+  Pager *pPager;    /* The associated pager.  Also accessible by pBt->pPager */
+  int nPage;        /* Number of pages in the database */
+  int *anRef;       /* Number of times each page is referenced */
+  int mxErr;        /* Stop accumulating errors when this reaches zero */
+  char *zErrMsg;    /* An error message.  NULL if no errors seen. */
+  int nErr;         /* Number of messages written to zErrMsg so far */
+};
+
+/*
+** Read or write a two- and four-byte big-endian integer values.
+*/
+#define get2byte(x)   ((x)[0]<<8 | (x)[1])
+#define put2byte(p,v) ((p)[0] = (v)>>8, (p)[1] = (v))
+#define get4byte sqlite3Get4byte
+#define put4byte sqlite3Put4byte
+
+/*
+** Internal routines that should be accessed by the btree layer only.
+*/
+int sqlite3BtreeGetPage(BtShared*, Pgno, MemPage**, int);
+int sqlite3BtreeInitPage(MemPage *pPage, MemPage *pParent);
+void sqlite3BtreeParseCellPtr(MemPage*, u8*, CellInfo*);
+void sqlite3BtreeParseCell(MemPage*, int, CellInfo*);
+#ifdef SQLITE_TEST
+u8 *sqlite3BtreeFindCell(MemPage *pPage, int iCell);
+#endif
+int sqlite3BtreeRestoreOrClearCursorPosition(BtCursor *pCur);
+void sqlite3BtreeGetTempCursor(BtCursor *pCur, BtCursor *pTempCur);
+void sqlite3BtreeReleaseTempCursor(BtCursor *pCur);
+int sqlite3BtreeIsRootPage(MemPage *pPage);
+void sqlite3BtreeMoveToParent(BtCursor *pCur);
diff --git a/uppsrc/plugin/sqlite3/lib/build.c b/uppsrc/plugin/sqlite3/lib/build.c
new file mode 100644
index 000000000..bc9e16fd2
--- /dev/null
+++ b/uppsrc/plugin/sqlite3/lib/build.c
@@ -0,0 +1,3467 @@
+/*
+** 2001 September 15
+**
+** The author disclaims copyright to this source code.  In place of
+** a legal notice, here is a blessing:
+**
+**    May you do good and not evil.
+**    May you find forgiveness for yourself and forgive others.
+**    May you share freely, never taking more than you give.
+**
+*************************************************************************
+** This file contains C code routines that are called by the SQLite parser
+** when syntax rules are reduced.  The routines in this file handle the
+** following kinds of SQL syntax:
+**
+**     CREATE TABLE
+**     DROP TABLE
+**     CREATE INDEX
+**     DROP INDEX
+**     creating ID lists
+**     BEGIN TRANSACTION
+**     COMMIT
+**     ROLLBACK
+**
+** $Id: build.c,v 1.474 2008/03/06 09:58:50 mlcreech Exp $
+*/
+#include "sqliteInt.h"
+#include <ctype.h>
+
+/*
+** This routine is called when a new SQL statement is beginning to
+** be parsed.  Initialize the pParse structure as needed.
+*/
+void sqlite3BeginParse(Parse *pParse, int explainFlag){
+  pParse->explain = explainFlag;
+  pParse->nVar = 0;
+}
+
+#ifndef SQLITE_OMIT_SHARED_CACHE
+/*
+** The TableLock structure is only used by the sqlite3TableLock() and
+** codeTableLocks() functions.
+*/
+struct TableLock {
+  int iDb;             /* The database containing the table to be locked */
+  int iTab;            /* The root page of the table to be locked */
+  u8 isWriteLock;      /* True for write lock.  False for a read lock */
+  const char *zName;   /* Name of the table */
+};
+
+/*
+** Record the fact that we want to lock a table at run-time.
+**
+** The table to be locked has root page iTab and is found in database iDb.
+** A read or a write lock can be taken depending on isWritelock.
+**
+** This routine just records the fact that the lock is desired.  The
+** code to make the lock occur is generated by a later call to
+** codeTableLocks() which occurs during sqlite3FinishCoding().
+*/
+void sqlite3TableLock(
+  Parse *pParse,     /* Parsing context */
+  int iDb,           /* Index of the database containing the table to lock */
+  int iTab,          /* Root page number of the table to be locked */
+  u8 isWriteLock,    /* True for a write lock */
+  const char *zName  /* Name of the table to be locked */
+){
+  int i;
+  int nBytes;
+  TableLock *p;
+
+  if( iDb<0 ){
+    return;
+  }
+
+  for(i=0; i<pParse->nTableLock; i++){
+    p = &pParse->aTableLock[i];
+    if( p->iDb==iDb && p->iTab==iTab ){
+      p->isWriteLock = (p->isWriteLock || isWriteLock);
+      return;
+    }
+  }
+
+  nBytes = sizeof(TableLock) * (pParse->nTableLock+1);
+  pParse->aTableLock =
+      sqlite3DbReallocOrFree(pParse->db, pParse->aTableLock, nBytes);
+  if( pParse->aTableLock ){
+    p = &pParse->aTableLock[pParse->nTableLock++];
+    p->iDb = iDb;
+    p->iTab = iTab;
+    p->isWriteLock = isWriteLock;
+    p->zName = zName;
+  }else{
+    pParse->nTableLock = 0;
+    pParse->db->mallocFailed = 1;
+  }
+}
+
+/*
+** Code an OP_TableLock instruction for each table locked by the
+** statement (configured by calls to sqlite3TableLock()).
+*/
+static void codeTableLocks(Parse *pParse){
+  int i;
+  Vdbe *pVdbe;
+
+  if( 0==(pVdbe = sqlite3GetVdbe(pParse)) ){
+    return;
+  }
+
+  for(i=0; i<pParse->nTableLock; i++){
+    TableLock *p = &pParse->aTableLock[i];
+    int p1 = p->iDb;
+    if( p->isWriteLock ){
+      p1 = -1*(p1+1);
+    }
+    sqlite3VdbeAddOp4(pVdbe, OP_TableLock, p1, p->iTab, 0, p->zName, P4_STATIC);
+  }
+}
+#else
+  #define codeTableLocks(x)
+#endif
+
+/*
+** This routine is called after a single SQL statement has been
+** parsed and a VDBE program to execute that statement has been
+** prepared.  This routine puts the finishing touches on the
+** VDBE program and resets the pParse structure for the next
+** parse.
+**
+** Note that if an error occurred, it might be the case that
+** no VDBE code was generated.
+*/
+void sqlite3FinishCoding(Parse *pParse){
+  sqlite3 *db;
+  Vdbe *v;
+
+  db = pParse->db;
+  if( db->mallocFailed ) return;
+  if( pParse->nested ) return;
+  if( pParse->nErr ) return;
+  if( !pParse->pVdbe ){
+    if( pParse->rc==SQLITE_OK && pParse->nErr ){
+      pParse->rc = SQLITE_ERROR;
+      return;
+    }
+  }
+
+  /* Begin by generating some termination code at the end of the
+  ** vdbe program
+  */
+  v = sqlite3GetVdbe(pParse);
+  if( v ){
+    sqlite3VdbeAddOp0(v, OP_Halt);
+
+    /* The cookie mask contains one bit for each database file open.
+    ** (Bit 0 is for main, bit 1 is for temp, and so forth.)  Bits are
+    ** set for each database that is used.  Generate code to start a
+    ** transaction on each used database and to verify the schema cookie
+    ** on each used database.
+    */
+    if( pParse->cookieGoto>0 ){
+      u32 mask;
+      int iDb;
+      sqlite3VdbeJumpHere(v, pParse->cookieGoto-1);
+      for(iDb=0, mask=1; iDb<db->nDb; mask<<=1, iDb++){
+        if( (mask & pParse->cookieMask)==0 ) continue;
+        sqlite3VdbeUsesBtree(v, iDb);
+        sqlite3VdbeAddOp2(v,OP_Transaction, iDb, (mask & pParse->writeMask)!=0);
+        sqlite3VdbeAddOp2(v,OP_VerifyCookie, iDb, pParse->cookieValue[iDb]);
+      }
+#ifndef SQLITE_OMIT_VIRTUALTABLE
+      if( pParse->pVirtualLock ){
+        char *vtab = (char *)pParse->pVirtualLock->pVtab;
+        sqlite3VdbeAddOp4(v, OP_VBegin, 0, 0, 0, vtab, P4_VTAB);
+      }
+#endif
+
+      /* Once all the cookies have been verified and transactions opened,
+      ** obtain the required table-locks. This is a no-op unless the
+      ** shared-cache feature is enabled.
+      */
+      codeTableLocks(pParse);
+      sqlite3VdbeAddOp2(v, OP_Goto, 0, pParse->cookieGoto);
+    }
+
+#ifndef SQLITE_OMIT_TRACE
+    if( !db->init.busy ){
+      /* Change the P4 argument of the first opcode (which will always be
+      ** an OP_Trace) to be the complete text of the current SQL statement.
+      */
+      VdbeOp *pOp = sqlite3VdbeGetOp(v, 0);
+      if( pOp && pOp->opcode==OP_Trace ){
+        sqlite3VdbeChangeP4(v, 0, pParse->zSql, pParse->zTail-pParse->zSql);
+      }
+    }
+#endif /* SQLITE_OMIT_TRACE */
+  }
+
+
+  /* Get the VDBE program ready for execution
+  */
+  if( v && pParse->nErr==0 && !db->mallocFailed ){
+#ifdef SQLITE_DEBUG
+    FILE *trace = (db->flags & SQLITE_VdbeTrace)!=0 ? stdout : 0;
+    sqlite3VdbeTrace(v, trace);
+#endif
+    sqlite3VdbeMakeReady(v, pParse->nVar, pParse->nMem+3,
+                         pParse->nTab+3, pParse->explain);
+    pParse->rc = SQLITE_DONE;
+    pParse->colNamesSet = 0;
+  }else if( pParse->rc==SQLITE_OK ){
+    pParse->rc = SQLITE_ERROR;
+  }
+  pParse->nTab = 0;
+  pParse->nMem = 0;
+  pParse->nSet = 0;
+  pParse->nVar = 0;
+  pParse->cookieMask = 0;
+  pParse->cookieGoto = 0;
+}
+
+/*
+** Run the parser and code generator recursively in order to generate
+** code for the SQL statement given onto the end of the pParse context
+** currently under construction.  When the parser is run recursively
+** this way, the final OP_Halt is not appended and other initialization
+** and finalization steps are omitted because those are handling by the
+** outermost parser.
+**
+** Not everything is nestable.  This facility is designed to permit
+** INSERT, UPDATE, and DELETE operations against SQLITE_MASTER.  Use
+** care if you decide to try to use this routine for some other purposes.
+*/
+void sqlite3NestedParse(Parse *pParse, const char *zFormat, ...){
+  va_list ap;
+  char *zSql;
+# define SAVE_SZ  (sizeof(Parse) - offsetof(Parse,nVar))
+  char saveBuf[SAVE_SZ];
+
+  if( pParse->nErr ) return;
+  assert( pParse->nested<10 );  /* Nesting should only be of limited depth */
+  va_start(ap, zFormat);
+  zSql = sqlite3VMPrintf(pParse->db, zFormat, ap);
+  va_end(ap);
+  if( zSql==0 ){
+    pParse->db->mallocFailed = 1;
+    return;   /* A malloc must have failed */
+  }
+  pParse->nested++;
+  memcpy(saveBuf, &pParse->nVar, SAVE_SZ);
+  memset(&pParse->nVar, 0, SAVE_SZ);
+  sqlite3RunParser(pParse, zSql, 0);
+  sqlite3_free(zSql);
+  memcpy(&pParse->nVar, saveBuf, SAVE_SZ);
+  pParse->nested--;
+}
+
+/*
+** Locate the in-memory structure that describes a particular database
+** table given the name of that table and (optionally) the name of the
+** database containing the table.  Return NULL if not found.
+**
+** If zDatabase is 0, all databases are searched for the table and the
+** first matching table is returned.  (No checking for duplicate table
+** names is done.)  The search order is TEMP first, then MAIN, then any
+** auxiliary databases added using the ATTACH command.
+**
+** See also sqlite3LocateTable().
+*/
+Table *sqlite3FindTable(sqlite3 *db, const char *zName, const char *zDatabase){
+  Table *p = 0;
+  int i;
+  assert( zName!=0 );
+  for(i=OMIT_TEMPDB; i<db->nDb; i++){
+    int j = (i<2) ? i^1 : i;   /* Search TEMP before MAIN */
+    if( zDatabase!=0 && sqlite3StrICmp(zDatabase, db->aDb[j].zName) ) continue;
+    p = sqlite3HashFind(&db->aDb[j].pSchema->tblHash, zName, strlen(zName)+1);
+    if( p ) break;
+  }
+  return p;
+}
+
+/*
+** Locate the in-memory structure that describes a particular database
+** table given the name of that table and (optionally) the name of the
+** database containing the table.  Return NULL if not found.  Also leave an
+** error message in pParse->zErrMsg.
+**
+** The difference between this routine and sqlite3FindTable() is that this
+** routine leaves an error message in pParse->zErrMsg where
+** sqlite3FindTable() does not.
+*/
+Table *sqlite3LocateTable(
+  Parse *pParse,         /* context in which to report errors */
+  int isView,            /* True if looking for a VIEW rather than a TABLE */
+  const char *zName,     /* Name of the table we are looking for */
+  const char *zDbase     /* Name of the database.  Might be NULL */
+){
+  Table *p;
+
+  /* Read the database schema. If an error occurs, leave an error message
+  ** and code in pParse and return NULL. */
+  if( SQLITE_OK!=sqlite3ReadSchema(pParse) ){
+    return 0;
+  }
+
+  p = sqlite3FindTable(pParse->db, zName, zDbase);
+  if( p==0 ){
+    const char *zMsg = isView ? "no such view" : "no such table";
+    if( zDbase ){
+      sqlite3ErrorMsg(pParse, "%s: %s.%s", zMsg, zDbase, zName);
+    }else{
+      sqlite3ErrorMsg(pParse, "%s: %s", zMsg, zName);
+    }
+    pParse->checkSchema = 1;
+  }
+  return p;
+}
+
+/*
+** Locate the in-memory structure that describes
+** a particular index given the name of that index
+** and the name of the database that contains the index.
+** Return NULL if not found.
+**
+** If zDatabase is 0, all databases are searched for the
+** table and the first matching index is returned.  (No checking
+** for duplicate index names is done.)  The search order is
+** TEMP first, then MAIN, then any auxiliary databases added
+** using the ATTACH command.
+*/
+Index *sqlite3FindIndex(sqlite3 *db, const char *zName, const char *zDb){
+  Index *p = 0;
+  int i;
+  for(i=OMIT_TEMPDB; i<db->nDb; i++){
+    int j = (i<2) ? i^1 : i;  /* Search TEMP before MAIN */
+    Schema *pSchema = db->aDb[j].pSchema;
+    if( zDb && sqlite3StrICmp(zDb, db->aDb[j].zName) ) continue;
+    assert( pSchema || (j==1 && !db->aDb[1].pBt) );
+    if( pSchema ){
+      p = sqlite3HashFind(&pSchema->idxHash, zName, strlen(zName)+1);
+    }
+    if( p ) break;
+  }
+  return p;
+}
+
+/*
+** Reclaim the memory used by an index
+*/
+static void freeIndex(Index *p){
+  sqlite3_free(p->zColAff);
+  sqlite3_free(p);
+}
+
+/*
+** Remove the given index from the index hash table, and free
+** its memory structures.
+**
+** The index is removed from the database hash tables but
+** it is not unlinked from the Table that it indexes.
+** Unlinking from the Table must be done by the calling function.
+*/
+static void sqliteDeleteIndex(Index *p){
+  Index *pOld;
+  const char *zName = p->zName;
+
+  pOld = sqlite3HashInsert(&p->pSchema->idxHash, zName, strlen( zName)+1, 0);
+  assert( pOld==0 || pOld==p );
+  freeIndex(p);
+}
+
+/*
+** For the index called zIdxName which is found in the database iDb,
+** unlike that index from its Table then remove the index from
+** the index hash table and free all memory structures associated
+** with the index.
+*/
+void sqlite3UnlinkAndDeleteIndex(sqlite3 *db, int iDb, const char *zIdxName){
+  Index *pIndex;
+  int len;
+  Hash *pHash = &db->aDb[iDb].pSchema->idxHash;
+
+  len = strlen(zIdxName);
+  pIndex = sqlite3HashInsert(pHash, zIdxName, len+1, 0);
+  if( pIndex ){
+    if( pIndex->pTable->pIndex==pIndex ){
+      pIndex->pTable->pIndex = pIndex->pNext;
+    }else{
+      Index *p;
+      for(p=pIndex->pTable->pIndex; p && p->pNext!=pIndex; p=p->pNext){}
+      if( p && p->pNext==pIndex ){
+        p->pNext = pIndex->pNext;
+      }
+    }
+    freeIndex(pIndex);
+  }
+  db->flags |= SQLITE_InternChanges;
+}
+
+/*
+** Erase all schema information from the in-memory hash tables of
+** a single database.  This routine is called to reclaim memory
+** before the database closes.  It is also called during a rollback
+** if there were schema changes during the transaction or if a
+** schema-cookie mismatch occurs.
+**
+** If iDb<=0 then reset the internal schema tables for all database
+** files.  If iDb>=2 then reset the internal schema for only the
+** single file indicated.
+*/
+void sqlite3ResetInternalSchema(sqlite3 *db, int iDb){
+  int i, j;
+  assert( iDb>=0 && iDb<db->nDb );
+
+  if( iDb==0 ){
+    sqlite3BtreeEnterAll(db);
+  }
+  for(i=iDb; i<db->nDb; i++){
+    Db *pDb = &db->aDb[i];
+    if( pDb->pSchema ){
+      assert(i==1 || (pDb->pBt && sqlite3BtreeHoldsMutex(pDb->pBt)));
+      sqlite3SchemaFree(pDb->pSchema);
+    }
+    if( iDb>0 ) return;
+  }
+  assert( iDb==0 );
+  db->flags &= ~SQLITE_InternChanges;
+  sqlite3BtreeLeaveAll(db);
+
+  /* If one or more of the auxiliary database files has been closed,
+  ** then remove them from the auxiliary database list.  We take the
+  ** opportunity to do this here since we have just deleted all of the
+  ** schema hash tables and therefore do not have to make any changes
+  ** to any of those tables.
+  */
+  for(i=0; i<db->nDb; i++){
+    struct Db *pDb = &db->aDb[i];
+    if( pDb->pBt==0 ){
+      if( pDb->pAux && pDb->xFreeAux ) pDb->xFreeAux(pDb->pAux);
+      pDb->pAux = 0;
+    }
+  }
+  for(i=j=2; i<db->nDb; i++){
+    struct Db *pDb = &db->aDb[i];
+    if( pDb->pBt==0 ){
+      sqlite3_free(pDb->zName);
+      pDb->zName = 0;
+      continue;
+    }
+    if( j<i ){
+      db->aDb[j] = db->aDb[i];
+    }
+    j++;
+  }
+  memset(&db->aDb[j], 0, (db->nDb-j)*sizeof(db->aDb[j]));
+  db->nDb = j;
+  if( db->nDb<=2 && db->aDb!=db->aDbStatic ){
+    memcpy(db->aDbStatic, db->aDb, 2*sizeof(db->aDb[0]));
+    sqlite3_free(db->aDb);
+    db->aDb = db->aDbStatic;
+  }
+}
+
+/*
+** This routine is called when a commit occurs.
+*/
+void sqlite3CommitInternalChanges(sqlite3 *db){
+  db->flags &= ~SQLITE_InternChanges;
+}
+
+/*
+** Clear the column names from a table or view.
+*/
+static void sqliteResetColumnNames(Table *pTable){
+  int i;
+  Column *pCol;
+  assert( pTable!=0 );
+  if( (pCol = pTable->aCol)!=0 ){
+    for(i=0; i<pTable->nCol; i++, pCol++){
+      sqlite3_free(pCol->zName);
+      sqlite3ExprDelete(pCol->pDflt);
+      sqlite3_free(pCol->zType);
+      sqlite3_free(pCol->zColl);
+    }
+    sqlite3_free(pTable->aCol);
+  }
+  pTable->aCol = 0;
+  pTable->nCol = 0;
+}
+
+/*
+** Remove the memory data structures associated with the given
+** Table.  No changes are made to disk by this routine.
+**
+** This routine just deletes the data structure.  It does not unlink
+** the table data structure from the hash table.  Nor does it remove
+** foreign keys from the sqlite.aFKey hash table.  But it does destroy
+** memory structures of the indices and foreign keys associated with
+** the table.
+*/
+void sqlite3DeleteTable(Table *pTable){
+  Index *pIndex, *pNext;
+  FKey *pFKey, *pNextFKey;
+
+  if( pTable==0 ) return;
+
+  /* Do not delete the table until the reference count reaches zero. */
+  pTable->nRef--;
+  if( pTable->nRef>0 ){
+    return;
+  }
+  assert( pTable->nRef==0 );
+
+  /* Delete all indices associated with this table
+  */
+  for(pIndex = pTable->pIndex; pIndex; pIndex=pNext){
+    pNext = pIndex->pNext;
+    assert( pIndex->pSchema==pTable->pSchema );
+    sqliteDeleteIndex(pIndex);
+  }
+
+#ifndef SQLITE_OMIT_FOREIGN_KEY
+  /* Delete all foreign keys associated with this table.  The keys
+  ** should have already been unlinked from the pSchema->aFKey hash table
+  */
+  for(pFKey=pTable->pFKey; pFKey; pFKey=pNextFKey){
+    pNextFKey = pFKey->pNextFrom;
+    assert( sqlite3HashFind(&pTable->pSchema->aFKey,
+                           pFKey->zTo, strlen(pFKey->zTo)+1)!=pFKey );
+    sqlite3_free(pFKey);
+  }
+#endif
+
+  /* Delete the Table structure itself.
+  */
+  sqliteResetColumnNames(pTable);
+  sqlite3_free(pTable->zName);
+  sqlite3_free(pTable->zColAff);
+  sqlite3SelectDelete(pTable->pSelect);
+#ifndef SQLITE_OMIT_CHECK
+  sqlite3ExprDelete(pTable->pCheck);
+#endif
+  sqlite3VtabClear(pTable);
+  sqlite3_free(pTable);
+}
+
+/*
+** Unlink the given table from the hash tables and the delete the
+** table structure with all its indices and foreign keys.
+*/
+void sqlite3UnlinkAndDeleteTable(sqlite3 *db, int iDb, const char *zTabName){
+  Table *p;
+  FKey *pF1, *pF2;
+  Db *pDb;
+
+  assert( db!=0 );
+  assert( iDb>=0 && iDb<db->nDb );
+  assert( zTabName && zTabName[0] );
+  pDb = &db->aDb[iDb];
+  p = sqlite3HashInsert(&pDb->pSchema->tblHash, zTabName, strlen(zTabName)+1,0);
+  if( p ){
+#ifndef SQLITE_OMIT_FOREIGN_KEY
+    for(pF1=p->pFKey; pF1; pF1=pF1->pNextFrom){
+      int nTo = strlen(pF1->zTo) + 1;
+      pF2 = sqlite3HashFind(&pDb->pSchema->aFKey, pF1->zTo, nTo);
+      if( pF2==pF1 ){
+        sqlite3HashInsert(&pDb->pSchema->aFKey, pF1->zTo, nTo, pF1->pNextTo);
+      }else{
+        while( pF2 && pF2->pNextTo!=pF1 ){ pF2=pF2->pNextTo; }
+        if( pF2 ){
+          pF2->pNextTo = pF1->pNextTo;
+        }
+      }
+    }
+#endif
+    sqlite3DeleteTable(p);
+  }
+  db->flags |= SQLITE_InternChanges;
+}
+
+/*
+** Given a token, return a string that consists of the text of that
+** token with any quotations removed.  Space to hold the returned string
+** is obtained from sqliteMalloc() and must be freed by the calling
+** function.
+**
+** Tokens are often just pointers into the original SQL text and so
+** are not \000 terminated and are not persistent.  The returned string
+** is \000 terminated and is persistent.
+*/
+char *sqlite3NameFromToken(sqlite3 *db, Token *pName){
+  char *zName;
+  if( pName ){
+    zName = sqlite3DbStrNDup(db, (char*)pName->z, pName->n);
+    sqlite3Dequote(zName);
+  }else{
+    zName = 0;
+  }
+  return zName;
+}
+
+/*
+** Open the sqlite_master table stored in database number iDb for
+** writing. The table is opened using cursor 0.
+*/
+void sqlite3OpenMasterTable(Parse *p, int iDb){
+  Vdbe *v = sqlite3GetVdbe(p);
+  sqlite3TableLock(p, iDb, MASTER_ROOT, 1, SCHEMA_TABLE(iDb));
+  sqlite3VdbeAddOp3(v, OP_OpenWrite, 0, MASTER_ROOT, iDb);
+  sqlite3VdbeAddOp2(v, OP_SetNumColumns, 0, 5); /* sqlite_master has 5 columns */
+}
+
+/*
+** The token *pName contains the name of a database (either "main" or
+** "temp" or the name of an attached db). This routine returns the
+** index of the named database in db->aDb[], or -1 if the named db
+** does not exist.
+*/
+int sqlite3FindDb(sqlite3 *db, Token *pName){
+  int i = -1;    /* Database number */
+  int n;         /* Number of characters in the name */
+  Db *pDb;       /* A database whose name space is being searched */
+  char *zName;   /* Name we are searching for */
+
+  zName = sqlite3NameFromToken(db, pName);
+  if( zName ){
+    n = strlen(zName);
+    for(i=(db->nDb-1), pDb=&db->aDb[i]; i>=0; i--, pDb--){
+      if( (!OMIT_TEMPDB || i!=1 ) && n==strlen(pDb->zName) &&
+          0==sqlite3StrICmp(pDb->zName, zName) ){
+        break;
+      }
+    }
+    sqlite3_free(zName);
+  }
+  return i;
+}
+
+/* The table or view or trigger name is passed to this routine via tokens
+** pName1 and pName2. If the table name was fully qualified, for example:
+**
+** CREATE TABLE xxx.yyy (...);
+**
+** Then pName1 is set to "xxx" and pName2 "yyy". On the other hand if
+** the table name is not fully qualified, i.e.:
+**
+** CREATE TABLE yyy(...);
+**
+** Then pName1 is set to "yyy" and pName2 is "".
+**
+** This routine sets the *ppUnqual pointer to point at the token (pName1 or
+** pName2) that stores the unqualified table name.  The index of the
+** database "xxx" is returned.
+*/
+int sqlite3TwoPartName(
+  Parse *pParse,      /* Parsing and code generating context */
+  Token *pName1,      /* The "xxx" in the name "xxx.yyy" or "xxx" */
+  Token *pName2,      /* The "yyy" in the name "xxx.yyy" */
+  Token **pUnqual     /* Write the unqualified object name here */
+){
+  int iDb;                    /* Database holding the object */
+  sqlite3 *db = pParse->db;
+
+  if( pName2 && pName2->n>0 ){
+    assert( !db->init.busy );
+    *pUnqual = pName2;
+    iDb = sqlite3FindDb(db, pName1);
+    if( iDb<0 ){
+      sqlite3ErrorMsg(pParse, "unknown database %T", pName1);
+      pParse->nErr++;
+      return -1;
+    }
+  }else{
+    assert( db->init.iDb==0 || db->init.busy );
+    iDb = db->init.iDb;
+    *pUnqual = pName1;
+  }
+  return iDb;
+}
+
+/*
+** This routine is used to check if the UTF-8 string zName is a legal
+** unqualified name for a new schema object (table, index, view or
+** trigger). All names are legal except those that begin with the string
+** "sqlite_" (in upper, lower or mixed case). This portion of the namespace
+** is reserved for internal use.
+*/
+int sqlite3CheckObjectName(Parse *pParse, const char *zName){
+  if( !pParse->db->init.busy && pParse->nested==0
+          && (pParse->db->flags & SQLITE_WriteSchema)==0
+          && 0==sqlite3StrNICmp(zName, "sqlite_", 7) ){
+    sqlite3ErrorMsg(pParse, "object name reserved for internal use: %s", zName);
+    return SQLITE_ERROR;
+  }
+  return SQLITE_OK;
+}
+
+/*
+** Begin constructing a new table representation in memory.  This is
+** the first of several action routines that get called in response
+** to a CREATE TABLE statement.  In particular, this routine is called
+** after seeing tokens "CREATE" and "TABLE" and the table name. The isTemp
+** flag is true if the table should be stored in the auxiliary database
+** file instead of in the main database file.  This is normally the case
+** when the "TEMP" or "TEMPORARY" keyword occurs in between
+** CREATE and TABLE.
+**
+** The new table record is initialized and put in pParse->pNewTable.
+** As more of the CREATE TABLE statement is parsed, additional action
+** routines will be called to add more information to this record.
+** At the end of the CREATE TABLE statement, the sqlite3EndTable() routine
+** is called to complete the construction of the new table record.
+*/
+void sqlite3StartTable(
+  Parse *pParse,   /* Parser context */
+  Token *pName1,   /* First part of the name of the table or view */
+  Token *pName2,   /* Second part of the name of the table or view */
+  int isTemp,      /* True if this is a TEMP table */
+  int isView,      /* True if this is a VIEW */
+  int isVirtual,   /* True if this is a VIRTUAL table */
+  int noErr        /* Do nothing if table already exists */
+){
+  Table *pTable;
+  char *zName = 0; /* The name of the new table */
+  sqlite3 *db = pParse->db;
+  Vdbe *v;
+  int iDb;         /* Database number to create the table in */
+  Token *pName;    /* Unqualified name of the table to create */
+
+  /* The table or view name to create is passed to this routine via tokens
+  ** pName1 and pName2. If the table name was fully qualified, for example:
+  **
+  ** CREATE TABLE xxx.yyy (...);
+  **
+  ** Then pName1 is set to "xxx" and pName2 "yyy". On the other hand if
+  ** the table name is not fully qualified, i.e.:
+  **
+  ** CREATE TABLE yyy(...);
+  **
+  ** Then pName1 is set to "yyy" and pName2 is "".
+  **
+  ** The call below sets the pName pointer to point at the token (pName1 or
+  ** pName2) that stores the unqualified table name. The variable iDb is
+  ** set to the index of the database that the table or view is to be
+  ** created in.
+  */
+  iDb = sqlite3TwoPartName(pParse, pName1, pName2, &pName);
+  if( iDb<0 ) return;
+  if( !OMIT_TEMPDB && isTemp && iDb>1 ){
+    /* If creating a temp table, the name may not be qualified */
+    sqlite3ErrorMsg(pParse, "temporary table name must be unqualified");
+    return;
+  }
+  if( !OMIT_TEMPDB && isTemp ) iDb = 1;
+
+  pParse->sNameToken = *pName;
+  zName = sqlite3NameFromToken(db, pName);
+  if( zName==0 ) return;
+  if( SQLITE_OK!=sqlite3CheckObjectName(pParse, zName) ){
+    goto begin_table_error;
+  }
+  if( db->init.iDb==1 ) isTemp = 1;
+#ifndef SQLITE_OMIT_AUTHORIZATION
+  assert( (isTemp & 1)==isTemp );
+  {
+    int code;
+    char *zDb = db->aDb[iDb].zName;
+    if( sqlite3AuthCheck(pParse, SQLITE_INSERT, SCHEMA_TABLE(isTemp), 0, zDb) ){
+      goto begin_table_error;
+    }
+    if( isView ){
+      if( !OMIT_TEMPDB && isTemp ){
+        code = SQLITE_CREATE_TEMP_VIEW;
+      }else{
+        code = SQLITE_CREATE_VIEW;
+      }
+    }else{
+      if( !OMIT_TEMPDB && isTemp ){
+        code = SQLITE_CREATE_TEMP_TABLE;
+      }else{
+        code = SQLITE_CREATE_TABLE;
+      }
+    }
+    if( !isVirtual && sqlite3AuthCheck(pParse, code, zName, 0, zDb) ){
+      goto begin_table_error;
+    }
+  }
+#endif
+
+  /* Make sure the new table name does not collide with an existing
+  ** index or table name in the same database.  Issue an error message if
+  ** it does. The exception is if the statement being parsed was passed
+  ** to an sqlite3_declare_vtab() call. In that case only the column names
+  ** and types will be used, so there is no need to test for namespace
+  ** collisions.
+  */
+  if( !IN_DECLARE_VTAB ){
+    if( SQLITE_OK!=sqlite3ReadSchema(pParse) ){
+      goto begin_table_error;
+    }
+    pTable = sqlite3FindTable(db, zName, db->aDb[iDb].zName);
+    if( pTable ){
+      if( !noErr ){
+        sqlite3ErrorMsg(pParse, "table %T already exists", pName);
+      }
+      goto begin_table_error;
+    }
+    if( sqlite3FindIndex(db, zName, 0)!=0 && (iDb==0 || !db->init.busy) ){
+      sqlite3ErrorMsg(pParse, "there is already an index named %s", zName);
+      goto begin_table_error;
+    }
+  }
+
+  pTable = sqlite3DbMallocZero(db, sizeof(Table));
+  if( pTable==0 ){
+    db->mallocFailed = 1;
+    pParse->rc = SQLITE_NOMEM;
+    pParse->nErr++;
+    goto begin_table_error;
+  }
+  pTable->zName = zName;
+  pTable->iPKey = -1;
+  pTable->pSchema = db->aDb[iDb].pSchema;
+  pTable->nRef = 1;
+  if( pParse->pNewTable ) sqlite3DeleteTable(pParse->pNewTable);
+  pParse->pNewTable = pTable;
+
+  /* If this is the magic sqlite_sequence table used by autoincrement,
+  ** then record a pointer to this table in the main database structure
+  ** so that INSERT can find the table easily.
+  */
+#ifndef SQLITE_OMIT_AUTOINCREMENT
+  if( !pParse->nested && strcmp(zName, "sqlite_sequence")==0 ){
+    pTable->pSchema->pSeqTab = pTable;
+  }
+#endif
+
+  /* Begin generating the code that will insert the table record into
+  ** the SQLITE_MASTER table.  Note in particular that we must go ahead
+  ** and allocate the record number for the table entry now.  Before any
+  ** PRIMARY KEY or UNIQUE keywords are parsed.  Those keywords will cause
+  ** indices to be created and the table record must come before the
+  ** indices.  Hence, the record number for the table must be allocated
+  ** now.
+  */
+  if( !db->init.busy && (v = sqlite3GetVdbe(pParse))!=0 ){
+    int j1;
+    int fileFormat;
+    int reg1, reg2, reg3;
+    sqlite3BeginWriteOperation(pParse, 0, iDb);
+
+#ifndef SQLITE_OMIT_VIRTUALTABLE
+    if( isVirtual ){
+      sqlite3VdbeAddOp0(v, OP_VBegin);
+    }
+#endif
+
+    /* If the file format and encoding in the database have not been set,
+    ** set them now.
+    */
+    reg1 = pParse->regRowid = ++pParse->nMem;
+    reg2 = pParse->regRoot = ++pParse->nMem;
+    reg3 = ++pParse->nMem;
+    sqlite3VdbeAddOp3(v, OP_ReadCookie, iDb, reg3, 1);   /* file_format */
+    sqlite3VdbeUsesBtree(v, iDb);
+    j1 = sqlite3VdbeAddOp1(v, OP_If, reg3);
+    fileFormat = (db->flags & SQLITE_LegacyFileFmt)!=0 ?
+                  1 : SQLITE_MAX_FILE_FORMAT;
+    sqlite3VdbeAddOp2(v, OP_Integer, fileFormat, reg3);
+    sqlite3VdbeAddOp3(v, OP_SetCookie, iDb, 1, reg3);
+    sqlite3VdbeAddOp2(v, OP_Integer, ENC(db), reg3);
+    sqlite3VdbeAddOp3(v, OP_SetCookie, iDb, 4, reg3);
+    sqlite3VdbeJumpHere(v, j1);
+
+    /* This just creates a place-holder record in the sqlite_master table.
+    ** The record created does not contain anything yet.  It will be replaced
+    ** by the real entry in code generated at sqlite3EndTable().
+    **
+    ** The rowid for the new entry is left on the top of the stack.
+    ** The rowid value is needed by the code that sqlite3EndTable will
+    ** generate.
+    */
+#if !defined(SQLITE_OMIT_VIEW) || !defined(SQLITE_OMIT_VIRTUALTABLE)
+    if( isView || isVirtual ){
+      sqlite3VdbeAddOp2(v, OP_Integer, 0, reg2);
+    }else
+#endif
+    {
+      sqlite3VdbeAddOp2(v, OP_CreateTable, iDb, reg2);
+    }
+    sqlite3OpenMasterTable(pParse, iDb);
+    sqlite3VdbeAddOp2(v, OP_NewRowid, 0, reg1);
+    sqlite3VdbeAddOp2(v, OP_Null, 0, reg3);
+    sqlite3VdbeAddOp3(v, OP_Insert, 0, reg3, reg1);
+    sqlite3VdbeChangeP5(v, OPFLAG_APPEND);
+    sqlite3VdbeAddOp0(v, OP_Close);
+  }
+
+  /* Normal (non-error) return. */
+  return;
+
+  /* If an error occurs, we jump here */
+begin_table_error:
+  sqlite3_free(zName);
+  return;
+}
+
+/*
+** This macro is used to compare two strings in a case-insensitive manner.
+** It is slightly faster than calling sqlite3StrICmp() directly, but
+** produces larger code.
+**
+** WARNING: This macro is not compatible with the strcmp() family. It
+** returns true if the two strings are equal, otherwise false.
+*/
+#define STRICMP(x, y) (\
+sqlite3UpperToLower[*(unsigned char *)(x)]==   \
+sqlite3UpperToLower[*(unsigned char *)(y)]     \
+&& sqlite3StrICmp((x)+1,(y)+1)==0 )
+
+/*
+** Add a new column to the table currently being constructed.
+**
+** The parser calls this routine once for each column declaration
+** in a CREATE TABLE statement.  sqlite3StartTable() gets called
+** first to get things going.  Then this routine is called for each
+** column.
+*/
+void sqlite3AddColumn(Parse *pParse, Token *pName){
+  Table *p;
+  int i;
+  char *z;
+  Column *pCol;
+  if( (p = pParse->pNewTable)==0 ) return;
+  if( p->nCol+1>SQLITE_MAX_COLUMN ){
+    sqlite3ErrorMsg(pParse, "too many columns on %s", p->zName);
+    return;
+  }
+  z = sqlite3NameFromToken(pParse->db, pName);
+  if( z==0 ) return;
+  for(i=0; i<p->nCol; i++){
+    if( STRICMP(z, p->aCol[i].zName) ){
+      sqlite3ErrorMsg(pParse, "duplicate column name: %s", z);
+      sqlite3_free(z);
+      return;
+    }
+  }
+  if( (p->nCol & 0x7)==0 ){
+    Column *aNew;
+    aNew = sqlite3DbRealloc(pParse->db,p->aCol,(p->nCol+8)*sizeof(p->aCol[0]));
+    if( aNew==0 ){
+      sqlite3_free(z);
+      return;
+    }
+    p->aCol = aNew;
+  }
+  pCol = &p->aCol[p->nCol];
+  memset(pCol, 0, sizeof(p->aCol[0]));
+  pCol->zName = z;
+
+  /* If there is no type specified, columns have the default affinity
+  ** 'NONE'. If there is a type specified, then sqlite3AddColumnType() will
+  ** be called next to set pCol->affinity correctly.
+  */
+  pCol->affinity = SQLITE_AFF_NONE;
+  p->nCol++;
+}
+
+/*
+** This routine is called by the parser while in the middle of
+** parsing a CREATE TABLE statement.  A "NOT NULL" constraint has
+** been seen on a column.  This routine sets the notNull flag on
+** the column currently under construction.
+*/
+void sqlite3AddNotNull(Parse *pParse, int onError){
+  Table *p;
+  int i;
+  if( (p = pParse->pNewTable)==0 ) return;
+  i = p->nCol-1;
+  if( i>=0 ) p->aCol[i].notNull = onError;
+}
+
+/*
+** Scan the column type name zType (length nType) and return the
+** associated affinity type.
+**
+** This routine does a case-independent search of zType for the
+** substrings in the following table. If one of the substrings is
+** found, the corresponding affinity is returned. If zType contains
+** more than one of the substrings, entries toward the top of
+** the table take priority. For example, if zType is 'BLOBINT',
+** SQLITE_AFF_INTEGER is returned.
+**
+** Substring     | Affinity
+** --------------------------------
+** 'INT'         | SQLITE_AFF_INTEGER
+** 'CHAR'        | SQLITE_AFF_TEXT
+** 'CLOB'        | SQLITE_AFF_TEXT
+** 'TEXT'        | SQLITE_AFF_TEXT
+** 'BLOB'        | SQLITE_AFF_NONE
+** 'REAL'        | SQLITE_AFF_REAL
+** 'FLOA'        | SQLITE_AFF_REAL
+** 'DOUB'        | SQLITE_AFF_REAL
+**
+** If none of the substrings in the above table are found,
+** SQLITE_AFF_NUMERIC is returned.
+*/
+char sqlite3AffinityType(const Token *pType){
+  u32 h = 0;
+  char aff = SQLITE_AFF_NUMERIC;
+  const unsigned char *zIn = pType->z;
+  const unsigned char *zEnd = &pType->z[pType->n];
+
+  while( zIn!=zEnd ){
+    h = (h<<8) + sqlite3UpperToLower[*zIn];
+    zIn++;
+    if( h==(('c'<<24)+('h'<<16)+('a'<<8)+'r') ){             /* CHAR */
+      aff = SQLITE_AFF_TEXT;
+    }else if( h==(('c'<<24)+('l'<<16)+('o'<<8)+'b') ){       /* CLOB */
+      aff = SQLITE_AFF_TEXT;
+    }else if( h==(('t'<<24)+('e'<<16)+('x'<<8)+'t') ){       /* TEXT */
+      aff = SQLITE_AFF_TEXT;
+    }else if( h==(('b'<<24)+('l'<<16)+('o'<<8)+'b')          /* BLOB */
+        && (aff==SQLITE_AFF_NUMERIC || aff==SQLITE_AFF_REAL) ){
+      aff = SQLITE_AFF_NONE;
+#ifndef SQLITE_OMIT_FLOATING_POINT
+    }else if( h==(('r'<<24)+('e'<<16)+('a'<<8)+'l')          /* REAL */
+        && aff==SQLITE_AFF_NUMERIC ){
+      aff = SQLITE_AFF_REAL;
+    }else if( h==(('f'<<24)+('l'<<16)+('o'<<8)+'a')          /* FLOA */
+        && aff==SQLITE_AFF_NUMERIC ){
+      aff = SQLITE_AFF_REAL;
+    }else if( h==(('d'<<24)+('o'<<16)+('u'<<8)+'b')          /* DOUB */
+        && aff==SQLITE_AFF_NUMERIC ){
+      aff = SQLITE_AFF_REAL;
+#endif
+    }else if( (h&0x00FFFFFF)==(('i'<<16)+('n'<<8)+'t') ){    /* INT */
+      aff = SQLITE_AFF_INTEGER;
+      break;
+    }
+  }
+
+  return aff;
+}
+
+/*
+** This routine is called by the parser while in the middle of
+** parsing a CREATE TABLE statement.  The pFirst token is the first
+** token in the sequence of tokens that describe the type of the
+** column currently under construction.   pLast is the last token
+** in the sequence.  Use this information to construct a string
+** that contains the typename of the column and store that string
+** in zType.
+*/
+void sqlite3AddColumnType(Parse *pParse, Token *pType){
+  Table *p;
+  int i;
+  Column *pCol;
+
+  if( (p = pParse->pNewTable)==0 ) return;
+  i = p->nCol-1;
+  if( i<0 ) return;
+  pCol = &p->aCol[i];
+  sqlite3_free(pCol->zType);
+  pCol->zType = sqlite3NameFromToken(pParse->db, pType);
+  pCol->affinity = sqlite3AffinityType(pType);
+}
+
+/*
+** The expression is the default value for the most recently added column
+** of the table currently under construction.
+**
+** Default value expressions must be constant.  Raise an exception if this
+** is not the case.
+**
+** This routine is called by the parser while in the middle of
+** parsing a CREATE TABLE statement.
+*/
+void sqlite3AddDefaultValue(Parse *pParse, Expr *pExpr){
+  Table *p;
+  Column *pCol;
+  if( (p = pParse->pNewTable)!=0 ){
+    pCol = &(p->aCol[p->nCol-1]);
+    if( !sqlite3ExprIsConstantOrFunction(pExpr) ){
+      sqlite3ErrorMsg(pParse, "default value of column [%s] is not constant",
+          pCol->zName);
+    }else{
+      Expr *pCopy;
+      sqlite3 *db = pParse->db;
+      sqlite3ExprDelete(pCol->pDflt);
+      pCol->pDflt = pCopy = sqlite3ExprDup(db, pExpr);
+      if( pCopy ){
+        sqlite3TokenCopy(db, &pCopy->span, &pExpr->span);
+      }
+    }
+  }
+  sqlite3ExprDelete(pExpr);
+}
+
+/*
+** Designate the PRIMARY KEY for the table.  pList is a list of names
+** of columns that form the primary key.  If pList is NULL, then the
+** most recently added column of the table is the primary key.
+**
+** A table can have at most one primary key.  If the table already has
+** a primary key (and this is the second primary key) then create an
+** error.
+**
+** If the PRIMARY KEY is on a single column whose datatype is INTEGER,
+** then we will try to use that column as the rowid.  Set the Table.iPKey
+** field of the table under construction to be the index of the
+** INTEGER PRIMARY KEY column.  Table.iPKey is set to -1 if there is
+** no INTEGER PRIMARY KEY.
+**
+** If the key is not an INTEGER PRIMARY KEY, then create a unique
+** index for the key.  No index is created for INTEGER PRIMARY KEYs.
+*/
+void sqlite3AddPrimaryKey(
+  Parse *pParse,    /* Parsing context */
+  ExprList *pList,  /* List of field names to be indexed */
+  int onError,      /* What to do with a uniqueness conflict */
+  int autoInc,      /* True if the AUTOINCREMENT keyword is present */
+  int sortOrder     /* SQLITE_SO_ASC or SQLITE_SO_DESC */
+){
+  Table *pTab = pParse->pNewTable;
+  char *zType = 0;
+  int iCol = -1, i;
+  if( pTab==0 || IN_DECLARE_VTAB ) goto primary_key_exit;
+  if( pTab->hasPrimKey ){
+    sqlite3ErrorMsg(pParse,
+      "table \"%s\" has more than one primary key", pTab->zName);
+    goto primary_key_exit;
+  }
+  pTab->hasPrimKey = 1;
+  if( pList==0 ){
+    iCol = pTab->nCol - 1;
+    pTab->aCol[iCol].isPrimKey = 1;
+  }else{
+    for(i=0; i<pList->nExpr; i++){
+      for(iCol=0; iCol<pTab->nCol; iCol++){
+        if( sqlite3StrICmp(pList->a[i].zName, pTab->aCol[iCol].zName)==0 ){
+          break;
+        }
+      }
+      if( iCol<pTab->nCol ){
+        pTab->aCol[iCol].isPrimKey = 1;
+      }
+    }
+    if( pList->nExpr>1 ) iCol = -1;
+  }
+  if( iCol>=0 && iCol<pTab->nCol ){
+    zType = pTab->aCol[iCol].zType;
+  }
+  if( zType && sqlite3StrICmp(zType, "INTEGER")==0
+        && sortOrder==SQLITE_SO_ASC ){
+    pTab->iPKey = iCol;
+    pTab->keyConf = onError;
+    pTab->autoInc = autoInc;
+  }else if( autoInc ){
+#ifndef SQLITE_OMIT_AUTOINCREMENT
+    sqlite3ErrorMsg(pParse, "AUTOINCREMENT is only allowed on an "
+       "INTEGER PRIMARY KEY");
+#endif
+  }else{
+    sqlite3CreateIndex(pParse, 0, 0, 0, pList, onError, 0, 0, sortOrder, 0);
+    pList = 0;
+  }
+
+primary_key_exit:
+  sqlite3ExprListDelete(pList);
+  return;
+}
+
+/*
+** Add a new CHECK constraint to the table currently under construction.
+*/
+void sqlite3AddCheckConstraint(
+  Parse *pParse,    /* Parsing context */
+  Expr *pCheckExpr  /* The check expression */
+){
+#ifndef SQLITE_OMIT_CHECK
+  Table *pTab = pParse->pNewTable;
+  sqlite3 *db = pParse->db;
+  if( pTab && !IN_DECLARE_VTAB ){
+    /* The CHECK expression must be duplicated so that tokens refer
+    ** to malloced space and not the (ephemeral) text of the CREATE TABLE
+    ** statement */
+    pTab->pCheck = sqlite3ExprAnd(db, pTab->pCheck,
+                                  sqlite3ExprDup(db, pCheckExpr));
+  }
+#endif
+  sqlite3ExprDelete(pCheckExpr);
+}
+
+/*
+** Set the collation function of the most recently parsed table column
+** to the CollSeq given.
+*/
+void sqlite3AddCollateType(Parse *pParse, Token *pToken){
+  Table *p;
+  int i;
+  char *zColl;              /* Dequoted name of collation sequence */
+
+  if( (p = pParse->pNewTable)==0 ) return;
+  i = p->nCol-1;
+
+  zColl = sqlite3NameFromToken(pParse->db, pToken);
+  if( !zColl ) return;
+
+  if( sqlite3LocateCollSeq(pParse, zColl, -1) ){
+    Index *pIdx;
+    p->aCol[i].zColl = zColl;
+
+    /* If the column is declared as "<name> PRIMARY KEY COLLATE <type>",
+    ** then an index may have been created on this column before the
+    ** collation type was added. Correct this if it is the case.
+    */
+    for(pIdx=p->pIndex; pIdx; pIdx=pIdx->pNext){
+      assert( pIdx->nColumn==1 );
+      if( pIdx->aiColumn[0]==i ){
+        pIdx->azColl[0] = p->aCol[i].zColl;
+      }
+    }
+  }else{
+    sqlite3_free(zColl);
+  }
+}
+
+/*
+** This function returns the collation sequence for database native text
+** encoding identified by the string zName, length nName.
+**
+** If the requested collation sequence is not available, or not available
+** in the database native encoding, the collation factory is invoked to
+** request it. If the collation factory does not supply such a sequence,
+** and the sequence is available in another text encoding, then that is
+** returned instead.
+**
+** If no versions of the requested collations sequence are available, or
+** another error occurs, NULL is returned and an error message written into
+** pParse.
+**
+** This routine is a wrapper around sqlite3FindCollSeq().  This routine
+** invokes the collation factory if the named collation cannot be found
+** and generates an error message.
+*/
+CollSeq *sqlite3LocateCollSeq(Parse *pParse, const char *zName, int nName){
+  sqlite3 *db = pParse->db;
+  u8 enc = ENC(db);
+  u8 initbusy = db->init.busy;
+  CollSeq *pColl;
+
+  pColl = sqlite3FindCollSeq(db, enc, zName, nName, initbusy);
+  if( !initbusy && (!pColl || !pColl->xCmp) ){
+    pColl = sqlite3GetCollSeq(db, pColl, zName, nName);
+    if( !pColl ){
+      if( nName<0 ){
+        nName = strlen(zName);
+      }
+      sqlite3ErrorMsg(pParse, "no such collation sequence: %.*s", nName, zName);
+      pColl = 0;
+    }
+  }
+
+  return pColl;
+}
+
+
+/*
+** Generate code that will increment the schema cookie.
+**
+** The schema cookie is used to determine when the schema for the
+** database changes.  After each schema change, the cookie value
+** changes.  When a process first reads the schema it records the
+** cookie.  Thereafter, whenever it goes to access the database,
+** it checks the cookie to make sure the schema has not changed
+** since it was last read.
+**
+** This plan is not completely bullet-proof.  It is possible for
+** the schema to change multiple times and for the cookie to be
+** set back to prior value.  But schema changes are infrequent
+** and the probability of hitting the same cookie value is only
+** 1 chance in 2^32.  So we're safe enough.
+*/
+void sqlite3ChangeCookie(Parse *pParse, int iDb){
+  int r1 = sqlite3GetTempReg(pParse);
+  sqlite3 *db = pParse->db;
+  Vdbe *v = pParse->pVdbe;
+  sqlite3VdbeAddOp2(v, OP_Integer, db->aDb[iDb].pSchema->schema_cookie+1, r1);
+  sqlite3VdbeAddOp3(v, OP_SetCookie, iDb, 0, r1);
+  sqlite3ReleaseTempReg(pParse, r1);
+}
+
+/*
+** Measure the number of characters needed to output the given
+** identifier.  The number returned includes any quotes used
+** but does not include the null terminator.
+**
+** The estimate is conservative.  It might be larger that what is
+** really needed.
+*/
+static int identLength(const char *z){
+  int n;
+  for(n=0; *z; n++, z++){
+    if( *z=='"' ){ n++; }
+  }
+  return n + 2;
+}
+
+/*
+** Write an identifier onto the end of the given string.  Add
+** quote characters as needed.
+*/
+static void identPut(char *z, int *pIdx, char *zSignedIdent){
+  unsigned char *zIdent = (unsigned char*)zSignedIdent;
+  int i, j, needQuote;
+  i = *pIdx;
+  for(j=0; zIdent[j]; j++){
+    if( !isalnum(zIdent[j]) && zIdent[j]!='_' ) break;
+  }
+  needQuote =  zIdent[j]!=0 || isdigit(zIdent[0])
+                  || sqlite3KeywordCode(zIdent, j)!=TK_ID;
+  if( needQuote ) z[i++] = '"';
+  for(j=0; zIdent[j]; j++){
+    z[i++] = zIdent[j];
+    if( zIdent[j]=='"' ) z[i++] = '"';
+  }
+  if( needQuote ) z[i++] = '"';
+  z[i] = 0;
+  *pIdx = i;
+}
+
+/*
+** Generate a CREATE TABLE statement appropriate for the given
+** table.  Memory to hold the text of the statement is obtained
+** from sqliteMalloc() and must be freed by the calling function.
+*/
+static char *createTableStmt(sqlite3 *db, Table *p, int isTemp){
+  int i, k, n;
+  char *zStmt;
+  char *zSep, *zSep2, *zEnd, *z;
+  Column *pCol;
+  n = 0;
+  for(pCol = p->aCol, i=0; i<p->nCol; i++, pCol++){
+    n += identLength(pCol->zName);
+    z = pCol->zType;
+    if( z ){
+      n += (strlen(z) + 1);
+    }
+  }
+  n += identLength(p->zName);
+  if( n<50 ){
+    zSep = "";
+    zSep2 = ",";
+    zEnd = ")";
+  }else{
+    zSep = "\n  ";
+    zSep2 = ",\n  ";
+    zEnd = "\n)";
+  }
+  n += 35 + 6*p->nCol;
+  zStmt = sqlite3_malloc( n );
+  if( zStmt==0 ){
+    db->mallocFailed = 1;
+    return 0;
+  }
+  sqlite3_snprintf(n, zStmt,
+                  !OMIT_TEMPDB&&isTemp ? "CREATE TEMP TABLE ":"CREATE TABLE ");
+  k = strlen(zStmt);
+  identPut(zStmt, &k, p->zName);
+  zStmt[k++] = '(';
+  for(pCol=p->aCol, i=0; i<p->nCol; i++, pCol++){
+    sqlite3_snprintf(n-k, &zStmt[k], zSep);
+    k += strlen(&zStmt[k]);
+    zSep = zSep2;
+    identPut(zStmt, &k, pCol->zName);
+    if( (z = pCol->zType)!=0 ){
+      zStmt[k++] = ' ';
+      assert( strlen(z)+k+1<=n );
+      sqlite3_snprintf(n-k, &zStmt[k], "%s", z);
+      k += strlen(z);
+    }
+  }
+  sqlite3_snprintf(n-k, &zStmt[k], "%s", zEnd);
+  return zStmt;
+}
+
+/*
+** This routine is called to report the final ")" that terminates
+** a CREATE TABLE statement.
+**
+** The table structure that other action routines have been building
+** is added to the internal hash tables, assuming no errors have
+** occurred.
+**
+** An entry for the table is made in the master table on disk, unless
+** this is a temporary table or db->init.busy==1.  When db->init.busy==1
+** it means we are reading the sqlite_master table because we just
+** connected to the database or because the sqlite_master table has
+** recently changed, so the entry for this table already exists in
+** the sqlite_master table.  We do not want to create it again.
+**
+** If the pSelect argument is not NULL, it means that this routine
+** was called to create a table generated from a
+** "CREATE TABLE ... AS SELECT ..." statement.  The column names of
+** the new table will match the result set of the SELECT.
+*/
+void sqlite3EndTable(
+  Parse *pParse,          /* Parse context */
+  Token *pCons,           /* The ',' token after the last column defn. */
+  Token *pEnd,            /* The final ')' token in the CREATE TABLE */
+  Select *pSelect         /* Select from a "CREATE ... AS SELECT" */
+){
+  Table *p;
+  sqlite3 *db = pParse->db;
+  int iDb;
+
+  if( (pEnd==0 && pSelect==0) || pParse->nErr || db->mallocFailed ) {
+    return;
+  }
+  p = pParse->pNewTable;
+  if( p==0 ) return;
+
+  assert( !db->init.busy || !pSelect );
+
+  iDb = sqlite3SchemaToIndex(db, p->pSchema);
+
+#ifndef SQLITE_OMIT_CHECK
+  /* Resolve names in all CHECK constraint expressions.
+  */
+  if( p->pCheck ){
+    SrcList sSrc;                   /* Fake SrcList for pParse->pNewTable */
+    NameContext sNC;                /* Name context for pParse->pNewTable */
+
+    memset(&sNC, 0, sizeof(sNC));
+    memset(&sSrc, 0, sizeof(sSrc));
+    sSrc.nSrc = 1;
+    sSrc.a[0].zName = p->zName;
+    sSrc.a[0].pTab = p;
+    sSrc.a[0].iCursor = -1;
+    sNC.pParse = pParse;
+    sNC.pSrcList = &sSrc;
+    sNC.isCheck = 1;
+    if( sqlite3ExprResolveNames(&sNC, p->pCheck) ){
+      return;
+    }
+  }
+#endif /* !defined(SQLITE_OMIT_CHECK) */
+
+  /* If the db->init.busy is 1 it means we are reading the SQL off the
+  ** "sqlite_master" or "sqlite_temp_master" table on the disk.
+  ** So do not write to the disk again.  Extract the root page number
+  ** for the table from the db->init.newTnum field.  (The page number
+  ** should have been put there by the sqliteOpenCb routine.)
+  */
+  if( db->init.busy ){
+    p->tnum = db->init.newTnum;
+  }
+
+  /* If not initializing, then create a record for the new table
+  ** in the SQLITE_MASTER table of the database.  The record number
+  ** for the new table entry should already be on the stack.
+  **
+  ** If this is a TEMPORARY table, write the entry into the auxiliary
+  ** file instead of into the main database file.
+  */
+  if( !db->init.busy ){
+    int n;
+    Vdbe *v;
+    char *zType;    /* "view" or "table" */
+    char *zType2;   /* "VIEW" or "TABLE" */
+    char *zStmt;    /* Text of the CREATE TABLE or CREATE VIEW statement */
+
+    v = sqlite3GetVdbe(pParse);
+    if( v==0 ) return;
+
+    sqlite3VdbeAddOp1(v, OP_Close, 0);
+
+    /* Create the rootpage for the new table and push it onto the stack.
+    ** A view has no rootpage, so just push a zero onto the stack for
+    ** views.  Initialize zType at the same time.
+    */
+    if( p->pSelect==0 ){
+      /* A regular table */
+      zType = "table";
+      zType2 = "TABLE";
+#ifndef SQLITE_OMIT_VIEW
+    }else{
+      /* A view */
+      zType = "view";
+      zType2 = "VIEW";
+#endif
+    }
+
+    /* If this is a CREATE TABLE xx AS SELECT ..., execute the SELECT
+    ** statement to populate the new table. The root-page number for the
+    ** new table is on the top of the vdbe stack.
+    **
+    ** Once the SELECT has been coded by sqlite3Select(), it is in a
+    ** suitable state to query for the column names and types to be used
+    ** by the new table.
+    **
+    ** A shared-cache write-lock is not required to write to the new table,
+    ** as a schema-lock must have already been obtained to create it. Since
+    ** a schema-lock excludes all other database users, the write-lock would
+    ** be redundant.
+    */
+    if( pSelect ){
+      SelectDest dest;
+      Table *pSelTab;
+
+      sqlite3VdbeAddOp3(v, OP_OpenWrite, 1, pParse->regRoot, iDb);
+      sqlite3VdbeChangeP5(v, 1);
+      pParse->nTab = 2;
+      sqlite3SelectDestInit(&dest, SRT_Table, 1);
+      sqlite3Select(pParse, pSelect, &dest, 0, 0, 0, 0);
+      sqlite3VdbeAddOp1(v, OP_Close, 1);
+      if( pParse->nErr==0 ){
+        pSelTab = sqlite3ResultSetOfSelect(pParse, 0, pSelect);
+        if( pSelTab==0 ) return;
+        assert( p->aCol==0 );
+        p->nCol = pSelTab->nCol;
+        p->aCol = pSelTab->aCol;
+        pSelTab->nCol = 0;
+        pSelTab->aCol = 0;
+        sqlite3DeleteTable(pSelTab);
+      }
+    }
+
+    /* Compute the complete text of the CREATE statement */
+    if( pSelect ){
+      zStmt = createTableStmt(db, p, p->pSchema==db->aDb[1].pSchema);
+    }else{
+      n = pEnd->z - pParse->sNameToken.z + 1;
+      zStmt = sqlite3MPrintf(db,
+          "CREATE %s %.*s", zType2, n, pParse->sNameToken.z
+      );
+    }
+
+    /* A slot for the record has already been allocated in the
+    ** SQLITE_MASTER table.  We just need to update that slot with all
+    ** the information we've collected.  The rowid for the preallocated
+    ** slot is the 2nd item on the stack.  The top of the stack is the
+    ** root page for the new table (or a 0 if this is a view).
+    */
+    sqlite3NestedParse(pParse,
+      "UPDATE %Q.%s "
+         "SET type='%s', name=%Q, tbl_name=%Q, rootpage=#%d, sql=%Q "
+       "WHERE rowid=#%d",
+      db->aDb[iDb].zName, SCHEMA_TABLE(iDb),
+      zType,
+      p->zName,
+      p->zName,
+      pParse->regRoot,
+      zStmt,
+      pParse->regRowid
+    );
+    sqlite3_free(zStmt);
+    sqlite3ChangeCookie(pParse, iDb);
+
+#ifndef SQLITE_OMIT_AUTOINCREMENT
+    /* Check to see if we need to create an sqlite_sequence table for
+    ** keeping track of autoincrement keys.
+    */
+    if( p->autoInc ){
+      Db *pDb = &db->aDb[iDb];
+      if( pDb->pSchema->pSeqTab==0 ){
+        sqlite3NestedParse(pParse,
+          "CREATE TABLE %Q.sqlite_sequence(name,seq)",
+          pDb->zName
+        );
+      }
+    }
+#endif
+
+    /* Reparse everything to update our internal data structures */
+    sqlite3VdbeAddOp4(v, OP_ParseSchema, iDb, 0, 0,
+        sqlite3MPrintf(db, "tbl_name='%q'",p->zName), P4_DYNAMIC);
+  }
+
+
+  /* Add the table to the in-memory representation of the database.
+  */
+  if( db->init.busy && pParse->nErr==0 ){
+    Table *pOld;
+    FKey *pFKey;
+    Schema *pSchema = p->pSchema;
+    pOld = sqlite3HashInsert(&pSchema->tblHash, p->zName, strlen(p->zName)+1,p);
+    if( pOld ){
+      assert( p==pOld );  /* Malloc must have failed inside HashInsert() */
+      db->mallocFailed = 1;
+      return;
+    }
+#ifndef SQLITE_OMIT_FOREIGN_KEY
+    for(pFKey=p->pFKey; pFKey; pFKey=pFKey->pNextFrom){
+      void *data;
+      int nTo = strlen(pFKey->zTo) + 1;
+      pFKey->pNextTo = sqlite3HashFind(&pSchema->aFKey, pFKey->zTo, nTo);
+      data = sqlite3HashInsert(&pSchema->aFKey, pFKey->zTo, nTo, pFKey);
+      if( data==(void *)pFKey ){
+        db->mallocFailed = 1;
+      }
+    }
+#endif
+    pParse->pNewTable = 0;
+    db->nTable++;
+    db->flags |= SQLITE_InternChanges;
+
+#ifndef SQLITE_OMIT_ALTERTABLE
+    if( !p->pSelect ){
+      const char *zName = (const char *)pParse->sNameToken.z;
+      int nName;
+      assert( !pSelect && pCons && pEnd );
+      if( pCons->z==0 ){
+        pCons = pEnd;
+      }
+      nName = (const char *)pCons->z - zName;
+      p->addColOffset = 13 + sqlite3Utf8CharLen(zName, nName);
+    }
+#endif
+  }
+}
+
+#ifndef SQLITE_OMIT_VIEW
+/*
+** The parser calls this routine in order to create a new VIEW
+*/
+void sqlite3CreateView(
+  Parse *pParse,     /* The parsing context */
+  Token *pBegin,     /* The CREATE token that begins the statement */
+  Token *pName1,     /* The token that holds the name of the view */
+  Token *pName2,     /* The token that holds the name of the view */
+  Select *pSelect,   /* A SELECT statement that will become the new view */
+  int isTemp,        /* TRUE for a TEMPORARY view */
+  int noErr          /* Suppress error messages if VIEW already exists */
+){
+  Table *p;
+  int n;
+  const unsigned char *z;
+  Token sEnd;
+  DbFixer sFix;
+  Token *pName;
+  int iDb;
+  sqlite3 *db = pParse->db;
+
+  if( pParse->nVar>0 ){
+    sqlite3ErrorMsg(pParse, "parameters are not allowed in views");
+    sqlite3SelectDelete(pSelect);
+    return;
+  }
+  sqlite3StartTable(pParse, pName1, pName2, isTemp, 1, 0, noErr);
+  p = pParse->pNewTable;
+  if( p==0 || pParse->nErr ){
+    sqlite3SelectDelete(pSelect);
+    return;
+  }
+  sqlite3TwoPartName(pParse, pName1, pName2, &pName);
+  iDb = sqlite3SchemaToIndex(db, p->pSchema);
+  if( sqlite3FixInit(&sFix, pParse, iDb, "view", pName)
+    && sqlite3FixSelect(&sFix, pSelect)
+  ){
+    sqlite3SelectDelete(pSelect);
+    return;
+  }
+
+  /* Make a copy of the entire SELECT statement that defines the view.
+  ** This will force all the Expr.token.z values to be dynamically
+  ** allocated rather than point to the input string - which means that
+  ** they will persist after the current sqlite3_exec() call returns.
+  */
+  p->pSelect = sqlite3SelectDup(db, pSelect);
+  sqlite3SelectDelete(pSelect);
+  if( db->mallocFailed ){
+    return;
+  }
+  if( !db->init.busy ){
+    sqlite3ViewGetColumnNames(pParse, p);
+  }
+
+  /* Locate the end of the CREATE VIEW statement.  Make sEnd point to
+  ** the end.
+  */
+  sEnd = pParse->sLastToken;
+  if( sEnd.z[0]!=0 && sEnd.z[0]!=';' ){
+    sEnd.z += sEnd.n;
+  }
+  sEnd.n = 0;
+  n = sEnd.z - pBegin->z;
+  z = (const unsigned char*)pBegin->z;
+  while( n>0 && (z[n-1]==';' || isspace(z[n-1])) ){ n--; }
+  sEnd.z = &z[n-1];
+  sEnd.n = 1;
+
+  /* Use sqlite3EndTable() to add the view to the SQLITE_MASTER table */
+  sqlite3EndTable(pParse, 0, &sEnd, 0);
+  return;
+}
+#endif /* SQLITE_OMIT_VIEW */
+
+#if !defined(SQLITE_OMIT_VIEW) || !defined(SQLITE_OMIT_VIRTUALTABLE)
+/*
+** The Table structure pTable is really a VIEW.  Fill in the names of
+** the columns of the view in the pTable structure.  Return the number
+** of errors.  If an error is seen leave an error message in pParse->zErrMsg.
+*/
+int sqlite3ViewGetColumnNames(Parse *pParse, Table *pTable){
+  Table *pSelTab;   /* A fake table from which we get the result set */
+  Select *pSel;     /* Copy of the SELECT that implements the view */
+  int nErr = 0;     /* Number of errors encountered */
+  int n;            /* Temporarily holds the number of cursors assigned */
+  sqlite3 *db = pParse->db;  /* Database connection for malloc errors */
+  int (*xAuth)(void*,int,const char*,const char*,const char*,const char*);
+
+  assert( pTable );
+
+#ifndef SQLITE_OMIT_VIRTUALTABLE
+  if( sqlite3VtabCallConnect(pParse, pTable) ){
+    return SQLITE_ERROR;
+  }
+  if( IsVirtual(pTable) ) return 0;
+#endif
+
+#ifndef SQLITE_OMIT_VIEW
+  /* A positive nCol means the columns names for this view are
+  ** already known.
+  */
+  if( pTable->nCol>0 ) return 0;
+
+  /* A negative nCol is a special marker meaning that we are currently
+  ** trying to compute the column names.  If we enter this routine with
+  ** a negative nCol, it means two or more views form a loop, like this:
+  **
+  **     CREATE VIEW one AS SELECT * FROM two;
+  **     CREATE VIEW two AS SELECT * FROM one;
+  **
+  ** Actually, this error is caught previously and so the following test
+  ** should always fail.  But we will leave it in place just to be safe.
+  */
+  if( pTable->nCol<0 ){
+    sqlite3ErrorMsg(pParse, "view %s is circularly defined", pTable->zName);
+    return 1;
+  }
+  assert( pTable->nCol>=0 );
+
+  /* If we get this far, it means we need to compute the table names.
+  ** Note that the call to sqlite3ResultSetOfSelect() will expand any
+  ** "*" elements in the results set of the view and will assign cursors
+  ** to the elements of the FROM clause.  But we do not want these changes
+  ** to be permanent.  So the computation is done on a copy of the SELECT
+  ** statement that defines the view.
+  */
+  assert( pTable->pSelect );
+  pSel = sqlite3SelectDup(db, pTable->pSelect);
+  if( pSel ){
+    n = pParse->nTab;
+    sqlite3SrcListAssignCursors(pParse, pSel->pSrc);
+    pTable->nCol = -1;
+#ifndef SQLITE_OMIT_AUTHORIZATION
+    xAuth = db->xAuth;
+    db->xAuth = 0;
+    pSelTab = sqlite3ResultSetOfSelect(pParse, 0, pSel);
+    db->xAuth = xAuth;
+#else
+    pSelTab = sqlite3ResultSetOfSelect(pParse, 0, pSel);
+#endif
+    pParse->nTab = n;
+    if( pSelTab ){
+      assert( pTable->aCol==0 );
+      pTable->nCol = pSelTab->nCol;
+      pTable->aCol = pSelTab->aCol;
+      pSelTab->nCol = 0;
+      pSelTab->aCol = 0;
+      sqlite3DeleteTable(pSelTab);
+      pTable->pSchema->flags |= DB_UnresetViews;
+    }else{
+      pTable->nCol = 0;
+      nErr++;
+    }
+    sqlite3SelectDelete(pSel);
+  } else {
+    nErr++;
+  }
+#endif /* SQLITE_OMIT_VIEW */
+  return nErr;
+}
+#endif /* !defined(SQLITE_OMIT_VIEW) || !defined(SQLITE_OMIT_VIRTUALTABLE) */
+
+#ifndef SQLITE_OMIT_VIEW
+/*
+** Clear the column names from every VIEW in database idx.
+*/
+static void sqliteViewResetAll(sqlite3 *db, int idx){
+  HashElem *i;
+  if( !DbHasProperty(db, idx, DB_UnresetViews) ) return;
+  for(i=sqliteHashFirst(&db->aDb[idx].pSchema->tblHash); i;i=sqliteHashNext(i)){
+    Table *pTab = sqliteHashData(i);
+    if( pTab->pSelect ){
+      sqliteResetColumnNames(pTab);
+    }
+  }
+  DbClearProperty(db, idx, DB_UnresetViews);
+}
+#else
+# define sqliteViewResetAll(A,B)
+#endif /* SQLITE_OMIT_VIEW */
+
+/*
+** This function is called by the VDBE to adjust the internal schema
+** used by SQLite when the btree layer moves a table root page. The
+** root-page of a table or index in database iDb has changed from iFrom
+** to iTo.
+**
+** Ticket #1728:  The symbol table might still contain information
+** on tables and/or indices that are the process of being deleted.
+** If you are unlucky, one of those deleted indices or tables might
+** have the same rootpage number as the real table or index that is
+** being moved.  So we cannot stop searching after the first match
+** because the first match might be for one of the deleted indices
+** or tables and not the table/index that is actually being moved.
+** We must continue looping until all tables and indices with
+** rootpage==iFrom have been converted to have a rootpage of iTo
+** in order to be certain that we got the right one.
+*/
+#ifndef SQLITE_OMIT_AUTOVACUUM
+void sqlite3RootPageMoved(Db *pDb, int iFrom, int iTo){
+  HashElem *pElem;
+  Hash *pHash;
+
+  pHash = &pDb->pSchema->tblHash;
+  for(pElem=sqliteHashFirst(pHash); pElem; pElem=sqliteHashNext(pElem)){
+    Table *pTab = sqliteHashData(pElem);
+    if( pTab->tnum==iFrom ){
+      pTab->tnum = iTo;
+    }
+  }
+  pHash = &pDb->pSchema->idxHash;
+  for(pElem=sqliteHashFirst(pHash); pElem; pElem=sqliteHashNext(pElem)){
+    Index *pIdx = sqliteHashData(pElem);
+    if( pIdx->tnum==iFrom ){
+      pIdx->tnum = iTo;
+    }
+  }
+}
+#endif
+
+/*
+** Write code to erase the table with root-page iTable from database iDb.
+** Also write code to modify the sqlite_master table and internal schema
+** if a root-page of another table is moved by the btree-layer whilst
+** erasing iTable (this can happen with an auto-vacuum database).
+*/
+static void destroyRootPage(Parse *pParse, int iTable, int iDb){
+  Vdbe *v = sqlite3GetVdbe(pParse);
+  int r1 = sqlite3GetTempReg(pParse);
+  sqlite3VdbeAddOp3(v, OP_Destroy, iTable, r1, iDb);
+#ifndef SQLITE_OMIT_AUTOVACUUM
+  /* OP_Destroy stores an in integer r1. If this integer
+  ** is non-zero, then it is the root page number of a table moved to
+  ** location iTable. The following code modifies the sqlite_master table to
+  ** reflect this.
+  **
+  ** The "#%d" in the SQL is a special constant that means whatever value
+  ** is on the top of the stack.  See sqlite3RegisterExpr().
+  */
+  sqlite3NestedParse(pParse,
+     "UPDATE %Q.%s SET rootpage=%d WHERE #%d AND rootpage=#%d",
+     pParse->db->aDb[iDb].zName, SCHEMA_TABLE(iDb), iTable, r1, r1);
+#endif
+  sqlite3ReleaseTempReg(pParse, r1);
+}
+
+/*
+** Write VDBE code to erase table pTab and all associated indices on disk.
+** Code to update the sqlite_master tables and internal schema definitions
+** in case a root-page belonging to another table is moved by the btree layer
+** is also added (this can happen with an auto-vacuum database).
+*/
+static void destroyTable(Parse *pParse, Table *pTab){
+#ifdef SQLITE_OMIT_AUTOVACUUM
+  Index *pIdx;
+  int iDb = sqlite3SchemaToIndex(pParse->db, pTab->pSchema);
+  destroyRootPage(pParse, pTab->tnum, iDb);
+  for(pIdx=pTab->pIndex; pIdx; pIdx=pIdx->pNext){
+    destroyRootPage(pParse, pIdx->tnum, iDb);
+  }
+#else
+  /* If the database may be auto-vacuum capable (if SQLITE_OMIT_AUTOVACUUM
+  ** is not defined), then it is important to call OP_Destroy on the
+  ** table and index root-pages in order, starting with the numerically
+  ** largest root-page number. This guarantees that none of the root-pages
+  ** to be destroyed is relocated by an earlier OP_Destroy. i.e. if the
+  ** following were coded:
+  **
+  ** OP_Destroy 4 0
+  ** ...
+  ** OP_Destroy 5 0
+  **
+  ** and root page 5 happened to be the largest root-page number in the
+  ** database, then root page 5 would be moved to page 4 by the
+  ** "OP_Destroy 4 0" opcode. The subsequent "OP_Destroy 5 0" would hit
+  ** a free-list page.
+  */
+  int iTab = pTab->tnum;
+  int iDestroyed = 0;
+
+  while( 1 ){
+    Index *pIdx;
+    int iLargest = 0;
+
+    if( iDestroyed==0 || iTab<iDestroyed ){
+      iLargest = iTab;
+    }
+    for(pIdx=pTab->pIndex; pIdx; pIdx=pIdx->pNext){
+      int iIdx = pIdx->tnum;
+      assert( pIdx->pSchema==pTab->pSchema );
+      if( (iDestroyed==0 || (iIdx<iDestroyed)) && iIdx>iLargest ){
+        iLargest = iIdx;
+      }
+    }
+    if( iLargest==0 ){
+      return;
+    }else{
+      int iDb = sqlite3SchemaToIndex(pParse->db, pTab->pSchema);
+      destroyRootPage(pParse, iLargest, iDb);
+      iDestroyed = iLargest;
+    }
+  }
+#endif
+}
+
+/*
+** This routine is called to do the work of a DROP TABLE statement.
+** pName is the name of the table to be dropped.
+*/
+void sqlite3DropTable(Parse *pParse, SrcList *pName, int isView, int noErr){
+  Table *pTab;
+  Vdbe *v;
+  sqlite3 *db = pParse->db;
+  int iDb;
+
+  if( pParse->nErr || db->mallocFailed ){
+    goto exit_drop_table;
+  }
+  assert( pName->nSrc==1 );
+  pTab = sqlite3LocateTable(pParse, isView,
+                            pName->a[0].zName, pName->a[0].zDatabase);
+
+  if( pTab==0 ){
+    if( noErr ){
+      sqlite3ErrorClear(pParse);
+    }
+    goto exit_drop_table;
+  }
+  iDb = sqlite3SchemaToIndex(db, pTab->pSchema);
+  assert( iDb>=0 && iDb<db->nDb );
+
+  /* If pTab is a virtual table, call ViewGetColumnNames() to ensure
+  ** it is initialized.
+  */
+  if( IsVirtual(pTab) && sqlite3ViewGetColumnNames(pParse, pTab) ){
+    goto exit_drop_table;
+  }
+#ifndef SQLITE_OMIT_AUTHORIZATION
+  {
+    int code;
+    const char *zTab = SCHEMA_TABLE(iDb);
+    const char *zDb = db->aDb[iDb].zName;
+    const char *zArg2 = 0;
+    if( sqlite3AuthCheck(pParse, SQLITE_DELETE, zTab, 0, zDb)){
+      goto exit_drop_table;
+    }
+    if( isView ){
+      if( !OMIT_TEMPDB && iDb==1 ){
+        code = SQLITE_DROP_TEMP_VIEW;
+      }else{
+        code = SQLITE_DROP_VIEW;
+      }
+#ifndef SQLITE_OMIT_VIRTUALTABLE
+    }else if( IsVirtual(pTab) ){
+      code = SQLITE_DROP_VTABLE;
+      zArg2 = pTab->pMod->zName;
+#endif
+    }else{
+      if( !OMIT_TEMPDB && iDb==1 ){
+        code = SQLITE_DROP_TEMP_TABLE;
+      }else{
+        code = SQLITE_DROP_TABLE;
+      }
+    }
+    if( sqlite3AuthCheck(pParse, code, pTab->zName, zArg2, zDb) ){
+      goto exit_drop_table;
+    }
+    if( sqlite3AuthCheck(pParse, SQLITE_DELETE, pTab->zName, 0, zDb) ){
+      goto exit_drop_table;
+    }
+  }
+#endif
+  if( pTab->readOnly || pTab==db->aDb[iDb].pSchema->pSeqTab ){
+    sqlite3ErrorMsg(pParse, "table %s may not be dropped", pTab->zName);
+    goto exit_drop_table;
+  }
+
+#ifndef SQLITE_OMIT_VIEW
+  /* Ensure DROP TABLE is not used on a view, and DROP VIEW is not used
+  ** on a table.
+  */
+  if( isView && pTab->pSelect==0 ){
+    sqlite3ErrorMsg(pParse, "use DROP TABLE to delete table %s", pTab->zName);
+    goto exit_drop_table;
+  }
+  if( !isView && pTab->pSelect ){
+    sqlite3ErrorMsg(pParse, "use DROP VIEW to delete view %s", pTab->zName);
+    goto exit_drop_table;
+  }
+#endif
+
+  /* Generate code to remove the table from the master table
+  ** on disk.
+  */
+  v = sqlite3GetVdbe(pParse);
+  if( v ){
+    Trigger *pTrigger;
+    Db *pDb = &db->aDb[iDb];
+    sqlite3BeginWriteOperation(pParse, 1, iDb);
+
+#ifndef SQLITE_OMIT_VIRTUALTABLE
+    if( IsVirtual(pTab) ){
+      Vdbe *v = sqlite3GetVdbe(pParse);
+      if( v ){
+        sqlite3VdbeAddOp0(v, OP_VBegin);
+      }
+    }
+#endif
+
+    /* Drop all triggers associated with the table being dropped. Code
+    ** is generated to remove entries from sqlite_master and/or
+    ** sqlite_temp_master if required.
+    */
+    pTrigger = pTab->pTrigger;
+    while( pTrigger ){
+      assert( pTrigger->pSchema==pTab->pSchema ||
+          pTrigger->pSchema==db->aDb[1].pSchema );
+      sqlite3DropTriggerPtr(pParse, pTrigger);
+      pTrigger = pTrigger->pNext;
+    }
+
+#ifndef SQLITE_OMIT_AUTOINCREMENT
+    /* Remove any entries of the sqlite_sequence table associated with
+    ** the table being dropped. This is done before the table is dropped
+    ** at the btree level, in case the sqlite_sequence table needs to
+    ** move as a result of the drop (can happen in auto-vacuum mode).
+    */
+    if( pTab->autoInc ){
+      sqlite3NestedParse(pParse,
+        "DELETE FROM %s.sqlite_sequence WHERE name=%Q",
+        pDb->zName, pTab->zName
+      );
+    }
+#endif
+
+    /* Drop all SQLITE_MASTER table and index entries that refer to the
+    ** table. The program name loops through the master table and deletes
+    ** every row that refers to a table of the same name as the one being
+    ** dropped. Triggers are handled seperately because a trigger can be
+    ** created in the temp database that refers to a table in another
+    ** database.
+    */
+    sqlite3NestedParse(pParse,
+        "DELETE FROM %Q.%s WHERE tbl_name=%Q and type!='trigger'",
+        pDb->zName, SCHEMA_TABLE(iDb), pTab->zName);
+    if( !isView && !IsVirtual(pTab) ){
+      destroyTable(pParse, pTab);
+    }
+
+    /* Remove the table entry from SQLite's internal schema and modify
+    ** the schema cookie.
+    */
+    if( IsVirtual(pTab) ){
+      sqlite3VdbeAddOp4(v, OP_VDestroy, iDb, 0, 0, pTab->zName, 0);
+    }
+    sqlite3VdbeAddOp4(v, OP_DropTable, iDb, 0, 0, pTab->zName, 0);
+    sqlite3ChangeCookie(pParse, iDb);
+  }
+  sqliteViewResetAll(db, iDb);
+
+exit_drop_table:
+  sqlite3SrcListDelete(pName);
+}
+
+/*
+** This routine is called to create a new foreign key on the table
+** currently under construction.  pFromCol determines which columns
+** in the current table point to the foreign key.  If pFromCol==0 then
+** connect the key to the last column inserted.  pTo is the name of
+** the table referred to.  pToCol is a list of tables in the other
+** pTo table that the foreign key points to.  flags contains all
+** information about the conflict resolution algorithms specified
+** in the ON DELETE, ON UPDATE and ON INSERT clauses.
+**
+** An FKey structure is created and added to the table currently
+** under construction in the pParse->pNewTable field.  The new FKey
+** is not linked into db->aFKey at this point - that does not happen
+** until sqlite3EndTable().
+**
+** The foreign key is set for IMMEDIATE processing.  A subsequent call
+** to sqlite3DeferForeignKey() might change this to DEFERRED.
+*/
+void sqlite3CreateForeignKey(
+  Parse *pParse,       /* Parsing context */
+  ExprList *pFromCol,  /* Columns in this table that point to other table */
+  Token *pTo,          /* Name of the other table */
+  ExprList *pToCol,    /* Columns in the other table */
+  int flags            /* Conflict resolution algorithms. */
+){
+#ifndef SQLITE_OMIT_FOREIGN_KEY
+  FKey *pFKey = 0;
+  Table *p = pParse->pNewTable;
+  int nByte;
+  int i;
+  int nCol;
+  char *z;
+
+  assert( pTo!=0 );
+  if( p==0 || pParse->nErr || IN_DECLARE_VTAB ) goto fk_end;
+  if( pFromCol==0 ){
+    int iCol = p->nCol-1;
+    if( iCol<0 ) goto fk_end;
+    if( pToCol && pToCol->nExpr!=1 ){
+      sqlite3ErrorMsg(pParse, "foreign key on %s"
+         " should reference only one column of table %T",
+         p->aCol[iCol].zName, pTo);
+      goto fk_end;
+    }
+    nCol = 1;
+  }else if( pToCol && pToCol->nExpr!=pFromCol->nExpr ){
+    sqlite3ErrorMsg(pParse,
+        "number of columns in foreign key does not match the number of "
+        "columns in the referenced table");
+    goto fk_end;
+  }else{
+    nCol = pFromCol->nExpr;
+  }
+  nByte = sizeof(*pFKey) + nCol*sizeof(pFKey->aCol[0]) + pTo->n + 1;
+  if( pToCol ){
+    for(i=0; i<pToCol->nExpr; i++){
+      nByte += strlen(pToCol->a[i].zName) + 1;
+    }
+  }
+  pFKey = sqlite3DbMallocZero(pParse->db, nByte );
+  if( pFKey==0 ){
+    goto fk_end;
+  }
+  pFKey->pFrom = p;
+  pFKey->pNextFrom = p->pFKey;
+  z = (char*)&pFKey[1];
+  pFKey->aCol = (struct sColMap*)z;
+  z += sizeof(struct sColMap)*nCol;
+  pFKey->zTo = z;
+  memcpy(z, pTo->z, pTo->n);
+  z[pTo->n] = 0;
+  z += pTo->n+1;
+  pFKey->pNextTo = 0;
+  pFKey->nCol = nCol;
+  if( pFromCol==0 ){
+    pFKey->aCol[0].iFrom = p->nCol-1;
+  }else{
+    for(i=0; i<nCol; i++){
+      int j;
+      for(j=0; j<p->nCol; j++){
+        if( sqlite3StrICmp(p->aCol[j].zName, pFromCol->a[i].zName)==0 ){
+          pFKey->aCol[i].iFrom = j;
+          break;
+        }
+      }
+      if( j>=p->nCol ){
+        sqlite3ErrorMsg(pParse,
+          "unknown column \"%s\" in foreign key definition",
+          pFromCol->a[i].zName);
+        goto fk_end;
+      }
+    }
+  }
+  if( pToCol ){
+    for(i=0; i<nCol; i++){
+      int n = strlen(pToCol->a[i].zName);
+      pFKey->aCol[i].zCol = z;
+      memcpy(z, pToCol->a[i].zName, n);
+      z[n] = 0;
+      z += n+1;
+    }
+  }
+  pFKey->isDeferred = 0;
+  pFKey->deleteConf = flags & 0xff;
+  pFKey->updateConf = (flags >> 8 ) & 0xff;
+  pFKey->insertConf = (flags >> 16 ) & 0xff;
+
+  /* Link the foreign key to the table as the last step.
+  */
+  p->pFKey = pFKey;
+  pFKey = 0;
+
+fk_end:
+  sqlite3_free(pFKey);
+#endif /* !defined(SQLITE_OMIT_FOREIGN_KEY) */
+  sqlite3ExprListDelete(pFromCol);
+  sqlite3ExprListDelete(pToCol);
+}
+
+/*
+** This routine is called when an INITIALLY IMMEDIATE or INITIALLY DEFERRED
+** clause is seen as part of a foreign key definition.  The isDeferred
+** parameter is 1 for INITIALLY DEFERRED and 0 for INITIALLY IMMEDIATE.
+** The behavior of the most recently created foreign key is adjusted
+** accordingly.
+*/
+void sqlite3DeferForeignKey(Parse *pParse, int isDeferred){
+#ifndef SQLITE_OMIT_FOREIGN_KEY
+  Table *pTab;
+  FKey *pFKey;
+  if( (pTab = pParse->pNewTable)==0 || (pFKey = pTab->pFKey)==0 ) return;
+  pFKey->isDeferred = isDeferred;
+#endif
+}
+
+/*
+** Generate code that will erase and refill index *pIdx.  This is
+** used to initialize a newly created index or to recompute the
+** content of an index in response to a REINDEX command.
+**
+** if memRootPage is not negative, it means that the index is newly
+** created.  The register specified by memRootPage contains the
+** root page number of the index.  If memRootPage is negative, then
+** the index already exists and must be cleared before being refilled and
+** the root page number of the index is taken from pIndex->tnum.
+*/
+static void sqlite3RefillIndex(Parse *pParse, Index *pIndex, int memRootPage){
+  Table *pTab = pIndex->pTable;  /* The table that is indexed */
+  int iTab = pParse->nTab;       /* Btree cursor used for pTab */
+  int iIdx = pParse->nTab+1;     /* Btree cursor used for pIndex */
+  int addr1;                     /* Address of top of loop */
+  int tnum;                      /* Root page of index */
+  Vdbe *v;                       /* Generate code into this virtual machine */
+  KeyInfo *pKey;                 /* KeyInfo for index */
+  int regIdxKey;                 /* Registers containing the index key */
+  int regRecord;                 /* Register holding assemblied index record */
+  sqlite3 *db = pParse->db;      /* The database connection */
+  int iDb = sqlite3SchemaToIndex(db, pIndex->pSchema);
+
+#ifndef SQLITE_OMIT_AUTHORIZATION
+  if( sqlite3AuthCheck(pParse, SQLITE_REINDEX, pIndex->zName, 0,
+      db->aDb[iDb].zName ) ){
+    return;
+  }
+#endif
+
+  /* Require a write-lock on the table to perform this operation */
+  sqlite3TableLock(pParse, iDb, pTab->tnum, 1, pTab->zName);
+
+  v = sqlite3GetVdbe(pParse);
+  if( v==0 ) return;
+  if( memRootPage>=0 ){
+    tnum = memRootPage;
+  }else{
+    tnum = pIndex->tnum;
+    sqlite3VdbeAddOp2(v, OP_Clear, tnum, iDb);
+  }
+  pKey = sqlite3IndexKeyinfo(pParse, pIndex);
+  sqlite3VdbeAddOp4(v, OP_OpenWrite, iIdx, tnum, iDb,
+                    (char *)pKey, P4_KEYINFO_HANDOFF);
+  if( memRootPage>=0 ){
+    sqlite3VdbeChangeP5(v, 1);
+  }
+  sqlite3OpenTable(pParse, iTab, iDb, pTab, OP_OpenRead);
+  addr1 = sqlite3VdbeAddOp2(v, OP_Rewind, iTab, 0);
+  regRecord = sqlite3GetTempReg(pParse);
+  regIdxKey = sqlite3GenerateIndexKey(pParse, pIndex, iTab, regRecord);
+  if( pIndex->onError!=OE_None ){
+    int j1, j2;
+    int regRowid;
+
+    regRowid = regIdxKey + pIndex->nColumn;
+    j1 = sqlite3VdbeAddOp3(v, OP_IsNull, regIdxKey, 0, pIndex->nColumn);
+    j2 = sqlite3VdbeAddOp4(v, OP_IsUnique, iIdx,
+                           0, regRowid, (char*)(sqlite3_intptr_t)regRecord, P4_INT32);
+    sqlite3VdbeAddOp4(v, OP_Halt, SQLITE_CONSTRAINT, OE_Abort, 0,
+                    "indexed columns are not unique", P4_STATIC);
+    sqlite3VdbeJumpHere(v, j1);
+    sqlite3VdbeJumpHere(v, j2);
+  }
+  sqlite3VdbeAddOp2(v, OP_IdxInsert, iIdx, regRecord);
+  sqlite3ReleaseTempReg(pParse, regRecord);
+  sqlite3VdbeAddOp2(v, OP_Next, iTab, addr1+1);
+  sqlite3VdbeJumpHere(v, addr1);
+  sqlite3VdbeAddOp1(v, OP_Close, iTab);
+  sqlite3VdbeAddOp1(v, OP_Close, iIdx);
+}
+
+/*
+** Create a new index for an SQL table.  pName1.pName2 is the name of the index
+** and pTblList is the name of the table that is to be indexed.  Both will
+** be NULL for a primary key or an index that is created to satisfy a
+** UNIQUE constraint.  If pTable and pIndex are NULL, use pParse->pNewTable
+** as the table to be indexed.  pParse->pNewTable is a table that is
+** currently being constructed by a CREATE TABLE statement.
+**
+** pList is a list of columns to be indexed.  pList will be NULL if this
+** is a primary key or unique-constraint on the most recent column added
+** to the table currently under construction.
+*/
+void sqlite3CreateIndex(
+  Parse *pParse,     /* All information about this parse */
+  Token *pName1,     /* First part of index name. May be NULL */
+  Token *pName2,     /* Second part of index name. May be NULL */
+  SrcList *pTblName, /* Table to index. Use pParse->pNewTable if 0 */
+  ExprList *pList,   /* A list of columns to be indexed */
+  int onError,       /* OE_Abort, OE_Ignore, OE_Replace, or OE_None */
+  Token *pStart,     /* The CREATE token that begins this statement */
+  Token *pEnd,       /* The ")" that closes the CREATE INDEX statement */
+  int sortOrder,     /* Sort order of primary key when pList==NULL */
+  int ifNotExist     /* Omit error if index already exists */
+){
+  Table *pTab = 0;     /* Table to be indexed */
+  Index *pIndex = 0;   /* The index to be created */
+  char *zName = 0;     /* Name of the index */
+  int nName;           /* Number of characters in zName */
+  int i, j;
+  Token nullId;        /* Fake token for an empty ID list */
+  DbFixer sFix;        /* For assigning database names to pTable */
+  int sortOrderMask;   /* 1 to honor DESC in index.  0 to ignore. */
+  sqlite3 *db = pParse->db;
+  Db *pDb;             /* The specific table containing the indexed database */
+  int iDb;             /* Index of the database that is being written */
+  Token *pName = 0;    /* Unqualified name of the index to create */
+  struct ExprList_item *pListItem; /* For looping over pList */
+  int nCol;
+  int nExtra = 0;
+  char *zExtra;
+
+  if( pParse->nErr || db->mallocFailed || IN_DECLARE_VTAB ){
+    goto exit_create_index;
+  }
+
+  /*
+  ** Find the table that is to be indexed.  Return early if not found.
+  */
+  if( pTblName!=0 ){
+
+    /* Use the two-part index name to determine the database
+    ** to search for the table. 'Fix' the table name to this db
+    ** before looking up the table.
+    */
+    assert( pName1 && pName2 );
+    iDb = sqlite3TwoPartName(pParse, pName1, pName2, &pName);
+    if( iDb<0 ) goto exit_create_index;
+
+#ifndef SQLITE_OMIT_TEMPDB
+    /* If the index name was unqualified, check if the the table
+    ** is a temp table. If so, set the database to 1. Do not do this
+    ** if initialising a database schema.
+    */
+    if( !db->init.busy ){
+      pTab = sqlite3SrcListLookup(pParse, pTblName);
+      if( pName2 && pName2->n==0 && pTab && pTab->pSchema==db->aDb[1].pSchema ){
+        iDb = 1;
+      }
+    }
+#endif
+
+    if( sqlite3FixInit(&sFix, pParse, iDb, "index", pName) &&
+        sqlite3FixSrcList(&sFix, pTblName)
+    ){
+      /* Because the parser constructs pTblName from a single identifier,
+      ** sqlite3FixSrcList can never fail. */
+      assert(0);
+    }
+    pTab = sqlite3LocateTable(pParse, 0, pTblName->a[0].zName,
+        pTblName->a[0].zDatabase);
+    if( !pTab ) goto exit_create_index;
+    assert( db->aDb[iDb].pSchema==pTab->pSchema );
+  }else{
+    assert( pName==0 );
+    pTab = pParse->pNewTable;
+    if( !pTab ) goto exit_create_index;
+    iDb = sqlite3SchemaToIndex(db, pTab->pSchema);
+  }
+  pDb = &db->aDb[iDb];
+
+  if( pTab==0 || pParse->nErr ) goto exit_create_index;
+  if( pTab->readOnly ){
+    sqlite3ErrorMsg(pParse, "table %s may not be indexed", pTab->zName);
+    goto exit_create_index;
+  }
+#ifndef SQLITE_OMIT_VIEW
+  if( pTab->pSelect ){
+    sqlite3ErrorMsg(pParse, "views may not be indexed");
+    goto exit_create_index;
+  }
+#endif
+#ifndef SQLITE_OMIT_VIRTUALTABLE
+  if( IsVirtual(pTab) ){
+    sqlite3ErrorMsg(pParse, "virtual tables may not be indexed");
+    goto exit_create_index;
+  }
+#endif
+
+  /*
+  ** Find the name of the index.  Make sure there is not already another
+  ** index or table with the same name.
+  **
+  ** Exception:  If we are reading the names of permanent indices from the
+  ** sqlite_master table (because some other process changed the schema) and
+  ** one of the index names collides with the name of a temporary table or
+  ** index, then we will continue to process this index.
+  **
+  ** If pName==0 it means that we are
+  ** dealing with a primary key or UNIQUE constraint.  We have to invent our
+  ** own name.
+  */
+  if( pName ){
+    zName = sqlite3NameFromToken(db, pName);
+    if( SQLITE_OK!=sqlite3ReadSchema(pParse) ) goto exit_create_index;
+    if( zName==0 ) goto exit_create_index;
+    if( SQLITE_OK!=sqlite3CheckObjectName(pParse, zName) ){
+      goto exit_create_index;
+    }
+    if( !db->init.busy ){
+      if( SQLITE_OK!=sqlite3ReadSchema(pParse) ) goto exit_create_index;
+      if( sqlite3FindTable(db, zName, 0)!=0 ){
+        sqlite3ErrorMsg(pParse, "there is already a table named %s", zName);
+        goto exit_create_index;
+      }
+    }
+    if( sqlite3FindIndex(db, zName, pDb->zName)!=0 ){
+      if( !ifNotExist ){
+        sqlite3ErrorMsg(pParse, "index %s already exists", zName);
+      }
+      goto exit_create_index;
+    }
+  }else{
+    char zBuf[30];
+    int n;
+    Index *pLoop;
+    for(pLoop=pTab->pIndex, n=1; pLoop; pLoop=pLoop->pNext, n++){}
+    sqlite3_snprintf(sizeof(zBuf),zBuf,"_%d",n);
+    zName = 0;
+    sqlite3SetString(&zName, "sqlite_autoindex_", pTab->zName, zBuf, (char*)0);
+    if( zName==0 ){
+      db->mallocFailed = 1;
+      goto exit_create_index;
+    }
+  }
+
+  /* Check for authorization to create an index.
+  */
+#ifndef SQLITE_OMIT_AUTHORIZATION
+  {
+    const char *zDb = pDb->zName;
+    if( sqlite3AuthCheck(pParse, SQLITE_INSERT, SCHEMA_TABLE(iDb), 0, zDb) ){
+      goto exit_create_index;
+    }
+    i = SQLITE_CREATE_INDEX;
+    if( !OMIT_TEMPDB && iDb==1 ) i = SQLITE_CREATE_TEMP_INDEX;
+    if( sqlite3AuthCheck(pParse, i, zName, pTab->zName, zDb) ){
+      goto exit_create_index;
+    }
+  }
+#endif
+
+  /* If pList==0, it means this routine was called to make a primary
+  ** key out of the last column added to the table under construction.
+  ** So create a fake list to simulate this.
+  */
+  if( pList==0 ){
+    nullId.z = (u8*)pTab->aCol[pTab->nCol-1].zName;
+    nullId.n = strlen((char*)nullId.z);
+    pList = sqlite3ExprListAppend(pParse, 0, 0, &nullId);
+    if( pList==0 ) goto exit_create_index;
+    pList->a[0].sortOrder = sortOrder;
+  }
+
+  /* Figure out how many bytes of space are required to store explicitly
+  ** specified collation sequence names.
+  */
+  for(i=0; i<pList->nExpr; i++){
+    Expr *pExpr = pList->a[i].pExpr;
+    if( pExpr ){
+      nExtra += (1 + strlen(pExpr->pColl->zName));
+    }
+  }
+
+  /*
+  ** Allocate the index structure.
+  */
+  nName = strlen(zName);
+  nCol = pList->nExpr;
+  pIndex = sqlite3DbMallocZero(db,
+      sizeof(Index) +              /* Index structure  */
+      sizeof(int)*nCol +           /* Index.aiColumn   */
+      sizeof(int)*(nCol+1) +       /* Index.aiRowEst   */
+      sizeof(char *)*nCol +        /* Index.azColl     */
+      sizeof(u8)*nCol +            /* Index.aSortOrder */
+      nName + 1 +                  /* Index.zName      */
+      nExtra                       /* Collation sequence names */
+  );
+  if( db->mallocFailed ){
+    goto exit_create_index;
+  }
+  pIndex->azColl = (char**)(&pIndex[1]);
+  pIndex->aiColumn = (int *)(&pIndex->azColl[nCol]);
+  pIndex->aiRowEst = (unsigned *)(&pIndex->aiColumn[nCol]);
+  pIndex->aSortOrder = (u8 *)(&pIndex->aiRowEst[nCol+1]);
+  pIndex->zName = (char *)(&pIndex->aSortOrder[nCol]);
+  zExtra = (char *)(&pIndex->zName[nName+1]);
+  memcpy(pIndex->zName, zName, nName+1);
+  pIndex->pTable = pTab;
+  pIndex->nColumn = pList->nExpr;
+  pIndex->onError = onError;
+  pIndex->autoIndex = pName==0;
+  pIndex->pSchema = db->aDb[iDb].pSchema;
+
+  /* Check to see if we should honor DESC requests on index columns
+  */
+  if( pDb->pSchema->file_format>=4 ){
+    sortOrderMask = -1;   /* Honor DESC */
+  }else{
+    sortOrderMask = 0;    /* Ignore DESC */
+  }
+
+  /* Scan the names of the columns of the table to be indexed and
+  ** load the column indices into the Index structure.  Report an error
+  ** if any column is not found.
+  */
+  for(i=0, pListItem=pList->a; i<pList->nExpr; i++, pListItem++){
+    const char *zColName = pListItem->zName;
+    Column *pTabCol;
+    int requestedSortOrder;
+    char *zColl;                   /* Collation sequence name */
+
+    for(j=0, pTabCol=pTab->aCol; j<pTab->nCol; j++, pTabCol++){
+      if( sqlite3StrICmp(zColName, pTabCol->zName)==0 ) break;
+    }
+    if( j>=pTab->nCol ){
+      sqlite3ErrorMsg(pParse, "table %s has no column named %s",
+        pTab->zName, zColName);
+      goto exit_create_index;
+    }
+    /* TODO:  Add a test to make sure that the same column is not named
+    ** more than once within the same index.  Only the first instance of
+    ** the column will ever be used by the optimizer.  Note that using the
+    ** same column more than once cannot be an error because that would
+    ** break backwards compatibility - it needs to be a warning.
+    */
+    pIndex->aiColumn[i] = j;
+    if( pListItem->pExpr ){
+      assert( pListItem->pExpr->pColl );
+      zColl = zExtra;
+      sqlite3_snprintf(nExtra, zExtra, "%s", pListItem->pExpr->pColl->zName);
+      zExtra += (strlen(zColl) + 1);
+    }else{
+      zColl = pTab->aCol[j].zColl;
+      if( !zColl ){
+        zColl = db->pDfltColl->zName;
+      }
+    }
+    if( !db->init.busy && !sqlite3LocateCollSeq(pParse, zColl, -1) ){
+      goto exit_create_index;
+    }
+    pIndex->azColl[i] = zColl;
+    requestedSortOrder = pListItem->sortOrder & sortOrderMask;
+    pIndex->aSortOrder[i] = requestedSortOrder;
+  }
+  sqlite3DefaultRowEst(pIndex);
+
+  if( pTab==pParse->pNewTable ){
+    /* This routine has been called to create an automatic index as a
+    ** result of a PRIMARY KEY or UNIQUE clause on a column definition, or
+    ** a PRIMARY KEY or UNIQUE clause following the column definitions.
+    ** i.e. one of:
+    **
+    ** CREATE TABLE t(x PRIMARY KEY, y);
+    ** CREATE TABLE t(x, y, UNIQUE(x, y));
+    **
+    ** Either way, check to see if the table already has such an index. If
+    ** so, don't bother creating this one. This only applies to
+    ** automatically created indices. Users can do as they wish with
+    ** explicit indices.
+    */
+    Index *pIdx;
+    for(pIdx=pTab->pIndex; pIdx; pIdx=pIdx->pNext){
+      int k;
+      assert( pIdx->onError!=OE_None );
+      assert( pIdx->autoIndex );
+      assert( pIndex->onError!=OE_None );
+
+      if( pIdx->nColumn!=pIndex->nColumn ) continue;
+      for(k=0; k<pIdx->nColumn; k++){
+        const char *z1 = pIdx->azColl[k];
+        const char *z2 = pIndex->azColl[k];
+        if( pIdx->aiColumn[k]!=pIndex->aiColumn[k] ) break;
+        if( pIdx->aSortOrder[k]!=pIndex->aSortOrder[k] ) break;
+        if( z1!=z2 && sqlite3StrICmp(z1, z2) ) break;
+      }
+      if( k==pIdx->nColumn ){
+        if( pIdx->onError!=pIndex->onError ){
+          /* This constraint creates the same index as a previous
+          ** constraint specified somewhere in the CREATE TABLE statement.
+          ** However the ON CONFLICT clauses are different. If both this
+          ** constraint and the previous equivalent constraint have explicit
+          ** ON CONFLICT clauses this is an error. Otherwise, use the
+          ** explicitly specified behaviour for the index.
+          */
+          if( !(pIdx->onError==OE_Default || pIndex->onError==OE_Default) ){
+            sqlite3ErrorMsg(pParse,
+                "conflicting ON CONFLICT clauses specified", 0);
+          }
+          if( pIdx->onError==OE_Default ){
+            pIdx->onError = pIndex->onError;
+          }
+        }
+        goto exit_create_index;
+      }
+    }
+  }
+
+  /* Link the new Index structure to its table and to the other
+  ** in-memory database structures.
+  */
+  if( db->init.busy ){
+    Index *p;
+    p = sqlite3HashInsert(&pIndex->pSchema->idxHash,
+                         pIndex->zName, strlen(pIndex->zName)+1, pIndex);
+    if( p ){
+      assert( p==pIndex );  /* Malloc must have failed */
+      db->mallocFailed = 1;
+      goto exit_create_index;
+    }
+    db->flags |= SQLITE_InternChanges;
+    if( pTblName!=0 ){
+      pIndex->tnum = db->init.newTnum;
+    }
+  }
+
+  /* If the db->init.busy is 0 then create the index on disk.  This
+  ** involves writing the index into the master table and filling in the
+  ** index with the current table contents.
+  **
+  ** The db->init.busy is 0 when the user first enters a CREATE INDEX
+  ** command.  db->init.busy is 1 when a database is opened and
+  ** CREATE INDEX statements are read out of the master table.  In
+  ** the latter case the index already exists on disk, which is why
+  ** we don't want to recreate it.
+  **
+  ** If pTblName==0 it means this index is generated as a primary key
+  ** or UNIQUE constraint of a CREATE TABLE statement.  Since the table
+  ** has just been created, it contains no data and the index initialization
+  ** step can be skipped.
+  */
+  else if( db->init.busy==0 ){
+    Vdbe *v;
+    char *zStmt;
+    int iMem = ++pParse->nMem;
+
+    v = sqlite3GetVdbe(pParse);
+    if( v==0 ) goto exit_create_index;
+
+
+    /* Create the rootpage for the index
+    */
+    sqlite3BeginWriteOperation(pParse, 1, iDb);
+    sqlite3VdbeAddOp2(v, OP_CreateIndex, iDb, iMem);
+
+    /* Gather the complete text of the CREATE INDEX statement into
+    ** the zStmt variable
+    */
+    if( pStart && pEnd ){
+      /* A named index with an explicit CREATE INDEX statement */
+      zStmt = sqlite3MPrintf(db, "CREATE%s INDEX %.*s",
+        onError==OE_None ? "" : " UNIQUE",
+        pEnd->z - pName->z + 1,
+        pName->z);
+    }else{
+      /* An automatic index created by a PRIMARY KEY or UNIQUE constraint */
+      /* zStmt = sqlite3MPrintf(""); */
+      zStmt = 0;
+    }
+
+    /* Add an entry in sqlite_master for this index
+    */
+    sqlite3NestedParse(pParse,
+        "INSERT INTO %Q.%s VALUES('index',%Q,%Q,#%d,%Q);",
+        db->aDb[iDb].zName, SCHEMA_TABLE(iDb),
+        pIndex->zName,
+        pTab->zName,
+        iMem,
+        zStmt
+    );
+    sqlite3_free(zStmt);
+
+    /* Fill the index with data and reparse the schema. Code an OP_Expire
+    ** to invalidate all pre-compiled statements.
+    */
+    if( pTblName ){
+      sqlite3RefillIndex(pParse, pIndex, iMem);
+      sqlite3ChangeCookie(pParse, iDb);
+      sqlite3VdbeAddOp4(v, OP_ParseSchema, iDb, 0, 0,
+         sqlite3MPrintf(db, "name='%q'", pIndex->zName), P4_DYNAMIC);
+      sqlite3VdbeAddOp1(v, OP_Expire, 0);
+    }
+  }
+
+  /* When adding an index to the list of indices for a table, make
+  ** sure all indices labeled OE_Replace come after all those labeled
+  ** OE_Ignore.  This is necessary for the correct operation of UPDATE
+  ** and INSERT.
+  */
+  if( db->init.busy || pTblName==0 ){
+    if( onError!=OE_Replace || pTab->pIndex==0
+         || pTab->pIndex->onError==OE_Replace){
+      pIndex->pNext = pTab->pIndex;
+      pTab->pIndex = pIndex;
+    }else{
+      Index *pOther = pTab->pIndex;
+      while( pOther->pNext && pOther->pNext->onError!=OE_Replace ){
+        pOther = pOther->pNext;
+      }
+      pIndex->pNext = pOther->pNext;
+      pOther->pNext = pIndex;
+    }
+    pIndex = 0;
+  }
+
+  /* Clean up before exiting */
+exit_create_index:
+  if( pIndex ){
+    freeIndex(pIndex);
+  }
+  sqlite3ExprListDelete(pList);
+  sqlite3SrcListDelete(pTblName);
+  sqlite3_free(zName);
+  return;
+}
+
+/*
+** Generate code to make sure the file format number is at least minFormat.
+** The generated code will increase the file format number if necessary.
+*/
+void sqlite3MinimumFileFormat(Parse *pParse, int iDb, int minFormat){
+  Vdbe *v;
+  v = sqlite3GetVdbe(pParse);
+  if( v ){
+    int r1 = sqlite3GetTempReg(pParse);
+    int r2 = sqlite3GetTempReg(pParse);
+    int j1;
+    sqlite3VdbeAddOp3(v, OP_ReadCookie, iDb, r1, 1);
+    sqlite3VdbeUsesBtree(v, iDb);
+    sqlite3VdbeAddOp2(v, OP_Integer, minFormat, r2);
+    j1 = sqlite3VdbeAddOp3(v, OP_Ge, r2, 0, r1);
+    sqlite3VdbeAddOp3(v, OP_SetCookie, iDb, 1, r2);
+    sqlite3VdbeJumpHere(v, j1);
+    sqlite3ReleaseTempReg(pParse, r1);
+    sqlite3ReleaseTempReg(pParse, r2);
+  }
+}
+
+/*
+** Fill the Index.aiRowEst[] array with default information - information
+** to be used when we have not run the ANALYZE command.
+**
+** aiRowEst[0] is suppose to contain the number of elements in the index.
+** Since we do not know, guess 1 million.  aiRowEst[1] is an estimate of the
+** number of rows in the table that match any particular value of the
+** first column of the index.  aiRowEst[2] is an estimate of the number
+** of rows that match any particular combiniation of the first 2 columns
+** of the index.  And so forth.  It must always be the case that
+*
+**           aiRowEst[N]<=aiRowEst[N-1]
+**           aiRowEst[N]>=1
+**
+** Apart from that, we have little to go on besides intuition as to
+** how aiRowEst[] should be initialized.  The numbers generated here
+** are based on typical values found in actual indices.
+*/
+void sqlite3DefaultRowEst(Index *pIdx){
+  unsigned *a = pIdx->aiRowEst;
+  int i;
+  assert( a!=0 );
+  a[0] = 1000000;
+  for(i=pIdx->nColumn; i>=5; i--){
+    a[i] = 5;
+  }
+  while( i>=1 ){
+    a[i] = 11 - i;
+    i--;
+  }
+  if( pIdx->onError!=OE_None ){
+    a[pIdx->nColumn] = 1;
+  }
+}
+
+/*
+** This routine will drop an existing named index.  This routine
+** implements the DROP INDEX statement.
+*/
+void sqlite3DropIndex(Parse *pParse, SrcList *pName, int ifExists){
+  Index *pIndex;
+  Vdbe *v;
+  sqlite3 *db = pParse->db;
+  int iDb;
+
+  if( pParse->nErr || db->mallocFailed ){
+    goto exit_drop_index;
+  }
+  assert( pName->nSrc==1 );
+  if( SQLITE_OK!=sqlite3ReadSchema(pParse) ){
+    goto exit_drop_index;
+  }
+  pIndex = sqlite3FindIndex(db, pName->a[0].zName, pName->a[0].zDatabase);
+  if( pIndex==0 ){
+    if( !ifExists ){
+      sqlite3ErrorMsg(pParse, "no such index: %S", pName, 0);
+    }
+    pParse->checkSchema = 1;
+    goto exit_drop_index;
+  }
+  if( pIndex->autoIndex ){
+    sqlite3ErrorMsg(pParse, "index associated with UNIQUE "
+      "or PRIMARY KEY constraint cannot be dropped", 0);
+    goto exit_drop_index;
+  }
+  iDb = sqlite3SchemaToIndex(db, pIndex->pSchema);
+#ifndef SQLITE_OMIT_AUTHORIZATION
+  {
+    int code = SQLITE_DROP_INDEX;
+    Table *pTab = pIndex->pTable;
+    const char *zDb = db->aDb[iDb].zName;
+    const char *zTab = SCHEMA_TABLE(iDb);
+    if( sqlite3AuthCheck(pParse, SQLITE_DELETE, zTab, 0, zDb) ){
+      goto exit_drop_index;
+    }
+    if( !OMIT_TEMPDB && iDb ) code = SQLITE_DROP_TEMP_INDEX;
+    if( sqlite3AuthCheck(pParse, code, pIndex->zName, pTab->zName, zDb) ){
+      goto exit_drop_index;
+    }
+  }
+#endif
+
+  /* Generate code to remove the index and from the master table */
+  v = sqlite3GetVdbe(pParse);
+  if( v ){
+    sqlite3BeginWriteOperation(pParse, 1, iDb);
+    sqlite3NestedParse(pParse,
+       "DELETE FROM %Q.%s WHERE name=%Q",
+       db->aDb[iDb].zName, SCHEMA_TABLE(iDb),
+       pIndex->zName
+    );
+    sqlite3ChangeCookie(pParse, iDb);
+    destroyRootPage(pParse, pIndex->tnum, iDb);
+    sqlite3VdbeAddOp4(v, OP_DropIndex, iDb, 0, 0, pIndex->zName, 0);
+  }
+
+exit_drop_index:
+  sqlite3SrcListDelete(pName);
+}
+
+/*
+** pArray is a pointer to an array of objects.  Each object in the
+** array is szEntry bytes in size.  This routine allocates a new
+** object on the end of the array.
+**
+** *pnEntry is the number of entries already in use.  *pnAlloc is
+** the previously allocated size of the array.  initSize is the
+** suggested initial array size allocation.
+**
+** The index of the new entry is returned in *pIdx.
+**
+** This routine returns a pointer to the array of objects.  This
+** might be the same as the pArray parameter or it might be a different
+** pointer if the array was resized.
+*/
+void *sqlite3ArrayAllocate(
+  sqlite3 *db,      /* Connection to notify of malloc failures */
+  void *pArray,     /* Array of objects.  Might be reallocated */
+  int szEntry,      /* Size of each object in the array */
+  int initSize,     /* Suggested initial allocation, in elements */
+  int *pnEntry,     /* Number of objects currently in use */
+  int *pnAlloc,     /* Current size of the allocation, in elements */
+  int *pIdx         /* Write the index of a new slot here */
+){
+  char *z;
+  if( *pnEntry >= *pnAlloc ){
+    void *pNew;
+    int newSize;
+    newSize = (*pnAlloc)*2 + initSize;
+    pNew = sqlite3DbRealloc(db, pArray, newSize*szEntry);
+    if( pNew==0 ){
+      *pIdx = -1;
+      return pArray;
+    }
+    *pnAlloc = newSize;
+    pArray = pNew;
+  }
+  z = (char*)pArray;
+  memset(&z[*pnEntry * szEntry], 0, szEntry);
+  *pIdx = *pnEntry;
+  ++*pnEntry;
+  return pArray;
+}
+
+/*
+** Append a new element to the given IdList.  Create a new IdList if
+** need be.
+**
+** A new IdList is returned, or NULL if malloc() fails.
+*/
+IdList *sqlite3IdListAppend(sqlite3 *db, IdList *pList, Token *pToken){
+  int i;
+  if( pList==0 ){
+    pList = sqlite3DbMallocZero(db, sizeof(IdList) );
+    if( pList==0 ) return 0;
+    pList->nAlloc = 0;
+  }
+  pList->a = sqlite3ArrayAllocate(
+      db,
+      pList->a,
+      sizeof(pList->a[0]),
+      5,
+      &pList->nId,
+      &pList->nAlloc,
+      &i
+  );
+  if( i<0 ){
+    sqlite3IdListDelete(pList);
+    return 0;
+  }
+  pList->a[i].zName = sqlite3NameFromToken(db, pToken);
+  return pList;
+}
+
+/*
+** Delete an IdList.
+*/
+void sqlite3IdListDelete(IdList *pList){
+  int i;
+  if( pList==0 ) return;
+  for(i=0; i<pList->nId; i++){
+    sqlite3_free(pList->a[i].zName);
+  }
+  sqlite3_free(pList->a);
+  sqlite3_free(pList);
+}
+
+/*
+** Return the index in pList of the identifier named zId.  Return -1
+** if not found.
+*/
+int sqlite3IdListIndex(IdList *pList, const char *zName){
+  int i;
+  if( pList==0 ) return -1;
+  for(i=0; i<pList->nId; i++){
+    if( sqlite3StrICmp(pList->a[i].zName, zName)==0 ) return i;
+  }
+  return -1;
+}
+
+/*
+** Append a new table name to the given SrcList.  Create a new SrcList if
+** need be.  A new entry is created in the SrcList even if pToken is NULL.
+**
+** A new SrcList is returned, or NULL if malloc() fails.
+**
+** If pDatabase is not null, it means that the table has an optional
+** database name prefix.  Like this:  "database.table".  The pDatabase
+** points to the table name and the pTable points to the database name.
+** The SrcList.a[].zName field is filled with the table name which might
+** come from pTable (if pDatabase is NULL) or from pDatabase.
+** SrcList.a[].zDatabase is filled with the database name from pTable,
+** or with NULL if no database is specified.
+**
+** In other words, if call like this:
+**
+**         sqlite3SrcListAppend(D,A,B,0);
+**
+** Then B is a table name and the database name is unspecified.  If called
+** like this:
+**
+**         sqlite3SrcListAppend(D,A,B,C);
+**
+** Then C is the table name and B is the database name.
+*/
+SrcList *sqlite3SrcListAppend(
+  sqlite3 *db,        /* Connection to notify of malloc failures */
+  SrcList *pList,     /* Append to this SrcList. NULL creates a new SrcList */
+  Token *pTable,      /* Table to append */
+  Token *pDatabase    /* Database of the table */
+){
+  struct SrcList_item *pItem;
+  if( pList==0 ){
+    pList = sqlite3DbMallocZero(db, sizeof(SrcList) );
+    if( pList==0 ) return 0;
+    pList->nAlloc = 1;
+  }
+  if( pList->nSrc>=pList->nAlloc ){
+    SrcList *pNew;
+    pList->nAlloc *= 2;
+    pNew = sqlite3DbRealloc(db, pList,
+               sizeof(*pList) + (pList->nAlloc-1)*sizeof(pList->a[0]) );
+    if( pNew==0 ){
+      sqlite3SrcListDelete(pList);
+      return 0;
+    }
+    pList = pNew;
+  }
+  pItem = &pList->a[pList->nSrc];
+  memset(pItem, 0, sizeof(pList->a[0]));
+  if( pDatabase && pDatabase->z==0 ){
+    pDatabase = 0;
+  }
+  if( pDatabase && pTable ){
+    Token *pTemp = pDatabase;
+    pDatabase = pTable;
+    pTable = pTemp;
+  }
+  pItem->zName = sqlite3NameFromToken(db, pTable);
+  pItem->zDatabase = sqlite3NameFromToken(db, pDatabase);
+  pItem->iCursor = -1;
+  pItem->isPopulated = 0;
+  pList->nSrc++;
+  return pList;
+}
+
+/*
+** Assign cursors to all tables in a SrcList
+*/
+void sqlite3SrcListAssignCursors(Parse *pParse, SrcList *pList){
+  int i;
+  struct SrcList_item *pItem;
+  assert(pList || pParse->db->mallocFailed );
+  if( pList ){
+    for(i=0, pItem=pList->a; i<pList->nSrc; i++, pItem++){
+      if( pItem->iCursor>=0 ) break;
+      pItem->iCursor = pParse->nTab++;
+      if( pItem->pSelect ){
+        sqlite3SrcListAssignCursors(pParse, pItem->pSelect->pSrc);
+      }
+    }
+  }
+}
+
+/*
+** Delete an entire SrcList including all its substructure.
+*/
+void sqlite3SrcListDelete(SrcList *pList){
+  int i;
+  struct SrcList_item *pItem;
+  if( pList==0 ) return;
+  for(pItem=pList->a, i=0; i<pList->nSrc; i++, pItem++){
+    sqlite3_free(pItem->zDatabase);
+    sqlite3_free(pItem->zName);
+    sqlite3_free(pItem->zAlias);
+    sqlite3DeleteTable(pItem->pTab);
+    sqlite3SelectDelete(pItem->pSelect);
+    sqlite3ExprDelete(pItem->pOn);
+    sqlite3IdListDelete(pItem->pUsing);
+  }
+  sqlite3_free(pList);
+}
+
+/*
+** This routine is called by the parser to add a new term to the
+** end of a growing FROM clause.  The "p" parameter is the part of
+** the FROM clause that has already been constructed.  "p" is NULL
+** if this is the first term of the FROM clause.  pTable and pDatabase
+** are the name of the table and database named in the FROM clause term.
+** pDatabase is NULL if the database name qualifier is missing - the
+** usual case.  If the term has a alias, then pAlias points to the
+** alias token.  If the term is a subquery, then pSubquery is the
+** SELECT statement that the subquery encodes.  The pTable and
+** pDatabase parameters are NULL for subqueries.  The pOn and pUsing
+** parameters are the content of the ON and USING clauses.
+**
+** Return a new SrcList which encodes is the FROM with the new
+** term added.
+*/
+SrcList *sqlite3SrcListAppendFromTerm(
+  Parse *pParse,          /* Parsing context */
+  SrcList *p,             /* The left part of the FROM clause already seen */
+  Token *pTable,          /* Name of the table to add to the FROM clause */
+  Token *pDatabase,       /* Name of the database containing pTable */
+  Token *pAlias,          /* The right-hand side of the AS subexpression */
+  Select *pSubquery,      /* A subquery used in place of a table name */
+  Expr *pOn,              /* The ON clause of a join */
+  IdList *pUsing          /* The USING clause of a join */
+){
+  struct SrcList_item *pItem;
+  sqlite3 *db = pParse->db;
+  p = sqlite3SrcListAppend(db, p, pTable, pDatabase);
+  if( p==0 || p->nSrc==0 ){
+    sqlite3ExprDelete(pOn);
+    sqlite3IdListDelete(pUsing);
+    sqlite3SelectDelete(pSubquery);
+    return p;
+  }
+  pItem = &p->a[p->nSrc-1];
+  if( pAlias && pAlias->n ){
+    pItem->zAlias = sqlite3NameFromToken(db, pAlias);
+  }
+  pItem->pSelect = pSubquery;
+  pItem->pOn = pOn;
+  pItem->pUsing = pUsing;
+  return p;
+}
+
+/*
+** When building up a FROM clause in the parser, the join operator
+** is initially attached to the left operand.  But the code generator
+** expects the join operator to be on the right operand.  This routine
+** Shifts all join operators from left to right for an entire FROM
+** clause.
+**
+** Example: Suppose the join is like this:
+**
+**           A natural cross join B
+**
+** The operator is "natural cross join".  The A and B operands are stored
+** in p->a[0] and p->a[1], respectively.  The parser initially stores the
+** operator with A.  This routine shifts that operator over to B.
+*/
+void sqlite3SrcListShiftJoinType(SrcList *p){
+  if( p && p->a ){
+    int i;
+    for(i=p->nSrc-1; i>0; i--){
+      p->a[i].jointype = p->a[i-1].jointype;
+    }
+    p->a[0].jointype = 0;
+  }
+}
+
+/*
+** Begin a transaction
+*/
+void sqlite3BeginTransaction(Parse *pParse, int type){
+  sqlite3 *db;
+  Vdbe *v;
+  int i;
+
+  if( pParse==0 || (db=pParse->db)==0 || db->aDb[0].pBt==0 ) return;
+  if( pParse->nErr || db->mallocFailed ) return;
+  if( sqlite3AuthCheck(pParse, SQLITE_TRANSACTION, "BEGIN", 0, 0) ) return;
+
+  v = sqlite3GetVdbe(pParse);
+  if( !v ) return;
+  if( type!=TK_DEFERRED ){
+    for(i=0; i<db->nDb; i++){
+      sqlite3VdbeAddOp2(v, OP_Transaction, i, (type==TK_EXCLUSIVE)+1);
+      sqlite3VdbeUsesBtree(v, i);
+    }
+  }
+  sqlite3VdbeAddOp2(v, OP_AutoCommit, 0, 0);
+}
+
+/*
+** Commit a transaction
+*/
+void sqlite3CommitTransaction(Parse *pParse){
+  sqlite3 *db;
+  Vdbe *v;
+
+  if( pParse==0 || (db=pParse->db)==0 || db->aDb[0].pBt==0 ) return;
+  if( pParse->nErr || db->mallocFailed ) return;
+  if( sqlite3AuthCheck(pParse, SQLITE_TRANSACTION, "COMMIT", 0, 0) ) return;
+
+  v = sqlite3GetVdbe(pParse);
+  if( v ){
+    sqlite3VdbeAddOp2(v, OP_AutoCommit, 1, 0);
+  }
+}
+
+/*
+** Rollback a transaction
+*/
+void sqlite3RollbackTransaction(Parse *pParse){
+  sqlite3 *db;
+  Vdbe *v;
+
+  if( pParse==0 || (db=pParse->db)==0 || db->aDb[0].pBt==0 ) return;
+  if( pParse->nErr || db->mallocFailed ) return;
+  if( sqlite3AuthCheck(pParse, SQLITE_TRANSACTION, "ROLLBACK", 0, 0) ) return;
+
+  v = sqlite3GetVdbe(pParse);
+  if( v ){
+    sqlite3VdbeAddOp2(v, OP_AutoCommit, 1, 1);
+  }
+}
+
+/*
+** Make sure the TEMP database is open and available for use.  Return
+** the number of errors.  Leave any error messages in the pParse structure.
+*/
+int sqlite3OpenTempDatabase(Parse *pParse){
+  sqlite3 *db = pParse->db;
+  if( db->aDb[1].pBt==0 && !pParse->explain ){
+    int rc;
+    static const int flags =
+          SQLITE_OPEN_READWRITE |
+          SQLITE_OPEN_CREATE |
+          SQLITE_OPEN_EXCLUSIVE |
+          SQLITE_OPEN_DELETEONCLOSE |
+          SQLITE_OPEN_TEMP_DB;
+
+    rc = sqlite3BtreeFactory(db, 0, 0, SQLITE_DEFAULT_CACHE_SIZE, flags,
+                                 &db->aDb[1].pBt);
+    if( rc!=SQLITE_OK ){
+      sqlite3ErrorMsg(pParse, "unable to open a temporary database "
+        "file for storing temporary tables");
+      pParse->rc = rc;
+      return 1;
+    }
+    assert( (db->flags & SQLITE_InTrans)==0 || db->autoCommit );
+    assert( db->aDb[1].pSchema );
+  }
+  return 0;
+}
+
+/*
+** Generate VDBE code that will verify the schema cookie and start
+** a read-transaction for all named database files.
+**
+** It is important that all schema cookies be verified and all
+** read transactions be started before anything else happens in
+** the VDBE program.  But this routine can be called after much other
+** code has been generated.  So here is what we do:
+**
+** The first time this routine is called, we code an OP_Goto that
+** will jump to a subroutine at the end of the program.  Then we
+** record every database that needs its schema verified in the
+** pParse->cookieMask field.  Later, after all other code has been
+** generated, the subroutine that does the cookie verifications and
+** starts the transactions will be coded and the OP_Goto P2 value
+** will be made to point to that subroutine.  The generation of the
+** cookie verification subroutine code happens in sqlite3FinishCoding().
+**
+** If iDb<0 then code the OP_Goto only - don't set flag to verify the
+** schema on any databases.  This can be used to position the OP_Goto
+** early in the code, before we know if any database tables will be used.
+*/
+void sqlite3CodeVerifySchema(Parse *pParse, int iDb){
+  sqlite3 *db;
+  Vdbe *v;
+  int mask;
+
+  v = sqlite3GetVdbe(pParse);
+  if( v==0 ) return;  /* This only happens if there was a prior error */
+  db = pParse->db;
+  if( pParse->cookieGoto==0 ){
+    pParse->cookieGoto = sqlite3VdbeAddOp2(v, OP_Goto, 0, 0)+1;
+  }
+  if( iDb>=0 ){
+    assert( iDb<db->nDb );
+    assert( db->aDb[iDb].pBt!=0 || iDb==1 );
+    assert( iDb<SQLITE_MAX_ATTACHED+2 );
+    mask = 1<<iDb;
+    if( (pParse->cookieMask & mask)==0 ){
+      pParse->cookieMask |= mask;
+      pParse->cookieValue[iDb] = db->aDb[iDb].pSchema->schema_cookie;
+      if( !OMIT_TEMPDB && iDb==1 ){
+        sqlite3OpenTempDatabase(pParse);
+      }
+    }
+  }
+}
+
+/*
+** Generate VDBE code that prepares for doing an operation that
+** might change the database.
+**
+** This routine starts a new transaction if we are not already within
+** a transaction.  If we are already within a transaction, then a checkpoint
+** is set if the setStatement parameter is true.  A checkpoint should
+** be set for operations that might fail (due to a constraint) part of
+** the way through and which will need to undo some writes without having to
+** rollback the whole transaction.  For operations where all constraints
+** can be checked before any changes are made to the database, it is never
+** necessary to undo a write and the checkpoint should not be set.
+**
+** Only database iDb and the temp database are made writable by this call.
+** If iDb==0, then the main and temp databases are made writable.   If
+** iDb==1 then only the temp database is made writable.  If iDb>1 then the
+** specified auxiliary database and the temp database are made writable.
+*/
+void sqlite3BeginWriteOperation(Parse *pParse, int setStatement, int iDb){
+  Vdbe *v = sqlite3GetVdbe(pParse);
+  if( v==0 ) return;
+  sqlite3CodeVerifySchema(pParse, iDb);
+  pParse->writeMask |= 1<<iDb;
+  if( setStatement && pParse->nested==0 ){
+    sqlite3VdbeAddOp1(v, OP_Statement, iDb);
+  }
+  if( (OMIT_TEMPDB || iDb!=1) && pParse->db->aDb[1].pBt!=0 ){
+    sqlite3BeginWriteOperation(pParse, setStatement, 1);
+  }
+}
+
+/*
+** Check to see if pIndex uses the collating sequence pColl.  Return
+** true if it does and false if it does not.
+*/
+#ifndef SQLITE_OMIT_REINDEX
+static int collationMatch(const char *zColl, Index *pIndex){
+  int i;
+  for(i=0; i<pIndex->nColumn; i++){
+    const char *z = pIndex->azColl[i];
+    if( z==zColl || (z && zColl && 0==sqlite3StrICmp(z, zColl)) ){
+      return 1;
+    }
+  }
+  return 0;
+}
+#endif
+
+/*
+** Recompute all indices of pTab that use the collating sequence pColl.
+** If pColl==0 then recompute all indices of pTab.
+*/
+#ifndef SQLITE_OMIT_REINDEX
+static void reindexTable(Parse *pParse, Table *pTab, char const *zColl){
+  Index *pIndex;              /* An index associated with pTab */
+
+  for(pIndex=pTab->pIndex; pIndex; pIndex=pIndex->pNext){
+    if( zColl==0 || collationMatch(zColl, pIndex) ){
+      int iDb = sqlite3SchemaToIndex(pParse->db, pTab->pSchema);
+      sqlite3BeginWriteOperation(pParse, 0, iDb);
+      sqlite3RefillIndex(pParse, pIndex, -1);
+    }
+  }
+}
+#endif
+
+/*
+** Recompute all indices of all tables in all databases where the
+** indices use the collating sequence pColl.  If pColl==0 then recompute
+** all indices everywhere.
+*/
+#ifndef SQLITE_OMIT_REINDEX
+static void reindexDatabases(Parse *pParse, char const *zColl){
+  Db *pDb;                    /* A single database */
+  int iDb;                    /* The database index number */
+  sqlite3 *db = pParse->db;   /* The database connection */
+  HashElem *k;                /* For looping over tables in pDb */
+  Table *pTab;                /* A table in the database */
+
+  for(iDb=0, pDb=db->aDb; iDb<db->nDb; iDb++, pDb++){
+    assert( pDb!=0 );
+    for(k=sqliteHashFirst(&pDb->pSchema->tblHash);  k; k=sqliteHashNext(k)){
+      pTab = (Table*)sqliteHashData(k);
+      reindexTable(pParse, pTab, zColl);
+    }
+  }
+}
+#endif
+
+/*
+** Generate code for the REINDEX command.
+**
+**        REINDEX                            -- 1
+**        REINDEX  <collation>               -- 2
+**        REINDEX  ?<database>.?<tablename>  -- 3
+**        REINDEX  ?<database>.?<indexname>  -- 4
+**
+** Form 1 causes all indices in all attached databases to be rebuilt.
+** Form 2 rebuilds all indices in all databases that use the named
+** collating function.  Forms 3 and 4 rebuild the named index or all
+** indices associated with the named table.
+*/
+#ifndef SQLITE_OMIT_REINDEX
+void sqlite3Reindex(Parse *pParse, Token *pName1, Token *pName2){
+  CollSeq *pColl;             /* Collating sequence to be reindexed, or NULL */
+  char *z;                    /* Name of a table or index */
+  const char *zDb;            /* Name of the database */
+  Table *pTab;                /* A table in the database */
+  Index *pIndex;              /* An index associated with pTab */
+  int iDb;                    /* The database index number */
+  sqlite3 *db = pParse->db;   /* The database connection */
+  Token *pObjName;            /* Name of the table or index to be reindexed */
+
+  /* Read the database schema. If an error occurs, leave an error message
+  ** and code in pParse and return NULL. */
+  if( SQLITE_OK!=sqlite3ReadSchema(pParse) ){
+    return;
+  }
+
+  if( pName1==0 || pName1->z==0 ){
+    reindexDatabases(pParse, 0);
+    return;
+  }else if( pName2==0 || pName2->z==0 ){
+    char *zColl;
+    assert( pName1->z );
+    zColl = sqlite3NameFromToken(pParse->db, pName1);
+    if( !zColl ) return;
+    pColl = sqlite3FindCollSeq(db, ENC(db), zColl, -1, 0);
+    if( pColl ){
+      if( zColl ){
+        reindexDatabases(pParse, zColl);
+        sqlite3_free(zColl);
+      }
+      return;
+    }
+    sqlite3_free(zColl);
+  }
+  iDb = sqlite3TwoPartName(pParse, pName1, pName2, &pObjName);
+  if( iDb<0 ) return;
+  z = sqlite3NameFromToken(db, pObjName);
+  if( z==0 ) return;
+  zDb = db->aDb[iDb].zName;
+  pTab = sqlite3FindTable(db, z, zDb);
+  if( pTab ){
+    reindexTable(pParse, pTab, 0);
+    sqlite3_free(z);
+    return;
+  }
+  pIndex = sqlite3FindIndex(db, z, zDb);
+  sqlite3_free(z);
+  if( pIndex ){
+    sqlite3BeginWriteOperation(pParse, 0, iDb);
+    sqlite3RefillIndex(pParse, pIndex, -1);
+    return;
+  }
+  sqlite3ErrorMsg(pParse, "unable to identify the object to be reindexed");
+}
+#endif
+
+/*
+** Return a dynamicly allocated KeyInfo structure that can be used
+** with OP_OpenRead or OP_OpenWrite to access database index pIdx.
+**
+** If successful, a pointer to the new structure is returned. In this case
+** the caller is responsible for calling sqlite3_free() on the returned
+** pointer. If an error occurs (out of memory or missing collation
+** sequence), NULL is returned and the state of pParse updated to reflect
+** the error.
+*/
+KeyInfo *sqlite3IndexKeyinfo(Parse *pParse, Index *pIdx){
+  int i;
+  int nCol = pIdx->nColumn;
+  int nBytes = sizeof(KeyInfo) + (nCol-1)*sizeof(CollSeq*) + nCol;
+  KeyInfo *pKey = (KeyInfo *)sqlite3DbMallocZero(pParse->db, nBytes);
+
+  if( pKey ){
+    pKey->db = pParse->db;
+    pKey->aSortOrder = (u8 *)&(pKey->aColl[nCol]);
+    assert( &pKey->aSortOrder[nCol]==&(((u8 *)pKey)[nBytes]) );
+    for(i=0; i<nCol; i++){
+      char *zColl = pIdx->azColl[i];
+      assert( zColl );
+      pKey->aColl[i] = sqlite3LocateCollSeq(pParse, zColl, -1);
+      pKey->aSortOrder[i] = pIdx->aSortOrder[i];
+    }
+    pKey->nField = nCol;
+  }
+
+  if( pParse->nErr ){
+    sqlite3_free(pKey);
+    pKey = 0;
+  }
+  return pKey;
+}
diff --git a/uppsrc/plugin/sqlite3/lib/callback.c b/uppsrc/plugin/sqlite3/lib/callback.c
new file mode 100644
index 000000000..54885f455
--- /dev/null
+++ b/uppsrc/plugin/sqlite3/lib/callback.c
@@ -0,0 +1,378 @@
+/*
+** 2005 May 23
+**
+** The author disclaims copyright to this source code.  In place of
+** a legal notice, here is a blessing:
+**
+**    May you do good and not evil.
+**    May you find forgiveness for yourself and forgive others.
+**    May you share freely, never taking more than you give.
+**
+*************************************************************************
+**
+** This file contains functions used to access the internal hash tables
+** of user defined functions and collation sequences.
+**
+** $Id: callback.c,v 1.23 2007/08/29 12:31:26 danielk1977 Exp $
+*/
+
+#include "sqliteInt.h"
+
+/*
+** Invoke the 'collation needed' callback to request a collation sequence
+** in the database text encoding of name zName, length nName.
+** If the collation sequence
+*/
+static void callCollNeeded(sqlite3 *db, const char *zName, int nName){
+  assert( !db->xCollNeeded || !db->xCollNeeded16 );
+  if( nName<0 ) nName = strlen(zName);
+  if( db->xCollNeeded ){
+    char *zExternal = sqlite3DbStrNDup(db, zName, nName);
+    if( !zExternal ) return;
+    db->xCollNeeded(db->pCollNeededArg, db, (int)ENC(db), zExternal);
+    sqlite3_free(zExternal);
+  }
+#ifndef SQLITE_OMIT_UTF16
+  if( db->xCollNeeded16 ){
+    char const *zExternal;
+    sqlite3_value *pTmp = sqlite3ValueNew(db);
+    sqlite3ValueSetStr(pTmp, nName, zName, SQLITE_UTF8, SQLITE_STATIC);
+    zExternal = sqlite3ValueText(pTmp, SQLITE_UTF16NATIVE);
+    if( zExternal ){
+      db->xCollNeeded16(db->pCollNeededArg, db, (int)ENC(db), zExternal);
+    }
+    sqlite3ValueFree(pTmp);
+  }
+#endif
+}
+
+/*
+** This routine is called if the collation factory fails to deliver a
+** collation function in the best encoding but there may be other versions
+** of this collation function (for other text encodings) available. Use one
+** of these instead if they exist. Avoid a UTF-8 <-> UTF-16 conversion if
+** possible.
+*/
+static int synthCollSeq(sqlite3 *db, CollSeq *pColl){
+  CollSeq *pColl2;
+  char *z = pColl->zName;
+  int n = strlen(z);
+  int i;
+  static const u8 aEnc[] = { SQLITE_UTF16BE, SQLITE_UTF16LE, SQLITE_UTF8 };
+  for(i=0; i<3; i++){
+    pColl2 = sqlite3FindCollSeq(db, aEnc[i], z, n, 0);
+    if( pColl2->xCmp!=0 ){
+      memcpy(pColl, pColl2, sizeof(CollSeq));
+      pColl->xDel = 0;         /* Do not copy the destructor */
+      return SQLITE_OK;
+    }
+  }
+  return SQLITE_ERROR;
+}
+
+/*
+** This function is responsible for invoking the collation factory callback
+** or substituting a collation sequence of a different encoding when the
+** requested collation sequence is not available in the database native
+** encoding.
+**
+** If it is not NULL, then pColl must point to the database native encoding
+** collation sequence with name zName, length nName.
+**
+** The return value is either the collation sequence to be used in database
+** db for collation type name zName, length nName, or NULL, if no collation
+** sequence can be found.
+*/
+CollSeq *sqlite3GetCollSeq(
+  sqlite3* db,
+  CollSeq *pColl,
+  const char *zName,
+  int nName
+){
+  CollSeq *p;
+
+  p = pColl;
+  if( !p ){
+    p = sqlite3FindCollSeq(db, ENC(db), zName, nName, 0);
+  }
+  if( !p || !p->xCmp ){
+    /* No collation sequence of this type for this encoding is registered.
+    ** Call the collation factory to see if it can supply us with one.
+    */
+    callCollNeeded(db, zName, nName);
+    p = sqlite3FindCollSeq(db, ENC(db), zName, nName, 0);
+  }
+  if( p && !p->xCmp && synthCollSeq(db, p) ){
+    p = 0;
+  }
+  assert( !p || p->xCmp );
+  return p;
+}
+
+/*
+** This routine is called on a collation sequence before it is used to
+** check that it is defined. An undefined collation sequence exists when
+** a database is loaded that contains references to collation sequences
+** that have not been defined by sqlite3_create_collation() etc.
+**
+** If required, this routine calls the 'collation needed' callback to
+** request a definition of the collating sequence. If this doesn't work,
+** an equivalent collating sequence that uses a text encoding different
+** from the main database is substituted, if one is available.
+*/
+int sqlite3CheckCollSeq(Parse *pParse, CollSeq *pColl){
+  if( pColl ){
+    const char *zName = pColl->zName;
+    CollSeq *p = sqlite3GetCollSeq(pParse->db, pColl, zName, -1);
+    if( !p ){
+      if( pParse->nErr==0 ){
+        sqlite3ErrorMsg(pParse, "no such collation sequence: %s", zName);
+      }
+      pParse->nErr++;
+      return SQLITE_ERROR;
+    }
+    assert( p==pColl );
+  }
+  return SQLITE_OK;
+}
+
+
+
+/*
+** Locate and return an entry from the db.aCollSeq hash table. If the entry
+** specified by zName and nName is not found and parameter 'create' is
+** true, then create a new entry. Otherwise return NULL.
+**
+** Each pointer stored in the sqlite3.aCollSeq hash table contains an
+** array of three CollSeq structures. The first is the collation sequence
+** prefferred for UTF-8, the second UTF-16le, and the third UTF-16be.
+**
+** Stored immediately after the three collation sequences is a copy of
+** the collation sequence name. A pointer to this string is stored in
+** each collation sequence structure.
+*/
+static CollSeq *findCollSeqEntry(
+  sqlite3 *db,
+  const char *zName,
+  int nName,
+  int create
+){
+  CollSeq *pColl;
+  if( nName<0 ) nName = strlen(zName);
+  pColl = sqlite3HashFind(&db->aCollSeq, zName, nName);
+
+  if( 0==pColl && create ){
+    pColl = sqlite3DbMallocZero(db, 3*sizeof(*pColl) + nName + 1 );
+    if( pColl ){
+      CollSeq *pDel = 0;
+      pColl[0].zName = (char*)&pColl[3];
+      pColl[0].enc = SQLITE_UTF8;
+      pColl[1].zName = (char*)&pColl[3];
+      pColl[1].enc = SQLITE_UTF16LE;
+      pColl[2].zName = (char*)&pColl[3];
+      pColl[2].enc = SQLITE_UTF16BE;
+      memcpy(pColl[0].zName, zName, nName);
+      pColl[0].zName[nName] = 0;
+      pDel = sqlite3HashInsert(&db->aCollSeq, pColl[0].zName, nName, pColl);
+
+      /* If a malloc() failure occured in sqlite3HashInsert(), it will
+      ** return the pColl pointer to be deleted (because it wasn't added
+      ** to the hash table).
+      */
+      assert( pDel==0 || pDel==pColl );
+      if( pDel!=0 ){
+        db->mallocFailed = 1;
+        sqlite3_free(pDel);
+        pColl = 0;
+      }
+    }
+  }
+  return pColl;
+}
+
+/*
+** Parameter zName points to a UTF-8 encoded string nName bytes long.
+** Return the CollSeq* pointer for the collation sequence named zName
+** for the encoding 'enc' from the database 'db'.
+**
+** If the entry specified is not found and 'create' is true, then create a
+** new entry.  Otherwise return NULL.
+**
+** A separate function sqlite3LocateCollSeq() is a wrapper around
+** this routine.  sqlite3LocateCollSeq() invokes the collation factory
+** if necessary and generates an error message if the collating sequence
+** cannot be found.
+*/
+CollSeq *sqlite3FindCollSeq(
+  sqlite3 *db,
+  u8 enc,
+  const char *zName,
+  int nName,
+  int create
+){
+  CollSeq *pColl;
+  if( zName ){
+    pColl = findCollSeqEntry(db, zName, nName, create);
+  }else{
+    pColl = db->pDfltColl;
+  }
+  assert( SQLITE_UTF8==1 && SQLITE_UTF16LE==2 && SQLITE_UTF16BE==3 );
+  assert( enc>=SQLITE_UTF8 && enc<=SQLITE_UTF16BE );
+  if( pColl ) pColl += enc-1;
+  return pColl;
+}
+
+/*
+** Locate a user function given a name, a number of arguments and a flag
+** indicating whether the function prefers UTF-16 over UTF-8.  Return a
+** pointer to the FuncDef structure that defines that function, or return
+** NULL if the function does not exist.
+**
+** If the createFlag argument is true, then a new (blank) FuncDef
+** structure is created and liked into the "db" structure if a
+** no matching function previously existed.  When createFlag is true
+** and the nArg parameter is -1, then only a function that accepts
+** any number of arguments will be returned.
+**
+** If createFlag is false and nArg is -1, then the first valid
+** function found is returned.  A function is valid if either xFunc
+** or xStep is non-zero.
+**
+** If createFlag is false, then a function with the required name and
+** number of arguments may be returned even if the eTextRep flag does not
+** match that requested.
+*/
+FuncDef *sqlite3FindFunction(
+  sqlite3 *db,       /* An open database */
+  const char *zName, /* Name of the function.  Not null-terminated */
+  int nName,         /* Number of characters in the name */
+  int nArg,          /* Number of arguments.  -1 means any number */
+  u8 enc,            /* Preferred text encoding */
+  int createFlag     /* Create new entry if true and does not otherwise exist */
+){
+  FuncDef *p;         /* Iterator variable */
+  FuncDef *pFirst;    /* First function with this name */
+  FuncDef *pBest = 0; /* Best match found so far */
+  int bestmatch = 0;
+
+
+  assert( enc==SQLITE_UTF8 || enc==SQLITE_UTF16LE || enc==SQLITE_UTF16BE );
+  if( nArg<-1 ) nArg = -1;
+
+  pFirst = (FuncDef*)sqlite3HashFind(&db->aFunc, zName, nName);
+  for(p=pFirst; p; p=p->pNext){
+    /* During the search for the best function definition, bestmatch is set
+    ** as follows to indicate the quality of the match with the definition
+    ** pointed to by pBest:
+    **
+    ** 0: pBest is NULL. No match has been found.
+    ** 1: A variable arguments function that prefers UTF-8 when a UTF-16
+    **    encoding is requested, or vice versa.
+    ** 2: A variable arguments function that uses UTF-16BE when UTF-16LE is
+    **    requested, or vice versa.
+    ** 3: A variable arguments function using the same text encoding.
+    ** 4: A function with the exact number of arguments requested that
+    **    prefers UTF-8 when a UTF-16 encoding is requested, or vice versa.
+    ** 5: A function with the exact number of arguments requested that
+    **    prefers UTF-16LE when UTF-16BE is requested, or vice versa.
+    ** 6: An exact match.
+    **
+    ** A larger value of 'matchqual' indicates a more desirable match.
+    */
+    if( p->nArg==-1 || p->nArg==nArg || nArg==-1 ){
+      int match = 1;          /* Quality of this match */
+      if( p->nArg==nArg || nArg==-1 ){
+        match = 4;
+      }
+      if( enc==p->iPrefEnc ){
+        match += 2;
+      }
+      else if( (enc==SQLITE_UTF16LE && p->iPrefEnc==SQLITE_UTF16BE) ||
+               (enc==SQLITE_UTF16BE && p->iPrefEnc==SQLITE_UTF16LE) ){
+        match += 1;
+      }
+
+      if( match>bestmatch ){
+        pBest = p;
+        bestmatch = match;
+      }
+    }
+  }
+
+  /* If the createFlag parameter is true, and the seach did not reveal an
+  ** exact match for the name, number of arguments and encoding, then add a
+  ** new entry to the hash table and return it.
+  */
+  if( createFlag && bestmatch<6 &&
+      (pBest = sqlite3DbMallocZero(db, sizeof(*pBest)+nName))!=0 ){
+    pBest->nArg = nArg;
+    pBest->pNext = pFirst;
+    pBest->iPrefEnc = enc;
+    memcpy(pBest->zName, zName, nName);
+    pBest->zName[nName] = 0;
+    if( pBest==sqlite3HashInsert(&db->aFunc,pBest->zName,nName,(void*)pBest) ){
+      db->mallocFailed = 1;
+      sqlite3_free(pBest);
+      return 0;
+    }
+  }
+
+  if( pBest && (pBest->xStep || pBest->xFunc || createFlag) ){
+    return pBest;
+  }
+  return 0;
+}
+
+/*
+** Free all resources held by the schema structure. The void* argument points
+** at a Schema struct. This function does not call sqlite3_free() on the
+** pointer itself, it just cleans up subsiduary resources (i.e. the contents
+** of the schema hash tables).
+*/
+void sqlite3SchemaFree(void *p){
+  Hash temp1;
+  Hash temp2;
+  HashElem *pElem;
+  Schema *pSchema = (Schema *)p;
+
+  temp1 = pSchema->tblHash;
+  temp2 = pSchema->trigHash;
+  sqlite3HashInit(&pSchema->trigHash, SQLITE_HASH_STRING, 0);
+  sqlite3HashClear(&pSchema->aFKey);
+  sqlite3HashClear(&pSchema->idxHash);
+  for(pElem=sqliteHashFirst(&temp2); pElem; pElem=sqliteHashNext(pElem)){
+    sqlite3DeleteTrigger((Trigger*)sqliteHashData(pElem));
+  }
+  sqlite3HashClear(&temp2);
+  sqlite3HashInit(&pSchema->tblHash, SQLITE_HASH_STRING, 0);
+  for(pElem=sqliteHashFirst(&temp1); pElem; pElem=sqliteHashNext(pElem)){
+    Table *pTab = sqliteHashData(pElem);
+    sqlite3DeleteTable(pTab);
+  }
+  sqlite3HashClear(&temp1);
+  pSchema->pSeqTab = 0;
+  pSchema->flags &= ~DB_SchemaLoaded;
+}
+
+/*
+** Find and return the schema associated with a BTree.  Create
+** a new one if necessary.
+*/
+Schema *sqlite3SchemaGet(sqlite3 *db, Btree *pBt){
+  Schema * p;
+  if( pBt ){
+    p = (Schema *)sqlite3BtreeSchema(pBt, sizeof(Schema), sqlite3SchemaFree);
+  }else{
+    p = (Schema *)sqlite3MallocZero(sizeof(Schema));
+  }
+  if( !p ){
+    db->mallocFailed = 1;
+  }else if ( 0==p->file_format ){
+    sqlite3HashInit(&p->tblHash, SQLITE_HASH_STRING, 0);
+    sqlite3HashInit(&p->idxHash, SQLITE_HASH_STRING, 0);
+    sqlite3HashInit(&p->trigHash, SQLITE_HASH_STRING, 0);
+    sqlite3HashInit(&p->aFKey, SQLITE_HASH_STRING, 1);
+    p->enc = SQLITE_UTF8;
+  }
+  return p;
+}
diff --git a/uppsrc/plugin/sqlite3/lib/complete.c b/uppsrc/plugin/sqlite3/lib/complete.c
new file mode 100644
index 000000000..086758b6a
--- /dev/null
+++ b/uppsrc/plugin/sqlite3/lib/complete.c
@@ -0,0 +1,271 @@
+/*
+** 2001 September 15
+**
+** The author disclaims copyright to this source code.  In place of
+** a legal notice, here is a blessing:
+**
+**    May you do good and not evil.
+**    May you find forgiveness for yourself and forgive others.
+**    May you share freely, never taking more than you give.
+**
+*************************************************************************
+** An tokenizer for SQL
+**
+** This file contains C code that implements the sqlite3_complete() API.
+** This code used to be part of the tokenizer.c source file.  But by
+** separating it out, the code will be automatically omitted from
+** static links that do not use it.
+**
+** $Id: complete.c,v 1.6 2007/08/27 23:26:59 drh Exp $
+*/
+#include "sqliteInt.h"
+#ifndef SQLITE_OMIT_COMPLETE
+
+/*
+** This is defined in tokenize.c.  We just have to import the definition.
+*/
+#ifndef SQLITE_AMALGAMATION
+#ifdef SQLITE_ASCII
+extern const char sqlite3IsAsciiIdChar[];
+#define IdChar(C)  (((c=C)&0x80)!=0 || (c>0x1f && sqlite3IsAsciiIdChar[c-0x20]))
+#endif
+#ifdef SQLITE_EBCDIC
+extern const char sqlite3IsEbcdicIdChar[];
+#define IdChar(C)  (((c=C)>=0x42 && sqlite3IsEbcdicIdChar[c-0x40]))
+#endif
+#endif /* SQLITE_AMALGAMATION */
+
+
+/*
+** Token types used by the sqlite3_complete() routine.  See the header
+** comments on that procedure for additional information.
+*/
+#define tkSEMI    0
+#define tkWS      1
+#define tkOTHER   2
+#define tkEXPLAIN 3
+#define tkCREATE  4
+#define tkTEMP    5
+#define tkTRIGGER 6
+#define tkEND     7
+
+/*
+** Return TRUE if the given SQL string ends in a semicolon.
+**
+** Special handling is require for CREATE TRIGGER statements.
+** Whenever the CREATE TRIGGER keywords are seen, the statement
+** must end with ";END;".
+**
+** This implementation uses a state machine with 7 states:
+**
+**   (0) START     At the beginning or end of an SQL statement.  This routine
+**                 returns 1 if it ends in the START state and 0 if it ends
+**                 in any other state.
+**
+**   (1) NORMAL    We are in the middle of statement which ends with a single
+**                 semicolon.
+**
+**   (2) EXPLAIN   The keyword EXPLAIN has been seen at the beginning of
+**                 a statement.
+**
+**   (3) CREATE    The keyword CREATE has been seen at the beginning of a
+**                 statement, possibly preceeded by EXPLAIN and/or followed by
+**                 TEMP or TEMPORARY
+**
+**   (4) TRIGGER   We are in the middle of a trigger definition that must be
+**                 ended by a semicolon, the keyword END, and another semicolon.
+**
+**   (5) SEMI      We've seen the first semicolon in the ";END;" that occurs at
+**                 the end of a trigger definition.
+**
+**   (6) END       We've seen the ";END" of the ";END;" that occurs at the end
+**                 of a trigger difinition.
+**
+** Transitions between states above are determined by tokens extracted
+** from the input.  The following tokens are significant:
+**
+**   (0) tkSEMI      A semicolon.
+**   (1) tkWS        Whitespace
+**   (2) tkOTHER     Any other SQL token.
+**   (3) tkEXPLAIN   The "explain" keyword.
+**   (4) tkCREATE    The "create" keyword.
+**   (5) tkTEMP      The "temp" or "temporary" keyword.
+**   (6) tkTRIGGER   The "trigger" keyword.
+**   (7) tkEND       The "end" keyword.
+**
+** Whitespace never causes a state transition and is always ignored.
+**
+** If we compile with SQLITE_OMIT_TRIGGER, all of the computation needed
+** to recognize the end of a trigger can be omitted.  All we have to do
+** is look for a semicolon that is not part of an string or comment.
+*/
+int sqlite3_complete(const char *zSql){
+  u8 state = 0;   /* Current state, using numbers defined in header comment */
+  u8 token;       /* Value of the next token */
+
+#ifndef SQLITE_OMIT_TRIGGER
+  /* A complex statement machine used to detect the end of a CREATE TRIGGER
+  ** statement.  This is the normal case.
+  */
+  static const u8 trans[7][8] = {
+                     /* Token:                                                */
+     /* State:       **  SEMI  WS  OTHER EXPLAIN  CREATE  TEMP  TRIGGER  END  */
+     /* 0   START: */ {    0,  0,     1,      2,      3,    1,       1,   1,  },
+     /* 1  NORMAL: */ {    0,  1,     1,      1,      1,    1,       1,   1,  },
+     /* 2 EXPLAIN: */ {    0,  2,     1,      1,      3,    1,       1,   1,  },
+     /* 3  CREATE: */ {    0,  3,     1,      1,      1,    3,       4,   1,  },
+     /* 4 TRIGGER: */ {    5,  4,     4,      4,      4,    4,       4,   4,  },
+     /* 5    SEMI: */ {    5,  5,     4,      4,      4,    4,       4,   6,  },
+     /* 6     END: */ {    0,  6,     4,      4,      4,    4,       4,   4,  },
+  };
+#else
+  /* If triggers are not suppored by this compile then the statement machine
+  ** used to detect the end of a statement is much simplier
+  */
+  static const u8 trans[2][3] = {
+                     /* Token:           */
+     /* State:       **  SEMI  WS  OTHER */
+     /* 0   START: */ {    0,  0,     1, },
+     /* 1  NORMAL: */ {    0,  1,     1, },
+  };
+#endif /* SQLITE_OMIT_TRIGGER */
+
+  while( *zSql ){
+    switch( *zSql ){
+      case ';': {  /* A semicolon */
+        token = tkSEMI;
+        break;
+      }
+      case ' ':
+      case '\r':
+      case '\t':
+      case '\n':
+      case '\f': {  /* White space is ignored */
+        token = tkWS;
+        break;
+      }
+      case '/': {   /* C-style comments */
+        if( zSql[1]!='*' ){
+          token = tkOTHER;
+          break;
+        }
+        zSql += 2;
+        while( zSql[0] && (zSql[0]!='*' || zSql[1]!='/') ){ zSql++; }
+        if( zSql[0]==0 ) return 0;
+        zSql++;
+        token = tkWS;
+        break;
+      }
+      case '-': {   /* SQL-style comments from "--" to end of line */
+        if( zSql[1]!='-' ){
+          token = tkOTHER;
+          break;
+        }
+        while( *zSql && *zSql!='\n' ){ zSql++; }
+        if( *zSql==0 ) return state==0;
+        token = tkWS;
+        break;
+      }
+      case '[': {   /* Microsoft-style identifiers in [...] */
+        zSql++;
+        while( *zSql && *zSql!=']' ){ zSql++; }
+        if( *zSql==0 ) return 0;
+        token = tkOTHER;
+        break;
+      }
+      case '`':     /* Grave-accent quoted symbols used by MySQL */
+      case '"':     /* single- and double-quoted strings */
+      case '\'': {
+        int c = *zSql;
+        zSql++;
+        while( *zSql && *zSql!=c ){ zSql++; }
+        if( *zSql==0 ) return 0;
+        token = tkOTHER;
+        break;
+      }
+      default: {
+        int c;
+        if( IdChar((u8)*zSql) ){
+          /* Keywords and unquoted identifiers */
+          int nId;
+          for(nId=1; IdChar(zSql[nId]); nId++){}
+#ifdef SQLITE_OMIT_TRIGGER
+          token = tkOTHER;
+#else
+          switch( *zSql ){
+            case 'c': case 'C': {
+              if( nId==6 && sqlite3StrNICmp(zSql, "create", 6)==0 ){
+                token = tkCREATE;
+              }else{
+                token = tkOTHER;
+              }
+              break;
+            }
+            case 't': case 'T': {
+              if( nId==7 && sqlite3StrNICmp(zSql, "trigger", 7)==0 ){
+                token = tkTRIGGER;
+              }else if( nId==4 && sqlite3StrNICmp(zSql, "temp", 4)==0 ){
+                token = tkTEMP;
+              }else if( nId==9 && sqlite3StrNICmp(zSql, "temporary", 9)==0 ){
+                token = tkTEMP;
+              }else{
+                token = tkOTHER;
+              }
+              break;
+            }
+            case 'e':  case 'E': {
+              if( nId==3 && sqlite3StrNICmp(zSql, "end", 3)==0 ){
+                token = tkEND;
+              }else
+#ifndef SQLITE_OMIT_EXPLAIN
+              if( nId==7 && sqlite3StrNICmp(zSql, "explain", 7)==0 ){
+                token = tkEXPLAIN;
+              }else
+#endif
+              {
+                token = tkOTHER;
+              }
+              break;
+            }
+            default: {
+              token = tkOTHER;
+              break;
+            }
+          }
+#endif /* SQLITE_OMIT_TRIGGER */
+          zSql += nId-1;
+        }else{
+          /* Operators and special symbols */
+          token = tkOTHER;
+        }
+        break;
+      }
+    }
+    state = trans[state][token];
+    zSql++;
+  }
+  return state==0;
+}
+
+#ifndef SQLITE_OMIT_UTF16
+/*
+** This routine is the same as the sqlite3_complete() routine described
+** above, except that the parameter is required to be UTF-16 encoded, not
+** UTF-8.
+*/
+int sqlite3_complete16(const void *zSql){
+  sqlite3_value *pVal;
+  char const *zSql8;
+  int rc = SQLITE_NOMEM;
+
+  pVal = sqlite3ValueNew(0);
+  sqlite3ValueSetStr(pVal, -1, zSql, SQLITE_UTF16NATIVE, SQLITE_STATIC);
+  zSql8 = sqlite3ValueText(pVal, SQLITE_UTF8);
+  if( zSql8 ){
+    rc = sqlite3_complete(zSql8);
+  }
+  sqlite3ValueFree(pVal);
+  return sqlite3ApiExit(0, rc);
+}
+#endif /* SQLITE_OMIT_UTF16 */
+#endif /* SQLITE_OMIT_COMPLETE */
diff --git a/uppsrc/plugin/sqlite3/lib/config.h b/uppsrc/plugin/sqlite3/lib/config.h
new file mode 100644
index 000000000..2b124aa2b
--- /dev/null
+++ b/uppsrc/plugin/sqlite3/lib/config.h
@@ -0,0 +1,21 @@
+/*
+** 2008 March 6
+**
+** The author disclaims copyright to this source code.  In place of
+** a legal notice, here is a blessing:
+**
+**    May you do good and not evil.
+**    May you find forgiveness for yourself and forgive others.
+**    May you share freely, never taking more than you give.
+**
+*************************************************************************
+** Default configuration header in case the 'configure' script is not used
+**
+** @(#) $Id: config.h,v 1.1 2008/03/06 07:36:18 mlcreech Exp $
+*/
+#ifndef _CONFIG_H_
+#define _CONFIG_H_
+
+/* We do nothing here, since no assumptions are made by default */
+
+#endif
diff --git a/uppsrc/plugin/sqlite3/lib/date.c b/uppsrc/plugin/sqlite3/lib/date.c
new file mode 100644
index 000000000..78c3c4ed6
--- /dev/null
+++ b/uppsrc/plugin/sqlite3/lib/date.c
@@ -0,0 +1,1048 @@
+/*
+** 2003 October 31
+**
+** The author disclaims copyright to this source code.  In place of
+** a legal notice, here is a blessing:
+**
+**    May you do good and not evil.
+**    May you find forgiveness for yourself and forgive others.
+**    May you share freely, never taking more than you give.
+**
+*************************************************************************
+** This file contains the C functions that implement date and time
+** functions for SQLite.
+**
+** There is only one exported symbol in this file - the function
+** sqlite3RegisterDateTimeFunctions() found at the bottom of the file.
+** All other code has file scope.
+**
+** $Id: date.c,v 1.76 2008/02/21 20:40:44 drh Exp $
+**
+** SQLite processes all times and dates as Julian Day numbers.  The
+** dates and times are stored as the number of days since noon
+** in Greenwich on November 24, 4714 B.C. according to the Gregorian
+** calendar system.
+**
+** 1970-01-01 00:00:00 is JD 2440587.5
+** 2000-01-01 00:00:00 is JD 2451544.5
+**
+** This implemention requires years to be expressed as a 4-digit number
+** which means that only dates between 0000-01-01 and 9999-12-31 can
+** be represented, even though julian day numbers allow a much wider
+** range of dates.
+**
+** The Gregorian calendar system is used for all dates and times,
+** even those that predate the Gregorian calendar.  Historians usually
+** use the Julian calendar for dates prior to 1582-10-15 and for some
+** dates afterwards, depending on locale.  Beware of this difference.
+**
+** The conversion algorithms are implemented based on descriptions
+** in the following text:
+**
+**      Jean Meeus
+**      Astronomical Algorithms, 2nd Edition, 1998
+**      ISBM 0-943396-61-1
+**      Willmann-Bell, Inc
+**      Richmond, Virginia (USA)
+*/
+#include "sqliteInt.h"
+#include <ctype.h>
+#include <stdlib.h>
+#include <assert.h>
+#include <time.h>
+
+#ifndef SQLITE_OMIT_DATETIME_FUNCS
+
+/*
+** A structure for holding a single date and time.
+*/
+typedef struct DateTime DateTime;
+struct DateTime {
+  double rJD;      /* The julian day number */
+  int Y, M, D;     /* Year, month, and day */
+  int h, m;        /* Hour and minutes */
+  int tz;          /* Timezone offset in minutes */
+  double s;        /* Seconds */
+  char validYMD;   /* True if Y,M,D are valid */
+  char validHMS;   /* True if h,m,s are valid */
+  char validJD;    /* True if rJD is valid */
+  char validTZ;    /* True if tz is valid */
+};
+
+
+/*
+** Convert zDate into one or more integers.  Additional arguments
+** come in groups of 5 as follows:
+**
+**       N       number of digits in the integer
+**       min     minimum allowed value of the integer
+**       max     maximum allowed value of the integer
+**       nextC   first character after the integer
+**       pVal    where to write the integers value.
+**
+** Conversions continue until one with nextC==0 is encountered.
+** The function returns the number of successful conversions.
+*/
+static int getDigits(const char *zDate, ...){
+  va_list ap;
+  int val;
+  int N;
+  int min;
+  int max;
+  int nextC;
+  int *pVal;
+  int cnt = 0;
+  va_start(ap, zDate);
+  do{
+    N = va_arg(ap, int);
+    min = va_arg(ap, int);
+    max = va_arg(ap, int);
+    nextC = va_arg(ap, int);
+    pVal = va_arg(ap, int*);
+    val = 0;
+    while( N-- ){
+      if( !isdigit(*(u8*)zDate) ){
+        goto end_getDigits;
+      }
+      val = val*10 + *zDate - '0';
+      zDate++;
+    }
+    if( val<min || val>max || (nextC!=0 && nextC!=*zDate) ){
+      goto end_getDigits;
+    }
+    *pVal = val;
+    zDate++;
+    cnt++;
+  }while( nextC );
+end_getDigits:
+  va_end(ap);
+  return cnt;
+}
+
+/*
+** Read text from z[] and convert into a floating point number.  Return
+** the number of digits converted.
+*/
+#define getValue sqlite3AtoF
+
+/*
+** Parse a timezone extension on the end of a date-time.
+** The extension is of the form:
+**
+**        (+/-)HH:MM
+**
+** Or the "zulu" notation:
+**
+**        Z
+**
+** If the parse is successful, write the number of minutes
+** of change in p->tz and return 0.  If a parser error occurs,
+** return non-zero.
+**
+** A missing specifier is not considered an error.
+*/
+static int parseTimezone(const char *zDate, DateTime *p){
+  int sgn = 0;
+  int nHr, nMn;
+  int c;
+  while( isspace(*(u8*)zDate) ){ zDate++; }
+  p->tz = 0;
+  c = *zDate;
+  if( c=='-' ){
+    sgn = -1;
+  }else if( c=='+' ){
+    sgn = +1;
+  }else if( c=='Z' || c=='z' ){
+    zDate++;
+    goto zulu_time;
+  }else{
+    return c!=0;
+  }
+  zDate++;
+  if( getDigits(zDate, 2, 0, 14, ':', &nHr, 2, 0, 59, 0, &nMn)!=2 ){
+    return 1;
+  }
+  zDate += 5;
+  p->tz = sgn*(nMn + nHr*60);
+zulu_time:
+  while( isspace(*(u8*)zDate) ){ zDate++; }
+  return *zDate!=0;
+}
+
+/*
+** Parse times of the form HH:MM or HH:MM:SS or HH:MM:SS.FFFF.
+** The HH, MM, and SS must each be exactly 2 digits.  The
+** fractional seconds FFFF can be one or more digits.
+**
+** Return 1 if there is a parsing error and 0 on success.
+*/
+static int parseHhMmSs(const char *zDate, DateTime *p){
+  int h, m, s;
+  double ms = 0.0;
+  if( getDigits(zDate, 2, 0, 24, ':', &h, 2, 0, 59, 0, &m)!=2 ){
+    return 1;
+  }
+  zDate += 5;
+  if( *zDate==':' ){
+    zDate++;
+    if( getDigits(zDate, 2, 0, 59, 0, &s)!=1 ){
+      return 1;
+    }
+    zDate += 2;
+    if( *zDate=='.' && isdigit((u8)zDate[1]) ){
+      double rScale = 1.0;
+      zDate++;
+      while( isdigit(*(u8*)zDate) ){
+        ms = ms*10.0 + *zDate - '0';
+        rScale *= 10.0;
+        zDate++;
+      }
+      ms /= rScale;
+    }
+  }else{
+    s = 0;
+  }
+  p->validJD = 0;
+  p->validHMS = 1;
+  p->h = h;
+  p->m = m;
+  p->s = s + ms;
+  if( parseTimezone(zDate, p) ) return 1;
+  p->validTZ = p->tz!=0;
+  return 0;
+}
+
+/*
+** Convert from YYYY-MM-DD HH:MM:SS to julian day.  We always assume
+** that the YYYY-MM-DD is according to the Gregorian calendar.
+**
+** Reference:  Meeus page 61
+*/
+static void computeJD(DateTime *p){
+  int Y, M, D, A, B, X1, X2;
+
+  if( p->validJD ) return;
+  if( p->validYMD ){
+    Y = p->Y;
+    M = p->M;
+    D = p->D;
+  }else{
+    Y = 2000;  /* If no YMD specified, assume 2000-Jan-01 */
+    M = 1;
+    D = 1;
+  }
+  if( M<=2 ){
+    Y--;
+    M += 12;
+  }
+  A = Y/100;
+  B = 2 - A + (A/4);
+  X1 = 365.25*(Y+4716);
+  X2 = 30.6001*(M+1);
+  p->rJD = X1 + X2 + D + B - 1524.5;
+  p->validJD = 1;
+  if( p->validHMS ){
+    p->rJD += (p->h*3600.0 + p->m*60.0 + p->s)/86400.0;
+    if( p->validTZ ){
+      p->rJD -= p->tz*60/86400.0;
+      p->validYMD = 0;
+      p->validHMS = 0;
+      p->validTZ = 0;
+    }
+  }
+}
+
+/*
+** Parse dates of the form
+**
+**     YYYY-MM-DD HH:MM:SS.FFF
+**     YYYY-MM-DD HH:MM:SS
+**     YYYY-MM-DD HH:MM
+**     YYYY-MM-DD
+**
+** Write the result into the DateTime structure and return 0
+** on success and 1 if the input string is not a well-formed
+** date.
+*/
+static int parseYyyyMmDd(const char *zDate, DateTime *p){
+  int Y, M, D, neg;
+
+  if( zDate[0]=='-' ){
+    zDate++;
+    neg = 1;
+  }else{
+    neg = 0;
+  }
+  if( getDigits(zDate,4,0,9999,'-',&Y,2,1,12,'-',&M,2,1,31,0,&D)!=3 ){
+    return 1;
+  }
+  zDate += 10;
+  while( isspace(*(u8*)zDate) || 'T'==*(u8*)zDate ){ zDate++; }
+  if( parseHhMmSs(zDate, p)==0 ){
+    /* We got the time */
+  }else if( *zDate==0 ){
+    p->validHMS = 0;
+  }else{
+    return 1;
+  }
+  p->validJD = 0;
+  p->validYMD = 1;
+  p->Y = neg ? -Y : Y;
+  p->M = M;
+  p->D = D;
+  if( p->validTZ ){
+    computeJD(p);
+  }
+  return 0;
+}
+
+/*
+** Attempt to parse the given string into a Julian Day Number.  Return
+** the number of errors.
+**
+** The following are acceptable forms for the input string:
+**
+**      YYYY-MM-DD HH:MM:SS.FFF  +/-HH:MM
+**      DDDD.DD
+**      now
+**
+** In the first form, the +/-HH:MM is always optional.  The fractional
+** seconds extension (the ".FFF") is optional.  The seconds portion
+** (":SS.FFF") is option.  The year and date can be omitted as long
+** as there is a time string.  The time string can be omitted as long
+** as there is a year and date.
+*/
+static int parseDateOrTime(
+  sqlite3_context *context,
+  const char *zDate,
+  DateTime *p
+){
+  memset(p, 0, sizeof(*p));
+  if( parseYyyyMmDd(zDate,p)==0 ){
+    return 0;
+  }else if( parseHhMmSs(zDate, p)==0 ){
+    return 0;
+  }else if( sqlite3StrICmp(zDate,"now")==0){
+    double r;
+    sqlite3OsCurrentTime((sqlite3_vfs *)sqlite3_user_data(context), &r);
+    p->rJD = r;
+    p->validJD = 1;
+    return 0;
+  }else if( sqlite3IsNumber(zDate, 0, SQLITE_UTF8) ){
+    getValue(zDate, &p->rJD);
+    p->validJD = 1;
+    return 0;
+  }
+  return 1;
+}
+
+/*
+** Compute the Year, Month, and Day from the julian day number.
+*/
+static void computeYMD(DateTime *p){
+  int Z, A, B, C, D, E, X1;
+  if( p->validYMD ) return;
+  if( !p->validJD ){
+    p->Y = 2000;
+    p->M = 1;
+    p->D = 1;
+  }else{
+    Z = p->rJD + 0.5;
+    A = (Z - 1867216.25)/36524.25;
+    A = Z + 1 + A - (A/4);
+    B = A + 1524;
+    C = (B - 122.1)/365.25;
+    D = 365.25*C;
+    E = (B-D)/30.6001;
+    X1 = 30.6001*E;
+    p->D = B - D - X1;
+    p->M = E<14 ? E-1 : E-13;
+    p->Y = p->M>2 ? C - 4716 : C - 4715;
+  }
+  p->validYMD = 1;
+}
+
+/*
+** Compute the Hour, Minute, and Seconds from the julian day number.
+*/
+static void computeHMS(DateTime *p){
+  int Z, s;
+  if( p->validHMS ) return;
+  computeJD(p);
+  Z = p->rJD + 0.5;
+  s = (p->rJD + 0.5 - Z)*86400000.0 + 0.5;
+  p->s = 0.001*s;
+  s = p->s;
+  p->s -= s;
+  p->h = s/3600;
+  s -= p->h*3600;
+  p->m = s/60;
+  p->s += s - p->m*60;
+  p->validHMS = 1;
+}
+
+/*
+** Compute both YMD and HMS
+*/
+static void computeYMD_HMS(DateTime *p){
+  computeYMD(p);
+  computeHMS(p);
+}
+
+/*
+** Clear the YMD and HMS and the TZ
+*/
+static void clearYMD_HMS_TZ(DateTime *p){
+  p->validYMD = 0;
+  p->validHMS = 0;
+  p->validTZ = 0;
+}
+
+/*
+** Compute the difference (in days) between localtime and UTC (a.k.a. GMT)
+** for the time value p where p is in UTC.
+*/
+static double localtimeOffset(DateTime *p){
+  DateTime x, y;
+  time_t t;
+  x = *p;
+  computeYMD_HMS(&x);
+  if( x.Y<1971 || x.Y>=2038 ){
+    x.Y = 2000;
+    x.M = 1;
+    x.D = 1;
+    x.h = 0;
+    x.m = 0;
+    x.s = 0.0;
+  } else {
+    int s = x.s + 0.5;
+    x.s = s;
+  }
+  x.tz = 0;
+  x.validJD = 0;
+  computeJD(&x);
+  t = (x.rJD-2440587.5)*86400.0 + 0.5;
+#ifdef HAVE_LOCALTIME_R
+  {
+    struct tm sLocal;
+    localtime_r(&t, &sLocal);
+    y.Y = sLocal.tm_year + 1900;
+    y.M = sLocal.tm_mon + 1;
+    y.D = sLocal.tm_mday;
+    y.h = sLocal.tm_hour;
+    y.m = sLocal.tm_min;
+    y.s = sLocal.tm_sec;
+  }
+#else
+  {
+    struct tm *pTm;
+    sqlite3_mutex_enter(sqlite3_mutex_alloc(SQLITE_MUTEX_STATIC_MASTER));
+    pTm = localtime(&t);
+    y.Y = pTm->tm_year + 1900;
+    y.M = pTm->tm_mon + 1;
+    y.D = pTm->tm_mday;
+    y.h = pTm->tm_hour;
+    y.m = pTm->tm_min;
+    y.s = pTm->tm_sec;
+    sqlite3_mutex_leave(sqlite3_mutex_alloc(SQLITE_MUTEX_STATIC_MASTER));
+  }
+#endif
+  y.validYMD = 1;
+  y.validHMS = 1;
+  y.validJD = 0;
+  y.validTZ = 0;
+  computeJD(&y);
+  return y.rJD - x.rJD;
+}
+
+/*
+** Process a modifier to a date-time stamp.  The modifiers are
+** as follows:
+**
+**     NNN days
+**     NNN hours
+**     NNN minutes
+**     NNN.NNNN seconds
+**     NNN months
+**     NNN years
+**     start of month
+**     start of year
+**     start of week
+**     start of day
+**     weekday N
+**     unixepoch
+**     localtime
+**     utc
+**
+** Return 0 on success and 1 if there is any kind of error.
+*/
+static int parseModifier(const char *zMod, DateTime *p){
+  int rc = 1;
+  int n;
+  double r;
+  char *z, zBuf[30];
+  z = zBuf;
+  for(n=0; n<sizeof(zBuf)-1 && zMod[n]; n++){
+    z[n] = tolower(zMod[n]);
+  }
+  z[n] = 0;
+  switch( z[0] ){
+    case 'l': {
+      /*    localtime
+      **
+      ** Assuming the current time value is UTC (a.k.a. GMT), shift it to
+      ** show local time.
+      */
+      if( strcmp(z, "localtime")==0 ){
+        computeJD(p);
+        p->rJD += localtimeOffset(p);
+        clearYMD_HMS_TZ(p);
+        rc = 0;
+      }
+      break;
+    }
+    case 'u': {
+      /*
+      **    unixepoch
+      **
+      ** Treat the current value of p->rJD as the number of
+      ** seconds since 1970.  Convert to a real julian day number.
+      */
+      if( strcmp(z, "unixepoch")==0 && p->validJD ){
+        p->rJD = p->rJD/86400.0 + 2440587.5;
+        clearYMD_HMS_TZ(p);
+        rc = 0;
+      }else if( strcmp(z, "utc")==0 ){
+        double c1;
+        computeJD(p);
+        c1 = localtimeOffset(p);
+        p->rJD -= c1;
+        clearYMD_HMS_TZ(p);
+        p->rJD += c1 - localtimeOffset(p);
+        rc = 0;
+      }
+      break;
+    }
+    case 'w': {
+      /*
+      **    weekday N
+      **
+      ** Move the date to the same time on the next occurrence of
+      ** weekday N where 0==Sunday, 1==Monday, and so forth.  If the
+      ** date is already on the appropriate weekday, this is a no-op.
+      */
+      if( strncmp(z, "weekday ", 8)==0 && getValue(&z[8],&r)>0
+                 && (n=r)==r && n>=0 && r<7 ){
+        int Z;
+        computeYMD_HMS(p);
+        p->validTZ = 0;
+        p->validJD = 0;
+        computeJD(p);
+        Z = p->rJD + 1.5;
+        Z %= 7;
+        if( Z>n ) Z -= 7;
+        p->rJD += n - Z;
+        clearYMD_HMS_TZ(p);
+        rc = 0;
+      }
+      break;
+    }
+    case 's': {
+      /*
+      **    start of TTTTT
+      **
+      ** Move the date backwards to the beginning of the current day,
+      ** or month or year.
+      */
+      if( strncmp(z, "start of ", 9)!=0 ) break;
+      z += 9;
+      computeYMD(p);
+      p->validHMS = 1;
+      p->h = p->m = 0;
+      p->s = 0.0;
+      p->validTZ = 0;
+      p->validJD = 0;
+      if( strcmp(z,"month")==0 ){
+        p->D = 1;
+        rc = 0;
+      }else if( strcmp(z,"year")==0 ){
+        computeYMD(p);
+        p->M = 1;
+        p->D = 1;
+        rc = 0;
+      }else if( strcmp(z,"day")==0 ){
+        rc = 0;
+      }
+      break;
+    }
+    case '+':
+    case '-':
+    case '0':
+    case '1':
+    case '2':
+    case '3':
+    case '4':
+    case '5':
+    case '6':
+    case '7':
+    case '8':
+    case '9': {
+      n = getValue(z, &r);
+      assert( n>=1 );
+      if( z[n]==':' ){
+        /* A modifier of the form (+|-)HH:MM:SS.FFF adds (or subtracts) the
+        ** specified number of hours, minutes, seconds, and fractional seconds
+        ** to the time.  The ".FFF" may be omitted.  The ":SS.FFF" may be
+        ** omitted.
+        */
+        const char *z2 = z;
+        DateTime tx;
+        int day;
+        if( !isdigit(*(u8*)z2) ) z2++;
+        memset(&tx, 0, sizeof(tx));
+        if( parseHhMmSs(z2, &tx) ) break;
+        computeJD(&tx);
+        tx.rJD -= 0.5;
+        day = (int)tx.rJD;
+        tx.rJD -= day;
+        if( z[0]=='-' ) tx.rJD = -tx.rJD;
+        computeJD(p);
+        clearYMD_HMS_TZ(p);
+        p->rJD += tx.rJD;
+        rc = 0;
+        break;
+      }
+      z += n;
+      while( isspace(*(u8*)z) ) z++;
+      n = strlen(z);
+      if( n>10 || n<3 ) break;
+      if( z[n-1]=='s' ){ z[n-1] = 0; n--; }
+      computeJD(p);
+      rc = 0;
+      if( n==3 && strcmp(z,"day")==0 ){
+        p->rJD += r;
+      }else if( n==4 && strcmp(z,"hour")==0 ){
+        p->rJD += r/24.0;
+      }else if( n==6 && strcmp(z,"minute")==0 ){
+        p->rJD += r/(24.0*60.0);
+      }else if( n==6 && strcmp(z,"second")==0 ){
+        p->rJD += r/(24.0*60.0*60.0);
+      }else if( n==5 && strcmp(z,"month")==0 ){
+        int x, y;
+        computeYMD_HMS(p);
+        p->M += r;
+        x = p->M>0 ? (p->M-1)/12 : (p->M-12)/12;
+        p->Y += x;
+        p->M -= x*12;
+        p->validJD = 0;
+        computeJD(p);
+        y = r;
+        if( y!=r ){
+          p->rJD += (r - y)*30.0;
+        }
+      }else if( n==4 && strcmp(z,"year")==0 ){
+        computeYMD_HMS(p);
+        p->Y += r;
+        p->validJD = 0;
+        computeJD(p);
+      }else{
+        rc = 1;
+      }
+      clearYMD_HMS_TZ(p);
+      break;
+    }
+    default: {
+      break;
+    }
+  }
+  return rc;
+}
+
+/*
+** Process time function arguments.  argv[0] is a date-time stamp.
+** argv[1] and following are modifiers.  Parse them all and write
+** the resulting time into the DateTime structure p.  Return 0
+** on success and 1 if there are any errors.
+**
+** If there are zero parameters (if even argv[0] is undefined)
+** then assume a default value of "now" for argv[0].
+*/
+static int isDate(
+  sqlite3_context *context,
+  int argc,
+  sqlite3_value **argv,
+  DateTime *p
+){
+  int i;
+  const unsigned char *z;
+  static const unsigned char zDflt[] = "now";
+  if( argc==0 ){
+    z = zDflt;
+  }else{
+    z = sqlite3_value_text(argv[0]);
+  }
+  if( !z || parseDateOrTime(context, (char*)z, p) ){
+    return 1;
+  }
+  for(i=1; i<argc; i++){
+    if( (z = sqlite3_value_text(argv[i]))==0 || parseModifier((char*)z, p) ){
+      return 1;
+    }
+  }
+  return 0;
+}
+
+
+/*
+** The following routines implement the various date and time functions
+** of SQLite.
+*/
+
+/*
+**    julianday( TIMESTRING, MOD, MOD, ...)
+**
+** Return the julian day number of the date specified in the arguments
+*/
+static void juliandayFunc(
+  sqlite3_context *context,
+  int argc,
+  sqlite3_value **argv
+){
+  DateTime x;
+  if( isDate(context, argc, argv, &x)==0 ){
+    computeJD(&x);
+    sqlite3_result_double(context, x.rJD);
+  }
+}
+
+/*
+**    datetime( TIMESTRING, MOD, MOD, ...)
+**
+** Return YYYY-MM-DD HH:MM:SS
+*/
+static void datetimeFunc(
+  sqlite3_context *context,
+  int argc,
+  sqlite3_value **argv
+){
+  DateTime x;
+  if( isDate(context, argc, argv, &x)==0 ){
+    char zBuf[100];
+    computeYMD_HMS(&x);
+    sqlite3_snprintf(sizeof(zBuf), zBuf, "%04d-%02d-%02d %02d:%02d:%02d",
+                     x.Y, x.M, x.D, x.h, x.m, (int)(x.s));
+    sqlite3_result_text(context, zBuf, -1, SQLITE_TRANSIENT);
+  }
+}
+
+/*
+**    time( TIMESTRING, MOD, MOD, ...)
+**
+** Return HH:MM:SS
+*/
+static void timeFunc(
+  sqlite3_context *context,
+  int argc,
+  sqlite3_value **argv
+){
+  DateTime x;
+  if( isDate(context, argc, argv, &x)==0 ){
+    char zBuf[100];
+    computeHMS(&x);
+    sqlite3_snprintf(sizeof(zBuf), zBuf, "%02d:%02d:%02d", x.h, x.m, (int)x.s);
+    sqlite3_result_text(context, zBuf, -1, SQLITE_TRANSIENT);
+  }
+}
+
+/*
+**    date( TIMESTRING, MOD, MOD, ...)
+**
+** Return YYYY-MM-DD
+*/
+static void dateFunc(
+  sqlite3_context *context,
+  int argc,
+  sqlite3_value **argv
+){
+  DateTime x;
+  if( isDate(context, argc, argv, &x)==0 ){
+    char zBuf[100];
+    computeYMD(&x);
+    sqlite3_snprintf(sizeof(zBuf), zBuf, "%04d-%02d-%02d", x.Y, x.M, x.D);
+    sqlite3_result_text(context, zBuf, -1, SQLITE_TRANSIENT);
+  }
+}
+
+/*
+**    strftime( FORMAT, TIMESTRING, MOD, MOD, ...)
+**
+** Return a string described by FORMAT.  Conversions as follows:
+**
+**   %d  day of month
+**   %f  ** fractional seconds  SS.SSS
+**   %H  hour 00-24
+**   %j  day of year 000-366
+**   %J  ** Julian day number
+**   %m  month 01-12
+**   %M  minute 00-59
+**   %s  seconds since 1970-01-01
+**   %S  seconds 00-59
+**   %w  day of week 0-6  sunday==0
+**   %W  week of year 00-53
+**   %Y  year 0000-9999
+**   %%  %
+*/
+static void strftimeFunc(
+  sqlite3_context *context,
+  int argc,
+  sqlite3_value **argv
+){
+  DateTime x;
+  u64 n;
+  int i, j;
+  char *z;
+  const char *zFmt = (const char*)sqlite3_value_text(argv[0]);
+  char zBuf[100];
+  if( zFmt==0 || isDate(context, argc-1, argv+1, &x) ) return;
+  for(i=0, n=1; zFmt[i]; i++, n++){
+    if( zFmt[i]=='%' ){
+      switch( zFmt[i+1] ){
+        case 'd':
+        case 'H':
+        case 'm':
+        case 'M':
+        case 'S':
+        case 'W':
+          n++;
+          /* fall thru */
+        case 'w':
+        case '%':
+          break;
+        case 'f':
+          n += 8;
+          break;
+        case 'j':
+          n += 3;
+          break;
+        case 'Y':
+          n += 8;
+          break;
+        case 's':
+        case 'J':
+          n += 50;
+          break;
+        default:
+          return;  /* ERROR.  return a NULL */
+      }
+      i++;
+    }
+  }
+  if( n<sizeof(zBuf) ){
+    z = zBuf;
+  }else if( n>SQLITE_MAX_LENGTH ){
+    sqlite3_result_error_toobig(context);
+    return;
+  }else{
+    z = sqlite3_malloc( n );
+    if( z==0 ){
+      sqlite3_result_error_nomem(context);
+      return;
+    }
+  }
+  computeJD(&x);
+  computeYMD_HMS(&x);
+  for(i=j=0; zFmt[i]; i++){
+    if( zFmt[i]!='%' ){
+      z[j++] = zFmt[i];
+    }else{
+      i++;
+      switch( zFmt[i] ){
+        case 'd':  sqlite3_snprintf(3, &z[j],"%02d",x.D); j+=2; break;
+        case 'f': {
+          double s = x.s;
+          if( s>59.999 ) s = 59.999;
+          sqlite3_snprintf(7, &z[j],"%06.3f", s);
+          j += strlen(&z[j]);
+          break;
+        }
+        case 'H':  sqlite3_snprintf(3, &z[j],"%02d",x.h); j+=2; break;
+        case 'W': /* Fall thru */
+        case 'j': {
+          int nDay;             /* Number of days since 1st day of year */
+          DateTime y = x;
+          y.validJD = 0;
+          y.M = 1;
+          y.D = 1;
+          computeJD(&y);
+          nDay = x.rJD - y.rJD + 0.5;
+          if( zFmt[i]=='W' ){
+            int wd;   /* 0=Monday, 1=Tuesday, ... 6=Sunday */
+            wd = ((int)(x.rJD+0.5)) % 7;
+            sqlite3_snprintf(3, &z[j],"%02d",(nDay+7-wd)/7);
+            j += 2;
+          }else{
+            sqlite3_snprintf(4, &z[j],"%03d",nDay+1);
+            j += 3;
+          }
+          break;
+        }
+        case 'J': {
+          sqlite3_snprintf(20, &z[j],"%.16g",x.rJD);
+          j+=strlen(&z[j]);
+          break;
+        }
+        case 'm':  sqlite3_snprintf(3, &z[j],"%02d",x.M); j+=2; break;
+        case 'M':  sqlite3_snprintf(3, &z[j],"%02d",x.m); j+=2; break;
+        case 's': {
+          sqlite3_snprintf(30,&z[j],"%d",
+                           (int)((x.rJD-2440587.5)*86400.0 + 0.5));
+          j += strlen(&z[j]);
+          break;
+        }
+        case 'S':  sqlite3_snprintf(3,&z[j],"%02d",(int)x.s); j+=2; break;
+        case 'w':  z[j++] = (((int)(x.rJD+1.5)) % 7) + '0'; break;
+        case 'Y':  sqlite3_snprintf(5,&z[j],"%04d",x.Y); j+=strlen(&z[j]);break;
+        default:   z[j++] = '%'; break;
+      }
+    }
+  }
+  z[j] = 0;
+  sqlite3_result_text(context, z, -1,
+                      z==zBuf ? SQLITE_TRANSIENT : sqlite3_free);
+}
+
+/*
+** current_time()
+**
+** This function returns the same value as time('now').
+*/
+static void ctimeFunc(
+  sqlite3_context *context,
+  int argc,
+  sqlite3_value **argv
+){
+  timeFunc(context, 0, 0);
+}
+
+/*
+** current_date()
+**
+** This function returns the same value as date('now').
+*/
+static void cdateFunc(
+  sqlite3_context *context,
+  int argc,
+  sqlite3_value **argv
+){
+  dateFunc(context, 0, 0);
+}
+
+/*
+** current_timestamp()
+**
+** This function returns the same value as datetime('now').
+*/
+static void ctimestampFunc(
+  sqlite3_context *context,
+  int argc,
+  sqlite3_value **argv
+){
+  datetimeFunc(context, 0, 0);
+}
+#endif /* !defined(SQLITE_OMIT_DATETIME_FUNCS) */
+
+#ifdef SQLITE_OMIT_DATETIME_FUNCS
+/*
+** If the library is compiled to omit the full-scale date and time
+** handling (to get a smaller binary), the following minimal version
+** of the functions current_time(), current_date() and current_timestamp()
+** are included instead. This is to support column declarations that
+** include "DEFAULT CURRENT_TIME" etc.
+**
+** This function uses the C-library functions time(), gmtime()
+** and strftime(). The format string to pass to strftime() is supplied
+** as the user-data for the function.
+*/
+static void currentTimeFunc(
+  sqlite3_context *context,
+  int argc,
+  sqlite3_value **argv
+){
+  time_t t;
+  char *zFormat = (char *)sqlite3_user_data(context);
+  char zBuf[20];
+
+  time(&t);
+#ifdef SQLITE_TEST
+  {
+    extern int sqlite3_current_time;  /* See os_XXX.c */
+    if( sqlite3_current_time ){
+      t = sqlite3_current_time;
+    }
+  }
+#endif
+
+#ifdef HAVE_GMTIME_R
+  {
+    struct tm sNow;
+    gmtime_r(&t, &sNow);
+    strftime(zBuf, 20, zFormat, &sNow);
+  }
+#else
+  {
+    struct tm *pTm;
+    sqlite3_mutex_enter(sqlite3_mutex_alloc(SQLITE_MUTEX_STATIC_MASTER));
+    pTm = gmtime(&t);
+    strftime(zBuf, 20, zFormat, pTm);
+    sqlite3_mutex_leave(sqlite3_mutex_alloc(SQLITE_MUTEX_STATIC_MASTER));
+  }
+#endif
+
+  sqlite3_result_text(context, zBuf, -1, SQLITE_TRANSIENT);
+}
+#endif
+
+/*
+** This function registered all of the above C functions as SQL
+** functions.  This should be the only routine in this file with
+** external linkage.
+*/
+void sqlite3RegisterDateTimeFunctions(sqlite3 *db){
+#ifndef SQLITE_OMIT_DATETIME_FUNCS
+  static const struct {
+     char *zName;
+     int nArg;
+     void (*xFunc)(sqlite3_context*,int,sqlite3_value**);
+  } aFuncs[] = {
+    { "julianday", -1, juliandayFunc   },
+    { "date",      -1, dateFunc        },
+    { "time",      -1, timeFunc        },
+    { "datetime",  -1, datetimeFunc    },
+    { "strftime",  -1, strftimeFunc    },
+    { "current_time",       0, ctimeFunc      },
+    { "current_timestamp",  0, ctimestampFunc },
+    { "current_date",       0, cdateFunc      },
+  };
+  int i;
+
+  for(i=0; i<sizeof(aFuncs)/sizeof(aFuncs[0]); i++){
+    sqlite3CreateFunc(db, aFuncs[i].zName, aFuncs[i].nArg,
+        SQLITE_UTF8, (void *)(db->pVfs), aFuncs[i].xFunc, 0, 0);
+  }
+#else
+  static const struct {
+     char *zName;
+     char *zFormat;
+  } aFuncs[] = {
+    { "current_time", "%H:%M:%S" },
+    { "current_date", "%Y-%m-%d" },
+    { "current_timestamp", "%Y-%m-%d %H:%M:%S" }
+  };
+  int i;
+
+  for(i=0; i<sizeof(aFuncs)/sizeof(aFuncs[0]); i++){
+    sqlite3CreateFunc(db, aFuncs[i].zName, 0, SQLITE_UTF8,
+        aFuncs[i].zFormat, currentTimeFunc, 0, 0);
+  }
+#endif
+}
diff --git a/uppsrc/plugin/sqlite3/lib/delete.c b/uppsrc/plugin/sqlite3/lib/delete.c
new file mode 100644
index 000000000..3d5989348
--- /dev/null
+++ b/uppsrc/plugin/sqlite3/lib/delete.c
@@ -0,0 +1,539 @@
+/*
+** 2001 September 15
+**
+** The author disclaims copyright to this source code.  In place of
+** a legal notice, here is a blessing:
+**
+**    May you do good and not evil.
+**    May you find forgiveness for yourself and forgive others.
+**    May you share freely, never taking more than you give.
+**
+*************************************************************************
+** This file contains C code routines that are called by the parser
+** in order to generate code for DELETE FROM statements.
+**
+** $Id: delete.c,v 1.161 2008/02/12 16:52:14 drh Exp $
+*/
+#include "sqliteInt.h"
+
+/*
+** Look up every table that is named in pSrc.  If any table is not found,
+** add an error message to pParse->zErrMsg and return NULL.  If all tables
+** are found, return a pointer to the last table.
+*/
+Table *sqlite3SrcListLookup(Parse *pParse, SrcList *pSrc){
+  Table *pTab = 0;
+  int i;
+  struct SrcList_item *pItem;
+  for(i=0, pItem=pSrc->a; i<pSrc->nSrc; i++, pItem++){
+    pTab = sqlite3LocateTable(pParse, 0, pItem->zName, pItem->zDatabase);
+    sqlite3DeleteTable(pItem->pTab);
+    pItem->pTab = pTab;
+    if( pTab ){
+      pTab->nRef++;
+    }
+  }
+  return pTab;
+}
+
+/*
+** Check to make sure the given table is writable.  If it is not
+** writable, generate an error message and return 1.  If it is
+** writable return 0;
+*/
+int sqlite3IsReadOnly(Parse *pParse, Table *pTab, int viewOk){
+  if( (pTab->readOnly && (pParse->db->flags & SQLITE_WriteSchema)==0
+        && pParse->nested==0)
+#ifndef SQLITE_OMIT_VIRTUALTABLE
+      || (pTab->pMod && pTab->pMod->pModule->xUpdate==0)
+#endif
+  ){
+    sqlite3ErrorMsg(pParse, "table %s may not be modified", pTab->zName);
+    return 1;
+  }
+#ifndef SQLITE_OMIT_VIEW
+  if( !viewOk && pTab->pSelect ){
+    sqlite3ErrorMsg(pParse,"cannot modify %s because it is a view",pTab->zName);
+    return 1;
+  }
+#endif
+  return 0;
+}
+
+/*
+** Generate code that will open a table for reading.
+*/
+void sqlite3OpenTable(
+  Parse *p,       /* Generate code into this VDBE */
+  int iCur,       /* The cursor number of the table */
+  int iDb,        /* The database index in sqlite3.aDb[] */
+  Table *pTab,    /* The table to be opened */
+  int opcode      /* OP_OpenRead or OP_OpenWrite */
+){
+  Vdbe *v;
+  if( IsVirtual(pTab) ) return;
+  v = sqlite3GetVdbe(p);
+  assert( opcode==OP_OpenWrite || opcode==OP_OpenRead );
+  sqlite3TableLock(p, iDb, pTab->tnum, (opcode==OP_OpenWrite), pTab->zName);
+  sqlite3VdbeAddOp3(v, opcode, iCur, pTab->tnum, iDb);
+  VdbeComment((v, "%s", pTab->zName));
+  sqlite3VdbeAddOp2(v, OP_SetNumColumns, iCur, pTab->nCol);
+}
+
+
+#if !defined(SQLITE_OMIT_VIEW) && !defined(SQLITE_OMIT_TRIGGER)
+/*
+** Evaluate a view and store its result in an ephemeral table.  The
+** pWhere argument is an optional WHERE clause that restricts the
+** set of rows in the view that are to be added to the ephemeral table.
+*/
+void sqlite3MaterializeView(
+  Parse *pParse,       /* Parsing context */
+  Select *pView,       /* View definition */
+  Expr *pWhere,        /* Optional WHERE clause to be added */
+  u32 col_mask,        /* Render only the columns in this mask. */
+  int iCur             /* Cursor number for ephemerial table */
+){
+  SelectDest dest;
+  Select *pDup;
+  sqlite3 *db = pParse->db;
+
+  pDup = sqlite3SelectDup(db, pView);
+  if( pWhere ){
+    SrcList *pFrom;
+
+    pWhere = sqlite3ExprDup(db, pWhere);
+    pFrom = sqlite3SrcListAppendFromTerm(pParse, 0, 0, 0, 0, pDup, 0, 0);
+    pDup = sqlite3SelectNew(pParse, 0, pFrom, pWhere, 0, 0, 0, 0, 0, 0);
+  }
+  sqlite3SelectMask(pParse, pDup, col_mask);
+  sqlite3SelectDestInit(&dest, SRT_EphemTab, iCur);
+  sqlite3Select(pParse, pDup, &dest, 0, 0, 0, 0);
+  sqlite3SelectDelete(pDup);
+}
+#endif /* !defined(SQLITE_OMIT_VIEW) && !defined(SQLITE_OMIT_TRIGGER) */
+
+
+/*
+** Generate code for a DELETE FROM statement.
+**
+**     DELETE FROM table_wxyz WHERE a<5 AND b NOT NULL;
+**                 \________/       \________________/
+**                  pTabList              pWhere
+*/
+void sqlite3DeleteFrom(
+  Parse *pParse,         /* The parser context */
+  SrcList *pTabList,     /* The table from which we should delete things */
+  Expr *pWhere           /* The WHERE clause.  May be null */
+){
+  Vdbe *v;               /* The virtual database engine */
+  Table *pTab;           /* The table from which records will be deleted */
+  const char *zDb;       /* Name of database holding pTab */
+  int end, addr = 0;     /* A couple addresses of generated code */
+  int i;                 /* Loop counter */
+  WhereInfo *pWInfo;     /* Information about the WHERE clause */
+  Index *pIdx;           /* For looping over indices of the table */
+  int iCur;              /* VDBE Cursor number for pTab */
+  sqlite3 *db;           /* Main database structure */
+  AuthContext sContext;  /* Authorization context */
+  int oldIdx = -1;       /* Cursor for the OLD table of AFTER triggers */
+  NameContext sNC;       /* Name context to resolve expressions in */
+  int iDb;               /* Database number */
+  int memCnt = 0;        /* Memory cell used for change counting */
+
+#ifndef SQLITE_OMIT_TRIGGER
+  int isView;                  /* True if attempting to delete from a view */
+  int triggers_exist = 0;      /* True if any triggers exist */
+#endif
+  int iBeginAfterTrigger;      /* Address of after trigger program */
+  int iEndAfterTrigger;        /* Exit of after trigger program */
+  int iBeginBeforeTrigger;     /* Address of before trigger program */
+  int iEndBeforeTrigger;       /* Exit of before trigger program */
+  u32 old_col_mask = 0;        /* Mask of OLD.* columns in use */
+
+  sContext.pParse = 0;
+  db = pParse->db;
+  if( pParse->nErr || db->mallocFailed ){
+    goto delete_from_cleanup;
+  }
+  assert( pTabList->nSrc==1 );
+
+  /* Locate the table which we want to delete.  This table has to be
+  ** put in an SrcList structure because some of the subroutines we
+  ** will be calling are designed to work with multiple tables and expect
+  ** an SrcList* parameter instead of just a Table* parameter.
+  */
+  pTab = sqlite3SrcListLookup(pParse, pTabList);
+  if( pTab==0 )  goto delete_from_cleanup;
+
+  /* Figure out if we have any triggers and if the table being
+  ** deleted from is a view
+  */
+#ifndef SQLITE_OMIT_TRIGGER
+  triggers_exist = sqlite3TriggersExist(pParse, pTab, TK_DELETE, 0);
+  isView = pTab->pSelect!=0;
+#else
+# define triggers_exist 0
+# define isView 0
+#endif
+#ifdef SQLITE_OMIT_VIEW
+# undef isView
+# define isView 0
+#endif
+
+  if( sqlite3IsReadOnly(pParse, pTab, triggers_exist) ){
+    goto delete_from_cleanup;
+  }
+  iDb = sqlite3SchemaToIndex(db, pTab->pSchema);
+  assert( iDb<db->nDb );
+  zDb = db->aDb[iDb].zName;
+  if( sqlite3AuthCheck(pParse, SQLITE_DELETE, pTab->zName, 0, zDb) ){
+    goto delete_from_cleanup;
+  }
+
+  /* If pTab is really a view, make sure it has been initialized.
+  */
+  if( sqlite3ViewGetColumnNames(pParse, pTab) ){
+    goto delete_from_cleanup;
+  }
+
+  /* Allocate a cursor used to store the old.* data for a trigger.
+  */
+  if( triggers_exist ){
+    oldIdx = pParse->nTab++;
+  }
+
+  /* Assign  cursor number to the table and all its indices.
+  */
+  assert( pTabList->nSrc==1 );
+  iCur = pTabList->a[0].iCursor = pParse->nTab++;
+  for(pIdx=pTab->pIndex; pIdx; pIdx=pIdx->pNext){
+    pParse->nTab++;
+  }
+
+  /* Start the view context
+  */
+  if( isView ){
+    sqlite3AuthContextPush(pParse, &sContext, pTab->zName);
+  }
+
+  /* Begin generating code.
+  */
+  v = sqlite3GetVdbe(pParse);
+  if( v==0 ){
+    goto delete_from_cleanup;
+  }
+  if( pParse->nested==0 ) sqlite3VdbeCountChanges(v);
+  sqlite3BeginWriteOperation(pParse, triggers_exist, iDb);
+
+  if( triggers_exist ){
+    int orconf = ((pParse->trigStack)?pParse->trigStack->orconf:OE_Default);
+    int iGoto = sqlite3VdbeAddOp0(v, OP_Goto);
+    addr = sqlite3VdbeMakeLabel(v);
+
+    iBeginBeforeTrigger = sqlite3VdbeCurrentAddr(v);
+    (void)sqlite3CodeRowTrigger(pParse, TK_DELETE, 0, TRIGGER_BEFORE, pTab,
+        -1, oldIdx, orconf, addr, &old_col_mask, 0);
+    iEndBeforeTrigger = sqlite3VdbeAddOp0(v, OP_Goto);
+
+    iBeginAfterTrigger = sqlite3VdbeCurrentAddr(v);
+    (void)sqlite3CodeRowTrigger(pParse, TK_DELETE, 0, TRIGGER_AFTER, pTab, -1,
+        oldIdx, orconf, addr, &old_col_mask, 0);
+    iEndAfterTrigger = sqlite3VdbeAddOp0(v, OP_Goto);
+
+    sqlite3VdbeJumpHere(v, iGoto);
+  }
+
+  /* If we are trying to delete from a view, realize that view into
+  ** a ephemeral table.
+  */
+  if( isView ){
+    sqlite3MaterializeView(pParse, pTab->pSelect, pWhere, old_col_mask, iCur);
+  }
+
+  /* Resolve the column names in the WHERE clause.
+  */
+  memset(&sNC, 0, sizeof(sNC));
+  sNC.pParse = pParse;
+  sNC.pSrcList = pTabList;
+  if( sqlite3ExprResolveNames(&sNC, pWhere) ){
+    goto delete_from_cleanup;
+  }
+
+  /* Initialize the counter of the number of rows deleted, if
+  ** we are counting rows.
+  */
+  if( db->flags & SQLITE_CountRows ){
+    memCnt = ++pParse->nMem;
+    sqlite3VdbeAddOp2(v, OP_Integer, 0, memCnt);
+  }
+
+  /* Special case: A DELETE without a WHERE clause deletes everything.
+  ** It is easier just to erase the whole table.  Note, however, that
+  ** this means that the row change count will be incorrect.
+  */
+  if( pWhere==0 && !triggers_exist && !IsVirtual(pTab) ){
+    if( db->flags & SQLITE_CountRows ){
+      /* If counting rows deleted, just count the total number of
+      ** entries in the table. */
+      int addr2;
+      if( !isView ){
+        sqlite3OpenTable(pParse, iCur, iDb, pTab, OP_OpenRead);
+      }
+      sqlite3VdbeAddOp2(v, OP_Rewind, iCur, sqlite3VdbeCurrentAddr(v)+2);
+      addr2 = sqlite3VdbeAddOp2(v, OP_AddImm, memCnt, 1);
+      sqlite3VdbeAddOp2(v, OP_Next, iCur, addr2);
+      sqlite3VdbeAddOp1(v, OP_Close, iCur);
+    }
+    if( !isView ){
+      sqlite3VdbeAddOp2(v, OP_Clear, pTab->tnum, iDb);
+      if( !pParse->nested ){
+        sqlite3VdbeChangeP4(v, -1, pTab->zName, P4_STATIC);
+      }
+      for(pIdx=pTab->pIndex; pIdx; pIdx=pIdx->pNext){
+        assert( pIdx->pSchema==pTab->pSchema );
+        sqlite3VdbeAddOp2(v, OP_Clear, pIdx->tnum, iDb);
+      }
+    }
+  }
+  /* The usual case: There is a WHERE clause so we have to scan through
+  ** the table and pick which records to delete.
+  */
+  else{
+    int iRowid = ++pParse->nMem;    /* Used for storing rowid values. */
+
+    /* Begin the database scan
+    */
+    pWInfo = sqlite3WhereBegin(pParse, pTabList, pWhere, 0, 0);
+    if( pWInfo==0 ) goto delete_from_cleanup;
+
+    /* Remember the rowid of every item to be deleted.
+    */
+    sqlite3VdbeAddOp2(v, IsVirtual(pTab) ? OP_VRowid : OP_Rowid, iCur, iRowid);
+    sqlite3VdbeAddOp1(v, OP_FifoWrite, iRowid);
+    if( db->flags & SQLITE_CountRows ){
+      sqlite3VdbeAddOp2(v, OP_AddImm, memCnt, 1);
+    }
+
+    /* End the database scan loop.
+    */
+    sqlite3WhereEnd(pWInfo);
+
+    /* Open the pseudo-table used to store OLD if there are triggers.
+    */
+    if( triggers_exist ){
+      sqlite3VdbeAddOp1(v, OP_OpenPseudo, oldIdx);
+      sqlite3VdbeAddOp2(v, OP_SetNumColumns, oldIdx, pTab->nCol);
+    }
+
+    /* Delete every item whose key was written to the list during the
+    ** database scan.  We have to delete items after the scan is complete
+    ** because deleting an item can change the scan order.
+    */
+    end = sqlite3VdbeMakeLabel(v);
+
+    if( !isView ){
+      /* Open cursors for the table we are deleting from and
+      ** all its indices.
+      */
+      sqlite3OpenTableAndIndices(pParse, pTab, iCur, OP_OpenWrite);
+    }
+
+    /* This is the beginning of the delete loop. If a trigger encounters
+    ** an IGNORE constraint, it jumps back to here.
+    */
+    if( triggers_exist ){
+      sqlite3VdbeResolveLabel(v, addr);
+    }
+    addr = sqlite3VdbeAddOp2(v, OP_FifoRead, iRowid, end);
+
+    if( triggers_exist ){
+      int iData = ++pParse->nMem;   /* For storing row data of OLD table */
+
+      /* If the record is no longer present in the table, jump to the
+      ** next iteration of the loop through the contents of the fifo.
+      */
+      sqlite3VdbeAddOp3(v, OP_NotExists, iCur, addr, iRowid);
+
+      /* Populate the OLD.* pseudo-table */
+      if( old_col_mask ){
+        sqlite3VdbeAddOp2(v, OP_RowData, iCur, iData);
+      }else{
+        sqlite3VdbeAddOp2(v, OP_Null, 0, iData);
+      }
+      sqlite3VdbeAddOp3(v, OP_Insert, oldIdx, iData, iRowid);
+
+      /* Jump back and run the BEFORE triggers */
+      sqlite3VdbeAddOp2(v, OP_Goto, 0, iBeginBeforeTrigger);
+      sqlite3VdbeJumpHere(v, iEndBeforeTrigger);
+    }
+
+    if( !isView ){
+      /* Delete the row */
+#ifndef SQLITE_OMIT_VIRTUALTABLE
+      if( IsVirtual(pTab) ){
+        const char *pVtab = (const char *)pTab->pVtab;
+        pParse->pVirtualLock = pTab;
+        sqlite3VdbeAddOp4(v, OP_VUpdate, 0, 1, iRowid, pVtab, P4_VTAB);
+      }else
+#endif
+      {
+        sqlite3GenerateRowDelete(pParse, pTab, iCur, iRowid, pParse->nested==0);
+      }
+    }
+
+    /* If there are row triggers, close all cursors then invoke
+    ** the AFTER triggers
+    */
+    if( triggers_exist ){
+      /* Jump back and run the AFTER triggers */
+      sqlite3VdbeAddOp2(v, OP_Goto, 0, iBeginAfterTrigger);
+      sqlite3VdbeJumpHere(v, iEndAfterTrigger);
+    }
+
+    /* End of the delete loop */
+    sqlite3VdbeAddOp2(v, OP_Goto, 0, addr);
+    sqlite3VdbeResolveLabel(v, end);
+
+    /* Close the cursors after the loop if there are no row triggers */
+    if( !isView  && !IsVirtual(pTab) ){
+      for(i=1, pIdx=pTab->pIndex; pIdx; i++, pIdx=pIdx->pNext){
+        sqlite3VdbeAddOp2(v, OP_Close, iCur + i, pIdx->tnum);
+      }
+      sqlite3VdbeAddOp1(v, OP_Close, iCur);
+    }
+  }
+
+  /*
+  ** Return the number of rows that were deleted. If this routine is
+  ** generating code because of a call to sqlite3NestedParse(), do not
+  ** invoke the callback function.
+  */
+  if( db->flags & SQLITE_CountRows && pParse->nested==0 && !pParse->trigStack ){
+    sqlite3VdbeAddOp2(v, OP_ResultRow, memCnt, 1);
+    sqlite3VdbeSetNumCols(v, 1);
+    sqlite3VdbeSetColName(v, 0, COLNAME_NAME, "rows deleted", P4_STATIC);
+  }
+
+delete_from_cleanup:
+  sqlite3AuthContextPop(&sContext);
+  sqlite3SrcListDelete(pTabList);
+  sqlite3ExprDelete(pWhere);
+  return;
+}
+
+/*
+** This routine generates VDBE code that causes a single row of a
+** single table to be deleted.
+**
+** The VDBE must be in a particular state when this routine is called.
+** These are the requirements:
+**
+**   1.  A read/write cursor pointing to pTab, the table containing the row
+**       to be deleted, must be opened as cursor number "base".
+**
+**   2.  Read/write cursors for all indices of pTab must be open as
+**       cursor number base+i for the i-th index.
+**
+**   3.  The record number of the row to be deleted must be stored in
+**       memory cell iRowid.
+**
+** This routine pops the top of the stack to remove the record number
+** and then generates code to remove both the table record and all index
+** entries that point to that record.
+*/
+void sqlite3GenerateRowDelete(
+  Parse *pParse,     /* Parsing context */
+  Table *pTab,       /* Table containing the row to be deleted */
+  int iCur,          /* Cursor number for the table */
+  int iRowid,        /* Memory cell that contains the rowid to delete */
+  int count          /* Increment the row change counter */
+){
+  int addr;
+  Vdbe *v;
+
+  v = pParse->pVdbe;
+  addr = sqlite3VdbeAddOp3(v, OP_NotExists, iCur, 0, iRowid);
+  sqlite3GenerateRowIndexDelete(pParse, pTab, iCur, 0);
+  sqlite3VdbeAddOp2(v, OP_Delete, iCur, (count?OPFLAG_NCHANGE:0));
+  if( count ){
+    sqlite3VdbeChangeP4(v, -1, pTab->zName, P4_STATIC);
+  }
+  sqlite3VdbeJumpHere(v, addr);
+}
+
+/*
+** This routine generates VDBE code that causes the deletion of all
+** index entries associated with a single row of a single table.
+**
+** The VDBE must be in a particular state when this routine is called.
+** These are the requirements:
+**
+**   1.  A read/write cursor pointing to pTab, the table containing the row
+**       to be deleted, must be opened as cursor number "iCur".
+**
+**   2.  Read/write cursors for all indices of pTab must be open as
+**       cursor number iCur+i for the i-th index.
+**
+**   3.  The "iCur" cursor must be pointing to the row that is to be
+**       deleted.
+*/
+void sqlite3GenerateRowIndexDelete(
+  Parse *pParse,     /* Parsing and code generating context */
+  Table *pTab,       /* Table containing the row to be deleted */
+  int iCur,          /* Cursor number for the table */
+  int *aRegIdx       /* Only delete if aRegIdx!=0 && aRegIdx[i]>0 */
+){
+  int i;
+  Index *pIdx;
+  int r1;
+
+  r1 = sqlite3GetTempReg(pParse);
+  for(i=1, pIdx=pTab->pIndex; pIdx; i++, pIdx=pIdx->pNext){
+    if( aRegIdx!=0 && aRegIdx[i-1]==0 ) continue;
+    sqlite3GenerateIndexKey(pParse, pIdx, iCur, r1);
+    sqlite3VdbeAddOp2(pParse->pVdbe, OP_IdxDelete, iCur+i, r1);
+  }
+  sqlite3ReleaseTempReg(pParse, r1);
+}
+
+/*
+** Generate code that will assemble an index key and put it on the top
+** of the tack.  The key with be for index pIdx which is an index on pTab.
+** iCur is the index of a cursor open on the pTab table and pointing to
+** the entry that needs indexing.
+**
+** Return a register number which is the first in a block of
+** registers that holds the elements of the index key.  The
+** block of registers has already been deallocated by the time
+** this routine returns.
+*/
+int sqlite3GenerateIndexKey(
+  Parse *pParse,     /* Parsing context */
+  Index *pIdx,       /* The index for which to generate a key */
+  int iCur,          /* Cursor number for the pIdx->pTable table */
+  int regOut         /* Write the new index key to this register */
+){
+  Vdbe *v = pParse->pVdbe;
+  int j;
+  Table *pTab = pIdx->pTable;
+  int regBase;
+  int nCol;
+
+  nCol = pIdx->nColumn;
+  regBase = sqlite3GetTempRange(pParse, nCol+1);
+  sqlite3VdbeAddOp2(v, OP_Rowid, iCur, regBase+nCol);
+  for(j=0; j<nCol; j++){
+    int idx = pIdx->aiColumn[j];
+    if( idx==pTab->iPKey ){
+      sqlite3VdbeAddOp2(v, OP_SCopy, regBase+nCol, regBase+j);
+    }else{
+      sqlite3VdbeAddOp3(v, OP_Column, iCur, idx, regBase+j);
+      sqlite3ColumnDefault(v, pTab, idx);
+    }
+  }
+  sqlite3VdbeAddOp3(v, OP_MakeRecord, regBase, nCol+1, regOut);
+  sqlite3IndexAffinityStr(v, pIdx);
+  sqlite3ReleaseTempRange(pParse, regBase, nCol+1);
+  return regBase;
+}
diff --git a/uppsrc/plugin/sqlite3/lib/expr.c b/uppsrc/plugin/sqlite3/lib/expr.c
new file mode 100644
index 000000000..28c55fef4
--- /dev/null
+++ b/uppsrc/plugin/sqlite3/lib/expr.c
@@ -0,0 +1,2983 @@
+/*
+** 2001 September 15
+**
+** The author disclaims copyright to this source code.  In place of
+** a legal notice, here is a blessing:
+**
+**    May you do good and not evil.
+**    May you find forgiveness for yourself and forgive others.
+**    May you share freely, never taking more than you give.
+**
+*************************************************************************
+** This file contains routines used for analyzing expressions and
+** for generating VDBE code that evaluates expressions in SQLite.
+**
+** $Id: expr.c,v 1.354 2008/03/12 10:39:00 danielk1977 Exp $
+*/
+#include "sqliteInt.h"
+#include <ctype.h>
+
+/*
+** Return the 'affinity' of the expression pExpr if any.
+**
+** If pExpr is a column, a reference to a column via an 'AS' alias,
+** or a sub-select with a column as the return value, then the
+** affinity of that column is returned. Otherwise, 0x00 is returned,
+** indicating no affinity for the expression.
+**
+** i.e. the WHERE clause expresssions in the following statements all
+** have an affinity:
+**
+** CREATE TABLE t1(a);
+** SELECT * FROM t1 WHERE a;
+** SELECT a AS b FROM t1 WHERE b;
+** SELECT * FROM t1 WHERE (select a from t1);
+*/
+char sqlite3ExprAffinity(Expr *pExpr){
+  int op = pExpr->op;
+  if( op==TK_SELECT ){
+    return sqlite3ExprAffinity(pExpr->pSelect->pEList->a[0].pExpr);
+  }
+#ifndef SQLITE_OMIT_CAST
+  if( op==TK_CAST ){
+    return sqlite3AffinityType(&pExpr->token);
+  }
+#endif
+  return pExpr->affinity;
+}
+
+/*
+** Set the collating sequence for expression pExpr to be the collating
+** sequence named by pToken.   Return a pointer to the revised expression.
+** The collating sequence is marked as "explicit" using the EP_ExpCollate
+** flag.  An explicit collating sequence will override implicit
+** collating sequences.
+*/
+Expr *sqlite3ExprSetColl(Parse *pParse, Expr *pExpr, Token *pName){
+  char *zColl = 0;            /* Dequoted name of collation sequence */
+  CollSeq *pColl;
+  zColl = sqlite3NameFromToken(pParse->db, pName);
+  if( pExpr && zColl ){
+    pColl = sqlite3LocateCollSeq(pParse, zColl, -1);
+    if( pColl ){
+      pExpr->pColl = pColl;
+      pExpr->flags |= EP_ExpCollate;
+    }
+  }
+  sqlite3_free(zColl);
+  return pExpr;
+}
+
+/*
+** Return the default collation sequence for the expression pExpr. If
+** there is no default collation type, return 0.
+*/
+CollSeq *sqlite3ExprCollSeq(Parse *pParse, Expr *pExpr){
+  CollSeq *pColl = 0;
+  if( pExpr ){
+    int op;
+    pColl = pExpr->pColl;
+    op = pExpr->op;
+    if( (op==TK_CAST || op==TK_UPLUS) && !pColl ){
+      return sqlite3ExprCollSeq(pParse, pExpr->pLeft);
+    }
+  }
+  if( sqlite3CheckCollSeq(pParse, pColl) ){
+    pColl = 0;
+  }
+  return pColl;
+}
+
+/*
+** pExpr is an operand of a comparison operator.  aff2 is the
+** type affinity of the other operand.  This routine returns the
+** type affinity that should be used for the comparison operator.
+*/
+char sqlite3CompareAffinity(Expr *pExpr, char aff2){
+  char aff1 = sqlite3ExprAffinity(pExpr);
+  if( aff1 && aff2 ){
+    /* Both sides of the comparison are columns. If one has numeric
+    ** affinity, use that. Otherwise use no affinity.
+    */
+    if( sqlite3IsNumericAffinity(aff1) || sqlite3IsNumericAffinity(aff2) ){
+      return SQLITE_AFF_NUMERIC;
+    }else{
+      return SQLITE_AFF_NONE;
+    }
+  }else if( !aff1 && !aff2 ){
+    /* Neither side of the comparison is a column.  Compare the
+    ** results directly.
+    */
+    return SQLITE_AFF_NONE;
+  }else{
+    /* One side is a column, the other is not. Use the columns affinity. */
+    assert( aff1==0 || aff2==0 );
+    return (aff1 + aff2);
+  }
+}
+
+/*
+** pExpr is a comparison operator.  Return the type affinity that should
+** be applied to both operands prior to doing the comparison.
+*/
+static char comparisonAffinity(Expr *pExpr){
+  char aff;
+  assert( pExpr->op==TK_EQ || pExpr->op==TK_IN || pExpr->op==TK_LT ||
+          pExpr->op==TK_GT || pExpr->op==TK_GE || pExpr->op==TK_LE ||
+          pExpr->op==TK_NE );
+  assert( pExpr->pLeft );
+  aff = sqlite3ExprAffinity(pExpr->pLeft);
+  if( pExpr->pRight ){
+    aff = sqlite3CompareAffinity(pExpr->pRight, aff);
+  }
+  else if( pExpr->pSelect ){
+    aff = sqlite3CompareAffinity(pExpr->pSelect->pEList->a[0].pExpr, aff);
+  }
+  else if( !aff ){
+    aff = SQLITE_AFF_NONE;
+  }
+  return aff;
+}
+
+/*
+** pExpr is a comparison expression, eg. '=', '<', IN(...) etc.
+** idx_affinity is the affinity of an indexed column. Return true
+** if the index with affinity idx_affinity may be used to implement
+** the comparison in pExpr.
+*/
+int sqlite3IndexAffinityOk(Expr *pExpr, char idx_affinity){
+  char aff = comparisonAffinity(pExpr);
+  switch( aff ){
+    case SQLITE_AFF_NONE:
+      return 1;
+    case SQLITE_AFF_TEXT:
+      return idx_affinity==SQLITE_AFF_TEXT;
+    default:
+      return sqlite3IsNumericAffinity(idx_affinity);
+  }
+}
+
+/*
+** Return the P5 value that should be used for a binary comparison
+** opcode (OP_Eq, OP_Ge etc.) used to compare pExpr1 and pExpr2.
+*/
+static u8 binaryCompareP5(Expr *pExpr1, Expr *pExpr2, int jumpIfNull){
+  u8 aff = (char)sqlite3ExprAffinity(pExpr2);
+  aff = sqlite3CompareAffinity(pExpr1, aff) | jumpIfNull;
+  return aff;
+}
+
+/*
+** Return a pointer to the collation sequence that should be used by
+** a binary comparison operator comparing pLeft and pRight.
+**
+** If the left hand expression has a collating sequence type, then it is
+** used. Otherwise the collation sequence for the right hand expression
+** is used, or the default (BINARY) if neither expression has a collating
+** type.
+**
+** Argument pRight (but not pLeft) may be a null pointer. In this case,
+** it is not considered.
+*/
+CollSeq *sqlite3BinaryCompareCollSeq(
+  Parse *pParse,
+  Expr *pLeft,
+  Expr *pRight
+){
+  CollSeq *pColl;
+  assert( pLeft );
+  if( pLeft->flags & EP_ExpCollate ){
+    assert( pLeft->pColl );
+    pColl = pLeft->pColl;
+  }else if( pRight && pRight->flags & EP_ExpCollate ){
+    assert( pRight->pColl );
+    pColl = pRight->pColl;
+  }else{
+    pColl = sqlite3ExprCollSeq(pParse, pLeft);
+    if( !pColl ){
+      pColl = sqlite3ExprCollSeq(pParse, pRight);
+    }
+  }
+  return pColl;
+}
+
+/*
+** Generate code for a comparison operator.
+*/
+static int codeCompare(
+  Parse *pParse,    /* The parsing (and code generating) context */
+  Expr *pLeft,      /* The left operand */
+  Expr *pRight,     /* The right operand */
+  int opcode,       /* The comparison opcode */
+  int in1, int in2, /* Register holding operands */
+  int dest,         /* Jump here if true.  */
+  int jumpIfNull    /* If true, jump if either operand is NULL */
+){
+  int p5;
+  int addr;
+  CollSeq *p4;
+
+  p4 = sqlite3BinaryCompareCollSeq(pParse, pLeft, pRight);
+  p5 = binaryCompareP5(pLeft, pRight, jumpIfNull);
+  addr = sqlite3VdbeAddOp4(pParse->pVdbe, opcode, in2, dest, in1,
+                           (void*)p4, P4_COLLSEQ);
+  sqlite3VdbeChangeP5(pParse->pVdbe, p5);
+  return addr;
+}
+
+/*
+** Construct a new expression node and return a pointer to it.  Memory
+** for this node is obtained from sqlite3_malloc().  The calling function
+** is responsible for making sure the node eventually gets freed.
+*/
+Expr *sqlite3Expr(
+  sqlite3 *db,            /* Handle for sqlite3DbMallocZero() (may be null) */
+  int op,                 /* Expression opcode */
+  Expr *pLeft,            /* Left operand */
+  Expr *pRight,           /* Right operand */
+  const Token *pToken     /* Argument token */
+){
+  Expr *pNew;
+  pNew = sqlite3DbMallocZero(db, sizeof(Expr));
+  if( pNew==0 ){
+    /* When malloc fails, delete pLeft and pRight. Expressions passed to
+    ** this function must always be allocated with sqlite3Expr() for this
+    ** reason.
+    */
+    sqlite3ExprDelete(pLeft);
+    sqlite3ExprDelete(pRight);
+    return 0;
+  }
+  pNew->op = op;
+  pNew->pLeft = pLeft;
+  pNew->pRight = pRight;
+  pNew->iAgg = -1;
+  if( pToken ){
+    assert( pToken->dyn==0 );
+    pNew->span = pNew->token = *pToken;
+  }else if( pLeft ){
+    if( pRight ){
+      sqlite3ExprSpan(pNew, &pLeft->span, &pRight->span);
+      if( pRight->flags & EP_ExpCollate ){
+        pNew->flags |= EP_ExpCollate;
+        pNew->pColl = pRight->pColl;
+      }
+    }
+    if( pLeft->flags & EP_ExpCollate ){
+      pNew->flags |= EP_ExpCollate;
+      pNew->pColl = pLeft->pColl;
+    }
+  }
+
+  sqlite3ExprSetHeight(pNew);
+  return pNew;
+}
+
+/*
+** Works like sqlite3Expr() except that it takes an extra Parse*
+** argument and notifies the associated connection object if malloc fails.
+*/
+Expr *sqlite3PExpr(
+  Parse *pParse,          /* Parsing context */
+  int op,                 /* Expression opcode */
+  Expr *pLeft,            /* Left operand */
+  Expr *pRight,           /* Right operand */
+  const Token *pToken     /* Argument token */
+){
+  return sqlite3Expr(pParse->db, op, pLeft, pRight, pToken);
+}
+
+/*
+** When doing a nested parse, you can include terms in an expression
+** that look like this:   #1 #2 ...  These terms refer to registers
+** in the virtual machine.  #N is the N-th register.
+**
+** This routine is called by the parser to deal with on of those terms.
+** It immediately generates code to store the value in a memory location.
+** The returns an expression that will code to extract the value from
+** that memory location as needed.
+*/
+Expr *sqlite3RegisterExpr(Parse *pParse, Token *pToken){
+  Vdbe *v = pParse->pVdbe;
+  Expr *p;
+  if( pParse->nested==0 ){
+    sqlite3ErrorMsg(pParse, "near \"%T\": syntax error", pToken);
+    return sqlite3PExpr(pParse, TK_NULL, 0, 0, 0);
+  }
+  if( v==0 ) return 0;
+  p = sqlite3PExpr(pParse, TK_REGISTER, 0, 0, pToken);
+  if( p==0 ){
+    return 0;  /* Malloc failed */
+  }
+  p->iTable = atoi((char*)&pToken->z[1]);
+  return p;
+}
+
+/*
+** Join two expressions using an AND operator.  If either expression is
+** NULL, then just return the other expression.
+*/
+Expr *sqlite3ExprAnd(sqlite3 *db, Expr *pLeft, Expr *pRight){
+  if( pLeft==0 ){
+    return pRight;
+  }else if( pRight==0 ){
+    return pLeft;
+  }else{
+    return sqlite3Expr(db, TK_AND, pLeft, pRight, 0);
+  }
+}
+
+/*
+** Set the Expr.span field of the given expression to span all
+** text between the two given tokens.
+*/
+void sqlite3ExprSpan(Expr *pExpr, Token *pLeft, Token *pRight){
+  assert( pRight!=0 );
+  assert( pLeft!=0 );
+  if( pExpr && pRight->z && pLeft->z ){
+    assert( pLeft->dyn==0 || pLeft->z[pLeft->n]==0 );
+    if( pLeft->dyn==0 && pRight->dyn==0 ){
+      pExpr->span.z = pLeft->z;
+      pExpr->span.n = pRight->n + (pRight->z - pLeft->z);
+    }else{
+      pExpr->span.z = 0;
+    }
+  }
+}
+
+/*
+** Construct a new expression node for a function with multiple
+** arguments.
+*/
+Expr *sqlite3ExprFunction(Parse *pParse, ExprList *pList, Token *pToken){
+  Expr *pNew;
+  assert( pToken );
+  pNew = sqlite3DbMallocZero(pParse->db, sizeof(Expr) );
+  if( pNew==0 ){
+    sqlite3ExprListDelete(pList); /* Avoid leaking memory when malloc fails */
+    return 0;
+  }
+  pNew->op = TK_FUNCTION;
+  pNew->pList = pList;
+  assert( pToken->dyn==0 );
+  pNew->token = *pToken;
+  pNew->span = pNew->token;
+
+  sqlite3ExprSetHeight(pNew);
+  return pNew;
+}
+
+/*
+** Assign a variable number to an expression that encodes a wildcard
+** in the original SQL statement.
+**
+** Wildcards consisting of a single "?" are assigned the next sequential
+** variable number.
+**
+** Wildcards of the form "?nnn" are assigned the number "nnn".  We make
+** sure "nnn" is not too be to avoid a denial of service attack when
+** the SQL statement comes from an external source.
+**
+** Wildcards of the form ":aaa" or "$aaa" are assigned the same number
+** as the previous instance of the same wildcard.  Or if this is the first
+** instance of the wildcard, the next sequenial variable number is
+** assigned.
+*/
+void sqlite3ExprAssignVarNumber(Parse *pParse, Expr *pExpr){
+  Token *pToken;
+  sqlite3 *db = pParse->db;
+
+  if( pExpr==0 ) return;
+  pToken = &pExpr->token;
+  assert( pToken->n>=1 );
+  assert( pToken->z!=0 );
+  assert( pToken->z[0]!=0 );
+  if( pToken->n==1 ){
+    /* Wildcard of the form "?".  Assign the next variable number */
+    pExpr->iTable = ++pParse->nVar;
+  }else if( pToken->z[0]=='?' ){
+    /* Wildcard of the form "?nnn".  Convert "nnn" to an integer and
+    ** use it as the variable number */
+    int i;
+    pExpr->iTable = i = atoi((char*)&pToken->z[1]);
+    if( i<1 || i>SQLITE_MAX_VARIABLE_NUMBER ){
+      sqlite3ErrorMsg(pParse, "variable number must be between ?1 and ?%d",
+          SQLITE_MAX_VARIABLE_NUMBER);
+    }
+    if( i>pParse->nVar ){
+      pParse->nVar = i;
+    }
+  }else{
+    /* Wildcards of the form ":aaa" or "$aaa".  Reuse the same variable
+    ** number as the prior appearance of the same name, or if the name
+    ** has never appeared before, reuse the same variable number
+    */
+    int i, n;
+    n = pToken->n;
+    for(i=0; i<pParse->nVarExpr; i++){
+      Expr *pE;
+      if( (pE = pParse->apVarExpr[i])!=0
+          && pE->token.n==n
+          && memcmp(pE->token.z, pToken->z, n)==0 ){
+        pExpr->iTable = pE->iTable;
+        break;
+      }
+    }
+    if( i>=pParse->nVarExpr ){
+      pExpr->iTable = ++pParse->nVar;
+      if( pParse->nVarExpr>=pParse->nVarExprAlloc-1 ){
+        pParse->nVarExprAlloc += pParse->nVarExprAlloc + 10;
+        pParse->apVarExpr =
+            sqlite3DbReallocOrFree(
+              db,
+              pParse->apVarExpr,
+              pParse->nVarExprAlloc*sizeof(pParse->apVarExpr[0])
+            );
+      }
+      if( !db->mallocFailed ){
+        assert( pParse->apVarExpr!=0 );
+        pParse->apVarExpr[pParse->nVarExpr++] = pExpr;
+      }
+    }
+  }
+  if( !pParse->nErr && pParse->nVar>SQLITE_MAX_VARIABLE_NUMBER ){
+    sqlite3ErrorMsg(pParse, "too many SQL variables");
+  }
+}
+
+/*
+** Recursively delete an expression tree.
+*/
+void sqlite3ExprDelete(Expr *p){
+  if( p==0 ) return;
+  if( p->span.dyn ) sqlite3_free((char*)p->span.z);
+  if( p->token.dyn ) sqlite3_free((char*)p->token.z);
+  sqlite3ExprDelete(p->pLeft);
+  sqlite3ExprDelete(p->pRight);
+  sqlite3ExprListDelete(p->pList);
+  sqlite3SelectDelete(p->pSelect);
+  sqlite3_free(p);
+}
+
+/*
+** The Expr.token field might be a string literal that is quoted.
+** If so, remove the quotation marks.
+*/
+void sqlite3DequoteExpr(sqlite3 *db, Expr *p){
+  if( ExprHasAnyProperty(p, EP_Dequoted) ){
+    return;
+  }
+  ExprSetProperty(p, EP_Dequoted);
+  if( p->token.dyn==0 ){
+    sqlite3TokenCopy(db, &p->token, &p->token);
+  }
+  sqlite3Dequote((char*)p->token.z);
+}
+
+
+/*
+** The following group of routines make deep copies of expressions,
+** expression lists, ID lists, and select statements.  The copies can
+** be deleted (by being passed to their respective ...Delete() routines)
+** without effecting the originals.
+**
+** The expression list, ID, and source lists return by sqlite3ExprListDup(),
+** sqlite3IdListDup(), and sqlite3SrcListDup() can not be further expanded
+** by subsequent calls to sqlite*ListAppend() routines.
+**
+** Any tables that the SrcList might point to are not duplicated.
+*/
+Expr *sqlite3ExprDup(sqlite3 *db, Expr *p){
+  Expr *pNew;
+  if( p==0 ) return 0;
+  pNew = sqlite3DbMallocRaw(db, sizeof(*p) );
+  if( pNew==0 ) return 0;
+  memcpy(pNew, p, sizeof(*pNew));
+  if( p->token.z!=0 ){
+    pNew->token.z = (u8*)sqlite3DbStrNDup(db, (char*)p->token.z, p->token.n);
+    pNew->token.dyn = 1;
+  }else{
+    assert( pNew->token.z==0 );
+  }
+  pNew->span.z = 0;
+  pNew->pLeft = sqlite3ExprDup(db, p->pLeft);
+  pNew->pRight = sqlite3ExprDup(db, p->pRight);
+  pNew->pList = sqlite3ExprListDup(db, p->pList);
+  pNew->pSelect = sqlite3SelectDup(db, p->pSelect);
+  return pNew;
+}
+void sqlite3TokenCopy(sqlite3 *db, Token *pTo, Token *pFrom){
+  if( pTo->dyn ) sqlite3_free((char*)pTo->z);
+  if( pFrom->z ){
+    pTo->n = pFrom->n;
+    pTo->z = (u8*)sqlite3DbStrNDup(db, (char*)pFrom->z, pFrom->n);
+    pTo->dyn = 1;
+  }else{
+    pTo->z = 0;
+  }
+}
+ExprList *sqlite3ExprListDup(sqlite3 *db, ExprList *p){
+  ExprList *pNew;
+  struct ExprList_item *pItem, *pOldItem;
+  int i;
+  if( p==0 ) return 0;
+  pNew = sqlite3DbMallocRaw(db, sizeof(*pNew) );
+  if( pNew==0 ) return 0;
+  pNew->iECursor = 0;
+  pNew->nExpr = pNew->nAlloc = p->nExpr;
+  pNew->a = pItem = sqlite3DbMallocRaw(db,  p->nExpr*sizeof(p->a[0]) );
+  if( pItem==0 ){
+    sqlite3_free(pNew);
+    return 0;
+  }
+  pOldItem = p->a;
+  for(i=0; i<p->nExpr; i++, pItem++, pOldItem++){
+    Expr *pNewExpr, *pOldExpr;
+    pItem->pExpr = pNewExpr = sqlite3ExprDup(db, pOldExpr = pOldItem->pExpr);
+    if( pOldExpr->span.z!=0 && pNewExpr ){
+      /* Always make a copy of the span for top-level expressions in the
+      ** expression list.  The logic in SELECT processing that determines
+      ** the names of columns in the result set needs this information */
+      sqlite3TokenCopy(db, &pNewExpr->span, &pOldExpr->span);
+    }
+    assert( pNewExpr==0 || pNewExpr->span.z!=0
+            || pOldExpr->span.z==0
+            || db->mallocFailed );
+    pItem->zName = sqlite3DbStrDup(db, pOldItem->zName);
+    pItem->sortOrder = pOldItem->sortOrder;
+    pItem->isAgg = pOldItem->isAgg;
+    pItem->done = 0;
+  }
+  return pNew;
+}
+
+/*
+** If cursors, triggers, views and subqueries are all omitted from
+** the build, then none of the following routines, except for
+** sqlite3SelectDup(), can be called. sqlite3SelectDup() is sometimes
+** called with a NULL argument.
+*/
+#if !defined(SQLITE_OMIT_VIEW) || !defined(SQLITE_OMIT_TRIGGER) \
+ || !defined(SQLITE_OMIT_SUBQUERY)
+SrcList *sqlite3SrcListDup(sqlite3 *db, SrcList *p){
+  SrcList *pNew;
+  int i;
+  int nByte;
+  if( p==0 ) return 0;
+  nByte = sizeof(*p) + (p->nSrc>0 ? sizeof(p->a[0]) * (p->nSrc-1) : 0);
+  pNew = sqlite3DbMallocRaw(db, nByte );
+  if( pNew==0 ) return 0;
+  pNew->nSrc = pNew->nAlloc = p->nSrc;
+  for(i=0; i<p->nSrc; i++){
+    struct SrcList_item *pNewItem = &pNew->a[i];
+    struct SrcList_item *pOldItem = &p->a[i];
+    Table *pTab;
+    pNewItem->zDatabase = sqlite3DbStrDup(db, pOldItem->zDatabase);
+    pNewItem->zName = sqlite3DbStrDup(db, pOldItem->zName);
+    pNewItem->zAlias = sqlite3DbStrDup(db, pOldItem->zAlias);
+    pNewItem->jointype = pOldItem->jointype;
+    pNewItem->iCursor = pOldItem->iCursor;
+    pNewItem->isPopulated = pOldItem->isPopulated;
+    pTab = pNewItem->pTab = pOldItem->pTab;
+    if( pTab ){
+      pTab->nRef++;
+    }
+    pNewItem->pSelect = sqlite3SelectDup(db, pOldItem->pSelect);
+    pNewItem->pOn = sqlite3ExprDup(db, pOldItem->pOn);
+    pNewItem->pUsing = sqlite3IdListDup(db, pOldItem->pUsing);
+    pNewItem->colUsed = pOldItem->colUsed;
+  }
+  return pNew;
+}
+IdList *sqlite3IdListDup(sqlite3 *db, IdList *p){
+  IdList *pNew;
+  int i;
+  if( p==0 ) return 0;
+  pNew = sqlite3DbMallocRaw(db, sizeof(*pNew) );
+  if( pNew==0 ) return 0;
+  pNew->nId = pNew->nAlloc = p->nId;
+  pNew->a = sqlite3DbMallocRaw(db, p->nId*sizeof(p->a[0]) );
+  if( pNew->a==0 ){
+    sqlite3_free(pNew);
+    return 0;
+  }
+  for(i=0; i<p->nId; i++){
+    struct IdList_item *pNewItem = &pNew->a[i];
+    struct IdList_item *pOldItem = &p->a[i];
+    pNewItem->zName = sqlite3DbStrDup(db, pOldItem->zName);
+    pNewItem->idx = pOldItem->idx;
+  }
+  return pNew;
+}
+Select *sqlite3SelectDup(sqlite3 *db, Select *p){
+  Select *pNew;
+  if( p==0 ) return 0;
+  pNew = sqlite3DbMallocRaw(db, sizeof(*p) );
+  if( pNew==0 ) return 0;
+  pNew->isDistinct = p->isDistinct;
+  pNew->pEList = sqlite3ExprListDup(db, p->pEList);
+  pNew->pSrc = sqlite3SrcListDup(db, p->pSrc);
+  pNew->pWhere = sqlite3ExprDup(db, p->pWhere);
+  pNew->pGroupBy = sqlite3ExprListDup(db, p->pGroupBy);
+  pNew->pHaving = sqlite3ExprDup(db, p->pHaving);
+  pNew->pOrderBy = sqlite3ExprListDup(db, p->pOrderBy);
+  pNew->op = p->op;
+  pNew->pPrior = sqlite3SelectDup(db, p->pPrior);
+  pNew->pLimit = sqlite3ExprDup(db, p->pLimit);
+  pNew->pOffset = sqlite3ExprDup(db, p->pOffset);
+  pNew->iLimit = -1;
+  pNew->iOffset = -1;
+  pNew->isResolved = p->isResolved;
+  pNew->isAgg = p->isAgg;
+  pNew->usesEphm = 0;
+  pNew->disallowOrderBy = 0;
+  pNew->pRightmost = 0;
+  pNew->addrOpenEphm[0] = -1;
+  pNew->addrOpenEphm[1] = -1;
+  pNew->addrOpenEphm[2] = -1;
+  return pNew;
+}
+#else
+Select *sqlite3SelectDup(sqlite3 *db, Select *p){
+  assert( p==0 );
+  return 0;
+}
+#endif
+
+
+/*
+** Add a new element to the end of an expression list.  If pList is
+** initially NULL, then create a new expression list.
+*/
+ExprList *sqlite3ExprListAppend(
+  Parse *pParse,          /* Parsing context */
+  ExprList *pList,        /* List to which to append. Might be NULL */
+  Expr *pExpr,            /* Expression to be appended */
+  Token *pName            /* AS keyword for the expression */
+){
+  sqlite3 *db = pParse->db;
+  if( pList==0 ){
+    pList = sqlite3DbMallocZero(db, sizeof(ExprList) );
+    if( pList==0 ){
+      goto no_mem;
+    }
+    assert( pList->nAlloc==0 );
+  }
+  if( pList->nAlloc<=pList->nExpr ){
+    struct ExprList_item *a;
+    int n = pList->nAlloc*2 + 4;
+    a = sqlite3DbRealloc(db, pList->a, n*sizeof(pList->a[0]));
+    if( a==0 ){
+      goto no_mem;
+    }
+    pList->a = a;
+    pList->nAlloc = n;
+  }
+  assert( pList->a!=0 );
+  if( pExpr || pName ){
+    struct ExprList_item *pItem = &pList->a[pList->nExpr++];
+    memset(pItem, 0, sizeof(*pItem));
+    pItem->zName = sqlite3NameFromToken(db, pName);
+    pItem->pExpr = pExpr;
+  }
+  return pList;
+
+no_mem:
+  /* Avoid leaking memory if malloc has failed. */
+  sqlite3ExprDelete(pExpr);
+  sqlite3ExprListDelete(pList);
+  return 0;
+}
+
+/*
+** If the expression list pEList contains more than iLimit elements,
+** leave an error message in pParse.
+*/
+void sqlite3ExprListCheckLength(
+  Parse *pParse,
+  ExprList *pEList,
+  int iLimit,
+  const char *zObject
+){
+  if( pEList && pEList->nExpr>iLimit ){
+    sqlite3ErrorMsg(pParse, "too many columns in %s", zObject);
+  }
+}
+
+
+#if defined(SQLITE_TEST) || SQLITE_MAX_EXPR_DEPTH>0
+/* The following three functions, heightOfExpr(), heightOfExprList()
+** and heightOfSelect(), are used to determine the maximum height
+** of any expression tree referenced by the structure passed as the
+** first argument.
+**
+** If this maximum height is greater than the current value pointed
+** to by pnHeight, the second parameter, then set *pnHeight to that
+** value.
+*/
+static void heightOfExpr(Expr *p, int *pnHeight){
+  if( p ){
+    if( p->nHeight>*pnHeight ){
+      *pnHeight = p->nHeight;
+    }
+  }
+}
+static void heightOfExprList(ExprList *p, int *pnHeight){
+  if( p ){
+    int i;
+    for(i=0; i<p->nExpr; i++){
+      heightOfExpr(p->a[i].pExpr, pnHeight);
+    }
+  }
+}
+static void heightOfSelect(Select *p, int *pnHeight){
+  if( p ){
+    heightOfExpr(p->pWhere, pnHeight);
+    heightOfExpr(p->pHaving, pnHeight);
+    heightOfExpr(p->pLimit, pnHeight);
+    heightOfExpr(p->pOffset, pnHeight);
+    heightOfExprList(p->pEList, pnHeight);
+    heightOfExprList(p->pGroupBy, pnHeight);
+    heightOfExprList(p->pOrderBy, pnHeight);
+    heightOfSelect(p->pPrior, pnHeight);
+  }
+}
+
+/*
+** Set the Expr.nHeight variable in the structure passed as an
+** argument. An expression with no children, Expr.pList or
+** Expr.pSelect member has a height of 1. Any other expression
+** has a height equal to the maximum height of any other
+** referenced Expr plus one.
+*/
+void sqlite3ExprSetHeight(Expr *p){
+  int nHeight = 0;
+  heightOfExpr(p->pLeft, &nHeight);
+  heightOfExpr(p->pRight, &nHeight);
+  heightOfExprList(p->pList, &nHeight);
+  heightOfSelect(p->pSelect, &nHeight);
+  p->nHeight = nHeight + 1;
+}
+
+/*
+** Return the maximum height of any expression tree referenced
+** by the select statement passed as an argument.
+*/
+int sqlite3SelectExprHeight(Select *p){
+  int nHeight = 0;
+  heightOfSelect(p, &nHeight);
+  return nHeight;
+}
+#endif
+
+/*
+** Delete an entire expression list.
+*/
+void sqlite3ExprListDelete(ExprList *pList){
+  int i;
+  struct ExprList_item *pItem;
+  if( pList==0 ) return;
+  assert( pList->a!=0 || (pList->nExpr==0 && pList->nAlloc==0) );
+  assert( pList->nExpr<=pList->nAlloc );
+  for(pItem=pList->a, i=0; i<pList->nExpr; i++, pItem++){
+    sqlite3ExprDelete(pItem->pExpr);
+    sqlite3_free(pItem->zName);
+  }
+  sqlite3_free(pList->a);
+  sqlite3_free(pList);
+}
+
+/*
+** Walk an expression tree.  Call xFunc for each node visited.
+**
+** The return value from xFunc determines whether the tree walk continues.
+** 0 means continue walking the tree.  1 means do not walk children
+** of the current node but continue with siblings.  2 means abandon
+** the tree walk completely.
+**
+** The return value from this routine is 1 to abandon the tree walk
+** and 0 to continue.
+**
+** NOTICE:  This routine does *not* descend into subqueries.
+*/
+static int walkExprList(ExprList *, int (*)(void *, Expr*), void *);
+static int walkExprTree(Expr *pExpr, int (*xFunc)(void*,Expr*), void *pArg){
+  int rc;
+  if( pExpr==0 ) return 0;
+  rc = (*xFunc)(pArg, pExpr);
+  if( rc==0 ){
+    if( walkExprTree(pExpr->pLeft, xFunc, pArg) ) return 1;
+    if( walkExprTree(pExpr->pRight, xFunc, pArg) ) return 1;
+    if( walkExprList(pExpr->pList, xFunc, pArg) ) return 1;
+  }
+  return rc>1;
+}
+
+/*
+** Call walkExprTree() for every expression in list p.
+*/
+static int walkExprList(ExprList *p, int (*xFunc)(void *, Expr*), void *pArg){
+  int i;
+  struct ExprList_item *pItem;
+  if( !p ) return 0;
+  for(i=p->nExpr, pItem=p->a; i>0; i--, pItem++){
+    if( walkExprTree(pItem->pExpr, xFunc, pArg) ) return 1;
+  }
+  return 0;
+}
+
+/*
+** Call walkExprTree() for every expression in Select p, not including
+** expressions that are part of sub-selects in any FROM clause or the LIMIT
+** or OFFSET expressions..
+*/
+static int walkSelectExpr(Select *p, int (*xFunc)(void *, Expr*), void *pArg){
+  walkExprList(p->pEList, xFunc, pArg);
+  walkExprTree(p->pWhere, xFunc, pArg);
+  walkExprList(p->pGroupBy, xFunc, pArg);
+  walkExprTree(p->pHaving, xFunc, pArg);
+  walkExprList(p->pOrderBy, xFunc, pArg);
+  if( p->pPrior ){
+    walkSelectExpr(p->pPrior, xFunc, pArg);
+  }
+  return 0;
+}
+
+
+/*
+** This routine is designed as an xFunc for walkExprTree().
+**
+** pArg is really a pointer to an integer.  If we can tell by looking
+** at pExpr that the expression that contains pExpr is not a constant
+** expression, then set *pArg to 0 and return 2 to abandon the tree walk.
+** If pExpr does does not disqualify the expression from being a constant
+** then do nothing.
+**
+** After walking the whole tree, if no nodes are found that disqualify
+** the expression as constant, then we assume the whole expression
+** is constant.  See sqlite3ExprIsConstant() for additional information.
+*/
+static int exprNodeIsConstant(void *pArg, Expr *pExpr){
+  int *pN = (int*)pArg;
+
+  /* If *pArg is 3 then any term of the expression that comes from
+  ** the ON or USING clauses of a join disqualifies the expression
+  ** from being considered constant. */
+  if( (*pN)==3 && ExprHasAnyProperty(pExpr, EP_FromJoin) ){
+    *pN = 0;
+    return 2;
+  }
+
+  switch( pExpr->op ){
+    /* Consider functions to be constant if all their arguments are constant
+    ** and *pArg==2 */
+    case TK_FUNCTION:
+      if( (*pN)==2 ) return 0;
+      /* Fall through */
+    case TK_ID:
+    case TK_COLUMN:
+    case TK_DOT:
+    case TK_AGG_FUNCTION:
+    case TK_AGG_COLUMN:
+#ifndef SQLITE_OMIT_SUBQUERY
+    case TK_SELECT:
+    case TK_EXISTS:
+#endif
+      *pN = 0;
+      return 2;
+    case TK_IN:
+      if( pExpr->pSelect ){
+        *pN = 0;
+        return 2;
+      }
+    default:
+      return 0;
+  }
+}
+
+/*
+** Walk an expression tree.  Return 1 if the expression is constant
+** and 0 if it involves variables or function calls.
+**
+** For the purposes of this function, a double-quoted string (ex: "abc")
+** is considered a variable but a single-quoted string (ex: 'abc') is
+** a constant.
+*/
+int sqlite3ExprIsConstant(Expr *p){
+  int isConst = 1;
+  walkExprTree(p, exprNodeIsConstant, &isConst);
+  return isConst;
+}
+
+/*
+** Walk an expression tree.  Return 1 if the expression is constant
+** that does no originate from the ON or USING clauses of a join.
+** Return 0 if it involves variables or function calls or terms from
+** an ON or USING clause.
+*/
+int sqlite3ExprIsConstantNotJoin(Expr *p){
+  int isConst = 3;
+  walkExprTree(p, exprNodeIsConstant, &isConst);
+  return isConst!=0;
+}
+
+/*
+** Walk an expression tree.  Return 1 if the expression is constant
+** or a function call with constant arguments.  Return and 0 if there
+** are any variables.
+**
+** For the purposes of this function, a double-quoted string (ex: "abc")
+** is considered a variable but a single-quoted string (ex: 'abc') is
+** a constant.
+*/
+int sqlite3ExprIsConstantOrFunction(Expr *p){
+  int isConst = 2;
+  walkExprTree(p, exprNodeIsConstant, &isConst);
+  return isConst!=0;
+}
+
+/*
+** If the expression p codes a constant integer that is small enough
+** to fit in a 32-bit integer, return 1 and put the value of the integer
+** in *pValue.  If the expression is not an integer or if it is too big
+** to fit in a signed 32-bit integer, return 0 and leave *pValue unchanged.
+*/
+int sqlite3ExprIsInteger(Expr *p, int *pValue){
+  switch( p->op ){
+    case TK_INTEGER: {
+      if( sqlite3GetInt32((char*)p->token.z, pValue) ){
+        return 1;
+      }
+      break;
+    }
+    case TK_UPLUS: {
+      return sqlite3ExprIsInteger(p->pLeft, pValue);
+    }
+    case TK_UMINUS: {
+      int v;
+      if( sqlite3ExprIsInteger(p->pLeft, &v) ){
+        *pValue = -v;
+        return 1;
+      }
+      break;
+    }
+    default: break;
+  }
+  return 0;
+}
+
+/*
+** Return TRUE if the given string is a row-id column name.
+*/
+int sqlite3IsRowid(const char *z){
+  if( sqlite3StrICmp(z, "_ROWID_")==0 ) return 1;
+  if( sqlite3StrICmp(z, "ROWID")==0 ) return 1;
+  if( sqlite3StrICmp(z, "OID")==0 ) return 1;
+  return 0;
+}
+
+/*
+** Given the name of a column of the form X.Y.Z or Y.Z or just Z, look up
+** that name in the set of source tables in pSrcList and make the pExpr
+** expression node refer back to that source column.  The following changes
+** are made to pExpr:
+**
+**    pExpr->iDb           Set the index in db->aDb[] of the database holding
+**                         the table.
+**    pExpr->iTable        Set to the cursor number for the table obtained
+**                         from pSrcList.
+**    pExpr->iColumn       Set to the column number within the table.
+**    pExpr->op            Set to TK_COLUMN.
+**    pExpr->pLeft         Any expression this points to is deleted
+**    pExpr->pRight        Any expression this points to is deleted.
+**
+** The pDbToken is the name of the database (the "X").  This value may be
+** NULL meaning that name is of the form Y.Z or Z.  Any available database
+** can be used.  The pTableToken is the name of the table (the "Y").  This
+** value can be NULL if pDbToken is also NULL.  If pTableToken is NULL it
+** means that the form of the name is Z and that columns from any table
+** can be used.
+**
+** If the name cannot be resolved unambiguously, leave an error message
+** in pParse and return non-zero.  Return zero on success.
+*/
+static int lookupName(
+  Parse *pParse,       /* The parsing context */
+  Token *pDbToken,     /* Name of the database containing table, or NULL */
+  Token *pTableToken,  /* Name of table containing column, or NULL */
+  Token *pColumnToken, /* Name of the column. */
+  NameContext *pNC,    /* The name context used to resolve the name */
+  Expr *pExpr          /* Make this EXPR node point to the selected column */
+){
+  char *zDb = 0;       /* Name of the database.  The "X" in X.Y.Z */
+  char *zTab = 0;      /* Name of the table.  The "Y" in X.Y.Z or Y.Z */
+  char *zCol = 0;      /* Name of the column.  The "Z" */
+  int i, j;            /* Loop counters */
+  int cnt = 0;         /* Number of matching column names */
+  int cntTab = 0;      /* Number of matching table names */
+  sqlite3 *db = pParse->db;  /* The database */
+  struct SrcList_item *pItem;       /* Use for looping over pSrcList items */
+  struct SrcList_item *pMatch = 0;  /* The matching pSrcList item */
+  NameContext *pTopNC = pNC;        /* First namecontext in the list */
+  Schema *pSchema = 0;              /* Schema of the expression */
+
+  assert( pColumnToken && pColumnToken->z ); /* The Z in X.Y.Z cannot be NULL */
+  zDb = sqlite3NameFromToken(db, pDbToken);
+  zTab = sqlite3NameFromToken(db, pTableToken);
+  zCol = sqlite3NameFromToken(db, pColumnToken);
+  if( db->mallocFailed ){
+    goto lookupname_end;
+  }
+
+  pExpr->iTable = -1;
+  while( pNC && cnt==0 ){
+    ExprList *pEList;
+    SrcList *pSrcList = pNC->pSrcList;
+
+    if( pSrcList ){
+      for(i=0, pItem=pSrcList->a; i<pSrcList->nSrc; i++, pItem++){
+        Table *pTab;
+        int iDb;
+        Column *pCol;
+
+        pTab = pItem->pTab;
+        assert( pTab!=0 );
+        iDb = sqlite3SchemaToIndex(db, pTab->pSchema);
+        assert( pTab->nCol>0 );
+        if( zTab ){
+          if( pItem->zAlias ){
+            char *zTabName = pItem->zAlias;
+            if( sqlite3StrICmp(zTabName, zTab)!=0 ) continue;
+          }else{
+            char *zTabName = pTab->zName;
+            if( zTabName==0 || sqlite3StrICmp(zTabName, zTab)!=0 ) continue;
+            if( zDb!=0 && sqlite3StrICmp(db->aDb[iDb].zName, zDb)!=0 ){
+              continue;
+            }
+          }
+        }
+        if( 0==(cntTab++) ){
+          pExpr->iTable = pItem->iCursor;
+          pSchema = pTab->pSchema;
+          pMatch = pItem;
+        }
+        for(j=0, pCol=pTab->aCol; j<pTab->nCol; j++, pCol++){
+          if( sqlite3StrICmp(pCol->zName, zCol)==0 ){
+            const char *zColl = pTab->aCol[j].zColl;
+            IdList *pUsing;
+            cnt++;
+            pExpr->iTable = pItem->iCursor;
+            pMatch = pItem;
+            pSchema = pTab->pSchema;
+            /* Substitute the rowid (column -1) for the INTEGER PRIMARY KEY */
+            pExpr->iColumn = j==pTab->iPKey ? -1 : j;
+            pExpr->affinity = pTab->aCol[j].affinity;
+            if( (pExpr->flags & EP_ExpCollate)==0 ){
+              pExpr->pColl = sqlite3FindCollSeq(db, ENC(db), zColl,-1, 0);
+            }
+            if( i<pSrcList->nSrc-1 ){
+              if( pItem[1].jointype & JT_NATURAL ){
+                /* If this match occurred in the left table of a natural join,
+                ** then skip the right table to avoid a duplicate match */
+                pItem++;
+                i++;
+              }else if( (pUsing = pItem[1].pUsing)!=0 ){
+                /* If this match occurs on a column that is in the USING clause
+                ** of a join, skip the search of the right table of the join
+                ** to avoid a duplicate match there. */
+                int k;
+                for(k=0; k<pUsing->nId; k++){
+                  if( sqlite3StrICmp(pUsing->a[k].zName, zCol)==0 ){
+                    pItem++;
+                    i++;
+                    break;
+                  }
+                }
+              }
+            }
+            break;
+          }
+        }
+      }
+    }
+
+#ifndef SQLITE_OMIT_TRIGGER
+    /* If we have not already resolved the name, then maybe
+    ** it is a new.* or old.* trigger argument reference
+    */
+    if( zDb==0 && zTab!=0 && cnt==0 && pParse->trigStack!=0 ){
+      TriggerStack *pTriggerStack = pParse->trigStack;
+      Table *pTab = 0;
+      u32 *piColMask;
+      if( pTriggerStack->newIdx != -1 && sqlite3StrICmp("new", zTab) == 0 ){
+        pExpr->iTable = pTriggerStack->newIdx;
+        assert( pTriggerStack->pTab );
+        pTab = pTriggerStack->pTab;
+        piColMask = &(pTriggerStack->newColMask);
+      }else if( pTriggerStack->oldIdx != -1 && sqlite3StrICmp("old", zTab)==0 ){
+        pExpr->iTable = pTriggerStack->oldIdx;
+        assert( pTriggerStack->pTab );
+        pTab = pTriggerStack->pTab;
+        piColMask = &(pTriggerStack->oldColMask);
+      }
+
+      if( pTab ){
+        int iCol;
+        Column *pCol = pTab->aCol;
+
+        pSchema = pTab->pSchema;
+        cntTab++;
+        for(iCol=0; iCol < pTab->nCol; iCol++, pCol++) {
+          if( sqlite3StrICmp(pCol->zName, zCol)==0 ){
+            const char *zColl = pTab->aCol[iCol].zColl;
+            cnt++;
+            pExpr->iColumn = iCol==pTab->iPKey ? -1 : iCol;
+            pExpr->affinity = pTab->aCol[iCol].affinity;
+            if( (pExpr->flags & EP_ExpCollate)==0 ){
+              pExpr->pColl = sqlite3FindCollSeq(db, ENC(db), zColl,-1, 0);
+            }
+            pExpr->pTab = pTab;
+            if( iCol>=0 ){
+              *piColMask |= ((u32)1<<iCol) | (iCol>=32?0xffffffff:0);
+            }
+            break;
+          }
+        }
+      }
+    }
+#endif /* !defined(SQLITE_OMIT_TRIGGER) */
+
+    /*
+    ** Perhaps the name is a reference to the ROWID
+    */
+    if( cnt==0 && cntTab==1 && sqlite3IsRowid(zCol) ){
+      cnt = 1;
+      pExpr->iColumn = -1;
+      pExpr->affinity = SQLITE_AFF_INTEGER;
+    }
+
+    /*
+    ** If the input is of the form Z (not Y.Z or X.Y.Z) then the name Z
+    ** might refer to an result-set alias.  This happens, for example, when
+    ** we are resolving names in the WHERE clause of the following command:
+    **
+    **     SELECT a+b AS x FROM table WHERE x<10;
+    **
+    ** In cases like this, replace pExpr with a copy of the expression that
+    ** forms the result set entry ("a+b" in the example) and return immediately.
+    ** Note that the expression in the result set should have already been
+    ** resolved by the time the WHERE clause is resolved.
+    */
+    if( cnt==0 && (pEList = pNC->pEList)!=0 && zTab==0 ){
+      for(j=0; j<pEList->nExpr; j++){
+        char *zAs = pEList->a[j].zName;
+        if( zAs!=0 && sqlite3StrICmp(zAs, zCol)==0 ){
+          Expr *pDup, *pOrig;
+          assert( pExpr->pLeft==0 && pExpr->pRight==0 );
+          assert( pExpr->pList==0 );
+          assert( pExpr->pSelect==0 );
+          pOrig = pEList->a[j].pExpr;
+          if( !pNC->allowAgg && ExprHasProperty(pOrig, EP_Agg) ){
+            sqlite3ErrorMsg(pParse, "misuse of aliased aggregate %s", zAs);
+            sqlite3_free(zCol);
+            return 2;
+          }
+          pDup = sqlite3ExprDup(db, pOrig);
+          if( pExpr->flags & EP_ExpCollate ){
+            pDup->pColl = pExpr->pColl;
+            pDup->flags |= EP_ExpCollate;
+          }
+          if( pExpr->span.dyn ) sqlite3_free((char*)pExpr->span.z);
+          if( pExpr->token.dyn ) sqlite3_free((char*)pExpr->token.z);
+          memcpy(pExpr, pDup, sizeof(*pExpr));
+          sqlite3_free(pDup);
+          cnt = 1;
+          pMatch = 0;
+          assert( zTab==0 && zDb==0 );
+          goto lookupname_end_2;
+        }
+      }
+    }
+
+    /* Advance to the next name context.  The loop will exit when either
+    ** we have a match (cnt>0) or when we run out of name contexts.
+    */
+    if( cnt==0 ){
+      pNC = pNC->pNext;
+    }
+  }
+
+  /*
+  ** If X and Y are NULL (in other words if only the column name Z is
+  ** supplied) and the value of Z is enclosed in double-quotes, then
+  ** Z is a string literal if it doesn't match any column names.  In that
+  ** case, we need to return right away and not make any changes to
+  ** pExpr.
+  **
+  ** Because no reference was made to outer contexts, the pNC->nRef
+  ** fields are not changed in any context.
+  */
+  if( cnt==0 && zTab==0 && pColumnToken->z[0]=='"' ){
+    sqlite3_free(zCol);
+    return 0;
+  }
+
+  /*
+  ** cnt==0 means there was not match.  cnt>1 means there were two or
+  ** more matches.  Either way, we have an error.
+  */
+  if( cnt!=1 ){
+    const char *zErr;
+    zErr = cnt==0 ? "no such column" : "ambiguous column name";
+    if( zDb ){
+      sqlite3ErrorMsg(pParse, "%s: %s.%s.%s", zErr, zDb, zTab, zCol);
+    }else if( zTab ){
+      sqlite3ErrorMsg(pParse, "%s: %s.%s", zErr, zTab, zCol);
+    }else{
+      sqlite3ErrorMsg(pParse, "%s: %s", zErr, zCol);
+    }
+    pTopNC->nErr++;
+  }
+
+  /* If a column from a table in pSrcList is referenced, then record
+  ** this fact in the pSrcList.a[].colUsed bitmask.  Column 0 causes
+  ** bit 0 to be set.  Column 1 sets bit 1.  And so forth.  If the
+  ** column number is greater than the number of bits in the bitmask
+  ** then set the high-order bit of the bitmask.
+  */
+  if( pExpr->iColumn>=0 && pMatch!=0 ){
+    int n = pExpr->iColumn;
+    if( n>=sizeof(Bitmask)*8 ){
+      n = sizeof(Bitmask)*8-1;
+    }
+    assert( pMatch->iCursor==pExpr->iTable );
+    pMatch->colUsed |= ((Bitmask)1)<<n;
+  }
+
+lookupname_end:
+  /* Clean up and return
+  */
+  sqlite3_free(zDb);
+  sqlite3_free(zTab);
+  sqlite3ExprDelete(pExpr->pLeft);
+  pExpr->pLeft = 0;
+  sqlite3ExprDelete(pExpr->pRight);
+  pExpr->pRight = 0;
+  pExpr->op = TK_COLUMN;
+lookupname_end_2:
+  sqlite3_free(zCol);
+  if( cnt==1 ){
+    assert( pNC!=0 );
+    sqlite3AuthRead(pParse, pExpr, pSchema, pNC->pSrcList);
+    if( pMatch && !pMatch->pSelect ){
+      pExpr->pTab = pMatch->pTab;
+    }
+    /* Increment the nRef value on all name contexts from TopNC up to
+    ** the point where the name matched. */
+    for(;;){
+      assert( pTopNC!=0 );
+      pTopNC->nRef++;
+      if( pTopNC==pNC ) break;
+      pTopNC = pTopNC->pNext;
+    }
+    return 0;
+  } else {
+    return 1;
+  }
+}
+
+/*
+** This routine is designed as an xFunc for walkExprTree().
+**
+** Resolve symbolic names into TK_COLUMN operators for the current
+** node in the expression tree.  Return 0 to continue the search down
+** the tree or 2 to abort the tree walk.
+**
+** This routine also does error checking and name resolution for
+** function names.  The operator for aggregate functions is changed
+** to TK_AGG_FUNCTION.
+*/
+static int nameResolverStep(void *pArg, Expr *pExpr){
+  NameContext *pNC = (NameContext*)pArg;
+  Parse *pParse;
+
+  if( pExpr==0 ) return 1;
+  assert( pNC!=0 );
+  pParse = pNC->pParse;
+
+  if( ExprHasAnyProperty(pExpr, EP_Resolved) ) return 1;
+  ExprSetProperty(pExpr, EP_Resolved);
+#ifndef NDEBUG
+  if( pNC->pSrcList && pNC->pSrcList->nAlloc>0 ){
+    SrcList *pSrcList = pNC->pSrcList;
+    int i;
+    for(i=0; i<pNC->pSrcList->nSrc; i++){
+      assert( pSrcList->a[i].iCursor>=0 && pSrcList->a[i].iCursor<pParse->nTab);
+    }
+  }
+#endif
+  switch( pExpr->op ){
+    /* Double-quoted strings (ex: "abc") are used as identifiers if
+    ** possible.  Otherwise they remain as strings.  Single-quoted
+    ** strings (ex: 'abc') are always string literals.
+    */
+    case TK_STRING: {
+      if( pExpr->token.z[0]=='\'' ) break;
+      /* Fall thru into the TK_ID case if this is a double-quoted string */
+    }
+    /* A lone identifier is the name of a column.
+    */
+    case TK_ID: {
+      lookupName(pParse, 0, 0, &pExpr->token, pNC, pExpr);
+      return 1;
+    }
+
+    /* A table name and column name:     ID.ID
+    ** Or a database, table and column:  ID.ID.ID
+    */
+    case TK_DOT: {
+      Token *pColumn;
+      Token *pTable;
+      Token *pDb;
+      Expr *pRight;
+
+      /* if( pSrcList==0 ) break; */
+      pRight = pExpr->pRight;
+      if( pRight->op==TK_ID ){
+        pDb = 0;
+        pTable = &pExpr->pLeft->token;
+        pColumn = &pRight->token;
+      }else{
+        assert( pRight->op==TK_DOT );
+        pDb = &pExpr->pLeft->token;
+        pTable = &pRight->pLeft->token;
+        pColumn = &pRight->pRight->token;
+      }
+      lookupName(pParse, pDb, pTable, pColumn, pNC, pExpr);
+      return 1;
+    }
+
+    /* Resolve function names
+    */
+    case TK_CONST_FUNC:
+    case TK_FUNCTION: {
+      ExprList *pList = pExpr->pList;    /* The argument list */
+      int n = pList ? pList->nExpr : 0;  /* Number of arguments */
+      int no_such_func = 0;       /* True if no such function exists */
+      int wrong_num_args = 0;     /* True if wrong number of arguments */
+      int is_agg = 0;             /* True if is an aggregate function */
+      int i;
+      int auth;                   /* Authorization to use the function */
+      int nId;                    /* Number of characters in function name */
+      const char *zId;            /* The function name. */
+      FuncDef *pDef;              /* Information about the function */
+      int enc = ENC(pParse->db);  /* The database encoding */
+
+      zId = (char*)pExpr->token.z;
+      nId = pExpr->token.n;
+      pDef = sqlite3FindFunction(pParse->db, zId, nId, n, enc, 0);
+      if( pDef==0 ){
+        pDef = sqlite3FindFunction(pParse->db, zId, nId, -1, enc, 0);
+        if( pDef==0 ){
+          no_such_func = 1;
+        }else{
+          wrong_num_args = 1;
+        }
+      }else{
+        is_agg = pDef->xFunc==0;
+      }
+#ifndef SQLITE_OMIT_AUTHORIZATION
+      if( pDef ){
+        auth = sqlite3AuthCheck(pParse, SQLITE_FUNCTION, 0, pDef->zName, 0);
+        if( auth!=SQLITE_OK ){
+          if( auth==SQLITE_DENY ){
+            sqlite3ErrorMsg(pParse, "not authorized to use function: %s",
+                                    pDef->zName);
+            pNC->nErr++;
+          }
+          pExpr->op = TK_NULL;
+          return 1;
+        }
+      }
+#endif
+      if( is_agg && !pNC->allowAgg ){
+        sqlite3ErrorMsg(pParse, "misuse of aggregate function %.*s()", nId,zId);
+        pNC->nErr++;
+        is_agg = 0;
+      }else if( no_such_func ){
+        sqlite3ErrorMsg(pParse, "no such function: %.*s", nId, zId);
+        pNC->nErr++;
+      }else if( wrong_num_args ){
+        sqlite3ErrorMsg(pParse,"wrong number of arguments to function %.*s()",
+             nId, zId);
+        pNC->nErr++;
+      }
+      if( is_agg ){
+        pExpr->op = TK_AGG_FUNCTION;
+        pNC->hasAgg = 1;
+      }
+      if( is_agg ) pNC->allowAgg = 0;
+      for(i=0; pNC->nErr==0 && i<n; i++){
+        walkExprTree(pList->a[i].pExpr, nameResolverStep, pNC);
+      }
+      if( is_agg ) pNC->allowAgg = 1;
+      /* FIX ME:  Compute pExpr->affinity based on the expected return
+      ** type of the function
+      */
+      return is_agg;
+    }
+#ifndef SQLITE_OMIT_SUBQUERY
+    case TK_SELECT:
+    case TK_EXISTS:
+#endif
+    case TK_IN: {
+      if( pExpr->pSelect ){
+        int nRef = pNC->nRef;
+#ifndef SQLITE_OMIT_CHECK
+        if( pNC->isCheck ){
+          sqlite3ErrorMsg(pParse,"subqueries prohibited in CHECK constraints");
+        }
+#endif
+        sqlite3SelectResolve(pParse, pExpr->pSelect, pNC);
+        assert( pNC->nRef>=nRef );
+        if( nRef!=pNC->nRef ){
+          ExprSetProperty(pExpr, EP_VarSelect);
+        }
+      }
+      break;
+    }
+#ifndef SQLITE_OMIT_CHECK
+    case TK_VARIABLE: {
+      if( pNC->isCheck ){
+        sqlite3ErrorMsg(pParse,"parameters prohibited in CHECK constraints");
+      }
+      break;
+    }
+#endif
+  }
+  return 0;
+}
+
+/*
+** This routine walks an expression tree and resolves references to
+** table columns.  Nodes of the form ID.ID or ID resolve into an
+** index to the table in the table list and a column offset.  The
+** Expr.opcode for such nodes is changed to TK_COLUMN.  The Expr.iTable
+** value is changed to the index of the referenced table in pTabList
+** plus the "base" value.  The base value will ultimately become the
+** VDBE cursor number for a cursor that is pointing into the referenced
+** table.  The Expr.iColumn value is changed to the index of the column
+** of the referenced table.  The Expr.iColumn value for the special
+** ROWID column is -1.  Any INTEGER PRIMARY KEY column is tried as an
+** alias for ROWID.
+**
+** Also resolve function names and check the functions for proper
+** usage.  Make sure all function names are recognized and all functions
+** have the correct number of arguments.  Leave an error message
+** in pParse->zErrMsg if anything is amiss.  Return the number of errors.
+**
+** If the expression contains aggregate functions then set the EP_Agg
+** property on the expression.
+*/
+int sqlite3ExprResolveNames(
+  NameContext *pNC,       /* Namespace to resolve expressions in. */
+  Expr *pExpr             /* The expression to be analyzed. */
+){
+  int savedHasAgg;
+  if( pExpr==0 ) return 0;
+#if defined(SQLITE_TEST) || SQLITE_MAX_EXPR_DEPTH>0
+  if( (pExpr->nHeight+pNC->pParse->nHeight)>SQLITE_MAX_EXPR_DEPTH ){
+    sqlite3ErrorMsg(pNC->pParse,
+       "Expression tree is too large (maximum depth %d)",
+       SQLITE_MAX_EXPR_DEPTH
+    );
+    return 1;
+  }
+  pNC->pParse->nHeight += pExpr->nHeight;
+#endif
+  savedHasAgg = pNC->hasAgg;
+  pNC->hasAgg = 0;
+  walkExprTree(pExpr, nameResolverStep, pNC);
+#if defined(SQLITE_TEST) || SQLITE_MAX_EXPR_DEPTH>0
+  pNC->pParse->nHeight -= pExpr->nHeight;
+#endif
+  if( pNC->nErr>0 ){
+    ExprSetProperty(pExpr, EP_Error);
+  }
+  if( pNC->hasAgg ){
+    ExprSetProperty(pExpr, EP_Agg);
+  }else if( savedHasAgg ){
+    pNC->hasAgg = 1;
+  }
+  return ExprHasProperty(pExpr, EP_Error);
+}
+
+/*
+** A pointer instance of this structure is used to pass information
+** through walkExprTree into codeSubqueryStep().
+*/
+typedef struct QueryCoder QueryCoder;
+struct QueryCoder {
+  Parse *pParse;       /* The parsing context */
+  NameContext *pNC;    /* Namespace of first enclosing query */
+};
+
+#ifdef SQLITE_TEST
+  int sqlite3_enable_in_opt = 1;
+#else
+  #define sqlite3_enable_in_opt 1
+#endif
+
+/*
+** This function is used by the implementation of the IN (...) operator.
+** It's job is to find or create a b-tree structure that may be used
+** either to test for membership of the (...) set or to iterate through
+** its members, skipping duplicates.
+**
+** The cursor opened on the structure (database table, database index
+** or ephermal table) is stored in pX->iTable before this function returns.
+** The returned value indicates the structure type, as follows:
+**
+**   IN_INDEX_ROWID - The cursor was opened on a database table.
+**   IN_INDEX_INDEX - The cursor was opened on a database index.
+**   IN_INDEX_EPH -   The cursor was opened on a specially created and
+**                    populated epheremal table.
+**
+** An existing structure may only be used if the SELECT is of the simple
+** form:
+**
+**     SELECT <column> FROM <table>
+**
+** If the mustBeUnique parameter is false, the structure will be used
+** for fast set membership tests. In this case an epheremal table must
+** be used unless <column> is an INTEGER PRIMARY KEY or an index can
+** be found with <column> as its left-most column.
+**
+** If mustBeUnique is true, then the structure will be used to iterate
+** through the set members, skipping any duplicates. In this case an
+** epheremal table must be used unless the selected <column> is guaranteed
+** to be unique - either because it is an INTEGER PRIMARY KEY or it
+** is unique by virtue of a constraint or implicit index.
+*/
+#ifndef SQLITE_OMIT_SUBQUERY
+int sqlite3FindInIndex(Parse *pParse, Expr *pX, int mustBeUnique){
+  Select *p;
+  int eType = 0;
+  int iTab = pParse->nTab++;
+
+  /* The follwing if(...) expression is true if the SELECT is of the
+  ** simple form:
+  **
+  **     SELECT <column> FROM <table>
+  **
+  ** If this is the case, it may be possible to use an existing table
+  ** or index instead of generating an epheremal table.
+  */
+  if( sqlite3_enable_in_opt
+   && (p=pX->pSelect)!=0 && !p->pPrior
+   && !p->isDistinct && !p->isAgg && !p->pGroupBy
+   && p->pSrc && p->pSrc->nSrc==1 && !p->pSrc->a[0].pSelect
+   && p->pSrc->a[0].pTab && !p->pSrc->a[0].pTab->pSelect
+   && p->pEList->nExpr==1 && p->pEList->a[0].pExpr->op==TK_COLUMN
+   && !p->pLimit && !p->pOffset && !p->pWhere
+  ){
+    sqlite3 *db = pParse->db;
+    Index *pIdx;
+    Expr *pExpr = p->pEList->a[0].pExpr;
+    int iCol = pExpr->iColumn;
+    Vdbe *v = sqlite3GetVdbe(pParse);
+
+    /* This function is only called from two places. In both cases the vdbe
+    ** has already been allocated. So assume sqlite3GetVdbe() is always
+    ** successful here.
+    */
+    assert(v);
+    if( iCol<0 ){
+      int iMem = ++pParse->nMem;
+      int iAddr;
+      Table *pTab = p->pSrc->a[0].pTab;
+      int iDb = sqlite3SchemaToIndex(db, pTab->pSchema);
+      sqlite3VdbeUsesBtree(v, iDb);
+
+      iAddr = sqlite3VdbeAddOp1(v, OP_If, iMem);
+      sqlite3VdbeAddOp2(v, OP_Integer, 1, iMem);
+
+      sqlite3OpenTable(pParse, iTab, iDb, pTab, OP_OpenRead);
+      eType = IN_INDEX_ROWID;
+
+      sqlite3VdbeJumpHere(v, iAddr);
+    }else{
+      /* The collation sequence used by the comparison. If an index is to
+      ** be used in place of a temp-table, it must be ordered according
+      ** to this collation sequence.
+      */
+      CollSeq *pReq = sqlite3BinaryCompareCollSeq(pParse, pX->pLeft, pExpr);
+
+      /* Check that the affinity that will be used to perform the
+      ** comparison is the same as the affinity of the column. If
+      ** it is not, it is not possible to use any index.
+      */
+      Table *pTab = p->pSrc->a[0].pTab;
+      char aff = comparisonAffinity(pX);
+      int affinity_ok = (pTab->aCol[iCol].affinity==aff||aff==SQLITE_AFF_NONE);
+
+      for(pIdx=pTab->pIndex; pIdx && eType==0 && affinity_ok; pIdx=pIdx->pNext){
+        if( (pIdx->aiColumn[0]==iCol)
+         && (pReq==sqlite3FindCollSeq(db, ENC(db), pIdx->azColl[0], -1, 0))
+         && (!mustBeUnique || (pIdx->nColumn==1 && pIdx->onError!=OE_None))
+        ){
+          int iDb;
+          int iMem = ++pParse->nMem;
+          int iAddr;
+          char *pKey;
+
+          pKey = (char *)sqlite3IndexKeyinfo(pParse, pIdx);
+          iDb = sqlite3SchemaToIndex(db, pIdx->pSchema);
+          sqlite3VdbeUsesBtree(v, iDb);
+
+          iAddr = sqlite3VdbeAddOp1(v, OP_If, iMem);
+          sqlite3VdbeAddOp2(v, OP_Integer, 1, iMem);
+
+          sqlite3VdbeAddOp4(v, OP_OpenRead, iTab, pIdx->tnum, iDb,
+                               pKey,P4_KEYINFO_HANDOFF);
+          VdbeComment((v, "%s", pIdx->zName));
+          eType = IN_INDEX_INDEX;
+          sqlite3VdbeAddOp2(v, OP_SetNumColumns, iTab, pIdx->nColumn);
+
+          sqlite3VdbeJumpHere(v, iAddr);
+        }
+      }
+    }
+  }
+
+  if( eType==0 ){
+    sqlite3CodeSubselect(pParse, pX);
+    eType = IN_INDEX_EPH;
+  }else{
+    pX->iTable = iTab;
+  }
+  return eType;
+}
+#endif
+
+/*
+** Generate code for scalar subqueries used as an expression
+** and IN operators.  Examples:
+**
+**     (SELECT a FROM b)          -- subquery
+**     EXISTS (SELECT a FROM b)   -- EXISTS subquery
+**     x IN (4,5,11)              -- IN operator with list on right-hand side
+**     x IN (SELECT a FROM b)     -- IN operator with subquery on the right
+**
+** The pExpr parameter describes the expression that contains the IN
+** operator or subquery.
+*/
+#ifndef SQLITE_OMIT_SUBQUERY
+void sqlite3CodeSubselect(Parse *pParse, Expr *pExpr){
+  int testAddr = 0;                       /* One-time test address */
+  Vdbe *v = sqlite3GetVdbe(pParse);
+  if( v==0 ) return;
+
+
+  /* This code must be run in its entirety every time it is encountered
+  ** if any of the following is true:
+  **
+  **    *  The right-hand side is a correlated subquery
+  **    *  The right-hand side is an expression list containing variables
+  **    *  We are inside a trigger
+  **
+  ** If all of the above are false, then we can run this code just once
+  ** save the results, and reuse the same result on subsequent invocations.
+  */
+  if( !ExprHasAnyProperty(pExpr, EP_VarSelect) && !pParse->trigStack ){
+    int mem = ++pParse->nMem;
+    sqlite3VdbeAddOp1(v, OP_If, mem);
+    testAddr = sqlite3VdbeAddOp2(v, OP_Integer, 1, mem);
+    assert( testAddr>0 || pParse->db->mallocFailed );
+  }
+
+  switch( pExpr->op ){
+    case TK_IN: {
+      char affinity;
+      KeyInfo keyInfo;
+      int addr;        /* Address of OP_OpenEphemeral instruction */
+
+      affinity = sqlite3ExprAffinity(pExpr->pLeft);
+
+      /* Whether this is an 'x IN(SELECT...)' or an 'x IN(<exprlist>)'
+      ** expression it is handled the same way. A virtual table is
+      ** filled with single-field index keys representing the results
+      ** from the SELECT or the <exprlist>.
+      **
+      ** If the 'x' expression is a column value, or the SELECT...
+      ** statement returns a column value, then the affinity of that
+      ** column is used to build the index keys. If both 'x' and the
+      ** SELECT... statement are columns, then numeric affinity is used
+      ** if either column has NUMERIC or INTEGER affinity. If neither
+      ** 'x' nor the SELECT... statement are columns, then numeric affinity
+      ** is used.
+      */
+      pExpr->iTable = pParse->nTab++;
+      addr = sqlite3VdbeAddOp1(v, OP_OpenEphemeral, pExpr->iTable);
+      memset(&keyInfo, 0, sizeof(keyInfo));
+      keyInfo.nField = 1;
+      sqlite3VdbeAddOp2(v, OP_SetNumColumns, pExpr->iTable, 1);
+
+      if( pExpr->pSelect ){
+        /* Case 1:     expr IN (SELECT ...)
+        **
+        ** Generate code to write the results of the select into the temporary
+        ** table allocated and opened above.
+        */
+        SelectDest dest;
+        ExprList *pEList;
+
+        sqlite3SelectDestInit(&dest, SRT_Set, pExpr->iTable);
+        dest.affinity = (int)affinity;
+        assert( (pExpr->iTable&0x0000FFFF)==pExpr->iTable );
+        if( sqlite3Select(pParse, pExpr->pSelect, &dest, 0, 0, 0, 0) ){
+          return;
+        }
+        pEList = pExpr->pSelect->pEList;
+        if( pEList && pEList->nExpr>0 ){
+          keyInfo.aColl[0] = sqlite3BinaryCompareCollSeq(pParse, pExpr->pLeft,
+              pEList->a[0].pExpr);
+        }
+      }else if( pExpr->pList ){
+        /* Case 2:     expr IN (exprlist)
+        **
+        ** For each expression, build an index key from the evaluation and
+        ** store it in the temporary table. If <expr> is a column, then use
+        ** that columns affinity when building index keys. If <expr> is not
+        ** a column, use numeric affinity.
+        */
+        int i;
+        ExprList *pList = pExpr->pList;
+        struct ExprList_item *pItem;
+        int r1, r2;
+
+        if( !affinity ){
+          affinity = SQLITE_AFF_NONE;
+        }
+        keyInfo.aColl[0] = pExpr->pLeft->pColl;
+
+        /* Loop through each expression in <exprlist>. */
+        r1 = sqlite3GetTempReg(pParse);
+        r2 = sqlite3GetTempReg(pParse);
+        for(i=pList->nExpr, pItem=pList->a; i>0; i--, pItem++){
+          Expr *pE2 = pItem->pExpr;
+
+          /* If the expression is not constant then we will need to
+          ** disable the test that was generated above that makes sure
+          ** this code only executes once.  Because for a non-constant
+          ** expression we need to rerun this code each time.
+          */
+          if( testAddr && !sqlite3ExprIsConstant(pE2) ){
+            sqlite3VdbeChangeToNoop(v, testAddr-1, 2);
+            testAddr = 0;
+          }
+
+          /* Evaluate the expression and insert it into the temp table */
+          sqlite3ExprCode(pParse, pE2, r1);
+          sqlite3VdbeAddOp4(v, OP_MakeRecord, r1, 1, r2, &affinity, 1);
+          sqlite3VdbeAddOp2(v, OP_IdxInsert, pExpr->iTable, r2);
+        }
+        sqlite3ReleaseTempReg(pParse, r1);
+        sqlite3ReleaseTempReg(pParse, r2);
+      }
+      sqlite3VdbeChangeP4(v, addr, (void *)&keyInfo, P4_KEYINFO);
+      break;
+    }
+
+    case TK_EXISTS:
+    case TK_SELECT: {
+      /* This has to be a scalar SELECT.  Generate code to put the
+      ** value of this select in a memory cell and record the number
+      ** of the memory cell in iColumn.
+      */
+      static const Token one = { (u8*)"1", 0, 1 };
+      Select *pSel;
+      SelectDest dest;
+
+      pSel = pExpr->pSelect;
+      sqlite3SelectDestInit(&dest, 0, ++pParse->nMem);
+      if( pExpr->op==TK_SELECT ){
+        dest.eDest = SRT_Mem;
+        sqlite3VdbeAddOp2(v, OP_Null, 0, dest.iParm);
+        VdbeComment((v, "Init subquery result"));
+      }else{
+        dest.eDest = SRT_Exists;
+        sqlite3VdbeAddOp2(v, OP_Integer, 0, dest.iParm);
+        VdbeComment((v, "Init EXISTS result"));
+      }
+      sqlite3ExprDelete(pSel->pLimit);
+      pSel->pLimit = sqlite3PExpr(pParse, TK_INTEGER, 0, 0, &one);
+      if( sqlite3Select(pParse, pSel, &dest, 0, 0, 0, 0) ){
+        return;
+      }
+      pExpr->iColumn = dest.iParm;
+      break;
+    }
+  }
+
+  if( testAddr ){
+    sqlite3VdbeJumpHere(v, testAddr-1);
+  }
+
+  return;
+}
+#endif /* SQLITE_OMIT_SUBQUERY */
+
+/*
+** Duplicate an 8-byte value
+*/
+static char *dup8bytes(Vdbe *v, const char *in){
+  char *out = sqlite3DbMallocRaw(sqlite3VdbeDb(v), 8);
+  if( out ){
+    memcpy(out, in, 8);
+  }
+  return out;
+}
+
+/*
+** Generate an instruction that will put the floating point
+** value described by z[0..n-1] into register iMem.
+**
+** The z[] string will probably not be zero-terminated.  But the
+** z[n] character is guaranteed to be something that does not look
+** like the continuation of the number.
+*/
+static void codeReal(Vdbe *v, const char *z, int n, int negateFlag, int iMem){
+  assert( z || v==0 || sqlite3VdbeDb(v)->mallocFailed );
+  if( z ){
+    double value;
+    char *zV;
+    assert( !isdigit(z[n]) );
+    sqlite3AtoF(z, &value);
+    if( negateFlag ) value = -value;
+    zV = dup8bytes(v, (char*)&value);
+    sqlite3VdbeAddOp4(v, OP_Real, 0, iMem, 0, zV, P4_REAL);
+  }
+}
+
+
+/*
+** Generate an instruction that will put the integer describe by
+** text z[0..n-1] into register iMem.
+**
+** The z[] string will probably not be zero-terminated.  But the
+** z[n] character is guaranteed to be something that does not look
+** like the continuation of the number.
+*/
+static void codeInteger(Vdbe *v, const char *z, int n, int negFlag, int iMem){
+  assert( z || v==0 || sqlite3VdbeDb(v)->mallocFailed );
+  if( z ){
+    int i;
+    assert( !isdigit(z[n]) );
+    if( sqlite3GetInt32(z, &i) ){
+      if( negFlag ) i = -i;
+      sqlite3VdbeAddOp2(v, OP_Integer, i, iMem);
+    }else if( sqlite3FitsIn64Bits(z, negFlag) ){
+      i64 value;
+      char *zV;
+      sqlite3Atoi64(z, &value);
+      if( negFlag ) value = -value;
+      zV = dup8bytes(v, (char*)&value);
+      sqlite3VdbeAddOp4(v, OP_Int64, 0, iMem, 0, zV, P4_INT64);
+    }else{
+      codeReal(v, z, n, negFlag, iMem);
+    }
+  }
+}
+
+
+/*
+** Generate code that will extract the iColumn-th column from
+** table pTab and store the column value in register iReg.
+** There is an open cursor to pTab in
+** iTable.  If iColumn<0 then code is generated that extracts the rowid.
+*/
+void sqlite3ExprCodeGetColumn(
+  Vdbe *v,         /* The VM being created */
+  Table *pTab,     /* Description of the table we are reading from */
+  int iColumn,     /* Index of the table column */
+  int iTable,      /* The cursor pointing to the table */
+  int iReg         /* Store results here */
+){
+  if( iColumn<0 ){
+    int op = (pTab && IsVirtual(pTab)) ? OP_VRowid : OP_Rowid;
+    sqlite3VdbeAddOp2(v, op, iTable, iReg);
+  }else if( pTab==0 ){
+    sqlite3VdbeAddOp3(v, OP_Column, iTable, iColumn, iReg);
+  }else{
+    int op = IsVirtual(pTab) ? OP_VColumn : OP_Column;
+    sqlite3VdbeAddOp3(v, op, iTable, iColumn, iReg);
+    sqlite3ColumnDefault(v, pTab, iColumn);
+#ifndef SQLITE_OMIT_FLOATING_POINT
+    if( pTab->aCol[iColumn].affinity==SQLITE_AFF_REAL ){
+      sqlite3VdbeAddOp1(v, OP_RealAffinity, iReg);
+    }
+#endif
+  }
+}
+
+/*
+** Generate code into the current Vdbe to evaluate the given
+** expression.  Attempt to store the results in register "target".
+** Return the register where results are stored.
+**
+** With this routine, there is no guaranteed that results will
+** be stored in target.  The result might be stored in some other
+** register if it is convenient to do so.  The calling function
+** must check the return code and move the results to the desired
+** register.
+*/
+static int sqlite3ExprCodeTarget(Parse *pParse, Expr *pExpr, int target){
+  Vdbe *v = pParse->pVdbe;  /* The VM under construction */
+  int op;                   /* The opcode being coded */
+  int inReg = target;       /* Results stored in register inReg */
+  int regFree1 = 0;         /* If non-zero free this temporary register */
+  int regFree2 = 0;         /* If non-zero free this temporary register */
+  int r1, r2, r3;           /* Various register numbers */
+
+  assert( v!=0 || pParse->db->mallocFailed );
+  assert( target>0 && target<=pParse->nMem );
+  if( v==0 ) return 0;
+
+  if( pExpr==0 ){
+    op = TK_NULL;
+  }else{
+    op = pExpr->op;
+  }
+  switch( op ){
+    case TK_AGG_COLUMN: {
+      AggInfo *pAggInfo = pExpr->pAggInfo;
+      struct AggInfo_col *pCol = &pAggInfo->aCol[pExpr->iAgg];
+      if( !pAggInfo->directMode ){
+        assert( pCol->iMem>0 );
+        inReg = pCol->iMem;
+        break;
+      }else if( pAggInfo->useSortingIdx ){
+        sqlite3VdbeAddOp3(v, OP_Column, pAggInfo->sortingIdx,
+                              pCol->iSorterColumn, target);
+        break;
+      }
+      /* Otherwise, fall thru into the TK_COLUMN case */
+    }
+    case TK_COLUMN: {
+      if( pExpr->iTable<0 ){
+        /* This only happens when coding check constraints */
+        assert( pParse->ckBase>0 );
+        inReg = pExpr->iColumn + pParse->ckBase;
+      }else{
+        sqlite3ExprCodeGetColumn(v, pExpr->pTab,
+                                 pExpr->iColumn, pExpr->iTable, target);
+      }
+      break;
+    }
+    case TK_INTEGER: {
+      codeInteger(v, (char*)pExpr->token.z, pExpr->token.n, 0, target);
+      break;
+    }
+    case TK_FLOAT: {
+      codeReal(v, (char*)pExpr->token.z, pExpr->token.n, 0, target);
+      break;
+    }
+    case TK_STRING: {
+      sqlite3DequoteExpr(pParse->db, pExpr);
+      sqlite3VdbeAddOp4(v,OP_String8, 0, target, 0,
+                        (char*)pExpr->token.z, pExpr->token.n);
+      break;
+    }
+    case TK_NULL: {
+      sqlite3VdbeAddOp2(v, OP_Null, 0, target);
+      break;
+    }
+#ifndef SQLITE_OMIT_BLOB_LITERAL
+    case TK_BLOB: {
+      int n;
+      const char *z;
+      char *zBlob;
+      assert( pExpr->token.n>=3 );
+      assert( pExpr->token.z[0]=='x' || pExpr->token.z[0]=='X' );
+      assert( pExpr->token.z[1]=='\'' );
+      assert( pExpr->token.z[pExpr->token.n-1]=='\'' );
+      n = pExpr->token.n - 3;
+      z = (char*)pExpr->token.z + 2;
+      zBlob = sqlite3HexToBlob(sqlite3VdbeDb(v), z, n);
+      sqlite3VdbeAddOp4(v, OP_Blob, n/2, target, 0, zBlob, P4_DYNAMIC);
+      break;
+    }
+#endif
+    case TK_VARIABLE: {
+      sqlite3VdbeAddOp2(v, OP_Variable, pExpr->iTable, target);
+      if( pExpr->token.n>1 ){
+        sqlite3VdbeChangeP4(v, -1, (char*)pExpr->token.z, pExpr->token.n);
+      }
+      break;
+    }
+    case TK_REGISTER: {
+      inReg = pExpr->iTable;
+      break;
+    }
+#ifndef SQLITE_OMIT_CAST
+    case TK_CAST: {
+      /* Expressions of the form:   CAST(pLeft AS token) */
+      int aff, to_op;
+      inReg = sqlite3ExprCodeTarget(pParse, pExpr->pLeft, target);
+      aff = sqlite3AffinityType(&pExpr->token);
+      to_op = aff - SQLITE_AFF_TEXT + OP_ToText;
+      assert( to_op==OP_ToText    || aff!=SQLITE_AFF_TEXT    );
+      assert( to_op==OP_ToBlob    || aff!=SQLITE_AFF_NONE    );
+      assert( to_op==OP_ToNumeric || aff!=SQLITE_AFF_NUMERIC );
+      assert( to_op==OP_ToInt     || aff!=SQLITE_AFF_INTEGER );
+      assert( to_op==OP_ToReal    || aff!=SQLITE_AFF_REAL    );
+      sqlite3VdbeAddOp1(v, to_op, inReg);
+      break;
+    }
+#endif /* SQLITE_OMIT_CAST */
+    case TK_LT:
+    case TK_LE:
+    case TK_GT:
+    case TK_GE:
+    case TK_NE:
+    case TK_EQ: {
+      assert( TK_LT==OP_Lt );
+      assert( TK_LE==OP_Le );
+      assert( TK_GT==OP_Gt );
+      assert( TK_GE==OP_Ge );
+      assert( TK_EQ==OP_Eq );
+      assert( TK_NE==OP_Ne );
+      r1 = sqlite3ExprCodeTemp(pParse, pExpr->pLeft, &regFree1);
+      r2 = sqlite3ExprCodeTemp(pParse, pExpr->pRight, &regFree2);
+      codeCompare(pParse, pExpr->pLeft, pExpr->pRight, op,
+                  r1, r2, inReg, SQLITE_STOREP2);
+      break;
+    }
+    case TK_AND:
+    case TK_OR:
+    case TK_PLUS:
+    case TK_STAR:
+    case TK_MINUS:
+    case TK_REM:
+    case TK_BITAND:
+    case TK_BITOR:
+    case TK_SLASH:
+    case TK_LSHIFT:
+    case TK_RSHIFT:
+    case TK_CONCAT: {
+      assert( TK_AND==OP_And );
+      assert( TK_OR==OP_Or );
+      assert( TK_PLUS==OP_Add );
+      assert( TK_MINUS==OP_Subtract );
+      assert( TK_REM==OP_Remainder );
+      assert( TK_BITAND==OP_BitAnd );
+      assert( TK_BITOR==OP_BitOr );
+      assert( TK_SLASH==OP_Divide );
+      assert( TK_LSHIFT==OP_ShiftLeft );
+      assert( TK_RSHIFT==OP_ShiftRight );
+      assert( TK_CONCAT==OP_Concat );
+      r1 = sqlite3ExprCodeTemp(pParse, pExpr->pLeft, &regFree1);
+      r2 = sqlite3ExprCodeTemp(pParse, pExpr->pRight, &regFree2);
+      sqlite3VdbeAddOp3(v, op, r2, r1, target);
+      break;
+    }
+    case TK_UMINUS: {
+      Expr *pLeft = pExpr->pLeft;
+      assert( pLeft );
+      if( pLeft->op==TK_FLOAT || pLeft->op==TK_INTEGER ){
+        Token *p = &pLeft->token;
+        if( pLeft->op==TK_FLOAT ){
+          codeReal(v, (char*)p->z, p->n, 1, target);
+        }else{
+          codeInteger(v, (char*)p->z, p->n, 1, target);
+        }
+      }else{
+        regFree1 = r1 = sqlite3GetTempReg(pParse);
+        sqlite3VdbeAddOp2(v, OP_Integer, 0, r1);
+        r2 = sqlite3ExprCodeTarget(pParse, pExpr->pLeft, target);
+        sqlite3VdbeAddOp3(v, OP_Subtract, r2, r1, target);
+      }
+      inReg = target;
+      break;
+    }
+    case TK_BITNOT:
+    case TK_NOT: {
+      assert( TK_BITNOT==OP_BitNot );
+      assert( TK_NOT==OP_Not );
+      inReg = sqlite3ExprCodeTarget(pParse, pExpr->pLeft, target);
+      sqlite3VdbeAddOp1(v, op, inReg);
+      break;
+    }
+    case TK_ISNULL:
+    case TK_NOTNULL: {
+      int addr;
+      assert( TK_ISNULL==OP_IsNull );
+      assert( TK_NOTNULL==OP_NotNull );
+      sqlite3VdbeAddOp2(v, OP_Integer, 1, target);
+      r1 = sqlite3ExprCodeTemp(pParse, pExpr->pLeft, &regFree1);
+      addr = sqlite3VdbeAddOp1(v, op, r1);
+      sqlite3VdbeAddOp2(v, OP_AddImm, target, -1);
+      sqlite3VdbeJumpHere(v, addr);
+      break;
+    }
+    case TK_AGG_FUNCTION: {
+      AggInfo *pInfo = pExpr->pAggInfo;
+      if( pInfo==0 ){
+        sqlite3ErrorMsg(pParse, "misuse of aggregate: %T",
+            &pExpr->span);
+      }else{
+        inReg = pInfo->aFunc[pExpr->iAgg].iMem;
+      }
+      break;
+    }
+    case TK_CONST_FUNC:
+    case TK_FUNCTION: {
+      ExprList *pList = pExpr->pList;
+      int nExpr = pList ? pList->nExpr : 0;
+      FuncDef *pDef;
+      int nId;
+      const char *zId;
+      int constMask = 0;
+      int i;
+      sqlite3 *db = pParse->db;
+      u8 enc = ENC(db);
+      CollSeq *pColl = 0;
+
+      zId = (char*)pExpr->token.z;
+      nId = pExpr->token.n;
+      pDef = sqlite3FindFunction(pParse->db, zId, nId, nExpr, enc, 0);
+      assert( pDef!=0 );
+      if( pList ){
+        nExpr = pList->nExpr;
+        r1 = sqlite3GetTempRange(pParse, nExpr);
+        sqlite3ExprCodeExprList(pParse, pList, r1);
+      }else{
+        nExpr = r1 = 0;
+      }
+#ifndef SQLITE_OMIT_VIRTUALTABLE
+      /* Possibly overload the function if the first argument is
+      ** a virtual table column.
+      **
+      ** For infix functions (LIKE, GLOB, REGEXP, and MATCH) use the
+      ** second argument, not the first, as the argument to test to
+      ** see if it is a column in a virtual table.  This is done because
+      ** the left operand of infix functions (the operand we want to
+      ** control overloading) ends up as the second argument to the
+      ** function.  The expression "A glob B" is equivalent to
+      ** "glob(B,A).  We want to use the A in "A glob B" to test
+      ** for function overloading.  But we use the B term in "glob(B,A)".
+      */
+      if( nExpr>=2 && (pExpr->flags & EP_InfixFunc) ){
+        pDef = sqlite3VtabOverloadFunction(db, pDef, nExpr, pList->a[1].pExpr);
+      }else if( nExpr>0 ){
+        pDef = sqlite3VtabOverloadFunction(db, pDef, nExpr, pList->a[0].pExpr);
+      }
+#endif
+      for(i=0; i<nExpr && i<32; i++){
+        if( sqlite3ExprIsConstant(pList->a[i].pExpr) ){
+          constMask |= (1<<i);
+        }
+        if( pDef->needCollSeq && !pColl ){
+          pColl = sqlite3ExprCollSeq(pParse, pList->a[i].pExpr);
+        }
+      }
+      if( pDef->needCollSeq ){
+        if( !pColl ) pColl = pParse->db->pDfltColl;
+        sqlite3VdbeAddOp4(v, OP_CollSeq, 0, 0, 0, (char *)pColl, P4_COLLSEQ);
+      }
+      sqlite3VdbeAddOp4(v, OP_Function, constMask, r1, target,
+                        (char*)pDef, P4_FUNCDEF);
+      sqlite3VdbeChangeP5(v, nExpr);
+      if( nExpr ){
+        sqlite3ReleaseTempRange(pParse, r1, nExpr);
+      }
+      break;
+    }
+#ifndef SQLITE_OMIT_SUBQUERY
+    case TK_EXISTS:
+    case TK_SELECT: {
+      if( pExpr->iColumn==0 ){
+        sqlite3CodeSubselect(pParse, pExpr);
+      }
+      inReg = pExpr->iColumn;
+      break;
+    }
+    case TK_IN: {
+      int j1, j2, j3, j4, j5;
+      char affinity;
+      int eType;
+
+      eType = sqlite3FindInIndex(pParse, pExpr, 0);
+
+      /* Figure out the affinity to use to create a key from the results
+      ** of the expression. affinityStr stores a static string suitable for
+      ** P4 of OP_MakeRecord.
+      */
+      affinity = comparisonAffinity(pExpr);
+
+      sqlite3VdbeAddOp2(v, OP_Integer, 1, target);
+
+      /* Code the <expr> from "<expr> IN (...)". The temporary table
+      ** pExpr->iTable contains the values that make up the (...) set.
+      */
+      r1 = sqlite3ExprCodeTemp(pParse, pExpr->pLeft, &regFree1);
+      j1 = sqlite3VdbeAddOp1(v, OP_NotNull, r1);
+      sqlite3VdbeAddOp2(v, OP_Null, 0, target);
+      j2  = sqlite3VdbeAddOp0(v, OP_Goto);
+      sqlite3VdbeJumpHere(v, j1);
+      if( eType==IN_INDEX_ROWID ){
+        j3 = sqlite3VdbeAddOp3(v, OP_MustBeInt, r1, 0, 1);
+        j4 = sqlite3VdbeAddOp3(v, OP_NotExists, pExpr->iTable, 0, r1);
+        j5 = sqlite3VdbeAddOp0(v, OP_Goto);
+        sqlite3VdbeJumpHere(v, j3);
+        sqlite3VdbeJumpHere(v, j4);
+      }else{
+        r2 = regFree2 = sqlite3GetTempReg(pParse);
+        sqlite3VdbeAddOp4(v, OP_MakeRecord, r1, 1, r2, &affinity, 1);
+        j5 = sqlite3VdbeAddOp3(v, OP_Found, pExpr->iTable, 0, r2);
+      }
+      sqlite3VdbeAddOp2(v, OP_AddImm, target, -1);
+      sqlite3VdbeJumpHere(v, j2);
+      sqlite3VdbeJumpHere(v, j5);
+      break;
+    }
+#endif
+    /*
+    **    x BETWEEN y AND z
+    **
+    ** This is equivalent to
+    **
+    **    x>=y AND x<=z
+    **
+    ** X is stored in pExpr->pLeft.
+    ** Y is stored in pExpr->pList->a[0].pExpr.
+    ** Z is stored in pExpr->pList->a[1].pExpr.
+    */
+    case TK_BETWEEN: {
+      Expr *pLeft = pExpr->pLeft;
+      struct ExprList_item *pLItem = pExpr->pList->a;
+      Expr *pRight = pLItem->pExpr;
+
+      r1 = sqlite3ExprCodeTemp(pParse, pLeft, &regFree1);
+      r2 = sqlite3ExprCodeTemp(pParse, pRight, &regFree2);
+      r3 = sqlite3GetTempReg(pParse);
+      codeCompare(pParse, pLeft, pRight, OP_Ge,
+                  r1, r2, r3, SQLITE_STOREP2);
+      pLItem++;
+      pRight = pLItem->pExpr;
+      sqlite3ReleaseTempReg(pParse, regFree2);
+      r2 = sqlite3ExprCodeTemp(pParse, pRight, &regFree2);
+      codeCompare(pParse, pLeft, pRight, OP_Le, r1, r2, r2, SQLITE_STOREP2);
+      sqlite3VdbeAddOp3(v, OP_And, r3, r2, target);
+      sqlite3ReleaseTempReg(pParse, r3);
+      break;
+    }
+    case TK_UPLUS: {
+      inReg = sqlite3ExprCodeTarget(pParse, pExpr->pLeft, target);
+      break;
+    }
+
+    /*
+    ** Form A:
+    **   CASE x WHEN e1 THEN r1 WHEN e2 THEN r2 ... WHEN eN THEN rN ELSE y END
+    **
+    ** Form B:
+    **   CASE WHEN e1 THEN r1 WHEN e2 THEN r2 ... WHEN eN THEN rN ELSE y END
+    **
+    ** Form A is can be transformed into the equivalent form B as follows:
+    **   CASE WHEN x=e1 THEN r1 WHEN x=e2 THEN r2 ...
+    **        WHEN x=eN THEN rN ELSE y END
+    **
+    ** X (if it exists) is in pExpr->pLeft.
+    ** Y is in pExpr->pRight.  The Y is also optional.  If there is no
+    ** ELSE clause and no other term matches, then the result of the
+    ** exprssion is NULL.
+    ** Ei is in pExpr->pList->a[i*2] and Ri is pExpr->pList->a[i*2+1].
+    **
+    ** The result of the expression is the Ri for the first matching Ei,
+    ** or if there is no matching Ei, the ELSE term Y, or if there is
+    ** no ELSE term, NULL.
+    */
+    case TK_CASE: {
+      int endLabel;                     /* GOTO label for end of CASE stmt */
+      int nextCase;                     /* GOTO label for next WHEN clause */
+      int nExpr;                        /* 2x number of WHEN terms */
+      int i;                            /* Loop counter */
+      ExprList *pEList;                 /* List of WHEN terms */
+      struct ExprList_item *aListelem;  /* Array of WHEN terms */
+      Expr opCompare;                   /* The X==Ei expression */
+      Expr cacheX;                      /* Cached expression X */
+      Expr *pX;                         /* The X expression */
+      Expr *pTest;                      /* X==Ei (form A) or just Ei (form B) */
+
+      assert(pExpr->pList);
+      assert((pExpr->pList->nExpr % 2) == 0);
+      assert(pExpr->pList->nExpr > 0);
+      pEList = pExpr->pList;
+      aListelem = pEList->a;
+      nExpr = pEList->nExpr;
+      endLabel = sqlite3VdbeMakeLabel(v);
+      if( (pX = pExpr->pLeft)!=0 ){
+        cacheX = *pX;
+        cacheX.iTable = sqlite3ExprCodeTemp(pParse, pX, &regFree1);
+        cacheX.op = TK_REGISTER;
+        opCompare.op = TK_EQ;
+        opCompare.pLeft = &cacheX;
+        pTest = &opCompare;
+      }
+      for(i=0; i<nExpr; i=i+2){
+        if( pX ){
+          opCompare.pRight = aListelem[i].pExpr;
+        }else{
+          pTest = aListelem[i].pExpr;
+        }
+        nextCase = sqlite3VdbeMakeLabel(v);
+        sqlite3ExprIfFalse(pParse, pTest, nextCase, SQLITE_JUMPIFNULL);
+        sqlite3ExprCode(pParse, aListelem[i+1].pExpr, target);
+        sqlite3VdbeAddOp2(v, OP_Goto, 0, endLabel);
+        sqlite3VdbeResolveLabel(v, nextCase);
+      }
+      if( pExpr->pRight ){
+        sqlite3ExprCode(pParse, pExpr->pRight, target);
+      }else{
+        sqlite3VdbeAddOp2(v, OP_Null, 0, target);
+      }
+      sqlite3VdbeResolveLabel(v, endLabel);
+      break;
+    }
+#ifndef SQLITE_OMIT_TRIGGER
+    case TK_RAISE: {
+      if( !pParse->trigStack ){
+        sqlite3ErrorMsg(pParse,
+                       "RAISE() may only be used within a trigger-program");
+        return 0;
+      }
+      if( pExpr->iColumn!=OE_Ignore ){
+         assert( pExpr->iColumn==OE_Rollback ||
+                 pExpr->iColumn == OE_Abort ||
+                 pExpr->iColumn == OE_Fail );
+         sqlite3DequoteExpr(pParse->db, pExpr);
+         sqlite3VdbeAddOp4(v, OP_Halt, SQLITE_CONSTRAINT, pExpr->iColumn, 0,
+                        (char*)pExpr->token.z, pExpr->token.n);
+      } else {
+         assert( pExpr->iColumn == OE_Ignore );
+         sqlite3VdbeAddOp2(v, OP_ContextPop, 0, 0);
+         sqlite3VdbeAddOp2(v, OP_Goto, 0, pParse->trigStack->ignoreJump);
+         VdbeComment((v, "raise(IGNORE)"));
+      }
+      break;
+    }
+#endif
+  }
+  sqlite3ReleaseTempReg(pParse, regFree1);
+  sqlite3ReleaseTempReg(pParse, regFree2);
+  return inReg;
+}
+
+/*
+** Generate code to evaluate an expression and store the results
+** into a register.  Return the register number where the results
+** are stored.
+**
+** If the register is a temporary register that can be deallocated,
+** then write its number into *pReg.  If the result register is no
+** a temporary, then set *pReg to zero.
+*/
+int sqlite3ExprCodeTemp(Parse *pParse, Expr *pExpr, int *pReg){
+  int r1 = sqlite3GetTempReg(pParse);
+  int r2 = sqlite3ExprCodeTarget(pParse, pExpr, r1);
+  if( r2==r1 ){
+    *pReg = r1;
+  }else{
+    sqlite3ReleaseTempReg(pParse, r1);
+    *pReg = 0;
+  }
+  return r2;
+}
+
+/*
+** Generate code that will evaluate expression pExpr and store the
+** results in register target.  The results are guaranteed to appear
+** in register target.
+*/
+int sqlite3ExprCode(Parse *pParse, Expr *pExpr, int target){
+  int inReg;
+
+  assert( target>0 && target<=pParse->nMem );
+  inReg = sqlite3ExprCodeTarget(pParse, pExpr, target);
+  assert( pParse->pVdbe || pParse->db->mallocFailed );
+  if( inReg!=target && pParse->pVdbe ){
+    sqlite3VdbeAddOp2(pParse->pVdbe, OP_SCopy, inReg, target);
+  }
+  return target;
+}
+
+/*
+** Generate code that evalutes the given expression and puts the result
+** in register target.
+**
+** Also make a copy of the expression results into another "cache" register
+** and modify the expression so that the next time it is evaluated,
+** the result is a copy of the cache register.
+**
+** This routine is used for expressions that are used multiple
+** times.  They are evaluated once and the results of the expression
+** are reused.
+*/
+int sqlite3ExprCodeAndCache(Parse *pParse, Expr *pExpr, int target){
+  Vdbe *v = pParse->pVdbe;
+  int inReg;
+  inReg = sqlite3ExprCode(pParse, pExpr, target);
+  assert( target>0 );
+  if( pExpr->op!=TK_REGISTER ){
+    int iMem;
+    iMem = ++pParse->nMem;
+    sqlite3VdbeAddOp2(v, OP_Copy, inReg, iMem);
+    pExpr->iTable = iMem;
+    pExpr->op = TK_REGISTER;
+  }
+  return inReg;
+}
+
+
+/*
+** Generate code that pushes the value of every element of the given
+** expression list into a sequence of registers beginning at target.
+**
+** Return the number of elements evaluated.
+*/
+int sqlite3ExprCodeExprList(
+  Parse *pParse,     /* Parsing context */
+  ExprList *pList,   /* The expression list to be coded */
+  int target         /* Where to write results */
+){
+  struct ExprList_item *pItem;
+  int i, n;
+  assert( pList!=0 || pParse->db->mallocFailed );
+  if( pList==0 ){
+    return 0;
+  }
+  assert( target>0 );
+  n = pList->nExpr;
+  for(pItem=pList->a, i=n; i>0; i--, pItem++){
+    sqlite3ExprCode(pParse, pItem->pExpr, target);
+    target++;
+  }
+  return n;
+}
+
+/*
+** Generate code for a boolean expression such that a jump is made
+** to the label "dest" if the expression is true but execution
+** continues straight thru if the expression is false.
+**
+** If the expression evaluates to NULL (neither true nor false), then
+** take the jump if the jumpIfNull flag is SQLITE_JUMPIFNULL.
+**
+** This code depends on the fact that certain token values (ex: TK_EQ)
+** are the same as opcode values (ex: OP_Eq) that implement the corresponding
+** operation.  Special comments in vdbe.c and the mkopcodeh.awk script in
+** the make process cause these values to align.  Assert()s in the code
+** below verify that the numbers are aligned correctly.
+*/
+void sqlite3ExprIfTrue(Parse *pParse, Expr *pExpr, int dest, int jumpIfNull){
+  Vdbe *v = pParse->pVdbe;
+  int op = 0;
+  int regFree1 = 0;
+  int regFree2 = 0;
+  int r1, r2;
+
+  assert( jumpIfNull==SQLITE_JUMPIFNULL || jumpIfNull==0 );
+  if( v==0 || pExpr==0 ) return;
+  op = pExpr->op;
+  switch( op ){
+    case TK_AND: {
+      int d2 = sqlite3VdbeMakeLabel(v);
+      sqlite3ExprIfFalse(pParse, pExpr->pLeft, d2,jumpIfNull^SQLITE_JUMPIFNULL);
+      sqlite3ExprIfTrue(pParse, pExpr->pRight, dest, jumpIfNull);
+      sqlite3VdbeResolveLabel(v, d2);
+      break;
+    }
+    case TK_OR: {
+      sqlite3ExprIfTrue(pParse, pExpr->pLeft, dest, jumpIfNull);
+      sqlite3ExprIfTrue(pParse, pExpr->pRight, dest, jumpIfNull);
+      break;
+    }
+    case TK_NOT: {
+      sqlite3ExprIfFalse(pParse, pExpr->pLeft, dest, jumpIfNull);
+      break;
+    }
+    case TK_LT:
+    case TK_LE:
+    case TK_GT:
+    case TK_GE:
+    case TK_NE:
+    case TK_EQ: {
+      assert( TK_LT==OP_Lt );
+      assert( TK_LE==OP_Le );
+      assert( TK_GT==OP_Gt );
+      assert( TK_GE==OP_Ge );
+      assert( TK_EQ==OP_Eq );
+      assert( TK_NE==OP_Ne );
+      r1 = sqlite3ExprCodeTemp(pParse, pExpr->pLeft, &regFree1);
+      r2 = sqlite3ExprCodeTemp(pParse, pExpr->pRight, &regFree2);
+      codeCompare(pParse, pExpr->pLeft, pExpr->pRight, op,
+                  r1, r2, dest, jumpIfNull);
+      break;
+    }
+    case TK_ISNULL:
+    case TK_NOTNULL: {
+      assert( TK_ISNULL==OP_IsNull );
+      assert( TK_NOTNULL==OP_NotNull );
+      r1 = sqlite3ExprCodeTemp(pParse, pExpr->pLeft, &regFree1);
+      sqlite3VdbeAddOp2(v, op, r1, dest);
+      break;
+    }
+    case TK_BETWEEN: {
+      /*    x BETWEEN y AND z
+      **
+      ** Is equivalent to
+      **
+      **    x>=y AND x<=z
+      **
+      ** Code it as such, taking care to do the common subexpression
+      ** elementation of x.
+      */
+      Expr exprAnd;
+      Expr compLeft;
+      Expr compRight;
+      Expr exprX;
+
+      exprX = *pExpr->pLeft;
+      exprAnd.op = TK_AND;
+      exprAnd.pLeft = &compLeft;
+      exprAnd.pRight = &compRight;
+      compLeft.op = TK_GE;
+      compLeft.pLeft = &exprX;
+      compLeft.pRight = pExpr->pList->a[0].pExpr;
+      compRight.op = TK_LE;
+      compRight.pLeft = &exprX;
+      compRight.pRight = pExpr->pList->a[1].pExpr;
+      exprX.iTable = sqlite3ExprCodeTemp(pParse, &exprX, &regFree1);
+      exprX.op = TK_REGISTER;
+      sqlite3ExprIfTrue(pParse, &exprAnd, dest, jumpIfNull);
+      break;
+    }
+    default: {
+      r1 = sqlite3ExprCodeTemp(pParse, pExpr, &regFree1);
+      sqlite3VdbeAddOp3(v, OP_If, r1, dest, jumpIfNull!=0);
+      break;
+    }
+  }
+  sqlite3ReleaseTempReg(pParse, regFree1);
+  sqlite3ReleaseTempReg(pParse, regFree2);
+}
+
+/*
+** Generate code for a boolean expression such that a jump is made
+** to the label "dest" if the expression is false but execution
+** continues straight thru if the expression is true.
+**
+** If the expression evaluates to NULL (neither true nor false) then
+** jump if jumpIfNull is SQLITE_JUMPIFNULL or fall through if jumpIfNull
+** is 0.
+*/
+void sqlite3ExprIfFalse(Parse *pParse, Expr *pExpr, int dest, int jumpIfNull){
+  Vdbe *v = pParse->pVdbe;
+  int op = 0;
+  int regFree1 = 0;
+  int regFree2 = 0;
+  int r1, r2;
+
+  assert( jumpIfNull==SQLITE_JUMPIFNULL || jumpIfNull==0 );
+  if( v==0 || pExpr==0 ) return;
+
+  /* The value of pExpr->op and op are related as follows:
+  **
+  **       pExpr->op            op
+  **       ---------          ----------
+  **       TK_ISNULL          OP_NotNull
+  **       TK_NOTNULL         OP_IsNull
+  **       TK_NE              OP_Eq
+  **       TK_EQ              OP_Ne
+  **       TK_GT              OP_Le
+  **       TK_LE              OP_Gt
+  **       TK_GE              OP_Lt
+  **       TK_LT              OP_Ge
+  **
+  ** For other values of pExpr->op, op is undefined and unused.
+  ** The value of TK_ and OP_ constants are arranged such that we
+  ** can compute the mapping above using the following expression.
+  ** Assert()s verify that the computation is correct.
+  */
+  op = ((pExpr->op+(TK_ISNULL&1))^1)-(TK_ISNULL&1);
+
+  /* Verify correct alignment of TK_ and OP_ constants
+  */
+  assert( pExpr->op!=TK_ISNULL || op==OP_NotNull );
+  assert( pExpr->op!=TK_NOTNULL || op==OP_IsNull );
+  assert( pExpr->op!=TK_NE || op==OP_Eq );
+  assert( pExpr->op!=TK_EQ || op==OP_Ne );
+  assert( pExpr->op!=TK_LT || op==OP_Ge );
+  assert( pExpr->op!=TK_LE || op==OP_Gt );
+  assert( pExpr->op!=TK_GT || op==OP_Le );
+  assert( pExpr->op!=TK_GE || op==OP_Lt );
+
+  switch( pExpr->op ){
+    case TK_AND: {
+      sqlite3ExprIfFalse(pParse, pExpr->pLeft, dest, jumpIfNull);
+      sqlite3ExprIfFalse(pParse, pExpr->pRight, dest, jumpIfNull);
+      break;
+    }
+    case TK_OR: {
+      int d2 = sqlite3VdbeMakeLabel(v);
+      sqlite3ExprIfTrue(pParse, pExpr->pLeft, d2, jumpIfNull^SQLITE_JUMPIFNULL);
+      sqlite3ExprIfFalse(pParse, pExpr->pRight, dest, jumpIfNull);
+      sqlite3VdbeResolveLabel(v, d2);
+      break;
+    }
+    case TK_NOT: {
+      sqlite3ExprIfTrue(pParse, pExpr->pLeft, dest, jumpIfNull);
+      break;
+    }
+    case TK_LT:
+    case TK_LE:
+    case TK_GT:
+    case TK_GE:
+    case TK_NE:
+    case TK_EQ: {
+      r1 = sqlite3ExprCodeTemp(pParse, pExpr->pLeft, &regFree1);
+      r2 = sqlite3ExprCodeTemp(pParse, pExpr->pRight, &regFree2);
+      codeCompare(pParse, pExpr->pLeft, pExpr->pRight, op,
+                  r1, r2, dest, jumpIfNull);
+      break;
+    }
+    case TK_ISNULL:
+    case TK_NOTNULL: {
+      r1 = sqlite3ExprCodeTemp(pParse, pExpr->pLeft, &regFree1);
+      sqlite3VdbeAddOp2(v, op, r1, dest);
+      break;
+    }
+    case TK_BETWEEN: {
+      /*    x BETWEEN y AND z
+      **
+      ** Is equivalent to
+      **
+      **    x>=y AND x<=z
+      **
+      ** Code it as such, taking care to do the common subexpression
+      ** elementation of x.
+      */
+      Expr exprAnd;
+      Expr compLeft;
+      Expr compRight;
+      Expr exprX;
+
+      exprX = *pExpr->pLeft;
+      exprAnd.op = TK_AND;
+      exprAnd.pLeft = &compLeft;
+      exprAnd.pRight = &compRight;
+      compLeft.op = TK_GE;
+      compLeft.pLeft = &exprX;
+      compLeft.pRight = pExpr->pList->a[0].pExpr;
+      compRight.op = TK_LE;
+      compRight.pLeft = &exprX;
+      compRight.pRight = pExpr->pList->a[1].pExpr;
+      exprX.iTable = sqlite3ExprCodeTemp(pParse, &exprX, &regFree1);
+      exprX.op = TK_REGISTER;
+      sqlite3ExprIfFalse(pParse, &exprAnd, dest, jumpIfNull);
+      break;
+    }
+    default: {
+      r1 = sqlite3ExprCodeTemp(pParse, pExpr, &regFree1);
+      sqlite3VdbeAddOp3(v, OP_IfNot, r1, dest, jumpIfNull!=0);
+      break;
+    }
+  }
+  sqlite3ReleaseTempReg(pParse, regFree1);
+  sqlite3ReleaseTempReg(pParse, regFree2);
+}
+
+/*
+** Do a deep comparison of two expression trees.  Return TRUE (non-zero)
+** if they are identical and return FALSE if they differ in any way.
+**
+** Sometimes this routine will return FALSE even if the two expressions
+** really are equivalent.  If we cannot prove that the expressions are
+** identical, we return FALSE just to be safe.  So if this routine
+** returns false, then you do not really know for certain if the two
+** expressions are the same.  But if you get a TRUE return, then you
+** can be sure the expressions are the same.  In the places where
+** this routine is used, it does not hurt to get an extra FALSE - that
+** just might result in some slightly slower code.  But returning
+** an incorrect TRUE could lead to a malfunction.
+*/
+int sqlite3ExprCompare(Expr *pA, Expr *pB){
+  int i;
+  if( pA==0||pB==0 ){
+    return pB==pA;
+  }
+  if( pA->op!=pB->op ) return 0;
+  if( (pA->flags & EP_Distinct)!=(pB->flags & EP_Distinct) ) return 0;
+  if( !sqlite3ExprCompare(pA->pLeft, pB->pLeft) ) return 0;
+  if( !sqlite3ExprCompare(pA->pRight, pB->pRight) ) return 0;
+  if( pA->pList ){
+    if( pB->pList==0 ) return 0;
+    if( pA->pList->nExpr!=pB->pList->nExpr ) return 0;
+    for(i=0; i<pA->pList->nExpr; i++){
+      if( !sqlite3ExprCompare(pA->pList->a[i].pExpr, pB->pList->a[i].pExpr) ){
+        return 0;
+      }
+    }
+  }else if( pB->pList ){
+    return 0;
+  }
+  if( pA->pSelect || pB->pSelect ) return 0;
+  if( pA->iTable!=pB->iTable || pA->iColumn!=pB->iColumn ) return 0;
+  if( pA->op!=TK_COLUMN && pA->token.z ){
+    if( pB->token.z==0 ) return 0;
+    if( pB->token.n!=pA->token.n ) return 0;
+    if( sqlite3StrNICmp((char*)pA->token.z,(char*)pB->token.z,pB->token.n)!=0 ){
+      return 0;
+    }
+  }
+  return 1;
+}
+
+
+/*
+** Add a new element to the pAggInfo->aCol[] array.  Return the index of
+** the new element.  Return a negative number if malloc fails.
+*/
+static int addAggInfoColumn(sqlite3 *db, AggInfo *pInfo){
+  int i;
+  pInfo->aCol = sqlite3ArrayAllocate(
+       db,
+       pInfo->aCol,
+       sizeof(pInfo->aCol[0]),
+       3,
+       &pInfo->nColumn,
+       &pInfo->nColumnAlloc,
+       &i
+  );
+  return i;
+}
+
+/*
+** Add a new element to the pAggInfo->aFunc[] array.  Return the index of
+** the new element.  Return a negative number if malloc fails.
+*/
+static int addAggInfoFunc(sqlite3 *db, AggInfo *pInfo){
+  int i;
+  pInfo->aFunc = sqlite3ArrayAllocate(
+       db,
+       pInfo->aFunc,
+       sizeof(pInfo->aFunc[0]),
+       3,
+       &pInfo->nFunc,
+       &pInfo->nFuncAlloc,
+       &i
+  );
+  return i;
+}
+
+/*
+** This is an xFunc for walkExprTree() used to implement
+** sqlite3ExprAnalyzeAggregates().  See sqlite3ExprAnalyzeAggregates
+** for additional information.
+**
+** This routine analyzes the aggregate function at pExpr.
+*/
+static int analyzeAggregate(void *pArg, Expr *pExpr){
+  int i;
+  NameContext *pNC = (NameContext *)pArg;
+  Parse *pParse = pNC->pParse;
+  SrcList *pSrcList = pNC->pSrcList;
+  AggInfo *pAggInfo = pNC->pAggInfo;
+
+  switch( pExpr->op ){
+    case TK_AGG_COLUMN:
+    case TK_COLUMN: {
+      /* Check to see if the column is in one of the tables in the FROM
+      ** clause of the aggregate query */
+      if( pSrcList ){
+        struct SrcList_item *pItem = pSrcList->a;
+        for(i=0; i<pSrcList->nSrc; i++, pItem++){
+          struct AggInfo_col *pCol;
+          if( pExpr->iTable==pItem->iCursor ){
+            /* If we reach this point, it means that pExpr refers to a table
+            ** that is in the FROM clause of the aggregate query.
+            **
+            ** Make an entry for the column in pAggInfo->aCol[] if there
+            ** is not an entry there already.
+            */
+            int k;
+            pCol = pAggInfo->aCol;
+            for(k=0; k<pAggInfo->nColumn; k++, pCol++){
+              if( pCol->iTable==pExpr->iTable &&
+                  pCol->iColumn==pExpr->iColumn ){
+                break;
+              }
+            }
+            if( (k>=pAggInfo->nColumn)
+             && (k = addAggInfoColumn(pParse->db, pAggInfo))>=0
+            ){
+              pCol = &pAggInfo->aCol[k];
+              pCol->pTab = pExpr->pTab;
+              pCol->iTable = pExpr->iTable;
+              pCol->iColumn = pExpr->iColumn;
+              pCol->iMem = ++pParse->nMem;
+              pCol->iSorterColumn = -1;
+              pCol->pExpr = pExpr;
+              if( pAggInfo->pGroupBy ){
+                int j, n;
+                ExprList *pGB = pAggInfo->pGroupBy;
+                struct ExprList_item *pTerm = pGB->a;
+                n = pGB->nExpr;
+                for(j=0; j<n; j++, pTerm++){
+                  Expr *pE = pTerm->pExpr;
+                  if( pE->op==TK_COLUMN && pE->iTable==pExpr->iTable &&
+                      pE->iColumn==pExpr->iColumn ){
+                    pCol->iSorterColumn = j;
+                    break;
+                  }
+                }
+              }
+              if( pCol->iSorterColumn<0 ){
+                pCol->iSorterColumn = pAggInfo->nSortingColumn++;
+              }
+            }
+            /* There is now an entry for pExpr in pAggInfo->aCol[] (either
+            ** because it was there before or because we just created it).
+            ** Convert the pExpr to be a TK_AGG_COLUMN referring to that
+            ** pAggInfo->aCol[] entry.
+            */
+            pExpr->pAggInfo = pAggInfo;
+            pExpr->op = TK_AGG_COLUMN;
+            pExpr->iAgg = k;
+            break;
+          } /* endif pExpr->iTable==pItem->iCursor */
+        } /* end loop over pSrcList */
+      }
+      return 1;
+    }
+    case TK_AGG_FUNCTION: {
+      /* The pNC->nDepth==0 test causes aggregate functions in subqueries
+      ** to be ignored */
+      if( pNC->nDepth==0 ){
+        /* Check to see if pExpr is a duplicate of another aggregate
+        ** function that is already in the pAggInfo structure
+        */
+        struct AggInfo_func *pItem = pAggInfo->aFunc;
+        for(i=0; i<pAggInfo->nFunc; i++, pItem++){
+          if( sqlite3ExprCompare(pItem->pExpr, pExpr) ){
+            break;
+          }
+        }
+        if( i>=pAggInfo->nFunc ){
+          /* pExpr is original.  Make a new entry in pAggInfo->aFunc[]
+          */
+          u8 enc = ENC(pParse->db);
+          i = addAggInfoFunc(pParse->db, pAggInfo);
+          if( i>=0 ){
+            pItem = &pAggInfo->aFunc[i];
+            pItem->pExpr = pExpr;
+            pItem->iMem = ++pParse->nMem;
+            pItem->pFunc = sqlite3FindFunction(pParse->db,
+                   (char*)pExpr->token.z, pExpr->token.n,
+                   pExpr->pList ? pExpr->pList->nExpr : 0, enc, 0);
+            if( pExpr->flags & EP_Distinct ){
+              pItem->iDistinct = pParse->nTab++;
+            }else{
+              pItem->iDistinct = -1;
+            }
+          }
+        }
+        /* Make pExpr point to the appropriate pAggInfo->aFunc[] entry
+        */
+        pExpr->iAgg = i;
+        pExpr->pAggInfo = pAggInfo;
+        return 1;
+      }
+    }
+  }
+
+  /* Recursively walk subqueries looking for TK_COLUMN nodes that need
+  ** to be changed to TK_AGG_COLUMN.  But increment nDepth so that
+  ** TK_AGG_FUNCTION nodes in subqueries will be unchanged.
+  */
+  if( pExpr->pSelect ){
+    pNC->nDepth++;
+    walkSelectExpr(pExpr->pSelect, analyzeAggregate, pNC);
+    pNC->nDepth--;
+  }
+  return 0;
+}
+
+/*
+** Analyze the given expression looking for aggregate functions and
+** for variables that need to be added to the pParse->aAgg[] array.
+** Make additional entries to the pParse->aAgg[] array as necessary.
+**
+** This routine should only be called after the expression has been
+** analyzed by sqlite3ExprResolveNames().
+*/
+void sqlite3ExprAnalyzeAggregates(NameContext *pNC, Expr *pExpr){
+  walkExprTree(pExpr, analyzeAggregate, pNC);
+}
+
+/*
+** Call sqlite3ExprAnalyzeAggregates() for every expression in an
+** expression list.  Return the number of errors.
+**
+** If an error is found, the analysis is cut short.
+*/
+void sqlite3ExprAnalyzeAggList(NameContext *pNC, ExprList *pList){
+  struct ExprList_item *pItem;
+  int i;
+  if( pList ){
+    for(pItem=pList->a, i=0; i<pList->nExpr; i++, pItem++){
+      sqlite3ExprAnalyzeAggregates(pNC, pItem->pExpr);
+    }
+  }
+}
+
+/*
+** Allocate or deallocate temporary use registers during code generation.
+*/
+int sqlite3GetTempReg(Parse *pParse){
+  if( pParse->nTempReg ){
+    return pParse->aTempReg[--pParse->nTempReg];
+  }else{
+    return ++pParse->nMem;
+  }
+}
+void sqlite3ReleaseTempReg(Parse *pParse, int iReg){
+  if( iReg && pParse->nTempReg<ArraySize(pParse->aTempReg) ){
+    assert( iReg>0 );
+    pParse->aTempReg[pParse->nTempReg++] = iReg;
+  }
+}
+
+/*
+** Allocate or deallocate a block of nReg consecutive registers
+*/
+int sqlite3GetTempRange(Parse *pParse, int nReg){
+  int i;
+  if( nReg<=pParse->nRangeReg ){
+    i  = pParse->iRangeReg;
+    pParse->iRangeReg += nReg;
+    pParse->nRangeReg -= nReg;
+  }else{
+    i = pParse->nMem+1;
+    pParse->nMem += nReg;
+  }
+  return i;
+}
+void sqlite3ReleaseTempRange(Parse *pParse, int iReg, int nReg){
+  if( nReg>pParse->nRangeReg ){
+    pParse->nRangeReg = nReg;
+    pParse->iRangeReg = iReg;
+  }
+}
diff --git a/uppsrc/plugin/sqlite3/lib/fault.c b/uppsrc/plugin/sqlite3/lib/fault.c
new file mode 100644
index 000000000..83d21eeb6
--- /dev/null
+++ b/uppsrc/plugin/sqlite3/lib/fault.c
@@ -0,0 +1,147 @@
+/*
+** 2008 Jan 22
+**
+** The author disclaims copyright to this source code.  In place of
+** a legal notice, here is a blessing:
+**
+**    May you do good and not evil.
+**    May you find forgiveness for yourself and forgive others.
+**    May you share freely, never taking more than you give.
+**
+*************************************************************************
+** This file contains code to implement a fault-injector used for
+** testing and verification of SQLite.
+**
+** Subsystems within SQLite can call sqlite3FaultStep() to see if
+** they should simulate a fault.  sqlite3FaultStep() normally returns
+** zero but will return non-zero if a fault should be simulated.
+** Fault injectors can be used, for example, to simulate memory
+** allocation failures or I/O errors.
+**
+** The fault injector is omitted from the code if SQLite is
+** compiled with -DSQLITE_OMIT_FAULTINJECTOR=1.  There is a very
+** small performance hit for leaving the fault injector in the code.
+** Commerical products will probably want to omit the fault injector
+** from production builds.  But safety-critical systems who work
+** under the motto "fly what you test and test what you fly" may
+** choose to leave the fault injector enabled even in production.
+*/
+#include "sqliteInt.h"
+
+#ifndef SQLITE_OMIT_FAULTINJECTOR
+
+/*
+** There can be various kinds of faults.  For example, there can be
+** a memory allocation failure.  Or an I/O failure.  For each different
+** fault type, there is a separate FaultInjector structure to keep track
+** of the status of that fault.
+*/
+static struct FaultInjector {
+  int iCountdown;   /* Number of pending successes before we hit a failure */
+  int nRepeat;      /* Number of times to repeat the failure */
+  int nBenign;      /* Number of benign failures seen since last config */
+  int nFail;        /* Number of failures seen since last config */
+  u8 enable;        /* True if enabled */
+  u8 benign;        /* Ture if next failure will be benign */
+} aFault[SQLITE_FAULTINJECTOR_COUNT];
+
+/*
+** This routine configures and enables a fault injector.  After
+** calling this routine, aFaultStep() will return false (zero)
+** nDelay times, then it will return true nRepeat times,
+** then it will again begin returning false.
+*/
+void sqlite3FaultConfig(int id, int nDelay, int nRepeat){
+  assert( id>=0 && id<SQLITE_FAULTINJECTOR_COUNT );
+  aFault[id].iCountdown = nDelay;
+  aFault[id].nRepeat = nRepeat;
+  aFault[id].nBenign = 0;
+  aFault[id].nFail = 0;
+  aFault[id].enable = nDelay>=0;
+  aFault[id].benign = 0;
+}
+
+/*
+** Return the number of faults (both hard and benign faults) that have
+** occurred since the injector was last configured.
+*/
+int sqlite3FaultFailures(int id){
+  assert( id>=0 && id<SQLITE_FAULTINJECTOR_COUNT );
+  return aFault[id].nFail;
+}
+
+/*
+** Return the number of benign faults that have occurred since the
+** injector was last configured.
+*/
+int sqlite3FaultBenignFailures(int id){
+  assert( id>=0 && id<SQLITE_FAULTINJECTOR_COUNT );
+  return aFault[id].nBenign;
+}
+
+/*
+** Return the number of successes that will occur before the next failure.
+** If no failures are scheduled, return -1.
+*/
+int sqlite3FaultPending(int id){
+  assert( id>=0 && id<SQLITE_FAULTINJECTOR_COUNT );
+  if( aFault[id].enable ){
+    return aFault[id].iCountdown;
+  }else{
+    return -1;
+  }
+}
+
+/*
+** After this routine causes subsequent faults to be either benign
+** or hard (not benign), according to the "enable" parameter.
+**
+** Most faults are hard.  In other words, most faults cause
+** an error to be propagated back up to the application interface.
+** However, sometimes a fault is easily recoverable.  For example,
+** if a malloc fails while resizing a hash table, this is completely
+** recoverable simply by not carrying out the resize.  The hash table
+** will continue to function normally.  So a malloc failure during
+** a hash table resize is a benign fault.
+*/
+void sqlite3FaultBenign(int id, int enable){
+  assert( id>=0 && id<SQLITE_FAULTINJECTOR_COUNT );
+  aFault[id].benign = enable;
+}
+
+/*
+** This routine exists as a place to set a breakpoint that will
+** fire on any simulated fault.
+*/
+static void sqlite3Fault(void){
+  static int cnt = 0;
+  cnt++;
+}
+
+
+/*
+** Check to see if a fault should be simulated.  Return true to simulate
+** the fault.  Return false if the fault should not be simulated.
+*/
+int sqlite3FaultStep(int id){
+  assert( id>=0 && id<SQLITE_FAULTINJECTOR_COUNT );
+  if( likely(!aFault[id].enable) ){
+    return 0;
+  }
+  if( aFault[id].iCountdown>0 ){
+    aFault[id].iCountdown--;
+    return 0;
+  }
+  sqlite3Fault();
+  aFault[id].nFail++;
+  if( aFault[id].benign ){
+    aFault[id].nBenign++;
+  }
+  aFault[id].nRepeat--;
+  if( aFault[id].nRepeat<=0 ){
+    aFault[id].enable = 0;
+  }
+  return 1;
+}
+
+#endif /* SQLITE_OMIT_FAULTINJECTOR */
diff --git a/uppsrc/plugin/sqlite3/lib/fts3.c b/uppsrc/plugin/sqlite3/lib/fts3.c
new file mode 100644
index 000000000..d456dc786
--- /dev/null
+++ b/uppsrc/plugin/sqlite3/lib/fts3.c
@@ -0,0 +1,6403 @@
+/*
+** 2006 Oct 10
+**
+** The author disclaims copyright to this source code.  In place of
+** a legal notice, here is a blessing:
+**
+**    May you do good and not evil.
+**    May you find forgiveness for yourself and forgive others.
+**    May you share freely, never taking more than you give.
+**
+******************************************************************************
+**
+** This is an SQLite module implementing full-text search.
+*/
+
+/*
+** The code in this file is only compiled if:
+**
+**     * The FTS3 module is being built as an extension
+**       (in which case SQLITE_CORE is not defined), or
+**
+**     * The FTS3 module is being built into the core of
+**       SQLite (in which case SQLITE_ENABLE_FTS3 is defined).
+*/
+
+/* TODO(shess) Consider exporting this comment to an HTML file or the
+** wiki.
+*/
+/* The full-text index is stored in a series of b+tree (-like)
+** structures called segments which map terms to doclists.  The
+** structures are like b+trees in layout, but are constructed from the
+** bottom up in optimal fashion and are not updatable.  Since trees
+** are built from the bottom up, things will be described from the
+** bottom up.
+**
+**
+**** Varints ****
+** The basic unit of encoding is a variable-length integer called a
+** varint.  We encode variable-length integers in little-endian order
+** using seven bits * per byte as follows:
+**
+** KEY:
+**         A = 0xxxxxxx    7 bits of data and one flag bit
+**         B = 1xxxxxxx    7 bits of data and one flag bit
+**
+**  7 bits - A
+** 14 bits - BA
+** 21 bits - BBA
+** and so on.
+**
+** This is identical to how sqlite encodes varints (see util.c).
+**
+**
+**** Document lists ****
+** A doclist (document list) holds a docid-sorted list of hits for a
+** given term.  Doclists hold docids, and can optionally associate
+** token positions and offsets with docids.
+**
+** A DL_POSITIONS_OFFSETS doclist is stored like this:
+**
+** array {
+**   varint docid;
+**   array {                (position list for column 0)
+**     varint position;     (delta from previous position plus POS_BASE)
+**     varint startOffset;  (delta from previous startOffset)
+**     varint endOffset;    (delta from startOffset)
+**   }
+**   array {
+**     varint POS_COLUMN;   (marks start of position list for new column)
+**     varint column;       (index of new column)
+**     array {
+**       varint position;   (delta from previous position plus POS_BASE)
+**       varint startOffset;(delta from previous startOffset)
+**       varint endOffset;  (delta from startOffset)
+**     }
+**   }
+**   varint POS_END;        (marks end of positions for this document.
+** }
+**
+** Here, array { X } means zero or more occurrences of X, adjacent in
+** memory.  A "position" is an index of a token in the token stream
+** generated by the tokenizer, while an "offset" is a byte offset,
+** both based at 0.  Note that POS_END and POS_COLUMN occur in the
+** same logical place as the position element, and act as sentinals
+** ending a position list array.
+**
+** A DL_POSITIONS doclist omits the startOffset and endOffset
+** information.  A DL_DOCIDS doclist omits both the position and
+** offset information, becoming an array of varint-encoded docids.
+**
+** On-disk data is stored as type DL_DEFAULT, so we don't serialize
+** the type.  Due to how deletion is implemented in the segmentation
+** system, on-disk doclists MUST store at least positions.
+**
+**
+**** Segment leaf nodes ****
+** Segment leaf nodes store terms and doclists, ordered by term.  Leaf
+** nodes are written using LeafWriter, and read using LeafReader (to
+** iterate through a single leaf node's data) and LeavesReader (to
+** iterate through a segment's entire leaf layer).  Leaf nodes have
+** the format:
+**
+** varint iHeight;             (height from leaf level, always 0)
+** varint nTerm;               (length of first term)
+** char pTerm[nTerm];          (content of first term)
+** varint nDoclist;            (length of term's associated doclist)
+** char pDoclist[nDoclist];    (content of doclist)
+** array {
+**                             (further terms are delta-encoded)
+**   varint nPrefix;           (length of prefix shared with previous term)
+**   varint nSuffix;           (length of unshared suffix)
+**   char pTermSuffix[nSuffix];(unshared suffix of next term)
+**   varint nDoclist;          (length of term's associated doclist)
+**   char pDoclist[nDoclist];  (content of doclist)
+** }
+**
+** Here, array { X } means zero or more occurrences of X, adjacent in
+** memory.
+**
+** Leaf nodes are broken into blocks which are stored contiguously in
+** the %_segments table in sorted order.  This means that when the end
+** of a node is reached, the next term is in the node with the next
+** greater node id.
+**
+** New data is spilled to a new leaf node when the current node
+** exceeds LEAF_MAX bytes (default 2048).  New data which itself is
+** larger than STANDALONE_MIN (default 1024) is placed in a standalone
+** node (a leaf node with a single term and doclist).  The goal of
+** these settings is to pack together groups of small doclists while
+** making it efficient to directly access large doclists.  The
+** assumption is that large doclists represent terms which are more
+** likely to be query targets.
+**
+** TODO(shess) It may be useful for blocking decisions to be more
+** dynamic.  For instance, it may make more sense to have a 2.5k leaf
+** node rather than splitting into 2k and .5k nodes.  My intuition is
+** that this might extend through 2x or 4x the pagesize.
+**
+**
+**** Segment interior nodes ****
+** Segment interior nodes store blockids for subtree nodes and terms
+** to describe what data is stored by the each subtree.  Interior
+** nodes are written using InteriorWriter, and read using
+** InteriorReader.  InteriorWriters are created as needed when
+** SegmentWriter creates new leaf nodes, or when an interior node
+** itself grows too big and must be split.  The format of interior
+** nodes:
+**
+** varint iHeight;           (height from leaf level, always >0)
+** varint iBlockid;          (block id of node's leftmost subtree)
+** optional {
+**   varint nTerm;           (length of first term)
+**   char pTerm[nTerm];      (content of first term)
+**   array {
+**                                (further terms are delta-encoded)
+**     varint nPrefix;            (length of shared prefix with previous term)
+**     varint nSuffix;            (length of unshared suffix)
+**     char pTermSuffix[nSuffix]; (unshared suffix of next term)
+**   }
+** }
+**
+** Here, optional { X } means an optional element, while array { X }
+** means zero or more occurrences of X, adjacent in memory.
+**
+** An interior node encodes n terms separating n+1 subtrees.  The
+** subtree blocks are contiguous, so only the first subtree's blockid
+** is encoded.  The subtree at iBlockid will contain all terms less
+** than the first term encoded (or all terms if no term is encoded).
+** Otherwise, for terms greater than or equal to pTerm[i] but less
+** than pTerm[i+1], the subtree for that term will be rooted at
+** iBlockid+i.  Interior nodes only store enough term data to
+** distinguish adjacent children (if the rightmost term of the left
+** child is "something", and the leftmost term of the right child is
+** "wicked", only "w" is stored).
+**
+** New data is spilled to a new interior node at the same height when
+** the current node exceeds INTERIOR_MAX bytes (default 2048).
+** INTERIOR_MIN_TERMS (default 7) keeps large terms from monopolizing
+** interior nodes and making the tree too skinny.  The interior nodes
+** at a given height are naturally tracked by interior nodes at
+** height+1, and so on.
+**
+**
+**** Segment directory ****
+** The segment directory in table %_segdir stores meta-information for
+** merging and deleting segments, and also the root node of the
+** segment's tree.
+**
+** The root node is the top node of the segment's tree after encoding
+** the entire segment, restricted to ROOT_MAX bytes (default 1024).
+** This could be either a leaf node or an interior node.  If the top
+** node requires more than ROOT_MAX bytes, it is flushed to %_segments
+** and a new root interior node is generated (which should always fit
+** within ROOT_MAX because it only needs space for 2 varints, the
+** height and the blockid of the previous root).
+**
+** The meta-information in the segment directory is:
+**   level               - segment level (see below)
+**   idx                 - index within level
+**                       - (level,idx uniquely identify a segment)
+**   start_block         - first leaf node
+**   leaves_end_block    - last leaf node
+**   end_block           - last block (including interior nodes)
+**   root                - contents of root node
+**
+** If the root node is a leaf node, then start_block,
+** leaves_end_block, and end_block are all 0.
+**
+**
+**** Segment merging ****
+** To amortize update costs, segments are groups into levels and
+** merged in matches.  Each increase in level represents exponentially
+** more documents.
+**
+** New documents (actually, document updates) are tokenized and
+** written individually (using LeafWriter) to a level 0 segment, with
+** incrementing idx.  When idx reaches MERGE_COUNT (default 16), all
+** level 0 segments are merged into a single level 1 segment.  Level 1
+** is populated like level 0, and eventually MERGE_COUNT level 1
+** segments are merged to a single level 2 segment (representing
+** MERGE_COUNT^2 updates), and so on.
+**
+** A segment merge traverses all segments at a given level in
+** parallel, performing a straightforward sorted merge.  Since segment
+** leaf nodes are written in to the %_segments table in order, this
+** merge traverses the underlying sqlite disk structures efficiently.
+** After the merge, all segment blocks from the merged level are
+** deleted.
+**
+** MERGE_COUNT controls how often we merge segments.  16 seems to be
+** somewhat of a sweet spot for insertion performance.  32 and 64 show
+** very similar performance numbers to 16 on insertion, though they're
+** a tiny bit slower (perhaps due to more overhead in merge-time
+** sorting).  8 is about 20% slower than 16, 4 about 50% slower than
+** 16, 2 about 66% slower than 16.
+**
+** At query time, high MERGE_COUNT increases the number of segments
+** which need to be scanned and merged.  For instance, with 100k docs
+** inserted:
+**
+**    MERGE_COUNT   segments
+**       16           25
+**        8           12
+**        4           10
+**        2            6
+**
+** This appears to have only a moderate impact on queries for very
+** frequent terms (which are somewhat dominated by segment merge
+** costs), and infrequent and non-existent terms still seem to be fast
+** even with many segments.
+**
+** TODO(shess) That said, it would be nice to have a better query-side
+** argument for MERGE_COUNT of 16.  Also, it is possible/likely that
+** optimizations to things like doclist merging will swing the sweet
+** spot around.
+**
+**
+**
+**** Handling of deletions and updates ****
+** Since we're using a segmented structure, with no docid-oriented
+** index into the term index, we clearly cannot simply update the term
+** index when a document is deleted or updated.  For deletions, we
+** write an empty doclist (varint(docid) varint(POS_END)), for updates
+** we simply write the new doclist.  Segment merges overwrite older
+** data for a particular docid with newer data, so deletes or updates
+** will eventually overtake the earlier data and knock it out.  The
+** query logic likewise merges doclists so that newer data knocks out
+** older data.
+**
+** TODO(shess) Provide a VACUUM type operation to clear out all
+** deletions and duplications.  This would basically be a forced merge
+** into a single segment.
+*/
+
+#if !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_FTS3)
+
+#if defined(SQLITE_ENABLE_FTS3) && !defined(SQLITE_CORE)
+# define SQLITE_CORE 1
+#endif
+
+#include <assert.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <ctype.h>
+
+#include "fts3.h"
+#include "fts3_hash.h"
+#include "fts3_tokenizer.h"
+#ifndef SQLITE_CORE
+# include "sqlite3ext.h"
+  SQLITE_EXTENSION_INIT1
+#endif
+
+
+/* TODO(shess) MAN, this thing needs some refactoring.  At minimum, it
+** would be nice to order the file better, perhaps something along the
+** lines of:
+**
+**  - utility functions
+**  - table setup functions
+**  - table update functions
+**  - table query functions
+**
+** Put the query functions last because they're likely to reference
+** typedefs or functions from the table update section.
+*/
+
+#if 0
+# define FTSTRACE(A)  printf A; fflush(stdout)
+#else
+# define FTSTRACE(A)
+#endif
+
+/*
+** Default span for NEAR operators.
+*/
+#define SQLITE_FTS3_DEFAULT_NEAR_PARAM 10
+
+/* It is not safe to call isspace(), tolower(), or isalnum() on
+** hi-bit-set characters.  This is the same solution used in the
+** tokenizer.
+*/
+/* TODO(shess) The snippet-generation code should be using the
+** tokenizer-generated tokens rather than doing its own local
+** tokenization.
+*/
+/* TODO(shess) Is __isascii() a portable version of (c&0x80)==0? */
+static int safe_isspace(char c){
+  return (c&0x80)==0 ? isspace(c) : 0;
+}
+static int safe_tolower(char c){
+  return (c&0x80)==0 ? tolower(c) : c;
+}
+static int safe_isalnum(char c){
+  return (c&0x80)==0 ? isalnum(c) : 0;
+}
+
+typedef enum DocListType {
+  DL_DOCIDS,              /* docids only */
+  DL_POSITIONS,           /* docids + positions */
+  DL_POSITIONS_OFFSETS    /* docids + positions + offsets */
+} DocListType;
+
+/*
+** By default, only positions and not offsets are stored in the doclists.
+** To change this so that offsets are stored too, compile with
+**
+**          -DDL_DEFAULT=DL_POSITIONS_OFFSETS
+**
+** If DL_DEFAULT is set to DL_DOCIDS, your table can only be inserted
+** into (no deletes or updates).
+*/
+#ifndef DL_DEFAULT
+# define DL_DEFAULT DL_POSITIONS
+#endif
+
+enum {
+  POS_END = 0,        /* end of this position list */
+  POS_COLUMN,         /* followed by new column number */
+  POS_BASE
+};
+
+/* MERGE_COUNT controls how often we merge segments (see comment at
+** top of file).
+*/
+#define MERGE_COUNT 16
+
+/* utility functions */
+
+/* CLEAR() and SCRAMBLE() abstract memset() on a pointer to a single
+** record to prevent errors of the form:
+**
+** my_function(SomeType *b){
+**   memset(b, '\0', sizeof(b));  // sizeof(b)!=sizeof(*b)
+** }
+*/
+/* TODO(shess) Obvious candidates for a header file. */
+#define CLEAR(b) memset(b, '\0', sizeof(*(b)))
+
+#ifndef NDEBUG
+#  define SCRAMBLE(b) memset(b, 0x55, sizeof(*(b)))
+#else
+#  define SCRAMBLE(b)
+#endif
+
+/* We may need up to VARINT_MAX bytes to store an encoded 64-bit integer. */
+#define VARINT_MAX 10
+
+/* Write a 64-bit variable-length integer to memory starting at p[0].
+ * The length of data written will be between 1 and VARINT_MAX bytes.
+ * The number of bytes written is returned. */
+static int fts3PutVarint(char *p, sqlite_int64 v){
+  unsigned char *q = (unsigned char *) p;
+  sqlite_uint64 vu = v;
+  do{
+    *q++ = (unsigned char) ((vu & 0x7f) | 0x80);
+    vu >>= 7;
+  }while( vu!=0 );
+  q[-1] &= 0x7f;  /* turn off high bit in final byte */
+  assert( q - (unsigned char *)p <= VARINT_MAX );
+  return (int) (q - (unsigned char *)p);
+}
+
+/* Read a 64-bit variable-length integer from memory starting at p[0].
+ * Return the number of bytes read, or 0 on error.
+ * The value is stored in *v. */
+static int fts3GetVarint(const char *p, sqlite_int64 *v){
+  const unsigned char *q = (const unsigned char *) p;
+  sqlite_uint64 x = 0, y = 1;
+  while( (*q & 0x80) == 0x80 ){
+    x += y * (*q++ & 0x7f);
+    y <<= 7;
+    if( q - (unsigned char *)p >= VARINT_MAX ){  /* bad data */
+      assert( 0 );
+      return 0;
+    }
+  }
+  x += y * (*q++);
+  *v = (sqlite_int64) x;
+  return (int) (q - (unsigned char *)p);
+}
+
+static int fts3GetVarint32(const char *p, int *pi){
+ sqlite_int64 i;
+ int ret = fts3GetVarint(p, &i);
+ *pi = (int) i;
+ assert( *pi==i );
+ return ret;
+}
+
+/*******************************************************************/
+/* DataBuffer is used to collect data into a buffer in piecemeal
+** fashion.  It implements the usual distinction between amount of
+** data currently stored (nData) and buffer capacity (nCapacity).
+**
+** dataBufferInit - create a buffer with given initial capacity.
+** dataBufferReset - forget buffer's data, retaining capacity.
+** dataBufferDestroy - free buffer's data.
+** dataBufferSwap - swap contents of two buffers.
+** dataBufferExpand - expand capacity without adding data.
+** dataBufferAppend - append data.
+** dataBufferAppend2 - append two pieces of data at once.
+** dataBufferReplace - replace buffer's data.
+*/
+typedef struct DataBuffer {
+  char *pData;          /* Pointer to malloc'ed buffer. */
+  int nCapacity;        /* Size of pData buffer. */
+  int nData;            /* End of data loaded into pData. */
+} DataBuffer;
+
+static void dataBufferInit(DataBuffer *pBuffer, int nCapacity){
+  assert( nCapacity>=0 );
+  pBuffer->nData = 0;
+  pBuffer->nCapacity = nCapacity;
+  pBuffer->pData = nCapacity==0 ? NULL : sqlite3_malloc(nCapacity);
+}
+static void dataBufferReset(DataBuffer *pBuffer){
+  pBuffer->nData = 0;
+}
+static void dataBufferDestroy(DataBuffer *pBuffer){
+  if( pBuffer->pData!=NULL ) sqlite3_free(pBuffer->pData);
+  SCRAMBLE(pBuffer);
+}
+static void dataBufferSwap(DataBuffer *pBuffer1, DataBuffer *pBuffer2){
+  DataBuffer tmp = *pBuffer1;
+  *pBuffer1 = *pBuffer2;
+  *pBuffer2 = tmp;
+}
+static void dataBufferExpand(DataBuffer *pBuffer, int nAddCapacity){
+  assert( nAddCapacity>0 );
+  /* TODO(shess) Consider expanding more aggressively.  Note that the
+  ** underlying malloc implementation may take care of such things for
+  ** us already.
+  */
+  if( pBuffer->nData+nAddCapacity>pBuffer->nCapacity ){
+    pBuffer->nCapacity = pBuffer->nData+nAddCapacity;
+    pBuffer->pData = sqlite3_realloc(pBuffer->pData, pBuffer->nCapacity);
+  }
+}
+static void dataBufferAppend(DataBuffer *pBuffer,
+                             const char *pSource, int nSource){
+  assert( nSource>0 && pSource!=NULL );
+  dataBufferExpand(pBuffer, nSource);
+  memcpy(pBuffer->pData+pBuffer->nData, pSource, nSource);
+  pBuffer->nData += nSource;
+}
+static void dataBufferAppend2(DataBuffer *pBuffer,
+                              const char *pSource1, int nSource1,
+                              const char *pSource2, int nSource2){
+  assert( nSource1>0 && pSource1!=NULL );
+  assert( nSource2>0 && pSource2!=NULL );
+  dataBufferExpand(pBuffer, nSource1+nSource2);
+  memcpy(pBuffer->pData+pBuffer->nData, pSource1, nSource1);
+  memcpy(pBuffer->pData+pBuffer->nData+nSource1, pSource2, nSource2);
+  pBuffer->nData += nSource1+nSource2;
+}
+static void dataBufferReplace(DataBuffer *pBuffer,
+                              const char *pSource, int nSource){
+  dataBufferReset(pBuffer);
+  dataBufferAppend(pBuffer, pSource, nSource);
+}
+
+/* StringBuffer is a null-terminated version of DataBuffer. */
+typedef struct StringBuffer {
+  DataBuffer b;            /* Includes null terminator. */
+} StringBuffer;
+
+static void initStringBuffer(StringBuffer *sb){
+  dataBufferInit(&sb->b, 100);
+  dataBufferReplace(&sb->b, "", 1);
+}
+static int stringBufferLength(StringBuffer *sb){
+  return sb->b.nData-1;
+}
+static char *stringBufferData(StringBuffer *sb){
+  return sb->b.pData;
+}
+static void stringBufferDestroy(StringBuffer *sb){
+  dataBufferDestroy(&sb->b);
+}
+
+static void nappend(StringBuffer *sb, const char *zFrom, int nFrom){
+  assert( sb->b.nData>0 );
+  if( nFrom>0 ){
+    sb->b.nData--;
+    dataBufferAppend2(&sb->b, zFrom, nFrom, "", 1);
+  }
+}
+static void append(StringBuffer *sb, const char *zFrom){
+  nappend(sb, zFrom, strlen(zFrom));
+}
+
+/* Append a list of strings separated by commas. */
+static void appendList(StringBuffer *sb, int nString, char **azString){
+  int i;
+  for(i=0; i<nString; ++i){
+    if( i>0 ) append(sb, ", ");
+    append(sb, azString[i]);
+  }
+}
+
+static int endsInWhiteSpace(StringBuffer *p){
+  return stringBufferLength(p)>0 &&
+    safe_isspace(stringBufferData(p)[stringBufferLength(p)-1]);
+}
+
+/* If the StringBuffer ends in something other than white space, add a
+** single space character to the end.
+*/
+static void appendWhiteSpace(StringBuffer *p){
+  if( stringBufferLength(p)==0 ) return;
+  if( !endsInWhiteSpace(p) ) append(p, " ");
+}
+
+/* Remove white space from the end of the StringBuffer */
+static void trimWhiteSpace(StringBuffer *p){
+  while( endsInWhiteSpace(p) ){
+    p->b.pData[--p->b.nData-1] = '\0';
+  }
+}
+
+/*******************************************************************/
+/* DLReader is used to read document elements from a doclist.  The
+** current docid is cached, so dlrDocid() is fast.  DLReader does not
+** own the doclist buffer.
+**
+** dlrAtEnd - true if there's no more data to read.
+** dlrDocid - docid of current document.
+** dlrDocData - doclist data for current document (including docid).
+** dlrDocDataBytes - length of same.
+** dlrAllDataBytes - length of all remaining data.
+** dlrPosData - position data for current document.
+** dlrPosDataLen - length of pos data for current document (incl POS_END).
+** dlrStep - step to current document.
+** dlrInit - initial for doclist of given type against given data.
+** dlrDestroy - clean up.
+**
+** Expected usage is something like:
+**
+**   DLReader reader;
+**   dlrInit(&reader, pData, nData);
+**   while( !dlrAtEnd(&reader) ){
+**     // calls to dlrDocid() and kin.
+**     dlrStep(&reader);
+**   }
+**   dlrDestroy(&reader);
+*/
+typedef struct DLReader {
+  DocListType iType;
+  const char *pData;
+  int nData;
+
+  sqlite_int64 iDocid;
+  int nElement;
+} DLReader;
+
+static int dlrAtEnd(DLReader *pReader){
+  assert( pReader->nData>=0 );
+  return pReader->nData==0;
+}
+static sqlite_int64 dlrDocid(DLReader *pReader){
+  assert( !dlrAtEnd(pReader) );
+  return pReader->iDocid;
+}
+static const char *dlrDocData(DLReader *pReader){
+  assert( !dlrAtEnd(pReader) );
+  return pReader->pData;
+}
+static int dlrDocDataBytes(DLReader *pReader){
+  assert( !dlrAtEnd(pReader) );
+  return pReader->nElement;
+}
+static int dlrAllDataBytes(DLReader *pReader){
+  assert( !dlrAtEnd(pReader) );
+  return pReader->nData;
+}
+/* TODO(shess) Consider adding a field to track iDocid varint length
+** to make these two functions faster.  This might matter (a tiny bit)
+** for queries.
+*/
+static const char *dlrPosData(DLReader *pReader){
+  sqlite_int64 iDummy;
+  int n = fts3GetVarint(pReader->pData, &iDummy);
+  assert( !dlrAtEnd(pReader) );
+  return pReader->pData+n;
+}
+static int dlrPosDataLen(DLReader *pReader){
+  sqlite_int64 iDummy;
+  int n = fts3GetVarint(pReader->pData, &iDummy);
+  assert( !dlrAtEnd(pReader) );
+  return pReader->nElement-n;
+}
+static void dlrStep(DLReader *pReader){
+  assert( !dlrAtEnd(pReader) );
+
+  /* Skip past current doclist element. */
+  assert( pReader->nElement<=pReader->nData );
+  pReader->pData += pReader->nElement;
+  pReader->nData -= pReader->nElement;
+
+  /* If there is more data, read the next doclist element. */
+  if( pReader->nData!=0 ){
+    sqlite_int64 iDocidDelta;
+    int iDummy, n = fts3GetVarint(pReader->pData, &iDocidDelta);
+    pReader->iDocid += iDocidDelta;
+    if( pReader->iType>=DL_POSITIONS ){
+      assert( n<pReader->nData );
+      while( 1 ){
+        n += fts3GetVarint32(pReader->pData+n, &iDummy);
+        assert( n<=pReader->nData );
+        if( iDummy==POS_END ) break;
+        if( iDummy==POS_COLUMN ){
+          n += fts3GetVarint32(pReader->pData+n, &iDummy);
+          assert( n<pReader->nData );
+        }else if( pReader->iType==DL_POSITIONS_OFFSETS ){
+          n += fts3GetVarint32(pReader->pData+n, &iDummy);
+          n += fts3GetVarint32(pReader->pData+n, &iDummy);
+          assert( n<pReader->nData );
+        }
+      }
+    }
+    pReader->nElement = n;
+    assert( pReader->nElement<=pReader->nData );
+  }
+}
+static void dlrInit(DLReader *pReader, DocListType iType,
+                    const char *pData, int nData){
+  assert( pData!=NULL && nData!=0 );
+  pReader->iType = iType;
+  pReader->pData = pData;
+  pReader->nData = nData;
+  pReader->nElement = 0;
+  pReader->iDocid = 0;
+
+  /* Load the first element's data.  There must be a first element. */
+  dlrStep(pReader);
+}
+static void dlrDestroy(DLReader *pReader){
+  SCRAMBLE(pReader);
+}
+
+#ifndef NDEBUG
+/* Verify that the doclist can be validly decoded.  Also returns the
+** last docid found because it is convenient in other assertions for
+** DLWriter.
+*/
+static void docListValidate(DocListType iType, const char *pData, int nData,
+                            sqlite_int64 *pLastDocid){
+  sqlite_int64 iPrevDocid = 0;
+  assert( nData>0 );
+  assert( pData!=0 );
+  assert( pData+nData>pData );
+  while( nData!=0 ){
+    sqlite_int64 iDocidDelta;
+    int n = fts3GetVarint(pData, &iDocidDelta);
+    iPrevDocid += iDocidDelta;
+    if( iType>DL_DOCIDS ){
+      int iDummy;
+      while( 1 ){
+        n += fts3GetVarint32(pData+n, &iDummy);
+        if( iDummy==POS_END ) break;
+        if( iDummy==POS_COLUMN ){
+          n += fts3GetVarint32(pData+n, &iDummy);
+        }else if( iType>DL_POSITIONS ){
+          n += fts3GetVarint32(pData+n, &iDummy);
+          n += fts3GetVarint32(pData+n, &iDummy);
+        }
+        assert( n<=nData );
+      }
+    }
+    assert( n<=nData );
+    pData += n;
+    nData -= n;
+  }
+  if( pLastDocid ) *pLastDocid = iPrevDocid;
+}
+#define ASSERT_VALID_DOCLIST(i, p, n, o) docListValidate(i, p, n, o)
+#else
+#define ASSERT_VALID_DOCLIST(i, p, n, o) assert( 1 )
+#endif
+
+/*******************************************************************/
+/* DLWriter is used to write doclist data to a DataBuffer.  DLWriter
+** always appends to the buffer and does not own it.
+**
+** dlwInit - initialize to write a given type doclistto a buffer.
+** dlwDestroy - clear the writer's memory.  Does not free buffer.
+** dlwAppend - append raw doclist data to buffer.
+** dlwCopy - copy next doclist from reader to writer.
+** dlwAdd - construct doclist element and append to buffer.
+**    Only apply dlwAdd() to DL_DOCIDS doclists (else use PLWriter).
+*/
+typedef struct DLWriter {
+  DocListType iType;
+  DataBuffer *b;
+  sqlite_int64 iPrevDocid;
+#ifndef NDEBUG
+  int has_iPrevDocid;
+#endif
+} DLWriter;
+
+static void dlwInit(DLWriter *pWriter, DocListType iType, DataBuffer *b){
+  pWriter->b = b;
+  pWriter->iType = iType;
+  pWriter->iPrevDocid = 0;
+#ifndef NDEBUG
+  pWriter->has_iPrevDocid = 0;
+#endif
+}
+static void dlwDestroy(DLWriter *pWriter){
+  SCRAMBLE(pWriter);
+}
+/* iFirstDocid is the first docid in the doclist in pData.  It is
+** needed because pData may point within a larger doclist, in which
+** case the first item would be delta-encoded.
+**
+** iLastDocid is the final docid in the doclist in pData.  It is
+** needed to create the new iPrevDocid for future delta-encoding.  The
+** code could decode the passed doclist to recreate iLastDocid, but
+** the only current user (docListMerge) already has decoded this
+** information.
+*/
+/* TODO(shess) This has become just a helper for docListMerge.
+** Consider a refactor to make this cleaner.
+*/
+static void dlwAppend(DLWriter *pWriter,
+                      const char *pData, int nData,
+                      sqlite_int64 iFirstDocid, sqlite_int64 iLastDocid){
+  sqlite_int64 iDocid = 0;
+  char c[VARINT_MAX];
+  int nFirstOld, nFirstNew;     /* Old and new varint len of first docid. */
+#ifndef NDEBUG
+  sqlite_int64 iLastDocidDelta;
+#endif
+
+  /* Recode the initial docid as delta from iPrevDocid. */
+  nFirstOld = fts3GetVarint(pData, &iDocid);
+  assert( nFirstOld<nData || (nFirstOld==nData && pWriter->iType==DL_DOCIDS) );
+  nFirstNew = fts3PutVarint(c, iFirstDocid-pWriter->iPrevDocid);
+
+  /* Verify that the incoming doclist is valid AND that it ends with
+  ** the expected docid.  This is essential because we'll trust this
+  ** docid in future delta-encoding.
+  */
+  ASSERT_VALID_DOCLIST(pWriter->iType, pData, nData, &iLastDocidDelta);
+  assert( iLastDocid==iFirstDocid-iDocid+iLastDocidDelta );
+
+  /* Append recoded initial docid and everything else.  Rest of docids
+  ** should have been delta-encoded from previous initial docid.
+  */
+  if( nFirstOld<nData ){
+    dataBufferAppend2(pWriter->b, c, nFirstNew,
+                      pData+nFirstOld, nData-nFirstOld);
+  }else{
+    dataBufferAppend(pWriter->b, c, nFirstNew);
+  }
+  pWriter->iPrevDocid = iLastDocid;
+}
+static void dlwCopy(DLWriter *pWriter, DLReader *pReader){
+  dlwAppend(pWriter, dlrDocData(pReader), dlrDocDataBytes(pReader),
+            dlrDocid(pReader), dlrDocid(pReader));
+}
+static void dlwAdd(DLWriter *pWriter, sqlite_int64 iDocid){
+  char c[VARINT_MAX];
+  int n = fts3PutVarint(c, iDocid-pWriter->iPrevDocid);
+
+  /* Docids must ascend. */
+  assert( !pWriter->has_iPrevDocid || iDocid>pWriter->iPrevDocid );
+  assert( pWriter->iType==DL_DOCIDS );
+
+  dataBufferAppend(pWriter->b, c, n);
+  pWriter->iPrevDocid = iDocid;
+#ifndef NDEBUG
+  pWriter->has_iPrevDocid = 1;
+#endif
+}
+
+/*******************************************************************/
+/* PLReader is used to read data from a document's position list.  As
+** the caller steps through the list, data is cached so that varints
+** only need to be decoded once.
+**
+** plrInit, plrDestroy - create/destroy a reader.
+** plrColumn, plrPosition, plrStartOffset, plrEndOffset - accessors
+** plrAtEnd - at end of stream, only call plrDestroy once true.
+** plrStep - step to the next element.
+*/
+typedef struct PLReader {
+  /* These refer to the next position's data.  nData will reach 0 when
+  ** reading the last position, so plrStep() signals EOF by setting
+  ** pData to NULL.
+  */
+  const char *pData;
+  int nData;
+
+  DocListType iType;
+  int iColumn;         /* the last column read */
+  int iPosition;       /* the last position read */
+  int iStartOffset;    /* the last start offset read */
+  int iEndOffset;      /* the last end offset read */
+} PLReader;
+
+static int plrAtEnd(PLReader *pReader){
+  return pReader->pData==NULL;
+}
+static int plrColumn(PLReader *pReader){
+  assert( !plrAtEnd(pReader) );
+  return pReader->iColumn;
+}
+static int plrPosition(PLReader *pReader){
+  assert( !plrAtEnd(pReader) );
+  return pReader->iPosition;
+}
+static int plrStartOffset(PLReader *pReader){
+  assert( !plrAtEnd(pReader) );
+  return pReader->iStartOffset;
+}
+static int plrEndOffset(PLReader *pReader){
+  assert( !plrAtEnd(pReader) );
+  return pReader->iEndOffset;
+}
+static void plrStep(PLReader *pReader){
+  int i, n;
+
+  assert( !plrAtEnd(pReader) );
+
+  if( pReader->nData==0 ){
+    pReader->pData = NULL;
+    return;
+  }
+
+  n = fts3GetVarint32(pReader->pData, &i);
+  if( i==POS_COLUMN ){
+    n += fts3GetVarint32(pReader->pData+n, &pReader->iColumn);
+    pReader->iPosition = 0;
+    pReader->iStartOffset = 0;
+    n += fts3GetVarint32(pReader->pData+n, &i);
+  }
+  /* Should never see adjacent column changes. */
+  assert( i!=POS_COLUMN );
+
+  if( i==POS_END ){
+    pReader->nData = 0;
+    pReader->pData = NULL;
+    return;
+  }
+
+  pReader->iPosition += i-POS_BASE;
+  if( pReader->iType==DL_POSITIONS_OFFSETS ){
+    n += fts3GetVarint32(pReader->pData+n, &i);
+    pReader->iStartOffset += i;
+    n += fts3GetVarint32(pReader->pData+n, &i);
+    pReader->iEndOffset = pReader->iStartOffset+i;
+  }
+  assert( n<=pReader->nData );
+  pReader->pData += n;
+  pReader->nData -= n;
+}
+
+static void plrInit(PLReader *pReader, DLReader *pDLReader){
+  pReader->pData = dlrPosData(pDLReader);
+  pReader->nData = dlrPosDataLen(pDLReader);
+  pReader->iType = pDLReader->iType;
+  pReader->iColumn = 0;
+  pReader->iPosition = 0;
+  pReader->iStartOffset = 0;
+  pReader->iEndOffset = 0;
+  plrStep(pReader);
+}
+static void plrDestroy(PLReader *pReader){
+  SCRAMBLE(pReader);
+}
+
+/*******************************************************************/
+/* PLWriter is used in constructing a document's position list.  As a
+** convenience, if iType is DL_DOCIDS, PLWriter becomes a no-op.
+** PLWriter writes to the associated DLWriter's buffer.
+**
+** plwInit - init for writing a document's poslist.
+** plwDestroy - clear a writer.
+** plwAdd - append position and offset information.
+** plwCopy - copy next position's data from reader to writer.
+** plwTerminate - add any necessary doclist terminator.
+**
+** Calling plwAdd() after plwTerminate() may result in a corrupt
+** doclist.
+*/
+/* TODO(shess) Until we've written the second item, we can cache the
+** first item's information.  Then we'd have three states:
+**
+** - initialized with docid, no positions.
+** - docid and one position.
+** - docid and multiple positions.
+**
+** Only the last state needs to actually write to dlw->b, which would
+** be an improvement in the DLCollector case.
+*/
+typedef struct PLWriter {
+  DLWriter *dlw;
+
+  int iColumn;    /* the last column written */
+  int iPos;       /* the last position written */
+  int iOffset;    /* the last start offset written */
+} PLWriter;
+
+/* TODO(shess) In the case where the parent is reading these values
+** from a PLReader, we could optimize to a copy if that PLReader has
+** the same type as pWriter.
+*/
+static void plwAdd(PLWriter *pWriter, int iColumn, int iPos,
+                   int iStartOffset, int iEndOffset){
+  /* Worst-case space for POS_COLUMN, iColumn, iPosDelta,
+  ** iStartOffsetDelta, and iEndOffsetDelta.
+  */
+  char c[5*VARINT_MAX];
+  int n = 0;
+
+  /* Ban plwAdd() after plwTerminate(). */
+  assert( pWriter->iPos!=-1 );
+
+  if( pWriter->dlw->iType==DL_DOCIDS ) return;
+
+  if( iColumn!=pWriter->iColumn ){
+    n += fts3PutVarint(c+n, POS_COLUMN);
+    n += fts3PutVarint(c+n, iColumn);
+    pWriter->iColumn = iColumn;
+    pWriter->iPos = 0;
+    pWriter->iOffset = 0;
+  }
+  assert( iPos>=pWriter->iPos );
+  n += fts3PutVarint(c+n, POS_BASE+(iPos-pWriter->iPos));
+  pWriter->iPos = iPos;
+  if( pWriter->dlw->iType==DL_POSITIONS_OFFSETS ){
+    assert( iStartOffset>=pWriter->iOffset );
+    n += fts3PutVarint(c+n, iStartOffset-pWriter->iOffset);
+    pWriter->iOffset = iStartOffset;
+    assert( iEndOffset>=iStartOffset );
+    n += fts3PutVarint(c+n, iEndOffset-iStartOffset);
+  }
+  dataBufferAppend(pWriter->dlw->b, c, n);
+}
+static void plwCopy(PLWriter *pWriter, PLReader *pReader){
+  plwAdd(pWriter, plrColumn(pReader), plrPosition(pReader),
+         plrStartOffset(pReader), plrEndOffset(pReader));
+}
+static void plwInit(PLWriter *pWriter, DLWriter *dlw, sqlite_int64 iDocid){
+  char c[VARINT_MAX];
+  int n;
+
+  pWriter->dlw = dlw;
+
+  /* Docids must ascend. */
+  assert( !pWriter->dlw->has_iPrevDocid || iDocid>pWriter->dlw->iPrevDocid );
+  n = fts3PutVarint(c, iDocid-pWriter->dlw->iPrevDocid);
+  dataBufferAppend(pWriter->dlw->b, c, n);
+  pWriter->dlw->iPrevDocid = iDocid;
+#ifndef NDEBUG
+  pWriter->dlw->has_iPrevDocid = 1;
+#endif
+
+  pWriter->iColumn = 0;
+  pWriter->iPos = 0;
+  pWriter->iOffset = 0;
+}
+/* TODO(shess) Should plwDestroy() also terminate the doclist?  But
+** then plwDestroy() would no longer be just a destructor, it would
+** also be doing work, which isn't consistent with the overall idiom.
+** Another option would be for plwAdd() to always append any necessary
+** terminator, so that the output is always correct.  But that would
+** add incremental work to the common case with the only benefit being
+** API elegance.  Punt for now.
+*/
+static void plwTerminate(PLWriter *pWriter){
+  if( pWriter->dlw->iType>DL_DOCIDS ){
+    char c[VARINT_MAX];
+    int n = fts3PutVarint(c, POS_END);
+    dataBufferAppend(pWriter->dlw->b, c, n);
+  }
+#ifndef NDEBUG
+  /* Mark as terminated for assert in plwAdd(). */
+  pWriter->iPos = -1;
+#endif
+}
+static void plwDestroy(PLWriter *pWriter){
+  SCRAMBLE(pWriter);
+}
+
+/*******************************************************************/
+/* DLCollector wraps PLWriter and DLWriter to provide a
+** dynamically-allocated doclist area to use during tokenization.
+**
+** dlcNew - malloc up and initialize a collector.
+** dlcDelete - destroy a collector and all contained items.
+** dlcAddPos - append position and offset information.
+** dlcAddDoclist - add the collected doclist to the given buffer.
+** dlcNext - terminate the current document and open another.
+*/
+typedef struct DLCollector {
+  DataBuffer b;
+  DLWriter dlw;
+  PLWriter plw;
+} DLCollector;
+
+/* TODO(shess) This could also be done by calling plwTerminate() and
+** dataBufferAppend().  I tried that, expecting nominal performance
+** differences, but it seemed to pretty reliably be worth 1% to code
+** it this way.  I suspect it is the incremental malloc overhead (some
+** percentage of the plwTerminate() calls will cause a realloc), so
+** this might be worth revisiting if the DataBuffer implementation
+** changes.
+*/
+static void dlcAddDoclist(DLCollector *pCollector, DataBuffer *b){
+  if( pCollector->dlw.iType>DL_DOCIDS ){
+    char c[VARINT_MAX];
+    int n = fts3PutVarint(c, POS_END);
+    dataBufferAppend2(b, pCollector->b.pData, pCollector->b.nData, c, n);
+  }else{
+    dataBufferAppend(b, pCollector->b.pData, pCollector->b.nData);
+  }
+}
+static void dlcNext(DLCollector *pCollector, sqlite_int64 iDocid){
+  plwTerminate(&pCollector->plw);
+  plwDestroy(&pCollector->plw);
+  plwInit(&pCollector->plw, &pCollector->dlw, iDocid);
+}
+static void dlcAddPos(DLCollector *pCollector, int iColumn, int iPos,
+                      int iStartOffset, int iEndOffset){
+  plwAdd(&pCollector->plw, iColumn, iPos, iStartOffset, iEndOffset);
+}
+
+static DLCollector *dlcNew(sqlite_int64 iDocid, DocListType iType){
+  DLCollector *pCollector = sqlite3_malloc(sizeof(DLCollector));
+  dataBufferInit(&pCollector->b, 0);
+  dlwInit(&pCollector->dlw, iType, &pCollector->b);
+  plwInit(&pCollector->plw, &pCollector->dlw, iDocid);
+  return pCollector;
+}
+static void dlcDelete(DLCollector *pCollector){
+  plwDestroy(&pCollector->plw);
+  dlwDestroy(&pCollector->dlw);
+  dataBufferDestroy(&pCollector->b);
+  SCRAMBLE(pCollector);
+  sqlite3_free(pCollector);
+}
+
+
+/* Copy the doclist data of iType in pData/nData into *out, trimming
+** unnecessary data as we go.  Only columns matching iColumn are
+** copied, all columns copied if iColumn is -1.  Elements with no
+** matching columns are dropped.  The output is an iOutType doclist.
+*/
+/* NOTE(shess) This code is only valid after all doclists are merged.
+** If this is run before merges, then doclist items which represent
+** deletion will be trimmed, and will thus not effect a deletion
+** during the merge.
+*/
+static void docListTrim(DocListType iType, const char *pData, int nData,
+                        int iColumn, DocListType iOutType, DataBuffer *out){
+  DLReader dlReader;
+  DLWriter dlWriter;
+
+  assert( iOutType<=iType );
+
+  dlrInit(&dlReader, iType, pData, nData);
+  dlwInit(&dlWriter, iOutType, out);
+
+  while( !dlrAtEnd(&dlReader) ){
+    PLReader plReader;
+    PLWriter plWriter;
+    int match = 0;
+
+    plrInit(&plReader, &dlReader);
+
+    while( !plrAtEnd(&plReader) ){
+      if( iColumn==-1 || plrColumn(&plReader)==iColumn ){
+        if( !match ){
+          plwInit(&plWriter, &dlWriter, dlrDocid(&dlReader));
+          match = 1;
+        }
+        plwAdd(&plWriter, plrColumn(&plReader), plrPosition(&plReader),
+               plrStartOffset(&plReader), plrEndOffset(&plReader));
+      }
+      plrStep(&plReader);
+    }
+    if( match ){
+      plwTerminate(&plWriter);
+      plwDestroy(&plWriter);
+    }
+
+    plrDestroy(&plReader);
+    dlrStep(&dlReader);
+  }
+  dlwDestroy(&dlWriter);
+  dlrDestroy(&dlReader);
+}
+
+/* Used by docListMerge() to keep doclists in the ascending order by
+** docid, then ascending order by age (so the newest comes first).
+*/
+typedef struct OrderedDLReader {
+  DLReader *pReader;
+
+  /* TODO(shess) If we assume that docListMerge pReaders is ordered by
+  ** age (which we do), then we could use pReader comparisons to break
+  ** ties.
+  */
+  int idx;
+} OrderedDLReader;
+
+/* Order eof to end, then by docid asc, idx desc. */
+static int orderedDLReaderCmp(OrderedDLReader *r1, OrderedDLReader *r2){
+  if( dlrAtEnd(r1->pReader) ){
+    if( dlrAtEnd(r2->pReader) ) return 0;  /* Both atEnd(). */
+    return 1;                              /* Only r1 atEnd(). */
+  }
+  if( dlrAtEnd(r2->pReader) ) return -1;   /* Only r2 atEnd(). */
+
+  if( dlrDocid(r1->pReader)<dlrDocid(r2->pReader) ) return -1;
+  if( dlrDocid(r1->pReader)>dlrDocid(r2->pReader) ) return 1;
+
+  /* Descending on idx. */
+  return r2->idx-r1->idx;
+}
+
+/* Bubble p[0] to appropriate place in p[1..n-1].  Assumes that
+** p[1..n-1] is already sorted.
+*/
+/* TODO(shess) Is this frequent enough to warrant a binary search?
+** Before implementing that, instrument the code to check.  In most
+** current usage, I expect that p[0] will be less than p[1] a very
+** high proportion of the time.
+*/
+static void orderedDLReaderReorder(OrderedDLReader *p, int n){
+  while( n>1 && orderedDLReaderCmp(p, p+1)>0 ){
+    OrderedDLReader tmp = p[0];
+    p[0] = p[1];
+    p[1] = tmp;
+    n--;
+    p++;
+  }
+}
+
+/* Given an array of doclist readers, merge their doclist elements
+** into out in sorted order (by docid), dropping elements from older
+** readers when there is a duplicate docid.  pReaders is assumed to be
+** ordered by age, oldest first.
+*/
+/* TODO(shess) nReaders must be <= MERGE_COUNT.  This should probably
+** be fixed.
+*/
+static void docListMerge(DataBuffer *out,
+                         DLReader *pReaders, int nReaders){
+  OrderedDLReader readers[MERGE_COUNT];
+  DLWriter writer;
+  int i, n;
+  const char *pStart = 0;
+  int nStart = 0;
+  sqlite_int64 iFirstDocid = 0, iLastDocid = 0;
+
+  assert( nReaders>0 );
+  if( nReaders==1 ){
+    dataBufferAppend(out, dlrDocData(pReaders), dlrAllDataBytes(pReaders));
+    return;
+  }
+
+  assert( nReaders<=MERGE_COUNT );
+  n = 0;
+  for(i=0; i<nReaders; i++){
+    assert( pReaders[i].iType==pReaders[0].iType );
+    readers[i].pReader = pReaders+i;
+    readers[i].idx = i;
+    n += dlrAllDataBytes(&pReaders[i]);
+  }
+  /* Conservatively size output to sum of inputs.  Output should end
+  ** up strictly smaller than input.
+  */
+  dataBufferExpand(out, n);
+
+  /* Get the readers into sorted order. */
+  while( i-->0 ){
+    orderedDLReaderReorder(readers+i, nReaders-i);
+  }
+
+  dlwInit(&writer, pReaders[0].iType, out);
+  while( !dlrAtEnd(readers[0].pReader) ){
+    sqlite_int64 iDocid = dlrDocid(readers[0].pReader);
+
+    /* If this is a continuation of the current buffer to copy, extend
+    ** that buffer.  memcpy() seems to be more efficient if it has a
+    ** lots of data to copy.
+    */
+    if( dlrDocData(readers[0].pReader)==pStart+nStart ){
+      nStart += dlrDocDataBytes(readers[0].pReader);
+    }else{
+      if( pStart!=0 ){
+        dlwAppend(&writer, pStart, nStart, iFirstDocid, iLastDocid);
+      }
+      pStart = dlrDocData(readers[0].pReader);
+      nStart = dlrDocDataBytes(readers[0].pReader);
+      iFirstDocid = iDocid;
+    }
+    iLastDocid = iDocid;
+    dlrStep(readers[0].pReader);
+
+    /* Drop all of the older elements with the same docid. */
+    for(i=1; i<nReaders &&
+             !dlrAtEnd(readers[i].pReader) &&
+             dlrDocid(readers[i].pReader)==iDocid; i++){
+      dlrStep(readers[i].pReader);
+    }
+
+    /* Get the readers back into order. */
+    while( i-->0 ){
+      orderedDLReaderReorder(readers+i, nReaders-i);
+    }
+  }
+
+  /* Copy over any remaining elements. */
+  if( nStart>0 ) dlwAppend(&writer, pStart, nStart, iFirstDocid, iLastDocid);
+  dlwDestroy(&writer);
+}
+
+/* Helper function for posListUnion().  Compares the current position
+** between left and right, returning as standard C idiom of <0 if
+** left<right, >0 if left>right, and 0 if left==right.  "End" always
+** compares greater.
+*/
+static int posListCmp(PLReader *pLeft, PLReader *pRight){
+  assert( pLeft->iType==pRight->iType );
+  if( pLeft->iType==DL_DOCIDS ) return 0;
+
+  if( plrAtEnd(pLeft) ) return plrAtEnd(pRight) ? 0 : 1;
+  if( plrAtEnd(pRight) ) return -1;
+
+  if( plrColumn(pLeft)<plrColumn(pRight) ) return -1;
+  if( plrColumn(pLeft)>plrColumn(pRight) ) return 1;
+
+  if( plrPosition(pLeft)<plrPosition(pRight) ) return -1;
+  if( plrPosition(pLeft)>plrPosition(pRight) ) return 1;
+  if( pLeft->iType==DL_POSITIONS ) return 0;
+
+  if( plrStartOffset(pLeft)<plrStartOffset(pRight) ) return -1;
+  if( plrStartOffset(pLeft)>plrStartOffset(pRight) ) return 1;
+
+  if( plrEndOffset(pLeft)<plrEndOffset(pRight) ) return -1;
+  if( plrEndOffset(pLeft)>plrEndOffset(pRight) ) return 1;
+
+  return 0;
+}
+
+/* Write the union of position lists in pLeft and pRight to pOut.
+** "Union" in this case meaning "All unique position tuples".  Should
+** work with any doclist type, though both inputs and the output
+** should be the same type.
+*/
+static void posListUnion(DLReader *pLeft, DLReader *pRight, DLWriter *pOut){
+  PLReader left, right;
+  PLWriter writer;
+
+  assert( dlrDocid(pLeft)==dlrDocid(pRight) );
+  assert( pLeft->iType==pRight->iType );
+  assert( pLeft->iType==pOut->iType );
+
+  plrInit(&left, pLeft);
+  plrInit(&right, pRight);
+  plwInit(&writer, pOut, dlrDocid(pLeft));
+
+  while( !plrAtEnd(&left) || !plrAtEnd(&right) ){
+    int c = posListCmp(&left, &right);
+    if( c<0 ){
+      plwCopy(&writer, &left);
+      plrStep(&left);
+    }else if( c>0 ){
+      plwCopy(&writer, &right);
+      plrStep(&right);
+    }else{
+      plwCopy(&writer, &left);
+      plrStep(&left);
+      plrStep(&right);
+    }
+  }
+
+  plwTerminate(&writer);
+  plwDestroy(&writer);
+  plrDestroy(&left);
+  plrDestroy(&right);
+}
+
+/* Write the union of doclists in pLeft and pRight to pOut.  For
+** docids in common between the inputs, the union of the position
+** lists is written.  Inputs and outputs are always type DL_DEFAULT.
+*/
+static void docListUnion(
+  const char *pLeft, int nLeft,
+  const char *pRight, int nRight,
+  DataBuffer *pOut      /* Write the combined doclist here */
+){
+  DLReader left, right;
+  DLWriter writer;
+
+  if( nLeft==0 ){
+    if( nRight!=0) dataBufferAppend(pOut, pRight, nRight);
+    return;
+  }
+  if( nRight==0 ){
+    dataBufferAppend(pOut, pLeft, nLeft);
+    return;
+  }
+
+  dlrInit(&left, DL_DEFAULT, pLeft, nLeft);
+  dlrInit(&right, DL_DEFAULT, pRight, nRight);
+  dlwInit(&writer, DL_DEFAULT, pOut);
+
+  while( !dlrAtEnd(&left) || !dlrAtEnd(&right) ){
+    if( dlrAtEnd(&right) ){
+      dlwCopy(&writer, &left);
+      dlrStep(&left);
+    }else if( dlrAtEnd(&left) ){
+      dlwCopy(&writer, &right);
+      dlrStep(&right);
+    }else if( dlrDocid(&left)<dlrDocid(&right) ){
+      dlwCopy(&writer, &left);
+      dlrStep(&left);
+    }else if( dlrDocid(&left)>dlrDocid(&right) ){
+      dlwCopy(&writer, &right);
+      dlrStep(&right);
+    }else{
+      posListUnion(&left, &right, &writer);
+      dlrStep(&left);
+      dlrStep(&right);
+    }
+  }
+
+  dlrDestroy(&left);
+  dlrDestroy(&right);
+  dlwDestroy(&writer);
+}
+
+/*
+** This function is used as part of the implementation of phrase and
+** NEAR matching.
+**
+** pLeft and pRight are DLReaders positioned to the same docid in
+** lists of type DL_POSITION. This function writes an entry to the
+** DLWriter pOut for each position in pRight that is less than
+** (nNear+1) greater (but not equal to or smaller) than a position
+** in pLeft. For example, if nNear is 0, and the positions contained
+** by pLeft and pRight are:
+**
+**    pLeft:  5 10 15 20
+**    pRight: 6  9 17 21
+**
+** then the docid is added to pOut. If pOut is of type DL_POSITIONS,
+** then a positionids "6" and "21" are also added to pOut.
+**
+** If boolean argument isSaveLeft is true, then positionids are copied
+** from pLeft instead of pRight. In the example above, the positions "5"
+** and "20" would be added instead of "6" and "21".
+*/
+static void posListPhraseMerge(
+  DLReader *pLeft,
+  DLReader *pRight,
+  int nNear,
+  int isSaveLeft,
+  DLWriter *pOut
+){
+  PLReader left, right;
+  PLWriter writer;
+  int match = 0;
+
+  assert( dlrDocid(pLeft)==dlrDocid(pRight) );
+  assert( pOut->iType!=DL_POSITIONS_OFFSETS );
+
+  plrInit(&left, pLeft);
+  plrInit(&right, pRight);
+
+  while( !plrAtEnd(&left) && !plrAtEnd(&right) ){
+    if( plrColumn(&left)<plrColumn(&right) ){
+      plrStep(&left);
+    }else if( plrColumn(&left)>plrColumn(&right) ){
+      plrStep(&right);
+    }else if( plrPosition(&left)>=plrPosition(&right) ){
+      plrStep(&right);
+    }else{
+      if( (plrPosition(&right)-plrPosition(&left))<=(nNear+1) ){
+        if( !match ){
+          plwInit(&writer, pOut, dlrDocid(pLeft));
+          match = 1;
+        }
+        if( !isSaveLeft ){
+          plwAdd(&writer, plrColumn(&right), plrPosition(&right), 0, 0);
+        }else{
+          plwAdd(&writer, plrColumn(&left), plrPosition(&left), 0, 0);
+        }
+        plrStep(&right);
+      }else{
+        plrStep(&left);
+      }
+    }
+  }
+
+  if( match ){
+    plwTerminate(&writer);
+    plwDestroy(&writer);
+  }
+
+  plrDestroy(&left);
+  plrDestroy(&right);
+}
+
+/*
+** Compare the values pointed to by the PLReaders passed as arguments.
+** Return -1 if the value pointed to by pLeft is considered less than
+** the value pointed to by pRight, +1 if it is considered greater
+** than it, or 0 if it is equal. i.e.
+**
+**     (*pLeft - *pRight)
+**
+** A PLReader that is in the EOF condition is considered greater than
+** any other. If neither argument is in EOF state, the return value of
+** plrColumn() is used. If the plrColumn() values are equal, the
+** comparison is on the basis of plrPosition().
+*/
+static int plrCompare(PLReader *pLeft, PLReader *pRight){
+  assert(!plrAtEnd(pLeft) || !plrAtEnd(pRight));
+
+  if( plrAtEnd(pRight) || plrAtEnd(pLeft) ){
+    return (plrAtEnd(pRight) ? -1 : 1);
+  }
+  if( plrColumn(pLeft)!=plrColumn(pRight) ){
+    return ((plrColumn(pLeft)<plrColumn(pRight)) ? -1 : 1);
+  }
+  if( plrPosition(pLeft)!=plrPosition(pRight) ){
+    return ((plrPosition(pLeft)<plrPosition(pRight)) ? -1 : 1);
+  }
+  return 0;
+}
+
+/* We have two doclists with positions:  pLeft and pRight. Depending
+** on the value of the nNear parameter, perform either a phrase
+** intersection (if nNear==0) or a NEAR intersection (if nNear>0)
+** and write the results into pOut.
+**
+** A phrase intersection means that two documents only match
+** if pLeft.iPos+1==pRight.iPos.
+**
+** A NEAR intersection means that two documents only match if
+** (abs(pLeft.iPos-pRight.iPos)<nNear).
+**
+** If a NEAR intersection is requested, then the nPhrase argument should
+** be passed the number of tokens in the two operands to the NEAR operator
+** combined. For example:
+**
+**       Query syntax               nPhrase
+**      ------------------------------------
+**       "A B C" NEAR "D E"         5
+**       A NEAR B                   2
+**
+** iType controls the type of data written to pOut.  If iType is
+** DL_POSITIONS, the positions are those from pRight.
+*/
+static void docListPhraseMerge(
+  const char *pLeft, int nLeft,
+  const char *pRight, int nRight,
+  int nNear,            /* 0 for a phrase merge, non-zero for a NEAR merge */
+  int nPhrase,          /* Number of tokens in left+right operands to NEAR */
+  DocListType iType,    /* Type of doclist to write to pOut */
+  DataBuffer *pOut      /* Write the combined doclist here */
+){
+  DLReader left, right;
+  DLWriter writer;
+
+  if( nLeft==0 || nRight==0 ) return;
+
+  assert( iType!=DL_POSITIONS_OFFSETS );
+
+  dlrInit(&left, DL_POSITIONS, pLeft, nLeft);
+  dlrInit(&right, DL_POSITIONS, pRight, nRight);
+  dlwInit(&writer, iType, pOut);
+
+  while( !dlrAtEnd(&left) && !dlrAtEnd(&right) ){
+    if( dlrDocid(&left)<dlrDocid(&right) ){
+      dlrStep(&left);
+    }else if( dlrDocid(&right)<dlrDocid(&left) ){
+      dlrStep(&right);
+    }else{
+      if( nNear==0 ){
+        posListPhraseMerge(&left, &right, 0, 0, &writer);
+      }else{
+        /* This case occurs when two terms (simple terms or phrases) are
+         * connected by a NEAR operator, span (nNear+1). i.e.
+         *
+         *     '"terrible company" NEAR widget'
+         */
+        DataBuffer one = {0, 0, 0};
+        DataBuffer two = {0, 0, 0};
+
+        DLWriter dlwriter2;
+        DLReader dr1 = {0, 0, 0, 0, 0};
+        DLReader dr2 = {0, 0, 0, 0, 0};
+
+        dlwInit(&dlwriter2, iType, &one);
+        posListPhraseMerge(&right, &left, nNear-3+nPhrase, 1, &dlwriter2);
+        dlwInit(&dlwriter2, iType, &two);
+        posListPhraseMerge(&left, &right, nNear-1, 0, &dlwriter2);
+
+        if( one.nData) dlrInit(&dr1, iType, one.pData, one.nData);
+        if( two.nData) dlrInit(&dr2, iType, two.pData, two.nData);
+
+        if( !dlrAtEnd(&dr1) || !dlrAtEnd(&dr2) ){
+          PLReader pr1 = {0};
+          PLReader pr2 = {0};
+
+          PLWriter plwriter;
+          plwInit(&plwriter, &writer, dlrDocid(dlrAtEnd(&dr1)?&dr2:&dr1));
+
+          if( one.nData ) plrInit(&pr1, &dr1);
+          if( two.nData ) plrInit(&pr2, &dr2);
+          while( !plrAtEnd(&pr1) || !plrAtEnd(&pr2) ){
+            int iCompare = plrCompare(&pr1, &pr2);
+            switch( iCompare ){
+              case -1:
+                plwCopy(&plwriter, &pr1);
+                plrStep(&pr1);
+                break;
+              case 1:
+                plwCopy(&plwriter, &pr2);
+                plrStep(&pr2);
+                break;
+              case 0:
+                plwCopy(&plwriter, &pr1);
+                plrStep(&pr1);
+                plrStep(&pr2);
+                break;
+            }
+          }
+          plwTerminate(&plwriter);
+        }
+        dataBufferDestroy(&one);
+        dataBufferDestroy(&two);
+      }
+      dlrStep(&left);
+      dlrStep(&right);
+    }
+  }
+
+  dlrDestroy(&left);
+  dlrDestroy(&right);
+  dlwDestroy(&writer);
+}
+
+/* We have two DL_DOCIDS doclists:  pLeft and pRight.
+** Write the intersection of these two doclists into pOut as a
+** DL_DOCIDS doclist.
+*/
+static void docListAndMerge(
+  const char *pLeft, int nLeft,
+  const char *pRight, int nRight,
+  DataBuffer *pOut      /* Write the combined doclist here */
+){
+  DLReader left, right;
+  DLWriter writer;
+
+  if( nLeft==0 || nRight==0 ) return;
+
+  dlrInit(&left, DL_DOCIDS, pLeft, nLeft);
+  dlrInit(&right, DL_DOCIDS, pRight, nRight);
+  dlwInit(&writer, DL_DOCIDS, pOut);
+
+  while( !dlrAtEnd(&left) && !dlrAtEnd(&right) ){
+    if( dlrDocid(&left)<dlrDocid(&right) ){
+      dlrStep(&left);
+    }else if( dlrDocid(&right)<dlrDocid(&left) ){
+      dlrStep(&right);
+    }else{
+      dlwAdd(&writer, dlrDocid(&left));
+      dlrStep(&left);
+      dlrStep(&right);
+    }
+  }
+
+  dlrDestroy(&left);
+  dlrDestroy(&right);
+  dlwDestroy(&writer);
+}
+
+/* We have two DL_DOCIDS doclists:  pLeft and pRight.
+** Write the union of these two doclists into pOut as a
+** DL_DOCIDS doclist.
+*/
+static void docListOrMerge(
+  const char *pLeft, int nLeft,
+  const char *pRight, int nRight,
+  DataBuffer *pOut      /* Write the combined doclist here */
+){
+  DLReader left, right;
+  DLWriter writer;
+
+  if( nLeft==0 ){
+    if( nRight!=0 ) dataBufferAppend(pOut, pRight, nRight);
+    return;
+  }
+  if( nRight==0 ){
+    dataBufferAppend(pOut, pLeft, nLeft);
+    return;
+  }
+
+  dlrInit(&left, DL_DOCIDS, pLeft, nLeft);
+  dlrInit(&right, DL_DOCIDS, pRight, nRight);
+  dlwInit(&writer, DL_DOCIDS, pOut);
+
+  while( !dlrAtEnd(&left) || !dlrAtEnd(&right) ){
+    if( dlrAtEnd(&right) ){
+      dlwAdd(&writer, dlrDocid(&left));
+      dlrStep(&left);
+    }else if( dlrAtEnd(&left) ){
+      dlwAdd(&writer, dlrDocid(&right));
+      dlrStep(&right);
+    }else if( dlrDocid(&left)<dlrDocid(&right) ){
+      dlwAdd(&writer, dlrDocid(&left));
+      dlrStep(&left);
+    }else if( dlrDocid(&right)<dlrDocid(&left) ){
+      dlwAdd(&writer, dlrDocid(&right));
+      dlrStep(&right);
+    }else{
+      dlwAdd(&writer, dlrDocid(&left));
+      dlrStep(&left);
+      dlrStep(&right);
+    }
+  }
+
+  dlrDestroy(&left);
+  dlrDestroy(&right);
+  dlwDestroy(&writer);
+}
+
+/* We have two DL_DOCIDS doclists:  pLeft and pRight.
+** Write into pOut as DL_DOCIDS doclist containing all documents that
+** occur in pLeft but not in pRight.
+*/
+static void docListExceptMerge(
+  const char *pLeft, int nLeft,
+  const char *pRight, int nRight,
+  DataBuffer *pOut      /* Write the combined doclist here */
+){
+  DLReader left, right;
+  DLWriter writer;
+
+  if( nLeft==0 ) return;
+  if( nRight==0 ){
+    dataBufferAppend(pOut, pLeft, nLeft);
+    return;
+  }
+
+  dlrInit(&left, DL_DOCIDS, pLeft, nLeft);
+  dlrInit(&right, DL_DOCIDS, pRight, nRight);
+  dlwInit(&writer, DL_DOCIDS, pOut);
+
+  while( !dlrAtEnd(&left) ){
+    while( !dlrAtEnd(&right) && dlrDocid(&right)<dlrDocid(&left) ){
+      dlrStep(&right);
+    }
+    if( dlrAtEnd(&right) || dlrDocid(&left)<dlrDocid(&right) ){
+      dlwAdd(&writer, dlrDocid(&left));
+    }
+    dlrStep(&left);
+  }
+
+  dlrDestroy(&left);
+  dlrDestroy(&right);
+  dlwDestroy(&writer);
+}
+
+static char *string_dup_n(const char *s, int n){
+  char *str = sqlite3_malloc(n + 1);
+  memcpy(str, s, n);
+  str[n] = '\0';
+  return str;
+}
+
+/* Duplicate a string; the caller must free() the returned string.
+ * (We don't use strdup() since it is not part of the standard C library and
+ * may not be available everywhere.) */
+static char *string_dup(const char *s){
+  return string_dup_n(s, strlen(s));
+}
+
+/* Format a string, replacing each occurrence of the % character with
+ * zDb.zName.  This may be more convenient than sqlite_mprintf()
+ * when one string is used repeatedly in a format string.
+ * The caller must free() the returned string. */
+static char *string_format(const char *zFormat,
+                           const char *zDb, const char *zName){
+  const char *p;
+  size_t len = 0;
+  size_t nDb = strlen(zDb);
+  size_t nName = strlen(zName);
+  size_t nFullTableName = nDb+1+nName;
+  char *result;
+  char *r;
+
+  /* first compute length needed */
+  for(p = zFormat ; *p ; ++p){
+    len += (*p=='%' ? nFullTableName : 1);
+  }
+  len += 1;  /* for null terminator */
+
+  r = result = sqlite3_malloc(len);
+  for(p = zFormat; *p; ++p){
+    if( *p=='%' ){
+      memcpy(r, zDb, nDb);
+      r += nDb;
+      *r++ = '.';
+      memcpy(r, zName, nName);
+      r += nName;
+    } else {
+      *r++ = *p;
+    }
+  }
+  *r++ = '\0';
+  assert( r == result + len );
+  return result;
+}
+
+static int sql_exec(sqlite3 *db, const char *zDb, const char *zName,
+                    const char *zFormat){
+  char *zCommand = string_format(zFormat, zDb, zName);
+  int rc;
+  FTSTRACE(("FTS3 sql: %s\n", zCommand));
+  rc = sqlite3_exec(db, zCommand, NULL, 0, NULL);
+  sqlite3_free(zCommand);
+  return rc;
+}
+
+static int sql_prepare(sqlite3 *db, const char *zDb, const char *zName,
+                       sqlite3_stmt **ppStmt, const char *zFormat){
+  char *zCommand = string_format(zFormat, zDb, zName);
+  int rc;
+  FTSTRACE(("FTS3 prepare: %s\n", zCommand));
+  rc = sqlite3_prepare_v2(db, zCommand, -1, ppStmt, NULL);
+  sqlite3_free(zCommand);
+  return rc;
+}
+
+/* end utility functions */
+
+/* Forward reference */
+typedef struct fulltext_vtab fulltext_vtab;
+
+/* A single term in a query is represented by an instances of
+** the following structure. Each word which may match against
+** document content is a term. Operators, like NEAR or OR, are
+** not terms. Query terms are organized as a flat list stored
+** in the Query.pTerms array.
+**
+** If the QueryTerm.nPhrase variable is non-zero, then the QueryTerm
+** is the first in a contiguous string of terms that are either part
+** of the same phrase, or connected by the NEAR operator.
+**
+** If the QueryTerm.nNear variable is non-zero, then the token is followed
+** by a NEAR operator with span set to (nNear-1). For example, the
+** following query:
+**
+** The QueryTerm.iPhrase variable stores the index of the token within
+** its phrase, indexed starting at 1, or 1 if the token is not part
+** of any phrase.
+**
+** For example, the data structure used to represent the following query:
+**
+**     ... MATCH 'sqlite NEAR/5 google NEAR/2 "search engine"'
+**
+** is:
+**
+**     {nPhrase=4, iPhrase=1, nNear=6, pTerm="sqlite"},
+**     {nPhrase=0, iPhrase=1, nNear=3, pTerm="google"},
+**     {nPhrase=0, iPhrase=1, nNear=0, pTerm="search"},
+**     {nPhrase=0, iPhrase=2, nNear=0, pTerm="engine"},
+**
+** compiling the FTS3 syntax to Query structures is done by the parseQuery()
+** function.
+*/
+typedef struct QueryTerm {
+  short int nPhrase; /* How many following terms are part of the same phrase */
+  short int iPhrase; /* This is the i-th term of a phrase. */
+  short int iColumn; /* Column of the index that must match this term */
+  signed char nNear; /* term followed by a NEAR operator with span=(nNear-1) */
+  signed char isOr;  /* this term is preceded by "OR" */
+  signed char isNot; /* this term is preceded by "-" */
+  signed char isPrefix; /* this term is followed by "*" */
+  char *pTerm;       /* text of the term.  '\000' terminated.  malloced */
+  int nTerm;         /* Number of bytes in pTerm[] */
+} QueryTerm;
+
+
+/* A query string is parsed into a Query structure.
+ *
+ * We could, in theory, allow query strings to be complicated
+ * nested expressions with precedence determined by parentheses.
+ * But none of the major search engines do this.  (Perhaps the
+ * feeling is that an parenthesized expression is two complex of
+ * an idea for the average user to grasp.)  Taking our lead from
+ * the major search engines, we will allow queries to be a list
+ * of terms (with an implied AND operator) or phrases in double-quotes,
+ * with a single optional "-" before each non-phrase term to designate
+ * negation and an optional OR connector.
+ *
+ * OR binds more tightly than the implied AND, which is what the
+ * major search engines seem to do.  So, for example:
+ *
+ *    [one two OR three]     ==>    one AND (two OR three)
+ *    [one OR two three]     ==>    (one OR two) AND three
+ *
+ * A "-" before a term matches all entries that lack that term.
+ * The "-" must occur immediately before the term with in intervening
+ * space.  This is how the search engines do it.
+ *
+ * A NOT term cannot be the right-hand operand of an OR.  If this
+ * occurs in the query string, the NOT is ignored:
+ *
+ *    [one OR -two]          ==>    one OR two
+ *
+ */
+typedef struct Query {
+  fulltext_vtab *pFts;  /* The full text index */
+  int nTerms;           /* Number of terms in the query */
+  QueryTerm *pTerms;    /* Array of terms.  Space obtained from malloc() */
+  int nextIsOr;         /* Set the isOr flag on the next inserted term */
+  int nextIsNear;       /* Set the isOr flag on the next inserted term */
+  int nextColumn;       /* Next word parsed must be in this column */
+  int dfltColumn;       /* The default column */
+} Query;
+
+
+/*
+** An instance of the following structure keeps track of generated
+** matching-word offset information and snippets.
+*/
+typedef struct Snippet {
+  int nMatch;     /* Total number of matches */
+  int nAlloc;     /* Space allocated for aMatch[] */
+  struct snippetMatch { /* One entry for each matching term */
+    char snStatus;       /* Status flag for use while constructing snippets */
+    short int iCol;      /* The column that contains the match */
+    short int iTerm;     /* The index in Query.pTerms[] of the matching term */
+    int iToken;          /* The index of the matching document token */
+    short int nByte;     /* Number of bytes in the term */
+    int iStart;          /* The offset to the first character of the term */
+  } *aMatch;      /* Points to space obtained from malloc */
+  char *zOffset;  /* Text rendering of aMatch[] */
+  int nOffset;    /* strlen(zOffset) */
+  char *zSnippet; /* Snippet text */
+  int nSnippet;   /* strlen(zSnippet) */
+} Snippet;
+
+
+typedef enum QueryType {
+  QUERY_GENERIC,   /* table scan */
+  QUERY_DOCID,     /* lookup by docid */
+  QUERY_FULLTEXT   /* QUERY_FULLTEXT + [i] is a full-text search for column i*/
+} QueryType;
+
+typedef enum fulltext_statement {
+  CONTENT_INSERT_STMT,
+  CONTENT_SELECT_STMT,
+  CONTENT_UPDATE_STMT,
+  CONTENT_DELETE_STMT,
+
+  BLOCK_INSERT_STMT,
+  BLOCK_SELECT_STMT,
+  BLOCK_DELETE_STMT,
+
+  SEGDIR_MAX_INDEX_STMT,
+  SEGDIR_SET_STMT,
+  SEGDIR_SELECT_STMT,
+  SEGDIR_SPAN_STMT,
+  SEGDIR_DELETE_STMT,
+  SEGDIR_SELECT_ALL_STMT,
+
+  MAX_STMT                     /* Always at end! */
+} fulltext_statement;
+
+/* These must exactly match the enum above. */
+/* TODO(shess): Is there some risk that a statement will be used in two
+** cursors at once, e.g.  if a query joins a virtual table to itself?
+** If so perhaps we should move some of these to the cursor object.
+*/
+static const char *const fulltext_zStatement[MAX_STMT] = {
+  /* CONTENT_INSERT */ NULL,  /* generated in contentInsertStatement() */
+  /* CONTENT_SELECT */ NULL,  /* generated in contentSelectStatement() */
+  /* CONTENT_UPDATE */ NULL,  /* generated in contentUpdateStatement() */
+  /* CONTENT_DELETE */ "delete from %_content where docid = ?",
+
+  /* BLOCK_INSERT */
+  "insert into %_segments (blockid, block) values (null, ?)",
+  /* BLOCK_SELECT */ "select block from %_segments where blockid = ?",
+  /* BLOCK_DELETE */ "delete from %_segments where blockid between ? and ?",
+
+  /* SEGDIR_MAX_INDEX */ "select max(idx) from %_segdir where level = ?",
+  /* SEGDIR_SET */ "insert into %_segdir values (?, ?, ?, ?, ?, ?)",
+  /* SEGDIR_SELECT */
+  "select start_block, leaves_end_block, root from %_segdir "
+  " where level = ? order by idx",
+  /* SEGDIR_SPAN */
+  "select min(start_block), max(end_block) from %_segdir "
+  " where level = ? and start_block <> 0",
+  /* SEGDIR_DELETE */ "delete from %_segdir where level = ?",
+  /* SEGDIR_SELECT_ALL */
+  "select root, leaves_end_block from %_segdir order by level desc, idx",
+};
+
+/*
+** A connection to a fulltext index is an instance of the following
+** structure.  The xCreate and xConnect methods create an instance
+** of this structure and xDestroy and xDisconnect free that instance.
+** All other methods receive a pointer to the structure as one of their
+** arguments.
+*/
+struct fulltext_vtab {
+  sqlite3_vtab base;               /* Base class used by SQLite core */
+  sqlite3 *db;                     /* The database connection */
+  const char *zDb;                 /* logical database name */
+  const char *zName;               /* virtual table name */
+  int nColumn;                     /* number of columns in virtual table */
+  char **azColumn;                 /* column names.  malloced */
+  char **azContentColumn;          /* column names in content table; malloced */
+  sqlite3_tokenizer *pTokenizer;   /* tokenizer for inserts and queries */
+
+  /* Precompiled statements which we keep as long as the table is
+  ** open.
+  */
+  sqlite3_stmt *pFulltextStatements[MAX_STMT];
+
+  /* Precompiled statements used for segment merges.  We run a
+  ** separate select across the leaf level of each tree being merged.
+  */
+  sqlite3_stmt *pLeafSelectStmts[MERGE_COUNT];
+  /* The statement used to prepare pLeafSelectStmts. */
+#define LEAF_SELECT \
+  "select block from %_segments where blockid between ? and ? order by blockid"
+
+  /* These buffer pending index updates during transactions.
+  ** nPendingData estimates the memory size of the pending data.  It
+  ** doesn't include the hash-bucket overhead, nor any malloc
+  ** overhead.  When nPendingData exceeds kPendingThreshold, the
+  ** buffer is flushed even before the transaction closes.
+  ** pendingTerms stores the data, and is only valid when nPendingData
+  ** is >=0 (nPendingData<0 means pendingTerms has not been
+  ** initialized).  iPrevDocid is the last docid written, used to make
+  ** certain we're inserting in sorted order.
+  */
+  int nPendingData;
+#define kPendingThreshold (1*1024*1024)
+  sqlite_int64 iPrevDocid;
+  fts3Hash pendingTerms;
+};
+
+/*
+** When the core wants to do a query, it create a cursor using a
+** call to xOpen.  This structure is an instance of a cursor.  It
+** is destroyed by xClose.
+*/
+typedef struct fulltext_cursor {
+  sqlite3_vtab_cursor base;        /* Base class used by SQLite core */
+  QueryType iCursorType;           /* Copy of sqlite3_index_info.idxNum */
+  sqlite3_stmt *pStmt;             /* Prepared statement in use by the cursor */
+  int eof;                         /* True if at End Of Results */
+  Query q;                         /* Parsed query string */
+  Snippet snippet;                 /* Cached snippet for the current row */
+  int iColumn;                     /* Column being searched */
+  DataBuffer result;               /* Doclist results from fulltextQuery */
+  DLReader reader;                 /* Result reader if result not empty */
+} fulltext_cursor;
+
+static struct fulltext_vtab *cursor_vtab(fulltext_cursor *c){
+  return (fulltext_vtab *) c->base.pVtab;
+}
+
+static const sqlite3_module fts3Module;   /* forward declaration */
+
+/* Return a dynamically generated statement of the form
+ *   insert into %_content (docid, ...) values (?, ...)
+ */
+static const char *contentInsertStatement(fulltext_vtab *v){
+  StringBuffer sb;
+  int i;
+
+  initStringBuffer(&sb);
+  append(&sb, "insert into %_content (docid, ");
+  appendList(&sb, v->nColumn, v->azContentColumn);
+  append(&sb, ") values (?");
+  for(i=0; i<v->nColumn; ++i)
+    append(&sb, ", ?");
+  append(&sb, ")");
+  return stringBufferData(&sb);
+}
+
+/* Return a dynamically generated statement of the form
+ *   select <content columns> from %_content where docid = ?
+ */
+static const char *contentSelectStatement(fulltext_vtab *v){
+  StringBuffer sb;
+  initStringBuffer(&sb);
+  append(&sb, "SELECT ");
+  appendList(&sb, v->nColumn, v->azContentColumn);
+  append(&sb, " FROM %_content WHERE docid = ?");
+  return stringBufferData(&sb);
+}
+
+/* Return a dynamically generated statement of the form
+ *   update %_content set [col_0] = ?, [col_1] = ?, ...
+ *                    where docid = ?
+ */
+static const char *contentUpdateStatement(fulltext_vtab *v){
+  StringBuffer sb;
+  int i;
+
+  initStringBuffer(&sb);
+  append(&sb, "update %_content set ");
+  for(i=0; i<v->nColumn; ++i) {
+    if( i>0 ){
+      append(&sb, ", ");
+    }
+    append(&sb, v->azContentColumn[i]);
+    append(&sb, " = ?");
+  }
+  append(&sb, " where docid = ?");
+  return stringBufferData(&sb);
+}
+
+/* Puts a freshly-prepared statement determined by iStmt in *ppStmt.
+** If the indicated statement has never been prepared, it is prepared
+** and cached, otherwise the cached version is reset.
+*/
+static int sql_get_statement(fulltext_vtab *v, fulltext_statement iStmt,
+                             sqlite3_stmt **ppStmt){
+  assert( iStmt<MAX_STMT );
+  if( v->pFulltextStatements[iStmt]==NULL ){
+    const char *zStmt;
+    int rc;
+    switch( iStmt ){
+      case CONTENT_INSERT_STMT:
+        zStmt = contentInsertStatement(v); break;
+      case CONTENT_SELECT_STMT:
+        zStmt = contentSelectStatement(v); break;
+      case CONTENT_UPDATE_STMT:
+        zStmt = contentUpdateStatement(v); break;
+      default:
+        zStmt = fulltext_zStatement[iStmt];
+    }
+    rc = sql_prepare(v->db, v->zDb, v->zName, &v->pFulltextStatements[iStmt],
+                         zStmt);
+    if( zStmt != fulltext_zStatement[iStmt]) sqlite3_free((void *) zStmt);
+    if( rc!=SQLITE_OK ) return rc;
+  } else {
+    int rc = sqlite3_reset(v->pFulltextStatements[iStmt]);
+    if( rc!=SQLITE_OK ) return rc;
+  }
+
+  *ppStmt = v->pFulltextStatements[iStmt];
+  return SQLITE_OK;
+}
+
+/* Like sqlite3_step(), but convert SQLITE_DONE to SQLITE_OK and
+** SQLITE_ROW to SQLITE_ERROR.  Useful for statements like UPDATE,
+** where we expect no results.
+*/
+static int sql_single_step(sqlite3_stmt *s){
+  int rc = sqlite3_step(s);
+  return (rc==SQLITE_DONE) ? SQLITE_OK : rc;
+}
+
+/* Like sql_get_statement(), but for special replicated LEAF_SELECT
+** statements.
+*/
+/* TODO(shess) Write version for generic statements and then share
+** that between the cached-statement functions.
+*/
+static int sql_get_leaf_statement(fulltext_vtab *v, int idx,
+                                  sqlite3_stmt **ppStmt){
+  assert( idx>=0 && idx<MERGE_COUNT );
+  if( v->pLeafSelectStmts[idx]==NULL ){
+    int rc = sql_prepare(v->db, v->zDb, v->zName, &v->pLeafSelectStmts[idx],
+                         LEAF_SELECT);
+    if( rc!=SQLITE_OK ) return rc;
+  }else{
+    int rc = sqlite3_reset(v->pLeafSelectStmts[idx]);
+    if( rc!=SQLITE_OK ) return rc;
+  }
+
+  *ppStmt = v->pLeafSelectStmts[idx];
+  return SQLITE_OK;
+}
+
+/* insert into %_content (docid, ...) values ([docid], [pValues])
+** If the docid contains SQL NULL, then a unique docid will be
+** generated.
+*/
+static int content_insert(fulltext_vtab *v, sqlite3_value *docid,
+                          sqlite3_value **pValues){
+  sqlite3_stmt *s;
+  int i;
+  int rc = sql_get_statement(v, CONTENT_INSERT_STMT, &s);
+  if( rc!=SQLITE_OK ) return rc;
+
+  rc = sqlite3_bind_value(s, 1, docid);
+  if( rc!=SQLITE_OK ) return rc;
+
+  for(i=0; i<v->nColumn; ++i){
+    rc = sqlite3_bind_value(s, 2+i, pValues[i]);
+    if( rc!=SQLITE_OK ) return rc;
+  }
+
+  return sql_single_step(s);
+}
+
+/* update %_content set col0 = pValues[0], col1 = pValues[1], ...
+ *                  where docid = [iDocid] */
+static int content_update(fulltext_vtab *v, sqlite3_value **pValues,
+                          sqlite_int64 iDocid){
+  sqlite3_stmt *s;
+  int i;
+  int rc = sql_get_statement(v, CONTENT_UPDATE_STMT, &s);
+  if( rc!=SQLITE_OK ) return rc;
+
+  for(i=0; i<v->nColumn; ++i){
+    rc = sqlite3_bind_value(s, 1+i, pValues[i]);
+    if( rc!=SQLITE_OK ) return rc;
+  }
+
+  rc = sqlite3_bind_int64(s, 1+v->nColumn, iDocid);
+  if( rc!=SQLITE_OK ) return rc;
+
+  return sql_single_step(s);
+}
+
+static void freeStringArray(int nString, const char **pString){
+  int i;
+
+  for (i=0 ; i < nString ; ++i) {
+    if( pString[i]!=NULL ) sqlite3_free((void *) pString[i]);
+  }
+  sqlite3_free((void *) pString);
+}
+
+/* select * from %_content where docid = [iDocid]
+ * The caller must delete the returned array and all strings in it.
+ * null fields will be NULL in the returned array.
+ *
+ * TODO: Perhaps we should return pointer/length strings here for consistency
+ * with other code which uses pointer/length. */
+static int content_select(fulltext_vtab *v, sqlite_int64 iDocid,
+                          const char ***pValues){
+  sqlite3_stmt *s;
+  const char **values;
+  int i;
+  int rc;
+
+  *pValues = NULL;
+
+  rc = sql_get_statement(v, CONTENT_SELECT_STMT, &s);
+  if( rc!=SQLITE_OK ) return rc;
+
+  rc = sqlite3_bind_int64(s, 1, iDocid);
+  if( rc!=SQLITE_OK ) return rc;
+
+  rc = sqlite3_step(s);
+  if( rc!=SQLITE_ROW ) return rc;
+
+  values = (const char **) sqlite3_malloc(v->nColumn * sizeof(const char *));
+  for(i=0; i<v->nColumn; ++i){
+    if( sqlite3_column_type(s, i)==SQLITE_NULL ){
+      values[i] = NULL;
+    }else{
+      values[i] = string_dup((char*)sqlite3_column_text(s, i));
+    }
+  }
+
+  /* We expect only one row.  We must execute another sqlite3_step()
+   * to complete the iteration; otherwise the table will remain locked. */
+  rc = sqlite3_step(s);
+  if( rc==SQLITE_DONE ){
+    *pValues = values;
+    return SQLITE_OK;
+  }
+
+  freeStringArray(v->nColumn, values);
+  return rc;
+}
+
+/* delete from %_content where docid = [iDocid ] */
+static int content_delete(fulltext_vtab *v, sqlite_int64 iDocid){
+  sqlite3_stmt *s;
+  int rc = sql_get_statement(v, CONTENT_DELETE_STMT, &s);
+  if( rc!=SQLITE_OK ) return rc;
+
+  rc = sqlite3_bind_int64(s, 1, iDocid);
+  if( rc!=SQLITE_OK ) return rc;
+
+  return sql_single_step(s);
+}
+
+/* insert into %_segments values ([pData])
+**   returns assigned blockid in *piBlockid
+*/
+static int block_insert(fulltext_vtab *v, const char *pData, int nData,
+                        sqlite_int64 *piBlockid){
+  sqlite3_stmt *s;
+  int rc = sql_get_statement(v, BLOCK_INSERT_STMT, &s);
+  if( rc!=SQLITE_OK ) return rc;
+
+  rc = sqlite3_bind_blob(s, 1, pData, nData, SQLITE_STATIC);
+  if( rc!=SQLITE_OK ) return rc;
+
+  rc = sqlite3_step(s);
+  if( rc==SQLITE_ROW ) return SQLITE_ERROR;
+  if( rc!=SQLITE_DONE ) return rc;
+
+  /* blockid column is an alias for rowid. */
+  *piBlockid = sqlite3_last_insert_rowid(v->db);
+  return SQLITE_OK;
+}
+
+/* delete from %_segments
+**   where blockid between [iStartBlockid] and [iEndBlockid]
+**
+** Deletes the range of blocks, inclusive, used to delete the blocks
+** which form a segment.
+*/
+static int block_delete(fulltext_vtab *v,
+                        sqlite_int64 iStartBlockid, sqlite_int64 iEndBlockid){
+  sqlite3_stmt *s;
+  int rc = sql_get_statement(v, BLOCK_DELETE_STMT, &s);
+  if( rc!=SQLITE_OK ) return rc;
+
+  rc = sqlite3_bind_int64(s, 1, iStartBlockid);
+  if( rc!=SQLITE_OK ) return rc;
+
+  rc = sqlite3_bind_int64(s, 2, iEndBlockid);
+  if( rc!=SQLITE_OK ) return rc;
+
+  return sql_single_step(s);
+}
+
+/* Returns SQLITE_ROW with *pidx set to the maximum segment idx found
+** at iLevel.  Returns SQLITE_DONE if there are no segments at
+** iLevel.  Otherwise returns an error.
+*/
+static int segdir_max_index(fulltext_vtab *v, int iLevel, int *pidx){
+  sqlite3_stmt *s;
+  int rc = sql_get_statement(v, SEGDIR_MAX_INDEX_STMT, &s);
+  if( rc!=SQLITE_OK ) return rc;
+
+  rc = sqlite3_bind_int(s, 1, iLevel);
+  if( rc!=SQLITE_OK ) return rc;
+
+  rc = sqlite3_step(s);
+  /* Should always get at least one row due to how max() works. */
+  if( rc==SQLITE_DONE ) return SQLITE_DONE;
+  if( rc!=SQLITE_ROW ) return rc;
+
+  /* NULL means that there were no inputs to max(). */
+  if( SQLITE_NULL==sqlite3_column_type(s, 0) ){
+    rc = sqlite3_step(s);
+    if( rc==SQLITE_ROW ) return SQLITE_ERROR;
+    return rc;
+  }
+
+  *pidx = sqlite3_column_int(s, 0);
+
+  /* We expect only one row.  We must execute another sqlite3_step()
+   * to complete the iteration; otherwise the table will remain locked. */
+  rc = sqlite3_step(s);
+  if( rc==SQLITE_ROW ) return SQLITE_ERROR;
+  if( rc!=SQLITE_DONE ) return rc;
+  return SQLITE_ROW;
+}
+
+/* insert into %_segdir values (
+**   [iLevel], [idx],
+**   [iStartBlockid], [iLeavesEndBlockid], [iEndBlockid],
+**   [pRootData]
+** )
+*/
+static int segdir_set(fulltext_vtab *v, int iLevel, int idx,
+                      sqlite_int64 iStartBlockid,
+                      sqlite_int64 iLeavesEndBlockid,
+                      sqlite_int64 iEndBlockid,
+                      const char *pRootData, int nRootData){
+  sqlite3_stmt *s;
+  int rc = sql_get_statement(v, SEGDIR_SET_STMT, &s);
+  if( rc!=SQLITE_OK ) return rc;
+
+  rc = sqlite3_bind_int(s, 1, iLevel);
+  if( rc!=SQLITE_OK ) return rc;
+
+  rc = sqlite3_bind_int(s, 2, idx);
+  if( rc!=SQLITE_OK ) return rc;
+
+  rc = sqlite3_bind_int64(s, 3, iStartBlockid);
+  if( rc!=SQLITE_OK ) return rc;
+
+  rc = sqlite3_bind_int64(s, 4, iLeavesEndBlockid);
+  if( rc!=SQLITE_OK ) return rc;
+
+  rc = sqlite3_bind_int64(s, 5, iEndBlockid);
+  if( rc!=SQLITE_OK ) return rc;
+
+  rc = sqlite3_bind_blob(s, 6, pRootData, nRootData, SQLITE_STATIC);
+  if( rc!=SQLITE_OK ) return rc;
+
+  return sql_single_step(s);
+}
+
+/* Queries %_segdir for the block span of the segments in level
+** iLevel.  Returns SQLITE_DONE if there are no blocks for iLevel,
+** SQLITE_ROW if there are blocks, else an error.
+*/
+static int segdir_span(fulltext_vtab *v, int iLevel,
+                       sqlite_int64 *piStartBlockid,
+                       sqlite_int64 *piEndBlockid){
+  sqlite3_stmt *s;
+  int rc = sql_get_statement(v, SEGDIR_SPAN_STMT, &s);
+  if( rc!=SQLITE_OK ) return rc;
+
+  rc = sqlite3_bind_int(s, 1, iLevel);
+  if( rc!=SQLITE_OK ) return rc;
+
+  rc = sqlite3_step(s);
+  if( rc==SQLITE_DONE ) return SQLITE_DONE;  /* Should never happen */
+  if( rc!=SQLITE_ROW ) return rc;
+
+  /* This happens if all segments at this level are entirely inline. */
+  if( SQLITE_NULL==sqlite3_column_type(s, 0) ){
+    /* We expect only one row.  We must execute another sqlite3_step()
+     * to complete the iteration; otherwise the table will remain locked. */
+    int rc2 = sqlite3_step(s);
+    if( rc2==SQLITE_ROW ) return SQLITE_ERROR;
+    return rc2;
+  }
+
+  *piStartBlockid = sqlite3_column_int64(s, 0);
+  *piEndBlockid = sqlite3_column_int64(s, 1);
+
+  /* We expect only one row.  We must execute another sqlite3_step()
+   * to complete the iteration; otherwise the table will remain locked. */
+  rc = sqlite3_step(s);
+  if( rc==SQLITE_ROW ) return SQLITE_ERROR;
+  if( rc!=SQLITE_DONE ) return rc;
+  return SQLITE_ROW;
+}
+
+/* Delete the segment blocks and segment directory records for all
+** segments at iLevel.
+*/
+static int segdir_delete(fulltext_vtab *v, int iLevel){
+  sqlite3_stmt *s;
+  sqlite_int64 iStartBlockid, iEndBlockid;
+  int rc = segdir_span(v, iLevel, &iStartBlockid, &iEndBlockid);
+  if( rc!=SQLITE_ROW && rc!=SQLITE_DONE ) return rc;
+
+  if( rc==SQLITE_ROW ){
+    rc = block_delete(v, iStartBlockid, iEndBlockid);
+    if( rc!=SQLITE_OK ) return rc;
+  }
+
+  /* Delete the segment directory itself. */
+  rc = sql_get_statement(v, SEGDIR_DELETE_STMT, &s);
+  if( rc!=SQLITE_OK ) return rc;
+
+  rc = sqlite3_bind_int64(s, 1, iLevel);
+  if( rc!=SQLITE_OK ) return rc;
+
+  return sql_single_step(s);
+}
+
+/* TODO(shess) clearPendingTerms() is far down the file because
+** writeZeroSegment() is far down the file because LeafWriter is far
+** down the file.  Consider refactoring the code to move the non-vtab
+** code above the vtab code so that we don't need this forward
+** reference.
+*/
+static int clearPendingTerms(fulltext_vtab *v);
+
+/*
+** Free the memory used to contain a fulltext_vtab structure.
+*/
+static void fulltext_vtab_destroy(fulltext_vtab *v){
+  int iStmt, i;
+
+  FTSTRACE(("FTS3 Destroy %p\n", v));
+  for( iStmt=0; iStmt<MAX_STMT; iStmt++ ){
+    if( v->pFulltextStatements[iStmt]!=NULL ){
+      sqlite3_finalize(v->pFulltextStatements[iStmt]);
+      v->pFulltextStatements[iStmt] = NULL;
+    }
+  }
+
+  for( i=0; i<MERGE_COUNT; i++ ){
+    if( v->pLeafSelectStmts[i]!=NULL ){
+      sqlite3_finalize(v->pLeafSelectStmts[i]);
+      v->pLeafSelectStmts[i] = NULL;
+    }
+  }
+
+  if( v->pTokenizer!=NULL ){
+    v->pTokenizer->pModule->xDestroy(v->pTokenizer);
+    v->pTokenizer = NULL;
+  }
+
+  clearPendingTerms(v);
+
+  sqlite3_free(v->azColumn);
+  for(i = 0; i < v->nColumn; ++i) {
+    sqlite3_free(v->azContentColumn[i]);
+  }
+  sqlite3_free(v->azContentColumn);
+  sqlite3_free(v);
+}
+
+/*
+** Token types for parsing the arguments to xConnect or xCreate.
+*/
+#define TOKEN_EOF         0    /* End of file */
+#define TOKEN_SPACE       1    /* Any kind of whitespace */
+#define TOKEN_ID          2    /* An identifier */
+#define TOKEN_STRING      3    /* A string literal */
+#define TOKEN_PUNCT       4    /* A single punctuation character */
+
+/*
+** If X is a character that can be used in an identifier then
+** ftsIdChar(X) will be true.  Otherwise it is false.
+**
+** For ASCII, any character with the high-order bit set is
+** allowed in an identifier.  For 7-bit characters,
+** isFtsIdChar[X] must be 1.
+**
+** Ticket #1066.  the SQL standard does not allow '$' in the
+** middle of identfiers.  But many SQL implementations do.
+** SQLite will allow '$' in identifiers for compatibility.
+** But the feature is undocumented.
+*/
+static const char isFtsIdChar[] = {
+/* x0 x1 x2 x3 x4 x5 x6 x7 x8 x9 xA xB xC xD xE xF */
+    0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  /* 2x */
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0,  /* 3x */
+    0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,  /* 4x */
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1,  /* 5x */
+    0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,  /* 6x */
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0,  /* 7x */
+};
+#define ftsIdChar(C)  (((c=C)&0x80)!=0 || (c>0x1f && isFtsIdChar[c-0x20]))
+
+
+/*
+** Return the length of the token that begins at z[0].
+** Store the token type in *tokenType before returning.
+*/
+static int ftsGetToken(const char *z, int *tokenType){
+  int i, c;
+  switch( *z ){
+    case 0: {
+      *tokenType = TOKEN_EOF;
+      return 0;
+    }
+    case ' ': case '\t': case '\n': case '\f': case '\r': {
+      for(i=1; safe_isspace(z[i]); i++){}
+      *tokenType = TOKEN_SPACE;
+      return i;
+    }
+    case '`':
+    case '\'':
+    case '"': {
+      int delim = z[0];
+      for(i=1; (c=z[i])!=0; i++){
+        if( c==delim ){
+          if( z[i+1]==delim ){
+            i++;
+          }else{
+            break;
+          }
+        }
+      }
+      *tokenType = TOKEN_STRING;
+      return i + (c!=0);
+    }
+    case '[': {
+      for(i=1, c=z[0]; c!=']' && (c=z[i])!=0; i++){}
+      *tokenType = TOKEN_ID;
+      return i;
+    }
+    default: {
+      if( !ftsIdChar(*z) ){
+        break;
+      }
+      for(i=1; ftsIdChar(z[i]); i++){}
+      *tokenType = TOKEN_ID;
+      return i;
+    }
+  }
+  *tokenType = TOKEN_PUNCT;
+  return 1;
+}
+
+/*
+** A token extracted from a string is an instance of the following
+** structure.
+*/
+typedef struct FtsToken {
+  const char *z;       /* Pointer to token text.  Not '\000' terminated */
+  short int n;         /* Length of the token text in bytes. */
+} FtsToken;
+
+/*
+** Given a input string (which is really one of the argv[] parameters
+** passed into xConnect or xCreate) split the string up into tokens.
+** Return an array of pointers to '\000' terminated strings, one string
+** for each non-whitespace token.
+**
+** The returned array is terminated by a single NULL pointer.
+**
+** Space to hold the returned array is obtained from a single
+** malloc and should be freed by passing the return value to free().
+** The individual strings within the token list are all a part of
+** the single memory allocation and will all be freed at once.
+*/
+static char **tokenizeString(const char *z, int *pnToken){
+  int nToken = 0;
+  FtsToken *aToken = sqlite3_malloc( strlen(z) * sizeof(aToken[0]) );
+  int n = 1;
+  int e, i;
+  int totalSize = 0;
+  char **azToken;
+  char *zCopy;
+  while( n>0 ){
+    n = ftsGetToken(z, &e);
+    if( e!=TOKEN_SPACE ){
+      aToken[nToken].z = z;
+      aToken[nToken].n = n;
+      nToken++;
+      totalSize += n+1;
+    }
+    z += n;
+  }
+  azToken = (char**)sqlite3_malloc( nToken*sizeof(char*) + totalSize );
+  zCopy = (char*)&azToken[nToken];
+  nToken--;
+  for(i=0; i<nToken; i++){
+    azToken[i] = zCopy;
+    n = aToken[i].n;
+    memcpy(zCopy, aToken[i].z, n);
+    zCopy[n] = 0;
+    zCopy += n+1;
+  }
+  azToken[nToken] = 0;
+  sqlite3_free(aToken);
+  *pnToken = nToken;
+  return azToken;
+}
+
+/*
+** Convert an SQL-style quoted string into a normal string by removing
+** the quote characters.  The conversion is done in-place.  If the
+** input does not begin with a quote character, then this routine
+** is a no-op.
+**
+** Examples:
+**
+**     "abc"   becomes   abc
+**     'xyz'   becomes   xyz
+**     [pqr]   becomes   pqr
+**     `mno`   becomes   mno
+*/
+static void dequoteString(char *z){
+  int quote;
+  int i, j;
+  if( z==0 ) return;
+  quote = z[0];
+  switch( quote ){
+    case '\'':  break;
+    case '"':   break;
+    case '`':   break;                /* For MySQL compatibility */
+    case '[':   quote = ']';  break;  /* For MS SqlServer compatibility */
+    default:    return;
+  }
+  for(i=1, j=0; z[i]; i++){
+    if( z[i]==quote ){
+      if( z[i+1]==quote ){
+        z[j++] = quote;
+        i++;
+      }else{
+        z[j++] = 0;
+        break;
+      }
+    }else{
+      z[j++] = z[i];
+    }
+  }
+}
+
+/*
+** The input azIn is a NULL-terminated list of tokens.  Remove the first
+** token and all punctuation tokens.  Remove the quotes from
+** around string literal tokens.
+**
+** Example:
+**
+**     input:      tokenize chinese ( 'simplifed' , 'mixed' )
+**     output:     chinese simplifed mixed
+**
+** Another example:
+**
+**     input:      delimiters ( '[' , ']' , '...' )
+**     output:     [ ] ...
+*/
+static void tokenListToIdList(char **azIn){
+  int i, j;
+  if( azIn ){
+    for(i=0, j=-1; azIn[i]; i++){
+      if( safe_isalnum(azIn[i][0]) || azIn[i][1] ){
+        dequoteString(azIn[i]);
+        if( j>=0 ){
+          azIn[j] = azIn[i];
+        }
+        j++;
+      }
+    }
+    azIn[j] = 0;
+  }
+}
+
+
+/*
+** Find the first alphanumeric token in the string zIn.  Null-terminate
+** this token.  Remove any quotation marks.  And return a pointer to
+** the result.
+*/
+static char *firstToken(char *zIn, char **pzTail){
+  int n, ttype;
+  while(1){
+    n = ftsGetToken(zIn, &ttype);
+    if( ttype==TOKEN_SPACE ){
+      zIn += n;
+    }else if( ttype==TOKEN_EOF ){
+      *pzTail = zIn;
+      return 0;
+    }else{
+      zIn[n] = 0;
+      *pzTail = &zIn[1];
+      dequoteString(zIn);
+      return zIn;
+    }
+  }
+  /*NOTREACHED*/
+}
+
+/* Return true if...
+**
+**   *  s begins with the string t, ignoring case
+**   *  s is longer than t
+**   *  The first character of s beyond t is not a alphanumeric
+**
+** Ignore leading space in *s.
+**
+** To put it another way, return true if the first token of
+** s[] is t[].
+*/
+static int startsWith(const char *s, const char *t){
+  while( safe_isspace(*s) ){ s++; }
+  while( *t ){
+    if( safe_tolower(*s++)!=safe_tolower(*t++) ) return 0;
+  }
+  return *s!='_' && !safe_isalnum(*s);
+}
+
+/*
+** An instance of this structure defines the "spec" of a
+** full text index.  This structure is populated by parseSpec
+** and use by fulltextConnect and fulltextCreate.
+*/
+typedef struct TableSpec {
+  const char *zDb;         /* Logical database name */
+  const char *zName;       /* Name of the full-text index */
+  int nColumn;             /* Number of columns to be indexed */
+  char **azColumn;         /* Original names of columns to be indexed */
+  char **azContentColumn;  /* Column names for %_content */
+  char **azTokenizer;      /* Name of tokenizer and its arguments */
+} TableSpec;
+
+/*
+** Reclaim all of the memory used by a TableSpec
+*/
+static void clearTableSpec(TableSpec *p) {
+  sqlite3_free(p->azColumn);
+  sqlite3_free(p->azContentColumn);
+  sqlite3_free(p->azTokenizer);
+}
+
+/* Parse a CREATE VIRTUAL TABLE statement, which looks like this:
+ *
+ * CREATE VIRTUAL TABLE email
+ *        USING fts3(subject, body, tokenize mytokenizer(myarg))
+ *
+ * We return parsed information in a TableSpec structure.
+ *
+ */
+static int parseSpec(TableSpec *pSpec, int argc, const char *const*argv,
+                     char**pzErr){
+  int i, n;
+  char *z, *zDummy;
+  char **azArg;
+  const char *zTokenizer = 0;    /* argv[] entry describing the tokenizer */
+
+  assert( argc>=3 );
+  /* Current interface:
+  ** argv[0] - module name
+  ** argv[1] - database name
+  ** argv[2] - table name
+  ** argv[3..] - columns, optionally followed by tokenizer specification
+  **             and snippet delimiters specification.
+  */
+
+  /* Make a copy of the complete argv[][] array in a single allocation.
+  ** The argv[][] array is read-only and transient.  We can write to the
+  ** copy in order to modify things and the copy is persistent.
+  */
+  CLEAR(pSpec);
+  for(i=n=0; i<argc; i++){
+    n += strlen(argv[i]) + 1;
+  }
+  azArg = sqlite3_malloc( sizeof(char*)*argc + n );
+  if( azArg==0 ){
+    return SQLITE_NOMEM;
+  }
+  z = (char*)&azArg[argc];
+  for(i=0; i<argc; i++){
+    azArg[i] = z;
+    strcpy(z, argv[i]);
+    z += strlen(z)+1;
+  }
+
+  /* Identify the column names and the tokenizer and delimiter arguments
+  ** in the argv[][] array.
+  */
+  pSpec->zDb = azArg[1];
+  pSpec->zName = azArg[2];
+  pSpec->nColumn = 0;
+  pSpec->azColumn = azArg;
+  zTokenizer = "tokenize simple";
+  for(i=3; i<argc; ++i){
+    if( startsWith(azArg[i],"tokenize") ){
+      zTokenizer = azArg[i];
+    }else{
+      z = azArg[pSpec->nColumn] = firstToken(azArg[i], &zDummy);
+      pSpec->nColumn++;
+    }
+  }
+  if( pSpec->nColumn==0 ){
+    azArg[0] = "content";
+    pSpec->nColumn = 1;
+  }
+
+  /*
+  ** Construct the list of content column names.
+  **
+  ** Each content column name will be of the form cNNAAAA
+  ** where NN is the column number and AAAA is the sanitized
+  ** column name.  "sanitized" means that special characters are
+  ** converted to "_".  The cNN prefix guarantees that all column
+  ** names are unique.
+  **
+  ** The AAAA suffix is not strictly necessary.  It is included
+  ** for the convenience of people who might examine the generated
+  ** %_content table and wonder what the columns are used for.
+  */
+  pSpec->azContentColumn = sqlite3_malloc( pSpec->nColumn * sizeof(char *) );
+  if( pSpec->azContentColumn==0 ){
+    clearTableSpec(pSpec);
+    return SQLITE_NOMEM;
+  }
+  for(i=0; i<pSpec->nColumn; i++){
+    char *p;
+    pSpec->azContentColumn[i] = sqlite3_mprintf("c%d%s", i, azArg[i]);
+    for (p = pSpec->azContentColumn[i]; *p ; ++p) {
+      if( !safe_isalnum(*p) ) *p = '_';
+    }
+  }
+
+  /*
+  ** Parse the tokenizer specification string.
+  */
+  pSpec->azTokenizer = tokenizeString(zTokenizer, &n);
+  tokenListToIdList(pSpec->azTokenizer);
+
+  return SQLITE_OK;
+}
+
+/*
+** Generate a CREATE TABLE statement that describes the schema of
+** the virtual table.  Return a pointer to this schema string.
+**
+** Space is obtained from sqlite3_mprintf() and should be freed
+** using sqlite3_free().
+*/
+static char *fulltextSchema(
+  int nColumn,                  /* Number of columns */
+  const char *const* azColumn,  /* List of columns */
+  const char *zTableName        /* Name of the table */
+){
+  int i;
+  char *zSchema, *zNext;
+  const char *zSep = "(";
+  zSchema = sqlite3_mprintf("CREATE TABLE x");
+  for(i=0; i<nColumn; i++){
+    zNext = sqlite3_mprintf("%s%s%Q", zSchema, zSep, azColumn[i]);
+    sqlite3_free(zSchema);
+    zSchema = zNext;
+    zSep = ",";
+  }
+  zNext = sqlite3_mprintf("%s,%Q HIDDEN", zSchema, zTableName);
+  sqlite3_free(zSchema);
+  zSchema = zNext;
+  zNext = sqlite3_mprintf("%s,docid HIDDEN)", zSchema);
+  sqlite3_free(zSchema);
+  return zNext;
+}
+
+/*
+** Build a new sqlite3_vtab structure that will describe the
+** fulltext index defined by spec.
+*/
+static int constructVtab(
+  sqlite3 *db,              /* The SQLite database connection */
+  fts3Hash *pHash,          /* Hash table containing tokenizers */
+  TableSpec *spec,          /* Parsed spec information from parseSpec() */
+  sqlite3_vtab **ppVTab,    /* Write the resulting vtab structure here */
+  char **pzErr              /* Write any error message here */
+){
+  int rc;
+  int n;
+  fulltext_vtab *v = 0;
+  const sqlite3_tokenizer_module *m = NULL;
+  char *schema;
+
+  char const *zTok;         /* Name of tokenizer to use for this fts table */
+  int nTok;                 /* Length of zTok, including nul terminator */
+
+  v = (fulltext_vtab *) sqlite3_malloc(sizeof(fulltext_vtab));
+  if( v==0 ) return SQLITE_NOMEM;
+  CLEAR(v);
+  /* sqlite will initialize v->base */
+  v->db = db;
+  v->zDb = spec->zDb;       /* Freed when azColumn is freed */
+  v->zName = spec->zName;   /* Freed when azColumn is freed */
+  v->nColumn = spec->nColumn;
+  v->azContentColumn = spec->azContentColumn;
+  spec->azContentColumn = 0;
+  v->azColumn = spec->azColumn;
+  spec->azColumn = 0;
+
+  if( spec->azTokenizer==0 ){
+    return SQLITE_NOMEM;
+  }
+
+  zTok = spec->azTokenizer[0];
+  if( !zTok ){
+    zTok = "simple";
+  }
+  nTok = strlen(zTok)+1;
+
+  m = (sqlite3_tokenizer_module *)sqlite3Fts3HashFind(pHash, zTok, nTok);
+  if( !m ){
+    *pzErr = sqlite3_mprintf("unknown tokenizer: %s", spec->azTokenizer[0]);
+    rc = SQLITE_ERROR;
+    goto err;
+  }
+
+  for(n=0; spec->azTokenizer[n]; n++){}
+  if( n ){
+    rc = m->xCreate(n-1, (const char*const*)&spec->azTokenizer[1],
+                    &v->pTokenizer);
+  }else{
+    rc = m->xCreate(0, 0, &v->pTokenizer);
+  }
+  if( rc!=SQLITE_OK ) goto err;
+  v->pTokenizer->pModule = m;
+
+  /* TODO: verify the existence of backing tables foo_content, foo_term */
+
+  schema = fulltextSchema(v->nColumn, (const char*const*)v->azColumn,
+                          spec->zName);
+  rc = sqlite3_declare_vtab(db, schema);
+  sqlite3_free(schema);
+  if( rc!=SQLITE_OK ) goto err;
+
+  memset(v->pFulltextStatements, 0, sizeof(v->pFulltextStatements));
+
+  /* Indicate that the buffer is not live. */
+  v->nPendingData = -1;
+
+  *ppVTab = &v->base;
+  FTSTRACE(("FTS3 Connect %p\n", v));
+
+  return rc;
+
+err:
+  fulltext_vtab_destroy(v);
+  return rc;
+}
+
+static int fulltextConnect(
+  sqlite3 *db,
+  void *pAux,
+  int argc, const char *const*argv,
+  sqlite3_vtab **ppVTab,
+  char **pzErr
+){
+  TableSpec spec;
+  int rc = parseSpec(&spec, argc, argv, pzErr);
+  if( rc!=SQLITE_OK ) return rc;
+
+  rc = constructVtab(db, (fts3Hash *)pAux, &spec, ppVTab, pzErr);
+  clearTableSpec(&spec);
+  return rc;
+}
+
+/* The %_content table holds the text of each document, with
+** the docid column exposed as the SQLite rowid for the table.
+*/
+/* TODO(shess) This comment needs elaboration to match the updated
+** code.  Work it into the top-of-file comment at that time.
+*/
+static int fulltextCreate(sqlite3 *db, void *pAux,
+                          int argc, const char * const *argv,
+                          sqlite3_vtab **ppVTab, char **pzErr){
+  int rc;
+  TableSpec spec;
+  StringBuffer schema;
+  FTSTRACE(("FTS3 Create\n"));
+
+  rc = parseSpec(&spec, argc, argv, pzErr);
+  if( rc!=SQLITE_OK ) return rc;
+
+  initStringBuffer(&schema);
+  append(&schema, "CREATE TABLE %_content(");
+  append(&schema, "  docid INTEGER PRIMARY KEY,");
+  appendList(&schema, spec.nColumn, spec.azContentColumn);
+  append(&schema, ")");
+  rc = sql_exec(db, spec.zDb, spec.zName, stringBufferData(&schema));
+  stringBufferDestroy(&schema);
+  if( rc!=SQLITE_OK ) goto out;
+
+  rc = sql_exec(db, spec.zDb, spec.zName,
+                "create table %_segments("
+                "  blockid INTEGER PRIMARY KEY,"
+                "  block blob"
+                ");"
+                );
+  if( rc!=SQLITE_OK ) goto out;
+
+  rc = sql_exec(db, spec.zDb, spec.zName,
+                "create table %_segdir("
+                "  level integer,"
+                "  idx integer,"
+                "  start_block integer,"
+                "  leaves_end_block integer,"
+                "  end_block integer,"
+                "  root blob,"
+                "  primary key(level, idx)"
+                ");");
+  if( rc!=SQLITE_OK ) goto out;
+
+  rc = constructVtab(db, (fts3Hash *)pAux, &spec, ppVTab, pzErr);
+
+out:
+  clearTableSpec(&spec);
+  return rc;
+}
+
+/* Decide how to handle an SQL query. */
+static int fulltextBestIndex(sqlite3_vtab *pVTab, sqlite3_index_info *pInfo){
+  fulltext_vtab *v = (fulltext_vtab *)pVTab;
+  int i;
+  FTSTRACE(("FTS3 BestIndex\n"));
+
+  for(i=0; i<pInfo->nConstraint; ++i){
+    const struct sqlite3_index_constraint *pConstraint;
+    pConstraint = &pInfo->aConstraint[i];
+    if( pConstraint->usable ) {
+      if( (pConstraint->iColumn==-1 || pConstraint->iColumn==v->nColumn+1) &&
+          pConstraint->op==SQLITE_INDEX_CONSTRAINT_EQ ){
+        pInfo->idxNum = QUERY_DOCID;      /* lookup by docid */
+        FTSTRACE(("FTS3 QUERY_DOCID\n"));
+      } else if( pConstraint->iColumn>=0 && pConstraint->iColumn<=v->nColumn &&
+                 pConstraint->op==SQLITE_INDEX_CONSTRAINT_MATCH ){
+        /* full-text search */
+        pInfo->idxNum = QUERY_FULLTEXT + pConstraint->iColumn;
+        FTSTRACE(("FTS3 QUERY_FULLTEXT %d\n", pConstraint->iColumn));
+      } else continue;
+
+      pInfo->aConstraintUsage[i].argvIndex = 1;
+      pInfo->aConstraintUsage[i].omit = 1;
+
+      /* An arbitrary value for now.
+       * TODO: Perhaps docid matches should be considered cheaper than
+       * full-text searches. */
+      pInfo->estimatedCost = 1.0;
+
+      return SQLITE_OK;
+    }
+  }
+  pInfo->idxNum = QUERY_GENERIC;
+  return SQLITE_OK;
+}
+
+static int fulltextDisconnect(sqlite3_vtab *pVTab){
+  FTSTRACE(("FTS3 Disconnect %p\n", pVTab));
+  fulltext_vtab_destroy((fulltext_vtab *)pVTab);
+  return SQLITE_OK;
+}
+
+static int fulltextDestroy(sqlite3_vtab *pVTab){
+  fulltext_vtab *v = (fulltext_vtab *)pVTab;
+  int rc;
+
+  FTSTRACE(("FTS3 Destroy %p\n", pVTab));
+  rc = sql_exec(v->db, v->zDb, v->zName,
+                "drop table if exists %_content;"
+                "drop table if exists %_segments;"
+                "drop table if exists %_segdir;"
+                );
+  if( rc!=SQLITE_OK ) return rc;
+
+  fulltext_vtab_destroy((fulltext_vtab *)pVTab);
+  return SQLITE_OK;
+}
+
+static int fulltextOpen(sqlite3_vtab *pVTab, sqlite3_vtab_cursor **ppCursor){
+  fulltext_cursor *c;
+
+  c = (fulltext_cursor *) sqlite3_malloc(sizeof(fulltext_cursor));
+  if( c ){
+    memset(c, 0, sizeof(fulltext_cursor));
+    /* sqlite will initialize c->base */
+    *ppCursor = &c->base;
+    FTSTRACE(("FTS3 Open %p: %p\n", pVTab, c));
+    return SQLITE_OK;
+  }else{
+    return SQLITE_NOMEM;
+  }
+}
+
+
+/* Free all of the dynamically allocated memory held by *q
+*/
+static void queryClear(Query *q){
+  int i;
+  for(i = 0; i < q->nTerms; ++i){
+    sqlite3_free(q->pTerms[i].pTerm);
+  }
+  sqlite3_free(q->pTerms);
+  CLEAR(q);
+}
+
+/* Free all of the dynamically allocated memory held by the
+** Snippet
+*/
+static void snippetClear(Snippet *p){
+  sqlite3_free(p->aMatch);
+  sqlite3_free(p->zOffset);
+  sqlite3_free(p->zSnippet);
+  CLEAR(p);
+}
+/*
+** Append a single entry to the p->aMatch[] log.
+*/
+static void snippetAppendMatch(
+  Snippet *p,               /* Append the entry to this snippet */
+  int iCol, int iTerm,      /* The column and query term */
+  int iToken,               /* Matching token in document */
+  int iStart, int nByte     /* Offset and size of the match */
+){
+  int i;
+  struct snippetMatch *pMatch;
+  if( p->nMatch+1>=p->nAlloc ){
+    p->nAlloc = p->nAlloc*2 + 10;
+    p->aMatch = sqlite3_realloc(p->aMatch, p->nAlloc*sizeof(p->aMatch[0]) );
+    if( p->aMatch==0 ){
+      p->nMatch = 0;
+      p->nAlloc = 0;
+      return;
+    }
+  }
+  i = p->nMatch++;
+  pMatch = &p->aMatch[i];
+  pMatch->iCol = iCol;
+  pMatch->iTerm = iTerm;
+  pMatch->iToken = iToken;
+  pMatch->iStart = iStart;
+  pMatch->nByte = nByte;
+}
+
+/*
+** Sizing information for the circular buffer used in snippetOffsetsOfColumn()
+*/
+#define FTS3_ROTOR_SZ   (32)
+#define FTS3_ROTOR_MASK (FTS3_ROTOR_SZ-1)
+
+/*
+** Add entries to pSnippet->aMatch[] for every match that occurs against
+** document zDoc[0..nDoc-1] which is stored in column iColumn.
+*/
+static void snippetOffsetsOfColumn(
+  Query *pQuery,
+  Snippet *pSnippet,
+  int iColumn,
+  const char *zDoc,
+  int nDoc
+){
+  const sqlite3_tokenizer_module *pTModule;  /* The tokenizer module */
+  sqlite3_tokenizer *pTokenizer;             /* The specific tokenizer */
+  sqlite3_tokenizer_cursor *pTCursor;        /* Tokenizer cursor */
+  fulltext_vtab *pVtab;                /* The full text index */
+  int nColumn;                         /* Number of columns in the index */
+  const QueryTerm *aTerm;              /* Query string terms */
+  int nTerm;                           /* Number of query string terms */
+  int i, j;                            /* Loop counters */
+  int rc;                              /* Return code */
+  unsigned int match, prevMatch;       /* Phrase search bitmasks */
+  const char *zToken;                  /* Next token from the tokenizer */
+  int nToken;                          /* Size of zToken */
+  int iBegin, iEnd, iPos;              /* Offsets of beginning and end */
+
+  /* The following variables keep a circular buffer of the last
+  ** few tokens */
+  unsigned int iRotor = 0;             /* Index of current token */
+  int iRotorBegin[FTS3_ROTOR_SZ];      /* Beginning offset of token */
+  int iRotorLen[FTS3_ROTOR_SZ];        /* Length of token */
+
+  pVtab = pQuery->pFts;
+  nColumn = pVtab->nColumn;
+  pTokenizer = pVtab->pTokenizer;
+  pTModule = pTokenizer->pModule;
+  rc = pTModule->xOpen(pTokenizer, zDoc, nDoc, &pTCursor);
+  if( rc ) return;
+  pTCursor->pTokenizer = pTokenizer;
+  aTerm = pQuery->pTerms;
+  nTerm = pQuery->nTerms;
+  if( nTerm>=FTS3_ROTOR_SZ ){
+    nTerm = FTS3_ROTOR_SZ - 1;
+  }
+  prevMatch = 0;
+  while(1){
+    rc = pTModule->xNext(pTCursor, &zToken, &nToken, &iBegin, &iEnd, &iPos);
+    if( rc ) break;
+    iRotorBegin[iRotor&FTS3_ROTOR_MASK] = iBegin;
+    iRotorLen[iRotor&FTS3_ROTOR_MASK] = iEnd-iBegin;
+    match = 0;
+    for(i=0; i<nTerm; i++){
+      int iCol;
+      iCol = aTerm[i].iColumn;
+      if( iCol>=0 && iCol<nColumn && iCol!=iColumn ) continue;
+      if( aTerm[i].nTerm>nToken ) continue;
+      if( !aTerm[i].isPrefix && aTerm[i].nTerm<nToken ) continue;
+      assert( aTerm[i].nTerm<=nToken );
+      if( memcmp(aTerm[i].pTerm, zToken, aTerm[i].nTerm) ) continue;
+      if( aTerm[i].iPhrase>1 && (prevMatch & (1<<i))==0 ) continue;
+      match |= 1<<i;
+      if( i==nTerm-1 || aTerm[i+1].iPhrase==1 ){
+        for(j=aTerm[i].iPhrase-1; j>=0; j--){
+          int k = (iRotor-j) & FTS3_ROTOR_MASK;
+          snippetAppendMatch(pSnippet, iColumn, i-j, iPos-j,
+                iRotorBegin[k], iRotorLen[k]);
+        }
+      }
+    }
+    prevMatch = match<<1;
+    iRotor++;
+  }
+  pTModule->xClose(pTCursor);
+}
+
+/*
+** Remove entries from the pSnippet structure to account for the NEAR
+** operator. When this is called, pSnippet contains the list of token
+** offsets produced by treating all NEAR operators as AND operators.
+** This function removes any entries that should not be present after
+** accounting for the NEAR restriction. For example, if the queried
+** document is:
+**
+**     "A B C D E A"
+**
+** and the query is:
+**
+**     A NEAR/0 E
+**
+** then when this function is called the Snippet contains token offsets
+** 0, 4 and 5. This function removes the "0" entry (because the first A
+** is not near enough to an E).
+*/
+static void trimSnippetOffsetsForNear(Query *pQuery, Snippet *pSnippet){
+  int ii;
+  int iDir = 1;
+
+  while(iDir>-2) {
+    assert( iDir==1 || iDir==-1 );
+    for(ii=0; ii<pSnippet->nMatch; ii++){
+      int jj;
+      int nNear;
+      struct snippetMatch *pMatch = &pSnippet->aMatch[ii];
+      QueryTerm *pQueryTerm = &pQuery->pTerms[pMatch->iTerm];
+
+      if( (pMatch->iTerm+iDir)<0
+       || (pMatch->iTerm+iDir)>=pQuery->nTerms
+      ){
+        continue;
+      }
+
+      nNear = pQueryTerm->nNear;
+      if( iDir<0 ){
+        nNear = pQueryTerm[-1].nNear;
+      }
+
+      if( pMatch->iTerm>=0 && nNear ){
+        int isOk = 0;
+        int iNextTerm = pMatch->iTerm+iDir;
+        int iPrevTerm = iNextTerm;
+
+        int iEndToken;
+        int iStartToken;
+
+        if( iDir<0 ){
+          int nPhrase = 1;
+          iStartToken = pMatch->iToken;
+          while( (pMatch->iTerm+nPhrase)<pQuery->nTerms
+              && pQuery->pTerms[pMatch->iTerm+nPhrase].iPhrase>1
+          ){
+            nPhrase++;
+          }
+          iEndToken = iStartToken + nPhrase - 1;
+        }else{
+          iEndToken   = pMatch->iToken;
+          iStartToken = pMatch->iToken+1-pQueryTerm->iPhrase;
+        }
+
+        while( pQuery->pTerms[iNextTerm].iPhrase>1 ){
+          iNextTerm--;
+        }
+        while( (iPrevTerm+1)<pQuery->nTerms &&
+               pQuery->pTerms[iPrevTerm+1].iPhrase>1
+        ){
+          iPrevTerm++;
+        }
+
+        for(jj=0; isOk==0 && jj<pSnippet->nMatch; jj++){
+          struct snippetMatch *p = &pSnippet->aMatch[jj];
+          if( p->iCol==pMatch->iCol && ((
+               p->iTerm==iNextTerm &&
+               p->iToken>iEndToken &&
+               p->iToken<=iEndToken+nNear
+          ) || (
+               p->iTerm==iPrevTerm &&
+               p->iToken<iStartToken &&
+               p->iToken>=iStartToken-nNear
+          ))){
+            isOk = 1;
+          }
+        }
+        if( !isOk ){
+          for(jj=1-pQueryTerm->iPhrase; jj<=0; jj++){
+            pMatch[jj].iTerm = -1;
+          }
+          ii = -1;
+          iDir = 1;
+        }
+      }
+    }
+    iDir -= 2;
+  }
+}
+
+/*
+** Compute all offsets for the current row of the query.
+** If the offsets have already been computed, this routine is a no-op.
+*/
+static void snippetAllOffsets(fulltext_cursor *p){
+  int nColumn;
+  int iColumn, i;
+  int iFirst, iLast;
+  fulltext_vtab *pFts;
+
+  if( p->snippet.nMatch ) return;
+  if( p->q.nTerms==0 ) return;
+  pFts = p->q.pFts;
+  nColumn = pFts->nColumn;
+  iColumn = (p->iCursorType - QUERY_FULLTEXT);
+  if( iColumn<0 || iColumn>=nColumn ){
+    iFirst = 0;
+    iLast = nColumn-1;
+  }else{
+    iFirst = iColumn;
+    iLast = iColumn;
+  }
+  for(i=iFirst; i<=iLast; i++){
+    const char *zDoc;
+    int nDoc;
+    zDoc = (const char*)sqlite3_column_text(p->pStmt, i+1);
+    nDoc = sqlite3_column_bytes(p->pStmt, i+1);
+    snippetOffsetsOfColumn(&p->q, &p->snippet, i, zDoc, nDoc);
+  }
+
+  trimSnippetOffsetsForNear(&p->q, &p->snippet);
+}
+
+/*
+** Convert the information in the aMatch[] array of the snippet
+** into the string zOffset[0..nOffset-1].
+*/
+static void snippetOffsetText(Snippet *p){
+  int i;
+  int cnt = 0;
+  StringBuffer sb;
+  char zBuf[200];
+  if( p->zOffset ) return;
+  initStringBuffer(&sb);
+  for(i=0; i<p->nMatch; i++){
+    struct snippetMatch *pMatch = &p->aMatch[i];
+    if( pMatch->iTerm>=0 ){
+      /* If snippetMatch.iTerm is less than 0, then the match was
+      ** discarded as part of processing the NEAR operator (see the
+      ** trimSnippetOffsetsForNear() function for details). Ignore
+      ** it in this case
+      */
+      zBuf[0] = ' ';
+      sprintf(&zBuf[cnt>0], "%d %d %d %d", pMatch->iCol,
+          pMatch->iTerm, pMatch->iStart, pMatch->nByte);
+      append(&sb, zBuf);
+      cnt++;
+    }
+  }
+  p->zOffset = stringBufferData(&sb);
+  p->nOffset = stringBufferLength(&sb);
+}
+
+/*
+** zDoc[0..nDoc-1] is phrase of text.  aMatch[0..nMatch-1] are a set
+** of matching words some of which might be in zDoc.  zDoc is column
+** number iCol.
+**
+** iBreak is suggested spot in zDoc where we could begin or end an
+** excerpt.  Return a value similar to iBreak but possibly adjusted
+** to be a little left or right so that the break point is better.
+*/
+static int wordBoundary(
+  int iBreak,                   /* The suggested break point */
+  const char *zDoc,             /* Document text */
+  int nDoc,                     /* Number of bytes in zDoc[] */
+  struct snippetMatch *aMatch,  /* Matching words */
+  int nMatch,                   /* Number of entries in aMatch[] */
+  int iCol                      /* The column number for zDoc[] */
+){
+  int i;
+  if( iBreak<=10 ){
+    return 0;
+  }
+  if( iBreak>=nDoc-10 ){
+    return nDoc;
+  }
+  for(i=0; i<nMatch && aMatch[i].iCol<iCol; i++){}
+  while( i<nMatch && aMatch[i].iStart+aMatch[i].nByte<iBreak ){ i++; }
+  if( i<nMatch ){
+    if( aMatch[i].iStart<iBreak+10 ){
+      return aMatch[i].iStart;
+    }
+    if( i>0 && aMatch[i-1].iStart+aMatch[i-1].nByte>=iBreak ){
+      return aMatch[i-1].iStart;
+    }
+  }
+  for(i=1; i<=10; i++){
+    if( safe_isspace(zDoc[iBreak-i]) ){
+      return iBreak - i + 1;
+    }
+    if( safe_isspace(zDoc[iBreak+i]) ){
+      return iBreak + i + 1;
+    }
+  }
+  return iBreak;
+}
+
+
+
+/*
+** Allowed values for Snippet.aMatch[].snStatus
+*/
+#define SNIPPET_IGNORE  0   /* It is ok to omit this match from the snippet */
+#define SNIPPET_DESIRED 1   /* We want to include this match in the snippet */
+
+/*
+** Generate the text of a snippet.
+*/
+static void snippetText(
+  fulltext_cursor *pCursor,   /* The cursor we need the snippet for */
+  const char *zStartMark,     /* Markup to appear before each match */
+  const char *zEndMark,       /* Markup to appear after each match */
+  const char *zEllipsis       /* Ellipsis mark */
+){
+  int i, j;
+  struct snippetMatch *aMatch;
+  int nMatch;
+  int nDesired;
+  StringBuffer sb;
+  int tailCol;
+  int tailOffset;
+  int iCol;
+  int nDoc;
+  const char *zDoc;
+  int iStart, iEnd;
+  int tailEllipsis = 0;
+  int iMatch;
+
+
+  sqlite3_free(pCursor->snippet.zSnippet);
+  pCursor->snippet.zSnippet = 0;
+  aMatch = pCursor->snippet.aMatch;
+  nMatch = pCursor->snippet.nMatch;
+  initStringBuffer(&sb);
+
+  for(i=0; i<nMatch; i++){
+    aMatch[i].snStatus = SNIPPET_IGNORE;
+  }
+  nDesired = 0;
+  for(i=0; i<pCursor->q.nTerms; i++){
+    for(j=0; j<nMatch; j++){
+      if( aMatch[j].iTerm==i ){
+        aMatch[j].snStatus = SNIPPET_DESIRED;
+        nDesired++;
+        break;
+      }
+    }
+  }
+
+  iMatch = 0;
+  tailCol = -1;
+  tailOffset = 0;
+  for(i=0; i<nMatch && nDesired>0; i++){
+    if( aMatch[i].snStatus!=SNIPPET_DESIRED ) continue;
+    nDesired--;
+    iCol = aMatch[i].iCol;
+    zDoc = (const char*)sqlite3_column_text(pCursor->pStmt, iCol+1);
+    nDoc = sqlite3_column_bytes(pCursor->pStmt, iCol+1);
+    iStart = aMatch[i].iStart - 40;
+    iStart = wordBoundary(iStart, zDoc, nDoc, aMatch, nMatch, iCol);
+    if( iStart<=10 ){
+      iStart = 0;
+    }
+    if( iCol==tailCol && iStart<=tailOffset+20 ){
+      iStart = tailOffset;
+    }
+    if( (iCol!=tailCol && tailCol>=0) || iStart!=tailOffset ){
+      trimWhiteSpace(&sb);
+      appendWhiteSpace(&sb);
+      append(&sb, zEllipsis);
+      appendWhiteSpace(&sb);
+    }
+    iEnd = aMatch[i].iStart + aMatch[i].nByte + 40;
+    iEnd = wordBoundary(iEnd, zDoc, nDoc, aMatch, nMatch, iCol);
+    if( iEnd>=nDoc-10 ){
+      iEnd = nDoc;
+      tailEllipsis = 0;
+    }else{
+      tailEllipsis = 1;
+    }
+    while( iMatch<nMatch && aMatch[iMatch].iCol<iCol ){ iMatch++; }
+    while( iStart<iEnd ){
+      while( iMatch<nMatch && aMatch[iMatch].iStart<iStart
+             && aMatch[iMatch].iCol<=iCol ){
+        iMatch++;
+      }
+      if( iMatch<nMatch && aMatch[iMatch].iStart<iEnd
+             && aMatch[iMatch].iCol==iCol ){
+        nappend(&sb, &zDoc[iStart], aMatch[iMatch].iStart - iStart);
+        iStart = aMatch[iMatch].iStart;
+        append(&sb, zStartMark);
+        nappend(&sb, &zDoc[iStart], aMatch[iMatch].nByte);
+        append(&sb, zEndMark);
+        iStart += aMatch[iMatch].nByte;
+        for(j=iMatch+1; j<nMatch; j++){
+          if( aMatch[j].iTerm==aMatch[iMatch].iTerm
+              && aMatch[j].snStatus==SNIPPET_DESIRED ){
+            nDesired--;
+            aMatch[j].snStatus = SNIPPET_IGNORE;
+          }
+        }
+      }else{
+        nappend(&sb, &zDoc[iStart], iEnd - iStart);
+        iStart = iEnd;
+      }
+    }
+    tailCol = iCol;
+    tailOffset = iEnd;
+  }
+  trimWhiteSpace(&sb);
+  if( tailEllipsis ){
+    appendWhiteSpace(&sb);
+    append(&sb, zEllipsis);
+  }
+  pCursor->snippet.zSnippet = stringBufferData(&sb);
+  pCursor->snippet.nSnippet = stringBufferLength(&sb);
+}
+
+
+/*
+** Close the cursor.  For additional information see the documentation
+** on the xClose method of the virtual table interface.
+*/
+static int fulltextClose(sqlite3_vtab_cursor *pCursor){
+  fulltext_cursor *c = (fulltext_cursor *) pCursor;
+  FTSTRACE(("FTS3 Close %p\n", c));
+  sqlite3_finalize(c->pStmt);
+  queryClear(&c->q);
+  snippetClear(&c->snippet);
+  if( c->result.nData!=0 ) dlrDestroy(&c->reader);
+  dataBufferDestroy(&c->result);
+  sqlite3_free(c);
+  return SQLITE_OK;
+}
+
+static int fulltextNext(sqlite3_vtab_cursor *pCursor){
+  fulltext_cursor *c = (fulltext_cursor *) pCursor;
+  int rc;
+
+  FTSTRACE(("FTS3 Next %p\n", pCursor));
+  snippetClear(&c->snippet);
+  if( c->iCursorType < QUERY_FULLTEXT ){
+    /* TODO(shess) Handle SQLITE_SCHEMA AND SQLITE_BUSY. */
+    rc = sqlite3_step(c->pStmt);
+    switch( rc ){
+      case SQLITE_ROW:
+        c->eof = 0;
+        return SQLITE_OK;
+      case SQLITE_DONE:
+        c->eof = 1;
+        return SQLITE_OK;
+      default:
+        c->eof = 1;
+        return rc;
+    }
+  } else {  /* full-text query */
+    rc = sqlite3_reset(c->pStmt);
+    if( rc!=SQLITE_OK ) return rc;
+
+    if( c->result.nData==0 || dlrAtEnd(&c->reader) ){
+      c->eof = 1;
+      return SQLITE_OK;
+    }
+    rc = sqlite3_bind_int64(c->pStmt, 1, dlrDocid(&c->reader));
+    dlrStep(&c->reader);
+    if( rc!=SQLITE_OK ) return rc;
+    /* TODO(shess) Handle SQLITE_SCHEMA AND SQLITE_BUSY. */
+    rc = sqlite3_step(c->pStmt);
+    if( rc==SQLITE_ROW ){   /* the case we expect */
+      c->eof = 0;
+      return SQLITE_OK;
+    }
+    /* an error occurred; abort */
+    return rc==SQLITE_DONE ? SQLITE_ERROR : rc;
+  }
+}
+
+
+/* TODO(shess) If we pushed LeafReader to the top of the file, or to
+** another file, term_select() could be pushed above
+** docListOfTerm().
+*/
+static int termSelect(fulltext_vtab *v, int iColumn,
+                      const char *pTerm, int nTerm, int isPrefix,
+                      DocListType iType, DataBuffer *out);
+
+/* Return a DocList corresponding to the query term *pTerm.  If *pTerm
+** is the first term of a phrase query, go ahead and evaluate the phrase
+** query and return the doclist for the entire phrase query.
+**
+** The resulting DL_DOCIDS doclist is stored in pResult, which is
+** overwritten.
+*/
+static int docListOfTerm(
+  fulltext_vtab *v,    /* The full text index */
+  int iColumn,         /* column to restrict to.  No restriction if >=nColumn */
+  QueryTerm *pQTerm,   /* Term we are looking for, or 1st term of a phrase */
+  DataBuffer *pResult  /* Write the result here */
+){
+  DataBuffer left, right, new;
+  int i, rc;
+
+  /* No phrase search if no position info. */
+  assert( pQTerm->nPhrase==0 || DL_DEFAULT!=DL_DOCIDS );
+
+  /* This code should never be called with buffered updates. */
+  assert( v->nPendingData<0 );
+
+  dataBufferInit(&left, 0);
+  rc = termSelect(v, iColumn, pQTerm->pTerm, pQTerm->nTerm, pQTerm->isPrefix,
+                  (0<pQTerm->nPhrase ? DL_POSITIONS : DL_DOCIDS), &left);
+  if( rc ) return rc;
+  for(i=1; i<=pQTerm->nPhrase && left.nData>0; i++){
+    /* If this token is connected to the next by a NEAR operator, and
+    ** the next token is the start of a phrase, then set nPhraseRight
+    ** to the number of tokens in the phrase. Otherwise leave it at 1.
+    */
+    int nPhraseRight = 1;
+    while( (i+nPhraseRight)<=pQTerm->nPhrase
+        && pQTerm[i+nPhraseRight].nNear==0
+    ){
+      nPhraseRight++;
+    }
+
+    dataBufferInit(&right, 0);
+    rc = termSelect(v, iColumn, pQTerm[i].pTerm, pQTerm[i].nTerm,
+                    pQTerm[i].isPrefix, DL_POSITIONS, &right);
+    if( rc ){
+      dataBufferDestroy(&left);
+      return rc;
+    }
+    dataBufferInit(&new, 0);
+    docListPhraseMerge(left.pData, left.nData, right.pData, right.nData,
+                       pQTerm[i-1].nNear, pQTerm[i-1].iPhrase + nPhraseRight,
+                       ((i<pQTerm->nPhrase) ? DL_POSITIONS : DL_DOCIDS),
+                       &new);
+    dataBufferDestroy(&left);
+    dataBufferDestroy(&right);
+    left = new;
+  }
+  *pResult = left;
+  return SQLITE_OK;
+}
+
+/* Add a new term pTerm[0..nTerm-1] to the query *q.
+*/
+static void queryAdd(Query *q, const char *pTerm, int nTerm){
+  QueryTerm *t;
+  ++q->nTerms;
+  q->pTerms = sqlite3_realloc(q->pTerms, q->nTerms * sizeof(q->pTerms[0]));
+  if( q->pTerms==0 ){
+    q->nTerms = 0;
+    return;
+  }
+  t = &q->pTerms[q->nTerms - 1];
+  CLEAR(t);
+  t->pTerm = sqlite3_malloc(nTerm+1);
+  memcpy(t->pTerm, pTerm, nTerm);
+  t->pTerm[nTerm] = 0;
+  t->nTerm = nTerm;
+  t->isOr = q->nextIsOr;
+  t->isPrefix = 0;
+  q->nextIsOr = 0;
+  t->iColumn = q->nextColumn;
+  q->nextColumn = q->dfltColumn;
+}
+
+/*
+** Check to see if the string zToken[0...nToken-1] matches any
+** column name in the virtual table.   If it does,
+** return the zero-indexed column number.  If not, return -1.
+*/
+static int checkColumnSpecifier(
+  fulltext_vtab *pVtab,    /* The virtual table */
+  const char *zToken,      /* Text of the token */
+  int nToken               /* Number of characters in the token */
+){
+  int i;
+  for(i=0; i<pVtab->nColumn; i++){
+    if( memcmp(pVtab->azColumn[i], zToken, nToken)==0
+        && pVtab->azColumn[i][nToken]==0 ){
+      return i;
+    }
+  }
+  return -1;
+}
+
+/*
+** Parse the text at pSegment[0..nSegment-1].  Add additional terms
+** to the query being assemblied in pQuery.
+**
+** inPhrase is true if pSegment[0..nSegement-1] is contained within
+** double-quotes.  If inPhrase is true, then the first term
+** is marked with the number of terms in the phrase less one and
+** OR and "-" syntax is ignored.  If inPhrase is false, then every
+** term found is marked with nPhrase=0 and OR and "-" syntax is significant.
+*/
+static int tokenizeSegment(
+  sqlite3_tokenizer *pTokenizer,          /* The tokenizer to use */
+  const char *pSegment, int nSegment,     /* Query expression being parsed */
+  int inPhrase,                           /* True if within "..." */
+  Query *pQuery                           /* Append results here */
+){
+  const sqlite3_tokenizer_module *pModule = pTokenizer->pModule;
+  sqlite3_tokenizer_cursor *pCursor;
+  int firstIndex = pQuery->nTerms;
+  int iCol;
+  int nTerm = 1;
+
+  int rc = pModule->xOpen(pTokenizer, pSegment, nSegment, &pCursor);
+  if( rc!=SQLITE_OK ) return rc;
+  pCursor->pTokenizer = pTokenizer;
+
+  while( 1 ){
+    const char *pToken;
+    int nToken, iBegin, iEnd, iPos;
+
+    rc = pModule->xNext(pCursor,
+                        &pToken, &nToken,
+                        &iBegin, &iEnd, &iPos);
+    if( rc!=SQLITE_OK ) break;
+    if( !inPhrase &&
+        pSegment[iEnd]==':' &&
+         (iCol = checkColumnSpecifier(pQuery->pFts, pToken, nToken))>=0 ){
+      pQuery->nextColumn = iCol;
+      continue;
+    }
+    if( !inPhrase && pQuery->nTerms>0 && nToken==2
+     && pSegment[iBegin+0]=='O'
+     && pSegment[iBegin+1]=='R'
+    ){
+      pQuery->nextIsOr = 1;
+      continue;
+    }
+    if( !inPhrase && pQuery->nTerms>0 && !pQuery->nextIsOr && nToken==4
+      && pSegment[iBegin+0]=='N'
+      && pSegment[iBegin+1]=='E'
+      && pSegment[iBegin+2]=='A'
+      && pSegment[iBegin+3]=='R'
+    ){
+      QueryTerm *pTerm = &pQuery->pTerms[pQuery->nTerms-1];
+      if( (iBegin+6)<nSegment
+       && pSegment[iBegin+4] == '/'
+       && pSegment[iBegin+5]>='0' && pSegment[iBegin+5]<='9'
+      ){
+        pTerm->nNear = (pSegment[iBegin+5] - '0');
+        nToken += 2;
+        if( pSegment[iBegin+6]>='0' && pSegment[iBegin+6]<=9 ){
+          pTerm->nNear = pTerm->nNear * 10 + (pSegment[iBegin+6] - '0');
+          iEnd++;
+        }
+        pModule->xNext(pCursor, &pToken, &nToken, &iBegin, &iEnd, &iPos);
+      } else {
+        pTerm->nNear = SQLITE_FTS3_DEFAULT_NEAR_PARAM;
+      }
+      pTerm->nNear++;
+      continue;
+    }
+
+    queryAdd(pQuery, pToken, nToken);
+    if( !inPhrase && iBegin>0 && pSegment[iBegin-1]=='-' ){
+      pQuery->pTerms[pQuery->nTerms-1].isNot = 1;
+    }
+    if( iEnd<nSegment && pSegment[iEnd]=='*' ){
+      pQuery->pTerms[pQuery->nTerms-1].isPrefix = 1;
+    }
+    pQuery->pTerms[pQuery->nTerms-1].iPhrase = nTerm;
+    if( inPhrase ){
+      nTerm++;
+    }
+  }
+
+  if( inPhrase && pQuery->nTerms>firstIndex ){
+    pQuery->pTerms[firstIndex].nPhrase = pQuery->nTerms - firstIndex - 1;
+  }
+
+  return pModule->xClose(pCursor);
+}
+
+/* Parse a query string, yielding a Query object pQuery.
+**
+** The calling function will need to queryClear() to clean up
+** the dynamically allocated memory held by pQuery.
+*/
+static int parseQuery(
+  fulltext_vtab *v,        /* The fulltext index */
+  const char *zInput,      /* Input text of the query string */
+  int nInput,              /* Size of the input text */
+  int dfltColumn,          /* Default column of the index to match against */
+  Query *pQuery            /* Write the parse results here. */
+){
+  int iInput, inPhrase = 0;
+  int ii;
+  QueryTerm *aTerm;
+
+  if( zInput==0 ) nInput = 0;
+  if( nInput<0 ) nInput = strlen(zInput);
+  pQuery->nTerms = 0;
+  pQuery->pTerms = NULL;
+  pQuery->nextIsOr = 0;
+  pQuery->nextColumn = dfltColumn;
+  pQuery->dfltColumn = dfltColumn;
+  pQuery->pFts = v;
+
+  for(iInput=0; iInput<nInput; ++iInput){
+    int i;
+    for(i=iInput; i<nInput && zInput[i]!='"'; ++i){}
+    if( i>iInput ){
+      tokenizeSegment(v->pTokenizer, zInput+iInput, i-iInput, inPhrase,
+                       pQuery);
+    }
+    iInput = i;
+    if( i<nInput ){
+      assert( zInput[i]=='"' );
+      inPhrase = !inPhrase;
+    }
+  }
+
+  if( inPhrase ){
+    /* unmatched quote */
+    queryClear(pQuery);
+    return SQLITE_ERROR;
+  }
+
+  /* Modify the values of the QueryTerm.nPhrase variables to account for
+  ** the NEAR operator. For the purposes of QueryTerm.nPhrase, phrases
+  ** and tokens connected by the NEAR operator are handled as a single
+  ** phrase. See comments above the QueryTerm structure for details.
+  */
+  aTerm = pQuery->pTerms;
+  for(ii=0; ii<pQuery->nTerms; ii++){
+    if( aTerm[ii].nNear || aTerm[ii].nPhrase ){
+      while (aTerm[ii+aTerm[ii].nPhrase].nNear) {
+        aTerm[ii].nPhrase += (1 + aTerm[ii+aTerm[ii].nPhrase+1].nPhrase);
+      }
+    }
+  }
+
+  return SQLITE_OK;
+}
+
+/* TODO(shess) Refactor the code to remove this forward decl. */
+static int flushPendingTerms(fulltext_vtab *v);
+
+/* Perform a full-text query using the search expression in
+** zInput[0..nInput-1].  Return a list of matching documents
+** in pResult.
+**
+** Queries must match column iColumn.  Or if iColumn>=nColumn
+** they are allowed to match against any column.
+*/
+static int fulltextQuery(
+  fulltext_vtab *v,      /* The full text index */
+  int iColumn,           /* Match against this column by default */
+  const char *zInput,    /* The query string */
+  int nInput,            /* Number of bytes in zInput[] */
+  DataBuffer *pResult,   /* Write the result doclist here */
+  Query *pQuery          /* Put parsed query string here */
+){
+  int i, iNext, rc;
+  DataBuffer left, right, or, new;
+  int nNot = 0;
+  QueryTerm *aTerm;
+
+  /* TODO(shess) Instead of flushing pendingTerms, we could query for
+  ** the relevant term and merge the doclist into what we receive from
+  ** the database.  Wait and see if this is a common issue, first.
+  **
+  ** A good reason not to flush is to not generate update-related
+  ** error codes from here.
+  */
+
+  /* Flush any buffered updates before executing the query. */
+  rc = flushPendingTerms(v);
+  if( rc!=SQLITE_OK ) return rc;
+
+  /* TODO(shess) I think that the queryClear() calls below are not
+  ** necessary, because fulltextClose() already clears the query.
+  */
+  rc = parseQuery(v, zInput, nInput, iColumn, pQuery);
+  if( rc!=SQLITE_OK ) return rc;
+
+  /* Empty or NULL queries return no results. */
+  if( pQuery->nTerms==0 ){
+    dataBufferInit(pResult, 0);
+    return SQLITE_OK;
+  }
+
+  /* Merge AND terms. */
+  /* TODO(shess) I think we can early-exit if( i>nNot && left.nData==0 ). */
+  aTerm = pQuery->pTerms;
+  for(i = 0; i<pQuery->nTerms; i=iNext){
+    if( aTerm[i].isNot ){
+      /* Handle all NOT terms in a separate pass */
+      nNot++;
+      iNext = i + aTerm[i].nPhrase+1;
+      continue;
+    }
+    iNext = i + aTerm[i].nPhrase + 1;
+    rc = docListOfTerm(v, aTerm[i].iColumn, &aTerm[i], &right);
+    if( rc ){
+      if( i!=nNot ) dataBufferDestroy(&left);
+      queryClear(pQuery);
+      return rc;
+    }
+    while( iNext<pQuery->nTerms && aTerm[iNext].isOr ){
+      rc = docListOfTerm(v, aTerm[iNext].iColumn, &aTerm[iNext], &or);
+      iNext += aTerm[iNext].nPhrase + 1;
+      if( rc ){
+        if( i!=nNot ) dataBufferDestroy(&left);
+        dataBufferDestroy(&right);
+        queryClear(pQuery);
+        return rc;
+      }
+      dataBufferInit(&new, 0);
+      docListOrMerge(right.pData, right.nData, or.pData, or.nData, &new);
+      dataBufferDestroy(&right);
+      dataBufferDestroy(&or);
+      right = new;
+    }
+    if( i==nNot ){           /* first term processed. */
+      left = right;
+    }else{
+      dataBufferInit(&new, 0);
+      docListAndMerge(left.pData, left.nData, right.pData, right.nData, &new);
+      dataBufferDestroy(&right);
+      dataBufferDestroy(&left);
+      left = new;
+    }
+  }
+
+  if( nNot==pQuery->nTerms ){
+    /* We do not yet know how to handle a query of only NOT terms */
+    return SQLITE_ERROR;
+  }
+
+  /* Do the EXCEPT terms */
+  for(i=0; i<pQuery->nTerms;  i += aTerm[i].nPhrase + 1){
+    if( !aTerm[i].isNot ) continue;
+    rc = docListOfTerm(v, aTerm[i].iColumn, &aTerm[i], &right);
+    if( rc ){
+      queryClear(pQuery);
+      dataBufferDestroy(&left);
+      return rc;
+    }
+    dataBufferInit(&new, 0);
+    docListExceptMerge(left.pData, left.nData, right.pData, right.nData, &new);
+    dataBufferDestroy(&right);
+    dataBufferDestroy(&left);
+    left = new;
+  }
+
+  *pResult = left;
+  return rc;
+}
+
+/*
+** This is the xFilter interface for the virtual table.  See
+** the virtual table xFilter method documentation for additional
+** information.
+**
+** If idxNum==QUERY_GENERIC then do a full table scan against
+** the %_content table.
+**
+** If idxNum==QUERY_DOCID then do a docid lookup for a single entry
+** in the %_content table.
+**
+** If idxNum>=QUERY_FULLTEXT then use the full text index.  The
+** column on the left-hand side of the MATCH operator is column
+** number idxNum-QUERY_FULLTEXT, 0 indexed.  argv[0] is the right-hand
+** side of the MATCH operator.
+*/
+/* TODO(shess) Upgrade the cursor initialization and destruction to
+** account for fulltextFilter() being called multiple times on the
+** same cursor.  The current solution is very fragile.  Apply fix to
+** fts3 as appropriate.
+*/
+static int fulltextFilter(
+  sqlite3_vtab_cursor *pCursor,     /* The cursor used for this query */
+  int idxNum, const char *idxStr,   /* Which indexing scheme to use */
+  int argc, sqlite3_value **argv    /* Arguments for the indexing scheme */
+){
+  fulltext_cursor *c = (fulltext_cursor *) pCursor;
+  fulltext_vtab *v = cursor_vtab(c);
+  int rc;
+  StringBuffer sb;
+
+  FTSTRACE(("FTS3 Filter %p\n",pCursor));
+
+  initStringBuffer(&sb);
+  append(&sb, "SELECT docid, ");
+  appendList(&sb, v->nColumn, v->azContentColumn);
+  append(&sb, " FROM %_content");
+  if( idxNum!=QUERY_GENERIC ) append(&sb, " WHERE docid = ?");
+  sqlite3_finalize(c->pStmt);
+  rc = sql_prepare(v->db, v->zDb, v->zName, &c->pStmt, stringBufferData(&sb));
+  stringBufferDestroy(&sb);
+  if( rc!=SQLITE_OK ) return rc;
+
+  c->iCursorType = idxNum;
+  switch( idxNum ){
+    case QUERY_GENERIC:
+      break;
+
+    case QUERY_DOCID:
+      rc = sqlite3_bind_int64(c->pStmt, 1, sqlite3_value_int64(argv[0]));
+      if( rc!=SQLITE_OK ) return rc;
+      break;
+
+    default:   /* full-text search */
+    {
+      const char *zQuery = (const char *)sqlite3_value_text(argv[0]);
+      assert( idxNum<=QUERY_FULLTEXT+v->nColumn);
+      assert( argc==1 );
+      queryClear(&c->q);
+      if( c->result.nData!=0 ){
+        /* This case happens if the same cursor is used repeatedly. */
+        dlrDestroy(&c->reader);
+        dataBufferReset(&c->result);
+      }else{
+        dataBufferInit(&c->result, 0);
+      }
+      rc = fulltextQuery(v, idxNum-QUERY_FULLTEXT, zQuery, -1, &c->result, &c->q);
+      if( rc!=SQLITE_OK ) return rc;
+      if( c->result.nData!=0 ){
+        dlrInit(&c->reader, DL_DOCIDS, c->result.pData, c->result.nData);
+      }
+      break;
+    }
+  }
+
+  return fulltextNext(pCursor);
+}
+
+/* This is the xEof method of the virtual table.  The SQLite core
+** calls this routine to find out if it has reached the end of
+** a query's results set.
+*/
+static int fulltextEof(sqlite3_vtab_cursor *pCursor){
+  fulltext_cursor *c = (fulltext_cursor *) pCursor;
+  return c->eof;
+}
+
+/* This is the xColumn method of the virtual table.  The SQLite
+** core calls this method during a query when it needs the value
+** of a column from the virtual table.  This method needs to use
+** one of the sqlite3_result_*() routines to store the requested
+** value back in the pContext.
+*/
+static int fulltextColumn(sqlite3_vtab_cursor *pCursor,
+                          sqlite3_context *pContext, int idxCol){
+  fulltext_cursor *c = (fulltext_cursor *) pCursor;
+  fulltext_vtab *v = cursor_vtab(c);
+
+  if( idxCol<v->nColumn ){
+    sqlite3_value *pVal = sqlite3_column_value(c->pStmt, idxCol+1);
+    sqlite3_result_value(pContext, pVal);
+  }else if( idxCol==v->nColumn ){
+    /* The extra column whose name is the same as the table.
+    ** Return a blob which is a pointer to the cursor
+    */
+    sqlite3_result_blob(pContext, &c, sizeof(c), SQLITE_TRANSIENT);
+  }else if( idxCol==v->nColumn+1 ){
+    /* The docid column, which is an alias for rowid. */
+    sqlite3_value *pVal = sqlite3_column_value(c->pStmt, 0);
+    sqlite3_result_value(pContext, pVal);
+  }
+  return SQLITE_OK;
+}
+
+/* This is the xRowid method.  The SQLite core calls this routine to
+** retrieve the rowid for the current row of the result set.  fts3
+** exposes %_content.docid as the rowid for the virtual table.  The
+** rowid should be written to *pRowid.
+*/
+static int fulltextRowid(sqlite3_vtab_cursor *pCursor, sqlite_int64 *pRowid){
+  fulltext_cursor *c = (fulltext_cursor *) pCursor;
+
+  *pRowid = sqlite3_column_int64(c->pStmt, 0);
+  return SQLITE_OK;
+}
+
+/* Add all terms in [zText] to pendingTerms table.  If [iColumn] > 0,
+** we also store positions and offsets in the hash table using that
+** column number.
+*/
+static int buildTerms(fulltext_vtab *v, sqlite_int64 iDocid,
+                      const char *zText, int iColumn){
+  sqlite3_tokenizer *pTokenizer = v->pTokenizer;
+  sqlite3_tokenizer_cursor *pCursor;
+  const char *pToken;
+  int nTokenBytes;
+  int iStartOffset, iEndOffset, iPosition;
+  int rc;
+
+  rc = pTokenizer->pModule->xOpen(pTokenizer, zText, -1, &pCursor);
+  if( rc!=SQLITE_OK ) return rc;
+
+  pCursor->pTokenizer = pTokenizer;
+  while( SQLITE_OK==(rc=pTokenizer->pModule->xNext(pCursor,
+                                                   &pToken, &nTokenBytes,
+                                                   &iStartOffset, &iEndOffset,
+                                                   &iPosition)) ){
+    DLCollector *p;
+    int nData;                   /* Size of doclist before our update. */
+
+    /* Positions can't be negative; we use -1 as a terminator
+     * internally.  Token can't be NULL or empty. */
+    if( iPosition<0 || pToken == NULL || nTokenBytes == 0 ){
+      rc = SQLITE_ERROR;
+      break;
+    }
+
+    p = fts3HashFind(&v->pendingTerms, pToken, nTokenBytes);
+    if( p==NULL ){
+      nData = 0;
+      p = dlcNew(iDocid, DL_DEFAULT);
+      fts3HashInsert(&v->pendingTerms, pToken, nTokenBytes, p);
+
+      /* Overhead for our hash table entry, the key, and the value. */
+      v->nPendingData += sizeof(struct fts3HashElem)+sizeof(*p)+nTokenBytes;
+    }else{
+      nData = p->b.nData;
+      if( p->dlw.iPrevDocid!=iDocid ) dlcNext(p, iDocid);
+    }
+    if( iColumn>=0 ){
+      dlcAddPos(p, iColumn, iPosition, iStartOffset, iEndOffset);
+    }
+
+    /* Accumulate data added by dlcNew or dlcNext, and dlcAddPos. */
+    v->nPendingData += p->b.nData-nData;
+  }
+
+  /* TODO(shess) Check return?  Should this be able to cause errors at
+  ** this point?  Actually, same question about sqlite3_finalize(),
+  ** though one could argue that failure there means that the data is
+  ** not durable.  *ponder*
+  */
+  pTokenizer->pModule->xClose(pCursor);
+  if( SQLITE_DONE == rc ) return SQLITE_OK;
+  return rc;
+}
+
+/* Add doclists for all terms in [pValues] to pendingTerms table. */
+static int insertTerms(fulltext_vtab *v, sqlite_int64 iDocid,
+                       sqlite3_value **pValues){
+  int i;
+  for(i = 0; i < v->nColumn ; ++i){
+    char *zText = (char*)sqlite3_value_text(pValues[i]);
+    int rc = buildTerms(v, iDocid, zText, i);
+    if( rc!=SQLITE_OK ) return rc;
+  }
+  return SQLITE_OK;
+}
+
+/* Add empty doclists for all terms in the given row's content to
+** pendingTerms.
+*/
+static int deleteTerms(fulltext_vtab *v, sqlite_int64 iDocid){
+  const char **pValues;
+  int i, rc;
+
+  /* TODO(shess) Should we allow such tables at all? */
+  if( DL_DEFAULT==DL_DOCIDS ) return SQLITE_ERROR;
+
+  rc = content_select(v, iDocid, &pValues);
+  if( rc!=SQLITE_OK ) return rc;
+
+  for(i = 0 ; i < v->nColumn; ++i) {
+    rc = buildTerms(v, iDocid, pValues[i], -1);
+    if( rc!=SQLITE_OK ) break;
+  }
+
+  freeStringArray(v->nColumn, pValues);
+  return SQLITE_OK;
+}
+
+/* TODO(shess) Refactor the code to remove this forward decl. */
+static int initPendingTerms(fulltext_vtab *v, sqlite_int64 iDocid);
+
+/* Insert a row into the %_content table; set *piDocid to be the ID of the
+** new row.  Add doclists for terms to pendingTerms.
+*/
+static int index_insert(fulltext_vtab *v, sqlite3_value *pRequestDocid,
+                        sqlite3_value **pValues, sqlite_int64 *piDocid){
+  int rc;
+
+  rc = content_insert(v, pRequestDocid, pValues);  /* execute an SQL INSERT */
+  if( rc!=SQLITE_OK ) return rc;
+
+  /* docid column is an alias for rowid. */
+  *piDocid = sqlite3_last_insert_rowid(v->db);
+  rc = initPendingTerms(v, *piDocid);
+  if( rc!=SQLITE_OK ) return rc;
+
+  return insertTerms(v, *piDocid, pValues);
+}
+
+/* Delete a row from the %_content table; add empty doclists for terms
+** to pendingTerms.
+*/
+static int index_delete(fulltext_vtab *v, sqlite_int64 iRow){
+  int rc = initPendingTerms(v, iRow);
+  if( rc!=SQLITE_OK ) return rc;
+
+  rc = deleteTerms(v, iRow);
+  if( rc!=SQLITE_OK ) return rc;
+
+  return content_delete(v, iRow);  /* execute an SQL DELETE */
+}
+
+/* Update a row in the %_content table; add delete doclists to
+** pendingTerms for old terms not in the new data, add insert doclists
+** to pendingTerms for terms in the new data.
+*/
+static int index_update(fulltext_vtab *v, sqlite_int64 iRow,
+                        sqlite3_value **pValues){
+  int rc = initPendingTerms(v, iRow);
+  if( rc!=SQLITE_OK ) return rc;
+
+  /* Generate an empty doclist for each term that previously appeared in this
+   * row. */
+  rc = deleteTerms(v, iRow);
+  if( rc!=SQLITE_OK ) return rc;
+
+  rc = content_update(v, pValues, iRow);  /* execute an SQL UPDATE */
+  if( rc!=SQLITE_OK ) return rc;
+
+  /* Now add positions for terms which appear in the updated row. */
+  return insertTerms(v, iRow, pValues);
+}
+
+/*******************************************************************/
+/* InteriorWriter is used to collect terms and block references into
+** interior nodes in %_segments.  See commentary at top of file for
+** format.
+*/
+
+/* How large interior nodes can grow. */
+#define INTERIOR_MAX 2048
+
+/* Minimum number of terms per interior node (except the root). This
+** prevents large terms from making the tree too skinny - must be >0
+** so that the tree always makes progress.  Note that the min tree
+** fanout will be INTERIOR_MIN_TERMS+1.
+*/
+#define INTERIOR_MIN_TERMS 7
+#if INTERIOR_MIN_TERMS<1
+# error INTERIOR_MIN_TERMS must be greater than 0.
+#endif
+
+/* ROOT_MAX controls how much data is stored inline in the segment
+** directory.
+*/
+/* TODO(shess) Push ROOT_MAX down to whoever is writing things.  It's
+** only here so that interiorWriterRootInfo() and leafWriterRootInfo()
+** can both see it, but if the caller passed it in, we wouldn't even
+** need a define.
+*/
+#define ROOT_MAX 1024
+#if ROOT_MAX<VARINT_MAX*2
+# error ROOT_MAX must have enough space for a header.
+#endif
+
+/* InteriorBlock stores a linked-list of interior blocks while a lower
+** layer is being constructed.
+*/
+typedef struct InteriorBlock {
+  DataBuffer term;           /* Leftmost term in block's subtree. */
+  DataBuffer data;           /* Accumulated data for the block. */
+  struct InteriorBlock *next;
+} InteriorBlock;
+
+static InteriorBlock *interiorBlockNew(int iHeight, sqlite_int64 iChildBlock,
+                                       const char *pTerm, int nTerm){
+  InteriorBlock *block = sqlite3_malloc(sizeof(InteriorBlock));
+  char c[VARINT_MAX+VARINT_MAX];
+  int n;
+
+  if( block ){
+    memset(block, 0, sizeof(*block));
+    dataBufferInit(&block->term, 0);
+    dataBufferReplace(&block->term, pTerm, nTerm);
+
+    n = fts3PutVarint(c, iHeight);
+    n += fts3PutVarint(c+n, iChildBlock);
+    dataBufferInit(&block->data, INTERIOR_MAX);
+    dataBufferReplace(&block->data, c, n);
+  }
+  return block;
+}
+
+#ifndef NDEBUG
+/* Verify that the data is readable as an interior node. */
+static void interiorBlockValidate(InteriorBlock *pBlock){
+  const char *pData = pBlock->data.pData;
+  int nData = pBlock->data.nData;
+  int n, iDummy;
+  sqlite_int64 iBlockid;
+
+  assert( nData>0 );
+  assert( pData!=0 );
+  assert( pData+nData>pData );
+
+  /* Must lead with height of node as a varint(n), n>0 */
+  n = fts3GetVarint32(pData, &iDummy);
+  assert( n>0 );
+  assert( iDummy>0 );
+  assert( n<nData );
+  pData += n;
+  nData -= n;
+
+  /* Must contain iBlockid. */
+  n = fts3GetVarint(pData, &iBlockid);
+  assert( n>0 );
+  assert( n<=nData );
+  pData += n;
+  nData -= n;
+
+  /* Zero or more terms of positive length */
+  if( nData!=0 ){
+    /* First term is not delta-encoded. */
+    n = fts3GetVarint32(pData, &iDummy);
+    assert( n>0 );
+    assert( iDummy>0 );
+    assert( n+iDummy>0);
+    assert( n+iDummy<=nData );
+    pData += n+iDummy;
+    nData -= n+iDummy;
+
+    /* Following terms delta-encoded. */
+    while( nData!=0 ){
+      /* Length of shared prefix. */
+      n = fts3GetVarint32(pData, &iDummy);
+      assert( n>0 );
+      assert( iDummy>=0 );
+      assert( n<nData );
+      pData += n;
+      nData -= n;
+
+      /* Length and data of distinct suffix. */
+      n = fts3GetVarint32(pData, &iDummy);
+      assert( n>0 );
+      assert( iDummy>0 );
+      assert( n+iDummy>0);
+      assert( n+iDummy<=nData );
+      pData += n+iDummy;
+      nData -= n+iDummy;
+    }
+  }
+}
+#define ASSERT_VALID_INTERIOR_BLOCK(x) interiorBlockValidate(x)
+#else
+#define ASSERT_VALID_INTERIOR_BLOCK(x) assert( 1 )
+#endif
+
+typedef struct InteriorWriter {
+  int iHeight;                   /* from 0 at leaves. */
+  InteriorBlock *first, *last;
+  struct InteriorWriter *parentWriter;
+
+  DataBuffer term;               /* Last term written to block "last". */
+  sqlite_int64 iOpeningChildBlock; /* First child block in block "last". */
+#ifndef NDEBUG
+  sqlite_int64 iLastChildBlock;  /* for consistency checks. */
+#endif
+} InteriorWriter;
+
+/* Initialize an interior node where pTerm[nTerm] marks the leftmost
+** term in the tree.  iChildBlock is the leftmost child block at the
+** next level down the tree.
+*/
+static void interiorWriterInit(int iHeight, const char *pTerm, int nTerm,
+                               sqlite_int64 iChildBlock,
+                               InteriorWriter *pWriter){
+  InteriorBlock *block;
+  assert( iHeight>0 );
+  CLEAR(pWriter);
+
+  pWriter->iHeight = iHeight;
+  pWriter->iOpeningChildBlock = iChildBlock;
+#ifndef NDEBUG
+  pWriter->iLastChildBlock = iChildBlock;
+#endif
+  block = interiorBlockNew(iHeight, iChildBlock, pTerm, nTerm);
+  pWriter->last = pWriter->first = block;
+  ASSERT_VALID_INTERIOR_BLOCK(pWriter->last);
+  dataBufferInit(&pWriter->term, 0);
+}
+
+/* Append the child node rooted at iChildBlock to the interior node,
+** with pTerm[nTerm] as the leftmost term in iChildBlock's subtree.
+*/
+static void interiorWriterAppend(InteriorWriter *pWriter,
+                                 const char *pTerm, int nTerm,
+                                 sqlite_int64 iChildBlock){
+  char c[VARINT_MAX+VARINT_MAX];
+  int n, nPrefix = 0;
+
+  ASSERT_VALID_INTERIOR_BLOCK(pWriter->last);
+
+  /* The first term written into an interior node is actually
+  ** associated with the second child added (the first child was added
+  ** in interiorWriterInit, or in the if clause at the bottom of this
+  ** function).  That term gets encoded straight up, with nPrefix left
+  ** at 0.
+  */
+  if( pWriter->term.nData==0 ){
+    n = fts3PutVarint(c, nTerm);
+  }else{
+    while( nPrefix<pWriter->term.nData &&
+           pTerm[nPrefix]==pWriter->term.pData[nPrefix] ){
+      nPrefix++;
+    }
+
+    n = fts3PutVarint(c, nPrefix);
+    n += fts3PutVarint(c+n, nTerm-nPrefix);
+  }
+
+#ifndef NDEBUG
+  pWriter->iLastChildBlock++;
+#endif
+  assert( pWriter->iLastChildBlock==iChildBlock );
+
+  /* Overflow to a new block if the new term makes the current block
+  ** too big, and the current block already has enough terms.
+  */
+  if( pWriter->last->data.nData+n+nTerm-nPrefix>INTERIOR_MAX &&
+      iChildBlock-pWriter->iOpeningChildBlock>INTERIOR_MIN_TERMS ){
+    pWriter->last->next = interiorBlockNew(pWriter->iHeight, iChildBlock,
+                                           pTerm, nTerm);
+    pWriter->last = pWriter->last->next;
+    pWriter->iOpeningChildBlock = iChildBlock;
+    dataBufferReset(&pWriter->term);
+  }else{
+    dataBufferAppend2(&pWriter->last->data, c, n,
+                      pTerm+nPrefix, nTerm-nPrefix);
+    dataBufferReplace(&pWriter->term, pTerm, nTerm);
+  }
+  ASSERT_VALID_INTERIOR_BLOCK(pWriter->last);
+}
+
+/* Free the space used by pWriter, including the linked-list of
+** InteriorBlocks, and parentWriter, if present.
+*/
+static int interiorWriterDestroy(InteriorWriter *pWriter){
+  InteriorBlock *block = pWriter->first;
+
+  while( block!=NULL ){
+    InteriorBlock *b = block;
+    block = block->next;
+    dataBufferDestroy(&b->term);
+    dataBufferDestroy(&b->data);
+    sqlite3_free(b);
+  }
+  if( pWriter->parentWriter!=NULL ){
+    interiorWriterDestroy(pWriter->parentWriter);
+    sqlite3_free(pWriter->parentWriter);
+  }
+  dataBufferDestroy(&pWriter->term);
+  SCRAMBLE(pWriter);
+  return SQLITE_OK;
+}
+
+/* If pWriter can fit entirely in ROOT_MAX, return it as the root info
+** directly, leaving *piEndBlockid unchanged.  Otherwise, flush
+** pWriter to %_segments, building a new layer of interior nodes, and
+** recursively ask for their root into.
+*/
+static int interiorWriterRootInfo(fulltext_vtab *v, InteriorWriter *pWriter,
+                                  char **ppRootInfo, int *pnRootInfo,
+                                  sqlite_int64 *piEndBlockid){
+  InteriorBlock *block = pWriter->first;
+  sqlite_int64 iBlockid = 0;
+  int rc;
+
+  /* If we can fit the segment inline */
+  if( block==pWriter->last && block->data.nData<ROOT_MAX ){
+    *ppRootInfo = block->data.pData;
+    *pnRootInfo = block->data.nData;
+    return SQLITE_OK;
+  }
+
+  /* Flush the first block to %_segments, and create a new level of
+  ** interior node.
+  */
+  ASSERT_VALID_INTERIOR_BLOCK(block);
+  rc = block_insert(v, block->data.pData, block->data.nData, &iBlockid);
+  if( rc!=SQLITE_OK ) return rc;
+  *piEndBlockid = iBlockid;
+
+  pWriter->parentWriter = sqlite3_malloc(sizeof(*pWriter->parentWriter));
+  interiorWriterInit(pWriter->iHeight+1,
+                     block->term.pData, block->term.nData,
+                     iBlockid, pWriter->parentWriter);
+
+  /* Flush additional blocks and append to the higher interior
+  ** node.
+  */
+  for(block=block->next; block!=NULL; block=block->next){
+    ASSERT_VALID_INTERIOR_BLOCK(block);
+    rc = block_insert(v, block->data.pData, block->data.nData, &iBlockid);
+    if( rc!=SQLITE_OK ) return rc;
+    *piEndBlockid = iBlockid;
+
+    interiorWriterAppend(pWriter->parentWriter,
+                         block->term.pData, block->term.nData, iBlockid);
+  }
+
+  /* Parent node gets the chance to be the root. */
+  return interiorWriterRootInfo(v, pWriter->parentWriter,
+                                ppRootInfo, pnRootInfo, piEndBlockid);
+}
+
+/****************************************************************/
+/* InteriorReader is used to read off the data from an interior node
+** (see comment at top of file for the format).
+*/
+typedef struct InteriorReader {
+  const char *pData;
+  int nData;
+
+  DataBuffer term;          /* previous term, for decoding term delta. */
+
+  sqlite_int64 iBlockid;
+} InteriorReader;
+
+static void interiorReaderDestroy(InteriorReader *pReader){
+  dataBufferDestroy(&pReader->term);
+  SCRAMBLE(pReader);
+}
+
+/* TODO(shess) The assertions are great, but what if we're in NDEBUG
+** and the blob is empty or otherwise contains suspect data?
+*/
+static void interiorReaderInit(const char *pData, int nData,
+                               InteriorReader *pReader){
+  int n, nTerm;
+
+  /* Require at least the leading flag byte */
+  assert( nData>0 );
+  assert( pData[0]!='\0' );
+
+  CLEAR(pReader);
+
+  /* Decode the base blockid, and set the cursor to the first term. */
+  n = fts3GetVarint(pData+1, &pReader->iBlockid);
+  assert( 1+n<=nData );
+  pReader->pData = pData+1+n;
+  pReader->nData = nData-(1+n);
+
+  /* A single-child interior node (such as when a leaf node was too
+  ** large for the segment directory) won't have any terms.
+  ** Otherwise, decode the first term.
+  */
+  if( pReader->nData==0 ){
+    dataBufferInit(&pReader->term, 0);
+  }else{
+    n = fts3GetVarint32(pReader->pData, &nTerm);
+    dataBufferInit(&pReader->term, nTerm);
+    dataBufferReplace(&pReader->term, pReader->pData+n, nTerm);
+    assert( n+nTerm<=pReader->nData );
+    pReader->pData += n+nTerm;
+    pReader->nData -= n+nTerm;
+  }
+}
+
+static int interiorReaderAtEnd(InteriorReader *pReader){
+  return pReader->term.nData==0;
+}
+
+static sqlite_int64 interiorReaderCurrentBlockid(InteriorReader *pReader){
+  return pReader->iBlockid;
+}
+
+static int interiorReaderTermBytes(InteriorReader *pReader){
+  assert( !interiorReaderAtEnd(pReader) );
+  return pReader->term.nData;
+}
+static const char *interiorReaderTerm(InteriorReader *pReader){
+  assert( !interiorReaderAtEnd(pReader) );
+  return pReader->term.pData;
+}
+
+/* Step forward to the next term in the node. */
+static void interiorReaderStep(InteriorReader *pReader){
+  assert( !interiorReaderAtEnd(pReader) );
+
+  /* If the last term has been read, signal eof, else construct the
+  ** next term.
+  */
+  if( pReader->nData==0 ){
+    dataBufferReset(&pReader->term);
+  }else{
+    int n, nPrefix, nSuffix;
+
+    n = fts3GetVarint32(pReader->pData, &nPrefix);
+    n += fts3GetVarint32(pReader->pData+n, &nSuffix);
+
+    /* Truncate the current term and append suffix data. */
+    pReader->term.nData = nPrefix;
+    dataBufferAppend(&pReader->term, pReader->pData+n, nSuffix);
+
+    assert( n+nSuffix<=pReader->nData );
+    pReader->pData += n+nSuffix;
+    pReader->nData -= n+nSuffix;
+  }
+  pReader->iBlockid++;
+}
+
+/* Compare the current term to pTerm[nTerm], returning strcmp-style
+** results.  If isPrefix, equality means equal through nTerm bytes.
+*/
+static int interiorReaderTermCmp(InteriorReader *pReader,
+                                 const char *pTerm, int nTerm, int isPrefix){
+  const char *pReaderTerm = interiorReaderTerm(pReader);
+  int nReaderTerm = interiorReaderTermBytes(pReader);
+  int c, n = nReaderTerm<nTerm ? nReaderTerm : nTerm;
+
+  if( n==0 ){
+    if( nReaderTerm>0 ) return -1;
+    if( nTerm>0 ) return 1;
+    return 0;
+  }
+
+  c = memcmp(pReaderTerm, pTerm, n);
+  if( c!=0 ) return c;
+  if( isPrefix && n==nTerm ) return 0;
+  return nReaderTerm - nTerm;
+}
+
+/****************************************************************/
+/* LeafWriter is used to collect terms and associated doclist data
+** into leaf blocks in %_segments (see top of file for format info).
+** Expected usage is:
+**
+** LeafWriter writer;
+** leafWriterInit(0, 0, &writer);
+** while( sorted_terms_left_to_process ){
+**   // data is doclist data for that term.
+**   rc = leafWriterStep(v, &writer, pTerm, nTerm, pData, nData);
+**   if( rc!=SQLITE_OK ) goto err;
+** }
+** rc = leafWriterFinalize(v, &writer);
+**err:
+** leafWriterDestroy(&writer);
+** return rc;
+**
+** leafWriterStep() may write a collected leaf out to %_segments.
+** leafWriterFinalize() finishes writing any buffered data and stores
+** a root node in %_segdir.  leafWriterDestroy() frees all buffers and
+** InteriorWriters allocated as part of writing this segment.
+**
+** TODO(shess) Document leafWriterStepMerge().
+*/
+
+/* Put terms with data this big in their own block. */
+#define STANDALONE_MIN 1024
+
+/* Keep leaf blocks below this size. */
+#define LEAF_MAX 2048
+
+typedef struct LeafWriter {
+  int iLevel;
+  int idx;
+  sqlite_int64 iStartBlockid;     /* needed to create the root info */
+  sqlite_int64 iEndBlockid;       /* when we're done writing. */
+
+  DataBuffer term;                /* previous encoded term */
+  DataBuffer data;                /* encoding buffer */
+
+  /* bytes of first term in the current node which distinguishes that
+  ** term from the last term of the previous node.
+  */
+  int nTermDistinct;
+
+  InteriorWriter parentWriter;    /* if we overflow */
+  int has_parent;
+} LeafWriter;
+
+static void leafWriterInit(int iLevel, int idx, LeafWriter *pWriter){
+  CLEAR(pWriter);
+  pWriter->iLevel = iLevel;
+  pWriter->idx = idx;
+
+  dataBufferInit(&pWriter->term, 32);
+
+  /* Start out with a reasonably sized block, though it can grow. */
+  dataBufferInit(&pWriter->data, LEAF_MAX);
+}
+
+#ifndef NDEBUG
+/* Verify that the data is readable as a leaf node. */
+static void leafNodeValidate(const char *pData, int nData){
+  int n, iDummy;
+
+  if( nData==0 ) return;
+  assert( nData>0 );
+  assert( pData!=0 );
+  assert( pData+nData>pData );
+
+  /* Must lead with a varint(0) */
+  n = fts3GetVarint32(pData, &iDummy);
+  assert( iDummy==0 );
+  assert( n>0 );
+  assert( n<nData );
+  pData += n;
+  nData -= n;
+
+  /* Leading term length and data must fit in buffer. */
+  n = fts3GetVarint32(pData, &iDummy);
+  assert( n>0 );
+  assert( iDummy>0 );
+  assert( n+iDummy>0 );
+  assert( n+iDummy<nData );
+  pData += n+iDummy;
+  nData -= n+iDummy;
+
+  /* Leading term's doclist length and data must fit. */
+  n = fts3GetVarint32(pData, &iDummy);
+  assert( n>0 );
+  assert( iDummy>0 );
+  assert( n+iDummy>0 );
+  assert( n+iDummy<=nData );
+  ASSERT_VALID_DOCLIST(DL_DEFAULT, pData+n, iDummy, NULL);
+  pData += n+iDummy;
+  nData -= n+iDummy;
+
+  /* Verify that trailing terms and doclists also are readable. */
+  while( nData!=0 ){
+    n = fts3GetVarint32(pData, &iDummy);
+    assert( n>0 );
+    assert( iDummy>=0 );
+    assert( n<nData );
+    pData += n;
+    nData -= n;
+    n = fts3GetVarint32(pData, &iDummy);
+    assert( n>0 );
+    assert( iDummy>0 );
+    assert( n+iDummy>0 );
+    assert( n+iDummy<nData );
+    pData += n+iDummy;
+    nData -= n+iDummy;
+
+    n = fts3GetVarint32(pData, &iDummy);
+    assert( n>0 );
+    assert( iDummy>0 );
+    assert( n+iDummy>0 );
+    assert( n+iDummy<=nData );
+    ASSERT_VALID_DOCLIST(DL_DEFAULT, pData+n, iDummy, NULL);
+    pData += n+iDummy;
+    nData -= n+iDummy;
+  }
+}
+#define ASSERT_VALID_LEAF_NODE(p, n) leafNodeValidate(p, n)
+#else
+#define ASSERT_VALID_LEAF_NODE(p, n) assert( 1 )
+#endif
+
+/* Flush the current leaf node to %_segments, and adding the resulting
+** blockid and the starting term to the interior node which will
+** contain it.
+*/
+static int leafWriterInternalFlush(fulltext_vtab *v, LeafWriter *pWriter,
+                                   int iData, int nData){
+  sqlite_int64 iBlockid = 0;
+  const char *pStartingTerm;
+  int nStartingTerm, rc, n;
+
+  /* Must have the leading varint(0) flag, plus at least some
+  ** valid-looking data.
+  */
+  assert( nData>2 );
+  assert( iData>=0 );
+  assert( iData+nData<=pWriter->data.nData );
+  ASSERT_VALID_LEAF_NODE(pWriter->data.pData+iData, nData);
+
+  rc = block_insert(v, pWriter->data.pData+iData, nData, &iBlockid);
+  if( rc!=SQLITE_OK ) return rc;
+  assert( iBlockid!=0 );
+
+  /* Reconstruct the first term in the leaf for purposes of building
+  ** the interior node.
+  */
+  n = fts3GetVarint32(pWriter->data.pData+iData+1, &nStartingTerm);
+  pStartingTerm = pWriter->data.pData+iData+1+n;
+  assert( pWriter->data.nData>iData+1+n+nStartingTerm );
+  assert( pWriter->nTermDistinct>0 );
+  assert( pWriter->nTermDistinct<=nStartingTerm );
+  nStartingTerm = pWriter->nTermDistinct;
+
+  if( pWriter->has_parent ){
+    interiorWriterAppend(&pWriter->parentWriter,
+                         pStartingTerm, nStartingTerm, iBlockid);
+  }else{
+    interiorWriterInit(1, pStartingTerm, nStartingTerm, iBlockid,
+                       &pWriter->parentWriter);
+    pWriter->has_parent = 1;
+  }
+
+  /* Track the span of this segment's leaf nodes. */
+  if( pWriter->iEndBlockid==0 ){
+    pWriter->iEndBlockid = pWriter->iStartBlockid = iBlockid;
+  }else{
+    pWriter->iEndBlockid++;
+    assert( iBlockid==pWriter->iEndBlockid );
+  }
+
+  return SQLITE_OK;
+}
+static int leafWriterFlush(fulltext_vtab *v, LeafWriter *pWriter){
+  int rc = leafWriterInternalFlush(v, pWriter, 0, pWriter->data.nData);
+  if( rc!=SQLITE_OK ) return rc;
+
+  /* Re-initialize the output buffer. */
+  dataBufferReset(&pWriter->data);
+
+  return SQLITE_OK;
+}
+
+/* Fetch the root info for the segment.  If the entire leaf fits
+** within ROOT_MAX, then it will be returned directly, otherwise it
+** will be flushed and the root info will be returned from the
+** interior node.  *piEndBlockid is set to the blockid of the last
+** interior or leaf node written to disk (0 if none are written at
+** all).
+*/
+static int leafWriterRootInfo(fulltext_vtab *v, LeafWriter *pWriter,
+                              char **ppRootInfo, int *pnRootInfo,
+                              sqlite_int64 *piEndBlockid){
+  /* we can fit the segment entirely inline */
+  if( !pWriter->has_parent && pWriter->data.nData<ROOT_MAX ){
+    *ppRootInfo = pWriter->data.pData;
+    *pnRootInfo = pWriter->data.nData;
+    *piEndBlockid = 0;
+    return SQLITE_OK;
+  }
+
+  /* Flush remaining leaf data. */
+  if( pWriter->data.nData>0 ){
+    int rc = leafWriterFlush(v, pWriter);
+    if( rc!=SQLITE_OK ) return rc;
+  }
+
+  /* We must have flushed a leaf at some point. */
+  assert( pWriter->has_parent );
+
+  /* Tenatively set the end leaf blockid as the end blockid.  If the
+  ** interior node can be returned inline, this will be the final
+  ** blockid, otherwise it will be overwritten by
+  ** interiorWriterRootInfo().
+  */
+  *piEndBlockid = pWriter->iEndBlockid;
+
+  return interiorWriterRootInfo(v, &pWriter->parentWriter,
+                                ppRootInfo, pnRootInfo, piEndBlockid);
+}
+
+/* Collect the rootInfo data and store it into the segment directory.
+** This has the effect of flushing the segment's leaf data to
+** %_segments, and also flushing any interior nodes to %_segments.
+*/
+static int leafWriterFinalize(fulltext_vtab *v, LeafWriter *pWriter){
+  sqlite_int64 iEndBlockid;
+  char *pRootInfo;
+  int rc, nRootInfo;
+
+  rc = leafWriterRootInfo(v, pWriter, &pRootInfo, &nRootInfo, &iEndBlockid);
+  if( rc!=SQLITE_OK ) return rc;
+
+  /* Don't bother storing an entirely empty segment. */
+  if( iEndBlockid==0 && nRootInfo==0 ) return SQLITE_OK;
+
+  return segdir_set(v, pWriter->iLevel, pWriter->idx,
+                    pWriter->iStartBlockid, pWriter->iEndBlockid,
+                    iEndBlockid, pRootInfo, nRootInfo);
+}
+
+static void leafWriterDestroy(LeafWriter *pWriter){
+  if( pWriter->has_parent ) interiorWriterDestroy(&pWriter->parentWriter);
+  dataBufferDestroy(&pWriter->term);
+  dataBufferDestroy(&pWriter->data);
+}
+
+/* Encode a term into the leafWriter, delta-encoding as appropriate.
+** Returns the length of the new term which distinguishes it from the
+** previous term, which can be used to set nTermDistinct when a node
+** boundary is crossed.
+*/
+static int leafWriterEncodeTerm(LeafWriter *pWriter,
+                                const char *pTerm, int nTerm){
+  char c[VARINT_MAX+VARINT_MAX];
+  int n, nPrefix = 0;
+
+  assert( nTerm>0 );
+  while( nPrefix<pWriter->term.nData &&
+         pTerm[nPrefix]==pWriter->term.pData[nPrefix] ){
+    nPrefix++;
+    /* Failing this implies that the terms weren't in order. */
+    assert( nPrefix<nTerm );
+  }
+
+  if( pWriter->data.nData==0 ){
+    /* Encode the node header and leading term as:
+    **  varint(0)
+    **  varint(nTerm)
+    **  char pTerm[nTerm]
+    */
+    n = fts3PutVarint(c, '\0');
+    n += fts3PutVarint(c+n, nTerm);
+    dataBufferAppend2(&pWriter->data, c, n, pTerm, nTerm);
+  }else{
+    /* Delta-encode the term as:
+    **  varint(nPrefix)
+    **  varint(nSuffix)
+    **  char pTermSuffix[nSuffix]
+    */
+    n = fts3PutVarint(c, nPrefix);
+    n += fts3PutVarint(c+n, nTerm-nPrefix);
+    dataBufferAppend2(&pWriter->data, c, n, pTerm+nPrefix, nTerm-nPrefix);
+  }
+  dataBufferReplace(&pWriter->term, pTerm, nTerm);
+
+  return nPrefix+1;
+}
+
+/* Used to avoid a memmove when a large amount of doclist data is in
+** the buffer.  This constructs a node and term header before
+** iDoclistData and flushes the resulting complete node using
+** leafWriterInternalFlush().
+*/
+static int leafWriterInlineFlush(fulltext_vtab *v, LeafWriter *pWriter,
+                                 const char *pTerm, int nTerm,
+                                 int iDoclistData){
+  char c[VARINT_MAX+VARINT_MAX];
+  int iData, n = fts3PutVarint(c, 0);
+  n += fts3PutVarint(c+n, nTerm);
+
+  /* There should always be room for the header.  Even if pTerm shared
+  ** a substantial prefix with the previous term, the entire prefix
+  ** could be constructed from earlier data in the doclist, so there
+  ** should be room.
+  */
+  assert( iDoclistData>=n+nTerm );
+
+  iData = iDoclistData-(n+nTerm);
+  memcpy(pWriter->data.pData+iData, c, n);
+  memcpy(pWriter->data.pData+iData+n, pTerm, nTerm);
+
+  return leafWriterInternalFlush(v, pWriter, iData, pWriter->data.nData-iData);
+}
+
+/* Push pTerm[nTerm] along with the doclist data to the leaf layer of
+** %_segments.
+*/
+static int leafWriterStepMerge(fulltext_vtab *v, LeafWriter *pWriter,
+                               const char *pTerm, int nTerm,
+                               DLReader *pReaders, int nReaders){
+  char c[VARINT_MAX+VARINT_MAX];
+  int iTermData = pWriter->data.nData, iDoclistData;
+  int i, nData, n, nActualData, nActual, rc, nTermDistinct;
+
+  ASSERT_VALID_LEAF_NODE(pWriter->data.pData, pWriter->data.nData);
+  nTermDistinct = leafWriterEncodeTerm(pWriter, pTerm, nTerm);
+
+  /* Remember nTermDistinct if opening a new node. */
+  if( iTermData==0 ) pWriter->nTermDistinct = nTermDistinct;
+
+  iDoclistData = pWriter->data.nData;
+
+  /* Estimate the length of the merged doclist so we can leave space
+  ** to encode it.
+  */
+  for(i=0, nData=0; i<nReaders; i++){
+    nData += dlrAllDataBytes(&pReaders[i]);
+  }
+  n = fts3PutVarint(c, nData);
+  dataBufferAppend(&pWriter->data, c, n);
+
+  docListMerge(&pWriter->data, pReaders, nReaders);
+  ASSERT_VALID_DOCLIST(DL_DEFAULT,
+                       pWriter->data.pData+iDoclistData+n,
+                       pWriter->data.nData-iDoclistData-n, NULL);
+
+  /* The actual amount of doclist data at this point could be smaller
+  ** than the length we encoded.  Additionally, the space required to
+  ** encode this length could be smaller.  For small doclists, this is
+  ** not a big deal, we can just use memmove() to adjust things.
+  */
+  nActualData = pWriter->data.nData-(iDoclistData+n);
+  nActual = fts3PutVarint(c, nActualData);
+  assert( nActualData<=nData );
+  assert( nActual<=n );
+
+  /* If the new doclist is big enough for force a standalone leaf
+  ** node, we can immediately flush it inline without doing the
+  ** memmove().
+  */
+  /* TODO(shess) This test matches leafWriterStep(), which does this
+  ** test before it knows the cost to varint-encode the term and
+  ** doclist lengths.  At some point, change to
+  ** pWriter->data.nData-iTermData>STANDALONE_MIN.
+  */
+  if( nTerm+nActualData>STANDALONE_MIN ){
+    /* Push leaf node from before this term. */
+    if( iTermData>0 ){
+      rc = leafWriterInternalFlush(v, pWriter, 0, iTermData);
+      if( rc!=SQLITE_OK ) return rc;
+
+      pWriter->nTermDistinct = nTermDistinct;
+    }
+
+    /* Fix the encoded doclist length. */
+    iDoclistData += n - nActual;
+    memcpy(pWriter->data.pData+iDoclistData, c, nActual);
+
+    /* Push the standalone leaf node. */
+    rc = leafWriterInlineFlush(v, pWriter, pTerm, nTerm, iDoclistData);
+    if( rc!=SQLITE_OK ) return rc;
+
+    /* Leave the node empty. */
+    dataBufferReset(&pWriter->data);
+
+    return rc;
+  }
+
+  /* At this point, we know that the doclist was small, so do the
+  ** memmove if indicated.
+  */
+  if( nActual<n ){
+    memmove(pWriter->data.pData+iDoclistData+nActual,
+            pWriter->data.pData+iDoclistData+n,
+            pWriter->data.nData-(iDoclistData+n));
+    pWriter->data.nData -= n-nActual;
+  }
+
+  /* Replace written length with actual length. */
+  memcpy(pWriter->data.pData+iDoclistData, c, nActual);
+
+  /* If the node is too large, break things up. */
+  /* TODO(shess) This test matches leafWriterStep(), which does this
+  ** test before it knows the cost to varint-encode the term and
+  ** doclist lengths.  At some point, change to
+  ** pWriter->data.nData>LEAF_MAX.
+  */
+  if( iTermData+nTerm+nActualData>LEAF_MAX ){
+    /* Flush out the leading data as a node */
+    rc = leafWriterInternalFlush(v, pWriter, 0, iTermData);
+    if( rc!=SQLITE_OK ) return rc;
+
+    pWriter->nTermDistinct = nTermDistinct;
+
+    /* Rebuild header using the current term */
+    n = fts3PutVarint(pWriter->data.pData, 0);
+    n += fts3PutVarint(pWriter->data.pData+n, nTerm);
+    memcpy(pWriter->data.pData+n, pTerm, nTerm);
+    n += nTerm;
+
+    /* There should always be room, because the previous encoding
+    ** included all data necessary to construct the term.
+    */
+    assert( n<iDoclistData );
+    /* So long as STANDALONE_MIN is half or less of LEAF_MAX, the
+    ** following memcpy() is safe (as opposed to needing a memmove).
+    */
+    assert( 2*STANDALONE_MIN<=LEAF_MAX );
+    assert( n+pWriter->data.nData-iDoclistData<iDoclistData );
+    memcpy(pWriter->data.pData+n,
+           pWriter->data.pData+iDoclistData,
+           pWriter->data.nData-iDoclistData);
+    pWriter->data.nData -= iDoclistData-n;
+  }
+  ASSERT_VALID_LEAF_NODE(pWriter->data.pData, pWriter->data.nData);
+
+  return SQLITE_OK;
+}
+
+/* Push pTerm[nTerm] along with the doclist data to the leaf layer of
+** %_segments.
+*/
+/* TODO(shess) Revise writeZeroSegment() so that doclists are
+** constructed directly in pWriter->data.
+*/
+static int leafWriterStep(fulltext_vtab *v, LeafWriter *pWriter,
+                          const char *pTerm, int nTerm,
+                          const char *pData, int nData){
+  int rc;
+  DLReader reader;
+
+  dlrInit(&reader, DL_DEFAULT, pData, nData);
+  rc = leafWriterStepMerge(v, pWriter, pTerm, nTerm, &reader, 1);
+  dlrDestroy(&reader);
+
+  return rc;
+}
+
+
+/****************************************************************/
+/* LeafReader is used to iterate over an individual leaf node. */
+typedef struct LeafReader {
+  DataBuffer term;          /* copy of current term. */
+
+  const char *pData;        /* data for current term. */
+  int nData;
+} LeafReader;
+
+static void leafReaderDestroy(LeafReader *pReader){
+  dataBufferDestroy(&pReader->term);
+  SCRAMBLE(pReader);
+}
+
+static int leafReaderAtEnd(LeafReader *pReader){
+  return pReader->nData<=0;
+}
+
+/* Access the current term. */
+static int leafReaderTermBytes(LeafReader *pReader){
+  return pReader->term.nData;
+}
+static const char *leafReaderTerm(LeafReader *pReader){
+  assert( pReader->term.nData>0 );
+  return pReader->term.pData;
+}
+
+/* Access the doclist data for the current term. */
+static int leafReaderDataBytes(LeafReader *pReader){
+  int nData;
+  assert( pReader->term.nData>0 );
+  fts3GetVarint32(pReader->pData, &nData);
+  return nData;
+}
+static const char *leafReaderData(LeafReader *pReader){
+  int n, nData;
+  assert( pReader->term.nData>0 );
+  n = fts3GetVarint32(pReader->pData, &nData);
+  return pReader->pData+n;
+}
+
+static void leafReaderInit(const char *pData, int nData,
+                           LeafReader *pReader){
+  int nTerm, n;
+
+  assert( nData>0 );
+  assert( pData[0]=='\0' );
+
+  CLEAR(pReader);
+
+  /* Read the first term, skipping the header byte. */
+  n = fts3GetVarint32(pData+1, &nTerm);
+  dataBufferInit(&pReader->term, nTerm);
+  dataBufferReplace(&pReader->term, pData+1+n, nTerm);
+
+  /* Position after the first term. */
+  assert( 1+n+nTerm<nData );
+  pReader->pData = pData+1+n+nTerm;
+  pReader->nData = nData-1-n-nTerm;
+}
+
+/* Step the reader forward to the next term. */
+static void leafReaderStep(LeafReader *pReader){
+  int n, nData, nPrefix, nSuffix;
+  assert( !leafReaderAtEnd(pReader) );
+
+  /* Skip previous entry's data block. */
+  n = fts3GetVarint32(pReader->pData, &nData);
+  assert( n+nData<=pReader->nData );
+  pReader->pData += n+nData;
+  pReader->nData -= n+nData;
+
+  if( !leafReaderAtEnd(pReader) ){
+    /* Construct the new term using a prefix from the old term plus a
+    ** suffix from the leaf data.
+    */
+    n = fts3GetVarint32(pReader->pData, &nPrefix);
+    n += fts3GetVarint32(pReader->pData+n, &nSuffix);
+    assert( n+nSuffix<pReader->nData );
+    pReader->term.nData = nPrefix;
+    dataBufferAppend(&pReader->term, pReader->pData+n, nSuffix);
+
+    pReader->pData += n+nSuffix;
+    pReader->nData -= n+nSuffix;
+  }
+}
+
+/* strcmp-style comparison of pReader's current term against pTerm.
+** If isPrefix, equality means equal through nTerm bytes.
+*/
+static int leafReaderTermCmp(LeafReader *pReader,
+                             const char *pTerm, int nTerm, int isPrefix){
+  int c, n = pReader->term.nData<nTerm ? pReader->term.nData : nTerm;
+  if( n==0 ){
+    if( pReader->term.nData>0 ) return -1;
+    if(nTerm>0 ) return 1;
+    return 0;
+  }
+
+  c = memcmp(pReader->term.pData, pTerm, n);
+  if( c!=0 ) return c;
+  if( isPrefix && n==nTerm ) return 0;
+  return pReader->term.nData - nTerm;
+}
+
+
+/****************************************************************/
+/* LeavesReader wraps LeafReader to allow iterating over the entire
+** leaf layer of the tree.
+*/
+typedef struct LeavesReader {
+  int idx;                  /* Index within the segment. */
+
+  sqlite3_stmt *pStmt;      /* Statement we're streaming leaves from. */
+  int eof;                  /* we've seen SQLITE_DONE from pStmt. */
+
+  LeafReader leafReader;    /* reader for the current leaf. */
+  DataBuffer rootData;      /* root data for inline. */
+} LeavesReader;
+
+/* Access the current term. */
+static int leavesReaderTermBytes(LeavesReader *pReader){
+  assert( !pReader->eof );
+  return leafReaderTermBytes(&pReader->leafReader);
+}
+static const char *leavesReaderTerm(LeavesReader *pReader){
+  assert( !pReader->eof );
+  return leafReaderTerm(&pReader->leafReader);
+}
+
+/* Access the doclist data for the current term. */
+static int leavesReaderDataBytes(LeavesReader *pReader){
+  assert( !pReader->eof );
+  return leafReaderDataBytes(&pReader->leafReader);
+}
+static const char *leavesReaderData(LeavesReader *pReader){
+  assert( !pReader->eof );
+  return leafReaderData(&pReader->leafReader);
+}
+
+static int leavesReaderAtEnd(LeavesReader *pReader){
+  return pReader->eof;
+}
+
+/* loadSegmentLeaves() may not read all the way to SQLITE_DONE, thus
+** leaving the statement handle open, which locks the table.
+*/
+/* TODO(shess) This "solution" is not satisfactory.  Really, there
+** should be check-in function for all statement handles which
+** arranges to call sqlite3_reset().  This most likely will require
+** modification to control flow all over the place, though, so for now
+** just punt.
+**
+** Note the the current system assumes that segment merges will run to
+** completion, which is why this particular probably hasn't arisen in
+** this case.  Probably a brittle assumption.
+*/
+static int leavesReaderReset(LeavesReader *pReader){
+  return sqlite3_reset(pReader->pStmt);
+}
+
+static void leavesReaderDestroy(LeavesReader *pReader){
+  leafReaderDestroy(&pReader->leafReader);
+  dataBufferDestroy(&pReader->rootData);
+  SCRAMBLE(pReader);
+}
+
+/* Initialize pReader with the given root data (if iStartBlockid==0
+** the leaf data was entirely contained in the root), or from the
+** stream of blocks between iStartBlockid and iEndBlockid, inclusive.
+*/
+static int leavesReaderInit(fulltext_vtab *v,
+                            int idx,
+                            sqlite_int64 iStartBlockid,
+                            sqlite_int64 iEndBlockid,
+                            const char *pRootData, int nRootData,
+                            LeavesReader *pReader){
+  CLEAR(pReader);
+  pReader->idx = idx;
+
+  dataBufferInit(&pReader->rootData, 0);
+  if( iStartBlockid==0 ){
+    /* Entire leaf level fit in root data. */
+    dataBufferReplace(&pReader->rootData, pRootData, nRootData);
+    leafReaderInit(pReader->rootData.pData, pReader->rootData.nData,
+                   &pReader->leafReader);
+  }else{
+    sqlite3_stmt *s;
+    int rc = sql_get_leaf_statement(v, idx, &s);
+    if( rc!=SQLITE_OK ) return rc;
+
+    rc = sqlite3_bind_int64(s, 1, iStartBlockid);
+    if( rc!=SQLITE_OK ) return rc;
+
+    rc = sqlite3_bind_int64(s, 2, iEndBlockid);
+    if( rc!=SQLITE_OK ) return rc;
+
+    rc = sqlite3_step(s);
+    if( rc==SQLITE_DONE ){
+      pReader->eof = 1;
+      return SQLITE_OK;
+    }
+    if( rc!=SQLITE_ROW ) return rc;
+
+    pReader->pStmt = s;
+    leafReaderInit(sqlite3_column_blob(pReader->pStmt, 0),
+                   sqlite3_column_bytes(pReader->pStmt, 0),
+                   &pReader->leafReader);
+  }
+  return SQLITE_OK;
+}
+
+/* Step the current leaf forward to the next term.  If we reach the
+** end of the current leaf, step forward to the next leaf block.
+*/
+static int leavesReaderStep(fulltext_vtab *v, LeavesReader *pReader){
+  assert( !leavesReaderAtEnd(pReader) );
+  leafReaderStep(&pReader->leafReader);
+
+  if( leafReaderAtEnd(&pReader->leafReader) ){
+    int rc;
+    if( pReader->rootData.pData ){
+      pReader->eof = 1;
+      return SQLITE_OK;
+    }
+    rc = sqlite3_step(pReader->pStmt);
+    if( rc!=SQLITE_ROW ){
+      pReader->eof = 1;
+      return rc==SQLITE_DONE ? SQLITE_OK : rc;
+    }
+    leafReaderDestroy(&pReader->leafReader);
+    leafReaderInit(sqlite3_column_blob(pReader->pStmt, 0),
+                   sqlite3_column_bytes(pReader->pStmt, 0),
+                   &pReader->leafReader);
+  }
+  return SQLITE_OK;
+}
+
+/* Order LeavesReaders by their term, ignoring idx.  Readers at eof
+** always sort to the end.
+*/
+static int leavesReaderTermCmp(LeavesReader *lr1, LeavesReader *lr2){
+  if( leavesReaderAtEnd(lr1) ){
+    if( leavesReaderAtEnd(lr2) ) return 0;
+    return 1;
+  }
+  if( leavesReaderAtEnd(lr2) ) return -1;
+
+  return leafReaderTermCmp(&lr1->leafReader,
+                           leavesReaderTerm(lr2), leavesReaderTermBytes(lr2),
+                           0);
+}
+
+/* Similar to leavesReaderTermCmp(), with additional ordering by idx
+** so that older segments sort before newer segments.
+*/
+static int leavesReaderCmp(LeavesReader *lr1, LeavesReader *lr2){
+  int c = leavesReaderTermCmp(lr1, lr2);
+  if( c!=0 ) return c;
+  return lr1->idx-lr2->idx;
+}
+
+/* Assume that pLr[1]..pLr[nLr] are sorted.  Bubble pLr[0] into its
+** sorted position.
+*/
+static void leavesReaderReorder(LeavesReader *pLr, int nLr){
+  while( nLr>1 && leavesReaderCmp(pLr, pLr+1)>0 ){
+    LeavesReader tmp = pLr[0];
+    pLr[0] = pLr[1];
+    pLr[1] = tmp;
+    nLr--;
+    pLr++;
+  }
+}
+
+/* Initializes pReaders with the segments from level iLevel, returning
+** the number of segments in *piReaders.  Leaves pReaders in sorted
+** order.
+*/
+static int leavesReadersInit(fulltext_vtab *v, int iLevel,
+                             LeavesReader *pReaders, int *piReaders){
+  sqlite3_stmt *s;
+  int i, rc = sql_get_statement(v, SEGDIR_SELECT_STMT, &s);
+  if( rc!=SQLITE_OK ) return rc;
+
+  rc = sqlite3_bind_int(s, 1, iLevel);
+  if( rc!=SQLITE_OK ) return rc;
+
+  i = 0;
+  while( (rc = sqlite3_step(s))==SQLITE_ROW ){
+    sqlite_int64 iStart = sqlite3_column_int64(s, 0);
+    sqlite_int64 iEnd = sqlite3_column_int64(s, 1);
+    const char *pRootData = sqlite3_column_blob(s, 2);
+    int nRootData = sqlite3_column_bytes(s, 2);
+
+    assert( i<MERGE_COUNT );
+    rc = leavesReaderInit(v, i, iStart, iEnd, pRootData, nRootData,
+                          &pReaders[i]);
+    if( rc!=SQLITE_OK ) break;
+
+    i++;
+  }
+  if( rc!=SQLITE_DONE ){
+    while( i-->0 ){
+      leavesReaderDestroy(&pReaders[i]);
+    }
+    return rc;
+  }
+
+  *piReaders = i;
+
+  /* Leave our results sorted by term, then age. */
+  while( i-- ){
+    leavesReaderReorder(pReaders+i, *piReaders-i);
+  }
+  return SQLITE_OK;
+}
+
+/* Merge doclists from pReaders[nReaders] into a single doclist, which
+** is written to pWriter.  Assumes pReaders is ordered oldest to
+** newest.
+*/
+/* TODO(shess) Consider putting this inline in segmentMerge(). */
+static int leavesReadersMerge(fulltext_vtab *v,
+                              LeavesReader *pReaders, int nReaders,
+                              LeafWriter *pWriter){
+  DLReader dlReaders[MERGE_COUNT];
+  const char *pTerm = leavesReaderTerm(pReaders);
+  int i, nTerm = leavesReaderTermBytes(pReaders);
+
+  assert( nReaders<=MERGE_COUNT );
+
+  for(i=0; i<nReaders; i++){
+    dlrInit(&dlReaders[i], DL_DEFAULT,
+            leavesReaderData(pReaders+i),
+            leavesReaderDataBytes(pReaders+i));
+  }
+
+  return leafWriterStepMerge(v, pWriter, pTerm, nTerm, dlReaders, nReaders);
+}
+
+/* Forward ref due to mutual recursion with segdirNextIndex(). */
+static int segmentMerge(fulltext_vtab *v, int iLevel);
+
+/* Put the next available index at iLevel into *pidx.  If iLevel
+** already has MERGE_COUNT segments, they are merged to a higher
+** level to make room.
+*/
+static int segdirNextIndex(fulltext_vtab *v, int iLevel, int *pidx){
+  int rc = segdir_max_index(v, iLevel, pidx);
+  if( rc==SQLITE_DONE ){              /* No segments at iLevel. */
+    *pidx = 0;
+  }else if( rc==SQLITE_ROW ){
+    if( *pidx==(MERGE_COUNT-1) ){
+      rc = segmentMerge(v, iLevel);
+      if( rc!=SQLITE_OK ) return rc;
+      *pidx = 0;
+    }else{
+      (*pidx)++;
+    }
+  }else{
+    return rc;
+  }
+  return SQLITE_OK;
+}
+
+/* Merge MERGE_COUNT segments at iLevel into a new segment at
+** iLevel+1.  If iLevel+1 is already full of segments, those will be
+** merged to make room.
+*/
+static int segmentMerge(fulltext_vtab *v, int iLevel){
+  LeafWriter writer;
+  LeavesReader lrs[MERGE_COUNT];
+  int i, rc, idx = 0;
+
+  /* Determine the next available segment index at the next level,
+  ** merging as necessary.
+  */
+  rc = segdirNextIndex(v, iLevel+1, &idx);
+  if( rc!=SQLITE_OK ) return rc;
+
+  /* TODO(shess) This assumes that we'll always see exactly
+  ** MERGE_COUNT segments to merge at a given level.  That will be
+  ** broken if we allow the developer to request preemptive or
+  ** deferred merging.
+  */
+  memset(&lrs, '\0', sizeof(lrs));
+  rc = leavesReadersInit(v, iLevel, lrs, &i);
+  if( rc!=SQLITE_OK ) return rc;
+  assert( i==MERGE_COUNT );
+
+  leafWriterInit(iLevel+1, idx, &writer);
+
+  /* Since leavesReaderReorder() pushes readers at eof to the end,
+  ** when the first reader is empty, all will be empty.
+  */
+  while( !leavesReaderAtEnd(lrs) ){
+    /* Figure out how many readers share their next term. */
+    for(i=1; i<MERGE_COUNT && !leavesReaderAtEnd(lrs+i); i++){
+      if( 0!=leavesReaderTermCmp(lrs, lrs+i) ) break;
+    }
+
+    rc = leavesReadersMerge(v, lrs, i, &writer);
+    if( rc!=SQLITE_OK ) goto err;
+
+    /* Step forward those that were merged. */
+    while( i-->0 ){
+      rc = leavesReaderStep(v, lrs+i);
+      if( rc!=SQLITE_OK ) goto err;
+
+      /* Reorder by term, then by age. */
+      leavesReaderReorder(lrs+i, MERGE_COUNT-i);
+    }
+  }
+
+  for(i=0; i<MERGE_COUNT; i++){
+    leavesReaderDestroy(&lrs[i]);
+  }
+
+  rc = leafWriterFinalize(v, &writer);
+  leafWriterDestroy(&writer);
+  if( rc!=SQLITE_OK ) return rc;
+
+  /* Delete the merged segment data. */
+  return segdir_delete(v, iLevel);
+
+ err:
+  for(i=0; i<MERGE_COUNT; i++){
+    leavesReaderDestroy(&lrs[i]);
+  }
+  leafWriterDestroy(&writer);
+  return rc;
+}
+
+/* Accumulate the union of *acc and *pData into *acc. */
+static void docListAccumulateUnion(DataBuffer *acc,
+                                   const char *pData, int nData) {
+  DataBuffer tmp = *acc;
+  dataBufferInit(acc, tmp.nData+nData);
+  docListUnion(tmp.pData, tmp.nData, pData, nData, acc);
+  dataBufferDestroy(&tmp);
+}
+
+/* TODO(shess) It might be interesting to explore different merge
+** strategies, here.  For instance, since this is a sorted merge, we
+** could easily merge many doclists in parallel.  With some
+** comprehension of the storage format, we could merge all of the
+** doclists within a leaf node directly from the leaf node's storage.
+** It may be worthwhile to merge smaller doclists before larger
+** doclists, since they can be traversed more quickly - but the
+** results may have less overlap, making them more expensive in a
+** different way.
+*/
+
+/* Scan pReader for pTerm/nTerm, and merge the term's doclist over
+** *out (any doclists with duplicate docids overwrite those in *out).
+** Internal function for loadSegmentLeaf().
+*/
+static int loadSegmentLeavesInt(fulltext_vtab *v, LeavesReader *pReader,
+                                const char *pTerm, int nTerm, int isPrefix,
+                                DataBuffer *out){
+  /* doclist data is accumulated into pBuffers similar to how one does
+  ** increment in binary arithmetic.  If index 0 is empty, the data is
+  ** stored there.  If there is data there, it is merged and the
+  ** results carried into position 1, with further merge-and-carry
+  ** until an empty position is found.
+  */
+  DataBuffer *pBuffers = NULL;
+  int nBuffers = 0, nMaxBuffers = 0, rc;
+
+  assert( nTerm>0 );
+
+  for(rc=SQLITE_OK; rc==SQLITE_OK && !leavesReaderAtEnd(pReader);
+      rc=leavesReaderStep(v, pReader)){
+    /* TODO(shess) Really want leavesReaderTermCmp(), but that name is
+    ** already taken to compare the terms of two LeavesReaders.  Think
+    ** on a better name.  [Meanwhile, break encapsulation rather than
+    ** use a confusing name.]
+    */
+    int c = leafReaderTermCmp(&pReader->leafReader, pTerm, nTerm, isPrefix);
+    if( c>0 ) break;      /* Past any possible matches. */
+    if( c==0 ){
+      const char *pData = leavesReaderData(pReader);
+      int iBuffer, nData = leavesReaderDataBytes(pReader);
+
+      /* Find the first empty buffer. */
+      for(iBuffer=0; iBuffer<nBuffers; ++iBuffer){
+        if( 0==pBuffers[iBuffer].nData ) break;
+      }
+
+      /* Out of buffers, add an empty one. */
+      if( iBuffer==nBuffers ){
+        if( nBuffers==nMaxBuffers ){
+          DataBuffer *p;
+          nMaxBuffers += 20;
+
+          /* Manual realloc so we can handle NULL appropriately. */
+          p = sqlite3_malloc(nMaxBuffers*sizeof(*pBuffers));
+          if( p==NULL ){
+            rc = SQLITE_NOMEM;
+            break;
+          }
+
+          if( nBuffers>0 ){
+            assert(pBuffers!=NULL);
+            memcpy(p, pBuffers, nBuffers*sizeof(*pBuffers));
+            sqlite3_free(pBuffers);
+          }
+          pBuffers = p;
+        }
+        dataBufferInit(&(pBuffers[nBuffers]), 0);
+        nBuffers++;
+      }
+
+      /* At this point, must have an empty at iBuffer. */
+      assert(iBuffer<nBuffers && pBuffers[iBuffer].nData==0);
+
+      /* If empty was first buffer, no need for merge logic. */
+      if( iBuffer==0 ){
+        dataBufferReplace(&(pBuffers[0]), pData, nData);
+      }else{
+        /* pAcc is the empty buffer the merged data will end up in. */
+        DataBuffer *pAcc = &(pBuffers[iBuffer]);
+        DataBuffer *p = &(pBuffers[0]);
+
+        /* Handle position 0 specially to avoid need to prime pAcc
+        ** with pData/nData.
+        */
+        dataBufferSwap(p, pAcc);
+        docListAccumulateUnion(pAcc, pData, nData);
+
+        /* Accumulate remaining doclists into pAcc. */
+        for(++p; p<pAcc; ++p){
+          docListAccumulateUnion(pAcc, p->pData, p->nData);
+
+          /* dataBufferReset() could allow a large doclist to blow up
+          ** our memory requirements.
+          */
+          if( p->nCapacity<1024 ){
+            dataBufferReset(p);
+          }else{
+            dataBufferDestroy(p);
+            dataBufferInit(p, 0);
+          }
+        }
+      }
+    }
+  }
+
+  /* Union all the doclists together into *out. */
+  /* TODO(shess) What if *out is big?  Sigh. */
+  if( rc==SQLITE_OK && nBuffers>0 ){
+    int iBuffer;
+    for(iBuffer=0; iBuffer<nBuffers; ++iBuffer){
+      if( pBuffers[iBuffer].nData>0 ){
+        if( out->nData==0 ){
+          dataBufferSwap(out, &(pBuffers[iBuffer]));
+        }else{
+          docListAccumulateUnion(out, pBuffers[iBuffer].pData,
+                                 pBuffers[iBuffer].nData);
+        }
+      }
+    }
+  }
+
+  while( nBuffers-- ){
+    dataBufferDestroy(&(pBuffers[nBuffers]));
+  }
+  if( pBuffers!=NULL ) sqlite3_free(pBuffers);
+
+  return rc;
+}
+
+/* Call loadSegmentLeavesInt() with pData/nData as input. */
+static int loadSegmentLeaf(fulltext_vtab *v, const char *pData, int nData,
+                           const char *pTerm, int nTerm, int isPrefix,
+                           DataBuffer *out){
+  LeavesReader reader;
+  int rc;
+
+  assert( nData>1 );
+  assert( *pData=='\0' );
+  rc = leavesReaderInit(v, 0, 0, 0, pData, nData, &reader);
+  if( rc!=SQLITE_OK ) return rc;
+
+  rc = loadSegmentLeavesInt(v, &reader, pTerm, nTerm, isPrefix, out);
+  leavesReaderReset(&reader);
+  leavesReaderDestroy(&reader);
+  return rc;
+}
+
+/* Call loadSegmentLeavesInt() with the leaf nodes from iStartLeaf to
+** iEndLeaf (inclusive) as input, and merge the resulting doclist into
+** out.
+*/
+static int loadSegmentLeaves(fulltext_vtab *v,
+                             sqlite_int64 iStartLeaf, sqlite_int64 iEndLeaf,
+                             const char *pTerm, int nTerm, int isPrefix,
+                             DataBuffer *out){
+  int rc;
+  LeavesReader reader;
+
+  assert( iStartLeaf<=iEndLeaf );
+  rc = leavesReaderInit(v, 0, iStartLeaf, iEndLeaf, NULL, 0, &reader);
+  if( rc!=SQLITE_OK ) return rc;
+
+  rc = loadSegmentLeavesInt(v, &reader, pTerm, nTerm, isPrefix, out);
+  leavesReaderReset(&reader);
+  leavesReaderDestroy(&reader);
+  return rc;
+}
+
+/* Taking pData/nData as an interior node, find the sequence of child
+** nodes which could include pTerm/nTerm/isPrefix.  Note that the
+** interior node terms logically come between the blocks, so there is
+** one more blockid than there are terms (that block contains terms >=
+** the last interior-node term).
+*/
+/* TODO(shess) The calling code may already know that the end child is
+** not worth calculating, because the end may be in a later sibling
+** node.  Consider whether breaking symmetry is worthwhile.  I suspect
+** it is not worthwhile.
+*/
+static void getChildrenContaining(const char *pData, int nData,
+                                  const char *pTerm, int nTerm, int isPrefix,
+                                  sqlite_int64 *piStartChild,
+                                  sqlite_int64 *piEndChild){
+  InteriorReader reader;
+
+  assert( nData>1 );
+  assert( *pData!='\0' );
+  interiorReaderInit(pData, nData, &reader);
+
+  /* Scan for the first child which could contain pTerm/nTerm. */
+  while( !interiorReaderAtEnd(&reader) ){
+    if( interiorReaderTermCmp(&reader, pTerm, nTerm, 0)>0 ) break;
+    interiorReaderStep(&reader);
+  }
+  *piStartChild = interiorReaderCurrentBlockid(&reader);
+
+  /* Keep scanning to find a term greater than our term, using prefix
+  ** comparison if indicated.  If isPrefix is false, this will be the
+  ** same blockid as the starting block.
+  */
+  while( !interiorReaderAtEnd(&reader) ){
+    if( interiorReaderTermCmp(&reader, pTerm, nTerm, isPrefix)>0 ) break;
+    interiorReaderStep(&reader);
+  }
+  *piEndChild = interiorReaderCurrentBlockid(&reader);
+
+  interiorReaderDestroy(&reader);
+
+  /* Children must ascend, and if !prefix, both must be the same. */
+  assert( *piEndChild>=*piStartChild );
+  assert( isPrefix || *piStartChild==*piEndChild );
+}
+
+/* Read block at iBlockid and pass it with other params to
+** getChildrenContaining().
+*/
+static int loadAndGetChildrenContaining(
+  fulltext_vtab *v,
+  sqlite_int64 iBlockid,
+  const char *pTerm, int nTerm, int isPrefix,
+  sqlite_int64 *piStartChild, sqlite_int64 *piEndChild
+){
+  sqlite3_stmt *s = NULL;
+  int rc;
+
+  assert( iBlockid!=0 );
+  assert( pTerm!=NULL );
+  assert( nTerm!=0 );        /* TODO(shess) Why not allow this? */
+  assert( piStartChild!=NULL );
+  assert( piEndChild!=NULL );
+
+  rc = sql_get_statement(v, BLOCK_SELECT_STMT, &s);
+  if( rc!=SQLITE_OK ) return rc;
+
+  rc = sqlite3_bind_int64(s, 1, iBlockid);
+  if( rc!=SQLITE_OK ) return rc;
+
+  rc = sqlite3_step(s);
+  if( rc==SQLITE_DONE ) return SQLITE_ERROR;
+  if( rc!=SQLITE_ROW ) return rc;
+
+  getChildrenContaining(sqlite3_column_blob(s, 0), sqlite3_column_bytes(s, 0),
+                        pTerm, nTerm, isPrefix, piStartChild, piEndChild);
+
+  /* We expect only one row.  We must execute another sqlite3_step()
+   * to complete the iteration; otherwise the table will remain
+   * locked. */
+  rc = sqlite3_step(s);
+  if( rc==SQLITE_ROW ) return SQLITE_ERROR;
+  if( rc!=SQLITE_DONE ) return rc;
+
+  return SQLITE_OK;
+}
+
+/* Traverse the tree represented by pData[nData] looking for
+** pTerm[nTerm], placing its doclist into *out.  This is internal to
+** loadSegment() to make error-handling cleaner.
+*/
+static int loadSegmentInt(fulltext_vtab *v, const char *pData, int nData,
+                          sqlite_int64 iLeavesEnd,
+                          const char *pTerm, int nTerm, int isPrefix,
+                          DataBuffer *out){
+  /* Special case where root is a leaf. */
+  if( *pData=='\0' ){
+    return loadSegmentLeaf(v, pData, nData, pTerm, nTerm, isPrefix, out);
+  }else{
+    int rc;
+    sqlite_int64 iStartChild, iEndChild;
+
+    /* Process pData as an interior node, then loop down the tree
+    ** until we find the set of leaf nodes to scan for the term.
+    */
+    getChildrenContaining(pData, nData, pTerm, nTerm, isPrefix,
+                          &iStartChild, &iEndChild);
+    while( iStartChild>iLeavesEnd ){
+      sqlite_int64 iNextStart, iNextEnd;
+      rc = loadAndGetChildrenContaining(v, iStartChild, pTerm, nTerm, isPrefix,
+                                        &iNextStart, &iNextEnd);
+      if( rc!=SQLITE_OK ) return rc;
+
+      /* If we've branched, follow the end branch, too. */
+      if( iStartChild!=iEndChild ){
+        sqlite_int64 iDummy;
+        rc = loadAndGetChildrenContaining(v, iEndChild, pTerm, nTerm, isPrefix,
+                                          &iDummy, &iNextEnd);
+        if( rc!=SQLITE_OK ) return rc;
+      }
+
+      assert( iNextStart<=iNextEnd );
+      iStartChild = iNextStart;
+      iEndChild = iNextEnd;
+    }
+    assert( iStartChild<=iLeavesEnd );
+    assert( iEndChild<=iLeavesEnd );
+
+    /* Scan through the leaf segments for doclists. */
+    return loadSegmentLeaves(v, iStartChild, iEndChild,
+                             pTerm, nTerm, isPrefix, out);
+  }
+}
+
+/* Call loadSegmentInt() to collect the doclist for pTerm/nTerm, then
+** merge its doclist over *out (any duplicate doclists read from the
+** segment rooted at pData will overwrite those in *out).
+*/
+/* TODO(shess) Consider changing this to determine the depth of the
+** leaves using either the first characters of interior nodes (when
+** ==1, we're one level above the leaves), or the first character of
+** the root (which will describe the height of the tree directly).
+** Either feels somewhat tricky to me.
+*/
+/* TODO(shess) The current merge is likely to be slow for large
+** doclists (though it should process from newest/smallest to
+** oldest/largest, so it may not be that bad).  It might be useful to
+** modify things to allow for N-way merging.  This could either be
+** within a segment, with pairwise merges across segments, or across
+** all segments at once.
+*/
+static int loadSegment(fulltext_vtab *v, const char *pData, int nData,
+                       sqlite_int64 iLeavesEnd,
+                       const char *pTerm, int nTerm, int isPrefix,
+                       DataBuffer *out){
+  DataBuffer result;
+  int rc;
+
+  assert( nData>1 );
+
+  /* This code should never be called with buffered updates. */
+  assert( v->nPendingData<0 );
+
+  dataBufferInit(&result, 0);
+  rc = loadSegmentInt(v, pData, nData, iLeavesEnd,
+                      pTerm, nTerm, isPrefix, &result);
+  if( rc==SQLITE_OK && result.nData>0 ){
+    if( out->nData==0 ){
+      DataBuffer tmp = *out;
+      *out = result;
+      result = tmp;
+    }else{
+      DataBuffer merged;
+      DLReader readers[2];
+
+      dlrInit(&readers[0], DL_DEFAULT, out->pData, out->nData);
+      dlrInit(&readers[1], DL_DEFAULT, result.pData, result.nData);
+      dataBufferInit(&merged, out->nData+result.nData);
+      docListMerge(&merged, readers, 2);
+      dataBufferDestroy(out);
+      *out = merged;
+      dlrDestroy(&readers[0]);
+      dlrDestroy(&readers[1]);
+    }
+  }
+  dataBufferDestroy(&result);
+  return rc;
+}
+
+/* Scan the database and merge together the posting lists for the term
+** into *out.
+*/
+static int termSelect(fulltext_vtab *v, int iColumn,
+                      const char *pTerm, int nTerm, int isPrefix,
+                      DocListType iType, DataBuffer *out){
+  DataBuffer doclist;
+  sqlite3_stmt *s;
+  int rc = sql_get_statement(v, SEGDIR_SELECT_ALL_STMT, &s);
+  if( rc!=SQLITE_OK ) return rc;
+
+  /* This code should never be called with buffered updates. */
+  assert( v->nPendingData<0 );
+
+  dataBufferInit(&doclist, 0);
+
+  /* Traverse the segments from oldest to newest so that newer doclist
+  ** elements for given docids overwrite older elements.
+  */
+  while( (rc = sqlite3_step(s))==SQLITE_ROW ){
+    const char *pData = sqlite3_column_blob(s, 0);
+    const int nData = sqlite3_column_bytes(s, 0);
+    const sqlite_int64 iLeavesEnd = sqlite3_column_int64(s, 1);
+    rc = loadSegment(v, pData, nData, iLeavesEnd, pTerm, nTerm, isPrefix,
+                     &doclist);
+    if( rc!=SQLITE_OK ) goto err;
+  }
+  if( rc==SQLITE_DONE ){
+    if( doclist.nData!=0 ){
+      /* TODO(shess) The old term_select_all() code applied the column
+      ** restrict as we merged segments, leading to smaller buffers.
+      ** This is probably worthwhile to bring back, once the new storage
+      ** system is checked in.
+      */
+      if( iColumn==v->nColumn) iColumn = -1;
+      docListTrim(DL_DEFAULT, doclist.pData, doclist.nData,
+                  iColumn, iType, out);
+    }
+    rc = SQLITE_OK;
+  }
+
+ err:
+  dataBufferDestroy(&doclist);
+  return rc;
+}
+
+/****************************************************************/
+/* Used to hold hashtable data for sorting. */
+typedef struct TermData {
+  const char *pTerm;
+  int nTerm;
+  DLCollector *pCollector;
+} TermData;
+
+/* Orders TermData elements in strcmp fashion ( <0 for less-than, 0
+** for equal, >0 for greater-than).
+*/
+static int termDataCmp(const void *av, const void *bv){
+  const TermData *a = (const TermData *)av;
+  const TermData *b = (const TermData *)bv;
+  int n = a->nTerm<b->nTerm ? a->nTerm : b->nTerm;
+  int c = memcmp(a->pTerm, b->pTerm, n);
+  if( c!=0 ) return c;
+  return a->nTerm-b->nTerm;
+}
+
+/* Order pTerms data by term, then write a new level 0 segment using
+** LeafWriter.
+*/
+static int writeZeroSegment(fulltext_vtab *v, fts3Hash *pTerms){
+  fts3HashElem *e;
+  int idx, rc, i, n;
+  TermData *pData;
+  LeafWriter writer;
+  DataBuffer dl;
+
+  /* Determine the next index at level 0, merging as necessary. */
+  rc = segdirNextIndex(v, 0, &idx);
+  if( rc!=SQLITE_OK ) return rc;
+
+  n = fts3HashCount(pTerms);
+  pData = sqlite3_malloc(n*sizeof(TermData));
+
+  for(i = 0, e = fts3HashFirst(pTerms); e; i++, e = fts3HashNext(e)){
+    assert( i<n );
+    pData[i].pTerm = fts3HashKey(e);
+    pData[i].nTerm = fts3HashKeysize(e);
+    pData[i].pCollector = fts3HashData(e);
+  }
+  assert( i==n );
+
+  /* TODO(shess) Should we allow user-defined collation sequences,
+  ** here?  I think we only need that once we support prefix searches.
+  */
+  if( n>1 ) qsort(pData, n, sizeof(*pData), termDataCmp);
+
+  /* TODO(shess) Refactor so that we can write directly to the segment
+  ** DataBuffer, as happens for segment merges.
+  */
+  leafWriterInit(0, idx, &writer);
+  dataBufferInit(&dl, 0);
+  for(i=0; i<n; i++){
+    dataBufferReset(&dl);
+    dlcAddDoclist(pData[i].pCollector, &dl);
+    rc = leafWriterStep(v, &writer,
+                        pData[i].pTerm, pData[i].nTerm, dl.pData, dl.nData);
+    if( rc!=SQLITE_OK ) goto err;
+  }
+  rc = leafWriterFinalize(v, &writer);
+
+ err:
+  dataBufferDestroy(&dl);
+  sqlite3_free(pData);
+  leafWriterDestroy(&writer);
+  return rc;
+}
+
+/* If pendingTerms has data, free it. */
+static int clearPendingTerms(fulltext_vtab *v){
+  if( v->nPendingData>=0 ){
+    fts3HashElem *e;
+    for(e=fts3HashFirst(&v->pendingTerms); e; e=fts3HashNext(e)){
+      dlcDelete(fts3HashData(e));
+    }
+    fts3HashClear(&v->pendingTerms);
+    v->nPendingData = -1;
+  }
+  return SQLITE_OK;
+}
+
+/* If pendingTerms has data, flush it to a level-zero segment, and
+** free it.
+*/
+static int flushPendingTerms(fulltext_vtab *v){
+  if( v->nPendingData>=0 ){
+    int rc = writeZeroSegment(v, &v->pendingTerms);
+    if( rc==SQLITE_OK ) clearPendingTerms(v);
+    return rc;
+  }
+  return SQLITE_OK;
+}
+
+/* If pendingTerms is "too big", or docid is out of order, flush it.
+** Regardless, be certain that pendingTerms is initialized for use.
+*/
+static int initPendingTerms(fulltext_vtab *v, sqlite_int64 iDocid){
+  /* TODO(shess) Explore whether partially flushing the buffer on
+  ** forced-flush would provide better performance.  I suspect that if
+  ** we ordered the doclists by size and flushed the largest until the
+  ** buffer was half empty, that would let the less frequent terms
+  ** generate longer doclists.
+  */
+  if( iDocid<=v->iPrevDocid || v->nPendingData>kPendingThreshold ){
+    int rc = flushPendingTerms(v);
+    if( rc!=SQLITE_OK ) return rc;
+  }
+  if( v->nPendingData<0 ){
+    fts3HashInit(&v->pendingTerms, FTS3_HASH_STRING, 1);
+    v->nPendingData = 0;
+  }
+  v->iPrevDocid = iDocid;
+  return SQLITE_OK;
+}
+
+/* This function implements the xUpdate callback; it is the top-level entry
+ * point for inserting, deleting or updating a row in a full-text table. */
+static int fulltextUpdate(sqlite3_vtab *pVtab, int nArg, sqlite3_value **ppArg,
+                          sqlite_int64 *pRowid){
+  fulltext_vtab *v = (fulltext_vtab *) pVtab;
+  int rc;
+
+  FTSTRACE(("FTS3 Update %p\n", pVtab));
+
+  if( nArg<2 ){
+    rc = index_delete(v, sqlite3_value_int64(ppArg[0]));
+  } else if( sqlite3_value_type(ppArg[0]) != SQLITE_NULL ){
+    /* An update:
+     * ppArg[0] = old rowid
+     * ppArg[1] = new rowid
+     * ppArg[2..2+v->nColumn-1] = values
+     * ppArg[2+v->nColumn] = value for magic column (we ignore this)
+     * ppArg[2+v->nColumn+1] = value for docid
+     */
+    sqlite_int64 rowid = sqlite3_value_int64(ppArg[0]);
+    if( sqlite3_value_type(ppArg[1]) != SQLITE_INTEGER ||
+        sqlite3_value_int64(ppArg[1]) != rowid ){
+      rc = SQLITE_ERROR;  /* we don't allow changing the rowid */
+    }else if( sqlite3_value_type(ppArg[2+v->nColumn+1]) != SQLITE_INTEGER ||
+              sqlite3_value_int64(ppArg[2+v->nColumn+1]) != rowid ){
+      rc = SQLITE_ERROR;  /* we don't allow changing the docid */
+    }else{
+      assert( nArg==2+v->nColumn+2);
+      rc = index_update(v, rowid, &ppArg[2]);
+    }
+  } else {
+    /* An insert:
+     * ppArg[1] = requested rowid
+     * ppArg[2..2+v->nColumn-1] = values
+     * ppArg[2+v->nColumn] = value for magic column (we ignore this)
+     * ppArg[2+v->nColumn+1] = value for docid
+     */
+    sqlite3_value *pRequestDocid = ppArg[2+v->nColumn+1];
+    assert( nArg==2+v->nColumn+2);
+    if( SQLITE_NULL != sqlite3_value_type(pRequestDocid) &&
+        SQLITE_NULL != sqlite3_value_type(ppArg[1]) ){
+      /* TODO(shess) Consider allowing this to work if the values are
+      ** identical.  I'm inclined to discourage that usage, though,
+      ** given that both rowid and docid are special columns.  Better
+      ** would be to define one or the other as the default winner,
+      ** but should it be fts3-centric (docid) or SQLite-centric
+      ** (rowid)?
+      */
+      rc = SQLITE_ERROR;
+    }else{
+      if( SQLITE_NULL == sqlite3_value_type(pRequestDocid) ){
+        pRequestDocid = ppArg[1];
+      }
+      rc = index_insert(v, pRequestDocid, &ppArg[2], pRowid);
+    }
+  }
+
+  return rc;
+}
+
+static int fulltextSync(sqlite3_vtab *pVtab){
+  FTSTRACE(("FTS3 xSync()\n"));
+  return flushPendingTerms((fulltext_vtab *)pVtab);
+}
+
+static int fulltextBegin(sqlite3_vtab *pVtab){
+  fulltext_vtab *v = (fulltext_vtab *) pVtab;
+  FTSTRACE(("FTS3 xBegin()\n"));
+
+  /* Any buffered updates should have been cleared by the previous
+  ** transaction.
+  */
+  assert( v->nPendingData<0 );
+  return clearPendingTerms(v);
+}
+
+static int fulltextCommit(sqlite3_vtab *pVtab){
+  fulltext_vtab *v = (fulltext_vtab *) pVtab;
+  FTSTRACE(("FTS3 xCommit()\n"));
+
+  /* Buffered updates should have been cleared by fulltextSync(). */
+  assert( v->nPendingData<0 );
+  return clearPendingTerms(v);
+}
+
+static int fulltextRollback(sqlite3_vtab *pVtab){
+  FTSTRACE(("FTS3 xRollback()\n"));
+  return clearPendingTerms((fulltext_vtab *)pVtab);
+}
+
+/*
+** Implementation of the snippet() function for FTS3
+*/
+static void snippetFunc(
+  sqlite3_context *pContext,
+  int argc,
+  sqlite3_value **argv
+){
+  fulltext_cursor *pCursor;
+  if( argc<1 ) return;
+  if( sqlite3_value_type(argv[0])!=SQLITE_BLOB ||
+      sqlite3_value_bytes(argv[0])!=sizeof(pCursor) ){
+    sqlite3_result_error(pContext, "illegal first argument to html_snippet",-1);
+  }else{
+    const char *zStart = "<b>";
+    const char *zEnd = "</b>";
+    const char *zEllipsis = "<b>...</b>";
+    memcpy(&pCursor, sqlite3_value_blob(argv[0]), sizeof(pCursor));
+    if( argc>=2 ){
+      zStart = (const char*)sqlite3_value_text(argv[1]);
+      if( argc>=3 ){
+        zEnd = (const char*)sqlite3_value_text(argv[2]);
+        if( argc>=4 ){
+          zEllipsis = (const char*)sqlite3_value_text(argv[3]);
+        }
+      }
+    }
+    snippetAllOffsets(pCursor);
+    snippetText(pCursor, zStart, zEnd, zEllipsis);
+    sqlite3_result_text(pContext, pCursor->snippet.zSnippet,
+                        pCursor->snippet.nSnippet, SQLITE_STATIC);
+  }
+}
+
+/*
+** Implementation of the offsets() function for FTS3
+*/
+static void snippetOffsetsFunc(
+  sqlite3_context *pContext,
+  int argc,
+  sqlite3_value **argv
+){
+  fulltext_cursor *pCursor;
+  if( argc<1 ) return;
+  if( sqlite3_value_type(argv[0])!=SQLITE_BLOB ||
+      sqlite3_value_bytes(argv[0])!=sizeof(pCursor) ){
+    sqlite3_result_error(pContext, "illegal first argument to offsets",-1);
+  }else{
+    memcpy(&pCursor, sqlite3_value_blob(argv[0]), sizeof(pCursor));
+    snippetAllOffsets(pCursor);
+    snippetOffsetText(&pCursor->snippet);
+    sqlite3_result_text(pContext,
+                        pCursor->snippet.zOffset, pCursor->snippet.nOffset,
+                        SQLITE_STATIC);
+  }
+}
+
+/*
+** This routine implements the xFindFunction method for the FTS3
+** virtual table.
+*/
+static int fulltextFindFunction(
+  sqlite3_vtab *pVtab,
+  int nArg,
+  const char *zName,
+  void (**pxFunc)(sqlite3_context*,int,sqlite3_value**),
+  void **ppArg
+){
+  if( strcmp(zName,"snippet")==0 ){
+    *pxFunc = snippetFunc;
+    return 1;
+  }else if( strcmp(zName,"offsets")==0 ){
+    *pxFunc = snippetOffsetsFunc;
+    return 1;
+  }
+  return 0;
+}
+
+/*
+** Rename an fts3 table.
+*/
+static int fulltextRename(
+  sqlite3_vtab *pVtab,
+  const char *zName
+){
+  fulltext_vtab *p = (fulltext_vtab *)pVtab;
+  int rc = SQLITE_NOMEM;
+  char *zSql = sqlite3_mprintf(
+    "ALTER TABLE %Q.'%q_content'  RENAME TO '%q_content';"
+    "ALTER TABLE %Q.'%q_segments' RENAME TO '%q_segments';"
+    "ALTER TABLE %Q.'%q_segdir'   RENAME TO '%q_segdir';"
+    , p->zDb, p->zName, zName
+    , p->zDb, p->zName, zName
+    , p->zDb, p->zName, zName
+  );
+  if( zSql ){
+    rc = sqlite3_exec(p->db, zSql, 0, 0, 0);
+    sqlite3_free(zSql);
+  }
+  return rc;
+}
+
+static const sqlite3_module fts3Module = {
+  /* iVersion      */ 0,
+  /* xCreate       */ fulltextCreate,
+  /* xConnect      */ fulltextConnect,
+  /* xBestIndex    */ fulltextBestIndex,
+  /* xDisconnect   */ fulltextDisconnect,
+  /* xDestroy      */ fulltextDestroy,
+  /* xOpen         */ fulltextOpen,
+  /* xClose        */ fulltextClose,
+  /* xFilter       */ fulltextFilter,
+  /* xNext         */ fulltextNext,
+  /* xEof          */ fulltextEof,
+  /* xColumn       */ fulltextColumn,
+  /* xRowid        */ fulltextRowid,
+  /* xUpdate       */ fulltextUpdate,
+  /* xBegin        */ fulltextBegin,
+  /* xSync         */ fulltextSync,
+  /* xCommit       */ fulltextCommit,
+  /* xRollback     */ fulltextRollback,
+  /* xFindFunction */ fulltextFindFunction,
+  /* xRename */       fulltextRename,
+};
+
+static void hashDestroy(void *p){
+  fts3Hash *pHash = (fts3Hash *)p;
+  sqlite3Fts3HashClear(pHash);
+  sqlite3_free(pHash);
+}
+
+/*
+** The fts3 built-in tokenizers - "simple" and "porter" - are implemented
+** in files fts3_tokenizer1.c and fts3_porter.c respectively. The following
+** two forward declarations are for functions declared in these files
+** used to retrieve the respective implementations.
+**
+** Calling sqlite3Fts3SimpleTokenizerModule() sets the value pointed
+** to by the argument to point a the "simple" tokenizer implementation.
+** Function ...PorterTokenizerModule() sets *pModule to point to the
+** porter tokenizer/stemmer implementation.
+*/
+void sqlite3Fts3SimpleTokenizerModule(sqlite3_tokenizer_module const**ppModule);
+void sqlite3Fts3PorterTokenizerModule(sqlite3_tokenizer_module const**ppModule);
+void sqlite3Fts3IcuTokenizerModule(sqlite3_tokenizer_module const**ppModule);
+
+int sqlite3Fts3InitHashTable(sqlite3 *, fts3Hash *, const char *);
+
+/*
+** Initialise the fts3 extension. If this extension is built as part
+** of the sqlite library, then this function is called directly by
+** SQLite. If fts3 is built as a dynamically loadable extension, this
+** function is called by the sqlite3_extension_init() entry point.
+*/
+int sqlite3Fts3Init(sqlite3 *db){
+  int rc = SQLITE_OK;
+  fts3Hash *pHash = 0;
+  const sqlite3_tokenizer_module *pSimple = 0;
+  const sqlite3_tokenizer_module *pPorter = 0;
+  const sqlite3_tokenizer_module *pIcu = 0;
+
+  sqlite3Fts3SimpleTokenizerModule(&pSimple);
+  sqlite3Fts3PorterTokenizerModule(&pPorter);
+#ifdef SQLITE_ENABLE_ICU
+  sqlite3Fts3IcuTokenizerModule(&pIcu);
+#endif
+
+  /* Allocate and initialise the hash-table used to store tokenizers. */
+  pHash = sqlite3_malloc(sizeof(fts3Hash));
+  if( !pHash ){
+    rc = SQLITE_NOMEM;
+  }else{
+    sqlite3Fts3HashInit(pHash, FTS3_HASH_STRING, 1);
+  }
+
+  /* Load the built-in tokenizers into the hash table */
+  if( rc==SQLITE_OK ){
+    if( sqlite3Fts3HashInsert(pHash, "simple", 7, (void *)pSimple)
+     || sqlite3Fts3HashInsert(pHash, "porter", 7, (void *)pPorter)
+     || (pIcu && sqlite3Fts3HashInsert(pHash, "icu", 4, (void *)pIcu))
+    ){
+      rc = SQLITE_NOMEM;
+    }
+  }
+
+  /* Create the virtual table wrapper around the hash-table and overload
+  ** the two scalar functions. If this is successful, register the
+  ** module with sqlite.
+  */
+  if( SQLITE_OK==rc
+   && SQLITE_OK==(rc = sqlite3Fts3InitHashTable(db, pHash, "fts3_tokenizer"))
+   && SQLITE_OK==(rc = sqlite3_overload_function(db, "snippet", -1))
+   && SQLITE_OK==(rc = sqlite3_overload_function(db, "offsets", -1))
+  ){
+    return sqlite3_create_module_v2(
+        db, "fts3", &fts3Module, (void *)pHash, hashDestroy
+    );
+  }
+
+  /* An error has occured. Delete the hash table and return the error code. */
+  assert( rc!=SQLITE_OK );
+  if( pHash ){
+    sqlite3Fts3HashClear(pHash);
+    sqlite3_free(pHash);
+  }
+  return rc;
+}
+
+#if !SQLITE_CORE
+int sqlite3_extension_init(
+  sqlite3 *db,
+  char **pzErrMsg,
+  const sqlite3_api_routines *pApi
+){
+  SQLITE_EXTENSION_INIT2(pApi)
+  return sqlite3Fts3Init(db);
+}
+#endif
+
+#endif /* !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_FTS3) */
diff --git a/uppsrc/plugin/sqlite3/lib/fts3.h b/uppsrc/plugin/sqlite3/lib/fts3.h
new file mode 100644
index 000000000..7d7d615d7
--- /dev/null
+++ b/uppsrc/plugin/sqlite3/lib/fts3.h
@@ -0,0 +1,26 @@
+/*
+** 2006 Oct 10
+**
+** The author disclaims copyright to this source code.  In place of
+** a legal notice, here is a blessing:
+**
+**    May you do good and not evil.
+**    May you find forgiveness for yourself and forgive others.
+**    May you share freely, never taking more than you give.
+**
+******************************************************************************
+**
+** This header file is used by programs that want to link against the
+** FTS3 library.  All it does is declare the sqlite3Fts3Init() interface.
+*/
+#include "sqlite3.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif  /* __cplusplus */
+
+int sqlite3Fts3Init(sqlite3 *db);
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif  /* __cplusplus */
diff --git a/uppsrc/plugin/sqlite3/lib/fts3_hash.c b/uppsrc/plugin/sqlite3/lib/fts3_hash.c
new file mode 100644
index 000000000..fa0408866
--- /dev/null
+++ b/uppsrc/plugin/sqlite3/lib/fts3_hash.c
@@ -0,0 +1,374 @@
+/*
+** 2001 September 22
+**
+** The author disclaims copyright to this source code.  In place of
+** a legal notice, here is a blessing:
+**
+**    May you do good and not evil.
+**    May you find forgiveness for yourself and forgive others.
+**    May you share freely, never taking more than you give.
+**
+*************************************************************************
+** This is the implementation of generic hash-tables used in SQLite.
+** We've modified it slightly to serve as a standalone hash table
+** implementation for the full-text indexing module.
+*/
+
+/*
+** The code in this file is only compiled if:
+**
+**     * The FTS3 module is being built as an extension
+**       (in which case SQLITE_CORE is not defined), or
+**
+**     * The FTS3 module is being built into the core of
+**       SQLite (in which case SQLITE_ENABLE_FTS3 is defined).
+*/
+#if !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_FTS3)
+
+#include <assert.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "sqlite3.h"
+#include "fts3_hash.h"
+
+/*
+** Malloc and Free functions
+*/
+static void *fts3HashMalloc(int n){
+  void *p = sqlite3_malloc(n);
+  if( p ){
+    memset(p, 0, n);
+  }
+  return p;
+}
+static void fts3HashFree(void *p){
+  sqlite3_free(p);
+}
+
+/* Turn bulk memory into a hash table object by initializing the
+** fields of the Hash structure.
+**
+** "pNew" is a pointer to the hash table that is to be initialized.
+** keyClass is one of the constants
+** FTS3_HASH_BINARY or FTS3_HASH_STRING.  The value of keyClass
+** determines what kind of key the hash table will use.  "copyKey" is
+** true if the hash table should make its own private copy of keys and
+** false if it should just use the supplied pointer.
+*/
+void sqlite3Fts3HashInit(fts3Hash *pNew, int keyClass, int copyKey){
+  assert( pNew!=0 );
+  assert( keyClass>=FTS3_HASH_STRING && keyClass<=FTS3_HASH_BINARY );
+  pNew->keyClass = keyClass;
+  pNew->copyKey = copyKey;
+  pNew->first = 0;
+  pNew->count = 0;
+  pNew->htsize = 0;
+  pNew->ht = 0;
+}
+
+/* Remove all entries from a hash table.  Reclaim all memory.
+** Call this routine to delete a hash table or to reset a hash table
+** to the empty state.
+*/
+void sqlite3Fts3HashClear(fts3Hash *pH){
+  fts3HashElem *elem;         /* For looping over all elements of the table */
+
+  assert( pH!=0 );
+  elem = pH->first;
+  pH->first = 0;
+  fts3HashFree(pH->ht);
+  pH->ht = 0;
+  pH->htsize = 0;
+  while( elem ){
+    fts3HashElem *next_elem = elem->next;
+    if( pH->copyKey && elem->pKey ){
+      fts3HashFree(elem->pKey);
+    }
+    fts3HashFree(elem);
+    elem = next_elem;
+  }
+  pH->count = 0;
+}
+
+/*
+** Hash and comparison functions when the mode is FTS3_HASH_STRING
+*/
+static int fts3StrHash(const void *pKey, int nKey){
+  const char *z = (const char *)pKey;
+  int h = 0;
+  if( nKey<=0 ) nKey = (int) strlen(z);
+  while( nKey > 0  ){
+    h = (h<<3) ^ h ^ *z++;
+    nKey--;
+  }
+  return h & 0x7fffffff;
+}
+static int fts3StrCompare(const void *pKey1, int n1, const void *pKey2, int n2){
+  if( n1!=n2 ) return 1;
+  return strncmp((const char*)pKey1,(const char*)pKey2,n1);
+}
+
+/*
+** Hash and comparison functions when the mode is FTS3_HASH_BINARY
+*/
+static int fts3BinHash(const void *pKey, int nKey){
+  int h = 0;
+  const char *z = (const char *)pKey;
+  while( nKey-- > 0 ){
+    h = (h<<3) ^ h ^ *(z++);
+  }
+  return h & 0x7fffffff;
+}
+static int fts3BinCompare(const void *pKey1, int n1, const void *pKey2, int n2){
+  if( n1!=n2 ) return 1;
+  return memcmp(pKey1,pKey2,n1);
+}
+
+/*
+** Return a pointer to the appropriate hash function given the key class.
+**
+** The C syntax in this function definition may be unfamilar to some
+** programmers, so we provide the following additional explanation:
+**
+** The name of the function is "ftsHashFunction".  The function takes a
+** single parameter "keyClass".  The return value of ftsHashFunction()
+** is a pointer to another function.  Specifically, the return value
+** of ftsHashFunction() is a pointer to a function that takes two parameters
+** with types "const void*" and "int" and returns an "int".
+*/
+static int (*ftsHashFunction(int keyClass))(const void*,int){
+  if( keyClass==FTS3_HASH_STRING ){
+    return &fts3StrHash;
+  }else{
+    assert( keyClass==FTS3_HASH_BINARY );
+    return &fts3BinHash;
+  }
+}
+
+/*
+** Return a pointer to the appropriate hash function given the key class.
+**
+** For help in interpreted the obscure C code in the function definition,
+** see the header comment on the previous function.
+*/
+static int (*ftsCompareFunction(int keyClass))(const void*,int,const void*,int){
+  if( keyClass==FTS3_HASH_STRING ){
+    return &fts3StrCompare;
+  }else{
+    assert( keyClass==FTS3_HASH_BINARY );
+    return &fts3BinCompare;
+  }
+}
+
+/* Link an element into the hash table
+*/
+static void fts3HashInsertElement(
+  fts3Hash *pH,            /* The complete hash table */
+  struct _fts3ht *pEntry,  /* The entry into which pNew is inserted */
+  fts3HashElem *pNew       /* The element to be inserted */
+){
+  fts3HashElem *pHead;     /* First element already in pEntry */
+  pHead = pEntry->chain;
+  if( pHead ){
+    pNew->next = pHead;
+    pNew->prev = pHead->prev;
+    if( pHead->prev ){ pHead->prev->next = pNew; }
+    else             { pH->first = pNew; }
+    pHead->prev = pNew;
+  }else{
+    pNew->next = pH->first;
+    if( pH->first ){ pH->first->prev = pNew; }
+    pNew->prev = 0;
+    pH->first = pNew;
+  }
+  pEntry->count++;
+  pEntry->chain = pNew;
+}
+
+
+/* Resize the hash table so that it cantains "new_size" buckets.
+** "new_size" must be a power of 2.  The hash table might fail
+** to resize if sqliteMalloc() fails.
+*/
+static void fts3Rehash(fts3Hash *pH, int new_size){
+  struct _fts3ht *new_ht;          /* The new hash table */
+  fts3HashElem *elem, *next_elem;  /* For looping over existing elements */
+  int (*xHash)(const void*,int);   /* The hash function */
+
+  assert( (new_size & (new_size-1))==0 );
+  new_ht = (struct _fts3ht *)fts3HashMalloc( new_size*sizeof(struct _fts3ht) );
+  if( new_ht==0 ) return;
+  fts3HashFree(pH->ht);
+  pH->ht = new_ht;
+  pH->htsize = new_size;
+  xHash = ftsHashFunction(pH->keyClass);
+  for(elem=pH->first, pH->first=0; elem; elem = next_elem){
+    int h = (*xHash)(elem->pKey, elem->nKey) & (new_size-1);
+    next_elem = elem->next;
+    fts3HashInsertElement(pH, &new_ht[h], elem);
+  }
+}
+
+/* This function (for internal use only) locates an element in an
+** hash table that matches the given key.  The hash for this key has
+** already been computed and is passed as the 4th parameter.
+*/
+static fts3HashElem *fts3FindElementByHash(
+  const fts3Hash *pH, /* The pH to be searched */
+  const void *pKey,   /* The key we are searching for */
+  int nKey,
+  int h               /* The hash for this key. */
+){
+  fts3HashElem *elem;            /* Used to loop thru the element list */
+  int count;                     /* Number of elements left to test */
+  int (*xCompare)(const void*,int,const void*,int);  /* comparison function */
+
+  if( pH->ht ){
+    struct _fts3ht *pEntry = &pH->ht[h];
+    elem = pEntry->chain;
+    count = pEntry->count;
+    xCompare = ftsCompareFunction(pH->keyClass);
+    while( count-- && elem ){
+      if( (*xCompare)(elem->pKey,elem->nKey,pKey,nKey)==0 ){
+        return elem;
+      }
+      elem = elem->next;
+    }
+  }
+  return 0;
+}
+
+/* Remove a single entry from the hash table given a pointer to that
+** element and a hash on the element's key.
+*/
+static void fts3RemoveElementByHash(
+  fts3Hash *pH,         /* The pH containing "elem" */
+  fts3HashElem* elem,   /* The element to be removed from the pH */
+  int h                 /* Hash value for the element */
+){
+  struct _fts3ht *pEntry;
+  if( elem->prev ){
+    elem->prev->next = elem->next;
+  }else{
+    pH->first = elem->next;
+  }
+  if( elem->next ){
+    elem->next->prev = elem->prev;
+  }
+  pEntry = &pH->ht[h];
+  if( pEntry->chain==elem ){
+    pEntry->chain = elem->next;
+  }
+  pEntry->count--;
+  if( pEntry->count<=0 ){
+    pEntry->chain = 0;
+  }
+  if( pH->copyKey && elem->pKey ){
+    fts3HashFree(elem->pKey);
+  }
+  fts3HashFree( elem );
+  pH->count--;
+  if( pH->count<=0 ){
+    assert( pH->first==0 );
+    assert( pH->count==0 );
+    fts3HashClear(pH);
+  }
+}
+
+/* Attempt to locate an element of the hash table pH with a key
+** that matches pKey,nKey.  Return the data for this element if it is
+** found, or NULL if there is no match.
+*/
+void *sqlite3Fts3HashFind(const fts3Hash *pH, const void *pKey, int nKey){
+  int h;                 /* A hash on key */
+  fts3HashElem *elem;    /* The element that matches key */
+  int (*xHash)(const void*,int);  /* The hash function */
+
+  if( pH==0 || pH->ht==0 ) return 0;
+  xHash = ftsHashFunction(pH->keyClass);
+  assert( xHash!=0 );
+  h = (*xHash)(pKey,nKey);
+  assert( (pH->htsize & (pH->htsize-1))==0 );
+  elem = fts3FindElementByHash(pH,pKey,nKey, h & (pH->htsize-1));
+  return elem ? elem->data : 0;
+}
+
+/* Insert an element into the hash table pH.  The key is pKey,nKey
+** and the data is "data".
+**
+** If no element exists with a matching key, then a new
+** element is created.  A copy of the key is made if the copyKey
+** flag is set.  NULL is returned.
+**
+** If another element already exists with the same key, then the
+** new data replaces the old data and the old data is returned.
+** The key is not copied in this instance.  If a malloc fails, then
+** the new data is returned and the hash table is unchanged.
+**
+** If the "data" parameter to this function is NULL, then the
+** element corresponding to "key" is removed from the hash table.
+*/
+void *sqlite3Fts3HashInsert(
+  fts3Hash *pH,        /* The hash table to insert into */
+  const void *pKey,    /* The key */
+  int nKey,            /* Number of bytes in the key */
+  void *data           /* The data */
+){
+  int hraw;                 /* Raw hash value of the key */
+  int h;                    /* the hash of the key modulo hash table size */
+  fts3HashElem *elem;       /* Used to loop thru the element list */
+  fts3HashElem *new_elem;   /* New element added to the pH */
+  int (*xHash)(const void*,int);  /* The hash function */
+
+  assert( pH!=0 );
+  xHash = ftsHashFunction(pH->keyClass);
+  assert( xHash!=0 );
+  hraw = (*xHash)(pKey, nKey);
+  assert( (pH->htsize & (pH->htsize-1))==0 );
+  h = hraw & (pH->htsize-1);
+  elem = fts3FindElementByHash(pH,pKey,nKey,h);
+  if( elem ){
+    void *old_data = elem->data;
+    if( data==0 ){
+      fts3RemoveElementByHash(pH,elem,h);
+    }else{
+      elem->data = data;
+    }
+    return old_data;
+  }
+  if( data==0 ) return 0;
+  new_elem = (fts3HashElem*)fts3HashMalloc( sizeof(fts3HashElem) );
+  if( new_elem==0 ) return data;
+  if( pH->copyKey && pKey!=0 ){
+    new_elem->pKey = fts3HashMalloc( nKey );
+    if( new_elem->pKey==0 ){
+      fts3HashFree(new_elem);
+      return data;
+    }
+    memcpy((void*)new_elem->pKey, pKey, nKey);
+  }else{
+    new_elem->pKey = (void*)pKey;
+  }
+  new_elem->nKey = nKey;
+  pH->count++;
+  if( pH->htsize==0 ){
+    fts3Rehash(pH,8);
+    if( pH->htsize==0 ){
+      pH->count = 0;
+      fts3HashFree(new_elem);
+      return data;
+    }
+  }
+  if( pH->count > pH->htsize ){
+    fts3Rehash(pH,pH->htsize*2);
+  }
+  assert( pH->htsize>0 );
+  assert( (pH->htsize & (pH->htsize-1))==0 );
+  h = hraw & (pH->htsize-1);
+  fts3HashInsertElement(pH, &pH->ht[h], new_elem);
+  new_elem->data = data;
+  return 0;
+}
+
+#endif /* !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_FTS3) */
diff --git a/uppsrc/plugin/sqlite3/lib/fts3_hash.h b/uppsrc/plugin/sqlite3/lib/fts3_hash.h
new file mode 100644
index 000000000..e9ef6ac49
--- /dev/null
+++ b/uppsrc/plugin/sqlite3/lib/fts3_hash.h
@@ -0,0 +1,110 @@
+/*
+** 2001 September 22
+**
+** The author disclaims copyright to this source code.  In place of
+** a legal notice, here is a blessing:
+**
+**    May you do good and not evil.
+**    May you find forgiveness for yourself and forgive others.
+**    May you share freely, never taking more than you give.
+**
+*************************************************************************
+** This is the header file for the generic hash-table implemenation
+** used in SQLite.  We've modified it slightly to serve as a standalone
+** hash table implementation for the full-text indexing module.
+**
+*/
+#ifndef _FTS3_HASH_H_
+#define _FTS3_HASH_H_
+
+/* Forward declarations of structures. */
+typedef struct fts3Hash fts3Hash;
+typedef struct fts3HashElem fts3HashElem;
+
+/* A complete hash table is an instance of the following structure.
+** The internals of this structure are intended to be opaque -- client
+** code should not attempt to access or modify the fields of this structure
+** directly.  Change this structure only by using the routines below.
+** However, many of the "procedures" and "functions" for modifying and
+** accessing this structure are really macros, so we can't really make
+** this structure opaque.
+*/
+struct fts3Hash {
+  char keyClass;          /* HASH_INT, _POINTER, _STRING, _BINARY */
+  char copyKey;           /* True if copy of key made on insert */
+  int count;              /* Number of entries in this table */
+  fts3HashElem *first;    /* The first element of the array */
+  int htsize;             /* Number of buckets in the hash table */
+  struct _fts3ht {        /* the hash table */
+    int count;               /* Number of entries with this hash */
+    fts3HashElem *chain;     /* Pointer to first entry with this hash */
+  } *ht;
+};
+
+/* Each element in the hash table is an instance of the following
+** structure.  All elements are stored on a single doubly-linked list.
+**
+** Again, this structure is intended to be opaque, but it can't really
+** be opaque because it is used by macros.
+*/
+struct fts3HashElem {
+  fts3HashElem *next, *prev; /* Next and previous elements in the table */
+  void *data;                /* Data associated with this element */
+  void *pKey; int nKey;      /* Key associated with this element */
+};
+
+/*
+** There are 2 different modes of operation for a hash table:
+**
+**   FTS3_HASH_STRING        pKey points to a string that is nKey bytes long
+**                           (including the null-terminator, if any).  Case
+**                           is respected in comparisons.
+**
+**   FTS3_HASH_BINARY        pKey points to binary data nKey bytes long.
+**                           memcmp() is used to compare keys.
+**
+** A copy of the key is made if the copyKey parameter to fts3HashInit is 1.
+*/
+#define FTS3_HASH_STRING    1
+#define FTS3_HASH_BINARY    2
+
+/*
+** Access routines.  To delete, insert a NULL pointer.
+*/
+void sqlite3Fts3HashInit(fts3Hash*, int keytype, int copyKey);
+void *sqlite3Fts3HashInsert(fts3Hash*, const void *pKey, int nKey, void *pData);
+void *sqlite3Fts3HashFind(const fts3Hash*, const void *pKey, int nKey);
+void sqlite3Fts3HashClear(fts3Hash*);
+
+/*
+** Shorthand for the functions above
+*/
+#define fts3HashInit   sqlite3Fts3HashInit
+#define fts3HashInsert sqlite3Fts3HashInsert
+#define fts3HashFind   sqlite3Fts3HashFind
+#define fts3HashClear  sqlite3Fts3HashClear
+
+/*
+** Macros for looping over all elements of a hash table.  The idiom is
+** like this:
+**
+**   fts3Hash h;
+**   fts3HashElem *p;
+**   ...
+**   for(p=fts3HashFirst(&h); p; p=fts3HashNext(p)){
+**     SomeStructure *pData = fts3HashData(p);
+**     // do something with pData
+**   }
+*/
+#define fts3HashFirst(H)  ((H)->first)
+#define fts3HashNext(E)   ((E)->next)
+#define fts3HashData(E)   ((E)->data)
+#define fts3HashKey(E)    ((E)->pKey)
+#define fts3HashKeysize(E) ((E)->nKey)
+
+/*
+** Number of entries in a hash table
+*/
+#define fts3HashCount(H)  ((H)->count)
+
+#endif /* _FTS3_HASH_H_ */
diff --git a/uppsrc/plugin/sqlite3/lib/fts3_icu.c b/uppsrc/plugin/sqlite3/lib/fts3_icu.c
new file mode 100644
index 000000000..001384110
--- /dev/null
+++ b/uppsrc/plugin/sqlite3/lib/fts3_icu.c
@@ -0,0 +1,258 @@
+/*
+** 2007 June 22
+**
+** The author disclaims copyright to this source code.  In place of
+** a legal notice, here is a blessing:
+**
+**    May you do good and not evil.
+**    May you find forgiveness for yourself and forgive others.
+**    May you share freely, never taking more than you give.
+**
+*************************************************************************
+** This file implements a tokenizer for fts3 based on the ICU library.
+**
+** $Id: fts3_icu.c,v 1.2 2007/10/24 21:52:37 shess Exp $
+*/
+
+#if !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_FTS3)
+#ifdef SQLITE_ENABLE_ICU
+
+#include <assert.h>
+#include <string.h>
+#include "fts3_tokenizer.h"
+
+#include <unicode/ubrk.h>
+#include <unicode/ucol.h>
+#include <unicode/ustring.h>
+#include <unicode/utf16.h>
+
+typedef struct IcuTokenizer IcuTokenizer;
+typedef struct IcuCursor IcuCursor;
+
+struct IcuTokenizer {
+  sqlite3_tokenizer base;
+  char *zLocale;
+};
+
+struct IcuCursor {
+  sqlite3_tokenizer_cursor base;
+
+  UBreakIterator *pIter;      /* ICU break-iterator object */
+  int nChar;                  /* Number of UChar elements in pInput */
+  UChar *aChar;               /* Copy of input using utf-16 encoding */
+  int *aOffset;               /* Offsets of each character in utf-8 input */
+
+  int nBuffer;
+  char *zBuffer;
+
+  int iToken;
+};
+
+/*
+** Create a new tokenizer instance.
+*/
+static int icuCreate(
+  int argc,                            /* Number of entries in argv[] */
+  const char * const *argv,            /* Tokenizer creation arguments */
+  sqlite3_tokenizer **ppTokenizer      /* OUT: Created tokenizer */
+){
+  IcuTokenizer *p;
+  int n = 0;
+
+  if( argc>0 ){
+    n = strlen(argv[0])+1;
+  }
+  p = (IcuTokenizer *)sqlite3_malloc(sizeof(IcuTokenizer)+n);
+  if( !p ){
+    return SQLITE_NOMEM;
+  }
+  memset(p, 0, sizeof(IcuTokenizer));
+
+  if( n ){
+    p->zLocale = (char *)&p[1];
+    memcpy(p->zLocale, argv[0], n);
+  }
+
+  *ppTokenizer = (sqlite3_tokenizer *)p;
+
+  return SQLITE_OK;
+}
+
+/*
+** Destroy a tokenizer
+*/
+static int icuDestroy(sqlite3_tokenizer *pTokenizer){
+  IcuTokenizer *p = (IcuTokenizer *)pTokenizer;
+  sqlite3_free(p);
+  return SQLITE_OK;
+}
+
+/*
+** Prepare to begin tokenizing a particular string.  The input
+** string to be tokenized is pInput[0..nBytes-1].  A cursor
+** used to incrementally tokenize this string is returned in
+** *ppCursor.
+*/
+static int icuOpen(
+  sqlite3_tokenizer *pTokenizer,         /* The tokenizer */
+  const char *zInput,                    /* Input string */
+  int nInput,                            /* Length of zInput in bytes */
+  sqlite3_tokenizer_cursor **ppCursor    /* OUT: Tokenization cursor */
+){
+  IcuTokenizer *p = (IcuTokenizer *)pTokenizer;
+  IcuCursor *pCsr;
+
+  const int32_t opt = U_FOLD_CASE_DEFAULT;
+  UErrorCode status = U_ZERO_ERROR;
+  int nChar;
+
+  UChar32 c;
+  int iInput = 0;
+  int iOut = 0;
+
+  *ppCursor = 0;
+
+  if( -1 == nInput ) nInput = strlen(nInput);
+  nChar = nInput+1;
+  pCsr = (IcuCursor *)sqlite3_malloc(
+      sizeof(IcuCursor) +                /* IcuCursor */
+      nChar * sizeof(UChar) +            /* IcuCursor.aChar[] */
+      (nChar+1) * sizeof(int)            /* IcuCursor.aOffset[] */
+  );
+  if( !pCsr ){
+    return SQLITE_NOMEM;
+  }
+  memset(pCsr, 0, sizeof(IcuCursor));
+  pCsr->aChar = (UChar *)&pCsr[1];
+  pCsr->aOffset = (int *)&pCsr->aChar[nChar];
+
+  pCsr->aOffset[iOut] = iInput;
+  U8_NEXT(zInput, iInput, nInput, c);
+  while( c>0 ){
+    int isError = 0;
+    c = u_foldCase(c, opt);
+    U16_APPEND(pCsr->aChar, iOut, nChar, c, isError);
+    if( isError ){
+      sqlite3_free(pCsr);
+      return SQLITE_ERROR;
+    }
+    pCsr->aOffset[iOut] = iInput;
+
+    if( iInput<nInput ){
+      U8_NEXT(zInput, iInput, nInput, c);
+    }else{
+      c = 0;
+    }
+  }
+
+  pCsr->pIter = ubrk_open(UBRK_WORD, p->zLocale, pCsr->aChar, iOut, &status);
+  if( !U_SUCCESS(status) ){
+    sqlite3_free(pCsr);
+    return SQLITE_ERROR;
+  }
+  pCsr->nChar = iOut;
+
+  ubrk_first(pCsr->pIter);
+  *ppCursor = (sqlite3_tokenizer_cursor *)pCsr;
+  return SQLITE_OK;
+}
+
+/*
+** Close a tokenization cursor previously opened by a call to icuOpen().
+*/
+static int icuClose(sqlite3_tokenizer_cursor *pCursor){
+  IcuCursor *pCsr = (IcuCursor *)pCursor;
+  ubrk_close(pCsr->pIter);
+  sqlite3_free(pCsr->zBuffer);
+  sqlite3_free(pCsr);
+  return SQLITE_OK;
+}
+
+/*
+** Extract the next token from a tokenization cursor.
+*/
+static int icuNext(
+  sqlite3_tokenizer_cursor *pCursor,  /* Cursor returned by simpleOpen */
+  const char **ppToken,               /* OUT: *ppToken is the token text */
+  int *pnBytes,                       /* OUT: Number of bytes in token */
+  int *piStartOffset,                 /* OUT: Starting offset of token */
+  int *piEndOffset,                   /* OUT: Ending offset of token */
+  int *piPosition                     /* OUT: Position integer of token */
+){
+  IcuCursor *pCsr = (IcuCursor *)pCursor;
+
+  int iStart = 0;
+  int iEnd = 0;
+  int nByte = 0;
+
+  while( iStart==iEnd ){
+    UChar32 c;
+
+    iStart = ubrk_current(pCsr->pIter);
+    iEnd = ubrk_next(pCsr->pIter);
+    if( iEnd==UBRK_DONE ){
+      return SQLITE_DONE;
+    }
+
+    while( iStart<iEnd ){
+      int iWhite = iStart;
+      U8_NEXT(pCsr->aChar, iWhite, pCsr->nChar, c);
+      if( u_isspace(c) ){
+        iStart = iWhite;
+      }else{
+        break;
+      }
+    }
+    assert(iStart<=iEnd);
+  }
+
+  do {
+    UErrorCode status = U_ZERO_ERROR;
+    if( nByte ){
+      char *zNew = sqlite3_realloc(pCsr->zBuffer, nByte);
+      if( !zNew ){
+        return SQLITE_NOMEM;
+      }
+      pCsr->zBuffer = zNew;
+      pCsr->nBuffer = nByte;
+    }
+
+    u_strToUTF8(
+        pCsr->zBuffer, pCsr->nBuffer, &nByte,    /* Output vars */
+        &pCsr->aChar[iStart], iEnd-iStart,       /* Input vars */
+        &status                                  /* Output success/failure */
+    );
+  } while( nByte>pCsr->nBuffer );
+
+  *ppToken = pCsr->zBuffer;
+  *pnBytes = nByte;
+  *piStartOffset = pCsr->aOffset[iStart];
+  *piEndOffset = pCsr->aOffset[iEnd];
+  *piPosition = pCsr->iToken++;
+
+  return SQLITE_OK;
+}
+
+/*
+** The set of routines that implement the simple tokenizer
+*/
+static const sqlite3_tokenizer_module icuTokenizerModule = {
+  0,                           /* iVersion */
+  icuCreate,                   /* xCreate  */
+  icuDestroy,                  /* xCreate  */
+  icuOpen,                     /* xOpen    */
+  icuClose,                    /* xClose   */
+  icuNext,                     /* xNext    */
+};
+
+/*
+** Set *ppModule to point at the implementation of the ICU tokenizer.
+*/
+void sqlite3Fts3IcuTokenizerModule(
+  sqlite3_tokenizer_module const**ppModule
+){
+  *ppModule = &icuTokenizerModule;
+}
+
+#endif /* defined(SQLITE_ENABLE_ICU) */
+#endif /* !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_FTS3) */
diff --git a/uppsrc/plugin/sqlite3/lib/fts3_porter.c b/uppsrc/plugin/sqlite3/lib/fts3_porter.c
new file mode 100644
index 000000000..e9a21b82e
--- /dev/null
+++ b/uppsrc/plugin/sqlite3/lib/fts3_porter.c
@@ -0,0 +1,642 @@
+/*
+** 2006 September 30
+**
+** The author disclaims copyright to this source code.  In place of
+** a legal notice, here is a blessing:
+**
+**    May you do good and not evil.
+**    May you find forgiveness for yourself and forgive others.
+**    May you share freely, never taking more than you give.
+**
+*************************************************************************
+** Implementation of the full-text-search tokenizer that implements
+** a Porter stemmer.
+*/
+
+/*
+** The code in this file is only compiled if:
+**
+**     * The FTS3 module is being built as an extension
+**       (in which case SQLITE_CORE is not defined), or
+**
+**     * The FTS3 module is being built into the core of
+**       SQLite (in which case SQLITE_ENABLE_FTS3 is defined).
+*/
+#if !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_FTS3)
+
+
+#include <assert.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <ctype.h>
+
+#include "fts3_tokenizer.h"
+
+/*
+** Class derived from sqlite3_tokenizer
+*/
+typedef struct porter_tokenizer {
+  sqlite3_tokenizer base;      /* Base class */
+} porter_tokenizer;
+
+/*
+** Class derived from sqlit3_tokenizer_cursor
+*/
+typedef struct porter_tokenizer_cursor {
+  sqlite3_tokenizer_cursor base;
+  const char *zInput;          /* input we are tokenizing */
+  int nInput;                  /* size of the input */
+  int iOffset;                 /* current position in zInput */
+  int iToken;                  /* index of next token to be returned */
+  char *zToken;                /* storage for current token */
+  int nAllocated;              /* space allocated to zToken buffer */
+} porter_tokenizer_cursor;
+
+
+/* Forward declaration */
+static const sqlite3_tokenizer_module porterTokenizerModule;
+
+
+/*
+** Create a new tokenizer instance.
+*/
+static int porterCreate(
+  int argc, const char * const *argv,
+  sqlite3_tokenizer **ppTokenizer
+){
+  porter_tokenizer *t;
+  t = (porter_tokenizer *) sqlite3_malloc(sizeof(*t));
+  if( t==NULL ) return SQLITE_NOMEM;
+  memset(t, 0, sizeof(*t));
+  *ppTokenizer = &t->base;
+  return SQLITE_OK;
+}
+
+/*
+** Destroy a tokenizer
+*/
+static int porterDestroy(sqlite3_tokenizer *pTokenizer){
+  sqlite3_free(pTokenizer);
+  return SQLITE_OK;
+}
+
+/*
+** Prepare to begin tokenizing a particular string.  The input
+** string to be tokenized is zInput[0..nInput-1].  A cursor
+** used to incrementally tokenize this string is returned in
+** *ppCursor.
+*/
+static int porterOpen(
+  sqlite3_tokenizer *pTokenizer,         /* The tokenizer */
+  const char *zInput, int nInput,        /* String to be tokenized */
+  sqlite3_tokenizer_cursor **ppCursor    /* OUT: Tokenization cursor */
+){
+  porter_tokenizer_cursor *c;
+
+  c = (porter_tokenizer_cursor *) sqlite3_malloc(sizeof(*c));
+  if( c==NULL ) return SQLITE_NOMEM;
+
+  c->zInput = zInput;
+  if( zInput==0 ){
+    c->nInput = 0;
+  }else if( nInput<0 ){
+    c->nInput = (int)strlen(zInput);
+  }else{
+    c->nInput = nInput;
+  }
+  c->iOffset = 0;                 /* start tokenizing at the beginning */
+  c->iToken = 0;
+  c->zToken = NULL;               /* no space allocated, yet. */
+  c->nAllocated = 0;
+
+  *ppCursor = &c->base;
+  return SQLITE_OK;
+}
+
+/*
+** Close a tokenization cursor previously opened by a call to
+** porterOpen() above.
+*/
+static int porterClose(sqlite3_tokenizer_cursor *pCursor){
+  porter_tokenizer_cursor *c = (porter_tokenizer_cursor *) pCursor;
+  sqlite3_free(c->zToken);
+  sqlite3_free(c);
+  return SQLITE_OK;
+}
+/*
+** Vowel or consonant
+*/
+static const char cType[] = {
+   0, 1, 1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 0,
+   1, 1, 1, 2, 1
+};
+
+/*
+** isConsonant() and isVowel() determine if their first character in
+** the string they point to is a consonant or a vowel, according
+** to Porter ruls.
+**
+** A consonate is any letter other than 'a', 'e', 'i', 'o', or 'u'.
+** 'Y' is a consonant unless it follows another consonant,
+** in which case it is a vowel.
+**
+** In these routine, the letters are in reverse order.  So the 'y' rule
+** is that 'y' is a consonant unless it is followed by another
+** consonent.
+*/
+static int isVowel(const char*);
+static int isConsonant(const char *z){
+  int j;
+  char x = *z;
+  if( x==0 ) return 0;
+  assert( x>='a' && x<='z' );
+  j = cType[x-'a'];
+  if( j<2 ) return j;
+  return z[1]==0 || isVowel(z + 1);
+}
+static int isVowel(const char *z){
+  int j;
+  char x = *z;
+  if( x==0 ) return 0;
+  assert( x>='a' && x<='z' );
+  j = cType[x-'a'];
+  if( j<2 ) return 1-j;
+  return isConsonant(z + 1);
+}
+
+/*
+** Let any sequence of one or more vowels be represented by V and let
+** C be sequence of one or more consonants.  Then every word can be
+** represented as:
+**
+**           [C] (VC){m} [V]
+**
+** In prose:  A word is an optional consonant followed by zero or
+** vowel-consonant pairs followed by an optional vowel.  "m" is the
+** number of vowel consonant pairs.  This routine computes the value
+** of m for the first i bytes of a word.
+**
+** Return true if the m-value for z is 1 or more.  In other words,
+** return true if z contains at least one vowel that is followed
+** by a consonant.
+**
+** In this routine z[] is in reverse order.  So we are really looking
+** for an instance of of a consonant followed by a vowel.
+*/
+static int m_gt_0(const char *z){
+  while( isVowel(z) ){ z++; }
+  if( *z==0 ) return 0;
+  while( isConsonant(z) ){ z++; }
+  return *z!=0;
+}
+
+/* Like mgt0 above except we are looking for a value of m which is
+** exactly 1
+*/
+static int m_eq_1(const char *z){
+  while( isVowel(z) ){ z++; }
+  if( *z==0 ) return 0;
+  while( isConsonant(z) ){ z++; }
+  if( *z==0 ) return 0;
+  while( isVowel(z) ){ z++; }
+  if( *z==0 ) return 1;
+  while( isConsonant(z) ){ z++; }
+  return *z==0;
+}
+
+/* Like mgt0 above except we are looking for a value of m>1 instead
+** or m>0
+*/
+static int m_gt_1(const char *z){
+  while( isVowel(z) ){ z++; }
+  if( *z==0 ) return 0;
+  while( isConsonant(z) ){ z++; }
+  if( *z==0 ) return 0;
+  while( isVowel(z) ){ z++; }
+  if( *z==0 ) return 0;
+  while( isConsonant(z) ){ z++; }
+  return *z!=0;
+}
+
+/*
+** Return TRUE if there is a vowel anywhere within z[0..n-1]
+*/
+static int hasVowel(const char *z){
+  while( isConsonant(z) ){ z++; }
+  return *z!=0;
+}
+
+/*
+** Return TRUE if the word ends in a double consonant.
+**
+** The text is reversed here. So we are really looking at
+** the first two characters of z[].
+*/
+static int doubleConsonant(const char *z){
+  return isConsonant(z) && z[0]==z[1] && isConsonant(z+1);
+}
+
+/*
+** Return TRUE if the word ends with three letters which
+** are consonant-vowel-consonent and where the final consonant
+** is not 'w', 'x', or 'y'.
+**
+** The word is reversed here.  So we are really checking the
+** first three letters and the first one cannot be in [wxy].
+*/
+static int star_oh(const char *z){
+  return
+    z[0]!=0 && isConsonant(z) &&
+    z[0]!='w' && z[0]!='x' && z[0]!='y' &&
+    z[1]!=0 && isVowel(z+1) &&
+    z[2]!=0 && isConsonant(z+2);
+}
+
+/*
+** If the word ends with zFrom and xCond() is true for the stem
+** of the word that preceeds the zFrom ending, then change the
+** ending to zTo.
+**
+** The input word *pz and zFrom are both in reverse order.  zTo
+** is in normal order.
+**
+** Return TRUE if zFrom matches.  Return FALSE if zFrom does not
+** match.  Not that TRUE is returned even if xCond() fails and
+** no substitution occurs.
+*/
+static int stem(
+  char **pz,             /* The word being stemmed (Reversed) */
+  const char *zFrom,     /* If the ending matches this... (Reversed) */
+  const char *zTo,       /* ... change the ending to this (not reversed) */
+  int (*xCond)(const char*)   /* Condition that must be true */
+){
+  char *z = *pz;
+  while( *zFrom && *zFrom==*z ){ z++; zFrom++; }
+  if( *zFrom!=0 ) return 0;
+  if( xCond && !xCond(z) ) return 1;
+  while( *zTo ){
+    *(--z) = *(zTo++);
+  }
+  *pz = z;
+  return 1;
+}
+
+/*
+** This is the fallback stemmer used when the porter stemmer is
+** inappropriate.  The input word is copied into the output with
+** US-ASCII case folding.  If the input word is too long (more
+** than 20 bytes if it contains no digits or more than 6 bytes if
+** it contains digits) then word is truncated to 20 or 6 bytes
+** by taking 10 or 3 bytes from the beginning and end.
+*/
+static void copy_stemmer(const char *zIn, int nIn, char *zOut, int *pnOut){
+  int i, mx, j;
+  int hasDigit = 0;
+  for(i=0; i<nIn; i++){
+    int c = zIn[i];
+    if( c>='A' && c<='Z' ){
+      zOut[i] = c - 'A' + 'a';
+    }else{
+      if( c>='0' && c<='9' ) hasDigit = 1;
+      zOut[i] = c;
+    }
+  }
+  mx = hasDigit ? 3 : 10;
+  if( nIn>mx*2 ){
+    for(j=mx, i=nIn-mx; i<nIn; i++, j++){
+      zOut[j] = zOut[i];
+    }
+    i = j;
+  }
+  zOut[i] = 0;
+  *pnOut = i;
+}
+
+
+/*
+** Stem the input word zIn[0..nIn-1].  Store the output in zOut.
+** zOut is at least big enough to hold nIn bytes.  Write the actual
+** size of the output word (exclusive of the '\0' terminator) into *pnOut.
+**
+** Any upper-case characters in the US-ASCII character set ([A-Z])
+** are converted to lower case.  Upper-case UTF characters are
+** unchanged.
+**
+** Words that are longer than about 20 bytes are stemmed by retaining
+** a few bytes from the beginning and the end of the word.  If the
+** word contains digits, 3 bytes are taken from the beginning and
+** 3 bytes from the end.  For long words without digits, 10 bytes
+** are taken from each end.  US-ASCII case folding still applies.
+**
+** If the input word contains not digits but does characters not
+** in [a-zA-Z] then no stemming is attempted and this routine just
+** copies the input into the input into the output with US-ASCII
+** case folding.
+**
+** Stemming never increases the length of the word.  So there is
+** no chance of overflowing the zOut buffer.
+*/
+static void porter_stemmer(const char *zIn, int nIn, char *zOut, int *pnOut){
+  int i, j, c;
+  char zReverse[28];
+  char *z, *z2;
+  if( nIn<3 || nIn>=sizeof(zReverse)-7 ){
+    /* The word is too big or too small for the porter stemmer.
+    ** Fallback to the copy stemmer */
+    copy_stemmer(zIn, nIn, zOut, pnOut);
+    return;
+  }
+  for(i=0, j=sizeof(zReverse)-6; i<nIn; i++, j--){
+    c = zIn[i];
+    if( c>='A' && c<='Z' ){
+      zReverse[j] = c + 'a' - 'A';
+    }else if( c>='a' && c<='z' ){
+      zReverse[j] = c;
+    }else{
+      /* The use of a character not in [a-zA-Z] means that we fallback
+      ** to the copy stemmer */
+      copy_stemmer(zIn, nIn, zOut, pnOut);
+      return;
+    }
+  }
+  memset(&zReverse[sizeof(zReverse)-5], 0, 5);
+  z = &zReverse[j+1];
+
+
+  /* Step 1a */
+  if( z[0]=='s' ){
+    if(
+     !stem(&z, "sess", "ss", 0) &&
+     !stem(&z, "sei", "i", 0)  &&
+     !stem(&z, "ss", "ss", 0)
+    ){
+      z++;
+    }
+  }
+
+  /* Step 1b */
+  z2 = z;
+  if( stem(&z, "dee", "ee", m_gt_0) ){
+    /* Do nothing.  The work was all in the test */
+  }else if(
+     (stem(&z, "gni", "", hasVowel) || stem(&z, "de", "", hasVowel))
+      && z!=z2
+  ){
+     if( stem(&z, "ta", "ate", 0) ||
+         stem(&z, "lb", "ble", 0) ||
+         stem(&z, "zi", "ize", 0) ){
+       /* Do nothing.  The work was all in the test */
+     }else if( doubleConsonant(z) && (*z!='l' && *z!='s' && *z!='z') ){
+       z++;
+     }else if( m_eq_1(z) && star_oh(z) ){
+       *(--z) = 'e';
+     }
+  }
+
+  /* Step 1c */
+  if( z[0]=='y' && hasVowel(z+1) ){
+    z[0] = 'i';
+  }
+
+  /* Step 2 */
+  switch( z[1] ){
+   case 'a':
+     stem(&z, "lanoita", "ate", m_gt_0) ||
+     stem(&z, "lanoit", "tion", m_gt_0);
+     break;
+   case 'c':
+     stem(&z, "icne", "ence", m_gt_0) ||
+     stem(&z, "icna", "ance", m_gt_0);
+     break;
+   case 'e':
+     stem(&z, "rezi", "ize", m_gt_0);
+     break;
+   case 'g':
+     stem(&z, "igol", "log", m_gt_0);
+     break;
+   case 'l':
+     stem(&z, "ilb", "ble", m_gt_0) ||
+     stem(&z, "illa", "al", m_gt_0) ||
+     stem(&z, "iltne", "ent", m_gt_0) ||
+     stem(&z, "ile", "e", m_gt_0) ||
+     stem(&z, "ilsuo", "ous", m_gt_0);
+     break;
+   case 'o':
+     stem(&z, "noitazi", "ize", m_gt_0) ||
+     stem(&z, "noita", "ate", m_gt_0) ||
+     stem(&z, "rota", "ate", m_gt_0);
+     break;
+   case 's':
+     stem(&z, "msila", "al", m_gt_0) ||
+     stem(&z, "ssenevi", "ive", m_gt_0) ||
+     stem(&z, "ssenluf", "ful", m_gt_0) ||
+     stem(&z, "ssensuo", "ous", m_gt_0);
+     break;
+   case 't':
+     stem(&z, "itila", "al", m_gt_0) ||
+     stem(&z, "itivi", "ive", m_gt_0) ||
+     stem(&z, "itilib", "ble", m_gt_0);
+     break;
+  }
+
+  /* Step 3 */
+  switch( z[0] ){
+   case 'e':
+     stem(&z, "etaci", "ic", m_gt_0) ||
+     stem(&z, "evita", "", m_gt_0)   ||
+     stem(&z, "ezila", "al", m_gt_0);
+     break;
+   case 'i':
+     stem(&z, "itici", "ic", m_gt_0);
+     break;
+   case 'l':
+     stem(&z, "laci", "ic", m_gt_0) ||
+     stem(&z, "luf", "", m_gt_0);
+     break;
+   case 's':
+     stem(&z, "ssen", "", m_gt_0);
+     break;
+  }
+
+  /* Step 4 */
+  switch( z[1] ){
+   case 'a':
+     if( z[0]=='l' && m_gt_1(z+2) ){
+       z += 2;
+     }
+     break;
+   case 'c':
+     if( z[0]=='e' && z[2]=='n' && (z[3]=='a' || z[3]=='e')  && m_gt_1(z+4)  ){
+       z += 4;
+     }
+     break;
+   case 'e':
+     if( z[0]=='r' && m_gt_1(z+2) ){
+       z += 2;
+     }
+     break;
+   case 'i':
+     if( z[0]=='c' && m_gt_1(z+2) ){
+       z += 2;
+     }
+     break;
+   case 'l':
+     if( z[0]=='e' && z[2]=='b' && (z[3]=='a' || z[3]=='i') && m_gt_1(z+4) ){
+       z += 4;
+     }
+     break;
+   case 'n':
+     if( z[0]=='t' ){
+       if( z[2]=='a' ){
+         if( m_gt_1(z+3) ){
+           z += 3;
+         }
+       }else if( z[2]=='e' ){
+         stem(&z, "tneme", "", m_gt_1) ||
+         stem(&z, "tnem", "", m_gt_1) ||
+         stem(&z, "tne", "", m_gt_1);
+       }
+     }
+     break;
+   case 'o':
+     if( z[0]=='u' ){
+       if( m_gt_1(z+2) ){
+         z += 2;
+       }
+     }else if( z[3]=='s' || z[3]=='t' ){
+       stem(&z, "noi", "", m_gt_1);
+     }
+     break;
+   case 's':
+     if( z[0]=='m' && z[2]=='i' && m_gt_1(z+3) ){
+       z += 3;
+     }
+     break;
+   case 't':
+     stem(&z, "eta", "", m_gt_1) ||
+     stem(&z, "iti", "", m_gt_1);
+     break;
+   case 'u':
+     if( z[0]=='s' && z[2]=='o' && m_gt_1(z+3) ){
+       z += 3;
+     }
+     break;
+   case 'v':
+   case 'z':
+     if( z[0]=='e' && z[2]=='i' && m_gt_1(z+3) ){
+       z += 3;
+     }
+     break;
+  }
+
+  /* Step 5a */
+  if( z[0]=='e' ){
+    if( m_gt_1(z+1) ){
+      z++;
+    }else if( m_eq_1(z+1) && !star_oh(z+1) ){
+      z++;
+    }
+  }
+
+  /* Step 5b */
+  if( m_gt_1(z) && z[0]=='l' && z[1]=='l' ){
+    z++;
+  }
+
+  /* z[] is now the stemmed word in reverse order.  Flip it back
+  ** around into forward order and return.
+  */
+  *pnOut = i = strlen(z);
+  zOut[i] = 0;
+  while( *z ){
+    zOut[--i] = *(z++);
+  }
+}
+
+/*
+** Characters that can be part of a token.  We assume any character
+** whose value is greater than 0x80 (any UTF character) can be
+** part of a token.  In other words, delimiters all must have
+** values of 0x7f or lower.
+*/
+static const char porterIdChar[] = {
+/* x0 x1 x2 x3 x4 x5 x6 x7 x8 x9 xA xB xC xD xE xF */
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0,  /* 3x */
+    0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,  /* 4x */
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1,  /* 5x */
+    0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,  /* 6x */
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0,  /* 7x */
+};
+#define isDelim(C) (((ch=C)&0x80)==0 && (ch<0x30 || !porterIdChar[ch-0x30]))
+
+/*
+** Extract the next token from a tokenization cursor.  The cursor must
+** have been opened by a prior call to porterOpen().
+*/
+static int porterNext(
+  sqlite3_tokenizer_cursor *pCursor,  /* Cursor returned by porterOpen */
+  const char **pzToken,               /* OUT: *pzToken is the token text */
+  int *pnBytes,                       /* OUT: Number of bytes in token */
+  int *piStartOffset,                 /* OUT: Starting offset of token */
+  int *piEndOffset,                   /* OUT: Ending offset of token */
+  int *piPosition                     /* OUT: Position integer of token */
+){
+  porter_tokenizer_cursor *c = (porter_tokenizer_cursor *) pCursor;
+  const char *z = c->zInput;
+
+  while( c->iOffset<c->nInput ){
+    int iStartOffset, ch;
+
+    /* Scan past delimiter characters */
+    while( c->iOffset<c->nInput && isDelim(z[c->iOffset]) ){
+      c->iOffset++;
+    }
+
+    /* Count non-delimiter characters. */
+    iStartOffset = c->iOffset;
+    while( c->iOffset<c->nInput && !isDelim(z[c->iOffset]) ){
+      c->iOffset++;
+    }
+
+    if( c->iOffset>iStartOffset ){
+      int n = c->iOffset-iStartOffset;
+      if( n>c->nAllocated ){
+        c->nAllocated = n+20;
+        c->zToken = sqlite3_realloc(c->zToken, c->nAllocated);
+        if( c->zToken==NULL ) return SQLITE_NOMEM;
+      }
+      porter_stemmer(&z[iStartOffset], n, c->zToken, pnBytes);
+      *pzToken = c->zToken;
+      *piStartOffset = iStartOffset;
+      *piEndOffset = c->iOffset;
+      *piPosition = c->iToken++;
+      return SQLITE_OK;
+    }
+  }
+  return SQLITE_DONE;
+}
+
+/*
+** The set of routines that implement the porter-stemmer tokenizer
+*/
+static const sqlite3_tokenizer_module porterTokenizerModule = {
+  0,
+  porterCreate,
+  porterDestroy,
+  porterOpen,
+  porterClose,
+  porterNext,
+};
+
+/*
+** Allocate a new porter tokenizer.  Return a pointer to the new
+** tokenizer in *ppModule
+*/
+void sqlite3Fts3PorterTokenizerModule(
+  sqlite3_tokenizer_module const**ppModule
+){
+  *ppModule = &porterTokenizerModule;
+}
+
+#endif /* !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_FTS3) */
diff --git a/uppsrc/plugin/sqlite3/lib/fts3_tokenizer.c b/uppsrc/plugin/sqlite3/lib/fts3_tokenizer.c
new file mode 100644
index 000000000..9d35518bd
--- /dev/null
+++ b/uppsrc/plugin/sqlite3/lib/fts3_tokenizer.c
@@ -0,0 +1,371 @@
+/*
+** 2007 June 22
+**
+** The author disclaims copyright to this source code.  In place of
+** a legal notice, here is a blessing:
+**
+**    May you do good and not evil.
+**    May you find forgiveness for yourself and forgive others.
+**    May you share freely, never taking more than you give.
+**
+******************************************************************************
+**
+** This is part of an SQLite module implementing full-text search.
+** This particular file implements the generic tokenizer interface.
+*/
+
+/*
+** The code in this file is only compiled if:
+**
+**     * The FTS3 module is being built as an extension
+**       (in which case SQLITE_CORE is not defined), or
+**
+**     * The FTS3 module is being built into the core of
+**       SQLite (in which case SQLITE_ENABLE_FTS3 is defined).
+*/
+#if !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_FTS3)
+
+#include "sqlite3ext.h"
+#ifndef SQLITE_CORE
+  SQLITE_EXTENSION_INIT1
+#endif
+
+#include "fts3_hash.h"
+#include "fts3_tokenizer.h"
+#include <assert.h>
+
+/*
+** Implementation of the SQL scalar function for accessing the underlying
+** hash table. This function may be called as follows:
+**
+**   SELECT <function-name>(<key-name>);
+**   SELECT <function-name>(<key-name>, <pointer>);
+**
+** where <function-name> is the name passed as the second argument
+** to the sqlite3Fts3InitHashTable() function (e.g. 'fts3_tokenizer').
+**
+** If the <pointer> argument is specified, it must be a blob value
+** containing a pointer to be stored as the hash data corresponding
+** to the string <key-name>. If <pointer> is not specified, then
+** the string <key-name> must already exist in the has table. Otherwise,
+** an error is returned.
+**
+** Whether or not the <pointer> argument is specified, the value returned
+** is a blob containing the pointer stored as the hash data corresponding
+** to string <key-name> (after the hash-table is updated, if applicable).
+*/
+static void scalarFunc(
+  sqlite3_context *context,
+  int argc,
+  sqlite3_value **argv
+){
+  fts3Hash *pHash;
+  void *pPtr = 0;
+  const unsigned char *zName;
+  int nName;
+
+  assert( argc==1 || argc==2 );
+
+  pHash = (fts3Hash *)sqlite3_user_data(context);
+
+  zName = sqlite3_value_text(argv[0]);
+  nName = sqlite3_value_bytes(argv[0])+1;
+
+  if( argc==2 ){
+    void *pOld;
+    int n = sqlite3_value_bytes(argv[1]);
+    if( n!=sizeof(pPtr) ){
+      sqlite3_result_error(context, "argument type mismatch", -1);
+      return;
+    }
+    pPtr = *(void **)sqlite3_value_blob(argv[1]);
+    pOld = sqlite3Fts3HashInsert(pHash, (void *)zName, nName, pPtr);
+    if( pOld==pPtr ){
+      sqlite3_result_error(context, "out of memory", -1);
+      return;
+    }
+  }else{
+    pPtr = sqlite3Fts3HashFind(pHash, zName, nName);
+    if( !pPtr ){
+      char *zErr = sqlite3_mprintf("unknown tokenizer: %s", zName);
+      sqlite3_result_error(context, zErr, -1);
+      sqlite3_free(zErr);
+      return;
+    }
+  }
+
+  sqlite3_result_blob(context, (void *)&pPtr, sizeof(pPtr), SQLITE_TRANSIENT);
+}
+
+#ifdef SQLITE_TEST
+
+#include <tcl.h>
+#include <string.h>
+
+/*
+** Implementation of a special SQL scalar function for testing tokenizers
+** designed to be used in concert with the Tcl testing framework. This
+** function must be called with two arguments:
+**
+**   SELECT <function-name>(<key-name>, <input-string>);
+**   SELECT <function-name>(<key-name>, <pointer>);
+**
+** where <function-name> is the name passed as the second argument
+** to the sqlite3Fts3InitHashTable() function (e.g. 'fts3_tokenizer')
+** concatenated with the string '_test' (e.g. 'fts3_tokenizer_test').
+**
+** The return value is a string that may be interpreted as a Tcl
+** list. For each token in the <input-string>, three elements are
+** added to the returned list. The first is the token position, the
+** second is the token text (folded, stemmed, etc.) and the third is the
+** substring of <input-string> associated with the token. For example,
+** using the built-in "simple" tokenizer:
+**
+**   SELECT fts_tokenizer_test('simple', 'I don't see how');
+**
+** will return the string:
+**
+**   "{0 i I 1 dont don't 2 see see 3 how how}"
+**
+*/
+static void testFunc(
+  sqlite3_context *context,
+  int argc,
+  sqlite3_value **argv
+){
+  fts3Hash *pHash;
+  sqlite3_tokenizer_module *p;
+  sqlite3_tokenizer *pTokenizer = 0;
+  sqlite3_tokenizer_cursor *pCsr = 0;
+
+  const char *zErr = 0;
+
+  const char *zName;
+  int nName;
+  const char *zInput;
+  int nInput;
+
+  const char *zArg = 0;
+
+  const char *zToken;
+  int nToken;
+  int iStart;
+  int iEnd;
+  int iPos;
+
+  Tcl_Obj *pRet;
+
+  assert( argc==2 || argc==3 );
+
+  nName = sqlite3_value_bytes(argv[0]);
+  zName = (const char *)sqlite3_value_text(argv[0]);
+  nInput = sqlite3_value_bytes(argv[argc-1]);
+  zInput = (const char *)sqlite3_value_text(argv[argc-1]);
+
+  if( argc==3 ){
+    zArg = (const char *)sqlite3_value_text(argv[1]);
+  }
+
+  pHash = (fts3Hash *)sqlite3_user_data(context);
+  p = (sqlite3_tokenizer_module *)sqlite3Fts3HashFind(pHash, zName, nName+1);
+
+  if( !p ){
+    char *zErr = sqlite3_mprintf("unknown tokenizer: %s", zName);
+    sqlite3_result_error(context, zErr, -1);
+    sqlite3_free(zErr);
+    return;
+  }
+
+  pRet = Tcl_NewObj();
+  Tcl_IncrRefCount(pRet);
+
+  if( SQLITE_OK!=p->xCreate(zArg ? 1 : 0, &zArg, &pTokenizer) ){
+    zErr = "error in xCreate()";
+    goto finish;
+  }
+  pTokenizer->pModule = p;
+  if( SQLITE_OK!=p->xOpen(pTokenizer, zInput, nInput, &pCsr) ){
+    zErr = "error in xOpen()";
+    goto finish;
+  }
+  pCsr->pTokenizer = pTokenizer;
+
+  while( SQLITE_OK==p->xNext(pCsr, &zToken, &nToken, &iStart, &iEnd, &iPos) ){
+    Tcl_ListObjAppendElement(0, pRet, Tcl_NewIntObj(iPos));
+    Tcl_ListObjAppendElement(0, pRet, Tcl_NewStringObj(zToken, nToken));
+    zToken = &zInput[iStart];
+    nToken = iEnd-iStart;
+    Tcl_ListObjAppendElement(0, pRet, Tcl_NewStringObj(zToken, nToken));
+  }
+
+  if( SQLITE_OK!=p->xClose(pCsr) ){
+    zErr = "error in xClose()";
+    goto finish;
+  }
+  if( SQLITE_OK!=p->xDestroy(pTokenizer) ){
+    zErr = "error in xDestroy()";
+    goto finish;
+  }
+
+finish:
+  if( zErr ){
+    sqlite3_result_error(context, zErr, -1);
+  }else{
+    sqlite3_result_text(context, Tcl_GetString(pRet), -1, SQLITE_TRANSIENT);
+  }
+  Tcl_DecrRefCount(pRet);
+}
+
+static
+int registerTokenizer(
+  sqlite3 *db,
+  char *zName,
+  const sqlite3_tokenizer_module *p
+){
+  int rc;
+  sqlite3_stmt *pStmt;
+  const char zSql[] = "SELECT fts3_tokenizer(?, ?)";
+
+  rc = sqlite3_prepare_v2(db, zSql, -1, &pStmt, 0);
+  if( rc!=SQLITE_OK ){
+    return rc;
+  }
+
+  sqlite3_bind_text(pStmt, 1, zName, -1, SQLITE_STATIC);
+  sqlite3_bind_blob(pStmt, 2, &p, sizeof(p), SQLITE_STATIC);
+  sqlite3_step(pStmt);
+
+  return sqlite3_finalize(pStmt);
+}
+
+static
+int queryTokenizer(
+  sqlite3 *db,
+  char *zName,
+  const sqlite3_tokenizer_module **pp
+){
+  int rc;
+  sqlite3_stmt *pStmt;
+  const char zSql[] = "SELECT fts3_tokenizer(?)";
+
+  *pp = 0;
+  rc = sqlite3_prepare_v2(db, zSql, -1, &pStmt, 0);
+  if( rc!=SQLITE_OK ){
+    return rc;
+  }
+
+  sqlite3_bind_text(pStmt, 1, zName, -1, SQLITE_STATIC);
+  if( SQLITE_ROW==sqlite3_step(pStmt) ){
+    if( sqlite3_column_type(pStmt, 0)==SQLITE_BLOB ){
+      memcpy(pp, sqlite3_column_blob(pStmt, 0), sizeof(*pp));
+    }
+  }
+
+  return sqlite3_finalize(pStmt);
+}
+
+void sqlite3Fts3SimpleTokenizerModule(sqlite3_tokenizer_module const**ppModule);
+
+/*
+** Implementation of the scalar function fts3_tokenizer_internal_test().
+** This function is used for testing only, it is not included in the
+** build unless SQLITE_TEST is defined.
+**
+** The purpose of this is to test that the fts3_tokenizer() function
+** can be used as designed by the C-code in the queryTokenizer and
+** registerTokenizer() functions above. These two functions are repeated
+** in the README.tokenizer file as an example, so it is important to
+** test them.
+**
+** To run the tests, evaluate the fts3_tokenizer_internal_test() scalar
+** function with no arguments. An assert() will fail if a problem is
+** detected. i.e.:
+**
+**     SELECT fts3_tokenizer_internal_test();
+**
+*/
+static void intTestFunc(
+  sqlite3_context *context,
+  int argc,
+  sqlite3_value **argv
+){
+  int rc;
+  const sqlite3_tokenizer_module *p1;
+  const sqlite3_tokenizer_module *p2;
+  sqlite3 *db = (sqlite3 *)sqlite3_user_data(context);
+
+  /* Test the query function */
+  sqlite3Fts3SimpleTokenizerModule(&p1);
+  rc = queryTokenizer(db, "simple", &p2);
+  assert( rc==SQLITE_OK );
+  assert( p1==p2 );
+  rc = queryTokenizer(db, "nosuchtokenizer", &p2);
+  assert( rc==SQLITE_ERROR );
+  assert( p2==0 );
+  assert( 0==strcmp(sqlite3_errmsg(db), "unknown tokenizer: nosuchtokenizer") );
+
+  /* Test the storage function */
+  rc = registerTokenizer(db, "nosuchtokenizer", p1);
+  assert( rc==SQLITE_OK );
+  rc = queryTokenizer(db, "nosuchtokenizer", &p2);
+  assert( rc==SQLITE_OK );
+  assert( p2==p1 );
+
+  sqlite3_result_text(context, "ok", -1, SQLITE_STATIC);
+}
+
+#endif
+
+/*
+** Set up SQL objects in database db used to access the contents of
+** the hash table pointed to by argument pHash. The hash table must
+** been initialised to use string keys, and to take a private copy
+** of the key when a value is inserted. i.e. by a call similar to:
+**
+**    sqlite3Fts3HashInit(pHash, FTS3_HASH_STRING, 1);
+**
+** This function adds a scalar function (see header comment above
+** scalarFunc() in this file for details) and, if ENABLE_TABLE is
+** defined at compilation time, a temporary virtual table (see header
+** comment above struct HashTableVtab) to the database schema. Both
+** provide read/write access to the contents of *pHash.
+**
+** The third argument to this function, zName, is used as the name
+** of both the scalar and, if created, the virtual table.
+*/
+int sqlite3Fts3InitHashTable(
+  sqlite3 *db,
+  fts3Hash *pHash,
+  const char *zName
+){
+  int rc = SQLITE_OK;
+  void *p = (void *)pHash;
+  const int any = SQLITE_ANY;
+  char *zTest = 0;
+  char *zTest2 = 0;
+
+#ifdef SQLITE_TEST
+  void *pdb = (void *)db;
+  zTest = sqlite3_mprintf("%s_test", zName);
+  zTest2 = sqlite3_mprintf("%s_internal_test", zName);
+  if( !zTest || !zTest2 ){
+    rc = SQLITE_NOMEM;
+  }
+#endif
+
+  if( rc!=SQLITE_OK
+   || (rc = sqlite3_create_function(db, zName, 1, any, p, scalarFunc, 0, 0))
+   || (rc = sqlite3_create_function(db, zName, 2, any, p, scalarFunc, 0, 0))
+#ifdef SQLITE_TEST
+   || (rc = sqlite3_create_function(db, zTest, 2, any, p, testFunc, 0, 0))
+   || (rc = sqlite3_create_function(db, zTest, 3, any, p, testFunc, 0, 0))
+   || (rc = sqlite3_create_function(db, zTest2, 0, any, pdb, intTestFunc, 0, 0))
+#endif
+  );
+
+  sqlite3_free(zTest);
+  sqlite3_free(zTest2);
+  return rc;
+}
+
+#endif /* !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_FTS3) */
diff --git a/uppsrc/plugin/sqlite3/lib/fts3_tokenizer.h b/uppsrc/plugin/sqlite3/lib/fts3_tokenizer.h
new file mode 100644
index 000000000..4b0b4f607
--- /dev/null
+++ b/uppsrc/plugin/sqlite3/lib/fts3_tokenizer.h
@@ -0,0 +1,145 @@
+/*
+** 2006 July 10
+**
+** The author disclaims copyright to this source code.
+**
+*************************************************************************
+** Defines the interface to tokenizers used by fulltext-search.  There
+** are three basic components:
+**
+** sqlite3_tokenizer_module is a singleton defining the tokenizer
+** interface functions.  This is essentially the class structure for
+** tokenizers.
+**
+** sqlite3_tokenizer is used to define a particular tokenizer, perhaps
+** including customization information defined at creation time.
+**
+** sqlite3_tokenizer_cursor is generated by a tokenizer to generate
+** tokens from a particular input.
+*/
+#ifndef _FTS3_TOKENIZER_H_
+#define _FTS3_TOKENIZER_H_
+
+/* TODO(shess) Only used for SQLITE_OK and SQLITE_DONE at this time.
+** If tokenizers are to be allowed to call sqlite3_*() functions, then
+** we will need a way to register the API consistently.
+*/
+#include "sqlite3.h"
+
+/*
+** Structures used by the tokenizer interface. When a new tokenizer
+** implementation is registered, the caller provides a pointer to
+** an sqlite3_tokenizer_module containing pointers to the callback
+** functions that make up an implementation.
+**
+** When an fts3 table is created, it passes any arguments passed to
+** the tokenizer clause of the CREATE VIRTUAL TABLE statement to the
+** sqlite3_tokenizer_module.xCreate() function of the requested tokenizer
+** implementation. The xCreate() function in turn returns an
+** sqlite3_tokenizer structure representing the specific tokenizer to
+** be used for the fts3 table (customized by the tokenizer clause arguments).
+**
+** To tokenize an input buffer, the sqlite3_tokenizer_module.xOpen()
+** method is called. It returns an sqlite3_tokenizer_cursor object
+** that may be used to tokenize a specific input buffer based on
+** the tokenization rules supplied by a specific sqlite3_tokenizer
+** object.
+*/
+typedef struct sqlite3_tokenizer_module sqlite3_tokenizer_module;
+typedef struct sqlite3_tokenizer sqlite3_tokenizer;
+typedef struct sqlite3_tokenizer_cursor sqlite3_tokenizer_cursor;
+
+struct sqlite3_tokenizer_module {
+
+  /*
+  ** Structure version. Should always be set to 0.
+  */
+  int iVersion;
+
+  /*
+  ** Create a new tokenizer. The values in the argv[] array are the
+  ** arguments passed to the "tokenizer" clause of the CREATE VIRTUAL
+  ** TABLE statement that created the fts3 table. For example, if
+  ** the following SQL is executed:
+  **
+  **   CREATE .. USING fts3( ... , tokenizer <tokenizer-name> arg1 arg2)
+  **
+  ** then argc is set to 2, and the argv[] array contains pointers
+  ** to the strings "arg1" and "arg2".
+  **
+  ** This method should return either SQLITE_OK (0), or an SQLite error
+  ** code. If SQLITE_OK is returned, then *ppTokenizer should be set
+  ** to point at the newly created tokenizer structure. The generic
+  ** sqlite3_tokenizer.pModule variable should not be initialised by
+  ** this callback. The caller will do so.
+  */
+  int (*xCreate)(
+    int argc,                           /* Size of argv array */
+    const char *const*argv,             /* Tokenizer argument strings */
+    sqlite3_tokenizer **ppTokenizer     /* OUT: Created tokenizer */
+  );
+
+  /*
+  ** Destroy an existing tokenizer. The fts3 module calls this method
+  ** exactly once for each successful call to xCreate().
+  */
+  int (*xDestroy)(sqlite3_tokenizer *pTokenizer);
+
+  /*
+  ** Create a tokenizer cursor to tokenize an input buffer. The caller
+  ** is responsible for ensuring that the input buffer remains valid
+  ** until the cursor is closed (using the xClose() method).
+  */
+  int (*xOpen)(
+    sqlite3_tokenizer *pTokenizer,       /* Tokenizer object */
+    const char *pInput, int nBytes,      /* Input buffer */
+    sqlite3_tokenizer_cursor **ppCursor  /* OUT: Created tokenizer cursor */
+  );
+
+  /*
+  ** Destroy an existing tokenizer cursor. The fts3 module calls this
+  ** method exactly once for each successful call to xOpen().
+  */
+  int (*xClose)(sqlite3_tokenizer_cursor *pCursor);
+
+  /*
+  ** Retrieve the next token from the tokenizer cursor pCursor. This
+  ** method should either return SQLITE_OK and set the values of the
+  ** "OUT" variables identified below, or SQLITE_DONE to indicate that
+  ** the end of the buffer has been reached, or an SQLite error code.
+  **
+  ** *ppToken should be set to point at a buffer containing the
+  ** normalized version of the token (i.e. after any case-folding and/or
+  ** stemming has been performed). *pnBytes should be set to the length
+  ** of this buffer in bytes. The input text that generated the token is
+  ** identified by the byte offsets returned in *piStartOffset and
+  ** *piEndOffset.
+  **
+  ** The buffer *ppToken is set to point at is managed by the tokenizer
+  ** implementation. It is only required to be valid until the next call
+  ** to xNext() or xClose().
+  */
+  /* TODO(shess) current implementation requires pInput to be
+  ** nul-terminated.  This should either be fixed, or pInput/nBytes
+  ** should be converted to zInput.
+  */
+  int (*xNext)(
+    sqlite3_tokenizer_cursor *pCursor,   /* Tokenizer cursor */
+    const char **ppToken, int *pnBytes,  /* OUT: Normalized text for token */
+    int *piStartOffset,  /* OUT: Byte offset of token in input buffer */
+    int *piEndOffset,    /* OUT: Byte offset of end of token in input buffer */
+    int *piPosition      /* OUT: Number of tokens returned before this one */
+  );
+};
+
+struct sqlite3_tokenizer {
+  const sqlite3_tokenizer_module *pModule;  /* The module for this tokenizer */
+  /* Tokenizer implementations will typically add additional fields */
+};
+
+struct sqlite3_tokenizer_cursor {
+  sqlite3_tokenizer *pTokenizer;       /* Tokenizer for this cursor. */
+  /* Tokenizer implementations will typically add additional fields */
+};
+
+#endif /* _FTS3_TOKENIZER_H_ */
diff --git a/uppsrc/plugin/sqlite3/lib/fts3_tokenizer1.c b/uppsrc/plugin/sqlite3/lib/fts3_tokenizer1.c
new file mode 100644
index 000000000..58215c7ac
--- /dev/null
+++ b/uppsrc/plugin/sqlite3/lib/fts3_tokenizer1.c
@@ -0,0 +1,230 @@
+/*
+** 2006 Oct 10
+**
+** The author disclaims copyright to this source code.  In place of
+** a legal notice, here is a blessing:
+**
+**    May you do good and not evil.
+**    May you find forgiveness for yourself and forgive others.
+**    May you share freely, never taking more than you give.
+**
+******************************************************************************
+**
+** Implementation of the "simple" full-text-search tokenizer.
+*/
+
+/*
+** The code in this file is only compiled if:
+**
+**     * The FTS3 module is being built as an extension
+**       (in which case SQLITE_CORE is not defined), or
+**
+**     * The FTS3 module is being built into the core of
+**       SQLite (in which case SQLITE_ENABLE_FTS3 is defined).
+*/
+#if !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_FTS3)
+
+
+#include <assert.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <ctype.h>
+
+#include "fts3_tokenizer.h"
+
+typedef struct simple_tokenizer {
+  sqlite3_tokenizer base;
+  char delim[128];             /* flag ASCII delimiters */
+} simple_tokenizer;
+
+typedef struct simple_tokenizer_cursor {
+  sqlite3_tokenizer_cursor base;
+  const char *pInput;          /* input we are tokenizing */
+  int nBytes;                  /* size of the input */
+  int iOffset;                 /* current position in pInput */
+  int iToken;                  /* index of next token to be returned */
+  char *pToken;                /* storage for current token */
+  int nTokenAllocated;         /* space allocated to zToken buffer */
+} simple_tokenizer_cursor;
+
+
+/* Forward declaration */
+static const sqlite3_tokenizer_module simpleTokenizerModule;
+
+static int simpleDelim(simple_tokenizer *t, unsigned char c){
+  return c<0x80 && t->delim[c];
+}
+
+/*
+** Create a new tokenizer instance.
+*/
+static int simpleCreate(
+  int argc, const char * const *argv,
+  sqlite3_tokenizer **ppTokenizer
+){
+  simple_tokenizer *t;
+
+  t = (simple_tokenizer *) sqlite3_malloc(sizeof(*t));
+  if( t==NULL ) return SQLITE_NOMEM;
+  memset(t, 0, sizeof(*t));
+
+  /* TODO(shess) Delimiters need to remain the same from run to run,
+  ** else we need to reindex.  One solution would be a meta-table to
+  ** track such information in the database, then we'd only want this
+  ** information on the initial create.
+  */
+  if( argc>1 ){
+    int i, n = strlen(argv[1]);
+    for(i=0; i<n; i++){
+      unsigned char ch = argv[1][i];
+      /* We explicitly don't support UTF-8 delimiters for now. */
+      if( ch>=0x80 ){
+        sqlite3_free(t);
+        return SQLITE_ERROR;
+      }
+      t->delim[ch] = 1;
+    }
+  } else {
+    /* Mark non-alphanumeric ASCII characters as delimiters */
+    int i;
+    for(i=1; i<0x80; i++){
+      t->delim[i] = !isalnum(i);
+    }
+  }
+
+  *ppTokenizer = &t->base;
+  return SQLITE_OK;
+}
+
+/*
+** Destroy a tokenizer
+*/
+static int simpleDestroy(sqlite3_tokenizer *pTokenizer){
+  sqlite3_free(pTokenizer);
+  return SQLITE_OK;
+}
+
+/*
+** Prepare to begin tokenizing a particular string.  The input
+** string to be tokenized is pInput[0..nBytes-1].  A cursor
+** used to incrementally tokenize this string is returned in
+** *ppCursor.
+*/
+static int simpleOpen(
+  sqlite3_tokenizer *pTokenizer,         /* The tokenizer */
+  const char *pInput, int nBytes,        /* String to be tokenized */
+  sqlite3_tokenizer_cursor **ppCursor    /* OUT: Tokenization cursor */
+){
+  simple_tokenizer_cursor *c;
+
+  c = (simple_tokenizer_cursor *) sqlite3_malloc(sizeof(*c));
+  if( c==NULL ) return SQLITE_NOMEM;
+
+  c->pInput = pInput;
+  if( pInput==0 ){
+    c->nBytes = 0;
+  }else if( nBytes<0 ){
+    c->nBytes = (int)strlen(pInput);
+  }else{
+    c->nBytes = nBytes;
+  }
+  c->iOffset = 0;                 /* start tokenizing at the beginning */
+  c->iToken = 0;
+  c->pToken = NULL;               /* no space allocated, yet. */
+  c->nTokenAllocated = 0;
+
+  *ppCursor = &c->base;
+  return SQLITE_OK;
+}
+
+/*
+** Close a tokenization cursor previously opened by a call to
+** simpleOpen() above.
+*/
+static int simpleClose(sqlite3_tokenizer_cursor *pCursor){
+  simple_tokenizer_cursor *c = (simple_tokenizer_cursor *) pCursor;
+  sqlite3_free(c->pToken);
+  sqlite3_free(c);
+  return SQLITE_OK;
+}
+
+/*
+** Extract the next token from a tokenization cursor.  The cursor must
+** have been opened by a prior call to simpleOpen().
+*/
+static int simpleNext(
+  sqlite3_tokenizer_cursor *pCursor,  /* Cursor returned by simpleOpen */
+  const char **ppToken,               /* OUT: *ppToken is the token text */
+  int *pnBytes,                       /* OUT: Number of bytes in token */
+  int *piStartOffset,                 /* OUT: Starting offset of token */
+  int *piEndOffset,                   /* OUT: Ending offset of token */
+  int *piPosition                     /* OUT: Position integer of token */
+){
+  simple_tokenizer_cursor *c = (simple_tokenizer_cursor *) pCursor;
+  simple_tokenizer *t = (simple_tokenizer *) pCursor->pTokenizer;
+  unsigned char *p = (unsigned char *)c->pInput;
+
+  while( c->iOffset<c->nBytes ){
+    int iStartOffset;
+
+    /* Scan past delimiter characters */
+    while( c->iOffset<c->nBytes && simpleDelim(t, p[c->iOffset]) ){
+      c->iOffset++;
+    }
+
+    /* Count non-delimiter characters. */
+    iStartOffset = c->iOffset;
+    while( c->iOffset<c->nBytes && !simpleDelim(t, p[c->iOffset]) ){
+      c->iOffset++;
+    }
+
+    if( c->iOffset>iStartOffset ){
+      int i, n = c->iOffset-iStartOffset;
+      if( n>c->nTokenAllocated ){
+        c->nTokenAllocated = n+20;
+        c->pToken = sqlite3_realloc(c->pToken, c->nTokenAllocated);
+        if( c->pToken==NULL ) return SQLITE_NOMEM;
+      }
+      for(i=0; i<n; i++){
+        /* TODO(shess) This needs expansion to handle UTF-8
+        ** case-insensitivity.
+        */
+        unsigned char ch = p[iStartOffset+i];
+        c->pToken[i] = ch<0x80 ? tolower(ch) : ch;
+      }
+      *ppToken = c->pToken;
+      *pnBytes = n;
+      *piStartOffset = iStartOffset;
+      *piEndOffset = c->iOffset;
+      *piPosition = c->iToken++;
+
+      return SQLITE_OK;
+    }
+  }
+  return SQLITE_DONE;
+}
+
+/*
+** The set of routines that implement the simple tokenizer
+*/
+static const sqlite3_tokenizer_module simpleTokenizerModule = {
+  0,
+  simpleCreate,
+  simpleDestroy,
+  simpleOpen,
+  simpleClose,
+  simpleNext,
+};
+
+/*
+** Allocate a new simple tokenizer.  Return a pointer to the new
+** tokenizer in *ppModule
+*/
+void sqlite3Fts3SimpleTokenizerModule(
+  sqlite3_tokenizer_module const**ppModule
+){
+  *ppModule = &simpleTokenizerModule;
+}
+
+#endif /* !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_FTS3) */
diff --git a/uppsrc/plugin/sqlite3/lib/func.c b/uppsrc/plugin/sqlite3/lib/func.c
new file mode 100644
index 000000000..51bb6295c
--- /dev/null
+++ b/uppsrc/plugin/sqlite3/lib/func.c
@@ -0,0 +1,1573 @@
+/*
+** 2002 February 23
+**
+** The author disclaims copyright to this source code.  In place of
+** a legal notice, here is a blessing:
+**
+**    May you do good and not evil.
+**    May you find forgiveness for yourself and forgive others.
+**    May you share freely, never taking more than you give.
+**
+*************************************************************************
+** This file contains the C functions that implement various SQL
+** functions of SQLite.
+**
+** There is only one exported symbol in this file - the function
+** sqliteRegisterBuildinFunctions() found at the bottom of the file.
+** All other code has file scope.
+**
+** $Id: func.c,v 1.186 2008/03/06 09:58:50 mlcreech Exp $
+*/
+#include "sqliteInt.h"
+#include <ctype.h>
+#include <stdlib.h>
+#include <assert.h>
+#include "vdbeInt.h"
+
+
+/*
+** Return the collating function associated with a function.
+*/
+static CollSeq *sqlite3GetFuncCollSeq(sqlite3_context *context){
+  return context->pColl;
+}
+
+/*
+** Implementation of the non-aggregate min() and max() functions
+*/
+static void minmaxFunc(
+  sqlite3_context *context,
+  int argc,
+  sqlite3_value **argv
+){
+  int i;
+  int mask;    /* 0 for min() or 0xffffffff for max() */
+  int iBest;
+  CollSeq *pColl;
+
+  if( argc==0 ) return;
+  mask = sqlite3_user_data(context)==0 ? 0 : -1;
+  pColl = sqlite3GetFuncCollSeq(context);
+  assert( pColl );
+  assert( mask==-1 || mask==0 );
+  iBest = 0;
+  if( sqlite3_value_type(argv[0])==SQLITE_NULL ) return;
+  for(i=1; i<argc; i++){
+    if( sqlite3_value_type(argv[i])==SQLITE_NULL ) return;
+    if( (sqlite3MemCompare(argv[iBest], argv[i], pColl)^mask)>=0 ){
+      iBest = i;
+    }
+  }
+  sqlite3_result_value(context, argv[iBest]);
+}
+
+/*
+** Return the type of the argument.
+*/
+static void typeofFunc(
+  sqlite3_context *context,
+  int argc,
+  sqlite3_value **argv
+){
+  const char *z = 0;
+  switch( sqlite3_value_type(argv[0]) ){
+    case SQLITE_NULL:    z = "null";    break;
+    case SQLITE_INTEGER: z = "integer"; break;
+    case SQLITE_TEXT:    z = "text";    break;
+    case SQLITE_FLOAT:   z = "real";    break;
+    case SQLITE_BLOB:    z = "blob";    break;
+  }
+  sqlite3_result_text(context, z, -1, SQLITE_STATIC);
+}
+
+
+/*
+** Implementation of the length() function
+*/
+static void lengthFunc(
+  sqlite3_context *context,
+  int argc,
+  sqlite3_value **argv
+){
+  int len;
+
+  assert( argc==1 );
+  switch( sqlite3_value_type(argv[0]) ){
+    case SQLITE_BLOB:
+    case SQLITE_INTEGER:
+    case SQLITE_FLOAT: {
+      sqlite3_result_int(context, sqlite3_value_bytes(argv[0]));
+      break;
+    }
+    case SQLITE_TEXT: {
+      const unsigned char *z = sqlite3_value_text(argv[0]);
+      if( z==0 ) return;
+      len = 0;
+      while( *z ){
+        len++;
+        SQLITE_SKIP_UTF8(z);
+      }
+      sqlite3_result_int(context, len);
+      break;
+    }
+    default: {
+      sqlite3_result_null(context);
+      break;
+    }
+  }
+}
+
+/*
+** Implementation of the abs() function
+*/
+static void absFunc(sqlite3_context *context, int argc, sqlite3_value **argv){
+  assert( argc==1 );
+  switch( sqlite3_value_type(argv[0]) ){
+    case SQLITE_INTEGER: {
+      i64 iVal = sqlite3_value_int64(argv[0]);
+      if( iVal<0 ){
+        if( (iVal<<1)==0 ){
+          sqlite3_result_error(context, "integer overflow", -1);
+          return;
+        }
+        iVal = -iVal;
+      }
+      sqlite3_result_int64(context, iVal);
+      break;
+    }
+    case SQLITE_NULL: {
+      sqlite3_result_null(context);
+      break;
+    }
+    default: {
+      double rVal = sqlite3_value_double(argv[0]);
+      if( rVal<0 ) rVal = -rVal;
+      sqlite3_result_double(context, rVal);
+      break;
+    }
+  }
+}
+
+/*
+** Implementation of the substr() function.
+**
+** substr(x,p1,p2)  returns p2 characters of x[] beginning with p1.
+** p1 is 1-indexed.  So substr(x,1,1) returns the first character
+** of x.  If x is text, then we actually count UTF-8 characters.
+** If x is a blob, then we count bytes.
+**
+** If p1 is negative, then we begin abs(p1) from the end of x[].
+*/
+static void substrFunc(
+  sqlite3_context *context,
+  int argc,
+  sqlite3_value **argv
+){
+  const unsigned char *z;
+  const unsigned char *z2;
+  int len;
+  int p0type;
+  i64 p1, p2;
+
+  assert( argc==3 || argc==2 );
+  p0type = sqlite3_value_type(argv[0]);
+  if( p0type==SQLITE_BLOB ){
+    len = sqlite3_value_bytes(argv[0]);
+    z = sqlite3_value_blob(argv[0]);
+    if( z==0 ) return;
+    assert( len==sqlite3_value_bytes(argv[0]) );
+  }else{
+    z = sqlite3_value_text(argv[0]);
+    if( z==0 ) return;
+    len = 0;
+    for(z2=z; *z2; len++){
+      SQLITE_SKIP_UTF8(z2);
+    }
+  }
+  p1 = sqlite3_value_int(argv[1]);
+  if( argc==3 ){
+    p2 = sqlite3_value_int(argv[2]);
+  }else{
+    p2 = SQLITE_MAX_LENGTH;
+  }
+  if( p1<0 ){
+    p1 += len;
+    if( p1<0 ){
+      p2 += p1;
+      p1 = 0;
+    }
+  }else if( p1>0 ){
+    p1--;
+  }
+  if( p1+p2>len ){
+    p2 = len-p1;
+  }
+  if( p0type!=SQLITE_BLOB ){
+    while( *z && p1 ){
+      SQLITE_SKIP_UTF8(z);
+      p1--;
+    }
+    for(z2=z; *z2 && p2; p2--){
+      SQLITE_SKIP_UTF8(z2);
+    }
+    sqlite3_result_text(context, (char*)z, z2-z, SQLITE_TRANSIENT);
+  }else{
+    if( p2<0 ) p2 = 0;
+    sqlite3_result_blob(context, (char*)&z[p1], p2, SQLITE_TRANSIENT);
+  }
+}
+
+/*
+** Implementation of the round() function
+*/
+static void roundFunc(sqlite3_context *context, int argc, sqlite3_value **argv){
+  int n = 0;
+  double r;
+  char zBuf[500];  /* larger than the %f representation of the largest double */
+  assert( argc==1 || argc==2 );
+  if( argc==2 ){
+    if( SQLITE_NULL==sqlite3_value_type(argv[1]) ) return;
+    n = sqlite3_value_int(argv[1]);
+    if( n>30 ) n = 30;
+    if( n<0 ) n = 0;
+  }
+  if( sqlite3_value_type(argv[0])==SQLITE_NULL ) return;
+  r = sqlite3_value_double(argv[0]);
+  sqlite3_snprintf(sizeof(zBuf),zBuf,"%.*f",n,r);
+  sqlite3AtoF(zBuf, &r);
+  sqlite3_result_double(context, r);
+}
+
+/*
+** Allocate nByte bytes of space using sqlite3_malloc(). If the
+** allocation fails, call sqlite3_result_error_nomem() to notify
+** the database handle that malloc() has failed.
+*/
+static void *contextMalloc(sqlite3_context *context, int nByte){
+  char *z = sqlite3_malloc(nByte);
+  if( !z && nByte>0 ){
+    sqlite3_result_error_nomem(context);
+  }
+  return z;
+}
+
+/*
+** Implementation of the upper() and lower() SQL functions.
+*/
+static void upperFunc(sqlite3_context *context, int argc, sqlite3_value **argv){
+  char *z1;
+  const char *z2;
+  int i, n;
+  if( argc<1 || SQLITE_NULL==sqlite3_value_type(argv[0]) ) return;
+  z2 = (char*)sqlite3_value_text(argv[0]);
+  n = sqlite3_value_bytes(argv[0]);
+  /* Verify that the call to _bytes() does not invalidate the _text() pointer */
+  assert( z2==(char*)sqlite3_value_text(argv[0]) );
+  if( z2 ){
+    z1 = contextMalloc(context, n+1);
+    if( z1 ){
+      memcpy(z1, z2, n+1);
+      for(i=0; z1[i]; i++){
+        z1[i] = toupper(z1[i]);
+      }
+      sqlite3_result_text(context, z1, -1, sqlite3_free);
+    }
+  }
+}
+static void lowerFunc(sqlite3_context *context, int argc, sqlite3_value **argv){
+  char *z1;
+  const char *z2;
+  int i, n;
+  if( argc<1 || SQLITE_NULL==sqlite3_value_type(argv[0]) ) return;
+  z2 = (char*)sqlite3_value_text(argv[0]);
+  n = sqlite3_value_bytes(argv[0]);
+  /* Verify that the call to _bytes() does not invalidate the _text() pointer */
+  assert( z2==(char*)sqlite3_value_text(argv[0]) );
+  if( z2 ){
+    z1 = contextMalloc(context, n+1);
+    if( z1 ){
+      memcpy(z1, z2, n+1);
+      for(i=0; z1[i]; i++){
+        z1[i] = tolower(z1[i]);
+      }
+      sqlite3_result_text(context, z1, -1, sqlite3_free);
+    }
+  }
+}
+
+/*
+** Implementation of the IFNULL(), NVL(), and COALESCE() functions.
+** All three do the same thing.  They return the first non-NULL
+** argument.
+*/
+static void ifnullFunc(
+  sqlite3_context *context,
+  int argc,
+  sqlite3_value **argv
+){
+  int i;
+  for(i=0; i<argc; i++){
+    if( SQLITE_NULL!=sqlite3_value_type(argv[i]) ){
+      sqlite3_result_value(context, argv[i]);
+      break;
+    }
+  }
+}
+
+/*
+** Implementation of random().  Return a random integer.
+*/
+static void randomFunc(
+  sqlite3_context *context,
+  int argc,
+  sqlite3_value **argv
+){
+  sqlite_int64 r;
+  sqlite3Randomness(sizeof(r), &r);
+  if( (r<<1)==0 ) r = 0;  /* Prevent 0x8000.... as the result so that we */
+                          /* can always do abs() of the result */
+  sqlite3_result_int64(context, r);
+}
+
+/*
+** Implementation of randomblob(N).  Return a random blob
+** that is N bytes long.
+*/
+static void randomBlob(
+  sqlite3_context *context,
+  int argc,
+  sqlite3_value **argv
+){
+  int n;
+  unsigned char *p;
+  assert( argc==1 );
+  n = sqlite3_value_int(argv[0]);
+  if( n<1 ){
+    n = 1;
+  }
+  if( n>SQLITE_MAX_LENGTH ){
+    sqlite3_result_error_toobig(context);
+    return;
+  }
+  p = contextMalloc(context, n);
+  if( p ){
+    sqlite3Randomness(n, p);
+    sqlite3_result_blob(context, (char*)p, n, sqlite3_free);
+  }
+}
+
+/*
+** Implementation of the last_insert_rowid() SQL function.  The return
+** value is the same as the sqlite3_last_insert_rowid() API function.
+*/
+static void last_insert_rowid(
+  sqlite3_context *context,
+  int arg,
+  sqlite3_value **argv
+){
+  sqlite3 *db = sqlite3_user_data(context);
+  sqlite3_result_int64(context, sqlite3_last_insert_rowid(db));
+}
+
+/*
+** Implementation of the changes() SQL function.  The return value is the
+** same as the sqlite3_changes() API function.
+*/
+static void changes(
+  sqlite3_context *context,
+  int arg,
+  sqlite3_value **argv
+){
+  sqlite3 *db = sqlite3_user_data(context);
+  sqlite3_result_int(context, sqlite3_changes(db));
+}
+
+/*
+** Implementation of the total_changes() SQL function.  The return value is
+** the same as the sqlite3_total_changes() API function.
+*/
+static void total_changes(
+  sqlite3_context *context,
+  int arg,
+  sqlite3_value **argv
+){
+  sqlite3 *db = sqlite3_user_data(context);
+  sqlite3_result_int(context, sqlite3_total_changes(db));
+}
+
+/*
+** A structure defining how to do GLOB-style comparisons.
+*/
+struct compareInfo {
+  u8 matchAll;
+  u8 matchOne;
+  u8 matchSet;
+  u8 noCase;
+};
+
+/*
+** For LIKE and GLOB matching on EBCDIC machines, assume that every
+** character is exactly one byte in size.  Also, all characters are
+** able to participate in upper-case-to-lower-case mappings in EBCDIC
+** whereas only characters less than 0x80 do in ASCII.
+*/
+#if defined(SQLITE_EBCDIC)
+# define sqlite3Utf8Read(A,B,C)  (*(A++))
+# define GlogUpperToLower(A)     A = sqlite3UpperToLower[A]
+#else
+# define GlogUpperToLower(A)     if( A<0x80 ){ A = sqlite3UpperToLower[A]; }
+#endif
+
+static const struct compareInfo globInfo = { '*', '?', '[', 0 };
+/* The correct SQL-92 behavior is for the LIKE operator to ignore
+** case.  Thus  'a' LIKE 'A' would be true. */
+static const struct compareInfo likeInfoNorm = { '%', '_',   0, 1 };
+/* If SQLITE_CASE_SENSITIVE_LIKE is defined, then the LIKE operator
+** is case sensitive causing 'a' LIKE 'A' to be false */
+static const struct compareInfo likeInfoAlt = { '%', '_',   0, 0 };
+
+/*
+** Compare two UTF-8 strings for equality where the first string can
+** potentially be a "glob" expression.  Return true (1) if they
+** are the same and false (0) if they are different.
+**
+** Globbing rules:
+**
+**      '*'       Matches any sequence of zero or more characters.
+**
+**      '?'       Matches exactly one character.
+**
+**     [...]      Matches one character from the enclosed list of
+**                characters.
+**
+**     [^...]     Matches one character not in the enclosed list.
+**
+** With the [...] and [^...] matching, a ']' character can be included
+** in the list by making it the first character after '[' or '^'.  A
+** range of characters can be specified using '-'.  Example:
+** "[a-z]" matches any single lower-case letter.  To match a '-', make
+** it the last character in the list.
+**
+** This routine is usually quick, but can be N**2 in the worst case.
+**
+** Hints: to match '*' or '?', put them in "[]".  Like this:
+**
+**         abc[*]xyz        Matches "abc*xyz" only
+*/
+static int patternCompare(
+  const u8 *zPattern,              /* The glob pattern */
+  const u8 *zString,               /* The string to compare against the glob */
+  const struct compareInfo *pInfo, /* Information about how to do the compare */
+  const int esc                    /* The escape character */
+){
+  int c, c2;
+  int invert;
+  int seen;
+  u8 matchOne = pInfo->matchOne;
+  u8 matchAll = pInfo->matchAll;
+  u8 matchSet = pInfo->matchSet;
+  u8 noCase = pInfo->noCase;
+  int prevEscape = 0;     /* True if the previous character was 'escape' */
+
+  while( (c = sqlite3Utf8Read(zPattern,0,&zPattern))!=0 ){
+    if( !prevEscape && c==matchAll ){
+      while( (c=sqlite3Utf8Read(zPattern,0,&zPattern)) == matchAll
+               || c == matchOne ){
+        if( c==matchOne && sqlite3Utf8Read(zString, 0, &zString)==0 ){
+          return 0;
+        }
+      }
+      if( c==0 ){
+        return 1;
+      }else if( c==esc ){
+        c = sqlite3Utf8Read(zPattern, 0, &zPattern);
+        if( c==0 ){
+          return 0;
+        }
+      }else if( c==matchSet ){
+        assert( esc==0 );         /* This is GLOB, not LIKE */
+        assert( matchSet<0x80 );  /* '[' is a single-byte character */
+        while( *zString && patternCompare(&zPattern[-1],zString,pInfo,esc)==0 ){
+          SQLITE_SKIP_UTF8(zString);
+        }
+        return *zString!=0;
+      }
+      while( (c2 = sqlite3Utf8Read(zString,0,&zString))!=0 ){
+        if( noCase ){
+          GlogUpperToLower(c2);
+          GlogUpperToLower(c);
+          while( c2 != 0 && c2 != c ){
+            c2 = sqlite3Utf8Read(zString, 0, &zString);
+            GlogUpperToLower(c2);
+          }
+        }else{
+          while( c2 != 0 && c2 != c ){
+            c2 = sqlite3Utf8Read(zString, 0, &zString);
+          }
+        }
+        if( c2==0 ) return 0;
+        if( patternCompare(zPattern,zString,pInfo,esc) ) return 1;
+      }
+      return 0;
+    }else if( !prevEscape && c==matchOne ){
+      if( sqlite3Utf8Read(zString, 0, &zString)==0 ){
+        return 0;
+      }
+    }else if( c==matchSet ){
+      int prior_c = 0;
+      assert( esc==0 );    /* This only occurs for GLOB, not LIKE */
+      seen = 0;
+      invert = 0;
+      c = sqlite3Utf8Read(zString, 0, &zString);
+      if( c==0 ) return 0;
+      c2 = sqlite3Utf8Read(zPattern, 0, &zPattern);
+      if( c2=='^' ){
+        invert = 1;
+        c2 = sqlite3Utf8Read(zPattern, 0, &zPattern);
+      }
+      if( c2==']' ){
+        if( c==']' ) seen = 1;
+        c2 = sqlite3Utf8Read(zPattern, 0, &zPattern);
+      }
+      while( c2 && c2!=']' ){
+        if( c2=='-' && zPattern[0]!=']' && zPattern[0]!=0 && prior_c>0 ){
+          c2 = sqlite3Utf8Read(zPattern, 0, &zPattern);
+          if( c>=prior_c && c<=c2 ) seen = 1;
+          prior_c = 0;
+        }else{
+          if( c==c2 ){
+            seen = 1;
+          }
+          prior_c = c2;
+        }
+        c2 = sqlite3Utf8Read(zPattern, 0, &zPattern);
+      }
+      if( c2==0 || (seen ^ invert)==0 ){
+        return 0;
+      }
+    }else if( esc==c && !prevEscape ){
+      prevEscape = 1;
+    }else{
+      c2 = sqlite3Utf8Read(zString, 0, &zString);
+      if( noCase ){
+        GlogUpperToLower(c);
+        GlogUpperToLower(c2);
+      }
+      if( c!=c2 ){
+        return 0;
+      }
+      prevEscape = 0;
+    }
+  }
+  return *zString==0;
+}
+
+/*
+** Count the number of times that the LIKE operator (or GLOB which is
+** just a variation of LIKE) gets called.  This is used for testing
+** only.
+*/
+#ifdef SQLITE_TEST
+int sqlite3_like_count = 0;
+#endif
+
+
+/*
+** Implementation of the like() SQL function.  This function implements
+** the build-in LIKE operator.  The first argument to the function is the
+** pattern and the second argument is the string.  So, the SQL statements:
+**
+**       A LIKE B
+**
+** is implemented as like(B,A).
+**
+** This same function (with a different compareInfo structure) computes
+** the GLOB operator.
+*/
+static void likeFunc(
+  sqlite3_context *context,
+  int argc,
+  sqlite3_value **argv
+){
+  const unsigned char *zA, *zB;
+  int escape = 0;
+
+  zB = sqlite3_value_text(argv[0]);
+  zA = sqlite3_value_text(argv[1]);
+
+  /* Limit the length of the LIKE or GLOB pattern to avoid problems
+  ** of deep recursion and N*N behavior in patternCompare().
+  */
+  if( sqlite3_value_bytes(argv[0])>SQLITE_MAX_LIKE_PATTERN_LENGTH ){
+    sqlite3_result_error(context, "LIKE or GLOB pattern too complex", -1);
+    return;
+  }
+  assert( zB==sqlite3_value_text(argv[0]) );  /* Encoding did not change */
+
+  if( argc==3 ){
+    /* The escape character string must consist of a single UTF-8 character.
+    ** Otherwise, return an error.
+    */
+    const unsigned char *zEsc = sqlite3_value_text(argv[2]);
+    if( zEsc==0 ) return;
+    if( sqlite3Utf8CharLen((char*)zEsc, -1)!=1 ){
+      sqlite3_result_error(context,
+          "ESCAPE expression must be a single character", -1);
+      return;
+    }
+    escape = sqlite3Utf8Read(zEsc, 0, &zEsc);
+  }
+  if( zA && zB ){
+    struct compareInfo *pInfo = sqlite3_user_data(context);
+#ifdef SQLITE_TEST
+    sqlite3_like_count++;
+#endif
+
+    sqlite3_result_int(context, patternCompare(zB, zA, pInfo, escape));
+  }
+}
+
+/*
+** Implementation of the NULLIF(x,y) function.  The result is the first
+** argument if the arguments are different.  The result is NULL if the
+** arguments are equal to each other.
+*/
+static void nullifFunc(
+  sqlite3_context *context,
+  int argc,
+  sqlite3_value **argv
+){
+  CollSeq *pColl = sqlite3GetFuncCollSeq(context);
+  if( sqlite3MemCompare(argv[0], argv[1], pColl)!=0 ){
+    sqlite3_result_value(context, argv[0]);
+  }
+}
+
+/*
+** Implementation of the VERSION(*) function.  The result is the version
+** of the SQLite library that is running.
+*/
+static void versionFunc(
+  sqlite3_context *context,
+  int argc,
+  sqlite3_value **argv
+){
+  sqlite3_result_text(context, sqlite3_version, -1, SQLITE_STATIC);
+}
+
+/* Array for converting from half-bytes (nybbles) into ASCII hex
+** digits. */
+static const char hexdigits[] = {
+  '0', '1', '2', '3', '4', '5', '6', '7',
+  '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'
+};
+
+/*
+** EXPERIMENTAL - This is not an official function.  The interface may
+** change.  This function may disappear.  Do not write code that depends
+** on this function.
+**
+** Implementation of the QUOTE() function.  This function takes a single
+** argument.  If the argument is numeric, the return value is the same as
+** the argument.  If the argument is NULL, the return value is the string
+** "NULL".  Otherwise, the argument is enclosed in single quotes with
+** single-quote escapes.
+*/
+static void quoteFunc(sqlite3_context *context, int argc, sqlite3_value **argv){
+  if( argc<1 ) return;
+  switch( sqlite3_value_type(argv[0]) ){
+    case SQLITE_NULL: {
+      sqlite3_result_text(context, "NULL", 4, SQLITE_STATIC);
+      break;
+    }
+    case SQLITE_INTEGER:
+    case SQLITE_FLOAT: {
+      sqlite3_result_value(context, argv[0]);
+      break;
+    }
+    case SQLITE_BLOB: {
+      char *zText = 0;
+      char const *zBlob = sqlite3_value_blob(argv[0]);
+      int nBlob = sqlite3_value_bytes(argv[0]);
+      assert( zBlob==sqlite3_value_blob(argv[0]) ); /* No encoding change */
+
+      if( 2*nBlob+4>SQLITE_MAX_LENGTH ){
+        sqlite3_result_error_toobig(context);
+        return;
+      }
+      zText = (char *)contextMalloc(context, (2*nBlob)+4);
+      if( zText ){
+        int i;
+        for(i=0; i<nBlob; i++){
+          zText[(i*2)+2] = hexdigits[(zBlob[i]>>4)&0x0F];
+          zText[(i*2)+3] = hexdigits[(zBlob[i])&0x0F];
+        }
+        zText[(nBlob*2)+2] = '\'';
+        zText[(nBlob*2)+3] = '\0';
+        zText[0] = 'X';
+        zText[1] = '\'';
+        sqlite3_result_text(context, zText, -1, SQLITE_TRANSIENT);
+        sqlite3_free(zText);
+      }
+      break;
+    }
+    case SQLITE_TEXT: {
+      int i,j;
+      u64 n;
+      const unsigned char *zArg = sqlite3_value_text(argv[0]);
+      char *z;
+
+      if( zArg==0 ) return;
+      for(i=0, n=0; zArg[i]; i++){ if( zArg[i]=='\'' ) n++; }
+      if( i+n+3>SQLITE_MAX_LENGTH ){
+        sqlite3_result_error_toobig(context);
+        return;
+      }
+      z = contextMalloc(context, i+n+3);
+      if( z ){
+        z[0] = '\'';
+        for(i=0, j=1; zArg[i]; i++){
+          z[j++] = zArg[i];
+          if( zArg[i]=='\'' ){
+            z[j++] = '\'';
+          }
+        }
+        z[j++] = '\'';
+        z[j] = 0;
+        sqlite3_result_text(context, z, j, sqlite3_free);
+      }
+    }
+  }
+}
+
+/*
+** The hex() function.  Interpret the argument as a blob.  Return
+** a hexadecimal rendering as text.
+*/
+static void hexFunc(
+  sqlite3_context *context,
+  int argc,
+  sqlite3_value **argv
+){
+  int i, n;
+  const unsigned char *pBlob;
+  char *zHex, *z;
+  assert( argc==1 );
+  pBlob = sqlite3_value_blob(argv[0]);
+  n = sqlite3_value_bytes(argv[0]);
+  if( n*2+1>SQLITE_MAX_LENGTH ){
+    sqlite3_result_error_toobig(context);
+    return;
+  }
+  assert( pBlob==sqlite3_value_blob(argv[0]) );  /* No encoding change */
+  z = zHex = contextMalloc(context, n*2 + 1);
+  if( zHex ){
+    for(i=0; i<n; i++, pBlob++){
+      unsigned char c = *pBlob;
+      *(z++) = hexdigits[(c>>4)&0xf];
+      *(z++) = hexdigits[c&0xf];
+    }
+    *z = 0;
+    sqlite3_result_text(context, zHex, n*2, sqlite3_free);
+  }
+}
+
+/*
+** The zeroblob(N) function returns a zero-filled blob of size N bytes.
+*/
+static void zeroblobFunc(
+  sqlite3_context *context,
+  int argc,
+  sqlite3_value **argv
+){
+  i64 n;
+  assert( argc==1 );
+  n = sqlite3_value_int64(argv[0]);
+  if( n>SQLITE_MAX_LENGTH ){
+    sqlite3_result_error_toobig(context);
+  }else{
+    sqlite3_result_zeroblob(context, n);
+  }
+}
+
+/*
+** The replace() function.  Three arguments are all strings: call
+** them A, B, and C. The result is also a string which is derived
+** from A by replacing every occurance of B with C.  The match
+** must be exact.  Collating sequences are not used.
+*/
+static void replaceFunc(
+  sqlite3_context *context,
+  int argc,
+  sqlite3_value **argv
+){
+  const unsigned char *zStr;        /* The input string A */
+  const unsigned char *zPattern;    /* The pattern string B */
+  const unsigned char *zRep;        /* The replacement string C */
+  unsigned char *zOut;              /* The output */
+  int nStr;                /* Size of zStr */
+  int nPattern;            /* Size of zPattern */
+  int nRep;                /* Size of zRep */
+  i64 nOut;                /* Maximum size of zOut */
+  int loopLimit;           /* Last zStr[] that might match zPattern[] */
+  int i, j;                /* Loop counters */
+
+  assert( argc==3 );
+  zStr = sqlite3_value_text(argv[0]);
+  if( zStr==0 ) return;
+  nStr = sqlite3_value_bytes(argv[0]);
+  assert( zStr==sqlite3_value_text(argv[0]) );  /* No encoding change */
+  zPattern = sqlite3_value_text(argv[1]);
+  if( zPattern==0 || zPattern[0]==0 ) return;
+  nPattern = sqlite3_value_bytes(argv[1]);
+  assert( zPattern==sqlite3_value_text(argv[1]) );  /* No encoding change */
+  zRep = sqlite3_value_text(argv[2]);
+  if( zRep==0 ) return;
+  nRep = sqlite3_value_bytes(argv[2]);
+  assert( zRep==sqlite3_value_text(argv[2]) );
+  nOut = nStr + 1;
+  assert( nOut<SQLITE_MAX_LENGTH );
+  zOut = contextMalloc(context, (int)nOut);
+  if( zOut==0 ){
+    return;
+  }
+  loopLimit = nStr - nPattern;
+  for(i=j=0; i<=loopLimit; i++){
+    if( zStr[i]!=zPattern[0] || memcmp(&zStr[i], zPattern, nPattern) ){
+      zOut[j++] = zStr[i];
+    }else{
+      u8 *zOld;
+      nOut += nRep - nPattern;
+      if( nOut>=SQLITE_MAX_LENGTH ){
+        sqlite3_result_error_toobig(context);
+        sqlite3_free(zOut);
+        return;
+      }
+      zOld = zOut;
+      zOut = sqlite3_realloc(zOut, (int)nOut);
+      if( zOut==0 ){
+        sqlite3_result_error_nomem(context);
+        sqlite3_free(zOld);
+        return;
+      }
+      memcpy(&zOut[j], zRep, nRep);
+      j += nRep;
+      i += nPattern-1;
+    }
+  }
+  assert( j+nStr-i+1==nOut );
+  memcpy(&zOut[j], &zStr[i], nStr-i);
+  j += nStr - i;
+  assert( j<=nOut );
+  zOut[j] = 0;
+  sqlite3_result_text(context, (char*)zOut, j, sqlite3_free);
+}
+
+/*
+** Implementation of the TRIM(), LTRIM(), and RTRIM() functions.
+** The userdata is 0x1 for left trim, 0x2 for right trim, 0x3 for both.
+*/
+static void trimFunc(
+  sqlite3_context *context,
+  int argc,
+  sqlite3_value **argv
+){
+  const unsigned char *zIn;         /* Input string */
+  const unsigned char *zCharSet;    /* Set of characters to trim */
+  int nIn;                          /* Number of bytes in input */
+  sqlite3_intptr_t flags;           /* 1: trimleft  2: trimright  3: trim */
+  int i;                            /* Loop counter */
+  unsigned char *aLen;              /* Length of each character in zCharSet */
+  unsigned char **azChar;           /* Individual characters in zCharSet */
+  int nChar;                        /* Number of characters in zCharSet */
+
+  if( sqlite3_value_type(argv[0])==SQLITE_NULL ){
+    return;
+  }
+  zIn = sqlite3_value_text(argv[0]);
+  if( zIn==0 ) return;
+  nIn = sqlite3_value_bytes(argv[0]);
+  assert( zIn==sqlite3_value_text(argv[0]) );
+  if( argc==1 ){
+    static const unsigned char lenOne[] = { 1 };
+    static const unsigned char *azOne[] = { (u8*)" " };
+    nChar = 1;
+    aLen = (u8*)lenOne;
+    azChar = (unsigned char **)azOne;
+    zCharSet = 0;
+  }else if( (zCharSet = sqlite3_value_text(argv[1]))==0 ){
+    return;
+  }else{
+    const unsigned char *z;
+    for(z=zCharSet, nChar=0; *z; nChar++){
+      SQLITE_SKIP_UTF8(z);
+    }
+    if( nChar>0 ){
+      azChar = contextMalloc(context, nChar*(sizeof(char*)+1));
+      if( azChar==0 ){
+        return;
+      }
+      aLen = (unsigned char*)&azChar[nChar];
+      for(z=zCharSet, nChar=0; *z; nChar++){
+        azChar[nChar] = (unsigned char *)z;
+        SQLITE_SKIP_UTF8(z);
+        aLen[nChar] = z - azChar[nChar];
+      }
+    }
+  }
+  if( nChar>0 ){
+    flags = (sqlite3_intptr_t)sqlite3_user_data(context);
+    if( flags & 1 ){
+      while( nIn>0 ){
+        int len;
+        for(i=0; i<nChar; i++){
+          len = aLen[i];
+          if( memcmp(zIn, azChar[i], len)==0 ) break;
+        }
+        if( i>=nChar ) break;
+        zIn += len;
+        nIn -= len;
+      }
+    }
+    if( flags & 2 ){
+      while( nIn>0 ){
+        int len;
+        for(i=0; i<nChar; i++){
+          len = aLen[i];
+          if( len<=nIn && memcmp(&zIn[nIn-len],azChar[i],len)==0 ) break;
+        }
+        if( i>=nChar ) break;
+        nIn -= len;
+      }
+    }
+    if( zCharSet ){
+      sqlite3_free(azChar);
+    }
+  }
+  sqlite3_result_text(context, (char*)zIn, nIn, SQLITE_TRANSIENT);
+}
+
+#ifdef SQLITE_SOUNDEX
+/*
+** Compute the soundex encoding of a word.
+*/
+static void soundexFunc(
+  sqlite3_context *context,
+  int argc,
+  sqlite3_value **argv
+){
+  char zResult[8];
+  const u8 *zIn;
+  int i, j;
+  static const unsigned char iCode[] = {
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 1, 2, 3, 0, 1, 2, 0, 0, 2, 2, 4, 5, 5, 0,
+    1, 2, 6, 2, 3, 0, 1, 0, 2, 0, 2, 0, 0, 0, 0, 0,
+    0, 0, 1, 2, 3, 0, 1, 2, 0, 0, 2, 2, 4, 5, 5, 0,
+    1, 2, 6, 2, 3, 0, 1, 0, 2, 0, 2, 0, 0, 0, 0, 0,
+  };
+  assert( argc==1 );
+  zIn = (u8*)sqlite3_value_text(argv[0]);
+  if( zIn==0 ) zIn = (u8*)"";
+  for(i=0; zIn[i] && !isalpha(zIn[i]); i++){}
+  if( zIn[i] ){
+    u8 prevcode = iCode[zIn[i]&0x7f];
+    zResult[0] = toupper(zIn[i]);
+    for(j=1; j<4 && zIn[i]; i++){
+      int code = iCode[zIn[i]&0x7f];
+      if( code>0 ){
+        if( code!=prevcode ){
+          prevcode = code;
+          zResult[j++] = code + '0';
+        }
+      }else{
+        prevcode = 0;
+      }
+    }
+    while( j<4 ){
+      zResult[j++] = '0';
+    }
+    zResult[j] = 0;
+    sqlite3_result_text(context, zResult, 4, SQLITE_TRANSIENT);
+  }else{
+    sqlite3_result_text(context, "?000", 4, SQLITE_STATIC);
+  }
+}
+#endif
+
+#ifndef SQLITE_OMIT_LOAD_EXTENSION
+/*
+** A function that loads a shared-library extension then returns NULL.
+*/
+static void loadExt(sqlite3_context *context, int argc, sqlite3_value **argv){
+  const char *zFile = (const char *)sqlite3_value_text(argv[0]);
+  const char *zProc;
+  sqlite3 *db = sqlite3_user_data(context);
+  char *zErrMsg = 0;
+
+  if( argc==2 ){
+    zProc = (const char *)sqlite3_value_text(argv[1]);
+  }else{
+    zProc = 0;
+  }
+  if( zFile && sqlite3_load_extension(db, zFile, zProc, &zErrMsg) ){
+    sqlite3_result_error(context, zErrMsg, -1);
+    sqlite3_free(zErrMsg);
+  }
+}
+#endif
+
+#ifdef SQLITE_TEST
+/*
+** This function generates a string of random characters.  Used for
+** generating test data.
+*/
+static void randStr(sqlite3_context *context, int argc, sqlite3_value **argv){
+  static const unsigned char zSrc[] =
+     "abcdefghijklmnopqrstuvwxyz"
+     "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+     "0123456789"
+     ".-!,:*^+=_|?/<> ";
+  int iMin, iMax, n, r, i;
+  unsigned char zBuf[1000];
+
+  /* It used to be possible to call randstr() with any number of arguments,
+  ** but now it is registered with SQLite as requiring exactly 2.
+  */
+  assert(argc==2);
+
+  iMin = sqlite3_value_int(argv[0]);
+  if( iMin<0 ) iMin = 0;
+  if( iMin>=sizeof(zBuf) ) iMin = sizeof(zBuf)-1;
+  iMax = sqlite3_value_int(argv[1]);
+  if( iMax<iMin ) iMax = iMin;
+  if( iMax>=sizeof(zBuf) ) iMax = sizeof(zBuf)-1;
+  n = iMin;
+  if( iMax>iMin ){
+    sqlite3Randomness(sizeof(r), &r);
+    r &= 0x7fffffff;
+    n += r%(iMax + 1 - iMin);
+  }
+  assert( n<sizeof(zBuf) );
+  sqlite3Randomness(n, zBuf);
+  for(i=0; i<n; i++){
+    zBuf[i] = zSrc[zBuf[i]%(sizeof(zSrc)-1)];
+  }
+  zBuf[n] = 0;
+  sqlite3_result_text(context, (char*)zBuf, n, SQLITE_TRANSIENT);
+}
+#endif /* SQLITE_TEST */
+
+#ifdef SQLITE_TEST
+/*
+** The following two SQL functions are used to test returning a text
+** result with a destructor. Function 'test_destructor' takes one argument
+** and returns the same argument interpreted as TEXT. A destructor is
+** passed with the sqlite3_result_text() call.
+**
+** SQL function 'test_destructor_count' returns the number of outstanding
+** allocations made by 'test_destructor';
+**
+** WARNING: Not threadsafe.
+*/
+static int test_destructor_count_var = 0;
+static void destructor(void *p){
+  char *zVal = (char *)p;
+  assert(zVal);
+  zVal--;
+  sqlite3_free(zVal);
+  test_destructor_count_var--;
+}
+static void test_destructor(
+  sqlite3_context *pCtx,
+  int nArg,
+  sqlite3_value **argv
+){
+  char *zVal;
+  int len;
+  sqlite3 *db = sqlite3_user_data(pCtx);
+
+  test_destructor_count_var++;
+  assert( nArg==1 );
+  if( sqlite3_value_type(argv[0])==SQLITE_NULL ) return;
+  len = sqlite3ValueBytes(argv[0], ENC(db));
+  zVal = contextMalloc(pCtx, len+3);
+  if( !zVal ){
+    return;
+  }
+  zVal[len+1] = 0;
+  zVal[len+2] = 0;
+  zVal++;
+  memcpy(zVal, sqlite3ValueText(argv[0], ENC(db)), len);
+  if( ENC(db)==SQLITE_UTF8 ){
+    sqlite3_result_text(pCtx, zVal, -1, destructor);
+#ifndef SQLITE_OMIT_UTF16
+  }else if( ENC(db)==SQLITE_UTF16LE ){
+    sqlite3_result_text16le(pCtx, zVal, -1, destructor);
+  }else{
+    sqlite3_result_text16be(pCtx, zVal, -1, destructor);
+#endif /* SQLITE_OMIT_UTF16 */
+  }
+}
+static void test_destructor_count(
+  sqlite3_context *pCtx,
+  int nArg,
+  sqlite3_value **argv
+){
+  sqlite3_result_int(pCtx, test_destructor_count_var);
+}
+#endif /* SQLITE_TEST */
+
+#ifdef SQLITE_TEST
+/*
+** Routines for testing the sqlite3_get_auxdata() and sqlite3_set_auxdata()
+** interface.
+**
+** The test_auxdata() SQL function attempts to register each of its arguments
+** as auxiliary data.  If there are no prior registrations of aux data for
+** that argument (meaning the argument is not a constant or this is its first
+** call) then the result for that argument is 0.  If there is a prior
+** registration, the result for that argument is 1.  The overall result
+** is the individual argument results separated by spaces.
+*/
+static void free_test_auxdata(void *p) {sqlite3_free(p);}
+static void test_auxdata(
+  sqlite3_context *pCtx,
+  int nArg,
+  sqlite3_value **argv
+){
+  int i;
+  char *zRet = contextMalloc(pCtx, nArg*2);
+  if( !zRet ) return;
+  memset(zRet, 0, nArg*2);
+  for(i=0; i<nArg; i++){
+    char const *z = (char*)sqlite3_value_text(argv[i]);
+    if( z ){
+      int n;
+      char *zAux = sqlite3_get_auxdata(pCtx, i);
+      if( zAux ){
+        zRet[i*2] = '1';
+        assert( strcmp(zAux,z)==0 );
+      }else {
+        zRet[i*2] = '0';
+      }
+      n = strlen(z) + 1;
+      zAux = contextMalloc(pCtx, n);
+      if( zAux ){
+        memcpy(zAux, z, n);
+        sqlite3_set_auxdata(pCtx, i, zAux, free_test_auxdata);
+      }
+      zRet[i*2+1] = ' ';
+    }
+  }
+  sqlite3_result_text(pCtx, zRet, 2*nArg-1, free_test_auxdata);
+}
+#endif /* SQLITE_TEST */
+
+#ifdef SQLITE_TEST
+/*
+** A function to test error reporting from user functions. This function
+** returns a copy of its first argument as an error.
+*/
+static void test_error(
+  sqlite3_context *pCtx,
+  int nArg,
+  sqlite3_value **argv
+){
+  sqlite3_result_error(pCtx, (char*)sqlite3_value_text(argv[0]), 0);
+}
+#endif /* SQLITE_TEST */
+
+/*
+** An instance of the following structure holds the context of a
+** sum() or avg() aggregate computation.
+*/
+typedef struct SumCtx SumCtx;
+struct SumCtx {
+  double rSum;      /* Floating point sum */
+  i64 iSum;         /* Integer sum */
+  i64 cnt;          /* Number of elements summed */
+  u8 overflow;      /* True if integer overflow seen */
+  u8 approx;        /* True if non-integer value was input to the sum */
+};
+
+/*
+** Routines used to compute the sum, average, and total.
+**
+** The SUM() function follows the (broken) SQL standard which means
+** that it returns NULL if it sums over no inputs.  TOTAL returns
+** 0.0 in that case.  In addition, TOTAL always returns a float where
+** SUM might return an integer if it never encounters a floating point
+** value.  TOTAL never fails, but SUM might through an exception if
+** it overflows an integer.
+*/
+static void sumStep(sqlite3_context *context, int argc, sqlite3_value **argv){
+  SumCtx *p;
+  int type;
+  assert( argc==1 );
+  p = sqlite3_aggregate_context(context, sizeof(*p));
+  type = sqlite3_value_numeric_type(argv[0]);
+  if( p && type!=SQLITE_NULL ){
+    p->cnt++;
+    if( type==SQLITE_INTEGER ){
+      i64 v = sqlite3_value_int64(argv[0]);
+      p->rSum += v;
+      if( (p->approx|p->overflow)==0 ){
+        i64 iNewSum = p->iSum + v;
+        int s1 = p->iSum >> (sizeof(i64)*8-1);
+        int s2 = v       >> (sizeof(i64)*8-1);
+        int s3 = iNewSum >> (sizeof(i64)*8-1);
+        p->overflow = (s1&s2&~s3) | (~s1&~s2&s3);
+        p->iSum = iNewSum;
+      }
+    }else{
+      p->rSum += sqlite3_value_double(argv[0]);
+      p->approx = 1;
+    }
+  }
+}
+static void sumFinalize(sqlite3_context *context){
+  SumCtx *p;
+  p = sqlite3_aggregate_context(context, 0);
+  if( p && p->cnt>0 ){
+    if( p->overflow ){
+      sqlite3_result_error(context,"integer overflow",-1);
+    }else if( p->approx ){
+      sqlite3_result_double(context, p->rSum);
+    }else{
+      sqlite3_result_int64(context, p->iSum);
+    }
+  }
+}
+static void avgFinalize(sqlite3_context *context){
+  SumCtx *p;
+  p = sqlite3_aggregate_context(context, 0);
+  if( p && p->cnt>0 ){
+    sqlite3_result_double(context, p->rSum/(double)p->cnt);
+  }
+}
+static void totalFinalize(sqlite3_context *context){
+  SumCtx *p;
+  p = sqlite3_aggregate_context(context, 0);
+  sqlite3_result_double(context, p ? p->rSum : 0.0);
+}
+
+/*
+** The following structure keeps track of state information for the
+** count() aggregate function.
+*/
+typedef struct CountCtx CountCtx;
+struct CountCtx {
+  i64 n;
+};
+
+/*
+** Routines to implement the count() aggregate function.
+*/
+static void countStep(sqlite3_context *context, int argc, sqlite3_value **argv){
+  CountCtx *p;
+  p = sqlite3_aggregate_context(context, sizeof(*p));
+  if( (argc==0 || SQLITE_NULL!=sqlite3_value_type(argv[0])) && p ){
+    p->n++;
+  }
+}
+static void countFinalize(sqlite3_context *context){
+  CountCtx *p;
+  p = sqlite3_aggregate_context(context, 0);
+  sqlite3_result_int64(context, p ? p->n : 0);
+}
+
+/*
+** Routines to implement min() and max() aggregate functions.
+*/
+static void minmaxStep(sqlite3_context *context, int argc, sqlite3_value **argv){
+  Mem *pArg  = (Mem *)argv[0];
+  Mem *pBest;
+
+  if( sqlite3_value_type(argv[0])==SQLITE_NULL ) return;
+  pBest = (Mem *)sqlite3_aggregate_context(context, sizeof(*pBest));
+  if( !pBest ) return;
+
+  if( pBest->flags ){
+    int max;
+    int cmp;
+    CollSeq *pColl = sqlite3GetFuncCollSeq(context);
+    /* This step function is used for both the min() and max() aggregates,
+    ** the only difference between the two being that the sense of the
+    ** comparison is inverted. For the max() aggregate, the
+    ** sqlite3_user_data() function returns (void *)-1. For min() it
+    ** returns (void *)db, where db is the sqlite3* database pointer.
+    ** Therefore the next statement sets variable 'max' to 1 for the max()
+    ** aggregate, or 0 for min().
+    */
+    max = sqlite3_user_data(context)!=0;
+    cmp = sqlite3MemCompare(pBest, pArg, pColl);
+    if( (max && cmp<0) || (!max && cmp>0) ){
+      sqlite3VdbeMemCopy(pBest, pArg);
+    }
+  }else{
+    sqlite3VdbeMemCopy(pBest, pArg);
+  }
+}
+static void minMaxFinalize(sqlite3_context *context){
+  sqlite3_value *pRes;
+  pRes = (sqlite3_value *)sqlite3_aggregate_context(context, 0);
+  if( pRes ){
+    if( pRes->flags ){
+      sqlite3_result_value(context, pRes);
+    }
+    sqlite3VdbeMemRelease(pRes);
+  }
+}
+
+/*
+** group_concat(EXPR, ?SEPARATOR?)
+*/
+static void groupConcatStep(
+  sqlite3_context *context,
+  int argc,
+  sqlite3_value **argv
+){
+  const char *zVal;
+  StrAccum *pAccum;
+  const char *zSep;
+  int nVal, nSep;
+  if( sqlite3_value_type(argv[0])==SQLITE_NULL ) return;
+  pAccum = (StrAccum*)sqlite3_aggregate_context(context, sizeof(*pAccum));
+
+  if( pAccum ){
+    pAccum->useMalloc = 1;
+    if( pAccum->nChar ){
+      if( argc==2 ){
+        zSep = (char*)sqlite3_value_text(argv[1]);
+        nSep = sqlite3_value_bytes(argv[1]);
+      }else{
+        zSep = ",";
+        nSep = 1;
+      }
+      sqlite3StrAccumAppend(pAccum, zSep, nSep);
+    }
+    zVal = (char*)sqlite3_value_text(argv[0]);
+    nVal = sqlite3_value_bytes(argv[0]);
+    sqlite3StrAccumAppend(pAccum, zVal, nVal);
+  }
+}
+static void groupConcatFinalize(sqlite3_context *context){
+  StrAccum *pAccum;
+  pAccum = sqlite3_aggregate_context(context, 0);
+  if( pAccum ){
+    if( pAccum->tooBig ){
+      sqlite3_result_error_toobig(context);
+    }else if( pAccum->mallocFailed ){
+      sqlite3_result_error_nomem(context);
+    }else{
+      sqlite3_result_text(context, sqlite3StrAccumFinish(pAccum), -1,
+                          sqlite3_free);
+    }
+  }
+}
+
+/*
+** This function registered all of the above C functions as SQL
+** functions.  This should be the only routine in this file with
+** external linkage.
+*/
+void sqlite3RegisterBuiltinFunctions(sqlite3 *db){
+  static const struct {
+     char *zName;
+     signed char nArg;
+     u8 argType;           /* ff: db   1: 0, 2: 1, 3: 2,...  N:  N-1. */
+     u8 eTextRep;          /* 1: UTF-16.  0: UTF-8 */
+     u8 needCollSeq;
+     void (*xFunc)(sqlite3_context*,int,sqlite3_value **);
+  } aFuncs[] = {
+    { "min",               -1, 0, SQLITE_UTF8,    1, minmaxFunc },
+    { "min",                0, 0, SQLITE_UTF8,    1, 0          },
+    { "max",               -1, 1, SQLITE_UTF8,    1, minmaxFunc },
+    { "max",                0, 1, SQLITE_UTF8,    1, 0          },
+    { "typeof",             1, 0, SQLITE_UTF8,    0, typeofFunc },
+    { "length",             1, 0, SQLITE_UTF8,    0, lengthFunc },
+    { "substr",             2, 0, SQLITE_UTF8,    0, substrFunc },
+    { "substr",             3, 0, SQLITE_UTF8,    0, substrFunc },
+    { "abs",                1, 0, SQLITE_UTF8,    0, absFunc    },
+    { "round",              1, 0, SQLITE_UTF8,    0, roundFunc  },
+    { "round",              2, 0, SQLITE_UTF8,    0, roundFunc  },
+    { "upper",              1, 0, SQLITE_UTF8,    0, upperFunc  },
+    { "lower",              1, 0, SQLITE_UTF8,    0, lowerFunc  },
+    { "coalesce",          -1, 0, SQLITE_UTF8,    0, ifnullFunc },
+    { "coalesce",           0, 0, SQLITE_UTF8,    0, 0          },
+    { "coalesce",           1, 0, SQLITE_UTF8,    0, 0          },
+    { "hex",                1, 0, SQLITE_UTF8,    0, hexFunc    },
+    { "ifnull",             2, 0, SQLITE_UTF8,    1, ifnullFunc },
+    { "random",            -1, 0, SQLITE_UTF8,    0, randomFunc },
+    { "randomblob",         1, 0, SQLITE_UTF8,    0, randomBlob },
+    { "nullif",             2, 0, SQLITE_UTF8,    1, nullifFunc },
+    { "sqlite_version",     0, 0, SQLITE_UTF8,    0, versionFunc},
+    { "quote",              1, 0, SQLITE_UTF8,    0, quoteFunc  },
+    { "last_insert_rowid",  0, 0xff, SQLITE_UTF8, 0, last_insert_rowid },
+    { "changes",            0, 0xff, SQLITE_UTF8, 0, changes           },
+    { "total_changes",      0, 0xff, SQLITE_UTF8, 0, total_changes     },
+    { "replace",            3, 0, SQLITE_UTF8,    0, replaceFunc       },
+    { "ltrim",              1, 1, SQLITE_UTF8,    0, trimFunc          },
+    { "ltrim",              2, 1, SQLITE_UTF8,    0, trimFunc          },
+    { "rtrim",              1, 2, SQLITE_UTF8,    0, trimFunc          },
+    { "rtrim",              2, 2, SQLITE_UTF8,    0, trimFunc          },
+    { "trim",               1, 3, SQLITE_UTF8,    0, trimFunc          },
+    { "trim",               2, 3, SQLITE_UTF8,    0, trimFunc          },
+    { "zeroblob",           1, 0, SQLITE_UTF8,    0, zeroblobFunc      },
+#ifdef SQLITE_SOUNDEX
+    { "soundex",            1, 0, SQLITE_UTF8,    0, soundexFunc},
+#endif
+#ifndef SQLITE_OMIT_LOAD_EXTENSION
+    { "load_extension",     1, 0xff, SQLITE_UTF8, 0, loadExt },
+    { "load_extension",     2, 0xff, SQLITE_UTF8, 0, loadExt },
+#endif
+#ifdef SQLITE_TEST
+    { "randstr",               2, 0,    SQLITE_UTF8, 0, randStr    },
+    { "test_destructor",       1, 0xff, SQLITE_UTF8, 0, test_destructor},
+    { "test_destructor_count", 0, 0,    SQLITE_UTF8, 0, test_destructor_count},
+    { "test_auxdata",         -1, 0,    SQLITE_UTF8, 0, test_auxdata},
+    { "test_error",            1, 0,    SQLITE_UTF8, 0, test_error},
+#endif
+  };
+  static const struct {
+    char *zName;
+    signed char nArg;
+    u8 argType;
+    u8 needCollSeq;
+    void (*xStep)(sqlite3_context*,int,sqlite3_value**);
+    void (*xFinalize)(sqlite3_context*);
+  } aAggs[] = {
+    { "min",    1, 0, 1, minmaxStep,   minMaxFinalize },
+    { "max",    1, 1, 1, minmaxStep,   minMaxFinalize },
+    { "sum",    1, 0, 0, sumStep,      sumFinalize    },
+    { "total",  1, 0, 0, sumStep,      totalFinalize    },
+    { "avg",    1, 0, 0, sumStep,      avgFinalize    },
+    { "count",  0, 0, 0, countStep,    countFinalize  },
+    { "count",  1, 0, 0, countStep,    countFinalize  },
+    { "group_concat", 1, 0, 0, groupConcatStep, groupConcatFinalize },
+    { "group_concat", 2, 0, 0, groupConcatStep, groupConcatFinalize },
+  };
+  int i;
+
+  for(i=0; i<sizeof(aFuncs)/sizeof(aFuncs[0]); i++){
+    void *pArg;
+    u8 argType = aFuncs[i].argType;
+    if( argType==0xff ){
+      pArg = db;
+    }else{
+      pArg = (void*)(sqlite3_intptr_t)argType;
+    }
+    sqlite3CreateFunc(db, aFuncs[i].zName, aFuncs[i].nArg,
+        aFuncs[i].eTextRep, pArg, aFuncs[i].xFunc, 0, 0);
+    if( aFuncs[i].needCollSeq ){
+      FuncDef *pFunc = sqlite3FindFunction(db, aFuncs[i].zName,
+          strlen(aFuncs[i].zName), aFuncs[i].nArg, aFuncs[i].eTextRep, 0);
+      if( pFunc && aFuncs[i].needCollSeq ){
+        pFunc->needCollSeq = 1;
+      }
+    }
+  }
+#ifndef SQLITE_OMIT_ALTERTABLE
+  sqlite3AlterFunctions(db);
+#endif
+#ifndef SQLITE_OMIT_PARSER
+  sqlite3AttachFunctions(db);
+#endif
+  for(i=0; i<sizeof(aAggs)/sizeof(aAggs[0]); i++){
+    void *pArg = (void*)(sqlite3_intptr_t)aAggs[i].argType;
+    sqlite3CreateFunc(db, aAggs[i].zName, aAggs[i].nArg, SQLITE_UTF8,
+        pArg, 0, aAggs[i].xStep, aAggs[i].xFinalize);
+    if( aAggs[i].needCollSeq ){
+      FuncDef *pFunc = sqlite3FindFunction( db, aAggs[i].zName,
+          strlen(aAggs[i].zName), aAggs[i].nArg, SQLITE_UTF8, 0);
+      if( pFunc && aAggs[i].needCollSeq ){
+        pFunc->needCollSeq = 1;
+      }
+    }
+  }
+  sqlite3RegisterDateTimeFunctions(db);
+  if( !db->mallocFailed ){
+    int rc = sqlite3_overload_function(db, "MATCH", 2);
+    assert( rc==SQLITE_NOMEM || rc==SQLITE_OK );
+    if( rc==SQLITE_NOMEM ){
+      db->mallocFailed = 1;
+    }
+  }
+#ifdef SQLITE_SSE
+  (void)sqlite3SseFunctions(db);
+#endif
+#ifdef SQLITE_CASE_SENSITIVE_LIKE
+  sqlite3RegisterLikeFunctions(db, 1);
+#else
+  sqlite3RegisterLikeFunctions(db, 0);
+#endif
+}
+
+/*
+** Set the LIKEOPT flag on the 2-argument function with the given name.
+*/
+static void setLikeOptFlag(sqlite3 *db, const char *zName, int flagVal){
+  FuncDef *pDef;
+  pDef = sqlite3FindFunction(db, zName, strlen(zName), 2, SQLITE_UTF8, 0);
+  if( pDef ){
+    pDef->flags = flagVal;
+  }
+}
+
+/*
+** Register the built-in LIKE and GLOB functions.  The caseSensitive
+** parameter determines whether or not the LIKE operator is case
+** sensitive.  GLOB is always case sensitive.
+*/
+void sqlite3RegisterLikeFunctions(sqlite3 *db, int caseSensitive){
+  struct compareInfo *pInfo;
+  if( caseSensitive ){
+    pInfo = (struct compareInfo*)&likeInfoAlt;
+  }else{
+    pInfo = (struct compareInfo*)&likeInfoNorm;
+  }
+  sqlite3CreateFunc(db, "like", 2, SQLITE_UTF8, pInfo, likeFunc, 0, 0);
+  sqlite3CreateFunc(db, "like", 3, SQLITE_UTF8, pInfo, likeFunc, 0, 0);
+  sqlite3CreateFunc(db, "glob", 2, SQLITE_UTF8,
+      (struct compareInfo*)&globInfo, likeFunc, 0,0);
+  setLikeOptFlag(db, "glob", SQLITE_FUNC_LIKE | SQLITE_FUNC_CASE);
+  setLikeOptFlag(db, "like",
+      caseSensitive ? (SQLITE_FUNC_LIKE | SQLITE_FUNC_CASE) : SQLITE_FUNC_LIKE);
+}
+
+/*
+** pExpr points to an expression which implements a function.  If
+** it is appropriate to apply the LIKE optimization to that function
+** then set aWc[0] through aWc[2] to the wildcard characters and
+** return TRUE.  If the function is not a LIKE-style function then
+** return FALSE.
+*/
+int sqlite3IsLikeFunction(sqlite3 *db, Expr *pExpr, int *pIsNocase, char *aWc){
+  FuncDef *pDef;
+  if( pExpr->op!=TK_FUNCTION || !pExpr->pList ){
+    return 0;
+  }
+  if( pExpr->pList->nExpr!=2 ){
+    return 0;
+  }
+  pDef = sqlite3FindFunction(db, (char*)pExpr->token.z, pExpr->token.n, 2,
+                             SQLITE_UTF8, 0);
+  if( pDef==0 || (pDef->flags & SQLITE_FUNC_LIKE)==0 ){
+    return 0;
+  }
+
+  /* The memcpy() statement assumes that the wildcard characters are
+  ** the first three statements in the compareInfo structure.  The
+  ** asserts() that follow verify that assumption
+  */
+  memcpy(aWc, pDef->pUserData, 3);
+  assert( (char*)&likeInfoAlt == (char*)&likeInfoAlt.matchAll );
+  assert( &((char*)&likeInfoAlt)[1] == (char*)&likeInfoAlt.matchOne );
+  assert( &((char*)&likeInfoAlt)[2] == (char*)&likeInfoAlt.matchSet );
+  *pIsNocase = (pDef->flags & SQLITE_FUNC_CASE)==0;
+  return 1;
+}
diff --git a/uppsrc/plugin/sqlite3/lib/hash.c b/uppsrc/plugin/sqlite3/lib/hash.c
new file mode 100644
index 000000000..ab5c5c194
--- /dev/null
+++ b/uppsrc/plugin/sqlite3/lib/hash.c
@@ -0,0 +1,423 @@
+/*
+** 2001 September 22
+**
+** The author disclaims copyright to this source code.  In place of
+** a legal notice, here is a blessing:
+**
+**    May you do good and not evil.
+**    May you find forgiveness for yourself and forgive others.
+**    May you share freely, never taking more than you give.
+**
+*************************************************************************
+** This is the implementation of generic hash-tables
+** used in SQLite.
+**
+** $Id: hash.c,v 1.26 2008/02/18 22:24:58 drh Exp $
+*/
+#include "sqliteInt.h"
+#include <assert.h>
+
+/* Turn bulk memory into a hash table object by initializing the
+** fields of the Hash structure.
+**
+** "pNew" is a pointer to the hash table that is to be initialized.
+** keyClass is one of the constants SQLITE_HASH_INT, SQLITE_HASH_POINTER,
+** SQLITE_HASH_BINARY, or SQLITE_HASH_STRING.  The value of keyClass
+** determines what kind of key the hash table will use.  "copyKey" is
+** true if the hash table should make its own private copy of keys and
+** false if it should just use the supplied pointer.  CopyKey only makes
+** sense for SQLITE_HASH_STRING and SQLITE_HASH_BINARY and is ignored
+** for other key classes.
+*/
+void sqlite3HashInit(Hash *pNew, int keyClass, int copyKey){
+  assert( pNew!=0 );
+  assert( keyClass>=SQLITE_HASH_STRING && keyClass<=SQLITE_HASH_BINARY );
+  pNew->keyClass = keyClass;
+#if 0
+  if( keyClass==SQLITE_HASH_POINTER || keyClass==SQLITE_HASH_INT ) copyKey = 0;
+#endif
+  pNew->copyKey = copyKey;
+  pNew->first = 0;
+  pNew->count = 0;
+  pNew->htsize = 0;
+  pNew->ht = 0;
+}
+
+/* Remove all entries from a hash table.  Reclaim all memory.
+** Call this routine to delete a hash table or to reset a hash table
+** to the empty state.
+*/
+void sqlite3HashClear(Hash *pH){
+  HashElem *elem;         /* For looping over all elements of the table */
+
+  assert( pH!=0 );
+  elem = pH->first;
+  pH->first = 0;
+  if( pH->ht ) sqlite3_free(pH->ht);
+  pH->ht = 0;
+  pH->htsize = 0;
+  while( elem ){
+    HashElem *next_elem = elem->next;
+    if( pH->copyKey && elem->pKey ){
+      sqlite3_free(elem->pKey);
+    }
+    sqlite3_free(elem);
+    elem = next_elem;
+  }
+  pH->count = 0;
+}
+
+#if 0 /* NOT USED */
+/*
+** Hash and comparison functions when the mode is SQLITE_HASH_INT
+*/
+static int intHash(const void *pKey, int nKey){
+  return nKey ^ (nKey<<8) ^ (nKey>>8);
+}
+static int intCompare(const void *pKey1, int n1, const void *pKey2, int n2){
+  return n2 - n1;
+}
+#endif
+
+#if 0 /* NOT USED */
+/*
+** Hash and comparison functions when the mode is SQLITE_HASH_POINTER
+*/
+static int ptrHash(const void *pKey, int nKey){
+  uptr x = Addr(pKey);
+  return x ^ (x<<8) ^ (x>>8);
+}
+static int ptrCompare(const void *pKey1, int n1, const void *pKey2, int n2){
+  if( pKey1==pKey2 ) return 0;
+  if( pKey1<pKey2 ) return -1;
+  return 1;
+}
+#endif
+
+/*
+** Hash and comparison functions when the mode is SQLITE_HASH_STRING
+*/
+static int strHash(const void *pKey, int nKey){
+  const char *z = (const char *)pKey;
+  int h = 0;
+  if( nKey<=0 ) nKey = strlen(z);
+  while( nKey > 0  ){
+    h = (h<<3) ^ h ^ sqlite3UpperToLower[(unsigned char)*z++];
+    nKey--;
+  }
+  return h & 0x7fffffff;
+}
+static int strCompare(const void *pKey1, int n1, const void *pKey2, int n2){
+  if( n1!=n2 ) return 1;
+  return sqlite3StrNICmp((const char*)pKey1,(const char*)pKey2,n1);
+}
+
+/*
+** Hash and comparison functions when the mode is SQLITE_HASH_BINARY
+*/
+static int binHash(const void *pKey, int nKey){
+  int h = 0;
+  const char *z = (const char *)pKey;
+  while( nKey-- > 0 ){
+    h = (h<<3) ^ h ^ *(z++);
+  }
+  return h & 0x7fffffff;
+}
+static int binCompare(const void *pKey1, int n1, const void *pKey2, int n2){
+  if( n1!=n2 ) return 1;
+  return memcmp(pKey1,pKey2,n1);
+}
+
+/*
+** Return a pointer to the appropriate hash function given the key class.
+**
+** The C syntax in this function definition may be unfamilar to some
+** programmers, so we provide the following additional explanation:
+**
+** The name of the function is "hashFunction".  The function takes a
+** single parameter "keyClass".  The return value of hashFunction()
+** is a pointer to another function.  Specifically, the return value
+** of hashFunction() is a pointer to a function that takes two parameters
+** with types "const void*" and "int" and returns an "int".
+*/
+static int (*hashFunction(int keyClass))(const void*,int){
+#if 0  /* HASH_INT and HASH_POINTER are never used */
+  switch( keyClass ){
+    case SQLITE_HASH_INT:     return &intHash;
+    case SQLITE_HASH_POINTER: return &ptrHash;
+    case SQLITE_HASH_STRING:  return &strHash;
+    case SQLITE_HASH_BINARY:  return &binHash;;
+    default: break;
+  }
+  return 0;
+#else
+  if( keyClass==SQLITE_HASH_STRING ){
+    return &strHash;
+  }else{
+    assert( keyClass==SQLITE_HASH_BINARY );
+    return &binHash;
+  }
+#endif
+}
+
+/*
+** Return a pointer to the appropriate hash function given the key class.
+**
+** For help in interpreted the obscure C code in the function definition,
+** see the header comment on the previous function.
+*/
+static int (*compareFunction(int keyClass))(const void*,int,const void*,int){
+#if 0 /* HASH_INT and HASH_POINTER are never used */
+  switch( keyClass ){
+    case SQLITE_HASH_INT:     return &intCompare;
+    case SQLITE_HASH_POINTER: return &ptrCompare;
+    case SQLITE_HASH_STRING:  return &strCompare;
+    case SQLITE_HASH_BINARY:  return &binCompare;
+    default: break;
+  }
+  return 0;
+#else
+  if( keyClass==SQLITE_HASH_STRING ){
+    return &strCompare;
+  }else{
+    assert( keyClass==SQLITE_HASH_BINARY );
+    return &binCompare;
+  }
+#endif
+}
+
+/* Link an element into the hash table
+*/
+static void insertElement(
+  Hash *pH,              /* The complete hash table */
+  struct _ht *pEntry,    /* The entry into which pNew is inserted */
+  HashElem *pNew         /* The element to be inserted */
+){
+  HashElem *pHead;       /* First element already in pEntry */
+  pHead = pEntry->chain;
+  if( pHead ){
+    pNew->next = pHead;
+    pNew->prev = pHead->prev;
+    if( pHead->prev ){ pHead->prev->next = pNew; }
+    else             { pH->first = pNew; }
+    pHead->prev = pNew;
+  }else{
+    pNew->next = pH->first;
+    if( pH->first ){ pH->first->prev = pNew; }
+    pNew->prev = 0;
+    pH->first = pNew;
+  }
+  pEntry->count++;
+  pEntry->chain = pNew;
+}
+
+
+/* Resize the hash table so that it cantains "new_size" buckets.
+** "new_size" must be a power of 2.  The hash table might fail
+** to resize if sqlite3_malloc() fails.
+*/
+static void rehash(Hash *pH, int new_size){
+  struct _ht *new_ht;            /* The new hash table */
+  HashElem *elem, *next_elem;    /* For looping over existing elements */
+  int (*xHash)(const void*,int); /* The hash function */
+
+#ifdef SQLITE_MALLOC_SOFT_LIMIT
+  if( new_size*sizeof(struct _ht)>SQLITE_MALLOC_SOFT_LIMIT ){
+    new_size = SQLITE_MALLOC_SOFT_LIMIT/sizeof(struct _ht);
+  }
+  if( new_size==pH->htsize ) return;
+#endif
+
+  /* There is a call to sqlite3_malloc() inside rehash(). If there is
+  ** already an allocation at pH->ht, then if this malloc() fails it
+  ** is benign (since failing to resize a hash table is a performance
+  ** hit only, not a fatal error).
+  */
+  sqlite3FaultBenign(SQLITE_FAULTINJECTOR_MALLOC, pH->htsize>0);
+  new_ht = (struct _ht *)sqlite3MallocZero( new_size*sizeof(struct _ht) );
+  sqlite3FaultBenign(SQLITE_FAULTINJECTOR_MALLOC, 0);
+
+  if( new_ht==0 ) return;
+  if( pH->ht ) sqlite3_free(pH->ht);
+  pH->ht = new_ht;
+  pH->htsize = new_size;
+  xHash = hashFunction(pH->keyClass);
+  for(elem=pH->first, pH->first=0; elem; elem = next_elem){
+    int h = (*xHash)(elem->pKey, elem->nKey) & (new_size-1);
+    next_elem = elem->next;
+    insertElement(pH, &new_ht[h], elem);
+  }
+}
+
+/* This function (for internal use only) locates an element in an
+** hash table that matches the given key.  The hash for this key has
+** already been computed and is passed as the 4th parameter.
+*/
+static HashElem *findElementGivenHash(
+  const Hash *pH,     /* The pH to be searched */
+  const void *pKey,   /* The key we are searching for */
+  int nKey,
+  int h               /* The hash for this key. */
+){
+  HashElem *elem;                /* Used to loop thru the element list */
+  int count;                     /* Number of elements left to test */
+  int (*xCompare)(const void*,int,const void*,int);  /* comparison function */
+
+  if( pH->ht ){
+    struct _ht *pEntry = &pH->ht[h];
+    elem = pEntry->chain;
+    count = pEntry->count;
+    xCompare = compareFunction(pH->keyClass);
+    while( count-- && elem ){
+      if( (*xCompare)(elem->pKey,elem->nKey,pKey,nKey)==0 ){
+        return elem;
+      }
+      elem = elem->next;
+    }
+  }
+  return 0;
+}
+
+/* Remove a single entry from the hash table given a pointer to that
+** element and a hash on the element's key.
+*/
+static void removeElementGivenHash(
+  Hash *pH,         /* The pH containing "elem" */
+  HashElem* elem,   /* The element to be removed from the pH */
+  int h             /* Hash value for the element */
+){
+  struct _ht *pEntry;
+  if( elem->prev ){
+    elem->prev->next = elem->next;
+  }else{
+    pH->first = elem->next;
+  }
+  if( elem->next ){
+    elem->next->prev = elem->prev;
+  }
+  pEntry = &pH->ht[h];
+  if( pEntry->chain==elem ){
+    pEntry->chain = elem->next;
+  }
+  pEntry->count--;
+  if( pEntry->count<=0 ){
+    pEntry->chain = 0;
+  }
+  if( pH->copyKey ){
+    sqlite3_free(elem->pKey);
+  }
+  sqlite3_free( elem );
+  pH->count--;
+  if( pH->count<=0 ){
+    assert( pH->first==0 );
+    assert( pH->count==0 );
+    sqlite3HashClear(pH);
+  }
+}
+
+/* Attempt to locate an element of the hash table pH with a key
+** that matches pKey,nKey.  Return a pointer to the corresponding
+** HashElem structure for this element if it is found, or NULL
+** otherwise.
+*/
+HashElem *sqlite3HashFindElem(const Hash *pH, const void *pKey, int nKey){
+  int h;             /* A hash on key */
+  HashElem *elem;    /* The element that matches key */
+  int (*xHash)(const void*,int);  /* The hash function */
+
+  if( pH==0 || pH->ht==0 ) return 0;
+  xHash = hashFunction(pH->keyClass);
+  assert( xHash!=0 );
+  h = (*xHash)(pKey,nKey);
+  elem = findElementGivenHash(pH,pKey,nKey, h % pH->htsize);
+  return elem;
+}
+
+/* Attempt to locate an element of the hash table pH with a key
+** that matches pKey,nKey.  Return the data for this element if it is
+** found, or NULL if there is no match.
+*/
+void *sqlite3HashFind(const Hash *pH, const void *pKey, int nKey){
+  HashElem *elem;    /* The element that matches key */
+  elem = sqlite3HashFindElem(pH, pKey, nKey);
+  return elem ? elem->data : 0;
+}
+
+/* Insert an element into the hash table pH.  The key is pKey,nKey
+** and the data is "data".
+**
+** If no element exists with a matching key, then a new
+** element is created.  A copy of the key is made if the copyKey
+** flag is set.  NULL is returned.
+**
+** If another element already exists with the same key, then the
+** new data replaces the old data and the old data is returned.
+** The key is not copied in this instance.  If a malloc fails, then
+** the new data is returned and the hash table is unchanged.
+**
+** If the "data" parameter to this function is NULL, then the
+** element corresponding to "key" is removed from the hash table.
+*/
+void *sqlite3HashInsert(Hash *pH, const void *pKey, int nKey, void *data){
+  int hraw;             /* Raw hash value of the key */
+  int h;                /* the hash of the key modulo hash table size */
+  HashElem *elem;       /* Used to loop thru the element list */
+  HashElem *new_elem;   /* New element added to the pH */
+  int (*xHash)(const void*,int);  /* The hash function */
+
+  assert( pH!=0 );
+  xHash = hashFunction(pH->keyClass);
+  assert( xHash!=0 );
+  hraw = (*xHash)(pKey, nKey);
+  if( pH->htsize ){
+    h = hraw % pH->htsize;
+    elem = findElementGivenHash(pH,pKey,nKey,h);
+    if( elem ){
+      void *old_data = elem->data;
+      if( data==0 ){
+        removeElementGivenHash(pH,elem,h);
+      }else{
+        elem->data = data;
+        if( !pH->copyKey ){
+          elem->pKey = (void *)pKey;
+        }
+        assert(nKey==elem->nKey);
+      }
+      return old_data;
+    }
+  }
+  if( data==0 ) return 0;
+  new_elem = (HashElem*)sqlite3_malloc( sizeof(HashElem) );
+  if( new_elem==0 ) return data;
+  if( pH->copyKey && pKey!=0 ){
+    new_elem->pKey = sqlite3_malloc( nKey );
+    if( new_elem->pKey==0 ){
+      sqlite3_free(new_elem);
+      return data;
+    }
+    memcpy((void*)new_elem->pKey, pKey, nKey);
+  }else{
+    new_elem->pKey = (void*)pKey;
+  }
+  new_elem->nKey = nKey;
+  pH->count++;
+  if( pH->htsize==0 ){
+    rehash(pH, 128/sizeof(pH->ht[0]));
+    if( pH->htsize==0 ){
+      pH->count = 0;
+      if( pH->copyKey ){
+        sqlite3_free(new_elem->pKey);
+      }
+      sqlite3_free(new_elem);
+      return data;
+    }
+  }
+  if( pH->count > pH->htsize ){
+    rehash(pH,pH->htsize*2);
+  }
+  assert( pH->htsize>0 );
+  h = hraw % pH->htsize;
+  insertElement(pH, &pH->ht[h], new_elem);
+  new_elem->data = data;
+  return 0;
+}
diff --git a/uppsrc/plugin/sqlite3/lib/hash.h b/uppsrc/plugin/sqlite3/lib/hash.h
new file mode 100644
index 000000000..c99f8bec0
--- /dev/null
+++ b/uppsrc/plugin/sqlite3/lib/hash.h
@@ -0,0 +1,110 @@
+/*
+** 2001 September 22
+**
+** The author disclaims copyright to this source code.  In place of
+** a legal notice, here is a blessing:
+**
+**    May you do good and not evil.
+**    May you find forgiveness for yourself and forgive others.
+**    May you share freely, never taking more than you give.
+**
+*************************************************************************
+** This is the header file for the generic hash-table implemenation
+** used in SQLite.
+**
+** $Id: hash.h,v 1.11 2007/09/04 14:31:47 danielk1977 Exp $
+*/
+#ifndef _SQLITE_HASH_H_
+#define _SQLITE_HASH_H_
+
+/* Forward declarations of structures. */
+typedef struct Hash Hash;
+typedef struct HashElem HashElem;
+
+/* A complete hash table is an instance of the following structure.
+** The internals of this structure are intended to be opaque -- client
+** code should not attempt to access or modify the fields of this structure
+** directly.  Change this structure only by using the routines below.
+** However, many of the "procedures" and "functions" for modifying and
+** accessing this structure are really macros, so we can't really make
+** this structure opaque.
+*/
+struct Hash {
+  char keyClass;          /* SQLITE_HASH_INT, _POINTER, _STRING, _BINARY */
+  char copyKey;           /* True if copy of key made on insert */
+  int count;              /* Number of entries in this table */
+  int htsize;             /* Number of buckets in the hash table */
+  HashElem *first;        /* The first element of the array */
+  struct _ht {            /* the hash table */
+    int count;               /* Number of entries with this hash */
+    HashElem *chain;         /* Pointer to first entry with this hash */
+  } *ht;
+};
+
+/* Each element in the hash table is an instance of the following
+** structure.  All elements are stored on a single doubly-linked list.
+**
+** Again, this structure is intended to be opaque, but it can't really
+** be opaque because it is used by macros.
+*/
+struct HashElem {
+  HashElem *next, *prev;   /* Next and previous elements in the table */
+  void *data;              /* Data associated with this element */
+  void *pKey; int nKey;    /* Key associated with this element */
+};
+
+/*
+** There are 4 different modes of operation for a hash table:
+**
+**   SQLITE_HASH_INT         nKey is used as the key and pKey is ignored.
+**
+**   SQLITE_HASH_POINTER     pKey is used as the key and nKey is ignored.
+**
+**   SQLITE_HASH_STRING      pKey points to a string that is nKey bytes long
+**                           (including the null-terminator, if any).  Case
+**                           is ignored in comparisons.
+**
+**   SQLITE_HASH_BINARY      pKey points to binary data nKey bytes long.
+**                           memcmp() is used to compare keys.
+**
+** A copy of the key is made for SQLITE_HASH_STRING and SQLITE_HASH_BINARY
+** if the copyKey parameter to HashInit is 1.
+*/
+/* #define SQLITE_HASH_INT       1 // NOT USED */
+/* #define SQLITE_HASH_POINTER   2 // NOT USED */
+#define SQLITE_HASH_STRING    3
+#define SQLITE_HASH_BINARY    4
+
+/*
+** Access routines.  To delete, insert a NULL pointer.
+*/
+void sqlite3HashInit(Hash*, int keytype, int copyKey);
+void *sqlite3HashInsert(Hash*, const void *pKey, int nKey, void *pData);
+void *sqlite3HashFind(const Hash*, const void *pKey, int nKey);
+HashElem *sqlite3HashFindElem(const Hash*, const void *pKey, int nKey);
+void sqlite3HashClear(Hash*);
+
+/*
+** Macros for looping over all elements of a hash table.  The idiom is
+** like this:
+**
+**   Hash h;
+**   HashElem *p;
+**   ...
+**   for(p=sqliteHashFirst(&h); p; p=sqliteHashNext(p)){
+**     SomeStructure *pData = sqliteHashData(p);
+**     // do something with pData
+**   }
+*/
+#define sqliteHashFirst(H)  ((H)->first)
+#define sqliteHashNext(E)   ((E)->next)
+#define sqliteHashData(E)   ((E)->data)
+#define sqliteHashKey(E)    ((E)->pKey)
+#define sqliteHashKeysize(E) ((E)->nKey)
+
+/*
+** Number of entries in a hash table
+*/
+#define sqliteHashCount(H)  ((H)->count)
+
+#endif /* _SQLITE_HASH_H_ */
diff --git a/uppsrc/plugin/sqlite3/lib/insert.c b/uppsrc/plugin/sqlite3/lib/insert.c
new file mode 100644
index 000000000..d008470e0
--- /dev/null
+++ b/uppsrc/plugin/sqlite3/lib/insert.c
@@ -0,0 +1,1665 @@
+/*
+** 2001 September 15
+**
+** The author disclaims copyright to this source code.  In place of
+** a legal notice, here is a blessing:
+**
+**    May you do good and not evil.
+**    May you find forgiveness for yourself and forgive others.
+**    May you share freely, never taking more than you give.
+**
+*************************************************************************
+** This file contains C code routines that are called by the parser
+** to handle INSERT statements in SQLite.
+**
+** $Id: insert.c,v 1.231 2008/03/06 09:58:50 mlcreech Exp $
+*/
+#include "sqliteInt.h"
+
+/*
+** Set P4 of the most recently inserted opcode to a column affinity
+** string for index pIdx. A column affinity string has one character
+** for each column in the table, according to the affinity of the column:
+**
+**  Character      Column affinity
+**  ------------------------------
+**  'a'            TEXT
+**  'b'            NONE
+**  'c'            NUMERIC
+**  'd'            INTEGER
+**  'e'            REAL
+**
+** An extra 'b' is appended to the end of the string to cover the
+** rowid that appears as the last column in every index.
+*/
+void sqlite3IndexAffinityStr(Vdbe *v, Index *pIdx){
+  if( !pIdx->zColAff ){
+    /* The first time a column affinity string for a particular index is
+    ** required, it is allocated and populated here. It is then stored as
+    ** a member of the Index structure for subsequent use.
+    **
+    ** The column affinity string will eventually be deleted by
+    ** sqliteDeleteIndex() when the Index structure itself is cleaned
+    ** up.
+    */
+    int n;
+    Table *pTab = pIdx->pTable;
+    sqlite3 *db = sqlite3VdbeDb(v);
+    pIdx->zColAff = (char *)sqlite3DbMallocZero(db, pIdx->nColumn+2);
+    if( !pIdx->zColAff ){
+      return;
+    }
+    for(n=0; n<pIdx->nColumn; n++){
+      pIdx->zColAff[n] = pTab->aCol[pIdx->aiColumn[n]].affinity;
+    }
+    pIdx->zColAff[n++] = SQLITE_AFF_NONE;
+    pIdx->zColAff[n] = 0;
+  }
+
+  sqlite3VdbeChangeP4(v, -1, pIdx->zColAff, 0);
+}
+
+/*
+** Set P4 of the most recently inserted opcode to a column affinity
+** string for table pTab. A column affinity string has one character
+** for each column indexed by the index, according to the affinity of the
+** column:
+**
+**  Character      Column affinity
+**  ------------------------------
+**  'a'            TEXT
+**  'b'            NONE
+**  'c'            NUMERIC
+**  'd'            INTEGER
+**  'e'            REAL
+*/
+void sqlite3TableAffinityStr(Vdbe *v, Table *pTab){
+  /* The first time a column affinity string for a particular table
+  ** is required, it is allocated and populated here. It is then
+  ** stored as a member of the Table structure for subsequent use.
+  **
+  ** The column affinity string will eventually be deleted by
+  ** sqlite3DeleteTable() when the Table structure itself is cleaned up.
+  */
+  if( !pTab->zColAff ){
+    char *zColAff;
+    int i;
+    sqlite3 *db = sqlite3VdbeDb(v);
+
+    zColAff = (char *)sqlite3DbMallocZero(db, pTab->nCol+1);
+    if( !zColAff ){
+      return;
+    }
+
+    for(i=0; i<pTab->nCol; i++){
+      zColAff[i] = pTab->aCol[i].affinity;
+    }
+    zColAff[pTab->nCol] = '\0';
+
+    pTab->zColAff = zColAff;
+  }
+
+  sqlite3VdbeChangeP4(v, -1, pTab->zColAff, 0);
+}
+
+/*
+** Return non-zero if the table pTab in database iDb or any of its indices
+** have been opened at any point in the VDBE program beginning at location
+** iStartAddr throught the end of the program.  This is used to see if
+** a statement of the form  "INSERT INTO <iDb, pTab> SELECT ..." can
+** run without using temporary table for the results of the SELECT.
+*/
+static int readsTable(Vdbe *v, int iStartAddr, int iDb, Table *pTab){
+  int i;
+  int iEnd = sqlite3VdbeCurrentAddr(v);
+  for(i=iStartAddr; i<iEnd; i++){
+    VdbeOp *pOp = sqlite3VdbeGetOp(v, i);
+    assert( pOp!=0 );
+    if( pOp->opcode==OP_OpenRead && pOp->p3==iDb ){
+      Index *pIndex;
+      int tnum = pOp->p2;
+      if( tnum==pTab->tnum ){
+        return 1;
+      }
+      for(pIndex=pTab->pIndex; pIndex; pIndex=pIndex->pNext){
+        if( tnum==pIndex->tnum ){
+          return 1;
+        }
+      }
+    }
+#ifndef SQLITE_OMIT_VIRTUALTABLE
+    if( pOp->opcode==OP_VOpen && pOp->p4.pVtab==pTab->pVtab ){
+      assert( pOp->p4.pVtab!=0 );
+      assert( pOp->p4type==P4_VTAB );
+      return 1;
+    }
+#endif
+  }
+  return 0;
+}
+
+#ifndef SQLITE_OMIT_AUTOINCREMENT
+/*
+** Write out code to initialize the autoincrement logic.  This code
+** looks up the current autoincrement value in the sqlite_sequence
+** table and stores that value in a register.  Code generated by
+** autoIncStep() will keep that register holding the largest
+** rowid value.  Code generated by autoIncEnd() will write the new
+** largest value of the counter back into the sqlite_sequence table.
+**
+** This routine returns the index of the mem[] cell that contains
+** the maximum rowid counter.
+**
+** Three consecutive registers are allocated by this routine.  The
+** first two hold the name of the target table and the maximum rowid
+** inserted into the target table, respectively.
+** The third holds the rowid in sqlite_sequence where we will
+** write back the revised maximum rowid.  This routine returns the
+** index of the second of these three registers.
+*/
+static int autoIncBegin(
+  Parse *pParse,      /* Parsing context */
+  int iDb,            /* Index of the database holding pTab */
+  Table *pTab         /* The table we are writing to */
+){
+  int memId = 0;      /* Register holding maximum rowid */
+  if( pTab->autoInc ){
+    Vdbe *v = pParse->pVdbe;
+    Db *pDb = &pParse->db->aDb[iDb];
+    int iCur = pParse->nTab;
+    int addr;               /* Address of the top of the loop */
+    assert( v );
+    pParse->nMem++;         /* Holds name of table */
+    memId = ++pParse->nMem;
+    pParse->nMem++;
+    sqlite3OpenTable(pParse, iCur, iDb, pDb->pSchema->pSeqTab, OP_OpenRead);
+    addr = sqlite3VdbeCurrentAddr(v);
+    sqlite3VdbeAddOp4(v, OP_String8, 0, memId-1, 0, pTab->zName, 0);
+    sqlite3VdbeAddOp2(v, OP_Rewind, iCur, addr+8);
+    sqlite3VdbeAddOp3(v, OP_Column, iCur, 0, memId);
+    sqlite3VdbeAddOp3(v, OP_Ne, memId-1, addr+7, memId);
+    sqlite3VdbeChangeP5(v, SQLITE_JUMPIFNULL);
+    sqlite3VdbeAddOp2(v, OP_Rowid, iCur, memId+1);
+    sqlite3VdbeAddOp3(v, OP_Column, iCur, 1, memId);
+    sqlite3VdbeAddOp2(v, OP_Goto, 0, addr+8);
+    sqlite3VdbeAddOp2(v, OP_Next, iCur, addr+2);
+    sqlite3VdbeAddOp2(v, OP_Close, iCur, 0);
+  }
+  return memId;
+}
+
+/*
+** Update the maximum rowid for an autoincrement calculation.
+**
+** This routine should be called when the top of the stack holds a
+** new rowid that is about to be inserted.  If that new rowid is
+** larger than the maximum rowid in the memId memory cell, then the
+** memory cell is updated.  The stack is unchanged.
+*/
+static void autoIncStep(Parse *pParse, int memId, int regRowid){
+  if( memId>0 ){
+    sqlite3VdbeAddOp2(pParse->pVdbe, OP_MemMax, memId, regRowid);
+  }
+}
+
+/*
+** After doing one or more inserts, the maximum rowid is stored
+** in reg[memId].  Generate code to write this value back into the
+** the sqlite_sequence table.
+*/
+static void autoIncEnd(
+  Parse *pParse,     /* The parsing context */
+  int iDb,           /* Index of the database holding pTab */
+  Table *pTab,       /* Table we are inserting into */
+  int memId          /* Memory cell holding the maximum rowid */
+){
+  if( pTab->autoInc ){
+    int iCur = pParse->nTab;
+    Vdbe *v = pParse->pVdbe;
+    Db *pDb = &pParse->db->aDb[iDb];
+    int j1;
+    int iRec = ++pParse->nMem;    /* Memory cell used for record */
+
+    assert( v );
+    sqlite3OpenTable(pParse, iCur, iDb, pDb->pSchema->pSeqTab, OP_OpenWrite);
+    j1 = sqlite3VdbeAddOp1(v, OP_NotNull, memId+1);
+    sqlite3VdbeAddOp2(v, OP_NewRowid, iCur, memId+1);
+    sqlite3VdbeJumpHere(v, j1);
+    sqlite3VdbeAddOp3(v, OP_MakeRecord, memId-1, 2, iRec);
+    sqlite3VdbeAddOp3(v, OP_Insert, iCur, iRec, memId+1);
+    sqlite3VdbeChangeP5(v, OPFLAG_APPEND);
+    sqlite3VdbeAddOp1(v, OP_Close, iCur);
+  }
+}
+#else
+/*
+** If SQLITE_OMIT_AUTOINCREMENT is defined, then the three routines
+** above are all no-ops
+*/
+# define autoIncBegin(A,B,C) (0)
+# define autoIncStep(A,B,C)
+# define autoIncEnd(A,B,C,D)
+#endif /* SQLITE_OMIT_AUTOINCREMENT */
+
+
+/* Forward declaration */
+static int xferOptimization(
+  Parse *pParse,        /* Parser context */
+  Table *pDest,         /* The table we are inserting into */
+  Select *pSelect,      /* A SELECT statement to use as the data source */
+  int onError,          /* How to handle constraint errors */
+  int iDbDest           /* The database of pDest */
+);
+
+/*
+** This routine is call to handle SQL of the following forms:
+**
+**    insert into TABLE (IDLIST) values(EXPRLIST)
+**    insert into TABLE (IDLIST) select
+**
+** The IDLIST following the table name is always optional.  If omitted,
+** then a list of all columns for the table is substituted.  The IDLIST
+** appears in the pColumn parameter.  pColumn is NULL if IDLIST is omitted.
+**
+** The pList parameter holds EXPRLIST in the first form of the INSERT
+** statement above, and pSelect is NULL.  For the second form, pList is
+** NULL and pSelect is a pointer to the select statement used to generate
+** data for the insert.
+**
+** The code generated follows one of four templates.  For a simple
+** select with data coming from a VALUES clause, the code executes
+** once straight down through.  The template looks like this:
+**
+**         open write cursor to <table> and its indices
+**         puts VALUES clause expressions onto the stack
+**         write the resulting record into <table>
+**         cleanup
+**
+** The three remaining templates assume the statement is of the form
+**
+**   INSERT INTO <table> SELECT ...
+**
+** If the SELECT clause is of the restricted form "SELECT * FROM <table2>" -
+** in other words if the SELECT pulls all columns from a single table
+** and there is no WHERE or LIMIT or GROUP BY or ORDER BY clauses, and
+** if <table2> and <table1> are distinct tables but have identical
+** schemas, including all the same indices, then a special optimization
+** is invoked that copies raw records from <table2> over to <table1>.
+** See the xferOptimization() function for the implementation of this
+** template.  This is the second template.
+**
+**         open a write cursor to <table>
+**         open read cursor on <table2>
+**         transfer all records in <table2> over to <table>
+**         close cursors
+**         foreach index on <table>
+**           open a write cursor on the <table> index
+**           open a read cursor on the corresponding <table2> index
+**           transfer all records from the read to the write cursors
+**           close cursors
+**         end foreach
+**
+** The third template is for when the second template does not apply
+** and the SELECT clause does not read from <table> at any time.
+** The generated code follows this template:
+**
+**         goto B
+**      A: setup for the SELECT
+**         loop over the rows in the SELECT
+**           gosub C
+**         end loop
+**         cleanup after the SELECT
+**         goto D
+**      B: open write cursor to <table> and its indices
+**         goto A
+**      C: insert the select result into <table>
+**         return
+**      D: cleanup
+**
+** The fourth template is used if the insert statement takes its
+** values from a SELECT but the data is being inserted into a table
+** that is also read as part of the SELECT.  In the third form,
+** we have to use a intermediate table to store the results of
+** the select.  The template is like this:
+**
+**         goto B
+**      A: setup for the SELECT
+**         loop over the tables in the SELECT
+**           gosub C
+**         end loop
+**         cleanup after the SELECT
+**         goto D
+**      C: insert the select result into the intermediate table
+**         return
+**      B: open a cursor to an intermediate table
+**         goto A
+**      D: open write cursor to <table> and its indices
+**         loop over the intermediate table
+**           transfer values form intermediate table into <table>
+**         end the loop
+**         cleanup
+*/
+void sqlite3Insert(
+  Parse *pParse,        /* Parser context */
+  SrcList *pTabList,    /* Name of table into which we are inserting */
+  ExprList *pList,      /* List of values to be inserted */
+  Select *pSelect,      /* A SELECT statement to use as the data source */
+  IdList *pColumn,      /* Column names corresponding to IDLIST. */
+  int onError           /* How to handle constraint errors */
+){
+  sqlite3 *db;          /* The main database structure */
+  Table *pTab;          /* The table to insert into.  aka TABLE */
+  char *zTab;           /* Name of the table into which we are inserting */
+  const char *zDb;      /* Name of the database holding this table */
+  int i, j, idx;        /* Loop counters */
+  Vdbe *v;              /* Generate code into this virtual machine */
+  Index *pIdx;          /* For looping over indices of the table */
+  int nColumn;          /* Number of columns in the data */
+  int nHidden = 0;      /* Number of hidden columns if TABLE is virtual */
+  int baseCur = 0;      /* VDBE Cursor number for pTab */
+  int keyColumn = -1;   /* Column that is the INTEGER PRIMARY KEY */
+  int endOfLoop;        /* Label for the end of the insertion loop */
+  int useTempTable = 0; /* Store SELECT results in intermediate table */
+  int srcTab = 0;       /* Data comes from this temporary cursor if >=0 */
+  int iCont=0,iBreak=0; /* Beginning and end of the loop over srcTab */
+  int iSelectLoop = 0;  /* Address of code that implements the SELECT */
+  int iCleanup = 0;     /* Address of the cleanup code */
+  int iInsertBlock = 0; /* Address of the subroutine used to insert data */
+  int newIdx = -1;      /* Cursor for the NEW pseudo-table */
+  int iDb;              /* Index of database holding TABLE */
+  Db *pDb;              /* The database containing table being inserted into */
+  int appendFlag = 0;   /* True if the insert is likely to be an append */
+
+  /* Register allocations */
+  int regFromSelect;    /* Base register for data coming from SELECT */
+  int regAutoinc = 0;   /* Register holding the AUTOINCREMENT counter */
+  int regRowCount = 0;  /* Memory cell used for the row counter */
+  int regIns;           /* Block of regs holding rowid+data being inserted */
+  int regRowid;         /* registers holding insert rowid */
+  int regData;          /* register holding first column to insert */
+  int regRecord;        /* Holds the assemblied row record */
+  int *aRegIdx = 0;     /* One register allocated to each index */
+
+
+#ifndef SQLITE_OMIT_TRIGGER
+  int isView;                 /* True if attempting to insert into a view */
+  int triggers_exist = 0;     /* True if there are FOR EACH ROW triggers */
+#endif
+
+  db = pParse->db;
+  if( pParse->nErr || db->mallocFailed ){
+    goto insert_cleanup;
+  }
+
+  /* Locate the table into which we will be inserting new information.
+  */
+  assert( pTabList->nSrc==1 );
+  zTab = pTabList->a[0].zName;
+  if( zTab==0 ) goto insert_cleanup;
+  pTab = sqlite3SrcListLookup(pParse, pTabList);
+  if( pTab==0 ){
+    goto insert_cleanup;
+  }
+  iDb = sqlite3SchemaToIndex(db, pTab->pSchema);
+  assert( iDb<db->nDb );
+  pDb = &db->aDb[iDb];
+  zDb = pDb->zName;
+  if( sqlite3AuthCheck(pParse, SQLITE_INSERT, pTab->zName, 0, zDb) ){
+    goto insert_cleanup;
+  }
+
+  /* Figure out if we have any triggers and if the table being
+  ** inserted into is a view
+  */
+#ifndef SQLITE_OMIT_TRIGGER
+  triggers_exist = sqlite3TriggersExist(pParse, pTab, TK_INSERT, 0);
+  isView = pTab->pSelect!=0;
+#else
+# define triggers_exist 0
+# define isView 0
+#endif
+#ifdef SQLITE_OMIT_VIEW
+# undef isView
+# define isView 0
+#endif
+
+  /* Ensure that:
+  *  (a) the table is not read-only,
+  *  (b) that if it is a view then ON INSERT triggers exist
+  */
+  if( sqlite3IsReadOnly(pParse, pTab, triggers_exist) ){
+    goto insert_cleanup;
+  }
+  assert( pTab!=0 );
+
+  /* If pTab is really a view, make sure it has been initialized.
+  ** ViewGetColumnNames() is a no-op if pTab is not a view (or virtual
+  ** module table).
+  */
+  if( sqlite3ViewGetColumnNames(pParse, pTab) ){
+    goto insert_cleanup;
+  }
+
+  /* Allocate a VDBE
+  */
+  v = sqlite3GetVdbe(pParse);
+  if( v==0 ) goto insert_cleanup;
+  if( pParse->nested==0 ) sqlite3VdbeCountChanges(v);
+  sqlite3BeginWriteOperation(pParse, pSelect || triggers_exist, iDb);
+
+  /* if there are row triggers, allocate a temp table for new.* references. */
+  if( triggers_exist ){
+    newIdx = pParse->nTab++;
+  }
+
+#ifndef SQLITE_OMIT_XFER_OPT
+  /* If the statement is of the form
+  **
+  **       INSERT INTO <table1> SELECT * FROM <table2>;
+  **
+  ** Then special optimizations can be applied that make the transfer
+  ** very fast and which reduce fragmentation of indices.
+  */
+  if( pColumn==0 && xferOptimization(pParse, pTab, pSelect, onError, iDb) ){
+    assert( !triggers_exist );
+    assert( pList==0 );
+    goto insert_cleanup;
+  }
+#endif /* SQLITE_OMIT_XFER_OPT */
+
+  /* If this is an AUTOINCREMENT table, look up the sequence number in the
+  ** sqlite_sequence table and store it in memory cell regAutoinc.
+  */
+  regAutoinc = autoIncBegin(pParse, iDb, pTab);
+
+  /* Figure out how many columns of data are supplied.  If the data
+  ** is coming from a SELECT statement, then this step also generates
+  ** all the code to implement the SELECT statement and invoke a subroutine
+  ** to process each row of the result. (Template 2.) If the SELECT
+  ** statement uses the the table that is being inserted into, then the
+  ** subroutine is also coded here.  That subroutine stores the SELECT
+  ** results in a temporary table. (Template 3.)
+  */
+  if( pSelect ){
+    /* Data is coming from a SELECT.  Generate code to implement that SELECT
+    */
+    SelectDest dest;
+    int rc, iInitCode;
+
+    iInitCode = sqlite3VdbeAddOp2(v, OP_Goto, 0, 0);
+    iSelectLoop = sqlite3VdbeCurrentAddr(v);
+    iInsertBlock = sqlite3VdbeMakeLabel(v);
+    sqlite3SelectDestInit(&dest, SRT_Subroutine, iInsertBlock);
+
+    /* Resolve the expressions in the SELECT statement and execute it. */
+    rc = sqlite3Select(pParse, pSelect, &dest, 0, 0, 0, 0);
+    if( rc || pParse->nErr || db->mallocFailed ){
+      goto insert_cleanup;
+    }
+
+    regFromSelect = dest.iMem;
+    iCleanup = sqlite3VdbeMakeLabel(v);
+    sqlite3VdbeAddOp2(v, OP_Goto, 0, iCleanup);
+    assert( pSelect->pEList );
+    nColumn = pSelect->pEList->nExpr;
+
+    /* Set useTempTable to TRUE if the result of the SELECT statement
+    ** should be written into a temporary table.  Set to FALSE if each
+    ** row of the SELECT can be written directly into the result table.
+    **
+    ** A temp table must be used if the table being updated is also one
+    ** of the tables being read by the SELECT statement.  Also use a
+    ** temp table in the case of row triggers.
+    */
+    if( triggers_exist || readsTable(v, iSelectLoop, iDb, pTab) ){
+      useTempTable = 1;
+    }
+
+    if( useTempTable ){
+      /* Generate the subroutine that SELECT calls to process each row of
+      ** the result.  Store the result in a temporary table
+      */
+      int regRec, regRowid;
+
+      srcTab = pParse->nTab++;
+      regRec = sqlite3GetTempReg(pParse);
+      regRowid = sqlite3GetTempReg(pParse);
+      sqlite3VdbeResolveLabel(v, iInsertBlock);
+      sqlite3VdbeAddOp3(v, OP_MakeRecord, regFromSelect, nColumn, regRec);
+      sqlite3VdbeAddOp2(v, OP_NewRowid, srcTab, regRowid);
+      sqlite3VdbeAddOp3(v, OP_Insert, srcTab, regRec, regRowid);
+      sqlite3VdbeAddOp2(v, OP_Return, 0, 0);
+      sqlite3ReleaseTempReg(pParse, regRec);
+      sqlite3ReleaseTempReg(pParse, regRowid);
+
+      /* The following code runs first because the GOTO at the very top
+      ** of the program jumps to it.  Create the temporary table, then jump
+      ** back up and execute the SELECT code above.
+      */
+      sqlite3VdbeJumpHere(v, iInitCode);
+      sqlite3VdbeAddOp2(v, OP_OpenEphemeral, srcTab, 0);
+      sqlite3VdbeAddOp2(v, OP_SetNumColumns, srcTab, nColumn);
+      sqlite3VdbeAddOp2(v, OP_Goto, 0, iSelectLoop);
+      sqlite3VdbeResolveLabel(v, iCleanup);
+    }else{
+      sqlite3VdbeJumpHere(v, iInitCode);
+    }
+  }else{
+    /* This is the case if the data for the INSERT is coming from a VALUES
+    ** clause
+    */
+    NameContext sNC;
+    memset(&sNC, 0, sizeof(sNC));
+    sNC.pParse = pParse;
+    srcTab = -1;
+    assert( useTempTable==0 );
+    nColumn = pList ? pList->nExpr : 0;
+    for(i=0; i<nColumn; i++){
+      if( sqlite3ExprResolveNames(&sNC, pList->a[i].pExpr) ){
+        goto insert_cleanup;
+      }
+    }
+  }
+
+  /* Make sure the number of columns in the source data matches the number
+  ** of columns to be inserted into the table.
+  */
+  if( IsVirtual(pTab) ){
+    for(i=0; i<pTab->nCol; i++){
+      nHidden += (IsHiddenColumn(&pTab->aCol[i]) ? 1 : 0);
+    }
+  }
+  if( pColumn==0 && nColumn && nColumn!=(pTab->nCol-nHidden) ){
+    sqlite3ErrorMsg(pParse,
+       "table %S has %d columns but %d values were supplied",
+       pTabList, 0, pTab->nCol, nColumn);
+    goto insert_cleanup;
+  }
+  if( pColumn!=0 && nColumn!=pColumn->nId ){
+    sqlite3ErrorMsg(pParse, "%d values for %d columns", nColumn, pColumn->nId);
+    goto insert_cleanup;
+  }
+
+  /* If the INSERT statement included an IDLIST term, then make sure
+  ** all elements of the IDLIST really are columns of the table and
+  ** remember the column indices.
+  **
+  ** If the table has an INTEGER PRIMARY KEY column and that column
+  ** is named in the IDLIST, then record in the keyColumn variable
+  ** the index into IDLIST of the primary key column.  keyColumn is
+  ** the index of the primary key as it appears in IDLIST, not as
+  ** is appears in the original table.  (The index of the primary
+  ** key in the original table is pTab->iPKey.)
+  */
+  if( pColumn ){
+    for(i=0; i<pColumn->nId; i++){
+      pColumn->a[i].idx = -1;
+    }
+    for(i=0; i<pColumn->nId; i++){
+      for(j=0; j<pTab->nCol; j++){
+        if( sqlite3StrICmp(pColumn->a[i].zName, pTab->aCol[j].zName)==0 ){
+          pColumn->a[i].idx = j;
+          if( j==pTab->iPKey ){
+            keyColumn = i;
+          }
+          break;
+        }
+      }
+      if( j>=pTab->nCol ){
+        if( sqlite3IsRowid(pColumn->a[i].zName) ){
+          keyColumn = i;
+        }else{
+          sqlite3ErrorMsg(pParse, "table %S has no column named %s",
+              pTabList, 0, pColumn->a[i].zName);
+          pParse->nErr++;
+          goto insert_cleanup;
+        }
+      }
+    }
+  }
+
+  /* If there is no IDLIST term but the table has an integer primary
+  ** key, the set the keyColumn variable to the primary key column index
+  ** in the original table definition.
+  */
+  if( pColumn==0 && nColumn>0 ){
+    keyColumn = pTab->iPKey;
+  }
+
+  /* Open the temp table for FOR EACH ROW triggers
+  */
+  if( triggers_exist ){
+    sqlite3VdbeAddOp2(v, OP_OpenPseudo, newIdx, 0);
+    sqlite3VdbeAddOp2(v, OP_SetNumColumns, newIdx, pTab->nCol);
+  }
+
+  /* Initialize the count of rows to be inserted
+  */
+  if( db->flags & SQLITE_CountRows ){
+    regRowCount = ++pParse->nMem;
+    sqlite3VdbeAddOp2(v, OP_Integer, 0, regRowCount);
+  }
+
+  /* If this is not a view, open the table and and all indices */
+  if( !isView ){
+    int nIdx;
+    int i;
+
+    baseCur = pParse->nTab;
+    nIdx = sqlite3OpenTableAndIndices(pParse, pTab, baseCur, OP_OpenWrite);
+    aRegIdx = sqlite3DbMallocZero(db, sizeof(int)*(nIdx+1));
+    if( aRegIdx==0 ){
+      goto insert_cleanup;
+    }
+    for(i=0; i<nIdx; i++){
+      aRegIdx[i] = ++pParse->nMem;
+    }
+  }
+
+  /* If the data source is a temporary table, then we have to create
+  ** a loop because there might be multiple rows of data.  If the data
+  ** source is a subroutine call from the SELECT statement, then we need
+  ** to launch the SELECT statement processing.
+  */
+  if( useTempTable ){
+    iBreak = sqlite3VdbeMakeLabel(v);
+    sqlite3VdbeAddOp2(v, OP_Rewind, srcTab, iBreak);
+    iCont = sqlite3VdbeCurrentAddr(v);
+  }else if( pSelect ){
+    sqlite3VdbeAddOp2(v, OP_Goto, 0, iSelectLoop);
+    sqlite3VdbeResolveLabel(v, iInsertBlock);
+  }
+
+  /* Allocate registers for holding the rowid of the new row,
+  ** the content of the new row, and the assemblied row record.
+  */
+  regRecord = ++pParse->nMem;
+  regRowid = regIns = pParse->nMem+1;
+  pParse->nMem += pTab->nCol + 1;
+  if( IsVirtual(pTab) ){
+    regRowid++;
+    pParse->nMem++;
+  }
+  regData = regRowid+1;
+
+  /* Run the BEFORE and INSTEAD OF triggers, if there are any
+  */
+  endOfLoop = sqlite3VdbeMakeLabel(v);
+  if( triggers_exist & TRIGGER_BEFORE ){
+    int regRowid;
+    int regCols;
+    int regRec;
+
+    /* build the NEW.* reference row.  Note that if there is an INTEGER
+    ** PRIMARY KEY into which a NULL is being inserted, that NULL will be
+    ** translated into a unique ID for the row.  But on a BEFORE trigger,
+    ** we do not know what the unique ID will be (because the insert has
+    ** not happened yet) so we substitute a rowid of -1
+    */
+    regRowid = sqlite3GetTempReg(pParse);
+    if( keyColumn<0 ){
+      sqlite3VdbeAddOp2(v, OP_Integer, -1, regRowid);
+    }else if( useTempTable ){
+      sqlite3VdbeAddOp3(v, OP_Column, srcTab, keyColumn, regRowid);
+    }else{
+      int j1;
+      assert( pSelect==0 );  /* Otherwise useTempTable is true */
+      sqlite3ExprCode(pParse, pList->a[keyColumn].pExpr, regRowid);
+      j1 = sqlite3VdbeAddOp1(v, OP_NotNull, regRowid);
+      sqlite3VdbeAddOp2(v, OP_Integer, -1, regRowid);
+      sqlite3VdbeJumpHere(v, j1);
+      sqlite3VdbeAddOp1(v, OP_MustBeInt, regRowid);
+    }
+
+    /* Cannot have triggers on a virtual table. If it were possible,
+    ** this block would have to account for hidden column.
+    */
+    assert(!IsVirtual(pTab));
+
+    /* Create the new column data
+    */
+    regCols = sqlite3GetTempRange(pParse, pTab->nCol);
+    for(i=0; i<pTab->nCol; i++){
+      if( pColumn==0 ){
+        j = i;
+      }else{
+        for(j=0; j<pColumn->nId; j++){
+          if( pColumn->a[j].idx==i ) break;
+        }
+      }
+      if( pColumn && j>=pColumn->nId ){
+        sqlite3ExprCode(pParse, pTab->aCol[i].pDflt, regCols+i);
+      }else if( useTempTable ){
+        sqlite3VdbeAddOp3(v, OP_Column, srcTab, j, regCols+i);
+      }else{
+        assert( pSelect==0 ); /* Otherwise useTempTable is true */
+        sqlite3ExprCodeAndCache(pParse, pList->a[j].pExpr, regCols+i);
+      }
+    }
+    regRec = sqlite3GetTempReg(pParse);
+    sqlite3VdbeAddOp3(v, OP_MakeRecord, regCols, pTab->nCol, regRec);
+
+    /* If this is an INSERT on a view with an INSTEAD OF INSERT trigger,
+    ** do not attempt any conversions before assembling the record.
+    ** If this is a real table, attempt conversions as required by the
+    ** table column affinities.
+    */
+    if( !isView ){
+      sqlite3TableAffinityStr(v, pTab);
+    }
+    sqlite3VdbeAddOp3(v, OP_Insert, newIdx, regRec, regRowid);
+    sqlite3ReleaseTempReg(pParse, regRec);
+    sqlite3ReleaseTempReg(pParse, regRowid);
+    sqlite3ReleaseTempRange(pParse, regCols, pTab->nCol);
+
+    /* Fire BEFORE or INSTEAD OF triggers */
+    if( sqlite3CodeRowTrigger(pParse, TK_INSERT, 0, TRIGGER_BEFORE, pTab,
+        newIdx, -1, onError, endOfLoop, 0, 0) ){
+      goto insert_cleanup;
+    }
+  }
+
+  /* Push the record number for the new entry onto the stack.  The
+  ** record number is a randomly generate integer created by NewRowid
+  ** except when the table has an INTEGER PRIMARY KEY column, in which
+  ** case the record number is the same as that column.
+  */
+  if( !isView ){
+    if( IsVirtual(pTab) ){
+      /* The row that the VUpdate opcode will delete: none */
+      sqlite3VdbeAddOp2(v, OP_Null, 0, regIns);
+    }
+    if( keyColumn>=0 ){
+      if( useTempTable ){
+        sqlite3VdbeAddOp3(v, OP_Column, srcTab, keyColumn, regRowid);
+      }else if( pSelect ){
+        sqlite3VdbeAddOp2(v, OP_SCopy, regFromSelect+keyColumn, regRowid);
+      }else{
+        VdbeOp *pOp;
+        sqlite3ExprCode(pParse, pList->a[keyColumn].pExpr, regRowid);
+        pOp = sqlite3VdbeGetOp(v, sqlite3VdbeCurrentAddr(v) - 1);
+        if( pOp && pOp->opcode==OP_Null ){
+          appendFlag = 1;
+          pOp->opcode = OP_NewRowid;
+          pOp->p1 = baseCur;
+          pOp->p2 = regRowid;
+          pOp->p3 = regAutoinc;
+        }
+      }
+      /* If the PRIMARY KEY expression is NULL, then use OP_NewRowid
+      ** to generate a unique primary key value.
+      */
+      if( !appendFlag ){
+        int j1;
+        j1 = sqlite3VdbeAddOp1(v, OP_NotNull, regRowid);
+        sqlite3VdbeAddOp3(v, OP_NewRowid, baseCur, regRowid, regAutoinc);
+        sqlite3VdbeJumpHere(v, j1);
+        sqlite3VdbeAddOp1(v, OP_MustBeInt, regRowid);
+      }
+    }else if( IsVirtual(pTab) ){
+      sqlite3VdbeAddOp2(v, OP_Null, 0, regRowid);
+    }else{
+      sqlite3VdbeAddOp3(v, OP_NewRowid, baseCur, regRowid, regAutoinc);
+      appendFlag = 1;
+    }
+    autoIncStep(pParse, regAutoinc, regRowid);
+
+    /* Push onto the stack, data for all columns of the new entry, beginning
+    ** with the first column.
+    */
+    nHidden = 0;
+    for(i=0; i<pTab->nCol; i++){
+      int iRegStore = regRowid+1+i;
+      if( i==pTab->iPKey ){
+        /* The value of the INTEGER PRIMARY KEY column is always a NULL.
+        ** Whenever this column is read, the record number will be substituted
+        ** in its place.  So will fill this column with a NULL to avoid
+        ** taking up data space with information that will never be used. */
+        sqlite3VdbeAddOp2(v, OP_Null, 0, iRegStore);
+        continue;
+      }
+      if( pColumn==0 ){
+        if( IsHiddenColumn(&pTab->aCol[i]) ){
+          assert( IsVirtual(pTab) );
+          j = -1;
+          nHidden++;
+        }else{
+          j = i - nHidden;
+        }
+      }else{
+        for(j=0; j<pColumn->nId; j++){
+          if( pColumn->a[j].idx==i ) break;
+        }
+      }
+      if( j<0 || nColumn==0 || (pColumn && j>=pColumn->nId) ){
+        sqlite3ExprCode(pParse, pTab->aCol[i].pDflt, iRegStore);
+      }else if( useTempTable ){
+        sqlite3VdbeAddOp3(v, OP_Column, srcTab, j, iRegStore);
+      }else if( pSelect ){
+        sqlite3VdbeAddOp2(v, OP_SCopy, regFromSelect+j, iRegStore);
+      }else{
+        sqlite3ExprCode(pParse, pList->a[j].pExpr, iRegStore);
+      }
+    }
+
+    /* Generate code to check constraints and generate index keys and
+    ** do the insertion.
+    */
+#ifndef SQLITE_OMIT_VIRTUALTABLE
+    if( IsVirtual(pTab) ){
+      pParse->pVirtualLock = pTab;
+      sqlite3VdbeAddOp4(v, OP_VUpdate, 1, pTab->nCol+2, regIns,
+                     (const char*)pTab->pVtab, P4_VTAB);
+    }else
+#endif
+    {
+      sqlite3GenerateConstraintChecks(
+          pParse,
+          pTab,
+          baseCur,
+          regIns,
+          aRegIdx,
+          keyColumn>=0,
+          0,
+          onError,
+          endOfLoop
+      );
+      sqlite3CompleteInsertion(
+          pParse,
+          pTab,
+          baseCur,
+          regIns,
+          aRegIdx,
+          0,
+          0,
+          (triggers_exist & TRIGGER_AFTER)!=0 ? newIdx : -1,
+          appendFlag
+       );
+    }
+  }
+
+  /* Update the count of rows that are inserted
+  */
+  if( (db->flags & SQLITE_CountRows)!=0 ){
+    sqlite3VdbeAddOp2(v, OP_AddImm, regRowCount, 1);
+  }
+
+  if( triggers_exist ){
+    /* Code AFTER triggers */
+    if( sqlite3CodeRowTrigger(pParse, TK_INSERT, 0, TRIGGER_AFTER, pTab,
+          newIdx, -1, onError, endOfLoop, 0, 0) ){
+      goto insert_cleanup;
+    }
+  }
+
+  /* The bottom of the loop, if the data source is a SELECT statement
+  */
+  sqlite3VdbeResolveLabel(v, endOfLoop);
+  if( useTempTable ){
+    sqlite3VdbeAddOp2(v, OP_Next, srcTab, iCont);
+    sqlite3VdbeResolveLabel(v, iBreak);
+    sqlite3VdbeAddOp2(v, OP_Close, srcTab, 0);
+  }else if( pSelect ){
+    sqlite3VdbeAddOp2(v, OP_Return, 0, 0);
+    sqlite3VdbeResolveLabel(v, iCleanup);
+  }
+
+  if( !IsVirtual(pTab) && !isView ){
+    /* Close all tables opened */
+    sqlite3VdbeAddOp2(v, OP_Close, baseCur, 0);
+    for(idx=1, pIdx=pTab->pIndex; pIdx; pIdx=pIdx->pNext, idx++){
+      sqlite3VdbeAddOp2(v, OP_Close, idx+baseCur, 0);
+    }
+  }
+
+  /* Update the sqlite_sequence table by storing the content of the
+  ** counter value in memory regAutoinc back into the sqlite_sequence
+  ** table.
+  */
+  autoIncEnd(pParse, iDb, pTab, regAutoinc);
+
+  /*
+  ** Return the number of rows inserted. If this routine is
+  ** generating code because of a call to sqlite3NestedParse(), do not
+  ** invoke the callback function.
+  */
+  if( db->flags & SQLITE_CountRows && pParse->nested==0 && !pParse->trigStack ){
+    sqlite3VdbeAddOp2(v, OP_ResultRow, regRowCount, 1);
+    sqlite3VdbeSetNumCols(v, 1);
+    sqlite3VdbeSetColName(v, 0, COLNAME_NAME, "rows inserted", P4_STATIC);
+  }
+
+insert_cleanup:
+  sqlite3SrcListDelete(pTabList);
+  sqlite3ExprListDelete(pList);
+  sqlite3SelectDelete(pSelect);
+  sqlite3IdListDelete(pColumn);
+  sqlite3_free(aRegIdx);
+}
+
+/*
+** Generate code to do constraint checks prior to an INSERT or an UPDATE.
+**
+** The input is a range of consecutive registers as follows:
+**
+**    1.  The rowid of the row to be updated before the update.  This
+**        value is omitted unless we are doing an UPDATE that involves a
+**        change to the record number or writing to a virtual table.
+**
+**    2.  The rowid of the row after the update.
+**
+**    3.  The data in the first column of the entry after the update.
+**
+**    i.  Data from middle columns...
+**
+**    N.  The data in the last column of the entry after the update.
+**
+** The regRowid parameter is the index of the register containing (2).
+**
+** The old rowid shown as entry (1) above is omitted unless both isUpdate
+** and rowidChng are 1.  isUpdate is true for UPDATEs and false for
+** INSERTs.  RowidChng means that the new rowid is explicitly specified by
+** the update or insert statement.  If rowidChng is false, it means that
+** the rowid is computed automatically in an insert or that the rowid value
+** is not modified by the update.
+**
+** The code generated by this routine store new index entries into
+** registers identified by aRegIdx[].  No index entry is created for
+** indices where aRegIdx[i]==0.  The order of indices in aRegIdx[] is
+** the same as the order of indices on the linked list of indices
+** attached to the table.
+**
+** This routine also generates code to check constraints.  NOT NULL,
+** CHECK, and UNIQUE constraints are all checked.  If a constraint fails,
+** then the appropriate action is performed.  There are five possible
+** actions: ROLLBACK, ABORT, FAIL, REPLACE, and IGNORE.
+**
+**  Constraint type  Action       What Happens
+**  ---------------  ----------   ----------------------------------------
+**  any              ROLLBACK     The current transaction is rolled back and
+**                                sqlite3_exec() returns immediately with a
+**                                return code of SQLITE_CONSTRAINT.
+**
+**  any              ABORT        Back out changes from the current command
+**                                only (do not do a complete rollback) then
+**                                cause sqlite3_exec() to return immediately
+**                                with SQLITE_CONSTRAINT.
+**
+**  any              FAIL         Sqlite_exec() returns immediately with a
+**                                return code of SQLITE_CONSTRAINT.  The
+**                                transaction is not rolled back and any
+**                                prior changes are retained.
+**
+**  any              IGNORE       The record number and data is popped from
+**                                the stack and there is an immediate jump
+**                                to label ignoreDest.
+**
+**  NOT NULL         REPLACE      The NULL value is replace by the default
+**                                value for that column.  If the default value
+**                                is NULL, the action is the same as ABORT.
+**
+**  UNIQUE           REPLACE      The other row that conflicts with the row
+**                                being inserted is removed.
+**
+**  CHECK            REPLACE      Illegal.  The results in an exception.
+**
+** Which action to take is determined by the overrideError parameter.
+** Or if overrideError==OE_Default, then the pParse->onError parameter
+** is used.  Or if pParse->onError==OE_Default then the onError value
+** for the constraint is used.
+**
+** The calling routine must open a read/write cursor for pTab with
+** cursor number "baseCur".  All indices of pTab must also have open
+** read/write cursors with cursor number baseCur+i for the i-th cursor.
+** Except, if there is no possibility of a REPLACE action then
+** cursors do not need to be open for indices where aRegIdx[i]==0.
+*/
+void sqlite3GenerateConstraintChecks(
+  Parse *pParse,      /* The parser context */
+  Table *pTab,        /* the table into which we are inserting */
+  int baseCur,        /* Index of a read/write cursor pointing at pTab */
+  int regRowid,       /* Index of the range of input registers */
+  int *aRegIdx,       /* Register used by each index.  0 for unused indices */
+  int rowidChng,      /* True if the rowid might collide with existing entry */
+  int isUpdate,       /* True for UPDATE, False for INSERT */
+  int overrideError,  /* Override onError to this if not OE_Default */
+  int ignoreDest      /* Jump to this label on an OE_Ignore resolution */
+){
+  int i;
+  Vdbe *v;
+  int nCol;
+  int onError;
+  int j1, j2, j3;     /* Addresses of jump instructions */
+  int regData;        /* Register containing first data column */
+  int iCur;
+  Index *pIdx;
+  int seenReplace = 0;
+  int hasTwoRowids = (isUpdate && rowidChng);
+
+  v = sqlite3GetVdbe(pParse);
+  assert( v!=0 );
+  assert( pTab->pSelect==0 );  /* This table is not a VIEW */
+  nCol = pTab->nCol;
+  regData = regRowid + 1;
+
+
+  /* Test all NOT NULL constraints.
+  */
+  for(i=0; i<nCol; i++){
+    if( i==pTab->iPKey ){
+      continue;
+    }
+    onError = pTab->aCol[i].notNull;
+    if( onError==OE_None ) continue;
+    if( overrideError!=OE_Default ){
+      onError = overrideError;
+    }else if( onError==OE_Default ){
+      onError = OE_Abort;
+    }
+    if( onError==OE_Replace && pTab->aCol[i].pDflt==0 ){
+      onError = OE_Abort;
+    }
+    j1 = sqlite3VdbeAddOp1(v, OP_NotNull, regData+i);
+    assert( onError==OE_Rollback || onError==OE_Abort || onError==OE_Fail
+        || onError==OE_Ignore || onError==OE_Replace );
+    switch( onError ){
+      case OE_Rollback:
+      case OE_Abort:
+      case OE_Fail: {
+        char *zMsg = 0;
+        sqlite3VdbeAddOp2(v, OP_Halt, SQLITE_CONSTRAINT, onError);
+        sqlite3SetString(&zMsg, pTab->zName, ".", pTab->aCol[i].zName,
+                        " may not be NULL", (char*)0);
+        sqlite3VdbeChangeP4(v, -1, zMsg, P4_DYNAMIC);
+        break;
+      }
+      case OE_Ignore: {
+        sqlite3VdbeAddOp2(v, OP_Goto, 0, ignoreDest);
+        break;
+      }
+      case OE_Replace: {
+        sqlite3ExprCode(pParse, pTab->aCol[i].pDflt, regData+i);
+        break;
+      }
+    }
+    sqlite3VdbeJumpHere(v, j1);
+  }
+
+  /* Test all CHECK constraints
+  */
+#ifndef SQLITE_OMIT_CHECK
+  if( pTab->pCheck && (pParse->db->flags & SQLITE_IgnoreChecks)==0 ){
+    int allOk = sqlite3VdbeMakeLabel(v);
+    pParse->ckBase = regData;
+    sqlite3ExprIfTrue(pParse, pTab->pCheck, allOk, SQLITE_JUMPIFNULL);
+    onError = overrideError!=OE_Default ? overrideError : OE_Abort;
+    if( onError==OE_Ignore ){
+      sqlite3VdbeAddOp2(v, OP_Goto, 0, ignoreDest);
+    }else{
+      sqlite3VdbeAddOp2(v, OP_Halt, SQLITE_CONSTRAINT, onError);
+    }
+    sqlite3VdbeResolveLabel(v, allOk);
+  }
+#endif /* !defined(SQLITE_OMIT_CHECK) */
+
+  /* If we have an INTEGER PRIMARY KEY, make sure the primary key
+  ** of the new record does not previously exist.  Except, if this
+  ** is an UPDATE and the primary key is not changing, that is OK.
+  */
+  if( rowidChng ){
+    onError = pTab->keyConf;
+    if( overrideError!=OE_Default ){
+      onError = overrideError;
+    }else if( onError==OE_Default ){
+      onError = OE_Abort;
+    }
+
+    if( onError!=OE_Replace || pTab->pIndex ){
+      if( isUpdate ){
+        j2 = sqlite3VdbeAddOp3(v, OP_Eq, regRowid, 0, regRowid-1);
+      }
+      j3 = sqlite3VdbeAddOp3(v, OP_NotExists, baseCur, 0, regRowid);
+      switch( onError ){
+        default: {
+          onError = OE_Abort;
+          /* Fall thru into the next case */
+        }
+        case OE_Rollback:
+        case OE_Abort:
+        case OE_Fail: {
+          sqlite3VdbeAddOp4(v, OP_Halt, SQLITE_CONSTRAINT, onError, 0,
+                           "PRIMARY KEY must be unique", P4_STATIC);
+          break;
+        }
+        case OE_Replace: {
+          sqlite3GenerateRowIndexDelete(pParse, pTab, baseCur, 0);
+          seenReplace = 1;
+          break;
+        }
+        case OE_Ignore: {
+          assert( seenReplace==0 );
+          sqlite3VdbeAddOp2(v, OP_Goto, 0, ignoreDest);
+          break;
+        }
+      }
+      sqlite3VdbeJumpHere(v, j3);
+      if( isUpdate ){
+        sqlite3VdbeJumpHere(v, j2);
+      }
+    }
+  }
+
+  /* Test all UNIQUE constraints by creating entries for each UNIQUE
+  ** index and making sure that duplicate entries do not already exist.
+  ** Add the new records to the indices as we go.
+  */
+  for(iCur=0, pIdx=pTab->pIndex; pIdx; pIdx=pIdx->pNext, iCur++){
+    int regIdx;
+    int regR;
+
+    if( aRegIdx[iCur]==0 ) continue;  /* Skip unused indices */
+
+    /* Create a key for accessing the index entry */
+    regIdx = sqlite3GetTempRange(pParse, pIdx->nColumn+1);
+    for(i=0; i<pIdx->nColumn; i++){
+      int idx = pIdx->aiColumn[i];
+      if( idx==pTab->iPKey ){
+        sqlite3VdbeAddOp2(v, OP_SCopy, regRowid, regIdx+i);
+      }else{
+        sqlite3VdbeAddOp2(v, OP_SCopy, regData+idx, regIdx+i);
+      }
+    }
+    sqlite3VdbeAddOp2(v, OP_SCopy, regRowid, regIdx+i);
+    sqlite3VdbeAddOp3(v, OP_MakeRecord, regIdx, pIdx->nColumn+1, aRegIdx[iCur]);
+    sqlite3IndexAffinityStr(v, pIdx);
+    sqlite3ReleaseTempRange(pParse, regIdx, pIdx->nColumn+1);
+
+    /* Find out what action to take in case there is an indexing conflict */
+    onError = pIdx->onError;
+    if( onError==OE_None ) continue;  /* pIdx is not a UNIQUE index */
+    if( overrideError!=OE_Default ){
+      onError = overrideError;
+    }else if( onError==OE_Default ){
+      onError = OE_Abort;
+    }
+    if( seenReplace ){
+      if( onError==OE_Ignore ) onError = OE_Replace;
+      else if( onError==OE_Fail ) onError = OE_Abort;
+    }
+
+
+    /* Check to see if the new index entry will be unique */
+    j2 = sqlite3VdbeAddOp3(v, OP_IsNull, regIdx, 0, pIdx->nColumn);
+    regR = sqlite3GetTempReg(pParse);
+    sqlite3VdbeAddOp2(v, OP_SCopy, regRowid-hasTwoRowids, regR);
+    j3 = sqlite3VdbeAddOp4(v, OP_IsUnique, baseCur+iCur+1, 0,
+                           regR, (char*)(sqlite3_intptr_t)aRegIdx[iCur],
+                           P4_INT32);
+
+    /* Generate code that executes if the new index entry is not unique */
+    assert( onError==OE_Rollback || onError==OE_Abort || onError==OE_Fail
+        || onError==OE_Ignore || onError==OE_Replace );
+    switch( onError ){
+      case OE_Rollback:
+      case OE_Abort:
+      case OE_Fail: {
+        int j, n1, n2;
+        char zErrMsg[200];
+        sqlite3_snprintf(sizeof(zErrMsg), zErrMsg,
+                         pIdx->nColumn>1 ? "columns " : "column ");
+        n1 = strlen(zErrMsg);
+        for(j=0; j<pIdx->nColumn && n1<sizeof(zErrMsg)-30; j++){
+          char *zCol = pTab->aCol[pIdx->aiColumn[j]].zName;
+          n2 = strlen(zCol);
+          if( j>0 ){
+            sqlite3_snprintf(sizeof(zErrMsg)-n1, &zErrMsg[n1], ", ");
+            n1 += 2;
+          }
+          if( n1+n2>sizeof(zErrMsg)-30 ){
+            sqlite3_snprintf(sizeof(zErrMsg)-n1, &zErrMsg[n1], "...");
+            n1 += 3;
+            break;
+          }else{
+            sqlite3_snprintf(sizeof(zErrMsg)-n1, &zErrMsg[n1], "%s", zCol);
+            n1 += n2;
+          }
+        }
+        sqlite3_snprintf(sizeof(zErrMsg)-n1, &zErrMsg[n1],
+            pIdx->nColumn>1 ? " are not unique" : " is not unique");
+        sqlite3VdbeAddOp4(v, OP_Halt, SQLITE_CONSTRAINT, onError, 0, zErrMsg,0);
+        break;
+      }
+      case OE_Ignore: {
+        assert( seenReplace==0 );
+        sqlite3VdbeAddOp2(v, OP_Goto, 0, ignoreDest);
+        break;
+      }
+      case OE_Replace: {
+        sqlite3GenerateRowDelete(pParse, pTab, baseCur, regR, 0);
+        seenReplace = 1;
+        break;
+      }
+    }
+    sqlite3VdbeJumpHere(v, j2);
+    sqlite3VdbeJumpHere(v, j3);
+    sqlite3ReleaseTempReg(pParse, regR);
+  }
+}
+
+/*
+** This routine generates code to finish the INSERT or UPDATE operation
+** that was started by a prior call to sqlite3GenerateConstraintChecks.
+** A consecutive range of registers starting at regRowid contains the
+** rowid and the content to be inserted.
+**
+** The arguments to this routine should be the same as the first six
+** arguments to sqlite3GenerateConstraintChecks.
+*/
+void sqlite3CompleteInsertion(
+  Parse *pParse,      /* The parser context */
+  Table *pTab,        /* the table into which we are inserting */
+  int baseCur,        /* Index of a read/write cursor pointing at pTab */
+  int regRowid,       /* Range of content */
+  int *aRegIdx,       /* Register used by each index.  0 for unused indices */
+  int rowidChng,      /* True if the record number will change */
+  int isUpdate,       /* True for UPDATE, False for INSERT */
+  int newIdx,         /* Index of NEW table for triggers.  -1 if none */
+  int appendBias      /* True if this is likely to be an append */
+){
+  int i;
+  Vdbe *v;
+  int nIdx;
+  Index *pIdx;
+  int pik_flags;
+  int regData;
+  int regRec;
+
+  v = sqlite3GetVdbe(pParse);
+  assert( v!=0 );
+  assert( pTab->pSelect==0 );  /* This table is not a VIEW */
+  for(nIdx=0, pIdx=pTab->pIndex; pIdx; pIdx=pIdx->pNext, nIdx++){}
+  for(i=nIdx-1; i>=0; i--){
+    if( aRegIdx[i]==0 ) continue;
+    sqlite3VdbeAddOp2(v, OP_IdxInsert, baseCur+i+1, aRegIdx[i]);
+  }
+  regData = regRowid + 1;
+  regRec = sqlite3GetTempReg(pParse);
+  sqlite3VdbeAddOp3(v, OP_MakeRecord, regData, pTab->nCol, regRec);
+  sqlite3TableAffinityStr(v, pTab);
+#ifndef SQLITE_OMIT_TRIGGER
+  if( newIdx>=0 ){
+    sqlite3VdbeAddOp3(v, OP_Insert, newIdx, regRec, regRowid);
+  }
+#endif
+  if( pParse->nested ){
+    pik_flags = 0;
+  }else{
+    pik_flags = OPFLAG_NCHANGE;
+    pik_flags |= (isUpdate?OPFLAG_ISUPDATE:OPFLAG_LASTROWID);
+  }
+  if( appendBias ){
+    pik_flags |= OPFLAG_APPEND;
+  }
+  sqlite3VdbeAddOp3(v, OP_Insert, baseCur, regRec, regRowid);
+  if( !pParse->nested ){
+    sqlite3VdbeChangeP4(v, -1, pTab->zName, P4_STATIC);
+  }
+  sqlite3VdbeChangeP5(v, pik_flags);
+}
+
+/*
+** Generate code that will open cursors for a table and for all
+** indices of that table.  The "baseCur" parameter is the cursor number used
+** for the table.  Indices are opened on subsequent cursors.
+**
+** Return the number of indices on the table.
+*/
+int sqlite3OpenTableAndIndices(
+  Parse *pParse,   /* Parsing context */
+  Table *pTab,     /* Table to be opened */
+  int baseCur,        /* Cursor number assigned to the table */
+  int op           /* OP_OpenRead or OP_OpenWrite */
+){
+  int i;
+  int iDb;
+  Index *pIdx;
+  Vdbe *v;
+
+  if( IsVirtual(pTab) ) return 0;
+  iDb = sqlite3SchemaToIndex(pParse->db, pTab->pSchema);
+  v = sqlite3GetVdbe(pParse);
+  assert( v!=0 );
+  sqlite3OpenTable(pParse, baseCur, iDb, pTab, op);
+  for(i=1, pIdx=pTab->pIndex; pIdx; pIdx=pIdx->pNext, i++){
+    KeyInfo *pKey = sqlite3IndexKeyinfo(pParse, pIdx);
+    assert( pIdx->pSchema==pTab->pSchema );
+    sqlite3VdbeAddOp4(v, op, i+baseCur, pIdx->tnum, iDb,
+                      (char*)pKey, P4_KEYINFO_HANDOFF);
+    VdbeComment((v, "%s", pIdx->zName));
+  }
+  if( pParse->nTab<=baseCur+i ){
+    pParse->nTab = baseCur+i;
+  }
+  return i-1;
+}
+
+
+#ifdef SQLITE_TEST
+/*
+** The following global variable is incremented whenever the
+** transfer optimization is used.  This is used for testing
+** purposes only - to make sure the transfer optimization really
+** is happening when it is suppose to.
+*/
+int sqlite3_xferopt_count;
+#endif /* SQLITE_TEST */
+
+
+#ifndef SQLITE_OMIT_XFER_OPT
+/*
+** Check to collation names to see if they are compatible.
+*/
+static int xferCompatibleCollation(const char *z1, const char *z2){
+  if( z1==0 ){
+    return z2==0;
+  }
+  if( z2==0 ){
+    return 0;
+  }
+  return sqlite3StrICmp(z1, z2)==0;
+}
+
+
+/*
+** Check to see if index pSrc is compatible as a source of data
+** for index pDest in an insert transfer optimization.  The rules
+** for a compatible index:
+**
+**    *   The index is over the same set of columns
+**    *   The same DESC and ASC markings occurs on all columns
+**    *   The same onError processing (OE_Abort, OE_Ignore, etc)
+**    *   The same collating sequence on each column
+*/
+static int xferCompatibleIndex(Index *pDest, Index *pSrc){
+  int i;
+  assert( pDest && pSrc );
+  assert( pDest->pTable!=pSrc->pTable );
+  if( pDest->nColumn!=pSrc->nColumn ){
+    return 0;   /* Different number of columns */
+  }
+  if( pDest->onError!=pSrc->onError ){
+    return 0;   /* Different conflict resolution strategies */
+  }
+  for(i=0; i<pSrc->nColumn; i++){
+    if( pSrc->aiColumn[i]!=pDest->aiColumn[i] ){
+      return 0;   /* Different columns indexed */
+    }
+    if( pSrc->aSortOrder[i]!=pDest->aSortOrder[i] ){
+      return 0;   /* Different sort orders */
+    }
+    if( pSrc->azColl[i]!=pDest->azColl[i] ){
+      return 0;   /* Different collating sequences */
+    }
+  }
+
+  /* If no test above fails then the indices must be compatible */
+  return 1;
+}
+
+/*
+** Attempt the transfer optimization on INSERTs of the form
+**
+**     INSERT INTO tab1 SELECT * FROM tab2;
+**
+** This optimization is only attempted if
+**
+**    (1)  tab1 and tab2 have identical schemas including all the
+**         same indices and constraints
+**
+**    (2)  tab1 and tab2 are different tables
+**
+**    (3)  There must be no triggers on tab1
+**
+**    (4)  The result set of the SELECT statement is "*"
+**
+**    (5)  The SELECT statement has no WHERE, HAVING, ORDER BY, GROUP BY,
+**         or LIMIT clause.
+**
+**    (6)  The SELECT statement is a simple (not a compound) select that
+**         contains only tab2 in its FROM clause
+**
+** This method for implementing the INSERT transfers raw records from
+** tab2 over to tab1.  The columns are not decoded.  Raw records from
+** the indices of tab2 are transfered to tab1 as well.  In so doing,
+** the resulting tab1 has much less fragmentation.
+**
+** This routine returns TRUE if the optimization is attempted.  If any
+** of the conditions above fail so that the optimization should not
+** be attempted, then this routine returns FALSE.
+*/
+static int xferOptimization(
+  Parse *pParse,        /* Parser context */
+  Table *pDest,         /* The table we are inserting into */
+  Select *pSelect,      /* A SELECT statement to use as the data source */
+  int onError,          /* How to handle constraint errors */
+  int iDbDest           /* The database of pDest */
+){
+  ExprList *pEList;                /* The result set of the SELECT */
+  Table *pSrc;                     /* The table in the FROM clause of SELECT */
+  Index *pSrcIdx, *pDestIdx;       /* Source and destination indices */
+  struct SrcList_item *pItem;      /* An element of pSelect->pSrc */
+  int i;                           /* Loop counter */
+  int iDbSrc;                      /* The database of pSrc */
+  int iSrc, iDest;                 /* Cursors from source and destination */
+  int addr1, addr2;                /* Loop addresses */
+  int emptyDestTest;               /* Address of test for empty pDest */
+  int emptySrcTest;                /* Address of test for empty pSrc */
+  Vdbe *v;                         /* The VDBE we are building */
+  KeyInfo *pKey;                   /* Key information for an index */
+  int regAutoinc;                  /* Memory register used by AUTOINC */
+  int destHasUniqueIdx = 0;        /* True if pDest has a UNIQUE index */
+  int regData, regRowid;           /* Registers holding data and rowid */
+
+  if( pSelect==0 ){
+    return 0;   /* Must be of the form  INSERT INTO ... SELECT ... */
+  }
+  if( pDest->pTrigger ){
+    return 0;   /* tab1 must not have triggers */
+  }
+#ifndef SQLITE_OMIT_VIRTUALTABLE
+  if( pDest->isVirtual ){
+    return 0;   /* tab1 must not be a virtual table */
+  }
+#endif
+  if( onError==OE_Default ){
+    onError = OE_Abort;
+  }
+  if( onError!=OE_Abort && onError!=OE_Rollback ){
+    return 0;   /* Cannot do OR REPLACE or OR IGNORE or OR FAIL */
+  }
+  assert(pSelect->pSrc);   /* allocated even if there is no FROM clause */
+  if( pSelect->pSrc->nSrc!=1 ){
+    return 0;   /* FROM clause must have exactly one term */
+  }
+  if( pSelect->pSrc->a[0].pSelect ){
+    return 0;   /* FROM clause cannot contain a subquery */
+  }
+  if( pSelect->pWhere ){
+    return 0;   /* SELECT may not have a WHERE clause */
+  }
+  if( pSelect->pOrderBy ){
+    return 0;   /* SELECT may not have an ORDER BY clause */
+  }
+  /* Do not need to test for a HAVING clause.  If HAVING is present but
+  ** there is no ORDER BY, we will get an error. */
+  if( pSelect->pGroupBy ){
+    return 0;   /* SELECT may not have a GROUP BY clause */
+  }
+  if( pSelect->pLimit ){
+    return 0;   /* SELECT may not have a LIMIT clause */
+  }
+  assert( pSelect->pOffset==0 );  /* Must be so if pLimit==0 */
+  if( pSelect->pPrior ){
+    return 0;   /* SELECT may not be a compound query */
+  }
+  if( pSelect->isDistinct ){
+    return 0;   /* SELECT may not be DISTINCT */
+  }
+  pEList = pSelect->pEList;
+  assert( pEList!=0 );
+  if( pEList->nExpr!=1 ){
+    return 0;   /* The result set must have exactly one column */
+  }
+  assert( pEList->a[0].pExpr );
+  if( pEList->a[0].pExpr->op!=TK_ALL ){
+    return 0;   /* The result set must be the special operator "*" */
+  }
+
+  /* At this point we have established that the statement is of the
+  ** correct syntactic form to participate in this optimization.  Now
+  ** we have to check the semantics.
+  */
+  pItem = pSelect->pSrc->a;
+  pSrc = sqlite3LocateTable(pParse, 0, pItem->zName, pItem->zDatabase);
+  if( pSrc==0 ){
+    return 0;   /* FROM clause does not contain a real table */
+  }
+  if( pSrc==pDest ){
+    return 0;   /* tab1 and tab2 may not be the same table */
+  }
+#ifndef SQLITE_OMIT_VIRTUALTABLE
+  if( pSrc->isVirtual ){
+    return 0;   /* tab2 must not be a virtual table */
+  }
+#endif
+  if( pSrc->pSelect ){
+    return 0;   /* tab2 may not be a view */
+  }
+  if( pDest->nCol!=pSrc->nCol ){
+    return 0;   /* Number of columns must be the same in tab1 and tab2 */
+  }
+  if( pDest->iPKey!=pSrc->iPKey ){
+    return 0;   /* Both tables must have the same INTEGER PRIMARY KEY */
+  }
+  for(i=0; i<pDest->nCol; i++){
+    if( pDest->aCol[i].affinity!=pSrc->aCol[i].affinity ){
+      return 0;    /* Affinity must be the same on all columns */
+    }
+    if( !xferCompatibleCollation(pDest->aCol[i].zColl, pSrc->aCol[i].zColl) ){
+      return 0;    /* Collating sequence must be the same on all columns */
+    }
+    if( pDest->aCol[i].notNull && !pSrc->aCol[i].notNull ){
+      return 0;    /* tab2 must be NOT NULL if tab1 is */
+    }
+  }
+  for(pDestIdx=pDest->pIndex; pDestIdx; pDestIdx=pDestIdx->pNext){
+    if( pDestIdx->onError!=OE_None ){
+      destHasUniqueIdx = 1;
+    }
+    for(pSrcIdx=pSrc->pIndex; pSrcIdx; pSrcIdx=pSrcIdx->pNext){
+      if( xferCompatibleIndex(pDestIdx, pSrcIdx) ) break;
+    }
+    if( pSrcIdx==0 ){
+      return 0;    /* pDestIdx has no corresponding index in pSrc */
+    }
+  }
+#ifndef SQLITE_OMIT_CHECK
+  if( pDest->pCheck && !sqlite3ExprCompare(pSrc->pCheck, pDest->pCheck) ){
+    return 0;   /* Tables have different CHECK constraints.  Ticket #2252 */
+  }
+#endif
+
+  /* If we get this far, it means either:
+  **
+  **    *   We can always do the transfer if the table contains an
+  **        an integer primary key
+  **
+  **    *   We can conditionally do the transfer if the destination
+  **        table is empty.
+  */
+#ifdef SQLITE_TEST
+  sqlite3_xferopt_count++;
+#endif
+  iDbSrc = sqlite3SchemaToIndex(pParse->db, pSrc->pSchema);
+  v = sqlite3GetVdbe(pParse);
+  sqlite3CodeVerifySchema(pParse, iDbSrc);
+  iSrc = pParse->nTab++;
+  iDest = pParse->nTab++;
+  regAutoinc = autoIncBegin(pParse, iDbDest, pDest);
+  sqlite3OpenTable(pParse, iDest, iDbDest, pDest, OP_OpenWrite);
+  if( (pDest->iPKey<0 && pDest->pIndex!=0) || destHasUniqueIdx ){
+    /* If tables do not have an INTEGER PRIMARY KEY and there
+    ** are indices to be copied and the destination is not empty,
+    ** we have to disallow the transfer optimization because the
+    ** the rowids might change which will mess up indexing.
+    **
+    ** Or if the destination has a UNIQUE index and is not empty,
+    ** we also disallow the transfer optimization because we cannot
+    ** insure that all entries in the union of DEST and SRC will be
+    ** unique.
+    */
+    addr1 = sqlite3VdbeAddOp2(v, OP_Rewind, iDest, 0);
+    emptyDestTest = sqlite3VdbeAddOp2(v, OP_Goto, 0, 0);
+    sqlite3VdbeJumpHere(v, addr1);
+  }else{
+    emptyDestTest = 0;
+  }
+  sqlite3OpenTable(pParse, iSrc, iDbSrc, pSrc, OP_OpenRead);
+  emptySrcTest = sqlite3VdbeAddOp2(v, OP_Rewind, iSrc, 0);
+  regData = sqlite3GetTempReg(pParse);
+  regRowid = sqlite3GetTempReg(pParse);
+  if( pDest->iPKey>=0 ){
+    addr1 = sqlite3VdbeAddOp2(v, OP_Rowid, iSrc, regRowid);
+    addr2 = sqlite3VdbeAddOp3(v, OP_NotExists, iDest, 0, regRowid);
+    sqlite3VdbeAddOp4(v, OP_Halt, SQLITE_CONSTRAINT, onError, 0,
+                      "PRIMARY KEY must be unique", P4_STATIC);
+    sqlite3VdbeJumpHere(v, addr2);
+    autoIncStep(pParse, regAutoinc, regRowid);
+  }else if( pDest->pIndex==0 ){
+    addr1 = sqlite3VdbeAddOp2(v, OP_NewRowid, iDest, regRowid);
+  }else{
+    addr1 = sqlite3VdbeAddOp2(v, OP_Rowid, iSrc, regRowid);
+    assert( pDest->autoInc==0 );
+  }
+  sqlite3VdbeAddOp2(v, OP_RowData, iSrc, regData);
+  sqlite3VdbeAddOp3(v, OP_Insert, iDest, regData, regRowid);
+  sqlite3VdbeChangeP5(v, OPFLAG_NCHANGE|OPFLAG_LASTROWID|OPFLAG_APPEND);
+  sqlite3VdbeChangeP4(v, -1, pDest->zName, 0);
+  sqlite3VdbeAddOp2(v, OP_Next, iSrc, addr1);
+  autoIncEnd(pParse, iDbDest, pDest, regAutoinc);
+  for(pDestIdx=pDest->pIndex; pDestIdx; pDestIdx=pDestIdx->pNext){
+    for(pSrcIdx=pSrc->pIndex; pSrcIdx; pSrcIdx=pSrcIdx->pNext){
+      if( xferCompatibleIndex(pDestIdx, pSrcIdx) ) break;
+    }
+    assert( pSrcIdx );
+    sqlite3VdbeAddOp2(v, OP_Close, iSrc, 0);
+    sqlite3VdbeAddOp2(v, OP_Close, iDest, 0);
+    pKey = sqlite3IndexKeyinfo(pParse, pSrcIdx);
+    sqlite3VdbeAddOp4(v, OP_OpenRead, iSrc, pSrcIdx->tnum, iDbSrc,
+                      (char*)pKey, P4_KEYINFO_HANDOFF);
+    VdbeComment((v, "%s", pSrcIdx->zName));
+    pKey = sqlite3IndexKeyinfo(pParse, pDestIdx);
+    sqlite3VdbeAddOp4(v, OP_OpenWrite, iDest, pDestIdx->tnum, iDbDest,
+                      (char*)pKey, P4_KEYINFO_HANDOFF);
+    VdbeComment((v, "%s", pDestIdx->zName));
+    addr1 = sqlite3VdbeAddOp2(v, OP_Rewind, iSrc, 0);
+    sqlite3VdbeAddOp2(v, OP_RowKey, iSrc, regData);
+    sqlite3VdbeAddOp3(v, OP_IdxInsert, iDest, regData, 1);
+    sqlite3VdbeAddOp2(v, OP_Next, iSrc, addr1+1);
+    sqlite3VdbeJumpHere(v, addr1);
+  }
+  sqlite3VdbeJumpHere(v, emptySrcTest);
+  sqlite3ReleaseTempReg(pParse, regRowid);
+  sqlite3ReleaseTempReg(pParse, regData);
+  sqlite3VdbeAddOp2(v, OP_Close, iSrc, 0);
+  sqlite3VdbeAddOp2(v, OP_Close, iDest, 0);
+  if( emptyDestTest ){
+    sqlite3VdbeAddOp2(v, OP_Halt, SQLITE_OK, 0);
+    sqlite3VdbeJumpHere(v, emptyDestTest);
+    sqlite3VdbeAddOp2(v, OP_Close, iDest, 0);
+    return 0;
+  }else{
+    return 1;
+  }
+}
+#endif /* SQLITE_OMIT_XFER_OPT */
diff --git a/uppsrc/plugin/sqlite3/lib/journal.c b/uppsrc/plugin/sqlite3/lib/journal.c
new file mode 100644
index 000000000..7ee2250ac
--- /dev/null
+++ b/uppsrc/plugin/sqlite3/lib/journal.c
@@ -0,0 +1,238 @@
+/*
+** 2007 August 22
+**
+** The author disclaims copyright to this source code.  In place of
+** a legal notice, here is a blessing:
+**
+**    May you do good and not evil.
+**    May you find forgiveness for yourself and forgive others.
+**    May you share freely, never taking more than you give.
+**
+*************************************************************************
+**
+** @(#) $Id: journal.c,v 1.7 2007/09/06 13:49:37 drh Exp $
+*/
+
+#ifdef SQLITE_ENABLE_ATOMIC_WRITE
+
+/*
+** This file implements a special kind of sqlite3_file object used
+** by SQLite to create journal files if the atomic-write optimization
+** is enabled.
+**
+** The distinctive characteristic of this sqlite3_file is that the
+** actual on disk file is created lazily. When the file is created,
+** the caller specifies a buffer size for an in-memory buffer to
+** be used to service read() and write() requests. The actual file
+** on disk is not created or populated until either:
+**
+**   1) The in-memory representation grows too large for the allocated
+**      buffer, or
+**   2) The xSync() method is called.
+*/
+
+#include "sqliteInt.h"
+
+
+/*
+** A JournalFile object is a subclass of sqlite3_file used by
+** as an open file handle for journal files.
+*/
+struct JournalFile {
+  sqlite3_io_methods *pMethod;    /* I/O methods on journal files */
+  int nBuf;                       /* Size of zBuf[] in bytes */
+  char *zBuf;                     /* Space to buffer journal writes */
+  int iSize;                      /* Amount of zBuf[] currently used */
+  int flags;                      /* xOpen flags */
+  sqlite3_vfs *pVfs;              /* The "real" underlying VFS */
+  sqlite3_file *pReal;            /* The "real" underlying file descriptor */
+  const char *zJournal;           /* Name of the journal file */
+};
+typedef struct JournalFile JournalFile;
+
+/*
+** If it does not already exists, create and populate the on-disk file
+** for JournalFile p.
+*/
+static int createFile(JournalFile *p){
+  int rc = SQLITE_OK;
+  if( !p->pReal ){
+    sqlite3_file *pReal = (sqlite3_file *)&p[1];
+    rc = sqlite3OsOpen(p->pVfs, p->zJournal, pReal, p->flags, 0);
+    if( rc==SQLITE_OK ){
+      p->pReal = pReal;
+      if( p->iSize>0 ){
+        assert(p->iSize<=p->nBuf);
+        rc = sqlite3OsWrite(p->pReal, p->zBuf, p->iSize, 0);
+      }
+    }
+  }
+  return rc;
+}
+
+/*
+** Close the file.
+*/
+static int jrnlClose(sqlite3_file *pJfd){
+  JournalFile *p = (JournalFile *)pJfd;
+  if( p->pReal ){
+    sqlite3OsClose(p->pReal);
+  }
+  sqlite3_free(p->zBuf);
+  return SQLITE_OK;
+}
+
+/*
+** Read data from the file.
+*/
+static int jrnlRead(
+  sqlite3_file *pJfd,    /* The journal file from which to read */
+  void *zBuf,            /* Put the results here */
+  int iAmt,              /* Number of bytes to read */
+  sqlite_int64 iOfst     /* Begin reading at this offset */
+){
+  int rc = SQLITE_OK;
+  JournalFile *p = (JournalFile *)pJfd;
+  if( p->pReal ){
+    rc = sqlite3OsRead(p->pReal, zBuf, iAmt, iOfst);
+  }else{
+    assert( iAmt+iOfst<=p->iSize );
+    memcpy(zBuf, &p->zBuf[iOfst], iAmt);
+  }
+  return rc;
+}
+
+/*
+** Write data to the file.
+*/
+static int jrnlWrite(
+  sqlite3_file *pJfd,    /* The journal file into which to write */
+  const void *zBuf,      /* Take data to be written from here */
+  int iAmt,              /* Number of bytes to write */
+  sqlite_int64 iOfst     /* Begin writing at this offset into the file */
+){
+  int rc = SQLITE_OK;
+  JournalFile *p = (JournalFile *)pJfd;
+  if( !p->pReal && (iOfst+iAmt)>p->nBuf ){
+    rc = createFile(p);
+  }
+  if( rc==SQLITE_OK ){
+    if( p->pReal ){
+      rc = sqlite3OsWrite(p->pReal, zBuf, iAmt, iOfst);
+    }else{
+      memcpy(&p->zBuf[iOfst], zBuf, iAmt);
+      if( p->iSize<(iOfst+iAmt) ){
+        p->iSize = (iOfst+iAmt);
+      }
+    }
+  }
+  return rc;
+}
+
+/*
+** Truncate the file.
+*/
+static int jrnlTruncate(sqlite3_file *pJfd, sqlite_int64 size){
+  int rc = SQLITE_OK;
+  JournalFile *p = (JournalFile *)pJfd;
+  if( p->pReal ){
+    rc = sqlite3OsTruncate(p->pReal, size);
+  }else if( size<p->iSize ){
+    p->iSize = size;
+  }
+  return rc;
+}
+
+/*
+** Sync the file.
+*/
+static int jrnlSync(sqlite3_file *pJfd, int flags){
+  int rc;
+  JournalFile *p = (JournalFile *)pJfd;
+  rc = createFile(p);
+  if( rc==SQLITE_OK ){
+    rc = sqlite3OsSync(p->pReal, flags);
+  }
+  return rc;
+}
+
+/*
+** Query the size of the file in bytes.
+*/
+static int jrnlFileSize(sqlite3_file *pJfd, sqlite_int64 *pSize){
+  int rc = SQLITE_OK;
+  JournalFile *p = (JournalFile *)pJfd;
+  if( p->pReal ){
+    rc = sqlite3OsFileSize(p->pReal, pSize);
+  }else{
+    *pSize = (sqlite_int64) p->iSize;
+  }
+  return rc;
+}
+
+/*
+** Table of methods for JournalFile sqlite3_file object.
+*/
+static struct sqlite3_io_methods JournalFileMethods = {
+  1,             /* iVersion */
+  jrnlClose,     /* xClose */
+  jrnlRead,      /* xRead */
+  jrnlWrite,     /* xWrite */
+  jrnlTruncate,  /* xTruncate */
+  jrnlSync,      /* xSync */
+  jrnlFileSize,  /* xFileSize */
+  0,             /* xLock */
+  0,             /* xUnlock */
+  0,             /* xCheckReservedLock */
+  0,             /* xFileControl */
+  0,             /* xSectorSize */
+  0              /* xDeviceCharacteristics */
+};
+
+/*
+** Open a journal file.
+*/
+int sqlite3JournalOpen(
+  sqlite3_vfs *pVfs,         /* The VFS to use for actual file I/O */
+  const char *zName,         /* Name of the journal file */
+  sqlite3_file *pJfd,        /* Preallocated, blank file handle */
+  int flags,                 /* Opening flags */
+  int nBuf                   /* Bytes buffered before opening the file */
+){
+  JournalFile *p = (JournalFile *)pJfd;
+  memset(p, 0, sqlite3JournalSize(pVfs));
+  if( nBuf>0 ){
+    p->zBuf = sqlite3MallocZero(nBuf);
+    if( !p->zBuf ){
+      return SQLITE_NOMEM;
+    }
+  }else{
+    return sqlite3OsOpen(pVfs, zName, pJfd, flags, 0);
+  }
+  p->pMethod = &JournalFileMethods;
+  p->nBuf = nBuf;
+  p->flags = flags;
+  p->zJournal = zName;
+  p->pVfs = pVfs;
+  return SQLITE_OK;
+}
+
+/*
+** If the argument p points to a JournalFile structure, and the underlying
+** file has not yet been created, create it now.
+*/
+int sqlite3JournalCreate(sqlite3_file *p){
+  if( p->pMethods!=&JournalFileMethods ){
+    return SQLITE_OK;
+  }
+  return createFile((JournalFile *)p);
+}
+
+/*
+** Return the number of bytes required to store a JournalFile that uses vfs
+** pVfs to create the underlying on-disk files.
+*/
+int sqlite3JournalSize(sqlite3_vfs *pVfs){
+  return (pVfs->szOsFile+sizeof(JournalFile));
+}
+#endif
diff --git a/uppsrc/plugin/sqlite3/lib/keywordhash.h b/uppsrc/plugin/sqlite3/lib/keywordhash.h
new file mode 100644
index 000000000..12f4816db
--- /dev/null
+++ b/uppsrc/plugin/sqlite3/lib/keywordhash.h
@@ -0,0 +1,112 @@
+/***** This file contains automatically generated code ******
+**
+** The code in this file has been automatically generated by
+**
+**     $Header: /sqlite/sqlite/tool/mkkeywordhash.c,v 1.31 2007/07/30 18:26:20 rse Exp $
+**
+** The code in this file implements a function that determines whether
+** or not a given identifier is really an SQL keyword.  The same thing
+** might be implemented more directly using a hand-written hash table.
+** But by using this automatically generated code, the size of the code
+** is substantially reduced.  This is important for embedded applications
+** on platforms with limited memory.
+*/
+/* Hash score: 165 */
+static int keywordCode(const char *z, int n){
+  /* zText[] encodes 775 bytes of keywords in 526 bytes */
+  static const char zText[526] =
+    "BEFOREIGNOREGEXPLAINSTEADDESCAPEACHECKEYCONSTRAINTERSECTABLEFT"
+    "HENDATABASELECTRANSACTIONATURALTERAISELSEXCEPTRIGGEREFERENCES"
+    "UNIQUERYATTACHAVINGROUPDATEMPORARYBEGINNEREINDEXCLUSIVEXISTSBETWEEN"
+    "OTNULLIKECASCADEFERRABLECASECOLLATECREATECURRENT_DATEDELETEDETACH"
+    "IMMEDIATEJOINSERTMATCHPLANALYZEPRAGMABORTVALUESVIRTUALIMITWHEN"
+    "WHERENAMEAFTEREPLACEANDEFAULTAUTOINCREMENTCASTCOLUMNCOMMITCONFLICT"
+    "CROSSCURRENT_TIMESTAMPRIMARYDEFERREDISTINCTDROPFAILFROMFULLGLOB"
+    "YIFINTOFFSETISNULLORDERESTRICTOUTERIGHTROLLBACKROWUNIONUSINGVACUUM"
+    "VIEWINITIALLY";
+  static const unsigned char aHash[127] = {
+      63,  92, 109,  61,   0,  38,   0,   0,  69,   0,  64,   0,   0,
+     102,   4,  65,   7,   0, 108,  72, 103,  99,   0,  22,   0,   0,
+     113,   0, 111, 106,   0,  18,  80,   0,   1,   0,   0,  56,  57,
+       0,  55,  11,   0,  33,  77,  89,   0, 110,  88,   0,   0,  45,
+       0,  90,  54,   0,  20,   0, 114,  34,  19,   0,  10,  97,  28,
+      83,   0,   0, 116,  93,  47, 115,  41,  12,  44,   0,  78,   0,
+      87,  29,   0,  86,   0,   0,   0,  82,  79,  84,  75,  96,   6,
+      14,  95,   0,  68,   0,  21,  76,  98,  27,   0, 112,  67, 104,
+      49,  40,  71,   0,   0,  81, 100,   0, 107,   0,  15,   0,   0,
+      24,   0,  73,  42,  50,   0,  16,  48,   0,  37,
+  };
+  static const unsigned char aNext[116] = {
+       0,   0,   0,   0,   0,   0,   0,   0,   0,   9,   0,   0,   0,
+       0,   0,   0,   0,   5,   0,   0,   0,   0,   0,   0,   0,   0,
+       0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  32,   0,   0,
+      17,   0,   0,   0,  36,  39,   0,   0,  25,   0,   0,  31,   0,
+       0,   0,  43,  52,   0,   0,   0,  53,   0,   0,   0,   0,   0,
+       0,   0,   0,   0,  51,   0,   0,   0,   0,  26,   0,   8,  46,
+       2,   0,   0,   0,   0,   0,   0,   0,   3,  58,  66,   0,  13,
+       0,  91,  85,   0,  94,   0,  74,   0,   0,  62,   0,  35, 101,
+       0,   0, 105,  23,  30,  60,  70,   0,   0,  59,   0,   0,
+  };
+  static const unsigned char aLen[116] = {
+       6,   7,   3,   6,   6,   7,   7,   3,   4,   6,   4,   5,   3,
+      10,   9,   5,   4,   4,   3,   8,   2,   6,  11,   2,   7,   5,
+       5,   4,   6,   7,  10,   6,   5,   6,   6,   5,   6,   4,   9,
+       2,   5,   5,   7,   5,   9,   6,   7,   7,   3,   4,   4,   7,
+       3,  10,   4,   7,   6,  12,   6,   6,   9,   4,   6,   5,   4,
+       7,   6,   5,   6,   7,   5,   4,   5,   6,   5,   7,   3,   7,
+      13,   2,   2,   4,   6,   6,   8,   5,  17,  12,   7,   8,   8,
+       2,   4,   4,   4,   4,   4,   2,   2,   4,   6,   2,   3,   6,
+       5,   8,   5,   5,   8,   3,   5,   5,   6,   4,   9,   3,
+  };
+  static const unsigned short int aOffset[116] = {
+       0,   2,   2,   6,  10,  13,  18,  23,  25,  26,  31,  33,  37,
+      40,  47,  55,  58,  61,  63,  65,  70,  71,  76,  85,  86,  91,
+      95,  99, 102, 107, 113, 123, 126, 131, 136, 141, 144, 148, 148,
+     152, 157, 160, 164, 166, 169, 177, 183, 189, 189, 192, 195, 199,
+     200, 204, 214, 218, 225, 231, 243, 249, 255, 264, 266, 272, 277,
+     279, 286, 291, 296, 302, 308, 313, 317, 320, 326, 330, 337, 339,
+     346, 348, 350, 359, 363, 369, 375, 383, 388, 388, 404, 411, 418,
+     419, 426, 430, 434, 438, 442, 445, 447, 449, 452, 452, 455, 458,
+     464, 468, 476, 480, 485, 493, 496, 501, 506, 512, 516, 521,
+  };
+  static const unsigned char aCode[116] = {
+    TK_BEFORE,     TK_FOREIGN,    TK_FOR,        TK_IGNORE,     TK_LIKE_KW,
+    TK_EXPLAIN,    TK_INSTEAD,    TK_ADD,        TK_DESC,       TK_ESCAPE,
+    TK_EACH,       TK_CHECK,      TK_KEY,        TK_CONSTRAINT, TK_INTERSECT,
+    TK_TABLE,      TK_JOIN_KW,    TK_THEN,       TK_END,        TK_DATABASE,
+    TK_AS,         TK_SELECT,     TK_TRANSACTION,TK_ON,         TK_JOIN_KW,
+    TK_ALTER,      TK_RAISE,      TK_ELSE,       TK_EXCEPT,     TK_TRIGGER,
+    TK_REFERENCES, TK_UNIQUE,     TK_QUERY,      TK_ATTACH,     TK_HAVING,
+    TK_GROUP,      TK_UPDATE,     TK_TEMP,       TK_TEMP,       TK_OR,
+    TK_BEGIN,      TK_JOIN_KW,    TK_REINDEX,    TK_INDEX,      TK_EXCLUSIVE,
+    TK_EXISTS,     TK_BETWEEN,    TK_NOTNULL,    TK_NOT,        TK_NULL,
+    TK_LIKE_KW,    TK_CASCADE,    TK_ASC,        TK_DEFERRABLE, TK_CASE,
+    TK_COLLATE,    TK_CREATE,     TK_CTIME_KW,   TK_DELETE,     TK_DETACH,
+    TK_IMMEDIATE,  TK_JOIN,       TK_INSERT,     TK_MATCH,      TK_PLAN,
+    TK_ANALYZE,    TK_PRAGMA,     TK_ABORT,      TK_VALUES,     TK_VIRTUAL,
+    TK_LIMIT,      TK_WHEN,       TK_WHERE,      TK_RENAME,     TK_AFTER,
+    TK_REPLACE,    TK_AND,        TK_DEFAULT,    TK_AUTOINCR,   TK_TO,
+    TK_IN,         TK_CAST,       TK_COLUMNKW,   TK_COMMIT,     TK_CONFLICT,
+    TK_JOIN_KW,    TK_CTIME_KW,   TK_CTIME_KW,   TK_PRIMARY,    TK_DEFERRED,
+    TK_DISTINCT,   TK_IS,         TK_DROP,       TK_FAIL,       TK_FROM,
+    TK_JOIN_KW,    TK_LIKE_KW,    TK_BY,         TK_IF,         TK_INTO,
+    TK_OFFSET,     TK_OF,         TK_SET,        TK_ISNULL,     TK_ORDER,
+    TK_RESTRICT,   TK_JOIN_KW,    TK_JOIN_KW,    TK_ROLLBACK,   TK_ROW,
+    TK_UNION,      TK_USING,      TK_VACUUM,     TK_VIEW,       TK_INITIALLY,
+    TK_ALL,
+  };
+  int h, i;
+  if( n<2 ) return TK_ID;
+  h = ((charMap(z[0])*4) ^
+      (charMap(z[n-1])*3) ^
+      n) % 127;
+  for(i=((int)aHash[h])-1; i>=0; i=((int)aNext[i])-1){
+    if( aLen[i]==n && sqlite3StrNICmp(&zText[aOffset[i]],z,n)==0 ){
+      return aCode[i];
+    }
+  }
+  return TK_ID;
+}
+int sqlite3KeywordCode(const unsigned char *z, int n){
+  return keywordCode((char*)z, n);
+}
diff --git a/uppsrc/plugin/sqlite3/lib/legacy.c b/uppsrc/plugin/sqlite3/lib/legacy.c
new file mode 100644
index 000000000..07450c56d
--- /dev/null
+++ b/uppsrc/plugin/sqlite3/lib/legacy.c
@@ -0,0 +1,142 @@
+/*
+** 2001 September 15
+**
+** The author disclaims copyright to this source code.  In place of
+** a legal notice, here is a blessing:
+**
+**    May you do good and not evil.
+**    May you find forgiveness for yourself and forgive others.
+**    May you share freely, never taking more than you give.
+**
+*************************************************************************
+** Main file for the SQLite library.  The routines in this file
+** implement the programmer interface to the library.  Routines in
+** other files are for internal use by SQLite and should not be
+** accessed by users of the library.
+**
+** $Id: legacy.c,v 1.23 2008/02/13 18:25:27 danielk1977 Exp $
+*/
+
+#include "sqliteInt.h"
+#include <ctype.h>
+
+/*
+** Execute SQL code.  Return one of the SQLITE_ success/failure
+** codes.  Also write an error message into memory obtained from
+** malloc() and make *pzErrMsg point to that message.
+**
+** If the SQL is a query, then for each row in the query result
+** the xCallback() function is called.  pArg becomes the first
+** argument to xCallback().  If xCallback=NULL then no callback
+** is invoked, even for queries.
+*/
+int sqlite3_exec(
+  sqlite3 *db,                /* The database on which the SQL executes */
+  const char *zSql,           /* The SQL to be executed */
+  sqlite3_callback xCallback, /* Invoke this callback routine */
+  void *pArg,                 /* First argument to xCallback() */
+  char **pzErrMsg             /* Write error messages here */
+){
+  int rc = SQLITE_OK;
+  const char *zLeftover;
+  sqlite3_stmt *pStmt = 0;
+  char **azCols = 0;
+
+  int nRetry = 0;
+  int nCallback;
+
+  if( zSql==0 ) return SQLITE_OK;
+
+  sqlite3_mutex_enter(db->mutex);
+  while( (rc==SQLITE_OK || (rc==SQLITE_SCHEMA && (++nRetry)<2)) && zSql[0] ){
+    int nCol;
+    char **azVals = 0;
+
+    pStmt = 0;
+    rc = sqlite3_prepare(db, zSql, -1, &pStmt, &zLeftover);
+    assert( rc==SQLITE_OK || pStmt==0 );
+    if( rc!=SQLITE_OK ){
+      continue;
+    }
+    if( !pStmt ){
+      /* this happens for a comment or white-space */
+      zSql = zLeftover;
+      continue;
+    }
+
+    nCallback = 0;
+
+    nCol = sqlite3_column_count(pStmt);
+    azCols = sqlite3DbMallocZero(db, 2*nCol*sizeof(const char *) + 1);
+    if( azCols==0 ){
+      goto exec_out;
+    }
+
+    while( 1 ){
+      int i;
+      rc = sqlite3_step(pStmt);
+
+      /* Invoke the callback function if required */
+      if( xCallback && (SQLITE_ROW==rc ||
+          (SQLITE_DONE==rc && !nCallback && db->flags&SQLITE_NullCallback)) ){
+        if( 0==nCallback ){
+          for(i=0; i<nCol; i++){
+            azCols[i] = (char *)sqlite3_column_name(pStmt, i);
+            if( !azCols[i] ){
+              db->mallocFailed = 1;
+              goto exec_out;
+            }
+          }
+          nCallback++;
+        }
+        if( rc==SQLITE_ROW ){
+          azVals = &azCols[nCol];
+          for(i=0; i<nCol; i++){
+            azVals[i] = (char *)sqlite3_column_text(pStmt, i);
+            if( !azVals[i] && sqlite3_column_type(pStmt, i)!=SQLITE_NULL ){
+              db->mallocFailed = 1;
+              goto exec_out;
+            }
+          }
+        }
+        if( xCallback(pArg, nCol, azVals, azCols) ){
+          rc = SQLITE_ABORT;
+          goto exec_out;
+        }
+      }
+
+      if( rc!=SQLITE_ROW ){
+        rc = sqlite3_finalize(pStmt);
+        pStmt = 0;
+        if( rc!=SQLITE_SCHEMA ){
+          nRetry = 0;
+          zSql = zLeftover;
+          while( isspace((unsigned char)zSql[0]) ) zSql++;
+        }
+        break;
+      }
+    }
+
+    sqlite3_free(azCols);
+    azCols = 0;
+  }
+
+exec_out:
+  if( pStmt ) sqlite3_finalize(pStmt);
+  if( azCols ) sqlite3_free(azCols);
+
+  rc = sqlite3ApiExit(db, rc);
+  if( rc!=SQLITE_OK && rc==sqlite3_errcode(db) && pzErrMsg ){
+    int nErrMsg = 1 + strlen(sqlite3_errmsg(db));
+    *pzErrMsg = sqlite3_malloc(nErrMsg);
+    if( *pzErrMsg ){
+      memcpy(*pzErrMsg, sqlite3_errmsg(db), nErrMsg);
+    }
+  }else if( pzErrMsg ){
+    *pzErrMsg = 0;
+  }
+
+  assert( (rc&db->errMask)==rc );
+  sqlite3_mutex_leave(db->mutex);
+  return rc;
+}
diff --git a/uppsrc/plugin/sqlite3/lib/loadext.c b/uppsrc/plugin/sqlite3/lib/loadext.c
new file mode 100644
index 000000000..4f48b40bd
--- /dev/null
+++ b/uppsrc/plugin/sqlite3/lib/loadext.c
@@ -0,0 +1,518 @@
+/*
+** 2006 June 7
+**
+** The author disclaims copyright to this source code.  In place of
+** a legal notice, here is a blessing:
+**
+**    May you do good and not evil.
+**    May you find forgiveness for yourself and forgive others.
+**    May you share freely, never taking more than you give.
+**
+*************************************************************************
+** This file contains code used to dynamically load extensions into
+** the SQLite library.
+*/
+#ifndef SQLITE_OMIT_LOAD_EXTENSION
+
+#ifndef SQLITE_CORE
+  #define SQLITE_CORE 1  /* Disable the API redefinition in sqlite3ext.h */
+#endif
+#include "sqlite3ext.h"
+#include "sqliteInt.h"
+#include <string.h>
+#include <ctype.h>
+
+/*
+** Some API routines are omitted when various features are
+** excluded from a build of SQLite.  Substitute a NULL pointer
+** for any missing APIs.
+*/
+#ifndef SQLITE_ENABLE_COLUMN_METADATA
+# define sqlite3_column_database_name   0
+# define sqlite3_column_database_name16 0
+# define sqlite3_column_table_name      0
+# define sqlite3_column_table_name16    0
+# define sqlite3_column_origin_name     0
+# define sqlite3_column_origin_name16   0
+# define sqlite3_table_column_metadata  0
+#endif
+
+#ifdef SQLITE_OMIT_AUTHORIZATION
+# define sqlite3_set_authorizer         0
+#endif
+
+#ifdef SQLITE_OMIT_UTF16
+# define sqlite3_bind_text16            0
+# define sqlite3_collation_needed16     0
+# define sqlite3_column_decltype16      0
+# define sqlite3_column_name16          0
+# define sqlite3_column_text16          0
+# define sqlite3_complete16             0
+# define sqlite3_create_collation16     0
+# define sqlite3_create_function16      0
+# define sqlite3_errmsg16               0
+# define sqlite3_open16                 0
+# define sqlite3_prepare16              0
+# define sqlite3_prepare16_v2           0
+# define sqlite3_result_error16         0
+# define sqlite3_result_text16          0
+# define sqlite3_result_text16be        0
+# define sqlite3_result_text16le        0
+# define sqlite3_value_text16           0
+# define sqlite3_value_text16be         0
+# define sqlite3_value_text16le         0
+# define sqlite3_column_database_name16 0
+# define sqlite3_column_table_name16    0
+# define sqlite3_column_origin_name16   0
+#endif
+
+#ifdef SQLITE_OMIT_COMPLETE
+# define sqlite3_complete 0
+# define sqlite3_complete16 0
+#endif
+
+#ifdef SQLITE_OMIT_PROGRESS_CALLBACK
+# define sqlite3_progress_handler 0
+#endif
+
+#ifdef SQLITE_OMIT_VIRTUALTABLE
+# define sqlite3_create_module 0
+# define sqlite3_create_module_v2 0
+# define sqlite3_declare_vtab 0
+#endif
+
+#ifdef SQLITE_OMIT_SHARED_CACHE
+# define sqlite3_enable_shared_cache 0
+#endif
+
+#ifdef SQLITE_OMIT_TRACE
+# define sqlite3_profile       0
+# define sqlite3_trace         0
+#endif
+
+#ifdef SQLITE_OMIT_GET_TABLE
+# define sqlite3_free_table    0
+# define sqlite3_get_table     0
+#endif
+
+#ifdef SQLITE_OMIT_INCRBLOB
+#define sqlite3_bind_zeroblob  0
+#define sqlite3_blob_bytes     0
+#define sqlite3_blob_close     0
+#define sqlite3_blob_open      0
+#define sqlite3_blob_read      0
+#define sqlite3_blob_write     0
+#endif
+
+/*
+** The following structure contains pointers to all SQLite API routines.
+** A pointer to this structure is passed into extensions when they are
+** loaded so that the extension can make calls back into the SQLite
+** library.
+**
+** When adding new APIs, add them to the bottom of this structure
+** in order to preserve backwards compatibility.
+**
+** Extensions that use newer APIs should first call the
+** sqlite3_libversion_number() to make sure that the API they
+** intend to use is supported by the library.  Extensions should
+** also check to make sure that the pointer to the function is
+** not NULL before calling it.
+*/
+const sqlite3_api_routines sqlite3Apis = {
+  sqlite3_aggregate_context,
+  sqlite3_aggregate_count,
+  sqlite3_bind_blob,
+  sqlite3_bind_double,
+  sqlite3_bind_int,
+  sqlite3_bind_int64,
+  sqlite3_bind_null,
+  sqlite3_bind_parameter_count,
+  sqlite3_bind_parameter_index,
+  sqlite3_bind_parameter_name,
+  sqlite3_bind_text,
+  sqlite3_bind_text16,
+  sqlite3_bind_value,
+  sqlite3_busy_handler,
+  sqlite3_busy_timeout,
+  sqlite3_changes,
+  sqlite3_close,
+  sqlite3_collation_needed,
+  sqlite3_collation_needed16,
+  sqlite3_column_blob,
+  sqlite3_column_bytes,
+  sqlite3_column_bytes16,
+  sqlite3_column_count,
+  sqlite3_column_database_name,
+  sqlite3_column_database_name16,
+  sqlite3_column_decltype,
+  sqlite3_column_decltype16,
+  sqlite3_column_double,
+  sqlite3_column_int,
+  sqlite3_column_int64,
+  sqlite3_column_name,
+  sqlite3_column_name16,
+  sqlite3_column_origin_name,
+  sqlite3_column_origin_name16,
+  sqlite3_column_table_name,
+  sqlite3_column_table_name16,
+  sqlite3_column_text,
+  sqlite3_column_text16,
+  sqlite3_column_type,
+  sqlite3_column_value,
+  sqlite3_commit_hook,
+  sqlite3_complete,
+  sqlite3_complete16,
+  sqlite3_create_collation,
+  sqlite3_create_collation16,
+  sqlite3_create_function,
+  sqlite3_create_function16,
+  sqlite3_create_module,
+  sqlite3_data_count,
+  sqlite3_db_handle,
+  sqlite3_declare_vtab,
+  sqlite3_enable_shared_cache,
+  sqlite3_errcode,
+  sqlite3_errmsg,
+  sqlite3_errmsg16,
+  sqlite3_exec,
+  sqlite3_expired,
+  sqlite3_finalize,
+  sqlite3_free,
+  sqlite3_free_table,
+  sqlite3_get_autocommit,
+  sqlite3_get_auxdata,
+  sqlite3_get_table,
+  0,     /* Was sqlite3_global_recover(), but that function is deprecated */
+  sqlite3_interrupt,
+  sqlite3_last_insert_rowid,
+  sqlite3_libversion,
+  sqlite3_libversion_number,
+  sqlite3_malloc,
+  sqlite3_mprintf,
+  sqlite3_open,
+  sqlite3_open16,
+  sqlite3_prepare,
+  sqlite3_prepare16,
+  sqlite3_profile,
+  sqlite3_progress_handler,
+  sqlite3_realloc,
+  sqlite3_reset,
+  sqlite3_result_blob,
+  sqlite3_result_double,
+  sqlite3_result_error,
+  sqlite3_result_error16,
+  sqlite3_result_int,
+  sqlite3_result_int64,
+  sqlite3_result_null,
+  sqlite3_result_text,
+  sqlite3_result_text16,
+  sqlite3_result_text16be,
+  sqlite3_result_text16le,
+  sqlite3_result_value,
+  sqlite3_rollback_hook,
+  sqlite3_set_authorizer,
+  sqlite3_set_auxdata,
+  sqlite3_snprintf,
+  sqlite3_step,
+  sqlite3_table_column_metadata,
+  sqlite3_thread_cleanup,
+  sqlite3_total_changes,
+  sqlite3_trace,
+  sqlite3_transfer_bindings,
+  sqlite3_update_hook,
+  sqlite3_user_data,
+  sqlite3_value_blob,
+  sqlite3_value_bytes,
+  sqlite3_value_bytes16,
+  sqlite3_value_double,
+  sqlite3_value_int,
+  sqlite3_value_int64,
+  sqlite3_value_numeric_type,
+  sqlite3_value_text,
+  sqlite3_value_text16,
+  sqlite3_value_text16be,
+  sqlite3_value_text16le,
+  sqlite3_value_type,
+  sqlite3_vmprintf,
+  /*
+  ** The original API set ends here.  All extensions can call any
+  ** of the APIs above provided that the pointer is not NULL.  But
+  ** before calling APIs that follow, extension should check the
+  ** sqlite3_libversion_number() to make sure they are dealing with
+  ** a library that is new enough to support that API.
+  *************************************************************************
+  */
+  sqlite3_overload_function,
+
+  /*
+  ** Added after 3.3.13
+  */
+  sqlite3_prepare_v2,
+  sqlite3_prepare16_v2,
+  sqlite3_clear_bindings,
+
+  /*
+  ** Added for 3.4.1
+  */
+  sqlite3_create_module_v2,
+
+  /*
+  ** Added for 3.5.0
+  */
+  sqlite3_bind_zeroblob,
+  sqlite3_blob_bytes,
+  sqlite3_blob_close,
+  sqlite3_blob_open,
+  sqlite3_blob_read,
+  sqlite3_blob_write,
+  sqlite3_create_collation_v2,
+  sqlite3_file_control,
+  sqlite3_memory_highwater,
+  sqlite3_memory_used,
+#ifdef SQLITE_MUTEX_NOOP
+  0,
+  0,
+  0,
+  0,
+  0,
+#else
+  sqlite3_mutex_alloc,
+  sqlite3_mutex_enter,
+  sqlite3_mutex_free,
+  sqlite3_mutex_leave,
+  sqlite3_mutex_try,
+#endif
+  sqlite3_open_v2,
+  sqlite3_release_memory,
+  sqlite3_result_error_nomem,
+  sqlite3_result_error_toobig,
+  sqlite3_sleep,
+  sqlite3_soft_heap_limit,
+  sqlite3_vfs_find,
+  sqlite3_vfs_register,
+  sqlite3_vfs_unregister,
+};
+
+/*
+** Attempt to load an SQLite extension library contained in the file
+** zFile.  The entry point is zProc.  zProc may be 0 in which case a
+** default entry point name (sqlite3_extension_init) is used.  Use
+** of the default name is recommended.
+**
+** Return SQLITE_OK on success and SQLITE_ERROR if something goes wrong.
+**
+** If an error occurs and pzErrMsg is not 0, then fill *pzErrMsg with
+** error message text.  The calling function should free this memory
+** by calling sqlite3_free().
+*/
+static int sqlite3LoadExtension(
+  sqlite3 *db,          /* Load the extension into this database connection */
+  const char *zFile,    /* Name of the shared library containing extension */
+  const char *zProc,    /* Entry point.  Use "sqlite3_extension_init" if 0 */
+  char **pzErrMsg       /* Put error message here if not 0 */
+){
+  sqlite3_vfs *pVfs = db->pVfs;
+  void *handle;
+  int (*xInit)(sqlite3*,char**,const sqlite3_api_routines*);
+  char *zErrmsg = 0;
+  void **aHandle;
+
+  /* Ticket #1863.  To avoid a creating security problems for older
+  ** applications that relink against newer versions of SQLite, the
+  ** ability to run load_extension is turned off by default.  One
+  ** must call sqlite3_enable_load_extension() to turn on extension
+  ** loading.  Otherwise you get the following error.
+  */
+  if( (db->flags & SQLITE_LoadExtension)==0 ){
+    if( pzErrMsg ){
+      *pzErrMsg = sqlite3_mprintf("not authorized");
+    }
+    return SQLITE_ERROR;
+  }
+
+  if( zProc==0 ){
+    zProc = "sqlite3_extension_init";
+  }
+
+  handle = sqlite3OsDlOpen(pVfs, zFile);
+  if( handle==0 ){
+    if( pzErrMsg ){
+      char zErr[256];
+      zErr[sizeof(zErr)-1] = '\0';
+      sqlite3_snprintf(sizeof(zErr)-1, zErr,
+          "unable to open shared library [%s]", zFile);
+      sqlite3OsDlError(pVfs, sizeof(zErr)-1, zErr);
+      *pzErrMsg = sqlite3DbStrDup(db, zErr);
+    }
+    return SQLITE_ERROR;
+  }
+  xInit = (int(*)(sqlite3*,char**,const sqlite3_api_routines*))
+                   sqlite3OsDlSym(pVfs, handle, zProc);
+  if( xInit==0 ){
+    if( pzErrMsg ){
+      char zErr[256];
+      zErr[sizeof(zErr)-1] = '\0';
+      sqlite3_snprintf(sizeof(zErr)-1, zErr,
+          "no entry point [%s] in shared library [%s]", zProc,zFile);
+      sqlite3OsDlError(pVfs, sizeof(zErr)-1, zErr);
+      *pzErrMsg = sqlite3DbStrDup(db, zErr);
+      sqlite3OsDlClose(pVfs, handle);
+    }
+    return SQLITE_ERROR;
+  }else if( xInit(db, &zErrmsg, &sqlite3Apis) ){
+    if( pzErrMsg ){
+      *pzErrMsg = sqlite3_mprintf("error during initialization: %s", zErrmsg);
+    }
+    sqlite3_free(zErrmsg);
+    sqlite3OsDlClose(pVfs, handle);
+    return SQLITE_ERROR;
+  }
+
+  /* Append the new shared library handle to the db->aExtension array. */
+  db->nExtension++;
+  aHandle = sqlite3DbMallocZero(db, sizeof(handle)*db->nExtension);
+  if( aHandle==0 ){
+    return SQLITE_NOMEM;
+  }
+  if( db->nExtension>0 ){
+    memcpy(aHandle, db->aExtension, sizeof(handle)*(db->nExtension-1));
+  }
+  sqlite3_free(db->aExtension);
+  db->aExtension = aHandle;
+
+  db->aExtension[db->nExtension-1] = handle;
+  return SQLITE_OK;
+}
+int sqlite3_load_extension(
+  sqlite3 *db,          /* Load the extension into this database connection */
+  const char *zFile,    /* Name of the shared library containing extension */
+  const char *zProc,    /* Entry point.  Use "sqlite3_extension_init" if 0 */
+  char **pzErrMsg       /* Put error message here if not 0 */
+){
+  int rc;
+  sqlite3_mutex_enter(db->mutex);
+  rc = sqlite3LoadExtension(db, zFile, zProc, pzErrMsg);
+  sqlite3_mutex_leave(db->mutex);
+  return rc;
+}
+
+/*
+** Call this routine when the database connection is closing in order
+** to clean up loaded extensions
+*/
+void sqlite3CloseExtensions(sqlite3 *db){
+  int i;
+  assert( sqlite3_mutex_held(db->mutex) );
+  for(i=0; i<db->nExtension; i++){
+    sqlite3OsDlClose(db->pVfs, db->aExtension[i]);
+  }
+  sqlite3_free(db->aExtension);
+}
+
+/*
+** Enable or disable extension loading.  Extension loading is disabled by
+** default so as not to open security holes in older applications.
+*/
+int sqlite3_enable_load_extension(sqlite3 *db, int onoff){
+  sqlite3_mutex_enter(db->mutex);
+  if( onoff ){
+    db->flags |= SQLITE_LoadExtension;
+  }else{
+    db->flags &= ~SQLITE_LoadExtension;
+  }
+  sqlite3_mutex_leave(db->mutex);
+  return SQLITE_OK;
+}
+
+/*
+** The following object holds the list of automatically loaded
+** extensions.
+**
+** This list is shared across threads.  The SQLITE_MUTEX_STATIC_MASTER
+** mutex must be held while accessing this list.
+*/
+static struct {
+  int nExt;        /* Number of entries in aExt[] */
+  void **aExt;     /* Pointers to the extension init functions */
+} autoext = { 0, 0 };
+
+
+/*
+** Register a statically linked extension that is automatically
+** loaded by every new database connection.
+*/
+int sqlite3_auto_extension(void *xInit){
+  int i;
+  int rc = SQLITE_OK;
+  sqlite3_mutex *mutex = sqlite3_mutex_alloc(SQLITE_MUTEX_STATIC_MASTER);
+  sqlite3_mutex_enter(mutex);
+  for(i=0; i<autoext.nExt; i++){
+    if( autoext.aExt[i]==xInit ) break;
+  }
+  if( i==autoext.nExt ){
+    int nByte = (autoext.nExt+1)*sizeof(autoext.aExt[0]);
+    void **aNew;
+    aNew = sqlite3_realloc(autoext.aExt, nByte);
+    if( aNew==0 ){
+      rc = SQLITE_NOMEM;
+    }else{
+      autoext.aExt = aNew;
+      autoext.aExt[autoext.nExt] = xInit;
+      autoext.nExt++;
+    }
+  }
+  sqlite3_mutex_leave(mutex);
+  assert( (rc&0xff)==rc );
+  return rc;
+}
+
+/*
+** Reset the automatic extension loading mechanism.
+*/
+void sqlite3_reset_auto_extension(void){
+  sqlite3_mutex *mutex = sqlite3_mutex_alloc(SQLITE_MUTEX_STATIC_MASTER);
+  sqlite3_mutex_enter(mutex);
+  sqlite3_free(autoext.aExt);
+  autoext.aExt = 0;
+  autoext.nExt = 0;
+  sqlite3_mutex_leave(mutex);
+}
+
+/*
+** Load all automatic extensions.
+*/
+int sqlite3AutoLoadExtensions(sqlite3 *db){
+  int i;
+  int go = 1;
+  int rc = SQLITE_OK;
+  int (*xInit)(sqlite3*,char**,const sqlite3_api_routines*);
+
+  if( autoext.nExt==0 ){
+    /* Common case: early out without every having to acquire a mutex */
+    return SQLITE_OK;
+  }
+  for(i=0; go; i++){
+    char *zErrmsg = 0;
+    sqlite3_mutex *mutex = sqlite3_mutex_alloc(SQLITE_MUTEX_STATIC_MASTER);
+    sqlite3_mutex_enter(mutex);
+    if( i>=autoext.nExt ){
+      xInit = 0;
+      go = 0;
+    }else{
+      xInit = (int(*)(sqlite3*,char**,const sqlite3_api_routines*))
+              autoext.aExt[i];
+    }
+    sqlite3_mutex_leave(mutex);
+    if( xInit && xInit(db, &zErrmsg, &sqlite3Apis) ){
+      sqlite3Error(db, SQLITE_ERROR,
+            "automatic extension loading failed: %s", zErrmsg);
+      go = 0;
+      rc = SQLITE_ERROR;
+      sqlite3_free(zErrmsg);
+    }
+  }
+  return rc;
+}
+
+#endif /* SQLITE_OMIT_LOAD_EXTENSION */
diff --git a/uppsrc/plugin/sqlite3/lib/main.c b/uppsrc/plugin/sqlite3/lib/main.c
new file mode 100644
index 000000000..97486e7b0
--- /dev/null
+++ b/uppsrc/plugin/sqlite3/lib/main.c
@@ -0,0 +1,1525 @@
+/*
+** 2001 September 15
+**
+** The author disclaims copyright to this source code.  In place of
+** a legal notice, here is a blessing:
+**
+**    May you do good and not evil.
+**    May you find forgiveness for yourself and forgive others.
+**    May you share freely, never taking more than you give.
+**
+*************************************************************************
+** Main file for the SQLite library.  The routines in this file
+** implement the programmer interface to the library.  Routines in
+** other files are for internal use by SQLite and should not be
+** accessed by users of the library.
+**
+** $Id: main.c,v 1.421 2008/03/07 21:37:19 drh Exp $
+*/
+#include "sqliteInt.h"
+#include <ctype.h>
+#ifdef SQLITE_ENABLE_FTS3
+# include "fts3.h"
+#endif
+
+/*
+** The version of the library
+*/
+const char sqlite3_version[] = SQLITE_VERSION;
+const char *sqlite3_libversion(void){ return sqlite3_version; }
+int sqlite3_libversion_number(void){ return SQLITE_VERSION_NUMBER; }
+int sqlite3_threadsafe(void){ return SQLITE_THREADSAFE; }
+
+/*
+** If the following function pointer is not NULL and if
+** SQLITE_ENABLE_IOTRACE is enabled, then messages describing
+** I/O active are written using this function.  These messages
+** are intended for debugging activity only.
+*/
+void (*sqlite3IoTrace)(const char*, ...) = 0;
+
+/*
+** If the following global variable points to a string which is the
+** name of a directory, then that directory will be used to store
+** temporary files.
+**
+** See also the "PRAGMA temp_store_directory" SQL command.
+*/
+char *sqlite3_temp_directory = 0;
+
+
+/*
+** Return true if the buffer z[0..n-1] contains all spaces.
+*/
+static int allSpaces(const char *z, int n){
+  while( n>0 && z[--n]==' ' ){}
+  return n==0;
+}
+
+/*
+** This is the default collating function named "BINARY" which is always
+** available.
+**
+** If the padFlag argument is not NULL then space padding at the end
+** of strings is ignored.  This implements the RTRIM collation.
+*/
+static int binCollFunc(
+  void *padFlag,
+  int nKey1, const void *pKey1,
+  int nKey2, const void *pKey2
+){
+  int rc, n;
+  n = nKey1<nKey2 ? nKey1 : nKey2;
+  rc = memcmp(pKey1, pKey2, n);
+  if( rc==0 ){
+    if( padFlag
+     && allSpaces(((char*)pKey1)+n, nKey1-n)
+     && allSpaces(((char*)pKey2)+n, nKey2-n)
+    ){
+      /* Leave rc unchanged at 0 */
+    }else{
+      rc = nKey1 - nKey2;
+    }
+  }
+  return rc;
+}
+
+/*
+** Another built-in collating sequence: NOCASE.
+**
+** This collating sequence is intended to be used for "case independant
+** comparison". SQLite's knowledge of upper and lower case equivalents
+** extends only to the 26 characters used in the English language.
+**
+** At the moment there is only a UTF-8 implementation.
+*/
+static int nocaseCollatingFunc(
+  void *NotUsed,
+  int nKey1, const void *pKey1,
+  int nKey2, const void *pKey2
+){
+  int r = sqlite3StrNICmp(
+      (const char *)pKey1, (const char *)pKey2, (nKey1<nKey2)?nKey1:nKey2);
+  if( 0==r ){
+    r = nKey1-nKey2;
+  }
+  return r;
+}
+
+/*
+** Return the ROWID of the most recent insert
+*/
+sqlite_int64 sqlite3_last_insert_rowid(sqlite3 *db){
+  return db->lastRowid;
+}
+
+/*
+** Return the number of changes in the most recent call to sqlite3_exec().
+*/
+int sqlite3_changes(sqlite3 *db){
+  return db->nChange;
+}
+
+/*
+** Return the number of changes since the database handle was opened.
+*/
+int sqlite3_total_changes(sqlite3 *db){
+  return db->nTotalChange;
+}
+
+/*
+** Close an existing SQLite database
+*/
+int sqlite3_close(sqlite3 *db){
+  HashElem *i;
+  int j;
+
+  if( !db ){
+    return SQLITE_OK;
+  }
+  if( !sqlite3SafetyCheckSickOrOk(db) ){
+    return SQLITE_MISUSE;
+  }
+  sqlite3_mutex_enter(db->mutex);
+
+#ifdef SQLITE_SSE
+  {
+    extern void sqlite3SseCleanup(sqlite3*);
+    sqlite3SseCleanup(db);
+  }
+#endif
+
+  sqlite3ResetInternalSchema(db, 0);
+
+  /* If a transaction is open, the ResetInternalSchema() call above
+  ** will not have called the xDisconnect() method on any virtual
+  ** tables in the db->aVTrans[] array. The following sqlite3VtabRollback()
+  ** call will do so. We need to do this before the check for active
+  ** SQL statements below, as the v-table implementation may be storing
+  ** some prepared statements internally.
+  */
+  sqlite3VtabRollback(db);
+
+  /* If there are any outstanding VMs, return SQLITE_BUSY. */
+  if( db->pVdbe ){
+    sqlite3Error(db, SQLITE_BUSY,
+        "Unable to close due to unfinalised statements");
+    sqlite3_mutex_leave(db->mutex);
+    return SQLITE_BUSY;
+  }
+  assert( sqlite3SafetyCheckSickOrOk(db) );
+
+  for(j=0; j<db->nDb; j++){
+    struct Db *pDb = &db->aDb[j];
+    if( pDb->pBt ){
+      sqlite3BtreeClose(pDb->pBt);
+      pDb->pBt = 0;
+      if( j!=1 ){
+        pDb->pSchema = 0;
+      }
+    }
+  }
+  sqlite3ResetInternalSchema(db, 0);
+  assert( db->nDb<=2 );
+  assert( db->aDb==db->aDbStatic );
+  for(i=sqliteHashFirst(&db->aFunc); i; i=sqliteHashNext(i)){
+    FuncDef *pFunc, *pNext;
+    for(pFunc = (FuncDef*)sqliteHashData(i); pFunc; pFunc=pNext){
+      pNext = pFunc->pNext;
+      sqlite3_free(pFunc);
+    }
+  }
+
+  for(i=sqliteHashFirst(&db->aCollSeq); i; i=sqliteHashNext(i)){
+    CollSeq *pColl = (CollSeq *)sqliteHashData(i);
+    /* Invoke any destructors registered for collation sequence user data. */
+    for(j=0; j<3; j++){
+      if( pColl[j].xDel ){
+        pColl[j].xDel(pColl[j].pUser);
+      }
+    }
+    sqlite3_free(pColl);
+  }
+  sqlite3HashClear(&db->aCollSeq);
+#ifndef SQLITE_OMIT_VIRTUALTABLE
+  for(i=sqliteHashFirst(&db->aModule); i; i=sqliteHashNext(i)){
+    Module *pMod = (Module *)sqliteHashData(i);
+    if( pMod->xDestroy ){
+      pMod->xDestroy(pMod->pAux);
+    }
+    sqlite3_free(pMod);
+  }
+  sqlite3HashClear(&db->aModule);
+#endif
+
+  sqlite3HashClear(&db->aFunc);
+  sqlite3Error(db, SQLITE_OK, 0); /* Deallocates any cached error strings. */
+  if( db->pErr ){
+    sqlite3ValueFree(db->pErr);
+  }
+  sqlite3CloseExtensions(db);
+
+  db->magic = SQLITE_MAGIC_ERROR;
+
+  /* The temp-database schema is allocated differently from the other schema
+  ** objects (using sqliteMalloc() directly, instead of sqlite3BtreeSchema()).
+  ** So it needs to be freed here. Todo: Why not roll the temp schema into
+  ** the same sqliteMalloc() as the one that allocates the database
+  ** structure?
+  */
+  sqlite3_free(db->aDb[1].pSchema);
+  sqlite3_mutex_leave(db->mutex);
+  db->magic = SQLITE_MAGIC_CLOSED;
+  sqlite3_mutex_free(db->mutex);
+  sqlite3_free(db);
+  return SQLITE_OK;
+}
+
+/*
+** Rollback all database files.
+*/
+void sqlite3RollbackAll(sqlite3 *db){
+  int i;
+  int inTrans = 0;
+  assert( sqlite3_mutex_held(db->mutex) );
+  sqlite3FaultBenign(SQLITE_FAULTINJECTOR_MALLOC, 1);
+  for(i=0; i<db->nDb; i++){
+    if( db->aDb[i].pBt ){
+      if( sqlite3BtreeIsInTrans(db->aDb[i].pBt) ){
+        inTrans = 1;
+      }
+      sqlite3BtreeRollback(db->aDb[i].pBt);
+      db->aDb[i].inTrans = 0;
+    }
+  }
+  sqlite3VtabRollback(db);
+  sqlite3FaultBenign(SQLITE_FAULTINJECTOR_MALLOC, 0);
+
+  if( db->flags&SQLITE_InternChanges ){
+    sqlite3ExpirePreparedStatements(db);
+    sqlite3ResetInternalSchema(db, 0);
+  }
+
+  /* If one has been configured, invoke the rollback-hook callback */
+  if( db->xRollbackCallback && (inTrans || !db->autoCommit) ){
+    db->xRollbackCallback(db->pRollbackArg);
+  }
+}
+
+/*
+** Return a static string that describes the kind of error specified in the
+** argument.
+*/
+const char *sqlite3ErrStr(int rc){
+  const char *z;
+  switch( rc & 0xff ){
+    case SQLITE_ROW:
+    case SQLITE_DONE:
+    case SQLITE_OK:         z = "not an error";                          break;
+    case SQLITE_ERROR:      z = "SQL logic error or missing database";   break;
+    case SQLITE_PERM:       z = "access permission denied";              break;
+    case SQLITE_ABORT:      z = "callback requested query abort";        break;
+    case SQLITE_BUSY:       z = "database is locked";                    break;
+    case SQLITE_LOCKED:     z = "database table is locked";              break;
+    case SQLITE_NOMEM:      z = "out of memory";                         break;
+    case SQLITE_READONLY:   z = "attempt to write a readonly database";  break;
+    case SQLITE_INTERRUPT:  z = "interrupted";                           break;
+    case SQLITE_IOERR:      z = "disk I/O error";                        break;
+    case SQLITE_CORRUPT:    z = "database disk image is malformed";      break;
+    case SQLITE_FULL:       z = "database or disk is full";              break;
+    case SQLITE_CANTOPEN:   z = "unable to open database file";          break;
+    case SQLITE_EMPTY:      z = "table contains no data";                break;
+    case SQLITE_SCHEMA:     z = "database schema has changed";           break;
+    case SQLITE_TOOBIG:     z = "String or BLOB exceeded size limit";    break;
+    case SQLITE_CONSTRAINT: z = "constraint failed";                     break;
+    case SQLITE_MISMATCH:   z = "datatype mismatch";                     break;
+    case SQLITE_MISUSE:     z = "library routine called out of sequence";break;
+    case SQLITE_NOLFS:      z = "kernel lacks large file support";       break;
+    case SQLITE_AUTH:       z = "authorization denied";                  break;
+    case SQLITE_FORMAT:     z = "auxiliary database format error";       break;
+    case SQLITE_RANGE:      z = "bind or column index out of range";     break;
+    case SQLITE_NOTADB:     z = "file is encrypted or is not a database";break;
+    default:                z = "unknown error";                         break;
+  }
+  return z;
+}
+
+/*
+** This routine implements a busy callback that sleeps and tries
+** again until a timeout value is reached.  The timeout value is
+** an integer number of milliseconds passed in as the first
+** argument.
+*/
+static int sqliteDefaultBusyCallback(
+ void *ptr,               /* Database connection */
+ int count                /* Number of times table has been busy */
+){
+#if OS_WIN || (defined(HAVE_USLEEP) && HAVE_USLEEP)
+  static const u8 delays[] =
+     { 1, 2, 5, 10, 15, 20, 25, 25,  25,  50,  50, 100 };
+  static const u8 totals[] =
+     { 0, 1, 3,  8, 18, 33, 53, 78, 103, 128, 178, 228 };
+# define NDELAY (sizeof(delays)/sizeof(delays[0]))
+  sqlite3 *db = (sqlite3 *)ptr;
+  int timeout = db->busyTimeout;
+  int delay, prior;
+
+  assert( count>=0 );
+  if( count < NDELAY ){
+    delay = delays[count];
+    prior = totals[count];
+  }else{
+    delay = delays[NDELAY-1];
+    prior = totals[NDELAY-1] + delay*(count-(NDELAY-1));
+  }
+  if( prior + delay > timeout ){
+    delay = timeout - prior;
+    if( delay<=0 ) return 0;
+  }
+  sqlite3OsSleep(db->pVfs, delay*1000);
+  return 1;
+#else
+  sqlite3 *db = (sqlite3 *)ptr;
+  int timeout = ((sqlite3 *)ptr)->busyTimeout;
+  if( (count+1)*1000 > timeout ){
+    return 0;
+  }
+  sqlite3OsSleep(db->pVfs, 1000000);
+  return 1;
+#endif
+}
+
+/*
+** Invoke the given busy handler.
+**
+** This routine is called when an operation failed with a lock.
+** If this routine returns non-zero, the lock is retried.  If it
+** returns 0, the operation aborts with an SQLITE_BUSY error.
+*/
+int sqlite3InvokeBusyHandler(BusyHandler *p){
+  int rc;
+  if( p==0 || p->xFunc==0 || p->nBusy<0 ) return 0;
+  rc = p->xFunc(p->pArg, p->nBusy);
+  if( rc==0 ){
+    p->nBusy = -1;
+  }else{
+    p->nBusy++;
+  }
+  return rc;
+}
+
+/*
+** This routine sets the busy callback for an Sqlite database to the
+** given callback function with the given argument.
+*/
+int sqlite3_busy_handler(
+  sqlite3 *db,
+  int (*xBusy)(void*,int),
+  void *pArg
+){
+  sqlite3_mutex_enter(db->mutex);
+  db->busyHandler.xFunc = xBusy;
+  db->busyHandler.pArg = pArg;
+  db->busyHandler.nBusy = 0;
+  sqlite3_mutex_leave(db->mutex);
+  return SQLITE_OK;
+}
+
+#ifndef SQLITE_OMIT_PROGRESS_CALLBACK
+/*
+** This routine sets the progress callback for an Sqlite database to the
+** given callback function with the given argument. The progress callback will
+** be invoked every nOps opcodes.
+*/
+void sqlite3_progress_handler(
+  sqlite3 *db,
+  int nOps,
+  int (*xProgress)(void*),
+  void *pArg
+){
+  if( sqlite3SafetyCheckOk(db) ){
+    sqlite3_mutex_enter(db->mutex);
+    if( nOps>0 ){
+      db->xProgress = xProgress;
+      db->nProgressOps = nOps;
+      db->pProgressArg = pArg;
+    }else{
+      db->xProgress = 0;
+      db->nProgressOps = 0;
+      db->pProgressArg = 0;
+    }
+    sqlite3_mutex_leave(db->mutex);
+  }
+}
+#endif
+
+
+/*
+** This routine installs a default busy handler that waits for the
+** specified number of milliseconds before returning 0.
+*/
+int sqlite3_busy_timeout(sqlite3 *db, int ms){
+  if( ms>0 ){
+    db->busyTimeout = ms;
+    sqlite3_busy_handler(db, sqliteDefaultBusyCallback, (void*)db);
+  }else{
+    sqlite3_busy_handler(db, 0, 0);
+  }
+  return SQLITE_OK;
+}
+
+/*
+** Cause any pending operation to stop at its earliest opportunity.
+*/
+void sqlite3_interrupt(sqlite3 *db){
+  if( sqlite3SafetyCheckOk(db) ){
+    db->u1.isInterrupted = 1;
+  }
+}
+
+
+/*
+** This function is exactly the same as sqlite3_create_function(), except
+** that it is designed to be called by internal code. The difference is
+** that if a malloc() fails in sqlite3_create_function(), an error code
+** is returned and the mallocFailed flag cleared.
+*/
+int sqlite3CreateFunc(
+  sqlite3 *db,
+  const char *zFunctionName,
+  int nArg,
+  int enc,
+  void *pUserData,
+  void (*xFunc)(sqlite3_context*,int,sqlite3_value **),
+  void (*xStep)(sqlite3_context*,int,sqlite3_value **),
+  void (*xFinal)(sqlite3_context*)
+){
+  FuncDef *p;
+  int nName;
+
+  assert( sqlite3_mutex_held(db->mutex) );
+  if( zFunctionName==0 ||
+      (xFunc && (xFinal || xStep)) ||
+      (!xFunc && (xFinal && !xStep)) ||
+      (!xFunc && (!xFinal && xStep)) ||
+      (nArg<-1 || nArg>127) ||
+      (255<(nName = strlen(zFunctionName))) ){
+    sqlite3Error(db, SQLITE_ERROR, "bad parameters");
+    return SQLITE_ERROR;
+  }
+
+#ifndef SQLITE_OMIT_UTF16
+  /* If SQLITE_UTF16 is specified as the encoding type, transform this
+  ** to one of SQLITE_UTF16LE or SQLITE_UTF16BE using the
+  ** SQLITE_UTF16NATIVE macro. SQLITE_UTF16 is not used internally.
+  **
+  ** If SQLITE_ANY is specified, add three versions of the function
+  ** to the hash table.
+  */
+  if( enc==SQLITE_UTF16 ){
+    enc = SQLITE_UTF16NATIVE;
+  }else if( enc==SQLITE_ANY ){
+    int rc;
+    rc = sqlite3CreateFunc(db, zFunctionName, nArg, SQLITE_UTF8,
+         pUserData, xFunc, xStep, xFinal);
+    if( rc==SQLITE_OK ){
+      rc = sqlite3CreateFunc(db, zFunctionName, nArg, SQLITE_UTF16LE,
+          pUserData, xFunc, xStep, xFinal);
+    }
+    if( rc!=SQLITE_OK ){
+      return rc;
+    }
+    enc = SQLITE_UTF16BE;
+  }
+#else
+  enc = SQLITE_UTF8;
+#endif
+
+  /* Check if an existing function is being overridden or deleted. If so,
+  ** and there are active VMs, then return SQLITE_BUSY. If a function
+  ** is being overridden/deleted but there are no active VMs, allow the
+  ** operation to continue but invalidate all precompiled statements.
+  */
+  p = sqlite3FindFunction(db, zFunctionName, nName, nArg, enc, 0);
+  if( p && p->iPrefEnc==enc && p->nArg==nArg ){
+    if( db->activeVdbeCnt ){
+      sqlite3Error(db, SQLITE_BUSY,
+        "Unable to delete/modify user-function due to active statements");
+      assert( !db->mallocFailed );
+      return SQLITE_BUSY;
+    }else{
+      sqlite3ExpirePreparedStatements(db);
+    }
+  }
+
+  p = sqlite3FindFunction(db, zFunctionName, nName, nArg, enc, 1);
+  assert(p || db->mallocFailed);
+  if( !p ){
+    return SQLITE_NOMEM;
+  }
+  p->flags = 0;
+  p->xFunc = xFunc;
+  p->xStep = xStep;
+  p->xFinalize = xFinal;
+  p->pUserData = pUserData;
+  p->nArg = nArg;
+  return SQLITE_OK;
+}
+
+/*
+** Create new user functions.
+*/
+int sqlite3_create_function(
+  sqlite3 *db,
+  const char *zFunctionName,
+  int nArg,
+  int enc,
+  void *p,
+  void (*xFunc)(sqlite3_context*,int,sqlite3_value **),
+  void (*xStep)(sqlite3_context*,int,sqlite3_value **),
+  void (*xFinal)(sqlite3_context*)
+){
+  int rc;
+  sqlite3_mutex_enter(db->mutex);
+  assert( !db->mallocFailed );
+  rc = sqlite3CreateFunc(db, zFunctionName, nArg, enc, p, xFunc, xStep, xFinal);
+  rc = sqlite3ApiExit(db, rc);
+  sqlite3_mutex_leave(db->mutex);
+  return rc;
+}
+
+#ifndef SQLITE_OMIT_UTF16
+int sqlite3_create_function16(
+  sqlite3 *db,
+  const void *zFunctionName,
+  int nArg,
+  int eTextRep,
+  void *p,
+  void (*xFunc)(sqlite3_context*,int,sqlite3_value**),
+  void (*xStep)(sqlite3_context*,int,sqlite3_value**),
+  void (*xFinal)(sqlite3_context*)
+){
+  int rc;
+  char *zFunc8;
+  sqlite3_mutex_enter(db->mutex);
+  assert( !db->mallocFailed );
+  zFunc8 = sqlite3Utf16to8(db, zFunctionName, -1);
+  rc = sqlite3CreateFunc(db, zFunc8, nArg, eTextRep, p, xFunc, xStep, xFinal);
+  sqlite3_free(zFunc8);
+  rc = sqlite3ApiExit(db, rc);
+  sqlite3_mutex_leave(db->mutex);
+  return rc;
+}
+#endif
+
+
+/*
+** Declare that a function has been overloaded by a virtual table.
+**
+** If the function already exists as a regular global function, then
+** this routine is a no-op.  If the function does not exist, then create
+** a new one that always throws a run-time error.
+**
+** When virtual tables intend to provide an overloaded function, they
+** should call this routine to make sure the global function exists.
+** A global function must exist in order for name resolution to work
+** properly.
+*/
+int sqlite3_overload_function(
+  sqlite3 *db,
+  const char *zName,
+  int nArg
+){
+  int nName = strlen(zName);
+  int rc;
+  sqlite3_mutex_enter(db->mutex);
+  if( sqlite3FindFunction(db, zName, nName, nArg, SQLITE_UTF8, 0)==0 ){
+    sqlite3CreateFunc(db, zName, nArg, SQLITE_UTF8,
+                      0, sqlite3InvalidFunction, 0, 0);
+  }
+  rc = sqlite3ApiExit(db, SQLITE_OK);
+  sqlite3_mutex_leave(db->mutex);
+  return rc;
+}
+
+#ifndef SQLITE_OMIT_TRACE
+/*
+** Register a trace function.  The pArg from the previously registered trace
+** is returned.
+**
+** A NULL trace function means that no tracing is executes.  A non-NULL
+** trace is a pointer to a function that is invoked at the start of each
+** SQL statement.
+*/
+void *sqlite3_trace(sqlite3 *db, void (*xTrace)(void*,const char*), void *pArg){
+  void *pOld;
+  sqlite3_mutex_enter(db->mutex);
+  pOld = db->pTraceArg;
+  db->xTrace = xTrace;
+  db->pTraceArg = pArg;
+  sqlite3_mutex_leave(db->mutex);
+  return pOld;
+}
+/*
+** Register a profile function.  The pArg from the previously registered
+** profile function is returned.
+**
+** A NULL profile function means that no profiling is executes.  A non-NULL
+** profile is a pointer to a function that is invoked at the conclusion of
+** each SQL statement that is run.
+*/
+void *sqlite3_profile(
+  sqlite3 *db,
+  void (*xProfile)(void*,const char*,sqlite_uint64),
+  void *pArg
+){
+  void *pOld;
+  sqlite3_mutex_enter(db->mutex);
+  pOld = db->pProfileArg;
+  db->xProfile = xProfile;
+  db->pProfileArg = pArg;
+  sqlite3_mutex_leave(db->mutex);
+  return pOld;
+}
+#endif /* SQLITE_OMIT_TRACE */
+
+/*** EXPERIMENTAL ***
+**
+** Register a function to be invoked when a transaction comments.
+** If the invoked function returns non-zero, then the commit becomes a
+** rollback.
+*/
+void *sqlite3_commit_hook(
+  sqlite3 *db,              /* Attach the hook to this database */
+  int (*xCallback)(void*),  /* Function to invoke on each commit */
+  void *pArg                /* Argument to the function */
+){
+  void *pOld;
+  sqlite3_mutex_enter(db->mutex);
+  pOld = db->pCommitArg;
+  db->xCommitCallback = xCallback;
+  db->pCommitArg = pArg;
+  sqlite3_mutex_leave(db->mutex);
+  return pOld;
+}
+
+/*
+** Register a callback to be invoked each time a row is updated,
+** inserted or deleted using this database connection.
+*/
+void *sqlite3_update_hook(
+  sqlite3 *db,              /* Attach the hook to this database */
+  void (*xCallback)(void*,int,char const *,char const *,sqlite_int64),
+  void *pArg                /* Argument to the function */
+){
+  void *pRet;
+  sqlite3_mutex_enter(db->mutex);
+  pRet = db->pUpdateArg;
+  db->xUpdateCallback = xCallback;
+  db->pUpdateArg = pArg;
+  sqlite3_mutex_leave(db->mutex);
+  return pRet;
+}
+
+/*
+** Register a callback to be invoked each time a transaction is rolled
+** back by this database connection.
+*/
+void *sqlite3_rollback_hook(
+  sqlite3 *db,              /* Attach the hook to this database */
+  void (*xCallback)(void*), /* Callback function */
+  void *pArg                /* Argument to the function */
+){
+  void *pRet;
+  sqlite3_mutex_enter(db->mutex);
+  pRet = db->pRollbackArg;
+  db->xRollbackCallback = xCallback;
+  db->pRollbackArg = pArg;
+  sqlite3_mutex_leave(db->mutex);
+  return pRet;
+}
+
+/*
+** This routine is called to create a connection to a database BTree
+** driver.  If zFilename is the name of a file, then that file is
+** opened and used.  If zFilename is the magic name ":memory:" then
+** the database is stored in memory (and is thus forgotten as soon as
+** the connection is closed.)  If zFilename is NULL then the database
+** is a "virtual" database for transient use only and is deleted as
+** soon as the connection is closed.
+**
+** A virtual database can be either a disk file (that is automatically
+** deleted when the file is closed) or it an be held entirely in memory,
+** depending on the values of the TEMP_STORE compile-time macro and the
+** db->temp_store variable, according to the following chart:
+**
+**       TEMP_STORE     db->temp_store     Location of temporary database
+**       ----------     --------------     ------------------------------
+**           0               any             file
+**           1                1              file
+**           1                2              memory
+**           1                0              file
+**           2                1              file
+**           2                2              memory
+**           2                0              memory
+**           3               any             memory
+*/
+int sqlite3BtreeFactory(
+  const sqlite3 *db,        /* Main database when opening aux otherwise 0 */
+  const char *zFilename,    /* Name of the file containing the BTree database */
+  int omitJournal,          /* if TRUE then do not journal this file */
+  int nCache,               /* How many pages in the page cache */
+  int vfsFlags,             /* Flags passed through to vfsOpen */
+  Btree **ppBtree           /* Pointer to new Btree object written here */
+){
+  int btFlags = 0;
+  int rc;
+
+  assert( sqlite3_mutex_held(db->mutex) );
+  assert( ppBtree != 0);
+  if( omitJournal ){
+    btFlags |= BTREE_OMIT_JOURNAL;
+  }
+  if( db->flags & SQLITE_NoReadlock ){
+    btFlags |= BTREE_NO_READLOCK;
+  }
+  if( zFilename==0 ){
+#if TEMP_STORE==0
+    /* Do nothing */
+#endif
+#ifndef SQLITE_OMIT_MEMORYDB
+#if TEMP_STORE==1
+    if( db->temp_store==2 ) zFilename = ":memory:";
+#endif
+#if TEMP_STORE==2
+    if( db->temp_store!=1 ) zFilename = ":memory:";
+#endif
+#if TEMP_STORE==3
+    zFilename = ":memory:";
+#endif
+#endif /* SQLITE_OMIT_MEMORYDB */
+  }
+
+  if( (vfsFlags & SQLITE_OPEN_MAIN_DB)!=0 && (zFilename==0 || *zFilename==0) ){
+    vfsFlags = (vfsFlags & ~SQLITE_OPEN_MAIN_DB) | SQLITE_OPEN_TEMP_DB;
+  }
+  rc = sqlite3BtreeOpen(zFilename, (sqlite3 *)db, ppBtree, btFlags, vfsFlags);
+  if( rc==SQLITE_OK ){
+    sqlite3BtreeSetCacheSize(*ppBtree, nCache);
+  }
+  return rc;
+}
+
+/*
+** Return UTF-8 encoded English language explanation of the most recent
+** error.
+*/
+const char *sqlite3_errmsg(sqlite3 *db){
+  const char *z;
+  if( !db ){
+    return sqlite3ErrStr(SQLITE_NOMEM);
+  }
+  if( !sqlite3SafetyCheckSickOrOk(db) || db->errCode==SQLITE_MISUSE ){
+    return sqlite3ErrStr(SQLITE_MISUSE);
+  }
+  sqlite3_mutex_enter(db->mutex);
+  assert( !db->mallocFailed );
+  z = (char*)sqlite3_value_text(db->pErr);
+  if( z==0 ){
+    z = sqlite3ErrStr(db->errCode);
+  }
+  sqlite3_mutex_leave(db->mutex);
+  return z;
+}
+
+#ifndef SQLITE_OMIT_UTF16
+/*
+** Return UTF-16 encoded English language explanation of the most recent
+** error.
+*/
+const void *sqlite3_errmsg16(sqlite3 *db){
+  /* Because all the characters in the string are in the unicode
+  ** range 0x00-0xFF, if we pad the big-endian string with a
+  ** zero byte, we can obtain the little-endian string with
+  ** &big_endian[1].
+  */
+  static const char outOfMemBe[] = {
+    0, 'o', 0, 'u', 0, 't', 0, ' ',
+    0, 'o', 0, 'f', 0, ' ',
+    0, 'm', 0, 'e', 0, 'm', 0, 'o', 0, 'r', 0, 'y', 0, 0, 0
+  };
+  static const char misuseBe [] = {
+    0, 'l', 0, 'i', 0, 'b', 0, 'r', 0, 'a', 0, 'r', 0, 'y', 0, ' ',
+    0, 'r', 0, 'o', 0, 'u', 0, 't', 0, 'i', 0, 'n', 0, 'e', 0, ' ',
+    0, 'c', 0, 'a', 0, 'l', 0, 'l', 0, 'e', 0, 'd', 0, ' ',
+    0, 'o', 0, 'u', 0, 't', 0, ' ',
+    0, 'o', 0, 'f', 0, ' ',
+    0, 's', 0, 'e', 0, 'q', 0, 'u', 0, 'e', 0, 'n', 0, 'c', 0, 'e', 0, 0, 0
+  };
+
+  const void *z;
+  if( !db ){
+    return (void *)(&outOfMemBe[SQLITE_UTF16NATIVE==SQLITE_UTF16LE?1:0]);
+  }
+  if( !sqlite3SafetyCheckSickOrOk(db) || db->errCode==SQLITE_MISUSE ){
+    return (void *)(&misuseBe[SQLITE_UTF16NATIVE==SQLITE_UTF16LE?1:0]);
+  }
+  sqlite3_mutex_enter(db->mutex);
+  assert( !db->mallocFailed );
+  z = sqlite3_value_text16(db->pErr);
+  if( z==0 ){
+    sqlite3ValueSetStr(db->pErr, -1, sqlite3ErrStr(db->errCode),
+         SQLITE_UTF8, SQLITE_STATIC);
+    z = sqlite3_value_text16(db->pErr);
+  }
+  sqlite3ApiExit(0, 0);
+  sqlite3_mutex_leave(db->mutex);
+  return z;
+}
+#endif /* SQLITE_OMIT_UTF16 */
+
+/*
+** Return the most recent error code generated by an SQLite routine. If NULL is
+** passed to this function, we assume a malloc() failed during sqlite3_open().
+*/
+int sqlite3_errcode(sqlite3 *db){
+  if( db && !sqlite3SafetyCheckSickOrOk(db) ){
+    return SQLITE_MISUSE;
+  }
+  if( !db || db->mallocFailed ){
+    return SQLITE_NOMEM;
+  }
+  return db->errCode & db->errMask;
+}
+
+/*
+** Create a new collating function for database "db".  The name is zName
+** and the encoding is enc.
+*/
+static int createCollation(
+  sqlite3* db,
+  const char *zName,
+  int enc,
+  void* pCtx,
+  int(*xCompare)(void*,int,const void*,int,const void*),
+  void(*xDel)(void*)
+){
+  CollSeq *pColl;
+  int enc2;
+
+  assert( sqlite3_mutex_held(db->mutex) );
+
+  /* If SQLITE_UTF16 is specified as the encoding type, transform this
+  ** to one of SQLITE_UTF16LE or SQLITE_UTF16BE using the
+  ** SQLITE_UTF16NATIVE macro. SQLITE_UTF16 is not used internally.
+  */
+  enc2 = enc & ~SQLITE_UTF16_ALIGNED;
+  if( enc2==SQLITE_UTF16 ){
+    enc2 = SQLITE_UTF16NATIVE;
+  }
+
+  if( (enc2&~3)!=0 ){
+    sqlite3Error(db, SQLITE_ERROR, "unknown encoding");
+    return SQLITE_ERROR;
+  }
+
+  /* Check if this call is removing or replacing an existing collation
+  ** sequence. If so, and there are active VMs, return busy. If there
+  ** are no active VMs, invalidate any pre-compiled statements.
+  */
+  pColl = sqlite3FindCollSeq(db, (u8)enc2, zName, strlen(zName), 0);
+  if( pColl && pColl->xCmp ){
+    if( db->activeVdbeCnt ){
+      sqlite3Error(db, SQLITE_BUSY,
+        "Unable to delete/modify collation sequence due to active statements");
+      return SQLITE_BUSY;
+    }
+    sqlite3ExpirePreparedStatements(db);
+
+    /* If collation sequence pColl was created directly by a call to
+    ** sqlite3_create_collation, and not generated by synthCollSeq(),
+    ** then any copies made by synthCollSeq() need to be invalidated.
+    ** Also, collation destructor - CollSeq.xDel() - function may need
+    ** to be called.
+    */
+    if( (pColl->enc & ~SQLITE_UTF16_ALIGNED)==enc2 ){
+      CollSeq *aColl = sqlite3HashFind(&db->aCollSeq, zName, strlen(zName));
+      int j;
+      for(j=0; j<3; j++){
+        CollSeq *p = &aColl[j];
+        if( p->enc==pColl->enc ){
+          if( p->xDel ){
+            p->xDel(p->pUser);
+          }
+          p->xCmp = 0;
+        }
+      }
+    }
+  }
+
+  pColl = sqlite3FindCollSeq(db, (u8)enc2, zName, strlen(zName), 1);
+  if( pColl ){
+    pColl->xCmp = xCompare;
+    pColl->pUser = pCtx;
+    pColl->xDel = xDel;
+    pColl->enc = enc2 | (enc & SQLITE_UTF16_ALIGNED);
+  }
+  sqlite3Error(db, SQLITE_OK, 0);
+  return SQLITE_OK;
+}
+
+
+/*
+** This routine does the work of opening a database on behalf of
+** sqlite3_open() and sqlite3_open16(). The database filename "zFilename"
+** is UTF-8 encoded.
+*/
+static int openDatabase(
+  const char *zFilename, /* Database filename UTF-8 encoded */
+  sqlite3 **ppDb,        /* OUT: Returned database handle */
+  unsigned flags,        /* Operational flags */
+  const char *zVfs       /* Name of the VFS to use */
+){
+  sqlite3 *db;
+  int rc;
+  CollSeq *pColl;
+
+  /* Remove harmful bits from the flags parameter */
+  flags &=  ~( SQLITE_OPEN_DELETEONCLOSE |
+               SQLITE_OPEN_MAIN_DB |
+               SQLITE_OPEN_TEMP_DB |
+               SQLITE_OPEN_TRANSIENT_DB |
+               SQLITE_OPEN_MAIN_JOURNAL |
+               SQLITE_OPEN_TEMP_JOURNAL |
+               SQLITE_OPEN_SUBJOURNAL |
+               SQLITE_OPEN_MASTER_JOURNAL
+             );
+
+  /* Allocate the sqlite data structure */
+  db = sqlite3MallocZero( sizeof(sqlite3) );
+  if( db==0 ) goto opendb_out;
+  db->mutex = sqlite3_mutex_alloc(SQLITE_MUTEX_RECURSIVE);
+  if( db->mutex==0 ){
+    sqlite3_free(db);
+    db = 0;
+    goto opendb_out;
+  }
+  sqlite3_mutex_enter(db->mutex);
+  db->errMask = 0xff;
+  db->priorNewRowid = 0;
+  db->nDb = 2;
+  db->magic = SQLITE_MAGIC_BUSY;
+  db->aDb = db->aDbStatic;
+  db->autoCommit = 1;
+  db->nextAutovac = -1;
+  db->flags |= SQLITE_ShortColNames
+#if SQLITE_DEFAULT_FILE_FORMAT<4
+                 | SQLITE_LegacyFileFmt
+#endif
+#ifdef SQLITE_ENABLE_LOAD_EXTENSION
+                 | SQLITE_LoadExtension
+#endif
+      ;
+  sqlite3HashInit(&db->aFunc, SQLITE_HASH_STRING, 0);
+  sqlite3HashInit(&db->aCollSeq, SQLITE_HASH_STRING, 0);
+#ifndef SQLITE_OMIT_VIRTUALTABLE
+  sqlite3HashInit(&db->aModule, SQLITE_HASH_STRING, 0);
+#endif
+
+  db->pVfs = sqlite3_vfs_find(zVfs);
+  if( !db->pVfs ){
+    rc = SQLITE_ERROR;
+    db->magic = SQLITE_MAGIC_SICK;
+    sqlite3Error(db, rc, "no such vfs: %s", zVfs);
+    goto opendb_out;
+  }
+
+  /* Add the default collation sequence BINARY. BINARY works for both UTF-8
+  ** and UTF-16, so add a version for each to avoid any unnecessary
+  ** conversions. The only error that can occur here is a malloc() failure.
+  */
+  createCollation(db, "BINARY", SQLITE_UTF8, 0, binCollFunc, 0);
+  createCollation(db, "BINARY", SQLITE_UTF16BE, 0, binCollFunc, 0);
+  createCollation(db, "BINARY", SQLITE_UTF16LE, 0, binCollFunc, 0);
+  createCollation(db, "RTRIM", SQLITE_UTF8, (void*)1, binCollFunc, 0);
+  if( db->mallocFailed ||
+      (db->pDfltColl = sqlite3FindCollSeq(db, SQLITE_UTF8, "BINARY", 6, 0))==0
+  ){
+    assert( db->mallocFailed );
+    db->magic = SQLITE_MAGIC_SICK;
+    goto opendb_out;
+  }
+
+  /* Also add a UTF-8 case-insensitive collation sequence. */
+  createCollation(db, "NOCASE", SQLITE_UTF8, 0, nocaseCollatingFunc, 0);
+
+  /* Set flags on the built-in collating sequences */
+  db->pDfltColl->type = SQLITE_COLL_BINARY;
+  pColl = sqlite3FindCollSeq(db, SQLITE_UTF8, "NOCASE", 6, 0);
+  if( pColl ){
+    pColl->type = SQLITE_COLL_NOCASE;
+  }
+
+  /* Open the backend database driver */
+  db->openFlags = flags;
+  rc = sqlite3BtreeFactory(db, zFilename, 0, SQLITE_DEFAULT_CACHE_SIZE,
+                           flags | SQLITE_OPEN_MAIN_DB,
+                           &db->aDb[0].pBt);
+  if( rc!=SQLITE_OK ){
+    sqlite3Error(db, rc, 0);
+    db->magic = SQLITE_MAGIC_SICK;
+    goto opendb_out;
+  }
+  db->aDb[0].pSchema = sqlite3SchemaGet(db, db->aDb[0].pBt);
+  db->aDb[1].pSchema = sqlite3SchemaGet(db, 0);
+
+
+  /* The default safety_level for the main database is 'full'; for the temp
+  ** database it is 'NONE'. This matches the pager layer defaults.
+  */
+  db->aDb[0].zName = "main";
+  db->aDb[0].safety_level = 3;
+#ifndef SQLITE_OMIT_TEMPDB
+  db->aDb[1].zName = "temp";
+  db->aDb[1].safety_level = 1;
+#endif
+
+  db->magic = SQLITE_MAGIC_OPEN;
+  if( db->mallocFailed ){
+    goto opendb_out;
+  }
+
+  /* Register all built-in functions, but do not attempt to read the
+  ** database schema yet. This is delayed until the first time the database
+  ** is accessed.
+  */
+  sqlite3Error(db, SQLITE_OK, 0);
+  sqlite3RegisterBuiltinFunctions(db);
+
+  /* Load automatic extensions - extensions that have been registered
+  ** using the sqlite3_automatic_extension() API.
+  */
+  (void)sqlite3AutoLoadExtensions(db);
+  if( sqlite3_errcode(db)!=SQLITE_OK ){
+    goto opendb_out;
+  }
+
+#ifdef SQLITE_ENABLE_FTS1
+  if( !db->mallocFailed ){
+    extern int sqlite3Fts1Init(sqlite3*);
+    rc = sqlite3Fts1Init(db);
+  }
+#endif
+
+#ifdef SQLITE_ENABLE_FTS2
+  if( !db->mallocFailed && rc==SQLITE_OK ){
+    extern int sqlite3Fts2Init(sqlite3*);
+    rc = sqlite3Fts2Init(db);
+  }
+#endif
+
+#ifdef SQLITE_ENABLE_FTS3
+  if( !db->mallocFailed && rc==SQLITE_OK ){
+    rc = sqlite3Fts3Init(db);
+  }
+#endif
+
+#ifdef SQLITE_ENABLE_ICU
+  if( !db->mallocFailed && rc==SQLITE_OK ){
+    extern int sqlite3IcuInit(sqlite3*);
+    rc = sqlite3IcuInit(db);
+  }
+#endif
+  sqlite3Error(db, rc, 0);
+
+  /* -DSQLITE_DEFAULT_LOCKING_MODE=1 makes EXCLUSIVE the default locking
+  ** mode.  -DSQLITE_DEFAULT_LOCKING_MODE=0 make NORMAL the default locking
+  ** mode.  Doing nothing at all also makes NORMAL the default.
+  */
+#ifdef SQLITE_DEFAULT_LOCKING_MODE
+  db->dfltLockMode = SQLITE_DEFAULT_LOCKING_MODE;
+  sqlite3PagerLockingMode(sqlite3BtreePager(db->aDb[0].pBt),
+                          SQLITE_DEFAULT_LOCKING_MODE);
+#endif
+
+opendb_out:
+  if( db ){
+    assert( db->mutex!=0 );
+    sqlite3_mutex_leave(db->mutex);
+  }
+  if( SQLITE_NOMEM==(rc = sqlite3_errcode(db)) ){
+    sqlite3_close(db);
+    db = 0;
+  }
+  *ppDb = db;
+  return sqlite3ApiExit(0, rc);
+}
+
+/*
+** Open a new database handle.
+*/
+int sqlite3_open(
+  const char *zFilename,
+  sqlite3 **ppDb
+){
+  return openDatabase(zFilename, ppDb,
+                      SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE, 0);
+}
+int sqlite3_open_v2(
+  const char *filename,   /* Database filename (UTF-8) */
+  sqlite3 **ppDb,         /* OUT: SQLite db handle */
+  int flags,              /* Flags */
+  const char *zVfs        /* Name of VFS module to use */
+){
+  return openDatabase(filename, ppDb, flags, zVfs);
+}
+
+#ifndef SQLITE_OMIT_UTF16
+/*
+** Open a new database handle.
+*/
+int sqlite3_open16(
+  const void *zFilename,
+  sqlite3 **ppDb
+){
+  char const *zFilename8;   /* zFilename encoded in UTF-8 instead of UTF-16 */
+  sqlite3_value *pVal;
+  int rc = SQLITE_NOMEM;
+
+  assert( zFilename );
+  assert( ppDb );
+  *ppDb = 0;
+  pVal = sqlite3ValueNew(0);
+  sqlite3ValueSetStr(pVal, -1, zFilename, SQLITE_UTF16NATIVE, SQLITE_STATIC);
+  zFilename8 = sqlite3ValueText(pVal, SQLITE_UTF8);
+  if( zFilename8 ){
+    rc = openDatabase(zFilename8, ppDb,
+                      SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE, 0);
+    assert( *ppDb || rc==SQLITE_NOMEM );
+    if( rc==SQLITE_OK ){
+      rc = sqlite3_exec(*ppDb, "PRAGMA encoding = 'UTF-16'", 0, 0, 0);
+      if( rc!=SQLITE_OK ){
+        sqlite3_close(*ppDb);
+        *ppDb = 0;
+      }
+    }
+  }
+  sqlite3ValueFree(pVal);
+
+  return sqlite3ApiExit(0, rc);
+}
+#endif /* SQLITE_OMIT_UTF16 */
+
+/*
+** Register a new collation sequence with the database handle db.
+*/
+int sqlite3_create_collation(
+  sqlite3* db,
+  const char *zName,
+  int enc,
+  void* pCtx,
+  int(*xCompare)(void*,int,const void*,int,const void*)
+){
+  int rc;
+  sqlite3_mutex_enter(db->mutex);
+  assert( !db->mallocFailed );
+  rc = createCollation(db, zName, enc, pCtx, xCompare, 0);
+  rc = sqlite3ApiExit(db, rc);
+  sqlite3_mutex_leave(db->mutex);
+  return rc;
+}
+
+/*
+** Register a new collation sequence with the database handle db.
+*/
+int sqlite3_create_collation_v2(
+  sqlite3* db,
+  const char *zName,
+  int enc,
+  void* pCtx,
+  int(*xCompare)(void*,int,const void*,int,const void*),
+  void(*xDel)(void*)
+){
+  int rc;
+  sqlite3_mutex_enter(db->mutex);
+  assert( !db->mallocFailed );
+  rc = createCollation(db, zName, enc, pCtx, xCompare, xDel);
+  rc = sqlite3ApiExit(db, rc);
+  sqlite3_mutex_leave(db->mutex);
+  return rc;
+}
+
+#ifndef SQLITE_OMIT_UTF16
+/*
+** Register a new collation sequence with the database handle db.
+*/
+int sqlite3_create_collation16(
+  sqlite3* db,
+  const char *zName,
+  int enc,
+  void* pCtx,
+  int(*xCompare)(void*,int,const void*,int,const void*)
+){
+  int rc = SQLITE_OK;
+  char *zName8;
+  sqlite3_mutex_enter(db->mutex);
+  assert( !db->mallocFailed );
+  zName8 = sqlite3Utf16to8(db, zName, -1);
+  if( zName8 ){
+    rc = createCollation(db, zName8, enc, pCtx, xCompare, 0);
+    sqlite3_free(zName8);
+  }
+  rc = sqlite3ApiExit(db, rc);
+  sqlite3_mutex_leave(db->mutex);
+  return rc;
+}
+#endif /* SQLITE_OMIT_UTF16 */
+
+/*
+** Register a collation sequence factory callback with the database handle
+** db. Replace any previously installed collation sequence factory.
+*/
+int sqlite3_collation_needed(
+  sqlite3 *db,
+  void *pCollNeededArg,
+  void(*xCollNeeded)(void*,sqlite3*,int eTextRep,const char*)
+){
+  sqlite3_mutex_enter(db->mutex);
+  db->xCollNeeded = xCollNeeded;
+  db->xCollNeeded16 = 0;
+  db->pCollNeededArg = pCollNeededArg;
+  sqlite3_mutex_leave(db->mutex);
+  return SQLITE_OK;
+}
+
+#ifndef SQLITE_OMIT_UTF16
+/*
+** Register a collation sequence factory callback with the database handle
+** db. Replace any previously installed collation sequence factory.
+*/
+int sqlite3_collation_needed16(
+  sqlite3 *db,
+  void *pCollNeededArg,
+  void(*xCollNeeded16)(void*,sqlite3*,int eTextRep,const void*)
+){
+  sqlite3_mutex_enter(db->mutex);
+  db->xCollNeeded = 0;
+  db->xCollNeeded16 = xCollNeeded16;
+  db->pCollNeededArg = pCollNeededArg;
+  sqlite3_mutex_leave(db->mutex);
+  return SQLITE_OK;
+}
+#endif /* SQLITE_OMIT_UTF16 */
+
+#ifndef SQLITE_OMIT_GLOBALRECOVER
+/*
+** This function is now an anachronism. It used to be used to recover from a
+** malloc() failure, but SQLite now does this automatically.
+*/
+int sqlite3_global_recover(void){
+  return SQLITE_OK;
+}
+#endif
+
+/*
+** Test to see whether or not the database connection is in autocommit
+** mode.  Return TRUE if it is and FALSE if not.  Autocommit mode is on
+** by default.  Autocommit is disabled by a BEGIN statement and reenabled
+** by the next COMMIT or ROLLBACK.
+**
+******* THIS IS AN EXPERIMENTAL API AND IS SUBJECT TO CHANGE ******
+*/
+int sqlite3_get_autocommit(sqlite3 *db){
+  return db->autoCommit;
+}
+
+#ifdef SQLITE_DEBUG
+/*
+** The following routine is subtituted for constant SQLITE_CORRUPT in
+** debugging builds.  This provides a way to set a breakpoint for when
+** corruption is first detected.
+*/
+int sqlite3Corrupt(void){
+  return SQLITE_CORRUPT;
+}
+#endif
+
+/*
+** This is a convenience routine that makes sure that all thread-specific
+** data for this thread has been deallocated.
+**
+** SQLite no longer uses thread-specific data so this routine is now a
+** no-op.  It is retained for historical compatibility.
+*/
+void sqlite3_thread_cleanup(void){
+}
+
+/*
+** Return meta information about a specific column of a database table.
+** See comment in sqlite3.h (sqlite.h.in) for details.
+*/
+#ifdef SQLITE_ENABLE_COLUMN_METADATA
+int sqlite3_table_column_metadata(
+  sqlite3 *db,                /* Connection handle */
+  const char *zDbName,        /* Database name or NULL */
+  const char *zTableName,     /* Table name */
+  const char *zColumnName,    /* Column name */
+  char const **pzDataType,    /* OUTPUT: Declared data type */
+  char const **pzCollSeq,     /* OUTPUT: Collation sequence name */
+  int *pNotNull,              /* OUTPUT: True if NOT NULL constraint exists */
+  int *pPrimaryKey,           /* OUTPUT: True if column part of PK */
+  int *pAutoinc               /* OUTPUT: True if colums is auto-increment */
+){
+  int rc;
+  char *zErrMsg = 0;
+  Table *pTab = 0;
+  Column *pCol = 0;
+  int iCol;
+
+  char const *zDataType = 0;
+  char const *zCollSeq = 0;
+  int notnull = 0;
+  int primarykey = 0;
+  int autoinc = 0;
+
+  /* Ensure the database schema has been loaded */
+  (void)sqlite3SafetyOn(db);
+  sqlite3_mutex_enter(db->mutex);
+  sqlite3BtreeEnterAll(db);
+  rc = sqlite3Init(db, &zErrMsg);
+  sqlite3BtreeLeaveAll(db);
+  if( SQLITE_OK!=rc ){
+    goto error_out;
+  }
+
+  /* Locate the table in question */
+  pTab = sqlite3FindTable(db, zTableName, zDbName);
+  if( !pTab || pTab->pSelect ){
+    pTab = 0;
+    goto error_out;
+  }
+
+  /* Find the column for which info is requested */
+  if( sqlite3IsRowid(zColumnName) ){
+    iCol = pTab->iPKey;
+    if( iCol>=0 ){
+      pCol = &pTab->aCol[iCol];
+    }
+  }else{
+    for(iCol=0; iCol<pTab->nCol; iCol++){
+      pCol = &pTab->aCol[iCol];
+      if( 0==sqlite3StrICmp(pCol->zName, zColumnName) ){
+        break;
+      }
+    }
+    if( iCol==pTab->nCol ){
+      pTab = 0;
+      goto error_out;
+    }
+  }
+
+  /* The following block stores the meta information that will be returned
+  ** to the caller in local variables zDataType, zCollSeq, notnull, primarykey
+  ** and autoinc. At this point there are two possibilities:
+  **
+  **     1. The specified column name was rowid", "oid" or "_rowid_"
+  **        and there is no explicitly declared IPK column.
+  **
+  **     2. The table is not a view and the column name identified an
+  **        explicitly declared column. Copy meta information from *pCol.
+  */
+  if( pCol ){
+    zDataType = pCol->zType;
+    zCollSeq = pCol->zColl;
+    notnull = (pCol->notNull?1:0);
+    primarykey  = (pCol->isPrimKey?1:0);
+    autoinc = ((pTab->iPKey==iCol && pTab->autoInc)?1:0);
+  }else{
+    zDataType = "INTEGER";
+    primarykey = 1;
+  }
+  if( !zCollSeq ){
+    zCollSeq = "BINARY";
+  }
+
+error_out:
+  (void)sqlite3SafetyOff(db);
+
+  /* Whether the function call succeeded or failed, set the output parameters
+  ** to whatever their local counterparts contain. If an error did occur,
+  ** this has the effect of zeroing all output parameters.
+  */
+  if( pzDataType ) *pzDataType = zDataType;
+  if( pzCollSeq ) *pzCollSeq = zCollSeq;
+  if( pNotNull ) *pNotNull = notnull;
+  if( pPrimaryKey ) *pPrimaryKey = primarykey;
+  if( pAutoinc ) *pAutoinc = autoinc;
+
+  if( SQLITE_OK==rc && !pTab ){
+    sqlite3SetString(&zErrMsg, "no such table column: ", zTableName, ".",
+        zColumnName, 0);
+    rc = SQLITE_ERROR;
+  }
+  sqlite3Error(db, rc, (zErrMsg?"%s":0), zErrMsg);
+  sqlite3_free(zErrMsg);
+  rc = sqlite3ApiExit(db, rc);
+  sqlite3_mutex_leave(db->mutex);
+  return rc;
+}
+#endif
+
+/*
+** Sleep for a little while.  Return the amount of time slept.
+*/
+int sqlite3_sleep(int ms){
+  sqlite3_vfs *pVfs;
+  int rc;
+  pVfs = sqlite3_vfs_find(0);
+
+  /* This function works in milliseconds, but the underlying OsSleep()
+  ** API uses microseconds. Hence the 1000's.
+  */
+  rc = (sqlite3OsSleep(pVfs, 1000*ms)/1000);
+  return rc;
+}
+
+/*
+** Enable or disable the extended result codes.
+*/
+int sqlite3_extended_result_codes(sqlite3 *db, int onoff){
+  sqlite3_mutex_enter(db->mutex);
+  db->errMask = onoff ? 0xffffffff : 0xff;
+  sqlite3_mutex_leave(db->mutex);
+  return SQLITE_OK;
+}
+
+/*
+** Invoke the xFileControl method on a particular database.
+*/
+int sqlite3_file_control(sqlite3 *db, const char *zDbName, int op, void *pArg){
+  int rc = SQLITE_ERROR;
+  int iDb;
+  sqlite3_mutex_enter(db->mutex);
+  if( zDbName==0 ){
+    iDb = 0;
+  }else{
+    for(iDb=0; iDb<db->nDb; iDb++){
+      if( strcmp(db->aDb[iDb].zName, zDbName)==0 ) break;
+    }
+  }
+  if( iDb<db->nDb ){
+    Btree *pBtree = db->aDb[iDb].pBt;
+    if( pBtree ){
+      Pager *pPager;
+      sqlite3_file *fd;
+      sqlite3BtreeEnter(pBtree);
+      pPager = sqlite3BtreePager(pBtree);
+      assert( pPager!=0 );
+      fd = sqlite3PagerFile(pPager);
+      assert( fd!=0 );
+      if( fd->pMethods ){
+        rc = sqlite3OsFileControl(fd, op, pArg);
+      }
+      sqlite3BtreeLeave(pBtree);
+    }
+  }
+  sqlite3_mutex_leave(db->mutex);
+  return rc;
+}
+
+/*
+** Interface to the testing logic.
+*/
+int sqlite3_test_control(int op, ...){
+  va_list ap;
+  int rc = 0;
+  va_start(ap, op);
+  switch( op ){
+#ifndef SQLITE_OMIT_FAULTINJECTOR
+    case SQLITE_TESTCTRL_FAULT_CONFIG: {
+      int id = va_arg(ap, int);
+      int nDelay = va_arg(ap, int);
+      int nRepeat = va_arg(ap, int);
+      sqlite3FaultConfig(id, nDelay, nRepeat);
+      break;
+    }
+    case SQLITE_TESTCTRL_FAULT_FAILURES: {
+      int id = va_arg(ap, int);
+      rc = sqlite3FaultFailures(id);
+      break;
+    }
+    case SQLITE_TESTCTRL_FAULT_BENIGN_FAILURES: {
+      int id = va_arg(ap, int);
+      rc = sqlite3FaultBenignFailures(id);
+      break;
+    }
+    case SQLITE_TESTCTRL_FAULT_PENDING: {
+      int id = va_arg(ap, int);
+      rc = sqlite3FaultPending(id);
+      break;
+    }
+#endif /* SQLITE_OMIT_FAULTINJECTOR */
+  }
+  va_end(ap);
+  return rc;
+}
diff --git a/uppsrc/plugin/sqlite3/lib/malloc.c b/uppsrc/plugin/sqlite3/lib/malloc.c
new file mode 100644
index 000000000..38fd6f32e
--- /dev/null
+++ b/uppsrc/plugin/sqlite3/lib/malloc.c
@@ -0,0 +1,239 @@
+/*
+** 2001 September 15
+**
+** The author disclaims copyright to this source code.  In place of
+** a legal notice, here is a blessing:
+**
+**    May you do good and not evil.
+**    May you find forgiveness for yourself and forgive others.
+**    May you share freely, never taking more than you give.
+**
+*************************************************************************
+** Memory allocation functions used throughout sqlite.
+**
+**
+** $Id: malloc.c,v 1.14 2007/10/20 16:36:31 drh Exp $
+*/
+#include "sqliteInt.h"
+#include <stdarg.h>
+#include <ctype.h>
+
+/*
+** This routine runs when the memory allocator sees that the
+** total memory allocation is about to exceed the soft heap
+** limit.
+*/
+static void softHeapLimitEnforcer(
+  void *NotUsed,
+  sqlite3_int64 inUse,
+  int allocSize
+){
+  sqlite3_release_memory(allocSize);
+}
+
+/*
+** Set the soft heap-size limit for the current thread. Passing a
+** zero or negative value indicates no limit.
+*/
+void sqlite3_soft_heap_limit(int n){
+  sqlite3_uint64 iLimit;
+  int overage;
+  if( n<0 ){
+    iLimit = 0;
+  }else{
+    iLimit = n;
+  }
+  if( iLimit>0 ){
+    sqlite3_memory_alarm(softHeapLimitEnforcer, 0, iLimit);
+  }else{
+    sqlite3_memory_alarm(0, 0, 0);
+  }
+  overage = sqlite3_memory_used() - n;
+  if( overage>0 ){
+    sqlite3_release_memory(overage);
+  }
+}
+
+/*
+** Release memory held by SQLite instances created by the current thread.
+*/
+int sqlite3_release_memory(int n){
+#ifdef SQLITE_ENABLE_MEMORY_MANAGEMENT
+  return sqlite3PagerReleaseMemory(n);
+#else
+  return SQLITE_OK;
+#endif
+}
+
+
+/*
+** Allocate and zero memory.
+*/
+void *sqlite3MallocZero(unsigned n){
+  void *p = sqlite3_malloc(n);
+  if( p ){
+    memset(p, 0, n);
+  }
+  return p;
+}
+
+/*
+** Allocate and zero memory.  If the allocation fails, make
+** the mallocFailed flag in the connection pointer.
+*/
+void *sqlite3DbMallocZero(sqlite3 *db, unsigned n){
+  void *p = sqlite3DbMallocRaw(db, n);
+  if( p ){
+    memset(p, 0, n);
+  }
+  return p;
+}
+
+/*
+** Allocate and zero memory.  If the allocation fails, make
+** the mallocFailed flag in the connection pointer.
+*/
+void *sqlite3DbMallocRaw(sqlite3 *db, unsigned n){
+  void *p = 0;
+  if( !db || db->mallocFailed==0 ){
+    p = sqlite3_malloc(n);
+    if( !p && db ){
+      db->mallocFailed = 1;
+    }
+  }
+  return p;
+}
+
+/*
+** Resize the block of memory pointed to by p to n bytes. If the
+** resize fails, set the mallocFailed flag inthe connection object.
+*/
+void *sqlite3DbRealloc(sqlite3 *db, void *p, int n){
+  void *pNew = 0;
+  if( db->mallocFailed==0 ){
+    pNew = sqlite3_realloc(p, n);
+    if( !pNew ){
+      db->mallocFailed = 1;
+    }
+  }
+  return pNew;
+}
+
+/*
+** Attempt to reallocate p.  If the reallocation fails, then free p
+** and set the mallocFailed flag in the database connection.
+*/
+void *sqlite3DbReallocOrFree(sqlite3 *db, void *p, int n){
+  void *pNew;
+  pNew = sqlite3DbRealloc(db, p, n);
+  if( !pNew ){
+    sqlite3_free(p);
+  }
+  return pNew;
+}
+
+/*
+** Make a copy of a string in memory obtained from sqliteMalloc(). These
+** functions call sqlite3MallocRaw() directly instead of sqliteMalloc(). This
+** is because when memory debugging is turned on, these two functions are
+** called via macros that record the current file and line number in the
+** ThreadData structure.
+*/
+char *sqlite3StrDup(const char *z){
+  char *zNew;
+  int n;
+  if( z==0 ) return 0;
+  n = strlen(z)+1;
+  zNew = sqlite3_malloc(n);
+  if( zNew ) memcpy(zNew, z, n);
+  return zNew;
+}
+char *sqlite3StrNDup(const char *z, int n){
+  char *zNew;
+  if( z==0 ) return 0;
+  zNew = sqlite3_malloc(n+1);
+  if( zNew ){
+    memcpy(zNew, z, n);
+    zNew[n] = 0;
+  }
+  return zNew;
+}
+
+char *sqlite3DbStrDup(sqlite3 *db, const char *z){
+  char *zNew = sqlite3StrDup(z);
+  if( z && !zNew ){
+    db->mallocFailed = 1;
+  }
+  return zNew;
+}
+char *sqlite3DbStrNDup(sqlite3 *db, const char *z, int n){
+  char *zNew = sqlite3StrNDup(z, n);
+  if( z && !zNew ){
+    db->mallocFailed = 1;
+  }
+  return zNew;
+}
+
+/*
+** Create a string from the 2nd and subsequent arguments (up to the
+** first NULL argument), store the string in memory obtained from
+** sqliteMalloc() and make the pointer indicated by the 1st argument
+** point to that string.  The 1st argument must either be NULL or
+** point to memory obtained from sqliteMalloc().
+*/
+void sqlite3SetString(char **pz, ...){
+  va_list ap;
+  int nByte;
+  const char *z;
+  char *zResult;
+
+  assert( pz!=0 );
+  nByte = 1;
+  va_start(ap, pz);
+  while( (z = va_arg(ap, const char*))!=0 ){
+    nByte += strlen(z);
+  }
+  va_end(ap);
+  sqlite3_free(*pz);
+  *pz = zResult = sqlite3_malloc(nByte);
+  if( zResult==0 ){
+    return;
+  }
+  *zResult = 0;
+  va_start(ap, pz);
+  while( (z = va_arg(ap, const char*))!=0 ){
+    int n = strlen(z);
+    memcpy(zResult, z, n);
+    zResult += n;
+  }
+  zResult[0] = 0;
+  va_end(ap);
+}
+
+
+/*
+** This function must be called before exiting any API function (i.e.
+** returning control to the user) that has called sqlite3_malloc or
+** sqlite3_realloc.
+**
+** The returned value is normally a copy of the second argument to this
+** function. However, if a malloc() failure has occured since the previous
+** invocation SQLITE_NOMEM is returned instead.
+**
+** If the first argument, db, is not NULL and a malloc() error has occured,
+** then the connection error-code (the value returned by sqlite3_errcode())
+** is set to SQLITE_NOMEM.
+*/
+int sqlite3ApiExit(sqlite3* db, int rc){
+  /* If the db handle is not NULL, then we must hold the connection handle
+  ** mutex here. Otherwise the read (and possible write) of db->mallocFailed
+  ** is unsafe, as is the call to sqlite3Error().
+  */
+  assert( !db || sqlite3_mutex_held(db->mutex) );
+  if( db && db->mallocFailed ){
+    sqlite3Error(db, SQLITE_NOMEM, 0);
+    db->mallocFailed = 0;
+    rc = SQLITE_NOMEM;
+  }
+  return rc & (db ? db->errMask : 0xff);
+}
diff --git a/uppsrc/plugin/sqlite3/lib/mem1.c b/uppsrc/plugin/sqlite3/lib/mem1.c
new file mode 100644
index 000000000..8167d9ca0
--- /dev/null
+++ b/uppsrc/plugin/sqlite3/lib/mem1.c
@@ -0,0 +1,227 @@
+/*
+** 2007 August 14
+**
+** The author disclaims copyright to this source code.  In place of
+** a legal notice, here is a blessing:
+**
+**    May you do good and not evil.
+**    May you find forgiveness for yourself and forgive others.
+**    May you share freely, never taking more than you give.
+**
+*************************************************************************
+** This file contains the C functions that implement a memory
+** allocation subsystem for use by SQLite.
+**
+** $Id: mem1.c,v 1.16 2008/02/14 23:26:56 drh Exp $
+*/
+#include "sqliteInt.h"
+
+/*
+** This version of the memory allocator is the default.  It is
+** used when no other memory allocator is specified using compile-time
+** macros.
+*/
+#ifdef SQLITE_SYSTEM_MALLOC
+
+/*
+** All of the static variables used by this module are collected
+** into a single structure named "mem".  This is to keep the
+** static variables organized and to reduce namespace pollution
+** when this module is combined with other in the amalgamation.
+*/
+static struct {
+  /*
+  ** The alarm callback and its arguments.  The mem.mutex lock will
+  ** be held while the callback is running.  Recursive calls into
+  ** the memory subsystem are allowed, but no new callbacks will be
+  ** issued.  The alarmBusy variable is set to prevent recursive
+  ** callbacks.
+  */
+  sqlite3_int64 alarmThreshold;
+  void (*alarmCallback)(void*, sqlite3_int64,int);
+  void *alarmArg;
+  int alarmBusy;
+
+  /*
+  ** Mutex to control access to the memory allocation subsystem.
+  */
+  sqlite3_mutex *mutex;
+
+  /*
+  ** Current allocation and high-water mark.
+  */
+  sqlite3_int64 nowUsed;
+  sqlite3_int64 mxUsed;
+
+
+} mem;
+
+/*
+** Enter the mutex mem.mutex. Allocate it if it is not already allocated.
+*/
+static void enterMem(void){
+  if( mem.mutex==0 ){
+    mem.mutex = sqlite3_mutex_alloc(SQLITE_MUTEX_STATIC_MEM);
+  }
+  sqlite3_mutex_enter(mem.mutex);
+}
+
+/*
+** Return the amount of memory currently checked out.
+*/
+sqlite3_int64 sqlite3_memory_used(void){
+  sqlite3_int64 n;
+  enterMem();
+  n = mem.nowUsed;
+  sqlite3_mutex_leave(mem.mutex);
+  return n;
+}
+
+/*
+** Return the maximum amount of memory that has ever been
+** checked out since either the beginning of this process
+** or since the most recent reset.
+*/
+sqlite3_int64 sqlite3_memory_highwater(int resetFlag){
+  sqlite3_int64 n;
+  enterMem();
+  n = mem.mxUsed;
+  if( resetFlag ){
+    mem.mxUsed = mem.nowUsed;
+  }
+  sqlite3_mutex_leave(mem.mutex);
+  return n;
+}
+
+/*
+** Change the alarm callback
+*/
+int sqlite3_memory_alarm(
+  void(*xCallback)(void *pArg, sqlite3_int64 used,int N),
+  void *pArg,
+  sqlite3_int64 iThreshold
+){
+  enterMem();
+  mem.alarmCallback = xCallback;
+  mem.alarmArg = pArg;
+  mem.alarmThreshold = iThreshold;
+  sqlite3_mutex_leave(mem.mutex);
+  return SQLITE_OK;
+}
+
+/*
+** Trigger the alarm
+*/
+static void sqlite3MemsysAlarm(int nByte){
+  void (*xCallback)(void*,sqlite3_int64,int);
+  sqlite3_int64 nowUsed;
+  void *pArg;
+  if( mem.alarmCallback==0 || mem.alarmBusy  ) return;
+  mem.alarmBusy = 1;
+  xCallback = mem.alarmCallback;
+  nowUsed = mem.nowUsed;
+  pArg = mem.alarmArg;
+  sqlite3_mutex_leave(mem.mutex);
+  xCallback(pArg, nowUsed, nByte);
+  sqlite3_mutex_enter(mem.mutex);
+  mem.alarmBusy = 0;
+}
+
+/*
+** Allocate nBytes of memory
+*/
+void *sqlite3_malloc(int nBytes){
+  sqlite3_int64 *p = 0;
+  if( nBytes>0 ){
+    enterMem();
+    if( mem.alarmCallback!=0 && mem.nowUsed+nBytes>=mem.alarmThreshold ){
+      sqlite3MemsysAlarm(nBytes);
+    }
+    p = malloc(nBytes+8);
+    if( p==0 ){
+      sqlite3MemsysAlarm(nBytes);
+      p = malloc(nBytes+8);
+    }
+    if( p ){
+      p[0] = nBytes;
+      p++;
+      mem.nowUsed += nBytes;
+      if( mem.nowUsed>mem.mxUsed ){
+        mem.mxUsed = mem.nowUsed;
+      }
+    }
+    sqlite3_mutex_leave(mem.mutex);
+  }
+  return (void*)p;
+}
+
+/*
+** Free memory.
+*/
+void sqlite3_free(void *pPrior){
+  sqlite3_int64 *p;
+  int nByte;
+  if( pPrior==0 ){
+    return;
+  }
+  assert( mem.mutex!=0 );
+  p = pPrior;
+  p--;
+  nByte = (int)*p;
+  sqlite3_mutex_enter(mem.mutex);
+  mem.nowUsed -= nByte;
+  free(p);
+  sqlite3_mutex_leave(mem.mutex);
+}
+
+/*
+** Return the number of bytes allocated at p.
+*/
+int sqlite3MallocSize(void *p){
+  sqlite3_int64 *pInt;
+  if( !p ) return 0;
+  pInt = p;
+  return pInt[-1];
+}
+
+/*
+** Change the size of an existing memory allocation
+*/
+void *sqlite3_realloc(void *pPrior, int nBytes){
+  int nOld;
+  sqlite3_int64 *p;
+  if( pPrior==0 ){
+    return sqlite3_malloc(nBytes);
+  }
+  if( nBytes<=0 ){
+    sqlite3_free(pPrior);
+    return 0;
+  }
+  p = pPrior;
+  p--;
+  nOld = (int)p[0];
+  assert( mem.mutex!=0 );
+  sqlite3_mutex_enter(mem.mutex);
+  if( mem.nowUsed+nBytes-nOld>=mem.alarmThreshold ){
+    sqlite3MemsysAlarm(nBytes-nOld);
+  }
+  p = realloc(p, nBytes+8);
+  if( p==0 ){
+    sqlite3MemsysAlarm(nBytes);
+    p = pPrior;
+    p--;
+    p = realloc(p, nBytes+8);
+  }
+  if( p ){
+    p[0] = nBytes;
+    p++;
+    mem.nowUsed += nBytes-nOld;
+    if( mem.nowUsed>mem.mxUsed ){
+      mem.mxUsed = mem.nowUsed;
+    }
+  }
+  sqlite3_mutex_leave(mem.mutex);
+  return (void*)p;
+}
+
+#endif /* SQLITE_SYSTEM_MALLOC */
diff --git a/uppsrc/plugin/sqlite3/lib/mem2.c b/uppsrc/plugin/sqlite3/lib/mem2.c
new file mode 100644
index 000000000..9a0b42a4b
--- /dev/null
+++ b/uppsrc/plugin/sqlite3/lib/mem2.c
@@ -0,0 +1,458 @@
+/*
+** 2007 August 15
+**
+** The author disclaims copyright to this source code.  In place of
+** a legal notice, here is a blessing:
+**
+**    May you do good and not evil.
+**    May you find forgiveness for yourself and forgive others.
+**    May you share freely, never taking more than you give.
+**
+*************************************************************************
+** This file contains the C functions that implement a memory
+** allocation subsystem for use by SQLite.
+**
+** $Id: mem2.c,v 1.22 2008/02/19 15:15:16 drh Exp $
+*/
+#include "sqliteInt.h"
+
+/*
+** This version of the memory allocator is used only if the
+** SQLITE_MEMDEBUG macro is defined
+*/
+#ifdef SQLITE_MEMDEBUG
+
+/*
+** The backtrace functionality is only available with GLIBC
+*/
+#ifdef __GLIBC__
+  extern int backtrace(void**,int);
+  extern void backtrace_symbols_fd(void*const*,int,int);
+#else
+# define backtrace(A,B) 0
+# define backtrace_symbols_fd(A,B,C)
+#endif
+#include <stdio.h>
+
+/*
+** Each memory allocation looks like this:
+**
+**  ------------------------------------------------------------------------
+**  | Title |  backtrace pointers |  MemBlockHdr |  allocation |  EndGuard |
+**  ------------------------------------------------------------------------
+**
+** The application code sees only a pointer to the allocation.  We have
+** to back up from the allocation pointer to find the MemBlockHdr.  The
+** MemBlockHdr tells us the size of the allocation and the number of
+** backtrace pointers.  There is also a guard word at the end of the
+** MemBlockHdr.
+*/
+struct MemBlockHdr {
+  struct MemBlockHdr *pNext, *pPrev;  /* Linked list of all unfreed memory */
+  int iSize;                          /* Size of this allocation */
+  char nBacktrace;                    /* Number of backtraces on this alloc */
+  char nBacktraceSlots;               /* Available backtrace slots */
+  short nTitle;                       /* Bytes of title; includes '\0' */
+  int iForeGuard;                     /* Guard word for sanity */
+};
+
+/*
+** Guard words
+*/
+#define FOREGUARD 0x80F5E153
+#define REARGUARD 0xE4676B53
+
+/*
+** Number of malloc size increments to track.
+*/
+#define NCSIZE  1000
+
+/*
+** All of the static variables used by this module are collected
+** into a single structure named "mem".  This is to keep the
+** static variables organized and to reduce namespace pollution
+** when this module is combined with other in the amalgamation.
+*/
+static struct {
+  /*
+  ** The alarm callback and its arguments.  The mem.mutex lock will
+  ** be held while the callback is running.  Recursive calls into
+  ** the memory subsystem are allowed, but no new callbacks will be
+  ** issued.  The alarmBusy variable is set to prevent recursive
+  ** callbacks.
+  */
+  sqlite3_int64 alarmThreshold;
+  void (*alarmCallback)(void*, sqlite3_int64, int);
+  void *alarmArg;
+  int alarmBusy;
+
+  /*
+  ** Mutex to control access to the memory allocation subsystem.
+  */
+  sqlite3_mutex *mutex;
+
+  /*
+  ** Current allocation and high-water mark.
+  */
+  sqlite3_int64 nowUsed;
+  sqlite3_int64 mxUsed;
+
+  /*
+  ** Head and tail of a linked list of all outstanding allocations
+  */
+  struct MemBlockHdr *pFirst;
+  struct MemBlockHdr *pLast;
+
+  /*
+  ** The number of levels of backtrace to save in new allocations.
+  */
+  int nBacktrace;
+
+  /*
+  ** Title text to insert in front of each block
+  */
+  int nTitle;        /* Bytes of zTitle to save.  Includes '\0' and padding */
+  char zTitle[100];  /* The title text */
+
+  /*
+  ** sqlite3MallocDisallow() increments the following counter.
+  ** sqlite3MallocAllow() decrements it.
+  */
+  int disallow; /* Do not allow memory allocation */
+
+  /*
+  ** Gather statistics on the sizes of memory allocations.
+  ** sizeCnt[i] is the number of allocation attempts of i*8
+  ** bytes.  i==NCSIZE is the number of allocation attempts for
+  ** sizes more than NCSIZE*8 bytes.
+  */
+  int sizeCnt[NCSIZE];
+
+} mem;
+
+
+/*
+** Enter the mutex mem.mutex. Allocate it if it is not already allocated.
+*/
+static void enterMem(void){
+  if( mem.mutex==0 ){
+    mem.mutex = sqlite3_mutex_alloc(SQLITE_MUTEX_STATIC_MEM);
+  }
+  sqlite3_mutex_enter(mem.mutex);
+}
+
+/*
+** Return the amount of memory currently checked out.
+*/
+sqlite3_int64 sqlite3_memory_used(void){
+  sqlite3_int64 n;
+  enterMem();
+  n = mem.nowUsed;
+  sqlite3_mutex_leave(mem.mutex);
+  return n;
+}
+
+/*
+** Return the maximum amount of memory that has ever been
+** checked out since either the beginning of this process
+** or since the most recent reset.
+*/
+sqlite3_int64 sqlite3_memory_highwater(int resetFlag){
+  sqlite3_int64 n;
+  enterMem();
+  n = mem.mxUsed;
+  if( resetFlag ){
+    mem.mxUsed = mem.nowUsed;
+  }
+  sqlite3_mutex_leave(mem.mutex);
+  return n;
+}
+
+/*
+** Change the alarm callback
+*/
+int sqlite3_memory_alarm(
+  void(*xCallback)(void *pArg, sqlite3_int64 used, int N),
+  void *pArg,
+  sqlite3_int64 iThreshold
+){
+  enterMem();
+  mem.alarmCallback = xCallback;
+  mem.alarmArg = pArg;
+  mem.alarmThreshold = iThreshold;
+  sqlite3_mutex_leave(mem.mutex);
+  return SQLITE_OK;
+}
+
+/*
+** Trigger the alarm
+*/
+static void sqlite3MemsysAlarm(int nByte){
+  void (*xCallback)(void*,sqlite3_int64,int);
+  sqlite3_int64 nowUsed;
+  void *pArg;
+  if( mem.alarmCallback==0 || mem.alarmBusy  ) return;
+  mem.alarmBusy = 1;
+  xCallback = mem.alarmCallback;
+  nowUsed = mem.nowUsed;
+  pArg = mem.alarmArg;
+  sqlite3_mutex_leave(mem.mutex);
+  xCallback(pArg, nowUsed, nByte);
+  sqlite3_mutex_enter(mem.mutex);
+  mem.alarmBusy = 0;
+}
+
+/*
+** Given an allocation, find the MemBlockHdr for that allocation.
+**
+** This routine checks the guards at either end of the allocation and
+** if they are incorrect it asserts.
+*/
+static struct MemBlockHdr *sqlite3MemsysGetHeader(void *pAllocation){
+  struct MemBlockHdr *p;
+  int *pInt;
+
+  p = (struct MemBlockHdr*)pAllocation;
+  p--;
+  assert( p->iForeGuard==FOREGUARD );
+  assert( (p->iSize & 3)==0 );
+  pInt = (int*)pAllocation;
+  assert( pInt[p->iSize/sizeof(int)]==REARGUARD );
+  return p;
+}
+
+/*
+** Return the number of bytes currently allocated at address p.
+*/
+int sqlite3MallocSize(void *p){
+  struct MemBlockHdr *pHdr;
+  if( !p ){
+    return 0;
+  }
+  pHdr = sqlite3MemsysGetHeader(p);
+  return pHdr->iSize;
+}
+
+/*
+** Allocate nByte bytes of memory.
+*/
+void *sqlite3_malloc(int nByte){
+  struct MemBlockHdr *pHdr;
+  void **pBt;
+  char *z;
+  int *pInt;
+  void *p = 0;
+  int totalSize;
+
+  if( nByte>0 ){
+    enterMem();
+    assert( mem.disallow==0 );
+    if( mem.alarmCallback!=0 && mem.nowUsed+nByte>=mem.alarmThreshold ){
+      sqlite3MemsysAlarm(nByte);
+    }
+    nByte = (nByte+3)&~3;
+    if( nByte/8>NCSIZE-1 ){
+      mem.sizeCnt[NCSIZE-1]++;
+    }else{
+      mem.sizeCnt[nByte/8]++;
+    }
+    totalSize = nByte + sizeof(*pHdr) + sizeof(int) +
+                 mem.nBacktrace*sizeof(void*) + mem.nTitle;
+    if( sqlite3FaultStep(SQLITE_FAULTINJECTOR_MALLOC) ){
+      p = 0;
+    }else{
+      p = malloc(totalSize);
+      if( p==0 ){
+        sqlite3MemsysAlarm(nByte);
+        p = malloc(totalSize);
+      }
+    }
+    if( p ){
+      z = p;
+      pBt = (void**)&z[mem.nTitle];
+      pHdr = (struct MemBlockHdr*)&pBt[mem.nBacktrace];
+      pHdr->pNext = 0;
+      pHdr->pPrev = mem.pLast;
+      if( mem.pLast ){
+        mem.pLast->pNext = pHdr;
+      }else{
+        mem.pFirst = pHdr;
+      }
+      mem.pLast = pHdr;
+      pHdr->iForeGuard = FOREGUARD;
+      pHdr->nBacktraceSlots = mem.nBacktrace;
+      pHdr->nTitle = mem.nTitle;
+      if( mem.nBacktrace ){
+        void *aAddr[40];
+        pHdr->nBacktrace = backtrace(aAddr, mem.nBacktrace+1)-1;
+        memcpy(pBt, &aAddr[1], pHdr->nBacktrace*sizeof(void*));
+      }else{
+        pHdr->nBacktrace = 0;
+      }
+      if( mem.nTitle ){
+        memcpy(z, mem.zTitle, mem.nTitle);
+      }
+      pHdr->iSize = nByte;
+      pInt = (int*)&pHdr[1];
+      pInt[nByte/sizeof(int)] = REARGUARD;
+      memset(pInt, 0x65, nByte);
+      mem.nowUsed += nByte;
+      if( mem.nowUsed>mem.mxUsed ){
+        mem.mxUsed = mem.nowUsed;
+      }
+      p = (void*)pInt;
+    }
+    sqlite3_mutex_leave(mem.mutex);
+  }
+  return p;
+}
+
+/*
+** Free memory.
+*/
+void sqlite3_free(void *pPrior){
+  struct MemBlockHdr *pHdr;
+  void **pBt;
+  char *z;
+  if( pPrior==0 ){
+    return;
+  }
+  assert( mem.mutex!=0 );
+  pHdr = sqlite3MemsysGetHeader(pPrior);
+  pBt = (void**)pHdr;
+  pBt -= pHdr->nBacktraceSlots;
+  sqlite3_mutex_enter(mem.mutex);
+  mem.nowUsed -= pHdr->iSize;
+  if( pHdr->pPrev ){
+    assert( pHdr->pPrev->pNext==pHdr );
+    pHdr->pPrev->pNext = pHdr->pNext;
+  }else{
+    assert( mem.pFirst==pHdr );
+    mem.pFirst = pHdr->pNext;
+  }
+  if( pHdr->pNext ){
+    assert( pHdr->pNext->pPrev==pHdr );
+    pHdr->pNext->pPrev = pHdr->pPrev;
+  }else{
+    assert( mem.pLast==pHdr );
+    mem.pLast = pHdr->pPrev;
+  }
+  z = (char*)pBt;
+  z -= pHdr->nTitle;
+  memset(z, 0x2b, sizeof(void*)*pHdr->nBacktraceSlots + sizeof(*pHdr) +
+                  pHdr->iSize + sizeof(int) + pHdr->nTitle);
+  free(z);
+  sqlite3_mutex_leave(mem.mutex);
+}
+
+/*
+** Change the size of an existing memory allocation.
+**
+** For this debugging implementation, we *always* make a copy of the
+** allocation into a new place in memory.  In this way, if the
+** higher level code is using pointer to the old allocation, it is
+** much more likely to break and we are much more liking to find
+** the error.
+*/
+void *sqlite3_realloc(void *pPrior, int nByte){
+  struct MemBlockHdr *pOldHdr;
+  void *pNew;
+  if( pPrior==0 ){
+    return sqlite3_malloc(nByte);
+  }
+  if( nByte<=0 ){
+    sqlite3_free(pPrior);
+    return 0;
+  }
+  assert( mem.disallow==0 );
+  pOldHdr = sqlite3MemsysGetHeader(pPrior);
+  pNew = sqlite3_malloc(nByte);
+  if( pNew ){
+    memcpy(pNew, pPrior, nByte<pOldHdr->iSize ? nByte : pOldHdr->iSize);
+    if( nByte>pOldHdr->iSize ){
+      memset(&((char*)pNew)[pOldHdr->iSize], 0x2b, nByte - pOldHdr->iSize);
+    }
+    sqlite3_free(pPrior);
+  }
+  return pNew;
+}
+
+/*
+** Set the number of backtrace levels kept for each allocation.
+** A value of zero turns of backtracing.  The number is always rounded
+** up to a multiple of 2.
+*/
+void sqlite3MemdebugBacktrace(int depth){
+  if( depth<0 ){ depth = 0; }
+  if( depth>20 ){ depth = 20; }
+  depth = (depth+1)&0xfe;
+  mem.nBacktrace = depth;
+}
+
+/*
+** Set the title string for subsequent allocations.
+*/
+void sqlite3MemdebugSettitle(const char *zTitle){
+  int n = strlen(zTitle) + 1;
+  enterMem();
+  if( n>=sizeof(mem.zTitle) ) n = sizeof(mem.zTitle)-1;
+  memcpy(mem.zTitle, zTitle, n);
+  mem.zTitle[n] = 0;
+  mem.nTitle = (n+3)&~3;
+  sqlite3_mutex_leave(mem.mutex);
+}
+
+/*
+** Open the file indicated and write a log of all unfreed memory
+** allocations into that log.
+*/
+void sqlite3MemdebugDump(const char *zFilename){
+  FILE *out;
+  struct MemBlockHdr *pHdr;
+  void **pBt;
+  int i;
+  out = fopen(zFilename, "w");
+  if( out==0 ){
+    fprintf(stderr, "** Unable to output memory debug output log: %s **\n",
+                    zFilename);
+    return;
+  }
+  for(pHdr=mem.pFirst; pHdr; pHdr=pHdr->pNext){
+    char *z = (char*)pHdr;
+    z -= pHdr->nBacktraceSlots*sizeof(void*) + pHdr->nTitle;
+    fprintf(out, "**** %d bytes at %p from %s ****\n",
+            pHdr->iSize, &pHdr[1], pHdr->nTitle ? z : "???");
+    if( pHdr->nBacktrace ){
+      fflush(out);
+      pBt = (void**)pHdr;
+      pBt -= pHdr->nBacktraceSlots;
+      backtrace_symbols_fd(pBt, pHdr->nBacktrace, fileno(out));
+      fprintf(out, "\n");
+    }
+  }
+  fprintf(out, "COUNTS:\n");
+  for(i=0; i<NCSIZE-1; i++){
+    if( mem.sizeCnt[i] ){
+      fprintf(out, "   %3d: %d\n", i*8+8, mem.sizeCnt[i]);
+    }
+  }
+  if( mem.sizeCnt[NCSIZE-1] ){
+    fprintf(out, "  >%3d: %d\n", NCSIZE*8, mem.sizeCnt[NCSIZE-1]);
+  }
+  fclose(out);
+}
+
+/*
+** Return the number of times sqlite3_malloc() has been called.
+*/
+int sqlite3MemdebugMallocCount(){
+  int i;
+  int nTotal = 0;
+  for(i=0; i<NCSIZE; i++){
+    nTotal += mem.sizeCnt[i];
+  }
+  return nTotal;
+}
+
+
+#endif /* SQLITE_MEMDEBUG */
diff --git a/uppsrc/plugin/sqlite3/lib/mem3.c b/uppsrc/plugin/sqlite3/lib/mem3.c
new file mode 100644
index 000000000..497edec1a
--- /dev/null
+++ b/uppsrc/plugin/sqlite3/lib/mem3.c
@@ -0,0 +1,653 @@
+/*
+** 2007 October 14
+**
+** The author disclaims copyright to this source code.  In place of
+** a legal notice, here is a blessing:
+**
+**    May you do good and not evil.
+**    May you find forgiveness for yourself and forgive others.
+**    May you share freely, never taking more than you give.
+**
+*************************************************************************
+** This file contains the C functions that implement a memory
+** allocation subsystem for use by SQLite.
+**
+** This version of the memory allocation subsystem omits all
+** use of malloc().  All dynamically allocatable memory is
+** contained in a static array, mem.aPool[].  The size of this
+** fixed memory pool is SQLITE_MEMORY_SIZE bytes.
+**
+** This version of the memory allocation subsystem is used if
+** and only if SQLITE_MEMORY_SIZE is defined.
+**
+** $Id: mem3.c,v 1.12 2008/02/19 15:15:16 drh Exp $
+*/
+#include "sqliteInt.h"
+
+/*
+** This version of the memory allocator is used only when
+** SQLITE_MEMORY_SIZE is defined.
+*/
+#ifdef SQLITE_MEMORY_SIZE
+
+/*
+** Maximum size (in Mem3Blocks) of a "small" chunk.
+*/
+#define MX_SMALL 10
+
+
+/*
+** Number of freelist hash slots
+*/
+#define N_HASH  61
+
+/*
+** A memory allocation (also called a "chunk") consists of two or
+** more blocks where each block is 8 bytes.  The first 8 bytes are
+** a header that is not returned to the user.
+**
+** A chunk is two or more blocks that is either checked out or
+** free.  The first block has format u.hdr.  u.hdr.size4x is 4 times the
+** size of the allocation in blocks if the allocation is free.
+** The u.hdr.size4x&1 bit is true if the chunk is checked out and
+** false if the chunk is on the freelist.  The u.hdr.size4x&2 bit
+** is true if the previous chunk is checked out and false if the
+** previous chunk is free.  The u.hdr.prevSize field is the size of
+** the previous chunk in blocks if the previous chunk is on the
+** freelist. If the previous chunk is checked out, then
+** u.hdr.prevSize can be part of the data for that chunk and should
+** not be read or written.
+**
+** We often identify a chunk by its index in mem.aPool[].  When
+** this is done, the chunk index refers to the second block of
+** the chunk.  In this way, the first chunk has an index of 1.
+** A chunk index of 0 means "no such chunk" and is the equivalent
+** of a NULL pointer.
+**
+** The second block of free chunks is of the form u.list.  The
+** two fields form a double-linked list of chunks of related sizes.
+** Pointers to the head of the list are stored in mem.aiSmall[]
+** for smaller chunks and mem.aiHash[] for larger chunks.
+**
+** The second block of a chunk is user data if the chunk is checked
+** out.  If a chunk is checked out, the user data may extend into
+** the u.hdr.prevSize value of the following chunk.
+*/
+typedef struct Mem3Block Mem3Block;
+struct Mem3Block {
+  union {
+    struct {
+      u32 prevSize;   /* Size of previous chunk in Mem3Block elements */
+      u32 size4x;     /* 4x the size of current chunk in Mem3Block elements */
+    } hdr;
+    struct {
+      u32 next;       /* Index in mem.aPool[] of next free chunk */
+      u32 prev;       /* Index in mem.aPool[] of previous free chunk */
+    } list;
+  } u;
+};
+
+/*
+** All of the static variables used by this module are collected
+** into a single structure named "mem".  This is to keep the
+** static variables organized and to reduce namespace pollution
+** when this module is combined with other in the amalgamation.
+*/
+static struct {
+  /*
+  ** True if we are evaluating an out-of-memory callback.
+  */
+  int alarmBusy;
+
+  /*
+  ** Mutex to control access to the memory allocation subsystem.
+  */
+  sqlite3_mutex *mutex;
+
+  /*
+  ** The minimum amount of free space that we have seen.
+  */
+  u32 mnMaster;
+
+  /*
+  ** iMaster is the index of the master chunk.  Most new allocations
+  ** occur off of this chunk.  szMaster is the size (in Mem3Blocks)
+  ** of the current master.  iMaster is 0 if there is not master chunk.
+  ** The master chunk is not in either the aiHash[] or aiSmall[].
+  */
+  u32 iMaster;
+  u32 szMaster;
+
+  /*
+  ** Array of lists of free blocks according to the block size
+  ** for smaller chunks, or a hash on the block size for larger
+  ** chunks.
+  */
+  u32 aiSmall[MX_SMALL-1];   /* For sizes 2 through MX_SMALL, inclusive */
+  u32 aiHash[N_HASH];        /* For sizes MX_SMALL+1 and larger */
+
+  /*
+  ** Memory available for allocation
+  */
+  Mem3Block aPool[SQLITE_MEMORY_SIZE/sizeof(Mem3Block)+2];
+} mem;
+
+/*
+** Unlink the chunk at mem.aPool[i] from list it is currently
+** on.  *pRoot is the list that i is a member of.
+*/
+static void memsys3UnlinkFromList(u32 i, u32 *pRoot){
+  u32 next = mem.aPool[i].u.list.next;
+  u32 prev = mem.aPool[i].u.list.prev;
+  assert( sqlite3_mutex_held(mem.mutex) );
+  if( prev==0 ){
+    *pRoot = next;
+  }else{
+    mem.aPool[prev].u.list.next = next;
+  }
+  if( next ){
+    mem.aPool[next].u.list.prev = prev;
+  }
+  mem.aPool[i].u.list.next = 0;
+  mem.aPool[i].u.list.prev = 0;
+}
+
+/*
+** Unlink the chunk at index i from
+** whatever list is currently a member of.
+*/
+static void memsys3Unlink(u32 i){
+  u32 size, hash;
+  assert( sqlite3_mutex_held(mem.mutex) );
+  assert( (mem.aPool[i-1].u.hdr.size4x & 1)==0 );
+  assert( i>=1 );
+  size = mem.aPool[i-1].u.hdr.size4x/4;
+  assert( size==mem.aPool[i+size-1].u.hdr.prevSize );
+  assert( size>=2 );
+  if( size <= MX_SMALL ){
+    memsys3UnlinkFromList(i, &mem.aiSmall[size-2]);
+  }else{
+    hash = size % N_HASH;
+    memsys3UnlinkFromList(i, &mem.aiHash[hash]);
+  }
+}
+
+/*
+** Link the chunk at mem.aPool[i] so that is on the list rooted
+** at *pRoot.
+*/
+static void memsys3LinkIntoList(u32 i, u32 *pRoot){
+  assert( sqlite3_mutex_held(mem.mutex) );
+  mem.aPool[i].u.list.next = *pRoot;
+  mem.aPool[i].u.list.prev = 0;
+  if( *pRoot ){
+    mem.aPool[*pRoot].u.list.prev = i;
+  }
+  *pRoot = i;
+}
+
+/*
+** Link the chunk at index i into either the appropriate
+** small chunk list, or into the large chunk hash table.
+*/
+static void memsys3Link(u32 i){
+  u32 size, hash;
+  assert( sqlite3_mutex_held(mem.mutex) );
+  assert( i>=1 );
+  assert( (mem.aPool[i-1].u.hdr.size4x & 1)==0 );
+  size = mem.aPool[i-1].u.hdr.size4x/4;
+  assert( size==mem.aPool[i+size-1].u.hdr.prevSize );
+  assert( size>=2 );
+  if( size <= MX_SMALL ){
+    memsys3LinkIntoList(i, &mem.aiSmall[size-2]);
+  }else{
+    hash = size % N_HASH;
+    memsys3LinkIntoList(i, &mem.aiHash[hash]);
+  }
+}
+
+/*
+** Enter the mutex mem.mutex. Allocate it if it is not already allocated.
+**
+** Also:  Initialize the memory allocation subsystem the first time
+** this routine is called.
+*/
+static void memsys3Enter(void){
+  if( mem.mutex==0 ){
+    mem.mutex = sqlite3_mutex_alloc(SQLITE_MUTEX_STATIC_MEM);
+    mem.aPool[0].u.hdr.size4x = SQLITE_MEMORY_SIZE/2 + 2;
+    mem.aPool[SQLITE_MEMORY_SIZE/8].u.hdr.prevSize = SQLITE_MEMORY_SIZE/8;
+    mem.aPool[SQLITE_MEMORY_SIZE/8].u.hdr.size4x = 1;
+    mem.iMaster = 1;
+    mem.szMaster = SQLITE_MEMORY_SIZE/8;
+    mem.mnMaster = mem.szMaster;
+  }
+  sqlite3_mutex_enter(mem.mutex);
+}
+
+/*
+** Return the amount of memory currently checked out.
+*/
+sqlite3_int64 sqlite3_memory_used(void){
+  sqlite3_int64 n;
+  memsys3Enter();
+  n = SQLITE_MEMORY_SIZE - mem.szMaster*8;
+  sqlite3_mutex_leave(mem.mutex);
+  return n;
+}
+
+/*
+** Return the maximum amount of memory that has ever been
+** checked out since either the beginning of this process
+** or since the most recent reset.
+*/
+sqlite3_int64 sqlite3_memory_highwater(int resetFlag){
+  sqlite3_int64 n;
+  memsys3Enter();
+  n = SQLITE_MEMORY_SIZE - mem.mnMaster*8;
+  if( resetFlag ){
+    mem.mnMaster = mem.szMaster;
+  }
+  sqlite3_mutex_leave(mem.mutex);
+  return n;
+}
+
+/*
+** Change the alarm callback.
+**
+** This is a no-op for the static memory allocator.  The purpose
+** of the memory alarm is to support sqlite3_soft_heap_limit().
+** But with this memory allocator, the soft_heap_limit is really
+** a hard limit that is fixed at SQLITE_MEMORY_SIZE.
+*/
+int sqlite3_memory_alarm(
+  void(*xCallback)(void *pArg, sqlite3_int64 used,int N),
+  void *pArg,
+  sqlite3_int64 iThreshold
+){
+  return SQLITE_OK;
+}
+
+/*
+** Called when we are unable to satisfy an allocation of nBytes.
+*/
+static void memsys3OutOfMemory(int nByte){
+  if( !mem.alarmBusy ){
+    mem.alarmBusy = 1;
+    assert( sqlite3_mutex_held(mem.mutex) );
+    sqlite3_mutex_leave(mem.mutex);
+    sqlite3_release_memory(nByte);
+    sqlite3_mutex_enter(mem.mutex);
+    mem.alarmBusy = 0;
+  }
+}
+
+/*
+** Return the size of an outstanding allocation, in bytes.  The
+** size returned omits the 8-byte header overhead.  This only
+** works for chunks that are currently checked out.
+*/
+int sqlite3MallocSize(void *p){
+  int iSize = 0;
+  if( p ){
+    Mem3Block *pBlock = (Mem3Block*)p;
+    assert( (pBlock[-1].u.hdr.size4x&1)!=0 );
+    iSize = (pBlock[-1].u.hdr.size4x&~3)*2 - 4;
+  }
+  return iSize;
+}
+
+/*
+** Chunk i is a free chunk that has been unlinked.  Adjust its
+** size parameters for check-out and return a pointer to the
+** user portion of the chunk.
+*/
+static void *memsys3Checkout(u32 i, int nBlock){
+  u32 x;
+  assert( sqlite3_mutex_held(mem.mutex) );
+  assert( i>=1 );
+  assert( mem.aPool[i-1].u.hdr.size4x/4==nBlock );
+  assert( mem.aPool[i+nBlock-1].u.hdr.prevSize==nBlock );
+  x = mem.aPool[i-1].u.hdr.size4x;
+  mem.aPool[i-1].u.hdr.size4x = nBlock*4 | 1 | (x&2);
+  mem.aPool[i+nBlock-1].u.hdr.prevSize = nBlock;
+  mem.aPool[i+nBlock-1].u.hdr.size4x |= 2;
+  return &mem.aPool[i];
+}
+
+/*
+** Carve a piece off of the end of the mem.iMaster free chunk.
+** Return a pointer to the new allocation.  Or, if the master chunk
+** is not large enough, return 0.
+*/
+static void *memsys3FromMaster(int nBlock){
+  assert( sqlite3_mutex_held(mem.mutex) );
+  assert( mem.szMaster>=nBlock );
+  if( nBlock>=mem.szMaster-1 ){
+    /* Use the entire master */
+    void *p = memsys3Checkout(mem.iMaster, mem.szMaster);
+    mem.iMaster = 0;
+    mem.szMaster = 0;
+    mem.mnMaster = 0;
+    return p;
+  }else{
+    /* Split the master block.  Return the tail. */
+    u32 newi, x;
+    newi = mem.iMaster + mem.szMaster - nBlock;
+    assert( newi > mem.iMaster+1 );
+    mem.aPool[mem.iMaster+mem.szMaster-1].u.hdr.prevSize = nBlock;
+    mem.aPool[mem.iMaster+mem.szMaster-1].u.hdr.size4x |= 2;
+    mem.aPool[newi-1].u.hdr.size4x = nBlock*4 + 1;
+    mem.szMaster -= nBlock;
+    mem.aPool[newi-1].u.hdr.prevSize = mem.szMaster;
+    x = mem.aPool[mem.iMaster-1].u.hdr.size4x & 2;
+    mem.aPool[mem.iMaster-1].u.hdr.size4x = mem.szMaster*4 | x;
+    if( mem.szMaster < mem.mnMaster ){
+      mem.mnMaster = mem.szMaster;
+    }
+    return (void*)&mem.aPool[newi];
+  }
+}
+
+/*
+** *pRoot is the head of a list of free chunks of the same size
+** or same size hash.  In other words, *pRoot is an entry in either
+** mem.aiSmall[] or mem.aiHash[].
+**
+** This routine examines all entries on the given list and tries
+** to coalesce each entries with adjacent free chunks.
+**
+** If it sees a chunk that is larger than mem.iMaster, it replaces
+** the current mem.iMaster with the new larger chunk.  In order for
+** this mem.iMaster replacement to work, the master chunk must be
+** linked into the hash tables.  That is not the normal state of
+** affairs, of course.  The calling routine must link the master
+** chunk before invoking this routine, then must unlink the (possibly
+** changed) master chunk once this routine has finished.
+*/
+static void memsys3Merge(u32 *pRoot){
+  u32 iNext, prev, size, i, x;
+
+  assert( sqlite3_mutex_held(mem.mutex) );
+  for(i=*pRoot; i>0; i=iNext){
+    iNext = mem.aPool[i].u.list.next;
+    size = mem.aPool[i-1].u.hdr.size4x;
+    assert( (size&1)==0 );
+    if( (size&2)==0 ){
+      memsys3UnlinkFromList(i, pRoot);
+      assert( i > mem.aPool[i-1].u.hdr.prevSize );
+      prev = i - mem.aPool[i-1].u.hdr.prevSize;
+      if( prev==iNext ){
+        iNext = mem.aPool[prev].u.list.next;
+      }
+      memsys3Unlink(prev);
+      size = i + size/4 - prev;
+      x = mem.aPool[prev-1].u.hdr.size4x & 2;
+      mem.aPool[prev-1].u.hdr.size4x = size*4 | x;
+      mem.aPool[prev+size-1].u.hdr.prevSize = size;
+      memsys3Link(prev);
+      i = prev;
+    }else{
+      size /= 4;
+    }
+    if( size>mem.szMaster ){
+      mem.iMaster = i;
+      mem.szMaster = size;
+    }
+  }
+}
+
+/*
+** Return a block of memory of at least nBytes in size.
+** Return NULL if unable.
+*/
+static void *memsys3Malloc(int nByte){
+  u32 i;
+  int nBlock;
+  int toFree;
+
+  assert( sqlite3_mutex_held(mem.mutex) );
+  assert( sizeof(Mem3Block)==8 );
+  if( nByte<=12 ){
+    nBlock = 2;
+  }else{
+    nBlock = (nByte + 11)/8;
+  }
+  assert( nBlock >= 2 );
+
+  /* STEP 1:
+  ** Look for an entry of the correct size in either the small
+  ** chunk table or in the large chunk hash table.  This is
+  ** successful most of the time (about 9 times out of 10).
+  */
+  if( nBlock <= MX_SMALL ){
+    i = mem.aiSmall[nBlock-2];
+    if( i>0 ){
+      memsys3UnlinkFromList(i, &mem.aiSmall[nBlock-2]);
+      return memsys3Checkout(i, nBlock);
+    }
+  }else{
+    int hash = nBlock % N_HASH;
+    for(i=mem.aiHash[hash]; i>0; i=mem.aPool[i].u.list.next){
+      if( mem.aPool[i-1].u.hdr.size4x/4==nBlock ){
+        memsys3UnlinkFromList(i, &mem.aiHash[hash]);
+        return memsys3Checkout(i, nBlock);
+      }
+    }
+  }
+
+  /* STEP 2:
+  ** Try to satisfy the allocation by carving a piece off of the end
+  ** of the master chunk.  This step usually works if step 1 fails.
+  */
+  if( mem.szMaster>=nBlock ){
+    return memsys3FromMaster(nBlock);
+  }
+
+
+  /* STEP 3:
+  ** Loop through the entire memory pool.  Coalesce adjacent free
+  ** chunks.  Recompute the master chunk as the largest free chunk.
+  ** Then try again to satisfy the allocation by carving a piece off
+  ** of the end of the master chunk.  This step happens very
+  ** rarely (we hope!)
+  */
+  for(toFree=nBlock*16; toFree<SQLITE_MEMORY_SIZE*2; toFree *= 2){
+    memsys3OutOfMemory(toFree);
+    if( mem.iMaster ){
+      memsys3Link(mem.iMaster);
+      mem.iMaster = 0;
+      mem.szMaster = 0;
+    }
+    for(i=0; i<N_HASH; i++){
+      memsys3Merge(&mem.aiHash[i]);
+    }
+    for(i=0; i<MX_SMALL-1; i++){
+      memsys3Merge(&mem.aiSmall[i]);
+    }
+    if( mem.szMaster ){
+      memsys3Unlink(mem.iMaster);
+      if( mem.szMaster>=nBlock ){
+        return memsys3FromMaster(nBlock);
+      }
+    }
+  }
+
+  /* If none of the above worked, then we fail. */
+  return 0;
+}
+
+/*
+** Free an outstanding memory allocation.
+*/
+void memsys3Free(void *pOld){
+  Mem3Block *p = (Mem3Block*)pOld;
+  int i;
+  u32 size, x;
+  assert( sqlite3_mutex_held(mem.mutex) );
+  assert( p>mem.aPool && p<&mem.aPool[SQLITE_MEMORY_SIZE/8] );
+  i = p - mem.aPool;
+  assert( (mem.aPool[i-1].u.hdr.size4x&1)==1 );
+  size = mem.aPool[i-1].u.hdr.size4x/4;
+  assert( i+size<=SQLITE_MEMORY_SIZE/8+1 );
+  mem.aPool[i-1].u.hdr.size4x &= ~1;
+  mem.aPool[i+size-1].u.hdr.prevSize = size;
+  mem.aPool[i+size-1].u.hdr.size4x &= ~2;
+  memsys3Link(i);
+
+  /* Try to expand the master using the newly freed chunk */
+  if( mem.iMaster ){
+    while( (mem.aPool[mem.iMaster-1].u.hdr.size4x&2)==0 ){
+      size = mem.aPool[mem.iMaster-1].u.hdr.prevSize;
+      mem.iMaster -= size;
+      mem.szMaster += size;
+      memsys3Unlink(mem.iMaster);
+      x = mem.aPool[mem.iMaster-1].u.hdr.size4x & 2;
+      mem.aPool[mem.iMaster-1].u.hdr.size4x = mem.szMaster*4 | x;
+      mem.aPool[mem.iMaster+mem.szMaster-1].u.hdr.prevSize = mem.szMaster;
+    }
+    x = mem.aPool[mem.iMaster-1].u.hdr.size4x & 2;
+    while( (mem.aPool[mem.iMaster+mem.szMaster-1].u.hdr.size4x&1)==0 ){
+      memsys3Unlink(mem.iMaster+mem.szMaster);
+      mem.szMaster += mem.aPool[mem.iMaster+mem.szMaster-1].u.hdr.size4x/4;
+      mem.aPool[mem.iMaster-1].u.hdr.size4x = mem.szMaster*4 | x;
+      mem.aPool[mem.iMaster+mem.szMaster-1].u.hdr.prevSize = mem.szMaster;
+    }
+  }
+}
+
+/*
+** Allocate nBytes of memory
+*/
+void *sqlite3_malloc(int nBytes){
+  sqlite3_int64 *p = 0;
+  if( nBytes>0 ){
+    memsys3Enter();
+    p = memsys3Malloc(nBytes);
+    sqlite3_mutex_leave(mem.mutex);
+  }
+  return (void*)p;
+}
+
+/*
+** Free memory.
+*/
+void sqlite3_free(void *pPrior){
+  if( pPrior==0 ){
+    return;
+  }
+  assert( mem.mutex!=0 );
+  sqlite3_mutex_enter(mem.mutex);
+  memsys3Free(pPrior);
+  sqlite3_mutex_leave(mem.mutex);
+}
+
+/*
+** Change the size of an existing memory allocation
+*/
+void *sqlite3_realloc(void *pPrior, int nBytes){
+  int nOld;
+  void *p;
+  if( pPrior==0 ){
+    return sqlite3_malloc(nBytes);
+  }
+  if( nBytes<=0 ){
+    sqlite3_free(pPrior);
+    return 0;
+  }
+  assert( mem.mutex!=0 );
+  nOld = sqlite3MallocSize(pPrior);
+  if( nBytes<=nOld && nBytes>=nOld-128 ){
+    return pPrior;
+  }
+  sqlite3_mutex_enter(mem.mutex);
+  p = memsys3Malloc(nBytes);
+  if( p ){
+    if( nOld<nBytes ){
+      memcpy(p, pPrior, nOld);
+    }else{
+      memcpy(p, pPrior, nBytes);
+    }
+    memsys3Free(pPrior);
+  }
+  sqlite3_mutex_leave(mem.mutex);
+  return p;
+}
+
+/*
+** Open the file indicated and write a log of all unfreed memory
+** allocations into that log.
+*/
+void sqlite3MemdebugDump(const char *zFilename){
+#ifdef SQLITE_DEBUG
+  FILE *out;
+  int i, j;
+  u32 size;
+  if( zFilename==0 || zFilename[0]==0 ){
+    out = stdout;
+  }else{
+    out = fopen(zFilename, "w");
+    if( out==0 ){
+      fprintf(stderr, "** Unable to output memory debug output log: %s **\n",
+                      zFilename);
+      return;
+    }
+  }
+  memsys3Enter();
+  fprintf(out, "CHUNKS:\n");
+  for(i=1; i<=SQLITE_MEMORY_SIZE/8; i+=size/4){
+    size = mem.aPool[i-1].u.hdr.size4x;
+    if( size/4<=1 ){
+      fprintf(out, "%p size error\n", &mem.aPool[i]);
+      assert( 0 );
+      break;
+    }
+    if( (size&1)==0 && mem.aPool[i+size/4-1].u.hdr.prevSize!=size/4 ){
+      fprintf(out, "%p tail size does not match\n", &mem.aPool[i]);
+      assert( 0 );
+      break;
+    }
+    if( ((mem.aPool[i+size/4-1].u.hdr.size4x&2)>>1)!=(size&1) ){
+      fprintf(out, "%p tail checkout bit is incorrect\n", &mem.aPool[i]);
+      assert( 0 );
+      break;
+    }
+    if( size&1 ){
+      fprintf(out, "%p %6d bytes checked out\n", &mem.aPool[i], (size/4)*8-8);
+    }else{
+      fprintf(out, "%p %6d bytes free%s\n", &mem.aPool[i], (size/4)*8-8,
+                  i==mem.iMaster ? " **master**" : "");
+    }
+  }
+  for(i=0; i<MX_SMALL-1; i++){
+    if( mem.aiSmall[i]==0 ) continue;
+    fprintf(out, "small(%2d):", i);
+    for(j = mem.aiSmall[i]; j>0; j=mem.aPool[j].u.list.next){
+      fprintf(out, " %p(%d)", &mem.aPool[j],
+              (mem.aPool[j-1].u.hdr.size4x/4)*8-8);
+    }
+    fprintf(out, "\n");
+  }
+  for(i=0; i<N_HASH; i++){
+    if( mem.aiHash[i]==0 ) continue;
+    fprintf(out, "hash(%2d):", i);
+    for(j = mem.aiHash[i]; j>0; j=mem.aPool[j].u.list.next){
+      fprintf(out, " %p(%d)", &mem.aPool[j],
+              (mem.aPool[j-1].u.hdr.size4x/4)*8-8);
+    }
+    fprintf(out, "\n");
+  }
+  fprintf(out, "master=%d\n", mem.iMaster);
+  fprintf(out, "nowUsed=%d\n", SQLITE_MEMORY_SIZE - mem.szMaster*8);
+  fprintf(out, "mxUsed=%d\n", SQLITE_MEMORY_SIZE - mem.mnMaster*8);
+  sqlite3_mutex_leave(mem.mutex);
+  if( out==stdout ){
+    fflush(stdout);
+  }else{
+    fclose(out);
+  }
+#endif
+}
+
+
+#endif /* !SQLITE_MEMORY_SIZE */
diff --git a/uppsrc/plugin/sqlite3/lib/mem4.c b/uppsrc/plugin/sqlite3/lib/mem4.c
new file mode 100644
index 000000000..32b50f2b1
--- /dev/null
+++ b/uppsrc/plugin/sqlite3/lib/mem4.c
@@ -0,0 +1,393 @@
+/*
+** 2007 August 14
+**
+** The author disclaims copyright to this source code.  In place of
+** a legal notice, here is a blessing:
+**
+**    May you do good and not evil.
+**    May you find forgiveness for yourself and forgive others.
+**    May you share freely, never taking more than you give.
+**
+*************************************************************************
+** This file contains the C functions that implement a memory
+** allocation subsystem for use by SQLite.
+**
+** $Id: mem4.c,v 1.2 2008/02/14 23:26:56 drh Exp $
+*/
+#include "sqliteInt.h"
+
+/*
+** This version of the memory allocator attempts to obtain memory
+** from mmap() if the size of the allocation is close to the size
+** of a virtual memory page.  If the size of the allocation is different
+** from the virtual memory page size, then ordinary malloc() is used.
+** Ordinary malloc is also used if space allocated to mmap() is
+** exhausted.
+**
+** Enable this memory allocation by compiling with -DSQLITE_MMAP_HEAP_SIZE=nnn
+** where nnn is the maximum number of bytes of mmap-ed memory you want
+** to support.   This module may choose to use less memory than requested.
+**
+*/
+#ifdef SQLITE_MMAP_HEAP_SIZE
+
+/*
+** This is a test version of the memory allocator that attempts to
+** use mmap() and madvise() for allocations and frees of approximately
+** the virtual memory page size.
+*/
+#include <sys/types.h>
+#include <sys/mman.h>
+#include <errno.h>
+#include <unistd.h>
+
+
+/*
+** All of the static variables used by this module are collected
+** into a single structure named "mem".  This is to keep the
+** static variables organized and to reduce namespace pollution
+** when this module is combined with other in the amalgamation.
+*/
+static struct {
+  /*
+  ** The alarm callback and its arguments.  The mem.mutex lock will
+  ** be held while the callback is running.  Recursive calls into
+  ** the memory subsystem are allowed, but no new callbacks will be
+  ** issued.  The alarmBusy variable is set to prevent recursive
+  ** callbacks.
+  */
+  sqlite3_int64 alarmThreshold;
+  void (*alarmCallback)(void*, sqlite3_int64,int);
+  void *alarmArg;
+  int alarmBusy;
+
+  /*
+  ** Mutex to control access to the memory allocation subsystem.
+  */
+  sqlite3_mutex *mutex;
+
+  /*
+  ** Current allocation and high-water mark.
+  */
+  sqlite3_int64 nowUsed;
+  sqlite3_int64 mxUsed;
+
+  /*
+  ** Current allocation and high-water marks for mmap allocated memory.
+  */
+  sqlite3_int64 nowUsedMMap;
+  sqlite3_int64 mxUsedMMap;
+
+  /*
+  ** Size of a single mmap page.  Obtained from sysconf().
+  */
+  int szPage;
+  int mnPage;
+
+  /*
+  ** The number of available mmap pages.
+  */
+  int nPage;
+
+  /*
+  ** Index of the first free page.  0 means no pages have been freed.
+  */
+  int firstFree;
+
+  /* First unused page on the top of the heap.
+  */
+  int firstUnused;
+
+  /*
+  ** Bulk memory obtained from from mmap().
+  */
+  char *mmapHeap;   /* first byte of the heap */
+
+} mem;
+
+
+/*
+** Enter the mutex mem.mutex. Allocate it if it is not already allocated.
+** The mmap() region is initialized the first time this routine is called.
+*/
+static void memsys4Enter(void){
+  if( mem.mutex==0 ){
+    mem.mutex = sqlite3_mutex_alloc(SQLITE_MUTEX_STATIC_MEM);
+  }
+  sqlite3_mutex_enter(mem.mutex);
+}
+
+/*
+** Attempt to free memory to the mmap heap.  This only works if
+** the pointer p is within the range of memory addresses that
+** comprise the mmap heap.  Return 1 if the memory was freed
+** successfully.  Return 0 if the pointer is out of range.
+*/
+static int mmapFree(void *p){
+  char *z;
+  int idx, *a;
+  if( mem.mmapHeap==MAP_FAILED || mem.nPage==0 ){
+    return 0;
+  }
+  z = (char*)p;
+  idx = (z - mem.mmapHeap)/mem.szPage;
+  if( idx<1 || idx>=mem.nPage ){
+    return 0;
+  }
+  a = (int*)mem.mmapHeap;
+  a[idx] = a[mem.firstFree];
+  mem.firstFree = idx;
+  mem.nowUsedMMap -= mem.szPage;
+  madvise(p, mem.szPage, MADV_DONTNEED);
+  return 1;
+}
+
+/*
+** Attempt to allocate nBytes from the mmap heap.  Return a pointer
+** to the allocated page.  Or, return NULL if the allocation fails.
+**
+** The allocation will fail if nBytes is not the right size.
+** Or, the allocation will fail if the mmap heap has been exhausted.
+*/
+static void *mmapAlloc(int nBytes){
+  int idx = 0;
+  if( nBytes>mem.szPage || nBytes<mem.mnPage ){
+    return 0;
+  }
+  if( mem.nPage==0 ){
+    mem.szPage = sysconf(_SC_PAGE_SIZE);
+    mem.mnPage = mem.szPage - mem.szPage/10;
+    mem.nPage = SQLITE_MMAP_HEAP_SIZE/mem.szPage;
+    if( mem.nPage * sizeof(int) > mem.szPage ){
+      mem.nPage = mem.szPage/sizeof(int);
+    }
+    mem.mmapHeap =  mmap(0, mem.szPage*mem.nPage, PROT_WRITE|PROT_READ,
+                         MAP_ANONYMOUS|MAP_SHARED, -1, 0);
+    if( mem.mmapHeap==MAP_FAILED ){
+      mem.firstUnused = errno;
+    }else{
+      mem.firstUnused = 1;
+      mem.nowUsedMMap = mem.szPage;
+    }
+  }
+  if( mem.mmapHeap==MAP_FAILED ){
+    return 0;
+  }
+  if( mem.firstFree ){
+    int idx = mem.firstFree;
+    int *a = (int*)mem.mmapHeap;
+    mem.firstFree = a[idx];
+  }else if( mem.firstUnused<mem.nPage ){
+    idx = mem.firstUnused++;
+  }
+  if( idx ){
+    mem.nowUsedMMap += mem.szPage;
+    if( mem.nowUsedMMap>mem.mxUsedMMap ){
+      mem.mxUsedMMap = mem.nowUsedMMap;
+    }
+    return (void*)&mem.mmapHeap[idx*mem.szPage];
+  }else{
+    return 0;
+  }
+}
+
+/*
+** Release the mmap-ed memory region if it is currently allocated and
+** is not in use.
+*/
+static void mmapUnmap(void){
+  if( mem.mmapHeap==MAP_FAILED ) return;
+  if( mem.nPage==0 ) return;
+  if( mem.nowUsedMMap>mem.szPage ) return;
+  munmap(mem.mmapHeap, mem.nPage*mem.szPage);
+  mem.nowUsedMMap = 0;
+  mem.nPage = 0;
+}
+
+
+/*
+** Return the amount of memory currently checked out.
+*/
+sqlite3_int64 sqlite3_memory_used(void){
+  sqlite3_int64 n;
+  memsys4Enter();
+  n = mem.nowUsed + mem.nowUsedMMap;
+  sqlite3_mutex_leave(mem.mutex);
+  return n;
+}
+
+/*
+** Return the maximum amount of memory that has ever been
+** checked out since either the beginning of this process
+** or since the most recent reset.
+*/
+sqlite3_int64 sqlite3_memory_highwater(int resetFlag){
+  sqlite3_int64 n;
+  memsys4Enter();
+  n = mem.mxUsed + mem.mxUsedMMap;
+  if( resetFlag ){
+    mem.mxUsed = mem.nowUsed;
+    mem.mxUsedMMap = mem.nowUsedMMap;
+  }
+  sqlite3_mutex_leave(mem.mutex);
+  return n;
+}
+
+/*
+** Change the alarm callback
+*/
+int sqlite3_memory_alarm(
+  void(*xCallback)(void *pArg, sqlite3_int64 used,int N),
+  void *pArg,
+  sqlite3_int64 iThreshold
+){
+  memsys4Enter();
+  mem.alarmCallback = xCallback;
+  mem.alarmArg = pArg;
+  mem.alarmThreshold = iThreshold;
+  sqlite3_mutex_leave(mem.mutex);
+  return SQLITE_OK;
+}
+
+/*
+** Trigger the alarm
+*/
+static void sqlite3MemsysAlarm(int nByte){
+  void (*xCallback)(void*,sqlite3_int64,int);
+  sqlite3_int64 nowUsed;
+  void *pArg;
+  if( mem.alarmCallback==0 || mem.alarmBusy  ) return;
+  mem.alarmBusy = 1;
+  xCallback = mem.alarmCallback;
+  nowUsed = mem.nowUsed;
+  pArg = mem.alarmArg;
+  sqlite3_mutex_leave(mem.mutex);
+  xCallback(pArg, nowUsed, nByte);
+  sqlite3_mutex_enter(mem.mutex);
+  mem.alarmBusy = 0;
+}
+
+/*
+** Allocate nBytes of memory
+*/
+static void *memsys4Malloc(int nBytes){
+  sqlite3_int64 *p = 0;
+  if( mem.alarmCallback!=0
+         && mem.nowUsed+mem.nowUsedMMap+nBytes>=mem.alarmThreshold ){
+    sqlite3MemsysAlarm(nBytes);
+  }
+  if( (p = mmapAlloc(nBytes))==0 ){
+    p = malloc(nBytes+8);
+    if( p==0 ){
+      sqlite3MemsysAlarm(nBytes);
+      p = malloc(nBytes+8);
+    }
+    if( p ){
+      p[0] = nBytes;
+      p++;
+      mem.nowUsed += nBytes;
+      if( mem.nowUsed>mem.mxUsed ){
+        mem.mxUsed = mem.nowUsed;
+      }
+    }
+  }
+  return (void*)p;
+}
+
+/*
+** Return the size of a memory allocation
+*/
+static int memsys4Size(void *pPrior){
+  char *z = (char*)pPrior;
+  int idx = mem.nPage ? (z - mem.mmapHeap)/mem.szPage : 0;
+  int nByte;
+  if( idx>=1 && idx<mem.nPage ){
+    nByte = mem.szPage;
+  }else{
+    sqlite3_int64 *p = pPrior;
+    p--;
+    nByte = (int)*p;
+  }
+  return nByte;
+}
+
+/*
+** Free memory.
+*/
+static void memsys4Free(void *pPrior){
+  sqlite3_int64 *p;
+  int nByte;
+  if( mmapFree(pPrior)==0 ){
+    p = pPrior;
+    p--;
+    nByte = (int)*p;
+    mem.nowUsed -= nByte;
+    free(p);
+    if( mem.nowUsed==0 ){
+      mmapUnmap();
+    }
+  }
+}
+
+/*
+** Allocate nBytes of memory
+*/
+void *sqlite3_malloc(int nBytes){
+  sqlite3_int64 *p = 0;
+  if( nBytes>0 ){
+    memsys4Enter();
+    p = memsys4Malloc(nBytes);
+    sqlite3_mutex_leave(mem.mutex);
+  }
+  return (void*)p;
+}
+
+/*
+** Free memory.
+*/
+void sqlite3_free(void *pPrior){
+  if( pPrior==0 ){
+    return;
+  }
+  assert( mem.mutex!=0 );
+  sqlite3_mutex_enter(mem.mutex);
+  memsys4Free(pPrior);
+  sqlite3_mutex_leave(mem.mutex);
+}
+
+
+
+/*
+** Change the size of an existing memory allocation
+*/
+void *sqlite3_realloc(void *pPrior, int nBytes){
+  int nOld;
+  sqlite3_int64 *p;
+  if( pPrior==0 ){
+    return sqlite3_malloc(nBytes);
+  }
+  if( nBytes<=0 ){
+    sqlite3_free(pPrior);
+    return 0;
+  }
+  nOld = memsys4Size(pPrior);
+  if( nBytes<=nOld && nBytes>=nOld-128 ){
+    return pPrior;
+  }
+  assert( mem.mutex!=0 );
+  sqlite3_mutex_enter(mem.mutex);
+  p = memsys4Malloc(nBytes);
+  if( p ){
+    if( nOld<nBytes ){
+      memcpy(p, pPrior, nOld);
+    }else{
+      memcpy(p, pPrior, nBytes);
+    }
+    memsys4Free(pPrior);
+  }
+  assert( mem.mutex!=0 );
+  sqlite3_mutex_leave(mem.mutex);
+  return (void*)p;
+}
+
+#endif /* SQLITE_MMAP_HEAP_SIZE */
diff --git a/uppsrc/plugin/sqlite3/lib/mem5.c b/uppsrc/plugin/sqlite3/lib/mem5.c
new file mode 100644
index 000000000..934e408e4
--- /dev/null
+++ b/uppsrc/plugin/sqlite3/lib/mem5.c
@@ -0,0 +1,511 @@
+/*
+** 2007 October 14
+**
+** The author disclaims copyright to this source code.  In place of
+** a legal notice, here is a blessing:
+**
+**    May you do good and not evil.
+**    May you find forgiveness for yourself and forgive others.
+**    May you share freely, never taking more than you give.
+**
+*************************************************************************
+** This file contains the C functions that implement a memory
+** allocation subsystem for use by SQLite.
+**
+** This version of the memory allocation subsystem omits all
+** use of malloc().  All dynamically allocatable memory is
+** contained in a static array, mem.aPool[].  The size of this
+** fixed memory pool is SQLITE_POW2_MEMORY_SIZE bytes.
+**
+** This version of the memory allocation subsystem is used if
+** and only if SQLITE_POW2_MEMORY_SIZE is defined.
+**
+** $Id: mem5.c,v 1.4 2008/02/19 15:15:16 drh Exp $
+*/
+#include "sqliteInt.h"
+
+/*
+** This version of the memory allocator is used only when
+** SQLITE_POW2_MEMORY_SIZE is defined.
+*/
+#ifdef SQLITE_POW2_MEMORY_SIZE
+
+/*
+** Log2 of the minimum size of an allocation.  For example, if
+** 4 then all allocations will be rounded up to at least 16 bytes.
+** If 5 then all allocations will be rounded up to at least 32 bytes.
+*/
+#ifndef SQLITE_POW2_LOGMIN
+# define SQLITE_POW2_LOGMIN 6
+#endif
+#define POW2_MIN (1<<SQLITE_POW2_LOGMIN)
+
+/*
+** Log2 of the maximum size of an allocation.
+*/
+#ifndef SQLITE_POW2_LOGMAX
+# define SQLITE_POW2_LOGMAX 18
+#endif
+#define POW2_MAX (((unsigned int)1)<<SQLITE_POW2_LOGMAX)
+
+/*
+** Number of distinct allocation sizes.
+*/
+#define NSIZE (SQLITE_POW2_LOGMAX - SQLITE_POW2_LOGMIN + 1)
+
+/*
+** A minimum allocation is an instance of the following structure.
+** Larger allocations are an array of these structures where the
+** size of the array is a power of 2.
+*/
+typedef struct Mem5Block Mem5Block;
+struct Mem5Block {
+  union {
+    char aData[POW2_MIN];
+    struct {
+      int next;       /* Index in mem.aPool[] of next free chunk */
+      int prev;       /* Index in mem.aPool[] of previous free chunk */
+    } list;
+  } u;
+};
+
+/*
+** Number of blocks of memory available for allocation.
+*/
+#define NBLOCK (SQLITE_POW2_MEMORY_SIZE/POW2_MIN)
+
+/*
+** The size in blocks of an POW2_MAX allocation
+*/
+#define SZ_MAX (1<<(NSIZE-1))
+
+/*
+** Masks used for mem.aCtrl[] elements.
+*/
+#define CTRL_LOGSIZE  0x1f    /* Log2 Size of this block relative to POW2_MIN */
+#define CTRL_FREE     0x20    /* True if not checked out */
+
+/*
+** All of the static variables used by this module are collected
+** into a single structure named "mem".  This is to keep the
+** static variables organized and to reduce namespace pollution
+** when this module is combined with other in the amalgamation.
+*/
+static struct {
+  /*
+  ** The alarm callback and its arguments.  The mem.mutex lock will
+  ** be held while the callback is running.  Recursive calls into
+  ** the memory subsystem are allowed, but no new callbacks will be
+  ** issued.  The alarmBusy variable is set to prevent recursive
+  ** callbacks.
+  */
+  sqlite3_int64 alarmThreshold;
+  void (*alarmCallback)(void*, sqlite3_int64,int);
+  void *alarmArg;
+  int alarmBusy;
+
+  /*
+  ** Mutex to control access to the memory allocation subsystem.
+  */
+  sqlite3_mutex *mutex;
+
+  /*
+  ** Performance statistics
+  */
+  u64 nAlloc;         /* Total number of calls to malloc */
+  u64 totalAlloc;     /* Total of all malloc calls - includes internal frag */
+  u64 totalExcess;    /* Total internal fragmentation */
+  u32 currentOut;     /* Current checkout, including internal fragmentation */
+  u32 currentCount;   /* Current number of distinct checkouts */
+  u32 maxOut;         /* Maximum instantaneous currentOut */
+  u32 maxCount;       /* Maximum instantaneous currentCount */
+  u32 maxRequest;     /* Largest allocation (exclusive of internal frag) */
+
+  /*
+  ** Lists of free blocks of various sizes.
+  */
+  int aiFreelist[NSIZE];
+
+  /*
+  ** Space for tracking which blocks are checked out and the size
+  ** of each block.  One byte per block.
+  */
+  u8 aCtrl[NBLOCK];
+
+  /*
+  ** Memory available for allocation
+  */
+  Mem5Block aPool[NBLOCK];
+} mem;
+
+/*
+** Unlink the chunk at mem.aPool[i] from list it is currently
+** on.  It should be found on mem.aiFreelist[iLogsize].
+*/
+static void memsys5Unlink(int i, int iLogsize){
+  int next, prev;
+  assert( i>=0 && i<NBLOCK );
+  assert( iLogsize>=0 && iLogsize<NSIZE );
+  assert( (mem.aCtrl[i] & CTRL_LOGSIZE)==iLogsize );
+  assert( sqlite3_mutex_held(mem.mutex) );
+
+  next = mem.aPool[i].u.list.next;
+  prev = mem.aPool[i].u.list.prev;
+  if( prev<0 ){
+    mem.aiFreelist[iLogsize] = next;
+  }else{
+    mem.aPool[prev].u.list.next = next;
+  }
+  if( next>=0 ){
+    mem.aPool[next].u.list.prev = prev;
+  }
+}
+
+/*
+** Link the chunk at mem.aPool[i] so that is on the iLogsize
+** free list.
+*/
+static void memsys5Link(int i, int iLogsize){
+  int x;
+  assert( sqlite3_mutex_held(mem.mutex) );
+  assert( i>=0 && i<NBLOCK );
+  assert( iLogsize>=0 && iLogsize<NSIZE );
+  assert( (mem.aCtrl[i] & CTRL_LOGSIZE)==iLogsize );
+
+  mem.aPool[i].u.list.next = x = mem.aiFreelist[iLogsize];
+  mem.aPool[i].u.list.prev = -1;
+  if( x>=0 ){
+    assert( x<NBLOCK );
+    mem.aPool[x].u.list.prev = i;
+  }
+  mem.aiFreelist[iLogsize] = i;
+}
+
+/*
+** Enter the mutex mem.mutex. Allocate it if it is not already allocated.
+**
+** Also:  Initialize the memory allocation subsystem the first time
+** this routine is called.
+*/
+static void memsys5Enter(void){
+  if( mem.mutex==0 ){
+    int i;
+    assert( sizeof(Mem5Block)==POW2_MIN );
+    assert( (SQLITE_POW2_MEMORY_SIZE % POW2_MAX)==0 );
+    assert( SQLITE_POW2_MEMORY_SIZE>=POW2_MAX );
+    mem.mutex = sqlite3_mutex_alloc(SQLITE_MUTEX_STATIC_MEM);
+    sqlite3_mutex_enter(mem.mutex);
+    for(i=0; i<NSIZE; i++) mem.aiFreelist[i] = -1;
+    for(i=0; i<=NBLOCK-SZ_MAX; i += SZ_MAX){
+      mem.aCtrl[i] = (NSIZE-1) | CTRL_FREE;
+      memsys5Link(i, NSIZE-1);
+    }
+  }else{
+    sqlite3_mutex_enter(mem.mutex);
+  }
+}
+
+/*
+** Return the amount of memory currently checked out.
+*/
+sqlite3_int64 sqlite3_memory_used(void){
+  return mem.currentOut;
+}
+
+/*
+** Return the maximum amount of memory that has ever been
+** checked out since either the beginning of this process
+** or since the most recent reset.
+*/
+sqlite3_int64 sqlite3_memory_highwater(int resetFlag){
+  sqlite3_int64 n;
+  memsys5Enter();
+  n = mem.maxOut;
+  if( resetFlag ){
+    mem.maxOut = mem.currentOut;
+  }
+  sqlite3_mutex_leave(mem.mutex);
+  return n;
+}
+
+
+/*
+** Trigger the alarm
+*/
+static void memsys5Alarm(int nByte){
+  void (*xCallback)(void*,sqlite3_int64,int);
+  sqlite3_int64 nowUsed;
+  void *pArg;
+  if( mem.alarmCallback==0 || mem.alarmBusy  ) return;
+  mem.alarmBusy = 1;
+  xCallback = mem.alarmCallback;
+  nowUsed = mem.currentOut;
+  pArg = mem.alarmArg;
+  sqlite3_mutex_leave(mem.mutex);
+  xCallback(pArg, nowUsed, nByte);
+  sqlite3_mutex_enter(mem.mutex);
+  mem.alarmBusy = 0;
+}
+
+/*
+** Change the alarm callback.
+**
+** This is a no-op for the static memory allocator.  The purpose
+** of the memory alarm is to support sqlite3_soft_heap_limit().
+** But with this memory allocator, the soft_heap_limit is really
+** a hard limit that is fixed at SQLITE_POW2_MEMORY_SIZE.
+*/
+int sqlite3_memory_alarm(
+  void(*xCallback)(void *pArg, sqlite3_int64 used,int N),
+  void *pArg,
+  sqlite3_int64 iThreshold
+){
+  memsys5Enter();
+  mem.alarmCallback = xCallback;
+  mem.alarmArg = pArg;
+  mem.alarmThreshold = iThreshold;
+  sqlite3_mutex_leave(mem.mutex);
+  return SQLITE_OK;
+}
+
+/*
+** Return the size of an outstanding allocation, in bytes.  The
+** size returned omits the 8-byte header overhead.  This only
+** works for chunks that are currently checked out.
+*/
+int sqlite3MallocSize(void *p){
+  int iSize = 0;
+  if( p ){
+    int i = ((Mem5Block*)p) - mem.aPool;
+    assert( i>=0 && i<NBLOCK );
+    iSize = 1 << ((mem.aCtrl[i]&CTRL_LOGSIZE) + SQLITE_POW2_LOGMIN);
+  }
+  return iSize;
+}
+
+/*
+** Find the first entry on the freelist iLogsize.  Unlink that
+** entry and return its index.
+*/
+static int memsys5UnlinkFirst(int iLogsize){
+  int i;
+  int iFirst;
+
+  assert( iLogsize>=0 && iLogsize<NSIZE );
+  i = iFirst = mem.aiFreelist[iLogsize];
+  assert( iFirst>=0 );
+  while( i>0 ){
+    if( i<iFirst ) iFirst = i;
+    i = mem.aPool[i].u.list.next;
+  }
+  memsys5Unlink(iFirst, iLogsize);
+  return iFirst;
+}
+
+/*
+** Return a block of memory of at least nBytes in size.
+** Return NULL if unable.
+*/
+static void *memsys5Malloc(int nByte){
+  int i;           /* Index of a mem.aPool[] slot */
+  int iBin;        /* Index into mem.aiFreelist[] */
+  int iFullSz;     /* Size of allocation rounded up to power of 2 */
+  int iLogsize;    /* Log2 of iFullSz/POW2_MIN */
+
+  assert( sqlite3_mutex_held(mem.mutex) );
+
+  /* Keep track of the maximum allocation request.  Even unfulfilled
+  ** requests are counted */
+  if( nByte>mem.maxRequest ){
+    mem.maxRequest = nByte;
+  }
+
+  /* Simulate a memory allocation fault */
+  if( sqlite3FaultStep(SQLITE_FAULTINJECTOR_MALLOC) ) return 0;
+
+  /* Round nByte up to the next valid power of two */
+  if( nByte>POW2_MAX ) return 0;
+  for(iFullSz=POW2_MIN, iLogsize=0; iFullSz<nByte; iFullSz *= 2, iLogsize++){}
+
+  /* If we will be over the memory alarm threshold after this allocation,
+  ** then trigger the memory overflow alarm */
+  if( mem.alarmCallback!=0 && mem.currentOut+iFullSz>=mem.alarmThreshold ){
+    memsys5Alarm(iFullSz);
+  }
+
+  /* Make sure mem.aiFreelist[iLogsize] contains at least one free
+  ** block.  If not, then split a block of the next larger power of
+  ** two in order to create a new free block of size iLogsize.
+  */
+  for(iBin=iLogsize; mem.aiFreelist[iBin]<0 && iBin<NSIZE; iBin++){}
+  if( iBin>=NSIZE ) return 0;
+  i = memsys5UnlinkFirst(iBin);
+  while( iBin>iLogsize ){
+    int newSize;
+
+    iBin--;
+    newSize = 1 << iBin;
+    mem.aCtrl[i+newSize] = CTRL_FREE | iBin;
+    memsys5Link(i+newSize, iBin);
+  }
+  mem.aCtrl[i] = iLogsize;
+
+  /* Update allocator performance statistics. */
+  mem.nAlloc++;
+  mem.totalAlloc += iFullSz;
+  mem.totalExcess += iFullSz - nByte;
+  mem.currentCount++;
+  mem.currentOut += iFullSz;
+  if( mem.maxCount<mem.currentCount ) mem.maxCount = mem.currentCount;
+  if( mem.maxOut<mem.currentOut ) mem.maxOut = mem.currentOut;
+
+  /* Return a pointer to the allocated memory. */
+  return (void*)&mem.aPool[i];
+}
+
+/*
+** Free an outstanding memory allocation.
+*/
+void memsys5Free(void *pOld){
+  u32 size, iLogsize;
+  int i;
+
+  i = ((Mem5Block*)pOld) - mem.aPool;
+  assert( sqlite3_mutex_held(mem.mutex) );
+  assert( i>=0 && i<NBLOCK );
+  assert( (mem.aCtrl[i] & CTRL_FREE)==0 );
+  iLogsize = mem.aCtrl[i] & CTRL_LOGSIZE;
+  size = 1<<iLogsize;
+  assert( i+size-1<NBLOCK );
+  mem.aCtrl[i] |= CTRL_FREE;
+  mem.aCtrl[i+size-1] |= CTRL_FREE;
+  assert( mem.currentCount>0 );
+  assert( mem.currentOut>=0 );
+  mem.currentCount--;
+  mem.currentOut -= size*POW2_MIN;
+  assert( mem.currentOut>0 || mem.currentCount==0 );
+  assert( mem.currentCount>0 || mem.currentOut==0 );
+
+  mem.aCtrl[i] = CTRL_FREE | iLogsize;
+  while( iLogsize<NSIZE-1 ){
+    int iBuddy;
+
+    if( (i>>iLogsize) & 1 ){
+      iBuddy = i - size;
+    }else{
+      iBuddy = i + size;
+    }
+    assert( iBuddy>=0 && iBuddy<NBLOCK );
+    if( mem.aCtrl[iBuddy]!=(CTRL_FREE | iLogsize) ) break;
+    memsys5Unlink(iBuddy, iLogsize);
+    iLogsize++;
+    if( iBuddy<i ){
+      mem.aCtrl[iBuddy] = CTRL_FREE | iLogsize;
+      mem.aCtrl[i] = 0;
+      i = iBuddy;
+    }else{
+      mem.aCtrl[i] = CTRL_FREE | iLogsize;
+      mem.aCtrl[iBuddy] = 0;
+    }
+    size *= 2;
+  }
+  memsys5Link(i, iLogsize);
+}
+
+/*
+** Allocate nBytes of memory
+*/
+void *sqlite3_malloc(int nBytes){
+  sqlite3_int64 *p = 0;
+  if( nBytes>0 ){
+    memsys5Enter();
+    p = memsys5Malloc(nBytes);
+    sqlite3_mutex_leave(mem.mutex);
+  }
+  return (void*)p;
+}
+
+/*
+** Free memory.
+*/
+void sqlite3_free(void *pPrior){
+  if( pPrior==0 ){
+    return;
+  }
+  assert( mem.mutex!=0 );
+  sqlite3_mutex_enter(mem.mutex);
+  memsys5Free(pPrior);
+  sqlite3_mutex_leave(mem.mutex);
+}
+
+/*
+** Change the size of an existing memory allocation
+*/
+void *sqlite3_realloc(void *pPrior, int nBytes){
+  int nOld;
+  void *p;
+  if( pPrior==0 ){
+    return sqlite3_malloc(nBytes);
+  }
+  if( nBytes<=0 ){
+    sqlite3_free(pPrior);
+    return 0;
+  }
+  assert( mem.mutex!=0 );
+  nOld = sqlite3MallocSize(pPrior);
+  if( nBytes<=nOld ){
+    return pPrior;
+  }
+  sqlite3_mutex_enter(mem.mutex);
+  p = memsys5Malloc(nBytes);
+  if( p ){
+    memcpy(p, pPrior, nOld);
+    memsys5Free(pPrior);
+  }
+  sqlite3_mutex_leave(mem.mutex);
+  return p;
+}
+
+/*
+** Open the file indicated and write a log of all unfreed memory
+** allocations into that log.
+*/
+void sqlite3MemdebugDump(const char *zFilename){
+#ifdef SQLITE_DEBUG
+  FILE *out;
+  int i, j, n;
+
+  if( zFilename==0 || zFilename[0]==0 ){
+    out = stdout;
+  }else{
+    out = fopen(zFilename, "w");
+    if( out==0 ){
+      fprintf(stderr, "** Unable to output memory debug output log: %s **\n",
+                      zFilename);
+      return;
+    }
+  }
+  memsys5Enter();
+  for(i=0; i<NSIZE; i++){
+    for(n=0, j=mem.aiFreelist[i]; j>=0; j = mem.aPool[j].u.list.next, n++){}
+    fprintf(out, "freelist items of size %d: %d\n", POW2_MIN << i, n);
+  }
+  fprintf(out, "mem.nAlloc       = %llu\n", mem.nAlloc);
+  fprintf(out, "mem.totalAlloc   = %llu\n", mem.totalAlloc);
+  fprintf(out, "mem.totalExcess  = %llu\n", mem.totalExcess);
+  fprintf(out, "mem.currentOut   = %u\n", mem.currentOut);
+  fprintf(out, "mem.currentCount = %u\n", mem.currentCount);
+  fprintf(out, "mem.maxOut       = %u\n", mem.maxOut);
+  fprintf(out, "mem.maxCount     = %u\n", mem.maxCount);
+  fprintf(out, "mem.maxRequest   = %u\n", mem.maxRequest);
+  sqlite3_mutex_leave(mem.mutex);
+  if( out==stdout ){
+    fflush(stdout);
+  }else{
+    fclose(out);
+  }
+#endif
+}
+
+
+#endif /* !SQLITE_POW2_MEMORY_SIZE */
diff --git a/uppsrc/plugin/sqlite3/lib/mutex.c b/uppsrc/plugin/sqlite3/lib/mutex.c
new file mode 100644
index 000000000..ecbd4952c
--- /dev/null
+++ b/uppsrc/plugin/sqlite3/lib/mutex.c
@@ -0,0 +1,126 @@
+/*
+** 2007 August 14
+**
+** The author disclaims copyright to this source code.  In place of
+** a legal notice, here is a blessing:
+**
+**    May you do good and not evil.
+**    May you find forgiveness for yourself and forgive others.
+**    May you share freely, never taking more than you give.
+**
+*************************************************************************
+** This file contains the C functions that implement mutexes.
+**
+** The implementation in this file does not provide any mutual
+** exclusion and is thus suitable for use only in applications
+** that use SQLite in a single thread.  But this implementation
+** does do a lot of error checking on mutexes to make sure they
+** are called correctly and at appropriate times.  Hence, this
+** implementation is suitable for testing.
+** debugging purposes
+**
+** $Id: mutex.c,v 1.16 2007/09/10 16:13:00 danielk1977 Exp $
+*/
+#include "sqliteInt.h"
+
+#ifdef SQLITE_MUTEX_NOOP_DEBUG
+/*
+** In this implementation, mutexes do not provide any mutual exclusion.
+** But the error checking is provided.  This implementation is useful
+** for test purposes.
+*/
+
+/*
+** The mutex object
+*/
+struct sqlite3_mutex {
+  int id;     /* The mutex type */
+  int cnt;    /* Number of entries without a matching leave */
+};
+
+/*
+** The sqlite3_mutex_alloc() routine allocates a new
+** mutex and returns a pointer to it.  If it returns NULL
+** that means that a mutex could not be allocated.
+*/
+sqlite3_mutex *sqlite3_mutex_alloc(int id){
+  static sqlite3_mutex aStatic[5];
+  sqlite3_mutex *pNew = 0;
+  switch( id ){
+    case SQLITE_MUTEX_FAST:
+    case SQLITE_MUTEX_RECURSIVE: {
+      pNew = sqlite3_malloc(sizeof(*pNew));
+      if( pNew ){
+        pNew->id = id;
+        pNew->cnt = 0;
+      }
+      break;
+    }
+    default: {
+      assert( id-2 >= 0 );
+      assert( id-2 < sizeof(aStatic)/sizeof(aStatic[0]) );
+      pNew = &aStatic[id-2];
+      pNew->id = id;
+      break;
+    }
+  }
+  return pNew;
+}
+
+/*
+** This routine deallocates a previously allocated mutex.
+*/
+void sqlite3_mutex_free(sqlite3_mutex *p){
+  assert( p );
+  assert( p->cnt==0 );
+  assert( p->id==SQLITE_MUTEX_FAST || p->id==SQLITE_MUTEX_RECURSIVE );
+  sqlite3_free(p);
+}
+
+/*
+** The sqlite3_mutex_enter() and sqlite3_mutex_try() routines attempt
+** to enter a mutex.  If another thread is already within the mutex,
+** sqlite3_mutex_enter() will block and sqlite3_mutex_try() will return
+** SQLITE_BUSY.  The sqlite3_mutex_try() interface returns SQLITE_OK
+** upon successful entry.  Mutexes created using SQLITE_MUTEX_RECURSIVE can
+** be entered multiple times by the same thread.  In such cases the,
+** mutex must be exited an equal number of times before another thread
+** can enter.  If the same thread tries to enter any other kind of mutex
+** more than once, the behavior is undefined.
+*/
+void sqlite3_mutex_enter(sqlite3_mutex *p){
+  assert( p );
+  assert( p->id==SQLITE_MUTEX_RECURSIVE || sqlite3_mutex_notheld(p) );
+  p->cnt++;
+}
+int sqlite3_mutex_try(sqlite3_mutex *p){
+  assert( p );
+  assert( p->id==SQLITE_MUTEX_RECURSIVE || sqlite3_mutex_notheld(p) );
+  p->cnt++;
+  return SQLITE_OK;
+}
+
+/*
+** The sqlite3_mutex_leave() routine exits a mutex that was
+** previously entered by the same thread.  The behavior
+** is undefined if the mutex is not currently entered or
+** is not currently allocated.  SQLite will never do either.
+*/
+void sqlite3_mutex_leave(sqlite3_mutex *p){
+  assert( p );
+  assert( sqlite3_mutex_held(p) );
+  p->cnt--;
+  assert( p->id==SQLITE_MUTEX_RECURSIVE || sqlite3_mutex_notheld(p) );
+}
+
+/*
+** The sqlite3_mutex_held() and sqlite3_mutex_notheld() routine are
+** intended for use inside assert() statements.
+*/
+int sqlite3_mutex_held(sqlite3_mutex *p){
+  return p==0 || p->cnt>0;
+}
+int sqlite3_mutex_notheld(sqlite3_mutex *p){
+  return p==0 || p->cnt==0;
+}
+#endif /* SQLITE_MUTEX_NOOP_DEBUG */
diff --git a/uppsrc/plugin/sqlite3/lib/mutex.h b/uppsrc/plugin/sqlite3/lib/mutex.h
new file mode 100644
index 000000000..6b672f934
--- /dev/null
+++ b/uppsrc/plugin/sqlite3/lib/mutex.h
@@ -0,0 +1,82 @@
+/*
+** 2007 August 28
+**
+** The author disclaims copyright to this source code.  In place of
+** a legal notice, here is a blessing:
+**
+**    May you do good and not evil.
+**    May you find forgiveness for yourself and forgive others.
+**    May you share freely, never taking more than you give.
+**
+*************************************************************************
+**
+** This file contains the common header for all mutex implementations.
+** The sqliteInt.h header #includes this file so that it is available
+** to all source files.  We break it out in an effort to keep the code
+** better organized.
+**
+** NOTE:  source files should *not* #include this header file directly.
+** Source files should #include the sqliteInt.h file and let that file
+** include this one indirectly.
+**
+** $Id: mutex.h,v 1.2 2007/08/30 14:10:30 drh Exp $
+*/
+
+
+#ifdef SQLITE_MUTEX_APPDEF
+/*
+** If SQLITE_MUTEX_APPDEF is defined, then this whole module is
+** omitted and equivalent functionality must be provided by the
+** application that links against the SQLite library.
+*/
+#else
+/*
+** Figure out what version of the code to use.  The choices are
+**
+**   SQLITE_MUTEX_NOOP         For single-threaded applications that
+**                             do not desire error checking.
+**
+**   SQLITE_MUTEX_NOOP_DEBUG   For single-threaded applications with
+**                             error checking to help verify that mutexes
+**                             are being used correctly even though they
+**                             are not needed.  Used when SQLITE_DEBUG is
+**                             defined on single-threaded builds.
+**
+**   SQLITE_MUTEX_PTHREADS     For multi-threaded applications on Unix.
+**
+**   SQLITE_MUTEX_W32          For multi-threaded applications on Win32.
+**
+**   SQLITE_MUTEX_OS2          For multi-threaded applications on OS/2.
+*/
+#define SQLITE_MUTEX_NOOP 1   /* The default */
+#if defined(SQLITE_DEBUG) && !SQLITE_THREADSAFE
+# undef SQLITE_MUTEX_NOOP
+# define SQLITE_MUTEX_NOOP_DEBUG
+#endif
+#if defined(SQLITE_MUTEX_NOOP) && SQLITE_THREADSAFE && OS_UNIX
+# undef SQLITE_MUTEX_NOOP
+# define SQLITE_MUTEX_PTHREADS
+#endif
+#if defined(SQLITE_MUTEX_NOOP) && SQLITE_THREADSAFE && OS_WIN
+# undef SQLITE_MUTEX_NOOP
+# define SQLITE_MUTEX_W32
+#endif
+#if defined(SQLITE_MUTEX_NOOP) && SQLITE_THREADSAFE && OS_OS2
+# undef SQLITE_MUTEX_NOOP
+# define SQLITE_MUTEX_OS2
+#endif
+
+#ifdef SQLITE_MUTEX_NOOP
+/*
+** If this is a no-op implementation, implement everything as macros.
+*/
+#define sqlite3_mutex_alloc(X)    ((sqlite3_mutex*)8)
+#define sqlite3_mutex_free(X)
+#define sqlite3_mutex_enter(X)
+#define sqlite3_mutex_try(X)      SQLITE_OK
+#define sqlite3_mutex_leave(X)
+#define sqlite3_mutex_held(X)     1
+#define sqlite3_mutex_notheld(X)  1
+#endif
+
+#endif /* SQLITE_MUTEX_APPDEF */
diff --git a/uppsrc/plugin/sqlite3/lib/mutex_os2.c b/uppsrc/plugin/sqlite3/lib/mutex_os2.c
new file mode 100644
index 000000000..dd0058dbe
--- /dev/null
+++ b/uppsrc/plugin/sqlite3/lib/mutex_os2.c
@@ -0,0 +1,245 @@
+/*
+** 2007 August 28
+**
+** The author disclaims copyright to this source code.  In place of
+** a legal notice, here is a blessing:
+**
+**    May you do good and not evil.
+**    May you find forgiveness for yourself and forgive others.
+**    May you share freely, never taking more than you give.
+**
+*************************************************************************
+** This file contains the C functions that implement mutexes for OS/2
+**
+** $Id: mutex_os2.c,v 1.5 2008/02/01 19:42:38 pweilbacher Exp $
+*/
+#include "sqliteInt.h"
+
+/*
+** The code in this file is only used if SQLITE_MUTEX_OS2 is defined.
+** See the mutex.h file for details.
+*/
+#ifdef SQLITE_MUTEX_OS2
+
+/********************** OS/2 Mutex Implementation **********************
+**
+** This implementation of mutexes is built using the OS/2 API.
+*/
+
+/*
+** The mutex object
+** Each recursive mutex is an instance of the following structure.
+*/
+struct sqlite3_mutex {
+  HMTX mutex;       /* Mutex controlling the lock */
+  int  id;          /* Mutex type */
+  int  nRef;        /* Number of references */
+  TID  owner;       /* Thread holding this mutex */
+};
+
+#define OS2_MUTEX_INITIALIZER   0,0,0,0
+
+/*
+** The sqlite3_mutex_alloc() routine allocates a new
+** mutex and returns a pointer to it.  If it returns NULL
+** that means that a mutex could not be allocated.
+** SQLite will unwind its stack and return an error.  The argument
+** to sqlite3_mutex_alloc() is one of these integer constants:
+**
+** <ul>
+** <li>  SQLITE_MUTEX_FAST               0
+** <li>  SQLITE_MUTEX_RECURSIVE          1
+** <li>  SQLITE_MUTEX_STATIC_MASTER      2
+** <li>  SQLITE_MUTEX_STATIC_MEM         3
+** <li>  SQLITE_MUTEX_STATIC_PRNG        4
+** </ul>
+**
+** The first two constants cause sqlite3_mutex_alloc() to create
+** a new mutex.  The new mutex is recursive when SQLITE_MUTEX_RECURSIVE
+** is used but not necessarily so when SQLITE_MUTEX_FAST is used.
+** The mutex implementation does not need to make a distinction
+** between SQLITE_MUTEX_RECURSIVE and SQLITE_MUTEX_FAST if it does
+** not want to.  But SQLite will only request a recursive mutex in
+** cases where it really needs one.  If a faster non-recursive mutex
+** implementation is available on the host platform, the mutex subsystem
+** might return such a mutex in response to SQLITE_MUTEX_FAST.
+**
+** The other allowed parameters to sqlite3_mutex_alloc() each return
+** a pointer to a static preexisting mutex.  Three static mutexes are
+** used by the current version of SQLite.  Future versions of SQLite
+** may add additional static mutexes.  Static mutexes are for internal
+** use by SQLite only.  Applications that use SQLite mutexes should
+** use only the dynamic mutexes returned by SQLITE_MUTEX_FAST or
+** SQLITE_MUTEX_RECURSIVE.
+**
+** Note that if one of the dynamic mutex parameters (SQLITE_MUTEX_FAST
+** or SQLITE_MUTEX_RECURSIVE) is used then sqlite3_mutex_alloc()
+** returns a different mutex on every call.  But for the static
+** mutex types, the same mutex is returned on every call that has
+** the same type number.
+*/
+sqlite3_mutex *sqlite3_mutex_alloc(int iType){
+  sqlite3_mutex *p = NULL;
+  switch( iType ){
+    case SQLITE_MUTEX_FAST:
+    case SQLITE_MUTEX_RECURSIVE: {
+      p = sqlite3MallocZero( sizeof(*p) );
+      if( p ){
+        p->id = iType;
+        if( DosCreateMutexSem( 0, &p->mutex, 0, FALSE ) != NO_ERROR ){
+          sqlite3_free( p );
+          p = NULL;
+        }
+      }
+      break;
+    }
+    default: {
+      static volatile int isInit = 0;
+      static sqlite3_mutex staticMutexes[] = {
+        { OS2_MUTEX_INITIALIZER, },
+        { OS2_MUTEX_INITIALIZER, },
+        { OS2_MUTEX_INITIALIZER, },
+        { OS2_MUTEX_INITIALIZER, },
+        { OS2_MUTEX_INITIALIZER, },
+      };
+      if ( !isInit ){
+        APIRET rc;
+        PTIB ptib;
+        PPIB ppib;
+        HMTX mutex;
+        char name[32];
+        DosGetInfoBlocks( &ptib, &ppib );
+        sqlite3_snprintf( sizeof(name), name, "\\SEM32\\SQLITE%04x",
+                          ppib->pib_ulpid );
+        while( !isInit ){
+          mutex = 0;
+          rc = DosCreateMutexSem( name, &mutex, 0, FALSE);
+          if( rc == NO_ERROR ){
+            int i;
+            if( !isInit ){
+              for( i = 0; i < sizeof(staticMutexes)/sizeof(staticMutexes[0]); i++ ){
+                DosCreateMutexSem( 0, &staticMutexes[i].mutex, 0, FALSE );
+              }
+              isInit = 1;
+            }
+            DosCloseMutexSem( mutex );
+          }else if( rc == ERROR_DUPLICATE_NAME ){
+            DosSleep( 1 );
+          }else{
+            return p;
+          }
+        }
+      }
+      assert( iType-2 >= 0 );
+      assert( iType-2 < sizeof(staticMutexes)/sizeof(staticMutexes[0]) );
+      p = &staticMutexes[iType-2];
+      p->id = iType;
+      break;
+    }
+  }
+  return p;
+}
+
+
+/*
+** This routine deallocates a previously allocated mutex.
+** SQLite is careful to deallocate every mutex that it allocates.
+*/
+void sqlite3_mutex_free(sqlite3_mutex *p){
+  assert( p );
+  assert( p->nRef==0 );
+  assert( p->id==SQLITE_MUTEX_FAST || p->id==SQLITE_MUTEX_RECURSIVE );
+  DosCloseMutexSem( p->mutex );
+  sqlite3_free( p );
+}
+
+/*
+** The sqlite3_mutex_enter() and sqlite3_mutex_try() routines attempt
+** to enter a mutex.  If another thread is already within the mutex,
+** sqlite3_mutex_enter() will block and sqlite3_mutex_try() will return
+** SQLITE_BUSY.  The sqlite3_mutex_try() interface returns SQLITE_OK
+** upon successful entry.  Mutexes created using SQLITE_MUTEX_RECURSIVE can
+** be entered multiple times by the same thread.  In such cases the,
+** mutex must be exited an equal number of times before another thread
+** can enter.  If the same thread tries to enter any other kind of mutex
+** more than once, the behavior is undefined.
+*/
+void sqlite3_mutex_enter(sqlite3_mutex *p){
+  TID tid;
+  PID holder1;
+  ULONG holder2;
+  assert( p );
+  assert( p->id==SQLITE_MUTEX_RECURSIVE || sqlite3_mutex_notheld(p) );
+  DosRequestMutexSem(p->mutex, SEM_INDEFINITE_WAIT);
+  DosQueryMutexSem(p->mutex, &holder1, &tid, &holder2);
+  p->owner = tid;
+  p->nRef++;
+}
+int sqlite3_mutex_try(sqlite3_mutex *p){
+  int rc;
+  TID tid;
+  PID holder1;
+  ULONG holder2;
+  assert( p );
+  assert( p->id==SQLITE_MUTEX_RECURSIVE || sqlite3_mutex_notheld(p) );
+  if( DosRequestMutexSem(p->mutex, SEM_IMMEDIATE_RETURN) == NO_ERROR) {
+    DosQueryMutexSem(p->mutex, &holder1, &tid, &holder2);
+    p->owner = tid;
+    p->nRef++;
+    rc = SQLITE_OK;
+  } else {
+    rc = SQLITE_BUSY;
+  }
+
+  return rc;
+}
+
+/*
+** The sqlite3_mutex_leave() routine exits a mutex that was
+** previously entered by the same thread.  The behavior
+** is undefined if the mutex is not currently entered or
+** is not currently allocated.  SQLite will never do either.
+*/
+void sqlite3_mutex_leave(sqlite3_mutex *p){
+  TID tid;
+  PID holder1;
+  ULONG holder2;
+  assert( p->nRef>0 );
+  DosQueryMutexSem(p->mutex, &holder1, &tid, &holder2);
+  assert( p->owner==tid );
+  p->nRef--;
+  assert( p->nRef==0 || p->id==SQLITE_MUTEX_RECURSIVE );
+  DosReleaseMutexSem(p->mutex);
+}
+
+/*
+** The sqlite3_mutex_held() and sqlite3_mutex_notheld() routine are
+** intended for use inside assert() statements.
+*/
+int sqlite3_mutex_held(sqlite3_mutex *p){
+  TID tid;
+  PID pid;
+  ULONG ulCount;
+  PTIB ptib;
+  if( p!=0 ) {
+    DosQueryMutexSem(p->mutex, &pid, &tid, &ulCount);
+  } else {
+    DosGetInfoBlocks(&ptib, NULL);
+    tid = ptib->tib_ptib2->tib2_ultid;
+  }
+  return p==0 || (p->nRef!=0 && p->owner==tid);
+}
+int sqlite3_mutex_notheld(sqlite3_mutex *p){
+  TID tid;
+  PID pid;
+  ULONG ulCount;
+  PTIB ptib;
+  if( p!= 0 ) {
+    DosQueryMutexSem(p->mutex, &pid, &tid, &ulCount);
+  } else {
+    DosGetInfoBlocks(&ptib, NULL);
+    tid = ptib->tib_ptib2->tib2_ultid;
+  }
+  return p==0 || p->nRef==0 || p->owner!=tid;
+}
+#endif /* SQLITE_MUTEX_OS2 */
diff --git a/uppsrc/plugin/sqlite3/lib/mutex_unix.c b/uppsrc/plugin/sqlite3/lib/mutex_unix.c
new file mode 100644
index 000000000..47bf947a1
--- /dev/null
+++ b/uppsrc/plugin/sqlite3/lib/mutex_unix.c
@@ -0,0 +1,298 @@
+/*
+** 2007 August 28
+**
+** The author disclaims copyright to this source code.  In place of
+** a legal notice, here is a blessing:
+**
+**    May you do good and not evil.
+**    May you find forgiveness for yourself and forgive others.
+**    May you share freely, never taking more than you give.
+**
+*************************************************************************
+** This file contains the C functions that implement mutexes for pthreads
+**
+** $Id: mutex_unix.c,v 1.5 2007/11/28 14:04:57 drh Exp $
+*/
+#include "sqliteInt.h"
+
+/*
+** The code in this file is only used if we are compiling threadsafe
+** under unix with pthreads.
+**
+** Note that this implementation requires a version of pthreads that
+** supports recursive mutexes.
+*/
+#ifdef SQLITE_MUTEX_PTHREADS
+
+#include <pthread.h>
+
+
+/*
+** Each recursive mutex is an instance of the following structure.
+*/
+struct sqlite3_mutex {
+  pthread_mutex_t mutex;     /* Mutex controlling the lock */
+  int id;                    /* Mutex type */
+  int nRef;                  /* Number of entrances */
+  pthread_t owner;           /* Thread that is within this mutex */
+#ifdef SQLITE_DEBUG
+  int trace;                 /* True to trace changes */
+#endif
+};
+
+/*
+** The sqlite3_mutex_alloc() routine allocates a new
+** mutex and returns a pointer to it.  If it returns NULL
+** that means that a mutex could not be allocated.  SQLite
+** will unwind its stack and return an error.  The argument
+** to sqlite3_mutex_alloc() is one of these integer constants:
+**
+** <ul>
+** <li>  SQLITE_MUTEX_FAST
+** <li>  SQLITE_MUTEX_RECURSIVE
+** <li>  SQLITE_MUTEX_STATIC_MASTER
+** <li>  SQLITE_MUTEX_STATIC_MEM
+** <li>  SQLITE_MUTEX_STATIC_MEM2
+** <li>  SQLITE_MUTEX_STATIC_PRNG
+** <li>  SQLITE_MUTEX_STATIC_LRU
+** </ul>
+**
+** The first two constants cause sqlite3_mutex_alloc() to create
+** a new mutex.  The new mutex is recursive when SQLITE_MUTEX_RECURSIVE
+** is used but not necessarily so when SQLITE_MUTEX_FAST is used.
+** The mutex implementation does not need to make a distinction
+** between SQLITE_MUTEX_RECURSIVE and SQLITE_MUTEX_FAST if it does
+** not want to.  But SQLite will only request a recursive mutex in
+** cases where it really needs one.  If a faster non-recursive mutex
+** implementation is available on the host platform, the mutex subsystem
+** might return such a mutex in response to SQLITE_MUTEX_FAST.
+**
+** The other allowed parameters to sqlite3_mutex_alloc() each return
+** a pointer to a static preexisting mutex.  Three static mutexes are
+** used by the current version of SQLite.  Future versions of SQLite
+** may add additional static mutexes.  Static mutexes are for internal
+** use by SQLite only.  Applications that use SQLite mutexes should
+** use only the dynamic mutexes returned by SQLITE_MUTEX_FAST or
+** SQLITE_MUTEX_RECURSIVE.
+**
+** Note that if one of the dynamic mutex parameters (SQLITE_MUTEX_FAST
+** or SQLITE_MUTEX_RECURSIVE) is used then sqlite3_mutex_alloc()
+** returns a different mutex on every call.  But for the static
+** mutex types, the same mutex is returned on every call that has
+** the same type number.
+*/
+sqlite3_mutex *sqlite3_mutex_alloc(int iType){
+  static sqlite3_mutex staticMutexes[] = {
+    { PTHREAD_MUTEX_INITIALIZER, },
+    { PTHREAD_MUTEX_INITIALIZER, },
+    { PTHREAD_MUTEX_INITIALIZER, },
+    { PTHREAD_MUTEX_INITIALIZER, },
+    { PTHREAD_MUTEX_INITIALIZER, },
+  };
+  sqlite3_mutex *p;
+  switch( iType ){
+    case SQLITE_MUTEX_RECURSIVE: {
+      p = sqlite3MallocZero( sizeof(*p) );
+      if( p ){
+#ifdef SQLITE_HOMEGROWN_RECURSIVE_MUTEX
+        /* If recursive mutexes are not available, we will have to
+        ** build our own.  See below. */
+        pthread_mutex_init(&p->mutex, 0);
+#else
+        /* Use a recursive mutex if it is available */
+        pthread_mutexattr_t recursiveAttr;
+        pthread_mutexattr_init(&recursiveAttr);
+        pthread_mutexattr_settype(&recursiveAttr, PTHREAD_MUTEX_RECURSIVE);
+        pthread_mutex_init(&p->mutex, &recursiveAttr);
+        pthread_mutexattr_destroy(&recursiveAttr);
+#endif
+        p->id = iType;
+      }
+      break;
+    }
+    case SQLITE_MUTEX_FAST: {
+      p = sqlite3MallocZero( sizeof(*p) );
+      if( p ){
+        p->id = iType;
+        pthread_mutex_init(&p->mutex, 0);
+      }
+      break;
+    }
+    default: {
+      assert( iType-2 >= 0 );
+      assert( iType-2 < sizeof(staticMutexes)/sizeof(staticMutexes[0]) );
+      p = &staticMutexes[iType-2];
+      p->id = iType;
+      break;
+    }
+  }
+  return p;
+}
+
+
+/*
+** This routine deallocates a previously
+** allocated mutex.  SQLite is careful to deallocate every
+** mutex that it allocates.
+*/
+void sqlite3_mutex_free(sqlite3_mutex *p){
+  assert( p );
+  assert( p->nRef==0 );
+  assert( p->id==SQLITE_MUTEX_FAST || p->id==SQLITE_MUTEX_RECURSIVE );
+  pthread_mutex_destroy(&p->mutex);
+  sqlite3_free(p);
+}
+
+/*
+** The sqlite3_mutex_enter() and sqlite3_mutex_try() routines attempt
+** to enter a mutex.  If another thread is already within the mutex,
+** sqlite3_mutex_enter() will block and sqlite3_mutex_try() will return
+** SQLITE_BUSY.  The sqlite3_mutex_try() interface returns SQLITE_OK
+** upon successful entry.  Mutexes created using SQLITE_MUTEX_RECURSIVE can
+** be entered multiple times by the same thread.  In such cases the,
+** mutex must be exited an equal number of times before another thread
+** can enter.  If the same thread tries to enter any other kind of mutex
+** more than once, the behavior is undefined.
+*/
+void sqlite3_mutex_enter(sqlite3_mutex *p){
+  assert( p );
+  assert( p->id==SQLITE_MUTEX_RECURSIVE || sqlite3_mutex_notheld(p) );
+
+#ifdef SQLITE_HOMEGROWN_RECURSIVE_MUTEX
+  /* If recursive mutexes are not available, then we have to grow
+  ** our own.  This implementation assumes that pthread_equal()
+  ** is atomic - that it cannot be deceived into thinking self
+  ** and p->owner are equal if p->owner changes between two values
+  ** that are not equal to self while the comparison is taking place.
+  ** This implementation also assumes a coherent cache - that
+  ** separate processes cannot read different values from the same
+  ** address at the same time.  If either of these two conditions
+  ** are not met, then the mutexes will fail and problems will result.
+  */
+  {
+    pthread_t self = pthread_self();
+    if( p->nRef>0 && pthread_equal(p->owner, self) ){
+      p->nRef++;
+    }else{
+      pthread_mutex_lock(&p->mutex);
+      assert( p->nRef==0 );
+      p->owner = self;
+      p->nRef = 1;
+    }
+  }
+#else
+  /* Use the built-in recursive mutexes if they are available.
+  */
+  pthread_mutex_lock(&p->mutex);
+  p->owner = pthread_self();
+  p->nRef++;
+#endif
+
+#ifdef SQLITE_DEBUG
+  if( p->trace ){
+    printf("enter mutex %p (%d) with nRef=%d\n", p, p->trace, p->nRef);
+  }
+#endif
+}
+int sqlite3_mutex_try(sqlite3_mutex *p){
+  int rc;
+  assert( p );
+  assert( p->id==SQLITE_MUTEX_RECURSIVE || sqlite3_mutex_notheld(p) );
+
+#ifdef SQLITE_HOMEGROWN_RECURSIVE_MUTEX
+  /* If recursive mutexes are not available, then we have to grow
+  ** our own.  This implementation assumes that pthread_equal()
+  ** is atomic - that it cannot be deceived into thinking self
+  ** and p->owner are equal if p->owner changes between two values
+  ** that are not equal to self while the comparison is taking place.
+  ** This implementation also assumes a coherent cache - that
+  ** separate processes cannot read different values from the same
+  ** address at the same time.  If either of these two conditions
+  ** are not met, then the mutexes will fail and problems will result.
+  */
+  {
+    pthread_t self = pthread_self();
+    if( p->nRef>0 && pthread_equal(p->owner, self) ){
+      p->nRef++;
+      rc = SQLITE_OK;
+    }else if( pthread_mutex_lock(&p->mutex)==0 ){
+      assert( p->nRef==0 );
+      p->owner = self;
+      p->nRef = 1;
+      rc = SQLITE_OK;
+    }else{
+      rc = SQLITE_BUSY;
+    }
+  }
+#else
+  /* Use the built-in recursive mutexes if they are available.
+  */
+  if( pthread_mutex_trylock(&p->mutex)==0 ){
+    p->owner = pthread_self();
+    p->nRef++;
+    rc = SQLITE_OK;
+  }else{
+    rc = SQLITE_BUSY;
+  }
+#endif
+
+#ifdef SQLITE_DEBUG
+  if( rc==SQLITE_OK && p->trace ){
+    printf("enter mutex %p (%d) with nRef=%d\n", p, p->trace, p->nRef);
+  }
+#endif
+  return rc;
+}
+
+/*
+** The sqlite3_mutex_leave() routine exits a mutex that was
+** previously entered by the same thread.  The behavior
+** is undefined if the mutex is not currently entered or
+** is not currently allocated.  SQLite will never do either.
+*/
+void sqlite3_mutex_leave(sqlite3_mutex *p){
+  assert( p );
+  assert( sqlite3_mutex_held(p) );
+  p->nRef--;
+  assert( p->nRef==0 || p->id==SQLITE_MUTEX_RECURSIVE );
+
+#ifdef SQLITE_HOMEGROWN_RECURSIVE_MUTEX
+  if( p->nRef==0 ){
+    pthread_mutex_unlock(&p->mutex);
+  }
+#else
+  pthread_mutex_unlock(&p->mutex);
+#endif
+
+#ifdef SQLITE_DEBUG
+  if( p->trace ){
+    printf("leave mutex %p (%d) with nRef=%d\n", p, p->trace, p->nRef);
+  }
+#endif
+}
+
+/*
+** The sqlite3_mutex_held() and sqlite3_mutex_notheld() routine are
+** intended for use only inside assert() statements.  On some platforms,
+** there might be race conditions that can cause these routines to
+** deliver incorrect results.  In particular, if pthread_equal() is
+** not an atomic operation, then these routines might delivery
+** incorrect results.  On most platforms, pthread_equal() is a
+** comparison of two integers and is therefore atomic.  But we are
+** told that HPUX is not such a platform.  If so, then these routines
+** will not always work correctly on HPUX.
+**
+** On those platforms where pthread_equal() is not atomic, SQLite
+** should be compiled without -DSQLITE_DEBUG and with -DNDEBUG to
+** make sure no assert() statements are evaluated and hence these
+** routines are never called.
+*/
+#ifndef NDEBUG
+int sqlite3_mutex_held(sqlite3_mutex *p){
+  return p==0 || (p->nRef!=0 && pthread_equal(p->owner, pthread_self()));
+}
+int sqlite3_mutex_notheld(sqlite3_mutex *p){
+  return p==0 || p->nRef==0 || pthread_equal(p->owner, pthread_self())==0;
+}
+#endif
+#endif /* SQLITE_MUTEX_PTHREAD */
diff --git a/uppsrc/plugin/sqlite3/lib/mutex_w32.c b/uppsrc/plugin/sqlite3/lib/mutex_w32.c
new file mode 100644
index 000000000..3183f9a59
--- /dev/null
+++ b/uppsrc/plugin/sqlite3/lib/mutex_w32.c
@@ -0,0 +1,219 @@
+/*
+** 2007 August 14
+**
+** The author disclaims copyright to this source code.  In place of
+** a legal notice, here is a blessing:
+**
+**    May you do good and not evil.
+**    May you find forgiveness for yourself and forgive others.
+**    May you share freely, never taking more than you give.
+**
+*************************************************************************
+** This file contains the C functions that implement mutexes for win32
+**
+** $Id: mutex_w32.c,v 1.5 2007/10/05 15:08:01 drh Exp $
+*/
+#include "sqliteInt.h"
+
+/*
+** The code in this file is only used if we are compiling multithreaded
+** on a win32 system.
+*/
+#ifdef SQLITE_MUTEX_W32
+
+/*
+** Each recursive mutex is an instance of the following structure.
+*/
+struct sqlite3_mutex {
+  CRITICAL_SECTION mutex;    /* Mutex controlling the lock */
+  int id;                    /* Mutex type */
+  int nRef;                  /* Number of enterances */
+  DWORD owner;               /* Thread holding this mutex */
+};
+
+/*
+** Return true (non-zero) if we are running under WinNT, Win2K, WinXP,
+** or WinCE.  Return false (zero) for Win95, Win98, or WinME.
+**
+** Here is an interesting observation:  Win95, Win98, and WinME lack
+** the LockFileEx() API.  But we can still statically link against that
+** API as long as we don't call it win running Win95/98/ME.  A call to
+** this routine is used to determine if the host is Win95/98/ME or
+** WinNT/2K/XP so that we will know whether or not we can safely call
+** the LockFileEx() API.
+*/
+#if OS_WINCE
+# define mutexIsNT()  (1)
+#else
+  static int mutexIsNT(void){
+    static int osType = 0;
+    if( osType==0 ){
+      OSVERSIONINFO sInfo;
+      sInfo.dwOSVersionInfoSize = sizeof(sInfo);
+      GetVersionEx(&sInfo);
+      osType = sInfo.dwPlatformId==VER_PLATFORM_WIN32_NT ? 2 : 1;
+    }
+    return osType==2;
+  }
+#endif /* OS_WINCE */
+
+
+/*
+** The sqlite3_mutex_alloc() routine allocates a new
+** mutex and returns a pointer to it.  If it returns NULL
+** that means that a mutex could not be allocated.  SQLite
+** will unwind its stack and return an error.  The argument
+** to sqlite3_mutex_alloc() is one of these integer constants:
+**
+** <ul>
+** <li>  SQLITE_MUTEX_FAST               0
+** <li>  SQLITE_MUTEX_RECURSIVE          1
+** <li>  SQLITE_MUTEX_STATIC_MASTER      2
+** <li>  SQLITE_MUTEX_STATIC_MEM         3
+** <li>  SQLITE_MUTEX_STATIC_PRNG        4
+** </ul>
+**
+** The first two constants cause sqlite3_mutex_alloc() to create
+** a new mutex.  The new mutex is recursive when SQLITE_MUTEX_RECURSIVE
+** is used but not necessarily so when SQLITE_MUTEX_FAST is used.
+** The mutex implementation does not need to make a distinction
+** between SQLITE_MUTEX_RECURSIVE and SQLITE_MUTEX_FAST if it does
+** not want to.  But SQLite will only request a recursive mutex in
+** cases where it really needs one.  If a faster non-recursive mutex
+** implementation is available on the host platform, the mutex subsystem
+** might return such a mutex in response to SQLITE_MUTEX_FAST.
+**
+** The other allowed parameters to sqlite3_mutex_alloc() each return
+** a pointer to a static preexisting mutex.  Three static mutexes are
+** used by the current version of SQLite.  Future versions of SQLite
+** may add additional static mutexes.  Static mutexes are for internal
+** use by SQLite only.  Applications that use SQLite mutexes should
+** use only the dynamic mutexes returned by SQLITE_MUTEX_FAST or
+** SQLITE_MUTEX_RECURSIVE.
+**
+** Note that if one of the dynamic mutex parameters (SQLITE_MUTEX_FAST
+** or SQLITE_MUTEX_RECURSIVE) is used then sqlite3_mutex_alloc()
+** returns a different mutex on every call.  But for the static
+** mutex types, the same mutex is returned on every call that has
+** the same type number.
+*/
+sqlite3_mutex *sqlite3_mutex_alloc(int iType){
+  sqlite3_mutex *p;
+
+  switch( iType ){
+    case SQLITE_MUTEX_FAST:
+    case SQLITE_MUTEX_RECURSIVE: {
+      p = sqlite3MallocZero( sizeof(*p) );
+      if( p ){
+        p->id = iType;
+        InitializeCriticalSection(&p->mutex);
+      }
+      break;
+    }
+    default: {
+      static sqlite3_mutex staticMutexes[5];
+      static int isInit = 0;
+      while( !isInit ){
+        static long lock = 0;
+        if( InterlockedIncrement(&lock)==1 ){
+          int i;
+          for(i=0; i<sizeof(staticMutexes)/sizeof(staticMutexes[0]); i++){
+            InitializeCriticalSection(&staticMutexes[i].mutex);
+          }
+          isInit = 1;
+        }else{
+          Sleep(1);
+        }
+      }
+      assert( iType-2 >= 0 );
+      assert( iType-2 < sizeof(staticMutexes)/sizeof(staticMutexes[0]) );
+      p = &staticMutexes[iType-2];
+      p->id = iType;
+      break;
+    }
+  }
+  return p;
+}
+
+
+/*
+** This routine deallocates a previously
+** allocated mutex.  SQLite is careful to deallocate every
+** mutex that it allocates.
+*/
+void sqlite3_mutex_free(sqlite3_mutex *p){
+  assert( p );
+  assert( p->nRef==0 );
+  assert( p->id==SQLITE_MUTEX_FAST || p->id==SQLITE_MUTEX_RECURSIVE );
+  DeleteCriticalSection(&p->mutex);
+  sqlite3_free(p);
+}
+
+/*
+** The sqlite3_mutex_enter() and sqlite3_mutex_try() routines attempt
+** to enter a mutex.  If another thread is already within the mutex,
+** sqlite3_mutex_enter() will block and sqlite3_mutex_try() will return
+** SQLITE_BUSY.  The sqlite3_mutex_try() interface returns SQLITE_OK
+** upon successful entry.  Mutexes created using SQLITE_MUTEX_RECURSIVE can
+** be entered multiple times by the same thread.  In such cases the,
+** mutex must be exited an equal number of times before another thread
+** can enter.  If the same thread tries to enter any other kind of mutex
+** more than once, the behavior is undefined.
+*/
+void sqlite3_mutex_enter(sqlite3_mutex *p){
+  assert( p );
+  assert( p->id==SQLITE_MUTEX_RECURSIVE || sqlite3_mutex_notheld(p) );
+  EnterCriticalSection(&p->mutex);
+  p->owner = GetCurrentThreadId();
+  p->nRef++;
+}
+int sqlite3_mutex_try(sqlite3_mutex *p){
+  int rc = SQLITE_BUSY;
+  assert( p );
+  assert( p->id==SQLITE_MUTEX_RECURSIVE || sqlite3_mutex_notheld(p) );
+  /*
+  ** The sqlite3_mutex_try() routine is very rarely used, and when it
+  ** is used it is merely an optimization.  So it is OK for it to always
+  ** fail.
+  **
+  ** The TryEnterCriticalSection() interface is only available on WinNT.
+  ** And some windows compilers complain if you try to use it without
+  ** first doing some #defines that prevent SQLite from building on Win98.
+  ** For that reason, we will omit this optimization for now.  See
+  ** ticket #2685.
+  */
+#if 0
+  if( mutexIsNT() && TryEnterCriticalSection(&p->mutex) ){
+    p->owner = GetCurrentThreadId();
+    p->nRef++;
+    rc = SQLITE_OK;
+  }
+#endif
+  return rc;
+}
+
+/*
+** The sqlite3_mutex_leave() routine exits a mutex that was
+** previously entered by the same thread.  The behavior
+** is undefined if the mutex is not currently entered or
+** is not currently allocated.  SQLite will never do either.
+*/
+void sqlite3_mutex_leave(sqlite3_mutex *p){
+  assert( p->nRef>0 );
+  assert( p->owner==GetCurrentThreadId() );
+  p->nRef--;
+  assert( p->nRef==0 || p->id==SQLITE_MUTEX_RECURSIVE );
+  LeaveCriticalSection(&p->mutex);
+}
+
+/*
+** The sqlite3_mutex_held() and sqlite3_mutex_notheld() routine are
+** intended for use only inside assert() statements.
+*/
+int sqlite3_mutex_held(sqlite3_mutex *p){
+  return p==0 || (p->nRef!=0 && p->owner==GetCurrentThreadId());
+}
+int sqlite3_mutex_notheld(sqlite3_mutex *p){
+  return p==0 || p->nRef==0 || p->owner!=GetCurrentThreadId();
+}
+#endif /* SQLITE_MUTEX_W32 */
diff --git a/uppsrc/plugin/sqlite3/lib/opcodes.c b/uppsrc/plugin/sqlite3/lib/opcodes.c
new file mode 100644
index 000000000..eadb3a16b
--- /dev/null
+++ b/uppsrc/plugin/sqlite3/lib/opcodes.c
@@ -0,0 +1,151 @@
+/* Automatically generated.  Do not edit */
+/* See the mkopcodec.awk script for details. */
+#if !defined(SQLITE_OMIT_EXPLAIN) || !defined(NDEBUG) || defined(VDBE_PROFILE) || defined(SQLITE_DEBUG)
+const char *sqlite3OpcodeName(int i){
+ static const char *const azName[] = { "?",
+     /*   1 */ "VNext",
+     /*   2 */ "Column",
+     /*   3 */ "SetCookie",
+     /*   4 */ "Sequence",
+     /*   5 */ "MoveGt",
+     /*   6 */ "RowKey",
+     /*   7 */ "SCopy",
+     /*   8 */ "OpenWrite",
+     /*   9 */ "If",
+     /*  10 */ "VRowid",
+     /*  11 */ "CollSeq",
+     /*  12 */ "OpenRead",
+     /*  13 */ "Expire",
+     /*  14 */ "AutoCommit",
+     /*  15 */ "IntegrityCk",
+     /*  16 */ "Not",
+     /*  17 */ "Sort",
+     /*  18 */ "Copy",
+     /*  19 */ "Trace",
+     /*  20 */ "Function",
+     /*  21 */ "IfNeg",
+     /*  22 */ "Noop",
+     /*  23 */ "Return",
+     /*  24 */ "NewRowid",
+     /*  25 */ "Variable",
+     /*  26 */ "String",
+     /*  27 */ "RealAffinity",
+     /*  28 */ "VRename",
+     /*  29 */ "ParseSchema",
+     /*  30 */ "VOpen",
+     /*  31 */ "Close",
+     /*  32 */ "CreateIndex",
+     /*  33 */ "IsUnique",
+     /*  34 */ "NotFound",
+     /*  35 */ "Int64",
+     /*  36 */ "MustBeInt",
+     /*  37 */ "Halt",
+     /*  38 */ "Rowid",
+     /*  39 */ "IdxLT",
+     /*  40 */ "AddImm",
+     /*  41 */ "Statement",
+     /*  42 */ "RowData",
+     /*  43 */ "MemMax",
+     /*  44 */ "NotExists",
+     /*  45 */ "Gosub",
+     /*  46 */ "Integer",
+     /*  47 */ "Prev",
+     /*  48 */ "VColumn",
+     /*  49 */ "CreateTable",
+     /*  50 */ "Last",
+     /*  51 */ "IncrVacuum",
+     /*  52 */ "IdxRowid",
+     /*  53 */ "ResetCount",
+     /*  54 */ "FifoWrite",
+     /*  55 */ "ContextPush",
+     /*  56 */ "DropTrigger",
+     /*  57 */ "DropIndex",
+     /*  58 */ "IdxGE",
+     /*  59 */ "IdxDelete",
+     /*  60 */ "Or",
+     /*  61 */ "And",
+     /*  62 */ "Vacuum",
+     /*  63 */ "MoveLe",
+     /*  64 */ "IfNot",
+     /*  65 */ "IsNull",
+     /*  66 */ "NotNull",
+     /*  67 */ "Ne",
+     /*  68 */ "Eq",
+     /*  69 */ "Gt",
+     /*  70 */ "Le",
+     /*  71 */ "Lt",
+     /*  72 */ "Ge",
+     /*  73 */ "DropTable",
+     /*  74 */ "BitAnd",
+     /*  75 */ "BitOr",
+     /*  76 */ "ShiftLeft",
+     /*  77 */ "ShiftRight",
+     /*  78 */ "Add",
+     /*  79 */ "Subtract",
+     /*  80 */ "Multiply",
+     /*  81 */ "Divide",
+     /*  82 */ "Remainder",
+     /*  83 */ "Concat",
+     /*  84 */ "MakeRecord",
+     /*  85 */ "ResultRow",
+     /*  86 */ "Delete",
+     /*  87 */ "BitNot",
+     /*  88 */ "String8",
+     /*  89 */ "AggFinal",
+     /*  90 */ "Goto",
+     /*  91 */ "TableLock",
+     /*  92 */ "FifoRead",
+     /*  93 */ "Clear",
+     /*  94 */ "MoveLt",
+     /*  95 */ "VerifyCookie",
+     /*  96 */ "AggStep",
+     /*  97 */ "SetNumColumns",
+     /*  98 */ "Transaction",
+     /*  99 */ "VFilter",
+     /* 100 */ "VDestroy",
+     /* 101 */ "ContextPop",
+     /* 102 */ "Next",
+     /* 103 */ "IdxInsert",
+     /* 104 */ "Insert",
+     /* 105 */ "Destroy",
+     /* 106 */ "ReadCookie",
+     /* 107 */ "ForceInt",
+     /* 108 */ "LoadAnalysis",
+     /* 109 */ "Explain",
+     /* 110 */ "OpenPseudo",
+     /* 111 */ "OpenEphemeral",
+     /* 112 */ "Null",
+     /* 113 */ "Move",
+     /* 114 */ "Blob",
+     /* 115 */ "Rewind",
+     /* 116 */ "MoveGe",
+     /* 117 */ "VBegin",
+     /* 118 */ "VUpdate",
+     /* 119 */ "IfZero",
+     /* 120 */ "VCreate",
+     /* 121 */ "Found",
+     /* 122 */ "IfPos",
+     /* 123 */ "NullRow",
+     /* 124 */ "NotUsed_124",
+     /* 125 */ "Real",
+     /* 126 */ "NotUsed_126",
+     /* 127 */ "NotUsed_127",
+     /* 128 */ "NotUsed_128",
+     /* 129 */ "NotUsed_129",
+     /* 130 */ "NotUsed_130",
+     /* 131 */ "NotUsed_131",
+     /* 132 */ "NotUsed_132",
+     /* 133 */ "NotUsed_133",
+     /* 134 */ "NotUsed_134",
+     /* 135 */ "NotUsed_135",
+     /* 136 */ "NotUsed_136",
+     /* 137 */ "NotUsed_137",
+     /* 138 */ "ToText",
+     /* 139 */ "ToBlob",
+     /* 140 */ "ToNumeric",
+     /* 141 */ "ToInt",
+     /* 142 */ "ToReal",
+  };
+  return azName[i];
+}
+#endif
diff --git a/uppsrc/plugin/sqlite3/lib/opcodes.h b/uppsrc/plugin/sqlite3/lib/opcodes.h
new file mode 100644
index 000000000..92ec8fefb
--- /dev/null
+++ b/uppsrc/plugin/sqlite3/lib/opcodes.h
@@ -0,0 +1,177 @@
+/* Automatically generated.  Do not edit */
+/* See the mkopcodeh.awk script for details */
+#define OP_VNext                                1
+#define OP_Column                               2
+#define OP_SetCookie                            3
+#define OP_Real                               125   /* same as TK_FLOAT    */
+#define OP_Sequence                             4
+#define OP_MoveGt                               5
+#define OP_Ge                                  72   /* same as TK_GE       */
+#define OP_RowKey                               6
+#define OP_SCopy                                7
+#define OP_Eq                                  68   /* same as TK_EQ       */
+#define OP_OpenWrite                            8
+#define OP_NotNull                             66   /* same as TK_NOTNULL  */
+#define OP_If                                   9
+#define OP_ToInt                              141   /* same as TK_TO_INT   */
+#define OP_String8                             88   /* same as TK_STRING   */
+#define OP_VRowid                              10
+#define OP_CollSeq                             11
+#define OP_OpenRead                            12
+#define OP_Expire                              13
+#define OP_AutoCommit                          14
+#define OP_Gt                                  69   /* same as TK_GT       */
+#define OP_IntegrityCk                         15
+#define OP_Sort                                17
+#define OP_Copy                                18
+#define OP_Trace                               19
+#define OP_Function                            20
+#define OP_IfNeg                               21
+#define OP_And                                 61   /* same as TK_AND      */
+#define OP_Subtract                            79   /* same as TK_MINUS    */
+#define OP_Noop                                22
+#define OP_Return                              23
+#define OP_Remainder                           82   /* same as TK_REM      */
+#define OP_NewRowid                            24
+#define OP_Multiply                            80   /* same as TK_STAR     */
+#define OP_Variable                            25
+#define OP_String                              26
+#define OP_RealAffinity                        27
+#define OP_VRename                             28
+#define OP_ParseSchema                         29
+#define OP_VOpen                               30
+#define OP_Close                               31
+#define OP_CreateIndex                         32
+#define OP_IsUnique                            33
+#define OP_NotFound                            34
+#define OP_Int64                               35
+#define OP_MustBeInt                           36
+#define OP_Halt                                37
+#define OP_Rowid                               38
+#define OP_IdxLT                               39
+#define OP_AddImm                              40
+#define OP_Statement                           41
+#define OP_RowData                             42
+#define OP_MemMax                              43
+#define OP_Or                                  60   /* same as TK_OR       */
+#define OP_NotExists                           44
+#define OP_Gosub                               45
+#define OP_Divide                              81   /* same as TK_SLASH    */
+#define OP_Integer                             46
+#define OP_ToNumeric                          140   /* same as TK_TO_NUMERIC*/
+#define OP_Prev                                47
+#define OP_Concat                              83   /* same as TK_CONCAT   */
+#define OP_BitAnd                              74   /* same as TK_BITAND   */
+#define OP_VColumn                             48
+#define OP_CreateTable                         49
+#define OP_Last                                50
+#define OP_IsNull                              65   /* same as TK_ISNULL   */
+#define OP_IncrVacuum                          51
+#define OP_IdxRowid                            52
+#define OP_ShiftRight                          77   /* same as TK_RSHIFT   */
+#define OP_ResetCount                          53
+#define OP_FifoWrite                           54
+#define OP_ContextPush                         55
+#define OP_DropTrigger                         56
+#define OP_DropIndex                           57
+#define OP_IdxGE                               58
+#define OP_IdxDelete                           59
+#define OP_Vacuum                              62
+#define OP_MoveLe                              63
+#define OP_IfNot                               64
+#define OP_DropTable                           73
+#define OP_MakeRecord                          84
+#define OP_ToBlob                             139   /* same as TK_TO_BLOB  */
+#define OP_ResultRow                           85
+#define OP_Delete                              86
+#define OP_AggFinal                            89
+#define OP_ShiftLeft                           76   /* same as TK_LSHIFT   */
+#define OP_Goto                                90
+#define OP_TableLock                           91
+#define OP_FifoRead                            92
+#define OP_Clear                               93
+#define OP_MoveLt                              94
+#define OP_Le                                  70   /* same as TK_LE       */
+#define OP_VerifyCookie                        95
+#define OP_AggStep                             96
+#define OP_ToText                             138   /* same as TK_TO_TEXT  */
+#define OP_Not                                 16   /* same as TK_NOT      */
+#define OP_ToReal                             142   /* same as TK_TO_REAL  */
+#define OP_SetNumColumns                       97
+#define OP_Transaction                         98
+#define OP_VFilter                             99
+#define OP_Ne                                  67   /* same as TK_NE       */
+#define OP_VDestroy                           100
+#define OP_ContextPop                         101
+#define OP_BitOr                               75   /* same as TK_BITOR    */
+#define OP_Next                               102
+#define OP_IdxInsert                          103
+#define OP_Lt                                  71   /* same as TK_LT       */
+#define OP_Insert                             104
+#define OP_Destroy                            105
+#define OP_ReadCookie                         106
+#define OP_ForceInt                           107
+#define OP_LoadAnalysis                       108
+#define OP_Explain                            109
+#define OP_OpenPseudo                         110
+#define OP_OpenEphemeral                      111
+#define OP_Null                               112
+#define OP_Move                               113
+#define OP_Blob                               114
+#define OP_Add                                 78   /* same as TK_PLUS     */
+#define OP_Rewind                             115
+#define OP_MoveGe                             116
+#define OP_VBegin                             117
+#define OP_VUpdate                            118
+#define OP_IfZero                             119
+#define OP_BitNot                              87   /* same as TK_BITNOT   */
+#define OP_VCreate                            120
+#define OP_Found                              121
+#define OP_IfPos                              122
+#define OP_NullRow                            123
+
+/* The following opcode values are never used */
+#define OP_NotUsed_124                        124
+#define OP_NotUsed_126                        126
+#define OP_NotUsed_127                        127
+#define OP_NotUsed_128                        128
+#define OP_NotUsed_129                        129
+#define OP_NotUsed_130                        130
+#define OP_NotUsed_131                        131
+#define OP_NotUsed_132                        132
+#define OP_NotUsed_133                        133
+#define OP_NotUsed_134                        134
+#define OP_NotUsed_135                        135
+#define OP_NotUsed_136                        136
+#define OP_NotUsed_137                        137
+
+
+/* Properties such as "out2" or "jump" that are specified in
+** comments following the "case" for each opcode in the vdbe.c
+** are encoded into bitvectors as follows:
+*/
+#define OPFLG_JUMP            0x0001  /* jump:  P2 holds jmp target */
+#define OPFLG_OUT2_PRERELEASE 0x0002  /* out2-prerelease: */
+#define OPFLG_IN1             0x0004  /* in1:   P1 is an input */
+#define OPFLG_IN2             0x0008  /* in2:   P2 is an input */
+#define OPFLG_IN3             0x0010  /* in3:   P3 is an input */
+#define OPFLG_OUT3            0x0020  /* out3:  P3 is an output */
+#define OPFLG_INITIALIZER {\
+/*   0 */ 0x00, 0x01, 0x00, 0x10, 0x02, 0x11, 0x00, 0x00,\
+/*   8 */ 0x00, 0x05, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00,\
+/*  16 */ 0x04, 0x01, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00,\
+/*  24 */ 0x02, 0x02, 0x02, 0x04, 0x00, 0x00, 0x00, 0x00,\
+/*  32 */ 0x02, 0x11, 0x11, 0x02, 0x05, 0x00, 0x02, 0x11,\
+/*  40 */ 0x04, 0x00, 0x00, 0x0c, 0x11, 0x01, 0x02, 0x01,\
+/*  48 */ 0x00, 0x02, 0x01, 0x01, 0x02, 0x00, 0x04, 0x00,\
+/*  56 */ 0x00, 0x00, 0x11, 0x08, 0x2c, 0x2c, 0x00, 0x11,\
+/*  64 */ 0x05, 0x05, 0x05, 0x15, 0x15, 0x15, 0x15, 0x15,\
+/*  72 */ 0x15, 0x00, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c,\
+/*  80 */ 0x2c, 0x2c, 0x2c, 0x2c, 0x00, 0x00, 0x00, 0x04,\
+/*  88 */ 0x02, 0x00, 0x01, 0x00, 0x01, 0x00, 0x11, 0x00,\
+/*  96 */ 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x08,\
+/* 104 */ 0x00, 0x02, 0x02, 0x05, 0x00, 0x00, 0x00, 0x00,\
+/* 112 */ 0x02, 0x00, 0x02, 0x01, 0x11, 0x00, 0x00, 0x05,\
+/* 120 */ 0x00, 0x11, 0x05, 0x00, 0x00, 0x02, 0x00, 0x00,\
+/* 128 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\
+/* 136 */ 0x00, 0x00, 0x04, 0x04, 0x04, 0x04, 0x04,}
diff --git a/uppsrc/plugin/sqlite3/lib/os.c b/uppsrc/plugin/sqlite3/lib/os.c
new file mode 100644
index 000000000..27a6a6336
--- /dev/null
+++ b/uppsrc/plugin/sqlite3/lib/os.c
@@ -0,0 +1,267 @@
+/*
+** 2005 November 29
+**
+** The author disclaims copyright to this source code.  In place of
+** a legal notice, here is a blessing:
+**
+**    May you do good and not evil.
+**    May you find forgiveness for yourself and forgive others.
+**    May you share freely, never taking more than you give.
+**
+******************************************************************************
+**
+** This file contains OS interface code that is common to all
+** architectures.
+*/
+#define _SQLITE_OS_C_ 1
+#include "sqliteInt.h"
+#undef _SQLITE_OS_C_
+
+/*
+** The default SQLite sqlite3_vfs implementations do not allocate
+** memory (actually, os_unix.c allocates a small amount of memory
+** from within OsOpen()), but some third-party implementations may.
+** So we test the effects of a malloc() failing and the sqlite3OsXXX()
+** function returning SQLITE_IOERR_NOMEM using the DO_OS_MALLOC_TEST macro.
+**
+** The following functions are instrumented for malloc() failure
+** testing:
+**
+**     sqlite3OsOpen()
+**     sqlite3OsRead()
+**     sqlite3OsWrite()
+**     sqlite3OsSync()
+**     sqlite3OsLock()
+**
+*/
+#ifdef SQLITE_TEST
+  #define DO_OS_MALLOC_TEST if (1) {            \
+    void *pTstAlloc = sqlite3_malloc(10);       \
+    if (!pTstAlloc) return SQLITE_IOERR_NOMEM;  \
+    sqlite3_free(pTstAlloc);                    \
+  }
+#else
+  #define DO_OS_MALLOC_TEST
+#endif
+
+/*
+** The following routines are convenience wrappers around methods
+** of the sqlite3_file object.  This is mostly just syntactic sugar. All
+** of this would be completely automatic if SQLite were coded using
+** C++ instead of plain old C.
+*/
+int sqlite3OsClose(sqlite3_file *pId){
+  int rc = SQLITE_OK;
+  if( pId->pMethods ){
+    rc = pId->pMethods->xClose(pId);
+    pId->pMethods = 0;
+  }
+  return rc;
+}
+int sqlite3OsRead(sqlite3_file *id, void *pBuf, int amt, i64 offset){
+  DO_OS_MALLOC_TEST;
+  return id->pMethods->xRead(id, pBuf, amt, offset);
+}
+int sqlite3OsWrite(sqlite3_file *id, const void *pBuf, int amt, i64 offset){
+  DO_OS_MALLOC_TEST;
+  return id->pMethods->xWrite(id, pBuf, amt, offset);
+}
+int sqlite3OsTruncate(sqlite3_file *id, i64 size){
+  return id->pMethods->xTruncate(id, size);
+}
+int sqlite3OsSync(sqlite3_file *id, int flags){
+  DO_OS_MALLOC_TEST;
+  return id->pMethods->xSync(id, flags);
+}
+int sqlite3OsFileSize(sqlite3_file *id, i64 *pSize){
+  return id->pMethods->xFileSize(id, pSize);
+}
+int sqlite3OsLock(sqlite3_file *id, int lockType){
+  DO_OS_MALLOC_TEST;
+  return id->pMethods->xLock(id, lockType);
+}
+int sqlite3OsUnlock(sqlite3_file *id, int lockType){
+  return id->pMethods->xUnlock(id, lockType);
+}
+int sqlite3OsCheckReservedLock(sqlite3_file *id){
+  return id->pMethods->xCheckReservedLock(id);
+}
+int sqlite3OsFileControl(sqlite3_file *id, int op, void *pArg){
+  return id->pMethods->xFileControl(id,op,pArg);
+}
+int sqlite3OsSectorSize(sqlite3_file *id){
+  int (*xSectorSize)(sqlite3_file*) = id->pMethods->xSectorSize;
+  return (xSectorSize ? xSectorSize(id) : SQLITE_DEFAULT_SECTOR_SIZE);
+}
+int sqlite3OsDeviceCharacteristics(sqlite3_file *id){
+  return id->pMethods->xDeviceCharacteristics(id);
+}
+
+/*
+** The next group of routines are convenience wrappers around the
+** VFS methods.
+*/
+int sqlite3OsOpen(
+  sqlite3_vfs *pVfs,
+  const char *zPath,
+  sqlite3_file *pFile,
+  int flags,
+  int *pFlagsOut
+){
+  DO_OS_MALLOC_TEST;
+  return pVfs->xOpen(pVfs, zPath, pFile, flags, pFlagsOut);
+}
+int sqlite3OsDelete(sqlite3_vfs *pVfs, const char *zPath, int dirSync){
+  return pVfs->xDelete(pVfs, zPath, dirSync);
+}
+int sqlite3OsAccess(sqlite3_vfs *pVfs, const char *zPath, int flags){
+  return pVfs->xAccess(pVfs, zPath, flags);
+}
+int sqlite3OsGetTempname(sqlite3_vfs *pVfs, int nBufOut, char *zBufOut){
+  return pVfs->xGetTempname(pVfs, nBufOut, zBufOut);
+}
+int sqlite3OsFullPathname(
+  sqlite3_vfs *pVfs,
+  const char *zPath,
+  int nPathOut,
+  char *zPathOut
+){
+  return pVfs->xFullPathname(pVfs, zPath, nPathOut, zPathOut);
+}
+void *sqlite3OsDlOpen(sqlite3_vfs *pVfs, const char *zPath){
+  return pVfs->xDlOpen(pVfs, zPath);
+}
+void sqlite3OsDlError(sqlite3_vfs *pVfs, int nByte, char *zBufOut){
+  pVfs->xDlError(pVfs, nByte, zBufOut);
+}
+void *sqlite3OsDlSym(sqlite3_vfs *pVfs, void *pHandle, const char *zSymbol){
+  return pVfs->xDlSym(pVfs, pHandle, zSymbol);
+}
+void sqlite3OsDlClose(sqlite3_vfs *pVfs, void *pHandle){
+  pVfs->xDlClose(pVfs, pHandle);
+}
+int sqlite3OsRandomness(sqlite3_vfs *pVfs, int nByte, char *zBufOut){
+  return pVfs->xRandomness(pVfs, nByte, zBufOut);
+}
+int sqlite3OsSleep(sqlite3_vfs *pVfs, int nMicro){
+  return pVfs->xSleep(pVfs, nMicro);
+}
+int sqlite3OsCurrentTime(sqlite3_vfs *pVfs, double *pTimeOut){
+  return pVfs->xCurrentTime(pVfs, pTimeOut);
+}
+
+int sqlite3OsOpenMalloc(
+  sqlite3_vfs *pVfs,
+  const char *zFile,
+  sqlite3_file **ppFile,
+  int flags,
+  int *pOutFlags
+){
+  int rc = SQLITE_NOMEM;
+  sqlite3_file *pFile;
+  pFile = (sqlite3_file *)sqlite3_malloc(pVfs->szOsFile);
+  if( pFile ){
+    rc = sqlite3OsOpen(pVfs, zFile, pFile, flags, pOutFlags);
+    if( rc!=SQLITE_OK ){
+      sqlite3_free(pFile);
+    }else{
+      *ppFile = pFile;
+    }
+  }
+  return rc;
+}
+int sqlite3OsCloseFree(sqlite3_file *pFile){
+  int rc = SQLITE_OK;
+  if( pFile ){
+    rc = sqlite3OsClose(pFile);
+    sqlite3_free(pFile);
+  }
+  return rc;
+}
+
+/*
+** The list of all registered VFS implementations.  This list is
+** initialized to the single VFS returned by sqlite3OsDefaultVfs()
+** upon the first call to sqlite3_vfs_find().
+*/
+static sqlite3_vfs *vfsList = 0;
+
+/*
+** Locate a VFS by name.  If no name is given, simply return the
+** first VFS on the list.
+*/
+sqlite3_vfs *sqlite3_vfs_find(const char *zVfs){
+#ifndef SQLITE_MUTEX_NOOP
+  sqlite3_mutex *mutex = sqlite3_mutex_alloc(SQLITE_MUTEX_STATIC_MASTER);
+#endif
+  sqlite3_vfs *pVfs = 0;
+  static int isInit = 0;
+  sqlite3_mutex_enter(mutex);
+  if( !isInit ){
+    vfsList = sqlite3OsDefaultVfs();
+    isInit = 1;
+  }
+  for(pVfs = vfsList; pVfs; pVfs=pVfs->pNext){
+    if( zVfs==0 ) break;
+    if( strcmp(zVfs, pVfs->zName)==0 ) break;
+  }
+  sqlite3_mutex_leave(mutex);
+  return pVfs;
+}
+
+/*
+** Unlink a VFS from the linked list
+*/
+static void vfsUnlink(sqlite3_vfs *pVfs){
+  assert( sqlite3_mutex_held(sqlite3_mutex_alloc(SQLITE_MUTEX_STATIC_MASTER)) );
+  if( pVfs==0 ){
+    /* No-op */
+  }else if( vfsList==pVfs ){
+    vfsList = pVfs->pNext;
+  }else if( vfsList ){
+    sqlite3_vfs *p = vfsList;
+    while( p->pNext && p->pNext!=pVfs ){
+      p = p->pNext;
+    }
+    if( p->pNext==pVfs ){
+      p->pNext = pVfs->pNext;
+    }
+  }
+}
+
+/*
+** Register a VFS with the system.  It is harmless to register the same
+** VFS multiple times.  The new VFS becomes the default if makeDflt is
+** true.
+*/
+int sqlite3_vfs_register(sqlite3_vfs *pVfs, int makeDflt){
+#ifndef SQLITE_MUTEX_NOOP
+  sqlite3_mutex *mutex = sqlite3_mutex_alloc(SQLITE_MUTEX_STATIC_MASTER);
+#endif
+  sqlite3_vfs_find(0);  /* Make sure we are initialized */
+  sqlite3_mutex_enter(mutex);
+  vfsUnlink(pVfs);
+  if( makeDflt || vfsList==0 ){
+    pVfs->pNext = vfsList;
+    vfsList = pVfs;
+  }else{
+    pVfs->pNext = vfsList->pNext;
+    vfsList->pNext = pVfs;
+  }
+  assert(vfsList);
+  sqlite3_mutex_leave(mutex);
+  return SQLITE_OK;
+}
+
+/*
+** Unregister a VFS so that it is no longer accessible.
+*/
+int sqlite3_vfs_unregister(sqlite3_vfs *pVfs){
+#ifndef SQLITE_MUTEX_NOOP
+  sqlite3_mutex *mutex = sqlite3_mutex_alloc(SQLITE_MUTEX_STATIC_MASTER);
+#endif
+  sqlite3_mutex_enter(mutex);
+  vfsUnlink(pVfs);
+  sqlite3_mutex_leave(mutex);
+  return SQLITE_OK;
+}
diff --git a/uppsrc/plugin/sqlite3/lib/os.h b/uppsrc/plugin/sqlite3/lib/os.h
new file mode 100644
index 000000000..dd0d019b0
--- /dev/null
+++ b/uppsrc/plugin/sqlite3/lib/os.h
@@ -0,0 +1,275 @@
+/*
+** 2001 September 16
+**
+** The author disclaims copyright to this source code.  In place of
+** a legal notice, here is a blessing:
+**
+**    May you do good and not evil.
+**    May you find forgiveness for yourself and forgive others.
+**    May you share freely, never taking more than you give.
+**
+******************************************************************************
+**
+** This header file (together with is companion C source-code file
+** "os.c") attempt to abstract the underlying operating system so that
+** the SQLite library will work on both POSIX and windows systems.
+**
+** This header file is #include-ed by sqliteInt.h and thus ends up
+** being included by every source file.
+*/
+#ifndef _SQLITE_OS_H_
+#define _SQLITE_OS_H_
+
+/*
+** Figure out if we are dealing with Unix, Windows, or some other
+** operating system.  After the following block of preprocess macros,
+** all of OS_UNIX, OS_WIN, OS_OS2, and OS_OTHER will defined to either
+** 1 or 0.  One of the four will be 1.  The other three will be 0.
+*/
+#if defined(OS_OTHER)
+# if OS_OTHER==1
+#   undef OS_UNIX
+#   define OS_UNIX 0
+#   undef OS_WIN
+#   define OS_WIN 0
+#   undef OS_OS2
+#   define OS_OS2 0
+# else
+#   undef OS_OTHER
+# endif
+#endif
+#if !defined(OS_UNIX) && !defined(OS_OTHER)
+# define OS_OTHER 0
+# ifndef OS_WIN
+#   if defined(_WIN32) || defined(WIN32) || defined(__CYGWIN__) || defined(__MINGW32__) || defined(__BORLANDC__)
+#     define OS_WIN 1
+#     define OS_UNIX 0
+#     define OS_OS2 0
+#   elif defined(__EMX__) || defined(_OS2) || defined(OS2) || defined(_OS2_) || defined(__OS2__)
+#     define OS_WIN 0
+#     define OS_UNIX 0
+#     define OS_OS2 1
+#   else
+#     define OS_WIN 0
+#     define OS_UNIX 1
+#     define OS_OS2 0
+#  endif
+# else
+#  define OS_UNIX 0
+#  define OS_OS2 0
+# endif
+#else
+# ifndef OS_WIN
+#  define OS_WIN 0
+# endif
+#endif
+
+
+
+/*
+** Define the maximum size of a temporary filename
+*/
+#if OS_WIN
+# include <windows.h>
+# define SQLITE_TEMPNAME_SIZE (MAX_PATH+50)
+#elif OS_OS2
+# if (__GNUC__ > 3 || __GNUC__ == 3 && __GNUC_MINOR__ >= 3) && defined(OS2_HIGH_MEMORY)
+#  include <os2safe.h> /* has to be included before os2.h for linking to work */
+# endif
+# define INCL_DOSDATETIME
+# define INCL_DOSFILEMGR
+# define INCL_DOSERRORS
+# define INCL_DOSMISC
+# define INCL_DOSPROCESS
+# define INCL_DOSMODULEMGR
+# define INCL_DOSSEMAPHORES
+# include <os2.h>
+# define SQLITE_TEMPNAME_SIZE (CCHMAXPATHCOMP)
+#else
+# define SQLITE_TEMPNAME_SIZE 200
+#endif
+
+/* If the SET_FULLSYNC macro is not defined above, then make it
+** a no-op
+*/
+#ifndef SET_FULLSYNC
+# define SET_FULLSYNC(x,y)
+#endif
+
+/*
+** The default size of a disk sector
+*/
+#ifndef SQLITE_DEFAULT_SECTOR_SIZE
+# define SQLITE_DEFAULT_SECTOR_SIZE 512
+#endif
+
+/*
+** Temporary files are named starting with this prefix followed by 16 random
+** alphanumeric characters, and no file extension. They are stored in the
+** OS's standard temporary file directory, and are deleted prior to exit.
+** If sqlite is being embedded in another program, you may wish to change the
+** prefix to reflect your program's name, so that if your program exits
+** prematurely, old temporary files can be easily identified. This can be done
+** using -DSQLITE_TEMP_FILE_PREFIX=myprefix_ on the compiler command line.
+**
+** 2006-10-31:  The default prefix used to be "sqlite_".  But then
+** Mcafee started using SQLite in their anti-virus product and it
+** started putting files with the "sqlite" name in the c:/temp folder.
+** This annoyed many windows users.  Those users would then do a
+** Google search for "sqlite", find the telephone numbers of the
+** developers and call to wake them up at night and complain.
+** For this reason, the default name prefix is changed to be "sqlite"
+** spelled backwards.  So the temp files are still identified, but
+** anybody smart enough to figure out the code is also likely smart
+** enough to know that calling the developer will not help get rid
+** of the file.
+*/
+#ifndef SQLITE_TEMP_FILE_PREFIX
+# define SQLITE_TEMP_FILE_PREFIX "etilqs_"
+#endif
+
+/*
+** The following values may be passed as the second argument to
+** sqlite3OsLock(). The various locks exhibit the following semantics:
+**
+** SHARED:    Any number of processes may hold a SHARED lock simultaneously.
+** RESERVED:  A single process may hold a RESERVED lock on a file at
+**            any time. Other processes may hold and obtain new SHARED locks.
+** PENDING:   A single process may hold a PENDING lock on a file at
+**            any one time. Existing SHARED locks may persist, but no new
+**            SHARED locks may be obtained by other processes.
+** EXCLUSIVE: An EXCLUSIVE lock precludes all other locks.
+**
+** PENDING_LOCK may not be passed directly to sqlite3OsLock(). Instead, a
+** process that requests an EXCLUSIVE lock may actually obtain a PENDING
+** lock. This can be upgraded to an EXCLUSIVE lock by a subsequent call to
+** sqlite3OsLock().
+*/
+#define NO_LOCK         0
+#define SHARED_LOCK     1
+#define RESERVED_LOCK   2
+#define PENDING_LOCK    3
+#define EXCLUSIVE_LOCK  4
+
+/*
+** File Locking Notes:  (Mostly about windows but also some info for Unix)
+**
+** We cannot use LockFileEx() or UnlockFileEx() on Win95/98/ME because
+** those functions are not available.  So we use only LockFile() and
+** UnlockFile().
+**
+** LockFile() prevents not just writing but also reading by other processes.
+** A SHARED_LOCK is obtained by locking a single randomly-chosen
+** byte out of a specific range of bytes. The lock byte is obtained at
+** random so two separate readers can probably access the file at the
+** same time, unless they are unlucky and choose the same lock byte.
+** An EXCLUSIVE_LOCK is obtained by locking all bytes in the range.
+** There can only be one writer.  A RESERVED_LOCK is obtained by locking
+** a single byte of the file that is designated as the reserved lock byte.
+** A PENDING_LOCK is obtained by locking a designated byte different from
+** the RESERVED_LOCK byte.
+**
+** On WinNT/2K/XP systems, LockFileEx() and UnlockFileEx() are available,
+** which means we can use reader/writer locks.  When reader/writer locks
+** are used, the lock is placed on the same range of bytes that is used
+** for probabilistic locking in Win95/98/ME.  Hence, the locking scheme
+** will support two or more Win95 readers or two or more WinNT readers.
+** But a single Win95 reader will lock out all WinNT readers and a single
+** WinNT reader will lock out all other Win95 readers.
+**
+** The following #defines specify the range of bytes used for locking.
+** SHARED_SIZE is the number of bytes available in the pool from which
+** a random byte is selected for a shared lock.  The pool of bytes for
+** shared locks begins at SHARED_FIRST.
+**
+** These #defines are available in sqlite_aux.h so that adaptors for
+** connecting SQLite to other operating systems can use the same byte
+** ranges for locking.  In particular, the same locking strategy and
+** byte ranges are used for Unix.  This leaves open the possiblity of having
+** clients on win95, winNT, and unix all talking to the same shared file
+** and all locking correctly.  To do so would require that samba (or whatever
+** tool is being used for file sharing) implements locks correctly between
+** windows and unix.  I'm guessing that isn't likely to happen, but by
+** using the same locking range we are at least open to the possibility.
+**
+** Locking in windows is manditory.  For this reason, we cannot store
+** actual data in the bytes used for locking.  The pager never allocates
+** the pages involved in locking therefore.  SHARED_SIZE is selected so
+** that all locks will fit on a single page even at the minimum page size.
+** PENDING_BYTE defines the beginning of the locks.  By default PENDING_BYTE
+** is set high so that we don't have to allocate an unused page except
+** for very large databases.  But one should test the page skipping logic
+** by setting PENDING_BYTE low and running the entire regression suite.
+**
+** Changing the value of PENDING_BYTE results in a subtly incompatible
+** file format.  Depending on how it is changed, you might not notice
+** the incompatibility right away, even running a full regression test.
+** The default location of PENDING_BYTE is the first byte past the
+** 1GB boundary.
+**
+*/
+#ifndef SQLITE_TEST
+#define PENDING_BYTE      0x40000000  /* First byte past the 1GB boundary */
+#else
+extern unsigned int sqlite3_pending_byte;
+#define PENDING_BYTE sqlite3_pending_byte
+#endif
+
+#define RESERVED_BYTE     (PENDING_BYTE+1)
+#define SHARED_FIRST      (PENDING_BYTE+2)
+#define SHARED_SIZE       510
+
+/*
+** Functions for accessing sqlite3_file methods
+*/
+int sqlite3OsClose(sqlite3_file*);
+int sqlite3OsRead(sqlite3_file*, void*, int amt, i64 offset);
+int sqlite3OsWrite(sqlite3_file*, const void*, int amt, i64 offset);
+int sqlite3OsTruncate(sqlite3_file*, i64 size);
+int sqlite3OsSync(sqlite3_file*, int);
+int sqlite3OsFileSize(sqlite3_file*, i64 *pSize);
+int sqlite3OsLock(sqlite3_file*, int);
+int sqlite3OsUnlock(sqlite3_file*, int);
+int sqlite3OsCheckReservedLock(sqlite3_file *id);
+int sqlite3OsFileControl(sqlite3_file*,int,void*);
+int sqlite3OsSectorSize(sqlite3_file *id);
+int sqlite3OsDeviceCharacteristics(sqlite3_file *id);
+
+/*
+** Functions for accessing sqlite3_vfs methods
+*/
+int sqlite3OsOpen(sqlite3_vfs *, const char *, sqlite3_file*, int, int *);
+int sqlite3OsDelete(sqlite3_vfs *, const char *, int);
+int sqlite3OsAccess(sqlite3_vfs *, const char *, int);
+int sqlite3OsGetTempname(sqlite3_vfs *, int, char *);
+int sqlite3OsFullPathname(sqlite3_vfs *, const char *, int, char *);
+void *sqlite3OsDlOpen(sqlite3_vfs *, const char *);
+void sqlite3OsDlError(sqlite3_vfs *, int, char *);
+void *sqlite3OsDlSym(sqlite3_vfs *, void *, const char *);
+void sqlite3OsDlClose(sqlite3_vfs *, void *);
+int sqlite3OsRandomness(sqlite3_vfs *, int, char *);
+int sqlite3OsSleep(sqlite3_vfs *, int);
+int sqlite3OsCurrentTime(sqlite3_vfs *, double*);
+
+/*
+** Convenience functions for opening and closing files using
+** sqlite3_malloc() to obtain space for the file-handle structure.
+*/
+int sqlite3OsOpenMalloc(sqlite3_vfs *, const char *, sqlite3_file **, int,int*);
+int sqlite3OsCloseFree(sqlite3_file *);
+
+/*
+** Each OS-specific backend defines an instance of the following
+** structure for returning a pointer to its sqlite3_vfs.  If OS_OTHER
+** is defined (meaning that the application-defined OS interface layer
+** is used) then there is no default VFS.   The application must
+** register one or more VFS structures using sqlite3_vfs_register()
+** before attempting to use SQLite.
+*/
+#if OS_UNIX || OS_WIN || OS_OS2
+sqlite3_vfs *sqlite3OsDefaultVfs(void);
+#else
+# define sqlite3OsDefaultVfs(X) 0
+#endif
+
+#endif /* _SQLITE_OS_H_ */
diff --git a/uppsrc/plugin/sqlite3/lib/os_common.h b/uppsrc/plugin/sqlite3/lib/os_common.h
new file mode 100644
index 000000000..26ea7d6af
--- /dev/null
+++ b/uppsrc/plugin/sqlite3/lib/os_common.h
@@ -0,0 +1,131 @@
+/*
+** 2004 May 22
+**
+** The author disclaims copyright to this source code.  In place of
+** a legal notice, here is a blessing:
+**
+**    May you do good and not evil.
+**    May you find forgiveness for yourself and forgive others.
+**    May you share freely, never taking more than you give.
+**
+******************************************************************************
+**
+** This file contains macros and a little bit of code that is common to
+** all of the platform-specific files (os_*.c) and is #included into those
+** files.
+**
+** This file should be #included by the os_*.c files only.  It is not a
+** general purpose header file.
+*/
+
+/*
+** At least two bugs have slipped in because we changed the MEMORY_DEBUG
+** macro to SQLITE_DEBUG and some older makefiles have not yet made the
+** switch.  The following code should catch this problem at compile-time.
+*/
+#ifdef MEMORY_DEBUG
+# error "The MEMORY_DEBUG macro is obsolete.  Use SQLITE_DEBUG instead."
+#endif
+
+
+/*
+ * When testing, this global variable stores the location of the
+ * pending-byte in the database file.
+ */
+#ifdef SQLITE_TEST
+unsigned int sqlite3_pending_byte = 0x40000000;
+#endif
+
+#ifdef SQLITE_DEBUG
+int sqlite3OSTrace = 0;
+#define OSTRACE1(X)         if( sqlite3OSTrace ) sqlite3DebugPrintf(X)
+#define OSTRACE2(X,Y)       if( sqlite3OSTrace ) sqlite3DebugPrintf(X,Y)
+#define OSTRACE3(X,Y,Z)     if( sqlite3OSTrace ) sqlite3DebugPrintf(X,Y,Z)
+#define OSTRACE4(X,Y,Z,A)   if( sqlite3OSTrace ) sqlite3DebugPrintf(X,Y,Z,A)
+#define OSTRACE5(X,Y,Z,A,B) if( sqlite3OSTrace ) sqlite3DebugPrintf(X,Y,Z,A,B)
+#define OSTRACE6(X,Y,Z,A,B,C) \
+    if(sqlite3OSTrace) sqlite3DebugPrintf(X,Y,Z,A,B,C)
+#define OSTRACE7(X,Y,Z,A,B,C,D) \
+    if(sqlite3OSTrace) sqlite3DebugPrintf(X,Y,Z,A,B,C,D)
+#else
+#define OSTRACE1(X)
+#define OSTRACE2(X,Y)
+#define OSTRACE3(X,Y,Z)
+#define OSTRACE4(X,Y,Z,A)
+#define OSTRACE5(X,Y,Z,A,B)
+#define OSTRACE6(X,Y,Z,A,B,C)
+#define OSTRACE7(X,Y,Z,A,B,C,D)
+#endif
+
+/*
+** Macros for performance tracing.  Normally turned off.  Only works
+** on i486 hardware.
+*/
+#ifdef SQLITE_PERFORMANCE_TRACE
+__inline__ unsigned long long int hwtime(void){
+  unsigned long long int x;
+  __asm__("rdtsc\n\t"
+          "mov %%edx, %%ecx\n\t"
+          :"=A" (x));
+  return x;
+}
+static unsigned long long int g_start;
+static unsigned int elapse;
+#define TIMER_START       g_start=hwtime()
+#define TIMER_END         elapse=hwtime()-g_start
+#define TIMER_ELAPSED     elapse
+#else
+#define TIMER_START
+#define TIMER_END
+#define TIMER_ELAPSED     0
+#endif
+
+/*
+** If we compile with the SQLITE_TEST macro set, then the following block
+** of code will give us the ability to simulate a disk I/O error.  This
+** is used for testing the I/O recovery logic.
+*/
+#ifdef SQLITE_TEST
+int sqlite3_io_error_hit = 0;            /* Total number of I/O Errors */
+int sqlite3_io_error_hardhit = 0;        /* Number of non-benign errors */
+int sqlite3_io_error_pending = 0;        /* Count down to first I/O error */
+int sqlite3_io_error_persist = 0;        /* True if I/O errors persist */
+int sqlite3_io_error_benign = 0;         /* True if errors are benign */
+int sqlite3_diskfull_pending = 0;
+int sqlite3_diskfull = 0;
+#define SimulateIOErrorBenign(X) sqlite3_io_error_benign=(X)
+#define SimulateIOError(CODE)  \
+  if( (sqlite3_io_error_persist && sqlite3_io_error_hit) \
+       || sqlite3_io_error_pending-- == 1 )  \
+              { local_ioerr(); CODE; }
+static void local_ioerr(){
+  IOTRACE(("IOERR\n"));
+  sqlite3_io_error_hit++;
+  if( !sqlite3_io_error_benign ) sqlite3_io_error_hardhit++;
+}
+#define SimulateDiskfullError(CODE) \
+   if( sqlite3_diskfull_pending ){ \
+     if( sqlite3_diskfull_pending == 1 ){ \
+       local_ioerr(); \
+       sqlite3_diskfull = 1; \
+       sqlite3_io_error_hit = 1; \
+       CODE; \
+     }else{ \
+       sqlite3_diskfull_pending--; \
+     } \
+   }
+#else
+#define SimulateIOErrorBenign(X)
+#define SimulateIOError(A)
+#define SimulateDiskfullError(A)
+#endif
+
+/*
+** When testing, keep a count of the number of open files.
+*/
+#ifdef SQLITE_TEST
+int sqlite3_open_file_count = 0;
+#define OpenCounter(X)  sqlite3_open_file_count+=(X)
+#else
+#define OpenCounter(X)
+#endif
diff --git a/uppsrc/plugin/sqlite3/lib/os_os2.c b/uppsrc/plugin/sqlite3/lib/os_os2.c
new file mode 100644
index 000000000..0b4f7a71e
--- /dev/null
+++ b/uppsrc/plugin/sqlite3/lib/os_os2.c
@@ -0,0 +1,984 @@
+/*
+** 2006 Feb 14
+**
+** The author disclaims copyright to this source code.  In place of
+** a legal notice, here is a blessing:
+**
+**    May you do good and not evil.
+**    May you find forgiveness for yourself and forgive others.
+**    May you share freely, never taking more than you give.
+**
+******************************************************************************
+**
+** This file contains code that is specific to OS/2.
+*/
+
+#include "sqliteInt.h"
+
+#if OS_OS2
+
+/*
+** A Note About Memory Allocation:
+**
+** This driver uses malloc()/free() directly rather than going through
+** the SQLite-wrappers sqlite3_malloc()/sqlite3_free().  Those wrappers
+** are designed for use on embedded systems where memory is scarce and
+** malloc failures happen frequently.  OS/2 does not typically run on
+** embedded systems, and when it does the developers normally have bigger
+** problems to worry about than running out of memory.  So there is not
+** a compelling need to use the wrappers.
+**
+** But there is a good reason to not use the wrappers.  If we use the
+** wrappers then we will get simulated malloc() failures within this
+** driver.  And that causes all kinds of problems for our tests.  We
+** could enhance SQLite to deal with simulated malloc failures within
+** the OS driver, but the code to deal with those failure would not
+** be exercised on Linux (which does not need to malloc() in the driver)
+** and so we would have difficulty writing coverage tests for that
+** code.  Better to leave the code out, we think.
+**
+** The point of this discussion is as follows:  When creating a new
+** OS layer for an embedded system, if you use this file as an example,
+** avoid the use of malloc()/free().  Those routines work ok on OS/2
+** desktops but not so well in embedded systems.
+*/
+
+/*
+** Macros used to determine whether or not to use threads.
+*/
+#if defined(SQLITE_THREADSAFE) && SQLITE_THREADSAFE
+# define SQLITE_OS2_THREADS 1
+#endif
+
+/*
+** Include code that is common to all os_*.c files
+*/
+#include "os_common.h"
+
+/*
+** The os2File structure is subclass of sqlite3_file specific for the OS/2
+** protability layer.
+*/
+typedef struct os2File os2File;
+struct os2File {
+  const sqlite3_io_methods *pMethod;  /* Always the first entry */
+  HFILE h;                  /* Handle for accessing the file */
+  int delOnClose;           /* True if file is to be deleted on close */
+  char* pathToDel;          /* Name of file to delete on close */
+  unsigned char locktype;   /* Type of lock currently held on this file */
+};
+
+/*****************************************************************************
+** The next group of routines implement the I/O methods specified
+** by the sqlite3_io_methods object.
+******************************************************************************/
+
+/*
+** Close a file.
+*/
+int os2Close( sqlite3_file *id ){
+  APIRET rc = NO_ERROR;
+  os2File *pFile;
+  if( id && (pFile = (os2File*)id) != 0 ){
+    OSTRACE2( "CLOSE %d\n", pFile->h );
+    rc = DosClose( pFile->h );
+    pFile->locktype = NO_LOCK;
+    if( pFile->delOnClose != 0 ){
+      rc = DosForceDelete( (PSZ)pFile->pathToDel );
+    }
+    if( pFile->pathToDel ){
+      free( pFile->pathToDel );
+    }
+    id = 0;
+    OpenCounter( -1 );
+  }
+
+  return rc == NO_ERROR ? SQLITE_OK : SQLITE_IOERR;
+}
+
+/*
+** Read data from a file into a buffer.  Return SQLITE_OK if all
+** bytes were read successfully and SQLITE_IOERR if anything goes
+** wrong.
+*/
+int os2Read(
+  sqlite3_file *id,               /* File to read from */
+  void *pBuf,                     /* Write content into this buffer */
+  int amt,                        /* Number of bytes to read */
+  sqlite3_int64 offset            /* Begin reading at this offset */
+){
+  ULONG fileLocation = 0L;
+  ULONG got;
+  os2File *pFile = (os2File*)id;
+  assert( id!=0 );
+  SimulateIOError( return SQLITE_IOERR_READ );
+  OSTRACE3( "READ %d lock=%d\n", pFile->h, pFile->locktype );
+  if( DosSetFilePtr(pFile->h, offset, FILE_BEGIN, &fileLocation) != NO_ERROR ){
+    return SQLITE_IOERR;
+  }
+  if( DosRead( pFile->h, pBuf, amt, &got ) != NO_ERROR ){
+    return SQLITE_IOERR_READ;
+  }
+  if( got == (ULONG)amt )
+    return SQLITE_OK;
+  else {
+    memset(&((char*)pBuf)[got], 0, amt-got);
+    return SQLITE_IOERR_SHORT_READ;
+  }
+}
+
+/*
+** Write data from a buffer into a file.  Return SQLITE_OK on success
+** or some other error code on failure.
+*/
+int os2Write(
+  sqlite3_file *id,               /* File to write into */
+  const void *pBuf,               /* The bytes to be written */
+  int amt,                        /* Number of bytes to write */
+  sqlite3_int64 offset            /* Offset into the file to begin writing at */
+){
+  ULONG fileLocation = 0L;
+  APIRET rc = NO_ERROR;
+  ULONG wrote;
+  os2File *pFile = (os2File*)id;
+  assert( id!=0 );
+  SimulateIOError( return SQLITE_IOERR_WRITE );
+  SimulateDiskfullError( return SQLITE_FULL );
+  OSTRACE3( "WRITE %d lock=%d\n", pFile->h, pFile->locktype );
+  if( DosSetFilePtr(pFile->h, offset, FILE_BEGIN, &fileLocation) != NO_ERROR ){
+    return SQLITE_IOERR;
+  }
+  assert( amt>0 );
+  while( amt > 0 &&
+         (rc = DosWrite( pFile->h, (PVOID)pBuf, amt, &wrote )) &&
+         wrote > 0
+  ){
+    amt -= wrote;
+    pBuf = &((char*)pBuf)[wrote];
+  }
+
+  return ( rc != NO_ERROR || amt > (int)wrote ) ? SQLITE_FULL : SQLITE_OK;
+}
+
+/*
+** Truncate an open file to a specified size
+*/
+int os2Truncate( sqlite3_file *id, i64 nByte ){
+  APIRET rc = NO_ERROR;
+  os2File *pFile = (os2File*)id;
+  OSTRACE3( "TRUNCATE %d %lld\n", pFile->h, nByte );
+  SimulateIOError( return SQLITE_IOERR_TRUNCATE );
+  rc = DosSetFileSize( pFile->h, nByte );
+  return rc == NO_ERROR ? SQLITE_OK : SQLITE_IOERR;
+}
+
+#ifdef SQLITE_TEST
+/*
+** Count the number of fullsyncs and normal syncs.  This is used to test
+** that syncs and fullsyncs are occuring at the right times.
+*/
+int sqlite3_sync_count = 0;
+int sqlite3_fullsync_count = 0;
+#endif
+
+/*
+** Make sure all writes to a particular file are committed to disk.
+*/
+int os2Sync( sqlite3_file *id, int flags ){
+  os2File *pFile = (os2File*)id;
+  OSTRACE3( "SYNC %d lock=%d\n", pFile->h, pFile->locktype );
+#ifdef SQLITE_TEST
+  if( flags & SQLITE_SYNC_FULL){
+    sqlite3_fullsync_count++;
+  }
+  sqlite3_sync_count++;
+#endif
+  return DosResetBuffer( pFile->h ) == NO_ERROR ? SQLITE_OK : SQLITE_IOERR;
+}
+
+/*
+** Determine the current size of a file in bytes
+*/
+int os2FileSize( sqlite3_file *id, sqlite3_int64 *pSize ){
+  APIRET rc = NO_ERROR;
+  FILESTATUS3 fsts3FileInfo;
+  memset(&fsts3FileInfo, 0, sizeof(fsts3FileInfo));
+  assert( id!=0 );
+  SimulateIOError( return SQLITE_IOERR );
+  rc = DosQueryFileInfo( ((os2File*)id)->h, FIL_STANDARD, &fsts3FileInfo, sizeof(FILESTATUS3) );
+  if( rc == NO_ERROR ){
+    *pSize = fsts3FileInfo.cbFile;
+    return SQLITE_OK;
+  }else{
+    return SQLITE_IOERR;
+  }
+}
+
+/*
+** Acquire a reader lock.
+*/
+static int getReadLock( os2File *pFile ){
+  FILELOCK  LockArea,
+            UnlockArea;
+  APIRET res;
+  memset(&LockArea, 0, sizeof(LockArea));
+  memset(&UnlockArea, 0, sizeof(UnlockArea));
+  LockArea.lOffset = SHARED_FIRST;
+  LockArea.lRange = SHARED_SIZE;
+  UnlockArea.lOffset = 0L;
+  UnlockArea.lRange = 0L;
+  res = DosSetFileLocks( pFile->h, &UnlockArea, &LockArea, 2000L, 1L );
+  OSTRACE3( "GETREADLOCK %d res=%d\n", pFile->h, res );
+  return res;
+}
+
+/*
+** Undo a readlock
+*/
+static int unlockReadLock( os2File *id ){
+  FILELOCK  LockArea,
+            UnlockArea;
+  APIRET res;
+  memset(&LockArea, 0, sizeof(LockArea));
+  memset(&UnlockArea, 0, sizeof(UnlockArea));
+  LockArea.lOffset = 0L;
+  LockArea.lRange = 0L;
+  UnlockArea.lOffset = SHARED_FIRST;
+  UnlockArea.lRange = SHARED_SIZE;
+  res = DosSetFileLocks( id->h, &UnlockArea, &LockArea, 2000L, 1L );
+  OSTRACE3( "UNLOCK-READLOCK file handle=%d res=%d?\n", id->h, res );
+  return res;
+}
+
+/*
+** Lock the file with the lock specified by parameter locktype - one
+** of the following:
+**
+**     (1) SHARED_LOCK
+**     (2) RESERVED_LOCK
+**     (3) PENDING_LOCK
+**     (4) EXCLUSIVE_LOCK
+**
+** Sometimes when requesting one lock state, additional lock states
+** are inserted in between.  The locking might fail on one of the later
+** transitions leaving the lock state different from what it started but
+** still short of its goal.  The following chart shows the allowed
+** transitions and the inserted intermediate states:
+**
+**    UNLOCKED -> SHARED
+**    SHARED -> RESERVED
+**    SHARED -> (PENDING) -> EXCLUSIVE
+**    RESERVED -> (PENDING) -> EXCLUSIVE
+**    PENDING -> EXCLUSIVE
+**
+** This routine will only increase a lock.  The os2Unlock() routine
+** erases all locks at once and returns us immediately to locking level 0.
+** It is not possible to lower the locking level one step at a time.  You
+** must go straight to locking level 0.
+*/
+int os2Lock( sqlite3_file *id, int locktype ){
+  int rc = SQLITE_OK;       /* Return code from subroutines */
+  APIRET res = NO_ERROR;    /* Result of an OS/2 lock call */
+  int newLocktype;       /* Set pFile->locktype to this value before exiting */
+  int gotPendingLock = 0;/* True if we acquired a PENDING lock this time */
+  FILELOCK  LockArea,
+            UnlockArea;
+  os2File *pFile = (os2File*)id;
+  memset(&LockArea, 0, sizeof(LockArea));
+  memset(&UnlockArea, 0, sizeof(UnlockArea));
+  assert( pFile!=0 );
+  OSTRACE4( "LOCK %d %d was %d\n", pFile->h, locktype, pFile->locktype );
+
+  /* If there is already a lock of this type or more restrictive on the
+  ** os2File, do nothing. Don't use the end_lock: exit path, as
+  ** sqlite3OsEnterMutex() hasn't been called yet.
+  */
+  if( pFile->locktype>=locktype ){
+    OSTRACE3( "LOCK %d %d ok (already held)\n", pFile->h, locktype );
+    return SQLITE_OK;
+  }
+
+  /* Make sure the locking sequence is correct
+  */
+  assert( pFile->locktype!=NO_LOCK || locktype==SHARED_LOCK );
+  assert( locktype!=PENDING_LOCK );
+  assert( locktype!=RESERVED_LOCK || pFile->locktype==SHARED_LOCK );
+
+  /* Lock the PENDING_LOCK byte if we need to acquire a PENDING lock or
+  ** a SHARED lock.  If we are acquiring a SHARED lock, the acquisition of
+  ** the PENDING_LOCK byte is temporary.
+  */
+  newLocktype = pFile->locktype;
+  if( pFile->locktype==NO_LOCK
+      || (locktype==EXCLUSIVE_LOCK && pFile->locktype==RESERVED_LOCK)
+  ){
+    int cnt = 3;
+
+    LockArea.lOffset = PENDING_BYTE;
+    LockArea.lRange = 1L;
+    UnlockArea.lOffset = 0L;
+    UnlockArea.lRange = 0L;
+
+    while( cnt-->0 && ( res = DosSetFileLocks( pFile->h, &UnlockArea, &LockArea, 2000L, 1L) )
+                      != NO_ERROR
+    ){
+      /* Try 3 times to get the pending lock.  The pending lock might be
+      ** held by another reader process who will release it momentarily.
+      */
+      OSTRACE2( "LOCK could not get a PENDING lock. cnt=%d\n", cnt );
+      DosSleep(1);
+    }
+    if( res == NO_ERROR){
+      gotPendingLock = 1;
+      OSTRACE3( "LOCK %d pending lock boolean set.  res=%d\n", pFile->h, res );
+    }
+  }
+
+  /* Acquire a shared lock
+  */
+  if( locktype==SHARED_LOCK && res == NO_ERROR ){
+    assert( pFile->locktype==NO_LOCK );
+    res = getReadLock(pFile);
+    if( res == NO_ERROR ){
+      newLocktype = SHARED_LOCK;
+    }
+    OSTRACE3( "LOCK %d acquire shared lock. res=%d\n", pFile->h, res );
+  }
+
+  /* Acquire a RESERVED lock
+  */
+  if( locktype==RESERVED_LOCK && res == NO_ERROR ){
+    assert( pFile->locktype==SHARED_LOCK );
+    LockArea.lOffset = RESERVED_BYTE;
+    LockArea.lRange = 1L;
+    UnlockArea.lOffset = 0L;
+    UnlockArea.lRange = 0L;
+    res = DosSetFileLocks( pFile->h, &UnlockArea, &LockArea, 2000L, 1L );
+    if( res == NO_ERROR ){
+      newLocktype = RESERVED_LOCK;
+    }
+    OSTRACE3( "LOCK %d acquire reserved lock. res=%d\n", pFile->h, res );
+  }
+
+  /* Acquire a PENDING lock
+  */
+  if( locktype==EXCLUSIVE_LOCK && res == NO_ERROR ){
+    newLocktype = PENDING_LOCK;
+    gotPendingLock = 0;
+    OSTRACE2( "LOCK %d acquire pending lock. pending lock boolean unset.\n", pFile->h );
+  }
+
+  /* Acquire an EXCLUSIVE lock
+  */
+  if( locktype==EXCLUSIVE_LOCK && res == NO_ERROR ){
+    assert( pFile->locktype>=SHARED_LOCK );
+    res = unlockReadLock(pFile);
+    OSTRACE2( "unreadlock = %d\n", res );
+    LockArea.lOffset = SHARED_FIRST;
+    LockArea.lRange = SHARED_SIZE;
+    UnlockArea.lOffset = 0L;
+    UnlockArea.lRange = 0L;
+    res = DosSetFileLocks( pFile->h, &UnlockArea, &LockArea, 2000L, 1L );
+    if( res == NO_ERROR ){
+      newLocktype = EXCLUSIVE_LOCK;
+    }else{
+      OSTRACE2( "OS/2 error-code = %d\n", res );
+      getReadLock(pFile);
+    }
+    OSTRACE3( "LOCK %d acquire exclusive lock.  res=%d\n", pFile->h, res );
+  }
+
+  /* If we are holding a PENDING lock that ought to be released, then
+  ** release it now.
+  */
+  if( gotPendingLock && locktype==SHARED_LOCK ){
+    int r;
+    LockArea.lOffset = 0L;
+    LockArea.lRange = 0L;
+    UnlockArea.lOffset = PENDING_BYTE;
+    UnlockArea.lRange = 1L;
+    r = DosSetFileLocks( pFile->h, &UnlockArea, &LockArea, 2000L, 1L );
+    OSTRACE3( "LOCK %d unlocking pending/is shared. r=%d\n", pFile->h, r );
+  }
+
+  /* Update the state of the lock has held in the file descriptor then
+  ** return the appropriate result code.
+  */
+  if( res == NO_ERROR ){
+    rc = SQLITE_OK;
+  }else{
+    OSTRACE4( "LOCK FAILED %d trying for %d but got %d\n", pFile->h,
+              locktype, newLocktype );
+    rc = SQLITE_BUSY;
+  }
+  pFile->locktype = newLocktype;
+  OSTRACE3( "LOCK %d now %d\n", pFile->h, pFile->locktype );
+  return rc;
+}
+
+/*
+** This routine checks if there is a RESERVED lock held on the specified
+** file by this or any other process. If such a lock is held, return
+** non-zero, otherwise zero.
+*/
+int os2CheckReservedLock( sqlite3_file *id ){
+  int r = 0;
+  os2File *pFile = (os2File*)id;
+  assert( pFile!=0 );
+  if( pFile->locktype>=RESERVED_LOCK ){
+    r = 1;
+    OSTRACE3( "TEST WR-LOCK %d %d (local)\n", pFile->h, r );
+  }else{
+    FILELOCK  LockArea,
+              UnlockArea;
+    APIRET rc = NO_ERROR;
+    memset(&LockArea, 0, sizeof(LockArea));
+    memset(&UnlockArea, 0, sizeof(UnlockArea));
+    LockArea.lOffset = RESERVED_BYTE;
+    LockArea.lRange = 1L;
+    UnlockArea.lOffset = 0L;
+    UnlockArea.lRange = 0L;
+    rc = DosSetFileLocks( pFile->h, &UnlockArea, &LockArea, 2000L, 1L );
+    OSTRACE3( "TEST WR-LOCK %d lock reserved byte rc=%d\n", pFile->h, rc );
+    if( rc == NO_ERROR ){
+      APIRET rcu = NO_ERROR; /* return code for unlocking */
+      LockArea.lOffset = 0L;
+      LockArea.lRange = 0L;
+      UnlockArea.lOffset = RESERVED_BYTE;
+      UnlockArea.lRange = 1L;
+      rcu = DosSetFileLocks( pFile->h, &UnlockArea, &LockArea, 2000L, 1L );
+      OSTRACE3( "TEST WR-LOCK %d unlock reserved byte r=%d\n", pFile->h, rcu );
+    }
+    r = !(rc == NO_ERROR);
+    OSTRACE3( "TEST WR-LOCK %d %d (remote)\n", pFile->h, r );
+  }
+  return r;
+}
+
+/*
+** Lower the locking level on file descriptor id to locktype.  locktype
+** must be either NO_LOCK or SHARED_LOCK.
+**
+** If the locking level of the file descriptor is already at or below
+** the requested locking level, this routine is a no-op.
+**
+** It is not possible for this routine to fail if the second argument
+** is NO_LOCK.  If the second argument is SHARED_LOCK then this routine
+** might return SQLITE_IOERR;
+*/
+int os2Unlock( sqlite3_file *id, int locktype ){
+  int type;
+  os2File *pFile = (os2File*)id;
+  APIRET rc = SQLITE_OK;
+  APIRET res = NO_ERROR;
+  FILELOCK  LockArea,
+            UnlockArea;
+  memset(&LockArea, 0, sizeof(LockArea));
+  memset(&UnlockArea, 0, sizeof(UnlockArea));
+  assert( pFile!=0 );
+  assert( locktype<=SHARED_LOCK );
+  OSTRACE4( "UNLOCK %d to %d was %d\n", pFile->h, locktype, pFile->locktype );
+  type = pFile->locktype;
+  if( type>=EXCLUSIVE_LOCK ){
+    LockArea.lOffset = 0L;
+    LockArea.lRange = 0L;
+    UnlockArea.lOffset = SHARED_FIRST;
+    UnlockArea.lRange = SHARED_SIZE;
+    res = DosSetFileLocks( pFile->h, &UnlockArea, &LockArea, 2000L, 1L );
+    OSTRACE3( "UNLOCK %d exclusive lock res=%d\n", pFile->h, res );
+    if( locktype==SHARED_LOCK && getReadLock(pFile) != NO_ERROR ){
+      /* This should never happen.  We should always be able to
+      ** reacquire the read lock */
+      OSTRACE3( "UNLOCK %d to %d getReadLock() failed\n", pFile->h, locktype );
+      rc = SQLITE_IOERR_UNLOCK;
+    }
+  }
+  if( type>=RESERVED_LOCK ){
+    LockArea.lOffset = 0L;
+    LockArea.lRange = 0L;
+    UnlockArea.lOffset = RESERVED_BYTE;
+    UnlockArea.lRange = 1L;
+    res = DosSetFileLocks( pFile->h, &UnlockArea, &LockArea, 2000L, 1L );
+    OSTRACE3( "UNLOCK %d reserved res=%d\n", pFile->h, res );
+  }
+  if( locktype==NO_LOCK && type>=SHARED_LOCK ){
+    res = unlockReadLock(pFile);
+    OSTRACE5( "UNLOCK %d is %d want %d res=%d\n", pFile->h, type, locktype, res );
+  }
+  if( type>=PENDING_LOCK ){
+    LockArea.lOffset = 0L;
+    LockArea.lRange = 0L;
+    UnlockArea.lOffset = PENDING_BYTE;
+    UnlockArea.lRange = 1L;
+    res = DosSetFileLocks( pFile->h, &UnlockArea, &LockArea, 2000L, 1L );
+    OSTRACE3( "UNLOCK %d pending res=%d\n", pFile->h, res );
+  }
+  pFile->locktype = locktype;
+  OSTRACE3( "UNLOCK %d now %d\n", pFile->h, pFile->locktype );
+  return rc;
+}
+
+/*
+** Control and query of the open file handle.
+*/
+static int os2FileControl(sqlite3_file *id, int op, void *pArg){
+  switch( op ){
+    case SQLITE_FCNTL_LOCKSTATE: {
+      *(int*)pArg = ((os2File*)id)->locktype;
+      OSTRACE3( "FCNTL_LOCKSTATE %d lock=%d\n", ((os2File*)id)->h, ((os2File*)id)->locktype );
+      return SQLITE_OK;
+    }
+  }
+  return SQLITE_ERROR;
+}
+
+/*
+** Return the sector size in bytes of the underlying block device for
+** the specified file. This is almost always 512 bytes, but may be
+** larger for some devices.
+**
+** SQLite code assumes this function cannot fail. It also assumes that
+** if two files are created in the same file-system directory (i.e.
+** a database and its journal file) that the sector size will be the
+** same for both.
+*/
+static int os2SectorSize(sqlite3_file *id){
+  return SQLITE_DEFAULT_SECTOR_SIZE;
+}
+
+/*
+** Return a vector of device characteristics.
+*/
+static int os2DeviceCharacteristics(sqlite3_file *id){
+  return 0;
+}
+
+/*
+** This vector defines all the methods that can operate on an
+** sqlite3_file for os2.
+*/
+static const sqlite3_io_methods os2IoMethod = {
+  1,                        /* iVersion */
+  os2Close,
+  os2Read,
+  os2Write,
+  os2Truncate,
+  os2Sync,
+  os2FileSize,
+  os2Lock,
+  os2Unlock,
+  os2CheckReservedLock,
+  os2FileControl,
+  os2SectorSize,
+  os2DeviceCharacteristics
+};
+
+/***************************************************************************
+** Here ends the I/O methods that form the sqlite3_io_methods object.
+**
+** The next block of code implements the VFS methods.
+****************************************************************************/
+
+/*
+** Open a file.
+*/
+static int os2Open(
+  sqlite3_vfs *pVfs,            /* Not used */
+  const char *zName,            /* Name of the file */
+  sqlite3_file *id,             /* Write the SQLite file handle here */
+  int flags,                    /* Open mode flags */
+  int *pOutFlags                /* Status return flags */
+){
+  HFILE h;
+  ULONG ulFileAttribute = 0;
+  ULONG ulOpenFlags = 0;
+  ULONG ulOpenMode = 0;
+  os2File *pFile = (os2File*)id;
+  APIRET rc = NO_ERROR;
+  ULONG ulAction;
+
+  memset(pFile, 0, sizeof(*pFile));
+
+  OSTRACE2( "OPEN want %d\n", flags );
+
+  //ulOpenMode = flags & SQLITE_OPEN_READWRITE ? OPEN_ACCESS_READWRITE : OPEN_ACCESS_READONLY;
+  if( flags & SQLITE_OPEN_READWRITE ){
+    ulOpenMode |= OPEN_ACCESS_READWRITE;
+    OSTRACE1( "OPEN read/write\n" );
+  }else{
+    ulOpenMode |= OPEN_ACCESS_READONLY;
+    OSTRACE1( "OPEN read only\n" );
+  }
+
+  //ulOpenFlags = flags & SQLITE_OPEN_CREATE ? OPEN_ACTION_CREATE_IF_NEW : OPEN_ACTION_FAIL_IF_NEW;
+  if( flags & SQLITE_OPEN_CREATE ){
+    ulOpenFlags |= OPEN_ACTION_OPEN_IF_EXISTS | OPEN_ACTION_CREATE_IF_NEW;
+    OSTRACE1( "OPEN open new/create\n" );
+  }else{
+    ulOpenFlags |= OPEN_ACTION_OPEN_IF_EXISTS | OPEN_ACTION_FAIL_IF_NEW;
+    OSTRACE1( "OPEN open existing\n" );
+  }
+
+  //ulOpenMode |= flags & SQLITE_OPEN_MAIN_DB ? OPEN_SHARE_DENYNONE : OPEN_SHARE_DENYWRITE;
+  if( flags & SQLITE_OPEN_MAIN_DB ){
+    ulOpenMode |= OPEN_SHARE_DENYNONE;
+    OSTRACE1( "OPEN share read/write\n" );
+  }else{
+    ulOpenMode |= OPEN_SHARE_DENYWRITE;
+    OSTRACE1( "OPEN share read only\n" );
+  }
+
+  if( flags & (SQLITE_OPEN_TEMP_DB | SQLITE_OPEN_TEMP_JOURNAL
+               | SQLITE_OPEN_SUBJOURNAL) ){
+    //ulFileAttribute = FILE_HIDDEN;  //for debugging, we want to make sure it is deleted
+    ulFileAttribute = FILE_NORMAL;
+    pFile->delOnClose = 1;
+    pFile->pathToDel = (char*)malloc(sizeof(char) * pVfs->mxPathname);
+    sqlite3OsFullPathname(pVfs, zName, pVfs->mxPathname, pFile->pathToDel);
+    OSTRACE1( "OPEN hidden/delete on close file attributes\n" );
+  }else{
+    ulFileAttribute = FILE_ARCHIVED | FILE_NORMAL;
+    pFile->delOnClose = 0;
+    pFile->pathToDel = NULL;
+    OSTRACE1( "OPEN normal file attribute\n" );
+  }
+
+  /* always open in random access mode for possibly better speed */
+  ulOpenMode |= OPEN_FLAGS_RANDOM;
+  ulOpenMode |= OPEN_FLAGS_FAIL_ON_ERROR;
+
+  rc = DosOpen( (PSZ)zName,
+                &h,
+                &ulAction,
+                0L,
+                ulFileAttribute,
+                ulOpenFlags,
+                ulOpenMode,
+                (PEAOP2)NULL );
+  if( rc != NO_ERROR ){
+    OSTRACE7( "OPEN Invalid handle rc=%d: zName=%s, ulAction=%#lx, ulAttr=%#lx, ulFlags=%#lx, ulMode=%#lx\n",
+              rc, zName, ulAction, ulFileAttribute, ulOpenFlags, ulOpenMode );
+    if( flags & SQLITE_OPEN_READWRITE ){
+      OSTRACE2( "OPEN %d Invalid handle\n", ((flags | SQLITE_OPEN_READONLY) & ~SQLITE_OPEN_READWRITE) );
+      return os2Open( 0, zName, id,
+                      ((flags | SQLITE_OPEN_READONLY) & ~SQLITE_OPEN_READWRITE),
+                      pOutFlags );
+    }else{
+      return SQLITE_CANTOPEN;
+    }
+  }
+
+  if( pOutFlags ){
+    *pOutFlags = flags & SQLITE_OPEN_READWRITE ? SQLITE_OPEN_READWRITE : SQLITE_OPEN_READONLY;
+  }
+
+  pFile->pMethod = &os2IoMethod;
+  pFile->h = h;
+  OpenCounter(+1);
+  OSTRACE3( "OPEN %d pOutFlags=%d\n", pFile->h, pOutFlags );
+  return SQLITE_OK;
+}
+
+/*
+** Delete the named file.
+*/
+int os2Delete(
+  sqlite3_vfs *pVfs,                     /* Not used on os2 */
+  const char *zFilename,                 /* Name of file to delete */
+  int syncDir                            /* Not used on os2 */
+){
+  APIRET rc = NO_ERROR;
+  SimulateIOError(return SQLITE_IOERR_DELETE);
+  rc = DosDelete( (PSZ)zFilename );
+  OSTRACE2( "DELETE \"%s\"\n", zFilename );
+  return rc == NO_ERROR ? SQLITE_OK : SQLITE_IOERR;
+}
+
+/*
+** Check the existance and status of a file.
+*/
+static int os2Access(
+  sqlite3_vfs *pVfs,        /* Not used on os2 */
+  const char *zFilename,    /* Name of file to check */
+  int flags                 /* Type of test to make on this file */
+){
+  FILESTATUS3 fsts3ConfigInfo;
+  APIRET rc = NO_ERROR;
+
+  memset(&fsts3ConfigInfo, 0, sizeof(fsts3ConfigInfo));
+  rc = DosQueryPathInfo( (PSZ)zFilename, FIL_STANDARD,
+                         &fsts3ConfigInfo, sizeof(FILESTATUS3) );
+  OSTRACE4( "ACCESS fsts3ConfigInfo.attrFile=%d flags=%d rc=%d\n",
+            fsts3ConfigInfo.attrFile, flags, rc );
+  switch( flags ){
+    case SQLITE_ACCESS_READ:
+    case SQLITE_ACCESS_EXISTS:
+      rc = (rc == NO_ERROR);
+      OSTRACE3( "ACCESS %s access of read and exists  rc=%d\n", zFilename, rc );
+      break;
+    case SQLITE_ACCESS_READWRITE:
+      rc = (fsts3ConfigInfo.attrFile & FILE_READONLY) == 0;
+      OSTRACE3( "ACCESS %s access of read/write  rc=%d\n", zFilename, rc );
+      break;
+    default:
+      assert( !"Invalid flags argument" );
+  }
+  return rc;
+}
+
+
+/*
+** Create a temporary file name in zBuf.  zBuf must be big enough to
+** hold at pVfs->mxPathname characters.
+*/
+static int os2GetTempname( sqlite3_vfs *pVfs, int nBuf, char *zBuf ){
+  static const unsigned char zChars[] =
+    "abcdefghijklmnopqrstuvwxyz"
+    "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+    "0123456789";
+  int i, j;
+  char zTempPathBuf[3];
+  PSZ zTempPath = (PSZ)&zTempPathBuf;
+  if( DosScanEnv( (PSZ)"TEMP", &zTempPath ) ){
+    if( DosScanEnv( (PSZ)"TMP", &zTempPath ) ){
+      if( DosScanEnv( (PSZ)"TMPDIR", &zTempPath ) ){
+           ULONG ulDriveNum = 0, ulDriveMap = 0;
+           DosQueryCurrentDisk( &ulDriveNum, &ulDriveMap );
+           sprintf( (char*)zTempPath, "%c:", (char)( 'A' + ulDriveNum - 1 ) );
+      }
+    }
+  }
+  /* strip off a trailing slashes or backslashes, otherwise we would get *
+   * multiple (back)slashes which causes DosOpen() to fail               */
+  j = strlen(zTempPath);
+  while( j > 0 && ( zTempPath[j-1] == '\\' || zTempPath[j-1] == '/' ) ){
+    j--;
+  }
+  zTempPath[j] = '\0';
+  sqlite3_snprintf( nBuf-30, zBuf,
+                    "%s\\"SQLITE_TEMP_FILE_PREFIX, zTempPath );
+  j = strlen( zBuf );
+  sqlite3Randomness( 20, &zBuf[j] );
+  for( i = 0; i < 20; i++, j++ ){
+    zBuf[j] = (char)zChars[ ((unsigned char)zBuf[j])%(sizeof(zChars)-1) ];
+  }
+  zBuf[j] = 0;
+  OSTRACE2( "TEMP FILENAME: %s\n", zBuf );
+  return SQLITE_OK;
+}
+
+
+/*
+** Turn a relative pathname into a full pathname.  Write the full
+** pathname into zFull[].  zFull[] will be at least pVfs->mxPathname
+** bytes in size.
+*/
+static int os2FullPathname(
+  sqlite3_vfs *pVfs,          /* Pointer to vfs object */
+  const char *zRelative,      /* Possibly relative input path */
+  int nFull,                  /* Size of output buffer in bytes */
+  char *zFull                 /* Output buffer */
+){
+  APIRET rc = DosQueryPathInfo( zRelative, FIL_QUERYFULLNAME, zFull, nFull );
+  return rc == NO_ERROR ? SQLITE_OK : SQLITE_IOERR;
+}
+
+#ifndef SQLITE_OMIT_LOAD_EXTENSION
+/*
+** Interfaces for opening a shared library, finding entry points
+** within the shared library, and closing the shared library.
+*/
+/*
+** Interfaces for opening a shared library, finding entry points
+** within the shared library, and closing the shared library.
+*/
+static void *os2DlOpen(sqlite3_vfs *pVfs, const char *zFilename){
+  UCHAR loadErr[256];
+  HMODULE hmod;
+  APIRET rc;
+  rc = DosLoadModule((PSZ)loadErr, sizeof(loadErr), zFilename, &hmod);
+  return rc != NO_ERROR ? 0 : (void*)hmod;
+}
+/*
+** A no-op since the error code is returned on the DosLoadModule call.
+** os2Dlopen returns zero if DosLoadModule is not successful.
+*/
+static void os2DlError(sqlite3_vfs *pVfs, int nBuf, char *zBufOut){
+/* no-op */
+}
+void *os2DlSym(sqlite3_vfs *pVfs, void *pHandle, const char *zSymbol){
+  PFN pfn;
+  APIRET rc;
+  rc = DosQueryProcAddr((HMODULE)pHandle, 0L, zSymbol, &pfn);
+  if( rc != NO_ERROR ){
+    /* if the symbol itself was not found, search again for the same
+     * symbol with an extra underscore, that might be needed depending
+     * on the calling convention */
+    char _zSymbol[256] = "_";
+    strncat(_zSymbol, zSymbol, 255);
+    rc = DosQueryProcAddr((HMODULE)pHandle, 0L, _zSymbol, &pfn);
+  }
+  return rc != NO_ERROR ? 0 : (void*)pfn;
+}
+void os2DlClose(sqlite3_vfs *pVfs, void *pHandle){
+  DosFreeModule((HMODULE)pHandle);
+}
+#else /* if SQLITE_OMIT_LOAD_EXTENSION is defined: */
+  #define os2DlOpen 0
+  #define os2DlError 0
+  #define os2DlSym 0
+  #define os2DlClose 0
+#endif
+
+
+/*
+** Write up to nBuf bytes of randomness into zBuf.
+*/
+static int os2Randomness(sqlite3_vfs *pVfs, int nBuf, char *zBuf ){
+  ULONG sizeofULong = sizeof(ULONG);
+  int n = 0;
+  if( sizeof(DATETIME) <= nBuf - n ){
+    DATETIME x;
+    DosGetDateTime(&x);
+    memcpy(&zBuf[n], &x, sizeof(x));
+    n += sizeof(x);
+  }
+
+  if( sizeofULong <= nBuf - n ){
+    PPIB ppib;
+    DosGetInfoBlocks(NULL, &ppib);
+    memcpy(&zBuf[n], &ppib->pib_ulpid, sizeofULong);
+    n += sizeofULong;
+  }
+
+  if( sizeofULong <= nBuf - n ){
+    PTIB ptib;
+    DosGetInfoBlocks(&ptib, NULL);
+    memcpy(&zBuf[n], &ptib->tib_ptib2->tib2_ultid, sizeofULong);
+    n += sizeofULong;
+  }
+
+  /* if we still haven't filled the buffer yet the following will */
+  /* grab everything once instead of making several calls for a single item */
+  if( sizeofULong <= nBuf - n ){
+    ULONG ulSysInfo[QSV_MAX];
+    DosQuerySysInfo(1L, QSV_MAX, ulSysInfo, sizeofULong * QSV_MAX);
+
+    memcpy(&zBuf[n], &ulSysInfo[QSV_MS_COUNT - 1], sizeofULong);
+    n += sizeofULong;
+
+    if( sizeofULong <= nBuf - n ){
+      memcpy(&zBuf[n], &ulSysInfo[QSV_TIMER_INTERVAL - 1], sizeofULong);
+      n += sizeofULong;
+    }
+    if( sizeofULong <= nBuf - n ){
+      memcpy(&zBuf[n], &ulSysInfo[QSV_TIME_LOW - 1], sizeofULong);
+      n += sizeofULong;
+    }
+    if( sizeofULong <= nBuf - n ){
+      memcpy(&zBuf[n], &ulSysInfo[QSV_TIME_HIGH - 1], sizeofULong);
+      n += sizeofULong;
+    }
+    if( sizeofULong <= nBuf - n ){
+      memcpy(&zBuf[n], &ulSysInfo[QSV_TOTAVAILMEM - 1], sizeofULong);
+      n += sizeofULong;
+    }
+  }
+
+  return n;
+}
+
+/*
+** Sleep for a little while.  Return the amount of time slept.
+** The argument is the number of microseconds we want to sleep.
+** The return value is the number of microseconds of sleep actually
+** requested from the underlying operating system, a number which
+** might be greater than or equal to the argument, but not less
+** than the argument.
+*/
+static int os2Sleep( sqlite3_vfs *pVfs, int microsec ){
+  DosSleep( (microsec/1000) );
+  return microsec;
+}
+
+/*
+** The following variable, if set to a non-zero value, becomes the result
+** returned from sqlite3OsCurrentTime().  This is used for testing.
+*/
+#ifdef SQLITE_TEST
+int sqlite3_current_time = 0;
+#endif
+
+/*
+** Find the current time (in Universal Coordinated Time).  Write the
+** current time and date as a Julian Day number into *prNow and
+** return 0.  Return 1 if the time and date cannot be found.
+*/
+int os2CurrentTime( sqlite3_vfs *pVfs, double *prNow ){
+  double now;
+  SHORT minute; /* needs to be able to cope with negative timezone offset */
+  USHORT second, hour,
+         day, month, year;
+  DATETIME dt;
+  DosGetDateTime( &dt );
+  second = (USHORT)dt.seconds;
+  minute = (SHORT)dt.minutes + dt.timezone;
+  hour = (USHORT)dt.hours;
+  day = (USHORT)dt.day;
+  month = (USHORT)dt.month;
+  year = (USHORT)dt.year;
+
+  /* Calculations from http://www.astro.keele.ac.uk/~rno/Astronomy/hjd.html
+     http://www.astro.keele.ac.uk/~rno/Astronomy/hjd-0.1.c */
+  /* Calculate the Julian days */
+  now = day - 32076 +
+    1461*(year + 4800 + (month - 14)/12)/4 +
+    367*(month - 2 - (month - 14)/12*12)/12 -
+    3*((year + 4900 + (month - 14)/12)/100)/4;
+
+  /* Add the fractional hours, mins and seconds */
+  now += (hour + 12.0)/24.0;
+  now += minute/1440.0;
+  now += second/86400.0;
+  *prNow = now;
+#ifdef SQLITE_TEST
+  if( sqlite3_current_time ){
+    *prNow = sqlite3_current_time/86400.0 + 2440587.5;
+  }
+#endif
+  return 0;
+}
+
+/*
+** Return a pointer to the sqlite3DefaultVfs structure.   We use
+** a function rather than give the structure global scope because
+** some compilers (MSVC) do not allow forward declarations of
+** initialized structures.
+*/
+sqlite3_vfs *sqlite3OsDefaultVfs(void){
+  static sqlite3_vfs os2Vfs = {
+    1,                 /* iVersion */
+    sizeof(os2File),   /* szOsFile */
+    CCHMAXPATH,        /* mxPathname */
+    0,                 /* pNext */
+    "os2",             /* zName */
+    0,                 /* pAppData */
+
+    os2Open,           /* xOpen */
+    os2Delete,         /* xDelete */
+    os2Access,         /* xAccess */
+    os2GetTempname,    /* xGetTempname */
+    os2FullPathname,   /* xFullPathname */
+    os2DlOpen,         /* xDlOpen */
+    os2DlError,        /* xDlError */
+    os2DlSym,          /* xDlSym */
+    os2DlClose,        /* xDlClose */
+    os2Randomness,     /* xRandomness */
+    os2Sleep,          /* xSleep */
+    os2CurrentTime     /* xCurrentTime */
+  };
+
+  return &os2Vfs;
+}
+
+#endif /* OS_OS2 */
diff --git a/uppsrc/plugin/sqlite3/lib/os_unix.c b/uppsrc/plugin/sqlite3/lib/os_unix.c
new file mode 100644
index 000000000..d5eba3054
--- /dev/null
+++ b/uppsrc/plugin/sqlite3/lib/os_unix.c
@@ -0,0 +1,2766 @@
+/*
+** 2004 May 22
+**
+** The author disclaims copyright to this source code.  In place of
+** a legal notice, here is a blessing:
+**
+**    May you do good and not evil.
+**    May you find forgiveness for yourself and forgive others.
+**    May you share freely, never taking more than you give.
+**
+******************************************************************************
+**
+** This file contains code that is specific to Unix systems.
+*/
+#include "sqliteInt.h"
+#if OS_UNIX              /* This file is used on unix only */
+
+/* #define SQLITE_ENABLE_LOCKING_STYLE 0 */
+
+/*
+** These #defines should enable >2GB file support on Posix if the
+** underlying operating system supports it.  If the OS lacks
+** large file support, these should be no-ops.
+**
+** Large file support can be disabled using the -DSQLITE_DISABLE_LFS switch
+** on the compiler command line.  This is necessary if you are compiling
+** on a recent machine (ex: RedHat 7.2) but you want your code to work
+** on an older machine (ex: RedHat 6.0).  If you compile on RedHat 7.2
+** without this option, LFS is enable.  But LFS does not exist in the kernel
+** in RedHat 6.0, so the code won't work.  Hence, for maximum binary
+** portability you should omit LFS.
+*/
+#ifndef SQLITE_DISABLE_LFS
+# define _LARGE_FILE       1
+# ifndef _FILE_OFFSET_BITS
+#   define _FILE_OFFSET_BITS 64
+# endif
+# define _LARGEFILE_SOURCE 1
+#endif
+
+/*
+** standard include files.
+*/
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <time.h>
+#include <sys/time.h>
+#include <errno.h>
+#ifdef SQLITE_ENABLE_LOCKING_STYLE
+#include <sys/ioctl.h>
+#include <sys/param.h>
+#include <sys/mount.h>
+#endif /* SQLITE_ENABLE_LOCKING_STYLE */
+
+/*
+** If we are to be thread-safe, include the pthreads header and define
+** the SQLITE_UNIX_THREADS macro.
+*/
+#if SQLITE_THREADSAFE
+# include <pthread.h>
+# define SQLITE_UNIX_THREADS 1
+#endif
+
+/*
+** Default permissions when creating a new file
+*/
+#ifndef SQLITE_DEFAULT_FILE_PERMISSIONS
+# define SQLITE_DEFAULT_FILE_PERMISSIONS 0644
+#endif
+
+/*
+** Maximum supported path-length.
+*/
+#define MAX_PATHNAME 512
+
+
+/*
+** The unixFile structure is subclass of sqlite3_file specific for the unix
+** protability layer.
+*/
+typedef struct unixFile unixFile;
+struct unixFile {
+  sqlite3_io_methods const *pMethod;  /* Always the first entry */
+#ifdef SQLITE_TEST
+  /* In test mode, increase the size of this structure a bit so that
+  ** it is larger than the struct CrashFile defined in test6.c.
+  */
+  char aPadding[32];
+#endif
+  struct openCnt *pOpen;    /* Info about all open fd's on this inode */
+  struct lockInfo *pLock;   /* Info about locks on this inode */
+#ifdef SQLITE_ENABLE_LOCKING_STYLE
+  void *lockingContext;     /* Locking style specific state */
+#endif /* SQLITE_ENABLE_LOCKING_STYLE */
+  int h;                    /* The file descriptor */
+  unsigned char locktype;   /* The type of lock held on this fd */
+  int dirfd;                /* File descriptor for the directory */
+#if SQLITE_THREADSAFE
+  pthread_t tid;            /* The thread that "owns" this unixFile */
+#endif
+};
+
+/*
+** Include code that is common to all os_*.c files
+*/
+#include "os_common.h"
+
+/*
+** Define various macros that are missing from some systems.
+*/
+#ifndef O_LARGEFILE
+# define O_LARGEFILE 0
+#endif
+#ifdef SQLITE_DISABLE_LFS
+# undef O_LARGEFILE
+# define O_LARGEFILE 0
+#endif
+#ifndef O_NOFOLLOW
+# define O_NOFOLLOW 0
+#endif
+#ifndef O_BINARY
+# define O_BINARY 0
+#endif
+
+/*
+** The DJGPP compiler environment looks mostly like Unix, but it
+** lacks the fcntl() system call.  So redefine fcntl() to be something
+** that always succeeds.  This means that locking does not occur under
+** DJGPP.  But it is DOS - what did you expect?
+*/
+#ifdef __DJGPP__
+# define fcntl(A,B,C) 0
+#endif
+
+/*
+** The threadid macro resolves to the thread-id or to 0.  Used for
+** testing and debugging only.
+*/
+#if SQLITE_THREADSAFE
+#define threadid pthread_self()
+#else
+#define threadid 0
+#endif
+
+/*
+** Set or check the unixFile.tid field.  This field is set when an unixFile
+** is first opened.  All subsequent uses of the unixFile verify that the
+** same thread is operating on the unixFile.  Some operating systems do
+** not allow locks to be overridden by other threads and that restriction
+** means that sqlite3* database handles cannot be moved from one thread
+** to another.  This logic makes sure a user does not try to do that
+** by mistake.
+**
+** Version 3.3.1 (2006-01-15):  unixFile can be moved from one thread to
+** another as long as we are running on a system that supports threads
+** overriding each others locks (which now the most common behavior)
+** or if no locks are held.  But the unixFile.pLock field needs to be
+** recomputed because its key includes the thread-id.  See the
+** transferOwnership() function below for additional information
+*/
+#if SQLITE_THREADSAFE
+# define SET_THREADID(X)   (X)->tid = pthread_self()
+# define CHECK_THREADID(X) (threadsOverrideEachOthersLocks==0 && \
+                            !pthread_equal((X)->tid, pthread_self()))
+#else
+# define SET_THREADID(X)
+# define CHECK_THREADID(X) 0
+#endif
+
+/*
+** Here is the dirt on POSIX advisory locks:  ANSI STD 1003.1 (1996)
+** section 6.5.2.2 lines 483 through 490 specify that when a process
+** sets or clears a lock, that operation overrides any prior locks set
+** by the same process.  It does not explicitly say so, but this implies
+** that it overrides locks set by the same process using a different
+** file descriptor.  Consider this test case:
+**
+**       int fd1 = open("./file1", O_RDWR|O_CREAT, 0644);
+**       int fd2 = open("./file2", O_RDWR|O_CREAT, 0644);
+**
+** Suppose ./file1 and ./file2 are really the same file (because
+** one is a hard or symbolic link to the other) then if you set
+** an exclusive lock on fd1, then try to get an exclusive lock
+** on fd2, it works.  I would have expected the second lock to
+** fail since there was already a lock on the file due to fd1.
+** But not so.  Since both locks came from the same process, the
+** second overrides the first, even though they were on different
+** file descriptors opened on different file names.
+**
+** Bummer.  If you ask me, this is broken.  Badly broken.  It means
+** that we cannot use POSIX locks to synchronize file access among
+** competing threads of the same process.  POSIX locks will work fine
+** to synchronize access for threads in separate processes, but not
+** threads within the same process.
+**
+** To work around the problem, SQLite has to manage file locks internally
+** on its own.  Whenever a new database is opened, we have to find the
+** specific inode of the database file (the inode is determined by the
+** st_dev and st_ino fields of the stat structure that fstat() fills in)
+** and check for locks already existing on that inode.  When locks are
+** created or removed, we have to look at our own internal record of the
+** locks to see if another thread has previously set a lock on that same
+** inode.
+**
+** The sqlite3_file structure for POSIX is no longer just an integer file
+** descriptor.  It is now a structure that holds the integer file
+** descriptor and a pointer to a structure that describes the internal
+** locks on the corresponding inode.  There is one locking structure
+** per inode, so if the same inode is opened twice, both unixFile structures
+** point to the same locking structure.  The locking structure keeps
+** a reference count (so we will know when to delete it) and a "cnt"
+** field that tells us its internal lock status.  cnt==0 means the
+** file is unlocked.  cnt==-1 means the file has an exclusive lock.
+** cnt>0 means there are cnt shared locks on the file.
+**
+** Any attempt to lock or unlock a file first checks the locking
+** structure.  The fcntl() system call is only invoked to set a
+** POSIX lock if the internal lock structure transitions between
+** a locked and an unlocked state.
+**
+** 2004-Jan-11:
+** More recent discoveries about POSIX advisory locks.  (The more
+** I discover, the more I realize the a POSIX advisory locks are
+** an abomination.)
+**
+** If you close a file descriptor that points to a file that has locks,
+** all locks on that file that are owned by the current process are
+** released.  To work around this problem, each unixFile structure contains
+** a pointer to an openCnt structure.  There is one openCnt structure
+** per open inode, which means that multiple unixFile can point to a single
+** openCnt.  When an attempt is made to close an unixFile, if there are
+** other unixFile open on the same inode that are holding locks, the call
+** to close() the file descriptor is deferred until all of the locks clear.
+** The openCnt structure keeps a list of file descriptors that need to
+** be closed and that list is walked (and cleared) when the last lock
+** clears.
+**
+** First, under Linux threads, because each thread has a separate
+** process ID, lock operations in one thread do not override locks
+** to the same file in other threads.  Linux threads behave like
+** separate processes in this respect.  But, if you close a file
+** descriptor in linux threads, all locks are cleared, even locks
+** on other threads and even though the other threads have different
+** process IDs.  Linux threads is inconsistent in this respect.
+** (I'm beginning to think that linux threads is an abomination too.)
+** The consequence of this all is that the hash table for the lockInfo
+** structure has to include the process id as part of its key because
+** locks in different threads are treated as distinct.  But the
+** openCnt structure should not include the process id in its
+** key because close() clears lock on all threads, not just the current
+** thread.  Were it not for this goofiness in linux threads, we could
+** combine the lockInfo and openCnt structures into a single structure.
+**
+** 2004-Jun-28:
+** On some versions of linux, threads can override each others locks.
+** On others not.  Sometimes you can change the behavior on the same
+** system by setting the LD_ASSUME_KERNEL environment variable.  The
+** POSIX standard is silent as to which behavior is correct, as far
+** as I can tell, so other versions of unix might show the same
+** inconsistency.  There is no little doubt in my mind that posix
+** advisory locks and linux threads are profoundly broken.
+**
+** To work around the inconsistencies, we have to test at runtime
+** whether or not threads can override each others locks.  This test
+** is run once, the first time any lock is attempted.  A static
+** variable is set to record the results of this test for future
+** use.
+*/
+
+/*
+** An instance of the following structure serves as the key used
+** to locate a particular lockInfo structure given its inode.
+**
+** If threads cannot override each others locks, then we set the
+** lockKey.tid field to the thread ID.  If threads can override
+** each others locks then tid is always set to zero.  tid is omitted
+** if we compile without threading support.
+*/
+struct lockKey {
+  dev_t dev;       /* Device number */
+  ino_t ino;       /* Inode number */
+#if SQLITE_THREADSAFE
+  pthread_t tid;   /* Thread ID or zero if threads can override each other */
+#endif
+};
+
+/*
+** An instance of the following structure is allocated for each open
+** inode on each thread with a different process ID.  (Threads have
+** different process IDs on linux, but not on most other unixes.)
+**
+** A single inode can have multiple file descriptors, so each unixFile
+** structure contains a pointer to an instance of this object and this
+** object keeps a count of the number of unixFile pointing to it.
+*/
+struct lockInfo {
+  struct lockKey key;  /* The lookup key */
+  int cnt;             /* Number of SHARED locks held */
+  int locktype;        /* One of SHARED_LOCK, RESERVED_LOCK etc. */
+  int nRef;            /* Number of pointers to this structure */
+};
+
+/*
+** An instance of the following structure serves as the key used
+** to locate a particular openCnt structure given its inode.  This
+** is the same as the lockKey except that the thread ID is omitted.
+*/
+struct openKey {
+  dev_t dev;   /* Device number */
+  ino_t ino;   /* Inode number */
+};
+
+/*
+** An instance of the following structure is allocated for each open
+** inode.  This structure keeps track of the number of locks on that
+** inode.  If a close is attempted against an inode that is holding
+** locks, the close is deferred until all locks clear by adding the
+** file descriptor to be closed to the pending list.
+*/
+struct openCnt {
+  struct openKey key;   /* The lookup key */
+  int nRef;             /* Number of pointers to this structure */
+  int nLock;            /* Number of outstanding locks */
+  int nPending;         /* Number of pending close() operations */
+  int *aPending;        /* Malloced space holding fd's awaiting a close() */
+};
+
+/*
+** These hash tables map inodes and file descriptors (really, lockKey and
+** openKey structures) into lockInfo and openCnt structures.  Access to
+** these hash tables must be protected by a mutex.
+*/
+static Hash lockHash = {SQLITE_HASH_BINARY, 0, 0, 0, 0, 0};
+static Hash openHash = {SQLITE_HASH_BINARY, 0, 0, 0, 0, 0};
+
+#ifdef SQLITE_ENABLE_LOCKING_STYLE
+/*
+** The locking styles are associated with the different file locking
+** capabilities supported by different file systems.
+**
+** POSIX locking style fully supports shared and exclusive byte-range locks
+** ADP locking only supports exclusive byte-range locks
+** FLOCK only supports a single file-global exclusive lock
+** DOTLOCK isn't a true locking style, it refers to the use of a special
+**   file named the same as the database file with a '.lock' extension, this
+**   can be used on file systems that do not offer any reliable file locking
+** NO locking means that no locking will be attempted, this is only used for
+**   read-only file systems currently
+** UNSUPPORTED means that no locking will be attempted, this is only used for
+**   file systems that are known to be unsupported
+*/
+typedef enum {
+  posixLockingStyle = 0,       /* standard posix-advisory locks */
+  afpLockingStyle,             /* use afp locks */
+  flockLockingStyle,           /* use flock() */
+  dotlockLockingStyle,         /* use <file>.lock files */
+  noLockingStyle,              /* useful for read-only file system */
+  unsupportedLockingStyle      /* indicates unsupported file system */
+} sqlite3LockingStyle;
+#endif /* SQLITE_ENABLE_LOCKING_STYLE */
+
+/*
+** Helper functions to obtain and relinquish the global mutex.
+*/
+static void enterMutex(){
+  sqlite3_mutex_enter(sqlite3_mutex_alloc(SQLITE_MUTEX_STATIC_MASTER));
+}
+static void leaveMutex(){
+  sqlite3_mutex_leave(sqlite3_mutex_alloc(SQLITE_MUTEX_STATIC_MASTER));
+}
+
+#if SQLITE_THREADSAFE
+/*
+** This variable records whether or not threads can override each others
+** locks.
+**
+**    0:  No.  Threads cannot override each others locks.
+**    1:  Yes.  Threads can override each others locks.
+**   -1:  We don't know yet.
+**
+** On some systems, we know at compile-time if threads can override each
+** others locks.  On those systems, the SQLITE_THREAD_OVERRIDE_LOCK macro
+** will be set appropriately.  On other systems, we have to check at
+** runtime.  On these latter systems, SQLTIE_THREAD_OVERRIDE_LOCK is
+** undefined.
+**
+** This variable normally has file scope only.  But during testing, we make
+** it a global so that the test code can change its value in order to verify
+** that the right stuff happens in either case.
+*/
+#ifndef SQLITE_THREAD_OVERRIDE_LOCK
+# define SQLITE_THREAD_OVERRIDE_LOCK -1
+#endif
+#ifdef SQLITE_TEST
+int threadsOverrideEachOthersLocks = SQLITE_THREAD_OVERRIDE_LOCK;
+#else
+static int threadsOverrideEachOthersLocks = SQLITE_THREAD_OVERRIDE_LOCK;
+#endif
+
+/*
+** This structure holds information passed into individual test
+** threads by the testThreadLockingBehavior() routine.
+*/
+struct threadTestData {
+  int fd;                /* File to be locked */
+  struct flock lock;     /* The locking operation */
+  int result;            /* Result of the locking operation */
+};
+
+#ifdef SQLITE_LOCK_TRACE
+/*
+** Print out information about all locking operations.
+**
+** This routine is used for troubleshooting locks on multithreaded
+** platforms.  Enable by compiling with the -DSQLITE_LOCK_TRACE
+** command-line option on the compiler.  This code is normally
+** turned off.
+*/
+static int lockTrace(int fd, int op, struct flock *p){
+  char *zOpName, *zType;
+  int s;
+  int savedErrno;
+  if( op==F_GETLK ){
+    zOpName = "GETLK";
+  }else if( op==F_SETLK ){
+    zOpName = "SETLK";
+  }else{
+    s = fcntl(fd, op, p);
+    sqlite3DebugPrintf("fcntl unknown %d %d %d\n", fd, op, s);
+    return s;
+  }
+  if( p->l_type==F_RDLCK ){
+    zType = "RDLCK";
+  }else if( p->l_type==F_WRLCK ){
+    zType = "WRLCK";
+  }else if( p->l_type==F_UNLCK ){
+    zType = "UNLCK";
+  }else{
+    assert( 0 );
+  }
+  assert( p->l_whence==SEEK_SET );
+  s = fcntl(fd, op, p);
+  savedErrno = errno;
+  sqlite3DebugPrintf("fcntl %d %d %s %s %d %d %d %d\n",
+     threadid, fd, zOpName, zType, (int)p->l_start, (int)p->l_len,
+     (int)p->l_pid, s);
+  if( s==(-1) && op==F_SETLK && (p->l_type==F_RDLCK || p->l_type==F_WRLCK) ){
+    struct flock l2;
+    l2 = *p;
+    fcntl(fd, F_GETLK, &l2);
+    if( l2.l_type==F_RDLCK ){
+      zType = "RDLCK";
+    }else if( l2.l_type==F_WRLCK ){
+      zType = "WRLCK";
+    }else if( l2.l_type==F_UNLCK ){
+      zType = "UNLCK";
+    }else{
+      assert( 0 );
+    }
+    sqlite3DebugPrintf("fcntl-failure-reason: %s %d %d %d\n",
+       zType, (int)l2.l_start, (int)l2.l_len, (int)l2.l_pid);
+  }
+  errno = savedErrno;
+  return s;
+}
+#define fcntl lockTrace
+#endif /* SQLITE_LOCK_TRACE */
+
+/*
+** The testThreadLockingBehavior() routine launches two separate
+** threads on this routine.  This routine attempts to lock a file
+** descriptor then returns.  The success or failure of that attempt
+** allows the testThreadLockingBehavior() procedure to determine
+** whether or not threads can override each others locks.
+*/
+static void *threadLockingTest(void *pArg){
+  struct threadTestData *pData = (struct threadTestData*)pArg;
+  pData->result = fcntl(pData->fd, F_SETLK, &pData->lock);
+  return pArg;
+}
+
+/*
+** This procedure attempts to determine whether or not threads
+** can override each others locks then sets the
+** threadsOverrideEachOthersLocks variable appropriately.
+*/
+static void testThreadLockingBehavior(int fd_orig){
+  int fd;
+  struct threadTestData d[2];
+  pthread_t t[2];
+
+  fd = dup(fd_orig);
+  if( fd<0 ) return;
+  memset(d, 0, sizeof(d));
+  d[0].fd = fd;
+  d[0].lock.l_type = F_RDLCK;
+  d[0].lock.l_len = 1;
+  d[0].lock.l_start = 0;
+  d[0].lock.l_whence = SEEK_SET;
+  d[1] = d[0];
+  d[1].lock.l_type = F_WRLCK;
+  pthread_create(&t[0], 0, threadLockingTest, &d[0]);
+  pthread_create(&t[1], 0, threadLockingTest, &d[1]);
+  pthread_join(t[0], 0);
+  pthread_join(t[1], 0);
+  close(fd);
+  threadsOverrideEachOthersLocks =  d[0].result==0 && d[1].result==0;
+}
+#endif /* SQLITE_THREADSAFE */
+
+/*
+** Release a lockInfo structure previously allocated by findLockInfo().
+*/
+static void releaseLockInfo(struct lockInfo *pLock){
+  if (pLock == NULL)
+    return;
+  pLock->nRef--;
+  if( pLock->nRef==0 ){
+    sqlite3HashInsert(&lockHash, &pLock->key, sizeof(pLock->key), 0);
+    sqlite3_free(pLock);
+  }
+}
+
+/*
+** Release a openCnt structure previously allocated by findLockInfo().
+*/
+static void releaseOpenCnt(struct openCnt *pOpen){
+  if (pOpen == NULL)
+    return;
+  pOpen->nRef--;
+  if( pOpen->nRef==0 ){
+    sqlite3HashInsert(&openHash, &pOpen->key, sizeof(pOpen->key), 0);
+    free(pOpen->aPending);
+    sqlite3_free(pOpen);
+  }
+}
+
+#ifdef SQLITE_ENABLE_LOCKING_STYLE
+/*
+** Tests a byte-range locking query to see if byte range locks are
+** supported, if not we fall back to dotlockLockingStyle.
+*/
+static sqlite3LockingStyle sqlite3TestLockingStyle(
+  const char *filePath,
+  int fd
+){
+  /* test byte-range lock using fcntl */
+  struct flock lockInfo;
+
+  lockInfo.l_len = 1;
+  lockInfo.l_start = 0;
+  lockInfo.l_whence = SEEK_SET;
+  lockInfo.l_type = F_RDLCK;
+
+  if( fcntl(fd, F_GETLK, &lockInfo)!=-1 ) {
+    return posixLockingStyle;
+  }
+
+  /* testing for flock can give false positives.  So if if the above test
+  ** fails, then we fall back to using dot-lock style locking.
+  */
+  return dotlockLockingStyle;
+}
+
+/*
+** Examines the f_fstypename entry in the statfs structure as returned by
+** stat() for the file system hosting the database file, assigns the
+** appropriate locking style based on its value.  These values and
+** assignments are based on Darwin/OSX behavior and have not been tested on
+** other systems.
+*/
+static sqlite3LockingStyle sqlite3DetectLockingStyle(
+  const char *filePath,
+  int fd
+){
+
+#ifdef SQLITE_FIXED_LOCKING_STYLE
+  return (sqlite3LockingStyle)SQLITE_FIXED_LOCKING_STYLE;
+#else
+  struct statfs fsInfo;
+
+  if( statfs(filePath, &fsInfo) == -1 ){
+    return sqlite3TestLockingStyle(filePath, fd);
+  }
+  if( fsInfo.f_flags & MNT_RDONLY ){
+    return noLockingStyle;
+  }
+  if( strcmp(fsInfo.f_fstypename, "hfs")==0 ||
+      strcmp(fsInfo.f_fstypename, "ufs")==0 ){
+    return posixLockingStyle;
+  }
+  if( strcmp(fsInfo.f_fstypename, "afpfs")==0 ){
+    return afpLockingStyle;
+  }
+  if( strcmp(fsInfo.f_fstypename, "nfs")==0 ){
+    return sqlite3TestLockingStyle(filePath, fd);
+  }
+  if( strcmp(fsInfo.f_fstypename, "smbfs")==0 ){
+    return flockLockingStyle;
+  }
+  if( strcmp(fsInfo.f_fstypename, "msdos")==0 ){
+    return dotlockLockingStyle;
+  }
+  if( strcmp(fsInfo.f_fstypename, "webdav")==0 ){
+    return unsupportedLockingStyle;
+  }
+  return sqlite3TestLockingStyle(filePath, fd);
+#endif /* SQLITE_FIXED_LOCKING_STYLE */
+}
+
+#endif /* SQLITE_ENABLE_LOCKING_STYLE */
+
+/*
+** Given a file descriptor, locate lockInfo and openCnt structures that
+** describes that file descriptor.  Create new ones if necessary.  The
+** return values might be uninitialized if an error occurs.
+**
+** Return the number of errors.
+*/
+static int findLockInfo(
+  int fd,                      /* The file descriptor used in the key */
+  struct lockInfo **ppLock,    /* Return the lockInfo structure here */
+  struct openCnt **ppOpen      /* Return the openCnt structure here */
+){
+  int rc;
+  struct lockKey key1;
+  struct openKey key2;
+  struct stat statbuf;
+  struct lockInfo *pLock;
+  struct openCnt *pOpen;
+  rc = fstat(fd, &statbuf);
+  if( rc!=0 ) return 1;
+
+  memset(&key1, 0, sizeof(key1));
+  key1.dev = statbuf.st_dev;
+  key1.ino = statbuf.st_ino;
+#if SQLITE_THREADSAFE
+  if( threadsOverrideEachOthersLocks<0 ){
+    testThreadLockingBehavior(fd);
+  }
+  key1.tid = threadsOverrideEachOthersLocks ? 0 : pthread_self();
+#endif
+  memset(&key2, 0, sizeof(key2));
+  key2.dev = statbuf.st_dev;
+  key2.ino = statbuf.st_ino;
+  pLock = (struct lockInfo*)sqlite3HashFind(&lockHash, &key1, sizeof(key1));
+  if( pLock==0 ){
+    struct lockInfo *pOld;
+    pLock = sqlite3_malloc( sizeof(*pLock) );
+    if( pLock==0 ){
+      rc = 1;
+      goto exit_findlockinfo;
+    }
+    pLock->key = key1;
+    pLock->nRef = 1;
+    pLock->cnt = 0;
+    pLock->locktype = 0;
+    pOld = sqlite3HashInsert(&lockHash, &pLock->key, sizeof(key1), pLock);
+    if( pOld!=0 ){
+      assert( pOld==pLock );
+      sqlite3_free(pLock);
+      rc = 1;
+      goto exit_findlockinfo;
+    }
+  }else{
+    pLock->nRef++;
+  }
+  *ppLock = pLock;
+  if( ppOpen!=0 ){
+    pOpen = (struct openCnt*)sqlite3HashFind(&openHash, &key2, sizeof(key2));
+    if( pOpen==0 ){
+      struct openCnt *pOld;
+      pOpen = sqlite3_malloc( sizeof(*pOpen) );
+      if( pOpen==0 ){
+        releaseLockInfo(pLock);
+        rc = 1;
+        goto exit_findlockinfo;
+      }
+      pOpen->key = key2;
+      pOpen->nRef = 1;
+      pOpen->nLock = 0;
+      pOpen->nPending = 0;
+      pOpen->aPending = 0;
+      pOld = sqlite3HashInsert(&openHash, &pOpen->key, sizeof(key2), pOpen);
+      if( pOld!=0 ){
+        assert( pOld==pOpen );
+        sqlite3_free(pOpen);
+        releaseLockInfo(pLock);
+        rc = 1;
+        goto exit_findlockinfo;
+      }
+    }else{
+      pOpen->nRef++;
+    }
+    *ppOpen = pOpen;
+  }
+
+exit_findlockinfo:
+  return rc;
+}
+
+#ifdef SQLITE_DEBUG
+/*
+** Helper function for printing out trace information from debugging
+** binaries. This returns the string represetation of the supplied
+** integer lock-type.
+*/
+static const char *locktypeName(int locktype){
+  switch( locktype ){
+  case NO_LOCK: return "NONE";
+  case SHARED_LOCK: return "SHARED";
+  case RESERVED_LOCK: return "RESERVED";
+  case PENDING_LOCK: return "PENDING";
+  case EXCLUSIVE_LOCK: return "EXCLUSIVE";
+  }
+  return "ERROR";
+}
+#endif
+
+/*
+** If we are currently in a different thread than the thread that the
+** unixFile argument belongs to, then transfer ownership of the unixFile
+** over to the current thread.
+**
+** A unixFile is only owned by a thread on systems where one thread is
+** unable to override locks created by a different thread.  RedHat9 is
+** an example of such a system.
+**
+** Ownership transfer is only allowed if the unixFile is currently unlocked.
+** If the unixFile is locked and an ownership is wrong, then return
+** SQLITE_MISUSE.  SQLITE_OK is returned if everything works.
+*/
+#if SQLITE_THREADSAFE
+static int transferOwnership(unixFile *pFile){
+  int rc;
+  pthread_t hSelf;
+  if( threadsOverrideEachOthersLocks ){
+    /* Ownership transfers not needed on this system */
+    return SQLITE_OK;
+  }
+  hSelf = pthread_self();
+  if( pthread_equal(pFile->tid, hSelf) ){
+    /* We are still in the same thread */
+    OSTRACE1("No-transfer, same thread\n");
+    return SQLITE_OK;
+  }
+  if( pFile->locktype!=NO_LOCK ){
+    /* We cannot change ownership while we are holding a lock! */
+    return SQLITE_MISUSE;
+  }
+  OSTRACE4("Transfer ownership of %d from %d to %d\n",
+            pFile->h, pFile->tid, hSelf);
+  pFile->tid = hSelf;
+  if (pFile->pLock != NULL) {
+    releaseLockInfo(pFile->pLock);
+    rc = findLockInfo(pFile->h, &pFile->pLock, 0);
+    OSTRACE5("LOCK    %d is now %s(%s,%d)\n", pFile->h,
+           locktypeName(pFile->locktype),
+           locktypeName(pFile->pLock->locktype), pFile->pLock->cnt);
+    return rc;
+  } else {
+    return SQLITE_OK;
+  }
+}
+#else
+  /* On single-threaded builds, ownership transfer is a no-op */
+# define transferOwnership(X) SQLITE_OK
+#endif
+
+/*
+** Seek to the offset passed as the second argument, then read cnt
+** bytes into pBuf. Return the number of bytes actually read.
+**
+** NB:  If you define USE_PREAD or USE_PREAD64, then it might also
+** be necessary to define _XOPEN_SOURCE to be 500.  This varies from
+** one system to another.  Since SQLite does not define USE_PREAD
+** any any form by default, we will not attempt to define _XOPEN_SOURCE.
+** See tickets #2741 and #2681.
+*/
+static int seekAndRead(unixFile *id, sqlite3_int64 offset, void *pBuf, int cnt){
+  int got;
+  i64 newOffset;
+  TIMER_START;
+#if defined(USE_PREAD)
+  got = pread(id->h, pBuf, cnt, offset);
+  SimulateIOError( got = -1 );
+#elif defined(USE_PREAD64)
+  got = pread64(id->h, pBuf, cnt, offset);
+  SimulateIOError( got = -1 );
+#else
+  newOffset = lseek(id->h, offset, SEEK_SET);
+  SimulateIOError( newOffset-- );
+  if( newOffset!=offset ){
+    return -1;
+  }
+  got = read(id->h, pBuf, cnt);
+#endif
+  TIMER_END;
+  OSTRACE5("READ    %-3d %5d %7lld %d\n", id->h, got, offset, TIMER_ELAPSED);
+  return got;
+}
+
+/*
+** Read data from a file into a buffer.  Return SQLITE_OK if all
+** bytes were read successfully and SQLITE_IOERR if anything goes
+** wrong.
+*/
+static int unixRead(
+  sqlite3_file *id,
+  void *pBuf,
+  int amt,
+  sqlite3_int64 offset
+){
+  int got;
+  assert( id );
+  got = seekAndRead((unixFile*)id, offset, pBuf, amt);
+  if( got==amt ){
+    return SQLITE_OK;
+  }else if( got<0 ){
+    return SQLITE_IOERR_READ;
+  }else{
+    memset(&((char*)pBuf)[got], 0, amt-got);
+    return SQLITE_IOERR_SHORT_READ;
+  }
+}
+
+/*
+** Seek to the offset in id->offset then read cnt bytes into pBuf.
+** Return the number of bytes actually read.  Update the offset.
+*/
+static int seekAndWrite(unixFile *id, i64 offset, const void *pBuf, int cnt){
+  int got;
+  i64 newOffset;
+  TIMER_START;
+#if defined(USE_PREAD)
+  got = pwrite(id->h, pBuf, cnt, offset);
+#elif defined(USE_PREAD64)
+  got = pwrite64(id->h, pBuf, cnt, offset);
+#else
+  newOffset = lseek(id->h, offset, SEEK_SET);
+  if( newOffset!=offset ){
+    return -1;
+  }
+  got = write(id->h, pBuf, cnt);
+#endif
+  TIMER_END;
+  OSTRACE5("WRITE   %-3d %5d %7lld %d\n", id->h, got, offset, TIMER_ELAPSED);
+  return got;
+}
+
+
+/*
+** Write data from a buffer into a file.  Return SQLITE_OK on success
+** or some other error code on failure.
+*/
+static int unixWrite(
+  sqlite3_file *id,
+  const void *pBuf,
+  int amt,
+  sqlite3_int64 offset
+){
+  int wrote = 0;
+  assert( id );
+  assert( amt>0 );
+  while( amt>0 && (wrote = seekAndWrite((unixFile*)id, offset, pBuf, amt))>0 ){
+    amt -= wrote;
+    offset += wrote;
+    pBuf = &((char*)pBuf)[wrote];
+  }
+  SimulateIOError(( wrote=(-1), amt=1 ));
+  SimulateDiskfullError(( wrote=0, amt=1 ));
+  if( amt>0 ){
+    if( wrote<0 ){
+      return SQLITE_IOERR_WRITE;
+    }else{
+      return SQLITE_FULL;
+    }
+  }
+  return SQLITE_OK;
+}
+
+#ifdef SQLITE_TEST
+/*
+** Count the number of fullsyncs and normal syncs.  This is used to test
+** that syncs and fullsyncs are occuring at the right times.
+*/
+int sqlite3_sync_count = 0;
+int sqlite3_fullsync_count = 0;
+#endif
+
+/*
+** Use the fdatasync() API only if the HAVE_FDATASYNC macro is defined.
+** Otherwise use fsync() in its place.
+*/
+#ifndef HAVE_FDATASYNC
+# define fdatasync fsync
+#endif
+
+/*
+** Define HAVE_FULLFSYNC to 0 or 1 depending on whether or not
+** the F_FULLFSYNC macro is defined.  F_FULLFSYNC is currently
+** only available on Mac OS X.  But that could change.
+*/
+#ifdef F_FULLFSYNC
+# define HAVE_FULLFSYNC 1
+#else
+# define HAVE_FULLFSYNC 0
+#endif
+
+
+/*
+** The fsync() system call does not work as advertised on many
+** unix systems.  The following procedure is an attempt to make
+** it work better.
+**
+** The SQLITE_NO_SYNC macro disables all fsync()s.  This is useful
+** for testing when we want to run through the test suite quickly.
+** You are strongly advised *not* to deploy with SQLITE_NO_SYNC
+** enabled, however, since with SQLITE_NO_SYNC enabled, an OS crash
+** or power failure will likely corrupt the database file.
+*/
+static int full_fsync(int fd, int fullSync, int dataOnly){
+  int rc;
+
+  /* Record the number of times that we do a normal fsync() and
+  ** FULLSYNC.  This is used during testing to verify that this procedure
+  ** gets called with the correct arguments.
+  */
+#ifdef SQLITE_TEST
+  if( fullSync ) sqlite3_fullsync_count++;
+  sqlite3_sync_count++;
+#endif
+
+  /* If we compiled with the SQLITE_NO_SYNC flag, then syncing is a
+  ** no-op
+  */
+#ifdef SQLITE_NO_SYNC
+  rc = SQLITE_OK;
+#else
+
+#if HAVE_FULLFSYNC
+  if( fullSync ){
+    rc = fcntl(fd, F_FULLFSYNC, 0);
+  }else{
+    rc = 1;
+  }
+  /* If the FULLFSYNC failed, fall back to attempting an fsync().
+   * It shouldn't be possible for fullfsync to fail on the local
+   * file system (on OSX), so failure indicates that FULLFSYNC
+   * isn't supported for this file system. So, attempt an fsync
+   * and (for now) ignore the overhead of a superfluous fcntl call.
+   * It'd be better to detect fullfsync support once and avoid
+   * the fcntl call every time sync is called.
+   */
+  if( rc ) rc = fsync(fd);
+
+#else
+  if( dataOnly ){
+    rc = fdatasync(fd);
+  }else{
+    rc = fsync(fd);
+  }
+#endif /* HAVE_FULLFSYNC */
+#endif /* defined(SQLITE_NO_SYNC) */
+
+  return rc;
+}
+
+/*
+** Make sure all writes to a particular file are committed to disk.
+**
+** If dataOnly==0 then both the file itself and its metadata (file
+** size, access time, etc) are synced.  If dataOnly!=0 then only the
+** file data is synced.
+**
+** Under Unix, also make sure that the directory entry for the file
+** has been created by fsync-ing the directory that contains the file.
+** If we do not do this and we encounter a power failure, the directory
+** entry for the journal might not exist after we reboot.  The next
+** SQLite to access the file will not know that the journal exists (because
+** the directory entry for the journal was never created) and the transaction
+** will not roll back - possibly leading to database corruption.
+*/
+static int unixSync(sqlite3_file *id, int flags){
+  int rc;
+  unixFile *pFile = (unixFile*)id;
+
+  int isDataOnly = (flags&SQLITE_SYNC_DATAONLY);
+  int isFullsync = (flags&0x0F)==SQLITE_SYNC_FULL;
+
+  /* Check that one of SQLITE_SYNC_NORMAL or FULL was passed */
+  assert((flags&0x0F)==SQLITE_SYNC_NORMAL
+      || (flags&0x0F)==SQLITE_SYNC_FULL
+  );
+
+  assert( pFile );
+  OSTRACE2("SYNC    %-3d\n", pFile->h);
+  rc = full_fsync(pFile->h, isFullsync, isDataOnly);
+  SimulateIOError( rc=1 );
+  if( rc ){
+    return SQLITE_IOERR_FSYNC;
+  }
+  if( pFile->dirfd>=0 ){
+    OSTRACE4("DIRSYNC %-3d (have_fullfsync=%d fullsync=%d)\n", pFile->dirfd,
+            HAVE_FULLFSYNC, isFullsync);
+#ifndef SQLITE_DISABLE_DIRSYNC
+    /* The directory sync is only attempted if full_fsync is
+    ** turned off or unavailable.  If a full_fsync occurred above,
+    ** then the directory sync is superfluous.
+    */
+    if( (!HAVE_FULLFSYNC || !isFullsync) && full_fsync(pFile->dirfd,0,0) ){
+       /*
+       ** We have received multiple reports of fsync() returning
+       ** errors when applied to directories on certain file systems.
+       ** A failed directory sync is not a big deal.  So it seems
+       ** better to ignore the error.  Ticket #1657
+       */
+       /* return SQLITE_IOERR; */
+    }
+#endif
+    close(pFile->dirfd);  /* Only need to sync once, so close the directory */
+    pFile->dirfd = -1;    /* when we are done. */
+  }
+  return SQLITE_OK;
+}
+
+/*
+** Truncate an open file to a specified size
+*/
+static int unixTruncate(sqlite3_file *id, i64 nByte){
+  int rc;
+  assert( id );
+  SimulateIOError( return SQLITE_IOERR_TRUNCATE );
+  rc = ftruncate(((unixFile*)id)->h, (off_t)nByte);
+  if( rc ){
+    return SQLITE_IOERR_TRUNCATE;
+  }else{
+    return SQLITE_OK;
+  }
+}
+
+/*
+** Determine the current size of a file in bytes
+*/
+static int unixFileSize(sqlite3_file *id, i64 *pSize){
+  int rc;
+  struct stat buf;
+  assert( id );
+  rc = fstat(((unixFile*)id)->h, &buf);
+  SimulateIOError( rc=1 );
+  if( rc!=0 ){
+    return SQLITE_IOERR_FSTAT;
+  }
+  *pSize = buf.st_size;
+  return SQLITE_OK;
+}
+
+/*
+** This routine checks if there is a RESERVED lock held on the specified
+** file by this or any other process. If such a lock is held, return
+** non-zero.  If the file is unlocked or holds only SHARED locks, then
+** return zero.
+*/
+static int unixCheckReservedLock(sqlite3_file *id){
+  int r = 0;
+  unixFile *pFile = (unixFile*)id;
+
+  assert( pFile );
+  enterMutex(); /* Because pFile->pLock is shared across threads */
+
+  /* Check if a thread in this process holds such a lock */
+  if( pFile->pLock->locktype>SHARED_LOCK ){
+    r = 1;
+  }
+
+  /* Otherwise see if some other process holds it.
+  */
+  if( !r ){
+    struct flock lock;
+    lock.l_whence = SEEK_SET;
+    lock.l_start = RESERVED_BYTE;
+    lock.l_len = 1;
+    lock.l_type = F_WRLCK;
+    fcntl(pFile->h, F_GETLK, &lock);
+    if( lock.l_type!=F_UNLCK ){
+      r = 1;
+    }
+  }
+
+  leaveMutex();
+  OSTRACE3("TEST WR-LOCK %d %d\n", pFile->h, r);
+
+  return r;
+}
+
+/*
+** Lock the file with the lock specified by parameter locktype - one
+** of the following:
+**
+**     (1) SHARED_LOCK
+**     (2) RESERVED_LOCK
+**     (3) PENDING_LOCK
+**     (4) EXCLUSIVE_LOCK
+**
+** Sometimes when requesting one lock state, additional lock states
+** are inserted in between.  The locking might fail on one of the later
+** transitions leaving the lock state different from what it started but
+** still short of its goal.  The following chart shows the allowed
+** transitions and the inserted intermediate states:
+**
+**    UNLOCKED -> SHARED
+**    SHARED -> RESERVED
+**    SHARED -> (PENDING) -> EXCLUSIVE
+**    RESERVED -> (PENDING) -> EXCLUSIVE
+**    PENDING -> EXCLUSIVE
+**
+** This routine will only increase a lock.  Use the sqlite3OsUnlock()
+** routine to lower a locking level.
+*/
+static int unixLock(sqlite3_file *id, int locktype){
+  /* The following describes the implementation of the various locks and
+  ** lock transitions in terms of the POSIX advisory shared and exclusive
+  ** lock primitives (called read-locks and write-locks below, to avoid
+  ** confusion with SQLite lock names). The algorithms are complicated
+  ** slightly in order to be compatible with windows systems simultaneously
+  ** accessing the same database file, in case that is ever required.
+  **
+  ** Symbols defined in os.h indentify the 'pending byte' and the 'reserved
+  ** byte', each single bytes at well known offsets, and the 'shared byte
+  ** range', a range of 510 bytes at a well known offset.
+  **
+  ** To obtain a SHARED lock, a read-lock is obtained on the 'pending
+  ** byte'.  If this is successful, a random byte from the 'shared byte
+  ** range' is read-locked and the lock on the 'pending byte' released.
+  **
+  ** A process may only obtain a RESERVED lock after it has a SHARED lock.
+  ** A RESERVED lock is implemented by grabbing a write-lock on the
+  ** 'reserved byte'.
+  **
+  ** A process may only obtain a PENDING lock after it has obtained a
+  ** SHARED lock. A PENDING lock is implemented by obtaining a write-lock
+  ** on the 'pending byte'. This ensures that no new SHARED locks can be
+  ** obtained, but existing SHARED locks are allowed to persist. A process
+  ** does not have to obtain a RESERVED lock on the way to a PENDING lock.
+  ** This property is used by the algorithm for rolling back a journal file
+  ** after a crash.
+  **
+  ** An EXCLUSIVE lock, obtained after a PENDING lock is held, is
+  ** implemented by obtaining a write-lock on the entire 'shared byte
+  ** range'. Since all other locks require a read-lock on one of the bytes
+  ** within this range, this ensures that no other locks are held on the
+  ** database.
+  **
+  ** The reason a single byte cannot be used instead of the 'shared byte
+  ** range' is that some versions of windows do not support read-locks. By
+  ** locking a random byte from a range, concurrent SHARED locks may exist
+  ** even if the locking primitive used is always a write-lock.
+  */
+  int rc = SQLITE_OK;
+  unixFile *pFile = (unixFile*)id;
+  struct lockInfo *pLock = pFile->pLock;
+  struct flock lock;
+  int s;
+
+  assert( pFile );
+  OSTRACE7("LOCK    %d %s was %s(%s,%d) pid=%d\n", pFile->h,
+      locktypeName(locktype), locktypeName(pFile->locktype),
+      locktypeName(pLock->locktype), pLock->cnt , getpid());
+
+  /* If there is already a lock of this type or more restrictive on the
+  ** unixFile, do nothing. Don't use the end_lock: exit path, as
+  ** enterMutex() hasn't been called yet.
+  */
+  if( pFile->locktype>=locktype ){
+    OSTRACE3("LOCK    %d %s ok (already held)\n", pFile->h,
+            locktypeName(locktype));
+    return SQLITE_OK;
+  }
+
+  /* Make sure the locking sequence is correct
+  */
+  assert( pFile->locktype!=NO_LOCK || locktype==SHARED_LOCK );
+  assert( locktype!=PENDING_LOCK );
+  assert( locktype!=RESERVED_LOCK || pFile->locktype==SHARED_LOCK );
+
+  /* This mutex is needed because pFile->pLock is shared across threads
+  */
+  enterMutex();
+
+  /* Make sure the current thread owns the pFile.
+  */
+  rc = transferOwnership(pFile);
+  if( rc!=SQLITE_OK ){
+    leaveMutex();
+    return rc;
+  }
+  pLock = pFile->pLock;
+
+  /* If some thread using this PID has a lock via a different unixFile*
+  ** handle that precludes the requested lock, return BUSY.
+  */
+  if( (pFile->locktype!=pLock->locktype &&
+          (pLock->locktype>=PENDING_LOCK || locktype>SHARED_LOCK))
+  ){
+    rc = SQLITE_BUSY;
+    goto end_lock;
+  }
+
+  /* If a SHARED lock is requested, and some thread using this PID already
+  ** has a SHARED or RESERVED lock, then increment reference counts and
+  ** return SQLITE_OK.
+  */
+  if( locktype==SHARED_LOCK &&
+      (pLock->locktype==SHARED_LOCK || pLock->locktype==RESERVED_LOCK) ){
+    assert( locktype==SHARED_LOCK );
+    assert( pFile->locktype==0 );
+    assert( pLock->cnt>0 );
+    pFile->locktype = SHARED_LOCK;
+    pLock->cnt++;
+    pFile->pOpen->nLock++;
+    goto end_lock;
+  }
+
+  lock.l_len = 1L;
+
+  lock.l_whence = SEEK_SET;
+
+  /* A PENDING lock is needed before acquiring a SHARED lock and before
+  ** acquiring an EXCLUSIVE lock.  For the SHARED lock, the PENDING will
+  ** be released.
+  */
+  if( locktype==SHARED_LOCK
+      || (locktype==EXCLUSIVE_LOCK && pFile->locktype<PENDING_LOCK)
+  ){
+    lock.l_type = (locktype==SHARED_LOCK?F_RDLCK:F_WRLCK);
+    lock.l_start = PENDING_BYTE;
+    s = fcntl(pFile->h, F_SETLK, &lock);
+    if( s==(-1) ){
+      rc = (errno==EINVAL) ? SQLITE_NOLFS : SQLITE_BUSY;
+      goto end_lock;
+    }
+  }
+
+
+  /* If control gets to this point, then actually go ahead and make
+  ** operating system calls for the specified lock.
+  */
+  if( locktype==SHARED_LOCK ){
+    assert( pLock->cnt==0 );
+    assert( pLock->locktype==0 );
+
+    /* Now get the read-lock */
+    lock.l_start = SHARED_FIRST;
+    lock.l_len = SHARED_SIZE;
+    s = fcntl(pFile->h, F_SETLK, &lock);
+
+    /* Drop the temporary PENDING lock */
+    lock.l_start = PENDING_BYTE;
+    lock.l_len = 1L;
+    lock.l_type = F_UNLCK;
+    if( fcntl(pFile->h, F_SETLK, &lock)!=0 ){
+      rc = SQLITE_IOERR_UNLOCK;  /* This should never happen */
+      goto end_lock;
+    }
+    if( s==(-1) ){
+      rc = (errno==EINVAL) ? SQLITE_NOLFS : SQLITE_BUSY;
+    }else{
+      pFile->locktype = SHARED_LOCK;
+      pFile->pOpen->nLock++;
+      pLock->cnt = 1;
+    }
+  }else if( locktype==EXCLUSIVE_LOCK && pLock->cnt>1 ){
+    /* We are trying for an exclusive lock but another thread in this
+    ** same process is still holding a shared lock. */
+    rc = SQLITE_BUSY;
+  }else{
+    /* The request was for a RESERVED or EXCLUSIVE lock.  It is
+    ** assumed that there is a SHARED or greater lock on the file
+    ** already.
+    */
+    assert( 0!=pFile->locktype );
+    lock.l_type = F_WRLCK;
+    switch( locktype ){
+      case RESERVED_LOCK:
+        lock.l_start = RESERVED_BYTE;
+        break;
+      case EXCLUSIVE_LOCK:
+        lock.l_start = SHARED_FIRST;
+        lock.l_len = SHARED_SIZE;
+        break;
+      default:
+        assert(0);
+    }
+    s = fcntl(pFile->h, F_SETLK, &lock);
+    if( s==(-1) ){
+      rc = (errno==EINVAL) ? SQLITE_NOLFS : SQLITE_BUSY;
+    }
+  }
+
+  if( rc==SQLITE_OK ){
+    pFile->locktype = locktype;
+    pLock->locktype = locktype;
+  }else if( locktype==EXCLUSIVE_LOCK ){
+    pFile->locktype = PENDING_LOCK;
+    pLock->locktype = PENDING_LOCK;
+  }
+
+end_lock:
+  leaveMutex();
+  OSTRACE4("LOCK    %d %s %s\n", pFile->h, locktypeName(locktype),
+      rc==SQLITE_OK ? "ok" : "failed");
+  return rc;
+}
+
+/*
+** Lower the locking level on file descriptor pFile to locktype.  locktype
+** must be either NO_LOCK or SHARED_LOCK.
+**
+** If the locking level of the file descriptor is already at or below
+** the requested locking level, this routine is a no-op.
+*/
+static int unixUnlock(sqlite3_file *id, int locktype){
+  struct lockInfo *pLock;
+  struct flock lock;
+  int rc = SQLITE_OK;
+  unixFile *pFile = (unixFile*)id;
+  int h;
+
+  assert( pFile );
+  OSTRACE7("UNLOCK  %d %d was %d(%d,%d) pid=%d\n", pFile->h, locktype,
+      pFile->locktype, pFile->pLock->locktype, pFile->pLock->cnt, getpid());
+
+  assert( locktype<=SHARED_LOCK );
+  if( pFile->locktype<=locktype ){
+    return SQLITE_OK;
+  }
+  if( CHECK_THREADID(pFile) ){
+    return SQLITE_MISUSE;
+  }
+  enterMutex();
+  h = pFile->h;
+  pLock = pFile->pLock;
+  assert( pLock->cnt!=0 );
+  if( pFile->locktype>SHARED_LOCK ){
+    assert( pLock->locktype==pFile->locktype );
+    SimulateIOErrorBenign(1);
+    SimulateIOError( h=(-1) )
+    SimulateIOErrorBenign(0);
+    if( locktype==SHARED_LOCK ){
+      lock.l_type = F_RDLCK;
+      lock.l_whence = SEEK_SET;
+      lock.l_start = SHARED_FIRST;
+      lock.l_len = SHARED_SIZE;
+      if( fcntl(h, F_SETLK, &lock)==(-1) ){
+        rc = SQLITE_IOERR_RDLOCK;
+      }
+    }
+    lock.l_type = F_UNLCK;
+    lock.l_whence = SEEK_SET;
+    lock.l_start = PENDING_BYTE;
+    lock.l_len = 2L;  assert( PENDING_BYTE+1==RESERVED_BYTE );
+    if( fcntl(h, F_SETLK, &lock)!=(-1) ){
+      pLock->locktype = SHARED_LOCK;
+    }else{
+      rc = SQLITE_IOERR_UNLOCK;
+    }
+  }
+  if( locktype==NO_LOCK ){
+    struct openCnt *pOpen;
+
+    /* Decrement the shared lock counter.  Release the lock using an
+    ** OS call only when all threads in this same process have released
+    ** the lock.
+    */
+    pLock->cnt--;
+    if( pLock->cnt==0 ){
+      lock.l_type = F_UNLCK;
+      lock.l_whence = SEEK_SET;
+      lock.l_start = lock.l_len = 0L;
+      SimulateIOErrorBenign(1);
+      SimulateIOError( h=(-1) )
+      SimulateIOErrorBenign(0);
+      if( fcntl(h, F_SETLK, &lock)!=(-1) ){
+        pLock->locktype = NO_LOCK;
+      }else{
+        rc = SQLITE_IOERR_UNLOCK;
+        pLock->cnt = 1;
+      }
+    }
+
+    /* Decrement the count of locks against this same file.  When the
+    ** count reaches zero, close any other file descriptors whose close
+    ** was deferred because of outstanding locks.
+    */
+    if( rc==SQLITE_OK ){
+      pOpen = pFile->pOpen;
+      pOpen->nLock--;
+      assert( pOpen->nLock>=0 );
+      if( pOpen->nLock==0 && pOpen->nPending>0 ){
+        int i;
+        for(i=0; i<pOpen->nPending; i++){
+          close(pOpen->aPending[i]);
+        }
+        free(pOpen->aPending);
+        pOpen->nPending = 0;
+        pOpen->aPending = 0;
+      }
+    }
+  }
+  leaveMutex();
+  if( rc==SQLITE_OK ) pFile->locktype = locktype;
+  return rc;
+}
+
+/*
+** Close a file.
+*/
+static int unixClose(sqlite3_file *id){
+  unixFile *pFile = (unixFile *)id;
+  if( !pFile ) return SQLITE_OK;
+  unixUnlock(id, NO_LOCK);
+  if( pFile->dirfd>=0 ) close(pFile->dirfd);
+  pFile->dirfd = -1;
+  enterMutex();
+
+  if( pFile->pOpen->nLock ){
+    /* If there are outstanding locks, do not actually close the file just
+    ** yet because that would clear those locks.  Instead, add the file
+    ** descriptor to pOpen->aPending.  It will be automatically closed when
+    ** the last lock is cleared.
+    */
+    int *aNew;
+    struct openCnt *pOpen = pFile->pOpen;
+    aNew = realloc( pOpen->aPending, (pOpen->nPending+1)*sizeof(int) );
+    if( aNew==0 ){
+      /* If a malloc fails, just leak the file descriptor */
+    }else{
+      pOpen->aPending = aNew;
+      pOpen->aPending[pOpen->nPending] = pFile->h;
+      pOpen->nPending++;
+    }
+  }else{
+    /* There are no outstanding locks so we can close the file immediately */
+    close(pFile->h);
+  }
+  releaseLockInfo(pFile->pLock);
+  releaseOpenCnt(pFile->pOpen);
+
+  leaveMutex();
+  OSTRACE2("CLOSE   %-3d\n", pFile->h);
+  OpenCounter(-1);
+  memset(pFile, 0, sizeof(unixFile));
+  return SQLITE_OK;
+}
+
+
+#ifdef SQLITE_ENABLE_LOCKING_STYLE
+#pragma mark AFP Support
+
+/*
+ ** The afpLockingContext structure contains all afp lock specific state
+ */
+typedef struct afpLockingContext afpLockingContext;
+struct afpLockingContext {
+  unsigned long long sharedLockByte;
+  const char *filePath;
+};
+
+struct ByteRangeLockPB2
+{
+  unsigned long long offset;        /* offset to first byte to lock */
+  unsigned long long length;        /* nbr of bytes to lock */
+  unsigned long long retRangeStart; /* nbr of 1st byte locked if successful */
+  unsigned char unLockFlag;         /* 1 = unlock, 0 = lock */
+  unsigned char startEndFlag;       /* 1=rel to end of fork, 0=rel to start */
+  int fd;                           /* file desc to assoc this lock with */
+};
+
+#define afpfsByteRangeLock2FSCTL        _IOWR('z', 23, struct ByteRangeLockPB2)
+
+/*
+** Return 0 on success, 1 on failure.  To match the behavior of the
+** normal posix file locking (used in unixLock for example), we should
+** provide 'richer' return codes - specifically to differentiate between
+** 'file busy' and 'file system error' results.
+*/
+static int _AFPFSSetLock(
+  const char *path,
+  int fd,
+  unsigned long long offset,
+  unsigned long long length,
+  int setLockFlag
+){
+  struct ByteRangeLockPB2       pb;
+  int                     err;
+
+  pb.unLockFlag = setLockFlag ? 0 : 1;
+  pb.startEndFlag = 0;
+  pb.offset = offset;
+  pb.length = length;
+  pb.fd = fd;
+  OSTRACE5("AFPLOCK setting lock %s for %d in range %llx:%llx\n",
+    (setLockFlag?"ON":"OFF"), fd, offset, length);
+  err = fsctl(path, afpfsByteRangeLock2FSCTL, &pb, 0);
+  if ( err==-1 ) {
+    OSTRACE4("AFPLOCK failed to fsctl() '%s' %d %s\n", path, errno,
+      strerror(errno));
+    return 1; /* error */
+  } else {
+    return 0;
+  }
+}
+
+/*
+ ** This routine checks if there is a RESERVED lock held on the specified
+ ** file by this or any other process. If such a lock is held, return
+ ** non-zero.  If the file is unlocked or holds only SHARED locks, then
+ ** return zero.
+ */
+static int afpUnixCheckReservedLock(sqlite3_file *id){
+  int r = 0;
+  unixFile *pFile = (unixFile*)id;
+
+  assert( pFile );
+  afpLockingContext *context = (afpLockingContext *) pFile->lockingContext;
+
+  /* Check if a thread in this process holds such a lock */
+  if( pFile->locktype>SHARED_LOCK ){
+    r = 1;
+  }
+
+  /* Otherwise see if some other process holds it.
+   */
+  if ( !r ) {
+    /* lock the byte */
+    int failed = _AFPFSSetLock(context->filePath, pFile->h, RESERVED_BYTE, 1,1);
+    if (failed) {
+      /* if we failed to get the lock then someone else must have it */
+      r = 1;
+    } else {
+      /* if we succeeded in taking the reserved lock, unlock it to restore
+      ** the original state */
+      _AFPFSSetLock(context->filePath, pFile->h, RESERVED_BYTE, 1, 0);
+    }
+  }
+  OSTRACE3("TEST WR-LOCK %d %d\n", pFile->h, r);
+
+  return r;
+}
+
+/* AFP-style locking following the behavior of unixLock, see the unixLock
+** function comments for details of lock management. */
+static int afpUnixLock(sqlite3_file *id, int locktype){
+  int rc = SQLITE_OK;
+  unixFile *pFile = (unixFile*)id;
+  afpLockingContext *context = (afpLockingContext *) pFile->lockingContext;
+  int gotPendingLock = 0;
+
+  assert( pFile );
+  OSTRACE5("LOCK    %d %s was %s pid=%d\n", pFile->h,
+         locktypeName(locktype), locktypeName(pFile->locktype), getpid());
+
+  /* If there is already a lock of this type or more restrictive on the
+  ** unixFile, do nothing. Don't use the afp_end_lock: exit path, as
+  ** enterMutex() hasn't been called yet.
+  */
+  if( pFile->locktype>=locktype ){
+    OSTRACE3("LOCK    %d %s ok (already held)\n", pFile->h,
+           locktypeName(locktype));
+    return SQLITE_OK;
+  }
+
+  /* Make sure the locking sequence is correct
+  */
+  assert( pFile->locktype!=NO_LOCK || locktype==SHARED_LOCK );
+  assert( locktype!=PENDING_LOCK );
+  assert( locktype!=RESERVED_LOCK || pFile->locktype==SHARED_LOCK );
+
+  /* This mutex is needed because pFile->pLock is shared across threads
+  */
+  enterMutex();
+
+  /* Make sure the current thread owns the pFile.
+  */
+  rc = transferOwnership(pFile);
+  if( rc!=SQLITE_OK ){
+    leaveMutex();
+    return rc;
+  }
+
+  /* A PENDING lock is needed before acquiring a SHARED lock and before
+  ** acquiring an EXCLUSIVE lock.  For the SHARED lock, the PENDING will
+  ** be released.
+  */
+  if( locktype==SHARED_LOCK
+      || (locktype==EXCLUSIVE_LOCK && pFile->locktype<PENDING_LOCK)
+  ){
+    int failed;
+    failed = _AFPFSSetLock(context->filePath, pFile->h, PENDING_BYTE, 1, 1);
+    if (failed) {
+      rc = SQLITE_BUSY;
+      goto afp_end_lock;
+    }
+  }
+
+  /* If control gets to this point, then actually go ahead and make
+  ** operating system calls for the specified lock.
+  */
+  if( locktype==SHARED_LOCK ){
+    int lk, failed;
+    int tries = 0;
+
+    /* Now get the read-lock */
+    /* note that the quality of the randomness doesn't matter that much */
+    lk = random();
+    context->sharedLockByte = (lk & 0x7fffffff)%(SHARED_SIZE - 1);
+    failed = _AFPFSSetLock(context->filePath, pFile->h,
+      SHARED_FIRST+context->sharedLockByte, 1, 1);
+
+    /* Drop the temporary PENDING lock */
+    if (_AFPFSSetLock(context->filePath, pFile->h, PENDING_BYTE, 1, 0)) {
+      rc = SQLITE_IOERR_UNLOCK;  /* This should never happen */
+      goto afp_end_lock;
+    }
+
+    if( failed ){
+      rc = SQLITE_BUSY;
+    } else {
+      pFile->locktype = SHARED_LOCK;
+    }
+  }else{
+    /* The request was for a RESERVED or EXCLUSIVE lock.  It is
+    ** assumed that there is a SHARED or greater lock on the file
+    ** already.
+    */
+    int failed = 0;
+    assert( 0!=pFile->locktype );
+    if (locktype >= RESERVED_LOCK && pFile->locktype < RESERVED_LOCK) {
+        /* Acquire a RESERVED lock */
+        failed = _AFPFSSetLock(context->filePath, pFile->h, RESERVED_BYTE, 1,1);
+    }
+    if (!failed && locktype == EXCLUSIVE_LOCK) {
+      /* Acquire an EXCLUSIVE lock */
+
+      /* Remove the shared lock before trying the range.  we'll need to
+      ** reestablish the shared lock if we can't get the  afpUnixUnlock
+      */
+      if (!_AFPFSSetLock(context->filePath, pFile->h, SHARED_FIRST +
+                         context->sharedLockByte, 1, 0)) {
+        /* now attemmpt to get the exclusive lock range */
+        failed = _AFPFSSetLock(context->filePath, pFile->h, SHARED_FIRST,
+                               SHARED_SIZE, 1);
+        if (failed && _AFPFSSetLock(context->filePath, pFile->h, SHARED_FIRST +
+                                    context->sharedLockByte, 1, 1)) {
+          rc = SQLITE_IOERR_RDLOCK; /* this should never happen */
+        }
+      } else {
+        /* */
+        rc = SQLITE_IOERR_UNLOCK; /* this should never happen */
+      }
+    }
+    if( failed && rc == SQLITE_OK){
+      rc = SQLITE_BUSY;
+    }
+  }
+
+  if( rc==SQLITE_OK ){
+    pFile->locktype = locktype;
+  }else if( locktype==EXCLUSIVE_LOCK ){
+    pFile->locktype = PENDING_LOCK;
+  }
+
+afp_end_lock:
+  leaveMutex();
+  OSTRACE4("LOCK    %d %s %s\n", pFile->h, locktypeName(locktype),
+         rc==SQLITE_OK ? "ok" : "failed");
+  return rc;
+}
+
+/*
+** Lower the locking level on file descriptor pFile to locktype.  locktype
+** must be either NO_LOCK or SHARED_LOCK.
+**
+** If the locking level of the file descriptor is already at or below
+** the requested locking level, this routine is a no-op.
+*/
+static int afpUnixUnlock(sqlite3_file *id, int locktype) {
+  struct flock lock;
+  int rc = SQLITE_OK;
+  unixFile *pFile = (unixFile*)id;
+  afpLockingContext *context = (afpLockingContext *) pFile->lockingContext;
+
+  assert( pFile );
+  OSTRACE5("UNLOCK  %d %d was %d pid=%d\n", pFile->h, locktype,
+         pFile->locktype, getpid());
+
+  assert( locktype<=SHARED_LOCK );
+  if( pFile->locktype<=locktype ){
+    return SQLITE_OK;
+  }
+  if( CHECK_THREADID(pFile) ){
+    return SQLITE_MISUSE;
+  }
+  enterMutex();
+  if( pFile->locktype>SHARED_LOCK ){
+    if( locktype==SHARED_LOCK ){
+      int failed = 0;
+
+      /* unlock the exclusive range - then re-establish the shared lock */
+      if (pFile->locktype==EXCLUSIVE_LOCK) {
+        failed = _AFPFSSetLock(context->filePath, pFile->h, SHARED_FIRST,
+                                 SHARED_SIZE, 0);
+        if (!failed) {
+          /* successfully removed the exclusive lock */
+          if (_AFPFSSetLock(context->filePath, pFile->h, SHARED_FIRST+
+                            context->sharedLockByte, 1, 1)) {
+            /* failed to re-establish our shared lock */
+            rc = SQLITE_IOERR_RDLOCK; /* This should never happen */
+          }
+        } else {
+          /* This should never happen - failed to unlock the exclusive range */
+          rc = SQLITE_IOERR_UNLOCK;
+        }
+      }
+    }
+    if (rc == SQLITE_OK && pFile->locktype>=PENDING_LOCK) {
+      if (_AFPFSSetLock(context->filePath, pFile->h, PENDING_BYTE, 1, 0)){
+        /* failed to release the pending lock */
+        rc = SQLITE_IOERR_UNLOCK; /* This should never happen */
+      }
+    }
+    if (rc == SQLITE_OK && pFile->locktype>=RESERVED_LOCK) {
+      if (_AFPFSSetLock(context->filePath, pFile->h, RESERVED_BYTE, 1, 0)) {
+        /* failed to release the reserved lock */
+        rc = SQLITE_IOERR_UNLOCK;  /* This should never happen */
+      }
+    }
+  }
+  if( locktype==NO_LOCK ){
+    int failed = _AFPFSSetLock(context->filePath, pFile->h,
+                               SHARED_FIRST + context->sharedLockByte, 1, 0);
+    if (failed) {
+      rc = SQLITE_IOERR_UNLOCK;  /* This should never happen */
+    }
+  }
+  if (rc == SQLITE_OK)
+    pFile->locktype = locktype;
+  leaveMutex();
+  return rc;
+}
+
+/*
+** Close a file & cleanup AFP specific locking context
+*/
+static int afpUnixClose(sqlite3_file *id) {
+  unixFile *pFile = (unixFile*)id;
+
+  if( !pFile ) return SQLITE_OK;
+  afpUnixUnlock(id, NO_LOCK);
+  sqlite3_free(pFile->lockingContext);
+  if( pFile->dirfd>=0 ) close(pFile->dirfd);
+  pFile->dirfd = -1;
+  enterMutex();
+  close(pFile->h);
+  leaveMutex();
+  OSTRACE2("CLOSE   %-3d\n", pFile->h);
+  OpenCounter(-1);
+  memset(pFile, 0, sizeof(unixFile));
+  return SQLITE_OK;
+}
+
+
+#pragma mark flock() style locking
+
+/*
+** The flockLockingContext is not used
+*/
+typedef void flockLockingContext;
+
+static int flockUnixCheckReservedLock(sqlite3_file *id){
+  unixFile *pFile = (unixFile*)id;
+
+  if (pFile->locktype == RESERVED_LOCK) {
+    return 1; /* already have a reserved lock */
+  } else {
+    /* attempt to get the lock */
+    int rc = flock(pFile->h, LOCK_EX | LOCK_NB);
+    if (!rc) {
+      /* got the lock, unlock it */
+      flock(pFile->h, LOCK_UN);
+      return 0;  /* no one has it reserved */
+    }
+    return 1; /* someone else might have it reserved */
+  }
+}
+
+static int flockUnixLock(sqlite3_file *id, int locktype) {
+  unixFile *pFile = (unixFile*)id;
+
+  /* if we already have a lock, it is exclusive.
+  ** Just adjust level and punt on outta here. */
+  if (pFile->locktype > NO_LOCK) {
+    pFile->locktype = locktype;
+    return SQLITE_OK;
+  }
+
+  /* grab an exclusive lock */
+  int rc = flock(pFile->h, LOCK_EX | LOCK_NB);
+  if (rc) {
+    /* didn't get, must be busy */
+    return SQLITE_BUSY;
+  } else {
+    /* got it, set the type and return ok */
+    pFile->locktype = locktype;
+    return SQLITE_OK;
+  }
+}
+
+static int flockUnixUnlock(sqlite3_file *id, int locktype) {
+  unixFile *pFile = (unixFile*)id;
+
+  assert( locktype<=SHARED_LOCK );
+
+  /* no-op if possible */
+  if( pFile->locktype==locktype ){
+    return SQLITE_OK;
+  }
+
+  /* shared can just be set because we always have an exclusive */
+  if (locktype==SHARED_LOCK) {
+    pFile->locktype = locktype;
+    return SQLITE_OK;
+  }
+
+  /* no, really, unlock. */
+  int rc = flock(pFile->h, LOCK_UN);
+  if (rc)
+    return SQLITE_IOERR_UNLOCK;
+  else {
+    pFile->locktype = NO_LOCK;
+    return SQLITE_OK;
+  }
+}
+
+/*
+** Close a file.
+*/
+static int flockUnixClose(sqlite3_file *id) {
+  unixFile *pFile = (unixFile*)id;
+
+  if( !pFile ) return SQLITE_OK;
+  flockUnixUnlock(id, NO_LOCK);
+
+  if( pFile->dirfd>=0 ) close(pFile->dirfd);
+  pFile->dirfd = -1;
+
+  enterMutex();
+  close(pFile->h);
+  leaveMutex();
+  OSTRACE2("CLOSE   %-3d\n", pFile->h);
+  OpenCounter(-1);
+  memset(pFile, 0, sizeof(unixFile));
+  return SQLITE_OK;
+}
+
+#pragma mark Old-School .lock file based locking
+
+/*
+** The dotlockLockingContext structure contains all dotlock (.lock) lock
+** specific state
+*/
+typedef struct dotlockLockingContext dotlockLockingContext;
+struct dotlockLockingContext {
+  char *lockPath;
+};
+
+
+static int dotlockUnixCheckReservedLock(sqlite3_file *id) {
+  unixFile *pFile = (unixFile*)id;
+  dotlockLockingContext *context;
+
+  context = (dotlockLockingContext*)pFile->lockingContext;
+  if (pFile->locktype == RESERVED_LOCK) {
+    return 1; /* already have a reserved lock */
+  } else {
+    struct stat statBuf;
+    if (lstat(context->lockPath,&statBuf) == 0){
+      /* file exists, someone else has the lock */
+      return 1;
+    }else{
+      /* file does not exist, we could have it if we want it */
+      return 0;
+    }
+  }
+}
+
+static int dotlockUnixLock(sqlite3_file *id, int locktype) {
+  unixFile *pFile = (unixFile*)id;
+  dotlockLockingContext *context;
+  int fd;
+
+  context = (dotlockLockingContext*)pFile->lockingContext;
+
+  /* if we already have a lock, it is exclusive.
+  ** Just adjust level and punt on outta here. */
+  if (pFile->locktype > NO_LOCK) {
+    pFile->locktype = locktype;
+
+    /* Always update the timestamp on the old file */
+    utimes(context->lockPath,NULL);
+    return SQLITE_OK;
+  }
+
+  /* check to see if lock file already exists */
+  struct stat statBuf;
+  if (lstat(context->lockPath,&statBuf) == 0){
+    return SQLITE_BUSY; /* it does, busy */
+  }
+
+  /* grab an exclusive lock */
+  fd = open(context->lockPath,O_RDONLY|O_CREAT|O_EXCL,0600);
+  if( fd<0 ){
+    /* failed to open/create the file, someone else may have stolen the lock */
+    return SQLITE_BUSY;
+  }
+  close(fd);
+
+  /* got it, set the type and return ok */
+  pFile->locktype = locktype;
+  return SQLITE_OK;
+}
+
+static int dotlockUnixUnlock(sqlite3_file *id, int locktype) {
+  unixFile *pFile = (unixFile*)id;
+  dotlockLockingContext *context;
+
+  context = (dotlockLockingContext*)pFile->lockingContext;
+
+  assert( locktype<=SHARED_LOCK );
+
+  /* no-op if possible */
+  if( pFile->locktype==locktype ){
+    return SQLITE_OK;
+  }
+
+  /* shared can just be set because we always have an exclusive */
+  if (locktype==SHARED_LOCK) {
+    pFile->locktype = locktype;
+    return SQLITE_OK;
+  }
+
+  /* no, really, unlock. */
+  unlink(context->lockPath);
+  pFile->locktype = NO_LOCK;
+  return SQLITE_OK;
+}
+
+/*
+ ** Close a file.
+ */
+static int dotlockUnixClose(sqlite3_file *id) {
+  unixFile *pFile = (unixFile*)id;
+
+  if( !pFile ) return SQLITE_OK;
+  dotlockUnixUnlock(id, NO_LOCK);
+  sqlite3_free(pFile->lockingContext);
+  if( pFile->dirfd>=0 ) close(pFile->dirfd);
+  pFile->dirfd = -1;
+  enterMutex();
+  close(pFile->h);
+  leaveMutex();
+  OSTRACE2("CLOSE   %-3d\n", pFile->h);
+  OpenCounter(-1);
+  memset(pFile, 0, sizeof(unixFile));
+  return SQLITE_OK;
+}
+
+
+#pragma mark No locking
+
+/*
+** The nolockLockingContext is void
+*/
+typedef void nolockLockingContext;
+
+static int nolockUnixCheckReservedLock(sqlite3_file *id) {
+  return 0;
+}
+
+static int nolockUnixLock(sqlite3_file *id, int locktype) {
+  return SQLITE_OK;
+}
+
+static int nolockUnixUnlock(sqlite3_file *id, int locktype) {
+  return SQLITE_OK;
+}
+
+/*
+** Close a file.
+*/
+static int nolockUnixClose(sqlite3_file *id) {
+  unixFile *pFile = (unixFile*)id;
+
+  if( !pFile ) return SQLITE_OK;
+  if( pFile->dirfd>=0 ) close(pFile->dirfd);
+  pFile->dirfd = -1;
+  enterMutex();
+  close(pFile->h);
+  leaveMutex();
+  OSTRACE2("CLOSE   %-3d\n", pFile->h);
+  OpenCounter(-1);
+  memset(pFile, 0, sizeof(unixFile));
+  return SQLITE_OK;
+}
+
+#endif /* SQLITE_ENABLE_LOCKING_STYLE */
+
+
+/*
+** Information and control of an open file handle.
+*/
+static int unixFileControl(sqlite3_file *id, int op, void *pArg){
+  switch( op ){
+    case SQLITE_FCNTL_LOCKSTATE: {
+      *(int*)pArg = ((unixFile*)id)->locktype;
+      return SQLITE_OK;
+    }
+  }
+  return SQLITE_ERROR;
+}
+
+/*
+** Return the sector size in bytes of the underlying block device for
+** the specified file. This is almost always 512 bytes, but may be
+** larger for some devices.
+**
+** SQLite code assumes this function cannot fail. It also assumes that
+** if two files are created in the same file-system directory (i.e.
+** a database and its journal file) that the sector size will be the
+** same for both.
+*/
+static int unixSectorSize(sqlite3_file *id){
+  return SQLITE_DEFAULT_SECTOR_SIZE;
+}
+
+/*
+** Return the device characteristics for the file. This is always 0.
+*/
+static int unixDeviceCharacteristics(sqlite3_file *id){
+  return 0;
+}
+
+/*
+** This vector defines all the methods that can operate on an sqlite3_file
+** for unix.
+*/
+static const sqlite3_io_methods sqlite3UnixIoMethod = {
+  1,                        /* iVersion */
+  unixClose,
+  unixRead,
+  unixWrite,
+  unixTruncate,
+  unixSync,
+  unixFileSize,
+  unixLock,
+  unixUnlock,
+  unixCheckReservedLock,
+  unixFileControl,
+  unixSectorSize,
+  unixDeviceCharacteristics
+};
+
+#ifdef SQLITE_ENABLE_LOCKING_STYLE
+/*
+** This vector defines all the methods that can operate on an sqlite3_file
+** for unix with AFP style file locking.
+*/
+static const sqlite3_io_methods sqlite3AFPLockingUnixIoMethod = {
+  1,                        /* iVersion */
+  afpUnixClose,
+  unixRead,
+  unixWrite,
+  unixTruncate,
+  unixSync,
+  unixFileSize,
+  afpUnixLock,
+  afpUnixUnlock,
+  afpUnixCheckReservedLock,
+  unixFileControl,
+  unixSectorSize,
+  unixDeviceCharacteristics
+};
+
+/*
+** This vector defines all the methods that can operate on an sqlite3_file
+** for unix with flock() style file locking.
+*/
+static const sqlite3_io_methods sqlite3FlockLockingUnixIoMethod = {
+  1,                        /* iVersion */
+  flockUnixClose,
+  unixRead,
+  unixWrite,
+  unixTruncate,
+  unixSync,
+  unixFileSize,
+  flockUnixLock,
+  flockUnixUnlock,
+  flockUnixCheckReservedLock,
+  unixFileControl,
+  unixSectorSize,
+  unixDeviceCharacteristics
+};
+
+/*
+** This vector defines all the methods that can operate on an sqlite3_file
+** for unix with dotlock style file locking.
+*/
+static const sqlite3_io_methods sqlite3DotlockLockingUnixIoMethod = {
+  1,                        /* iVersion */
+  dotlockUnixClose,
+  unixRead,
+  unixWrite,
+  unixTruncate,
+  unixSync,
+  unixFileSize,
+  dotlockUnixLock,
+  dotlockUnixUnlock,
+  dotlockUnixCheckReservedLock,
+  unixFileControl,
+  unixSectorSize,
+  unixDeviceCharacteristics
+};
+
+/*
+** This vector defines all the methods that can operate on an sqlite3_file
+** for unix with nolock style file locking.
+*/
+static const sqlite3_io_methods sqlite3NolockLockingUnixIoMethod = {
+  1,                        /* iVersion */
+  nolockUnixClose,
+  unixRead,
+  unixWrite,
+  unixTruncate,
+  unixSync,
+  unixFileSize,
+  nolockUnixLock,
+  nolockUnixUnlock,
+  nolockUnixCheckReservedLock,
+  unixFileControl,
+  unixSectorSize,
+  unixDeviceCharacteristics
+};
+
+#endif /* SQLITE_ENABLE_LOCKING_STYLE */
+
+/*
+** Allocate memory for a new unixFile and initialize that unixFile.
+** Write a pointer to the new unixFile into *pId.
+** If we run out of memory, close the file and return an error.
+*/
+#ifdef SQLITE_ENABLE_LOCKING_STYLE
+/*
+** When locking extensions are enabled, the filepath and locking style
+** are needed to determine the unixFile pMethod to use for locking operations.
+** The locking-style specific lockingContext data structure is created
+** and assigned here also.
+*/
+static int fillInUnixFile(
+  int h,                  /* Open file descriptor of file being opened */
+  int dirfd,              /* Directory file descriptor */
+  sqlite3_file *pId,      /* Write to the unixFile structure here */
+  const char *zFilename   /* Name of the file being opened */
+){
+  sqlite3LockingStyle lockingStyle;
+  unixFile *pNew = (unixFile *)pId;
+  int rc;
+
+#ifdef FD_CLOEXEC
+  fcntl(h, F_SETFD, fcntl(h, F_GETFD, 0) | FD_CLOEXEC);
+#endif
+
+  lockingStyle = sqlite3DetectLockingStyle(zFilename, h);
+  if ( lockingStyle==posixLockingStyle ){
+    enterMutex();
+    rc = findLockInfo(h, &pNew->pLock, &pNew->pOpen);
+    leaveMutex();
+    if( rc ){
+      if( dirfd>=0 ) close(dirfd);
+      close(h);
+      return SQLITE_NOMEM;
+    }
+  } else {
+    /*  pLock and pOpen are only used for posix advisory locking */
+    pNew->pLock = NULL;
+    pNew->pOpen = NULL;
+  }
+
+  OSTRACE3("OPEN    %-3d %s\n", h, zFilename);
+  pNew->dirfd = -1;
+  pNew->h = h;
+  pNew->dirfd = dirfd;
+  SET_THREADID(pNew);
+
+  switch(lockingStyle) {
+    case afpLockingStyle: {
+      /* afp locking uses the file path so it needs to be included in
+      ** the afpLockingContext */
+      afpLockingContext *context;
+      pNew->pMethod = &sqlite3AFPLockingUnixIoMethod;
+      pNew->lockingContext = context = sqlite3_malloc( sizeof(*context) );
+      if( context==0 ){
+        close(h);
+        if( dirfd>=0 ) close(dirfd);
+        return SQLITE_NOMEM;
+      }
+
+      /* NB: zFilename exists and remains valid until the file is closed
+      ** according to requirement F11141.  So we do not need to make a
+      ** copy of the filename. */
+      context->filePath = zFilename;
+      srandomdev();
+      break;
+    }
+    case flockLockingStyle:
+      /* flock locking doesn't need additional lockingContext information */
+      pNew->pMethod = &sqlite3FlockLockingUnixIoMethod;
+      break;
+    case dotlockLockingStyle: {
+      /* dotlock locking uses the file path so it needs to be included in
+      ** the dotlockLockingContext */
+      dotlockLockingContext *context;
+      int nFilename;
+      nFilename = strlen(zFilename);
+      pNew->pMethod = &sqlite3DotlockLockingUnixIoMethod;
+      pNew->lockingContext = context =
+         sqlite3_malloc( sizeof(*context) + nFilename + 6 );
+      if( context==0 ){
+        close(h);
+        if( dirfd>=0 ) close(dirfd);
+        return SQLITE_NOMEM;
+      }
+      context->lockPath = (char*)&context[1];
+      sqlite3_snprintf(nFilename, context->lockPath,
+                       "%s.lock", zFilename);
+      break;
+    }
+    case posixLockingStyle:
+      /* posix locking doesn't need additional lockingContext information */
+      pNew->pMethod = &sqlite3UnixIoMethod;
+      break;
+    case noLockingStyle:
+    case unsupportedLockingStyle:
+    default:
+      pNew->pMethod = &sqlite3NolockLockingUnixIoMethod;
+  }
+  OpenCounter(+1);
+  return SQLITE_OK;
+}
+#else /* SQLITE_ENABLE_LOCKING_STYLE */
+static int fillInUnixFile(
+  int h,                 /* Open file descriptor on file being opened */
+  int dirfd,
+  sqlite3_file *pId,     /* Write to the unixFile structure here */
+  const char *zFilename  /* Name of the file being opened */
+){
+  unixFile *pNew = (unixFile *)pId;
+  int rc;
+
+#ifdef FD_CLOEXEC
+  fcntl(h, F_SETFD, fcntl(h, F_GETFD, 0) | FD_CLOEXEC);
+#endif
+
+  enterMutex();
+  rc = findLockInfo(h, &pNew->pLock, &pNew->pOpen);
+  leaveMutex();
+  if( rc ){
+    if( dirfd>=0 ) close(dirfd);
+    close(h);
+    return SQLITE_NOMEM;
+  }
+
+  OSTRACE3("OPEN    %-3d %s\n", h, zFilename);
+  pNew->dirfd = -1;
+  pNew->h = h;
+  pNew->dirfd = dirfd;
+  SET_THREADID(pNew);
+
+  pNew->pMethod = &sqlite3UnixIoMethod;
+  OpenCounter(+1);
+  return SQLITE_OK;
+}
+#endif /* SQLITE_ENABLE_LOCKING_STYLE */
+
+/*
+** Open a file descriptor to the directory containing file zFilename.
+** If successful, *pFd is set to the opened file descriptor and
+** SQLITE_OK is returned. If an error occurs, either SQLITE_NOMEM
+** or SQLITE_CANTOPEN is returned and *pFd is set to an undefined
+** value.
+**
+** If SQLITE_OK is returned, the caller is responsible for closing
+** the file descriptor *pFd using close().
+*/
+static int openDirectory(const char *zFilename, int *pFd){
+  int ii;
+  int fd = -1;
+  char zDirname[MAX_PATHNAME+1];
+
+  sqlite3_snprintf(MAX_PATHNAME, zDirname, "%s", zFilename);
+  for(ii=strlen(zDirname); ii>=0 && zDirname[ii]!='/'; ii--);
+  if( ii>0 ){
+    zDirname[ii] = '\0';
+    fd = open(zDirname, O_RDONLY|O_BINARY, 0);
+    if( fd>=0 ){
+#ifdef FD_CLOEXEC
+      fcntl(fd, F_SETFD, fcntl(fd, F_GETFD, 0) | FD_CLOEXEC);
+#endif
+      OSTRACE3("OPENDIR %-3d %s\n", fd, zDirname);
+    }
+  }
+  *pFd = fd;
+  return (fd>=0?SQLITE_OK:SQLITE_CANTOPEN);
+}
+
+/*
+** Open the file zPath.
+**
+** Previously, the SQLite OS layer used three functions in place of this
+** one:
+**
+**     sqlite3OsOpenReadWrite();
+**     sqlite3OsOpenReadOnly();
+**     sqlite3OsOpenExclusive();
+**
+** These calls correspond to the following combinations of flags:
+**
+**     ReadWrite() ->     (READWRITE | CREATE)
+**     ReadOnly()  ->     (READONLY)
+**     OpenExclusive() -> (READWRITE | CREATE | EXCLUSIVE)
+**
+** The old OpenExclusive() accepted a boolean argument - "delFlag". If
+** true, the file was configured to be automatically deleted when the
+** file handle closed. To achieve the same effect using this new
+** interface, add the DELETEONCLOSE flag to those specified above for
+** OpenExclusive().
+*/
+static int unixOpen(
+  sqlite3_vfs *pVfs,
+  const char *zPath,
+  sqlite3_file *pFile,
+  int flags,
+  int *pOutFlags
+){
+  int fd = 0;                    /* File descriptor returned by open() */
+  int dirfd = -1;                /* Directory file descriptor */
+  int oflags = 0;                /* Flags to pass to open() */
+  int eType = flags&0xFFFFFF00;  /* Type of file to open */
+
+  int isExclusive  = (flags & SQLITE_OPEN_EXCLUSIVE);
+  int isDelete     = (flags & SQLITE_OPEN_DELETEONCLOSE);
+  int isCreate     = (flags & SQLITE_OPEN_CREATE);
+  int isReadonly   = (flags & SQLITE_OPEN_READONLY);
+  int isReadWrite  = (flags & SQLITE_OPEN_READWRITE);
+
+  /* If creating a master or main-file journal, this function will open
+  ** a file-descriptor on the directory too. The first time unixSync()
+  ** is called the directory file descriptor will be fsync()ed and close()d.
+  */
+  int isOpenDirectory = (isCreate &&
+      (eType==SQLITE_OPEN_MASTER_JOURNAL || eType==SQLITE_OPEN_MAIN_JOURNAL)
+  );
+
+  /* Check the following statements are true:
+  **
+  **   (a) Exactly one of the READWRITE and READONLY flags must be set, and
+  **   (b) if CREATE is set, then READWRITE must also be set, and
+  **   (c) if EXCLUSIVE is set, then CREATE must also be set.
+  **   (d) if DELETEONCLOSE is set, then CREATE must also be set.
+  */
+  assert((isReadonly==0 || isReadWrite==0) && (isReadWrite || isReadonly));
+  assert(isCreate==0 || isReadWrite);
+  assert(isExclusive==0 || isCreate);
+  assert(isDelete==0 || isCreate);
+
+
+  /* The main DB, main journal, and master journal are never automatically
+  ** deleted
+  */
+  assert( eType!=SQLITE_OPEN_MAIN_DB || !isDelete );
+  assert( eType!=SQLITE_OPEN_MAIN_JOURNAL || !isDelete );
+  assert( eType!=SQLITE_OPEN_MASTER_JOURNAL || !isDelete );
+
+  /* Assert that the upper layer has set one of the "file-type" flags. */
+  assert( eType==SQLITE_OPEN_MAIN_DB      || eType==SQLITE_OPEN_TEMP_DB
+       || eType==SQLITE_OPEN_MAIN_JOURNAL || eType==SQLITE_OPEN_TEMP_JOURNAL
+       || eType==SQLITE_OPEN_SUBJOURNAL   || eType==SQLITE_OPEN_MASTER_JOURNAL
+       || eType==SQLITE_OPEN_TRANSIENT_DB
+  );
+
+  if( isReadonly )  oflags |= O_RDONLY;
+  if( isReadWrite ) oflags |= O_RDWR;
+  if( isCreate )    oflags |= O_CREAT;
+  if( isExclusive ) oflags |= (O_EXCL|O_NOFOLLOW);
+  oflags |= (O_LARGEFILE|O_BINARY);
+
+  memset(pFile, 0, sizeof(unixFile));
+  fd = open(zPath, oflags, isDelete?0600:SQLITE_DEFAULT_FILE_PERMISSIONS);
+  if( fd<0 && errno!=EISDIR && isReadWrite && !isExclusive ){
+    /* Failed to open the file for read/write access. Try read-only. */
+    flags &= ~(SQLITE_OPEN_READWRITE|SQLITE_OPEN_CREATE);
+    flags |= SQLITE_OPEN_READONLY;
+    return unixOpen(pVfs, zPath, pFile, flags, pOutFlags);
+  }
+  if( fd<0 ){
+    return SQLITE_CANTOPEN;
+  }
+  if( isDelete ){
+    unlink(zPath);
+  }
+  if( pOutFlags ){
+    *pOutFlags = flags;
+  }
+
+  assert(fd!=0);
+  if( isOpenDirectory ){
+    int rc = openDirectory(zPath, &dirfd);
+    if( rc!=SQLITE_OK ){
+      close(fd);
+      return rc;
+    }
+  }
+  return fillInUnixFile(fd, dirfd, pFile, zPath);
+}
+
+/*
+** Delete the file at zPath. If the dirSync argument is true, fsync()
+** the directory after deleting the file.
+*/
+static int unixDelete(sqlite3_vfs *pVfs, const char *zPath, int dirSync){
+  int rc = SQLITE_OK;
+  SimulateIOError(return SQLITE_IOERR_DELETE);
+  unlink(zPath);
+  if( dirSync ){
+    int fd;
+    rc = openDirectory(zPath, &fd);
+    if( rc==SQLITE_OK ){
+      if( fsync(fd) ){
+        rc = SQLITE_IOERR_DIR_FSYNC;
+      }
+      close(fd);
+    }
+  }
+  return rc;
+}
+
+/*
+** Test the existance of or access permissions of file zPath. The
+** test performed depends on the value of flags:
+**
+**     SQLITE_ACCESS_EXISTS: Return 1 if the file exists
+**     SQLITE_ACCESS_READWRITE: Return 1 if the file is read and writable.
+**     SQLITE_ACCESS_READONLY: Return 1 if the file is readable.
+**
+** Otherwise return 0.
+*/
+static int unixAccess(sqlite3_vfs *pVfs, const char *zPath, int flags){
+  int amode = 0;
+  switch( flags ){
+    case SQLITE_ACCESS_EXISTS:
+      amode = F_OK;
+      break;
+    case SQLITE_ACCESS_READWRITE:
+      amode = W_OK|R_OK;
+      break;
+    case SQLITE_ACCESS_READ:
+      amode = R_OK;
+      break;
+
+    default:
+      assert(!"Invalid flags argument");
+  }
+  return (access(zPath, amode)==0);
+}
+
+/*
+** Create a temporary file name in zBuf.  zBuf must be allocated
+** by the calling process and must be big enough to hold at least
+** pVfs->mxPathname bytes.
+*/
+static int unixGetTempname(sqlite3_vfs *pVfs, int nBuf, char *zBuf){
+  static const char *azDirs[] = {
+     0,
+     "/var/tmp",
+     "/usr/tmp",
+     "/tmp",
+     ".",
+  };
+  static const unsigned char zChars[] =
+    "abcdefghijklmnopqrstuvwxyz"
+    "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+    "0123456789";
+  int i, j;
+  struct stat buf;
+  const char *zDir = ".";
+
+  /* It's odd to simulate an io-error here, but really this is just
+  ** using the io-error infrastructure to test that SQLite handles this
+  ** function failing.
+  */
+  SimulateIOError( return SQLITE_ERROR );
+
+  azDirs[0] = sqlite3_temp_directory;
+  for(i=0; i<sizeof(azDirs)/sizeof(azDirs[0]); i++){
+    if( azDirs[i]==0 ) continue;
+    if( stat(azDirs[i], &buf) ) continue;
+    if( !S_ISDIR(buf.st_mode) ) continue;
+    if( access(azDirs[i], 07) ) continue;
+    zDir = azDirs[i];
+    break;
+  }
+  if( strlen(zDir) - sizeof(SQLITE_TEMP_FILE_PREFIX) - 17 <=0 ){
+    return SQLITE_ERROR;
+  }
+  do{
+    assert( pVfs->mxPathname==MAX_PATHNAME );
+    sqlite3_snprintf(nBuf-17, zBuf, "%s/"SQLITE_TEMP_FILE_PREFIX, zDir);
+    j = strlen(zBuf);
+    sqlite3Randomness(15, &zBuf[j]);
+    for(i=0; i<15; i++, j++){
+      zBuf[j] = (char)zChars[ ((unsigned char)zBuf[j])%(sizeof(zChars)-1) ];
+    }
+    zBuf[j] = 0;
+  }while( access(zBuf,0)==0 );
+  return SQLITE_OK;
+}
+
+
+/*
+** Turn a relative pathname into a full pathname. The relative path
+** is stored as a nul-terminated string in the buffer pointed to by
+** zPath.
+**
+** zOut points to a buffer of at least sqlite3_vfs.mxPathname bytes
+** (in this case, MAX_PATHNAME bytes). The full-path is written to
+** this buffer before returning.
+*/
+static int unixFullPathname(
+  sqlite3_vfs *pVfs,            /* Pointer to vfs object */
+  const char *zPath,            /* Possibly relative input path */
+  int nOut,                     /* Size of output buffer in bytes */
+  char *zOut                    /* Output buffer */
+){
+
+  /* It's odd to simulate an io-error here, but really this is just
+  ** using the io-error infrastructure to test that SQLite handles this
+  ** function failing. This function could fail if, for example, the
+  ** current working directly has been unlinked.
+  */
+  SimulateIOError( return SQLITE_ERROR );
+
+  assert( pVfs->mxPathname==MAX_PATHNAME );
+  zOut[nOut-1] = '\0';
+  if( zPath[0]=='/' ){
+    sqlite3_snprintf(nOut, zOut, "%s", zPath);
+  }else{
+    int nCwd;
+    if( getcwd(zOut, nOut-1)==0 ){
+      return SQLITE_CANTOPEN;
+    }
+    nCwd = strlen(zOut);
+    sqlite3_snprintf(nOut-nCwd, &zOut[nCwd], "/%s", zPath);
+  }
+  return SQLITE_OK;
+
+#if 0
+  /*
+  ** Remove "/./" path elements and convert "/A/./" path elements
+  ** to just "/".
+  */
+  if( zFull ){
+    int i, j;
+    for(i=j=0; zFull[i]; i++){
+      if( zFull[i]=='/' ){
+        if( zFull[i+1]=='/' ) continue;
+        if( zFull[i+1]=='.' && zFull[i+2]=='/' ){
+          i += 1;
+          continue;
+        }
+        if( zFull[i+1]=='.' && zFull[i+2]=='.' && zFull[i+3]=='/' ){
+          while( j>0 && zFull[j-1]!='/' ){ j--; }
+          i += 3;
+          continue;
+        }
+      }
+      zFull[j++] = zFull[i];
+    }
+    zFull[j] = 0;
+  }
+#endif
+}
+
+
+#ifndef SQLITE_OMIT_LOAD_EXTENSION
+/*
+** Interfaces for opening a shared library, finding entry points
+** within the shared library, and closing the shared library.
+*/
+#include <dlfcn.h>
+static void *unixDlOpen(sqlite3_vfs *pVfs, const char *zFilename){
+  return dlopen(zFilename, RTLD_NOW | RTLD_GLOBAL);
+}
+
+/*
+** SQLite calls this function immediately after a call to unixDlSym() or
+** unixDlOpen() fails (returns a null pointer). If a more detailed error
+** message is available, it is written to zBufOut. If no error message
+** is available, zBufOut is left unmodified and SQLite uses a default
+** error message.
+*/
+static void unixDlError(sqlite3_vfs *pVfs, int nBuf, char *zBufOut){
+  char *zErr;
+  enterMutex();
+  zErr = dlerror();
+  if( zErr ){
+    sqlite3_snprintf(nBuf, zBufOut, "%s", zErr);
+  }
+  leaveMutex();
+}
+static void *unixDlSym(sqlite3_vfs *pVfs, void *pHandle, const char *zSymbol){
+  return dlsym(pHandle, zSymbol);
+}
+static void unixDlClose(sqlite3_vfs *pVfs, void *pHandle){
+  dlclose(pHandle);
+}
+#else /* if SQLITE_OMIT_LOAD_EXTENSION is defined: */
+  #define unixDlOpen  0
+  #define unixDlError 0
+  #define unixDlSym   0
+  #define unixDlClose 0
+#endif
+
+/*
+** Write nBuf bytes of random data to the supplied buffer zBuf.
+*/
+static int unixRandomness(sqlite3_vfs *pVfs, int nBuf, char *zBuf){
+
+  assert(nBuf>=(sizeof(time_t)+sizeof(int)));
+
+  /* We have to initialize zBuf to prevent valgrind from reporting
+  ** errors.  The reports issued by valgrind are incorrect - we would
+  ** prefer that the randomness be increased by making use of the
+  ** uninitialized space in zBuf - but valgrind errors tend to worry
+  ** some users.  Rather than argue, it seems easier just to initialize
+  ** the whole array and silence valgrind, even if that means less randomness
+  ** in the random seed.
+  **
+  ** When testing, initializing zBuf[] to zero is all we do.  That means
+  ** that we always use the same random number sequence.  This makes the
+  ** tests repeatable.
+  */
+  memset(zBuf, 0, nBuf);
+#if !defined(SQLITE_TEST)
+  {
+    int pid, fd;
+    fd = open("/dev/urandom", O_RDONLY);
+    if( fd<0 ){
+      time_t t;
+      time(&t);
+      memcpy(zBuf, &t, sizeof(t));
+      pid = getpid();
+      memcpy(&zBuf[sizeof(t)], &pid, sizeof(pid));
+    }else{
+      read(fd, zBuf, nBuf);
+      close(fd);
+    }
+  }
+#endif
+  return SQLITE_OK;
+}
+
+
+/*
+** Sleep for a little while.  Return the amount of time slept.
+** The argument is the number of microseconds we want to sleep.
+** The return value is the number of microseconds of sleep actually
+** requested from the underlying operating system, a number which
+** might be greater than or equal to the argument, but not less
+** than the argument.
+*/
+static int unixSleep(sqlite3_vfs *pVfs, int microseconds){
+#if defined(HAVE_USLEEP) && HAVE_USLEEP
+  usleep(microseconds);
+  return microseconds;
+#else
+  int seconds = (microseconds+999999)/1000000;
+  sleep(seconds);
+  return seconds*1000000;
+#endif
+}
+
+/*
+** The following variable, if set to a non-zero value, becomes the result
+** returned from sqlite3OsCurrentTime().  This is used for testing.
+*/
+#ifdef SQLITE_TEST
+int sqlite3_current_time = 0;
+#endif
+
+/*
+** Find the current time (in Universal Coordinated Time).  Write the
+** current time and date as a Julian Day number into *prNow and
+** return 0.  Return 1 if the time and date cannot be found.
+*/
+static int unixCurrentTime(sqlite3_vfs *pVfs, double *prNow){
+#ifdef NO_GETTOD
+  time_t t;
+  time(&t);
+  *prNow = t/86400.0 + 2440587.5;
+#else
+  struct timeval sNow;
+  gettimeofday(&sNow, 0);
+  *prNow = 2440587.5 + sNow.tv_sec/86400.0 + sNow.tv_usec/86400000000.0;
+#endif
+#ifdef SQLITE_TEST
+  if( sqlite3_current_time ){
+    *prNow = sqlite3_current_time/86400.0 + 2440587.5;
+  }
+#endif
+  return 0;
+}
+
+/*
+** Return a pointer to the sqlite3DefaultVfs structure.   We use
+** a function rather than give the structure global scope because
+** some compilers (MSVC) do not allow forward declarations of
+** initialized structures.
+*/
+sqlite3_vfs *sqlite3OsDefaultVfs(void){
+  static sqlite3_vfs unixVfs = {
+    1,                  /* iVersion */
+    sizeof(unixFile),   /* szOsFile */
+    MAX_PATHNAME,       /* mxPathname */
+    0,                  /* pNext */
+    "unix",             /* zName */
+    0,                  /* pAppData */
+
+    unixOpen,           /* xOpen */
+    unixDelete,         /* xDelete */
+    unixAccess,         /* xAccess */
+    unixGetTempname,    /* xGetTempName */
+    unixFullPathname,   /* xFullPathname */
+    unixDlOpen,         /* xDlOpen */
+    unixDlError,        /* xDlError */
+    unixDlSym,          /* xDlSym */
+    unixDlClose,        /* xDlClose */
+    unixRandomness,     /* xRandomness */
+    unixSleep,          /* xSleep */
+    unixCurrentTime     /* xCurrentTime */
+  };
+
+  return &unixVfs;
+}
+
+#endif /* OS_UNIX */
diff --git a/uppsrc/plugin/sqlite3/lib/os_win.c b/uppsrc/plugin/sqlite3/lib/os_win.c
new file mode 100644
index 000000000..6fe72ffcb
--- /dev/null
+++ b/uppsrc/plugin/sqlite3/lib/os_win.c
@@ -0,0 +1,1565 @@
+/*
+** 2004 May 22
+**
+** The author disclaims copyright to this source code.  In place of
+** a legal notice, here is a blessing:
+**
+**    May you do good and not evil.
+**    May you find forgiveness for yourself and forgive others.
+**    May you share freely, never taking more than you give.
+**
+******************************************************************************
+**
+** This file contains code that is specific to windows.
+*/
+#include "sqliteInt.h"
+#if OS_WIN               /* This file is used for windows only */
+
+
+/*
+** A Note About Memory Allocation:
+**
+** This driver uses malloc()/free() directly rather than going through
+** the SQLite-wrappers sqlite3_malloc()/sqlite3_free().  Those wrappers
+** are designed for use on embedded systems where memory is scarce and
+** malloc failures happen frequently.  Win32 does not typically run on
+** embedded systems, and when it does the developers normally have bigger
+** problems to worry about than running out of memory.  So there is not
+** a compelling need to use the wrappers.
+**
+** But there is a good reason to not use the wrappers.  If we use the
+** wrappers then we will get simulated malloc() failures within this
+** driver.  And that causes all kinds of problems for our tests.  We
+** could enhance SQLite to deal with simulated malloc failures within
+** the OS driver, but the code to deal with those failure would not
+** be exercised on Linux (which does not need to malloc() in the driver)
+** and so we would have difficulty writing coverage tests for that
+** code.  Better to leave the code out, we think.
+**
+** The point of this discussion is as follows:  When creating a new
+** OS layer for an embedded system, if you use this file as an example,
+** avoid the use of malloc()/free().  Those routines work ok on windows
+** desktops but not so well in embedded systems.
+*/
+
+#include <winbase.h>
+
+#ifdef __CYGWIN__
+# include <sys/cygwin.h>
+#endif
+
+/*
+** Macros used to determine whether or not to use threads.
+*/
+#if defined(THREADSAFE) && THREADSAFE
+# define SQLITE_W32_THREADS 1
+#endif
+
+/*
+** Include code that is common to all os_*.c files
+*/
+#include "os_common.h"
+
+/*
+** Determine if we are dealing with WindowsCE - which has a much
+** reduced API.
+*/
+#if defined(_WIN32_WCE)
+# define OS_WINCE 1
+# define AreFileApisANSI() 1
+#else
+# define OS_WINCE 0
+#endif
+
+/*
+** WinCE lacks native support for file locking so we have to fake it
+** with some code of our own.
+*/
+#if OS_WINCE
+typedef struct winceLock {
+  int nReaders;       /* Number of reader locks obtained */
+  BOOL bPending;      /* Indicates a pending lock has been obtained */
+  BOOL bReserved;     /* Indicates a reserved lock has been obtained */
+  BOOL bExclusive;    /* Indicates an exclusive lock has been obtained */
+} winceLock;
+#endif
+
+/*
+** The winFile structure is a subclass of sqlite3_file* specific to the win32
+** portability layer.
+*/
+typedef struct winFile winFile;
+struct winFile {
+  const sqlite3_io_methods *pMethod;/* Must be first */
+  HANDLE h;               /* Handle for accessing the file */
+  unsigned char locktype; /* Type of lock currently held on this file */
+  short sharedLockByte;   /* Randomly chosen byte used as a shared lock */
+#if OS_WINCE
+  WCHAR *zDeleteOnClose;  /* Name of file to delete when closing */
+  HANDLE hMutex;          /* Mutex used to control access to shared lock */
+  HANDLE hShared;         /* Shared memory segment used for locking */
+  winceLock local;        /* Locks obtained by this instance of winFile */
+  winceLock *shared;      /* Global shared lock memory for the file  */
+#endif
+};
+
+
+/*
+** The following variable is (normally) set once and never changes
+** thereafter.  It records whether the operating system is Win95
+** or WinNT.
+**
+** 0:   Operating system unknown.
+** 1:   Operating system is Win95.
+** 2:   Operating system is WinNT.
+**
+** In order to facilitate testing on a WinNT system, the test fixture
+** can manually set this value to 1 to emulate Win98 behavior.
+*/
+#ifdef SQLITE_TEST
+int sqlite3_os_type = 0;
+#else
+static int sqlite3_os_type = 0;
+#endif
+
+/*
+** Return true (non-zero) if we are running under WinNT, Win2K, WinXP,
+** or WinCE.  Return false (zero) for Win95, Win98, or WinME.
+**
+** Here is an interesting observation:  Win95, Win98, and WinME lack
+** the LockFileEx() API.  But we can still statically link against that
+** API as long as we don't call it win running Win95/98/ME.  A call to
+** this routine is used to determine if the host is Win95/98/ME or
+** WinNT/2K/XP so that we will know whether or not we can safely call
+** the LockFileEx() API.
+*/
+#if OS_WINCE
+# define isNT()  (1)
+#else
+  static int isNT(void){
+    if( sqlite3_os_type==0 ){
+      OSVERSIONINFO sInfo;
+      sInfo.dwOSVersionInfoSize = sizeof(sInfo);
+      GetVersionEx(&sInfo);
+      sqlite3_os_type = sInfo.dwPlatformId==VER_PLATFORM_WIN32_NT ? 2 : 1;
+    }
+    return sqlite3_os_type==2;
+  }
+#endif /* OS_WINCE */
+
+/*
+** Convert a UTF-8 string to microsoft unicode (UTF-16?).
+**
+** Space to hold the returned string is obtained from malloc.
+*/
+static WCHAR *utf8ToUnicode(const char *zFilename){
+  int nChar;
+  WCHAR *zWideFilename;
+
+  nChar = MultiByteToWideChar(CP_UTF8, 0, zFilename, -1, NULL, 0);
+  zWideFilename = malloc( nChar*sizeof(zWideFilename[0]) );
+  if( zWideFilename==0 ){
+    return 0;
+  }
+  nChar = MultiByteToWideChar(CP_UTF8, 0, zFilename, -1, zWideFilename, nChar);
+  if( nChar==0 ){
+    free(zWideFilename);
+    zWideFilename = 0;
+  }
+  return zWideFilename;
+}
+
+/*
+** Convert microsoft unicode to UTF-8.  Space to hold the returned string is
+** obtained from malloc().
+*/
+static char *unicodeToUtf8(const WCHAR *zWideFilename){
+  int nByte;
+  char *zFilename;
+
+  nByte = WideCharToMultiByte(CP_UTF8, 0, zWideFilename, -1, 0, 0, 0, 0);
+  zFilename = malloc( nByte );
+  if( zFilename==0 ){
+    return 0;
+  }
+  nByte = WideCharToMultiByte(CP_UTF8, 0, zWideFilename, -1, zFilename, nByte,
+                              0, 0);
+  if( nByte == 0 ){
+    free(zFilename);
+    zFilename = 0;
+  }
+  return zFilename;
+}
+
+/*
+** Convert an ansi string to microsoft unicode, based on the
+** current codepage settings for file apis.
+**
+** Space to hold the returned string is obtained
+** from malloc.
+*/
+static WCHAR *mbcsToUnicode(const char *zFilename){
+  int nByte;
+  WCHAR *zMbcsFilename;
+  int codepage = AreFileApisANSI() ? CP_ACP : CP_OEMCP;
+
+  nByte = MultiByteToWideChar(codepage, 0, zFilename, -1, NULL,0)*sizeof(WCHAR);
+  zMbcsFilename = malloc( nByte*sizeof(zMbcsFilename[0]) );
+  if( zMbcsFilename==0 ){
+    return 0;
+  }
+  nByte = MultiByteToWideChar(codepage, 0, zFilename, -1, zMbcsFilename, nByte);
+  if( nByte==0 ){
+    free(zMbcsFilename);
+    zMbcsFilename = 0;
+  }
+  return zMbcsFilename;
+}
+
+/*
+** Convert microsoft unicode to multibyte character string, based on the
+** user's Ansi codepage.
+**
+** Space to hold the returned string is obtained from
+** malloc().
+*/
+static char *unicodeToMbcs(const WCHAR *zWideFilename){
+  int nByte;
+  char *zFilename;
+  int codepage = AreFileApisANSI() ? CP_ACP : CP_OEMCP;
+
+  nByte = WideCharToMultiByte(codepage, 0, zWideFilename, -1, 0, 0, 0, 0);
+  zFilename = malloc( nByte );
+  if( zFilename==0 ){
+    return 0;
+  }
+  nByte = WideCharToMultiByte(codepage, 0, zWideFilename, -1, zFilename, nByte,
+                              0, 0);
+  if( nByte == 0 ){
+    free(zFilename);
+    zFilename = 0;
+  }
+  return zFilename;
+}
+
+/*
+** Convert multibyte character string to UTF-8.  Space to hold the
+** returned string is obtained from malloc().
+*/
+static char *mbcsToUtf8(const char *zFilename){
+  char *zFilenameUtf8;
+  WCHAR *zTmpWide;
+
+  zTmpWide = mbcsToUnicode(zFilename);
+  if( zTmpWide==0 ){
+    return 0;
+  }
+  zFilenameUtf8 = unicodeToUtf8(zTmpWide);
+  free(zTmpWide);
+  return zFilenameUtf8;
+}
+
+/*
+** Convert UTF-8 to multibyte character string.  Space to hold the
+** returned string is obtained from malloc().
+*/
+static char *utf8ToMbcs(const char *zFilename){
+  char *zFilenameMbcs;
+  WCHAR *zTmpWide;
+
+  zTmpWide = utf8ToUnicode(zFilename);
+  if( zTmpWide==0 ){
+    return 0;
+  }
+  zFilenameMbcs = unicodeToMbcs(zTmpWide);
+  free(zTmpWide);
+  return zFilenameMbcs;
+}
+
+#if OS_WINCE
+/*************************************************************************
+** This section contains code for WinCE only.
+*/
+/*
+** WindowsCE does not have a localtime() function.  So create a
+** substitute.
+*/
+#include <time.h>
+struct tm *__cdecl localtime(const time_t *t)
+{
+  static struct tm y;
+  FILETIME uTm, lTm;
+  SYSTEMTIME pTm;
+  sqlite3_int64 t64;
+  t64 = *t;
+  t64 = (t64 + 11644473600)*10000000;
+  uTm.dwLowDateTime = t64 & 0xFFFFFFFF;
+  uTm.dwHighDateTime= t64 >> 32;
+  FileTimeToLocalFileTime(&uTm,&lTm);
+  FileTimeToSystemTime(&lTm,&pTm);
+  y.tm_year = pTm.wYear - 1900;
+  y.tm_mon = pTm.wMonth - 1;
+  y.tm_wday = pTm.wDayOfWeek;
+  y.tm_mday = pTm.wDay;
+  y.tm_hour = pTm.wHour;
+  y.tm_min = pTm.wMinute;
+  y.tm_sec = pTm.wSecond;
+  return &y;
+}
+
+/* This will never be called, but defined to make the code compile */
+#define GetTempPathA(a,b)
+
+#define LockFile(a,b,c,d,e)       winceLockFile(&a, b, c, d, e)
+#define UnlockFile(a,b,c,d,e)     winceUnlockFile(&a, b, c, d, e)
+#define LockFileEx(a,b,c,d,e,f)   winceLockFileEx(&a, b, c, d, e, f)
+
+#define HANDLE_TO_WINFILE(a) (winFile*)&((char*)a)[-offsetof(winFile,h)]
+
+/*
+** Acquire a lock on the handle h
+*/
+static void winceMutexAcquire(HANDLE h){
+   DWORD dwErr;
+   do {
+     dwErr = WaitForSingleObject(h, INFINITE);
+   } while (dwErr != WAIT_OBJECT_0 && dwErr != WAIT_ABANDONED);
+}
+/*
+** Release a lock acquired by winceMutexAcquire()
+*/
+#define winceMutexRelease(h) ReleaseMutex(h)
+
+/*
+** Create the mutex and shared memory used for locking in the file
+** descriptor pFile
+*/
+static BOOL winceCreateLock(const char *zFilename, winFile *pFile){
+  WCHAR *zTok;
+  WCHAR *zName = utf8ToUnicode(zFilename);
+  BOOL bInit = TRUE;
+
+  /* Initialize the local lockdata */
+  ZeroMemory(&pFile->local, sizeof(pFile->local));
+
+  /* Replace the backslashes from the filename and lowercase it
+  ** to derive a mutex name. */
+  zTok = CharLowerW(zName);
+  for (;*zTok;zTok++){
+    if (*zTok == '\\') *zTok = '_';
+  }
+
+  /* Create/open the named mutex */
+  pFile->hMutex = CreateMutexW(NULL, FALSE, zName);
+  if (!pFile->hMutex){
+    free(zName);
+    return FALSE;
+  }
+
+  /* Acquire the mutex before continuing */
+  winceMutexAcquire(pFile->hMutex);
+
+  /* Since the names of named mutexes, semaphores, file mappings etc are
+  ** case-sensitive, take advantage of that by uppercasing the mutex name
+  ** and using that as the shared filemapping name.
+  */
+  CharUpperW(zName);
+  pFile->hShared = CreateFileMappingW(INVALID_HANDLE_VALUE, NULL,
+                                       PAGE_READWRITE, 0, sizeof(winceLock),
+                                       zName);
+
+  /* Set a flag that indicates we're the first to create the memory so it
+  ** must be zero-initialized */
+  if (GetLastError() == ERROR_ALREADY_EXISTS){
+    bInit = FALSE;
+  }
+
+  free(zName);
+
+  /* If we succeeded in making the shared memory handle, map it. */
+  if (pFile->hShared){
+    pFile->shared = (winceLock*)MapViewOfFile(pFile->hShared,
+             FILE_MAP_READ|FILE_MAP_WRITE, 0, 0, sizeof(winceLock));
+    /* If mapping failed, close the shared memory handle and erase it */
+    if (!pFile->shared){
+      CloseHandle(pFile->hShared);
+      pFile->hShared = NULL;
+    }
+  }
+
+  /* If shared memory could not be created, then close the mutex and fail */
+  if (pFile->hShared == NULL){
+    winceMutexRelease(pFile->hMutex);
+    CloseHandle(pFile->hMutex);
+    pFile->hMutex = NULL;
+    return FALSE;
+  }
+
+  /* Initialize the shared memory if we're supposed to */
+  if (bInit) {
+    ZeroMemory(pFile->shared, sizeof(winceLock));
+  }
+
+  winceMutexRelease(pFile->hMutex);
+  return TRUE;
+}
+
+/*
+** Destroy the part of winFile that deals with wince locks
+*/
+static void winceDestroyLock(winFile *pFile){
+  if (pFile->hMutex){
+    /* Acquire the mutex */
+    winceMutexAcquire(pFile->hMutex);
+
+    /* The following blocks should probably assert in debug mode, but they
+       are to cleanup in case any locks remained open */
+    if (pFile->local.nReaders){
+      pFile->shared->nReaders --;
+    }
+    if (pFile->local.bReserved){
+      pFile->shared->bReserved = FALSE;
+    }
+    if (pFile->local.bPending){
+      pFile->shared->bPending = FALSE;
+    }
+    if (pFile->local.bExclusive){
+      pFile->shared->bExclusive = FALSE;
+    }
+
+    /* De-reference and close our copy of the shared memory handle */
+    UnmapViewOfFile(pFile->shared);
+    CloseHandle(pFile->hShared);
+
+    /* Done with the mutex */
+    winceMutexRelease(pFile->hMutex);
+    CloseHandle(pFile->hMutex);
+    pFile->hMutex = NULL;
+  }
+}
+
+/*
+** An implementation of the LockFile() API of windows for wince
+*/
+static BOOL winceLockFile(
+  HANDLE *phFile,
+  DWORD dwFileOffsetLow,
+  DWORD dwFileOffsetHigh,
+  DWORD nNumberOfBytesToLockLow,
+  DWORD nNumberOfBytesToLockHigh
+){
+  winFile *pFile = HANDLE_TO_WINFILE(phFile);
+  BOOL bReturn = FALSE;
+
+  if (!pFile->hMutex) return TRUE;
+  winceMutexAcquire(pFile->hMutex);
+
+  /* Wanting an exclusive lock? */
+  if (dwFileOffsetLow == SHARED_FIRST
+       && nNumberOfBytesToLockLow == SHARED_SIZE){
+    if (pFile->shared->nReaders == 0 && pFile->shared->bExclusive == 0){
+       pFile->shared->bExclusive = TRUE;
+       pFile->local.bExclusive = TRUE;
+       bReturn = TRUE;
+    }
+  }
+
+  /* Want a read-only lock? */
+  else if ((dwFileOffsetLow >= SHARED_FIRST &&
+            dwFileOffsetLow < SHARED_FIRST + SHARED_SIZE) &&
+            nNumberOfBytesToLockLow == 1){
+    if (pFile->shared->bExclusive == 0){
+      pFile->local.nReaders ++;
+      if (pFile->local.nReaders == 1){
+        pFile->shared->nReaders ++;
+      }
+      bReturn = TRUE;
+    }
+  }
+
+  /* Want a pending lock? */
+  else if (dwFileOffsetLow == PENDING_BYTE && nNumberOfBytesToLockLow == 1){
+    /* If no pending lock has been acquired, then acquire it */
+    if (pFile->shared->bPending == 0) {
+      pFile->shared->bPending = TRUE;
+      pFile->local.bPending = TRUE;
+      bReturn = TRUE;
+    }
+  }
+  /* Want a reserved lock? */
+  else if (dwFileOffsetLow == RESERVED_BYTE && nNumberOfBytesToLockLow == 1){
+    if (pFile->shared->bReserved == 0) {
+      pFile->shared->bReserved = TRUE;
+      pFile->local.bReserved = TRUE;
+      bReturn = TRUE;
+    }
+  }
+
+  winceMutexRelease(pFile->hMutex);
+  return bReturn;
+}
+
+/*
+** An implementation of the UnlockFile API of windows for wince
+*/
+static BOOL winceUnlockFile(
+  HANDLE *phFile,
+  DWORD dwFileOffsetLow,
+  DWORD dwFileOffsetHigh,
+  DWORD nNumberOfBytesToUnlockLow,
+  DWORD nNumberOfBytesToUnlockHigh
+){
+  winFile *pFile = HANDLE_TO_WINFILE(phFile);
+  BOOL bReturn = FALSE;
+
+  if (!pFile->hMutex) return TRUE;
+  winceMutexAcquire(pFile->hMutex);
+
+  /* Releasing a reader lock or an exclusive lock */
+  if (dwFileOffsetLow >= SHARED_FIRST &&
+       dwFileOffsetLow < SHARED_FIRST + SHARED_SIZE){
+    /* Did we have an exclusive lock? */
+    if (pFile->local.bExclusive){
+      pFile->local.bExclusive = FALSE;
+      pFile->shared->bExclusive = FALSE;
+      bReturn = TRUE;
+    }
+
+    /* Did we just have a reader lock? */
+    else if (pFile->local.nReaders){
+      pFile->local.nReaders --;
+      if (pFile->local.nReaders == 0)
+      {
+        pFile->shared->nReaders --;
+      }
+      bReturn = TRUE;
+    }
+  }
+
+  /* Releasing a pending lock */
+  else if (dwFileOffsetLow == PENDING_BYTE && nNumberOfBytesToUnlockLow == 1){
+    if (pFile->local.bPending){
+      pFile->local.bPending = FALSE;
+      pFile->shared->bPending = FALSE;
+      bReturn = TRUE;
+    }
+  }
+  /* Releasing a reserved lock */
+  else if (dwFileOffsetLow == RESERVED_BYTE && nNumberOfBytesToUnlockLow == 1){
+    if (pFile->local.bReserved) {
+      pFile->local.bReserved = FALSE;
+      pFile->shared->bReserved = FALSE;
+      bReturn = TRUE;
+    }
+  }
+
+  winceMutexRelease(pFile->hMutex);
+  return bReturn;
+}
+
+/*
+** An implementation of the LockFileEx() API of windows for wince
+*/
+static BOOL winceLockFileEx(
+  HANDLE *phFile,
+  DWORD dwFlags,
+  DWORD dwReserved,
+  DWORD nNumberOfBytesToLockLow,
+  DWORD nNumberOfBytesToLockHigh,
+  LPOVERLAPPED lpOverlapped
+){
+  /* If the caller wants a shared read lock, forward this call
+  ** to winceLockFile */
+  if (lpOverlapped->Offset == SHARED_FIRST &&
+      dwFlags == 1 &&
+      nNumberOfBytesToLockLow == SHARED_SIZE){
+    return winceLockFile(phFile, SHARED_FIRST, 0, 1, 0);
+  }
+  return FALSE;
+}
+/*
+** End of the special code for wince
+*****************************************************************************/
+#endif /* OS_WINCE */
+
+/*****************************************************************************
+** The next group of routines implement the I/O methods specified
+** by the sqlite3_io_methods object.
+******************************************************************************/
+
+/*
+** Close a file.
+**
+** It is reported that an attempt to close a handle might sometimes
+** fail.  This is a very unreasonable result, but windows is notorious
+** for being unreasonable so I do not doubt that it might happen.  If
+** the close fails, we pause for 100 milliseconds and try again.  As
+** many as MX_CLOSE_ATTEMPT attempts to close the handle are made before
+** giving up and returning an error.
+*/
+#define MX_CLOSE_ATTEMPT 3
+static int winClose(sqlite3_file *id){
+  int rc, cnt = 0;
+  winFile *pFile = (winFile*)id;
+  OSTRACE2("CLOSE %d\n", pFile->h);
+  do{
+    rc = CloseHandle(pFile->h);
+  }while( rc==0 && cnt++ < MX_CLOSE_ATTEMPT && (Sleep(100), 1) );
+#if OS_WINCE
+#define WINCE_DELETION_ATTEMPTS 3
+  winceDestroyLock(pFile);
+  if( pFile->zDeleteOnClose ){
+    int cnt = 0;
+    while(
+           DeleteFileW(pFile->zDeleteOnClose)==0
+        && GetFileAttributesW(pFile->zDeleteOnClose)!=0xffffffff
+        && cnt++ < WINCE_DELETION_ATTEMPTS
+    ){
+       Sleep(100);  /* Wait a little before trying again */
+    }
+    free(pFile->zDeleteOnClose);
+  }
+#endif
+  OpenCounter(-1);
+  return rc ? SQLITE_OK : SQLITE_IOERR;
+}
+
+/*
+** Some microsoft compilers lack this definition.
+*/
+#ifndef INVALID_SET_FILE_POINTER
+# define INVALID_SET_FILE_POINTER ((DWORD)-1)
+#endif
+
+/*
+** Read data from a file into a buffer.  Return SQLITE_OK if all
+** bytes were read successfully and SQLITE_IOERR if anything goes
+** wrong.
+*/
+static int winRead(
+  sqlite3_file *id,          /* File to read from */
+  void *pBuf,                /* Write content into this buffer */
+  int amt,                   /* Number of bytes to read */
+  sqlite3_int64 offset       /* Begin reading at this offset */
+){
+  LONG upperBits = (offset>>32) & 0x7fffffff;
+  LONG lowerBits = offset & 0xffffffff;
+  DWORD rc;
+  DWORD got;
+  winFile *pFile = (winFile*)id;
+  assert( id!=0 );
+  SimulateIOError(return SQLITE_IOERR_READ);
+  OSTRACE3("READ %d lock=%d\n", pFile->h, pFile->locktype);
+  rc = SetFilePointer(pFile->h, lowerBits, &upperBits, FILE_BEGIN);
+  if( rc==INVALID_SET_FILE_POINTER && GetLastError()!=NO_ERROR ){
+    return SQLITE_FULL;
+  }
+  if( !ReadFile(pFile->h, pBuf, amt, &got, 0) ){
+    return SQLITE_IOERR_READ;
+  }
+  if( got==(DWORD)amt ){
+    return SQLITE_OK;
+  }else{
+    memset(&((char*)pBuf)[got], 0, amt-got);
+    return SQLITE_IOERR_SHORT_READ;
+  }
+}
+
+/*
+** Write data from a buffer into a file.  Return SQLITE_OK on success
+** or some other error code on failure.
+*/
+static int winWrite(
+  sqlite3_file *id,         /* File to write into */
+  const void *pBuf,         /* The bytes to be written */
+  int amt,                  /* Number of bytes to write */
+  sqlite3_int64 offset      /* Offset into the file to begin writing at */
+){
+  LONG upperBits = (offset>>32) & 0x7fffffff;
+  LONG lowerBits = offset & 0xffffffff;
+  DWORD rc;
+  DWORD wrote;
+  winFile *pFile = (winFile*)id;
+  assert( id!=0 );
+  SimulateIOError(return SQLITE_IOERR_WRITE);
+  SimulateDiskfullError(return SQLITE_FULL);
+  OSTRACE3("WRITE %d lock=%d\n", pFile->h, pFile->locktype);
+  rc = SetFilePointer(pFile->h, lowerBits, &upperBits, FILE_BEGIN);
+  if( rc==INVALID_SET_FILE_POINTER && GetLastError()!=NO_ERROR ){
+    return SQLITE_FULL;
+  }
+  assert( amt>0 );
+  while(
+     amt>0
+     && (rc = WriteFile(pFile->h, pBuf, amt, &wrote, 0))!=0
+     && wrote>0
+  ){
+    amt -= wrote;
+    pBuf = &((char*)pBuf)[wrote];
+  }
+  if( !rc || amt>(int)wrote ){
+    return SQLITE_FULL;
+  }
+  return SQLITE_OK;
+}
+
+/*
+** Truncate an open file to a specified size
+*/
+static int winTruncate(sqlite3_file *id, sqlite3_int64 nByte){
+  LONG upperBits = (nByte>>32) & 0x7fffffff;
+  LONG lowerBits = nByte & 0xffffffff;
+  winFile *pFile = (winFile*)id;
+  OSTRACE3("TRUNCATE %d %lld\n", pFile->h, nByte);
+  SimulateIOError(return SQLITE_IOERR_TRUNCATE);
+  SetFilePointer(pFile->h, lowerBits, &upperBits, FILE_BEGIN);
+  SetEndOfFile(pFile->h);
+  return SQLITE_OK;
+}
+
+#ifdef SQLITE_TEST
+/*
+** Count the number of fullsyncs and normal syncs.  This is used to test
+** that syncs and fullsyncs are occuring at the right times.
+*/
+int sqlite3_sync_count = 0;
+int sqlite3_fullsync_count = 0;
+#endif
+
+/*
+** Make sure all writes to a particular file are committed to disk.
+*/
+static int winSync(sqlite3_file *id, int flags){
+  winFile *pFile = (winFile*)id;
+  OSTRACE3("SYNC %d lock=%d\n", pFile->h, pFile->locktype);
+#ifdef SQLITE_TEST
+  if( flags & SQLITE_SYNC_FULL ){
+    sqlite3_fullsync_count++;
+  }
+  sqlite3_sync_count++;
+#endif
+  if( FlushFileBuffers(pFile->h) ){
+    return SQLITE_OK;
+  }else{
+    return SQLITE_IOERR;
+  }
+}
+
+/*
+** Determine the current size of a file in bytes
+*/
+static int winFileSize(sqlite3_file *id, sqlite3_int64 *pSize){
+  winFile *pFile = (winFile*)id;
+  DWORD upperBits, lowerBits;
+  SimulateIOError(return SQLITE_IOERR_FSTAT);
+  lowerBits = GetFileSize(pFile->h, &upperBits);
+  *pSize = (((sqlite3_int64)upperBits)<<32) + lowerBits;
+  return SQLITE_OK;
+}
+
+/*
+** LOCKFILE_FAIL_IMMEDIATELY is undefined on some Windows systems.
+*/
+#ifndef LOCKFILE_FAIL_IMMEDIATELY
+# define LOCKFILE_FAIL_IMMEDIATELY 1
+#endif
+
+/*
+** Acquire a reader lock.
+** Different API routines are called depending on whether or not this
+** is Win95 or WinNT.
+*/
+static int getReadLock(winFile *pFile){
+  int res;
+  if( isNT() ){
+    OVERLAPPED ovlp;
+    ovlp.Offset = SHARED_FIRST;
+    ovlp.OffsetHigh = 0;
+    ovlp.hEvent = 0;
+    res = LockFileEx(pFile->h, LOCKFILE_FAIL_IMMEDIATELY,
+                     0, SHARED_SIZE, 0, &ovlp);
+  }else{
+    int lk;
+    sqlite3Randomness(sizeof(lk), &lk);
+    pFile->sharedLockByte = (lk & 0x7fffffff)%(SHARED_SIZE - 1);
+    res = LockFile(pFile->h, SHARED_FIRST+pFile->sharedLockByte, 0, 1, 0);
+  }
+  return res;
+}
+
+/*
+** Undo a readlock
+*/
+static int unlockReadLock(winFile *pFile){
+  int res;
+  if( isNT() ){
+    res = UnlockFile(pFile->h, SHARED_FIRST, 0, SHARED_SIZE, 0);
+  }else{
+    res = UnlockFile(pFile->h, SHARED_FIRST + pFile->sharedLockByte, 0, 1, 0);
+  }
+  return res;
+}
+
+/*
+** Lock the file with the lock specified by parameter locktype - one
+** of the following:
+**
+**     (1) SHARED_LOCK
+**     (2) RESERVED_LOCK
+**     (3) PENDING_LOCK
+**     (4) EXCLUSIVE_LOCK
+**
+** Sometimes when requesting one lock state, additional lock states
+** are inserted in between.  The locking might fail on one of the later
+** transitions leaving the lock state different from what it started but
+** still short of its goal.  The following chart shows the allowed
+** transitions and the inserted intermediate states:
+**
+**    UNLOCKED -> SHARED
+**    SHARED -> RESERVED
+**    SHARED -> (PENDING) -> EXCLUSIVE
+**    RESERVED -> (PENDING) -> EXCLUSIVE
+**    PENDING -> EXCLUSIVE
+**
+** This routine will only increase a lock.  The winUnlock() routine
+** erases all locks at once and returns us immediately to locking level 0.
+** It is not possible to lower the locking level one step at a time.  You
+** must go straight to locking level 0.
+*/
+static int winLock(sqlite3_file *id, int locktype){
+  int rc = SQLITE_OK;    /* Return code from subroutines */
+  int res = 1;           /* Result of a windows lock call */
+  int newLocktype;       /* Set pFile->locktype to this value before exiting */
+  int gotPendingLock = 0;/* True if we acquired a PENDING lock this time */
+  winFile *pFile = (winFile*)id;
+
+  assert( pFile!=0 );
+  OSTRACE5("LOCK %d %d was %d(%d)\n",
+          pFile->h, locktype, pFile->locktype, pFile->sharedLockByte);
+
+  /* If there is already a lock of this type or more restrictive on the
+  ** OsFile, do nothing. Don't use the end_lock: exit path, as
+  ** sqlite3OsEnterMutex() hasn't been called yet.
+  */
+  if( pFile->locktype>=locktype ){
+    return SQLITE_OK;
+  }
+
+  /* Make sure the locking sequence is correct
+  */
+  assert( pFile->locktype!=NO_LOCK || locktype==SHARED_LOCK );
+  assert( locktype!=PENDING_LOCK );
+  assert( locktype!=RESERVED_LOCK || pFile->locktype==SHARED_LOCK );
+
+  /* Lock the PENDING_LOCK byte if we need to acquire a PENDING lock or
+  ** a SHARED lock.  If we are acquiring a SHARED lock, the acquisition of
+  ** the PENDING_LOCK byte is temporary.
+  */
+  newLocktype = pFile->locktype;
+  if( pFile->locktype==NO_LOCK
+   || (locktype==EXCLUSIVE_LOCK && pFile->locktype==RESERVED_LOCK)
+  ){
+    int cnt = 3;
+    while( cnt-->0 && (res = LockFile(pFile->h, PENDING_BYTE, 0, 1, 0))==0 ){
+      /* Try 3 times to get the pending lock.  The pending lock might be
+      ** held by another reader process who will release it momentarily.
+      */
+      OSTRACE2("could not get a PENDING lock. cnt=%d\n", cnt);
+      Sleep(1);
+    }
+    gotPendingLock = res;
+  }
+
+  /* Acquire a shared lock
+  */
+  if( locktype==SHARED_LOCK && res ){
+    assert( pFile->locktype==NO_LOCK );
+    res = getReadLock(pFile);
+    if( res ){
+      newLocktype = SHARED_LOCK;
+    }
+  }
+
+  /* Acquire a RESERVED lock
+  */
+  if( locktype==RESERVED_LOCK && res ){
+    assert( pFile->locktype==SHARED_LOCK );
+    res = LockFile(pFile->h, RESERVED_BYTE, 0, 1, 0);
+    if( res ){
+      newLocktype = RESERVED_LOCK;
+    }
+  }
+
+  /* Acquire a PENDING lock
+  */
+  if( locktype==EXCLUSIVE_LOCK && res ){
+    newLocktype = PENDING_LOCK;
+    gotPendingLock = 0;
+  }
+
+  /* Acquire an EXCLUSIVE lock
+  */
+  if( locktype==EXCLUSIVE_LOCK && res ){
+    assert( pFile->locktype>=SHARED_LOCK );
+    res = unlockReadLock(pFile);
+    OSTRACE2("unreadlock = %d\n", res);
+    res = LockFile(pFile->h, SHARED_FIRST, 0, SHARED_SIZE, 0);
+    if( res ){
+      newLocktype = EXCLUSIVE_LOCK;
+    }else{
+      OSTRACE2("error-code = %d\n", GetLastError());
+      getReadLock(pFile);
+    }
+  }
+
+  /* If we are holding a PENDING lock that ought to be released, then
+  ** release it now.
+  */
+  if( gotPendingLock && locktype==SHARED_LOCK ){
+    UnlockFile(pFile->h, PENDING_BYTE, 0, 1, 0);
+  }
+
+  /* Update the state of the lock has held in the file descriptor then
+  ** return the appropriate result code.
+  */
+  if( res ){
+    rc = SQLITE_OK;
+  }else{
+    OSTRACE4("LOCK FAILED %d trying for %d but got %d\n", pFile->h,
+           locktype, newLocktype);
+    rc = SQLITE_BUSY;
+  }
+  pFile->locktype = newLocktype;
+  return rc;
+}
+
+/*
+** This routine checks if there is a RESERVED lock held on the specified
+** file by this or any other process. If such a lock is held, return
+** non-zero, otherwise zero.
+*/
+static int winCheckReservedLock(sqlite3_file *id){
+  int rc;
+  winFile *pFile = (winFile*)id;
+  assert( pFile!=0 );
+  if( pFile->locktype>=RESERVED_LOCK ){
+    rc = 1;
+    OSTRACE3("TEST WR-LOCK %d %d (local)\n", pFile->h, rc);
+  }else{
+    rc = LockFile(pFile->h, RESERVED_BYTE, 0, 1, 0);
+    if( rc ){
+      UnlockFile(pFile->h, RESERVED_BYTE, 0, 1, 0);
+    }
+    rc = !rc;
+    OSTRACE3("TEST WR-LOCK %d %d (remote)\n", pFile->h, rc);
+  }
+  return rc;
+}
+
+/*
+** Lower the locking level on file descriptor id to locktype.  locktype
+** must be either NO_LOCK or SHARED_LOCK.
+**
+** If the locking level of the file descriptor is already at or below
+** the requested locking level, this routine is a no-op.
+**
+** It is not possible for this routine to fail if the second argument
+** is NO_LOCK.  If the second argument is SHARED_LOCK then this routine
+** might return SQLITE_IOERR;
+*/
+static int winUnlock(sqlite3_file *id, int locktype){
+  int type;
+  winFile *pFile = (winFile*)id;
+  int rc = SQLITE_OK;
+  assert( pFile!=0 );
+  assert( locktype<=SHARED_LOCK );
+  OSTRACE5("UNLOCK %d to %d was %d(%d)\n", pFile->h, locktype,
+          pFile->locktype, pFile->sharedLockByte);
+  type = pFile->locktype;
+  if( type>=EXCLUSIVE_LOCK ){
+    UnlockFile(pFile->h, SHARED_FIRST, 0, SHARED_SIZE, 0);
+    if( locktype==SHARED_LOCK && !getReadLock(pFile) ){
+      /* This should never happen.  We should always be able to
+      ** reacquire the read lock */
+      rc = SQLITE_IOERR_UNLOCK;
+    }
+  }
+  if( type>=RESERVED_LOCK ){
+    UnlockFile(pFile->h, RESERVED_BYTE, 0, 1, 0);
+  }
+  if( locktype==NO_LOCK && type>=SHARED_LOCK ){
+    unlockReadLock(pFile);
+  }
+  if( type>=PENDING_LOCK ){
+    UnlockFile(pFile->h, PENDING_BYTE, 0, 1, 0);
+  }
+  pFile->locktype = locktype;
+  return rc;
+}
+
+/*
+** Control and query of the open file handle.
+*/
+static int winFileControl(sqlite3_file *id, int op, void *pArg){
+  switch( op ){
+    case SQLITE_FCNTL_LOCKSTATE: {
+      *(int*)pArg = ((winFile*)id)->locktype;
+      return SQLITE_OK;
+    }
+  }
+  return SQLITE_ERROR;
+}
+
+/*
+** Return the sector size in bytes of the underlying block device for
+** the specified file. This is almost always 512 bytes, but may be
+** larger for some devices.
+**
+** SQLite code assumes this function cannot fail. It also assumes that
+** if two files are created in the same file-system directory (i.e.
+** a database and its journal file) that the sector size will be the
+** same for both.
+*/
+static int winSectorSize(sqlite3_file *id){
+  return SQLITE_DEFAULT_SECTOR_SIZE;
+}
+
+/*
+** Return a vector of device characteristics.
+*/
+static int winDeviceCharacteristics(sqlite3_file *id){
+  return 0;
+}
+
+/*
+** This vector defines all the methods that can operate on an
+** sqlite3_file for win32.
+*/
+static const sqlite3_io_methods winIoMethod = {
+  1,                        /* iVersion */
+  winClose,
+  winRead,
+  winWrite,
+  winTruncate,
+  winSync,
+  winFileSize,
+  winLock,
+  winUnlock,
+  winCheckReservedLock,
+  winFileControl,
+  winSectorSize,
+  winDeviceCharacteristics
+};
+
+/***************************************************************************
+** Here ends the I/O methods that form the sqlite3_io_methods object.
+**
+** The next block of code implements the VFS methods.
+****************************************************************************/
+
+/*
+** Convert a UTF-8 filename into whatever form the underlying
+** operating system wants filenames in.  Space to hold the result
+** is obtained from malloc and must be freed by the calling
+** function.
+*/
+static void *convertUtf8Filename(const char *zFilename){
+  void *zConverted = 0;
+  if( isNT() ){
+    zConverted = utf8ToUnicode(zFilename);
+  }else{
+    zConverted = utf8ToMbcs(zFilename);
+  }
+  /* caller will handle out of memory */
+  return zConverted;
+}
+
+/*
+** Open a file.
+*/
+static int winOpen(
+  sqlite3_vfs *pVfs,        /* Not used */
+  const char *zName,        /* Name of the file (UTF-8) */
+  sqlite3_file *id,         /* Write the SQLite file handle here */
+  int flags,                /* Open mode flags */
+  int *pOutFlags            /* Status return flags */
+){
+  HANDLE h;
+  DWORD dwDesiredAccess;
+  DWORD dwShareMode;
+  DWORD dwCreationDisposition;
+  DWORD dwFlagsAndAttributes = 0;
+  int isTemp;
+  winFile *pFile = (winFile*)id;
+  void *zConverted = convertUtf8Filename(zName);
+  if( zConverted==0 ){
+    return SQLITE_NOMEM;
+  }
+
+  if( flags & SQLITE_OPEN_READWRITE ){
+    dwDesiredAccess = GENERIC_READ | GENERIC_WRITE;
+  }else{
+    dwDesiredAccess = GENERIC_READ;
+  }
+  if( flags & SQLITE_OPEN_CREATE ){
+    dwCreationDisposition = OPEN_ALWAYS;
+  }else{
+    dwCreationDisposition = OPEN_EXISTING;
+  }
+  if( flags & SQLITE_OPEN_MAIN_DB ){
+    dwShareMode = FILE_SHARE_READ | FILE_SHARE_WRITE;
+  }else{
+    dwShareMode = 0;
+  }
+  if( flags & SQLITE_OPEN_DELETEONCLOSE ){
+#if OS_WINCE
+    dwFlagsAndAttributes = FILE_ATTRIBUTE_HIDDEN;
+#else
+    dwFlagsAndAttributes = FILE_ATTRIBUTE_TEMPORARY
+                               | FILE_ATTRIBUTE_HIDDEN
+                               | FILE_FLAG_DELETE_ON_CLOSE;
+#endif
+    isTemp = 1;
+  }else{
+    dwFlagsAndAttributes = FILE_ATTRIBUTE_NORMAL;
+    isTemp = 0;
+  }
+  /* Reports from the internet are that performance is always
+  ** better if FILE_FLAG_RANDOM_ACCESS is used.  Ticket #2699. */
+  dwFlagsAndAttributes |= FILE_FLAG_RANDOM_ACCESS;
+  if( isNT() ){
+    h = CreateFileW((WCHAR*)zConverted,
+       dwDesiredAccess,
+       dwShareMode,
+       NULL,
+       dwCreationDisposition,
+       dwFlagsAndAttributes,
+       NULL
+    );
+  }else{
+#if OS_WINCE
+    return SQLITE_NOMEM;
+#else
+    h = CreateFileA((char*)zConverted,
+       dwDesiredAccess,
+       dwShareMode,
+       NULL,
+       dwCreationDisposition,
+       dwFlagsAndAttributes,
+       NULL
+    );
+#endif
+  }
+  if( h==INVALID_HANDLE_VALUE ){
+    free(zConverted);
+    if( flags & SQLITE_OPEN_READWRITE ){
+      return winOpen(0, zName, id,
+             ((flags|SQLITE_OPEN_READONLY)&~SQLITE_OPEN_READWRITE), pOutFlags);
+    }else{
+      return SQLITE_CANTOPEN;
+    }
+  }
+  if( pOutFlags ){
+    if( flags & SQLITE_OPEN_READWRITE ){
+      *pOutFlags = SQLITE_OPEN_READWRITE;
+    }else{
+      *pOutFlags = SQLITE_OPEN_READONLY;
+    }
+  }
+  memset(pFile, 0, sizeof(*pFile));
+  pFile->pMethod = &winIoMethod;
+  pFile->h = h;
+#if OS_WINCE
+  if( (flags & (SQLITE_OPEN_READWRITE|SQLITE_OPEN_MAIN_DB)) ==
+               (SQLITE_OPEN_READWRITE|SQLITE_OPEN_MAIN_DB)
+       && !winceCreateLock(zName, pFile)
+  ){
+    CloseHandle(h);
+    free(zConverted);
+    return SQLITE_CANTOPEN;
+  }
+  if( isTemp ){
+    pFile->zDeleteOnClose = zConverted;
+  }else
+#endif
+  {
+    free(zConverted);
+  }
+  OpenCounter(+1);
+  return SQLITE_OK;
+}
+
+/*
+** Delete the named file.
+**
+** Note that windows does not allow a file to be deleted if some other
+** process has it open.  Sometimes a virus scanner or indexing program
+** will open a journal file shortly after it is created in order to do
+** whatever does.  While this other process is holding the
+** file open, we will be unable to delete it.  To work around this
+** problem, we delay 100 milliseconds and try to delete again.  Up
+** to MX_DELETION_ATTEMPTs deletion attempts are run before giving
+** up and returning an error.
+*/
+#define MX_DELETION_ATTEMPTS 5
+static int winDelete(
+  sqlite3_vfs *pVfs,          /* Not used on win32 */
+  const char *zFilename,      /* Name of file to delete */
+  int syncDir                 /* Not used on win32 */
+){
+  int cnt = 0;
+  int rc;
+  void *zConverted = convertUtf8Filename(zFilename);
+  if( zConverted==0 ){
+    return SQLITE_NOMEM;
+  }
+  SimulateIOError(return SQLITE_IOERR_DELETE);
+  if( isNT() ){
+    do{
+      DeleteFileW(zConverted);
+    }while( (rc = GetFileAttributesW(zConverted))!=0xffffffff
+            && cnt++ < MX_DELETION_ATTEMPTS && (Sleep(100), 1) );
+  }else{
+#if OS_WINCE
+    return SQLITE_NOMEM;
+#else
+    do{
+      DeleteFileA(zConverted);
+    }while( (rc = GetFileAttributesA(zConverted))!=0xffffffff
+            && cnt++ < MX_DELETION_ATTEMPTS && (Sleep(100), 1) );
+#endif
+  }
+  free(zConverted);
+  OSTRACE2("DELETE \"%s\"\n", zFilename);
+  return rc==0xffffffff ? SQLITE_OK : SQLITE_IOERR_DELETE;
+}
+
+/*
+** Check the existance and status of a file.
+*/
+static int winAccess(
+  sqlite3_vfs *pVfs,         /* Not used on win32 */
+  const char *zFilename,     /* Name of file to check */
+  int flags                  /* Type of test to make on this file */
+){
+  DWORD attr;
+  int rc;
+  void *zConverted = convertUtf8Filename(zFilename);
+  if( zConverted==0 ){
+    return SQLITE_NOMEM;
+  }
+  if( isNT() ){
+    attr = GetFileAttributesW((WCHAR*)zConverted);
+  }else{
+#if OS_WINCE
+    return SQLITE_NOMEM;
+#else
+    attr = GetFileAttributesA((char*)zConverted);
+#endif
+  }
+  free(zConverted);
+  switch( flags ){
+    case SQLITE_ACCESS_READ:
+    case SQLITE_ACCESS_EXISTS:
+      rc = attr!=0xffffffff;
+      break;
+    case SQLITE_ACCESS_READWRITE:
+      rc = (attr & FILE_ATTRIBUTE_READONLY)==0;
+      break;
+    default:
+      assert(!"Invalid flags argument");
+  }
+  return rc;
+}
+
+
+/*
+** Create a temporary file name in zBuf.  zBuf must be big enough to
+** hold at pVfs->mxPathname characters.
+*/
+static int winGetTempname(sqlite3_vfs *pVfs, int nBuf, char *zBuf){
+  static char zChars[] =
+    "abcdefghijklmnopqrstuvwxyz"
+    "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+    "0123456789";
+  int i, j;
+  char zTempPath[MAX_PATH+1];
+  if( sqlite3_temp_directory ){
+    sqlite3_snprintf(MAX_PATH-30, zTempPath, "%s", sqlite3_temp_directory);
+  }else if( isNT() ){
+    char *zMulti;
+    WCHAR zWidePath[MAX_PATH];
+    GetTempPathW(MAX_PATH-30, zWidePath);
+    zMulti = unicodeToUtf8(zWidePath);
+    if( zMulti ){
+      sqlite3_snprintf(MAX_PATH-30, zTempPath, "%s", zMulti);
+      free(zMulti);
+    }else{
+      return SQLITE_NOMEM;
+    }
+  }else{
+    char *zUtf8;
+    char zMbcsPath[MAX_PATH];
+    GetTempPathA(MAX_PATH-30, zMbcsPath);
+    zUtf8 = mbcsToUtf8(zMbcsPath);
+    if( zUtf8 ){
+      sqlite3_snprintf(MAX_PATH-30, zTempPath, "%s", zUtf8);
+      free(zUtf8);
+    }else{
+      return SQLITE_NOMEM;
+    }
+  }
+  for(i=strlen(zTempPath); i>0 && zTempPath[i-1]=='\\'; i--){}
+  zTempPath[i] = 0;
+  sqlite3_snprintf(nBuf-30, zBuf,
+                   "%s\\"SQLITE_TEMP_FILE_PREFIX, zTempPath);
+  j = strlen(zBuf);
+  sqlite3Randomness(20, &zBuf[j]);
+  for(i=0; i<20; i++, j++){
+    zBuf[j] = (char)zChars[ ((unsigned char)zBuf[j])%(sizeof(zChars)-1) ];
+  }
+  zBuf[j] = 0;
+  OSTRACE2("TEMP FILENAME: %s\n", zBuf);
+  return SQLITE_OK;
+}
+
+/*
+** Turn a relative pathname into a full pathname.  Write the full
+** pathname into zOut[].  zOut[] will be at least pVfs->mxPathname
+** bytes in size.
+*/
+static int winFullPathname(
+  sqlite3_vfs *pVfs,            /* Pointer to vfs object */
+  const char *zRelative,        /* Possibly relative input path */
+  int nFull,                    /* Size of output buffer in bytes */
+  char *zFull                   /* Output buffer */
+){
+
+#if defined(__CYGWIN__)
+  cygwin_conv_to_full_win32_path(zRelative, zFull);
+  return SQLITE_OK;
+#endif
+
+#if OS_WINCE
+  /* WinCE has no concept of a relative pathname, or so I am told. */
+  sqlite3_snprintf(pVfs->mxPathname, zFull, "%s", zRelative);
+  return SQLITE_OK;
+#endif
+
+#if !OS_WINCE && !defined(__CYGWIN__)
+  int nByte;
+  void *zConverted;
+  char *zOut;
+  zConverted = convertUtf8Filename(zRelative);
+  if( isNT() ){
+    WCHAR *zTemp;
+    nByte = GetFullPathNameW((WCHAR*)zConverted, 0, 0, 0) + 3;
+    zTemp = malloc( nByte*sizeof(zTemp[0]) );
+    if( zTemp==0 ){
+      free(zConverted);
+      return SQLITE_NOMEM;
+    }
+    GetFullPathNameW((WCHAR*)zConverted, nByte, zTemp, 0);
+    free(zConverted);
+    zOut = unicodeToUtf8(zTemp);
+    free(zTemp);
+  }else{
+    char *zTemp;
+    nByte = GetFullPathNameA((char*)zConverted, 0, 0, 0) + 3;
+    zTemp = malloc( nByte*sizeof(zTemp[0]) );
+    if( zTemp==0 ){
+      free(zConverted);
+      return SQLITE_NOMEM;
+    }
+    GetFullPathNameA((char*)zConverted, nByte, zTemp, 0);
+    free(zConverted);
+    zOut = mbcsToUtf8(zTemp);
+    free(zTemp);
+  }
+  if( zOut ){
+    sqlite3_snprintf(pVfs->mxPathname, zFull, "%s", zOut);
+    free(zOut);
+    return SQLITE_OK;
+  }else{
+    return SQLITE_NOMEM;
+  }
+#endif
+}
+
+#ifndef SQLITE_OMIT_LOAD_EXTENSION
+/*
+** Interfaces for opening a shared library, finding entry points
+** within the shared library, and closing the shared library.
+*/
+/*
+** Interfaces for opening a shared library, finding entry points
+** within the shared library, and closing the shared library.
+*/
+static void *winDlOpen(sqlite3_vfs *pVfs, const char *zFilename){
+  HANDLE h;
+  void *zConverted = convertUtf8Filename(zFilename);
+  if( zConverted==0 ){
+    return 0;
+  }
+  if( isNT() ){
+    h = LoadLibraryW((WCHAR*)zConverted);
+  }else{
+#if OS_WINCE
+    return 0;
+#else
+    h = LoadLibraryA((char*)zConverted);
+#endif
+  }
+  free(zConverted);
+  return (void*)h;
+}
+static void winDlError(sqlite3_vfs *pVfs, int nBuf, char *zBufOut){
+#if OS_WINCE
+  int error = GetLastError();
+  if( error>0x7FFFFFF ){
+    sqlite3_snprintf(nBuf, zBufOut, "OsError 0x%x", error);
+  }else{
+    sqlite3_snprintf(nBuf, zBufOut, "OsError %d", error);
+  }
+#else
+  FormatMessageA(
+    FORMAT_MESSAGE_FROM_SYSTEM,
+    NULL,
+    GetLastError(),
+    0,
+    zBufOut,
+    nBuf-1,
+    0
+  );
+#endif
+}
+void *winDlSym(sqlite3_vfs *pVfs, void *pHandle, const char *zSymbol){
+#if OS_WINCE
+  /* The GetProcAddressA() routine is only available on wince. */
+  return GetProcAddressA((HANDLE)pHandle, zSymbol);
+#else
+  /* All other windows platforms expect GetProcAddress() to take
+  ** an Ansi string regardless of the _UNICODE setting */
+  return GetProcAddress((HANDLE)pHandle, zSymbol);
+#endif
+}
+void winDlClose(sqlite3_vfs *pVfs, void *pHandle){
+  FreeLibrary((HANDLE)pHandle);
+}
+#else /* if SQLITE_OMIT_LOAD_EXTENSION is defined: */
+  #define winDlOpen  0
+  #define winDlError 0
+  #define winDlSym   0
+  #define winDlClose 0
+#endif
+
+
+/*
+** Write up to nBuf bytes of randomness into zBuf.
+*/
+static int winRandomness(sqlite3_vfs *pVfs, int nBuf, char *zBuf){
+  int n = 0;
+  if( sizeof(SYSTEMTIME)<=nBuf-n ){
+    SYSTEMTIME x;
+    GetSystemTime(&x);
+    memcpy(&zBuf[n], &x, sizeof(x));
+    n += sizeof(x);
+  }
+  if( sizeof(DWORD)<=nBuf-n ){
+    DWORD pid = GetCurrentProcessId();
+    memcpy(&zBuf[n], &pid, sizeof(pid));
+    n += sizeof(pid);
+  }
+  if( sizeof(DWORD)<=nBuf-n ){
+    DWORD cnt = GetTickCount();
+    memcpy(&zBuf[n], &cnt, sizeof(cnt));
+    n += sizeof(cnt);
+  }
+  if( sizeof(LARGE_INTEGER)<=nBuf-n ){
+    LARGE_INTEGER i;
+    QueryPerformanceCounter(&i);
+    memcpy(&zBuf[n], &i, sizeof(i));
+    n += sizeof(i);
+  }
+  return n;
+}
+
+
+/*
+** Sleep for a little while.  Return the amount of time slept.
+*/
+static int winSleep(sqlite3_vfs *pVfs, int microsec){
+  Sleep((microsec+999)/1000);
+  return ((microsec+999)/1000)*1000;
+}
+
+/*
+** The following variable, if set to a non-zero value, becomes the result
+** returned from sqlite3OsCurrentTime().  This is used for testing.
+*/
+#ifdef SQLITE_TEST
+int sqlite3_current_time = 0;
+#endif
+
+/*
+** Find the current time (in Universal Coordinated Time).  Write the
+** current time and date as a Julian Day number into *prNow and
+** return 0.  Return 1 if the time and date cannot be found.
+*/
+int winCurrentTime(sqlite3_vfs *pVfs, double *prNow){
+  FILETIME ft;
+  /* FILETIME structure is a 64-bit value representing the number of
+     100-nanosecond intervals since January 1, 1601 (= JD 2305813.5).
+  */
+  double now;
+#if OS_WINCE
+  SYSTEMTIME time;
+  GetSystemTime(&time);
+  SystemTimeToFileTime(&time,&ft);
+#else
+  GetSystemTimeAsFileTime( &ft );
+#endif
+  now = ((double)ft.dwHighDateTime) * 4294967296.0;
+  *prNow = (now + ft.dwLowDateTime)/864000000000.0 + 2305813.5;
+#ifdef SQLITE_TEST
+  if( sqlite3_current_time ){
+    *prNow = sqlite3_current_time/86400.0 + 2440587.5;
+  }
+#endif
+  return 0;
+}
+
+
+/*
+** Return a pointer to the sqlite3DefaultVfs structure.   We use
+** a function rather than give the structure global scope because
+** some compilers (MSVC) do not allow forward declarations of
+** initialized structures.
+*/
+sqlite3_vfs *sqlite3OsDefaultVfs(void){
+  static sqlite3_vfs winVfs = {
+    1,                 /* iVersion */
+    sizeof(winFile),   /* szOsFile */
+    MAX_PATH,          /* mxPathname */
+    0,                 /* pNext */
+    "win32",           /* zName */
+    0,                 /* pAppData */
+
+    winOpen,           /* xOpen */
+    winDelete,         /* xDelete */
+    winAccess,         /* xAccess */
+    winGetTempname,    /* xGetTempName */
+    winFullPathname,   /* xFullPathname */
+    winDlOpen,         /* xDlOpen */
+    winDlError,        /* xDlError */
+    winDlSym,          /* xDlSym */
+    winDlClose,        /* xDlClose */
+    winRandomness,     /* xRandomness */
+    winSleep,          /* xSleep */
+    winCurrentTime     /* xCurrentTime */
+  };
+
+  return &winVfs;
+}
+
+#endif /* OS_WIN */
diff --git a/uppsrc/plugin/sqlite3/lib/pager.c b/uppsrc/plugin/sqlite3/lib/pager.c
new file mode 100644
index 000000000..d6347074e
--- /dev/null
+++ b/uppsrc/plugin/sqlite3/lib/pager.c
@@ -0,0 +1,5173 @@
+/*
+** 2001 September 15
+**
+** The author disclaims copyright to this source code.  In place of
+** a legal notice, here is a blessing:
+**
+**    May you do good and not evil.
+**    May you find forgiveness for yourself and forgive others.
+**    May you share freely, never taking more than you give.
+**
+*************************************************************************
+** This is the implementation of the page cache subsystem or "pager".
+**
+** The pager is used to access a database disk file.  It implements
+** atomic commit and rollback through the use of a journal file that
+** is separate from the database file.  The pager also implements file
+** locking to prevent two processes from writing the same database
+** file simultaneously, or one process from reading the database while
+** another is writing.
+**
+** @(#) $Id: pager.c,v 1.417 2008/03/17 13:50:58 drh Exp $
+*/
+#ifndef SQLITE_OMIT_DISKIO
+#include "sqliteInt.h"
+#include <assert.h>
+#include <string.h>
+
+/*
+** Macros for troubleshooting.  Normally turned off
+*/
+#if 0
+#define sqlite3DebugPrintf printf
+#define PAGERTRACE1(X)       sqlite3DebugPrintf(X)
+#define PAGERTRACE2(X,Y)     sqlite3DebugPrintf(X,Y)
+#define PAGERTRACE3(X,Y,Z)   sqlite3DebugPrintf(X,Y,Z)
+#define PAGERTRACE4(X,Y,Z,W) sqlite3DebugPrintf(X,Y,Z,W)
+#define PAGERTRACE5(X,Y,Z,W,V) sqlite3DebugPrintf(X,Y,Z,W,V)
+#else
+#define PAGERTRACE1(X)
+#define PAGERTRACE2(X,Y)
+#define PAGERTRACE3(X,Y,Z)
+#define PAGERTRACE4(X,Y,Z,W)
+#define PAGERTRACE5(X,Y,Z,W,V)
+#endif
+
+/*
+** The following two macros are used within the PAGERTRACEX() macros above
+** to print out file-descriptors.
+**
+** PAGERID() takes a pointer to a Pager struct as its argument. The
+** associated file-descriptor is returned. FILEHANDLEID() takes an sqlite3_file
+** struct as its argument.
+*/
+#define PAGERID(p) ((int)(p->fd))
+#define FILEHANDLEID(fd) ((int)fd)
+
+/*
+** The page cache as a whole is always in one of the following
+** states:
+**
+**   PAGER_UNLOCK        The page cache is not currently reading or
+**                       writing the database file.  There is no
+**                       data held in memory.  This is the initial
+**                       state.
+**
+**   PAGER_SHARED        The page cache is reading the database.
+**                       Writing is not permitted.  There can be
+**                       multiple readers accessing the same database
+**                       file at the same time.
+**
+**   PAGER_RESERVED      This process has reserved the database for writing
+**                       but has not yet made any changes.  Only one process
+**                       at a time can reserve the database.  The original
+**                       database file has not been modified so other
+**                       processes may still be reading the on-disk
+**                       database file.
+**
+**   PAGER_EXCLUSIVE     The page cache is writing the database.
+**                       Access is exclusive.  No other processes or
+**                       threads can be reading or writing while one
+**                       process is writing.
+**
+**   PAGER_SYNCED        The pager moves to this state from PAGER_EXCLUSIVE
+**                       after all dirty pages have been written to the
+**                       database file and the file has been synced to
+**                       disk. All that remains to do is to remove or
+**                       truncate the journal file and the transaction
+**                       will be committed.
+**
+** The page cache comes up in PAGER_UNLOCK.  The first time a
+** sqlite3PagerGet() occurs, the state transitions to PAGER_SHARED.
+** After all pages have been released using sqlite_page_unref(),
+** the state transitions back to PAGER_UNLOCK.  The first time
+** that sqlite3PagerWrite() is called, the state transitions to
+** PAGER_RESERVED.  (Note that sqlite3PagerWrite() can only be
+** called on an outstanding page which means that the pager must
+** be in PAGER_SHARED before it transitions to PAGER_RESERVED.)
+** PAGER_RESERVED means that there is an open rollback journal.
+** The transition to PAGER_EXCLUSIVE occurs before any changes
+** are made to the database file, though writes to the rollback
+** journal occurs with just PAGER_RESERVED.  After an sqlite3PagerRollback()
+** or sqlite3PagerCommitPhaseTwo(), the state can go back to PAGER_SHARED,
+** or it can stay at PAGER_EXCLUSIVE if we are in exclusive access mode.
+*/
+#define PAGER_UNLOCK      0
+#define PAGER_SHARED      1   /* same as SHARED_LOCK */
+#define PAGER_RESERVED    2   /* same as RESERVED_LOCK */
+#define PAGER_EXCLUSIVE   4   /* same as EXCLUSIVE_LOCK */
+#define PAGER_SYNCED      5
+
+/*
+** If the SQLITE_BUSY_RESERVED_LOCK macro is set to true at compile-time,
+** then failed attempts to get a reserved lock will invoke the busy callback.
+** This is off by default.  To see why, consider the following scenario:
+**
+** Suppose thread A already has a shared lock and wants a reserved lock.
+** Thread B already has a reserved lock and wants an exclusive lock.  If
+** both threads are using their busy callbacks, it might be a long time
+** be for one of the threads give up and allows the other to proceed.
+** But if the thread trying to get the reserved lock gives up quickly
+** (if it never invokes its busy callback) then the contention will be
+** resolved quickly.
+*/
+#ifndef SQLITE_BUSY_RESERVED_LOCK
+# define SQLITE_BUSY_RESERVED_LOCK 0
+#endif
+
+/*
+** This macro rounds values up so that if the value is an address it
+** is guaranteed to be an address that is aligned to an 8-byte boundary.
+*/
+#define FORCE_ALIGNMENT(X)   (((X)+7)&~7)
+
+typedef struct PgHdr PgHdr;
+
+/*
+** Each pager stores all currently unreferenced pages in a list sorted
+** in least-recently-used (LRU) order (i.e. the first item on the list has
+** not been referenced in a long time, the last item has been recently
+** used). An instance of this structure is included as part of each
+** pager structure for this purpose (variable Pager.lru).
+**
+** Additionally, if memory-management is enabled, all unreferenced pages
+** are stored in a global LRU list (global variable sqlite3LruPageList).
+**
+** In both cases, the PagerLruList.pFirstSynced variable points to
+** the first page in the corresponding list that does not require an
+** fsync() operation before its memory can be reclaimed. If no such
+** page exists, PagerLruList.pFirstSynced is set to NULL.
+*/
+typedef struct PagerLruList PagerLruList;
+struct PagerLruList {
+  PgHdr *pFirst;         /* First page in LRU list */
+  PgHdr *pLast;          /* Last page in LRU list (the most recently used) */
+  PgHdr *pFirstSynced;   /* First page in list with PgHdr.needSync==0 */
+};
+
+/*
+** The following structure contains the next and previous pointers used
+** to link a PgHdr structure into a PagerLruList linked list.
+*/
+typedef struct PagerLruLink PagerLruLink;
+struct PagerLruLink {
+  PgHdr *pNext;
+  PgHdr *pPrev;
+};
+
+/*
+** Each in-memory image of a page begins with the following header.
+** This header is only visible to this pager module.  The client
+** code that calls pager sees only the data that follows the header.
+**
+** Client code should call sqlite3PagerWrite() on a page prior to making
+** any modifications to that page.  The first time sqlite3PagerWrite()
+** is called, the original page contents are written into the rollback
+** journal and PgHdr.inJournal and PgHdr.needSync are set.  Later, once
+** the journal page has made it onto the disk surface, PgHdr.needSync
+** is cleared.  The modified page cannot be written back into the original
+** database file until the journal pages has been synced to disk and the
+** PgHdr.needSync has been cleared.
+**
+** The PgHdr.dirty flag is set when sqlite3PagerWrite() is called and
+** is cleared again when the page content is written back to the original
+** database file.
+**
+** Details of important structure elements:
+**
+** needSync
+**
+**     If this is true, this means that it is not safe to write the page
+**     content to the database because the original content needed
+**     for rollback has not by synced to the main rollback journal.
+**     The original content may have been written to the rollback journal
+**     but it has not yet been synced.  So we cannot write to the database
+**     file because power failure might cause the page in the journal file
+**     to never reach the disk.  It is as if the write to the journal file
+**     does not occur until the journal file is synced.
+**
+**     This flag is false if the page content exactly matches what
+**     currently exists in the database file.  The needSync flag is also
+**     false if the original content has been written to the main rollback
+**     journal and synced.  If the page represents a new page that has
+**     been added onto the end of the database during the current
+**     transaction, the needSync flag is true until the original database
+**     size in the journal header has been synced to disk.
+**
+** inJournal
+**
+**     This is true if the original page has been written into the main
+**     rollback journal.  This is always false for new pages added to
+**     the end of the database file during the current transaction.
+**     And this flag says nothing about whether or not the journal
+**     has been synced to disk.  For pages that are in the original
+**     database file, the following expression should always be true:
+**
+**       inJournal = sqlite3BitvecTest(pPager->pInJournal, pgno)
+**
+**     The pPager->pInJournal object is only valid for the original
+**     pages of the database, not new pages that are added to the end
+**     of the database, so obviously the above expression cannot be
+**     valid for new pages.  For new pages inJournal is always 0.
+**
+** dirty
+**
+**     When true, this means that the content of the page has been
+**     modified and needs to be written back to the database file.
+**     If false, it means that either the content of the page is
+**     unchanged or else the content is unimportant and we do not
+**     care whether or not it is preserved.
+**
+** alwaysRollback
+**
+**     This means that the sqlite3PagerDontRollback() API should be
+**     ignored for this page.  The DontRollback() API attempts to say
+**     that the content of the page on disk is unimportant (it is an
+**     unused page on the freelist) so that it is unnecessary to
+**     rollback changes to this page because the content of the page
+**     can change without changing the meaning of the database.  This
+**     flag overrides any DontRollback() attempt.  This flag is set
+**     when a page that originally contained valid data is added to
+**     the freelist.  Later in the same transaction, this page might
+**     be pulled from the freelist and reused for something different
+**     and at that point the DontRollback() API will be called because
+**     pages taken from the freelist do not need to be protected by
+**     the rollback journal.  But this flag says that the page was
+**     not originally part of the freelist so that it still needs to
+**     be rolled back in spite of any subsequent DontRollback() calls.
+**
+** needRead
+**
+**     This flag means (when true) that the content of the page has
+**     not yet been loaded from disk.  The in-memory content is just
+**     garbage.  (Actually, we zero the content, but you should not
+**     make any assumptions about the content nevertheless.)  If the
+**     content is needed in the future, it should be read from the
+**     original database file.
+*/
+struct PgHdr {
+  Pager *pPager;                 /* The pager to which this page belongs */
+  Pgno pgno;                     /* The page number for this page */
+  PgHdr *pNextHash, *pPrevHash;  /* Hash collision chain for PgHdr.pgno */
+  PagerLruLink free;             /* Next and previous free pages */
+  PgHdr *pNextAll;               /* A list of all pages */
+  u8 inJournal;                  /* TRUE if has been written to journal */
+  u8 dirty;                      /* TRUE if we need to write back changes */
+  u8 needSync;                   /* Sync journal before writing this page */
+  u8 alwaysRollback;             /* Disable DontRollback() for this page */
+  u8 needRead;                   /* Read content if PagerWrite() is called */
+  short int nRef;                /* Number of users of this page */
+  PgHdr *pDirty, *pPrevDirty;    /* Dirty pages */
+#ifdef SQLITE_ENABLE_MEMORY_MANAGEMENT
+  PagerLruLink gfree;            /* Global list of nRef==0 pages */
+#endif
+#ifdef SQLITE_CHECK_PAGES
+  u32 pageHash;
+#endif
+  void *pData;                   /* Page data */
+  /* Pager.nExtra bytes of local data appended to this header */
+};
+
+/*
+** For an in-memory only database, some extra information is recorded about
+** each page so that changes can be rolled back.  (Journal files are not
+** used for in-memory databases.)  The following information is added to
+** the end of every EXTRA block for in-memory databases.
+**
+** This information could have been added directly to the PgHdr structure.
+** But then it would take up an extra 8 bytes of storage on every PgHdr
+** even for disk-based databases.  Splitting it out saves 8 bytes.  This
+** is only a savings of 0.8% but those percentages add up.
+*/
+typedef struct PgHistory PgHistory;
+struct PgHistory {
+  u8 *pOrig;     /* Original page text.  Restore to this on a full rollback */
+  u8 *pStmt;     /* Text as it was at the beginning of the current statement */
+  PgHdr *pNextStmt, *pPrevStmt;  /* List of pages in the statement journal */
+  u8 inStmt;                     /* TRUE if in the statement subjournal */
+};
+
+/*
+** A macro used for invoking the codec if there is one
+*/
+#ifdef SQLITE_HAS_CODEC
+# define CODEC1(P,D,N,X) if( P->xCodec!=0 ){ P->xCodec(P->pCodecArg,D,N,X); }
+# define CODEC2(P,D,N,X) ((char*)(P->xCodec!=0?P->xCodec(P->pCodecArg,D,N,X):D))
+#else
+# define CODEC1(P,D,N,X) /* NO-OP */
+# define CODEC2(P,D,N,X) ((char*)D)
+#endif
+
+/*
+** Convert a pointer to a PgHdr into a pointer to its data
+** and back again.
+*/
+#define PGHDR_TO_DATA(P)    ((P)->pData)
+#define PGHDR_TO_EXTRA(G,P) ((void*)&((G)[1]))
+#define PGHDR_TO_HIST(P,PGR)  \
+            ((PgHistory*)&((char*)(&(P)[1]))[(PGR)->nExtra])
+
+/*
+** A open page cache is an instance of the following structure.
+**
+** Pager.errCode may be set to SQLITE_IOERR, SQLITE_CORRUPT, or
+** or SQLITE_FULL. Once one of the first three errors occurs, it persists
+** and is returned as the result of every major pager API call.  The
+** SQLITE_FULL return code is slightly different. It persists only until the
+** next successful rollback is performed on the pager cache. Also,
+** SQLITE_FULL does not affect the sqlite3PagerGet() and sqlite3PagerLookup()
+** APIs, they may still be used successfully.
+*/
+struct Pager {
+  sqlite3_vfs *pVfs;          /* OS functions to use for IO */
+  u8 journalOpen;             /* True if journal file descriptors is valid */
+  u8 journalStarted;          /* True if header of journal is synced */
+  u8 useJournal;              /* Use a rollback journal on this file */
+  u8 noReadlock;              /* Do not bother to obtain readlocks */
+  u8 stmtOpen;                /* True if the statement subjournal is open */
+  u8 stmtInUse;               /* True we are in a statement subtransaction */
+  u8 stmtAutoopen;            /* Open stmt journal when main journal is opened*/
+  u8 noSync;                  /* Do not sync the journal if true */
+  u8 fullSync;                /* Do extra syncs of the journal for robustness */
+  u8 sync_flags;              /* One of SYNC_NORMAL or SYNC_FULL */
+  u8 state;                   /* PAGER_UNLOCK, _SHARED, _RESERVED, etc. */
+  u8 tempFile;                /* zFilename is a temporary file */
+  u8 readOnly;                /* True for a read-only database */
+  u8 needSync;                /* True if an fsync() is needed on the journal */
+  u8 dirtyCache;              /* True if cached pages have changed */
+  u8 alwaysRollback;          /* Disable DontRollback() for all pages */
+  u8 memDb;                   /* True to inhibit all file I/O */
+  u8 setMaster;               /* True if a m-j name has been written to jrnl */
+  u8 doNotSync;               /* Boolean. While true, do not spill the cache */
+  u8 exclusiveMode;           /* Boolean. True if locking_mode==EXCLUSIVE */
+  u8 changeCountDone;         /* Set after incrementing the change-counter */
+  u32 vfsFlags;               /* Flags for sqlite3_vfs.xOpen() */
+  int errCode;                /* One of several kinds of errors */
+  int dbSize;                 /* Number of pages in the file */
+  int origDbSize;             /* dbSize before the current change */
+  int stmtSize;               /* Size of database (in pages) at stmt_begin() */
+  int nRec;                   /* Number of pages written to the journal */
+  u32 cksumInit;              /* Quasi-random value added to every checksum */
+  int stmtNRec;               /* Number of records in stmt subjournal */
+  int nExtra;                 /* Add this many bytes to each in-memory page */
+  int pageSize;               /* Number of bytes in a page */
+  int nPage;                  /* Total number of in-memory pages */
+  int nRef;                   /* Number of in-memory pages with PgHdr.nRef>0 */
+  int mxPage;                 /* Maximum number of pages to hold in cache */
+  Pgno mxPgno;                /* Maximum allowed size of the database */
+  Bitvec *pInJournal;         /* One bit for each page in the database file */
+  Bitvec *pInStmt;            /* One bit for each page in the database */
+  char *zFilename;            /* Name of the database file */
+  char *zJournal;             /* Name of the journal file */
+  char *zDirectory;           /* Directory hold database and journal files */
+  char *zStmtJrnl;            /* Name of the statement journal file */
+  sqlite3_file *fd, *jfd;     /* File descriptors for database and journal */
+  sqlite3_file *stfd;         /* File descriptor for the statement subjournal*/
+  BusyHandler *pBusyHandler;  /* Pointer to sqlite.busyHandler */
+  PagerLruList lru;           /* LRU list of free pages */
+  PgHdr *pAll;                /* List of all pages */
+  PgHdr *pStmt;               /* List of pages in the statement subjournal */
+  PgHdr *pDirty;              /* List of all dirty pages */
+  i64 journalOff;             /* Current byte offset in the journal file */
+  i64 journalHdr;             /* Byte offset to previous journal header */
+  i64 stmtHdrOff;             /* First journal header written this statement */
+  i64 stmtCksum;              /* cksumInit when statement was started */
+  i64 stmtJSize;              /* Size of journal at stmt_begin() */
+  int sectorSize;             /* Assumed sector size during rollback */
+#ifdef SQLITE_TEST
+  int nHit, nMiss;            /* Cache hits and missing */
+  int nRead, nWrite;          /* Database pages read/written */
+#endif
+  void (*xDestructor)(DbPage*,int); /* Call this routine when freeing pages */
+  void (*xReiniter)(DbPage*,int);   /* Call this routine when reloading pages */
+#ifdef SQLITE_HAS_CODEC
+  void *(*xCodec)(void*,void*,Pgno,int); /* Routine for en/decoding data */
+  void *pCodecArg;            /* First argument to xCodec() */
+#endif
+  int nHash;                  /* Size of the pager hash table */
+  PgHdr **aHash;              /* Hash table to map page number to PgHdr */
+#ifdef SQLITE_ENABLE_MEMORY_MANAGEMENT
+  Pager *pNext;               /* Doubly linked list of pagers on which */
+  Pager *pPrev;               /* sqlite3_release_memory() will work */
+  int iInUseMM;               /* Non-zero if unavailable to MM */
+  int iInUseDB;               /* Non-zero if in sqlite3_release_memory() */
+#endif
+  char *pTmpSpace;            /* Pager.pageSize bytes of space for tmp use */
+  char dbFileVers[16];        /* Changes whenever database file changes */
+};
+
+/*
+** The following global variables hold counters used for
+** testing purposes only.  These variables do not exist in
+** a non-testing build.  These variables are not thread-safe.
+*/
+#ifdef SQLITE_TEST
+int sqlite3_pager_readdb_count = 0;    /* Number of full pages read from DB */
+int sqlite3_pager_writedb_count = 0;   /* Number of full pages written to DB */
+int sqlite3_pager_writej_count = 0;    /* Number of pages written to journal */
+int sqlite3_pager_pgfree_count = 0;    /* Number of cache pages freed */
+# define PAGER_INCR(v)  v++
+#else
+# define PAGER_INCR(v)
+#endif
+
+/*
+** The following variable points to the head of a double-linked list
+** of all pagers that are eligible for page stealing by the
+** sqlite3_release_memory() interface.  Access to this list is
+** protected by the SQLITE_MUTEX_STATIC_MEM2 mutex.
+*/
+#ifdef SQLITE_ENABLE_MEMORY_MANAGEMENT
+static Pager *sqlite3PagerList = 0;
+static PagerLruList sqlite3LruPageList = {0, 0, 0};
+#endif
+
+
+/*
+** Journal files begin with the following magic string.  The data
+** was obtained from /dev/random.  It is used only as a sanity check.
+**
+** Since version 2.8.0, the journal format contains additional sanity
+** checking information.  If the power fails while the journal is begin
+** written, semi-random garbage data might appear in the journal
+** file after power is restored.  If an attempt is then made
+** to roll the journal back, the database could be corrupted.  The additional
+** sanity checking data is an attempt to discover the garbage in the
+** journal and ignore it.
+**
+** The sanity checking information for the new journal format consists
+** of a 32-bit checksum on each page of data.  The checksum covers both
+** the page number and the pPager->pageSize bytes of data for the page.
+** This cksum is initialized to a 32-bit random value that appears in the
+** journal file right after the header.  The random initializer is important,
+** because garbage data that appears at the end of a journal is likely
+** data that was once in other files that have now been deleted.  If the
+** garbage data came from an obsolete journal file, the checksums might
+** be correct.  But by initializing the checksum to random value which
+** is different for every journal, we minimize that risk.
+*/
+static const unsigned char aJournalMagic[] = {
+  0xd9, 0xd5, 0x05, 0xf9, 0x20, 0xa1, 0x63, 0xd7,
+};
+
+/*
+** The size of the header and of each page in the journal is determined
+** by the following macros.
+*/
+#define JOURNAL_PG_SZ(pPager)  ((pPager->pageSize) + 8)
+
+/*
+** The journal header size for this pager. In the future, this could be
+** set to some value read from the disk controller. The important
+** characteristic is that it is the same size as a disk sector.
+*/
+#define JOURNAL_HDR_SZ(pPager) (pPager->sectorSize)
+
+/*
+** The macro MEMDB is true if we are dealing with an in-memory database.
+** We do this as a macro so that if the SQLITE_OMIT_MEMORYDB macro is set,
+** the value of MEMDB will be a constant and the compiler will optimize
+** out code that would never execute.
+*/
+#ifdef SQLITE_OMIT_MEMORYDB
+# define MEMDB 0
+#else
+# define MEMDB pPager->memDb
+#endif
+
+/*
+** Page number PAGER_MJ_PGNO is never used in an SQLite database (it is
+** reserved for working around a windows/posix incompatibility). It is
+** used in the journal to signify that the remainder of the journal file
+** is devoted to storing a master journal name - there are no more pages to
+** roll back. See comments for function writeMasterJournal() for details.
+*/
+/* #define PAGER_MJ_PGNO(x) (PENDING_BYTE/((x)->pageSize)) */
+#define PAGER_MJ_PGNO(x) ((PENDING_BYTE/((x)->pageSize))+1)
+
+/*
+** The maximum legal page number is (2^31 - 1).
+*/
+#define PAGER_MAX_PGNO 2147483647
+
+/*
+** The pagerEnter() and pagerLeave() routines acquire and release
+** a mutex on each pager.  The mutex is recursive.
+**
+** This is a special-purpose mutex.  It only provides mutual exclusion
+** between the Btree and the Memory Management sqlite3_release_memory()
+** function.  It does not prevent, for example, two Btrees from accessing
+** the same pager at the same time.  Other general-purpose mutexes in
+** the btree layer handle that chore.
+*/
+#ifdef SQLITE_ENABLE_MEMORY_MANAGEMENT
+  static void pagerEnter(Pager *p){
+    p->iInUseDB++;
+    if( p->iInUseMM && p->iInUseDB==1 ){
+      sqlite3_mutex *mutex;
+      mutex = sqlite3_mutex_alloc(SQLITE_MUTEX_STATIC_MEM2);
+      p->iInUseDB = 0;
+      sqlite3_mutex_enter(mutex);
+      p->iInUseDB = 1;
+      sqlite3_mutex_leave(mutex);
+    }
+    assert( p->iInUseMM==0 );
+  }
+  static void pagerLeave(Pager *p){
+    p->iInUseDB--;
+    assert( p->iInUseDB>=0 );
+  }
+#else
+# define pagerEnter(X)
+# define pagerLeave(X)
+#endif
+
+/*
+** Add page pPg to the end of the linked list managed by structure
+** pList (pPg becomes the last entry in the list - the most recently
+** used). Argument pLink should point to either pPg->free or pPg->gfree,
+** depending on whether pPg is being added to the pager-specific or
+** global LRU list.
+*/
+static void listAdd(PagerLruList *pList, PagerLruLink *pLink, PgHdr *pPg){
+  pLink->pNext = 0;
+  pLink->pPrev = pList->pLast;
+
+#ifdef SQLITE_ENABLE_MEMORY_MANAGEMENT
+  assert(pLink==&pPg->free || pLink==&pPg->gfree);
+  assert(pLink==&pPg->gfree || pList!=&sqlite3LruPageList);
+#endif
+
+  if( pList->pLast ){
+    int iOff = (char *)pLink - (char *)pPg;
+    PagerLruLink *pLastLink = (PagerLruLink *)(&((u8 *)pList->pLast)[iOff]);
+    pLastLink->pNext = pPg;
+  }else{
+    assert(!pList->pFirst);
+    pList->pFirst = pPg;
+  }
+
+  pList->pLast = pPg;
+  if( !pList->pFirstSynced && pPg->needSync==0 ){
+    pList->pFirstSynced = pPg;
+  }
+}
+
+/*
+** Remove pPg from the list managed by the structure pointed to by pList.
+**
+** Argument pLink should point to either pPg->free or pPg->gfree, depending
+** on whether pPg is being added to the pager-specific or global LRU list.
+*/
+static void listRemove(PagerLruList *pList, PagerLruLink *pLink, PgHdr *pPg){
+  int iOff = (char *)pLink - (char *)pPg;
+
+#ifdef SQLITE_ENABLE_MEMORY_MANAGEMENT
+  assert(pLink==&pPg->free || pLink==&pPg->gfree);
+  assert(pLink==&pPg->gfree || pList!=&sqlite3LruPageList);
+#endif
+
+  if( pPg==pList->pFirst ){
+    pList->pFirst = pLink->pNext;
+  }
+  if( pPg==pList->pLast ){
+    pList->pLast = pLink->pPrev;
+  }
+  if( pLink->pPrev ){
+    PagerLruLink *pPrevLink = (PagerLruLink *)(&((u8 *)pLink->pPrev)[iOff]);
+    pPrevLink->pNext = pLink->pNext;
+  }
+  if( pLink->pNext ){
+    PagerLruLink *pNextLink = (PagerLruLink *)(&((u8 *)pLink->pNext)[iOff]);
+    pNextLink->pPrev = pLink->pPrev;
+  }
+  if( pPg==pList->pFirstSynced ){
+    PgHdr *p = pLink->pNext;
+    while( p && p->needSync ){
+      PagerLruLink *pL = (PagerLruLink *)(&((u8 *)p)[iOff]);
+      p = pL->pNext;
+    }
+    pList->pFirstSynced = p;
+  }
+
+  pLink->pNext = pLink->pPrev = 0;
+}
+
+/*
+** Add page pPg to the list of free pages for the pager. If
+** memory-management is enabled, also add the page to the global
+** list of free pages.
+*/
+static void lruListAdd(PgHdr *pPg){
+  listAdd(&pPg->pPager->lru, &pPg->free, pPg);
+#ifdef SQLITE_ENABLE_MEMORY_MANAGEMENT
+  if( !pPg->pPager->memDb ){
+    sqlite3_mutex_enter(sqlite3_mutex_alloc(SQLITE_MUTEX_STATIC_LRU));
+    listAdd(&sqlite3LruPageList, &pPg->gfree, pPg);
+    sqlite3_mutex_leave(sqlite3_mutex_alloc(SQLITE_MUTEX_STATIC_LRU));
+  }
+#endif
+}
+
+/*
+** Remove page pPg from the list of free pages for the associated pager.
+** If memory-management is enabled, also remove pPg from the global list
+** of free pages.
+*/
+static void lruListRemove(PgHdr *pPg){
+  listRemove(&pPg->pPager->lru, &pPg->free, pPg);
+#ifdef SQLITE_ENABLE_MEMORY_MANAGEMENT
+  if( !pPg->pPager->memDb ){
+    sqlite3_mutex_enter(sqlite3_mutex_alloc(SQLITE_MUTEX_STATIC_LRU));
+    listRemove(&sqlite3LruPageList, &pPg->gfree, pPg);
+    sqlite3_mutex_leave(sqlite3_mutex_alloc(SQLITE_MUTEX_STATIC_LRU));
+  }
+#endif
+}
+
+/*
+** This function is called just after the needSync flag has been cleared
+** from all pages managed by pPager (usually because the journal file
+** has just been synced). It updates the pPager->lru.pFirstSynced variable
+** and, if memory-management is enabled, the sqlite3LruPageList.pFirstSynced
+** variable also.
+*/
+static void lruListSetFirstSynced(Pager *pPager){
+  pPager->lru.pFirstSynced = pPager->lru.pFirst;
+#ifdef SQLITE_ENABLE_MEMORY_MANAGEMENT
+  if( !pPager->memDb ){
+    PgHdr *p;
+    sqlite3_mutex_enter(sqlite3_mutex_alloc(SQLITE_MUTEX_STATIC_LRU));
+    for(p=sqlite3LruPageList.pFirst; p && p->needSync; p=p->gfree.pNext);
+    assert(p==pPager->lru.pFirstSynced || p==sqlite3LruPageList.pFirstSynced);
+    sqlite3LruPageList.pFirstSynced = p;
+    sqlite3_mutex_leave(sqlite3_mutex_alloc(SQLITE_MUTEX_STATIC_LRU));
+  }
+#endif
+}
+
+/*
+** Return true if page *pPg has already been written to the statement
+** journal (or statement snapshot has been created, if *pPg is part
+** of an in-memory database).
+*/
+static int pageInStatement(PgHdr *pPg){
+  Pager *pPager = pPg->pPager;
+  if( MEMDB ){
+    return PGHDR_TO_HIST(pPg, pPager)->inStmt;
+  }else{
+    return sqlite3BitvecTest(pPager->pInStmt, pPg->pgno);
+  }
+}
+
+/*
+** Change the size of the pager hash table to N.  N must be a power
+** of two.
+*/
+static void pager_resize_hash_table(Pager *pPager, int N){
+  PgHdr **aHash, *pPg;
+  assert( N>0 && (N&(N-1))==0 );
+#ifdef SQLITE_MALLOC_SOFT_LIMIT
+  if( N*sizeof(aHash[0])>SQLITE_MALLOC_SOFT_LIMIT ){
+    N = SQLITE_MALLOC_SOFT_LIMIT/sizeof(aHash[0]);
+  }
+  if( N==pPager->nHash ) return;
+#endif
+  pagerLeave(pPager);
+  sqlite3FaultBenign(SQLITE_FAULTINJECTOR_MALLOC, pPager->aHash!=0);
+  aHash = sqlite3MallocZero( sizeof(aHash[0])*N );
+  sqlite3FaultBenign(SQLITE_FAULTINJECTOR_MALLOC, 0);
+  pagerEnter(pPager);
+  if( aHash==0 ){
+    /* Failure to rehash is not an error.  It is only a performance hit. */
+    return;
+  }
+  sqlite3_free(pPager->aHash);
+  pPager->nHash = N;
+  pPager->aHash = aHash;
+  for(pPg=pPager->pAll; pPg; pPg=pPg->pNextAll){
+    int h;
+    if( pPg->pgno==0 ){
+      assert( pPg->pNextHash==0 && pPg->pPrevHash==0 );
+      continue;
+    }
+    h = pPg->pgno & (N-1);
+    pPg->pNextHash = aHash[h];
+    if( aHash[h] ){
+      aHash[h]->pPrevHash = pPg;
+    }
+    aHash[h] = pPg;
+    pPg->pPrevHash = 0;
+  }
+}
+
+/*
+** Read a 32-bit integer from the given file descriptor.  Store the integer
+** that is read in *pRes.  Return SQLITE_OK if everything worked, or an
+** error code is something goes wrong.
+**
+** All values are stored on disk as big-endian.
+*/
+static int read32bits(sqlite3_file *fd, i64 offset, u32 *pRes){
+  unsigned char ac[4];
+  int rc = sqlite3OsRead(fd, ac, sizeof(ac), offset);
+  if( rc==SQLITE_OK ){
+    *pRes = sqlite3Get4byte(ac);
+  }
+  return rc;
+}
+
+/*
+** Write a 32-bit integer into a string buffer in big-endian byte order.
+*/
+#define put32bits(A,B)  sqlite3Put4byte((u8*)A,B)
+
+/*
+** Write a 32-bit integer into the given file descriptor.  Return SQLITE_OK
+** on success or an error code is something goes wrong.
+*/
+static int write32bits(sqlite3_file *fd, i64 offset, u32 val){
+  char ac[4];
+  put32bits(ac, val);
+  return sqlite3OsWrite(fd, ac, 4, offset);
+}
+
+/*
+** If file pFd is open, call sqlite3OsUnlock() on it.
+*/
+static int osUnlock(sqlite3_file *pFd, int eLock){
+  if( !pFd->pMethods ){
+    return SQLITE_OK;
+  }
+  return sqlite3OsUnlock(pFd, eLock);
+}
+
+/*
+** This function determines whether or not the atomic-write optimization
+** can be used with this pager. The optimization can be used if:
+**
+**  (a) the value returned by OsDeviceCharacteristics() indicates that
+**      a database page may be written atomically, and
+**  (b) the value returned by OsSectorSize() is less than or equal
+**      to the page size.
+**
+** If the optimization cannot be used, 0 is returned. If it can be used,
+** then the value returned is the size of the journal file when it
+** contains rollback data for exactly one page.
+*/
+#ifdef SQLITE_ENABLE_ATOMIC_WRITE
+static int jrnlBufferSize(Pager *pPager){
+  int dc;           /* Device characteristics */
+  int nSector;      /* Sector size */
+  int nPage;        /* Page size */
+  sqlite3_file *fd = pPager->fd;
+
+  if( fd->pMethods ){
+    dc = sqlite3OsDeviceCharacteristics(fd);
+    nSector = sqlite3OsSectorSize(fd);
+    nPage = pPager->pageSize;
+  }
+
+  assert(SQLITE_IOCAP_ATOMIC512==(512>>8));
+  assert(SQLITE_IOCAP_ATOMIC64K==(65536>>8));
+
+  if( !fd->pMethods || (dc&(SQLITE_IOCAP_ATOMIC|(nPage>>8))&&nSector<=nPage) ){
+    return JOURNAL_HDR_SZ(pPager) + JOURNAL_PG_SZ(pPager);
+  }
+  return 0;
+}
+#endif
+
+/*
+** This function should be called when an error occurs within the pager
+** code. The first argument is a pointer to the pager structure, the
+** second the error-code about to be returned by a pager API function.
+** The value returned is a copy of the second argument to this function.
+**
+** If the second argument is SQLITE_IOERR, SQLITE_CORRUPT, or SQLITE_FULL
+** the error becomes persistent. Until the persisten error is cleared,
+** subsequent API calls on this Pager will immediately return the same
+** error code.
+**
+** A persistent error indicates that the contents of the pager-cache
+** cannot be trusted. This state can be cleared by completely discarding
+** the contents of the pager-cache. If a transaction was active when
+** the persistent error occured, then the rollback journal may need
+** to be replayed.
+*/
+static void pager_unlock(Pager *pPager);
+static int pager_error(Pager *pPager, int rc){
+  int rc2 = rc & 0xff;
+  assert(
+       pPager->errCode==SQLITE_FULL ||
+       pPager->errCode==SQLITE_OK ||
+       (pPager->errCode & 0xff)==SQLITE_IOERR
+  );
+  if(
+    rc2==SQLITE_FULL ||
+    rc2==SQLITE_IOERR ||
+    rc2==SQLITE_CORRUPT
+  ){
+    pPager->errCode = rc;
+    if( pPager->state==PAGER_UNLOCK && pPager->nRef==0 ){
+      /* If the pager is already unlocked, call pager_unlock() now to
+      ** clear the error state and ensure that the pager-cache is
+      ** completely empty.
+      */
+      pager_unlock(pPager);
+    }
+  }
+  return rc;
+}
+
+/*
+** If SQLITE_CHECK_PAGES is defined then we do some sanity checking
+** on the cache using a hash function.  This is used for testing
+** and debugging only.
+*/
+#ifdef SQLITE_CHECK_PAGES
+/*
+** Return a 32-bit hash of the page data for pPage.
+*/
+static u32 pager_datahash(int nByte, unsigned char *pData){
+  u32 hash = 0;
+  int i;
+  for(i=0; i<nByte; i++){
+    hash = (hash*1039) + pData[i];
+  }
+  return hash;
+}
+static u32 pager_pagehash(PgHdr *pPage){
+  return pager_datahash(pPage->pPager->pageSize,
+                        (unsigned char *)PGHDR_TO_DATA(pPage));
+}
+
+/*
+** The CHECK_PAGE macro takes a PgHdr* as an argument. If SQLITE_CHECK_PAGES
+** is defined, and NDEBUG is not defined, an assert() statement checks
+** that the page is either dirty or still matches the calculated page-hash.
+*/
+#define CHECK_PAGE(x) checkPage(x)
+static void checkPage(PgHdr *pPg){
+  Pager *pPager = pPg->pPager;
+  assert( !pPg->pageHash || pPager->errCode || MEMDB || pPg->dirty ||
+      pPg->pageHash==pager_pagehash(pPg) );
+}
+
+#else
+#define pager_datahash(X,Y)  0
+#define pager_pagehash(X)  0
+#define CHECK_PAGE(x)
+#endif
+
+/*
+** When this is called the journal file for pager pPager must be open.
+** The master journal file name is read from the end of the file and
+** written into memory supplied by the caller.
+**
+** zMaster must point to a buffer of at least nMaster bytes allocated by
+** the caller. This should be sqlite3_vfs.mxPathname+1 (to ensure there is
+** enough space to write the master journal name). If the master journal
+** name in the journal is longer than nMaster bytes (including a
+** nul-terminator), then this is handled as if no master journal name
+** were present in the journal.
+**
+** If no master journal file name is present zMaster[0] is set to 0 and
+** SQLITE_OK returned.
+*/
+static int readMasterJournal(sqlite3_file *pJrnl, char *zMaster, int nMaster){
+  int rc;
+  u32 len;
+  i64 szJ;
+  u32 cksum;
+  int i;
+  unsigned char aMagic[8]; /* A buffer to hold the magic header */
+
+  zMaster[0] = '\0';
+
+  rc = sqlite3OsFileSize(pJrnl, &szJ);
+  if( rc!=SQLITE_OK || szJ<16 ) return rc;
+
+  rc = read32bits(pJrnl, szJ-16, &len);
+  if( rc!=SQLITE_OK ) return rc;
+
+  if( len>=nMaster ){
+    return SQLITE_OK;
+  }
+
+  rc = read32bits(pJrnl, szJ-12, &cksum);
+  if( rc!=SQLITE_OK ) return rc;
+
+  rc = sqlite3OsRead(pJrnl, aMagic, 8, szJ-8);
+  if( rc!=SQLITE_OK || memcmp(aMagic, aJournalMagic, 8) ) return rc;
+
+  rc = sqlite3OsRead(pJrnl, zMaster, len, szJ-16-len);
+  if( rc!=SQLITE_OK ){
+    return rc;
+  }
+  zMaster[len] = '\0';
+
+  /* See if the checksum matches the master journal name */
+  for(i=0; i<len; i++){
+    cksum -= zMaster[i];
+   }
+  if( cksum ){
+    /* If the checksum doesn't add up, then one or more of the disk sectors
+    ** containing the master journal filename is corrupted. This means
+    ** definitely roll back, so just return SQLITE_OK and report a (nul)
+    ** master-journal filename.
+    */
+    zMaster[0] = '\0';
+  }
+
+  return SQLITE_OK;
+}
+
+/*
+** Seek the journal file descriptor to the next sector boundary where a
+** journal header may be read or written. Pager.journalOff is updated with
+** the new seek offset.
+**
+** i.e for a sector size of 512:
+**
+** Input Offset              Output Offset
+** ---------------------------------------
+** 0                         0
+** 512                       512
+** 100                       512
+** 2000                      2048
+**
+*/
+static void seekJournalHdr(Pager *pPager){
+  i64 offset = 0;
+  i64 c = pPager->journalOff;
+  if( c ){
+    offset = ((c-1)/JOURNAL_HDR_SZ(pPager) + 1) * JOURNAL_HDR_SZ(pPager);
+  }
+  assert( offset%JOURNAL_HDR_SZ(pPager)==0 );
+  assert( offset>=c );
+  assert( (offset-c)<JOURNAL_HDR_SZ(pPager) );
+  pPager->journalOff = offset;
+}
+
+/*
+** The journal file must be open when this routine is called. A journal
+** header (JOURNAL_HDR_SZ bytes) is written into the journal file at the
+** current location.
+**
+** The format for the journal header is as follows:
+** - 8 bytes: Magic identifying journal format.
+** - 4 bytes: Number of records in journal, or -1 no-sync mode is on.
+** - 4 bytes: Random number used for page hash.
+** - 4 bytes: Initial database page count.
+** - 4 bytes: Sector size used by the process that wrote this journal.
+**
+** Followed by (JOURNAL_HDR_SZ - 24) bytes of unused space.
+*/
+static int writeJournalHdr(Pager *pPager){
+  char zHeader[sizeof(aJournalMagic)+16];
+  int rc;
+
+  if( pPager->stmtHdrOff==0 ){
+    pPager->stmtHdrOff = pPager->journalOff;
+  }
+
+  seekJournalHdr(pPager);
+  pPager->journalHdr = pPager->journalOff;
+
+  memcpy(zHeader, aJournalMagic, sizeof(aJournalMagic));
+
+  /*
+  ** Write the nRec Field - the number of page records that follow this
+  ** journal header. Normally, zero is written to this value at this time.
+  ** After the records are added to the journal (and the journal synced,
+  ** if in full-sync mode), the zero is overwritten with the true number
+  ** of records (see syncJournal()).
+  **
+  ** A faster alternative is to write 0xFFFFFFFF to the nRec field. When
+  ** reading the journal this value tells SQLite to assume that the
+  ** rest of the journal file contains valid page records. This assumption
+  ** is dangerous, as if a failure occured whilst writing to the journal
+  ** file it may contain some garbage data. There are two scenarios
+  ** where this risk can be ignored:
+  **
+  **   * When the pager is in no-sync mode. Corruption can follow a
+  **     power failure in this case anyway.
+  **
+  **   * When the SQLITE_IOCAP_SAFE_APPEND flag is set. This guarantees
+  **     that garbage data is never appended to the journal file.
+  */
+  assert(pPager->fd->pMethods||pPager->noSync);
+  if( (pPager->noSync)
+   || (sqlite3OsDeviceCharacteristics(pPager->fd)&SQLITE_IOCAP_SAFE_APPEND)
+  ){
+    put32bits(&zHeader[sizeof(aJournalMagic)], 0xffffffff);
+  }else{
+    put32bits(&zHeader[sizeof(aJournalMagic)], 0);
+  }
+
+  /* The random check-hash initialiser */
+  sqlite3Randomness(sizeof(pPager->cksumInit), &pPager->cksumInit);
+  put32bits(&zHeader[sizeof(aJournalMagic)+4], pPager->cksumInit);
+  /* The initial database size */
+  put32bits(&zHeader[sizeof(aJournalMagic)+8], pPager->dbSize);
+  /* The assumed sector size for this process */
+  put32bits(&zHeader[sizeof(aJournalMagic)+12], pPager->sectorSize);
+  IOTRACE(("JHDR %p %lld %d\n", pPager, pPager->journalHdr, sizeof(zHeader)))
+  rc = sqlite3OsWrite(pPager->jfd, zHeader, sizeof(zHeader),pPager->journalOff);
+  pPager->journalOff += JOURNAL_HDR_SZ(pPager);
+
+  /* The journal header has been written successfully. Seek the journal
+  ** file descriptor to the end of the journal header sector.
+  */
+  if( rc==SQLITE_OK ){
+    IOTRACE(("JTAIL %p %lld\n", pPager, pPager->journalOff-1))
+    rc = sqlite3OsWrite(pPager->jfd, "\000", 1, pPager->journalOff-1);
+  }
+  return rc;
+}
+
+/*
+** The journal file must be open when this is called. A journal header file
+** (JOURNAL_HDR_SZ bytes) is read from the current location in the journal
+** file. See comments above function writeJournalHdr() for a description of
+** the journal header format.
+**
+** If the header is read successfully, *nRec is set to the number of
+** page records following this header and *dbSize is set to the size of the
+** database before the transaction began, in pages. Also, pPager->cksumInit
+** is set to the value read from the journal header. SQLITE_OK is returned
+** in this case.
+**
+** If the journal header file appears to be corrupted, SQLITE_DONE is
+** returned and *nRec and *dbSize are not set.  If JOURNAL_HDR_SZ bytes
+** cannot be read from the journal file an error code is returned.
+*/
+static int readJournalHdr(
+  Pager *pPager,
+  i64 journalSize,
+  u32 *pNRec,
+  u32 *pDbSize
+){
+  int rc;
+  unsigned char aMagic[8]; /* A buffer to hold the magic header */
+  i64 jrnlOff;
+
+  seekJournalHdr(pPager);
+  if( pPager->journalOff+JOURNAL_HDR_SZ(pPager) > journalSize ){
+    return SQLITE_DONE;
+  }
+  jrnlOff = pPager->journalOff;
+
+  rc = sqlite3OsRead(pPager->jfd, aMagic, sizeof(aMagic), jrnlOff);
+  if( rc ) return rc;
+  jrnlOff += sizeof(aMagic);
+
+  if( memcmp(aMagic, aJournalMagic, sizeof(aMagic))!=0 ){
+    return SQLITE_DONE;
+  }
+
+  rc = read32bits(pPager->jfd, jrnlOff, pNRec);
+  if( rc ) return rc;
+
+  rc = read32bits(pPager->jfd, jrnlOff+4, &pPager->cksumInit);
+  if( rc ) return rc;
+
+  rc = read32bits(pPager->jfd, jrnlOff+8, pDbSize);
+  if( rc ) return rc;
+
+  /* Update the assumed sector-size to match the value used by
+  ** the process that created this journal. If this journal was
+  ** created by a process other than this one, then this routine
+  ** is being called from within pager_playback(). The local value
+  ** of Pager.sectorSize is restored at the end of that routine.
+  */
+  rc = read32bits(pPager->jfd, jrnlOff+12, (u32 *)&pPager->sectorSize);
+  if( rc ) return rc;
+
+  pPager->journalOff += JOURNAL_HDR_SZ(pPager);
+  return SQLITE_OK;
+}
+
+
+/*
+** Write the supplied master journal name into the journal file for pager
+** pPager at the current location. The master journal name must be the last
+** thing written to a journal file. If the pager is in full-sync mode, the
+** journal file descriptor is advanced to the next sector boundary before
+** anything is written. The format is:
+**
+** + 4 bytes: PAGER_MJ_PGNO.
+** + N bytes: length of master journal name.
+** + 4 bytes: N
+** + 4 bytes: Master journal name checksum.
+** + 8 bytes: aJournalMagic[].
+**
+** The master journal page checksum is the sum of the bytes in the master
+** journal name.
+**
+** If zMaster is a NULL pointer (occurs for a single database transaction),
+** this call is a no-op.
+*/
+static int writeMasterJournal(Pager *pPager, const char *zMaster){
+  int rc;
+  int len;
+  int i;
+  i64 jrnlOff;
+  u32 cksum = 0;
+  char zBuf[sizeof(aJournalMagic)+2*4];
+
+  if( !zMaster || pPager->setMaster) return SQLITE_OK;
+  pPager->setMaster = 1;
+
+  len = strlen(zMaster);
+  for(i=0; i<len; i++){
+    cksum += zMaster[i];
+  }
+
+  /* If in full-sync mode, advance to the next disk sector before writing
+  ** the master journal name. This is in case the previous page written to
+  ** the journal has already been synced.
+  */
+  if( pPager->fullSync ){
+    seekJournalHdr(pPager);
+  }
+  jrnlOff = pPager->journalOff;
+  pPager->journalOff += (len+20);
+
+  rc = write32bits(pPager->jfd, jrnlOff, PAGER_MJ_PGNO(pPager));
+  if( rc!=SQLITE_OK ) return rc;
+  jrnlOff += 4;
+
+  rc = sqlite3OsWrite(pPager->jfd, zMaster, len, jrnlOff);
+  if( rc!=SQLITE_OK ) return rc;
+  jrnlOff += len;
+
+  put32bits(zBuf, len);
+  put32bits(&zBuf[4], cksum);
+  memcpy(&zBuf[8], aJournalMagic, sizeof(aJournalMagic));
+  rc = sqlite3OsWrite(pPager->jfd, zBuf, 8+sizeof(aJournalMagic), jrnlOff);
+  pPager->needSync = !pPager->noSync;
+  return rc;
+}
+
+/*
+** Add or remove a page from the list of all pages that are in the
+** statement journal.
+**
+** The Pager keeps a separate list of pages that are currently in
+** the statement journal.  This helps the sqlite3PagerStmtCommit()
+** routine run MUCH faster for the common case where there are many
+** pages in memory but only a few are in the statement journal.
+*/
+static void page_add_to_stmt_list(PgHdr *pPg){
+  Pager *pPager = pPg->pPager;
+  PgHistory *pHist = PGHDR_TO_HIST(pPg, pPager);
+  assert( MEMDB );
+  if( !pHist->inStmt ){
+    assert( pHist->pPrevStmt==0 && pHist->pNextStmt==0 );
+    if( pPager->pStmt ){
+      PGHDR_TO_HIST(pPager->pStmt, pPager)->pPrevStmt = pPg;
+    }
+    pHist->pNextStmt = pPager->pStmt;
+    pPager->pStmt = pPg;
+    pHist->inStmt = 1;
+  }
+}
+
+/*
+** Find a page in the hash table given its page number.  Return
+** a pointer to the page or NULL if not found.
+*/
+static PgHdr *pager_lookup(Pager *pPager, Pgno pgno){
+  PgHdr *p;
+  if( pPager->aHash==0 ) return 0;
+  p = pPager->aHash[pgno & (pPager->nHash-1)];
+  while( p && p->pgno!=pgno ){
+    p = p->pNextHash;
+  }
+  return p;
+}
+
+/*
+** Clear the in-memory cache.  This routine
+** sets the state of the pager back to what it was when it was first
+** opened.  Any outstanding pages are invalidated and subsequent attempts
+** to access those pages will likely result in a coredump.
+*/
+static void pager_reset(Pager *pPager){
+  PgHdr *pPg, *pNext;
+  if( pPager->errCode ) return;
+  for(pPg=pPager->pAll; pPg; pPg=pNext){
+    IOTRACE(("PGFREE %p %d\n", pPager, pPg->pgno));
+    PAGER_INCR(sqlite3_pager_pgfree_count);
+    pNext = pPg->pNextAll;
+    lruListRemove(pPg);
+    sqlite3_free(pPg->pData);
+    sqlite3_free(pPg);
+  }
+  assert(pPager->lru.pFirst==0);
+  assert(pPager->lru.pFirstSynced==0);
+  assert(pPager->lru.pLast==0);
+  pPager->pStmt = 0;
+  pPager->pAll = 0;
+  pPager->pDirty = 0;
+  pPager->nHash = 0;
+  sqlite3_free(pPager->aHash);
+  pPager->nPage = 0;
+  pPager->aHash = 0;
+  pPager->nRef = 0;
+}
+
+/*
+** Unlock the database file.
+**
+** If the pager is currently in error state, discard the contents of
+** the cache and reset the Pager structure internal state. If there is
+** an open journal-file, then the next time a shared-lock is obtained
+** on the pager file (by this or any other process), it will be
+** treated as a hot-journal and rolled back.
+*/
+static void pager_unlock(Pager *pPager){
+  if( !pPager->exclusiveMode ){
+    if( !MEMDB ){
+      int rc = osUnlock(pPager->fd, NO_LOCK);
+      if( rc ) pPager->errCode = rc;
+      pPager->dbSize = -1;
+      IOTRACE(("UNLOCK %p\n", pPager))
+
+      /* If Pager.errCode is set, the contents of the pager cache cannot be
+      ** trusted. Now that the pager file is unlocked, the contents of the
+      ** cache can be discarded and the error code safely cleared.
+      */
+      if( pPager->errCode ){
+        if( rc==SQLITE_OK ) pPager->errCode = SQLITE_OK;
+        pager_reset(pPager);
+        if( pPager->stmtOpen ){
+          sqlite3OsClose(pPager->stfd);
+          sqlite3BitvecDestroy(pPager->pInStmt);
+          pPager->pInStmt = 0;
+        }
+        if( pPager->journalOpen ){
+          sqlite3OsClose(pPager->jfd);
+          pPager->journalOpen = 0;
+          sqlite3BitvecDestroy(pPager->pInJournal);
+          pPager->pInJournal = 0;
+        }
+        pPager->stmtOpen = 0;
+        pPager->stmtInUse = 0;
+        pPager->journalOff = 0;
+        pPager->journalStarted = 0;
+        pPager->stmtAutoopen = 0;
+        pPager->origDbSize = 0;
+      }
+    }
+
+    if( !MEMDB || pPager->errCode==SQLITE_OK ){
+      pPager->state = PAGER_UNLOCK;
+      pPager->changeCountDone = 0;
+    }
+  }
+}
+
+/*
+** Execute a rollback if a transaction is active and unlock the
+** database file. If the pager has already entered the error state,
+** do not attempt the rollback.
+*/
+static void pagerUnlockAndRollback(Pager *p){
+  assert( p->state>=PAGER_RESERVED || p->journalOpen==0 );
+  if( p->errCode==SQLITE_OK && p->state>=PAGER_RESERVED ){
+    sqlite3PagerRollback(p);
+  }
+  pager_unlock(p);
+  assert( p->errCode || !p->journalOpen || (p->exclusiveMode&&!p->journalOff) );
+  assert( p->errCode || !p->stmtOpen || p->exclusiveMode );
+}
+
+/*
+** This routine ends a transaction.  A transaction is ended by either
+** a COMMIT or a ROLLBACK.
+**
+** When this routine is called, the pager has the journal file open and
+** a RESERVED or EXCLUSIVE lock on the database.  This routine will release
+** the database lock and acquires a SHARED lock in its place if that is
+** the appropriate thing to do.  Release locks usually is appropriate,
+** unless we are in exclusive access mode or unless this is a
+** COMMIT AND BEGIN or ROLLBACK AND BEGIN operation.
+**
+** The journal file is either deleted or truncated.
+**
+** TODO: Consider keeping the journal file open for temporary databases.
+** This might give a performance improvement on windows where opening
+** a file is an expensive operation.
+*/
+static int pager_end_transaction(Pager *pPager){
+  PgHdr *pPg;
+  int rc = SQLITE_OK;
+  int rc2 = SQLITE_OK;
+  assert( !MEMDB );
+  if( pPager->state<PAGER_RESERVED ){
+    return SQLITE_OK;
+  }
+  sqlite3PagerStmtCommit(pPager);
+  if( pPager->stmtOpen && !pPager->exclusiveMode ){
+    sqlite3OsClose(pPager->stfd);
+    pPager->stmtOpen = 0;
+  }
+  if( pPager->journalOpen ){
+    if( pPager->exclusiveMode
+          && (rc = sqlite3OsTruncate(pPager->jfd, 0))==SQLITE_OK ){;
+      pPager->journalOff = 0;
+      pPager->journalStarted = 0;
+    }else{
+      sqlite3OsClose(pPager->jfd);
+      pPager->journalOpen = 0;
+      if( rc==SQLITE_OK ){
+        rc = sqlite3OsDelete(pPager->pVfs, pPager->zJournal, 0);
+      }
+    }
+    sqlite3BitvecDestroy(pPager->pInJournal);
+    pPager->pInJournal = 0;
+    for(pPg=pPager->pAll; pPg; pPg=pPg->pNextAll){
+      pPg->inJournal = 0;
+      pPg->dirty = 0;
+      pPg->needSync = 0;
+      pPg->alwaysRollback = 0;
+#ifdef SQLITE_CHECK_PAGES
+      pPg->pageHash = pager_pagehash(pPg);
+#endif
+    }
+    pPager->pDirty = 0;
+    pPager->dirtyCache = 0;
+    pPager->nRec = 0;
+  }else{
+    assert( pPager->pInJournal==0 );
+    assert( pPager->dirtyCache==0 || pPager->useJournal==0 );
+  }
+
+  if( !pPager->exclusiveMode ){
+    rc2 = osUnlock(pPager->fd, SHARED_LOCK);
+    pPager->state = PAGER_SHARED;
+  }else if( pPager->state==PAGER_SYNCED ){
+    pPager->state = PAGER_EXCLUSIVE;
+  }
+  pPager->origDbSize = 0;
+  pPager->setMaster = 0;
+  pPager->needSync = 0;
+  lruListSetFirstSynced(pPager);
+  pPager->dbSize = -1;
+
+  return (rc==SQLITE_OK?rc2:rc);
+}
+
+/*
+** Compute and return a checksum for the page of data.
+**
+** This is not a real checksum.  It is really just the sum of the
+** random initial value and the page number.  We experimented with
+** a checksum of the entire data, but that was found to be too slow.
+**
+** Note that the page number is stored at the beginning of data and
+** the checksum is stored at the end.  This is important.  If journal
+** corruption occurs due to a power failure, the most likely scenario
+** is that one end or the other of the record will be changed.  It is
+** much less likely that the two ends of the journal record will be
+** correct and the middle be corrupt.  Thus, this "checksum" scheme,
+** though fast and simple, catches the mostly likely kind of corruption.
+**
+** FIX ME:  Consider adding every 200th (or so) byte of the data to the
+** checksum.  That way if a single page spans 3 or more disk sectors and
+** only the middle sector is corrupt, we will still have a reasonable
+** chance of failing the checksum and thus detecting the problem.
+*/
+static u32 pager_cksum(Pager *pPager, const u8 *aData){
+  u32 cksum = pPager->cksumInit;
+  int i = pPager->pageSize-200;
+  while( i>0 ){
+    cksum += aData[i];
+    i -= 200;
+  }
+  return cksum;
+}
+
+/* Forward declaration */
+static void makeClean(PgHdr*);
+
+/*
+** Read a single page from the journal file opened on file descriptor
+** jfd.  Playback this one page.
+**
+** If useCksum==0 it means this journal does not use checksums.  Checksums
+** are not used in statement journals because statement journals do not
+** need to survive power failures.
+*/
+static int pager_playback_one_page(
+  Pager *pPager,
+  sqlite3_file *jfd,
+  i64 offset,
+  int useCksum
+){
+  int rc;
+  PgHdr *pPg;                   /* An existing page in the cache */
+  Pgno pgno;                    /* The page number of a page in journal */
+  u32 cksum;                    /* Checksum used for sanity checking */
+  u8 *aData = (u8 *)pPager->pTmpSpace;   /* Temp storage for a page */
+
+  /* useCksum should be true for the main journal and false for
+  ** statement journals.  Verify that this is always the case
+  */
+  assert( jfd == (useCksum ? pPager->jfd : pPager->stfd) );
+  assert( aData );
+
+  rc = read32bits(jfd, offset, &pgno);
+  if( rc!=SQLITE_OK ) return rc;
+  rc = sqlite3OsRead(jfd, aData, pPager->pageSize, offset+4);
+  if( rc!=SQLITE_OK ) return rc;
+  pPager->journalOff += pPager->pageSize + 4;
+
+  /* Sanity checking on the page.  This is more important that I originally
+  ** thought.  If a power failure occurs while the journal is being written,
+  ** it could cause invalid data to be written into the journal.  We need to
+  ** detect this invalid data (with high probability) and ignore it.
+  */
+  if( pgno==0 || pgno==PAGER_MJ_PGNO(pPager) ){
+    return SQLITE_DONE;
+  }
+  if( pgno>(unsigned)pPager->dbSize ){
+    return SQLITE_OK;
+  }
+  if( useCksum ){
+    rc = read32bits(jfd, offset+pPager->pageSize+4, &cksum);
+    if( rc ) return rc;
+    pPager->journalOff += 4;
+    if( pager_cksum(pPager, aData)!=cksum ){
+      return SQLITE_DONE;
+    }
+  }
+
+  assert( pPager->state==PAGER_RESERVED || pPager->state>=PAGER_EXCLUSIVE );
+
+  /* If the pager is in RESERVED state, then there must be a copy of this
+  ** page in the pager cache. In this case just update the pager cache,
+  ** not the database file. The page is left marked dirty in this case.
+  **
+  ** An exception to the above rule: If the database is in no-sync mode
+  ** and a page is moved during an incremental vacuum then the page may
+  ** not be in the pager cache. Later: if a malloc() or IO error occurs
+  ** during a Movepage() call, then the page may not be in the cache
+  ** either. So the condition described in the above paragraph is not
+  ** assert()able.
+  **
+  ** If in EXCLUSIVE state, then we update the pager cache if it exists
+  ** and the main file. The page is then marked not dirty.
+  **
+  ** Ticket #1171:  The statement journal might contain page content that is
+  ** different from the page content at the start of the transaction.
+  ** This occurs when a page is changed prior to the start of a statement
+  ** then changed again within the statement.  When rolling back such a
+  ** statement we must not write to the original database unless we know
+  ** for certain that original page contents are synced into the main rollback
+  ** journal.  Otherwise, a power loss might leave modified data in the
+  ** database file without an entry in the rollback journal that can
+  ** restore the database to its original form.  Two conditions must be
+  ** met before writing to the database files. (1) the database must be
+  ** locked.  (2) we know that the original page content is fully synced
+  ** in the main journal either because the page is not in cache or else
+  ** the page is marked as needSync==0.
+  */
+  pPg = pager_lookup(pPager, pgno);
+  PAGERTRACE4("PLAYBACK %d page %d hash(%08x)\n",
+               PAGERID(pPager), pgno, pager_datahash(pPager->pageSize, aData));
+  if( pPager->state>=PAGER_EXCLUSIVE && (pPg==0 || pPg->needSync==0) ){
+    i64 offset = (pgno-1)*(i64)pPager->pageSize;
+    rc = sqlite3OsWrite(pPager->fd, aData, pPager->pageSize, offset);
+    if( pPg ){
+      makeClean(pPg);
+    }
+  }
+  if( pPg ){
+    /* No page should ever be explicitly rolled back that is in use, except
+    ** for page 1 which is held in use in order to keep the lock on the
+    ** database active. However such a page may be rolled back as a result
+    ** of an internal error resulting in an automatic call to
+    ** sqlite3PagerRollback().
+    */
+    void *pData;
+    /* assert( pPg->nRef==0 || pPg->pgno==1 ); */
+    pData = PGHDR_TO_DATA(pPg);
+    memcpy(pData, aData, pPager->pageSize);
+    if( pPager->xReiniter ){
+      pPager->xReiniter(pPg, pPager->pageSize);
+    }
+#ifdef SQLITE_CHECK_PAGES
+    pPg->pageHash = pager_pagehash(pPg);
+#endif
+    /* If this was page 1, then restore the value of Pager.dbFileVers.
+    ** Do this before any decoding. */
+    if( pgno==1 ){
+      memcpy(&pPager->dbFileVers, &((u8*)pData)[24],sizeof(pPager->dbFileVers));
+    }
+
+    /* Decode the page just read from disk */
+    CODEC1(pPager, pData, pPg->pgno, 3);
+  }
+  return rc;
+}
+
+/*
+** Parameter zMaster is the name of a master journal file. A single journal
+** file that referred to the master journal file has just been rolled back.
+** This routine checks if it is possible to delete the master journal file,
+** and does so if it is.
+**
+** Argument zMaster may point to Pager.pTmpSpace. So that buffer is not
+** available for use within this function.
+**
+**
+** The master journal file contains the names of all child journals.
+** To tell if a master journal can be deleted, check to each of the
+** children.  If all children are either missing or do not refer to
+** a different master journal, then this master journal can be deleted.
+*/
+static int pager_delmaster(Pager *pPager, const char *zMaster){
+  sqlite3_vfs *pVfs = pPager->pVfs;
+  int rc;
+  int master_open = 0;
+  sqlite3_file *pMaster;
+  sqlite3_file *pJournal;
+  char *zMasterJournal = 0; /* Contents of master journal file */
+  i64 nMasterJournal;       /* Size of master journal file */
+
+  /* Open the master journal file exclusively in case some other process
+  ** is running this routine also. Not that it makes too much difference.
+  */
+  pMaster = (sqlite3_file *)sqlite3_malloc(pVfs->szOsFile * 2);
+  pJournal = (sqlite3_file *)(((u8 *)pMaster) + pVfs->szOsFile);
+  if( !pMaster ){
+    rc = SQLITE_NOMEM;
+  }else{
+    int flags = (SQLITE_OPEN_READONLY|SQLITE_OPEN_MASTER_JOURNAL);
+    rc = sqlite3OsOpen(pVfs, zMaster, pMaster, flags, 0);
+  }
+  if( rc!=SQLITE_OK ) goto delmaster_out;
+  master_open = 1;
+
+  rc = sqlite3OsFileSize(pMaster, &nMasterJournal);
+  if( rc!=SQLITE_OK ) goto delmaster_out;
+
+  if( nMasterJournal>0 ){
+    char *zJournal;
+    char *zMasterPtr = 0;
+    int nMasterPtr = pPager->pVfs->mxPathname+1;
+
+    /* Load the entire master journal file into space obtained from
+    ** sqlite3_malloc() and pointed to by zMasterJournal.
+    */
+    zMasterJournal = (char *)sqlite3_malloc(nMasterJournal + nMasterPtr);
+    if( !zMasterJournal ){
+      rc = SQLITE_NOMEM;
+      goto delmaster_out;
+    }
+    zMasterPtr = &zMasterJournal[nMasterJournal];
+    rc = sqlite3OsRead(pMaster, zMasterJournal, nMasterJournal, 0);
+    if( rc!=SQLITE_OK ) goto delmaster_out;
+
+    zJournal = zMasterJournal;
+    while( (zJournal-zMasterJournal)<nMasterJournal ){
+      if( sqlite3OsAccess(pVfs, zJournal, SQLITE_ACCESS_EXISTS) ){
+        /* One of the journals pointed to by the master journal exists.
+        ** Open it and check if it points at the master journal. If
+        ** so, return without deleting the master journal file.
+        */
+        int c;
+        int flags = (SQLITE_OPEN_READONLY|SQLITE_OPEN_MAIN_JOURNAL);
+        rc = sqlite3OsOpen(pVfs, zJournal, pJournal, flags, 0);
+        if( rc!=SQLITE_OK ){
+          goto delmaster_out;
+        }
+
+        rc = readMasterJournal(pJournal, zMasterPtr, nMasterPtr);
+        sqlite3OsClose(pJournal);
+        if( rc!=SQLITE_OK ){
+          goto delmaster_out;
+        }
+
+        c = zMasterPtr[0]!=0 && strcmp(zMasterPtr, zMaster)==0;
+        if( c ){
+          /* We have a match. Do not delete the master journal file. */
+          goto delmaster_out;
+        }
+      }
+      zJournal += (strlen(zJournal)+1);
+    }
+  }
+
+  rc = sqlite3OsDelete(pVfs, zMaster, 0);
+
+delmaster_out:
+  if( zMasterJournal ){
+    sqlite3_free(zMasterJournal);
+  }
+  if( master_open ){
+    sqlite3OsClose(pMaster);
+  }
+  sqlite3_free(pMaster);
+  return rc;
+}
+
+
+static void pager_truncate_cache(Pager *pPager);
+
+/*
+** Truncate the main file of the given pager to the number of pages
+** indicated. Also truncate the cached representation of the file.
+**
+** Might might be the case that the file on disk is smaller than nPage.
+** This can happen, for example, if we are in the middle of a transaction
+** which has extended the file size and the new pages are still all held
+** in cache, then an INSERT or UPDATE does a statement rollback.  Some
+** operating system implementations can get confused if you try to
+** truncate a file to some size that is larger than it currently is,
+** so detect this case and do not do the truncation.
+*/
+static int pager_truncate(Pager *pPager, int nPage){
+  int rc = SQLITE_OK;
+  if( pPager->state>=PAGER_EXCLUSIVE && pPager->fd->pMethods ){
+    i64 currentSize, newSize;
+    rc = sqlite3OsFileSize(pPager->fd, &currentSize);
+    newSize = pPager->pageSize*(i64)nPage;
+    if( rc==SQLITE_OK && currentSize>newSize ){
+      rc = sqlite3OsTruncate(pPager->fd, newSize);
+    }
+  }
+  if( rc==SQLITE_OK ){
+    pPager->dbSize = nPage;
+    pager_truncate_cache(pPager);
+  }
+  return rc;
+}
+
+/*
+** Set the sectorSize for the given pager.
+**
+** The sector size is the larger of the sector size reported
+** by sqlite3OsSectorSize() and the pageSize.
+*/
+static void setSectorSize(Pager *pPager){
+  assert(pPager->fd->pMethods||pPager->tempFile);
+  if( !pPager->tempFile ){
+    /* Sector size doesn't matter for temporary files. Also, the file
+    ** may not have been opened yet, in whcih case the OsSectorSize()
+    ** call will segfault.
+    */
+    pPager->sectorSize = sqlite3OsSectorSize(pPager->fd);
+  }
+  if( pPager->sectorSize<pPager->pageSize ){
+    pPager->sectorSize = pPager->pageSize;
+  }
+}
+
+/*
+** Playback the journal and thus restore the database file to
+** the state it was in before we started making changes.
+**
+** The journal file format is as follows:
+**
+**  (1)  8 byte prefix.  A copy of aJournalMagic[].
+**  (2)  4 byte big-endian integer which is the number of valid page records
+**       in the journal.  If this value is 0xffffffff, then compute the
+**       number of page records from the journal size.
+**  (3)  4 byte big-endian integer which is the initial value for the
+**       sanity checksum.
+**  (4)  4 byte integer which is the number of pages to truncate the
+**       database to during a rollback.
+**  (5)  4 byte integer which is the number of bytes in the master journal
+**       name.  The value may be zero (indicate that there is no master
+**       journal.)
+**  (6)  N bytes of the master journal name.  The name will be nul-terminated
+**       and might be shorter than the value read from (5).  If the first byte
+**       of the name is \000 then there is no master journal.  The master
+**       journal name is stored in UTF-8.
+**  (7)  Zero or more pages instances, each as follows:
+**        +  4 byte page number.
+**        +  pPager->pageSize bytes of data.
+**        +  4 byte checksum
+**
+** When we speak of the journal header, we mean the first 6 items above.
+** Each entry in the journal is an instance of the 7th item.
+**
+** Call the value from the second bullet "nRec".  nRec is the number of
+** valid page entries in the journal.  In most cases, you can compute the
+** value of nRec from the size of the journal file.  But if a power
+** failure occurred while the journal was being written, it could be the
+** case that the size of the journal file had already been increased but
+** the extra entries had not yet made it safely to disk.  In such a case,
+** the value of nRec computed from the file size would be too large.  For
+** that reason, we always use the nRec value in the header.
+**
+** If the nRec value is 0xffffffff it means that nRec should be computed
+** from the file size.  This value is used when the user selects the
+** no-sync option for the journal.  A power failure could lead to corruption
+** in this case.  But for things like temporary table (which will be
+** deleted when the power is restored) we don't care.
+**
+** If the file opened as the journal file is not a well-formed
+** journal file then all pages up to the first corrupted page are rolled
+** back (or no pages if the journal header is corrupted). The journal file
+** is then deleted and SQLITE_OK returned, just as if no corruption had
+** been encountered.
+**
+** If an I/O or malloc() error occurs, the journal-file is not deleted
+** and an error code is returned.
+*/
+static int pager_playback(Pager *pPager, int isHot){
+  sqlite3_vfs *pVfs = pPager->pVfs;
+  i64 szJ;                 /* Size of the journal file in bytes */
+  u32 nRec;                /* Number of Records in the journal */
+  int i;                   /* Loop counter */
+  Pgno mxPg = 0;           /* Size of the original file in pages */
+  int rc;                  /* Result code of a subroutine */
+  char *zMaster = 0;       /* Name of master journal file if any */
+
+  /* Figure out how many records are in the journal.  Abort early if
+  ** the journal is empty.
+  */
+  assert( pPager->journalOpen );
+  rc = sqlite3OsFileSize(pPager->jfd, &szJ);
+  if( rc!=SQLITE_OK || szJ==0 ){
+    goto end_playback;
+  }
+
+  /* Read the master journal name from the journal, if it is present.
+  ** If a master journal file name is specified, but the file is not
+  ** present on disk, then the journal is not hot and does not need to be
+  ** played back.
+  */
+  zMaster = pPager->pTmpSpace;
+  rc = readMasterJournal(pPager->jfd, zMaster, pPager->pVfs->mxPathname+1);
+  assert( rc!=SQLITE_DONE );
+  if( rc!=SQLITE_OK
+   || (zMaster[0] && !sqlite3OsAccess(pVfs, zMaster, SQLITE_ACCESS_EXISTS))
+  ){
+    zMaster = 0;
+    if( rc==SQLITE_DONE ) rc = SQLITE_OK;
+    goto end_playback;
+  }
+  pPager->journalOff = 0;
+  zMaster = 0;
+
+  /* This loop terminates either when the readJournalHdr() call returns
+  ** SQLITE_DONE or an IO error occurs. */
+  while( 1 ){
+
+    /* Read the next journal header from the journal file.  If there are
+    ** not enough bytes left in the journal file for a complete header, or
+    ** it is corrupted, then a process must of failed while writing it.
+    ** This indicates nothing more needs to be rolled back.
+    */
+    rc = readJournalHdr(pPager, szJ, &nRec, &mxPg);
+    if( rc!=SQLITE_OK ){
+      if( rc==SQLITE_DONE ){
+        rc = SQLITE_OK;
+      }
+      goto end_playback;
+    }
+
+    /* If nRec is 0xffffffff, then this journal was created by a process
+    ** working in no-sync mode. This means that the rest of the journal
+    ** file consists of pages, there are no more journal headers. Compute
+    ** the value of nRec based on this assumption.
+    */
+    if( nRec==0xffffffff ){
+      assert( pPager->journalOff==JOURNAL_HDR_SZ(pPager) );
+      nRec = (szJ - JOURNAL_HDR_SZ(pPager))/JOURNAL_PG_SZ(pPager);
+    }
+
+    /* If nRec is 0 and this rollback is of a transaction created by this
+    ** process and if this is the final header in the journal, then it means
+    ** that this part of the journal was being filled but has not yet been
+    ** synced to disk.  Compute the number of pages based on the remaining
+    ** size of the file.
+    **
+    ** The third term of the test was added to fix ticket #2565.
+    */
+    if( nRec==0 && !isHot &&
+        pPager->journalHdr+JOURNAL_HDR_SZ(pPager)==pPager->journalOff ){
+      nRec = (szJ - pPager->journalOff) / JOURNAL_PG_SZ(pPager);
+    }
+
+    /* If this is the first header read from the journal, truncate the
+    ** database file back to its original size.
+    */
+    if( pPager->journalOff==JOURNAL_HDR_SZ(pPager) ){
+      rc = pager_truncate(pPager, mxPg);
+      if( rc!=SQLITE_OK ){
+        goto end_playback;
+      }
+    }
+
+    /* Copy original pages out of the journal and back into the database file.
+    */
+    for(i=0; i<nRec; i++){
+      rc = pager_playback_one_page(pPager, pPager->jfd, pPager->journalOff, 1);
+      if( rc!=SQLITE_OK ){
+        if( rc==SQLITE_DONE ){
+          rc = SQLITE_OK;
+          pPager->journalOff = szJ;
+          break;
+        }else{
+          goto end_playback;
+        }
+      }
+    }
+  }
+  /*NOTREACHED*/
+  assert( 0 );
+
+end_playback:
+  if( rc==SQLITE_OK ){
+    zMaster = pPager->pTmpSpace;
+    rc = readMasterJournal(pPager->jfd, zMaster, pPager->pVfs->mxPathname+1);
+  }
+  if( rc==SQLITE_OK ){
+    rc = pager_end_transaction(pPager);
+  }
+  if( rc==SQLITE_OK && zMaster[0] ){
+    /* If there was a master journal and this routine will return success,
+    ** see if it is possible to delete the master journal.
+    */
+    rc = pager_delmaster(pPager, zMaster);
+  }
+
+  /* The Pager.sectorSize variable may have been updated while rolling
+  ** back a journal created by a process with a different sector size
+  ** value. Reset it to the correct value for this process.
+  */
+  setSectorSize(pPager);
+  return rc;
+}
+
+/*
+** Playback the statement journal.
+**
+** This is similar to playing back the transaction journal but with
+** a few extra twists.
+**
+**    (1)  The number of pages in the database file at the start of
+**         the statement is stored in pPager->stmtSize, not in the
+**         journal file itself.
+**
+**    (2)  In addition to playing back the statement journal, also
+**         playback all pages of the transaction journal beginning
+**         at offset pPager->stmtJSize.
+*/
+static int pager_stmt_playback(Pager *pPager){
+  i64 szJ;                 /* Size of the full journal */
+  i64 hdrOff;
+  int nRec;                /* Number of Records */
+  int i;                   /* Loop counter */
+  int rc;
+
+  szJ = pPager->journalOff;
+#ifndef NDEBUG
+  {
+    i64 os_szJ;
+    rc = sqlite3OsFileSize(pPager->jfd, &os_szJ);
+    if( rc!=SQLITE_OK ) return rc;
+    assert( szJ==os_szJ );
+  }
+#endif
+
+  /* Set hdrOff to be the offset just after the end of the last journal
+  ** page written before the first journal-header for this statement
+  ** transaction was written, or the end of the file if no journal
+  ** header was written.
+  */
+  hdrOff = pPager->stmtHdrOff;
+  assert( pPager->fullSync || !hdrOff );
+  if( !hdrOff ){
+    hdrOff = szJ;
+  }
+
+  /* Truncate the database back to its original size.
+  */
+  rc = pager_truncate(pPager, pPager->stmtSize);
+  assert( pPager->state>=PAGER_SHARED );
+
+  /* Figure out how many records are in the statement journal.
+  */
+  assert( pPager->stmtInUse && pPager->journalOpen );
+  nRec = pPager->stmtNRec;
+
+  /* Copy original pages out of the statement journal and back into the
+  ** database file.  Note that the statement journal omits checksums from
+  ** each record since power-failure recovery is not important to statement
+  ** journals.
+  */
+  for(i=0; i<nRec; i++){
+    i64 offset = i*(4+pPager->pageSize);
+    rc = pager_playback_one_page(pPager, pPager->stfd, offset, 0);
+    assert( rc!=SQLITE_DONE );
+    if( rc!=SQLITE_OK ) goto end_stmt_playback;
+  }
+
+  /* Now roll some pages back from the transaction journal. Pager.stmtJSize
+  ** was the size of the journal file when this statement was started, so
+  ** everything after that needs to be rolled back, either into the
+  ** database, the memory cache, or both.
+  **
+  ** If it is not zero, then Pager.stmtHdrOff is the offset to the start
+  ** of the first journal header written during this statement transaction.
+  */
+  pPager->journalOff = pPager->stmtJSize;
+  pPager->cksumInit = pPager->stmtCksum;
+  while( pPager->journalOff < hdrOff ){
+    rc = pager_playback_one_page(pPager, pPager->jfd, pPager->journalOff, 1);
+    assert( rc!=SQLITE_DONE );
+    if( rc!=SQLITE_OK ) goto end_stmt_playback;
+  }
+
+  while( pPager->journalOff < szJ ){
+    u32 nJRec;         /* Number of Journal Records */
+    u32 dummy;
+    rc = readJournalHdr(pPager, szJ, &nJRec, &dummy);
+    if( rc!=SQLITE_OK ){
+      assert( rc!=SQLITE_DONE );
+      goto end_stmt_playback;
+    }
+    if( nJRec==0 ){
+      nJRec = (szJ - pPager->journalOff) / (pPager->pageSize+8);
+    }
+    for(i=nJRec-1; i>=0 && pPager->journalOff < szJ; i--){
+      rc = pager_playback_one_page(pPager, pPager->jfd, pPager->journalOff, 1);
+      assert( rc!=SQLITE_DONE );
+      if( rc!=SQLITE_OK ) goto end_stmt_playback;
+    }
+  }
+
+  pPager->journalOff = szJ;
+
+end_stmt_playback:
+  if( rc==SQLITE_OK) {
+    pPager->journalOff = szJ;
+    /* pager_reload_cache(pPager); */
+  }
+  return rc;
+}
+
+/*
+** Change the maximum number of in-memory pages that are allowed.
+*/
+void sqlite3PagerSetCachesize(Pager *pPager, int mxPage){
+  if( mxPage>10 ){
+    pPager->mxPage = mxPage;
+  }else{
+    pPager->mxPage = 10;
+  }
+}
+
+/*
+** Adjust the robustness of the database to damage due to OS crashes
+** or power failures by changing the number of syncs()s when writing
+** the rollback journal.  There are three levels:
+**
+**    OFF       sqlite3OsSync() is never called.  This is the default
+**              for temporary and transient files.
+**
+**    NORMAL    The journal is synced once before writes begin on the
+**              database.  This is normally adequate protection, but
+**              it is theoretically possible, though very unlikely,
+**              that an inopertune power failure could leave the journal
+**              in a state which would cause damage to the database
+**              when it is rolled back.
+**
+**    FULL      The journal is synced twice before writes begin on the
+**              database (with some additional information - the nRec field
+**              of the journal header - being written in between the two
+**              syncs).  If we assume that writing a
+**              single disk sector is atomic, then this mode provides
+**              assurance that the journal will not be corrupted to the
+**              point of causing damage to the database during rollback.
+**
+** Numeric values associated with these states are OFF==1, NORMAL=2,
+** and FULL=3.
+*/
+#ifndef SQLITE_OMIT_PAGER_PRAGMAS
+void sqlite3PagerSetSafetyLevel(Pager *pPager, int level, int full_fsync){
+  pPager->noSync =  level==1 || pPager->tempFile;
+  pPager->fullSync = level==3 && !pPager->tempFile;
+  pPager->sync_flags = (full_fsync?SQLITE_SYNC_FULL:SQLITE_SYNC_NORMAL);
+  if( pPager->noSync ) pPager->needSync = 0;
+}
+#endif
+
+/*
+** The following global variable is incremented whenever the library
+** attempts to open a temporary file.  This information is used for
+** testing and analysis only.
+*/
+#ifdef SQLITE_TEST
+int sqlite3_opentemp_count = 0;
+#endif
+
+/*
+** Open a temporary file.
+**
+** Write the file descriptor into *fd.  Return SQLITE_OK on success or some
+** other error code if we fail. The OS will automatically delete the temporary
+** file when it is closed.
+*/
+static int sqlite3PagerOpentemp(
+  sqlite3_vfs *pVfs,    /* The virtual file system layer */
+  sqlite3_file *pFile,  /* Write the file descriptor here */
+  char *zFilename,      /* Name of the file.  Might be NULL */
+  int vfsFlags          /* Flags passed through to the VFS */
+){
+  int rc;
+  assert( zFilename!=0 );
+
+#ifdef SQLITE_TEST
+  sqlite3_opentemp_count++;  /* Used for testing and analysis only */
+#endif
+
+  vfsFlags |=  SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE |
+            SQLITE_OPEN_EXCLUSIVE | SQLITE_OPEN_DELETEONCLOSE;
+  rc = sqlite3OsOpen(pVfs, zFilename, pFile, vfsFlags, 0);
+  assert( rc!=SQLITE_OK || pFile->pMethods );
+  return rc;
+}
+
+/*
+** Create a new page cache and put a pointer to the page cache in *ppPager.
+** The file to be cached need not exist.  The file is not locked until
+** the first call to sqlite3PagerGet() and is only held open until the
+** last page is released using sqlite3PagerUnref().
+**
+** If zFilename is NULL then a randomly-named temporary file is created
+** and used as the file to be cached.  The file will be deleted
+** automatically when it is closed.
+**
+** If zFilename is ":memory:" then all information is held in cache.
+** It is never written to disk.  This can be used to implement an
+** in-memory database.
+*/
+int sqlite3PagerOpen(
+  sqlite3_vfs *pVfs,       /* The virtual file system to use */
+  Pager **ppPager,         /* Return the Pager structure here */
+  const char *zFilename,   /* Name of the database file to open */
+  int nExtra,              /* Extra bytes append to each in-memory page */
+  int flags,               /* flags controlling this file */
+  int vfsFlags             /* flags passed through to sqlite3_vfs.xOpen() */
+){
+  u8 *pPtr;
+  Pager *pPager = 0;
+  int rc = SQLITE_OK;
+  int i;
+  int tempFile = 0;
+  int memDb = 0;
+  int readOnly = 0;
+  int useJournal = (flags & PAGER_OMIT_JOURNAL)==0;
+  int noReadlock = (flags & PAGER_NO_READLOCK)!=0;
+  int journalFileSize = sqlite3JournalSize(pVfs);
+  int nDefaultPage = SQLITE_DEFAULT_PAGE_SIZE;
+  char *zPathname;
+  int nPathname;
+  char *zStmtJrnl;
+  int nStmtJrnl;
+
+  /* The default return is a NULL pointer */
+  *ppPager = 0;
+
+  /* Compute the full pathname */
+  nPathname = pVfs->mxPathname+1;
+  zPathname = sqlite3_malloc(nPathname*2);
+  if( zPathname==0 ){
+    return SQLITE_NOMEM;
+  }
+  if( zFilename && zFilename[0] ){
+#ifndef SQLITE_OMIT_MEMORYDB
+    if( strcmp(zFilename,":memory:")==0 ){
+      memDb = 1;
+      zPathname[0] = 0;
+    }else
+#endif
+    {
+      rc = sqlite3OsFullPathname(pVfs, zFilename, nPathname, zPathname);
+    }
+  }else{
+    rc = sqlite3OsGetTempname(pVfs, nPathname, zPathname);
+  }
+  if( rc!=SQLITE_OK ){
+    sqlite3_free(zPathname);
+    return rc;
+  }
+  nPathname = strlen(zPathname);
+
+  /* Put the statement journal in temporary disk space since this is
+  ** sometimes RAM disk or other optimized storage.  Unlikely the main
+  ** main journal file, the statement journal does not need to be
+  ** colocated with the database nor does it need to be persistent.
+  */
+  zStmtJrnl = &zPathname[nPathname+1];
+  rc = sqlite3OsGetTempname(pVfs, pVfs->mxPathname+1, zStmtJrnl);
+  if( rc!=SQLITE_OK ){
+    sqlite3_free(zPathname);
+    return rc;
+  }
+  nStmtJrnl = strlen(zStmtJrnl);
+
+  /* Allocate memory for the pager structure */
+  pPager = sqlite3MallocZero(
+    sizeof(*pPager) +           /* Pager structure */
+    journalFileSize +           /* The journal file structure */
+    pVfs->szOsFile * 3 +        /* The main db and two journal files */
+    3*nPathname + 40 +          /* zFilename, zDirectory, zJournal */
+    nStmtJrnl                   /* zStmtJrnl */
+  );
+  if( !pPager ){
+    sqlite3_free(zPathname);
+    return SQLITE_NOMEM;
+  }
+  pPtr = (u8 *)&pPager[1];
+  pPager->vfsFlags = vfsFlags;
+  pPager->fd = (sqlite3_file*)&pPtr[pVfs->szOsFile*0];
+  pPager->stfd = (sqlite3_file*)&pPtr[pVfs->szOsFile*1];
+  pPager->jfd = (sqlite3_file*)&pPtr[pVfs->szOsFile*2];
+  pPager->zFilename = (char*)&pPtr[pVfs->szOsFile*2+journalFileSize];
+  pPager->zDirectory = &pPager->zFilename[nPathname+1];
+  pPager->zJournal = &pPager->zDirectory[nPathname+1];
+  pPager->zStmtJrnl = &pPager->zJournal[nPathname+10];
+  pPager->pVfs = pVfs;
+  memcpy(pPager->zFilename, zPathname, nPathname+1);
+  memcpy(pPager->zStmtJrnl, zStmtJrnl, nStmtJrnl+1);
+  sqlite3_free(zPathname);
+
+  /* Open the pager file.
+  */
+  if( zFilename && zFilename[0] && !memDb ){
+    if( nPathname>(pVfs->mxPathname - sizeof("-journal")) ){
+      rc = SQLITE_CANTOPEN;
+    }else{
+      int fout = 0;
+      rc = sqlite3OsOpen(pVfs, pPager->zFilename, pPager->fd,
+                         pPager->vfsFlags, &fout);
+      readOnly = (fout&SQLITE_OPEN_READONLY);
+
+      /* If the file was successfully opened for read/write access,
+      ** choose a default page size in case we have to create the
+      ** database file. The default page size is the maximum of:
+      **
+      **    + SQLITE_DEFAULT_PAGE_SIZE,
+      **    + The value returned by sqlite3OsSectorSize()
+      **    + The largest page size that can be written atomically.
+      */
+      if( rc==SQLITE_OK && !readOnly ){
+        int iSectorSize = sqlite3OsSectorSize(pPager->fd);
+        if( nDefaultPage<iSectorSize ){
+          nDefaultPage = iSectorSize;
+        }
+#ifdef SQLITE_ENABLE_ATOMIC_WRITE
+        {
+          int iDc = sqlite3OsDeviceCharacteristics(pPager->fd);
+          int ii;
+          assert(SQLITE_IOCAP_ATOMIC512==(512>>8));
+          assert(SQLITE_IOCAP_ATOMIC64K==(65536>>8));
+          assert(SQLITE_MAX_DEFAULT_PAGE_SIZE<=65536);
+          for(ii=nDefaultPage; ii<=SQLITE_MAX_DEFAULT_PAGE_SIZE; ii=ii*2){
+            if( iDc&(SQLITE_IOCAP_ATOMIC|(ii>>8)) ) nDefaultPage = ii;
+          }
+        }
+#endif
+        if( nDefaultPage>SQLITE_MAX_DEFAULT_PAGE_SIZE ){
+          nDefaultPage = SQLITE_MAX_DEFAULT_PAGE_SIZE;
+        }
+      }
+    }
+  }else if( !memDb ){
+    /* If a temporary file is requested, it is not opened immediately.
+    ** In this case we accept the default page size and delay actually
+    ** opening the file until the first call to OsWrite().
+    */
+    tempFile = 1;
+    pPager->state = PAGER_EXCLUSIVE;
+  }
+
+  if( pPager && rc==SQLITE_OK ){
+    pPager->pTmpSpace = (char *)sqlite3_malloc(nDefaultPage);
+  }
+
+  /* If an error occured in either of the blocks above.
+  ** Free the Pager structure and close the file.
+  ** Since the pager is not allocated there is no need to set
+  ** any Pager.errMask variables.
+  */
+  if( !pPager || !pPager->pTmpSpace ){
+    sqlite3OsClose(pPager->fd);
+    sqlite3_free(pPager);
+    return ((rc==SQLITE_OK)?SQLITE_NOMEM:rc);
+  }
+
+  PAGERTRACE3("OPEN %d %s\n", FILEHANDLEID(pPager->fd), pPager->zFilename);
+  IOTRACE(("OPEN %p %s\n", pPager, pPager->zFilename))
+
+  /* Fill in Pager.zDirectory[] */
+  memcpy(pPager->zDirectory, pPager->zFilename, nPathname+1);
+  for(i=strlen(pPager->zDirectory); i>0 && pPager->zDirectory[i-1]!='/'; i--){}
+  if( i>0 ) pPager->zDirectory[i-1] = 0;
+
+  /* Fill in Pager.zJournal[] */
+  memcpy(pPager->zJournal, pPager->zFilename, nPathname);
+  memcpy(&pPager->zJournal[nPathname], "-journal", 9);
+
+  /* pPager->journalOpen = 0; */
+  pPager->useJournal = useJournal && !memDb;
+  pPager->noReadlock = noReadlock && readOnly;
+  /* pPager->stmtOpen = 0; */
+  /* pPager->stmtInUse = 0; */
+  /* pPager->nRef = 0; */
+  pPager->dbSize = memDb-1;
+  pPager->pageSize = nDefaultPage;
+  /* pPager->stmtSize = 0; */
+  /* pPager->stmtJSize = 0; */
+  /* pPager->nPage = 0; */
+  pPager->mxPage = 100;
+  pPager->mxPgno = SQLITE_MAX_PAGE_COUNT;
+  /* pPager->state = PAGER_UNLOCK; */
+  assert( pPager->state == (tempFile ? PAGER_EXCLUSIVE : PAGER_UNLOCK) );
+  /* pPager->errMask = 0; */
+  pPager->tempFile = tempFile;
+  assert( tempFile==PAGER_LOCKINGMODE_NORMAL
+          || tempFile==PAGER_LOCKINGMODE_EXCLUSIVE );
+  assert( PAGER_LOCKINGMODE_EXCLUSIVE==1 );
+  pPager->exclusiveMode = tempFile;
+  pPager->memDb = memDb;
+  pPager->readOnly = readOnly;
+  /* pPager->needSync = 0; */
+  pPager->noSync = pPager->tempFile || !useJournal;
+  pPager->fullSync = (pPager->noSync?0:1);
+  pPager->sync_flags = SQLITE_SYNC_NORMAL;
+  /* pPager->pFirst = 0; */
+  /* pPager->pFirstSynced = 0; */
+  /* pPager->pLast = 0; */
+  pPager->nExtra = FORCE_ALIGNMENT(nExtra);
+  assert(pPager->fd->pMethods||memDb||tempFile);
+  if( !memDb ){
+    setSectorSize(pPager);
+  }
+  /* pPager->pBusyHandler = 0; */
+  /* memset(pPager->aHash, 0, sizeof(pPager->aHash)); */
+  *ppPager = pPager;
+#ifdef SQLITE_ENABLE_MEMORY_MANAGEMENT
+  pPager->iInUseMM = 0;
+  pPager->iInUseDB = 0;
+  if( !memDb ){
+    sqlite3_mutex *mutex = sqlite3_mutex_alloc(SQLITE_MUTEX_STATIC_MEM2);
+    sqlite3_mutex_enter(mutex);
+    pPager->pNext = sqlite3PagerList;
+    if( sqlite3PagerList ){
+      assert( sqlite3PagerList->pPrev==0 );
+      sqlite3PagerList->pPrev = pPager;
+    }
+    pPager->pPrev = 0;
+    sqlite3PagerList = pPager;
+    sqlite3_mutex_leave(mutex);
+  }
+#endif
+  return SQLITE_OK;
+}
+
+/*
+** Set the busy handler function.
+*/
+void sqlite3PagerSetBusyhandler(Pager *pPager, BusyHandler *pBusyHandler){
+  pPager->pBusyHandler = pBusyHandler;
+}
+
+/*
+** Set the destructor for this pager.  If not NULL, the destructor is called
+** when the reference count on each page reaches zero.  The destructor can
+** be used to clean up information in the extra segment appended to each page.
+**
+** The destructor is not called as a result sqlite3PagerClose().
+** Destructors are only called by sqlite3PagerUnref().
+*/
+void sqlite3PagerSetDestructor(Pager *pPager, void (*xDesc)(DbPage*,int)){
+  pPager->xDestructor = xDesc;
+}
+
+/*
+** Set the reinitializer for this pager.  If not NULL, the reinitializer
+** is called when the content of a page in cache is restored to its original
+** value as a result of a rollback.  The callback gives higher-level code
+** an opportunity to restore the EXTRA section to agree with the restored
+** page data.
+*/
+void sqlite3PagerSetReiniter(Pager *pPager, void (*xReinit)(DbPage*,int)){
+  pPager->xReiniter = xReinit;
+}
+
+/*
+** Set the page size to *pPageSize. If the suggest new page size is
+** inappropriate, then an alternative page size is set to that
+** value before returning.
+*/
+int sqlite3PagerSetPagesize(Pager *pPager, u16 *pPageSize){
+  int rc = SQLITE_OK;
+  u16 pageSize = *pPageSize;
+  assert( pageSize==0 || (pageSize>=512 && pageSize<=SQLITE_MAX_PAGE_SIZE) );
+  if( pageSize && pageSize!=pPager->pageSize
+   && !pPager->memDb && pPager->nRef==0
+  ){
+    char *pNew = (char *)sqlite3_malloc(pageSize);
+    if( !pNew ){
+      rc = SQLITE_NOMEM;
+    }else{
+      pagerEnter(pPager);
+      pager_reset(pPager);
+      pPager->pageSize = pageSize;
+      setSectorSize(pPager);
+      sqlite3_free(pPager->pTmpSpace);
+      pPager->pTmpSpace = pNew;
+      pagerLeave(pPager);
+    }
+  }
+  *pPageSize = pPager->pageSize;
+  return rc;
+}
+
+/*
+** Return a pointer to the "temporary page" buffer held internally
+** by the pager.  This is a buffer that is big enough to hold the
+** entire content of a database page.  This buffer is used internally
+** during rollback and will be overwritten whenever a rollback
+** occurs.  But other modules are free to use it too, as long as
+** no rollbacks are happening.
+*/
+void *sqlite3PagerTempSpace(Pager *pPager){
+  return pPager->pTmpSpace;
+}
+
+/*
+** Attempt to set the maximum database page count if mxPage is positive.
+** Make no changes if mxPage is zero or negative.  And never reduce the
+** maximum page count below the current size of the database.
+**
+** Regardless of mxPage, return the current maximum page count.
+*/
+int sqlite3PagerMaxPageCount(Pager *pPager, int mxPage){
+  if( mxPage>0 ){
+    pPager->mxPgno = mxPage;
+  }
+  sqlite3PagerPagecount(pPager);
+  return pPager->mxPgno;
+}
+
+/*
+** The following set of routines are used to disable the simulated
+** I/O error mechanism.  These routines are used to avoid simulated
+** errors in places where we do not care about errors.
+**
+** Unless -DSQLITE_TEST=1 is used, these routines are all no-ops
+** and generate no code.
+*/
+#ifdef SQLITE_TEST
+extern int sqlite3_io_error_pending;
+extern int sqlite3_io_error_hit;
+static int saved_cnt;
+void disable_simulated_io_errors(void){
+  saved_cnt = sqlite3_io_error_pending;
+  sqlite3_io_error_pending = -1;
+}
+void enable_simulated_io_errors(void){
+  sqlite3_io_error_pending = saved_cnt;
+}
+#else
+# define disable_simulated_io_errors()
+# define enable_simulated_io_errors()
+#endif
+
+/*
+** Read the first N bytes from the beginning of the file into memory
+** that pDest points to.
+**
+** No error checking is done. The rational for this is that this function
+** may be called even if the file does not exist or contain a header. In
+** these cases sqlite3OsRead() will return an error, to which the correct
+** response is to zero the memory at pDest and continue.  A real IO error
+** will presumably recur and be picked up later (Todo: Think about this).
+*/
+int sqlite3PagerReadFileheader(Pager *pPager, int N, unsigned char *pDest){
+  int rc = SQLITE_OK;
+  memset(pDest, 0, N);
+  assert(MEMDB||pPager->fd->pMethods||pPager->tempFile);
+  if( pPager->fd->pMethods ){
+    IOTRACE(("DBHDR %p 0 %d\n", pPager, N))
+    rc = sqlite3OsRead(pPager->fd, pDest, N, 0);
+    if( rc==SQLITE_IOERR_SHORT_READ ){
+      rc = SQLITE_OK;
+    }
+  }
+  return rc;
+}
+
+/*
+** Return the total number of pages in the disk file associated with
+** pPager.
+**
+** If the PENDING_BYTE lies on the page directly after the end of the
+** file, then consider this page part of the file too. For example, if
+** PENDING_BYTE is byte 4096 (the first byte of page 5) and the size of the
+** file is 4096 bytes, 5 is returned instead of 4.
+*/
+int sqlite3PagerPagecount(Pager *pPager){
+  i64 n = 0;
+  int rc;
+  assert( pPager!=0 );
+  if( pPager->errCode ){
+    return -1;
+  }
+  if( pPager->dbSize>=0 ){
+    n = pPager->dbSize;
+  } else {
+    assert(pPager->fd->pMethods||pPager->tempFile);
+    if( (pPager->fd->pMethods)
+     && (rc = sqlite3OsFileSize(pPager->fd, &n))!=SQLITE_OK ){
+      pPager->nRef++;
+      pager_error(pPager, rc);
+      pPager->nRef--;
+      return -1;
+    }
+    if( n>0 && n<pPager->pageSize ){
+      n = 1;
+    }else{
+      n /= pPager->pageSize;
+    }
+    if( pPager->state!=PAGER_UNLOCK ){
+      pPager->dbSize = n;
+    }
+  }
+  if( n==(PENDING_BYTE/pPager->pageSize) ){
+    n++;
+  }
+  if( n>pPager->mxPgno ){
+    pPager->mxPgno = n;
+  }
+  return n;
+}
+
+
+#ifndef SQLITE_OMIT_MEMORYDB
+/*
+** Clear a PgHistory block
+*/
+static void clearHistory(PgHistory *pHist){
+  sqlite3_free(pHist->pOrig);
+  sqlite3_free(pHist->pStmt);
+  pHist->pOrig = 0;
+  pHist->pStmt = 0;
+}
+#else
+#define clearHistory(x)
+#endif
+
+/*
+** Forward declaration
+*/
+static int syncJournal(Pager*);
+
+/*
+** Unlink pPg from its hash chain. Also set the page number to 0 to indicate
+** that the page is not part of any hash chain. This is required because the
+** sqlite3PagerMovepage() routine can leave a page in the
+** pNextFree/pPrevFree list that is not a part of any hash-chain.
+*/
+static void unlinkHashChain(Pager *pPager, PgHdr *pPg){
+  if( pPg->pgno==0 ){
+    assert( pPg->pNextHash==0 && pPg->pPrevHash==0 );
+    return;
+  }
+  if( pPg->pNextHash ){
+    pPg->pNextHash->pPrevHash = pPg->pPrevHash;
+  }
+  if( pPg->pPrevHash ){
+    assert( pPager->aHash[pPg->pgno & (pPager->nHash-1)]!=pPg );
+    pPg->pPrevHash->pNextHash = pPg->pNextHash;
+  }else{
+    int h = pPg->pgno & (pPager->nHash-1);
+    pPager->aHash[h] = pPg->pNextHash;
+  }
+  if( MEMDB ){
+    clearHistory(PGHDR_TO_HIST(pPg, pPager));
+  }
+  pPg->pgno = 0;
+  pPg->pNextHash = pPg->pPrevHash = 0;
+}
+
+/*
+** Unlink a page from the free list (the list of all pages where nRef==0)
+** and from its hash collision chain.
+*/
+static void unlinkPage(PgHdr *pPg){
+  Pager *pPager = pPg->pPager;
+
+  /* Unlink from free page list */
+  lruListRemove(pPg);
+
+  /* Unlink from the pgno hash table */
+  unlinkHashChain(pPager, pPg);
+}
+
+/*
+** This routine is used to truncate the cache when a database
+** is truncated.  Drop from the cache all pages whose pgno is
+** larger than pPager->dbSize and is unreferenced.
+**
+** Referenced pages larger than pPager->dbSize are zeroed.
+**
+** Actually, at the point this routine is called, it would be
+** an error to have a referenced page.  But rather than delete
+** that page and guarantee a subsequent segfault, it seems better
+** to zero it and hope that we error out sanely.
+*/
+static void pager_truncate_cache(Pager *pPager){
+  PgHdr *pPg;
+  PgHdr **ppPg;
+  int dbSize = pPager->dbSize;
+
+  ppPg = &pPager->pAll;
+  while( (pPg = *ppPg)!=0 ){
+    if( pPg->pgno<=dbSize ){
+      ppPg = &pPg->pNextAll;
+    }else if( pPg->nRef>0 ){
+      memset(PGHDR_TO_DATA(pPg), 0, pPager->pageSize);
+      ppPg = &pPg->pNextAll;
+    }else{
+      *ppPg = pPg->pNextAll;
+      IOTRACE(("PGFREE %p %d\n", pPager, pPg->pgno));
+      PAGER_INCR(sqlite3_pager_pgfree_count);
+      unlinkPage(pPg);
+      makeClean(pPg);
+      sqlite3_free(pPg->pData);
+      sqlite3_free(pPg);
+      pPager->nPage--;
+    }
+  }
+}
+
+/*
+** Try to obtain a lock on a file.  Invoke the busy callback if the lock
+** is currently not available.  Repeat until the busy callback returns
+** false or until the lock succeeds.
+**
+** Return SQLITE_OK on success and an error code if we cannot obtain
+** the lock.
+*/
+static int pager_wait_on_lock(Pager *pPager, int locktype){
+  int rc;
+
+  /* The OS lock values must be the same as the Pager lock values */
+  assert( PAGER_SHARED==SHARED_LOCK );
+  assert( PAGER_RESERVED==RESERVED_LOCK );
+  assert( PAGER_EXCLUSIVE==EXCLUSIVE_LOCK );
+
+  /* If the file is currently unlocked then the size must be unknown */
+  assert( pPager->state>=PAGER_SHARED || pPager->dbSize<0 || MEMDB );
+
+  if( pPager->state>=locktype ){
+    rc = SQLITE_OK;
+  }else{
+    if( pPager->pBusyHandler ) pPager->pBusyHandler->nBusy = 0;
+    do {
+      rc = sqlite3OsLock(pPager->fd, locktype);
+    }while( rc==SQLITE_BUSY && sqlite3InvokeBusyHandler(pPager->pBusyHandler) );
+    if( rc==SQLITE_OK ){
+      pPager->state = locktype;
+      IOTRACE(("LOCK %p %d\n", pPager, locktype))
+    }
+  }
+  return rc;
+}
+
+/*
+** Truncate the file to the number of pages specified.
+*/
+int sqlite3PagerTruncate(Pager *pPager, Pgno nPage){
+  int rc;
+  assert( pPager->state>=PAGER_SHARED || MEMDB );
+  sqlite3PagerPagecount(pPager);
+  if( pPager->errCode ){
+    rc = pPager->errCode;
+    return rc;
+  }
+  if( nPage>=(unsigned)pPager->dbSize ){
+    return SQLITE_OK;
+  }
+  if( MEMDB ){
+    pPager->dbSize = nPage;
+    pager_truncate_cache(pPager);
+    return SQLITE_OK;
+  }
+  pagerEnter(pPager);
+  rc = syncJournal(pPager);
+  pagerLeave(pPager);
+  if( rc!=SQLITE_OK ){
+    return rc;
+  }
+
+  /* Get an exclusive lock on the database before truncating. */
+  pagerEnter(pPager);
+  rc = pager_wait_on_lock(pPager, EXCLUSIVE_LOCK);
+  pagerLeave(pPager);
+  if( rc!=SQLITE_OK ){
+    return rc;
+  }
+
+  rc = pager_truncate(pPager, nPage);
+  return rc;
+}
+
+/*
+** Shutdown the page cache.  Free all memory and close all files.
+**
+** If a transaction was in progress when this routine is called, that
+** transaction is rolled back.  All outstanding pages are invalidated
+** and their memory is freed.  Any attempt to use a page associated
+** with this page cache after this function returns will likely
+** result in a coredump.
+**
+** This function always succeeds. If a transaction is active an attempt
+** is made to roll it back. If an error occurs during the rollback
+** a hot journal may be left in the filesystem but no error is returned
+** to the caller.
+*/
+int sqlite3PagerClose(Pager *pPager){
+#ifdef SQLITE_ENABLE_MEMORY_MANAGEMENT
+  if( !MEMDB ){
+    sqlite3_mutex *mutex = sqlite3_mutex_alloc(SQLITE_MUTEX_STATIC_MEM2);
+    sqlite3_mutex_enter(mutex);
+    if( pPager->pPrev ){
+      pPager->pPrev->pNext = pPager->pNext;
+    }else{
+      sqlite3PagerList = pPager->pNext;
+    }
+    if( pPager->pNext ){
+      pPager->pNext->pPrev = pPager->pPrev;
+    }
+    sqlite3_mutex_leave(mutex);
+  }
+#endif
+
+  disable_simulated_io_errors();
+  pPager->errCode = 0;
+  pPager->exclusiveMode = 0;
+  pager_reset(pPager);
+  pagerUnlockAndRollback(pPager);
+  enable_simulated_io_errors();
+  PAGERTRACE2("CLOSE %d\n", PAGERID(pPager));
+  IOTRACE(("CLOSE %p\n", pPager))
+  assert( pPager->errCode || (pPager->journalOpen==0 && pPager->stmtOpen==0) );
+  if( pPager->journalOpen ){
+    sqlite3OsClose(pPager->jfd);
+  }
+  sqlite3BitvecDestroy(pPager->pInJournal);
+  if( pPager->stmtOpen ){
+    sqlite3OsClose(pPager->stfd);
+  }
+  sqlite3OsClose(pPager->fd);
+  /* Temp files are automatically deleted by the OS
+  ** if( pPager->tempFile ){
+  **   sqlite3OsDelete(pPager->zFilename);
+  ** }
+  */
+
+  sqlite3_free(pPager->aHash);
+  sqlite3_free(pPager->pTmpSpace);
+  sqlite3_free(pPager);
+  return SQLITE_OK;
+}
+
+#if !defined(NDEBUG) || defined(SQLITE_TEST)
+/*
+** Return the page number for the given page data.
+*/
+Pgno sqlite3PagerPagenumber(DbPage *p){
+  return p->pgno;
+}
+#endif
+
+/*
+** The page_ref() function increments the reference count for a page.
+** If the page is currently on the freelist (the reference count is zero) then
+** remove it from the freelist.
+**
+** For non-test systems, page_ref() is a macro that calls _page_ref()
+** online of the reference count is zero.  For test systems, page_ref()
+** is a real function so that we can set breakpoints and trace it.
+*/
+static void _page_ref(PgHdr *pPg){
+  if( pPg->nRef==0 ){
+    /* The page is currently on the freelist.  Remove it. */
+    lruListRemove(pPg);
+    pPg->pPager->nRef++;
+  }
+  pPg->nRef++;
+}
+#ifdef SQLITE_DEBUG
+  static void page_ref(PgHdr *pPg){
+    if( pPg->nRef==0 ){
+      _page_ref(pPg);
+    }else{
+      pPg->nRef++;
+    }
+  }
+#else
+# define page_ref(P)   ((P)->nRef==0?_page_ref(P):(void)(P)->nRef++)
+#endif
+
+/*
+** Increment the reference count for a page.  The input pointer is
+** a reference to the page data.
+*/
+int sqlite3PagerRef(DbPage *pPg){
+  pagerEnter(pPg->pPager);
+  page_ref(pPg);
+  pagerLeave(pPg->pPager);
+  return SQLITE_OK;
+}
+
+/*
+** Sync the journal.  In other words, make sure all the pages that have
+** been written to the journal have actually reached the surface of the
+** disk.  It is not safe to modify the original database file until after
+** the journal has been synced.  If the original database is modified before
+** the journal is synced and a power failure occurs, the unsynced journal
+** data would be lost and we would be unable to completely rollback the
+** database changes.  Database corruption would occur.
+**
+** This routine also updates the nRec field in the header of the journal.
+** (See comments on the pager_playback() routine for additional information.)
+** If the sync mode is FULL, two syncs will occur.  First the whole journal
+** is synced, then the nRec field is updated, then a second sync occurs.
+**
+** For temporary databases, we do not care if we are able to rollback
+** after a power failure, so no sync occurs.
+**
+** If the IOCAP_SEQUENTIAL flag is set for the persistent media on which
+** the database is stored, then OsSync() is never called on the journal
+** file. In this case all that is required is to update the nRec field in
+** the journal header.
+**
+** This routine clears the needSync field of every page current held in
+** memory.
+*/
+static int syncJournal(Pager *pPager){
+  PgHdr *pPg;
+  int rc = SQLITE_OK;
+
+
+  /* Sync the journal before modifying the main database
+  ** (assuming there is a journal and it needs to be synced.)
+  */
+  if( pPager->needSync ){
+    if( !pPager->tempFile ){
+      int iDc = sqlite3OsDeviceCharacteristics(pPager->fd);
+      assert( pPager->journalOpen );
+
+      /* assert( !pPager->noSync ); // noSync might be set if synchronous
+      ** was turned off after the transaction was started.  Ticket #615 */
+#ifndef NDEBUG
+      {
+        /* Make sure the pPager->nRec counter we are keeping agrees
+        ** with the nRec computed from the size of the journal file.
+        */
+        i64 jSz;
+        rc = sqlite3OsFileSize(pPager->jfd, &jSz);
+        if( rc!=0 ) return rc;
+        assert( pPager->journalOff==jSz );
+      }
+#endif
+      if( 0==(iDc&SQLITE_IOCAP_SAFE_APPEND) ){
+        /* Write the nRec value into the journal file header. If in
+        ** full-synchronous mode, sync the journal first. This ensures that
+        ** all data has really hit the disk before nRec is updated to mark
+        ** it as a candidate for rollback.
+        **
+        ** This is not required if the persistent media supports the
+        ** SAFE_APPEND property. Because in this case it is not possible
+        ** for garbage data to be appended to the file, the nRec field
+        ** is populated with 0xFFFFFFFF when the journal header is written
+        ** and never needs to be updated.
+        */
+        i64 jrnlOff;
+        if( pPager->fullSync && 0==(iDc&SQLITE_IOCAP_SEQUENTIAL) ){
+          PAGERTRACE2("SYNC journal of %d\n", PAGERID(pPager));
+          IOTRACE(("JSYNC %p\n", pPager))
+          rc = sqlite3OsSync(pPager->jfd, pPager->sync_flags);
+          if( rc!=0 ) return rc;
+        }
+
+        jrnlOff = pPager->journalHdr + sizeof(aJournalMagic);
+        IOTRACE(("JHDR %p %lld %d\n", pPager, jrnlOff, 4));
+        rc = write32bits(pPager->jfd, jrnlOff, pPager->nRec);
+        if( rc ) return rc;
+      }
+      if( 0==(iDc&SQLITE_IOCAP_SEQUENTIAL) ){
+        PAGERTRACE2("SYNC journal of %d\n", PAGERID(pPager));
+        IOTRACE(("JSYNC %p\n", pPager))
+        rc = sqlite3OsSync(pPager->jfd, pPager->sync_flags|
+          (pPager->sync_flags==SQLITE_SYNC_FULL?SQLITE_SYNC_DATAONLY:0)
+        );
+        if( rc!=0 ) return rc;
+      }
+      pPager->journalStarted = 1;
+    }
+    pPager->needSync = 0;
+
+    /* Erase the needSync flag from every page.
+    */
+    for(pPg=pPager->pAll; pPg; pPg=pPg->pNextAll){
+      pPg->needSync = 0;
+    }
+    lruListSetFirstSynced(pPager);
+  }
+
+#ifndef NDEBUG
+  /* If the Pager.needSync flag is clear then the PgHdr.needSync
+  ** flag must also be clear for all pages.  Verify that this
+  ** invariant is true.
+  */
+  else{
+    for(pPg=pPager->pAll; pPg; pPg=pPg->pNextAll){
+      assert( pPg->needSync==0 );
+    }
+    assert( pPager->lru.pFirstSynced==pPager->lru.pFirst );
+  }
+#endif
+
+  return rc;
+}
+
+/*
+** Merge two lists of pages connected by pDirty and in pgno order.
+** Do not both fixing the pPrevDirty pointers.
+*/
+static PgHdr *merge_pagelist(PgHdr *pA, PgHdr *pB){
+  PgHdr result, *pTail;
+  pTail = &result;
+  while( pA && pB ){
+    if( pA->pgno<pB->pgno ){
+      pTail->pDirty = pA;
+      pTail = pA;
+      pA = pA->pDirty;
+    }else{
+      pTail->pDirty = pB;
+      pTail = pB;
+      pB = pB->pDirty;
+    }
+  }
+  if( pA ){
+    pTail->pDirty = pA;
+  }else if( pB ){
+    pTail->pDirty = pB;
+  }else{
+    pTail->pDirty = 0;
+  }
+  return result.pDirty;
+}
+
+/*
+** Sort the list of pages in accending order by pgno.  Pages are
+** connected by pDirty pointers.  The pPrevDirty pointers are
+** corrupted by this sort.
+*/
+#define N_SORT_BUCKET_ALLOC 25
+#define N_SORT_BUCKET       25
+#ifdef SQLITE_TEST
+  int sqlite3_pager_n_sort_bucket = 0;
+  #undef N_SORT_BUCKET
+  #define N_SORT_BUCKET \
+   (sqlite3_pager_n_sort_bucket?sqlite3_pager_n_sort_bucket:N_SORT_BUCKET_ALLOC)
+#endif
+static PgHdr *sort_pagelist(PgHdr *pIn){
+  PgHdr *a[N_SORT_BUCKET_ALLOC], *p;
+  int i;
+  memset(a, 0, sizeof(a));
+  while( pIn ){
+    p = pIn;
+    pIn = p->pDirty;
+    p->pDirty = 0;
+    for(i=0; i<N_SORT_BUCKET-1; i++){
+      if( a[i]==0 ){
+        a[i] = p;
+        break;
+      }else{
+        p = merge_pagelist(a[i], p);
+        a[i] = 0;
+      }
+    }
+    if( i==N_SORT_BUCKET-1 ){
+      /* Coverage: To get here, there need to be 2^(N_SORT_BUCKET)
+      ** elements in the input list. This is possible, but impractical.
+      ** Testing this line is the point of global variable
+      ** sqlite3_pager_n_sort_bucket.
+      */
+      a[i] = merge_pagelist(a[i], p);
+    }
+  }
+  p = a[0];
+  for(i=1; i<N_SORT_BUCKET; i++){
+    p = merge_pagelist(p, a[i]);
+  }
+  return p;
+}
+
+/*
+** Given a list of pages (connected by the PgHdr.pDirty pointer) write
+** every one of those pages out to the database file and mark them all
+** as clean.
+*/
+static int pager_write_pagelist(PgHdr *pList){
+  Pager *pPager;
+  PgHdr *p;
+  int rc;
+
+  if( pList==0 ) return SQLITE_OK;
+  pPager = pList->pPager;
+
+  /* At this point there may be either a RESERVED or EXCLUSIVE lock on the
+  ** database file. If there is already an EXCLUSIVE lock, the following
+  ** calls to sqlite3OsLock() are no-ops.
+  **
+  ** Moving the lock from RESERVED to EXCLUSIVE actually involves going
+  ** through an intermediate state PENDING.   A PENDING lock prevents new
+  ** readers from attaching to the database but is unsufficient for us to
+  ** write.  The idea of a PENDING lock is to prevent new readers from
+  ** coming in while we wait for existing readers to clear.
+  **
+  ** While the pager is in the RESERVED state, the original database file
+  ** is unchanged and we can rollback without having to playback the
+  ** journal into the original database file.  Once we transition to
+  ** EXCLUSIVE, it means the database file has been changed and any rollback
+  ** will require a journal playback.
+  */
+  rc = pager_wait_on_lock(pPager, EXCLUSIVE_LOCK);
+  if( rc!=SQLITE_OK ){
+    return rc;
+  }
+
+  pList = sort_pagelist(pList);
+  for(p=pList; p; p=p->pDirty){
+    assert( p->dirty );
+    p->dirty = 0;
+  }
+  while( pList ){
+
+    /* If the file has not yet been opened, open it now. */
+    if( !pPager->fd->pMethods ){
+      assert(pPager->tempFile);
+      rc = sqlite3PagerOpentemp(pPager->pVfs, pPager->fd, pPager->zFilename,
+                                pPager->vfsFlags);
+      if( rc ) return rc;
+    }
+
+    /* If there are dirty pages in the page cache with page numbers greater
+    ** than Pager.dbSize, this means sqlite3PagerTruncate() was called to
+    ** make the file smaller (presumably by auto-vacuum code). Do not write
+    ** any such pages to the file.
+    */
+    if( pList->pgno<=pPager->dbSize ){
+      i64 offset = (pList->pgno-1)*(i64)pPager->pageSize;
+      char *pData = CODEC2(pPager, PGHDR_TO_DATA(pList), pList->pgno, 6);
+      PAGERTRACE4("STORE %d page %d hash(%08x)\n",
+                   PAGERID(pPager), pList->pgno, pager_pagehash(pList));
+      IOTRACE(("PGOUT %p %d\n", pPager, pList->pgno));
+      rc = sqlite3OsWrite(pPager->fd, pData, pPager->pageSize, offset);
+      PAGER_INCR(sqlite3_pager_writedb_count);
+      PAGER_INCR(pPager->nWrite);
+      if( pList->pgno==1 ){
+        memcpy(&pPager->dbFileVers, &pData[24], sizeof(pPager->dbFileVers));
+      }
+    }
+#ifndef NDEBUG
+    else{
+      PAGERTRACE3("NOSTORE %d page %d\n", PAGERID(pPager), pList->pgno);
+    }
+#endif
+    if( rc ) return rc;
+#ifdef SQLITE_CHECK_PAGES
+    pList->pageHash = pager_pagehash(pList);
+#endif
+    pList = pList->pDirty;
+  }
+  return SQLITE_OK;
+}
+
+/*
+** Collect every dirty page into a dirty list and
+** return a pointer to the head of that list.  All pages are
+** collected even if they are still in use.
+*/
+static PgHdr *pager_get_all_dirty_pages(Pager *pPager){
+
+#ifndef NDEBUG
+  /* Verify the sanity of the dirty list when we are running
+  ** in debugging mode.  This is expensive, so do not
+  ** do this on a normal build. */
+  int n1 = 0;
+  int n2 = 0;
+  PgHdr *p;
+  for(p=pPager->pAll; p; p=p->pNextAll){ if( p->dirty ) n1++; }
+  for(p=pPager->pDirty; p; p=p->pDirty){ n2++; }
+  assert( n1==n2 );
+#endif
+
+  return pPager->pDirty;
+}
+
+/*
+** Return TRUE if there is a hot journal on the given pager.
+** A hot journal is one that needs to be played back.
+**
+** If the current size of the database file is 0 but a journal file
+** exists, that is probably an old journal left over from a prior
+** database with the same name.  Just delete the journal.
+*/
+static int hasHotJournal(Pager *pPager){
+  sqlite3_vfs *pVfs = pPager->pVfs;
+  if( !pPager->useJournal ) return 0;
+  if( !pPager->fd->pMethods ) return 0;
+  if( !sqlite3OsAccess(pVfs, pPager->zJournal, SQLITE_ACCESS_EXISTS) ){
+    return 0;
+  }
+  if( sqlite3OsCheckReservedLock(pPager->fd) ){
+    return 0;
+  }
+  if( sqlite3PagerPagecount(pPager)==0 ){
+    sqlite3OsDelete(pVfs, pPager->zJournal, 0);
+    return 0;
+  }else{
+    return 1;
+  }
+}
+
+/*
+** Try to find a page in the cache that can be recycled.
+**
+** This routine may return SQLITE_IOERR, SQLITE_FULL or SQLITE_OK. It
+** does not set the pPager->errCode variable.
+*/
+static int pager_recycle(Pager *pPager, PgHdr **ppPg){
+  PgHdr *pPg;
+  *ppPg = 0;
+
+  /* It is illegal to call this function unless the pager object
+  ** pointed to by pPager has at least one free page (page with nRef==0).
+  */
+  assert(!MEMDB);
+  assert(pPager->lru.pFirst);
+
+  /* Find a page to recycle.  Try to locate a page that does not
+  ** require us to do an fsync() on the journal.
+  */
+  pPg = pPager->lru.pFirstSynced;
+
+  /* If we could not find a page that does not require an fsync()
+  ** on the journal file then fsync the journal file.  This is a
+  ** very slow operation, so we work hard to avoid it.  But sometimes
+  ** it can't be helped.
+  */
+  if( pPg==0 && pPager->lru.pFirst){
+    int iDc = sqlite3OsDeviceCharacteristics(pPager->fd);
+    int rc = syncJournal(pPager);
+    if( rc!=0 ){
+      return rc;
+    }
+    if( pPager->fullSync && 0==(iDc&SQLITE_IOCAP_SAFE_APPEND) ){
+      /* If in full-sync mode, write a new journal header into the
+      ** journal file. This is done to avoid ever modifying a journal
+      ** header that is involved in the rollback of pages that have
+      ** already been written to the database (in case the header is
+      ** trashed when the nRec field is updated).
+      */
+      pPager->nRec = 0;
+      assert( pPager->journalOff > 0 );
+      assert( pPager->doNotSync==0 );
+      rc = writeJournalHdr(pPager);
+      if( rc!=0 ){
+        return rc;
+      }
+    }
+    pPg = pPager->lru.pFirst;
+  }
+
+  assert( pPg->nRef==0 );
+
+  /* Write the page to the database file if it is dirty.
+  */
+  if( pPg->dirty ){
+    int rc;
+    assert( pPg->needSync==0 );
+    makeClean(pPg);
+    pPg->dirty = 1;
+    pPg->pDirty = 0;
+    rc = pager_write_pagelist( pPg );
+    pPg->dirty = 0;
+    if( rc!=SQLITE_OK ){
+      return rc;
+    }
+  }
+  assert( pPg->dirty==0 );
+
+  /* If the page we are recycling is marked as alwaysRollback, then
+  ** set the global alwaysRollback flag, thus disabling the
+  ** sqlite3PagerDontRollback() optimization for the rest of this transaction.
+  ** It is necessary to do this because the page marked alwaysRollback
+  ** might be reloaded at a later time but at that point we won't remember
+  ** that is was marked alwaysRollback.  This means that all pages must
+  ** be marked as alwaysRollback from here on out.
+  */
+  if( pPg->alwaysRollback ){
+    IOTRACE(("ALWAYS_ROLLBACK %p\n", pPager))
+    pPager->alwaysRollback = 1;
+  }
+
+  /* Unlink the old page from the free list and the hash table
+  */
+  unlinkPage(pPg);
+  assert( pPg->pgno==0 );
+
+  *ppPg = pPg;
+  return SQLITE_OK;
+}
+
+#ifdef SQLITE_ENABLE_MEMORY_MANAGEMENT
+/*
+** This function is called to free superfluous dynamically allocated memory
+** held by the pager system. Memory in use by any SQLite pager allocated
+** by the current thread may be sqlite3_free()ed.
+**
+** nReq is the number of bytes of memory required. Once this much has
+** been released, the function returns. The return value is the total number
+** of bytes of memory released.
+*/
+int sqlite3PagerReleaseMemory(int nReq){
+  int nReleased = 0;          /* Bytes of memory released so far */
+  sqlite3_mutex *mutex;       /* The MEM2 mutex */
+  Pager *pPager;              /* For looping over pagers */
+  BusyHandler *savedBusy;     /* Saved copy of the busy handler */
+  int rc = SQLITE_OK;
+
+  /* Acquire the memory-management mutex
+  */
+  mutex = sqlite3_mutex_alloc(SQLITE_MUTEX_STATIC_MEM2);
+  sqlite3_mutex_enter(mutex);
+
+  /* Signal all database connections that memory management wants
+  ** to have access to the pagers.
+  */
+  for(pPager=sqlite3PagerList; pPager; pPager=pPager->pNext){
+     pPager->iInUseMM = 1;
+  }
+
+  while( rc==SQLITE_OK && (nReq<0 || nReleased<nReq) ){
+    PgHdr *pPg;
+    PgHdr *pRecycled;
+
+    /* Try to find a page to recycle that does not require a sync(). If
+    ** this is not possible, find one that does require a sync().
+    */
+    sqlite3_mutex_enter(sqlite3_mutex_alloc(SQLITE_MUTEX_STATIC_LRU));
+    pPg = sqlite3LruPageList.pFirstSynced;
+    while( pPg && (pPg->needSync || pPg->pPager->iInUseDB) ){
+      pPg = pPg->gfree.pNext;
+    }
+    if( !pPg ){
+      pPg = sqlite3LruPageList.pFirst;
+      while( pPg && pPg->pPager->iInUseDB ){
+        pPg = pPg->gfree.pNext;
+      }
+    }
+    sqlite3_mutex_leave(sqlite3_mutex_alloc(SQLITE_MUTEX_STATIC_LRU));
+
+    /* If pPg==0, then the block above has failed to find a page to
+    ** recycle. In this case return early - no further memory will
+    ** be released.
+    */
+    if( !pPg ) break;
+
+    pPager = pPg->pPager;
+    assert(!pPg->needSync || pPg==pPager->lru.pFirst);
+    assert(pPg->needSync || pPg==pPager->lru.pFirstSynced);
+
+    savedBusy = pPager->pBusyHandler;
+    pPager->pBusyHandler = 0;
+    rc = pager_recycle(pPager, &pRecycled);
+    pPager->pBusyHandler = savedBusy;
+    assert(pRecycled==pPg || rc!=SQLITE_OK);
+    if( rc==SQLITE_OK ){
+      /* We've found a page to free. At this point the page has been
+      ** removed from the page hash-table, free-list and synced-list
+      ** (pFirstSynced). It is still in the all pages (pAll) list.
+      ** Remove it from this list before freeing.
+      **
+      ** Todo: Check the Pager.pStmt list to make sure this is Ok. It
+      ** probably is though.
+      */
+      PgHdr *pTmp;
+      assert( pPg );
+      if( pPg==pPager->pAll ){
+         pPager->pAll = pPg->pNextAll;
+      }else{
+        for( pTmp=pPager->pAll; pTmp->pNextAll!=pPg; pTmp=pTmp->pNextAll ){}
+        pTmp->pNextAll = pPg->pNextAll;
+      }
+      nReleased += (
+          sizeof(*pPg) + pPager->pageSize
+          + sizeof(u32) + pPager->nExtra
+          + MEMDB*sizeof(PgHistory)
+      );
+      IOTRACE(("PGFREE %p %d *\n", pPager, pPg->pgno));
+      PAGER_INCR(sqlite3_pager_pgfree_count);
+      sqlite3_free(pPg->pData);
+      sqlite3_free(pPg);
+      pPager->nPage--;
+    }else{
+      /* An error occured whilst writing to the database file or
+      ** journal in pager_recycle(). The error is not returned to the
+      ** caller of this function. Instead, set the Pager.errCode variable.
+      ** The error will be returned to the user (or users, in the case
+      ** of a shared pager cache) of the pager for which the error occured.
+      */
+      assert(
+          (rc&0xff)==SQLITE_IOERR ||
+          rc==SQLITE_FULL ||
+          rc==SQLITE_BUSY
+      );
+      assert( pPager->state>=PAGER_RESERVED );
+      pager_error(pPager, rc);
+    }
+  }
+
+  /* Clear the memory management flags and release the mutex
+  */
+  for(pPager=sqlite3PagerList; pPager; pPager=pPager->pNext){
+     pPager->iInUseMM = 0;
+  }
+  sqlite3_mutex_leave(mutex);
+
+  /* Return the number of bytes released
+  */
+  return nReleased;
+}
+#endif /* SQLITE_ENABLE_MEMORY_MANAGEMENT */
+
+/*
+** Read the content of page pPg out of the database file.
+*/
+static int readDbPage(Pager *pPager, PgHdr *pPg, Pgno pgno){
+  int rc;
+  i64 offset;
+  assert( MEMDB==0 );
+  assert(pPager->fd->pMethods||pPager->tempFile);
+  if( !pPager->fd->pMethods ){
+    return SQLITE_IOERR_SHORT_READ;
+  }
+  offset = (pgno-1)*(i64)pPager->pageSize;
+  rc = sqlite3OsRead(pPager->fd, PGHDR_TO_DATA(pPg), pPager->pageSize, offset);
+  PAGER_INCR(sqlite3_pager_readdb_count);
+  PAGER_INCR(pPager->nRead);
+  IOTRACE(("PGIN %p %d\n", pPager, pgno));
+  if( pgno==1 ){
+    memcpy(&pPager->dbFileVers, &((u8*)PGHDR_TO_DATA(pPg))[24],
+                                              sizeof(pPager->dbFileVers));
+  }
+  CODEC1(pPager, PGHDR_TO_DATA(pPg), pPg->pgno, 3);
+  PAGERTRACE4("FETCH %d page %d hash(%08x)\n",
+               PAGERID(pPager), pPg->pgno, pager_pagehash(pPg));
+  return rc;
+}
+
+
+/*
+** This function is called to obtain the shared lock required before
+** data may be read from the pager cache. If the shared lock has already
+** been obtained, this function is a no-op.
+**
+** Immediately after obtaining the shared lock (if required), this function
+** checks for a hot-journal file. If one is found, an emergency rollback
+** is performed immediately.
+*/
+static int pagerSharedLock(Pager *pPager){
+  int rc = SQLITE_OK;
+  int isHot = 0;
+
+  /* If this database is opened for exclusive access, has no outstanding
+  ** page references and is in an error-state, now is the chance to clear
+  ** the error. Discard the contents of the pager-cache and treat any
+  ** open journal file as a hot-journal.
+  */
+  if( !MEMDB && pPager->exclusiveMode && pPager->nRef==0 && pPager->errCode ){
+    if( pPager->journalOpen ){
+      isHot = 1;
+    }
+    pager_reset(pPager);
+    pPager->errCode = SQLITE_OK;
+  }
+
+  /* If the pager is still in an error state, do not proceed. The error
+  ** state will be cleared at some point in the future when all page
+  ** references are dropped and the cache can be discarded.
+  */
+  if( pPager->errCode && pPager->errCode!=SQLITE_FULL ){
+    return pPager->errCode;
+  }
+
+  if( pPager->state==PAGER_UNLOCK || isHot ){
+    sqlite3_vfs *pVfs = pPager->pVfs;
+    if( !MEMDB ){
+      assert( pPager->nRef==0 );
+      if( !pPager->noReadlock ){
+        rc = pager_wait_on_lock(pPager, SHARED_LOCK);
+        if( rc!=SQLITE_OK ){
+          return pager_error(pPager, rc);
+        }
+        assert( pPager->state>=SHARED_LOCK );
+      }
+
+      /* If a journal file exists, and there is no RESERVED lock on the
+      ** database file, then it either needs to be played back or deleted.
+      */
+      if( hasHotJournal(pPager) || isHot ){
+        /* Get an EXCLUSIVE lock on the database file. At this point it is
+        ** important that a RESERVED lock is not obtained on the way to the
+        ** EXCLUSIVE lock. If it were, another process might open the
+        ** database file, detect the RESERVED lock, and conclude that the
+        ** database is safe to read while this process is still rolling it
+        ** back.
+        **
+        ** Because the intermediate RESERVED lock is not requested, the
+        ** second process will get to this point in the code and fail to
+        ** obtain its own EXCLUSIVE lock on the database file.
+        */
+        if( pPager->state<EXCLUSIVE_LOCK ){
+          rc = sqlite3OsLock(pPager->fd, EXCLUSIVE_LOCK);
+          if( rc!=SQLITE_OK ){
+            pager_unlock(pPager);
+            return pager_error(pPager, rc);
+          }
+          pPager->state = PAGER_EXCLUSIVE;
+        }
+
+        /* Open the journal for reading only.  Return SQLITE_BUSY if
+        ** we are unable to open the journal file.
+        **
+        ** The journal file does not need to be locked itself.  The
+        ** journal file is never open unless the main database file holds
+        ** a write lock, so there is never any chance of two or more
+        ** processes opening the journal at the same time.
+        **
+        ** Open the journal for read/write access. This is because in
+        ** exclusive-access mode the file descriptor will be kept open and
+        ** possibly used for a transaction later on. On some systems, the
+        ** OsTruncate() call used in exclusive-access mode also requires
+        ** a read/write file handle.
+        */
+        if( !isHot ){
+          rc = SQLITE_BUSY;
+          if( sqlite3OsAccess(pVfs, pPager->zJournal, SQLITE_ACCESS_EXISTS) ){
+            int fout = 0;
+            int f = SQLITE_OPEN_READWRITE|SQLITE_OPEN_MAIN_JOURNAL;
+            assert( !pPager->tempFile );
+            rc = sqlite3OsOpen(pVfs, pPager->zJournal, pPager->jfd, f, &fout);
+            assert( rc!=SQLITE_OK || pPager->jfd->pMethods );
+            if( fout&SQLITE_OPEN_READONLY ){
+              rc = SQLITE_BUSY;
+              sqlite3OsClose(pPager->jfd);
+            }
+          }
+        }
+        if( rc!=SQLITE_OK ){
+          pager_unlock(pPager);
+          switch( rc ){
+            case SQLITE_NOMEM:
+            case SQLITE_IOERR_UNLOCK:
+            case SQLITE_IOERR_NOMEM:
+              return rc;
+            default:
+              return SQLITE_BUSY;
+          }
+        }
+        pPager->journalOpen = 1;
+        pPager->journalStarted = 0;
+        pPager->journalOff = 0;
+        pPager->setMaster = 0;
+        pPager->journalHdr = 0;
+
+        /* Playback and delete the journal.  Drop the database write
+        ** lock and reacquire the read lock.
+        */
+        rc = pager_playback(pPager, 1);
+        if( rc!=SQLITE_OK ){
+          return pager_error(pPager, rc);
+        }
+        assert(pPager->state==PAGER_SHARED ||
+            (pPager->exclusiveMode && pPager->state>PAGER_SHARED)
+        );
+      }
+
+      if( pPager->pAll ){
+        /* The shared-lock has just been acquired on the database file
+        ** and there are already pages in the cache (from a previous
+        ** read or write transaction).  Check to see if the database
+        ** has been modified.  If the database has changed, flush the
+        ** cache.
+        **
+        ** Database changes is detected by looking at 15 bytes beginning
+        ** at offset 24 into the file.  The first 4 of these 16 bytes are
+        ** a 32-bit counter that is incremented with each change.  The
+        ** other bytes change randomly with each file change when
+        ** a codec is in use.
+        **
+        ** There is a vanishingly small chance that a change will not be
+        ** detected.  The chance of an undetected change is so small that
+        ** it can be neglected.
+        */
+        char dbFileVers[sizeof(pPager->dbFileVers)];
+        sqlite3PagerPagecount(pPager);
+
+        if( pPager->errCode ){
+          return pPager->errCode;
+        }
+
+        if( pPager->dbSize>0 ){
+          IOTRACE(("CKVERS %p %d\n", pPager, sizeof(dbFileVers)));
+          rc = sqlite3OsRead(pPager->fd, &dbFileVers, sizeof(dbFileVers), 24);
+          if( rc!=SQLITE_OK ){
+            return rc;
+          }
+        }else{
+          memset(dbFileVers, 0, sizeof(dbFileVers));
+        }
+
+        if( memcmp(pPager->dbFileVers, dbFileVers, sizeof(dbFileVers))!=0 ){
+          pager_reset(pPager);
+        }
+      }
+    }
+    assert( pPager->exclusiveMode || pPager->state<=PAGER_SHARED );
+    if( pPager->state==PAGER_UNLOCK ){
+      pPager->state = PAGER_SHARED;
+    }
+  }
+
+  return rc;
+}
+
+/*
+** Allocate a PgHdr object.   Either create a new one or reuse
+** an existing one that is not otherwise in use.
+**
+** A new PgHdr structure is created if any of the following are
+** true:
+**
+**     (1)  We have not exceeded our maximum allocated cache size
+**          as set by the "PRAGMA cache_size" command.
+**
+**     (2)  There are no unused PgHdr objects available at this time.
+**
+**     (3)  This is an in-memory database.
+**
+**     (4)  There are no PgHdr objects that do not require a journal
+**          file sync and a sync of the journal file is currently
+**          prohibited.
+**
+** Otherwise, reuse an existing PgHdr.  In other words, reuse an
+** existing PgHdr if all of the following are true:
+**
+**     (1)  We have reached or exceeded the maximum cache size
+**          allowed by "PRAGMA cache_size".
+**
+**     (2)  There is a PgHdr available with PgHdr->nRef==0
+**
+**     (3)  We are not in an in-memory database
+**
+**     (4)  Either there is an available PgHdr that does not need
+**          to be synced to disk or else disk syncing is currently
+**          allowed.
+*/
+static int pagerAllocatePage(Pager *pPager, PgHdr **ppPg){
+  int rc = SQLITE_OK;
+  PgHdr *pPg;
+  int nByteHdr;
+
+  /* Create a new PgHdr if any of the four conditions defined
+  ** above are met: */
+  if( pPager->nPage<pPager->mxPage
+   || pPager->lru.pFirst==0
+   || MEMDB
+   || (pPager->lru.pFirstSynced==0 && pPager->doNotSync)
+  ){
+    void *pData;
+    if( pPager->nPage>=pPager->nHash ){
+      pager_resize_hash_table(pPager,
+         pPager->nHash<256 ? 256 : pPager->nHash*2);
+      if( pPager->nHash==0 ){
+        rc = SQLITE_NOMEM;
+        goto pager_allocate_out;
+      }
+    }
+    pagerLeave(pPager);
+    nByteHdr = sizeof(*pPg) + sizeof(u32) + pPager->nExtra
+              + MEMDB*sizeof(PgHistory);
+    pPg = sqlite3_malloc( nByteHdr );
+    if( pPg ){
+      pData = sqlite3_malloc( pPager->pageSize );
+      if( pData==0 ){
+        sqlite3_free(pPg);
+        pPg = 0;
+      }
+    }
+    pagerEnter(pPager);
+    if( pPg==0 ){
+      rc = SQLITE_NOMEM;
+      goto pager_allocate_out;
+    }
+    memset(pPg, 0, nByteHdr);
+    pPg->pData = pData;
+    pPg->pPager = pPager;
+    pPg->pNextAll = pPager->pAll;
+    pPager->pAll = pPg;
+    pPager->nPage++;
+  }else{
+    /* Recycle an existing page with a zero ref-count. */
+    rc = pager_recycle(pPager, &pPg);
+    if( rc==SQLITE_BUSY ){
+      rc = SQLITE_IOERR_BLOCKED;
+    }
+    if( rc!=SQLITE_OK ){
+      goto pager_allocate_out;
+    }
+    assert( pPager->state>=SHARED_LOCK );
+    assert(pPg);
+  }
+  *ppPg = pPg;
+
+pager_allocate_out:
+  return rc;
+}
+
+/*
+** Make sure we have the content for a page.  If the page was
+** previously acquired with noContent==1, then the content was
+** just initialized to zeros instead of being read from disk.
+** But now we need the real data off of disk.  So make sure we
+** have it.  Read it in if we do not have it already.
+*/
+static int pager_get_content(PgHdr *pPg){
+  if( pPg->needRead ){
+    int rc = readDbPage(pPg->pPager, pPg, pPg->pgno);
+    if( rc==SQLITE_OK ){
+      pPg->needRead = 0;
+    }else{
+      return rc;
+    }
+  }
+  return SQLITE_OK;
+}
+
+/*
+** Acquire a page.
+**
+** A read lock on the disk file is obtained when the first page is acquired.
+** This read lock is dropped when the last page is released.
+**
+** This routine works for any page number greater than 0.  If the database
+** file is smaller than the requested page, then no actual disk
+** read occurs and the memory image of the page is initialized to
+** all zeros.  The extra data appended to a page is always initialized
+** to zeros the first time a page is loaded into memory.
+**
+** The acquisition might fail for several reasons.  In all cases,
+** an appropriate error code is returned and *ppPage is set to NULL.
+**
+** See also sqlite3PagerLookup().  Both this routine and Lookup() attempt
+** to find a page in the in-memory cache first.  If the page is not already
+** in memory, this routine goes to disk to read it in whereas Lookup()
+** just returns 0.  This routine acquires a read-lock the first time it
+** has to go to disk, and could also playback an old journal if necessary.
+** Since Lookup() never goes to disk, it never has to deal with locks
+** or journal files.
+**
+** If noContent is false, the page contents are actually read from disk.
+** If noContent is true, it means that we do not care about the contents
+** of the page at this time, so do not do a disk read.  Just fill in the
+** page content with zeros.  But mark the fact that we have not read the
+** content by setting the PgHdr.needRead flag.  Later on, if
+** sqlite3PagerWrite() is called on this page or if this routine is
+** called again with noContent==0, that means that the content is needed
+** and the disk read should occur at that point.
+*/
+static int pagerAcquire(
+  Pager *pPager,      /* The pager open on the database file */
+  Pgno pgno,          /* Page number to fetch */
+  DbPage **ppPage,    /* Write a pointer to the page here */
+  int noContent       /* Do not bother reading content from disk if true */
+){
+  PgHdr *pPg;
+  int rc;
+
+  assert( pPager->state==PAGER_UNLOCK || pPager->nRef>0 || pgno==1 );
+
+  /* The maximum page number is 2^31. Return SQLITE_CORRUPT if a page
+  ** number greater than this, or zero, is requested.
+  */
+  if( pgno>PAGER_MAX_PGNO || pgno==0 || pgno==PAGER_MJ_PGNO(pPager) ){
+    return SQLITE_CORRUPT_BKPT;
+  }
+
+  /* Make sure we have not hit any critical errors.
+  */
+  assert( pPager!=0 );
+  *ppPage = 0;
+
+  /* If this is the first page accessed, then get a SHARED lock
+  ** on the database file. pagerSharedLock() is a no-op if
+  ** a database lock is already held.
+  */
+  rc = pagerSharedLock(pPager);
+  if( rc!=SQLITE_OK ){
+    return rc;
+  }
+  assert( pPager->state!=PAGER_UNLOCK );
+
+  pPg = pager_lookup(pPager, pgno);
+  if( pPg==0 ){
+    /* The requested page is not in the page cache. */
+    int nMax;
+    int h;
+    PAGER_INCR(pPager->nMiss);
+    rc = pagerAllocatePage(pPager, &pPg);
+    if( rc!=SQLITE_OK ){
+      return rc;
+    }
+
+    pPg->pgno = pgno;
+    assert( !MEMDB || pgno>pPager->stmtSize );
+    pPg->inJournal = sqlite3BitvecTest(pPager->pInJournal, pgno);
+    pPg->needSync = 0;
+
+    makeClean(pPg);
+    pPg->nRef = 1;
+
+    pPager->nRef++;
+    if( pPager->nExtra>0 ){
+      memset(PGHDR_TO_EXTRA(pPg, pPager), 0, pPager->nExtra);
+    }
+    nMax = sqlite3PagerPagecount(pPager);
+    if( pPager->errCode ){
+      rc = pPager->errCode;
+      sqlite3PagerUnref(pPg);
+      return rc;
+    }
+
+    /* Populate the page with data, either by reading from the database
+    ** file, or by setting the entire page to zero.
+    */
+    if( nMax<(int)pgno || MEMDB || (noContent && !pPager->alwaysRollback) ){
+      if( pgno>pPager->mxPgno ){
+        sqlite3PagerUnref(pPg);
+        return SQLITE_FULL;
+      }
+      memset(PGHDR_TO_DATA(pPg), 0, pPager->pageSize);
+      pPg->needRead = noContent && !pPager->alwaysRollback;
+      IOTRACE(("ZERO %p %d\n", pPager, pgno));
+    }else{
+      rc = readDbPage(pPager, pPg, pgno);
+      if( rc!=SQLITE_OK && rc!=SQLITE_IOERR_SHORT_READ ){
+        pPg->pgno = 0;
+        sqlite3PagerUnref(pPg);
+        return rc;
+      }
+      pPg->needRead = 0;
+    }
+
+    /* Link the page into the page hash table */
+    h = pgno & (pPager->nHash-1);
+    assert( pgno!=0 );
+    pPg->pNextHash = pPager->aHash[h];
+    pPager->aHash[h] = pPg;
+    if( pPg->pNextHash ){
+      assert( pPg->pNextHash->pPrevHash==0 );
+      pPg->pNextHash->pPrevHash = pPg;
+    }
+
+#ifdef SQLITE_CHECK_PAGES
+    pPg->pageHash = pager_pagehash(pPg);
+#endif
+  }else{
+    /* The requested page is in the page cache. */
+    assert(pPager->nRef>0 || pgno==1);
+    PAGER_INCR(pPager->nHit);
+    if( !noContent ){
+      rc = pager_get_content(pPg);
+      if( rc ){
+        return rc;
+      }
+    }
+    page_ref(pPg);
+  }
+  *ppPage = pPg;
+  return SQLITE_OK;
+}
+int sqlite3PagerAcquire(
+  Pager *pPager,      /* The pager open on the database file */
+  Pgno pgno,          /* Page number to fetch */
+  DbPage **ppPage,    /* Write a pointer to the page here */
+  int noContent       /* Do not bother reading content from disk if true */
+){
+  int rc;
+  pagerEnter(pPager);
+  rc = pagerAcquire(pPager, pgno, ppPage, noContent);
+  pagerLeave(pPager);
+  return rc;
+}
+
+
+/*
+** Acquire a page if it is already in the in-memory cache.  Do
+** not read the page from disk.  Return a pointer to the page,
+** or 0 if the page is not in cache.
+**
+** See also sqlite3PagerGet().  The difference between this routine
+** and sqlite3PagerGet() is that _get() will go to the disk and read
+** in the page if the page is not already in cache.  This routine
+** returns NULL if the page is not in cache or if a disk I/O error
+** has ever happened.
+*/
+DbPage *sqlite3PagerLookup(Pager *pPager, Pgno pgno){
+  PgHdr *pPg = 0;
+
+  assert( pPager!=0 );
+  assert( pgno!=0 );
+
+  pagerEnter(pPager);
+  if( pPager->state==PAGER_UNLOCK ){
+    assert( !pPager->pAll || pPager->exclusiveMode );
+  }else if( pPager->errCode && pPager->errCode!=SQLITE_FULL ){
+    /* Do nothing */
+  }else if( (pPg = pager_lookup(pPager, pgno))!=0 ){
+    page_ref(pPg);
+  }
+  pagerLeave(pPager);
+  return pPg;
+}
+
+/*
+** Release a page.
+**
+** If the number of references to the page drop to zero, then the
+** page is added to the LRU list.  When all references to all pages
+** are released, a rollback occurs and the lock on the database is
+** removed.
+*/
+int sqlite3PagerUnref(DbPage *pPg){
+  Pager *pPager = pPg->pPager;
+
+  /* Decrement the reference count for this page
+  */
+  assert( pPg->nRef>0 );
+  pagerEnter(pPg->pPager);
+  pPg->nRef--;
+
+  CHECK_PAGE(pPg);
+
+  /* When the number of references to a page reach 0, call the
+  ** destructor and add the page to the freelist.
+  */
+  if( pPg->nRef==0 ){
+
+    lruListAdd(pPg);
+    if( pPager->xDestructor ){
+      pPager->xDestructor(pPg, pPager->pageSize);
+    }
+
+    /* When all pages reach the freelist, drop the read lock from
+    ** the database file.
+    */
+    pPager->nRef--;
+    assert( pPager->nRef>=0 );
+    if( pPager->nRef==0 && (!pPager->exclusiveMode || pPager->journalOff>0) ){
+      pagerUnlockAndRollback(pPager);
+    }
+  }
+  pagerLeave(pPager);
+  return SQLITE_OK;
+}
+
+/*
+** Create a journal file for pPager.  There should already be a RESERVED
+** or EXCLUSIVE lock on the database file when this routine is called.
+**
+** Return SQLITE_OK if everything.  Return an error code and release the
+** write lock if anything goes wrong.
+*/
+static int pager_open_journal(Pager *pPager){
+  sqlite3_vfs *pVfs = pPager->pVfs;
+  int flags = (SQLITE_OPEN_READWRITE|SQLITE_OPEN_EXCLUSIVE|SQLITE_OPEN_CREATE);
+
+  int rc;
+  assert( !MEMDB );
+  assert( pPager->state>=PAGER_RESERVED );
+  assert( pPager->journalOpen==0 );
+  assert( pPager->useJournal );
+  assert( pPager->pInJournal==0 );
+  sqlite3PagerPagecount(pPager);
+  pagerLeave(pPager);
+  pPager->pInJournal = sqlite3BitvecCreate(pPager->dbSize);
+  pagerEnter(pPager);
+  if( pPager->pInJournal==0 ){
+    rc = SQLITE_NOMEM;
+    goto failed_to_open_journal;
+  }
+
+  if( pPager->tempFile ){
+    flags |= (SQLITE_OPEN_DELETEONCLOSE|SQLITE_OPEN_TEMP_JOURNAL);
+  }else{
+    flags |= (SQLITE_OPEN_MAIN_JOURNAL);
+  }
+#ifdef SQLITE_ENABLE_ATOMIC_WRITE
+  rc = sqlite3JournalOpen(
+      pVfs, pPager->zJournal, pPager->jfd, flags, jrnlBufferSize(pPager)
+  );
+#else
+  rc = sqlite3OsOpen(pVfs, pPager->zJournal, pPager->jfd, flags, 0);
+#endif
+  assert( rc!=SQLITE_OK || pPager->jfd->pMethods );
+  pPager->journalOff = 0;
+  pPager->setMaster = 0;
+  pPager->journalHdr = 0;
+  if( rc!=SQLITE_OK ){
+    if( rc==SQLITE_NOMEM ){
+      sqlite3OsDelete(pVfs, pPager->zJournal, 0);
+    }
+    goto failed_to_open_journal;
+  }
+  pPager->journalOpen = 1;
+  pPager->journalStarted = 0;
+  pPager->needSync = 0;
+  pPager->alwaysRollback = 0;
+  pPager->nRec = 0;
+  if( pPager->errCode ){
+    rc = pPager->errCode;
+    goto failed_to_open_journal;
+  }
+  pPager->origDbSize = pPager->dbSize;
+
+  rc = writeJournalHdr(pPager);
+
+  if( pPager->stmtAutoopen && rc==SQLITE_OK ){
+    rc = sqlite3PagerStmtBegin(pPager);
+  }
+  if( rc!=SQLITE_OK && rc!=SQLITE_NOMEM && rc!=SQLITE_IOERR_NOMEM ){
+    rc = pager_end_transaction(pPager);
+    if( rc==SQLITE_OK ){
+      rc = SQLITE_FULL;
+    }
+  }
+  return rc;
+
+failed_to_open_journal:
+  sqlite3BitvecDestroy(pPager->pInJournal);
+  pPager->pInJournal = 0;
+  return rc;
+}
+
+/*
+** Acquire a write-lock on the database.  The lock is removed when
+** the any of the following happen:
+**
+**   *  sqlite3PagerCommitPhaseTwo() is called.
+**   *  sqlite3PagerRollback() is called.
+**   *  sqlite3PagerClose() is called.
+**   *  sqlite3PagerUnref() is called to on every outstanding page.
+**
+** The first parameter to this routine is a pointer to any open page of the
+** database file.  Nothing changes about the page - it is used merely to
+** acquire a pointer to the Pager structure and as proof that there is
+** already a read-lock on the database.
+**
+** The second parameter indicates how much space in bytes to reserve for a
+** master journal file-name at the start of the journal when it is created.
+**
+** A journal file is opened if this is not a temporary file.  For temporary
+** files, the opening of the journal file is deferred until there is an
+** actual need to write to the journal.
+**
+** If the database is already reserved for writing, this routine is a no-op.
+**
+** If exFlag is true, go ahead and get an EXCLUSIVE lock on the file
+** immediately instead of waiting until we try to flush the cache.  The
+** exFlag is ignored if a transaction is already active.
+*/
+int sqlite3PagerBegin(DbPage *pPg, int exFlag){
+  Pager *pPager = pPg->pPager;
+  int rc = SQLITE_OK;
+  pagerEnter(pPager);
+  assert( pPg->nRef>0 );
+  assert( pPager->state!=PAGER_UNLOCK );
+  if( pPager->state==PAGER_SHARED ){
+    assert( pPager->pInJournal==0 );
+    if( MEMDB ){
+      pPager->state = PAGER_EXCLUSIVE;
+      pPager->origDbSize = pPager->dbSize;
+    }else{
+      rc = sqlite3OsLock(pPager->fd, RESERVED_LOCK);
+      if( rc==SQLITE_OK ){
+        pPager->state = PAGER_RESERVED;
+        if( exFlag ){
+          rc = pager_wait_on_lock(pPager, EXCLUSIVE_LOCK);
+        }
+      }
+      if( rc!=SQLITE_OK ){
+        pagerLeave(pPager);
+        return rc;
+      }
+      pPager->dirtyCache = 0;
+      PAGERTRACE2("TRANSACTION %d\n", PAGERID(pPager));
+      if( pPager->useJournal && !pPager->tempFile ){
+        rc = pager_open_journal(pPager);
+      }
+    }
+  }else if( pPager->journalOpen && pPager->journalOff==0 ){
+    /* This happens when the pager was in exclusive-access mode last
+    ** time a (read or write) transaction was successfully concluded
+    ** by this connection. Instead of deleting the journal file it was
+    ** kept open and truncated to 0 bytes.
+    */
+    assert( pPager->nRec==0 );
+    assert( pPager->origDbSize==0 );
+    assert( pPager->pInJournal==0 );
+    sqlite3PagerPagecount(pPager);
+    pagerLeave(pPager);
+    pPager->pInJournal = sqlite3BitvecCreate( pPager->dbSize );
+    pagerEnter(pPager);
+    if( !pPager->pInJournal ){
+      rc = SQLITE_NOMEM;
+    }else{
+      pPager->origDbSize = pPager->dbSize;
+      rc = writeJournalHdr(pPager);
+    }
+  }
+  assert( !pPager->journalOpen || pPager->journalOff>0 || rc!=SQLITE_OK );
+  pagerLeave(pPager);
+  return rc;
+}
+
+/*
+** Make a page dirty.  Set its dirty flag and add it to the dirty
+** page list.
+*/
+static void makeDirty(PgHdr *pPg){
+  if( pPg->dirty==0 ){
+    Pager *pPager = pPg->pPager;
+    pPg->dirty = 1;
+    pPg->pDirty = pPager->pDirty;
+    if( pPager->pDirty ){
+      pPager->pDirty->pPrevDirty = pPg;
+    }
+    pPg->pPrevDirty = 0;
+    pPager->pDirty = pPg;
+  }
+}
+
+/*
+** Make a page clean.  Clear its dirty bit and remove it from the
+** dirty page list.
+*/
+static void makeClean(PgHdr *pPg){
+  if( pPg->dirty ){
+    pPg->dirty = 0;
+    if( pPg->pDirty ){
+      assert( pPg->pDirty->pPrevDirty==pPg );
+      pPg->pDirty->pPrevDirty = pPg->pPrevDirty;
+    }
+    if( pPg->pPrevDirty ){
+      assert( pPg->pPrevDirty->pDirty==pPg );
+      pPg->pPrevDirty->pDirty = pPg->pDirty;
+    }else{
+      assert( pPg->pPager->pDirty==pPg );
+      pPg->pPager->pDirty = pPg->pDirty;
+    }
+  }
+}
+
+
+/*
+** Mark a data page as writeable.  The page is written into the journal
+** if it is not there already.  This routine must be called before making
+** changes to a page.
+**
+** The first time this routine is called, the pager creates a new
+** journal and acquires a RESERVED lock on the database.  If the RESERVED
+** lock could not be acquired, this routine returns SQLITE_BUSY.  The
+** calling routine must check for that return value and be careful not to
+** change any page data until this routine returns SQLITE_OK.
+**
+** If the journal file could not be written because the disk is full,
+** then this routine returns SQLITE_FULL and does an immediate rollback.
+** All subsequent write attempts also return SQLITE_FULL until there
+** is a call to sqlite3PagerCommit() or sqlite3PagerRollback() to
+** reset.
+*/
+static int pager_write(PgHdr *pPg){
+  void *pData = PGHDR_TO_DATA(pPg);
+  Pager *pPager = pPg->pPager;
+  int rc = SQLITE_OK;
+
+  /* Check for errors
+  */
+  if( pPager->errCode ){
+    return pPager->errCode;
+  }
+  if( pPager->readOnly ){
+    return SQLITE_PERM;
+  }
+
+  assert( !pPager->setMaster );
+
+  CHECK_PAGE(pPg);
+
+  /* If this page was previously acquired with noContent==1, that means
+  ** we didn't really read in the content of the page.  This can happen
+  ** (for example) when the page is being moved to the freelist.  But
+  ** now we are (perhaps) moving the page off of the freelist for
+  ** reuse and we need to know its original content so that content
+  ** can be stored in the rollback journal.  So do the read at this
+  ** time.
+  */
+  rc = pager_get_content(pPg);
+  if( rc ){
+    return rc;
+  }
+
+  /* Mark the page as dirty.  If the page has already been written
+  ** to the journal then we can return right away.
+  */
+  makeDirty(pPg);
+  if( pPg->inJournal && (pageInStatement(pPg) || pPager->stmtInUse==0) ){
+    pPager->dirtyCache = 1;
+  }else{
+
+    /* If we get this far, it means that the page needs to be
+    ** written to the transaction journal or the ckeckpoint journal
+    ** or both.
+    **
+    ** First check to see that the transaction journal exists and
+    ** create it if it does not.
+    */
+    assert( pPager->state!=PAGER_UNLOCK );
+    rc = sqlite3PagerBegin(pPg, 0);
+    if( rc!=SQLITE_OK ){
+      return rc;
+    }
+    assert( pPager->state>=PAGER_RESERVED );
+    if( !pPager->journalOpen && pPager->useJournal ){
+      rc = pager_open_journal(pPager);
+      if( rc!=SQLITE_OK ) return rc;
+    }
+    assert( pPager->journalOpen || !pPager->useJournal );
+    pPager->dirtyCache = 1;
+
+    /* The transaction journal now exists and we have a RESERVED or an
+    ** EXCLUSIVE lock on the main database file.  Write the current page to
+    ** the transaction journal if it is not there already.
+    */
+    if( !pPg->inJournal && (pPager->useJournal || MEMDB) ){
+      if( (int)pPg->pgno <= pPager->origDbSize ){
+        if( MEMDB ){
+          PgHistory *pHist = PGHDR_TO_HIST(pPg, pPager);
+          PAGERTRACE3("JOURNAL %d page %d\n", PAGERID(pPager), pPg->pgno);
+          assert( pHist->pOrig==0 );
+          pHist->pOrig = sqlite3_malloc( pPager->pageSize );
+          if( !pHist->pOrig ){
+            return SQLITE_NOMEM;
+          }
+          memcpy(pHist->pOrig, PGHDR_TO_DATA(pPg), pPager->pageSize);
+        }else{
+          u32 cksum;
+          char *pData2;
+
+          /* We should never write to the journal file the page that
+          ** contains the database locks.  The following assert verifies
+          ** that we do not. */
+          assert( pPg->pgno!=PAGER_MJ_PGNO(pPager) );
+          pData2 = CODEC2(pPager, pData, pPg->pgno, 7);
+          cksum = pager_cksum(pPager, (u8*)pData2);
+          rc = write32bits(pPager->jfd, pPager->journalOff, pPg->pgno);
+          if( rc==SQLITE_OK ){
+            rc = sqlite3OsWrite(pPager->jfd, pData2, pPager->pageSize,
+                                pPager->journalOff + 4);
+            pPager->journalOff += pPager->pageSize+4;
+          }
+          if( rc==SQLITE_OK ){
+            rc = write32bits(pPager->jfd, pPager->journalOff, cksum);
+            pPager->journalOff += 4;
+          }
+          IOTRACE(("JOUT %p %d %lld %d\n", pPager, pPg->pgno,
+                   pPager->journalOff, pPager->pageSize));
+          PAGER_INCR(sqlite3_pager_writej_count);
+          PAGERTRACE5("JOURNAL %d page %d needSync=%d hash(%08x)\n",
+               PAGERID(pPager), pPg->pgno, pPg->needSync, pager_pagehash(pPg));
+
+          /* An error has occured writing to the journal file. The
+          ** transaction will be rolled back by the layer above.
+          */
+          if( rc!=SQLITE_OK ){
+            return rc;
+          }
+
+          pPager->nRec++;
+          assert( pPager->pInJournal!=0 );
+          sqlite3BitvecSet(pPager->pInJournal, pPg->pgno);
+          pPg->needSync = !pPager->noSync;
+          if( pPager->stmtInUse ){
+            sqlite3BitvecSet(pPager->pInStmt, pPg->pgno);
+          }
+        }
+      }else{
+        pPg->needSync = !pPager->journalStarted && !pPager->noSync;
+        PAGERTRACE4("APPEND %d page %d needSync=%d\n",
+                PAGERID(pPager), pPg->pgno, pPg->needSync);
+      }
+      if( pPg->needSync ){
+        pPager->needSync = 1;
+      }
+      pPg->inJournal = 1;
+    }
+
+    /* If the statement journal is open and the page is not in it,
+    ** then write the current page to the statement journal.  Note that
+    ** the statement journal format differs from the standard journal format
+    ** in that it omits the checksums and the header.
+    */
+    if( pPager->stmtInUse
+     && !pageInStatement(pPg)
+     && (int)pPg->pgno<=pPager->stmtSize
+    ){
+      assert( pPg->inJournal || (int)pPg->pgno>pPager->origDbSize );
+      if( MEMDB ){
+        PgHistory *pHist = PGHDR_TO_HIST(pPg, pPager);
+        assert( pHist->pStmt==0 );
+        pHist->pStmt = sqlite3_malloc( pPager->pageSize );
+        if( pHist->pStmt ){
+          memcpy(pHist->pStmt, PGHDR_TO_DATA(pPg), pPager->pageSize);
+        }
+        PAGERTRACE3("STMT-JOURNAL %d page %d\n", PAGERID(pPager), pPg->pgno);
+        page_add_to_stmt_list(pPg);
+      }else{
+        i64 offset = pPager->stmtNRec*(4+pPager->pageSize);
+        char *pData2 = CODEC2(pPager, pData, pPg->pgno, 7);
+        rc = write32bits(pPager->stfd, offset, pPg->pgno);
+        if( rc==SQLITE_OK ){
+          rc = sqlite3OsWrite(pPager->stfd, pData2, pPager->pageSize, offset+4);
+        }
+        PAGERTRACE3("STMT-JOURNAL %d page %d\n", PAGERID(pPager), pPg->pgno);
+        if( rc!=SQLITE_OK ){
+          return rc;
+        }
+        pPager->stmtNRec++;
+        assert( pPager->pInStmt!=0 );
+        sqlite3BitvecSet(pPager->pInStmt, pPg->pgno);
+      }
+    }
+  }
+
+  /* Update the database size and return.
+  */
+  assert( pPager->state>=PAGER_SHARED );
+  if( pPager->dbSize<(int)pPg->pgno ){
+    pPager->dbSize = pPg->pgno;
+    if( !MEMDB && pPager->dbSize==PENDING_BYTE/pPager->pageSize ){
+      pPager->dbSize++;
+    }
+  }
+  return rc;
+}
+
+/*
+** This function is used to mark a data-page as writable. It uses
+** pager_write() to open a journal file (if it is not already open)
+** and write the page *pData to the journal.
+**
+** The difference between this function and pager_write() is that this
+** function also deals with the special case where 2 or more pages
+** fit on a single disk sector. In this case all co-resident pages
+** must have been written to the journal file before returning.
+*/
+int sqlite3PagerWrite(DbPage *pDbPage){
+  int rc = SQLITE_OK;
+
+  PgHdr *pPg = pDbPage;
+  Pager *pPager = pPg->pPager;
+  Pgno nPagePerSector = (pPager->sectorSize/pPager->pageSize);
+
+  pagerEnter(pPager);
+  if( !MEMDB && nPagePerSector>1 ){
+    Pgno nPageCount;          /* Total number of pages in database file */
+    Pgno pg1;                 /* First page of the sector pPg is located on. */
+    int nPage;                /* Number of pages starting at pg1 to journal */
+    int ii;
+    int needSync = 0;
+
+    /* Set the doNotSync flag to 1. This is because we cannot allow a journal
+    ** header to be written between the pages journaled by this function.
+    */
+    assert( pPager->doNotSync==0 );
+    pPager->doNotSync = 1;
+
+    /* This trick assumes that both the page-size and sector-size are
+    ** an integer power of 2. It sets variable pg1 to the identifier
+    ** of the first page of the sector pPg is located on.
+    */
+    pg1 = ((pPg->pgno-1) & ~(nPagePerSector-1)) + 1;
+
+    nPageCount = sqlite3PagerPagecount(pPager);
+    if( pPg->pgno>nPageCount ){
+      nPage = (pPg->pgno - pg1)+1;
+    }else if( (pg1+nPagePerSector-1)>nPageCount ){
+      nPage = nPageCount+1-pg1;
+    }else{
+      nPage = nPagePerSector;
+    }
+    assert(nPage>0);
+    assert(pg1<=pPg->pgno);
+    assert((pg1+nPage)>pPg->pgno);
+
+    for(ii=0; ii<nPage && rc==SQLITE_OK; ii++){
+      Pgno pg = pg1+ii;
+      PgHdr *pPage;
+      if( pg==pPg->pgno || !sqlite3BitvecTest(pPager->pInJournal, pg) ){
+        if( pg!=PAGER_MJ_PGNO(pPager) ){
+          rc = sqlite3PagerGet(pPager, pg, &pPage);
+          if( rc==SQLITE_OK ){
+            rc = pager_write(pPage);
+            if( pPage->needSync ){
+              needSync = 1;
+            }
+            sqlite3PagerUnref(pPage);
+          }
+        }
+      }else if( (pPage = pager_lookup(pPager, pg))!=0 ){
+        if( pPage->needSync ){
+          needSync = 1;
+        }
+      }
+    }
+
+    /* If the PgHdr.needSync flag is set for any of the nPage pages
+    ** starting at pg1, then it needs to be set for all of them. Because
+    ** writing to any of these nPage pages may damage the others, the
+    ** journal file must contain sync()ed copies of all of them
+    ** before any of them can be written out to the database file.
+    */
+    if( needSync ){
+      for(ii=0; ii<nPage && needSync; ii++){
+        PgHdr *pPage = pager_lookup(pPager, pg1+ii);
+        if( pPage ) pPage->needSync = 1;
+      }
+      assert(pPager->needSync);
+    }
+
+    assert( pPager->doNotSync==1 );
+    pPager->doNotSync = 0;
+  }else{
+    rc = pager_write(pDbPage);
+  }
+  pagerLeave(pPager);
+  return rc;
+}
+
+/*
+** Return TRUE if the page given in the argument was previously passed
+** to sqlite3PagerWrite().  In other words, return TRUE if it is ok
+** to change the content of the page.
+*/
+#ifndef NDEBUG
+int sqlite3PagerIswriteable(DbPage *pPg){
+  return pPg->dirty;
+}
+#endif
+
+#ifndef SQLITE_OMIT_VACUUM
+/*
+** Replace the content of a single page with the information in the third
+** argument.
+*/
+int sqlite3PagerOverwrite(Pager *pPager, Pgno pgno, void *pData){
+  PgHdr *pPg;
+  int rc;
+
+  pagerEnter(pPager);
+  rc = sqlite3PagerGet(pPager, pgno, &pPg);
+  if( rc==SQLITE_OK ){
+    rc = sqlite3PagerWrite(pPg);
+    if( rc==SQLITE_OK ){
+      memcpy(sqlite3PagerGetData(pPg), pData, pPager->pageSize);
+    }
+    sqlite3PagerUnref(pPg);
+  }
+  pagerLeave(pPager);
+  return rc;
+}
+#endif
+
+/*
+** A call to this routine tells the pager that it is not necessary to
+** write the information on page pPg back to the disk, even though
+** that page might be marked as dirty.
+**
+** The overlying software layer calls this routine when all of the data
+** on the given page is unused.  The pager marks the page as clean so
+** that it does not get written to disk.
+**
+** Tests show that this optimization, together with the
+** sqlite3PagerDontRollback() below, more than double the speed
+** of large INSERT operations and quadruple the speed of large DELETEs.
+**
+** When this routine is called, set the alwaysRollback flag to true.
+** Subsequent calls to sqlite3PagerDontRollback() for the same page
+** will thereafter be ignored.  This is necessary to avoid a problem
+** where a page with data is added to the freelist during one part of
+** a transaction then removed from the freelist during a later part
+** of the same transaction and reused for some other purpose.  When it
+** is first added to the freelist, this routine is called.  When reused,
+** the sqlite3PagerDontRollback() routine is called.  But because the
+** page contains critical data, we still need to be sure it gets
+** rolled back in spite of the sqlite3PagerDontRollback() call.
+*/
+void sqlite3PagerDontWrite(DbPage *pDbPage){
+  PgHdr *pPg = pDbPage;
+  Pager *pPager = pPg->pPager;
+
+  if( MEMDB ) return;
+  pagerEnter(pPager);
+  pPg->alwaysRollback = 1;
+  if( pPg->dirty && !pPager->stmtInUse ){
+    assert( pPager->state>=PAGER_SHARED );
+    if( pPager->dbSize==(int)pPg->pgno && pPager->origDbSize<pPager->dbSize ){
+      /* If this pages is the last page in the file and the file has grown
+      ** during the current transaction, then do NOT mark the page as clean.
+      ** When the database file grows, we must make sure that the last page
+      ** gets written at least once so that the disk file will be the correct
+      ** size. If you do not write this page and the size of the file
+      ** on the disk ends up being too small, that can lead to database
+      ** corruption during the next transaction.
+      */
+    }else{
+      PAGERTRACE3("DONT_WRITE page %d of %d\n", pPg->pgno, PAGERID(pPager));
+      IOTRACE(("CLEAN %p %d\n", pPager, pPg->pgno))
+      makeClean(pPg);
+#ifdef SQLITE_CHECK_PAGES
+      pPg->pageHash = pager_pagehash(pPg);
+#endif
+    }
+  }
+  pagerLeave(pPager);
+}
+
+/*
+** A call to this routine tells the pager that if a rollback occurs,
+** it is not necessary to restore the data on the given page.  This
+** means that the pager does not have to record the given page in the
+** rollback journal.
+**
+** If we have not yet actually read the content of this page (if
+** the PgHdr.needRead flag is set) then this routine acts as a promise
+** that we will never need to read the page content in the future.
+** so the needRead flag can be cleared at this point.
+**
+** This routine is only called from a single place in the sqlite btree
+** code (when a leaf is removed from the free-list). This allows the
+** following assumptions to be made about pPg:
+**
+**   1. PagerDontWrite() has been called on the page, OR
+**      PagerWrite() has not yet been called on the page.
+**
+**   2. The page existed when the transaction was started.
+**
+** Details: DontRollback() (this routine) is only called when a leaf is
+** removed from the free list. DontWrite() is called whenever a page
+** becomes a free-list leaf.
+*/
+void sqlite3PagerDontRollback(DbPage *pPg){
+  Pager *pPager = pPg->pPager;
+
+  pagerEnter(pPager);
+  assert( pPager->state>=PAGER_RESERVED );
+
+  /* If the journal file is not open, or DontWrite() has been called on
+  ** this page (DontWrite() sets the alwaysRollback flag), then this
+  ** function is a no-op.
+  */
+  if( pPager->journalOpen==0 || pPg->alwaysRollback || pPager->alwaysRollback ){
+    pagerLeave(pPager);
+    return;
+  }
+  assert( !MEMDB );    /* For a memdb, pPager->journalOpen is always 0 */
+
+  /* Check that PagerWrite() has not yet been called on this page, and
+  ** that the page existed when the transaction started.
+  */
+  assert( !pPg->inJournal && (int)pPg->pgno <= pPager->origDbSize );
+
+  assert( pPager->pInJournal!=0 );
+  sqlite3BitvecSet(pPager->pInJournal, pPg->pgno);
+  pPg->inJournal = 1;
+  pPg->needRead = 0;
+  if( pPager->stmtInUse ){
+    assert( pPager->stmtSize <= pPager->origDbSize );
+    sqlite3BitvecSet(pPager->pInStmt, pPg->pgno);
+  }
+  PAGERTRACE3("DONT_ROLLBACK page %d of %d\n", pPg->pgno, PAGERID(pPager));
+  IOTRACE(("GARBAGE %p %d\n", pPager, pPg->pgno))
+  pagerLeave(pPager);
+}
+
+
+/*
+** This routine is called to increment the database file change-counter,
+** stored at byte 24 of the pager file.
+*/
+static int pager_incr_changecounter(Pager *pPager, int isDirect){
+  PgHdr *pPgHdr;
+  u32 change_counter;
+  int rc = SQLITE_OK;
+
+  if( !pPager->changeCountDone ){
+    /* Open page 1 of the file for writing. */
+    rc = sqlite3PagerGet(pPager, 1, &pPgHdr);
+    if( rc!=SQLITE_OK ) return rc;
+
+    if( !isDirect ){
+      rc = sqlite3PagerWrite(pPgHdr);
+      if( rc!=SQLITE_OK ){
+        sqlite3PagerUnref(pPgHdr);
+        return rc;
+      }
+    }
+
+    /* Increment the value just read and write it back to byte 24. */
+    change_counter = sqlite3Get4byte((u8*)pPager->dbFileVers);
+    change_counter++;
+    put32bits(((char*)PGHDR_TO_DATA(pPgHdr))+24, change_counter);
+
+    if( isDirect && pPager->fd->pMethods ){
+      const void *zBuf = PGHDR_TO_DATA(pPgHdr);
+      rc = sqlite3OsWrite(pPager->fd, zBuf, pPager->pageSize, 0);
+    }
+
+    /* Release the page reference. */
+    sqlite3PagerUnref(pPgHdr);
+    pPager->changeCountDone = 1;
+  }
+  return rc;
+}
+
+/*
+** Sync the database file for the pager pPager. zMaster points to the name
+** of a master journal file that should be written into the individual
+** journal file. zMaster may be NULL, which is interpreted as no master
+** journal (a single database transaction).
+**
+** This routine ensures that the journal is synced, all dirty pages written
+** to the database file and the database file synced. The only thing that
+** remains to commit the transaction is to delete the journal file (or
+** master journal file if specified).
+**
+** Note that if zMaster==NULL, this does not overwrite a previous value
+** passed to an sqlite3PagerCommitPhaseOne() call.
+**
+** If parameter nTrunc is non-zero, then the pager file is truncated to
+** nTrunc pages (this is used by auto-vacuum databases).
+*/
+int sqlite3PagerCommitPhaseOne(Pager *pPager, const char *zMaster, Pgno nTrunc){
+  int rc = SQLITE_OK;
+
+  PAGERTRACE4("DATABASE SYNC: File=%s zMaster=%s nTrunc=%d\n",
+      pPager->zFilename, zMaster, nTrunc);
+  pagerEnter(pPager);
+
+  /* If this is an in-memory db, or no pages have been written to, or this
+  ** function has already been called, it is a no-op.
+  */
+  if( pPager->state!=PAGER_SYNCED && !MEMDB && pPager->dirtyCache ){
+    PgHdr *pPg;
+
+#ifdef SQLITE_ENABLE_ATOMIC_WRITE
+    /* The atomic-write optimization can be used if all of the
+    ** following are true:
+    **
+    **    + The file-system supports the atomic-write property for
+    **      blocks of size page-size, and
+    **    + This commit is not part of a multi-file transaction, and
+    **    + Exactly one page has been modified and store in the journal file.
+    **
+    ** If the optimization can be used, then the journal file will never
+    ** be created for this transaction.
+    */
+    int useAtomicWrite = (
+        !zMaster &&
+        pPager->journalOff==jrnlBufferSize(pPager) &&
+        nTrunc==0 &&
+        (0==pPager->pDirty || 0==pPager->pDirty->pDirty)
+    );
+    if( useAtomicWrite ){
+      /* Update the nRec field in the journal file. */
+      int offset = pPager->journalHdr + sizeof(aJournalMagic);
+      assert(pPager->nRec==1);
+      rc = write32bits(pPager->jfd, offset, pPager->nRec);
+
+      /* Update the db file change counter. The following call will modify
+      ** the in-memory representation of page 1 to include the updated
+      ** change counter and then write page 1 directly to the database
+      ** file. Because of the atomic-write property of the host file-system,
+      ** this is safe.
+      */
+      if( rc==SQLITE_OK ){
+        rc = pager_incr_changecounter(pPager, 1);
+      }
+    }else{
+      rc = sqlite3JournalCreate(pPager->jfd);
+    }
+
+    if( !useAtomicWrite && rc==SQLITE_OK )
+#endif
+
+    /* If a master journal file name has already been written to the
+    ** journal file, then no sync is required. This happens when it is
+    ** written, then the process fails to upgrade from a RESERVED to an
+    ** EXCLUSIVE lock. The next time the process tries to commit the
+    ** transaction the m-j name will have already been written.
+    */
+    if( !pPager->setMaster ){
+      assert( pPager->journalOpen );
+      rc = pager_incr_changecounter(pPager, 0);
+      if( rc!=SQLITE_OK ) goto sync_exit;
+#ifndef SQLITE_OMIT_AUTOVACUUM
+      if( nTrunc!=0 ){
+        /* If this transaction has made the database smaller, then all pages
+        ** being discarded by the truncation must be written to the journal
+        ** file.
+        */
+        Pgno i;
+        int iSkip = PAGER_MJ_PGNO(pPager);
+        for( i=nTrunc+1; i<=pPager->origDbSize; i++ ){
+          if( !sqlite3BitvecTest(pPager->pInJournal, i) && i!=iSkip ){
+            rc = sqlite3PagerGet(pPager, i, &pPg);
+            if( rc!=SQLITE_OK ) goto sync_exit;
+            rc = sqlite3PagerWrite(pPg);
+            sqlite3PagerUnref(pPg);
+            if( rc!=SQLITE_OK ) goto sync_exit;
+          }
+        }
+      }
+#endif
+      rc = writeMasterJournal(pPager, zMaster);
+      if( rc!=SQLITE_OK ) goto sync_exit;
+      rc = syncJournal(pPager);
+    }
+    if( rc!=SQLITE_OK ) goto sync_exit;
+
+#ifndef SQLITE_OMIT_AUTOVACUUM
+    if( nTrunc!=0 ){
+      rc = sqlite3PagerTruncate(pPager, nTrunc);
+      if( rc!=SQLITE_OK ) goto sync_exit;
+    }
+#endif
+
+    /* Write all dirty pages to the database file */
+    pPg = pager_get_all_dirty_pages(pPager);
+    rc = pager_write_pagelist(pPg);
+    if( rc!=SQLITE_OK ){
+      assert( rc!=SQLITE_IOERR_BLOCKED );
+      /* The error might have left the dirty list all fouled up here,
+      ** but that does not matter because if the if the dirty list did
+      ** get corrupted, then the transaction will roll back and
+      ** discard the dirty list.  There is an assert in
+      ** pager_get_all_dirty_pages() that verifies that no attempt
+      ** is made to use an invalid dirty list.
+      */
+      goto sync_exit;
+    }
+    pPager->pDirty = 0;
+
+    /* Sync the database file. */
+    if( !pPager->noSync ){
+      rc = sqlite3OsSync(pPager->fd, pPager->sync_flags);
+    }
+    IOTRACE(("DBSYNC %p\n", pPager))
+
+    pPager->state = PAGER_SYNCED;
+  }else if( MEMDB && nTrunc!=0 ){
+    rc = sqlite3PagerTruncate(pPager, nTrunc);
+  }
+
+sync_exit:
+  if( rc==SQLITE_IOERR_BLOCKED ){
+    /* pager_incr_changecounter() may attempt to obtain an exclusive
+     * lock to spill the cache and return IOERR_BLOCKED. But since
+     * there is no chance the cache is inconsistent, it is
+     * better to return SQLITE_BUSY.
+     */
+    rc = SQLITE_BUSY;
+  }
+  pagerLeave(pPager);
+  return rc;
+}
+
+
+/*
+** Commit all changes to the database and release the write lock.
+**
+** If the commit fails for any reason, a rollback attempt is made
+** and an error code is returned.  If the commit worked, SQLITE_OK
+** is returned.
+*/
+int sqlite3PagerCommitPhaseTwo(Pager *pPager){
+  int rc;
+  PgHdr *pPg;
+
+  if( pPager->errCode ){
+    return pPager->errCode;
+  }
+  if( pPager->state<PAGER_RESERVED ){
+    return SQLITE_ERROR;
+  }
+  pagerEnter(pPager);
+  PAGERTRACE2("COMMIT %d\n", PAGERID(pPager));
+  if( MEMDB ){
+    pPg = pager_get_all_dirty_pages(pPager);
+    while( pPg ){
+      PgHistory *pHist = PGHDR_TO_HIST(pPg, pPager);
+      clearHistory(pHist);
+      pPg->dirty = 0;
+      pPg->inJournal = 0;
+      pHist->inStmt = 0;
+      pPg->needSync = 0;
+      pHist->pPrevStmt = pHist->pNextStmt = 0;
+      pPg = pPg->pDirty;
+    }
+    pPager->pDirty = 0;
+#ifndef NDEBUG
+    for(pPg=pPager->pAll; pPg; pPg=pPg->pNextAll){
+      PgHistory *pHist = PGHDR_TO_HIST(pPg, pPager);
+      assert( !pPg->alwaysRollback );
+      assert( !pHist->pOrig );
+      assert( !pHist->pStmt );
+    }
+#endif
+    pPager->pStmt = 0;
+    pPager->state = PAGER_SHARED;
+    pagerLeave(pPager);
+    return SQLITE_OK;
+  }
+  assert( pPager->journalOpen || !pPager->dirtyCache );
+  assert( pPager->state==PAGER_SYNCED || !pPager->dirtyCache );
+  rc = pager_end_transaction(pPager);
+  rc = pager_error(pPager, rc);
+  pagerLeave(pPager);
+  return rc;
+}
+
+/*
+** Rollback all changes.  The database falls back to PAGER_SHARED mode.
+** All in-memory cache pages revert to their original data contents.
+** The journal is deleted.
+**
+** This routine cannot fail unless some other process is not following
+** the correct locking protocol or unless some other
+** process is writing trash into the journal file (SQLITE_CORRUPT) or
+** unless a prior malloc() failed (SQLITE_NOMEM).  Appropriate error
+** codes are returned for all these occasions.  Otherwise,
+** SQLITE_OK is returned.
+*/
+int sqlite3PagerRollback(Pager *pPager){
+  int rc;
+  PAGERTRACE2("ROLLBACK %d\n", PAGERID(pPager));
+  if( MEMDB ){
+    PgHdr *p;
+    for(p=pPager->pAll; p; p=p->pNextAll){
+      PgHistory *pHist;
+      assert( !p->alwaysRollback );
+      if( !p->dirty ){
+        assert( !((PgHistory *)PGHDR_TO_HIST(p, pPager))->pOrig );
+        assert( !((PgHistory *)PGHDR_TO_HIST(p, pPager))->pStmt );
+        continue;
+      }
+
+      pHist = PGHDR_TO_HIST(p, pPager);
+      if( pHist->pOrig ){
+        memcpy(PGHDR_TO_DATA(p), pHist->pOrig, pPager->pageSize);
+        PAGERTRACE3("ROLLBACK-PAGE %d of %d\n", p->pgno, PAGERID(pPager));
+      }else{
+        PAGERTRACE3("PAGE %d is clean on %d\n", p->pgno, PAGERID(pPager));
+      }
+      clearHistory(pHist);
+      p->dirty = 0;
+      p->inJournal = 0;
+      pHist->inStmt = 0;
+      pHist->pPrevStmt = pHist->pNextStmt = 0;
+      if( pPager->xReiniter ){
+        pPager->xReiniter(p, pPager->pageSize);
+      }
+    }
+    pPager->pDirty = 0;
+    pPager->pStmt = 0;
+    pPager->dbSize = pPager->origDbSize;
+    pager_truncate_cache(pPager);
+    pPager->stmtInUse = 0;
+    pPager->state = PAGER_SHARED;
+    return SQLITE_OK;
+  }
+
+  pagerEnter(pPager);
+  if( !pPager->dirtyCache || !pPager->journalOpen ){
+    rc = pager_end_transaction(pPager);
+    pagerLeave(pPager);
+    return rc;
+  }
+
+  if( pPager->errCode && pPager->errCode!=SQLITE_FULL ){
+    if( pPager->state>=PAGER_EXCLUSIVE ){
+      pager_playback(pPager, 0);
+    }
+    pagerLeave(pPager);
+    return pPager->errCode;
+  }
+  if( pPager->state==PAGER_RESERVED ){
+    int rc2;
+    rc = pager_playback(pPager, 0);
+    rc2 = pager_end_transaction(pPager);
+    if( rc==SQLITE_OK ){
+      rc = rc2;
+    }
+  }else{
+    rc = pager_playback(pPager, 0);
+  }
+  /* pager_reset(pPager); */
+  pPager->dbSize = -1;
+
+  /* If an error occurs during a ROLLBACK, we can no longer trust the pager
+  ** cache. So call pager_error() on the way out to make any error
+  ** persistent.
+  */
+  rc = pager_error(pPager, rc);
+  pagerLeave(pPager);
+  return rc;
+}
+
+/*
+** Return TRUE if the database file is opened read-only.  Return FALSE
+** if the database is (in theory) writable.
+*/
+int sqlite3PagerIsreadonly(Pager *pPager){
+  return pPager->readOnly;
+}
+
+/*
+** Return the number of references to the pager.
+*/
+int sqlite3PagerRefcount(Pager *pPager){
+  return pPager->nRef;
+}
+
+#ifdef SQLITE_TEST
+/*
+** This routine is used for testing and analysis only.
+*/
+int *sqlite3PagerStats(Pager *pPager){
+  static int a[11];
+  a[0] = pPager->nRef;
+  a[1] = pPager->nPage;
+  a[2] = pPager->mxPage;
+  a[3] = pPager->dbSize;
+  a[4] = pPager->state;
+  a[5] = pPager->errCode;
+  a[6] = pPager->nHit;
+  a[7] = pPager->nMiss;
+  a[8] = 0;  /* Used to be pPager->nOvfl */
+  a[9] = pPager->nRead;
+  a[10] = pPager->nWrite;
+  return a;
+}
+#endif
+
+/*
+** Set the statement rollback point.
+**
+** This routine should be called with the transaction journal already
+** open.  A new statement journal is created that can be used to rollback
+** changes of a single SQL command within a larger transaction.
+*/
+static int pagerStmtBegin(Pager *pPager){
+  int rc;
+  assert( !pPager->stmtInUse );
+  assert( pPager->state>=PAGER_SHARED );
+  assert( pPager->dbSize>=0 );
+  PAGERTRACE2("STMT-BEGIN %d\n", PAGERID(pPager));
+  if( MEMDB ){
+    pPager->stmtInUse = 1;
+    pPager->stmtSize = pPager->dbSize;
+    return SQLITE_OK;
+  }
+  if( !pPager->journalOpen ){
+    pPager->stmtAutoopen = 1;
+    return SQLITE_OK;
+  }
+  assert( pPager->journalOpen );
+  pagerLeave(pPager);
+  assert( pPager->pInStmt==0 );
+  pPager->pInStmt = sqlite3BitvecCreate(pPager->dbSize);
+  pagerEnter(pPager);
+  if( pPager->pInStmt==0 ){
+    /* sqlite3OsLock(pPager->fd, SHARED_LOCK); */
+    return SQLITE_NOMEM;
+  }
+#ifndef NDEBUG
+  rc = sqlite3OsFileSize(pPager->jfd, &pPager->stmtJSize);
+  if( rc ) goto stmt_begin_failed;
+  assert( pPager->stmtJSize == pPager->journalOff );
+#endif
+  pPager->stmtJSize = pPager->journalOff;
+  pPager->stmtSize = pPager->dbSize;
+  pPager->stmtHdrOff = 0;
+  pPager->stmtCksum = pPager->cksumInit;
+  if( !pPager->stmtOpen ){
+    rc = sqlite3PagerOpentemp(pPager->pVfs, pPager->stfd, pPager->zStmtJrnl,
+                              SQLITE_OPEN_SUBJOURNAL);
+    if( rc ){
+      goto stmt_begin_failed;
+    }
+    pPager->stmtOpen = 1;
+    pPager->stmtNRec = 0;
+  }
+  pPager->stmtInUse = 1;
+  return SQLITE_OK;
+
+stmt_begin_failed:
+  if( pPager->pInStmt ){
+    sqlite3BitvecDestroy(pPager->pInStmt);
+    pPager->pInStmt = 0;
+  }
+  return rc;
+}
+int sqlite3PagerStmtBegin(Pager *pPager){
+  int rc;
+  pagerEnter(pPager);
+  rc = pagerStmtBegin(pPager);
+  pagerLeave(pPager);
+  return rc;
+}
+
+/*
+** Commit a statement.
+*/
+int sqlite3PagerStmtCommit(Pager *pPager){
+  pagerEnter(pPager);
+  if( pPager->stmtInUse ){
+    PgHdr *pPg, *pNext;
+    PAGERTRACE2("STMT-COMMIT %d\n", PAGERID(pPager));
+    if( !MEMDB ){
+      /* sqlite3OsTruncate(pPager->stfd, 0); */
+      sqlite3BitvecDestroy(pPager->pInStmt);
+      pPager->pInStmt = 0;
+    }else{
+      for(pPg=pPager->pStmt; pPg; pPg=pNext){
+        PgHistory *pHist = PGHDR_TO_HIST(pPg, pPager);
+        pNext = pHist->pNextStmt;
+        assert( pHist->inStmt );
+        pHist->inStmt = 0;
+        pHist->pPrevStmt = pHist->pNextStmt = 0;
+        sqlite3_free(pHist->pStmt);
+        pHist->pStmt = 0;
+      }
+    }
+    pPager->stmtNRec = 0;
+    pPager->stmtInUse = 0;
+    pPager->pStmt = 0;
+  }
+  pPager->stmtAutoopen = 0;
+  pagerLeave(pPager);
+  return SQLITE_OK;
+}
+
+/*
+** Rollback a statement.
+*/
+int sqlite3PagerStmtRollback(Pager *pPager){
+  int rc;
+  pagerEnter(pPager);
+  if( pPager->stmtInUse ){
+    PAGERTRACE2("STMT-ROLLBACK %d\n", PAGERID(pPager));
+    if( MEMDB ){
+      PgHdr *pPg;
+      PgHistory *pHist;
+      for(pPg=pPager->pStmt; pPg; pPg=pHist->pNextStmt){
+        pHist = PGHDR_TO_HIST(pPg, pPager);
+        if( pHist->pStmt ){
+          memcpy(PGHDR_TO_DATA(pPg), pHist->pStmt, pPager->pageSize);
+          sqlite3_free(pHist->pStmt);
+          pHist->pStmt = 0;
+        }
+      }
+      pPager->dbSize = pPager->stmtSize;
+      pager_truncate_cache(pPager);
+      rc = SQLITE_OK;
+    }else{
+      rc = pager_stmt_playback(pPager);
+    }
+    sqlite3PagerStmtCommit(pPager);
+  }else{
+    rc = SQLITE_OK;
+  }
+  pPager->stmtAutoopen = 0;
+  pagerLeave(pPager);
+  return rc;
+}
+
+/*
+** Return the full pathname of the database file.
+*/
+const char *sqlite3PagerFilename(Pager *pPager){
+  return pPager->zFilename;
+}
+
+/*
+** Return the VFS structure for the pager.
+*/
+const sqlite3_vfs *sqlite3PagerVfs(Pager *pPager){
+  return pPager->pVfs;
+}
+
+/*
+** Return the file handle for the database file associated
+** with the pager.  This might return NULL if the file has
+** not yet been opened.
+*/
+sqlite3_file *sqlite3PagerFile(Pager *pPager){
+  return pPager->fd;
+}
+
+/*
+** Return the directory of the database file.
+*/
+const char *sqlite3PagerDirname(Pager *pPager){
+  return pPager->zDirectory;
+}
+
+/*
+** Return the full pathname of the journal file.
+*/
+const char *sqlite3PagerJournalname(Pager *pPager){
+  return pPager->zJournal;
+}
+
+/*
+** Return true if fsync() calls are disabled for this pager.  Return FALSE
+** if fsync()s are executed normally.
+*/
+int sqlite3PagerNosync(Pager *pPager){
+  return pPager->noSync;
+}
+
+#ifdef SQLITE_HAS_CODEC
+/*
+** Set the codec for this pager
+*/
+void sqlite3PagerSetCodec(
+  Pager *pPager,
+  void *(*xCodec)(void*,void*,Pgno,int),
+  void *pCodecArg
+){
+  pPager->xCodec = xCodec;
+  pPager->pCodecArg = pCodecArg;
+}
+#endif
+
+#ifndef SQLITE_OMIT_AUTOVACUUM
+/*
+** Move the page pPg to location pgno in the file.
+**
+** There must be no references to the page previously located at
+** pgno (which we call pPgOld) though that page is allowed to be
+** in cache.  If the page previous located at pgno is not already
+** in the rollback journal, it is not put there by by this routine.
+**
+** References to the page pPg remain valid. Updating any
+** meta-data associated with pPg (i.e. data stored in the nExtra bytes
+** allocated along with the page) is the responsibility of the caller.
+**
+** A transaction must be active when this routine is called. It used to be
+** required that a statement transaction was not active, but this restriction
+** has been removed (CREATE INDEX needs to move a page when a statement
+** transaction is active).
+*/
+int sqlite3PagerMovepage(Pager *pPager, DbPage *pPg, Pgno pgno){
+  PgHdr *pPgOld;  /* The page being overwritten. */
+  int h;
+  Pgno needSyncPgno = 0;
+
+  pagerEnter(pPager);
+  assert( pPg->nRef>0 );
+
+  PAGERTRACE5("MOVE %d page %d (needSync=%d) moves to %d\n",
+      PAGERID(pPager), pPg->pgno, pPg->needSync, pgno);
+  IOTRACE(("MOVE %p %d %d\n", pPager, pPg->pgno, pgno))
+
+  pager_get_content(pPg);
+  if( pPg->needSync ){
+    needSyncPgno = pPg->pgno;
+    assert( pPg->inJournal || (int)pgno>pPager->origDbSize );
+    assert( pPg->dirty );
+    assert( pPager->needSync );
+  }
+
+  /* Unlink pPg from its hash-chain */
+  unlinkHashChain(pPager, pPg);
+
+  /* If the cache contains a page with page-number pgno, remove it
+  ** from its hash chain. Also, if the PgHdr.needSync was set for
+  ** page pgno before the 'move' operation, it needs to be retained
+  ** for the page moved there.
+  */
+  pPg->needSync = 0;
+  pPgOld = pager_lookup(pPager, pgno);
+  if( pPgOld ){
+    assert( pPgOld->nRef==0 );
+    unlinkHashChain(pPager, pPgOld);
+    makeClean(pPgOld);
+    pPg->needSync = pPgOld->needSync;
+  }else{
+    pPg->needSync = 0;
+  }
+  pPg->inJournal = sqlite3BitvecTest(pPager->pInJournal, pgno);
+
+  /* Change the page number for pPg and insert it into the new hash-chain. */
+  assert( pgno!=0 );
+  pPg->pgno = pgno;
+  h = pgno & (pPager->nHash-1);
+  if( pPager->aHash[h] ){
+    assert( pPager->aHash[h]->pPrevHash==0 );
+    pPager->aHash[h]->pPrevHash = pPg;
+  }
+  pPg->pNextHash = pPager->aHash[h];
+  pPager->aHash[h] = pPg;
+  pPg->pPrevHash = 0;
+
+  makeDirty(pPg);
+  pPager->dirtyCache = 1;
+
+  if( needSyncPgno ){
+    /* If needSyncPgno is non-zero, then the journal file needs to be
+    ** sync()ed before any data is written to database file page needSyncPgno.
+    ** Currently, no such page exists in the page-cache and the
+    ** Pager.pInJournal bit has been set. This needs to be remedied by loading
+    ** the page into the pager-cache and setting the PgHdr.needSync flag.
+    **
+    ** If the attempt to load the page into the page-cache fails, (due
+    ** to a malloc() or IO failure), clear the bit in the pInJournal[]
+    ** array. Otherwise, if the page is loaded and written again in
+    ** this transaction, it may be written to the database file before
+    ** it is synced into the journal file. This way, it may end up in
+    ** the journal file twice, but that is not a problem.
+    **
+    ** The sqlite3PagerGet() call may cause the journal to sync. So make
+    ** sure the Pager.needSync flag is set too.
+    */
+    int rc;
+    PgHdr *pPgHdr;
+    assert( pPager->needSync );
+    rc = sqlite3PagerGet(pPager, needSyncPgno, &pPgHdr);
+    if( rc!=SQLITE_OK ){
+      if( pPager->pInJournal && (int)needSyncPgno<=pPager->origDbSize ){
+        sqlite3BitvecClear(pPager->pInJournal, needSyncPgno);
+      }
+      pagerLeave(pPager);
+      return rc;
+    }
+    pPager->needSync = 1;
+    pPgHdr->needSync = 1;
+    pPgHdr->inJournal = 1;
+    makeDirty(pPgHdr);
+    sqlite3PagerUnref(pPgHdr);
+  }
+
+  pagerLeave(pPager);
+  return SQLITE_OK;
+}
+#endif
+
+/*
+** Return a pointer to the data for the specified page.
+*/
+void *sqlite3PagerGetData(DbPage *pPg){
+  return PGHDR_TO_DATA(pPg);
+}
+
+/*
+** Return a pointer to the Pager.nExtra bytes of "extra" space
+** allocated along with the specified page.
+*/
+void *sqlite3PagerGetExtra(DbPage *pPg){
+  Pager *pPager = pPg->pPager;
+  return (pPager?PGHDR_TO_EXTRA(pPg, pPager):0);
+}
+
+/*
+** Get/set the locking-mode for this pager. Parameter eMode must be one
+** of PAGER_LOCKINGMODE_QUERY, PAGER_LOCKINGMODE_NORMAL or
+** PAGER_LOCKINGMODE_EXCLUSIVE. If the parameter is not _QUERY, then
+** the locking-mode is set to the value specified.
+**
+** The returned value is either PAGER_LOCKINGMODE_NORMAL or
+** PAGER_LOCKINGMODE_EXCLUSIVE, indicating the current (possibly updated)
+** locking-mode.
+*/
+int sqlite3PagerLockingMode(Pager *pPager, int eMode){
+  assert( eMode==PAGER_LOCKINGMODE_QUERY
+            || eMode==PAGER_LOCKINGMODE_NORMAL
+            || eMode==PAGER_LOCKINGMODE_EXCLUSIVE );
+  assert( PAGER_LOCKINGMODE_QUERY<0 );
+  assert( PAGER_LOCKINGMODE_NORMAL>=0 && PAGER_LOCKINGMODE_EXCLUSIVE>=0 );
+  if( eMode>=0 && !pPager->tempFile ){
+    pPager->exclusiveMode = eMode;
+  }
+  return (int)pPager->exclusiveMode;
+}
+
+#ifdef SQLITE_TEST
+/*
+** Print a listing of all referenced pages and their ref count.
+*/
+void sqlite3PagerRefdump(Pager *pPager){
+  PgHdr *pPg;
+  for(pPg=pPager->pAll; pPg; pPg=pPg->pNextAll){
+    if( pPg->nRef<=0 ) continue;
+    sqlite3DebugPrintf("PAGE %3d addr=%p nRef=%d\n",
+       pPg->pgno, PGHDR_TO_DATA(pPg), pPg->nRef);
+  }
+}
+#endif
+
+#endif /* SQLITE_OMIT_DISKIO */
diff --git a/uppsrc/plugin/sqlite3/lib/pager.h b/uppsrc/plugin/sqlite3/lib/pager.h
new file mode 100644
index 000000000..e81fa5dbb
--- /dev/null
+++ b/uppsrc/plugin/sqlite3/lib/pager.h
@@ -0,0 +1,125 @@
+/*
+** 2001 September 15
+**
+** The author disclaims copyright to this source code.  In place of
+** a legal notice, here is a blessing:
+**
+**    May you do good and not evil.
+**    May you find forgiveness for yourself and forgive others.
+**    May you share freely, never taking more than you give.
+**
+*************************************************************************
+** This header file defines the interface that the sqlite page cache
+** subsystem.  The page cache subsystem reads and writes a file a page
+** at a time and provides a journal for rollback.
+**
+** @(#) $Id: pager.h,v 1.69 2008/02/02 20:47:38 drh Exp $
+*/
+
+#ifndef _PAGER_H_
+#define _PAGER_H_
+
+/*
+** The type used to represent a page number.  The first page in a file
+** is called page 1.  0 is used to represent "not a page".
+*/
+typedef unsigned int Pgno;
+
+/*
+** Each open file is managed by a separate instance of the "Pager" structure.
+*/
+typedef struct Pager Pager;
+
+/*
+** Handle type for pages.
+*/
+typedef struct PgHdr DbPage;
+
+/*
+** Allowed values for the flags parameter to sqlite3PagerOpen().
+**
+** NOTE: This values must match the corresponding BTREE_ values in btree.h.
+*/
+#define PAGER_OMIT_JOURNAL  0x0001    /* Do not use a rollback journal */
+#define PAGER_NO_READLOCK   0x0002    /* Omit readlocks on readonly files */
+
+/*
+** Valid values for the second argument to sqlite3PagerLockingMode().
+*/
+#define PAGER_LOCKINGMODE_QUERY      -1
+#define PAGER_LOCKINGMODE_NORMAL      0
+#define PAGER_LOCKINGMODE_EXCLUSIVE   1
+
+/*
+** See source code comments for a detailed description of the following
+** routines:
+*/
+int sqlite3PagerOpen(sqlite3_vfs *, Pager **ppPager, const char*, int,int,int);
+void sqlite3PagerSetBusyhandler(Pager*, BusyHandler *pBusyHandler);
+void sqlite3PagerSetDestructor(Pager*, void(*)(DbPage*,int));
+void sqlite3PagerSetReiniter(Pager*, void(*)(DbPage*,int));
+int sqlite3PagerSetPagesize(Pager*, u16*);
+int sqlite3PagerMaxPageCount(Pager*, int);
+int sqlite3PagerReadFileheader(Pager*, int, unsigned char*);
+void sqlite3PagerSetCachesize(Pager*, int);
+int sqlite3PagerClose(Pager *pPager);
+int sqlite3PagerAcquire(Pager *pPager, Pgno pgno, DbPage **ppPage, int clrFlag);
+#define sqlite3PagerGet(A,B,C) sqlite3PagerAcquire(A,B,C,0)
+DbPage *sqlite3PagerLookup(Pager *pPager, Pgno pgno);
+int sqlite3PagerRef(DbPage*);
+int sqlite3PagerUnref(DbPage*);
+int sqlite3PagerWrite(DbPage*);
+int sqlite3PagerOverwrite(Pager *pPager, Pgno pgno, void*);
+int sqlite3PagerPagecount(Pager*);
+int sqlite3PagerTruncate(Pager*,Pgno);
+int sqlite3PagerBegin(DbPage*, int exFlag);
+int sqlite3PagerCommitPhaseOne(Pager*,const char *zMaster, Pgno);
+int sqlite3PagerCommitPhaseTwo(Pager*);
+int sqlite3PagerRollback(Pager*);
+int sqlite3PagerIsreadonly(Pager*);
+int sqlite3PagerStmtBegin(Pager*);
+int sqlite3PagerStmtCommit(Pager*);
+int sqlite3PagerStmtRollback(Pager*);
+void sqlite3PagerDontRollback(DbPage*);
+void sqlite3PagerDontWrite(DbPage*);
+int sqlite3PagerRefcount(Pager*);
+void sqlite3PagerSetSafetyLevel(Pager*,int,int);
+const char *sqlite3PagerFilename(Pager*);
+const sqlite3_vfs *sqlite3PagerVfs(Pager*);
+sqlite3_file *sqlite3PagerFile(Pager*);
+const char *sqlite3PagerDirname(Pager*);
+const char *sqlite3PagerJournalname(Pager*);
+int sqlite3PagerNosync(Pager*);
+int sqlite3PagerMovepage(Pager*,DbPage*,Pgno);
+void *sqlite3PagerGetData(DbPage *);
+void *sqlite3PagerGetExtra(DbPage *);
+int sqlite3PagerLockingMode(Pager *, int);
+void *sqlite3PagerTempSpace(Pager*);
+
+#if defined(SQLITE_ENABLE_MEMORY_MANAGEMENT) && !defined(SQLITE_OMIT_DISKIO)
+  int sqlite3PagerReleaseMemory(int);
+#endif
+
+#ifdef SQLITE_HAS_CODEC
+  void sqlite3PagerSetCodec(Pager*,void*(*)(void*,void*,Pgno,int),void*);
+#endif
+
+#if !defined(NDEBUG) || defined(SQLITE_TEST)
+  Pgno sqlite3PagerPagenumber(DbPage*);
+  int sqlite3PagerIswriteable(DbPage*);
+#endif
+
+#ifdef SQLITE_TEST
+  int *sqlite3PagerStats(Pager*);
+  void sqlite3PagerRefdump(Pager*);
+#endif
+
+#ifdef SQLITE_TEST
+void disable_simulated_io_errors(void);
+void enable_simulated_io_errors(void);
+#else
+# define disable_simulated_io_errors()
+# define enable_simulated_io_errors()
+#endif
+
+#endif /* _PAGER_H_ */
diff --git a/uppsrc/plugin/sqlite3/lib/parse.c b/uppsrc/plugin/sqlite3/lib/parse.c
new file mode 100644
index 000000000..be2a57eb5
--- /dev/null
+++ b/uppsrc/plugin/sqlite3/lib/parse.c
@@ -0,0 +1,3480 @@
+/* Driver template for the LEMON parser generator.
+** The author disclaims copyright to this source code.
+*/
+/* First off, code is include which follows the "include" declaration
+** in the input file. */
+#include <stdio.h>
+#line 51 "parse.y"
+
+#include "sqliteInt.h"
+
+/*
+** An instance of this structure holds information about the
+** LIMIT clause of a SELECT statement.
+*/
+struct LimitVal {
+  Expr *pLimit;    /* The LIMIT expression.  NULL if there is no limit */
+  Expr *pOffset;   /* The OFFSET expression.  NULL if there is none */
+};
+
+/*
+** An instance of this structure is used to store the LIKE,
+** GLOB, NOT LIKE, and NOT GLOB operators.
+*/
+struct LikeOp {
+  Token eOperator;  /* "like" or "glob" or "regexp" */
+  int not;         /* True if the NOT keyword is present */
+};
+
+/*
+** An instance of the following structure describes the event of a
+** TRIGGER.  "a" is the event type, one of TK_UPDATE, TK_INSERT,
+** TK_DELETE, or TK_INSTEAD.  If the event is of the form
+**
+**      UPDATE ON (a,b,c)
+**
+** Then the "b" IdList records the list "a,b,c".
+*/
+struct TrigEvent { int a; IdList * b; };
+
+/*
+** An instance of this structure holds the ATTACH key and the key type.
+*/
+struct AttachKey { int type;  Token key; };
+
+#line 47 "parse.c"
+/* Next is all token values, in a form suitable for use by makeheaders.
+** This section will be null unless lemon is run with the -m switch.
+*/
+/*
+** These constants (all generated automatically by the parser generator)
+** specify the various kinds of tokens (terminals) that the parser
+** understands.
+**
+** Each symbol here is a terminal symbol in the grammar.
+*/
+/* Make sure the INTERFACE macro is defined.
+*/
+#ifndef INTERFACE
+# define INTERFACE 1
+#endif
+/* The next thing included is series of defines which control
+** various aspects of the generated parser.
+**    YYCODETYPE         is the data type used for storing terminal
+**                       and nonterminal numbers.  "unsigned char" is
+**                       used if there are fewer than 250 terminals
+**                       and nonterminals.  "int" is used otherwise.
+**    YYNOCODE           is a number of type YYCODETYPE which corresponds
+**                       to no legal terminal or nonterminal number.  This
+**                       number is used to fill in empty slots of the hash
+**                       table.
+**    YYFALLBACK         If defined, this indicates that one or more tokens
+**                       have fall-back values which should be used if the
+**                       original value of the token will not parse.
+**    YYACTIONTYPE       is the data type used for storing terminal
+**                       and nonterminal numbers.  "unsigned char" is
+**                       used if there are fewer than 250 rules and
+**                       states combined.  "int" is used otherwise.
+**    sqlite3ParserTOKENTYPE     is the data type used for minor tokens given
+**                       directly to the parser from the tokenizer.
+**    YYMINORTYPE        is the data type used for all minor tokens.
+**                       This is typically a union of many types, one of
+**                       which is sqlite3ParserTOKENTYPE.  The entry in the union
+**                       for base tokens is called "yy0".
+**    YYSTACKDEPTH       is the maximum depth of the parser's stack.  If
+**                       zero the stack is dynamically sized using realloc()
+**    sqlite3ParserARG_SDECL     A static variable declaration for the %extra_argument
+**    sqlite3ParserARG_PDECL     A parameter declaration for the %extra_argument
+**    sqlite3ParserARG_STORE     Code to store %extra_argument into yypParser
+**    sqlite3ParserARG_FETCH     Code to extract %extra_argument from yypParser
+**    YYNSTATE           the combined number of states.
+**    YYNRULE            the number of rules in the grammar
+**    YYERRORSYMBOL      is the code number of the error symbol.  If not
+**                       defined, then do no error processing.
+*/
+#define YYCODETYPE unsigned char
+#define YYNOCODE 248
+#define YYACTIONTYPE unsigned short int
+#define YYWILDCARD 59
+#define sqlite3ParserTOKENTYPE Token
+typedef union {
+  sqlite3ParserTOKENTYPE yy0;
+  int yy46;
+  struct LikeOp yy72;
+  Expr* yy172;
+  ExprList* yy174;
+  Select* yy219;
+  struct LimitVal yy234;
+  TriggerStep* yy243;
+  struct TrigEvent yy370;
+  SrcList* yy373;
+  struct {int value; int mask;} yy405;
+  Token yy410;
+  IdList* yy432;
+} YYMINORTYPE;
+#ifndef YYSTACKDEPTH
+#define YYSTACKDEPTH 100
+#endif
+#define sqlite3ParserARG_SDECL Parse *pParse;
+#define sqlite3ParserARG_PDECL ,Parse *pParse
+#define sqlite3ParserARG_FETCH Parse *pParse = yypParser->pParse
+#define sqlite3ParserARG_STORE yypParser->pParse = pParse
+#define YYNSTATE 588
+#define YYNRULE 312
+#define YYFALLBACK 1
+#define YY_NO_ACTION      (YYNSTATE+YYNRULE+2)
+#define YY_ACCEPT_ACTION  (YYNSTATE+YYNRULE+1)
+#define YY_ERROR_ACTION   (YYNSTATE+YYNRULE)
+
+/* Next are that tables used to determine what action to take based on the
+** current state and lookahead token.  These tables are used to implement
+** functions that take a state number and lookahead value and return an
+** action integer.
+**
+** Suppose the action integer is N.  Then the action is determined as
+** follows
+**
+**   0 <= N < YYNSTATE                  Shift N.  That is, push the lookahead
+**                                      token onto the stack and goto state N.
+**
+**   YYNSTATE <= N < YYNSTATE+YYNRULE   Reduce by rule N-YYNSTATE.
+**
+**   N == YYNSTATE+YYNRULE              A syntax error has occurred.
+**
+**   N == YYNSTATE+YYNRULE+1            The parser accepts its input.
+**
+**   N == YYNSTATE+YYNRULE+2            No such action.  Denotes unused
+**                                      slots in the yy_action[] table.
+**
+** The action table is constructed as a single large table named yy_action[].
+** Given state S and lookahead X, the action is computed as
+**
+**      yy_action[ yy_shift_ofst[S] + X ]
+**
+** If the index value yy_shift_ofst[S]+X is out of range or if the value
+** yy_lookahead[yy_shift_ofst[S]+X] is not equal to X or if yy_shift_ofst[S]
+** is equal to YY_SHIFT_USE_DFLT, it means that the action is not in the table
+** and that yy_default[S] should be used instead.
+**
+** The formula above is for computing the action when the lookahead is
+** a terminal symbol.  If the lookahead is a non-terminal (as occurs after
+** a reduce action) then the yy_reduce_ofst[] array is used in place of
+** the yy_shift_ofst[] array and YY_REDUCE_USE_DFLT is used in place of
+** YY_SHIFT_USE_DFLT.
+**
+** The following are the tables generated in this section:
+**
+**  yy_action[]        A single table containing all actions.
+**  yy_lookahead[]     A table containing the lookahead for each entry in
+**                     yy_action.  Used to detect hash collisions.
+**  yy_shift_ofst[]    For each state, the offset into yy_action for
+**                     shifting terminals.
+**  yy_reduce_ofst[]   For each state, the offset into yy_action for
+**                     shifting non-terminals after a reduce.
+**  yy_default[]       Default action for each state.
+*/
+static const YYACTIONTYPE yy_action[] = {
+ /*     0 */   292,  901,  124,  587,  409,  172,    2,  418,   61,   61,
+ /*    10 */    61,   61,  519,   63,   63,   63,   63,   64,   64,   65,
+ /*    20 */    65,   65,   66,  210,  447,  212,  425,  431,   68,   63,
+ /*    30 */    63,   63,   63,   64,   64,   65,   65,   65,   66,  210,
+ /*    40 */   391,  388,  396,  451,   60,   59,  297,  435,  436,  432,
+ /*    50 */   432,   62,   62,   61,   61,   61,   61,  263,   63,   63,
+ /*    60 */    63,   63,   64,   64,   65,   65,   65,   66,  210,  292,
+ /*    70 */   493,  494,  418,  489,  208,   82,   67,  420,   69,  154,
+ /*    80 */    63,   63,   63,   63,   64,   64,   65,   65,   65,   66,
+ /*    90 */   210,   67,  462,   69,  154,  425,  431,  573,  264,   58,
+ /*   100 */    64,   64,   65,   65,   65,   66,  210,  397,  398,  422,
+ /*   110 */   422,  422,  292,   60,   59,  297,  435,  436,  432,  432,
+ /*   120 */    62,   62,   61,   61,   61,   61,  317,   63,   63,   63,
+ /*   130 */    63,   64,   64,   65,   65,   65,   66,  210,  425,  431,
+ /*   140 */    94,   65,   65,   65,   66,  210,  396,  210,  414,   34,
+ /*   150 */    56,  298,  442,  443,  410,  488,   60,   59,  297,  435,
+ /*   160 */   436,  432,  432,   62,   62,   61,   61,   61,   61,  490,
+ /*   170 */    63,   63,   63,   63,   64,   64,   65,   65,   65,   66,
+ /*   180 */   210,  292,  257,  524,  295,  571,  113,  408,  522,  451,
+ /*   190 */   331,  317,  407,   20,  418,  340,  519,  396,  532,  531,
+ /*   200 */   505,  447,  212,  570,  569,  208,  530,  425,  431,  149,
+ /*   210 */   150,  397,  398,  414,   41,  211,  151,  533,  372,  489,
+ /*   220 */   261,  568,  259,  420,  292,   60,   59,  297,  435,  436,
+ /*   230 */   432,  432,   62,   62,   61,   61,   61,   61,  317,   63,
+ /*   240 */    63,   63,   63,   64,   64,   65,   65,   65,   66,  210,
+ /*   250 */   425,  431,  447,  333,  215,  422,  422,  422,  363,  418,
+ /*   260 */   414,   41,  397,  398,  366,  567,  211,  292,   60,   59,
+ /*   270 */   297,  435,  436,  432,  432,   62,   62,   61,   61,   61,
+ /*   280 */    61,  396,   63,   63,   63,   63,   64,   64,   65,   65,
+ /*   290 */    65,   66,  210,  425,  431,  491,  300,  524,  474,   66,
+ /*   300 */   210,  214,  474,  229,  411,  286,  534,   20,  449,  523,
+ /*   310 */   168,   60,   59,  297,  435,  436,  432,  432,   62,   62,
+ /*   320 */    61,   61,   61,   61,  474,   63,   63,   63,   63,   64,
+ /*   330 */    64,   65,   65,   65,   66,  210,  209,  480,  317,   77,
+ /*   340 */   292,  239,  300,   55,  484,  230,  397,  398,  181,  547,
+ /*   350 */   494,  345,  348,  349,   67,  152,   69,  154,  339,  524,
+ /*   360 */   414,   35,  350,  241,  221,  370,  425,  431,  578,   20,
+ /*   370 */   164,  118,  243,  343,  248,  344,  176,  322,  442,  443,
+ /*   380 */   414,    3,   80,  252,   60,   59,  297,  435,  436,  432,
+ /*   390 */   432,   62,   62,   61,   61,   61,   61,  174,   63,   63,
+ /*   400 */    63,   63,   64,   64,   65,   65,   65,   66,  210,  292,
+ /*   410 */   221,  550,  236,  487,  510,  353,  317,  118,  243,  343,
+ /*   420 */   248,  344,  176,  181,  317,  525,  345,  348,  349,  252,
+ /*   430 */   223,  415,  155,  464,  511,  425,  431,  350,  414,   34,
+ /*   440 */   465,  211,  177,  175,  160,  237,  414,   34,  338,  549,
+ /*   450 */   449,  323,  168,   60,   59,  297,  435,  436,  432,  432,
+ /*   460 */    62,   62,   61,   61,   61,   61,  415,   63,   63,   63,
+ /*   470 */    63,   64,   64,   65,   65,   65,   66,  210,  292,  542,
+ /*   480 */   335,  517,  504,  541,  456,  571,  302,   19,  331,  144,
+ /*   490 */   317,  390,  317,  330,    2,  362,  457,  294,  483,  373,
+ /*   500 */   269,  268,  252,  570,  425,  431,  588,  391,  388,  458,
+ /*   510 */   208,  495,  414,   49,  414,   49,  303,  585,  892,  159,
+ /*   520 */   892,  496,   60,   59,  297,  435,  436,  432,  432,   62,
+ /*   530 */    62,   61,   61,   61,   61,  201,   63,   63,   63,   63,
+ /*   540 */    64,   64,   65,   65,   65,   66,  210,  292,  317,  181,
+ /*   550 */   439,  255,  345,  348,  349,  370,  153,  582,  308,  251,
+ /*   560 */   309,  452,   76,  350,   78,  382,  211,  426,  427,  415,
+ /*   570 */   414,   27,  319,  425,  431,  440,    1,   22,  585,  891,
+ /*   580 */   396,  891,  544,  478,  320,  263,  438,  438,  429,  430,
+ /*   590 */   415,   60,   59,  297,  435,  436,  432,  432,   62,   62,
+ /*   600 */    61,   61,   61,   61,  328,   63,   63,   63,   63,   64,
+ /*   610 */    64,   65,   65,   65,   66,  210,  292,  428,  582,  374,
+ /*   620 */   224,   93,  517,    9,  336,  396,  557,  396,  456,   67,
+ /*   630 */   396,   69,  154,  399,  400,  401,  320,  238,  438,  438,
+ /*   640 */   457,  318,  425,  431,  299,  397,  398,  320,  433,  438,
+ /*   650 */   438,  581,  291,  458,  225,  327,    5,  222,  546,  292,
+ /*   660 */    60,   59,  297,  435,  436,  432,  432,   62,   62,   61,
+ /*   670 */    61,   61,   61,  395,   63,   63,   63,   63,   64,   64,
+ /*   680 */    65,   65,   65,   66,  210,  425,  431,  482,  313,  392,
+ /*   690 */   397,  398,  397,  398,  207,  397,  398,  824,  273,  517,
+ /*   700 */   251,  200,  292,   60,   59,  297,  435,  436,  432,  432,
+ /*   710 */    62,   62,   61,   61,   61,   61,  470,   63,   63,   63,
+ /*   720 */    63,   64,   64,   65,   65,   65,   66,  210,  425,  431,
+ /*   730 */   171,  160,  263,  263,  304,  415,  276,  119,  274,  263,
+ /*   740 */   517,  517,  263,  517,  192,  292,   60,   70,  297,  435,
+ /*   750 */   436,  432,  432,   62,   62,   61,   61,   61,   61,  379,
+ /*   760 */    63,   63,   63,   63,   64,   64,   65,   65,   65,   66,
+ /*   770 */   210,  425,  431,  384,  559,  305,  306,  251,  415,  320,
+ /*   780 */   560,  438,  438,  561,  540,  360,  540,  387,  292,  196,
+ /*   790 */    59,  297,  435,  436,  432,  432,   62,   62,   61,   61,
+ /*   800 */    61,   61,  371,   63,   63,   63,   63,   64,   64,   65,
+ /*   810 */    65,   65,   66,  210,  425,  431,  396,  275,  251,  251,
+ /*   820 */   172,  250,  418,  415,  386,  367,  178,  179,  180,  469,
+ /*   830 */   311,  123,  156,  128,  297,  435,  436,  432,  432,   62,
+ /*   840 */    62,   61,   61,   61,   61,  317,   63,   63,   63,   63,
+ /*   850 */    64,   64,   65,   65,   65,   66,  210,   72,  324,  177,
+ /*   860 */     4,  317,  263,  317,  296,  263,  415,  414,   28,  317,
+ /*   870 */   263,  317,  321,   72,  324,  317,    4,  421,  445,  445,
+ /*   880 */   296,  397,  398,  414,   23,  414,   32,  418,  321,  326,
+ /*   890 */   329,  414,   53,  414,   52,  317,  158,  414,   98,  451,
+ /*   900 */   317,  194,  317,  277,  317,  326,  378,  471,  502,  317,
+ /*   910 */   478,  279,  478,  165,  294,  451,  317,  414,   96,   75,
+ /*   920 */    74,  469,  414,  101,  414,  102,  414,  112,   73,  315,
+ /*   930 */   316,  414,  114,  420,  448,   75,   74,  481,  414,   16,
+ /*   940 */   381,  317,  183,  467,   73,  315,  316,   72,  324,  420,
+ /*   950 */     4,  208,  317,  186,  296,  317,  499,  500,  476,  208,
+ /*   960 */   173,  341,  321,  414,   99,  422,  422,  422,  423,  424,
+ /*   970 */    11,  361,  380,  307,  414,   33,  415,  414,   97,  326,
+ /*   980 */   460,  422,  422,  422,  423,  424,   11,  415,  413,  451,
+ /*   990 */   413,  162,  412,  317,  412,  468,  226,  227,  228,  104,
+ /*  1000 */    84,  473,  317,  509,  508,  317,  622,  477,  317,   75,
+ /*  1010 */    74,  249,  205,   21,  281,  414,   24,  418,   73,  315,
+ /*  1020 */   316,  282,  317,  420,  414,   54,  507,  414,  115,  317,
+ /*  1030 */   414,  116,  506,  203,  147,  549,  244,  512,  526,  202,
+ /*  1040 */   317,  513,  204,  317,  414,  117,  317,  245,  317,   18,
+ /*  1050 */   317,  414,   25,  317,  256,  422,  422,  422,  423,  424,
+ /*  1060 */    11,  258,  414,   36,  260,  414,   37,  317,  414,   26,
+ /*  1070 */   414,   38,  414,   39,  262,  414,   40,  317,  514,  317,
+ /*  1080 */   128,  317,  418,  317,  189,  377,  278,  268,  267,  414,
+ /*  1090 */    42,  293,  317,  254,  317,  128,  208,  365,    8,  414,
+ /*  1100 */    43,  414,   44,  414,   29,  414,   30,  352,  368,  128,
+ /*  1110 */   317,  545,  317,  128,  414,   45,  414,   46,  317,  583,
+ /*  1120 */   383,  553,  317,  173,  554,  317,   91,  317,  564,  369,
+ /*  1130 */    91,  357,  414,   47,  414,   48,  580,  270,  290,  271,
+ /*  1140 */   414,   31,  272,  556,  414,   10,  566,  414,   50,  414,
+ /*  1150 */    51,  280,  283,  284,  577,  146,  463,  405,  584,  231,
+ /*  1160 */   325,  419,  444,  466,  446,  246,  505,  552,  563,  515,
+ /*  1170 */   516,  520,  163,  518,  394,  347,    7,  402,  403,  404,
+ /*  1180 */   314,   84,  232,  334,  332,   83,   79,  416,  170,   57,
+ /*  1190 */   213,  461,  125,   85,  337,  342,  492,  301,  233,  498,
+ /*  1200 */   497,  105,  502,  219,  354,  247,  521,  234,  501,  235,
+ /*  1210 */   287,  417,  503,  218,  527,  528,  529,  358,  240,  535,
+ /*  1220 */   475,  242,  288,  479,  356,  184,  185,  121,  187,  132,
+ /*  1230 */   188,  548,  537,   88,  190,  193,  364,  142,  375,  376,
+ /*  1240 */   555,  133,  220,  562,  134,  310,  135,  138,  136,  574,
+ /*  1250 */   575,  141,  576,  265,  579,  100,  538,  217,  393,   92,
+ /*  1260 */   103,   95,  406,  623,  624,  166,  434,  167,  437,   71,
+ /*  1270 */   453,  441,  450,   17,  143,  157,  169,    6,  111,   13,
+ /*  1280 */   454,  455,  459,  472,  126,   81,   12,  127,  161,  485,
+ /*  1290 */   486,  216,   86,  122,  106,  182,  253,  346,  312,  107,
+ /*  1300 */   120,   87,  351,  108,  245,  355,  145,  536,  359,  129,
+ /*  1310 */   173,  266,  191,  109,  289,  551,  130,  539,  195,  543,
+ /*  1320 */   131,   14,  197,  199,  198,  558,  137,  139,  140,  110,
+ /*  1330 */    15,  285,  572,  206,  389,  565,  385,  148,  586,  902,
+ /*  1340 */   902,  902,  902,  902,  902,   89,   90,
+};
+static const YYCODETYPE yy_lookahead[] = {
+ /*     0 */    16,  139,  140,  141,  168,   21,  144,   23,   69,   70,
+ /*    10 */    71,   72,  176,   74,   75,   76,   77,   78,   79,   80,
+ /*    20 */    81,   82,   83,   84,   78,   79,   42,   43,   73,   74,
+ /*    30 */    75,   76,   77,   78,   79,   80,   81,   82,   83,   84,
+ /*    40 */     1,    2,   23,   58,   60,   61,   62,   63,   64,   65,
+ /*    50 */    66,   67,   68,   69,   70,   71,   72,  147,   74,   75,
+ /*    60 */    76,   77,   78,   79,   80,   81,   82,   83,   84,   16,
+ /*    70 */   185,  186,   88,   88,  110,   22,  217,   92,  219,  220,
+ /*    80 */    74,   75,   76,   77,   78,   79,   80,   81,   82,   83,
+ /*    90 */    84,  217,  218,  219,  220,   42,   43,  238,  188,   46,
+ /*   100 */    78,   79,   80,   81,   82,   83,   84,   88,   89,  124,
+ /*   110 */   125,  126,   16,   60,   61,   62,   63,   64,   65,   66,
+ /*   120 */    67,   68,   69,   70,   71,   72,  147,   74,   75,   76,
+ /*   130 */    77,   78,   79,   80,   81,   82,   83,   84,   42,   43,
+ /*   140 */    44,   80,   81,   82,   83,   84,   23,   84,  169,  170,
+ /*   150 */    19,  164,  165,  166,   23,  169,   60,   61,   62,   63,
+ /*   160 */    64,   65,   66,   67,   68,   69,   70,   71,   72,  169,
+ /*   170 */    74,   75,   76,   77,   78,   79,   80,   81,   82,   83,
+ /*   180 */    84,   16,   14,  147,  150,  147,   21,  167,  168,   58,
+ /*   190 */   211,  147,  156,  157,   23,  216,  176,   23,  181,  176,
+ /*   200 */   177,   78,   79,  165,  166,  110,  183,   42,   43,   78,
+ /*   210 */    79,   88,   89,  169,  170,  228,  180,  181,  123,   88,
+ /*   220 */    52,   98,   54,   92,   16,   60,   61,   62,   63,   64,
+ /*   230 */    65,   66,   67,   68,   69,   70,   71,   72,  147,   74,
+ /*   240 */    75,   76,   77,   78,   79,   80,   81,   82,   83,   84,
+ /*   250 */    42,   43,   78,  209,  210,  124,  125,  126,  224,   88,
+ /*   260 */   169,  170,   88,   89,  230,  227,  228,   16,   60,   61,
+ /*   270 */    62,   63,   64,   65,   66,   67,   68,   69,   70,   71,
+ /*   280 */    72,   23,   74,   75,   76,   77,   78,   79,   80,   81,
+ /*   290 */    82,   83,   84,   42,   43,  160,   16,  147,  161,   83,
+ /*   300 */    84,  210,  161,  153,  169,  158,  156,  157,  161,  162,
+ /*   310 */   163,   60,   61,   62,   63,   64,   65,   66,   67,   68,
+ /*   320 */    69,   70,   71,   72,  161,   74,   75,   76,   77,   78,
+ /*   330 */    79,   80,   81,   82,   83,   84,  192,  200,  147,  131,
+ /*   340 */    16,  200,   16,  199,   20,  190,   88,   89,   90,  185,
+ /*   350 */   186,   93,   94,   95,  217,   22,  219,  220,  147,  147,
+ /*   360 */   169,  170,  104,  200,   84,  147,   42,   43,  156,  157,
+ /*   370 */    90,   91,   92,   93,   94,   95,   96,  164,  165,  166,
+ /*   380 */   169,  170,  131,  103,   60,   61,   62,   63,   64,   65,
+ /*   390 */    66,   67,   68,   69,   70,   71,   72,  155,   74,   75,
+ /*   400 */    76,   77,   78,   79,   80,   81,   82,   83,   84,   16,
+ /*   410 */    84,   11,  221,   20,   30,   16,  147,   91,   92,   93,
+ /*   420 */    94,   95,   96,   90,  147,  181,   93,   94,   95,  103,
+ /*   430 */   212,  189,  155,   27,   50,   42,   43,  104,  169,  170,
+ /*   440 */    34,  228,   43,  201,  202,  147,  169,  170,  206,   49,
+ /*   450 */   161,  162,  163,   60,   61,   62,   63,   64,   65,   66,
+ /*   460 */    67,   68,   69,   70,   71,   72,  189,   74,   75,   76,
+ /*   470 */    77,   78,   79,   80,   81,   82,   83,   84,   16,   25,
+ /*   480 */   211,  147,   20,   29,   12,  147,  102,   19,  211,   21,
+ /*   490 */   147,  141,  147,  216,  144,   41,   24,   98,   20,   99,
+ /*   500 */   100,  101,  103,  165,   42,   43,    0,    1,    2,   37,
+ /*   510 */   110,   39,  169,  170,  169,  170,  182,   19,   20,  147,
+ /*   520 */    22,   49,   60,   61,   62,   63,   64,   65,   66,   67,
+ /*   530 */    68,   69,   70,   71,   72,  155,   74,   75,   76,   77,
+ /*   540 */    78,   79,   80,   81,   82,   83,   84,   16,  147,   90,
+ /*   550 */    20,   20,   93,   94,   95,  147,  155,   59,  215,  225,
+ /*   560 */   215,   20,  130,  104,  132,  227,  228,   42,   43,  189,
+ /*   570 */   169,  170,   16,   42,   43,   20,   19,   22,   19,   20,
+ /*   580 */    23,   22,   18,  147,  106,  147,  108,  109,   63,   64,
+ /*   590 */   189,   60,   61,   62,   63,   64,   65,   66,   67,   68,
+ /*   600 */    69,   70,   71,   72,  186,   74,   75,   76,   77,   78,
+ /*   610 */    79,   80,   81,   82,   83,   84,   16,   92,   59,   55,
+ /*   620 */   212,   21,  147,   19,  147,   23,  188,   23,   12,  217,
+ /*   630 */    23,  219,  220,    7,    8,    9,  106,  147,  108,  109,
+ /*   640 */    24,  147,   42,   43,  208,   88,   89,  106,   92,  108,
+ /*   650 */   109,  244,  245,   37,  145,   39,  191,  182,   94,   16,
+ /*   660 */    60,   61,   62,   63,   64,   65,   66,   67,   68,   69,
+ /*   670 */    70,   71,   72,  147,   74,   75,   76,   77,   78,   79,
+ /*   680 */    80,   81,   82,   83,   84,   42,   43,   80,  142,  143,
+ /*   690 */    88,   89,   88,   89,  148,   88,   89,  133,   14,  147,
+ /*   700 */   225,  155,   16,   60,   61,   62,   63,   64,   65,   66,
+ /*   710 */    67,   68,   69,   70,   71,   72,  114,   74,   75,   76,
+ /*   720 */    77,   78,   79,   80,   81,   82,   83,   84,   42,   43,
+ /*   730 */   201,  202,  147,  147,  182,  189,   52,  147,   54,  147,
+ /*   740 */   147,  147,  147,  147,  155,   16,   60,   61,   62,   63,
+ /*   750 */    64,   65,   66,   67,   68,   69,   70,   71,   72,  213,
+ /*   760 */    74,   75,   76,   77,   78,   79,   80,   81,   82,   83,
+ /*   770 */    84,   42,   43,  188,  188,  182,  182,  225,  189,  106,
+ /*   780 */   188,  108,  109,  188,   99,  100,  101,  241,   16,  155,
+ /*   790 */    61,   62,   63,   64,   65,   66,   67,   68,   69,   70,
+ /*   800 */    71,   72,  213,   74,   75,   76,   77,   78,   79,   80,
+ /*   810 */    81,   82,   83,   84,   42,   43,   23,  133,  225,  225,
+ /*   820 */    21,  225,   23,  189,  239,  236,   99,  100,  101,   22,
+ /*   830 */   242,  243,  155,   22,   62,   63,   64,   65,   66,   67,
+ /*   840 */    68,   69,   70,   71,   72,  147,   74,   75,   76,   77,
+ /*   850 */    78,   79,   80,   81,   82,   83,   84,   16,   17,   43,
+ /*   860 */    19,  147,  147,  147,   23,  147,  189,  169,  170,  147,
+ /*   870 */   147,  147,   31,   16,   17,  147,   19,  147,  124,  125,
+ /*   880 */    23,   88,   89,  169,  170,  169,  170,   88,   31,   48,
+ /*   890 */   147,  169,  170,  169,  170,  147,   89,  169,  170,   58,
+ /*   900 */   147,   22,  147,  188,  147,   48,  188,  114,   97,  147,
+ /*   910 */   147,  188,  147,   19,   98,   58,  147,  169,  170,   78,
+ /*   920 */    79,  114,  169,  170,  169,  170,  169,  170,   87,   88,
+ /*   930 */    89,  169,  170,   92,  161,   78,   79,   80,  169,  170,
+ /*   940 */    91,  147,  155,   22,   87,   88,   89,   16,   17,   92,
+ /*   950 */    19,  110,  147,  155,   23,  147,    7,    8,   20,  110,
+ /*   960 */    22,   80,   31,  169,  170,  124,  125,  126,  127,  128,
+ /*   970 */   129,  208,  123,  208,  169,  170,  189,  169,  170,   48,
+ /*   980 */   147,  124,  125,  126,  127,  128,  129,  189,  107,   58,
+ /*   990 */   107,    5,  111,  147,  111,  203,   10,   11,   12,   13,
+ /*  1000 */   121,  147,  147,   91,   92,  147,  112,  147,  147,   78,
+ /*  1010 */    79,  147,   26,   19,   28,  169,  170,   23,   87,   88,
+ /*  1020 */    89,   35,  147,   92,  169,  170,  178,  169,  170,  147,
+ /*  1030 */   169,  170,  147,   47,  113,   49,   92,  178,  147,   53,
+ /*  1040 */   147,  178,   56,  147,  169,  170,  147,  103,  147,   19,
+ /*  1050 */   147,  169,  170,  147,  147,  124,  125,  126,  127,  128,
+ /*  1060 */   129,  147,  169,  170,  147,  169,  170,  147,  169,  170,
+ /*  1070 */   169,  170,  169,  170,  147,  169,  170,  147,   20,  147,
+ /*  1080 */    22,  147,   88,  147,  232,   99,  100,  101,  147,  169,
+ /*  1090 */   170,  105,  147,   20,  147,   22,  110,  147,   68,  169,
+ /*  1100 */   170,  169,  170,  169,  170,  169,  170,   20,  147,   22,
+ /*  1110 */   147,   20,  147,   22,  169,  170,  169,  170,  147,   20,
+ /*  1120 */   134,   20,  147,   22,   20,  147,   22,  147,   20,  147,
+ /*  1130 */    22,  233,  169,  170,  169,  170,   20,  147,   22,  147,
+ /*  1140 */   169,  170,  147,  147,  169,  170,  147,  169,  170,  169,
+ /*  1150 */   170,  147,  147,  147,  147,  191,  172,  149,   59,  193,
+ /*  1160 */   223,  161,  229,  172,  229,  172,  177,  194,  194,  172,
+ /*  1170 */   161,  161,    6,  172,  146,  173,   22,  146,  146,  146,
+ /*  1180 */   154,  121,  194,  118,  116,  119,  130,  189,  112,  120,
+ /*  1190 */   222,  152,  152,   98,  115,   98,  171,   40,  195,  179,
+ /*  1200 */   171,   19,   97,   84,   15,  171,  179,  196,  173,  197,
+ /*  1210 */   174,  198,  171,  226,  171,  171,  171,   38,  204,  152,
+ /*  1220 */   205,  204,  174,  205,  152,  151,  151,   60,  151,   19,
+ /*  1230 */   152,  184,  152,  130,  151,  184,  152,  214,  152,   15,
+ /*  1240 */   194,  187,  226,  194,  187,  152,  187,  184,  187,   33,
+ /*  1250 */   152,  214,  152,  234,  137,  159,  235,  175,    1,  237,
+ /*  1260 */   175,  237,   20,  112,  112,  112,   92,  112,  107,   19,
+ /*  1270 */    11,   20,   20,  231,   19,   19,   22,  117,  240,  117,
+ /*  1280 */    20,   20,   20,  114,   19,   22,   22,   20,  112,   20,
+ /*  1290 */    20,   44,   19,  243,   19,   96,   20,   44,  246,   19,
+ /*  1300 */    32,   19,   44,   19,  103,   16,   21,   17,   36,   98,
+ /*  1310 */    22,  133,   98,   19,    5,    1,   45,   51,  122,   45,
+ /*  1320 */   102,   19,  113,  115,   14,   17,  113,  102,  122,   14,
+ /*  1330 */    19,  136,   20,  135,    3,  123,   57,   19,    4,  247,
+ /*  1340 */   247,  247,  247,  247,  247,   68,   68,
+};
+#define YY_SHIFT_USE_DFLT (-62)
+#define YY_SHIFT_MAX 389
+static const short yy_shift_ofst[] = {
+ /*     0 */    39,  841,  986,  -16,  841,  931,  931,  258,  123,  -36,
+ /*    10 */    96,  931,  931,  931,  931,  931,  -45,  400,  174,   19,
+ /*    20 */   171,  -54,  -54,   53,  165,  208,  251,  324,  393,  462,
+ /*    30 */   531,  600,  643,  686,  643,  643,  643,  643,  643,  643,
+ /*    40 */   643,  643,  643,  643,  643,  643,  643,  643,  643,  643,
+ /*    50 */   643,  643,  729,  772,  772,  857,  931,  931,  931,  931,
+ /*    60 */   931,  931,  931,  931,  931,  931,  931,  931,  931,  931,
+ /*    70 */   931,  931,  931,  931,  931,  931,  931,  931,  931,  931,
+ /*    80 */   931,  931,  931,  931,  931,  931,  931,  931,  931,  931,
+ /*    90 */   931,  931,  931,  931,  931,  931,  -61,  -61,    6,    6,
+ /*   100 */   280,   22,   61,  399,  564,   19,   19,   19,   19,   19,
+ /*   110 */    19,   19,  216,  171,   63,  -62,  -62,  -62,  131,  326,
+ /*   120 */   472,  472,  498,  559,  506,  799,   19,  799,   19,   19,
+ /*   130 */    19,   19,   19,   19,   19,   19,   19,   19,   19,   19,
+ /*   140 */    19,  849,   95,  -36,  -36,  -36,  -62,  -62,  -62,  -15,
+ /*   150 */   -15,  333,  459,  478,  557,  530,  541,  616,  602,  793,
+ /*   160 */   604,  607,  626,   19,   19,  881,   19,   19,  994,   19,
+ /*   170 */    19,  807,   19,   19,  673,  807,   19,   19,  384,  384,
+ /*   180 */   384,   19,   19,  673,   19,   19,  673,   19,  454,  685,
+ /*   190 */    19,   19,  673,   19,   19,   19,  673,   19,   19,   19,
+ /*   200 */   673,  673,   19,   19,   19,   19,   19,  468,  883,  921,
+ /*   210 */   171,  754,  754,  432,  406,  406,  406,  816,  406,  171,
+ /*   220 */   406,  171,  811,  879,  879, 1166, 1166, 1166, 1166, 1154,
+ /*   230 */   -36, 1060, 1065, 1066, 1068, 1069, 1056, 1076, 1076, 1095,
+ /*   240 */  1079, 1095, 1079, 1097, 1097, 1157, 1097, 1105, 1097, 1182,
+ /*   250 */  1119, 1119, 1157, 1097, 1097, 1097, 1182, 1189, 1076, 1189,
+ /*   260 */  1076, 1189, 1076, 1076, 1179, 1103, 1189, 1076, 1167, 1167,
+ /*   270 */  1210, 1060, 1076, 1224, 1224, 1224, 1224, 1060, 1167, 1210,
+ /*   280 */  1076, 1216, 1216, 1076, 1076, 1117,  -62,  -62,  -62,  -62,
+ /*   290 */   -62,  -62,  525,  684,  727,  168,  894,  556,  555,  938,
+ /*   300 */   944,  949,  912, 1058, 1073, 1087, 1091, 1101, 1104, 1108,
+ /*   310 */  1030, 1116, 1099, 1257, 1242, 1151, 1152, 1153, 1155, 1174,
+ /*   320 */  1161, 1250, 1251, 1252, 1255, 1259, 1256, 1260, 1254, 1261,
+ /*   330 */  1262, 1263, 1160, 1264, 1162, 1263, 1169, 1265, 1267, 1176,
+ /*   340 */  1269, 1270, 1268, 1247, 1273, 1253, 1275, 1276, 1280, 1282,
+ /*   350 */  1258, 1284, 1199, 1201, 1289, 1290, 1285, 1211, 1272, 1266,
+ /*   360 */  1271, 1288, 1274, 1178, 1214, 1294, 1309, 1314, 1218, 1277,
+ /*   370 */  1278, 1196, 1302, 1209, 1310, 1208, 1308, 1213, 1225, 1206,
+ /*   380 */  1311, 1212, 1312, 1315, 1279, 1198, 1195, 1318, 1331, 1334,
+};
+#define YY_REDUCE_USE_DFLT (-165)
+#define YY_REDUCE_MAX 291
+static const short yy_reduce_ofst[] = {
+ /*     0 */  -138,  277,  546,  137,  401,  -21,   44,   36,   38,  242,
+ /*    10 */  -141,  191,   91,  269,  343,  345, -126,  589,  338,  150,
+ /*    20 */   147,  -13,  213,  412,  412,  412,  412,  412,  412,  412,
+ /*    30 */   412,  412,  412,  412,  412,  412,  412,  412,  412,  412,
+ /*    40 */   412,  412,  412,  412,  412,  412,  412,  412,  412,  412,
+ /*    50 */   412,  412,  412,  412,  412,  211,  698,  714,  716,  722,
+ /*    60 */   724,  728,  748,  753,  755,  757,  762,  769,  794,  805,
+ /*    70 */   808,  846,  855,  858,  861,  875,  882,  893,  896,  899,
+ /*    80 */   901,  903,  906,  920,  930,  932,  934,  936,  945,  947,
+ /*    90 */   963,  965,  971,  975,  978,  980,  412,  412,  412,  412,
+ /*   100 */    20,  412,  412,   23,   34,  334,  475,  552,  593,  594,
+ /*   110 */   585,  212,  412,  289,  412,  412,  412,  412,  135, -164,
+ /*   120 */  -115,  164,  407,  407,  350,  141,  436,  163,  596,  -90,
+ /*   130 */   763,  218,  765,  438,  586,  592,  595,  715,  718,  408,
+ /*   140 */   723,  380,  634,  677,  787,  798,  144,  529,  588,  -14,
+ /*   150 */     0,   17,  244,  155,  298,  155,  155,  418,  372,  477,
+ /*   160 */   490,  494,  509,  526,  590,  465,  494,  730,  773,  743,
+ /*   170 */   833,  792,  854,  860,  155,  792,  864,  885,  848,  859,
+ /*   180 */   863,  891,  907,  155,  914,  917,  155,  927,  852,  898,
+ /*   190 */   941,  950,  155,  961,  982,  990,  155,  992,  995,  996,
+ /*   200 */   155,  155,  999, 1004, 1005, 1006, 1007, 1008,  964,  966,
+ /*   210 */  1000,  933,  935,  937,  984,  991,  993,  989,  997, 1009,
+ /*   220 */  1001, 1010, 1002,  973,  974, 1028, 1031, 1032, 1033, 1026,
+ /*   230 */   998,  988, 1003, 1011, 1012, 1013,  968, 1039, 1040, 1014,
+ /*   240 */  1015, 1017, 1018, 1025, 1029, 1020, 1034, 1035, 1041, 1036,
+ /*   250 */   987, 1016, 1027, 1043, 1044, 1045, 1048, 1074, 1067, 1075,
+ /*   260 */  1072, 1077, 1078, 1080, 1019, 1021, 1083, 1084, 1047, 1051,
+ /*   270 */  1023, 1046, 1086, 1054, 1057, 1059, 1061, 1049, 1063, 1037,
+ /*   280 */  1093, 1022, 1024, 1098, 1100, 1038, 1096, 1082, 1085, 1042,
+ /*   290 */  1050, 1052,
+};
+static const YYACTIONTYPE yy_default[] = {
+ /*     0 */   594,  819,  900,  709,  900,  819,  900,  900,  846,  713,
+ /*    10 */   875,  817,  900,  900,  900,  900,  791,  900,  846,  900,
+ /*    20 */   625,  846,  846,  742,  900,  900,  900,  900,  900,  900,
+ /*    30 */   900,  900,  743,  900,  821,  816,  812,  814,  813,  820,
+ /*    40 */   744,  733,  740,  747,  725,  859,  749,  750,  756,  757,
+ /*    50 */   876,  874,  779,  778,  797,  900,  900,  900,  900,  900,
+ /*    60 */   900,  900,  900,  900,  900,  900,  900,  900,  900,  900,
+ /*    70 */   900,  900,  900,  900,  900,  900,  900,  900,  900,  900,
+ /*    80 */   900,  900,  900,  900,  900,  900,  900,  900,  900,  900,
+ /*    90 */   900,  900,  900,  900,  900,  900,  781,  803,  780,  790,
+ /*   100 */   618,  782,  783,  678,  613,  900,  900,  900,  900,  900,
+ /*   110 */   900,  900,  784,  900,  785,  798,  799,  800,  900,  900,
+ /*   120 */   900,  900,  900,  900,  594,  709,  900,  709,  900,  900,
+ /*   130 */   900,  900,  900,  900,  900,  900,  900,  900,  900,  900,
+ /*   140 */   900,  900,  900,  900,  900,  900,  703,  713,  893,  900,
+ /*   150 */   900,  669,  900,  900,  900,  900,  900,  900,  900,  900,
+ /*   160 */   900,  900,  601,  599,  900,  701,  900,  900,  627,  900,
+ /*   170 */   900,  711,  900,  900,  716,  717,  900,  900,  900,  900,
+ /*   180 */   900,  900,  900,  615,  900,  900,  690,  900,  852,  900,
+ /*   190 */   900,  900,  866,  900,  900,  900,  864,  900,  900,  900,
+ /*   200 */   692,  752,  833,  900,  879,  881,  900,  900,  701,  710,
+ /*   210 */   900,  900,  900,  815,  736,  736,  736,  648,  736,  900,
+ /*   220 */   736,  900,  651,  746,  746,  598,  598,  598,  598,  668,
+ /*   230 */   900,  746,  737,  739,  729,  741,  900,  718,  718,  726,
+ /*   240 */   728,  726,  728,  680,  680,  665,  680,  651,  680,  825,
+ /*   250 */   830,  830,  665,  680,  680,  680,  825,  610,  718,  610,
+ /*   260 */   718,  610,  718,  718,  856,  858,  610,  718,  682,  682,
+ /*   270 */   758,  746,  718,  689,  689,  689,  689,  746,  682,  758,
+ /*   280 */   718,  878,  878,  718,  718,  886,  635,  653,  653,  861,
+ /*   290 */   893,  898,  900,  900,  900,  900,  765,  900,  900,  900,
+ /*   300 */   900,  900,  900,  900,  900,  900,  900,  900,  900,  900,
+ /*   310 */   839,  900,  900,  900,  900,  770,  766,  900,  767,  900,
+ /*   320 */   695,  900,  900,  900,  900,  900,  900,  900,  900,  900,
+ /*   330 */   900,  818,  900,  730,  900,  738,  900,  900,  900,  900,
+ /*   340 */   900,  900,  900,  900,  900,  900,  900,  900,  900,  900,
+ /*   350 */   900,  900,  900,  900,  900,  900,  900,  900,  900,  900,
+ /*   360 */   854,  855,  900,  900,  900,  900,  900,  900,  900,  900,
+ /*   370 */   900,  900,  900,  900,  900,  900,  900,  900,  900,  900,
+ /*   380 */   900,  900,  900,  900,  885,  900,  900,  888,  595,  900,
+ /*   390 */   589,  592,  591,  593,  597,  600,  622,  623,  624,  602,
+ /*   400 */   603,  604,  605,  606,  607,  608,  614,  616,  634,  636,
+ /*   410 */   620,  638,  699,  700,  762,  693,  694,  698,  621,  773,
+ /*   420 */   764,  768,  769,  771,  772,  786,  787,  789,  795,  802,
+ /*   430 */   805,  788,  793,  794,  796,  801,  804,  696,  697,  808,
+ /*   440 */   628,  629,  632,  633,  842,  844,  843,  845,  631,  630,
+ /*   450 */   774,  777,  810,  811,  867,  868,  869,  870,  871,  806,
+ /*   460 */   719,  809,  792,  731,  734,  735,  732,  702,  712,  721,
+ /*   470 */   722,  723,  724,  707,  708,  714,  727,  760,  761,  715,
+ /*   480 */   704,  705,  706,  807,  763,  775,  776,  639,  640,  770,
+ /*   490 */   641,  642,  643,  681,  684,  685,  686,  644,  663,  666,
+ /*   500 */   667,  645,  652,  646,  647,  654,  655,  656,  659,  660,
+ /*   510 */   661,  662,  657,  658,  826,  827,  831,  829,  828,  649,
+ /*   520 */   650,  664,  637,  626,  619,  670,  673,  674,  675,  676,
+ /*   530 */   677,  679,  671,  672,  617,  609,  611,  720,  848,  857,
+ /*   540 */   853,  849,  850,  851,  612,  822,  823,  683,  754,  755,
+ /*   550 */   847,  860,  862,  759,  863,  865,  890,  687,  688,  691,
+ /*   560 */   832,  872,  745,  748,  751,  753,  834,  835,  836,  837,
+ /*   570 */   840,  841,  838,  873,  877,  880,  882,  883,  884,  887,
+ /*   580 */   889,  894,  895,  896,  899,  897,  596,  590,
+};
+#define YY_SZ_ACTTAB (int)(sizeof(yy_action)/sizeof(yy_action[0]))
+
+/* The next table maps tokens into fallback tokens.  If a construct
+** like the following:
+**
+**      %fallback ID X Y Z.
+**
+** appears in the grammer, then ID becomes a fallback token for X, Y,
+** and Z.  Whenever one of the tokens X, Y, or Z is input to the parser
+** but it does not parse, the type of the token is changed to ID and
+** the parse is retried before an error is thrown.
+*/
+#ifdef YYFALLBACK
+static const YYCODETYPE yyFallback[] = {
+    0,  /*          $ => nothing */
+    0,  /*       SEMI => nothing */
+   23,  /*    EXPLAIN => ID */
+   23,  /*      QUERY => ID */
+   23,  /*       PLAN => ID */
+   23,  /*      BEGIN => ID */
+    0,  /* TRANSACTION => nothing */
+   23,  /*   DEFERRED => ID */
+   23,  /*  IMMEDIATE => ID */
+   23,  /*  EXCLUSIVE => ID */
+    0,  /*     COMMIT => nothing */
+   23,  /*        END => ID */
+    0,  /*   ROLLBACK => nothing */
+    0,  /*     CREATE => nothing */
+    0,  /*      TABLE => nothing */
+   23,  /*         IF => ID */
+    0,  /*        NOT => nothing */
+    0,  /*     EXISTS => nothing */
+   23,  /*       TEMP => ID */
+    0,  /*         LP => nothing */
+    0,  /*         RP => nothing */
+    0,  /*         AS => nothing */
+    0,  /*      COMMA => nothing */
+    0,  /*         ID => nothing */
+   23,  /*      ABORT => ID */
+   23,  /*      AFTER => ID */
+   23,  /*    ANALYZE => ID */
+   23,  /*        ASC => ID */
+   23,  /*     ATTACH => ID */
+   23,  /*     BEFORE => ID */
+   23,  /*    CASCADE => ID */
+   23,  /*       CAST => ID */
+   23,  /*   CONFLICT => ID */
+   23,  /*   DATABASE => ID */
+   23,  /*       DESC => ID */
+   23,  /*     DETACH => ID */
+   23,  /*       EACH => ID */
+   23,  /*       FAIL => ID */
+   23,  /*        FOR => ID */
+   23,  /*     IGNORE => ID */
+   23,  /*  INITIALLY => ID */
+   23,  /*    INSTEAD => ID */
+   23,  /*    LIKE_KW => ID */
+   23,  /*      MATCH => ID */
+   23,  /*        KEY => ID */
+   23,  /*         OF => ID */
+   23,  /*     OFFSET => ID */
+   23,  /*     PRAGMA => ID */
+   23,  /*      RAISE => ID */
+   23,  /*    REPLACE => ID */
+   23,  /*   RESTRICT => ID */
+   23,  /*        ROW => ID */
+   23,  /*    TRIGGER => ID */
+   23,  /*     VACUUM => ID */
+   23,  /*       VIEW => ID */
+   23,  /*    VIRTUAL => ID */
+   23,  /*    REINDEX => ID */
+   23,  /*     RENAME => ID */
+   23,  /*   CTIME_KW => ID */
+    0,  /*        ANY => nothing */
+    0,  /*         OR => nothing */
+    0,  /*        AND => nothing */
+    0,  /*         IS => nothing */
+    0,  /*    BETWEEN => nothing */
+    0,  /*         IN => nothing */
+    0,  /*     ISNULL => nothing */
+    0,  /*    NOTNULL => nothing */
+    0,  /*         NE => nothing */
+    0,  /*         EQ => nothing */
+    0,  /*         GT => nothing */
+    0,  /*         LE => nothing */
+    0,  /*         LT => nothing */
+    0,  /*         GE => nothing */
+    0,  /*     ESCAPE => nothing */
+    0,  /*     BITAND => nothing */
+    0,  /*      BITOR => nothing */
+    0,  /*     LSHIFT => nothing */
+    0,  /*     RSHIFT => nothing */
+    0,  /*       PLUS => nothing */
+    0,  /*      MINUS => nothing */
+    0,  /*       STAR => nothing */
+    0,  /*      SLASH => nothing */
+    0,  /*        REM => nothing */
+    0,  /*     CONCAT => nothing */
+    0,  /*    COLLATE => nothing */
+    0,  /*     UMINUS => nothing */
+    0,  /*      UPLUS => nothing */
+    0,  /*     BITNOT => nothing */
+    0,  /*     STRING => nothing */
+    0,  /*    JOIN_KW => nothing */
+    0,  /* CONSTRAINT => nothing */
+    0,  /*    DEFAULT => nothing */
+    0,  /*       NULL => nothing */
+    0,  /*    PRIMARY => nothing */
+    0,  /*     UNIQUE => nothing */
+    0,  /*      CHECK => nothing */
+    0,  /* REFERENCES => nothing */
+    0,  /*   AUTOINCR => nothing */
+    0,  /*         ON => nothing */
+    0,  /*     DELETE => nothing */
+    0,  /*     UPDATE => nothing */
+    0,  /*     INSERT => nothing */
+    0,  /*        SET => nothing */
+    0,  /* DEFERRABLE => nothing */
+    0,  /*    FOREIGN => nothing */
+    0,  /*       DROP => nothing */
+    0,  /*      UNION => nothing */
+    0,  /*        ALL => nothing */
+    0,  /*     EXCEPT => nothing */
+    0,  /*  INTERSECT => nothing */
+    0,  /*     SELECT => nothing */
+    0,  /*   DISTINCT => nothing */
+    0,  /*        DOT => nothing */
+    0,  /*       FROM => nothing */
+    0,  /*       JOIN => nothing */
+    0,  /*      USING => nothing */
+    0,  /*      ORDER => nothing */
+    0,  /*         BY => nothing */
+    0,  /*      GROUP => nothing */
+    0,  /*     HAVING => nothing */
+    0,  /*      LIMIT => nothing */
+    0,  /*      WHERE => nothing */
+    0,  /*       INTO => nothing */
+    0,  /*     VALUES => nothing */
+    0,  /*    INTEGER => nothing */
+    0,  /*      FLOAT => nothing */
+    0,  /*       BLOB => nothing */
+    0,  /*   REGISTER => nothing */
+    0,  /*   VARIABLE => nothing */
+    0,  /*       CASE => nothing */
+    0,  /*       WHEN => nothing */
+    0,  /*       THEN => nothing */
+    0,  /*       ELSE => nothing */
+    0,  /*      INDEX => nothing */
+    0,  /*      ALTER => nothing */
+    0,  /*         TO => nothing */
+    0,  /*        ADD => nothing */
+    0,  /*   COLUMNKW => nothing */
+};
+#endif /* YYFALLBACK */
+
+/* The following structure represents a single element of the
+** parser's stack.  Information stored includes:
+**
+**   +  The state number for the parser at this level of the stack.
+**
+**   +  The value of the token stored at this level of the stack.
+**      (In other words, the "major" token.)
+**
+**   +  The semantic value stored at this level of the stack.  This is
+**      the information used by the action routines in the grammar.
+**      It is sometimes called the "minor" token.
+*/
+struct yyStackEntry {
+  int stateno;       /* The state-number */
+  int major;         /* The major token value.  This is the code
+                     ** number for the token at this stack level */
+  YYMINORTYPE minor; /* The user-supplied minor token value.  This
+                     ** is the value of the token  */
+};
+typedef struct yyStackEntry yyStackEntry;
+
+/* The state of the parser is completely contained in an instance of
+** the following structure */
+struct yyParser {
+  int yyidx;                    /* Index of top element in stack */
+  int yyerrcnt;                 /* Shifts left before out of the error */
+  sqlite3ParserARG_SDECL                /* A place to hold %extra_argument */
+#if YYSTACKDEPTH<=0
+  int yystksz;                  /* Current side of the stack */
+  yyStackEntry *yystack;        /* The parser's stack */
+#else
+  yyStackEntry yystack[YYSTACKDEPTH];  /* The parser's stack */
+#endif
+};
+typedef struct yyParser yyParser;
+
+#ifndef NDEBUG
+#include <stdio.h>
+static FILE *yyTraceFILE = 0;
+static char *yyTracePrompt = 0;
+#endif /* NDEBUG */
+
+#ifndef NDEBUG
+/*
+** Turn parser tracing on by giving a stream to which to write the trace
+** and a prompt to preface each trace message.  Tracing is turned off
+** by making either argument NULL
+**
+** Inputs:
+** <ul>
+** <li> A FILE* to which trace output should be written.
+**      If NULL, then tracing is turned off.
+** <li> A prefix string written at the beginning of every
+**      line of trace output.  If NULL, then tracing is
+**      turned off.
+** </ul>
+**
+** Outputs:
+** None.
+*/
+void sqlite3ParserTrace(FILE *TraceFILE, char *zTracePrompt){
+  yyTraceFILE = TraceFILE;
+  yyTracePrompt = zTracePrompt;
+  if( yyTraceFILE==0 ) yyTracePrompt = 0;
+  else if( yyTracePrompt==0 ) yyTraceFILE = 0;
+}
+#endif /* NDEBUG */
+
+#ifndef NDEBUG
+/* For tracing shifts, the names of all terminals and nonterminals
+** are required.  The following table supplies these names */
+static const char *const yyTokenName[] = {
+  "$",             "SEMI",          "EXPLAIN",       "QUERY",
+  "PLAN",          "BEGIN",         "TRANSACTION",   "DEFERRED",
+  "IMMEDIATE",     "EXCLUSIVE",     "COMMIT",        "END",
+  "ROLLBACK",      "CREATE",        "TABLE",         "IF",
+  "NOT",           "EXISTS",        "TEMP",          "LP",
+  "RP",            "AS",            "COMMA",         "ID",
+  "ABORT",         "AFTER",         "ANALYZE",       "ASC",
+  "ATTACH",        "BEFORE",        "CASCADE",       "CAST",
+  "CONFLICT",      "DATABASE",      "DESC",          "DETACH",
+  "EACH",          "FAIL",          "FOR",           "IGNORE",
+  "INITIALLY",     "INSTEAD",       "LIKE_KW",       "MATCH",
+  "KEY",           "OF",            "OFFSET",        "PRAGMA",
+  "RAISE",         "REPLACE",       "RESTRICT",      "ROW",
+  "TRIGGER",       "VACUUM",        "VIEW",          "VIRTUAL",
+  "REINDEX",       "RENAME",        "CTIME_KW",      "ANY",
+  "OR",            "AND",           "IS",            "BETWEEN",
+  "IN",            "ISNULL",        "NOTNULL",       "NE",
+  "EQ",            "GT",            "LE",            "LT",
+  "GE",            "ESCAPE",        "BITAND",        "BITOR",
+  "LSHIFT",        "RSHIFT",        "PLUS",          "MINUS",
+  "STAR",          "SLASH",         "REM",           "CONCAT",
+  "COLLATE",       "UMINUS",        "UPLUS",         "BITNOT",
+  "STRING",        "JOIN_KW",       "CONSTRAINT",    "DEFAULT",
+  "NULL",          "PRIMARY",       "UNIQUE",        "CHECK",
+  "REFERENCES",    "AUTOINCR",      "ON",            "DELETE",
+  "UPDATE",        "INSERT",        "SET",           "DEFERRABLE",
+  "FOREIGN",       "DROP",          "UNION",         "ALL",
+  "EXCEPT",        "INTERSECT",     "SELECT",        "DISTINCT",
+  "DOT",           "FROM",          "JOIN",          "USING",
+  "ORDER",         "BY",            "GROUP",         "HAVING",
+  "LIMIT",         "WHERE",         "INTO",          "VALUES",
+  "INTEGER",       "FLOAT",         "BLOB",          "REGISTER",
+  "VARIABLE",      "CASE",          "WHEN",          "THEN",
+  "ELSE",          "INDEX",         "ALTER",         "TO",
+  "ADD",           "COLUMNKW",      "error",         "input",
+  "cmdlist",       "ecmd",          "cmdx",          "cmd",
+  "explain",       "transtype",     "trans_opt",     "nm",
+  "create_table",  "create_table_args",  "temp",          "ifnotexists",
+  "dbnm",          "columnlist",    "conslist_opt",  "select",
+  "column",        "columnid",      "type",          "carglist",
+  "id",            "ids",           "typetoken",     "typename",
+  "signed",        "plus_num",      "minus_num",     "carg",
+  "ccons",         "term",          "expr",          "onconf",
+  "sortorder",     "autoinc",       "idxlist_opt",   "refargs",
+  "defer_subclause",  "refarg",        "refact",        "init_deferred_pred_opt",
+  "conslist",      "tcons",         "idxlist",       "defer_subclause_opt",
+  "orconf",        "resolvetype",   "raisetype",     "ifexists",
+  "fullname",      "oneselect",     "multiselect_op",  "distinct",
+  "selcollist",    "from",          "where_opt",     "groupby_opt",
+  "having_opt",    "orderby_opt",   "limit_opt",     "sclp",
+  "as",            "seltablist",    "stl_prefix",    "joinop",
+  "on_opt",        "using_opt",     "seltablist_paren",  "joinop2",
+  "inscollist",    "sortlist",      "sortitem",      "nexprlist",
+  "setlist",       "insert_cmd",    "inscollist_opt",  "itemlist",
+  "exprlist",      "likeop",        "escape",        "between_op",
+  "in_op",         "case_operand",  "case_exprlist",  "case_else",
+  "uniqueflag",    "idxitem",       "collate",       "nmnum",
+  "plus_opt",      "number",        "trigger_decl",  "trigger_cmd_list",
+  "trigger_time",  "trigger_event",  "foreach_clause",  "when_clause",
+  "trigger_cmd",   "database_kw_opt",  "key_opt",       "add_column_fullname",
+  "kwcolumn_opt",  "create_vtab",   "vtabarglist",   "vtabarg",
+  "vtabargtoken",  "lp",            "anylist",
+};
+#endif /* NDEBUG */
+
+#ifndef NDEBUG
+/* For tracing reduce actions, the names of all rules are required.
+*/
+static const char *const yyRuleName[] = {
+ /*   0 */ "input ::= cmdlist",
+ /*   1 */ "cmdlist ::= cmdlist ecmd",
+ /*   2 */ "cmdlist ::= ecmd",
+ /*   3 */ "cmdx ::= cmd",
+ /*   4 */ "ecmd ::= SEMI",
+ /*   5 */ "ecmd ::= explain cmdx SEMI",
+ /*   6 */ "explain ::=",
+ /*   7 */ "explain ::= EXPLAIN",
+ /*   8 */ "explain ::= EXPLAIN QUERY PLAN",
+ /*   9 */ "cmd ::= BEGIN transtype trans_opt",
+ /*  10 */ "trans_opt ::=",
+ /*  11 */ "trans_opt ::= TRANSACTION",
+ /*  12 */ "trans_opt ::= TRANSACTION nm",
+ /*  13 */ "transtype ::=",
+ /*  14 */ "transtype ::= DEFERRED",
+ /*  15 */ "transtype ::= IMMEDIATE",
+ /*  16 */ "transtype ::= EXCLUSIVE",
+ /*  17 */ "cmd ::= COMMIT trans_opt",
+ /*  18 */ "cmd ::= END trans_opt",
+ /*  19 */ "cmd ::= ROLLBACK trans_opt",
+ /*  20 */ "cmd ::= create_table create_table_args",
+ /*  21 */ "create_table ::= CREATE temp TABLE ifnotexists nm dbnm",
+ /*  22 */ "ifnotexists ::=",
+ /*  23 */ "ifnotexists ::= IF NOT EXISTS",
+ /*  24 */ "temp ::= TEMP",
+ /*  25 */ "temp ::=",
+ /*  26 */ "create_table_args ::= LP columnlist conslist_opt RP",
+ /*  27 */ "create_table_args ::= AS select",
+ /*  28 */ "columnlist ::= columnlist COMMA column",
+ /*  29 */ "columnlist ::= column",
+ /*  30 */ "column ::= columnid type carglist",
+ /*  31 */ "columnid ::= nm",
+ /*  32 */ "id ::= ID",
+ /*  33 */ "ids ::= ID|STRING",
+ /*  34 */ "nm ::= ID",
+ /*  35 */ "nm ::= STRING",
+ /*  36 */ "nm ::= JOIN_KW",
+ /*  37 */ "type ::=",
+ /*  38 */ "type ::= typetoken",
+ /*  39 */ "typetoken ::= typename",
+ /*  40 */ "typetoken ::= typename LP signed RP",
+ /*  41 */ "typetoken ::= typename LP signed COMMA signed RP",
+ /*  42 */ "typename ::= ids",
+ /*  43 */ "typename ::= typename ids",
+ /*  44 */ "signed ::= plus_num",
+ /*  45 */ "signed ::= minus_num",
+ /*  46 */ "carglist ::= carglist carg",
+ /*  47 */ "carglist ::=",
+ /*  48 */ "carg ::= CONSTRAINT nm ccons",
+ /*  49 */ "carg ::= ccons",
+ /*  50 */ "ccons ::= DEFAULT term",
+ /*  51 */ "ccons ::= DEFAULT LP expr RP",
+ /*  52 */ "ccons ::= DEFAULT PLUS term",
+ /*  53 */ "ccons ::= DEFAULT MINUS term",
+ /*  54 */ "ccons ::= DEFAULT id",
+ /*  55 */ "ccons ::= NULL onconf",
+ /*  56 */ "ccons ::= NOT NULL onconf",
+ /*  57 */ "ccons ::= PRIMARY KEY sortorder onconf autoinc",
+ /*  58 */ "ccons ::= UNIQUE onconf",
+ /*  59 */ "ccons ::= CHECK LP expr RP",
+ /*  60 */ "ccons ::= REFERENCES nm idxlist_opt refargs",
+ /*  61 */ "ccons ::= defer_subclause",
+ /*  62 */ "ccons ::= COLLATE ids",
+ /*  63 */ "autoinc ::=",
+ /*  64 */ "autoinc ::= AUTOINCR",
+ /*  65 */ "refargs ::=",
+ /*  66 */ "refargs ::= refargs refarg",
+ /*  67 */ "refarg ::= MATCH nm",
+ /*  68 */ "refarg ::= ON DELETE refact",
+ /*  69 */ "refarg ::= ON UPDATE refact",
+ /*  70 */ "refarg ::= ON INSERT refact",
+ /*  71 */ "refact ::= SET NULL",
+ /*  72 */ "refact ::= SET DEFAULT",
+ /*  73 */ "refact ::= CASCADE",
+ /*  74 */ "refact ::= RESTRICT",
+ /*  75 */ "defer_subclause ::= NOT DEFERRABLE init_deferred_pred_opt",
+ /*  76 */ "defer_subclause ::= DEFERRABLE init_deferred_pred_opt",
+ /*  77 */ "init_deferred_pred_opt ::=",
+ /*  78 */ "init_deferred_pred_opt ::= INITIALLY DEFERRED",
+ /*  79 */ "init_deferred_pred_opt ::= INITIALLY IMMEDIATE",
+ /*  80 */ "conslist_opt ::=",
+ /*  81 */ "conslist_opt ::= COMMA conslist",
+ /*  82 */ "conslist ::= conslist COMMA tcons",
+ /*  83 */ "conslist ::= conslist tcons",
+ /*  84 */ "conslist ::= tcons",
+ /*  85 */ "tcons ::= CONSTRAINT nm",
+ /*  86 */ "tcons ::= PRIMARY KEY LP idxlist autoinc RP onconf",
+ /*  87 */ "tcons ::= UNIQUE LP idxlist RP onconf",
+ /*  88 */ "tcons ::= CHECK LP expr RP onconf",
+ /*  89 */ "tcons ::= FOREIGN KEY LP idxlist RP REFERENCES nm idxlist_opt refargs defer_subclause_opt",
+ /*  90 */ "defer_subclause_opt ::=",
+ /*  91 */ "defer_subclause_opt ::= defer_subclause",
+ /*  92 */ "onconf ::=",
+ /*  93 */ "onconf ::= ON CONFLICT resolvetype",
+ /*  94 */ "orconf ::=",
+ /*  95 */ "orconf ::= OR resolvetype",
+ /*  96 */ "resolvetype ::= raisetype",
+ /*  97 */ "resolvetype ::= IGNORE",
+ /*  98 */ "resolvetype ::= REPLACE",
+ /*  99 */ "cmd ::= DROP TABLE ifexists fullname",
+ /* 100 */ "ifexists ::= IF EXISTS",
+ /* 101 */ "ifexists ::=",
+ /* 102 */ "cmd ::= CREATE temp VIEW ifnotexists nm dbnm AS select",
+ /* 103 */ "cmd ::= DROP VIEW ifexists fullname",
+ /* 104 */ "cmd ::= select",
+ /* 105 */ "select ::= oneselect",
+ /* 106 */ "select ::= select multiselect_op oneselect",
+ /* 107 */ "multiselect_op ::= UNION",
+ /* 108 */ "multiselect_op ::= UNION ALL",
+ /* 109 */ "multiselect_op ::= EXCEPT|INTERSECT",
+ /* 110 */ "oneselect ::= SELECT distinct selcollist from where_opt groupby_opt having_opt orderby_opt limit_opt",
+ /* 111 */ "distinct ::= DISTINCT",
+ /* 112 */ "distinct ::= ALL",
+ /* 113 */ "distinct ::=",
+ /* 114 */ "sclp ::= selcollist COMMA",
+ /* 115 */ "sclp ::=",
+ /* 116 */ "selcollist ::= sclp expr as",
+ /* 117 */ "selcollist ::= sclp STAR",
+ /* 118 */ "selcollist ::= sclp nm DOT STAR",
+ /* 119 */ "as ::= AS nm",
+ /* 120 */ "as ::= ids",
+ /* 121 */ "as ::=",
+ /* 122 */ "from ::=",
+ /* 123 */ "from ::= FROM seltablist",
+ /* 124 */ "stl_prefix ::= seltablist joinop",
+ /* 125 */ "stl_prefix ::=",
+ /* 126 */ "seltablist ::= stl_prefix nm dbnm as on_opt using_opt",
+ /* 127 */ "seltablist ::= stl_prefix LP seltablist_paren RP as on_opt using_opt",
+ /* 128 */ "seltablist_paren ::= select",
+ /* 129 */ "seltablist_paren ::= seltablist",
+ /* 130 */ "dbnm ::=",
+ /* 131 */ "dbnm ::= DOT nm",
+ /* 132 */ "fullname ::= nm dbnm",
+ /* 133 */ "joinop ::= COMMA|JOIN",
+ /* 134 */ "joinop ::= JOIN_KW JOIN",
+ /* 135 */ "joinop ::= JOIN_KW nm JOIN",
+ /* 136 */ "joinop ::= JOIN_KW nm nm JOIN",
+ /* 137 */ "on_opt ::= ON expr",
+ /* 138 */ "on_opt ::=",
+ /* 139 */ "using_opt ::= USING LP inscollist RP",
+ /* 140 */ "using_opt ::=",
+ /* 141 */ "orderby_opt ::=",
+ /* 142 */ "orderby_opt ::= ORDER BY sortlist",
+ /* 143 */ "sortlist ::= sortlist COMMA sortitem sortorder",
+ /* 144 */ "sortlist ::= sortitem sortorder",
+ /* 145 */ "sortitem ::= expr",
+ /* 146 */ "sortorder ::= ASC",
+ /* 147 */ "sortorder ::= DESC",
+ /* 148 */ "sortorder ::=",
+ /* 149 */ "groupby_opt ::=",
+ /* 150 */ "groupby_opt ::= GROUP BY nexprlist",
+ /* 151 */ "having_opt ::=",
+ /* 152 */ "having_opt ::= HAVING expr",
+ /* 153 */ "limit_opt ::=",
+ /* 154 */ "limit_opt ::= LIMIT expr",
+ /* 155 */ "limit_opt ::= LIMIT expr OFFSET expr",
+ /* 156 */ "limit_opt ::= LIMIT expr COMMA expr",
+ /* 157 */ "cmd ::= DELETE FROM fullname where_opt",
+ /* 158 */ "where_opt ::=",
+ /* 159 */ "where_opt ::= WHERE expr",
+ /* 160 */ "cmd ::= UPDATE orconf fullname SET setlist where_opt",
+ /* 161 */ "setlist ::= setlist COMMA nm EQ expr",
+ /* 162 */ "setlist ::= nm EQ expr",
+ /* 163 */ "cmd ::= insert_cmd INTO fullname inscollist_opt VALUES LP itemlist RP",
+ /* 164 */ "cmd ::= insert_cmd INTO fullname inscollist_opt select",
+ /* 165 */ "cmd ::= insert_cmd INTO fullname inscollist_opt DEFAULT VALUES",
+ /* 166 */ "insert_cmd ::= INSERT orconf",
+ /* 167 */ "insert_cmd ::= REPLACE",
+ /* 168 */ "itemlist ::= itemlist COMMA expr",
+ /* 169 */ "itemlist ::= expr",
+ /* 170 */ "inscollist_opt ::=",
+ /* 171 */ "inscollist_opt ::= LP inscollist RP",
+ /* 172 */ "inscollist ::= inscollist COMMA nm",
+ /* 173 */ "inscollist ::= nm",
+ /* 174 */ "expr ::= term",
+ /* 175 */ "expr ::= LP expr RP",
+ /* 176 */ "term ::= NULL",
+ /* 177 */ "expr ::= ID",
+ /* 178 */ "expr ::= JOIN_KW",
+ /* 179 */ "expr ::= nm DOT nm",
+ /* 180 */ "expr ::= nm DOT nm DOT nm",
+ /* 181 */ "term ::= INTEGER|FLOAT|BLOB",
+ /* 182 */ "term ::= STRING",
+ /* 183 */ "expr ::= REGISTER",
+ /* 184 */ "expr ::= VARIABLE",
+ /* 185 */ "expr ::= expr COLLATE ids",
+ /* 186 */ "expr ::= CAST LP expr AS typetoken RP",
+ /* 187 */ "expr ::= ID LP distinct exprlist RP",
+ /* 188 */ "expr ::= ID LP STAR RP",
+ /* 189 */ "term ::= CTIME_KW",
+ /* 190 */ "expr ::= expr AND expr",
+ /* 191 */ "expr ::= expr OR expr",
+ /* 192 */ "expr ::= expr LT|GT|GE|LE expr",
+ /* 193 */ "expr ::= expr EQ|NE expr",
+ /* 194 */ "expr ::= expr BITAND|BITOR|LSHIFT|RSHIFT expr",
+ /* 195 */ "expr ::= expr PLUS|MINUS expr",
+ /* 196 */ "expr ::= expr STAR|SLASH|REM expr",
+ /* 197 */ "expr ::= expr CONCAT expr",
+ /* 198 */ "likeop ::= LIKE_KW",
+ /* 199 */ "likeop ::= NOT LIKE_KW",
+ /* 200 */ "likeop ::= MATCH",
+ /* 201 */ "likeop ::= NOT MATCH",
+ /* 202 */ "escape ::= ESCAPE expr",
+ /* 203 */ "escape ::=",
+ /* 204 */ "expr ::= expr likeop expr escape",
+ /* 205 */ "expr ::= expr ISNULL|NOTNULL",
+ /* 206 */ "expr ::= expr IS NULL",
+ /* 207 */ "expr ::= expr NOT NULL",
+ /* 208 */ "expr ::= expr IS NOT NULL",
+ /* 209 */ "expr ::= NOT expr",
+ /* 210 */ "expr ::= BITNOT expr",
+ /* 211 */ "expr ::= MINUS expr",
+ /* 212 */ "expr ::= PLUS expr",
+ /* 213 */ "between_op ::= BETWEEN",
+ /* 214 */ "between_op ::= NOT BETWEEN",
+ /* 215 */ "expr ::= expr between_op expr AND expr",
+ /* 216 */ "in_op ::= IN",
+ /* 217 */ "in_op ::= NOT IN",
+ /* 218 */ "expr ::= expr in_op LP exprlist RP",
+ /* 219 */ "expr ::= LP select RP",
+ /* 220 */ "expr ::= expr in_op LP select RP",
+ /* 221 */ "expr ::= expr in_op nm dbnm",
+ /* 222 */ "expr ::= EXISTS LP select RP",
+ /* 223 */ "expr ::= CASE case_operand case_exprlist case_else END",
+ /* 224 */ "case_exprlist ::= case_exprlist WHEN expr THEN expr",
+ /* 225 */ "case_exprlist ::= WHEN expr THEN expr",
+ /* 226 */ "case_else ::= ELSE expr",
+ /* 227 */ "case_else ::=",
+ /* 228 */ "case_operand ::= expr",
+ /* 229 */ "case_operand ::=",
+ /* 230 */ "exprlist ::= nexprlist",
+ /* 231 */ "exprlist ::=",
+ /* 232 */ "nexprlist ::= nexprlist COMMA expr",
+ /* 233 */ "nexprlist ::= expr",
+ /* 234 */ "cmd ::= CREATE uniqueflag INDEX ifnotexists nm dbnm ON nm LP idxlist RP",
+ /* 235 */ "uniqueflag ::= UNIQUE",
+ /* 236 */ "uniqueflag ::=",
+ /* 237 */ "idxlist_opt ::=",
+ /* 238 */ "idxlist_opt ::= LP idxlist RP",
+ /* 239 */ "idxlist ::= idxlist COMMA idxitem collate sortorder",
+ /* 240 */ "idxlist ::= idxitem collate sortorder",
+ /* 241 */ "idxitem ::= nm",
+ /* 242 */ "collate ::=",
+ /* 243 */ "collate ::= COLLATE ids",
+ /* 244 */ "cmd ::= DROP INDEX ifexists fullname",
+ /* 245 */ "cmd ::= VACUUM",
+ /* 246 */ "cmd ::= VACUUM nm",
+ /* 247 */ "cmd ::= PRAGMA nm dbnm EQ nmnum",
+ /* 248 */ "cmd ::= PRAGMA nm dbnm EQ ON",
+ /* 249 */ "cmd ::= PRAGMA nm dbnm EQ minus_num",
+ /* 250 */ "cmd ::= PRAGMA nm dbnm LP nmnum RP",
+ /* 251 */ "cmd ::= PRAGMA nm dbnm",
+ /* 252 */ "nmnum ::= plus_num",
+ /* 253 */ "nmnum ::= nm",
+ /* 254 */ "plus_num ::= plus_opt number",
+ /* 255 */ "minus_num ::= MINUS number",
+ /* 256 */ "number ::= INTEGER|FLOAT",
+ /* 257 */ "plus_opt ::= PLUS",
+ /* 258 */ "plus_opt ::=",
+ /* 259 */ "cmd ::= CREATE trigger_decl BEGIN trigger_cmd_list END",
+ /* 260 */ "trigger_decl ::= temp TRIGGER ifnotexists nm dbnm trigger_time trigger_event ON fullname foreach_clause when_clause",
+ /* 261 */ "trigger_time ::= BEFORE",
+ /* 262 */ "trigger_time ::= AFTER",
+ /* 263 */ "trigger_time ::= INSTEAD OF",
+ /* 264 */ "trigger_time ::=",
+ /* 265 */ "trigger_event ::= DELETE|INSERT",
+ /* 266 */ "trigger_event ::= UPDATE",
+ /* 267 */ "trigger_event ::= UPDATE OF inscollist",
+ /* 268 */ "foreach_clause ::=",
+ /* 269 */ "foreach_clause ::= FOR EACH ROW",
+ /* 270 */ "when_clause ::=",
+ /* 271 */ "when_clause ::= WHEN expr",
+ /* 272 */ "trigger_cmd_list ::= trigger_cmd_list trigger_cmd SEMI",
+ /* 273 */ "trigger_cmd_list ::=",
+ /* 274 */ "trigger_cmd ::= UPDATE orconf nm SET setlist where_opt",
+ /* 275 */ "trigger_cmd ::= insert_cmd INTO nm inscollist_opt VALUES LP itemlist RP",
+ /* 276 */ "trigger_cmd ::= insert_cmd INTO nm inscollist_opt select",
+ /* 277 */ "trigger_cmd ::= DELETE FROM nm where_opt",
+ /* 278 */ "trigger_cmd ::= select",
+ /* 279 */ "expr ::= RAISE LP IGNORE RP",
+ /* 280 */ "expr ::= RAISE LP raisetype COMMA nm RP",
+ /* 281 */ "raisetype ::= ROLLBACK",
+ /* 282 */ "raisetype ::= ABORT",
+ /* 283 */ "raisetype ::= FAIL",
+ /* 284 */ "cmd ::= DROP TRIGGER ifexists fullname",
+ /* 285 */ "cmd ::= ATTACH database_kw_opt expr AS expr key_opt",
+ /* 286 */ "cmd ::= DETACH database_kw_opt expr",
+ /* 287 */ "key_opt ::=",
+ /* 288 */ "key_opt ::= KEY expr",
+ /* 289 */ "database_kw_opt ::= DATABASE",
+ /* 290 */ "database_kw_opt ::=",
+ /* 291 */ "cmd ::= REINDEX",
+ /* 292 */ "cmd ::= REINDEX nm dbnm",
+ /* 293 */ "cmd ::= ANALYZE",
+ /* 294 */ "cmd ::= ANALYZE nm dbnm",
+ /* 295 */ "cmd ::= ALTER TABLE fullname RENAME TO nm",
+ /* 296 */ "cmd ::= ALTER TABLE add_column_fullname ADD kwcolumn_opt column",
+ /* 297 */ "add_column_fullname ::= fullname",
+ /* 298 */ "kwcolumn_opt ::=",
+ /* 299 */ "kwcolumn_opt ::= COLUMNKW",
+ /* 300 */ "cmd ::= create_vtab",
+ /* 301 */ "cmd ::= create_vtab LP vtabarglist RP",
+ /* 302 */ "create_vtab ::= CREATE VIRTUAL TABLE nm dbnm USING nm",
+ /* 303 */ "vtabarglist ::= vtabarg",
+ /* 304 */ "vtabarglist ::= vtabarglist COMMA vtabarg",
+ /* 305 */ "vtabarg ::=",
+ /* 306 */ "vtabarg ::= vtabarg vtabargtoken",
+ /* 307 */ "vtabargtoken ::= ANY",
+ /* 308 */ "vtabargtoken ::= lp anylist RP",
+ /* 309 */ "lp ::= LP",
+ /* 310 */ "anylist ::=",
+ /* 311 */ "anylist ::= anylist ANY",
+};
+#endif /* NDEBUG */
+
+
+#if YYSTACKDEPTH<=0
+/*
+** Try to increase the size of the parser stack.
+*/
+static void yyGrowStack(yyParser *p){
+  int newSize;
+  yyStackEntry *pNew;
+
+  newSize = p->yystksz*2 + 100;
+  pNew = realloc(p->yystack, newSize*sizeof(pNew[0]));
+  if( pNew ){
+    p->yystack = pNew;
+    p->yystksz = newSize;
+#ifndef NDEBUG
+    if( yyTraceFILE ){
+      fprintf(yyTraceFILE,"%sStack grows to %d entries!\n",
+              yyTracePrompt, p->yystksz);
+    }
+#endif
+  }
+}
+#endif
+
+/*
+** This function allocates a new parser.
+** The only argument is a pointer to a function which works like
+** malloc.
+**
+** Inputs:
+** A pointer to the function used to allocate memory.
+**
+** Outputs:
+** A pointer to a parser.  This pointer is used in subsequent calls
+** to sqlite3Parser and sqlite3ParserFree.
+*/
+void *sqlite3ParserAlloc(void *(*mallocProc)(size_t)){
+  yyParser *pParser;
+  pParser = (yyParser*)(*mallocProc)( (size_t)sizeof(yyParser) );
+  if( pParser ){
+    pParser->yyidx = -1;
+#if YYSTACKDEPTH<=0
+    yyGrowStack(pParser);
+#endif
+  }
+  return pParser;
+}
+
+/* The following function deletes the value associated with a
+** symbol.  The symbol can be either a terminal or nonterminal.
+** "yymajor" is the symbol code, and "yypminor" is a pointer to
+** the value.
+*/
+static void yy_destructor(YYCODETYPE yymajor, YYMINORTYPE *yypminor){
+  switch( yymajor ){
+    /* Here is inserted the actions which take place when a
+    ** terminal or non-terminal is destroyed.  This can happen
+    ** when the symbol is popped from the stack during a
+    ** reduce or during error processing or when a parser is
+    ** being destroyed before it is finished parsing.
+    **
+    ** Note: during a reduce, the only symbols destroyed are those
+    ** which appear on the RHS of the rule, but which are not used
+    ** inside the C code.
+    */
+    case 155: /* select */
+    case 189: /* oneselect */
+    case 206: /* seltablist_paren */
+#line 369 "parse.y"
+{sqlite3SelectDelete((yypminor->yy219));}
+#line 1271 "parse.c"
+      break;
+    case 169: /* term */
+    case 170: /* expr */
+    case 194: /* where_opt */
+    case 196: /* having_opt */
+    case 204: /* on_opt */
+    case 210: /* sortitem */
+    case 218: /* escape */
+    case 221: /* case_operand */
+    case 223: /* case_else */
+    case 235: /* when_clause */
+    case 238: /* key_opt */
+#line 629 "parse.y"
+{sqlite3ExprDelete((yypminor->yy172));}
+#line 1286 "parse.c"
+      break;
+    case 174: /* idxlist_opt */
+    case 182: /* idxlist */
+    case 192: /* selcollist */
+    case 195: /* groupby_opt */
+    case 197: /* orderby_opt */
+    case 199: /* sclp */
+    case 209: /* sortlist */
+    case 211: /* nexprlist */
+    case 212: /* setlist */
+    case 215: /* itemlist */
+    case 216: /* exprlist */
+    case 222: /* case_exprlist */
+#line 887 "parse.y"
+{sqlite3ExprListDelete((yypminor->yy174));}
+#line 1302 "parse.c"
+      break;
+    case 188: /* fullname */
+    case 193: /* from */
+    case 201: /* seltablist */
+    case 202: /* stl_prefix */
+#line 486 "parse.y"
+{sqlite3SrcListDelete((yypminor->yy373));}
+#line 1310 "parse.c"
+      break;
+    case 205: /* using_opt */
+    case 208: /* inscollist */
+    case 214: /* inscollist_opt */
+#line 503 "parse.y"
+{sqlite3IdListDelete((yypminor->yy432));}
+#line 1317 "parse.c"
+      break;
+    case 231: /* trigger_cmd_list */
+    case 236: /* trigger_cmd */
+#line 990 "parse.y"
+{sqlite3DeleteTriggerStep((yypminor->yy243));}
+#line 1323 "parse.c"
+      break;
+    case 233: /* trigger_event */
+#line 976 "parse.y"
+{sqlite3IdListDelete((yypminor->yy370).b);}
+#line 1328 "parse.c"
+      break;
+    default:  break;   /* If no destructor action specified: do nothing */
+  }
+}
+
+/*
+** Pop the parser's stack once.
+**
+** If there is a destructor routine associated with the token which
+** is popped from the stack, then call it.
+**
+** Return the major token number for the symbol popped.
+*/
+static int yy_pop_parser_stack(yyParser *pParser){
+  YYCODETYPE yymajor;
+  yyStackEntry *yytos = &pParser->yystack[pParser->yyidx];
+
+  if( pParser->yyidx<0 ) return 0;
+#ifndef NDEBUG
+  if( yyTraceFILE && pParser->yyidx>=0 ){
+    fprintf(yyTraceFILE,"%sPopping %s\n",
+      yyTracePrompt,
+      yyTokenName[yytos->major]);
+  }
+#endif
+  yymajor = yytos->major;
+  yy_destructor( yymajor, &yytos->minor);
+  pParser->yyidx--;
+  return yymajor;
+}
+
+/*
+** Deallocate and destroy a parser.  Destructors are all called for
+** all stack elements before shutting the parser down.
+**
+** Inputs:
+** <ul>
+** <li>  A pointer to the parser.  This should be a pointer
+**       obtained from sqlite3ParserAlloc.
+** <li>  A pointer to a function used to reclaim memory obtained
+**       from malloc.
+** </ul>
+*/
+void sqlite3ParserFree(
+  void *p,                    /* The parser to be deleted */
+  void (*freeProc)(void*)     /* Function used to reclaim memory */
+){
+  yyParser *pParser = (yyParser*)p;
+  if( pParser==0 ) return;
+  while( pParser->yyidx>=0 ) yy_pop_parser_stack(pParser);
+#if YYSTACKDEPTH<=0
+  free(pParser->yystack);
+#endif
+  (*freeProc)((void*)pParser);
+}
+
+/*
+** Find the appropriate action for a parser given the terminal
+** look-ahead token iLookAhead.
+**
+** If the look-ahead token is YYNOCODE, then check to see if the action is
+** independent of the look-ahead.  If it is, return the action, otherwise
+** return YY_NO_ACTION.
+*/
+static int yy_find_shift_action(
+  yyParser *pParser,        /* The parser */
+  YYCODETYPE iLookAhead     /* The look-ahead token */
+){
+  int i;
+  int stateno = pParser->yystack[pParser->yyidx].stateno;
+
+  if( stateno>YY_SHIFT_MAX || (i = yy_shift_ofst[stateno])==YY_SHIFT_USE_DFLT ){
+    return yy_default[stateno];
+  }
+  assert( iLookAhead!=YYNOCODE );
+  i += iLookAhead;
+  if( i<0 || i>=YY_SZ_ACTTAB || yy_lookahead[i]!=iLookAhead ){
+    if( iLookAhead>0 ){
+#ifdef YYFALLBACK
+      int iFallback;            /* Fallback token */
+      if( iLookAhead<sizeof(yyFallback)/sizeof(yyFallback[0])
+             && (iFallback = yyFallback[iLookAhead])!=0 ){
+#ifndef NDEBUG
+        if( yyTraceFILE ){
+          fprintf(yyTraceFILE, "%sFALLBACK %s => %s\n",
+             yyTracePrompt, yyTokenName[iLookAhead], yyTokenName[iFallback]);
+        }
+#endif
+        return yy_find_shift_action(pParser, iFallback);
+      }
+#endif
+#ifdef YYWILDCARD
+      {
+        int j = i - iLookAhead + YYWILDCARD;
+        if( j>=0 && j<YY_SZ_ACTTAB && yy_lookahead[j]==YYWILDCARD ){
+#ifndef NDEBUG
+          if( yyTraceFILE ){
+            fprintf(yyTraceFILE, "%sWILDCARD %s => %s\n",
+               yyTracePrompt, yyTokenName[iLookAhead], yyTokenName[YYWILDCARD]);
+          }
+#endif /* NDEBUG */
+          return yy_action[j];
+        }
+      }
+#endif /* YYWILDCARD */
+    }
+    return yy_default[stateno];
+  }else{
+    return yy_action[i];
+  }
+}
+
+/*
+** Find the appropriate action for a parser given the non-terminal
+** look-ahead token iLookAhead.
+**
+** If the look-ahead token is YYNOCODE, then check to see if the action is
+** independent of the look-ahead.  If it is, return the action, otherwise
+** return YY_NO_ACTION.
+*/
+static int yy_find_reduce_action(
+  int stateno,              /* Current state number */
+  YYCODETYPE iLookAhead     /* The look-ahead token */
+){
+  int i;
+  assert( stateno<=YY_REDUCE_MAX );
+  i = yy_reduce_ofst[stateno];
+  assert( i!=YY_REDUCE_USE_DFLT );
+  assert( iLookAhead!=YYNOCODE );
+  i += iLookAhead;
+  assert( i>=0 && i<YY_SZ_ACTTAB );
+  assert( yy_lookahead[i]==iLookAhead );
+  return yy_action[i];
+}
+
+/*
+** The following routine is called if the stack overflows.
+*/
+static void yyStackOverflow(yyParser *yypParser, YYMINORTYPE *yypMinor){
+   sqlite3ParserARG_FETCH;
+   yypParser->yyidx--;
+#ifndef NDEBUG
+   if( yyTraceFILE ){
+     fprintf(yyTraceFILE,"%sStack Overflow!\n",yyTracePrompt);
+   }
+#endif
+   while( yypParser->yyidx>=0 ) yy_pop_parser_stack(yypParser);
+   /* Here code is inserted which will execute if the parser
+   ** stack every overflows */
+#line 39 "parse.y"
+
+  sqlite3ErrorMsg(pParse, "parser stack overflow");
+  pParse->parseError = 1;
+#line 1483 "parse.c"
+   sqlite3ParserARG_STORE; /* Suppress warning about unused %extra_argument var */
+}
+
+/*
+** Perform a shift action.
+*/
+static void yy_shift(
+  yyParser *yypParser,          /* The parser to be shifted */
+  int yyNewState,               /* The new state to shift in */
+  int yyMajor,                  /* The major token to shift in */
+  YYMINORTYPE *yypMinor         /* Pointer ot the minor token to shift in */
+){
+  yyStackEntry *yytos;
+  yypParser->yyidx++;
+#if YYSTACKDEPTH>0
+  if( yypParser->yyidx>=YYSTACKDEPTH ){
+    yyStackOverflow(yypParser, yypMinor);
+    return;
+  }
+#else
+  if( yypParser->yyidx>=yypParser->yystksz ){
+    yyGrowStack(yypParser);
+    if( yypParser->yyidx>=yypParser->yystksz ){
+      yyStackOverflow(yypParser, yypMinor);
+      return;
+    }
+  }
+#endif
+  yytos = &yypParser->yystack[yypParser->yyidx];
+  yytos->stateno = yyNewState;
+  yytos->major = yyMajor;
+  yytos->minor = *yypMinor;
+#ifndef NDEBUG
+  if( yyTraceFILE && yypParser->yyidx>0 ){
+    int i;
+    fprintf(yyTraceFILE,"%sShift %d\n",yyTracePrompt,yyNewState);
+    fprintf(yyTraceFILE,"%sStack:",yyTracePrompt);
+    for(i=1; i<=yypParser->yyidx; i++)
+      fprintf(yyTraceFILE," %s",yyTokenName[yypParser->yystack[i].major]);
+    fprintf(yyTraceFILE,"\n");
+  }
+#endif
+}
+
+/* The following table contains information about every rule that
+** is used during the reduce.
+*/
+static const struct {
+  YYCODETYPE lhs;         /* Symbol on the left-hand side of the rule */
+  unsigned char nrhs;     /* Number of right-hand side symbols in the rule */
+} yyRuleInfo[] = {
+  { 139, 1 },
+  { 140, 2 },
+  { 140, 1 },
+  { 142, 1 },
+  { 141, 1 },
+  { 141, 3 },
+  { 144, 0 },
+  { 144, 1 },
+  { 144, 3 },
+  { 143, 3 },
+  { 146, 0 },
+  { 146, 1 },
+  { 146, 2 },
+  { 145, 0 },
+  { 145, 1 },
+  { 145, 1 },
+  { 145, 1 },
+  { 143, 2 },
+  { 143, 2 },
+  { 143, 2 },
+  { 143, 2 },
+  { 148, 6 },
+  { 151, 0 },
+  { 151, 3 },
+  { 150, 1 },
+  { 150, 0 },
+  { 149, 4 },
+  { 149, 2 },
+  { 153, 3 },
+  { 153, 1 },
+  { 156, 3 },
+  { 157, 1 },
+  { 160, 1 },
+  { 161, 1 },
+  { 147, 1 },
+  { 147, 1 },
+  { 147, 1 },
+  { 158, 0 },
+  { 158, 1 },
+  { 162, 1 },
+  { 162, 4 },
+  { 162, 6 },
+  { 163, 1 },
+  { 163, 2 },
+  { 164, 1 },
+  { 164, 1 },
+  { 159, 2 },
+  { 159, 0 },
+  { 167, 3 },
+  { 167, 1 },
+  { 168, 2 },
+  { 168, 4 },
+  { 168, 3 },
+  { 168, 3 },
+  { 168, 2 },
+  { 168, 2 },
+  { 168, 3 },
+  { 168, 5 },
+  { 168, 2 },
+  { 168, 4 },
+  { 168, 4 },
+  { 168, 1 },
+  { 168, 2 },
+  { 173, 0 },
+  { 173, 1 },
+  { 175, 0 },
+  { 175, 2 },
+  { 177, 2 },
+  { 177, 3 },
+  { 177, 3 },
+  { 177, 3 },
+  { 178, 2 },
+  { 178, 2 },
+  { 178, 1 },
+  { 178, 1 },
+  { 176, 3 },
+  { 176, 2 },
+  { 179, 0 },
+  { 179, 2 },
+  { 179, 2 },
+  { 154, 0 },
+  { 154, 2 },
+  { 180, 3 },
+  { 180, 2 },
+  { 180, 1 },
+  { 181, 2 },
+  { 181, 7 },
+  { 181, 5 },
+  { 181, 5 },
+  { 181, 10 },
+  { 183, 0 },
+  { 183, 1 },
+  { 171, 0 },
+  { 171, 3 },
+  { 184, 0 },
+  { 184, 2 },
+  { 185, 1 },
+  { 185, 1 },
+  { 185, 1 },
+  { 143, 4 },
+  { 187, 2 },
+  { 187, 0 },
+  { 143, 8 },
+  { 143, 4 },
+  { 143, 1 },
+  { 155, 1 },
+  { 155, 3 },
+  { 190, 1 },
+  { 190, 2 },
+  { 190, 1 },
+  { 189, 9 },
+  { 191, 1 },
+  { 191, 1 },
+  { 191, 0 },
+  { 199, 2 },
+  { 199, 0 },
+  { 192, 3 },
+  { 192, 2 },
+  { 192, 4 },
+  { 200, 2 },
+  { 200, 1 },
+  { 200, 0 },
+  { 193, 0 },
+  { 193, 2 },
+  { 202, 2 },
+  { 202, 0 },
+  { 201, 6 },
+  { 201, 7 },
+  { 206, 1 },
+  { 206, 1 },
+  { 152, 0 },
+  { 152, 2 },
+  { 188, 2 },
+  { 203, 1 },
+  { 203, 2 },
+  { 203, 3 },
+  { 203, 4 },
+  { 204, 2 },
+  { 204, 0 },
+  { 205, 4 },
+  { 205, 0 },
+  { 197, 0 },
+  { 197, 3 },
+  { 209, 4 },
+  { 209, 2 },
+  { 210, 1 },
+  { 172, 1 },
+  { 172, 1 },
+  { 172, 0 },
+  { 195, 0 },
+  { 195, 3 },
+  { 196, 0 },
+  { 196, 2 },
+  { 198, 0 },
+  { 198, 2 },
+  { 198, 4 },
+  { 198, 4 },
+  { 143, 4 },
+  { 194, 0 },
+  { 194, 2 },
+  { 143, 6 },
+  { 212, 5 },
+  { 212, 3 },
+  { 143, 8 },
+  { 143, 5 },
+  { 143, 6 },
+  { 213, 2 },
+  { 213, 1 },
+  { 215, 3 },
+  { 215, 1 },
+  { 214, 0 },
+  { 214, 3 },
+  { 208, 3 },
+  { 208, 1 },
+  { 170, 1 },
+  { 170, 3 },
+  { 169, 1 },
+  { 170, 1 },
+  { 170, 1 },
+  { 170, 3 },
+  { 170, 5 },
+  { 169, 1 },
+  { 169, 1 },
+  { 170, 1 },
+  { 170, 1 },
+  { 170, 3 },
+  { 170, 6 },
+  { 170, 5 },
+  { 170, 4 },
+  { 169, 1 },
+  { 170, 3 },
+  { 170, 3 },
+  { 170, 3 },
+  { 170, 3 },
+  { 170, 3 },
+  { 170, 3 },
+  { 170, 3 },
+  { 170, 3 },
+  { 217, 1 },
+  { 217, 2 },
+  { 217, 1 },
+  { 217, 2 },
+  { 218, 2 },
+  { 218, 0 },
+  { 170, 4 },
+  { 170, 2 },
+  { 170, 3 },
+  { 170, 3 },
+  { 170, 4 },
+  { 170, 2 },
+  { 170, 2 },
+  { 170, 2 },
+  { 170, 2 },
+  { 219, 1 },
+  { 219, 2 },
+  { 170, 5 },
+  { 220, 1 },
+  { 220, 2 },
+  { 170, 5 },
+  { 170, 3 },
+  { 170, 5 },
+  { 170, 4 },
+  { 170, 4 },
+  { 170, 5 },
+  { 222, 5 },
+  { 222, 4 },
+  { 223, 2 },
+  { 223, 0 },
+  { 221, 1 },
+  { 221, 0 },
+  { 216, 1 },
+  { 216, 0 },
+  { 211, 3 },
+  { 211, 1 },
+  { 143, 11 },
+  { 224, 1 },
+  { 224, 0 },
+  { 174, 0 },
+  { 174, 3 },
+  { 182, 5 },
+  { 182, 3 },
+  { 225, 1 },
+  { 226, 0 },
+  { 226, 2 },
+  { 143, 4 },
+  { 143, 1 },
+  { 143, 2 },
+  { 143, 5 },
+  { 143, 5 },
+  { 143, 5 },
+  { 143, 6 },
+  { 143, 3 },
+  { 227, 1 },
+  { 227, 1 },
+  { 165, 2 },
+  { 166, 2 },
+  { 229, 1 },
+  { 228, 1 },
+  { 228, 0 },
+  { 143, 5 },
+  { 230, 11 },
+  { 232, 1 },
+  { 232, 1 },
+  { 232, 2 },
+  { 232, 0 },
+  { 233, 1 },
+  { 233, 1 },
+  { 233, 3 },
+  { 234, 0 },
+  { 234, 3 },
+  { 235, 0 },
+  { 235, 2 },
+  { 231, 3 },
+  { 231, 0 },
+  { 236, 6 },
+  { 236, 8 },
+  { 236, 5 },
+  { 236, 4 },
+  { 236, 1 },
+  { 170, 4 },
+  { 170, 6 },
+  { 186, 1 },
+  { 186, 1 },
+  { 186, 1 },
+  { 143, 4 },
+  { 143, 6 },
+  { 143, 3 },
+  { 238, 0 },
+  { 238, 2 },
+  { 237, 1 },
+  { 237, 0 },
+  { 143, 1 },
+  { 143, 3 },
+  { 143, 1 },
+  { 143, 3 },
+  { 143, 6 },
+  { 143, 6 },
+  { 239, 1 },
+  { 240, 0 },
+  { 240, 1 },
+  { 143, 1 },
+  { 143, 4 },
+  { 241, 7 },
+  { 242, 1 },
+  { 242, 3 },
+  { 243, 0 },
+  { 243, 2 },
+  { 244, 1 },
+  { 244, 3 },
+  { 245, 1 },
+  { 246, 0 },
+  { 246, 2 },
+};
+
+static void yy_accept(yyParser*);  /* Forward Declaration */
+
+/*
+** Perform a reduce action and the shift that must immediately
+** follow the reduce.
+*/
+static void yy_reduce(
+  yyParser *yypParser,         /* The parser */
+  int yyruleno                 /* Number of the rule by which to reduce */
+){
+  int yygoto;                     /* The next state */
+  int yyact;                      /* The next action */
+  YYMINORTYPE yygotominor;        /* The LHS of the rule reduced */
+  yyStackEntry *yymsp;            /* The top of the parser's stack */
+  int yysize;                     /* Amount to pop the stack */
+  sqlite3ParserARG_FETCH;
+  yymsp = &yypParser->yystack[yypParser->yyidx];
+#ifndef NDEBUG
+  if( yyTraceFILE && yyruleno>=0
+        && yyruleno<(int)(sizeof(yyRuleName)/sizeof(yyRuleName[0])) ){
+    fprintf(yyTraceFILE, "%sReduce [%s].\n", yyTracePrompt,
+      yyRuleName[yyruleno]);
+  }
+#endif /* NDEBUG */
+
+  /* Silence complaints from purify about yygotominor being uninitialized
+  ** in some cases when it is copied into the stack after the following
+  ** switch.  yygotominor is uninitialized when a rule reduces that does
+  ** not set the value of its left-hand side nonterminal.  Leaving the
+  ** value of the nonterminal uninitialized is utterly harmless as long
+  ** as the value is never used.  So really the only thing this code
+  ** accomplishes is to quieten purify.
+  **
+  ** 2007-01-16:  The wireshark project (www.wireshark.org) reports that
+  ** without this code, their parser segfaults.  I'm not sure what there
+  ** parser is doing to make this happen.  This is the second bug report
+  ** from wireshark this week.  Clearly they are stressing Lemon in ways
+  ** that it has not been previously stressed...  (SQLite ticket #2172)
+  */
+  memset(&yygotominor, 0, sizeof(yygotominor));
+
+
+  switch( yyruleno ){
+  /* Beginning here are the reduction cases.  A typical example
+  ** follows:
+  **   case 0:
+  **  #line <lineno> <grammarfile>
+  **     { ... }           // User supplied code
+  **  #line <lineno> <thisfile>
+  **     break;
+  */
+      case 0: /* input ::= cmdlist */
+      case 1: /* cmdlist ::= cmdlist ecmd */
+      case 2: /* cmdlist ::= ecmd */
+      case 4: /* ecmd ::= SEMI */
+      case 5: /* ecmd ::= explain cmdx SEMI */
+      case 10: /* trans_opt ::= */
+      case 11: /* trans_opt ::= TRANSACTION */
+      case 12: /* trans_opt ::= TRANSACTION nm */
+      case 20: /* cmd ::= create_table create_table_args */
+      case 28: /* columnlist ::= columnlist COMMA column */
+      case 29: /* columnlist ::= column */
+      case 37: /* type ::= */
+      case 44: /* signed ::= plus_num */
+      case 45: /* signed ::= minus_num */
+      case 46: /* carglist ::= carglist carg */
+      case 47: /* carglist ::= */
+      case 48: /* carg ::= CONSTRAINT nm ccons */
+      case 49: /* carg ::= ccons */
+      case 55: /* ccons ::= NULL onconf */
+      case 82: /* conslist ::= conslist COMMA tcons */
+      case 83: /* conslist ::= conslist tcons */
+      case 84: /* conslist ::= tcons */
+      case 85: /* tcons ::= CONSTRAINT nm */
+      case 257: /* plus_opt ::= PLUS */
+      case 258: /* plus_opt ::= */
+      case 268: /* foreach_clause ::= */
+      case 269: /* foreach_clause ::= FOR EACH ROW */
+      case 289: /* database_kw_opt ::= DATABASE */
+      case 290: /* database_kw_opt ::= */
+      case 298: /* kwcolumn_opt ::= */
+      case 299: /* kwcolumn_opt ::= COLUMNKW */
+      case 303: /* vtabarglist ::= vtabarg */
+      case 304: /* vtabarglist ::= vtabarglist COMMA vtabarg */
+      case 306: /* vtabarg ::= vtabarg vtabargtoken */
+      case 310: /* anylist ::= */
+#line 91 "parse.y"
+{
+}
+#line 1938 "parse.c"
+        break;
+      case 3: /* cmdx ::= cmd */
+#line 94 "parse.y"
+{ sqlite3FinishCoding(pParse); }
+#line 1943 "parse.c"
+        break;
+      case 6: /* explain ::= */
+#line 97 "parse.y"
+{ sqlite3BeginParse(pParse, 0); }
+#line 1948 "parse.c"
+        break;
+      case 7: /* explain ::= EXPLAIN */
+#line 99 "parse.y"
+{ sqlite3BeginParse(pParse, 1); }
+#line 1953 "parse.c"
+        break;
+      case 8: /* explain ::= EXPLAIN QUERY PLAN */
+#line 100 "parse.y"
+{ sqlite3BeginParse(pParse, 2); }
+#line 1958 "parse.c"
+        break;
+      case 9: /* cmd ::= BEGIN transtype trans_opt */
+#line 106 "parse.y"
+{sqlite3BeginTransaction(pParse, yymsp[-1].minor.yy46);}
+#line 1963 "parse.c"
+        break;
+      case 13: /* transtype ::= */
+#line 111 "parse.y"
+{yygotominor.yy46 = TK_DEFERRED;}
+#line 1968 "parse.c"
+        break;
+      case 14: /* transtype ::= DEFERRED */
+      case 15: /* transtype ::= IMMEDIATE */
+      case 16: /* transtype ::= EXCLUSIVE */
+      case 107: /* multiselect_op ::= UNION */
+      case 109: /* multiselect_op ::= EXCEPT|INTERSECT */
+#line 112 "parse.y"
+{yygotominor.yy46 = yymsp[0].major;}
+#line 1977 "parse.c"
+        break;
+      case 17: /* cmd ::= COMMIT trans_opt */
+      case 18: /* cmd ::= END trans_opt */
+#line 115 "parse.y"
+{sqlite3CommitTransaction(pParse);}
+#line 1983 "parse.c"
+        break;
+      case 19: /* cmd ::= ROLLBACK trans_opt */
+#line 117 "parse.y"
+{sqlite3RollbackTransaction(pParse);}
+#line 1988 "parse.c"
+        break;
+      case 21: /* create_table ::= CREATE temp TABLE ifnotexists nm dbnm */
+#line 122 "parse.y"
+{
+   sqlite3StartTable(pParse,&yymsp[-1].minor.yy410,&yymsp[0].minor.yy410,yymsp[-4].minor.yy46,0,0,yymsp[-2].minor.yy46);
+}
+#line 1995 "parse.c"
+        break;
+      case 22: /* ifnotexists ::= */
+      case 25: /* temp ::= */
+      case 63: /* autoinc ::= */
+      case 77: /* init_deferred_pred_opt ::= */
+      case 79: /* init_deferred_pred_opt ::= INITIALLY IMMEDIATE */
+      case 90: /* defer_subclause_opt ::= */
+      case 101: /* ifexists ::= */
+      case 112: /* distinct ::= ALL */
+      case 113: /* distinct ::= */
+      case 213: /* between_op ::= BETWEEN */
+      case 216: /* in_op ::= IN */
+#line 126 "parse.y"
+{yygotominor.yy46 = 0;}
+#line 2010 "parse.c"
+        break;
+      case 23: /* ifnotexists ::= IF NOT EXISTS */
+      case 24: /* temp ::= TEMP */
+      case 64: /* autoinc ::= AUTOINCR */
+      case 78: /* init_deferred_pred_opt ::= INITIALLY DEFERRED */
+      case 100: /* ifexists ::= IF EXISTS */
+      case 111: /* distinct ::= DISTINCT */
+      case 214: /* between_op ::= NOT BETWEEN */
+      case 217: /* in_op ::= NOT IN */
+#line 127 "parse.y"
+{yygotominor.yy46 = 1;}
+#line 2022 "parse.c"
+        break;
+      case 26: /* create_table_args ::= LP columnlist conslist_opt RP */
+#line 133 "parse.y"
+{
+  sqlite3EndTable(pParse,&yymsp[-1].minor.yy410,&yymsp[0].minor.yy0,0);
+}
+#line 2029 "parse.c"
+        break;
+      case 27: /* create_table_args ::= AS select */
+#line 136 "parse.y"
+{
+  sqlite3EndTable(pParse,0,0,yymsp[0].minor.yy219);
+  sqlite3SelectDelete(yymsp[0].minor.yy219);
+}
+#line 2037 "parse.c"
+        break;
+      case 30: /* column ::= columnid type carglist */
+#line 148 "parse.y"
+{
+  yygotominor.yy410.z = yymsp[-2].minor.yy410.z;
+  yygotominor.yy410.n = (pParse->sLastToken.z-yymsp[-2].minor.yy410.z) + pParse->sLastToken.n;
+}
+#line 2045 "parse.c"
+        break;
+      case 31: /* columnid ::= nm */
+#line 152 "parse.y"
+{
+  sqlite3AddColumn(pParse,&yymsp[0].minor.yy410);
+  yygotominor.yy410 = yymsp[0].minor.yy410;
+}
+#line 2053 "parse.c"
+        break;
+      case 32: /* id ::= ID */
+      case 33: /* ids ::= ID|STRING */
+      case 34: /* nm ::= ID */
+      case 35: /* nm ::= STRING */
+      case 36: /* nm ::= JOIN_KW */
+      case 256: /* number ::= INTEGER|FLOAT */
+#line 162 "parse.y"
+{yygotominor.yy410 = yymsp[0].minor.yy0;}
+#line 2063 "parse.c"
+        break;
+      case 38: /* type ::= typetoken */
+#line 223 "parse.y"
+{sqlite3AddColumnType(pParse,&yymsp[0].minor.yy410);}
+#line 2068 "parse.c"
+        break;
+      case 39: /* typetoken ::= typename */
+      case 42: /* typename ::= ids */
+      case 119: /* as ::= AS nm */
+      case 120: /* as ::= ids */
+      case 131: /* dbnm ::= DOT nm */
+      case 241: /* idxitem ::= nm */
+      case 243: /* collate ::= COLLATE ids */
+      case 252: /* nmnum ::= plus_num */
+      case 253: /* nmnum ::= nm */
+      case 254: /* plus_num ::= plus_opt number */
+      case 255: /* minus_num ::= MINUS number */
+#line 224 "parse.y"
+{yygotominor.yy410 = yymsp[0].minor.yy410;}
+#line 2083 "parse.c"
+        break;
+      case 40: /* typetoken ::= typename LP signed RP */
+#line 225 "parse.y"
+{
+  yygotominor.yy410.z = yymsp[-3].minor.yy410.z;
+  yygotominor.yy410.n = &yymsp[0].minor.yy0.z[yymsp[0].minor.yy0.n] - yymsp[-3].minor.yy410.z;
+}
+#line 2091 "parse.c"
+        break;
+      case 41: /* typetoken ::= typename LP signed COMMA signed RP */
+#line 229 "parse.y"
+{
+  yygotominor.yy410.z = yymsp[-5].minor.yy410.z;
+  yygotominor.yy410.n = &yymsp[0].minor.yy0.z[yymsp[0].minor.yy0.n] - yymsp[-5].minor.yy410.z;
+}
+#line 2099 "parse.c"
+        break;
+      case 43: /* typename ::= typename ids */
+#line 235 "parse.y"
+{yygotominor.yy410.z=yymsp[-1].minor.yy410.z; yygotominor.yy410.n=yymsp[0].minor.yy410.n+(yymsp[0].minor.yy410.z-yymsp[-1].minor.yy410.z);}
+#line 2104 "parse.c"
+        break;
+      case 50: /* ccons ::= DEFAULT term */
+      case 52: /* ccons ::= DEFAULT PLUS term */
+#line 246 "parse.y"
+{sqlite3AddDefaultValue(pParse,yymsp[0].minor.yy172);}
+#line 2110 "parse.c"
+        break;
+      case 51: /* ccons ::= DEFAULT LP expr RP */
+#line 247 "parse.y"
+{sqlite3AddDefaultValue(pParse,yymsp[-1].minor.yy172);}
+#line 2115 "parse.c"
+        break;
+      case 53: /* ccons ::= DEFAULT MINUS term */
+#line 249 "parse.y"
+{
+  Expr *p = sqlite3PExpr(pParse, TK_UMINUS, yymsp[0].minor.yy172, 0, 0);
+  sqlite3AddDefaultValue(pParse,p);
+}
+#line 2123 "parse.c"
+        break;
+      case 54: /* ccons ::= DEFAULT id */
+#line 253 "parse.y"
+{
+  Expr *p = sqlite3PExpr(pParse, TK_STRING, 0, 0, &yymsp[0].minor.yy410);
+  sqlite3AddDefaultValue(pParse,p);
+}
+#line 2131 "parse.c"
+        break;
+      case 56: /* ccons ::= NOT NULL onconf */
+#line 262 "parse.y"
+{sqlite3AddNotNull(pParse, yymsp[0].minor.yy46);}
+#line 2136 "parse.c"
+        break;
+      case 57: /* ccons ::= PRIMARY KEY sortorder onconf autoinc */
+#line 264 "parse.y"
+{sqlite3AddPrimaryKey(pParse,0,yymsp[-1].minor.yy46,yymsp[0].minor.yy46,yymsp[-2].minor.yy46);}
+#line 2141 "parse.c"
+        break;
+      case 58: /* ccons ::= UNIQUE onconf */
+#line 265 "parse.y"
+{sqlite3CreateIndex(pParse,0,0,0,0,yymsp[0].minor.yy46,0,0,0,0);}
+#line 2146 "parse.c"
+        break;
+      case 59: /* ccons ::= CHECK LP expr RP */
+#line 266 "parse.y"
+{sqlite3AddCheckConstraint(pParse,yymsp[-1].minor.yy172);}
+#line 2151 "parse.c"
+        break;
+      case 60: /* ccons ::= REFERENCES nm idxlist_opt refargs */
+#line 268 "parse.y"
+{sqlite3CreateForeignKey(pParse,0,&yymsp[-2].minor.yy410,yymsp[-1].minor.yy174,yymsp[0].minor.yy46);}
+#line 2156 "parse.c"
+        break;
+      case 61: /* ccons ::= defer_subclause */
+#line 269 "parse.y"
+{sqlite3DeferForeignKey(pParse,yymsp[0].minor.yy46);}
+#line 2161 "parse.c"
+        break;
+      case 62: /* ccons ::= COLLATE ids */
+#line 270 "parse.y"
+{sqlite3AddCollateType(pParse, &yymsp[0].minor.yy410);}
+#line 2166 "parse.c"
+        break;
+      case 65: /* refargs ::= */
+#line 283 "parse.y"
+{ yygotominor.yy46 = OE_Restrict * 0x010101; }
+#line 2171 "parse.c"
+        break;
+      case 66: /* refargs ::= refargs refarg */
+#line 284 "parse.y"
+{ yygotominor.yy46 = (yymsp[-1].minor.yy46 & yymsp[0].minor.yy405.mask) | yymsp[0].minor.yy405.value; }
+#line 2176 "parse.c"
+        break;
+      case 67: /* refarg ::= MATCH nm */
+#line 286 "parse.y"
+{ yygotominor.yy405.value = 0;     yygotominor.yy405.mask = 0x000000; }
+#line 2181 "parse.c"
+        break;
+      case 68: /* refarg ::= ON DELETE refact */
+#line 287 "parse.y"
+{ yygotominor.yy405.value = yymsp[0].minor.yy46;     yygotominor.yy405.mask = 0x0000ff; }
+#line 2186 "parse.c"
+        break;
+      case 69: /* refarg ::= ON UPDATE refact */
+#line 288 "parse.y"
+{ yygotominor.yy405.value = yymsp[0].minor.yy46<<8;  yygotominor.yy405.mask = 0x00ff00; }
+#line 2191 "parse.c"
+        break;
+      case 70: /* refarg ::= ON INSERT refact */
+#line 289 "parse.y"
+{ yygotominor.yy405.value = yymsp[0].minor.yy46<<16; yygotominor.yy405.mask = 0xff0000; }
+#line 2196 "parse.c"
+        break;
+      case 71: /* refact ::= SET NULL */
+#line 291 "parse.y"
+{ yygotominor.yy46 = OE_SetNull; }
+#line 2201 "parse.c"
+        break;
+      case 72: /* refact ::= SET DEFAULT */
+#line 292 "parse.y"
+{ yygotominor.yy46 = OE_SetDflt; }
+#line 2206 "parse.c"
+        break;
+      case 73: /* refact ::= CASCADE */
+#line 293 "parse.y"
+{ yygotominor.yy46 = OE_Cascade; }
+#line 2211 "parse.c"
+        break;
+      case 74: /* refact ::= RESTRICT */
+#line 294 "parse.y"
+{ yygotominor.yy46 = OE_Restrict; }
+#line 2216 "parse.c"
+        break;
+      case 75: /* defer_subclause ::= NOT DEFERRABLE init_deferred_pred_opt */
+      case 76: /* defer_subclause ::= DEFERRABLE init_deferred_pred_opt */
+      case 91: /* defer_subclause_opt ::= defer_subclause */
+      case 93: /* onconf ::= ON CONFLICT resolvetype */
+      case 95: /* orconf ::= OR resolvetype */
+      case 96: /* resolvetype ::= raisetype */
+      case 166: /* insert_cmd ::= INSERT orconf */
+#line 296 "parse.y"
+{yygotominor.yy46 = yymsp[0].minor.yy46;}
+#line 2227 "parse.c"
+        break;
+      case 80: /* conslist_opt ::= */
+#line 306 "parse.y"
+{yygotominor.yy410.n = 0; yygotominor.yy410.z = 0;}
+#line 2232 "parse.c"
+        break;
+      case 81: /* conslist_opt ::= COMMA conslist */
+#line 307 "parse.y"
+{yygotominor.yy410 = yymsp[-1].minor.yy0;}
+#line 2237 "parse.c"
+        break;
+      case 86: /* tcons ::= PRIMARY KEY LP idxlist autoinc RP onconf */
+#line 313 "parse.y"
+{sqlite3AddPrimaryKey(pParse,yymsp[-3].minor.yy174,yymsp[0].minor.yy46,yymsp[-2].minor.yy46,0);}
+#line 2242 "parse.c"
+        break;
+      case 87: /* tcons ::= UNIQUE LP idxlist RP onconf */
+#line 315 "parse.y"
+{sqlite3CreateIndex(pParse,0,0,0,yymsp[-2].minor.yy174,yymsp[0].minor.yy46,0,0,0,0);}
+#line 2247 "parse.c"
+        break;
+      case 88: /* tcons ::= CHECK LP expr RP onconf */
+#line 316 "parse.y"
+{sqlite3AddCheckConstraint(pParse,yymsp[-2].minor.yy172);}
+#line 2252 "parse.c"
+        break;
+      case 89: /* tcons ::= FOREIGN KEY LP idxlist RP REFERENCES nm idxlist_opt refargs defer_subclause_opt */
+#line 318 "parse.y"
+{
+    sqlite3CreateForeignKey(pParse, yymsp[-6].minor.yy174, &yymsp[-3].minor.yy410, yymsp[-2].minor.yy174, yymsp[-1].minor.yy46);
+    sqlite3DeferForeignKey(pParse, yymsp[0].minor.yy46);
+}
+#line 2260 "parse.c"
+        break;
+      case 92: /* onconf ::= */
+      case 94: /* orconf ::= */
+#line 332 "parse.y"
+{yygotominor.yy46 = OE_Default;}
+#line 2266 "parse.c"
+        break;
+      case 97: /* resolvetype ::= IGNORE */
+#line 337 "parse.y"
+{yygotominor.yy46 = OE_Ignore;}
+#line 2271 "parse.c"
+        break;
+      case 98: /* resolvetype ::= REPLACE */
+      case 167: /* insert_cmd ::= REPLACE */
+#line 338 "parse.y"
+{yygotominor.yy46 = OE_Replace;}
+#line 2277 "parse.c"
+        break;
+      case 99: /* cmd ::= DROP TABLE ifexists fullname */
+#line 342 "parse.y"
+{
+  sqlite3DropTable(pParse, yymsp[0].minor.yy373, 0, yymsp[-1].minor.yy46);
+}
+#line 2284 "parse.c"
+        break;
+      case 102: /* cmd ::= CREATE temp VIEW ifnotexists nm dbnm AS select */
+#line 352 "parse.y"
+{
+  sqlite3CreateView(pParse, &yymsp[-7].minor.yy0, &yymsp[-3].minor.yy410, &yymsp[-2].minor.yy410, yymsp[0].minor.yy219, yymsp[-6].minor.yy46, yymsp[-4].minor.yy46);
+}
+#line 2291 "parse.c"
+        break;
+      case 103: /* cmd ::= DROP VIEW ifexists fullname */
+#line 355 "parse.y"
+{
+  sqlite3DropTable(pParse, yymsp[0].minor.yy373, 1, yymsp[-1].minor.yy46);
+}
+#line 2298 "parse.c"
+        break;
+      case 104: /* cmd ::= select */
+#line 362 "parse.y"
+{
+  SelectDest dest = {SRT_Callback, 0, 0};
+  sqlite3Select(pParse, yymsp[0].minor.yy219, &dest, 0, 0, 0, 0);
+  sqlite3SelectDelete(yymsp[0].minor.yy219);
+}
+#line 2307 "parse.c"
+        break;
+      case 105: /* select ::= oneselect */
+      case 128: /* seltablist_paren ::= select */
+#line 373 "parse.y"
+{yygotominor.yy219 = yymsp[0].minor.yy219;}
+#line 2313 "parse.c"
+        break;
+      case 106: /* select ::= select multiselect_op oneselect */
+#line 375 "parse.y"
+{
+  if( yymsp[0].minor.yy219 ){
+    yymsp[0].minor.yy219->op = yymsp[-1].minor.yy46;
+    yymsp[0].minor.yy219->pPrior = yymsp[-2].minor.yy219;
+  }else{
+    sqlite3SelectDelete(yymsp[-2].minor.yy219);
+  }
+  yygotominor.yy219 = yymsp[0].minor.yy219;
+}
+#line 2326 "parse.c"
+        break;
+      case 108: /* multiselect_op ::= UNION ALL */
+#line 386 "parse.y"
+{yygotominor.yy46 = TK_ALL;}
+#line 2331 "parse.c"
+        break;
+      case 110: /* oneselect ::= SELECT distinct selcollist from where_opt groupby_opt having_opt orderby_opt limit_opt */
+#line 390 "parse.y"
+{
+  yygotominor.yy219 = sqlite3SelectNew(pParse,yymsp[-6].minor.yy174,yymsp[-5].minor.yy373,yymsp[-4].minor.yy172,yymsp[-3].minor.yy174,yymsp[-2].minor.yy172,yymsp[-1].minor.yy174,yymsp[-7].minor.yy46,yymsp[0].minor.yy234.pLimit,yymsp[0].minor.yy234.pOffset);
+}
+#line 2338 "parse.c"
+        break;
+      case 114: /* sclp ::= selcollist COMMA */
+      case 238: /* idxlist_opt ::= LP idxlist RP */
+#line 411 "parse.y"
+{yygotominor.yy174 = yymsp[-1].minor.yy174;}
+#line 2344 "parse.c"
+        break;
+      case 115: /* sclp ::= */
+      case 141: /* orderby_opt ::= */
+      case 149: /* groupby_opt ::= */
+      case 231: /* exprlist ::= */
+      case 237: /* idxlist_opt ::= */
+#line 412 "parse.y"
+{yygotominor.yy174 = 0;}
+#line 2353 "parse.c"
+        break;
+      case 116: /* selcollist ::= sclp expr as */
+#line 413 "parse.y"
+{
+   yygotominor.yy174 = sqlite3ExprListAppend(pParse,yymsp[-2].minor.yy174,yymsp[-1].minor.yy172,yymsp[0].minor.yy410.n?&yymsp[0].minor.yy410:0);
+}
+#line 2360 "parse.c"
+        break;
+      case 117: /* selcollist ::= sclp STAR */
+#line 416 "parse.y"
+{
+  Expr *p = sqlite3PExpr(pParse, TK_ALL, 0, 0, 0);
+  yygotominor.yy174 = sqlite3ExprListAppend(pParse, yymsp[-1].minor.yy174, p, 0);
+}
+#line 2368 "parse.c"
+        break;
+      case 118: /* selcollist ::= sclp nm DOT STAR */
+#line 420 "parse.y"
+{
+  Expr *pRight = sqlite3PExpr(pParse, TK_ALL, 0, 0, 0);
+  Expr *pLeft = sqlite3PExpr(pParse, TK_ID, 0, 0, &yymsp[-2].minor.yy410);
+  Expr *pDot = sqlite3PExpr(pParse, TK_DOT, pLeft, pRight, 0);
+  yygotominor.yy174 = sqlite3ExprListAppend(pParse,yymsp[-3].minor.yy174, pDot, 0);
+}
+#line 2378 "parse.c"
+        break;
+      case 121: /* as ::= */
+#line 433 "parse.y"
+{yygotominor.yy410.n = 0;}
+#line 2383 "parse.c"
+        break;
+      case 122: /* from ::= */
+#line 445 "parse.y"
+{yygotominor.yy373 = sqlite3DbMallocZero(pParse->db, sizeof(*yygotominor.yy373));}
+#line 2388 "parse.c"
+        break;
+      case 123: /* from ::= FROM seltablist */
+#line 446 "parse.y"
+{
+  yygotominor.yy373 = yymsp[0].minor.yy373;
+  sqlite3SrcListShiftJoinType(yygotominor.yy373);
+}
+#line 2396 "parse.c"
+        break;
+      case 124: /* stl_prefix ::= seltablist joinop */
+#line 454 "parse.y"
+{
+   yygotominor.yy373 = yymsp[-1].minor.yy373;
+   if( yygotominor.yy373 && yygotominor.yy373->nSrc>0 ) yygotominor.yy373->a[yygotominor.yy373->nSrc-1].jointype = yymsp[0].minor.yy46;
+}
+#line 2404 "parse.c"
+        break;
+      case 125: /* stl_prefix ::= */
+#line 458 "parse.y"
+{yygotominor.yy373 = 0;}
+#line 2409 "parse.c"
+        break;
+      case 126: /* seltablist ::= stl_prefix nm dbnm as on_opt using_opt */
+#line 459 "parse.y"
+{
+  yygotominor.yy373 = sqlite3SrcListAppendFromTerm(pParse,yymsp[-5].minor.yy373,&yymsp[-4].minor.yy410,&yymsp[-3].minor.yy410,&yymsp[-2].minor.yy410,0,yymsp[-1].minor.yy172,yymsp[0].minor.yy432);
+}
+#line 2416 "parse.c"
+        break;
+      case 127: /* seltablist ::= stl_prefix LP seltablist_paren RP as on_opt using_opt */
+#line 464 "parse.y"
+{
+    yygotominor.yy373 = sqlite3SrcListAppendFromTerm(pParse,yymsp[-6].minor.yy373,0,0,&yymsp[-2].minor.yy410,yymsp[-4].minor.yy219,yymsp[-1].minor.yy172,yymsp[0].minor.yy432);
+  }
+#line 2423 "parse.c"
+        break;
+      case 129: /* seltablist_paren ::= seltablist */
+#line 475 "parse.y"
+{
+     sqlite3SrcListShiftJoinType(yymsp[0].minor.yy373);
+     yygotominor.yy219 = sqlite3SelectNew(pParse,0,yymsp[0].minor.yy373,0,0,0,0,0,0,0);
+  }
+#line 2431 "parse.c"
+        break;
+      case 130: /* dbnm ::= */
+#line 482 "parse.y"
+{yygotominor.yy410.z=0; yygotominor.yy410.n=0;}
+#line 2436 "parse.c"
+        break;
+      case 132: /* fullname ::= nm dbnm */
+#line 487 "parse.y"
+{yygotominor.yy373 = sqlite3SrcListAppend(pParse->db,0,&yymsp[-1].minor.yy410,&yymsp[0].minor.yy410);}
+#line 2441 "parse.c"
+        break;
+      case 133: /* joinop ::= COMMA|JOIN */
+#line 491 "parse.y"
+{ yygotominor.yy46 = JT_INNER; }
+#line 2446 "parse.c"
+        break;
+      case 134: /* joinop ::= JOIN_KW JOIN */
+#line 492 "parse.y"
+{ yygotominor.yy46 = sqlite3JoinType(pParse,&yymsp[-1].minor.yy0,0,0); }
+#line 2451 "parse.c"
+        break;
+      case 135: /* joinop ::= JOIN_KW nm JOIN */
+#line 493 "parse.y"
+{ yygotominor.yy46 = sqlite3JoinType(pParse,&yymsp[-2].minor.yy0,&yymsp[-1].minor.yy410,0); }
+#line 2456 "parse.c"
+        break;
+      case 136: /* joinop ::= JOIN_KW nm nm JOIN */
+#line 495 "parse.y"
+{ yygotominor.yy46 = sqlite3JoinType(pParse,&yymsp[-3].minor.yy0,&yymsp[-2].minor.yy410,&yymsp[-1].minor.yy410); }
+#line 2461 "parse.c"
+        break;
+      case 137: /* on_opt ::= ON expr */
+      case 145: /* sortitem ::= expr */
+      case 152: /* having_opt ::= HAVING expr */
+      case 159: /* where_opt ::= WHERE expr */
+      case 174: /* expr ::= term */
+      case 202: /* escape ::= ESCAPE expr */
+      case 226: /* case_else ::= ELSE expr */
+      case 228: /* case_operand ::= expr */
+#line 499 "parse.y"
+{yygotominor.yy172 = yymsp[0].minor.yy172;}
+#line 2473 "parse.c"
+        break;
+      case 138: /* on_opt ::= */
+      case 151: /* having_opt ::= */
+      case 158: /* where_opt ::= */
+      case 203: /* escape ::= */
+      case 227: /* case_else ::= */
+      case 229: /* case_operand ::= */
+#line 500 "parse.y"
+{yygotominor.yy172 = 0;}
+#line 2483 "parse.c"
+        break;
+      case 139: /* using_opt ::= USING LP inscollist RP */
+      case 171: /* inscollist_opt ::= LP inscollist RP */
+#line 504 "parse.y"
+{yygotominor.yy432 = yymsp[-1].minor.yy432;}
+#line 2489 "parse.c"
+        break;
+      case 140: /* using_opt ::= */
+      case 170: /* inscollist_opt ::= */
+#line 505 "parse.y"
+{yygotominor.yy432 = 0;}
+#line 2495 "parse.c"
+        break;
+      case 142: /* orderby_opt ::= ORDER BY sortlist */
+      case 150: /* groupby_opt ::= GROUP BY nexprlist */
+      case 230: /* exprlist ::= nexprlist */
+#line 516 "parse.y"
+{yygotominor.yy174 = yymsp[0].minor.yy174;}
+#line 2502 "parse.c"
+        break;
+      case 143: /* sortlist ::= sortlist COMMA sortitem sortorder */
+#line 517 "parse.y"
+{
+  yygotominor.yy174 = sqlite3ExprListAppend(pParse,yymsp[-3].minor.yy174,yymsp[-1].minor.yy172,0);
+  if( yygotominor.yy174 ) yygotominor.yy174->a[yygotominor.yy174->nExpr-1].sortOrder = yymsp[0].minor.yy46;
+}
+#line 2510 "parse.c"
+        break;
+      case 144: /* sortlist ::= sortitem sortorder */
+#line 521 "parse.y"
+{
+  yygotominor.yy174 = sqlite3ExprListAppend(pParse,0,yymsp[-1].minor.yy172,0);
+  if( yygotominor.yy174 && yygotominor.yy174->a ) yygotominor.yy174->a[0].sortOrder = yymsp[0].minor.yy46;
+}
+#line 2518 "parse.c"
+        break;
+      case 146: /* sortorder ::= ASC */
+      case 148: /* sortorder ::= */
+#line 529 "parse.y"
+{yygotominor.yy46 = SQLITE_SO_ASC;}
+#line 2524 "parse.c"
+        break;
+      case 147: /* sortorder ::= DESC */
+#line 530 "parse.y"
+{yygotominor.yy46 = SQLITE_SO_DESC;}
+#line 2529 "parse.c"
+        break;
+      case 153: /* limit_opt ::= */
+#line 556 "parse.y"
+{yygotominor.yy234.pLimit = 0; yygotominor.yy234.pOffset = 0;}
+#line 2534 "parse.c"
+        break;
+      case 154: /* limit_opt ::= LIMIT expr */
+#line 557 "parse.y"
+{yygotominor.yy234.pLimit = yymsp[0].minor.yy172; yygotominor.yy234.pOffset = 0;}
+#line 2539 "parse.c"
+        break;
+      case 155: /* limit_opt ::= LIMIT expr OFFSET expr */
+#line 559 "parse.y"
+{yygotominor.yy234.pLimit = yymsp[-2].minor.yy172; yygotominor.yy234.pOffset = yymsp[0].minor.yy172;}
+#line 2544 "parse.c"
+        break;
+      case 156: /* limit_opt ::= LIMIT expr COMMA expr */
+#line 561 "parse.y"
+{yygotominor.yy234.pOffset = yymsp[-2].minor.yy172; yygotominor.yy234.pLimit = yymsp[0].minor.yy172;}
+#line 2549 "parse.c"
+        break;
+      case 157: /* cmd ::= DELETE FROM fullname where_opt */
+#line 565 "parse.y"
+{sqlite3DeleteFrom(pParse,yymsp[-1].minor.yy373,yymsp[0].minor.yy172);}
+#line 2554 "parse.c"
+        break;
+      case 160: /* cmd ::= UPDATE orconf fullname SET setlist where_opt */
+#line 575 "parse.y"
+{
+  sqlite3ExprListCheckLength(pParse,yymsp[-1].minor.yy174,SQLITE_MAX_COLUMN,"set list");
+  sqlite3Update(pParse,yymsp[-3].minor.yy373,yymsp[-1].minor.yy174,yymsp[0].minor.yy172,yymsp[-4].minor.yy46);
+}
+#line 2562 "parse.c"
+        break;
+      case 161: /* setlist ::= setlist COMMA nm EQ expr */
+#line 584 "parse.y"
+{yygotominor.yy174 = sqlite3ExprListAppend(pParse,yymsp[-4].minor.yy174,yymsp[0].minor.yy172,&yymsp[-2].minor.yy410);}
+#line 2567 "parse.c"
+        break;
+      case 162: /* setlist ::= nm EQ expr */
+#line 586 "parse.y"
+{yygotominor.yy174 = sqlite3ExprListAppend(pParse,0,yymsp[0].minor.yy172,&yymsp[-2].minor.yy410);}
+#line 2572 "parse.c"
+        break;
+      case 163: /* cmd ::= insert_cmd INTO fullname inscollist_opt VALUES LP itemlist RP */
+#line 592 "parse.y"
+{sqlite3Insert(pParse, yymsp[-5].minor.yy373, yymsp[-1].minor.yy174, 0, yymsp[-4].minor.yy432, yymsp[-7].minor.yy46);}
+#line 2577 "parse.c"
+        break;
+      case 164: /* cmd ::= insert_cmd INTO fullname inscollist_opt select */
+#line 594 "parse.y"
+{sqlite3Insert(pParse, yymsp[-2].minor.yy373, 0, yymsp[0].minor.yy219, yymsp[-1].minor.yy432, yymsp[-4].minor.yy46);}
+#line 2582 "parse.c"
+        break;
+      case 165: /* cmd ::= insert_cmd INTO fullname inscollist_opt DEFAULT VALUES */
+#line 596 "parse.y"
+{sqlite3Insert(pParse, yymsp[-3].minor.yy373, 0, 0, yymsp[-2].minor.yy432, yymsp[-5].minor.yy46);}
+#line 2587 "parse.c"
+        break;
+      case 168: /* itemlist ::= itemlist COMMA expr */
+      case 232: /* nexprlist ::= nexprlist COMMA expr */
+#line 607 "parse.y"
+{yygotominor.yy174 = sqlite3ExprListAppend(pParse,yymsp[-2].minor.yy174,yymsp[0].minor.yy172,0);}
+#line 2593 "parse.c"
+        break;
+      case 169: /* itemlist ::= expr */
+      case 233: /* nexprlist ::= expr */
+#line 609 "parse.y"
+{yygotominor.yy174 = sqlite3ExprListAppend(pParse,0,yymsp[0].minor.yy172,0);}
+#line 2599 "parse.c"
+        break;
+      case 172: /* inscollist ::= inscollist COMMA nm */
+#line 619 "parse.y"
+{yygotominor.yy432 = sqlite3IdListAppend(pParse->db,yymsp[-2].minor.yy432,&yymsp[0].minor.yy410);}
+#line 2604 "parse.c"
+        break;
+      case 173: /* inscollist ::= nm */
+#line 621 "parse.y"
+{yygotominor.yy432 = sqlite3IdListAppend(pParse->db,0,&yymsp[0].minor.yy410);}
+#line 2609 "parse.c"
+        break;
+      case 175: /* expr ::= LP expr RP */
+#line 632 "parse.y"
+{yygotominor.yy172 = yymsp[-1].minor.yy172; sqlite3ExprSpan(yygotominor.yy172,&yymsp[-2].minor.yy0,&yymsp[0].minor.yy0); }
+#line 2614 "parse.c"
+        break;
+      case 176: /* term ::= NULL */
+      case 181: /* term ::= INTEGER|FLOAT|BLOB */
+      case 182: /* term ::= STRING */
+#line 633 "parse.y"
+{yygotominor.yy172 = sqlite3PExpr(pParse, yymsp[0].major, 0, 0, &yymsp[0].minor.yy0);}
+#line 2621 "parse.c"
+        break;
+      case 177: /* expr ::= ID */
+      case 178: /* expr ::= JOIN_KW */
+#line 634 "parse.y"
+{yygotominor.yy172 = sqlite3PExpr(pParse, TK_ID, 0, 0, &yymsp[0].minor.yy0);}
+#line 2627 "parse.c"
+        break;
+      case 179: /* expr ::= nm DOT nm */
+#line 636 "parse.y"
+{
+  Expr *temp1 = sqlite3PExpr(pParse, TK_ID, 0, 0, &yymsp[-2].minor.yy410);
+  Expr *temp2 = sqlite3PExpr(pParse, TK_ID, 0, 0, &yymsp[0].minor.yy410);
+  yygotominor.yy172 = sqlite3PExpr(pParse, TK_DOT, temp1, temp2, 0);
+}
+#line 2636 "parse.c"
+        break;
+      case 180: /* expr ::= nm DOT nm DOT nm */
+#line 641 "parse.y"
+{
+  Expr *temp1 = sqlite3PExpr(pParse, TK_ID, 0, 0, &yymsp[-4].minor.yy410);
+  Expr *temp2 = sqlite3PExpr(pParse, TK_ID, 0, 0, &yymsp[-2].minor.yy410);
+  Expr *temp3 = sqlite3PExpr(pParse, TK_ID, 0, 0, &yymsp[0].minor.yy410);
+  Expr *temp4 = sqlite3PExpr(pParse, TK_DOT, temp2, temp3, 0);
+  yygotominor.yy172 = sqlite3PExpr(pParse, TK_DOT, temp1, temp4, 0);
+}
+#line 2647 "parse.c"
+        break;
+      case 183: /* expr ::= REGISTER */
+#line 650 "parse.y"
+{yygotominor.yy172 = sqlite3RegisterExpr(pParse, &yymsp[0].minor.yy0);}
+#line 2652 "parse.c"
+        break;
+      case 184: /* expr ::= VARIABLE */
+#line 651 "parse.y"
+{
+  Token *pToken = &yymsp[0].minor.yy0;
+  Expr *pExpr = yygotominor.yy172 = sqlite3PExpr(pParse, TK_VARIABLE, 0, 0, pToken);
+  sqlite3ExprAssignVarNumber(pParse, pExpr);
+}
+#line 2661 "parse.c"
+        break;
+      case 185: /* expr ::= expr COLLATE ids */
+#line 656 "parse.y"
+{
+  yygotominor.yy172 = sqlite3ExprSetColl(pParse, yymsp[-2].minor.yy172, &yymsp[0].minor.yy410);
+}
+#line 2668 "parse.c"
+        break;
+      case 186: /* expr ::= CAST LP expr AS typetoken RP */
+#line 660 "parse.y"
+{
+  yygotominor.yy172 = sqlite3PExpr(pParse, TK_CAST, yymsp[-3].minor.yy172, 0, &yymsp[-1].minor.yy410);
+  sqlite3ExprSpan(yygotominor.yy172,&yymsp[-5].minor.yy0,&yymsp[0].minor.yy0);
+}
+#line 2676 "parse.c"
+        break;
+      case 187: /* expr ::= ID LP distinct exprlist RP */
+#line 665 "parse.y"
+{
+  if( yymsp[-1].minor.yy174 && yymsp[-1].minor.yy174->nExpr>SQLITE_MAX_FUNCTION_ARG ){
+    sqlite3ErrorMsg(pParse, "too many arguments on function %T", &yymsp[-4].minor.yy0);
+  }
+  yygotominor.yy172 = sqlite3ExprFunction(pParse, yymsp[-1].minor.yy174, &yymsp[-4].minor.yy0);
+  sqlite3ExprSpan(yygotominor.yy172,&yymsp[-4].minor.yy0,&yymsp[0].minor.yy0);
+  if( yymsp[-2].minor.yy46 && yygotominor.yy172 ){
+    yygotominor.yy172->flags |= EP_Distinct;
+  }
+}
+#line 2690 "parse.c"
+        break;
+      case 188: /* expr ::= ID LP STAR RP */
+#line 675 "parse.y"
+{
+  yygotominor.yy172 = sqlite3ExprFunction(pParse, 0, &yymsp[-3].minor.yy0);
+  sqlite3ExprSpan(yygotominor.yy172,&yymsp[-3].minor.yy0,&yymsp[0].minor.yy0);
+}
+#line 2698 "parse.c"
+        break;
+      case 189: /* term ::= CTIME_KW */
+#line 679 "parse.y"
+{
+  /* The CURRENT_TIME, CURRENT_DATE, and CURRENT_TIMESTAMP values are
+  ** treated as functions that return constants */
+  yygotominor.yy172 = sqlite3ExprFunction(pParse, 0,&yymsp[0].minor.yy0);
+  if( yygotominor.yy172 ){
+    yygotominor.yy172->op = TK_CONST_FUNC;
+    yygotominor.yy172->span = yymsp[0].minor.yy0;
+  }
+}
+#line 2711 "parse.c"
+        break;
+      case 190: /* expr ::= expr AND expr */
+      case 191: /* expr ::= expr OR expr */
+      case 192: /* expr ::= expr LT|GT|GE|LE expr */
+      case 193: /* expr ::= expr EQ|NE expr */
+      case 194: /* expr ::= expr BITAND|BITOR|LSHIFT|RSHIFT expr */
+      case 195: /* expr ::= expr PLUS|MINUS expr */
+      case 196: /* expr ::= expr STAR|SLASH|REM expr */
+      case 197: /* expr ::= expr CONCAT expr */
+#line 688 "parse.y"
+{yygotominor.yy172 = sqlite3PExpr(pParse,yymsp[-1].major,yymsp[-2].minor.yy172,yymsp[0].minor.yy172,0);}
+#line 2723 "parse.c"
+        break;
+      case 198: /* likeop ::= LIKE_KW */
+      case 200: /* likeop ::= MATCH */
+#line 700 "parse.y"
+{yygotominor.yy72.eOperator = yymsp[0].minor.yy0; yygotominor.yy72.not = 0;}
+#line 2729 "parse.c"
+        break;
+      case 199: /* likeop ::= NOT LIKE_KW */
+      case 201: /* likeop ::= NOT MATCH */
+#line 701 "parse.y"
+{yygotominor.yy72.eOperator = yymsp[0].minor.yy0; yygotominor.yy72.not = 1;}
+#line 2735 "parse.c"
+        break;
+      case 204: /* expr ::= expr likeop expr escape */
+#line 708 "parse.y"
+{
+  ExprList *pList;
+  pList = sqlite3ExprListAppend(pParse,0, yymsp[-1].minor.yy172, 0);
+  pList = sqlite3ExprListAppend(pParse,pList, yymsp[-3].minor.yy172, 0);
+  if( yymsp[0].minor.yy172 ){
+    pList = sqlite3ExprListAppend(pParse,pList, yymsp[0].minor.yy172, 0);
+  }
+  yygotominor.yy172 = sqlite3ExprFunction(pParse, pList, &yymsp[-2].minor.yy72.eOperator);
+  if( yymsp[-2].minor.yy72.not ) yygotominor.yy172 = sqlite3PExpr(pParse, TK_NOT, yygotominor.yy172, 0, 0);
+  sqlite3ExprSpan(yygotominor.yy172, &yymsp[-3].minor.yy172->span, &yymsp[-1].minor.yy172->span);
+  if( yygotominor.yy172 ) yygotominor.yy172->flags |= EP_InfixFunc;
+}
+#line 2751 "parse.c"
+        break;
+      case 205: /* expr ::= expr ISNULL|NOTNULL */
+#line 721 "parse.y"
+{
+  yygotominor.yy172 = sqlite3PExpr(pParse, yymsp[0].major, yymsp[-1].minor.yy172, 0, 0);
+  sqlite3ExprSpan(yygotominor.yy172,&yymsp[-1].minor.yy172->span,&yymsp[0].minor.yy0);
+}
+#line 2759 "parse.c"
+        break;
+      case 206: /* expr ::= expr IS NULL */
+#line 725 "parse.y"
+{
+  yygotominor.yy172 = sqlite3PExpr(pParse, TK_ISNULL, yymsp[-2].minor.yy172, 0, 0);
+  sqlite3ExprSpan(yygotominor.yy172,&yymsp[-2].minor.yy172->span,&yymsp[0].minor.yy0);
+}
+#line 2767 "parse.c"
+        break;
+      case 207: /* expr ::= expr NOT NULL */
+#line 729 "parse.y"
+{
+  yygotominor.yy172 = sqlite3PExpr(pParse, TK_NOTNULL, yymsp[-2].minor.yy172, 0, 0);
+  sqlite3ExprSpan(yygotominor.yy172,&yymsp[-2].minor.yy172->span,&yymsp[0].minor.yy0);
+}
+#line 2775 "parse.c"
+        break;
+      case 208: /* expr ::= expr IS NOT NULL */
+#line 733 "parse.y"
+{
+  yygotominor.yy172 = sqlite3PExpr(pParse, TK_NOTNULL, yymsp[-3].minor.yy172, 0, 0);
+  sqlite3ExprSpan(yygotominor.yy172,&yymsp[-3].minor.yy172->span,&yymsp[0].minor.yy0);
+}
+#line 2783 "parse.c"
+        break;
+      case 209: /* expr ::= NOT expr */
+      case 210: /* expr ::= BITNOT expr */
+#line 737 "parse.y"
+{
+  yygotominor.yy172 = sqlite3PExpr(pParse, yymsp[-1].major, yymsp[0].minor.yy172, 0, 0);
+  sqlite3ExprSpan(yygotominor.yy172,&yymsp[-1].minor.yy0,&yymsp[0].minor.yy172->span);
+}
+#line 2792 "parse.c"
+        break;
+      case 211: /* expr ::= MINUS expr */
+#line 745 "parse.y"
+{
+  yygotominor.yy172 = sqlite3PExpr(pParse, TK_UMINUS, yymsp[0].minor.yy172, 0, 0);
+  sqlite3ExprSpan(yygotominor.yy172,&yymsp[-1].minor.yy0,&yymsp[0].minor.yy172->span);
+}
+#line 2800 "parse.c"
+        break;
+      case 212: /* expr ::= PLUS expr */
+#line 749 "parse.y"
+{
+  yygotominor.yy172 = sqlite3PExpr(pParse, TK_UPLUS, yymsp[0].minor.yy172, 0, 0);
+  sqlite3ExprSpan(yygotominor.yy172,&yymsp[-1].minor.yy0,&yymsp[0].minor.yy172->span);
+}
+#line 2808 "parse.c"
+        break;
+      case 215: /* expr ::= expr between_op expr AND expr */
+#line 756 "parse.y"
+{
+  ExprList *pList = sqlite3ExprListAppend(pParse,0, yymsp[-2].minor.yy172, 0);
+  pList = sqlite3ExprListAppend(pParse,pList, yymsp[0].minor.yy172, 0);
+  yygotominor.yy172 = sqlite3PExpr(pParse, TK_BETWEEN, yymsp[-4].minor.yy172, 0, 0);
+  if( yygotominor.yy172 ){
+    yygotominor.yy172->pList = pList;
+  }else{
+    sqlite3ExprListDelete(pList);
+  }
+  if( yymsp[-3].minor.yy46 ) yygotominor.yy172 = sqlite3PExpr(pParse, TK_NOT, yygotominor.yy172, 0, 0);
+  sqlite3ExprSpan(yygotominor.yy172,&yymsp[-4].minor.yy172->span,&yymsp[0].minor.yy172->span);
+}
+#line 2824 "parse.c"
+        break;
+      case 218: /* expr ::= expr in_op LP exprlist RP */
+#line 772 "parse.y"
+{
+    yygotominor.yy172 = sqlite3PExpr(pParse, TK_IN, yymsp[-4].minor.yy172, 0, 0);
+    if( yygotominor.yy172 ){
+      yygotominor.yy172->pList = yymsp[-1].minor.yy174;
+      sqlite3ExprSetHeight(yygotominor.yy172);
+    }else{
+      sqlite3ExprListDelete(yymsp[-1].minor.yy174);
+    }
+    if( yymsp[-3].minor.yy46 ) yygotominor.yy172 = sqlite3PExpr(pParse, TK_NOT, yygotominor.yy172, 0, 0);
+    sqlite3ExprSpan(yygotominor.yy172,&yymsp[-4].minor.yy172->span,&yymsp[0].minor.yy0);
+  }
+#line 2839 "parse.c"
+        break;
+      case 219: /* expr ::= LP select RP */
+#line 783 "parse.y"
+{
+    yygotominor.yy172 = sqlite3PExpr(pParse, TK_SELECT, 0, 0, 0);
+    if( yygotominor.yy172 ){
+      yygotominor.yy172->pSelect = yymsp[-1].minor.yy219;
+      sqlite3ExprSetHeight(yygotominor.yy172);
+    }else{
+      sqlite3SelectDelete(yymsp[-1].minor.yy219);
+    }
+    sqlite3ExprSpan(yygotominor.yy172,&yymsp[-2].minor.yy0,&yymsp[0].minor.yy0);
+  }
+#line 2853 "parse.c"
+        break;
+      case 220: /* expr ::= expr in_op LP select RP */
+#line 793 "parse.y"
+{
+    yygotominor.yy172 = sqlite3PExpr(pParse, TK_IN, yymsp[-4].minor.yy172, 0, 0);
+    if( yygotominor.yy172 ){
+      yygotominor.yy172->pSelect = yymsp[-1].minor.yy219;
+      sqlite3ExprSetHeight(yygotominor.yy172);
+    }else{
+      sqlite3SelectDelete(yymsp[-1].minor.yy219);
+    }
+    if( yymsp[-3].minor.yy46 ) yygotominor.yy172 = sqlite3PExpr(pParse, TK_NOT, yygotominor.yy172, 0, 0);
+    sqlite3ExprSpan(yygotominor.yy172,&yymsp[-4].minor.yy172->span,&yymsp[0].minor.yy0);
+  }
+#line 2868 "parse.c"
+        break;
+      case 221: /* expr ::= expr in_op nm dbnm */
+#line 804 "parse.y"
+{
+    SrcList *pSrc = sqlite3SrcListAppend(pParse->db, 0,&yymsp[-1].minor.yy410,&yymsp[0].minor.yy410);
+    yygotominor.yy172 = sqlite3PExpr(pParse, TK_IN, yymsp[-3].minor.yy172, 0, 0);
+    if( yygotominor.yy172 ){
+      yygotominor.yy172->pSelect = sqlite3SelectNew(pParse, 0,pSrc,0,0,0,0,0,0,0);
+      sqlite3ExprSetHeight(yygotominor.yy172);
+    }else{
+      sqlite3SrcListDelete(pSrc);
+    }
+    if( yymsp[-2].minor.yy46 ) yygotominor.yy172 = sqlite3PExpr(pParse, TK_NOT, yygotominor.yy172, 0, 0);
+    sqlite3ExprSpan(yygotominor.yy172,&yymsp[-3].minor.yy172->span,yymsp[0].minor.yy410.z?&yymsp[0].minor.yy410:&yymsp[-1].minor.yy410);
+  }
+#line 2884 "parse.c"
+        break;
+      case 222: /* expr ::= EXISTS LP select RP */
+#line 816 "parse.y"
+{
+    Expr *p = yygotominor.yy172 = sqlite3PExpr(pParse, TK_EXISTS, 0, 0, 0);
+    if( p ){
+      p->pSelect = yymsp[-1].minor.yy219;
+      sqlite3ExprSpan(p,&yymsp[-3].minor.yy0,&yymsp[0].minor.yy0);
+      sqlite3ExprSetHeight(yygotominor.yy172);
+    }else{
+      sqlite3SelectDelete(yymsp[-1].minor.yy219);
+    }
+  }
+#line 2898 "parse.c"
+        break;
+      case 223: /* expr ::= CASE case_operand case_exprlist case_else END */
+#line 829 "parse.y"
+{
+  yygotominor.yy172 = sqlite3PExpr(pParse, TK_CASE, yymsp[-3].minor.yy172, yymsp[-1].minor.yy172, 0);
+  if( yygotominor.yy172 ){
+    yygotominor.yy172->pList = yymsp[-2].minor.yy174;
+    sqlite3ExprSetHeight(yygotominor.yy172);
+  }else{
+    sqlite3ExprListDelete(yymsp[-2].minor.yy174);
+  }
+  sqlite3ExprSpan(yygotominor.yy172, &yymsp[-4].minor.yy0, &yymsp[0].minor.yy0);
+}
+#line 2912 "parse.c"
+        break;
+      case 224: /* case_exprlist ::= case_exprlist WHEN expr THEN expr */
+#line 841 "parse.y"
+{
+  yygotominor.yy174 = sqlite3ExprListAppend(pParse,yymsp[-4].minor.yy174, yymsp[-2].minor.yy172, 0);
+  yygotominor.yy174 = sqlite3ExprListAppend(pParse,yygotominor.yy174, yymsp[0].minor.yy172, 0);
+}
+#line 2920 "parse.c"
+        break;
+      case 225: /* case_exprlist ::= WHEN expr THEN expr */
+#line 845 "parse.y"
+{
+  yygotominor.yy174 = sqlite3ExprListAppend(pParse,0, yymsp[-2].minor.yy172, 0);
+  yygotominor.yy174 = sqlite3ExprListAppend(pParse,yygotominor.yy174, yymsp[0].minor.yy172, 0);
+}
+#line 2928 "parse.c"
+        break;
+      case 234: /* cmd ::= CREATE uniqueflag INDEX ifnotexists nm dbnm ON nm LP idxlist RP */
+#line 874 "parse.y"
+{
+  sqlite3CreateIndex(pParse, &yymsp[-6].minor.yy410, &yymsp[-5].minor.yy410,
+                     sqlite3SrcListAppend(pParse->db,0,&yymsp[-3].minor.yy410,0), yymsp[-1].minor.yy174, yymsp[-9].minor.yy46,
+                      &yymsp[-10].minor.yy0, &yymsp[0].minor.yy0, SQLITE_SO_ASC, yymsp[-7].minor.yy46);
+}
+#line 2937 "parse.c"
+        break;
+      case 235: /* uniqueflag ::= UNIQUE */
+      case 282: /* raisetype ::= ABORT */
+#line 881 "parse.y"
+{yygotominor.yy46 = OE_Abort;}
+#line 2943 "parse.c"
+        break;
+      case 236: /* uniqueflag ::= */
+#line 882 "parse.y"
+{yygotominor.yy46 = OE_None;}
+#line 2948 "parse.c"
+        break;
+      case 239: /* idxlist ::= idxlist COMMA idxitem collate sortorder */
+#line 892 "parse.y"
+{
+  Expr *p = 0;
+  if( yymsp[-1].minor.yy410.n>0 ){
+    p = sqlite3PExpr(pParse, TK_COLUMN, 0, 0, 0);
+    sqlite3ExprSetColl(pParse, p, &yymsp[-1].minor.yy410);
+  }
+  yygotominor.yy174 = sqlite3ExprListAppend(pParse,yymsp[-4].minor.yy174, p, &yymsp[-2].minor.yy410);
+  sqlite3ExprListCheckLength(pParse, yygotominor.yy174, SQLITE_MAX_COLUMN, "index");
+  if( yygotominor.yy174 ) yygotominor.yy174->a[yygotominor.yy174->nExpr-1].sortOrder = yymsp[0].minor.yy46;
+}
+#line 2962 "parse.c"
+        break;
+      case 240: /* idxlist ::= idxitem collate sortorder */
+#line 902 "parse.y"
+{
+  Expr *p = 0;
+  if( yymsp[-1].minor.yy410.n>0 ){
+    p = sqlite3PExpr(pParse, TK_COLUMN, 0, 0, 0);
+    sqlite3ExprSetColl(pParse, p, &yymsp[-1].minor.yy410);
+  }
+  yygotominor.yy174 = sqlite3ExprListAppend(pParse,0, p, &yymsp[-2].minor.yy410);
+  sqlite3ExprListCheckLength(pParse, yygotominor.yy174, SQLITE_MAX_COLUMN, "index");
+  if( yygotominor.yy174 ) yygotominor.yy174->a[yygotominor.yy174->nExpr-1].sortOrder = yymsp[0].minor.yy46;
+}
+#line 2976 "parse.c"
+        break;
+      case 242: /* collate ::= */
+#line 915 "parse.y"
+{yygotominor.yy410.z = 0; yygotominor.yy410.n = 0;}
+#line 2981 "parse.c"
+        break;
+      case 244: /* cmd ::= DROP INDEX ifexists fullname */
+#line 921 "parse.y"
+{sqlite3DropIndex(pParse, yymsp[0].minor.yy373, yymsp[-1].minor.yy46);}
+#line 2986 "parse.c"
+        break;
+      case 245: /* cmd ::= VACUUM */
+      case 246: /* cmd ::= VACUUM nm */
+#line 927 "parse.y"
+{sqlite3Vacuum(pParse);}
+#line 2992 "parse.c"
+        break;
+      case 247: /* cmd ::= PRAGMA nm dbnm EQ nmnum */
+#line 935 "parse.y"
+{sqlite3Pragma(pParse,&yymsp[-3].minor.yy410,&yymsp[-2].minor.yy410,&yymsp[0].minor.yy410,0);}
+#line 2997 "parse.c"
+        break;
+      case 248: /* cmd ::= PRAGMA nm dbnm EQ ON */
+#line 936 "parse.y"
+{sqlite3Pragma(pParse,&yymsp[-3].minor.yy410,&yymsp[-2].minor.yy410,&yymsp[0].minor.yy0,0);}
+#line 3002 "parse.c"
+        break;
+      case 249: /* cmd ::= PRAGMA nm dbnm EQ minus_num */
+#line 937 "parse.y"
+{
+  sqlite3Pragma(pParse,&yymsp[-3].minor.yy410,&yymsp[-2].minor.yy410,&yymsp[0].minor.yy410,1);
+}
+#line 3009 "parse.c"
+        break;
+      case 250: /* cmd ::= PRAGMA nm dbnm LP nmnum RP */
+#line 940 "parse.y"
+{sqlite3Pragma(pParse,&yymsp[-4].minor.yy410,&yymsp[-3].minor.yy410,&yymsp[-1].minor.yy410,0);}
+#line 3014 "parse.c"
+        break;
+      case 251: /* cmd ::= PRAGMA nm dbnm */
+#line 941 "parse.y"
+{sqlite3Pragma(pParse,&yymsp[-1].minor.yy410,&yymsp[0].minor.yy410,0,0);}
+#line 3019 "parse.c"
+        break;
+      case 259: /* cmd ::= CREATE trigger_decl BEGIN trigger_cmd_list END */
+#line 955 "parse.y"
+{
+  Token all;
+  all.z = yymsp[-3].minor.yy410.z;
+  all.n = (yymsp[0].minor.yy0.z - yymsp[-3].minor.yy410.z) + yymsp[0].minor.yy0.n;
+  sqlite3FinishTrigger(pParse, yymsp[-1].minor.yy243, &all);
+}
+#line 3029 "parse.c"
+        break;
+      case 260: /* trigger_decl ::= temp TRIGGER ifnotexists nm dbnm trigger_time trigger_event ON fullname foreach_clause when_clause */
+#line 964 "parse.y"
+{
+  sqlite3BeginTrigger(pParse, &yymsp[-7].minor.yy410, &yymsp[-6].minor.yy410, yymsp[-5].minor.yy46, yymsp[-4].minor.yy370.a, yymsp[-4].minor.yy370.b, yymsp[-2].minor.yy373, yymsp[0].minor.yy172, yymsp[-10].minor.yy46, yymsp[-8].minor.yy46);
+  yygotominor.yy410 = (yymsp[-6].minor.yy410.n==0?yymsp[-7].minor.yy410:yymsp[-6].minor.yy410);
+}
+#line 3037 "parse.c"
+        break;
+      case 261: /* trigger_time ::= BEFORE */
+      case 264: /* trigger_time ::= */
+#line 970 "parse.y"
+{ yygotominor.yy46 = TK_BEFORE; }
+#line 3043 "parse.c"
+        break;
+      case 262: /* trigger_time ::= AFTER */
+#line 971 "parse.y"
+{ yygotominor.yy46 = TK_AFTER;  }
+#line 3048 "parse.c"
+        break;
+      case 263: /* trigger_time ::= INSTEAD OF */
+#line 972 "parse.y"
+{ yygotominor.yy46 = TK_INSTEAD;}
+#line 3053 "parse.c"
+        break;
+      case 265: /* trigger_event ::= DELETE|INSERT */
+      case 266: /* trigger_event ::= UPDATE */
+#line 977 "parse.y"
+{yygotominor.yy370.a = yymsp[0].major; yygotominor.yy370.b = 0;}
+#line 3059 "parse.c"
+        break;
+      case 267: /* trigger_event ::= UPDATE OF inscollist */
+#line 979 "parse.y"
+{yygotominor.yy370.a = TK_UPDATE; yygotominor.yy370.b = yymsp[0].minor.yy432;}
+#line 3064 "parse.c"
+        break;
+      case 270: /* when_clause ::= */
+      case 287: /* key_opt ::= */
+#line 986 "parse.y"
+{ yygotominor.yy172 = 0; }
+#line 3070 "parse.c"
+        break;
+      case 271: /* when_clause ::= WHEN expr */
+      case 288: /* key_opt ::= KEY expr */
+#line 987 "parse.y"
+{ yygotominor.yy172 = yymsp[0].minor.yy172; }
+#line 3076 "parse.c"
+        break;
+      case 272: /* trigger_cmd_list ::= trigger_cmd_list trigger_cmd SEMI */
+#line 991 "parse.y"
+{
+  if( yymsp[-2].minor.yy243 ){
+    yymsp[-2].minor.yy243->pLast->pNext = yymsp[-1].minor.yy243;
+  }else{
+    yymsp[-2].minor.yy243 = yymsp[-1].minor.yy243;
+  }
+  yymsp[-2].minor.yy243->pLast = yymsp[-1].minor.yy243;
+  yygotominor.yy243 = yymsp[-2].minor.yy243;
+}
+#line 3089 "parse.c"
+        break;
+      case 273: /* trigger_cmd_list ::= */
+#line 1000 "parse.y"
+{ yygotominor.yy243 = 0; }
+#line 3094 "parse.c"
+        break;
+      case 274: /* trigger_cmd ::= UPDATE orconf nm SET setlist where_opt */
+#line 1006 "parse.y"
+{ yygotominor.yy243 = sqlite3TriggerUpdateStep(pParse->db, &yymsp[-3].minor.yy410, yymsp[-1].minor.yy174, yymsp[0].minor.yy172, yymsp[-4].minor.yy46); }
+#line 3099 "parse.c"
+        break;
+      case 275: /* trigger_cmd ::= insert_cmd INTO nm inscollist_opt VALUES LP itemlist RP */
+#line 1011 "parse.y"
+{yygotominor.yy243 = sqlite3TriggerInsertStep(pParse->db, &yymsp[-5].minor.yy410, yymsp[-4].minor.yy432, yymsp[-1].minor.yy174, 0, yymsp[-7].minor.yy46);}
+#line 3104 "parse.c"
+        break;
+      case 276: /* trigger_cmd ::= insert_cmd INTO nm inscollist_opt select */
+#line 1014 "parse.y"
+{yygotominor.yy243 = sqlite3TriggerInsertStep(pParse->db, &yymsp[-2].minor.yy410, yymsp[-1].minor.yy432, 0, yymsp[0].minor.yy219, yymsp[-4].minor.yy46);}
+#line 3109 "parse.c"
+        break;
+      case 277: /* trigger_cmd ::= DELETE FROM nm where_opt */
+#line 1018 "parse.y"
+{yygotominor.yy243 = sqlite3TriggerDeleteStep(pParse->db, &yymsp[-1].minor.yy410, yymsp[0].minor.yy172);}
+#line 3114 "parse.c"
+        break;
+      case 278: /* trigger_cmd ::= select */
+#line 1021 "parse.y"
+{yygotominor.yy243 = sqlite3TriggerSelectStep(pParse->db, yymsp[0].minor.yy219); }
+#line 3119 "parse.c"
+        break;
+      case 279: /* expr ::= RAISE LP IGNORE RP */
+#line 1024 "parse.y"
+{
+  yygotominor.yy172 = sqlite3PExpr(pParse, TK_RAISE, 0, 0, 0);
+  if( yygotominor.yy172 ){
+    yygotominor.yy172->iColumn = OE_Ignore;
+    sqlite3ExprSpan(yygotominor.yy172, &yymsp[-3].minor.yy0, &yymsp[0].minor.yy0);
+  }
+}
+#line 3130 "parse.c"
+        break;
+      case 280: /* expr ::= RAISE LP raisetype COMMA nm RP */
+#line 1031 "parse.y"
+{
+  yygotominor.yy172 = sqlite3PExpr(pParse, TK_RAISE, 0, 0, &yymsp[-1].minor.yy410);
+  if( yygotominor.yy172 ) {
+    yygotominor.yy172->iColumn = yymsp[-3].minor.yy46;
+    sqlite3ExprSpan(yygotominor.yy172, &yymsp[-5].minor.yy0, &yymsp[0].minor.yy0);
+  }
+}
+#line 3141 "parse.c"
+        break;
+      case 281: /* raisetype ::= ROLLBACK */
+#line 1041 "parse.y"
+{yygotominor.yy46 = OE_Rollback;}
+#line 3146 "parse.c"
+        break;
+      case 283: /* raisetype ::= FAIL */
+#line 1043 "parse.y"
+{yygotominor.yy46 = OE_Fail;}
+#line 3151 "parse.c"
+        break;
+      case 284: /* cmd ::= DROP TRIGGER ifexists fullname */
+#line 1048 "parse.y"
+{
+  sqlite3DropTrigger(pParse,yymsp[0].minor.yy373,yymsp[-1].minor.yy46);
+}
+#line 3158 "parse.c"
+        break;
+      case 285: /* cmd ::= ATTACH database_kw_opt expr AS expr key_opt */
+#line 1055 "parse.y"
+{
+  sqlite3Attach(pParse, yymsp[-3].minor.yy172, yymsp[-1].minor.yy172, yymsp[0].minor.yy172);
+}
+#line 3165 "parse.c"
+        break;
+      case 286: /* cmd ::= DETACH database_kw_opt expr */
+#line 1058 "parse.y"
+{
+  sqlite3Detach(pParse, yymsp[0].minor.yy172);
+}
+#line 3172 "parse.c"
+        break;
+      case 291: /* cmd ::= REINDEX */
+#line 1073 "parse.y"
+{sqlite3Reindex(pParse, 0, 0);}
+#line 3177 "parse.c"
+        break;
+      case 292: /* cmd ::= REINDEX nm dbnm */
+#line 1074 "parse.y"
+{sqlite3Reindex(pParse, &yymsp[-1].minor.yy410, &yymsp[0].minor.yy410);}
+#line 3182 "parse.c"
+        break;
+      case 293: /* cmd ::= ANALYZE */
+#line 1079 "parse.y"
+{sqlite3Analyze(pParse, 0, 0);}
+#line 3187 "parse.c"
+        break;
+      case 294: /* cmd ::= ANALYZE nm dbnm */
+#line 1080 "parse.y"
+{sqlite3Analyze(pParse, &yymsp[-1].minor.yy410, &yymsp[0].minor.yy410);}
+#line 3192 "parse.c"
+        break;
+      case 295: /* cmd ::= ALTER TABLE fullname RENAME TO nm */
+#line 1085 "parse.y"
+{
+  sqlite3AlterRenameTable(pParse,yymsp[-3].minor.yy373,&yymsp[0].minor.yy410);
+}
+#line 3199 "parse.c"
+        break;
+      case 296: /* cmd ::= ALTER TABLE add_column_fullname ADD kwcolumn_opt column */
+#line 1088 "parse.y"
+{
+  sqlite3AlterFinishAddColumn(pParse, &yymsp[0].minor.yy410);
+}
+#line 3206 "parse.c"
+        break;
+      case 297: /* add_column_fullname ::= fullname */
+#line 1091 "parse.y"
+{
+  sqlite3AlterBeginAddColumn(pParse, yymsp[0].minor.yy373);
+}
+#line 3213 "parse.c"
+        break;
+      case 300: /* cmd ::= create_vtab */
+#line 1100 "parse.y"
+{sqlite3VtabFinishParse(pParse,0);}
+#line 3218 "parse.c"
+        break;
+      case 301: /* cmd ::= create_vtab LP vtabarglist RP */
+#line 1101 "parse.y"
+{sqlite3VtabFinishParse(pParse,&yymsp[0].minor.yy0);}
+#line 3223 "parse.c"
+        break;
+      case 302: /* create_vtab ::= CREATE VIRTUAL TABLE nm dbnm USING nm */
+#line 1102 "parse.y"
+{
+    sqlite3VtabBeginParse(pParse, &yymsp[-3].minor.yy410, &yymsp[-2].minor.yy410, &yymsp[0].minor.yy410);
+}
+#line 3230 "parse.c"
+        break;
+      case 305: /* vtabarg ::= */
+#line 1107 "parse.y"
+{sqlite3VtabArgInit(pParse);}
+#line 3235 "parse.c"
+        break;
+      case 307: /* vtabargtoken ::= ANY */
+      case 308: /* vtabargtoken ::= lp anylist RP */
+      case 309: /* lp ::= LP */
+      case 311: /* anylist ::= anylist ANY */
+#line 1109 "parse.y"
+{sqlite3VtabArgExtend(pParse,&yymsp[0].minor.yy0);}
+#line 3243 "parse.c"
+        break;
+  };
+  yygoto = yyRuleInfo[yyruleno].lhs;
+  yysize = yyRuleInfo[yyruleno].nrhs;
+  yypParser->yyidx -= yysize;
+  yyact = yy_find_reduce_action(yymsp[-yysize].stateno,yygoto);
+  if( yyact < YYNSTATE ){
+#ifdef NDEBUG
+    /* If we are not debugging and the reduce action popped at least
+    ** one element off the stack, then we can push the new element back
+    ** onto the stack here, and skip the stack overflow test in yy_shift().
+    ** That gives a significant speed improvement. */
+    if( yysize ){
+      yypParser->yyidx++;
+      yymsp -= yysize-1;
+      yymsp->stateno = yyact;
+      yymsp->major = yygoto;
+      yymsp->minor = yygotominor;
+    }else
+#endif
+    {
+      yy_shift(yypParser,yyact,yygoto,&yygotominor);
+    }
+  }else{
+    assert( yyact == YYNSTATE + YYNRULE + 1 );
+    yy_accept(yypParser);
+  }
+}
+
+/*
+** The following code executes when the parse fails
+*/
+static void yy_parse_failed(
+  yyParser *yypParser           /* The parser */
+){
+  sqlite3ParserARG_FETCH;
+#ifndef NDEBUG
+  if( yyTraceFILE ){
+    fprintf(yyTraceFILE,"%sFail!\n",yyTracePrompt);
+  }
+#endif
+  while( yypParser->yyidx>=0 ) yy_pop_parser_stack(yypParser);
+  /* Here code is inserted which will be executed whenever the
+  ** parser fails */
+  sqlite3ParserARG_STORE; /* Suppress warning about unused %extra_argument variable */
+}
+
+/*
+** The following code executes when a syntax error first occurs.
+*/
+static void yy_syntax_error(
+  yyParser *yypParser,           /* The parser */
+  int yymajor,                   /* The major type of the error token */
+  YYMINORTYPE yyminor            /* The minor type of the error token */
+){
+  sqlite3ParserARG_FETCH;
+#define TOKEN (yyminor.yy0)
+#line 34 "parse.y"
+
+  assert( TOKEN.z[0] );  /* The tokenizer always gives us a token */
+  sqlite3ErrorMsg(pParse, "near \"%T\": syntax error", &TOKEN);
+  pParse->parseError = 1;
+#line 3307 "parse.c"
+  sqlite3ParserARG_STORE; /* Suppress warning about unused %extra_argument variable */
+}
+
+/*
+** The following is executed when the parser accepts
+*/
+static void yy_accept(
+  yyParser *yypParser           /* The parser */
+){
+  sqlite3ParserARG_FETCH;
+#ifndef NDEBUG
+  if( yyTraceFILE ){
+    fprintf(yyTraceFILE,"%sAccept!\n",yyTracePrompt);
+  }
+#endif
+  while( yypParser->yyidx>=0 ) yy_pop_parser_stack(yypParser);
+  /* Here code is inserted which will be executed whenever the
+  ** parser accepts */
+  sqlite3ParserARG_STORE; /* Suppress warning about unused %extra_argument variable */
+}
+
+/* The main parser program.
+** The first argument is a pointer to a structure obtained from
+** "sqlite3ParserAlloc" which describes the current state of the parser.
+** The second argument is the major token number.  The third is
+** the minor token.  The fourth optional argument is whatever the
+** user wants (and specified in the grammar) and is available for
+** use by the action routines.
+**
+** Inputs:
+** <ul>
+** <li> A pointer to the parser (an opaque structure.)
+** <li> The major token number.
+** <li> The minor token number.
+** <li> An option argument of a grammar-specified type.
+** </ul>
+**
+** Outputs:
+** None.
+*/
+void sqlite3Parser(
+  void *yyp,                   /* The parser */
+  int yymajor,                 /* The major token code number */
+  sqlite3ParserTOKENTYPE yyminor       /* The value for the token */
+  sqlite3ParserARG_PDECL               /* Optional %extra_argument parameter */
+){
+  YYMINORTYPE yyminorunion;
+  int yyact;            /* The parser action. */
+  int yyendofinput;     /* True if we are at the end of input */
+#ifdef YYERRORSYMBOL
+  int yyerrorhit = 0;   /* True if yymajor has invoked an error */
+#endif
+  yyParser *yypParser;  /* The parser */
+
+  /* (re)initialize the parser, if necessary */
+  yypParser = (yyParser*)yyp;
+  if( yypParser->yyidx<0 ){
+#if YYSTACKDEPTH<=0
+    if( yypParser->yystksz <=0 ){
+      memset(&yyminorunion, 0, sizeof(yyminorunion));
+      yyStackOverflow(yypParser, &yyminorunion);
+      return;
+    }
+#endif
+    yypParser->yyidx = 0;
+    yypParser->yyerrcnt = -1;
+    yypParser->yystack[0].stateno = 0;
+    yypParser->yystack[0].major = 0;
+  }
+  yyminorunion.yy0 = yyminor;
+  yyendofinput = (yymajor==0);
+  sqlite3ParserARG_STORE;
+
+#ifndef NDEBUG
+  if( yyTraceFILE ){
+    fprintf(yyTraceFILE,"%sInput %s\n",yyTracePrompt,yyTokenName[yymajor]);
+  }
+#endif
+
+  do{
+    yyact = yy_find_shift_action(yypParser,yymajor);
+    if( yyact<YYNSTATE ){
+      assert( !yyendofinput );  /* Impossible to shift the $ token */
+      yy_shift(yypParser,yyact,yymajor,&yyminorunion);
+      yypParser->yyerrcnt--;
+      yymajor = YYNOCODE;
+    }else if( yyact < YYNSTATE + YYNRULE ){
+      yy_reduce(yypParser,yyact-YYNSTATE);
+    }else{
+      assert( yyact == YY_ERROR_ACTION );
+#ifdef YYERRORSYMBOL
+      int yymx;
+#endif
+#ifndef NDEBUG
+      if( yyTraceFILE ){
+        fprintf(yyTraceFILE,"%sSyntax Error!\n",yyTracePrompt);
+      }
+#endif
+#ifdef YYERRORSYMBOL
+      /* A syntax error has occurred.
+      ** The response to an error depends upon whether or not the
+      ** grammar defines an error token "ERROR".
+      **
+      ** This is what we do if the grammar does define ERROR:
+      **
+      **  * Call the %syntax_error function.
+      **
+      **  * Begin popping the stack until we enter a state where
+      **    it is legal to shift the error symbol, then shift
+      **    the error symbol.
+      **
+      **  * Set the error count to three.
+      **
+      **  * Begin accepting and shifting new tokens.  No new error
+      **    processing will occur until three tokens have been
+      **    shifted successfully.
+      **
+      */
+      if( yypParser->yyerrcnt<0 ){
+        yy_syntax_error(yypParser,yymajor,yyminorunion);
+      }
+      yymx = yypParser->yystack[yypParser->yyidx].major;
+      if( yymx==YYERRORSYMBOL || yyerrorhit ){
+#ifndef NDEBUG
+        if( yyTraceFILE ){
+          fprintf(yyTraceFILE,"%sDiscard input token %s\n",
+             yyTracePrompt,yyTokenName[yymajor]);
+        }
+#endif
+        yy_destructor(yymajor,&yyminorunion);
+        yymajor = YYNOCODE;
+      }else{
+         while(
+          yypParser->yyidx >= 0 &&
+          yymx != YYERRORSYMBOL &&
+          (yyact = yy_find_reduce_action(
+                        yypParser->yystack[yypParser->yyidx].stateno,
+                        YYERRORSYMBOL)) >= YYNSTATE
+        ){
+          yy_pop_parser_stack(yypParser);
+        }
+        if( yypParser->yyidx < 0 || yymajor==0 ){
+          yy_destructor(yymajor,&yyminorunion);
+          yy_parse_failed(yypParser);
+          yymajor = YYNOCODE;
+        }else if( yymx!=YYERRORSYMBOL ){
+          YYMINORTYPE u2;
+          u2.YYERRSYMDT = 0;
+          yy_shift(yypParser,yyact,YYERRORSYMBOL,&u2);
+        }
+      }
+      yypParser->yyerrcnt = 3;
+      yyerrorhit = 1;
+#else  /* YYERRORSYMBOL is not defined */
+      /* This is what we do if the grammar does not define ERROR:
+      **
+      **  * Report an error message, and throw away the input token.
+      **
+      **  * If the input token is $, then fail the parse.
+      **
+      ** As before, subsequent error messages are suppressed until
+      ** three input tokens have been successfully shifted.
+      */
+      if( yypParser->yyerrcnt<=0 ){
+        yy_syntax_error(yypParser,yymajor,yyminorunion);
+      }
+      yypParser->yyerrcnt = 3;
+      yy_destructor(yymajor,&yyminorunion);
+      if( yyendofinput ){
+        yy_parse_failed(yypParser);
+      }
+      yymajor = YYNOCODE;
+#endif
+    }
+  }while( yymajor!=YYNOCODE && yypParser->yyidx>=0 );
+  return;
+}
diff --git a/uppsrc/plugin/sqlite3/lib/parse.h b/uppsrc/plugin/sqlite3/lib/parse.h
new file mode 100644
index 000000000..ed848ec5c
--- /dev/null
+++ b/uppsrc/plugin/sqlite3/lib/parse.h
@@ -0,0 +1,152 @@
+#define TK_SEMI                            1
+#define TK_EXPLAIN                         2
+#define TK_QUERY                           3
+#define TK_PLAN                            4
+#define TK_BEGIN                           5
+#define TK_TRANSACTION                     6
+#define TK_DEFERRED                        7
+#define TK_IMMEDIATE                       8
+#define TK_EXCLUSIVE                       9
+#define TK_COMMIT                         10
+#define TK_END                            11
+#define TK_ROLLBACK                       12
+#define TK_CREATE                         13
+#define TK_TABLE                          14
+#define TK_IF                             15
+#define TK_NOT                            16
+#define TK_EXISTS                         17
+#define TK_TEMP                           18
+#define TK_LP                             19
+#define TK_RP                             20
+#define TK_AS                             21
+#define TK_COMMA                          22
+#define TK_ID                             23
+#define TK_ABORT                          24
+#define TK_AFTER                          25
+#define TK_ANALYZE                        26
+#define TK_ASC                            27
+#define TK_ATTACH                         28
+#define TK_BEFORE                         29
+#define TK_CASCADE                        30
+#define TK_CAST                           31
+#define TK_CONFLICT                       32
+#define TK_DATABASE                       33
+#define TK_DESC                           34
+#define TK_DETACH                         35
+#define TK_EACH                           36
+#define TK_FAIL                           37
+#define TK_FOR                            38
+#define TK_IGNORE                         39
+#define TK_INITIALLY                      40
+#define TK_INSTEAD                        41
+#define TK_LIKE_KW                        42
+#define TK_MATCH                          43
+#define TK_KEY                            44
+#define TK_OF                             45
+#define TK_OFFSET                         46
+#define TK_PRAGMA                         47
+#define TK_RAISE                          48
+#define TK_REPLACE                        49
+#define TK_RESTRICT                       50
+#define TK_ROW                            51
+#define TK_TRIGGER                        52
+#define TK_VACUUM                         53
+#define TK_VIEW                           54
+#define TK_VIRTUAL                        55
+#define TK_REINDEX                        56
+#define TK_RENAME                         57
+#define TK_CTIME_KW                       58
+#define TK_ANY                            59
+#define TK_OR                             60
+#define TK_AND                            61
+#define TK_IS                             62
+#define TK_BETWEEN                        63
+#define TK_IN                             64
+#define TK_ISNULL                         65
+#define TK_NOTNULL                        66
+#define TK_NE                             67
+#define TK_EQ                             68
+#define TK_GT                             69
+#define TK_LE                             70
+#define TK_LT                             71
+#define TK_GE                             72
+#define TK_ESCAPE                         73
+#define TK_BITAND                         74
+#define TK_BITOR                          75
+#define TK_LSHIFT                         76
+#define TK_RSHIFT                         77
+#define TK_PLUS                           78
+#define TK_MINUS                          79
+#define TK_STAR                           80
+#define TK_SLASH                          81
+#define TK_REM                            82
+#define TK_CONCAT                         83
+#define TK_COLLATE                        84
+#define TK_UMINUS                         85
+#define TK_UPLUS                          86
+#define TK_BITNOT                         87
+#define TK_STRING                         88
+#define TK_JOIN_KW                        89
+#define TK_CONSTRAINT                     90
+#define TK_DEFAULT                        91
+#define TK_NULL                           92
+#define TK_PRIMARY                        93
+#define TK_UNIQUE                         94
+#define TK_CHECK                          95
+#define TK_REFERENCES                     96
+#define TK_AUTOINCR                       97
+#define TK_ON                             98
+#define TK_DELETE                         99
+#define TK_UPDATE                         100
+#define TK_INSERT                         101
+#define TK_SET                            102
+#define TK_DEFERRABLE                     103
+#define TK_FOREIGN                        104
+#define TK_DROP                           105
+#define TK_UNION                          106
+#define TK_ALL                            107
+#define TK_EXCEPT                         108
+#define TK_INTERSECT                      109
+#define TK_SELECT                         110
+#define TK_DISTINCT                       111
+#define TK_DOT                            112
+#define TK_FROM                           113
+#define TK_JOIN                           114
+#define TK_USING                          115
+#define TK_ORDER                          116
+#define TK_BY                             117
+#define TK_GROUP                          118
+#define TK_HAVING                         119
+#define TK_LIMIT                          120
+#define TK_WHERE                          121
+#define TK_INTO                           122
+#define TK_VALUES                         123
+#define TK_INTEGER                        124
+#define TK_FLOAT                          125
+#define TK_BLOB                           126
+#define TK_REGISTER                       127
+#define TK_VARIABLE                       128
+#define TK_CASE                           129
+#define TK_WHEN                           130
+#define TK_THEN                           131
+#define TK_ELSE                           132
+#define TK_INDEX                          133
+#define TK_ALTER                          134
+#define TK_TO                             135
+#define TK_ADD                            136
+#define TK_COLUMNKW                       137
+#define TK_TO_TEXT                        138
+#define TK_TO_BLOB                        139
+#define TK_TO_NUMERIC                     140
+#define TK_TO_INT                         141
+#define TK_TO_REAL                        142
+#define TK_END_OF_FILE                    143
+#define TK_ILLEGAL                        144
+#define TK_SPACE                          145
+#define TK_UNCLOSED_STRING                146
+#define TK_COMMENT                        147
+#define TK_FUNCTION                       148
+#define TK_COLUMN                         149
+#define TK_AGG_FUNCTION                   150
+#define TK_AGG_COLUMN                     151
+#define TK_CONST_FUNC                     152
diff --git a/uppsrc/plugin/sqlite3/lib/pragma.c b/uppsrc/plugin/sqlite3/lib/pragma.c
new file mode 100644
index 000000000..d76d3592c
--- /dev/null
+++ b/uppsrc/plugin/sqlite3/lib/pragma.c
@@ -0,0 +1,1228 @@
+/*
+** 2003 April 6
+**
+** The author disclaims copyright to this source code.  In place of
+** a legal notice, here is a blessing:
+**
+**    May you do good and not evil.
+**    May you find forgiveness for yourself and forgive others.
+**    May you share freely, never taking more than you give.
+**
+*************************************************************************
+** This file contains code used to implement the PRAGMA command.
+**
+** $Id: pragma.c,v 1.170 2008/02/13 18:25:27 danielk1977 Exp $
+*/
+#include "sqliteInt.h"
+#include <ctype.h>
+
+/* Ignore this whole file if pragmas are disabled
+*/
+#if !defined(SQLITE_OMIT_PRAGMA) && !defined(SQLITE_OMIT_PARSER)
+
+/*
+** Interpret the given string as a safety level.  Return 0 for OFF,
+** 1 for ON or NORMAL and 2 for FULL.  Return 1 for an empty or
+** unrecognized string argument.
+**
+** Note that the values returned are one less that the values that
+** should be passed into sqlite3BtreeSetSafetyLevel().  The is done
+** to support legacy SQL code.  The safety level used to be boolean
+** and older scripts may have used numbers 0 for OFF and 1 for ON.
+*/
+static int getSafetyLevel(const char *z){
+                             /* 123456789 123456789 */
+  static const char zText[] = "onoffalseyestruefull";
+  static const u8 iOffset[] = {0, 1, 2, 4, 9, 12, 16};
+  static const u8 iLength[] = {2, 2, 3, 5, 3, 4, 4};
+  static const u8 iValue[] =  {1, 0, 0, 0, 1, 1, 2};
+  int i, n;
+  if( isdigit(*z) ){
+    return atoi(z);
+  }
+  n = strlen(z);
+  for(i=0; i<sizeof(iLength); i++){
+    if( iLength[i]==n && sqlite3StrNICmp(&zText[iOffset[i]],z,n)==0 ){
+      return iValue[i];
+    }
+  }
+  return 1;
+}
+
+/*
+** Interpret the given string as a boolean value.
+*/
+static int getBoolean(const char *z){
+  return getSafetyLevel(z)&1;
+}
+
+/*
+** Interpret the given string as a locking mode value.
+*/
+static int getLockingMode(const char *z){
+  if( z ){
+    if( 0==sqlite3StrICmp(z, "exclusive") ) return PAGER_LOCKINGMODE_EXCLUSIVE;
+    if( 0==sqlite3StrICmp(z, "normal") ) return PAGER_LOCKINGMODE_NORMAL;
+  }
+  return PAGER_LOCKINGMODE_QUERY;
+}
+
+#ifndef SQLITE_OMIT_AUTOVACUUM
+/*
+** Interpret the given string as an auto-vacuum mode value.
+**
+** The following strings, "none", "full" and "incremental" are
+** acceptable, as are their numeric equivalents: 0, 1 and 2 respectively.
+*/
+static int getAutoVacuum(const char *z){
+  int i;
+  if( 0==sqlite3StrICmp(z, "none") ) return BTREE_AUTOVACUUM_NONE;
+  if( 0==sqlite3StrICmp(z, "full") ) return BTREE_AUTOVACUUM_FULL;
+  if( 0==sqlite3StrICmp(z, "incremental") ) return BTREE_AUTOVACUUM_INCR;
+  i = atoi(z);
+  return ((i>=0&&i<=2)?i:0);
+}
+#endif /* ifndef SQLITE_OMIT_AUTOVACUUM */
+
+#ifndef SQLITE_OMIT_PAGER_PRAGMAS
+/*
+** Interpret the given string as a temp db location. Return 1 for file
+** backed temporary databases, 2 for the Red-Black tree in memory database
+** and 0 to use the compile-time default.
+*/
+static int getTempStore(const char *z){
+  if( z[0]>='0' && z[0]<='2' ){
+    return z[0] - '0';
+  }else if( sqlite3StrICmp(z, "file")==0 ){
+    return 1;
+  }else if( sqlite3StrICmp(z, "memory")==0 ){
+    return 2;
+  }else{
+    return 0;
+  }
+}
+#endif /* SQLITE_PAGER_PRAGMAS */
+
+#ifndef SQLITE_OMIT_PAGER_PRAGMAS
+/*
+** Invalidate temp storage, either when the temp storage is changed
+** from default, or when 'file' and the temp_store_directory has changed
+*/
+static int invalidateTempStorage(Parse *pParse){
+  sqlite3 *db = pParse->db;
+  if( db->aDb[1].pBt!=0 ){
+    if( !db->autoCommit ){
+      sqlite3ErrorMsg(pParse, "temporary storage cannot be changed "
+        "from within a transaction");
+      return SQLITE_ERROR;
+    }
+    sqlite3BtreeClose(db->aDb[1].pBt);
+    db->aDb[1].pBt = 0;
+    sqlite3ResetInternalSchema(db, 0);
+  }
+  return SQLITE_OK;
+}
+#endif /* SQLITE_PAGER_PRAGMAS */
+
+#ifndef SQLITE_OMIT_PAGER_PRAGMAS
+/*
+** If the TEMP database is open, close it and mark the database schema
+** as needing reloading.  This must be done when using the TEMP_STORE
+** or DEFAULT_TEMP_STORE pragmas.
+*/
+static int changeTempStorage(Parse *pParse, const char *zStorageType){
+  int ts = getTempStore(zStorageType);
+  sqlite3 *db = pParse->db;
+  if( db->temp_store==ts ) return SQLITE_OK;
+  if( invalidateTempStorage( pParse ) != SQLITE_OK ){
+    return SQLITE_ERROR;
+  }
+  db->temp_store = ts;
+  return SQLITE_OK;
+}
+#endif /* SQLITE_PAGER_PRAGMAS */
+
+/*
+** Generate code to return a single integer value.
+*/
+static void returnSingleInt(Parse *pParse, const char *zLabel, int value){
+  Vdbe *v = sqlite3GetVdbe(pParse);
+  int mem = ++pParse->nMem;
+  sqlite3VdbeAddOp2(v, OP_Integer, value, mem);
+  if( pParse->explain==0 ){
+    sqlite3VdbeSetNumCols(v, 1);
+    sqlite3VdbeSetColName(v, 0, COLNAME_NAME, zLabel, P4_STATIC);
+  }
+  sqlite3VdbeAddOp2(v, OP_ResultRow, mem, 1);
+}
+
+#ifndef SQLITE_OMIT_FLAG_PRAGMAS
+/*
+** Check to see if zRight and zLeft refer to a pragma that queries
+** or changes one of the flags in db->flags.  Return 1 if so and 0 if not.
+** Also, implement the pragma.
+*/
+static int flagPragma(Parse *pParse, const char *zLeft, const char *zRight){
+  static const struct sPragmaType {
+    const char *zName;  /* Name of the pragma */
+    int mask;           /* Mask for the db->flags value */
+  } aPragma[] = {
+    { "full_column_names",        SQLITE_FullColNames  },
+    { "short_column_names",       SQLITE_ShortColNames },
+    { "count_changes",            SQLITE_CountRows     },
+    { "empty_result_callbacks",   SQLITE_NullCallback  },
+    { "legacy_file_format",       SQLITE_LegacyFileFmt },
+    { "fullfsync",                SQLITE_FullFSync     },
+#ifdef SQLITE_DEBUG
+    { "sql_trace",                SQLITE_SqlTrace      },
+    { "vdbe_listing",             SQLITE_VdbeListing   },
+    { "vdbe_trace",               SQLITE_VdbeTrace     },
+#endif
+#ifndef SQLITE_OMIT_CHECK
+    { "ignore_check_constraints", SQLITE_IgnoreChecks  },
+#endif
+    /* The following is VERY experimental */
+    { "writable_schema",          SQLITE_WriteSchema|SQLITE_RecoveryMode },
+    { "omit_readlock",            SQLITE_NoReadlock    },
+
+    /* TODO: Maybe it shouldn't be possible to change the ReadUncommitted
+    ** flag if there are any active statements. */
+    { "read_uncommitted",         SQLITE_ReadUncommitted },
+  };
+  int i;
+  const struct sPragmaType *p;
+  for(i=0, p=aPragma; i<sizeof(aPragma)/sizeof(aPragma[0]); i++, p++){
+    if( sqlite3StrICmp(zLeft, p->zName)==0 ){
+      sqlite3 *db = pParse->db;
+      Vdbe *v;
+      v = sqlite3GetVdbe(pParse);
+      if( v ){
+        if( zRight==0 ){
+          returnSingleInt(pParse, p->zName, (db->flags & p->mask)!=0 );
+        }else{
+          if( getBoolean(zRight) ){
+            db->flags |= p->mask;
+          }else{
+            db->flags &= ~p->mask;
+          }
+
+          /* Many of the flag-pragmas modify the code generated by the SQL
+          ** compiler (eg. count_changes). So add an opcode to expire all
+          ** compiled SQL statements after modifying a pragma value.
+          */
+          sqlite3VdbeAddOp2(v, OP_Expire, 0, 0);
+        }
+      }
+
+      return 1;
+    }
+  }
+  return 0;
+}
+#endif /* SQLITE_OMIT_FLAG_PRAGMAS */
+
+/*
+** Process a pragma statement.
+**
+** Pragmas are of this form:
+**
+**      PRAGMA [database.]id [= value]
+**
+** The identifier might also be a string.  The value is a string, and
+** identifier, or a number.  If minusFlag is true, then the value is
+** a number that was preceded by a minus sign.
+**
+** If the left side is "database.id" then pId1 is the database name
+** and pId2 is the id.  If the left side is just "id" then pId1 is the
+** id and pId2 is any empty string.
+*/
+void sqlite3Pragma(
+  Parse *pParse,
+  Token *pId1,        /* First part of [database.]id field */
+  Token *pId2,        /* Second part of [database.]id field, or NULL */
+  Token *pValue,      /* Token for <value>, or NULL */
+  int minusFlag       /* True if a '-' sign preceded <value> */
+){
+  char *zLeft = 0;       /* Nul-terminated UTF-8 string <id> */
+  char *zRight = 0;      /* Nul-terminated UTF-8 string <value>, or NULL */
+  const char *zDb = 0;   /* The database name */
+  Token *pId;            /* Pointer to <id> token */
+  int iDb;               /* Database index for <database> */
+  sqlite3 *db = pParse->db;
+  Db *pDb;
+  Vdbe *v = pParse->pVdbe = sqlite3VdbeCreate(db);
+  if( v==0 ) return;
+  pParse->nMem = 2;
+
+  /* Interpret the [database.] part of the pragma statement. iDb is the
+  ** index of the database this pragma is being applied to in db.aDb[]. */
+  iDb = sqlite3TwoPartName(pParse, pId1, pId2, &pId);
+  if( iDb<0 ) return;
+  pDb = &db->aDb[iDb];
+
+  /* If the temp database has been explicitly named as part of the
+  ** pragma, make sure it is open.
+  */
+  if( iDb==1 && sqlite3OpenTempDatabase(pParse) ){
+    return;
+  }
+
+  zLeft = sqlite3NameFromToken(db, pId);
+  if( !zLeft ) return;
+  if( minusFlag ){
+    zRight = sqlite3MPrintf(db, "-%T", pValue);
+  }else{
+    zRight = sqlite3NameFromToken(db, pValue);
+  }
+
+  zDb = ((iDb>0)?pDb->zName:0);
+  if( sqlite3AuthCheck(pParse, SQLITE_PRAGMA, zLeft, zRight, zDb) ){
+    goto pragma_out;
+  }
+
+#ifndef SQLITE_OMIT_PAGER_PRAGMAS
+  /*
+  **  PRAGMA [database.]default_cache_size
+  **  PRAGMA [database.]default_cache_size=N
+  **
+  ** The first form reports the current persistent setting for the
+  ** page cache size.  The value returned is the maximum number of
+  ** pages in the page cache.  The second form sets both the current
+  ** page cache size value and the persistent page cache size value
+  ** stored in the database file.
+  **
+  ** The default cache size is stored in meta-value 2 of page 1 of the
+  ** database file.  The cache size is actually the absolute value of
+  ** this memory location.  The sign of meta-value 2 determines the
+  ** synchronous setting.  A negative value means synchronous is off
+  ** and a positive value means synchronous is on.
+  */
+  if( sqlite3StrICmp(zLeft,"default_cache_size")==0 ){
+    static const VdbeOpList getCacheSize[] = {
+      { OP_ReadCookie,  0, 1,        2},  /* 0 */
+      { OP_IfPos,       1, 6,        0},
+      { OP_Integer,     0, 2,        0},
+      { OP_Subtract,    1, 2,        1},
+      { OP_IfPos,       1, 6,        0},
+      { OP_Integer,     0, 1,        0},  /* 5 */
+      { OP_ResultRow,   1, 1,        0},
+    };
+    int addr;
+    if( sqlite3ReadSchema(pParse) ) goto pragma_out;
+    sqlite3VdbeUsesBtree(v, iDb);
+    if( !zRight ){
+      sqlite3VdbeSetNumCols(v, 1);
+      sqlite3VdbeSetColName(v, 0, COLNAME_NAME, "cache_size", P4_STATIC);
+      pParse->nMem += 2;
+      addr = sqlite3VdbeAddOpList(v, ArraySize(getCacheSize), getCacheSize);
+      sqlite3VdbeChangeP1(v, addr, iDb);
+      sqlite3VdbeChangeP1(v, addr+5, SQLITE_DEFAULT_CACHE_SIZE);
+    }else{
+      int size = atoi(zRight);
+      if( size<0 ) size = -size;
+      sqlite3BeginWriteOperation(pParse, 0, iDb);
+      sqlite3VdbeAddOp2(v, OP_Integer, size, 1);
+      sqlite3VdbeAddOp3(v, OP_ReadCookie, iDb, 2, 2);
+      addr = sqlite3VdbeAddOp2(v, OP_IfPos, 2, 0);
+      sqlite3VdbeAddOp2(v, OP_Integer, -size, 1);
+      sqlite3VdbeJumpHere(v, addr);
+      sqlite3VdbeAddOp3(v, OP_SetCookie, iDb, 2, 1);
+      pDb->pSchema->cache_size = size;
+      sqlite3BtreeSetCacheSize(pDb->pBt, pDb->pSchema->cache_size);
+    }
+  }else
+
+  /*
+  **  PRAGMA [database.]page_size
+  **  PRAGMA [database.]page_size=N
+  **
+  ** The first form reports the current setting for the
+  ** database page size in bytes.  The second form sets the
+  ** database page size value.  The value can only be set if
+  ** the database has not yet been created.
+  */
+  if( sqlite3StrICmp(zLeft,"page_size")==0 ){
+    Btree *pBt = pDb->pBt;
+    if( !zRight ){
+      int size = pBt ? sqlite3BtreeGetPageSize(pBt) : 0;
+      returnSingleInt(pParse, "page_size", size);
+    }else{
+      /* Malloc may fail when setting the page-size, as there is an internal
+      ** buffer that the pager module resizes using sqlite3_realloc().
+      */
+      if( SQLITE_NOMEM==sqlite3BtreeSetPageSize(pBt, atoi(zRight), -1) ){
+        db->mallocFailed = 1;
+      }
+    }
+  }else
+
+  /*
+  **  PRAGMA [database.]max_page_count
+  **  PRAGMA [database.]max_page_count=N
+  **
+  ** The first form reports the current setting for the
+  ** maximum number of pages in the database file.  The
+  ** second form attempts to change this setting.  Both
+  ** forms return the current setting.
+  */
+  if( sqlite3StrICmp(zLeft,"max_page_count")==0 ){
+    Btree *pBt = pDb->pBt;
+    int newMax = 0;
+    if( zRight ){
+      newMax = atoi(zRight);
+    }
+    if( pBt ){
+      newMax = sqlite3BtreeMaxPageCount(pBt, newMax);
+    }
+    returnSingleInt(pParse, "max_page_count", newMax);
+  }else
+
+  /*
+  **  PRAGMA [database.]locking_mode
+  **  PRAGMA [database.]locking_mode = (normal|exclusive)
+  */
+  if( sqlite3StrICmp(zLeft,"locking_mode")==0 ){
+    const char *zRet = "normal";
+    int eMode = getLockingMode(zRight);
+
+    if( pId2->n==0 && eMode==PAGER_LOCKINGMODE_QUERY ){
+      /* Simple "PRAGMA locking_mode;" statement. This is a query for
+      ** the current default locking mode (which may be different to
+      ** the locking-mode of the main database).
+      */
+      eMode = db->dfltLockMode;
+    }else{
+      Pager *pPager;
+      if( pId2->n==0 ){
+        /* This indicates that no database name was specified as part
+        ** of the PRAGMA command. In this case the locking-mode must be
+        ** set on all attached databases, as well as the main db file.
+        **
+        ** Also, the sqlite3.dfltLockMode variable is set so that
+        ** any subsequently attached databases also use the specified
+        ** locking mode.
+        */
+        int ii;
+        assert(pDb==&db->aDb[0]);
+        for(ii=2; ii<db->nDb; ii++){
+          pPager = sqlite3BtreePager(db->aDb[ii].pBt);
+          sqlite3PagerLockingMode(pPager, eMode);
+        }
+        db->dfltLockMode = eMode;
+      }
+      pPager = sqlite3BtreePager(pDb->pBt);
+      eMode = sqlite3PagerLockingMode(pPager, eMode);
+    }
+
+    assert(eMode==PAGER_LOCKINGMODE_NORMAL||eMode==PAGER_LOCKINGMODE_EXCLUSIVE);
+    if( eMode==PAGER_LOCKINGMODE_EXCLUSIVE ){
+      zRet = "exclusive";
+    }
+    sqlite3VdbeSetNumCols(v, 1);
+    sqlite3VdbeSetColName(v, 0, COLNAME_NAME, "locking_mode", P4_STATIC);
+    sqlite3VdbeAddOp4(v, OP_String8, 0, 1, 0, zRet, 0);
+    sqlite3VdbeAddOp2(v, OP_ResultRow, 1, 1);
+  }else
+#endif /* SQLITE_OMIT_PAGER_PRAGMAS */
+
+  /*
+  **  PRAGMA [database.]auto_vacuum
+  **  PRAGMA [database.]auto_vacuum=N
+  **
+  ** Get or set the (boolean) value of the database 'auto-vacuum' parameter.
+  */
+#ifndef SQLITE_OMIT_AUTOVACUUM
+  if( sqlite3StrICmp(zLeft,"auto_vacuum")==0 ){
+    Btree *pBt = pDb->pBt;
+    if( sqlite3ReadSchema(pParse) ){
+      goto pragma_out;
+    }
+    if( !zRight ){
+      int auto_vacuum =
+          pBt ? sqlite3BtreeGetAutoVacuum(pBt) : SQLITE_DEFAULT_AUTOVACUUM;
+      returnSingleInt(pParse, "auto_vacuum", auto_vacuum);
+    }else{
+      int eAuto = getAutoVacuum(zRight);
+      db->nextAutovac = eAuto;
+      if( eAuto>=0 ){
+        /* Call SetAutoVacuum() to set initialize the internal auto and
+        ** incr-vacuum flags. This is required in case this connection
+        ** creates the database file. It is important that it is created
+        ** as an auto-vacuum capable db.
+        */
+        int rc = sqlite3BtreeSetAutoVacuum(pBt, eAuto);
+        if( rc==SQLITE_OK && (eAuto==1 || eAuto==2) ){
+          /* When setting the auto_vacuum mode to either "full" or
+          ** "incremental", write the value of meta[6] in the database
+          ** file. Before writing to meta[6], check that meta[3] indicates
+          ** that this really is an auto-vacuum capable database.
+          */
+          static const VdbeOpList setMeta6[] = {
+            { OP_Transaction,    0,               1,        0},    /* 0 */
+            { OP_ReadCookie,     0,               1,        3},    /* 1 */
+            { OP_If,             1,               0,        0},    /* 2 */
+            { OP_Halt,           SQLITE_OK,       OE_Abort, 0},    /* 3 */
+            { OP_Integer,        0,               1,        0},    /* 4 */
+            { OP_SetCookie,      0,               6,        1},    /* 5 */
+          };
+          int iAddr;
+          iAddr = sqlite3VdbeAddOpList(v, ArraySize(setMeta6), setMeta6);
+          sqlite3VdbeChangeP1(v, iAddr, iDb);
+          sqlite3VdbeChangeP1(v, iAddr+1, iDb);
+          sqlite3VdbeChangeP2(v, iAddr+2, iAddr+4);
+          sqlite3VdbeChangeP1(v, iAddr+4, eAuto-1);
+          sqlite3VdbeChangeP1(v, iAddr+5, iDb);
+          sqlite3VdbeUsesBtree(v, iDb);
+        }
+      }
+    }
+  }else
+#endif
+
+  /*
+  **  PRAGMA [database.]incremental_vacuum(N)
+  **
+  ** Do N steps of incremental vacuuming on a database.
+  */
+#ifndef SQLITE_OMIT_AUTOVACUUM
+  if( sqlite3StrICmp(zLeft,"incremental_vacuum")==0 ){
+    int iLimit, addr;
+    if( sqlite3ReadSchema(pParse) ){
+      goto pragma_out;
+    }
+    if( zRight==0 || !sqlite3GetInt32(zRight, &iLimit) || iLimit<=0 ){
+      iLimit = 0x7fffffff;
+    }
+    sqlite3BeginWriteOperation(pParse, 0, iDb);
+    sqlite3VdbeAddOp2(v, OP_Integer, iLimit, 1);
+    addr = sqlite3VdbeAddOp1(v, OP_IncrVacuum, iDb);
+    sqlite3VdbeAddOp1(v, OP_ResultRow, 1);
+    sqlite3VdbeAddOp2(v, OP_AddImm, 1, -1);
+    sqlite3VdbeAddOp2(v, OP_IfPos, 1, addr);
+    sqlite3VdbeJumpHere(v, addr);
+  }else
+#endif
+
+#ifndef SQLITE_OMIT_PAGER_PRAGMAS
+  /*
+  **  PRAGMA [database.]cache_size
+  **  PRAGMA [database.]cache_size=N
+  **
+  ** The first form reports the current local setting for the
+  ** page cache size.  The local setting can be different from
+  ** the persistent cache size value that is stored in the database
+  ** file itself.  The value returned is the maximum number of
+  ** pages in the page cache.  The second form sets the local
+  ** page cache size value.  It does not change the persistent
+  ** cache size stored on the disk so the cache size will revert
+  ** to its default value when the database is closed and reopened.
+  ** N should be a positive integer.
+  */
+  if( sqlite3StrICmp(zLeft,"cache_size")==0 ){
+    if( sqlite3ReadSchema(pParse) ) goto pragma_out;
+    if( !zRight ){
+      returnSingleInt(pParse, "cache_size", pDb->pSchema->cache_size);
+    }else{
+      int size = atoi(zRight);
+      if( size<0 ) size = -size;
+      pDb->pSchema->cache_size = size;
+      sqlite3BtreeSetCacheSize(pDb->pBt, pDb->pSchema->cache_size);
+    }
+  }else
+
+  /*
+  **   PRAGMA temp_store
+  **   PRAGMA temp_store = "default"|"memory"|"file"
+  **
+  ** Return or set the local value of the temp_store flag.  Changing
+  ** the local value does not make changes to the disk file and the default
+  ** value will be restored the next time the database is opened.
+  **
+  ** Note that it is possible for the library compile-time options to
+  ** override this setting
+  */
+  if( sqlite3StrICmp(zLeft, "temp_store")==0 ){
+    if( !zRight ){
+      returnSingleInt(pParse, "temp_store", db->temp_store);
+    }else{
+      changeTempStorage(pParse, zRight);
+    }
+  }else
+
+  /*
+  **   PRAGMA temp_store_directory
+  **   PRAGMA temp_store_directory = ""|"directory_name"
+  **
+  ** Return or set the local value of the temp_store_directory flag.  Changing
+  ** the value sets a specific directory to be used for temporary files.
+  ** Setting to a null string reverts to the default temporary directory search.
+  ** If temporary directory is changed, then invalidateTempStorage.
+  **
+  */
+  if( sqlite3StrICmp(zLeft, "temp_store_directory")==0 ){
+    if( !zRight ){
+      if( sqlite3_temp_directory ){
+        sqlite3VdbeSetNumCols(v, 1);
+        sqlite3VdbeSetColName(v, 0, COLNAME_NAME,
+            "temp_store_directory", P4_STATIC);
+        sqlite3VdbeAddOp4(v, OP_String8, 0, 1, 0, sqlite3_temp_directory, 0);
+        sqlite3VdbeAddOp2(v, OP_ResultRow, 1, 1);
+      }
+    }else{
+      if( zRight[0]
+       && !sqlite3OsAccess(db->pVfs, zRight, SQLITE_ACCESS_READWRITE)
+      ){
+        sqlite3ErrorMsg(pParse, "not a writable directory");
+        goto pragma_out;
+      }
+      if( TEMP_STORE==0
+       || (TEMP_STORE==1 && db->temp_store<=1)
+       || (TEMP_STORE==2 && db->temp_store==1)
+      ){
+        invalidateTempStorage(pParse);
+      }
+      sqlite3_free(sqlite3_temp_directory);
+      if( zRight[0] ){
+        sqlite3_temp_directory = zRight;
+        zRight = 0;
+      }else{
+        sqlite3_temp_directory = 0;
+      }
+    }
+  }else
+
+  /*
+  **   PRAGMA [database.]synchronous
+  **   PRAGMA [database.]synchronous=OFF|ON|NORMAL|FULL
+  **
+  ** Return or set the local value of the synchronous flag.  Changing
+  ** the local value does not make changes to the disk file and the
+  ** default value will be restored the next time the database is
+  ** opened.
+  */
+  if( sqlite3StrICmp(zLeft,"synchronous")==0 ){
+    if( sqlite3ReadSchema(pParse) ) goto pragma_out;
+    if( !zRight ){
+      returnSingleInt(pParse, "synchronous", pDb->safety_level-1);
+    }else{
+      if( !db->autoCommit ){
+        sqlite3ErrorMsg(pParse,
+            "Safety level may not be changed inside a transaction");
+      }else{
+        pDb->safety_level = getSafetyLevel(zRight)+1;
+      }
+    }
+  }else
+#endif /* SQLITE_OMIT_PAGER_PRAGMAS */
+
+#ifndef SQLITE_OMIT_FLAG_PRAGMAS
+  if( flagPragma(pParse, zLeft, zRight) ){
+    /* The flagPragma() subroutine also generates any necessary code
+    ** there is nothing more to do here */
+  }else
+#endif /* SQLITE_OMIT_FLAG_PRAGMAS */
+
+#ifndef SQLITE_OMIT_SCHEMA_PRAGMAS
+  /*
+  **   PRAGMA table_info(<table>)
+  **
+  ** Return a single row for each column of the named table. The columns of
+  ** the returned data set are:
+  **
+  ** cid:        Column id (numbered from left to right, starting at 0)
+  ** name:       Column name
+  ** type:       Column declaration type.
+  ** notnull:    True if 'NOT NULL' is part of column declaration
+  ** dflt_value: The default value for the column, if any.
+  */
+  if( sqlite3StrICmp(zLeft, "table_info")==0 && zRight ){
+    Table *pTab;
+    if( sqlite3ReadSchema(pParse) ) goto pragma_out;
+    pTab = sqlite3FindTable(db, zRight, zDb);
+    if( pTab ){
+      int i;
+      int nHidden = 0;
+      Column *pCol;
+      sqlite3VdbeSetNumCols(v, 6);
+      pParse->nMem = 6;
+      sqlite3VdbeSetColName(v, 0, COLNAME_NAME, "cid", P4_STATIC);
+      sqlite3VdbeSetColName(v, 1, COLNAME_NAME, "name", P4_STATIC);
+      sqlite3VdbeSetColName(v, 2, COLNAME_NAME, "type", P4_STATIC);
+      sqlite3VdbeSetColName(v, 3, COLNAME_NAME, "notnull", P4_STATIC);
+      sqlite3VdbeSetColName(v, 4, COLNAME_NAME, "dflt_value", P4_STATIC);
+      sqlite3VdbeSetColName(v, 5, COLNAME_NAME, "pk", P4_STATIC);
+      sqlite3ViewGetColumnNames(pParse, pTab);
+      for(i=0, pCol=pTab->aCol; i<pTab->nCol; i++, pCol++){
+        const Token *pDflt;
+        if( IsHiddenColumn(pCol) ){
+          nHidden++;
+          continue;
+        }
+        sqlite3VdbeAddOp2(v, OP_Integer, i-nHidden, 1);
+        sqlite3VdbeAddOp4(v, OP_String8, 0, 2, 0, pCol->zName, 0);
+        sqlite3VdbeAddOp4(v, OP_String8, 0, 3, 0,
+           pCol->zType ? pCol->zType : "", 0);
+        sqlite3VdbeAddOp2(v, OP_Integer, pCol->notNull, 4);
+        if( pCol->pDflt && (pDflt = &pCol->pDflt->span)->z ){
+          sqlite3VdbeAddOp4(v, OP_String8, 0, 5, 0, (char*)pDflt->z, pDflt->n);
+        }else{
+          sqlite3VdbeAddOp2(v, OP_Null, 0, 5);
+        }
+        sqlite3VdbeAddOp2(v, OP_Integer, pCol->isPrimKey, 6);
+        sqlite3VdbeAddOp2(v, OP_ResultRow, 1, 6);
+      }
+    }
+  }else
+
+  if( sqlite3StrICmp(zLeft, "index_info")==0 && zRight ){
+    Index *pIdx;
+    Table *pTab;
+    if( sqlite3ReadSchema(pParse) ) goto pragma_out;
+    pIdx = sqlite3FindIndex(db, zRight, zDb);
+    if( pIdx ){
+      int i;
+      pTab = pIdx->pTable;
+      sqlite3VdbeSetNumCols(v, 3);
+      pParse->nMem = 3;
+      sqlite3VdbeSetColName(v, 0, COLNAME_NAME, "seqno", P4_STATIC);
+      sqlite3VdbeSetColName(v, 1, COLNAME_NAME, "cid", P4_STATIC);
+      sqlite3VdbeSetColName(v, 2, COLNAME_NAME, "name", P4_STATIC);
+      for(i=0; i<pIdx->nColumn; i++){
+        int cnum = pIdx->aiColumn[i];
+        sqlite3VdbeAddOp2(v, OP_Integer, i, 1);
+        sqlite3VdbeAddOp2(v, OP_Integer, cnum, 2);
+        assert( pTab->nCol>cnum );
+        sqlite3VdbeAddOp4(v, OP_String8, 0, 3, 0, pTab->aCol[cnum].zName, 0);
+        sqlite3VdbeAddOp2(v, OP_ResultRow, 1, 3);
+      }
+    }
+  }else
+
+  if( sqlite3StrICmp(zLeft, "index_list")==0 && zRight ){
+    Index *pIdx;
+    Table *pTab;
+    if( sqlite3ReadSchema(pParse) ) goto pragma_out;
+    pTab = sqlite3FindTable(db, zRight, zDb);
+    if( pTab ){
+      v = sqlite3GetVdbe(pParse);
+      pIdx = pTab->pIndex;
+      if( pIdx ){
+        int i = 0;
+        sqlite3VdbeSetNumCols(v, 3);
+        pParse->nMem = 3;
+        sqlite3VdbeSetColName(v, 0, COLNAME_NAME, "seq", P4_STATIC);
+        sqlite3VdbeSetColName(v, 1, COLNAME_NAME, "name", P4_STATIC);
+        sqlite3VdbeSetColName(v, 2, COLNAME_NAME, "unique", P4_STATIC);
+        while(pIdx){
+          sqlite3VdbeAddOp2(v, OP_Integer, i, 1);
+          sqlite3VdbeAddOp4(v, OP_String8, 0, 2, 0, pIdx->zName, 0);
+          sqlite3VdbeAddOp2(v, OP_Integer, pIdx->onError!=OE_None, 3);
+          sqlite3VdbeAddOp2(v, OP_ResultRow, 1, 3);
+          ++i;
+          pIdx = pIdx->pNext;
+        }
+      }
+    }
+  }else
+
+  if( sqlite3StrICmp(zLeft, "database_list")==0 ){
+    int i;
+    if( sqlite3ReadSchema(pParse) ) goto pragma_out;
+    sqlite3VdbeSetNumCols(v, 3);
+    pParse->nMem = 3;
+    sqlite3VdbeSetColName(v, 0, COLNAME_NAME, "seq", P4_STATIC);
+    sqlite3VdbeSetColName(v, 1, COLNAME_NAME, "name", P4_STATIC);
+    sqlite3VdbeSetColName(v, 2, COLNAME_NAME, "file", P4_STATIC);
+    for(i=0; i<db->nDb; i++){
+      if( db->aDb[i].pBt==0 ) continue;
+      assert( db->aDb[i].zName!=0 );
+      sqlite3VdbeAddOp2(v, OP_Integer, i, 1);
+      sqlite3VdbeAddOp4(v, OP_String8, 0, 2, 0, db->aDb[i].zName, 0);
+      sqlite3VdbeAddOp4(v, OP_String8, 0, 3, 0,
+           sqlite3BtreeGetFilename(db->aDb[i].pBt), 0);
+      sqlite3VdbeAddOp2(v, OP_ResultRow, 1, 3);
+    }
+  }else
+
+  if( sqlite3StrICmp(zLeft, "collation_list")==0 ){
+    int i = 0;
+    HashElem *p;
+    sqlite3VdbeSetNumCols(v, 2);
+    pParse->nMem = 2;
+    sqlite3VdbeSetColName(v, 0, COLNAME_NAME, "seq", P4_STATIC);
+    sqlite3VdbeSetColName(v, 1, COLNAME_NAME, "name", P4_STATIC);
+    for(p=sqliteHashFirst(&db->aCollSeq); p; p=sqliteHashNext(p)){
+      CollSeq *pColl = (CollSeq *)sqliteHashData(p);
+      sqlite3VdbeAddOp2(v, OP_Integer, i++, 1);
+      sqlite3VdbeAddOp4(v, OP_String8, 0, 2, 0, pColl->zName, 0);
+      sqlite3VdbeAddOp2(v, OP_ResultRow, 1, 2);
+    }
+  }else
+#endif /* SQLITE_OMIT_SCHEMA_PRAGMAS */
+
+#ifndef SQLITE_OMIT_FOREIGN_KEY
+  if( sqlite3StrICmp(zLeft, "foreign_key_list")==0 && zRight ){
+    FKey *pFK;
+    Table *pTab;
+    if( sqlite3ReadSchema(pParse) ) goto pragma_out;
+    pTab = sqlite3FindTable(db, zRight, zDb);
+    if( pTab ){
+      v = sqlite3GetVdbe(pParse);
+      pFK = pTab->pFKey;
+      if( pFK ){
+        int i = 0;
+        sqlite3VdbeSetNumCols(v, 5);
+        pParse->nMem = 5;
+        sqlite3VdbeSetColName(v, 0, COLNAME_NAME, "id", P4_STATIC);
+        sqlite3VdbeSetColName(v, 1, COLNAME_NAME, "seq", P4_STATIC);
+        sqlite3VdbeSetColName(v, 2, COLNAME_NAME, "table", P4_STATIC);
+        sqlite3VdbeSetColName(v, 3, COLNAME_NAME, "from", P4_STATIC);
+        sqlite3VdbeSetColName(v, 4, COLNAME_NAME, "to", P4_STATIC);
+        while(pFK){
+          int j;
+          for(j=0; j<pFK->nCol; j++){
+            char *zCol = pFK->aCol[j].zCol;
+            sqlite3VdbeAddOp2(v, OP_Integer, i, 1);
+            sqlite3VdbeAddOp2(v, OP_Integer, j, 2);
+            sqlite3VdbeAddOp4(v, OP_String8, 0, 3, 0, pFK->zTo, 0);
+            sqlite3VdbeAddOp4(v, OP_String8, 0, 4, 0,
+                              pTab->aCol[pFK->aCol[j].iFrom].zName, 0);
+            sqlite3VdbeAddOp4(v, zCol ? OP_String8 : OP_Null, 0, 5, 0, zCol, 0);
+            sqlite3VdbeAddOp2(v, OP_ResultRow, 1, 5);
+          }
+          ++i;
+          pFK = pFK->pNextFrom;
+        }
+      }
+    }
+  }else
+#endif /* !defined(SQLITE_OMIT_FOREIGN_KEY) */
+
+#ifndef NDEBUG
+  if( sqlite3StrICmp(zLeft, "parser_trace")==0 ){
+    if( zRight ){
+      if( getBoolean(zRight) ){
+        sqlite3ParserTrace(stderr, "parser: ");
+      }else{
+        sqlite3ParserTrace(0, 0);
+      }
+    }
+  }else
+#endif
+
+  /* Reinstall the LIKE and GLOB functions.  The variant of LIKE
+  ** used will be case sensitive or not depending on the RHS.
+  */
+  if( sqlite3StrICmp(zLeft, "case_sensitive_like")==0 ){
+    if( zRight ){
+      sqlite3RegisterLikeFunctions(db, getBoolean(zRight));
+    }
+  }else
+
+#ifndef SQLITE_INTEGRITY_CHECK_ERROR_MAX
+# define SQLITE_INTEGRITY_CHECK_ERROR_MAX 100
+#endif
+
+#ifndef SQLITE_OMIT_INTEGRITY_CHECK
+  /* Pragma "quick_check" is an experimental reduced version of
+  ** integrity_check designed to detect most database corruption
+  ** without most of the overhead of a full integrity-check.
+  */
+  if( sqlite3StrICmp(zLeft, "integrity_check")==0
+   || sqlite3StrICmp(zLeft, "quick_check")==0
+  ){
+    int i, j, addr, mxErr;
+
+    /* Code that appears at the end of the integrity check.  If no error
+    ** messages have been generated, output OK.  Otherwise output the
+    ** error message
+    */
+    static const VdbeOpList endCode[] = {
+      { OP_AddImm,      1, 0,        0},    /* 0 */
+      { OP_IfNeg,       1, 0,        0},    /* 1 */
+      { OP_String8,     0, 3,        0},    /* 2 */
+      { OP_ResultRow,   3, 1,        0},
+    };
+
+    int isQuick = (zLeft[0]=='q');
+
+    /* Initialize the VDBE program */
+    if( sqlite3ReadSchema(pParse) ) goto pragma_out;
+    pParse->nMem = 6;
+    sqlite3VdbeSetNumCols(v, 1);
+    sqlite3VdbeSetColName(v, 0, COLNAME_NAME, "integrity_check", P4_STATIC);
+
+    /* Set the maximum error count */
+    mxErr = SQLITE_INTEGRITY_CHECK_ERROR_MAX;
+    if( zRight ){
+      mxErr = atoi(zRight);
+      if( mxErr<=0 ){
+        mxErr = SQLITE_INTEGRITY_CHECK_ERROR_MAX;
+      }
+    }
+    sqlite3VdbeAddOp2(v, OP_Integer, mxErr, 1);  /* reg[1] holds errors left */
+
+    /* Do an integrity check on each database file */
+    for(i=0; i<db->nDb; i++){
+      HashElem *x;
+      Hash *pTbls;
+      int cnt = 0;
+
+      if( OMIT_TEMPDB && i==1 ) continue;
+
+      sqlite3CodeVerifySchema(pParse, i);
+      addr = sqlite3VdbeAddOp1(v, OP_IfPos, 1); /* Halt if out of errors */
+      sqlite3VdbeAddOp2(v, OP_Halt, 0, 0);
+      sqlite3VdbeJumpHere(v, addr);
+
+      /* Do an integrity check of the B-Tree
+      **
+      ** Begin by filling registers 2, 3, ... with the root pages numbers
+      ** for all tables and indices in the database.
+      */
+      pTbls = &db->aDb[i].pSchema->tblHash;
+      for(x=sqliteHashFirst(pTbls); x; x=sqliteHashNext(x)){
+        Table *pTab = sqliteHashData(x);
+        Index *pIdx;
+        sqlite3VdbeAddOp2(v, OP_Integer, pTab->tnum, 2+cnt);
+        cnt++;
+        for(pIdx=pTab->pIndex; pIdx; pIdx=pIdx->pNext){
+          sqlite3VdbeAddOp2(v, OP_Integer, pIdx->tnum, 2+cnt);
+          cnt++;
+        }
+      }
+      if( cnt==0 ) continue;
+
+      /* Make sure sufficient number of registers have been allocated */
+      if( pParse->nMem < cnt+4 ){
+        pParse->nMem = cnt+4;
+      }
+
+      /* Do the b-tree integrity checks */
+      sqlite3VdbeAddOp3(v, OP_IntegrityCk, 2, cnt, 1);
+      sqlite3VdbeChangeP5(v, i);
+      addr = sqlite3VdbeAddOp1(v, OP_IsNull, 2);
+      sqlite3VdbeAddOp4(v, OP_String8, 0, 3, 0,
+         sqlite3MPrintf(db, "*** in database %s ***\n", db->aDb[i].zName),
+         P4_DYNAMIC);
+      sqlite3VdbeAddOp2(v, OP_Move, 2, 4);
+      sqlite3VdbeAddOp3(v, OP_Concat, 4, 3, 2);
+      sqlite3VdbeAddOp2(v, OP_ResultRow, 2, 1);
+      sqlite3VdbeJumpHere(v, addr);
+
+      /* Make sure all the indices are constructed correctly.
+      */
+      for(x=sqliteHashFirst(pTbls); x && !isQuick; x=sqliteHashNext(x)){
+        Table *pTab = sqliteHashData(x);
+        Index *pIdx;
+        int loopTop;
+
+        if( pTab->pIndex==0 ) continue;
+        addr = sqlite3VdbeAddOp1(v, OP_IfPos, 1);  /* Stop if out of errors */
+        sqlite3VdbeAddOp2(v, OP_Halt, 0, 0);
+        sqlite3VdbeJumpHere(v, addr);
+        sqlite3OpenTableAndIndices(pParse, pTab, 1, OP_OpenRead);
+        sqlite3VdbeAddOp2(v, OP_Integer, 0, 2);  /* reg(2) will count entries */
+        loopTop = sqlite3VdbeAddOp2(v, OP_Rewind, 1, 0);
+        sqlite3VdbeAddOp2(v, OP_AddImm, 2, 1);   /* increment entry count */
+        for(j=0, pIdx=pTab->pIndex; pIdx; pIdx=pIdx->pNext, j++){
+          int jmp2;
+          static const VdbeOpList idxErr[] = {
+            { OP_AddImm,      1, -1,  0},
+            { OP_String8,     0,  3,  0},    /* 1 */
+            { OP_Rowid,       1,  4,  0},
+            { OP_String8,     0,  5,  0},    /* 3 */
+            { OP_String8,     0,  6,  0},    /* 4 */
+            { OP_Concat,      4,  3,  3},
+            { OP_Concat,      5,  3,  3},
+            { OP_Concat,      6,  3,  3},
+            { OP_ResultRow,   3,  1,  0},
+          };
+          sqlite3GenerateIndexKey(pParse, pIdx, 1, 3);
+          jmp2 = sqlite3VdbeAddOp3(v, OP_Found, j+2, 0, 3);
+          addr = sqlite3VdbeAddOpList(v, ArraySize(idxErr), idxErr);
+          sqlite3VdbeChangeP4(v, addr+1, "rowid ", P4_STATIC);
+          sqlite3VdbeChangeP4(v, addr+3, " missing from index ", P4_STATIC);
+          sqlite3VdbeChangeP4(v, addr+4, pIdx->zName, P4_STATIC);
+          sqlite3VdbeJumpHere(v, jmp2);
+        }
+        sqlite3VdbeAddOp2(v, OP_Next, 1, loopTop+1);
+        sqlite3VdbeJumpHere(v, loopTop);
+        for(j=0, pIdx=pTab->pIndex; pIdx; pIdx=pIdx->pNext, j++){
+          static const VdbeOpList cntIdx[] = {
+             { OP_Integer,      0,  3,  0},
+             { OP_Rewind,       0,  0,  0},  /* 1 */
+             { OP_AddImm,       3,  1,  0},
+             { OP_Next,         0,  0,  0},  /* 3 */
+             { OP_Eq,           2,  0,  3},  /* 4 */
+             { OP_AddImm,       1, -1,  0},
+             { OP_String8,      0,  2,  0},  /* 6 */
+             { OP_String8,      0,  3,  0},  /* 7 */
+             { OP_Concat,       3,  2,  2},
+             { OP_ResultRow,    2,  1,  0},
+          };
+          if( pIdx->tnum==0 ) continue;
+          addr = sqlite3VdbeAddOp1(v, OP_IfPos, 1);
+          sqlite3VdbeAddOp2(v, OP_Halt, 0, 0);
+          sqlite3VdbeJumpHere(v, addr);
+          addr = sqlite3VdbeAddOpList(v, ArraySize(cntIdx), cntIdx);
+          sqlite3VdbeChangeP1(v, addr+1, j+2);
+          sqlite3VdbeChangeP2(v, addr+1, addr+4);
+          sqlite3VdbeChangeP1(v, addr+3, j+2);
+          sqlite3VdbeChangeP2(v, addr+3, addr+2);
+          sqlite3VdbeJumpHere(v, addr+4);
+          sqlite3VdbeChangeP4(v, addr+6,
+                     "wrong # of entries in index ", P4_STATIC);
+          sqlite3VdbeChangeP4(v, addr+7, pIdx->zName, P4_STATIC);
+        }
+      }
+    }
+    addr = sqlite3VdbeAddOpList(v, ArraySize(endCode), endCode);
+    sqlite3VdbeChangeP2(v, addr, -mxErr);
+    sqlite3VdbeJumpHere(v, addr+1);
+    sqlite3VdbeChangeP4(v, addr+2, "ok", P4_STATIC);
+  }else
+#endif /* SQLITE_OMIT_INTEGRITY_CHECK */
+
+#ifndef SQLITE_OMIT_UTF16
+  /*
+  **   PRAGMA encoding
+  **   PRAGMA encoding = "utf-8"|"utf-16"|"utf-16le"|"utf-16be"
+  **
+  ** In its first form, this pragma returns the encoding of the main
+  ** database. If the database is not initialized, it is initialized now.
+  **
+  ** The second form of this pragma is a no-op if the main database file
+  ** has not already been initialized. In this case it sets the default
+  ** encoding that will be used for the main database file if a new file
+  ** is created. If an existing main database file is opened, then the
+  ** default text encoding for the existing database is used.
+  **
+  ** In all cases new databases created using the ATTACH command are
+  ** created to use the same default text encoding as the main database. If
+  ** the main database has not been initialized and/or created when ATTACH
+  ** is executed, this is done before the ATTACH operation.
+  **
+  ** In the second form this pragma sets the text encoding to be used in
+  ** new database files created using this database handle. It is only
+  ** useful if invoked immediately after the main database i
+  */
+  if( sqlite3StrICmp(zLeft, "encoding")==0 ){
+    static const struct EncName {
+      char *zName;
+      u8 enc;
+    } encnames[] = {
+      { "UTF-8",    SQLITE_UTF8        },
+      { "UTF8",     SQLITE_UTF8        },
+      { "UTF-16le", SQLITE_UTF16LE     },
+      { "UTF16le",  SQLITE_UTF16LE     },
+      { "UTF-16be", SQLITE_UTF16BE     },
+      { "UTF16be",  SQLITE_UTF16BE     },
+      { "UTF-16",   0                  }, /* SQLITE_UTF16NATIVE */
+      { "UTF16",    0                  }, /* SQLITE_UTF16NATIVE */
+      { 0, 0 }
+    };
+    const struct EncName *pEnc;
+    if( !zRight ){    /* "PRAGMA encoding" */
+      if( sqlite3ReadSchema(pParse) ) goto pragma_out;
+      sqlite3VdbeSetNumCols(v, 1);
+      sqlite3VdbeSetColName(v, 0, COLNAME_NAME, "encoding", P4_STATIC);
+      sqlite3VdbeAddOp2(v, OP_String8, 0, 1);
+      for(pEnc=&encnames[0]; pEnc->zName; pEnc++){
+        if( pEnc->enc==ENC(pParse->db) ){
+          sqlite3VdbeChangeP4(v, -1, pEnc->zName, P4_STATIC);
+          break;
+        }
+      }
+      sqlite3VdbeAddOp2(v, OP_ResultRow, 1, 1);
+    }else{                        /* "PRAGMA encoding = XXX" */
+      /* Only change the value of sqlite.enc if the database handle is not
+      ** initialized. If the main database exists, the new sqlite.enc value
+      ** will be overwritten when the schema is next loaded. If it does not
+      ** already exists, it will be created to use the new encoding value.
+      */
+      if(
+        !(DbHasProperty(db, 0, DB_SchemaLoaded)) ||
+        DbHasProperty(db, 0, DB_Empty)
+      ){
+        for(pEnc=&encnames[0]; pEnc->zName; pEnc++){
+          if( 0==sqlite3StrICmp(zRight, pEnc->zName) ){
+            ENC(pParse->db) = pEnc->enc ? pEnc->enc : SQLITE_UTF16NATIVE;
+            break;
+          }
+        }
+        if( !pEnc->zName ){
+          sqlite3ErrorMsg(pParse, "unsupported encoding: %s", zRight);
+        }
+      }
+    }
+  }else
+#endif /* SQLITE_OMIT_UTF16 */
+
+#ifndef SQLITE_OMIT_SCHEMA_VERSION_PRAGMAS
+  /*
+  **   PRAGMA [database.]schema_version
+  **   PRAGMA [database.]schema_version = <integer>
+  **
+  **   PRAGMA [database.]user_version
+  **   PRAGMA [database.]user_version = <integer>
+  **
+  ** The pragma's schema_version and user_version are used to set or get
+  ** the value of the schema-version and user-version, respectively. Both
+  ** the schema-version and the user-version are 32-bit signed integers
+  ** stored in the database header.
+  **
+  ** The schema-cookie is usually only manipulated internally by SQLite. It
+  ** is incremented by SQLite whenever the database schema is modified (by
+  ** creating or dropping a table or index). The schema version is used by
+  ** SQLite each time a query is executed to ensure that the internal cache
+  ** of the schema used when compiling the SQL query matches the schema of
+  ** the database against which the compiled query is actually executed.
+  ** Subverting this mechanism by using "PRAGMA schema_version" to modify
+  ** the schema-version is potentially dangerous and may lead to program
+  ** crashes or database corruption. Use with caution!
+  **
+  ** The user-version is not used internally by SQLite. It may be used by
+  ** applications for any purpose.
+  */
+  if( sqlite3StrICmp(zLeft, "schema_version")==0
+   || sqlite3StrICmp(zLeft, "user_version")==0
+   || sqlite3StrICmp(zLeft, "freelist_count")==0
+  ){
+
+    int iCookie;   /* Cookie index. 0 for schema-cookie, 6 for user-cookie. */
+    sqlite3VdbeUsesBtree(v, iDb);
+    switch( zLeft[0] ){
+      case 's': case 'S':
+        iCookie = 0;
+        break;
+      case 'f': case 'F':
+        iCookie = 1;
+        iDb = (-1*(iDb+1));
+        assert(iDb<=0);
+        break;
+      default:
+        iCookie = 5;
+        break;
+    }
+
+    if( zRight && iDb>=0 ){
+      /* Write the specified cookie value */
+      static const VdbeOpList setCookie[] = {
+        { OP_Transaction,    0,  1,  0},    /* 0 */
+        { OP_Integer,        0,  1,  0},    /* 1 */
+        { OP_SetCookie,      0,  0,  1},    /* 2 */
+      };
+      int addr = sqlite3VdbeAddOpList(v, ArraySize(setCookie), setCookie);
+      sqlite3VdbeChangeP1(v, addr, iDb);
+      sqlite3VdbeChangeP1(v, addr+1, atoi(zRight));
+      sqlite3VdbeChangeP1(v, addr+2, iDb);
+      sqlite3VdbeChangeP2(v, addr+2, iCookie);
+    }else{
+      /* Read the specified cookie value */
+      static const VdbeOpList readCookie[] = {
+        { OP_ReadCookie,      0,  1,  0},    /* 0 */
+        { OP_ResultRow,       1,  1,  0}
+      };
+      int addr = sqlite3VdbeAddOpList(v, ArraySize(readCookie), readCookie);
+      sqlite3VdbeChangeP1(v, addr, iDb);
+      sqlite3VdbeChangeP3(v, addr, iCookie);
+      sqlite3VdbeSetNumCols(v, 1);
+      sqlite3VdbeSetColName(v, 0, COLNAME_NAME, zLeft, P4_TRANSIENT);
+    }
+  }else
+#endif /* SQLITE_OMIT_SCHEMA_VERSION_PRAGMAS */
+
+#if defined(SQLITE_DEBUG) || defined(SQLITE_TEST)
+  /*
+  ** Report the current state of file logs for all databases
+  */
+  if( sqlite3StrICmp(zLeft, "lock_status")==0 ){
+    static const char *const azLockName[] = {
+      "unlocked", "shared", "reserved", "pending", "exclusive"
+    };
+    int i;
+    Vdbe *v = sqlite3GetVdbe(pParse);
+    sqlite3VdbeSetNumCols(v, 2);
+    pParse->nMem = 2;
+    sqlite3VdbeSetColName(v, 0, COLNAME_NAME, "database", P4_STATIC);
+    sqlite3VdbeSetColName(v, 1, COLNAME_NAME, "status", P4_STATIC);
+    for(i=0; i<db->nDb; i++){
+      Btree *pBt;
+      Pager *pPager;
+      const char *zState = "unknown";
+      int j;
+      if( db->aDb[i].zName==0 ) continue;
+      sqlite3VdbeAddOp4(v, OP_String8, 0, 1, 0, db->aDb[i].zName, P4_STATIC);
+      pBt = db->aDb[i].pBt;
+      if( pBt==0 || (pPager = sqlite3BtreePager(pBt))==0 ){
+        zState = "closed";
+      }else if( sqlite3_file_control(db, i ? db->aDb[i].zName : 0,
+                                     SQLITE_FCNTL_LOCKSTATE, &j)==SQLITE_OK ){
+         zState = azLockName[j];
+      }
+      sqlite3VdbeAddOp4(v, OP_String8, 0, 2, 0, zState, P4_STATIC);
+      sqlite3VdbeAddOp2(v, OP_ResultRow, 1, 2);
+    }
+  }else
+#endif
+
+#ifdef SQLITE_SSE
+  /*
+  ** Check to see if the sqlite_statements table exists.  Create it
+  ** if it does not.
+  */
+  if( sqlite3StrICmp(zLeft, "create_sqlite_statement_table")==0 ){
+    extern int sqlite3CreateStatementsTable(Parse*);
+    sqlite3CreateStatementsTable(pParse);
+  }else
+#endif
+
+#if SQLITE_HAS_CODEC
+  if( sqlite3StrICmp(zLeft, "key")==0 ){
+    sqlite3_key(db, zRight, strlen(zRight));
+  }else
+#endif
+#if SQLITE_HAS_CODEC || defined(SQLITE_ENABLE_CEROD)
+  if( sqlite3StrICmp(zLeft, "activate_extensions")==0 ){
+#if SQLITE_HAS_CODEC
+    if( sqlite3StrNICmp(zRight, "see-", 4)==0 ){
+      extern void sqlite3_activate_see(const char*);
+      sqlite3_activate_see(&zRight[4]);
+    }
+#endif
+#ifdef SQLITE_ENABLE_CEROD
+    if( sqlite3StrNICmp(zRight, "cerod-", 6)==0 ){
+      extern void sqlite3_activate_cerod(const char*);
+      sqlite3_activate_cerod(&zRight[6]);
+    }
+#endif
+  }
+#endif
+
+  {}
+
+  if( v ){
+    /* Code an OP_Expire at the end of each PRAGMA program to cause
+    ** the VDBE implementing the pragma to expire. Most (all?) pragmas
+    ** are only valid for a single execution.
+    */
+    sqlite3VdbeAddOp2(v, OP_Expire, 1, 0);
+
+    /*
+    ** Reset the safety level, in case the fullfsync flag or synchronous
+    ** setting changed.
+    */
+#ifndef SQLITE_OMIT_PAGER_PRAGMAS
+    if( db->autoCommit ){
+      sqlite3BtreeSetSafetyLevel(pDb->pBt, pDb->safety_level,
+                 (db->flags&SQLITE_FullFSync)!=0);
+    }
+#endif
+  }
+pragma_out:
+  sqlite3_free(zLeft);
+  sqlite3_free(zRight);
+}
+
+#endif /* SQLITE_OMIT_PRAGMA || SQLITE_OMIT_PARSER */
diff --git a/uppsrc/plugin/sqlite3/lib/prepare.c b/uppsrc/plugin/sqlite3/lib/prepare.c
new file mode 100644
index 000000000..3ed8e0296
--- /dev/null
+++ b/uppsrc/plugin/sqlite3/lib/prepare.c
@@ -0,0 +1,780 @@
+/*
+** 2005 May 25
+**
+** The author disclaims copyright to this source code.  In place of
+** a legal notice, here is a blessing:
+**
+**    May you do good and not evil.
+**    May you find forgiveness for yourself and forgive others.
+**    May you share freely, never taking more than you give.
+**
+*************************************************************************
+** This file contains the implementation of the sqlite3_prepare()
+** interface, and routines that contribute to loading the database schema
+** from disk.
+**
+** $Id: prepare.c,v 1.78 2008/03/08 12:23:31 drh Exp $
+*/
+#include "sqliteInt.h"
+#include <ctype.h>
+
+/*
+** Fill the InitData structure with an error message that indicates
+** that the database is corrupt.
+*/
+static void corruptSchema(InitData *pData, const char *zExtra){
+  if( !pData->db->mallocFailed ){
+    sqlite3SetString(pData->pzErrMsg, "malformed database schema",
+       zExtra!=0 && zExtra[0]!=0 ? " - " : (char*)0, zExtra, (char*)0);
+  }
+  pData->rc = SQLITE_CORRUPT;
+}
+
+/*
+** This is the callback routine for the code that initializes the
+** database.  See sqlite3Init() below for additional information.
+** This routine is also called from the OP_ParseSchema opcode of the VDBE.
+**
+** Each callback contains the following information:
+**
+**     argv[0] = name of thing being created
+**     argv[1] = root page number for table or index. 0 for trigger or view.
+**     argv[2] = SQL text for the CREATE statement.
+**
+*/
+int sqlite3InitCallback(void *pInit, int argc, char **argv, char **azColName){
+  InitData *pData = (InitData*)pInit;
+  sqlite3 *db = pData->db;
+  int iDb = pData->iDb;
+
+  assert( sqlite3_mutex_held(db->mutex) );
+  pData->rc = SQLITE_OK;
+  DbClearProperty(db, iDb, DB_Empty);
+  if( db->mallocFailed ){
+    corruptSchema(pData, 0);
+    return SQLITE_NOMEM;
+  }
+
+  assert( argc==3 );
+  if( argv==0 ) return 0;   /* Might happen if EMPTY_RESULT_CALLBACKS are on */
+  if( argv[1]==0 ){
+    corruptSchema(pData, 0);
+    return 1;
+  }
+  assert( iDb>=0 && iDb<db->nDb );
+  if( argv[2] && argv[2][0] ){
+    /* Call the parser to process a CREATE TABLE, INDEX or VIEW.
+    ** But because db->init.busy is set to 1, no VDBE code is generated
+    ** or executed.  All the parser does is build the internal data
+    ** structures that describe the table, index, or view.
+    */
+    char *zErr;
+    int rc;
+    assert( db->init.busy );
+    db->init.iDb = iDb;
+    db->init.newTnum = atoi(argv[1]);
+    rc = sqlite3_exec(db, argv[2], 0, 0, &zErr);
+    db->init.iDb = 0;
+    assert( rc!=SQLITE_OK || zErr==0 );
+    if( SQLITE_OK!=rc ){
+      pData->rc = rc;
+      if( rc==SQLITE_NOMEM ){
+        db->mallocFailed = 1;
+      }else if( rc!=SQLITE_INTERRUPT ){
+        corruptSchema(pData, zErr);
+      }
+      sqlite3_free(zErr);
+      return 1;
+    }
+  }else if( argv[0]==0 ){
+    corruptSchema(pData, 0);
+  }else{
+    /* If the SQL column is blank it means this is an index that
+    ** was created to be the PRIMARY KEY or to fulfill a UNIQUE
+    ** constraint for a CREATE TABLE.  The index should have already
+    ** been created when we processed the CREATE TABLE.  All we have
+    ** to do here is record the root page number for that index.
+    */
+    Index *pIndex;
+    pIndex = sqlite3FindIndex(db, argv[0], db->aDb[iDb].zName);
+    if( pIndex==0 || pIndex->tnum!=0 ){
+      /* This can occur if there exists an index on a TEMP table which
+      ** has the same name as another index on a permanent index.  Since
+      ** the permanent table is hidden by the TEMP table, we can also
+      ** safely ignore the index on the permanent table.
+      */
+      /* Do Nothing */;
+    }else{
+      pIndex->tnum = atoi(argv[1]);
+    }
+  }
+  return 0;
+}
+
+/*
+** Attempt to read the database schema and initialize internal
+** data structures for a single database file.  The index of the
+** database file is given by iDb.  iDb==0 is used for the main
+** database.  iDb==1 should never be used.  iDb>=2 is used for
+** auxiliary databases.  Return one of the SQLITE_ error codes to
+** indicate success or failure.
+*/
+static int sqlite3InitOne(sqlite3 *db, int iDb, char **pzErrMsg){
+  int rc;
+  BtCursor *curMain;
+  int size;
+  Table *pTab;
+  Db *pDb;
+  char const *azArg[4];
+  int meta[10];
+  InitData initData;
+  char const *zMasterSchema;
+  char const *zMasterName = SCHEMA_TABLE(iDb);
+
+  /*
+  ** The master database table has a structure like this
+  */
+  static const char master_schema[] =
+     "CREATE TABLE sqlite_master(\n"
+     "  type text,\n"
+     "  name text,\n"
+     "  tbl_name text,\n"
+     "  rootpage integer,\n"
+     "  sql text\n"
+     ")"
+  ;
+#ifndef SQLITE_OMIT_TEMPDB
+  static const char temp_master_schema[] =
+     "CREATE TEMP TABLE sqlite_temp_master(\n"
+     "  type text,\n"
+     "  name text,\n"
+     "  tbl_name text,\n"
+     "  rootpage integer,\n"
+     "  sql text\n"
+     ")"
+  ;
+#else
+  #define temp_master_schema 0
+#endif
+
+  assert( iDb>=0 && iDb<db->nDb );
+  assert( db->aDb[iDb].pSchema );
+  assert( sqlite3_mutex_held(db->mutex) );
+  assert( iDb==1 || sqlite3BtreeHoldsMutex(db->aDb[iDb].pBt) );
+
+  /* zMasterSchema and zInitScript are set to point at the master schema
+  ** and initialisation script appropriate for the database being
+  ** initialised. zMasterName is the name of the master table.
+  */
+  if( !OMIT_TEMPDB && iDb==1 ){
+    zMasterSchema = temp_master_schema;
+  }else{
+    zMasterSchema = master_schema;
+  }
+  zMasterName = SCHEMA_TABLE(iDb);
+
+  /* Construct the schema tables.  */
+  azArg[0] = zMasterName;
+  azArg[1] = "1";
+  azArg[2] = zMasterSchema;
+  azArg[3] = 0;
+  initData.db = db;
+  initData.iDb = iDb;
+  initData.pzErrMsg = pzErrMsg;
+  (void)sqlite3SafetyOff(db);
+  rc = sqlite3InitCallback(&initData, 3, (char **)azArg, 0);
+  (void)sqlite3SafetyOn(db);
+  if( rc ){
+    rc = initData.rc;
+    goto error_out;
+  }
+  pTab = sqlite3FindTable(db, zMasterName, db->aDb[iDb].zName);
+  if( pTab ){
+    pTab->readOnly = 1;
+  }
+
+  /* Create a cursor to hold the database open
+  */
+  pDb = &db->aDb[iDb];
+  if( pDb->pBt==0 ){
+    if( !OMIT_TEMPDB && iDb==1 ){
+      DbSetProperty(db, 1, DB_SchemaLoaded);
+    }
+    return SQLITE_OK;
+  }
+  sqlite3BtreeEnter(pDb->pBt);
+  rc = sqlite3BtreeCursor(pDb->pBt, MASTER_ROOT, 0, 0, 0, &curMain);
+  if( rc!=SQLITE_OK && rc!=SQLITE_EMPTY ){
+    sqlite3SetString(pzErrMsg, sqlite3ErrStr(rc), (char*)0);
+    sqlite3BtreeLeave(pDb->pBt);
+    goto error_out;
+  }
+
+  /* Get the database meta information.
+  **
+  ** Meta values are as follows:
+  **    meta[0]   Schema cookie.  Changes with each schema change.
+  **    meta[1]   File format of schema layer.
+  **    meta[2]   Size of the page cache.
+  **    meta[3]   Use freelist if 0.  Autovacuum if greater than zero.
+  **    meta[4]   Db text encoding. 1:UTF-8 2:UTF-16LE 3:UTF-16BE
+  **    meta[5]   The user cookie. Used by the application.
+  **    meta[6]   Incremental-vacuum flag.
+  **    meta[7]
+  **    meta[8]
+  **    meta[9]
+  **
+  ** Note: The #defined SQLITE_UTF* symbols in sqliteInt.h correspond to
+  ** the possible values of meta[4].
+  */
+  if( rc==SQLITE_OK ){
+    int i;
+    for(i=0; rc==SQLITE_OK && i<sizeof(meta)/sizeof(meta[0]); i++){
+      rc = sqlite3BtreeGetMeta(pDb->pBt, i+1, (u32 *)&meta[i]);
+    }
+    if( rc ){
+      sqlite3SetString(pzErrMsg, sqlite3ErrStr(rc), (char*)0);
+      sqlite3BtreeCloseCursor(curMain);
+      sqlite3BtreeLeave(pDb->pBt);
+      goto error_out;
+    }
+  }else{
+    memset(meta, 0, sizeof(meta));
+  }
+  pDb->pSchema->schema_cookie = meta[0];
+
+  /* If opening a non-empty database, check the text encoding. For the
+  ** main database, set sqlite3.enc to the encoding of the main database.
+  ** For an attached db, it is an error if the encoding is not the same
+  ** as sqlite3.enc.
+  */
+  if( meta[4] ){  /* text encoding */
+    if( iDb==0 ){
+      /* If opening the main database, set ENC(db). */
+      ENC(db) = (u8)meta[4];
+      db->pDfltColl = sqlite3FindCollSeq(db, SQLITE_UTF8, "BINARY", 6, 0);
+    }else{
+      /* If opening an attached database, the encoding much match ENC(db) */
+      if( meta[4]!=ENC(db) ){
+        sqlite3BtreeCloseCursor(curMain);
+        sqlite3SetString(pzErrMsg, "attached databases must use the same"
+            " text encoding as main database", (char*)0);
+        sqlite3BtreeLeave(pDb->pBt);
+        return SQLITE_ERROR;
+      }
+    }
+  }else{
+    DbSetProperty(db, iDb, DB_Empty);
+  }
+  pDb->pSchema->enc = ENC(db);
+
+  size = meta[2];
+  if( size==0 ){ size = SQLITE_DEFAULT_CACHE_SIZE; }
+  if( size<0 ) size = -size;
+  pDb->pSchema->cache_size = size;
+  sqlite3BtreeSetCacheSize(pDb->pBt, pDb->pSchema->cache_size);
+
+  /*
+  ** file_format==1    Version 3.0.0.
+  ** file_format==2    Version 3.1.3.  // ALTER TABLE ADD COLUMN
+  ** file_format==3    Version 3.1.4.  // ditto but with non-NULL defaults
+  ** file_format==4    Version 3.3.0.  // DESC indices.  Boolean constants
+  */
+  pDb->pSchema->file_format = meta[1];
+  if( pDb->pSchema->file_format==0 ){
+    pDb->pSchema->file_format = 1;
+  }
+  if( pDb->pSchema->file_format>SQLITE_MAX_FILE_FORMAT ){
+    sqlite3BtreeCloseCursor(curMain);
+    sqlite3SetString(pzErrMsg, "unsupported file format", (char*)0);
+    sqlite3BtreeLeave(pDb->pBt);
+    return SQLITE_ERROR;
+  }
+
+  /* Ticket #2804:  When we open a database in the newer file format,
+  ** clear the legacy_file_format pragma flag so that a VACUUM will
+  ** not downgrade the database and thus invalidate any descending
+  ** indices that the user might have created.
+  */
+  if( iDb==0 && meta[1]>=4 ){
+    db->flags &= ~SQLITE_LegacyFileFmt;
+  }
+
+  /* Read the schema information out of the schema tables
+  */
+  assert( db->init.busy );
+  if( rc==SQLITE_EMPTY ){
+    /* For an empty database, there is nothing to read */
+    rc = SQLITE_OK;
+  }else{
+    char *zSql;
+    zSql = sqlite3MPrintf(db,
+        "SELECT name, rootpage, sql FROM '%q'.%s",
+        db->aDb[iDb].zName, zMasterName);
+    (void)sqlite3SafetyOff(db);
+#ifndef SQLITE_OMIT_AUTHORIZATION
+    {
+      int (*xAuth)(void*,int,const char*,const char*,const char*,const char*);
+      xAuth = db->xAuth;
+      db->xAuth = 0;
+#endif
+      rc = sqlite3_exec(db, zSql, sqlite3InitCallback, &initData, 0);
+#ifndef SQLITE_OMIT_AUTHORIZATION
+      db->xAuth = xAuth;
+    }
+#endif
+    if( rc==SQLITE_ABORT ) rc = initData.rc;
+    (void)sqlite3SafetyOn(db);
+    sqlite3_free(zSql);
+#ifndef SQLITE_OMIT_ANALYZE
+    if( rc==SQLITE_OK ){
+      sqlite3AnalysisLoad(db, iDb);
+    }
+#endif
+    sqlite3BtreeCloseCursor(curMain);
+  }
+  if( db->mallocFailed ){
+    /* sqlite3SetString(pzErrMsg, "out of memory", (char*)0); */
+    rc = SQLITE_NOMEM;
+    sqlite3ResetInternalSchema(db, 0);
+  }
+  if( rc==SQLITE_OK || (db->flags&SQLITE_RecoveryMode)){
+    /* Black magic: If the SQLITE_RecoveryMode flag is set, then consider
+    ** the schema loaded, even if errors occured. In this situation the
+    ** current sqlite3_prepare() operation will fail, but the following one
+    ** will attempt to compile the supplied statement against whatever subset
+    ** of the schema was loaded before the error occured. The primary
+    ** purpose of this is to allow access to the sqlite_master table
+    ** even when its contents have been corrupted.
+    */
+    DbSetProperty(db, iDb, DB_SchemaLoaded);
+    rc = SQLITE_OK;
+  }
+  sqlite3BtreeLeave(pDb->pBt);
+
+error_out:
+  if( rc==SQLITE_NOMEM || rc==SQLITE_IOERR_NOMEM ){
+    db->mallocFailed = 1;
+  }
+  return rc;
+}
+
+/*
+** Initialize all database files - the main database file, the file
+** used to store temporary tables, and any additional database files
+** created using ATTACH statements.  Return a success code.  If an
+** error occurs, write an error message into *pzErrMsg.
+**
+** After a database is initialized, the DB_SchemaLoaded bit is set
+** bit is set in the flags field of the Db structure. If the database
+** file was of zero-length, then the DB_Empty flag is also set.
+*/
+int sqlite3Init(sqlite3 *db, char **pzErrMsg){
+  int i, rc;
+  int commit_internal = !(db->flags&SQLITE_InternChanges);
+
+  assert( sqlite3_mutex_held(db->mutex) );
+  if( db->init.busy ) return SQLITE_OK;
+  rc = SQLITE_OK;
+  db->init.busy = 1;
+  for(i=0; rc==SQLITE_OK && i<db->nDb; i++){
+    if( DbHasProperty(db, i, DB_SchemaLoaded) || i==1 ) continue;
+    rc = sqlite3InitOne(db, i, pzErrMsg);
+    if( rc ){
+      sqlite3ResetInternalSchema(db, i);
+    }
+  }
+
+  /* Once all the other databases have been initialised, load the schema
+  ** for the TEMP database. This is loaded last, as the TEMP database
+  ** schema may contain references to objects in other databases.
+  */
+#ifndef SQLITE_OMIT_TEMPDB
+  if( rc==SQLITE_OK && db->nDb>1 && !DbHasProperty(db, 1, DB_SchemaLoaded) ){
+    rc = sqlite3InitOne(db, 1, pzErrMsg);
+    if( rc ){
+      sqlite3ResetInternalSchema(db, 1);
+    }
+  }
+#endif
+
+  db->init.busy = 0;
+  if( rc==SQLITE_OK && commit_internal ){
+    sqlite3CommitInternalChanges(db);
+  }
+
+  return rc;
+}
+
+/*
+** This routine is a no-op if the database schema is already initialised.
+** Otherwise, the schema is loaded. An error code is returned.
+*/
+int sqlite3ReadSchema(Parse *pParse){
+  int rc = SQLITE_OK;
+  sqlite3 *db = pParse->db;
+  assert( sqlite3_mutex_held(db->mutex) );
+  if( !db->init.busy ){
+    rc = sqlite3Init(db, &pParse->zErrMsg);
+  }
+  if( rc!=SQLITE_OK ){
+    pParse->rc = rc;
+    pParse->nErr++;
+  }
+  return rc;
+}
+
+
+/*
+** Check schema cookies in all databases.  If any cookie is out
+** of date, return 0.  If all schema cookies are current, return 1.
+*/
+static int schemaIsValid(sqlite3 *db){
+  int iDb;
+  int rc;
+  BtCursor *curTemp;
+  int cookie;
+  int allOk = 1;
+
+  assert( sqlite3_mutex_held(db->mutex) );
+  for(iDb=0; allOk && iDb<db->nDb; iDb++){
+    Btree *pBt;
+    pBt = db->aDb[iDb].pBt;
+    if( pBt==0 ) continue;
+    rc = sqlite3BtreeCursor(pBt, MASTER_ROOT, 0, 0, 0, &curTemp);
+    if( rc==SQLITE_OK ){
+      rc = sqlite3BtreeGetMeta(pBt, 1, (u32 *)&cookie);
+      if( rc==SQLITE_OK && cookie!=db->aDb[iDb].pSchema->schema_cookie ){
+        allOk = 0;
+      }
+      sqlite3BtreeCloseCursor(curTemp);
+    }
+    if( rc==SQLITE_NOMEM || rc==SQLITE_IOERR_NOMEM ){
+      db->mallocFailed = 1;
+    }
+  }
+  return allOk;
+}
+
+/*
+** Convert a schema pointer into the iDb index that indicates
+** which database file in db->aDb[] the schema refers to.
+**
+** If the same database is attached more than once, the first
+** attached database is returned.
+*/
+int sqlite3SchemaToIndex(sqlite3 *db, Schema *pSchema){
+  int i = -1000000;
+
+  /* If pSchema is NULL, then return -1000000. This happens when code in
+  ** expr.c is trying to resolve a reference to a transient table (i.e. one
+  ** created by a sub-select). In this case the return value of this
+  ** function should never be used.
+  **
+  ** We return -1000000 instead of the more usual -1 simply because using
+  ** -1000000 as incorrectly using -1000000 index into db->aDb[] is much
+  ** more likely to cause a segfault than -1 (of course there are assert()
+  ** statements too, but it never hurts to play the odds).
+  */
+  assert( sqlite3_mutex_held(db->mutex) );
+  if( pSchema ){
+    for(i=0; i<db->nDb; i++){
+      if( db->aDb[i].pSchema==pSchema ){
+        break;
+      }
+    }
+    assert( i>=0 &&i>=0 &&  i<db->nDb );
+  }
+  return i;
+}
+
+/*
+** Compile the UTF-8 encoded SQL statement zSql into a statement handle.
+*/
+static int sqlite3Prepare(
+  sqlite3 *db,              /* Database handle. */
+  const char *zSql,         /* UTF-8 encoded SQL statement. */
+  int nBytes,               /* Length of zSql in bytes. */
+  int saveSqlFlag,          /* True to copy SQL text into the sqlite3_stmt */
+  sqlite3_stmt **ppStmt,    /* OUT: A pointer to the prepared statement */
+  const char **pzTail       /* OUT: End of parsed string */
+){
+  Parse sParse;
+  char *zErrMsg = 0;
+  int rc = SQLITE_OK;
+  int i;
+
+  assert( ppStmt );
+  *ppStmt = 0;
+  if( sqlite3SafetyOn(db) ){
+    return SQLITE_MISUSE;
+  }
+  assert( !db->mallocFailed );
+  assert( sqlite3_mutex_held(db->mutex) );
+
+  /* If any attached database schemas are locked, do not proceed with
+  ** compilation. Instead return SQLITE_LOCKED immediately.
+  */
+  for(i=0; i<db->nDb; i++) {
+    Btree *pBt = db->aDb[i].pBt;
+    if( pBt ){
+      int rc;
+      rc = sqlite3BtreeSchemaLocked(pBt);
+      if( rc ){
+        const char *zDb = db->aDb[i].zName;
+        sqlite3Error(db, SQLITE_LOCKED, "database schema is locked: %s", zDb);
+        (void)sqlite3SafetyOff(db);
+        return SQLITE_LOCKED;
+      }
+    }
+  }
+
+  memset(&sParse, 0, sizeof(sParse));
+  sParse.db = db;
+  if( nBytes>=0 && zSql[nBytes]!=0 ){
+    char *zSqlCopy;
+    if( SQLITE_MAX_SQL_LENGTH>0 && nBytes>SQLITE_MAX_SQL_LENGTH ){
+      sqlite3Error(db, SQLITE_TOOBIG, "statement too long");
+      (void)sqlite3SafetyOff(db);
+      return SQLITE_TOOBIG;
+    }
+    zSqlCopy = sqlite3DbStrNDup(db, zSql, nBytes);
+    if( zSqlCopy ){
+      sqlite3RunParser(&sParse, zSqlCopy, &zErrMsg);
+      sqlite3_free(zSqlCopy);
+    }
+    sParse.zTail = &zSql[nBytes];
+  }else{
+    sqlite3RunParser(&sParse, zSql, &zErrMsg);
+  }
+
+  if( db->mallocFailed ){
+    sParse.rc = SQLITE_NOMEM;
+  }
+  if( sParse.rc==SQLITE_DONE ) sParse.rc = SQLITE_OK;
+  if( sParse.checkSchema && !schemaIsValid(db) ){
+    sParse.rc = SQLITE_SCHEMA;
+  }
+  if( sParse.rc==SQLITE_SCHEMA ){
+    sqlite3ResetInternalSchema(db, 0);
+  }
+  if( db->mallocFailed ){
+    sParse.rc = SQLITE_NOMEM;
+  }
+  if( pzTail ){
+    *pzTail = sParse.zTail;
+  }
+  rc = sParse.rc;
+
+#ifndef SQLITE_OMIT_EXPLAIN
+  if( rc==SQLITE_OK && sParse.pVdbe && sParse.explain ){
+    if( sParse.explain==2 ){
+      sqlite3VdbeSetNumCols(sParse.pVdbe, 3);
+      sqlite3VdbeSetColName(sParse.pVdbe, 0, COLNAME_NAME, "order", P4_STATIC);
+      sqlite3VdbeSetColName(sParse.pVdbe, 1, COLNAME_NAME, "from", P4_STATIC);
+      sqlite3VdbeSetColName(sParse.pVdbe, 2, COLNAME_NAME, "detail", P4_STATIC);
+    }else{
+      sqlite3VdbeSetNumCols(sParse.pVdbe, 8);
+      sqlite3VdbeSetColName(sParse.pVdbe, 0, COLNAME_NAME, "addr", P4_STATIC);
+      sqlite3VdbeSetColName(sParse.pVdbe, 1, COLNAME_NAME, "opcode", P4_STATIC);
+      sqlite3VdbeSetColName(sParse.pVdbe, 2, COLNAME_NAME, "p1", P4_STATIC);
+      sqlite3VdbeSetColName(sParse.pVdbe, 3, COLNAME_NAME, "p2", P4_STATIC);
+      sqlite3VdbeSetColName(sParse.pVdbe, 4, COLNAME_NAME, "p3", P4_STATIC);
+      sqlite3VdbeSetColName(sParse.pVdbe, 5, COLNAME_NAME, "p4", P4_STATIC);
+      sqlite3VdbeSetColName(sParse.pVdbe, 6, COLNAME_NAME, "p5", P4_STATIC);
+      sqlite3VdbeSetColName(sParse.pVdbe, 7, COLNAME_NAME, "comment",P4_STATIC);
+    }
+  }
+#endif
+
+  if( sqlite3SafetyOff(db) ){
+    rc = SQLITE_MISUSE;
+  }
+
+  if( saveSqlFlag ){
+    sqlite3VdbeSetSql(sParse.pVdbe, zSql, sParse.zTail - zSql);
+  }
+  if( rc!=SQLITE_OK || db->mallocFailed ){
+    sqlite3_finalize((sqlite3_stmt*)sParse.pVdbe);
+    assert(!(*ppStmt));
+  }else{
+    *ppStmt = (sqlite3_stmt*)sParse.pVdbe;
+  }
+
+  if( zErrMsg ){
+    sqlite3Error(db, rc, "%s", zErrMsg);
+    sqlite3_free(zErrMsg);
+  }else{
+    sqlite3Error(db, rc, 0);
+  }
+
+  rc = sqlite3ApiExit(db, rc);
+  assert( (rc&db->errMask)==rc );
+  return rc;
+}
+static int sqlite3LockAndPrepare(
+  sqlite3 *db,              /* Database handle. */
+  const char *zSql,         /* UTF-8 encoded SQL statement. */
+  int nBytes,               /* Length of zSql in bytes. */
+  int saveSqlFlag,          /* True to copy SQL text into the sqlite3_stmt */
+  sqlite3_stmt **ppStmt,    /* OUT: A pointer to the prepared statement */
+  const char **pzTail       /* OUT: End of parsed string */
+){
+  int rc;
+  if( !sqlite3SafetyCheckOk(db) ){
+    return SQLITE_MISUSE;
+  }
+  sqlite3_mutex_enter(db->mutex);
+  sqlite3BtreeEnterAll(db);
+  rc = sqlite3Prepare(db, zSql, nBytes, saveSqlFlag, ppStmt, pzTail);
+  sqlite3BtreeLeaveAll(db);
+  sqlite3_mutex_leave(db->mutex);
+  return rc;
+}
+
+/*
+** Rerun the compilation of a statement after a schema change.
+** Return true if the statement was recompiled successfully.
+** Return false if there is an error of some kind.
+*/
+int sqlite3Reprepare(Vdbe *p){
+  int rc;
+  sqlite3_stmt *pNew;
+  const char *zSql;
+  sqlite3 *db;
+
+  assert( sqlite3_mutex_held(sqlite3VdbeDb(p)->mutex) );
+  zSql = sqlite3_sql((sqlite3_stmt *)p);
+  assert( zSql!=0 );  /* Reprepare only called for prepare_v2() statements */
+  db = sqlite3VdbeDb(p);
+  assert( sqlite3_mutex_held(db->mutex) );
+  rc = sqlite3LockAndPrepare(db, zSql, -1, 0, &pNew, 0);
+  if( rc ){
+    if( rc==SQLITE_NOMEM ){
+      db->mallocFailed = 1;
+    }
+    assert( pNew==0 );
+    return 0;
+  }else{
+    assert( pNew!=0 );
+  }
+  sqlite3VdbeSwap((Vdbe*)pNew, p);
+  sqlite3_transfer_bindings(pNew, (sqlite3_stmt*)p);
+  sqlite3VdbeResetStepResult((Vdbe*)pNew);
+  sqlite3VdbeFinalize((Vdbe*)pNew);
+  return 1;
+}
+
+
+/*
+** Two versions of the official API.  Legacy and new use.  In the legacy
+** version, the original SQL text is not saved in the prepared statement
+** and so if a schema change occurs, SQLITE_SCHEMA is returned by
+** sqlite3_step().  In the new version, the original SQL text is retained
+** and the statement is automatically recompiled if an schema change
+** occurs.
+*/
+int sqlite3_prepare(
+  sqlite3 *db,              /* Database handle. */
+  const char *zSql,         /* UTF-8 encoded SQL statement. */
+  int nBytes,               /* Length of zSql in bytes. */
+  sqlite3_stmt **ppStmt,    /* OUT: A pointer to the prepared statement */
+  const char **pzTail       /* OUT: End of parsed string */
+){
+  int rc;
+  rc = sqlite3LockAndPrepare(db,zSql,nBytes,0,ppStmt,pzTail);
+  assert( rc==SQLITE_OK || ppStmt==0 || *ppStmt==0 );  /* VERIFY: F13021 */
+  return rc;
+}
+int sqlite3_prepare_v2(
+  sqlite3 *db,              /* Database handle. */
+  const char *zSql,         /* UTF-8 encoded SQL statement. */
+  int nBytes,               /* Length of zSql in bytes. */
+  sqlite3_stmt **ppStmt,    /* OUT: A pointer to the prepared statement */
+  const char **pzTail       /* OUT: End of parsed string */
+){
+  int rc;
+  rc = sqlite3LockAndPrepare(db,zSql,nBytes,1,ppStmt,pzTail);
+  assert( rc==SQLITE_OK || ppStmt==0 || *ppStmt==0 );  /* VERIFY: F13021 */
+  return rc;
+}
+
+
+#ifndef SQLITE_OMIT_UTF16
+/*
+** Compile the UTF-16 encoded SQL statement zSql into a statement handle.
+*/
+static int sqlite3Prepare16(
+  sqlite3 *db,              /* Database handle. */
+  const void *zSql,         /* UTF-8 encoded SQL statement. */
+  int nBytes,               /* Length of zSql in bytes. */
+  int saveSqlFlag,          /* True to save SQL text into the sqlite3_stmt */
+  sqlite3_stmt **ppStmt,    /* OUT: A pointer to the prepared statement */
+  const void **pzTail       /* OUT: End of parsed string */
+){
+  /* This function currently works by first transforming the UTF-16
+  ** encoded string to UTF-8, then invoking sqlite3_prepare(). The
+  ** tricky bit is figuring out the pointer to return in *pzTail.
+  */
+  char *zSql8;
+  const char *zTail8 = 0;
+  int rc = SQLITE_OK;
+
+  if( !sqlite3SafetyCheckOk(db) ){
+    return SQLITE_MISUSE;
+  }
+  sqlite3_mutex_enter(db->mutex);
+  zSql8 = sqlite3Utf16to8(db, zSql, nBytes);
+  if( zSql8 ){
+    rc = sqlite3LockAndPrepare(db, zSql8, -1, saveSqlFlag, ppStmt, &zTail8);
+  }
+
+  if( zTail8 && pzTail ){
+    /* If sqlite3_prepare returns a tail pointer, we calculate the
+    ** equivalent pointer into the UTF-16 string by counting the unicode
+    ** characters between zSql8 and zTail8, and then returning a pointer
+    ** the same number of characters into the UTF-16 string.
+    */
+    int chars_parsed = sqlite3Utf8CharLen(zSql8, zTail8-zSql8);
+    *pzTail = (u8 *)zSql + sqlite3Utf16ByteLen(zSql, chars_parsed);
+  }
+  sqlite3_free(zSql8);
+  rc = sqlite3ApiExit(db, rc);
+  sqlite3_mutex_leave(db->mutex);
+  return rc;
+}
+
+/*
+** Two versions of the official API.  Legacy and new use.  In the legacy
+** version, the original SQL text is not saved in the prepared statement
+** and so if a schema change occurs, SQLITE_SCHEMA is returned by
+** sqlite3_step().  In the new version, the original SQL text is retained
+** and the statement is automatically recompiled if an schema change
+** occurs.
+*/
+int sqlite3_prepare16(
+  sqlite3 *db,              /* Database handle. */
+  const void *zSql,         /* UTF-8 encoded SQL statement. */
+  int nBytes,               /* Length of zSql in bytes. */
+  sqlite3_stmt **ppStmt,    /* OUT: A pointer to the prepared statement */
+  const void **pzTail       /* OUT: End of parsed string */
+){
+  int rc;
+  rc = sqlite3Prepare16(db,zSql,nBytes,0,ppStmt,pzTail);
+  assert( rc==SQLITE_OK || ppStmt==0 || *ppStmt==0 );  /* VERIFY: F13021 */
+  return rc;
+}
+int sqlite3_prepare16_v2(
+  sqlite3 *db,              /* Database handle. */
+  const void *zSql,         /* UTF-8 encoded SQL statement. */
+  int nBytes,               /* Length of zSql in bytes. */
+  sqlite3_stmt **ppStmt,    /* OUT: A pointer to the prepared statement */
+  const void **pzTail       /* OUT: End of parsed string */
+){
+  int rc;
+  rc = sqlite3Prepare16(db,zSql,nBytes,1,ppStmt,pzTail);
+  assert( rc==SQLITE_OK || ppStmt==0 || *ppStmt==0 );  /* VERIFY: F13021 */
+  return rc;
+}
+
+#endif /* SQLITE_OMIT_UTF16 */
diff --git a/uppsrc/plugin/sqlite3/lib/printf.c b/uppsrc/plugin/sqlite3/lib/printf.c
new file mode 100644
index 000000000..ab417e033
--- /dev/null
+++ b/uppsrc/plugin/sqlite3/lib/printf.c
@@ -0,0 +1,904 @@
+/*
+** The "printf" code that follows dates from the 1980's.  It is in
+** the public domain.  The original comments are included here for
+** completeness.  They are very out-of-date but might be useful as
+** an historical reference.  Most of the "enhancements" have been backed
+** out so that the functionality is now the same as standard printf().
+**
+**************************************************************************
+**
+** The following modules is an enhanced replacement for the "printf" subroutines
+** found in the standard C library.  The following enhancements are
+** supported:
+**
+**      +  Additional functions.  The standard set of "printf" functions
+**         includes printf, fprintf, sprintf, vprintf, vfprintf, and
+**         vsprintf.  This module adds the following:
+**
+**           *  snprintf -- Works like sprintf, but has an extra argument
+**                          which is the size of the buffer written to.
+**
+**           *  mprintf --  Similar to sprintf.  Writes output to memory
+**                          obtained from malloc.
+**
+**           *  xprintf --  Calls a function to dispose of output.
+**
+**           *  nprintf --  No output, but returns the number of characters
+**                          that would have been output by printf.
+**
+**           *  A v- version (ex: vsnprintf) of every function is also
+**              supplied.
+**
+**      +  A few extensions to the formatting notation are supported:
+**
+**           *  The "=" flag (similar to "-") causes the output to be
+**              be centered in the appropriately sized field.
+**
+**           *  The %b field outputs an integer in binary notation.
+**
+**           *  The %c field now accepts a precision.  The character output
+**              is repeated by the number of times the precision specifies.
+**
+**           *  The %' field works like %c, but takes as its character the
+**              next character of the format string, instead of the next
+**              argument.  For example,  printf("%.78'-")  prints 78 minus
+**              signs, the same as  printf("%.78c",'-').
+**
+**      +  When compiled using GCC on a SPARC, this version of printf is
+**         faster than the library printf for SUN OS 4.1.
+**
+**      +  All functions are fully reentrant.
+**
+*/
+#include "sqliteInt.h"
+
+/*
+** Conversion types fall into various categories as defined by the
+** following enumeration.
+*/
+#define etRADIX       1 /* Integer types.  %d, %x, %o, and so forth */
+#define etFLOAT       2 /* Floating point.  %f */
+#define etEXP         3 /* Exponentional notation. %e and %E */
+#define etGENERIC     4 /* Floating or exponential, depending on exponent. %g */
+#define etSIZE        5 /* Return number of characters processed so far. %n */
+#define etSTRING      6 /* Strings. %s */
+#define etDYNSTRING   7 /* Dynamically allocated strings. %z */
+#define etPERCENT     8 /* Percent symbol. %% */
+#define etCHARX       9 /* Characters. %c */
+/* The rest are extensions, not normally found in printf() */
+#define etCHARLIT    10 /* Literal characters.  %' */
+#define etSQLESCAPE  11 /* Strings with '\'' doubled.  %q */
+#define etSQLESCAPE2 12 /* Strings with '\'' doubled and enclosed in '',
+                          NULL pointers replaced by SQL NULL.  %Q */
+#define etTOKEN      13 /* a pointer to a Token structure */
+#define etSRCLIST    14 /* a pointer to a SrcList */
+#define etPOINTER    15 /* The %p conversion */
+#define etSQLESCAPE3 16 /* %w -> Strings with '\"' doubled */
+#define etORDINAL    17 /* %r -> 1st, 2nd, 3rd, 4th, etc.  English only */
+
+
+/*
+** An "etByte" is an 8-bit unsigned value.
+*/
+typedef unsigned char etByte;
+
+/*
+** Each builtin conversion character (ex: the 'd' in "%d") is described
+** by an instance of the following structure
+*/
+typedef struct et_info {   /* Information about each format field */
+  char fmttype;            /* The format field code letter */
+  etByte base;             /* The base for radix conversion */
+  etByte flags;            /* One or more of FLAG_ constants below */
+  etByte type;             /* Conversion paradigm */
+  etByte charset;          /* Offset into aDigits[] of the digits string */
+  etByte prefix;           /* Offset into aPrefix[] of the prefix string */
+} et_info;
+
+/*
+** Allowed values for et_info.flags
+*/
+#define FLAG_SIGNED  1     /* True if the value to convert is signed */
+#define FLAG_INTERN  2     /* True if for internal use only */
+#define FLAG_STRING  4     /* Allow infinity precision */
+
+
+/*
+** The following table is searched linearly, so it is good to put the
+** most frequently used conversion types first.
+*/
+static const char aDigits[] = "0123456789ABCDEF0123456789abcdef";
+static const char aPrefix[] = "-x0\000X0";
+static const et_info fmtinfo[] = {
+  {  'd', 10, 1, etRADIX,      0,  0 },
+  {  's',  0, 4, etSTRING,     0,  0 },
+  {  'g',  0, 1, etGENERIC,    30, 0 },
+  {  'z',  0, 4, etDYNSTRING,  0,  0 },
+  {  'q',  0, 4, etSQLESCAPE,  0,  0 },
+  {  'Q',  0, 4, etSQLESCAPE2, 0,  0 },
+  {  'w',  0, 4, etSQLESCAPE3, 0,  0 },
+  {  'c',  0, 0, etCHARX,      0,  0 },
+  {  'o',  8, 0, etRADIX,      0,  2 },
+  {  'u', 10, 0, etRADIX,      0,  0 },
+  {  'x', 16, 0, etRADIX,      16, 1 },
+  {  'X', 16, 0, etRADIX,      0,  4 },
+#ifndef SQLITE_OMIT_FLOATING_POINT
+  {  'f',  0, 1, etFLOAT,      0,  0 },
+  {  'e',  0, 1, etEXP,        30, 0 },
+  {  'E',  0, 1, etEXP,        14, 0 },
+  {  'G',  0, 1, etGENERIC,    14, 0 },
+#endif
+  {  'i', 10, 1, etRADIX,      0,  0 },
+  {  'n',  0, 0, etSIZE,       0,  0 },
+  {  '%',  0, 0, etPERCENT,    0,  0 },
+  {  'p', 16, 0, etPOINTER,    0,  1 },
+  {  'T',  0, 2, etTOKEN,      0,  0 },
+  {  'S',  0, 2, etSRCLIST,    0,  0 },
+  {  'r', 10, 3, etORDINAL,    0,  0 },
+};
+#define etNINFO  (sizeof(fmtinfo)/sizeof(fmtinfo[0]))
+
+/*
+** If SQLITE_OMIT_FLOATING_POINT is defined, then none of the floating point
+** conversions will work.
+*/
+#ifndef SQLITE_OMIT_FLOATING_POINT
+/*
+** "*val" is a double such that 0.1 <= *val < 10.0
+** Return the ascii code for the leading digit of *val, then
+** multiply "*val" by 10.0 to renormalize.
+**
+** Example:
+**     input:     *val = 3.14159
+**     output:    *val = 1.4159    function return = '3'
+**
+** The counter *cnt is incremented each time.  After counter exceeds
+** 16 (the number of significant digits in a 64-bit float) '0' is
+** always returned.
+*/
+static int et_getdigit(LONGDOUBLE_TYPE *val, int *cnt){
+  int digit;
+  LONGDOUBLE_TYPE d;
+  if( (*cnt)++ >= 16 ) return '0';
+  digit = (int)*val;
+  d = digit;
+  digit += '0';
+  *val = (*val - d)*10.0;
+  return digit;
+}
+#endif /* SQLITE_OMIT_FLOATING_POINT */
+
+/*
+** Append N space characters to the given string buffer.
+*/
+static void appendSpace(StrAccum *pAccum, int N){
+  static const char zSpaces[] = "                             ";
+  while( N>=sizeof(zSpaces)-1 ){
+    sqlite3StrAccumAppend(pAccum, zSpaces, sizeof(zSpaces)-1);
+    N -= sizeof(zSpaces)-1;
+  }
+  if( N>0 ){
+    sqlite3StrAccumAppend(pAccum, zSpaces, N);
+  }
+}
+
+/*
+** On machines with a small stack size, you can redefine the
+** SQLITE_PRINT_BUF_SIZE to be less than 350.  But beware - for
+** smaller values some %f conversions may go into an infinite loop.
+*/
+#ifndef SQLITE_PRINT_BUF_SIZE
+# define SQLITE_PRINT_BUF_SIZE 350
+#endif
+#define etBUFSIZE SQLITE_PRINT_BUF_SIZE  /* Size of the output buffer */
+
+/*
+** The root program.  All variations call this core.
+**
+** INPUTS:
+**   func   This is a pointer to a function taking three arguments
+**            1. A pointer to anything.  Same as the "arg" parameter.
+**            2. A pointer to the list of characters to be output
+**               (Note, this list is NOT null terminated.)
+**            3. An integer number of characters to be output.
+**               (Note: This number might be zero.)
+**
+**   arg    This is the pointer to anything which will be passed as the
+**          first argument to "func".  Use it for whatever you like.
+**
+**   fmt    This is the format string, as in the usual print.
+**
+**   ap     This is a pointer to a list of arguments.  Same as in
+**          vfprint.
+**
+** OUTPUTS:
+**          The return value is the total number of characters sent to
+**          the function "func".  Returns -1 on a error.
+**
+** Note that the order in which automatic variables are declared below
+** seems to make a big difference in determining how fast this beast
+** will run.
+*/
+static void vxprintf(
+  StrAccum *pAccum,                  /* Accumulate results here */
+  int useExtended,                   /* Allow extended %-conversions */
+  const char *fmt,                   /* Format string */
+  va_list ap                         /* arguments */
+){
+  int c;                     /* Next character in the format string */
+  char *bufpt;               /* Pointer to the conversion buffer */
+  int precision;             /* Precision of the current field */
+  int length;                /* Length of the field */
+  int idx;                   /* A general purpose loop counter */
+  int width;                 /* Width of the current field */
+  etByte flag_leftjustify;   /* True if "-" flag is present */
+  etByte flag_plussign;      /* True if "+" flag is present */
+  etByte flag_blanksign;     /* True if " " flag is present */
+  etByte flag_alternateform; /* True if "#" flag is present */
+  etByte flag_altform2;      /* True if "!" flag is present */
+  etByte flag_zeropad;       /* True if field width constant starts with zero */
+  etByte flag_long;          /* True if "l" flag is present */
+  etByte flag_longlong;      /* True if the "ll" flag is present */
+  etByte done;               /* Loop termination flag */
+  sqlite_uint64 longvalue;   /* Value for integer types */
+  LONGDOUBLE_TYPE realvalue; /* Value for real types */
+  const et_info *infop;      /* Pointer to the appropriate info structure */
+  char buf[etBUFSIZE];       /* Conversion buffer */
+  char prefix;               /* Prefix character.  "+" or "-" or " " or '\0'. */
+  etByte errorflag = 0;      /* True if an error is encountered */
+  etByte xtype;              /* Conversion paradigm */
+  char *zExtra;              /* Extra memory used for etTCLESCAPE conversions */
+#ifndef SQLITE_OMIT_FLOATING_POINT
+  int  exp, e2;              /* exponent of real numbers */
+  double rounder;            /* Used for rounding floating point values */
+  etByte flag_dp;            /* True if decimal point should be shown */
+  etByte flag_rtz;           /* True if trailing zeros should be removed */
+  etByte flag_exp;           /* True to force display of the exponent */
+  int nsd;                   /* Number of significant digits returned */
+#endif
+
+  length = 0;
+  bufpt = 0;
+  for(; (c=(*fmt))!=0; ++fmt){
+    if( c!='%' ){
+      int amt;
+      bufpt = (char *)fmt;
+      amt = 1;
+      while( (c=(*++fmt))!='%' && c!=0 ) amt++;
+      sqlite3StrAccumAppend(pAccum, bufpt, amt);
+      if( c==0 ) break;
+    }
+    if( (c=(*++fmt))==0 ){
+      errorflag = 1;
+      sqlite3StrAccumAppend(pAccum, "%", 1);
+      break;
+    }
+    /* Find out what flags are present */
+    flag_leftjustify = flag_plussign = flag_blanksign =
+     flag_alternateform = flag_altform2 = flag_zeropad = 0;
+    done = 0;
+    do{
+      switch( c ){
+        case '-':   flag_leftjustify = 1;     break;
+        case '+':   flag_plussign = 1;        break;
+        case ' ':   flag_blanksign = 1;       break;
+        case '#':   flag_alternateform = 1;   break;
+        case '!':   flag_altform2 = 1;        break;
+        case '0':   flag_zeropad = 1;         break;
+        default:    done = 1;                 break;
+      }
+    }while( !done && (c=(*++fmt))!=0 );
+    /* Get the field width */
+    width = 0;
+    if( c=='*' ){
+      width = va_arg(ap,int);
+      if( width<0 ){
+        flag_leftjustify = 1;
+        width = -width;
+      }
+      c = *++fmt;
+    }else{
+      while( c>='0' && c<='9' ){
+        width = width*10 + c - '0';
+        c = *++fmt;
+      }
+    }
+    if( width > etBUFSIZE-10 ){
+      width = etBUFSIZE-10;
+    }
+    /* Get the precision */
+    if( c=='.' ){
+      precision = 0;
+      c = *++fmt;
+      if( c=='*' ){
+        precision = va_arg(ap,int);
+        if( precision<0 ) precision = -precision;
+        c = *++fmt;
+      }else{
+        while( c>='0' && c<='9' ){
+          precision = precision*10 + c - '0';
+          c = *++fmt;
+        }
+      }
+    }else{
+      precision = -1;
+    }
+    /* Get the conversion type modifier */
+    if( c=='l' ){
+      flag_long = 1;
+      c = *++fmt;
+      if( c=='l' ){
+        flag_longlong = 1;
+        c = *++fmt;
+      }else{
+        flag_longlong = 0;
+      }
+    }else{
+      flag_long = flag_longlong = 0;
+    }
+    /* Fetch the info entry for the field */
+    infop = 0;
+    for(idx=0; idx<etNINFO; idx++){
+      if( c==fmtinfo[idx].fmttype ){
+        infop = &fmtinfo[idx];
+        if( useExtended || (infop->flags & FLAG_INTERN)==0 ){
+          xtype = infop->type;
+        }else{
+          return;
+        }
+        break;
+      }
+    }
+    zExtra = 0;
+    if( infop==0 ){
+      return;
+    }
+
+
+    /* Limit the precision to prevent overflowing buf[] during conversion */
+    if( precision>etBUFSIZE-40 && (infop->flags & FLAG_STRING)==0 ){
+      precision = etBUFSIZE-40;
+    }
+
+    /*
+    ** At this point, variables are initialized as follows:
+    **
+    **   flag_alternateform          TRUE if a '#' is present.
+    **   flag_altform2               TRUE if a '!' is present.
+    **   flag_plussign               TRUE if a '+' is present.
+    **   flag_leftjustify            TRUE if a '-' is present or if the
+    **                               field width was negative.
+    **   flag_zeropad                TRUE if the width began with 0.
+    **   flag_long                   TRUE if the letter 'l' (ell) prefixed
+    **                               the conversion character.
+    **   flag_longlong               TRUE if the letter 'll' (ell ell) prefixed
+    **                               the conversion character.
+    **   flag_blanksign              TRUE if a ' ' is present.
+    **   width                       The specified field width.  This is
+    **                               always non-negative.  Zero is the default.
+    **   precision                   The specified precision.  The default
+    **                               is -1.
+    **   xtype                       The class of the conversion.
+    **   infop                       Pointer to the appropriate info struct.
+    */
+    switch( xtype ){
+      case etPOINTER:
+        flag_longlong = sizeof(char*)==sizeof(i64);
+        flag_long = sizeof(char*)==sizeof(long int);
+        /* Fall through into the next case */
+      case etORDINAL:
+      case etRADIX:
+        if( infop->flags & FLAG_SIGNED ){
+          i64 v;
+          if( flag_longlong )   v = va_arg(ap,i64);
+          else if( flag_long )  v = va_arg(ap,long int);
+          else                  v = va_arg(ap,int);
+          if( v<0 ){
+            longvalue = -v;
+            prefix = '-';
+          }else{
+            longvalue = v;
+            if( flag_plussign )        prefix = '+';
+            else if( flag_blanksign )  prefix = ' ';
+            else                       prefix = 0;
+          }
+        }else{
+          if( flag_longlong )   longvalue = va_arg(ap,u64);
+          else if( flag_long )  longvalue = va_arg(ap,unsigned long int);
+          else                  longvalue = va_arg(ap,unsigned int);
+          prefix = 0;
+        }
+        if( longvalue==0 ) flag_alternateform = 0;
+        if( flag_zeropad && precision<width-(prefix!=0) ){
+          precision = width-(prefix!=0);
+        }
+        bufpt = &buf[etBUFSIZE-1];
+        if( xtype==etORDINAL ){
+          static const char zOrd[] = "thstndrd";
+          int x = longvalue % 10;
+          if( x>=4 || (longvalue/10)%10==1 ){
+            x = 0;
+          }
+          buf[etBUFSIZE-3] = zOrd[x*2];
+          buf[etBUFSIZE-2] = zOrd[x*2+1];
+          bufpt -= 2;
+        }
+        {
+          register const char *cset;      /* Use registers for speed */
+          register int base;
+          cset = &aDigits[infop->charset];
+          base = infop->base;
+          do{                                           /* Convert to ascii */
+            *(--bufpt) = cset[longvalue%base];
+            longvalue = longvalue/base;
+          }while( longvalue>0 );
+        }
+        length = &buf[etBUFSIZE-1]-bufpt;
+        for(idx=precision-length; idx>0; idx--){
+          *(--bufpt) = '0';                             /* Zero pad */
+        }
+        if( prefix ) *(--bufpt) = prefix;               /* Add sign */
+        if( flag_alternateform && infop->prefix ){      /* Add "0" or "0x" */
+          const char *pre;
+          char x;
+          pre = &aPrefix[infop->prefix];
+          if( *bufpt!=pre[0] ){
+            for(; (x=(*pre))!=0; pre++) *(--bufpt) = x;
+          }
+        }
+        length = &buf[etBUFSIZE-1]-bufpt;
+        break;
+      case etFLOAT:
+      case etEXP:
+      case etGENERIC:
+        realvalue = va_arg(ap,double);
+#ifndef SQLITE_OMIT_FLOATING_POINT
+        if( precision<0 ) precision = 6;         /* Set default precision */
+        if( precision>etBUFSIZE/2-10 ) precision = etBUFSIZE/2-10;
+        if( realvalue<0.0 ){
+          realvalue = -realvalue;
+          prefix = '-';
+        }else{
+          if( flag_plussign )          prefix = '+';
+          else if( flag_blanksign )    prefix = ' ';
+          else                         prefix = 0;
+        }
+        if( xtype==etGENERIC && precision>0 ) precision--;
+#if 0
+        /* Rounding works like BSD when the constant 0.4999 is used.  Wierd! */
+        for(idx=precision, rounder=0.4999; idx>0; idx--, rounder*=0.1);
+#else
+        /* It makes more sense to use 0.5 */
+        for(idx=precision, rounder=0.5; idx>0; idx--, rounder*=0.1){}
+#endif
+        if( xtype==etFLOAT ) realvalue += rounder;
+        /* Normalize realvalue to within 10.0 > realvalue >= 1.0 */
+        exp = 0;
+        if( sqlite3_isnan(realvalue) ){
+          bufpt = "NaN";
+          length = 3;
+          break;
+        }
+        if( realvalue>0.0 ){
+          while( realvalue>=1e32 && exp<=350 ){ realvalue *= 1e-32; exp+=32; }
+          while( realvalue>=1e8 && exp<=350 ){ realvalue *= 1e-8; exp+=8; }
+          while( realvalue>=10.0 && exp<=350 ){ realvalue *= 0.1; exp++; }
+          while( realvalue<1e-8 && exp>=-350 ){ realvalue *= 1e8; exp-=8; }
+          while( realvalue<1.0 && exp>=-350 ){ realvalue *= 10.0; exp--; }
+          if( exp>350 || exp<-350 ){
+            if( prefix=='-' ){
+              bufpt = "-Inf";
+            }else if( prefix=='+' ){
+              bufpt = "+Inf";
+            }else{
+              bufpt = "Inf";
+            }
+            length = strlen(bufpt);
+            break;
+          }
+        }
+        bufpt = buf;
+        /*
+        ** If the field type is etGENERIC, then convert to either etEXP
+        ** or etFLOAT, as appropriate.
+        */
+        flag_exp = xtype==etEXP;
+        if( xtype!=etFLOAT ){
+          realvalue += rounder;
+          if( realvalue>=10.0 ){ realvalue *= 0.1; exp++; }
+        }
+        if( xtype==etGENERIC ){
+          flag_rtz = !flag_alternateform;
+          if( exp<-4 || exp>precision ){
+            xtype = etEXP;
+          }else{
+            precision = precision - exp;
+            xtype = etFLOAT;
+          }
+        }else{
+          flag_rtz = 0;
+        }
+        if( xtype==etEXP ){
+          e2 = 0;
+        }else{
+          e2 = exp;
+        }
+        nsd = 0;
+        flag_dp = (precision>0) | flag_alternateform | flag_altform2;
+        /* The sign in front of the number */
+        if( prefix ){
+          *(bufpt++) = prefix;
+        }
+        /* Digits prior to the decimal point */
+        if( e2<0 ){
+          *(bufpt++) = '0';
+        }else{
+          for(; e2>=0; e2--){
+            *(bufpt++) = et_getdigit(&realvalue,&nsd);
+          }
+        }
+        /* The decimal point */
+        if( flag_dp ){
+          *(bufpt++) = '.';
+        }
+        /* "0" digits after the decimal point but before the first
+        ** significant digit of the number */
+        for(e2++; e2<0 && precision>0; precision--, e2++){
+          *(bufpt++) = '0';
+        }
+        /* Significant digits after the decimal point */
+        while( (precision--)>0 ){
+          *(bufpt++) = et_getdigit(&realvalue,&nsd);
+        }
+        /* Remove trailing zeros and the "." if no digits follow the "." */
+        if( flag_rtz && flag_dp ){
+          while( bufpt[-1]=='0' ) *(--bufpt) = 0;
+          assert( bufpt>buf );
+          if( bufpt[-1]=='.' ){
+            if( flag_altform2 ){
+              *(bufpt++) = '0';
+            }else{
+              *(--bufpt) = 0;
+            }
+          }
+        }
+        /* Add the "eNNN" suffix */
+        if( flag_exp || (xtype==etEXP && exp) ){
+          *(bufpt++) = aDigits[infop->charset];
+          if( exp<0 ){
+            *(bufpt++) = '-'; exp = -exp;
+          }else{
+            *(bufpt++) = '+';
+          }
+          if( exp>=100 ){
+            *(bufpt++) = (exp/100)+'0';                /* 100's digit */
+            exp %= 100;
+          }
+          *(bufpt++) = exp/10+'0';                     /* 10's digit */
+          *(bufpt++) = exp%10+'0';                     /* 1's digit */
+        }
+        *bufpt = 0;
+
+        /* The converted number is in buf[] and zero terminated. Output it.
+        ** Note that the number is in the usual order, not reversed as with
+        ** integer conversions. */
+        length = bufpt-buf;
+        bufpt = buf;
+
+        /* Special case:  Add leading zeros if the flag_zeropad flag is
+        ** set and we are not left justified */
+        if( flag_zeropad && !flag_leftjustify && length < width){
+          int i;
+          int nPad = width - length;
+          for(i=width; i>=nPad; i--){
+            bufpt[i] = bufpt[i-nPad];
+          }
+          i = prefix!=0;
+          while( nPad-- ) bufpt[i++] = '0';
+          length = width;
+        }
+#endif
+        break;
+      case etSIZE:
+        *(va_arg(ap,int*)) = pAccum->nChar;
+        length = width = 0;
+        break;
+      case etPERCENT:
+        buf[0] = '%';
+        bufpt = buf;
+        length = 1;
+        break;
+      case etCHARLIT:
+      case etCHARX:
+        c = buf[0] = (xtype==etCHARX ? va_arg(ap,int) : *++fmt);
+        if( precision>=0 ){
+          for(idx=1; idx<precision; idx++) buf[idx] = c;
+          length = precision;
+        }else{
+          length =1;
+        }
+        bufpt = buf;
+        break;
+      case etSTRING:
+      case etDYNSTRING:
+        bufpt = va_arg(ap,char*);
+        if( bufpt==0 ){
+          bufpt = "";
+        }else if( xtype==etDYNSTRING ){
+          zExtra = bufpt;
+        }
+        length = strlen(bufpt);
+        if( precision>=0 && precision<length ) length = precision;
+        break;
+      case etSQLESCAPE:
+      case etSQLESCAPE2:
+      case etSQLESCAPE3: {
+        int i, j, n, ch, isnull;
+        int needQuote;
+        char q = ((xtype==etSQLESCAPE3)?'"':'\'');   /* Quote character */
+        char *escarg = va_arg(ap,char*);
+        isnull = escarg==0;
+        if( isnull ) escarg = (xtype==etSQLESCAPE2 ? "NULL" : "(NULL)");
+        for(i=n=0; (ch=escarg[i])!=0; i++){
+          if( ch==q )  n++;
+        }
+        needQuote = !isnull && xtype==etSQLESCAPE2;
+        n += i + 1 + needQuote*2;
+        if( n>etBUFSIZE ){
+          bufpt = zExtra = sqlite3_malloc( n );
+          if( bufpt==0 ) return;
+        }else{
+          bufpt = buf;
+        }
+        j = 0;
+        if( needQuote ) bufpt[j++] = q;
+        for(i=0; (ch=escarg[i])!=0; i++){
+          bufpt[j++] = ch;
+          if( ch==q ) bufpt[j++] = ch;
+        }
+        if( needQuote ) bufpt[j++] = q;
+        bufpt[j] = 0;
+        length = j;
+        /* The precision is ignored on %q and %Q */
+        /* if( precision>=0 && precision<length ) length = precision; */
+        break;
+      }
+      case etTOKEN: {
+        Token *pToken = va_arg(ap, Token*);
+        if( pToken && pToken->z ){
+          sqlite3StrAccumAppend(pAccum, (const char*)pToken->z, pToken->n);
+        }
+        length = width = 0;
+        break;
+      }
+      case etSRCLIST: {
+        SrcList *pSrc = va_arg(ap, SrcList*);
+        int k = va_arg(ap, int);
+        struct SrcList_item *pItem = &pSrc->a[k];
+        assert( k>=0 && k<pSrc->nSrc );
+        if( pItem->zDatabase && pItem->zDatabase[0] ){
+          sqlite3StrAccumAppend(pAccum, pItem->zDatabase, -1);
+          sqlite3StrAccumAppend(pAccum, ".", 1);
+        }
+        sqlite3StrAccumAppend(pAccum, pItem->zName, -1);
+        length = width = 0;
+        break;
+      }
+    }/* End switch over the format type */
+    /*
+    ** The text of the conversion is pointed to by "bufpt" and is
+    ** "length" characters long.  The field width is "width".  Do
+    ** the output.
+    */
+    if( !flag_leftjustify ){
+      register int nspace;
+      nspace = width-length;
+      if( nspace>0 ){
+        appendSpace(pAccum, nspace);
+      }
+    }
+    if( length>0 ){
+      sqlite3StrAccumAppend(pAccum, bufpt, length);
+    }
+    if( flag_leftjustify ){
+      register int nspace;
+      nspace = width-length;
+      if( nspace>0 ){
+        appendSpace(pAccum, nspace);
+      }
+    }
+    if( zExtra ){
+      sqlite3_free(zExtra);
+    }
+  }/* End for loop over the format string */
+} /* End of function */
+
+/*
+** Append N bytes of text from z to the StrAccum object.
+*/
+void sqlite3StrAccumAppend(StrAccum *p, const char *z, int N){
+  if( p->tooBig | p->mallocFailed ){
+    return;
+  }
+  if( N<0 ){
+    N = strlen(z);
+  }
+  if( N==0 ){
+    return;
+  }
+  if( p->nChar+N >= p->nAlloc ){
+    char *zNew;
+    if( !p->useMalloc ){
+      p->tooBig = 1;
+      N = p->nAlloc - p->nChar - 1;
+      if( N<=0 ){
+        return;
+      }
+    }else{
+      p->nAlloc += p->nAlloc + N + 1;
+      if( p->nAlloc > SQLITE_MAX_LENGTH ){
+        p->nAlloc = SQLITE_MAX_LENGTH;
+        if( p->nChar+N >= p->nAlloc ){
+          sqlite3StrAccumReset(p);
+          p->tooBig = 1;
+          return;
+        }
+      }
+      zNew = sqlite3_malloc( p->nAlloc );
+      if( zNew ){
+        memcpy(zNew, p->zText, p->nChar);
+        sqlite3StrAccumReset(p);
+        p->zText = zNew;
+      }else{
+        p->mallocFailed = 1;
+        sqlite3StrAccumReset(p);
+        return;
+      }
+    }
+  }
+  memcpy(&p->zText[p->nChar], z, N);
+  p->nChar += N;
+}
+
+/*
+** Finish off a string by making sure it is zero-terminated.
+** Return a pointer to the resulting string.  Return a NULL
+** pointer if any kind of error was encountered.
+*/
+char *sqlite3StrAccumFinish(StrAccum *p){
+  if( p->zText ){
+    p->zText[p->nChar] = 0;
+    if( p->useMalloc && p->zText==p->zBase ){
+      p->zText = sqlite3_malloc( p->nChar+1 );
+      if( p->zText ){
+        memcpy(p->zText, p->zBase, p->nChar+1);
+      }else{
+        p->mallocFailed = 1;
+      }
+    }
+  }
+  return p->zText;
+}
+
+/*
+** Reset an StrAccum string.  Reclaim all malloced memory.
+*/
+void sqlite3StrAccumReset(StrAccum *p){
+  if( p->zText!=p->zBase ){
+    sqlite3_free(p->zText);
+    p->zText = 0;
+  }
+}
+
+/*
+** Initialize a string accumulator
+*/
+static void sqlite3StrAccumInit(StrAccum *p, char *zBase, int n){
+  p->zText = p->zBase = zBase;
+  p->nChar = 0;
+  p->nAlloc = n;
+  p->useMalloc = 1;
+  p->tooBig = 0;
+  p->mallocFailed = 0;
+}
+
+/*
+** Print into memory obtained from sqliteMalloc().  Use the internal
+** %-conversion extensions.
+*/
+char *sqlite3VMPrintf(sqlite3 *db, const char *zFormat, va_list ap){
+  char *z;
+  char zBase[SQLITE_PRINT_BUF_SIZE];
+  StrAccum acc;
+  sqlite3StrAccumInit(&acc, zBase, sizeof(zBase));
+  vxprintf(&acc, 1, zFormat, ap);
+  z = sqlite3StrAccumFinish(&acc);
+  if( acc.mallocFailed && db ){
+    db->mallocFailed = 1;
+  }
+  return z;
+}
+
+/*
+** Print into memory obtained from sqliteMalloc().  Use the internal
+** %-conversion extensions.
+*/
+char *sqlite3MPrintf(sqlite3 *db, const char *zFormat, ...){
+  va_list ap;
+  char *z;
+  va_start(ap, zFormat);
+  z = sqlite3VMPrintf(db, zFormat, ap);
+  va_end(ap);
+  return z;
+}
+
+/*
+** Print into memory obtained from sqlite3_malloc().  Omit the internal
+** %-conversion extensions.
+*/
+char *sqlite3_vmprintf(const char *zFormat, va_list ap){
+  char *z;
+  char zBase[SQLITE_PRINT_BUF_SIZE];
+  StrAccum acc;
+  sqlite3StrAccumInit(&acc, zBase, sizeof(zBase));
+  vxprintf(&acc, 0, zFormat, ap);
+  z = sqlite3StrAccumFinish(&acc);
+  return z;
+}
+
+/*
+** Print into memory obtained from sqlite3_malloc()().  Omit the internal
+** %-conversion extensions.
+*/
+char *sqlite3_mprintf(const char *zFormat, ...){
+  va_list ap;
+  char *z;
+  va_start(ap, zFormat);
+  z = sqlite3_vmprintf(zFormat, ap);
+  va_end(ap);
+  return z;
+}
+
+/*
+** sqlite3_snprintf() works like snprintf() except that it ignores the
+** current locale settings.  This is important for SQLite because we
+** are not able to use a "," as the decimal point in place of "." as
+** specified by some locales.
+*/
+char *sqlite3_snprintf(int n, char *zBuf, const char *zFormat, ...){
+  char *z;
+  va_list ap;
+  StrAccum acc;
+
+  if( n<=0 ){
+    return zBuf;
+  }
+  sqlite3StrAccumInit(&acc, zBuf, n);
+  acc.useMalloc = 0;
+  va_start(ap,zFormat);
+  vxprintf(&acc, 0, zFormat, ap);
+  va_end(ap);
+  z = sqlite3StrAccumFinish(&acc);
+  return z;
+}
+
+#if defined(SQLITE_TEST) || defined(SQLITE_DEBUG) || defined(SQLITE_MEMDEBUG)
+/*
+** A version of printf() that understands %lld.  Used for debugging.
+** The printf() built into some versions of windows does not understand %lld
+** and segfaults if you give it a long long int.
+*/
+void sqlite3DebugPrintf(const char *zFormat, ...){
+  va_list ap;
+  StrAccum acc;
+  char zBuf[500];
+  sqlite3StrAccumInit(&acc, zBuf, sizeof(zBuf));
+  acc.useMalloc = 0;
+  va_start(ap,zFormat);
+  vxprintf(&acc, 0, zFormat, ap);
+  va_end(ap);
+  sqlite3StrAccumFinish(&acc);
+  fprintf(stdout,"%s", zBuf);
+  fflush(stdout);
+}
+#endif
diff --git a/uppsrc/plugin/sqlite3/lib/random.c b/uppsrc/plugin/sqlite3/lib/random.c
new file mode 100644
index 000000000..8684ce670
--- /dev/null
+++ b/uppsrc/plugin/sqlite3/lib/random.c
@@ -0,0 +1,121 @@
+/*
+** 2001 September 15
+**
+** The author disclaims copyright to this source code.  In place of
+** a legal notice, here is a blessing:
+**
+**    May you do good and not evil.
+**    May you find forgiveness for yourself and forgive others.
+**    May you share freely, never taking more than you give.
+**
+*************************************************************************
+** This file contains code to implement a pseudo-random number
+** generator (PRNG) for SQLite.
+**
+** Random numbers are used by some of the database backends in order
+** to generate random integer keys for tables or random filenames.
+**
+** $Id: random.c,v 1.21 2008/01/16 17:46:38 drh Exp $
+*/
+#include "sqliteInt.h"
+
+
+/* All threads share a single random number generator.
+** This structure is the current state of the generator.
+*/
+static struct sqlite3PrngType {
+  unsigned char isInit;          /* True if initialized */
+  unsigned char i, j;            /* State variables */
+  unsigned char s[256];          /* State variables */
+} sqlite3Prng;
+
+/*
+** Get a single 8-bit random value from the RC4 PRNG.  The Mutex
+** must be held while executing this routine.
+**
+** Why not just use a library random generator like lrand48() for this?
+** Because the OP_NewRowid opcode in the VDBE depends on having a very
+** good source of random numbers.  The lrand48() library function may
+** well be good enough.  But maybe not.  Or maybe lrand48() has some
+** subtle problems on some systems that could cause problems.  It is hard
+** to know.  To minimize the risk of problems due to bad lrand48()
+** implementations, SQLite uses this random number generator based
+** on RC4, which we know works very well.
+**
+** (Later):  Actually, OP_NewRowid does not depend on a good source of
+** randomness any more.  But we will leave this code in all the same.
+*/
+static int randomByte(void){
+  unsigned char t;
+
+
+  /* Initialize the state of the random number generator once,
+  ** the first time this routine is called.  The seed value does
+  ** not need to contain a lot of randomness since we are not
+  ** trying to do secure encryption or anything like that...
+  **
+  ** Nothing in this file or anywhere else in SQLite does any kind of
+  ** encryption.  The RC4 algorithm is being used as a PRNG (pseudo-random
+  ** number generator) not as an encryption device.
+  */
+  if( !sqlite3Prng.isInit ){
+    int i;
+    char k[256];
+    sqlite3Prng.j = 0;
+    sqlite3Prng.i = 0;
+    sqlite3OsRandomness(sqlite3_vfs_find(0), 256, k);
+    for(i=0; i<256; i++){
+      sqlite3Prng.s[i] = i;
+    }
+    for(i=0; i<256; i++){
+      sqlite3Prng.j += sqlite3Prng.s[i] + k[i];
+      t = sqlite3Prng.s[sqlite3Prng.j];
+      sqlite3Prng.s[sqlite3Prng.j] = sqlite3Prng.s[i];
+      sqlite3Prng.s[i] = t;
+    }
+    sqlite3Prng.isInit = 1;
+  }
+
+  /* Generate and return single random byte
+  */
+  sqlite3Prng.i++;
+  t = sqlite3Prng.s[sqlite3Prng.i];
+  sqlite3Prng.j += t;
+  sqlite3Prng.s[sqlite3Prng.i] = sqlite3Prng.s[sqlite3Prng.j];
+  sqlite3Prng.s[sqlite3Prng.j] = t;
+  t += sqlite3Prng.s[sqlite3Prng.i];
+  return sqlite3Prng.s[t];
+}
+
+/*
+** Return N random bytes.
+*/
+void sqlite3Randomness(int N, void *pBuf){
+  unsigned char *zBuf = pBuf;
+  static sqlite3_mutex *mutex = 0;
+  if( mutex==0 ){
+    mutex = sqlite3_mutex_alloc(SQLITE_MUTEX_STATIC_PRNG);
+  }
+  sqlite3_mutex_enter(mutex);
+  while( N-- ){
+    *(zBuf++) = randomByte();
+  }
+  sqlite3_mutex_leave(mutex);
+}
+
+#ifdef SQLITE_TEST
+/*
+** For testing purposes, we sometimes want to preserve the state of
+** PRNG and restore the PRNG to its saved state at a later time.
+*/
+static struct sqlite3PrngType sqlite3SavedPrng;
+void sqlite3SavePrngState(void){
+  memcpy(&sqlite3SavedPrng, &sqlite3Prng, sizeof(sqlite3Prng));
+}
+void sqlite3RestorePrngState(void){
+  memcpy(&sqlite3Prng, &sqlite3SavedPrng, sizeof(sqlite3Prng));
+}
+void sqlite3ResetPrngState(void){
+  sqlite3Prng.isInit = 0;
+}
+#endif /* SQLITE_TEST */
diff --git a/uppsrc/plugin/sqlite3/lib/select.c b/uppsrc/plugin/sqlite3/lib/select.c
new file mode 100644
index 000000000..809d67e38
--- /dev/null
+++ b/uppsrc/plugin/sqlite3/lib/select.c
@@ -0,0 +1,3694 @@
+/*
+** 2001 September 15
+**
+** The author disclaims copyright to this source code.  In place of
+** a legal notice, here is a blessing:
+**
+**    May you do good and not evil.
+**    May you find forgiveness for yourself and forgive others.
+**    May you share freely, never taking more than you give.
+**
+*************************************************************************
+** This file contains C code routines that are called by the parser
+** to handle SELECT statements in SQLite.
+**
+** $Id: select.c,v 1.415 2008/03/04 17:45:01 mlcreech Exp $
+*/
+#include "sqliteInt.h"
+
+
+/*
+** Delete all the content of a Select structure but do not deallocate
+** the select structure itself.
+*/
+static void clearSelect(Select *p){
+  sqlite3ExprListDelete(p->pEList);
+  sqlite3SrcListDelete(p->pSrc);
+  sqlite3ExprDelete(p->pWhere);
+  sqlite3ExprListDelete(p->pGroupBy);
+  sqlite3ExprDelete(p->pHaving);
+  sqlite3ExprListDelete(p->pOrderBy);
+  sqlite3SelectDelete(p->pPrior);
+  sqlite3ExprDelete(p->pLimit);
+  sqlite3ExprDelete(p->pOffset);
+}
+
+/*
+** Initialize a SelectDest structure.
+*/
+void sqlite3SelectDestInit(SelectDest *pDest, int eDest, int iParm){
+  pDest->eDest = eDest;
+  pDest->iParm = iParm;
+  pDest->affinity = 0;
+  pDest->iMem = 0;
+}
+
+
+/*
+** Allocate a new Select structure and return a pointer to that
+** structure.
+*/
+Select *sqlite3SelectNew(
+  Parse *pParse,        /* Parsing context */
+  ExprList *pEList,     /* which columns to include in the result */
+  SrcList *pSrc,        /* the FROM clause -- which tables to scan */
+  Expr *pWhere,         /* the WHERE clause */
+  ExprList *pGroupBy,   /* the GROUP BY clause */
+  Expr *pHaving,        /* the HAVING clause */
+  ExprList *pOrderBy,   /* the ORDER BY clause */
+  int isDistinct,       /* true if the DISTINCT keyword is present */
+  Expr *pLimit,         /* LIMIT value.  NULL means not used */
+  Expr *pOffset         /* OFFSET value.  NULL means no offset */
+){
+  Select *pNew;
+  Select standin;
+  sqlite3 *db = pParse->db;
+  pNew = sqlite3DbMallocZero(db, sizeof(*pNew) );
+  assert( !pOffset || pLimit );   /* Can't have OFFSET without LIMIT. */
+  if( pNew==0 ){
+    pNew = &standin;
+    memset(pNew, 0, sizeof(*pNew));
+  }
+  if( pEList==0 ){
+    pEList = sqlite3ExprListAppend(pParse, 0, sqlite3Expr(db,TK_ALL,0,0,0), 0);
+  }
+  pNew->pEList = pEList;
+  pNew->pSrc = pSrc;
+  pNew->pWhere = pWhere;
+  pNew->pGroupBy = pGroupBy;
+  pNew->pHaving = pHaving;
+  pNew->pOrderBy = pOrderBy;
+  pNew->isDistinct = isDistinct;
+  pNew->op = TK_SELECT;
+  assert( pOffset==0 || pLimit!=0 );
+  pNew->pLimit = pLimit;
+  pNew->pOffset = pOffset;
+  pNew->iLimit = -1;
+  pNew->iOffset = -1;
+  pNew->addrOpenEphm[0] = -1;
+  pNew->addrOpenEphm[1] = -1;
+  pNew->addrOpenEphm[2] = -1;
+  if( pNew==&standin) {
+    clearSelect(pNew);
+    pNew = 0;
+  }
+  return pNew;
+}
+
+/*
+** Delete the given Select structure and all of its substructures.
+*/
+void sqlite3SelectDelete(Select *p){
+  if( p ){
+    clearSelect(p);
+    sqlite3_free(p);
+  }
+}
+
+/*
+** Given 1 to 3 identifiers preceeding the JOIN keyword, determine the
+** type of join.  Return an integer constant that expresses that type
+** in terms of the following bit values:
+**
+**     JT_INNER
+**     JT_CROSS
+**     JT_OUTER
+**     JT_NATURAL
+**     JT_LEFT
+**     JT_RIGHT
+**
+** A full outer join is the combination of JT_LEFT and JT_RIGHT.
+**
+** If an illegal or unsupported join type is seen, then still return
+** a join type, but put an error in the pParse structure.
+*/
+int sqlite3JoinType(Parse *pParse, Token *pA, Token *pB, Token *pC){
+  int jointype = 0;
+  Token *apAll[3];
+  Token *p;
+  static const struct {
+    const char zKeyword[8];
+    u8 nChar;
+    u8 code;
+  } keywords[] = {
+    { "natural", 7, JT_NATURAL },
+    { "left",    4, JT_LEFT|JT_OUTER },
+    { "right",   5, JT_RIGHT|JT_OUTER },
+    { "full",    4, JT_LEFT|JT_RIGHT|JT_OUTER },
+    { "outer",   5, JT_OUTER },
+    { "inner",   5, JT_INNER },
+    { "cross",   5, JT_INNER|JT_CROSS },
+  };
+  int i, j;
+  apAll[0] = pA;
+  apAll[1] = pB;
+  apAll[2] = pC;
+  for(i=0; i<3 && apAll[i]; i++){
+    p = apAll[i];
+    for(j=0; j<sizeof(keywords)/sizeof(keywords[0]); j++){
+      if( p->n==keywords[j].nChar
+          && sqlite3StrNICmp((char*)p->z, keywords[j].zKeyword, p->n)==0 ){
+        jointype |= keywords[j].code;
+        break;
+      }
+    }
+    if( j>=sizeof(keywords)/sizeof(keywords[0]) ){
+      jointype |= JT_ERROR;
+      break;
+    }
+  }
+  if(
+     (jointype & (JT_INNER|JT_OUTER))==(JT_INNER|JT_OUTER) ||
+     (jointype & JT_ERROR)!=0
+  ){
+    const char *zSp1 = " ";
+    const char *zSp2 = " ";
+    if( pB==0 ){ zSp1++; }
+    if( pC==0 ){ zSp2++; }
+    sqlite3ErrorMsg(pParse, "unknown or unsupported join type: "
+       "%T%s%T%s%T", pA, zSp1, pB, zSp2, pC);
+    jointype = JT_INNER;
+  }else if( jointype & JT_RIGHT ){
+    sqlite3ErrorMsg(pParse,
+      "RIGHT and FULL OUTER JOINs are not currently supported");
+    jointype = JT_INNER;
+  }
+  return jointype;
+}
+
+/*
+** Return the index of a column in a table.  Return -1 if the column
+** is not contained in the table.
+*/
+static int columnIndex(Table *pTab, const char *zCol){
+  int i;
+  for(i=0; i<pTab->nCol; i++){
+    if( sqlite3StrICmp(pTab->aCol[i].zName, zCol)==0 ) return i;
+  }
+  return -1;
+}
+
+/*
+** Set the value of a token to a '\000'-terminated string.
+*/
+static void setToken(Token *p, const char *z){
+  p->z = (u8*)z;
+  p->n = z ? strlen(z) : 0;
+  p->dyn = 0;
+}
+
+/*
+** Set the token to the double-quoted and escaped version of the string pointed
+** to by z. For example;
+**
+**    {a"bc}  ->  {"a""bc"}
+*/
+static void setQuotedToken(Parse *pParse, Token *p, const char *z){
+  p->z = (u8 *)sqlite3MPrintf(0, "\"%w\"", z);
+  p->dyn = 1;
+  if( p->z ){
+    p->n = strlen((char *)p->z);
+  }else{
+    pParse->db->mallocFailed = 1;
+  }
+}
+
+/*
+** Create an expression node for an identifier with the name of zName
+*/
+Expr *sqlite3CreateIdExpr(Parse *pParse, const char *zName){
+  Token dummy;
+  setToken(&dummy, zName);
+  return sqlite3PExpr(pParse, TK_ID, 0, 0, &dummy);
+}
+
+
+/*
+** Add a term to the WHERE expression in *ppExpr that requires the
+** zCol column to be equal in the two tables pTab1 and pTab2.
+*/
+static void addWhereTerm(
+  Parse *pParse,           /* Parsing context */
+  const char *zCol,        /* Name of the column */
+  const Table *pTab1,      /* First table */
+  const char *zAlias1,     /* Alias for first table.  May be NULL */
+  const Table *pTab2,      /* Second table */
+  const char *zAlias2,     /* Alias for second table.  May be NULL */
+  int iRightJoinTable,     /* VDBE cursor for the right table */
+  Expr **ppExpr            /* Add the equality term to this expression */
+){
+  Expr *pE1a, *pE1b, *pE1c;
+  Expr *pE2a, *pE2b, *pE2c;
+  Expr *pE;
+
+  pE1a = sqlite3CreateIdExpr(pParse, zCol);
+  pE2a = sqlite3CreateIdExpr(pParse, zCol);
+  if( zAlias1==0 ){
+    zAlias1 = pTab1->zName;
+  }
+  pE1b = sqlite3CreateIdExpr(pParse, zAlias1);
+  if( zAlias2==0 ){
+    zAlias2 = pTab2->zName;
+  }
+  pE2b = sqlite3CreateIdExpr(pParse, zAlias2);
+  pE1c = sqlite3PExpr(pParse, TK_DOT, pE1b, pE1a, 0);
+  pE2c = sqlite3PExpr(pParse, TK_DOT, pE2b, pE2a, 0);
+  pE = sqlite3PExpr(pParse, TK_EQ, pE1c, pE2c, 0);
+  if( pE ){
+    ExprSetProperty(pE, EP_FromJoin);
+    pE->iRightJoinTable = iRightJoinTable;
+  }
+  *ppExpr = sqlite3ExprAnd(pParse->db,*ppExpr, pE);
+}
+
+/*
+** Set the EP_FromJoin property on all terms of the given expression.
+** And set the Expr.iRightJoinTable to iTable for every term in the
+** expression.
+**
+** The EP_FromJoin property is used on terms of an expression to tell
+** the LEFT OUTER JOIN processing logic that this term is part of the
+** join restriction specified in the ON or USING clause and not a part
+** of the more general WHERE clause.  These terms are moved over to the
+** WHERE clause during join processing but we need to remember that they
+** originated in the ON or USING clause.
+**
+** The Expr.iRightJoinTable tells the WHERE clause processing that the
+** expression depends on table iRightJoinTable even if that table is not
+** explicitly mentioned in the expression.  That information is needed
+** for cases like this:
+**
+**    SELECT * FROM t1 LEFT JOIN t2 ON t1.a=t2.b AND t1.x=5
+**
+** The where clause needs to defer the handling of the t1.x=5
+** term until after the t2 loop of the join.  In that way, a
+** NULL t2 row will be inserted whenever t1.x!=5.  If we do not
+** defer the handling of t1.x=5, it will be processed immediately
+** after the t1 loop and rows with t1.x!=5 will never appear in
+** the output, which is incorrect.
+*/
+static void setJoinExpr(Expr *p, int iTable){
+  while( p ){
+    ExprSetProperty(p, EP_FromJoin);
+    p->iRightJoinTable = iTable;
+    setJoinExpr(p->pLeft, iTable);
+    p = p->pRight;
+  }
+}
+
+/*
+** This routine processes the join information for a SELECT statement.
+** ON and USING clauses are converted into extra terms of the WHERE clause.
+** NATURAL joins also create extra WHERE clause terms.
+**
+** The terms of a FROM clause are contained in the Select.pSrc structure.
+** The left most table is the first entry in Select.pSrc.  The right-most
+** table is the last entry.  The join operator is held in the entry to
+** the left.  Thus entry 0 contains the join operator for the join between
+** entries 0 and 1.  Any ON or USING clauses associated with the join are
+** also attached to the left entry.
+**
+** This routine returns the number of errors encountered.
+*/
+static int sqliteProcessJoin(Parse *pParse, Select *p){
+  SrcList *pSrc;                  /* All tables in the FROM clause */
+  int i, j;                       /* Loop counters */
+  struct SrcList_item *pLeft;     /* Left table being joined */
+  struct SrcList_item *pRight;    /* Right table being joined */
+
+  pSrc = p->pSrc;
+  pLeft = &pSrc->a[0];
+  pRight = &pLeft[1];
+  for(i=0; i<pSrc->nSrc-1; i++, pRight++, pLeft++){
+    Table *pLeftTab = pLeft->pTab;
+    Table *pRightTab = pRight->pTab;
+
+    if( pLeftTab==0 || pRightTab==0 ) continue;
+
+    /* When the NATURAL keyword is present, add WHERE clause terms for
+    ** every column that the two tables have in common.
+    */
+    if( pRight->jointype & JT_NATURAL ){
+      if( pRight->pOn || pRight->pUsing ){
+        sqlite3ErrorMsg(pParse, "a NATURAL join may not have "
+           "an ON or USING clause", 0);
+        return 1;
+      }
+      for(j=0; j<pLeftTab->nCol; j++){
+        char *zName = pLeftTab->aCol[j].zName;
+        if( columnIndex(pRightTab, zName)>=0 ){
+          addWhereTerm(pParse, zName, pLeftTab, pLeft->zAlias,
+                              pRightTab, pRight->zAlias,
+                              pRight->iCursor, &p->pWhere);
+
+        }
+      }
+    }
+
+    /* Disallow both ON and USING clauses in the same join
+    */
+    if( pRight->pOn && pRight->pUsing ){
+      sqlite3ErrorMsg(pParse, "cannot have both ON and USING "
+        "clauses in the same join");
+      return 1;
+    }
+
+    /* Add the ON clause to the end of the WHERE clause, connected by
+    ** an AND operator.
+    */
+    if( pRight->pOn ){
+      setJoinExpr(pRight->pOn, pRight->iCursor);
+      p->pWhere = sqlite3ExprAnd(pParse->db, p->pWhere, pRight->pOn);
+      pRight->pOn = 0;
+    }
+
+    /* Create extra terms on the WHERE clause for each column named
+    ** in the USING clause.  Example: If the two tables to be joined are
+    ** A and B and the USING clause names X, Y, and Z, then add this
+    ** to the WHERE clause:    A.X=B.X AND A.Y=B.Y AND A.Z=B.Z
+    ** Report an error if any column mentioned in the USING clause is
+    ** not contained in both tables to be joined.
+    */
+    if( pRight->pUsing ){
+      IdList *pList = pRight->pUsing;
+      for(j=0; j<pList->nId; j++){
+        char *zName = pList->a[j].zName;
+        if( columnIndex(pLeftTab, zName)<0 || columnIndex(pRightTab, zName)<0 ){
+          sqlite3ErrorMsg(pParse, "cannot join using column %s - column "
+            "not present in both tables", zName);
+          return 1;
+        }
+        addWhereTerm(pParse, zName, pLeftTab, pLeft->zAlias,
+                            pRightTab, pRight->zAlias,
+                            pRight->iCursor, &p->pWhere);
+      }
+    }
+  }
+  return 0;
+}
+
+/*
+** Insert code into "v" that will push the record on the top of the
+** stack into the sorter.
+*/
+static void pushOntoSorter(
+  Parse *pParse,         /* Parser context */
+  ExprList *pOrderBy,    /* The ORDER BY clause */
+  Select *pSelect,       /* The whole SELECT statement */
+  int regData            /* Register holding data to be sorted */
+){
+  Vdbe *v = pParse->pVdbe;
+  int nExpr = pOrderBy->nExpr;
+  int regBase = sqlite3GetTempRange(pParse, nExpr+2);
+  int regRecord = sqlite3GetTempReg(pParse);
+  sqlite3ExprCodeExprList(pParse, pOrderBy, regBase);
+  sqlite3VdbeAddOp2(v, OP_Sequence, pOrderBy->iECursor, regBase+nExpr);
+  sqlite3VdbeAddOp2(v, OP_Move, regData, regBase+nExpr+1);
+  sqlite3VdbeAddOp3(v, OP_MakeRecord, regBase, nExpr + 2, regRecord);
+  sqlite3VdbeAddOp2(v, OP_IdxInsert, pOrderBy->iECursor, regRecord);
+  sqlite3ReleaseTempReg(pParse, regRecord);
+  sqlite3ReleaseTempRange(pParse, regBase, nExpr+2);
+  if( pSelect->iLimit>=0 ){
+    int addr1, addr2;
+    int iLimit;
+    if( pSelect->pOffset ){
+      iLimit = pSelect->iOffset+1;
+    }else{
+      iLimit = pSelect->iLimit;
+    }
+    addr1 = sqlite3VdbeAddOp1(v, OP_IfZero, iLimit);
+    sqlite3VdbeAddOp2(v, OP_AddImm, iLimit, -1);
+    addr2 = sqlite3VdbeAddOp0(v, OP_Goto);
+    sqlite3VdbeJumpHere(v, addr1);
+    sqlite3VdbeAddOp1(v, OP_Last, pOrderBy->iECursor);
+    sqlite3VdbeAddOp1(v, OP_Delete, pOrderBy->iECursor);
+    sqlite3VdbeJumpHere(v, addr2);
+    pSelect->iLimit = -1;
+  }
+}
+
+/*
+** Add code to implement the OFFSET
+*/
+static void codeOffset(
+  Vdbe *v,          /* Generate code into this VM */
+  Select *p,        /* The SELECT statement being coded */
+  int iContinue     /* Jump here to skip the current record */
+){
+  if( p->iOffset>=0 && iContinue!=0 ){
+    int addr;
+    sqlite3VdbeAddOp2(v, OP_AddImm, p->iOffset, -1);
+    addr = sqlite3VdbeAddOp1(v, OP_IfNeg, p->iOffset);
+    sqlite3VdbeAddOp2(v, OP_Goto, 0, iContinue);
+    VdbeComment((v, "skip OFFSET records"));
+    sqlite3VdbeJumpHere(v, addr);
+  }
+}
+
+/*
+** Add code that will check to make sure the N registers starting at iMem
+** form a distinct entry.  iTab is a sorting index that holds previously
+** seen combinations of the N values.  A new entry is made in iTab
+** if the current N values are new.
+**
+** A jump to addrRepeat is made and the N+1 values are popped from the
+** stack if the top N elements are not distinct.
+*/
+static void codeDistinct(
+  Parse *pParse,     /* Parsing and code generating context */
+  int iTab,          /* A sorting index used to test for distinctness */
+  int addrRepeat,    /* Jump to here if not distinct */
+  int N,             /* Number of elements */
+  int iMem           /* First element */
+){
+  Vdbe *v;
+  int r1;
+
+  v = pParse->pVdbe;
+  r1 = sqlite3GetTempReg(pParse);
+  sqlite3VdbeAddOp3(v, OP_MakeRecord, iMem, N, r1);
+  sqlite3VdbeAddOp3(v, OP_Found, iTab, addrRepeat, r1);
+  sqlite3VdbeAddOp2(v, OP_IdxInsert, iTab, r1);
+  sqlite3ReleaseTempReg(pParse, r1);
+}
+
+/*
+** Generate an error message when a SELECT is used within a subexpression
+** (example:  "a IN (SELECT * FROM table)") but it has more than 1 result
+** column.  We do this in a subroutine because the error occurs in multiple
+** places.
+*/
+static int checkForMultiColumnSelectError(
+  Parse *pParse,       /* Parse context. */
+  SelectDest *pDest,   /* Destination of SELECT results */
+  int nExpr            /* Number of result columns returned by SELECT */
+){
+  int eDest = pDest->eDest;
+  if( nExpr>1 && (eDest==SRT_Mem || eDest==SRT_Set) ){
+    sqlite3ErrorMsg(pParse, "only a single result allowed for "
+       "a SELECT that is part of an expression");
+    return 1;
+  }else{
+    return 0;
+  }
+}
+
+/*
+** This routine generates the code for the inside of the inner loop
+** of a SELECT.
+**
+** If srcTab and nColumn are both zero, then the pEList expressions
+** are evaluated in order to get the data for this row.  If nColumn>0
+** then data is pulled from srcTab and pEList is used only to get the
+** datatypes for each column.
+*/
+static void selectInnerLoop(
+  Parse *pParse,          /* The parser context */
+  Select *p,              /* The complete select statement being coded */
+  ExprList *pEList,       /* List of values being extracted */
+  int srcTab,             /* Pull data from this table */
+  int nColumn,            /* Number of columns in the source table */
+  ExprList *pOrderBy,     /* If not NULL, sort results using this key */
+  int distinct,           /* If >=0, make sure results are distinct */
+  SelectDest *pDest,      /* How to dispose of the results */
+  int iContinue,          /* Jump here to continue with next row */
+  int iBreak,             /* Jump here to break out of the inner loop */
+  char *aff               /* affinity string if eDest is SRT_Union */
+){
+  Vdbe *v = pParse->pVdbe;
+  int i;
+  int hasDistinct;        /* True if the DISTINCT keyword is present */
+  int regResult;              /* Start of memory holding result set */
+  int eDest = pDest->eDest;   /* How to dispose of results */
+  int iParm = pDest->iParm;   /* First argument to disposal method */
+  int nResultCol;             /* Number of result columns */
+
+  if( v==0 ) return;
+  assert( pEList!=0 );
+
+  /* If there was a LIMIT clause on the SELECT statement, then do the check
+  ** to see if this row should be output.
+  */
+  hasDistinct = distinct>=0 && pEList->nExpr>0;
+  if( pOrderBy==0 && !hasDistinct ){
+    codeOffset(v, p, iContinue);
+  }
+
+  /* Pull the requested columns.
+  */
+  if( nColumn>0 ){
+    nResultCol = nColumn;
+  }else{
+    nResultCol = pEList->nExpr;
+  }
+  if( pDest->iMem==0 ){
+    pDest->iMem = sqlite3GetTempRange(pParse, nResultCol);
+  }
+  regResult = pDest->iMem;
+  if( nColumn>0 ){
+    for(i=0; i<nColumn; i++){
+      sqlite3VdbeAddOp3(v, OP_Column, srcTab, i, regResult+i);
+    }
+  }else if( eDest!=SRT_Exists ){
+    /* If the destination is an EXISTS(...) expression, the actual
+    ** values returned by the SELECT are not required.
+    */
+    for(i=0; i<nResultCol; i++){
+      sqlite3ExprCode(pParse, pEList->a[i].pExpr, regResult+i);
+    }
+  }
+  nColumn = nResultCol;
+
+  /* If the DISTINCT keyword was present on the SELECT statement
+  ** and this row has been seen before, then do not make this row
+  ** part of the result.
+  */
+  if( hasDistinct ){
+    assert( pEList!=0 );
+    assert( pEList->nExpr==nColumn );
+    codeDistinct(pParse, distinct, iContinue, nColumn, regResult);
+    if( pOrderBy==0 ){
+      codeOffset(v, p, iContinue);
+    }
+  }
+
+  if( checkForMultiColumnSelectError(pParse, pDest, pEList->nExpr) ){
+    return;
+  }
+
+  switch( eDest ){
+    /* In this mode, write each query result to the key of the temporary
+    ** table iParm.
+    */
+#ifndef SQLITE_OMIT_COMPOUND_SELECT
+    case SRT_Union: {
+      int r1;
+      r1 = sqlite3GetTempReg(pParse);
+      sqlite3VdbeAddOp3(v, OP_MakeRecord, regResult, nColumn, r1);
+      if( aff ){
+        sqlite3VdbeChangeP4(v, -1, aff, P4_STATIC);
+      }
+      sqlite3VdbeAddOp2(v, OP_IdxInsert, iParm, r1);
+      sqlite3ReleaseTempReg(pParse, r1);
+      break;
+    }
+
+    /* Construct a record from the query result, but instead of
+    ** saving that record, use it as a key to delete elements from
+    ** the temporary table iParm.
+    */
+    case SRT_Except: {
+      int r1;
+      r1 = sqlite3GetTempReg(pParse);
+      sqlite3VdbeAddOp3(v, OP_MakeRecord, regResult, nColumn, r1);
+      sqlite3VdbeChangeP4(v, -1, aff, P4_STATIC);
+      sqlite3VdbeAddOp2(v, OP_IdxDelete, iParm, r1);
+      sqlite3ReleaseTempReg(pParse, r1);
+      break;
+    }
+#endif
+
+    /* Store the result as data using a unique key.
+    */
+    case SRT_Table:
+    case SRT_EphemTab: {
+      int r1 = sqlite3GetTempReg(pParse);
+      sqlite3VdbeAddOp3(v, OP_MakeRecord, regResult, nColumn, r1);
+      if( pOrderBy ){
+        pushOntoSorter(pParse, pOrderBy, p, r1);
+      }else{
+        int r2 = sqlite3GetTempReg(pParse);
+        sqlite3VdbeAddOp2(v, OP_NewRowid, iParm, r2);
+        sqlite3VdbeAddOp3(v, OP_Insert, iParm, r1, r2);
+        sqlite3VdbeChangeP5(v, OPFLAG_APPEND);
+        sqlite3ReleaseTempReg(pParse, r2);
+      }
+      sqlite3ReleaseTempReg(pParse, r1);
+      break;
+    }
+
+#ifndef SQLITE_OMIT_SUBQUERY
+    /* If we are creating a set for an "expr IN (SELECT ...)" construct,
+    ** then there should be a single item on the stack.  Write this
+    ** item into the set table with bogus data.
+    */
+    case SRT_Set: {
+      int addr2;
+
+      assert( nColumn==1 );
+      addr2 = sqlite3VdbeAddOp1(v, OP_IsNull, regResult);
+      p->affinity = sqlite3CompareAffinity(pEList->a[0].pExpr, pDest->affinity);
+      if( pOrderBy ){
+        /* At first glance you would think we could optimize out the
+        ** ORDER BY in this case since the order of entries in the set
+        ** does not matter.  But there might be a LIMIT clause, in which
+        ** case the order does matter */
+        pushOntoSorter(pParse, pOrderBy, p, regResult);
+      }else{
+        int r1 = sqlite3GetTempReg(pParse);
+        sqlite3VdbeAddOp4(v, OP_MakeRecord, regResult, 1, r1, &p->affinity, 1);
+        sqlite3VdbeAddOp2(v, OP_IdxInsert, iParm, r1);
+        sqlite3ReleaseTempReg(pParse, r1);
+      }
+      sqlite3VdbeJumpHere(v, addr2);
+      break;
+    }
+
+    /* If any row exist in the result set, record that fact and abort.
+    */
+    case SRT_Exists: {
+      sqlite3VdbeAddOp2(v, OP_Integer, 1, iParm);
+      /* The LIMIT clause will terminate the loop for us */
+      break;
+    }
+
+    /* If this is a scalar select that is part of an expression, then
+    ** store the results in the appropriate memory cell and break out
+    ** of the scan loop.
+    */
+    case SRT_Mem: {
+      assert( nColumn==1 );
+      if( pOrderBy ){
+        pushOntoSorter(pParse, pOrderBy, p, regResult);
+      }else{
+        sqlite3VdbeAddOp2(v, OP_Move, regResult, iParm);
+        /* The LIMIT clause will jump out of the loop for us */
+      }
+      break;
+    }
+#endif /* #ifndef SQLITE_OMIT_SUBQUERY */
+
+    /* Send the data to the callback function or to a subroutine.  In the
+    ** case of a subroutine, the subroutine itself is responsible for
+    ** popping the data from the stack.
+    */
+    case SRT_Subroutine:
+    case SRT_Callback: {
+      if( pOrderBy ){
+        int r1 = sqlite3GetTempReg(pParse);
+        sqlite3VdbeAddOp3(v, OP_MakeRecord, regResult, nColumn, r1);
+        pushOntoSorter(pParse, pOrderBy, p, r1);
+        sqlite3ReleaseTempReg(pParse, r1);
+      }else if( eDest==SRT_Subroutine ){
+        sqlite3VdbeAddOp2(v, OP_Gosub, 0, iParm);
+      }else{
+        sqlite3VdbeAddOp2(v, OP_ResultRow, regResult, nColumn);
+      }
+      break;
+    }
+
+#if !defined(SQLITE_OMIT_TRIGGER)
+    /* Discard the results.  This is used for SELECT statements inside
+    ** the body of a TRIGGER.  The purpose of such selects is to call
+    ** user-defined functions that have side effects.  We do not care
+    ** about the actual results of the select.
+    */
+    default: {
+      assert( eDest==SRT_Discard );
+      break;
+    }
+#endif
+  }
+
+  /* Jump to the end of the loop if the LIMIT is reached.
+  */
+  if( p->iLimit>=0 && pOrderBy==0 ){
+    sqlite3VdbeAddOp2(v, OP_AddImm, p->iLimit, -1);
+    sqlite3VdbeAddOp2(v, OP_IfZero, p->iLimit, iBreak);
+  }
+}
+
+/*
+** Given an expression list, generate a KeyInfo structure that records
+** the collating sequence for each expression in that expression list.
+**
+** If the ExprList is an ORDER BY or GROUP BY clause then the resulting
+** KeyInfo structure is appropriate for initializing a virtual index to
+** implement that clause.  If the ExprList is the result set of a SELECT
+** then the KeyInfo structure is appropriate for initializing a virtual
+** index to implement a DISTINCT test.
+**
+** Space to hold the KeyInfo structure is obtain from malloc.  The calling
+** function is responsible for seeing that this structure is eventually
+** freed.  Add the KeyInfo structure to the P4 field of an opcode using
+** P4_KEYINFO_HANDOFF is the usual way of dealing with this.
+*/
+static KeyInfo *keyInfoFromExprList(Parse *pParse, ExprList *pList){
+  sqlite3 *db = pParse->db;
+  int nExpr;
+  KeyInfo *pInfo;
+  struct ExprList_item *pItem;
+  int i;
+
+  nExpr = pList->nExpr;
+  pInfo = sqlite3DbMallocZero(db, sizeof(*pInfo) + nExpr*(sizeof(CollSeq*)+1) );
+  if( pInfo ){
+    pInfo->aSortOrder = (u8*)&pInfo->aColl[nExpr];
+    pInfo->nField = nExpr;
+    pInfo->enc = ENC(db);
+    for(i=0, pItem=pList->a; i<nExpr; i++, pItem++){
+      CollSeq *pColl;
+      pColl = sqlite3ExprCollSeq(pParse, pItem->pExpr);
+      if( !pColl ){
+        pColl = db->pDfltColl;
+      }
+      pInfo->aColl[i] = pColl;
+      pInfo->aSortOrder[i] = pItem->sortOrder;
+    }
+  }
+  return pInfo;
+}
+
+
+/*
+** If the inner loop was generated using a non-null pOrderBy argument,
+** then the results were placed in a sorter.  After the loop is terminated
+** we need to run the sorter and output the results.  The following
+** routine generates the code needed to do that.
+*/
+static void generateSortTail(
+  Parse *pParse,    /* Parsing context */
+  Select *p,        /* The SELECT statement */
+  Vdbe *v,          /* Generate code into this VDBE */
+  int nColumn,      /* Number of columns of data */
+  SelectDest *pDest /* Write the sorted results here */
+){
+  int brk = sqlite3VdbeMakeLabel(v);
+  int cont = sqlite3VdbeMakeLabel(v);
+  int addr;
+  int iTab;
+  int pseudoTab = 0;
+  ExprList *pOrderBy = p->pOrderBy;
+
+  int eDest = pDest->eDest;
+  int iParm = pDest->iParm;
+
+  int regRow;
+  int regRowid;
+
+  iTab = pOrderBy->iECursor;
+  if( eDest==SRT_Callback || eDest==SRT_Subroutine ){
+    pseudoTab = pParse->nTab++;
+    sqlite3VdbeAddOp2(v, OP_OpenPseudo, pseudoTab, 0);
+    sqlite3VdbeAddOp2(v, OP_SetNumColumns, pseudoTab, nColumn);
+  }
+  addr = 1 + sqlite3VdbeAddOp2(v, OP_Sort, iTab, brk);
+  codeOffset(v, p, cont);
+  regRow = sqlite3GetTempReg(pParse);
+  regRowid = sqlite3GetTempReg(pParse);
+  sqlite3VdbeAddOp3(v, OP_Column, iTab, pOrderBy->nExpr + 1, regRow);
+  switch( eDest ){
+    case SRT_Table:
+    case SRT_EphemTab: {
+      sqlite3VdbeAddOp2(v, OP_NewRowid, iParm, regRowid);
+      sqlite3VdbeAddOp3(v, OP_Insert, iParm, regRow, regRowid);
+      sqlite3VdbeChangeP5(v, OPFLAG_APPEND);
+      break;
+    }
+#ifndef SQLITE_OMIT_SUBQUERY
+    case SRT_Set: {
+      int j1;
+      assert( nColumn==1 );
+      j1 = sqlite3VdbeAddOp1(v, OP_IsNull, regRow);
+      sqlite3VdbeAddOp4(v, OP_MakeRecord, regRow, 1, regRowid, &p->affinity, 1);
+      sqlite3VdbeAddOp2(v, OP_IdxInsert, iParm, regRowid);
+      sqlite3VdbeJumpHere(v, j1);
+      break;
+    }
+    case SRT_Mem: {
+      assert( nColumn==1 );
+      sqlite3VdbeAddOp2(v, OP_Move, regRow, iParm);
+      /* The LIMIT clause will terminate the loop for us */
+      break;
+    }
+#endif
+    case SRT_Callback:
+    case SRT_Subroutine: {
+      int i;
+      sqlite3VdbeAddOp2(v, OP_Integer, 1, regRowid);
+      sqlite3VdbeAddOp3(v, OP_Insert, pseudoTab, regRow, regRowid);
+      for(i=0; i<nColumn; i++){
+        sqlite3VdbeAddOp3(v, OP_Column, pseudoTab, i, pDest->iMem+i);
+      }
+      if( eDest==SRT_Callback ){
+        sqlite3VdbeAddOp2(v, OP_ResultRow, pDest->iMem, nColumn);
+      }else{
+        sqlite3VdbeAddOp2(v, OP_Gosub, 0, iParm);
+      }
+      break;
+    }
+    default: {
+      /* Do nothing */
+      break;
+    }
+  }
+  sqlite3ReleaseTempReg(pParse, regRow);
+  sqlite3ReleaseTempReg(pParse, regRowid);
+
+  /* Jump to the end of the loop when the LIMIT is reached
+  */
+  if( p->iLimit>=0 ){
+    sqlite3VdbeAddOp2(v, OP_AddImm, p->iLimit, -1);
+    sqlite3VdbeAddOp2(v, OP_IfZero, p->iLimit, brk);
+  }
+
+  /* The bottom of the loop
+  */
+  sqlite3VdbeResolveLabel(v, cont);
+  sqlite3VdbeAddOp2(v, OP_Next, iTab, addr);
+  sqlite3VdbeResolveLabel(v, brk);
+  if( eDest==SRT_Callback || eDest==SRT_Subroutine ){
+    sqlite3VdbeAddOp2(v, OP_Close, pseudoTab, 0);
+  }
+
+}
+
+/*
+** Return a pointer to a string containing the 'declaration type' of the
+** expression pExpr. The string may be treated as static by the caller.
+**
+** The declaration type is the exact datatype definition extracted from the
+** original CREATE TABLE statement if the expression is a column. The
+** declaration type for a ROWID field is INTEGER. Exactly when an expression
+** is considered a column can be complex in the presence of subqueries. The
+** result-set expression in all of the following SELECT statements is
+** considered a column by this function.
+**
+**   SELECT col FROM tbl;
+**   SELECT (SELECT col FROM tbl;
+**   SELECT (SELECT col FROM tbl);
+**   SELECT abc FROM (SELECT col AS abc FROM tbl);
+**
+** The declaration type for any expression other than a column is NULL.
+*/
+static const char *columnType(
+  NameContext *pNC,
+  Expr *pExpr,
+  const char **pzOriginDb,
+  const char **pzOriginTab,
+  const char **pzOriginCol
+){
+  char const *zType = 0;
+  char const *zOriginDb = 0;
+  char const *zOriginTab = 0;
+  char const *zOriginCol = 0;
+  int j;
+  if( pExpr==0 || pNC->pSrcList==0 ) return 0;
+
+  switch( pExpr->op ){
+    case TK_AGG_COLUMN:
+    case TK_COLUMN: {
+      /* The expression is a column. Locate the table the column is being
+      ** extracted from in NameContext.pSrcList. This table may be real
+      ** database table or a subquery.
+      */
+      Table *pTab = 0;            /* Table structure column is extracted from */
+      Select *pS = 0;             /* Select the column is extracted from */
+      int iCol = pExpr->iColumn;  /* Index of column in pTab */
+      while( pNC && !pTab ){
+        SrcList *pTabList = pNC->pSrcList;
+        for(j=0;j<pTabList->nSrc && pTabList->a[j].iCursor!=pExpr->iTable;j++);
+        if( j<pTabList->nSrc ){
+          pTab = pTabList->a[j].pTab;
+          pS = pTabList->a[j].pSelect;
+        }else{
+          pNC = pNC->pNext;
+        }
+      }
+
+      if( pTab==0 ){
+        /* FIX ME:
+        ** This can occurs if you have something like "SELECT new.x;" inside
+        ** a trigger.  In other words, if you reference the special "new"
+        ** table in the result set of a select.  We do not have a good way
+        ** to find the actual table type, so call it "TEXT".  This is really
+        ** something of a bug, but I do not know how to fix it.
+        **
+        ** This code does not produce the correct answer - it just prevents
+        ** a segfault.  See ticket #1229.
+        */
+        zType = "TEXT";
+        break;
+      }
+
+      assert( pTab );
+      if( pS ){
+        /* The "table" is actually a sub-select or a view in the FROM clause
+        ** of the SELECT statement. Return the declaration type and origin
+        ** data for the result-set column of the sub-select.
+        */
+        if( iCol>=0 && iCol<pS->pEList->nExpr ){
+          /* If iCol is less than zero, then the expression requests the
+          ** rowid of the sub-select or view. This expression is legal (see
+          ** test case misc2.2.2) - it always evaluates to NULL.
+          */
+          NameContext sNC;
+          Expr *p = pS->pEList->a[iCol].pExpr;
+          sNC.pSrcList = pS->pSrc;
+          sNC.pNext = 0;
+          sNC.pParse = pNC->pParse;
+          zType = columnType(&sNC, p, &zOriginDb, &zOriginTab, &zOriginCol);
+        }
+      }else if( pTab->pSchema ){
+        /* A real table */
+        assert( !pS );
+        if( iCol<0 ) iCol = pTab->iPKey;
+        assert( iCol==-1 || (iCol>=0 && iCol<pTab->nCol) );
+        if( iCol<0 ){
+          zType = "INTEGER";
+          zOriginCol = "rowid";
+        }else{
+          zType = pTab->aCol[iCol].zType;
+          zOriginCol = pTab->aCol[iCol].zName;
+        }
+        zOriginTab = pTab->zName;
+        if( pNC->pParse ){
+          int iDb = sqlite3SchemaToIndex(pNC->pParse->db, pTab->pSchema);
+          zOriginDb = pNC->pParse->db->aDb[iDb].zName;
+        }
+      }
+      break;
+    }
+#ifndef SQLITE_OMIT_SUBQUERY
+    case TK_SELECT: {
+      /* The expression is a sub-select. Return the declaration type and
+      ** origin info for the single column in the result set of the SELECT
+      ** statement.
+      */
+      NameContext sNC;
+      Select *pS = pExpr->pSelect;
+      Expr *p = pS->pEList->a[0].pExpr;
+      sNC.pSrcList = pS->pSrc;
+      sNC.pNext = pNC;
+      sNC.pParse = pNC->pParse;
+      zType = columnType(&sNC, p, &zOriginDb, &zOriginTab, &zOriginCol);
+      break;
+    }
+#endif
+  }
+
+  if( pzOriginDb ){
+    assert( pzOriginTab && pzOriginCol );
+    *pzOriginDb = zOriginDb;
+    *pzOriginTab = zOriginTab;
+    *pzOriginCol = zOriginCol;
+  }
+  return zType;
+}
+
+/*
+** Generate code that will tell the VDBE the declaration types of columns
+** in the result set.
+*/
+static void generateColumnTypes(
+  Parse *pParse,      /* Parser context */
+  SrcList *pTabList,  /* List of tables */
+  ExprList *pEList    /* Expressions defining the result set */
+){
+  Vdbe *v = pParse->pVdbe;
+  int i;
+  NameContext sNC;
+  sNC.pSrcList = pTabList;
+  sNC.pParse = pParse;
+  for(i=0; i<pEList->nExpr; i++){
+    Expr *p = pEList->a[i].pExpr;
+    const char *zOrigDb = 0;
+    const char *zOrigTab = 0;
+    const char *zOrigCol = 0;
+    const char *zType = columnType(&sNC, p, &zOrigDb, &zOrigTab, &zOrigCol);
+
+    /* The vdbe must make its own copy of the column-type and other
+    ** column specific strings, in case the schema is reset before this
+    ** virtual machine is deleted.
+    */
+    sqlite3VdbeSetColName(v, i, COLNAME_DECLTYPE, zType, P4_TRANSIENT);
+    sqlite3VdbeSetColName(v, i, COLNAME_DATABASE, zOrigDb, P4_TRANSIENT);
+    sqlite3VdbeSetColName(v, i, COLNAME_TABLE, zOrigTab, P4_TRANSIENT);
+    sqlite3VdbeSetColName(v, i, COLNAME_COLUMN, zOrigCol, P4_TRANSIENT);
+  }
+}
+
+/*
+** Generate code that will tell the VDBE the names of columns
+** in the result set.  This information is used to provide the
+** azCol[] values in the callback.
+*/
+static void generateColumnNames(
+  Parse *pParse,      /* Parser context */
+  SrcList *pTabList,  /* List of tables */
+  ExprList *pEList    /* Expressions defining the result set */
+){
+  Vdbe *v = pParse->pVdbe;
+  int i, j;
+  sqlite3 *db = pParse->db;
+  int fullNames, shortNames;
+
+#ifndef SQLITE_OMIT_EXPLAIN
+  /* If this is an EXPLAIN, skip this step */
+  if( pParse->explain ){
+    return;
+  }
+#endif
+
+  assert( v!=0 );
+  if( pParse->colNamesSet || v==0 || db->mallocFailed ) return;
+  pParse->colNamesSet = 1;
+  fullNames = (db->flags & SQLITE_FullColNames)!=0;
+  shortNames = (db->flags & SQLITE_ShortColNames)!=0;
+  sqlite3VdbeSetNumCols(v, pEList->nExpr);
+  for(i=0; i<pEList->nExpr; i++){
+    Expr *p;
+    p = pEList->a[i].pExpr;
+    if( p==0 ) continue;
+    if( pEList->a[i].zName ){
+      char *zName = pEList->a[i].zName;
+      sqlite3VdbeSetColName(v, i, COLNAME_NAME, zName, strlen(zName));
+      continue;
+    }
+    if( p->op==TK_COLUMN && pTabList ){
+      Table *pTab;
+      char *zCol;
+      int iCol = p->iColumn;
+      for(j=0; j<pTabList->nSrc && pTabList->a[j].iCursor!=p->iTable; j++){}
+      assert( j<pTabList->nSrc );
+      pTab = pTabList->a[j].pTab;
+      if( iCol<0 ) iCol = pTab->iPKey;
+      assert( iCol==-1 || (iCol>=0 && iCol<pTab->nCol) );
+      if( iCol<0 ){
+        zCol = "rowid";
+      }else{
+        zCol = pTab->aCol[iCol].zName;
+      }
+      if( !shortNames && !fullNames && p->span.z && p->span.z[0] ){
+        sqlite3VdbeSetColName(v, i, COLNAME_NAME, (char*)p->span.z, p->span.n);
+      }else if( fullNames || (!shortNames && pTabList->nSrc>1) ){
+        char *zName = 0;
+        char *zTab;
+
+        zTab = pTabList->a[j].zAlias;
+        if( fullNames || zTab==0 ) zTab = pTab->zName;
+        sqlite3SetString(&zName, zTab, ".", zCol, (char*)0);
+        sqlite3VdbeSetColName(v, i, COLNAME_NAME, zName, P4_DYNAMIC);
+      }else{
+        sqlite3VdbeSetColName(v, i, COLNAME_NAME, zCol, strlen(zCol));
+      }
+    }else if( p->span.z && p->span.z[0] ){
+      sqlite3VdbeSetColName(v, i, COLNAME_NAME, (char*)p->span.z, p->span.n);
+      /* sqlite3VdbeCompressSpace(v, addr); */
+    }else{
+      char zName[30];
+      assert( p->op!=TK_COLUMN || pTabList==0 );
+      sqlite3_snprintf(sizeof(zName), zName, "column%d", i+1);
+      sqlite3VdbeSetColName(v, i, COLNAME_NAME, zName, 0);
+    }
+  }
+  generateColumnTypes(pParse, pTabList, pEList);
+}
+
+#ifndef SQLITE_OMIT_COMPOUND_SELECT
+/*
+** Name of the connection operator, used for error messages.
+*/
+static const char *selectOpName(int id){
+  char *z;
+  switch( id ){
+    case TK_ALL:       z = "UNION ALL";   break;
+    case TK_INTERSECT: z = "INTERSECT";   break;
+    case TK_EXCEPT:    z = "EXCEPT";      break;
+    default:           z = "UNION";       break;
+  }
+  return z;
+}
+#endif /* SQLITE_OMIT_COMPOUND_SELECT */
+
+/*
+** Forward declaration
+*/
+static int prepSelectStmt(Parse*, Select*);
+
+/*
+** Given a SELECT statement, generate a Table structure that describes
+** the result set of that SELECT.
+*/
+Table *sqlite3ResultSetOfSelect(Parse *pParse, char *zTabName, Select *pSelect){
+  Table *pTab;
+  int i, j;
+  ExprList *pEList;
+  Column *aCol, *pCol;
+  sqlite3 *db = pParse->db;
+
+  while( pSelect->pPrior ) pSelect = pSelect->pPrior;
+  if( prepSelectStmt(pParse, pSelect) ){
+    return 0;
+  }
+  if( sqlite3SelectResolve(pParse, pSelect, 0) ){
+    return 0;
+  }
+  pTab = sqlite3DbMallocZero(db, sizeof(Table) );
+  if( pTab==0 ){
+    return 0;
+  }
+  pTab->nRef = 1;
+  pTab->zName = zTabName ? sqlite3DbStrDup(db, zTabName) : 0;
+  pEList = pSelect->pEList;
+  pTab->nCol = pEList->nExpr;
+  assert( pTab->nCol>0 );
+  pTab->aCol = aCol = sqlite3DbMallocZero(db, sizeof(pTab->aCol[0])*pTab->nCol);
+  for(i=0, pCol=aCol; i<pTab->nCol; i++, pCol++){
+    Expr *p, *pR;
+    char *zType;
+    char *zName;
+    int nName;
+    CollSeq *pColl;
+    int cnt;
+    NameContext sNC;
+
+    /* Get an appropriate name for the column
+    */
+    p = pEList->a[i].pExpr;
+    assert( p->pRight==0 || p->pRight->token.z==0 || p->pRight->token.z[0]!=0 );
+    if( (zName = pEList->a[i].zName)!=0 ){
+      /* If the column contains an "AS <name>" phrase, use <name> as the name */
+      zName = sqlite3DbStrDup(db, zName);
+    }else if( p->op==TK_DOT
+              && (pR=p->pRight)!=0 && pR->token.z && pR->token.z[0] ){
+      /* For columns of the from A.B use B as the name */
+      zName = sqlite3MPrintf(db, "%T", &pR->token);
+    }else if( p->span.z && p->span.z[0] ){
+      /* Use the original text of the column expression as its name */
+      zName = sqlite3MPrintf(db, "%T", &p->span);
+    }else{
+      /* If all else fails, make up a name */
+      zName = sqlite3MPrintf(db, "column%d", i+1);
+    }
+    if( !zName || db->mallocFailed ){
+      db->mallocFailed = 1;
+      sqlite3_free(zName);
+      sqlite3DeleteTable(pTab);
+      return 0;
+    }
+    sqlite3Dequote(zName);
+
+    /* Make sure the column name is unique.  If the name is not unique,
+    ** append a integer to the name so that it becomes unique.
+    */
+    nName = strlen(zName);
+    for(j=cnt=0; j<i; j++){
+      if( sqlite3StrICmp(aCol[j].zName, zName)==0 ){
+        zName[nName] = 0;
+        zName = sqlite3MPrintf(db, "%z:%d", zName, ++cnt);
+        j = -1;
+        if( zName==0 ) break;
+      }
+    }
+    pCol->zName = zName;
+
+    /* Get the typename, type affinity, and collating sequence for the
+    ** column.
+    */
+    memset(&sNC, 0, sizeof(sNC));
+    sNC.pSrcList = pSelect->pSrc;
+    zType = sqlite3DbStrDup(db, columnType(&sNC, p, 0, 0, 0));
+    pCol->zType = zType;
+    pCol->affinity = sqlite3ExprAffinity(p);
+    pColl = sqlite3ExprCollSeq(pParse, p);
+    if( pColl ){
+      pCol->zColl = sqlite3DbStrDup(db, pColl->zName);
+    }
+  }
+  pTab->iPKey = -1;
+  return pTab;
+}
+
+/*
+** Prepare a SELECT statement for processing by doing the following
+** things:
+**
+**    (1)  Make sure VDBE cursor numbers have been assigned to every
+**         element of the FROM clause.
+**
+**    (2)  Fill in the pTabList->a[].pTab fields in the SrcList that
+**         defines FROM clause.  When views appear in the FROM clause,
+**         fill pTabList->a[].pSelect with a copy of the SELECT statement
+**         that implements the view.  A copy is made of the view's SELECT
+**         statement so that we can freely modify or delete that statement
+**         without worrying about messing up the presistent representation
+**         of the view.
+**
+**    (3)  Add terms to the WHERE clause to accomodate the NATURAL keyword
+**         on joins and the ON and USING clause of joins.
+**
+**    (4)  Scan the list of columns in the result set (pEList) looking
+**         for instances of the "*" operator or the TABLE.* operator.
+**         If found, expand each "*" to be every column in every table
+**         and TABLE.* to be every column in TABLE.
+**
+** Return 0 on success.  If there are problems, leave an error message
+** in pParse and return non-zero.
+*/
+static int prepSelectStmt(Parse *pParse, Select *p){
+  int i, j, k, rc;
+  SrcList *pTabList;
+  ExprList *pEList;
+  struct SrcList_item *pFrom;
+  sqlite3 *db = pParse->db;
+
+  if( p==0 || p->pSrc==0 || db->mallocFailed ){
+    return 1;
+  }
+  pTabList = p->pSrc;
+  pEList = p->pEList;
+
+  /* Make sure cursor numbers have been assigned to all entries in
+  ** the FROM clause of the SELECT statement.
+  */
+  sqlite3SrcListAssignCursors(pParse, p->pSrc);
+
+  /* Look up every table named in the FROM clause of the select.  If
+  ** an entry of the FROM clause is a subquery instead of a table or view,
+  ** then create a transient table structure to describe the subquery.
+  */
+  for(i=0, pFrom=pTabList->a; i<pTabList->nSrc; i++, pFrom++){
+    Table *pTab;
+    if( pFrom->pTab!=0 ){
+      /* This statement has already been prepared.  There is no need
+      ** to go further. */
+      assert( i==0 );
+      return 0;
+    }
+    if( pFrom->zName==0 ){
+#ifndef SQLITE_OMIT_SUBQUERY
+      /* A sub-query in the FROM clause of a SELECT */
+      assert( pFrom->pSelect!=0 );
+      if( pFrom->zAlias==0 ){
+        pFrom->zAlias =
+          sqlite3MPrintf(db, "sqlite_subquery_%p_", (void*)pFrom->pSelect);
+      }
+      assert( pFrom->pTab==0 );
+      pFrom->pTab = pTab =
+        sqlite3ResultSetOfSelect(pParse, pFrom->zAlias, pFrom->pSelect);
+      if( pTab==0 ){
+        return 1;
+      }
+      /* The isEphem flag indicates that the Table structure has been
+      ** dynamically allocated and may be freed at any time.  In other words,
+      ** pTab is not pointing to a persistent table structure that defines
+      ** part of the schema. */
+      pTab->isEphem = 1;
+#endif
+    }else{
+      /* An ordinary table or view name in the FROM clause */
+      assert( pFrom->pTab==0 );
+      pFrom->pTab = pTab =
+        sqlite3LocateTable(pParse,0,pFrom->zName,pFrom->zDatabase);
+      if( pTab==0 ){
+        return 1;
+      }
+      pTab->nRef++;
+#if !defined(SQLITE_OMIT_VIEW) || !defined (SQLITE_OMIT_VIRTUALTABLE)
+      if( pTab->pSelect || IsVirtual(pTab) ){
+        /* We reach here if the named table is a really a view */
+        if( sqlite3ViewGetColumnNames(pParse, pTab) ){
+          return 1;
+        }
+        /* If pFrom->pSelect!=0 it means we are dealing with a
+        ** view within a view.  The SELECT structure has already been
+        ** copied by the outer view so we can skip the copy step here
+        ** in the inner view.
+        */
+        if( pFrom->pSelect==0 ){
+          pFrom->pSelect = sqlite3SelectDup(db, pTab->pSelect);
+        }
+      }
+#endif
+    }
+  }
+
+  /* Process NATURAL keywords, and ON and USING clauses of joins.
+  */
+  if( sqliteProcessJoin(pParse, p) ) return 1;
+
+  /* For every "*" that occurs in the column list, insert the names of
+  ** all columns in all tables.  And for every TABLE.* insert the names
+  ** of all columns in TABLE.  The parser inserted a special expression
+  ** with the TK_ALL operator for each "*" that it found in the column list.
+  ** The following code just has to locate the TK_ALL expressions and expand
+  ** each one to the list of all columns in all tables.
+  **
+  ** The first loop just checks to see if there are any "*" operators
+  ** that need expanding.
+  */
+  for(k=0; k<pEList->nExpr; k++){
+    Expr *pE = pEList->a[k].pExpr;
+    if( pE->op==TK_ALL ) break;
+    if( pE->op==TK_DOT && pE->pRight && pE->pRight->op==TK_ALL
+         && pE->pLeft && pE->pLeft->op==TK_ID ) break;
+  }
+  rc = 0;
+  if( k<pEList->nExpr ){
+    /*
+    ** If we get here it means the result set contains one or more "*"
+    ** operators that need to be expanded.  Loop through each expression
+    ** in the result set and expand them one by one.
+    */
+    struct ExprList_item *a = pEList->a;
+    ExprList *pNew = 0;
+    int flags = pParse->db->flags;
+    int longNames = (flags & SQLITE_FullColNames)!=0 &&
+                      (flags & SQLITE_ShortColNames)==0;
+
+    for(k=0; k<pEList->nExpr; k++){
+      Expr *pE = a[k].pExpr;
+      if( pE->op!=TK_ALL &&
+           (pE->op!=TK_DOT || pE->pRight==0 || pE->pRight->op!=TK_ALL) ){
+        /* This particular expression does not need to be expanded.
+        */
+        pNew = sqlite3ExprListAppend(pParse, pNew, a[k].pExpr, 0);
+        if( pNew ){
+          pNew->a[pNew->nExpr-1].zName = a[k].zName;
+        }else{
+          rc = 1;
+        }
+        a[k].pExpr = 0;
+        a[k].zName = 0;
+      }else{
+        /* This expression is a "*" or a "TABLE.*" and needs to be
+        ** expanded. */
+        int tableSeen = 0;      /* Set to 1 when TABLE matches */
+        char *zTName;            /* text of name of TABLE */
+        if( pE->op==TK_DOT && pE->pLeft ){
+          zTName = sqlite3NameFromToken(db, &pE->pLeft->token);
+        }else{
+          zTName = 0;
+        }
+        for(i=0, pFrom=pTabList->a; i<pTabList->nSrc; i++, pFrom++){
+          Table *pTab = pFrom->pTab;
+          char *zTabName = pFrom->zAlias;
+          if( zTabName==0 || zTabName[0]==0 ){
+            zTabName = pTab->zName;
+          }
+          if( zTName && (zTabName==0 || zTabName[0]==0 ||
+                 sqlite3StrICmp(zTName, zTabName)!=0) ){
+            continue;
+          }
+          tableSeen = 1;
+          for(j=0; j<pTab->nCol; j++){
+            Expr *pExpr, *pRight;
+            char *zName = pTab->aCol[j].zName;
+
+            /* If a column is marked as 'hidden' (currently only possible
+            ** for virtual tables), do not include it in the expanded
+            ** result-set list.
+            */
+            if( IsHiddenColumn(&pTab->aCol[j]) ){
+              assert(IsVirtual(pTab));
+              continue;
+            }
+
+            if( i>0 ){
+              struct SrcList_item *pLeft = &pTabList->a[i-1];
+              if( (pLeft[1].jointype & JT_NATURAL)!=0 &&
+                        columnIndex(pLeft->pTab, zName)>=0 ){
+                /* In a NATURAL join, omit the join columns from the
+                ** table on the right */
+                continue;
+              }
+              if( sqlite3IdListIndex(pLeft[1].pUsing, zName)>=0 ){
+                /* In a join with a USING clause, omit columns in the
+                ** using clause from the table on the right. */
+                continue;
+              }
+            }
+            pRight = sqlite3PExpr(pParse, TK_ID, 0, 0, 0);
+            if( pRight==0 ) break;
+            setQuotedToken(pParse, &pRight->token, zName);
+            if( zTabName && (longNames || pTabList->nSrc>1) ){
+              Expr *pLeft = sqlite3PExpr(pParse, TK_ID, 0, 0, 0);
+              pExpr = sqlite3PExpr(pParse, TK_DOT, pLeft, pRight, 0);
+              if( pExpr==0 ) break;
+              setQuotedToken(pParse, &pLeft->token, zTabName);
+              setToken(&pExpr->span,
+                  sqlite3MPrintf(db, "%s.%s", zTabName, zName));
+              pExpr->span.dyn = 1;
+              pExpr->token.z = 0;
+              pExpr->token.n = 0;
+              pExpr->token.dyn = 0;
+            }else{
+              pExpr = pRight;
+              pExpr->span = pExpr->token;
+              pExpr->span.dyn = 0;
+            }
+            if( longNames ){
+              pNew = sqlite3ExprListAppend(pParse, pNew, pExpr, &pExpr->span);
+            }else{
+              pNew = sqlite3ExprListAppend(pParse, pNew, pExpr, &pRight->token);
+            }
+          }
+        }
+        if( !tableSeen ){
+          if( zTName ){
+            sqlite3ErrorMsg(pParse, "no such table: %s", zTName);
+          }else{
+            sqlite3ErrorMsg(pParse, "no tables specified");
+          }
+          rc = 1;
+        }
+        sqlite3_free(zTName);
+      }
+    }
+    sqlite3ExprListDelete(pEList);
+    p->pEList = pNew;
+  }
+  if( p->pEList && p->pEList->nExpr>SQLITE_MAX_COLUMN ){
+    sqlite3ErrorMsg(pParse, "too many columns in result set");
+    rc = SQLITE_ERROR;
+  }
+  if( db->mallocFailed ){
+    rc = SQLITE_NOMEM;
+  }
+  return rc;
+}
+
+/*
+** pE is a pointer to an expression which is a single term in
+** ORDER BY or GROUP BY clause.
+**
+** If pE evaluates to an integer constant i, then return i.
+** This is an indication to the caller that it should sort
+** by the i-th column of the result set.
+**
+** If pE is a well-formed expression and the SELECT statement
+** is not compound, then return 0.  This indicates to the
+** caller that it should sort by the value of the ORDER BY
+** expression.
+**
+** If the SELECT is compound, then attempt to match pE against
+** result set columns in the left-most SELECT statement.  Return
+** the index i of the matching column, as an indication to the
+** caller that it should sort by the i-th column.  If there is
+** no match, return -1 and leave an error message in pParse.
+*/
+static int matchOrderByTermToExprList(
+  Parse *pParse,     /* Parsing context for error messages */
+  Select *pSelect,   /* The SELECT statement with the ORDER BY clause */
+  Expr *pE,          /* The specific ORDER BY term */
+  int idx,           /* When ORDER BY term is this */
+  int isCompound,    /* True if this is a compound SELECT */
+  u8 *pHasAgg        /* True if expression contains aggregate functions */
+){
+  int i;             /* Loop counter */
+  ExprList *pEList;  /* The columns of the result set */
+  NameContext nc;    /* Name context for resolving pE */
+
+
+  /* If the term is an integer constant, return the value of that
+  ** constant */
+  pEList = pSelect->pEList;
+  if( sqlite3ExprIsInteger(pE, &i) ){
+    if( i<=0 ){
+      /* If i is too small, make it too big.  That way the calling
+      ** function still sees a value that is out of range, but does
+      ** not confuse the column number with 0 or -1 result code.
+      */
+      i = pEList->nExpr+1;
+    }
+    return i;
+  }
+
+  /* If the term is a simple identifier that try to match that identifier
+  ** against a column name in the result set.
+  */
+  if( pE->op==TK_ID || (pE->op==TK_STRING && pE->token.z[0]!='\'') ){
+    sqlite3 *db = pParse->db;
+    char *zCol = sqlite3NameFromToken(db, &pE->token);
+    if( zCol==0 ){
+      return -1;
+    }
+    for(i=0; i<pEList->nExpr; i++){
+      char *zAs = pEList->a[i].zName;
+      if( zAs!=0 && sqlite3StrICmp(zAs, zCol)==0 ){
+        sqlite3_free(zCol);
+        return i+1;
+      }
+    }
+    sqlite3_free(zCol);
+  }
+
+  /* Resolve all names in the ORDER BY term expression
+  */
+  memset(&nc, 0, sizeof(nc));
+  nc.pParse = pParse;
+  nc.pSrcList = pSelect->pSrc;
+  nc.pEList = pEList;
+  nc.allowAgg = 1;
+  nc.nErr = 0;
+  if( sqlite3ExprResolveNames(&nc, pE) ){
+    if( isCompound ){
+      sqlite3ErrorClear(pParse);
+      return 0;
+    }else{
+      return -1;
+    }
+  }
+  if( nc.hasAgg && pHasAgg ){
+    *pHasAgg = 1;
+  }
+
+  /* For a compound SELECT, we need to try to match the ORDER BY
+  ** expression against an expression in the result set
+  */
+  if( isCompound ){
+    for(i=0; i<pEList->nExpr; i++){
+      if( sqlite3ExprCompare(pEList->a[i].pExpr, pE) ){
+        return i+1;
+      }
+    }
+  }
+  return 0;
+}
+
+
+/*
+** Analyze and ORDER BY or GROUP BY clause in a simple SELECT statement.
+** Return the number of errors seen.
+**
+** Every term of the ORDER BY or GROUP BY clause needs to be an
+** expression.  If any expression is an integer constant, then
+** that expression is replaced by the corresponding
+** expression from the result set.
+*/
+static int processOrderGroupBy(
+  Parse *pParse,        /* Parsing context.  Leave error messages here */
+  Select *pSelect,      /* The SELECT statement containing the clause */
+  ExprList *pOrderBy,   /* The ORDER BY or GROUP BY clause to be processed */
+  int isOrder,          /* 1 for ORDER BY.  0 for GROUP BY */
+  u8 *pHasAgg           /* Set to TRUE if any term contains an aggregate */
+){
+  int i;
+  sqlite3 *db = pParse->db;
+  ExprList *pEList;
+
+  if( pOrderBy==0 || pParse->db->mallocFailed ) return 0;
+  if( pOrderBy->nExpr>SQLITE_MAX_COLUMN ){
+    const char *zType = isOrder ? "ORDER" : "GROUP";
+    sqlite3ErrorMsg(pParse, "too many terms in %s BY clause", zType);
+    return 1;
+  }
+  pEList = pSelect->pEList;
+  if( pEList==0 ){
+    return 0;
+  }
+  for(i=0; i<pOrderBy->nExpr; i++){
+    int iCol;
+    Expr *pE = pOrderBy->a[i].pExpr;
+    iCol = matchOrderByTermToExprList(pParse, pSelect, pE, i+1, 0, pHasAgg);
+    if( iCol<0 ){
+      return 1;
+    }
+    if( iCol>pEList->nExpr ){
+      const char *zType = isOrder ? "ORDER" : "GROUP";
+      sqlite3ErrorMsg(pParse,
+         "%r %s BY term out of range - should be "
+         "between 1 and %d", i+1, zType, pEList->nExpr);
+      return 1;
+    }
+    if( iCol>0 ){
+      CollSeq *pColl = pE->pColl;
+      int flags = pE->flags & EP_ExpCollate;
+      sqlite3ExprDelete(pE);
+      pE = sqlite3ExprDup(db, pEList->a[iCol-1].pExpr);
+      pOrderBy->a[i].pExpr = pE;
+      if( pE && pColl && flags ){
+        pE->pColl = pColl;
+        pE->flags |= flags;
+      }
+    }
+  }
+  return 0;
+}
+
+/*
+** Analyze and ORDER BY or GROUP BY clause in a SELECT statement.  Return
+** the number of errors seen.
+**
+** The processing depends on whether the SELECT is simple or compound.
+** For a simple SELECT statement, evry term of the ORDER BY or GROUP BY
+** clause needs to be an expression.  If any expression is an integer
+** constant, then that expression is replaced by the corresponding
+** expression from the result set.
+**
+** For compound SELECT statements, every expression needs to be of
+** type TK_COLUMN with a iTable value as given in the 4th parameter.
+** If any expression is an integer, that becomes the column number.
+** Otherwise, match the expression against result set columns from
+** the left-most SELECT.
+*/
+static int processCompoundOrderBy(
+  Parse *pParse,        /* Parsing context.  Leave error messages here */
+  Select *pSelect,      /* The SELECT statement containing the ORDER BY */
+  int iTable            /* Output table for compound SELECT statements */
+){
+  int i;
+  ExprList *pOrderBy;
+  ExprList *pEList;
+  sqlite3 *db;
+  int moreToDo = 1;
+
+  pOrderBy = pSelect->pOrderBy;
+  if( pOrderBy==0 ) return 0;
+  if( pOrderBy->nExpr>SQLITE_MAX_COLUMN ){
+    sqlite3ErrorMsg(pParse, "too many terms in ORDER BY clause");
+    return 1;
+  }
+  db = pParse->db;
+  for(i=0; i<pOrderBy->nExpr; i++){
+    pOrderBy->a[i].done = 0;
+  }
+  while( pSelect->pPrior ){
+    pSelect = pSelect->pPrior;
+  }
+  while( pSelect && moreToDo ){
+    moreToDo = 0;
+    for(i=0; i<pOrderBy->nExpr; i++){
+      int iCol = -1;
+      Expr *pE, *pDup;
+      if( pOrderBy->a[i].done ) continue;
+      pE = pOrderBy->a[i].pExpr;
+      pDup = sqlite3ExprDup(db, pE);
+      if( !db->mallocFailed ){
+        assert(pDup);
+        iCol = matchOrderByTermToExprList(pParse, pSelect, pDup, i+1, 1, 0);
+      }
+      sqlite3ExprDelete(pDup);
+      if( iCol<0 ){
+        return 1;
+      }
+      pEList = pSelect->pEList;
+      if( pEList==0 ){
+        return 1;
+      }
+      if( iCol>pEList->nExpr ){
+        sqlite3ErrorMsg(pParse,
+           "%r ORDER BY term out of range - should be "
+           "between 1 and %d", i+1, pEList->nExpr);
+        return 1;
+      }
+      if( iCol>0 ){
+        pE->op = TK_COLUMN;
+        pE->iTable = iTable;
+        pE->iAgg = -1;
+        pE->iColumn = iCol-1;
+        pE->pTab = 0;
+        pOrderBy->a[i].done = 1;
+      }else{
+        moreToDo = 1;
+      }
+    }
+    pSelect = pSelect->pNext;
+  }
+  for(i=0; i<pOrderBy->nExpr; i++){
+    if( pOrderBy->a[i].done==0 ){
+      sqlite3ErrorMsg(pParse, "%r ORDER BY term does not match any "
+            "column in the result set", i+1);
+      return 1;
+    }
+  }
+  return 0;
+}
+
+/*
+** Get a VDBE for the given parser context.  Create a new one if necessary.
+** If an error occurs, return NULL and leave a message in pParse.
+*/
+Vdbe *sqlite3GetVdbe(Parse *pParse){
+  Vdbe *v = pParse->pVdbe;
+  if( v==0 ){
+    v = pParse->pVdbe = sqlite3VdbeCreate(pParse->db);
+#ifndef SQLITE_OMIT_TRACE
+    if( v ){
+      sqlite3VdbeAddOp0(v, OP_Trace);
+    }
+#endif
+  }
+  return v;
+}
+
+
+/*
+** Compute the iLimit and iOffset fields of the SELECT based on the
+** pLimit and pOffset expressions.  pLimit and pOffset hold the expressions
+** that appear in the original SQL statement after the LIMIT and OFFSET
+** keywords.  Or NULL if those keywords are omitted. iLimit and iOffset
+** are the integer memory register numbers for counters used to compute
+** the limit and offset.  If there is no limit and/or offset, then
+** iLimit and iOffset are negative.
+**
+** This routine changes the values of iLimit and iOffset only if
+** a limit or offset is defined by pLimit and pOffset.  iLimit and
+** iOffset should have been preset to appropriate default values
+** (usually but not always -1) prior to calling this routine.
+** Only if pLimit!=0 or pOffset!=0 do the limit registers get
+** redefined.  The UNION ALL operator uses this property to force
+** the reuse of the same limit and offset registers across multiple
+** SELECT statements.
+*/
+static void computeLimitRegisters(Parse *pParse, Select *p, int iBreak){
+  Vdbe *v = 0;
+  int iLimit = 0;
+  int iOffset;
+  int addr1;
+
+  /*
+  ** "LIMIT -1" always shows all rows.  There is some
+  ** contraversy about what the correct behavior should be.
+  ** The current implementation interprets "LIMIT 0" to mean
+  ** no rows.
+  */
+  if( p->pLimit ){
+    p->iLimit = iLimit = ++pParse->nMem;
+    v = sqlite3GetVdbe(pParse);
+    if( v==0 ) return;
+    sqlite3ExprCode(pParse, p->pLimit, iLimit);
+    sqlite3VdbeAddOp1(v, OP_MustBeInt, iLimit);
+    VdbeComment((v, "LIMIT counter"));
+    sqlite3VdbeAddOp2(v, OP_IfZero, iLimit, iBreak);
+  }
+  if( p->pOffset ){
+    p->iOffset = iOffset = ++pParse->nMem;
+    if( p->pLimit ){
+      pParse->nMem++;   /* Allocate an extra register for limit+offset */
+    }
+    v = sqlite3GetVdbe(pParse);
+    if( v==0 ) return;
+    sqlite3ExprCode(pParse, p->pOffset, iOffset);
+    sqlite3VdbeAddOp1(v, OP_MustBeInt, iOffset);
+    VdbeComment((v, "OFFSET counter"));
+    addr1 = sqlite3VdbeAddOp1(v, OP_IfPos, iOffset);
+    sqlite3VdbeAddOp2(v, OP_Integer, 0, iOffset);
+    sqlite3VdbeJumpHere(v, addr1);
+    if( p->pLimit ){
+      sqlite3VdbeAddOp3(v, OP_Add, iLimit, iOffset, iOffset+1);
+      VdbeComment((v, "LIMIT+OFFSET"));
+      addr1 = sqlite3VdbeAddOp1(v, OP_IfPos, iLimit);
+      sqlite3VdbeAddOp2(v, OP_Integer, -1, iOffset+1);
+      sqlite3VdbeJumpHere(v, addr1);
+    }
+  }
+}
+
+/*
+** Allocate a virtual index to use for sorting.
+*/
+static void createSortingIndex(Parse *pParse, Select *p, ExprList *pOrderBy){
+  if( pOrderBy ){
+    int addr;
+    assert( pOrderBy->iECursor==0 );
+    pOrderBy->iECursor = pParse->nTab++;
+    addr = sqlite3VdbeAddOp2(pParse->pVdbe, OP_OpenEphemeral,
+                            pOrderBy->iECursor, pOrderBy->nExpr+1);
+    assert( p->addrOpenEphm[2] == -1 );
+    p->addrOpenEphm[2] = addr;
+  }
+}
+
+#ifndef SQLITE_OMIT_COMPOUND_SELECT
+/*
+** Return the appropriate collating sequence for the iCol-th column of
+** the result set for the compound-select statement "p".  Return NULL if
+** the column has no default collating sequence.
+**
+** The collating sequence for the compound select is taken from the
+** left-most term of the select that has a collating sequence.
+*/
+static CollSeq *multiSelectCollSeq(Parse *pParse, Select *p, int iCol){
+  CollSeq *pRet;
+  if( p->pPrior ){
+    pRet = multiSelectCollSeq(pParse, p->pPrior, iCol);
+  }else{
+    pRet = 0;
+  }
+  if( pRet==0 ){
+    pRet = sqlite3ExprCollSeq(pParse, p->pEList->a[iCol].pExpr);
+  }
+  return pRet;
+}
+#endif /* SQLITE_OMIT_COMPOUND_SELECT */
+
+#ifndef SQLITE_OMIT_COMPOUND_SELECT
+/*
+** This routine is called to process a query that is really the union
+** or intersection of two or more separate queries.
+**
+** "p" points to the right-most of the two queries.  the query on the
+** left is p->pPrior.  The left query could also be a compound query
+** in which case this routine will be called recursively.
+**
+** The results of the total query are to be written into a destination
+** of type eDest with parameter iParm.
+**
+** Example 1:  Consider a three-way compound SQL statement.
+**
+**     SELECT a FROM t1 UNION SELECT b FROM t2 UNION SELECT c FROM t3
+**
+** This statement is parsed up as follows:
+**
+**     SELECT c FROM t3
+**      |
+**      `----->  SELECT b FROM t2
+**                |
+**                `------>  SELECT a FROM t1
+**
+** The arrows in the diagram above represent the Select.pPrior pointer.
+** So if this routine is called with p equal to the t3 query, then
+** pPrior will be the t2 query.  p->op will be TK_UNION in this case.
+**
+** Notice that because of the way SQLite parses compound SELECTs, the
+** individual selects always group from left to right.
+*/
+static int multiSelect(
+  Parse *pParse,        /* Parsing context */
+  Select *p,            /* The right-most of SELECTs to be coded */
+  SelectDest *pDest,    /* What to do with query results */
+  char *aff             /* If eDest is SRT_Union, the affinity string */
+){
+  int rc = SQLITE_OK;   /* Success code from a subroutine */
+  Select *pPrior;       /* Another SELECT immediately to our left */
+  Vdbe *v;              /* Generate code to this VDBE */
+  int nCol;             /* Number of columns in the result set */
+  ExprList *pOrderBy;   /* The ORDER BY clause on p */
+  int aSetP2[2];        /* Set P2 value of these op to number of columns */
+  int nSetP2 = 0;       /* Number of slots in aSetP2[] used */
+  SelectDest dest;      /* Alternative data destination */
+
+  dest = *pDest;
+
+  /* Make sure there is no ORDER BY or LIMIT clause on prior SELECTs.  Only
+  ** the last (right-most) SELECT in the series may have an ORDER BY or LIMIT.
+  */
+  if( p==0 || p->pPrior==0 ){
+    rc = 1;
+    goto multi_select_end;
+  }
+  pPrior = p->pPrior;
+  assert( pPrior->pRightmost!=pPrior );
+  assert( pPrior->pRightmost==p->pRightmost );
+  if( pPrior->pOrderBy ){
+    sqlite3ErrorMsg(pParse,"ORDER BY clause should come after %s not before",
+      selectOpName(p->op));
+    rc = 1;
+    goto multi_select_end;
+  }
+  if( pPrior->pLimit ){
+    sqlite3ErrorMsg(pParse,"LIMIT clause should come after %s not before",
+      selectOpName(p->op));
+    rc = 1;
+    goto multi_select_end;
+  }
+
+  /* Make sure we have a valid query engine.  If not, create a new one.
+  */
+  v = sqlite3GetVdbe(pParse);
+  if( v==0 ){
+    rc = 1;
+    goto multi_select_end;
+  }
+
+  /* Create the destination temporary table if necessary
+  */
+  if( dest.eDest==SRT_EphemTab ){
+    assert( p->pEList );
+    assert( nSetP2<sizeof(aSetP2)/sizeof(aSetP2[0]) );
+    aSetP2[nSetP2++] = sqlite3VdbeAddOp2(v, OP_OpenEphemeral, dest.iParm, 0);
+    dest.eDest = SRT_Table;
+  }
+
+  /* Generate code for the left and right SELECT statements.
+  */
+  pOrderBy = p->pOrderBy;
+  switch( p->op ){
+    case TK_ALL: {
+      if( pOrderBy==0 ){
+        int addr = 0;
+        assert( !pPrior->pLimit );
+        pPrior->pLimit = p->pLimit;
+        pPrior->pOffset = p->pOffset;
+        rc = sqlite3Select(pParse, pPrior, &dest, 0, 0, 0, aff);
+        p->pLimit = 0;
+        p->pOffset = 0;
+        if( rc ){
+          goto multi_select_end;
+        }
+        p->pPrior = 0;
+        p->iLimit = pPrior->iLimit;
+        p->iOffset = pPrior->iOffset;
+        if( p->iLimit>=0 ){
+          addr = sqlite3VdbeAddOp1(v, OP_IfZero, p->iLimit);
+          VdbeComment((v, "Jump ahead if LIMIT reached"));
+        }
+        rc = sqlite3Select(pParse, p, &dest, 0, 0, 0, aff);
+        p->pPrior = pPrior;
+        if( rc ){
+          goto multi_select_end;
+        }
+        if( addr ){
+          sqlite3VdbeJumpHere(v, addr);
+        }
+        break;
+      }
+      /* For UNION ALL ... ORDER BY fall through to the next case */
+    }
+    case TK_EXCEPT:
+    case TK_UNION: {
+      int unionTab;    /* Cursor number of the temporary table holding result */
+      int op = 0;      /* One of the SRT_ operations to apply to self */
+      int priorOp;     /* The SRT_ operation to apply to prior selects */
+      Expr *pLimit, *pOffset; /* Saved values of p->nLimit and p->nOffset */
+      int addr;
+      SelectDest uniondest;
+
+      priorOp = p->op==TK_ALL ? SRT_Table : SRT_Union;
+      if( dest.eDest==priorOp && pOrderBy==0 && !p->pLimit && !p->pOffset ){
+        /* We can reuse a temporary table generated by a SELECT to our
+        ** right.
+        */
+        unionTab = dest.iParm;
+      }else{
+        /* We will need to create our own temporary table to hold the
+        ** intermediate results.
+        */
+        unionTab = pParse->nTab++;
+        if( processCompoundOrderBy(pParse, p, unionTab) ){
+          rc = 1;
+          goto multi_select_end;
+        }
+        addr = sqlite3VdbeAddOp2(v, OP_OpenEphemeral, unionTab, 0);
+        if( priorOp==SRT_Table ){
+          assert( nSetP2<sizeof(aSetP2)/sizeof(aSetP2[0]) );
+          aSetP2[nSetP2++] = addr;
+        }else{
+          assert( p->addrOpenEphm[0] == -1 );
+          p->addrOpenEphm[0] = addr;
+          p->pRightmost->usesEphm = 1;
+        }
+        createSortingIndex(pParse, p, pOrderBy);
+        assert( p->pEList );
+      }
+
+      /* Code the SELECT statements to our left
+      */
+      assert( !pPrior->pOrderBy );
+      sqlite3SelectDestInit(&uniondest, priorOp, unionTab);
+      rc = sqlite3Select(pParse, pPrior, &uniondest, 0, 0, 0, aff);
+      if( rc ){
+        goto multi_select_end;
+      }
+
+      /* Code the current SELECT statement
+      */
+      switch( p->op ){
+         case TK_EXCEPT:  op = SRT_Except;   break;
+         case TK_UNION:   op = SRT_Union;    break;
+         case TK_ALL:     op = SRT_Table;    break;
+      }
+      p->pPrior = 0;
+      p->pOrderBy = 0;
+      p->disallowOrderBy = pOrderBy!=0;
+      pLimit = p->pLimit;
+      p->pLimit = 0;
+      pOffset = p->pOffset;
+      p->pOffset = 0;
+      uniondest.eDest = op;
+      rc = sqlite3Select(pParse, p, &uniondest, 0, 0, 0, aff);
+      /* Query flattening in sqlite3Select() might refill p->pOrderBy.
+      ** Be sure to delete p->pOrderBy, therefore, to avoid a memory leak. */
+      sqlite3ExprListDelete(p->pOrderBy);
+      p->pPrior = pPrior;
+      p->pOrderBy = pOrderBy;
+      sqlite3ExprDelete(p->pLimit);
+      p->pLimit = pLimit;
+      p->pOffset = pOffset;
+      p->iLimit = -1;
+      p->iOffset = -1;
+      if( rc ){
+        goto multi_select_end;
+      }
+
+
+      /* Convert the data in the temporary table into whatever form
+      ** it is that we currently need.
+      */
+      if( dest.eDest!=priorOp || unionTab!=dest.iParm ){
+        int iCont, iBreak, iStart;
+        assert( p->pEList );
+        if( dest.eDest==SRT_Callback ){
+          Select *pFirst = p;
+          while( pFirst->pPrior ) pFirst = pFirst->pPrior;
+          generateColumnNames(pParse, 0, pFirst->pEList);
+        }
+        iBreak = sqlite3VdbeMakeLabel(v);
+        iCont = sqlite3VdbeMakeLabel(v);
+        computeLimitRegisters(pParse, p, iBreak);
+        sqlite3VdbeAddOp2(v, OP_Rewind, unionTab, iBreak);
+        iStart = sqlite3VdbeCurrentAddr(v);
+        selectInnerLoop(pParse, p, p->pEList, unionTab, p->pEList->nExpr,
+                        pOrderBy, -1, &dest, iCont, iBreak, 0);
+        sqlite3VdbeResolveLabel(v, iCont);
+        sqlite3VdbeAddOp2(v, OP_Next, unionTab, iStart);
+        sqlite3VdbeResolveLabel(v, iBreak);
+        sqlite3VdbeAddOp2(v, OP_Close, unionTab, 0);
+      }
+      break;
+    }
+    case TK_INTERSECT: {
+      int tab1, tab2;
+      int iCont, iBreak, iStart;
+      Expr *pLimit, *pOffset;
+      int addr;
+      SelectDest intersectdest;
+      int r1;
+
+      /* INTERSECT is different from the others since it requires
+      ** two temporary tables.  Hence it has its own case.  Begin
+      ** by allocating the tables we will need.
+      */
+      tab1 = pParse->nTab++;
+      tab2 = pParse->nTab++;
+      if( processCompoundOrderBy(pParse, p, tab1) ){
+        rc = 1;
+        goto multi_select_end;
+      }
+      createSortingIndex(pParse, p, pOrderBy);
+
+      addr = sqlite3VdbeAddOp2(v, OP_OpenEphemeral, tab1, 0);
+      assert( p->addrOpenEphm[0] == -1 );
+      p->addrOpenEphm[0] = addr;
+      p->pRightmost->usesEphm = 1;
+      assert( p->pEList );
+
+      /* Code the SELECTs to our left into temporary table "tab1".
+      */
+      sqlite3SelectDestInit(&intersectdest, SRT_Union, tab1);
+      rc = sqlite3Select(pParse, pPrior, &intersectdest, 0, 0, 0, aff);
+      if( rc ){
+        goto multi_select_end;
+      }
+
+      /* Code the current SELECT into temporary table "tab2"
+      */
+      addr = sqlite3VdbeAddOp2(v, OP_OpenEphemeral, tab2, 0);
+      assert( p->addrOpenEphm[1] == -1 );
+      p->addrOpenEphm[1] = addr;
+      p->pPrior = 0;
+      pLimit = p->pLimit;
+      p->pLimit = 0;
+      pOffset = p->pOffset;
+      p->pOffset = 0;
+      intersectdest.iParm = tab2;
+      rc = sqlite3Select(pParse, p, &intersectdest, 0, 0, 0, aff);
+      p->pPrior = pPrior;
+      sqlite3ExprDelete(p->pLimit);
+      p->pLimit = pLimit;
+      p->pOffset = pOffset;
+      if( rc ){
+        goto multi_select_end;
+      }
+
+      /* Generate code to take the intersection of the two temporary
+      ** tables.
+      */
+      assert( p->pEList );
+      if( dest.eDest==SRT_Callback ){
+        Select *pFirst = p;
+        while( pFirst->pPrior ) pFirst = pFirst->pPrior;
+        generateColumnNames(pParse, 0, pFirst->pEList);
+      }
+      iBreak = sqlite3VdbeMakeLabel(v);
+      iCont = sqlite3VdbeMakeLabel(v);
+      computeLimitRegisters(pParse, p, iBreak);
+      sqlite3VdbeAddOp2(v, OP_Rewind, tab1, iBreak);
+      r1 = sqlite3GetTempReg(pParse);
+      iStart = sqlite3VdbeAddOp2(v, OP_RowKey, tab1, r1);
+      sqlite3VdbeAddOp3(v, OP_NotFound, tab2, iCont, r1);
+      sqlite3ReleaseTempReg(pParse, r1);
+      selectInnerLoop(pParse, p, p->pEList, tab1, p->pEList->nExpr,
+                      pOrderBy, -1, &dest, iCont, iBreak, 0);
+      sqlite3VdbeResolveLabel(v, iCont);
+      sqlite3VdbeAddOp2(v, OP_Next, tab1, iStart);
+      sqlite3VdbeResolveLabel(v, iBreak);
+      sqlite3VdbeAddOp2(v, OP_Close, tab2, 0);
+      sqlite3VdbeAddOp2(v, OP_Close, tab1, 0);
+      break;
+    }
+  }
+
+  /* Make sure all SELECTs in the statement have the same number of elements
+  ** in their result sets.
+  */
+  assert( p->pEList && pPrior->pEList );
+  if( p->pEList->nExpr!=pPrior->pEList->nExpr ){
+    sqlite3ErrorMsg(pParse, "SELECTs to the left and right of %s"
+      " do not have the same number of result columns", selectOpName(p->op));
+    rc = 1;
+    goto multi_select_end;
+  }
+
+  /* Set the number of columns in temporary tables
+  */
+  nCol = p->pEList->nExpr;
+  while( nSetP2 ){
+    sqlite3VdbeChangeP2(v, aSetP2[--nSetP2], nCol);
+  }
+
+  /* Compute collating sequences used by either the ORDER BY clause or
+  ** by any temporary tables needed to implement the compound select.
+  ** Attach the KeyInfo structure to all temporary tables.  Invoke the
+  ** ORDER BY processing if there is an ORDER BY clause.
+  **
+  ** This section is run by the right-most SELECT statement only.
+  ** SELECT statements to the left always skip this part.  The right-most
+  ** SELECT might also skip this part if it has no ORDER BY clause and
+  ** no temp tables are required.
+  */
+  if( pOrderBy || p->usesEphm ){
+    int i;                        /* Loop counter */
+    KeyInfo *pKeyInfo;            /* Collating sequence for the result set */
+    Select *pLoop;                /* For looping through SELECT statements */
+    int nKeyCol;                  /* Number of entries in pKeyInfo->aCol[] */
+    CollSeq **apColl;             /* For looping through pKeyInfo->aColl[] */
+    CollSeq **aCopy;              /* A copy of pKeyInfo->aColl[] */
+
+    assert( p->pRightmost==p );
+    nKeyCol = nCol + (pOrderBy ? pOrderBy->nExpr : 0);
+    pKeyInfo = sqlite3DbMallocZero(pParse->db,
+                       sizeof(*pKeyInfo)+nKeyCol*(sizeof(CollSeq*) + 1));
+    if( !pKeyInfo ){
+      rc = SQLITE_NOMEM;
+      goto multi_select_end;
+    }
+
+    pKeyInfo->enc = ENC(pParse->db);
+    pKeyInfo->nField = nCol;
+
+    for(i=0, apColl=pKeyInfo->aColl; i<nCol; i++, apColl++){
+      *apColl = multiSelectCollSeq(pParse, p, i);
+      if( 0==*apColl ){
+        *apColl = pParse->db->pDfltColl;
+      }
+    }
+
+    for(pLoop=p; pLoop; pLoop=pLoop->pPrior){
+      for(i=0; i<2; i++){
+        int addr = pLoop->addrOpenEphm[i];
+        if( addr<0 ){
+          /* If [0] is unused then [1] is also unused.  So we can
+          ** always safely abort as soon as the first unused slot is found */
+          assert( pLoop->addrOpenEphm[1]<0 );
+          break;
+        }
+        sqlite3VdbeChangeP2(v, addr, nCol);
+        sqlite3VdbeChangeP4(v, addr, (char*)pKeyInfo, P4_KEYINFO);
+        pLoop->addrOpenEphm[i] = -1;
+      }
+    }
+
+    if( pOrderBy ){
+      struct ExprList_item *pOTerm = pOrderBy->a;
+      int nOrderByExpr = pOrderBy->nExpr;
+      int addr;
+      u8 *pSortOrder;
+
+      /* Reuse the same pKeyInfo for the ORDER BY as was used above for
+      ** the compound select statements.  Except we have to change out the
+      ** pKeyInfo->aColl[] values.  Some of the aColl[] values will be
+      ** reused when constructing the pKeyInfo for the ORDER BY, so make
+      ** a copy.  Sufficient space to hold both the nCol entries for
+      ** the compound select and the nOrderbyExpr entries for the ORDER BY
+      ** was allocated above.  But we need to move the compound select
+      ** entries out of the way before constructing the ORDER BY entries.
+      ** Move the compound select entries into aCopy[] where they can be
+      ** accessed and reused when constructing the ORDER BY entries.
+      ** Because nCol might be greater than or less than nOrderByExpr
+      ** we have to use memmove() when doing the copy.
+      */
+      aCopy = &pKeyInfo->aColl[nOrderByExpr];
+      pSortOrder = pKeyInfo->aSortOrder = (u8*)&aCopy[nCol];
+      memmove(aCopy, pKeyInfo->aColl, nCol*sizeof(CollSeq*));
+
+      apColl = pKeyInfo->aColl;
+      for(i=0; i<nOrderByExpr; i++, pOTerm++, apColl++, pSortOrder++){
+        Expr *pExpr = pOTerm->pExpr;
+        if( (pExpr->flags & EP_ExpCollate) ){
+          assert( pExpr->pColl!=0 );
+          *apColl = pExpr->pColl;
+        }else{
+          *apColl = aCopy[pExpr->iColumn];
+        }
+        *pSortOrder = pOTerm->sortOrder;
+      }
+      assert( p->pRightmost==p );
+      assert( p->addrOpenEphm[2]>=0 );
+      addr = p->addrOpenEphm[2];
+      sqlite3VdbeChangeP2(v, addr, p->pOrderBy->nExpr+2);
+      pKeyInfo->nField = nOrderByExpr;
+      sqlite3VdbeChangeP4(v, addr, (char*)pKeyInfo, P4_KEYINFO_HANDOFF);
+      pKeyInfo = 0;
+      generateSortTail(pParse, p, v, p->pEList->nExpr, &dest);
+    }
+
+    sqlite3_free(pKeyInfo);
+  }
+
+multi_select_end:
+  pDest->iMem = dest.iMem;
+  return rc;
+}
+#endif /* SQLITE_OMIT_COMPOUND_SELECT */
+
+#ifndef SQLITE_OMIT_VIEW
+/* Forward Declarations */
+static void substExprList(sqlite3*, ExprList*, int, ExprList*);
+static void substSelect(sqlite3*, Select *, int, ExprList *);
+
+/*
+** Scan through the expression pExpr.  Replace every reference to
+** a column in table number iTable with a copy of the iColumn-th
+** entry in pEList.  (But leave references to the ROWID column
+** unchanged.)
+**
+** This routine is part of the flattening procedure.  A subquery
+** whose result set is defined by pEList appears as entry in the
+** FROM clause of a SELECT such that the VDBE cursor assigned to that
+** FORM clause entry is iTable.  This routine make the necessary
+** changes to pExpr so that it refers directly to the source table
+** of the subquery rather the result set of the subquery.
+*/
+static void substExpr(
+  sqlite3 *db,        /* Report malloc errors to this connection */
+  Expr *pExpr,        /* Expr in which substitution occurs */
+  int iTable,         /* Table to be substituted */
+  ExprList *pEList    /* Substitute expressions */
+){
+  if( pExpr==0 ) return;
+  if( pExpr->op==TK_COLUMN && pExpr->iTable==iTable ){
+    if( pExpr->iColumn<0 ){
+      pExpr->op = TK_NULL;
+    }else{
+      Expr *pNew;
+      assert( pEList!=0 && pExpr->iColumn<pEList->nExpr );
+      assert( pExpr->pLeft==0 && pExpr->pRight==0 && pExpr->pList==0 );
+      pNew = pEList->a[pExpr->iColumn].pExpr;
+      assert( pNew!=0 );
+      pExpr->op = pNew->op;
+      assert( pExpr->pLeft==0 );
+      pExpr->pLeft = sqlite3ExprDup(db, pNew->pLeft);
+      assert( pExpr->pRight==0 );
+      pExpr->pRight = sqlite3ExprDup(db, pNew->pRight);
+      assert( pExpr->pList==0 );
+      pExpr->pList = sqlite3ExprListDup(db, pNew->pList);
+      pExpr->iTable = pNew->iTable;
+      pExpr->pTab = pNew->pTab;
+      pExpr->iColumn = pNew->iColumn;
+      pExpr->iAgg = pNew->iAgg;
+      sqlite3TokenCopy(db, &pExpr->token, &pNew->token);
+      sqlite3TokenCopy(db, &pExpr->span, &pNew->span);
+      pExpr->pSelect = sqlite3SelectDup(db, pNew->pSelect);
+      pExpr->flags = pNew->flags;
+    }
+  }else{
+    substExpr(db, pExpr->pLeft, iTable, pEList);
+    substExpr(db, pExpr->pRight, iTable, pEList);
+    substSelect(db, pExpr->pSelect, iTable, pEList);
+    substExprList(db, pExpr->pList, iTable, pEList);
+  }
+}
+static void substExprList(
+  sqlite3 *db,         /* Report malloc errors here */
+  ExprList *pList,     /* List to scan and in which to make substitutes */
+  int iTable,          /* Table to be substituted */
+  ExprList *pEList     /* Substitute values */
+){
+  int i;
+  if( pList==0 ) return;
+  for(i=0; i<pList->nExpr; i++){
+    substExpr(db, pList->a[i].pExpr, iTable, pEList);
+  }
+}
+static void substSelect(
+  sqlite3 *db,         /* Report malloc errors here */
+  Select *p,           /* SELECT statement in which to make substitutions */
+  int iTable,          /* Table to be replaced */
+  ExprList *pEList     /* Substitute values */
+){
+  if( !p ) return;
+  substExprList(db, p->pEList, iTable, pEList);
+  substExprList(db, p->pGroupBy, iTable, pEList);
+  substExprList(db, p->pOrderBy, iTable, pEList);
+  substExpr(db, p->pHaving, iTable, pEList);
+  substExpr(db, p->pWhere, iTable, pEList);
+  substSelect(db, p->pPrior, iTable, pEList);
+}
+#endif /* !defined(SQLITE_OMIT_VIEW) */
+
+#ifndef SQLITE_OMIT_VIEW
+/*
+** This routine attempts to flatten subqueries in order to speed
+** execution.  It returns 1 if it makes changes and 0 if no flattening
+** occurs.
+**
+** To understand the concept of flattening, consider the following
+** query:
+**
+**     SELECT a FROM (SELECT x+y AS a FROM t1 WHERE z<100) WHERE a>5
+**
+** The default way of implementing this query is to execute the
+** subquery first and store the results in a temporary table, then
+** run the outer query on that temporary table.  This requires two
+** passes over the data.  Furthermore, because the temporary table
+** has no indices, the WHERE clause on the outer query cannot be
+** optimized.
+**
+** This routine attempts to rewrite queries such as the above into
+** a single flat select, like this:
+**
+**     SELECT x+y AS a FROM t1 WHERE z<100 AND a>5
+**
+** The code generated for this simpification gives the same result
+** but only has to scan the data once.  And because indices might
+** exist on the table t1, a complete scan of the data might be
+** avoided.
+**
+** Flattening is only attempted if all of the following are true:
+**
+**   (1)  The subquery and the outer query do not both use aggregates.
+**
+**   (2)  The subquery is not an aggregate or the outer query is not a join.
+**
+**   (3)  The subquery is not the right operand of a left outer join, or
+**        the subquery is not itself a join.  (Ticket #306)
+**
+**   (4)  The subquery is not DISTINCT or the outer query is not a join.
+**
+**   (5)  The subquery is not DISTINCT or the outer query does not use
+**        aggregates.
+**
+**   (6)  The subquery does not use aggregates or the outer query is not
+**        DISTINCT.
+**
+**   (7)  The subquery has a FROM clause.
+**
+**   (8)  The subquery does not use LIMIT or the outer query is not a join.
+**
+**   (9)  The subquery does not use LIMIT or the outer query does not use
+**        aggregates.
+**
+**  (10)  The subquery does not use aggregates or the outer query does not
+**        use LIMIT.
+**
+**  (11)  The subquery and the outer query do not both have ORDER BY clauses.
+**
+**  (12)  The subquery is not the right term of a LEFT OUTER JOIN or the
+**        subquery has no WHERE clause.  (added by ticket #350)
+**
+**  (13)  The subquery and outer query do not both use LIMIT
+**
+**  (14)  The subquery does not use OFFSET
+**
+**  (15)  The outer query is not part of a compound select or the
+**        subquery does not have both an ORDER BY and a LIMIT clause.
+**        (See ticket #2339)
+**
+**  (16)  The outer query is not an aggregate or the subquery does
+**        not contain ORDER BY.  (Ticket #2942)  This used to not matter
+**        until we introduced the group_concat() function.
+**
+** In this routine, the "p" parameter is a pointer to the outer query.
+** The subquery is p->pSrc->a[iFrom].  isAgg is true if the outer query
+** uses aggregates and subqueryIsAgg is true if the subquery uses aggregates.
+**
+** If flattening is not attempted, this routine is a no-op and returns 0.
+** If flattening is attempted this routine returns 1.
+**
+** All of the expression analysis must occur on both the outer query and
+** the subquery before this routine runs.
+*/
+static int flattenSubquery(
+  sqlite3 *db,         /* Database connection */
+  Select *p,           /* The parent or outer SELECT statement */
+  int iFrom,           /* Index in p->pSrc->a[] of the inner subquery */
+  int isAgg,           /* True if outer SELECT uses aggregate functions */
+  int subqueryIsAgg    /* True if the subquery uses aggregate functions */
+){
+  Select *pSub;       /* The inner query or "subquery" */
+  SrcList *pSrc;      /* The FROM clause of the outer query */
+  SrcList *pSubSrc;   /* The FROM clause of the subquery */
+  ExprList *pList;    /* The result set of the outer query */
+  int iParent;        /* VDBE cursor number of the pSub result set temp table */
+  int i;              /* Loop counter */
+  Expr *pWhere;                    /* The WHERE clause */
+  struct SrcList_item *pSubitem;   /* The subquery */
+
+  /* Check to see if flattening is permitted.  Return 0 if not.
+  */
+  if( p==0 ) return 0;
+  pSrc = p->pSrc;
+  assert( pSrc && iFrom>=0 && iFrom<pSrc->nSrc );
+  pSubitem = &pSrc->a[iFrom];
+  pSub = pSubitem->pSelect;
+  assert( pSub!=0 );
+  if( isAgg && subqueryIsAgg ) return 0;                 /* Restriction (1)  */
+  if( subqueryIsAgg && pSrc->nSrc>1 ) return 0;          /* Restriction (2)  */
+  pSubSrc = pSub->pSrc;
+  assert( pSubSrc );
+  /* Prior to version 3.1.2, when LIMIT and OFFSET had to be simple constants,
+  ** not arbitrary expresssions, we allowed some combining of LIMIT and OFFSET
+  ** because they could be computed at compile-time.  But when LIMIT and OFFSET
+  ** became arbitrary expressions, we were forced to add restrictions (13)
+  ** and (14). */
+  if( pSub->pLimit && p->pLimit ) return 0;              /* Restriction (13) */
+  if( pSub->pOffset ) return 0;                          /* Restriction (14) */
+  if( p->pRightmost && pSub->pLimit && pSub->pOrderBy ){
+    return 0;                                            /* Restriction (15) */
+  }
+  if( pSubSrc->nSrc==0 ) return 0;                       /* Restriction (7)  */
+  if( (pSub->isDistinct || pSub->pLimit)
+         && (pSrc->nSrc>1 || isAgg) ){          /* Restrictions (4)(5)(8)(9) */
+     return 0;
+  }
+  if( p->isDistinct && subqueryIsAgg ) return 0;         /* Restriction (6)  */
+  if( (p->disallowOrderBy || p->pOrderBy) && pSub->pOrderBy ){
+     return 0;                                           /* Restriction (11) */
+  }
+  if( isAgg && pSub->pOrderBy ) return 0;                /* Restriction (16) */
+
+  /* Restriction 3:  If the subquery is a join, make sure the subquery is
+  ** not used as the right operand of an outer join.  Examples of why this
+  ** is not allowed:
+  **
+  **         t1 LEFT OUTER JOIN (t2 JOIN t3)
+  **
+  ** If we flatten the above, we would get
+  **
+  **         (t1 LEFT OUTER JOIN t2) JOIN t3
+  **
+  ** which is not at all the same thing.
+  */
+  if( pSubSrc->nSrc>1 && (pSubitem->jointype & JT_OUTER)!=0 ){
+    return 0;
+  }
+
+  /* Restriction 12:  If the subquery is the right operand of a left outer
+  ** join, make sure the subquery has no WHERE clause.
+  ** An examples of why this is not allowed:
+  **
+  **         t1 LEFT OUTER JOIN (SELECT * FROM t2 WHERE t2.x>0)
+  **
+  ** If we flatten the above, we would get
+  **
+  **         (t1 LEFT OUTER JOIN t2) WHERE t2.x>0
+  **
+  ** But the t2.x>0 test will always fail on a NULL row of t2, which
+  ** effectively converts the OUTER JOIN into an INNER JOIN.
+  */
+  if( (pSubitem->jointype & JT_OUTER)!=0 && pSub->pWhere!=0 ){
+    return 0;
+  }
+
+  /* If we reach this point, it means flattening is permitted for the
+  ** iFrom-th entry of the FROM clause in the outer query.
+  */
+
+  /* Move all of the FROM elements of the subquery into the
+  ** the FROM clause of the outer query.  Before doing this, remember
+  ** the cursor number for the original outer query FROM element in
+  ** iParent.  The iParent cursor will never be used.  Subsequent code
+  ** will scan expressions looking for iParent references and replace
+  ** those references with expressions that resolve to the subquery FROM
+  ** elements we are now copying in.
+  */
+  iParent = pSubitem->iCursor;
+  {
+    int nSubSrc = pSubSrc->nSrc;
+    int jointype = pSubitem->jointype;
+
+    sqlite3DeleteTable(pSubitem->pTab);
+    sqlite3_free(pSubitem->zDatabase);
+    sqlite3_free(pSubitem->zName);
+    sqlite3_free(pSubitem->zAlias);
+    pSubitem->pTab = 0;
+    pSubitem->zDatabase = 0;
+    pSubitem->zName = 0;
+    pSubitem->zAlias = 0;
+    if( nSubSrc>1 ){
+      int extra = nSubSrc - 1;
+      for(i=1; i<nSubSrc; i++){
+        pSrc = sqlite3SrcListAppend(db, pSrc, 0, 0);
+        if( pSrc==0 ){
+          p->pSrc = 0;
+          return 1;
+        }
+      }
+      p->pSrc = pSrc;
+      for(i=pSrc->nSrc-1; i-extra>=iFrom; i--){
+        pSrc->a[i] = pSrc->a[i-extra];
+      }
+    }
+    for(i=0; i<nSubSrc; i++){
+      pSrc->a[i+iFrom] = pSubSrc->a[i];
+      memset(&pSubSrc->a[i], 0, sizeof(pSubSrc->a[i]));
+    }
+    pSrc->a[iFrom].jointype = jointype;
+  }
+
+  /* Now begin substituting subquery result set expressions for
+  ** references to the iParent in the outer query.
+  **
+  ** Example:
+  **
+  **   SELECT a+5, b*10 FROM (SELECT x*3 AS a, y+10 AS b FROM t1) WHERE a>b;
+  **   \                     \_____________ subquery __________/          /
+  **    \_____________________ outer query ______________________________/
+  **
+  ** We look at every expression in the outer query and every place we see
+  ** "a" we substitute "x*3" and every place we see "b" we substitute "y+10".
+  */
+  pList = p->pEList;
+  for(i=0; i<pList->nExpr; i++){
+    Expr *pExpr;
+    if( pList->a[i].zName==0 && (pExpr = pList->a[i].pExpr)->span.z!=0 ){
+      pList->a[i].zName =
+             sqlite3DbStrNDup(db, (char*)pExpr->span.z, pExpr->span.n);
+    }
+  }
+  substExprList(db, p->pEList, iParent, pSub->pEList);
+  if( isAgg ){
+    substExprList(db, p->pGroupBy, iParent, pSub->pEList);
+    substExpr(db, p->pHaving, iParent, pSub->pEList);
+  }
+  if( pSub->pOrderBy ){
+    assert( p->pOrderBy==0 );
+    p->pOrderBy = pSub->pOrderBy;
+    pSub->pOrderBy = 0;
+  }else if( p->pOrderBy ){
+    substExprList(db, p->pOrderBy, iParent, pSub->pEList);
+  }
+  if( pSub->pWhere ){
+    pWhere = sqlite3ExprDup(db, pSub->pWhere);
+  }else{
+    pWhere = 0;
+  }
+  if( subqueryIsAgg ){
+    assert( p->pHaving==0 );
+    p->pHaving = p->pWhere;
+    p->pWhere = pWhere;
+    substExpr(db, p->pHaving, iParent, pSub->pEList);
+    p->pHaving = sqlite3ExprAnd(db, p->pHaving,
+                                sqlite3ExprDup(db, pSub->pHaving));
+    assert( p->pGroupBy==0 );
+    p->pGroupBy = sqlite3ExprListDup(db, pSub->pGroupBy);
+  }else{
+    substExpr(db, p->pWhere, iParent, pSub->pEList);
+    p->pWhere = sqlite3ExprAnd(db, p->pWhere, pWhere);
+  }
+
+  /* The flattened query is distinct if either the inner or the
+  ** outer query is distinct.
+  */
+  p->isDistinct = p->isDistinct || pSub->isDistinct;
+
+  /*
+  ** SELECT ... FROM (SELECT ... LIMIT a OFFSET b) LIMIT x OFFSET y;
+  **
+  ** One is tempted to try to add a and b to combine the limits.  But this
+  ** does not work if either limit is negative.
+  */
+  if( pSub->pLimit ){
+    p->pLimit = pSub->pLimit;
+    pSub->pLimit = 0;
+  }
+
+  /* Finially, delete what is left of the subquery and return
+  ** success.
+  */
+  sqlite3SelectDelete(pSub);
+  return 1;
+}
+#endif /* SQLITE_OMIT_VIEW */
+
+/*
+** Analyze the SELECT statement passed as an argument to see if it
+** is a min() or max() query. Return ORDERBY_MIN or ORDERBY_MAX if
+** it is, or 0 otherwise. At present, a query is considered to be
+** a min()/max() query if:
+**
+**   1. There is a single object in the FROM clause.
+**
+**   2. There is a single expression in the result set, and it is
+**      either min(x) or max(x), where x is a column reference.
+*/
+static int minMaxQuery(Parse *pParse, Select *p){
+  Expr *pExpr;
+  ExprList *pEList = p->pEList;
+
+  if( pEList->nExpr!=1 ) return ORDERBY_NORMAL;
+  pExpr = pEList->a[0].pExpr;
+  pEList = pExpr->pList;
+  if( pExpr->op!=TK_AGG_FUNCTION || pEList==0 || pEList->nExpr!=1 ) return 0;
+  if( pEList->a[0].pExpr->op!=TK_AGG_COLUMN ) return ORDERBY_NORMAL;
+  if( pExpr->token.n!=3 ) return ORDERBY_NORMAL;
+  if( sqlite3StrNICmp((char*)pExpr->token.z,"min",3)==0 ){
+    return ORDERBY_MIN;
+  }else if( sqlite3StrNICmp((char*)pExpr->token.z,"max",3)==0 ){
+    return ORDERBY_MAX;
+  }
+  return ORDERBY_NORMAL;
+}
+
+/*
+** This routine resolves any names used in the result set of the
+** supplied SELECT statement. If the SELECT statement being resolved
+** is a sub-select, then pOuterNC is a pointer to the NameContext
+** of the parent SELECT.
+*/
+int sqlite3SelectResolve(
+  Parse *pParse,         /* The parser context */
+  Select *p,             /* The SELECT statement being coded. */
+  NameContext *pOuterNC  /* The outer name context. May be NULL. */
+){
+  ExprList *pEList;          /* Result set. */
+  int i;                     /* For-loop variable used in multiple places */
+  NameContext sNC;           /* Local name-context */
+  ExprList *pGroupBy;        /* The group by clause */
+
+  /* If this routine has run before, return immediately. */
+  if( p->isResolved ){
+    assert( !pOuterNC );
+    return SQLITE_OK;
+  }
+  p->isResolved = 1;
+
+  /* If there have already been errors, do nothing. */
+  if( pParse->nErr>0 ){
+    return SQLITE_ERROR;
+  }
+
+  /* Prepare the select statement. This call will allocate all cursors
+  ** required to handle the tables and subqueries in the FROM clause.
+  */
+  if( prepSelectStmt(pParse, p) ){
+    return SQLITE_ERROR;
+  }
+
+  /* Resolve the expressions in the LIMIT and OFFSET clauses. These
+  ** are not allowed to refer to any names, so pass an empty NameContext.
+  */
+  memset(&sNC, 0, sizeof(sNC));
+  sNC.pParse = pParse;
+  if( sqlite3ExprResolveNames(&sNC, p->pLimit) ||
+      sqlite3ExprResolveNames(&sNC, p->pOffset) ){
+    return SQLITE_ERROR;
+  }
+
+  /* Set up the local name-context to pass to ExprResolveNames() to
+  ** resolve the expression-list.
+  */
+  sNC.allowAgg = 1;
+  sNC.pSrcList = p->pSrc;
+  sNC.pNext = pOuterNC;
+
+  /* Resolve names in the result set. */
+  pEList = p->pEList;
+  if( !pEList ) return SQLITE_ERROR;
+  for(i=0; i<pEList->nExpr; i++){
+    Expr *pX = pEList->a[i].pExpr;
+    if( sqlite3ExprResolveNames(&sNC, pX) ){
+      return SQLITE_ERROR;
+    }
+  }
+
+  /* If there are no aggregate functions in the result-set, and no GROUP BY
+  ** expression, do not allow aggregates in any of the other expressions.
+  */
+  assert( !p->isAgg );
+  pGroupBy = p->pGroupBy;
+  if( pGroupBy || sNC.hasAgg ){
+    p->isAgg = 1;
+  }else{
+    sNC.allowAgg = 0;
+  }
+
+  /* If a HAVING clause is present, then there must be a GROUP BY clause.
+  */
+  if( p->pHaving && !pGroupBy ){
+    sqlite3ErrorMsg(pParse, "a GROUP BY clause is required before HAVING");
+    return SQLITE_ERROR;
+  }
+
+  /* Add the expression list to the name-context before parsing the
+  ** other expressions in the SELECT statement. This is so that
+  ** expressions in the WHERE clause (etc.) can refer to expressions by
+  ** aliases in the result set.
+  **
+  ** Minor point: If this is the case, then the expression will be
+  ** re-evaluated for each reference to it.
+  */
+  sNC.pEList = p->pEList;
+  if( sqlite3ExprResolveNames(&sNC, p->pWhere) ||
+     sqlite3ExprResolveNames(&sNC, p->pHaving) ){
+    return SQLITE_ERROR;
+  }
+  if( p->pPrior==0 ){
+    if( processOrderGroupBy(pParse, p, p->pOrderBy, 1, &sNC.hasAgg) ){
+      return SQLITE_ERROR;
+    }
+  }
+  if( processOrderGroupBy(pParse, p, pGroupBy, 0, &sNC.hasAgg) ){
+    return SQLITE_ERROR;
+  }
+
+  if( pParse->db->mallocFailed ){
+    return SQLITE_NOMEM;
+  }
+
+  /* Make sure the GROUP BY clause does not contain aggregate functions.
+  */
+  if( pGroupBy ){
+    struct ExprList_item *pItem;
+
+    for(i=0, pItem=pGroupBy->a; i<pGroupBy->nExpr; i++, pItem++){
+      if( ExprHasProperty(pItem->pExpr, EP_Agg) ){
+        sqlite3ErrorMsg(pParse, "aggregate functions are not allowed in "
+            "the GROUP BY clause");
+        return SQLITE_ERROR;
+      }
+    }
+  }
+
+  /* If this is one SELECT of a compound, be sure to resolve names
+  ** in the other SELECTs.
+  */
+  if( p->pPrior ){
+    return sqlite3SelectResolve(pParse, p->pPrior, pOuterNC);
+  }else{
+    return SQLITE_OK;
+  }
+}
+
+/*
+** Reset the aggregate accumulator.
+**
+** The aggregate accumulator is a set of memory cells that hold
+** intermediate results while calculating an aggregate.  This
+** routine simply stores NULLs in all of those memory cells.
+*/
+static void resetAccumulator(Parse *pParse, AggInfo *pAggInfo){
+  Vdbe *v = pParse->pVdbe;
+  int i;
+  struct AggInfo_func *pFunc;
+  if( pAggInfo->nFunc+pAggInfo->nColumn==0 ){
+    return;
+  }
+  for(i=0; i<pAggInfo->nColumn; i++){
+    sqlite3VdbeAddOp2(v, OP_Null, 0, pAggInfo->aCol[i].iMem);
+  }
+  for(pFunc=pAggInfo->aFunc, i=0; i<pAggInfo->nFunc; i++, pFunc++){
+    sqlite3VdbeAddOp2(v, OP_Null, 0, pFunc->iMem);
+    if( pFunc->iDistinct>=0 ){
+      Expr *pE = pFunc->pExpr;
+      if( pE->pList==0 || pE->pList->nExpr!=1 ){
+        sqlite3ErrorMsg(pParse, "DISTINCT in aggregate must be followed "
+           "by an expression");
+        pFunc->iDistinct = -1;
+      }else{
+        KeyInfo *pKeyInfo = keyInfoFromExprList(pParse, pE->pList);
+        sqlite3VdbeAddOp4(v, OP_OpenEphemeral, pFunc->iDistinct, 0, 0,
+                          (char*)pKeyInfo, P4_KEYINFO_HANDOFF);
+      }
+    }
+  }
+}
+
+/*
+** Invoke the OP_AggFinalize opcode for every aggregate function
+** in the AggInfo structure.
+*/
+static void finalizeAggFunctions(Parse *pParse, AggInfo *pAggInfo){
+  Vdbe *v = pParse->pVdbe;
+  int i;
+  struct AggInfo_func *pF;
+  for(i=0, pF=pAggInfo->aFunc; i<pAggInfo->nFunc; i++, pF++){
+    ExprList *pList = pF->pExpr->pList;
+    sqlite3VdbeAddOp4(v, OP_AggFinal, pF->iMem, pList ? pList->nExpr : 0, 0,
+                      (void*)pF->pFunc, P4_FUNCDEF);
+  }
+}
+
+/*
+** Update the accumulator memory cells for an aggregate based on
+** the current cursor position.
+*/
+static void updateAccumulator(Parse *pParse, AggInfo *pAggInfo){
+  Vdbe *v = pParse->pVdbe;
+  int i;
+  struct AggInfo_func *pF;
+  struct AggInfo_col *pC;
+
+  pAggInfo->directMode = 1;
+  for(i=0, pF=pAggInfo->aFunc; i<pAggInfo->nFunc; i++, pF++){
+    int nArg;
+    int addrNext = 0;
+    int regAgg;
+    ExprList *pList = pF->pExpr->pList;
+    if( pList ){
+      nArg = pList->nExpr;
+      regAgg = sqlite3GetTempRange(pParse, nArg);
+      sqlite3ExprCodeExprList(pParse, pList, regAgg);
+    }else{
+      nArg = 0;
+      regAgg = 0;
+    }
+    if( pF->iDistinct>=0 ){
+      addrNext = sqlite3VdbeMakeLabel(v);
+      assert( nArg==1 );
+      codeDistinct(pParse, pF->iDistinct, addrNext, 1, regAgg);
+    }
+    if( pF->pFunc->needCollSeq ){
+      CollSeq *pColl = 0;
+      struct ExprList_item *pItem;
+      int j;
+      assert( pList!=0 );  /* pList!=0 if pF->pFunc->needCollSeq is true */
+      for(j=0, pItem=pList->a; !pColl && j<nArg; j++, pItem++){
+        pColl = sqlite3ExprCollSeq(pParse, pItem->pExpr);
+      }
+      if( !pColl ){
+        pColl = pParse->db->pDfltColl;
+      }
+      sqlite3VdbeAddOp4(v, OP_CollSeq, 0, 0, 0, (char *)pColl, P4_COLLSEQ);
+    }
+    sqlite3VdbeAddOp4(v, OP_AggStep, 0, regAgg, pF->iMem,
+                      (void*)pF->pFunc, P4_FUNCDEF);
+    sqlite3VdbeChangeP5(v, nArg);
+    sqlite3ReleaseTempRange(pParse, regAgg, nArg);
+    if( addrNext ){
+      sqlite3VdbeResolveLabel(v, addrNext);
+    }
+  }
+  for(i=0, pC=pAggInfo->aCol; i<pAggInfo->nAccumulator; i++, pC++){
+    sqlite3ExprCode(pParse, pC->pExpr, pC->iMem);
+  }
+  pAggInfo->directMode = 0;
+}
+
+#ifndef SQLITE_OMIT_TRIGGER
+/*
+** This function is used when a SELECT statement is used to create a
+** temporary table for iterating through when running an INSTEAD OF
+** UPDATE or INSTEAD OF DELETE trigger.
+**
+** If possible, the SELECT statement is modified so that NULL values
+** are stored in the temporary table for all columns for which the
+** corresponding bit in argument mask is not set. If mask takes the
+** special value 0xffffffff, then all columns are populated.
+*/
+void sqlite3SelectMask(Parse *pParse, Select *p, u32 mask){
+  if( p && !p->pPrior && !p->isDistinct && mask!=0xffffffff ){
+    ExprList *pEList;
+    int i;
+    sqlite3SelectResolve(pParse, p, 0);
+    pEList = p->pEList;
+    for(i=0; pEList && i<pEList->nExpr && i<32; i++){
+      if( !(mask&((u32)1<<i)) ){
+        sqlite3ExprDelete(pEList->a[i].pExpr);
+        pEList->a[i].pExpr = sqlite3Expr(pParse->db, TK_NULL, 0, 0, 0);
+      }
+    }
+  }
+}
+#endif
+
+/*
+** Generate code for the given SELECT statement.
+**
+** The results are distributed in various ways depending on the
+** contents of the SelectDest structure pointed to by argument pDest
+** as follows:
+**
+**     pDest->eDest    Result
+**     ------------    -------------------------------------------
+**     SRT_Callback    Invoke the callback for each row of the result.
+**
+**     SRT_Mem         Store first result in memory cell pDest->iParm
+**
+**     SRT_Set         Store non-null results as keys of table pDest->iParm.
+**                     Apply the affinity pDest->affinity before storing them.
+**
+**     SRT_Union       Store results as a key in a temporary table pDest->iParm.
+**
+**     SRT_Except      Remove results from the temporary table pDest->iParm.
+**
+**     SRT_Table       Store results in temporary table pDest->iParm
+**
+**     SRT_EphemTab    Create an temporary table pDest->iParm and store
+**                     the result there. The cursor is left open after
+**                     returning.
+**
+**     SRT_Subroutine  For each row returned, push the results onto the
+**                     vdbe stack and call the subroutine (via OP_Gosub)
+**                     at address pDest->iParm.
+**
+**     SRT_Exists      Store a 1 in memory cell pDest->iParm if the result
+**                     set is not empty.
+**
+**     SRT_Discard     Throw the results away.
+**
+** See the selectInnerLoop() function for a canonical listing of the
+** allowed values of eDest and their meanings.
+**
+** This routine returns the number of errors.  If any errors are
+** encountered, then an appropriate error message is left in
+** pParse->zErrMsg.
+**
+** This routine does NOT free the Select structure passed in.  The
+** calling function needs to do that.
+**
+** The pParent, parentTab, and *pParentAgg fields are filled in if this
+** SELECT is a subquery.  This routine may try to combine this SELECT
+** with its parent to form a single flat query.  In so doing, it might
+** change the parent query from a non-aggregate to an aggregate query.
+** For that reason, the pParentAgg flag is passed as a pointer, so it
+** can be changed.
+**
+** Example 1:   The meaning of the pParent parameter.
+**
+**    SELECT * FROM t1 JOIN (SELECT x, count(*) FROM t2) JOIN t3;
+**    \                      \_______ subquery _______/        /
+**     \                                                      /
+**      \____________________ outer query ___________________/
+**
+** This routine is called for the outer query first.   For that call,
+** pParent will be NULL.  During the processing of the outer query, this
+** routine is called recursively to handle the subquery.  For the recursive
+** call, pParent will point to the outer query.  Because the subquery is
+** the second element in a three-way join, the parentTab parameter will
+** be 1 (the 2nd value of a 0-indexed array.)
+*/
+int sqlite3Select(
+  Parse *pParse,         /* The parser context */
+  Select *p,             /* The SELECT statement being coded. */
+  SelectDest *pDest,     /* What to do with the query results */
+  Select *pParent,       /* Another SELECT for which this is a sub-query */
+  int parentTab,         /* Index in pParent->pSrc of this query */
+  int *pParentAgg,       /* True if pParent uses aggregate functions */
+  char *aff              /* If eDest is SRT_Union, the affinity string */
+){
+  int i, j;              /* Loop counters */
+  WhereInfo *pWInfo;     /* Return from sqlite3WhereBegin() */
+  Vdbe *v;               /* The virtual machine under construction */
+  int isAgg;             /* True for select lists like "count(*)" */
+  ExprList *pEList;      /* List of columns to extract. */
+  SrcList *pTabList;     /* List of tables to select from */
+  Expr *pWhere;          /* The WHERE clause.  May be NULL */
+  ExprList *pOrderBy;    /* The ORDER BY clause.  May be NULL */
+  ExprList *pGroupBy;    /* The GROUP BY clause.  May be NULL */
+  Expr *pHaving;         /* The HAVING clause.  May be NULL */
+  int isDistinct;        /* True if the DISTINCT keyword is present */
+  int distinct;          /* Table to use for the distinct set */
+  int rc = 1;            /* Value to return from this function */
+  int addrSortIndex;     /* Address of an OP_OpenEphemeral instruction */
+  AggInfo sAggInfo;      /* Information used by aggregate queries */
+  int iEnd;              /* Address of the end of the query */
+  sqlite3 *db;           /* The database connection */
+
+  db = pParse->db;
+  if( p==0 || db->mallocFailed || pParse->nErr ){
+    return 1;
+  }
+  if( sqlite3AuthCheck(pParse, SQLITE_SELECT, 0, 0, 0) ) return 1;
+  memset(&sAggInfo, 0, sizeof(sAggInfo));
+
+  pOrderBy = p->pOrderBy;
+  if( IgnorableOrderby(pDest) ){
+    p->pOrderBy = 0;
+
+    /* In these cases the DISTINCT operator makes no difference to the
+    ** results, so remove it if it were specified.
+    */
+    assert(pDest->eDest==SRT_Exists || pDest->eDest==SRT_Union ||
+           pDest->eDest==SRT_Except || pDest->eDest==SRT_Discard);
+    p->isDistinct = 0;
+  }
+  if( sqlite3SelectResolve(pParse, p, 0) ){
+    goto select_end;
+  }
+  p->pOrderBy = pOrderBy;
+
+#ifndef SQLITE_OMIT_COMPOUND_SELECT
+  /* If there is are a sequence of queries, do the earlier ones first.
+  */
+  if( p->pPrior ){
+    if( p->pRightmost==0 ){
+      Select *pLoop, *pRight = 0;
+      int cnt = 0;
+      for(pLoop=p; pLoop; pLoop=pLoop->pPrior, cnt++){
+        pLoop->pRightmost = p;
+        pLoop->pNext = pRight;
+        pRight = pLoop;
+      }
+      if( SQLITE_MAX_COMPOUND_SELECT>0 && cnt>SQLITE_MAX_COMPOUND_SELECT ){
+        sqlite3ErrorMsg(pParse, "too many terms in compound SELECT");
+        return 1;
+      }
+    }
+    return multiSelect(pParse, p, pDest, aff);
+  }
+#endif
+
+  /* Make local copies of the parameters for this query.
+  */
+  pTabList = p->pSrc;
+  pWhere = p->pWhere;
+  pGroupBy = p->pGroupBy;
+  pHaving = p->pHaving;
+  isAgg = p->isAgg;
+  isDistinct = p->isDistinct;
+  pEList = p->pEList;
+  if( pEList==0 ) goto select_end;
+
+  /*
+  ** Do not even attempt to generate any code if we have already seen
+  ** errors before this routine starts.
+  */
+  if( pParse->nErr>0 ) goto select_end;
+
+  /* If writing to memory or generating a set
+  ** only a single column may be output.
+  */
+#ifndef SQLITE_OMIT_SUBQUERY
+  if( checkForMultiColumnSelectError(pParse, pDest, pEList->nExpr) ){
+    goto select_end;
+  }
+#endif
+
+  /* ORDER BY is ignored for some destinations.
+  */
+  if( IgnorableOrderby(pDest) ){
+    pOrderBy = 0;
+  }
+
+  /* Begin generating code.
+  */
+  v = sqlite3GetVdbe(pParse);
+  if( v==0 ) goto select_end;
+
+  /* Generate code for all sub-queries in the FROM clause
+  */
+#if !defined(SQLITE_OMIT_SUBQUERY) || !defined(SQLITE_OMIT_VIEW)
+  for(i=0; i<pTabList->nSrc; i++){
+    const char *zSavedAuthContext = 0;
+    int needRestoreContext;
+    struct SrcList_item *pItem = &pTabList->a[i];
+    SelectDest dest;
+
+    if( pItem->pSelect==0 || pItem->isPopulated ) continue;
+    if( pItem->zName!=0 ){
+      zSavedAuthContext = pParse->zAuthContext;
+      pParse->zAuthContext = pItem->zName;
+      needRestoreContext = 1;
+    }else{
+      needRestoreContext = 0;
+    }
+#if defined(SQLITE_TEST) || SQLITE_MAX_EXPR_DEPTH>0
+    /* Increment Parse.nHeight by the height of the largest expression
+    ** tree refered to by this, the parent select. The child select
+    ** may contain expression trees of at most
+    ** (SQLITE_MAX_EXPR_DEPTH-Parse.nHeight) height. This is a bit
+    ** more conservative than necessary, but much easier than enforcing
+    ** an exact limit.
+    */
+    pParse->nHeight += sqlite3SelectExprHeight(p);
+#endif
+    sqlite3SelectDestInit(&dest, SRT_EphemTab, pItem->iCursor);
+    sqlite3Select(pParse, pItem->pSelect, &dest, p, i, &isAgg, 0);
+    if( db->mallocFailed ){
+      goto select_end;
+    }
+#if defined(SQLITE_TEST) || SQLITE_MAX_EXPR_DEPTH>0
+    pParse->nHeight -= sqlite3SelectExprHeight(p);
+#endif
+    if( needRestoreContext ){
+      pParse->zAuthContext = zSavedAuthContext;
+    }
+    pTabList = p->pSrc;
+    pWhere = p->pWhere;
+    if( !IgnorableOrderby(pDest) ){
+      pOrderBy = p->pOrderBy;
+    }
+    pGroupBy = p->pGroupBy;
+    pHaving = p->pHaving;
+    isDistinct = p->isDistinct;
+  }
+#endif
+
+  /* Check to see if this is a subquery that can be "flattened" into its parent.
+  ** If flattening is a possiblity, do so and return immediately.
+  */
+#ifndef SQLITE_OMIT_VIEW
+  if( pParent && pParentAgg &&
+      flattenSubquery(db, pParent, parentTab, *pParentAgg, isAgg) ){
+    if( isAgg ) *pParentAgg = 1;
+    goto select_end;
+  }
+#endif
+
+  /* If possible, rewrite the query to use GROUP BY instead of DISTINCT.
+  ** GROUP BY may use an index, DISTINCT never does.
+  */
+  if( p->isDistinct && !p->isAgg && !p->pGroupBy ){
+    p->pGroupBy = sqlite3ExprListDup(db, p->pEList);
+    pGroupBy = p->pGroupBy;
+    p->isDistinct = 0;
+    isDistinct = 0;
+  }
+
+  /* If there is an ORDER BY clause, then this sorting
+  ** index might end up being unused if the data can be
+  ** extracted in pre-sorted order.  If that is the case, then the
+  ** OP_OpenEphemeral instruction will be changed to an OP_Noop once
+  ** we figure out that the sorting index is not needed.  The addrSortIndex
+  ** variable is used to facilitate that change.
+  */
+  if( pOrderBy ){
+    KeyInfo *pKeyInfo;
+    pKeyInfo = keyInfoFromExprList(pParse, pOrderBy);
+    pOrderBy->iECursor = pParse->nTab++;
+    p->addrOpenEphm[2] = addrSortIndex =
+      sqlite3VdbeAddOp4(v, OP_OpenEphemeral,
+                           pOrderBy->iECursor, pOrderBy->nExpr+2, 0,
+                           (char*)pKeyInfo, P4_KEYINFO_HANDOFF);
+  }else{
+    addrSortIndex = -1;
+  }
+
+  /* If the output is destined for a temporary table, open that table.
+  */
+  if( pDest->eDest==SRT_EphemTab ){
+    sqlite3VdbeAddOp2(v, OP_OpenEphemeral, pDest->iParm, pEList->nExpr);
+  }
+
+  /* Set the limiter.
+  */
+  iEnd = sqlite3VdbeMakeLabel(v);
+  computeLimitRegisters(pParse, p, iEnd);
+
+  /* Open a virtual index to use for the distinct set.
+  */
+  if( isDistinct ){
+    KeyInfo *pKeyInfo;
+    assert( isAgg || pGroupBy );
+    distinct = pParse->nTab++;
+    pKeyInfo = keyInfoFromExprList(pParse, p->pEList);
+    sqlite3VdbeAddOp4(v, OP_OpenEphemeral, distinct, 0, 0,
+                        (char*)pKeyInfo, P4_KEYINFO_HANDOFF);
+  }else{
+    distinct = -1;
+  }
+
+  /* Aggregate and non-aggregate queries are handled differently */
+  if( !isAgg && pGroupBy==0 ){
+    /* This case is for non-aggregate queries
+    ** Begin the database scan
+    */
+    pWInfo = sqlite3WhereBegin(pParse, pTabList, pWhere, &pOrderBy, 0);
+    if( pWInfo==0 ) goto select_end;
+
+    /* If sorting index that was created by a prior OP_OpenEphemeral
+    ** instruction ended up not being needed, then change the OP_OpenEphemeral
+    ** into an OP_Noop.
+    */
+    if( addrSortIndex>=0 && pOrderBy==0 ){
+      sqlite3VdbeChangeToNoop(v, addrSortIndex, 1);
+      p->addrOpenEphm[2] = -1;
+    }
+
+    /* Use the standard inner loop
+    */
+    assert(!isDistinct);
+    selectInnerLoop(pParse, p, pEList, 0, 0, pOrderBy, -1, pDest,
+                    pWInfo->iContinue, pWInfo->iBreak, aff);
+
+    /* End the database scan loop.
+    */
+    sqlite3WhereEnd(pWInfo);
+  }else{
+    /* This is the processing for aggregate queries */
+    NameContext sNC;    /* Name context for processing aggregate information */
+    int iAMem;          /* First Mem address for storing current GROUP BY */
+    int iBMem;          /* First Mem address for previous GROUP BY */
+    int iUseFlag;       /* Mem address holding flag indicating that at least
+                        ** one row of the input to the aggregator has been
+                        ** processed */
+    int iAbortFlag;     /* Mem address which causes query abort if positive */
+    int groupBySort;    /* Rows come from source in GROUP BY order */
+
+
+    /* The following variables hold addresses or labels for parts of the
+    ** virtual machine program we are putting together */
+    int addrOutputRow;      /* Start of subroutine that outputs a result row */
+    int addrSetAbort;       /* Set the abort flag and return */
+    int addrInitializeLoop; /* Start of code that initializes the input loop */
+    int addrTopOfLoop;      /* Top of the input loop */
+    int addrGroupByChange;  /* Code that runs when any GROUP BY term changes */
+    int addrProcessRow;     /* Code to process a single input row */
+    int addrEnd;            /* End of all processing */
+    int addrSortingIdx;     /* The OP_OpenEphemeral for the sorting index */
+    int addrReset;          /* Subroutine for resetting the accumulator */
+
+    addrEnd = sqlite3VdbeMakeLabel(v);
+
+    /* Convert TK_COLUMN nodes into TK_AGG_COLUMN and make entries in
+    ** sAggInfo for all TK_AGG_FUNCTION nodes in expressions of the
+    ** SELECT statement.
+    */
+    memset(&sNC, 0, sizeof(sNC));
+    sNC.pParse = pParse;
+    sNC.pSrcList = pTabList;
+    sNC.pAggInfo = &sAggInfo;
+    sAggInfo.nSortingColumn = pGroupBy ? pGroupBy->nExpr+1 : 0;
+    sAggInfo.pGroupBy = pGroupBy;
+    sqlite3ExprAnalyzeAggList(&sNC, pEList);
+    sqlite3ExprAnalyzeAggList(&sNC, pOrderBy);
+    if( pHaving ){
+      sqlite3ExprAnalyzeAggregates(&sNC, pHaving);
+    }
+    sAggInfo.nAccumulator = sAggInfo.nColumn;
+    for(i=0; i<sAggInfo.nFunc; i++){
+      sqlite3ExprAnalyzeAggList(&sNC, sAggInfo.aFunc[i].pExpr->pList);
+    }
+    if( db->mallocFailed ) goto select_end;
+
+    /* Processing for aggregates with GROUP BY is very different and
+    ** much more complex than aggregates without a GROUP BY.
+    */
+    if( pGroupBy ){
+      KeyInfo *pKeyInfo;  /* Keying information for the group by clause */
+
+      /* Create labels that we will be needing
+      */
+
+      addrInitializeLoop = sqlite3VdbeMakeLabel(v);
+      addrGroupByChange = sqlite3VdbeMakeLabel(v);
+      addrProcessRow = sqlite3VdbeMakeLabel(v);
+
+      /* If there is a GROUP BY clause we might need a sorting index to
+      ** implement it.  Allocate that sorting index now.  If it turns out
+      ** that we do not need it after all, the OpenEphemeral instruction
+      ** will be converted into a Noop.
+      */
+      sAggInfo.sortingIdx = pParse->nTab++;
+      pKeyInfo = keyInfoFromExprList(pParse, pGroupBy);
+      addrSortingIdx =
+          sqlite3VdbeAddOp4(v, OP_OpenEphemeral, sAggInfo.sortingIdx,
+                         sAggInfo.nSortingColumn, 0,
+                         (char*)pKeyInfo, P4_KEYINFO_HANDOFF);
+
+      /* Initialize memory locations used by GROUP BY aggregate processing
+      */
+      iUseFlag = ++pParse->nMem;
+      iAbortFlag = ++pParse->nMem;
+      iAMem = pParse->nMem + 1;
+      pParse->nMem += pGroupBy->nExpr;
+      iBMem = pParse->nMem + 1;
+      pParse->nMem += pGroupBy->nExpr;
+      sqlite3VdbeAddOp2(v, OP_Integer, 0, iAbortFlag);
+      VdbeComment((v, "clear abort flag"));
+      sqlite3VdbeAddOp2(v, OP_Integer, 0, iUseFlag);
+      VdbeComment((v, "indicate accumulator empty"));
+      sqlite3VdbeAddOp2(v, OP_Goto, 0, addrInitializeLoop);
+
+      /* Generate a subroutine that outputs a single row of the result
+      ** set.  This subroutine first looks at the iUseFlag.  If iUseFlag
+      ** is less than or equal to zero, the subroutine is a no-op.  If
+      ** the processing calls for the query to abort, this subroutine
+      ** increments the iAbortFlag memory location before returning in
+      ** order to signal the caller to abort.
+      */
+      addrSetAbort = sqlite3VdbeCurrentAddr(v);
+      sqlite3VdbeAddOp2(v, OP_Integer, 1, iAbortFlag);
+      VdbeComment((v, "set abort flag"));
+      sqlite3VdbeAddOp2(v, OP_Return, 0, 0);
+      addrOutputRow = sqlite3VdbeCurrentAddr(v);
+      sqlite3VdbeAddOp2(v, OP_IfPos, iUseFlag, addrOutputRow+2);
+      VdbeComment((v, "Groupby result generator entry point"));
+      sqlite3VdbeAddOp2(v, OP_Return, 0, 0);
+      finalizeAggFunctions(pParse, &sAggInfo);
+      if( pHaving ){
+        sqlite3ExprIfFalse(pParse, pHaving, addrOutputRow+1, SQLITE_JUMPIFNULL);
+      }
+      selectInnerLoop(pParse, p, p->pEList, 0, 0, pOrderBy,
+                      distinct, pDest,
+                      addrOutputRow+1, addrSetAbort, aff);
+      sqlite3VdbeAddOp2(v, OP_Return, 0, 0);
+      VdbeComment((v, "end groupby result generator"));
+
+      /* Generate a subroutine that will reset the group-by accumulator
+      */
+      addrReset = sqlite3VdbeCurrentAddr(v);
+      resetAccumulator(pParse, &sAggInfo);
+      sqlite3VdbeAddOp2(v, OP_Return, 0, 0);
+
+      /* Begin a loop that will extract all source rows in GROUP BY order.
+      ** This might involve two separate loops with an OP_Sort in between, or
+      ** it might be a single loop that uses an index to extract information
+      ** in the right order to begin with.
+      */
+      sqlite3VdbeResolveLabel(v, addrInitializeLoop);
+      sqlite3VdbeAddOp2(v, OP_Gosub, 0, addrReset);
+      pWInfo = sqlite3WhereBegin(pParse, pTabList, pWhere, &pGroupBy, 0);
+      if( pWInfo==0 ) goto select_end;
+      if( pGroupBy==0 ){
+        /* The optimizer is able to deliver rows in group by order so
+        ** we do not have to sort.  The OP_OpenEphemeral table will be
+        ** cancelled later because we still need to use the pKeyInfo
+        */
+        pGroupBy = p->pGroupBy;
+        groupBySort = 0;
+      }else{
+        /* Rows are coming out in undetermined order.  We have to push
+        ** each row into a sorting index, terminate the first loop,
+        ** then loop over the sorting index in order to get the output
+        ** in sorted order
+        */
+        int regBase;
+        int regRecord;
+        int nCol;
+        int nGroupBy;
+
+        groupBySort = 1;
+        nGroupBy = pGroupBy->nExpr;
+        nCol = nGroupBy + 1;
+        j = nGroupBy+1;
+        for(i=0; i<sAggInfo.nColumn; i++){
+          if( sAggInfo.aCol[i].iSorterColumn>=j ){
+            nCol++;
+            j++;
+          }
+        }
+        regBase = sqlite3GetTempRange(pParse, nCol);
+        sqlite3ExprCodeExprList(pParse, pGroupBy, regBase);
+        sqlite3VdbeAddOp2(v, OP_Sequence, sAggInfo.sortingIdx,regBase+nGroupBy);
+        j = nGroupBy+1;
+        for(i=0; i<sAggInfo.nColumn; i++){
+          struct AggInfo_col *pCol = &sAggInfo.aCol[i];
+          if( pCol->iSorterColumn>=j ){
+            sqlite3ExprCodeGetColumn(v, pCol->pTab, pCol->iColumn, pCol->iTable,
+                                     j + regBase);
+            j++;
+          }
+        }
+        regRecord = sqlite3GetTempReg(pParse);
+        sqlite3VdbeAddOp3(v, OP_MakeRecord, regBase, nCol, regRecord);
+        sqlite3VdbeAddOp2(v, OP_IdxInsert, sAggInfo.sortingIdx, regRecord);
+        sqlite3ReleaseTempReg(pParse, regRecord);
+        sqlite3ReleaseTempRange(pParse, regBase, nCol);
+        sqlite3WhereEnd(pWInfo);
+        sqlite3VdbeAddOp2(v, OP_Sort, sAggInfo.sortingIdx, addrEnd);
+        VdbeComment((v, "GROUP BY sort"));
+        sAggInfo.useSortingIdx = 1;
+      }
+
+      /* Evaluate the current GROUP BY terms and store in b0, b1, b2...
+      ** (b0 is memory location iBMem+0, b1 is iBMem+1, and so forth)
+      ** Then compare the current GROUP BY terms against the GROUP BY terms
+      ** from the previous row currently stored in a0, a1, a2...
+      */
+      addrTopOfLoop = sqlite3VdbeCurrentAddr(v);
+      for(j=0; j<pGroupBy->nExpr; j++){
+        if( groupBySort ){
+          sqlite3VdbeAddOp3(v, OP_Column, sAggInfo.sortingIdx, j, iBMem+j);
+        }else{
+          sAggInfo.directMode = 1;
+          sqlite3ExprCode(pParse, pGroupBy->a[j].pExpr, iBMem+j);
+        }
+      }
+      for(j=pGroupBy->nExpr-1; j>=0; j--){
+        if( j==0 ){
+          sqlite3VdbeAddOp3(v, OP_Eq, iAMem+j, addrProcessRow, iBMem+j);
+        }else{
+          sqlite3VdbeAddOp3(v, OP_Ne, iAMem+j, addrGroupByChange, iBMem+j);
+        }
+        sqlite3VdbeChangeP4(v, -1, (void*)pKeyInfo->aColl[j], P4_COLLSEQ);
+        sqlite3VdbeChangeP5(v, SQLITE_NULLEQUAL);
+      }
+
+      /* Generate code that runs whenever the GROUP BY changes.
+      ** Change in the GROUP BY are detected by the previous code
+      ** block.  If there were no changes, this block is skipped.
+      **
+      ** This code copies current group by terms in b0,b1,b2,...
+      ** over to a0,a1,a2.  It then calls the output subroutine
+      ** and resets the aggregate accumulator registers in preparation
+      ** for the next GROUP BY batch.
+      */
+      sqlite3VdbeResolveLabel(v, addrGroupByChange);
+      for(j=0; j<pGroupBy->nExpr; j++){
+        sqlite3VdbeAddOp2(v, OP_Move, iBMem+j, iAMem+j);
+      }
+      sqlite3VdbeAddOp2(v, OP_Gosub, 0, addrOutputRow);
+      VdbeComment((v, "output one row"));
+      sqlite3VdbeAddOp2(v, OP_IfPos, iAbortFlag, addrEnd);
+      VdbeComment((v, "check abort flag"));
+      sqlite3VdbeAddOp2(v, OP_Gosub, 0, addrReset);
+      VdbeComment((v, "reset accumulator"));
+
+      /* Update the aggregate accumulators based on the content of
+      ** the current row
+      */
+      sqlite3VdbeResolveLabel(v, addrProcessRow);
+      updateAccumulator(pParse, &sAggInfo);
+      sqlite3VdbeAddOp2(v, OP_Integer, 1, iUseFlag);
+      VdbeComment((v, "indicate data in accumulator"));
+
+      /* End of the loop
+      */
+      if( groupBySort ){
+        sqlite3VdbeAddOp2(v, OP_Next, sAggInfo.sortingIdx, addrTopOfLoop);
+      }else{
+        sqlite3WhereEnd(pWInfo);
+        sqlite3VdbeChangeToNoop(v, addrSortingIdx, 1);
+      }
+
+      /* Output the final row of result
+      */
+      sqlite3VdbeAddOp2(v, OP_Gosub, 0, addrOutputRow);
+      VdbeComment((v, "output final row"));
+
+    } /* endif pGroupBy */
+    else {
+      ExprList *pMinMax = 0;
+      ExprList *pDel = 0;
+      u8 flag;
+
+      /* Check if the query is of one of the following forms:
+      **
+      **   SELECT min(x) FROM ...
+      **   SELECT max(x) FROM ...
+      **
+      ** If it is, then ask the code in where.c to attempt to sort results
+      ** as if there was an "ORDER ON x" or "ORDER ON x DESC" clause.
+      ** If where.c is able to produce results sorted in this order, then
+      ** add vdbe code to break out of the processing loop after the
+      ** first iteration (since the first iteration of the loop is
+      ** guaranteed to operate on the row with the minimum or maximum
+      ** value of x, the only row required).
+      **
+      ** A special flag must be passed to sqlite3WhereBegin() to slightly
+      ** modify behaviour as follows:
+      **
+      **   + If the query is a "SELECT min(x)", then the loop coded by
+      **     where.c should not iterate over any values with a NULL value
+      **     for x.
+      **
+      **   + The optimizer code in where.c (the thing that decides which
+      **     index or indices to use) should place a different priority on
+      **     satisfying the 'ORDER BY' clause than it does in other cases.
+      **     Refer to code and comments in where.c for details.
+      */
+      flag = minMaxQuery(pParse, p);
+      if( flag ){
+        pDel = pMinMax = sqlite3ExprListDup(db, p->pEList->a[0].pExpr->pList);
+        if( pMinMax && !db->mallocFailed ){
+          pMinMax->a[0].sortOrder = ((flag==ORDERBY_MIN)?0:1);
+          pMinMax->a[0].pExpr->op = TK_COLUMN;
+        }
+      }
+
+      /* This case runs if the aggregate has no GROUP BY clause.  The
+      ** processing is much simpler since there is only a single row
+      ** of output.
+      */
+      resetAccumulator(pParse, &sAggInfo);
+      pWInfo = sqlite3WhereBegin(pParse, pTabList, pWhere, &pMinMax, flag);
+      if( pWInfo==0 ){
+        sqlite3ExprListDelete(pDel);
+        goto select_end;
+      }
+      updateAccumulator(pParse, &sAggInfo);
+      if( !pMinMax && flag ){
+        sqlite3VdbeAddOp2(v, OP_Goto, 0, pWInfo->iBreak);
+        VdbeComment((v, "%s() by index", (flag==ORDERBY_MIN?"min":"max")));
+      }
+      sqlite3WhereEnd(pWInfo);
+      finalizeAggFunctions(pParse, &sAggInfo);
+      pOrderBy = 0;
+      if( pHaving ){
+        sqlite3ExprIfFalse(pParse, pHaving, addrEnd, SQLITE_JUMPIFNULL);
+      }
+      selectInnerLoop(pParse, p, p->pEList, 0, 0, 0, -1,
+                      pDest, addrEnd, addrEnd, aff);
+
+      sqlite3ExprListDelete(pDel);
+    }
+    sqlite3VdbeResolveLabel(v, addrEnd);
+
+  } /* endif aggregate query */
+
+  /* If there is an ORDER BY clause, then we need to sort the results
+  ** and send them to the callback one by one.
+  */
+  if( pOrderBy ){
+    generateSortTail(pParse, p, v, pEList->nExpr, pDest);
+  }
+
+#ifndef SQLITE_OMIT_SUBQUERY
+  /* If this was a subquery, we have now converted the subquery into a
+  ** temporary table.  So set the SrcList_item.isPopulated flag to prevent
+  ** this subquery from being evaluated again and to force the use of
+  ** the temporary table.
+  */
+  if( pParent ){
+    assert( pParent->pSrc->nSrc>parentTab );
+    assert( pParent->pSrc->a[parentTab].pSelect==p );
+    pParent->pSrc->a[parentTab].isPopulated = 1;
+  }
+#endif
+
+  /* Jump here to skip this query
+  */
+  sqlite3VdbeResolveLabel(v, iEnd);
+
+  /* The SELECT was successfully coded.   Set the return code to 0
+  ** to indicate no errors.
+  */
+  rc = 0;
+
+  /* Control jumps to here if an error is encountered above, or upon
+  ** successful coding of the SELECT.
+  */
+select_end:
+
+  /* Identify column names if we will be using them in a callback.  This
+  ** step is skipped if the output is going to some other destination.
+  */
+  if( rc==SQLITE_OK && pDest->eDest==SRT_Callback ){
+    generateColumnNames(pParse, pTabList, pEList);
+  }
+
+  sqlite3_free(sAggInfo.aCol);
+  sqlite3_free(sAggInfo.aFunc);
+  return rc;
+}
+
+#if defined(SQLITE_DEBUG)
+/*
+*******************************************************************************
+** The following code is used for testing and debugging only.  The code
+** that follows does not appear in normal builds.
+**
+** These routines are used to print out the content of all or part of a
+** parse structures such as Select or Expr.  Such printouts are useful
+** for helping to understand what is happening inside the code generator
+** during the execution of complex SELECT statements.
+**
+** These routine are not called anywhere from within the normal
+** code base.  Then are intended to be called from within the debugger
+** or from temporary "printf" statements inserted for debugging.
+*/
+static void sqlite3PrintExpr(Expr *p){
+  if( p->token.z && p->token.n>0 ){
+    sqlite3DebugPrintf("(%.*s", p->token.n, p->token.z);
+  }else{
+    sqlite3DebugPrintf("(%d", p->op);
+  }
+  if( p->pLeft ){
+    sqlite3DebugPrintf(" ");
+    sqlite3PrintExpr(p->pLeft);
+  }
+  if( p->pRight ){
+    sqlite3DebugPrintf(" ");
+    sqlite3PrintExpr(p->pRight);
+  }
+  sqlite3DebugPrintf(")");
+}
+static void sqlite3PrintExprList(ExprList *pList){
+  int i;
+  for(i=0; i<pList->nExpr; i++){
+    sqlite3PrintExpr(pList->a[i].pExpr);
+    if( i<pList->nExpr-1 ){
+      sqlite3DebugPrintf(", ");
+    }
+  }
+}
+static void sqlite3PrintSelect(Select *p, int indent){
+  sqlite3DebugPrintf("%*sSELECT(%p) ", indent, "", p);
+  sqlite3PrintExprList(p->pEList);
+  sqlite3DebugPrintf("\n");
+  if( p->pSrc ){
+    char *zPrefix;
+    int i;
+    zPrefix = "FROM";
+    for(i=0; i<p->pSrc->nSrc; i++){
+      struct SrcList_item *pItem = &p->pSrc->a[i];
+      sqlite3DebugPrintf("%*s ", indent+6, zPrefix);
+      zPrefix = "";
+      if( pItem->pSelect ){
+        sqlite3DebugPrintf("(\n");
+        sqlite3PrintSelect(pItem->pSelect, indent+10);
+        sqlite3DebugPrintf("%*s)", indent+8, "");
+      }else if( pItem->zName ){
+        sqlite3DebugPrintf("%s", pItem->zName);
+      }
+      if( pItem->pTab ){
+        sqlite3DebugPrintf("(table: %s)", pItem->pTab->zName);
+      }
+      if( pItem->zAlias ){
+        sqlite3DebugPrintf(" AS %s", pItem->zAlias);
+      }
+      if( i<p->pSrc->nSrc-1 ){
+        sqlite3DebugPrintf(",");
+      }
+      sqlite3DebugPrintf("\n");
+    }
+  }
+  if( p->pWhere ){
+    sqlite3DebugPrintf("%*s WHERE ", indent, "");
+    sqlite3PrintExpr(p->pWhere);
+    sqlite3DebugPrintf("\n");
+  }
+  if( p->pGroupBy ){
+    sqlite3DebugPrintf("%*s GROUP BY ", indent, "");
+    sqlite3PrintExprList(p->pGroupBy);
+    sqlite3DebugPrintf("\n");
+  }
+  if( p->pHaving ){
+    sqlite3DebugPrintf("%*s HAVING ", indent, "");
+    sqlite3PrintExpr(p->pHaving);
+    sqlite3DebugPrintf("\n");
+  }
+  if( p->pOrderBy ){
+    sqlite3DebugPrintf("%*s ORDER BY ", indent, "");
+    sqlite3PrintExprList(p->pOrderBy);
+    sqlite3DebugPrintf("\n");
+  }
+}
+/* End of the structure debug printing code
+*****************************************************************************/
+#endif /* defined(SQLITE_TEST) || defined(SQLITE_DEBUG) */
diff --git a/uppsrc/plugin/sqlite3/lib/shell.c b/uppsrc/plugin/sqlite3/lib/shell.c
new file mode 100644
index 000000000..851a4e880
--- /dev/null
+++ b/uppsrc/plugin/sqlite3/lib/shell.c
@@ -0,0 +1,2087 @@
+/*
+** 2001 September 15
+**
+** The author disclaims copyright to this source code.  In place of
+** a legal notice, here is a blessing:
+**
+**    May you do good and not evil.
+**    May you find forgiveness for yourself and forgive others.
+**    May you share freely, never taking more than you give.
+**
+*************************************************************************
+** This file contains code to implement the "sqlite" command line
+** utility for accessing SQLite databases.
+**
+** $Id: shell.c,v 1.176 2008/03/04 17:45:01 mlcreech Exp $
+*/
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <assert.h>
+#include "sqlite3.h"
+#include <ctype.h>
+#include <stdarg.h>
+
+#if !defined(_WIN32) && !defined(WIN32) && !defined(__OS2__)
+# include <signal.h>
+# include <pwd.h>
+# include <unistd.h>
+# include <sys/types.h>
+#endif
+
+#ifdef __OS2__
+# include <unistd.h>
+#endif
+
+#if defined(HAVE_READLINE) && HAVE_READLINE==1
+# include <readline/readline.h>
+# include <readline/history.h>
+#else
+# define readline(p) local_getline(p,stdin)
+# define add_history(X)
+# define read_history(X)
+# define write_history(X)
+# define stifle_history(X)
+#endif
+
+#if defined(_WIN32) || defined(WIN32)
+# include <io.h>
+#else
+/* Make sure isatty() has a prototype.
+*/
+extern int isatty();
+#endif
+
+#if defined(_WIN32_WCE)
+/* Windows CE (arm-wince-mingw32ce-gcc) does not provide isatty()
+ * thus we always assume that we have a console. That can be
+ * overridden with the -batch command line option.
+ */
+#define isatty(x) 1
+#endif
+
+#if !defined(_WIN32) && !defined(WIN32) && !defined(__OS2__)
+#include <sys/time.h>
+#include <sys/resource.h>
+
+/* Saved resource information for the beginning of an operation */
+static struct rusage sBegin;
+
+/* True if the timer is enabled */
+static int enableTimer = 0;
+
+/*
+** Begin timing an operation
+*/
+static void beginTimer(void){
+  if( enableTimer ){
+    getrusage(RUSAGE_SELF, &sBegin);
+  }
+}
+
+/* Return the difference of two time_structs in microseconds */
+static int timeDiff(struct timeval *pStart, struct timeval *pEnd){
+  return (pEnd->tv_usec - pStart->tv_usec) +
+         1000000*(pEnd->tv_sec - pStart->tv_sec);
+}
+
+/*
+** Print the timing results.
+*/
+static void endTimer(void){
+  if( enableTimer ){
+    struct rusage sEnd;
+    getrusage(RUSAGE_SELF, &sEnd);
+    printf("CPU Time: user %f sys %f\n",
+       0.000001*timeDiff(&sBegin.ru_utime, &sEnd.ru_utime),
+       0.000001*timeDiff(&sBegin.ru_stime, &sEnd.ru_stime));
+  }
+}
+#define BEGIN_TIMER beginTimer()
+#define END_TIMER endTimer()
+#define HAS_TIMER 1
+#else
+#define BEGIN_TIMER
+#define END_TIMER
+#define HAS_TIMER 0
+#endif
+
+
+/*
+** If the following flag is set, then command execution stops
+** at an error if we are not interactive.
+*/
+static int bail_on_error = 0;
+
+/*
+** Threat stdin as an interactive input if the following variable
+** is true.  Otherwise, assume stdin is connected to a file or pipe.
+*/
+static int stdin_is_interactive = 1;
+
+/*
+** The following is the open SQLite database.  We make a pointer
+** to this database a static variable so that it can be accessed
+** by the SIGINT handler to interrupt database processing.
+*/
+static sqlite3 *db = 0;
+
+/*
+** True if an interrupt (Control-C) has been received.
+*/
+static volatile int seenInterrupt = 0;
+
+/*
+** This is the name of our program. It is set in main(), used
+** in a number of other places, mostly for error messages.
+*/
+static char *Argv0;
+
+/*
+** Prompt strings. Initialized in main. Settable with
+**   .prompt main continue
+*/
+static char mainPrompt[20];     /* First line prompt. default: "sqlite> "*/
+static char continuePrompt[20]; /* Continuation prompt. default: "   ...> " */
+
+/*
+** Write I/O traces to the following stream.
+*/
+#ifdef SQLITE_ENABLE_IOTRACE
+static FILE *iotrace = 0;
+#endif
+
+/*
+** This routine works like printf in that its first argument is a
+** format string and subsequent arguments are values to be substituted
+** in place of % fields.  The result of formatting this string
+** is written to iotrace.
+*/
+#ifdef SQLITE_ENABLE_IOTRACE
+static void iotracePrintf(const char *zFormat, ...){
+  va_list ap;
+  char *z;
+  if( iotrace==0 ) return;
+  va_start(ap, zFormat);
+  z = sqlite3_vmprintf(zFormat, ap);
+  va_end(ap);
+  fprintf(iotrace, "%s", z);
+  sqlite3_free(z);
+}
+#endif
+
+
+/*
+** Determines if a string is a number of not.
+*/
+static int isNumber(const char *z, int *realnum){
+  if( *z=='-' || *z=='+' ) z++;
+  if( !isdigit(*z) ){
+    return 0;
+  }
+  z++;
+  if( realnum ) *realnum = 0;
+  while( isdigit(*z) ){ z++; }
+  if( *z=='.' ){
+    z++;
+    if( !isdigit(*z) ) return 0;
+    while( isdigit(*z) ){ z++; }
+    if( realnum ) *realnum = 1;
+  }
+  if( *z=='e' || *z=='E' ){
+    z++;
+    if( *z=='+' || *z=='-' ) z++;
+    if( !isdigit(*z) ) return 0;
+    while( isdigit(*z) ){ z++; }
+    if( realnum ) *realnum = 1;
+  }
+  return *z==0;
+}
+
+/*
+** A global char* and an SQL function to access its current value
+** from within an SQL statement. This program used to use the
+** sqlite_exec_printf() API to substitue a string into an SQL statement.
+** The correct way to do this with sqlite3 is to use the bind API, but
+** since the shell is built around the callback paradigm it would be a lot
+** of work. Instead just use this hack, which is quite harmless.
+*/
+static const char *zShellStatic = 0;
+static void shellstaticFunc(
+  sqlite3_context *context,
+  int argc,
+  sqlite3_value **argv
+){
+  assert( 0==argc );
+  assert( zShellStatic );
+  sqlite3_result_text(context, zShellStatic, -1, SQLITE_STATIC);
+}
+
+
+/*
+** This routine reads a line of text from FILE in, stores
+** the text in memory obtained from malloc() and returns a pointer
+** to the text.  NULL is returned at end of file, or if malloc()
+** fails.
+**
+** The interface is like "readline" but no command-line editing
+** is done.
+*/
+static char *local_getline(char *zPrompt, FILE *in){
+  char *zLine;
+  int nLine;
+  int n;
+  int eol;
+
+  if( zPrompt && *zPrompt ){
+    printf("%s",zPrompt);
+    fflush(stdout);
+  }
+  nLine = 100;
+  zLine = malloc( nLine );
+  if( zLine==0 ) return 0;
+  n = 0;
+  eol = 0;
+  while( !eol ){
+    if( n+100>nLine ){
+      nLine = nLine*2 + 100;
+      zLine = realloc(zLine, nLine);
+      if( zLine==0 ) return 0;
+    }
+    if( fgets(&zLine[n], nLine - n, in)==0 ){
+      if( n==0 ){
+        free(zLine);
+        return 0;
+      }
+      zLine[n] = 0;
+      eol = 1;
+      break;
+    }
+    while( zLine[n] ){ n++; }
+    if( n>0 && zLine[n-1]=='\n' ){
+      n--;
+      zLine[n] = 0;
+      eol = 1;
+    }
+  }
+  zLine = realloc( zLine, n+1 );
+  return zLine;
+}
+
+/*
+** Retrieve a single line of input text.
+**
+** zPrior is a string of prior text retrieved.  If not the empty
+** string, then issue a continuation prompt.
+*/
+static char *one_input_line(const char *zPrior, FILE *in){
+  char *zPrompt;
+  char *zResult;
+  if( in!=0 ){
+    return local_getline(0, in);
+  }
+  if( zPrior && zPrior[0] ){
+    zPrompt = continuePrompt;
+  }else{
+    zPrompt = mainPrompt;
+  }
+  zResult = readline(zPrompt);
+#if defined(HAVE_READLINE) && HAVE_READLINE==1
+  if( zResult && *zResult ) add_history(zResult);
+#endif
+  return zResult;
+}
+
+struct previous_mode_data {
+  int valid;        /* Is there legit data in here? */
+  int mode;
+  int showHeader;
+  int colWidth[100];
+};
+
+/*
+** An pointer to an instance of this structure is passed from
+** the main program to the callback.  This is used to communicate
+** state and mode information.
+*/
+struct callback_data {
+  sqlite3 *db;            /* The database */
+  int echoOn;            /* True to echo input commands */
+  int cnt;               /* Number of records displayed so far */
+  FILE *out;             /* Write results here */
+  int mode;              /* An output mode setting */
+  int writableSchema;    /* True if PRAGMA writable_schema=ON */
+  int showHeader;        /* True to show column names in List or Column mode */
+  char *zDestTable;      /* Name of destination table when MODE_Insert */
+  char separator[20];    /* Separator character for MODE_List */
+  int colWidth[100];     /* Requested width of each column when in column mode*/
+  int actualWidth[100];  /* Actual width of each column */
+  char nullvalue[20];    /* The text to print when a NULL comes back from
+                         ** the database */
+  struct previous_mode_data explainPrev;
+                         /* Holds the mode information just before
+                         ** .explain ON */
+  char outfile[FILENAME_MAX]; /* Filename for *out */
+  const char *zDbFilename;    /* name of the database file */
+};
+
+/*
+** These are the allowed modes.
+*/
+#define MODE_Line     0  /* One column per line.  Blank line between records */
+#define MODE_Column   1  /* One record per line in neat columns */
+#define MODE_List     2  /* One record per line with a separator */
+#define MODE_Semi     3  /* Same as MODE_List but append ";" to each line */
+#define MODE_Html     4  /* Generate an XHTML table */
+#define MODE_Insert   5  /* Generate SQL "insert" statements */
+#define MODE_Tcl      6  /* Generate ANSI-C or TCL quoted elements */
+#define MODE_Csv      7  /* Quote strings, numbers are plain */
+#define MODE_Explain  8  /* Like MODE_Column, but do not truncate data */
+
+static const char *modeDescr[] = {
+  "line",
+  "column",
+  "list",
+  "semi",
+  "html",
+  "insert",
+  "tcl",
+  "csv",
+  "explain",
+};
+
+/*
+** Number of elements in an array
+*/
+#define ArraySize(X)  (sizeof(X)/sizeof(X[0]))
+
+/*
+** Output the given string as a quoted string using SQL quoting conventions.
+*/
+static void output_quoted_string(FILE *out, const char *z){
+  int i;
+  int nSingle = 0;
+  for(i=0; z[i]; i++){
+    if( z[i]=='\'' ) nSingle++;
+  }
+  if( nSingle==0 ){
+    fprintf(out,"'%s'",z);
+  }else{
+    fprintf(out,"'");
+    while( *z ){
+      for(i=0; z[i] && z[i]!='\''; i++){}
+      if( i==0 ){
+        fprintf(out,"''");
+        z++;
+      }else if( z[i]=='\'' ){
+        fprintf(out,"%.*s''",i,z);
+        z += i+1;
+      }else{
+        fprintf(out,"%s",z);
+        break;
+      }
+    }
+    fprintf(out,"'");
+  }
+}
+
+/*
+** Output the given string as a quoted according to C or TCL quoting rules.
+*/
+static void output_c_string(FILE *out, const char *z){
+  unsigned int c;
+  fputc('"', out);
+  while( (c = *(z++))!=0 ){
+    if( c=='\\' ){
+      fputc(c, out);
+      fputc(c, out);
+    }else if( c=='\t' ){
+      fputc('\\', out);
+      fputc('t', out);
+    }else if( c=='\n' ){
+      fputc('\\', out);
+      fputc('n', out);
+    }else if( c=='\r' ){
+      fputc('\\', out);
+      fputc('r', out);
+    }else if( !isprint(c) ){
+      fprintf(out, "\\%03o", c&0xff);
+    }else{
+      fputc(c, out);
+    }
+  }
+  fputc('"', out);
+}
+
+/*
+** Output the given string with characters that are special to
+** HTML escaped.
+*/
+static void output_html_string(FILE *out, const char *z){
+  int i;
+  while( *z ){
+    for(i=0; z[i] && z[i]!='<' && z[i]!='&'; i++){}
+    if( i>0 ){
+      fprintf(out,"%.*s",i,z);
+    }
+    if( z[i]=='<' ){
+      fprintf(out,"&lt;");
+    }else if( z[i]=='&' ){
+      fprintf(out,"&amp;");
+    }else{
+      break;
+    }
+    z += i + 1;
+  }
+}
+
+/*
+** If a field contains any character identified by a 1 in the following
+** array, then the string must be quoted for CSV.
+*/
+static const char needCsvQuote[] = {
+  1, 1, 1, 1, 1, 1, 1, 1,   1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1,   1, 1, 1, 1, 1, 1, 1, 1,
+  1, 0, 1, 0, 0, 0, 0, 1,   0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,   0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,   0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,   0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,   0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,   0, 0, 0, 0, 0, 0, 0, 1,
+  1, 1, 1, 1, 1, 1, 1, 1,   1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1,   1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1,   1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1,   1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1,   1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1,   1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1,   1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1,   1, 1, 1, 1, 1, 1, 1, 1,
+};
+
+/*
+** Output a single term of CSV.  Actually, p->separator is used for
+** the separator, which may or may not be a comma.  p->nullvalue is
+** the null value.  Strings are quoted using ANSI-C rules.  Numbers
+** appear outside of quotes.
+*/
+static void output_csv(struct callback_data *p, const char *z, int bSep){
+  FILE *out = p->out;
+  if( z==0 ){
+    fprintf(out,"%s",p->nullvalue);
+  }else{
+    int i;
+    int nSep = strlen(p->separator);
+    for(i=0; z[i]; i++){
+      if( needCsvQuote[((unsigned char*)z)[i]]
+         || (z[i]==p->separator[0] &&
+             (nSep==1 || memcmp(z, p->separator, nSep)==0)) ){
+        i = 0;
+        break;
+      }
+    }
+    if( i==0 ){
+      putc('"', out);
+      for(i=0; z[i]; i++){
+        if( z[i]=='"' ) putc('"', out);
+        putc(z[i], out);
+      }
+      putc('"', out);
+    }else{
+      fprintf(out, "%s", z);
+    }
+  }
+  if( bSep ){
+    fprintf(p->out, "%s", p->separator);
+  }
+}
+
+#ifdef SIGINT
+/*
+** This routine runs when the user presses Ctrl-C
+*/
+static void interrupt_handler(int NotUsed){
+  seenInterrupt = 1;
+  if( db ) sqlite3_interrupt(db);
+}
+#endif
+
+/*
+** This is the callback routine that the SQLite library
+** invokes for each row of a query result.
+*/
+static int callback(void *pArg, int nArg, char **azArg, char **azCol){
+  int i;
+  struct callback_data *p = (struct callback_data*)pArg;
+  switch( p->mode ){
+    case MODE_Line: {
+      int w = 5;
+      if( azArg==0 ) break;
+      for(i=0; i<nArg; i++){
+        int len = strlen(azCol[i] ? azCol[i] : "");
+        if( len>w ) w = len;
+      }
+      if( p->cnt++>0 ) fprintf(p->out,"\n");
+      for(i=0; i<nArg; i++){
+        fprintf(p->out,"%*s = %s\n", w, azCol[i],
+                azArg[i] ? azArg[i] : p->nullvalue);
+      }
+      break;
+    }
+    case MODE_Explain:
+    case MODE_Column: {
+      if( p->cnt++==0 ){
+        for(i=0; i<nArg; i++){
+          int w, n;
+          if( i<ArraySize(p->colWidth) ){
+            w = p->colWidth[i];
+          }else{
+            w = 0;
+          }
+          if( w<=0 ){
+            w = strlen(azCol[i] ? azCol[i] : "");
+            if( w<10 ) w = 10;
+            n = strlen(azArg && azArg[i] ? azArg[i] : p->nullvalue);
+            if( w<n ) w = n;
+          }
+          if( i<ArraySize(p->actualWidth) ){
+            p->actualWidth[i] = w;
+          }
+          if( p->showHeader ){
+            fprintf(p->out,"%-*.*s%s",w,w,azCol[i], i==nArg-1 ? "\n": "  ");
+          }
+        }
+        if( p->showHeader ){
+          for(i=0; i<nArg; i++){
+            int w;
+            if( i<ArraySize(p->actualWidth) ){
+               w = p->actualWidth[i];
+            }else{
+               w = 10;
+            }
+            fprintf(p->out,"%-*.*s%s",w,w,"-----------------------------------"
+                   "----------------------------------------------------------",
+                    i==nArg-1 ? "\n": "  ");
+          }
+        }
+      }
+      if( azArg==0 ) break;
+      for(i=0; i<nArg; i++){
+        int w;
+        if( i<ArraySize(p->actualWidth) ){
+           w = p->actualWidth[i];
+        }else{
+           w = 10;
+        }
+        if( p->mode==MODE_Explain && azArg[i] && strlen(azArg[i])>w ){
+          w = strlen(azArg[i]);
+        }
+        fprintf(p->out,"%-*.*s%s",w,w,
+            azArg[i] ? azArg[i] : p->nullvalue, i==nArg-1 ? "\n": "  ");
+      }
+      break;
+    }
+    case MODE_Semi:
+    case MODE_List: {
+      if( p->cnt++==0 && p->showHeader ){
+        for(i=0; i<nArg; i++){
+          fprintf(p->out,"%s%s",azCol[i], i==nArg-1 ? "\n" : p->separator);
+        }
+      }
+      if( azArg==0 ) break;
+      for(i=0; i<nArg; i++){
+        char *z = azArg[i];
+        if( z==0 ) z = p->nullvalue;
+        fprintf(p->out, "%s", z);
+        if( i<nArg-1 ){
+          fprintf(p->out, "%s", p->separator);
+        }else if( p->mode==MODE_Semi ){
+          fprintf(p->out, ";\n");
+        }else{
+          fprintf(p->out, "\n");
+        }
+      }
+      break;
+    }
+    case MODE_Html: {
+      if( p->cnt++==0 && p->showHeader ){
+        fprintf(p->out,"<TR>");
+        for(i=0; i<nArg; i++){
+          fprintf(p->out,"<TH>%s</TH>",azCol[i]);
+        }
+        fprintf(p->out,"</TR>\n");
+      }
+      if( azArg==0 ) break;
+      fprintf(p->out,"<TR>");
+      for(i=0; i<nArg; i++){
+        fprintf(p->out,"<TD>");
+        output_html_string(p->out, azArg[i] ? azArg[i] : p->nullvalue);
+        fprintf(p->out,"</TD>\n");
+      }
+      fprintf(p->out,"</TR>\n");
+      break;
+    }
+    case MODE_Tcl: {
+      if( p->cnt++==0 && p->showHeader ){
+        for(i=0; i<nArg; i++){
+          output_c_string(p->out,azCol[i] ? azCol[i] : "");
+          fprintf(p->out, "%s", p->separator);
+        }
+        fprintf(p->out,"\n");
+      }
+      if( azArg==0 ) break;
+      for(i=0; i<nArg; i++){
+        output_c_string(p->out, azArg[i] ? azArg[i] : p->nullvalue);
+        fprintf(p->out, "%s", p->separator);
+      }
+      fprintf(p->out,"\n");
+      break;
+    }
+    case MODE_Csv: {
+      if( p->cnt++==0 && p->showHeader ){
+        for(i=0; i<nArg; i++){
+          output_csv(p, azCol[i] ? azCol[i] : "", i<nArg-1);
+        }
+        fprintf(p->out,"\n");
+      }
+      if( azArg==0 ) break;
+      for(i=0; i<nArg; i++){
+        output_csv(p, azArg[i], i<nArg-1);
+      }
+      fprintf(p->out,"\n");
+      break;
+    }
+    case MODE_Insert: {
+      if( azArg==0 ) break;
+      fprintf(p->out,"INSERT INTO %s VALUES(",p->zDestTable);
+      for(i=0; i<nArg; i++){
+        char *zSep = i>0 ? ",": "";
+        if( azArg[i]==0 ){
+          fprintf(p->out,"%sNULL",zSep);
+        }else if( isNumber(azArg[i], 0) ){
+          fprintf(p->out,"%s%s",zSep, azArg[i]);
+        }else{
+          if( zSep[0] ) fprintf(p->out,"%s",zSep);
+          output_quoted_string(p->out, azArg[i]);
+        }
+      }
+      fprintf(p->out,");\n");
+      break;
+    }
+  }
+  return 0;
+}
+
+/*
+** Set the destination table field of the callback_data structure to
+** the name of the table given.  Escape any quote characters in the
+** table name.
+*/
+static void set_table_name(struct callback_data *p, const char *zName){
+  int i, n;
+  int needQuote;
+  char *z;
+
+  if( p->zDestTable ){
+    free(p->zDestTable);
+    p->zDestTable = 0;
+  }
+  if( zName==0 ) return;
+  needQuote = !isalpha((unsigned char)*zName) && *zName!='_';
+  for(i=n=0; zName[i]; i++, n++){
+    if( !isalnum((unsigned char)zName[i]) && zName[i]!='_' ){
+      needQuote = 1;
+      if( zName[i]=='\'' ) n++;
+    }
+  }
+  if( needQuote ) n += 2;
+  z = p->zDestTable = malloc( n+1 );
+  if( z==0 ){
+    fprintf(stderr,"Out of memory!\n");
+    exit(1);
+  }
+  n = 0;
+  if( needQuote ) z[n++] = '\'';
+  for(i=0; zName[i]; i++){
+    z[n++] = zName[i];
+    if( zName[i]=='\'' ) z[n++] = '\'';
+  }
+  if( needQuote ) z[n++] = '\'';
+  z[n] = 0;
+}
+
+/* zIn is either a pointer to a NULL-terminated string in memory obtained
+** from malloc(), or a NULL pointer. The string pointed to by zAppend is
+** added to zIn, and the result returned in memory obtained from malloc().
+** zIn, if it was not NULL, is freed.
+**
+** If the third argument, quote, is not '\0', then it is used as a
+** quote character for zAppend.
+*/
+static char *appendText(char *zIn, char const *zAppend, char quote){
+  int len;
+  int i;
+  int nAppend = strlen(zAppend);
+  int nIn = (zIn?strlen(zIn):0);
+
+  len = nAppend+nIn+1;
+  if( quote ){
+    len += 2;
+    for(i=0; i<nAppend; i++){
+      if( zAppend[i]==quote ) len++;
+    }
+  }
+
+  zIn = (char *)realloc(zIn, len);
+  if( !zIn ){
+    return 0;
+  }
+
+  if( quote ){
+    char *zCsr = &zIn[nIn];
+    *zCsr++ = quote;
+    for(i=0; i<nAppend; i++){
+      *zCsr++ = zAppend[i];
+      if( zAppend[i]==quote ) *zCsr++ = quote;
+    }
+    *zCsr++ = quote;
+    *zCsr++ = '\0';
+    assert( (zCsr-zIn)==len );
+  }else{
+    memcpy(&zIn[nIn], zAppend, nAppend);
+    zIn[len-1] = '\0';
+  }
+
+  return zIn;
+}
+
+
+/*
+** Execute a query statement that has a single result column.  Print
+** that result column on a line by itself with a semicolon terminator.
+**
+** This is used, for example, to show the schema of the database by
+** querying the SQLITE_MASTER table.
+*/
+static int run_table_dump_query(FILE *out, sqlite3 *db, const char *zSelect){
+  sqlite3_stmt *pSelect;
+  int rc;
+  rc = sqlite3_prepare(db, zSelect, -1, &pSelect, 0);
+  if( rc!=SQLITE_OK || !pSelect ){
+    return rc;
+  }
+  rc = sqlite3_step(pSelect);
+  while( rc==SQLITE_ROW ){
+    fprintf(out, "%s;\n", sqlite3_column_text(pSelect, 0));
+    rc = sqlite3_step(pSelect);
+  }
+  return sqlite3_finalize(pSelect);
+}
+
+
+/*
+** This is a different callback routine used for dumping the database.
+** Each row received by this callback consists of a table name,
+** the table type ("index" or "table") and SQL to create the table.
+** This routine should print text sufficient to recreate the table.
+*/
+static int dump_callback(void *pArg, int nArg, char **azArg, char **azCol){
+  int rc;
+  const char *zTable;
+  const char *zType;
+  const char *zSql;
+  struct callback_data *p = (struct callback_data *)pArg;
+
+  if( nArg!=3 ) return 1;
+  zTable = azArg[0];
+  zType = azArg[1];
+  zSql = azArg[2];
+
+  if( strcmp(zTable, "sqlite_sequence")==0 ){
+    fprintf(p->out, "DELETE FROM sqlite_sequence;\n");
+  }else if( strcmp(zTable, "sqlite_stat1")==0 ){
+    fprintf(p->out, "ANALYZE sqlite_master;\n");
+  }else if( strncmp(zTable, "sqlite_", 7)==0 ){
+    return 0;
+  }else if( strncmp(zSql, "CREATE VIRTUAL TABLE", 20)==0 ){
+    char *zIns;
+    if( !p->writableSchema ){
+      fprintf(p->out, "PRAGMA writable_schema=ON;\n");
+      p->writableSchema = 1;
+    }
+    zIns = sqlite3_mprintf(
+       "INSERT INTO sqlite_master(type,name,tbl_name,rootpage,sql)"
+       "VALUES('table','%q','%q',0,'%q');",
+       zTable, zTable, zSql);
+    fprintf(p->out, "%s\n", zIns);
+    sqlite3_free(zIns);
+    return 0;
+  }else{
+    fprintf(p->out, "%s;\n", zSql);
+  }
+
+  if( strcmp(zType, "table")==0 ){
+    sqlite3_stmt *pTableInfo = 0;
+    char *zSelect = 0;
+    char *zTableInfo = 0;
+    char *zTmp = 0;
+
+    zTableInfo = appendText(zTableInfo, "PRAGMA table_info(", 0);
+    zTableInfo = appendText(zTableInfo, zTable, '"');
+    zTableInfo = appendText(zTableInfo, ");", 0);
+
+    rc = sqlite3_prepare(p->db, zTableInfo, -1, &pTableInfo, 0);
+    if( zTableInfo ) free(zTableInfo);
+    if( rc!=SQLITE_OK || !pTableInfo ){
+      return 1;
+    }
+
+    zSelect = appendText(zSelect, "SELECT 'INSERT INTO ' || ", 0);
+    zTmp = appendText(zTmp, zTable, '"');
+    if( zTmp ){
+      zSelect = appendText(zSelect, zTmp, '\'');
+    }
+    zSelect = appendText(zSelect, " || ' VALUES(' || ", 0);
+    rc = sqlite3_step(pTableInfo);
+    while( rc==SQLITE_ROW ){
+      const char *zText = (const char *)sqlite3_column_text(pTableInfo, 1);
+      zSelect = appendText(zSelect, "quote(", 0);
+      zSelect = appendText(zSelect, zText, '"');
+      rc = sqlite3_step(pTableInfo);
+      if( rc==SQLITE_ROW ){
+        zSelect = appendText(zSelect, ") || ',' || ", 0);
+      }else{
+        zSelect = appendText(zSelect, ") ", 0);
+      }
+    }
+    rc = sqlite3_finalize(pTableInfo);
+    if( rc!=SQLITE_OK ){
+      if( zSelect ) free(zSelect);
+      return 1;
+    }
+    zSelect = appendText(zSelect, "|| ')' FROM  ", 0);
+    zSelect = appendText(zSelect, zTable, '"');
+
+    rc = run_table_dump_query(p->out, p->db, zSelect);
+    if( rc==SQLITE_CORRUPT ){
+      zSelect = appendText(zSelect, " ORDER BY rowid DESC", 0);
+      rc = run_table_dump_query(p->out, p->db, zSelect);
+    }
+    if( zSelect ) free(zSelect);
+  }
+  return 0;
+}
+
+/*
+** Run zQuery.  Use dump_callback() as the callback routine so that
+** the contents of the query are output as SQL statements.
+**
+** If we get a SQLITE_CORRUPT error, rerun the query after appending
+** "ORDER BY rowid DESC" to the end.
+*/
+static int run_schema_dump_query(
+  struct callback_data *p,
+  const char *zQuery,
+  char **pzErrMsg
+){
+  int rc;
+  rc = sqlite3_exec(p->db, zQuery, dump_callback, p, pzErrMsg);
+  if( rc==SQLITE_CORRUPT ){
+    char *zQ2;
+    int len = strlen(zQuery);
+    if( pzErrMsg ) sqlite3_free(*pzErrMsg);
+    zQ2 = malloc( len+100 );
+    if( zQ2==0 ) return rc;
+    sqlite3_snprintf(sizeof(zQ2), zQ2, "%s ORDER BY rowid DESC", zQuery);
+    rc = sqlite3_exec(p->db, zQ2, dump_callback, p, pzErrMsg);
+    free(zQ2);
+  }
+  return rc;
+}
+
+/*
+** Text of a help message
+*/
+static char zHelp[] =
+  ".bail ON|OFF           Stop after hitting an error.  Default OFF\n"
+  ".databases             List names and files of attached databases\n"
+  ".dump ?TABLE? ...      Dump the database in an SQL text format\n"
+  ".echo ON|OFF           Turn command echo on or off\n"
+  ".exit                  Exit this program\n"
+  ".explain ON|OFF        Turn output mode suitable for EXPLAIN on or off.\n"
+  ".header(s) ON|OFF      Turn display of headers on or off\n"
+  ".help                  Show this message\n"
+  ".import FILE TABLE     Import data from FILE into TABLE\n"
+  ".indices TABLE         Show names of all indices on TABLE\n"
+#ifdef SQLITE_ENABLE_IOTRACE
+  ".iotrace FILE          Enable I/O diagnostic logging to FILE\n"
+#endif
+#ifndef SQLITE_OMIT_LOAD_EXTENSION
+  ".load FILE ?ENTRY?     Load an extension library\n"
+#endif
+  ".mode MODE ?TABLE?     Set output mode where MODE is one of:\n"
+  "                         csv      Comma-separated values\n"
+  "                         column   Left-aligned columns.  (See .width)\n"
+  "                         html     HTML <table> code\n"
+  "                         insert   SQL insert statements for TABLE\n"
+  "                         line     One value per line\n"
+  "                         list     Values delimited by .separator string\n"
+  "                         tabs     Tab-separated values\n"
+  "                         tcl      TCL list elements\n"
+  ".nullvalue STRING      Print STRING in place of NULL values\n"
+  ".output FILENAME       Send output to FILENAME\n"
+  ".output stdout         Send output to the screen\n"
+  ".prompt MAIN CONTINUE  Replace the standard prompts\n"
+  ".quit                  Exit this program\n"
+  ".read FILENAME         Execute SQL in FILENAME\n"
+  ".schema ?TABLE?        Show the CREATE statements\n"
+  ".separator STRING      Change separator used by output mode and .import\n"
+  ".show                  Show the current values for various settings\n"
+  ".tables ?PATTERN?      List names of tables matching a LIKE pattern\n"
+  ".timeout MS            Try opening locked tables for MS milliseconds\n"
+#if HAS_TIMER
+  ".timer ON|OFF          Turn the CPU timer measurement on or off\n"
+#endif
+  ".width NUM NUM ...     Set column widths for \"column\" mode\n"
+;
+
+/* Forward reference */
+static int process_input(struct callback_data *p, FILE *in);
+
+/*
+** Make sure the database is open.  If it is not, then open it.  If
+** the database fails to open, print an error message and exit.
+*/
+static void open_db(struct callback_data *p){
+  if( p->db==0 ){
+    sqlite3_open(p->zDbFilename, &p->db);
+    db = p->db;
+    sqlite3_create_function(db, "shellstatic", 0, SQLITE_UTF8, 0,
+        shellstaticFunc, 0, 0);
+    if( SQLITE_OK!=sqlite3_errcode(db) ){
+      fprintf(stderr,"Unable to open database \"%s\": %s\n",
+          p->zDbFilename, sqlite3_errmsg(db));
+      exit(1);
+    }
+#ifndef SQLITE_OMIT_LOAD_EXTENSION
+    sqlite3_enable_load_extension(p->db, 1);
+#endif
+  }
+}
+
+/*
+** Do C-language style dequoting.
+**
+**    \t    -> tab
+**    \n    -> newline
+**    \r    -> carriage return
+**    \NNN  -> ascii character NNN in octal
+**    \\    -> backslash
+*/
+static void resolve_backslashes(char *z){
+  int i, j, c;
+  for(i=j=0; (c = z[i])!=0; i++, j++){
+    if( c=='\\' ){
+      c = z[++i];
+      if( c=='n' ){
+        c = '\n';
+      }else if( c=='t' ){
+        c = '\t';
+      }else if( c=='r' ){
+        c = '\r';
+      }else if( c>='0' && c<='7' ){
+        c -= '0';
+        if( z[i+1]>='0' && z[i+1]<='7' ){
+          i++;
+          c = (c<<3) + z[i] - '0';
+          if( z[i+1]>='0' && z[i+1]<='7' ){
+            i++;
+            c = (c<<3) + z[i] - '0';
+          }
+        }
+      }
+    }
+    z[j] = c;
+  }
+  z[j] = 0;
+}
+
+/*
+** Interpret zArg as a boolean value.  Return either 0 or 1.
+*/
+static int booleanValue(char *zArg){
+  int val = atoi(zArg);
+  int j;
+  for(j=0; zArg[j]; j++){
+    zArg[j] = tolower(zArg[j]);
+  }
+  if( strcmp(zArg,"on")==0 ){
+    val = 1;
+  }else if( strcmp(zArg,"yes")==0 ){
+    val = 1;
+  }
+  return val;
+}
+
+/*
+** If an input line begins with "." then invoke this routine to
+** process that line.
+**
+** Return 1 on error, 2 to exit, and 0 otherwise.
+*/
+static int do_meta_command(char *zLine, struct callback_data *p){
+  int i = 1;
+  int nArg = 0;
+  int n, c;
+  int rc = 0;
+  char *azArg[50];
+
+  /* Parse the input line into tokens.
+  */
+  while( zLine[i] && nArg<ArraySize(azArg) ){
+    while( isspace((unsigned char)zLine[i]) ){ i++; }
+    if( zLine[i]==0 ) break;
+    if( zLine[i]=='\'' || zLine[i]=='"' ){
+      int delim = zLine[i++];
+      azArg[nArg++] = &zLine[i];
+      while( zLine[i] && zLine[i]!=delim ){ i++; }
+      if( zLine[i]==delim ){
+        zLine[i++] = 0;
+      }
+      if( delim=='"' ) resolve_backslashes(azArg[nArg-1]);
+    }else{
+      azArg[nArg++] = &zLine[i];
+      while( zLine[i] && !isspace((unsigned char)zLine[i]) ){ i++; }
+      if( zLine[i] ) zLine[i++] = 0;
+      resolve_backslashes(azArg[nArg-1]);
+    }
+  }
+
+  /* Process the input line.
+  */
+  if( nArg==0 ) return rc;
+  n = strlen(azArg[0]);
+  c = azArg[0][0];
+  if( c=='b' && n>1 && strncmp(azArg[0], "bail", n)==0 && nArg>1 ){
+    bail_on_error = booleanValue(azArg[1]);
+  }else
+
+  if( c=='d' && n>1 && strncmp(azArg[0], "databases", n)==0 ){
+    struct callback_data data;
+    char *zErrMsg = 0;
+    open_db(p);
+    memcpy(&data, p, sizeof(data));
+    data.showHeader = 1;
+    data.mode = MODE_Column;
+    data.colWidth[0] = 3;
+    data.colWidth[1] = 15;
+    data.colWidth[2] = 58;
+    data.cnt = 0;
+    sqlite3_exec(p->db, "PRAGMA database_list; ", callback, &data, &zErrMsg);
+    if( zErrMsg ){
+      fprintf(stderr,"Error: %s\n", zErrMsg);
+      sqlite3_free(zErrMsg);
+    }
+  }else
+
+  if( c=='d' && strncmp(azArg[0], "dump", n)==0 ){
+    char *zErrMsg = 0;
+    open_db(p);
+    fprintf(p->out, "BEGIN TRANSACTION;\n");
+    p->writableSchema = 0;
+    if( nArg==1 ){
+      run_schema_dump_query(p,
+        "SELECT name, type, sql FROM sqlite_master "
+        "WHERE sql NOT NULL AND type=='table'", 0
+      );
+      run_table_dump_query(p->out, p->db,
+        "SELECT sql FROM sqlite_master "
+        "WHERE sql NOT NULL AND type IN ('index','trigger','view')"
+      );
+    }else{
+      int i;
+      for(i=1; i<nArg; i++){
+        zShellStatic = azArg[i];
+        run_schema_dump_query(p,
+          "SELECT name, type, sql FROM sqlite_master "
+          "WHERE tbl_name LIKE shellstatic() AND type=='table'"
+          "  AND sql NOT NULL", 0);
+        run_table_dump_query(p->out, p->db,
+          "SELECT sql FROM sqlite_master "
+          "WHERE sql NOT NULL"
+          "  AND type IN ('index','trigger','view')"
+          "  AND tbl_name LIKE shellstatic()"
+        );
+        zShellStatic = 0;
+      }
+    }
+    if( p->writableSchema ){
+      fprintf(p->out, "PRAGMA writable_schema=OFF;\n");
+      p->writableSchema = 0;
+    }
+    if( zErrMsg ){
+      fprintf(stderr,"Error: %s\n", zErrMsg);
+      sqlite3_free(zErrMsg);
+    }else{
+      fprintf(p->out, "COMMIT;\n");
+    }
+  }else
+
+  if( c=='e' && strncmp(azArg[0], "echo", n)==0 && nArg>1 ){
+    p->echoOn = booleanValue(azArg[1]);
+  }else
+
+  if( c=='e' && strncmp(azArg[0], "exit", n)==0 ){
+    rc = 2;
+  }else
+
+  if( c=='e' && strncmp(azArg[0], "explain", n)==0 ){
+    int val = nArg>=2 ? booleanValue(azArg[1]) : 1;
+    if(val == 1) {
+      if(!p->explainPrev.valid) {
+        p->explainPrev.valid = 1;
+        p->explainPrev.mode = p->mode;
+        p->explainPrev.showHeader = p->showHeader;
+        memcpy(p->explainPrev.colWidth,p->colWidth,sizeof(p->colWidth));
+      }
+      /* We could put this code under the !p->explainValid
+      ** condition so that it does not execute if we are already in
+      ** explain mode. However, always executing it allows us an easy
+      ** was to reset to explain mode in case the user previously
+      ** did an .explain followed by a .width, .mode or .header
+      ** command.
+      */
+      p->mode = MODE_Explain;
+      p->showHeader = 1;
+      memset(p->colWidth,0,ArraySize(p->colWidth));
+      p->colWidth[0] = 4;                  /* addr */
+      p->colWidth[1] = 13;                 /* opcode */
+      p->colWidth[2] = 4;                  /* P1 */
+      p->colWidth[3] = 4;                  /* P2 */
+      p->colWidth[4] = 4;                  /* P3 */
+      p->colWidth[5] = 13;                 /* P4 */
+      p->colWidth[6] = 2;                  /* P5 */
+      p->colWidth[7] = 13;                  /* Comment */
+    }else if (p->explainPrev.valid) {
+      p->explainPrev.valid = 0;
+      p->mode = p->explainPrev.mode;
+      p->showHeader = p->explainPrev.showHeader;
+      memcpy(p->colWidth,p->explainPrev.colWidth,sizeof(p->colWidth));
+    }
+  }else
+
+  if( c=='h' && (strncmp(azArg[0], "header", n)==0 ||
+                 strncmp(azArg[0], "headers", n)==0 )&& nArg>1 ){
+    p->showHeader = booleanValue(azArg[1]);
+  }else
+
+  if( c=='h' && strncmp(azArg[0], "help", n)==0 ){
+    fprintf(stderr,zHelp);
+  }else
+
+  if( c=='i' && strncmp(azArg[0], "import", n)==0 && nArg>=3 ){
+    char *zTable = azArg[2];    /* Insert data into this table */
+    char *zFile = azArg[1];     /* The file from which to extract data */
+    sqlite3_stmt *pStmt;        /* A statement */
+    int rc;                     /* Result code */
+    int nCol;                   /* Number of columns in the table */
+    int nByte;                  /* Number of bytes in an SQL string */
+    int i, j;                   /* Loop counters */
+    int nSep;                   /* Number of bytes in p->separator[] */
+    char *zSql;                 /* An SQL statement */
+    char *zLine;                /* A single line of input from the file */
+    char **azCol;               /* zLine[] broken up into columns */
+    char *zCommit;              /* How to commit changes */
+    FILE *in;                   /* The input file */
+    int lineno = 0;             /* Line number of input file */
+
+    open_db(p);
+    nSep = strlen(p->separator);
+    if( nSep==0 ){
+      fprintf(stderr, "non-null separator required for import\n");
+      return 0;
+    }
+    zSql = sqlite3_mprintf("SELECT * FROM '%q'", zTable);
+    if( zSql==0 ) return 0;
+    nByte = strlen(zSql);
+    rc = sqlite3_prepare(p->db, zSql, -1, &pStmt, 0);
+    sqlite3_free(zSql);
+    if( rc ){
+      fprintf(stderr,"Error: %s\n", sqlite3_errmsg(db));
+      nCol = 0;
+      rc = 1;
+    }else{
+      nCol = sqlite3_column_count(pStmt);
+    }
+    sqlite3_finalize(pStmt);
+    if( nCol==0 ) return 0;
+    zSql = malloc( nByte + 20 + nCol*2 );
+    if( zSql==0 ) return 0;
+    sqlite3_snprintf(nByte+20, zSql, "INSERT INTO '%q' VALUES(?", zTable);
+    j = strlen(zSql);
+    for(i=1; i<nCol; i++){
+      zSql[j++] = ',';
+      zSql[j++] = '?';
+    }
+    zSql[j++] = ')';
+    zSql[j] = 0;
+    rc = sqlite3_prepare(p->db, zSql, -1, &pStmt, 0);
+    free(zSql);
+    if( rc ){
+      fprintf(stderr, "Error: %s\n", sqlite3_errmsg(db));
+      sqlite3_finalize(pStmt);
+      return 1;
+    }
+    in = fopen(zFile, "rb");
+    if( in==0 ){
+      fprintf(stderr, "cannot open file: %s\n", zFile);
+      sqlite3_finalize(pStmt);
+      return 0;
+    }
+    azCol = malloc( sizeof(azCol[0])*(nCol+1) );
+    if( azCol==0 ){
+      fclose(in);
+      return 0;
+    }
+    sqlite3_exec(p->db, "BEGIN", 0, 0, 0);
+    zCommit = "COMMIT";
+    while( (zLine = local_getline(0, in))!=0 ){
+      char *z;
+      i = 0;
+      lineno++;
+      azCol[0] = zLine;
+      for(i=0, z=zLine; *z && *z!='\n' && *z!='\r'; z++){
+        if( *z==p->separator[0] && strncmp(z, p->separator, nSep)==0 ){
+          *z = 0;
+          i++;
+          if( i<nCol ){
+            azCol[i] = &z[nSep];
+            z += nSep-1;
+          }
+        }
+      }
+      *z = 0;
+      if( i+1!=nCol ){
+        fprintf(stderr,"%s line %d: expected %d columns of data but found %d\n",
+           zFile, lineno, nCol, i+1);
+        zCommit = "ROLLBACK";
+        break;
+      }
+      for(i=0; i<nCol; i++){
+        sqlite3_bind_text(pStmt, i+1, azCol[i], -1, SQLITE_STATIC);
+      }
+      sqlite3_step(pStmt);
+      rc = sqlite3_reset(pStmt);
+      free(zLine);
+      if( rc!=SQLITE_OK ){
+        fprintf(stderr,"Error: %s\n", sqlite3_errmsg(db));
+        zCommit = "ROLLBACK";
+        rc = 1;
+        break;
+      }
+    }
+    free(azCol);
+    fclose(in);
+    sqlite3_finalize(pStmt);
+    sqlite3_exec(p->db, zCommit, 0, 0, 0);
+  }else
+
+  if( c=='i' && strncmp(azArg[0], "indices", n)==0 && nArg>1 ){
+    struct callback_data data;
+    char *zErrMsg = 0;
+    open_db(p);
+    memcpy(&data, p, sizeof(data));
+    data.showHeader = 0;
+    data.mode = MODE_List;
+    zShellStatic = azArg[1];
+    sqlite3_exec(p->db,
+      "SELECT name FROM sqlite_master "
+      "WHERE type='index' AND tbl_name LIKE shellstatic() "
+      "UNION ALL "
+      "SELECT name FROM sqlite_temp_master "
+      "WHERE type='index' AND tbl_name LIKE shellstatic() "
+      "ORDER BY 1",
+      callback, &data, &zErrMsg
+    );
+    zShellStatic = 0;
+    if( zErrMsg ){
+      fprintf(stderr,"Error: %s\n", zErrMsg);
+      sqlite3_free(zErrMsg);
+    }
+  }else
+
+#ifdef SQLITE_ENABLE_IOTRACE
+  if( c=='i' && strncmp(azArg[0], "iotrace", n)==0 ){
+    extern void (*sqlite3IoTrace)(const char*, ...);
+    if( iotrace && iotrace!=stdout ) fclose(iotrace);
+    iotrace = 0;
+    if( nArg<2 ){
+      sqlite3IoTrace = 0;
+    }else if( strcmp(azArg[1], "-")==0 ){
+      sqlite3IoTrace = iotracePrintf;
+      iotrace = stdout;
+    }else{
+      iotrace = fopen(azArg[1], "w");
+      if( iotrace==0 ){
+        fprintf(stderr, "cannot open \"%s\"\n", azArg[1]);
+        sqlite3IoTrace = 0;
+      }else{
+        sqlite3IoTrace = iotracePrintf;
+      }
+    }
+  }else
+#endif
+
+#ifndef SQLITE_OMIT_LOAD_EXTENSION
+  if( c=='l' && strncmp(azArg[0], "load", n)==0 && nArg>=2 ){
+    const char *zFile, *zProc;
+    char *zErrMsg = 0;
+    int rc;
+    zFile = azArg[1];
+    zProc = nArg>=3 ? azArg[2] : 0;
+    open_db(p);
+    rc = sqlite3_load_extension(p->db, zFile, zProc, &zErrMsg);
+    if( rc!=SQLITE_OK ){
+      fprintf(stderr, "%s\n", zErrMsg);
+      sqlite3_free(zErrMsg);
+      rc = 1;
+    }
+  }else
+#endif
+
+  if( c=='m' && strncmp(azArg[0], "mode", n)==0 && nArg>=2 ){
+    int n2 = strlen(azArg[1]);
+    if( strncmp(azArg[1],"line",n2)==0
+        ||
+        strncmp(azArg[1],"lines",n2)==0 ){
+      p->mode = MODE_Line;
+    }else if( strncmp(azArg[1],"column",n2)==0
+              ||
+              strncmp(azArg[1],"columns",n2)==0 ){
+      p->mode = MODE_Column;
+    }else if( strncmp(azArg[1],"list",n2)==0 ){
+      p->mode = MODE_List;
+    }else if( strncmp(azArg[1],"html",n2)==0 ){
+      p->mode = MODE_Html;
+    }else if( strncmp(azArg[1],"tcl",n2)==0 ){
+      p->mode = MODE_Tcl;
+    }else if( strncmp(azArg[1],"csv",n2)==0 ){
+      p->mode = MODE_Csv;
+      sqlite3_snprintf(sizeof(p->separator), p->separator, ",");
+    }else if( strncmp(azArg[1],"tabs",n2)==0 ){
+      p->mode = MODE_List;
+      sqlite3_snprintf(sizeof(p->separator), p->separator, "\t");
+    }else if( strncmp(azArg[1],"insert",n2)==0 ){
+      p->mode = MODE_Insert;
+      if( nArg>=3 ){
+        set_table_name(p, azArg[2]);
+      }else{
+        set_table_name(p, "table");
+      }
+    }else {
+      fprintf(stderr,"mode should be one of: "
+         "column csv html insert line list tabs tcl\n");
+    }
+  }else
+
+  if( c=='n' && strncmp(azArg[0], "nullvalue", n)==0 && nArg==2 ) {
+    sqlite3_snprintf(sizeof(p->nullvalue), p->nullvalue,
+                     "%.*s", (int)ArraySize(p->nullvalue)-1, azArg[1]);
+  }else
+
+  if( c=='o' && strncmp(azArg[0], "output", n)==0 && nArg==2 ){
+    if( p->out!=stdout ){
+      fclose(p->out);
+    }
+    if( strcmp(azArg[1],"stdout")==0 ){
+      p->out = stdout;
+      sqlite3_snprintf(sizeof(p->outfile), p->outfile, "stdout");
+    }else{
+      p->out = fopen(azArg[1], "wb");
+      if( p->out==0 ){
+        fprintf(stderr,"can't write to \"%s\"\n", azArg[1]);
+        p->out = stdout;
+      } else {
+         sqlite3_snprintf(sizeof(p->outfile), p->outfile, "%s", azArg[1]);
+      }
+    }
+  }else
+
+  if( c=='p' && strncmp(azArg[0], "prompt", n)==0 && (nArg==2 || nArg==3)){
+    if( nArg >= 2) {
+      strncpy(mainPrompt,azArg[1],(int)ArraySize(mainPrompt)-1);
+    }
+    if( nArg >= 3) {
+      strncpy(continuePrompt,azArg[2],(int)ArraySize(continuePrompt)-1);
+    }
+  }else
+
+  if( c=='q' && strncmp(azArg[0], "quit", n)==0 ){
+    rc = 2;
+  }else
+
+  if( c=='r' && strncmp(azArg[0], "read", n)==0 && nArg==2 ){
+    FILE *alt = fopen(azArg[1], "rb");
+    if( alt==0 ){
+      fprintf(stderr,"can't open \"%s\"\n", azArg[1]);
+    }else{
+      process_input(p, alt);
+      fclose(alt);
+    }
+  }else
+
+  if( c=='s' && strncmp(azArg[0], "schema", n)==0 ){
+    struct callback_data data;
+    char *zErrMsg = 0;
+    open_db(p);
+    memcpy(&data, p, sizeof(data));
+    data.showHeader = 0;
+    data.mode = MODE_Semi;
+    if( nArg>1 ){
+      int i;
+      for(i=0; azArg[1][i]; i++) azArg[1][i] = tolower(azArg[1][i]);
+      if( strcmp(azArg[1],"sqlite_master")==0 ){
+        char *new_argv[2], *new_colv[2];
+        new_argv[0] = "CREATE TABLE sqlite_master (\n"
+                      "  type text,\n"
+                      "  name text,\n"
+                      "  tbl_name text,\n"
+                      "  rootpage integer,\n"
+                      "  sql text\n"
+                      ")";
+        new_argv[1] = 0;
+        new_colv[0] = "sql";
+        new_colv[1] = 0;
+        callback(&data, 1, new_argv, new_colv);
+      }else if( strcmp(azArg[1],"sqlite_temp_master")==0 ){
+        char *new_argv[2], *new_colv[2];
+        new_argv[0] = "CREATE TEMP TABLE sqlite_temp_master (\n"
+                      "  type text,\n"
+                      "  name text,\n"
+                      "  tbl_name text,\n"
+                      "  rootpage integer,\n"
+                      "  sql text\n"
+                      ")";
+        new_argv[1] = 0;
+        new_colv[0] = "sql";
+        new_colv[1] = 0;
+        callback(&data, 1, new_argv, new_colv);
+      }else{
+        zShellStatic = azArg[1];
+        sqlite3_exec(p->db,
+          "SELECT sql FROM "
+          "  (SELECT * FROM sqlite_master UNION ALL"
+          "   SELECT * FROM sqlite_temp_master) "
+          "WHERE tbl_name LIKE shellstatic() AND type!='meta' AND sql NOTNULL "
+          "ORDER BY substr(type,2,1), name",
+          callback, &data, &zErrMsg);
+        zShellStatic = 0;
+      }
+    }else{
+      sqlite3_exec(p->db,
+         "SELECT sql FROM "
+         "  (SELECT * FROM sqlite_master UNION ALL"
+         "   SELECT * FROM sqlite_temp_master) "
+         "WHERE type!='meta' AND sql NOTNULL AND name NOT LIKE 'sqlite_%'"
+         "ORDER BY substr(type,2,1), name",
+         callback, &data, &zErrMsg
+      );
+    }
+    if( zErrMsg ){
+      fprintf(stderr,"Error: %s\n", zErrMsg);
+      sqlite3_free(zErrMsg);
+    }
+  }else
+
+  if( c=='s' && strncmp(azArg[0], "separator", n)==0 && nArg==2 ){
+    sqlite3_snprintf(sizeof(p->separator), p->separator,
+                     "%.*s", (int)sizeof(p->separator)-1, azArg[1]);
+  }else
+
+  if( c=='s' && strncmp(azArg[0], "show", n)==0){
+    int i;
+    fprintf(p->out,"%9.9s: %s\n","echo", p->echoOn ? "on" : "off");
+    fprintf(p->out,"%9.9s: %s\n","explain", p->explainPrev.valid ? "on" :"off");
+    fprintf(p->out,"%9.9s: %s\n","headers", p->showHeader ? "on" : "off");
+    fprintf(p->out,"%9.9s: %s\n","mode", modeDescr[p->mode]);
+    fprintf(p->out,"%9.9s: ", "nullvalue");
+      output_c_string(p->out, p->nullvalue);
+      fprintf(p->out, "\n");
+    fprintf(p->out,"%9.9s: %s\n","output",
+                                 strlen(p->outfile) ? p->outfile : "stdout");
+    fprintf(p->out,"%9.9s: ", "separator");
+      output_c_string(p->out, p->separator);
+      fprintf(p->out, "\n");
+    fprintf(p->out,"%9.9s: ","width");
+    for (i=0;i<(int)ArraySize(p->colWidth) && p->colWidth[i] != 0;i++) {
+      fprintf(p->out,"%d ",p->colWidth[i]);
+    }
+    fprintf(p->out,"\n");
+  }else
+
+  if( c=='t' && n>1 && strncmp(azArg[0], "tables", n)==0 ){
+    char **azResult;
+    int nRow, rc;
+    char *zErrMsg;
+    open_db(p);
+    if( nArg==1 ){
+      rc = sqlite3_get_table(p->db,
+        "SELECT name FROM sqlite_master "
+        "WHERE type IN ('table','view') AND name NOT LIKE 'sqlite_%'"
+        "UNION ALL "
+        "SELECT name FROM sqlite_temp_master "
+        "WHERE type IN ('table','view') "
+        "ORDER BY 1",
+        &azResult, &nRow, 0, &zErrMsg
+      );
+    }else{
+      zShellStatic = azArg[1];
+      rc = sqlite3_get_table(p->db,
+        "SELECT name FROM sqlite_master "
+        "WHERE type IN ('table','view') AND name LIKE '%'||shellstatic()||'%' "
+        "UNION ALL "
+        "SELECT name FROM sqlite_temp_master "
+        "WHERE type IN ('table','view') AND name LIKE '%'||shellstatic()||'%' "
+        "ORDER BY 1",
+        &azResult, &nRow, 0, &zErrMsg
+      );
+      zShellStatic = 0;
+    }
+    if( zErrMsg ){
+      fprintf(stderr,"Error: %s\n", zErrMsg);
+      sqlite3_free(zErrMsg);
+    }
+    if( rc==SQLITE_OK ){
+      int len, maxlen = 0;
+      int i, j;
+      int nPrintCol, nPrintRow;
+      for(i=1; i<=nRow; i++){
+        if( azResult[i]==0 ) continue;
+        len = strlen(azResult[i]);
+        if( len>maxlen ) maxlen = len;
+      }
+      nPrintCol = 80/(maxlen+2);
+      if( nPrintCol<1 ) nPrintCol = 1;
+      nPrintRow = (nRow + nPrintCol - 1)/nPrintCol;
+      for(i=0; i<nPrintRow; i++){
+        for(j=i+1; j<=nRow; j+=nPrintRow){
+          char *zSp = j<=nPrintRow ? "" : "  ";
+          printf("%s%-*s", zSp, maxlen, azResult[j] ? azResult[j] : "");
+        }
+        printf("\n");
+      }
+    }else{
+      rc = 1;
+    }
+    sqlite3_free_table(azResult);
+  }else
+
+  if( c=='t' && n>4 && strncmp(azArg[0], "timeout", n)==0 && nArg>=2 ){
+    open_db(p);
+    sqlite3_busy_timeout(p->db, atoi(azArg[1]));
+  }else
+
+#if HAS_TIMER
+  if( c=='t' && n>=5 && strncmp(azArg[0], "timer", n)==0 && nArg>1 ){
+    enableTimer = booleanValue(azArg[1]);
+  }else
+#endif
+
+  if( c=='w' && strncmp(azArg[0], "width", n)==0 ){
+    int j;
+    assert( nArg<=ArraySize(azArg) );
+    for(j=1; j<nArg && j<ArraySize(p->colWidth); j++){
+      p->colWidth[j-1] = atoi(azArg[j]);
+    }
+  }else
+
+
+  {
+    fprintf(stderr, "unknown command or invalid arguments: "
+      " \"%s\". Enter \".help\" for help\n", azArg[0]);
+  }
+
+  return rc;
+}
+
+/*
+** Return TRUE if a semicolon occurs anywhere in the first N characters
+** of string z[].
+*/
+static int _contains_semicolon(const char *z, int N){
+  int i;
+  for(i=0; i<N; i++){  if( z[i]==';' ) return 1; }
+  return 0;
+}
+
+/*
+** Test to see if a line consists entirely of whitespace.
+*/
+static int _all_whitespace(const char *z){
+  for(; *z; z++){
+    if( isspace(*(unsigned char*)z) ) continue;
+    if( *z=='/' && z[1]=='*' ){
+      z += 2;
+      while( *z && (*z!='*' || z[1]!='/') ){ z++; }
+      if( *z==0 ) return 0;
+      z++;
+      continue;
+    }
+    if( *z=='-' && z[1]=='-' ){
+      z += 2;
+      while( *z && *z!='\n' ){ z++; }
+      if( *z==0 ) return 1;
+      continue;
+    }
+    return 0;
+  }
+  return 1;
+}
+
+/*
+** Return TRUE if the line typed in is an SQL command terminator other
+** than a semi-colon.  The SQL Server style "go" command is understood
+** as is the Oracle "/".
+*/
+static int _is_command_terminator(const char *zLine){
+  while( isspace(*(unsigned char*)zLine) ){ zLine++; };
+  if( zLine[0]=='/' && _all_whitespace(&zLine[1]) ) return 1;  /* Oracle */
+  if( tolower(zLine[0])=='g' && tolower(zLine[1])=='o'
+         && _all_whitespace(&zLine[2]) ){
+    return 1;  /* SQL Server */
+  }
+  return 0;
+}
+
+/*
+** Read input from *in and process it.  If *in==0 then input
+** is interactive - the user is typing it it.  Otherwise, input
+** is coming from a file or device.  A prompt is issued and history
+** is saved only if input is interactive.  An interrupt signal will
+** cause this routine to exit immediately, unless input is interactive.
+**
+** Return the number of errors.
+*/
+static int process_input(struct callback_data *p, FILE *in){
+  char *zLine = 0;
+  char *zSql = 0;
+  int nSql = 0;
+  int nSqlPrior = 0;
+  char *zErrMsg;
+  int rc;
+  int errCnt = 0;
+  int lineno = 0;
+  int startline = 0;
+
+  while( errCnt==0 || !bail_on_error || (in==0 && stdin_is_interactive) ){
+    fflush(p->out);
+    free(zLine);
+    zLine = one_input_line(zSql, in);
+    if( zLine==0 ){
+      break;  /* We have reached EOF */
+    }
+    if( seenInterrupt ){
+      if( in!=0 ) break;
+      seenInterrupt = 0;
+    }
+    lineno++;
+    if( p->echoOn ) printf("%s\n", zLine);
+    if( (zSql==0 || zSql[0]==0) && _all_whitespace(zLine) ) continue;
+    if( zLine && zLine[0]=='.' && nSql==0 ){
+      rc = do_meta_command(zLine, p);
+      if( rc==2 ){
+        break;
+      }else if( rc ){
+        errCnt++;
+      }
+      continue;
+    }
+    if( _is_command_terminator(zLine) ){
+      memcpy(zLine,";",2);
+    }
+    nSqlPrior = nSql;
+    if( zSql==0 ){
+      int i;
+      for(i=0; zLine[i] && isspace((unsigned char)zLine[i]); i++){}
+      if( zLine[i]!=0 ){
+        nSql = strlen(zLine);
+        zSql = malloc( nSql+1 );
+        if( zSql==0 ){
+          fprintf(stderr, "out of memory\n");
+          exit(1);
+        }
+        memcpy(zSql, zLine, nSql+1);
+        startline = lineno;
+      }
+    }else{
+      int len = strlen(zLine);
+      zSql = realloc( zSql, nSql + len + 2 );
+      if( zSql==0 ){
+        fprintf(stderr,"%s: out of memory!\n", Argv0);
+        exit(1);
+      }
+      zSql[nSql++] = '\n';
+      memcpy(&zSql[nSql], zLine, len+1);
+      nSql += len;
+    }
+    if( zSql && _contains_semicolon(&zSql[nSqlPrior], nSql-nSqlPrior)
+                && sqlite3_complete(zSql) ){
+      p->cnt = 0;
+      open_db(p);
+      BEGIN_TIMER;
+      rc = sqlite3_exec(p->db, zSql, callback, p, &zErrMsg);
+      END_TIMER;
+      if( rc || zErrMsg ){
+        char zPrefix[100];
+        if( in!=0 || !stdin_is_interactive ){
+          sqlite3_snprintf(sizeof(zPrefix), zPrefix,
+                           "SQL error near line %d:", startline);
+        }else{
+          sqlite3_snprintf(sizeof(zPrefix), zPrefix, "SQL error:");
+        }
+        if( zErrMsg!=0 ){
+          printf("%s %s\n", zPrefix, zErrMsg);
+          sqlite3_free(zErrMsg);
+          zErrMsg = 0;
+        }else{
+          printf("%s %s\n", zPrefix, sqlite3_errmsg(p->db));
+        }
+        errCnt++;
+      }
+      free(zSql);
+      zSql = 0;
+      nSql = 0;
+    }
+  }
+  if( zSql ){
+    if( !_all_whitespace(zSql) ) printf("Incomplete SQL: %s\n", zSql);
+    free(zSql);
+  }
+  free(zLine);
+  return errCnt;
+}
+
+/*
+** Return a pathname which is the user's home directory.  A
+** 0 return indicates an error of some kind.  Space to hold the
+** resulting string is obtained from malloc().  The calling
+** function should free the result.
+*/
+static char *find_home_dir(void){
+  char *home_dir = NULL;
+
+#if !defined(_WIN32) && !defined(WIN32) && !defined(__OS2__) && !defined(_WIN32_WCE)
+  struct passwd *pwent;
+  uid_t uid = getuid();
+  if( (pwent=getpwuid(uid)) != NULL) {
+    home_dir = pwent->pw_dir;
+  }
+#endif
+
+#if defined(_WIN32_WCE)
+  /* Windows CE (arm-wince-mingw32ce-gcc) does not provide getenv()
+   */
+  home_dir = strdup("/");
+#else
+
+#if defined(_WIN32) || defined(WIN32) || defined(__OS2__)
+  if (!home_dir) {
+    home_dir = getenv("USERPROFILE");
+  }
+#endif
+
+  if (!home_dir) {
+    home_dir = getenv("HOME");
+  }
+
+#if defined(_WIN32) || defined(WIN32) || defined(__OS2__)
+  if (!home_dir) {
+    char *zDrive, *zPath;
+    int n;
+    zDrive = getenv("HOMEDRIVE");
+    zPath = getenv("HOMEPATH");
+    if( zDrive && zPath ){
+      n = strlen(zDrive) + strlen(zPath) + 1;
+      home_dir = malloc( n );
+      if( home_dir==0 ) return 0;
+      sqlite3_snprintf(n, home_dir, "%s%s", zDrive, zPath);
+      return home_dir;
+    }
+    home_dir = "c:\\";
+  }
+#endif
+
+#endif /* !_WIN32_WCE */
+
+  if( home_dir ){
+    int n = strlen(home_dir) + 1;
+    char *z = malloc( n );
+    if( z ) memcpy(z, home_dir, n);
+    home_dir = z;
+  }
+
+  return home_dir;
+}
+
+/*
+** Read input from the file given by sqliterc_override.  Or if that
+** parameter is NULL, take input from ~/.sqliterc
+*/
+static void process_sqliterc(
+  struct callback_data *p,        /* Configuration data */
+  const char *sqliterc_override   /* Name of config file. NULL to use default */
+){
+  char *home_dir = NULL;
+  const char *sqliterc = sqliterc_override;
+  char *zBuf = 0;
+  FILE *in = NULL;
+  int nBuf;
+
+  if (sqliterc == NULL) {
+    home_dir = find_home_dir();
+    if( home_dir==0 ){
+      fprintf(stderr,"%s: cannot locate your home directory!\n", Argv0);
+      return;
+    }
+    nBuf = strlen(home_dir) + 16;
+    zBuf = malloc( nBuf );
+    if( zBuf==0 ){
+      fprintf(stderr,"%s: out of memory!\n", Argv0);
+      exit(1);
+    }
+    sqlite3_snprintf(nBuf, zBuf,"%s/.sqliterc",home_dir);
+    free(home_dir);
+    sqliterc = (const char*)zBuf;
+  }
+  in = fopen(sqliterc,"rb");
+  if( in ){
+    if( stdin_is_interactive ){
+      printf("-- Loading resources from %s\n",sqliterc);
+    }
+    process_input(p,in);
+    fclose(in);
+  }
+  free(zBuf);
+  return;
+}
+
+/*
+** Show available command line options
+*/
+static const char zOptions[] =
+  "   -init filename       read/process named file\n"
+  "   -echo                print commands before execution\n"
+  "   -[no]header          turn headers on or off\n"
+  "   -bail                stop after hitting an error\n"
+  "   -interactive         force interactive I/O\n"
+  "   -batch               force batch I/O\n"
+  "   -column              set output mode to 'column'\n"
+  "   -csv                 set output mode to 'csv'\n"
+  "   -html                set output mode to HTML\n"
+  "   -line                set output mode to 'line'\n"
+  "   -list                set output mode to 'list'\n"
+  "   -separator 'x'       set output field separator (|)\n"
+  "   -nullvalue 'text'    set text string for NULL values\n"
+  "   -version             show SQLite version\n"
+;
+static void usage(int showDetail){
+  fprintf(stderr,
+      "Usage: %s [OPTIONS] FILENAME [SQL]\n"
+      "FILENAME is the name of an SQLite database. A new database is created\n"
+      "if the file does not previously exist.\n", Argv0);
+  if( showDetail ){
+    fprintf(stderr, "OPTIONS include:\n%s", zOptions);
+  }else{
+    fprintf(stderr, "Use the -help option for additional information\n");
+  }
+  exit(1);
+}
+
+/*
+** Initialize the state information in data
+*/
+static void main_init(struct callback_data *data) {
+  memset(data, 0, sizeof(*data));
+  data->mode = MODE_List;
+  memcpy(data->separator,"|", 2);
+  data->showHeader = 0;
+  sqlite3_snprintf(sizeof(mainPrompt), mainPrompt,"sqlite> ");
+  sqlite3_snprintf(sizeof(continuePrompt), continuePrompt,"   ...> ");
+}
+
+int main(int argc, char **argv){
+  char *zErrMsg = 0;
+  struct callback_data data;
+  const char *zInitFile = 0;
+  char *zFirstCmd = 0;
+  int i;
+  int rc = 0;
+
+  Argv0 = argv[0];
+  main_init(&data);
+  stdin_is_interactive = isatty(0);
+
+  /* Make sure we have a valid signal handler early, before anything
+  ** else is done.
+  */
+#ifdef SIGINT
+  signal(SIGINT, interrupt_handler);
+#endif
+
+  /* Do an initial pass through the command-line argument to locate
+  ** the name of the database file, the name of the initialization file,
+  ** and the first command to execute.
+  */
+  for(i=1; i<argc-1; i++){
+    char *z;
+    if( argv[i][0]!='-' ) break;
+    z = argv[i];
+    if( z[0]=='-' && z[1]=='-' ) z++;
+    if( strcmp(argv[i],"-separator")==0 || strcmp(argv[i],"-nullvalue")==0 ){
+      i++;
+    }else if( strcmp(argv[i],"-init")==0 ){
+      i++;
+      zInitFile = argv[i];
+    }
+  }
+  if( i<argc ){
+    data.zDbFilename = argv[i++];
+  }else{
+#ifndef SQLITE_OMIT_MEMORYDB
+    data.zDbFilename = ":memory:";
+#else
+    data.zDbFilename = 0;
+#endif
+  }
+  if( i<argc ){
+    zFirstCmd = argv[i++];
+  }
+  data.out = stdout;
+
+#ifdef SQLITE_OMIT_MEMORYDB
+  if( data.zDbFilename==0 ){
+    fprintf(stderr,"%s: no database filename specified\n", argv[0]);
+    exit(1);
+  }
+#endif
+
+  /* Go ahead and open the database file if it already exists.  If the
+  ** file does not exist, delay opening it.  This prevents empty database
+  ** files from being created if a user mistypes the database name argument
+  ** to the sqlite command-line tool.
+  */
+  if( access(data.zDbFilename, 0)==0 ){
+    open_db(&data);
+  }
+
+  /* Process the initialization file if there is one.  If no -init option
+  ** is given on the command line, look for a file named ~/.sqliterc and
+  ** try to process it.
+  */
+  process_sqliterc(&data,zInitFile);
+
+  /* Make a second pass through the command-line argument and set
+  ** options.  This second pass is delayed until after the initialization
+  ** file is processed so that the command-line arguments will override
+  ** settings in the initialization file.
+  */
+  for(i=1; i<argc && argv[i][0]=='-'; i++){
+    char *z = argv[i];
+    if( z[1]=='-' ){ z++; }
+    if( strcmp(z,"-init")==0 ){
+      i++;
+    }else if( strcmp(z,"-html")==0 ){
+      data.mode = MODE_Html;
+    }else if( strcmp(z,"-list")==0 ){
+      data.mode = MODE_List;
+    }else if( strcmp(z,"-line")==0 ){
+      data.mode = MODE_Line;
+    }else if( strcmp(z,"-column")==0 ){
+      data.mode = MODE_Column;
+    }else if( strcmp(z,"-csv")==0 ){
+      data.mode = MODE_Csv;
+      memcpy(data.separator,",",2);
+    }else if( strcmp(z,"-separator")==0 ){
+      i++;
+      sqlite3_snprintf(sizeof(data.separator), data.separator,
+                       "%.*s",(int)sizeof(data.separator)-1,argv[i]);
+    }else if( strcmp(z,"-nullvalue")==0 ){
+      i++;
+      sqlite3_snprintf(sizeof(data.nullvalue), data.nullvalue,
+                       "%.*s",(int)sizeof(data.nullvalue)-1,argv[i]);
+    }else if( strcmp(z,"-header")==0 ){
+      data.showHeader = 1;
+    }else if( strcmp(z,"-noheader")==0 ){
+      data.showHeader = 0;
+    }else if( strcmp(z,"-echo")==0 ){
+      data.echoOn = 1;
+    }else if( strcmp(z,"-bail")==0 ){
+      bail_on_error = 1;
+    }else if( strcmp(z,"-version")==0 ){
+      printf("%s\n", sqlite3_libversion());
+      return 0;
+    }else if( strcmp(z,"-interactive")==0 ){
+      stdin_is_interactive = 1;
+    }else if( strcmp(z,"-batch")==0 ){
+      stdin_is_interactive = 0;
+    }else if( strcmp(z,"-help")==0 || strcmp(z, "--help")==0 ){
+      usage(1);
+    }else{
+      fprintf(stderr,"%s: unknown option: %s\n", Argv0, z);
+      fprintf(stderr,"Use -help for a list of options.\n");
+      return 1;
+    }
+  }
+
+  if( zFirstCmd ){
+    /* Run just the command that follows the database name
+    */
+    if( zFirstCmd[0]=='.' ){
+      do_meta_command(zFirstCmd, &data);
+      exit(0);
+    }else{
+      int rc;
+      open_db(&data);
+      rc = sqlite3_exec(data.db, zFirstCmd, callback, &data, &zErrMsg);
+      if( rc!=0 && zErrMsg!=0 ){
+        fprintf(stderr,"SQL error: %s\n", zErrMsg);
+        exit(1);
+      }
+    }
+  }else{
+    /* Run commands received from standard input
+    */
+    if( stdin_is_interactive ){
+      char *zHome;
+      char *zHistory = 0;
+      int nHistory;
+      printf(
+        "SQLite version %s\n"
+        "Enter \".help\" for instructions\n",
+        sqlite3_libversion()
+      );
+      zHome = find_home_dir();
+      if( zHome && (zHistory = malloc(nHistory = strlen(zHome)+20))!=0 ){
+        sqlite3_snprintf(nHistory, zHistory,"%s/.sqlite_history", zHome);
+      }
+#if defined(HAVE_READLINE) && HAVE_READLINE==1
+      if( zHistory ) read_history(zHistory);
+#endif
+      rc = process_input(&data, 0);
+      if( zHistory ){
+        stifle_history(100);
+        write_history(zHistory);
+        free(zHistory);
+      }
+      free(zHome);
+    }else{
+      rc = process_input(&data, stdin);
+    }
+  }
+  set_table_name(&data, 0);
+  if( db ){
+    if( sqlite3_close(db)!=SQLITE_OK ){
+      fprintf(stderr,"error closing database: %s\n", sqlite3_errmsg(db));
+    }
+  }
+  return rc;
+}
diff --git a/uppsrc/plugin/sqlite3/lib/sqlite3.h b/uppsrc/plugin/sqlite3/lib/sqlite3.h
new file mode 100644
index 000000000..aaf913b38
--- /dev/null
+++ b/uppsrc/plugin/sqlite3/lib/sqlite3.h
@@ -0,0 +1,5413 @@
+/*
+** 2001 September 15
+**
+** The author disclaims copyright to this source code.  In place of
+** a legal notice, here is a blessing:
+**
+**    May you do good and not evil.
+**    May you find forgiveness for yourself and forgive others.
+**    May you share freely, never taking more than you give.
+**
+*************************************************************************
+** This header file defines the interface that the SQLite library
+** presents to client programs.  If a C-function, structure, datatype,
+** or constant definition does not appear in this file, then it is
+** not a published API of SQLite, is subject to change without
+** notice, and should not be referenced by programs that use SQLite.
+**
+** Some of the definitions that are in this file are marked as
+** "experimental".  Experimental interfaces are normally new
+** features recently added to SQLite.  We do not anticipate changes
+** to experimental interfaces but reserve to make minor changes if
+** experience from use "in the wild" suggest such changes are prudent.
+**
+** The official C-language API documentation for SQLite is derived
+** from comments in this file.  This file is the authoritative source
+** on how SQLite interfaces are suppose to operate.
+**
+** The name of this file under configuration management is "sqlite.h.in".
+** The makefile makes some minor changes to this file (such as inserting
+** the version number) and changes its name to "sqlite3.h" as
+** part of the build process.
+**
+** @(#) $Id: sqlite.h.in,v 1.291 2008/03/08 12:37:31 drh Exp $
+*/
+#ifndef _SQLITE3_H_
+#define _SQLITE3_H_
+#include <stdarg.h>     /* Needed for the definition of va_list */
+
+/*
+** Make sure we can call this stuff from C++.
+*/
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/*
+** Add the ability to override 'extern'
+*/
+#ifndef SQLITE_EXTERN
+# define SQLITE_EXTERN extern
+#endif
+
+/*
+** Make sure these symbols where not defined by some previous header
+** file.
+*/
+#ifdef SQLITE_VERSION
+# undef SQLITE_VERSION
+#endif
+#ifdef SQLITE_VERSION_NUMBER
+# undef SQLITE_VERSION_NUMBER
+#endif
+
+/*
+** CAPI3REF: Compile-Time Library Version Numbers {F10010}
+**
+** The SQLITE_VERSION and SQLITE_VERSION_NUMBER #defines in
+** the sqlite3.h file specify the version of SQLite with which
+** that header file is associated.
+**
+** The "version" of SQLite is a string of the form "X.Y.Z".
+** The phrase "alpha" or "beta" might be appended after the Z.
+** The X value is major version number always 3 in SQLite3.
+** The X value only changes when  backwards compatibility is
+** broken and we intend to never break
+** backwards compatibility.  The Y value is the minor version
+** number and only changes when
+** there are major feature enhancements that are forwards compatible
+** but not backwards compatible.  The Z value is release number
+** and is incremented with
+** each release but resets back to 0 when Y is incremented.
+**
+** See also: [sqlite3_libversion()] and [sqlite3_libversion_number()].
+**
+** INVARIANTS:
+**
+** {F10011} The SQLITE_VERSION #define in the sqlite3.h header file
+**          evaluates to a string literal that is the SQLite version
+**          with which the header file is associated.
+**
+** {F10014} The SQLITE_VERSION_NUMBER #define resolves to an integer
+**          with the value  (X*1000000 + Y*1000 + Z) where X, Y, and
+**          Z are the major version, minor version, and release number.
+*/
+#define SQLITE_VERSION         "3.5.7"
+#define SQLITE_VERSION_NUMBER  3005007
+
+/*
+** CAPI3REF: Run-Time Library Version Numbers {F10020}
+** KEYWORDS: sqlite3_version
+**
+** These features provide the same information as the [SQLITE_VERSION]
+** and [SQLITE_VERSION_NUMBER] #defines in the header, but are associated
+** with the library instead of the header file.  Cautious programmers might
+** include a check in their application to verify that
+** sqlite3_libversion_number() always returns the value
+** [SQLITE_VERSION_NUMBER].
+**
+** The sqlite3_libversion() function returns the same information as is
+** in the sqlite3_version[] string constant.  The function is provided
+** for use in DLLs since DLL users usually do not have direct access to string
+** constants within the DLL.
+**
+** INVARIANTS:
+**
+** {F10021} The [sqlite3_libversion_number()] interface returns an integer
+**          equal to [SQLITE_VERSION_NUMBER].
+**
+** {F10022} The [sqlite3_version] string constant contains the text of the
+**          [SQLITE_VERSION] string.
+**
+** {F10023} The [sqlite3_libversion()] function returns
+**          a pointer to the [sqlite3_version] string constant.
+*/
+SQLITE_EXTERN const char sqlite3_version[];
+const char *sqlite3_libversion(void);
+int sqlite3_libversion_number(void);
+
+/*
+** CAPI3REF: Test To See If The Library Is Threadsafe {F10100}
+**
+** SQLite can be compiled with or without mutexes.  When
+** the SQLITE_THREADSAFE C preprocessor macro is true, mutexes
+** are enabled and SQLite is threadsafe.  When that macro is false,
+** the mutexes are omitted.  Without the mutexes, it is not safe
+** to use SQLite from more than one thread.
+**
+** There is a measurable performance penalty for enabling mutexes.
+** So if speed is of utmost importance, it makes sense to disable
+** the mutexes.  But for maximum safety, mutexes should be enabled.
+** The default behavior is for mutexes to be enabled.
+**
+** This interface can be used by a program to make sure that the
+** version of SQLite that it is linking against was compiled with
+** the desired setting of the SQLITE_THREADSAFE macro.
+**
+** INVARIANTS:
+**
+** {F10101} The [sqlite3_threadsafe()] function returns nonzero if
+**          SQLite was compiled with its mutexes enabled or zero
+**          if SQLite was compiled with mutexes disabled.
+*/
+int sqlite3_threadsafe(void);
+
+/*
+** CAPI3REF: Database Connection Handle {F12000}
+** KEYWORDS: {database connection}
+**
+** Each open SQLite database is represented by pointer to an instance of the
+** opaque structure named "sqlite3".  It is useful to think of an sqlite3
+** pointer as an object.  The [sqlite3_open()], [sqlite3_open16()], and
+** [sqlite3_open_v2()] interfaces are its constructors
+** and [sqlite3_close()] is its destructor.  There are many other interfaces
+** (such as [sqlite3_prepare_v2()], [sqlite3_create_function()], and
+** [sqlite3_busy_timeout()] to name but three) that are methods on this
+** object.
+*/
+typedef struct sqlite3 sqlite3;
+
+
+/*
+** CAPI3REF: 64-Bit Integer Types {F10200}
+** KEYWORDS: sqlite_int64 sqlite_uint64
+**
+** Because there is no cross-platform way to specify 64-bit integer types
+** SQLite includes typedefs for 64-bit signed and unsigned integers.
+**
+** The sqlite3_int64 and sqlite3_uint64 are the preferred type
+** definitions.  The sqlite_int64 and sqlite_uint64 types are
+** supported for backwards compatibility only.
+**
+** INVARIANTS:
+**
+** {F10201} The [sqlite_int64] and [sqlite3_int64] types specify a
+**          64-bit signed integer.
+**
+** {F10202} The [sqlite_uint64] and [sqlite3_uint64] types specify
+**          a 64-bit unsigned integer.
+*/
+#ifdef SQLITE_INT64_TYPE
+  typedef SQLITE_INT64_TYPE sqlite_int64;
+  typedef unsigned SQLITE_INT64_TYPE sqlite_uint64;
+#elif defined(_MSC_VER) || defined(__BORLANDC__)
+  typedef __int64 sqlite_int64;
+  typedef unsigned __int64 sqlite_uint64;
+#else
+  typedef long long int sqlite_int64;
+  typedef unsigned long long int sqlite_uint64;
+#endif
+typedef sqlite_int64 sqlite3_int64;
+typedef sqlite_uint64 sqlite3_uint64;
+
+/*
+** If compiling for a processor that lacks floating point support,
+** substitute integer for floating-point
+*/
+#ifdef SQLITE_OMIT_FLOATING_POINT
+# define double sqlite3_int64
+#endif
+
+/*
+** CAPI3REF: Closing A Database Connection {F12010}
+**
+** This routine is the destructor for the [sqlite3] object.
+**
+** Applications should [sqlite3_finalize | finalize] all
+** [prepared statements] and
+** [sqlite3_blob_close | close] all [sqlite3_blob | BLOBs]
+** associated with the [sqlite3] object prior
+** to attempting to close the [sqlite3] object.
+**
+** <todo>What happens to pending transactions?  Are they
+** rolled back, or abandoned?</todo>
+**
+** INVARIANTS:
+**
+** {F12011} The [sqlite3_close()] interface destroys an [sqlite3] object
+**          allocated by a prior call to [sqlite3_open()],
+**          [sqlite3_open16()], or [sqlite3_open_v2()].
+**
+** {F12012} The [sqlite3_close()] function releases all memory used by the
+**          connection and closes all open files.
+**
+** {F12013} If the database connection contains
+**          [prepared statements] that have not been
+**          finalized by [sqlite3_finalize()], then [sqlite3_close()]
+**          returns [SQLITE_BUSY] and leaves the connection open.
+**
+** {F12014} Giving sqlite3_close() a NULL pointer is a harmless no-op.
+**
+** LIMITATIONS:
+**
+** {U12015} The parameter to [sqlite3_close()] must be an [sqlite3] object
+**          pointer previously obtained from [sqlite3_open()] or the
+**          equivalent, or NULL.
+**
+** {U12016} The parameter to [sqlite3_close()] must not have been previously
+**          closed.
+*/
+int sqlite3_close(sqlite3 *);
+
+/*
+** The type for a callback function.
+** This is legacy and deprecated.  It is included for historical
+** compatibility and is not documented.
+*/
+typedef int (*sqlite3_callback)(void*,int,char**, char**);
+
+/*
+** CAPI3REF: One-Step Query Execution Interface {F12100}
+**
+** The sqlite3_exec() interface is a convenient way of running
+** one or more SQL statements without a lot of C code.  The
+** SQL statements are passed in as the second parameter to
+** sqlite3_exec().  The statements are evaluated one by one
+** until either an error or an interrupt is encountered or
+** until they are all done.  The 3rd parameter is an optional
+** callback that is invoked once for each row of any query results
+** produced by the SQL statements.  The 5th parameter tells where
+** to write any error messages.
+**
+** The sqlite3_exec() interface is implemented in terms of
+** [sqlite3_prepare_v2()], [sqlite3_step()], and [sqlite3_finalize()].
+** The sqlite3_exec() routine does nothing that cannot be done
+** by [sqlite3_prepare_v2()], [sqlite3_step()], and [sqlite3_finalize()].
+** The sqlite3_exec() is just a convenient wrapper.
+**
+** INVARIANTS:
+**
+** {F12101} The [sqlite3_exec()] interface evaluates zero or more UTF-8
+**          encoded, semicolon-separated, SQL statements in the
+**          zero-terminated string of its 2nd parameter within the
+**          context of the [sqlite3] object given in the 1st parameter.
+**
+** {F12104} The return value of [sqlite3_exec()] is SQLITE_OK if all
+**          SQL statements run successfully.
+**
+** {F12105} The return value of [sqlite3_exec()] is an appropriate
+**          non-zero error code if any SQL statement fails.
+**
+** {F12107} If one or more of the SQL statements handed to [sqlite3_exec()]
+**          return results and the 3rd parameter is not NULL, then
+**          the callback function specified by the 3rd parameter is
+**          invoked once for each row of result.
+**
+** {F12110} If the callback returns a non-zero value then [sqlite3_exec()]
+**          will aborted the SQL statement it is currently evaluating,
+**          skip all subsequent SQL statements, and return [SQLITE_ABORT].
+**          <todo>What happens to *errmsg here?  Does the result code for
+**          sqlite3_errcode() get set?</todo>
+**
+** {F12113} The [sqlite3_exec()] routine will pass its 4th parameter through
+**          as the 1st parameter of the callback.
+**
+** {F12116} The [sqlite3_exec()] routine sets the 2nd parameter of its
+**          callback to be the number of columns in the current row of
+**          result.
+**
+** {F12119} The [sqlite3_exec()] routine sets the 3rd parameter of its
+**          callback to be an array of pointers to strings holding the
+**          values for each column in the current result set row as
+**          obtained from [sqlite3_column_text()].
+**
+** {F12122} The [sqlite3_exec()] routine sets the 4th parameter of its
+**          callback to be an array of pointers to strings holding the
+**          names of result columns as obtained from [sqlite3_column_name()].
+**
+** {F12125} If the 3rd parameter to [sqlite3_exec()] is NULL then
+**          [sqlite3_exec()] never invokes a callback.  All query
+**          results are silently discarded.
+**
+** {F12128} If an error occurs while parsing or evaluating any of the SQL
+**          statements handed to [sqlite3_exec()] then [sqlite3_exec()] will
+**          return an [error code] other than [SQLITE_OK].
+**
+** {F12131} If an error occurs while parsing or evaluating any of the SQL
+**          handed to [sqlite3_exec()] and if the 5th parameter (errmsg)
+**          to [sqlite3_exec()] is not NULL, then an error message is
+**          allocated using the equivalent of [sqlite3_mprintf()] and
+**          *errmsg is made to point to that message.
+**
+** {F12134} The [sqlite3_exec()] routine does not change the value of
+**          *errmsg if errmsg is NULL or if there are no errors.
+**
+** {F12137} The [sqlite3_exec()] function sets the error code and message
+**          accessible via [sqlite3_errcode()], [sqlite3_errmsg()], and
+**          [sqlite3_errmsg16()].
+**
+** LIMITATIONS:
+**
+** {U12141} The first parameter to [sqlite3_exec()] must be an valid and open
+**          [database connection].
+**
+** {U12142} The database connection must not be closed while
+**          [sqlite3_exec()] is running.
+**
+** {U12143} The calling function is should use [sqlite3_free()] to free
+**          the memory that *errmsg is left pointing at once the error
+**          message is no longer needed.
+**
+** {U12145} The SQL statement text in the 2nd parameter to [sqlite3_exec()]
+**          must remain unchanged while [sqlite3_exec()] is running.
+*/
+int sqlite3_exec(
+  sqlite3*,                                  /* An open database */
+  const char *sql,                           /* SQL to be evaluted */
+  int (*callback)(void*,int,char**,char**),  /* Callback function */
+  void *,                                    /* 1st argument to callback */
+  char **errmsg                              /* Error msg written here */
+);
+
+/*
+** CAPI3REF: Result Codes {F10210}
+** KEYWORDS: SQLITE_OK {error code} {error codes}
+**
+** Many SQLite functions return an integer result code from the set shown
+** here in order to indicates success or failure.
+**
+** See also: [SQLITE_IOERR_READ | extended result codes]
+*/
+#define SQLITE_OK           0   /* Successful result */
+/* beginning-of-error-codes */
+#define SQLITE_ERROR        1   /* SQL error or missing database */
+#define SQLITE_INTERNAL     2   /* Internal logic error in SQLite */
+#define SQLITE_PERM         3   /* Access permission denied */
+#define SQLITE_ABORT        4   /* Callback routine requested an abort */
+#define SQLITE_BUSY         5   /* The database file is locked */
+#define SQLITE_LOCKED       6   /* A table in the database is locked */
+#define SQLITE_NOMEM        7   /* A malloc() failed */
+#define SQLITE_READONLY     8   /* Attempt to write a readonly database */
+#define SQLITE_INTERRUPT    9   /* Operation terminated by sqlite3_interrupt()*/
+#define SQLITE_IOERR       10   /* Some kind of disk I/O error occurred */
+#define SQLITE_CORRUPT     11   /* The database disk image is malformed */
+#define SQLITE_NOTFOUND    12   /* NOT USED. Table or record not found */
+#define SQLITE_FULL        13   /* Insertion failed because database is full */
+#define SQLITE_CANTOPEN    14   /* Unable to open the database file */
+#define SQLITE_PROTOCOL    15   /* NOT USED. Database lock protocol error */
+#define SQLITE_EMPTY       16   /* Database is empty */
+#define SQLITE_SCHEMA      17   /* The database schema changed */
+#define SQLITE_TOOBIG      18   /* String or BLOB exceeds size limit */
+#define SQLITE_CONSTRAINT  19   /* Abort due to constraint violation */
+#define SQLITE_MISMATCH    20   /* Data type mismatch */
+#define SQLITE_MISUSE      21   /* Library used incorrectly */
+#define SQLITE_NOLFS       22   /* Uses OS features not supported on host */
+#define SQLITE_AUTH        23   /* Authorization denied */
+#define SQLITE_FORMAT      24   /* Auxiliary database format error */
+#define SQLITE_RANGE       25   /* 2nd parameter to sqlite3_bind out of range */
+#define SQLITE_NOTADB      26   /* File opened that is not a database file */
+#define SQLITE_ROW         100  /* sqlite3_step() has another row ready */
+#define SQLITE_DONE        101  /* sqlite3_step() has finished executing */
+/* end-of-error-codes */
+
+/*
+** CAPI3REF: Extended Result Codes {F10220}
+** KEYWORDS: {extended error code} {extended error codes}
+** KEYWORDS: {extended result codes}
+**
+** In its default configuration, SQLite API routines return one of 26 integer
+** [SQLITE_OK | result codes].  However, experience has shown that
+** many of these result codes are too course-grained.  They do not provide as
+** much information about problems as programmers might like.  In an effort to
+** address this, newer versions of SQLite (version 3.3.8 and later) include
+** support for additional result codes that provide more detailed information
+** about errors. The extended result codes are enabled or disabled
+** for each database connection using the [sqlite3_extended_result_codes()]
+** API.
+**
+** Some of the available extended result codes are listed here.
+** One may expect the number of extended result codes will be expand
+** over time.  Software that uses extended result codes should expect
+** to see new result codes in future releases of SQLite.
+**
+** The SQLITE_OK result code will never be extended.  It will always
+** be exactly zero.
+**
+** INVARIANTS:
+**
+** {F10223} The symbolic name for an extended result code always contains
+**          a related primary result code as a prefix.
+**
+** {F10224} Primary result code names contain a single "_" character.
+**
+** {F10225} Extended result code names contain two or more "_" characters.
+**
+** {F10226} The numeric value of an extended result code contains the
+**          numeric value of its corresponding primary result code in
+**          its least significant 8 bits.
+*/
+#define SQLITE_IOERR_READ          (SQLITE_IOERR | (1<<8))
+#define SQLITE_IOERR_SHORT_READ    (SQLITE_IOERR | (2<<8))
+#define SQLITE_IOERR_WRITE         (SQLITE_IOERR | (3<<8))
+#define SQLITE_IOERR_FSYNC         (SQLITE_IOERR | (4<<8))
+#define SQLITE_IOERR_DIR_FSYNC     (SQLITE_IOERR | (5<<8))
+#define SQLITE_IOERR_TRUNCATE      (SQLITE_IOERR | (6<<8))
+#define SQLITE_IOERR_FSTAT         (SQLITE_IOERR | (7<<8))
+#define SQLITE_IOERR_UNLOCK        (SQLITE_IOERR | (8<<8))
+#define SQLITE_IOERR_RDLOCK        (SQLITE_IOERR | (9<<8))
+#define SQLITE_IOERR_DELETE        (SQLITE_IOERR | (10<<8))
+#define SQLITE_IOERR_BLOCKED       (SQLITE_IOERR | (11<<8))
+#define SQLITE_IOERR_NOMEM         (SQLITE_IOERR | (12<<8))
+
+/*
+** CAPI3REF: Flags For File Open Operations {F10230}
+**
+** These bit values are intended for use in the
+** 3rd parameter to the [sqlite3_open_v2()] interface and
+** in the 4th parameter to the xOpen method of the
+** [sqlite3_vfs] object.
+*/
+#define SQLITE_OPEN_READONLY         0x00000001
+#define SQLITE_OPEN_READWRITE        0x00000002
+#define SQLITE_OPEN_CREATE           0x00000004
+#define SQLITE_OPEN_DELETEONCLOSE    0x00000008
+#define SQLITE_OPEN_EXCLUSIVE        0x00000010
+#define SQLITE_OPEN_MAIN_DB          0x00000100
+#define SQLITE_OPEN_TEMP_DB          0x00000200
+#define SQLITE_OPEN_TRANSIENT_DB     0x00000400
+#define SQLITE_OPEN_MAIN_JOURNAL     0x00000800
+#define SQLITE_OPEN_TEMP_JOURNAL     0x00001000
+#define SQLITE_OPEN_SUBJOURNAL       0x00002000
+#define SQLITE_OPEN_MASTER_JOURNAL   0x00004000
+
+/*
+** CAPI3REF: Device Characteristics {F10240}
+**
+** The xDeviceCapabilities method of the [sqlite3_io_methods]
+** object returns an integer which is a vector of the these
+** bit values expressing I/O characteristics of the mass storage
+** device that holds the file that the [sqlite3_io_methods]
+** refers to.
+**
+** The SQLITE_IOCAP_ATOMIC property means that all writes of
+** any size are atomic.  The SQLITE_IOCAP_ATOMICnnn values
+** mean that writes of blocks that are nnn bytes in size and
+** are aligned to an address which is an integer multiple of
+** nnn are atomic.  The SQLITE_IOCAP_SAFE_APPEND value means
+** that when data is appended to a file, the data is appended
+** first then the size of the file is extended, never the other
+** way around.  The SQLITE_IOCAP_SEQUENTIAL property means that
+** information is written to disk in the same order as calls
+** to xWrite().
+*/
+#define SQLITE_IOCAP_ATOMIC          0x00000001
+#define SQLITE_IOCAP_ATOMIC512       0x00000002
+#define SQLITE_IOCAP_ATOMIC1K        0x00000004
+#define SQLITE_IOCAP_ATOMIC2K        0x00000008
+#define SQLITE_IOCAP_ATOMIC4K        0x00000010
+#define SQLITE_IOCAP_ATOMIC8K        0x00000020
+#define SQLITE_IOCAP_ATOMIC16K       0x00000040
+#define SQLITE_IOCAP_ATOMIC32K       0x00000080
+#define SQLITE_IOCAP_ATOMIC64K       0x00000100
+#define SQLITE_IOCAP_SAFE_APPEND     0x00000200
+#define SQLITE_IOCAP_SEQUENTIAL      0x00000400
+
+/*
+** CAPI3REF: File Locking Levels {F10250}
+**
+** SQLite uses one of these integer values as the second
+** argument to calls it makes to the xLock() and xUnlock() methods
+** of an [sqlite3_io_methods] object.
+*/
+#define SQLITE_LOCK_NONE          0
+#define SQLITE_LOCK_SHARED        1
+#define SQLITE_LOCK_RESERVED      2
+#define SQLITE_LOCK_PENDING       3
+#define SQLITE_LOCK_EXCLUSIVE     4
+
+/*
+** CAPI3REF: Synchronization Type Flags {F10260}
+**
+** When SQLite invokes the xSync() method of an
+** [sqlite3_io_methods] object it uses a combination of
+** these integer values as the second argument.
+**
+** When the SQLITE_SYNC_DATAONLY flag is used, it means that the
+** sync operation only needs to flush data to mass storage.  Inode
+** information need not be flushed. The SQLITE_SYNC_NORMAL flag means
+** to use normal fsync() semantics. The SQLITE_SYNC_FULL flag means
+** to use Mac OS-X style fullsync instead of fsync().
+*/
+#define SQLITE_SYNC_NORMAL        0x00002
+#define SQLITE_SYNC_FULL          0x00003
+#define SQLITE_SYNC_DATAONLY      0x00010
+
+
+/*
+** CAPI3REF: OS Interface Open File Handle {F11110}
+**
+** An [sqlite3_file] object represents an open file in the OS
+** interface layer.  Individual OS interface implementations will
+** want to subclass this object by appending additional fields
+** for their own use.  The pMethods entry is a pointer to an
+** [sqlite3_io_methods] object that defines methods for performing
+** I/O operations on the open file.
+*/
+typedef struct sqlite3_file sqlite3_file;
+struct sqlite3_file {
+  const struct sqlite3_io_methods *pMethods;  /* Methods for an open file */
+};
+
+/*
+** CAPI3REF: OS Interface File Virtual Methods Object {F11120}
+**
+** Every file opened by the [sqlite3_vfs] xOpen method contains a pointer to
+** an instance of this object.  This object defines the
+** methods used to perform various operations against the open file.
+**
+** The flags argument to xSync may be one of [SQLITE_SYNC_NORMAL] or
+** [SQLITE_SYNC_FULL].  The first choice is the normal fsync().
+*  The second choice is an
+** OS-X style fullsync.  The SQLITE_SYNC_DATA flag may be ORed in to
+** indicate that only the data of the file and not its inode needs to be
+** synced.
+**
+** The integer values to xLock() and xUnlock() are one of
+** <ul>
+** <li> [SQLITE_LOCK_NONE],
+** <li> [SQLITE_LOCK_SHARED],
+** <li> [SQLITE_LOCK_RESERVED],
+** <li> [SQLITE_LOCK_PENDING], or
+** <li> [SQLITE_LOCK_EXCLUSIVE].
+** </ul>
+** xLock() increases the lock. xUnlock() decreases the lock.
+** The xCheckReservedLock() method looks
+** to see if any database connection, either in this
+** process or in some other process, is holding an RESERVED,
+** PENDING, or EXCLUSIVE lock on the file.  It returns true
+** if such a lock exists and false if not.
+**
+** The xFileControl() method is a generic interface that allows custom
+** VFS implementations to directly control an open file using the
+** [sqlite3_file_control()] interface.  The second "op" argument
+** is an integer opcode.   The third
+** argument is a generic pointer which is intended to be a pointer
+** to a structure that may contain arguments or space in which to
+** write return values.  Potential uses for xFileControl() might be
+** functions to enable blocking locks with timeouts, to change the
+** locking strategy (for example to use dot-file locks), to inquire
+** about the status of a lock, or to break stale locks.  The SQLite
+** core reserves opcodes less than 100 for its own use.
+** A [SQLITE_FCNTL_LOCKSTATE | list of opcodes] less than 100 is available.
+** Applications that define a custom xFileControl method should use opcodes
+** greater than 100 to avoid conflicts.
+**
+** The xSectorSize() method returns the sector size of the
+** device that underlies the file.  The sector size is the
+** minimum write that can be performed without disturbing
+** other bytes in the file.  The xDeviceCharacteristics()
+** method returns a bit vector describing behaviors of the
+** underlying device:
+**
+** <ul>
+** <li> [SQLITE_IOCAP_ATOMIC]
+** <li> [SQLITE_IOCAP_ATOMIC512]
+** <li> [SQLITE_IOCAP_ATOMIC1K]
+** <li> [SQLITE_IOCAP_ATOMIC2K]
+** <li> [SQLITE_IOCAP_ATOMIC4K]
+** <li> [SQLITE_IOCAP_ATOMIC8K]
+** <li> [SQLITE_IOCAP_ATOMIC16K]
+** <li> [SQLITE_IOCAP_ATOMIC32K]
+** <li> [SQLITE_IOCAP_ATOMIC64K]
+** <li> [SQLITE_IOCAP_SAFE_APPEND]
+** <li> [SQLITE_IOCAP_SEQUENTIAL]
+** </ul>
+**
+** The SQLITE_IOCAP_ATOMIC property means that all writes of
+** any size are atomic.  The SQLITE_IOCAP_ATOMICnnn values
+** mean that writes of blocks that are nnn bytes in size and
+** are aligned to an address which is an integer multiple of
+** nnn are atomic.  The SQLITE_IOCAP_SAFE_APPEND value means
+** that when data is appended to a file, the data is appended
+** first then the size of the file is extended, never the other
+** way around.  The SQLITE_IOCAP_SEQUENTIAL property means that
+** information is written to disk in the same order as calls
+** to xWrite().
+*/
+typedef struct sqlite3_io_methods sqlite3_io_methods;
+struct sqlite3_io_methods {
+  int iVersion;
+  int (*xClose)(sqlite3_file*);
+  int (*xRead)(sqlite3_file*, void*, int iAmt, sqlite3_int64 iOfst);
+  int (*xWrite)(sqlite3_file*, const void*, int iAmt, sqlite3_int64 iOfst);
+  int (*xTruncate)(sqlite3_file*, sqlite3_int64 size);
+  int (*xSync)(sqlite3_file*, int flags);
+  int (*xFileSize)(sqlite3_file*, sqlite3_int64 *pSize);
+  int (*xLock)(sqlite3_file*, int);
+  int (*xUnlock)(sqlite3_file*, int);
+  int (*xCheckReservedLock)(sqlite3_file*);
+  int (*xFileControl)(sqlite3_file*, int op, void *pArg);
+  int (*xSectorSize)(sqlite3_file*);
+  int (*xDeviceCharacteristics)(sqlite3_file*);
+  /* Additional methods may be added in future releases */
+};
+
+/*
+** CAPI3REF: Standard File Control Opcodes {F11310}
+**
+** These integer constants are opcodes for the xFileControl method
+** of the [sqlite3_io_methods] object and to the [sqlite3_file_control()]
+** interface.
+**
+** The [SQLITE_FCNTL_LOCKSTATE] opcode is used for debugging.  This
+** opcode causes the xFileControl method to write the current state of
+** the lock (one of [SQLITE_LOCK_NONE], [SQLITE_LOCK_SHARED],
+** [SQLITE_LOCK_RESERVED], [SQLITE_LOCK_PENDING], or [SQLITE_LOCK_EXCLUSIVE])
+** into an integer that the pArg argument points to. This capability
+** is used during testing and only needs to be supported when SQLITE_TEST
+** is defined.
+*/
+#define SQLITE_FCNTL_LOCKSTATE        1
+
+/*
+** CAPI3REF: Mutex Handle {F17110}
+**
+** The mutex module within SQLite defines [sqlite3_mutex] to be an
+** abstract type for a mutex object.  The SQLite core never looks
+** at the internal representation of an [sqlite3_mutex].  It only
+** deals with pointers to the [sqlite3_mutex] object.
+**
+** Mutexes are created using [sqlite3_mutex_alloc()].
+*/
+typedef struct sqlite3_mutex sqlite3_mutex;
+
+/*
+** CAPI3REF: OS Interface Object {F11140}
+**
+** An instance of this object defines the interface between the
+** SQLite core and the underlying operating system.  The "vfs"
+** in the name of the object stands for "virtual file system".
+**
+** The iVersion field is initially 1 but may be larger for future
+** versions of SQLite.  Additional fields may be appended to this
+** object when the iVersion value is increased.
+**
+** The szOsFile field is the size of the subclassed [sqlite3_file]
+** structure used by this VFS.  mxPathname is the maximum length of
+** a pathname in this VFS.
+**
+** Registered sqlite3_vfs objects are kept on a linked list formed by
+** the pNext pointer.  The [sqlite3_vfs_register()]
+** and [sqlite3_vfs_unregister()] interfaces manage this list
+** in a thread-safe way.  The [sqlite3_vfs_find()] interface
+** searches the list.
+**
+** The pNext field is the only field in the sqlite3_vfs
+** structure that SQLite will ever modify.  SQLite will only access
+** or modify this field while holding a particular static mutex.
+** The application should never modify anything within the sqlite3_vfs
+** object once the object has been registered.
+**
+** The zName field holds the name of the VFS module.  The name must
+** be unique across all VFS modules.
+**
+** {F11141} SQLite will guarantee that the zFilename string passed to
+** xOpen() is a full pathname as generated by xFullPathname() and
+** that the string will be valid and unchanged until xClose() is
+** called.  {END} So the [sqlite3_file] can store a pointer to the
+** filename if it needs to remember the filename for some reason.
+**
+** {F11142} The flags argument to xOpen() includes all bits set in
+** the flags argument to [sqlite3_open_v2()].  Or if [sqlite3_open()]
+** or [sqlite3_open16()] is used, then flags includes at least
+** [SQLITE_OPEN_READWRITE] | [SQLITE_OPEN_CREATE]. {END}
+** If xOpen() opens a file read-only then it sets *pOutFlags to
+** include [SQLITE_OPEN_READONLY].  Other bits in *pOutFlags may be
+** set.
+**
+** {F11143} SQLite will also add one of the following flags to the xOpen()
+** call, depending on the object being opened:
+**
+** <ul>
+** <li>  [SQLITE_OPEN_MAIN_DB]
+** <li>  [SQLITE_OPEN_MAIN_JOURNAL]
+** <li>  [SQLITE_OPEN_TEMP_DB]
+** <li>  [SQLITE_OPEN_TEMP_JOURNAL]
+** <li>  [SQLITE_OPEN_TRANSIENT_DB]
+** <li>  [SQLITE_OPEN_SUBJOURNAL]
+** <li>  [SQLITE_OPEN_MASTER_JOURNAL]
+** </ul> {END}
+**
+** The file I/O implementation can use the object type flags to
+** changes the way it deals with files.  For example, an application
+** that does not care about crash recovery or rollback might make
+** the open of a journal file a no-op.  Writes to this journal would
+** also be no-ops, and any attempt to read the journal would return
+** SQLITE_IOERR.  Or the implementation might recognize that a database
+** file will be doing page-aligned sector reads and writes in a random
+** order and set up its I/O subsystem accordingly.
+**
+** SQLite might also add one of the following flags to the xOpen
+** method:
+**
+** <ul>
+** <li> [SQLITE_OPEN_DELETEONCLOSE]
+** <li> [SQLITE_OPEN_EXCLUSIVE]
+** </ul>
+**
+** {F11145} The [SQLITE_OPEN_DELETEONCLOSE] flag means the file should be
+** deleted when it is closed.  {F11146} The [SQLITE_OPEN_DELETEONCLOSE]
+** will be set for TEMP  databases, journals and for subjournals.
+** {F11147} The [SQLITE_OPEN_EXCLUSIVE] flag means the file should be opened
+** for exclusive access.  This flag is set for all files except
+** for the main database file. {END}
+**
+** {F11148} At least szOsFile bytes of memory are allocated by SQLite
+** to hold the  [sqlite3_file] structure passed as the third
+** argument to xOpen.  {END}  The xOpen method does not have to
+** allocate the structure; it should just fill it in.
+**
+** {F11149} The flags argument to xAccess() may be [SQLITE_ACCESS_EXISTS]
+** to test for the existance of a file,
+** or [SQLITE_ACCESS_READWRITE] to test to see
+** if a file is readable and writable, or [SQLITE_ACCESS_READ]
+** to test to see if a file is at least readable.  {END} The file can be a
+** directory.
+**
+** {F11150} SQLite will always allocate at least mxPathname+1 bytes for
+** the output buffers for xGetTempname and xFullPathname. {F11151} The exact
+** size of the output buffer is also passed as a parameter to both
+** methods. {END} If the output buffer is not large enough, SQLITE_CANTOPEN
+** should be returned. As this is handled as a fatal error by SQLite,
+** vfs implementations should endeavor to prevent this by setting
+** mxPathname to a sufficiently large value.
+**
+** The xRandomness(), xSleep(), and xCurrentTime() interfaces
+** are not strictly a part of the filesystem, but they are
+** included in the VFS structure for completeness.
+** The xRandomness() function attempts to return nBytes bytes
+** of good-quality randomness into zOut.  The return value is
+** the actual number of bytes of randomness obtained.  The
+** xSleep() method causes the calling thread to sleep for at
+** least the number of microseconds given.  The xCurrentTime()
+** method returns a Julian Day Number for the current date and
+** time.
+*/
+typedef struct sqlite3_vfs sqlite3_vfs;
+struct sqlite3_vfs {
+  int iVersion;            /* Structure version number */
+  int szOsFile;            /* Size of subclassed sqlite3_file */
+  int mxPathname;          /* Maximum file pathname length */
+  sqlite3_vfs *pNext;      /* Next registered VFS */
+  const char *zName;       /* Name of this virtual file system */
+  void *pAppData;          /* Pointer to application-specific data */
+  int (*xOpen)(sqlite3_vfs*, const char *zName, sqlite3_file*,
+               int flags, int *pOutFlags);
+  int (*xDelete)(sqlite3_vfs*, const char *zName, int syncDir);
+  int (*xAccess)(sqlite3_vfs*, const char *zName, int flags);
+  int (*xGetTempname)(sqlite3_vfs*, int nOut, char *zOut);
+  int (*xFullPathname)(sqlite3_vfs*, const char *zName, int nOut, char *zOut);
+  void *(*xDlOpen)(sqlite3_vfs*, const char *zFilename);
+  void (*xDlError)(sqlite3_vfs*, int nByte, char *zErrMsg);
+  void *(*xDlSym)(sqlite3_vfs*,void*, const char *zSymbol);
+  void (*xDlClose)(sqlite3_vfs*, void*);
+  int (*xRandomness)(sqlite3_vfs*, int nByte, char *zOut);
+  int (*xSleep)(sqlite3_vfs*, int microseconds);
+  int (*xCurrentTime)(sqlite3_vfs*, double*);
+  /* New fields may be appended in figure versions.  The iVersion
+  ** value will increment whenever this happens. */
+};
+
+/*
+** CAPI3REF: Flags for the xAccess VFS method {F11190}
+**
+** {F11191} These integer constants can be used as the third parameter to
+** the xAccess method of an [sqlite3_vfs] object. {END}  They determine
+** what kind of permissions the xAccess method is
+** looking for.  {F11192} With SQLITE_ACCESS_EXISTS, the xAccess method
+** simply checks to see if the file exists. {F11193} With
+** SQLITE_ACCESS_READWRITE, the xAccess method checks to see
+** if the file is both readable and writable.  {F11194} With
+** SQLITE_ACCESS_READ the xAccess method
+** checks to see if the file is readable.
+*/
+#define SQLITE_ACCESS_EXISTS    0
+#define SQLITE_ACCESS_READWRITE 1
+#define SQLITE_ACCESS_READ      2
+
+/*
+** CAPI3REF: Enable Or Disable Extended Result Codes {F12200}
+**
+** The sqlite3_extended_result_codes() routine enables or disables the
+** [SQLITE_IOERR_READ | extended result codes] feature of SQLite.
+** The extended result codes are disabled by default for historical
+** compatibility.
+**
+** INVARIANTS:
+**
+** {F12201} Each new [database connection] has the
+**          [extended result codes] feature
+**          disabled by default.
+**
+** {F12202} The [sqlite3_extended_result_codes(D,F)] interface will enable
+**          [extended result codes] for the
+**          [database connection] D if the F parameter
+**          is true, or disable them if F is false.
+*/
+int sqlite3_extended_result_codes(sqlite3*, int onoff);
+
+/*
+** CAPI3REF: Last Insert Rowid {F12220}
+**
+** Each entry in an SQLite table has a unique 64-bit signed
+** integer key called the "rowid". The rowid is always available
+** as an undeclared column named ROWID, OID, or _ROWID_ as long as those
+** names are not also used by explicitly declared columns. If
+** the table has a column of type INTEGER PRIMARY KEY then that column
+** is another alias for the rowid.
+**
+** This routine returns the rowid of the most recent
+** successful INSERT into the database from the database connection
+** shown in the first argument.  If no successful inserts
+** have ever occurred on this database connection, zero is returned.
+**
+** If an INSERT occurs within a trigger, then the rowid of the
+** inserted row is returned by this routine as long as the trigger
+** is running.  But once the trigger terminates, the value returned
+** by this routine reverts to the last value inserted before the
+** trigger fired.
+**
+** An INSERT that fails due to a constraint violation is not a
+** successful insert and does not change the value returned by this
+** routine.  Thus INSERT OR FAIL, INSERT OR IGNORE, INSERT OR ROLLBACK,
+** and INSERT OR ABORT make no changes to the return value of this
+** routine when their insertion fails.  When INSERT OR REPLACE
+** encounters a constraint violation, it does not fail.  The
+** INSERT continues to completion after deleting rows that caused
+** the constraint problem so INSERT OR REPLACE will always change
+** the return value of this interface.
+**
+** For the purposes of this routine, an insert is considered to
+** be successful even if it is subsequently rolled back.
+**
+** INVARIANTS:
+**
+** {F12221} The [sqlite3_last_insert_rowid()] function returns the
+**          rowid of the most recent successful insert done
+**          on the same database connection and within the same
+**          trigger context, or zero if there have
+**          been no qualifying inserts on that connection.
+**
+** {F12223} The [sqlite3_last_insert_rowid()] function returns
+**          same value when called from the same trigger context
+**          immediately before and after a ROLLBACK.
+**
+** LIMITATIONS:
+**
+** {U12232} If a separate thread does a new insert on the same
+**          database connection while the [sqlite3_last_insert_rowid()]
+**          function is running and thus changes the last insert rowid,
+**          then the value returned by [sqlite3_last_insert_rowid()] is
+**          unpredictable and might not equal either the old or the new
+**          last insert rowid.
+*/
+sqlite3_int64 sqlite3_last_insert_rowid(sqlite3*);
+
+/*
+** CAPI3REF: Count The Number Of Rows Modified {F12240}
+**
+** This function returns the number of database rows that were changed
+** or inserted or deleted by the most recently completed SQL statement
+** on the connection specified by the first parameter.  Only
+** changes that are directly specified by the INSERT, UPDATE, or
+** DELETE statement are counted.  Auxiliary changes caused by
+** triggers are not counted. Use the [sqlite3_total_changes()] function
+** to find the total number of changes including changes caused by triggers.
+**
+** A "row change" is a change to a single row of a single table
+** caused by an INSERT, DELETE, or UPDATE statement.  Rows that
+** are changed as side effects of REPLACE constraint resolution,
+** rollback, ABORT processing, DROP TABLE, or by any other
+** mechanisms do not count as direct row changes.
+**
+** A "trigger context" is a scope of execution that begins and
+** ends with the script of a trigger.  Most SQL statements are
+** evaluated outside of any trigger.  This is the "top level"
+** trigger context.  If a trigger fires from the top level, a
+** new trigger context is entered for the duration of that one
+** trigger.  Subtriggers create subcontexts for their duration.
+**
+** Calling [sqlite3_exec()] or [sqlite3_step()] recursively does
+** not create a new trigger context.
+**
+** This function returns the number of direct row changes in the
+** most recent INSERT, UPDATE, or DELETE statement within the same
+** trigger context.
+**
+** So when called from the top level, this function returns the
+** number of changes in the most recent INSERT, UPDATE, or DELETE
+** that also occurred at the top level.
+** Within the body of a trigger, the sqlite3_changes() interface
+** can be called to find the number of
+** changes in the most recently completed INSERT, UPDATE, or DELETE
+** statement within the body of the same trigger.
+** However, the number returned does not include in changes
+** caused by subtriggers since they have their own context.
+**
+** SQLite implements the command "DELETE FROM table" without
+** a WHERE clause by dropping and recreating the table.  (This is much
+** faster than going through and deleting individual elements from the
+** table.)  Because of this optimization, the deletions in
+** "DELETE FROM table" are not row changes and will not be counted
+** by the sqlite3_changes() or [sqlite3_total_changes()] functions.
+** To get an accurate count of the number of rows deleted, use
+** "DELETE FROM table WHERE 1" instead.
+**
+** INVARIANTS:
+**
+** {F12241} The [sqlite3_changes()] function returns the number of
+**          row changes caused by the most recent INSERT, UPDATE,
+**          or DELETE statement on the same database connection and
+**          within the same trigger context, or zero if there have
+**          not been any qualifying row changes.
+**
+** LIMITATIONS:
+**
+** {U12252} If a separate thread makes changes on the same database connection
+**          while [sqlite3_changes()] is running then the value returned
+**          is unpredictable and unmeaningful.
+*/
+int sqlite3_changes(sqlite3*);
+
+/*
+** CAPI3REF: Total Number Of Rows Modified {F12260}
+***
+** This function returns the number of row changes caused
+** by INSERT, UPDATE or DELETE statements since the database handle
+** was opened.  The count includes all changes from all trigger
+** contexts.  But the count does not include changes used to
+** implement REPLACE constraints, do rollbacks or ABORT processing,
+** or DROP table processing.
+** The changes
+** are counted as soon as the statement that makes them is completed
+** (when the statement handle is passed to [sqlite3_reset()] or
+** [sqlite3_finalize()]).
+**
+** SQLite implements the command "DELETE FROM table" without
+** a WHERE clause by dropping and recreating the table.  (This is much
+** faster than going
+** through and deleting individual elements from the table.)  Because of
+** this optimization, the change count for "DELETE FROM table" will be
+** zero regardless of the number of elements that were originally in the
+** table. To get an accurate count of the number of rows deleted, use
+** "DELETE FROM table WHERE 1" instead.
+**
+** See also the [sqlite3_changes()] interface.
+**
+** INVARIANTS:
+**
+** {F12261} The [sqlite3_total_changes()] returns the total number
+**          of row changes caused by INSERT, UPDATE, and/or DELETE
+**          statements on the same [database connection], in any
+**          trigger context, since the database connection was
+**          created.
+**
+** LIMITATIONS:
+**
+** {U12264} If a separate thread makes changes on the same database connection
+**          while [sqlite3_total_changes()] is running then the value
+**          returned is unpredictable and unmeaningful.
+*/
+int sqlite3_total_changes(sqlite3*);
+
+/*
+** CAPI3REF: Interrupt A Long-Running Query {F12270}
+**
+** This function causes any pending database operation to abort and
+** return at its earliest opportunity. This routine is typically
+** called in response to a user action such as pressing "Cancel"
+** or Ctrl-C where the user wants a long query operation to halt
+** immediately.
+**
+** It is safe to call this routine from a thread different from the
+** thread that is currently running the database operation.  But it
+** is not safe to call this routine with a database connection that
+** is closed or might close before sqlite3_interrupt() returns.
+**
+** If an SQL is very nearly finished at the time when sqlite3_interrupt()
+** is called, then it might not have an opportunity to be interrupted.
+** It might continue to completion.
+** An SQL operation that is interrupted will return
+** [SQLITE_INTERRUPT].  If the interrupted SQL operation is an
+** INSERT, UPDATE, or DELETE that is inside an explicit transaction,
+** then the entire transaction will be rolled back automatically.
+** A call to sqlite3_interrupt() has no effect on SQL statements
+** that are started after sqlite3_interrupt() returns.
+**
+** INVARIANTS:
+**
+** {F12271} The [sqlite3_interrupt()] interface will force all running
+**          SQL statements associated with the same database connection
+**          to halt after processing at most one additional row of
+**          data.
+**
+** {F12272} Any SQL statement that is interrupted by [sqlite3_interrupt()]
+**          will return [SQLITE_INTERRUPT].
+**
+** LIMITATIONS:
+**
+** {U12279} If the database connection closes while [sqlite3_interrupt()]
+**          is running then bad things will likely happen.
+*/
+void sqlite3_interrupt(sqlite3*);
+
+/*
+** CAPI3REF: Determine If An SQL Statement Is Complete {F10510}
+**
+** These routines are useful for command-line input to determine if the
+** currently entered text seems to form complete a SQL statement or
+** if additional input is needed before sending the text into
+** SQLite for parsing.  These routines return true if the input string
+** appears to be a complete SQL statement.  A statement is judged to be
+** complete if it ends with a semicolon token and is not a fragment of a
+** CREATE TRIGGER statement.  Semicolons that are embedded within
+** string literals or quoted identifier names or comments are not
+** independent tokens (they are part of the token in which they are
+** embedded) and thus do not count as a statement terminator.
+**
+** These routines do not parse the SQL and
+** so will not detect syntactically incorrect SQL.
+**
+** INVARIANTS:
+**
+** {F10511} The sqlite3_complete() and sqlite3_complete16() functions
+**          return true (non-zero) if and only if the last
+**          non-whitespace token in their input is a semicolon that
+**          is not in between the BEGIN and END of a CREATE TRIGGER
+**          statement.
+**
+** LIMITATIONS:
+**
+** {U10512} The input to sqlite3_complete() must be a zero-terminated
+**          UTF-8 string.
+**
+** {U10513} The input to sqlite3_complete16() must be a zero-terminated
+**          UTF-16 string in native byte order.
+*/
+int sqlite3_complete(const char *sql);
+int sqlite3_complete16(const void *sql);
+
+/*
+** CAPI3REF: Register A Callback To Handle SQLITE_BUSY Errors {F12310}
+**
+** This routine identifies a callback function that might be
+** invoked whenever an attempt is made to open a database table
+** that another thread or process has locked.
+** If the busy callback is NULL, then [SQLITE_BUSY]
+** or [SQLITE_IOERR_BLOCKED]
+** is returned immediately upon encountering the lock.
+** If the busy callback is not NULL, then the
+** callback will be invoked with two arguments.  The
+** first argument to the handler is a copy of the void* pointer which
+** is the third argument to this routine.  The second argument to
+** the handler is the number of times that the busy handler has
+** been invoked for this locking event.   If the
+** busy callback returns 0, then no additional attempts are made to
+** access the database and [SQLITE_BUSY] or [SQLITE_IOERR_BLOCKED] is returned.
+** If the callback returns non-zero, then another attempt
+** is made to open the database for reading and the cycle repeats.
+**
+** The presence of a busy handler does not guarantee that
+** it will be invoked when there is lock contention.
+** If SQLite determines that invoking the busy handler could result in
+** a deadlock, it will go ahead and return [SQLITE_BUSY] or
+** [SQLITE_IOERR_BLOCKED] instead of invoking the
+** busy handler.
+** Consider a scenario where one process is holding a read lock that
+** it is trying to promote to a reserved lock and
+** a second process is holding a reserved lock that it is trying
+** to promote to an exclusive lock.  The first process cannot proceed
+** because it is blocked by the second and the second process cannot
+** proceed because it is blocked by the first.  If both processes
+** invoke the busy handlers, neither will make any progress.  Therefore,
+** SQLite returns [SQLITE_BUSY] for the first process, hoping that this
+** will induce the first process to release its read lock and allow
+** the second process to proceed.
+**
+** The default busy callback is NULL.
+**
+** The [SQLITE_BUSY] error is converted to [SQLITE_IOERR_BLOCKED]
+** when SQLite is in the middle of a large transaction where all the
+** changes will not fit into the in-memory cache.  SQLite will
+** already hold a RESERVED lock on the database file, but it needs
+** to promote this lock to EXCLUSIVE so that it can spill cache
+** pages into the database file without harm to concurrent
+** readers.  If it is unable to promote the lock, then the in-memory
+** cache will be left in an inconsistent state and so the error
+** code is promoted from the relatively benign [SQLITE_BUSY] to
+** the more severe [SQLITE_IOERR_BLOCKED].  This error code promotion
+** forces an automatic rollback of the changes.  See the
+** <a href="http://www.sqlite.org/cvstrac/wiki?p=CorruptionFollowingBusyError">
+** CorruptionFollowingBusyError</a> wiki page for a discussion of why
+** this is important.
+**
+** There can only be a single busy handler defined for each database
+** connection.  Setting a new busy handler clears any previous one.
+** Note that calling [sqlite3_busy_timeout()] will also set or clear
+** the busy handler.
+**
+** INVARIANTS:
+**
+** {F12311} The [sqlite3_busy_handler()] function replaces the busy handler
+**          callback in the database connection identified by the 1st
+**          parameter with a new busy handler identified by the 2nd and 3rd
+**          parameters.
+**
+** {F12312} The default busy handler for new database connections is NULL.
+**
+** {F12314} When two or more database connection share a common cache,
+**          the busy handler for the database connection currently using
+**          the cache is invoked when the cache encounters a lock.
+**
+** {F12316} If a busy handler callback returns zero, then the SQLite
+**          interface that provoked the locking event will return
+**          [SQLITE_BUSY].
+**
+** {F12318} SQLite will invokes the busy handler with two argument which
+**          are a copy of the pointer supplied by the 3rd parameter to
+**          [sqlite3_busy_handler()] and a count of the number of prior
+**          invocations of the busy handler for the same locking event.
+**
+** LIMITATIONS:
+**
+** {U12319} A busy handler should not call close the database connection
+**          or prepared statement that invoked the busy handler.
+*/
+int sqlite3_busy_handler(sqlite3*, int(*)(void*,int), void*);
+
+/*
+** CAPI3REF: Set A Busy Timeout {F12340}
+**
+** This routine sets a [sqlite3_busy_handler | busy handler]
+** that sleeps for a while when a
+** table is locked.  The handler will sleep multiple times until
+** at least "ms" milliseconds of sleeping have been done. {F12343} After
+** "ms" milliseconds of sleeping, the handler returns 0 which
+** causes [sqlite3_step()] to return [SQLITE_BUSY] or [SQLITE_IOERR_BLOCKED].
+**
+** Calling this routine with an argument less than or equal to zero
+** turns off all busy handlers.
+**
+** There can only be a single busy handler for a particular database
+** connection.  If another busy handler was defined
+** (using [sqlite3_busy_handler()]) prior to calling
+** this routine, that other busy handler is cleared.
+**
+** INVARIANTS:
+**
+** {F12341} The [sqlite3_busy_timeout()] function overrides any prior
+**          [sqlite3_busy_timeout()] or [sqlite3_busy_handler()] setting
+**          on the same database connection.
+**
+** {F12343} If the 2nd parameter to [sqlite3_busy_timeout()] is less than
+**          or equal to zero, then the busy handler is cleared so that
+**          all subsequent locking events immediately return [SQLITE_BUSY].
+**
+** {F12344} If the 2nd parameter to [sqlite3_busy_timeout()] is a positive
+**          number N, then a busy handler is set that repeatedly calls
+**          the xSleep() method in the VFS interface until either the
+**          lock clears or until the cumulative sleep time reported back
+**          by xSleep() exceeds N milliseconds.
+*/
+int sqlite3_busy_timeout(sqlite3*, int ms);
+
+/*
+** CAPI3REF: Convenience Routines For Running Queries {F12370}
+**
+** Definition: A <b>result table</b> is memory data structure created by the
+** [sqlite3_get_table()] interface.  A result table records the
+** complete query results from one or more queries.
+**
+** The table conceptually has a number of rows and columns.  But
+** these numbers are not part of the result table itself.  These
+** numbers are obtained separately.  Let N be the number of rows
+** and M be the number of columns.
+**
+** A result table is an array of pointers to zero-terminated
+** UTF-8 strings.  There are (N+1)*M elements in the array.
+** The first M pointers point to zero-terminated strings that
+** contain the names of the columns.
+** The remaining entries all point to query results.  NULL
+** values are give a NULL pointer.  All other values are in
+** their UTF-8 zero-terminated string representation as returned by
+** [sqlite3_column_text()].
+**
+** A result table might consists of one or more memory allocations.
+** It is not safe to pass a result table directly to [sqlite3_free()].
+** A result table should be deallocated using [sqlite3_free_table()].
+**
+** As an example of the result table format, suppose a query result
+** is as follows:
+**
+** <blockquote><pre>
+**        Name        | Age
+**        -----------------------
+**        Alice       | 43
+**        Bob         | 28
+**        Cindy       | 21
+** </pre></blockquote>
+**
+** There are two column (M==2) and three rows (N==3).  Thus the
+** result table has 8 entries.  Suppose the result table is stored
+** in an array names azResult.  Then azResult holds this content:
+**
+** <blockquote><pre>
+**        azResult&#91;0] = "Name";
+**        azResult&#91;1] = "Age";
+**        azResult&#91;2] = "Alice";
+**        azResult&#91;3] = "43";
+**        azResult&#91;4] = "Bob";
+**        azResult&#91;5] = "28";
+**        azResult&#91;6] = "Cindy";
+**        azResult&#91;7] = "21";
+** </pre></blockquote>
+**
+** The sqlite3_get_table() function evaluates one or more
+** semicolon-separated SQL statements in the zero-terminated UTF-8
+** string of its 2nd parameter.  It returns a result table to the
+** pointer given in its 3rd parameter.
+**
+** After the calling function has finished using the result, it should
+** pass the pointer to the result table to sqlite3_free_table() in order to
+** release the memory that was malloc-ed.  Because of the way the
+** [sqlite3_malloc()] happens within sqlite3_get_table(), the calling
+** function must not try to call [sqlite3_free()] directly.  Only
+** [sqlite3_free_table()] is able to release the memory properly and safely.
+**
+** The sqlite3_get_table() interface is implemented as a wrapper around
+** [sqlite3_exec()].  The sqlite3_get_table() routine does not have access
+** to any internal data structures of SQLite.  It uses only the public
+** interface defined here.  As a consequence, errors that occur in the
+** wrapper layer outside of the internal [sqlite3_exec()] call are not
+** reflected in subsequent calls to [sqlite3_errcode()] or
+** [sqlite3_errmsg()].
+**
+** INVARIANTS:
+**
+** {F12371} If a [sqlite3_get_table()] fails a memory allocation, then
+**          it frees the result table under construction, aborts the
+**          query in process, skips any subsequent queries, sets the
+**          *resultp output pointer to NULL and returns [SQLITE_NOMEM].
+**
+** {F12373} If the ncolumn parameter to [sqlite3_get_table()] is not NULL
+**          then [sqlite3_get_table()] write the number of columns in the
+**          result set of the query into *ncolumn if the query is
+**          successful (if the function returns SQLITE_OK).
+**
+** {F12374} If the nrow parameter to [sqlite3_get_table()] is not NULL
+**          then [sqlite3_get_table()] write the number of rows in the
+**          result set of the query into *nrow if the query is
+**          successful (if the function returns SQLITE_OK).
+**
+** {F12376} The [sqlite3_get_table()] function sets its *ncolumn value
+**          to the number of columns in the result set of the query in the
+**          sql parameter, or to zero if the query in sql has an empty
+**          result set.
+*/
+int sqlite3_get_table(
+  sqlite3*,             /* An open database */
+  const char *sql,      /* SQL to be evaluated */
+  char ***pResult,      /* Results of the query */
+  int *nrow,            /* Number of result rows written here */
+  int *ncolumn,         /* Number of result columns written here */
+  char **errmsg         /* Error msg written here */
+);
+void sqlite3_free_table(char **result);
+
+/*
+** CAPI3REF: Formatted String Printing Functions {F17400}
+**
+** These routines are workalikes of the "printf()" family of functions
+** from the standard C library.
+**
+** The sqlite3_mprintf() and sqlite3_vmprintf() routines write their
+** results into memory obtained from [sqlite3_malloc()].
+** The strings returned by these two routines should be
+** released by [sqlite3_free()].   Both routines return a
+** NULL pointer if [sqlite3_malloc()] is unable to allocate enough
+** memory to hold the resulting string.
+**
+** In sqlite3_snprintf() routine is similar to "snprintf()" from
+** the standard C library.  The result is written into the
+** buffer supplied as the second parameter whose size is given by
+** the first parameter. Note that the order of the
+** first two parameters is reversed from snprintf().  This is an
+** historical accident that cannot be fixed without breaking
+** backwards compatibility.  Note also that sqlite3_snprintf()
+** returns a pointer to its buffer instead of the number of
+** characters actually written into the buffer.  We admit that
+** the number of characters written would be a more useful return
+** value but we cannot change the implementation of sqlite3_snprintf()
+** now without breaking compatibility.
+**
+** As long as the buffer size is greater than zero, sqlite3_snprintf()
+** guarantees that the buffer is always zero-terminated.  The first
+** parameter "n" is the total size of the buffer, including space for
+** the zero terminator.  So the longest string that can be completely
+** written will be n-1 characters.
+**
+** These routines all implement some additional formatting
+** options that are useful for constructing SQL statements.
+** All of the usual printf formatting options apply.  In addition, there
+** is are "%q", "%Q", and "%z" options.
+**
+** The %q option works like %s in that it substitutes a null-terminated
+** string from the argument list.  But %q also doubles every '\'' character.
+** %q is designed for use inside a string literal.  By doubling each '\''
+** character it escapes that character and allows it to be inserted into
+** the string.
+**
+** For example, so some string variable contains text as follows:
+**
+** <blockquote><pre>
+**  char *zText = "It's a happy day!";
+** </pre></blockquote>
+**
+** One can use this text in an SQL statement as follows:
+**
+** <blockquote><pre>
+**  char *zSQL = sqlite3_mprintf("INSERT INTO table VALUES('%q')", zText);
+**  sqlite3_exec(db, zSQL, 0, 0, 0);
+**  sqlite3_free(zSQL);
+** </pre></blockquote>
+**
+** Because the %q format string is used, the '\'' character in zText
+** is escaped and the SQL generated is as follows:
+**
+** <blockquote><pre>
+**  INSERT INTO table1 VALUES('It''s a happy day!')
+** </pre></blockquote>
+**
+** This is correct.  Had we used %s instead of %q, the generated SQL
+** would have looked like this:
+**
+** <blockquote><pre>
+**  INSERT INTO table1 VALUES('It's a happy day!');
+** </pre></blockquote>
+**
+** This second example is an SQL syntax error.  As a general rule you
+** should always use %q instead of %s when inserting text into a string
+** literal.
+**
+** The %Q option works like %q except it also adds single quotes around
+** the outside of the total string.  Or if the parameter in the argument
+** list is a NULL pointer, %Q substitutes the text "NULL" (without single
+** quotes) in place of the %Q option. {END}  So, for example, one could say:
+**
+** <blockquote><pre>
+**  char *zSQL = sqlite3_mprintf("INSERT INTO table VALUES(%Q)", zText);
+**  sqlite3_exec(db, zSQL, 0, 0, 0);
+**  sqlite3_free(zSQL);
+** </pre></blockquote>
+**
+** The code above will render a correct SQL statement in the zSQL
+** variable even if the zText variable is a NULL pointer.
+**
+** The "%z" formatting option works exactly like "%s" with the
+** addition that after the string has been read and copied into
+** the result, [sqlite3_free()] is called on the input string. {END}
+**
+** INVARIANTS:
+**
+** {F17403}  The [sqlite3_mprintf()] and [sqlite3_vmprintf()] interfaces
+**           return either pointers to zero-terminated UTF-8 strings held in
+**           memory obtained from [sqlite3_malloc()] or NULL pointers if
+**           a call to [sqlite3_malloc()] fails.
+**
+** {F17406}  The [sqlite3_snprintf()] interface writes a zero-terminated
+**           UTF-8 string into the buffer pointed to by the second parameter
+**           provided that the first parameter is greater than zero.
+**
+** {F17407}  The [sqlite3_snprintf()] interface does not writes slots of
+**           its output buffer (the second parameter) outside the range
+**           of 0 through N-1 (where N is the first parameter)
+**           regardless of the length of the string
+**           requested by the format specification.
+**
+*/
+char *sqlite3_mprintf(const char*,...);
+char *sqlite3_vmprintf(const char*, va_list);
+char *sqlite3_snprintf(int,char*,const char*, ...);
+
+/*
+** CAPI3REF: Memory Allocation Subsystem {F17300}
+**
+** The SQLite core  uses these three routines for all of its own
+** internal memory allocation needs. "Core" in the previous sentence
+** does not include operating-system specific VFS implementation.  The
+** windows VFS uses native malloc and free for some operations.
+**
+** The sqlite3_malloc() routine returns a pointer to a block
+** of memory at least N bytes in length, where N is the parameter.
+** If sqlite3_malloc() is unable to obtain sufficient free
+** memory, it returns a NULL pointer.  If the parameter N to
+** sqlite3_malloc() is zero or negative then sqlite3_malloc() returns
+** a NULL pointer.
+**
+** Calling sqlite3_free() with a pointer previously returned
+** by sqlite3_malloc() or sqlite3_realloc() releases that memory so
+** that it might be reused.  The sqlite3_free() routine is
+** a no-op if is called with a NULL pointer.  Passing a NULL pointer
+** to sqlite3_free() is harmless.  After being freed, memory
+** should neither be read nor written.  Even reading previously freed
+** memory might result in a segmentation fault or other severe error.
+** Memory corruption, a segmentation fault, or other severe error
+** might result if sqlite3_free() is called with a non-NULL pointer that
+** was not obtained from sqlite3_malloc() or sqlite3_free().
+**
+** The sqlite3_realloc() interface attempts to resize a
+** prior memory allocation to be at least N bytes, where N is the
+** second parameter.  The memory allocation to be resized is the first
+** parameter.  If the first parameter to sqlite3_realloc()
+** is a NULL pointer then its behavior is identical to calling
+** sqlite3_malloc(N) where N is the second parameter to sqlite3_realloc().
+** If the second parameter to sqlite3_realloc() is zero or
+** negative then the behavior is exactly the same as calling
+** sqlite3_free(P) where P is the first parameter to sqlite3_realloc().
+** Sqlite3_realloc() returns a pointer to a memory allocation
+** of at least N bytes in size or NULL if sufficient memory is unavailable.
+** If M is the size of the prior allocation, then min(N,M) bytes
+** of the prior allocation are copied into the beginning of buffer returned
+** by sqlite3_realloc() and the prior allocation is freed.
+** If sqlite3_realloc() returns NULL, then the prior allocation
+** is not freed.
+**
+** The memory returned by sqlite3_malloc() and sqlite3_realloc()
+** is always aligned to at least an 8 byte boundary. {END}
+**
+** The default implementation
+** of the memory allocation subsystem uses the malloc(), realloc()
+** and free() provided by the standard C library. {F17382} However, if
+** SQLite is compiled with the following C preprocessor macro
+**
+** <blockquote> SQLITE_MEMORY_SIZE=<i>NNN</i> </blockquote>
+**
+** where <i>NNN</i> is an integer, then SQLite create a static
+** array of at least <i>NNN</i> bytes in size and use that array
+** for all of its dynamic memory allocation needs. {END}  Additional
+** memory allocator options may be added in future releases.
+**
+** In SQLite version 3.5.0 and 3.5.1, it was possible to define
+** the SQLITE_OMIT_MEMORY_ALLOCATION which would cause the built-in
+** implementation of these routines to be omitted.  That capability
+** is no longer provided.  Only built-in memory allocators can be
+** used.
+**
+** The windows OS interface layer calls
+** the system malloc() and free() directly when converting
+** filenames between the UTF-8 encoding used by SQLite
+** and whatever filename encoding is used by the particular windows
+** installation.  Memory allocation errors are detected, but
+** they are reported back as [SQLITE_CANTOPEN] or
+** [SQLITE_IOERR] rather than [SQLITE_NOMEM].
+**
+** INVARIANTS:
+**
+** {F17303}  The [sqlite3_malloc(N)] interface returns either a pointer to
+**           newly checked-out block of at least N bytes of memory
+**           that is 8-byte aligned,
+**           or it returns NULL if it is unable to fulfill the request.
+**
+** {F17304}  The [sqlite3_malloc(N)] interface returns a NULL pointer if
+**           N is less than or equal to zero.
+**
+** {F17305}  The [sqlite3_free(P)] interface releases memory previously
+**           returned from [sqlite3_malloc()] or [sqlite3_realloc()],
+**           making it available for reuse.
+**
+** {F17306}  A call to [sqlite3_free(NULL)] is a harmless no-op.
+**
+** {F17310}  A call to [sqlite3_realloc(0,N)] is equivalent to a call
+**           to [sqlite3_malloc(N)].
+**
+** {F17312}  A call to [sqlite3_realloc(P,0)] is equivalent to a call
+**           to [sqlite3_free(P)].
+**
+** {F17315}  The SQLite core uses [sqlite3_malloc()], [sqlite3_realloc()],
+**           and [sqlite3_free()] for all of its memory allocation and
+**           deallocation needs.
+**
+** {F17318}  The [sqlite3_realloc(P,N)] interface returns either a pointer
+**           to a block of checked-out memory of at least N bytes in size
+**           that is 8-byte aligned, or a NULL pointer.
+**
+** {F17321}  When [sqlite3_realloc(P,N)] returns a non-NULL pointer, it first
+**           copies the first K bytes of content from P into the newly allocated
+**           where K is the lessor of N and the size of the buffer P.
+**
+** {F17322}  When [sqlite3_realloc(P,N)] returns a non-NULL pointer, it first
+**           releases the buffer P.
+**
+** {F17323}  When [sqlite3_realloc(P,N)] returns NULL, the buffer P is
+**           not modified or released.
+**
+** LIMITATIONS:
+**
+** {U17350}  The pointer arguments to [sqlite3_free()] and [sqlite3_realloc()]
+**           must be either NULL or else a pointer obtained from a prior
+**           invocation of [sqlite3_malloc()] or [sqlite3_realloc()] that has
+**           not been released.
+**
+** {U17351}  The application must not read or write any part of
+**           a block of memory after it has been released using
+**           [sqlite3_free()] or [sqlite3_realloc()].
+**
+*/
+void *sqlite3_malloc(int);
+void *sqlite3_realloc(void*, int);
+void sqlite3_free(void*);
+
+/*
+** CAPI3REF: Memory Allocator Statistics {F17370}
+**
+** SQLite provides these two interfaces for reporting on the status
+** of the [sqlite3_malloc()], [sqlite3_free()], and [sqlite3_realloc()]
+** the memory allocation subsystem included within the SQLite.
+**
+** INVARIANTS:
+**
+** {F17371} The [sqlite3_memory_used()] routine returns the
+**          number of bytes of memory currently outstanding
+**          (malloced but not freed).
+**
+** {F17373} The [sqlite3_memory_highwater()] routine returns the maximum
+**          value of [sqlite3_memory_used()]
+**          since the highwater mark was last reset.
+**
+** {F17374} The values returned by [sqlite3_memory_used()] and
+**          [sqlite3_memory_highwater()] include any overhead
+**          added by SQLite in its implementation of [sqlite3_malloc()],
+**          but not overhead added by the any underlying system library
+**          routines that [sqlite3_malloc()] may call.
+**
+** {F17375} The memory highwater mark is reset to the current value of
+**          [sqlite3_memory_used()] if and only if the parameter to
+**          [sqlite3_memory_highwater()] is true.  The value returned
+**          by [sqlite3_memory_highwater(1)] is the highwater mark
+**          prior to the reset.
+*/
+sqlite3_int64 sqlite3_memory_used(void);
+sqlite3_int64 sqlite3_memory_highwater(int resetFlag);
+
+/*
+** CAPI3REF: Compile-Time Authorization Callbacks {F12500}
+**
+** This routine registers a authorizer callback with a particular
+** database connection, supplied in the first argument.
+** The authorizer callback is invoked as SQL statements are being compiled
+** by [sqlite3_prepare()] or its variants [sqlite3_prepare_v2()],
+** [sqlite3_prepare16()] and [sqlite3_prepare16_v2()].  At various
+** points during the compilation process, as logic is being created
+** to perform various actions, the authorizer callback is invoked to
+** see if those actions are allowed.  The authorizer callback should
+** return SQLITE_OK to allow the action, [SQLITE_IGNORE] to disallow the
+** specific action but allow the SQL statement to continue to be
+** compiled, or [SQLITE_DENY] to cause the entire SQL statement to be
+** rejected with an error.   If the authorizer callback returns
+** any value other than [SQLITE_IGNORE], [SQLITE_OK], or [SQLITE_DENY]
+** then [sqlite3_prepare_v2()] or equivalent call that triggered
+** the authorizer will fail with an error message.
+**
+** When the callback returns [SQLITE_OK], that means the operation
+** requested is ok.  When the callback returns [SQLITE_DENY], the
+** [sqlite3_prepare_v2()] or equivalent call that triggered the
+** authorizer will fail with an error message explaining that
+** access is denied.  If the authorizer code is [SQLITE_READ]
+** and the callback returns [SQLITE_IGNORE] then the prepared
+** statement is constructed to insert a NULL value in place of
+** the table column that would have
+** been read if [SQLITE_OK] had been returned.  The [SQLITE_IGNORE]
+** return can be used to deny an untrusted user access to individual
+** columns of a table.
+**
+** The first parameter to the authorizer callback is a copy of
+** the third parameter to the sqlite3_set_authorizer() interface.
+** The second parameter to the callback is an integer
+** [SQLITE_COPY | action code] that specifies the particular action
+** to be authorized. The third through sixth
+** parameters to the callback are zero-terminated strings that contain
+** additional details about the action to be authorized.
+**
+** An authorizer is used when preparing SQL statements from an untrusted
+** source, to ensure that the SQL statements do not try to access data
+** that they are not allowed to see, or that they do not try to
+** execute malicious statements that damage the database.  For
+** example, an application may allow a user to enter arbitrary
+** SQL queries for evaluation by a database.  But the application does
+** not want the user to be able to make arbitrary changes to the
+** database.  An authorizer could then be put in place while the
+** user-entered SQL is being prepared that disallows everything
+** except SELECT statements.
+**
+** Only a single authorizer can be in place on a database connection
+** at a time.  Each call to sqlite3_set_authorizer overrides the
+** previous call.  Disable the authorizer by installing a NULL callback.
+** The authorizer is disabled by default.
+**
+** Note that the authorizer callback is invoked only during
+** [sqlite3_prepare()] or its variants.  Authorization is not
+** performed during statement evaluation in [sqlite3_step()].
+**
+** INVARIANTS:
+**
+** {F12501} The [sqlite3_set_authorizer(D,...)] interface registers a
+**          authorizer callback with database connection D.
+**
+** {F12502} The authorizer callback is invoked as SQL statements are
+**          being compiled
+**
+** {F12503} If the authorizer callback returns any value other than
+**          [SQLITE_IGNORE], [SQLITE_OK], or [SQLITE_DENY] then
+**          the [sqlite3_prepare_v2()] or equivalent call that caused
+**          the authorizer callback to run shall fail with an
+**          [SQLITE_ERROR] error code and an appropriate error message.
+**
+** {F12504} When the authorizer callback returns [SQLITE_OK], the operation
+**          described is coded normally.
+**
+** {F12505} When the authorizer callback returns [SQLITE_DENY], the
+**          [sqlite3_prepare_v2()] or equivalent call that caused the
+**          authorizer callback to run shall fail
+**          with an [SQLITE_ERROR] error code and an error message
+**          explaining that access is denied.
+**
+** {F12506} If the authorizer code (the 2nd parameter to the authorizer
+**          callback) is [SQLITE_READ] and the authorizer callback returns
+**          [SQLITE_IGNORE] then the prepared statement is constructed to
+**          insert a NULL value in place of the table column that would have
+**          been read if [SQLITE_OK] had been returned.
+**
+** {F12507} If the authorizer code (the 2nd parameter to the authorizer
+**          callback) is anything other than [SQLITE_READ], then
+**          a return of [SQLITE_IGNORE] has the same effect as [SQLITE_DENY].
+**
+** {F12510} The first parameter to the authorizer callback is a copy of
+**          the third parameter to the [sqlite3_set_authorizer()] interface.
+**
+** {F12511} The second parameter to the callback is an integer
+**          [SQLITE_COPY | action code] that specifies the particular action
+**          to be authorized.
+**
+** {F12512} The third through sixth parameters to the callback are
+**          zero-terminated strings that contain
+**          additional details about the action to be authorized.
+**
+** {F12520} Each call to [sqlite3_set_authorizer()] overrides the
+**          any previously installed authorizer.
+**
+** {F12521} A NULL authorizer means that no authorization
+**          callback is invoked.
+**
+** {F12522} The default authorizer is NULL.
+*/
+int sqlite3_set_authorizer(
+  sqlite3*,
+  int (*xAuth)(void*,int,const char*,const char*,const char*,const char*),
+  void *pUserData
+);
+
+/*
+** CAPI3REF: Authorizer Return Codes {F12590}
+**
+** The [sqlite3_set_authorizer | authorizer callback function] must
+** return either [SQLITE_OK] or one of these two constants in order
+** to signal SQLite whether or not the action is permitted.  See the
+** [sqlite3_set_authorizer | authorizer documentation] for additional
+** information.
+*/
+#define SQLITE_DENY   1   /* Abort the SQL statement with an error */
+#define SQLITE_IGNORE 2   /* Don't allow access, but don't generate an error */
+
+/*
+** CAPI3REF: Authorizer Action Codes {F12550}
+**
+** The [sqlite3_set_authorizer()] interface registers a callback function
+** that is invoked to authorizer certain SQL statement actions.  The
+** second parameter to the callback is an integer code that specifies
+** what action is being authorized.  These are the integer action codes that
+** the authorizer callback may be passed.
+**
+** These action code values signify what kind of operation is to be
+** authorized.  The 3rd and 4th parameters to the authorization
+** callback function will be parameters or NULL depending on which of these
+** codes is used as the second parameter.  The 5th parameter to the
+** authorizer callback is the name of the database ("main", "temp",
+** etc.) if applicable.  The 6th parameter to the authorizer callback
+** is the name of the inner-most trigger or view that is responsible for
+** the access attempt or NULL if this access attempt is directly from
+** top-level SQL code.
+**
+** INVARIANTS:
+**
+** {F12551} The second parameter to an
+**          [sqlite3_set_authorizer | authorizer callback is always an integer
+**          [SQLITE_COPY | authorizer code] that specifies what action
+**          is being authorized.
+**
+** {F12552} The 3rd and 4th parameters to the
+**          [sqlite3_set_authorizer | authorization callback function]
+**          will be parameters or NULL depending on which
+**          [SQLITE_COPY | authorizer code] is used as the second parameter.
+**
+** {F12553} The 5th parameter to the
+**          [sqlite3_set_authorizer | authorizer callback] is the name
+**          of the database (example: "main", "temp", etc.) if applicable.
+**
+** {F12554} The 6th parameter to the
+**          [sqlite3_set_authorizer | authorizer callback] is the name
+**          of the inner-most trigger or view that is responsible for
+**          the access attempt or NULL if this access attempt is directly from
+**          top-level SQL code.
+*/
+/******************************************* 3rd ************ 4th ***********/
+#define SQLITE_CREATE_INDEX          1   /* Index Name      Table Name      */
+#define SQLITE_CREATE_TABLE          2   /* Table Name      NULL            */
+#define SQLITE_CREATE_TEMP_INDEX     3   /* Index Name      Table Name      */
+#define SQLITE_CREATE_TEMP_TABLE     4   /* Table Name      NULL            */
+#define SQLITE_CREATE_TEMP_TRIGGER   5   /* Trigger Name    Table Name      */
+#define SQLITE_CREATE_TEMP_VIEW      6   /* View Name       NULL            */
+#define SQLITE_CREATE_TRIGGER        7   /* Trigger Name    Table Name      */
+#define SQLITE_CREATE_VIEW           8   /* View Name       NULL            */
+#define SQLITE_DELETE                9   /* Table Name      NULL            */
+#define SQLITE_DROP_INDEX           10   /* Index Name      Table Name      */
+#define SQLITE_DROP_TABLE           11   /* Table Name      NULL            */
+#define SQLITE_DROP_TEMP_INDEX      12   /* Index Name      Table Name      */
+#define SQLITE_DROP_TEMP_TABLE      13   /* Table Name      NULL            */
+#define SQLITE_DROP_TEMP_TRIGGER    14   /* Trigger Name    Table Name      */
+#define SQLITE_DROP_TEMP_VIEW       15   /* View Name       NULL            */
+#define SQLITE_DROP_TRIGGER         16   /* Trigger Name    Table Name      */
+#define SQLITE_DROP_VIEW            17   /* View Name       NULL            */
+#define SQLITE_INSERT               18   /* Table Name      NULL            */
+#define SQLITE_PRAGMA               19   /* Pragma Name     1st arg or NULL */
+#define SQLITE_READ                 20   /* Table Name      Column Name     */
+#define SQLITE_SELECT               21   /* NULL            NULL            */
+#define SQLITE_TRANSACTION          22   /* NULL            NULL            */
+#define SQLITE_UPDATE               23   /* Table Name      Column Name     */
+#define SQLITE_ATTACH               24   /* Filename        NULL            */
+#define SQLITE_DETACH               25   /* Database Name   NULL            */
+#define SQLITE_ALTER_TABLE          26   /* Database Name   Table Name      */
+#define SQLITE_REINDEX              27   /* Index Name      NULL            */
+#define SQLITE_ANALYZE              28   /* Table Name      NULL            */
+#define SQLITE_CREATE_VTABLE        29   /* Table Name      Module Name     */
+#define SQLITE_DROP_VTABLE          30   /* Table Name      Module Name     */
+#define SQLITE_FUNCTION             31   /* Function Name   NULL            */
+#define SQLITE_COPY                  0   /* No longer used */
+
+/*
+** CAPI3REF: Tracing And Profiling Functions {F12280}
+**
+** These routines register callback functions that can be used for
+** tracing and profiling the execution of SQL statements.
+**
+** The callback function registered by sqlite3_trace() is invoked at
+** various times when an SQL statement is being run by [sqlite3_step()].
+** The callback returns a UTF-8 rendering of the SQL statement text
+** as the statement first begins executing.  Additional callbacks occur
+** as each triggersubprogram is entered.  The callbacks for triggers
+** contain a UTF-8 SQL comment that identifies the trigger.
+**
+** The callback function registered by sqlite3_profile() is invoked
+** as each SQL statement finishes.  The profile callback contains
+** the original statement text and an estimate of wall-clock time
+** of how long that statement took to run.
+**
+** The sqlite3_profile() API is currently considered experimental and
+** is subject to change or removal in a future release.
+**
+** The trigger reporting feature of the trace callback is considered
+** experimental and is subject to change or removal in future releases.
+** Future versions of SQLite might also add new trace callback
+** invocations.
+**
+** INVARIANTS:
+**
+** {F12281} The callback function registered by [sqlite3_trace()] is
+**          whenever an SQL statement first begins to execute and
+**          whenever a trigger subprogram first begins to run.
+**
+** {F12282} Each call to [sqlite3_trace()] overrides the previously
+**          registered trace callback.
+**
+** {F12283} A NULL trace callback disables tracing.
+**
+** {F12284} The first argument to the trace callback is a copy of
+**          the pointer which was the 3rd argument to [sqlite3_trace()].
+**
+** {F12285} The second argument to the trace callback is a
+**          zero-terminated UTF8 string containing the original text
+**          of the SQL statement as it was passed into [sqlite3_prepare_v2()]
+**          or the equivalent, or an SQL comment indicating the beginning
+**          of a trigger subprogram.
+**
+** {F12287} The callback function registered by [sqlite3_profile()] is invoked
+**          as each SQL statement finishes.
+**
+** {F12288} The first parameter to the profile callback is a copy of
+**          the 3rd parameter to [sqlite3_profile()].
+**
+** {F12289} The second parameter to the profile callback is a
+**          zero-terminated UTF-8 string that contains the complete text of
+**          the SQL statement as it was processed by [sqlite3_prepare_v2()]
+**          or the equivalent.
+**
+** {F12290} The third parameter to the profile  callback is an estimate
+**          of the number of nanoseconds of wall-clock time required to
+**          run the SQL statement from start to finish.
+*/
+void *sqlite3_trace(sqlite3*, void(*xTrace)(void*,const char*), void*);
+void *sqlite3_profile(sqlite3*,
+   void(*xProfile)(void*,const char*,sqlite3_uint64), void*);
+
+/*
+** CAPI3REF: Query Progress Callbacks {F12910}
+**
+** This routine configures a callback function - the
+** progress callback - that is invoked periodically during long
+** running calls to [sqlite3_exec()], [sqlite3_step()] and
+** [sqlite3_get_table()].   An example use for this
+** interface is to keep a GUI updated during a large query.
+**
+** If the progress callback returns non-zero, the opertion is
+** interrupted.  This feature can be used to implement a
+** "Cancel" button on a GUI dialog box.
+**
+** INVARIANTS:
+**
+** {F12911} The callback function registered by [sqlite3_progress_handler()]
+**          is invoked periodically during long running calls to
+**          [sqlite3_step()].
+**
+** {F12912} The progress callback is invoked once for every N virtual
+**          machine opcodes, where N is the second argument to
+**          the [sqlite3_progress_handler()] call that registered
+**          the callback.  <todo>What if N is less than 1?</todo>
+**
+** {F12913} The progress callback itself is identified by the third
+**          argument to [sqlite3_progress_handler()].
+**
+** {F12914} The fourth argument [sqlite3_progress_handler()] is a
+***         void pointer passed to the progress callback
+**          function each time it is invoked.
+**
+** {F12915} If a call to [sqlite3_step()] results in fewer than
+**          N opcodes being executed,
+**          then the progress callback is never invoked. {END}
+**
+** {F12916} Every call to [sqlite3_progress_handler()]
+**          overwrites any previously registere progress handler.
+**
+** {F12917} If the progress handler callback is NULL then no progress
+**          handler is invoked.
+**
+** {F12918} If the progress callback returns a result other than 0, then
+**          the behavior is a if [sqlite3_interrupt()] had been called.
+*/
+void sqlite3_progress_handler(sqlite3*, int, int(*)(void*), void*);
+
+/*
+** CAPI3REF: Opening A New Database Connection {F12700}
+**
+** These routines open an SQLite database file whose name
+** is given by the filename argument.
+** The filename argument is interpreted as UTF-8
+** for [sqlite3_open()] and [sqlite3_open_v2()] and as UTF-16
+** in the native byte order for [sqlite3_open16()].
+** An [sqlite3*] handle is usually returned in *ppDb, even
+** if an error occurs.  The only exception is if SQLite is unable
+** to allocate memory to hold the [sqlite3] object, a NULL will
+** be written into *ppDb instead of a pointer to the [sqlite3] object.
+** If the database is opened (and/or created)
+** successfully, then [SQLITE_OK] is returned.  Otherwise an
+** error code is returned.  The
+** [sqlite3_errmsg()] or [sqlite3_errmsg16()]  routines can be used to obtain
+** an English language description of the error.
+**
+** The default encoding for the database will be UTF-8 if
+** [sqlite3_open()] or [sqlite3_open_v2()] is called and
+** UTF-16 in the native byte order if [sqlite3_open16()] is used.
+**
+** Whether or not an error occurs when it is opened, resources
+** associated with the [sqlite3*] handle should be released by passing it
+** to [sqlite3_close()] when it is no longer required.
+**
+** The [sqlite3_open_v2()] interface works like [sqlite3_open()]
+** except that it acccepts two additional parameters for additional control
+** over the new database connection.  The flags parameter can be
+** one of:
+**
+** <ol>
+** <li>  [SQLITE_OPEN_READONLY]
+** <li>  [SQLITE_OPEN_READWRITE]
+** <li>  [SQLITE_OPEN_READWRITE] | [SQLITE_OPEN_CREATE]
+** </ol>
+**
+** The first value opens the database read-only.
+** If the database does not previously exist, an error is returned.
+** The second option opens
+** the database for reading and writing if possible, or reading only if
+** if the file is write protected.  In either case the database
+** must already exist or an error is returned.  The third option
+** opens the database for reading and writing and creates it if it does
+** not already exist.
+** The third options is behavior that is always used for [sqlite3_open()]
+** and [sqlite3_open16()].
+**
+** If the filename is ":memory:", then an private
+** in-memory database is created for the connection.  This in-memory
+** database will vanish when the database connection is closed.  Future
+** version of SQLite might make use of additional special filenames
+** that begin with the ":" character.  It is recommended that
+** when a database filename really does begin with
+** ":" that you prefix the filename with a pathname like "./" to
+** avoid ambiguity.
+**
+** If the filename is an empty string, then a private temporary
+** on-disk database will be created.  This private database will be
+** automatically deleted as soon as the database connection is closed.
+**
+** The fourth parameter to sqlite3_open_v2() is the name of the
+** [sqlite3_vfs] object that defines the operating system
+** interface that the new database connection should use.  If the
+** fourth parameter is a NULL pointer then the default [sqlite3_vfs]
+** object is used.
+**
+** <b>Note to windows users:</b>  The encoding used for the filename argument
+** of [sqlite3_open()] and [sqlite3_open_v2()] must be UTF-8, not whatever
+** codepage is currently defined.  Filenames containing international
+** characters must be converted to UTF-8 prior to passing them into
+** [sqlite3_open()] or [sqlite3_open_v2()].
+**
+** INVARIANTS:
+**
+** {F12701} The [sqlite3_open()], [sqlite3_open16()], and
+**          [sqlite3_open_v2()] interfaces create a new
+**          [database connection] associated with
+**          the database file given in their first parameter.
+**
+** {F12702} The filename argument is interpreted as UTF-8
+**          for [sqlite3_open()] and [sqlite3_open_v2()] and as UTF-16
+**          in the native byte order for [sqlite3_open16()].
+**
+** {F12703} A successful invocation of [sqlite3_open()], [sqlite3_open16()],
+**          or [sqlite3_open_v2()] writes a pointer to a new
+**          [database connection] into *ppDb.
+**
+** {F12704} The [sqlite3_open()], [sqlite3_open16()], and
+**          [sqlite3_open_v2()] interfaces return [SQLITE_OK] upon success,
+**          or an appropriate [error code] on failure.
+**
+** {F12706} The default text encoding for a new database created using
+**          [sqlite3_open()] or [sqlite3_open_v2()] will be UTF-8.
+**
+** {F12707} The default text encoding for a new database created using
+**          [sqlite3_open16()] will be UTF-16.
+**
+** {F12709} The [sqlite3_open(F,D)] interface is equivalent to
+**          [sqlite3_open_v2(F,D,G,0)] where the G parameter is
+**          [SQLITE_OPEN_READWRITE]|[SQLITE_OPEN_CREATE].
+**
+** {F12711} If the G parameter to [sqlite3_open_v2(F,D,G,V)] contains the
+**          bit value [SQLITE_OPEN_READONLY] then the database is opened
+**          for reading only.
+**
+** {F12712} If the G parameter to [sqlite3_open_v2(F,D,G,V)] contains the
+**          bit value [SQLITE_OPEN_READWRITE] then the database is opened
+**          reading and writing if possible, or for reading only if the
+**          file is write protected by the operating system.
+**
+** {F12713} If the G parameter to [sqlite3_open(v2(F,D,G,V)] omits the
+**          bit value [SQLITE_OPEN_CREATE] and the database does not
+**          previously exist, an error is returned.
+**
+** {F12714} If the G parameter to [sqlite3_open(v2(F,D,G,V)] contains the
+**          bit value [SQLITE_OPEN_CREATE] and the database does not
+**          previously exist, then an attempt is made to create and
+**          initialize the database.
+**
+** {F12717} If the filename argument to [sqlite3_open()], [sqlite3_open16()],
+**          or [sqlite3_open_v2()] is ":memory:", then an private,
+**          ephemeral, in-memory database is created for the connection.
+**          <todo>Is SQLITE_OPEN_CREATE|SQLITE_OPEN_READWRITE required
+**          in sqlite3_open_v2()?</todo>
+**
+** {F12719} If the filename is NULL or an empty string, then a private,
+**          ephermeral on-disk database will be created.
+**          <todo>Is SQLITE_OPEN_CREATE|SQLITE_OPEN_READWRITE required
+**          in sqlite3_open_v2()?</todo>
+**
+** {F12721} The [database connection] created by
+**          [sqlite3_open_v2(F,D,G,V)] will use the
+**          [sqlite3_vfs] object identified by the V parameter, or
+**          the default [sqlite3_vfs] object is V is a NULL pointer.
+*/
+int sqlite3_open(
+  const char *filename,   /* Database filename (UTF-8) */
+  sqlite3 **ppDb          /* OUT: SQLite db handle */
+);
+int sqlite3_open16(
+  const void *filename,   /* Database filename (UTF-16) */
+  sqlite3 **ppDb          /* OUT: SQLite db handle */
+);
+int sqlite3_open_v2(
+  const char *filename,   /* Database filename (UTF-8) */
+  sqlite3 **ppDb,         /* OUT: SQLite db handle */
+  int flags,              /* Flags */
+  const char *zVfs        /* Name of VFS module to use */
+);
+
+/*
+** CAPI3REF: Error Codes And Messages {F12800}
+**
+** The sqlite3_errcode() interface returns the numeric
+** [SQLITE_OK | result code] or [SQLITE_IOERR_READ | extended result code]
+** for the most recent failed sqlite3_* API call associated
+** with [sqlite3] handle 'db'. If a prior API call failed but the
+** most recent API call succeeded, the return value from sqlite3_errcode()
+** is undefined.
+**
+** The sqlite3_errmsg() and sqlite3_errmsg16() return English-language
+** text that describes the error, as either UTF8 or UTF16 respectively.
+** Memory to hold the error message string is managed internally.
+** The application does not need to worry with freeing the result.
+** However, the error string might be overwritten or deallocated by
+** subsequent calls to other SQLite interface functions.
+**
+** INVARIANTS:
+**
+** {F12801} The [sqlite3_errcode(D)] interface returns the numeric
+**          [SQLITE_OK | result code] or
+**          [SQLITE_IOERR_READ | extended result code]
+**          for the most recently failed interface call associated
+**          with [database connection] D.
+**
+** {F12803} The [sqlite3_errmsg(D)] and [sqlite3_errmsg16(D)]
+**          interfaces return English-language text that describes
+**          the error in the mostly recently failed interface call,
+**          encoded as either UTF8 or UTF16 respectively.
+**
+** {F12807} The strings returned by [sqlite3_errmsg()] and [sqlite3_errmsg16()]
+**          are valid until the next SQLite interface call.
+**
+** {F12808} Calls to API routines that do not return an error code
+**          (example: [sqlite3_data_count()]) do not
+**          change the error code or message returned by
+**          [sqlite3_errcode()], [sqlite3_errmsg()], or [sqlite3_errmsg16()].
+**
+** {F12809} Interfaces that are not associated with a specific
+**          [database connection] (examples:
+**          [sqlite3_mprintf()] or [sqlite3_enable_shared_cache()]
+**          do not change the values returned by
+**          [sqlite3_errcode()], [sqlite3_errmsg()], or [sqlite3_errmsg16()].
+*/
+int sqlite3_errcode(sqlite3 *db);
+const char *sqlite3_errmsg(sqlite3*);
+const void *sqlite3_errmsg16(sqlite3*);
+
+/*
+** CAPI3REF: SQL Statement Object {F13000}
+** KEYWORDS: {prepared statement} {prepared statements}
+**
+** An instance of this object represent single SQL statements.  This
+** object is variously known as a "prepared statement" or a
+** "compiled SQL statement" or simply as a "statement".
+**
+** The life of a statement object goes something like this:
+**
+** <ol>
+** <li> Create the object using [sqlite3_prepare_v2()] or a related
+**      function.
+** <li> Bind values to host parameters using
+**      [sqlite3_bind_blob | sqlite3_bind_* interfaces].
+** <li> Run the SQL by calling [sqlite3_step()] one or more times.
+** <li> Reset the statement using [sqlite3_reset()] then go back
+**      to step 2.  Do this zero or more times.
+** <li> Destroy the object using [sqlite3_finalize()].
+** </ol>
+**
+** Refer to documentation on individual methods above for additional
+** information.
+*/
+typedef struct sqlite3_stmt sqlite3_stmt;
+
+/*
+** CAPI3REF: Compiling An SQL Statement {F13010}
+**
+** To execute an SQL query, it must first be compiled into a byte-code
+** program using one of these routines.
+**
+** The first argument "db" is an [database connection]
+** obtained from a prior call to [sqlite3_open()], [sqlite3_open_v2()]
+** or [sqlite3_open16()].
+** The second argument "zSql" is the statement to be compiled, encoded
+** as either UTF-8 or UTF-16.  The sqlite3_prepare() and sqlite3_prepare_v2()
+** interfaces uses UTF-8 and sqlite3_prepare16() and sqlite3_prepare16_v2()
+** use UTF-16. {END}
+**
+** If the nByte argument is less
+** than zero, then zSql is read up to the first zero terminator.
+** If nByte is non-negative, then it is the maximum number of
+** bytes read from zSql.  When nByte is non-negative, the
+** zSql string ends at either the first '\000' or '\u0000' character or
+** until the nByte-th byte, whichever comes first. {END}
+**
+** *pzTail is made to point to the first byte past the end of the
+** first SQL statement in zSql.  These routines only compiles the first
+** statement in zSql, so *pzTail is left pointing to what remains
+** uncompiled.
+**
+** *ppStmt is left pointing to a compiled [prepared statement] that can be
+** executed using [sqlite3_step()].  Or if there is an error, *ppStmt is
+** set to NULL.  If the input text contains no SQL (if the input
+** is and empty string or a comment) then *ppStmt is set to NULL.
+** {U13018} The calling procedure is responsible for deleting the
+** compiled SQL statement
+** using [sqlite3_finalize()] after it has finished with it.
+**
+** On success, [SQLITE_OK] is returned.  Otherwise an
+** [error code] is returned.
+**
+** The sqlite3_prepare_v2() and sqlite3_prepare16_v2() interfaces are
+** recommended for all new programs. The two older interfaces are retained
+** for backwards compatibility, but their use is discouraged.
+** In the "v2" interfaces, the prepared statement
+** that is returned (the [sqlite3_stmt] object) contains a copy of the
+** original SQL text. {END} This causes the [sqlite3_step()] interface to
+** behave a differently in two ways:
+**
+** <ol>
+** <li>
+** If the database schema changes, instead of returning [SQLITE_SCHEMA] as it
+** always used to do, [sqlite3_step()] will automatically recompile the SQL
+** statement and try to run it again.  If the schema has changed in
+** a way that makes the statement no longer valid, [sqlite3_step()] will still
+** return [SQLITE_SCHEMA].  But unlike the legacy behavior,
+** [SQLITE_SCHEMA] is now a fatal error.  Calling
+** [sqlite3_prepare_v2()] again will not make the
+** error go away.  Note: use [sqlite3_errmsg()] to find the text
+** of the parsing error that results in an [SQLITE_SCHEMA] return. {END}
+** </li>
+**
+** <li>
+** When an error occurs,
+** [sqlite3_step()] will return one of the detailed
+** [error codes] or [extended error codes].
+** The legacy behavior was that [sqlite3_step()] would only return a generic
+** [SQLITE_ERROR] result code and you would have to make a second call to
+** [sqlite3_reset()] in order to find the underlying cause of the problem.
+** With the "v2" prepare interfaces, the underlying reason for the error is
+** returned immediately.
+** </li>
+** </ol>
+**
+** INVARIANTS:
+**
+** {F13011} The [sqlite3_prepare(db,zSql,...)] and
+**          [sqlite3_prepare_v2(db,zSql,...)] interfaces interpret the
+**          text in their zSql parameter as UTF-8.
+**
+** {F13012} The [sqlite3_prepare16(db,zSql,...)] and
+**          [sqlite3_prepare16_v2(db,zSql,...)] interfaces interpret the
+**          text in their zSql parameter as UTF-16 in the native byte order.
+**
+** {F13013} If the nByte argument to [sqlite3_prepare_v2(db,zSql,nByte,...)]
+**          and its variants is less than zero, then SQL text is
+**          read from zSql is read up to the first zero terminator.
+**
+** {F13014} If the nByte argument to [sqlite3_prepare_v2(db,zSql,nByte,...)]
+**          and its variants is non-negative, then nBytes bytes
+**          SQL text is read from zSql.
+**
+** {F13015} In [sqlite3_prepare_v2(db,zSql,N,P,pzTail)] and its variants
+**          if the zSql input text contains more than one SQL statement
+**          and pzTail is not NULL, then *pzTail is made to point to the
+**          first byte past the end of the first SQL statement in zSql.
+**          <todo>What does *pzTail point to if there is one statement?</todo>
+**
+** {F13016} A successful call to [sqlite3_prepare_v2(db,zSql,N,ppStmt,...)]
+**          or one of its variants writes into *ppStmt a pointer to a new
+**          [prepared statement] or a pointer to NULL
+**          if zSql contains nothing other than whitespace or comments.
+**
+** {F13019} The [sqlite3_prepare_v2()] interface and its variants return
+**          [SQLITE_OK] or an appropriate [error code] upon failure.
+**
+** {F13021} Before [sqlite3_prepare(db,zSql,nByte,ppStmt,pzTail)] or its
+**          variants returns an error (any value other than [SQLITE_OK])
+**          it first sets *ppStmt to NULL.
+*/
+int sqlite3_prepare(
+  sqlite3 *db,            /* Database handle */
+  const char *zSql,       /* SQL statement, UTF-8 encoded */
+  int nByte,              /* Maximum length of zSql in bytes. */
+  sqlite3_stmt **ppStmt,  /* OUT: Statement handle */
+  const char **pzTail     /* OUT: Pointer to unused portion of zSql */
+);
+int sqlite3_prepare_v2(
+  sqlite3 *db,            /* Database handle */
+  const char *zSql,       /* SQL statement, UTF-8 encoded */
+  int nByte,              /* Maximum length of zSql in bytes. */
+  sqlite3_stmt **ppStmt,  /* OUT: Statement handle */
+  const char **pzTail     /* OUT: Pointer to unused portion of zSql */
+);
+int sqlite3_prepare16(
+  sqlite3 *db,            /* Database handle */
+  const void *zSql,       /* SQL statement, UTF-16 encoded */
+  int nByte,              /* Maximum length of zSql in bytes. */
+  sqlite3_stmt **ppStmt,  /* OUT: Statement handle */
+  const void **pzTail     /* OUT: Pointer to unused portion of zSql */
+);
+int sqlite3_prepare16_v2(
+  sqlite3 *db,            /* Database handle */
+  const void *zSql,       /* SQL statement, UTF-16 encoded */
+  int nByte,              /* Maximum length of zSql in bytes. */
+  sqlite3_stmt **ppStmt,  /* OUT: Statement handle */
+  const void **pzTail     /* OUT: Pointer to unused portion of zSql */
+);
+
+/*
+** CAPIREF: Retrieving Statement SQL {F13100}
+**
+** This intereface can be used to retrieve a saved copy of the original
+** SQL text used to create a [prepared statement].
+**
+** INVARIANTS:
+**
+** {F13101} If the [prepared statement] passed as
+**          the an argument to [sqlite3_sql()] was compiled
+**          compiled using either [sqlite3_prepare_v2()] or
+**          [sqlite3_prepare16_v2()],
+**          then [sqlite3_sql()] function returns a pointer to a
+**          zero-terminated string containing a UTF-8 rendering
+**          of the original SQL statement.
+**
+** {F13102} If the [prepared statement] passed as
+**          the an argument to [sqlite3_sql()] was compiled
+**          compiled using either [sqlite3_prepare()] or
+**          [sqlite3_prepare16()],
+**          then [sqlite3_sql()] function returns a NULL pointer.
+**
+** {F13103} The string returned by [sqlite3_sql(S)] is valid until the
+**          [prepared statement] S is deleted using [sqlite3_finalize(S)].
+*/
+const char *sqlite3_sql(sqlite3_stmt *pStmt);
+
+/*
+** CAPI3REF:  Dynamically Typed Value Object  {F15000}
+**
+** SQLite uses the sqlite3_value object to represent all values
+** that are or can be stored in a database table.
+** SQLite uses dynamic typing for the values it stores.
+** Values stored in sqlite3_value objects can be
+** be integers, floating point values, strings, BLOBs, or NULL.
+*/
+typedef struct Mem sqlite3_value;
+
+/*
+** CAPI3REF:  SQL Function Context Object {F16001}
+**
+** The context in which an SQL function executes is stored in an
+** sqlite3_context object.  A pointer to an sqlite3_context
+** object is always first parameter to application-defined SQL functions.
+*/
+typedef struct sqlite3_context sqlite3_context;
+
+/*
+** CAPI3REF:  Binding Values To Prepared Statements {F13500}
+**
+** In the SQL strings input to [sqlite3_prepare_v2()] and its
+** variants, literals may be replace by a parameter in one
+** of these forms:
+**
+** <ul>
+** <li>  ?
+** <li>  ?NNN
+** <li>  :VVV
+** <li>  @VVV
+** <li>  $VVV
+** </ul>
+**
+** In the parameter forms shown above NNN is an integer literal,
+** VVV alpha-numeric parameter name.
+** The values of these parameters (also called "host parameter names"
+** or "SQL parameters")
+** can be set using the sqlite3_bind_*() routines defined here.
+**
+** The first argument to the sqlite3_bind_*() routines always
+** is a pointer to the [sqlite3_stmt] object returned from
+** [sqlite3_prepare_v2()] or its variants. The second
+** argument is the index of the parameter to be set. The
+** first parameter has an index of 1.  When the same named
+** parameter is used more than once, second and subsequent
+** occurrences have the same index as the first occurrence.
+** The index for named parameters can be looked up using the
+** [sqlite3_bind_parameter_name()] API if desired.  The index
+** for "?NNN" parameters is the value of NNN.
+** The NNN value must be between 1 and the compile-time
+** parameter SQLITE_MAX_VARIABLE_NUMBER (default value: 999).
+**
+** The third argument is the value to bind to the parameter.
+**
+** In those
+** routines that have a fourth argument, its value is the number of bytes
+** in the parameter.  To be clear: the value is the number of <u>bytes</u>
+** in the value, not the number of characters.   The number
+** of bytes does not include the zero-terminator at the end of strings.
+** If the fourth parameter is negative, the length of the string is
+** number of bytes up to the first zero terminator.
+**
+** The fifth argument to sqlite3_bind_blob(), sqlite3_bind_text(), and
+** sqlite3_bind_text16() is a destructor used to dispose of the BLOB or
+** string after SQLite has finished with it. If the fifth argument is
+** the special value [SQLITE_STATIC], then SQLite assumes that the
+** information is in static, unmanaged space and does not need to be freed.
+** If the fifth argument has the value [SQLITE_TRANSIENT], then
+** SQLite makes its own private copy of the data immediately, before
+** the sqlite3_bind_*() routine returns.
+**
+** The sqlite3_bind_zeroblob() routine binds a BLOB of length N that
+** is filled with zeros.  A zeroblob uses a fixed amount of memory
+** (just an integer to hold it size) while it is being processed.
+** Zeroblobs are intended to serve as place-holders for BLOBs whose
+** content is later written using
+** [sqlite3_blob_open | increment BLOB I/O] routines. A negative
+** value for the zeroblob results in a zero-length BLOB.
+**
+** The sqlite3_bind_*() routines must be called after
+** [sqlite3_prepare_v2()] (and its variants) or [sqlite3_reset()] and
+** before [sqlite3_step()].
+** Bindings are not cleared by the [sqlite3_reset()] routine.
+** Unbound parameters are interpreted as NULL.
+**
+** These routines return [SQLITE_OK] on success or an error code if
+** anything goes wrong.  [SQLITE_RANGE] is returned if the parameter
+** index is out of range.  [SQLITE_NOMEM] is returned if malloc fails.
+** [SQLITE_MISUSE] might be returned if these routines are called on a
+** virtual machine that is the wrong state or which has already been finalized.
+** Detection of misuse is unreliable.  Applications should not depend
+** on SQLITE_MISUSE returns.  SQLITE_MISUSE is intended to indicate a
+** a logic error in the application.  Future versions of SQLite might
+** panic rather than return SQLITE_MISUSE.
+**
+** See also: [sqlite3_bind_parameter_count()],
+** [sqlite3_bind_parameter_name()], and
+** [sqlite3_bind_parameter_index()].
+**
+** INVARIANTS:
+**
+** {F13506} The [sqlite3_prepare | SQL statement compiler] recognizes
+**          tokens of the forms "?", "?NNN", "$VVV", ":VVV", and "@VVV"
+**          as SQL parameters, where NNN is any sequence of one or more
+**          digits and where VVV is any sequence of one or more
+**          alphanumeric characters or "::" optionally followed by
+**          a string containing no spaces and contained within parentheses.
+**
+** {F13509} The initial value of an SQL parameter is NULL.
+**
+** {F13512} The index of an "?" SQL parameter is one larger than the
+**          largest index of SQL parameter to the left, or 1 if
+**          the "?" is the leftmost SQL parameter.
+**
+** {F13515} The index of an "?NNN" SQL parameter is the integer NNN.
+**
+** {F13518} The index of an ":VVV", "$VVV", or "@VVV" SQL parameter is
+**          the same as the index of leftmost occurances of the same
+**          parameter, or one more than the largest index over all
+**          parameters to the left if this is the first occurrance
+**          of this parameter, or 1 if this is the leftmost parameter.
+**
+** {F13521} The [sqlite3_prepare | SQL statement compiler] fail with
+**          an [SQLITE_RANGE] error if the index of an SQL parameter
+**          is less than 1 or greater than SQLITE_MAX_VARIABLE_NUMBER.
+**
+** {F13524} Calls to [sqlite3_bind_text | sqlite3_bind(S,N,V,...)]
+**          associate the value V with all SQL parameters having an
+**          index of N in the [prepared statement] S.
+**
+** {F13527} Calls to [sqlite3_bind_text | sqlite3_bind(S,N,...)]
+**          override prior calls with the same values of S and N.
+**
+** {F13530} Bindings established by [sqlite3_bind_text | sqlite3_bind(S,...)]
+**          persist across calls to [sqlite3_reset(S)].
+**
+** {F13533} In calls to [sqlite3_bind_blob(S,N,V,L,D)],
+**          [sqlite3_bind_text(S,N,V,L,D)], or
+**          [sqlite3_bind_text16(S,N,V,L,D)] SQLite binds the first L
+**          bytes of the blob or string pointed to by V, when L
+**          is non-negative.
+**
+** {F13536} In calls to [sqlite3_bind_text(S,N,V,L,D)] or
+**          [sqlite3_bind_text16(S,N,V,L,D)] SQLite binds characters
+**          from V through the first zero character when L is negative.
+**
+** {F13539} In calls to [sqlite3_bind_blob(S,N,V,L,D)],
+**          [sqlite3_bind_text(S,N,V,L,D)], or
+**          [sqlite3_bind_text16(S,N,V,L,D)] when D is the special
+**          constant [SQLITE_STATIC], SQLite assumes that the value V
+**          is held in static unmanaged space that will not change
+**          during the lifetime of the binding.
+**
+** {F13542} In calls to [sqlite3_bind_blob(S,N,V,L,D)],
+**          [sqlite3_bind_text(S,N,V,L,D)], or
+**          [sqlite3_bind_text16(S,N,V,L,D)] when D is the special
+**          constant [SQLITE_TRANSIENT], the routine makes a
+**          private copy of V value before it returns.
+**
+** {F13545} In calls to [sqlite3_bind_blob(S,N,V,L,D)],
+**          [sqlite3_bind_text(S,N,V,L,D)], or
+**          [sqlite3_bind_text16(S,N,V,L,D)] when D is a pointer to
+**          a function, SQLite invokes that function to destroy the
+**          V value after it has finished using the V value.
+**
+** {F13548} In calls to [sqlite3_bind_zeroblob(S,N,V,L)] the value bound
+**          is a blob of L bytes, or a zero-length blob if L is negative.
+*/
+int sqlite3_bind_blob(sqlite3_stmt*, int, const void*, int n, void(*)(void*));
+int sqlite3_bind_double(sqlite3_stmt*, int, double);
+int sqlite3_bind_int(sqlite3_stmt*, int, int);
+int sqlite3_bind_int64(sqlite3_stmt*, int, sqlite3_int64);
+int sqlite3_bind_null(sqlite3_stmt*, int);
+int sqlite3_bind_text(sqlite3_stmt*, int, const char*, int n, void(*)(void*));
+int sqlite3_bind_text16(sqlite3_stmt*, int, const void*, int, void(*)(void*));
+int sqlite3_bind_value(sqlite3_stmt*, int, const sqlite3_value*);
+int sqlite3_bind_zeroblob(sqlite3_stmt*, int, int n);
+
+/*
+** CAPI3REF: Number Of SQL Parameters {F13600}
+**
+** This routine can be used to find the number of SQL parameters
+** in a prepared statement.  SQL parameters are tokens of the
+** form "?", "?NNN", ":AAA", "$AAA", or "@AAA" that serve as
+** place-holders for values that are [sqlite3_bind_blob | bound]
+** to the parameters at a later time.
+**
+** This routine actually returns the index of the largest parameter.
+** For all forms except ?NNN, this will correspond to the number of
+** unique parameters.  If parameters of the ?NNN are used, there may
+** be gaps in the list.
+**
+** See also: [sqlite3_bind_blob|sqlite3_bind()],
+** [sqlite3_bind_parameter_name()], and
+** [sqlite3_bind_parameter_index()].
+**
+** INVARIANTS:
+**
+** {F13601} The [sqlite3_bind_parameter_count(S)] interface returns
+**          the largest index of all SQL parameters in the
+**          [prepared statement] S, or 0 if S
+**          contains no SQL parameters.
+*/
+int sqlite3_bind_parameter_count(sqlite3_stmt*);
+
+/*
+** CAPI3REF: Name Of A Host Parameter {F13620}
+**
+** This routine returns a pointer to the name of the n-th
+** SQL parameter in a [prepared statement].
+** SQL parameters of the form ":AAA" or "@AAA" or "$AAA" have a name
+** which is the string ":AAA" or "@AAA" or "$VVV".
+** In other words, the initial ":" or "$" or "@"
+** is included as part of the name.
+** Parameters of the form "?" or "?NNN" have no name.
+**
+** The first host parameter has an index of 1, not 0.
+**
+** If the value n is out of range or if the n-th parameter is
+** nameless, then NULL is returned.  The returned string is
+** always in the UTF-8 encoding even if the named parameter was
+** originally specified as UTF-16 in [sqlite3_prepare16()] or
+** [sqlite3_prepare16_v2()].
+**
+** See also: [sqlite3_bind_blob|sqlite3_bind()],
+** [sqlite3_bind_parameter_count()], and
+** [sqlite3_bind_parameter_index()].
+**
+** INVARIANTS:
+**
+** {F13621} The [sqlite3_bind_parameter_name(S,N)] interface returns
+**          a UTF-8 rendering of the name of the SQL parameter in
+**          [prepared statement] S having index N, or
+**          NULL if there is no SQL parameter with index N or if the
+**          parameter with index N is an anonymous parameter "?" or
+**          a numbered parameter "?NNN".
+*/
+const char *sqlite3_bind_parameter_name(sqlite3_stmt*, int);
+
+/*
+** CAPI3REF: Index Of A Parameter With A Given Name {F13640}
+**
+** Return the index of an SQL parameter given its name.  The
+** index value returned is suitable for use as the second
+** parameter to [sqlite3_bind_blob|sqlite3_bind()].  A zero
+** is returned if no matching parameter is found.  The parameter
+** name must be given in UTF-8 even if the original statement
+** was prepared from UTF-16 text using [sqlite3_prepare16_v2()].
+**
+** See also: [sqlite3_bind_blob|sqlite3_bind()],
+** [sqlite3_bind_parameter_count()], and
+** [sqlite3_bind_parameter_index()].
+**
+** INVARIANTS:
+**
+** {F13641} The [sqlite3_bind_parameter_index(S,N)] interface returns
+**          the index of SQL parameter in [prepared statement]
+**          S whose name matches the UTF-8 string N, or 0 if there is
+**          no match.
+*/
+int sqlite3_bind_parameter_index(sqlite3_stmt*, const char *zName);
+
+/*
+** CAPI3REF: Reset All Bindings On A Prepared Statement {F13660}
+**
+** Contrary to the intuition of many, [sqlite3_reset()] does not
+** reset the [sqlite3_bind_blob | bindings] on a
+** [prepared statement].  Use this routine to
+** reset all host parameters to NULL.
+**
+** INVARIANTS:
+**
+** {F13661} The [sqlite3_clear_bindings(S)] interface resets all
+**          SQL parameter bindings in [prepared statement] S
+**          back to NULL.
+*/
+int sqlite3_clear_bindings(sqlite3_stmt*);
+
+/*
+** CAPI3REF: Number Of Columns In A Result Set {F13710}
+**
+** Return the number of columns in the result set returned by the
+** [prepared statement]. This routine returns 0
+** if pStmt is an SQL statement that does not return data (for
+** example an UPDATE).
+**
+** INVARIANTS:
+**
+** {F13711} The [sqlite3_column_count(S)] interface returns the number of
+**          columns in the result set generated by the
+**          [prepared statement] S, or 0 if S does not generate
+**          a result set.
+*/
+int sqlite3_column_count(sqlite3_stmt *pStmt);
+
+/*
+** CAPI3REF: Column Names In A Result Set {F13720}
+**
+** These routines return the name assigned to a particular column
+** in the result set of a SELECT statement.  The sqlite3_column_name()
+** interface returns a pointer to a zero-terminated UTF8 string
+** and sqlite3_column_name16() returns a pointer to a zero-terminated
+** UTF16 string.  The first parameter is the
+** [prepared statement] that implements the SELECT statement.
+** The second parameter is the column number.  The left-most column is
+** number 0.
+**
+** The returned string pointer is valid until either the
+** [prepared statement] is destroyed by [sqlite3_finalize()]
+** or until the next call sqlite3_column_name() or sqlite3_column_name16()
+** on the same column.
+**
+** If sqlite3_malloc() fails during the processing of either routine
+** (for example during a conversion from UTF-8 to UTF-16) then a
+** NULL pointer is returned.
+**
+** The name of a result column is the value of the "AS" clause for
+** that column, if there is an AS clause.  If there is no AS clause
+** then the name of the column is unspecified and may change from
+** one release of SQLite to the next.
+**
+** INVARIANTS:
+**
+** {F13721} A successful invocation of the [sqlite3_column_name(S,N)]
+**          interface returns the name
+**          of the Nth column (where 0 is the left-most column) for the
+**          result set of [prepared statement] S as a
+**          zero-terminated UTF-8 string.
+**
+** {F13723} A successful invocation of the [sqlite3_column_name16(S,N)]
+**          interface returns the name
+**          of the Nth column (where 0 is the left-most column) for the
+**          result set of [prepared statement] S as a
+**          zero-terminated UTF-16 string in the native byte order.
+**
+** {F13724} The [sqlite3_column_name()] and [sqlite3_column_name16()]
+**          interfaces return a NULL pointer if they are unable to
+**          allocate memory memory to hold there normal return strings.
+**
+** {F13725} If the N parameter to [sqlite3_column_name(S,N)] or
+**          [sqlite3_column_name16(S,N)] is out of range, then the
+**          interfaces returns a NULL pointer.
+**
+** {F13726} The strings returned by [sqlite3_column_name(S,N)] and
+**          [sqlite3_column_name16(S,N)] are valid until the next
+**          call to either routine with the same S and N parameters
+**          or until [sqlite3_finalize(S)] is called.
+**
+** {F13727} When a result column of a [SELECT] statement contains
+**          an AS clause, the name of that column is the indentifier
+**          to the right of the AS keyword.
+*/
+const char *sqlite3_column_name(sqlite3_stmt*, int N);
+const void *sqlite3_column_name16(sqlite3_stmt*, int N);
+
+/*
+** CAPI3REF: Source Of Data In A Query Result {F13740}
+**
+** These routines provide a means to determine what column of what
+** table in which database a result of a SELECT statement comes from.
+** The name of the database or table or column can be returned as
+** either a UTF8 or UTF16 string.  The _database_ routines return
+** the database name, the _table_ routines return the table name, and
+** the origin_ routines return the column name.
+** The returned string is valid until
+** the [prepared statement] is destroyed using
+** [sqlite3_finalize()] or until the same information is requested
+** again in a different encoding.
+**
+** The names returned are the original un-aliased names of the
+** database, table, and column.
+**
+** The first argument to the following calls is a [prepared statement].
+** These functions return information about the Nth column returned by
+** the statement, where N is the second function argument.
+**
+** If the Nth column returned by the statement is an expression
+** or subquery and is not a column value, then all of these functions
+** return NULL.  These routine might also return NULL if a memory
+** allocation error occurs.  Otherwise, they return the
+** name of the attached database, table and column that query result
+** column was extracted from.
+**
+** As with all other SQLite APIs, those postfixed with "16" return
+** UTF-16 encoded strings, the other functions return UTF-8. {END}
+**
+** These APIs are only available if the library was compiled with the
+** SQLITE_ENABLE_COLUMN_METADATA preprocessor symbol defined.
+**
+** {U13751}
+** If two or more threads call one or more of these routines against the same
+** prepared statement and column at the same time then the results are
+** undefined.
+**
+** INVARIANTS:
+**
+** {F13741} The [sqlite3_column_database_name(S,N)] interface returns either
+**          the UTF-8 zero-terminated name of the database from which the
+**          Nth result column of [prepared statement] S
+**          is extracted, or NULL if the the Nth column of S is a
+**          general expression or if unable to allocate memory
+**          to store the name.
+**
+** {F13742} The [sqlite3_column_database_name16(S,N)] interface returns either
+**          the UTF-16 native byte order
+**          zero-terminated name of the database from which the
+**          Nth result column of [prepared statement] S
+**          is extracted, or NULL if the the Nth column of S is a
+**          general expression or if unable to allocate memory
+**          to store the name.
+**
+** {F13743} The [sqlite3_column_table_name(S,N)] interface returns either
+**          the UTF-8 zero-terminated name of the table from which the
+**          Nth result column of [prepared statement] S
+**          is extracted, or NULL if the the Nth column of S is a
+**          general expression or if unable to allocate memory
+**          to store the name.
+**
+** {F13744} The [sqlite3_column_table_name16(S,N)] interface returns either
+**          the UTF-16 native byte order
+**          zero-terminated name of the table from which the
+**          Nth result column of [prepared statement] S
+**          is extracted, or NULL if the the Nth column of S is a
+**          general expression or if unable to allocate memory
+**          to store the name.
+**
+** {F13745} The [sqlite3_column_origin_name(S,N)] interface returns either
+**          the UTF-8 zero-terminated name of the table column from which the
+**          Nth result column of [prepared statement] S
+**          is extracted, or NULL if the the Nth column of S is a
+**          general expression or if unable to allocate memory
+**          to store the name.
+**
+** {F13746} The [sqlite3_column_origin_name16(S,N)] interface returns either
+**          the UTF-16 native byte order
+**          zero-terminated name of the table column from which the
+**          Nth result column of [prepared statement] S
+**          is extracted, or NULL if the the Nth column of S is a
+**          general expression or if unable to allocate memory
+**          to store the name.
+**
+** {F13748} The return values from
+**          [sqlite3_column_database_name|column metadata interfaces]
+**          are valid
+**          for the lifetime of the [prepared statement]
+**          or until the encoding is changed by another metadata
+**          interface call for the same prepared statement and column.
+**
+** LIMITATIONS:
+**
+** {U13751} If two or more threads call one or more
+**          [sqlite3_column_database_name|column metadata interfaces]
+**          the same [prepared statement] and result column
+**          at the same time then the results are undefined.
+*/
+const char *sqlite3_column_database_name(sqlite3_stmt*,int);
+const void *sqlite3_column_database_name16(sqlite3_stmt*,int);
+const char *sqlite3_column_table_name(sqlite3_stmt*,int);
+const void *sqlite3_column_table_name16(sqlite3_stmt*,int);
+const char *sqlite3_column_origin_name(sqlite3_stmt*,int);
+const void *sqlite3_column_origin_name16(sqlite3_stmt*,int);
+
+/*
+** CAPI3REF: Declared Datatype Of A Query Result {F13760}
+**
+** The first parameter is a [prepared statement].
+** If this statement is a SELECT statement and the Nth column of the
+** returned result set of that SELECT is a table column (not an
+** expression or subquery) then the declared type of the table
+** column is returned.  If the Nth column of the result set is an
+** expression or subquery, then a NULL pointer is returned.
+** The returned string is always UTF-8 encoded.  {END}
+** For example, in the database schema:
+**
+** CREATE TABLE t1(c1 VARIANT);
+**
+** And the following statement compiled:
+**
+** SELECT c1 + 1, c1 FROM t1;
+**
+** Then this routine would return the string "VARIANT" for the second
+** result column (i==1), and a NULL pointer for the first result column
+** (i==0).
+**
+** SQLite uses dynamic run-time typing.  So just because a column
+** is declared to contain a particular type does not mean that the
+** data stored in that column is of the declared type.  SQLite is
+** strongly typed, but the typing is dynamic not static.  Type
+** is associated with individual values, not with the containers
+** used to hold those values.
+**
+** INVARIANTS:
+**
+** {F13761}  A successful call to [sqlite3_column_decltype(S,N)]
+**           returns a zero-terminated UTF-8 string containing the
+**           the declared datatype of the table column that appears
+**           as the Nth column (numbered from 0) of the result set to the
+**           [prepared statement] S.
+**
+** {F13762}  A successful call to [sqlite3_column_decltype16(S,N)]
+**           returns a zero-terminated UTF-16 native byte order string
+**           containing the declared datatype of the table column that appears
+**           as the Nth column (numbered from 0) of the result set to the
+**           [prepared statement] S.
+**
+** {F13763}  If N is less than 0 or N is greater than or equal to
+**           the number of columns in [prepared statement] S
+**           or if the Nth column of S is an expression or subquery rather
+**           than a table column or if a memory allocation failure
+**           occurs during encoding conversions, then
+**           calls to [sqlite3_column_decltype(S,N)] or
+**           [sqlite3_column_decltype16(S,N)] return NULL.
+*/
+const char *sqlite3_column_decltype(sqlite3_stmt*,int);
+const void *sqlite3_column_decltype16(sqlite3_stmt*,int);
+
+/*
+** CAPI3REF:  Evaluate An SQL Statement {F13200}
+**
+** After an [prepared statement] has been prepared with a call
+** to either [sqlite3_prepare_v2()] or [sqlite3_prepare16_v2()] or to one of
+** the legacy interfaces [sqlite3_prepare()] or [sqlite3_prepare16()],
+** then this function must be called one or more times to evaluate the
+** statement.
+**
+** The details of the behavior of this sqlite3_step() interface depend
+** on whether the statement was prepared using the newer "v2" interface
+** [sqlite3_prepare_v2()] and [sqlite3_prepare16_v2()] or the older legacy
+** interface [sqlite3_prepare()] and [sqlite3_prepare16()].  The use of the
+** new "v2" interface is recommended for new applications but the legacy
+** interface will continue to be supported.
+**
+** In the lagacy interface, the return value will be either [SQLITE_BUSY],
+** [SQLITE_DONE], [SQLITE_ROW], [SQLITE_ERROR], or [SQLITE_MISUSE].
+** With the "v2" interface, any of the other [SQLITE_OK | result code]
+** or [SQLITE_IOERR_READ | extended result code] might be returned as
+** well.
+**
+** [SQLITE_BUSY] means that the database engine was unable to acquire the
+** database locks it needs to do its job.  If the statement is a COMMIT
+** or occurs outside of an explicit transaction, then you can retry the
+** statement.  If the statement is not a COMMIT and occurs within a
+** explicit transaction then you should rollback the transaction before
+** continuing.
+**
+** [SQLITE_DONE] means that the statement has finished executing
+** successfully.  sqlite3_step() should not be called again on this virtual
+** machine without first calling [sqlite3_reset()] to reset the virtual
+** machine back to its initial state.
+**
+** If the SQL statement being executed returns any data, then
+** [SQLITE_ROW] is returned each time a new row of data is ready
+** for processing by the caller. The values may be accessed using
+** the [sqlite3_column_int | column access functions].
+** sqlite3_step() is called again to retrieve the next row of data.
+**
+** [SQLITE_ERROR] means that a run-time error (such as a constraint
+** violation) has occurred.  sqlite3_step() should not be called again on
+** the VM. More information may be found by calling [sqlite3_errmsg()].
+** With the legacy interface, a more specific error code (example:
+** [SQLITE_INTERRUPT], [SQLITE_SCHEMA], [SQLITE_CORRUPT], and so forth)
+** can be obtained by calling [sqlite3_reset()] on the
+** [prepared statement].  In the "v2" interface,
+** the more specific error code is returned directly by sqlite3_step().
+**
+** [SQLITE_MISUSE] means that the this routine was called inappropriately.
+** Perhaps it was called on a [prepared statement] that has
+** already been [sqlite3_finalize | finalized] or on one that had
+** previously returned [SQLITE_ERROR] or [SQLITE_DONE].  Or it could
+** be the case that the same database connection is being used by two or
+** more threads at the same moment in time.
+**
+** <b>Goofy Interface Alert:</b>
+** In the legacy interface,
+** the sqlite3_step() API always returns a generic error code,
+** [SQLITE_ERROR], following any error other than [SQLITE_BUSY]
+** and [SQLITE_MISUSE].  You must call [sqlite3_reset()] or
+** [sqlite3_finalize()] in order to find one of the specific
+** [error codes] that better describes the error.
+** We admit that this is a goofy design.  The problem has been fixed
+** with the "v2" interface.  If you prepare all of your SQL statements
+** using either [sqlite3_prepare_v2()] or [sqlite3_prepare16_v2()] instead
+** of the legacy [sqlite3_prepare()] and [sqlite3_prepare16()], then the
+** more specific [error codes] are returned directly
+** by sqlite3_step().  The use of the "v2" interface is recommended.
+**
+** INVARIANTS:
+**
+** {F13202}  If [prepared statement] S is ready to be
+**           run, then [sqlite3_step(S)] advances that prepared statement
+**           until to completion or until it is ready to return another
+**           row of the result set or an interrupt or run-time error occurs.
+**
+** {F15304}  When a call to [sqlite3_step(S)] causes the
+**           [prepared statement] S to run to completion,
+**           the function returns [SQLITE_DONE].
+**
+** {F15306}  When a call to [sqlite3_step(S)] stops because it is ready
+**           to return another row of the result set, it returns
+**           [SQLITE_ROW].
+**
+** {F15308}  If a call to [sqlite3_step(S)] encounters an
+**           [sqlite3_interrupt|interrupt] or a run-time error,
+**           it returns an appropraite error code that is not one of
+**           [SQLITE_OK], [SQLITE_ROW], or [SQLITE_DONE].
+**
+** {F15310}  If an [sqlite3_interrupt|interrupt] or run-time error
+**           occurs during a call to [sqlite3_step(S)]
+**           for a [prepared statement] S created using
+**           legacy interfaces [sqlite3_prepare()] or
+**           [sqlite3_prepare16()] then the function returns either
+**           [SQLITE_ERROR], [SQLITE_BUSY], or [SQLITE_MISUSE].
+*/
+int sqlite3_step(sqlite3_stmt*);
+
+/*
+** CAPI3REF: Number of columns in a result set {F13770}
+**
+** Return the number of values in the current row of the result set.
+**
+** INVARIANTS:
+**
+** {F13771}  After a call to [sqlite3_step(S)] that returns
+**           [SQLITE_ROW], the [sqlite3_data_count(S)] routine
+**           will return the same value as the
+**           [sqlite3_column_count(S)] function.
+**
+** {F13772}  After [sqlite3_step(S)] has returned any value other than
+**           [SQLITE_ROW] or before [sqlite3_step(S)] has been
+**           called on the [prepared statement] for
+**           the first time since it was [sqlite3_prepare|prepared]
+**           or [sqlite3_reset|reset], the [sqlite3_data_count(S)]
+**           routine returns zero.
+*/
+int sqlite3_data_count(sqlite3_stmt *pStmt);
+
+/*
+** CAPI3REF: Fundamental Datatypes {F10265}
+** KEYWORDS: SQLITE_TEXT
+**
+** {F10266}Every value in SQLite has one of five fundamental datatypes:
+**
+** <ul>
+** <li> 64-bit signed integer
+** <li> 64-bit IEEE floating point number
+** <li> string
+** <li> BLOB
+** <li> NULL
+** </ul> {END}
+**
+** These constants are codes for each of those types.
+**
+** Note that the SQLITE_TEXT constant was also used in SQLite version 2
+** for a completely different meaning.  Software that links against both
+** SQLite version 2 and SQLite version 3 should use SQLITE3_TEXT not
+** SQLITE_TEXT.
+*/
+#define SQLITE_INTEGER  1
+#define SQLITE_FLOAT    2
+#define SQLITE_BLOB     4
+#define SQLITE_NULL     5
+#ifdef SQLITE_TEXT
+# undef SQLITE_TEXT
+#else
+# define SQLITE_TEXT     3
+#endif
+#define SQLITE3_TEXT     3
+
+/*
+** CAPI3REF: Results Values From A Query {F13800}
+**
+** These routines form the "result set query" interface.
+**
+** These routines return information about
+** a single column of the current result row of a query.  In every
+** case the first argument is a pointer to the
+** [prepared statement] that is being
+** evaluated (the [sqlite3_stmt*] that was returned from
+** [sqlite3_prepare_v2()] or one of its variants) and
+** the second argument is the index of the column for which information
+** should be returned.  The left-most column of the result set
+** has an index of 0.
+**
+** If the SQL statement is not currently point to a valid row, or if the
+** the column index is out of range, the result is undefined.
+** These routines may only be called when the most recent call to
+** [sqlite3_step()] has returned [SQLITE_ROW] and neither
+** [sqlite3_reset()] nor [sqlite3_finalize()] has been call subsequently.
+** If any of these routines are called after [sqlite3_reset()] or
+** [sqlite3_finalize()] or after [sqlite3_step()] has returned
+** something other than [SQLITE_ROW], the results are undefined.
+** If [sqlite3_step()] or [sqlite3_reset()] or [sqlite3_finalize()]
+** are called from a different thread while any of these routines
+** are pending, then the results are undefined.
+**
+** The sqlite3_column_type() routine returns
+** [SQLITE_INTEGER | datatype code] for the initial data type
+** of the result column.  The returned value is one of [SQLITE_INTEGER],
+** [SQLITE_FLOAT], [SQLITE_TEXT], [SQLITE_BLOB], or [SQLITE_NULL].  The value
+** returned by sqlite3_column_type() is only meaningful if no type
+** conversions have occurred as described below.  After a type conversion,
+** the value returned by sqlite3_column_type() is undefined.  Future
+** versions of SQLite may change the behavior of sqlite3_column_type()
+** following a type conversion.
+**
+** If the result is a BLOB or UTF-8 string then the sqlite3_column_bytes()
+** routine returns the number of bytes in that BLOB or string.
+** If the result is a UTF-16 string, then sqlite3_column_bytes() converts
+** the string to UTF-8 and then returns the number of bytes.
+** If the result is a numeric value then sqlite3_column_bytes() uses
+** [sqlite3_snprintf()] to convert that value to a UTF-8 string and returns
+** the number of bytes in that string.
+** The value returned does not include the zero terminator at the end
+** of the string.  For clarity: the value returned is the number of
+** bytes in the string, not the number of characters.
+**
+** Strings returned by sqlite3_column_text() and sqlite3_column_text16(),
+** even empty strings, are always zero terminated.  The return
+** value from sqlite3_column_blob() for a zero-length blob is an arbitrary
+** pointer, possibly even a NULL pointer.
+**
+** The sqlite3_column_bytes16() routine is similar to sqlite3_column_bytes()
+** but leaves the result in UTF-16 in native byte order instead of UTF-8.
+** The zero terminator is not included in this count.
+**
+** These routines attempt to convert the value where appropriate.  For
+** example, if the internal representation is FLOAT and a text result
+** is requested, [sqlite3_snprintf()] is used internally to do the conversion
+** automatically.  The following table details the conversions that
+** are applied:
+**
+** <blockquote>
+** <table border="1">
+** <tr><th> Internal<br>Type <th> Requested<br>Type <th>  Conversion
+**
+** <tr><td>  NULL    <td> INTEGER   <td> Result is 0
+** <tr><td>  NULL    <td>  FLOAT    <td> Result is 0.0
+** <tr><td>  NULL    <td>   TEXT    <td> Result is NULL pointer
+** <tr><td>  NULL    <td>   BLOB    <td> Result is NULL pointer
+** <tr><td> INTEGER  <td>  FLOAT    <td> Convert from integer to float
+** <tr><td> INTEGER  <td>   TEXT    <td> ASCII rendering of the integer
+** <tr><td> INTEGER  <td>   BLOB    <td> Same as for INTEGER->TEXT
+** <tr><td>  FLOAT   <td> INTEGER   <td> Convert from float to integer
+** <tr><td>  FLOAT   <td>   TEXT    <td> ASCII rendering of the float
+** <tr><td>  FLOAT   <td>   BLOB    <td> Same as FLOAT->TEXT
+** <tr><td>  TEXT    <td> INTEGER   <td> Use atoi()
+** <tr><td>  TEXT    <td>  FLOAT    <td> Use atof()
+** <tr><td>  TEXT    <td>   BLOB    <td> No change
+** <tr><td>  BLOB    <td> INTEGER   <td> Convert to TEXT then use atoi()
+** <tr><td>  BLOB    <td>  FLOAT    <td> Convert to TEXT then use atof()
+** <tr><td>  BLOB    <td>   TEXT    <td> Add a zero terminator if needed
+** </table>
+** </blockquote>
+**
+** The table above makes reference to standard C library functions atoi()
+** and atof().  SQLite does not really use these functions.  It has its
+** on equavalent internal routines.  The atoi() and atof() names are
+** used in the table for brevity and because they are familiar to most
+** C programmers.
+**
+** Note that when type conversions occur, pointers returned by prior
+** calls to sqlite3_column_blob(), sqlite3_column_text(), and/or
+** sqlite3_column_text16() may be invalidated.
+** Type conversions and pointer invalidations might occur
+** in the following cases:
+**
+** <ul>
+** <li><p>  The initial content is a BLOB and sqlite3_column_text()
+**          or sqlite3_column_text16() is called.  A zero-terminator might
+**          need to be added to the string.</p></li>
+**
+** <li><p>  The initial content is UTF-8 text and sqlite3_column_bytes16() or
+**          sqlite3_column_text16() is called.  The content must be converted
+**          to UTF-16.</p></li>
+**
+** <li><p>  The initial content is UTF-16 text and sqlite3_column_bytes() or
+**          sqlite3_column_text() is called.  The content must be converted
+**          to UTF-8.</p></li>
+** </ul>
+**
+** Conversions between UTF-16be and UTF-16le are always done in place and do
+** not invalidate a prior pointer, though of course the content of the buffer
+** that the prior pointer points to will have been modified.  Other kinds
+** of conversion are done in place when it is possible, but sometime it is
+** not possible and in those cases prior pointers are invalidated.
+**
+** The safest and easiest to remember policy is to invoke these routines
+** in one of the following ways:
+**
+**  <ul>
+**  <li>sqlite3_column_text() followed by sqlite3_column_bytes()</li>
+**  <li>sqlite3_column_blob() followed by sqlite3_column_bytes()</li>
+**  <li>sqlite3_column_text16() followed by sqlite3_column_bytes16()</li>
+**  </ul>
+**
+** In other words, you should call sqlite3_column_text(), sqlite3_column_blob(),
+** or sqlite3_column_text16() first to force the result into the desired
+** format, then invoke sqlite3_column_bytes() or sqlite3_column_bytes16() to
+** find the size of the result.  Do not mix call to sqlite3_column_text() or
+** sqlite3_column_blob() with calls to sqlite3_column_bytes16().  And do not
+** mix calls to sqlite3_column_text16() with calls to sqlite3_column_bytes().
+**
+** The pointers returned are valid until a type conversion occurs as
+** described above, or until [sqlite3_step()] or [sqlite3_reset()] or
+** [sqlite3_finalize()] is called.  The memory space used to hold strings
+** and blobs is freed automatically.  Do <b>not</b> pass the pointers returned
+** [sqlite3_column_blob()], [sqlite3_column_text()], etc. into
+** [sqlite3_free()].
+**
+** If a memory allocation error occurs during the evaluation of any
+** of these routines, a default value is returned.  The default value
+** is either the integer 0, the floating point number 0.0, or a NULL
+** pointer.  Subsequent calls to [sqlite3_errcode()] will return
+** [SQLITE_NOMEM].
+**
+** INVARIANTS:
+**
+** {F13803} The [sqlite3_column_blob(S,N)] interface converts the
+**          Nth column in the current row of the result set for
+**          [prepared statement] S into a blob and then returns a
+**          pointer to the converted value.
+**
+** {F13806} The [sqlite3_column_bytes(S,N)] interface returns the
+**          number of bytes in the blob or string (exclusive of the
+**          zero terminator on the string) that was returned by the
+**          most recent call to [sqlite3_column_blob(S,N)] or
+**          [sqlite3_column_text(S,N)].
+**
+** {F13809} The [sqlite3_column_bytes16(S,N)] interface returns the
+**          number of bytes in the string (exclusive of the
+**          zero terminator on the string) that was returned by the
+**          most recent call to [sqlite3_column_text16(S,N)].
+**
+** {F13812} The [sqlite3_column_double(S,N)] interface converts the
+**          Nth column in the current row of the result set for
+**          [prepared statement] S into a floating point value and
+**          returns a copy of that value.
+**
+** {F13815} The [sqlite3_column_int(S,N)] interface converts the
+**          Nth column in the current row of the result set for
+**          [prepared statement] S into a 64-bit signed integer and
+**          returns the lower 32 bits of that integer.
+**
+** {F13818} The [sqlite3_column_int64(S,N)] interface converts the
+**          Nth column in the current row of the result set for
+**          [prepared statement] S into a 64-bit signed integer and
+**          returns a copy of that integer.
+**
+** {F13821} The [sqlite3_column_text(S,N)] interface converts the
+**          Nth column in the current row of the result set for
+**          [prepared statement] S into a zero-terminated UTF-8
+**          string and returns a pointer to that string.
+**
+** {F13824} The [sqlite3_column_text16(S,N)] interface converts the
+**          Nth column in the current row of the result set for
+**          [prepared statement] S into a zero-terminated 2-byte
+**          aligned UTF-16 native byte order
+**          string and returns a pointer to that string.
+**
+** {F13827} The [sqlite3_column_type(S,N)] interface returns
+**          one of [SQLITE_NULL], [SQLITE_INTEGER], [SQLITE_FLOAT],
+**          [SQLITE_TEXT], or [SQLITE_BLOB] as appropriate for
+**          the Nth column in the current row of the result set for
+**          [prepared statement] S.
+**
+** {F13830} The [sqlite3_column_value(S,N)] interface returns a
+**          pointer to the [sqlite3_value] object that for the
+**          Nth column in the current row of the result set for
+**          [prepared statement] S.
+*/
+const void *sqlite3_column_blob(sqlite3_stmt*, int iCol);
+int sqlite3_column_bytes(sqlite3_stmt*, int iCol);
+int sqlite3_column_bytes16(sqlite3_stmt*, int iCol);
+double sqlite3_column_double(sqlite3_stmt*, int iCol);
+int sqlite3_column_int(sqlite3_stmt*, int iCol);
+sqlite3_int64 sqlite3_column_int64(sqlite3_stmt*, int iCol);
+const unsigned char *sqlite3_column_text(sqlite3_stmt*, int iCol);
+const void *sqlite3_column_text16(sqlite3_stmt*, int iCol);
+int sqlite3_column_type(sqlite3_stmt*, int iCol);
+sqlite3_value *sqlite3_column_value(sqlite3_stmt*, int iCol);
+
+/*
+** CAPI3REF: Destroy A Prepared Statement Object {F13300}
+**
+** The sqlite3_finalize() function is called to delete a
+** [prepared statement]. If the statement was
+** executed successfully, or not executed at all, then SQLITE_OK is returned.
+** If execution of the statement failed then an
+** [error code] or [extended error code]
+** is returned.
+**
+** This routine can be called at any point during the execution of the
+** [prepared statement].  If the virtual machine has not
+** completed execution when this routine is called, that is like
+** encountering an error or an interrupt.  (See [sqlite3_interrupt()].)
+** Incomplete updates may be rolled back and transactions cancelled,
+** depending on the circumstances, and the
+** [error code] returned will be [SQLITE_ABORT].
+**
+** INVARIANTS:
+**
+** {F11302} The [sqlite3_finalize(S)] interface destroys the
+**          [prepared statement] S and releases all
+**          memory and file resources held by that object.
+**
+** {F11304} If the most recent call to [sqlite3_step(S)] for the
+**          [prepared statement] S returned an error,
+**          then [sqlite3_finalize(S)] returns that same error.
+*/
+int sqlite3_finalize(sqlite3_stmt *pStmt);
+
+/*
+** CAPI3REF: Reset A Prepared Statement Object {F13330}
+**
+** The sqlite3_reset() function is called to reset a
+** [prepared statement] object.
+** back to its initial state, ready to be re-executed.
+** Any SQL statement variables that had values bound to them using
+** the [sqlite3_bind_blob | sqlite3_bind_*() API] retain their values.
+** Use [sqlite3_clear_bindings()] to reset the bindings.
+**
+** {F11332} The [sqlite3_reset(S)] interface resets the [prepared statement] S
+**          back to the beginning of its program.
+**
+** {F11334} If the most recent call to [sqlite3_step(S)] for
+**          [prepared statement] S returned [SQLITE_ROW] or [SQLITE_DONE],
+**          or if [sqlite3_step(S)] has never before been called on S,
+**          then [sqlite3_reset(S)] returns [SQLITE_OK].
+**
+** {F11336} If the most recent call to [sqlite3_step(S)] for
+**          [prepared statement] S indicated an error, then
+**          [sqlite3_reset(S)] returns an appropriate [error code].
+**
+** {F11338} The [sqlite3_reset(S)] interface does not change the values
+**          of any [sqlite3_bind_blob|bindings] on [prepared statement] S.
+*/
+int sqlite3_reset(sqlite3_stmt *pStmt);
+
+/*
+** CAPI3REF: Create Or Redefine SQL Functions {F16100}
+** KEYWORDS: {function creation routines}
+**
+** These two functions (collectively known as
+** "function creation routines") are used to add SQL functions or aggregates
+** or to redefine the behavior of existing SQL functions or aggregates.  The
+** difference only between the two is that the second parameter, the
+** name of the (scalar) function or aggregate, is encoded in UTF-8 for
+** sqlite3_create_function() and UTF-16 for sqlite3_create_function16().
+**
+** The first parameter is the [database connection] to which the SQL
+** function is to be added.  If a single
+** program uses more than one [database connection] internally, then SQL
+** functions must be added individually to each [database connection].
+**
+** The second parameter is the name of the SQL function to be created
+** or redefined.
+** The length of the name is limited to 255 bytes, exclusive of the
+** zero-terminator.  Note that the name length limit is in bytes, not
+** characters.  Any attempt to create a function with a longer name
+** will result in an SQLITE_ERROR error.
+**
+** The third parameter is the number of arguments that the SQL function or
+** aggregate takes. If this parameter is negative, then the SQL function or
+** aggregate may take any number of arguments.
+**
+** The fourth parameter, eTextRep, specifies what
+** [SQLITE_UTF8 | text encoding] this SQL function prefers for
+** its parameters.  Any SQL function implementation should be able to work
+** work with UTF-8, UTF-16le, or UTF-16be.  But some implementations may be
+** more efficient with one encoding than another.  It is allowed to
+** invoke sqlite3_create_function() or sqlite3_create_function16() multiple
+** times with the same function but with different values of eTextRep.
+** When multiple implementations of the same function are available, SQLite
+** will pick the one that involves the least amount of data conversion.
+** If there is only a single implementation which does not care what
+** text encoding is used, then the fourth argument should be
+** [SQLITE_ANY].
+**
+** The fifth parameter is an arbitrary pointer.  The implementation
+** of the function can gain access to this pointer using
+** [sqlite3_user_data()].
+**
+** The seventh, eighth and ninth parameters, xFunc, xStep and xFinal, are
+** pointers to C-language functions that implement the SQL
+** function or aggregate. A scalar SQL function requires an implementation of
+** the xFunc callback only, NULL pointers should be passed as the xStep
+** and xFinal parameters. An aggregate SQL function requires an implementation
+** of xStep and xFinal and NULL should be passed for xFunc. To delete an
+** existing SQL function or aggregate, pass NULL for all three function
+** callback.
+**
+** It is permitted to register multiple implementations of the same
+** functions with the same name but with either differing numbers of
+** arguments or differing perferred text encodings.  SQLite will use
+** the implementation most closely matches the way in which the
+** SQL function is used.
+**
+** INVARIANTS:
+**
+** {F16103} The [sqlite3_create_function16()] interface behaves exactly
+**          like [sqlite3_create_function()] in every way except that it
+**          interprets the zFunctionName argument as
+**          zero-terminated UTF-16 native byte order instead of as a
+**          zero-terminated UTF-8.
+**
+** {F16106} A successful invocation of
+**          the [sqlite3_create_function(D,X,N,E,...)] interface registers
+**          or replaces callback functions in [database connection] D
+**          used to implement the SQL function named X with N parameters
+**          and having a perferred text encoding of E.
+**
+** {F16109} A successful call to [sqlite3_create_function(D,X,N,E,P,F,S,L)]
+**          replaces the P, F, S, and L values from any prior calls with
+**          the same D, X, N, and E values.
+**
+** {F16112} The [sqlite3_create_function(D,X,...)] interface fails with
+**          a return code of [SQLITE_ERROR] if the SQL function name X is
+**          longer than 255 bytes exclusive of the zero terminator.
+**
+** {F16118} Either F must be NULL and S and L are non-NULL or else F
+**          is non-NULL and S and L are NULL, otherwise
+**          [sqlite3_create_function(D,X,N,E,P,F,S,L)] returns [SQLITE_ERROR].
+**
+** {F16121} The [sqlite3_create_function(D,...)] interface fails with an
+**          error code of [SQLITE_BUSY] if there exist [prepared statements]
+**          associated with the [database connection] D.
+**
+** {F16124} The [sqlite3_create_function(D,X,N,...)] interface fails with an
+**          error code of [SQLITE_ERROR] if parameter N (specifying the number
+**          of arguments to the SQL function being registered) is less
+**          than -1 or greater than 127.
+**
+** {F16127} When N is non-negative, the [sqlite3_create_function(D,X,N,...)]
+**          interface causes callbacks to be invoked for the SQL function
+**          named X when the number of arguments to the SQL function is
+**          exactly N.
+**
+** {F16130} When N is -1, the [sqlite3_create_function(D,X,N,...)]
+**          interface causes callbacks to be invoked for the SQL function
+**          named X with any number of arguments.
+**
+** {F16133} When calls to [sqlite3_create_function(D,X,N,...)]
+**          specify multiple implementations of the same function X
+**          and when one implementation has N>=0 and the other has N=(-1)
+**          the implementation with a non-zero N is preferred.
+**
+** {F16136} When calls to [sqlite3_create_function(D,X,N,E,...)]
+**          specify multiple implementations of the same function X with
+**          the same number of arguments N but with different
+**          encodings E, then the implementation where E matches the
+**          database encoding is preferred.
+**
+** {F16139} For an aggregate SQL function created using
+**          [sqlite3_create_function(D,X,N,E,P,0,S,L)] the finializer
+**          function L will always be invoked exactly once if the
+**          step function S is called one or more times.
+*/
+int sqlite3_create_function(
+  sqlite3 *db,
+  const char *zFunctionName,
+  int nArg,
+  int eTextRep,
+  void *pApp,
+  void (*xFunc)(sqlite3_context*,int,sqlite3_value**),
+  void (*xStep)(sqlite3_context*,int,sqlite3_value**),
+  void (*xFinal)(sqlite3_context*)
+);
+int sqlite3_create_function16(
+  sqlite3 *db,
+  const void *zFunctionName,
+  int nArg,
+  int eTextRep,
+  void *pApp,
+  void (*xFunc)(sqlite3_context*,int,sqlite3_value**),
+  void (*xStep)(sqlite3_context*,int,sqlite3_value**),
+  void (*xFinal)(sqlite3_context*)
+);
+
+/*
+** CAPI3REF: Text Encodings {F10267}
+**
+** These constant define integer codes that represent the various
+** text encodings supported by SQLite.
+*/
+#define SQLITE_UTF8           1
+#define SQLITE_UTF16LE        2
+#define SQLITE_UTF16BE        3
+#define SQLITE_UTF16          4    /* Use native byte order */
+#define SQLITE_ANY            5    /* sqlite3_create_function only */
+#define SQLITE_UTF16_ALIGNED  8    /* sqlite3_create_collation only */
+
+/*
+** CAPI3REF: Obsolete Functions
+**
+** These functions are all now obsolete.  In order to maintain
+** backwards compatibility with older code, we continue to support
+** these functions.  However, new development projects should avoid
+** the use of these functions.  To help encourage people to avoid
+** using these functions, we are not going to tell you want they do.
+*/
+int sqlite3_aggregate_count(sqlite3_context*);
+int sqlite3_expired(sqlite3_stmt*);
+int sqlite3_transfer_bindings(sqlite3_stmt*, sqlite3_stmt*);
+int sqlite3_global_recover(void);
+void sqlite3_thread_cleanup(void);
+int sqlite3_memory_alarm(void(*)(void*,sqlite3_int64,int),void*,sqlite3_int64);
+
+/*
+** CAPI3REF: Obtaining SQL Function Parameter Values {F15100}
+**
+** The C-language implementation of SQL functions and aggregates uses
+** this set of interface routines to access the parameter values on
+** the function or aggregate.
+**
+** The xFunc (for scalar functions) or xStep (for aggregates) parameters
+** to [sqlite3_create_function()] and [sqlite3_create_function16()]
+** define callbacks that implement the SQL functions and aggregates.
+** The 4th parameter to these callbacks is an array of pointers to
+** [sqlite3_value] objects.  There is one [sqlite3_value] object for
+** each parameter to the SQL function.  These routines are used to
+** extract values from the [sqlite3_value] objects.
+**
+** These routines work just like the corresponding
+** [sqlite3_column_blob | sqlite3_column_* routines] except that
+** these routines take a single [sqlite3_value*] pointer instead
+** of an [sqlite3_stmt*] pointer and an integer column number.
+**
+** The sqlite3_value_text16() interface extracts a UTF16 string
+** in the native byte-order of the host machine.  The
+** sqlite3_value_text16be() and sqlite3_value_text16le() interfaces
+** extract UTF16 strings as big-endian and little-endian respectively.
+**
+** The sqlite3_value_numeric_type() interface attempts to apply
+** numeric affinity to the value.  This means that an attempt is
+** made to convert the value to an integer or floating point.  If
+** such a conversion is possible without loss of information (in other
+** words if the value is a string that looks like a number)
+** then the conversion is done.  Otherwise no conversion occurs.  The
+** [SQLITE_INTEGER | datatype] after conversion is returned.
+**
+** Please pay particular attention to the fact that the pointer that
+** is returned from [sqlite3_value_blob()], [sqlite3_value_text()], or
+** [sqlite3_value_text16()] can be invalidated by a subsequent call to
+** [sqlite3_value_bytes()], [sqlite3_value_bytes16()], [sqlite3_value_text()],
+** or [sqlite3_value_text16()].
+**
+** These routines must be called from the same thread as
+** the SQL function that supplied the sqlite3_value* parameters.
+** Or, if the sqlite3_value* argument comes from the [sqlite3_column_value()]
+** interface, then these routines should be called from the same thread
+** that ran [sqlite3_column_value()].
+**
+**
+** INVARIANTS:
+**
+** {F15103} The [sqlite3_value_blob(V)] interface converts the
+**          [sqlite3_value] object V into a blob and then returns a
+**          pointer to the converted value.
+**
+** {F15106} The [sqlite3_value_bytes(V)] interface returns the
+**          number of bytes in the blob or string (exclusive of the
+**          zero terminator on the string) that was returned by the
+**          most recent call to [sqlite3_value_blob(V)] or
+**          [sqlite3_value_text(V)].
+**
+** {F15109} The [sqlite3_value_bytes16(V)] interface returns the
+**          number of bytes in the string (exclusive of the
+**          zero terminator on the string) that was returned by the
+**          most recent call to [sqlite3_value_text16(V)],
+**          [sqlite3_value_text16be(V)], or [sqlite3_value_text16le(V)].
+**
+** {F15112} The [sqlite3_value_double(V)] interface converts the
+**          [sqlite3_value] object V into a floating point value and
+**          returns a copy of that value.
+**
+** {F15115} The [sqlite3_value_int(V)] interface converts the
+**          [sqlite3_value] object V into a 64-bit signed integer and
+**          returns the lower 32 bits of that integer.
+**
+** {F15118} The [sqlite3_value_int64(V)] interface converts the
+**          [sqlite3_value] object V into a 64-bit signed integer and
+**          returns a copy of that integer.
+**
+** {F15121} The [sqlite3_value_text(V)] interface converts the
+**          [sqlite3_value] object V into a zero-terminated UTF-8
+**          string and returns a pointer to that string.
+**
+** {F15124} The [sqlite3_value_text16(V)] interface converts the
+**          [sqlite3_value] object V into a zero-terminated 2-byte
+**          aligned UTF-16 native byte order
+**          string and returns a pointer to that string.
+**
+** {F15127} The [sqlite3_value_text16be(V)] interface converts the
+**          [sqlite3_value] object V into a zero-terminated 2-byte
+**          aligned UTF-16 big-endian
+**          string and returns a pointer to that string.
+**
+** {F15130} The [sqlite3_value_text16le(V)] interface converts the
+**          [sqlite3_value] object V into a zero-terminated 2-byte
+**          aligned UTF-16 little-endian
+**          string and returns a pointer to that string.
+**
+** {F15133} The [sqlite3_value_type(V)] interface returns
+**          one of [SQLITE_NULL], [SQLITE_INTEGER], [SQLITE_FLOAT],
+**          [SQLITE_TEXT], or [SQLITE_BLOB] as appropriate for
+**          the [sqlite3_value] object V.
+**
+** {F15136} The [sqlite3_value_numeric_type(V)] interface converts
+**          the [sqlite3_value] object V into either an integer or
+**          a floating point value if it can do so without loss of
+**          information, and returns one of [SQLITE_NULL],
+**          [SQLITE_INTEGER], [SQLITE_FLOAT], [SQLITE_TEXT], or
+**          [SQLITE_BLOB] as appropriate for
+**          the [sqlite3_value] object V after the conversion attempt.
+*/
+const void *sqlite3_value_blob(sqlite3_value*);
+int sqlite3_value_bytes(sqlite3_value*);
+int sqlite3_value_bytes16(sqlite3_value*);
+double sqlite3_value_double(sqlite3_value*);
+int sqlite3_value_int(sqlite3_value*);
+sqlite3_int64 sqlite3_value_int64(sqlite3_value*);
+const unsigned char *sqlite3_value_text(sqlite3_value*);
+const void *sqlite3_value_text16(sqlite3_value*);
+const void *sqlite3_value_text16le(sqlite3_value*);
+const void *sqlite3_value_text16be(sqlite3_value*);
+int sqlite3_value_type(sqlite3_value*);
+int sqlite3_value_numeric_type(sqlite3_value*);
+
+/*
+** CAPI3REF: Obtain Aggregate Function Context {F16210}
+**
+** The implementation of aggregate SQL functions use this routine to allocate
+** a structure for storing their state.
+** The first time the sqlite3_aggregate_context() routine is
+** is called for a particular aggregate, SQLite allocates nBytes of memory
+** zeros that memory, and returns a pointer to it.
+** On second and subsequent calls to sqlite3_aggregate_context()
+** for the same aggregate function index, the same buffer is returned.
+** The implementation
+** of the aggregate can use the returned buffer to accumulate data.
+**
+** SQLite automatically frees the allocated buffer when the aggregate
+** query concludes.
+**
+** The first parameter should be a copy of the
+** [sqlite3_context | SQL function context] that is the first
+** parameter to the callback routine that implements the aggregate
+** function.
+**
+** This routine must be called from the same thread in which
+** the aggregate SQL function is running.
+**
+** INVARIANTS:
+**
+** {F16211} The first invocation of [sqlite3_aggregate_context(C,N)] for
+**          a particular instance of an aggregate function (for a particular
+**          context C) causes SQLite to allocation N bytes of memory,
+**          zero that memory, and return a pointer to the allocationed
+**          memory.
+**
+** {F16213} If a memory allocation error occurs during
+**          [sqlite3_aggregate_context(C,N)] then the function returns 0.
+**
+** {F16215} Second and subsequent invocations of
+**          [sqlite3_aggregate_context(C,N)] for the same context pointer C
+**          ignore the N parameter and return a pointer to the same
+**          block of memory returned by the first invocation.
+**
+** {F16217} The memory allocated by [sqlite3_aggregate_context(C,N)] is
+**          automatically freed on the next call to [sqlite3_reset()]
+**          or [sqlite3_finalize()] for the [prepared statement] containing
+**          the aggregate function associated with context C.
+*/
+void *sqlite3_aggregate_context(sqlite3_context*, int nBytes);
+
+/*
+** CAPI3REF: User Data For Functions {F16240}
+**
+** The sqlite3_user_data() interface returns a copy of
+** the pointer that was the pUserData parameter (the 5th parameter)
+** of the the [sqlite3_create_function()]
+** and [sqlite3_create_function16()] routines that originally
+** registered the application defined function. {END}
+**
+** This routine must be called from the same thread in which
+** the application-defined function is running.
+**
+** INVARIANTS:
+**
+** {F16243} The [sqlite3_user_data(C)] interface returns a copy of the
+**          P pointer from the [sqlite3_create_function(D,X,N,E,P,F,S,L)]
+**          or [sqlite3_create_function16(D,X,N,E,P,F,S,L)] call that
+**          registered the SQL function associated with
+**          [sqlite3_context] C.
+*/
+void *sqlite3_user_data(sqlite3_context*);
+
+/*
+** CAPI3REF: Function Auxiliary Data {F16270}
+**
+** The following two functions may be used by scalar SQL functions to
+** associate meta-data with argument values. If the same value is passed to
+** multiple invocations of the same SQL function during query execution, under
+** some circumstances the associated meta-data may be preserved. This may
+** be used, for example, to add a regular-expression matching scalar
+** function. The compiled version of the regular expression is stored as
+** meta-data associated with the SQL value passed as the regular expression
+** pattern.  The compiled regular expression can be reused on multiple
+** invocations of the same function so that the original pattern string
+** does not need to be recompiled on each invocation.
+**
+** The sqlite3_get_auxdata() interface returns a pointer to the meta-data
+** associated by the sqlite3_set_auxdata() function with the Nth argument
+** value to the application-defined function.
+** If no meta-data has been ever been set for the Nth
+** argument of the function, or if the cooresponding function parameter
+** has changed since the meta-data was set, then sqlite3_get_auxdata()
+** returns a NULL pointer.
+**
+** The sqlite3_set_auxdata() interface saves the meta-data
+** pointed to by its 3rd parameter as the meta-data for the N-th
+** argument of the application-defined function.  Subsequent
+** calls to sqlite3_get_auxdata() might return this data, if it has
+** not been destroyed.
+** If it is not NULL, SQLite will invoke the destructor
+** function given by the 4th parameter to sqlite3_set_auxdata() on
+** the meta-data when the corresponding function parameter changes
+** or when the SQL statement completes, whichever comes first.
+**
+** SQLite is free to call the destructor and drop meta-data on
+** any parameter of any function at any time.  The only guarantee
+** is that the destructor will be called before the metadata is
+** dropped.
+**
+** In practice, meta-data is preserved between function calls for
+** expressions that are constant at compile time. This includes literal
+** values and SQL variables.
+**
+** These routines must be called from the same thread in which
+** the SQL function is running.
+**
+** INVARIANTS:
+**
+** {F16272} The [sqlite3_get_auxdata(C,N)] interface returns a pointer
+**          to metadata associated with the Nth parameter of the SQL function
+**          whose context is C, or NULL if there is no metadata associated
+**          with that parameter.
+**
+** {F16274} The [sqlite3_set_auxdata(C,N,P,D)] interface assigns a metadata
+**          pointer P to the Nth parameter of the SQL function with context
+**          C.
+**
+** {F16276} SQLite will invoke the destructor D with a single argument
+**          which is the metadata pointer P following a call to
+**          [sqlite3_set_auxdata(C,N,P,D)] when SQLite ceases to hold
+**          the metadata.
+**
+** {F16277} SQLite ceases to hold metadata for an SQL function parameter
+**          when the value of that parameter changes.
+**
+** {F16278} When [sqlite3_set_auxdata(C,N,P,D)] is invoked, the destructor
+**          is called for any prior metadata associated with the same function
+**          context C and parameter N.
+**
+** {F16279} SQLite will call destructors for any metadata it is holding
+**          in a particular [prepared statement] S when either
+**          [sqlite3_reset(S)] or [sqlite3_finalize(S)] is called.
+*/
+void *sqlite3_get_auxdata(sqlite3_context*, int N);
+void sqlite3_set_auxdata(sqlite3_context*, int N, void*, void (*)(void*));
+
+
+/*
+** CAPI3REF: Constants Defining Special Destructor Behavior {F10280}
+**
+** These are special value for the destructor that is passed in as the
+** final argument to routines like [sqlite3_result_blob()].  If the destructor
+** argument is SQLITE_STATIC, it means that the content pointer is constant
+** and will never change.  It does not need to be destroyed.  The
+** SQLITE_TRANSIENT value means that the content will likely change in
+** the near future and that SQLite should make its own private copy of
+** the content before returning.
+**
+** The typedef is necessary to work around problems in certain
+** C++ compilers.  See ticket #2191.
+*/
+typedef void (*sqlite3_destructor_type)(void*);
+#define SQLITE_STATIC      ((sqlite3_destructor_type)0)
+#define SQLITE_TRANSIENT   ((sqlite3_destructor_type)-1)
+
+/*
+** CAPI3REF: Setting The Result Of An SQL Function {F16400}
+**
+** These routines are used by the xFunc or xFinal callbacks that
+** implement SQL functions and aggregates.  See
+** [sqlite3_create_function()] and [sqlite3_create_function16()]
+** for additional information.
+**
+** These functions work very much like the
+** [sqlite3_bind_blob | sqlite3_bind_*] family of functions used
+** to bind values to host parameters in prepared statements.
+** Refer to the
+** [sqlite3_bind_blob | sqlite3_bind_* documentation] for
+** additional information.
+**
+** The sqlite3_result_blob() interface sets the result from
+** an application defined function to be the BLOB whose content is pointed
+** to by the second parameter and which is N bytes long where N is the
+** third parameter.
+** The sqlite3_result_zeroblob() inerfaces set the result of
+** the application defined function to be a BLOB containing all zero
+** bytes and N bytes in size, where N is the value of the 2nd parameter.
+**
+** The sqlite3_result_double() interface sets the result from
+** an application defined function to be a floating point value specified
+** by its 2nd argument.
+**
+** The sqlite3_result_error() and sqlite3_result_error16() functions
+** cause the implemented SQL function to throw an exception.
+** SQLite uses the string pointed to by the
+** 2nd parameter of sqlite3_result_error() or sqlite3_result_error16()
+** as the text of an error message.  SQLite interprets the error
+** message string from sqlite3_result_error() as UTF8. SQLite
+** interprets the string from sqlite3_result_error16() as UTF16 in native
+** byte order.  If the third parameter to sqlite3_result_error()
+** or sqlite3_result_error16() is negative then SQLite takes as the error
+** message all text up through the first zero character.
+** If the third parameter to sqlite3_result_error() or
+** sqlite3_result_error16() is non-negative then SQLite takes that many
+** bytes (not characters) from the 2nd parameter as the error message.
+** The sqlite3_result_error() and sqlite3_result_error16()
+** routines make a copy private copy of the error message text before
+** they return.  Hence, the calling function can deallocate or
+** modify the text after they return without harm.
+** The sqlite3_result_error_code() function changes the error code
+** returned by SQLite as a result of an error in a function.  By default,
+** the error code is SQLITE_ERROR.
+**
+** The sqlite3_result_toobig() interface causes SQLite
+** to throw an error indicating that a string or BLOB is to long
+** to represent.  The sqlite3_result_nomem() interface
+** causes SQLite to throw an exception indicating that the a
+** memory allocation failed.
+**
+** The sqlite3_result_int() interface sets the return value
+** of the application-defined function to be the 32-bit signed integer
+** value given in the 2nd argument.
+** The sqlite3_result_int64() interface sets the return value
+** of the application-defined function to be the 64-bit signed integer
+** value given in the 2nd argument.
+**
+** The sqlite3_result_null() interface sets the return value
+** of the application-defined function to be NULL.
+**
+** The sqlite3_result_text(), sqlite3_result_text16(),
+** sqlite3_result_text16le(), and sqlite3_result_text16be() interfaces
+** set the return value of the application-defined function to be
+** a text string which is represented as UTF-8, UTF-16 native byte order,
+** UTF-16 little endian, or UTF-16 big endian, respectively.
+** SQLite takes the text result from the application from
+** the 2nd parameter of the sqlite3_result_text* interfaces.
+** If the 3rd parameter to the sqlite3_result_text* interfaces
+** is negative, then SQLite takes result text from the 2nd parameter
+** through the first zero character.
+** If the 3rd parameter to the sqlite3_result_text* interfaces
+** is non-negative, then as many bytes (not characters) of the text
+** pointed to by the 2nd parameter are taken as the application-defined
+** function result.
+** If the 4th parameter to the sqlite3_result_text* interfaces
+** or sqlite3_result_blob is a non-NULL pointer, then SQLite calls that
+** function as the destructor on the text or blob result when it has
+** finished using that result.
+** If the 4th parameter to the sqlite3_result_text* interfaces
+** or sqlite3_result_blob is the special constant SQLITE_STATIC, then
+** SQLite assumes that the text or blob result is constant space and
+** does not copy the space or call a destructor when it has
+** finished using that result.
+** If the 4th parameter to the sqlite3_result_text* interfaces
+** or sqlite3_result_blob is the special constant SQLITE_TRANSIENT
+** then SQLite makes a copy of the result into space obtained from
+** from [sqlite3_malloc()] before it returns.
+**
+** The sqlite3_result_value() interface sets the result of
+** the application-defined function to be a copy the [sqlite3_value]
+** object specified by the 2nd parameter.  The
+** sqlite3_result_value() interface makes a copy of the [sqlite3_value]
+** so that [sqlite3_value] specified in the parameter may change or
+** be deallocated after sqlite3_result_value() returns without harm.
+**
+** If these routines are called from within the different thread
+** than the one containing the application-defined function that recieved
+** the [sqlite3_context] pointer, the results are undefined.
+**
+** INVARIANTS:
+**
+** {F16403} The default return value from any SQL function is NULL.
+**
+** {F16406} The [sqlite3_result_blob(C,V,N,D)] interface changes the
+**          return value of function C to be a blob that is N bytes
+**          in length and with content pointed to by V.
+**
+** {F16409} The [sqlite3_result_double(C,V)] interface changes the
+**          return value of function C to be the floating point value V.
+**
+** {F16412} The [sqlite3_result_error(C,V,N)] interface changes the return
+**          value of function C to be an exception with error code
+**          [SQLITE_ERROR] and a UTF8 error message copied from V up to the
+**          first zero byte or until N bytes are read if N is positive.
+**
+** {F16415} The [sqlite3_result_error16(C,V,N)] interface changes the return
+**          value of function C to be an exception with error code
+**          [SQLITE_ERROR] and a UTF16 native byte order error message
+**          copied from V up to the first zero terminator or until N bytes
+**          are read if N is positive.
+**
+** {F16418} The [sqlite3_result_error_toobig(C)] interface changes the return
+**          value of the function C to be an exception with error code
+**          [SQLITE_TOOBIG] and an appropriate error message.
+**
+** {F16421} The [sqlite3_result_error_nomem(C)] interface changes the return
+**          value of the function C to be an exception with error code
+**          [SQLITE_NOMEM] and an appropriate error message.
+**
+** {F16424} The [sqlite3_result_error_code(C,E)] interface changes the return
+**          value of the function C to be an exception with error code E.
+**          The error message text is unchanged.
+**
+** {F16427} The [sqlite3_result_int(C,V)] interface changes the
+**          return value of function C to be the 32-bit integer value V.
+**
+** {F16430} The [sqlite3_result_int64(C,V)] interface changes the
+**          return value of function C to be the 64-bit integer value V.
+**
+** {F16433} The [sqlite3_result_null(C)] interface changes the
+**          return value of function C to be NULL.
+**
+** {F16436} The [sqlite3_result_text(C,V,N,D)] interface changes the
+**          return value of function C to be the UTF8 string
+**          V up through the first zero or until N bytes are read if N
+**          is positive.
+**
+** {F16439} The [sqlite3_result_text16(C,V,N,D)] interface changes the
+**          return value of function C to be the UTF16 native byte order
+**          string  V up through the first zero or until N bytes are read if N
+**          is positive.
+**
+** {F16442} The [sqlite3_result_text16be(C,V,N,D)] interface changes the
+**          return value of function C to be the UTF16 big-endian
+**          string  V up through the first zero or until N bytes are read if N
+**          is positive.
+**
+** {F16445} The [sqlite3_result_text16le(C,V,N,D)] interface changes the
+**          return value of function C to be the UTF16 little-endian
+**          string  V up through the first zero or until N bytes are read if N
+**          is positive.
+**
+** {F16448} The [sqlite3_result_value(C,V)] interface changes the
+**          return value of function C to be [sqlite3_value] object V.
+**
+** {F16451} The [sqlite3_result_zeroblob(C,N)] interface changes the
+**          return value of function C to be an N-byte blob of all zeros.
+**
+** {F16454} The [sqlite3_result_error()] and [sqlite3_result_error16()]
+**          interfaces make a copy of their error message strings before
+**          returning.
+**
+** {F16457} If the D destructor parameter to [sqlite3_result_blob(C,V,N,D)],
+**          [sqlite3_result_text(C,V,N,D)], [sqlite3_result_text16(C,V,N,D)],
+**          [sqlite3_result_text16be(C,V,N,D)], or
+**          [sqlite3_result_text16le(C,V,N,D)] is the constant [SQLITE_STATIC]
+**          then no destructor is ever called on the pointer V and SQLite
+**          assumes that V is immutable.
+**
+** {F16460} If the D destructor parameter to [sqlite3_result_blob(C,V,N,D)],
+**          [sqlite3_result_text(C,V,N,D)], [sqlite3_result_text16(C,V,N,D)],
+**          [sqlite3_result_text16be(C,V,N,D)], or
+**          [sqlite3_result_text16le(C,V,N,D)] is the constant
+**          [SQLITE_TRANSIENT] then the interfaces makes a copy of the
+**          content of V and retains the copy.
+**
+** {F16463} If the D destructor parameter to [sqlite3_result_blob(C,V,N,D)],
+**          [sqlite3_result_text(C,V,N,D)], [sqlite3_result_text16(C,V,N,D)],
+**          [sqlite3_result_text16be(C,V,N,D)], or
+**          [sqlite3_result_text16le(C,V,N,D)] is some value other than
+**          the constants [SQLITE_STATIC] and [SQLITE_TRANSIENT] then
+**          SQLite will invoke the destructor D with V as its only argument
+**          when it has finished with the V value.
+*/
+void sqlite3_result_blob(sqlite3_context*, const void*, int, void(*)(void*));
+void sqlite3_result_double(sqlite3_context*, double);
+void sqlite3_result_error(sqlite3_context*, const char*, int);
+void sqlite3_result_error16(sqlite3_context*, const void*, int);
+void sqlite3_result_error_toobig(sqlite3_context*);
+void sqlite3_result_error_nomem(sqlite3_context*);
+void sqlite3_result_error_code(sqlite3_context*, int);
+void sqlite3_result_int(sqlite3_context*, int);
+void sqlite3_result_int64(sqlite3_context*, sqlite3_int64);
+void sqlite3_result_null(sqlite3_context*);
+void sqlite3_result_text(sqlite3_context*, const char*, int, void(*)(void*));
+void sqlite3_result_text16(sqlite3_context*, const void*, int, void(*)(void*));
+void sqlite3_result_text16le(sqlite3_context*, const void*, int,void(*)(void*));
+void sqlite3_result_text16be(sqlite3_context*, const void*, int,void(*)(void*));
+void sqlite3_result_value(sqlite3_context*, sqlite3_value*);
+void sqlite3_result_zeroblob(sqlite3_context*, int n);
+
+/*
+** CAPI3REF: Define New Collating Sequences {F16600}
+**
+** These functions are used to add new collation sequences to the
+** [sqlite3*] handle specified as the first argument.
+**
+** The name of the new collation sequence is specified as a UTF-8 string
+** for sqlite3_create_collation() and sqlite3_create_collation_v2()
+** and a UTF-16 string for sqlite3_create_collation16(). In all cases
+** the name is passed as the second function argument.
+**
+** The third argument may be one of the constants [SQLITE_UTF8],
+** [SQLITE_UTF16LE] or [SQLITE_UTF16BE], indicating that the user-supplied
+** routine expects to be passed pointers to strings encoded using UTF-8,
+** UTF-16 little-endian or UTF-16 big-endian respectively. The
+** third argument might also be [SQLITE_UTF16_ALIGNED] to indicate that
+** the routine expects pointers to 16-bit word aligned strings
+** of UTF16 in the native byte order of the host computer.
+**
+** A pointer to the user supplied routine must be passed as the fifth
+** argument.  If it is NULL, this is the same as deleting the collation
+** sequence (so that SQLite cannot call it anymore).
+** Each time the application
+** supplied function is invoked, it is passed a copy of the void* passed as
+** the fourth argument to sqlite3_create_collation() or
+** sqlite3_create_collation16() as its first parameter.
+**
+** The remaining arguments to the application-supplied routine are two strings,
+** each represented by a (length, data) pair and encoded in the encoding
+** that was passed as the third argument when the collation sequence was
+** registered. {END} The application defined collation routine should
+** return negative, zero or positive if
+** the first string is less than, equal to, or greater than the second
+** string. i.e. (STRING1 - STRING2).
+**
+** The sqlite3_create_collation_v2() works like sqlite3_create_collation()
+** excapt that it takes an extra argument which is a destructor for
+** the collation.  The destructor is called when the collation is
+** destroyed and is passed a copy of the fourth parameter void* pointer
+** of the sqlite3_create_collation_v2().
+** Collations are destroyed when
+** they are overridden by later calls to the collation creation functions
+** or when the [sqlite3*] database handle is closed using [sqlite3_close()].
+**
+** INVARIANTS:
+**
+** {F16603} A successful call to the
+**          [sqlite3_create_collation_v2(B,X,E,P,F,D)] interface
+**          registers function F as the comparison function used to
+**          implement collation X on [database connection] B for
+**          databases having encoding E.
+**
+** {F16604} SQLite understands the X parameter to
+**          [sqlite3_create_collation_v2(B,X,E,P,F,D)] as a zero-terminated
+**          UTF-8 string in which case is ignored for ASCII characters and
+**          is significant for non-ASCII characters.
+**
+** {F16606} Successive calls to [sqlite3_create_collation_v2(B,X,E,P,F,D)]
+**          with the same values for B, X, and E, override prior values
+**          of P, F, and D.
+**
+** {F16609} The destructor D in [sqlite3_create_collation_v2(B,X,E,P,F,D)]
+**          is not NULL then it is called with argument P when the
+**          collating function is dropped by SQLite.
+**
+** {F16612} A collating function is dropped when it is overloaded.
+**
+** {F16615} A collating function is dropped when the database connection
+**          is closed using [sqlite3_close()].
+**
+** {F16618} The pointer P in [sqlite3_create_collation_v2(B,X,E,P,F,D)]
+**          is passed through as the first parameter to the comparison
+**          function F for all subsequent invocations of F.
+**
+** {F16621} A call to [sqlite3_create_collation(B,X,E,P,F)] is exactly
+**          the same as a call to [sqlite3_create_collation_v2()] with
+**          the same parameters and a NULL destructor.
+**
+** {F16624} Following a [sqlite3_create_collation_v2(B,X,E,P,F,D)],
+**          SQLite uses the comparison function F for all text comparison
+**          operations on [database connection] B on text values that
+**          use the collating sequence name X.
+**
+** {F16627} The [sqlite3_create_collation16(B,X,E,P,F)] works the same
+**          as [sqlite3_create_collation(B,X,E,P,F)] except that the
+**          collation name X is understood as UTF-16 in native byte order
+**          instead of UTF-8.
+**
+** {F16630} When multiple comparison functions are available for the same
+**          collating sequence, SQLite chooses the one whose text encoding
+**          requires the least amount of conversion from the default
+**          text encoding of the database.
+*/
+int sqlite3_create_collation(
+  sqlite3*,
+  const char *zName,
+  int eTextRep,
+  void*,
+  int(*xCompare)(void*,int,const void*,int,const void*)
+);
+int sqlite3_create_collation_v2(
+  sqlite3*,
+  const char *zName,
+  int eTextRep,
+  void*,
+  int(*xCompare)(void*,int,const void*,int,const void*),
+  void(*xDestroy)(void*)
+);
+int sqlite3_create_collation16(
+  sqlite3*,
+  const char *zName,
+  int eTextRep,
+  void*,
+  int(*xCompare)(void*,int,const void*,int,const void*)
+);
+
+/*
+** CAPI3REF: Collation Needed Callbacks {F16700}
+**
+** To avoid having to register all collation sequences before a database
+** can be used, a single callback function may be registered with the
+** database handle to be called whenever an undefined collation sequence is
+** required.
+**
+** If the function is registered using the sqlite3_collation_needed() API,
+** then it is passed the names of undefined collation sequences as strings
+** encoded in UTF-8. {F16703} If sqlite3_collation_needed16() is used, the names
+** are passed as UTF-16 in machine native byte order. A call to either
+** function replaces any existing callback.
+**
+** When the callback is invoked, the first argument passed is a copy
+** of the second argument to sqlite3_collation_needed() or
+** sqlite3_collation_needed16().  The second argument is the database
+** handle.  The third argument is one of [SQLITE_UTF8],
+** [SQLITE_UTF16BE], or [SQLITE_UTF16LE], indicating the most
+** desirable form of the collation sequence function required.
+** The fourth parameter is the name of the
+** required collation sequence.
+**
+** The callback function should register the desired collation using
+** [sqlite3_create_collation()], [sqlite3_create_collation16()], or
+** [sqlite3_create_collation_v2()].
+**
+** INVARIANTS:
+**
+** {F16702} A successful call to [sqlite3_collation_needed(D,P,F)]
+**          or [sqlite3_collation_needed16(D,P,F)] causes
+**          the [database connection] D to invoke callback F with first
+**          parameter P whenever it needs a comparison function for a
+**          collating sequence that it does not know about.
+**
+** {F16704} Each successful call to [sqlite3_collation_needed()] or
+**          [sqlite3_collation_needed16()] overrides the callback registered
+**          on the same [database connection] by prior calls to either
+**          interface.
+**
+** {F16706} The name of the requested collating function passed in the
+**          4th parameter to the callback is in UTF-8 if the callback
+**          was registered using [sqlite3_collation_needed()] and
+**          is in UTF-16 native byte order if the callback was
+**          registered using [sqlite3_collation_needed16()].
+**
+**
+*/
+int sqlite3_collation_needed(
+  sqlite3*,
+  void*,
+  void(*)(void*,sqlite3*,int eTextRep,const char*)
+);
+int sqlite3_collation_needed16(
+  sqlite3*,
+  void*,
+  void(*)(void*,sqlite3*,int eTextRep,const void*)
+);
+
+/*
+** Specify the key for an encrypted database.  This routine should be
+** called right after sqlite3_open().
+**
+** The code to implement this API is not available in the public release
+** of SQLite.
+*/
+int sqlite3_key(
+  sqlite3 *db,                   /* Database to be rekeyed */
+  const void *pKey, int nKey     /* The key */
+);
+
+/*
+** Change the key on an open database.  If the current database is not
+** encrypted, this routine will encrypt it.  If pNew==0 or nNew==0, the
+** database is decrypted.
+**
+** The code to implement this API is not available in the public release
+** of SQLite.
+*/
+int sqlite3_rekey(
+  sqlite3 *db,                   /* Database to be rekeyed */
+  const void *pKey, int nKey     /* The new key */
+);
+
+/*
+** CAPI3REF:  Suspend Execution For A Short Time {F10530}
+**
+** The sqlite3_sleep() function
+** causes the current thread to suspend execution
+** for at least a number of milliseconds specified in its parameter.
+**
+** If the operating system does not support sleep requests with
+** millisecond time resolution, then the time will be rounded up to
+** the nearest second. The number of milliseconds of sleep actually
+** requested from the operating system is returned.
+**
+** SQLite implements this interface by calling the xSleep()
+** method of the default [sqlite3_vfs] object.
+**
+** INVARIANTS:
+**
+** {F10533} The [sqlite3_sleep(M)] interface invokes the xSleep
+**          method of the default [sqlite3_vfs|VFS] in order to
+**          suspend execution of the current thread for at least
+**          M milliseconds.
+**
+** {F10536} The [sqlite3_sleep(M)] interface returns the number of
+**          milliseconds of sleep actually requested of the operating
+**          system, which might be larger than the parameter M.
+*/
+int sqlite3_sleep(int);
+
+/*
+** CAPI3REF:  Name Of The Folder Holding Temporary Files {F10310}
+**
+** If this global variable is made to point to a string which is
+** the name of a folder (a.ka. directory), then all temporary files
+** created by SQLite will be placed in that directory.  If this variable
+** is NULL pointer, then SQLite does a search for an appropriate temporary
+** file directory.
+**
+** It is not safe to modify this variable once a database connection
+** has been opened.  It is intended that this variable be set once
+** as part of process initialization and before any SQLite interface
+** routines have been call and remain unchanged thereafter.
+*/
+SQLITE_EXTERN char *sqlite3_temp_directory;
+
+/*
+** CAPI3REF:  Test To See If The Database Is In Auto-Commit Mode {F12930}
+**
+** The sqlite3_get_autocommit() interfaces returns non-zero or
+** zero if the given database connection is or is not in autocommit mode,
+** respectively.   Autocommit mode is on
+** by default.  Autocommit mode is disabled by a [BEGIN] statement.
+** Autocommit mode is reenabled by a [COMMIT] or [ROLLBACK].
+**
+** If certain kinds of errors occur on a statement within a multi-statement
+** transactions (errors including [SQLITE_FULL], [SQLITE_IOERR],
+** [SQLITE_NOMEM], [SQLITE_BUSY], and [SQLITE_INTERRUPT]) then the
+** transaction might be rolled back automatically.  The only way to
+** find out if SQLite automatically rolled back the transaction after
+** an error is to use this function.
+**
+** INVARIANTS:
+**
+** {F12931} The [sqlite3_get_autocommit(D)] interface returns non-zero or
+**          zero if the [database connection] D is or is not in autocommit
+**          mode, respectively.
+**
+** {F12932} Autocommit mode is on by default.
+**
+** {F12933} Autocommit mode is disabled by a successful [BEGIN] statement.
+**
+** {F12934} Autocommit mode is enabled by a successful [COMMIT] or [ROLLBACK]
+**          statement.
+**
+**
+** LIMITATIONS:
+***
+** {U12936} If another thread changes the autocommit status of the database
+**          connection while this routine is running, then the return value
+**          is undefined.
+*/
+int sqlite3_get_autocommit(sqlite3*);
+
+/*
+** CAPI3REF:  Find The Database Handle Of A Prepared Statement {F13120}
+**
+** The sqlite3_db_handle interface
+** returns the [sqlite3*] database handle to which a
+** [prepared statement] belongs.
+** The database handle returned by sqlite3_db_handle
+** is the same database handle that was
+** the first argument to the [sqlite3_prepare_v2()] or its variants
+** that was used to create the statement in the first place.
+**
+** INVARIANTS:
+**
+** {F13123} The [sqlite3_db_handle(S)] interface returns a pointer
+**          to the [database connection] associated with
+**          [prepared statement] S.
+*/
+sqlite3 *sqlite3_db_handle(sqlite3_stmt*);
+
+
+/*
+** CAPI3REF: Commit And Rollback Notification Callbacks {F12950}
+**
+** The sqlite3_commit_hook() interface registers a callback
+** function to be invoked whenever a transaction is committed.
+** Any callback set by a previous call to sqlite3_commit_hook()
+** for the same database connection is overridden.
+** The sqlite3_rollback_hook() interface registers a callback
+** function to be invoked whenever a transaction is committed.
+** Any callback set by a previous call to sqlite3_commit_hook()
+** for the same database connection is overridden.
+** The pArg argument is passed through
+** to the callback.  If the callback on a commit hook function
+** returns non-zero, then the commit is converted into a rollback.
+**
+** If another function was previously registered, its
+** pArg value is returned.  Otherwise NULL is returned.
+**
+** Registering a NULL function disables the callback.
+**
+** For the purposes of this API, a transaction is said to have been
+** rolled back if an explicit "ROLLBACK" statement is executed, or
+** an error or constraint causes an implicit rollback to occur.
+** The rollback callback is not invoked if a transaction is
+** automatically rolled back because the database connection is closed.
+** The rollback callback is not invoked if a transaction is
+** rolled back because a commit callback returned non-zero.
+** <todo> Check on this </todo>
+**
+** These are experimental interfaces and are subject to change.
+**
+** INVARIANTS:
+**
+** {F12951} The [sqlite3_commit_hook(D,F,P)] interface registers the
+**          callback function F to be invoked with argument P whenever
+**          a transaction commits on [database connection] D.
+**
+** {F12952} The [sqlite3_commit_hook(D,F,P)] interface returns the P
+**          argument from the previous call with the same
+**          [database connection ] D , or NULL on the first call
+**          for a particular [database connection] D.
+**
+** {F12953} Each call to [sqlite3_commit_hook()] overwrites the callback
+**          registered by prior calls.
+**
+** {F12954} If the F argument to [sqlite3_commit_hook(D,F,P)] is NULL
+**          then the commit hook callback is cancelled and no callback
+**          is invoked when a transaction commits.
+**
+** {F12955} If the commit callback returns non-zero then the commit is
+**          converted into a rollback.
+**
+** {F12961} The [sqlite3_rollback_hook(D,F,P)] interface registers the
+**          callback function F to be invoked with argument P whenever
+**          a transaction rolls back on [database connection] D.
+**
+** {F12962} The [sqlite3_rollback_hook(D,F,P)] interface returns the P
+**          argument from the previous call with the same
+**          [database connection ] D , or NULL on the first call
+**          for a particular [database connection] D.
+**
+** {F12963} Each call to [sqlite3_rollback_hook()] overwrites the callback
+**          registered by prior calls.
+**
+** {F12964} If the F argument to [sqlite3_rollback_hook(D,F,P)] is NULL
+**          then the rollback hook callback is cancelled and no callback
+**          is invoked when a transaction rolls back.
+*/
+void *sqlite3_commit_hook(sqlite3*, int(*)(void*), void*);
+void *sqlite3_rollback_hook(sqlite3*, void(*)(void *), void*);
+
+/*
+** CAPI3REF: Data Change Notification Callbacks {F12970}
+**
+** The sqlite3_update_hook() interface
+** registers a callback function with the database connection identified by the
+** first argument to be invoked whenever a row is updated, inserted or deleted.
+** Any callback set by a previous call to this function for the same
+** database connection is overridden.
+**
+** The second argument is a pointer to the function to invoke when a
+** row is updated, inserted or deleted.
+** The first argument to the callback is
+** a copy of the third argument to sqlite3_update_hook().
+** The second callback
+** argument is one of [SQLITE_INSERT], [SQLITE_DELETE] or [SQLITE_UPDATE],
+** depending on the operation that caused the callback to be invoked.
+** The third and
+** fourth arguments to the callback contain pointers to the database and
+** table name containing the affected row.
+** The final callback parameter is
+** the rowid of the row.
+** In the case of an update, this is the rowid after
+** the update takes place.
+**
+** The update hook is not invoked when internal system tables are
+** modified (i.e. sqlite_master and sqlite_sequence).
+**
+** If another function was previously registered, its pArg value
+** is returned.  Otherwise NULL is returned.
+**
+** INVARIANTS:
+**
+** {F12971} The [sqlite3_update_hook(D,F,P)] interface causes callback
+**          function F to be invoked with first parameter P whenever
+**          a table row is modified, inserted, or deleted on
+**          [database connection] D.
+**
+** {F12973} The [sqlite3_update_hook(D,F,P)] interface returns the value
+**          of P for the previous call on the same [database connection] D,
+**          or NULL for the first call.
+**
+** {F12975} If the update hook callback F in [sqlite3_update_hook(D,F,P)]
+**          is NULL then the no update callbacks are made.
+**
+** {F12977} Each call to [sqlite3_update_hook(D,F,P)] overrides prior calls
+**          to the same interface on the same [database connection] D.
+**
+** {F12979} The update hook callback is not invoked when internal system
+**          tables such as sqlite_master and sqlite_sequence are modified.
+**
+** {F12981} The second parameter to the update callback
+**          is one of [SQLITE_INSERT], [SQLITE_DELETE] or [SQLITE_UPDATE],
+**          depending on the operation that caused the callback to be invoked.
+**
+** {F12983} The third and fourth arguments to the callback contain pointers
+**          to zero-terminated UTF-8 strings which are the names of the
+**          database and table that is being updated.
+
+** {F12985} The final callback parameter is the rowid of the row after
+**          the change occurs.
+*/
+void *sqlite3_update_hook(
+  sqlite3*,
+  void(*)(void *,int ,char const *,char const *,sqlite3_int64),
+  void*
+);
+
+/*
+** CAPI3REF:  Enable Or Disable Shared Pager Cache {F10330}
+**
+** This routine enables or disables the sharing of the database cache
+** and schema data structures between connections to the same database.
+** Sharing is enabled if the argument is true and disabled if the argument
+** is false.
+**
+** Cache sharing is enabled and disabled
+** for an entire process. {END} This is a change as of SQLite version 3.5.0.
+** In prior versions of SQLite, sharing was
+** enabled or disabled for each thread separately.
+**
+** The cache sharing mode set by this interface effects all subsequent
+** calls to [sqlite3_open()], [sqlite3_open_v2()], and [sqlite3_open16()].
+** Existing database connections continue use the sharing mode
+** that was in effect at the time they were opened.
+**
+** Virtual tables cannot be used with a shared cache.   When shared
+** cache is enabled, the [sqlite3_create_module()] API used to register
+** virtual tables will always return an error.
+**
+** This routine returns [SQLITE_OK] if shared cache was
+** enabled or disabled successfully.  An [error code]
+** is returned otherwise.
+**
+** Shared cache is disabled by default. But this might change in
+** future releases of SQLite.  Applications that care about shared
+** cache setting should set it explicitly.
+**
+** INVARIANTS:
+**
+** {F10331} A successful invocation of [sqlite3_enable_shared_cache(B)]
+**          will enable or disable shared cache mode for any subsequently
+**          created [database connection] in the same process.
+**
+** {F10336} When shared cache is enabled, the [sqlite3_create_module()]
+**          interface will always return an error.
+**
+** {F10337} The [sqlite3_enable_shared_cache(B)] interface returns
+**          [SQLITE_OK] if shared cache was enabled or disabled successfully.
+**
+** {F10339} Shared cache is disabled by default.
+*/
+int sqlite3_enable_shared_cache(int);
+
+/*
+** CAPI3REF:  Attempt To Free Heap Memory {F17340}
+**
+** The sqlite3_release_memory() interface attempts to
+** free N bytes of heap memory by deallocating non-essential memory
+** allocations held by the database labrary. {END}  Memory used
+** to cache database pages to improve performance is an example of
+** non-essential memory.  Sqlite3_release_memory() returns
+** the number of bytes actually freed, which might be more or less
+** than the amount requested.
+**
+** INVARIANTS:
+**
+** {F17341} The [sqlite3_release_memory(N)] interface attempts to
+**          free N bytes of heap memory by deallocating non-essential
+**          memory allocations held by the database labrary.
+**
+** {F16342} The [sqlite3_release_memory(N)] returns the number
+**          of bytes actually freed, which might be more or less
+**          than the amount requested.
+*/
+int sqlite3_release_memory(int);
+
+/*
+** CAPI3REF:  Impose A Limit On Heap Size {F17350}
+**
+** The sqlite3_soft_heap_limit() interface
+** places a "soft" limit on the amount of heap memory that may be allocated
+** by SQLite. If an internal allocation is requested
+** that would exceed the soft heap limit, [sqlite3_release_memory()] is
+** invoked one or more times to free up some space before the allocation
+** is made.
+**
+** The limit is called "soft", because if
+** [sqlite3_release_memory()] cannot
+** free sufficient memory to prevent the limit from being exceeded,
+** the memory is allocated anyway and the current operation proceeds.
+**
+** A negative or zero value for N means that there is no soft heap limit and
+** [sqlite3_release_memory()] will only be called when memory is exhausted.
+** The default value for the soft heap limit is zero.
+**
+** SQLite makes a best effort to honor the soft heap limit.
+** But if the soft heap limit cannot honored, execution will
+** continue without error or notification.  This is why the limit is
+** called a "soft" limit.  It is advisory only.
+**
+** Prior to SQLite version 3.5.0, this routine only constrained the memory
+** allocated by a single thread - the same thread in which this routine
+** runs.  Beginning with SQLite version 3.5.0, the soft heap limit is
+** applied to all threads. The value specified for the soft heap limit
+** is an upper bound on the total memory allocation for all threads. In
+** version 3.5.0 there is no mechanism for limiting the heap usage for
+** individual threads.
+**
+** INVARIANTS:
+**
+** {F16351} The [sqlite3_soft_heap_limit(N)] interface places a soft limit
+**          of N bytes on the amount of heap memory that may be allocated
+**          using [sqlite3_malloc()] or [sqlite3_realloc()] at any point
+**          in time.
+**
+** {F16352} If a call to [sqlite3_malloc()] or [sqlite3_realloc()] would
+**          cause the total amount of allocated memory to exceed the
+**          soft heap limit, then [sqlite3_release_memory()] is invoked
+**          in an attempt to reduce the memory usage prior to proceeding
+**          with the memory allocation attempt.
+**
+** {F16353} Calls to [sqlite3_malloc()] or [sqlite3_realloc()] that trigger
+**          attempts to reduce memory usage through the soft heap limit
+**          mechanism continue even if the attempt to reduce memory
+**          usage is unsuccessful.
+**
+** {F16354} A negative or zero value for N in a call to
+**          [sqlite3_soft_heap_limit(N)] means that there is no soft
+**          heap limit and [sqlite3_release_memory()] will only be
+**          called when memory is completely exhausted.
+**
+** {F16355} The default value for the soft heap limit is zero.
+**
+** {F16358} Each call to [sqlite3_soft_heap_limit(N)] overrides the
+**          values set by all prior calls.
+*/
+void sqlite3_soft_heap_limit(int);
+
+/*
+** CAPI3REF:  Extract Metadata About A Column Of A Table {F12850}
+**
+** This routine
+** returns meta-data about a specific column of a specific database
+** table accessible using the connection handle passed as the first function
+** argument.
+**
+** The column is identified by the second, third and fourth parameters to
+** this function. The second parameter is either the name of the database
+** (i.e. "main", "temp" or an attached database) containing the specified
+** table or NULL. If it is NULL, then all attached databases are searched
+** for the table using the same algorithm as the database engine uses to
+** resolve unqualified table references.
+**
+** The third and fourth parameters to this function are the table and column
+** name of the desired column, respectively. Neither of these parameters
+** may be NULL.
+**
+** Meta information is returned by writing to the memory locations passed as
+** the 5th and subsequent parameters to this function. Any of these
+** arguments may be NULL, in which case the corresponding element of meta
+** information is ommitted.
+**
+** <pre>
+** Parameter     Output Type      Description
+** -----------------------------------
+**
+**   5th         const char*      Data type
+**   6th         const char*      Name of the default collation sequence
+**   7th         int              True if the column has a NOT NULL constraint
+**   8th         int              True if the column is part of the PRIMARY KEY
+**   9th         int              True if the column is AUTOINCREMENT
+** </pre>
+**
+**
+** The memory pointed to by the character pointers returned for the
+** declaration type and collation sequence is valid only until the next
+** call to any sqlite API function.
+**
+** If the specified table is actually a view, then an error is returned.
+**
+** If the specified column is "rowid", "oid" or "_rowid_" and an
+** INTEGER PRIMARY KEY column has been explicitly declared, then the output
+** parameters are set for the explicitly declared column. If there is no
+** explicitly declared IPK column, then the output parameters are set as
+** follows:
+**
+** <pre>
+**     data type: "INTEGER"
+**     collation sequence: "BINARY"
+**     not null: 0
+**     primary key: 1
+**     auto increment: 0
+** </pre>
+**
+** This function may load one or more schemas from database files. If an
+** error occurs during this process, or if the requested table or column
+** cannot be found, an SQLITE error code is returned and an error message
+** left in the database handle (to be retrieved using sqlite3_errmsg()).
+**
+** This API is only available if the library was compiled with the
+** SQLITE_ENABLE_COLUMN_METADATA preprocessor symbol defined.
+*/
+int sqlite3_table_column_metadata(
+  sqlite3 *db,                /* Connection handle */
+  const char *zDbName,        /* Database name or NULL */
+  const char *zTableName,     /* Table name */
+  const char *zColumnName,    /* Column name */
+  char const **pzDataType,    /* OUTPUT: Declared data type */
+  char const **pzCollSeq,     /* OUTPUT: Collation sequence name */
+  int *pNotNull,              /* OUTPUT: True if NOT NULL constraint exists */
+  int *pPrimaryKey,           /* OUTPUT: True if column part of PK */
+  int *pAutoinc               /* OUTPUT: True if column is auto-increment */
+);
+
+/*
+** CAPI3REF: Load An Extension {F12600}
+**
+** {F12601} The sqlite3_load_extension() interface
+** attempts to load an SQLite extension library contained in the file
+** zFile. {F12602} The entry point is zProc. {F12603} zProc may be 0
+** in which case the name of the entry point defaults
+** to "sqlite3_extension_init".
+**
+** {F12604} The sqlite3_load_extension() interface shall
+** return [SQLITE_OK] on success and [SQLITE_ERROR] if something goes wrong.
+**
+** {F12605}
+** If an error occurs and pzErrMsg is not 0, then the
+** sqlite3_load_extension() interface shall attempt to fill *pzErrMsg with
+** error message text stored in memory obtained from [sqlite3_malloc()].
+** {END}  The calling function should free this memory
+** by calling [sqlite3_free()].
+**
+** {F12606}
+** Extension loading must be enabled using [sqlite3_enable_load_extension()]
+** prior to calling this API or an error will be returned.
+*/
+int sqlite3_load_extension(
+  sqlite3 *db,          /* Load the extension into this database connection */
+  const char *zFile,    /* Name of the shared library containing extension */
+  const char *zProc,    /* Entry point.  Derived from zFile if 0 */
+  char **pzErrMsg       /* Put error message here if not 0 */
+);
+
+/*
+** CAPI3REF:  Enable Or Disable Extension Loading {F12620}
+**
+** So as not to open security holes in older applications that are
+** unprepared to deal with extension loading, and as a means of disabling
+** extension loading while evaluating user-entered SQL, the following
+** API is provided to turn the [sqlite3_load_extension()] mechanism on and
+** off.  {F12622} It is off by default. {END} See ticket #1863.
+**
+** {F12621} Call the sqlite3_enable_load_extension() routine
+** with onoff==1 to turn extension loading on
+** and call it with onoff==0 to turn it back off again. {END}
+*/
+int sqlite3_enable_load_extension(sqlite3 *db, int onoff);
+
+/*
+** CAPI3REF: Make Arrangements To Automatically Load An Extension {F12640}
+**
+** {F12641} This function
+** registers an extension entry point that is automatically invoked
+** whenever a new database connection is opened using
+** [sqlite3_open()], [sqlite3_open16()], or [sqlite3_open_v2()]. {END}
+**
+** This API can be invoked at program startup in order to register
+** one or more statically linked extensions that will be available
+** to all new database connections.
+**
+** {F12642} Duplicate extensions are detected so calling this routine multiple
+** times with the same extension is harmless.
+**
+** {F12643} This routine stores a pointer to the extension in an array
+** that is obtained from sqlite_malloc(). {END} If you run a memory leak
+** checker on your program and it reports a leak because of this
+** array, then invoke [sqlite3_reset_auto_extension()] prior
+** to shutdown to free the memory.
+**
+** {F12644} Automatic extensions apply across all threads. {END}
+**
+** This interface is experimental and is subject to change or
+** removal in future releases of SQLite.
+*/
+int sqlite3_auto_extension(void *xEntryPoint);
+
+
+/*
+** CAPI3REF: Reset Automatic Extension Loading {F12660}
+**
+** {F12661} This function disables all previously registered
+** automatic extensions. {END}  This
+** routine undoes the effect of all prior [sqlite3_auto_extension()]
+** calls.
+**
+** {F12662} This call disabled automatic extensions in all threads. {END}
+**
+** This interface is experimental and is subject to change or
+** removal in future releases of SQLite.
+*/
+void sqlite3_reset_auto_extension(void);
+
+
+/*
+****** EXPERIMENTAL - subject to change without notice **************
+**
+** The interface to the virtual-table mechanism is currently considered
+** to be experimental.  The interface might change in incompatible ways.
+** If this is a problem for you, do not use the interface at this time.
+**
+** When the virtual-table mechanism stablizes, we will declare the
+** interface fixed, support it indefinitely, and remove this comment.
+*/
+
+/*
+** Structures used by the virtual table interface
+*/
+typedef struct sqlite3_vtab sqlite3_vtab;
+typedef struct sqlite3_index_info sqlite3_index_info;
+typedef struct sqlite3_vtab_cursor sqlite3_vtab_cursor;
+typedef struct sqlite3_module sqlite3_module;
+
+/*
+** CAPI3REF: Virtual Table Object {F18000}
+** KEYWORDS: sqlite3_module
+**
+** A module is a class of virtual tables.  Each module is defined
+** by an instance of the following structure.  This structure consists
+** mostly of methods for the module.
+*/
+struct sqlite3_module {
+  int iVersion;
+  int (*xCreate)(sqlite3*, void *pAux,
+               int argc, const char *const*argv,
+               sqlite3_vtab **ppVTab, char**);
+  int (*xConnect)(sqlite3*, void *pAux,
+               int argc, const char *const*argv,
+               sqlite3_vtab **ppVTab, char**);
+  int (*xBestIndex)(sqlite3_vtab *pVTab, sqlite3_index_info*);
+  int (*xDisconnect)(sqlite3_vtab *pVTab);
+  int (*xDestroy)(sqlite3_vtab *pVTab);
+  int (*xOpen)(sqlite3_vtab *pVTab, sqlite3_vtab_cursor **ppCursor);
+  int (*xClose)(sqlite3_vtab_cursor*);
+  int (*xFilter)(sqlite3_vtab_cursor*, int idxNum, const char *idxStr,
+                int argc, sqlite3_value **argv);
+  int (*xNext)(sqlite3_vtab_cursor*);
+  int (*xEof)(sqlite3_vtab_cursor*);
+  int (*xColumn)(sqlite3_vtab_cursor*, sqlite3_context*, int);
+  int (*xRowid)(sqlite3_vtab_cursor*, sqlite3_int64 *pRowid);
+  int (*xUpdate)(sqlite3_vtab *, int, sqlite3_value **, sqlite3_int64 *);
+  int (*xBegin)(sqlite3_vtab *pVTab);
+  int (*xSync)(sqlite3_vtab *pVTab);
+  int (*xCommit)(sqlite3_vtab *pVTab);
+  int (*xRollback)(sqlite3_vtab *pVTab);
+  int (*xFindFunction)(sqlite3_vtab *pVtab, int nArg, const char *zName,
+                       void (**pxFunc)(sqlite3_context*,int,sqlite3_value**),
+                       void **ppArg);
+
+  int (*xRename)(sqlite3_vtab *pVtab, const char *zNew);
+};
+
+/*
+** CAPI3REF: Virtual Table Indexing Information {F18100}
+** KEYWORDS: sqlite3_index_info
+**
+** The sqlite3_index_info structure and its substructures is used to
+** pass information into and receive the reply from the xBestIndex
+** method of an sqlite3_module.  The fields under **Inputs** are the
+** inputs to xBestIndex and are read-only.  xBestIndex inserts its
+** results into the **Outputs** fields.
+**
+** The aConstraint[] array records WHERE clause constraints of the
+** form:
+**
+**         column OP expr
+**
+** Where OP is =, &lt;, &lt;=, &gt;, or &gt;=.
+** The particular operator is stored
+** in aConstraint[].op.  The index of the column is stored in
+** aConstraint[].iColumn.  aConstraint[].usable is TRUE if the
+** expr on the right-hand side can be evaluated (and thus the constraint
+** is usable) and false if it cannot.
+**
+** The optimizer automatically inverts terms of the form "expr OP column"
+** and makes other simplifications to the WHERE clause in an attempt to
+** get as many WHERE clause terms into the form shown above as possible.
+** The aConstraint[] array only reports WHERE clause terms in the correct
+** form that refer to the particular virtual table being queried.
+**
+** Information about the ORDER BY clause is stored in aOrderBy[].
+** Each term of aOrderBy records a column of the ORDER BY clause.
+**
+** The xBestIndex method must fill aConstraintUsage[] with information
+** about what parameters to pass to xFilter.  If argvIndex>0 then
+** the right-hand side of the corresponding aConstraint[] is evaluated
+** and becomes the argvIndex-th entry in argv.  If aConstraintUsage[].omit
+** is true, then the constraint is assumed to be fully handled by the
+** virtual table and is not checked again by SQLite.
+**
+** The idxNum and idxPtr values are recorded and passed into xFilter.
+** sqlite3_free() is used to free idxPtr if needToFreeIdxPtr is true.
+**
+** The orderByConsumed means that output from xFilter will occur in
+** the correct order to satisfy the ORDER BY clause so that no separate
+** sorting step is required.
+**
+** The estimatedCost value is an estimate of the cost of doing the
+** particular lookup.  A full scan of a table with N entries should have
+** a cost of N.  A binary search of a table of N entries should have a
+** cost of approximately log(N).
+*/
+struct sqlite3_index_info {
+  /* Inputs */
+  int nConstraint;           /* Number of entries in aConstraint */
+  struct sqlite3_index_constraint {
+     int iColumn;              /* Column on left-hand side of constraint */
+     unsigned char op;         /* Constraint operator */
+     unsigned char usable;     /* True if this constraint is usable */
+     int iTermOffset;          /* Used internally - xBestIndex should ignore */
+  } *aConstraint;            /* Table of WHERE clause constraints */
+  int nOrderBy;              /* Number of terms in the ORDER BY clause */
+  struct sqlite3_index_orderby {
+     int iColumn;              /* Column number */
+     unsigned char desc;       /* True for DESC.  False for ASC. */
+  } *aOrderBy;               /* The ORDER BY clause */
+
+  /* Outputs */
+  struct sqlite3_index_constraint_usage {
+    int argvIndex;           /* if >0, constraint is part of argv to xFilter */
+    unsigned char omit;      /* Do not code a test for this constraint */
+  } *aConstraintUsage;
+  int idxNum;                /* Number used to identify the index */
+  char *idxStr;              /* String, possibly obtained from sqlite3_malloc */
+  int needToFreeIdxStr;      /* Free idxStr using sqlite3_free() if true */
+  int orderByConsumed;       /* True if output is already ordered */
+  double estimatedCost;      /* Estimated cost of using this index */
+};
+#define SQLITE_INDEX_CONSTRAINT_EQ    2
+#define SQLITE_INDEX_CONSTRAINT_GT    4
+#define SQLITE_INDEX_CONSTRAINT_LE    8
+#define SQLITE_INDEX_CONSTRAINT_LT    16
+#define SQLITE_INDEX_CONSTRAINT_GE    32
+#define SQLITE_INDEX_CONSTRAINT_MATCH 64
+
+/*
+** CAPI3REF: Register A Virtual Table Implementation {F18200}
+**
+** This routine is used to register a new module name with an SQLite
+** connection.  Module names must be registered before creating new
+** virtual tables on the module, or before using preexisting virtual
+** tables of the module.
+*/
+int sqlite3_create_module(
+  sqlite3 *db,               /* SQLite connection to register module with */
+  const char *zName,         /* Name of the module */
+  const sqlite3_module *,    /* Methods for the module */
+  void *                     /* Client data for xCreate/xConnect */
+);
+
+/*
+** CAPI3REF: Register A Virtual Table Implementation {F18210}
+**
+** This routine is identical to the sqlite3_create_module() method above,
+** except that it allows a destructor function to be specified. It is
+** even more experimental than the rest of the virtual tables API.
+*/
+int sqlite3_create_module_v2(
+  sqlite3 *db,               /* SQLite connection to register module with */
+  const char *zName,         /* Name of the module */
+  const sqlite3_module *,    /* Methods for the module */
+  void *,                    /* Client data for xCreate/xConnect */
+  void(*xDestroy)(void*)     /* Module destructor function */
+);
+
+/*
+** CAPI3REF: Virtual Table Instance Object {F18010}
+** KEYWORDS: sqlite3_vtab
+**
+** Every module implementation uses a subclass of the following structure
+** to describe a particular instance of the module.  Each subclass will
+** be tailored to the specific needs of the module implementation.   The
+** purpose of this superclass is to define certain fields that are common
+** to all module implementations.
+**
+** Virtual tables methods can set an error message by assigning a
+** string obtained from sqlite3_mprintf() to zErrMsg.  The method should
+** take care that any prior string is freed by a call to sqlite3_free()
+** prior to assigning a new string to zErrMsg.  After the error message
+** is delivered up to the client application, the string will be automatically
+** freed by sqlite3_free() and the zErrMsg field will be zeroed.  Note
+** that sqlite3_mprintf() and sqlite3_free() are used on the zErrMsg field
+** since virtual tables are commonly implemented in loadable extensions which
+** do not have access to sqlite3MPrintf() or sqlite3Free().
+*/
+struct sqlite3_vtab {
+  const sqlite3_module *pModule;  /* The module for this virtual table */
+  int nRef;                       /* Used internally */
+  char *zErrMsg;                  /* Error message from sqlite3_mprintf() */
+  /* Virtual table implementations will typically add additional fields */
+};
+
+/*
+** CAPI3REF: Virtual Table Cursor Object  {F18020}
+** KEYWORDS: sqlite3_vtab_cursor
+**
+** Every module implementation uses a subclass of the following structure
+** to describe cursors that point into the virtual table and are used
+** to loop through the virtual table.  Cursors are created using the
+** xOpen method of the module.  Each module implementation will define
+** the content of a cursor structure to suit its own needs.
+**
+** This superclass exists in order to define fields of the cursor that
+** are common to all implementations.
+*/
+struct sqlite3_vtab_cursor {
+  sqlite3_vtab *pVtab;      /* Virtual table of this cursor */
+  /* Virtual table implementations will typically add additional fields */
+};
+
+/*
+** CAPI3REF: Declare The Schema Of A Virtual Table {F18280}
+**
+** The xCreate and xConnect methods of a module use the following API
+** to declare the format (the names and datatypes of the columns) of
+** the virtual tables they implement.
+*/
+int sqlite3_declare_vtab(sqlite3*, const char *zCreateTable);
+
+/*
+** CAPI3REF: Overload A Function For A Virtual Table {F18300}
+**
+** Virtual tables can provide alternative implementations of functions
+** using the xFindFunction method.  But global versions of those functions
+** must exist in order to be overloaded.
+**
+** This API makes sure a global version of a function with a particular
+** name and number of parameters exists.  If no such function exists
+** before this API is called, a new function is created.  The implementation
+** of the new function always causes an exception to be thrown.  So
+** the new function is not good for anything by itself.  Its only
+** purpose is to be a place-holder function that can be overloaded
+** by virtual tables.
+**
+** This API should be considered part of the virtual table interface,
+** which is experimental and subject to change.
+*/
+int sqlite3_overload_function(sqlite3*, const char *zFuncName, int nArg);
+
+/*
+** The interface to the virtual-table mechanism defined above (back up
+** to a comment remarkably similar to this one) is currently considered
+** to be experimental.  The interface might change in incompatible ways.
+** If this is a problem for you, do not use the interface at this time.
+**
+** When the virtual-table mechanism stabilizes, we will declare the
+** interface fixed, support it indefinitely, and remove this comment.
+**
+****** EXPERIMENTAL - subject to change without notice **************
+*/
+
+/*
+** CAPI3REF: A Handle To An Open BLOB {F17800}
+**
+** An instance of this object represents an open BLOB on which
+** incremental I/O can be preformed.
+** Objects of this type are created by
+** [sqlite3_blob_open()] and destroyed by [sqlite3_blob_close()].
+** The [sqlite3_blob_read()] and [sqlite3_blob_write()] interfaces
+** can be used to read or write small subsections of the blob.
+** The [sqlite3_blob_bytes()] interface returns the size of the
+** blob in bytes.
+*/
+typedef struct sqlite3_blob sqlite3_blob;
+
+/*
+** CAPI3REF: Open A BLOB For Incremental I/O {F17810}
+**
+** This interfaces opens a handle to the blob located
+** in row iRow,, column zColumn, table zTable in database zDb;
+** in other words,  the same blob that would be selected by:
+**
+** <pre>
+**     SELECT zColumn FROM zDb.zTable WHERE rowid = iRow;
+** </pre> {END}
+**
+** If the flags parameter is non-zero, the blob is opened for
+** read and write access. If it is zero, the blob is opened for read
+** access.
+**
+** On success, [SQLITE_OK] is returned and the new
+** [sqlite3_blob | blob handle] is written to *ppBlob.
+** Otherwise an error code is returned and
+** any value written to *ppBlob should not be used by the caller.
+** This function sets the database-handle error code and message
+** accessible via [sqlite3_errcode()] and [sqlite3_errmsg()].
+**
+** INVARIANTS:
+**
+** {F17813} A successful invocation of the [sqlite3_blob_open(D,B,T,C,R,F,P)]
+**          interface opens an [sqlite3_blob] object P on the blob
+**          in column C of table T in database B on [database connection] D.
+**
+** {F17814} A successful invocation of [sqlite3_blob_open(D,...)] starts
+**          a new transaction on [database connection] D if that connection
+**          is not already in a transaction.
+**
+** {F17816} The [sqlite3_blob_open(D,B,T,C,R,F,P)] interface opens the blob
+**          for read and write access if and only if the F parameter
+**          is non-zero.
+**
+** {F17819} The [sqlite3_blob_open()] interface returns [SQLITE_OK] on
+**          success and an appropriate [error code] on failure.
+**
+** {F17821} If an error occurs during evaluation of [sqlite3_blob_open(D,...)]
+**          then subsequent calls to [sqlite3_errcode(D)],
+**          [sqlite3_errmsg(D)], and [sqlite3_errmsg16(D)] will return
+**          information approprate for that error.
+*/
+int sqlite3_blob_open(
+  sqlite3*,
+  const char *zDb,
+  const char *zTable,
+  const char *zColumn,
+  sqlite3_int64 iRow,
+  int flags,
+  sqlite3_blob **ppBlob
+);
+
+/*
+** CAPI3REF:  Close A BLOB Handle {F17830}
+**
+** Close an open [sqlite3_blob | blob handle].
+**
+** Closing a BLOB shall cause the current transaction to commit
+** if there are no other BLOBs, no pending prepared statements, and the
+** database connection is in autocommit mode.
+** If any writes were made to the BLOB, they might be held in cache
+** until the close operation if they will fit. {END}
+** Closing the BLOB often forces the changes
+** out to disk and so if any I/O errors occur, they will likely occur
+** at the time when the BLOB is closed.  {F17833} Any errors that occur during
+** closing are reported as a non-zero return value.
+**
+** The BLOB is closed unconditionally.  Even if this routine returns
+** an error code, the BLOB is still closed.
+**
+** INVARIANTS:
+**
+** {F17833} The [sqlite3_blob_close(P)] interface closes an
+**          [sqlite3_blob] object P previously opened using
+**          [sqlite3_blob_open()].
+**
+** {F17836} Closing an [sqlite3_blob] object using
+**          [sqlite3_blob_close()] shall cause the current transaction to
+**          commit if there are no other open [sqlite3_blob] objects
+**          or [prepared statements] on the same [database connection] and
+**          the [database connection] is in
+**          [sqlite3_get_autocommit | autocommit mode].
+**
+** {F17839} The [sqlite3_blob_close(P)] interfaces closes the
+**          [sqlite3_blob] object P unconditionally, even if
+**          [sqlite3_blob_close(P)] returns something other than [SQLITE_OK].
+**
+*/
+int sqlite3_blob_close(sqlite3_blob *);
+
+/*
+** CAPI3REF:  Return The Size Of An Open BLOB {F17840}
+**
+** Return the size in bytes of the blob accessible via the open
+** [sqlite3_blob] object in its only argument.
+**
+** INVARIANTS:
+**
+** {F17843} The [sqlite3_blob_bytes(P)] interface returns the size
+**          in bytes of the BLOB that the [sqlite3_blob] object P
+**          refers to.
+*/
+int sqlite3_blob_bytes(sqlite3_blob *);
+
+/*
+** CAPI3REF:  Read Data From A BLOB Incrementally {F17850}
+**
+** This function is used to read data from an open
+** [sqlite3_blob | blob-handle] into a caller supplied buffer.
+** N bytes of data are copied into buffer
+** Z from the open blob, starting at offset iOffset.
+**
+** If offset iOffset is less than N bytes from the end of the blob,
+** [SQLITE_ERROR] is returned and no data is read.  If N or iOffset is
+** less than zero [SQLITE_ERROR] is returned and no data is read.
+**
+** On success, SQLITE_OK is returned. Otherwise, an
+** [error code] or an [extended error code] is returned.
+**
+** INVARIANTS:
+**
+** {F17853} The [sqlite3_blob_read(P,Z,N,X)] interface reads N bytes
+**          beginning at offset X from
+**          the blob that [sqlite3_blob] object P refers to
+**          and writes those N bytes into buffer Z.
+**
+** {F17856} In [sqlite3_blob_read(P,Z,N,X)] if the size of the blob
+**          is less than N+X bytes, then the function returns [SQLITE_ERROR]
+**          and nothing is read from the blob.
+**
+** {F17859} In [sqlite3_blob_read(P,Z,N,X)] if X or N is less than zero
+**          then the function returns [SQLITE_ERROR]
+**          and nothing is read from the blob.
+**
+** {F17862} The [sqlite3_blob_read(P,Z,N,X)] interface returns [SQLITE_OK]
+**          if N bytes where successfully read into buffer Z.
+**
+** {F17865} If the requested read could not be completed,
+**          the [sqlite3_blob_read(P,Z,N,X)] interface returns an
+**          appropriate [error code] or [extended error code].
+**
+** {F17868} If an error occurs during evaluation of [sqlite3_blob_read(D,...)]
+**          then subsequent calls to [sqlite3_errcode(D)],
+**          [sqlite3_errmsg(D)], and [sqlite3_errmsg16(D)] will return
+**          information approprate for that error.
+*/
+int sqlite3_blob_read(sqlite3_blob *, void *Z, int N, int iOffset);
+
+/*
+** CAPI3REF:  Write Data Into A BLOB Incrementally {F17870}
+**
+** This function is used to write data into an open
+** [sqlite3_blob | blob-handle] from a user supplied buffer.
+** n bytes of data are copied from the buffer
+** pointed to by z into the open blob, starting at offset iOffset.
+**
+** If the [sqlite3_blob | blob-handle] passed as the first argument
+** was not opened for writing (the flags parameter to [sqlite3_blob_open()]
+*** was zero), this function returns [SQLITE_READONLY].
+**
+** This function may only modify the contents of the blob; it is
+** not possible to increase the size of a blob using this API.
+** If offset iOffset is less than n bytes from the end of the blob,
+** [SQLITE_ERROR] is returned and no data is written.  If n is
+** less than zero [SQLITE_ERROR] is returned and no data is written.
+**
+** On success, SQLITE_OK is returned. Otherwise, an
+** [error code] or an [extended error code] is returned.
+**
+** INVARIANTS:
+**
+** {F17873} The [sqlite3_blob_write(P,Z,N,X)] interface writes N bytes
+**          from buffer Z into
+**          the blob that [sqlite3_blob] object P refers to
+**          beginning at an offset of X into the blob.
+**
+** {F17875} The [sqlite3_blob_write(P,Z,N,X)] interface returns
+**          [SQLITE_READONLY] if the [sqlite3_blob] object P was
+**          [sqlite3_blob_open | opened] for reading only.
+**
+** {F17876} In [sqlite3_blob_write(P,Z,N,X)] if the size of the blob
+**          is less than N+X bytes, then the function returns [SQLITE_ERROR]
+**          and nothing is written into the blob.
+**
+** {F17879} In [sqlite3_blob_write(P,Z,N,X)] if X or N is less than zero
+**          then the function returns [SQLITE_ERROR]
+**          and nothing is written into the blob.
+**
+** {F17882} The [sqlite3_blob_write(P,Z,N,X)] interface returns [SQLITE_OK]
+**          if N bytes where successfully written into blob.
+**
+** {F17885} If the requested write could not be completed,
+**          the [sqlite3_blob_write(P,Z,N,X)] interface returns an
+**          appropriate [error code] or [extended error code].
+**
+** {F17888} If an error occurs during evaluation of [sqlite3_blob_write(D,...)]
+**          then subsequent calls to [sqlite3_errcode(D)],
+**          [sqlite3_errmsg(D)], and [sqlite3_errmsg16(D)] will return
+**          information approprate for that error.
+*/
+int sqlite3_blob_write(sqlite3_blob *, const void *z, int n, int iOffset);
+
+/*
+** CAPI3REF:  Virtual File System Objects {F11200}
+**
+** A virtual filesystem (VFS) is an [sqlite3_vfs] object
+** that SQLite uses to interact
+** with the underlying operating system.  Most SQLite builds come with a
+** single default VFS that is appropriate for the host computer.
+** New VFSes can be registered and existing VFSes can be unregistered.
+** The following interfaces are provided.
+**
+** The sqlite3_vfs_find() interface returns a pointer to
+** a VFS given its name.  Names are case sensitive.
+** Names are zero-terminated UTF-8 strings.
+** If there is no match, a NULL
+** pointer is returned.  If zVfsName is NULL then the default
+** VFS is returned.
+**
+** New VFSes are registered with sqlite3_vfs_register().
+** Each new VFS becomes the default VFS if the makeDflt flag is set.
+** The same VFS can be registered multiple times without injury.
+** To make an existing VFS into the default VFS, register it again
+** with the makeDflt flag set.  If two different VFSes with the
+** same name are registered, the behavior is undefined.  If a
+** VFS is registered with a name that is NULL or an empty string,
+** then the behavior is undefined.
+**
+** Unregister a VFS with the sqlite3_vfs_unregister() interface.
+** If the default VFS is unregistered, another VFS is chosen as
+** the default.  The choice for the new VFS is arbitrary.
+**
+** INVARIANTS:
+**
+** {F11203} The [sqlite3_vfs_find(N)] interface returns a pointer to the
+**          registered [sqlite3_vfs] object whose name exactly matches
+**          the zero-terminated UTF-8 string N, or it returns NULL if
+**          there is no match.
+**
+** {F11206} If the N parameter to [sqlite3_vfs_find(N)] is NULL then
+**          the function returns a pointer to the default [sqlite3_vfs]
+**          object if there is one, or NULL if there is no default
+**          [sqlite3_vfs] object.
+**
+** {F11209} The [sqlite3_vfs_register(P,F)] interface registers the
+**          well-formed [sqlite3_vfs] object P using the name given
+**          by the zName field of the object.
+**
+** {F11212} Using the [sqlite3_vfs_register(P,F)] interface to register
+**          the same [sqlite3_vfs] object multiple times is a harmless no-op.
+**
+** {F11215} The [sqlite3_vfs_register(P,F)] interface makes the
+**          the [sqlite3_vfs] object P the default [sqlite3_vfs] object
+**          if F is non-zero.
+**
+** {F11218} The [sqlite3_vfs_unregister(P)] interface unregisters the
+**          [sqlite3_vfs] object P so that it is no longer returned by
+**          subsequent calls to [sqlite3_vfs_find()].
+*/
+sqlite3_vfs *sqlite3_vfs_find(const char *zVfsName);
+int sqlite3_vfs_register(sqlite3_vfs*, int makeDflt);
+int sqlite3_vfs_unregister(sqlite3_vfs*);
+
+/*
+** CAPI3REF: Mutexes {F17000}
+**
+** The SQLite core uses these routines for thread
+** synchronization.  Though they are intended for internal
+** use by SQLite, code that links against SQLite is
+** permitted to use any of these routines.
+**
+** The SQLite source code contains multiple implementations
+** of these mutex routines.  An appropriate implementation
+** is selected automatically at compile-time.  The following
+** implementations are available in the SQLite core:
+**
+** <ul>
+** <li>   SQLITE_MUTEX_OS2
+** <li>   SQLITE_MUTEX_PTHREAD
+** <li>   SQLITE_MUTEX_W32
+** <li>   SQLITE_MUTEX_NOOP
+** </ul>
+**
+** The SQLITE_MUTEX_NOOP implementation is a set of routines
+** that does no real locking and is appropriate for use in
+** a single-threaded application.  The SQLITE_MUTEX_OS2,
+** SQLITE_MUTEX_PTHREAD, and SQLITE_MUTEX_W32 implementations
+** are appropriate for use on os/2, unix, and windows.
+**
+** If SQLite is compiled with the SQLITE_MUTEX_APPDEF preprocessor
+** macro defined (with "-DSQLITE_MUTEX_APPDEF=1"), then no mutex
+** implementation is included with the library.  The
+** mutex interface routines defined here become external
+** references in the SQLite library for which implementations
+** must be provided by the application.  This facility allows an
+** application that links against SQLite to provide its own mutex
+** implementation without having to modify the SQLite core.
+**
+** {F17011} The sqlite3_mutex_alloc() routine allocates a new
+** mutex and returns a pointer to it. {F17012} If it returns NULL
+** that means that a mutex could not be allocated. {F17013} SQLite
+** will unwind its stack and return an error. {F17014} The argument
+** to sqlite3_mutex_alloc() is one of these integer constants:
+**
+** <ul>
+** <li>  SQLITE_MUTEX_FAST
+** <li>  SQLITE_MUTEX_RECURSIVE
+** <li>  SQLITE_MUTEX_STATIC_MASTER
+** <li>  SQLITE_MUTEX_STATIC_MEM
+** <li>  SQLITE_MUTEX_STATIC_MEM2
+** <li>  SQLITE_MUTEX_STATIC_PRNG
+** <li>  SQLITE_MUTEX_STATIC_LRU
+** </ul> {END}
+**
+** {F17015} The first two constants cause sqlite3_mutex_alloc() to create
+** a new mutex.  The new mutex is recursive when SQLITE_MUTEX_RECURSIVE
+** is used but not necessarily so when SQLITE_MUTEX_FAST is used. {END}
+** The mutex implementation does not need to make a distinction
+** between SQLITE_MUTEX_RECURSIVE and SQLITE_MUTEX_FAST if it does
+** not want to.  {F17016} But SQLite will only request a recursive mutex in
+** cases where it really needs one.  {END} If a faster non-recursive mutex
+** implementation is available on the host platform, the mutex subsystem
+** might return such a mutex in response to SQLITE_MUTEX_FAST.
+**
+** {F17017} The other allowed parameters to sqlite3_mutex_alloc() each return
+** a pointer to a static preexisting mutex. {END}  Four static mutexes are
+** used by the current version of SQLite.  Future versions of SQLite
+** may add additional static mutexes.  Static mutexes are for internal
+** use by SQLite only.  Applications that use SQLite mutexes should
+** use only the dynamic mutexes returned by SQLITE_MUTEX_FAST or
+** SQLITE_MUTEX_RECURSIVE.
+**
+** {F17018} Note that if one of the dynamic mutex parameters (SQLITE_MUTEX_FAST
+** or SQLITE_MUTEX_RECURSIVE) is used then sqlite3_mutex_alloc()
+** returns a different mutex on every call.  {F17034} But for the static
+** mutex types, the same mutex is returned on every call that has
+** the same type number. {END}
+**
+** {F17019} The sqlite3_mutex_free() routine deallocates a previously
+** allocated dynamic mutex. {F17020} SQLite is careful to deallocate every
+** dynamic mutex that it allocates. {U17021} The dynamic mutexes must not be in
+** use when they are deallocated. {U17022} Attempting to deallocate a static
+** mutex results in undefined behavior. {F17023} SQLite never deallocates
+** a static mutex. {END}
+**
+** The sqlite3_mutex_enter() and sqlite3_mutex_try() routines attempt
+** to enter a mutex. {F17024} If another thread is already within the mutex,
+** sqlite3_mutex_enter() will block and sqlite3_mutex_try() will return
+** SQLITE_BUSY. {F17025}  The sqlite3_mutex_try() interface returns SQLITE_OK
+** upon successful entry.  {F17026} Mutexes created using
+** SQLITE_MUTEX_RECURSIVE can be entered multiple times by the same thread.
+** {F17027} In such cases the,
+** mutex must be exited an equal number of times before another thread
+** can enter.  {U17028} If the same thread tries to enter any other
+** kind of mutex more than once, the behavior is undefined.
+** {F17029} SQLite will never exhibit
+** such behavior in its own use of mutexes. {END}
+**
+** Some systems (ex: windows95) do not the operation implemented by
+** sqlite3_mutex_try().  On those systems, sqlite3_mutex_try() will
+** always return SQLITE_BUSY.  {F17030} The SQLite core only ever uses
+** sqlite3_mutex_try() as an optimization so this is acceptable behavior. {END}
+**
+** {F17031} The sqlite3_mutex_leave() routine exits a mutex that was
+** previously entered by the same thread.  {U17032} The behavior
+** is undefined if the mutex is not currently entered by the
+** calling thread or is not currently allocated.  {F17033} SQLite will
+** never do either. {END}
+**
+** See also: [sqlite3_mutex_held()] and [sqlite3_mutex_notheld()].
+*/
+sqlite3_mutex *sqlite3_mutex_alloc(int);
+void sqlite3_mutex_free(sqlite3_mutex*);
+void sqlite3_mutex_enter(sqlite3_mutex*);
+int sqlite3_mutex_try(sqlite3_mutex*);
+void sqlite3_mutex_leave(sqlite3_mutex*);
+
+/*
+** CAPI3REF: Mutex Verifcation Routines {F17080}
+**
+** The sqlite3_mutex_held() and sqlite3_mutex_notheld() routines
+** are intended for use inside assert() statements. {F17081} The SQLite core
+** never uses these routines except inside an assert() and applications
+** are advised to follow the lead of the core.  {F17082} The core only
+** provides implementations for these routines when it is compiled
+** with the SQLITE_DEBUG flag.  {U17087} External mutex implementations
+** are only required to provide these routines if SQLITE_DEBUG is
+** defined and if NDEBUG is not defined.
+**
+** {F17083} These routines should return true if the mutex in their argument
+** is held or not held, respectively, by the calling thread. {END}
+**
+** {X17084} The implementation is not required to provided versions of these
+** routines that actually work.
+** If the implementation does not provide working
+** versions of these routines, it should at least provide stubs
+** that always return true so that one does not get spurious
+** assertion failures. {END}
+**
+** {F17085} If the argument to sqlite3_mutex_held() is a NULL pointer then
+** the routine should return 1.  {END} This seems counter-intuitive since
+** clearly the mutex cannot be held if it does not exist.  But the
+** the reason the mutex does not exist is because the build is not
+** using mutexes.  And we do not want the assert() containing the
+** call to sqlite3_mutex_held() to fail, so a non-zero return is
+** the appropriate thing to do.  {F17086} The sqlite3_mutex_notheld()
+** interface should also return 1 when given a NULL pointer.
+*/
+int sqlite3_mutex_held(sqlite3_mutex*);
+int sqlite3_mutex_notheld(sqlite3_mutex*);
+
+/*
+** CAPI3REF: Mutex Types {F17001}
+**
+** {F17002} The [sqlite3_mutex_alloc()] interface takes a single argument
+** which is one of these integer constants. {END}
+*/
+#define SQLITE_MUTEX_FAST             0
+#define SQLITE_MUTEX_RECURSIVE        1
+#define SQLITE_MUTEX_STATIC_MASTER    2
+#define SQLITE_MUTEX_STATIC_MEM       3  /* sqlite3_malloc() */
+#define SQLITE_MUTEX_STATIC_MEM2      4  /* sqlite3_release_memory() */
+#define SQLITE_MUTEX_STATIC_PRNG      5  /* sqlite3_random() */
+#define SQLITE_MUTEX_STATIC_LRU       6  /* lru page list */
+
+/*
+** CAPI3REF: Low-Level Control Of Database Files {F11300}
+**
+** {F11301} The [sqlite3_file_control()] interface makes a direct call to the
+** xFileControl method for the [sqlite3_io_methods] object associated
+** with a particular database identified by the second argument. {F11302} The
+** name of the database is the name assigned to the database by the
+** <a href="lang_attach.html">ATTACH</a> SQL command that opened the
+** database. {F11303} To control the main database file, use the name "main"
+** or a NULL pointer. {F11304} The third and fourth parameters to this routine
+** are passed directly through to the second and third parameters of
+** the xFileControl method.  {F11305} The return value of the xFileControl
+** method becomes the return value of this routine.
+**
+** {F11306} If the second parameter (zDbName) does not match the name of any
+** open database file, then SQLITE_ERROR is returned. {F11307} This error
+** code is not remembered and will not be recalled by [sqlite3_errcode()]
+** or [sqlite3_errmsg()]. {U11308} The underlying xFileControl method might
+** also return SQLITE_ERROR.  {U11309} There is no way to distinguish between
+** an incorrect zDbName and an SQLITE_ERROR return from the underlying
+** xFileControl method. {END}
+**
+** See also: [SQLITE_FCNTL_LOCKSTATE]
+*/
+int sqlite3_file_control(sqlite3*, const char *zDbName, int op, void*);
+
+/*
+** CAPI3REF: Testing Interface {F11400}
+**
+** The sqlite3_test_control() interface is used to read out internal
+** state of SQLite and to inject faults into SQLite for testing
+** purposes.  The first parameter a operation code that determines
+** the number, meaning, and operation of all subsequent parameters.
+**
+** This interface is not for use by applications.  It exists solely
+** for verifying the correct operation of the SQLite library.  Depending
+** on how the SQLite library is compiled, this interface might not exist.
+**
+** The details of the operation codes, their meanings, the parameters
+** they take, and what they do are all subject to change without notice.
+** Unlike most of the SQLite API, this function is not guaranteed to
+** operate consistently from one release to the next.
+*/
+int sqlite3_test_control(int op, ...);
+
+/*
+** CAPI3REF: Testing Interface Operation Codes {F11410}
+**
+** These constants are the valid operation code parameters used
+** as the first argument to [sqlite3_test_control()].
+**
+** These parameters and their meansing are subject to change
+** without notice.  These values are for testing purposes only.
+** Applications should not use any of these parameters or the
+** [sqlite3_test_control()] interface.
+*/
+#define SQLITE_TESTCTRL_FAULT_CONFIG             1
+#define SQLITE_TESTCTRL_FAULT_FAILURES           2
+#define SQLITE_TESTCTRL_FAULT_BENIGN_FAILURES    3
+#define SQLITE_TESTCTRL_FAULT_PENDING            4
+
+
+
+
+
+/*
+** Undo the hack that converts floating point types to integer for
+** builds on processors without floating point support.
+*/
+#ifdef SQLITE_OMIT_FLOATING_POINT
+# undef double
+#endif
+
+#ifdef __cplusplus
+}  /* End of the 'extern "C"' block */
+#endif
+#endif
diff --git a/uppsrc/plugin/sqlite3/lib/sqlite3ext.h b/uppsrc/plugin/sqlite3/lib/sqlite3ext.h
new file mode 100644
index 000000000..8a53abe55
--- /dev/null
+++ b/uppsrc/plugin/sqlite3/lib/sqlite3ext.h
@@ -0,0 +1,350 @@
+/*
+** 2006 June 7
+**
+** The author disclaims copyright to this source code.  In place of
+** a legal notice, here is a blessing:
+**
+**    May you do good and not evil.
+**    May you find forgiveness for yourself and forgive others.
+**    May you share freely, never taking more than you give.
+**
+*************************************************************************
+** This header file defines the SQLite interface for use by
+** shared libraries that want to be imported as extensions into
+** an SQLite instance.  Shared libraries that intend to be loaded
+** as extensions by SQLite should #include this file instead of
+** sqlite3.h.
+**
+** @(#) $Id: sqlite3ext.h,v 1.18 2008/03/02 03:32:05 mlcreech Exp $
+*/
+#ifndef _SQLITE3EXT_H_
+#define _SQLITE3EXT_H_
+#include "sqlite3.h"
+
+typedef struct sqlite3_api_routines sqlite3_api_routines;
+
+/*
+** The following structure holds pointers to all of the SQLite API
+** routines.
+**
+** WARNING:  In order to maintain backwards compatibility, add new
+** interfaces to the end of this structure only.  If you insert new
+** interfaces in the middle of this structure, then older different
+** versions of SQLite will not be able to load each others' shared
+** libraries!
+*/
+struct sqlite3_api_routines {
+  void * (*aggregate_context)(sqlite3_context*,int nBytes);
+  int  (*aggregate_count)(sqlite3_context*);
+  int  (*bind_blob)(sqlite3_stmt*,int,const void*,int n,void(*)(void*));
+  int  (*bind_double)(sqlite3_stmt*,int,double);
+  int  (*bind_int)(sqlite3_stmt*,int,int);
+  int  (*bind_int64)(sqlite3_stmt*,int,sqlite_int64);
+  int  (*bind_null)(sqlite3_stmt*,int);
+  int  (*bind_parameter_count)(sqlite3_stmt*);
+  int  (*bind_parameter_index)(sqlite3_stmt*,const char*zName);
+  const char * (*bind_parameter_name)(sqlite3_stmt*,int);
+  int  (*bind_text)(sqlite3_stmt*,int,const char*,int n,void(*)(void*));
+  int  (*bind_text16)(sqlite3_stmt*,int,const void*,int,void(*)(void*));
+  int  (*bind_value)(sqlite3_stmt*,int,const sqlite3_value*);
+  int  (*busy_handler)(sqlite3*,int(*)(void*,int),void*);
+  int  (*busy_timeout)(sqlite3*,int ms);
+  int  (*changes)(sqlite3*);
+  int  (*close)(sqlite3*);
+  int  (*collation_needed)(sqlite3*,void*,void(*)(void*,sqlite3*,int eTextRep,const char*));
+  int  (*collation_needed16)(sqlite3*,void*,void(*)(void*,sqlite3*,int eTextRep,const void*));
+  const void * (*column_blob)(sqlite3_stmt*,int iCol);
+  int  (*column_bytes)(sqlite3_stmt*,int iCol);
+  int  (*column_bytes16)(sqlite3_stmt*,int iCol);
+  int  (*column_count)(sqlite3_stmt*pStmt);
+  const char * (*column_database_name)(sqlite3_stmt*,int);
+  const void * (*column_database_name16)(sqlite3_stmt*,int);
+  const char * (*column_decltype)(sqlite3_stmt*,int i);
+  const void * (*column_decltype16)(sqlite3_stmt*,int);
+  double  (*column_double)(sqlite3_stmt*,int iCol);
+  int  (*column_int)(sqlite3_stmt*,int iCol);
+  sqlite_int64  (*column_int64)(sqlite3_stmt*,int iCol);
+  const char * (*column_name)(sqlite3_stmt*,int);
+  const void * (*column_name16)(sqlite3_stmt*,int);
+  const char * (*column_origin_name)(sqlite3_stmt*,int);
+  const void * (*column_origin_name16)(sqlite3_stmt*,int);
+  const char * (*column_table_name)(sqlite3_stmt*,int);
+  const void * (*column_table_name16)(sqlite3_stmt*,int);
+  const unsigned char * (*column_text)(sqlite3_stmt*,int iCol);
+  const void * (*column_text16)(sqlite3_stmt*,int iCol);
+  int  (*column_type)(sqlite3_stmt*,int iCol);
+  sqlite3_value* (*column_value)(sqlite3_stmt*,int iCol);
+  void * (*commit_hook)(sqlite3*,int(*)(void*),void*);
+  int  (*complete)(const char*sql);
+  int  (*complete16)(const void*sql);
+  int  (*create_collation)(sqlite3*,const char*,int,void*,int(*)(void*,int,const void*,int,const void*));
+  int  (*create_collation16)(sqlite3*,const char*,int,void*,int(*)(void*,int,const void*,int,const void*));
+  int  (*create_function)(sqlite3*,const char*,int,int,void*,void (*xFunc)(sqlite3_context*,int,sqlite3_value**),void (*xStep)(sqlite3_context*,int,sqlite3_value**),void (*xFinal)(sqlite3_context*));
+  int  (*create_function16)(sqlite3*,const void*,int,int,void*,void (*xFunc)(sqlite3_context*,int,sqlite3_value**),void (*xStep)(sqlite3_context*,int,sqlite3_value**),void (*xFinal)(sqlite3_context*));
+  int (*create_module)(sqlite3*,const char*,const sqlite3_module*,void*);
+  int  (*data_count)(sqlite3_stmt*pStmt);
+  sqlite3 * (*db_handle)(sqlite3_stmt*);
+  int (*declare_vtab)(sqlite3*,const char*);
+  int  (*enable_shared_cache)(int);
+  int  (*errcode)(sqlite3*db);
+  const char * (*errmsg)(sqlite3*);
+  const void * (*errmsg16)(sqlite3*);
+  int  (*exec)(sqlite3*,const char*,sqlite3_callback,void*,char**);
+  int  (*expired)(sqlite3_stmt*);
+  int  (*finalize)(sqlite3_stmt*pStmt);
+  void  (*free)(void*);
+  void  (*free_table)(char**result);
+  int  (*get_autocommit)(sqlite3*);
+  void * (*get_auxdata)(sqlite3_context*,int);
+  int  (*get_table)(sqlite3*,const char*,char***,int*,int*,char**);
+  int  (*global_recover)(void);
+  void  (*interruptx)(sqlite3*);
+  sqlite_int64  (*last_insert_rowid)(sqlite3*);
+  const char * (*libversion)(void);
+  int  (*libversion_number)(void);
+  void *(*malloc)(int);
+  char * (*mprintf)(const char*,...);
+  int  (*open)(const char*,sqlite3**);
+  int  (*open16)(const void*,sqlite3**);
+  int  (*prepare)(sqlite3*,const char*,int,sqlite3_stmt**,const char**);
+  int  (*prepare16)(sqlite3*,const void*,int,sqlite3_stmt**,const void**);
+  void * (*profile)(sqlite3*,void(*)(void*,const char*,sqlite_uint64),void*);
+  void  (*progress_handler)(sqlite3*,int,int(*)(void*),void*);
+  void *(*realloc)(void*,int);
+  int  (*reset)(sqlite3_stmt*pStmt);
+  void  (*result_blob)(sqlite3_context*,const void*,int,void(*)(void*));
+  void  (*result_double)(sqlite3_context*,double);
+  void  (*result_error)(sqlite3_context*,const char*,int);
+  void  (*result_error16)(sqlite3_context*,const void*,int);
+  void  (*result_int)(sqlite3_context*,int);
+  void  (*result_int64)(sqlite3_context*,sqlite_int64);
+  void  (*result_null)(sqlite3_context*);
+  void  (*result_text)(sqlite3_context*,const char*,int,void(*)(void*));
+  void  (*result_text16)(sqlite3_context*,const void*,int,void(*)(void*));
+  void  (*result_text16be)(sqlite3_context*,const void*,int,void(*)(void*));
+  void  (*result_text16le)(sqlite3_context*,const void*,int,void(*)(void*));
+  void  (*result_value)(sqlite3_context*,sqlite3_value*);
+  void * (*rollback_hook)(sqlite3*,void(*)(void*),void*);
+  int  (*set_authorizer)(sqlite3*,int(*)(void*,int,const char*,const char*,const char*,const char*),void*);
+  void  (*set_auxdata)(sqlite3_context*,int,void*,void (*)(void*));
+  char * (*snprintf)(int,char*,const char*,...);
+  int  (*step)(sqlite3_stmt*);
+  int  (*table_column_metadata)(sqlite3*,const char*,const char*,const char*,char const**,char const**,int*,int*,int*);
+  void  (*thread_cleanup)(void);
+  int  (*total_changes)(sqlite3*);
+  void * (*trace)(sqlite3*,void(*xTrace)(void*,const char*),void*);
+  int  (*transfer_bindings)(sqlite3_stmt*,sqlite3_stmt*);
+  void * (*update_hook)(sqlite3*,void(*)(void*,int ,char const*,char const*,sqlite_int64),void*);
+  void * (*user_data)(sqlite3_context*);
+  const void * (*value_blob)(sqlite3_value*);
+  int  (*value_bytes)(sqlite3_value*);
+  int  (*value_bytes16)(sqlite3_value*);
+  double  (*value_double)(sqlite3_value*);
+  int  (*value_int)(sqlite3_value*);
+  sqlite_int64  (*value_int64)(sqlite3_value*);
+  int  (*value_numeric_type)(sqlite3_value*);
+  const unsigned char * (*value_text)(sqlite3_value*);
+  const void * (*value_text16)(sqlite3_value*);
+  const void * (*value_text16be)(sqlite3_value*);
+  const void * (*value_text16le)(sqlite3_value*);
+  int  (*value_type)(sqlite3_value*);
+  char *(*vmprintf)(const char*,va_list);
+  /* Added ??? */
+  int (*overload_function)(sqlite3*, const char *zFuncName, int nArg);
+  /* Added by 3.3.13 */
+  int (*prepare_v2)(sqlite3*,const char*,int,sqlite3_stmt**,const char**);
+  int (*prepare16_v2)(sqlite3*,const void*,int,sqlite3_stmt**,const void**);
+  int (*clear_bindings)(sqlite3_stmt*);
+  /* Added by 3.4.1 */
+  int (*create_module_v2)(sqlite3*,const char*,const sqlite3_module*,void*,void (*xDestroy)(void *));
+  /* Added by 3.5.0 */
+  int (*bind_zeroblob)(sqlite3_stmt*,int,int);
+  int (*blob_bytes)(sqlite3_blob*);
+  int (*blob_close)(sqlite3_blob*);
+  int (*blob_open)(sqlite3*,const char*,const char*,const char*,sqlite3_int64,int,sqlite3_blob**);
+  int (*blob_read)(sqlite3_blob*,void*,int,int);
+  int (*blob_write)(sqlite3_blob*,const void*,int,int);
+  int (*create_collation_v2)(sqlite3*,const char*,int,void*,int(*)(void*,int,const void*,int,const void*),void(*)(void*));
+  int (*file_control)(sqlite3*,const char*,int,void*);
+  sqlite3_int64 (*memory_highwater)(int);
+  sqlite3_int64 (*memory_used)(void);
+  sqlite3_mutex *(*mutex_alloc)(int);
+  void (*mutex_enter)(sqlite3_mutex*);
+  void (*mutex_free)(sqlite3_mutex*);
+  void (*mutex_leave)(sqlite3_mutex*);
+  int (*mutex_try)(sqlite3_mutex*);
+  int (*open_v2)(const char*,sqlite3**,int,const char*);
+  int (*release_memory)(int);
+  void (*result_error_nomem)(sqlite3_context*);
+  void (*result_error_toobig)(sqlite3_context*);
+  int (*sleep)(int);
+  void (*soft_heap_limit)(int);
+  sqlite3_vfs *(*vfs_find)(const char*);
+  int (*vfs_register)(sqlite3_vfs*,int);
+  int (*vfs_unregister)(sqlite3_vfs*);
+};
+
+/*
+** The following macros redefine the API routines so that they are
+** redirected throught the global sqlite3_api structure.
+**
+** This header file is also used by the loadext.c source file
+** (part of the main SQLite library - not an extension) so that
+** it can get access to the sqlite3_api_routines structure
+** definition.  But the main library does not want to redefine
+** the API.  So the redefinition macros are only valid if the
+** SQLITE_CORE macros is undefined.
+*/
+#ifndef SQLITE_CORE
+#define sqlite3_aggregate_context      sqlite3_api->aggregate_context
+#define sqlite3_aggregate_count        sqlite3_api->aggregate_count
+#define sqlite3_bind_blob              sqlite3_api->bind_blob
+#define sqlite3_bind_double            sqlite3_api->bind_double
+#define sqlite3_bind_int               sqlite3_api->bind_int
+#define sqlite3_bind_int64             sqlite3_api->bind_int64
+#define sqlite3_bind_null              sqlite3_api->bind_null
+#define sqlite3_bind_parameter_count   sqlite3_api->bind_parameter_count
+#define sqlite3_bind_parameter_index   sqlite3_api->bind_parameter_index
+#define sqlite3_bind_parameter_name    sqlite3_api->bind_parameter_name
+#define sqlite3_bind_text              sqlite3_api->bind_text
+#define sqlite3_bind_text16            sqlite3_api->bind_text16
+#define sqlite3_bind_value             sqlite3_api->bind_value
+#define sqlite3_busy_handler           sqlite3_api->busy_handler
+#define sqlite3_busy_timeout           sqlite3_api->busy_timeout
+#define sqlite3_changes                sqlite3_api->changes
+#define sqlite3_close                  sqlite3_api->close
+#define sqlite3_collation_needed       sqlite3_api->collation_needed
+#define sqlite3_collation_needed16     sqlite3_api->collation_needed16
+#define sqlite3_column_blob            sqlite3_api->column_blob
+#define sqlite3_column_bytes           sqlite3_api->column_bytes
+#define sqlite3_column_bytes16         sqlite3_api->column_bytes16
+#define sqlite3_column_count           sqlite3_api->column_count
+#define sqlite3_column_database_name   sqlite3_api->column_database_name
+#define sqlite3_column_database_name16 sqlite3_api->column_database_name16
+#define sqlite3_column_decltype        sqlite3_api->column_decltype
+#define sqlite3_column_decltype16      sqlite3_api->column_decltype16
+#define sqlite3_column_double          sqlite3_api->column_double
+#define sqlite3_column_int             sqlite3_api->column_int
+#define sqlite3_column_int64           sqlite3_api->column_int64
+#define sqlite3_column_name            sqlite3_api->column_name
+#define sqlite3_column_name16          sqlite3_api->column_name16
+#define sqlite3_column_origin_name     sqlite3_api->column_origin_name
+#define sqlite3_column_origin_name16   sqlite3_api->column_origin_name16
+#define sqlite3_column_table_name      sqlite3_api->column_table_name
+#define sqlite3_column_table_name16    sqlite3_api->column_table_name16
+#define sqlite3_column_text            sqlite3_api->column_text
+#define sqlite3_column_text16          sqlite3_api->column_text16
+#define sqlite3_column_type            sqlite3_api->column_type
+#define sqlite3_column_value           sqlite3_api->column_value
+#define sqlite3_commit_hook            sqlite3_api->commit_hook
+#define sqlite3_complete               sqlite3_api->complete
+#define sqlite3_complete16             sqlite3_api->complete16
+#define sqlite3_create_collation       sqlite3_api->create_collation
+#define sqlite3_create_collation16     sqlite3_api->create_collation16
+#define sqlite3_create_function        sqlite3_api->create_function
+#define sqlite3_create_function16      sqlite3_api->create_function16
+#define sqlite3_create_module          sqlite3_api->create_module
+#define sqlite3_create_module_v2       sqlite3_api->create_module_v2
+#define sqlite3_data_count             sqlite3_api->data_count
+#define sqlite3_db_handle              sqlite3_api->db_handle
+#define sqlite3_declare_vtab           sqlite3_api->declare_vtab
+#define sqlite3_enable_shared_cache    sqlite3_api->enable_shared_cache
+#define sqlite3_errcode                sqlite3_api->errcode
+#define sqlite3_errmsg                 sqlite3_api->errmsg
+#define sqlite3_errmsg16               sqlite3_api->errmsg16
+#define sqlite3_exec                   sqlite3_api->exec
+#define sqlite3_expired                sqlite3_api->expired
+#define sqlite3_finalize               sqlite3_api->finalize
+#define sqlite3_free                   sqlite3_api->free
+#define sqlite3_free_table             sqlite3_api->free_table
+#define sqlite3_get_autocommit         sqlite3_api->get_autocommit
+#define sqlite3_get_auxdata            sqlite3_api->get_auxdata
+#define sqlite3_get_table              sqlite3_api->get_table
+#define sqlite3_global_recover         sqlite3_api->global_recover
+#define sqlite3_interrupt              sqlite3_api->interruptx
+#define sqlite3_last_insert_rowid      sqlite3_api->last_insert_rowid
+#define sqlite3_libversion             sqlite3_api->libversion
+#define sqlite3_libversion_number      sqlite3_api->libversion_number
+#define sqlite3_malloc                 sqlite3_api->malloc
+#define sqlite3_mprintf                sqlite3_api->mprintf
+#define sqlite3_open                   sqlite3_api->open
+#define sqlite3_open16                 sqlite3_api->open16
+#define sqlite3_prepare                sqlite3_api->prepare
+#define sqlite3_prepare16              sqlite3_api->prepare16
+#define sqlite3_prepare_v2             sqlite3_api->prepare_v2
+#define sqlite3_prepare16_v2           sqlite3_api->prepare16_v2
+#define sqlite3_profile                sqlite3_api->profile
+#define sqlite3_progress_handler       sqlite3_api->progress_handler
+#define sqlite3_realloc                sqlite3_api->realloc
+#define sqlite3_reset                  sqlite3_api->reset
+#define sqlite3_result_blob            sqlite3_api->result_blob
+#define sqlite3_result_double          sqlite3_api->result_double
+#define sqlite3_result_error           sqlite3_api->result_error
+#define sqlite3_result_error16         sqlite3_api->result_error16
+#define sqlite3_result_int             sqlite3_api->result_int
+#define sqlite3_result_int64           sqlite3_api->result_int64
+#define sqlite3_result_null            sqlite3_api->result_null
+#define sqlite3_result_text            sqlite3_api->result_text
+#define sqlite3_result_text16          sqlite3_api->result_text16
+#define sqlite3_result_text16be        sqlite3_api->result_text16be
+#define sqlite3_result_text16le        sqlite3_api->result_text16le
+#define sqlite3_result_value           sqlite3_api->result_value
+#define sqlite3_rollback_hook          sqlite3_api->rollback_hook
+#define sqlite3_set_authorizer         sqlite3_api->set_authorizer
+#define sqlite3_set_auxdata            sqlite3_api->set_auxdata
+#define sqlite3_snprintf               sqlite3_api->snprintf
+#define sqlite3_step                   sqlite3_api->step
+#define sqlite3_table_column_metadata  sqlite3_api->table_column_metadata
+#define sqlite3_thread_cleanup         sqlite3_api->thread_cleanup
+#define sqlite3_total_changes          sqlite3_api->total_changes
+#define sqlite3_trace                  sqlite3_api->trace
+#define sqlite3_transfer_bindings      sqlite3_api->transfer_bindings
+#define sqlite3_update_hook            sqlite3_api->update_hook
+#define sqlite3_user_data              sqlite3_api->user_data
+#define sqlite3_value_blob             sqlite3_api->value_blob
+#define sqlite3_value_bytes            sqlite3_api->value_bytes
+#define sqlite3_value_bytes16          sqlite3_api->value_bytes16
+#define sqlite3_value_double           sqlite3_api->value_double
+#define sqlite3_value_int              sqlite3_api->value_int
+#define sqlite3_value_int64            sqlite3_api->value_int64
+#define sqlite3_value_numeric_type     sqlite3_api->value_numeric_type
+#define sqlite3_value_text             sqlite3_api->value_text
+#define sqlite3_value_text16           sqlite3_api->value_text16
+#define sqlite3_value_text16be         sqlite3_api->value_text16be
+#define sqlite3_value_text16le         sqlite3_api->value_text16le
+#define sqlite3_value_type             sqlite3_api->value_type
+#define sqlite3_vmprintf               sqlite3_api->vmprintf
+#define sqlite3_overload_function      sqlite3_api->overload_function
+#define sqlite3_prepare_v2             sqlite3_api->prepare_v2
+#define sqlite3_prepare16_v2           sqlite3_api->prepare16_v2
+#define sqlite3_clear_bindings         sqlite3_api->clear_bindings
+#define sqlite3_bind_zeroblob          sqlite3_api->bind_zeroblob
+#define sqlite3_blob_bytes             sqlite3_api->blob_bytes
+#define sqlite3_blob_close             sqlite3_api->blob_close
+#define sqlite3_blob_open              sqlite3_api->blob_open
+#define sqlite3_blob_read              sqlite3_api->blob_read
+#define sqlite3_blob_write             sqlite3_api->blob_write
+#define sqlite3_create_collation_v2    sqlite3_api->create_collation_v2
+#define sqlite3_file_control           sqlite3_api->file_control
+#define sqlite3_memory_highwater       sqlite3_api->memory_highwater
+#define sqlite3_memory_used            sqlite3_api->memory_used
+#define sqlite3_mutex_alloc            sqlite3_api->mutex_alloc
+#define sqlite3_mutex_enter            sqlite3_api->mutex_enter
+#define sqlite3_mutex_free             sqlite3_api->mutex_free
+#define sqlite3_mutex_leave            sqlite3_api->mutex_leave
+#define sqlite3_mutex_try              sqlite3_api->mutex_try
+#define sqlite3_open_v2                sqlite3_api->open_v2
+#define sqlite3_release_memory         sqlite3_api->release_memory
+#define sqlite3_result_error_nomem     sqlite3_api->result_error_nomem
+#define sqlite3_result_error_toobig    sqlite3_api->result_error_toobig
+#define sqlite3_sleep                  sqlite3_api->sleep
+#define sqlite3_soft_heap_limit        sqlite3_api->soft_heap_limit
+#define sqlite3_vfs_find               sqlite3_api->vfs_find
+#define sqlite3_vfs_register           sqlite3_api->vfs_register
+#define sqlite3_vfs_unregister         sqlite3_api->vfs_unregister
+#endif /* SQLITE_CORE */
+
+#define SQLITE_EXTENSION_INIT1     const sqlite3_api_routines *sqlite3_api;
+#define SQLITE_EXTENSION_INIT2(v)  sqlite3_api = v;
+
+#endif /* _SQLITE3EXT_H_ */
diff --git a/uppsrc/plugin/sqlite3/lib/sqliteInt.h b/uppsrc/plugin/sqlite3/lib/sqliteInt.h
new file mode 100644
index 000000000..2b3219c55
--- /dev/null
+++ b/uppsrc/plugin/sqlite3/lib/sqliteInt.h
@@ -0,0 +1,2185 @@
+/*
+** 2001 September 15
+**
+** The author disclaims copyright to this source code.  In place of
+** a legal notice, here is a blessing:
+**
+**    May you do good and not evil.
+**    May you find forgiveness for yourself and forgive others.
+**    May you share freely, never taking more than you give.
+**
+*************************************************************************
+** Internal interface definitions for SQLite.
+**
+** @(#) $Id: sqliteInt.h,v 1.673 2008/03/14 13:02:08 mlcreech Exp $
+*/
+#ifndef _SQLITEINT_H_
+#define _SQLITEINT_H_
+
+/*
+** Include the configuration header output by 'configure' if it was run
+** (otherwise we get an empty default).
+*/
+#include "config.h"
+
+/* Needed for various definitions... */
+#define _GNU_SOURCE
+
+/*
+** Include standard header files as necessary
+*/
+#ifdef HAVE_STDINT_H
+#include <stdint.h>
+#endif
+#ifdef HAVE_INTTYPES_H
+#include <inttypes.h>
+#endif
+
+/*
+** If possible, use the C99 intptr_t type to define an integral type of
+** equivalent size to a pointer.  (Technically it's >= sizeof(void *), but
+** practically it's == sizeof(void *)).  We fall back to an int if this type
+** isn't defined.
+*/
+#ifdef HAVE_INTPTR_T
+  typedef intptr_t sqlite3_intptr_t;
+#else
+  typedef int sqlite3_intptr_t;
+#endif
+
+
+/*
+** The macro unlikely() is a hint that surrounds a boolean
+** expression that is usually false.  Macro likely() surrounds
+** a boolean expression that is usually true.  GCC is able to
+** use these hints to generate better code, sometimes.
+*/
+#if defined(__GNUC__) && 0
+# define likely(X)    __builtin_expect((X),1)
+# define unlikely(X)  __builtin_expect((X),0)
+#else
+# define likely(X)    !!(X)
+# define unlikely(X)  !!(X)
+#endif
+
+
+/*
+** These #defines should enable >2GB file support on Posix if the
+** underlying operating system supports it.  If the OS lacks
+** large file support, or if the OS is windows, these should be no-ops.
+**
+** Ticket #2739:  The _LARGEFILE_SOURCE macro must appear before any
+** system #includes.  Hence, this block of code must be the very first
+** code in all source files.
+**
+** Large file support can be disabled using the -DSQLITE_DISABLE_LFS switch
+** on the compiler command line.  This is necessary if you are compiling
+** on a recent machine (ex: RedHat 7.2) but you want your code to work
+** on an older machine (ex: RedHat 6.0).  If you compile on RedHat 7.2
+** without this option, LFS is enable.  But LFS does not exist in the kernel
+** in RedHat 6.0, so the code won't work.  Hence, for maximum binary
+** portability you should omit LFS.
+**
+** Similar is true for MacOS.  LFS is only supported on MacOS 9 and later.
+*/
+#ifndef SQLITE_DISABLE_LFS
+# define _LARGE_FILE       1
+# ifndef _FILE_OFFSET_BITS
+#   define _FILE_OFFSET_BITS 64
+# endif
+# define _LARGEFILE_SOURCE 1
+#endif
+
+
+#include "sqliteLimit.h"
+
+/*
+** For testing purposes, the various size limit constants are really
+** variables that we can modify in the testfixture.
+*/
+#ifdef SQLITE_TEST
+  #undef SQLITE_MAX_LENGTH
+  #undef SQLITE_MAX_COLUMN
+  #undef SQLITE_MAX_SQL_LENGTH
+  #undef SQLITE_MAX_EXPR_DEPTH
+  #undef SQLITE_MAX_COMPOUND_SELECT
+  #undef SQLITE_MAX_VDBE_OP
+  #undef SQLITE_MAX_FUNCTION_ARG
+  #undef SQLITE_MAX_VARIABLE_NUMBER
+  #undef SQLITE_MAX_PAGE_SIZE
+  #undef SQLITE_MAX_PAGE_COUNT
+  #undef SQLITE_MAX_LIKE_PATTERN_LENGTH
+
+  #define SQLITE_MAX_LENGTH              sqlite3MAX_LENGTH
+  #define SQLITE_MAX_COLUMN              sqlite3MAX_COLUMN
+  #define SQLITE_MAX_SQL_LENGTH          sqlite3MAX_SQL_LENGTH
+  #define SQLITE_MAX_EXPR_DEPTH          sqlite3MAX_EXPR_DEPTH
+  #define SQLITE_MAX_COMPOUND_SELECT     sqlite3MAX_COMPOUND_SELECT
+  #define SQLITE_MAX_VDBE_OP             sqlite3MAX_VDBE_OP
+  #define SQLITE_MAX_FUNCTION_ARG        sqlite3MAX_FUNCTION_ARG
+  #define SQLITE_MAX_VARIABLE_NUMBER     sqlite3MAX_VARIABLE_NUMBER
+  #define SQLITE_MAX_PAGE_SIZE           sqlite3MAX_PAGE_SIZE
+  #define SQLITE_MAX_PAGE_COUNT          sqlite3MAX_PAGE_COUNT
+  #define SQLITE_MAX_LIKE_PATTERN_LENGTH sqlite3MAX_LIKE_PATTERN_LENGTH
+
+  extern int sqlite3MAX_LENGTH;
+  extern int sqlite3MAX_COLUMN;
+  extern int sqlite3MAX_SQL_LENGTH;
+  extern int sqlite3MAX_EXPR_DEPTH;
+  extern int sqlite3MAX_COMPOUND_SELECT;
+  extern int sqlite3MAX_VDBE_OP;
+  extern int sqlite3MAX_FUNCTION_ARG;
+  extern int sqlite3MAX_VARIABLE_NUMBER;
+  extern int sqlite3MAX_PAGE_SIZE;
+  extern int sqlite3MAX_PAGE_COUNT;
+  extern int sqlite3MAX_LIKE_PATTERN_LENGTH;
+#endif
+
+
+/*
+** The SQLITE_THREADSAFE macro must be defined as either 0 or 1.
+** Older versions of SQLite used an optional THREADSAFE macro.
+** We support that for legacy
+*/
+#if !defined(SQLITE_THREADSAFE)
+#if defined(THREADSAFE)
+# define SQLITE_THREADSAFE THREADSAFE
+#else
+# define SQLITE_THREADSAFE 1
+#endif
+#endif
+
+/*
+** Exactly one of the following macros must be defined in order to
+** specify which memory allocation subsystem to use.
+**
+**     SQLITE_SYSTEM_MALLOC          // Use normal system malloc()
+**     SQLITE_MEMDEBUG               // Debugging version of system malloc()
+**     SQLITE_MEMORY_SIZE            // internal allocator #1
+**     SQLITE_MMAP_HEAP_SIZE         // internal mmap() allocator
+**     SQLITE_POW2_MEMORY_SIZE       // internal power-of-two allocator
+**
+** If none of the above are defined, then set SQLITE_SYSTEM_MALLOC as
+** the default.
+*/
+#if defined(SQLITE_SYSTEM_MALLOC)+defined(SQLITE_MEMDEBUG)+\
+    defined(SQLITE_MEMORY_SIZE)+defined(SQLITE_MMAP_HEAP_SIZE)+\
+    defined(SQLITE_POW2_MEMORY_SIZE)>1
+# error "At most one of the following compile-time configuration options\
+ is allows: SQLITE_SYSTEM_MALLOC, SQLITE_MEMDEBUG, SQLITE_MEMORY_SIZE,\
+ SQLITE_MMAP_HEAP_SIZE, SQLITE_POW2_MEMORY_SIZE"
+#endif
+#if defined(SQLITE_SYSTEM_MALLOC)+defined(SQLITE_MEMDEBUG)+\
+    defined(SQLITE_MEMORY_SIZE)+defined(SQLITE_MMAP_HEAP_SIZE)+\
+    defined(SQLITE_POW2_MEMORY_SIZE)==0
+# define SQLITE_SYSTEM_MALLOC 1
+#endif
+
+/*
+** If SQLITE_MALLOC_SOFT_LIMIT is defined, then try to keep the
+** sizes of memory allocations below this value where possible.
+*/
+#if defined(SQLITE_POW2_MEMORY_SIZE) && !defined(SQLITE_MALLOC_SOFT_LIMIT)
+# define SQLITE_MALLOC_SOFT_LIMIT 1024
+#endif
+
+/*
+** We need to define _XOPEN_SOURCE as follows in order to enable
+** recursive mutexes on most unix systems.  But Mac OS X is different.
+** The _XOPEN_SOURCE define causes problems for Mac OS X we are told,
+** so it is omitted there.  See ticket #2673.
+**
+** Later we learn that _XOPEN_SOURCE is poorly or incorrectly
+** implemented on some systems.  So we avoid defining it at all
+** if it is already defined or if it is unneeded because we are
+** not doing a threadsafe build.  Ticket #2681.
+**
+** See also ticket #2741.
+*/
+#if !defined(_XOPEN_SOURCE) && !defined(__DARWIN__) && !defined(__APPLE__) && SQLITE_THREADSAFE
+#  define _XOPEN_SOURCE 500  /* Needed to enable pthread recursive mutexes */
+#endif
+
+#if defined(SQLITE_TCL) || defined(TCLSH)
+# include <tcl.h>
+#endif
+
+/*
+** Many people are failing to set -DNDEBUG=1 when compiling SQLite.
+** Setting NDEBUG makes the code smaller and run faster.  So the following
+** lines are added to automatically set NDEBUG unless the -DSQLITE_DEBUG=1
+** option is set.  Thus NDEBUG becomes an opt-in rather than an opt-out
+** feature.
+*/
+#if !defined(NDEBUG) && !defined(SQLITE_DEBUG)
+# define NDEBUG 1
+#endif
+
+#include "sqlite3.h"
+#include "hash.h"
+#include "parse.h"
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <assert.h>
+#include <stddef.h>
+
+#define sqlite3_isnan(X)  ((X)!=(X))
+
+/*
+** If compiling for a processor that lacks floating point support,
+** substitute integer for floating-point
+*/
+#ifdef SQLITE_OMIT_FLOATING_POINT
+# define double sqlite_int64
+# define LONGDOUBLE_TYPE sqlite_int64
+# ifndef SQLITE_BIG_DBL
+#   define SQLITE_BIG_DBL (0x7fffffffffffffff)
+# endif
+# define SQLITE_OMIT_DATETIME_FUNCS 1
+# define SQLITE_OMIT_TRACE 1
+# undef SQLITE_MIXED_ENDIAN_64BIT_FLOAT
+#endif
+#ifndef SQLITE_BIG_DBL
+# define SQLITE_BIG_DBL (1e99)
+#endif
+
+/*
+** OMIT_TEMPDB is set to 1 if SQLITE_OMIT_TEMPDB is defined, or 0
+** afterward. Having this macro allows us to cause the C compiler
+** to omit code used by TEMP tables without messy #ifndef statements.
+*/
+#ifdef SQLITE_OMIT_TEMPDB
+#define OMIT_TEMPDB 1
+#else
+#define OMIT_TEMPDB 0
+#endif
+
+/*
+** If the following macro is set to 1, then NULL values are considered
+** distinct when determining whether or not two entries are the same
+** in a UNIQUE index.  This is the way PostgreSQL, Oracle, DB2, MySQL,
+** OCELOT, and Firebird all work.  The SQL92 spec explicitly says this
+** is the way things are suppose to work.
+**
+** If the following macro is set to 0, the NULLs are indistinct for
+** a UNIQUE index.  In this mode, you can only have a single NULL entry
+** for a column declared UNIQUE.  This is the way Informix and SQL Server
+** work.
+*/
+#define NULL_DISTINCT_FOR_UNIQUE 1
+
+/*
+** The "file format" number is an integer that is incremented whenever
+** the VDBE-level file format changes.  The following macros define the
+** the default file format for new databases and the maximum file format
+** that the library can read.
+*/
+#define SQLITE_MAX_FILE_FORMAT 4
+#ifndef SQLITE_DEFAULT_FILE_FORMAT
+# define SQLITE_DEFAULT_FILE_FORMAT 1
+#endif
+
+/*
+** Provide a default value for TEMP_STORE in case it is not specified
+** on the command-line
+*/
+#ifndef TEMP_STORE
+# define TEMP_STORE 1
+#endif
+
+/*
+** GCC does not define the offsetof() macro so we'll have to do it
+** ourselves.
+*/
+#ifndef offsetof
+#define offsetof(STRUCTURE,FIELD) ((int)((char*)&((STRUCTURE*)0)->FIELD))
+#endif
+
+/*
+** Check to see if this machine uses EBCDIC.  (Yes, believe it or
+** not, there are still machines out there that use EBCDIC.)
+*/
+#if 'A' == '\301'
+# define SQLITE_EBCDIC 1
+#else
+# define SQLITE_ASCII 1
+#endif
+
+/*
+** Integers of known sizes.  These typedefs might change for architectures
+** where the sizes very.  Preprocessor macros are available so that the
+** types can be conveniently redefined at compile-type.  Like this:
+**
+**         cc '-DUINTPTR_TYPE=long long int' ...
+*/
+#ifndef UINT32_TYPE
+# ifdef HAVE_UINT32_T
+#  define UINT32_TYPE uint32_t
+# else
+#  define UINT32_TYPE unsigned int
+# endif
+#endif
+#ifndef UINT16_TYPE
+# ifdef HAVE_UINT16_T
+#  define UINT16_TYPE uint16_t
+# else
+#  define UINT16_TYPE unsigned short int
+# endif
+#endif
+#ifndef INT16_TYPE
+# ifdef HAVE_INT16_T
+#  define INT16_TYPE int16_t
+# else
+#  define INT16_TYPE short int
+# endif
+#endif
+#ifndef UINT8_TYPE
+# ifdef HAVE_UINT8_T
+#  define UINT8_TYPE uint8_t
+# else
+#  define UINT8_TYPE unsigned char
+# endif
+#endif
+#ifndef INT8_TYPE
+# ifdef HAVE_INT8_T
+#  define INT8_TYPE int8_t
+# else
+#  define INT8_TYPE signed char
+# endif
+#endif
+#ifndef LONGDOUBLE_TYPE
+# define LONGDOUBLE_TYPE long double
+#endif
+typedef sqlite_int64 i64;          /* 8-byte signed integer */
+typedef sqlite_uint64 u64;         /* 8-byte unsigned integer */
+typedef UINT32_TYPE u32;           /* 4-byte unsigned integer */
+typedef UINT16_TYPE u16;           /* 2-byte unsigned integer */
+typedef INT16_TYPE i16;            /* 2-byte signed integer */
+typedef UINT8_TYPE u8;             /* 1-byte unsigned integer */
+typedef UINT8_TYPE i8;             /* 1-byte signed integer */
+
+/*
+** Macros to determine whether the machine is big or little endian,
+** evaluated at runtime.
+*/
+#ifdef SQLITE_AMALGAMATION
+const int sqlite3one;
+#else
+extern const int sqlite3one;
+#endif
+#if defined(i386) || defined(__i386__) || defined(_M_IX86)
+# define SQLITE_BIGENDIAN    0
+# define SQLITE_LITTLEENDIAN 1
+# define SQLITE_UTF16NATIVE  SQLITE_UTF16LE
+#else
+# define SQLITE_BIGENDIAN    (*(char *)(&sqlite3one)==0)
+# define SQLITE_LITTLEENDIAN (*(char *)(&sqlite3one)==1)
+# define SQLITE_UTF16NATIVE (SQLITE_BIGENDIAN?SQLITE_UTF16BE:SQLITE_UTF16LE)
+#endif
+
+/*
+** An instance of the following structure is used to store the busy-handler
+** callback for a given sqlite handle.
+**
+** The sqlite.busyHandler member of the sqlite struct contains the busy
+** callback for the database handle. Each pager opened via the sqlite
+** handle is passed a pointer to sqlite.busyHandler. The busy-handler
+** callback is currently invoked only from within pager.c.
+*/
+typedef struct BusyHandler BusyHandler;
+struct BusyHandler {
+  int (*xFunc)(void *,int);  /* The busy callback */
+  void *pArg;                /* First arg to busy callback */
+  int nBusy;                 /* Incremented with each busy call */
+};
+
+/*
+** Name of the master database table.  The master database table
+** is a special table that holds the names and attributes of all
+** user tables and indices.
+*/
+#define MASTER_NAME       "sqlite_master"
+#define TEMP_MASTER_NAME  "sqlite_temp_master"
+
+/*
+** The root-page of the master database table.
+*/
+#define MASTER_ROOT       1
+
+/*
+** The name of the schema table.
+*/
+#define SCHEMA_TABLE(x)  ((!OMIT_TEMPDB)&&(x==1)?TEMP_MASTER_NAME:MASTER_NAME)
+
+/*
+** A convenience macro that returns the number of elements in
+** an array.
+*/
+#define ArraySize(X)    (sizeof(X)/sizeof(X[0]))
+
+/*
+** Forward references to structures
+*/
+typedef struct AggInfo AggInfo;
+typedef struct AuthContext AuthContext;
+typedef struct Bitvec Bitvec;
+typedef struct CollSeq CollSeq;
+typedef struct Column Column;
+typedef struct Db Db;
+typedef struct Schema Schema;
+typedef struct Expr Expr;
+typedef struct ExprList ExprList;
+typedef struct FKey FKey;
+typedef struct FuncDef FuncDef;
+typedef struct IdList IdList;
+typedef struct Index Index;
+typedef struct KeyClass KeyClass;
+typedef struct KeyInfo KeyInfo;
+typedef struct Module Module;
+typedef struct NameContext NameContext;
+typedef struct Parse Parse;
+typedef struct Select Select;
+typedef struct SrcList SrcList;
+typedef struct StrAccum StrAccum;
+typedef struct Table Table;
+typedef struct TableLock TableLock;
+typedef struct Token Token;
+typedef struct TriggerStack TriggerStack;
+typedef struct TriggerStep TriggerStep;
+typedef struct Trigger Trigger;
+typedef struct WhereInfo WhereInfo;
+typedef struct WhereLevel WhereLevel;
+
+/*
+** Defer sourcing vdbe.h and btree.h until after the "u8" and
+** "BusyHandler" typedefs. vdbe.h also requires a few of the opaque
+** pointer types (i.e. FuncDef) defined above.
+*/
+#include "btree.h"
+#include "vdbe.h"
+#include "pager.h"
+
+#include "os.h"
+#include "mutex.h"
+
+
+/*
+** Each database file to be accessed by the system is an instance
+** of the following structure.  There are normally two of these structures
+** in the sqlite.aDb[] array.  aDb[0] is the main database file and
+** aDb[1] is the database file used to hold temporary tables.  Additional
+** databases may be attached.
+*/
+struct Db {
+  char *zName;         /* Name of this database */
+  Btree *pBt;          /* The B*Tree structure for this database file */
+  u8 inTrans;          /* 0: not writable.  1: Transaction.  2: Checkpoint */
+  u8 safety_level;     /* How aggressive at synching data to disk */
+  void *pAux;               /* Auxiliary data.  Usually NULL */
+  void (*xFreeAux)(void*);  /* Routine to free pAux */
+  Schema *pSchema;     /* Pointer to database schema (possibly shared) */
+};
+
+/*
+** An instance of the following structure stores a database schema.
+**
+** If there are no virtual tables configured in this schema, the
+** Schema.db variable is set to NULL. After the first virtual table
+** has been added, it is set to point to the database connection
+** used to create the connection. Once a virtual table has been
+** added to the Schema structure and the Schema.db variable populated,
+** only that database connection may use the Schema to prepare
+** statements.
+*/
+struct Schema {
+  int schema_cookie;   /* Database schema version number for this file */
+  Hash tblHash;        /* All tables indexed by name */
+  Hash idxHash;        /* All (named) indices indexed by name */
+  Hash trigHash;       /* All triggers indexed by name */
+  Hash aFKey;          /* Foreign keys indexed by to-table */
+  Table *pSeqTab;      /* The sqlite_sequence table used by AUTOINCREMENT */
+  u8 file_format;      /* Schema format version for this file */
+  u8 enc;              /* Text encoding used by this database */
+  u16 flags;           /* Flags associated with this schema */
+  int cache_size;      /* Number of pages to use in the cache */
+#ifndef SQLITE_OMIT_VIRTUALTABLE
+  sqlite3 *db;         /* "Owner" connection. See comment above */
+#endif
+};
+
+/*
+** These macros can be used to test, set, or clear bits in the
+** Db.flags field.
+*/
+#define DbHasProperty(D,I,P)     (((D)->aDb[I].pSchema->flags&(P))==(P))
+#define DbHasAnyProperty(D,I,P)  (((D)->aDb[I].pSchema->flags&(P))!=0)
+#define DbSetProperty(D,I,P)     (D)->aDb[I].pSchema->flags|=(P)
+#define DbClearProperty(D,I,P)   (D)->aDb[I].pSchema->flags&=~(P)
+
+/*
+** Allowed values for the DB.flags field.
+**
+** The DB_SchemaLoaded flag is set after the database schema has been
+** read into internal hash tables.
+**
+** DB_UnresetViews means that one or more views have column names that
+** have been filled out.  If the schema changes, these column names might
+** changes and so the view will need to be reset.
+*/
+#define DB_SchemaLoaded    0x0001  /* The schema has been loaded */
+#define DB_UnresetViews    0x0002  /* Some views have defined column names */
+#define DB_Empty           0x0004  /* The file is empty (length 0 bytes) */
+
+
+/*
+** Each database is an instance of the following structure.
+**
+** The sqlite.lastRowid records the last insert rowid generated by an
+** insert statement.  Inserts on views do not affect its value.  Each
+** trigger has its own context, so that lastRowid can be updated inside
+** triggers as usual.  The previous value will be restored once the trigger
+** exits.  Upon entering a before or instead of trigger, lastRowid is no
+** longer (since after version 2.8.12) reset to -1.
+**
+** The sqlite.nChange does not count changes within triggers and keeps no
+** context.  It is reset at start of sqlite3_exec.
+** The sqlite.lsChange represents the number of changes made by the last
+** insert, update, or delete statement.  It remains constant throughout the
+** length of a statement and is then updated by OP_SetCounts.  It keeps a
+** context stack just like lastRowid so that the count of changes
+** within a trigger is not seen outside the trigger.  Changes to views do not
+** affect the value of lsChange.
+** The sqlite.csChange keeps track of the number of current changes (since
+** the last statement) and is used to update sqlite_lsChange.
+**
+** The member variables sqlite.errCode, sqlite.zErrMsg and sqlite.zErrMsg16
+** store the most recent error code and, if applicable, string. The
+** internal function sqlite3Error() is used to set these variables
+** consistently.
+*/
+struct sqlite3 {
+  sqlite3_vfs *pVfs;            /* OS Interface */
+  int nDb;                      /* Number of backends currently in use */
+  Db *aDb;                      /* All backends */
+  int flags;                    /* Miscellanous flags. See below */
+  int openFlags;                /* Flags passed to sqlite3_vfs.xOpen() */
+  int errCode;                  /* Most recent error code (SQLITE_*) */
+  int errMask;                  /* & result codes with this before returning */
+  u8 autoCommit;                /* The auto-commit flag. */
+  u8 temp_store;                /* 1: file 2: memory 0: default */
+  u8 mallocFailed;              /* True if we have seen a malloc failure */
+  signed char nextAutovac;      /* Autovac setting after VACUUM if >=0 */
+  int nTable;                   /* Number of tables in the database */
+  CollSeq *pDfltColl;           /* The default collating sequence (BINARY) */
+  i64 lastRowid;                /* ROWID of most recent insert (see above) */
+  i64 priorNewRowid;            /* Last randomly generated ROWID */
+  int magic;                    /* Magic number for detect library misuse */
+  int nChange;                  /* Value returned by sqlite3_changes() */
+  int nTotalChange;             /* Value returned by sqlite3_total_changes() */
+  sqlite3_mutex *mutex;         /* Connection mutex */
+  struct sqlite3InitInfo {      /* Information used during initialization */
+    int iDb;                    /* When back is being initialized */
+    int newTnum;                /* Rootpage of table being initialized */
+    u8 busy;                    /* TRUE if currently initializing */
+  } init;
+  int nExtension;               /* Number of loaded extensions */
+  void **aExtension;            /* Array of shared libraray handles */
+  struct Vdbe *pVdbe;           /* List of active virtual machines */
+  int activeVdbeCnt;            /* Number of vdbes currently executing */
+  void (*xTrace)(void*,const char*);        /* Trace function */
+  void *pTraceArg;                          /* Argument to the trace function */
+  void (*xProfile)(void*,const char*,u64);  /* Profiling function */
+  void *pProfileArg;                        /* Argument to profile function */
+  void *pCommitArg;                 /* Argument to xCommitCallback() */
+  int (*xCommitCallback)(void*);    /* Invoked at every commit. */
+  void *pRollbackArg;               /* Argument to xRollbackCallback() */
+  void (*xRollbackCallback)(void*); /* Invoked at every commit. */
+  void *pUpdateArg;
+  void (*xUpdateCallback)(void*,int, const char*,const char*,sqlite_int64);
+  void(*xCollNeeded)(void*,sqlite3*,int eTextRep,const char*);
+  void(*xCollNeeded16)(void*,sqlite3*,int eTextRep,const void*);
+  void *pCollNeededArg;
+  sqlite3_value *pErr;          /* Most recent error message */
+  char *zErrMsg;                /* Most recent error message (UTF-8 encoded) */
+  char *zErrMsg16;              /* Most recent error message (UTF-16 encoded) */
+  union {
+    int isInterrupted;          /* True if sqlite3_interrupt has been called */
+    double notUsed1;            /* Spacer */
+  } u1;
+#ifndef SQLITE_OMIT_AUTHORIZATION
+  int (*xAuth)(void*,int,const char*,const char*,const char*,const char*);
+                                /* Access authorization function */
+  void *pAuthArg;               /* 1st argument to the access auth function */
+#endif
+#ifndef SQLITE_OMIT_PROGRESS_CALLBACK
+  int (*xProgress)(void *);     /* The progress callback */
+  void *pProgressArg;           /* Argument to the progress callback */
+  int nProgressOps;             /* Number of opcodes for progress callback */
+#endif
+#ifndef SQLITE_OMIT_VIRTUALTABLE
+  Hash aModule;                 /* populated by sqlite3_create_module() */
+  Table *pVTab;                 /* vtab with active Connect/Create method */
+  sqlite3_vtab **aVTrans;       /* Virtual tables with open transactions */
+  int nVTrans;                  /* Allocated size of aVTrans */
+#endif
+  Hash aFunc;                   /* All functions that can be in SQL exprs */
+  Hash aCollSeq;                /* All collating sequences */
+  BusyHandler busyHandler;      /* Busy callback */
+  int busyTimeout;              /* Busy handler timeout, in msec */
+  Db aDbStatic[2];              /* Static space for the 2 default backends */
+#ifdef SQLITE_SSE
+  sqlite3_stmt *pFetch;         /* Used by SSE to fetch stored statements */
+#endif
+  u8 dfltLockMode;              /* Default locking-mode for attached dbs */
+};
+
+/*
+** A macro to discover the encoding of a database.
+*/
+#define ENC(db) ((db)->aDb[0].pSchema->enc)
+
+/*
+** Possible values for the sqlite.flags and or Db.flags fields.
+**
+** On sqlite.flags, the SQLITE_InTrans value means that we have
+** executed a BEGIN.  On Db.flags, SQLITE_InTrans means a statement
+** transaction is active on that particular database file.
+*/
+#define SQLITE_VdbeTrace      0x00000001  /* True to trace VDBE execution */
+#define SQLITE_InTrans        0x00000008  /* True if in a transaction */
+#define SQLITE_InternChanges  0x00000010  /* Uncommitted Hash table changes */
+#define SQLITE_FullColNames   0x00000020  /* Show full column names on SELECT */
+#define SQLITE_ShortColNames  0x00000040  /* Show short columns names */
+#define SQLITE_CountRows      0x00000080  /* Count rows changed by INSERT, */
+                                          /*   DELETE, or UPDATE and return */
+                                          /*   the count using a callback. */
+#define SQLITE_NullCallback   0x00000100  /* Invoke the callback once if the */
+                                          /*   result set is empty */
+#define SQLITE_SqlTrace       0x00000200  /* Debug print SQL as it executes */
+#define SQLITE_VdbeListing    0x00000400  /* Debug listings of VDBE programs */
+#define SQLITE_WriteSchema    0x00000800  /* OK to update SQLITE_MASTER */
+#define SQLITE_NoReadlock     0x00001000  /* Readlocks are omitted when
+                                          ** accessing read-only databases */
+#define SQLITE_IgnoreChecks   0x00002000  /* Do not enforce check constraints */
+#define SQLITE_ReadUncommitted 0x00004000 /* For shared-cache mode */
+#define SQLITE_LegacyFileFmt  0x00008000  /* Create new databases in format 1 */
+#define SQLITE_FullFSync      0x00010000  /* Use full fsync on the backend */
+#define SQLITE_LoadExtension  0x00020000  /* Enable load_extension */
+
+#define SQLITE_RecoveryMode   0x00040000  /* Ignore schema errors */
+#define SQLITE_SharedCache    0x00080000  /* Cache sharing is enabled */
+#define SQLITE_Vtab           0x00100000  /* There exists a virtual table */
+
+/*
+** Possible values for the sqlite.magic field.
+** The numbers are obtained at random and have no special meaning, other
+** than being distinct from one another.
+*/
+#define SQLITE_MAGIC_OPEN     0xa029a697  /* Database is open */
+#define SQLITE_MAGIC_CLOSED   0x9f3c2d33  /* Database is closed */
+#define SQLITE_MAGIC_SICK     0x4b771290  /* Error and awaiting close */
+#define SQLITE_MAGIC_BUSY     0xf03b7906  /* Database currently in use */
+#define SQLITE_MAGIC_ERROR    0xb5357930  /* An SQLITE_MISUSE error occurred */
+
+/*
+** Each SQL function is defined by an instance of the following
+** structure.  A pointer to this structure is stored in the sqlite.aFunc
+** hash table.  When multiple functions have the same name, the hash table
+** points to a linked list of these structures.
+*/
+struct FuncDef {
+  i16 nArg;            /* Number of arguments.  -1 means unlimited */
+  u8 iPrefEnc;         /* Preferred text encoding (SQLITE_UTF8, 16LE, 16BE) */
+  u8 needCollSeq;      /* True if sqlite3GetFuncCollSeq() might be called */
+  u8 flags;            /* Some combination of SQLITE_FUNC_* */
+  void *pUserData;     /* User data parameter */
+  FuncDef *pNext;      /* Next function with same name */
+  void (*xFunc)(sqlite3_context*,int,sqlite3_value**); /* Regular function */
+  void (*xStep)(sqlite3_context*,int,sqlite3_value**); /* Aggregate step */
+  void (*xFinalize)(sqlite3_context*);                /* Aggregate finializer */
+  char zName[1];       /* SQL name of the function.  MUST BE LAST */
+};
+
+/*
+** Each SQLite module (virtual table definition) is defined by an
+** instance of the following structure, stored in the sqlite3.aModule
+** hash table.
+*/
+struct Module {
+  const sqlite3_module *pModule;       /* Callback pointers */
+  const char *zName;                   /* Name passed to create_module() */
+  void *pAux;                          /* pAux passed to create_module() */
+  void (*xDestroy)(void *);            /* Module destructor function */
+};
+
+/*
+** Possible values for FuncDef.flags
+*/
+#define SQLITE_FUNC_LIKE   0x01  /* Candidate for the LIKE optimization */
+#define SQLITE_FUNC_CASE   0x02  /* Case-sensitive LIKE-type function */
+#define SQLITE_FUNC_EPHEM  0x04  /* Ephermeral.  Delete with VDBE */
+
+/*
+** information about each column of an SQL table is held in an instance
+** of this structure.
+*/
+struct Column {
+  char *zName;     /* Name of this column */
+  Expr *pDflt;     /* Default value of this column */
+  char *zType;     /* Data type for this column */
+  char *zColl;     /* Collating sequence.  If NULL, use the default */
+  u8 notNull;      /* True if there is a NOT NULL constraint */
+  u8 isPrimKey;    /* True if this column is part of the PRIMARY KEY */
+  char affinity;   /* One of the SQLITE_AFF_... values */
+#ifndef SQLITE_OMIT_VIRTUALTABLE
+  u8 isHidden;     /* True if this column is 'hidden' */
+#endif
+};
+
+/*
+** A "Collating Sequence" is defined by an instance of the following
+** structure. Conceptually, a collating sequence consists of a name and
+** a comparison routine that defines the order of that sequence.
+**
+** There may two seperate implementations of the collation function, one
+** that processes text in UTF-8 encoding (CollSeq.xCmp) and another that
+** processes text encoded in UTF-16 (CollSeq.xCmp16), using the machine
+** native byte order. When a collation sequence is invoked, SQLite selects
+** the version that will require the least expensive encoding
+** translations, if any.
+**
+** The CollSeq.pUser member variable is an extra parameter that passed in
+** as the first argument to the UTF-8 comparison function, xCmp.
+** CollSeq.pUser16 is the equivalent for the UTF-16 comparison function,
+** xCmp16.
+**
+** If both CollSeq.xCmp and CollSeq.xCmp16 are NULL, it means that the
+** collating sequence is undefined.  Indices built on an undefined
+** collating sequence may not be read or written.
+*/
+struct CollSeq {
+  char *zName;          /* Name of the collating sequence, UTF-8 encoded */
+  u8 enc;               /* Text encoding handled by xCmp() */
+  u8 type;              /* One of the SQLITE_COLL_... values below */
+  void *pUser;          /* First argument to xCmp() */
+  int (*xCmp)(void*,int, const void*, int, const void*);
+  void (*xDel)(void*);  /* Destructor for pUser */
+};
+
+/*
+** Allowed values of CollSeq flags:
+*/
+#define SQLITE_COLL_BINARY  1  /* The default memcmp() collating sequence */
+#define SQLITE_COLL_NOCASE  2  /* The built-in NOCASE collating sequence */
+#define SQLITE_COLL_REVERSE 3  /* The built-in REVERSE collating sequence */
+#define SQLITE_COLL_USER    0  /* Any other user-defined collating sequence */
+
+/*
+** A sort order can be either ASC or DESC.
+*/
+#define SQLITE_SO_ASC       0  /* Sort in ascending order */
+#define SQLITE_SO_DESC      1  /* Sort in ascending order */
+
+/*
+** Column affinity types.
+**
+** These used to have mnemonic name like 'i' for SQLITE_AFF_INTEGER and
+** 't' for SQLITE_AFF_TEXT.  But we can save a little space and improve
+** the speed a little by number the values consecutively.
+**
+** But rather than start with 0 or 1, we begin with 'a'.  That way,
+** when multiple affinity types are concatenated into a string and
+** used as the P4 operand, they will be more readable.
+**
+** Note also that the numeric types are grouped together so that testing
+** for a numeric type is a single comparison.
+*/
+#define SQLITE_AFF_TEXT     'a'
+#define SQLITE_AFF_NONE     'b'
+#define SQLITE_AFF_NUMERIC  'c'
+#define SQLITE_AFF_INTEGER  'd'
+#define SQLITE_AFF_REAL     'e'
+
+#define sqlite3IsNumericAffinity(X)  ((X)>=SQLITE_AFF_NUMERIC)
+
+/*
+** The SQLITE_AFF_MASK values masks off the significant bits of an
+** affinity value.
+*/
+#define SQLITE_AFF_MASK     0x67
+
+/*
+** Additional bit values that can be ORed with an affinity without
+** changing the affinity.
+*/
+#define SQLITE_JUMPIFNULL   0x08  /* jumps if either operand is NULL */
+#define SQLITE_NULLEQUAL    0x10  /* compare NULLs equal */
+#define SQLITE_STOREP2      0x80  /* Store result in reg[P2] rather than jump */
+
+/*
+** Each SQL table is represented in memory by an instance of the
+** following structure.
+**
+** Table.zName is the name of the table.  The case of the original
+** CREATE TABLE statement is stored, but case is not significant for
+** comparisons.
+**
+** Table.nCol is the number of columns in this table.  Table.aCol is a
+** pointer to an array of Column structures, one for each column.
+**
+** If the table has an INTEGER PRIMARY KEY, then Table.iPKey is the index of
+** the column that is that key.   Otherwise Table.iPKey is negative.  Note
+** that the datatype of the PRIMARY KEY must be INTEGER for this field to
+** be set.  An INTEGER PRIMARY KEY is used as the rowid for each row of
+** the table.  If a table has no INTEGER PRIMARY KEY, then a random rowid
+** is generated for each row of the table.  Table.hasPrimKey is true if
+** the table has any PRIMARY KEY, INTEGER or otherwise.
+**
+** Table.tnum is the page number for the root BTree page of the table in the
+** database file.  If Table.iDb is the index of the database table backend
+** in sqlite.aDb[].  0 is for the main database and 1 is for the file that
+** holds temporary tables and indices.  If Table.isEphem
+** is true, then the table is stored in a file that is automatically deleted
+** when the VDBE cursor to the table is closed.  In this case Table.tnum
+** refers VDBE cursor number that holds the table open, not to the root
+** page number.  Transient tables are used to hold the results of a
+** sub-query that appears instead of a real table name in the FROM clause
+** of a SELECT statement.
+*/
+struct Table {
+  char *zName;     /* Name of the table */
+  int nCol;        /* Number of columns in this table */
+  Column *aCol;    /* Information about each column */
+  int iPKey;       /* If not less then 0, use aCol[iPKey] as the primary key */
+  Index *pIndex;   /* List of SQL indexes on this table. */
+  int tnum;        /* Root BTree node for this table (see note above) */
+  Select *pSelect; /* NULL for tables.  Points to definition if a view. */
+  int nRef;          /* Number of pointers to this Table */
+  Trigger *pTrigger; /* List of SQL triggers on this table */
+  FKey *pFKey;       /* Linked list of all foreign keys in this table */
+  char *zColAff;     /* String defining the affinity of each column */
+#ifndef SQLITE_OMIT_CHECK
+  Expr *pCheck;      /* The AND of all CHECK constraints */
+#endif
+#ifndef SQLITE_OMIT_ALTERTABLE
+  int addColOffset;  /* Offset in CREATE TABLE statement to add a new column */
+#endif
+  u8 readOnly;     /* True if this table should not be written by the user */
+  u8 isEphem;      /* True if created using OP_OpenEphermeral */
+  u8 hasPrimKey;   /* True if there exists a primary key */
+  u8 keyConf;      /* What to do in case of uniqueness conflict on iPKey */
+  u8 autoInc;      /* True if the integer primary key is autoincrement */
+#ifndef SQLITE_OMIT_VIRTUALTABLE
+  u8 isVirtual;             /* True if this is a virtual table */
+  u8 isCommit;              /* True once the CREATE TABLE has been committed */
+  Module *pMod;             /* Pointer to the implementation of the module */
+  sqlite3_vtab *pVtab;      /* Pointer to the module instance */
+  int nModuleArg;           /* Number of arguments to the module */
+  char **azModuleArg;       /* Text of all module args. [0] is module name */
+#endif
+  Schema *pSchema;          /* Schema that contains this table */
+};
+
+/*
+** Test to see whether or not a table is a virtual table.  This is
+** done as a macro so that it will be optimized out when virtual
+** table support is omitted from the build.
+*/
+#ifndef SQLITE_OMIT_VIRTUALTABLE
+#  define IsVirtual(X)      ((X)->isVirtual)
+#  define IsHiddenColumn(X) ((X)->isHidden)
+#else
+#  define IsVirtual(X)      0
+#  define IsHiddenColumn(X) 0
+#endif
+
+/*
+** Each foreign key constraint is an instance of the following structure.
+**
+** A foreign key is associated with two tables.  The "from" table is
+** the table that contains the REFERENCES clause that creates the foreign
+** key.  The "to" table is the table that is named in the REFERENCES clause.
+** Consider this example:
+**
+**     CREATE TABLE ex1(
+**       a INTEGER PRIMARY KEY,
+**       b INTEGER CONSTRAINT fk1 REFERENCES ex2(x)
+**     );
+**
+** For foreign key "fk1", the from-table is "ex1" and the to-table is "ex2".
+**
+** Each REFERENCES clause generates an instance of the following structure
+** which is attached to the from-table.  The to-table need not exist when
+** the from-table is created.  The existance of the to-table is not checked
+** until an attempt is made to insert data into the from-table.
+**
+** The sqlite.aFKey hash table stores pointers to this structure
+** given the name of a to-table.  For each to-table, all foreign keys
+** associated with that table are on a linked list using the FKey.pNextTo
+** field.
+*/
+struct FKey {
+  Table *pFrom;     /* The table that constains the REFERENCES clause */
+  FKey *pNextFrom;  /* Next foreign key in pFrom */
+  char *zTo;        /* Name of table that the key points to */
+  FKey *pNextTo;    /* Next foreign key that points to zTo */
+  int nCol;         /* Number of columns in this key */
+  struct sColMap {  /* Mapping of columns in pFrom to columns in zTo */
+    int iFrom;         /* Index of column in pFrom */
+    char *zCol;        /* Name of column in zTo.  If 0 use PRIMARY KEY */
+  } *aCol;          /* One entry for each of nCol column s */
+  u8 isDeferred;    /* True if constraint checking is deferred till COMMIT */
+  u8 updateConf;    /* How to resolve conflicts that occur on UPDATE */
+  u8 deleteConf;    /* How to resolve conflicts that occur on DELETE */
+  u8 insertConf;    /* How to resolve conflicts that occur on INSERT */
+};
+
+/*
+** SQLite supports many different ways to resolve a constraint
+** error.  ROLLBACK processing means that a constraint violation
+** causes the operation in process to fail and for the current transaction
+** to be rolled back.  ABORT processing means the operation in process
+** fails and any prior changes from that one operation are backed out,
+** but the transaction is not rolled back.  FAIL processing means that
+** the operation in progress stops and returns an error code.  But prior
+** changes due to the same operation are not backed out and no rollback
+** occurs.  IGNORE means that the particular row that caused the constraint
+** error is not inserted or updated.  Processing continues and no error
+** is returned.  REPLACE means that preexisting database rows that caused
+** a UNIQUE constraint violation are removed so that the new insert or
+** update can proceed.  Processing continues and no error is reported.
+**
+** RESTRICT, SETNULL, and CASCADE actions apply only to foreign keys.
+** RESTRICT is the same as ABORT for IMMEDIATE foreign keys and the
+** same as ROLLBACK for DEFERRED keys.  SETNULL means that the foreign
+** key is set to NULL.  CASCADE means that a DELETE or UPDATE of the
+** referenced table row is propagated into the row that holds the
+** foreign key.
+**
+** The following symbolic values are used to record which type
+** of action to take.
+*/
+#define OE_None     0   /* There is no constraint to check */
+#define OE_Rollback 1   /* Fail the operation and rollback the transaction */
+#define OE_Abort    2   /* Back out changes but do no rollback transaction */
+#define OE_Fail     3   /* Stop the operation but leave all prior changes */
+#define OE_Ignore   4   /* Ignore the error. Do not do the INSERT or UPDATE */
+#define OE_Replace  5   /* Delete existing record, then do INSERT or UPDATE */
+
+#define OE_Restrict 6   /* OE_Abort for IMMEDIATE, OE_Rollback for DEFERRED */
+#define OE_SetNull  7   /* Set the foreign key value to NULL */
+#define OE_SetDflt  8   /* Set the foreign key value to its default */
+#define OE_Cascade  9   /* Cascade the changes */
+
+#define OE_Default  99  /* Do whatever the default action is */
+
+
+/*
+** An instance of the following structure is passed as the first
+** argument to sqlite3VdbeKeyCompare and is used to control the
+** comparison of the two index keys.
+**
+** If the KeyInfo.incrKey value is true and the comparison would
+** otherwise be equal, then return a result as if the second key
+** were larger.
+*/
+struct KeyInfo {
+  sqlite3 *db;        /* The database connection */
+  u8 enc;             /* Text encoding - one of the TEXT_Utf* values */
+  u8 incrKey;         /* Increase 2nd key by epsilon before comparison */
+  u8 prefixIsEqual;   /* Treat a prefix as equal */
+  int nField;         /* Number of entries in aColl[] */
+  u8 *aSortOrder;     /* If defined an aSortOrder[i] is true, sort DESC */
+  CollSeq *aColl[1];  /* Collating sequence for each term of the key */
+};
+
+/*
+** Each SQL index is represented in memory by an
+** instance of the following structure.
+**
+** The columns of the table that are to be indexed are described
+** by the aiColumn[] field of this structure.  For example, suppose
+** we have the following table and index:
+**
+**     CREATE TABLE Ex1(c1 int, c2 int, c3 text);
+**     CREATE INDEX Ex2 ON Ex1(c3,c1);
+**
+** In the Table structure describing Ex1, nCol==3 because there are
+** three columns in the table.  In the Index structure describing
+** Ex2, nColumn==2 since 2 of the 3 columns of Ex1 are indexed.
+** The value of aiColumn is {2, 0}.  aiColumn[0]==2 because the
+** first column to be indexed (c3) has an index of 2 in Ex1.aCol[].
+** The second column to be indexed (c1) has an index of 0 in
+** Ex1.aCol[], hence Ex2.aiColumn[1]==0.
+**
+** The Index.onError field determines whether or not the indexed columns
+** must be unique and what to do if they are not.  When Index.onError=OE_None,
+** it means this is not a unique index.  Otherwise it is a unique index
+** and the value of Index.onError indicate the which conflict resolution
+** algorithm to employ whenever an attempt is made to insert a non-unique
+** element.
+*/
+struct Index {
+  char *zName;     /* Name of this index */
+  int nColumn;     /* Number of columns in the table used by this index */
+  int *aiColumn;   /* Which columns are used by this index.  1st is 0 */
+  unsigned *aiRowEst; /* Result of ANALYZE: Est. rows selected by each column */
+  Table *pTable;   /* The SQL table being indexed */
+  int tnum;        /* Page containing root of this index in database file */
+  u8 onError;      /* OE_Abort, OE_Ignore, OE_Replace, or OE_None */
+  u8 autoIndex;    /* True if is automatically created (ex: by UNIQUE) */
+  char *zColAff;   /* String defining the affinity of each column */
+  Index *pNext;    /* The next index associated with the same table */
+  Schema *pSchema; /* Schema containing this index */
+  u8 *aSortOrder;  /* Array of size Index.nColumn. True==DESC, False==ASC */
+  char **azColl;   /* Array of collation sequence names for index */
+};
+
+/*
+** Each token coming out of the lexer is an instance of
+** this structure.  Tokens are also used as part of an expression.
+**
+** Note if Token.z==0 then Token.dyn and Token.n are undefined and
+** may contain random values.  Do not make any assuptions about Token.dyn
+** and Token.n when Token.z==0.
+*/
+struct Token {
+  const unsigned char *z; /* Text of the token.  Not NULL-terminated! */
+  unsigned dyn  : 1;      /* True for malloced memory, false for static */
+  unsigned n    : 31;     /* Number of characters in this token */
+};
+
+/*
+** An instance of this structure contains information needed to generate
+** code for a SELECT that contains aggregate functions.
+**
+** If Expr.op==TK_AGG_COLUMN or TK_AGG_FUNCTION then Expr.pAggInfo is a
+** pointer to this structure.  The Expr.iColumn field is the index in
+** AggInfo.aCol[] or AggInfo.aFunc[] of information needed to generate
+** code for that node.
+**
+** AggInfo.pGroupBy and AggInfo.aFunc.pExpr point to fields within the
+** original Select structure that describes the SELECT statement.  These
+** fields do not need to be freed when deallocating the AggInfo structure.
+*/
+struct AggInfo {
+  u8 directMode;          /* Direct rendering mode means take data directly
+                          ** from source tables rather than from accumulators */
+  u8 useSortingIdx;       /* In direct mode, reference the sorting index rather
+                          ** than the source table */
+  int sortingIdx;         /* Cursor number of the sorting index */
+  ExprList *pGroupBy;     /* The group by clause */
+  int nSortingColumn;     /* Number of columns in the sorting index */
+  struct AggInfo_col {    /* For each column used in source tables */
+    Table *pTab;             /* Source table */
+    int iTable;              /* Cursor number of the source table */
+    int iColumn;             /* Column number within the source table */
+    int iSorterColumn;       /* Column number in the sorting index */
+    int iMem;                /* Memory location that acts as accumulator */
+    Expr *pExpr;             /* The original expression */
+  } *aCol;
+  int nColumn;            /* Number of used entries in aCol[] */
+  int nColumnAlloc;       /* Number of slots allocated for aCol[] */
+  int nAccumulator;       /* Number of columns that show through to the output.
+                          ** Additional columns are used only as parameters to
+                          ** aggregate functions */
+  struct AggInfo_func {   /* For each aggregate function */
+    Expr *pExpr;             /* Expression encoding the function */
+    FuncDef *pFunc;          /* The aggregate function implementation */
+    int iMem;                /* Memory location that acts as accumulator */
+    int iDistinct;           /* Ephermeral table used to enforce DISTINCT */
+  } *aFunc;
+  int nFunc;              /* Number of entries in aFunc[] */
+  int nFuncAlloc;         /* Number of slots allocated for aFunc[] */
+};
+
+/*
+** Each node of an expression in the parse tree is an instance
+** of this structure.
+**
+** Expr.op is the opcode.  The integer parser token codes are reused
+** as opcodes here.  For example, the parser defines TK_GE to be an integer
+** code representing the ">=" operator.  This same integer code is reused
+** to represent the greater-than-or-equal-to operator in the expression
+** tree.
+**
+** Expr.pRight and Expr.pLeft are subexpressions.  Expr.pList is a list
+** of argument if the expression is a function.
+**
+** Expr.token is the operator token for this node.  For some expressions
+** that have subexpressions, Expr.token can be the complete text that gave
+** rise to the Expr.  In the latter case, the token is marked as being
+** a compound token.
+**
+** An expression of the form ID or ID.ID refers to a column in a table.
+** For such expressions, Expr.op is set to TK_COLUMN and Expr.iTable is
+** the integer cursor number of a VDBE cursor pointing to that table and
+** Expr.iColumn is the column number for the specific column.  If the
+** expression is used as a result in an aggregate SELECT, then the
+** value is also stored in the Expr.iAgg column in the aggregate so that
+** it can be accessed after all aggregates are computed.
+**
+** If the expression is a function, the Expr.iTable is an integer code
+** representing which function.  If the expression is an unbound variable
+** marker (a question mark character '?' in the original SQL) then the
+** Expr.iTable holds the index number for that variable.
+**
+** If the expression is a subquery then Expr.iColumn holds an integer
+** register number containing the result of the subquery.  If the
+** subquery gives a constant result, then iTable is -1.  If the subquery
+** gives a different answer at different times during statement processing
+** then iTable is the address of a subroutine that computes the subquery.
+**
+** The Expr.pSelect field points to a SELECT statement.  The SELECT might
+** be the right operand of an IN operator.  Or, if a scalar SELECT appears
+** in an expression the opcode is TK_SELECT and Expr.pSelect is the only
+** operand.
+**
+** If the Expr is of type OP_Column, and the table it is selecting from
+** is a disk table or the "old.*" pseudo-table, then pTab points to the
+** corresponding table definition.
+*/
+struct Expr {
+  u8 op;                 /* Operation performed by this node */
+  char affinity;         /* The affinity of the column or 0 if not a column */
+  u16 flags;             /* Various flags.  See below */
+  CollSeq *pColl;        /* The collation type of the column or 0 */
+  Expr *pLeft, *pRight;  /* Left and right subnodes */
+  ExprList *pList;       /* A list of expressions used as function arguments
+                         ** or in "<expr> IN (<expr-list)" */
+  Token token;           /* An operand token */
+  Token span;            /* Complete text of the expression */
+  int iTable, iColumn;   /* When op==TK_COLUMN, then this expr node means the
+                         ** iColumn-th field of the iTable-th table. */
+  AggInfo *pAggInfo;     /* Used by TK_AGG_COLUMN and TK_AGG_FUNCTION */
+  int iAgg;              /* Which entry in pAggInfo->aCol[] or ->aFunc[] */
+  int iRightJoinTable;   /* If EP_FromJoin, the right table of the join */
+  Select *pSelect;       /* When the expression is a sub-select.  Also the
+                         ** right side of "<expr> IN (<select>)" */
+  Table *pTab;           /* Table for OP_Column expressions. */
+/*  Schema *pSchema; */
+#if defined(SQLITE_TEST) || SQLITE_MAX_EXPR_DEPTH>0
+  int nHeight;           /* Height of the tree headed by this node */
+#endif
+};
+
+/*
+** The following are the meanings of bits in the Expr.flags field.
+*/
+#define EP_FromJoin     0x01  /* Originated in ON or USING clause of a join */
+#define EP_Agg          0x02  /* Contains one or more aggregate functions */
+#define EP_Resolved     0x04  /* IDs have been resolved to COLUMNs */
+#define EP_Error        0x08  /* Expression contains one or more errors */
+#define EP_Distinct     0x10  /* Aggregate function with DISTINCT keyword */
+#define EP_VarSelect    0x20  /* pSelect is correlated, not constant */
+#define EP_Dequoted     0x40  /* True if the string has been dequoted */
+#define EP_InfixFunc    0x80  /* True for an infix function: LIKE, GLOB, etc */
+#define EP_ExpCollate  0x100  /* Collating sequence specified explicitly */
+
+/*
+** These macros can be used to test, set, or clear bits in the
+** Expr.flags field.
+*/
+#define ExprHasProperty(E,P)     (((E)->flags&(P))==(P))
+#define ExprHasAnyProperty(E,P)  (((E)->flags&(P))!=0)
+#define ExprSetProperty(E,P)     (E)->flags|=(P)
+#define ExprClearProperty(E,P)   (E)->flags&=~(P)
+
+/*
+** A list of expressions.  Each expression may optionally have a
+** name.  An expr/name combination can be used in several ways, such
+** as the list of "expr AS ID" fields following a "SELECT" or in the
+** list of "ID = expr" items in an UPDATE.  A list of expressions can
+** also be used as the argument to a function, in which case the a.zName
+** field is not used.
+*/
+struct ExprList {
+  int nExpr;             /* Number of expressions on the list */
+  int nAlloc;            /* Number of entries allocated below */
+  int iECursor;          /* VDBE Cursor associated with this ExprList */
+  struct ExprList_item {
+    Expr *pExpr;           /* The list of expressions */
+    char *zName;           /* Token associated with this expression */
+    u8 sortOrder;          /* 1 for DESC or 0 for ASC */
+    u8 isAgg;              /* True if this is an aggregate like count(*) */
+    u8 done;               /* A flag to indicate when processing is finished */
+  } *a;                  /* One entry for each expression */
+};
+
+/*
+** An instance of this structure can hold a simple list of identifiers,
+** such as the list "a,b,c" in the following statements:
+**
+**      INSERT INTO t(a,b,c) VALUES ...;
+**      CREATE INDEX idx ON t(a,b,c);
+**      CREATE TRIGGER trig BEFORE UPDATE ON t(a,b,c) ...;
+**
+** The IdList.a.idx field is used when the IdList represents the list of
+** column names after a table name in an INSERT statement.  In the statement
+**
+**     INSERT INTO t(a,b,c) ...
+**
+** If "a" is the k-th column of table "t", then IdList.a[0].idx==k.
+*/
+struct IdList {
+  struct IdList_item {
+    char *zName;      /* Name of the identifier */
+    int idx;          /* Index in some Table.aCol[] of a column named zName */
+  } *a;
+  int nId;         /* Number of identifiers on the list */
+  int nAlloc;      /* Number of entries allocated for a[] below */
+};
+
+/*
+** The bitmask datatype defined below is used for various optimizations.
+**
+** Changing this from a 64-bit to a 32-bit type limits the number of
+** tables in a join to 32 instead of 64.  But it also reduces the size
+** of the library by 738 bytes on ix86.
+*/
+typedef u64 Bitmask;
+
+/*
+** The following structure describes the FROM clause of a SELECT statement.
+** Each table or subquery in the FROM clause is a separate element of
+** the SrcList.a[] array.
+**
+** With the addition of multiple database support, the following structure
+** can also be used to describe a particular table such as the table that
+** is modified by an INSERT, DELETE, or UPDATE statement.  In standard SQL,
+** such a table must be a simple name: ID.  But in SQLite, the table can
+** now be identified by a database name, a dot, then the table name: ID.ID.
+**
+** The jointype starts out showing the join type between the current table
+** and the next table on the list.  The parser builds the list this way.
+** But sqlite3SrcListShiftJoinType() later shifts the jointypes so that each
+** jointype expresses the join between the table and the previous table.
+*/
+struct SrcList {
+  i16 nSrc;        /* Number of tables or subqueries in the FROM clause */
+  i16 nAlloc;      /* Number of entries allocated in a[] below */
+  struct SrcList_item {
+    char *zDatabase;  /* Name of database holding this table */
+    char *zName;      /* Name of the table */
+    char *zAlias;     /* The "B" part of a "A AS B" phrase.  zName is the "A" */
+    Table *pTab;      /* An SQL table corresponding to zName */
+    Select *pSelect;  /* A SELECT statement used in place of a table name */
+    u8 isPopulated;   /* Temporary table associated with SELECT is populated */
+    u8 jointype;      /* Type of join between this able and the previous */
+    int iCursor;      /* The VDBE cursor number used to access this table */
+    Expr *pOn;        /* The ON clause of a join */
+    IdList *pUsing;   /* The USING clause of a join */
+    Bitmask colUsed;  /* Bit N (1<<N) set if column N or pTab is used */
+  } a[1];             /* One entry for each identifier on the list */
+};
+
+/*
+** Permitted values of the SrcList.a.jointype field
+*/
+#define JT_INNER     0x0001    /* Any kind of inner or cross join */
+#define JT_CROSS     0x0002    /* Explicit use of the CROSS keyword */
+#define JT_NATURAL   0x0004    /* True for a "natural" join */
+#define JT_LEFT      0x0008    /* Left outer join */
+#define JT_RIGHT     0x0010    /* Right outer join */
+#define JT_OUTER     0x0020    /* The "OUTER" keyword is present */
+#define JT_ERROR     0x0040    /* unknown or unsupported join type */
+
+/*
+** For each nested loop in a WHERE clause implementation, the WhereInfo
+** structure contains a single instance of this structure.  This structure
+** is intended to be private the the where.c module and should not be
+** access or modified by other modules.
+**
+** The pIdxInfo and pBestIdx fields are used to help pick the best
+** index on a virtual table.  The pIdxInfo pointer contains indexing
+** information for the i-th table in the FROM clause before reordering.
+** All the pIdxInfo pointers are freed by whereInfoFree() in where.c.
+** The pBestIdx pointer is a copy of pIdxInfo for the i-th table after
+** FROM clause ordering.  This is a little confusing so I will repeat
+** it in different words.  WhereInfo.a[i].pIdxInfo is index information
+** for WhereInfo.pTabList.a[i].  WhereInfo.a[i].pBestInfo is the
+** index information for the i-th loop of the join.  pBestInfo is always
+** either NULL or a copy of some pIdxInfo.  So for cleanup it is
+** sufficient to free all of the pIdxInfo pointers.
+**
+*/
+struct WhereLevel {
+  int iFrom;            /* Which entry in the FROM clause */
+  int flags;            /* Flags associated with this level */
+  int iMem;             /* First memory cell used by this level */
+  int iLeftJoin;        /* Memory cell used to implement LEFT OUTER JOIN */
+  Index *pIdx;          /* Index used.  NULL if no index */
+  int iTabCur;          /* The VDBE cursor used to access the table */
+  int iIdxCur;          /* The VDBE cursor used to acesss pIdx */
+  int brk;              /* Jump here to break out of the loop */
+  int nxt;              /* Jump here to start the next IN combination */
+  int cont;             /* Jump here to continue with the next loop cycle */
+  int top;              /* First instruction of interior of the loop */
+  int op, p1, p2;       /* Opcode used to terminate the loop */
+  int nEq;              /* Number of == or IN constraints on this loop */
+  int nIn;              /* Number of IN operators constraining this loop */
+  struct InLoop {
+    int iCur;              /* The VDBE cursor used by this IN operator */
+    int topAddr;           /* Top of the IN loop */
+  } *aInLoop;           /* Information about each nested IN operator */
+  sqlite3_index_info *pBestIdx;  /* Index information for this level */
+
+  /* The following field is really not part of the current level.  But
+  ** we need a place to cache index information for each table in the
+  ** FROM clause and the WhereLevel structure is a convenient place.
+  */
+  sqlite3_index_info *pIdxInfo;  /* Index info for n-th source table */
+};
+
+#define ORDERBY_NORMAL 0
+#define ORDERBY_MIN    1
+#define ORDERBY_MAX    2
+
+/*
+** The WHERE clause processing routine has two halves.  The
+** first part does the start of the WHERE loop and the second
+** half does the tail of the WHERE loop.  An instance of
+** this structure is returned by the first half and passed
+** into the second half to give some continuity.
+*/
+struct WhereInfo {
+  Parse *pParse;
+  SrcList *pTabList;   /* List of tables in the join */
+  int iTop;            /* The very beginning of the WHERE loop */
+  int iContinue;       /* Jump here to continue with next record */
+  int iBreak;          /* Jump here to break out of the loop */
+  int nLevel;          /* Number of nested loop */
+  sqlite3_index_info **apInfo;  /* Array of pointers to index info structures */
+  WhereLevel a[1];     /* Information about each nest loop in the WHERE */
+};
+
+/*
+** A NameContext defines a context in which to resolve table and column
+** names.  The context consists of a list of tables (the pSrcList) field and
+** a list of named expression (pEList).  The named expression list may
+** be NULL.  The pSrc corresponds to the FROM clause of a SELECT or
+** to the table being operated on by INSERT, UPDATE, or DELETE.  The
+** pEList corresponds to the result set of a SELECT and is NULL for
+** other statements.
+**
+** NameContexts can be nested.  When resolving names, the inner-most
+** context is searched first.  If no match is found, the next outer
+** context is checked.  If there is still no match, the next context
+** is checked.  This process continues until either a match is found
+** or all contexts are check.  When a match is found, the nRef member of
+** the context containing the match is incremented.
+**
+** Each subquery gets a new NameContext.  The pNext field points to the
+** NameContext in the parent query.  Thus the process of scanning the
+** NameContext list corresponds to searching through successively outer
+** subqueries looking for a match.
+*/
+struct NameContext {
+  Parse *pParse;       /* The parser */
+  SrcList *pSrcList;   /* One or more tables used to resolve names */
+  ExprList *pEList;    /* Optional list of named expressions */
+  int nRef;            /* Number of names resolved by this context */
+  int nErr;            /* Number of errors encountered while resolving names */
+  u8 allowAgg;         /* Aggregate functions allowed here */
+  u8 hasAgg;           /* True if aggregates are seen */
+  u8 isCheck;          /* True if resolving names in a CHECK constraint */
+  int nDepth;          /* Depth of subquery recursion. 1 for no recursion */
+  AggInfo *pAggInfo;   /* Information about aggregates at this level */
+  NameContext *pNext;  /* Next outer name context.  NULL for outermost */
+};
+
+/*
+** An instance of the following structure contains all information
+** needed to generate code for a single SELECT statement.
+**
+** nLimit is set to -1 if there is no LIMIT clause.  nOffset is set to 0.
+** If there is a LIMIT clause, the parser sets nLimit to the value of the
+** limit and nOffset to the value of the offset (or 0 if there is not
+** offset).  But later on, nLimit and nOffset become the memory locations
+** in the VDBE that record the limit and offset counters.
+**
+** addrOpenEphm[] entries contain the address of OP_OpenEphemeral opcodes.
+** These addresses must be stored so that we can go back and fill in
+** the P4_KEYINFO and P2 parameters later.  Neither the KeyInfo nor
+** the number of columns in P2 can be computed at the same time
+** as the OP_OpenEphm instruction is coded because not
+** enough information about the compound query is known at that point.
+** The KeyInfo for addrOpenTran[0] and [1] contains collating sequences
+** for the result set.  The KeyInfo for addrOpenTran[2] contains collating
+** sequences for the ORDER BY clause.
+*/
+struct Select {
+  ExprList *pEList;      /* The fields of the result */
+  u8 op;                 /* One of: TK_UNION TK_ALL TK_INTERSECT TK_EXCEPT */
+  u8 isDistinct;         /* True if the DISTINCT keyword is present */
+  u8 isResolved;         /* True once sqlite3SelectResolve() has run. */
+  u8 isAgg;              /* True if this is an aggregate query */
+  u8 usesEphm;           /* True if uses an OpenEphemeral opcode */
+  u8 disallowOrderBy;    /* Do not allow an ORDER BY to be attached if TRUE */
+  char affinity;         /* MakeRecord with this affinity for SRT_Set */
+  SrcList *pSrc;         /* The FROM clause */
+  Expr *pWhere;          /* The WHERE clause */
+  ExprList *pGroupBy;    /* The GROUP BY clause */
+  Expr *pHaving;         /* The HAVING clause */
+  ExprList *pOrderBy;    /* The ORDER BY clause */
+  Select *pPrior;        /* Prior select in a compound select statement */
+  Select *pNext;         /* Next select to the left in a compound */
+  Select *pRightmost;    /* Right-most select in a compound select statement */
+  Expr *pLimit;          /* LIMIT expression. NULL means not used. */
+  Expr *pOffset;         /* OFFSET expression. NULL means not used. */
+  int iLimit, iOffset;   /* Memory registers holding LIMIT & OFFSET counters */
+  int addrOpenEphm[3];   /* OP_OpenEphem opcodes related to this select */
+};
+
+/*
+** The results of a select can be distributed in several ways.
+*/
+#define SRT_Union        1  /* Store result as keys in an index */
+#define SRT_Except       2  /* Remove result from a UNION index */
+#define SRT_Exists       3  /* Store 1 if the result is not empty */
+#define SRT_Discard      4  /* Do not save the results anywhere */
+
+/* The ORDER BY clause is ignored for all of the above */
+#define IgnorableOrderby(X) ((X->eDest)<=SRT_Discard)
+
+#define SRT_Callback     5  /* Invoke a callback with each row of result */
+#define SRT_Mem          6  /* Store result in a memory cell */
+#define SRT_Set          7  /* Store non-null results as keys in an index */
+#define SRT_Table        8  /* Store result as data with an automatic rowid */
+#define SRT_EphemTab     9  /* Create transient tab and store like SRT_Table */
+#define SRT_Subroutine  10  /* Call a subroutine to handle results */
+
+/*
+** A structure used to customize the behaviour of sqlite3Select(). See
+** comments above sqlite3Select() for details.
+*/
+typedef struct SelectDest SelectDest;
+struct SelectDest {
+  u8 eDest;         /* How to dispose of the results */
+  u8 affinity;      /* Affinity used when eDest==SRT_Set */
+  int iParm;        /* A parameter used by the eDest disposal method */
+  int iMem;         /* Base register where results are written */
+};
+
+/*
+** An SQL parser context.  A copy of this structure is passed through
+** the parser and down into all the parser action routine in order to
+** carry around information that is global to the entire parse.
+**
+** The structure is divided into two parts.  When the parser and code
+** generate call themselves recursively, the first part of the structure
+** is constant but the second part is reset at the beginning and end of
+** each recursion.
+**
+** The nTableLock and aTableLock variables are only used if the shared-cache
+** feature is enabled (if sqlite3Tsd()->useSharedData is true). They are
+** used to store the set of table-locks required by the statement being
+** compiled. Function sqlite3TableLock() is used to add entries to the
+** list.
+*/
+struct Parse {
+  sqlite3 *db;         /* The main database structure */
+  int rc;              /* Return code from execution */
+  char *zErrMsg;       /* An error message */
+  Vdbe *pVdbe;         /* An engine for executing database bytecode */
+  u8 colNamesSet;      /* TRUE after OP_ColumnName has been issued to pVdbe */
+  u8 nameClash;        /* A permanent table name clashes with temp table name */
+  u8 checkSchema;      /* Causes schema cookie check after an error */
+  u8 nested;           /* Number of nested calls to the parser/code generator */
+  u8 parseError;       /* True after a parsing error.  Ticket #1794 */
+  u8 nTempReg;         /* Number of temporary registers in aTempReg[] */
+  u8 nTempInUse;       /* Number of aTempReg[] currently checked out */
+  int aTempReg[8];     /* Holding area for temporary registers */
+  int nRangeReg;       /* Size of the temporary register block */
+  int iRangeReg;       /* First register in temporary register block */
+  int nErr;            /* Number of errors seen */
+  int nTab;            /* Number of previously allocated VDBE cursors */
+  int nMem;            /* Number of memory cells used so far */
+  int nSet;            /* Number of sets used so far */
+  int ckBase;          /* Base register of data during check constraints */
+  u32 writeMask;       /* Start a write transaction on these databases */
+  u32 cookieMask;      /* Bitmask of schema verified databases */
+  int cookieGoto;      /* Address of OP_Goto to cookie verifier subroutine */
+  int cookieValue[SQLITE_MAX_ATTACHED+2];  /* Values of cookies to verify */
+#ifndef SQLITE_OMIT_SHARED_CACHE
+  int nTableLock;        /* Number of locks in aTableLock */
+  TableLock *aTableLock; /* Required table locks for shared-cache mode */
+#endif
+  int regRowid;        /* Register holding rowid of CREATE TABLE entry */
+  int regRoot;         /* Register holding root page number for new objects */
+
+  /* Above is constant between recursions.  Below is reset before and after
+  ** each recursion */
+
+  int nVar;            /* Number of '?' variables seen in the SQL so far */
+  int nVarExpr;        /* Number of used slots in apVarExpr[] */
+  int nVarExprAlloc;   /* Number of allocated slots in apVarExpr[] */
+  Expr **apVarExpr;    /* Pointers to :aaa and $aaaa wildcard expressions */
+  u8 explain;          /* True if the EXPLAIN flag is found on the query */
+  Token sErrToken;     /* The token at which the error occurred */
+  Token sNameToken;    /* Token with unqualified schema object name */
+  Token sLastToken;    /* The last token parsed */
+  const char *zSql;    /* All SQL text */
+  const char *zTail;   /* All SQL text past the last semicolon parsed */
+  Table *pNewTable;    /* A table being constructed by CREATE TABLE */
+  Trigger *pNewTrigger;     /* Trigger under construct by a CREATE TRIGGER */
+  TriggerStack *trigStack;  /* Trigger actions being coded */
+  const char *zAuthContext; /* The 6th parameter to db->xAuth callbacks */
+#ifndef SQLITE_OMIT_VIRTUALTABLE
+  Token sArg;                /* Complete text of a module argument */
+  u8 declareVtab;            /* True if inside sqlite3_declare_vtab() */
+  Table *pVirtualLock;       /* Require virtual table lock on this table */
+#endif
+#if defined(SQLITE_TEST) || SQLITE_MAX_EXPR_DEPTH>0
+  int nHeight;            /* Expression tree height of current sub-select */
+#endif
+};
+
+#ifdef SQLITE_OMIT_VIRTUALTABLE
+  #define IN_DECLARE_VTAB 0
+#else
+  #define IN_DECLARE_VTAB (pParse->declareVtab)
+#endif
+
+/*
+** An instance of the following structure can be declared on a stack and used
+** to save the Parse.zAuthContext value so that it can be restored later.
+*/
+struct AuthContext {
+  const char *zAuthContext;   /* Put saved Parse.zAuthContext here */
+  Parse *pParse;              /* The Parse structure */
+};
+
+/*
+** Bitfield flags for P2 value in OP_Insert and OP_Delete
+*/
+#define OPFLAG_NCHANGE   1    /* Set to update db->nChange */
+#define OPFLAG_LASTROWID 2    /* Set to update db->lastRowid */
+#define OPFLAG_ISUPDATE  4    /* This OP_Insert is an sql UPDATE */
+#define OPFLAG_APPEND    8    /* This is likely to be an append */
+
+/*
+ * Each trigger present in the database schema is stored as an instance of
+ * struct Trigger.
+ *
+ * Pointers to instances of struct Trigger are stored in two ways.
+ * 1. In the "trigHash" hash table (part of the sqlite3* that represents the
+ *    database). This allows Trigger structures to be retrieved by name.
+ * 2. All triggers associated with a single table form a linked list, using the
+ *    pNext member of struct Trigger. A pointer to the first element of the
+ *    linked list is stored as the "pTrigger" member of the associated
+ *    struct Table.
+ *
+ * The "step_list" member points to the first element of a linked list
+ * containing the SQL statements specified as the trigger program.
+ */
+struct Trigger {
+  char *name;             /* The name of the trigger                        */
+  char *table;            /* The table or view to which the trigger applies */
+  u8 op;                  /* One of TK_DELETE, TK_UPDATE, TK_INSERT         */
+  u8 tr_tm;               /* One of TRIGGER_BEFORE, TRIGGER_AFTER */
+  Expr *pWhen;            /* The WHEN clause of the expresion (may be NULL) */
+  IdList *pColumns;       /* If this is an UPDATE OF <column-list> trigger,
+                             the <column-list> is stored here */
+  Token nameToken;        /* Token containing zName. Use during parsing only */
+  Schema *pSchema;        /* Schema containing the trigger */
+  Schema *pTabSchema;     /* Schema containing the table */
+  TriggerStep *step_list; /* Link list of trigger program steps             */
+  Trigger *pNext;         /* Next trigger associated with the table */
+};
+
+/*
+** A trigger is either a BEFORE or an AFTER trigger.  The following constants
+** determine which.
+**
+** If there are multiple triggers, you might of some BEFORE and some AFTER.
+** In that cases, the constants below can be ORed together.
+*/
+#define TRIGGER_BEFORE  1
+#define TRIGGER_AFTER   2
+
+/*
+ * An instance of struct TriggerStep is used to store a single SQL statement
+ * that is a part of a trigger-program.
+ *
+ * Instances of struct TriggerStep are stored in a singly linked list (linked
+ * using the "pNext" member) referenced by the "step_list" member of the
+ * associated struct Trigger instance. The first element of the linked list is
+ * the first step of the trigger-program.
+ *
+ * The "op" member indicates whether this is a "DELETE", "INSERT", "UPDATE" or
+ * "SELECT" statement. The meanings of the other members is determined by the
+ * value of "op" as follows:
+ *
+ * (op == TK_INSERT)
+ * orconf    -> stores the ON CONFLICT algorithm
+ * pSelect   -> If this is an INSERT INTO ... SELECT ... statement, then
+ *              this stores a pointer to the SELECT statement. Otherwise NULL.
+ * target    -> A token holding the name of the table to insert into.
+ * pExprList -> If this is an INSERT INTO ... VALUES ... statement, then
+ *              this stores values to be inserted. Otherwise NULL.
+ * pIdList   -> If this is an INSERT INTO ... (<column-names>) VALUES ...
+ *              statement, then this stores the column-names to be
+ *              inserted into.
+ *
+ * (op == TK_DELETE)
+ * target    -> A token holding the name of the table to delete from.
+ * pWhere    -> The WHERE clause of the DELETE statement if one is specified.
+ *              Otherwise NULL.
+ *
+ * (op == TK_UPDATE)
+ * target    -> A token holding the name of the table to update rows of.
+ * pWhere    -> The WHERE clause of the UPDATE statement if one is specified.
+ *              Otherwise NULL.
+ * pExprList -> A list of the columns to update and the expressions to update
+ *              them to. See sqlite3Update() documentation of "pChanges"
+ *              argument.
+ *
+ */
+struct TriggerStep {
+  int op;              /* One of TK_DELETE, TK_UPDATE, TK_INSERT, TK_SELECT */
+  int orconf;          /* OE_Rollback etc. */
+  Trigger *pTrig;      /* The trigger that this step is a part of */
+
+  Select *pSelect;     /* Valid for SELECT and sometimes
+                          INSERT steps (when pExprList == 0) */
+  Token target;        /* Valid for DELETE, UPDATE, INSERT steps */
+  Expr *pWhere;        /* Valid for DELETE, UPDATE steps */
+  ExprList *pExprList; /* Valid for UPDATE statements and sometimes
+                           INSERT steps (when pSelect == 0)         */
+  IdList *pIdList;     /* Valid for INSERT statements only */
+  TriggerStep *pNext;  /* Next in the link-list */
+  TriggerStep *pLast;  /* Last element in link-list. Valid for 1st elem only */
+};
+
+/*
+ * An instance of struct TriggerStack stores information required during code
+ * generation of a single trigger program. While the trigger program is being
+ * coded, its associated TriggerStack instance is pointed to by the
+ * "pTriggerStack" member of the Parse structure.
+ *
+ * The pTab member points to the table that triggers are being coded on. The
+ * newIdx member contains the index of the vdbe cursor that points at the temp
+ * table that stores the new.* references. If new.* references are not valid
+ * for the trigger being coded (for example an ON DELETE trigger), then newIdx
+ * is set to -1. The oldIdx member is analogous to newIdx, for old.* references.
+ *
+ * The ON CONFLICT policy to be used for the trigger program steps is stored
+ * as the orconf member. If this is OE_Default, then the ON CONFLICT clause
+ * specified for individual triggers steps is used.
+ *
+ * struct TriggerStack has a "pNext" member, to allow linked lists to be
+ * constructed. When coding nested triggers (triggers fired by other triggers)
+ * each nested trigger stores its parent trigger's TriggerStack as the "pNext"
+ * pointer. Once the nested trigger has been coded, the pNext value is restored
+ * to the pTriggerStack member of the Parse stucture and coding of the parent
+ * trigger continues.
+ *
+ * Before a nested trigger is coded, the linked list pointed to by the
+ * pTriggerStack is scanned to ensure that the trigger is not about to be coded
+ * recursively. If this condition is detected, the nested trigger is not coded.
+ */
+struct TriggerStack {
+  Table *pTab;         /* Table that triggers are currently being coded on */
+  int newIdx;          /* Index of vdbe cursor to "new" temp table */
+  int oldIdx;          /* Index of vdbe cursor to "old" temp table */
+  u32 newColMask;
+  u32 oldColMask;
+  int orconf;          /* Current orconf policy */
+  int ignoreJump;      /* where to jump to for a RAISE(IGNORE) */
+  Trigger *pTrigger;   /* The trigger currently being coded */
+  TriggerStack *pNext; /* Next trigger down on the trigger stack */
+};
+
+/*
+** The following structure contains information used by the sqliteFix...
+** routines as they walk the parse tree to make database references
+** explicit.
+*/
+typedef struct DbFixer DbFixer;
+struct DbFixer {
+  Parse *pParse;      /* The parsing context.  Error messages written here */
+  const char *zDb;    /* Make sure all objects are contained in this database */
+  const char *zType;  /* Type of the container - used for error messages */
+  const Token *pName; /* Name of the container - used for error messages */
+};
+
+/*
+** An objected used to accumulate the text of a string where we
+** do not necessarily know how big the string will be in the end.
+*/
+struct StrAccum {
+  char *zBase;     /* A base allocation.  Not from malloc. */
+  char *zText;     /* The string collected so far */
+  int  nChar;      /* Length of the string so far */
+  int  nAlloc;     /* Amount of space allocated in zText */
+  u8   mallocFailed;   /* Becomes true if any memory allocation fails */
+  u8   useMalloc;      /* True if zText is enlargable using realloc */
+  u8   tooBig;         /* Becomes true if string size exceeds limits */
+};
+
+/*
+** A pointer to this structure is used to communicate information
+** from sqlite3Init and OP_ParseSchema into the sqlite3InitCallback.
+*/
+typedef struct {
+  sqlite3 *db;        /* The database being initialized */
+  int iDb;            /* 0 for main database.  1 for TEMP, 2.. for ATTACHed */
+  char **pzErrMsg;    /* Error message stored here */
+  int rc;             /* Result code stored here */
+} InitData;
+
+/*
+** Assuming zIn points to the first byte of a UTF-8 character,
+** advance zIn to point to the first byte of the next UTF-8 character.
+*/
+#define SQLITE_SKIP_UTF8(zIn) {                        \
+  if( (*(zIn++))>=0xc0 ){                              \
+    while( (*zIn & 0xc0)==0x80 ){ zIn++; }             \
+  }                                                    \
+}
+
+/*
+** The SQLITE_CORRUPT_BKPT macro can be either a constant (for production
+** builds) or a function call (for debugging).  If it is a function call,
+** it allows the operator to set a breakpoint at the spot where database
+** corruption is first detected.
+*/
+#ifdef SQLITE_DEBUG
+  int sqlite3Corrupt(void);
+# define SQLITE_CORRUPT_BKPT sqlite3Corrupt()
+# define DEBUGONLY(X)        X
+#else
+# define SQLITE_CORRUPT_BKPT SQLITE_CORRUPT
+# define DEBUGONLY(X)
+#endif
+
+/*
+** Internal function prototypes
+*/
+int sqlite3StrICmp(const char *, const char *);
+int sqlite3StrNICmp(const char *, const char *, int);
+int sqlite3IsNumber(const char*, int*, u8);
+
+void *sqlite3MallocZero(unsigned);
+void *sqlite3DbMallocZero(sqlite3*, unsigned);
+void *sqlite3DbMallocRaw(sqlite3*, unsigned);
+char *sqlite3StrDup(const char*);
+char *sqlite3StrNDup(const char*, int);
+char *sqlite3DbStrDup(sqlite3*,const char*);
+char *sqlite3DbStrNDup(sqlite3*,const char*, int);
+void *sqlite3DbReallocOrFree(sqlite3 *, void *, int);
+void *sqlite3DbRealloc(sqlite3 *, void *, int);
+int sqlite3MallocSize(void *);
+
+char *sqlite3MPrintf(sqlite3*,const char*, ...);
+char *sqlite3VMPrintf(sqlite3*,const char*, va_list);
+#if defined(SQLITE_TEST) || defined(SQLITE_DEBUG)
+  void sqlite3DebugPrintf(const char*, ...);
+#endif
+#if defined(SQLITE_TEST)
+  void *sqlite3TextToPtr(const char*);
+#endif
+void sqlite3SetString(char **, ...);
+void sqlite3ErrorMsg(Parse*, const char*, ...);
+void sqlite3ErrorClear(Parse*);
+void sqlite3Dequote(char*);
+void sqlite3DequoteExpr(sqlite3*, Expr*);
+int sqlite3KeywordCode(const unsigned char*, int);
+int sqlite3RunParser(Parse*, const char*, char **);
+void sqlite3FinishCoding(Parse*);
+int sqlite3GetTempReg(Parse*);
+void sqlite3ReleaseTempReg(Parse*,int);
+int sqlite3GetTempRange(Parse*,int);
+void sqlite3ReleaseTempRange(Parse*,int,int);
+Expr *sqlite3Expr(sqlite3*, int, Expr*, Expr*, const Token*);
+Expr *sqlite3PExpr(Parse*, int, Expr*, Expr*, const Token*);
+Expr *sqlite3RegisterExpr(Parse*,Token*);
+Expr *sqlite3ExprAnd(sqlite3*,Expr*, Expr*);
+void sqlite3ExprSpan(Expr*,Token*,Token*);
+Expr *sqlite3ExprFunction(Parse*,ExprList*, Token*);
+void sqlite3ExprAssignVarNumber(Parse*, Expr*);
+void sqlite3ExprDelete(Expr*);
+ExprList *sqlite3ExprListAppend(Parse*,ExprList*,Expr*,Token*);
+void sqlite3ExprListDelete(ExprList*);
+int sqlite3Init(sqlite3*, char**);
+int sqlite3InitCallback(void*, int, char**, char**);
+void sqlite3Pragma(Parse*,Token*,Token*,Token*,int);
+void sqlite3ResetInternalSchema(sqlite3*, int);
+void sqlite3BeginParse(Parse*,int);
+void sqlite3CommitInternalChanges(sqlite3*);
+Table *sqlite3ResultSetOfSelect(Parse*,char*,Select*);
+void sqlite3OpenMasterTable(Parse *, int);
+void sqlite3StartTable(Parse*,Token*,Token*,int,int,int,int);
+void sqlite3AddColumn(Parse*,Token*);
+void sqlite3AddNotNull(Parse*, int);
+void sqlite3AddPrimaryKey(Parse*, ExprList*, int, int, int);
+void sqlite3AddCheckConstraint(Parse*, Expr*);
+void sqlite3AddColumnType(Parse*,Token*);
+void sqlite3AddDefaultValue(Parse*,Expr*);
+void sqlite3AddCollateType(Parse*, Token*);
+void sqlite3EndTable(Parse*,Token*,Token*,Select*);
+
+Bitvec *sqlite3BitvecCreate(u32);
+int sqlite3BitvecTest(Bitvec*, u32);
+int sqlite3BitvecSet(Bitvec*, u32);
+void sqlite3BitvecClear(Bitvec*, u32);
+void sqlite3BitvecDestroy(Bitvec*);
+
+void sqlite3CreateView(Parse*,Token*,Token*,Token*,Select*,int,int);
+
+#if !defined(SQLITE_OMIT_VIEW) || !defined(SQLITE_OMIT_VIRTUALTABLE)
+  int sqlite3ViewGetColumnNames(Parse*,Table*);
+#else
+# define sqlite3ViewGetColumnNames(A,B) 0
+#endif
+
+void sqlite3DropTable(Parse*, SrcList*, int, int);
+void sqlite3DeleteTable(Table*);
+void sqlite3Insert(Parse*, SrcList*, ExprList*, Select*, IdList*, int);
+void *sqlite3ArrayAllocate(sqlite3*,void*,int,int,int*,int*,int*);
+IdList *sqlite3IdListAppend(sqlite3*, IdList*, Token*);
+int sqlite3IdListIndex(IdList*,const char*);
+SrcList *sqlite3SrcListAppend(sqlite3*, SrcList*, Token*, Token*);
+SrcList *sqlite3SrcListAppendFromTerm(Parse*, SrcList*, Token*, Token*, Token*,
+                                      Select*, Expr*, IdList*);
+void sqlite3SrcListShiftJoinType(SrcList*);
+void sqlite3SrcListAssignCursors(Parse*, SrcList*);
+void sqlite3IdListDelete(IdList*);
+void sqlite3SrcListDelete(SrcList*);
+void sqlite3CreateIndex(Parse*,Token*,Token*,SrcList*,ExprList*,int,Token*,
+                        Token*, int, int);
+void sqlite3DropIndex(Parse*, SrcList*, int);
+int sqlite3Select(Parse*, Select*, SelectDest*, Select*, int, int*, char *aff);
+Select *sqlite3SelectNew(Parse*,ExprList*,SrcList*,Expr*,ExprList*,
+                         Expr*,ExprList*,int,Expr*,Expr*);
+void sqlite3SelectDelete(Select*);
+Table *sqlite3SrcListLookup(Parse*, SrcList*);
+int sqlite3IsReadOnly(Parse*, Table*, int);
+void sqlite3OpenTable(Parse*, int iCur, int iDb, Table*, int);
+void sqlite3DeleteFrom(Parse*, SrcList*, Expr*);
+void sqlite3Update(Parse*, SrcList*, ExprList*, Expr*, int);
+WhereInfo *sqlite3WhereBegin(Parse*, SrcList*, Expr*, ExprList**, u8);
+void sqlite3WhereEnd(WhereInfo*);
+void sqlite3ExprCodeGetColumn(Vdbe*, Table*, int, int, int);
+int sqlite3ExprCode(Parse*, Expr*, int);
+int sqlite3ExprCodeTemp(Parse*, Expr*, int*);
+int sqlite3ExprCodeAndCache(Parse*, Expr*, int);
+int sqlite3ExprCodeExprList(Parse*, ExprList*, int);
+void sqlite3ExprIfTrue(Parse*, Expr*, int, int);
+void sqlite3ExprIfFalse(Parse*, Expr*, int, int);
+Table *sqlite3FindTable(sqlite3*,const char*, const char*);
+Table *sqlite3LocateTable(Parse*,int isView,const char*, const char*);
+Index *sqlite3FindIndex(sqlite3*,const char*, const char*);
+void sqlite3UnlinkAndDeleteTable(sqlite3*,int,const char*);
+void sqlite3UnlinkAndDeleteIndex(sqlite3*,int,const char*);
+void sqlite3Vacuum(Parse*);
+int sqlite3RunVacuum(char**, sqlite3*);
+char *sqlite3NameFromToken(sqlite3*, Token*);
+int sqlite3ExprCompare(Expr*, Expr*);
+int sqlite3ExprResolveNames(NameContext *, Expr *);
+void sqlite3ExprAnalyzeAggregates(NameContext*, Expr*);
+void sqlite3ExprAnalyzeAggList(NameContext*,ExprList*);
+Vdbe *sqlite3GetVdbe(Parse*);
+Expr *sqlite3CreateIdExpr(Parse *, const char*);
+void sqlite3Randomness(int, void*);
+void sqlite3RollbackAll(sqlite3*);
+void sqlite3CodeVerifySchema(Parse*, int);
+void sqlite3BeginTransaction(Parse*, int);
+void sqlite3CommitTransaction(Parse*);
+void sqlite3RollbackTransaction(Parse*);
+int sqlite3ExprIsConstant(Expr*);
+int sqlite3ExprIsConstantNotJoin(Expr*);
+int sqlite3ExprIsConstantOrFunction(Expr*);
+int sqlite3ExprIsInteger(Expr*, int*);
+int sqlite3IsRowid(const char*);
+void sqlite3GenerateRowDelete(Parse*, Table*, int, int, int);
+void sqlite3GenerateRowIndexDelete(Parse*, Table*, int, int*);
+int sqlite3GenerateIndexKey(Parse*, Index*, int, int);
+void sqlite3GenerateConstraintChecks(Parse*,Table*,int,int,
+                                     int*,int,int,int,int);
+void sqlite3CompleteInsertion(Parse*, Table*, int, int, int*,int,int,int,int);
+int sqlite3OpenTableAndIndices(Parse*, Table*, int, int);
+void sqlite3BeginWriteOperation(Parse*, int, int);
+Expr *sqlite3ExprDup(sqlite3*,Expr*);
+void sqlite3TokenCopy(sqlite3*,Token*, Token*);
+ExprList *sqlite3ExprListDup(sqlite3*,ExprList*);
+SrcList *sqlite3SrcListDup(sqlite3*,SrcList*);
+IdList *sqlite3IdListDup(sqlite3*,IdList*);
+Select *sqlite3SelectDup(sqlite3*,Select*);
+FuncDef *sqlite3FindFunction(sqlite3*,const char*,int,int,u8,int);
+void sqlite3RegisterBuiltinFunctions(sqlite3*);
+void sqlite3RegisterDateTimeFunctions(sqlite3*);
+#ifdef SQLITE_DEBUG
+  int sqlite3SafetyOn(sqlite3*);
+  int sqlite3SafetyOff(sqlite3*);
+#else
+# define sqlite3SafetyOn(A) 0
+# define sqlite3SafetyOff(A) 0
+#endif
+int sqlite3SafetyCheckOk(sqlite3*);
+int sqlite3SafetyCheckSickOrOk(sqlite3*);
+void sqlite3ChangeCookie(Parse*, int);
+void sqlite3MaterializeView(Parse*, Select*, Expr*, u32, int);
+
+#ifndef SQLITE_OMIT_TRIGGER
+  void sqlite3BeginTrigger(Parse*, Token*,Token*,int,int,IdList*,SrcList*,
+                           Expr*,int, int);
+  void sqlite3FinishTrigger(Parse*, TriggerStep*, Token*);
+  void sqlite3DropTrigger(Parse*, SrcList*, int);
+  void sqlite3DropTriggerPtr(Parse*, Trigger*);
+  int sqlite3TriggersExist(Parse*, Table*, int, ExprList*);
+  int sqlite3CodeRowTrigger(Parse*, int, ExprList*, int, Table *, int, int,
+                           int, int, u32*, u32*);
+  void sqliteViewTriggers(Parse*, Table*, Expr*, int, ExprList*);
+  void sqlite3DeleteTriggerStep(TriggerStep*);
+  TriggerStep *sqlite3TriggerSelectStep(sqlite3*,Select*);
+  TriggerStep *sqlite3TriggerInsertStep(sqlite3*,Token*, IdList*,
+                                        ExprList*,Select*,int);
+  TriggerStep *sqlite3TriggerUpdateStep(sqlite3*,Token*,ExprList*, Expr*, int);
+  TriggerStep *sqlite3TriggerDeleteStep(sqlite3*,Token*, Expr*);
+  void sqlite3DeleteTrigger(Trigger*);
+  void sqlite3UnlinkAndDeleteTrigger(sqlite3*,int,const char*);
+  void sqlite3SelectMask(Parse *, Select *, u32);
+#else
+# define sqlite3TriggersExist(A,B,C,D,E,F) 0
+# define sqlite3DeleteTrigger(A)
+# define sqlite3DropTriggerPtr(A,B)
+# define sqlite3UnlinkAndDeleteTrigger(A,B,C)
+# define sqlite3CodeRowTrigger(A,B,C,D,E,F,G,H,I,J,K) 0
+# define sqlite3SelectMask(A, B, C)
+#endif
+
+int sqlite3JoinType(Parse*, Token*, Token*, Token*);
+void sqlite3CreateForeignKey(Parse*, ExprList*, Token*, ExprList*, int);
+void sqlite3DeferForeignKey(Parse*, int);
+#ifndef SQLITE_OMIT_AUTHORIZATION
+  void sqlite3AuthRead(Parse*,Expr*,Schema*,SrcList*);
+  int sqlite3AuthCheck(Parse*,int, const char*, const char*, const char*);
+  void sqlite3AuthContextPush(Parse*, AuthContext*, const char*);
+  void sqlite3AuthContextPop(AuthContext*);
+#else
+# define sqlite3AuthRead(a,b,c,d)
+# define sqlite3AuthCheck(a,b,c,d,e)    SQLITE_OK
+# define sqlite3AuthContextPush(a,b,c)
+# define sqlite3AuthContextPop(a)  ((void)(a))
+#endif
+void sqlite3Attach(Parse*, Expr*, Expr*, Expr*);
+void sqlite3Detach(Parse*, Expr*);
+int sqlite3BtreeFactory(const sqlite3 *db, const char *zFilename,
+                       int omitJournal, int nCache, int flags, Btree **ppBtree);
+int sqlite3FixInit(DbFixer*, Parse*, int, const char*, const Token*);
+int sqlite3FixSrcList(DbFixer*, SrcList*);
+int sqlite3FixSelect(DbFixer*, Select*);
+int sqlite3FixExpr(DbFixer*, Expr*);
+int sqlite3FixExprList(DbFixer*, ExprList*);
+int sqlite3FixTriggerStep(DbFixer*, TriggerStep*);
+int sqlite3AtoF(const char *z, double*);
+char *sqlite3_snprintf(int,char*,const char*,...);
+int sqlite3GetInt32(const char *, int*);
+int sqlite3FitsIn64Bits(const char *, int);
+int sqlite3Utf16ByteLen(const void *pData, int nChar);
+int sqlite3Utf8CharLen(const char *pData, int nByte);
+int sqlite3Utf8Read(const u8*, const u8*, const u8**);
+int sqlite3PutVarint(unsigned char *, u64);
+int sqlite3GetVarint(const unsigned char *, u64 *);
+int sqlite3GetVarint32(const unsigned char *, u32 *);
+int sqlite3VarintLen(u64 v);
+void sqlite3IndexAffinityStr(Vdbe *, Index *);
+void sqlite3TableAffinityStr(Vdbe *, Table *);
+char sqlite3CompareAffinity(Expr *pExpr, char aff2);
+int sqlite3IndexAffinityOk(Expr *pExpr, char idx_affinity);
+char sqlite3ExprAffinity(Expr *pExpr);
+int sqlite3Atoi64(const char*, i64*);
+void sqlite3Error(sqlite3*, int, const char*,...);
+void *sqlite3HexToBlob(sqlite3*, const char *z, int n);
+int sqlite3TwoPartName(Parse *, Token *, Token *, Token **);
+const char *sqlite3ErrStr(int);
+int sqlite3ReadSchema(Parse *pParse);
+CollSeq *sqlite3FindCollSeq(sqlite3*,u8 enc, const char *,int,int);
+CollSeq *sqlite3LocateCollSeq(Parse *pParse, const char *zName, int nName);
+CollSeq *sqlite3ExprCollSeq(Parse *pParse, Expr *pExpr);
+Expr *sqlite3ExprSetColl(Parse *pParse, Expr *, Token *);
+int sqlite3CheckCollSeq(Parse *, CollSeq *);
+int sqlite3CheckObjectName(Parse *, const char *);
+void sqlite3VdbeSetChanges(sqlite3 *, int);
+
+const void *sqlite3ValueText(sqlite3_value*, u8);
+int sqlite3ValueBytes(sqlite3_value*, u8);
+void sqlite3ValueSetStr(sqlite3_value*, int, const void *,u8,
+                        void(*)(void*));
+void sqlite3ValueFree(sqlite3_value*);
+sqlite3_value *sqlite3ValueNew(sqlite3 *);
+char *sqlite3Utf16to8(sqlite3 *, const void*, int);
+int sqlite3ValueFromExpr(sqlite3 *, Expr *, u8, u8, sqlite3_value **);
+void sqlite3ValueApplyAffinity(sqlite3_value *, u8, u8);
+#ifndef SQLITE_AMALGAMATION
+extern const unsigned char sqlite3UpperToLower[];
+#endif
+void sqlite3RootPageMoved(Db*, int, int);
+void sqlite3Reindex(Parse*, Token*, Token*);
+void sqlite3AlterFunctions(sqlite3*);
+void sqlite3AlterRenameTable(Parse*, SrcList*, Token*);
+int sqlite3GetToken(const unsigned char *, int *);
+void sqlite3NestedParse(Parse*, const char*, ...);
+void sqlite3ExpirePreparedStatements(sqlite3*);
+void sqlite3CodeSubselect(Parse *, Expr *);
+int sqlite3SelectResolve(Parse *, Select *, NameContext *);
+void sqlite3ColumnDefault(Vdbe *, Table *, int);
+void sqlite3AlterFinishAddColumn(Parse *, Token *);
+void sqlite3AlterBeginAddColumn(Parse *, SrcList *);
+CollSeq *sqlite3GetCollSeq(sqlite3*, CollSeq *, const char *, int);
+char sqlite3AffinityType(const Token*);
+void sqlite3Analyze(Parse*, Token*, Token*);
+int sqlite3InvokeBusyHandler(BusyHandler*);
+int sqlite3FindDb(sqlite3*, Token*);
+int sqlite3AnalysisLoad(sqlite3*,int iDB);
+void sqlite3DefaultRowEst(Index*);
+void sqlite3RegisterLikeFunctions(sqlite3*, int);
+int sqlite3IsLikeFunction(sqlite3*,Expr*,int*,char*);
+void sqlite3AttachFunctions(sqlite3 *);
+void sqlite3MinimumFileFormat(Parse*, int, int);
+void sqlite3SchemaFree(void *);
+Schema *sqlite3SchemaGet(sqlite3 *, Btree *);
+int sqlite3SchemaToIndex(sqlite3 *db, Schema *);
+KeyInfo *sqlite3IndexKeyinfo(Parse *, Index *);
+int sqlite3CreateFunc(sqlite3 *, const char *, int, int, void *,
+  void (*)(sqlite3_context*,int,sqlite3_value **),
+  void (*)(sqlite3_context*,int,sqlite3_value **), void (*)(sqlite3_context*));
+int sqlite3ApiExit(sqlite3 *db, int);
+int sqlite3OpenTempDatabase(Parse *);
+
+void sqlite3StrAccumAppend(StrAccum*,const char*,int);
+char *sqlite3StrAccumFinish(StrAccum*);
+void sqlite3StrAccumReset(StrAccum*);
+void sqlite3SelectDestInit(SelectDest*,int,int);
+
+/*
+** The interface to the LEMON-generated parser
+*/
+void *sqlite3ParserAlloc(void*(*)(size_t));
+void sqlite3ParserFree(void*, void(*)(void*));
+void sqlite3Parser(void*, int, Token, Parse*);
+
+#ifndef SQLITE_OMIT_LOAD_EXTENSION
+  void sqlite3CloseExtensions(sqlite3*);
+  int sqlite3AutoLoadExtensions(sqlite3*);
+#else
+# define sqlite3CloseExtensions(X)
+# define sqlite3AutoLoadExtensions(X)  SQLITE_OK
+#endif
+
+#ifndef SQLITE_OMIT_SHARED_CACHE
+  void sqlite3TableLock(Parse *, int, int, u8, const char *);
+#else
+  #define sqlite3TableLock(v,w,x,y,z)
+#endif
+
+#ifdef SQLITE_TEST
+  int sqlite3Utf8To8(unsigned char*);
+#endif
+
+#ifdef SQLITE_OMIT_VIRTUALTABLE
+#  define sqlite3VtabClear(X)
+#  define sqlite3VtabSync(X,Y) (Y)
+#  define sqlite3VtabRollback(X)
+#  define sqlite3VtabCommit(X)
+#else
+   void sqlite3VtabClear(Table*);
+   int sqlite3VtabSync(sqlite3 *db, int rc);
+   int sqlite3VtabRollback(sqlite3 *db);
+   int sqlite3VtabCommit(sqlite3 *db);
+#endif
+void sqlite3VtabLock(sqlite3_vtab*);
+void sqlite3VtabUnlock(sqlite3*, sqlite3_vtab*);
+void sqlite3VtabBeginParse(Parse*, Token*, Token*, Token*);
+void sqlite3VtabFinishParse(Parse*, Token*);
+void sqlite3VtabArgInit(Parse*);
+void sqlite3VtabArgExtend(Parse*, Token*);
+int sqlite3VtabCallCreate(sqlite3*, int, const char *, char **);
+int sqlite3VtabCallConnect(Parse*, Table*);
+int sqlite3VtabCallDestroy(sqlite3*, int, const char *);
+int sqlite3VtabBegin(sqlite3 *, sqlite3_vtab *);
+FuncDef *sqlite3VtabOverloadFunction(sqlite3 *,FuncDef*, int nArg, Expr*);
+void sqlite3InvalidFunction(sqlite3_context*,int,sqlite3_value**);
+int sqlite3Reprepare(Vdbe*);
+void sqlite3ExprListCheckLength(Parse*, ExprList*, int, const char*);
+CollSeq *sqlite3BinaryCompareCollSeq(Parse *, Expr *, Expr *);
+
+
+/*
+** Available fault injectors.  Should be numbered beginning with 0.
+*/
+#define SQLITE_FAULTINJECTOR_MALLOC     0
+#define SQLITE_FAULTINJECTOR_COUNT      1
+
+/*
+** The interface to the fault injector subsystem.  If the fault injector
+** mechanism is disabled at compile-time then set up macros so that no
+** unnecessary code is generated.
+*/
+#ifndef SQLITE_OMIT_FAULTINJECTOR
+  void sqlite3FaultConfig(int,int,int);
+  int sqlite3FaultFailures(int);
+  int sqlite3FaultBenignFailures(int);
+  int sqlite3FaultPending(int);
+  void sqlite3FaultBenign(int,int);
+  int sqlite3FaultStep(int);
+#else
+# define sqlite3FaultConfig(A,B,C)
+# define sqlite3FaultFailures(A)         0
+# define sqlite3FaultBenignFailures(A)   0
+# define sqlite3FaultPending(A)          (-1)
+# define sqlite3FaultBenign(A,B)
+# define sqlite3FaultStep(A)             0
+#endif
+
+
+
+#define IN_INDEX_ROWID           1
+#define IN_INDEX_EPH             2
+#define IN_INDEX_INDEX           3
+int sqlite3FindInIndex(Parse *, Expr *, int);
+
+#ifdef SQLITE_ENABLE_ATOMIC_WRITE
+  int sqlite3JournalOpen(sqlite3_vfs *, const char *, sqlite3_file *, int, int);
+  int sqlite3JournalSize(sqlite3_vfs *);
+  int sqlite3JournalCreate(sqlite3_file *);
+#else
+  #define sqlite3JournalSize(pVfs) ((pVfs)->szOsFile)
+#endif
+
+#if defined(SQLITE_TEST) || SQLITE_MAX_EXPR_DEPTH>0
+  void sqlite3ExprSetHeight(Expr *);
+  int sqlite3SelectExprHeight(Select *);
+#else
+  #define sqlite3ExprSetHeight(x)
+#endif
+
+u32 sqlite3Get4byte(const u8*);
+void sqlite3Put4byte(u8*, u32);
+
+#ifdef SQLITE_SSE
+#include "sseInt.h"
+#endif
+
+#ifdef SQLITE_DEBUG
+  void sqlite3ParserTrace(FILE*, char *);
+#endif
+
+/*
+** If the SQLITE_ENABLE IOTRACE exists then the global variable
+** sqlite3IoTrace is a pointer to a printf-like routine used to
+** print I/O tracing messages.
+*/
+#ifdef SQLITE_ENABLE_IOTRACE
+# define IOTRACE(A)  if( sqlite3IoTrace ){ sqlite3IoTrace A; }
+  void sqlite3VdbeIOTraceSql(Vdbe*);
+#else
+# define IOTRACE(A)
+# define sqlite3VdbeIOTraceSql(X)
+#endif
+SQLITE_EXTERN void (*sqlite3IoTrace)(const char*,...);
+
+#endif
diff --git a/uppsrc/plugin/sqlite3/lib/sqliteLimit.h b/uppsrc/plugin/sqlite3/lib/sqliteLimit.h
new file mode 100644
index 000000000..5072a3cfd
--- /dev/null
+++ b/uppsrc/plugin/sqlite3/lib/sqliteLimit.h
@@ -0,0 +1,179 @@
+/*
+** 2007 May 7
+**
+** The author disclaims copyright to this source code.  In place of
+** a legal notice, here is a blessing:
+**
+**    May you do good and not evil.
+**    May you find forgiveness for yourself and forgive others.
+**    May you share freely, never taking more than you give.
+**
+*************************************************************************
+**
+** This file defines various limits of what SQLite can process.
+**
+** @(#) $Id: sqliteLimit.h,v 1.6 2007/12/17 16:20:07 drh Exp $
+*/
+
+/*
+** The maximum length of a TEXT or BLOB in bytes.   This also
+** limits the size of a row in a table or index.
+**
+** The hard limit is the ability of a 32-bit signed integer
+** to count the size: 2^31-1 or 2147483647.
+*/
+#ifndef SQLITE_MAX_LENGTH
+# define SQLITE_MAX_LENGTH 1000000000
+#endif
+
+/*
+** This is the maximum number of
+**
+**    * Columns in a table
+**    * Columns in an index
+**    * Columns in a view
+**    * Terms in the SET clause of an UPDATE statement
+**    * Terms in the result set of a SELECT statement
+**    * Terms in the GROUP BY or ORDER BY clauses of a SELECT statement.
+**    * Terms in the VALUES clause of an INSERT statement
+**
+** The hard upper limit here is 32676.  Most database people will
+** tell you that in a well-normalized database, you usually should
+** not have more than a dozen or so columns in any table.  And if
+** that is the case, there is no point in having more than a few
+** dozen values in any of the other situations described above.
+*/
+#ifndef SQLITE_MAX_COLUMN
+# define SQLITE_MAX_COLUMN 2000
+#endif
+
+/*
+** The maximum length of a single SQL statement in bytes.
+** A value of zero means there is no limit.
+*/
+#ifndef SQLITE_MAX_SQL_LENGTH
+# define SQLITE_MAX_SQL_LENGTH 0
+#endif
+
+/*
+** The maximum depth of an expression tree. This is limited to
+** some extent by SQLITE_MAX_SQL_LENGTH. But sometime you might
+** want to place more severe limits on the complexity of an
+** expression. A value of 0 (the default) means do not enforce
+** any limitation on expression tree depth.
+*/
+#ifndef SQLITE_MAX_EXPR_DEPTH
+# define SQLITE_MAX_EXPR_DEPTH 1000
+#endif
+
+/*
+** The maximum number of terms in a compound SELECT statement.
+** The code generator for compound SELECT statements does one
+** level of recursion for each term.  A stack overflow can result
+** if the number of terms is too large.  In practice, most SQL
+** never has more than 3 or 4 terms.  Use a value of 0 to disable
+** any limit on the number of terms in a compount SELECT.
+*/
+#ifndef SQLITE_MAX_COMPOUND_SELECT
+# define SQLITE_MAX_COMPOUND_SELECT 500
+#endif
+
+/*
+** The maximum number of opcodes in a VDBE program.
+** Not currently enforced.
+*/
+#ifndef SQLITE_MAX_VDBE_OP
+# define SQLITE_MAX_VDBE_OP 25000
+#endif
+
+/*
+** The maximum number of arguments to an SQL function.
+*/
+#ifndef SQLITE_MAX_FUNCTION_ARG
+# define SQLITE_MAX_FUNCTION_ARG 100
+#endif
+
+/*
+** The maximum number of in-memory pages to use for the main database
+** table and for temporary tables.  The SQLITE_DEFAULT_CACHE_SIZE
+*/
+#ifndef SQLITE_DEFAULT_CACHE_SIZE
+# define SQLITE_DEFAULT_CACHE_SIZE  2000
+#endif
+#ifndef SQLITE_DEFAULT_TEMP_CACHE_SIZE
+# define SQLITE_DEFAULT_TEMP_CACHE_SIZE  500
+#endif
+
+/*
+** The maximum number of attached databases.  This must be at least 2
+** in order to support the main database file (0) and the file used to
+** hold temporary tables (1).  And it must be less than 32 because
+** we use a bitmask of databases with a u32 in places (for example
+** the Parse.cookieMask field).
+*/
+#ifndef SQLITE_MAX_ATTACHED
+# define SQLITE_MAX_ATTACHED 10
+#endif
+
+
+/*
+** The maximum value of a ?nnn wildcard that the parser will accept.
+*/
+#ifndef SQLITE_MAX_VARIABLE_NUMBER
+# define SQLITE_MAX_VARIABLE_NUMBER 999
+#endif
+
+/* Maximum page size.  The upper bound on this value is 32768.  This a limit
+** imposed by the necessity of storing the value in a 2-byte unsigned integer
+** and the fact that the page size must be a power of 2.
+*/
+#ifndef SQLITE_MAX_PAGE_SIZE
+# define SQLITE_MAX_PAGE_SIZE 32768
+#endif
+
+
+/*
+** The default size of a database page.
+*/
+#ifndef SQLITE_DEFAULT_PAGE_SIZE
+# define SQLITE_DEFAULT_PAGE_SIZE 1024
+#endif
+#if SQLITE_DEFAULT_PAGE_SIZE>SQLITE_MAX_PAGE_SIZE
+# undef SQLITE_DEFAULT_PAGE_SIZE
+# define SQLITE_DEFAULT_PAGE_SIZE SQLITE_MAX_PAGE_SIZE
+#endif
+
+/*
+** Ordinarily, if no value is explicitly provided, SQLite creates databases
+** with page size SQLITE_DEFAULT_PAGE_SIZE. However, based on certain
+** device characteristics (sector-size and atomic write() support),
+** SQLite may choose a larger value. This constant is the maximum value
+** SQLite will choose on its own.
+*/
+#ifndef SQLITE_MAX_DEFAULT_PAGE_SIZE
+# define SQLITE_MAX_DEFAULT_PAGE_SIZE 8192
+#endif
+#if SQLITE_MAX_DEFAULT_PAGE_SIZE>SQLITE_MAX_PAGE_SIZE
+# undef SQLITE_MAX_DEFAULT_PAGE_SIZE
+# define SQLITE_MAX_DEFAULT_PAGE_SIZE SQLITE_MAX_PAGE_SIZE
+#endif
+
+
+/*
+** Maximum number of pages in one database file.
+**
+** This is really just the default value for the max_page_count pragma.
+** This value can be lowered (or raised) at run-time using that the
+** max_page_count macro.
+*/
+#ifndef SQLITE_MAX_PAGE_COUNT
+# define SQLITE_MAX_PAGE_COUNT 1073741823
+#endif
+
+/*
+** Maximum length (in bytes) of the pattern in a LIKE or GLOB
+** operator.
+*/
+#ifndef SQLITE_MAX_LIKE_PATTERN_LENGTH
+# define SQLITE_MAX_LIKE_PATTERN_LENGTH 50000
+#endif
diff --git a/uppsrc/plugin/sqlite3/lib/table.c b/uppsrc/plugin/sqlite3/lib/table.c
new file mode 100644
index 000000000..a6e14a24b
--- /dev/null
+++ b/uppsrc/plugin/sqlite3/lib/table.c
@@ -0,0 +1,199 @@
+/*
+** 2001 September 15
+**
+** The author disclaims copyright to this source code.  In place of
+** a legal notice, here is a blessing:
+**
+**    May you do good and not evil.
+**    May you find forgiveness for yourself and forgive others.
+**    May you share freely, never taking more than you give.
+**
+*************************************************************************
+** This file contains the sqlite3_get_table() and sqlite3_free_table()
+** interface routines.  These are just wrappers around the main
+** interface routine of sqlite3_exec().
+**
+** These routines are in a separate files so that they will not be linked
+** if they are not used.
+*/
+#include "sqliteInt.h"
+#include <stdlib.h>
+#include <string.h>
+
+#ifndef SQLITE_OMIT_GET_TABLE
+
+/*
+** This structure is used to pass data from sqlite3_get_table() through
+** to the callback function is uses to build the result.
+*/
+typedef struct TabResult {
+  char **azResult;
+  char *zErrMsg;
+  int nResult;
+  int nAlloc;
+  int nRow;
+  int nColumn;
+  int nData;
+  int rc;
+} TabResult;
+
+/*
+** This routine is called once for each row in the result table.  Its job
+** is to fill in the TabResult structure appropriately, allocating new
+** memory as necessary.
+*/
+static int sqlite3_get_table_cb(void *pArg, int nCol, char **argv, char **colv){
+  TabResult *p = (TabResult*)pArg;
+  int need;
+  int i;
+  char *z;
+
+  /* Make sure there is enough space in p->azResult to hold everything
+  ** we need to remember from this invocation of the callback.
+  */
+  if( p->nRow==0 && argv!=0 ){
+    need = nCol*2;
+  }else{
+    need = nCol;
+  }
+  if( p->nData + need >= p->nAlloc ){
+    char **azNew;
+    p->nAlloc = p->nAlloc*2 + need + 1;
+    azNew = sqlite3_realloc( p->azResult, sizeof(char*)*p->nAlloc );
+    if( azNew==0 ) goto malloc_failed;
+    p->azResult = azNew;
+  }
+
+  /* If this is the first row, then generate an extra row containing
+  ** the names of all columns.
+  */
+  if( p->nRow==0 ){
+    p->nColumn = nCol;
+    for(i=0; i<nCol; i++){
+      z = sqlite3_mprintf("%s", colv[i]);
+      if( z==0 ) goto malloc_failed;
+      p->azResult[p->nData++] = z;
+    }
+  }else if( p->nColumn!=nCol ){
+    sqlite3_free(p->zErrMsg);
+    p->zErrMsg = sqlite3_mprintf(
+       "sqlite3_get_table() called with two or more incompatible queries"
+    );
+    p->rc = SQLITE_ERROR;
+    return 1;
+  }
+
+  /* Copy over the row data
+  */
+  if( argv!=0 ){
+    for(i=0; i<nCol; i++){
+      if( argv[i]==0 ){
+        z = 0;
+      }else{
+        int n = strlen(argv[i])+1;
+        z = sqlite3_malloc( n );
+        if( z==0 ) goto malloc_failed;
+        memcpy(z, argv[i], n);
+      }
+      p->azResult[p->nData++] = z;
+    }
+    p->nRow++;
+  }
+  return 0;
+
+malloc_failed:
+  p->rc = SQLITE_NOMEM;
+  return 1;
+}
+
+/*
+** Query the database.  But instead of invoking a callback for each row,
+** malloc() for space to hold the result and return the entire results
+** at the conclusion of the call.
+**
+** The result that is written to ***pazResult is held in memory obtained
+** from malloc().  But the caller cannot free this memory directly.
+** Instead, the entire table should be passed to sqlite3_free_table() when
+** the calling procedure is finished using it.
+*/
+int sqlite3_get_table(
+  sqlite3 *db,                /* The database on which the SQL executes */
+  const char *zSql,           /* The SQL to be executed */
+  char ***pazResult,          /* Write the result table here */
+  int *pnRow,                 /* Write the number of rows in the result here */
+  int *pnColumn,              /* Write the number of columns of result here */
+  char **pzErrMsg             /* Write error messages here */
+){
+  int rc;
+  TabResult res;
+
+  *pazResult = 0;
+  if( pnColumn ) *pnColumn = 0;
+  if( pnRow ) *pnRow = 0;
+  res.zErrMsg = 0;
+  res.nResult = 0;
+  res.nRow = 0;
+  res.nColumn = 0;
+  res.nData = 1;
+  res.nAlloc = 20;
+  res.rc = SQLITE_OK;
+  res.azResult = sqlite3_malloc(sizeof(char*)*res.nAlloc );
+  if( res.azResult==0 ){
+     db->errCode = SQLITE_NOMEM;
+     return SQLITE_NOMEM;
+  }
+  res.azResult[0] = 0;
+  rc = sqlite3_exec(db, zSql, sqlite3_get_table_cb, &res, pzErrMsg);
+  assert( sizeof(res.azResult[0])>= sizeof(res.nData) );
+  res.azResult[0] = (char*)(sqlite3_intptr_t)res.nData;
+  if( (rc&0xff)==SQLITE_ABORT ){
+    sqlite3_free_table(&res.azResult[1]);
+    if( res.zErrMsg ){
+      if( pzErrMsg ){
+        sqlite3_free(*pzErrMsg);
+        *pzErrMsg = sqlite3_mprintf("%s",res.zErrMsg);
+      }
+      sqlite3_free(res.zErrMsg);
+    }
+    db->errCode = res.rc;  /* Assume 32-bit assignment is atomic */
+    return res.rc;
+  }
+  sqlite3_free(res.zErrMsg);
+  if( rc!=SQLITE_OK ){
+    sqlite3_free_table(&res.azResult[1]);
+    return rc;
+  }
+  if( res.nAlloc>res.nData ){
+    char **azNew;
+    azNew = sqlite3_realloc( res.azResult, sizeof(char*)*(res.nData+1) );
+    if( azNew==0 ){
+      sqlite3_free_table(&res.azResult[1]);
+      db->errCode = SQLITE_NOMEM;
+      return SQLITE_NOMEM;
+    }
+    res.nAlloc = res.nData+1;
+    res.azResult = azNew;
+  }
+  *pazResult = &res.azResult[1];
+  if( pnColumn ) *pnColumn = res.nColumn;
+  if( pnRow ) *pnRow = res.nRow;
+  return rc;
+}
+
+/*
+** This routine frees the space the sqlite3_get_table() malloced.
+*/
+void sqlite3_free_table(
+  char **azResult            /* Result returned from from sqlite3_get_table() */
+){
+  if( azResult ){
+    sqlite3_intptr_t i, n;
+    azResult--;
+    assert( azResult!=0 );
+    n = (sqlite3_intptr_t)azResult[0];
+    for(i=1; i<n; i++){ if( azResult[i] ) sqlite3_free(azResult[i]); }
+    sqlite3_free(azResult);
+  }
+}
+
+#endif /* SQLITE_OMIT_GET_TABLE */
diff --git a/uppsrc/plugin/sqlite3/lib/tclsqlite.c b/uppsrc/plugin/sqlite3/lib/tclsqlite.c
new file mode 100644
index 000000000..9074dfa58
--- /dev/null
+++ b/uppsrc/plugin/sqlite3/lib/tclsqlite.c
@@ -0,0 +1,2593 @@
+/*
+** 2001 September 15
+**
+** The author disclaims copyright to this source code.  In place of
+** a legal notice, here is a blessing:
+**
+**    May you do good and not evil.
+**    May you find forgiveness for yourself and forgive others.
+**    May you share freely, never taking more than you give.
+**
+*************************************************************************
+** A TCL Interface to SQLite.  Append this file to sqlite3.c and
+** compile the whole thing to build a TCL-enabled version of SQLite.
+**
+** $Id: tclsqlite.c,v 1.209 2008/02/18 22:24:58 drh Exp $
+*/
+#include "tcl.h"
+#include <errno.h>
+
+/*
+** Some additional include files are needed if this file is not
+** appended to the amalgamation.
+*/
+#ifndef SQLITE_AMALGAMATION
+# include "sqliteInt.h"
+# include <stdlib.h>
+# include <string.h>
+# include <assert.h>
+# include <ctype.h>
+#endif
+
+/*
+ * Windows needs to know which symbols to export.  Unix does not.
+ * BUILD_sqlite should be undefined for Unix.
+ */
+#ifdef BUILD_sqlite
+#undef TCL_STORAGE_CLASS
+#define TCL_STORAGE_CLASS DLLEXPORT
+#endif /* BUILD_sqlite */
+
+#define NUM_PREPARED_STMTS 10
+#define MAX_PREPARED_STMTS 100
+
+/*
+** If TCL uses UTF-8 and SQLite is configured to use iso8859, then we
+** have to do a translation when going between the two.  Set the
+** UTF_TRANSLATION_NEEDED macro to indicate that we need to do
+** this translation.
+*/
+#if defined(TCL_UTF_MAX) && !defined(SQLITE_UTF8)
+# define UTF_TRANSLATION_NEEDED 1
+#endif
+
+/*
+** New SQL functions can be created as TCL scripts.  Each such function
+** is described by an instance of the following structure.
+*/
+typedef struct SqlFunc SqlFunc;
+struct SqlFunc {
+  Tcl_Interp *interp;   /* The TCL interpret to execute the function */
+  Tcl_Obj *pScript;     /* The Tcl_Obj representation of the script */
+  int useEvalObjv;      /* True if it is safe to use Tcl_EvalObjv */
+  char *zName;          /* Name of this function */
+  SqlFunc *pNext;       /* Next function on the list of them all */
+};
+
+/*
+** New collation sequences function can be created as TCL scripts.  Each such
+** function is described by an instance of the following structure.
+*/
+typedef struct SqlCollate SqlCollate;
+struct SqlCollate {
+  Tcl_Interp *interp;   /* The TCL interpret to execute the function */
+  char *zScript;        /* The script to be run */
+  SqlCollate *pNext;    /* Next function on the list of them all */
+};
+
+/*
+** Prepared statements are cached for faster execution.  Each prepared
+** statement is described by an instance of the following structure.
+*/
+typedef struct SqlPreparedStmt SqlPreparedStmt;
+struct SqlPreparedStmt {
+  SqlPreparedStmt *pNext;  /* Next in linked list */
+  SqlPreparedStmt *pPrev;  /* Previous on the list */
+  sqlite3_stmt *pStmt;     /* The prepared statement */
+  int nSql;                /* chars in zSql[] */
+  const char *zSql;        /* Text of the SQL statement */
+};
+
+typedef struct IncrblobChannel IncrblobChannel;
+
+/*
+** There is one instance of this structure for each SQLite database
+** that has been opened by the SQLite TCL interface.
+*/
+typedef struct SqliteDb SqliteDb;
+struct SqliteDb {
+  sqlite3 *db;               /* The "real" database structure. MUST BE FIRST */
+  Tcl_Interp *interp;        /* The interpreter used for this database */
+  char *zBusy;               /* The busy callback routine */
+  char *zCommit;             /* The commit hook callback routine */
+  char *zTrace;              /* The trace callback routine */
+  char *zProfile;            /* The profile callback routine */
+  char *zProgress;           /* The progress callback routine */
+  char *zAuth;               /* The authorization callback routine */
+  char *zNull;               /* Text to substitute for an SQL NULL value */
+  SqlFunc *pFunc;            /* List of SQL functions */
+  Tcl_Obj *pUpdateHook;      /* Update hook script (if any) */
+  Tcl_Obj *pRollbackHook;    /* Rollback hook script (if any) */
+  SqlCollate *pCollate;      /* List of SQL collation functions */
+  int rc;                    /* Return code of most recent sqlite3_exec() */
+  Tcl_Obj *pCollateNeeded;   /* Collation needed script */
+  SqlPreparedStmt *stmtList; /* List of prepared statements*/
+  SqlPreparedStmt *stmtLast; /* Last statement in the list */
+  int maxStmt;               /* The next maximum number of stmtList */
+  int nStmt;                 /* Number of statements in stmtList */
+  IncrblobChannel *pIncrblob;/* Linked list of open incrblob channels */
+};
+
+struct IncrblobChannel {
+  sqlite3_blob *pBlob;      /* sqlite3 blob handle */
+  SqliteDb *pDb;            /* Associated database connection */
+  int iSeek;                /* Current seek offset */
+  Tcl_Channel channel;      /* Channel identifier */
+  IncrblobChannel *pNext;   /* Linked list of all open incrblob channels */
+  IncrblobChannel *pPrev;   /* Linked list of all open incrblob channels */
+};
+
+#ifndef SQLITE_OMIT_INCRBLOB
+/*
+** Close all incrblob channels opened using database connection pDb.
+** This is called when shutting down the database connection.
+*/
+static void closeIncrblobChannels(SqliteDb *pDb){
+  IncrblobChannel *p;
+  IncrblobChannel *pNext;
+
+  for(p=pDb->pIncrblob; p; p=pNext){
+    pNext = p->pNext;
+
+    /* Note: Calling unregister here call Tcl_Close on the incrblob channel,
+    ** which deletes the IncrblobChannel structure at *p. So do not
+    ** call Tcl_Free() here.
+    */
+    Tcl_UnregisterChannel(pDb->interp, p->channel);
+  }
+}
+
+/*
+** Close an incremental blob channel.
+*/
+static int incrblobClose(ClientData instanceData, Tcl_Interp *interp){
+  IncrblobChannel *p = (IncrblobChannel *)instanceData;
+  int rc = sqlite3_blob_close(p->pBlob);
+  sqlite3 *db = p->pDb->db;
+
+  /* Remove the channel from the SqliteDb.pIncrblob list. */
+  if( p->pNext ){
+    p->pNext->pPrev = p->pPrev;
+  }
+  if( p->pPrev ){
+    p->pPrev->pNext = p->pNext;
+  }
+  if( p->pDb->pIncrblob==p ){
+    p->pDb->pIncrblob = p->pNext;
+  }
+
+  /* Free the IncrblobChannel structure */
+  Tcl_Free((char *)p);
+
+  if( rc!=SQLITE_OK ){
+    Tcl_SetResult(interp, (char *)sqlite3_errmsg(db), TCL_VOLATILE);
+    return TCL_ERROR;
+  }
+  return TCL_OK;
+}
+
+/*
+** Read data from an incremental blob channel.
+*/
+static int incrblobInput(
+  ClientData instanceData,
+  char *buf,
+  int bufSize,
+  int *errorCodePtr
+){
+  IncrblobChannel *p = (IncrblobChannel *)instanceData;
+  int nRead = bufSize;         /* Number of bytes to read */
+  int nBlob;                   /* Total size of the blob */
+  int rc;                      /* sqlite error code */
+
+  nBlob = sqlite3_blob_bytes(p->pBlob);
+  if( (p->iSeek+nRead)>nBlob ){
+    nRead = nBlob-p->iSeek;
+  }
+  if( nRead<=0 ){
+    return 0;
+  }
+
+  rc = sqlite3_blob_read(p->pBlob, (void *)buf, nRead, p->iSeek);
+  if( rc!=SQLITE_OK ){
+    *errorCodePtr = rc;
+    return -1;
+  }
+
+  p->iSeek += nRead;
+  return nRead;
+}
+
+/*
+** Write data to an incremental blob channel.
+*/
+static int incrblobOutput(
+  ClientData instanceData,
+  CONST char *buf,
+  int toWrite,
+  int *errorCodePtr
+){
+  IncrblobChannel *p = (IncrblobChannel *)instanceData;
+  int nWrite = toWrite;        /* Number of bytes to write */
+  int nBlob;                   /* Total size of the blob */
+  int rc;                      /* sqlite error code */
+
+  nBlob = sqlite3_blob_bytes(p->pBlob);
+  if( (p->iSeek+nWrite)>nBlob ){
+    *errorCodePtr = EINVAL;
+    return -1;
+  }
+  if( nWrite<=0 ){
+    return 0;
+  }
+
+  rc = sqlite3_blob_write(p->pBlob, (void *)buf, nWrite, p->iSeek);
+  if( rc!=SQLITE_OK ){
+    *errorCodePtr = EIO;
+    return -1;
+  }
+
+  p->iSeek += nWrite;
+  return nWrite;
+}
+
+/*
+** Seek an incremental blob channel.
+*/
+static int incrblobSeek(
+  ClientData instanceData,
+  long offset,
+  int seekMode,
+  int *errorCodePtr
+){
+  IncrblobChannel *p = (IncrblobChannel *)instanceData;
+
+  switch( seekMode ){
+    case SEEK_SET:
+      p->iSeek = offset;
+      break;
+    case SEEK_CUR:
+      p->iSeek += offset;
+      break;
+    case SEEK_END:
+      p->iSeek = sqlite3_blob_bytes(p->pBlob) + offset;
+      break;
+
+    default: assert(!"Bad seekMode");
+  }
+
+  return p->iSeek;
+}
+
+
+static void incrblobWatch(ClientData instanceData, int mode){
+  /* NO-OP */
+}
+static int incrblobHandle(ClientData instanceData, int dir, ClientData *hPtr){
+  return TCL_ERROR;
+}
+
+static Tcl_ChannelType IncrblobChannelType = {
+  "incrblob",                        /* typeName                             */
+  TCL_CHANNEL_VERSION_2,             /* version                              */
+  incrblobClose,                     /* closeProc                            */
+  incrblobInput,                     /* inputProc                            */
+  incrblobOutput,                    /* outputProc                           */
+  incrblobSeek,                      /* seekProc                             */
+  0,                                 /* setOptionProc                        */
+  0,                                 /* getOptionProc                        */
+  incrblobWatch,                     /* watchProc (this is a no-op)          */
+  incrblobHandle,                    /* getHandleProc (always returns error) */
+  0,                                 /* close2Proc                           */
+  0,                                 /* blockModeProc                        */
+  0,                                 /* flushProc                            */
+  0,                                 /* handlerProc                          */
+  0,                                 /* wideSeekProc                         */
+};
+
+/*
+** Create a new incrblob channel.
+*/
+static int createIncrblobChannel(
+  Tcl_Interp *interp,
+  SqliteDb *pDb,
+  const char *zDb,
+  const char *zTable,
+  const char *zColumn,
+  sqlite_int64 iRow,
+  int isReadonly
+){
+  IncrblobChannel *p;
+  sqlite3 *db = pDb->db;
+  sqlite3_blob *pBlob;
+  int rc;
+  int flags = TCL_READABLE|(isReadonly ? 0 : TCL_WRITABLE);
+
+  /* This variable is used to name the channels: "incrblob_[incr count]" */
+  static int count = 0;
+  char zChannel[64];
+
+  rc = sqlite3_blob_open(db, zDb, zTable, zColumn, iRow, !isReadonly, &pBlob);
+  if( rc!=SQLITE_OK ){
+    Tcl_SetResult(interp, (char *)sqlite3_errmsg(pDb->db), TCL_VOLATILE);
+    return TCL_ERROR;
+  }
+
+  p = (IncrblobChannel *)Tcl_Alloc(sizeof(IncrblobChannel));
+  p->iSeek = 0;
+  p->pBlob = pBlob;
+
+  sqlite3_snprintf(sizeof(zChannel), zChannel, "incrblob_%d", ++count);
+  p->channel = Tcl_CreateChannel(&IncrblobChannelType, zChannel, p, flags);
+  Tcl_RegisterChannel(interp, p->channel);
+
+  /* Link the new channel into the SqliteDb.pIncrblob list. */
+  p->pNext = pDb->pIncrblob;
+  p->pPrev = 0;
+  if( p->pNext ){
+    p->pNext->pPrev = p;
+  }
+  pDb->pIncrblob = p;
+  p->pDb = pDb;
+
+  Tcl_SetResult(interp, (char *)Tcl_GetChannelName(p->channel), TCL_VOLATILE);
+  return TCL_OK;
+}
+#else  /* else clause for "#ifndef SQLITE_OMIT_INCRBLOB" */
+  #define closeIncrblobChannels(pDb)
+#endif
+
+/*
+** Look at the script prefix in pCmd.  We will be executing this script
+** after first appending one or more arguments.  This routine analyzes
+** the script to see if it is safe to use Tcl_EvalObjv() on the script
+** rather than the more general Tcl_EvalEx().  Tcl_EvalObjv() is much
+** faster.
+**
+** Scripts that are safe to use with Tcl_EvalObjv() consists of a
+** command name followed by zero or more arguments with no [...] or $
+** or {...} or ; to be seen anywhere.  Most callback scripts consist
+** of just a single procedure name and they meet this requirement.
+*/
+static int safeToUseEvalObjv(Tcl_Interp *interp, Tcl_Obj *pCmd){
+  /* We could try to do something with Tcl_Parse().  But we will instead
+  ** just do a search for forbidden characters.  If any of the forbidden
+  ** characters appear in pCmd, we will report the string as unsafe.
+  */
+  const char *z;
+  int n;
+  z = Tcl_GetStringFromObj(pCmd, &n);
+  while( n-- > 0 ){
+    int c = *(z++);
+    if( c=='$' || c=='[' || c==';' ) return 0;
+  }
+  return 1;
+}
+
+/*
+** Find an SqlFunc structure with the given name.  Or create a new
+** one if an existing one cannot be found.  Return a pointer to the
+** structure.
+*/
+static SqlFunc *findSqlFunc(SqliteDb *pDb, const char *zName){
+  SqlFunc *p, *pNew;
+  int i;
+  pNew = (SqlFunc*)Tcl_Alloc( sizeof(*pNew) + strlen(zName) + 1 );
+  pNew->zName = (char*)&pNew[1];
+  for(i=0; zName[i]; i++){ pNew->zName[i] = tolower(zName[i]); }
+  pNew->zName[i] = 0;
+  for(p=pDb->pFunc; p; p=p->pNext){
+    if( strcmp(p->zName, pNew->zName)==0 ){
+      Tcl_Free((char*)pNew);
+      return p;
+    }
+  }
+  pNew->interp = pDb->interp;
+  pNew->pScript = 0;
+  pNew->pNext = pDb->pFunc;
+  pDb->pFunc = pNew;
+  return pNew;
+}
+
+/*
+** Finalize and free a list of prepared statements
+*/
+static void flushStmtCache( SqliteDb *pDb ){
+  SqlPreparedStmt *pPreStmt;
+
+  while(  pDb->stmtList ){
+    sqlite3_finalize( pDb->stmtList->pStmt );
+    pPreStmt = pDb->stmtList;
+    pDb->stmtList = pDb->stmtList->pNext;
+    Tcl_Free( (char*)pPreStmt );
+  }
+  pDb->nStmt = 0;
+  pDb->stmtLast = 0;
+}
+
+/*
+** TCL calls this procedure when an sqlite3 database command is
+** deleted.
+*/
+static void DbDeleteCmd(void *db){
+  SqliteDb *pDb = (SqliteDb*)db;
+  flushStmtCache(pDb);
+  closeIncrblobChannels(pDb);
+  sqlite3_close(pDb->db);
+  while( pDb->pFunc ){
+    SqlFunc *pFunc = pDb->pFunc;
+    pDb->pFunc = pFunc->pNext;
+    Tcl_DecrRefCount(pFunc->pScript);
+    Tcl_Free((char*)pFunc);
+  }
+  while( pDb->pCollate ){
+    SqlCollate *pCollate = pDb->pCollate;
+    pDb->pCollate = pCollate->pNext;
+    Tcl_Free((char*)pCollate);
+  }
+  if( pDb->zBusy ){
+    Tcl_Free(pDb->zBusy);
+  }
+  if( pDb->zTrace ){
+    Tcl_Free(pDb->zTrace);
+  }
+  if( pDb->zProfile ){
+    Tcl_Free(pDb->zProfile);
+  }
+  if( pDb->zAuth ){
+    Tcl_Free(pDb->zAuth);
+  }
+  if( pDb->zNull ){
+    Tcl_Free(pDb->zNull);
+  }
+  if( pDb->pUpdateHook ){
+    Tcl_DecrRefCount(pDb->pUpdateHook);
+  }
+  if( pDb->pRollbackHook ){
+    Tcl_DecrRefCount(pDb->pRollbackHook);
+  }
+  if( pDb->pCollateNeeded ){
+    Tcl_DecrRefCount(pDb->pCollateNeeded);
+  }
+  Tcl_Free((char*)pDb);
+}
+
+/*
+** This routine is called when a database file is locked while trying
+** to execute SQL.
+*/
+static int DbBusyHandler(void *cd, int nTries){
+  SqliteDb *pDb = (SqliteDb*)cd;
+  int rc;
+  char zVal[30];
+
+  sqlite3_snprintf(sizeof(zVal), zVal, "%d", nTries);
+  rc = Tcl_VarEval(pDb->interp, pDb->zBusy, " ", zVal, (char*)0);
+  if( rc!=TCL_OK || atoi(Tcl_GetStringResult(pDb->interp)) ){
+    return 0;
+  }
+  return 1;
+}
+
+/*
+** This routine is invoked as the 'progress callback' for the database.
+*/
+static int DbProgressHandler(void *cd){
+  SqliteDb *pDb = (SqliteDb*)cd;
+  int rc;
+
+  assert( pDb->zProgress );
+  rc = Tcl_Eval(pDb->interp, pDb->zProgress);
+  if( rc!=TCL_OK || atoi(Tcl_GetStringResult(pDb->interp)) ){
+    return 1;
+  }
+  return 0;
+}
+
+#ifndef SQLITE_OMIT_TRACE
+/*
+** This routine is called by the SQLite trace handler whenever a new
+** block of SQL is executed.  The TCL script in pDb->zTrace is executed.
+*/
+static void DbTraceHandler(void *cd, const char *zSql){
+  SqliteDb *pDb = (SqliteDb*)cd;
+  Tcl_DString str;
+
+  Tcl_DStringInit(&str);
+  Tcl_DStringAppend(&str, pDb->zTrace, -1);
+  Tcl_DStringAppendElement(&str, zSql);
+  Tcl_Eval(pDb->interp, Tcl_DStringValue(&str));
+  Tcl_DStringFree(&str);
+  Tcl_ResetResult(pDb->interp);
+}
+#endif
+
+#ifndef SQLITE_OMIT_TRACE
+/*
+** This routine is called by the SQLite profile handler after a statement
+** SQL has executed.  The TCL script in pDb->zProfile is evaluated.
+*/
+static void DbProfileHandler(void *cd, const char *zSql, sqlite_uint64 tm){
+  SqliteDb *pDb = (SqliteDb*)cd;
+  Tcl_DString str;
+  char zTm[100];
+
+  sqlite3_snprintf(sizeof(zTm)-1, zTm, "%lld", tm);
+  Tcl_DStringInit(&str);
+  Tcl_DStringAppend(&str, pDb->zProfile, -1);
+  Tcl_DStringAppendElement(&str, zSql);
+  Tcl_DStringAppendElement(&str, zTm);
+  Tcl_Eval(pDb->interp, Tcl_DStringValue(&str));
+  Tcl_DStringFree(&str);
+  Tcl_ResetResult(pDb->interp);
+}
+#endif
+
+/*
+** This routine is called when a transaction is committed.  The
+** TCL script in pDb->zCommit is executed.  If it returns non-zero or
+** if it throws an exception, the transaction is rolled back instead
+** of being committed.
+*/
+static int DbCommitHandler(void *cd){
+  SqliteDb *pDb = (SqliteDb*)cd;
+  int rc;
+
+  rc = Tcl_Eval(pDb->interp, pDb->zCommit);
+  if( rc!=TCL_OK || atoi(Tcl_GetStringResult(pDb->interp)) ){
+    return 1;
+  }
+  return 0;
+}
+
+static void DbRollbackHandler(void *clientData){
+  SqliteDb *pDb = (SqliteDb*)clientData;
+  assert(pDb->pRollbackHook);
+  if( TCL_OK!=Tcl_EvalObjEx(pDb->interp, pDb->pRollbackHook, 0) ){
+    Tcl_BackgroundError(pDb->interp);
+  }
+}
+
+static void DbUpdateHandler(
+  void *p,
+  int op,
+  const char *zDb,
+  const char *zTbl,
+  sqlite_int64 rowid
+){
+  SqliteDb *pDb = (SqliteDb *)p;
+  Tcl_Obj *pCmd;
+
+  assert( pDb->pUpdateHook );
+  assert( op==SQLITE_INSERT || op==SQLITE_UPDATE || op==SQLITE_DELETE );
+
+  pCmd = Tcl_DuplicateObj(pDb->pUpdateHook);
+  Tcl_IncrRefCount(pCmd);
+  Tcl_ListObjAppendElement(0, pCmd, Tcl_NewStringObj(
+    ( (op==SQLITE_INSERT)?"INSERT":(op==SQLITE_UPDATE)?"UPDATE":"DELETE"), -1));
+  Tcl_ListObjAppendElement(0, pCmd, Tcl_NewStringObj(zDb, -1));
+  Tcl_ListObjAppendElement(0, pCmd, Tcl_NewStringObj(zTbl, -1));
+  Tcl_ListObjAppendElement(0, pCmd, Tcl_NewWideIntObj(rowid));
+  Tcl_EvalObjEx(pDb->interp, pCmd, TCL_EVAL_DIRECT);
+}
+
+static void tclCollateNeeded(
+  void *pCtx,
+  sqlite3 *db,
+  int enc,
+  const char *zName
+){
+  SqliteDb *pDb = (SqliteDb *)pCtx;
+  Tcl_Obj *pScript = Tcl_DuplicateObj(pDb->pCollateNeeded);
+  Tcl_IncrRefCount(pScript);
+  Tcl_ListObjAppendElement(0, pScript, Tcl_NewStringObj(zName, -1));
+  Tcl_EvalObjEx(pDb->interp, pScript, 0);
+  Tcl_DecrRefCount(pScript);
+}
+
+/*
+** This routine is called to evaluate an SQL collation function implemented
+** using TCL script.
+*/
+static int tclSqlCollate(
+  void *pCtx,
+  int nA,
+  const void *zA,
+  int nB,
+  const void *zB
+){
+  SqlCollate *p = (SqlCollate *)pCtx;
+  Tcl_Obj *pCmd;
+
+  pCmd = Tcl_NewStringObj(p->zScript, -1);
+  Tcl_IncrRefCount(pCmd);
+  Tcl_ListObjAppendElement(p->interp, pCmd, Tcl_NewStringObj(zA, nA));
+  Tcl_ListObjAppendElement(p->interp, pCmd, Tcl_NewStringObj(zB, nB));
+  Tcl_EvalObjEx(p->interp, pCmd, TCL_EVAL_DIRECT);
+  Tcl_DecrRefCount(pCmd);
+  return (atoi(Tcl_GetStringResult(p->interp)));
+}
+
+/*
+** This routine is called to evaluate an SQL function implemented
+** using TCL script.
+*/
+static void tclSqlFunc(sqlite3_context *context, int argc, sqlite3_value**argv){
+  SqlFunc *p = sqlite3_user_data(context);
+  Tcl_Obj *pCmd;
+  int i;
+  int rc;
+
+  if( argc==0 ){
+    /* If there are no arguments to the function, call Tcl_EvalObjEx on the
+    ** script object directly.  This allows the TCL compiler to generate
+    ** bytecode for the command on the first invocation and thus make
+    ** subsequent invocations much faster. */
+    pCmd = p->pScript;
+    Tcl_IncrRefCount(pCmd);
+    rc = Tcl_EvalObjEx(p->interp, pCmd, 0);
+    Tcl_DecrRefCount(pCmd);
+  }else{
+    /* If there are arguments to the function, make a shallow copy of the
+    ** script object, lappend the arguments, then evaluate the copy.
+    **
+    ** By "shallow" copy, we mean a only the outer list Tcl_Obj is duplicated.
+    ** The new Tcl_Obj contains pointers to the original list elements.
+    ** That way, when Tcl_EvalObjv() is run and shimmers the first element
+    ** of the list to tclCmdNameType, that alternate representation will
+    ** be preserved and reused on the next invocation.
+    */
+    Tcl_Obj **aArg;
+    int nArg;
+    if( Tcl_ListObjGetElements(p->interp, p->pScript, &nArg, &aArg) ){
+      sqlite3_result_error(context, Tcl_GetStringResult(p->interp), -1);
+      return;
+    }
+    pCmd = Tcl_NewListObj(nArg, aArg);
+    Tcl_IncrRefCount(pCmd);
+    for(i=0; i<argc; i++){
+      sqlite3_value *pIn = argv[i];
+      Tcl_Obj *pVal;
+
+      /* Set pVal to contain the i'th column of this row. */
+      switch( sqlite3_value_type(pIn) ){
+        case SQLITE_BLOB: {
+          int bytes = sqlite3_value_bytes(pIn);
+          pVal = Tcl_NewByteArrayObj(sqlite3_value_blob(pIn), bytes);
+          break;
+        }
+        case SQLITE_INTEGER: {
+          sqlite_int64 v = sqlite3_value_int64(pIn);
+          if( v>=-2147483647 && v<=2147483647 ){
+            pVal = Tcl_NewIntObj(v);
+          }else{
+            pVal = Tcl_NewWideIntObj(v);
+          }
+          break;
+        }
+        case SQLITE_FLOAT: {
+          double r = sqlite3_value_double(pIn);
+          pVal = Tcl_NewDoubleObj(r);
+          break;
+        }
+        case SQLITE_NULL: {
+          pVal = Tcl_NewStringObj("", 0);
+          break;
+        }
+        default: {
+          int bytes = sqlite3_value_bytes(pIn);
+          pVal = Tcl_NewStringObj((char *)sqlite3_value_text(pIn), bytes);
+          break;
+        }
+      }
+      rc = Tcl_ListObjAppendElement(p->interp, pCmd, pVal);
+      if( rc ){
+        Tcl_DecrRefCount(pCmd);
+        sqlite3_result_error(context, Tcl_GetStringResult(p->interp), -1);
+        return;
+      }
+    }
+    if( !p->useEvalObjv ){
+      /* Tcl_EvalObjEx() will automatically call Tcl_EvalObjv() if pCmd
+      ** is a list without a string representation.  To prevent this from
+      ** happening, make sure pCmd has a valid string representation */
+      Tcl_GetString(pCmd);
+    }
+    rc = Tcl_EvalObjEx(p->interp, pCmd, TCL_EVAL_DIRECT);
+    Tcl_DecrRefCount(pCmd);
+  }
+
+  if( rc && rc!=TCL_RETURN ){
+    sqlite3_result_error(context, Tcl_GetStringResult(p->interp), -1);
+  }else{
+    Tcl_Obj *pVar = Tcl_GetObjResult(p->interp);
+    int n;
+    u8 *data;
+    char *zType = pVar->typePtr ? pVar->typePtr->name : "";
+    char c = zType[0];
+    if( c=='b' && strcmp(zType,"bytearray")==0 && pVar->bytes==0 ){
+      /* Only return a BLOB type if the Tcl variable is a bytearray and
+      ** has no string representation. */
+      data = Tcl_GetByteArrayFromObj(pVar, &n);
+      sqlite3_result_blob(context, data, n, SQLITE_TRANSIENT);
+    }else if( c=='b' && strcmp(zType,"boolean")==0 ){
+      Tcl_GetIntFromObj(0, pVar, &n);
+      sqlite3_result_int(context, n);
+    }else if( c=='d' && strcmp(zType,"double")==0 ){
+      double r;
+      Tcl_GetDoubleFromObj(0, pVar, &r);
+      sqlite3_result_double(context, r);
+    }else if( (c=='w' && strcmp(zType,"wideInt")==0) ||
+          (c=='i' && strcmp(zType,"int")==0) ){
+      Tcl_WideInt v;
+      Tcl_GetWideIntFromObj(0, pVar, &v);
+      sqlite3_result_int64(context, v);
+    }else{
+      data = (unsigned char *)Tcl_GetStringFromObj(pVar, &n);
+      sqlite3_result_text(context, (char *)data, n, SQLITE_TRANSIENT);
+    }
+  }
+}
+
+#ifndef SQLITE_OMIT_AUTHORIZATION
+/*
+** This is the authentication function.  It appends the authentication
+** type code and the two arguments to zCmd[] then invokes the result
+** on the interpreter.  The reply is examined to determine if the
+** authentication fails or succeeds.
+*/
+static int auth_callback(
+  void *pArg,
+  int code,
+  const char *zArg1,
+  const char *zArg2,
+  const char *zArg3,
+  const char *zArg4
+){
+  char *zCode;
+  Tcl_DString str;
+  int rc;
+  const char *zReply;
+  SqliteDb *pDb = (SqliteDb*)pArg;
+
+  switch( code ){
+    case SQLITE_COPY              : zCode="SQLITE_COPY"; break;
+    case SQLITE_CREATE_INDEX      : zCode="SQLITE_CREATE_INDEX"; break;
+    case SQLITE_CREATE_TABLE      : zCode="SQLITE_CREATE_TABLE"; break;
+    case SQLITE_CREATE_TEMP_INDEX : zCode="SQLITE_CREATE_TEMP_INDEX"; break;
+    case SQLITE_CREATE_TEMP_TABLE : zCode="SQLITE_CREATE_TEMP_TABLE"; break;
+    case SQLITE_CREATE_TEMP_TRIGGER: zCode="SQLITE_CREATE_TEMP_TRIGGER"; break;
+    case SQLITE_CREATE_TEMP_VIEW  : zCode="SQLITE_CREATE_TEMP_VIEW"; break;
+    case SQLITE_CREATE_TRIGGER    : zCode="SQLITE_CREATE_TRIGGER"; break;
+    case SQLITE_CREATE_VIEW       : zCode="SQLITE_CREATE_VIEW"; break;
+    case SQLITE_DELETE            : zCode="SQLITE_DELETE"; break;
+    case SQLITE_DROP_INDEX        : zCode="SQLITE_DROP_INDEX"; break;
+    case SQLITE_DROP_TABLE        : zCode="SQLITE_DROP_TABLE"; break;
+    case SQLITE_DROP_TEMP_INDEX   : zCode="SQLITE_DROP_TEMP_INDEX"; break;
+    case SQLITE_DROP_TEMP_TABLE   : zCode="SQLITE_DROP_TEMP_TABLE"; break;
+    case SQLITE_DROP_TEMP_TRIGGER : zCode="SQLITE_DROP_TEMP_TRIGGER"; break;
+    case SQLITE_DROP_TEMP_VIEW    : zCode="SQLITE_DROP_TEMP_VIEW"; break;
+    case SQLITE_DROP_TRIGGER      : zCode="SQLITE_DROP_TRIGGER"; break;
+    case SQLITE_DROP_VIEW         : zCode="SQLITE_DROP_VIEW"; break;
+    case SQLITE_INSERT            : zCode="SQLITE_INSERT"; break;
+    case SQLITE_PRAGMA            : zCode="SQLITE_PRAGMA"; break;
+    case SQLITE_READ              : zCode="SQLITE_READ"; break;
+    case SQLITE_SELECT            : zCode="SQLITE_SELECT"; break;
+    case SQLITE_TRANSACTION       : zCode="SQLITE_TRANSACTION"; break;
+    case SQLITE_UPDATE            : zCode="SQLITE_UPDATE"; break;
+    case SQLITE_ATTACH            : zCode="SQLITE_ATTACH"; break;
+    case SQLITE_DETACH            : zCode="SQLITE_DETACH"; break;
+    case SQLITE_ALTER_TABLE       : zCode="SQLITE_ALTER_TABLE"; break;
+    case SQLITE_REINDEX           : zCode="SQLITE_REINDEX"; break;
+    case SQLITE_ANALYZE           : zCode="SQLITE_ANALYZE"; break;
+    case SQLITE_CREATE_VTABLE     : zCode="SQLITE_CREATE_VTABLE"; break;
+    case SQLITE_DROP_VTABLE       : zCode="SQLITE_DROP_VTABLE"; break;
+    case SQLITE_FUNCTION          : zCode="SQLITE_FUNCTION"; break;
+    default                       : zCode="????"; break;
+  }
+  Tcl_DStringInit(&str);
+  Tcl_DStringAppend(&str, pDb->zAuth, -1);
+  Tcl_DStringAppendElement(&str, zCode);
+  Tcl_DStringAppendElement(&str, zArg1 ? zArg1 : "");
+  Tcl_DStringAppendElement(&str, zArg2 ? zArg2 : "");
+  Tcl_DStringAppendElement(&str, zArg3 ? zArg3 : "");
+  Tcl_DStringAppendElement(&str, zArg4 ? zArg4 : "");
+  rc = Tcl_GlobalEval(pDb->interp, Tcl_DStringValue(&str));
+  Tcl_DStringFree(&str);
+  zReply = Tcl_GetStringResult(pDb->interp);
+  if( strcmp(zReply,"SQLITE_OK")==0 ){
+    rc = SQLITE_OK;
+  }else if( strcmp(zReply,"SQLITE_DENY")==0 ){
+    rc = SQLITE_DENY;
+  }else if( strcmp(zReply,"SQLITE_IGNORE")==0 ){
+    rc = SQLITE_IGNORE;
+  }else{
+    rc = 999;
+  }
+  return rc;
+}
+#endif /* SQLITE_OMIT_AUTHORIZATION */
+
+/*
+** zText is a pointer to text obtained via an sqlite3_result_text()
+** or similar interface. This routine returns a Tcl string object,
+** reference count set to 0, containing the text. If a translation
+** between iso8859 and UTF-8 is required, it is preformed.
+*/
+static Tcl_Obj *dbTextToObj(char const *zText){
+  Tcl_Obj *pVal;
+#ifdef UTF_TRANSLATION_NEEDED
+  Tcl_DString dCol;
+  Tcl_DStringInit(&dCol);
+  Tcl_ExternalToUtfDString(NULL, zText, -1, &dCol);
+  pVal = Tcl_NewStringObj(Tcl_DStringValue(&dCol), -1);
+  Tcl_DStringFree(&dCol);
+#else
+  pVal = Tcl_NewStringObj(zText, -1);
+#endif
+  return pVal;
+}
+
+/*
+** This routine reads a line of text from FILE in, stores
+** the text in memory obtained from malloc() and returns a pointer
+** to the text.  NULL is returned at end of file, or if malloc()
+** fails.
+**
+** The interface is like "readline" but no command-line editing
+** is done.
+**
+** copied from shell.c from '.import' command
+*/
+static char *local_getline(char *zPrompt, FILE *in){
+  char *zLine;
+  int nLine;
+  int n;
+  int eol;
+
+  nLine = 100;
+  zLine = malloc( nLine );
+  if( zLine==0 ) return 0;
+  n = 0;
+  eol = 0;
+  while( !eol ){
+    if( n+100>nLine ){
+      nLine = nLine*2 + 100;
+      zLine = realloc(zLine, nLine);
+      if( zLine==0 ) return 0;
+    }
+    if( fgets(&zLine[n], nLine - n, in)==0 ){
+      if( n==0 ){
+        free(zLine);
+        return 0;
+      }
+      zLine[n] = 0;
+      eol = 1;
+      break;
+    }
+    while( zLine[n] ){ n++; }
+    if( n>0 && zLine[n-1]=='\n' ){
+      n--;
+      zLine[n] = 0;
+      eol = 1;
+    }
+  }
+  zLine = realloc( zLine, n+1 );
+  return zLine;
+}
+
+
+/*
+** Figure out the column names for the data returned by the statement
+** passed as the second argument.
+**
+** If parameter papColName is not NULL, then *papColName is set to point
+** at an array allocated using Tcl_Alloc(). It is the callers responsibility
+** to free this array using Tcl_Free(), and to decrement the reference
+** count of each Tcl_Obj* member of the array.
+**
+** The return value of this function is the number of columns of data
+** returned by pStmt (and hence the size of the *papColName array).
+**
+** If pArray is not NULL, then it contains the name of a Tcl array
+** variable. The "*" member of this array is set to a list containing
+** the names of the columns returned by the statement, in order from
+** left to right. e.g. if the names of the returned columns are a, b and
+** c, it does the equivalent of the tcl command:
+**
+**     set ${pArray}(*) {a b c}
+*/
+static int
+computeColumnNames(
+  Tcl_Interp *interp,
+  sqlite3_stmt *pStmt,              /* SQL statement */
+  Tcl_Obj ***papColName,            /* OUT: Array of column names */
+  Tcl_Obj *pArray                   /* Name of array variable (may be null) */
+){
+  int nCol;
+
+  /* Compute column names */
+  nCol = sqlite3_column_count(pStmt);
+  if( papColName ){
+    int i;
+    Tcl_Obj **apColName = (Tcl_Obj**)Tcl_Alloc( sizeof(Tcl_Obj*)*nCol );
+    for(i=0; i<nCol; i++){
+      apColName[i] = dbTextToObj(sqlite3_column_name(pStmt,i));
+      Tcl_IncrRefCount(apColName[i]);
+    }
+
+    /* If results are being stored in an array variable, then create
+    ** the array(*) entry for that array
+    */
+    if( pArray ){
+      Tcl_Obj *pColList = Tcl_NewObj();
+      Tcl_Obj *pStar = Tcl_NewStringObj("*", -1);
+      Tcl_IncrRefCount(pColList);
+      for(i=0; i<nCol; i++){
+        Tcl_ListObjAppendElement(interp, pColList, apColName[i]);
+      }
+      Tcl_IncrRefCount(pStar);
+      Tcl_ObjSetVar2(interp, pArray, pStar, pColList,0);
+      Tcl_DecrRefCount(pColList);
+      Tcl_DecrRefCount(pStar);
+    }
+    *papColName = apColName;
+  }
+
+  return nCol;
+}
+
+/*
+** The "sqlite" command below creates a new Tcl command for each
+** connection it opens to an SQLite database.  This routine is invoked
+** whenever one of those connection-specific commands is executed
+** in Tcl.  For example, if you run Tcl code like this:
+**
+**       sqlite3 db1  "my_database"
+**       db1 close
+**
+** The first command opens a connection to the "my_database" database
+** and calls that connection "db1".  The second command causes this
+** subroutine to be invoked.
+*/
+static int DbObjCmd(void *cd, Tcl_Interp *interp, int objc,Tcl_Obj *const*objv){
+  SqliteDb *pDb = (SqliteDb*)cd;
+  int choice;
+  int rc = TCL_OK;
+  static const char *DB_strs[] = {
+    "authorizer",         "busy",              "cache",
+    "changes",            "close",             "collate",
+    "collation_needed",   "commit_hook",       "complete",
+    "copy",               "enable_load_extension","errorcode",
+    "eval",               "exists",            "function",
+    "incrblob",           "interrupt",         "last_insert_rowid",
+    "nullvalue",          "onecolumn",         "profile",
+    "progress",           "rekey",             "rollback_hook",
+    "timeout",            "total_changes",     "trace",
+    "transaction",        "update_hook",       "version",
+    0
+  };
+  enum DB_enum {
+    DB_AUTHORIZER,        DB_BUSY,             DB_CACHE,
+    DB_CHANGES,           DB_CLOSE,            DB_COLLATE,
+    DB_COLLATION_NEEDED,  DB_COMMIT_HOOK,      DB_COMPLETE,
+    DB_COPY,              DB_ENABLE_LOAD_EXTENSION,DB_ERRORCODE,
+    DB_EVAL,              DB_EXISTS,           DB_FUNCTION,
+    DB_INCRBLOB,          DB_INTERRUPT,        DB_LAST_INSERT_ROWID,
+    DB_NULLVALUE,         DB_ONECOLUMN,        DB_PROFILE,
+    DB_PROGRESS,          DB_REKEY,            DB_ROLLBACK_HOOK,
+    DB_TIMEOUT,           DB_TOTAL_CHANGES,    DB_TRACE,
+    DB_TRANSACTION,       DB_UPDATE_HOOK,      DB_VERSION
+  };
+  /* don't leave trailing commas on DB_enum, it confuses the AIX xlc compiler */
+
+  if( objc<2 ){
+    Tcl_WrongNumArgs(interp, 1, objv, "SUBCOMMAND ...");
+    return TCL_ERROR;
+  }
+  if( Tcl_GetIndexFromObj(interp, objv[1], DB_strs, "option", 0, &choice) ){
+    return TCL_ERROR;
+  }
+
+  switch( (enum DB_enum)choice ){
+
+  /*    $db authorizer ?CALLBACK?
+  **
+  ** Invoke the given callback to authorize each SQL operation as it is
+  ** compiled.  5 arguments are appended to the callback before it is
+  ** invoked:
+  **
+  **   (1) The authorization type (ex: SQLITE_CREATE_TABLE, SQLITE_INSERT, ...)
+  **   (2) First descriptive name (depends on authorization type)
+  **   (3) Second descriptive name
+  **   (4) Name of the database (ex: "main", "temp")
+  **   (5) Name of trigger that is doing the access
+  **
+  ** The callback should return on of the following strings: SQLITE_OK,
+  ** SQLITE_IGNORE, or SQLITE_DENY.  Any other return value is an error.
+  **
+  ** If this method is invoked with no arguments, the current authorization
+  ** callback string is returned.
+  */
+  case DB_AUTHORIZER: {
+#ifdef SQLITE_OMIT_AUTHORIZATION
+    Tcl_AppendResult(interp, "authorization not available in this build", 0);
+    return TCL_ERROR;
+#else
+    if( objc>3 ){
+      Tcl_WrongNumArgs(interp, 2, objv, "?CALLBACK?");
+      return TCL_ERROR;
+    }else if( objc==2 ){
+      if( pDb->zAuth ){
+        Tcl_AppendResult(interp, pDb->zAuth, 0);
+      }
+    }else{
+      char *zAuth;
+      int len;
+      if( pDb->zAuth ){
+        Tcl_Free(pDb->zAuth);
+      }
+      zAuth = Tcl_GetStringFromObj(objv[2], &len);
+      if( zAuth && len>0 ){
+        pDb->zAuth = Tcl_Alloc( len + 1 );
+        memcpy(pDb->zAuth, zAuth, len+1);
+      }else{
+        pDb->zAuth = 0;
+      }
+      if( pDb->zAuth ){
+        pDb->interp = interp;
+        sqlite3_set_authorizer(pDb->db, auth_callback, pDb);
+      }else{
+        sqlite3_set_authorizer(pDb->db, 0, 0);
+      }
+    }
+#endif
+    break;
+  }
+
+  /*    $db busy ?CALLBACK?
+  **
+  ** Invoke the given callback if an SQL statement attempts to open
+  ** a locked database file.
+  */
+  case DB_BUSY: {
+    if( objc>3 ){
+      Tcl_WrongNumArgs(interp, 2, objv, "CALLBACK");
+      return TCL_ERROR;
+    }else if( objc==2 ){
+      if( pDb->zBusy ){
+        Tcl_AppendResult(interp, pDb->zBusy, 0);
+      }
+    }else{
+      char *zBusy;
+      int len;
+      if( pDb->zBusy ){
+        Tcl_Free(pDb->zBusy);
+      }
+      zBusy = Tcl_GetStringFromObj(objv[2], &len);
+      if( zBusy && len>0 ){
+        pDb->zBusy = Tcl_Alloc( len + 1 );
+        memcpy(pDb->zBusy, zBusy, len+1);
+      }else{
+        pDb->zBusy = 0;
+      }
+      if( pDb->zBusy ){
+        pDb->interp = interp;
+        sqlite3_busy_handler(pDb->db, DbBusyHandler, pDb);
+      }else{
+        sqlite3_busy_handler(pDb->db, 0, 0);
+      }
+    }
+    break;
+  }
+
+  /*     $db cache flush
+  **     $db cache size n
+  **
+  ** Flush the prepared statement cache, or set the maximum number of
+  ** cached statements.
+  */
+  case DB_CACHE: {
+    char *subCmd;
+    int n;
+
+    if( objc<=2 ){
+      Tcl_WrongNumArgs(interp, 1, objv, "cache option ?arg?");
+      return TCL_ERROR;
+    }
+    subCmd = Tcl_GetStringFromObj( objv[2], 0 );
+    if( *subCmd=='f' && strcmp(subCmd,"flush")==0 ){
+      if( objc!=3 ){
+        Tcl_WrongNumArgs(interp, 2, objv, "flush");
+        return TCL_ERROR;
+      }else{
+        flushStmtCache( pDb );
+      }
+    }else if( *subCmd=='s' && strcmp(subCmd,"size")==0 ){
+      if( objc!=4 ){
+        Tcl_WrongNumArgs(interp, 2, objv, "size n");
+        return TCL_ERROR;
+      }else{
+        if( TCL_ERROR==Tcl_GetIntFromObj(interp, objv[3], &n) ){
+          Tcl_AppendResult( interp, "cannot convert \"",
+               Tcl_GetStringFromObj(objv[3],0), "\" to integer", 0);
+          return TCL_ERROR;
+        }else{
+          if( n<0 ){
+            flushStmtCache( pDb );
+            n = 0;
+          }else if( n>MAX_PREPARED_STMTS ){
+            n = MAX_PREPARED_STMTS;
+          }
+          pDb->maxStmt = n;
+        }
+      }
+    }else{
+      Tcl_AppendResult( interp, "bad option \"",
+          Tcl_GetStringFromObj(objv[2],0), "\": must be flush or size", 0);
+      return TCL_ERROR;
+    }
+    break;
+  }
+
+  /*     $db changes
+  **
+  ** Return the number of rows that were modified, inserted, or deleted by
+  ** the most recent INSERT, UPDATE or DELETE statement, not including
+  ** any changes made by trigger programs.
+  */
+  case DB_CHANGES: {
+    Tcl_Obj *pResult;
+    if( objc!=2 ){
+      Tcl_WrongNumArgs(interp, 2, objv, "");
+      return TCL_ERROR;
+    }
+    pResult = Tcl_GetObjResult(interp);
+    Tcl_SetIntObj(pResult, sqlite3_changes(pDb->db));
+    break;
+  }
+
+  /*    $db close
+  **
+  ** Shutdown the database
+  */
+  case DB_CLOSE: {
+    Tcl_DeleteCommand(interp, Tcl_GetStringFromObj(objv[0], 0));
+    break;
+  }
+
+  /*
+  **     $db collate NAME SCRIPT
+  **
+  ** Create a new SQL collation function called NAME.  Whenever
+  ** that function is called, invoke SCRIPT to evaluate the function.
+  */
+  case DB_COLLATE: {
+    SqlCollate *pCollate;
+    char *zName;
+    char *zScript;
+    int nScript;
+    if( objc!=4 ){
+      Tcl_WrongNumArgs(interp, 2, objv, "NAME SCRIPT");
+      return TCL_ERROR;
+    }
+    zName = Tcl_GetStringFromObj(objv[2], 0);
+    zScript = Tcl_GetStringFromObj(objv[3], &nScript);
+    pCollate = (SqlCollate*)Tcl_Alloc( sizeof(*pCollate) + nScript + 1 );
+    if( pCollate==0 ) return TCL_ERROR;
+    pCollate->interp = interp;
+    pCollate->pNext = pDb->pCollate;
+    pCollate->zScript = (char*)&pCollate[1];
+    pDb->pCollate = pCollate;
+    memcpy(pCollate->zScript, zScript, nScript+1);
+    if( sqlite3_create_collation(pDb->db, zName, SQLITE_UTF8,
+        pCollate, tclSqlCollate) ){
+      Tcl_SetResult(interp, (char *)sqlite3_errmsg(pDb->db), TCL_VOLATILE);
+      return TCL_ERROR;
+    }
+    break;
+  }
+
+  /*
+  **     $db collation_needed SCRIPT
+  **
+  ** Create a new SQL collation function called NAME.  Whenever
+  ** that function is called, invoke SCRIPT to evaluate the function.
+  */
+  case DB_COLLATION_NEEDED: {
+    if( objc!=3 ){
+      Tcl_WrongNumArgs(interp, 2, objv, "SCRIPT");
+      return TCL_ERROR;
+    }
+    if( pDb->pCollateNeeded ){
+      Tcl_DecrRefCount(pDb->pCollateNeeded);
+    }
+    pDb->pCollateNeeded = Tcl_DuplicateObj(objv[2]);
+    Tcl_IncrRefCount(pDb->pCollateNeeded);
+    sqlite3_collation_needed(pDb->db, pDb, tclCollateNeeded);
+    break;
+  }
+
+  /*    $db commit_hook ?CALLBACK?
+  **
+  ** Invoke the given callback just before committing every SQL transaction.
+  ** If the callback throws an exception or returns non-zero, then the
+  ** transaction is aborted.  If CALLBACK is an empty string, the callback
+  ** is disabled.
+  */
+  case DB_COMMIT_HOOK: {
+    if( objc>3 ){
+      Tcl_WrongNumArgs(interp, 2, objv, "?CALLBACK?");
+      return TCL_ERROR;
+    }else if( objc==2 ){
+      if( pDb->zCommit ){
+        Tcl_AppendResult(interp, pDb->zCommit, 0);
+      }
+    }else{
+      char *zCommit;
+      int len;
+      if( pDb->zCommit ){
+        Tcl_Free(pDb->zCommit);
+      }
+      zCommit = Tcl_GetStringFromObj(objv[2], &len);
+      if( zCommit && len>0 ){
+        pDb->zCommit = Tcl_Alloc( len + 1 );
+        memcpy(pDb->zCommit, zCommit, len+1);
+      }else{
+        pDb->zCommit = 0;
+      }
+      if( pDb->zCommit ){
+        pDb->interp = interp;
+        sqlite3_commit_hook(pDb->db, DbCommitHandler, pDb);
+      }else{
+        sqlite3_commit_hook(pDb->db, 0, 0);
+      }
+    }
+    break;
+  }
+
+  /*    $db complete SQL
+  **
+  ** Return TRUE if SQL is a complete SQL statement.  Return FALSE if
+  ** additional lines of input are needed.  This is similar to the
+  ** built-in "info complete" command of Tcl.
+  */
+  case DB_COMPLETE: {
+#ifndef SQLITE_OMIT_COMPLETE
+    Tcl_Obj *pResult;
+    int isComplete;
+    if( objc!=3 ){
+      Tcl_WrongNumArgs(interp, 2, objv, "SQL");
+      return TCL_ERROR;
+    }
+    isComplete = sqlite3_complete( Tcl_GetStringFromObj(objv[2], 0) );
+    pResult = Tcl_GetObjResult(interp);
+    Tcl_SetBooleanObj(pResult, isComplete);
+#endif
+    break;
+  }
+
+  /*    $db copy conflict-algorithm table filename ?SEPARATOR? ?NULLINDICATOR?
+  **
+  ** Copy data into table from filename, optionally using SEPARATOR
+  ** as column separators.  If a column contains a null string, or the
+  ** value of NULLINDICATOR, a NULL is inserted for the column.
+  ** conflict-algorithm is one of the sqlite conflict algorithms:
+  **    rollback, abort, fail, ignore, replace
+  ** On success, return the number of lines processed, not necessarily same
+  ** as 'db changes' due to conflict-algorithm selected.
+  **
+  ** This code is basically an implementation/enhancement of
+  ** the sqlite3 shell.c ".import" command.
+  **
+  ** This command usage is equivalent to the sqlite2.x COPY statement,
+  ** which imports file data into a table using the PostgreSQL COPY file format:
+  **   $db copy $conflit_algo $table_name $filename \t \\N
+  */
+  case DB_COPY: {
+    char *zTable;               /* Insert data into this table */
+    char *zFile;                /* The file from which to extract data */
+    char *zConflict;            /* The conflict algorithm to use */
+    sqlite3_stmt *pStmt;        /* A statement */
+    int rc;                     /* Result code */
+    int nCol;                   /* Number of columns in the table */
+    int nByte;                  /* Number of bytes in an SQL string */
+    int i, j;                   /* Loop counters */
+    int nSep;                   /* Number of bytes in zSep[] */
+    int nNull;                  /* Number of bytes in zNull[] */
+    char *zSql;                 /* An SQL statement */
+    char *zLine;                /* A single line of input from the file */
+    char **azCol;               /* zLine[] broken up into columns */
+    char *zCommit;              /* How to commit changes */
+    FILE *in;                   /* The input file */
+    int lineno = 0;             /* Line number of input file */
+    char zLineNum[80];          /* Line number print buffer */
+    Tcl_Obj *pResult;           /* interp result */
+
+    char *zSep;
+    char *zNull;
+    if( objc<5 || objc>7 ){
+      Tcl_WrongNumArgs(interp, 2, objv,
+         "CONFLICT-ALGORITHM TABLE FILENAME ?SEPARATOR? ?NULLINDICATOR?");
+      return TCL_ERROR;
+    }
+    if( objc>=6 ){
+      zSep = Tcl_GetStringFromObj(objv[5], 0);
+    }else{
+      zSep = "\t";
+    }
+    if( objc>=7 ){
+      zNull = Tcl_GetStringFromObj(objv[6], 0);
+    }else{
+      zNull = "";
+    }
+    zConflict = Tcl_GetStringFromObj(objv[2], 0);
+    zTable = Tcl_GetStringFromObj(objv[3], 0);
+    zFile = Tcl_GetStringFromObj(objv[4], 0);
+    nSep = strlen(zSep);
+    nNull = strlen(zNull);
+    if( nSep==0 ){
+      Tcl_AppendResult(interp,"Error: non-null separator required for copy",0);
+      return TCL_ERROR;
+    }
+    if(sqlite3StrICmp(zConflict, "rollback") != 0 &&
+       sqlite3StrICmp(zConflict, "abort"   ) != 0 &&
+       sqlite3StrICmp(zConflict, "fail"    ) != 0 &&
+       sqlite3StrICmp(zConflict, "ignore"  ) != 0 &&
+       sqlite3StrICmp(zConflict, "replace" ) != 0 ) {
+      Tcl_AppendResult(interp, "Error: \"", zConflict,
+            "\", conflict-algorithm must be one of: rollback, "
+            "abort, fail, ignore, or replace", 0);
+      return TCL_ERROR;
+    }
+    zSql = sqlite3_mprintf("SELECT * FROM '%q'", zTable);
+    if( zSql==0 ){
+      Tcl_AppendResult(interp, "Error: no such table: ", zTable, 0);
+      return TCL_ERROR;
+    }
+    nByte = strlen(zSql);
+    rc = sqlite3_prepare(pDb->db, zSql, -1, &pStmt, 0);
+    sqlite3_free(zSql);
+    if( rc ){
+      Tcl_AppendResult(interp, "Error: ", sqlite3_errmsg(pDb->db), 0);
+      nCol = 0;
+    }else{
+      nCol = sqlite3_column_count(pStmt);
+    }
+    sqlite3_finalize(pStmt);
+    if( nCol==0 ) {
+      return TCL_ERROR;
+    }
+    zSql = malloc( nByte + 50 + nCol*2 );
+    if( zSql==0 ) {
+      Tcl_AppendResult(interp, "Error: can't malloc()", 0);
+      return TCL_ERROR;
+    }
+    sqlite3_snprintf(nByte+50, zSql, "INSERT OR %q INTO '%q' VALUES(?",
+         zConflict, zTable);
+    j = strlen(zSql);
+    for(i=1; i<nCol; i++){
+      zSql[j++] = ',';
+      zSql[j++] = '?';
+    }
+    zSql[j++] = ')';
+    zSql[j] = 0;
+    rc = sqlite3_prepare(pDb->db, zSql, -1, &pStmt, 0);
+    free(zSql);
+    if( rc ){
+      Tcl_AppendResult(interp, "Error: ", sqlite3_errmsg(pDb->db), 0);
+      sqlite3_finalize(pStmt);
+      return TCL_ERROR;
+    }
+    in = fopen(zFile, "rb");
+    if( in==0 ){
+      Tcl_AppendResult(interp, "Error: cannot open file: ", zFile, NULL);
+      sqlite3_finalize(pStmt);
+      return TCL_ERROR;
+    }
+    azCol = malloc( sizeof(azCol[0])*(nCol+1) );
+    if( azCol==0 ) {
+      Tcl_AppendResult(interp, "Error: can't malloc()", 0);
+      fclose(in);
+      return TCL_ERROR;
+    }
+    (void)sqlite3_exec(pDb->db, "BEGIN", 0, 0, 0);
+    zCommit = "COMMIT";
+    while( (zLine = local_getline(0, in))!=0 ){
+      char *z;
+      i = 0;
+      lineno++;
+      azCol[0] = zLine;
+      for(i=0, z=zLine; *z; z++){
+        if( *z==zSep[0] && strncmp(z, zSep, nSep)==0 ){
+          *z = 0;
+          i++;
+          if( i<nCol ){
+            azCol[i] = &z[nSep];
+            z += nSep-1;
+          }
+        }
+      }
+      if( i+1!=nCol ){
+        char *zErr;
+        int nErr = strlen(zFile) + 200;
+        zErr = malloc(nErr);
+        if( zErr ){
+          sqlite3_snprintf(nErr, zErr,
+             "Error: %s line %d: expected %d columns of data but found %d",
+             zFile, lineno, nCol, i+1);
+          Tcl_AppendResult(interp, zErr, 0);
+          free(zErr);
+        }
+        zCommit = "ROLLBACK";
+        break;
+      }
+      for(i=0; i<nCol; i++){
+        /* check for null data, if so, bind as null */
+        if ((nNull>0 && strcmp(azCol[i], zNull)==0) || strlen(azCol[i])==0) {
+          sqlite3_bind_null(pStmt, i+1);
+        }else{
+          sqlite3_bind_text(pStmt, i+1, azCol[i], -1, SQLITE_STATIC);
+        }
+      }
+      sqlite3_step(pStmt);
+      rc = sqlite3_reset(pStmt);
+      free(zLine);
+      if( rc!=SQLITE_OK ){
+        Tcl_AppendResult(interp,"Error: ", sqlite3_errmsg(pDb->db), 0);
+        zCommit = "ROLLBACK";
+        break;
+      }
+    }
+    free(azCol);
+    fclose(in);
+    sqlite3_finalize(pStmt);
+    (void)sqlite3_exec(pDb->db, zCommit, 0, 0, 0);
+
+    if( zCommit[0] == 'C' ){
+      /* success, set result as number of lines processed */
+      pResult = Tcl_GetObjResult(interp);
+      Tcl_SetIntObj(pResult, lineno);
+      rc = TCL_OK;
+    }else{
+      /* failure, append lineno where failed */
+      sqlite3_snprintf(sizeof(zLineNum), zLineNum,"%d",lineno);
+      Tcl_AppendResult(interp,", failed while processing line: ",zLineNum,0);
+      rc = TCL_ERROR;
+    }
+    break;
+  }
+
+  /*
+  **    $db enable_load_extension BOOLEAN
+  **
+  ** Turn the extension loading feature on or off.  It if off by
+  ** default.
+  */
+  case DB_ENABLE_LOAD_EXTENSION: {
+#ifndef SQLITE_OMIT_LOAD_EXTENSION
+    int onoff;
+    if( objc!=3 ){
+      Tcl_WrongNumArgs(interp, 2, objv, "BOOLEAN");
+      return TCL_ERROR;
+    }
+    if( Tcl_GetBooleanFromObj(interp, objv[2], &onoff) ){
+      return TCL_ERROR;
+    }
+    sqlite3_enable_load_extension(pDb->db, onoff);
+    break;
+#else
+    Tcl_AppendResult(interp, "extension loading is turned off at compile-time",
+                     0);
+    return TCL_ERROR;
+#endif
+  }
+
+  /*
+  **    $db errorcode
+  **
+  ** Return the numeric error code that was returned by the most recent
+  ** call to sqlite3_exec().
+  */
+  case DB_ERRORCODE: {
+    Tcl_SetObjResult(interp, Tcl_NewIntObj(sqlite3_errcode(pDb->db)));
+    break;
+  }
+
+  /*
+  **    $db eval $sql ?array? ?{  ...code... }?
+  **    $db onecolumn $sql
+  **
+  ** The SQL statement in $sql is evaluated.  For each row, the values are
+  ** placed in elements of the array named "array" and ...code... is executed.
+  ** If "array" and "code" are omitted, then no callback is every invoked.
+  ** If "array" is an empty string, then the values are placed in variables
+  ** that have the same name as the fields extracted by the query.
+  **
+  ** The onecolumn method is the equivalent of:
+  **     lindex [$db eval $sql] 0
+  */
+  case DB_ONECOLUMN:
+  case DB_EVAL:
+  case DB_EXISTS: {
+    char const *zSql;      /* Next SQL statement to execute */
+    char const *zLeft;     /* What is left after first stmt in zSql */
+    sqlite3_stmt *pStmt;   /* Compiled SQL statment */
+    Tcl_Obj *pArray;       /* Name of array into which results are written */
+    Tcl_Obj *pScript;      /* Script to run for each result set */
+    Tcl_Obj **apParm;      /* Parameters that need a Tcl_DecrRefCount() */
+    int nParm;             /* Number of entries used in apParm[] */
+    Tcl_Obj *aParm[10];    /* Static space for apParm[] in the common case */
+    Tcl_Obj *pRet;         /* Value to be returned */
+    SqlPreparedStmt *pPreStmt;  /* Pointer to a prepared statement */
+    int rc2;
+
+    if( choice==DB_EVAL ){
+      if( objc<3 || objc>5 ){
+        Tcl_WrongNumArgs(interp, 2, objv, "SQL ?ARRAY-NAME? ?SCRIPT?");
+        return TCL_ERROR;
+      }
+      pRet = Tcl_NewObj();
+      Tcl_IncrRefCount(pRet);
+    }else{
+      if( objc!=3 ){
+        Tcl_WrongNumArgs(interp, 2, objv, "SQL");
+        return TCL_ERROR;
+      }
+      if( choice==DB_EXISTS ){
+        pRet = Tcl_NewBooleanObj(0);
+        Tcl_IncrRefCount(pRet);
+      }else{
+        pRet = 0;
+      }
+    }
+    if( objc==3 ){
+      pArray = pScript = 0;
+    }else if( objc==4 ){
+      pArray = 0;
+      pScript = objv[3];
+    }else{
+      pArray = objv[3];
+      if( Tcl_GetString(pArray)[0]==0 ) pArray = 0;
+      pScript = objv[4];
+    }
+
+    Tcl_IncrRefCount(objv[2]);
+    zSql = Tcl_GetStringFromObj(objv[2], 0);
+    while( rc==TCL_OK && zSql[0] ){
+      int i;                     /* Loop counter */
+      int nVar;                  /* Number of bind parameters in the pStmt */
+      int nCol = -1;             /* Number of columns in the result set */
+      Tcl_Obj **apColName = 0;   /* Array of column names */
+      int len;                   /* String length of zSql */
+
+      /* Try to find a SQL statement that has already been compiled and
+      ** which matches the next sequence of SQL.
+      */
+      pStmt = 0;
+      len = strlen(zSql);
+      for(pPreStmt = pDb->stmtList; pPreStmt; pPreStmt=pPreStmt->pNext){
+        int n = pPreStmt->nSql;
+        if( len>=n
+            && memcmp(pPreStmt->zSql, zSql, n)==0
+            && (zSql[n]==0 || zSql[n-1]==';')
+        ){
+          pStmt = pPreStmt->pStmt;
+          zLeft = &zSql[pPreStmt->nSql];
+
+          /* When a prepared statement is found, unlink it from the
+          ** cache list.  It will later be added back to the beginning
+          ** of the cache list in order to implement LRU replacement.
+          */
+          if( pPreStmt->pPrev ){
+            pPreStmt->pPrev->pNext = pPreStmt->pNext;
+          }else{
+            pDb->stmtList = pPreStmt->pNext;
+          }
+          if( pPreStmt->pNext ){
+            pPreStmt->pNext->pPrev = pPreStmt->pPrev;
+          }else{
+            pDb->stmtLast = pPreStmt->pPrev;
+          }
+          pDb->nStmt--;
+          break;
+        }
+      }
+
+      /* If no prepared statement was found.  Compile the SQL text
+      */
+      if( pStmt==0 ){
+        if( SQLITE_OK!=sqlite3_prepare_v2(pDb->db, zSql, -1, &pStmt, &zLeft) ){
+          Tcl_SetObjResult(interp, dbTextToObj(sqlite3_errmsg(pDb->db)));
+          rc = TCL_ERROR;
+          break;
+        }
+        if( pStmt==0 ){
+          if( SQLITE_OK!=sqlite3_errcode(pDb->db) ){
+            /* A compile-time error in the statement
+            */
+            Tcl_SetObjResult(interp, dbTextToObj(sqlite3_errmsg(pDb->db)));
+            rc = TCL_ERROR;
+            break;
+          }else{
+            /* The statement was a no-op.  Continue to the next statement
+            ** in the SQL string.
+            */
+            zSql = zLeft;
+            continue;
+          }
+        }
+        assert( pPreStmt==0 );
+      }
+
+      /* Bind values to parameters that begin with $ or :
+      */
+      nVar = sqlite3_bind_parameter_count(pStmt);
+      nParm = 0;
+      if( nVar>sizeof(aParm)/sizeof(aParm[0]) ){
+        apParm = (Tcl_Obj**)Tcl_Alloc(nVar*sizeof(apParm[0]));
+      }else{
+        apParm = aParm;
+      }
+      for(i=1; i<=nVar; i++){
+        const char *zVar = sqlite3_bind_parameter_name(pStmt, i);
+        if( zVar!=0 && (zVar[0]=='$' || zVar[0]==':' || zVar[0]=='@') ){
+          Tcl_Obj *pVar = Tcl_GetVar2Ex(interp, &zVar[1], 0, 0);
+          if( pVar ){
+            int n;
+            u8 *data;
+            char *zType = pVar->typePtr ? pVar->typePtr->name : "";
+            char c = zType[0];
+            if( zVar[0]=='@' ||
+               (c=='b' && strcmp(zType,"bytearray")==0 && pVar->bytes==0) ){
+              /* Load a BLOB type if the Tcl variable is a bytearray and
+              ** it has no string representation or the host
+              ** parameter name begins with "@". */
+              data = Tcl_GetByteArrayFromObj(pVar, &n);
+              sqlite3_bind_blob(pStmt, i, data, n, SQLITE_STATIC);
+              Tcl_IncrRefCount(pVar);
+              apParm[nParm++] = pVar;
+            }else if( c=='b' && strcmp(zType,"boolean")==0 ){
+              Tcl_GetIntFromObj(interp, pVar, &n);
+              sqlite3_bind_int(pStmt, i, n);
+            }else if( c=='d' && strcmp(zType,"double")==0 ){
+              double r;
+              Tcl_GetDoubleFromObj(interp, pVar, &r);
+              sqlite3_bind_double(pStmt, i, r);
+            }else if( (c=='w' && strcmp(zType,"wideInt")==0) ||
+                  (c=='i' && strcmp(zType,"int")==0) ){
+              Tcl_WideInt v;
+              Tcl_GetWideIntFromObj(interp, pVar, &v);
+              sqlite3_bind_int64(pStmt, i, v);
+            }else{
+              data = (unsigned char *)Tcl_GetStringFromObj(pVar, &n);
+              sqlite3_bind_text(pStmt, i, (char *)data, n, SQLITE_STATIC);
+              Tcl_IncrRefCount(pVar);
+              apParm[nParm++] = pVar;
+            }
+          }else{
+            sqlite3_bind_null( pStmt, i );
+          }
+        }
+      }
+
+      /* Execute the SQL
+      */
+      while( rc==TCL_OK && pStmt && SQLITE_ROW==sqlite3_step(pStmt) ){
+
+	/* Compute column names. This must be done after the first successful
+	** call to sqlite3_step(), in case the query is recompiled and the
+        ** number or names of the returned columns changes.
+        */
+        assert(!pArray||pScript);
+        if (nCol < 0) {
+          Tcl_Obj ***ap = (pScript?&apColName:0);
+          nCol = computeColumnNames(interp, pStmt, ap, pArray);
+        }
+
+        for(i=0; i<nCol; i++){
+          Tcl_Obj *pVal;
+
+          /* Set pVal to contain the i'th column of this row. */
+          switch( sqlite3_column_type(pStmt, i) ){
+            case SQLITE_BLOB: {
+              int bytes = sqlite3_column_bytes(pStmt, i);
+              const char *zBlob = sqlite3_column_blob(pStmt, i);
+              if( !zBlob ) bytes = 0;
+              pVal = Tcl_NewByteArrayObj((u8*)zBlob, bytes);
+              break;
+            }
+            case SQLITE_INTEGER: {
+              sqlite_int64 v = sqlite3_column_int64(pStmt, i);
+              if( v>=-2147483647 && v<=2147483647 ){
+                pVal = Tcl_NewIntObj(v);
+              }else{
+                pVal = Tcl_NewWideIntObj(v);
+              }
+              break;
+            }
+            case SQLITE_FLOAT: {
+              double r = sqlite3_column_double(pStmt, i);
+              pVal = Tcl_NewDoubleObj(r);
+              break;
+            }
+            case SQLITE_NULL: {
+              pVal = dbTextToObj(pDb->zNull);
+              break;
+            }
+            default: {
+              pVal = dbTextToObj((char *)sqlite3_column_text(pStmt, i));
+              break;
+            }
+          }
+
+          if( pScript ){
+            if( pArray==0 ){
+              Tcl_ObjSetVar2(interp, apColName[i], 0, pVal, 0);
+            }else{
+              Tcl_ObjSetVar2(interp, pArray, apColName[i], pVal, 0);
+            }
+          }else if( choice==DB_ONECOLUMN ){
+            assert( pRet==0 );
+            if( pRet==0 ){
+              pRet = pVal;
+              Tcl_IncrRefCount(pRet);
+            }
+            rc = TCL_BREAK;
+            i = nCol;
+          }else if( choice==DB_EXISTS ){
+            Tcl_DecrRefCount(pRet);
+            pRet = Tcl_NewBooleanObj(1);
+            Tcl_IncrRefCount(pRet);
+            rc = TCL_BREAK;
+            i = nCol;
+          }else{
+            Tcl_ListObjAppendElement(interp, pRet, pVal);
+          }
+        }
+
+        if( pScript ){
+          rc = Tcl_EvalObjEx(interp, pScript, 0);
+          if( rc==TCL_CONTINUE ){
+            rc = TCL_OK;
+          }
+        }
+      }
+      if( rc==TCL_BREAK ){
+        rc = TCL_OK;
+      }
+
+      /* Free the column name objects */
+      if( pScript ){
+        /* If the query returned no rows, but an array variable was
+        ** specified, call computeColumnNames() now to populate the
+        ** arrayname(*) variable.
+        */
+        if (pArray && nCol < 0) {
+          Tcl_Obj ***ap = (pScript?&apColName:0);
+          nCol = computeColumnNames(interp, pStmt, ap, pArray);
+        }
+        for(i=0; i<nCol; i++){
+          Tcl_DecrRefCount(apColName[i]);
+        }
+        Tcl_Free((char*)apColName);
+      }
+
+      /* Free the bound string and blob parameters */
+      for(i=0; i<nParm; i++){
+        Tcl_DecrRefCount(apParm[i]);
+      }
+      if( apParm!=aParm ){
+        Tcl_Free((char*)apParm);
+      }
+
+      /* Reset the statement.  If the result code is SQLITE_SCHEMA, then
+      ** flush the statement cache and try the statement again.
+      */
+      rc2 = sqlite3_reset(pStmt);
+      if( SQLITE_OK!=rc2 ){
+        /* If a run-time error occurs, report the error and stop reading
+        ** the SQL
+        */
+        Tcl_SetObjResult(interp, dbTextToObj(sqlite3_errmsg(pDb->db)));
+        sqlite3_finalize(pStmt);
+        rc = TCL_ERROR;
+        if( pPreStmt ) Tcl_Free((char*)pPreStmt);
+        break;
+      }else if( pDb->maxStmt<=0 ){
+        /* If the cache is turned off, deallocated the statement */
+        if( pPreStmt ) Tcl_Free((char*)pPreStmt);
+        sqlite3_finalize(pStmt);
+      }else{
+        /* Everything worked and the cache is operational.
+        ** Create a new SqlPreparedStmt structure if we need one.
+        ** (If we already have one we can just reuse it.)
+        */
+        if( pPreStmt==0 ){
+          len = zLeft - zSql;
+          pPreStmt = (SqlPreparedStmt*)Tcl_Alloc( sizeof(*pPreStmt) );
+          if( pPreStmt==0 ) return TCL_ERROR;
+          pPreStmt->pStmt = pStmt;
+          pPreStmt->nSql = len;
+          pPreStmt->zSql = sqlite3_sql(pStmt);
+          assert( strlen(pPreStmt->zSql)==len );
+          assert( 0==memcmp(pPreStmt->zSql, zSql, len) );
+        }
+
+        /* Add the prepared statement to the beginning of the cache list
+        */
+        pPreStmt->pNext = pDb->stmtList;
+        pPreStmt->pPrev = 0;
+        if( pDb->stmtList ){
+         pDb->stmtList->pPrev = pPreStmt;
+        }
+        pDb->stmtList = pPreStmt;
+        if( pDb->stmtLast==0 ){
+          assert( pDb->nStmt==0 );
+          pDb->stmtLast = pPreStmt;
+        }else{
+          assert( pDb->nStmt>0 );
+        }
+        pDb->nStmt++;
+
+        /* If we have too many statement in cache, remove the surplus from the
+        ** end of the cache list.
+        */
+        while( pDb->nStmt>pDb->maxStmt ){
+          sqlite3_finalize(pDb->stmtLast->pStmt);
+          pDb->stmtLast = pDb->stmtLast->pPrev;
+          Tcl_Free((char*)pDb->stmtLast->pNext);
+          pDb->stmtLast->pNext = 0;
+          pDb->nStmt--;
+        }
+      }
+
+      /* Proceed to the next statement */
+      zSql = zLeft;
+    }
+    Tcl_DecrRefCount(objv[2]);
+
+    if( pRet ){
+      if( rc==TCL_OK ){
+        Tcl_SetObjResult(interp, pRet);
+      }
+      Tcl_DecrRefCount(pRet);
+    }else if( rc==TCL_OK ){
+      Tcl_ResetResult(interp);
+    }
+    break;
+  }
+
+  /*
+  **     $db function NAME SCRIPT
+  **
+  ** Create a new SQL function called NAME.  Whenever that function is
+  ** called, invoke SCRIPT to evaluate the function.
+  */
+  case DB_FUNCTION: {
+    SqlFunc *pFunc;
+    Tcl_Obj *pScript;
+    char *zName;
+    if( objc!=4 ){
+      Tcl_WrongNumArgs(interp, 2, objv, "NAME SCRIPT");
+      return TCL_ERROR;
+    }
+    zName = Tcl_GetStringFromObj(objv[2], 0);
+    pScript = objv[3];
+    pFunc = findSqlFunc(pDb, zName);
+    if( pFunc==0 ) return TCL_ERROR;
+    if( pFunc->pScript ){
+      Tcl_DecrRefCount(pFunc->pScript);
+    }
+    pFunc->pScript = pScript;
+    Tcl_IncrRefCount(pScript);
+    pFunc->useEvalObjv = safeToUseEvalObjv(interp, pScript);
+    rc = sqlite3_create_function(pDb->db, zName, -1, SQLITE_UTF8,
+        pFunc, tclSqlFunc, 0, 0);
+    if( rc!=SQLITE_OK ){
+      rc = TCL_ERROR;
+      Tcl_SetResult(interp, (char *)sqlite3_errmsg(pDb->db), TCL_VOLATILE);
+    }
+    break;
+  }
+
+  /*
+  **     $db incrblob ?-readonly? ?DB? TABLE COLUMN ROWID
+  */
+  case DB_INCRBLOB: {
+#ifdef SQLITE_OMIT_INCRBLOB
+    Tcl_AppendResult(interp, "incrblob not available in this build", 0);
+    return TCL_ERROR;
+#else
+    int isReadonly = 0;
+    const char *zDb = "main";
+    const char *zTable;
+    const char *zColumn;
+    sqlite_int64 iRow;
+
+    /* Check for the -readonly option */
+    if( objc>3 && strcmp(Tcl_GetString(objv[2]), "-readonly")==0 ){
+      isReadonly = 1;
+    }
+
+    if( objc!=(5+isReadonly) && objc!=(6+isReadonly) ){
+      Tcl_WrongNumArgs(interp, 2, objv, "?-readonly? ?DB? TABLE COLUMN ROWID");
+      return TCL_ERROR;
+    }
+
+    if( objc==(6+isReadonly) ){
+      zDb = Tcl_GetString(objv[2]);
+    }
+    zTable = Tcl_GetString(objv[objc-3]);
+    zColumn = Tcl_GetString(objv[objc-2]);
+    rc = Tcl_GetWideIntFromObj(interp, objv[objc-1], &iRow);
+
+    if( rc==TCL_OK ){
+      rc = createIncrblobChannel(
+          interp, pDb, zDb, zTable, zColumn, iRow, isReadonly
+      );
+    }
+#endif
+    break;
+  }
+
+  /*
+  **     $db interrupt
+  **
+  ** Interrupt the execution of the inner-most SQL interpreter.  This
+  ** causes the SQL statement to return an error of SQLITE_INTERRUPT.
+  */
+  case DB_INTERRUPT: {
+    sqlite3_interrupt(pDb->db);
+    break;
+  }
+
+  /*
+  **     $db nullvalue ?STRING?
+  **
+  ** Change text used when a NULL comes back from the database. If ?STRING?
+  ** is not present, then the current string used for NULL is returned.
+  ** If STRING is present, then STRING is returned.
+  **
+  */
+  case DB_NULLVALUE: {
+    if( objc!=2 && objc!=3 ){
+      Tcl_WrongNumArgs(interp, 2, objv, "NULLVALUE");
+      return TCL_ERROR;
+    }
+    if( objc==3 ){
+      int len;
+      char *zNull = Tcl_GetStringFromObj(objv[2], &len);
+      if( pDb->zNull ){
+        Tcl_Free(pDb->zNull);
+      }
+      if( zNull && len>0 ){
+        pDb->zNull = Tcl_Alloc( len + 1 );
+        strncpy(pDb->zNull, zNull, len);
+        pDb->zNull[len] = '\0';
+      }else{
+        pDb->zNull = 0;
+      }
+    }
+    Tcl_SetObjResult(interp, dbTextToObj(pDb->zNull));
+    break;
+  }
+
+  /*
+  **     $db last_insert_rowid
+  **
+  ** Return an integer which is the ROWID for the most recent insert.
+  */
+  case DB_LAST_INSERT_ROWID: {
+    Tcl_Obj *pResult;
+    Tcl_WideInt rowid;
+    if( objc!=2 ){
+      Tcl_WrongNumArgs(interp, 2, objv, "");
+      return TCL_ERROR;
+    }
+    rowid = sqlite3_last_insert_rowid(pDb->db);
+    pResult = Tcl_GetObjResult(interp);
+    Tcl_SetWideIntObj(pResult, rowid);
+    break;
+  }
+
+  /*
+  ** The DB_ONECOLUMN method is implemented together with DB_EVAL.
+  */
+
+  /*    $db progress ?N CALLBACK?
+  **
+  ** Invoke the given callback every N virtual machine opcodes while executing
+  ** queries.
+  */
+  case DB_PROGRESS: {
+    if( objc==2 ){
+      if( pDb->zProgress ){
+        Tcl_AppendResult(interp, pDb->zProgress, 0);
+      }
+    }else if( objc==4 ){
+      char *zProgress;
+      int len;
+      int N;
+      if( TCL_OK!=Tcl_GetIntFromObj(interp, objv[2], &N) ){
+        return TCL_ERROR;
+      };
+      if( pDb->zProgress ){
+        Tcl_Free(pDb->zProgress);
+      }
+      zProgress = Tcl_GetStringFromObj(objv[3], &len);
+      if( zProgress && len>0 ){
+        pDb->zProgress = Tcl_Alloc( len + 1 );
+        memcpy(pDb->zProgress, zProgress, len+1);
+      }else{
+        pDb->zProgress = 0;
+      }
+#ifndef SQLITE_OMIT_PROGRESS_CALLBACK
+      if( pDb->zProgress ){
+        pDb->interp = interp;
+        sqlite3_progress_handler(pDb->db, N, DbProgressHandler, pDb);
+      }else{
+        sqlite3_progress_handler(pDb->db, 0, 0, 0);
+      }
+#endif
+    }else{
+      Tcl_WrongNumArgs(interp, 2, objv, "N CALLBACK");
+      return TCL_ERROR;
+    }
+    break;
+  }
+
+  /*    $db profile ?CALLBACK?
+  **
+  ** Make arrangements to invoke the CALLBACK routine after each SQL statement
+  ** that has run.  The text of the SQL and the amount of elapse time are
+  ** appended to CALLBACK before the script is run.
+  */
+  case DB_PROFILE: {
+    if( objc>3 ){
+      Tcl_WrongNumArgs(interp, 2, objv, "?CALLBACK?");
+      return TCL_ERROR;
+    }else if( objc==2 ){
+      if( pDb->zProfile ){
+        Tcl_AppendResult(interp, pDb->zProfile, 0);
+      }
+    }else{
+      char *zProfile;
+      int len;
+      if( pDb->zProfile ){
+        Tcl_Free(pDb->zProfile);
+      }
+      zProfile = Tcl_GetStringFromObj(objv[2], &len);
+      if( zProfile && len>0 ){
+        pDb->zProfile = Tcl_Alloc( len + 1 );
+        memcpy(pDb->zProfile, zProfile, len+1);
+      }else{
+        pDb->zProfile = 0;
+      }
+#ifndef SQLITE_OMIT_TRACE
+      if( pDb->zProfile ){
+        pDb->interp = interp;
+        sqlite3_profile(pDb->db, DbProfileHandler, pDb);
+      }else{
+        sqlite3_profile(pDb->db, 0, 0);
+      }
+#endif
+    }
+    break;
+  }
+
+  /*
+  **     $db rekey KEY
+  **
+  ** Change the encryption key on the currently open database.
+  */
+  case DB_REKEY: {
+    int nKey;
+    void *pKey;
+    if( objc!=3 ){
+      Tcl_WrongNumArgs(interp, 2, objv, "KEY");
+      return TCL_ERROR;
+    }
+    pKey = Tcl_GetByteArrayFromObj(objv[2], &nKey);
+#ifdef SQLITE_HAS_CODEC
+    rc = sqlite3_rekey(pDb->db, pKey, nKey);
+    if( rc ){
+      Tcl_AppendResult(interp, sqlite3ErrStr(rc), 0);
+      rc = TCL_ERROR;
+    }
+#endif
+    break;
+  }
+
+  /*
+  **     $db timeout MILLESECONDS
+  **
+  ** Delay for the number of milliseconds specified when a file is locked.
+  */
+  case DB_TIMEOUT: {
+    int ms;
+    if( objc!=3 ){
+      Tcl_WrongNumArgs(interp, 2, objv, "MILLISECONDS");
+      return TCL_ERROR;
+    }
+    if( Tcl_GetIntFromObj(interp, objv[2], &ms) ) return TCL_ERROR;
+    sqlite3_busy_timeout(pDb->db, ms);
+    break;
+  }
+
+  /*
+  **     $db total_changes
+  **
+  ** Return the number of rows that were modified, inserted, or deleted
+  ** since the database handle was created.
+  */
+  case DB_TOTAL_CHANGES: {
+    Tcl_Obj *pResult;
+    if( objc!=2 ){
+      Tcl_WrongNumArgs(interp, 2, objv, "");
+      return TCL_ERROR;
+    }
+    pResult = Tcl_GetObjResult(interp);
+    Tcl_SetIntObj(pResult, sqlite3_total_changes(pDb->db));
+    break;
+  }
+
+  /*    $db trace ?CALLBACK?
+  **
+  ** Make arrangements to invoke the CALLBACK routine for each SQL statement
+  ** that is executed.  The text of the SQL is appended to CALLBACK before
+  ** it is executed.
+  */
+  case DB_TRACE: {
+    if( objc>3 ){
+      Tcl_WrongNumArgs(interp, 2, objv, "?CALLBACK?");
+      return TCL_ERROR;
+    }else if( objc==2 ){
+      if( pDb->zTrace ){
+        Tcl_AppendResult(interp, pDb->zTrace, 0);
+      }
+    }else{
+      char *zTrace;
+      int len;
+      if( pDb->zTrace ){
+        Tcl_Free(pDb->zTrace);
+      }
+      zTrace = Tcl_GetStringFromObj(objv[2], &len);
+      if( zTrace && len>0 ){
+        pDb->zTrace = Tcl_Alloc( len + 1 );
+        memcpy(pDb->zTrace, zTrace, len+1);
+      }else{
+        pDb->zTrace = 0;
+      }
+#ifndef SQLITE_OMIT_TRACE
+      if( pDb->zTrace ){
+        pDb->interp = interp;
+        sqlite3_trace(pDb->db, DbTraceHandler, pDb);
+      }else{
+        sqlite3_trace(pDb->db, 0, 0);
+      }
+#endif
+    }
+    break;
+  }
+
+  /*    $db transaction [-deferred|-immediate|-exclusive] SCRIPT
+  **
+  ** Start a new transaction (if we are not already in the midst of a
+  ** transaction) and execute the TCL script SCRIPT.  After SCRIPT
+  ** completes, either commit the transaction or roll it back if SCRIPT
+  ** throws an exception.  Or if no new transation was started, do nothing.
+  ** pass the exception on up the stack.
+  **
+  ** This command was inspired by Dave Thomas's talk on Ruby at the
+  ** 2005 O'Reilly Open Source Convention (OSCON).
+  */
+  case DB_TRANSACTION: {
+    int inTrans;
+    Tcl_Obj *pScript;
+    const char *zBegin = "BEGIN";
+    if( objc!=3 && objc!=4 ){
+      Tcl_WrongNumArgs(interp, 2, objv, "[TYPE] SCRIPT");
+      return TCL_ERROR;
+    }
+    if( objc==3 ){
+      pScript = objv[2];
+    } else {
+      static const char *TTYPE_strs[] = {
+        "deferred",   "exclusive",  "immediate", 0
+      };
+      enum TTYPE_enum {
+        TTYPE_DEFERRED, TTYPE_EXCLUSIVE, TTYPE_IMMEDIATE
+      };
+      int ttype;
+      if( Tcl_GetIndexFromObj(interp, objv[2], TTYPE_strs, "transaction type",
+                              0, &ttype) ){
+        return TCL_ERROR;
+      }
+      switch( (enum TTYPE_enum)ttype ){
+        case TTYPE_DEFERRED:    /* no-op */;                 break;
+        case TTYPE_EXCLUSIVE:   zBegin = "BEGIN EXCLUSIVE";  break;
+        case TTYPE_IMMEDIATE:   zBegin = "BEGIN IMMEDIATE";  break;
+      }
+      pScript = objv[3];
+    }
+    inTrans = !sqlite3_get_autocommit(pDb->db);
+    if( !inTrans ){
+      (void)sqlite3_exec(pDb->db, zBegin, 0, 0, 0);
+    }
+    rc = Tcl_EvalObjEx(interp, pScript, 0);
+    if( !inTrans ){
+      const char *zEnd;
+      if( rc==TCL_ERROR ){
+        zEnd = "ROLLBACK";
+      } else {
+        zEnd = "COMMIT";
+      }
+      if( sqlite3_exec(pDb->db, zEnd, 0, 0, 0) ){
+        sqlite3_exec(pDb->db, "ROLLBACK", 0, 0, 0);
+      }
+    }
+    break;
+  }
+
+  /*
+  **    $db update_hook ?script?
+  **    $db rollback_hook ?script?
+  */
+  case DB_UPDATE_HOOK:
+  case DB_ROLLBACK_HOOK: {
+
+    /* set ppHook to point at pUpdateHook or pRollbackHook, depending on
+    ** whether [$db update_hook] or [$db rollback_hook] was invoked.
+    */
+    Tcl_Obj **ppHook;
+    if( choice==DB_UPDATE_HOOK ){
+      ppHook = &pDb->pUpdateHook;
+    }else{
+      ppHook = &pDb->pRollbackHook;
+    }
+
+    if( objc!=2 && objc!=3 ){
+       Tcl_WrongNumArgs(interp, 2, objv, "?SCRIPT?");
+       return TCL_ERROR;
+    }
+    if( *ppHook ){
+      Tcl_SetObjResult(interp, *ppHook);
+      if( objc==3 ){
+        Tcl_DecrRefCount(*ppHook);
+        *ppHook = 0;
+      }
+    }
+    if( objc==3 ){
+      assert( !(*ppHook) );
+      if( Tcl_GetCharLength(objv[2])>0 ){
+        *ppHook = objv[2];
+        Tcl_IncrRefCount(*ppHook);
+      }
+    }
+
+    sqlite3_update_hook(pDb->db, (pDb->pUpdateHook?DbUpdateHandler:0), pDb);
+    sqlite3_rollback_hook(pDb->db,(pDb->pRollbackHook?DbRollbackHandler:0),pDb);
+
+    break;
+  }
+
+  /*    $db version
+  **
+  ** Return the version string for this database.
+  */
+  case DB_VERSION: {
+    Tcl_SetResult(interp, (char *)sqlite3_libversion(), TCL_STATIC);
+    break;
+  }
+
+
+  } /* End of the SWITCH statement */
+  return rc;
+}
+
+/*
+**   sqlite3 DBNAME FILENAME ?-vfs VFSNAME? ?-key KEY? ?-readonly BOOLEAN?
+**                           ?-create BOOLEAN?
+**
+** This is the main Tcl command.  When the "sqlite" Tcl command is
+** invoked, this routine runs to process that command.
+**
+** The first argument, DBNAME, is an arbitrary name for a new
+** database connection.  This command creates a new command named
+** DBNAME that is used to control that connection.  The database
+** connection is deleted when the DBNAME command is deleted.
+**
+** The second argument is the name of the database file.
+**
+*/
+static int DbMain(void *cd, Tcl_Interp *interp, int objc,Tcl_Obj *const*objv){
+  SqliteDb *p;
+  void *pKey = 0;
+  int nKey = 0;
+  const char *zArg;
+  char *zErrMsg;
+  int i;
+  const char *zFile;
+  const char *zVfs = 0;
+  int flags = SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE;
+  Tcl_DString translatedFilename;
+  if( objc==2 ){
+    zArg = Tcl_GetStringFromObj(objv[1], 0);
+    if( strcmp(zArg,"-version")==0 ){
+      Tcl_AppendResult(interp,sqlite3_version,0);
+      return TCL_OK;
+    }
+    if( strcmp(zArg,"-has-codec")==0 ){
+#ifdef SQLITE_HAS_CODEC
+      Tcl_AppendResult(interp,"1",0);
+#else
+      Tcl_AppendResult(interp,"0",0);
+#endif
+      return TCL_OK;
+    }
+  }
+  for(i=3; i+1<objc; i+=2){
+    zArg = Tcl_GetString(objv[i]);
+    if( strcmp(zArg,"-key")==0 ){
+      pKey = Tcl_GetByteArrayFromObj(objv[i+1], &nKey);
+    }else if( strcmp(zArg, "-vfs")==0 ){
+      i++;
+      zVfs = Tcl_GetString(objv[i]);
+    }else if( strcmp(zArg, "-readonly")==0 ){
+      int b;
+      if( Tcl_GetBooleanFromObj(interp, objv[i+1], &b) ) return TCL_ERROR;
+      if( b ){
+        flags &= ~(SQLITE_OPEN_READWRITE|SQLITE_OPEN_CREATE);
+        flags |= SQLITE_OPEN_READONLY;
+      }else{
+        flags &= ~SQLITE_OPEN_READONLY;
+        flags |= SQLITE_OPEN_READWRITE;
+      }
+    }else if( strcmp(zArg, "-create")==0 ){
+      int b;
+      if( Tcl_GetBooleanFromObj(interp, objv[i+1], &b) ) return TCL_ERROR;
+      if( b && (flags & SQLITE_OPEN_READONLY)==0 ){
+        flags |= SQLITE_OPEN_CREATE;
+      }else{
+        flags &= ~SQLITE_OPEN_CREATE;
+      }
+    }else{
+      Tcl_AppendResult(interp, "unknown option: ", zArg, (char*)0);
+      return TCL_ERROR;
+    }
+  }
+  if( objc<3 || (objc&1)!=1 ){
+    Tcl_WrongNumArgs(interp, 1, objv,
+      "HANDLE FILENAME ?-vfs VFSNAME? ?-readonly BOOLEAN? ?-create BOOLEAN?"
+#ifdef SQLITE_HAS_CODEC
+      " ?-key CODECKEY?"
+#endif
+    );
+    return TCL_ERROR;
+  }
+  zErrMsg = 0;
+  p = (SqliteDb*)Tcl_Alloc( sizeof(*p) );
+  if( p==0 ){
+    Tcl_SetResult(interp, "malloc failed", TCL_STATIC);
+    return TCL_ERROR;
+  }
+  memset(p, 0, sizeof(*p));
+  zFile = Tcl_GetStringFromObj(objv[2], 0);
+  zFile = Tcl_TranslateFileName(interp, zFile, &translatedFilename);
+  sqlite3_open_v2(zFile, &p->db, flags, zVfs);
+  Tcl_DStringFree(&translatedFilename);
+  if( SQLITE_OK!=sqlite3_errcode(p->db) ){
+    zErrMsg = sqlite3_mprintf("%s", sqlite3_errmsg(p->db));
+    sqlite3_close(p->db);
+    p->db = 0;
+  }
+#ifdef SQLITE_TEST
+  if( p->db ){
+    extern int Md5_Register(sqlite3*);
+    if( Md5_Register(p->db)==SQLITE_NOMEM ){
+      zErrMsg = sqlite3_mprintf("%s", sqlite3_errmsg(p->db));
+      sqlite3_close(p->db);
+      p->db = 0;
+    }
+  }
+#endif
+#ifdef SQLITE_HAS_CODEC
+  if( p->db ){
+    sqlite3_key(p->db, pKey, nKey);
+  }
+#endif
+  if( p->db==0 ){
+    Tcl_SetResult(interp, zErrMsg, TCL_VOLATILE);
+    Tcl_Free((char*)p);
+    sqlite3_free(zErrMsg);
+    return TCL_ERROR;
+  }
+  p->maxStmt = NUM_PREPARED_STMTS;
+  p->interp = interp;
+  zArg = Tcl_GetStringFromObj(objv[1], 0);
+  Tcl_CreateObjCommand(interp, zArg, DbObjCmd, (char*)p, DbDeleteCmd);
+  return TCL_OK;
+}
+
+/*
+** Provide a dummy Tcl_InitStubs if we are using this as a static
+** library.
+*/
+#ifndef USE_TCL_STUBS
+# undef  Tcl_InitStubs
+# define Tcl_InitStubs(a,b,c)
+#endif
+
+/*
+** Make sure we have a PACKAGE_VERSION macro defined.  This will be
+** defined automatically by the TEA makefile.  But other makefiles
+** do not define it.
+*/
+#ifndef PACKAGE_VERSION
+# define PACKAGE_VERSION SQLITE_VERSION
+#endif
+
+/*
+** Initialize this module.
+**
+** This Tcl module contains only a single new Tcl command named "sqlite".
+** (Hence there is no namespace.  There is no point in using a namespace
+** if the extension only supplies one new name!)  The "sqlite" command is
+** used to open a new SQLite database.  See the DbMain() routine above
+** for additional information.
+*/
+EXTERN int Sqlite3_Init(Tcl_Interp *interp){
+  Tcl_InitStubs(interp, "8.4", 0);
+  Tcl_CreateObjCommand(interp, "sqlite3", (Tcl_ObjCmdProc*)DbMain, 0, 0);
+  Tcl_PkgProvide(interp, "sqlite3", PACKAGE_VERSION);
+  Tcl_CreateObjCommand(interp, "sqlite", (Tcl_ObjCmdProc*)DbMain, 0, 0);
+  Tcl_PkgProvide(interp, "sqlite", PACKAGE_VERSION);
+  return TCL_OK;
+}
+EXTERN int Tclsqlite3_Init(Tcl_Interp *interp){ return Sqlite3_Init(interp); }
+EXTERN int Sqlite3_SafeInit(Tcl_Interp *interp){ return TCL_OK; }
+EXTERN int Tclsqlite3_SafeInit(Tcl_Interp *interp){ return TCL_OK; }
+
+#ifndef SQLITE_3_SUFFIX_ONLY
+EXTERN int Sqlite_Init(Tcl_Interp *interp){ return Sqlite3_Init(interp); }
+EXTERN int Tclsqlite_Init(Tcl_Interp *interp){ return Sqlite3_Init(interp); }
+EXTERN int Sqlite_SafeInit(Tcl_Interp *interp){ return TCL_OK; }
+EXTERN int Tclsqlite_SafeInit(Tcl_Interp *interp){ return TCL_OK; }
+#endif
+
+#ifdef TCLSH
+/*****************************************************************************
+** The code that follows is used to build standalone TCL interpreters
+** that are statically linked with SQLite.
+*/
+
+/*
+** If the macro TCLSH is one, then put in code this for the
+** "main" routine that will initialize Tcl and take input from
+** standard input, or if a file is named on the command line
+** the TCL interpreter reads and evaluates that file.
+*/
+#if TCLSH==1
+static char zMainloop[] =
+  "set line {}\n"
+  "while {![eof stdin]} {\n"
+    "if {$line!=\"\"} {\n"
+      "puts -nonewline \"> \"\n"
+    "} else {\n"
+      "puts -nonewline \"% \"\n"
+    "}\n"
+    "flush stdout\n"
+    "append line [gets stdin]\n"
+    "if {[info complete $line]} {\n"
+      "if {[catch {uplevel #0 $line} result]} {\n"
+        "puts stderr \"Error: $result\"\n"
+      "} elseif {$result!=\"\"} {\n"
+        "puts $result\n"
+      "}\n"
+      "set line {}\n"
+    "} else {\n"
+      "append line \\n\n"
+    "}\n"
+  "}\n"
+;
+#endif
+
+/*
+** If the macro TCLSH is two, then get the main loop code out of
+** the separate file "spaceanal_tcl.h".
+*/
+#if TCLSH==2
+static char zMainloop[] =
+#include "spaceanal_tcl.h"
+;
+#endif
+
+#define TCLSH_MAIN main   /* Needed to fake out mktclapp */
+int TCLSH_MAIN(int argc, char **argv){
+  Tcl_Interp *interp;
+  Tcl_FindExecutable(argv[0]);
+  interp = Tcl_CreateInterp();
+  Sqlite3_Init(interp);
+#ifdef SQLITE_TEST
+  {
+    extern int Md5_Init(Tcl_Interp*);
+    extern int Sqliteconfig_Init(Tcl_Interp*);
+    extern int Sqlitetest1_Init(Tcl_Interp*);
+    extern int Sqlitetest2_Init(Tcl_Interp*);
+    extern int Sqlitetest3_Init(Tcl_Interp*);
+    extern int Sqlitetest4_Init(Tcl_Interp*);
+    extern int Sqlitetest5_Init(Tcl_Interp*);
+    extern int Sqlitetest6_Init(Tcl_Interp*);
+    extern int Sqlitetest7_Init(Tcl_Interp*);
+    extern int Sqlitetest8_Init(Tcl_Interp*);
+    extern int Sqlitetest9_Init(Tcl_Interp*);
+    extern int Sqlitetestasync_Init(Tcl_Interp*);
+    extern int Sqlitetest_autoext_Init(Tcl_Interp*);
+    extern int Sqlitetest_hexio_Init(Tcl_Interp*);
+    extern int Sqlitetest_malloc_Init(Tcl_Interp*);
+    extern int Sqlitetestschema_Init(Tcl_Interp*);
+    extern int Sqlitetestsse_Init(Tcl_Interp*);
+    extern int Sqlitetesttclvar_Init(Tcl_Interp*);
+    extern int SqlitetestThread_Init(Tcl_Interp*);
+    extern int SqlitetestOnefile_Init();
+
+    Md5_Init(interp);
+    Sqliteconfig_Init(interp);
+    Sqlitetest1_Init(interp);
+    Sqlitetest2_Init(interp);
+    Sqlitetest3_Init(interp);
+    Sqlitetest4_Init(interp);
+    Sqlitetest5_Init(interp);
+    Sqlitetest6_Init(interp);
+    Sqlitetest7_Init(interp);
+    Sqlitetest8_Init(interp);
+    Sqlitetest9_Init(interp);
+    Sqlitetestasync_Init(interp);
+    Sqlitetest_autoext_Init(interp);
+    Sqlitetest_hexio_Init(interp);
+    Sqlitetest_malloc_Init(interp);
+    Sqlitetestschema_Init(interp);
+    Sqlitetesttclvar_Init(interp);
+    SqlitetestThread_Init(interp);
+    SqlitetestOnefile_Init(interp);
+
+#ifdef SQLITE_SSE
+    Sqlitetestsse_Init(interp);
+#endif
+  }
+#endif
+  if( argc>=2 || TCLSH==2 ){
+    int i;
+    char zArgc[32];
+    sqlite3_snprintf(sizeof(zArgc), zArgc, "%d", argc-(3-TCLSH));
+    Tcl_SetVar(interp,"argc", zArgc, TCL_GLOBAL_ONLY);
+    Tcl_SetVar(interp,"argv0",argv[1],TCL_GLOBAL_ONLY);
+    Tcl_SetVar(interp,"argv", "", TCL_GLOBAL_ONLY);
+    for(i=3-TCLSH; i<argc; i++){
+      Tcl_SetVar(interp, "argv", argv[i],
+          TCL_GLOBAL_ONLY | TCL_LIST_ELEMENT | TCL_APPEND_VALUE);
+    }
+    if( TCLSH==1 && Tcl_EvalFile(interp, argv[1])!=TCL_OK ){
+      const char *zInfo = Tcl_GetVar(interp, "errorInfo", TCL_GLOBAL_ONLY);
+      if( zInfo==0 ) zInfo = interp->result;
+      fprintf(stderr,"%s: %s\n", *argv, zInfo);
+      return 1;
+    }
+  }
+  if( argc<=1 || TCLSH==2 ){
+    Tcl_GlobalEval(interp, zMainloop);
+  }
+  return 0;
+}
+#endif /* TCLSH */
diff --git a/uppsrc/plugin/sqlite3/lib/tokenize.c b/uppsrc/plugin/sqlite3/lib/tokenize.c
new file mode 100644
index 000000000..ae6061dba
--- /dev/null
+++ b/uppsrc/plugin/sqlite3/lib/tokenize.c
@@ -0,0 +1,503 @@
+/*
+** 2001 September 15
+**
+** The author disclaims copyright to this source code.  In place of
+** a legal notice, here is a blessing:
+**
+**    May you do good and not evil.
+**    May you find forgiveness for yourself and forgive others.
+**    May you share freely, never taking more than you give.
+**
+*************************************************************************
+** An tokenizer for SQL
+**
+** This file contains C code that splits an SQL input string up into
+** individual tokens and sends those tokens one-by-one over to the
+** parser for analysis.
+**
+** $Id: tokenize.c,v 1.138 2008/01/22 23:37:10 drh Exp $
+*/
+#include "sqliteInt.h"
+#include <ctype.h>
+#include <stdlib.h>
+
+/*
+** The charMap() macro maps alphabetic characters into their
+** lower-case ASCII equivalent.  On ASCII machines, this is just
+** an upper-to-lower case map.  On EBCDIC machines we also need
+** to adjust the encoding.  Only alphabetic characters and underscores
+** need to be translated.
+*/
+#ifdef SQLITE_ASCII
+# define charMap(X) sqlite3UpperToLower[(unsigned char)X]
+#endif
+#ifdef SQLITE_EBCDIC
+# define charMap(X) ebcdicToAscii[(unsigned char)X]
+const unsigned char ebcdicToAscii[] = {
+/* 0   1   2   3   4   5   6   7   8   9   A   B   C   D   E   F */
+   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  /* 0x */
+   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  /* 1x */
+   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  /* 2x */
+   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  /* 3x */
+   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  /* 4x */
+   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  /* 5x */
+   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 95,  0,  0,  /* 6x */
+   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  /* 7x */
+   0, 97, 98, 99,100,101,102,103,104,105,  0,  0,  0,  0,  0,  0,  /* 8x */
+   0,106,107,108,109,110,111,112,113,114,  0,  0,  0,  0,  0,  0,  /* 9x */
+   0,  0,115,116,117,118,119,120,121,122,  0,  0,  0,  0,  0,  0,  /* Ax */
+   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  /* Bx */
+   0, 97, 98, 99,100,101,102,103,104,105,  0,  0,  0,  0,  0,  0,  /* Cx */
+   0,106,107,108,109,110,111,112,113,114,  0,  0,  0,  0,  0,  0,  /* Dx */
+   0,  0,115,116,117,118,119,120,121,122,  0,  0,  0,  0,  0,  0,  /* Ex */
+   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  /* Fx */
+};
+#endif
+
+/*
+** The sqlite3KeywordCode function looks up an identifier to determine if
+** it is a keyword.  If it is a keyword, the token code of that keyword is
+** returned.  If the input is not a keyword, TK_ID is returned.
+**
+** The implementation of this routine was generated by a program,
+** mkkeywordhash.h, located in the tool subdirectory of the distribution.
+** The output of the mkkeywordhash.c program is written into a file
+** named keywordhash.h and then included into this source file by
+** the #include below.
+*/
+#include "keywordhash.h"
+
+
+/*
+** If X is a character that can be used in an identifier then
+** IdChar(X) will be true.  Otherwise it is false.
+**
+** For ASCII, any character with the high-order bit set is
+** allowed in an identifier.  For 7-bit characters,
+** sqlite3IsIdChar[X] must be 1.
+**
+** For EBCDIC, the rules are more complex but have the same
+** end result.
+**
+** Ticket #1066.  the SQL standard does not allow '$' in the
+** middle of identfiers.  But many SQL implementations do.
+** SQLite will allow '$' in identifiers for compatibility.
+** But the feature is undocumented.
+*/
+#ifdef SQLITE_ASCII
+const char sqlite3IsAsciiIdChar[] = {
+/* x0 x1 x2 x3 x4 x5 x6 x7 x8 x9 xA xB xC xD xE xF */
+    0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  /* 2x */
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0,  /* 3x */
+    0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,  /* 4x */
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1,  /* 5x */
+    0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,  /* 6x */
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0,  /* 7x */
+};
+#define IdChar(C)  (((c=C)&0x80)!=0 || (c>0x1f && sqlite3IsAsciiIdChar[c-0x20]))
+#endif
+#ifdef SQLITE_EBCDIC
+const char sqlite3IsEbcdicIdChar[] = {
+/* x0 x1 x2 x3 x4 x5 x6 x7 x8 x9 xA xB xC xD xE xF */
+    0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0,  /* 4x */
+    0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 0, 0, 0,  /* 5x */
+    0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 1, 0, 0,  /* 6x */
+    0, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0,  /* 7x */
+    0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 0,  /* 8x */
+    0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1, 0, 1, 0,  /* 9x */
+    1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 0,  /* Ax */
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  /* Bx */
+    0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1,  /* Cx */
+    0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1,  /* Dx */
+    0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1,  /* Ex */
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 0,  /* Fx */
+};
+#define IdChar(C)  (((c=C)>=0x42 && sqlite3IsEbcdicIdChar[c-0x40]))
+#endif
+
+
+/*
+** Return the length of the token that begins at z[0].
+** Store the token type in *tokenType before returning.
+*/
+static int getToken(const unsigned char *z, int *tokenType){
+  int i, c;
+  switch( *z ){
+    case ' ': case '\t': case '\n': case '\f': case '\r': {
+      for(i=1; isspace(z[i]); i++){}
+      *tokenType = TK_SPACE;
+      return i;
+    }
+    case '-': {
+      if( z[1]=='-' ){
+        for(i=2; (c=z[i])!=0 && c!='\n'; i++){}
+        *tokenType = TK_COMMENT;
+        return i;
+      }
+      *tokenType = TK_MINUS;
+      return 1;
+    }
+    case '(': {
+      *tokenType = TK_LP;
+      return 1;
+    }
+    case ')': {
+      *tokenType = TK_RP;
+      return 1;
+    }
+    case ';': {
+      *tokenType = TK_SEMI;
+      return 1;
+    }
+    case '+': {
+      *tokenType = TK_PLUS;
+      return 1;
+    }
+    case '*': {
+      *tokenType = TK_STAR;
+      return 1;
+    }
+    case '/': {
+      if( z[1]!='*' || z[2]==0 ){
+        *tokenType = TK_SLASH;
+        return 1;
+      }
+      for(i=3, c=z[2]; (c!='*' || z[i]!='/') && (c=z[i])!=0; i++){}
+      if( c ) i++;
+      *tokenType = TK_COMMENT;
+      return i;
+    }
+    case '%': {
+      *tokenType = TK_REM;
+      return 1;
+    }
+    case '=': {
+      *tokenType = TK_EQ;
+      return 1 + (z[1]=='=');
+    }
+    case '<': {
+      if( (c=z[1])=='=' ){
+        *tokenType = TK_LE;
+        return 2;
+      }else if( c=='>' ){
+        *tokenType = TK_NE;
+        return 2;
+      }else if( c=='<' ){
+        *tokenType = TK_LSHIFT;
+        return 2;
+      }else{
+        *tokenType = TK_LT;
+        return 1;
+      }
+    }
+    case '>': {
+      if( (c=z[1])=='=' ){
+        *tokenType = TK_GE;
+        return 2;
+      }else if( c=='>' ){
+        *tokenType = TK_RSHIFT;
+        return 2;
+      }else{
+        *tokenType = TK_GT;
+        return 1;
+      }
+    }
+    case '!': {
+      if( z[1]!='=' ){
+        *tokenType = TK_ILLEGAL;
+        return 2;
+      }else{
+        *tokenType = TK_NE;
+        return 2;
+      }
+    }
+    case '|': {
+      if( z[1]!='|' ){
+        *tokenType = TK_BITOR;
+        return 1;
+      }else{
+        *tokenType = TK_CONCAT;
+        return 2;
+      }
+    }
+    case ',': {
+      *tokenType = TK_COMMA;
+      return 1;
+    }
+    case '&': {
+      *tokenType = TK_BITAND;
+      return 1;
+    }
+    case '~': {
+      *tokenType = TK_BITNOT;
+      return 1;
+    }
+    case '`':
+    case '\'':
+    case '"': {
+      int delim = z[0];
+      for(i=1; (c=z[i])!=0; i++){
+        if( c==delim ){
+          if( z[i+1]==delim ){
+            i++;
+          }else{
+            break;
+          }
+        }
+      }
+      if( c ){
+        *tokenType = TK_STRING;
+        return i+1;
+      }else{
+        *tokenType = TK_ILLEGAL;
+        return i;
+      }
+    }
+    case '.': {
+#ifndef SQLITE_OMIT_FLOATING_POINT
+      if( !isdigit(z[1]) )
+#endif
+      {
+        *tokenType = TK_DOT;
+        return 1;
+      }
+      /* If the next character is a digit, this is a floating point
+      ** number that begins with ".".  Fall thru into the next case */
+    }
+    case '0': case '1': case '2': case '3': case '4':
+    case '5': case '6': case '7': case '8': case '9': {
+      *tokenType = TK_INTEGER;
+      for(i=0; isdigit(z[i]); i++){}
+#ifndef SQLITE_OMIT_FLOATING_POINT
+      if( z[i]=='.' ){
+        i++;
+        while( isdigit(z[i]) ){ i++; }
+        *tokenType = TK_FLOAT;
+      }
+      if( (z[i]=='e' || z[i]=='E') &&
+           ( isdigit(z[i+1])
+            || ((z[i+1]=='+' || z[i+1]=='-') && isdigit(z[i+2]))
+           )
+      ){
+        i += 2;
+        while( isdigit(z[i]) ){ i++; }
+        *tokenType = TK_FLOAT;
+      }
+#endif
+      while( IdChar(z[i]) ){
+        *tokenType = TK_ILLEGAL;
+        i++;
+      }
+      return i;
+    }
+    case '[': {
+      for(i=1, c=z[0]; c!=']' && (c=z[i])!=0; i++){}
+      *tokenType = c==']' ? TK_ID : TK_ILLEGAL;
+      return i;
+    }
+    case '?': {
+      *tokenType = TK_VARIABLE;
+      for(i=1; isdigit(z[i]); i++){}
+      return i;
+    }
+    case '#': {
+      for(i=1; isdigit(z[i]); i++){}
+      if( i>1 ){
+        /* Parameters of the form #NNN (where NNN is a number) are used
+        ** internally by sqlite3NestedParse.  */
+        *tokenType = TK_REGISTER;
+        return i;
+      }
+      /* Fall through into the next case if the '#' is not followed by
+      ** a digit. Try to match #AAAA where AAAA is a parameter name. */
+    }
+#ifndef SQLITE_OMIT_TCL_VARIABLE
+    case '$':
+#endif
+    case '@':  /* For compatibility with MS SQL Server */
+    case ':': {
+      int n = 0;
+      *tokenType = TK_VARIABLE;
+      for(i=1; (c=z[i])!=0; i++){
+        if( IdChar(c) ){
+          n++;
+#ifndef SQLITE_OMIT_TCL_VARIABLE
+        }else if( c=='(' && n>0 ){
+          do{
+            i++;
+          }while( (c=z[i])!=0 && !isspace(c) && c!=')' );
+          if( c==')' ){
+            i++;
+          }else{
+            *tokenType = TK_ILLEGAL;
+          }
+          break;
+        }else if( c==':' && z[i+1]==':' ){
+          i++;
+#endif
+        }else{
+          break;
+        }
+      }
+      if( n==0 ) *tokenType = TK_ILLEGAL;
+      return i;
+    }
+#ifndef SQLITE_OMIT_BLOB_LITERAL
+    case 'x': case 'X': {
+      if( z[1]=='\'' ){
+        *tokenType = TK_BLOB;
+        for(i=2; (c=z[i])!=0 && c!='\''; i++){
+          if( !isxdigit(c) ){
+            *tokenType = TK_ILLEGAL;
+          }
+        }
+        if( i%2 || !c ) *tokenType = TK_ILLEGAL;
+        if( c ) i++;
+        return i;
+      }
+      /* Otherwise fall through to the next case */
+    }
+#endif
+    default: {
+      if( !IdChar(*z) ){
+        break;
+      }
+      for(i=1; IdChar(z[i]); i++){}
+      *tokenType = keywordCode((char*)z, i);
+      return i;
+    }
+  }
+  *tokenType = TK_ILLEGAL;
+  return 1;
+}
+int sqlite3GetToken(const unsigned char *z, int *tokenType){
+  return getToken(z, tokenType);
+}
+
+/*
+** Run the parser on the given SQL string.  The parser structure is
+** passed in.  An SQLITE_ status code is returned.  If an error occurs
+** and pzErrMsg!=NULL then an error message might be written into
+** memory obtained from sqlite3_malloc() and *pzErrMsg made to point to that
+** error message.  Or maybe not.
+*/
+int sqlite3RunParser(Parse *pParse, const char *zSql, char **pzErrMsg){
+  int nErr = 0;
+  int i;
+  void *pEngine;
+  int tokenType;
+  int lastTokenParsed = -1;
+  sqlite3 *db = pParse->db;
+
+  if( db->activeVdbeCnt==0 ){
+    db->u1.isInterrupted = 0;
+  }
+  pParse->rc = SQLITE_OK;
+  i = 0;
+  pEngine = sqlite3ParserAlloc((void*(*)(size_t))sqlite3_malloc);
+  if( pEngine==0 ){
+    db->mallocFailed = 1;
+    return SQLITE_NOMEM;
+  }
+  assert( pParse->sLastToken.dyn==0 );
+  assert( pParse->pNewTable==0 );
+  assert( pParse->pNewTrigger==0 );
+  assert( pParse->nVar==0 );
+  assert( pParse->nVarExpr==0 );
+  assert( pParse->nVarExprAlloc==0 );
+  assert( pParse->apVarExpr==0 );
+  pParse->zTail = pParse->zSql = zSql;
+  while( !db->mallocFailed && zSql[i]!=0 ){
+    assert( i>=0 );
+    pParse->sLastToken.z = (u8*)&zSql[i];
+    assert( pParse->sLastToken.dyn==0 );
+    pParse->sLastToken.n = getToken((unsigned char*)&zSql[i],&tokenType);
+    i += pParse->sLastToken.n;
+    if( SQLITE_MAX_SQL_LENGTH>0 && i>SQLITE_MAX_SQL_LENGTH ){
+      pParse->rc = SQLITE_TOOBIG;
+      break;
+    }
+    switch( tokenType ){
+      case TK_SPACE:
+      case TK_COMMENT: {
+        if( db->u1.isInterrupted ){
+          pParse->rc = SQLITE_INTERRUPT;
+          sqlite3SetString(pzErrMsg, "interrupt", (char*)0);
+          goto abort_parse;
+        }
+        break;
+      }
+      case TK_ILLEGAL: {
+        if( pzErrMsg ){
+          sqlite3_free(*pzErrMsg);
+          *pzErrMsg = sqlite3MPrintf(db, "unrecognized token: \"%T\"",
+                          &pParse->sLastToken);
+        }
+        nErr++;
+        goto abort_parse;
+      }
+      case TK_SEMI: {
+        pParse->zTail = &zSql[i];
+        /* Fall thru into the default case */
+      }
+      default: {
+        sqlite3Parser(pEngine, tokenType, pParse->sLastToken, pParse);
+        lastTokenParsed = tokenType;
+        if( pParse->rc!=SQLITE_OK ){
+          goto abort_parse;
+        }
+        break;
+      }
+    }
+  }
+abort_parse:
+  if( zSql[i]==0 && nErr==0 && pParse->rc==SQLITE_OK ){
+    if( lastTokenParsed!=TK_SEMI ){
+      sqlite3Parser(pEngine, TK_SEMI, pParse->sLastToken, pParse);
+      pParse->zTail = &zSql[i];
+    }
+    sqlite3Parser(pEngine, 0, pParse->sLastToken, pParse);
+  }
+  sqlite3ParserFree(pEngine, sqlite3_free);
+  if( db->mallocFailed ){
+    pParse->rc = SQLITE_NOMEM;
+  }
+  if( pParse->rc!=SQLITE_OK && pParse->rc!=SQLITE_DONE && pParse->zErrMsg==0 ){
+    sqlite3SetString(&pParse->zErrMsg, sqlite3ErrStr(pParse->rc), (char*)0);
+  }
+  if( pParse->zErrMsg ){
+    if( pzErrMsg && *pzErrMsg==0 ){
+      *pzErrMsg = pParse->zErrMsg;
+    }else{
+      sqlite3_free(pParse->zErrMsg);
+    }
+    pParse->zErrMsg = 0;
+    nErr++;
+  }
+  if( pParse->pVdbe && pParse->nErr>0 && pParse->nested==0 ){
+    sqlite3VdbeDelete(pParse->pVdbe);
+    pParse->pVdbe = 0;
+  }
+#ifndef SQLITE_OMIT_SHARED_CACHE
+  if( pParse->nested==0 ){
+    sqlite3_free(pParse->aTableLock);
+    pParse->aTableLock = 0;
+    pParse->nTableLock = 0;
+  }
+#endif
+
+  if( !IN_DECLARE_VTAB ){
+    /* If the pParse->declareVtab flag is set, do not delete any table
+    ** structure built up in pParse->pNewTable. The calling code (see vtab.c)
+    ** will take responsibility for freeing the Table structure.
+    */
+    sqlite3DeleteTable(pParse->pNewTable);
+  }
+
+  sqlite3DeleteTrigger(pParse->pNewTrigger);
+  sqlite3_free(pParse->apVarExpr);
+  if( nErr>0 && (pParse->rc==SQLITE_OK || pParse->rc==SQLITE_DONE) ){
+    pParse->rc = SQLITE_ERROR;
+  }
+  return nErr;
+}
diff --git a/uppsrc/plugin/sqlite3/lib/trigger.c b/uppsrc/plugin/sqlite3/lib/trigger.c
new file mode 100644
index 000000000..b43400ee0
--- /dev/null
+++ b/uppsrc/plugin/sqlite3/lib/trigger.c
@@ -0,0 +1,851 @@
+/*
+**
+** The author disclaims copyright to this source code.  In place of
+** a legal notice, here is a blessing:
+**
+**    May you do good and not evil.
+**    May you find forgiveness for yourself and forgive others.
+**    May you share freely, never taking more than you give.
+**
+*************************************************************************
+*
+*/
+#include "sqliteInt.h"
+
+#ifndef SQLITE_OMIT_TRIGGER
+/*
+** Delete a linked list of TriggerStep structures.
+*/
+void sqlite3DeleteTriggerStep(TriggerStep *pTriggerStep){
+  while( pTriggerStep ){
+    TriggerStep * pTmp = pTriggerStep;
+    pTriggerStep = pTriggerStep->pNext;
+
+    if( pTmp->target.dyn ) sqlite3_free((char*)pTmp->target.z);
+    sqlite3ExprDelete(pTmp->pWhere);
+    sqlite3ExprListDelete(pTmp->pExprList);
+    sqlite3SelectDelete(pTmp->pSelect);
+    sqlite3IdListDelete(pTmp->pIdList);
+
+    sqlite3_free(pTmp);
+  }
+}
+
+/*
+** This is called by the parser when it sees a CREATE TRIGGER statement
+** up to the point of the BEGIN before the trigger actions.  A Trigger
+** structure is generated based on the information available and stored
+** in pParse->pNewTrigger.  After the trigger actions have been parsed, the
+** sqlite3FinishTrigger() function is called to complete the trigger
+** construction process.
+*/
+void sqlite3BeginTrigger(
+  Parse *pParse,      /* The parse context of the CREATE TRIGGER statement */
+  Token *pName1,      /* The name of the trigger */
+  Token *pName2,      /* The name of the trigger */
+  int tr_tm,          /* One of TK_BEFORE, TK_AFTER, TK_INSTEAD */
+  int op,             /* One of TK_INSERT, TK_UPDATE, TK_DELETE */
+  IdList *pColumns,   /* column list if this is an UPDATE OF trigger */
+  SrcList *pTableName,/* The name of the table/view the trigger applies to */
+  Expr *pWhen,        /* WHEN clause */
+  int isTemp,         /* True if the TEMPORARY keyword is present */
+  int noErr           /* Suppress errors if the trigger already exists */
+){
+  Trigger *pTrigger = 0;
+  Table *pTab;
+  char *zName = 0;        /* Name of the trigger */
+  sqlite3 *db = pParse->db;
+  int iDb;                /* The database to store the trigger in */
+  Token *pName;           /* The unqualified db name */
+  DbFixer sFix;
+  int iTabDb;
+
+  assert( pName1!=0 );   /* pName1->z might be NULL, but not pName1 itself */
+  assert( pName2!=0 );
+  if( isTemp ){
+    /* If TEMP was specified, then the trigger name may not be qualified. */
+    if( pName2->n>0 ){
+      sqlite3ErrorMsg(pParse, "temporary trigger may not have qualified name");
+      goto trigger_cleanup;
+    }
+    iDb = 1;
+    pName = pName1;
+  }else{
+    /* Figure out the db that the the trigger will be created in */
+    iDb = sqlite3TwoPartName(pParse, pName1, pName2, &pName);
+    if( iDb<0 ){
+      goto trigger_cleanup;
+    }
+  }
+
+  /* If the trigger name was unqualified, and the table is a temp table,
+  ** then set iDb to 1 to create the trigger in the temporary database.
+  ** If sqlite3SrcListLookup() returns 0, indicating the table does not
+  ** exist, the error is caught by the block below.
+  */
+  if( !pTableName || db->mallocFailed ){
+    goto trigger_cleanup;
+  }
+  pTab = sqlite3SrcListLookup(pParse, pTableName);
+  if( pName2->n==0 && pTab && pTab->pSchema==db->aDb[1].pSchema ){
+    iDb = 1;
+  }
+
+  /* Ensure the table name matches database name and that the table exists */
+  if( db->mallocFailed ) goto trigger_cleanup;
+  assert( pTableName->nSrc==1 );
+  if( sqlite3FixInit(&sFix, pParse, iDb, "trigger", pName) &&
+      sqlite3FixSrcList(&sFix, pTableName) ){
+    goto trigger_cleanup;
+  }
+  pTab = sqlite3SrcListLookup(pParse, pTableName);
+  if( !pTab ){
+    /* The table does not exist. */
+    goto trigger_cleanup;
+  }
+  if( IsVirtual(pTab) ){
+    sqlite3ErrorMsg(pParse, "cannot create triggers on virtual tables");
+    goto trigger_cleanup;
+  }
+
+  /* Check that the trigger name is not reserved and that no trigger of the
+  ** specified name exists */
+  zName = sqlite3NameFromToken(db, pName);
+  if( !zName || SQLITE_OK!=sqlite3CheckObjectName(pParse, zName) ){
+    goto trigger_cleanup;
+  }
+  if( sqlite3HashFind(&(db->aDb[iDb].pSchema->trigHash), zName,strlen(zName)) ){
+    if( !noErr ){
+      sqlite3ErrorMsg(pParse, "trigger %T already exists", pName);
+    }
+    goto trigger_cleanup;
+  }
+
+  /* Do not create a trigger on a system table */
+  if( sqlite3StrNICmp(pTab->zName, "sqlite_", 7)==0 ){
+    sqlite3ErrorMsg(pParse, "cannot create trigger on system table");
+    pParse->nErr++;
+    goto trigger_cleanup;
+  }
+
+  /* INSTEAD of triggers are only for views and views only support INSTEAD
+  ** of triggers.
+  */
+  if( pTab->pSelect && tr_tm!=TK_INSTEAD ){
+    sqlite3ErrorMsg(pParse, "cannot create %s trigger on view: %S",
+        (tr_tm == TK_BEFORE)?"BEFORE":"AFTER", pTableName, 0);
+    goto trigger_cleanup;
+  }
+  if( !pTab->pSelect && tr_tm==TK_INSTEAD ){
+    sqlite3ErrorMsg(pParse, "cannot create INSTEAD OF"
+        " trigger on table: %S", pTableName, 0);
+    goto trigger_cleanup;
+  }
+  iTabDb = sqlite3SchemaToIndex(db, pTab->pSchema);
+
+#ifndef SQLITE_OMIT_AUTHORIZATION
+  {
+    int code = SQLITE_CREATE_TRIGGER;
+    const char *zDb = db->aDb[iTabDb].zName;
+    const char *zDbTrig = isTemp ? db->aDb[1].zName : zDb;
+    if( iTabDb==1 || isTemp ) code = SQLITE_CREATE_TEMP_TRIGGER;
+    if( sqlite3AuthCheck(pParse, code, zName, pTab->zName, zDbTrig) ){
+      goto trigger_cleanup;
+    }
+    if( sqlite3AuthCheck(pParse, SQLITE_INSERT, SCHEMA_TABLE(iTabDb),0,zDb)){
+      goto trigger_cleanup;
+    }
+  }
+#endif
+
+  /* INSTEAD OF triggers can only appear on views and BEFORE triggers
+  ** cannot appear on views.  So we might as well translate every
+  ** INSTEAD OF trigger into a BEFORE trigger.  It simplifies code
+  ** elsewhere.
+  */
+  if (tr_tm == TK_INSTEAD){
+    tr_tm = TK_BEFORE;
+  }
+
+  /* Build the Trigger object */
+  pTrigger = (Trigger*)sqlite3DbMallocZero(db, sizeof(Trigger));
+  if( pTrigger==0 ) goto trigger_cleanup;
+  pTrigger->name = zName;
+  zName = 0;
+  pTrigger->table = sqlite3DbStrDup(db, pTableName->a[0].zName);
+  pTrigger->pSchema = db->aDb[iDb].pSchema;
+  pTrigger->pTabSchema = pTab->pSchema;
+  pTrigger->op = op;
+  pTrigger->tr_tm = tr_tm==TK_BEFORE ? TRIGGER_BEFORE : TRIGGER_AFTER;
+  pTrigger->pWhen = sqlite3ExprDup(db, pWhen);
+  pTrigger->pColumns = sqlite3IdListDup(db, pColumns);
+  sqlite3TokenCopy(db, &pTrigger->nameToken,pName);
+  assert( pParse->pNewTrigger==0 );
+  pParse->pNewTrigger = pTrigger;
+
+trigger_cleanup:
+  sqlite3_free(zName);
+  sqlite3SrcListDelete(pTableName);
+  sqlite3IdListDelete(pColumns);
+  sqlite3ExprDelete(pWhen);
+  if( !pParse->pNewTrigger ){
+    sqlite3DeleteTrigger(pTrigger);
+  }else{
+    assert( pParse->pNewTrigger==pTrigger );
+  }
+}
+
+/*
+** This routine is called after all of the trigger actions have been parsed
+** in order to complete the process of building the trigger.
+*/
+void sqlite3FinishTrigger(
+  Parse *pParse,          /* Parser context */
+  TriggerStep *pStepList, /* The triggered program */
+  Token *pAll             /* Token that describes the complete CREATE TRIGGER */
+){
+  Trigger *pTrig = 0;     /* The trigger whose construction is finishing up */
+  sqlite3 *db = pParse->db;  /* The database */
+  DbFixer sFix;
+  int iDb;                   /* Database containing the trigger */
+
+  pTrig = pParse->pNewTrigger;
+  pParse->pNewTrigger = 0;
+  if( pParse->nErr || !pTrig ) goto triggerfinish_cleanup;
+  iDb = sqlite3SchemaToIndex(pParse->db, pTrig->pSchema);
+  pTrig->step_list = pStepList;
+  while( pStepList ){
+    pStepList->pTrig = pTrig;
+    pStepList = pStepList->pNext;
+  }
+  if( sqlite3FixInit(&sFix, pParse, iDb, "trigger", &pTrig->nameToken)
+          && sqlite3FixTriggerStep(&sFix, pTrig->step_list) ){
+    goto triggerfinish_cleanup;
+  }
+
+  /* if we are not initializing, and this trigger is not on a TEMP table,
+  ** build the sqlite_master entry
+  */
+  if( !db->init.busy ){
+    Vdbe *v;
+    char *z;
+
+    /* Make an entry in the sqlite_master table */
+    v = sqlite3GetVdbe(pParse);
+    if( v==0 ) goto triggerfinish_cleanup;
+    sqlite3BeginWriteOperation(pParse, 0, iDb);
+    z = sqlite3DbStrNDup(db, (char*)pAll->z, pAll->n);
+    sqlite3NestedParse(pParse,
+       "INSERT INTO %Q.%s VALUES('trigger',%Q,%Q,0,'CREATE TRIGGER %q')",
+       db->aDb[iDb].zName, SCHEMA_TABLE(iDb), pTrig->name,
+       pTrig->table, z);
+    sqlite3_free(z);
+    sqlite3ChangeCookie(pParse, iDb);
+    sqlite3VdbeAddOp4(v, OP_ParseSchema, iDb, 0, 0, sqlite3MPrintf(
+        db, "type='trigger' AND name='%q'", pTrig->name), P4_DYNAMIC
+    );
+  }
+
+  if( db->init.busy ){
+    int n;
+    Table *pTab;
+    Trigger *pDel;
+    pDel = sqlite3HashInsert(&db->aDb[iDb].pSchema->trigHash,
+                     pTrig->name, strlen(pTrig->name), pTrig);
+    if( pDel ){
+      assert( pDel==pTrig );
+      db->mallocFailed = 1;
+      goto triggerfinish_cleanup;
+    }
+    n = strlen(pTrig->table) + 1;
+    pTab = sqlite3HashFind(&pTrig->pTabSchema->tblHash, pTrig->table, n);
+    assert( pTab!=0 );
+    pTrig->pNext = pTab->pTrigger;
+    pTab->pTrigger = pTrig;
+    pTrig = 0;
+  }
+
+triggerfinish_cleanup:
+  sqlite3DeleteTrigger(pTrig);
+  assert( !pParse->pNewTrigger );
+  sqlite3DeleteTriggerStep(pStepList);
+}
+
+/*
+** Make a copy of all components of the given trigger step.  This has
+** the effect of copying all Expr.token.z values into memory obtained
+** from sqlite3_malloc().  As initially created, the Expr.token.z values
+** all point to the input string that was fed to the parser.  But that
+** string is ephemeral - it will go away as soon as the sqlite3_exec()
+** call that started the parser exits.  This routine makes a persistent
+** copy of all the Expr.token.z strings so that the TriggerStep structure
+** will be valid even after the sqlite3_exec() call returns.
+*/
+static void sqlitePersistTriggerStep(sqlite3 *db, TriggerStep *p){
+  if( p->target.z ){
+    p->target.z = (u8*)sqlite3DbStrNDup(db, (char*)p->target.z, p->target.n);
+    p->target.dyn = 1;
+  }
+  if( p->pSelect ){
+    Select *pNew = sqlite3SelectDup(db, p->pSelect);
+    sqlite3SelectDelete(p->pSelect);
+    p->pSelect = pNew;
+  }
+  if( p->pWhere ){
+    Expr *pNew = sqlite3ExprDup(db, p->pWhere);
+    sqlite3ExprDelete(p->pWhere);
+    p->pWhere = pNew;
+  }
+  if( p->pExprList ){
+    ExprList *pNew = sqlite3ExprListDup(db, p->pExprList);
+    sqlite3ExprListDelete(p->pExprList);
+    p->pExprList = pNew;
+  }
+  if( p->pIdList ){
+    IdList *pNew = sqlite3IdListDup(db, p->pIdList);
+    sqlite3IdListDelete(p->pIdList);
+    p->pIdList = pNew;
+  }
+}
+
+/*
+** Turn a SELECT statement (that the pSelect parameter points to) into
+** a trigger step.  Return a pointer to a TriggerStep structure.
+**
+** The parser calls this routine when it finds a SELECT statement in
+** body of a TRIGGER.
+*/
+TriggerStep *sqlite3TriggerSelectStep(sqlite3 *db, Select *pSelect){
+  TriggerStep *pTriggerStep = sqlite3DbMallocZero(db, sizeof(TriggerStep));
+  if( pTriggerStep==0 ) {
+    sqlite3SelectDelete(pSelect);
+    return 0;
+  }
+
+  pTriggerStep->op = TK_SELECT;
+  pTriggerStep->pSelect = pSelect;
+  pTriggerStep->orconf = OE_Default;
+  sqlitePersistTriggerStep(db, pTriggerStep);
+
+  return pTriggerStep;
+}
+
+/*
+** Build a trigger step out of an INSERT statement.  Return a pointer
+** to the new trigger step.
+**
+** The parser calls this routine when it sees an INSERT inside the
+** body of a trigger.
+*/
+TriggerStep *sqlite3TriggerInsertStep(
+  sqlite3 *db,        /* The database connection */
+  Token *pTableName,  /* Name of the table into which we insert */
+  IdList *pColumn,    /* List of columns in pTableName to insert into */
+  ExprList *pEList,   /* The VALUE clause: a list of values to be inserted */
+  Select *pSelect,    /* A SELECT statement that supplies values */
+  int orconf          /* The conflict algorithm (OE_Abort, OE_Replace, etc.) */
+){
+  TriggerStep *pTriggerStep;
+
+  assert(pEList == 0 || pSelect == 0);
+  assert(pEList != 0 || pSelect != 0 || db->mallocFailed);
+
+  pTriggerStep = sqlite3DbMallocZero(db, sizeof(TriggerStep));
+  if( pTriggerStep ){
+    pTriggerStep->op = TK_INSERT;
+    pTriggerStep->pSelect = pSelect;
+    pTriggerStep->target  = *pTableName;
+    pTriggerStep->pIdList = pColumn;
+    pTriggerStep->pExprList = pEList;
+    pTriggerStep->orconf = orconf;
+    sqlitePersistTriggerStep(db, pTriggerStep);
+  }else{
+    sqlite3IdListDelete(pColumn);
+    sqlite3ExprListDelete(pEList);
+    sqlite3SelectDelete(pSelect);
+  }
+
+  return pTriggerStep;
+}
+
+/*
+** Construct a trigger step that implements an UPDATE statement and return
+** a pointer to that trigger step.  The parser calls this routine when it
+** sees an UPDATE statement inside the body of a CREATE TRIGGER.
+*/
+TriggerStep *sqlite3TriggerUpdateStep(
+  sqlite3 *db,         /* The database connection */
+  Token *pTableName,   /* Name of the table to be updated */
+  ExprList *pEList,    /* The SET clause: list of column and new values */
+  Expr *pWhere,        /* The WHERE clause */
+  int orconf           /* The conflict algorithm. (OE_Abort, OE_Ignore, etc) */
+){
+  TriggerStep *pTriggerStep = sqlite3DbMallocZero(db, sizeof(TriggerStep));
+  if( pTriggerStep==0 ){
+     sqlite3ExprListDelete(pEList);
+     sqlite3ExprDelete(pWhere);
+     return 0;
+  }
+
+  pTriggerStep->op = TK_UPDATE;
+  pTriggerStep->target  = *pTableName;
+  pTriggerStep->pExprList = pEList;
+  pTriggerStep->pWhere = pWhere;
+  pTriggerStep->orconf = orconf;
+  sqlitePersistTriggerStep(db, pTriggerStep);
+
+  return pTriggerStep;
+}
+
+/*
+** Construct a trigger step that implements a DELETE statement and return
+** a pointer to that trigger step.  The parser calls this routine when it
+** sees a DELETE statement inside the body of a CREATE TRIGGER.
+*/
+TriggerStep *sqlite3TriggerDeleteStep(
+  sqlite3 *db,            /* Database connection */
+  Token *pTableName,      /* The table from which rows are deleted */
+  Expr *pWhere            /* The WHERE clause */
+){
+  TriggerStep *pTriggerStep = sqlite3DbMallocZero(db, sizeof(TriggerStep));
+  if( pTriggerStep==0 ){
+    sqlite3ExprDelete(pWhere);
+    return 0;
+  }
+
+  pTriggerStep->op = TK_DELETE;
+  pTriggerStep->target  = *pTableName;
+  pTriggerStep->pWhere = pWhere;
+  pTriggerStep->orconf = OE_Default;
+  sqlitePersistTriggerStep(db, pTriggerStep);
+
+  return pTriggerStep;
+}
+
+/*
+** Recursively delete a Trigger structure
+*/
+void sqlite3DeleteTrigger(Trigger *pTrigger){
+  if( pTrigger==0 ) return;
+  sqlite3DeleteTriggerStep(pTrigger->step_list);
+  sqlite3_free(pTrigger->name);
+  sqlite3_free(pTrigger->table);
+  sqlite3ExprDelete(pTrigger->pWhen);
+  sqlite3IdListDelete(pTrigger->pColumns);
+  if( pTrigger->nameToken.dyn ) sqlite3_free((char*)pTrigger->nameToken.z);
+  sqlite3_free(pTrigger);
+}
+
+/*
+** This function is called to drop a trigger from the database schema.
+**
+** This may be called directly from the parser and therefore identifies
+** the trigger by name.  The sqlite3DropTriggerPtr() routine does the
+** same job as this routine except it takes a pointer to the trigger
+** instead of the trigger name.
+**/
+void sqlite3DropTrigger(Parse *pParse, SrcList *pName, int noErr){
+  Trigger *pTrigger = 0;
+  int i;
+  const char *zDb;
+  const char *zName;
+  int nName;
+  sqlite3 *db = pParse->db;
+
+  if( db->mallocFailed ) goto drop_trigger_cleanup;
+  if( SQLITE_OK!=sqlite3ReadSchema(pParse) ){
+    goto drop_trigger_cleanup;
+  }
+
+  assert( pName->nSrc==1 );
+  zDb = pName->a[0].zDatabase;
+  zName = pName->a[0].zName;
+  nName = strlen(zName);
+  for(i=OMIT_TEMPDB; i<db->nDb; i++){
+    int j = (i<2) ? i^1 : i;  /* Search TEMP before MAIN */
+    if( zDb && sqlite3StrICmp(db->aDb[j].zName, zDb) ) continue;
+    pTrigger = sqlite3HashFind(&(db->aDb[j].pSchema->trigHash), zName, nName);
+    if( pTrigger ) break;
+  }
+  if( !pTrigger ){
+    if( !noErr ){
+      sqlite3ErrorMsg(pParse, "no such trigger: %S", pName, 0);
+    }
+    goto drop_trigger_cleanup;
+  }
+  sqlite3DropTriggerPtr(pParse, pTrigger);
+
+drop_trigger_cleanup:
+  sqlite3SrcListDelete(pName);
+}
+
+/*
+** Return a pointer to the Table structure for the table that a trigger
+** is set on.
+*/
+static Table *tableOfTrigger(Trigger *pTrigger){
+  int n = strlen(pTrigger->table) + 1;
+  return sqlite3HashFind(&pTrigger->pTabSchema->tblHash, pTrigger->table, n);
+}
+
+
+/*
+** Drop a trigger given a pointer to that trigger.
+*/
+void sqlite3DropTriggerPtr(Parse *pParse, Trigger *pTrigger){
+  Table   *pTable;
+  Vdbe *v;
+  sqlite3 *db = pParse->db;
+  int iDb;
+
+  iDb = sqlite3SchemaToIndex(pParse->db, pTrigger->pSchema);
+  assert( iDb>=0 && iDb<db->nDb );
+  pTable = tableOfTrigger(pTrigger);
+  assert( pTable );
+  assert( pTable->pSchema==pTrigger->pSchema || iDb==1 );
+#ifndef SQLITE_OMIT_AUTHORIZATION
+  {
+    int code = SQLITE_DROP_TRIGGER;
+    const char *zDb = db->aDb[iDb].zName;
+    const char *zTab = SCHEMA_TABLE(iDb);
+    if( iDb==1 ) code = SQLITE_DROP_TEMP_TRIGGER;
+    if( sqlite3AuthCheck(pParse, code, pTrigger->name, pTable->zName, zDb) ||
+      sqlite3AuthCheck(pParse, SQLITE_DELETE, zTab, 0, zDb) ){
+      return;
+    }
+  }
+#endif
+
+  /* Generate code to destroy the database record of the trigger.
+  */
+  assert( pTable!=0 );
+  if( (v = sqlite3GetVdbe(pParse))!=0 ){
+    int base;
+    static const VdbeOpList dropTrigger[] = {
+      { OP_Rewind,     0, ADDR(9),  0},
+      { OP_String8,    0, 1,        0}, /* 1 */
+      { OP_Column,     0, 1,        2},
+      { OP_Ne,         2, ADDR(8),  1},
+      { OP_String8,    0, 1,        0}, /* 4: "trigger" */
+      { OP_Column,     0, 0,        2},
+      { OP_Ne,         2, ADDR(8),  1},
+      { OP_Delete,     0, 0,        0},
+      { OP_Next,       0, ADDR(1),  0}, /* 8 */
+    };
+
+    sqlite3BeginWriteOperation(pParse, 0, iDb);
+    sqlite3OpenMasterTable(pParse, iDb);
+    base = sqlite3VdbeAddOpList(v,  ArraySize(dropTrigger), dropTrigger);
+    sqlite3VdbeChangeP4(v, base+1, pTrigger->name, 0);
+    sqlite3VdbeChangeP4(v, base+4, "trigger", P4_STATIC);
+    sqlite3ChangeCookie(pParse, iDb);
+    sqlite3VdbeAddOp2(v, OP_Close, 0, 0);
+    sqlite3VdbeAddOp4(v, OP_DropTrigger, iDb, 0, 0, pTrigger->name, 0);
+  }
+}
+
+/*
+** Remove a trigger from the hash tables of the sqlite* pointer.
+*/
+void sqlite3UnlinkAndDeleteTrigger(sqlite3 *db, int iDb, const char *zName){
+  Trigger *pTrigger;
+  int nName = strlen(zName);
+  pTrigger = sqlite3HashInsert(&(db->aDb[iDb].pSchema->trigHash),
+                               zName, nName, 0);
+  if( pTrigger ){
+    Table *pTable = tableOfTrigger(pTrigger);
+    assert( pTable!=0 );
+    if( pTable->pTrigger == pTrigger ){
+      pTable->pTrigger = pTrigger->pNext;
+    }else{
+      Trigger *cc = pTable->pTrigger;
+      while( cc ){
+        if( cc->pNext == pTrigger ){
+          cc->pNext = cc->pNext->pNext;
+          break;
+        }
+        cc = cc->pNext;
+      }
+      assert(cc);
+    }
+    sqlite3DeleteTrigger(pTrigger);
+    db->flags |= SQLITE_InternChanges;
+  }
+}
+
+/*
+** pEList is the SET clause of an UPDATE statement.  Each entry
+** in pEList is of the format <id>=<expr>.  If any of the entries
+** in pEList have an <id> which matches an identifier in pIdList,
+** then return TRUE.  If pIdList==NULL, then it is considered a
+** wildcard that matches anything.  Likewise if pEList==NULL then
+** it matches anything so always return true.  Return false only
+** if there is no match.
+*/
+static int checkColumnOverLap(IdList *pIdList, ExprList *pEList){
+  int e;
+  if( !pIdList || !pEList ) return 1;
+  for(e=0; e<pEList->nExpr; e++){
+    if( sqlite3IdListIndex(pIdList, pEList->a[e].zName)>=0 ) return 1;
+  }
+  return 0;
+}
+
+/*
+** Return a bit vector to indicate what kind of triggers exist for operation
+** "op" on table pTab.  If pChanges is not NULL then it is a list of columns
+** that are being updated.  Triggers only match if the ON clause of the
+** trigger definition overlaps the set of columns being updated.
+**
+** The returned bit vector is some combination of TRIGGER_BEFORE and
+** TRIGGER_AFTER.
+*/
+int sqlite3TriggersExist(
+  Parse *pParse,          /* Used to check for recursive triggers */
+  Table *pTab,            /* The table the contains the triggers */
+  int op,                 /* one of TK_DELETE, TK_INSERT, TK_UPDATE */
+  ExprList *pChanges      /* Columns that change in an UPDATE statement */
+){
+  Trigger *pTrigger;
+  int mask = 0;
+
+  pTrigger = IsVirtual(pTab) ? 0 : pTab->pTrigger;
+  while( pTrigger ){
+    if( pTrigger->op==op && checkColumnOverLap(pTrigger->pColumns, pChanges) ){
+      mask |= pTrigger->tr_tm;
+    }
+    pTrigger = pTrigger->pNext;
+  }
+  return mask;
+}
+
+/*
+** Convert the pStep->target token into a SrcList and return a pointer
+** to that SrcList.
+**
+** This routine adds a specific database name, if needed, to the target when
+** forming the SrcList.  This prevents a trigger in one database from
+** referring to a target in another database.  An exception is when the
+** trigger is in TEMP in which case it can refer to any other database it
+** wants.
+*/
+static SrcList *targetSrcList(
+  Parse *pParse,       /* The parsing context */
+  TriggerStep *pStep   /* The trigger containing the target token */
+){
+  Token sDb;           /* Dummy database name token */
+  int iDb;             /* Index of the database to use */
+  SrcList *pSrc;       /* SrcList to be returned */
+
+  iDb = sqlite3SchemaToIndex(pParse->db, pStep->pTrig->pSchema);
+  if( iDb==0 || iDb>=2 ){
+    assert( iDb<pParse->db->nDb );
+    sDb.z = (u8*)pParse->db->aDb[iDb].zName;
+    sDb.n = strlen((char*)sDb.z);
+    pSrc = sqlite3SrcListAppend(pParse->db, 0, &sDb, &pStep->target);
+  } else {
+    pSrc = sqlite3SrcListAppend(pParse->db, 0, &pStep->target, 0);
+  }
+  return pSrc;
+}
+
+/*
+** Generate VDBE code for zero or more statements inside the body of a
+** trigger.
+*/
+static int codeTriggerProgram(
+  Parse *pParse,            /* The parser context */
+  TriggerStep *pStepList,   /* List of statements inside the trigger body */
+  int orconfin              /* Conflict algorithm. (OE_Abort, etc) */
+){
+  TriggerStep * pTriggerStep = pStepList;
+  int orconf;
+  Vdbe *v = pParse->pVdbe;
+  sqlite3 *db = pParse->db;
+
+  assert( pTriggerStep!=0 );
+  assert( v!=0 );
+  sqlite3VdbeAddOp2(v, OP_ContextPush, 0, 0);
+  VdbeComment((v, "begin trigger %s", pStepList->pTrig->name));
+  while( pTriggerStep ){
+    orconf = (orconfin == OE_Default)?pTriggerStep->orconf:orconfin;
+    pParse->trigStack->orconf = orconf;
+    switch( pTriggerStep->op ){
+      case TK_SELECT: {
+        Select *ss = sqlite3SelectDup(db, pTriggerStep->pSelect);
+        if( ss ){
+          SelectDest dest;
+
+          sqlite3SelectDestInit(&dest, SRT_Discard, 0);
+          sqlite3SelectResolve(pParse, ss, 0);
+          sqlite3Select(pParse, ss, &dest, 0, 0, 0, 0);
+          sqlite3SelectDelete(ss);
+        }
+        break;
+      }
+      case TK_UPDATE: {
+        SrcList *pSrc;
+        pSrc = targetSrcList(pParse, pTriggerStep);
+        sqlite3VdbeAddOp2(v, OP_ResetCount, 0, 0);
+        sqlite3Update(pParse, pSrc,
+                sqlite3ExprListDup(db, pTriggerStep->pExprList),
+                sqlite3ExprDup(db, pTriggerStep->pWhere), orconf);
+        sqlite3VdbeAddOp2(v, OP_ResetCount, 1, 0);
+        break;
+      }
+      case TK_INSERT: {
+        SrcList *pSrc;
+        pSrc = targetSrcList(pParse, pTriggerStep);
+        sqlite3VdbeAddOp2(v, OP_ResetCount, 0, 0);
+        sqlite3Insert(pParse, pSrc,
+          sqlite3ExprListDup(db, pTriggerStep->pExprList),
+          sqlite3SelectDup(db, pTriggerStep->pSelect),
+          sqlite3IdListDup(db, pTriggerStep->pIdList), orconf);
+        sqlite3VdbeAddOp2(v, OP_ResetCount, 1, 0);
+        break;
+      }
+      case TK_DELETE: {
+        SrcList *pSrc;
+        sqlite3VdbeAddOp2(v, OP_ResetCount, 0, 0);
+        pSrc = targetSrcList(pParse, pTriggerStep);
+        sqlite3DeleteFrom(pParse, pSrc,
+                          sqlite3ExprDup(db, pTriggerStep->pWhere));
+        sqlite3VdbeAddOp2(v, OP_ResetCount, 1, 0);
+        break;
+      }
+      default:
+        assert(0);
+    }
+    pTriggerStep = pTriggerStep->pNext;
+  }
+  sqlite3VdbeAddOp2(v, OP_ContextPop, 0, 0);
+  VdbeComment((v, "end trigger %s", pStepList->pTrig->name));
+
+  return 0;
+}
+
+/*
+** This is called to code FOR EACH ROW triggers.
+**
+** When the code that this function generates is executed, the following
+** must be true:
+**
+** 1. No cursors may be open in the main database.  (But newIdx and oldIdx
+**    can be indices of cursors in temporary tables.  See below.)
+**
+** 2. If the triggers being coded are ON INSERT or ON UPDATE triggers, then
+**    a temporary vdbe cursor (index newIdx) must be open and pointing at
+**    a row containing values to be substituted for new.* expressions in the
+**    trigger program(s).
+**
+** 3. If the triggers being coded are ON DELETE or ON UPDATE triggers, then
+**    a temporary vdbe cursor (index oldIdx) must be open and pointing at
+**    a row containing values to be substituted for old.* expressions in the
+**    trigger program(s).
+**
+** If they are not NULL, the piOldColMask and piNewColMask output variables
+** are set to values that describe the columns used by the trigger program
+** in the OLD.* and NEW.* tables respectively. If column N of the
+** pseudo-table is read at least once, the corresponding bit of the output
+** mask is set. If a column with an index greater than 32 is read, the
+** output mask is set to the special value 0xffffffff.
+**
+*/
+int sqlite3CodeRowTrigger(
+  Parse *pParse,       /* Parse context */
+  int op,              /* One of TK_UPDATE, TK_INSERT, TK_DELETE */
+  ExprList *pChanges,  /* Changes list for any UPDATE OF triggers */
+  int tr_tm,           /* One of TRIGGER_BEFORE, TRIGGER_AFTER */
+  Table *pTab,         /* The table to code triggers from */
+  int newIdx,          /* The indice of the "new" row to access */
+  int oldIdx,          /* The indice of the "old" row to access */
+  int orconf,          /* ON CONFLICT policy */
+  int ignoreJump,      /* Instruction to jump to for RAISE(IGNORE) */
+  u32 *piOldColMask,   /* OUT: Mask of columns used from the OLD.* table */
+  u32 *piNewColMask    /* OUT: Mask of columns used from the NEW.* table */
+){
+  Trigger *p;
+  sqlite3 *db = pParse->db;
+  TriggerStack trigStackEntry;
+
+  trigStackEntry.oldColMask = 0;
+  trigStackEntry.newColMask = 0;
+
+  assert(op == TK_UPDATE || op == TK_INSERT || op == TK_DELETE);
+  assert(tr_tm == TRIGGER_BEFORE || tr_tm == TRIGGER_AFTER );
+
+  assert(newIdx != -1 || oldIdx != -1);
+
+  for(p=pTab->pTrigger; p; p=p->pNext){
+    int fire_this = 0;
+
+    /* Determine whether we should code this trigger */
+    if(
+      p->op==op &&
+      p->tr_tm==tr_tm &&
+      (p->pSchema==p->pTabSchema || p->pSchema==db->aDb[1].pSchema) &&
+      (op!=TK_UPDATE||!p->pColumns||checkColumnOverLap(p->pColumns,pChanges))
+    ){
+      TriggerStack *pS;      /* Pointer to trigger-stack entry */
+      for(pS=pParse->trigStack; pS && p!=pS->pTrigger; pS=pS->pNext){}
+      if( !pS ){
+        fire_this = 1;
+      }
+#if 0    /* Give no warning for recursive triggers.  Just do not do them */
+      else{
+        sqlite3ErrorMsg(pParse, "recursive triggers not supported (%s)",
+            p->name);
+        return SQLITE_ERROR;
+      }
+#endif
+    }
+
+    if( fire_this ){
+      int endTrigger;
+      Expr * whenExpr;
+      AuthContext sContext;
+      NameContext sNC;
+
+#ifndef SQLITE_OMIT_TRACE
+      sqlite3VdbeAddOp4(pParse->pVdbe, OP_Trace, 0, 0, 0,
+                        sqlite3MPrintf(db, "-- TRIGGER %s", p->name),
+                        P4_DYNAMIC);
+#endif
+      memset(&sNC, 0, sizeof(sNC));
+      sNC.pParse = pParse;
+
+      /* Push an entry on to the trigger stack */
+      trigStackEntry.pTrigger = p;
+      trigStackEntry.newIdx = newIdx;
+      trigStackEntry.oldIdx = oldIdx;
+      trigStackEntry.pTab = pTab;
+      trigStackEntry.pNext = pParse->trigStack;
+      trigStackEntry.ignoreJump = ignoreJump;
+      pParse->trigStack = &trigStackEntry;
+      sqlite3AuthContextPush(pParse, &sContext, p->name);
+
+      /* code the WHEN clause */
+      endTrigger = sqlite3VdbeMakeLabel(pParse->pVdbe);
+      whenExpr = sqlite3ExprDup(db, p->pWhen);
+      if( db->mallocFailed || sqlite3ExprResolveNames(&sNC, whenExpr) ){
+        pParse->trigStack = trigStackEntry.pNext;
+        sqlite3ExprDelete(whenExpr);
+        return 1;
+      }
+      sqlite3ExprIfFalse(pParse, whenExpr, endTrigger, SQLITE_JUMPIFNULL);
+      sqlite3ExprDelete(whenExpr);
+
+      codeTriggerProgram(pParse, p->step_list, orconf);
+
+      /* Pop the entry off the trigger stack */
+      pParse->trigStack = trigStackEntry.pNext;
+      sqlite3AuthContextPop(&sContext);
+
+      sqlite3VdbeResolveLabel(pParse->pVdbe, endTrigger);
+    }
+  }
+  if( piOldColMask ) *piOldColMask |= trigStackEntry.oldColMask;
+  if( piNewColMask ) *piNewColMask |= trigStackEntry.newColMask;
+  return 0;
+}
+#endif /* !defined(SQLITE_OMIT_TRIGGER) */
diff --git a/uppsrc/plugin/sqlite3/lib/update.c b/uppsrc/plugin/sqlite3/lib/update.c
new file mode 100644
index 000000000..38f382d93
--- /dev/null
+++ b/uppsrc/plugin/sqlite3/lib/update.c
@@ -0,0 +1,663 @@
+/*
+** 2001 September 15
+**
+** The author disclaims copyright to this source code.  In place of
+** a legal notice, here is a blessing:
+**
+**    May you do good and not evil.
+**    May you find forgiveness for yourself and forgive others.
+**    May you share freely, never taking more than you give.
+**
+*************************************************************************
+** This file contains C code routines that are called by the parser
+** to handle UPDATE statements.
+**
+** $Id: update.c,v 1.171 2008/02/12 16:52:14 drh Exp $
+*/
+#include "sqliteInt.h"
+
+#ifndef SQLITE_OMIT_VIRTUALTABLE
+/* Forward declaration */
+static void updateVirtualTable(
+  Parse *pParse,       /* The parsing context */
+  SrcList *pSrc,       /* The virtual table to be modified */
+  Table *pTab,         /* The virtual table */
+  ExprList *pChanges,  /* The columns to change in the UPDATE statement */
+  Expr *pRowidExpr,    /* Expression used to recompute the rowid */
+  int *aXRef,          /* Mapping from columns of pTab to entries in pChanges */
+  Expr *pWhere         /* WHERE clause of the UPDATE statement */
+);
+#endif /* SQLITE_OMIT_VIRTUALTABLE */
+
+/*
+** The most recently coded instruction was an OP_Column to retrieve the
+** i-th column of table pTab. This routine sets the P4 parameter of the
+** OP_Column to the default value, if any.
+**
+** The default value of a column is specified by a DEFAULT clause in the
+** column definition. This was either supplied by the user when the table
+** was created, or added later to the table definition by an ALTER TABLE
+** command. If the latter, then the row-records in the table btree on disk
+** may not contain a value for the column and the default value, taken
+** from the P4 parameter of the OP_Column instruction, is returned instead.
+** If the former, then all row-records are guaranteed to include a value
+** for the column and the P4 value is not required.
+**
+** Column definitions created by an ALTER TABLE command may only have
+** literal default values specified: a number, null or a string. (If a more
+** complicated default expression value was provided, it is evaluated
+** when the ALTER TABLE is executed and one of the literal values written
+** into the sqlite_master table.)
+**
+** Therefore, the P4 parameter is only required if the default value for
+** the column is a literal number, string or null. The sqlite3ValueFromExpr()
+** function is capable of transforming these types of expressions into
+** sqlite3_value objects.
+*/
+void sqlite3ColumnDefault(Vdbe *v, Table *pTab, int i){
+  if( pTab && !pTab->pSelect ){
+    sqlite3_value *pValue;
+    u8 enc = ENC(sqlite3VdbeDb(v));
+    Column *pCol = &pTab->aCol[i];
+    VdbeComment((v, "%s.%s", pTab->zName, pCol->zName));
+    assert( i<pTab->nCol );
+    sqlite3ValueFromExpr(sqlite3VdbeDb(v), pCol->pDflt, enc,
+                         pCol->affinity, &pValue);
+    if( pValue ){
+      sqlite3VdbeChangeP4(v, -1, (const char *)pValue, P4_MEM);
+    }
+  }
+}
+
+/*
+** Process an UPDATE statement.
+**
+**   UPDATE OR IGNORE table_wxyz SET a=b, c=d WHERE e<5 AND f NOT NULL;
+**          \_______/ \________/     \______/       \________________/
+*            onError   pTabList      pChanges             pWhere
+*/
+void sqlite3Update(
+  Parse *pParse,         /* The parser context */
+  SrcList *pTabList,     /* The table in which we should change things */
+  ExprList *pChanges,    /* Things to be changed */
+  Expr *pWhere,          /* The WHERE clause.  May be null */
+  int onError            /* How to handle constraint errors */
+){
+  int i, j;              /* Loop counters */
+  Table *pTab;           /* The table to be updated */
+  int addr = 0;          /* VDBE instruction address of the start of the loop */
+  WhereInfo *pWInfo;     /* Information about the WHERE clause */
+  Vdbe *v;               /* The virtual database engine */
+  Index *pIdx;           /* For looping over indices */
+  int nIdx;              /* Number of indices that need updating */
+  int iCur;              /* VDBE Cursor number of pTab */
+  sqlite3 *db;           /* The database structure */
+  int *aRegIdx = 0;      /* One register assigned to each index to be updated */
+  int *aXRef = 0;        /* aXRef[i] is the index in pChanges->a[] of the
+                         ** an expression for the i-th column of the table.
+                         ** aXRef[i]==-1 if the i-th column is not changed. */
+  int chngRowid;         /* True if the record number is being changed */
+  Expr *pRowidExpr = 0;  /* Expression defining the new record number */
+  int openAll = 0;       /* True if all indices need to be opened */
+  AuthContext sContext;  /* The authorization context */
+  NameContext sNC;       /* The name-context to resolve expressions in */
+  int iDb;               /* Database containing the table being updated */
+  int j1;                /* Addresses of jump instructions */
+
+#ifndef SQLITE_OMIT_TRIGGER
+  int isView;                  /* Trying to update a view */
+  int triggers_exist = 0;      /* True if any row triggers exist */
+#endif
+  int iBeginAfterTrigger;      /* Address of after trigger program */
+  int iEndAfterTrigger;        /* Exit of after trigger program */
+  int iBeginBeforeTrigger;     /* Address of before trigger program */
+  int iEndBeforeTrigger;       /* Exit of before trigger program */
+  u32 old_col_mask = 0;        /* Mask of OLD.* columns in use */
+  u32 new_col_mask = 0;        /* Mask of NEW.* columns in use */
+
+  int newIdx      = -1;  /* index of trigger "new" temp table       */
+  int oldIdx      = -1;  /* index of trigger "old" temp table       */
+
+  /* Register Allocations */
+  int regRowCount = 0;   /* A count of rows changed */
+  int regOldRowid;       /* The old rowid */
+  int regNewRowid;       /* The new rowid */
+  int regData;           /* New data for the row */
+
+  sContext.pParse = 0;
+  db = pParse->db;
+  if( pParse->nErr || db->mallocFailed ){
+    goto update_cleanup;
+  }
+  assert( pTabList->nSrc==1 );
+
+  /* Locate the table which we want to update.
+  */
+  pTab = sqlite3SrcListLookup(pParse, pTabList);
+  if( pTab==0 ) goto update_cleanup;
+  iDb = sqlite3SchemaToIndex(pParse->db, pTab->pSchema);
+
+  /* Figure out if we have any triggers and if the table being
+  ** updated is a view
+  */
+#ifndef SQLITE_OMIT_TRIGGER
+  triggers_exist = sqlite3TriggersExist(pParse, pTab, TK_UPDATE, pChanges);
+  isView = pTab->pSelect!=0;
+#else
+# define triggers_exist 0
+# define isView 0
+#endif
+#ifdef SQLITE_OMIT_VIEW
+# undef isView
+# define isView 0
+#endif
+
+  if( sqlite3IsReadOnly(pParse, pTab, triggers_exist) ){
+    goto update_cleanup;
+  }
+  if( sqlite3ViewGetColumnNames(pParse, pTab) ){
+    goto update_cleanup;
+  }
+  aXRef = sqlite3DbMallocRaw(db, sizeof(int) * pTab->nCol );
+  if( aXRef==0 ) goto update_cleanup;
+  for(i=0; i<pTab->nCol; i++) aXRef[i] = -1;
+
+  /* If there are FOR EACH ROW triggers, allocate cursors for the
+  ** special OLD and NEW tables
+  */
+  if( triggers_exist ){
+    newIdx = pParse->nTab++;
+    oldIdx = pParse->nTab++;
+  }
+
+  /* Allocate a cursors for the main database table and for all indices.
+  ** The index cursors might not be used, but if they are used they
+  ** need to occur right after the database cursor.  So go ahead and
+  ** allocate enough space, just in case.
+  */
+  pTabList->a[0].iCursor = iCur = pParse->nTab++;
+  for(pIdx=pTab->pIndex; pIdx; pIdx=pIdx->pNext){
+    pParse->nTab++;
+  }
+
+  /* Initialize the name-context */
+  memset(&sNC, 0, sizeof(sNC));
+  sNC.pParse = pParse;
+  sNC.pSrcList = pTabList;
+
+  /* Resolve the column names in all the expressions of the
+  ** of the UPDATE statement.  Also find the column index
+  ** for each column to be updated in the pChanges array.  For each
+  ** column to be updated, make sure we have authorization to change
+  ** that column.
+  */
+  chngRowid = 0;
+  for(i=0; i<pChanges->nExpr; i++){
+    if( sqlite3ExprResolveNames(&sNC, pChanges->a[i].pExpr) ){
+      goto update_cleanup;
+    }
+    for(j=0; j<pTab->nCol; j++){
+      if( sqlite3StrICmp(pTab->aCol[j].zName, pChanges->a[i].zName)==0 ){
+        if( j==pTab->iPKey ){
+          chngRowid = 1;
+          pRowidExpr = pChanges->a[i].pExpr;
+        }
+        aXRef[j] = i;
+        break;
+      }
+    }
+    if( j>=pTab->nCol ){
+      if( sqlite3IsRowid(pChanges->a[i].zName) ){
+        chngRowid = 1;
+        pRowidExpr = pChanges->a[i].pExpr;
+      }else{
+        sqlite3ErrorMsg(pParse, "no such column: %s", pChanges->a[i].zName);
+        goto update_cleanup;
+      }
+    }
+#ifndef SQLITE_OMIT_AUTHORIZATION
+    {
+      int rc;
+      rc = sqlite3AuthCheck(pParse, SQLITE_UPDATE, pTab->zName,
+                           pTab->aCol[j].zName, db->aDb[iDb].zName);
+      if( rc==SQLITE_DENY ){
+        goto update_cleanup;
+      }else if( rc==SQLITE_IGNORE ){
+        aXRef[j] = -1;
+      }
+    }
+#endif
+  }
+
+  /* Allocate memory for the array aRegIdx[].  There is one entry in the
+  ** array for each index associated with table being updated.  Fill in
+  ** the value with a register number for indices that are to be used
+  ** and with zero for unused indices.
+  */
+  for(nIdx=0, pIdx=pTab->pIndex; pIdx; pIdx=pIdx->pNext, nIdx++){}
+  if( nIdx>0 ){
+    aRegIdx = sqlite3DbMallocRaw(db, sizeof(Index*) * nIdx );
+    if( aRegIdx==0 ) goto update_cleanup;
+  }
+  for(j=0, pIdx=pTab->pIndex; pIdx; pIdx=pIdx->pNext, j++){
+    int reg;
+    if( chngRowid ){
+      reg = ++pParse->nMem;
+    }else{
+      reg = 0;
+      for(i=0; i<pIdx->nColumn; i++){
+        if( aXRef[pIdx->aiColumn[i]]>=0 ){
+          reg = ++pParse->nMem;
+          break;
+        }
+      }
+    }
+    aRegIdx[j] = reg;
+  }
+
+  /* Allocate a block of register used to store the change record
+  ** sent to sqlite3GenerateConstraintChecks().  There are either
+  ** one or two registers for holding the rowid.  One rowid register
+  ** is used if chngRowid is false and two are used if chngRowid is
+  ** true.  Following these are pTab->nCol register holding column
+  ** data.
+  */
+  regOldRowid = regNewRowid = pParse->nMem + 1;
+  pParse->nMem += pTab->nCol + 1;
+  if( chngRowid ){
+    regNewRowid++;
+    pParse->nMem++;
+  }
+  regData = regNewRowid+1;
+
+
+  /* Begin generating code.
+  */
+  v = sqlite3GetVdbe(pParse);
+  if( v==0 ) goto update_cleanup;
+  if( pParse->nested==0 ) sqlite3VdbeCountChanges(v);
+  sqlite3BeginWriteOperation(pParse, 1, iDb);
+
+#ifndef SQLITE_OMIT_VIRTUALTABLE
+  /* Virtual tables must be handled separately */
+  if( IsVirtual(pTab) ){
+    updateVirtualTable(pParse, pTabList, pTab, pChanges, pRowidExpr, aXRef,
+                       pWhere);
+    pWhere = 0;
+    pTabList = 0;
+    goto update_cleanup;
+  }
+#endif
+
+  /* Start the view context
+  */
+  if( isView ){
+    sqlite3AuthContextPush(pParse, &sContext, pTab->zName);
+  }
+
+  /* Generate the code for triggers.
+  */
+  if( triggers_exist ){
+    int iGoto;
+
+    /* Create pseudo-tables for NEW and OLD
+    */
+    sqlite3VdbeAddOp2(v, OP_OpenPseudo, oldIdx, 0);
+    sqlite3VdbeAddOp2(v, OP_SetNumColumns, oldIdx, pTab->nCol);
+    sqlite3VdbeAddOp2(v, OP_OpenPseudo, newIdx, 0);
+    sqlite3VdbeAddOp2(v, OP_SetNumColumns, newIdx, pTab->nCol);
+
+    iGoto = sqlite3VdbeAddOp2(v, OP_Goto, 0, 0);
+    addr = sqlite3VdbeMakeLabel(v);
+    iBeginBeforeTrigger = sqlite3VdbeCurrentAddr(v);
+    if( sqlite3CodeRowTrigger(pParse, TK_UPDATE, pChanges, TRIGGER_BEFORE, pTab,
+          newIdx, oldIdx, onError, addr, &old_col_mask, &new_col_mask) ){
+      goto update_cleanup;
+    }
+    iEndBeforeTrigger = sqlite3VdbeAddOp2(v, OP_Goto, 0, 0);
+    iBeginAfterTrigger = sqlite3VdbeCurrentAddr(v);
+    if( sqlite3CodeRowTrigger(pParse, TK_UPDATE, pChanges, TRIGGER_AFTER, pTab,
+          newIdx, oldIdx, onError, addr, &old_col_mask, &new_col_mask) ){
+      goto update_cleanup;
+    }
+    iEndAfterTrigger = sqlite3VdbeAddOp2(v, OP_Goto, 0, 0);
+    sqlite3VdbeJumpHere(v, iGoto);
+  }
+
+  /* If we are trying to update a view, realize that view into
+  ** a ephemeral table.
+  */
+  if( isView ){
+    sqlite3MaterializeView(pParse, pTab->pSelect, pWhere,
+                           old_col_mask|new_col_mask, iCur);
+  }
+
+  /* Resolve the column names in all the expressions in the
+  ** WHERE clause.
+  */
+  if( sqlite3ExprResolveNames(&sNC, pWhere) ){
+    goto update_cleanup;
+  }
+
+  /* Begin the database scan
+  */
+  pWInfo = sqlite3WhereBegin(pParse, pTabList, pWhere, 0, 0);
+  if( pWInfo==0 ) goto update_cleanup;
+
+  /* Remember the rowid of every item to be updated.
+  */
+  sqlite3VdbeAddOp2(v, IsVirtual(pTab) ? OP_VRowid : OP_Rowid,iCur,regOldRowid);
+  sqlite3VdbeAddOp2(v, OP_FifoWrite, regOldRowid, 0);
+
+  /* End the database scan loop.
+  */
+  sqlite3WhereEnd(pWInfo);
+
+  /* Initialize the count of updated rows
+  */
+  if( db->flags & SQLITE_CountRows && !pParse->trigStack ){
+    regRowCount = ++pParse->nMem;
+    sqlite3VdbeAddOp2(v, OP_Integer, 0, regRowCount);
+  }
+
+  if( !isView && !IsVirtual(pTab) ){
+    /*
+    ** Open every index that needs updating.  Note that if any
+    ** index could potentially invoke a REPLACE conflict resolution
+    ** action, then we need to open all indices because we might need
+    ** to be deleting some records.
+    */
+    sqlite3OpenTable(pParse, iCur, iDb, pTab, OP_OpenWrite);
+    if( onError==OE_Replace ){
+      openAll = 1;
+    }else{
+      openAll = 0;
+      for(pIdx=pTab->pIndex; pIdx; pIdx=pIdx->pNext){
+        if( pIdx->onError==OE_Replace ){
+          openAll = 1;
+          break;
+        }
+      }
+    }
+    for(i=0, pIdx=pTab->pIndex; pIdx; pIdx=pIdx->pNext, i++){
+      if( openAll || aRegIdx[i]>0 ){
+        KeyInfo *pKey = sqlite3IndexKeyinfo(pParse, pIdx);
+        sqlite3VdbeAddOp4(v, OP_OpenWrite, iCur+i+1, pIdx->tnum, iDb,
+                       (char*)pKey, P4_KEYINFO_HANDOFF);
+        assert( pParse->nTab>iCur+i+1 );
+      }
+    }
+  }
+
+  /* Jump back to this point if a trigger encounters an IGNORE constraint. */
+  if( triggers_exist ){
+    sqlite3VdbeResolveLabel(v, addr);
+  }
+
+  /* Top of the update loop */
+  addr = sqlite3VdbeAddOp2(v, OP_FifoRead, regOldRowid, 0);
+
+  if( triggers_exist ){
+    int regRowid;
+    int regRow;
+    int regCols;
+
+    /* Make cursor iCur point to the record that is being updated.
+    */
+    sqlite3VdbeAddOp3(v, OP_NotExists, iCur, addr, regOldRowid);
+
+    /* Generate the OLD table
+    */
+    regRowid = sqlite3GetTempReg(pParse);
+    regRow = sqlite3GetTempReg(pParse);
+    sqlite3VdbeAddOp2(v, OP_Rowid, iCur, regRowid);
+    if( !old_col_mask ){
+      sqlite3VdbeAddOp2(v, OP_Null, 0, regRow);
+    }else{
+      sqlite3VdbeAddOp2(v, OP_RowData, iCur, regRow);
+    }
+    sqlite3VdbeAddOp3(v, OP_Insert, oldIdx, regRow, regRowid);
+
+    /* Generate the NEW table
+    */
+    if( chngRowid ){
+      sqlite3ExprCodeAndCache(pParse, pRowidExpr, regRowid);
+    }else{
+      sqlite3VdbeAddOp2(v, OP_Rowid, iCur, regRowid);
+    }
+    regCols = sqlite3GetTempRange(pParse, pTab->nCol);
+    for(i=0; i<pTab->nCol; i++){
+      if( i==pTab->iPKey ){
+        sqlite3VdbeAddOp2(v, OP_Null, 0, regCols+i);
+        continue;
+      }
+      j = aXRef[i];
+      if( new_col_mask&((u32)1<<i) || new_col_mask==0xffffffff ){
+        if( j<0 ){
+          sqlite3VdbeAddOp3(v, OP_Column, iCur, i, regCols+i);
+          sqlite3ColumnDefault(v, pTab, i);
+        }else{
+          sqlite3ExprCodeAndCache(pParse, pChanges->a[j].pExpr, regCols+i);
+        }
+      }else{
+        sqlite3VdbeAddOp2(v, OP_Null, 0, regCols+i);
+      }
+    }
+    sqlite3VdbeAddOp3(v, OP_MakeRecord, regCols, pTab->nCol, regRow);
+    if( !isView ){
+      sqlite3TableAffinityStr(v, pTab);
+    }
+    sqlite3ReleaseTempRange(pParse, regCols, pTab->nCol);
+    if( pParse->nErr ) goto update_cleanup;
+    sqlite3VdbeAddOp3(v, OP_Insert, newIdx, regRow, regRowid);
+    sqlite3ReleaseTempReg(pParse, regRowid);
+    sqlite3ReleaseTempReg(pParse, regRow);
+
+    sqlite3VdbeAddOp2(v, OP_Goto, 0, iBeginBeforeTrigger);
+    sqlite3VdbeJumpHere(v, iEndBeforeTrigger);
+  }
+
+  if( !isView && !IsVirtual(pTab) ){
+    /* Loop over every record that needs updating.  We have to load
+    ** the old data for each record to be updated because some columns
+    ** might not change and we will need to copy the old value.
+    ** Also, the old data is needed to delete the old index entries.
+    ** So make the cursor point at the old record.
+    */
+    sqlite3VdbeAddOp3(v, OP_NotExists, iCur, addr, regOldRowid);
+
+    /* If the record number will change, push the record number as it
+    ** will be after the update. (The old record number is currently
+    ** on top of the stack.)
+    */
+    if( chngRowid ){
+      sqlite3ExprCode(pParse, pRowidExpr, regNewRowid);
+      sqlite3VdbeAddOp1(v, OP_MustBeInt, regNewRowid);
+    }
+
+    /* Compute new data for this record.
+    */
+    for(i=0; i<pTab->nCol; i++){
+      if( i==pTab->iPKey ){
+        sqlite3VdbeAddOp2(v, OP_Null, 0, regData+i);
+        continue;
+      }
+      j = aXRef[i];
+      if( j<0 ){
+        sqlite3VdbeAddOp3(v, OP_Column, iCur, i, regData+i);
+        sqlite3ColumnDefault(v, pTab, i);
+      }else{
+        sqlite3ExprCode(pParse, pChanges->a[j].pExpr, regData+i);
+      }
+    }
+
+    /* Do constraint checks
+    */
+    sqlite3GenerateConstraintChecks(pParse, pTab, iCur, regNewRowid,
+                                    aRegIdx, chngRowid, 1,
+                                    onError, addr);
+
+    /* Delete the old indices for the current record.
+    */
+    j1 = sqlite3VdbeAddOp3(v, OP_NotExists, iCur, 0, regOldRowid);
+    sqlite3GenerateRowIndexDelete(pParse, pTab, iCur, aRegIdx);
+
+    /* If changing the record number, delete the old record.
+    */
+    if( chngRowid ){
+      sqlite3VdbeAddOp2(v, OP_Delete, iCur, 0);
+    }
+    sqlite3VdbeJumpHere(v, j1);
+
+    /* Create the new index entries and the new record.
+    */
+    sqlite3CompleteInsertion(pParse, pTab, iCur, regNewRowid,
+                             aRegIdx, chngRowid, 1, -1, 0);
+  }
+
+  /* Increment the row counter
+  */
+  if( db->flags & SQLITE_CountRows && !pParse->trigStack){
+    sqlite3VdbeAddOp2(v, OP_AddImm, regRowCount, 1);
+  }
+
+  /* If there are triggers, close all the cursors after each iteration
+  ** through the loop.  The fire the after triggers.
+  */
+  if( triggers_exist ){
+    sqlite3VdbeAddOp2(v, OP_Goto, 0, iBeginAfterTrigger);
+    sqlite3VdbeJumpHere(v, iEndAfterTrigger);
+  }
+
+  /* Repeat the above with the next record to be updated, until
+  ** all record selected by the WHERE clause have been updated.
+  */
+  sqlite3VdbeAddOp2(v, OP_Goto, 0, addr);
+  sqlite3VdbeJumpHere(v, addr);
+
+  /* Close all tables */
+  for(i=0, pIdx=pTab->pIndex; pIdx; pIdx=pIdx->pNext, i++){
+    if( openAll || aRegIdx[i]>0 ){
+      sqlite3VdbeAddOp2(v, OP_Close, iCur+i+1, 0);
+    }
+  }
+  sqlite3VdbeAddOp2(v, OP_Close, iCur, 0);
+  if( triggers_exist ){
+    sqlite3VdbeAddOp2(v, OP_Close, newIdx, 0);
+    sqlite3VdbeAddOp2(v, OP_Close, oldIdx, 0);
+  }
+
+  /*
+  ** Return the number of rows that were changed. If this routine is
+  ** generating code because of a call to sqlite3NestedParse(), do not
+  ** invoke the callback function.
+  */
+  if( db->flags & SQLITE_CountRows && !pParse->trigStack && pParse->nested==0 ){
+    sqlite3VdbeAddOp2(v, OP_ResultRow, regRowCount, 1);
+    sqlite3VdbeSetNumCols(v, 1);
+    sqlite3VdbeSetColName(v, 0, COLNAME_NAME, "rows updated", P4_STATIC);
+  }
+
+update_cleanup:
+  sqlite3AuthContextPop(&sContext);
+  sqlite3_free(aRegIdx);
+  sqlite3_free(aXRef);
+  sqlite3SrcListDelete(pTabList);
+  sqlite3ExprListDelete(pChanges);
+  sqlite3ExprDelete(pWhere);
+  return;
+}
+
+#ifndef SQLITE_OMIT_VIRTUALTABLE
+/*
+** Generate code for an UPDATE of a virtual table.
+**
+** The strategy is that we create an ephemerial table that contains
+** for each row to be changed:
+**
+**   (A)  The original rowid of that row.
+**   (B)  The revised rowid for the row. (note1)
+**   (C)  The content of every column in the row.
+**
+** Then we loop over this ephemeral table and for each row in
+** the ephermeral table call VUpdate.
+**
+** When finished, drop the ephemeral table.
+**
+** (note1) Actually, if we know in advance that (A) is always the same
+** as (B) we only store (A), then duplicate (A) when pulling
+** it out of the ephemeral table before calling VUpdate.
+*/
+static void updateVirtualTable(
+  Parse *pParse,       /* The parsing context */
+  SrcList *pSrc,       /* The virtual table to be modified */
+  Table *pTab,         /* The virtual table */
+  ExprList *pChanges,  /* The columns to change in the UPDATE statement */
+  Expr *pRowid,        /* Expression used to recompute the rowid */
+  int *aXRef,          /* Mapping from columns of pTab to entries in pChanges */
+  Expr *pWhere         /* WHERE clause of the UPDATE statement */
+){
+  Vdbe *v = pParse->pVdbe;  /* Virtual machine under construction */
+  ExprList *pEList = 0;     /* The result set of the SELECT statement */
+  Select *pSelect = 0;      /* The SELECT statement */
+  Expr *pExpr;              /* Temporary expression */
+  int ephemTab;             /* Table holding the result of the SELECT */
+  int i;                    /* Loop counter */
+  int addr;                 /* Address of top of loop */
+  int iReg;                 /* First register in set passed to OP_VUpdate */
+  sqlite3 *db = pParse->db; /* Database connection */
+  const char *pVtab = (const char*)pTab->pVtab;
+  SelectDest dest;
+
+  /* Construct the SELECT statement that will find the new values for
+  ** all updated rows.
+  */
+  pEList = sqlite3ExprListAppend(pParse, 0,
+                                 sqlite3CreateIdExpr(pParse, "_rowid_"), 0);
+  if( pRowid ){
+    pEList = sqlite3ExprListAppend(pParse, pEList,
+                                   sqlite3ExprDup(db, pRowid), 0);
+  }
+  assert( pTab->iPKey<0 );
+  for(i=0; i<pTab->nCol; i++){
+    if( aXRef[i]>=0 ){
+      pExpr = sqlite3ExprDup(db, pChanges->a[aXRef[i]].pExpr);
+    }else{
+      pExpr = sqlite3CreateIdExpr(pParse, pTab->aCol[i].zName);
+    }
+    pEList = sqlite3ExprListAppend(pParse, pEList, pExpr, 0);
+  }
+  pSelect = sqlite3SelectNew(pParse, pEList, pSrc, pWhere, 0, 0, 0, 0, 0, 0);
+
+  /* Create the ephemeral table into which the update results will
+  ** be stored.
+  */
+  assert( v );
+  ephemTab = pParse->nTab++;
+  sqlite3VdbeAddOp2(v, OP_OpenEphemeral, ephemTab, pTab->nCol+1+(pRowid!=0));
+
+  /* fill the ephemeral table
+  */
+  sqlite3SelectDestInit(&dest, SRT_Table, ephemTab);
+  sqlite3Select(pParse, pSelect, &dest, 0, 0, 0, 0);
+
+  /* Generate code to scan the ephemeral table and call VUpdate. */
+  iReg = ++pParse->nMem;
+  pParse->nMem += pTab->nCol+1;
+  sqlite3VdbeAddOp2(v, OP_Rewind, ephemTab, 0);
+  addr = sqlite3VdbeCurrentAddr(v);
+  sqlite3VdbeAddOp3(v, OP_Column,  ephemTab, 0, iReg);
+  sqlite3VdbeAddOp3(v, OP_Column, ephemTab, (pRowid?1:0), iReg+1);
+  for(i=0; i<pTab->nCol; i++){
+    sqlite3VdbeAddOp3(v, OP_Column, ephemTab, i+1+(pRowid!=0), iReg+2+i);
+  }
+  pParse->pVirtualLock = pTab;
+  sqlite3VdbeAddOp4(v, OP_VUpdate, 0, pTab->nCol+2, iReg, pVtab, P4_VTAB);
+  sqlite3VdbeAddOp2(v, OP_Next, ephemTab, addr);
+  sqlite3VdbeJumpHere(v, addr-1);
+  sqlite3VdbeAddOp2(v, OP_Close, ephemTab, 0);
+
+  /* Cleanup */
+  sqlite3SelectDelete(pSelect);
+}
+#endif /* SQLITE_OMIT_VIRTUALTABLE */
diff --git a/uppsrc/plugin/sqlite3/lib/utf.c b/uppsrc/plugin/sqlite3/lib/utf.c
new file mode 100644
index 000000000..0dae0f3a4
--- /dev/null
+++ b/uppsrc/plugin/sqlite3/lib/utf.c
@@ -0,0 +1,523 @@
+/*
+** 2004 April 13
+**
+** The author disclaims copyright to this source code.  In place of
+** a legal notice, here is a blessing:
+**
+**    May you do good and not evil.
+**    May you find forgiveness for yourself and forgive others.
+**    May you share freely, never taking more than you give.
+**
+*************************************************************************
+** This file contains routines used to translate between UTF-8,
+** UTF-16, UTF-16BE, and UTF-16LE.
+**
+** $Id: utf.c,v 1.60 2008/02/13 18:25:27 danielk1977 Exp $
+**
+** Notes on UTF-8:
+**
+**   Byte-0    Byte-1    Byte-2    Byte-3    Value
+**  0xxxxxxx                                 00000000 00000000 0xxxxxxx
+**  110yyyyy  10xxxxxx                       00000000 00000yyy yyxxxxxx
+**  1110zzzz  10yyyyyy  10xxxxxx             00000000 zzzzyyyy yyxxxxxx
+**  11110uuu  10uuzzzz  10yyyyyy  10xxxxxx   000uuuuu zzzzyyyy yyxxxxxx
+**
+**
+** Notes on UTF-16:  (with wwww+1==uuuuu)
+**
+**      Word-0               Word-1          Value
+**  110110ww wwzzzzyy   110111yy yyxxxxxx    000uuuuu zzzzyyyy yyxxxxxx
+**  zzzzyyyy yyxxxxxx                        00000000 zzzzyyyy yyxxxxxx
+**
+**
+** BOM or Byte Order Mark:
+**     0xff 0xfe   little-endian utf-16 follows
+**     0xfe 0xff   big-endian utf-16 follows
+**
+*/
+#include "sqliteInt.h"
+#include <assert.h>
+#include "vdbeInt.h"
+
+/*
+** The following constant value is used by the SQLITE_BIGENDIAN and
+** SQLITE_LITTLEENDIAN macros.
+*/
+const int sqlite3one = 1;
+
+/*
+** This lookup table is used to help decode the first byte of
+** a multi-byte UTF8 character.
+*/
+static const unsigned char sqlite3UtfTrans1[] = {
+  0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+  0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
+  0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
+  0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f,
+  0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+  0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
+  0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+  0x00, 0x01, 0x02, 0x03, 0x00, 0x01, 0x00, 0x00,
+};
+
+
+#define WRITE_UTF8(zOut, c) {                          \
+  if( c<0x00080 ){                                     \
+    *zOut++ = (c&0xFF);                                \
+  }                                                    \
+  else if( c<0x00800 ){                                \
+    *zOut++ = 0xC0 + ((c>>6)&0x1F);                    \
+    *zOut++ = 0x80 + (c & 0x3F);                       \
+  }                                                    \
+  else if( c<0x10000 ){                                \
+    *zOut++ = 0xE0 + ((c>>12)&0x0F);                   \
+    *zOut++ = 0x80 + ((c>>6) & 0x3F);                  \
+    *zOut++ = 0x80 + (c & 0x3F);                       \
+  }else{                                               \
+    *zOut++ = 0xF0 + ((c>>18) & 0x07);                 \
+    *zOut++ = 0x80 + ((c>>12) & 0x3F);                 \
+    *zOut++ = 0x80 + ((c>>6) & 0x3F);                  \
+    *zOut++ = 0x80 + (c & 0x3F);                       \
+  }                                                    \
+}
+
+#define WRITE_UTF16LE(zOut, c) {                                \
+  if( c<=0xFFFF ){                                              \
+    *zOut++ = (c&0x00FF);                                       \
+    *zOut++ = ((c>>8)&0x00FF);                                  \
+  }else{                                                        \
+    *zOut++ = (((c>>10)&0x003F) + (((c-0x10000)>>10)&0x00C0));  \
+    *zOut++ = (0x00D8 + (((c-0x10000)>>18)&0x03));              \
+    *zOut++ = (c&0x00FF);                                       \
+    *zOut++ = (0x00DC + ((c>>8)&0x03));                         \
+  }                                                             \
+}
+
+#define WRITE_UTF16BE(zOut, c) {                                \
+  if( c<=0xFFFF ){                                              \
+    *zOut++ = ((c>>8)&0x00FF);                                  \
+    *zOut++ = (c&0x00FF);                                       \
+  }else{                                                        \
+    *zOut++ = (0x00D8 + (((c-0x10000)>>18)&0x03));              \
+    *zOut++ = (((c>>10)&0x003F) + (((c-0x10000)>>10)&0x00C0));  \
+    *zOut++ = (0x00DC + ((c>>8)&0x03));                         \
+    *zOut++ = (c&0x00FF);                                       \
+  }                                                             \
+}
+
+#define READ_UTF16LE(zIn, c){                                         \
+  c = (*zIn++);                                                       \
+  c += ((*zIn++)<<8);                                                 \
+  if( c>=0xD800 && c<0xE000 ){                                       \
+    int c2 = (*zIn++);                                                \
+    c2 += ((*zIn++)<<8);                                              \
+    c = (c2&0x03FF) + ((c&0x003F)<<10) + (((c&0x03C0)+0x0040)<<10);   \
+    if( (c & 0xFFFF0000)==0 ) c = 0xFFFD;                             \
+  }                                                                   \
+}
+
+#define READ_UTF16BE(zIn, c){                                         \
+  c = ((*zIn++)<<8);                                                  \
+  c += (*zIn++);                                                      \
+  if( c>=0xD800 && c<0xE000 ){                                       \
+    int c2 = ((*zIn++)<<8);                                           \
+    c2 += (*zIn++);                                                   \
+    c = (c2&0x03FF) + ((c&0x003F)<<10) + (((c&0x03C0)+0x0040)<<10);   \
+    if( (c & 0xFFFF0000)==0 ) c = 0xFFFD;                             \
+  }                                                                   \
+}
+
+/*
+** Translate a single UTF-8 character.  Return the unicode value.
+**
+** During translation, assume that the byte that zTerm points
+** is a 0x00.
+**
+** Write a pointer to the next unread byte back into *pzNext.
+**
+** Notes On Invalid UTF-8:
+**
+**  *  This routine never allows a 7-bit character (0x00 through 0x7f) to
+**     be encoded as a multi-byte character.  Any multi-byte character that
+**     attempts to encode a value between 0x00 and 0x7f is rendered as 0xfffd.
+**
+**  *  This routine never allows a UTF16 surrogate value to be encoded.
+**     If a multi-byte character attempts to encode a value between
+**     0xd800 and 0xe000 then it is rendered as 0xfffd.
+**
+**  *  Bytes in the range of 0x80 through 0xbf which occur as the first
+**     byte of a character are interpreted as single-byte characters
+**     and rendered as themselves even though they are technically
+**     invalid characters.
+**
+**  *  This routine accepts an infinite number of different UTF8 encodings
+**     for unicode values 0x80 and greater.  It do not change over-length
+**     encodings to 0xfffd as some systems recommend.
+*/
+int sqlite3Utf8Read(
+  const unsigned char *z,         /* First byte of UTF-8 character */
+  const unsigned char *zTerm,     /* Pretend this byte is 0x00 */
+  const unsigned char **pzNext    /* Write first byte past UTF-8 char here */
+){
+  int c = *(z++);
+  if( c>=0xc0 ){
+    c = sqlite3UtfTrans1[c-0xc0];
+    while( z!=zTerm && (*z & 0xc0)==0x80 ){
+      c = (c<<6) + (0x3f & *(z++));
+    }
+    if( c<0x80
+        || (c&0xFFFFF800)==0xD800
+        || (c&0xFFFFFFFE)==0xFFFE ){  c = 0xFFFD; }
+  }
+  *pzNext = z;
+  return c;
+}
+
+
+
+/*
+** If the TRANSLATE_TRACE macro is defined, the value of each Mem is
+** printed on stderr on the way into and out of sqlite3VdbeMemTranslate().
+*/
+/* #define TRANSLATE_TRACE 1 */
+
+#ifndef SQLITE_OMIT_UTF16
+/*
+** This routine transforms the internal text encoding used by pMem to
+** desiredEnc. It is an error if the string is already of the desired
+** encoding, or if *pMem does not contain a string value.
+*/
+int sqlite3VdbeMemTranslate(Mem *pMem, u8 desiredEnc){
+  int len;                    /* Maximum length of output string in bytes */
+  unsigned char *zOut;                  /* Output buffer */
+  unsigned char *zIn;                   /* Input iterator */
+  unsigned char *zTerm;                 /* End of input */
+  unsigned char *z;                     /* Output iterator */
+  unsigned int c;
+
+  assert( pMem->db==0 || sqlite3_mutex_held(pMem->db->mutex) );
+  assert( pMem->flags&MEM_Str );
+  assert( pMem->enc!=desiredEnc );
+  assert( pMem->enc!=0 );
+  assert( pMem->n>=0 );
+
+#if defined(TRANSLATE_TRACE) && defined(SQLITE_DEBUG)
+  {
+    char zBuf[100];
+    sqlite3VdbeMemPrettyPrint(pMem, zBuf);
+    fprintf(stderr, "INPUT:  %s\n", zBuf);
+  }
+#endif
+
+  /* If the translation is between UTF-16 little and big endian, then
+  ** all that is required is to swap the byte order. This case is handled
+  ** differently from the others.
+  */
+  if( pMem->enc!=SQLITE_UTF8 && desiredEnc!=SQLITE_UTF8 ){
+    u8 temp;
+    int rc;
+    rc = sqlite3VdbeMemMakeWriteable(pMem);
+    if( rc!=SQLITE_OK ){
+      assert( rc==SQLITE_NOMEM );
+      return SQLITE_NOMEM;
+    }
+    zIn = (u8*)pMem->z;
+    zTerm = &zIn[pMem->n];
+    while( zIn<zTerm ){
+      temp = *zIn;
+      *zIn = *(zIn+1);
+      zIn++;
+      *zIn++ = temp;
+    }
+    pMem->enc = desiredEnc;
+    goto translate_out;
+  }
+
+  /* Set len to the maximum number of bytes required in the output buffer. */
+  if( desiredEnc==SQLITE_UTF8 ){
+    /* When converting from UTF-16, the maximum growth results from
+    ** translating a 2-byte character to a 4-byte UTF-8 character.
+    ** A single byte is required for the output string
+    ** nul-terminator.
+    */
+    len = pMem->n * 2 + 1;
+  }else{
+    /* When converting from UTF-8 to UTF-16 the maximum growth is caused
+    ** when a 1-byte UTF-8 character is translated into a 2-byte UTF-16
+    ** character. Two bytes are required in the output buffer for the
+    ** nul-terminator.
+    */
+    len = pMem->n * 2 + 2;
+  }
+
+  /* Set zIn to point at the start of the input buffer and zTerm to point 1
+  ** byte past the end.
+  **
+  ** Variable zOut is set to point at the output buffer, space obtained
+  ** from sqlite3_malloc().
+  */
+  zIn = (u8*)pMem->z;
+  zTerm = &zIn[pMem->n];
+  zOut = sqlite3DbMallocRaw(pMem->db, len);
+  if( !zOut ){
+    return SQLITE_NOMEM;
+  }
+  z = zOut;
+
+  if( pMem->enc==SQLITE_UTF8 ){
+    if( desiredEnc==SQLITE_UTF16LE ){
+      /* UTF-8 -> UTF-16 Little-endian */
+      while( zIn<zTerm ){
+        c = sqlite3Utf8Read(zIn, zTerm, (const u8**)&zIn);
+        WRITE_UTF16LE(z, c);
+      }
+    }else{
+      assert( desiredEnc==SQLITE_UTF16BE );
+      /* UTF-8 -> UTF-16 Big-endian */
+      while( zIn<zTerm ){
+        c = sqlite3Utf8Read(zIn, zTerm, (const u8**)&zIn);
+        WRITE_UTF16BE(z, c);
+      }
+    }
+    pMem->n = z - zOut;
+    *z++ = 0;
+  }else{
+    assert( desiredEnc==SQLITE_UTF8 );
+    if( pMem->enc==SQLITE_UTF16LE ){
+      /* UTF-16 Little-endian -> UTF-8 */
+      while( zIn<zTerm ){
+        READ_UTF16LE(zIn, c);
+        WRITE_UTF8(z, c);
+      }
+    }else{
+      /* UTF-16 Little-endian -> UTF-8 */
+      while( zIn<zTerm ){
+        READ_UTF16BE(zIn, c);
+        WRITE_UTF8(z, c);
+      }
+    }
+    pMem->n = z - zOut;
+  }
+  *z = 0;
+  assert( (pMem->n+(desiredEnc==SQLITE_UTF8?1:2))<=len );
+
+  sqlite3VdbeMemRelease(pMem);
+  pMem->flags &= ~(MEM_Static|MEM_Dyn|MEM_Ephem);
+  pMem->enc = desiredEnc;
+  pMem->flags |= (MEM_Term|MEM_Dyn);
+  pMem->z = (char*)zOut;
+
+translate_out:
+#if defined(TRANSLATE_TRACE) && defined(SQLITE_DEBUG)
+  {
+    char zBuf[100];
+    sqlite3VdbeMemPrettyPrint(pMem, zBuf);
+    fprintf(stderr, "OUTPUT: %s\n", zBuf);
+  }
+#endif
+  return SQLITE_OK;
+}
+
+/*
+** This routine checks for a byte-order mark at the beginning of the
+** UTF-16 string stored in *pMem. If one is present, it is removed and
+** the encoding of the Mem adjusted. This routine does not do any
+** byte-swapping, it just sets Mem.enc appropriately.
+**
+** The allocation (static, dynamic etc.) and encoding of the Mem may be
+** changed by this function.
+*/
+int sqlite3VdbeMemHandleBom(Mem *pMem){
+  int rc = SQLITE_OK;
+  u8 bom = 0;
+
+  if( pMem->n<0 || pMem->n>1 ){
+    u8 b1 = *(u8 *)pMem->z;
+    u8 b2 = *(((u8 *)pMem->z) + 1);
+    if( b1==0xFE && b2==0xFF ){
+      bom = SQLITE_UTF16BE;
+    }
+    if( b1==0xFF && b2==0xFE ){
+      bom = SQLITE_UTF16LE;
+    }
+  }
+
+  if( bom ){
+    rc = sqlite3VdbeMemMakeWriteable(pMem);
+    if( rc==SQLITE_OK ){
+      pMem->n -= 2;
+      memmove(pMem->z, &pMem->z[2], pMem->n);
+      pMem->z[pMem->n] = '\0';
+      pMem->z[pMem->n+1] = '\0';
+      pMem->flags |= MEM_Term;
+      pMem->enc = bom;
+    }
+  }
+  return rc;
+}
+#endif /* SQLITE_OMIT_UTF16 */
+
+/*
+** pZ is a UTF-8 encoded unicode string. If nByte is less than zero,
+** return the number of unicode characters in pZ up to (but not including)
+** the first 0x00 byte. If nByte is not less than zero, return the
+** number of unicode characters in the first nByte of pZ (or up to
+** the first 0x00, whichever comes first).
+*/
+int sqlite3Utf8CharLen(const char *zIn, int nByte){
+  int r = 0;
+  const u8 *z = (const u8*)zIn;
+  const u8 *zTerm;
+  if( nByte>=0 ){
+    zTerm = &z[nByte];
+  }else{
+    zTerm = (const u8*)(-1);
+  }
+  assert( z<=zTerm );
+  while( *z!=0 && z<zTerm ){
+    SQLITE_SKIP_UTF8(z);
+    r++;
+  }
+  return r;
+}
+
+/* This test function is not currently used by the automated test-suite.
+** Hence it is only available in debug builds.
+*/
+#if defined(SQLITE_TEST) && defined(SQLITE_DEBUG)
+/*
+** Translate UTF-8 to UTF-8.
+**
+** This has the effect of making sure that the string is well-formed
+** UTF-8.  Miscoded characters are removed.
+**
+** The translation is done in-place (since it is impossible for the
+** correct UTF-8 encoding to be longer than a malformed encoding).
+*/
+int sqlite3Utf8To8(unsigned char *zIn){
+  unsigned char *zOut = zIn;
+  unsigned char *zStart = zIn;
+  unsigned char *zTerm;
+  u32 c;
+
+  while( zIn[0] ){
+    c = sqlite3Utf8Read(zIn, zTerm, (const u8**)&zIn);
+    if( c!=0xfffd ){
+      WRITE_UTF8(zOut, c);
+    }
+  }
+  *zOut = 0;
+  return zOut - zStart;
+}
+#endif
+
+#ifndef SQLITE_OMIT_UTF16
+/*
+** Convert a UTF-16 string in the native encoding into a UTF-8 string.
+** Memory to hold the UTF-8 string is obtained from sqlite3_malloc and must
+** be freed by the calling function.
+**
+** NULL is returned if there is an allocation error.
+*/
+char *sqlite3Utf16to8(sqlite3 *db, const void *z, int nByte){
+  Mem m;
+  memset(&m, 0, sizeof(m));
+  m.db = db;
+  sqlite3VdbeMemSetStr(&m, z, nByte, SQLITE_UTF16NATIVE, SQLITE_STATIC);
+  sqlite3VdbeChangeEncoding(&m, SQLITE_UTF8);
+  if( db->mallocFailed ){
+    sqlite3VdbeMemRelease(&m);
+    m.z = 0;
+  }
+  assert( (m.flags & MEM_Term)!=0 || db->mallocFailed );
+  assert( (m.flags & MEM_Str)!=0 || db->mallocFailed );
+  return (m.flags & MEM_Dyn)!=0 ? m.z : sqlite3DbStrDup(db, m.z);
+}
+
+/*
+** pZ is a UTF-16 encoded unicode string. If nChar is less than zero,
+** return the number of bytes up to (but not including), the first pair
+** of consecutive 0x00 bytes in pZ. If nChar is not less than zero,
+** then return the number of bytes in the first nChar unicode characters
+** in pZ (or up until the first pair of 0x00 bytes, whichever comes first).
+*/
+int sqlite3Utf16ByteLen(const void *zIn, int nChar){
+  unsigned int c = 1;
+  char const *z = zIn;
+  int n = 0;
+  if( SQLITE_UTF16NATIVE==SQLITE_UTF16BE ){
+    /* Using an "if (SQLITE_UTF16NATIVE==SQLITE_UTF16BE)" construct here
+    ** and in other parts of this file means that at one branch will
+    ** not be covered by coverage testing on any single host. But coverage
+    ** will be complete if the tests are run on both a little-endian and
+    ** big-endian host. Because both the UTF16NATIVE and SQLITE_UTF16BE
+    ** macros are constant at compile time the compiler can determine
+    ** which branch will be followed. It is therefore assumed that no runtime
+    ** penalty is paid for this "if" statement.
+    */
+    while( c && ((nChar<0) || n<nChar) ){
+      READ_UTF16BE(z, c);
+      n++;
+    }
+  }else{
+    while( c && ((nChar<0) || n<nChar) ){
+      READ_UTF16LE(z, c);
+      n++;
+    }
+  }
+  return (z-(char const *)zIn)-((c==0)?2:0);
+}
+
+#if defined(SQLITE_TEST)
+/*
+** This routine is called from the TCL test function "translate_selftest".
+** It checks that the primitives for serializing and deserializing
+** characters in each encoding are inverses of each other.
+*/
+void sqlite3UtfSelfTest(){
+  unsigned int i, t;
+  unsigned char zBuf[20];
+  unsigned char *z;
+  unsigned char *zTerm;
+  int n;
+  unsigned int c;
+
+  for(i=0; i<0x00110000; i++){
+    z = zBuf;
+    WRITE_UTF8(z, i);
+    n = z-zBuf;
+    z[0] = 0;
+    zTerm = z;
+    z = zBuf;
+    c = sqlite3Utf8Read(z, zTerm, (const u8**)&z);
+    t = i;
+    if( i>=0xD800 && i<=0xDFFF ) t = 0xFFFD;
+    if( (i&0xFFFFFFFE)==0xFFFE ) t = 0xFFFD;
+    assert( c==t );
+    assert( (z-zBuf)==n );
+  }
+  for(i=0; i<0x00110000; i++){
+    if( i>=0xD800 && i<0xE000 ) continue;
+    z = zBuf;
+    WRITE_UTF16LE(z, i);
+    n = z-zBuf;
+    z[0] = 0;
+    z = zBuf;
+    READ_UTF16LE(z, c);
+    assert( c==i );
+    assert( (z-zBuf)==n );
+  }
+  for(i=0; i<0x00110000; i++){
+    if( i>=0xD800 && i<0xE000 ) continue;
+    z = zBuf;
+    WRITE_UTF16BE(z, i);
+    n = z-zBuf;
+    z[0] = 0;
+    z = zBuf;
+    READ_UTF16BE(z, c);
+    assert( c==i );
+    assert( (z-zBuf)==n );
+  }
+}
+#endif /* SQLITE_TEST */
+#endif /* SQLITE_OMIT_UTF16 */
diff --git a/uppsrc/plugin/sqlite3/lib/util.c b/uppsrc/plugin/sqlite3/lib/util.c
new file mode 100644
index 000000000..e7044c9fe
--- /dev/null
+++ b/uppsrc/plugin/sqlite3/lib/util.c
@@ -0,0 +1,724 @@
+/*
+** 2001 September 15
+**
+** The author disclaims copyright to this source code.  In place of
+** a legal notice, here is a blessing:
+**
+**    May you do good and not evil.
+**    May you find forgiveness for yourself and forgive others.
+**    May you share freely, never taking more than you give.
+**
+*************************************************************************
+** Utility functions used throughout sqlite.
+**
+** This file contains functions for allocating memory, comparing
+** strings, and stuff like that.
+**
+** $Id: util.c,v 1.216 2008/01/23 03:03:05 drh Exp $
+*/
+#include "sqliteInt.h"
+#include <stdarg.h>
+#include <ctype.h>
+
+
+/*
+** Set the most recent error code and error string for the sqlite
+** handle "db". The error code is set to "err_code".
+**
+** If it is not NULL, string zFormat specifies the format of the
+** error string in the style of the printf functions: The following
+** format characters are allowed:
+**
+**      %s      Insert a string
+**      %z      A string that should be freed after use
+**      %d      Insert an integer
+**      %T      Insert a token
+**      %S      Insert the first element of a SrcList
+**
+** zFormat and any string tokens that follow it are assumed to be
+** encoded in UTF-8.
+**
+** To clear the most recent error for sqlite handle "db", sqlite3Error
+** should be called with err_code set to SQLITE_OK and zFormat set
+** to NULL.
+*/
+void sqlite3Error(sqlite3 *db, int err_code, const char *zFormat, ...){
+  if( db && (db->pErr || (db->pErr = sqlite3ValueNew(db))!=0) ){
+    db->errCode = err_code;
+    if( zFormat ){
+      char *z;
+      va_list ap;
+      va_start(ap, zFormat);
+      z = sqlite3VMPrintf(db, zFormat, ap);
+      va_end(ap);
+      sqlite3ValueSetStr(db->pErr, -1, z, SQLITE_UTF8, sqlite3_free);
+    }else{
+      sqlite3ValueSetStr(db->pErr, 0, 0, SQLITE_UTF8, SQLITE_STATIC);
+    }
+  }
+}
+
+/*
+** Add an error message to pParse->zErrMsg and increment pParse->nErr.
+** The following formatting characters are allowed:
+**
+**      %s      Insert a string
+**      %z      A string that should be freed after use
+**      %d      Insert an integer
+**      %T      Insert a token
+**      %S      Insert the first element of a SrcList
+**
+** This function should be used to report any error that occurs whilst
+** compiling an SQL statement (i.e. within sqlite3_prepare()). The
+** last thing the sqlite3_prepare() function does is copy the error
+** stored by this function into the database handle using sqlite3Error().
+** Function sqlite3Error() should be used during statement execution
+** (sqlite3_step() etc.).
+*/
+void sqlite3ErrorMsg(Parse *pParse, const char *zFormat, ...){
+  va_list ap;
+  pParse->nErr++;
+  sqlite3_free(pParse->zErrMsg);
+  va_start(ap, zFormat);
+  pParse->zErrMsg = sqlite3VMPrintf(pParse->db, zFormat, ap);
+  va_end(ap);
+  if( pParse->rc==SQLITE_OK ){
+    pParse->rc = SQLITE_ERROR;
+  }
+}
+
+/*
+** Clear the error message in pParse, if any
+*/
+void sqlite3ErrorClear(Parse *pParse){
+  sqlite3_free(pParse->zErrMsg);
+  pParse->zErrMsg = 0;
+  pParse->nErr = 0;
+}
+
+/*
+** Convert an SQL-style quoted string into a normal string by removing
+** the quote characters.  The conversion is done in-place.  If the
+** input does not begin with a quote character, then this routine
+** is a no-op.
+**
+** 2002-Feb-14: This routine is extended to remove MS-Access style
+** brackets from around identifers.  For example:  "[a-b-c]" becomes
+** "a-b-c".
+*/
+void sqlite3Dequote(char *z){
+  int quote;
+  int i, j;
+  if( z==0 ) return;
+  quote = z[0];
+  switch( quote ){
+    case '\'':  break;
+    case '"':   break;
+    case '`':   break;                /* For MySQL compatibility */
+    case '[':   quote = ']';  break;  /* For MS SqlServer compatibility */
+    default:    return;
+  }
+  for(i=1, j=0; z[i]; i++){
+    if( z[i]==quote ){
+      if( z[i+1]==quote ){
+        z[j++] = quote;
+        i++;
+      }else{
+        z[j++] = 0;
+        break;
+      }
+    }else{
+      z[j++] = z[i];
+    }
+  }
+}
+
+/* An array to map all upper-case characters into their corresponding
+** lower-case character.
+*/
+const unsigned char sqlite3UpperToLower[] = {
+#ifdef SQLITE_ASCII
+      0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15, 16, 17,
+     18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35,
+     36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53,
+     54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 97, 98, 99,100,101,102,103,
+    104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,
+    122, 91, 92, 93, 94, 95, 96, 97, 98, 99,100,101,102,103,104,105,106,107,
+    108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,
+    126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,
+    144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,
+    162,163,164,165,166,167,168,169,170,171,172,173,174,175,176,177,178,179,
+    180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,195,196,197,
+    198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,
+    216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,
+    234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,
+    252,253,254,255
+#endif
+#ifdef SQLITE_EBCDIC
+      0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15, /* 0x */
+     16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, /* 1x */
+     32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, /* 2x */
+     48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, /* 3x */
+     64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, /* 4x */
+     80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, /* 5x */
+     96, 97, 66, 67, 68, 69, 70, 71, 72, 73,106,107,108,109,110,111, /* 6x */
+    112, 81, 82, 83, 84, 85, 86, 87, 88, 89,122,123,124,125,126,127, /* 7x */
+    128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143, /* 8x */
+    144,145,146,147,148,149,150,151,152,153,154,155,156,157,156,159, /* 9x */
+    160,161,162,163,164,165,166,167,168,169,170,171,140,141,142,175, /* Ax */
+    176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191, /* Bx */
+    192,129,130,131,132,133,134,135,136,137,202,203,204,205,206,207, /* Cx */
+    208,145,146,147,148,149,150,151,152,153,218,219,220,221,222,223, /* Dx */
+    224,225,162,163,164,165,166,167,168,169,232,203,204,205,206,207, /* Ex */
+    239,240,241,242,243,244,245,246,247,248,249,219,220,221,222,255, /* Fx */
+#endif
+};
+#define UpperToLower sqlite3UpperToLower
+
+/*
+** Some systems have stricmp().  Others have strcasecmp().  Because
+** there is no consistency, we will define our own.
+*/
+int sqlite3StrICmp(const char *zLeft, const char *zRight){
+  register unsigned char *a, *b;
+  a = (unsigned char *)zLeft;
+  b = (unsigned char *)zRight;
+  while( *a!=0 && UpperToLower[*a]==UpperToLower[*b]){ a++; b++; }
+  return UpperToLower[*a] - UpperToLower[*b];
+}
+int sqlite3StrNICmp(const char *zLeft, const char *zRight, int N){
+  register unsigned char *a, *b;
+  a = (unsigned char *)zLeft;
+  b = (unsigned char *)zRight;
+  while( N-- > 0 && *a!=0 && UpperToLower[*a]==UpperToLower[*b]){ a++; b++; }
+  return N<0 ? 0 : UpperToLower[*a] - UpperToLower[*b];
+}
+
+/*
+** Return TRUE if z is a pure numeric string.  Return FALSE if the
+** string contains any character which is not part of a number. If
+** the string is numeric and contains the '.' character, set *realnum
+** to TRUE (otherwise FALSE).
+**
+** An empty string is considered non-numeric.
+*/
+int sqlite3IsNumber(const char *z, int *realnum, u8 enc){
+  int incr = (enc==SQLITE_UTF8?1:2);
+  if( enc==SQLITE_UTF16BE ) z++;
+  if( *z=='-' || *z=='+' ) z += incr;
+  if( !isdigit(*(u8*)z) ){
+    return 0;
+  }
+  z += incr;
+  if( realnum ) *realnum = 0;
+  while( isdigit(*(u8*)z) ){ z += incr; }
+  if( *z=='.' ){
+    z += incr;
+    if( !isdigit(*(u8*)z) ) return 0;
+    while( isdigit(*(u8*)z) ){ z += incr; }
+    if( realnum ) *realnum = 1;
+  }
+  if( *z=='e' || *z=='E' ){
+    z += incr;
+    if( *z=='+' || *z=='-' ) z += incr;
+    if( !isdigit(*(u8*)z) ) return 0;
+    while( isdigit(*(u8*)z) ){ z += incr; }
+    if( realnum ) *realnum = 1;
+  }
+  return *z==0;
+}
+
+/*
+** The string z[] is an ascii representation of a real number.
+** Convert this string to a double.
+**
+** This routine assumes that z[] really is a valid number.  If it
+** is not, the result is undefined.
+**
+** This routine is used instead of the library atof() function because
+** the library atof() might want to use "," as the decimal point instead
+** of "." depending on how locale is set.  But that would cause problems
+** for SQL.  So this routine always uses "." regardless of locale.
+*/
+int sqlite3AtoF(const char *z, double *pResult){
+#ifndef SQLITE_OMIT_FLOATING_POINT
+  int sign = 1;
+  const char *zBegin = z;
+  LONGDOUBLE_TYPE v1 = 0.0;
+  while( isspace(*(u8*)z) ) z++;
+  if( *z=='-' ){
+    sign = -1;
+    z++;
+  }else if( *z=='+' ){
+    z++;
+  }
+  while( isdigit(*(u8*)z) ){
+    v1 = v1*10.0 + (*z - '0');
+    z++;
+  }
+  if( *z=='.' ){
+    LONGDOUBLE_TYPE divisor = 1.0;
+    z++;
+    while( isdigit(*(u8*)z) ){
+      v1 = v1*10.0 + (*z - '0');
+      divisor *= 10.0;
+      z++;
+    }
+    v1 /= divisor;
+  }
+  if( *z=='e' || *z=='E' ){
+    int esign = 1;
+    int eval = 0;
+    LONGDOUBLE_TYPE scale = 1.0;
+    z++;
+    if( *z=='-' ){
+      esign = -1;
+      z++;
+    }else if( *z=='+' ){
+      z++;
+    }
+    while( isdigit(*(u8*)z) ){
+      eval = eval*10 + *z - '0';
+      z++;
+    }
+    while( eval>=64 ){ scale *= 1.0e+64; eval -= 64; }
+    while( eval>=16 ){ scale *= 1.0e+16; eval -= 16; }
+    while( eval>=4 ){ scale *= 1.0e+4; eval -= 4; }
+    while( eval>=1 ){ scale *= 1.0e+1; eval -= 1; }
+    if( esign<0 ){
+      v1 /= scale;
+    }else{
+      v1 *= scale;
+    }
+  }
+  *pResult = sign<0 ? -v1 : v1;
+  return z - zBegin;
+#else
+  return sqlite3Atoi64(z, pResult);
+#endif /* SQLITE_OMIT_FLOATING_POINT */
+}
+
+/*
+** Compare the 19-character string zNum against the text representation
+** value 2^63:  9223372036854775808.  Return negative, zero, or positive
+** if zNum is less than, equal to, or greater than the string.
+**
+** Unlike memcmp() this routine is guaranteed to return the difference
+** in the values of the last digit if the only difference is in the
+** last digit.  So, for example,
+**
+**      compare2pow63("9223372036854775800")
+**
+** will return -8.
+*/
+static int compare2pow63(const char *zNum){
+  int c;
+  c = memcmp(zNum,"922337203685477580",18);
+  if( c==0 ){
+    c = zNum[18] - '8';
+  }
+  return c;
+}
+
+
+/*
+** Return TRUE if zNum is a 64-bit signed integer and write
+** the value of the integer into *pNum.  If zNum is not an integer
+** or is an integer that is too large to be expressed with 64 bits,
+** then return false.
+**
+** When this routine was originally written it dealt with only
+** 32-bit numbers.  At that time, it was much faster than the
+** atoi() library routine in RedHat 7.2.
+*/
+int sqlite3Atoi64(const char *zNum, i64 *pNum){
+  i64 v = 0;
+  int neg;
+  int i, c;
+  while( isspace(*(u8*)zNum) ) zNum++;
+  if( *zNum=='-' ){
+    neg = 1;
+    zNum++;
+  }else if( *zNum=='+' ){
+    neg = 0;
+    zNum++;
+  }else{
+    neg = 0;
+  }
+  while( zNum[0]=='0' ){ zNum++; } /* Skip over leading zeros. Ticket #2454 */
+  for(i=0; (c=zNum[i])>='0' && c<='9'; i++){
+    v = v*10 + c - '0';
+  }
+  *pNum = neg ? -v : v;
+  if( c!=0 || i==0 || i>19 ){
+    /* zNum is empty or contains non-numeric text or is longer
+    ** than 19 digits (thus guaranting that it is too large) */
+    return 0;
+  }else if( i<19 ){
+    /* Less than 19 digits, so we know that it fits in 64 bits */
+    return 1;
+  }else{
+    /* 19-digit numbers must be no larger than 9223372036854775807 if positive
+    ** or 9223372036854775808 if negative.  Note that 9223372036854665808
+    ** is 2^63. */
+    return compare2pow63(zNum)<neg;
+  }
+}
+
+/*
+** The string zNum represents an integer.  There might be some other
+** information following the integer too, but that part is ignored.
+** If the integer that the prefix of zNum represents will fit in a
+** 64-bit signed integer, return TRUE.  Otherwise return FALSE.
+**
+** This routine returns FALSE for the string -9223372036854775808 even that
+** that number will, in theory fit in a 64-bit integer.  Positive
+** 9223373036854775808 will not fit in 64 bits.  So it seems safer to return
+** false.
+*/
+int sqlite3FitsIn64Bits(const char *zNum, int negFlag){
+  int i, c;
+  int neg = 0;
+  if( *zNum=='-' ){
+    neg = 1;
+    zNum++;
+  }else if( *zNum=='+' ){
+    zNum++;
+  }
+  if( negFlag ) neg = 1-neg;
+  while( *zNum=='0' ){
+    zNum++;   /* Skip leading zeros.  Ticket #2454 */
+  }
+  for(i=0; (c=zNum[i])>='0' && c<='9'; i++){}
+  if( i<19 ){
+    /* Guaranteed to fit if less than 19 digits */
+    return 1;
+  }else if( i>19 ){
+    /* Guaranteed to be too big if greater than 19 digits */
+    return 0;
+  }else{
+    /* Compare against 2^63. */
+    return compare2pow63(zNum)<neg;
+  }
+}
+
+/*
+** If zNum represents an integer that will fit in 32-bits, then set
+** *pValue to that integer and return true.  Otherwise return false.
+**
+** Any non-numeric characters that following zNum are ignored.
+** This is different from sqlite3Atoi64() which requires the
+** input number to be zero-terminated.
+*/
+int sqlite3GetInt32(const char *zNum, int *pValue){
+  sqlite_int64 v = 0;
+  int i, c;
+  int neg = 0;
+  if( zNum[0]=='-' ){
+    neg = 1;
+    zNum++;
+  }else if( zNum[0]=='+' ){
+    zNum++;
+  }
+  while( zNum[0]=='0' ) zNum++;
+  for(i=0; i<11 && (c = zNum[i] - '0')>=0 && c<=9; i++){
+    v = v*10 + c;
+  }
+
+  /* The longest decimal representation of a 32 bit integer is 10 digits:
+  **
+  **             1234567890
+  **     2^31 -> 2147483648
+  */
+  if( i>10 ){
+    return 0;
+  }
+  if( v-neg>2147483647 ){
+    return 0;
+  }
+  if( neg ){
+    v = -v;
+  }
+  *pValue = (int)v;
+  return 1;
+}
+
+/*
+** The variable-length integer encoding is as follows:
+**
+** KEY:
+**         A = 0xxxxxxx    7 bits of data and one flag bit
+**         B = 1xxxxxxx    7 bits of data and one flag bit
+**         C = xxxxxxxx    8 bits of data
+**
+**  7 bits - A
+** 14 bits - BA
+** 21 bits - BBA
+** 28 bits - BBBA
+** 35 bits - BBBBA
+** 42 bits - BBBBBA
+** 49 bits - BBBBBBA
+** 56 bits - BBBBBBBA
+** 64 bits - BBBBBBBBC
+*/
+
+/*
+** Write a 64-bit variable-length integer to memory starting at p[0].
+** The length of data write will be between 1 and 9 bytes.  The number
+** of bytes written is returned.
+**
+** A variable-length integer consists of the lower 7 bits of each byte
+** for all bytes that have the 8th bit set and one byte with the 8th
+** bit clear.  Except, if we get to the 9th byte, it stores the full
+** 8 bits and is the last byte.
+*/
+int sqlite3PutVarint(unsigned char *p, u64 v){
+  int i, j, n;
+  u8 buf[10];
+  if( v & (((u64)0xff000000)<<32) ){
+    p[8] = v;
+    v >>= 8;
+    for(i=7; i>=0; i--){
+      p[i] = (v & 0x7f) | 0x80;
+      v >>= 7;
+    }
+    return 9;
+  }
+  n = 0;
+  do{
+    buf[n++] = (v & 0x7f) | 0x80;
+    v >>= 7;
+  }while( v!=0 );
+  buf[0] &= 0x7f;
+  assert( n<=9 );
+  for(i=0, j=n-1; j>=0; j--, i++){
+    p[i] = buf[j];
+  }
+  return n;
+}
+
+/*
+** Read a 64-bit variable-length integer from memory starting at p[0].
+** Return the number of bytes read.  The value is stored in *v.
+*/
+int sqlite3GetVarint(const unsigned char *p, u64 *v){
+  u32 x;
+  u64 x64;
+  int n;
+  unsigned char c;
+  if( ((c = p[0]) & 0x80)==0 ){
+    *v = c;
+    return 1;
+  }
+  x = c & 0x7f;
+  if( ((c = p[1]) & 0x80)==0 ){
+    *v = (x<<7) | c;
+    return 2;
+  }
+  x = (x<<7) | (c&0x7f);
+  if( ((c = p[2]) & 0x80)==0 ){
+    *v = (x<<7) | c;
+    return 3;
+  }
+  x = (x<<7) | (c&0x7f);
+  if( ((c = p[3]) & 0x80)==0 ){
+    *v = (x<<7) | c;
+    return 4;
+  }
+  x64 = (x<<7) | (c&0x7f);
+  n = 4;
+  do{
+    c = p[n++];
+    if( n==9 ){
+      x64 = (x64<<8) | c;
+      break;
+    }
+    x64 = (x64<<7) | (c&0x7f);
+  }while( (c & 0x80)!=0 );
+  *v = x64;
+  return n;
+}
+
+/*
+** Read a 32-bit variable-length integer from memory starting at p[0].
+** Return the number of bytes read.  The value is stored in *v.
+*/
+int sqlite3GetVarint32(const unsigned char *p, u32 *v){
+  u32 x;
+  int n;
+  unsigned char c;
+  if( ((signed char*)p)[0]>=0 ){
+    *v = p[0];
+    return 1;
+  }
+  x = p[0] & 0x7f;
+  if( ((signed char*)p)[1]>=0 ){
+    *v = (x<<7) | p[1];
+    return 2;
+  }
+  x = (x<<7) | (p[1] & 0x7f);
+  n = 2;
+  do{
+    x = (x<<7) | ((c = p[n++])&0x7f);
+  }while( (c & 0x80)!=0 && n<9 );
+  *v = x;
+  return n;
+}
+
+/*
+** Return the number of bytes that will be needed to store the given
+** 64-bit integer.
+*/
+int sqlite3VarintLen(u64 v){
+  int i = 0;
+  do{
+    i++;
+    v >>= 7;
+  }while( v!=0 && i<9 );
+  return i;
+}
+
+
+/*
+** Read or write a four-byte big-endian integer value.
+*/
+u32 sqlite3Get4byte(const u8 *p){
+  return (p[0]<<24) | (p[1]<<16) | (p[2]<<8) | p[3];
+}
+void sqlite3Put4byte(unsigned char *p, u32 v){
+  p[0] = v>>24;
+  p[1] = v>>16;
+  p[2] = v>>8;
+  p[3] = v;
+}
+
+
+
+#if !defined(SQLITE_OMIT_BLOB_LITERAL) || defined(SQLITE_HAS_CODEC) \
+    || defined(SQLITE_TEST)
+/*
+** Translate a single byte of Hex into an integer.
+*/
+static int hexToInt(int h){
+  if( h>='0' && h<='9' ){
+    return h - '0';
+  }else if( h>='a' && h<='f' ){
+    return h - 'a' + 10;
+  }else{
+    assert( h>='A' && h<='F' );
+    return h - 'A' + 10;
+  }
+}
+#endif /* !SQLITE_OMIT_BLOB_LITERAL || SQLITE_HAS_CODEC || SQLITE_TEST */
+
+#if !defined(SQLITE_OMIT_BLOB_LITERAL) || defined(SQLITE_HAS_CODEC)
+/*
+** Convert a BLOB literal of the form "x'hhhhhh'" into its binary
+** value.  Return a pointer to its binary value.  Space to hold the
+** binary value has been obtained from malloc and must be freed by
+** the calling routine.
+*/
+void *sqlite3HexToBlob(sqlite3 *db, const char *z, int n){
+  char *zBlob;
+  int i;
+
+  zBlob = (char *)sqlite3DbMallocRaw(db, n/2 + 1);
+  n--;
+  if( zBlob ){
+    for(i=0; i<n; i+=2){
+      zBlob[i/2] = (hexToInt(z[i])<<4) | hexToInt(z[i+1]);
+    }
+    zBlob[i/2] = 0;
+  }
+  return zBlob;
+}
+#endif /* !SQLITE_OMIT_BLOB_LITERAL || SQLITE_HAS_CODEC */
+
+
+/*
+** Change the sqlite.magic from SQLITE_MAGIC_OPEN to SQLITE_MAGIC_BUSY.
+** Return an error (non-zero) if the magic was not SQLITE_MAGIC_OPEN
+** when this routine is called.
+**
+** This routine is called when entering an SQLite API.  The SQLITE_MAGIC_OPEN
+** value indicates that the database connection passed into the API is
+** open and is not being used by another thread.  By changing the value
+** to SQLITE_MAGIC_BUSY we indicate that the connection is in use.
+** sqlite3SafetyOff() below will change the value back to SQLITE_MAGIC_OPEN
+** when the API exits.
+**
+** This routine is a attempt to detect if two threads use the
+** same sqlite* pointer at the same time.  There is a race
+** condition so it is possible that the error is not detected.
+** But usually the problem will be seen.  The result will be an
+** error which can be used to debug the application that is
+** using SQLite incorrectly.
+**
+** Ticket #202:  If db->magic is not a valid open value, take care not
+** to modify the db structure at all.  It could be that db is a stale
+** pointer.  In other words, it could be that there has been a prior
+** call to sqlite3_close(db) and db has been deallocated.  And we do
+** not want to write into deallocated memory.
+*/
+#ifdef SQLITE_DEBUG
+int sqlite3SafetyOn(sqlite3 *db){
+  if( db->magic==SQLITE_MAGIC_OPEN ){
+    db->magic = SQLITE_MAGIC_BUSY;
+    return 0;
+  }else if( db->magic==SQLITE_MAGIC_BUSY ){
+    db->magic = SQLITE_MAGIC_ERROR;
+    db->u1.isInterrupted = 1;
+  }
+  return 1;
+}
+#endif
+
+/*
+** Change the magic from SQLITE_MAGIC_BUSY to SQLITE_MAGIC_OPEN.
+** Return an error (non-zero) if the magic was not SQLITE_MAGIC_BUSY
+** when this routine is called.
+*/
+#ifdef SQLITE_DEBUG
+int sqlite3SafetyOff(sqlite3 *db){
+  if( db->magic==SQLITE_MAGIC_BUSY ){
+    db->magic = SQLITE_MAGIC_OPEN;
+    return 0;
+  }else{
+    db->magic = SQLITE_MAGIC_ERROR;
+    db->u1.isInterrupted = 1;
+    return 1;
+  }
+}
+#endif
+
+/*
+** Check to make sure we have a valid db pointer.  This test is not
+** foolproof but it does provide some measure of protection against
+** misuse of the interface such as passing in db pointers that are
+** NULL or which have been previously closed.  If this routine returns
+** 1 it means that the db pointer is valid and 0 if it should not be
+** dereferenced for any reason.  The calling function should invoke
+** SQLITE_MISUSE immediately.
+**
+** sqlite3SafetyCheckOk() requires that the db pointer be valid for
+** use.  sqlite3SafetyCheckSickOrOk() allows a db pointer that failed to
+** open properly and is not fit for general use but which can be
+** used as an argument to sqlite3_errmsg() or sqlite3_close().
+*/
+int sqlite3SafetyCheckOk(sqlite3 *db){
+  int magic;
+  if( db==0 ) return 0;
+  magic = db->magic;
+  if( magic!=SQLITE_MAGIC_OPEN &&
+      magic!=SQLITE_MAGIC_BUSY ) return 0;
+  return 1;
+}
+int sqlite3SafetyCheckSickOrOk(sqlite3 *db){
+  int magic;
+  if( db==0 ) return 0;
+  magic = db->magic;
+  if( magic!=SQLITE_MAGIC_SICK &&
+      magic!=SQLITE_MAGIC_OPEN &&
+      magic!=SQLITE_MAGIC_BUSY ) return 0;
+  return 1;
+}
diff --git a/uppsrc/plugin/sqlite3/lib/vacuum.c b/uppsrc/plugin/sqlite3/lib/vacuum.c
new file mode 100644
index 000000000..c06e973c5
--- /dev/null
+++ b/uppsrc/plugin/sqlite3/lib/vacuum.c
@@ -0,0 +1,263 @@
+/*
+** 2003 April 6
+**
+** The author disclaims copyright to this source code.  In place of
+** a legal notice, here is a blessing:
+**
+**    May you do good and not evil.
+**    May you find forgiveness for yourself and forgive others.
+**    May you share freely, never taking more than you give.
+**
+*************************************************************************
+** This file contains code used to implement the VACUUM command.
+**
+** Most of the code in this file may be omitted by defining the
+** SQLITE_OMIT_VACUUM macro.
+**
+** $Id: vacuum.c,v 1.76 2008/01/03 00:01:25 drh Exp $
+*/
+#include "sqliteInt.h"
+#include "vdbeInt.h"
+
+#if !defined(SQLITE_OMIT_VACUUM) && !defined(SQLITE_OMIT_ATTACH)
+/*
+** Execute zSql on database db. Return an error code.
+*/
+static int execSql(sqlite3 *db, const char *zSql){
+  sqlite3_stmt *pStmt;
+  if( !zSql ){
+    return SQLITE_NOMEM;
+  }
+  if( SQLITE_OK!=sqlite3_prepare(db, zSql, -1, &pStmt, 0) ){
+    return sqlite3_errcode(db);
+  }
+  while( SQLITE_ROW==sqlite3_step(pStmt) ){}
+  return sqlite3_finalize(pStmt);
+}
+
+/*
+** Execute zSql on database db. The statement returns exactly
+** one column. Execute this as SQL on the same database.
+*/
+static int execExecSql(sqlite3 *db, const char *zSql){
+  sqlite3_stmt *pStmt;
+  int rc;
+
+  rc = sqlite3_prepare(db, zSql, -1, &pStmt, 0);
+  if( rc!=SQLITE_OK ) return rc;
+
+  while( SQLITE_ROW==sqlite3_step(pStmt) ){
+    rc = execSql(db, (char*)sqlite3_column_text(pStmt, 0));
+    if( rc!=SQLITE_OK ){
+      sqlite3_finalize(pStmt);
+      return rc;
+    }
+  }
+
+  return sqlite3_finalize(pStmt);
+}
+
+/*
+** The non-standard VACUUM command is used to clean up the database,
+** collapse free space, etc.  It is modelled after the VACUUM command
+** in PostgreSQL.
+**
+** In version 1.0.x of SQLite, the VACUUM command would call
+** gdbm_reorganize() on all the database tables.  But beginning
+** with 2.0.0, SQLite no longer uses GDBM so this command has
+** become a no-op.
+*/
+void sqlite3Vacuum(Parse *pParse){
+  Vdbe *v = sqlite3GetVdbe(pParse);
+  if( v ){
+    sqlite3VdbeAddOp2(v, OP_Vacuum, 0, 0);
+  }
+  return;
+}
+
+/*
+** This routine implements the OP_Vacuum opcode of the VDBE.
+*/
+int sqlite3RunVacuum(char **pzErrMsg, sqlite3 *db){
+  int rc = SQLITE_OK;     /* Return code from service routines */
+  Btree *pMain;           /* The database being vacuumed */
+  Btree *pTemp;           /* The temporary database we vacuum into */
+  char *zSql = 0;         /* SQL statements */
+  int saved_flags;        /* Saved value of the db->flags */
+  Db *pDb = 0;            /* Database to detach at end of vacuum */
+
+  /* Save the current value of the write-schema flag before setting it. */
+  saved_flags = db->flags;
+  db->flags |= SQLITE_WriteSchema | SQLITE_IgnoreChecks;
+
+  if( !db->autoCommit ){
+    sqlite3SetString(pzErrMsg, "cannot VACUUM from within a transaction",
+       (char*)0);
+    rc = SQLITE_ERROR;
+    goto end_of_vacuum;
+  }
+  pMain = db->aDb[0].pBt;
+
+  /* Attach the temporary database as 'vacuum_db'. The synchronous pragma
+  ** can be set to 'off' for this file, as it is not recovered if a crash
+  ** occurs anyway. The integrity of the database is maintained by a
+  ** (possibly synchronous) transaction opened on the main database before
+  ** sqlite3BtreeCopyFile() is called.
+  **
+  ** An optimisation would be to use a non-journaled pager.
+  */
+  zSql = "ATTACH '' AS vacuum_db;";
+  rc = execSql(db, zSql);
+  if( rc!=SQLITE_OK ) goto end_of_vacuum;
+  pDb = &db->aDb[db->nDb-1];
+  assert( strcmp(db->aDb[db->nDb-1].zName,"vacuum_db")==0 );
+  pTemp = db->aDb[db->nDb-1].pBt;
+  sqlite3BtreeSetPageSize(pTemp, sqlite3BtreeGetPageSize(pMain),
+     sqlite3BtreeGetReserve(pMain));
+  if( db->mallocFailed ){
+    rc = SQLITE_NOMEM;
+    goto end_of_vacuum;
+  }
+  assert( sqlite3BtreeGetPageSize(pTemp)==sqlite3BtreeGetPageSize(pMain) );
+  rc = execSql(db, "PRAGMA vacuum_db.synchronous=OFF");
+  if( rc!=SQLITE_OK ){
+    goto end_of_vacuum;
+  }
+
+#ifndef SQLITE_OMIT_AUTOVACUUM
+  sqlite3BtreeSetAutoVacuum(pTemp, db->nextAutovac>=0 ? db->nextAutovac :
+                                           sqlite3BtreeGetAutoVacuum(pMain));
+#endif
+
+  /* Begin a transaction */
+  rc = execSql(db, "BEGIN EXCLUSIVE;");
+  if( rc!=SQLITE_OK ) goto end_of_vacuum;
+
+  /* Query the schema of the main database. Create a mirror schema
+  ** in the temporary database.
+  */
+  rc = execExecSql(db,
+      "SELECT 'CREATE TABLE vacuum_db.' || substr(sql,14) "
+      "  FROM sqlite_master WHERE type='table' AND name!='sqlite_sequence'"
+      "   AND rootpage>0"
+  );
+  if( rc!=SQLITE_OK ) goto end_of_vacuum;
+  rc = execExecSql(db,
+      "SELECT 'CREATE INDEX vacuum_db.' || substr(sql,14)"
+      "  FROM sqlite_master WHERE sql LIKE 'CREATE INDEX %' ");
+  if( rc!=SQLITE_OK ) goto end_of_vacuum;
+  rc = execExecSql(db,
+      "SELECT 'CREATE UNIQUE INDEX vacuum_db.' || substr(sql,21) "
+      "  FROM sqlite_master WHERE sql LIKE 'CREATE UNIQUE INDEX %'");
+  if( rc!=SQLITE_OK ) goto end_of_vacuum;
+
+  /* Loop through the tables in the main database. For each, do
+  ** an "INSERT INTO vacuum_db.xxx SELECT * FROM xxx;" to copy
+  ** the contents to the temporary database.
+  */
+  rc = execExecSql(db,
+      "SELECT 'INSERT INTO vacuum_db.' || quote(name) "
+      "|| ' SELECT * FROM ' || quote(name) || ';'"
+      "FROM sqlite_master "
+      "WHERE type = 'table' AND name!='sqlite_sequence' "
+      "  AND rootpage>0"
+
+  );
+  if( rc!=SQLITE_OK ) goto end_of_vacuum;
+
+  /* Copy over the sequence table
+  */
+  rc = execExecSql(db,
+      "SELECT 'DELETE FROM vacuum_db.' || quote(name) || ';' "
+      "FROM vacuum_db.sqlite_master WHERE name='sqlite_sequence' "
+  );
+  if( rc!=SQLITE_OK ) goto end_of_vacuum;
+  rc = execExecSql(db,
+      "SELECT 'INSERT INTO vacuum_db.' || quote(name) "
+      "|| ' SELECT * FROM ' || quote(name) || ';' "
+      "FROM vacuum_db.sqlite_master WHERE name=='sqlite_sequence';"
+  );
+  if( rc!=SQLITE_OK ) goto end_of_vacuum;
+
+
+  /* Copy the triggers, views, and virtual tables from the main database
+  ** over to the temporary database.  None of these objects has any
+  ** associated storage, so all we have to do is copy their entries
+  ** from the SQLITE_MASTER table.
+  */
+  rc = execSql(db,
+      "INSERT INTO vacuum_db.sqlite_master "
+      "  SELECT type, name, tbl_name, rootpage, sql"
+      "    FROM sqlite_master"
+      "   WHERE type='view' OR type='trigger'"
+      "      OR (type='table' AND rootpage=0)"
+  );
+  if( rc ) goto end_of_vacuum;
+
+  /* At this point, unless the main db was completely empty, there is now a
+  ** transaction open on the vacuum database, but not on the main database.
+  ** Open a btree level transaction on the main database. This allows a
+  ** call to sqlite3BtreeCopyFile(). The main database btree level
+  ** transaction is then committed, so the SQL level never knows it was
+  ** opened for writing. This way, the SQL transaction used to create the
+  ** temporary database never needs to be committed.
+  */
+  if( rc==SQLITE_OK ){
+    u32 meta;
+    int i;
+
+    /* This array determines which meta meta values are preserved in the
+    ** vacuum.  Even entries are the meta value number and odd entries
+    ** are an increment to apply to the meta value after the vacuum.
+    ** The increment is used to increase the schema cookie so that other
+    ** connections to the same database will know to reread the schema.
+    */
+    static const unsigned char aCopy[] = {
+       1, 1,    /* Add one to the old schema cookie */
+       3, 0,    /* Preserve the default page cache size */
+       5, 0,    /* Preserve the default text encoding */
+       6, 0,    /* Preserve the user version */
+    };
+
+    assert( 1==sqlite3BtreeIsInTrans(pTemp) );
+    assert( 1==sqlite3BtreeIsInTrans(pMain) );
+
+    /* Copy Btree meta values */
+    for(i=0; i<sizeof(aCopy)/sizeof(aCopy[0]); i+=2){
+      rc = sqlite3BtreeGetMeta(pMain, aCopy[i], &meta);
+      if( rc!=SQLITE_OK ) goto end_of_vacuum;
+      rc = sqlite3BtreeUpdateMeta(pTemp, aCopy[i], meta+aCopy[i+1]);
+      if( rc!=SQLITE_OK ) goto end_of_vacuum;
+    }
+
+    rc = sqlite3BtreeCopyFile(pMain, pTemp);
+    if( rc!=SQLITE_OK ) goto end_of_vacuum;
+    rc = sqlite3BtreeCommit(pTemp);
+    if( rc!=SQLITE_OK ) goto end_of_vacuum;
+    rc = sqlite3BtreeCommit(pMain);
+  }
+
+end_of_vacuum:
+  /* Restore the original value of db->flags */
+  db->flags = saved_flags;
+
+  /* Currently there is an SQL level transaction open on the vacuum
+  ** database. No locks are held on any other files (since the main file
+  ** was committed at the btree level). So it safe to end the transaction
+  ** by manually setting the autoCommit flag to true and detaching the
+  ** vacuum database. The vacuum_db journal file is deleted when the pager
+  ** is closed by the DETACH.
+  */
+  db->autoCommit = 1;
+
+  if( pDb ){
+    sqlite3BtreeClose(pDb->pBt);
+    pDb->pBt = 0;
+    pDb->pSchema = 0;
+  }
+
+  sqlite3ResetInternalSchema(db, 0);
+
+  return rc;
+}
+#endif  /* SQLITE_OMIT_VACUUM && SQLITE_OMIT_ATTACH */
diff --git a/uppsrc/plugin/sqlite3/lib/vdbe.c b/uppsrc/plugin/sqlite3/lib/vdbe.c
new file mode 100644
index 000000000..a90fbb2bf
--- /dev/null
+++ b/uppsrc/plugin/sqlite3/lib/vdbe.c
@@ -0,0 +1,4814 @@
+/*
+** 2001 September 15
+**
+** The author disclaims copyright to this source code.  In place of
+** a legal notice, here is a blessing:
+**
+**    May you do good and not evil.
+**    May you find forgiveness for yourself and forgive others.
+**    May you share freely, never taking more than you give.
+**
+*************************************************************************
+** The code in this file implements execution method of the
+** Virtual Database Engine (VDBE).  A separate file ("vdbeaux.c")
+** handles housekeeping details such as creating and deleting
+** VDBE instances.  This file is solely interested in executing
+** the VDBE program.
+**
+** In the external interface, an "sqlite3_stmt*" is an opaque pointer
+** to a VDBE.
+**
+** The SQL parser generates a program which is then executed by
+** the VDBE to do the work of the SQL statement.  VDBE programs are
+** similar in form to assembly language.  The program consists of
+** a linear sequence of operations.  Each operation has an opcode
+** and 5 operands.  Operands P1, P2, and P3 are integers.  Operand P4
+** is a null-terminated string.  Operand P5 is an unsigned character.
+** Few opcodes use all 5 operands.
+**
+** Computation results are stored on a set of registers numbered beginning
+** with 1 and going up to Vdbe.nMem.  Each register can store
+** either an integer, a null-terminated string, a floating point
+** number, or the SQL "NULL" value.  An inplicit conversion from one
+** type to the other occurs as necessary.
+**
+** Most of the code in this file is taken up by the sqlite3VdbeExec()
+** function which does the work of interpreting a VDBE program.
+** But other routines are also provided to help in building up
+** a program instruction by instruction.
+**
+** Various scripts scan this source file in order to generate HTML
+** documentation, headers files, or other derived files.  The formatting
+** of the code in this file is, therefore, important.  See other comments
+** in this file for details.  If in doubt, do not deviate from existing
+** commenting and indentation practices when changing or adding code.
+**
+** $Id: vdbe.c,v 1.711 2008/03/17 17:18:38 drh Exp $
+*/
+#include "sqliteInt.h"
+#include <ctype.h>
+#include "vdbeInt.h"
+
+/*
+** The following global variable is incremented every time a cursor
+** moves, either by the OP_MoveXX, OP_Next, or OP_Prev opcodes.  The test
+** procedures use this information to make sure that indices are
+** working correctly.  This variable has no function other than to
+** help verify the correct operation of the library.
+*/
+#ifdef SQLITE_TEST
+int sqlite3_search_count = 0;
+#endif
+
+/*
+** When this global variable is positive, it gets decremented once before
+** each instruction in the VDBE.  When reaches zero, the u1.isInterrupted
+** field of the sqlite3 structure is set in order to simulate and interrupt.
+**
+** This facility is used for testing purposes only.  It does not function
+** in an ordinary build.
+*/
+#ifdef SQLITE_TEST
+int sqlite3_interrupt_count = 0;
+#endif
+
+/*
+** The next global variable is incremented each type the OP_Sort opcode
+** is executed.  The test procedures use this information to make sure that
+** sorting is occurring or not occuring at appropriate times.   This variable
+** has no function other than to help verify the correct operation of the
+** library.
+*/
+#ifdef SQLITE_TEST
+int sqlite3_sort_count = 0;
+#endif
+
+/*
+** The next global variable records the size of the largest MEM_Blob
+** or MEM_Str that has been used by a VDBE opcode.  The test procedures
+** use this information to make sure that the zero-blob functionality
+** is working correctly.   This variable has no function other than to
+** help verify the correct operation of the library.
+*/
+#ifdef SQLITE_TEST
+int sqlite3_max_blobsize = 0;
+static void updateMaxBlobsize(Mem *p){
+  if( (p->flags & (MEM_Str|MEM_Blob))!=0 && p->n>sqlite3_max_blobsize ){
+    sqlite3_max_blobsize = p->n;
+  }
+}
+#endif
+
+/*
+** Test a register to see if it exceeds the current maximum blob size.
+** If it does, record the new maximum blob size.
+*/
+#ifdef SQLITE_TEST
+# define UPDATE_MAX_BLOBSIZE(P)  updateMaxBlobsize(P)
+#else
+# define UPDATE_MAX_BLOBSIZE(P)
+#endif
+
+/*
+** Release the memory associated with a register.  This
+** leaves the Mem.flags field in an inconsistent state.
+*/
+#define Release(P) if((P)->flags&MEM_Dyn){ sqlite3VdbeMemRelease(P); }
+
+/*
+** Convert the given register into a string if it isn't one
+** already. Return non-zero if a malloc() fails.
+*/
+#define Stringify(P, enc) \
+   if(((P)->flags&(MEM_Str|MEM_Blob))==0 && sqlite3VdbeMemStringify(P,enc)) \
+     { goto no_mem; }
+
+/*
+** The header of a record consists of a sequence variable-length integers.
+** These integers are almost always small and are encoded as a single byte.
+** The following macro takes advantage this fact to provide a fast decode
+** of the integers in a record header.  It is faster for the common case
+** where the integer is a single byte.  It is a little slower when the
+** integer is two or more bytes.  But overall it is faster.
+**
+** The following expressions are equivalent:
+**
+**     x = sqlite3GetVarint32( A, &B );
+**
+**     x = GetVarint( A, B );
+**
+*/
+#define GetVarint(A,B)  ((B = *(A))<=0x7f ? 1 : sqlite3GetVarint32(A, &B))
+
+/*
+** An ephemeral string value (signified by the MEM_Ephem flag) contains
+** a pointer to a dynamically allocated string where some other entity
+** is responsible for deallocating that string.  Because the register
+** does not control the string, it might be deleted without the register
+** knowing it.
+**
+** This routine converts an ephemeral string into a dynamically allocated
+** string that the register itself controls.  In other words, it
+** converts an MEM_Ephem string into an MEM_Dyn string.
+*/
+#define Deephemeralize(P) \
+   if( ((P)->flags&MEM_Ephem)!=0 \
+       && sqlite3VdbeMemMakeWriteable(P) ){ goto no_mem;}
+
+/*
+** Call sqlite3VdbeMemExpandBlob() on the supplied value (type Mem*)
+** P if required.
+*/
+#define ExpandBlob(P) (((P)->flags&MEM_Zero)?sqlite3VdbeMemExpandBlob(P):0)
+
+/*
+** Argument pMem points at a regiser that will be passed to a
+** user-defined function or returned to the user as the result of a query.
+** The second argument, 'db_enc' is the text encoding used by the vdbe for
+** register variables.  This routine sets the pMem->enc and pMem->type
+** variables used by the sqlite3_value_*() routines.
+*/
+#define storeTypeInfo(A,B) _storeTypeInfo(A)
+static void _storeTypeInfo(Mem *pMem){
+  int flags = pMem->flags;
+  if( flags & MEM_Null ){
+    pMem->type = SQLITE_NULL;
+  }
+  else if( flags & MEM_Int ){
+    pMem->type = SQLITE_INTEGER;
+  }
+  else if( flags & MEM_Real ){
+    pMem->type = SQLITE_FLOAT;
+  }
+  else if( flags & MEM_Str ){
+    pMem->type = SQLITE_TEXT;
+  }else{
+    pMem->type = SQLITE_BLOB;
+  }
+}
+
+/*
+** Properties of opcodes.  The OPFLG_INITIALIZER macro is
+** created by mkopcodeh.awk during compilation.  Data is obtained
+** from the comments following the "case OP_xxxx:" statements in
+** this file.
+*/
+static unsigned char opcodeProperty[] = OPFLG_INITIALIZER;
+
+/*
+** Return true if an opcode has any of the OPFLG_xxx properties
+** specified by mask.
+*/
+int sqlite3VdbeOpcodeHasProperty(int opcode, int mask){
+  assert( opcode>0 && opcode<sizeof(opcodeProperty) );
+  return (opcodeProperty[opcode]&mask)!=0;
+}
+
+/*
+** Allocate cursor number iCur.  Return a pointer to it.  Return NULL
+** if we run out of memory.
+*/
+static Cursor *allocateCursor(Vdbe *p, int iCur, int iDb){
+  Cursor *pCx;
+  assert( iCur<p->nCursor );
+  if( p->apCsr[iCur] ){
+    sqlite3VdbeFreeCursor(p, p->apCsr[iCur]);
+  }
+  p->apCsr[iCur] = pCx = sqlite3MallocZero( sizeof(Cursor) );
+  if( pCx ){
+    pCx->iDb = iDb;
+  }
+  return pCx;
+}
+
+/*
+** Try to convert a value into a numeric representation if we can
+** do so without loss of information.  In other words, if the string
+** looks like a number, convert it into a number.  If it does not
+** look like a number, leave it alone.
+*/
+static void applyNumericAffinity(Mem *pRec){
+  if( (pRec->flags & (MEM_Real|MEM_Int))==0 ){
+    int realnum;
+    sqlite3VdbeMemNulTerminate(pRec);
+    if( (pRec->flags&MEM_Str)
+         && sqlite3IsNumber(pRec->z, &realnum, pRec->enc) ){
+      i64 value;
+      sqlite3VdbeChangeEncoding(pRec, SQLITE_UTF8);
+      if( !realnum && sqlite3Atoi64(pRec->z, &value) ){
+        pRec->u.i = value;
+        MemSetTypeFlag(pRec, MEM_Int);
+      }else{
+        sqlite3VdbeMemRealify(pRec);
+      }
+    }
+  }
+}
+
+/*
+** Processing is determine by the affinity parameter:
+**
+** SQLITE_AFF_INTEGER:
+** SQLITE_AFF_REAL:
+** SQLITE_AFF_NUMERIC:
+**    Try to convert pRec to an integer representation or a
+**    floating-point representation if an integer representation
+**    is not possible.  Note that the integer representation is
+**    always preferred, even if the affinity is REAL, because
+**    an integer representation is more space efficient on disk.
+**
+** SQLITE_AFF_TEXT:
+**    Convert pRec to a text representation.
+**
+** SQLITE_AFF_NONE:
+**    No-op.  pRec is unchanged.
+*/
+static void applyAffinity(
+  Mem *pRec,          /* The value to apply affinity to */
+  char affinity,      /* The affinity to be applied */
+  u8 enc              /* Use this text encoding */
+){
+  if( affinity==SQLITE_AFF_TEXT ){
+    /* Only attempt the conversion to TEXT if there is an integer or real
+    ** representation (blob and NULL do not get converted) but no string
+    ** representation.
+    */
+    if( 0==(pRec->flags&MEM_Str) && (pRec->flags&(MEM_Real|MEM_Int)) ){
+      sqlite3VdbeMemStringify(pRec, enc);
+    }
+    pRec->flags &= ~(MEM_Real|MEM_Int);
+  }else if( affinity!=SQLITE_AFF_NONE ){
+    assert( affinity==SQLITE_AFF_INTEGER || affinity==SQLITE_AFF_REAL
+             || affinity==SQLITE_AFF_NUMERIC );
+    applyNumericAffinity(pRec);
+    if( pRec->flags & MEM_Real ){
+      sqlite3VdbeIntegerAffinity(pRec);
+    }
+  }
+}
+
+/*
+** Try to convert the type of a function argument or a result column
+** into a numeric representation.  Use either INTEGER or REAL whichever
+** is appropriate.  But only do the conversion if it is possible without
+** loss of information and return the revised type of the argument.
+**
+** This is an EXPERIMENTAL api and is subject to change or removal.
+*/
+int sqlite3_value_numeric_type(sqlite3_value *pVal){
+  Mem *pMem = (Mem*)pVal;
+  applyNumericAffinity(pMem);
+  storeTypeInfo(pMem, 0);
+  return pMem->type;
+}
+
+/*
+** Exported version of applyAffinity(). This one works on sqlite3_value*,
+** not the internal Mem* type.
+*/
+void sqlite3ValueApplyAffinity(
+  sqlite3_value *pVal,
+  u8 affinity,
+  u8 enc
+){
+  applyAffinity((Mem *)pVal, affinity, enc);
+}
+
+#ifdef SQLITE_DEBUG
+/*
+** Write a nice string representation of the contents of cell pMem
+** into buffer zBuf, length nBuf.
+*/
+void sqlite3VdbeMemPrettyPrint(Mem *pMem, char *zBuf){
+  char *zCsr = zBuf;
+  int f = pMem->flags;
+
+  static const char *const encnames[] = {"(X)", "(8)", "(16LE)", "(16BE)"};
+
+  if( f&MEM_Blob ){
+    int i;
+    char c;
+    if( f & MEM_Dyn ){
+      c = 'z';
+      assert( (f & (MEM_Static|MEM_Ephem))==0 );
+    }else if( f & MEM_Static ){
+      c = 't';
+      assert( (f & (MEM_Dyn|MEM_Ephem))==0 );
+    }else if( f & MEM_Ephem ){
+      c = 'e';
+      assert( (f & (MEM_Static|MEM_Dyn))==0 );
+    }else{
+      c = 's';
+    }
+
+    sqlite3_snprintf(100, zCsr, "%c", c);
+    zCsr += strlen(zCsr);
+    sqlite3_snprintf(100, zCsr, "%d[", pMem->n);
+    zCsr += strlen(zCsr);
+    for(i=0; i<16 && i<pMem->n; i++){
+      sqlite3_snprintf(100, zCsr, "%02X", ((int)pMem->z[i] & 0xFF));
+      zCsr += strlen(zCsr);
+    }
+    for(i=0; i<16 && i<pMem->n; i++){
+      char z = pMem->z[i];
+      if( z<32 || z>126 ) *zCsr++ = '.';
+      else *zCsr++ = z;
+    }
+
+    sqlite3_snprintf(100, zCsr, "]%s", encnames[pMem->enc]);
+    zCsr += strlen(zCsr);
+    if( f & MEM_Zero ){
+      sqlite3_snprintf(100, zCsr,"+%lldz",pMem->u.i);
+      zCsr += strlen(zCsr);
+    }
+    *zCsr = '\0';
+  }else if( f & MEM_Str ){
+    int j, k;
+    zBuf[0] = ' ';
+    if( f & MEM_Dyn ){
+      zBuf[1] = 'z';
+      assert( (f & (MEM_Static|MEM_Ephem))==0 );
+    }else if( f & MEM_Static ){
+      zBuf[1] = 't';
+      assert( (f & (MEM_Dyn|MEM_Ephem))==0 );
+    }else if( f & MEM_Ephem ){
+      zBuf[1] = 'e';
+      assert( (f & (MEM_Static|MEM_Dyn))==0 );
+    }else{
+      zBuf[1] = 's';
+    }
+    k = 2;
+    sqlite3_snprintf(100, &zBuf[k], "%d", pMem->n);
+    k += strlen(&zBuf[k]);
+    zBuf[k++] = '[';
+    for(j=0; j<15 && j<pMem->n; j++){
+      u8 c = pMem->z[j];
+      if( c>=0x20 && c<0x7f ){
+        zBuf[k++] = c;
+      }else{
+        zBuf[k++] = '.';
+      }
+    }
+    zBuf[k++] = ']';
+    sqlite3_snprintf(100,&zBuf[k], encnames[pMem->enc]);
+    k += strlen(&zBuf[k]);
+    zBuf[k++] = 0;
+  }
+}
+#endif
+
+#ifdef SQLITE_DEBUG
+/*
+** Print the value of a register for tracing purposes:
+*/
+static void memTracePrint(FILE *out, Mem *p){
+  if( p->flags & MEM_Null ){
+    fprintf(out, " NULL");
+  }else if( (p->flags & (MEM_Int|MEM_Str))==(MEM_Int|MEM_Str) ){
+    fprintf(out, " si:%lld", p->u.i);
+  }else if( p->flags & MEM_Int ){
+    fprintf(out, " i:%lld", p->u.i);
+  }else if( p->flags & MEM_Real ){
+    fprintf(out, " r:%g", p->r);
+  }else{
+    char zBuf[200];
+    sqlite3VdbeMemPrettyPrint(p, zBuf);
+    fprintf(out, " ");
+    fprintf(out, "%s", zBuf);
+  }
+}
+static void registerTrace(FILE *out, int iReg, Mem *p){
+  fprintf(out, "REG[%d] = ", iReg);
+  memTracePrint(out, p);
+  fprintf(out, "\n");
+}
+#endif
+
+#ifdef SQLITE_DEBUG
+#  define REGISTER_TRACE(R,M) if(p->trace&&R>0)registerTrace(p->trace,R,M)
+#else
+#  define REGISTER_TRACE(R,M)
+#endif
+
+
+#ifdef VDBE_PROFILE
+/*
+** The following routine only works on pentium-class processors.
+** It uses the RDTSC opcode to read the cycle count value out of the
+** processor and returns that value.  This can be used for high-res
+** profiling.
+*/
+__inline__ unsigned long long int hwtime(void){
+  unsigned long long int x;
+  __asm__("rdtsc\n\t"
+          "mov %%edx, %%ecx\n\t"
+          :"=A" (x));
+  return x;
+}
+#endif
+
+/*
+** The CHECK_FOR_INTERRUPT macro defined here looks to see if the
+** sqlite3_interrupt() routine has been called.  If it has been, then
+** processing of the VDBE program is interrupted.
+**
+** This macro added to every instruction that does a jump in order to
+** implement a loop.  This test used to be on every single instruction,
+** but that meant we more testing that we needed.  By only testing the
+** flag on jump instructions, we get a (small) speed improvement.
+*/
+#define CHECK_FOR_INTERRUPT \
+   if( db->u1.isInterrupted ) goto abort_due_to_interrupt;
+
+
+/*
+** Execute as much of a VDBE program as we can then return.
+**
+** sqlite3VdbeMakeReady() must be called before this routine in order to
+** close the program with a final OP_Halt and to set up the callbacks
+** and the error message pointer.
+**
+** Whenever a row or result data is available, this routine will either
+** invoke the result callback (if there is one) or return with
+** SQLITE_ROW.
+**
+** If an attempt is made to open a locked database, then this routine
+** will either invoke the busy callback (if there is one) or it will
+** return SQLITE_BUSY.
+**
+** If an error occurs, an error message is written to memory obtained
+** from sqlite3_malloc() and p->zErrMsg is made to point to that memory.
+** The error code is stored in p->rc and this routine returns SQLITE_ERROR.
+**
+** If the callback ever returns non-zero, then the program exits
+** immediately.  There will be no error message but the p->rc field is
+** set to SQLITE_ABORT and this routine will return SQLITE_ERROR.
+**
+** A memory allocation error causes p->rc to be set to SQLITE_NOMEM and this
+** routine to return SQLITE_ERROR.
+**
+** Other fatal errors return SQLITE_ERROR.
+**
+** After this routine has finished, sqlite3VdbeFinalize() should be
+** used to clean up the mess that was left behind.
+*/
+int sqlite3VdbeExec(
+  Vdbe *p                    /* The VDBE */
+){
+  int pc;                    /* The program counter */
+  Op *pOp;                   /* Current operation */
+  int rc = SQLITE_OK;        /* Value to return */
+  sqlite3 *db = p->db;       /* The database */
+  u8 encoding = ENC(db);     /* The database encoding */
+  Mem *pIn1, *pIn2, *pIn3;   /* Input operands */
+  Mem *pOut;                 /* Output operand */
+  u8 opProperty;
+#ifdef VDBE_PROFILE
+  unsigned long long start;  /* CPU clock count at start of opcode */
+  int origPc;                /* Program counter at start of opcode */
+#endif
+#ifndef SQLITE_OMIT_PROGRESS_CALLBACK
+  int nProgressOps = 0;      /* Opcodes executed since progress callback. */
+#endif
+
+  assert( p->magic==VDBE_MAGIC_RUN );  /* sqlite3_step() verifies this */
+  assert( db->magic==SQLITE_MAGIC_BUSY );
+  sqlite3BtreeMutexArrayEnter(&p->aMutex);
+  if( p->rc==SQLITE_NOMEM ){
+    /* This happens if a malloc() inside a call to sqlite3_column_text() or
+    ** sqlite3_column_text16() failed.  */
+    goto no_mem;
+  }
+  assert( p->rc==SQLITE_OK || p->rc==SQLITE_BUSY );
+  p->rc = SQLITE_OK;
+  assert( p->explain==0 );
+  p->pResultSet = 0;
+  db->busyHandler.nBusy = 0;
+  CHECK_FOR_INTERRUPT;
+  sqlite3VdbeIOTraceSql(p);
+#ifdef SQLITE_DEBUG
+  if( p->pc==0 && ((p->db->flags & SQLITE_VdbeListing)!=0
+    || sqlite3OsAccess(db->pVfs, "vdbe_explain", SQLITE_ACCESS_EXISTS))
+  ){
+    int i;
+    printf("VDBE Program Listing:\n");
+    sqlite3VdbePrintSql(p);
+    for(i=0; i<p->nOp; i++){
+      sqlite3VdbePrintOp(stdout, i, &p->aOp[i]);
+    }
+  }
+  if( sqlite3OsAccess(db->pVfs, "vdbe_trace", SQLITE_ACCESS_EXISTS) ){
+    p->trace = stdout;
+  }
+#endif
+  for(pc=p->pc; rc==SQLITE_OK; pc++){
+    assert( pc>=0 && pc<p->nOp );
+    if( db->mallocFailed ) goto no_mem;
+#ifdef VDBE_PROFILE
+    origPc = pc;
+    start = hwtime();
+#endif
+    pOp = &p->aOp[pc];
+
+    /* Only allow tracing if SQLITE_DEBUG is defined.
+    */
+#ifdef SQLITE_DEBUG
+    if( p->trace ){
+      if( pc==0 ){
+        printf("VDBE Execution Trace:\n");
+        sqlite3VdbePrintSql(p);
+      }
+      sqlite3VdbePrintOp(p->trace, pc, pOp);
+    }
+    if( p->trace==0 && pc==0
+     && sqlite3OsAccess(db->pVfs, "vdbe_sqltrace", SQLITE_ACCESS_EXISTS) ){
+      sqlite3VdbePrintSql(p);
+    }
+#endif
+
+
+    /* Check to see if we need to simulate an interrupt.  This only happens
+    ** if we have a special test build.
+    */
+#ifdef SQLITE_TEST
+    if( sqlite3_interrupt_count>0 ){
+      sqlite3_interrupt_count--;
+      if( sqlite3_interrupt_count==0 ){
+        sqlite3_interrupt(db);
+      }
+    }
+#endif
+
+#ifndef SQLITE_OMIT_PROGRESS_CALLBACK
+    /* Call the progress callback if it is configured and the required number
+    ** of VDBE ops have been executed (either since this invocation of
+    ** sqlite3VdbeExec() or since last time the progress callback was called).
+    ** If the progress callback returns non-zero, exit the virtual machine with
+    ** a return code SQLITE_ABORT.
+    */
+    if( db->xProgress ){
+      if( db->nProgressOps==nProgressOps ){
+        int prc;
+        if( sqlite3SafetyOff(db) ) goto abort_due_to_misuse;
+        prc =db->xProgress(db->pProgressArg);
+        if( sqlite3SafetyOn(db) ) goto abort_due_to_misuse;
+        if( prc!=0 ){
+          rc = SQLITE_INTERRUPT;
+          goto vdbe_error_halt;
+        }
+        nProgressOps = 0;
+      }
+      nProgressOps++;
+    }
+#endif
+
+    /* Do common setup processing for any opcode that is marked
+    ** with the "out2-prerelease" tag.  Such opcodes have a single
+    ** output which is specified by the P2 parameter.  The P2 register
+    ** is initialized to a NULL.
+    */
+    opProperty = opcodeProperty[pOp->opcode];
+    if( (opProperty & OPFLG_OUT2_PRERELEASE)!=0 ){
+      assert( pOp->p2>0 );
+      assert( pOp->p2<=p->nMem );
+      pOut = &p->aMem[pOp->p2];
+      sqlite3VdbeMemRelease(pOut);
+      pOut->flags = MEM_Null;
+    }else
+
+    /* Do common setup for opcodes marked with one of the following
+    ** combinations of properties.
+    **
+    **           in1
+    **           in1 in2
+    **           in1 in2 out3
+    **           in1 in3
+    **
+    ** Variables pIn1, pIn2, and pIn3 are made to point to appropriate
+    ** registers for inputs.  Variable pOut points to the output register.
+    */
+    if( (opProperty & OPFLG_IN1)!=0 ){
+      assert( pOp->p1>0 );
+      assert( pOp->p1<=p->nMem );
+      pIn1 = &p->aMem[pOp->p1];
+      REGISTER_TRACE(pOp->p1, pIn1);
+      if( (opProperty & OPFLG_IN2)!=0 ){
+        assert( pOp->p2>0 );
+        assert( pOp->p2<=p->nMem );
+        pIn2 = &p->aMem[pOp->p2];
+        REGISTER_TRACE(pOp->p2, pIn2);
+        if( (opProperty & OPFLG_OUT3)!=0 ){
+          assert( pOp->p3>0 );
+          assert( pOp->p3<=p->nMem );
+          pOut = &p->aMem[pOp->p3];
+        }
+      }else if( (opProperty & OPFLG_IN3)!=0 ){
+        assert( pOp->p3>0 );
+        assert( pOp->p3<=p->nMem );
+        pIn3 = &p->aMem[pOp->p3];
+        REGISTER_TRACE(pOp->p3, pIn3);
+      }
+    }else if( (opProperty & OPFLG_IN2)!=0 ){
+      assert( pOp->p2>0 );
+      assert( pOp->p2<=p->nMem );
+      pIn2 = &p->aMem[pOp->p2];
+      REGISTER_TRACE(pOp->p2, pIn2);
+    }else if( (opProperty & OPFLG_IN3)!=0 ){
+      assert( pOp->p3>0 );
+      assert( pOp->p3<=p->nMem );
+      pIn3 = &p->aMem[pOp->p3];
+      REGISTER_TRACE(pOp->p3, pIn3);
+    }
+
+    switch( pOp->opcode ){
+
+/*****************************************************************************
+** What follows is a massive switch statement where each case implements a
+** separate instruction in the virtual machine.  If we follow the usual
+** indentation conventions, each case should be indented by 6 spaces.  But
+** that is a lot of wasted space on the left margin.  So the code within
+** the switch statement will break with convention and be flush-left. Another
+** big comment (similar to this one) will mark the point in the code where
+** we transition back to normal indentation.
+**
+** The formatting of each case is important.  The makefile for SQLite
+** generates two C files "opcodes.h" and "opcodes.c" by scanning this
+** file looking for lines that begin with "case OP_".  The opcodes.h files
+** will be filled with #defines that give unique integer values to each
+** opcode and the opcodes.c file is filled with an array of strings where
+** each string is the symbolic name for the corresponding opcode.  If the
+** case statement is followed by a comment of the form "/# same as ... #/"
+** that comment is used to determine the particular value of the opcode.
+**
+** Other keywords in the comment that follows each case are used to
+** construct the OPFLG_INITIALIZER value that initializes opcodeProperty[].
+** Keywords include: in1, in2, in3, out2_prerelease, out2, out3.  See
+** the mkopcodeh.awk script for additional information.
+**
+** Documentation about VDBE opcodes is generated by scanning this file
+** for lines of that contain "Opcode:".  That line and all subsequent
+** comment lines are used in the generation of the opcode.html documentation
+** file.
+**
+** SUMMARY:
+**
+**     Formatting is important to scripts that scan this file.
+**     Do not deviate from the formatting style currently in use.
+**
+*****************************************************************************/
+
+/* Opcode:  Goto * P2 * * *
+**
+** An unconditional jump to address P2.
+** The next instruction executed will be
+** the one at index P2 from the beginning of
+** the program.
+*/
+case OP_Goto: {             /* jump */
+  CHECK_FOR_INTERRUPT;
+  pc = pOp->p2 - 1;
+  break;
+}
+
+/* Opcode:  Gosub * P2 * * *
+**
+** Push the current address plus 1 onto the return address stack
+** and then jump to address P2.
+**
+** The return address stack is of limited depth.  If too many
+** OP_Gosub operations occur without intervening OP_Returns, then
+** the return address stack will fill up and processing will abort
+** with a fatal error.
+*/
+case OP_Gosub: {            /* jump */
+  assert( p->returnDepth<sizeof(p->returnStack)/sizeof(p->returnStack[0]) );
+  p->returnStack[p->returnDepth++] = pc+1;
+  pc = pOp->p2 - 1;
+  break;
+}
+
+/* Opcode:  Return * * * * *
+**
+** Jump immediately to the next instruction after the last unreturned
+** OP_Gosub.  If an OP_Return has occurred for all OP_Gosubs, then
+** processing aborts with a fatal error.
+*/
+case OP_Return: {
+  assert( p->returnDepth>0 );
+  p->returnDepth--;
+  pc = p->returnStack[p->returnDepth] - 1;
+  break;
+}
+
+/* Opcode:  Halt P1 P2 * P4 *
+**
+** Exit immediately.  All open cursors, Fifos, etc are closed
+** automatically.
+**
+** P1 is the result code returned by sqlite3_exec(), sqlite3_reset(),
+** or sqlite3_finalize().  For a normal halt, this should be SQLITE_OK (0).
+** For errors, it can be some other value.  If P1!=0 then P2 will determine
+** whether or not to rollback the current transaction.  Do not rollback
+** if P2==OE_Fail. Do the rollback if P2==OE_Rollback.  If P2==OE_Abort,
+** then back out all changes that have occurred during this execution of the
+** VDBE, but do not rollback the transaction.
+**
+** If P4 is not null then it is an error message string.
+**
+** There is an implied "Halt 0 0 0" instruction inserted at the very end of
+** every program.  So a jump past the last instruction of the program
+** is the same as executing Halt.
+*/
+case OP_Halt: {
+  p->rc = pOp->p1;
+  p->pc = pc;
+  p->errorAction = pOp->p2;
+  if( pOp->p4.z ){
+    sqlite3SetString(&p->zErrMsg, pOp->p4.z, (char*)0);
+  }
+  rc = sqlite3VdbeHalt(p);
+  assert( rc==SQLITE_BUSY || rc==SQLITE_OK );
+  if( rc==SQLITE_BUSY ){
+    p->rc = rc = SQLITE_BUSY;
+  }else{
+    rc = p->rc ? SQLITE_ERROR : SQLITE_DONE;
+  }
+  goto vdbe_return;
+}
+
+/* Opcode: Integer P1 P2 * * *
+**
+** The 32-bit integer value P1 is written into register P2.
+*/
+case OP_Integer: {         /* out2-prerelease */
+  pOut->flags = MEM_Int;
+  pOut->u.i = pOp->p1;
+  break;
+}
+
+/* Opcode: Int64 * P2 * P4 *
+**
+** P4 is a pointer to a 64-bit integer value.
+** Write that value into register P2.
+*/
+case OP_Int64: {           /* out2-prerelease */
+  assert( pOp->p4.pI64!=0 );
+  pOut->flags = MEM_Int;
+  pOut->u.i = *pOp->p4.pI64;
+  break;
+}
+
+/* Opcode: Real * P2 * P4 *
+**
+** P4 is a pointer to a 64-bit floating point value.
+** Write that value into register P2.
+*/
+case OP_Real: {            /* same as TK_FLOAT, out2-prerelease */
+  pOut->flags = MEM_Real;
+  pOut->r = *pOp->p4.pReal;
+  break;
+}
+
+/* Opcode: String8 * P2 * P4 *
+**
+** P4 points to a nul terminated UTF-8 string. This opcode is transformed
+** into an OP_String before it is executed for the first time.
+*/
+case OP_String8: {         /* same as TK_STRING, out2-prerelease */
+  assert( pOp->p4.z!=0 );
+  pOp->opcode = OP_String;
+  pOp->p1 = strlen(pOp->p4.z);
+
+#ifndef SQLITE_OMIT_UTF16
+  if( encoding!=SQLITE_UTF8 ){
+    sqlite3VdbeMemSetStr(pOut, pOp->p4.z, -1, SQLITE_UTF8, SQLITE_STATIC);
+    if( SQLITE_OK!=sqlite3VdbeChangeEncoding(pOut, encoding) ) goto no_mem;
+    if( SQLITE_OK!=sqlite3VdbeMemDynamicify(pOut) ) goto no_mem;
+    pOut->flags &= ~(MEM_Dyn);
+    pOut->flags |= MEM_Static;
+    if( pOp->p4type==P4_DYNAMIC ){
+      sqlite3_free(pOp->p4.z);
+    }
+    pOp->p4type = P4_DYNAMIC;
+    pOp->p4.z = pOut->z;
+    pOp->p1 = pOut->n;
+    if( pOp->p1>SQLITE_MAX_LENGTH ){
+      goto too_big;
+    }
+    UPDATE_MAX_BLOBSIZE(pOut);
+    break;
+  }
+#endif
+  if( pOp->p1>SQLITE_MAX_LENGTH ){
+    goto too_big;
+  }
+  /* Fall through to the next case, OP_String */
+}
+
+/* Opcode: String P1 P2 * P4 *
+**
+** The string value P4 of length P1 (bytes) is stored in register P2.
+*/
+case OP_String: {          /* out2-prerelease */
+  assert( pOp->p4.z!=0 );
+  pOut->flags = MEM_Str|MEM_Static|MEM_Term;
+  pOut->z = pOp->p4.z;
+  pOut->n = pOp->p1;
+  pOut->enc = encoding;
+  UPDATE_MAX_BLOBSIZE(pOut);
+  break;
+}
+
+/* Opcode: Null * P2 * * *
+**
+** Write a NULL into register P2.
+*/
+case OP_Null: {           /* out2-prerelease */
+  break;
+}
+
+
+#ifndef SQLITE_OMIT_BLOB_LITERAL
+/* Opcode: Blob P1 P2 * P4
+**
+** P4 points to a blob of data P1 bytes long.  Store this
+** blob in register P2. This instruction is not coded directly
+** by the compiler. Instead, the compiler layer specifies
+** an OP_HexBlob opcode, with the hex string representation of
+** the blob as P4. This opcode is transformed to an OP_Blob
+** the first time it is executed.
+*/
+case OP_Blob: {                /* out2-prerelease */
+  assert( pOp->p1 <= SQLITE_MAX_LENGTH );
+  sqlite3VdbeMemSetStr(pOut, pOp->p4.z, pOp->p1, 0, 0);
+  pOut->enc = encoding;
+  UPDATE_MAX_BLOBSIZE(pOut);
+  break;
+}
+#endif /* SQLITE_OMIT_BLOB_LITERAL */
+
+/* Opcode: Variable P1 P2 * * *
+**
+** The value of variable P1 is written into register P2. A variable is
+** an unknown in the original SQL string as handed to sqlite3_compile().
+** Any occurance of the '?' character in the original SQL is considered
+** a variable.  Variables in the SQL string are number from left to
+** right beginning with 1.  The values of variables are set using the
+** sqlite3_bind() API.
+*/
+case OP_Variable: {           /* out2-prerelease */
+  int j = pOp->p1 - 1;
+  Mem *pVar;
+  assert( j>=0 && j<p->nVar );
+
+  pVar = &p->aVar[j];
+  if( sqlite3VdbeMemTooBig(pVar) ){
+    goto too_big;
+  }
+  sqlite3VdbeMemShallowCopy(pOut, &p->aVar[j], MEM_Static);
+  UPDATE_MAX_BLOBSIZE(pOut);
+  break;
+}
+
+/* Opcode: Move P1 P2 * * *
+**
+** Move the value in register P1 over into register P2.  Register P1
+** is left holding a NULL.  It is an error for P1 and P2 to be the
+** same register.
+*/
+/* Opcode: Copy P1 P2 * * *
+**
+** Make a copy of register P1 into register P2.
+**
+** This instruction makes a deep copy of the value.  A duplicate
+** is made of any string or blob constant.  See also OP_SCopy.
+*/
+/* Opcode: SCopy P1 P2 * * *
+**
+** Make a shallow copy of register P1 into register P2.
+**
+** This instruction makes a shallow copy of the value.  If the value
+** is a string or blob, then the copy is only a pointer to the
+** original and hence if the original changes so will the copy.
+** Worse, if the original is deallocated, the copy becomes invalid.
+** Thus the program must guarantee that the original will not change
+** during the lifetime of the copy.  Use OP_Copy to make a complete
+** copy.
+*/
+case OP_Move:
+case OP_Copy:
+case OP_SCopy: {
+  assert( pOp->p1>0 );
+  assert( pOp->p1<=p->nMem );
+  pIn1 = &p->aMem[pOp->p1];
+  REGISTER_TRACE(pOp->p1, pIn1);
+  assert( pOp->p2>0 );
+  assert( pOp->p2<=p->nMem );
+  pOut = &p->aMem[pOp->p2];
+  assert( pOut!=pIn1 );
+  if( pOp->opcode==OP_Move ){
+    sqlite3VdbeMemMove(pOut, pIn1);
+  }else{
+    sqlite3VdbeMemShallowCopy(pOut, pIn1, MEM_Ephem);
+    if( pOp->opcode==OP_Copy ){
+      Deephemeralize(pOut);
+    }
+  }
+  REGISTER_TRACE(pOp->p2, pOut);
+  break;
+}
+
+/* Opcode: ResultRow P1 P2 * * *
+**
+** The registers P1 throught P1+P2-1 contain a single row of
+** results. This opcode causes the sqlite3_step() call to terminate
+** with an SQLITE_ROW return code and it sets up the sqlite3_stmt
+** structure to provide access to the top P1 values as the result
+** row.
+*/
+case OP_ResultRow: {
+  Mem *pMem;
+  int i;
+  assert( p->nResColumn==pOp->p2 );
+  assert( pOp->p1>0 );
+  assert( pOp->p1+pOp->p2<=p->nMem );
+
+  /* Invalidate all ephemeral cursor row caches */
+  p->cacheCtr = (p->cacheCtr + 2)|1;
+
+  /* Make sure the results of the current row are \000 terminated
+  ** and have an assigned type.  The results are deephemeralized as
+  ** as side effect.
+  */
+  pMem = p->pResultSet = &p->aMem[pOp->p1];
+  for(i=0; i<pOp->p2; i++){
+    sqlite3VdbeMemNulTerminate(&pMem[i]);
+    storeTypeInfo(&pMem[i], encoding);
+  }
+  if( db->mallocFailed ) goto no_mem;
+
+  /* Return SQLITE_ROW
+  */
+  p->nCallback++;
+  p->pc = pc + 1;
+  rc = SQLITE_ROW;
+  goto vdbe_return;
+}
+
+/* Opcode: Concat P1 P2 P3 * *
+**
+** Add the text in register P1 onto the end of the text in
+** register P2 and store the result in register P3.
+** If either the P1 or P2 text are NULL then store NULL in P3.
+**
+**   P3 = P2 || P1
+**
+** It is illegal for P1 and P3 to be the same register. Sometimes,
+** if P3 is the same register as P2, the implementation is able
+** to avoid a memcpy().
+*/
+case OP_Concat: {           /* same as TK_CONCAT, in1, in2, out3 */
+  i64 nByte;
+
+  assert( pIn1!=pOut );
+  if( (pIn1->flags | pIn2->flags) & MEM_Null ){
+    sqlite3VdbeMemSetNull(pOut);
+    break;
+  }
+  ExpandBlob(pIn1);
+  Stringify(pIn1, encoding);
+  ExpandBlob(pIn2);
+  Stringify(pIn2, encoding);
+  nByte = pIn1->n + pIn2->n;
+  if( nByte>SQLITE_MAX_LENGTH ){
+    goto too_big;
+  }
+  MemSetTypeFlag(pOut, MEM_Str);
+  if( sqlite3VdbeMemGrow(pOut, nByte+2, pOut==pIn2) ){
+    goto no_mem;
+  }
+  if( pOut!=pIn2 ){
+    memcpy(pOut->z, pIn2->z, pIn2->n);
+  }
+  memcpy(&pOut->z[pIn2->n], pIn1->z, pIn1->n);
+  pOut->z[nByte] = 0;
+  pOut->z[nByte+1] = 0;
+  pOut->flags |= MEM_Term;
+  pOut->n = nByte;
+  pOut->enc = encoding;
+  UPDATE_MAX_BLOBSIZE(pOut);
+  break;
+}
+
+/* Opcode: Add P1 P2 P3 * *
+**
+** Add the value in register P1 to the value in register P2
+** and store the result in regiser P3.
+** If either input is NULL, the result is NULL.
+*/
+/* Opcode: Multiply P1 P2 P3 * *
+**
+**
+** Multiply the value in regiser P1 by the value in regiser P2
+** and store the result in register P3.
+** If either input is NULL, the result is NULL.
+*/
+/* Opcode: Subtract P1 P2 P3 * *
+**
+** Subtract the value in register P1 from the value in register P2
+** and store the result in register P3.
+** If either input is NULL, the result is NULL.
+*/
+/* Opcode: Divide P1 P2 P3 * *
+**
+** Divide the value in register P1 by the value in register P2
+** and store the result in register P3.  If the value in register P2
+** is zero, then the result is NULL.
+** If either input is NULL, the result is NULL.
+*/
+/* Opcode: Remainder P1 P2 P3 * *
+**
+** Compute the remainder after integer division of the value in
+** register P1 by the value in register P2 and store the result in P3.
+** If the value in register P2 is zero the result is NULL.
+** If either operand is NULL, the result is NULL.
+*/
+case OP_Add:                   /* same as TK_PLUS, in1, in2, out3 */
+case OP_Subtract:              /* same as TK_MINUS, in1, in2, out3 */
+case OP_Multiply:              /* same as TK_STAR, in1, in2, out3 */
+case OP_Divide:                /* same as TK_SLASH, in1, in2, out3 */
+case OP_Remainder: {           /* same as TK_REM, in1, in2, out3 */
+  int flags;
+  flags = pIn1->flags | pIn2->flags;
+  if( (flags & MEM_Null)!=0 ) goto arithmetic_result_is_null;
+  if( (pIn1->flags & pIn2->flags & MEM_Int)==MEM_Int ){
+    i64 a, b;
+    a = pIn1->u.i;
+    b = pIn2->u.i;
+    switch( pOp->opcode ){
+      case OP_Add:         b += a;       break;
+      case OP_Subtract:    b -= a;       break;
+      case OP_Multiply:    b *= a;       break;
+      case OP_Divide: {
+        if( a==0 ) goto arithmetic_result_is_null;
+        /* Dividing the largest possible negative 64-bit integer (1<<63) by
+        ** -1 returns an integer to large to store in a 64-bit data-type. On
+        ** some architectures, the value overflows to (1<<63). On others,
+        ** a SIGFPE is issued. The following statement normalizes this
+        ** behaviour so that all architectures behave as if integer
+        ** overflow occured.
+        */
+        if( a==-1 && b==(((i64)1)<<63) ) a = 1;
+        b /= a;
+        break;
+      }
+      default: {
+        if( a==0 ) goto arithmetic_result_is_null;
+        if( a==-1 ) a = 1;
+        b %= a;
+        break;
+      }
+    }
+    pOut->u.i = b;
+    MemSetTypeFlag(pOut, MEM_Int);
+  }else{
+    double a, b;
+    a = sqlite3VdbeRealValue(pIn1);
+    b = sqlite3VdbeRealValue(pIn2);
+    switch( pOp->opcode ){
+      case OP_Add:         b += a;       break;
+      case OP_Subtract:    b -= a;       break;
+      case OP_Multiply:    b *= a;       break;
+      case OP_Divide: {
+        if( a==0.0 ) goto arithmetic_result_is_null;
+        b /= a;
+        break;
+      }
+      default: {
+        i64 ia = (i64)a;
+        i64 ib = (i64)b;
+        if( ia==0 ) goto arithmetic_result_is_null;
+        if( ia==-1 ) ia = 1;
+        b = ib % ia;
+        break;
+      }
+    }
+    if( sqlite3_isnan(b) ){
+      goto arithmetic_result_is_null;
+    }
+    pOut->r = b;
+    MemSetTypeFlag(pOut, MEM_Real);
+    if( (flags & MEM_Real)==0 ){
+      sqlite3VdbeIntegerAffinity(pOut);
+    }
+  }
+  break;
+
+arithmetic_result_is_null:
+  sqlite3VdbeMemSetNull(pOut);
+  break;
+}
+
+/* Opcode: CollSeq * * P4
+**
+** P4 is a pointer to a CollSeq struct. If the next call to a user function
+** or aggregate calls sqlite3GetFuncCollSeq(), this collation sequence will
+** be returned. This is used by the built-in min(), max() and nullif()
+** functions.
+**
+** The interface used by the implementation of the aforementioned functions
+** to retrieve the collation sequence set by this opcode is not available
+** publicly, only to user functions defined in func.c.
+*/
+case OP_CollSeq: {
+  assert( pOp->p4type==P4_COLLSEQ );
+  break;
+}
+
+/* Opcode: Function P1 P2 P3 P4 P5
+**
+** Invoke a user function (P4 is a pointer to a Function structure that
+** defines the function) with P5 arguments taken from register P2 and
+** successors.  The result of the function is stored in register P3.
+** Register P3 must not be one of the function inputs.
+**
+** P1 is a 32-bit bitmask indicating whether or not each argument to the
+** function was determined to be constant at compile time. If the first
+** argument was constant then bit 0 of P1 is set. This is used to determine
+** whether meta data associated with a user function argument using the
+** sqlite3_set_auxdata() API may be safely retained until the next
+** invocation of this opcode.
+**
+** See also: AggStep and AggFinal
+*/
+case OP_Function: {
+  int i;
+  Mem *pArg;
+  sqlite3_context ctx;
+  sqlite3_value **apVal;
+  int n = pOp->p5;
+
+  apVal = p->apArg;
+  assert( apVal || n==0 );
+
+  assert( n==0 || (pOp->p2>0 && pOp->p2+n<=p->nMem) );
+  assert( pOp->p3<pOp->p2 || pOp->p3>=pOp->p2+n );
+  pArg = &p->aMem[pOp->p2];
+  for(i=0; i<n; i++, pArg++){
+    apVal[i] = pArg;
+    storeTypeInfo(pArg, encoding);
+    REGISTER_TRACE(pOp->p2, pArg);
+  }
+
+  assert( pOp->p4type==P4_FUNCDEF || pOp->p4type==P4_VDBEFUNC );
+  if( pOp->p4type==P4_FUNCDEF ){
+    ctx.pFunc = pOp->p4.pFunc;
+    ctx.pVdbeFunc = 0;
+  }else{
+    ctx.pVdbeFunc = (VdbeFunc*)pOp->p4.pVdbeFunc;
+    ctx.pFunc = ctx.pVdbeFunc->pFunc;
+  }
+
+  assert( pOp->p3>0 && pOp->p3<=p->nMem );
+  pOut = &p->aMem[pOp->p3];
+  ctx.s.flags = MEM_Null;
+  ctx.s.db = 0;
+
+  /* The output cell may already have a buffer allocated. Move
+  ** the pointer to ctx.s so in case the user-function can use
+  ** the already allocated buffer instead of allocating a new one.
+  */
+  sqlite3VdbeMemMove(&ctx.s, pOut);
+  MemSetTypeFlag(&ctx.s, MEM_Null);
+
+  ctx.isError = 0;
+  if( ctx.pFunc->needCollSeq ){
+    assert( pOp>p->aOp );
+    assert( pOp[-1].p4type==P4_COLLSEQ );
+    assert( pOp[-1].opcode==OP_CollSeq );
+    ctx.pColl = pOp[-1].p4.pColl;
+  }
+  if( sqlite3SafetyOff(db) ) goto abort_due_to_misuse;
+  (*ctx.pFunc->xFunc)(&ctx, n, apVal);
+  if( sqlite3SafetyOn(db) ) goto abort_due_to_misuse;
+  if( db->mallocFailed ){
+    /* Even though a malloc() has failed, the implementation of the
+    ** user function may have called an sqlite3_result_XXX() function
+    ** to return a value. The following call releases any resources
+    ** associated with such a value.
+    **
+    ** Note: Maybe MemRelease() should be called if sqlite3SafetyOn()
+    ** fails also (the if(...) statement above). But if people are
+    ** misusing sqlite, they have bigger problems than a leaked value.
+    */
+    sqlite3VdbeMemRelease(&ctx.s);
+    goto no_mem;
+  }
+
+  /* If any auxilary data functions have been called by this user function,
+  ** immediately call the destructor for any non-static values.
+  */
+  if( ctx.pVdbeFunc ){
+    sqlite3VdbeDeleteAuxData(ctx.pVdbeFunc, pOp->p1);
+    pOp->p4.pVdbeFunc = ctx.pVdbeFunc;
+    pOp->p4type = P4_VDBEFUNC;
+  }
+
+  /* If the function returned an error, throw an exception */
+  if( ctx.isError ){
+    sqlite3SetString(&p->zErrMsg, sqlite3_value_text(&ctx.s), (char*)0);
+    rc = ctx.isError;
+  }
+
+  /* Copy the result of the function into register P3 */
+  sqlite3VdbeChangeEncoding(&ctx.s, encoding);
+  sqlite3VdbeMemMove(pOut, &ctx.s);
+  if( sqlite3VdbeMemTooBig(pOut) ){
+    goto too_big;
+  }
+  REGISTER_TRACE(pOp->p3, pOut);
+  UPDATE_MAX_BLOBSIZE(pOut);
+  break;
+}
+
+/* Opcode: BitAnd P1 P2 P3 * *
+**
+** Take the bit-wise AND of the values in register P1 and P2 and
+** store the result in register P3.
+** If either input is NULL, the result is NULL.
+*/
+/* Opcode: BitOr P1 P2 P3 * *
+**
+** Take the bit-wise OR of the values in register P1 and P2 and
+** store the result in register P3.
+** If either input is NULL, the result is NULL.
+*/
+/* Opcode: ShiftLeft P1 P2 P3 * *
+**
+** Shift the integer value in register P2 to the left by the
+** number of bits specified by the integer in regiser P1.
+** Store the result in register P3.
+** If either input is NULL, the result is NULL.
+*/
+/* Opcode: ShiftRight P1 P2 P3 * *
+**
+** Shift the integer value in register P2 to the right by the
+** number of bits specified by the integer in register P1.
+** Store the result in register P3.
+** If either input is NULL, the result is NULL.
+*/
+case OP_BitAnd:                 /* same as TK_BITAND, in1, in2, out3 */
+case OP_BitOr:                  /* same as TK_BITOR, in1, in2, out3 */
+case OP_ShiftLeft:              /* same as TK_LSHIFT, in1, in2, out3 */
+case OP_ShiftRight: {           /* same as TK_RSHIFT, in1, in2, out3 */
+  i64 a, b;
+
+  if( (pIn1->flags | pIn2->flags) & MEM_Null ){
+    sqlite3VdbeMemSetNull(pOut);
+    break;
+  }
+  a = sqlite3VdbeIntValue(pIn2);
+  b = sqlite3VdbeIntValue(pIn1);
+  switch( pOp->opcode ){
+    case OP_BitAnd:      a &= b;     break;
+    case OP_BitOr:       a |= b;     break;
+    case OP_ShiftLeft:   a <<= b;    break;
+    default:  assert( pOp->opcode==OP_ShiftRight );
+                         a >>= b;    break;
+  }
+  pOut->u.i = a;
+  MemSetTypeFlag(pOut, MEM_Int);
+  break;
+}
+
+/* Opcode: AddImm  P1 P2 * * *
+**
+** Add the constant P2 the value in register P1.
+** The result is always an integer.
+**
+** To force any register to be an integer, just add 0.
+*/
+case OP_AddImm: {            /* in1 */
+  sqlite3VdbeMemIntegerify(pIn1);
+  pIn1->u.i += pOp->p2;
+  break;
+}
+
+/* Opcode: ForceInt P1 P2 P3 * *
+**
+** Convert value in register P1 into an integer.  If the value
+** in P1 is not numeric (meaning that is is a NULL or a string that
+** does not look like an integer or floating point number) then
+** jump to P2.  If the value in P1 is numeric then
+** convert it into the least integer that is greater than or equal to its
+** current value if P3==0, or to the least integer that is strictly
+** greater than its current value if P3==1.
+*/
+case OP_ForceInt: {            /* jump, in1 */
+  i64 v;
+  applyAffinity(pIn1, SQLITE_AFF_NUMERIC, encoding);
+  if( (pIn1->flags & (MEM_Int|MEM_Real))==0 ){
+    pc = pOp->p2 - 1;
+    break;
+  }
+  if( pIn1->flags & MEM_Int ){
+    v = pIn1->u.i + (pOp->p3!=0);
+  }else{
+    assert( pIn1->flags & MEM_Real );
+    v = (sqlite3_int64)pIn1->r;
+    if( pIn1->r>(double)v ) v++;
+    if( pOp->p3 && pIn1->r==(double)v ) v++;
+  }
+  pIn1->u.i = v;
+  MemSetTypeFlag(pIn1, MEM_Int);
+  break;
+}
+
+/* Opcode: MustBeInt P1 P2 * * *
+**
+** Force the value in register P1 to be an integer.  If the value
+** in P1 is not an integer and cannot be converted into an integer
+** without data loss, then jump immediately to P2, or if P2==0
+** raise an SQLITE_MISMATCH exception.
+*/
+case OP_MustBeInt: {            /* jump, in1 */
+  applyAffinity(pIn1, SQLITE_AFF_NUMERIC, encoding);
+  if( (pIn1->flags & MEM_Int)==0 ){
+    if( pOp->p2==0 ){
+      rc = SQLITE_MISMATCH;
+      goto abort_due_to_error;
+    }else{
+      pc = pOp->p2 - 1;
+    }
+  }else{
+    MemSetTypeFlag(pIn1, MEM_Int);
+  }
+  break;
+}
+
+/* Opcode: RealAffinity P1 * * * *
+**
+** If register P1 holds an integer convert it to a real value.
+**
+** This opcode is used when extracting information from a column that
+** has REAL affinity.  Such column values may still be stored as
+** integers, for space efficiency, but after extraction we want them
+** to have only a real value.
+*/
+case OP_RealAffinity: {                  /* in1 */
+  if( pIn1->flags & MEM_Int ){
+    sqlite3VdbeMemRealify(pIn1);
+  }
+  break;
+}
+
+#ifndef SQLITE_OMIT_CAST
+/* Opcode: ToText P1 * * * *
+**
+** Force the value in register P1 to be text.
+** If the value is numeric, convert it to a string using the
+** equivalent of printf().  Blob values are unchanged and
+** are afterwards simply interpreted as text.
+**
+** A NULL value is not changed by this routine.  It remains NULL.
+*/
+case OP_ToText: {                  /* same as TK_TO_TEXT, in1 */
+  if( pIn1->flags & MEM_Null ) break;
+  assert( MEM_Str==(MEM_Blob>>3) );
+  pIn1->flags |= (pIn1->flags&MEM_Blob)>>3;
+  applyAffinity(pIn1, SQLITE_AFF_TEXT, encoding);
+  rc = ExpandBlob(pIn1);
+  assert( pIn1->flags & MEM_Str || db->mallocFailed );
+  pIn1->flags &= ~(MEM_Int|MEM_Real|MEM_Blob);
+  UPDATE_MAX_BLOBSIZE(pIn1);
+  break;
+}
+
+/* Opcode: ToBlob P1 * * * *
+**
+** Force the value in register P1 to be a BLOB.
+** If the value is numeric, convert it to a string first.
+** Strings are simply reinterpreted as blobs with no change
+** to the underlying data.
+**
+** A NULL value is not changed by this routine.  It remains NULL.
+*/
+case OP_ToBlob: {                  /* same as TK_TO_BLOB, in1 */
+  if( pIn1->flags & MEM_Null ) break;
+  if( (pIn1->flags & MEM_Blob)==0 ){
+    applyAffinity(pIn1, SQLITE_AFF_TEXT, encoding);
+    assert( pIn1->flags & MEM_Str || db->mallocFailed );
+  }
+  MemSetTypeFlag(pIn1, MEM_Blob);
+  UPDATE_MAX_BLOBSIZE(pIn1);
+  break;
+}
+
+/* Opcode: ToNumeric P1 * * * *
+**
+** Force the value in register P1 to be numeric (either an
+** integer or a floating-point number.)
+** If the value is text or blob, try to convert it to an using the
+** equivalent of atoi() or atof() and store 0 if no such conversion
+** is possible.
+**
+** A NULL value is not changed by this routine.  It remains NULL.
+*/
+case OP_ToNumeric: {                  /* same as TK_TO_NUMERIC, in1 */
+  if( (pIn1->flags & (MEM_Null|MEM_Int|MEM_Real))==0 ){
+    sqlite3VdbeMemNumerify(pIn1);
+  }
+  break;
+}
+#endif /* SQLITE_OMIT_CAST */
+
+/* Opcode: ToInt P1 * * * *
+**
+** Force the value in register P1 be an integer.  If
+** The value is currently a real number, drop its fractional part.
+** If the value is text or blob, try to convert it to an integer using the
+** equivalent of atoi() and store 0 if no such conversion is possible.
+**
+** A NULL value is not changed by this routine.  It remains NULL.
+*/
+case OP_ToInt: {                  /* same as TK_TO_INT, in1 */
+  if( (pIn1->flags & MEM_Null)==0 ){
+    sqlite3VdbeMemIntegerify(pIn1);
+  }
+  break;
+}
+
+#ifndef SQLITE_OMIT_CAST
+/* Opcode: ToReal P1 * * * *
+**
+** Force the value in register P1 to be a floating point number.
+** If The value is currently an integer, convert it.
+** If the value is text or blob, try to convert it to an integer using the
+** equivalent of atoi() and store 0.0 if no such conversion is possible.
+**
+** A NULL value is not changed by this routine.  It remains NULL.
+*/
+case OP_ToReal: {                  /* same as TK_TO_REAL, in1 */
+  if( (pIn1->flags & MEM_Null)==0 ){
+    sqlite3VdbeMemRealify(pIn1);
+  }
+  break;
+}
+#endif /* SQLITE_OMIT_CAST */
+
+/* Opcode: Lt P1 P2 P3 P4 P5
+**
+** Compare the values in register P1 and P3.  If reg(P3)<reg(P1) then
+** jump to address P2.
+**
+** If the SQLITE_JUMPIFNULL bit of P5 is set and either reg(P1) or
+** reg(P3) is NULL then take the jump.  If the SQLITE_JUMPIFNULL
+** bit is clear then fall thru if either operand is NULL.
+**
+** If the SQLITE_NULLEQUAL bit of P5 is set then treat NULL operands
+** as being equal to one another.  Normally NULLs are not equal to
+** anything including other NULLs.
+**
+** The SQLITE_AFF_MASK portion of P5 must be an affinity character -
+** SQLITE_AFF_TEXT, SQLITE_AFF_INTEGER, and so forth. An attempt is made
+** to coerce both inputs according to this affinity before the
+** comparison is made. If the SQLITE_AFF_MASK is 0x00, then numeric
+** affinity is used. Note that the affinity conversions are stored
+** back into the input registers P1 and P3.  So this opcode can cause
+** persistent changes to registers P1 and P3.
+**
+** Once any conversions have taken place, and neither value is NULL,
+** the values are compared. If both values are blobs then memcmp() is
+** used to determine the results of the comparison.  If both values
+** are text, then the appropriate collating function specified in
+** P4 is  used to do the comparison.  If P4 is not specified then
+** memcmp() is used to compare text string.  If both values are
+** numeric, then a numeric comparison is used. If the two values
+** are of different types, then numbers are considered less than
+** strings and strings are considered less than blobs.
+**
+** If the SQLITE_STOREP2 bit of P5 is set, then do not jump.  Instead,
+** store a boolean result (either 0, or 1, or NULL) in register P2.
+*/
+/* Opcode: Ne P1 P2 P3 P4 P5
+**
+** This works just like the Lt opcode except that the jump is taken if
+** the operands in registers P1 and P3 are not equal.  See the Lt opcode for
+** additional information.
+*/
+/* Opcode: Eq P1 P2 P3 P4 P5
+**
+** This works just like the Lt opcode except that the jump is taken if
+** the operands in registers P1 and P3 are equal.
+** See the Lt opcode for additional information.
+*/
+/* Opcode: Le P1 P2 P3 P4 P5
+**
+** This works just like the Lt opcode except that the jump is taken if
+** the content of register P3 is less than or equal to the content of
+** register P1.  See the Lt opcode for additional information.
+*/
+/* Opcode: Gt P1 P2 P3 P4 P5
+**
+** This works just like the Lt opcode except that the jump is taken if
+** the content of register P3 is greater than the content of
+** register P1.  See the Lt opcode for additional information.
+*/
+/* Opcode: Ge P1 P2 P3 P4 P5
+**
+** This works just like the Lt opcode except that the jump is taken if
+** the content of register P3 is greater than or equal to the content of
+** register P1.  See the Lt opcode for additional information.
+*/
+case OP_Eq:               /* same as TK_EQ, jump, in1, in3 */
+case OP_Ne:               /* same as TK_NE, jump, in1, in3 */
+case OP_Lt:               /* same as TK_LT, jump, in1, in3 */
+case OP_Le:               /* same as TK_LE, jump, in1, in3 */
+case OP_Gt:               /* same as TK_GT, jump, in1, in3 */
+case OP_Ge: {             /* same as TK_GE, jump, in1, in3 */
+  int flags;
+  int res;
+  char affinity;
+  Mem x1, x3;
+
+  flags = pIn1->flags|pIn3->flags;
+
+  if( flags&MEM_Null ){
+    if( (pOp->p5 & SQLITE_NULLEQUAL)!=0 ){
+      /*
+      ** When SQLITE_NULLEQUAL set and either operand is NULL
+      ** then both operands are converted to integers prior to being
+      ** passed down into the normal comparison logic below.
+      ** NULL operands are converted to zero and non-NULL operands
+      ** are converted to 1.  Thus, for example, with SQLITE_NULLEQUAL
+      ** set,  NULL==NULL is true whereas it would normally NULL.
+      ** Similarly,  NULL!=123 is true.
+      */
+      x1.flags = MEM_Int;
+      x1.u.i = (pIn1->flags & MEM_Null)==0;
+      pIn1 = &x1;
+      x3.flags = MEM_Int;
+      x3.u.i = (pIn3->flags & MEM_Null)==0;
+      pIn3 = &x3;
+    }else{
+      /* If the SQLITE_NULLEQUAL bit is clear and either operand is NULL then
+      ** the result is always NULL.  The jump is taken if the
+      ** SQLITE_JUMPIFNULL bit is set.
+      */
+      if( pOp->p5 & SQLITE_STOREP2 ){
+        pOut = &p->aMem[pOp->p2];
+        MemSetTypeFlag(pOut, MEM_Null);
+        REGISTER_TRACE(pOp->p2, pOut);
+      }else if( pOp->p5 & SQLITE_JUMPIFNULL ){
+        pc = pOp->p2-1;
+      }
+      break;
+    }
+  }
+
+  affinity = pOp->p5 & SQLITE_AFF_MASK;
+  if( affinity ){
+    applyAffinity(pIn1, affinity, encoding);
+    applyAffinity(pIn3, affinity, encoding);
+  }
+
+  assert( pOp->p4type==P4_COLLSEQ || pOp->p4.pColl==0 );
+  ExpandBlob(pIn1);
+  ExpandBlob(pIn3);
+  res = sqlite3MemCompare(pIn3, pIn1, pOp->p4.pColl);
+  switch( pOp->opcode ){
+    case OP_Eq:    res = res==0;     break;
+    case OP_Ne:    res = res!=0;     break;
+    case OP_Lt:    res = res<0;      break;
+    case OP_Le:    res = res<=0;     break;
+    case OP_Gt:    res = res>0;      break;
+    default:       res = res>=0;     break;
+  }
+
+  if( pOp->p5 & SQLITE_STOREP2 ){
+    pOut = &p->aMem[pOp->p2];
+    MemSetTypeFlag(pOut, MEM_Int);
+    pOut->u.i = res;
+    REGISTER_TRACE(pOp->p2, pOut);
+  }else if( res ){
+    pc = pOp->p2-1;
+  }
+  break;
+}
+
+/* Opcode: And P1 P2 P3 * *
+**
+** Take the logical AND of the values in registers P1 and P2 and
+** write the result into register P3.
+**
+** If either P1 or P2 is 0 (false) then the result is 0 even if
+** the other input is NULL.  A NULL and true or two NULLs give
+** a NULL output.
+*/
+/* Opcode: Or P1 P2 P3 * *
+**
+** Take the logical OR of the values in register P1 and P2 and
+** store the answer in register P3.
+**
+** If either P1 or P2 is nonzero (true) then the result is 1 (true)
+** even if the other input is NULL.  A NULL and false or two NULLs
+** give a NULL output.
+*/
+case OP_And:              /* same as TK_AND, in1, in2, out3 */
+case OP_Or: {             /* same as TK_OR, in1, in2, out3 */
+  int v1, v2;    /* 0==FALSE, 1==TRUE, 2==UNKNOWN or NULL */
+
+  if( pIn1->flags & MEM_Null ){
+    v1 = 2;
+  }else{
+    v1 = sqlite3VdbeIntValue(pIn1)!=0;
+  }
+  if( pIn2->flags & MEM_Null ){
+    v2 = 2;
+  }else{
+    v2 = sqlite3VdbeIntValue(pIn2)!=0;
+  }
+  if( pOp->opcode==OP_And ){
+    static const unsigned char and_logic[] = { 0, 0, 0, 0, 1, 2, 0, 2, 2 };
+    v1 = and_logic[v1*3+v2];
+  }else{
+    static const unsigned char or_logic[] = { 0, 1, 2, 1, 1, 1, 2, 1, 2 };
+    v1 = or_logic[v1*3+v2];
+  }
+  if( v1==2 ){
+    MemSetTypeFlag(pOut, MEM_Null);
+  }else{
+    pOut->u.i = v1;
+    MemSetTypeFlag(pOut, MEM_Int);
+  }
+  break;
+}
+
+/* Opcode: Not P1 * * * *
+**
+** Interpret the value in register P1 as a boolean value.  Replace it
+** with its complement.  If the value in register P1 is NULL its value
+** is unchanged.
+*/
+case OP_Not: {                /* same as TK_NOT, in1 */
+  if( pIn1->flags & MEM_Null ) break;  /* Do nothing to NULLs */
+  sqlite3VdbeMemIntegerify(pIn1);
+  pIn1->u.i = !pIn1->u.i;
+  assert( pIn1->flags&MEM_Int );
+  break;
+}
+
+/* Opcode: BitNot P1 * * * *
+**
+** Interpret the content of register P1 as an integer.  Replace it
+** with its ones-complement.  If the value is originally NULL, leave
+** it unchanged.
+*/
+case OP_BitNot: {             /* same as TK_BITNOT, in1 */
+  if( pIn1->flags & MEM_Null ) break;  /* Do nothing to NULLs */
+  sqlite3VdbeMemIntegerify(pIn1);
+  pIn1->u.i = ~pIn1->u.i;
+  assert( pIn1->flags&MEM_Int );
+  break;
+}
+
+/* Opcode: If P1 P2 P3 * *
+**
+** Jump to P2 if the value in register P1 is true.  The value is
+** is considered true if it is numeric and non-zero.  If the value
+** in P1 is NULL then take the jump if P3 is true.
+*/
+/* Opcode: IfNot P1 P2 P3 * *
+**
+** Jump to P2 if the value in register P1 is False.  The value is
+** is considered true if it has a numeric value of zero.  If the value
+** in P1 is NULL then take the jump if P3 is true.
+*/
+case OP_If:                 /* jump, in1 */
+case OP_IfNot: {            /* jump, in1 */
+  int c;
+  if( pIn1->flags & MEM_Null ){
+    c = pOp->p3;
+  }else{
+#ifdef SQLITE_OMIT_FLOATING_POINT
+    c = sqlite3VdbeIntValue(pIn1);
+#else
+    c = sqlite3VdbeRealValue(pIn1)!=0.0;
+#endif
+    if( pOp->opcode==OP_IfNot ) c = !c;
+  }
+  if( c ){
+    pc = pOp->p2-1;
+  }
+  break;
+}
+
+/* Opcode: IsNull P1 P2 P3 * *
+**
+** Jump to P2 if the value in register P1 is NULL.  If P3 is greater
+** than zero, then check all values reg(P1), reg(P1+1),
+** reg(P1+2), ..., reg(P1+P3-1).
+*/
+case OP_IsNull: {            /* same as TK_ISNULL, jump, in1 */
+  int n = pOp->p3;
+  assert( pOp->p3==0 || pOp->p1>0 );
+  do{
+    if( (pIn1->flags & MEM_Null)!=0 ){
+      pc = pOp->p2 - 1;
+      break;
+    }
+    pIn1++;
+  }while( --n > 0 );
+  break;
+}
+
+/* Opcode: NotNull P1 P2 * * *
+**
+** Jump to P2 if the value in register P1 is not NULL.
+*/
+case OP_NotNull: {            /* same as TK_NOTNULL, jump, in1 */
+  if( (pIn1->flags & MEM_Null)==0 ){
+    pc = pOp->p2 - 1;
+  }
+  break;
+}
+
+/* Opcode: SetNumColumns P1 P2 * * *
+**
+** Before the OP_Column opcode can be executed on a cursor, this
+** opcode must be called to set the number of fields in the table.
+**
+** This opcode sets the number of columns for cursor P1 to P2.
+**
+** If OP_KeyAsData is to be applied to cursor P1, it must be executed
+** before this op-code.
+*/
+case OP_SetNumColumns: {
+  Cursor *pC;
+  assert( (pOp->p1)<p->nCursor );
+  assert( p->apCsr[pOp->p1]!=0 );
+  pC = p->apCsr[pOp->p1];
+  pC->nField = pOp->p2;
+  break;
+}
+
+/* Opcode: Column P1 P2 P3 P4 *
+**
+** Interpret the data that cursor P1 points to as a structure built using
+** the MakeRecord instruction.  (See the MakeRecord opcode for additional
+** information about the format of the data.)  Extract the P2-th column
+** from this record.  If there are less that (P2+1)
+** values in the record, extract a NULL.
+**
+** The value extracted is stored in register P3.
+**
+** If the KeyAsData opcode has previously executed on this cursor, then the
+** field might be extracted from the key rather than the data.
+**
+** If the column contains fewer than P2 fields, then extract a NULL.  Or,
+** if the P4 argument is a P4_MEM use the value of the P4 argument as
+** the result.
+*/
+case OP_Column: {
+  u32 payloadSize;   /* Number of bytes in the record */
+  int p1 = pOp->p1;  /* P1 value of the opcode */
+  int p2 = pOp->p2;  /* column number to retrieve */
+  Cursor *pC = 0;    /* The VDBE cursor */
+  char *zRec;        /* Pointer to complete record-data */
+  BtCursor *pCrsr;   /* The BTree cursor */
+  u32 *aType;        /* aType[i] holds the numeric type of the i-th column */
+  u32 *aOffset;      /* aOffset[i] is offset to start of data for i-th column */
+  u32 nField;        /* number of fields in the record */
+  int len;           /* The length of the serialized data for the column */
+  int i;             /* Loop counter */
+  char *zData;       /* Part of the record being decoded */
+  Mem *pDest;        /* Where to write the extracted value */
+  Mem sMem;          /* For storing the record being decoded */
+
+  sMem.flags = 0;
+  sMem.db = 0;
+  assert( p1<p->nCursor );
+  assert( pOp->p3>0 && pOp->p3<=p->nMem );
+  pDest = &p->aMem[pOp->p3];
+  MemSetTypeFlag(pDest, MEM_Null);
+
+  /* This block sets the variable payloadSize to be the total number of
+  ** bytes in the record.
+  **
+  ** zRec is set to be the complete text of the record if it is available.
+  ** The complete record text is always available for pseudo-tables
+  ** If the record is stored in a cursor, the complete record text
+  ** might be available in the  pC->aRow cache.  Or it might not be.
+  ** If the data is unavailable,  zRec is set to NULL.
+  **
+  ** We also compute the number of columns in the record.  For cursors,
+  ** the number of columns is stored in the Cursor.nField element.
+  */
+  pC = p->apCsr[p1];
+  assert( pC!=0 );
+#ifndef SQLITE_OMIT_VIRTUALTABLE
+  assert( pC->pVtabCursor==0 );
+#endif
+  if( pC->pCursor!=0 ){
+    /* The record is stored in a B-Tree */
+    rc = sqlite3VdbeCursorMoveto(pC);
+    if( rc ) goto abort_due_to_error;
+    zRec = 0;
+    pCrsr = pC->pCursor;
+    if( pC->nullRow ){
+      payloadSize = 0;
+    }else if( pC->cacheStatus==p->cacheCtr ){
+      payloadSize = pC->payloadSize;
+      zRec = (char*)pC->aRow;
+    }else if( pC->isIndex ){
+      i64 payloadSize64;
+      sqlite3BtreeKeySize(pCrsr, &payloadSize64);
+      payloadSize = payloadSize64;
+    }else{
+      sqlite3BtreeDataSize(pCrsr, &payloadSize);
+    }
+    nField = pC->nField;
+  }else{
+    assert( pC->pseudoTable );
+    /* The record is the sole entry of a pseudo-table */
+    payloadSize = pC->nData;
+    zRec = pC->pData;
+    pC->cacheStatus = CACHE_STALE;
+    assert( payloadSize==0 || zRec!=0 );
+    nField = pC->nField;
+    pCrsr = 0;
+  }
+
+  /* If payloadSize is 0, then just store a NULL */
+  if( payloadSize==0 ){
+    assert( pDest->flags&MEM_Null );
+    goto op_column_out;
+  }
+  if( payloadSize>SQLITE_MAX_LENGTH ){
+    goto too_big;
+  }
+
+  assert( p2<nField );
+
+  /* Read and parse the table header.  Store the results of the parse
+  ** into the record header cache fields of the cursor.
+  */
+  if( pC->cacheStatus==p->cacheCtr ){
+    aType = pC->aType;
+    aOffset = pC->aOffset;
+  }else{
+    u8 *zIdx;        /* Index into header */
+    u8 *zEndHdr;     /* Pointer to first byte after the header */
+    u32 offset;      /* Offset into the data */
+    int szHdrSz;     /* Size of the header size field at start of record */
+    int avail;       /* Number of bytes of available data */
+
+    aType = pC->aType;
+    if( aType==0 ){
+      pC->aType = aType = sqlite3DbMallocRaw(db, 2*nField*sizeof(aType) );
+    }
+    if( aType==0 ){
+      goto no_mem;
+    }
+    pC->aOffset = aOffset = &aType[nField];
+    pC->payloadSize = payloadSize;
+    pC->cacheStatus = p->cacheCtr;
+
+    /* Figure out how many bytes are in the header */
+    if( zRec ){
+      zData = zRec;
+    }else{
+      if( pC->isIndex ){
+        zData = (char*)sqlite3BtreeKeyFetch(pCrsr, &avail);
+      }else{
+        zData = (char*)sqlite3BtreeDataFetch(pCrsr, &avail);
+      }
+      /* If KeyFetch()/DataFetch() managed to get the entire payload,
+      ** save the payload in the pC->aRow cache.  That will save us from
+      ** having to make additional calls to fetch the content portion of
+      ** the record.
+      */
+      if( avail>=payloadSize ){
+        zRec = zData;
+        pC->aRow = (u8*)zData;
+      }else{
+        pC->aRow = 0;
+      }
+    }
+    /* The following assert is true in all cases accept when
+    ** the database file has been corrupted externally.
+    **    assert( zRec!=0 || avail>=payloadSize || avail>=9 ); */
+    szHdrSz = GetVarint((u8*)zData, offset);
+
+    /* The KeyFetch() or DataFetch() above are fast and will get the entire
+    ** record header in most cases.  But they will fail to get the complete
+    ** record header if the record header does not fit on a single page
+    ** in the B-Tree.  When that happens, use sqlite3VdbeMemFromBtree() to
+    ** acquire the complete header text.
+    */
+    if( !zRec && avail<offset ){
+      sMem.flags = 0;
+      sMem.db = 0;
+      rc = sqlite3VdbeMemFromBtree(pCrsr, 0, offset, pC->isIndex, &sMem);
+      if( rc!=SQLITE_OK ){
+        goto op_column_out;
+      }
+      zData = sMem.z;
+    }
+    zEndHdr = (u8 *)&zData[offset];
+    zIdx = (u8 *)&zData[szHdrSz];
+
+    /* Scan the header and use it to fill in the aType[] and aOffset[]
+    ** arrays.  aType[i] will contain the type integer for the i-th
+    ** column and aOffset[i] will contain the offset from the beginning
+    ** of the record to the start of the data for the i-th column
+    */
+    for(i=0; i<nField; i++){
+      if( zIdx<zEndHdr ){
+        aOffset[i] = offset;
+        zIdx += GetVarint(zIdx, aType[i]);
+        offset += sqlite3VdbeSerialTypeLen(aType[i]);
+      }else{
+        /* If i is less that nField, then there are less fields in this
+        ** record than SetNumColumns indicated there are columns in the
+        ** table. Set the offset for any extra columns not present in
+        ** the record to 0. This tells code below to store a NULL
+        ** instead of deserializing a value from the record.
+        */
+        aOffset[i] = 0;
+      }
+    }
+    Release(&sMem);
+    sMem.flags = MEM_Null;
+
+    /* If we have read more header data than was contained in the header,
+    ** or if the end of the last field appears to be past the end of the
+    ** record, then we must be dealing with a corrupt database.
+    */
+    if( zIdx>zEndHdr || offset>payloadSize ){
+      rc = SQLITE_CORRUPT_BKPT;
+      goto op_column_out;
+    }
+  }
+
+  /* Get the column information. If aOffset[p2] is non-zero, then
+  ** deserialize the value from the record. If aOffset[p2] is zero,
+  ** then there are not enough fields in the record to satisfy the
+  ** request.  In this case, set the value NULL or to P4 if P4 is
+  ** a pointer to a Mem object.
+  */
+  if( aOffset[p2] ){
+    assert( rc==SQLITE_OK );
+    if( zRec ){
+      if( pDest->flags&MEM_Dyn ){
+        sqlite3VdbeSerialGet((u8 *)&zRec[aOffset[p2]], aType[p2], &sMem);
+        sMem.db = db;
+        sqlite3VdbeMemCopy(pDest, &sMem);
+        assert( !(sMem.flags&MEM_Dyn) );
+      }else{
+        sqlite3VdbeSerialGet((u8 *)&zRec[aOffset[p2]], aType[p2], pDest);
+      }
+    }else{
+      len = sqlite3VdbeSerialTypeLen(aType[p2]);
+      sqlite3VdbeMemMove(&sMem, pDest);
+      rc = sqlite3VdbeMemFromBtree(pCrsr, aOffset[p2], len, pC->isIndex, &sMem);
+      if( rc!=SQLITE_OK ){
+        goto op_column_out;
+      }
+      zData = sMem.z;
+      sqlite3VdbeSerialGet((u8*)zData, aType[p2], pDest);
+    }
+    pDest->enc = encoding;
+  }else{
+    if( pOp->p4type==P4_MEM ){
+      sqlite3VdbeMemShallowCopy(pDest, pOp->p4.pMem, MEM_Static);
+    }else{
+      assert( pDest->flags&MEM_Null );
+    }
+  }
+
+  /* If we dynamically allocated space to hold the data (in the
+  ** sqlite3VdbeMemFromBtree() call above) then transfer control of that
+  ** dynamically allocated space over to the pDest structure.
+  ** This prevents a memory copy.
+  */
+  if( (sMem.flags & MEM_Dyn)!=0 ){
+    assert( !sMem.xDel );
+    assert( !(pDest->flags & MEM_Dyn) );
+    assert( !(pDest->flags & (MEM_Blob|MEM_Str)) || pDest->z==sMem.z );
+    pDest->flags &= ~(MEM_Ephem|MEM_Static);
+    pDest->flags |= MEM_Dyn|MEM_Term;
+    pDest->z = sMem.z;
+  }
+
+  rc = sqlite3VdbeMemMakeWriteable(pDest);
+
+op_column_out:
+  UPDATE_MAX_BLOBSIZE(pDest);
+  REGISTER_TRACE(pOp->p3, pDest);
+  break;
+}
+
+/* Opcode: MakeRecord P1 P2 P3 P4 *
+**
+** Convert P2 registers beginning with P1 into a single entry
+** suitable for use as a data record in a database table or as a key
+** in an index.  The details of the format are irrelavant as long as
+** the OP_Column opcode can decode the record later and as long as the
+** sqlite3VdbeRecordCompare function will correctly compare two encoded
+** records.  Refer to source code comments for the details of the record
+** format.
+**
+** P4 may be a string that is P1 characters long.  The nth character of the
+** string indicates the column affinity that should be used for the nth
+** field of the index key.
+**
+** The mapping from character to affinity is given by the SQLITE_AFF_
+** macros defined in sqliteInt.h.
+**
+** If P4 is NULL then all index fields have the affinity NONE.
+*/
+case OP_MakeRecord: {
+  /* Assuming the record contains N fields, the record format looks
+  ** like this:
+  **
+  ** ------------------------------------------------------------------------
+  ** | hdr-size | type 0 | type 1 | ... | type N-1 | data0 | ... | data N-1 |
+  ** ------------------------------------------------------------------------
+  **
+  ** Data(0) is taken from register P1.  Data(1) comes from register P1+1
+  ** and so froth.
+  **
+  ** Each type field is a varint representing the serial type of the
+  ** corresponding data element (see sqlite3VdbeSerialType()). The
+  ** hdr-size field is also a varint which is the offset from the beginning
+  ** of the record to data0.
+  */
+  u8 *zNewRecord;        /* A buffer to hold the data for the new record */
+  Mem *pRec;             /* The new record */
+  u64 nData = 0;         /* Number of bytes of data space */
+  int nHdr = 0;          /* Number of bytes of header space */
+  u64 nByte = 0;         /* Data space required for this record */
+  int nZero = 0;         /* Number of zero bytes at the end of the record */
+  int nVarint;           /* Number of bytes in a varint */
+  u32 serial_type;       /* Type field */
+  Mem *pData0;           /* First field to be combined into the record */
+  Mem *pLast;            /* Last field of the record */
+  int nField;            /* Number of fields in the record */
+  char *zAffinity;       /* The affinity string for the record */
+  int file_format;       /* File format to use for encoding */
+  int i;                 /* Space used in zNewRecord[] */
+
+  nField = pOp->p1;
+  zAffinity = pOp->p4.z;
+  assert( nField>0 && pOp->p2>0 && pOp->p2+nField<=p->nMem );
+  pData0 = &p->aMem[nField];
+  nField = pOp->p2;
+  pLast = &pData0[nField-1];
+  file_format = p->minWriteFileFormat;
+
+  /* Loop through the elements that will make up the record to figure
+  ** out how much space is required for the new record.
+  */
+  for(pRec=pData0; pRec<=pLast; pRec++){
+    int len;
+    if( zAffinity ){
+      applyAffinity(pRec, zAffinity[pRec-pData0], encoding);
+    }
+    if( pRec->flags&MEM_Zero && pRec->n>0 ){
+      sqlite3VdbeMemExpandBlob(pRec);
+    }
+    serial_type = sqlite3VdbeSerialType(pRec, file_format);
+    len = sqlite3VdbeSerialTypeLen(serial_type);
+    nData += len;
+    nHdr += sqlite3VarintLen(serial_type);
+    if( pRec->flags & MEM_Zero ){
+      /* Only pure zero-filled BLOBs can be input to this Opcode.
+      ** We do not allow blobs with a prefix and a zero-filled tail. */
+      nZero += pRec->u.i;
+    }else if( len ){
+      nZero = 0;
+    }
+  }
+
+  /* Add the initial header varint and total the size */
+  nHdr += nVarint = sqlite3VarintLen(nHdr);
+  if( nVarint<sqlite3VarintLen(nHdr) ){
+    nHdr++;
+  }
+  nByte = nHdr+nData-nZero;
+  if( nByte>SQLITE_MAX_LENGTH ){
+    goto too_big;
+  }
+
+  /* Make sure the output register has a buffer large enough to store
+  ** the new record. The output register (pOp->p3) is not allowed to
+  ** be one of the input registers (because the following call to
+  ** sqlite3VdbeMemGrow() could clobber the value before it is used).
+  */
+  assert( pOp->p3<pOp->p1 || pOp->p3>=pOp->p1+pOp->p2 );
+  pOut = &p->aMem[pOp->p3];
+  if( sqlite3VdbeMemGrow(pOut, nByte, 0) ){
+    goto no_mem;
+  }
+  zNewRecord = (u8 *)pOut->z;
+
+  /* Write the record */
+  i = sqlite3PutVarint(zNewRecord, nHdr);
+  for(pRec=pData0; pRec<=pLast; pRec++){
+    serial_type = sqlite3VdbeSerialType(pRec, file_format);
+    i += sqlite3PutVarint(&zNewRecord[i], serial_type);      /* serial type */
+  }
+  for(pRec=pData0; pRec<=pLast; pRec++){  /* serial data */
+    i += sqlite3VdbeSerialPut(&zNewRecord[i], nByte-i, pRec, file_format);
+  }
+  assert( i==nByte );
+
+  assert( pOp->p3>0 && pOp->p3<=p->nMem );
+  pOut->n = nByte;
+  pOut->flags = MEM_Blob | MEM_Dyn;
+  pOut->xDel = 0;
+  if( nZero ){
+    pOut->u.i = nZero;
+    pOut->flags |= MEM_Zero;
+  }
+  pOut->enc = SQLITE_UTF8;  /* In case the blob is ever converted to text */
+  REGISTER_TRACE(pOp->p3, pOut);
+  UPDATE_MAX_BLOBSIZE(pOut);
+  break;
+}
+
+/* Opcode: Statement P1 * * * *
+**
+** Begin an individual statement transaction which is part of a larger
+** BEGIN..COMMIT transaction.  This is needed so that the statement
+** can be rolled back after an error without having to roll back the
+** entire transaction.  The statement transaction will automatically
+** commit when the VDBE halts.
+**
+** The statement is begun on the database file with index P1.  The main
+** database file has an index of 0 and the file used for temporary tables
+** has an index of 1.
+*/
+case OP_Statement: {
+  if( db->autoCommit==0 || db->activeVdbeCnt>1 ){
+    int i = pOp->p1;
+    Btree *pBt;
+    assert( i>=0 && i<db->nDb );
+    assert( db->aDb[i].pBt!=0 );
+    pBt = db->aDb[i].pBt;
+    assert( sqlite3BtreeIsInTrans(pBt) );
+    assert( (p->btreeMask & (1<<i))!=0 );
+    if( !sqlite3BtreeIsInStmt(pBt) ){
+      rc = sqlite3BtreeBeginStmt(pBt);
+      p->openedStatement = 1;
+    }
+  }
+  break;
+}
+
+/* Opcode: AutoCommit P1 P2 * * *
+**
+** Set the database auto-commit flag to P1 (1 or 0). If P2 is true, roll
+** back any currently active btree transactions. If there are any active
+** VMs (apart from this one), then the COMMIT or ROLLBACK statement fails.
+**
+** This instruction causes the VM to halt.
+*/
+case OP_AutoCommit: {
+  u8 i = pOp->p1;
+  u8 rollback = pOp->p2;
+
+  assert( i==1 || i==0 );
+  assert( i==1 || rollback==0 );
+
+  assert( db->activeVdbeCnt>0 );  /* At least this one VM is active */
+
+  if( db->activeVdbeCnt>1 && i && !db->autoCommit ){
+    /* If this instruction implements a COMMIT or ROLLBACK, other VMs are
+    ** still running, and a transaction is active, return an error indicating
+    ** that the other VMs must complete first.
+    */
+    sqlite3SetString(&p->zErrMsg, "cannot ", rollback?"rollback":"commit",
+        " transaction - SQL statements in progress", (char*)0);
+    rc = SQLITE_ERROR;
+  }else if( i!=db->autoCommit ){
+    if( pOp->p2 ){
+      assert( i==1 );
+      sqlite3RollbackAll(db);
+      db->autoCommit = 1;
+    }else{
+      db->autoCommit = i;
+      if( sqlite3VdbeHalt(p)==SQLITE_BUSY ){
+        p->pc = pc;
+        db->autoCommit = 1-i;
+        p->rc = rc = SQLITE_BUSY;
+        goto vdbe_return;
+      }
+    }
+    if( p->rc==SQLITE_OK ){
+      rc = SQLITE_DONE;
+    }else{
+      rc = SQLITE_ERROR;
+    }
+    goto vdbe_return;
+  }else{
+    sqlite3SetString(&p->zErrMsg,
+        (!i)?"cannot start a transaction within a transaction":(
+        (rollback)?"cannot rollback - no transaction is active":
+                   "cannot commit - no transaction is active"), (char*)0);
+
+    rc = SQLITE_ERROR;
+  }
+  break;
+}
+
+/* Opcode: Transaction P1 P2 * * *
+**
+** Begin a transaction.  The transaction ends when a Commit or Rollback
+** opcode is encountered.  Depending on the ON CONFLICT setting, the
+** transaction might also be rolled back if an error is encountered.
+**
+** P1 is the index of the database file on which the transaction is
+** started.  Index 0 is the main database file and index 1 is the
+** file used for temporary tables.  Indices of 2 or more are used for
+** attached databases.
+**
+** If P2 is non-zero, then a write-transaction is started.  A RESERVED lock is
+** obtained on the database file when a write-transaction is started.  No
+** other process can start another write transaction while this transaction is
+** underway.  Starting a write transaction also creates a rollback journal. A
+** write transaction must be started before any changes can be made to the
+** database.  If P2 is 2 or greater then an EXCLUSIVE lock is also obtained
+** on the file.
+**
+** If P2 is zero, then a read-lock is obtained on the database file.
+*/
+case OP_Transaction: {
+  int i = pOp->p1;
+  Btree *pBt;
+
+  assert( i>=0 && i<db->nDb );
+  assert( (p->btreeMask & (1<<i))!=0 );
+  pBt = db->aDb[i].pBt;
+
+  if( pBt ){
+    rc = sqlite3BtreeBeginTrans(pBt, pOp->p2);
+    if( rc==SQLITE_BUSY ){
+      p->pc = pc;
+      p->rc = rc = SQLITE_BUSY;
+      goto vdbe_return;
+    }
+    if( rc!=SQLITE_OK && rc!=SQLITE_READONLY /* && rc!=SQLITE_BUSY */ ){
+      goto abort_due_to_error;
+    }
+  }
+  break;
+}
+
+/* Opcode: ReadCookie P1 P2 P3 * *
+**
+** Read cookie number P3 from database P1 and write it into register P2.
+** P3==0 is the schema version.  P3==1 is the database format.
+** P3==2 is the recommended pager cache size, and so forth.  P1==0 is
+** the main database file and P1==1 is the database file used to store
+** temporary tables.
+**
+** If P1 is negative, then this is a request to read the size of a
+** databases free-list. P3 must be set to 1 in this case. The actual
+** database accessed is ((P1+1)*-1). For example, a P1 parameter of -1
+** corresponds to database 0 ("main"), a P1 of -2 is database 1 ("temp").
+**
+** There must be a read-lock on the database (either a transaction
+** must be started or there must be an open cursor) before
+** executing this instruction.
+*/
+case OP_ReadCookie: {               /* out2-prerelease */
+  int iMeta;
+  int iDb = pOp->p1;
+  int iCookie = pOp->p3;
+
+  assert( pOp->p3<SQLITE_N_BTREE_META );
+  if( iDb<0 ){
+    iDb = (-1*(iDb+1));
+    iCookie *= -1;
+  }
+  assert( iDb>=0 && iDb<db->nDb );
+  assert( db->aDb[iDb].pBt!=0 );
+  assert( (p->btreeMask & (1<<iDb))!=0 );
+  /* The indexing of meta values at the schema layer is off by one from
+  ** the indexing in the btree layer.  The btree considers meta[0] to
+  ** be the number of free pages in the database (a read-only value)
+  ** and meta[1] to be the schema cookie.  The schema layer considers
+  ** meta[1] to be the schema cookie.  So we have to shift the index
+  ** by one in the following statement.
+  */
+  rc = sqlite3BtreeGetMeta(db->aDb[iDb].pBt, 1 + iCookie, (u32 *)&iMeta);
+  pOut->u.i = iMeta;
+  MemSetTypeFlag(pOut, MEM_Int);
+  break;
+}
+
+/* Opcode: SetCookie P1 P2 P3 * *
+**
+** Write the content of register P3 (interpreted as an integer)
+** into cookie number P2 of database P1.
+** P2==0 is the schema version.  P2==1 is the database format.
+** P2==2 is the recommended pager cache size, and so forth.  P1==0 is
+** the main database file and P1==1 is the database file used to store
+** temporary tables.
+**
+** A transaction must be started before executing this opcode.
+*/
+case OP_SetCookie: {       /* in3 */
+  Db *pDb;
+  assert( pOp->p2<SQLITE_N_BTREE_META );
+  assert( pOp->p1>=0 && pOp->p1<db->nDb );
+  assert( (p->btreeMask & (1<<pOp->p1))!=0 );
+  pDb = &db->aDb[pOp->p1];
+  assert( pDb->pBt!=0 );
+  sqlite3VdbeMemIntegerify(pIn3);
+  /* See note about index shifting on OP_ReadCookie */
+  rc = sqlite3BtreeUpdateMeta(pDb->pBt, 1+pOp->p2, (int)pIn3->u.i);
+  if( pOp->p2==0 ){
+    /* When the schema cookie changes, record the new cookie internally */
+    pDb->pSchema->schema_cookie = pIn3->u.i;
+    db->flags |= SQLITE_InternChanges;
+  }else if( pOp->p2==1 ){
+    /* Record changes in the file format */
+    pDb->pSchema->file_format = pIn3->u.i;
+  }
+  if( pOp->p1==1 ){
+    /* Invalidate all prepared statements whenever the TEMP database
+    ** schema is changed.  Ticket #1644 */
+    sqlite3ExpirePreparedStatements(db);
+  }
+  break;
+}
+
+/* Opcode: VerifyCookie P1 P2 *
+**
+** Check the value of global database parameter number 0 (the
+** schema version) and make sure it is equal to P2.
+** P1 is the database number which is 0 for the main database file
+** and 1 for the file holding temporary tables and some higher number
+** for auxiliary databases.
+**
+** The cookie changes its value whenever the database schema changes.
+** This operation is used to detect when that the cookie has changed
+** and that the current process needs to reread the schema.
+**
+** Either a transaction needs to have been started or an OP_Open needs
+** to be executed (to establish a read lock) before this opcode is
+** invoked.
+*/
+case OP_VerifyCookie: {
+  int iMeta;
+  Btree *pBt;
+  assert( pOp->p1>=0 && pOp->p1<db->nDb );
+  assert( (p->btreeMask & (1<<pOp->p1))!=0 );
+  pBt = db->aDb[pOp->p1].pBt;
+  if( pBt ){
+    rc = sqlite3BtreeGetMeta(pBt, 1, (u32 *)&iMeta);
+  }else{
+    rc = SQLITE_OK;
+    iMeta = 0;
+  }
+  if( rc==SQLITE_OK && iMeta!=pOp->p2 ){
+    sqlite3_free(p->zErrMsg);
+    p->zErrMsg = sqlite3DbStrDup(db, "database schema has changed");
+    /* If the schema-cookie from the database file matches the cookie
+    ** stored with the in-memory representation of the schema, do
+    ** not reload the schema from the database file.
+    **
+    ** If virtual-tables are in use, this is not just an optimisation.
+    ** Often, v-tables store their data in other SQLite tables, which
+    ** are queried from within xNext() and other v-table methods using
+    ** prepared queries. If such a query is out-of-date, we do not want to
+    ** discard the database schema, as the user code implementing the
+    ** v-table would have to be ready for the sqlite3_vtab structure itself
+    ** to be invalidated whenever sqlite3_step() is called from within
+    ** a v-table method.
+    */
+    if( db->aDb[pOp->p1].pSchema->schema_cookie!=iMeta ){
+      sqlite3ResetInternalSchema(db, pOp->p1);
+    }
+
+    sqlite3ExpirePreparedStatements(db);
+    rc = SQLITE_SCHEMA;
+  }
+  break;
+}
+
+/* Opcode: OpenRead P1 P2 P3 P4 P5
+**
+** Open a read-only cursor for the database table whose root page is
+** P2 in a database file.  The database file is determined by P3.
+** P3==0 means the main database, P3==1 means the database used for
+** temporary tables, and P3>1 means used the corresponding attached
+** database.  Give the new cursor an identifier of P1.  The P1
+** values need not be contiguous but all P1 values should be small integers.
+** It is an error for P1 to be negative.
+**
+** If P5!=0 then use the content of register P2 as the root page, not
+** the value of P2 itself.
+**
+** There will be a read lock on the database whenever there is an
+** open cursor.  If the database was unlocked prior to this instruction
+** then a read lock is acquired as part of this instruction.  A read
+** lock allows other processes to read the database but prohibits
+** any other process from modifying the database.  The read lock is
+** released when all cursors are closed.  If this instruction attempts
+** to get a read lock but fails, the script terminates with an
+** SQLITE_BUSY error code.
+**
+** The P4 value is a pointer to a KeyInfo structure that defines the
+** content and collating sequence of indices.  P4 is NULL for cursors
+** that are not pointing to indices.
+**
+** See also OpenWrite.
+*/
+/* Opcode: OpenWrite P1 P2 P3 P4 P5
+**
+** Open a read/write cursor named P1 on the table or index whose root
+** page is P2.  Or if P5!=0 use the content of register P2 to find the
+** root page.
+**
+** The P4 value is a pointer to a KeyInfo structure that defines the
+** content and collating sequence of indices.  P4 is NULL for cursors
+** that are not pointing to indices.
+**
+** This instruction works just like OpenRead except that it opens the cursor
+** in read/write mode.  For a given table, there can be one or more read-only
+** cursors or a single read/write cursor but not both.
+**
+** See also OpenRead.
+*/
+case OP_OpenRead:
+case OP_OpenWrite: {
+  int i = pOp->p1;
+  int p2 = pOp->p2;
+  int iDb = pOp->p3;
+  int wrFlag;
+  Btree *pX;
+  Cursor *pCur;
+  Db *pDb;
+
+  assert( iDb>=0 && iDb<db->nDb );
+  assert( (p->btreeMask & (1<<iDb))!=0 );
+  pDb = &db->aDb[iDb];
+  pX = pDb->pBt;
+  assert( pX!=0 );
+  if( pOp->opcode==OP_OpenWrite ){
+    wrFlag = 1;
+    if( pDb->pSchema->file_format < p->minWriteFileFormat ){
+      p->minWriteFileFormat = pDb->pSchema->file_format;
+    }
+  }else{
+    wrFlag = 0;
+  }
+  if( pOp->p5 ){
+    assert( p2>0 );
+    assert( p2<=p->nMem );
+    pIn2 = &p->aMem[p2];
+    sqlite3VdbeMemIntegerify(pIn2);
+    p2 = pIn2->u.i;
+    assert( p2>=2 );
+  }
+  assert( i>=0 );
+  pCur = allocateCursor(p, i, iDb);
+  if( pCur==0 ) goto no_mem;
+  pCur->nullRow = 1;
+  /* We always provide a key comparison function.  If the table being
+  ** opened is of type INTKEY, the comparision function will be ignored. */
+  rc = sqlite3BtreeCursor(pX, p2, wrFlag,
+           sqlite3VdbeRecordCompare, pOp->p4.p,
+           &pCur->pCursor);
+  if( pOp->p4type==P4_KEYINFO ){
+    pCur->pKeyInfo = pOp->p4.pKeyInfo;
+    pCur->pIncrKey = &pCur->pKeyInfo->incrKey;
+    pCur->pKeyInfo->enc = ENC(p->db);
+  }else{
+    pCur->pKeyInfo = 0;
+    pCur->pIncrKey = &pCur->bogusIncrKey;
+  }
+  switch( rc ){
+    case SQLITE_BUSY: {
+      p->pc = pc;
+      p->rc = rc = SQLITE_BUSY;
+      goto vdbe_return;
+    }
+    case SQLITE_OK: {
+      int flags = sqlite3BtreeFlags(pCur->pCursor);
+      /* Sanity checking.  Only the lower four bits of the flags byte should
+      ** be used.  Bit 3 (mask 0x08) is unpreditable.  The lower 3 bits
+      ** (mask 0x07) should be either 5 (intkey+leafdata for tables) or
+      ** 2 (zerodata for indices).  If these conditions are not met it can
+      ** only mean that we are dealing with a corrupt database file
+      */
+      if( (flags & 0xf0)!=0 || ((flags & 0x07)!=5 && (flags & 0x07)!=2) ){
+        rc = SQLITE_CORRUPT_BKPT;
+        goto abort_due_to_error;
+      }
+      pCur->isTable = (flags & BTREE_INTKEY)!=0;
+      pCur->isIndex = (flags & BTREE_ZERODATA)!=0;
+      /* If P4==0 it means we are expected to open a table.  If P4!=0 then
+      ** we expect to be opening an index.  If this is not what happened,
+      ** then the database is corrupt
+      */
+      if( (pCur->isTable && pOp->p4type==P4_KEYINFO)
+       || (pCur->isIndex && pOp->p4type!=P4_KEYINFO) ){
+        rc = SQLITE_CORRUPT_BKPT;
+        goto abort_due_to_error;
+      }
+      break;
+    }
+    case SQLITE_EMPTY: {
+      pCur->isTable = pOp->p4type!=P4_KEYINFO;
+      pCur->isIndex = !pCur->isTable;
+      rc = SQLITE_OK;
+      break;
+    }
+    default: {
+      goto abort_due_to_error;
+    }
+  }
+  break;
+}
+
+/* Opcode: OpenEphemeral P1 P2 * P4 *
+**
+** Open a new cursor P1 to a transient table.
+** The cursor is always opened read/write even if
+** the main database is read-only.  The transient or virtual
+** table is deleted automatically when the cursor is closed.
+**
+** P2 is the number of columns in the virtual table.
+** The cursor points to a BTree table if P4==0 and to a BTree index
+** if P4 is not 0.  If P4 is not NULL, it points to a KeyInfo structure
+** that defines the format of keys in the index.
+**
+** This opcode was once called OpenTemp.  But that created
+** confusion because the term "temp table", might refer either
+** to a TEMP table at the SQL level, or to a table opened by
+** this opcode.  Then this opcode was call OpenVirtual.  But
+** that created confusion with the whole virtual-table idea.
+*/
+case OP_OpenEphemeral: {
+  int i = pOp->p1;
+  Cursor *pCx;
+  static const int openFlags =
+      SQLITE_OPEN_READWRITE |
+      SQLITE_OPEN_CREATE |
+      SQLITE_OPEN_EXCLUSIVE |
+      SQLITE_OPEN_DELETEONCLOSE |
+      SQLITE_OPEN_TRANSIENT_DB;
+
+  assert( i>=0 );
+  pCx = allocateCursor(p, i, -1);
+  if( pCx==0 ) goto no_mem;
+  pCx->nullRow = 1;
+  rc = sqlite3BtreeFactory(db, 0, 1, SQLITE_DEFAULT_TEMP_CACHE_SIZE, openFlags,
+                           &pCx->pBt);
+  if( rc==SQLITE_OK ){
+    rc = sqlite3BtreeBeginTrans(pCx->pBt, 1);
+  }
+  if( rc==SQLITE_OK ){
+    /* If a transient index is required, create it by calling
+    ** sqlite3BtreeCreateTable() with the BTREE_ZERODATA flag before
+    ** opening it. If a transient table is required, just use the
+    ** automatically created table with root-page 1 (an INTKEY table).
+    */
+    if( pOp->p4.pKeyInfo ){
+      int pgno;
+      assert( pOp->p4type==P4_KEYINFO );
+      rc = sqlite3BtreeCreateTable(pCx->pBt, &pgno, BTREE_ZERODATA);
+      if( rc==SQLITE_OK ){
+        assert( pgno==MASTER_ROOT+1 );
+        rc = sqlite3BtreeCursor(pCx->pBt, pgno, 1, sqlite3VdbeRecordCompare,
+            pOp->p4.z, &pCx->pCursor);
+        pCx->pKeyInfo = pOp->p4.pKeyInfo;
+        pCx->pKeyInfo->enc = ENC(p->db);
+        pCx->pIncrKey = &pCx->pKeyInfo->incrKey;
+      }
+      pCx->isTable = 0;
+    }else{
+      rc = sqlite3BtreeCursor(pCx->pBt, MASTER_ROOT, 1, 0, 0, &pCx->pCursor);
+      pCx->isTable = 1;
+      pCx->pIncrKey = &pCx->bogusIncrKey;
+    }
+  }
+  pCx->nField = pOp->p2;
+  pCx->isIndex = !pCx->isTable;
+  break;
+}
+
+/* Opcode: OpenPseudo P1 * * * *
+**
+** Open a new cursor that points to a fake table that contains a single
+** row of data.  Any attempt to write a second row of data causes the
+** first row to be deleted.  All data is deleted when the cursor is
+** closed.
+**
+** A pseudo-table created by this opcode is useful for holding the
+** NEW or OLD tables in a trigger.  Also used to hold the a single
+** row output from the sorter so that the row can be decomposed into
+** individual columns using the OP_Column opcode.
+*/
+case OP_OpenPseudo: {
+  int i = pOp->p1;
+  Cursor *pCx;
+  assert( i>=0 );
+  pCx = allocateCursor(p, i, -1);
+  if( pCx==0 ) goto no_mem;
+  pCx->nullRow = 1;
+  pCx->pseudoTable = 1;
+  pCx->pIncrKey = &pCx->bogusIncrKey;
+  pCx->isTable = 1;
+  pCx->isIndex = 0;
+  break;
+}
+
+/* Opcode: Close P1 * * * *
+**
+** Close a cursor previously opened as P1.  If P1 is not
+** currently open, this instruction is a no-op.
+*/
+case OP_Close: {
+  int i = pOp->p1;
+  assert( i>=0 && i<p->nCursor );
+  sqlite3VdbeFreeCursor(p, p->apCsr[i]);
+  p->apCsr[i] = 0;
+  break;
+}
+
+/* Opcode: MoveGe P1 P2 P3 * *
+**
+** Use the value in register P3 as a key.  Reposition
+** cursor P1 so that it points to the smallest entry that is greater
+** than or equal to the key in register P3.
+** If there are no records greater than or equal to the key and P2
+** is not zero, then jump to P2.
+**
+** A special feature of this opcode (and different from the
+** related OP_MoveGt, OP_MoveLt, and OP_MoveLe) is that if P2 is
+** zero and P1 is an SQL table (a b-tree with integer keys) then
+** the seek is deferred until it is actually needed.  It might be
+** the case that the cursor is never accessed.  By deferring the
+** seek, we avoid unnecessary seeks.
+**
+** See also: Found, NotFound, Distinct, MoveLt, MoveGt, MoveLe
+*/
+/* Opcode: MoveGt P1 P2 P3 * *
+**
+** Use the value in register P3 as a key.  Reposition
+** cursor P1 so that it points to the smallest entry that is greater
+** than the key in register P3.
+** If there are no records greater than the key
+** then jump to P2.
+**
+** See also: Found, NotFound, Distinct, MoveLt, MoveGe, MoveLe
+*/
+/* Opcode: MoveLt P1 P2 P3 * *
+**
+** Use the value in register P3 as a key.  Reposition
+** cursor P1 so that it points to the largest entry that is less
+** than the key in register P3.
+** If there are no records less than the key
+** then jump to P2.
+**
+** See also: Found, NotFound, Distinct, MoveGt, MoveGe, MoveLe
+*/
+/* Opcode: MoveLe P1 P2 P3 * *
+**
+** Use the value in register P3 as a key.  Reposition
+** cursor P1 so that it points to the largest entry that is less than
+** or equal to the key.
+** If there are no records less than or eqal to the key
+** then jump to P2.
+**
+** See also: Found, NotFound, Distinct, MoveGt, MoveGe, MoveLt
+*/
+case OP_MoveLt:         /* jump, in3 */
+case OP_MoveLe:         /* jump, in3 */
+case OP_MoveGe:         /* jump, in3 */
+case OP_MoveGt: {       /* jump, in3 */
+  int i = pOp->p1;
+  Cursor *pC;
+
+  assert( i>=0 && i<p->nCursor );
+  pC = p->apCsr[i];
+  assert( pC!=0 );
+  if( pC->pCursor!=0 ){
+    int res, oc;
+    oc = pOp->opcode;
+    pC->nullRow = 0;
+    *pC->pIncrKey = oc==OP_MoveGt || oc==OP_MoveLe;
+    if( pC->isTable ){
+      i64 iKey = sqlite3VdbeIntValue(pIn3);
+      if( pOp->p2==0 ){
+        assert( pOp->opcode==OP_MoveGe );
+        pC->movetoTarget = iKey;
+        pC->rowidIsValid = 0;
+        pC->deferredMoveto = 1;
+        break;
+      }
+      rc = sqlite3BtreeMoveto(pC->pCursor, 0, (u64)iKey, 0, &res);
+      if( rc!=SQLITE_OK ){
+        goto abort_due_to_error;
+      }
+      pC->lastRowid = iKey;
+      pC->rowidIsValid = res==0;
+    }else{
+      assert( pIn3->flags & MEM_Blob );
+      ExpandBlob(pIn3);
+      rc = sqlite3BtreeMoveto(pC->pCursor, pIn3->z, pIn3->n, 0, &res);
+      if( rc!=SQLITE_OK ){
+        goto abort_due_to_error;
+      }
+      pC->rowidIsValid = 0;
+    }
+    pC->deferredMoveto = 0;
+    pC->cacheStatus = CACHE_STALE;
+    *pC->pIncrKey = 0;
+#ifdef SQLITE_TEST
+    sqlite3_search_count++;
+#endif
+    if( oc==OP_MoveGe || oc==OP_MoveGt ){
+      if( res<0 ){
+        rc = sqlite3BtreeNext(pC->pCursor, &res);
+        if( rc!=SQLITE_OK ) goto abort_due_to_error;
+        pC->rowidIsValid = 0;
+      }else{
+        res = 0;
+      }
+    }else{
+      assert( oc==OP_MoveLt || oc==OP_MoveLe );
+      if( res>=0 ){
+        rc = sqlite3BtreePrevious(pC->pCursor, &res);
+        if( rc!=SQLITE_OK ) goto abort_due_to_error;
+        pC->rowidIsValid = 0;
+      }else{
+        /* res might be negative because the table is empty.  Check to
+        ** see if this is the case.
+        */
+        res = sqlite3BtreeEof(pC->pCursor);
+      }
+    }
+    assert( pOp->p2>0 );
+    if( res ){
+      pc = pOp->p2 - 1;
+    }
+  }
+  break;
+}
+
+/* Opcode: Found P1 P2 P3 * *
+**
+** Register P3 holds a blob constructed by MakeRecord.  P1 is an index.
+** If an entry that matches the value in register p3 exists in P1 then
+** jump to P2.  If the P3 value does not match any entry in P1
+** then fall thru.  The P1 cursor is left pointing at the matching entry
+** if it exists.
+**
+** This instruction is used to implement the IN operator where the
+** left-hand side is a SELECT statement.  P1 may be a true index, or it
+** may be a temporary index that holds the results of the SELECT
+** statement.   This instruction is also used to implement the
+** DISTINCT keyword in SELECT statements.
+**
+** This instruction checks if index P1 contains a record for which
+** the first N serialised values exactly match the N serialised values
+** in the record in register P3, where N is the total number of values in
+** the P3 record (the P3 record is a prefix of the P1 record).
+**
+** See also: NotFound, MoveTo, IsUnique, NotExists
+*/
+/* Opcode: NotFound P1 P2 P3 * *
+**
+** Register P3 holds a blob constructed by MakeRecord.  P1 is
+** an index.  If no entry exists in P1 that matches the blob then jump
+** to P2.  If an entry does existing, fall through.  The cursor is left
+** pointing to the entry that matches.
+**
+** See also: Found, MoveTo, NotExists, IsUnique
+*/
+case OP_NotFound:       /* jump, in3 */
+case OP_Found: {        /* jump, in3 */
+  int i = pOp->p1;
+  int alreadyExists = 0;
+  Cursor *pC;
+  assert( i>=0 && i<p->nCursor );
+  assert( p->apCsr[i]!=0 );
+  if( (pC = p->apCsr[i])->pCursor!=0 ){
+    int res;
+    assert( pC->isTable==0 );
+    assert( pIn3->flags & MEM_Blob );
+    if( pOp->opcode==OP_Found ){
+      pC->pKeyInfo->prefixIsEqual = 1;
+    }
+    rc = sqlite3BtreeMoveto(pC->pCursor, pIn3->z, pIn3->n, 0, &res);
+    pC->pKeyInfo->prefixIsEqual = 0;
+    if( rc!=SQLITE_OK ){
+      break;
+    }
+    alreadyExists = (res==0);
+    pC->deferredMoveto = 0;
+    pC->cacheStatus = CACHE_STALE;
+  }
+  if( pOp->opcode==OP_Found ){
+    if( alreadyExists ) pc = pOp->p2 - 1;
+  }else{
+    if( !alreadyExists ) pc = pOp->p2 - 1;
+  }
+  break;
+}
+
+/* Opcode: IsUnique P1 P2 P3 P4 *
+**
+** The P3 register contains an integer record number.  Call this
+** record number R.  The P4 register contains an index key created
+** using MakeIdxRec.  Call it K.
+**
+** P1 is an index.  So it has no data and its key consists of a
+** record generated by OP_MakeRecord where the last field is the
+** rowid of the entry that the index refers to.
+**
+** This instruction asks if there is an entry in P1 where the
+** fields matches K but the rowid is different from R.
+** If there is no such entry, then there is an immediate
+** jump to P2.  If any entry does exist where the index string
+** matches K but the record number is not R, then the record
+** number for that entry is written into P3 and control
+** falls through to the next instruction.
+**
+** See also: NotFound, NotExists, Found
+*/
+case OP_IsUnique: {        /* jump, in3 */
+  int i = pOp->p1;
+  Cursor *pCx;
+  BtCursor *pCrsr;
+  Mem *pK;
+  i64 R;
+
+  /* Pop the value R off the top of the stack
+  */
+  assert( pOp->p4type==P4_INT32 );
+  assert( pOp->p4.i>0 && pOp->p4.i<=p->nMem );
+  pK = &p->aMem[pOp->p4.i];
+  sqlite3VdbeMemIntegerify(pIn3);
+  R = pIn3->u.i;
+  assert( i>=0 && i<p->nCursor );
+  pCx = p->apCsr[i];
+  assert( pCx!=0 );
+  pCrsr = pCx->pCursor;
+  if( pCrsr!=0 ){
+    int res;
+    i64 v;         /* The record number on the P1 entry that matches K */
+    char *zKey;    /* The value of K */
+    int nKey;      /* Number of bytes in K */
+    int len;       /* Number of bytes in K without the rowid at the end */
+    int szRowid;   /* Size of the rowid column at the end of zKey */
+
+    /* Make sure K is a string and make zKey point to K
+    */
+    assert( pK->flags & MEM_Blob );
+    zKey = pK->z;
+    nKey = pK->n;
+
+    szRowid = sqlite3VdbeIdxRowidLen((u8*)zKey);
+    len = nKey-szRowid;
+
+    /* Search for an entry in P1 where all but the last four bytes match K.
+    ** If there is no such entry, jump immediately to P2.
+    */
+    assert( pCx->deferredMoveto==0 );
+    pCx->cacheStatus = CACHE_STALE;
+    rc = sqlite3BtreeMoveto(pCrsr, zKey, len, 0, &res);
+    if( rc!=SQLITE_OK ){
+      goto abort_due_to_error;
+    }
+    if( res<0 ){
+      rc = sqlite3BtreeNext(pCrsr, &res);
+      if( res ){
+        pc = pOp->p2 - 1;
+        break;
+      }
+    }
+    rc = sqlite3VdbeIdxKeyCompare(pCx, len, (u8*)zKey, &res);
+    if( rc!=SQLITE_OK ) goto abort_due_to_error;
+    if( res>0 ){
+      pc = pOp->p2 - 1;
+      break;
+    }
+
+    /* At this point, pCrsr is pointing to an entry in P1 where all but
+    ** the final entry (the rowid) matches K.  Check to see if the
+    ** final rowid column is different from R.  If it equals R then jump
+    ** immediately to P2.
+    */
+    rc = sqlite3VdbeIdxRowid(pCrsr, &v);
+    if( rc!=SQLITE_OK ){
+      goto abort_due_to_error;
+    }
+    if( v==R ){
+      pc = pOp->p2 - 1;
+      break;
+    }
+
+    /* The final varint of the key is different from R.  Store it back
+    ** into register R3.  (The record number of an entry that violates
+    ** a UNIQUE constraint.)
+    */
+    pIn3->u.i = v;
+    assert( pIn3->flags&MEM_Int );
+  }
+  break;
+}
+
+/* Opcode: NotExists P1 P2 P3 * *
+**
+** Use the content of register P3 as a integer key.  If a record
+** with that key does not exist in table of P1, then jump to P2.
+** If the record does exist, then fall thru.  The cursor is left
+** pointing to the record if it exists.
+**
+** The difference between this operation and NotFound is that this
+** operation assumes the key is an integer and that P1 is a table whereas
+** NotFound assumes key is a blob constructed from MakeRecord and
+** P1 is an index.
+**
+** See also: Found, MoveTo, NotFound, IsUnique
+*/
+case OP_NotExists: {        /* jump, in3 */
+  int i = pOp->p1;
+  Cursor *pC;
+  BtCursor *pCrsr;
+  assert( i>=0 && i<p->nCursor );
+  assert( p->apCsr[i]!=0 );
+  if( (pCrsr = (pC = p->apCsr[i])->pCursor)!=0 ){
+    int res;
+    u64 iKey;
+    assert( pIn3->flags & MEM_Int );
+    assert( p->apCsr[i]->isTable );
+    iKey = intToKey(pIn3->u.i);
+    rc = sqlite3BtreeMoveto(pCrsr, 0, iKey, 0,&res);
+    pC->lastRowid = pIn3->u.i;
+    pC->rowidIsValid = res==0;
+    pC->nullRow = 0;
+    pC->cacheStatus = CACHE_STALE;
+    /* res might be uninitialized if rc!=SQLITE_OK.  But if rc!=SQLITE_OK
+    ** processing is about to abort so we really do not care whether or not
+    ** the following jump is taken.  (In other words, do not stress over
+    ** the error that valgrind sometimes shows on the next statement when
+    ** running ioerr.test and similar failure-recovery test scripts.) */
+    if( res!=0 ){
+      pc = pOp->p2 - 1;
+      assert( pC->rowidIsValid==0 );
+    }
+  }
+  break;
+}
+
+/* Opcode: Sequence P1 P2 * * *
+**
+** Find the next available sequence number for cursor P1.
+** Write the sequence number into register P2.
+** The sequence number on the cursor is incremented after this
+** instruction.
+*/
+case OP_Sequence: {           /* out2-prerelease */
+  int i = pOp->p1;
+  assert( i>=0 && i<p->nCursor );
+  assert( p->apCsr[i]!=0 );
+  pOut->u.i = p->apCsr[i]->seqCount++;
+  MemSetTypeFlag(pOut, MEM_Int);
+  break;
+}
+
+
+/* Opcode: NewRowid P1 P2 P3 * *
+**
+** Get a new integer record number (a.k.a "rowid") used as the key to a table.
+** The record number is not previously used as a key in the database
+** table that cursor P1 points to.  The new record number is written
+** written to register P2.
+**
+** If P3>0 then P3 is a register that holds the largest previously
+** generated record number.  No new record numbers are allowed to be less
+** than this value.  When this value reaches its maximum, a SQLITE_FULL
+** error is generated.  The P3 register is updated with the generated
+** record number.  This P3 mechanism is used to help implement the
+** AUTOINCREMENT feature.
+*/
+case OP_NewRowid: {           /* out2-prerelease */
+  int i = pOp->p1;
+  i64 v = 0;
+  Cursor *pC;
+  assert( i>=0 && i<p->nCursor );
+  assert( p->apCsr[i]!=0 );
+  if( (pC = p->apCsr[i])->pCursor==0 ){
+    /* The zero initialization above is all that is needed */
+  }else{
+    /* The next rowid or record number (different terms for the same
+    ** thing) is obtained in a two-step algorithm.
+    **
+    ** First we attempt to find the largest existing rowid and add one
+    ** to that.  But if the largest existing rowid is already the maximum
+    ** positive integer, we have to fall through to the second
+    ** probabilistic algorithm
+    **
+    ** The second algorithm is to select a rowid at random and see if
+    ** it already exists in the table.  If it does not exist, we have
+    ** succeeded.  If the random rowid does exist, we select a new one
+    ** and try again, up to 1000 times.
+    **
+    ** For a table with less than 2 billion entries, the probability
+    ** of not finding a unused rowid is about 1.0e-300.  This is a
+    ** non-zero probability, but it is still vanishingly small and should
+    ** never cause a problem.  You are much, much more likely to have a
+    ** hardware failure than for this algorithm to fail.
+    **
+    ** The analysis in the previous paragraph assumes that you have a good
+    ** source of random numbers.  Is a library function like lrand48()
+    ** good enough?  Maybe. Maybe not. It's hard to know whether there
+    ** might be subtle bugs is some implementations of lrand48() that
+    ** could cause problems. To avoid uncertainty, SQLite uses its own
+    ** random number generator based on the RC4 algorithm.
+    **
+    ** To promote locality of reference for repetitive inserts, the
+    ** first few attempts at chosing a random rowid pick values just a little
+    ** larger than the previous rowid.  This has been shown experimentally
+    ** to double the speed of the COPY operation.
+    */
+    int res, rx=SQLITE_OK, cnt;
+    i64 x;
+    cnt = 0;
+    if( (sqlite3BtreeFlags(pC->pCursor)&(BTREE_INTKEY|BTREE_ZERODATA)) !=
+          BTREE_INTKEY ){
+      rc = SQLITE_CORRUPT_BKPT;
+      goto abort_due_to_error;
+    }
+    assert( (sqlite3BtreeFlags(pC->pCursor) & BTREE_INTKEY)!=0 );
+    assert( (sqlite3BtreeFlags(pC->pCursor) & BTREE_ZERODATA)==0 );
+
+#ifdef SQLITE_32BIT_ROWID
+#   define MAX_ROWID 0x7fffffff
+#else
+    /* Some compilers complain about constants of the form 0x7fffffffffffffff.
+    ** Others complain about 0x7ffffffffffffffffLL.  The following macro seems
+    ** to provide the constant while making all compilers happy.
+    */
+#   define MAX_ROWID  ( (((u64)0x7fffffff)<<32) | (u64)0xffffffff )
+#endif
+
+    if( !pC->useRandomRowid ){
+      if( pC->nextRowidValid ){
+        v = pC->nextRowid;
+      }else{
+        rc = sqlite3BtreeLast(pC->pCursor, &res);
+        if( rc!=SQLITE_OK ){
+          goto abort_due_to_error;
+        }
+        if( res ){
+          v = 1;
+        }else{
+          sqlite3BtreeKeySize(pC->pCursor, &v);
+          v = keyToInt(v);
+          if( v==MAX_ROWID ){
+            pC->useRandomRowid = 1;
+          }else{
+            v++;
+          }
+        }
+      }
+
+#ifndef SQLITE_OMIT_AUTOINCREMENT
+      if( pOp->p3 ){
+        Mem *pMem;
+        assert( pOp->p3>0 && pOp->p3<=p->nMem ); /* P3 is a valid memory cell */
+        pMem = &p->aMem[pOp->p3];
+	REGISTER_TRACE(pOp->p3, pMem);
+        sqlite3VdbeMemIntegerify(pMem);
+        assert( (pMem->flags & MEM_Int)!=0 );  /* mem(P3) holds an integer */
+        if( pMem->u.i==MAX_ROWID || pC->useRandomRowid ){
+          rc = SQLITE_FULL;
+          goto abort_due_to_error;
+        }
+        if( v<pMem->u.i+1 ){
+          v = pMem->u.i + 1;
+        }
+        pMem->u.i = v;
+      }
+#endif
+
+      if( v<MAX_ROWID ){
+        pC->nextRowidValid = 1;
+        pC->nextRowid = v+1;
+      }else{
+        pC->nextRowidValid = 0;
+      }
+    }
+    if( pC->useRandomRowid ){
+      assert( pOp->p3==0 );  /* SQLITE_FULL must have occurred prior to this */
+      v = db->priorNewRowid;
+      cnt = 0;
+      do{
+        if( cnt==0 && (v&0xffffff)==v ){
+          v++;
+        }else{
+          sqlite3Randomness(sizeof(v), &v);
+          if( cnt<5 ) v &= 0xffffff;
+        }
+        if( v==0 ) continue;
+        x = intToKey(v);
+        rx = sqlite3BtreeMoveto(pC->pCursor, 0, (u64)x, 0, &res);
+        cnt++;
+      }while( cnt<100 && rx==SQLITE_OK && res==0 );
+      db->priorNewRowid = v;
+      if( rx==SQLITE_OK && res==0 ){
+        rc = SQLITE_FULL;
+        goto abort_due_to_error;
+      }
+    }
+    pC->rowidIsValid = 0;
+    pC->deferredMoveto = 0;
+    pC->cacheStatus = CACHE_STALE;
+  }
+  MemSetTypeFlag(pOut, MEM_Int);
+  pOut->u.i = v;
+  break;
+}
+
+/* Opcode: Insert P1 P2 P3 P4 P5
+**
+** Write an entry into the table of cursor P1.  A new entry is
+** created if it doesn't already exist or the data for an existing
+** entry is overwritten.  The data is the value stored register
+** number P2. The key is stored in register P3. The key must
+** be an integer.
+**
+** If the OPFLAG_NCHANGE flag of P5 is set, then the row change count is
+** incremented (otherwise not).  If the OPFLAG_LASTROWID flag of P5 is set,
+** then rowid is stored for subsequent return by the
+** sqlite3_last_insert_rowid() function (otherwise it is unmodified).
+**
+** Parameter P4 may point to a string containing the table-name, or
+** may be NULL. If it is not NULL, then the update-hook
+** (sqlite3.xUpdateCallback) is invoked following a successful insert.
+**
+** (WARNING/TODO: If P1 is a pseudo-cursor and P2 is dynamically
+** allocated, then ownership of P2 is transferred to the pseudo-cursor
+** and register P2 becomes ephemeral.  If the cursor is changed, the
+** value of register P2 will then change.  Make sure this does not
+** cause any problems.)
+**
+** This instruction only works on tables.  The equivalent instruction
+** for indices is OP_IdxInsert.
+*/
+case OP_Insert: {
+  Mem *pData = &p->aMem[pOp->p2];
+  Mem *pKey = &p->aMem[pOp->p3];
+
+  i64 iKey;   /* The integer ROWID or key for the record to be inserted */
+  int i = pOp->p1;
+  Cursor *pC;
+  assert( i>=0 && i<p->nCursor );
+  pC = p->apCsr[i];
+  assert( pC!=0 );
+  assert( pC->pCursor!=0 || pC->pseudoTable );
+  assert( pKey->flags & MEM_Int );
+  assert( pC->isTable );
+  REGISTER_TRACE(pOp->p2, pData);
+  REGISTER_TRACE(pOp->p3, pKey);
+
+  iKey = intToKey(pKey->u.i);
+  if( pOp->p5 & OPFLAG_NCHANGE ) p->nChange++;
+  if( pOp->p5 & OPFLAG_LASTROWID ) db->lastRowid = pKey->u.i;
+  if( pC->nextRowidValid && pKey->u.i>=pC->nextRowid ){
+    pC->nextRowidValid = 0;
+  }
+  if( pData->flags & MEM_Null ){
+    pData->z = 0;
+    pData->n = 0;
+  }else{
+    assert( pData->flags & (MEM_Blob|MEM_Str) );
+  }
+  if( pC->pseudoTable ){
+    sqlite3_free(pC->pData);
+    pC->iKey = iKey;
+    pC->nData = pData->n;
+    if( pData->flags & MEM_Dyn ){
+      pC->pData = pData->z;
+      pData->flags &= ~MEM_Dyn;
+      pData->flags |= MEM_Ephem;
+    }else{
+      pC->pData = sqlite3_malloc( pC->nData+2 );
+      if( !pC->pData ) goto no_mem;
+      memcpy(pC->pData, pData->z, pC->nData);
+      pC->pData[pC->nData] = 0;
+      pC->pData[pC->nData+1] = 0;
+    }
+    pC->nullRow = 0;
+  }else{
+    int nZero;
+    if( pData->flags & MEM_Zero ){
+      nZero = pData->u.i;
+    }else{
+      nZero = 0;
+    }
+    rc = sqlite3BtreeInsert(pC->pCursor, 0, iKey,
+                            pData->z, pData->n, nZero,
+                            pOp->p5 & OPFLAG_APPEND);
+  }
+
+  pC->rowidIsValid = 0;
+  pC->deferredMoveto = 0;
+  pC->cacheStatus = CACHE_STALE;
+
+  /* Invoke the update-hook if required. */
+  if( rc==SQLITE_OK && db->xUpdateCallback && pOp->p4.z ){
+    const char *zDb = db->aDb[pC->iDb].zName;
+    const char *zTbl = pOp->p4.z;
+    int op = ((pOp->p5 & OPFLAG_ISUPDATE) ? SQLITE_UPDATE : SQLITE_INSERT);
+    assert( pC->isTable );
+    db->xUpdateCallback(db->pUpdateArg, op, zDb, zTbl, iKey);
+    assert( pC->iDb>=0 );
+  }
+  break;
+}
+
+/* Opcode: Delete P1 P2 * P4 *
+**
+** Delete the record at which the P1 cursor is currently pointing.
+**
+** The cursor will be left pointing at either the next or the previous
+** record in the table. If it is left pointing at the next record, then
+** the next Next instruction will be a no-op.  Hence it is OK to delete
+** a record from within an Next loop.
+**
+** If the OPFLAG_NCHANGE flag of P2 is set, then the row change count is
+** incremented (otherwise not).
+**
+** P1 must not be pseudo-table.  It has to be a real table with
+** multiple rows.
+**
+** If P4 is not NULL, then it is the name of the table that P1 is
+** pointing to.  The update hook will be invoked, if it exists.
+** If P4 is not NULL then the P1 cursor must have been positioned
+** using OP_NotFound prior to invoking this opcode.
+*/
+case OP_Delete: {
+  int i = pOp->p1;
+  i64 iKey;
+  Cursor *pC;
+
+  assert( i>=0 && i<p->nCursor );
+  pC = p->apCsr[i];
+  assert( pC!=0 );
+  assert( pC->pCursor!=0 );  /* Only valid for real tables, no pseudotables */
+
+  /* If the update-hook will be invoked, set iKey to the rowid of the
+  ** row being deleted.
+  */
+  if( db->xUpdateCallback && pOp->p4.z ){
+    assert( pC->isTable );
+    assert( pC->rowidIsValid );  /* lastRowid set by previous OP_NotFound */
+    iKey = pC->lastRowid;
+  }
+
+  rc = sqlite3VdbeCursorMoveto(pC);
+  if( rc ) goto abort_due_to_error;
+  rc = sqlite3BtreeDelete(pC->pCursor);
+  pC->nextRowidValid = 0;
+  pC->cacheStatus = CACHE_STALE;
+
+  /* Invoke the update-hook if required. */
+  if( rc==SQLITE_OK && db->xUpdateCallback && pOp->p4.z ){
+    const char *zDb = db->aDb[pC->iDb].zName;
+    const char *zTbl = pOp->p4.z;
+    db->xUpdateCallback(db->pUpdateArg, SQLITE_DELETE, zDb, zTbl, iKey);
+    assert( pC->iDb>=0 );
+  }
+  if( pOp->p2 & OPFLAG_NCHANGE ) p->nChange++;
+  break;
+}
+
+/* Opcode: ResetCount P1 * *
+**
+** This opcode resets the VMs internal change counter to 0. If P1 is true,
+** then the value of the change counter is copied to the database handle
+** change counter (returned by subsequent calls to sqlite3_changes())
+** before it is reset. This is used by trigger programs.
+*/
+case OP_ResetCount: {
+  if( pOp->p1 ){
+    sqlite3VdbeSetChanges(db, p->nChange);
+  }
+  p->nChange = 0;
+  break;
+}
+
+/* Opcode: RowData P1 P2 * * *
+**
+** Write into register P2 the complete row data for cursor P1.
+** There is no interpretation of the data.
+** It is just copied onto the P2 register exactly as
+** it is found in the database file.
+**
+** If the P1 cursor must be pointing to a valid row (not a NULL row)
+** of a real table, not a pseudo-table.
+*/
+/* Opcode: RowKey P1 P2 * * *
+**
+** Write into register P2 the complete row key for cursor P1.
+** There is no interpretation of the data.
+** The key is copied onto the P3 register exactly as
+** it is found in the database file.
+**
+** If the P1 cursor must be pointing to a valid row (not a NULL row)
+** of a real table, not a pseudo-table.
+*/
+case OP_RowKey:
+case OP_RowData: {
+  int i = pOp->p1;
+  Cursor *pC;
+  BtCursor *pCrsr;
+  u32 n;
+
+  pOut = &p->aMem[pOp->p2];
+
+  /* Note that RowKey and RowData are really exactly the same instruction */
+  assert( i>=0 && i<p->nCursor );
+  pC = p->apCsr[i];
+  assert( pC->isTable || pOp->opcode==OP_RowKey );
+  assert( pC->isIndex || pOp->opcode==OP_RowData );
+  assert( pC!=0 );
+  assert( pC->nullRow==0 );
+  assert( pC->pseudoTable==0 );
+  assert( pC->pCursor!=0 );
+  pCrsr = pC->pCursor;
+  rc = sqlite3VdbeCursorMoveto(pC);
+  if( rc ) goto abort_due_to_error;
+  if( pC->isIndex ){
+    i64 n64;
+    assert( !pC->isTable );
+    sqlite3BtreeKeySize(pCrsr, &n64);
+    if( n64>SQLITE_MAX_LENGTH ){
+      goto too_big;
+    }
+    n = n64;
+  }else{
+    sqlite3BtreeDataSize(pCrsr, &n);
+    if( n>SQLITE_MAX_LENGTH ){
+      goto too_big;
+    }
+  }
+  if( sqlite3VdbeMemGrow(pOut, n, 0) ){
+    goto no_mem;
+  }
+  pOut->n = n;
+  MemSetTypeFlag(pOut, MEM_Blob);
+  if( pC->isIndex ){
+    rc = sqlite3BtreeKey(pCrsr, 0, n, pOut->z);
+  }else{
+    rc = sqlite3BtreeData(pCrsr, 0, n, pOut->z);
+  }
+  pOut->enc = SQLITE_UTF8;  /* In case the blob is ever cast to text */
+  UPDATE_MAX_BLOBSIZE(pOut);
+  break;
+}
+
+/* Opcode: Rowid P1 P2 * * *
+**
+** Store in register P2 an integer which is the key of the table entry that
+** P1 is currently point to.  If p2==0 then push the integer.
+*/
+case OP_Rowid: {                 /* out2-prerelease */
+  int i = pOp->p1;
+  Cursor *pC;
+  i64 v;
+
+  assert( i>=0 && i<p->nCursor );
+  pC = p->apCsr[i];
+  assert( pC!=0 );
+  rc = sqlite3VdbeCursorMoveto(pC);
+  if( rc ) goto abort_due_to_error;
+  if( pC->rowidIsValid ){
+    v = pC->lastRowid;
+  }else if( pC->pseudoTable ){
+    v = keyToInt(pC->iKey);
+  }else if( pC->nullRow ){
+    /* Leave the rowid set to a NULL */
+    break;
+  }else{
+    assert( pC->pCursor!=0 );
+    sqlite3BtreeKeySize(pC->pCursor, &v);
+    v = keyToInt(v);
+  }
+  pOut->u.i = v;
+  MemSetTypeFlag(pOut, MEM_Int);
+  break;
+}
+
+/* Opcode: NullRow P1 * * * *
+**
+** Move the cursor P1 to a null row.  Any OP_Column operations
+** that occur while the cursor is on the null row will always
+** write a NULL.
+*/
+case OP_NullRow: {
+  int i = pOp->p1;
+  Cursor *pC;
+
+  assert( i>=0 && i<p->nCursor );
+  pC = p->apCsr[i];
+  assert( pC!=0 );
+  pC->nullRow = 1;
+  pC->rowidIsValid = 0;
+  break;
+}
+
+/* Opcode: Last P1 P2 * * *
+**
+** The next use of the Rowid or Column or Next instruction for P1
+** will refer to the last entry in the database table or index.
+** If the table or index is empty and P2>0, then jump immediately to P2.
+** If P2 is 0 or if the table or index is not empty, fall through
+** to the following instruction.
+*/
+case OP_Last: {        /* jump */
+  int i = pOp->p1;
+  Cursor *pC;
+  BtCursor *pCrsr;
+  int res;
+
+  assert( i>=0 && i<p->nCursor );
+  pC = p->apCsr[i];
+  assert( pC!=0 );
+  pCrsr = pC->pCursor;
+  assert( pCrsr!=0 );
+  rc = sqlite3BtreeLast(pCrsr, &res);
+  pC->nullRow = res;
+  pC->deferredMoveto = 0;
+  pC->cacheStatus = CACHE_STALE;
+  if( res && pOp->p2>0 ){
+    pc = pOp->p2 - 1;
+  }
+  break;
+}
+
+
+/* Opcode: Sort P1 P2 * * *
+**
+** This opcode does exactly the same thing as OP_Rewind except that
+** it increments an undocumented global variable used for testing.
+**
+** Sorting is accomplished by writing records into a sorting index,
+** then rewinding that index and playing it back from beginning to
+** end.  We use the OP_Sort opcode instead of OP_Rewind to do the
+** rewinding so that the global variable will be incremented and
+** regression tests can determine whether or not the optimizer is
+** correctly optimizing out sorts.
+*/
+case OP_Sort: {        /* jump */
+#ifdef SQLITE_TEST
+  sqlite3_sort_count++;
+  sqlite3_search_count--;
+#endif
+  /* Fall through into OP_Rewind */
+}
+/* Opcode: Rewind P1 P2 * * *
+**
+** The next use of the Rowid or Column or Next instruction for P1
+** will refer to the first entry in the database table or index.
+** If the table or index is empty and P2>0, then jump immediately to P2.
+** If P2 is 0 or if the table or index is not empty, fall through
+** to the following instruction.
+*/
+case OP_Rewind: {        /* jump */
+  int i = pOp->p1;
+  Cursor *pC;
+  BtCursor *pCrsr;
+  int res;
+
+  assert( i>=0 && i<p->nCursor );
+  pC = p->apCsr[i];
+  assert( pC!=0 );
+  if( (pCrsr = pC->pCursor)!=0 ){
+    rc = sqlite3BtreeFirst(pCrsr, &res);
+    pC->atFirst = res==0;
+    pC->deferredMoveto = 0;
+    pC->cacheStatus = CACHE_STALE;
+  }else{
+    res = 1;
+  }
+  pC->nullRow = res;
+  assert( pOp->p2>0 && pOp->p2<p->nOp );
+  if( res ){
+    pc = pOp->p2 - 1;
+  }
+  break;
+}
+
+/* Opcode: Next P1 P2 * * *
+**
+** Advance cursor P1 so that it points to the next key/data pair in its
+** table or index.  If there are no more key/value pairs then fall through
+** to the following instruction.  But if the cursor advance was successful,
+** jump immediately to P2.
+**
+** The P1 cursor must be for a real table, not a pseudo-table.
+**
+** See also: Prev
+*/
+/* Opcode: Prev P1 P2 * * *
+**
+** Back up cursor P1 so that it points to the previous key/data pair in its
+** table or index.  If there is no previous key/value pairs then fall through
+** to the following instruction.  But if the cursor backup was successful,
+** jump immediately to P2.
+**
+** The P1 cursor must be for a real table, not a pseudo-table.
+*/
+case OP_Prev:          /* jump */
+case OP_Next: {        /* jump */
+  Cursor *pC;
+  BtCursor *pCrsr;
+
+  CHECK_FOR_INTERRUPT;
+  assert( pOp->p1>=0 && pOp->p1<p->nCursor );
+  pC = p->apCsr[pOp->p1];
+  if( pC==0 ){
+    break;  /* See ticket #2273 */
+  }
+  pCrsr = pC->pCursor;
+  assert( pCrsr );
+  if( pC->nullRow==0 ){
+    int res = 1;
+    assert( pC->deferredMoveto==0 );
+    rc = pOp->opcode==OP_Next ? sqlite3BtreeNext(pCrsr, &res) :
+                                sqlite3BtreePrevious(pCrsr, &res);
+    pC->nullRow = res;
+    pC->cacheStatus = CACHE_STALE;
+    if( res==0 ){
+      pc = pOp->p2 - 1;
+#ifdef SQLITE_TEST
+      sqlite3_search_count++;
+#endif
+    }
+  }
+  pC->rowidIsValid = 0;
+  break;
+}
+
+/* Opcode: IdxInsert P1 P2 P3 * *
+**
+** Register P2 holds a SQL index key made using the
+** MakeIdxRec instructions.  This opcode writes that key
+** into the index P1.  Data for the entry is nil.
+**
+** P3 is a flag that provides a hint to the b-tree layer that this
+** insert is likely to be an append.
+**
+** This instruction only works for indices.  The equivalent instruction
+** for tables is OP_Insert.
+*/
+case OP_IdxInsert: {        /* in2 */
+  int i = pOp->p1;
+  Cursor *pC;
+  BtCursor *pCrsr;
+  assert( i>=0 && i<p->nCursor );
+  assert( p->apCsr[i]!=0 );
+  assert( pIn2->flags & MEM_Blob );
+  if( (pCrsr = (pC = p->apCsr[i])->pCursor)!=0 ){
+    assert( pC->isTable==0 );
+    rc = ExpandBlob(pIn2);
+    if( rc==SQLITE_OK ){
+      int nKey = pIn2->n;
+      const char *zKey = pIn2->z;
+      rc = sqlite3BtreeInsert(pCrsr, zKey, nKey, "", 0, 0, pOp->p3);
+      assert( pC->deferredMoveto==0 );
+      pC->cacheStatus = CACHE_STALE;
+    }
+  }
+  break;
+}
+
+/* Opcode: IdxDelete P1 P2 * * *
+**
+** The content of register P2 is an index key built using the
+** MakeIdxRec opcode. This opcode removes that entry from the
+** index opened by cursor P1.
+*/
+case OP_IdxDelete: {        /* in2 */
+  int i = pOp->p1;
+  Cursor *pC;
+  BtCursor *pCrsr;
+  assert( pIn2->flags & MEM_Blob );
+  assert( i>=0 && i<p->nCursor );
+  assert( p->apCsr[i]!=0 );
+  if( (pCrsr = (pC = p->apCsr[i])->pCursor)!=0 ){
+    int res;
+    rc = sqlite3BtreeMoveto(pCrsr, pIn2->z, pIn2->n, 0, &res);
+    if( rc==SQLITE_OK && res==0 ){
+      rc = sqlite3BtreeDelete(pCrsr);
+    }
+    assert( pC->deferredMoveto==0 );
+    pC->cacheStatus = CACHE_STALE;
+  }
+  break;
+}
+
+/* Opcode: IdxRowid P1 P2 * * *
+**
+** Write into register P2 an integer which is the last entry in the record at
+** the end of the index key pointed to by cursor P1.  This integer should be
+** the rowid of the table entry to which this index entry points.
+**
+** See also: Rowid, MakeIdxRec.
+*/
+case OP_IdxRowid: {              /* out2-prerelease */
+  int i = pOp->p1;
+  BtCursor *pCrsr;
+  Cursor *pC;
+
+  assert( i>=0 && i<p->nCursor );
+  assert( p->apCsr[i]!=0 );
+  if( (pCrsr = (pC = p->apCsr[i])->pCursor)!=0 ){
+    i64 rowid;
+
+    assert( pC->deferredMoveto==0 );
+    assert( pC->isTable==0 );
+    if( !pC->nullRow ){
+      rc = sqlite3VdbeIdxRowid(pCrsr, &rowid);
+      if( rc!=SQLITE_OK ){
+        goto abort_due_to_error;
+      }
+      MemSetTypeFlag(pOut, MEM_Int);
+      pOut->u.i = rowid;
+    }
+  }
+  break;
+}
+
+/* Opcode: IdxGE P1 P2 P3 * P5
+**
+** The value in register P3 is an index entry that omits the ROWID.  Compare
+** this value against the index that P1 is currently pointing to.
+** Ignore the ROWID on the P1 index.
+**
+** If the P1 index entry is greater than or equal to the value in
+** register P3 then jump to P2.  Otherwise fall through to the next
+** instruction.
+**
+** If P5 is non-zero then the value in register P3 is temporarily
+** increased by an epsilon prior to the comparison.  This make the opcode work
+** like IdxGT except that if the key from register P3 is a prefix of
+** the key in the cursor, the result is false whereas it would be
+** true with IdxGT.
+*/
+/* Opcode: IdxLT P1 P2 P3 * P5
+**
+** The value in register P3 is an index entry that omits the ROWID.  Compare
+** the this value against the index that P1 is currently pointing to.
+** Ignore the ROWID on the P1 index.
+**
+** If the P1 index entry is less than the register P3 value
+** then jump to P2.  Otherwise fall through to the next instruction.
+**
+** If P5 is non-zero then the
+** index taken from register P3 is temporarily increased by
+** an epsilon prior to the comparison.  This makes the opcode work
+** like IdxLE.
+*/
+case OP_IdxLT:          /* jump, in3 */
+case OP_IdxGE: {        /* jump, in3 */
+  int i= pOp->p1;
+  Cursor *pC;
+
+  assert( i>=0 && i<p->nCursor );
+  assert( p->apCsr[i]!=0 );
+  if( (pC = p->apCsr[i])->pCursor!=0 ){
+    int res;
+
+    assert( pIn3->flags & MEM_Blob );  /* Created using OP_MakeRecord */
+    assert( pC->deferredMoveto==0 );
+    ExpandBlob(pIn3);
+    assert( pOp->p5==0 || pOp->p5==1 );
+    *pC->pIncrKey = pOp->p5;
+    rc = sqlite3VdbeIdxKeyCompare(pC, pIn3->n, (u8*)pIn3->z, &res);
+    *pC->pIncrKey = 0;
+    if( rc!=SQLITE_OK ){
+      break;
+    }
+    if( pOp->opcode==OP_IdxLT ){
+      res = -res;
+    }else{
+      assert( pOp->opcode==OP_IdxGE );
+      res++;
+    }
+    if( res>0 ){
+      pc = pOp->p2 - 1 ;
+    }
+  }
+  break;
+}
+
+/* Opcode: Destroy P1 P2 P3 * *
+**
+** Delete an entire database table or index whose root page in the database
+** file is given by P1.
+**
+** The table being destroyed is in the main database file if P3==0.  If
+** P3==1 then the table to be clear is in the auxiliary database file
+** that is used to store tables create using CREATE TEMPORARY TABLE.
+**
+** If AUTOVACUUM is enabled then it is possible that another root page
+** might be moved into the newly deleted root page in order to keep all
+** root pages contiguous at the beginning of the database.  The former
+** value of the root page that moved - its value before the move occurred -
+** is stored in register P2.  If no page
+** movement was required (because the table being dropped was already
+** the last one in the database) then a zero is stored in register P2.
+** If AUTOVACUUM is disabled then a zero is stored in register P2.
+**
+** See also: Clear
+*/
+case OP_Destroy: {     /* out2-prerelease */
+  int iMoved;
+  int iCnt;
+#ifndef SQLITE_OMIT_VIRTUALTABLE
+  Vdbe *pVdbe;
+  iCnt = 0;
+  for(pVdbe=db->pVdbe; pVdbe; pVdbe=pVdbe->pNext){
+    if( pVdbe->magic==VDBE_MAGIC_RUN && pVdbe->inVtabMethod<2 && pVdbe->pc>=0 ){
+      iCnt++;
+    }
+  }
+#else
+  iCnt = db->activeVdbeCnt;
+#endif
+  if( iCnt>1 ){
+    rc = SQLITE_LOCKED;
+    p->errorAction = OE_Abort;
+  }else{
+    int iDb = pOp->p3;
+    assert( iCnt==1 );
+    assert( (p->btreeMask & (1<<iDb))!=0 );
+    rc = sqlite3BtreeDropTable(db->aDb[iDb].pBt, pOp->p1, &iMoved);
+    MemSetTypeFlag(pOut, MEM_Int);
+    pOut->u.i = iMoved;
+#ifndef SQLITE_OMIT_AUTOVACUUM
+    if( rc==SQLITE_OK && iMoved!=0 ){
+      sqlite3RootPageMoved(&db->aDb[iDb], iMoved, pOp->p1);
+    }
+#endif
+  }
+  break;
+}
+
+/* Opcode: Clear P1 P2 *
+**
+** Delete all contents of the database table or index whose root page
+** in the database file is given by P1.  But, unlike Destroy, do not
+** remove the table or index from the database file.
+**
+** The table being clear is in the main database file if P2==0.  If
+** P2==1 then the table to be clear is in the auxiliary database file
+** that is used to store tables create using CREATE TEMPORARY TABLE.
+**
+** See also: Destroy
+*/
+case OP_Clear: {
+  assert( (p->btreeMask & (1<<pOp->p2))!=0 );
+  rc = sqlite3BtreeClearTable(db->aDb[pOp->p2].pBt, pOp->p1);
+  break;
+}
+
+/* Opcode: CreateTable P1 P2 * * *
+**
+** Allocate a new table in the main database file if P1==0 or in the
+** auxiliary database file if P1==1 or in an attached database if
+** P1>1.  Write the root page number of the new table into
+** register P2
+**
+** The difference between a table and an index is this:  A table must
+** have a 4-byte integer key and can have arbitrary data.  An index
+** has an arbitrary key but no data.
+**
+** See also: CreateIndex
+*/
+/* Opcode: CreateIndex P1 P2 * * *
+**
+** Allocate a new index in the main database file if P1==0 or in the
+** auxiliary database file if P1==1 or in an attached database if
+** P1>1.  Write the root page number of the new table into
+** register P2.
+**
+** See documentation on OP_CreateTable for additional information.
+*/
+case OP_CreateIndex:            /* out2-prerelease */
+case OP_CreateTable: {          /* out2-prerelease */
+  int pgno;
+  int flags;
+  Db *pDb;
+  assert( pOp->p1>=0 && pOp->p1<db->nDb );
+  assert( (p->btreeMask & (1<<pOp->p1))!=0 );
+  pDb = &db->aDb[pOp->p1];
+  assert( pDb->pBt!=0 );
+  if( pOp->opcode==OP_CreateTable ){
+    /* flags = BTREE_INTKEY; */
+    flags = BTREE_LEAFDATA|BTREE_INTKEY;
+  }else{
+    flags = BTREE_ZERODATA;
+  }
+  rc = sqlite3BtreeCreateTable(pDb->pBt, &pgno, flags);
+  if( rc==SQLITE_OK ){
+    pOut->u.i = pgno;
+    MemSetTypeFlag(pOut, MEM_Int);
+  }
+  break;
+}
+
+/* Opcode: ParseSchema P1 P2 * P4 *
+**
+** Read and parse all entries from the SQLITE_MASTER table of database P1
+** that match the WHERE clause P4.  P2 is the "force" flag.   Always do
+** the parsing if P2 is true.  If P2 is false, then this routine is a
+** no-op if the schema is not currently loaded.  In other words, if P2
+** is false, the SQLITE_MASTER table is only parsed if the rest of the
+** schema is already loaded into the symbol table.
+**
+** This opcode invokes the parser to create a new virtual machine,
+** then runs the new virtual machine.  It is thus a reentrant opcode.
+*/
+case OP_ParseSchema: {
+  char *zSql;
+  int iDb = pOp->p1;
+  const char *zMaster;
+  InitData initData;
+
+  assert( iDb>=0 && iDb<db->nDb );
+  if( !pOp->p2 && !DbHasProperty(db, iDb, DB_SchemaLoaded) ){
+    break;
+  }
+  zMaster = SCHEMA_TABLE(iDb);
+  initData.db = db;
+  initData.iDb = pOp->p1;
+  initData.pzErrMsg = &p->zErrMsg;
+  zSql = sqlite3MPrintf(db,
+     "SELECT name, rootpage, sql FROM '%q'.%s WHERE %s",
+     db->aDb[iDb].zName, zMaster, pOp->p4.z);
+  if( zSql==0 ) goto no_mem;
+  (void)sqlite3SafetyOff(db);
+  assert( db->init.busy==0 );
+  db->init.busy = 1;
+  assert( !db->mallocFailed );
+  rc = sqlite3_exec(db, zSql, sqlite3InitCallback, &initData, 0);
+  if( rc==SQLITE_ABORT ) rc = initData.rc;
+  sqlite3_free(zSql);
+  db->init.busy = 0;
+  (void)sqlite3SafetyOn(db);
+  if( rc==SQLITE_NOMEM ){
+    goto no_mem;
+  }
+  break;
+}
+
+#if !defined(SQLITE_OMIT_ANALYZE) && !defined(SQLITE_OMIT_PARSER)
+/* Opcode: LoadAnalysis P1 * * * *
+**
+** Read the sqlite_stat1 table for database P1 and load the content
+** of that table into the internal index hash table.  This will cause
+** the analysis to be used when preparing all subsequent queries.
+*/
+case OP_LoadAnalysis: {
+  int iDb = pOp->p1;
+  assert( iDb>=0 && iDb<db->nDb );
+  rc = sqlite3AnalysisLoad(db, iDb);
+  break;
+}
+#endif /* !defined(SQLITE_OMIT_ANALYZE) && !defined(SQLITE_OMIT_PARSER)  */
+
+/* Opcode: DropTable P1 * * P4 *
+**
+** Remove the internal (in-memory) data structures that describe
+** the table named P4 in database P1.  This is called after a table
+** is dropped in order to keep the internal representation of the
+** schema consistent with what is on disk.
+*/
+case OP_DropTable: {
+  sqlite3UnlinkAndDeleteTable(db, pOp->p1, pOp->p4.z);
+  break;
+}
+
+/* Opcode: DropIndex P1 * * P4 *
+**
+** Remove the internal (in-memory) data structures that describe
+** the index named P4 in database P1.  This is called after an index
+** is dropped in order to keep the internal representation of the
+** schema consistent with what is on disk.
+*/
+case OP_DropIndex: {
+  sqlite3UnlinkAndDeleteIndex(db, pOp->p1, pOp->p4.z);
+  break;
+}
+
+/* Opcode: DropTrigger P1 * * P4 *
+**
+** Remove the internal (in-memory) data structures that describe
+** the trigger named P4 in database P1.  This is called after a trigger
+** is dropped in order to keep the internal representation of the
+** schema consistent with what is on disk.
+*/
+case OP_DropTrigger: {
+  sqlite3UnlinkAndDeleteTrigger(db, pOp->p1, pOp->p4.z);
+  break;
+}
+
+
+#ifndef SQLITE_OMIT_INTEGRITY_CHECK
+/* Opcode: IntegrityCk P1 P2 P3 * P5
+**
+** Do an analysis of the currently open database.  Store in
+** register P1 the text of an error message describing any problems.
+** If no problems are found, store a NULL in register P1.
+**
+** The register P3 contains the maximum number of allowed errors.
+** At most reg(P3) errors will be reported.
+** In other words, the analysis stops as soon as reg(P1) errors are
+** seen.  Reg(P1) is updated with the number of errors remaining.
+**
+** The root page numbers of all tables in the database are integer
+** stored in reg(P1), reg(P1+1), reg(P1+2), ....  There are P2 tables
+** total.
+**
+** If P5 is not zero, the check is done on the auxiliary database
+** file, not the main database file.
+**
+** This opcode is used to implement the integrity_check pragma.
+*/
+case OP_IntegrityCk: {
+  int nRoot;      /* Number of tables to check.  (Number of root pages.) */
+  int *aRoot;     /* Array of rootpage numbers for tables to be checked */
+  int j;          /* Loop counter */
+  int nErr;       /* Number of errors reported */
+  char *z;        /* Text of the error report */
+  Mem *pnErr;     /* Register keeping track of errors remaining */
+
+  nRoot = pOp->p2;
+  assert( nRoot>0 );
+  aRoot = sqlite3_malloc( sizeof(int)*(nRoot+1) );
+  if( aRoot==0 ) goto no_mem;
+  assert( pOp->p3>0 && pOp->p3<=p->nMem );
+  pnErr = &p->aMem[pOp->p3];
+  assert( (pnErr->flags & MEM_Int)!=0 );
+  assert( (pnErr->flags & (MEM_Str|MEM_Blob))==0 );
+  pIn1 = &p->aMem[pOp->p1];
+  for(j=0; j<nRoot; j++){
+    aRoot[j] = sqlite3VdbeIntValue(&pIn1[j]);
+  }
+  aRoot[j] = 0;
+  assert( pOp->p5<db->nDb );
+  assert( (p->btreeMask & (1<<pOp->p5))!=0 );
+  z = sqlite3BtreeIntegrityCheck(db->aDb[pOp->p5].pBt, aRoot, nRoot,
+                                 pnErr->u.i, &nErr);
+  pnErr->u.i -= nErr;
+  sqlite3VdbeMemSetNull(pIn1);
+  if( nErr==0 ){
+    assert( z==0 );
+  }else{
+    sqlite3VdbeMemSetStr(pIn1, z, -1, SQLITE_UTF8, sqlite3_free);
+  }
+  UPDATE_MAX_BLOBSIZE(pIn1);
+  sqlite3VdbeChangeEncoding(pIn1, encoding);
+  sqlite3_free(aRoot);
+  break;
+}
+#endif /* SQLITE_OMIT_INTEGRITY_CHECK */
+
+/* Opcode: FifoWrite P1 * * * *
+**
+** Write the integer from register P1 into the Fifo.
+*/
+case OP_FifoWrite: {        /* in1 */
+  if( sqlite3VdbeFifoPush(&p->sFifo, sqlite3VdbeIntValue(pIn1))==SQLITE_NOMEM ){
+    goto no_mem;
+  }
+  break;
+}
+
+/* Opcode: FifoRead P1 P2 * * *
+**
+** Attempt to read a single integer from the Fifo.  Store that
+** integer in register P1.
+**
+** If the Fifo is empty jump to P2.
+*/
+case OP_FifoRead: {         /* jump */
+  CHECK_FOR_INTERRUPT;
+  assert( pOp->p1>0 && pOp->p1<=p->nMem );
+  pOut = &p->aMem[pOp->p1];
+  MemSetTypeFlag(pOut, MEM_Int);
+  if( sqlite3VdbeFifoPop(&p->sFifo, &pOut->u.i)==SQLITE_DONE ){
+    pc = pOp->p2 - 1;
+  }
+  break;
+}
+
+#ifndef SQLITE_OMIT_TRIGGER
+/* Opcode: ContextPush * * *
+**
+** Save the current Vdbe context such that it can be restored by a ContextPop
+** opcode. The context stores the last insert row id, the last statement change
+** count, and the current statement change count.
+*/
+case OP_ContextPush: {
+  int i = p->contextStackTop++;
+  Context *pContext;
+
+  assert( i>=0 );
+  /* FIX ME: This should be allocated as part of the vdbe at compile-time */
+  if( i>=p->contextStackDepth ){
+    p->contextStackDepth = i+1;
+    p->contextStack = sqlite3DbReallocOrFree(db, p->contextStack,
+                                          sizeof(Context)*(i+1));
+    if( p->contextStack==0 ) goto no_mem;
+  }
+  pContext = &p->contextStack[i];
+  pContext->lastRowid = db->lastRowid;
+  pContext->nChange = p->nChange;
+  pContext->sFifo = p->sFifo;
+  sqlite3VdbeFifoInit(&p->sFifo);
+  break;
+}
+
+/* Opcode: ContextPop * * *
+**
+** Restore the Vdbe context to the state it was in when contextPush was last
+** executed. The context stores the last insert row id, the last statement
+** change count, and the current statement change count.
+*/
+case OP_ContextPop: {
+  Context *pContext = &p->contextStack[--p->contextStackTop];
+  assert( p->contextStackTop>=0 );
+  db->lastRowid = pContext->lastRowid;
+  p->nChange = pContext->nChange;
+  sqlite3VdbeFifoClear(&p->sFifo);
+  p->sFifo = pContext->sFifo;
+  break;
+}
+#endif /* #ifndef SQLITE_OMIT_TRIGGER */
+
+#ifndef SQLITE_OMIT_AUTOINCREMENT
+/* Opcode: MemMax P1 P2 * * *
+**
+** Set the value of register P1 to the maximum of its current value
+** and the value in register P2.
+**
+** This instruction throws an error if the memory cell is not initially
+** an integer.
+*/
+case OP_MemMax: {        /* in1, in2 */
+  sqlite3VdbeMemIntegerify(pIn1);
+  sqlite3VdbeMemIntegerify(pIn2);
+  if( pIn1->u.i<pIn2->u.i){
+    pIn1->u.i = pIn2->u.i;
+  }
+  break;
+}
+#endif /* SQLITE_OMIT_AUTOINCREMENT */
+
+/* Opcode: IfPos P1 P2 * * *
+**
+** If the value of register P1 is 1 or greater, jump to P2.
+**
+** It is illegal to use this instruction on a register that does
+** not contain an integer.  An assertion fault will result if you try.
+*/
+case OP_IfPos: {        /* jump, in1 */
+  assert( pIn1->flags&MEM_Int );
+  if( pIn1->u.i>0 ){
+     pc = pOp->p2 - 1;
+  }
+  break;
+}
+
+/* Opcode: IfNeg P1 P2 * * *
+**
+** If the value of register P1 is less than zero, jump to P2.
+**
+** It is illegal to use this instruction on a register that does
+** not contain an integer.  An assertion fault will result if you try.
+*/
+case OP_IfNeg: {        /* jump, in1 */
+  assert( pIn1->flags&MEM_Int );
+  if( pIn1->u.i<0 ){
+     pc = pOp->p2 - 1;
+  }
+  break;
+}
+
+/* Opcode: IfZero P1 P2 * * *
+**
+** If the value of register P1 is exactly 0, jump to P2.
+**
+** It is illegal to use this instruction on a register that does
+** not contain an integer.  An assertion fault will result if you try.
+*/
+case OP_IfZero: {        /* jump, in1 */
+  assert( pIn1->flags&MEM_Int );
+  if( pIn1->u.i==0 ){
+     pc = pOp->p2 - 1;
+  }
+  break;
+}
+
+/* Opcode: AggStep * P2 P3 P4 P5
+**
+** Execute the step function for an aggregate.  The
+** function has P5 arguments.   P4 is a pointer to the FuncDef
+** structure that specifies the function.  Use register
+** P3 as the accumulator.
+**
+** The P5 arguments are taken from register P2 and its
+** successors.
+*/
+case OP_AggStep: {
+  int n = pOp->p5;
+  int i;
+  Mem *pMem, *pRec;
+  sqlite3_context ctx;
+  sqlite3_value **apVal;
+
+  assert( n>=0 );
+  pRec = &p->aMem[pOp->p2];
+  apVal = p->apArg;
+  assert( apVal || n==0 );
+  for(i=0; i<n; i++, pRec++){
+    apVal[i] = pRec;
+    storeTypeInfo(pRec, encoding);
+  }
+  ctx.pFunc = pOp->p4.pFunc;
+  assert( pOp->p3>0 && pOp->p3<=p->nMem );
+  ctx.pMem = pMem = &p->aMem[pOp->p3];
+  pMem->n++;
+  ctx.s.flags = MEM_Null;
+  ctx.s.z = 0;
+  ctx.s.xDel = 0;
+  ctx.s.db = db;
+  ctx.isError = 0;
+  ctx.pColl = 0;
+  if( ctx.pFunc->needCollSeq ){
+    assert( pOp>p->aOp );
+    assert( pOp[-1].p4type==P4_COLLSEQ );
+    assert( pOp[-1].opcode==OP_CollSeq );
+    ctx.pColl = pOp[-1].p4.pColl;
+  }
+  (ctx.pFunc->xStep)(&ctx, n, apVal);
+  if( ctx.isError ){
+    sqlite3SetString(&p->zErrMsg, sqlite3_value_text(&ctx.s), (char*)0);
+    rc = ctx.isError;
+  }
+  sqlite3VdbeMemRelease(&ctx.s);
+  break;
+}
+
+/* Opcode: AggFinal P1 P2 * P4 *
+**
+** Execute the finalizer function for an aggregate.  P1 is
+** the memory location that is the accumulator for the aggregate.
+**
+** P2 is the number of arguments that the step function takes and
+** P4 is a pointer to the FuncDef for this function.  The P2
+** argument is not used by this opcode.  It is only there to disambiguate
+** functions that can take varying numbers of arguments.  The
+** P4 argument is only needed for the degenerate case where
+** the step function was not previously called.
+*/
+case OP_AggFinal: {
+  Mem *pMem;
+  assert( pOp->p1>0 && pOp->p1<=p->nMem );
+  pMem = &p->aMem[pOp->p1];
+  assert( (pMem->flags & ~(MEM_Null|MEM_Agg))==0 );
+  rc = sqlite3VdbeMemFinalize(pMem, pOp->p4.pFunc);
+  if( rc==SQLITE_ERROR ){
+    sqlite3SetString(&p->zErrMsg, sqlite3_value_text(pMem), (char*)0);
+  }
+  UPDATE_MAX_BLOBSIZE(pMem);
+  if( sqlite3VdbeMemTooBig(pMem) ){
+    goto too_big;
+  }
+  break;
+}
+
+
+#if !defined(SQLITE_OMIT_VACUUM) && !defined(SQLITE_OMIT_ATTACH)
+/* Opcode: Vacuum * * * * *
+**
+** Vacuum the entire database.  This opcode will cause other virtual
+** machines to be created and run.  It may not be called from within
+** a transaction.
+*/
+case OP_Vacuum: {
+  if( sqlite3SafetyOff(db) ) goto abort_due_to_misuse;
+  rc = sqlite3RunVacuum(&p->zErrMsg, db);
+  if( sqlite3SafetyOn(db) ) goto abort_due_to_misuse;
+  break;
+}
+#endif
+
+#if !defined(SQLITE_OMIT_AUTOVACUUM)
+/* Opcode: IncrVacuum P1 P2 * * *
+**
+** Perform a single step of the incremental vacuum procedure on
+** the P1 database. If the vacuum has finished, jump to instruction
+** P2. Otherwise, fall through to the next instruction.
+*/
+case OP_IncrVacuum: {        /* jump */
+  Btree *pBt;
+
+  assert( pOp->p1>=0 && pOp->p1<db->nDb );
+  assert( (p->btreeMask & (1<<pOp->p1))!=0 );
+  pBt = db->aDb[pOp->p1].pBt;
+  rc = sqlite3BtreeIncrVacuum(pBt);
+  if( rc==SQLITE_DONE ){
+    pc = pOp->p2 - 1;
+    rc = SQLITE_OK;
+  }
+  break;
+}
+#endif
+
+/* Opcode: Expire P1 * * * *
+**
+** Cause precompiled statements to become expired. An expired statement
+** fails with an error code of SQLITE_SCHEMA if it is ever executed
+** (via sqlite3_step()).
+**
+** If P1 is 0, then all SQL statements become expired. If P1 is non-zero,
+** then only the currently executing statement is affected.
+*/
+case OP_Expire: {
+  if( !pOp->p1 ){
+    sqlite3ExpirePreparedStatements(db);
+  }else{
+    p->expired = 1;
+  }
+  break;
+}
+
+#ifndef SQLITE_OMIT_SHARED_CACHE
+/* Opcode: TableLock P1 P2 * P4 *
+**
+** Obtain a lock on a particular table. This instruction is only used when
+** the shared-cache feature is enabled.
+**
+** If P1 is not negative, then it is the index of the database
+** in sqlite3.aDb[] and a read-lock is required. If P1 is negative, a
+** write-lock is required. In this case the index of the database is the
+** absolute value of P1 minus one (iDb = abs(P1) - 1;) and a write-lock is
+** required.
+**
+** P2 contains the root-page of the table to lock.
+**
+** P4 contains a pointer to the name of the table being locked. This is only
+** used to generate an error message if the lock cannot be obtained.
+*/
+case OP_TableLock: {
+  int p1 = pOp->p1;
+  u8 isWriteLock = (p1<0);
+  if( isWriteLock ){
+    p1 = (-1*p1)-1;
+  }
+  assert( p1>=0 && p1<db->nDb );
+  assert( (p->btreeMask & (1<<p1))!=0 );
+  rc = sqlite3BtreeLockTable(db->aDb[p1].pBt, pOp->p2, isWriteLock);
+  if( rc==SQLITE_LOCKED ){
+    const char *z = pOp->p4.z;
+    sqlite3SetString(&p->zErrMsg, "database table is locked: ", z, (char*)0);
+  }
+  break;
+}
+#endif /* SQLITE_OMIT_SHARED_CACHE */
+
+#ifndef SQLITE_OMIT_VIRTUALTABLE
+/* Opcode: VBegin * * * P4 *
+**
+** P4 a pointer to an sqlite3_vtab structure. Call the xBegin method
+** for that table.
+*/
+case OP_VBegin: {
+  rc = sqlite3VtabBegin(db, pOp->p4.pVtab);
+  break;
+}
+#endif /* SQLITE_OMIT_VIRTUALTABLE */
+
+#ifndef SQLITE_OMIT_VIRTUALTABLE
+/* Opcode: VCreate P1 * * P4 *
+**
+** P4 is the name of a virtual table in database P1. Call the xCreate method
+** for that table.
+*/
+case OP_VCreate: {
+  rc = sqlite3VtabCallCreate(db, pOp->p1, pOp->p4.z, &p->zErrMsg);
+  break;
+}
+#endif /* SQLITE_OMIT_VIRTUALTABLE */
+
+#ifndef SQLITE_OMIT_VIRTUALTABLE
+/* Opcode: VDestroy P1 * * P4 *
+**
+** P4 is the name of a virtual table in database P1.  Call the xDestroy method
+** of that table.
+*/
+case OP_VDestroy: {
+  p->inVtabMethod = 2;
+  rc = sqlite3VtabCallDestroy(db, pOp->p1, pOp->p4.z);
+  p->inVtabMethod = 0;
+  break;
+}
+#endif /* SQLITE_OMIT_VIRTUALTABLE */
+
+#ifndef SQLITE_OMIT_VIRTUALTABLE
+/* Opcode: VOpen P1 * * P4 *
+**
+** P4 is a pointer to a virtual table object, an sqlite3_vtab structure.
+** P1 is a cursor number.  This opcode opens a cursor to the virtual
+** table and stores that cursor in P1.
+*/
+case OP_VOpen: {
+  Cursor *pCur = 0;
+  sqlite3_vtab_cursor *pVtabCursor = 0;
+
+  sqlite3_vtab *pVtab = pOp->p4.pVtab;
+  sqlite3_module *pModule = (sqlite3_module *)pVtab->pModule;
+
+  assert(pVtab && pModule);
+  if( sqlite3SafetyOff(db) ) goto abort_due_to_misuse;
+  rc = pModule->xOpen(pVtab, &pVtabCursor);
+  if( sqlite3SafetyOn(db) ) goto abort_due_to_misuse;
+  if( SQLITE_OK==rc ){
+    /* Initialise sqlite3_vtab_cursor base class */
+    pVtabCursor->pVtab = pVtab;
+
+    /* Initialise vdbe cursor object */
+    pCur = allocateCursor(p, pOp->p1, -1);
+    if( pCur ){
+      pCur->pVtabCursor = pVtabCursor;
+      pCur->pModule = pVtabCursor->pVtab->pModule;
+    }else{
+      db->mallocFailed = 1;
+      pModule->xClose(pVtabCursor);
+    }
+  }
+  break;
+}
+#endif /* SQLITE_OMIT_VIRTUALTABLE */
+
+#ifndef SQLITE_OMIT_VIRTUALTABLE
+/* Opcode: VFilter P1 P2 P3 P4 *
+**
+** P1 is a cursor opened using VOpen.  P2 is an address to jump to if
+** the filtered result set is empty.
+**
+** P4 is either NULL or a string that was generated by the xBestIndex
+** method of the module.  The interpretation of the P4 string is left
+** to the module implementation.
+**
+** This opcode invokes the xFilter method on the virtual table specified
+** by P1.  The integer query plan parameter to xFilter is stored in register
+** P3. Register P3+1 stores the argc parameter to be passed to the
+** xFilter method. Registers P3+2..P3+1+argc are the argc additional
+** parametersneath additional parameters which are passed to
+** xFilter as argv. Register P3+2 becomes argv[0] when passed to xFilter.
+**
+** A jump is made to P2 if the result set after filtering would be empty.
+*/
+case OP_VFilter: {   /* jump */
+  int nArg;
+  int iQuery;
+  const sqlite3_module *pModule;
+  Mem *pQuery = &p->aMem[pOp->p3];
+  Mem *pArgc = &pQuery[1];
+
+  Cursor *pCur = p->apCsr[pOp->p1];
+
+  REGISTER_TRACE(pOp->p3, pQuery);
+  assert( pCur->pVtabCursor );
+  pModule = pCur->pVtabCursor->pVtab->pModule;
+
+  /* Grab the index number and argc parameters */
+  assert( (pQuery->flags&MEM_Int)!=0 && pArgc->flags==MEM_Int );
+  nArg = pArgc->u.i;
+  iQuery = pQuery->u.i;
+
+  /* Invoke the xFilter method */
+  {
+    int res = 0;
+    int i;
+    Mem **apArg = p->apArg;
+    for(i = 0; i<nArg; i++){
+      apArg[i] = &pArgc[i+1];
+      storeTypeInfo(apArg[i], 0);
+    }
+
+    if( sqlite3SafetyOff(db) ) goto abort_due_to_misuse;
+    p->inVtabMethod = 1;
+    rc = pModule->xFilter(pCur->pVtabCursor, iQuery, pOp->p4.z, nArg, apArg);
+    p->inVtabMethod = 0;
+    if( rc==SQLITE_OK ){
+      res = pModule->xEof(pCur->pVtabCursor);
+    }
+    if( sqlite3SafetyOn(db) ) goto abort_due_to_misuse;
+
+    if( res ){
+      pc = pOp->p2 - 1;
+    }
+  }
+  pCur->nullRow = 0;
+
+  break;
+}
+#endif /* SQLITE_OMIT_VIRTUALTABLE */
+
+#ifndef SQLITE_OMIT_VIRTUALTABLE
+/* Opcode: VRowid P1 P2 * * *
+**
+** Store into register P2  the rowid of
+** the virtual-table that the P1 cursor is pointing to.
+*/
+case OP_VRowid: {             /* out2-prerelease */
+  const sqlite3_module *pModule;
+  sqlite_int64 iRow;
+  Cursor *pCur = p->apCsr[pOp->p1];
+
+  assert( pCur->pVtabCursor );
+  if( pCur->nullRow ){
+    break;
+  }
+  pModule = pCur->pVtabCursor->pVtab->pModule;
+  assert( pModule->xRowid );
+  if( sqlite3SafetyOff(db) ) goto abort_due_to_misuse;
+  rc = pModule->xRowid(pCur->pVtabCursor, &iRow);
+  if( sqlite3SafetyOn(db) ) goto abort_due_to_misuse;
+  MemSetTypeFlag(pOut, MEM_Int);
+  pOut->u.i = iRow;
+  break;
+}
+#endif /* SQLITE_OMIT_VIRTUALTABLE */
+
+#ifndef SQLITE_OMIT_VIRTUALTABLE
+/* Opcode: VColumn P1 P2 P3 * *
+**
+** Store the value of the P2-th column of
+** the row of the virtual-table that the
+** P1 cursor is pointing to into register P3.
+*/
+case OP_VColumn: {
+  const sqlite3_module *pModule;
+  Mem *pDest;
+  sqlite3_context sContext;
+
+  Cursor *pCur = p->apCsr[pOp->p1];
+  assert( pCur->pVtabCursor );
+  assert( pOp->p3>0 && pOp->p3<=p->nMem );
+  pDest = &p->aMem[pOp->p3];
+  if( pCur->nullRow ){
+    sqlite3VdbeMemSetNull(pDest);
+    break;
+  }
+  pModule = pCur->pVtabCursor->pVtab->pModule;
+  assert( pModule->xColumn );
+  memset(&sContext, 0, sizeof(sContext));
+
+  /* The output cell may already have a buffer allocated. Move
+  ** the current contents to sContext.s so in case the user-function
+  ** can use the already allocated buffer instead of allocating a
+  ** new one.
+  */
+  sqlite3VdbeMemMove(&sContext.s, pDest);
+  MemSetTypeFlag(&sContext.s, MEM_Null);
+
+  if( sqlite3SafetyOff(db) ) goto abort_due_to_misuse;
+  rc = pModule->xColumn(pCur->pVtabCursor, &sContext, pOp->p2);
+
+  /* Copy the result of the function to the P3 register. We
+  ** do this regardless of whether or not an error occured to ensure any
+  ** dynamic allocation in sContext.s (a Mem struct) is  released.
+  */
+  sqlite3VdbeChangeEncoding(&sContext.s, encoding);
+  REGISTER_TRACE(pOp->p3, pDest);
+  sqlite3VdbeMemMove(pDest, &sContext.s);
+  UPDATE_MAX_BLOBSIZE(pDest);
+
+  if( sqlite3SafetyOn(db) ){
+    goto abort_due_to_misuse;
+  }
+  if( sqlite3VdbeMemTooBig(pDest) ){
+    goto too_big;
+  }
+  break;
+}
+#endif /* SQLITE_OMIT_VIRTUALTABLE */
+
+#ifndef SQLITE_OMIT_VIRTUALTABLE
+/* Opcode: VNext P1 P2 * * *
+**
+** Advance virtual table P1 to the next row in its result set and
+** jump to instruction P2.  Or, if the virtual table has reached
+** the end of its result set, then fall through to the next instruction.
+*/
+case OP_VNext: {   /* jump */
+  const sqlite3_module *pModule;
+  int res = 0;
+
+  Cursor *pCur = p->apCsr[pOp->p1];
+  assert( pCur->pVtabCursor );
+  if( pCur->nullRow ){
+    break;
+  }
+  pModule = pCur->pVtabCursor->pVtab->pModule;
+  assert( pModule->xNext );
+
+  /* Invoke the xNext() method of the module. There is no way for the
+  ** underlying implementation to return an error if one occurs during
+  ** xNext(). Instead, if an error occurs, true is returned (indicating that
+  ** data is available) and the error code returned when xColumn or
+  ** some other method is next invoked on the save virtual table cursor.
+  */
+  if( sqlite3SafetyOff(db) ) goto abort_due_to_misuse;
+  p->inVtabMethod = 1;
+  rc = pModule->xNext(pCur->pVtabCursor);
+  p->inVtabMethod = 0;
+  if( rc==SQLITE_OK ){
+    res = pModule->xEof(pCur->pVtabCursor);
+  }
+  if( sqlite3SafetyOn(db) ) goto abort_due_to_misuse;
+
+  if( !res ){
+    /* If there is data, jump to P2 */
+    pc = pOp->p2 - 1;
+  }
+  break;
+}
+#endif /* SQLITE_OMIT_VIRTUALTABLE */
+
+#ifndef SQLITE_OMIT_VIRTUALTABLE
+/* Opcode: VRename P1 * * P4 *
+**
+** P4 is a pointer to a virtual table object, an sqlite3_vtab structure.
+** This opcode invokes the corresponding xRename method. The value
+** in register P1 is passed as the zName argument to the xRename method.
+*/
+case OP_VRename: {
+  sqlite3_vtab *pVtab = pOp->p4.pVtab;
+  Mem *pName = &p->aMem[pOp->p1];
+  assert( pVtab->pModule->xRename );
+  REGISTER_TRACE(pOp->p1, pName);
+
+  Stringify(pName, encoding);
+
+  if( sqlite3SafetyOff(db) ) goto abort_due_to_misuse;
+  sqlite3VtabLock(pVtab);
+  rc = pVtab->pModule->xRename(pVtab, pName->z);
+  sqlite3VtabUnlock(db, pVtab);
+  if( sqlite3SafetyOn(db) ) goto abort_due_to_misuse;
+
+  break;
+}
+#endif
+
+#ifndef SQLITE_OMIT_VIRTUALTABLE
+/* Opcode: VUpdate P1 P2 P3 P4 *
+**
+** P4 is a pointer to a virtual table object, an sqlite3_vtab structure.
+** This opcode invokes the corresponding xUpdate method. P2 values
+** are contiguous memory cells starting at P3 to pass to the xUpdate
+** invocation. The value in register (P3+P2-1) corresponds to the
+** p2th element of the argv array passed to xUpdate.
+**
+** The xUpdate method will do a DELETE or an INSERT or both.
+** The argv[0] element (which corresponds to memory cell P3)
+** is the rowid of a row to delete.  If argv[0] is NULL then no
+** deletion occurs.  The argv[1] element is the rowid of the new
+** row.  This can be NULL to have the virtual table select the new
+** rowid for itself.  The subsequent elements in the array are
+** the values of columns in the new row.
+**
+** If P2==1 then no insert is performed.  argv[0] is the rowid of
+** a row to delete.
+**
+** P1 is a boolean flag. If it is set to true and the xUpdate call
+** is successful, then the value returned by sqlite3_last_insert_rowid()
+** is set to the value of the rowid for the row just inserted.
+*/
+case OP_VUpdate: {
+  sqlite3_vtab *pVtab = pOp->p4.pVtab;
+  sqlite3_module *pModule = (sqlite3_module *)pVtab->pModule;
+  int nArg = pOp->p2;
+  assert( pOp->p4type==P4_VTAB );
+  if( pModule->xUpdate==0 ){
+    sqlite3SetString(&p->zErrMsg, "read-only table", 0);
+    rc = SQLITE_ERROR;
+  }else{
+    int i;
+    sqlite_int64 rowid;
+    Mem **apArg = p->apArg;
+    Mem *pX = &p->aMem[pOp->p3];
+    for(i=0; i<nArg; i++){
+      storeTypeInfo(pX, 0);
+      apArg[i] = pX;
+      pX++;
+    }
+    if( sqlite3SafetyOff(db) ) goto abort_due_to_misuse;
+    sqlite3VtabLock(pVtab);
+    rc = pModule->xUpdate(pVtab, nArg, apArg, &rowid);
+    sqlite3VtabUnlock(db, pVtab);
+    if( sqlite3SafetyOn(db) ) goto abort_due_to_misuse;
+    if( pOp->p1 && rc==SQLITE_OK ){
+      assert( nArg>1 && apArg[0] && (apArg[0]->flags&MEM_Null) );
+      db->lastRowid = rowid;
+    }
+  }
+  break;
+}
+#endif /* SQLITE_OMIT_VIRTUALTABLE */
+
+#ifndef SQLITE_OMIT_TRACE
+/* Opcode: Trace * * * P4 *
+**
+** If tracing is enabled (by the sqlite3_trace()) interface, then
+** the UTF-8 string contained in P4 is emitted on the trace callback.
+*/
+case OP_Trace: {
+  if( pOp->p4.z ){
+    if( db->xTrace ){
+      db->xTrace(db->pTraceArg, pOp->p4.z);
+    }
+#ifdef SQLITE_DEBUG
+    if( (db->flags & SQLITE_SqlTrace)!=0 ){
+      sqlite3DebugPrintf("SQL-trace: %s\n", pOp->p4.z);
+    }
+#endif /* SQLITE_DEBUG */
+  }
+  break;
+}
+#endif
+
+
+/* Opcode: Noop * * * * *
+**
+** Do nothing.  This instruction is often useful as a jump
+** destination.
+*/
+/*
+** The magic Explain opcode are only inserted when explain==2 (which
+** is to say when the EXPLAIN QUERY PLAN syntax is used.)
+** This opcode records information from the optimizer.  It is the
+** the same as a no-op.  This opcodesnever appears in a real VM program.
+*/
+default: {          /* This is really OP_Noop and OP_Explain */
+  break;
+}
+
+/*****************************************************************************
+** The cases of the switch statement above this line should all be indented
+** by 6 spaces.  But the left-most 6 spaces have been removed to improve the
+** readability.  From this point on down, the normal indentation rules are
+** restored.
+*****************************************************************************/
+    }
+
+#ifdef VDBE_PROFILE
+    {
+      long long elapse = hwtime() - start;
+      pOp->cycles += elapse;
+      pOp->cnt++;
+#if 0
+        fprintf(stdout, "%10lld ", elapse);
+        sqlite3VdbePrintOp(stdout, origPc, &p->aOp[origPc]);
+#endif
+    }
+#endif
+
+    /* The following code adds nothing to the actual functionality
+    ** of the program.  It is only here for testing and debugging.
+    ** On the other hand, it does burn CPU cycles every time through
+    ** the evaluator loop.  So we can leave it out when NDEBUG is defined.
+    */
+#ifndef NDEBUG
+    assert( pc>=-1 && pc<p->nOp );
+
+#ifdef SQLITE_DEBUG
+    if( p->trace ){
+      if( rc!=0 ) fprintf(p->trace,"rc=%d\n",rc);
+      if( opProperty & OPFLG_OUT2_PRERELEASE ){
+        registerTrace(p->trace, pOp->p2, pOut);
+      }
+      if( opProperty & OPFLG_OUT3 ){
+        registerTrace(p->trace, pOp->p3, pOut);
+      }
+    }
+#endif  /* SQLITE_DEBUG */
+#endif  /* NDEBUG */
+  }  /* The end of the for(;;) loop the loops through opcodes */
+
+  /* If we reach this point, it means that execution is finished with
+  ** an error of some kind.
+  */
+vdbe_error_halt:
+  assert( rc );
+  p->rc = rc;
+  rc = SQLITE_ERROR;
+  sqlite3VdbeHalt(p);
+
+  /* This is the only way out of this procedure.  We have to
+  ** release the mutexes on btrees that were acquired at the
+  ** top. */
+vdbe_return:
+  sqlite3BtreeMutexArrayLeave(&p->aMutex);
+  return rc;
+
+  /* Jump to here if a string or blob larger than SQLITE_MAX_LENGTH
+  ** is encountered.
+  */
+too_big:
+  sqlite3SetString(&p->zErrMsg, "string or blob too big", (char*)0);
+  rc = SQLITE_TOOBIG;
+  goto vdbe_error_halt;
+
+  /* Jump to here if a malloc() fails.
+  */
+no_mem:
+  db->mallocFailed = 1;
+  sqlite3SetString(&p->zErrMsg, "out of memory", (char*)0);
+  rc = SQLITE_NOMEM;
+  goto vdbe_error_halt;
+
+  /* Jump to here for an SQLITE_MISUSE error.
+  */
+abort_due_to_misuse:
+  rc = SQLITE_MISUSE;
+  /* Fall thru into abort_due_to_error */
+
+  /* Jump to here for any other kind of fatal error.  The "rc" variable
+  ** should hold the error number.
+  */
+abort_due_to_error:
+  assert( p->zErrMsg==0 );
+  if( db->mallocFailed ) rc = SQLITE_NOMEM;
+  sqlite3SetString(&p->zErrMsg, sqlite3ErrStr(rc), (char*)0);
+  goto vdbe_error_halt;
+
+  /* Jump to here if the sqlite3_interrupt() API sets the interrupt
+  ** flag.
+  */
+abort_due_to_interrupt:
+  assert( db->u1.isInterrupted );
+  rc = SQLITE_INTERRUPT;
+  p->rc = rc;
+  sqlite3SetString(&p->zErrMsg, sqlite3ErrStr(rc), (char*)0);
+  goto vdbe_error_halt;
+}
diff --git a/uppsrc/plugin/sqlite3/lib/vdbe.h b/uppsrc/plugin/sqlite3/lib/vdbe.h
new file mode 100644
index 000000000..5bb893a3b
--- /dev/null
+++ b/uppsrc/plugin/sqlite3/lib/vdbe.h
@@ -0,0 +1,183 @@
+/*
+** 2001 September 15
+**
+** The author disclaims copyright to this source code.  In place of
+** a legal notice, here is a blessing:
+**
+**    May you do good and not evil.
+**    May you find forgiveness for yourself and forgive others.
+**    May you share freely, never taking more than you give.
+**
+*************************************************************************
+** Header file for the Virtual DataBase Engine (VDBE)
+**
+** This header defines the interface to the virtual database engine
+** or VDBE.  The VDBE implements an abstract machine that runs a
+** simple program to access and modify the underlying database.
+**
+** $Id: vdbe.h,v 1.125 2008/01/17 17:27:31 drh Exp $
+*/
+#ifndef _SQLITE_VDBE_H_
+#define _SQLITE_VDBE_H_
+#include <stdio.h>
+
+/*
+** A single VDBE is an opaque structure named "Vdbe".  Only routines
+** in the source file sqliteVdbe.c are allowed to see the insides
+** of this structure.
+*/
+typedef struct Vdbe Vdbe;
+
+/*
+** The names of the following types declared in vdbeInt.h are required
+** for the VdbeOp definition.
+*/
+typedef struct VdbeFunc VdbeFunc;
+typedef struct Mem Mem;
+
+/*
+** A single instruction of the virtual machine has an opcode
+** and as many as three operands.  The instruction is recorded
+** as an instance of the following structure:
+*/
+struct VdbeOp {
+  u8 opcode;          /* What operation to perform */
+  signed char p4type; /* One of the P4_xxx constants for p4 */
+  u8 flags;           /* Flags for internal use */
+  u8 p5;              /* Fifth parameter is an unsigned character */
+  int p1;             /* First operand */
+  int p2;             /* Second parameter (often the jump destination) */
+  int p3;             /* The third parameter */
+  union {             /* forth parameter */
+    int i;                 /* Integer value if p4type==P4_INT32 */
+    void *p;               /* Generic pointer */
+    char *z;               /* Pointer to data for string (char array) types */
+    i64 *pI64;             /* Used when p4type is P4_INT64 */
+    double *pReal;         /* Used when p4type is P4_REAL */
+    FuncDef *pFunc;        /* Used when p4type is P4_FUNCDEF */
+    VdbeFunc *pVdbeFunc;   /* Used when p4type is P4_VDBEFUNC */
+    CollSeq *pColl;        /* Used when p4type is P4_COLLSEQ */
+    Mem *pMem;             /* Used when p4type is P4_MEM */
+    sqlite3_vtab *pVtab;   /* Used when p4type is P4_VTAB */
+    KeyInfo *pKeyInfo;     /* Used when p4type is P4_KEYINFO */
+  } p4;
+#ifdef SQLITE_DEBUG
+  char *zComment;     /* Comment to improve readability */
+#endif
+#ifdef VDBE_PROFILE
+  int cnt;            /* Number of times this instruction was executed */
+  long long cycles;   /* Total time spend executing this instruction */
+#endif
+};
+typedef struct VdbeOp VdbeOp;
+
+/*
+** A smaller version of VdbeOp used for the VdbeAddOpList() function because
+** it takes up less space.
+*/
+struct VdbeOpList {
+  u8 opcode;          /* What operation to perform */
+  signed char p1;     /* First operand */
+  signed char p2;     /* Second parameter (often the jump destination) */
+  signed char p3;     /* Third parameter */
+};
+typedef struct VdbeOpList VdbeOpList;
+
+/*
+** Allowed values of VdbeOp.p3type
+*/
+#define P4_NOTUSED    0   /* The P4 parameter is not used */
+#define P4_DYNAMIC  (-1)  /* Pointer to a string obtained from sqliteMalloc() */
+#define P4_STATIC   (-2)  /* Pointer to a static string */
+#define P4_COLLSEQ  (-4)  /* P4 is a pointer to a CollSeq structure */
+#define P4_FUNCDEF  (-5)  /* P4 is a pointer to a FuncDef structure */
+#define P4_KEYINFO  (-6)  /* P4 is a pointer to a KeyInfo structure */
+#define P4_VDBEFUNC (-7)  /* P4 is a pointer to a VdbeFunc structure */
+#define P4_MEM      (-8)  /* P4 is a pointer to a Mem*    structure */
+#define P4_TRANSIENT (-9) /* P4 is a pointer to a transient string */
+#define P4_VTAB     (-10) /* P4 is a pointer to an sqlite3_vtab structure */
+#define P4_MPRINTF  (-11) /* P4 is a string obtained from sqlite3_mprintf() */
+#define P4_REAL     (-12) /* P4 is a 64-bit floating point value */
+#define P4_INT64    (-13) /* P4 is a 64-bit signed integer */
+#define P4_INT32    (-14) /* P4 is a 32-bit signed integer */
+
+/* When adding a P4 argument using P4_KEYINFO, a copy of the KeyInfo structure
+** is made.  That copy is freed when the Vdbe is finalized.  But if the
+** argument is P4_KEYINFO_HANDOFF, the passed in pointer is used.  It still
+** gets freed when the Vdbe is finalized so it still should be obtained
+** from a single sqliteMalloc().  But no copy is made and the calling
+** function should *not* try to free the KeyInfo.
+*/
+#define P4_KEYINFO_HANDOFF (-9)
+
+/*
+** The Vdbe.aColName array contains 5n Mem structures, where n is the
+** number of columns of data returned by the statement.
+*/
+#define COLNAME_NAME     0
+#define COLNAME_DECLTYPE 1
+#define COLNAME_DATABASE 2
+#define COLNAME_TABLE    3
+#define COLNAME_COLUMN   4
+#define COLNAME_N        5      /* Number of COLNAME_xxx symbols */
+
+/*
+** The following macro converts a relative address in the p2 field
+** of a VdbeOp structure into a negative number so that
+** sqlite3VdbeAddOpList() knows that the address is relative.  Calling
+** the macro again restores the address.
+*/
+#define ADDR(X)  (-1-(X))
+
+/*
+** The makefile scans the vdbe.c source file and creates the "opcodes.h"
+** header file that defines a number for each opcode used by the VDBE.
+*/
+#include "opcodes.h"
+
+/*
+** Prototypes for the VDBE interface.  See comments on the implementation
+** for a description of what each of these routines does.
+*/
+Vdbe *sqlite3VdbeCreate(sqlite3*);
+int sqlite3VdbeAddOp0(Vdbe*,int);
+int sqlite3VdbeAddOp1(Vdbe*,int,int);
+int sqlite3VdbeAddOp2(Vdbe*,int,int,int);
+int sqlite3VdbeAddOp3(Vdbe*,int,int,int,int);
+int sqlite3VdbeAddOp4(Vdbe*,int,int,int,int,const char *zP4,int);
+int sqlite3VdbeAddOpList(Vdbe*, int nOp, VdbeOpList const *aOp);
+void sqlite3VdbeChangeP1(Vdbe*, int addr, int P1);
+void sqlite3VdbeChangeP2(Vdbe*, int addr, int P2);
+void sqlite3VdbeChangeP3(Vdbe*, int addr, int P3);
+void sqlite3VdbeChangeP5(Vdbe*, u8 P5);
+void sqlite3VdbeJumpHere(Vdbe*, int addr);
+void sqlite3VdbeChangeToNoop(Vdbe*, int addr, int N);
+void sqlite3VdbeChangeP4(Vdbe*, int addr, const char *zP4, int N);
+void sqlite3VdbeUsesBtree(Vdbe*, int);
+VdbeOp *sqlite3VdbeGetOp(Vdbe*, int);
+int sqlite3VdbeMakeLabel(Vdbe*);
+void sqlite3VdbeDelete(Vdbe*);
+void sqlite3VdbeMakeReady(Vdbe*,int,int,int,int);
+int sqlite3VdbeFinalize(Vdbe*);
+void sqlite3VdbeResolveLabel(Vdbe*, int);
+int sqlite3VdbeCurrentAddr(Vdbe*);
+#ifdef SQLITE_DEBUG
+  void sqlite3VdbeTrace(Vdbe*,FILE*);
+#endif
+void sqlite3VdbeResetStepResult(Vdbe*);
+int sqlite3VdbeReset(Vdbe*);
+void sqlite3VdbeSetNumCols(Vdbe*,int);
+int sqlite3VdbeSetColName(Vdbe*, int, int, const char *, int);
+void sqlite3VdbeCountChanges(Vdbe*);
+sqlite3 *sqlite3VdbeDb(Vdbe*);
+void sqlite3VdbeSetSql(Vdbe*, const char *z, int n);
+void sqlite3VdbeSwap(Vdbe*,Vdbe*);
+
+#ifndef NDEBUG
+  void sqlite3VdbeComment(Vdbe*, const char*, ...);
+# define VdbeComment(X)  sqlite3VdbeComment X
+#else
+# define VdbeComment(X)
+#endif
+
+#endif
diff --git a/uppsrc/plugin/sqlite3/lib/vdbeInt.h b/uppsrc/plugin/sqlite3/lib/vdbeInt.h
new file mode 100644
index 000000000..0d8100191
--- /dev/null
+++ b/uppsrc/plugin/sqlite3/lib/vdbeInt.h
@@ -0,0 +1,417 @@
+/*
+** 2003 September 6
+**
+** The author disclaims copyright to this source code.  In place of
+** a legal notice, here is a blessing:
+**
+**    May you do good and not evil.
+**    May you find forgiveness for yourself and forgive others.
+**    May you share freely, never taking more than you give.
+**
+*************************************************************************
+** This is the header file for information that is private to the
+** VDBE.  This information used to all be at the top of the single
+** source code file "vdbe.c".  When that file became too big (over
+** 6000 lines long) it was split up into several smaller files and
+** this header information was factored out.
+*/
+#ifndef _VDBEINT_H_
+#define _VDBEINT_H_
+
+/*
+** intToKey() and keyToInt() used to transform the rowid.  But with
+** the latest versions of the design they are no-ops.
+*/
+#define keyToInt(X)   (X)
+#define intToKey(X)   (X)
+
+
+/*
+** SQL is translated into a sequence of instructions to be
+** executed by a virtual machine.  Each instruction is an instance
+** of the following structure.
+*/
+typedef struct VdbeOp Op;
+
+/*
+** Boolean values
+*/
+typedef unsigned char Bool;
+
+/*
+** A cursor is a pointer into a single BTree within a database file.
+** The cursor can seek to a BTree entry with a particular key, or
+** loop over all entries of the Btree.  You can also insert new BTree
+** entries or retrieve the key or data from the entry that the cursor
+** is currently pointing to.
+**
+** Every cursor that the virtual machine has open is represented by an
+** instance of the following structure.
+**
+** If the Cursor.isTriggerRow flag is set it means that this cursor is
+** really a single row that represents the NEW or OLD pseudo-table of
+** a row trigger.  The data for the row is stored in Cursor.pData and
+** the rowid is in Cursor.iKey.
+*/
+struct Cursor {
+  BtCursor *pCursor;    /* The cursor structure of the backend */
+  int iDb;              /* Index of cursor database in db->aDb[] (or -1) */
+  i64 lastRowid;        /* Last rowid from a Next or NextIdx operation */
+  i64 nextRowid;        /* Next rowid returned by OP_NewRowid */
+  Bool zeroed;          /* True if zeroed out and ready for reuse */
+  Bool rowidIsValid;    /* True if lastRowid is valid */
+  Bool atFirst;         /* True if pointing to first entry */
+  Bool useRandomRowid;  /* Generate new record numbers semi-randomly */
+  Bool nullRow;         /* True if pointing to a row with no data */
+  Bool nextRowidValid;  /* True if the nextRowid field is valid */
+  Bool pseudoTable;     /* This is a NEW or OLD pseudo-tables of a trigger */
+  Bool deferredMoveto;  /* A call to sqlite3BtreeMoveto() is needed */
+  Bool isTable;         /* True if a table requiring integer keys */
+  Bool isIndex;         /* True if an index containing keys only - no data */
+  u8 bogusIncrKey;      /* Something for pIncrKey to point to if pKeyInfo==0 */
+  i64 movetoTarget;     /* Argument to the deferred sqlite3BtreeMoveto() */
+  Btree *pBt;           /* Separate file holding temporary table */
+  int nData;            /* Number of bytes in pData */
+  char *pData;          /* Data for a NEW or OLD pseudo-table */
+  i64 iKey;             /* Key for the NEW or OLD pseudo-table row */
+  u8 *pIncrKey;         /* Pointer to pKeyInfo->incrKey */
+  KeyInfo *pKeyInfo;    /* Info about index keys needed by index cursors */
+  int nField;           /* Number of fields in the header */
+  i64 seqCount;         /* Sequence counter */
+  sqlite3_vtab_cursor *pVtabCursor;  /* The cursor for a virtual table */
+  const sqlite3_module *pModule;     /* Module for cursor pVtabCursor */
+
+  /* Cached information about the header for the data record that the
+  ** cursor is currently pointing to.  Only valid if cacheValid is true.
+  ** aRow might point to (ephemeral) data for the current row, or it might
+  ** be NULL.
+  */
+  int cacheStatus;      /* Cache is valid if this matches Vdbe.cacheCtr */
+  int payloadSize;      /* Total number of bytes in the record */
+  u32 *aType;           /* Type values for all entries in the record */
+  u32 *aOffset;         /* Cached offsets to the start of each columns data */
+  u8 *aRow;             /* Data for the current row, if all on one page */
+};
+typedef struct Cursor Cursor;
+
+/*
+** A value for Cursor.cacheValid that means the cache is always invalid.
+*/
+#define CACHE_STALE 0
+
+/*
+** Internally, the vdbe manipulates nearly all SQL values as Mem
+** structures. Each Mem struct may cache multiple representations (string,
+** integer etc.) of the same value.  A value (and therefore Mem structure)
+** has the following properties:
+**
+** Each value has a manifest type. The manifest type of the value stored
+** in a Mem struct is returned by the MemType(Mem*) macro. The type is
+** one of SQLITE_NULL, SQLITE_INTEGER, SQLITE_REAL, SQLITE_TEXT or
+** SQLITE_BLOB.
+*/
+struct Mem {
+  union {
+    i64 i;              /* Integer value. Or FuncDef* when flags==MEM_Agg */
+    FuncDef *pDef;      /* Used only when flags==MEM_Agg */
+  } u;
+  double r;           /* Real value */
+  sqlite3 *db;        /* The associated database connection */
+  char *z;            /* String or BLOB value */
+  int n;              /* Number of characters in string value, excluding '\0' */
+  u16 flags;          /* Some combination of MEM_Null, MEM_Str, MEM_Dyn, etc. */
+  u8  type;           /* One of SQLITE_NULL, SQLITE_TEXT, SQLITE_INTEGER, etc */
+  u8  enc;            /* SQLITE_UTF8, SQLITE_UTF16BE, SQLITE_UTF16LE */
+  void (*xDel)(void *);  /* If not null, call this function to delete Mem.z */
+};
+
+/* One or more of the following flags are set to indicate the validOK
+** representations of the value stored in the Mem struct.
+**
+** If the MEM_Null flag is set, then the value is an SQL NULL value.
+** No other flags may be set in this case.
+**
+** If the MEM_Str flag is set then Mem.z points at a string representation.
+** Usually this is encoded in the same unicode encoding as the main
+** database (see below for exceptions). If the MEM_Term flag is also
+** set, then the string is nul terminated. The MEM_Int and MEM_Real
+** flags may coexist with the MEM_Str flag.
+**
+** Multiple of these values can appear in Mem.flags.  But only one
+** at a time can appear in Mem.type.
+*/
+#define MEM_Null      0x0001   /* Value is NULL */
+#define MEM_Str       0x0002   /* Value is a string */
+#define MEM_Int       0x0004   /* Value is an integer */
+#define MEM_Real      0x0008   /* Value is a real number */
+#define MEM_Blob      0x0010   /* Value is a BLOB */
+
+#define MemSetTypeFlag(p, f) \
+  ((p)->flags = ((p)->flags&~(MEM_Int|MEM_Real|MEM_Null|MEM_Blob|MEM_Str))|f)
+
+/* Whenever Mem contains a valid string or blob representation, one of
+** the following flags must be set to determine the memory management
+** policy for Mem.z.  The MEM_Term flag tells us whether or not the
+** string is \000 or \u0000 terminated
+*/
+#define MEM_Term      0x0020   /* String rep is nul terminated */
+#define MEM_Dyn       0x0040   /* Need to call sqliteFree() on Mem.z */
+#define MEM_Static    0x0080   /* Mem.z points to a static string */
+#define MEM_Ephem     0x0100   /* Mem.z points to an ephemeral string */
+#define MEM_Agg       0x0400   /* Mem.z points to an agg function context */
+#define MEM_Zero      0x0800   /* Mem.i contains count of 0s appended to blob */
+
+#ifdef SQLITE_OMIT_INCRBLOB
+  #undef MEM_Zero
+  #define MEM_Zero 0x0000
+#endif
+
+
+/* A VdbeFunc is just a FuncDef (defined in sqliteInt.h) that contains
+** additional information about auxiliary information bound to arguments
+** of the function.  This is used to implement the sqlite3_get_auxdata()
+** and sqlite3_set_auxdata() APIs.  The "auxdata" is some auxiliary data
+** that can be associated with a constant argument to a function.  This
+** allows functions such as "regexp" to compile their constant regular
+** expression argument once and reused the compiled code for multiple
+** invocations.
+*/
+struct VdbeFunc {
+  FuncDef *pFunc;               /* The definition of the function */
+  int nAux;                     /* Number of entries allocated for apAux[] */
+  struct AuxData {
+    void *pAux;                   /* Aux data for the i-th argument */
+    void (*xDelete)(void *);      /* Destructor for the aux data */
+  } apAux[1];                   /* One slot for each function argument */
+};
+
+/*
+** The "context" argument for a installable function.  A pointer to an
+** instance of this structure is the first argument to the routines used
+** implement the SQL functions.
+**
+** There is a typedef for this structure in sqlite.h.  So all routines,
+** even the public interface to SQLite, can use a pointer to this structure.
+** But this file is the only place where the internal details of this
+** structure are known.
+**
+** This structure is defined inside of vdbeInt.h because it uses substructures
+** (Mem) which are only defined there.
+*/
+struct sqlite3_context {
+  FuncDef *pFunc;       /* Pointer to function information.  MUST BE FIRST */
+  VdbeFunc *pVdbeFunc;  /* Auxilary data, if created. */
+  Mem s;                /* The return value is stored here */
+  Mem *pMem;            /* Memory cell used to store aggregate context */
+  int isError;          /* Error code returned by the function. */
+  CollSeq *pColl;       /* Collating sequence */
+};
+
+/*
+** A Set structure is used for quick testing to see if a value
+** is part of a small set.  Sets are used to implement code like
+** this:
+**            x.y IN ('hi','hoo','hum')
+*/
+typedef struct Set Set;
+struct Set {
+  Hash hash;             /* A set is just a hash table */
+  HashElem *prev;        /* Previously accessed hash elemen */
+};
+
+/*
+** A FifoPage structure holds a single page of valves.  Pages are arranged
+** in a list.
+*/
+typedef struct FifoPage FifoPage;
+struct FifoPage {
+  int nSlot;         /* Number of entries aSlot[] */
+  int iWrite;        /* Push the next value into this entry in aSlot[] */
+  int iRead;         /* Read the next value from this entry in aSlot[] */
+  FifoPage *pNext;   /* Next page in the fifo */
+  i64 aSlot[1];      /* One or more slots for rowid values */
+};
+
+/*
+** The Fifo structure is typedef-ed in vdbeInt.h.  But the implementation
+** of that structure is private to this file.
+**
+** The Fifo structure describes the entire fifo.
+*/
+typedef struct Fifo Fifo;
+struct Fifo {
+  int nEntry;         /* Total number of entries */
+  FifoPage *pFirst;   /* First page on the list */
+  FifoPage *pLast;    /* Last page on the list */
+};
+
+/*
+** A Context stores the last insert rowid, the last statement change count,
+** and the current statement change count (i.e. changes since last statement).
+** The current keylist is also stored in the context.
+** Elements of Context structure type make up the ContextStack, which is
+** updated by the ContextPush and ContextPop opcodes (used by triggers).
+** The context is pushed before executing a trigger a popped when the
+** trigger finishes.
+*/
+typedef struct Context Context;
+struct Context {
+  i64 lastRowid;    /* Last insert rowid (sqlite3.lastRowid) */
+  int nChange;      /* Statement changes (Vdbe.nChanges)     */
+  Fifo sFifo;       /* Records that will participate in a DELETE or UPDATE */
+};
+
+/*
+** An instance of the virtual machine.  This structure contains the complete
+** state of the virtual machine.
+**
+** The "sqlite3_stmt" structure pointer that is returned by sqlite3_compile()
+** is really a pointer to an instance of this structure.
+**
+** The Vdbe.inVtabMethod variable is set to non-zero for the duration of
+** any virtual table method invocations made by the vdbe program. It is
+** set to 2 for xDestroy method calls and 1 for all other methods. This
+** variable is used for two purposes: to allow xDestroy methods to execute
+** "DROP TABLE" statements and to prevent some nasty side effects of
+** malloc failure when SQLite is invoked recursively by a virtual table
+** method function.
+*/
+struct Vdbe {
+  sqlite3 *db;        /* The whole database */
+  Vdbe *pPrev,*pNext; /* Linked list of VDBEs with the same Vdbe.db */
+  int nOp;            /* Number of instructions in the program */
+  int nOpAlloc;       /* Number of slots allocated for aOp[] */
+  Op *aOp;            /* Space to hold the virtual machine's program */
+  int nLabel;         /* Number of labels used */
+  int nLabelAlloc;    /* Number of slots allocated in aLabel[] */
+  int *aLabel;        /* Space to hold the labels */
+  Mem **apArg;        /* Arguments to currently executing user function */
+  Mem *aColName;      /* Column names to return */
+  int nCursor;        /* Number of slots in apCsr[] */
+  Cursor **apCsr;     /* One element of this array for each open cursor */
+  int nVar;           /* Number of entries in aVar[] */
+  Mem *aVar;          /* Values for the OP_Variable opcode. */
+  char **azVar;       /* Name of variables */
+  int okVar;          /* True if azVar[] has been initialized */
+  int magic;              /* Magic number for sanity checking */
+  int nMem;               /* Number of memory locations currently allocated */
+  Mem *aMem;              /* The memory locations */
+  int nCallback;          /* Number of callbacks invoked so far */
+  int cacheCtr;           /* Cursor row cache generation counter */
+  Fifo sFifo;             /* A list of ROWIDs */
+  int contextStackTop;    /* Index of top element in the context stack */
+  int contextStackDepth;  /* The size of the "context" stack */
+  Context *contextStack;  /* Stack used by opcodes ContextPush & ContextPop*/
+  int pc;                 /* The program counter */
+  int rc;                 /* Value to return */
+  unsigned uniqueCnt;     /* Used by OP_MakeRecord when P2!=0 */
+  int errorAction;        /* Recovery action to do in case of an error */
+  int inTempTrans;        /* True if temp database is transactioned */
+  int returnStack[25];    /* Return address stack for OP_Gosub & OP_Return */
+  int returnDepth;        /* Next unused element in returnStack[] */
+  int nResColumn;         /* Number of columns in one row of the result set */
+  char **azResColumn;     /* Values for one row of result */
+  char *zErrMsg;          /* Error message written here */
+  Mem *pResultSet;        /* Pointer to an array of results */
+  u8 explain;             /* True if EXPLAIN present on SQL command */
+  u8 changeCntOn;         /* True to update the change-counter */
+  u8 aborted;             /* True if ROLLBACK in another VM causes an abort */
+  u8 expired;             /* True if the VM needs to be recompiled */
+  u8 minWriteFileFormat;  /* Minimum file format for writable database files */
+  u8 inVtabMethod;        /* See comments above */
+  int nChange;            /* Number of db changes made since last reset */
+  i64 startTime;          /* Time when query started - used for profiling */
+  int btreeMask;          /* Bitmask of db->aDb[] entries referenced */
+  BtreeMutexArray aMutex; /* An array of Btree used here and needing locks */
+  int nSql;             /* Number of bytes in zSql */
+  char *zSql;           /* Text of the SQL statement that generated this */
+#ifdef SQLITE_DEBUG
+  FILE *trace;        /* Write an execution trace here, if not NULL */
+#endif
+  int openedStatement;  /* True if this VM has opened a statement journal */
+#ifdef SQLITE_SSE
+  int fetchId;          /* Statement number used by sqlite3_fetch_statement */
+  int lru;              /* Counter used for LRU cache replacement */
+#endif
+};
+
+/*
+** The following are allowed values for Vdbe.magic
+*/
+#define VDBE_MAGIC_INIT     0x26bceaa5    /* Building a VDBE program */
+#define VDBE_MAGIC_RUN      0xbdf20da3    /* VDBE is ready to execute */
+#define VDBE_MAGIC_HALT     0x519c2973    /* VDBE has completed execution */
+#define VDBE_MAGIC_DEAD     0xb606c3c8    /* The VDBE has been deallocated */
+
+/*
+** Function prototypes
+*/
+void sqlite3VdbeFreeCursor(Vdbe *, Cursor*);
+void sqliteVdbePopStack(Vdbe*,int);
+int sqlite3VdbeCursorMoveto(Cursor*);
+#if defined(SQLITE_DEBUG) || defined(VDBE_PROFILE)
+void sqlite3VdbePrintOp(FILE*, int, Op*);
+#endif
+int sqlite3VdbeSerialTypeLen(u32);
+u32 sqlite3VdbeSerialType(Mem*, int);
+int sqlite3VdbeSerialPut(unsigned char*, int, Mem*, int);
+int sqlite3VdbeSerialGet(const unsigned char*, u32, Mem*);
+void sqlite3VdbeDeleteAuxData(VdbeFunc*, int);
+
+int sqlite2BtreeKeyCompare(BtCursor *, const void *, int, int, int *);
+int sqlite3VdbeIdxKeyCompare(Cursor*,int,const unsigned char*,int*);
+int sqlite3VdbeIdxRowid(BtCursor *, i64 *);
+int sqlite3MemCompare(const Mem*, const Mem*, const CollSeq*);
+int sqlite3VdbeRecordCompare(void*,int,const void*,int, const void*);
+int sqlite3VdbeIdxRowidLen(const u8*);
+int sqlite3VdbeExec(Vdbe*);
+int sqlite3VdbeList(Vdbe*);
+int sqlite3VdbeHalt(Vdbe*);
+int sqlite3VdbeChangeEncoding(Mem *, int);
+int sqlite3VdbeMemTooBig(Mem*);
+int sqlite3VdbeMemCopy(Mem*, const Mem*);
+void sqlite3VdbeMemShallowCopy(Mem*, const Mem*, int);
+void sqlite3VdbeMemMove(Mem*, Mem*);
+int sqlite3VdbeMemNulTerminate(Mem*);
+int sqlite3VdbeMemSetStr(Mem*, const char*, int, u8, void(*)(void*));
+void sqlite3VdbeMemSetInt64(Mem*, i64);
+void sqlite3VdbeMemSetDouble(Mem*, double);
+void sqlite3VdbeMemSetNull(Mem*);
+void sqlite3VdbeMemSetZeroBlob(Mem*,int);
+int sqlite3VdbeMemMakeWriteable(Mem*);
+int sqlite3VdbeMemDynamicify(Mem*);
+int sqlite3VdbeMemStringify(Mem*, int);
+i64 sqlite3VdbeIntValue(Mem*);
+int sqlite3VdbeMemIntegerify(Mem*);
+double sqlite3VdbeRealValue(Mem*);
+void sqlite3VdbeIntegerAffinity(Mem*);
+int sqlite3VdbeMemRealify(Mem*);
+int sqlite3VdbeMemNumerify(Mem*);
+int sqlite3VdbeMemFromBtree(BtCursor*,int,int,int,Mem*);
+void sqlite3VdbeMemRelease(Mem *p);
+int sqlite3VdbeMemFinalize(Mem*, FuncDef*);
+const char *sqlite3OpcodeName(int);
+int sqlite3VdbeOpcodeHasProperty(int, int);
+int sqlite3VdbeMemGrow(Mem *pMem, int n, int preserve);
+
+#ifndef NDEBUG
+  void sqlite3VdbeMemSanity(Mem*);
+#endif
+int sqlite3VdbeMemTranslate(Mem*, u8);
+#ifdef SQLITE_DEBUG
+  void sqlite3VdbePrintSql(Vdbe*);
+  void sqlite3VdbeMemPrettyPrint(Mem *pMem, char *zBuf);
+#endif
+int sqlite3VdbeMemHandleBom(Mem *pMem);
+void sqlite3VdbeFifoInit(Fifo*);
+int sqlite3VdbeFifoPush(Fifo*, i64);
+int sqlite3VdbeFifoPop(Fifo*, i64*);
+void sqlite3VdbeFifoClear(Fifo*);
+
+#ifndef SQLITE_OMIT_INCRBLOB
+  int sqlite3VdbeMemExpandBlob(Mem *);
+#else
+  #define sqlite3VdbeMemExpandBlob(x) SQLITE_OK
+#endif
+
+#endif /* !defined(_VDBEINT_H_) */
diff --git a/uppsrc/plugin/sqlite3/lib/vdbeapi.c b/uppsrc/plugin/sqlite3/lib/vdbeapi.c
new file mode 100644
index 000000000..d7852b8c7
--- /dev/null
+++ b/uppsrc/plugin/sqlite3/lib/vdbeapi.c
@@ -0,0 +1,1067 @@
+/*
+** 2004 May 26
+**
+** The author disclaims copyright to this source code.  In place of
+** a legal notice, here is a blessing:
+**
+**    May you do good and not evil.
+**    May you find forgiveness for yourself and forgive others.
+**    May you share freely, never taking more than you give.
+**
+*************************************************************************
+**
+** This file contains code use to implement APIs that are part of the
+** VDBE.
+*/
+#include "sqliteInt.h"
+#include "vdbeInt.h"
+
+/*
+** Return TRUE (non-zero) of the statement supplied as an argument needs
+** to be recompiled.  A statement needs to be recompiled whenever the
+** execution environment changes in a way that would alter the program
+** that sqlite3_prepare() generates.  For example, if new functions or
+** collating sequences are registered or if an authorizer function is
+** added or changed.
+*/
+int sqlite3_expired(sqlite3_stmt *pStmt){
+  Vdbe *p = (Vdbe*)pStmt;
+  return p==0 || p->expired;
+}
+
+/*
+** The following routine destroys a virtual machine that is created by
+** the sqlite3_compile() routine. The integer returned is an SQLITE_
+** success/failure code that describes the result of executing the virtual
+** machine.
+**
+** This routine sets the error code and string returned by
+** sqlite3_errcode(), sqlite3_errmsg() and sqlite3_errmsg16().
+*/
+int sqlite3_finalize(sqlite3_stmt *pStmt){
+  int rc;
+  if( pStmt==0 ){
+    rc = SQLITE_OK;
+  }else{
+    Vdbe *v = (Vdbe*)pStmt;
+#ifndef SQLITE_MUTEX_NOOP
+    sqlite3_mutex *mutex = v->db->mutex;
+#endif
+    sqlite3_mutex_enter(mutex);
+    rc = sqlite3VdbeFinalize(v);
+    sqlite3_mutex_leave(mutex);
+  }
+  return rc;
+}
+
+/*
+** Terminate the current execution of an SQL statement and reset it
+** back to its starting state so that it can be reused. A success code from
+** the prior execution is returned.
+**
+** This routine sets the error code and string returned by
+** sqlite3_errcode(), sqlite3_errmsg() and sqlite3_errmsg16().
+*/
+int sqlite3_reset(sqlite3_stmt *pStmt){
+  int rc;
+  if( pStmt==0 ){
+    rc = SQLITE_OK;
+  }else{
+    Vdbe *v = (Vdbe*)pStmt;
+    sqlite3_mutex_enter(v->db->mutex);
+    rc = sqlite3VdbeReset(v);
+    sqlite3VdbeMakeReady(v, -1, 0, 0, 0);
+    assert( (rc & (v->db->errMask))==rc );
+    sqlite3_mutex_leave(v->db->mutex);
+  }
+  return rc;
+}
+
+/*
+** Set all the parameters in the compiled SQL statement to NULL.
+*/
+int sqlite3_clear_bindings(sqlite3_stmt *pStmt){
+  int i;
+  int rc = SQLITE_OK;
+#ifndef SQLITE_MUTEX_NOOP
+  sqlite3_mutex *mutex = ((Vdbe*)pStmt)->db->mutex;
+#endif
+  sqlite3_mutex_enter(mutex);
+  for(i=1; rc==SQLITE_OK && i<=sqlite3_bind_parameter_count(pStmt); i++){
+    rc = sqlite3_bind_null(pStmt, i);
+  }
+  sqlite3_mutex_leave(mutex);
+  return rc;
+}
+
+
+/**************************** sqlite3_value_  *******************************
+** The following routines extract information from a Mem or sqlite3_value
+** structure.
+*/
+const void *sqlite3_value_blob(sqlite3_value *pVal){
+  Mem *p = (Mem*)pVal;
+  if( p->flags & (MEM_Blob|MEM_Str) ){
+    sqlite3VdbeMemExpandBlob(p);
+    p->flags &= ~MEM_Str;
+    p->flags |= MEM_Blob;
+    return p->z;
+  }else{
+    return sqlite3_value_text(pVal);
+  }
+}
+int sqlite3_value_bytes(sqlite3_value *pVal){
+  return sqlite3ValueBytes(pVal, SQLITE_UTF8);
+}
+int sqlite3_value_bytes16(sqlite3_value *pVal){
+  return sqlite3ValueBytes(pVal, SQLITE_UTF16NATIVE);
+}
+double sqlite3_value_double(sqlite3_value *pVal){
+  return sqlite3VdbeRealValue((Mem*)pVal);
+}
+int sqlite3_value_int(sqlite3_value *pVal){
+  return sqlite3VdbeIntValue((Mem*)pVal);
+}
+sqlite_int64 sqlite3_value_int64(sqlite3_value *pVal){
+  return sqlite3VdbeIntValue((Mem*)pVal);
+}
+const unsigned char *sqlite3_value_text(sqlite3_value *pVal){
+  return (const unsigned char *)sqlite3ValueText(pVal, SQLITE_UTF8);
+}
+#ifndef SQLITE_OMIT_UTF16
+const void *sqlite3_value_text16(sqlite3_value* pVal){
+  return sqlite3ValueText(pVal, SQLITE_UTF16NATIVE);
+}
+const void *sqlite3_value_text16be(sqlite3_value *pVal){
+  return sqlite3ValueText(pVal, SQLITE_UTF16BE);
+}
+const void *sqlite3_value_text16le(sqlite3_value *pVal){
+  return sqlite3ValueText(pVal, SQLITE_UTF16LE);
+}
+#endif /* SQLITE_OMIT_UTF16 */
+int sqlite3_value_type(sqlite3_value* pVal){
+  return pVal->type;
+}
+
+/**************************** sqlite3_result_  *******************************
+** The following routines are used by user-defined functions to specify
+** the function result.
+*/
+void sqlite3_result_blob(
+  sqlite3_context *pCtx,
+  const void *z,
+  int n,
+  void (*xDel)(void *)
+){
+  assert( n>=0 );
+  assert( sqlite3_mutex_held(pCtx->s.db->mutex) );
+  sqlite3VdbeMemSetStr(&pCtx->s, z, n, 0, xDel);
+}
+void sqlite3_result_double(sqlite3_context *pCtx, double rVal){
+  assert( sqlite3_mutex_held(pCtx->s.db->mutex) );
+  sqlite3VdbeMemSetDouble(&pCtx->s, rVal);
+}
+void sqlite3_result_error(sqlite3_context *pCtx, const char *z, int n){
+  assert( sqlite3_mutex_held(pCtx->s.db->mutex) );
+  pCtx->isError = SQLITE_ERROR;
+  sqlite3VdbeMemSetStr(&pCtx->s, z, n, SQLITE_UTF8, SQLITE_TRANSIENT);
+}
+#ifndef SQLITE_OMIT_UTF16
+void sqlite3_result_error16(sqlite3_context *pCtx, const void *z, int n){
+  assert( sqlite3_mutex_held(pCtx->s.db->mutex) );
+  pCtx->isError = SQLITE_ERROR;
+  sqlite3VdbeMemSetStr(&pCtx->s, z, n, SQLITE_UTF16NATIVE, SQLITE_TRANSIENT);
+}
+#endif
+void sqlite3_result_int(sqlite3_context *pCtx, int iVal){
+  assert( sqlite3_mutex_held(pCtx->s.db->mutex) );
+  sqlite3VdbeMemSetInt64(&pCtx->s, (i64)iVal);
+}
+void sqlite3_result_int64(sqlite3_context *pCtx, i64 iVal){
+  assert( sqlite3_mutex_held(pCtx->s.db->mutex) );
+  sqlite3VdbeMemSetInt64(&pCtx->s, iVal);
+}
+void sqlite3_result_null(sqlite3_context *pCtx){
+  assert( sqlite3_mutex_held(pCtx->s.db->mutex) );
+  sqlite3VdbeMemSetNull(&pCtx->s);
+}
+void sqlite3_result_text(
+  sqlite3_context *pCtx,
+  const char *z,
+  int n,
+  void (*xDel)(void *)
+){
+  assert( sqlite3_mutex_held(pCtx->s.db->mutex) );
+  sqlite3VdbeMemSetStr(&pCtx->s, z, n, SQLITE_UTF8, xDel);
+}
+#ifndef SQLITE_OMIT_UTF16
+void sqlite3_result_text16(
+  sqlite3_context *pCtx,
+  const void *z,
+  int n,
+  void (*xDel)(void *)
+){
+  assert( sqlite3_mutex_held(pCtx->s.db->mutex) );
+  sqlite3VdbeMemSetStr(&pCtx->s, z, n, SQLITE_UTF16NATIVE, xDel);
+}
+void sqlite3_result_text16be(
+  sqlite3_context *pCtx,
+  const void *z,
+  int n,
+  void (*xDel)(void *)
+){
+  assert( sqlite3_mutex_held(pCtx->s.db->mutex) );
+  sqlite3VdbeMemSetStr(&pCtx->s, z, n, SQLITE_UTF16BE, xDel);
+}
+void sqlite3_result_text16le(
+  sqlite3_context *pCtx,
+  const void *z,
+  int n,
+  void (*xDel)(void *)
+){
+  assert( sqlite3_mutex_held(pCtx->s.db->mutex) );
+  sqlite3VdbeMemSetStr(&pCtx->s, z, n, SQLITE_UTF16LE, xDel);
+}
+#endif /* SQLITE_OMIT_UTF16 */
+void sqlite3_result_value(sqlite3_context *pCtx, sqlite3_value *pValue){
+  assert( sqlite3_mutex_held(pCtx->s.db->mutex) );
+  sqlite3VdbeMemCopy(&pCtx->s, pValue);
+}
+void sqlite3_result_zeroblob(sqlite3_context *pCtx, int n){
+  assert( sqlite3_mutex_held(pCtx->s.db->mutex) );
+  sqlite3VdbeMemSetZeroBlob(&pCtx->s, n);
+}
+void sqlite3_result_error_code(sqlite3_context *pCtx, int errCode){
+  pCtx->isError = errCode;
+}
+
+/* Force an SQLITE_TOOBIG error. */
+void sqlite3_result_error_toobig(sqlite3_context *pCtx){
+  assert( sqlite3_mutex_held(pCtx->s.db->mutex) );
+  sqlite3VdbeMemSetZeroBlob(&pCtx->s, SQLITE_MAX_LENGTH+1);
+}
+
+/* An SQLITE_NOMEM error. */
+void sqlite3_result_error_nomem(sqlite3_context *pCtx){
+  assert( sqlite3_mutex_held(pCtx->s.db->mutex) );
+  sqlite3VdbeMemSetNull(&pCtx->s);
+  pCtx->isError = SQLITE_NOMEM;
+  pCtx->s.db->mallocFailed = 1;
+}
+
+/*
+** Execute the statement pStmt, either until a row of data is ready, the
+** statement is completely executed or an error occurs.
+**
+** This routine implements the bulk of the logic behind the sqlite_step()
+** API.  The only thing omitted is the automatic recompile if a
+** schema change has occurred.  That detail is handled by the
+** outer sqlite3_step() wrapper procedure.
+*/
+static int sqlite3Step(Vdbe *p){
+  sqlite3 *db;
+  int rc;
+
+  assert(p);
+  if( p->magic!=VDBE_MAGIC_RUN ){
+    return SQLITE_MISUSE;
+  }
+
+  /* Assert that malloc() has not failed */
+  db = p->db;
+  assert( !db->mallocFailed );
+
+  if( p->aborted ){
+    return SQLITE_ABORT;
+  }
+  if( p->pc<=0 && p->expired ){
+    if( p->rc==SQLITE_OK ){
+      p->rc = SQLITE_SCHEMA;
+    }
+    rc = SQLITE_ERROR;
+    goto end_of_step;
+  }
+  if( sqlite3SafetyOn(db) ){
+    p->rc = SQLITE_MISUSE;
+    return SQLITE_MISUSE;
+  }
+  if( p->pc<0 ){
+    /* If there are no other statements currently running, then
+    ** reset the interrupt flag.  This prevents a call to sqlite3_interrupt
+    ** from interrupting a statement that has not yet started.
+    */
+    if( db->activeVdbeCnt==0 ){
+      db->u1.isInterrupted = 0;
+    }
+
+#ifndef SQLITE_OMIT_TRACE
+    if( db->xProfile && !db->init.busy ){
+      double rNow;
+      sqlite3OsCurrentTime(db->pVfs, &rNow);
+      p->startTime = (rNow - (int)rNow)*3600.0*24.0*1000000000.0;
+    }
+#endif
+
+    db->activeVdbeCnt++;
+    p->pc = 0;
+  }
+#ifndef SQLITE_OMIT_EXPLAIN
+  if( p->explain ){
+    rc = sqlite3VdbeList(p);
+  }else
+#endif /* SQLITE_OMIT_EXPLAIN */
+  {
+    rc = sqlite3VdbeExec(p);
+  }
+
+  if( sqlite3SafetyOff(db) ){
+    rc = SQLITE_MISUSE;
+  }
+
+#ifndef SQLITE_OMIT_TRACE
+  /* Invoke the profile callback if there is one
+  */
+  if( rc!=SQLITE_ROW && db->xProfile && !db->init.busy && p->nOp>0
+           && p->aOp[0].opcode==OP_Trace && p->aOp[0].p4.z!=0 ){
+    double rNow;
+    u64 elapseTime;
+
+    sqlite3OsCurrentTime(db->pVfs, &rNow);
+    elapseTime = (rNow - (int)rNow)*3600.0*24.0*1000000000.0 - p->startTime;
+    db->xProfile(db->pProfileArg, p->aOp[0].p4.z, elapseTime);
+  }
+#endif
+
+  sqlite3Error(p->db, rc, 0);
+  p->rc = sqlite3ApiExit(p->db, p->rc);
+end_of_step:
+  assert( (rc&0xff)==rc );
+  if( p->zSql && (rc&0xff)<SQLITE_ROW ){
+    /* This behavior occurs if sqlite3_prepare_v2() was used to build
+    ** the prepared statement.  Return error codes directly */
+    sqlite3Error(p->db, p->rc, 0);
+    return p->rc;
+  }else{
+    /* This is for legacy sqlite3_prepare() builds and when the code
+    ** is SQLITE_ROW or SQLITE_DONE */
+    return rc;
+  }
+}
+
+/*
+** This is the top-level implementation of sqlite3_step().  Call
+** sqlite3Step() to do most of the work.  If a schema error occurs,
+** call sqlite3Reprepare() and try again.
+*/
+#ifdef SQLITE_OMIT_PARSER
+int sqlite3_step(sqlite3_stmt *pStmt){
+  int rc = SQLITE_MISUSE;
+  if( pStmt ){
+    Vdbe *v;
+    v = (Vdbe*)pStmt;
+    sqlite3_mutex_enter(v->db->mutex);
+    rc = sqlite3Step(v);
+    sqlite3_mutex_leave(v->db->mutex);
+  }
+  return rc;
+}
+#else
+int sqlite3_step(sqlite3_stmt *pStmt){
+  int rc = SQLITE_MISUSE;
+  if( pStmt ){
+    int cnt = 0;
+    Vdbe *v = (Vdbe*)pStmt;
+    sqlite3 *db = v->db;
+    sqlite3_mutex_enter(db->mutex);
+    while( (rc = sqlite3Step(v))==SQLITE_SCHEMA
+           && cnt++ < 5
+           && sqlite3Reprepare(v) ){
+      sqlite3_reset(pStmt);
+      v->expired = 0;
+    }
+    if( rc==SQLITE_SCHEMA && v->zSql && db->pErr ){
+      /* This case occurs after failing to recompile an sql statement.
+      ** The error message from the SQL compiler has already been loaded
+      ** into the database handle. This block copies the error message
+      ** from the database handle into the statement and sets the statement
+      ** program counter to 0 to ensure that when the statement is
+      ** finalized or reset the parser error message is available via
+      ** sqlite3_errmsg() and sqlite3_errcode().
+      */
+      const char *zErr = (const char *)sqlite3_value_text(db->pErr);
+      sqlite3_free(v->zErrMsg);
+      if( !db->mallocFailed ){
+        v->zErrMsg = sqlite3DbStrDup(db, zErr);
+      } else {
+        v->zErrMsg = 0;
+        v->rc = SQLITE_NOMEM;
+      }
+    }
+    rc = sqlite3ApiExit(db, rc);
+    sqlite3_mutex_leave(db->mutex);
+  }
+  return rc;
+}
+#endif
+
+/*
+** Extract the user data from a sqlite3_context structure and return a
+** pointer to it.
+*/
+void *sqlite3_user_data(sqlite3_context *p){
+  assert( p && p->pFunc );
+  return p->pFunc->pUserData;
+}
+
+/*
+** The following is the implementation of an SQL function that always
+** fails with an error message stating that the function is used in the
+** wrong context.  The sqlite3_overload_function() API might construct
+** SQL function that use this routine so that the functions will exist
+** for name resolution but are actually overloaded by the xFindFunction
+** method of virtual tables.
+*/
+void sqlite3InvalidFunction(
+  sqlite3_context *context,  /* The function calling context */
+  int argc,                  /* Number of arguments to the function */
+  sqlite3_value **argv       /* Value of each argument */
+){
+  const char *zName = context->pFunc->zName;
+  char *zErr;
+  zErr = sqlite3MPrintf(0,
+      "unable to use function %s in the requested context", zName);
+  sqlite3_result_error(context, zErr, -1);
+  sqlite3_free(zErr);
+}
+
+/*
+** Allocate or return the aggregate context for a user function.  A new
+** context is allocated on the first call.  Subsequent calls return the
+** same context that was returned on prior calls.
+*/
+void *sqlite3_aggregate_context(sqlite3_context *p, int nByte){
+  Mem *pMem;
+  assert( p && p->pFunc && p->pFunc->xStep );
+  assert( sqlite3_mutex_held(p->s.db->mutex) );
+  pMem = p->pMem;
+  if( (pMem->flags & MEM_Agg)==0 ){
+    if( nByte==0 ){
+      assert( pMem->flags==MEM_Null );
+      pMem->z = 0;
+    }else{
+      pMem->flags = MEM_Agg;
+      pMem->xDel = sqlite3_free;
+      pMem->u.pDef = p->pFunc;
+      pMem->z = sqlite3DbMallocZero(p->s.db, nByte);
+    }
+  }
+  return (void*)pMem->z;
+}
+
+/*
+** Return the auxilary data pointer, if any, for the iArg'th argument to
+** the user-function defined by pCtx.
+*/
+void *sqlite3_get_auxdata(sqlite3_context *pCtx, int iArg){
+  VdbeFunc *pVdbeFunc;
+
+  assert( sqlite3_mutex_held(pCtx->s.db->mutex) );
+  pVdbeFunc = pCtx->pVdbeFunc;
+  if( !pVdbeFunc || iArg>=pVdbeFunc->nAux || iArg<0 ){
+    return 0;
+  }
+  return pVdbeFunc->apAux[iArg].pAux;
+}
+
+/*
+** Set the auxilary data pointer and delete function, for the iArg'th
+** argument to the user-function defined by pCtx. Any previous value is
+** deleted by calling the delete function specified when it was set.
+*/
+void sqlite3_set_auxdata(
+  sqlite3_context *pCtx,
+  int iArg,
+  void *pAux,
+  void (*xDelete)(void*)
+){
+  struct AuxData *pAuxData;
+  VdbeFunc *pVdbeFunc;
+  if( iArg<0 ) goto failed;
+
+  assert( sqlite3_mutex_held(pCtx->s.db->mutex) );
+  pVdbeFunc = pCtx->pVdbeFunc;
+  if( !pVdbeFunc || pVdbeFunc->nAux<=iArg ){
+    int nAux = (pVdbeFunc ? pVdbeFunc->nAux : 0);
+    int nMalloc = sizeof(VdbeFunc) + sizeof(struct AuxData)*iArg;
+    pVdbeFunc = sqlite3DbRealloc(pCtx->s.db, pVdbeFunc, nMalloc);
+    if( !pVdbeFunc ){
+      goto failed;
+    }
+    pCtx->pVdbeFunc = pVdbeFunc;
+    memset(&pVdbeFunc->apAux[nAux], 0, sizeof(struct AuxData)*(iArg+1-nAux));
+    pVdbeFunc->nAux = iArg+1;
+    pVdbeFunc->pFunc = pCtx->pFunc;
+  }
+
+  pAuxData = &pVdbeFunc->apAux[iArg];
+  if( pAuxData->pAux && pAuxData->xDelete ){
+    pAuxData->xDelete(pAuxData->pAux);
+  }
+  pAuxData->pAux = pAux;
+  pAuxData->xDelete = xDelete;
+  return;
+
+failed:
+  if( xDelete ){
+    xDelete(pAux);
+  }
+}
+
+/*
+** Return the number of times the Step function of a aggregate has been
+** called.
+**
+** This function is deprecated.  Do not use it for new code.  It is
+** provide only to avoid breaking legacy code.  New aggregate function
+** implementations should keep their own counts within their aggregate
+** context.
+*/
+int sqlite3_aggregate_count(sqlite3_context *p){
+  assert( p && p->pFunc && p->pFunc->xStep );
+  return p->pMem->n;
+}
+
+/*
+** Return the number of columns in the result set for the statement pStmt.
+*/
+int sqlite3_column_count(sqlite3_stmt *pStmt){
+  Vdbe *pVm = (Vdbe *)pStmt;
+  return pVm ? pVm->nResColumn : 0;
+}
+
+/*
+** Return the number of values available from the current row of the
+** currently executing statement pStmt.
+*/
+int sqlite3_data_count(sqlite3_stmt *pStmt){
+  Vdbe *pVm = (Vdbe *)pStmt;
+  if( pVm==0 || pVm->pResultSet==0 ) return 0;
+  return pVm->nResColumn;
+}
+
+
+/*
+** Check to see if column iCol of the given statement is valid.  If
+** it is, return a pointer to the Mem for the value of that column.
+** If iCol is not valid, return a pointer to a Mem which has a value
+** of NULL.
+*/
+static Mem *columnMem(sqlite3_stmt *pStmt, int i){
+  Vdbe *pVm;
+  int vals;
+  Mem *pOut;
+
+  pVm = (Vdbe *)pStmt;
+  if( pVm && pVm->pResultSet!=0 && i<pVm->nResColumn && i>=0 ){
+    sqlite3_mutex_enter(pVm->db->mutex);
+    vals = sqlite3_data_count(pStmt);
+    pOut = &pVm->pResultSet[i];
+  }else{
+    static const Mem nullMem = {{0}, 0.0, 0, "", 0, MEM_Null, SQLITE_NULL };
+    if( pVm->db ){
+      sqlite3_mutex_enter(pVm->db->mutex);
+      sqlite3Error(pVm->db, SQLITE_RANGE, 0);
+    }
+    pOut = (Mem*)&nullMem;
+  }
+  return pOut;
+}
+
+/*
+** This function is called after invoking an sqlite3_value_XXX function on a
+** column value (i.e. a value returned by evaluating an SQL expression in the
+** select list of a SELECT statement) that may cause a malloc() failure. If
+** malloc() has failed, the threads mallocFailed flag is cleared and the result
+** code of statement pStmt set to SQLITE_NOMEM.
+**
+** Specifically, this is called from within:
+**
+**     sqlite3_column_int()
+**     sqlite3_column_int64()
+**     sqlite3_column_text()
+**     sqlite3_column_text16()
+**     sqlite3_column_real()
+**     sqlite3_column_bytes()
+**     sqlite3_column_bytes16()
+**
+** But not for sqlite3_column_blob(), which never calls malloc().
+*/
+static void columnMallocFailure(sqlite3_stmt *pStmt)
+{
+  /* If malloc() failed during an encoding conversion within an
+  ** sqlite3_column_XXX API, then set the return code of the statement to
+  ** SQLITE_NOMEM. The next call to _step() (if any) will return SQLITE_ERROR
+  ** and _finalize() will return NOMEM.
+  */
+  Vdbe *p = (Vdbe *)pStmt;
+  if( p ){
+    p->rc = sqlite3ApiExit(p->db, p->rc);
+    sqlite3_mutex_leave(p->db->mutex);
+  }
+}
+
+/**************************** sqlite3_column_  *******************************
+** The following routines are used to access elements of the current row
+** in the result set.
+*/
+const void *sqlite3_column_blob(sqlite3_stmt *pStmt, int i){
+  const void *val;
+  val = sqlite3_value_blob( columnMem(pStmt,i) );
+  /* Even though there is no encoding conversion, value_blob() might
+  ** need to call malloc() to expand the result of a zeroblob()
+  ** expression.
+  */
+  columnMallocFailure(pStmt);
+  return val;
+}
+int sqlite3_column_bytes(sqlite3_stmt *pStmt, int i){
+  int val = sqlite3_value_bytes( columnMem(pStmt,i) );
+  columnMallocFailure(pStmt);
+  return val;
+}
+int sqlite3_column_bytes16(sqlite3_stmt *pStmt, int i){
+  int val = sqlite3_value_bytes16( columnMem(pStmt,i) );
+  columnMallocFailure(pStmt);
+  return val;
+}
+double sqlite3_column_double(sqlite3_stmt *pStmt, int i){
+  double val = sqlite3_value_double( columnMem(pStmt,i) );
+  columnMallocFailure(pStmt);
+  return val;
+}
+int sqlite3_column_int(sqlite3_stmt *pStmt, int i){
+  int val = sqlite3_value_int( columnMem(pStmt,i) );
+  columnMallocFailure(pStmt);
+  return val;
+}
+sqlite_int64 sqlite3_column_int64(sqlite3_stmt *pStmt, int i){
+  sqlite_int64 val = sqlite3_value_int64( columnMem(pStmt,i) );
+  columnMallocFailure(pStmt);
+  return val;
+}
+const unsigned char *sqlite3_column_text(sqlite3_stmt *pStmt, int i){
+  const unsigned char *val = sqlite3_value_text( columnMem(pStmt,i) );
+  columnMallocFailure(pStmt);
+  return val;
+}
+sqlite3_value *sqlite3_column_value(sqlite3_stmt *pStmt, int i){
+  sqlite3_value *pOut = columnMem(pStmt, i);
+  columnMallocFailure(pStmt);
+  return pOut;
+}
+#ifndef SQLITE_OMIT_UTF16
+const void *sqlite3_column_text16(sqlite3_stmt *pStmt, int i){
+  const void *val = sqlite3_value_text16( columnMem(pStmt,i) );
+  columnMallocFailure(pStmt);
+  return val;
+}
+#endif /* SQLITE_OMIT_UTF16 */
+int sqlite3_column_type(sqlite3_stmt *pStmt, int i){
+  int iType = sqlite3_value_type( columnMem(pStmt,i) );
+  columnMallocFailure(pStmt);
+  return iType;
+}
+
+/* The following function is experimental and subject to change or
+** removal */
+/*int sqlite3_column_numeric_type(sqlite3_stmt *pStmt, int i){
+**  return sqlite3_value_numeric_type( columnMem(pStmt,i) );
+**}
+*/
+
+/*
+** Convert the N-th element of pStmt->pColName[] into a string using
+** xFunc() then return that string.  If N is out of range, return 0.
+**
+** There are up to 5 names for each column.  useType determines which
+** name is returned.  Here are the names:
+**
+**    0      The column name as it should be displayed for output
+**    1      The datatype name for the column
+**    2      The name of the database that the column derives from
+**    3      The name of the table that the column derives from
+**    4      The name of the table column that the result column derives from
+**
+** If the result is not a simple column reference (if it is an expression
+** or a constant) then useTypes 2, 3, and 4 return NULL.
+*/
+static const void *columnName(
+  sqlite3_stmt *pStmt,
+  int N,
+  const void *(*xFunc)(Mem*),
+  int useType
+){
+  const void *ret = 0;
+  Vdbe *p = (Vdbe *)pStmt;
+  int n;
+
+
+  if( p!=0 ){
+    n = sqlite3_column_count(pStmt);
+    if( N<n && N>=0 ){
+      N += useType*n;
+      sqlite3_mutex_enter(p->db->mutex);
+      ret = xFunc(&p->aColName[N]);
+
+      /* A malloc may have failed inside of the xFunc() call. If this
+      ** is the case, clear the mallocFailed flag and return NULL.
+      */
+      if( p->db && p->db->mallocFailed ){
+        p->db->mallocFailed = 0;
+        ret = 0;
+      }
+      sqlite3_mutex_leave(p->db->mutex);
+    }
+  }
+  return ret;
+}
+
+/*
+** Return the name of the Nth column of the result set returned by SQL
+** statement pStmt.
+*/
+const char *sqlite3_column_name(sqlite3_stmt *pStmt, int N){
+  return columnName(
+      pStmt, N, (const void*(*)(Mem*))sqlite3_value_text, COLNAME_NAME);
+}
+#ifndef SQLITE_OMIT_UTF16
+const void *sqlite3_column_name16(sqlite3_stmt *pStmt, int N){
+  return columnName(
+      pStmt, N, (const void*(*)(Mem*))sqlite3_value_text16, COLNAME_NAME);
+}
+#endif
+
+/*
+** Return the column declaration type (if applicable) of the 'i'th column
+** of the result set of SQL statement pStmt.
+*/
+const char *sqlite3_column_decltype(sqlite3_stmt *pStmt, int N){
+  return columnName(
+      pStmt, N, (const void*(*)(Mem*))sqlite3_value_text, COLNAME_DECLTYPE);
+}
+#ifndef SQLITE_OMIT_UTF16
+const void *sqlite3_column_decltype16(sqlite3_stmt *pStmt, int N){
+  return columnName(
+      pStmt, N, (const void*(*)(Mem*))sqlite3_value_text16, COLNAME_DECLTYPE);
+}
+#endif /* SQLITE_OMIT_UTF16 */
+
+#ifdef SQLITE_ENABLE_COLUMN_METADATA
+/*
+** Return the name of the database from which a result column derives.
+** NULL is returned if the result column is an expression or constant or
+** anything else which is not an unabiguous reference to a database column.
+*/
+const char *sqlite3_column_database_name(sqlite3_stmt *pStmt, int N){
+  return columnName(
+      pStmt, N, (const void*(*)(Mem*))sqlite3_value_text, COLNAME_DATABASE);
+}
+#ifndef SQLITE_OMIT_UTF16
+const void *sqlite3_column_database_name16(sqlite3_stmt *pStmt, int N){
+  return columnName(
+      pStmt, N, (const void*(*)(Mem*))sqlite3_value_text16, COLNAME_DATABASE);
+}
+#endif /* SQLITE_OMIT_UTF16 */
+
+/*
+** Return the name of the table from which a result column derives.
+** NULL is returned if the result column is an expression or constant or
+** anything else which is not an unabiguous reference to a database column.
+*/
+const char *sqlite3_column_table_name(sqlite3_stmt *pStmt, int N){
+  return columnName(
+      pStmt, N, (const void*(*)(Mem*))sqlite3_value_text, COLNAME_TABLE);
+}
+#ifndef SQLITE_OMIT_UTF16
+const void *sqlite3_column_table_name16(sqlite3_stmt *pStmt, int N){
+  return columnName(
+      pStmt, N, (const void*(*)(Mem*))sqlite3_value_text16, COLNAME_TABLE);
+}
+#endif /* SQLITE_OMIT_UTF16 */
+
+/*
+** Return the name of the table column from which a result column derives.
+** NULL is returned if the result column is an expression or constant or
+** anything else which is not an unabiguous reference to a database column.
+*/
+const char *sqlite3_column_origin_name(sqlite3_stmt *pStmt, int N){
+  return columnName(
+      pStmt, N, (const void*(*)(Mem*))sqlite3_value_text, COLNAME_COLUMN);
+}
+#ifndef SQLITE_OMIT_UTF16
+const void *sqlite3_column_origin_name16(sqlite3_stmt *pStmt, int N){
+  return columnName(
+      pStmt, N, (const void*(*)(Mem*))sqlite3_value_text16, COLNAME_COLUMN);
+}
+#endif /* SQLITE_OMIT_UTF16 */
+#endif /* SQLITE_ENABLE_COLUMN_METADATA */
+
+
+/******************************* sqlite3_bind_  ***************************
+**
+** Routines used to attach values to wildcards in a compiled SQL statement.
+*/
+/*
+** Unbind the value bound to variable i in virtual machine p. This is the
+** the same as binding a NULL value to the column. If the "i" parameter is
+** out of range, then SQLITE_RANGE is returned. Othewise SQLITE_OK.
+**
+** The error code stored in database p->db is overwritten with the return
+** value in any case.
+*/
+static int vdbeUnbind(Vdbe *p, int i){
+  Mem *pVar;
+  if( p==0 || p->magic!=VDBE_MAGIC_RUN || p->pc>=0 ){
+    if( p ) sqlite3Error(p->db, SQLITE_MISUSE, 0);
+    return SQLITE_MISUSE;
+  }
+  if( i<1 || i>p->nVar ){
+    sqlite3Error(p->db, SQLITE_RANGE, 0);
+    return SQLITE_RANGE;
+  }
+  i--;
+  pVar = &p->aVar[i];
+  sqlite3VdbeMemRelease(pVar);
+  pVar->flags = MEM_Null;
+  sqlite3Error(p->db, SQLITE_OK, 0);
+  return SQLITE_OK;
+}
+
+/*
+** Bind a text or BLOB value.
+*/
+static int bindText(
+  sqlite3_stmt *pStmt,   /* The statement to bind against */
+  int i,                 /* Index of the parameter to bind */
+  const void *zData,     /* Pointer to the data to be bound */
+  int nData,             /* Number of bytes of data to be bound */
+  void (*xDel)(void*),   /* Destructor for the data */
+  int encoding           /* Encoding for the data */
+){
+  Vdbe *p = (Vdbe *)pStmt;
+  Mem *pVar;
+  int rc;
+
+  if( p==0 ){
+    return SQLITE_MISUSE;
+  }
+  sqlite3_mutex_enter(p->db->mutex);
+  rc = vdbeUnbind(p, i);
+  if( rc==SQLITE_OK && zData!=0 ){
+    pVar = &p->aVar[i-1];
+    rc = sqlite3VdbeMemSetStr(pVar, zData, nData, encoding, xDel);
+    if( rc==SQLITE_OK && encoding!=0 ){
+      rc = sqlite3VdbeChangeEncoding(pVar, ENC(p->db));
+    }
+    sqlite3Error(p->db, rc, 0);
+    rc = sqlite3ApiExit(p->db, rc);
+  }
+  sqlite3_mutex_leave(p->db->mutex);
+  return rc;
+}
+
+
+/*
+** Bind a blob value to an SQL statement variable.
+*/
+int sqlite3_bind_blob(
+  sqlite3_stmt *pStmt,
+  int i,
+  const void *zData,
+  int nData,
+  void (*xDel)(void*)
+){
+  return bindText(pStmt, i, zData, nData, xDel, 0);
+}
+int sqlite3_bind_double(sqlite3_stmt *pStmt, int i, double rValue){
+  int rc;
+  Vdbe *p = (Vdbe *)pStmt;
+  sqlite3_mutex_enter(p->db->mutex);
+  rc = vdbeUnbind(p, i);
+  if( rc==SQLITE_OK ){
+    sqlite3VdbeMemSetDouble(&p->aVar[i-1], rValue);
+  }
+  sqlite3_mutex_leave(p->db->mutex);
+  return rc;
+}
+int sqlite3_bind_int(sqlite3_stmt *p, int i, int iValue){
+  return sqlite3_bind_int64(p, i, (i64)iValue);
+}
+int sqlite3_bind_int64(sqlite3_stmt *pStmt, int i, sqlite_int64 iValue){
+  int rc;
+  Vdbe *p = (Vdbe *)pStmt;
+  sqlite3_mutex_enter(p->db->mutex);
+  rc = vdbeUnbind(p, i);
+  if( rc==SQLITE_OK ){
+    sqlite3VdbeMemSetInt64(&p->aVar[i-1], iValue);
+  }
+  sqlite3_mutex_leave(p->db->mutex);
+  return rc;
+}
+int sqlite3_bind_null(sqlite3_stmt *pStmt, int i){
+  int rc;
+  Vdbe *p = (Vdbe*)pStmt;
+  sqlite3_mutex_enter(p->db->mutex);
+  rc = vdbeUnbind(p, i);
+  sqlite3_mutex_leave(p->db->mutex);
+  return rc;
+}
+int sqlite3_bind_text(
+  sqlite3_stmt *pStmt,
+  int i,
+  const char *zData,
+  int nData,
+  void (*xDel)(void*)
+){
+  return bindText(pStmt, i, zData, nData, xDel, SQLITE_UTF8);
+}
+#ifndef SQLITE_OMIT_UTF16
+int sqlite3_bind_text16(
+  sqlite3_stmt *pStmt,
+  int i,
+  const void *zData,
+  int nData,
+  void (*xDel)(void*)
+){
+  return bindText(pStmt, i, zData, nData, xDel, SQLITE_UTF16NATIVE);
+}
+#endif /* SQLITE_OMIT_UTF16 */
+int sqlite3_bind_value(sqlite3_stmt *pStmt, int i, const sqlite3_value *pValue){
+  int rc;
+  Vdbe *p = (Vdbe *)pStmt;
+  sqlite3_mutex_enter(p->db->mutex);
+  rc = vdbeUnbind(p, i);
+  if( rc==SQLITE_OK ){
+    rc = sqlite3VdbeMemCopy(&p->aVar[i-1], pValue);
+  }
+  rc = sqlite3ApiExit(p->db, rc);
+  sqlite3_mutex_leave(p->db->mutex);
+  return rc;
+}
+int sqlite3_bind_zeroblob(sqlite3_stmt *pStmt, int i, int n){
+  int rc;
+  Vdbe *p = (Vdbe *)pStmt;
+  sqlite3_mutex_enter(p->db->mutex);
+  rc = vdbeUnbind(p, i);
+  if( rc==SQLITE_OK ){
+    sqlite3VdbeMemSetZeroBlob(&p->aVar[i-1], n);
+  }
+  sqlite3_mutex_leave(p->db->mutex);
+  return rc;
+}
+
+/*
+** Return the number of wildcards that can be potentially bound to.
+** This routine is added to support DBD::SQLite.
+*/
+int sqlite3_bind_parameter_count(sqlite3_stmt *pStmt){
+  Vdbe *p = (Vdbe*)pStmt;
+  return p ? p->nVar : 0;
+}
+
+/*
+** Create a mapping from variable numbers to variable names
+** in the Vdbe.azVar[] array, if such a mapping does not already
+** exist.
+*/
+static void createVarMap(Vdbe *p){
+  if( !p->okVar ){
+    sqlite3_mutex_enter(p->db->mutex);
+    if( !p->okVar ){
+      int j;
+      Op *pOp;
+      for(j=0, pOp=p->aOp; j<p->nOp; j++, pOp++){
+        if( pOp->opcode==OP_Variable ){
+          assert( pOp->p1>0 && pOp->p1<=p->nVar );
+          p->azVar[pOp->p1-1] = pOp->p4.z;
+        }
+      }
+      p->okVar = 1;
+    }
+    sqlite3_mutex_leave(p->db->mutex);
+  }
+}
+
+/*
+** Return the name of a wildcard parameter.  Return NULL if the index
+** is out of range or if the wildcard is unnamed.
+**
+** The result is always UTF-8.
+*/
+const char *sqlite3_bind_parameter_name(sqlite3_stmt *pStmt, int i){
+  Vdbe *p = (Vdbe*)pStmt;
+  if( p==0 || i<1 || i>p->nVar ){
+    return 0;
+  }
+  createVarMap(p);
+  return p->azVar[i-1];
+}
+
+/*
+** Given a wildcard parameter name, return the index of the variable
+** with that name.  If there is no variable with the given name,
+** return 0.
+*/
+int sqlite3_bind_parameter_index(sqlite3_stmt *pStmt, const char *zName){
+  Vdbe *p = (Vdbe*)pStmt;
+  int i;
+  if( p==0 ){
+    return 0;
+  }
+  createVarMap(p);
+  if( zName ){
+    for(i=0; i<p->nVar; i++){
+      const char *z = p->azVar[i];
+      if( z && strcmp(z,zName)==0 ){
+        return i+1;
+      }
+    }
+  }
+  return 0;
+}
+
+/*
+** Transfer all bindings from the first statement over to the second.
+** If the two statements contain a different number of bindings, then
+** an SQLITE_ERROR is returned.
+*/
+int sqlite3_transfer_bindings(sqlite3_stmt *pFromStmt, sqlite3_stmt *pToStmt){
+  Vdbe *pFrom = (Vdbe*)pFromStmt;
+  Vdbe *pTo = (Vdbe*)pToStmt;
+  int i, rc = SQLITE_OK;
+  if( (pFrom->magic!=VDBE_MAGIC_RUN && pFrom->magic!=VDBE_MAGIC_HALT)
+    || (pTo->magic!=VDBE_MAGIC_RUN && pTo->magic!=VDBE_MAGIC_HALT)
+    || pTo->db!=pFrom->db ){
+    return SQLITE_MISUSE;
+  }
+  if( pFrom->nVar!=pTo->nVar ){
+    return SQLITE_ERROR;
+  }
+  sqlite3_mutex_enter(pTo->db->mutex);
+  for(i=0; rc==SQLITE_OK && i<pFrom->nVar; i++){
+    sqlite3VdbeMemMove(&pTo->aVar[i], &pFrom->aVar[i]);
+  }
+  sqlite3_mutex_leave(pTo->db->mutex);
+  assert( rc==SQLITE_OK || rc==SQLITE_NOMEM );
+  return rc;
+}
+
+/*
+** Return the sqlite3* database handle to which the prepared statement given
+** in the argument belongs.  This is the same database handle that was
+** the first argument to the sqlite3_prepare() that was used to create
+** the statement in the first place.
+*/
+sqlite3 *sqlite3_db_handle(sqlite3_stmt *pStmt){
+  return pStmt ? ((Vdbe*)pStmt)->db : 0;
+}
diff --git a/uppsrc/plugin/sqlite3/lib/vdbeaux.c b/uppsrc/plugin/sqlite3/lib/vdbeaux.c
new file mode 100644
index 000000000..f65d84c8a
--- /dev/null
+++ b/uppsrc/plugin/sqlite3/lib/vdbeaux.c
@@ -0,0 +1,2346 @@
+/*
+** 2003 September 6
+**
+** The author disclaims copyright to this source code.  In place of
+** a legal notice, here is a blessing:
+**
+**    May you do good and not evil.
+**    May you find forgiveness for yourself and forgive others.
+**    May you share freely, never taking more than you give.
+**
+*************************************************************************
+** This file contains code used for creating, destroying, and populating
+** a VDBE (or an "sqlite3_stmt" as it is known to the outside world.)  Prior
+** to version 2.8.7, all this code was combined into the vdbe.c source file.
+** But that file was getting too big so this subroutines were split out.
+*/
+#include "sqliteInt.h"
+#include <ctype.h>
+#include "vdbeInt.h"
+
+
+
+/*
+** When debugging the code generator in a symbolic debugger, one can
+** set the sqlite3VdbeAddopTrace to 1 and all opcodes will be printed
+** as they are added to the instruction stream.
+*/
+#ifdef SQLITE_DEBUG
+int sqlite3VdbeAddopTrace = 0;
+#endif
+
+
+/*
+** Create a new virtual database engine.
+*/
+Vdbe *sqlite3VdbeCreate(sqlite3 *db){
+  Vdbe *p;
+  p = sqlite3DbMallocZero(db, sizeof(Vdbe) );
+  if( p==0 ) return 0;
+  p->db = db;
+  if( db->pVdbe ){
+    db->pVdbe->pPrev = p;
+  }
+  p->pNext = db->pVdbe;
+  p->pPrev = 0;
+  db->pVdbe = p;
+  p->magic = VDBE_MAGIC_INIT;
+  return p;
+}
+
+/*
+** Remember the SQL string for a prepared statement.
+*/
+void sqlite3VdbeSetSql(Vdbe *p, const char *z, int n){
+  if( p==0 ) return;
+  assert( p->zSql==0 );
+  p->zSql = sqlite3DbStrNDup(p->db, z, n);
+}
+
+/*
+** Return the SQL associated with a prepared statement
+*/
+const char *sqlite3_sql(sqlite3_stmt *pStmt){
+  return ((Vdbe *)pStmt)->zSql;
+}
+
+/*
+** Swap all content between two VDBE structures.
+*/
+void sqlite3VdbeSwap(Vdbe *pA, Vdbe *pB){
+  Vdbe tmp, *pTmp;
+  char *zTmp;
+  int nTmp;
+  tmp = *pA;
+  *pA = *pB;
+  *pB = tmp;
+  pTmp = pA->pNext;
+  pA->pNext = pB->pNext;
+  pB->pNext = pTmp;
+  pTmp = pA->pPrev;
+  pA->pPrev = pB->pPrev;
+  pB->pPrev = pTmp;
+  zTmp = pA->zSql;
+  pA->zSql = pB->zSql;
+  pB->zSql = zTmp;
+  nTmp = pA->nSql;
+  pA->nSql = pB->nSql;
+  pB->nSql = nTmp;
+}
+
+#ifdef SQLITE_DEBUG
+/*
+** Turn tracing on or off
+*/
+void sqlite3VdbeTrace(Vdbe *p, FILE *trace){
+  p->trace = trace;
+}
+#endif
+
+/*
+** Resize the Vdbe.aOp array so that it contains at least N
+** elements.
+**
+** If an out-of-memory error occurs while resizing the array,
+** Vdbe.aOp and Vdbe.nOpAlloc remain unchanged (this is so that
+** any opcodes already allocated can be correctly deallocated
+** along with the rest of the Vdbe).
+*/
+static void resizeOpArray(Vdbe *p, int N){
+  VdbeOp *pNew;
+  int oldSize = p->nOpAlloc;
+  pNew = sqlite3DbRealloc(p->db, p->aOp, N*sizeof(Op));
+  if( pNew ){
+    p->nOpAlloc = N;
+    p->aOp = pNew;
+    if( N>oldSize ){
+      memset(&p->aOp[oldSize], 0, (N-oldSize)*sizeof(Op));
+    }
+  }
+}
+
+/*
+** Add a new instruction to the list of instructions current in the
+** VDBE.  Return the address of the new instruction.
+**
+** Parameters:
+**
+**    p               Pointer to the VDBE
+**
+**    op              The opcode for this instruction
+**
+**    p1, p2, p3      Operands
+**
+** Use the sqlite3VdbeResolveLabel() function to fix an address and
+** the sqlite3VdbeChangeP4() function to change the value of the P4
+** operand.
+*/
+int sqlite3VdbeAddOp3(Vdbe *p, int op, int p1, int p2, int p3){
+  int i;
+  VdbeOp *pOp;
+
+  i = p->nOp;
+  assert( p->magic==VDBE_MAGIC_INIT );
+  if( p->nOpAlloc<=i ){
+    resizeOpArray(p, p->nOpAlloc ? p->nOpAlloc*2 : 1024/sizeof(Op));
+    if( p->db->mallocFailed ){
+      return 0;
+    }
+  }
+  p->nOp++;
+  pOp = &p->aOp[i];
+  pOp->opcode = op;
+  pOp->p1 = p1;
+  pOp->p2 = p2;
+  pOp->p3 = p3;
+  pOp->p4.p = 0;
+  pOp->p4type = P4_NOTUSED;
+  p->expired = 0;
+#ifdef SQLITE_DEBUG
+  if( sqlite3VdbeAddopTrace ) sqlite3VdbePrintOp(0, i, &p->aOp[i]);
+#endif
+  return i;
+}
+int sqlite3VdbeAddOp0(Vdbe *p, int op){
+  return sqlite3VdbeAddOp3(p, op, 0, 0, 0);
+}
+int sqlite3VdbeAddOp1(Vdbe *p, int op, int p1){
+  return sqlite3VdbeAddOp3(p, op, p1, 0, 0);
+}
+int sqlite3VdbeAddOp2(Vdbe *p, int op, int p1, int p2){
+  return sqlite3VdbeAddOp3(p, op, p1, p2, 0);
+}
+
+
+/*
+** Add an opcode that includes the p4 value as a pointer.
+*/
+int sqlite3VdbeAddOp4(
+  Vdbe *p,            /* Add the opcode to this VM */
+  int op,             /* The new opcode */
+  int p1,             /* The P1 operand */
+  int p2,             /* The P2 operand */
+  int p3,             /* The P3 operand */
+  const char *zP4,    /* The P4 operand */
+  int p4type          /* P4 operand type */
+){
+  int addr = sqlite3VdbeAddOp3(p, op, p1, p2, p3);
+  sqlite3VdbeChangeP4(p, addr, zP4, p4type);
+  return addr;
+}
+
+/*
+** Create a new symbolic label for an instruction that has yet to be
+** coded.  The symbolic label is really just a negative number.  The
+** label can be used as the P2 value of an operation.  Later, when
+** the label is resolved to a specific address, the VDBE will scan
+** through its operation list and change all values of P2 which match
+** the label into the resolved address.
+**
+** The VDBE knows that a P2 value is a label because labels are
+** always negative and P2 values are suppose to be non-negative.
+** Hence, a negative P2 value is a label that has yet to be resolved.
+**
+** Zero is returned if a malloc() fails.
+*/
+int sqlite3VdbeMakeLabel(Vdbe *p){
+  int i;
+  i = p->nLabel++;
+  assert( p->magic==VDBE_MAGIC_INIT );
+  if( i>=p->nLabelAlloc ){
+    p->nLabelAlloc = p->nLabelAlloc*2 + 10;
+    p->aLabel = sqlite3DbReallocOrFree(p->db, p->aLabel,
+                                    p->nLabelAlloc*sizeof(p->aLabel[0]));
+  }
+  if( p->aLabel ){
+    p->aLabel[i] = -1;
+  }
+  return -1-i;
+}
+
+/*
+** Resolve label "x" to be the address of the next instruction to
+** be inserted.  The parameter "x" must have been obtained from
+** a prior call to sqlite3VdbeMakeLabel().
+*/
+void sqlite3VdbeResolveLabel(Vdbe *p, int x){
+  int j = -1-x;
+  assert( p->magic==VDBE_MAGIC_INIT );
+  assert( j>=0 && j<p->nLabel );
+  if( p->aLabel ){
+    p->aLabel[j] = p->nOp;
+  }
+}
+
+/*
+** Loop through the program looking for P2 values that are negative
+** on jump instructions.  Each such value is a label.  Resolve the
+** label by setting the P2 value to its correct non-zero value.
+**
+** This routine is called once after all opcodes have been inserted.
+**
+** Variable *pMaxFuncArgs is set to the maximum value of any P2 argument
+** to an OP_Function, OP_AggStep or OP_VFilter opcode. This is used by
+** sqlite3VdbeMakeReady() to size the Vdbe.apArg[] array.
+**
+** This routine also does the following optimization:  It scans for
+** instructions that might cause a statement rollback.  Such instructions
+** are:
+**
+**   *  OP_Halt with P1=SQLITE_CONSTRAINT and P2=OE_Abort.
+**   *  OP_Destroy
+**   *  OP_VUpdate
+**   *  OP_VRename
+**
+** If no such instruction is found, then every Statement instruction
+** is changed to a Noop.  In this way, we avoid creating the statement
+** journal file unnecessarily.
+*/
+static void resolveP2Values(Vdbe *p, int *pMaxFuncArgs){
+  int i;
+  int nMaxArgs = 0;
+  Op *pOp;
+  int *aLabel = p->aLabel;
+  int doesStatementRollback = 0;
+  int hasStatementBegin = 0;
+  for(pOp=p->aOp, i=p->nOp-1; i>=0; i--, pOp++){
+    u8 opcode = pOp->opcode;
+
+    if( opcode==OP_Function ){
+      if( pOp->p5>nMaxArgs ) nMaxArgs = pOp->p5;
+    }else if( opcode==OP_AggStep
+#ifndef SQLITE_OMIT_VIRTUALTABLE
+        || opcode==OP_VUpdate
+#endif
+    ){
+      if( pOp->p2>nMaxArgs ) nMaxArgs = pOp->p2;
+    }
+    if( opcode==OP_Halt ){
+      if( pOp->p1==SQLITE_CONSTRAINT && pOp->p2==OE_Abort ){
+        doesStatementRollback = 1;
+      }
+    }else if( opcode==OP_Statement ){
+      hasStatementBegin = 1;
+    }else if( opcode==OP_Destroy ){
+      doesStatementRollback = 1;
+#ifndef SQLITE_OMIT_VIRTUALTABLE
+    }else if( opcode==OP_VUpdate || opcode==OP_VRename ){
+      doesStatementRollback = 1;
+    }else if( opcode==OP_VFilter ){
+      int n;
+      assert( p->nOp - i >= 3 );
+      assert( pOp[-1].opcode==OP_Integer );
+      n = pOp[-1].p1;
+      if( n>nMaxArgs ) nMaxArgs = n;
+#endif
+    }
+
+    if( sqlite3VdbeOpcodeHasProperty(opcode, OPFLG_JUMP) && pOp->p2<0 ){
+      assert( -1-pOp->p2<p->nLabel );
+      pOp->p2 = aLabel[-1-pOp->p2];
+    }
+  }
+  sqlite3_free(p->aLabel);
+  p->aLabel = 0;
+
+  *pMaxFuncArgs = nMaxArgs;
+
+  /* If we never rollback a statement transaction, then statement
+  ** transactions are not needed.  So change every OP_Statement
+  ** opcode into an OP_Noop.  This avoid a call to sqlite3OsOpenExclusive()
+  ** which can be expensive on some platforms.
+  */
+  if( hasStatementBegin && !doesStatementRollback ){
+    for(pOp=p->aOp, i=p->nOp-1; i>=0; i--, pOp++){
+      if( pOp->opcode==OP_Statement ){
+        pOp->opcode = OP_Noop;
+      }
+    }
+  }
+}
+
+/*
+** Return the address of the next instruction to be inserted.
+*/
+int sqlite3VdbeCurrentAddr(Vdbe *p){
+  assert( p->magic==VDBE_MAGIC_INIT );
+  return p->nOp;
+}
+
+/*
+** Add a whole list of operations to the operation stack.  Return the
+** address of the first operation added.
+*/
+int sqlite3VdbeAddOpList(Vdbe *p, int nOp, VdbeOpList const *aOp){
+  int addr;
+  assert( p->magic==VDBE_MAGIC_INIT );
+  if( p->nOp + nOp > p->nOpAlloc ){
+    resizeOpArray(p, p->nOpAlloc ? p->nOpAlloc*2 : 1024/sizeof(Op));
+    assert( p->nOp+nOp<=p->nOpAlloc || p->db->mallocFailed );
+  }
+  if( p->db->mallocFailed ){
+    return 0;
+  }
+  addr = p->nOp;
+  if( nOp>0 ){
+    int i;
+    VdbeOpList const *pIn = aOp;
+    for(i=0; i<nOp; i++, pIn++){
+      int p2 = pIn->p2;
+      VdbeOp *pOut = &p->aOp[i+addr];
+      pOut->opcode = pIn->opcode;
+      pOut->p1 = pIn->p1;
+      if( p2<0 && sqlite3VdbeOpcodeHasProperty(pOut->opcode, OPFLG_JUMP) ){
+        pOut->p2 = addr + ADDR(p2);
+      }else{
+        pOut->p2 = p2;
+      }
+      pOut->p3 = pIn->p3;
+      pOut->p4type = P4_NOTUSED;
+      pOut->p4.p = 0;
+      pOut->p5 = 0;
+#ifdef SQLITE_DEBUG
+      if( sqlite3VdbeAddopTrace ){
+        sqlite3VdbePrintOp(0, i+addr, &p->aOp[i+addr]);
+      }
+#endif
+    }
+    p->nOp += nOp;
+  }
+  return addr;
+}
+
+/*
+** Change the value of the P1 operand for a specific instruction.
+** This routine is useful when a large program is loaded from a
+** static array using sqlite3VdbeAddOpList but we want to make a
+** few minor changes to the program.
+*/
+void sqlite3VdbeChangeP1(Vdbe *p, int addr, int val){
+  assert( p==0 || p->magic==VDBE_MAGIC_INIT );
+  if( p && addr>=0 && p->nOp>addr && p->aOp ){
+    p->aOp[addr].p1 = val;
+  }
+}
+
+/*
+** Change the value of the P2 operand for a specific instruction.
+** This routine is useful for setting a jump destination.
+*/
+void sqlite3VdbeChangeP2(Vdbe *p, int addr, int val){
+  assert( p==0 || p->magic==VDBE_MAGIC_INIT );
+  if( p && addr>=0 && p->nOp>addr && p->aOp ){
+    p->aOp[addr].p2 = val;
+  }
+}
+
+/*
+** Change the value of the P3 operand for a specific instruction.
+*/
+void sqlite3VdbeChangeP3(Vdbe *p, int addr, int val){
+  assert( p==0 || p->magic==VDBE_MAGIC_INIT );
+  if( p && addr>=0 && p->nOp>addr && p->aOp ){
+    p->aOp[addr].p3 = val;
+  }
+}
+
+/*
+** Change the value of the P5 operand for the most recently
+** added operation.
+*/
+void sqlite3VdbeChangeP5(Vdbe *p, u8 val){
+  assert( p==0 || p->magic==VDBE_MAGIC_INIT );
+  if( p && p->aOp ){
+    assert( p->nOp>0 );
+    p->aOp[p->nOp-1].p5 = val;
+  }
+}
+
+/*
+** Change the P2 operand of instruction addr so that it points to
+** the address of the next instruction to be coded.
+*/
+void sqlite3VdbeJumpHere(Vdbe *p, int addr){
+  sqlite3VdbeChangeP2(p, addr, p->nOp);
+}
+
+
+/*
+** If the input FuncDef structure is ephemeral, then free it.  If
+** the FuncDef is not ephermal, then do nothing.
+*/
+static void freeEphemeralFunction(FuncDef *pDef){
+  if( pDef && (pDef->flags & SQLITE_FUNC_EPHEM)!=0 ){
+    sqlite3_free(pDef);
+  }
+}
+
+/*
+** Delete a P4 value if necessary.
+*/
+static void freeP4(int p4type, void *p3){
+  if( p3 ){
+    switch( p4type ){
+      case P4_REAL:
+      case P4_INT64:
+      case P4_MPRINTF:
+      case P4_DYNAMIC:
+      case P4_KEYINFO:
+      case P4_KEYINFO_HANDOFF: {
+        sqlite3_free(p3);
+        break;
+      }
+      case P4_VDBEFUNC: {
+        VdbeFunc *pVdbeFunc = (VdbeFunc *)p3;
+        freeEphemeralFunction(pVdbeFunc->pFunc);
+        sqlite3VdbeDeleteAuxData(pVdbeFunc, 0);
+        sqlite3_free(pVdbeFunc);
+        break;
+      }
+      case P4_FUNCDEF: {
+        freeEphemeralFunction((FuncDef*)p3);
+        break;
+      }
+      case P4_MEM: {
+        sqlite3ValueFree((sqlite3_value*)p3);
+        break;
+      }
+    }
+  }
+}
+
+
+/*
+** Change N opcodes starting at addr to No-ops.
+*/
+void sqlite3VdbeChangeToNoop(Vdbe *p, int addr, int N){
+  if( p && p->aOp ){
+    VdbeOp *pOp = &p->aOp[addr];
+    while( N-- ){
+      freeP4(pOp->p4type, pOp->p4.p);
+      memset(pOp, 0, sizeof(pOp[0]));
+      pOp->opcode = OP_Noop;
+      pOp++;
+    }
+  }
+}
+
+/*
+** Change the value of the P4 operand for a specific instruction.
+** This routine is useful when a large program is loaded from a
+** static array using sqlite3VdbeAddOpList but we want to make a
+** few minor changes to the program.
+**
+** If n>=0 then the P4 operand is dynamic, meaning that a copy of
+** the string is made into memory obtained from sqlite3_malloc().
+** A value of n==0 means copy bytes of zP4 up to and including the
+** first null byte.  If n>0 then copy n+1 bytes of zP4.
+**
+** If n==P4_KEYINFO it means that zP4 is a pointer to a KeyInfo structure.
+** A copy is made of the KeyInfo structure into memory obtained from
+** sqlite3_malloc, to be freed when the Vdbe is finalized.
+** n==P4_KEYINFO_HANDOFF indicates that zP4 points to a KeyInfo structure
+** stored in memory that the caller has obtained from sqlite3_malloc. The
+** caller should not free the allocation, it will be freed when the Vdbe is
+** finalized.
+**
+** Other values of n (P4_STATIC, P4_COLLSEQ etc.) indicate that zP4 points
+** to a string or structure that is guaranteed to exist for the lifetime of
+** the Vdbe. In these cases we can just copy the pointer.
+**
+** If addr<0 then change P4 on the most recently inserted instruction.
+*/
+void sqlite3VdbeChangeP4(Vdbe *p, int addr, const char *zP4, int n){
+  Op *pOp;
+  assert( p!=0 );
+  assert( p->magic==VDBE_MAGIC_INIT );
+  if( p->aOp==0 || p->db->mallocFailed ){
+    if (n != P4_KEYINFO) {
+      freeP4(n, (void*)*(char**)&zP4);
+    }
+    return;
+  }
+  assert( addr<p->nOp );
+  if( addr<0 ){
+    addr = p->nOp - 1;
+    if( addr<0 ) return;
+  }
+  pOp = &p->aOp[addr];
+  freeP4(pOp->p4type, pOp->p4.p);
+  pOp->p4.p = 0;
+  if( n==P4_INT32 ){
+    /* Note: this cast is safe, because the origin data point was an int
+    ** that was cast to a (const char *). */
+    pOp->p4.i = (int)(sqlite3_intptr_t)zP4;
+    pOp->p4type = n;
+  }else if( zP4==0 ){
+    pOp->p4.p = 0;
+    pOp->p4type = P4_NOTUSED;
+  }else if( n==P4_KEYINFO ){
+    KeyInfo *pKeyInfo;
+    int nField, nByte;
+
+    nField = ((KeyInfo*)zP4)->nField;
+    nByte = sizeof(*pKeyInfo) + (nField-1)*sizeof(pKeyInfo->aColl[0]) + nField;
+    pKeyInfo = sqlite3_malloc( nByte );
+    pOp->p4.pKeyInfo = pKeyInfo;
+    if( pKeyInfo ){
+      memcpy(pKeyInfo, zP4, nByte);
+      /* In the current implementation, P4_KEYINFO is only ever used on
+      ** KeyInfo structures that have no aSortOrder component.  Elements
+      ** with an aSortOrder always use P4_KEYINFO_HANDOFF.  So we do not
+      ** need to bother with duplicating the aSortOrder. */
+      assert( pKeyInfo->aSortOrder==0 );
+#if 0
+      aSortOrder = pKeyInfo->aSortOrder;
+      if( aSortOrder ){
+        pKeyInfo->aSortOrder = (unsigned char*)&pKeyInfo->aColl[nField];
+        memcpy(pKeyInfo->aSortOrder, aSortOrder, nField);
+      }
+#endif
+      pOp->p4type = P4_KEYINFO;
+    }else{
+      p->db->mallocFailed = 1;
+      pOp->p4type = P4_NOTUSED;
+    }
+  }else if( n==P4_KEYINFO_HANDOFF ){
+    pOp->p4.p = (void*)zP4;
+    pOp->p4type = P4_KEYINFO;
+  }else if( n<0 ){
+    pOp->p4.p = (void*)zP4;
+    pOp->p4type = n;
+  }else{
+    if( n==0 ) n = strlen(zP4);
+    pOp->p4.z = sqlite3DbStrNDup(p->db, zP4, n);
+    pOp->p4type = P4_DYNAMIC;
+  }
+}
+
+#ifndef NDEBUG
+/*
+** Change the comment on the the most recently coded instruction.
+*/
+void sqlite3VdbeComment(Vdbe *p, const char *zFormat, ...){
+  va_list ap;
+  assert( p->nOp>0 || p->aOp==0 );
+  assert( p->aOp==0 || p->aOp[p->nOp-1].zComment==0 || p->db->mallocFailed );
+  if( p->nOp ){
+    char **pz = &p->aOp[p->nOp-1].zComment;
+    va_start(ap, zFormat);
+    sqlite3_free(*pz);
+    *pz = sqlite3VMPrintf(p->db, zFormat, ap);
+    va_end(ap);
+  }
+}
+#endif
+
+/*
+** Return the opcode for a given address.
+*/
+VdbeOp *sqlite3VdbeGetOp(Vdbe *p, int addr){
+  assert( p->magic==VDBE_MAGIC_INIT );
+  assert( (addr>=0 && addr<p->nOp) || p->db->mallocFailed );
+  return ((addr>=0 && addr<p->nOp)?(&p->aOp[addr]):0);
+}
+
+#if !defined(SQLITE_OMIT_EXPLAIN) || !defined(NDEBUG) \
+     || defined(VDBE_PROFILE) || defined(SQLITE_DEBUG)
+/*
+** Compute a string that describes the P4 parameter for an opcode.
+** Use zTemp for any required temporary buffer space.
+*/
+static char *displayP4(Op *pOp, char *zTemp, int nTemp){
+  char *zP4 = zTemp;
+  assert( nTemp>=20 );
+  switch( pOp->p4type ){
+    case P4_KEYINFO: {
+      int i, j;
+      KeyInfo *pKeyInfo = pOp->p4.pKeyInfo;
+      sqlite3_snprintf(nTemp, zTemp, "keyinfo(%d", pKeyInfo->nField);
+      i = strlen(zTemp);
+      for(j=0; j<pKeyInfo->nField; j++){
+        CollSeq *pColl = pKeyInfo->aColl[j];
+        if( pColl ){
+          int n = strlen(pColl->zName);
+          if( i+n>nTemp-6 ){
+            memcpy(&zTemp[i],",...",4);
+            break;
+          }
+          zTemp[i++] = ',';
+          if( pKeyInfo->aSortOrder && pKeyInfo->aSortOrder[j] ){
+            zTemp[i++] = '-';
+          }
+          memcpy(&zTemp[i], pColl->zName,n+1);
+          i += n;
+        }else if( i+4<nTemp-6 ){
+          memcpy(&zTemp[i],",nil",4);
+          i += 4;
+        }
+      }
+      zTemp[i++] = ')';
+      zTemp[i] = 0;
+      assert( i<nTemp );
+      break;
+    }
+    case P4_COLLSEQ: {
+      CollSeq *pColl = pOp->p4.pColl;
+      sqlite3_snprintf(nTemp, zTemp, "collseq(%.20s)", pColl->zName);
+      break;
+    }
+    case P4_FUNCDEF: {
+      FuncDef *pDef = pOp->p4.pFunc;
+      sqlite3_snprintf(nTemp, zTemp, "%s(%d)", pDef->zName, pDef->nArg);
+      break;
+    }
+    case P4_INT64: {
+      sqlite3_snprintf(nTemp, zTemp, "%lld", *pOp->p4.pI64);
+      break;
+    }
+    case P4_INT32: {
+      sqlite3_snprintf(nTemp, zTemp, "%d", pOp->p4.i);
+      break;
+    }
+    case P4_REAL: {
+      sqlite3_snprintf(nTemp, zTemp, "%.16g", *pOp->p4.pReal);
+      break;
+    }
+    case P4_MEM: {
+      Mem *pMem = pOp->p4.pMem;
+      assert( (pMem->flags & MEM_Null)==0 );
+      if( pMem->flags & MEM_Str ){
+        zP4 = pMem->z;
+      }else if( pMem->flags & MEM_Int ){
+        sqlite3_snprintf(nTemp, zTemp, "%lld", pMem->u.i);
+      }else if( pMem->flags & MEM_Real ){
+        sqlite3_snprintf(nTemp, zTemp, "%.16g", pMem->r);
+      }
+      break;
+    }
+#ifndef SQLITE_OMIT_VIRTUALTABLE
+    case P4_VTAB: {
+      sqlite3_vtab *pVtab = pOp->p4.pVtab;
+      sqlite3_snprintf(nTemp, zTemp, "vtab:%p:%p", pVtab, pVtab->pModule);
+      break;
+    }
+#endif
+    default: {
+      zP4 = pOp->p4.z;
+      if( zP4==0 ){
+        zP4 = zTemp;
+        zTemp[0] = 0;
+      }
+    }
+  }
+  assert( zP4!=0 );
+  return zP4;
+}
+#endif
+
+/*
+** Declare to the Vdbe that the BTree object at db->aDb[i] is used.
+**
+*/
+void sqlite3VdbeUsesBtree(Vdbe *p, int i){
+  int mask;
+  assert( i>=0 && i<p->db->nDb );
+  assert( i<sizeof(p->btreeMask)*8 );
+  mask = 1<<i;
+  if( (p->btreeMask & mask)==0 ){
+    p->btreeMask |= mask;
+    sqlite3BtreeMutexArrayInsert(&p->aMutex, p->db->aDb[i].pBt);
+  }
+}
+
+
+#if defined(VDBE_PROFILE) || defined(SQLITE_DEBUG)
+/*
+** Print a single opcode.  This routine is used for debugging only.
+*/
+void sqlite3VdbePrintOp(FILE *pOut, int pc, Op *pOp){
+  char *zP4;
+  char zPtr[50];
+  static const char *zFormat1 = "%4d %-13s %4d %4d %4d %-4s %.2X %s\n";
+  if( pOut==0 ) pOut = stdout;
+  zP4 = displayP4(pOp, zPtr, sizeof(zPtr));
+  fprintf(pOut, zFormat1, pc,
+      sqlite3OpcodeName(pOp->opcode), pOp->p1, pOp->p2, pOp->p3, zP4, pOp->p5,
+#ifdef SQLITE_DEBUG
+      pOp->zComment ? pOp->zComment : ""
+#else
+      ""
+#endif
+  );
+  fflush(pOut);
+}
+#endif
+
+/*
+** Release an array of N Mem elements
+*/
+static void releaseMemArray(Mem *p, int N){
+  if( p && N ){
+    sqlite3 *db = p->db;
+    int malloc_failed = db->mallocFailed;
+    while( N-->0 ){
+      assert( N<2 || p[0].db==p[1].db );
+      sqlite3VdbeMemRelease(p);
+      p++->flags = MEM_Null;
+    }
+    db->mallocFailed = malloc_failed;
+  }
+}
+
+#ifndef SQLITE_OMIT_EXPLAIN
+/*
+** Give a listing of the program in the virtual machine.
+**
+** The interface is the same as sqlite3VdbeExec().  But instead of
+** running the code, it invokes the callback once for each instruction.
+** This feature is used to implement "EXPLAIN".
+**
+** When p->explain==1, each instruction is listed.  When
+** p->explain==2, only OP_Explain instructions are listed and these
+** are shown in a different format.  p->explain==2 is used to implement
+** EXPLAIN QUERY PLAN.
+*/
+int sqlite3VdbeList(
+  Vdbe *p                   /* The VDBE */
+){
+  sqlite3 *db = p->db;
+  int i;
+  int rc = SQLITE_OK;
+  Mem *pMem = p->pResultSet = &p->aMem[1];
+
+  assert( p->explain );
+  if( p->magic!=VDBE_MAGIC_RUN ) return SQLITE_MISUSE;
+  assert( db->magic==SQLITE_MAGIC_BUSY );
+  assert( p->rc==SQLITE_OK || p->rc==SQLITE_BUSY );
+
+  /* Even though this opcode does not use dynamic strings for
+  ** the result, result columns may become dynamic if the user calls
+  ** sqlite3_column_text16(), causing a translation to UTF-16 encoding.
+  */
+  releaseMemArray(pMem, p->nMem);
+
+  do{
+    i = p->pc++;
+  }while( i<p->nOp && p->explain==2 && p->aOp[i].opcode!=OP_Explain );
+  if( i>=p->nOp ){
+    p->rc = SQLITE_OK;
+    rc = SQLITE_DONE;
+  }else if( db->u1.isInterrupted ){
+    p->rc = SQLITE_INTERRUPT;
+    rc = SQLITE_ERROR;
+    sqlite3SetString(&p->zErrMsg, sqlite3ErrStr(p->rc), (char*)0);
+  }else{
+    char *z;
+    Op *pOp = &p->aOp[i];
+    if( p->explain==1 ){
+      pMem->flags = MEM_Int;
+      pMem->type = SQLITE_INTEGER;
+      pMem->u.i = i;                                /* Program counter */
+      pMem++;
+
+      pMem->flags = MEM_Static|MEM_Str|MEM_Term;
+      pMem->z = (char*)sqlite3OpcodeName(pOp->opcode);  /* Opcode */
+      assert( pMem->z!=0 );
+      pMem->n = strlen(pMem->z);
+      pMem->type = SQLITE_TEXT;
+      pMem->enc = SQLITE_UTF8;
+      pMem++;
+    }
+
+    pMem->flags = MEM_Int;
+    pMem->u.i = pOp->p1;                          /* P1 */
+    pMem->type = SQLITE_INTEGER;
+    pMem++;
+
+    pMem->flags = MEM_Int;
+    pMem->u.i = pOp->p2;                          /* P2 */
+    pMem->type = SQLITE_INTEGER;
+    pMem++;
+
+    if( p->explain==1 ){
+      pMem->flags = MEM_Int;
+      pMem->u.i = pOp->p3;                          /* P3 */
+      pMem->type = SQLITE_INTEGER;
+      pMem++;
+    }
+
+    if( sqlite3VdbeMemGrow(pMem, 32, 0) ){            /* P4 */
+      p->db->mallocFailed = 1;
+      return SQLITE_NOMEM;
+    }
+    pMem->flags = MEM_Dyn|MEM_Str|MEM_Term;
+    z = displayP4(pOp, pMem->z, 32);
+    if( z!=pMem->z ){
+      sqlite3VdbeMemSetStr(pMem, z, -1, SQLITE_UTF8, 0);
+    }else{
+      assert( pMem->z!=0 );
+      pMem->n = strlen(pMem->z);
+      pMem->enc = SQLITE_UTF8;
+    }
+    pMem->type = SQLITE_TEXT;
+    pMem++;
+
+    if( p->explain==1 ){
+      if( sqlite3VdbeMemGrow(pMem, 4, 0) ){
+        p->db->mallocFailed = 1;
+        return SQLITE_NOMEM;
+      }
+      pMem->flags = MEM_Dyn|MEM_Str|MEM_Term;
+      pMem->n = 2;
+      sqlite3_snprintf(3, pMem->z, "%.2x", pOp->p5);   /* P5 */
+      pMem->type = SQLITE_TEXT;
+      pMem->enc = SQLITE_UTF8;
+      pMem++;
+
+#ifdef SQLITE_DEBUG
+      if( pOp->zComment ){
+        pMem->flags = MEM_Str|MEM_Term;
+        pMem->z = pOp->zComment;
+        pMem->n = strlen(pMem->z);
+        pMem->enc = SQLITE_UTF8;
+      }else
+#endif
+      {
+        pMem->flags = MEM_Null;                       /* Comment */
+        pMem->type = SQLITE_NULL;
+      }
+    }
+
+    p->nResColumn = 8 - 5*(p->explain-1);
+    p->rc = SQLITE_OK;
+    rc = SQLITE_ROW;
+  }
+  return rc;
+}
+#endif /* SQLITE_OMIT_EXPLAIN */
+
+#ifdef SQLITE_DEBUG
+/*
+** Print the SQL that was used to generate a VDBE program.
+*/
+void sqlite3VdbePrintSql(Vdbe *p){
+  int nOp = p->nOp;
+  VdbeOp *pOp;
+  if( nOp<1 ) return;
+  pOp = &p->aOp[0];
+  if( pOp->opcode==OP_Trace && pOp->p4.z!=0 ){
+    const char *z = pOp->p4.z;
+    while( isspace(*(u8*)z) ) z++;
+    printf("SQL: [%s]\n", z);
+  }
+}
+#endif
+
+#if !defined(SQLITE_OMIT_TRACE) && defined(SQLITE_ENABLE_IOTRACE)
+/*
+** Print an IOTRACE message showing SQL content.
+*/
+void sqlite3VdbeIOTraceSql(Vdbe *p){
+  int nOp = p->nOp;
+  VdbeOp *pOp;
+  if( sqlite3IoTrace==0 ) return;
+  if( nOp<1 ) return;
+  pOp = &p->aOp[0];
+  if( pOp->opcode==OP_Trace && pOp->p4.z!=0 ){
+    int i, j;
+    char z[1000];
+    sqlite3_snprintf(sizeof(z), z, "%s", pOp->p4.z);
+    for(i=0; isspace((unsigned char)z[i]); i++){}
+    for(j=0; z[i]; i++){
+      if( isspace((unsigned char)z[i]) ){
+        if( z[i-1]!=' ' ){
+          z[j++] = ' ';
+        }
+      }else{
+        z[j++] = z[i];
+      }
+    }
+    z[j] = 0;
+    sqlite3IoTrace("SQL %s\n", z);
+  }
+}
+#endif /* !SQLITE_OMIT_TRACE && SQLITE_ENABLE_IOTRACE */
+
+
+/*
+** Prepare a virtual machine for execution.  This involves things such
+** as allocating stack space and initializing the program counter.
+** After the VDBE has be prepped, it can be executed by one or more
+** calls to sqlite3VdbeExec().
+**
+** This is the only way to move a VDBE from VDBE_MAGIC_INIT to
+** VDBE_MAGIC_RUN.
+*/
+void sqlite3VdbeMakeReady(
+  Vdbe *p,                       /* The VDBE */
+  int nVar,                      /* Number of '?' see in the SQL statement */
+  int nMem,                      /* Number of memory cells to allocate */
+  int nCursor,                   /* Number of cursors to allocate */
+  int isExplain                  /* True if the EXPLAIN keywords is present */
+){
+  int n;
+  sqlite3 *db = p->db;
+
+  assert( p!=0 );
+  assert( p->magic==VDBE_MAGIC_INIT );
+
+  /* There should be at least one opcode.
+  */
+  assert( p->nOp>0 );
+
+  /* Set the magic to VDBE_MAGIC_RUN sooner rather than later. This
+   * is because the call to resizeOpArray() below may shrink the
+   * p->aOp[] array to save memory if called when in VDBE_MAGIC_RUN
+   * state.
+   */
+  p->magic = VDBE_MAGIC_RUN;
+
+  /*
+  ** Allocation space for registers.
+  */
+  if( p->aMem==0 ){
+    int nArg;       /* Maximum number of args passed to a user function. */
+    resolveP2Values(p, &nArg);
+    resizeOpArray(p, p->nOp);
+    assert( nVar>=0 );
+    if( isExplain && nMem<10 ){
+      p->nMem = nMem = 10;
+    }
+    p->aMem = sqlite3DbMallocZero(db,
+        nMem*sizeof(Mem)               /* aMem */
+      + nVar*sizeof(Mem)               /* aVar */
+      + nArg*sizeof(Mem*)              /* apArg */
+      + nVar*sizeof(char*)             /* azVar */
+      + nCursor*sizeof(Cursor*) + 1    /* apCsr */
+    );
+    if( !db->mallocFailed ){
+      p->aMem--;             /* aMem[] goes from 1..nMem */
+      p->nMem = nMem;        /*       not from 0..nMem-1 */
+      p->aVar = &p->aMem[nMem+1];
+      p->nVar = nVar;
+      p->okVar = 0;
+      p->apArg = (Mem**)&p->aVar[nVar];
+      p->azVar = (char**)&p->apArg[nArg];
+      p->apCsr = (Cursor**)&p->azVar[nVar];
+      p->nCursor = nCursor;
+      for(n=0; n<nVar; n++){
+        p->aVar[n].flags = MEM_Null;
+        p->aVar[n].db = db;
+      }
+      for(n=1; n<=nMem; n++){
+        p->aMem[n].flags = MEM_Null;
+        p->aMem[n].db = db;
+      }
+    }
+  }
+#ifdef SQLITE_DEBUG
+  for(n=1; n<p->nMem; n++){
+    assert( p->aMem[n].db==db );
+    assert( p->aMem[n].flags==MEM_Null );
+  }
+#endif
+
+  p->pc = -1;
+  p->rc = SQLITE_OK;
+  p->uniqueCnt = 0;
+  p->returnDepth = 0;
+  p->errorAction = OE_Abort;
+  p->explain |= isExplain;
+  p->magic = VDBE_MAGIC_RUN;
+  p->nChange = 0;
+  p->cacheCtr = 1;
+  p->minWriteFileFormat = 255;
+  p->openedStatement = 0;
+#ifdef VDBE_PROFILE
+  {
+    int i;
+    for(i=0; i<p->nOp; i++){
+      p->aOp[i].cnt = 0;
+      p->aOp[i].cycles = 0;
+    }
+  }
+#endif
+}
+
+/*
+** Close a VDBE cursor and release all the resources that cursor happens
+** to hold.
+*/
+void sqlite3VdbeFreeCursor(Vdbe *p, Cursor *pCx){
+  if( pCx==0 ){
+    return;
+  }
+  if( pCx->pCursor ){
+    sqlite3BtreeCloseCursor(pCx->pCursor);
+  }
+  if( pCx->pBt ){
+    sqlite3BtreeClose(pCx->pBt);
+  }
+#ifndef SQLITE_OMIT_VIRTUALTABLE
+  if( pCx->pVtabCursor ){
+    sqlite3_vtab_cursor *pVtabCursor = pCx->pVtabCursor;
+    const sqlite3_module *pModule = pCx->pModule;
+    p->inVtabMethod = 1;
+    (void)sqlite3SafetyOff(p->db);
+    pModule->xClose(pVtabCursor);
+    (void)sqlite3SafetyOn(p->db);
+    p->inVtabMethod = 0;
+  }
+#endif
+  sqlite3_free(pCx->pData);
+  sqlite3_free(pCx->aType);
+  sqlite3_free(pCx);
+}
+
+/*
+** Close all cursors except for VTab cursors that are currently
+** in use.
+*/
+static void closeAllCursorsExceptActiveVtabs(Vdbe *p){
+  int i;
+  if( p->apCsr==0 ) return;
+  for(i=0; i<p->nCursor; i++){
+    Cursor *pC = p->apCsr[i];
+    if( pC && (!p->inVtabMethod || !pC->pVtabCursor) ){
+      sqlite3VdbeFreeCursor(p, pC);
+      p->apCsr[i] = 0;
+    }
+  }
+}
+
+/*
+** Clean up the VM after execution.
+**
+** This routine will automatically close any cursors, lists, and/or
+** sorters that were left open.  It also deletes the values of
+** variables in the aVar[] array.
+*/
+static void Cleanup(Vdbe *p){
+  int i;
+  closeAllCursorsExceptActiveVtabs(p);
+  for(i=1; i<=p->nMem; i++){
+    MemSetTypeFlag(&p->aMem[i], MEM_Null);
+  }
+  releaseMemArray(&p->aMem[1], p->nMem);
+  sqlite3VdbeFifoClear(&p->sFifo);
+  if( p->contextStack ){
+    for(i=0; i<p->contextStackTop; i++){
+      sqlite3VdbeFifoClear(&p->contextStack[i].sFifo);
+    }
+    sqlite3_free(p->contextStack);
+  }
+  p->contextStack = 0;
+  p->contextStackDepth = 0;
+  p->contextStackTop = 0;
+  sqlite3_free(p->zErrMsg);
+  p->zErrMsg = 0;
+  p->pResultSet = 0;
+}
+
+/*
+** Set the number of result columns that will be returned by this SQL
+** statement. This is now set at compile time, rather than during
+** execution of the vdbe program so that sqlite3_column_count() can
+** be called on an SQL statement before sqlite3_step().
+*/
+void sqlite3VdbeSetNumCols(Vdbe *p, int nResColumn){
+  Mem *pColName;
+  int n;
+
+  releaseMemArray(p->aColName, p->nResColumn*COLNAME_N);
+  sqlite3_free(p->aColName);
+  n = nResColumn*COLNAME_N;
+  p->nResColumn = nResColumn;
+  p->aColName = pColName = (Mem*)sqlite3DbMallocZero(p->db, sizeof(Mem)*n );
+  if( p->aColName==0 ) return;
+  while( n-- > 0 ){
+    pColName->flags = MEM_Null;
+    pColName->db = p->db;
+    pColName++;
+  }
+}
+
+/*
+** Set the name of the idx'th column to be returned by the SQL statement.
+** zName must be a pointer to a nul terminated string.
+**
+** This call must be made after a call to sqlite3VdbeSetNumCols().
+**
+** If N==P4_STATIC  it means that zName is a pointer to a constant static
+** string and we can just copy the pointer. If it is P4_DYNAMIC, then
+** the string is freed using sqlite3_free() when the vdbe is finished with
+** it. Otherwise, N bytes of zName are copied.
+*/
+int sqlite3VdbeSetColName(Vdbe *p, int idx, int var, const char *zName, int N){
+  int rc;
+  Mem *pColName;
+  assert( idx<p->nResColumn );
+  assert( var<COLNAME_N );
+  if( p->db->mallocFailed ) return SQLITE_NOMEM;
+  assert( p->aColName!=0 );
+  pColName = &(p->aColName[idx+var*p->nResColumn]);
+  if( N==P4_DYNAMIC || N==P4_STATIC ){
+    rc = sqlite3VdbeMemSetStr(pColName, zName, -1, SQLITE_UTF8, SQLITE_STATIC);
+  }else{
+    rc = sqlite3VdbeMemSetStr(pColName, zName, N, SQLITE_UTF8,SQLITE_TRANSIENT);
+  }
+  if( rc==SQLITE_OK && N==P4_DYNAMIC ){
+    pColName->flags = (pColName->flags&(~MEM_Static))|MEM_Dyn;
+    pColName->xDel = 0;
+  }
+  return rc;
+}
+
+/*
+** A read or write transaction may or may not be active on database handle
+** db. If a transaction is active, commit it. If there is a
+** write-transaction spanning more than one database file, this routine
+** takes care of the master journal trickery.
+*/
+static int vdbeCommit(sqlite3 *db){
+  int i;
+  int nTrans = 0;  /* Number of databases with an active write-transaction */
+  int rc = SQLITE_OK;
+  int needXcommit = 0;
+
+  /* Before doing anything else, call the xSync() callback for any
+  ** virtual module tables written in this transaction. This has to
+  ** be done before determining whether a master journal file is
+  ** required, as an xSync() callback may add an attached database
+  ** to the transaction.
+  */
+  rc = sqlite3VtabSync(db, rc);
+  if( rc!=SQLITE_OK ){
+    return rc;
+  }
+
+  /* This loop determines (a) if the commit hook should be invoked and
+  ** (b) how many database files have open write transactions, not
+  ** including the temp database. (b) is important because if more than
+  ** one database file has an open write transaction, a master journal
+  ** file is required for an atomic commit.
+  */
+  for(i=0; i<db->nDb; i++){
+    Btree *pBt = db->aDb[i].pBt;
+    if( sqlite3BtreeIsInTrans(pBt) ){
+      needXcommit = 1;
+      if( i!=1 ) nTrans++;
+    }
+  }
+
+  /* If there are any write-transactions at all, invoke the commit hook */
+  if( needXcommit && db->xCommitCallback ){
+    (void)sqlite3SafetyOff(db);
+    rc = db->xCommitCallback(db->pCommitArg);
+    (void)sqlite3SafetyOn(db);
+    if( rc ){
+      return SQLITE_CONSTRAINT;
+    }
+  }
+
+  /* The simple case - no more than one database file (not counting the
+  ** TEMP database) has a transaction active.   There is no need for the
+  ** master-journal.
+  **
+  ** If the return value of sqlite3BtreeGetFilename() is a zero length
+  ** string, it means the main database is :memory:.  In that case we do
+  ** not support atomic multi-file commits, so use the simple case then
+  ** too.
+  */
+  if( 0==strlen(sqlite3BtreeGetFilename(db->aDb[0].pBt)) || nTrans<=1 ){
+    for(i=0; rc==SQLITE_OK && i<db->nDb; i++){
+      Btree *pBt = db->aDb[i].pBt;
+      if( pBt ){
+        rc = sqlite3BtreeCommitPhaseOne(pBt, 0);
+      }
+    }
+
+    /* Do the commit only if all databases successfully complete phase 1.
+    ** If one of the BtreeCommitPhaseOne() calls fails, this indicates an
+    ** IO error while deleting or truncating a journal file. It is unlikely,
+    ** but could happen. In this case abandon processing and return the error.
+    */
+    for(i=0; rc==SQLITE_OK && i<db->nDb; i++){
+      Btree *pBt = db->aDb[i].pBt;
+      if( pBt ){
+        rc = sqlite3BtreeCommitPhaseTwo(pBt);
+      }
+    }
+    if( rc==SQLITE_OK ){
+      sqlite3VtabCommit(db);
+    }
+  }
+
+  /* The complex case - There is a multi-file write-transaction active.
+  ** This requires a master journal file to ensure the transaction is
+  ** committed atomicly.
+  */
+#ifndef SQLITE_OMIT_DISKIO
+  else{
+    sqlite3_vfs *pVfs = db->pVfs;
+    int needSync = 0;
+    char *zMaster = 0;   /* File-name for the master journal */
+    char const *zMainFile = sqlite3BtreeGetFilename(db->aDb[0].pBt);
+    sqlite3_file *pMaster = 0;
+    i64 offset = 0;
+
+    /* Select a master journal file name */
+    do {
+      u32 random;
+      sqlite3_free(zMaster);
+      sqlite3Randomness(sizeof(random), &random);
+      zMaster = sqlite3MPrintf(db, "%s-mj%08X", zMainFile, random&0x7fffffff);
+      if( !zMaster ){
+        return SQLITE_NOMEM;
+      }
+    }while( sqlite3OsAccess(pVfs, zMaster, SQLITE_ACCESS_EXISTS) );
+
+    /* Open the master journal. */
+    rc = sqlite3OsOpenMalloc(pVfs, zMaster, &pMaster,
+        SQLITE_OPEN_READWRITE|SQLITE_OPEN_CREATE|
+        SQLITE_OPEN_EXCLUSIVE|SQLITE_OPEN_MASTER_JOURNAL, 0
+    );
+    if( rc!=SQLITE_OK ){
+      sqlite3_free(zMaster);
+      return rc;
+    }
+
+    /* Write the name of each database file in the transaction into the new
+    ** master journal file. If an error occurs at this point close
+    ** and delete the master journal file. All the individual journal files
+    ** still have 'null' as the master journal pointer, so they will roll
+    ** back independently if a failure occurs.
+    */
+    for(i=0; i<db->nDb; i++){
+      Btree *pBt = db->aDb[i].pBt;
+      if( i==1 ) continue;   /* Ignore the TEMP database */
+      if( sqlite3BtreeIsInTrans(pBt) ){
+        char const *zFile = sqlite3BtreeGetJournalname(pBt);
+        if( zFile[0]==0 ) continue;  /* Ignore :memory: databases */
+        if( !needSync && !sqlite3BtreeSyncDisabled(pBt) ){
+          needSync = 1;
+        }
+        rc = sqlite3OsWrite(pMaster, zFile, strlen(zFile)+1, offset);
+        offset += strlen(zFile)+1;
+        if( rc!=SQLITE_OK ){
+          sqlite3OsCloseFree(pMaster);
+          sqlite3OsDelete(pVfs, zMaster, 0);
+          sqlite3_free(zMaster);
+          return rc;
+        }
+      }
+    }
+
+    /* Sync the master journal file. If the IOCAP_SEQUENTIAL device
+    ** flag is set this is not required.
+    */
+    zMainFile = sqlite3BtreeGetDirname(db->aDb[0].pBt);
+    if( (needSync
+     && (0==(sqlite3OsDeviceCharacteristics(pMaster)&SQLITE_IOCAP_SEQUENTIAL))
+     && (rc=sqlite3OsSync(pMaster, SQLITE_SYNC_NORMAL))!=SQLITE_OK) ){
+      sqlite3OsCloseFree(pMaster);
+      sqlite3OsDelete(pVfs, zMaster, 0);
+      sqlite3_free(zMaster);
+      return rc;
+    }
+
+    /* Sync all the db files involved in the transaction. The same call
+    ** sets the master journal pointer in each individual journal. If
+    ** an error occurs here, do not delete the master journal file.
+    **
+    ** If the error occurs during the first call to
+    ** sqlite3BtreeCommitPhaseOne(), then there is a chance that the
+    ** master journal file will be orphaned. But we cannot delete it,
+    ** in case the master journal file name was written into the journal
+    ** file before the failure occured.
+    */
+    for(i=0; rc==SQLITE_OK && i<db->nDb; i++){
+      Btree *pBt = db->aDb[i].pBt;
+      if( pBt ){
+        rc = sqlite3BtreeCommitPhaseOne(pBt, zMaster);
+      }
+    }
+    sqlite3OsCloseFree(pMaster);
+    if( rc!=SQLITE_OK ){
+      sqlite3_free(zMaster);
+      return rc;
+    }
+
+    /* Delete the master journal file. This commits the transaction. After
+    ** doing this the directory is synced again before any individual
+    ** transaction files are deleted.
+    */
+    rc = sqlite3OsDelete(pVfs, zMaster, 1);
+    sqlite3_free(zMaster);
+    zMaster = 0;
+    if( rc ){
+      return rc;
+    }
+
+    /* All files and directories have already been synced, so the following
+    ** calls to sqlite3BtreeCommitPhaseTwo() are only closing files and
+    ** deleting or truncating journals. If something goes wrong while
+    ** this is happening we don't really care. The integrity of the
+    ** transaction is already guaranteed, but some stray 'cold' journals
+    ** may be lying around. Returning an error code won't help matters.
+    */
+    disable_simulated_io_errors();
+    for(i=0; i<db->nDb; i++){
+      Btree *pBt = db->aDb[i].pBt;
+      if( pBt ){
+        sqlite3BtreeCommitPhaseTwo(pBt);
+      }
+    }
+    enable_simulated_io_errors();
+
+    sqlite3VtabCommit(db);
+  }
+#endif
+
+  return rc;
+}
+
+/*
+** This routine checks that the sqlite3.activeVdbeCnt count variable
+** matches the number of vdbe's in the list sqlite3.pVdbe that are
+** currently active. An assertion fails if the two counts do not match.
+** This is an internal self-check only - it is not an essential processing
+** step.
+**
+** This is a no-op if NDEBUG is defined.
+*/
+#ifndef NDEBUG
+static void checkActiveVdbeCnt(sqlite3 *db){
+  Vdbe *p;
+  int cnt = 0;
+  p = db->pVdbe;
+  while( p ){
+    if( p->magic==VDBE_MAGIC_RUN && p->pc>=0 ){
+      cnt++;
+    }
+    p = p->pNext;
+  }
+  assert( cnt==db->activeVdbeCnt );
+}
+#else
+#define checkActiveVdbeCnt(x)
+#endif
+
+/*
+** For every Btree that in database connection db which
+** has been modified, "trip" or invalidate each cursor in
+** that Btree might have been modified so that the cursor
+** can never be used again.  This happens when a rollback
+*** occurs.  We have to trip all the other cursors, even
+** cursor from other VMs in different database connections,
+** so that none of them try to use the data at which they
+** were pointing and which now may have been changed due
+** to the rollback.
+**
+** Remember that a rollback can delete tables complete and
+** reorder rootpages.  So it is not sufficient just to save
+** the state of the cursor.  We have to invalidate the cursor
+** so that it is never used again.
+*/
+static void invalidateCursorsOnModifiedBtrees(sqlite3 *db){
+  int i;
+  for(i=0; i<db->nDb; i++){
+    Btree *p = db->aDb[i].pBt;
+    if( p && sqlite3BtreeIsInTrans(p) ){
+      sqlite3BtreeTripAllCursors(p, SQLITE_ABORT);
+    }
+  }
+}
+
+/*
+** This routine is called the when a VDBE tries to halt.  If the VDBE
+** has made changes and is in autocommit mode, then commit those
+** changes.  If a rollback is needed, then do the rollback.
+**
+** This routine is the only way to move the state of a VM from
+** SQLITE_MAGIC_RUN to SQLITE_MAGIC_HALT.  It is harmless to
+** call this on a VM that is in the SQLITE_MAGIC_HALT state.
+**
+** Return an error code.  If the commit could not complete because of
+** lock contention, return SQLITE_BUSY.  If SQLITE_BUSY is returned, it
+** means the close did not happen and needs to be repeated.
+*/
+int sqlite3VdbeHalt(Vdbe *p){
+  sqlite3 *db = p->db;
+  int i;
+  int (*xFunc)(Btree *pBt) = 0;  /* Function to call on each btree backend */
+  int isSpecialError;            /* Set to true if SQLITE_NOMEM or IOERR */
+
+  /* This function contains the logic that determines if a statement or
+  ** transaction will be committed or rolled back as a result of the
+  ** execution of this virtual machine.
+  **
+  ** If any of the following errors occur:
+  **
+  **     SQLITE_NOMEM
+  **     SQLITE_IOERR
+  **     SQLITE_FULL
+  **     SQLITE_INTERRUPT
+  **
+  ** Then the internal cache might have been left in an inconsistent
+  ** state.  We need to rollback the statement transaction, if there is
+  ** one, or the complete transaction if there is no statement transaction.
+  */
+
+  if( p->db->mallocFailed ){
+    p->rc = SQLITE_NOMEM;
+  }
+  closeAllCursorsExceptActiveVtabs(p);
+  if( p->magic!=VDBE_MAGIC_RUN ){
+    return SQLITE_OK;
+  }
+  checkActiveVdbeCnt(db);
+
+  /* No commit or rollback needed if the program never started */
+  if( p->pc>=0 ){
+    int mrc;   /* Primary error code from p->rc */
+
+    /* Lock all btrees used by the statement */
+    sqlite3BtreeMutexArrayEnter(&p->aMutex);
+
+    /* Check for one of the special errors */
+    mrc = p->rc & 0xff;
+    isSpecialError = mrc==SQLITE_NOMEM || mrc==SQLITE_IOERR
+                     || mrc==SQLITE_INTERRUPT || mrc==SQLITE_FULL;
+    if( isSpecialError ){
+      /* This loop does static analysis of the query to see which of the
+      ** following three categories it falls into:
+      **
+      **     Read-only
+      **     Query with statement journal
+      **     Query without statement journal
+      **
+      ** We could do something more elegant than this static analysis (i.e.
+      ** store the type of query as part of the compliation phase), but
+      ** handling malloc() or IO failure is a fairly obscure edge case so
+      ** this is probably easier. Todo: Might be an opportunity to reduce
+      ** code size a very small amount though...
+      */
+      int notReadOnly = 0;
+      int isStatement = 0;
+      assert(p->aOp || p->nOp==0);
+      for(i=0; i<p->nOp; i++){
+        switch( p->aOp[i].opcode ){
+          case OP_Transaction:
+            notReadOnly |= p->aOp[i].p2;
+            break;
+          case OP_Statement:
+            isStatement = 1;
+            break;
+        }
+      }
+
+
+      /* If the query was read-only, we need do no rollback at all. Otherwise,
+      ** proceed with the special handling.
+      */
+      if( notReadOnly || mrc!=SQLITE_INTERRUPT ){
+        if( p->rc==SQLITE_IOERR_BLOCKED && isStatement ){
+          xFunc = sqlite3BtreeRollbackStmt;
+          p->rc = SQLITE_BUSY;
+        } else if( (mrc==SQLITE_NOMEM || mrc==SQLITE_FULL) && isStatement ){
+          xFunc = sqlite3BtreeRollbackStmt;
+        }else{
+          /* We are forced to roll back the active transaction. Before doing
+          ** so, abort any other statements this handle currently has active.
+          */
+          invalidateCursorsOnModifiedBtrees(db);
+          sqlite3RollbackAll(db);
+          db->autoCommit = 1;
+        }
+      }
+    }
+
+    /* If the auto-commit flag is set and this is the only active vdbe, then
+    ** we do either a commit or rollback of the current transaction.
+    **
+    ** Note: This block also runs if one of the special errors handled
+    ** above has occured.
+    */
+    if( db->autoCommit && db->activeVdbeCnt==1 ){
+      if( p->rc==SQLITE_OK || (p->errorAction==OE_Fail && !isSpecialError) ){
+        /* The auto-commit flag is true, and the vdbe program was
+        ** successful or hit an 'OR FAIL' constraint. This means a commit
+        ** is required.
+        */
+        int rc = vdbeCommit(db);
+        if( rc==SQLITE_BUSY ){
+          sqlite3BtreeMutexArrayLeave(&p->aMutex);
+          return SQLITE_BUSY;
+        }else if( rc!=SQLITE_OK ){
+          p->rc = rc;
+          sqlite3RollbackAll(db);
+        }else{
+          sqlite3CommitInternalChanges(db);
+        }
+      }else{
+        sqlite3RollbackAll(db);
+      }
+    }else if( !xFunc ){
+      if( p->rc==SQLITE_OK || p->errorAction==OE_Fail ){
+        if( p->openedStatement ){
+          xFunc = sqlite3BtreeCommitStmt;
+        }
+      }else if( p->errorAction==OE_Abort ){
+        xFunc = sqlite3BtreeRollbackStmt;
+      }else{
+        invalidateCursorsOnModifiedBtrees(db);
+        sqlite3RollbackAll(db);
+        db->autoCommit = 1;
+      }
+    }
+
+    /* If xFunc is not NULL, then it is one of sqlite3BtreeRollbackStmt or
+    ** sqlite3BtreeCommitStmt. Call it once on each backend. If an error occurs
+    ** and the return code is still SQLITE_OK, set the return code to the new
+    ** error value.
+    */
+    assert(!xFunc ||
+      xFunc==sqlite3BtreeCommitStmt ||
+      xFunc==sqlite3BtreeRollbackStmt
+    );
+    for(i=0; xFunc && i<db->nDb; i++){
+      int rc;
+      Btree *pBt = db->aDb[i].pBt;
+      if( pBt ){
+        rc = xFunc(pBt);
+        if( rc && (p->rc==SQLITE_OK || p->rc==SQLITE_CONSTRAINT) ){
+          p->rc = rc;
+          sqlite3SetString(&p->zErrMsg, 0);
+        }
+      }
+    }
+
+    /* If this was an INSERT, UPDATE or DELETE and the statement was committed,
+    ** set the change counter.
+    */
+    if( p->changeCntOn && p->pc>=0 ){
+      if( !xFunc || xFunc==sqlite3BtreeCommitStmt ){
+        sqlite3VdbeSetChanges(db, p->nChange);
+      }else{
+        sqlite3VdbeSetChanges(db, 0);
+      }
+      p->nChange = 0;
+    }
+
+    /* Rollback or commit any schema changes that occurred. */
+    if( p->rc!=SQLITE_OK && db->flags&SQLITE_InternChanges ){
+      sqlite3ResetInternalSchema(db, 0);
+      db->flags = (db->flags | SQLITE_InternChanges);
+    }
+
+    /* Release the locks */
+    sqlite3BtreeMutexArrayLeave(&p->aMutex);
+  }
+
+  /* We have successfully halted and closed the VM.  Record this fact. */
+  if( p->pc>=0 ){
+    db->activeVdbeCnt--;
+  }
+  p->magic = VDBE_MAGIC_HALT;
+  checkActiveVdbeCnt(db);
+  if( p->db->mallocFailed ){
+    p->rc = SQLITE_NOMEM;
+  }
+  checkActiveVdbeCnt(db);
+
+  return SQLITE_OK;
+}
+
+
+/*
+** Each VDBE holds the result of the most recent sqlite3_step() call
+** in p->rc.  This routine sets that result back to SQLITE_OK.
+*/
+void sqlite3VdbeResetStepResult(Vdbe *p){
+  p->rc = SQLITE_OK;
+}
+
+/*
+** Clean up a VDBE after execution but do not delete the VDBE just yet.
+** Write any error messages into *pzErrMsg.  Return the result code.
+**
+** After this routine is run, the VDBE should be ready to be executed
+** again.
+**
+** To look at it another way, this routine resets the state of the
+** virtual machine from VDBE_MAGIC_RUN or VDBE_MAGIC_HALT back to
+** VDBE_MAGIC_INIT.
+*/
+int sqlite3VdbeReset(Vdbe *p){
+  sqlite3 *db;
+  db = p->db;
+
+  /* If the VM did not run to completion or if it encountered an
+  ** error, then it might not have been halted properly.  So halt
+  ** it now.
+  */
+  (void)sqlite3SafetyOn(db);
+  sqlite3VdbeHalt(p);
+  (void)sqlite3SafetyOff(db);
+
+  /* If the VDBE has be run even partially, then transfer the error code
+  ** and error message from the VDBE into the main database structure.  But
+  ** if the VDBE has just been set to run but has not actually executed any
+  ** instructions yet, leave the main database error information unchanged.
+  */
+  if( p->pc>=0 ){
+    if( p->zErrMsg ){
+      sqlite3ValueSetStr(db->pErr,-1,p->zErrMsg,SQLITE_UTF8,sqlite3_free);
+      db->errCode = p->rc;
+      p->zErrMsg = 0;
+    }else if( p->rc ){
+      sqlite3Error(db, p->rc, 0);
+    }else{
+      sqlite3Error(db, SQLITE_OK, 0);
+    }
+  }else if( p->rc && p->expired ){
+    /* The expired flag was set on the VDBE before the first call
+    ** to sqlite3_step(). For consistency (since sqlite3_step() was
+    ** called), set the database error in this case as well.
+    */
+    sqlite3Error(db, p->rc, 0);
+    sqlite3ValueSetStr(db->pErr, -1, p->zErrMsg, SQLITE_UTF8, sqlite3_free);
+    p->zErrMsg = 0;
+  }
+
+  /* Reclaim all memory used by the VDBE
+  */
+  Cleanup(p);
+
+  /* Save profiling information from this VDBE run.
+  */
+#ifdef VDBE_PROFILE
+  {
+    FILE *out = fopen("vdbe_profile.out", "a");
+    if( out ){
+      int i;
+      fprintf(out, "---- ");
+      for(i=0; i<p->nOp; i++){
+        fprintf(out, "%02x", p->aOp[i].opcode);
+      }
+      fprintf(out, "\n");
+      for(i=0; i<p->nOp; i++){
+        fprintf(out, "%6d %10lld %8lld ",
+           p->aOp[i].cnt,
+           p->aOp[i].cycles,
+           p->aOp[i].cnt>0 ? p->aOp[i].cycles/p->aOp[i].cnt : 0
+        );
+        sqlite3VdbePrintOp(out, i, &p->aOp[i]);
+      }
+      fclose(out);
+    }
+  }
+#endif
+  p->magic = VDBE_MAGIC_INIT;
+  p->aborted = 0;
+  return p->rc & db->errMask;
+}
+
+/*
+** Clean up and delete a VDBE after execution.  Return an integer which is
+** the result code.  Write any error message text into *pzErrMsg.
+*/
+int sqlite3VdbeFinalize(Vdbe *p){
+  int rc = SQLITE_OK;
+  if( p->magic==VDBE_MAGIC_RUN || p->magic==VDBE_MAGIC_HALT ){
+    rc = sqlite3VdbeReset(p);
+    assert( (rc & p->db->errMask)==rc );
+  }else if( p->magic!=VDBE_MAGIC_INIT ){
+    return SQLITE_MISUSE;
+  }
+  sqlite3VdbeDelete(p);
+  return rc;
+}
+
+/*
+** Call the destructor for each auxdata entry in pVdbeFunc for which
+** the corresponding bit in mask is clear.  Auxdata entries beyond 31
+** are always destroyed.  To destroy all auxdata entries, call this
+** routine with mask==0.
+*/
+void sqlite3VdbeDeleteAuxData(VdbeFunc *pVdbeFunc, int mask){
+  int i;
+  for(i=0; i<pVdbeFunc->nAux; i++){
+    struct AuxData *pAux = &pVdbeFunc->apAux[i];
+    if( (i>31 || !(mask&(1<<i))) && pAux->pAux ){
+      if( pAux->xDelete ){
+        pAux->xDelete(pAux->pAux);
+      }
+      pAux->pAux = 0;
+    }
+  }
+}
+
+/*
+** Delete an entire VDBE.
+*/
+void sqlite3VdbeDelete(Vdbe *p){
+  int i;
+  if( p==0 ) return;
+  Cleanup(p);
+  if( p->pPrev ){
+    p->pPrev->pNext = p->pNext;
+  }else{
+    assert( p->db->pVdbe==p );
+    p->db->pVdbe = p->pNext;
+  }
+  if( p->pNext ){
+    p->pNext->pPrev = p->pPrev;
+  }
+  if( p->aOp ){
+    Op *pOp = p->aOp;
+    for(i=0; i<p->nOp; i++, pOp++){
+      freeP4(pOp->p4type, pOp->p4.p);
+#ifdef SQLITE_DEBUG
+      sqlite3_free(pOp->zComment);
+#endif
+    }
+    sqlite3_free(p->aOp);
+  }
+  releaseMemArray(p->aVar, p->nVar);
+  sqlite3_free(p->aLabel);
+  if( p->aMem ){
+    sqlite3_free(&p->aMem[1]);
+  }
+  releaseMemArray(p->aColName, p->nResColumn*COLNAME_N);
+  sqlite3_free(p->aColName);
+  sqlite3_free(p->zSql);
+  p->magic = VDBE_MAGIC_DEAD;
+  sqlite3_free(p);
+}
+
+/*
+** If a MoveTo operation is pending on the given cursor, then do that
+** MoveTo now.  Return an error code.  If no MoveTo is pending, this
+** routine does nothing and returns SQLITE_OK.
+*/
+int sqlite3VdbeCursorMoveto(Cursor *p){
+  if( p->deferredMoveto ){
+    int res, rc;
+#ifdef SQLITE_TEST
+    extern int sqlite3_search_count;
+#endif
+    assert( p->isTable );
+    rc = sqlite3BtreeMoveto(p->pCursor, 0, p->movetoTarget, 0, &res);
+    if( rc ) return rc;
+    *p->pIncrKey = 0;
+    p->lastRowid = keyToInt(p->movetoTarget);
+    p->rowidIsValid = res==0;
+    if( res<0 ){
+      rc = sqlite3BtreeNext(p->pCursor, &res);
+      if( rc ) return rc;
+    }
+#ifdef SQLITE_TEST
+    sqlite3_search_count++;
+#endif
+    p->deferredMoveto = 0;
+    p->cacheStatus = CACHE_STALE;
+  }
+  return SQLITE_OK;
+}
+
+/*
+** The following functions:
+**
+** sqlite3VdbeSerialType()
+** sqlite3VdbeSerialTypeLen()
+** sqlite3VdbeSerialRead()
+** sqlite3VdbeSerialLen()
+** sqlite3VdbeSerialWrite()
+**
+** encapsulate the code that serializes values for storage in SQLite
+** data and index records. Each serialized value consists of a
+** 'serial-type' and a blob of data. The serial type is an 8-byte unsigned
+** integer, stored as a varint.
+**
+** In an SQLite index record, the serial type is stored directly before
+** the blob of data that it corresponds to. In a table record, all serial
+** types are stored at the start of the record, and the blobs of data at
+** the end. Hence these functions allow the caller to handle the
+** serial-type and data blob seperately.
+**
+** The following table describes the various storage classes for data:
+**
+**   serial type        bytes of data      type
+**   --------------     ---------------    ---------------
+**      0                     0            NULL
+**      1                     1            signed integer
+**      2                     2            signed integer
+**      3                     3            signed integer
+**      4                     4            signed integer
+**      5                     6            signed integer
+**      6                     8            signed integer
+**      7                     8            IEEE float
+**      8                     0            Integer constant 0
+**      9                     0            Integer constant 1
+**     10,11                               reserved for expansion
+**    N>=12 and even       (N-12)/2        BLOB
+**    N>=13 and odd        (N-13)/2        text
+**
+** The 8 and 9 types were added in 3.3.0, file format 4.  Prior versions
+** of SQLite will not understand those serial types.
+*/
+
+/*
+** Return the serial-type for the value stored in pMem.
+*/
+u32 sqlite3VdbeSerialType(Mem *pMem, int file_format){
+  int flags = pMem->flags;
+  int n;
+
+  if( flags&MEM_Null ){
+    return 0;
+  }
+  if( flags&MEM_Int ){
+    /* Figure out whether to use 1, 2, 4, 6 or 8 bytes. */
+#   define MAX_6BYTE ((((i64)0x00001000)<<32)-1)
+    i64 i = pMem->u.i;
+    u64 u;
+    if( file_format>=4 && (i&1)==i ){
+      return 8+i;
+    }
+    u = i<0 ? -i : i;
+    if( u<=127 ) return 1;
+    if( u<=32767 ) return 2;
+    if( u<=8388607 ) return 3;
+    if( u<=2147483647 ) return 4;
+    if( u<=MAX_6BYTE ) return 5;
+    return 6;
+  }
+  if( flags&MEM_Real ){
+    return 7;
+  }
+  assert( flags&(MEM_Str|MEM_Blob) );
+  n = pMem->n;
+  if( flags & MEM_Zero ){
+    n += pMem->u.i;
+  }
+  assert( n>=0 );
+  return ((n*2) + 12 + ((flags&MEM_Str)!=0));
+}
+
+/*
+** Return the length of the data corresponding to the supplied serial-type.
+*/
+int sqlite3VdbeSerialTypeLen(u32 serial_type){
+  if( serial_type>=12 ){
+    return (serial_type-12)/2;
+  }else{
+    static const u8 aSize[] = { 0, 1, 2, 3, 4, 6, 8, 8, 0, 0, 0, 0 };
+    return aSize[serial_type];
+  }
+}
+
+/*
+** If we are on an architecture with mixed-endian floating
+** points (ex: ARM7) then swap the lower 4 bytes with the
+** upper 4 bytes.  Return the result.
+**
+** For most architectures, this is a no-op.
+**
+** (later):  It is reported to me that the mixed-endian problem
+** on ARM7 is an issue with GCC, not with the ARM7 chip.  It seems
+** that early versions of GCC stored the two words of a 64-bit
+** float in the wrong order.  And that error has been propagated
+** ever since.  The blame is not necessarily with GCC, though.
+** GCC might have just copying the problem from a prior compiler.
+** I am also told that newer versions of GCC that follow a different
+** ABI get the byte order right.
+**
+** Developers using SQLite on an ARM7 should compile and run their
+** application using -DSQLITE_DEBUG=1 at least once.  With DEBUG
+** enabled, some asserts below will ensure that the byte order of
+** floating point values is correct.
+**
+** (2007-08-30)  Frank van Vugt has studied this problem closely
+** and has send his findings to the SQLite developers.  Frank
+** writes that some Linux kernels offer floating point hardware
+** emulation that uses only 32-bit mantissas instead of a full
+** 48-bits as required by the IEEE standard.  (This is the
+** CONFIG_FPE_FASTFPE option.)  On such systems, floating point
+** byte swapping becomes very complicated.  To avoid problems,
+** the necessary byte swapping is carried out using a 64-bit integer
+** rather than a 64-bit float.  Frank assures us that the code here
+** works for him.  We, the developers, have no way to independently
+** verify this, but Frank seems to know what he is talking about
+** so we trust him.
+*/
+#ifdef SQLITE_MIXED_ENDIAN_64BIT_FLOAT
+static u64 floatSwap(u64 in){
+  union {
+    u64 r;
+    u32 i[2];
+  } u;
+  u32 t;
+
+  u.r = in;
+  t = u.i[0];
+  u.i[0] = u.i[1];
+  u.i[1] = t;
+  return u.r;
+}
+# define swapMixedEndianFloat(X)  X = floatSwap(X)
+#else
+# define swapMixedEndianFloat(X)
+#endif
+
+/*
+** Write the serialized data blob for the value stored in pMem into
+** buf. It is assumed that the caller has allocated sufficient space.
+** Return the number of bytes written.
+**
+** nBuf is the amount of space left in buf[].  nBuf must always be
+** large enough to hold the entire field.  Except, if the field is
+** a blob with a zero-filled tail, then buf[] might be just the right
+** size to hold everything except for the zero-filled tail.  If buf[]
+** is only big enough to hold the non-zero prefix, then only write that
+** prefix into buf[].  But if buf[] is large enough to hold both the
+** prefix and the tail then write the prefix and set the tail to all
+** zeros.
+**
+** Return the number of bytes actually written into buf[].  The number
+** of bytes in the zero-filled tail is included in the return value only
+** if those bytes were zeroed in buf[].
+*/
+int sqlite3VdbeSerialPut(u8 *buf, int nBuf, Mem *pMem, int file_format){
+  u32 serial_type = sqlite3VdbeSerialType(pMem, file_format);
+  int len;
+
+  /* Integer and Real */
+  if( serial_type<=7 && serial_type>0 ){
+    u64 v;
+    int i;
+    if( serial_type==7 ){
+      assert( sizeof(v)==sizeof(pMem->r) );
+      memcpy(&v, &pMem->r, sizeof(v));
+      swapMixedEndianFloat(v);
+    }else{
+      v = pMem->u.i;
+    }
+    len = i = sqlite3VdbeSerialTypeLen(serial_type);
+    assert( len<=nBuf );
+    while( i-- ){
+      buf[i] = (v&0xFF);
+      v >>= 8;
+    }
+    return len;
+  }
+
+  /* String or blob */
+  if( serial_type>=12 ){
+    assert( pMem->n + ((pMem->flags & MEM_Zero)?pMem->u.i:0)
+             == sqlite3VdbeSerialTypeLen(serial_type) );
+    assert( pMem->n<=nBuf );
+    len = pMem->n;
+    memcpy(buf, pMem->z, len);
+    if( pMem->flags & MEM_Zero ){
+      len += pMem->u.i;
+      if( len>nBuf ){
+        len = nBuf;
+      }
+      memset(&buf[pMem->n], 0, len-pMem->n);
+    }
+    return len;
+  }
+
+  /* NULL or constants 0 or 1 */
+  return 0;
+}
+
+/*
+** Deserialize the data blob pointed to by buf as serial type serial_type
+** and store the result in pMem.  Return the number of bytes read.
+*/
+int sqlite3VdbeSerialGet(
+  const unsigned char *buf,     /* Buffer to deserialize from */
+  u32 serial_type,              /* Serial type to deserialize */
+  Mem *pMem                     /* Memory cell to write value into */
+){
+  switch( serial_type ){
+    case 10:   /* Reserved for future use */
+    case 11:   /* Reserved for future use */
+    case 0: {  /* NULL */
+      pMem->flags = MEM_Null;
+      break;
+    }
+    case 1: { /* 1-byte signed integer */
+      pMem->u.i = (signed char)buf[0];
+      pMem->flags = MEM_Int;
+      return 1;
+    }
+    case 2: { /* 2-byte signed integer */
+      pMem->u.i = (((signed char)buf[0])<<8) | buf[1];
+      pMem->flags = MEM_Int;
+      return 2;
+    }
+    case 3: { /* 3-byte signed integer */
+      pMem->u.i = (((signed char)buf[0])<<16) | (buf[1]<<8) | buf[2];
+      pMem->flags = MEM_Int;
+      return 3;
+    }
+    case 4: { /* 4-byte signed integer */
+      pMem->u.i = (buf[0]<<24) | (buf[1]<<16) | (buf[2]<<8) | buf[3];
+      pMem->flags = MEM_Int;
+      return 4;
+    }
+    case 5: { /* 6-byte signed integer */
+      u64 x = (((signed char)buf[0])<<8) | buf[1];
+      u32 y = (buf[2]<<24) | (buf[3]<<16) | (buf[4]<<8) | buf[5];
+      x = (x<<32) | y;
+      pMem->u.i = *(i64*)&x;
+      pMem->flags = MEM_Int;
+      return 6;
+    }
+    case 6:   /* 8-byte signed integer */
+    case 7: { /* IEEE floating point */
+      u64 x;
+      u32 y;
+#if !defined(NDEBUG) && !defined(SQLITE_OMIT_FLOATING_POINT)
+      /* Verify that integers and floating point values use the same
+      ** byte order.  Or, that if SQLITE_MIXED_ENDIAN_64BIT_FLOAT is
+      ** defined that 64-bit floating point values really are mixed
+      ** endian.
+      */
+      static const u64 t1 = ((u64)0x3ff00000)<<32;
+      static const double r1 = 1.0;
+      u64 t2 = t1;
+      swapMixedEndianFloat(t2);
+      assert( sizeof(r1)==sizeof(t2) && memcmp(&r1, &t2, sizeof(r1))==0 );
+#endif
+
+      x = (buf[0]<<24) | (buf[1]<<16) | (buf[2]<<8) | buf[3];
+      y = (buf[4]<<24) | (buf[5]<<16) | (buf[6]<<8) | buf[7];
+      x = (x<<32) | y;
+      if( serial_type==6 ){
+        pMem->u.i = *(i64*)&x;
+        pMem->flags = MEM_Int;
+      }else{
+        assert( sizeof(x)==8 && sizeof(pMem->r)==8 );
+        swapMixedEndianFloat(x);
+        memcpy(&pMem->r, &x, sizeof(x));
+        pMem->flags = MEM_Real;
+      }
+      return 8;
+    }
+    case 8:    /* Integer 0 */
+    case 9: {  /* Integer 1 */
+      pMem->u.i = serial_type-8;
+      pMem->flags = MEM_Int;
+      return 0;
+    }
+    default: {
+      int len = (serial_type-12)/2;
+      pMem->z = (char *)buf;
+      pMem->n = len;
+      pMem->xDel = 0;
+      if( serial_type&0x01 ){
+        pMem->flags = MEM_Str | MEM_Ephem;
+      }else{
+        pMem->flags = MEM_Blob | MEM_Ephem;
+      }
+      return len;
+    }
+  }
+  return 0;
+}
+
+/*
+** The header of a record consists of a sequence variable-length integers.
+** These integers are almost always small and are encoded as a single byte.
+** The following macro takes advantage this fact to provide a fast decode
+** of the integers in a record header.  It is faster for the common case
+** where the integer is a single byte.  It is a little slower when the
+** integer is two or more bytes.  But overall it is faster.
+**
+** The following expressions are equivalent:
+**
+**     x = sqlite3GetVarint32( A, &B );
+**
+**     x = GetVarint( A, B );
+**
+*/
+#define GetVarint(A,B)  ((B = *(A))<=0x7f ? 1 : sqlite3GetVarint32(A, &B))
+
+/*
+** This function compares the two table rows or index records specified by
+** {nKey1, pKey1} and {nKey2, pKey2}, returning a negative, zero
+** or positive integer if {nKey1, pKey1} is less than, equal to or
+** greater than {nKey2, pKey2}.  Both Key1 and Key2 must be byte strings
+** composed by the OP_MakeRecord opcode of the VDBE.
+**
+** Key1 and Key2 do not have to contain the same number of fields.
+** But if the lengths differ, Key2 must be the shorter of the two.
+*/
+int sqlite3VdbeRecordCompare(
+  void *userData,
+  int nKey1, const void *pKey1,
+  int nKey2, const void *pKey2
+){
+  KeyInfo *pKeyInfo = (KeyInfo*)userData;
+  u32 d1, d2;          /* Offset into aKey[] of next data element */
+  u32 idx1, idx2;      /* Offset into aKey[] of next header element */
+  u32 szHdr1, szHdr2;  /* Number of bytes in header */
+  int i = 0;
+  int nField;
+  int rc = 0;
+  const unsigned char *aKey1 = (const unsigned char *)pKey1;
+  const unsigned char *aKey2 = (const unsigned char *)pKey2;
+
+  Mem mem1;
+  Mem mem2;
+  mem1.enc = pKeyInfo->enc;
+  mem1.db = pKeyInfo->db;
+  mem1.flags = 0;
+  mem2.enc = pKeyInfo->enc;
+  mem2.db = pKeyInfo->db;
+  mem2.flags = 0;
+
+  idx1 = GetVarint(aKey1, szHdr1);
+  d1 = szHdr1;
+  idx2 = GetVarint(aKey2, szHdr2);
+  d2 = szHdr2;
+  nField = pKeyInfo->nField;
+  while( idx1<szHdr1 && idx2<szHdr2 ){
+    u32 serial_type1;
+    u32 serial_type2;
+
+    /* Read the serial types for the next element in each key. */
+    idx1 += GetVarint( aKey1+idx1, serial_type1 );
+    if( d1>=nKey1 && sqlite3VdbeSerialTypeLen(serial_type1)>0 ) break;
+    idx2 += GetVarint( aKey2+idx2, serial_type2 );
+    if( d2>=nKey2 && sqlite3VdbeSerialTypeLen(serial_type2)>0 ) break;
+
+    /* Extract the values to be compared.
+    */
+    d1 += sqlite3VdbeSerialGet(&aKey1[d1], serial_type1, &mem1);
+    d2 += sqlite3VdbeSerialGet(&aKey2[d2], serial_type2, &mem2);
+
+    /* Do the comparison
+    */
+    rc = sqlite3MemCompare(&mem1, &mem2, i<nField ? pKeyInfo->aColl[i] : 0);
+    if( mem1.flags&MEM_Dyn ) sqlite3VdbeMemRelease(&mem1);
+    if( mem2.flags&MEM_Dyn ) sqlite3VdbeMemRelease(&mem2);
+    if( rc!=0 ){
+      break;
+    }
+    i++;
+  }
+
+  /* One of the keys ran out of fields, but all the fields up to that point
+  ** were equal. If the incrKey flag is true, then the second key is
+  ** treated as larger.
+  */
+  if( rc==0 ){
+    if( pKeyInfo->incrKey ){
+      rc = -1;
+    }else if( !pKeyInfo->prefixIsEqual ){
+      if( d1<nKey1 ){
+        rc = 1;
+      }else if( d2<nKey2 ){
+        rc = -1;  /* Only occurs on a corrupt database file */
+      }
+    }
+  }else if( pKeyInfo->aSortOrder && i<pKeyInfo->nField
+               && pKeyInfo->aSortOrder[i] ){
+    rc = -rc;
+  }
+
+  return rc;
+}
+
+/*
+** The argument is an index entry composed using the OP_MakeRecord opcode.
+** The last entry in this record should be an integer (specifically
+** an integer rowid).  This routine returns the number of bytes in
+** that integer.
+*/
+int sqlite3VdbeIdxRowidLen(const u8 *aKey){
+  u32 szHdr;        /* Size of the header */
+  u32 typeRowid;    /* Serial type of the rowid */
+
+  sqlite3GetVarint32(aKey, &szHdr);
+  sqlite3GetVarint32(&aKey[szHdr-1], &typeRowid);
+  return sqlite3VdbeSerialTypeLen(typeRowid);
+}
+
+
+/*
+** pCur points at an index entry created using the OP_MakeRecord opcode.
+** Read the rowid (the last field in the record) and store it in *rowid.
+** Return SQLITE_OK if everything works, or an error code otherwise.
+*/
+int sqlite3VdbeIdxRowid(BtCursor *pCur, i64 *rowid){
+  i64 nCellKey = 0;
+  int rc;
+  u32 szHdr;        /* Size of the header */
+  u32 typeRowid;    /* Serial type of the rowid */
+  u32 lenRowid;     /* Size of the rowid */
+  Mem m, v;
+
+  sqlite3BtreeKeySize(pCur, &nCellKey);
+  if( nCellKey<=0 ){
+    return SQLITE_CORRUPT_BKPT;
+  }
+  m.flags = 0;
+  m.db = 0;
+  rc = sqlite3VdbeMemFromBtree(pCur, 0, nCellKey, 1, &m);
+  if( rc ){
+    return rc;
+  }
+  sqlite3GetVarint32((u8*)m.z, &szHdr);
+  sqlite3GetVarint32((u8*)&m.z[szHdr-1], &typeRowid);
+  lenRowid = sqlite3VdbeSerialTypeLen(typeRowid);
+  sqlite3VdbeSerialGet((u8*)&m.z[m.n-lenRowid], typeRowid, &v);
+  *rowid = v.u.i;
+  sqlite3VdbeMemRelease(&m);
+  return SQLITE_OK;
+}
+
+/*
+** Compare the key of the index entry that cursor pC is point to against
+** the key string in pKey (of length nKey).  Write into *pRes a number
+** that is negative, zero, or positive if pC is less than, equal to,
+** or greater than pKey.  Return SQLITE_OK on success.
+**
+** pKey is either created without a rowid or is truncated so that it
+** omits the rowid at the end.  The rowid at the end of the index entry
+** is ignored as well.
+*/
+int sqlite3VdbeIdxKeyCompare(
+  Cursor *pC,                 /* The cursor to compare against */
+  int nKey, const u8 *pKey,   /* The key to compare */
+  int *res                    /* Write the comparison result here */
+){
+  i64 nCellKey = 0;
+  int rc;
+  BtCursor *pCur = pC->pCursor;
+  int lenRowid;
+  Mem m;
+
+  sqlite3BtreeKeySize(pCur, &nCellKey);
+  if( nCellKey<=0 ){
+    *res = 0;
+    return SQLITE_OK;
+  }
+  m.db = 0;
+  m.flags = 0;
+  rc = sqlite3VdbeMemFromBtree(pC->pCursor, 0, nCellKey, 1, &m);
+  if( rc ){
+    return rc;
+  }
+  lenRowid = sqlite3VdbeIdxRowidLen((u8*)m.z);
+  *res = sqlite3VdbeRecordCompare(pC->pKeyInfo, m.n-lenRowid, m.z, nKey, pKey);
+  sqlite3VdbeMemRelease(&m);
+  return SQLITE_OK;
+}
+
+/*
+** This routine sets the value to be returned by subsequent calls to
+** sqlite3_changes() on the database handle 'db'.
+*/
+void sqlite3VdbeSetChanges(sqlite3 *db, int nChange){
+  assert( sqlite3_mutex_held(db->mutex) );
+  db->nChange = nChange;
+  db->nTotalChange += nChange;
+}
+
+/*
+** Set a flag in the vdbe to update the change counter when it is finalised
+** or reset.
+*/
+void sqlite3VdbeCountChanges(Vdbe *v){
+  v->changeCntOn = 1;
+}
+
+/*
+** Mark every prepared statement associated with a database connection
+** as expired.
+**
+** An expired statement means that recompilation of the statement is
+** recommend.  Statements expire when things happen that make their
+** programs obsolete.  Removing user-defined functions or collating
+** sequences, or changing an authorization function are the types of
+** things that make prepared statements obsolete.
+*/
+void sqlite3ExpirePreparedStatements(sqlite3 *db){
+  Vdbe *p;
+  for(p = db->pVdbe; p; p=p->pNext){
+    p->expired = 1;
+  }
+}
+
+/*
+** Return the database associated with the Vdbe.
+*/
+sqlite3 *sqlite3VdbeDb(Vdbe *v){
+  return v->db;
+}
diff --git a/uppsrc/plugin/sqlite3/lib/vdbeblob.c b/uppsrc/plugin/sqlite3/lib/vdbeblob.c
new file mode 100644
index 000000000..538125ca0
--- /dev/null
+++ b/uppsrc/plugin/sqlite3/lib/vdbeblob.c
@@ -0,0 +1,337 @@
+/*
+** 2007 May 1
+**
+** The author disclaims copyright to this source code.  In place of
+** a legal notice, here is a blessing:
+**
+**    May you do good and not evil.
+**    May you find forgiveness for yourself and forgive others.
+**    May you share freely, never taking more than you give.
+**
+*************************************************************************
+**
+** This file contains code used to implement incremental BLOB I/O.
+**
+** $Id: vdbeblob.c,v 1.20 2008/01/25 15:04:50 drh Exp $
+*/
+
+#include "sqliteInt.h"
+#include "vdbeInt.h"
+
+#ifndef SQLITE_OMIT_INCRBLOB
+
+/*
+** Valid sqlite3_blob* handles point to Incrblob structures.
+*/
+typedef struct Incrblob Incrblob;
+struct Incrblob {
+  int flags;              /* Copy of "flags" passed to sqlite3_blob_open() */
+  int nByte;              /* Size of open blob, in bytes */
+  int iOffset;            /* Byte offset of blob in cursor data */
+  BtCursor *pCsr;         /* Cursor pointing at blob row */
+  sqlite3_stmt *pStmt;    /* Statement holding cursor open */
+  sqlite3 *db;            /* The associated database */
+};
+
+/*
+** Open a blob handle.
+*/
+int sqlite3_blob_open(
+  sqlite3* db,            /* The database connection */
+  const char *zDb,        /* The attached database containing the blob */
+  const char *zTable,     /* The table containing the blob */
+  const char *zColumn,    /* The column containing the blob */
+  sqlite_int64 iRow,      /* The row containing the glob */
+  int flags,              /* True -> read/write access, false -> read-only */
+  sqlite3_blob **ppBlob   /* Handle for accessing the blob returned here */
+){
+  int nAttempt = 0;
+  int iCol;               /* Index of zColumn in row-record */
+
+  /* This VDBE program seeks a btree cursor to the identified
+  ** db/table/row entry. The reason for using a vdbe program instead
+  ** of writing code to use the b-tree layer directly is that the
+  ** vdbe program will take advantage of the various transaction,
+  ** locking and error handling infrastructure built into the vdbe.
+  **
+  ** After seeking the cursor, the vdbe executes an OP_ResultRow.
+  ** Code external to the Vdbe then "borrows" the b-tree cursor and
+  ** uses it to implement the blob_read(), blob_write() and
+  ** blob_bytes() functions.
+  **
+  ** The sqlite3_blob_close() function finalizes the vdbe program,
+  ** which closes the b-tree cursor and (possibly) commits the
+  ** transaction.
+  */
+  static const VdbeOpList openBlob[] = {
+    {OP_Transaction, 0, 0, 0},     /* 0: Start a transaction */
+    {OP_VerifyCookie, 0, 0, 0},    /* 1: Check the schema cookie */
+
+    /* One of the following two instructions is replaced by an
+    ** OP_Noop before exection.
+    */
+    {OP_OpenRead, 0, 0, 0},        /* 2: Open cursor 0 for reading */
+    {OP_OpenWrite, 0, 0, 0},       /* 3: Open cursor 0 for read/write */
+    {OP_SetNumColumns, 0, 0, 0},   /* 4: Num cols for cursor */
+
+    {OP_Variable, 1, 1, 0},        /* 5: Push the rowid to the stack */
+    {OP_NotExists, 0, 10, 1},      /* 6: Seek the cursor */
+    {OP_Column, 0, 0, 1},          /* 7  */
+    {OP_ResultRow, 1, 0, 0},       /* 8  */
+    {OP_Close, 0, 0, 0},           /* 9  */
+    {OP_Halt, 0, 0, 0},            /* 10 */
+  };
+
+  Vdbe *v = 0;
+  int rc = SQLITE_OK;
+  char zErr[128];
+
+  zErr[0] = 0;
+  sqlite3_mutex_enter(db->mutex);
+  do {
+    Parse sParse;
+    Table *pTab;
+
+    memset(&sParse, 0, sizeof(Parse));
+    sParse.db = db;
+
+    rc = sqlite3SafetyOn(db);
+    if( rc!=SQLITE_OK ){
+      sqlite3_mutex_leave(db->mutex);
+      return rc;
+    }
+
+    sqlite3BtreeEnterAll(db);
+    pTab = sqlite3LocateTable(&sParse, 0, zTable, zDb);
+    if( !pTab ){
+      if( sParse.zErrMsg ){
+        sqlite3_snprintf(sizeof(zErr), zErr, "%s", sParse.zErrMsg);
+      }
+      sqlite3_free(sParse.zErrMsg);
+      rc = SQLITE_ERROR;
+      (void)sqlite3SafetyOff(db);
+      sqlite3BtreeLeaveAll(db);
+      goto blob_open_out;
+    }
+
+    /* Now search pTab for the exact column. */
+    for(iCol=0; iCol < pTab->nCol; iCol++) {
+      if( sqlite3StrICmp(pTab->aCol[iCol].zName, zColumn)==0 ){
+        break;
+      }
+    }
+    if( iCol==pTab->nCol ){
+      sqlite3_snprintf(sizeof(zErr), zErr, "no such column: \"%s\"", zColumn);
+      rc = SQLITE_ERROR;
+      (void)sqlite3SafetyOff(db);
+      sqlite3BtreeLeaveAll(db);
+      goto blob_open_out;
+    }
+
+    /* If the value is being opened for writing, check that the
+    ** column is not indexed. It is against the rules to open an
+    ** indexed column for writing.
+    */
+    if( flags ){
+      Index *pIdx;
+      for(pIdx=pTab->pIndex; pIdx; pIdx=pIdx->pNext){
+        int j;
+        for(j=0; j<pIdx->nColumn; j++){
+          if( pIdx->aiColumn[j]==iCol ){
+            sqlite3_snprintf(sizeof(zErr), zErr,
+                             "cannot open indexed column for writing");
+            rc = SQLITE_ERROR;
+            (void)sqlite3SafetyOff(db);
+            sqlite3BtreeLeaveAll(db);
+            goto blob_open_out;
+          }
+        }
+      }
+    }
+
+    v = sqlite3VdbeCreate(db);
+    if( v ){
+      int iDb = sqlite3SchemaToIndex(db, pTab->pSchema);
+      sqlite3VdbeAddOpList(v, sizeof(openBlob)/sizeof(VdbeOpList), openBlob);
+
+      /* Configure the OP_Transaction */
+      sqlite3VdbeChangeP1(v, 0, iDb);
+      sqlite3VdbeChangeP2(v, 0, (flags ? 1 : 0));
+
+      /* Configure the OP_VerifyCookie */
+      sqlite3VdbeChangeP1(v, 1, iDb);
+      sqlite3VdbeChangeP2(v, 1, pTab->pSchema->schema_cookie);
+
+      /* Make sure a mutex is held on the table to be accessed */
+      sqlite3VdbeUsesBtree(v, iDb);
+
+      /* Remove either the OP_OpenWrite or OpenRead. Set the P2
+      ** parameter of the other to pTab->tnum.
+      */
+      sqlite3VdbeChangeToNoop(v, (flags ? 2 : 3), 1);
+      sqlite3VdbeChangeP2(v, (flags ? 3 : 2), pTab->tnum);
+      sqlite3VdbeChangeP3(v, (flags ? 3 : 2), iDb);
+
+      /* Configure the OP_SetNumColumns. Configure the cursor to
+      ** think that the table has one more column than it really
+      ** does. An OP_Column to retrieve this imaginary column will
+      ** always return an SQL NULL. This is useful because it means
+      ** we can invoke OP_Column to fill in the vdbe cursors type
+      ** and offset cache without causing any IO.
+      */
+      sqlite3VdbeChangeP2(v, 4, pTab->nCol+1);
+      if( !db->mallocFailed ){
+        sqlite3VdbeMakeReady(v, 1, 1, 1, 0);
+      }
+    }
+
+    sqlite3BtreeLeaveAll(db);
+    rc = sqlite3SafetyOff(db);
+    if( rc!=SQLITE_OK || db->mallocFailed ){
+      goto blob_open_out;
+    }
+
+    sqlite3_bind_int64((sqlite3_stmt *)v, 1, iRow);
+    rc = sqlite3_step((sqlite3_stmt *)v);
+    if( rc!=SQLITE_ROW ){
+      nAttempt++;
+      rc = sqlite3_finalize((sqlite3_stmt *)v);
+      sqlite3_snprintf(sizeof(zErr), zErr, sqlite3_errmsg(db));
+      v = 0;
+    }
+  } while( nAttempt<5 && rc==SQLITE_SCHEMA );
+
+  if( rc==SQLITE_ROW ){
+    /* The row-record has been opened successfully. Check that the
+    ** column in question contains text or a blob. If it contains
+    ** text, it is up to the caller to get the encoding right.
+    */
+    Incrblob *pBlob;
+    u32 type = v->apCsr[0]->aType[iCol];
+
+    if( type<12 ){
+      sqlite3_snprintf(sizeof(zErr), zErr, "cannot open value of type %s",
+          type==0?"null": type==7?"real": "integer"
+      );
+      rc = SQLITE_ERROR;
+      goto blob_open_out;
+    }
+    pBlob = (Incrblob *)sqlite3DbMallocZero(db, sizeof(Incrblob));
+    if( db->mallocFailed ){
+      sqlite3_free(pBlob);
+      goto blob_open_out;
+    }
+    pBlob->flags = flags;
+    pBlob->pCsr =  v->apCsr[0]->pCursor;
+    sqlite3BtreeEnterCursor(pBlob->pCsr);
+    sqlite3BtreeCacheOverflow(pBlob->pCsr);
+    sqlite3BtreeLeaveCursor(pBlob->pCsr);
+    pBlob->pStmt = (sqlite3_stmt *)v;
+    pBlob->iOffset = v->apCsr[0]->aOffset[iCol];
+    pBlob->nByte = sqlite3VdbeSerialTypeLen(type);
+    pBlob->db = db;
+    *ppBlob = (sqlite3_blob *)pBlob;
+    rc = SQLITE_OK;
+  }else if( rc==SQLITE_OK ){
+    sqlite3_snprintf(sizeof(zErr), zErr, "no such rowid: %lld", iRow);
+    rc = SQLITE_ERROR;
+  }
+
+blob_open_out:
+  zErr[sizeof(zErr)-1] = '\0';
+  if( rc!=SQLITE_OK || db->mallocFailed ){
+    sqlite3_finalize((sqlite3_stmt *)v);
+  }
+  sqlite3Error(db, rc, (rc==SQLITE_OK?0:zErr));
+  rc = sqlite3ApiExit(db, rc);
+  sqlite3_mutex_leave(db->mutex);
+  return rc;
+}
+
+/*
+** Close a blob handle that was previously created using
+** sqlite3_blob_open().
+*/
+int sqlite3_blob_close(sqlite3_blob *pBlob){
+  Incrblob *p = (Incrblob *)pBlob;
+  int rc;
+
+  rc = sqlite3_finalize(p->pStmt);
+  sqlite3_free(p);
+  return rc;
+}
+
+/*
+** Perform a read or write operation on a blob
+*/
+static int blobReadWrite(
+  sqlite3_blob *pBlob,
+  void *z,
+  int n,
+  int iOffset,
+  int (*xCall)(BtCursor*, u32, u32, void*)
+){
+  int rc;
+  Incrblob *p = (Incrblob *)pBlob;
+  Vdbe *v;
+  sqlite3 *db = p->db;
+
+  /* Request is out of range. Return a transient error. */
+  if( (iOffset+n)>p->nByte ){
+    return SQLITE_ERROR;
+  }
+  sqlite3_mutex_enter(db->mutex);
+
+  /* If there is no statement handle, then the blob-handle has
+  ** already been invalidated. Return SQLITE_ABORT in this case.
+  */
+  v = (Vdbe*)p->pStmt;
+  if( v==0 ){
+    rc = SQLITE_ABORT;
+  }else{
+    /* Call either BtreeData() or BtreePutData(). If SQLITE_ABORT is
+    ** returned, clean-up the statement handle.
+    */
+    assert( db == v->db );
+    sqlite3BtreeEnterCursor(p->pCsr);
+    rc = xCall(p->pCsr, iOffset+p->iOffset, n, z);
+    sqlite3BtreeLeaveCursor(p->pCsr);
+    if( rc==SQLITE_ABORT ){
+      sqlite3VdbeFinalize(v);
+      p->pStmt = 0;
+    }else{
+      db->errCode = rc;
+      v->rc = rc;
+    }
+  }
+  rc = sqlite3ApiExit(db, rc);
+  sqlite3_mutex_leave(db->mutex);
+  return rc;
+}
+
+/*
+** Read data from a blob handle.
+*/
+int sqlite3_blob_read(sqlite3_blob *pBlob, void *z, int n, int iOffset){
+  return blobReadWrite(pBlob, z, n, iOffset, sqlite3BtreeData);
+}
+
+/*
+** Write data to a blob handle.
+*/
+int sqlite3_blob_write(sqlite3_blob *pBlob, const void *z, int n, int iOffset){
+  return blobReadWrite(pBlob, (void *)z, n, iOffset, sqlite3BtreePutData);
+}
+
+/*
+** Query a blob handle for the size of the data.
+**
+** The Incrblob.nByte field is fixed for the lifetime of the Incrblob
+** so no mutex is required for access.
+*/
+int sqlite3_blob_bytes(sqlite3_blob *pBlob){
+  Incrblob *p = (Incrblob *)pBlob;
+  return p->nByte;
+}
+
+#endif /* #ifndef SQLITE_OMIT_INCRBLOB */
diff --git a/uppsrc/plugin/sqlite3/lib/vdbefifo.c b/uppsrc/plugin/sqlite3/lib/vdbefifo.c
new file mode 100644
index 000000000..782ac99c7
--- /dev/null
+++ b/uppsrc/plugin/sqlite3/lib/vdbefifo.c
@@ -0,0 +1,126 @@
+/*
+** 2005 June 16
+**
+** The author disclaims copyright to this source code.  In place of
+** a legal notice, here is a blessing:
+**
+**    May you do good and not evil.
+**    May you find forgiveness for yourself and forgive others.
+**    May you share freely, never taking more than you give.
+**
+*************************************************************************
+** This file implements a FIFO queue of rowids used for processing
+** UPDATE and DELETE statements.
+*/
+#include "sqliteInt.h"
+#include "vdbeInt.h"
+
+/*
+** Constants FIFOSIZE_FIRST and FIFOSIZE_MAX are the initial
+** number of entries in a fifo page and the maximum number of
+** entries in a fifo page.
+*/
+#define FIFOSIZE_FIRST (((128-sizeof(FifoPage))/8)+1)
+#ifdef SQLITE_MALLOC_SOFT_LIMIT
+# define FIFOSIZE_MAX   (((SQLITE_MALLOC_SOFT_LIMIT-sizeof(FifoPage))/8)+1)
+#else
+# define FIFOSIZE_MAX   (((262144-sizeof(FifoPage))/8)+1)
+#endif
+
+/*
+** Allocate a new FifoPage and return a pointer to it.  Return NULL if
+** we run out of memory.  Leave space on the page for nEntry entries.
+*/
+static FifoPage *allocateFifoPage(int nEntry){
+  FifoPage *pPage;
+  if( nEntry>FIFOSIZE_MAX ){
+    nEntry = FIFOSIZE_MAX;
+  }
+  pPage = sqlite3_malloc( sizeof(FifoPage) + sizeof(i64)*(nEntry-1) );
+  if( pPage ){
+    pPage->nSlot = nEntry;
+    pPage->iWrite = 0;
+    pPage->iRead = 0;
+    pPage->pNext = 0;
+  }
+  return pPage;
+}
+
+/*
+** Initialize a Fifo structure.
+*/
+void sqlite3VdbeFifoInit(Fifo *pFifo){
+  memset(pFifo, 0, sizeof(*pFifo));
+}
+
+/*
+** Push a single 64-bit integer value into the Fifo.  Return SQLITE_OK
+** normally.   SQLITE_NOMEM is returned if we are unable to allocate
+** memory.
+*/
+int sqlite3VdbeFifoPush(Fifo *pFifo, i64 val){
+  FifoPage *pPage;
+  pPage = pFifo->pLast;
+  if( pPage==0 ){
+    pPage = pFifo->pLast = pFifo->pFirst = allocateFifoPage(FIFOSIZE_FIRST);
+    if( pPage==0 ){
+      return SQLITE_NOMEM;
+    }
+  }else if( pPage->iWrite>=pPage->nSlot ){
+    pPage->pNext = allocateFifoPage(pFifo->nEntry);
+    if( pPage->pNext==0 ){
+      return SQLITE_NOMEM;
+    }
+    pPage = pFifo->pLast = pPage->pNext;
+  }
+  pPage->aSlot[pPage->iWrite++] = val;
+  pFifo->nEntry++;
+  return SQLITE_OK;
+}
+
+/*
+** Extract a single 64-bit integer value from the Fifo.  The integer
+** extracted is the one least recently inserted.  If the Fifo is empty
+** return SQLITE_DONE.
+*/
+int sqlite3VdbeFifoPop(Fifo *pFifo, i64 *pVal){
+  FifoPage *pPage;
+  if( pFifo->nEntry==0 ){
+    return SQLITE_DONE;
+  }
+  assert( pFifo->nEntry>0 );
+  pPage = pFifo->pFirst;
+  assert( pPage!=0 );
+  assert( pPage->iWrite>pPage->iRead );
+  assert( pPage->iWrite<=pPage->nSlot );
+  assert( pPage->iRead<pPage->nSlot );
+  assert( pPage->iRead>=0 );
+  *pVal = pPage->aSlot[pPage->iRead++];
+  pFifo->nEntry--;
+  if( pPage->iRead>=pPage->iWrite ){
+    pFifo->pFirst = pPage->pNext;
+    sqlite3_free(pPage);
+    if( pFifo->nEntry==0 ){
+      assert( pFifo->pLast==pPage );
+      pFifo->pLast = 0;
+    }else{
+      assert( pFifo->pFirst!=0 );
+    }
+  }else{
+    assert( pFifo->nEntry>0 );
+  }
+  return SQLITE_OK;
+}
+
+/*
+** Delete all information from a Fifo object.   Free all memory held
+** by the Fifo.
+*/
+void sqlite3VdbeFifoClear(Fifo *pFifo){
+  FifoPage *pPage, *pNextPage;
+  for(pPage=pFifo->pFirst; pPage; pPage=pNextPage){
+    pNextPage = pPage->pNext;
+    sqlite3_free(pPage);
+  }
+  sqlite3VdbeFifoInit(pFifo);
+}
diff --git a/uppsrc/plugin/sqlite3/lib/vdbemem.c b/uppsrc/plugin/sqlite3/lib/vdbemem.c
new file mode 100644
index 000000000..9acc1b0ba
--- /dev/null
+++ b/uppsrc/plugin/sqlite3/lib/vdbemem.c
@@ -0,0 +1,1065 @@
+/*
+** 2004 May 26
+**
+** The author disclaims copyright to this source code.  In place of
+** a legal notice, here is a blessing:
+**
+**    May you do good and not evil.
+**    May you find forgiveness for yourself and forgive others.
+**    May you share freely, never taking more than you give.
+**
+*************************************************************************
+**
+** This file contains code use to manipulate "Mem" structure.  A "Mem"
+** stores a single value in the VDBE.  Mem is an opaque structure visible
+** only within the VDBE.  Interface routines refer to a Mem using the
+** name sqlite_value
+*/
+#include "sqliteInt.h"
+#include <ctype.h>
+#include "vdbeInt.h"
+
+/*
+** Call sqlite3VdbeMemExpandBlob() on the supplied value (type Mem*)
+** P if required.
+*/
+#define expandBlob(P) (((P)->flags&MEM_Zero)?sqlite3VdbeMemExpandBlob(P):0)
+
+/*
+** If pMem is an object with a valid string representation, this routine
+** ensures the internal encoding for the string representation is
+** 'desiredEnc', one of SQLITE_UTF8, SQLITE_UTF16LE or SQLITE_UTF16BE.
+**
+** If pMem is not a string object, or the encoding of the string
+** representation is already stored using the requested encoding, then this
+** routine is a no-op.
+**
+** SQLITE_OK is returned if the conversion is successful (or not required).
+** SQLITE_NOMEM may be returned if a malloc() fails during conversion
+** between formats.
+*/
+int sqlite3VdbeChangeEncoding(Mem *pMem, int desiredEnc){
+  int rc;
+  if( !(pMem->flags&MEM_Str) || pMem->enc==desiredEnc ){
+    return SQLITE_OK;
+  }
+  assert( pMem->db==0 || sqlite3_mutex_held(pMem->db->mutex) );
+#ifdef SQLITE_OMIT_UTF16
+  return SQLITE_ERROR;
+#else
+
+  /* MemTranslate() may return SQLITE_OK or SQLITE_NOMEM. If NOMEM is returned,
+  ** then the encoding of the value may not have changed.
+  */
+  rc = sqlite3VdbeMemTranslate(pMem, desiredEnc);
+  assert(rc==SQLITE_OK    || rc==SQLITE_NOMEM);
+  assert(rc==SQLITE_OK    || pMem->enc!=desiredEnc);
+  assert(rc==SQLITE_NOMEM || pMem->enc==desiredEnc);
+  return rc;
+#endif
+}
+
+/*
+** Make sure pMem->z points to a writable allocation of at least
+** n bytes.
+**
+** If the memory cell currently contains string or blob data
+** and the third argument passed to this function is true, the
+** current content of the cell is preserved. Otherwise, it may
+** be discarded.
+**
+** This function sets the MEM_Dyn flag and clears any xDel callback.
+** It also clears MEM_Ephem and MEM_Static. If the preserve flag is
+** not set, Mem.n is zeroed.
+*/
+int sqlite3VdbeMemGrow(Mem *pMem, int n, int preserve){
+  int f = pMem->flags;
+
+  assert( (f & (MEM_Dyn|MEM_Static|MEM_Ephem))==0
+       || (f & (MEM_Dyn|MEM_Static|MEM_Ephem))==MEM_Dyn
+       || (f & (MEM_Dyn|MEM_Static|MEM_Ephem))==MEM_Ephem
+       || (f & (MEM_Dyn|MEM_Static|MEM_Ephem))==MEM_Static
+  );
+
+  if( ((f&MEM_Dyn)==0 || pMem->xDel || sqlite3MallocSize(pMem->z)<n) ){
+
+    /* Allocate the new buffer. The minimum allocation size is 32 bytes. */
+    char *z = 0;
+    if( n>0 ){
+      if( preserve && (f&MEM_Dyn) && !pMem->xDel ){
+        z = sqlite3DbReallocOrFree(pMem->db, pMem->z, n);
+        pMem->z = 0;
+        preserve = 0;
+      }else{
+        z = sqlite3DbMallocRaw(pMem->db, (n>32?n:32));
+      }
+      if( !z ){
+        return SQLITE_NOMEM;
+      }
+    }
+
+    /* If the value is currently a string or blob and the preserve flag
+    ** is true, copy the content to the new buffer.
+    */
+    if( pMem->flags&(MEM_Blob|MEM_Str) && preserve ){
+      int nCopy = (pMem->n>n?n:pMem->n);
+      memcpy(z, pMem->z, nCopy);
+    }
+
+    /* Release the old buffer. */
+    sqlite3VdbeMemRelease(pMem);
+
+    pMem->z = z;
+    pMem->flags |= MEM_Dyn;
+    pMem->flags &= ~(MEM_Ephem|MEM_Static);
+    pMem->xDel = 0;
+  }
+  return SQLITE_OK;
+}
+
+/*
+** Make the given Mem object MEM_Dyn.
+**
+** Return SQLITE_OK on success or SQLITE_NOMEM if malloc fails.
+*/
+int sqlite3VdbeMemDynamicify(Mem *pMem){
+  int f;
+  assert( pMem->db==0 || sqlite3_mutex_held(pMem->db->mutex) );
+  expandBlob(pMem);
+  f = pMem->flags;
+  if( (f&(MEM_Str|MEM_Blob)) && ((f&MEM_Dyn)==0 || pMem->xDel) ){
+    if( sqlite3VdbeMemGrow(pMem, pMem->n + 2, 1) ){
+      return SQLITE_NOMEM;
+    }
+    pMem->z[pMem->n] = 0;
+    pMem->z[pMem->n+1] = 0;
+    pMem->flags |= MEM_Term;
+  }
+
+  return SQLITE_OK;
+}
+
+/*
+** If the given Mem* has a zero-filled tail, turn it into an ordinary
+** blob stored in dynamically allocated space.
+*/
+#ifndef SQLITE_OMIT_INCRBLOB
+int sqlite3VdbeMemExpandBlob(Mem *pMem){
+  if( pMem->flags & MEM_Zero ){
+    int nByte;
+    assert( pMem->flags&MEM_Blob );
+    assert( pMem->db==0 || sqlite3_mutex_held(pMem->db->mutex) );
+
+    /* Set nByte to the number of bytes required to store the expanded blob. */
+    nByte = pMem->n + pMem->u.i;
+    if( nByte<=0 ){
+      nByte = 1;
+    }
+    if( sqlite3VdbeMemGrow(pMem, nByte, 1) ){
+      return SQLITE_NOMEM;
+    }
+
+    memset(&pMem->z[pMem->n], 0, pMem->u.i);
+    pMem->n += pMem->u.i;
+    pMem->flags &= ~(MEM_Zero|MEM_Term);
+  }
+  return SQLITE_OK;
+}
+#endif
+
+
+/*
+** Make the given Mem object either MEM_Short or MEM_Dyn so that bytes
+** of the Mem.z[] array can be modified.
+**
+** Return SQLITE_OK on success or SQLITE_NOMEM if malloc fails.
+*/
+int sqlite3VdbeMemMakeWriteable(Mem *pMem){
+  return sqlite3VdbeMemDynamicify(pMem);
+}
+
+/*
+** Make sure the given Mem is \u0000 terminated.
+*/
+int sqlite3VdbeMemNulTerminate(Mem *pMem){
+  assert( pMem->db==0 || sqlite3_mutex_held(pMem->db->mutex) );
+  if( (pMem->flags & MEM_Term)!=0 || (pMem->flags & MEM_Str)==0 ){
+    return SQLITE_OK;   /* Nothing to do */
+  }
+  if( sqlite3VdbeMemGrow(pMem, pMem->n+2, 1) ){
+    return SQLITE_NOMEM;
+  }
+  pMem->z[pMem->n] = 0;
+  pMem->z[pMem->n+1] = 0;
+  pMem->flags |= MEM_Term;
+  return SQLITE_OK;
+}
+
+/*
+** Add MEM_Str to the set of representations for the given Mem.  Numbers
+** are converted using sqlite3_snprintf().  Converting a BLOB to a string
+** is a no-op.
+**
+** Existing representations MEM_Int and MEM_Real are *not* invalidated.
+**
+** A MEM_Null value will never be passed to this function. This function is
+** used for converting values to text for returning to the user (i.e. via
+** sqlite3_value_text()), or for ensuring that values to be used as btree
+** keys are strings. In the former case a NULL pointer is returned the
+** user and the later is an internal programming error.
+*/
+int sqlite3VdbeMemStringify(Mem *pMem, int enc){
+  int rc = SQLITE_OK;
+  int fg = pMem->flags;
+  const int nByte = 32;
+
+  assert( pMem->db==0 || sqlite3_mutex_held(pMem->db->mutex) );
+  assert( !(fg&MEM_Zero) );
+  assert( !(fg&(MEM_Str|MEM_Blob)) );
+  assert( fg&(MEM_Int|MEM_Real) );
+
+  if( sqlite3VdbeMemGrow(pMem, nByte, 0) ){
+    return SQLITE_NOMEM;
+  }
+
+  /* For a Real or Integer, use sqlite3_mprintf() to produce the UTF-8
+  ** string representation of the value. Then, if the required encoding
+  ** is UTF-16le or UTF-16be do a translation.
+  **
+  ** FIX ME: It would be better if sqlite3_snprintf() could do UTF-16.
+  */
+  if( fg & MEM_Int ){
+    sqlite3_snprintf(nByte, pMem->z, "%lld", pMem->u.i);
+  }else{
+    assert( fg & MEM_Real );
+    sqlite3_snprintf(nByte, pMem->z, "%!.15g", pMem->r);
+  }
+  pMem->n = strlen(pMem->z);
+  pMem->enc = SQLITE_UTF8;
+  pMem->flags |= MEM_Str|MEM_Term;
+  sqlite3VdbeChangeEncoding(pMem, enc);
+  return rc;
+}
+
+/*
+** Memory cell pMem contains the context of an aggregate function.
+** This routine calls the finalize method for that function.  The
+** result of the aggregate is stored back into pMem.
+**
+** Return SQLITE_ERROR if the finalizer reports an error.  SQLITE_OK
+** otherwise.
+*/
+int sqlite3VdbeMemFinalize(Mem *pMem, FuncDef *pFunc){
+  int rc = SQLITE_OK;
+  if( pFunc && pFunc->xFinalize ){
+    sqlite3_context ctx;
+    assert( (pMem->flags & MEM_Null)!=0 || pFunc==pMem->u.pDef );
+    assert( pMem->db==0 || sqlite3_mutex_held(pMem->db->mutex) );
+    ctx.s.flags = MEM_Null;
+    ctx.s.db = pMem->db;
+    ctx.pMem = pMem;
+    ctx.pFunc = pFunc;
+    ctx.isError = 0;
+    pFunc->xFinalize(&ctx);
+    if( pMem->z ){
+      sqlite3_free( pMem->z );
+    }
+    *pMem = ctx.s;
+    rc = (ctx.isError?SQLITE_ERROR:SQLITE_OK);
+  }
+  return rc;
+}
+
+/*
+** Release any memory held by the Mem. This may leave the Mem in an
+** inconsistent state, for example with (Mem.z==0) and
+** (Mem.type==SQLITE_TEXT).
+*/
+void sqlite3VdbeMemRelease(Mem *p){
+  assert( p->db==0 || sqlite3_mutex_held(p->db->mutex) );
+  if( p->flags & (MEM_Dyn|MEM_Agg) ){
+    if( p->xDel ){
+      if( p->flags & MEM_Agg ){
+        sqlite3VdbeMemFinalize(p, p->u.pDef);
+        assert( (p->flags & MEM_Agg)==0 );
+        sqlite3VdbeMemRelease(p);
+      }else{
+        p->xDel((void *)p->z);
+      }
+    }else{
+      sqlite3_free(p->z);
+    }
+    p->z = 0;
+    p->xDel = 0;
+  }
+}
+
+/*
+** Convert a 64-bit IEEE double into a 64-bit signed integer.
+** If the double is too large, return 0x8000000000000000.
+**
+** Most systems appear to do this simply by assigning
+** variables and without the extra range tests.  But
+** there are reports that windows throws an expection
+** if the floating point value is out of range. (See ticket #2880.)
+** Because we do not completely understand the problem, we will
+** take the conservative approach and always do range tests
+** before attempting the conversion.
+*/
+static i64 doubleToInt64(double r){
+  /*
+  ** Many compilers we encounter do not define constants for the
+  ** minimum and maximum 64-bit integers, or they define them
+  ** inconsistently.  And many do not understand the "LL" notation.
+  ** So we define our own static constants here using nothing
+  ** larger than a 32-bit integer constant.
+  */
+  static const i64 maxInt = (((i64)0x7fffffff)<<32)|0xffffffff;
+  static const i64 minInt = ((i64)0x80000000)<<32;
+
+  if( r<(double)minInt ){
+    return minInt;
+  }else if( r>(double)maxInt ){
+    return minInt;
+  }else{
+    return (i64)r;
+  }
+}
+
+/*
+** Return some kind of integer value which is the best we can do
+** at representing the value that *pMem describes as an integer.
+** If pMem is an integer, then the value is exact.  If pMem is
+** a floating-point then the value returned is the integer part.
+** If pMem is a string or blob, then we make an attempt to convert
+** it into a integer and return that.  If pMem is NULL, return 0.
+**
+** If pMem is a string, its encoding might be changed.
+*/
+i64 sqlite3VdbeIntValue(Mem *pMem){
+  int flags;
+  assert( pMem->db==0 || sqlite3_mutex_held(pMem->db->mutex) );
+  flags = pMem->flags;
+  if( flags & MEM_Int ){
+    return pMem->u.i;
+  }else if( flags & MEM_Real ){
+    return doubleToInt64(pMem->r);
+  }else if( flags & (MEM_Str|MEM_Blob) ){
+    i64 value;
+    pMem->flags |= MEM_Str;
+    if( sqlite3VdbeChangeEncoding(pMem, SQLITE_UTF8)
+       || sqlite3VdbeMemNulTerminate(pMem) ){
+      return 0;
+    }
+    assert( pMem->z );
+    sqlite3Atoi64(pMem->z, &value);
+    return value;
+  }else{
+    return 0;
+  }
+}
+
+/*
+** Return the best representation of pMem that we can get into a
+** double.  If pMem is already a double or an integer, return its
+** value.  If it is a string or blob, try to convert it to a double.
+** If it is a NULL, return 0.0.
+*/
+double sqlite3VdbeRealValue(Mem *pMem){
+  assert( pMem->db==0 || sqlite3_mutex_held(pMem->db->mutex) );
+  if( pMem->flags & MEM_Real ){
+    return pMem->r;
+  }else if( pMem->flags & MEM_Int ){
+    return (double)pMem->u.i;
+  }else if( pMem->flags & (MEM_Str|MEM_Blob) ){
+    double val = 0.0;
+    pMem->flags |= MEM_Str;
+    if( sqlite3VdbeChangeEncoding(pMem, SQLITE_UTF8)
+       || sqlite3VdbeMemNulTerminate(pMem) ){
+      return 0.0;
+    }
+    assert( pMem->z );
+    sqlite3AtoF(pMem->z, &val);
+    return val;
+  }else{
+    return 0.0;
+  }
+}
+
+/*
+** The MEM structure is already a MEM_Real.  Try to also make it a
+** MEM_Int if we can.
+*/
+void sqlite3VdbeIntegerAffinity(Mem *pMem){
+  assert( pMem->flags & MEM_Real );
+  assert( pMem->db==0 || sqlite3_mutex_held(pMem->db->mutex) );
+
+  pMem->u.i = doubleToInt64(pMem->r);
+  if( pMem->r==(double)pMem->u.i ){
+    pMem->flags |= MEM_Int;
+  }
+}
+
+static void setTypeFlag(Mem *pMem, int f){
+  MemSetTypeFlag(pMem, f);
+}
+
+/*
+** Convert pMem to type integer.  Invalidate any prior representations.
+*/
+int sqlite3VdbeMemIntegerify(Mem *pMem){
+  assert( pMem->db==0 || sqlite3_mutex_held(pMem->db->mutex) );
+  pMem->u.i = sqlite3VdbeIntValue(pMem);
+  setTypeFlag(pMem, MEM_Int);
+  return SQLITE_OK;
+}
+
+/*
+** Convert pMem so that it is of type MEM_Real.
+** Invalidate any prior representations.
+*/
+int sqlite3VdbeMemRealify(Mem *pMem){
+  assert( pMem->db==0 || sqlite3_mutex_held(pMem->db->mutex) );
+  pMem->r = sqlite3VdbeRealValue(pMem);
+  setTypeFlag(pMem, MEM_Real);
+  return SQLITE_OK;
+}
+
+/*
+** Convert pMem so that it has types MEM_Real or MEM_Int or both.
+** Invalidate any prior representations.
+*/
+int sqlite3VdbeMemNumerify(Mem *pMem){
+  double r1, r2;
+  i64 i;
+  assert( (pMem->flags & (MEM_Int|MEM_Real|MEM_Null))==0 );
+  assert( (pMem->flags & (MEM_Blob|MEM_Str))!=0 );
+  assert( pMem->db==0 || sqlite3_mutex_held(pMem->db->mutex) );
+  r1 = sqlite3VdbeRealValue(pMem);
+  i = doubleToInt64(r1);
+  r2 = (double)i;
+  if( r1==r2 ){
+    sqlite3VdbeMemIntegerify(pMem);
+  }else{
+    pMem->r = r1;
+    setTypeFlag(pMem, MEM_Real);
+  }
+  return SQLITE_OK;
+}
+
+/*
+** Delete any previous value and set the value stored in *pMem to NULL.
+*/
+void sqlite3VdbeMemSetNull(Mem *pMem){
+  setTypeFlag(pMem, MEM_Null);
+  pMem->type = SQLITE_NULL;
+}
+
+/*
+** Delete any previous value and set the value to be a BLOB of length
+** n containing all zeros.
+*/
+void sqlite3VdbeMemSetZeroBlob(Mem *pMem, int n){
+  sqlite3VdbeMemRelease(pMem);
+  setTypeFlag(pMem, MEM_Blob);
+  pMem->flags = MEM_Blob|MEM_Zero;
+  pMem->type = SQLITE_BLOB;
+  pMem->n = 0;
+  if( n<0 ) n = 0;
+  pMem->u.i = n;
+  pMem->enc = SQLITE_UTF8;
+}
+
+/*
+** Delete any previous value and set the value stored in *pMem to val,
+** manifest type INTEGER.
+*/
+void sqlite3VdbeMemSetInt64(Mem *pMem, i64 val){
+  sqlite3VdbeMemRelease(pMem);
+  pMem->u.i = val;
+  pMem->flags = MEM_Int;
+  pMem->type = SQLITE_INTEGER;
+}
+
+/*
+** Delete any previous value and set the value stored in *pMem to val,
+** manifest type REAL.
+*/
+void sqlite3VdbeMemSetDouble(Mem *pMem, double val){
+  if( sqlite3_isnan(val) ){
+    sqlite3VdbeMemSetNull(pMem);
+  }else{
+    sqlite3VdbeMemRelease(pMem);
+    pMem->r = val;
+    pMem->flags = MEM_Real;
+    pMem->type = SQLITE_FLOAT;
+  }
+}
+
+/*
+** Return true if the Mem object contains a TEXT or BLOB that is
+** too large - whose size exceeds SQLITE_MAX_LENGTH.
+*/
+int sqlite3VdbeMemTooBig(Mem *p){
+  if( p->flags & (MEM_Str|MEM_Blob) ){
+    int n = p->n;
+    if( p->flags & MEM_Zero ){
+      n += p->u.i;
+    }
+    return n>SQLITE_MAX_LENGTH;
+  }
+  return 0;
+}
+
+/*
+** Make an shallow copy of pFrom into pTo.  Prior contents of
+** pTo are freed.  The pFrom->z field is not duplicated.  If
+** pFrom->z is used, then pTo->z points to the same thing as pFrom->z
+** and flags gets srcType (either MEM_Ephem or MEM_Static).
+*/
+void sqlite3VdbeMemShallowCopy(Mem *pTo, const Mem *pFrom, int srcType){
+  sqlite3VdbeMemRelease(pTo);
+  memcpy(pTo, pFrom, sizeof(*pFrom));
+  pTo->xDel = 0;
+  if( pTo->flags&MEM_Dyn ){
+    pTo->flags &= ~(MEM_Dyn|MEM_Static|MEM_Ephem);
+    assert( srcType==MEM_Ephem || srcType==MEM_Static );
+    pTo->flags |= srcType;
+  }
+}
+
+/*
+** Make a full copy of pFrom into pTo.  Prior contents of pTo are
+** freed before the copy is made.
+*/
+int sqlite3VdbeMemCopy(Mem *pTo, const Mem *pFrom){
+  int rc = SQLITE_OK;
+  char *zBuf = 0;
+
+  /* If cell pTo currently has a reusable buffer, save a pointer to it
+  ** in local variable zBuf. This function attempts to avoid freeing
+  ** this buffer.
+  */
+  if( pTo->flags&MEM_Dyn ){
+    if( pTo->xDel ){
+      sqlite3VdbeMemRelease(pTo);
+    }else{
+      zBuf = pTo->z;
+    }
+  }
+
+  /* Copy the contents of *pFrom to *pTo */
+  memcpy(pTo, pFrom, sizeof(*pFrom));
+
+  if( pTo->flags&(MEM_Str|MEM_Blob) && pTo->flags&MEM_Static ){
+    /* pFrom contained a pointer to a static string. In this case,
+    ** free any dynamically allocated buffer associated with pTo.
+    */
+    sqlite3_free(zBuf);
+  }else{
+    char *zData = pTo->z;
+
+    pTo->z = zBuf;
+    pTo->flags &= ~(MEM_Static|MEM_Ephem);
+    pTo->flags |= MEM_Dyn;
+    pTo->xDel = 0;
+
+    if( pTo->flags&(MEM_Str|MEM_Blob) ){
+      if( sqlite3VdbeMemGrow(pTo, pTo->n+2, 0) ){
+        pTo->n = 0;
+        rc = SQLITE_NOMEM;
+      }else{
+        memcpy(pTo->z, zData, pTo->n);
+        pTo->z[pTo->n] = '\0';
+        pTo->z[pTo->n+1] = '\0';
+        pTo->flags |= MEM_Term;
+      }
+    }
+  }
+  return rc;
+}
+
+/*
+** Transfer the contents of pFrom to pTo. Any existing value in pTo is
+** freed. If pFrom contains ephemeral data, a copy is made.
+**
+** pFrom contains an SQL NULL when this routine returns.
+*/
+void sqlite3VdbeMemMove(Mem *pTo, Mem *pFrom){
+  assert( pFrom->db==0 || sqlite3_mutex_held(pFrom->db->mutex) );
+  assert( pTo->db==0 || sqlite3_mutex_held(pTo->db->mutex) );
+  assert( pFrom->db==0 || pTo->db==0 || pFrom->db==pTo->db );
+  if( pTo->flags & MEM_Dyn ){
+    sqlite3VdbeMemRelease(pTo);
+  }
+  memcpy(pTo, pFrom, sizeof(Mem));
+  pFrom->flags = MEM_Null;
+  pFrom->xDel = 0;
+}
+
+/*
+** Change the value of a Mem to be a string or a BLOB.
+**
+** The memory management strategy depends on the value of the xDel
+** parameter. If the value passed is SQLITE_TRANSIENT, then the
+** string is copied into a (possibly existing) buffer managed by the
+** Mem structure. Otherwise, any existing buffer is freed and the
+** pointer copied.
+*/
+int sqlite3VdbeMemSetStr(
+  Mem *pMem,          /* Memory cell to set to string value */
+  const char *z,      /* String pointer */
+  int n,              /* Bytes in string, or negative */
+  u8 enc,             /* Encoding of z.  0 for BLOBs */
+  void (*xDel)(void*) /* Destructor function */
+){
+  int nByte = n;      /* New value for pMem->n */
+  int flags = 0;      /* New value for pMem->flags */
+
+  assert( pMem->db==0 || sqlite3_mutex_held(pMem->db->mutex) );
+
+  /* If z is a NULL pointer, set pMem to contain an SQL NULL. */
+  if( !z ){
+    sqlite3VdbeMemSetNull(pMem);
+    return SQLITE_OK;
+  }
+
+  flags = (enc==0?MEM_Blob:MEM_Str);
+  if( nByte<0 ){
+    assert( enc!=0 );
+    if( enc==SQLITE_UTF8 ){
+      for(nByte=0; z[nByte]; nByte++){}
+    }else{
+      for(nByte=0; z[nByte] | z[nByte+1]; nByte+=2){}
+    }
+    flags |= MEM_Term;
+  }
+
+  /* The following block sets the new values of Mem.z and Mem.xDel. It
+  ** also sets a flag in local variable "flags" to indicate the memory
+  ** management (one of MEM_Dyn or MEM_Static).
+  */
+  if( xDel==SQLITE_TRANSIENT ){
+    int nAlloc = nByte;
+    if( flags&MEM_Term ){
+      nAlloc += (enc==SQLITE_UTF8?1:2);
+    }
+    if( sqlite3VdbeMemGrow(pMem, nAlloc, 0) ){
+      return SQLITE_NOMEM;
+    }
+    memcpy(pMem->z, z, nAlloc);
+    flags |= MEM_Dyn;
+  }else{
+    sqlite3VdbeMemRelease(pMem);
+    pMem->z = (char *)z;
+    pMem->xDel = xDel;
+    flags |= ((xDel==SQLITE_STATIC)?MEM_Static:MEM_Dyn);
+  }
+
+  pMem->n = nByte;
+  pMem->flags = flags;
+  pMem->enc = (enc==0 ? SQLITE_UTF8 : enc);
+  pMem->type = (enc==0 ? SQLITE_BLOB : SQLITE_TEXT);
+
+#ifndef SQLITE_OMIT_UTF16
+  if( pMem->enc!=SQLITE_UTF8 && sqlite3VdbeMemHandleBom(pMem) ){
+    return SQLITE_NOMEM;
+  }
+#endif
+
+  return SQLITE_OK;
+}
+
+/*
+** Compare the values contained by the two memory cells, returning
+** negative, zero or positive if pMem1 is less than, equal to, or greater
+** than pMem2. Sorting order is NULL's first, followed by numbers (integers
+** and reals) sorted numerically, followed by text ordered by the collating
+** sequence pColl and finally blob's ordered by memcmp().
+**
+** Two NULL values are considered equal by this function.
+*/
+int sqlite3MemCompare(const Mem *pMem1, const Mem *pMem2, const CollSeq *pColl){
+  int rc;
+  int f1, f2;
+  int combined_flags;
+
+  /* Interchange pMem1 and pMem2 if the collating sequence specifies
+  ** DESC order.
+  */
+  f1 = pMem1->flags;
+  f2 = pMem2->flags;
+  combined_flags = f1|f2;
+
+  /* If one value is NULL, it is less than the other. If both values
+  ** are NULL, return 0.
+  */
+  if( combined_flags&MEM_Null ){
+    return (f2&MEM_Null) - (f1&MEM_Null);
+  }
+
+  /* If one value is a number and the other is not, the number is less.
+  ** If both are numbers, compare as reals if one is a real, or as integers
+  ** if both values are integers.
+  */
+  if( combined_flags&(MEM_Int|MEM_Real) ){
+    if( !(f1&(MEM_Int|MEM_Real)) ){
+      return 1;
+    }
+    if( !(f2&(MEM_Int|MEM_Real)) ){
+      return -1;
+    }
+    if( (f1 & f2 & MEM_Int)==0 ){
+      double r1, r2;
+      if( (f1&MEM_Real)==0 ){
+        r1 = pMem1->u.i;
+      }else{
+        r1 = pMem1->r;
+      }
+      if( (f2&MEM_Real)==0 ){
+        r2 = pMem2->u.i;
+      }else{
+        r2 = pMem2->r;
+      }
+      if( r1<r2 ) return -1;
+      if( r1>r2 ) return 1;
+      return 0;
+    }else{
+      assert( f1&MEM_Int );
+      assert( f2&MEM_Int );
+      if( pMem1->u.i < pMem2->u.i ) return -1;
+      if( pMem1->u.i > pMem2->u.i ) return 1;
+      return 0;
+    }
+  }
+
+  /* If one value is a string and the other is a blob, the string is less.
+  ** If both are strings, compare using the collating functions.
+  */
+  if( combined_flags&MEM_Str ){
+    if( (f1 & MEM_Str)==0 ){
+      return 1;
+    }
+    if( (f2 & MEM_Str)==0 ){
+      return -1;
+    }
+
+    assert( pMem1->enc==pMem2->enc );
+    assert( pMem1->enc==SQLITE_UTF8 ||
+            pMem1->enc==SQLITE_UTF16LE || pMem1->enc==SQLITE_UTF16BE );
+
+    /* The collation sequence must be defined at this point, even if
+    ** the user deletes the collation sequence after the vdbe program is
+    ** compiled (this was not always the case).
+    */
+    assert( !pColl || pColl->xCmp );
+
+    if( pColl ){
+      if( pMem1->enc==pColl->enc ){
+        /* The strings are already in the correct encoding.  Call the
+        ** comparison function directly */
+        return pColl->xCmp(pColl->pUser,pMem1->n,pMem1->z,pMem2->n,pMem2->z);
+      }else{
+        u8 origEnc = pMem1->enc;
+        const void *v1, *v2;
+        int n1, n2;
+        /* Convert the strings into the encoding that the comparison
+        ** function expects */
+        v1 = sqlite3ValueText((sqlite3_value*)pMem1, pColl->enc);
+        n1 = v1==0 ? 0 : pMem1->n;
+        assert( n1==sqlite3ValueBytes((sqlite3_value*)pMem1, pColl->enc) );
+        v2 = sqlite3ValueText((sqlite3_value*)pMem2, pColl->enc);
+        n2 = v2==0 ? 0 : pMem2->n;
+        assert( n2==sqlite3ValueBytes((sqlite3_value*)pMem2, pColl->enc) );
+        /* Do the comparison */
+        rc = pColl->xCmp(pColl->pUser, n1, v1, n2, v2);
+        /* Convert the strings back into the database encoding */
+        sqlite3ValueText((sqlite3_value*)pMem1, origEnc);
+        sqlite3ValueText((sqlite3_value*)pMem2, origEnc);
+        return rc;
+      }
+    }
+    /* If a NULL pointer was passed as the collate function, fall through
+    ** to the blob case and use memcmp().  */
+  }
+
+  /* Both values must be blobs.  Compare using memcmp().  */
+  rc = memcmp(pMem1->z, pMem2->z, (pMem1->n>pMem2->n)?pMem2->n:pMem1->n);
+  if( rc==0 ){
+    rc = pMem1->n - pMem2->n;
+  }
+  return rc;
+}
+
+/*
+** Move data out of a btree key or data field and into a Mem structure.
+** The data or key is taken from the entry that pCur is currently pointing
+** to.  offset and amt determine what portion of the data or key to retrieve.
+** key is true to get the key or false to get data.  The result is written
+** into the pMem element.
+**
+** The pMem structure is assumed to be uninitialized.  Any prior content
+** is overwritten without being freed.
+**
+** If this routine fails for any reason (malloc returns NULL or unable
+** to read from the disk) then the pMem is left in an inconsistent state.
+*/
+int sqlite3VdbeMemFromBtree(
+  BtCursor *pCur,   /* Cursor pointing at record to retrieve. */
+  int offset,       /* Offset from the start of data to return bytes from. */
+  int amt,          /* Number of bytes to return. */
+  int key,          /* If true, retrieve from the btree key, not data. */
+  Mem *pMem         /* OUT: Return data in this Mem structure. */
+){
+  char *zData;       /* Data from the btree layer */
+  int available = 0; /* Number of bytes available on the local btree page */
+  sqlite3 *db;       /* Database connection */
+  int rc = SQLITE_OK;
+
+  db = sqlite3BtreeCursorDb(pCur);
+  assert( sqlite3_mutex_held(db->mutex) );
+  if( key ){
+    zData = (char *)sqlite3BtreeKeyFetch(pCur, &available);
+  }else{
+    zData = (char *)sqlite3BtreeDataFetch(pCur, &available);
+  }
+  assert( zData!=0 );
+
+  if( offset+amt<=available && ((pMem->flags&MEM_Dyn)==0 || pMem->xDel) ){
+    sqlite3VdbeMemRelease(pMem);
+    pMem->z = &zData[offset];
+    pMem->flags = MEM_Blob|MEM_Ephem;
+  }else if( SQLITE_OK==(rc = sqlite3VdbeMemGrow(pMem, amt+2, 0)) ){
+    pMem->flags = MEM_Blob|MEM_Dyn|MEM_Term;
+    pMem->enc = 0;
+    pMem->type = SQLITE_BLOB;
+    if( key ){
+      rc = sqlite3BtreeKey(pCur, offset, amt, pMem->z);
+    }else{
+      rc = sqlite3BtreeData(pCur, offset, amt, pMem->z);
+    }
+    pMem->z[amt] = 0;
+    pMem->z[amt+1] = 0;
+    if( rc!=SQLITE_OK ){
+      sqlite3VdbeMemRelease(pMem);
+    }
+  }
+  pMem->n = amt;
+
+  return rc;
+}
+
+#if 0
+/*
+** Perform various checks on the memory cell pMem. An assert() will
+** fail if pMem is internally inconsistent.
+*/
+void sqlite3VdbeMemSanity(Mem *pMem){
+  int flags = pMem->flags;
+  assert( flags!=0 );  /* Must define some type */
+  if( flags & (MEM_Str|MEM_Blob) ){
+    int x = flags & (MEM_Static|MEM_Dyn|MEM_Ephem|MEM_Short);
+    assert( x!=0 );            /* Strings must define a string subtype */
+    assert( (x & (x-1))==0 );  /* Only one string subtype can be defined */
+    assert( pMem->z!=0 );      /* Strings must have a value */
+    /* Mem.z points to Mem.zShort iff the subtype is MEM_Short */
+    assert( (x & MEM_Short)==0 || pMem->z==pMem->zShort );
+    assert( (x & MEM_Short)!=0 || pMem->z!=pMem->zShort );
+    /* No destructor unless there is MEM_Dyn */
+    assert( pMem->xDel==0 || (pMem->flags & MEM_Dyn)!=0 );
+
+    if( (flags & MEM_Str) ){
+      assert( pMem->enc==SQLITE_UTF8 ||
+              pMem->enc==SQLITE_UTF16BE ||
+              pMem->enc==SQLITE_UTF16LE
+      );
+      /* If the string is UTF-8 encoded and nul terminated, then pMem->n
+      ** must be the length of the string.  (Later:)  If the database file
+      ** has been corrupted, '\000' characters might have been inserted
+      ** into the middle of the string.  In that case, the strlen() might
+      ** be less.
+      */
+      if( pMem->enc==SQLITE_UTF8 && (flags & MEM_Term) ){
+        assert( strlen(pMem->z)<=pMem->n );
+        assert( pMem->z[pMem->n]==0 );
+      }
+    }
+  }else{
+    /* Cannot define a string subtype for non-string objects */
+    assert( (pMem->flags & (MEM_Static|MEM_Dyn|MEM_Ephem|MEM_Short))==0 );
+    assert( pMem->xDel==0 );
+  }
+  /* MEM_Null excludes all other types */
+  assert( (pMem->flags&(MEM_Str|MEM_Int|MEM_Real|MEM_Blob))==0
+          || (pMem->flags&MEM_Null)==0 );
+  /* If the MEM is both real and integer, the values are equal */
+  assert( (pMem->flags & (MEM_Int|MEM_Real))!=(MEM_Int|MEM_Real)
+          || pMem->r==pMem->u.i );
+}
+#endif
+
+/* This function is only available internally, it is not part of the
+** external API. It works in a similar way to sqlite3_value_text(),
+** except the data returned is in the encoding specified by the second
+** parameter, which must be one of SQLITE_UTF16BE, SQLITE_UTF16LE or
+** SQLITE_UTF8.
+**
+** (2006-02-16:)  The enc value can be or-ed with SQLITE_UTF16_ALIGNED.
+** If that is the case, then the result must be aligned on an even byte
+** boundary.
+*/
+const void *sqlite3ValueText(sqlite3_value* pVal, u8 enc){
+  if( !pVal ) return 0;
+
+  assert( pVal->db==0 || sqlite3_mutex_held(pVal->db->mutex) );
+  assert( (enc&3)==(enc&~SQLITE_UTF16_ALIGNED) );
+
+  if( pVal->flags&MEM_Null ){
+    return 0;
+  }
+  assert( (MEM_Blob>>3) == MEM_Str );
+  pVal->flags |= (pVal->flags & MEM_Blob)>>3;
+  expandBlob(pVal);
+  if( pVal->flags&MEM_Str ){
+    sqlite3VdbeChangeEncoding(pVal, enc & ~SQLITE_UTF16_ALIGNED);
+    if( (enc & SQLITE_UTF16_ALIGNED)!=0 && 1==(1&(sqlite3_intptr_t)pVal->z) ){
+      assert( (pVal->flags & (MEM_Ephem|MEM_Static))!=0 );
+      if( sqlite3VdbeMemMakeWriteable(pVal)!=SQLITE_OK ){
+        return 0;
+      }
+    }
+    sqlite3VdbeMemNulTerminate(pVal);
+  }else{
+    assert( (pVal->flags&MEM_Blob)==0 );
+    sqlite3VdbeMemStringify(pVal, enc);
+    assert( 0==(1&(sqlite3_intptr_t)pVal->z) );
+  }
+  assert(pVal->enc==(enc & ~SQLITE_UTF16_ALIGNED) || pVal->db==0
+              || pVal->db->mallocFailed );
+  if( pVal->enc==(enc & ~SQLITE_UTF16_ALIGNED) ){
+    return pVal->z;
+  }else{
+    return 0;
+  }
+}
+
+/*
+** Create a new sqlite3_value object.
+*/
+sqlite3_value *sqlite3ValueNew(sqlite3 *db){
+  Mem *p = sqlite3DbMallocZero(db, sizeof(*p));
+  if( p ){
+    p->flags = MEM_Null;
+    p->type = SQLITE_NULL;
+    p->db = db;
+  }
+  return p;
+}
+
+/*
+** Create a new sqlite3_value object, containing the value of pExpr.
+**
+** This only works for very simple expressions that consist of one constant
+** token (i.e. "5", "5.1", "'a string'"). If the expression can
+** be converted directly into a value, then the value is allocated and
+** a pointer written to *ppVal. The caller is responsible for deallocating
+** the value by passing it to sqlite3ValueFree() later on. If the expression
+** cannot be converted to a value, then *ppVal is set to NULL.
+*/
+int sqlite3ValueFromExpr(
+  sqlite3 *db,              /* The database connection */
+  Expr *pExpr,              /* The expression to evaluate */
+  u8 enc,                   /* Encoding to use */
+  u8 affinity,              /* Affinity to use */
+  sqlite3_value **ppVal     /* Write the new value here */
+){
+  int op;
+  char *zVal = 0;
+  sqlite3_value *pVal = 0;
+
+  if( !pExpr ){
+    *ppVal = 0;
+    return SQLITE_OK;
+  }
+  op = pExpr->op;
+
+  if( op==TK_STRING || op==TK_FLOAT || op==TK_INTEGER ){
+    zVal = sqlite3StrNDup((char*)pExpr->token.z, pExpr->token.n);
+    pVal = sqlite3ValueNew(db);
+    if( !zVal || !pVal ) goto no_mem;
+    sqlite3Dequote(zVal);
+    sqlite3ValueSetStr(pVal, -1, zVal, SQLITE_UTF8, sqlite3_free);
+    if( (op==TK_INTEGER || op==TK_FLOAT ) && affinity==SQLITE_AFF_NONE ){
+      sqlite3ValueApplyAffinity(pVal, SQLITE_AFF_NUMERIC, enc);
+    }else{
+      sqlite3ValueApplyAffinity(pVal, affinity, enc);
+    }
+  }else if( op==TK_UMINUS ) {
+    if( SQLITE_OK==sqlite3ValueFromExpr(db,pExpr->pLeft,enc,affinity,&pVal) ){
+      pVal->u.i = -1 * pVal->u.i;
+      pVal->r = -1.0 * pVal->r;
+    }
+  }
+#ifndef SQLITE_OMIT_BLOB_LITERAL
+  else if( op==TK_BLOB ){
+    int nVal;
+    assert( pExpr->token.n>=3 );
+    assert( pExpr->token.z[0]=='x' || pExpr->token.z[0]=='X' );
+    assert( pExpr->token.z[1]=='\'' );
+    assert( pExpr->token.z[pExpr->token.n-1]=='\'' );
+    pVal = sqlite3ValueNew(db);
+    nVal = pExpr->token.n - 3;
+    zVal = (char*)pExpr->token.z + 2;
+    sqlite3VdbeMemSetStr(pVal, sqlite3HexToBlob(db, zVal, nVal), nVal/2,
+                         0, sqlite3_free);
+  }
+#endif
+
+  *ppVal = pVal;
+  return SQLITE_OK;
+
+no_mem:
+  db->mallocFailed = 1;
+  sqlite3_free(zVal);
+  sqlite3ValueFree(pVal);
+  *ppVal = 0;
+  return SQLITE_NOMEM;
+}
+
+/*
+** Change the string value of an sqlite3_value object
+*/
+void sqlite3ValueSetStr(
+  sqlite3_value *v,     /* Value to be set */
+  int n,                /* Length of string z */
+  const void *z,        /* Text of the new string */
+  u8 enc,               /* Encoding to use */
+  void (*xDel)(void*)   /* Destructor for the string */
+){
+  if( v ) sqlite3VdbeMemSetStr((Mem *)v, z, n, enc, xDel);
+}
+
+/*
+** Free an sqlite3_value object
+*/
+void sqlite3ValueFree(sqlite3_value *v){
+  if( !v ) return;
+  sqlite3VdbeMemRelease((Mem *)v);
+  sqlite3_free(v);
+}
+
+/*
+** Return the number of bytes in the sqlite3_value object assuming
+** that it uses the encoding "enc"
+*/
+int sqlite3ValueBytes(sqlite3_value *pVal, u8 enc){
+  Mem *p = (Mem*)pVal;
+  if( (p->flags & MEM_Blob)!=0 || sqlite3ValueText(pVal, enc) ){
+    if( p->flags & MEM_Zero ){
+      return p->n+p->u.i;
+    }else{
+      return p->n;
+    }
+  }
+  return 0;
+}
diff --git a/uppsrc/plugin/sqlite3/lib/vtab.c b/uppsrc/plugin/sqlite3/lib/vtab.c
new file mode 100644
index 000000000..1b9ff0492
--- /dev/null
+++ b/uppsrc/plugin/sqlite3/lib/vtab.c
@@ -0,0 +1,798 @@
+/*
+** 2006 June 10
+**
+** The author disclaims copyright to this source code.  In place of
+** a legal notice, here is a blessing:
+**
+**    May you do good and not evil.
+**    May you find forgiveness for yourself and forgive others.
+**    May you share freely, never taking more than you give.
+**
+*************************************************************************
+** This file contains code used to help implement virtual tables.
+**
+** $Id: vtab.c,v 1.65 2008/03/06 09:58:50 mlcreech Exp $
+*/
+#ifndef SQLITE_OMIT_VIRTUALTABLE
+#include "sqliteInt.h"
+
+static int createModule(
+  sqlite3 *db,                    /* Database in which module is registered */
+  const char *zName,              /* Name assigned to this module */
+  const sqlite3_module *pModule,  /* The definition of the module */
+  void *pAux,                     /* Context pointer for xCreate/xConnect */
+  void (*xDestroy)(void *)        /* Module destructor function */
+) {
+  int rc, nName;
+  Module *pMod;
+
+  sqlite3_mutex_enter(db->mutex);
+  nName = strlen(zName);
+  pMod = (Module *)sqlite3DbMallocRaw(db, sizeof(Module) + nName + 1);
+  if( pMod ){
+    char *zCopy = (char *)(&pMod[1]);
+    memcpy(zCopy, zName, nName+1);
+    pMod->zName = zCopy;
+    pMod->pModule = pModule;
+    pMod->pAux = pAux;
+    pMod->xDestroy = xDestroy;
+    pMod = (Module *)sqlite3HashInsert(&db->aModule, zCopy, nName, (void*)pMod);
+    if( pMod && pMod->xDestroy ){
+      pMod->xDestroy(pMod->pAux);
+    }
+    sqlite3_free(pMod);
+    sqlite3ResetInternalSchema(db, 0);
+  }
+  rc = sqlite3ApiExit(db, SQLITE_OK);
+  sqlite3_mutex_leave(db->mutex);
+  return rc;
+}
+
+
+/*
+** External API function used to create a new virtual-table module.
+*/
+int sqlite3_create_module(
+  sqlite3 *db,                    /* Database in which module is registered */
+  const char *zName,              /* Name assigned to this module */
+  const sqlite3_module *pModule,  /* The definition of the module */
+  void *pAux                      /* Context pointer for xCreate/xConnect */
+){
+  return createModule(db, zName, pModule, pAux, 0);
+}
+
+/*
+** External API function used to create a new virtual-table module.
+*/
+int sqlite3_create_module_v2(
+  sqlite3 *db,                    /* Database in which module is registered */
+  const char *zName,              /* Name assigned to this module */
+  const sqlite3_module *pModule,  /* The definition of the module */
+  void *pAux,                     /* Context pointer for xCreate/xConnect */
+  void (*xDestroy)(void *)        /* Module destructor function */
+){
+  return createModule(db, zName, pModule, pAux, xDestroy);
+}
+
+/*
+** Lock the virtual table so that it cannot be disconnected.
+** Locks nest.  Every lock should have a corresponding unlock.
+** If an unlock is omitted, resources leaks will occur.
+**
+** If a disconnect is attempted while a virtual table is locked,
+** the disconnect is deferred until all locks have been removed.
+*/
+void sqlite3VtabLock(sqlite3_vtab *pVtab){
+  pVtab->nRef++;
+}
+
+/*
+** Unlock a virtual table.  When the last lock is removed,
+** disconnect the virtual table.
+*/
+void sqlite3VtabUnlock(sqlite3 *db, sqlite3_vtab *pVtab){
+  pVtab->nRef--;
+  assert(db);
+  assert( sqlite3SafetyCheckOk(db) );
+  if( pVtab->nRef==0 ){
+    if( db->magic==SQLITE_MAGIC_BUSY ){
+      (void)sqlite3SafetyOff(db);
+      pVtab->pModule->xDisconnect(pVtab);
+      (void)sqlite3SafetyOn(db);
+    } else {
+      pVtab->pModule->xDisconnect(pVtab);
+    }
+  }
+}
+
+/*
+** Clear any and all virtual-table information from the Table record.
+** This routine is called, for example, just before deleting the Table
+** record.
+*/
+void sqlite3VtabClear(Table *p){
+  sqlite3_vtab *pVtab = p->pVtab;
+  if( pVtab ){
+    assert( p->pMod && p->pMod->pModule );
+    sqlite3VtabUnlock(p->pSchema->db, pVtab);
+    p->pVtab = 0;
+  }
+  if( p->azModuleArg ){
+    int i;
+    for(i=0; i<p->nModuleArg; i++){
+      sqlite3_free(p->azModuleArg[i]);
+    }
+    sqlite3_free(p->azModuleArg);
+  }
+}
+
+/*
+** Add a new module argument to pTable->azModuleArg[].
+** The string is not copied - the pointer is stored.  The
+** string will be freed automatically when the table is
+** deleted.
+*/
+static void addModuleArgument(sqlite3 *db, Table *pTable, char *zArg){
+  int i = pTable->nModuleArg++;
+  int nBytes = sizeof(char *)*(1+pTable->nModuleArg);
+  char **azModuleArg;
+  azModuleArg = sqlite3DbRealloc(db, pTable->azModuleArg, nBytes);
+  if( azModuleArg==0 ){
+    int j;
+    for(j=0; j<i; j++){
+      sqlite3_free(pTable->azModuleArg[j]);
+    }
+    sqlite3_free(zArg);
+    sqlite3_free(pTable->azModuleArg);
+    pTable->nModuleArg = 0;
+  }else{
+    azModuleArg[i] = zArg;
+    azModuleArg[i+1] = 0;
+  }
+  pTable->azModuleArg = azModuleArg;
+}
+
+/*
+** The parser calls this routine when it first sees a CREATE VIRTUAL TABLE
+** statement.  The module name has been parsed, but the optional list
+** of parameters that follow the module name are still pending.
+*/
+void sqlite3VtabBeginParse(
+  Parse *pParse,        /* Parsing context */
+  Token *pName1,        /* Name of new table, or database name */
+  Token *pName2,        /* Name of new table or NULL */
+  Token *pModuleName    /* Name of the module for the virtual table */
+){
+  int iDb;              /* The database the table is being created in */
+  Table *pTable;        /* The new virtual table */
+  sqlite3 *db;          /* Database connection */
+
+  if( pParse->db->flags & SQLITE_SharedCache ){
+    sqlite3ErrorMsg(pParse, "Cannot use virtual tables in shared-cache mode");
+    return;
+  }
+
+  sqlite3StartTable(pParse, pName1, pName2, 0, 0, 1, 0);
+  pTable = pParse->pNewTable;
+  if( pTable==0 || pParse->nErr ) return;
+  assert( 0==pTable->pIndex );
+
+  db = pParse->db;
+  iDb = sqlite3SchemaToIndex(db, pTable->pSchema);
+  assert( iDb>=0 );
+
+  pTable->isVirtual = 1;
+  pTable->nModuleArg = 0;
+  addModuleArgument(db, pTable, sqlite3NameFromToken(db, pModuleName));
+  addModuleArgument(db, pTable, sqlite3DbStrDup(db, db->aDb[iDb].zName));
+  addModuleArgument(db, pTable, sqlite3DbStrDup(db, pTable->zName));
+  pParse->sNameToken.n = pModuleName->z + pModuleName->n - pName1->z;
+
+#ifndef SQLITE_OMIT_AUTHORIZATION
+  /* Creating a virtual table invokes the authorization callback twice.
+  ** The first invocation, to obtain permission to INSERT a row into the
+  ** sqlite_master table, has already been made by sqlite3StartTable().
+  ** The second call, to obtain permission to create the table, is made now.
+  */
+  if( pTable->azModuleArg ){
+    sqlite3AuthCheck(pParse, SQLITE_CREATE_VTABLE, pTable->zName,
+            pTable->azModuleArg[0], pParse->db->aDb[iDb].zName);
+  }
+#endif
+}
+
+/*
+** This routine takes the module argument that has been accumulating
+** in pParse->zArg[] and appends it to the list of arguments on the
+** virtual table currently under construction in pParse->pTable.
+*/
+static void addArgumentToVtab(Parse *pParse){
+  if( pParse->sArg.z && pParse->pNewTable ){
+    const char *z = (const char*)pParse->sArg.z;
+    int n = pParse->sArg.n;
+    sqlite3 *db = pParse->db;
+    addModuleArgument(db, pParse->pNewTable, sqlite3DbStrNDup(db, z, n));
+  }
+}
+
+/*
+** The parser calls this routine after the CREATE VIRTUAL TABLE statement
+** has been completely parsed.
+*/
+void sqlite3VtabFinishParse(Parse *pParse, Token *pEnd){
+  Table *pTab;        /* The table being constructed */
+  sqlite3 *db;        /* The database connection */
+  char *zModule;      /* The module name of the table: USING modulename */
+  Module *pMod = 0;
+
+  addArgumentToVtab(pParse);
+  pParse->sArg.z = 0;
+
+  /* Lookup the module name. */
+  pTab = pParse->pNewTable;
+  if( pTab==0 ) return;
+  db = pParse->db;
+  if( pTab->nModuleArg<1 ) return;
+  zModule = pTab->azModuleArg[0];
+  pMod = (Module *)sqlite3HashFind(&db->aModule, zModule, strlen(zModule));
+  pTab->pMod = pMod;
+
+  /* If the CREATE VIRTUAL TABLE statement is being entered for the
+  ** first time (in other words if the virtual table is actually being
+  ** created now instead of just being read out of sqlite_master) then
+  ** do additional initialization work and store the statement text
+  ** in the sqlite_master table.
+  */
+  if( !db->init.busy ){
+    char *zStmt;
+    char *zWhere;
+    int iDb;
+    Vdbe *v;
+
+    /* Compute the complete text of the CREATE VIRTUAL TABLE statement */
+    if( pEnd ){
+      pParse->sNameToken.n = pEnd->z - pParse->sNameToken.z + pEnd->n;
+    }
+    zStmt = sqlite3MPrintf(db, "CREATE VIRTUAL TABLE %T", &pParse->sNameToken);
+
+    /* A slot for the record has already been allocated in the
+    ** SQLITE_MASTER table.  We just need to update that slot with all
+    ** the information we've collected.
+    **
+    ** The VM register number pParse->regRowid holds the rowid of an
+    ** entry in the sqlite_master table tht was created for this vtab
+    ** by sqlite3StartTable().
+    */
+    iDb = sqlite3SchemaToIndex(db, pTab->pSchema);
+    sqlite3NestedParse(pParse,
+      "UPDATE %Q.%s "
+         "SET type='table', name=%Q, tbl_name=%Q, rootpage=0, sql=%Q "
+       "WHERE rowid=#%d",
+      db->aDb[iDb].zName, SCHEMA_TABLE(iDb),
+      pTab->zName,
+      pTab->zName,
+      zStmt,
+      pParse->regRowid
+    );
+    sqlite3_free(zStmt);
+    v = sqlite3GetVdbe(pParse);
+    sqlite3ChangeCookie(pParse, iDb);
+
+    sqlite3VdbeAddOp2(v, OP_Expire, 0, 0);
+    zWhere = sqlite3MPrintf(db, "name='%q'", pTab->zName);
+    sqlite3VdbeAddOp4(v, OP_ParseSchema, iDb, 1, 0, zWhere, P4_DYNAMIC);
+    sqlite3VdbeAddOp4(v, OP_VCreate, iDb, 0, 0,
+                         pTab->zName, strlen(pTab->zName) + 1);
+  }
+
+  /* If we are rereading the sqlite_master table create the in-memory
+  ** record of the table. If the module has already been registered,
+  ** also call the xConnect method here.
+  */
+  else {
+    Table *pOld;
+    Schema *pSchema = pTab->pSchema;
+    const char *zName = pTab->zName;
+    int nName = strlen(zName) + 1;
+    pOld = sqlite3HashInsert(&pSchema->tblHash, zName, nName, pTab);
+    if( pOld ){
+      db->mallocFailed = 1;
+      assert( pTab==pOld );  /* Malloc must have failed inside HashInsert() */
+      return;
+    }
+    pSchema->db = pParse->db;
+    pParse->pNewTable = 0;
+  }
+}
+
+/*
+** The parser calls this routine when it sees the first token
+** of an argument to the module name in a CREATE VIRTUAL TABLE statement.
+*/
+void sqlite3VtabArgInit(Parse *pParse){
+  addArgumentToVtab(pParse);
+  pParse->sArg.z = 0;
+  pParse->sArg.n = 0;
+}
+
+/*
+** The parser calls this routine for each token after the first token
+** in an argument to the module name in a CREATE VIRTUAL TABLE statement.
+*/
+void sqlite3VtabArgExtend(Parse *pParse, Token *p){
+  Token *pArg = &pParse->sArg;
+  if( pArg->z==0 ){
+    pArg->z = p->z;
+    pArg->n = p->n;
+  }else{
+    assert(pArg->z < p->z);
+    pArg->n = (p->z + p->n - pArg->z);
+  }
+}
+
+/*
+** Invoke a virtual table constructor (either xCreate or xConnect). The
+** pointer to the function to invoke is passed as the fourth parameter
+** to this procedure.
+*/
+static int vtabCallConstructor(
+  sqlite3 *db,
+  Table *pTab,
+  Module *pMod,
+  int (*xConstruct)(sqlite3*,void*,int,const char*const*,sqlite3_vtab**,char**),
+  char **pzErr
+){
+  int rc;
+  int rc2;
+  sqlite3_vtab *pVtab = 0;
+  const char *const*azArg = (const char *const*)pTab->azModuleArg;
+  int nArg = pTab->nModuleArg;
+  char *zErr = 0;
+  char *zModuleName = sqlite3MPrintf(db, "%s", pTab->zName);
+
+  if( !zModuleName ){
+    return SQLITE_NOMEM;
+  }
+
+  assert( !db->pVTab );
+  assert( xConstruct );
+
+  db->pVTab = pTab;
+  rc = sqlite3SafetyOff(db);
+  assert( rc==SQLITE_OK );
+  rc = xConstruct(db, pMod->pAux, nArg, azArg, &pVtab, &zErr);
+  rc2 = sqlite3SafetyOn(db);
+  if( rc==SQLITE_OK && pVtab ){
+    pVtab->pModule = pMod->pModule;
+    pVtab->nRef = 1;
+    pTab->pVtab = pVtab;
+  }
+
+  if( SQLITE_OK!=rc ){
+    if( zErr==0 ){
+      *pzErr = sqlite3MPrintf(db, "vtable constructor failed: %s", zModuleName);
+    }else {
+      *pzErr = sqlite3MPrintf(db, "%s", zErr);
+      sqlite3_free(zErr);
+    }
+  }else if( db->pVTab ){
+    const char *zFormat = "vtable constructor did not declare schema: %s";
+    *pzErr = sqlite3MPrintf(db, zFormat, pTab->zName);
+    rc = SQLITE_ERROR;
+  }
+  if( rc==SQLITE_OK ){
+    rc = rc2;
+  }
+  db->pVTab = 0;
+  sqlite3_free(zModuleName);
+
+  /* If everything went according to plan, loop through the columns
+  ** of the table to see if any of them contain the token "hidden".
+  ** If so, set the Column.isHidden flag and remove the token from
+  ** the type string.
+  */
+  if( rc==SQLITE_OK ){
+    int iCol;
+    for(iCol=0; iCol<pTab->nCol; iCol++){
+      char *zType = pTab->aCol[iCol].zType;
+      int nType;
+      int i = 0;
+      if( !zType ) continue;
+      nType = strlen(zType);
+      if( sqlite3StrNICmp("hidden", zType, 6) || (zType[6] && zType[6]!=' ') ){
+        for(i=0; i<nType; i++){
+          if( (0==sqlite3StrNICmp(" hidden", &zType[i], 7))
+           && (zType[i+7]=='\0' || zType[i+7]==' ')
+          ){
+            i++;
+            break;
+          }
+        }
+      }
+      if( i<nType ){
+        int j;
+        int nDel = 6 + (zType[i+6] ? 1 : 0);
+        for(j=i; (j+nDel)<=nType; j++){
+          zType[j] = zType[j+nDel];
+        }
+        if( zType[i]=='\0' && i>0 ){
+          assert(zType[i-1]==' ');
+          zType[i-1] = '\0';
+        }
+        pTab->aCol[iCol].isHidden = 1;
+      }
+    }
+  }
+  return rc;
+}
+
+/*
+** This function is invoked by the parser to call the xConnect() method
+** of the virtual table pTab. If an error occurs, an error code is returned
+** and an error left in pParse.
+**
+** This call is a no-op if table pTab is not a virtual table.
+*/
+int sqlite3VtabCallConnect(Parse *pParse, Table *pTab){
+  Module *pMod;
+  int rc = SQLITE_OK;
+
+  if( !pTab || !pTab->isVirtual || pTab->pVtab ){
+    return SQLITE_OK;
+  }
+
+  pMod = pTab->pMod;
+  if( !pMod ){
+    const char *zModule = pTab->azModuleArg[0];
+    sqlite3ErrorMsg(pParse, "no such module: %s", zModule);
+    rc = SQLITE_ERROR;
+  } else {
+    char *zErr = 0;
+    sqlite3 *db = pParse->db;
+    rc = vtabCallConstructor(db, pTab, pMod, pMod->pModule->xConnect, &zErr);
+    if( rc!=SQLITE_OK ){
+      sqlite3ErrorMsg(pParse, "%s", zErr);
+    }
+    sqlite3_free(zErr);
+  }
+
+  return rc;
+}
+
+/*
+** Add the virtual table pVtab to the array sqlite3.aVTrans[].
+*/
+static int addToVTrans(sqlite3 *db, sqlite3_vtab *pVtab){
+  const int ARRAY_INCR = 5;
+
+  /* Grow the sqlite3.aVTrans array if required */
+  if( (db->nVTrans%ARRAY_INCR)==0 ){
+    sqlite3_vtab **aVTrans;
+    int nBytes = sizeof(sqlite3_vtab *) * (db->nVTrans + ARRAY_INCR);
+    aVTrans = sqlite3DbRealloc(db, (void *)db->aVTrans, nBytes);
+    if( !aVTrans ){
+      return SQLITE_NOMEM;
+    }
+    memset(&aVTrans[db->nVTrans], 0, sizeof(sqlite3_vtab *)*ARRAY_INCR);
+    db->aVTrans = aVTrans;
+  }
+
+  /* Add pVtab to the end of sqlite3.aVTrans */
+  db->aVTrans[db->nVTrans++] = pVtab;
+  sqlite3VtabLock(pVtab);
+  return SQLITE_OK;
+}
+
+/*
+** This function is invoked by the vdbe to call the xCreate method
+** of the virtual table named zTab in database iDb.
+**
+** If an error occurs, *pzErr is set to point an an English language
+** description of the error and an SQLITE_XXX error code is returned.
+** In this case the caller must call sqlite3_free() on *pzErr.
+*/
+int sqlite3VtabCallCreate(sqlite3 *db, int iDb, const char *zTab, char **pzErr){
+  int rc = SQLITE_OK;
+  Table *pTab;
+  Module *pMod;
+  const char *zModule;
+
+  pTab = sqlite3FindTable(db, zTab, db->aDb[iDb].zName);
+  assert(pTab && pTab->isVirtual && !pTab->pVtab);
+  pMod = pTab->pMod;
+  zModule = pTab->azModuleArg[0];
+
+  /* If the module has been registered and includes a Create method,
+  ** invoke it now. If the module has not been registered, return an
+  ** error. Otherwise, do nothing.
+  */
+  if( !pMod ){
+    *pzErr = sqlite3MPrintf(db, "no such module: %s", zModule);
+    rc = SQLITE_ERROR;
+  }else{
+    rc = vtabCallConstructor(db, pTab, pMod, pMod->pModule->xCreate, pzErr);
+  }
+
+  if( rc==SQLITE_OK && pTab->pVtab ){
+      rc = addToVTrans(db, pTab->pVtab);
+  }
+
+  return rc;
+}
+
+/*
+** This function is used to set the schema of a virtual table.  It is only
+** valid to call this function from within the xCreate() or xConnect() of a
+** virtual table module.
+*/
+int sqlite3_declare_vtab(sqlite3 *db, const char *zCreateTable){
+  Parse sParse;
+
+  int rc = SQLITE_OK;
+  Table *pTab;
+  char *zErr = 0;
+
+  sqlite3_mutex_enter(db->mutex);
+  pTab = db->pVTab;
+  if( !pTab ){
+    sqlite3Error(db, SQLITE_MISUSE, 0);
+    sqlite3_mutex_leave(db->mutex);
+    return SQLITE_MISUSE;
+  }
+  assert(pTab->isVirtual && pTab->nCol==0 && pTab->aCol==0);
+
+  memset(&sParse, 0, sizeof(Parse));
+  sParse.declareVtab = 1;
+  sParse.db = db;
+
+  if(
+      SQLITE_OK == sqlite3RunParser(&sParse, zCreateTable, &zErr) &&
+      sParse.pNewTable &&
+      !sParse.pNewTable->pSelect &&
+      !sParse.pNewTable->isVirtual
+  ){
+    pTab->aCol = sParse.pNewTable->aCol;
+    pTab->nCol = sParse.pNewTable->nCol;
+    sParse.pNewTable->nCol = 0;
+    sParse.pNewTable->aCol = 0;
+    db->pVTab = 0;
+  } else {
+    sqlite3Error(db, SQLITE_ERROR, zErr);
+    sqlite3_free(zErr);
+    rc = SQLITE_ERROR;
+  }
+  sParse.declareVtab = 0;
+
+  sqlite3_finalize((sqlite3_stmt*)sParse.pVdbe);
+  sqlite3DeleteTable(sParse.pNewTable);
+  sParse.pNewTable = 0;
+
+  assert( (rc&0xff)==rc );
+  rc = sqlite3ApiExit(db, rc);
+  sqlite3_mutex_leave(db->mutex);
+  return rc;
+}
+
+/*
+** This function is invoked by the vdbe to call the xDestroy method
+** of the virtual table named zTab in database iDb. This occurs
+** when a DROP TABLE is mentioned.
+**
+** This call is a no-op if zTab is not a virtual table.
+*/
+int sqlite3VtabCallDestroy(sqlite3 *db, int iDb, const char *zTab)
+{
+  int rc = SQLITE_OK;
+  Table *pTab;
+
+  pTab = sqlite3FindTable(db, zTab, db->aDb[iDb].zName);
+  assert(pTab);
+  if( pTab->pVtab ){
+    int (*xDestroy)(sqlite3_vtab *pVTab) = pTab->pMod->pModule->xDestroy;
+    rc = sqlite3SafetyOff(db);
+    assert( rc==SQLITE_OK );
+    if( xDestroy ){
+      rc = xDestroy(pTab->pVtab);
+    }
+    (void)sqlite3SafetyOn(db);
+    if( rc==SQLITE_OK ){
+      pTab->pVtab = 0;
+    }
+  }
+
+  return rc;
+}
+
+/*
+** This function invokes either the xRollback or xCommit method
+** of each of the virtual tables in the sqlite3.aVTrans array. The method
+** called is identified by the second argument, "offset", which is
+** the offset of the method to call in the sqlite3_module structure.
+**
+** The array is cleared after invoking the callbacks.
+*/
+static void callFinaliser(sqlite3 *db, sqlite3_intptr_t offset){
+  int i;
+  if( db->aVTrans ){
+    for(i=0; i<db->nVTrans && db->aVTrans[i]; i++){
+      sqlite3_vtab *pVtab = db->aVTrans[i];
+      int (*x)(sqlite3_vtab *);
+      x = *(int (**)(sqlite3_vtab *))((char *)pVtab->pModule + offset);
+      if( x ) x(pVtab);
+      sqlite3VtabUnlock(db, pVtab);
+    }
+    sqlite3_free(db->aVTrans);
+    db->nVTrans = 0;
+    db->aVTrans = 0;
+  }
+}
+
+/*
+** If argument rc2 is not SQLITE_OK, then return it and do nothing.
+** Otherwise, invoke the xSync method of all virtual tables in the
+** sqlite3.aVTrans array. Return the error code for the first error
+** that occurs, or SQLITE_OK if all xSync operations are successful.
+*/
+int sqlite3VtabSync(sqlite3 *db, int rc2){
+  int i;
+  int rc = SQLITE_OK;
+  int rcsafety;
+  sqlite3_vtab **aVTrans = db->aVTrans;
+  if( rc2!=SQLITE_OK ) return rc2;
+
+  rc = sqlite3SafetyOff(db);
+  db->aVTrans = 0;
+  for(i=0; rc==SQLITE_OK && i<db->nVTrans && aVTrans[i]; i++){
+    sqlite3_vtab *pVtab = aVTrans[i];
+    int (*x)(sqlite3_vtab *);
+    x = pVtab->pModule->xSync;
+    if( x ){
+      rc = x(pVtab);
+    }
+  }
+  db->aVTrans = aVTrans;
+  rcsafety = sqlite3SafetyOn(db);
+
+  if( rc==SQLITE_OK ){
+    rc = rcsafety;
+  }
+  return rc;
+}
+
+/*
+** Invoke the xRollback method of all virtual tables in the
+** sqlite3.aVTrans array. Then clear the array itself.
+*/
+int sqlite3VtabRollback(sqlite3 *db){
+  callFinaliser(db, (sqlite3_intptr_t)(&((sqlite3_module *)0)->xRollback));
+  return SQLITE_OK;
+}
+
+/*
+** Invoke the xCommit method of all virtual tables in the
+** sqlite3.aVTrans array. Then clear the array itself.
+*/
+int sqlite3VtabCommit(sqlite3 *db){
+  callFinaliser(db, (sqlite3_intptr_t)(&((sqlite3_module *)0)->xCommit));
+  return SQLITE_OK;
+}
+
+/*
+** If the virtual table pVtab supports the transaction interface
+** (xBegin/xRollback/xCommit and optionally xSync) and a transaction is
+** not currently open, invoke the xBegin method now.
+**
+** If the xBegin call is successful, place the sqlite3_vtab pointer
+** in the sqlite3.aVTrans array.
+*/
+int sqlite3VtabBegin(sqlite3 *db, sqlite3_vtab *pVtab){
+  int rc = SQLITE_OK;
+  const sqlite3_module *pModule;
+
+  /* Special case: If db->aVTrans is NULL and db->nVTrans is greater
+  ** than zero, then this function is being called from within a
+  ** virtual module xSync() callback. It is illegal to write to
+  ** virtual module tables in this case, so return SQLITE_LOCKED.
+  */
+  if( 0==db->aVTrans && db->nVTrans>0 ){
+    return SQLITE_LOCKED;
+  }
+  if( !pVtab ){
+    return SQLITE_OK;
+  }
+  pModule = pVtab->pModule;
+
+  if( pModule->xBegin ){
+    int i;
+
+
+    /* If pVtab is already in the aVTrans array, return early */
+    for(i=0; (i<db->nVTrans) && 0!=db->aVTrans[i]; i++){
+      if( db->aVTrans[i]==pVtab ){
+        return SQLITE_OK;
+      }
+    }
+
+    /* Invoke the xBegin method */
+    rc = pModule->xBegin(pVtab);
+    if( rc!=SQLITE_OK ){
+      return rc;
+    }
+
+    rc = addToVTrans(db, pVtab);
+  }
+  return rc;
+}
+
+/*
+** The first parameter (pDef) is a function implementation.  The
+** second parameter (pExpr) is the first argument to this function.
+** If pExpr is a column in a virtual table, then let the virtual
+** table implementation have an opportunity to overload the function.
+**
+** This routine is used to allow virtual table implementations to
+** overload MATCH, LIKE, GLOB, and REGEXP operators.
+**
+** Return either the pDef argument (indicating no change) or a
+** new FuncDef structure that is marked as ephemeral using the
+** SQLITE_FUNC_EPHEM flag.
+*/
+FuncDef *sqlite3VtabOverloadFunction(
+  sqlite3 *db,    /* Database connection for reporting malloc problems */
+  FuncDef *pDef,  /* Function to possibly overload */
+  int nArg,       /* Number of arguments to the function */
+  Expr *pExpr     /* First argument to the function */
+){
+  Table *pTab;
+  sqlite3_vtab *pVtab;
+  sqlite3_module *pMod;
+  void (*xFunc)(sqlite3_context*,int,sqlite3_value**);
+  void *pArg;
+  FuncDef *pNew;
+  int rc = 0;
+  char *zLowerName;
+  unsigned char *z;
+
+
+  /* Check to see the left operand is a column in a virtual table */
+  if( pExpr==0 ) return pDef;
+  if( pExpr->op!=TK_COLUMN ) return pDef;
+  pTab = pExpr->pTab;
+  if( pTab==0 ) return pDef;
+  if( !pTab->isVirtual ) return pDef;
+  pVtab = pTab->pVtab;
+  assert( pVtab!=0 );
+  assert( pVtab->pModule!=0 );
+  pMod = (sqlite3_module *)pVtab->pModule;
+  if( pMod->xFindFunction==0 ) return pDef;
+
+  /* Call the xFindFunction method on the virtual table implementation
+  ** to see if the implementation wants to overload this function
+  */
+  zLowerName = sqlite3DbStrDup(db, pDef->zName);
+  if( zLowerName ){
+    for(z=(unsigned char*)zLowerName; *z; z++){
+      *z = sqlite3UpperToLower[*z];
+    }
+    rc = pMod->xFindFunction(pVtab, nArg, zLowerName, &xFunc, &pArg);
+    sqlite3_free(zLowerName);
+  }
+  if( rc==0 ){
+    return pDef;
+  }
+
+  /* Create a new ephemeral function definition for the overloaded
+  ** function */
+  pNew = sqlite3DbMallocZero(db, sizeof(*pNew) + strlen(pDef->zName) );
+  if( pNew==0 ){
+    return pDef;
+  }
+  *pNew = *pDef;
+  memcpy(pNew->zName, pDef->zName, strlen(pDef->zName)+1);
+  pNew->xFunc = xFunc;
+  pNew->pUserData = pArg;
+  pNew->flags |= SQLITE_FUNC_EPHEM;
+  return pNew;
+}
+
+#endif /* SQLITE_OMIT_VIRTUALTABLE */
diff --git a/uppsrc/plugin/sqlite3/lib/where.c b/uppsrc/plugin/sqlite3/lib/where.c
new file mode 100644
index 000000000..9e4b5fc73
--- /dev/null
+++ b/uppsrc/plugin/sqlite3/lib/where.c
@@ -0,0 +1,2869 @@
+/*
+** 2001 September 15
+**
+** The author disclaims copyright to this source code.  In place of
+** a legal notice, here is a blessing:
+**
+**    May you do good and not evil.
+**    May you find forgiveness for yourself and forgive others.
+**    May you share freely, never taking more than you give.
+**
+*************************************************************************
+** This module contains C code that generates VDBE code used to process
+** the WHERE clause of SQL statements.  This module is reponsible for
+** generating the code that loops through a table looking for applicable
+** rows.  Indices are selected and used to speed the search when doing
+** so is applicable.  Because this module is responsible for selecting
+** indices, you might also think of this module as the "query optimizer".
+**
+** $Id: where.c,v 1.290 2008/03/17 17:08:33 drh Exp $
+*/
+#include "sqliteInt.h"
+
+/*
+** The number of bits in a Bitmask.  "BMS" means "BitMask Size".
+*/
+#define BMS  (sizeof(Bitmask)*8)
+
+/*
+** Trace output macros
+*/
+#if defined(SQLITE_TEST) || defined(SQLITE_DEBUG)
+int sqlite3WhereTrace = 0;
+# define WHERETRACE(X)  if(sqlite3WhereTrace) sqlite3DebugPrintf X
+#else
+# define WHERETRACE(X)
+#endif
+
+/* Forward reference
+*/
+typedef struct WhereClause WhereClause;
+typedef struct ExprMaskSet ExprMaskSet;
+
+/*
+** The query generator uses an array of instances of this structure to
+** help it analyze the subexpressions of the WHERE clause.  Each WHERE
+** clause subexpression is separated from the others by an AND operator.
+**
+** All WhereTerms are collected into a single WhereClause structure.
+** The following identity holds:
+**
+**        WhereTerm.pWC->a[WhereTerm.idx] == WhereTerm
+**
+** When a term is of the form:
+**
+**              X <op> <expr>
+**
+** where X is a column name and <op> is one of certain operators,
+** then WhereTerm.leftCursor and WhereTerm.leftColumn record the
+** cursor number and column number for X.  WhereTerm.operator records
+** the <op> using a bitmask encoding defined by WO_xxx below.  The
+** use of a bitmask encoding for the operator allows us to search
+** quickly for terms that match any of several different operators.
+**
+** prereqRight and prereqAll record sets of cursor numbers,
+** but they do so indirectly.  A single ExprMaskSet structure translates
+** cursor number into bits and the translated bit is stored in the prereq
+** fields.  The translation is used in order to maximize the number of
+** bits that will fit in a Bitmask.  The VDBE cursor numbers might be
+** spread out over the non-negative integers.  For example, the cursor
+** numbers might be 3, 8, 9, 10, 20, 23, 41, and 45.  The ExprMaskSet
+** translates these sparse cursor numbers into consecutive integers
+** beginning with 0 in order to make the best possible use of the available
+** bits in the Bitmask.  So, in the example above, the cursor numbers
+** would be mapped into integers 0 through 7.
+*/
+typedef struct WhereTerm WhereTerm;
+struct WhereTerm {
+  Expr *pExpr;            /* Pointer to the subexpression */
+  i16 iParent;            /* Disable pWC->a[iParent] when this term disabled */
+  i16 leftCursor;         /* Cursor number of X in "X <op> <expr>" */
+  i16 leftColumn;         /* Column number of X in "X <op> <expr>" */
+  u16 eOperator;          /* A WO_xx value describing <op> */
+  u8 flags;               /* Bit flags.  See below */
+  u8 nChild;              /* Number of children that must disable us */
+  WhereClause *pWC;       /* The clause this term is part of */
+  Bitmask prereqRight;    /* Bitmask of tables used by pRight */
+  Bitmask prereqAll;      /* Bitmask of tables referenced by p */
+};
+
+/*
+** Allowed values of WhereTerm.flags
+*/
+#define TERM_DYNAMIC    0x01   /* Need to call sqlite3ExprDelete(pExpr) */
+#define TERM_VIRTUAL    0x02   /* Added by the optimizer.  Do not code */
+#define TERM_CODED      0x04   /* This term is already coded */
+#define TERM_COPIED     0x08   /* Has a child */
+#define TERM_OR_OK      0x10   /* Used during OR-clause processing */
+
+/*
+** An instance of the following structure holds all information about a
+** WHERE clause.  Mostly this is a container for one or more WhereTerms.
+*/
+struct WhereClause {
+  Parse *pParse;           /* The parser context */
+  ExprMaskSet *pMaskSet;   /* Mapping of table indices to bitmasks */
+  int nTerm;               /* Number of terms */
+  int nSlot;               /* Number of entries in a[] */
+  WhereTerm *a;            /* Each a[] describes a term of the WHERE cluase */
+  WhereTerm aStatic[10];   /* Initial static space for a[] */
+};
+
+/*
+** An instance of the following structure keeps track of a mapping
+** between VDBE cursor numbers and bits of the bitmasks in WhereTerm.
+**
+** The VDBE cursor numbers are small integers contained in
+** SrcList_item.iCursor and Expr.iTable fields.  For any given WHERE
+** clause, the cursor numbers might not begin with 0 and they might
+** contain gaps in the numbering sequence.  But we want to make maximum
+** use of the bits in our bitmasks.  This structure provides a mapping
+** from the sparse cursor numbers into consecutive integers beginning
+** with 0.
+**
+** If ExprMaskSet.ix[A]==B it means that The A-th bit of a Bitmask
+** corresponds VDBE cursor number B.  The A-th bit of a bitmask is 1<<A.
+**
+** For example, if the WHERE clause expression used these VDBE
+** cursors:  4, 5, 8, 29, 57, 73.  Then the  ExprMaskSet structure
+** would map those cursor numbers into bits 0 through 5.
+**
+** Note that the mapping is not necessarily ordered.  In the example
+** above, the mapping might go like this:  4->3, 5->1, 8->2, 29->0,
+** 57->5, 73->4.  Or one of 719 other combinations might be used. It
+** does not really matter.  What is important is that sparse cursor
+** numbers all get mapped into bit numbers that begin with 0 and contain
+** no gaps.
+*/
+struct ExprMaskSet {
+  int n;                        /* Number of assigned cursor values */
+  int ix[sizeof(Bitmask)*8];    /* Cursor assigned to each bit */
+};
+
+
+/*
+** Bitmasks for the operators that indices are able to exploit.  An
+** OR-ed combination of these values can be used when searching for
+** terms in the where clause.
+*/
+#define WO_IN     1
+#define WO_EQ     2
+#define WO_LT     (WO_EQ<<(TK_LT-TK_EQ))
+#define WO_LE     (WO_EQ<<(TK_LE-TK_EQ))
+#define WO_GT     (WO_EQ<<(TK_GT-TK_EQ))
+#define WO_GE     (WO_EQ<<(TK_GE-TK_EQ))
+#define WO_MATCH  64
+#define WO_ISNULL 128
+
+/*
+** Value for flags returned by bestIndex().
+**
+** The least significant byte is reserved as a mask for WO_ values above.
+** The WhereLevel.flags field is usually set to WO_IN|WO_EQ|WO_ISNULL.
+** But if the table is the right table of a left join, WhereLevel.flags
+** is set to WO_IN|WO_EQ.  The WhereLevel.flags field can then be used as
+** the "op" parameter to findTerm when we are resolving equality constraints.
+** ISNULL constraints will then not be used on the right table of a left
+** join.  Tickets #2177 and #2189.
+*/
+#define WHERE_ROWID_EQ     0x000100   /* rowid=EXPR or rowid IN (...) */
+#define WHERE_ROWID_RANGE  0x000200   /* rowid<EXPR and/or rowid>EXPR */
+#define WHERE_COLUMN_EQ    0x001000   /* x=EXPR or x IN (...) */
+#define WHERE_COLUMN_RANGE 0x002000   /* x<EXPR and/or x>EXPR */
+#define WHERE_COLUMN_IN    0x004000   /* x IN (...) */
+#define WHERE_TOP_LIMIT    0x010000   /* x<EXPR or x<=EXPR constraint */
+#define WHERE_BTM_LIMIT    0x020000   /* x>EXPR or x>=EXPR constraint */
+#define WHERE_IDX_ONLY     0x080000   /* Use index only - omit table */
+#define WHERE_ORDERBY      0x100000   /* Output will appear in correct order */
+#define WHERE_REVERSE      0x200000   /* Scan in reverse order */
+#define WHERE_UNIQUE       0x400000   /* Selects no more than one row */
+#define WHERE_VIRTUALTABLE 0x800000   /* Use virtual-table processing */
+
+/*
+** Initialize a preallocated WhereClause structure.
+*/
+static void whereClauseInit(
+  WhereClause *pWC,        /* The WhereClause to be initialized */
+  Parse *pParse,           /* The parsing context */
+  ExprMaskSet *pMaskSet    /* Mapping from table indices to bitmasks */
+){
+  pWC->pParse = pParse;
+  pWC->pMaskSet = pMaskSet;
+  pWC->nTerm = 0;
+  pWC->nSlot = ArraySize(pWC->aStatic);
+  pWC->a = pWC->aStatic;
+}
+
+/*
+** Deallocate a WhereClause structure.  The WhereClause structure
+** itself is not freed.  This routine is the inverse of whereClauseInit().
+*/
+static void whereClauseClear(WhereClause *pWC){
+  int i;
+  WhereTerm *a;
+  for(i=pWC->nTerm-1, a=pWC->a; i>=0; i--, a++){
+    if( a->flags & TERM_DYNAMIC ){
+      sqlite3ExprDelete(a->pExpr);
+    }
+  }
+  if( pWC->a!=pWC->aStatic ){
+    sqlite3_free(pWC->a);
+  }
+}
+
+/*
+** Add a new entries to the WhereClause structure.  Increase the allocated
+** space as necessary.
+**
+** If the flags argument includes TERM_DYNAMIC, then responsibility
+** for freeing the expression p is assumed by the WhereClause object.
+**
+** WARNING:  This routine might reallocate the space used to store
+** WhereTerms.  All pointers to WhereTerms should be invalided after
+** calling this routine.  Such pointers may be reinitialized by referencing
+** the pWC->a[] array.
+*/
+static int whereClauseInsert(WhereClause *pWC, Expr *p, int flags){
+  WhereTerm *pTerm;
+  int idx;
+  if( pWC->nTerm>=pWC->nSlot ){
+    WhereTerm *pOld = pWC->a;
+    pWC->a = sqlite3_malloc( sizeof(pWC->a[0])*pWC->nSlot*2 );
+    if( pWC->a==0 ){
+      pWC->pParse->db->mallocFailed = 1;
+      if( flags & TERM_DYNAMIC ){
+        sqlite3ExprDelete(p);
+      }
+      pWC->a = pOld;
+      return 0;
+    }
+    memcpy(pWC->a, pOld, sizeof(pWC->a[0])*pWC->nTerm);
+    if( pOld!=pWC->aStatic ){
+      sqlite3_free(pOld);
+    }
+    pWC->nSlot *= 2;
+  }
+  pTerm = &pWC->a[idx = pWC->nTerm];
+  pWC->nTerm++;
+  pTerm->pExpr = p;
+  pTerm->flags = flags;
+  pTerm->pWC = pWC;
+  pTerm->iParent = -1;
+  return idx;
+}
+
+/*
+** This routine identifies subexpressions in the WHERE clause where
+** each subexpression is separated by the AND operator or some other
+** operator specified in the op parameter.  The WhereClause structure
+** is filled with pointers to subexpressions.  For example:
+**
+**    WHERE  a=='hello' AND coalesce(b,11)<10 AND (c+12!=d OR c==22)
+**           \________/     \_______________/     \________________/
+**            slot[0]            slot[1]               slot[2]
+**
+** The original WHERE clause in pExpr is unaltered.  All this routine
+** does is make slot[] entries point to substructure within pExpr.
+**
+** In the previous sentence and in the diagram, "slot[]" refers to
+** the WhereClause.a[] array.  This array grows as needed to contain
+** all terms of the WHERE clause.
+*/
+static void whereSplit(WhereClause *pWC, Expr *pExpr, int op){
+  if( pExpr==0 ) return;
+  if( pExpr->op!=op ){
+    whereClauseInsert(pWC, pExpr, 0);
+  }else{
+    whereSplit(pWC, pExpr->pLeft, op);
+    whereSplit(pWC, pExpr->pRight, op);
+  }
+}
+
+/*
+** Initialize an expression mask set
+*/
+#define initMaskSet(P)  memset(P, 0, sizeof(*P))
+
+/*
+** Return the bitmask for the given cursor number.  Return 0 if
+** iCursor is not in the set.
+*/
+static Bitmask getMask(ExprMaskSet *pMaskSet, int iCursor){
+  int i;
+  for(i=0; i<pMaskSet->n; i++){
+    if( pMaskSet->ix[i]==iCursor ){
+      return ((Bitmask)1)<<i;
+    }
+  }
+  return 0;
+}
+
+/*
+** Create a new mask for cursor iCursor.
+**
+** There is one cursor per table in the FROM clause.  The number of
+** tables in the FROM clause is limited by a test early in the
+** sqlite3WhereBegin() routine.  So we know that the pMaskSet->ix[]
+** array will never overflow.
+*/
+static void createMask(ExprMaskSet *pMaskSet, int iCursor){
+  assert( pMaskSet->n < ArraySize(pMaskSet->ix) );
+  pMaskSet->ix[pMaskSet->n++] = iCursor;
+}
+
+/*
+** This routine walks (recursively) an expression tree and generates
+** a bitmask indicating which tables are used in that expression
+** tree.
+**
+** In order for this routine to work, the calling function must have
+** previously invoked sqlite3ExprResolveNames() on the expression.  See
+** the header comment on that routine for additional information.
+** The sqlite3ExprResolveNames() routines looks for column names and
+** sets their opcodes to TK_COLUMN and their Expr.iTable fields to
+** the VDBE cursor number of the table.  This routine just has to
+** translate the cursor numbers into bitmask values and OR all
+** the bitmasks together.
+*/
+static Bitmask exprListTableUsage(ExprMaskSet*, ExprList*);
+static Bitmask exprSelectTableUsage(ExprMaskSet*, Select*);
+static Bitmask exprTableUsage(ExprMaskSet *pMaskSet, Expr *p){
+  Bitmask mask = 0;
+  if( p==0 ) return 0;
+  if( p->op==TK_COLUMN ){
+    mask = getMask(pMaskSet, p->iTable);
+    return mask;
+  }
+  mask = exprTableUsage(pMaskSet, p->pRight);
+  mask |= exprTableUsage(pMaskSet, p->pLeft);
+  mask |= exprListTableUsage(pMaskSet, p->pList);
+  mask |= exprSelectTableUsage(pMaskSet, p->pSelect);
+  return mask;
+}
+static Bitmask exprListTableUsage(ExprMaskSet *pMaskSet, ExprList *pList){
+  int i;
+  Bitmask mask = 0;
+  if( pList ){
+    for(i=0; i<pList->nExpr; i++){
+      mask |= exprTableUsage(pMaskSet, pList->a[i].pExpr);
+    }
+  }
+  return mask;
+}
+static Bitmask exprSelectTableUsage(ExprMaskSet *pMaskSet, Select *pS){
+  Bitmask mask = 0;
+  while( pS ){
+    mask |= exprListTableUsage(pMaskSet, pS->pEList);
+    mask |= exprListTableUsage(pMaskSet, pS->pGroupBy);
+    mask |= exprListTableUsage(pMaskSet, pS->pOrderBy);
+    mask |= exprTableUsage(pMaskSet, pS->pWhere);
+    mask |= exprTableUsage(pMaskSet, pS->pHaving);
+    pS = pS->pPrior;
+  }
+  return mask;
+}
+
+/*
+** Return TRUE if the given operator is one of the operators that is
+** allowed for an indexable WHERE clause term.  The allowed operators are
+** "=", "<", ">", "<=", ">=", and "IN".
+*/
+static int allowedOp(int op){
+  assert( TK_GT>TK_EQ && TK_GT<TK_GE );
+  assert( TK_LT>TK_EQ && TK_LT<TK_GE );
+  assert( TK_LE>TK_EQ && TK_LE<TK_GE );
+  assert( TK_GE==TK_EQ+4 );
+  return op==TK_IN || (op>=TK_EQ && op<=TK_GE) || op==TK_ISNULL;
+}
+
+/*
+** Swap two objects of type T.
+*/
+#define SWAP(TYPE,A,B) {TYPE t=A; A=B; B=t;}
+
+/*
+** Commute a comparision operator.  Expressions of the form "X op Y"
+** are converted into "Y op X".
+**
+** If a collation sequence is associated with either the left or right
+** side of the comparison, it remains associated with the same side after
+** the commutation. So "Y collate NOCASE op X" becomes
+** "X collate NOCASE op Y". This is because any collation sequence on
+** the left hand side of a comparison overrides any collation sequence
+** attached to the right. For the same reason the EP_ExpCollate flag
+** is not commuted.
+*/
+static void exprCommute(Expr *pExpr){
+  u16 expRight = (pExpr->pRight->flags & EP_ExpCollate);
+  u16 expLeft = (pExpr->pLeft->flags & EP_ExpCollate);
+  assert( allowedOp(pExpr->op) && pExpr->op!=TK_IN );
+  SWAP(CollSeq*,pExpr->pRight->pColl,pExpr->pLeft->pColl);
+  pExpr->pRight->flags = (pExpr->pRight->flags & ~EP_ExpCollate) | expLeft;
+  pExpr->pLeft->flags = (pExpr->pLeft->flags & ~EP_ExpCollate) | expRight;
+  SWAP(Expr*,pExpr->pRight,pExpr->pLeft);
+  if( pExpr->op>=TK_GT ){
+    assert( TK_LT==TK_GT+2 );
+    assert( TK_GE==TK_LE+2 );
+    assert( TK_GT>TK_EQ );
+    assert( TK_GT<TK_LE );
+    assert( pExpr->op>=TK_GT && pExpr->op<=TK_GE );
+    pExpr->op = ((pExpr->op-TK_GT)^2)+TK_GT;
+  }
+}
+
+/*
+** Translate from TK_xx operator to WO_xx bitmask.
+*/
+static int operatorMask(int op){
+  int c;
+  assert( allowedOp(op) );
+  if( op==TK_IN ){
+    c = WO_IN;
+  }else if( op==TK_ISNULL ){
+    c = WO_ISNULL;
+  }else{
+    c = WO_EQ<<(op-TK_EQ);
+  }
+  assert( op!=TK_ISNULL || c==WO_ISNULL );
+  assert( op!=TK_IN || c==WO_IN );
+  assert( op!=TK_EQ || c==WO_EQ );
+  assert( op!=TK_LT || c==WO_LT );
+  assert( op!=TK_LE || c==WO_LE );
+  assert( op!=TK_GT || c==WO_GT );
+  assert( op!=TK_GE || c==WO_GE );
+  return c;
+}
+
+/*
+** Search for a term in the WHERE clause that is of the form "X <op> <expr>"
+** where X is a reference to the iColumn of table iCur and <op> is one of
+** the WO_xx operator codes specified by the op parameter.
+** Return a pointer to the term.  Return 0 if not found.
+*/
+static WhereTerm *findTerm(
+  WhereClause *pWC,     /* The WHERE clause to be searched */
+  int iCur,             /* Cursor number of LHS */
+  int iColumn,          /* Column number of LHS */
+  Bitmask notReady,     /* RHS must not overlap with this mask */
+  u16 op,               /* Mask of WO_xx values describing operator */
+  Index *pIdx           /* Must be compatible with this index, if not NULL */
+){
+  WhereTerm *pTerm;
+  int k;
+  for(pTerm=pWC->a, k=pWC->nTerm; k; k--, pTerm++){
+    if( pTerm->leftCursor==iCur
+       && (pTerm->prereqRight & notReady)==0
+       && pTerm->leftColumn==iColumn
+       && (pTerm->eOperator & op)!=0
+    ){
+      if( iCur>=0 && pIdx && pTerm->eOperator!=WO_ISNULL ){
+        Expr *pX = pTerm->pExpr;
+        CollSeq *pColl;
+        char idxaff;
+        int j;
+        Parse *pParse = pWC->pParse;
+
+        idxaff = pIdx->pTable->aCol[iColumn].affinity;
+        if( !sqlite3IndexAffinityOk(pX, idxaff) ) continue;
+
+        /* Figure out the collation sequence required from an index for
+        ** it to be useful for optimising expression pX. Store this
+        ** value in variable pColl.
+        */
+        assert(pX->pLeft);
+        pColl = sqlite3BinaryCompareCollSeq(pParse, pX->pLeft, pX->pRight);
+        if( !pColl ){
+          pColl = pParse->db->pDfltColl;
+        }
+
+        for(j=0; j<pIdx->nColumn && pIdx->aiColumn[j]!=iColumn; j++){}
+        assert( j<pIdx->nColumn );
+        if( sqlite3StrICmp(pColl->zName, pIdx->azColl[j]) ) continue;
+      }
+      return pTerm;
+    }
+  }
+  return 0;
+}
+
+/* Forward reference */
+static void exprAnalyze(SrcList*, WhereClause*, int);
+
+/*
+** Call exprAnalyze on all terms in a WHERE clause.
+**
+**
+*/
+static void exprAnalyzeAll(
+  SrcList *pTabList,       /* the FROM clause */
+  WhereClause *pWC         /* the WHERE clause to be analyzed */
+){
+  int i;
+  for(i=pWC->nTerm-1; i>=0; i--){
+    exprAnalyze(pTabList, pWC, i);
+  }
+}
+
+#ifndef SQLITE_OMIT_LIKE_OPTIMIZATION
+/*
+** Check to see if the given expression is a LIKE or GLOB operator that
+** can be optimized using inequality constraints.  Return TRUE if it is
+** so and false if not.
+**
+** In order for the operator to be optimizible, the RHS must be a string
+** literal that does not begin with a wildcard.
+*/
+static int isLikeOrGlob(
+  sqlite3 *db,      /* The database */
+  Expr *pExpr,      /* Test this expression */
+  int *pnPattern,   /* Number of non-wildcard prefix characters */
+  int *pisComplete, /* True if the only wildcard is % in the last character */
+  int *pnoCase      /* True if uppercase is equivalent to lowercase */
+){
+  const char *z;
+  Expr *pRight, *pLeft;
+  ExprList *pList;
+  int c, cnt;
+  char wc[3];
+  CollSeq *pColl;
+
+  if( !sqlite3IsLikeFunction(db, pExpr, pnoCase, wc) ){
+    return 0;
+  }
+#ifdef SQLITE_EBCDIC
+  if( *pnoCase ) return 0;
+#endif
+  pList = pExpr->pList;
+  pRight = pList->a[0].pExpr;
+  if( pRight->op!=TK_STRING ){
+    return 0;
+  }
+  pLeft = pList->a[1].pExpr;
+  if( pLeft->op!=TK_COLUMN ){
+    return 0;
+  }
+  pColl = pLeft->pColl;
+  assert( pColl!=0 || pLeft->iColumn==-1 );
+  if( pColl==0 ){
+    /* No collation is defined for the ROWID.  Use the default. */
+    pColl = db->pDfltColl;
+  }
+  if( (pColl->type!=SQLITE_COLL_BINARY || *pnoCase) &&
+      (pColl->type!=SQLITE_COLL_NOCASE || !*pnoCase) ){
+    return 0;
+  }
+  sqlite3DequoteExpr(db, pRight);
+  z = (char *)pRight->token.z;
+  cnt = 0;
+  if( z ){
+    while( (c=z[cnt])!=0 && c!=wc[0] && c!=wc[1] && c!=wc[2] ){ cnt++; }
+  }
+  if( cnt==0 || 255==(u8)z[cnt] ){
+    return 0;
+  }
+  *pisComplete = z[cnt]==wc[0] && z[cnt+1]==0;
+  *pnPattern = cnt;
+  return 1;
+}
+#endif /* SQLITE_OMIT_LIKE_OPTIMIZATION */
+
+
+#ifndef SQLITE_OMIT_VIRTUALTABLE
+/*
+** Check to see if the given expression is of the form
+**
+**         column MATCH expr
+**
+** If it is then return TRUE.  If not, return FALSE.
+*/
+static int isMatchOfColumn(
+  Expr *pExpr      /* Test this expression */
+){
+  ExprList *pList;
+
+  if( pExpr->op!=TK_FUNCTION ){
+    return 0;
+  }
+  if( pExpr->token.n!=5 ||
+       sqlite3StrNICmp((const char*)pExpr->token.z,"match",5)!=0 ){
+    return 0;
+  }
+  pList = pExpr->pList;
+  if( pList->nExpr!=2 ){
+    return 0;
+  }
+  if( pList->a[1].pExpr->op != TK_COLUMN ){
+    return 0;
+  }
+  return 1;
+}
+#endif /* SQLITE_OMIT_VIRTUALTABLE */
+
+/*
+** If the pBase expression originated in the ON or USING clause of
+** a join, then transfer the appropriate markings over to derived.
+*/
+static void transferJoinMarkings(Expr *pDerived, Expr *pBase){
+  pDerived->flags |= pBase->flags & EP_FromJoin;
+  pDerived->iRightJoinTable = pBase->iRightJoinTable;
+}
+
+#if !defined(SQLITE_OMIT_OR_OPTIMIZATION) && !defined(SQLITE_OMIT_SUBQUERY)
+/*
+** Return TRUE if the given term of an OR clause can be converted
+** into an IN clause.  The iCursor and iColumn define the left-hand
+** side of the IN clause.
+**
+** The context is that we have multiple OR-connected equality terms
+** like this:
+**
+**           a=<expr1> OR  a=<expr2> OR b=<expr3>  OR ...
+**
+** The pOrTerm input to this routine corresponds to a single term of
+** this OR clause.  In order for the term to be a condidate for
+** conversion to an IN operator, the following must be true:
+**
+**     *  The left-hand side of the term must be the column which
+**        is identified by iCursor and iColumn.
+**
+**     *  If the right-hand side is also a column, then the affinities
+**        of both right and left sides must be such that no type
+**        conversions are required on the right.  (Ticket #2249)
+**
+** If both of these conditions are true, then return true.  Otherwise
+** return false.
+*/
+static int orTermIsOptCandidate(WhereTerm *pOrTerm, int iCursor, int iColumn){
+  int affLeft, affRight;
+  assert( pOrTerm->eOperator==WO_EQ );
+  if( pOrTerm->leftCursor!=iCursor ){
+    return 0;
+  }
+  if( pOrTerm->leftColumn!=iColumn ){
+    return 0;
+  }
+  affRight = sqlite3ExprAffinity(pOrTerm->pExpr->pRight);
+  if( affRight==0 ){
+    return 1;
+  }
+  affLeft = sqlite3ExprAffinity(pOrTerm->pExpr->pLeft);
+  if( affRight!=affLeft ){
+    return 0;
+  }
+  return 1;
+}
+
+/*
+** Return true if the given term of an OR clause can be ignored during
+** a check to make sure all OR terms are candidates for optimization.
+** In other words, return true if a call to the orTermIsOptCandidate()
+** above returned false but it is not necessary to disqualify the
+** optimization.
+**
+** Suppose the original OR phrase was this:
+**
+**           a=4  OR  a=11  OR  a=b
+**
+** During analysis, the third term gets flipped around and duplicate
+** so that we are left with this:
+**
+**           a=4  OR  a=11  OR  a=b  OR  b=a
+**
+** Since the last two terms are duplicates, only one of them
+** has to qualify in order for the whole phrase to qualify.  When
+** this routine is called, we know that pOrTerm did not qualify.
+** This routine merely checks to see if pOrTerm has a duplicate that
+** might qualify.  If there is a duplicate that has not yet been
+** disqualified, then return true.  If there are no duplicates, or
+** the duplicate has also been disqualifed, return false.
+*/
+static int orTermHasOkDuplicate(WhereClause *pOr, WhereTerm *pOrTerm){
+  if( pOrTerm->flags & TERM_COPIED ){
+    /* This is the original term.  The duplicate is to the left had
+    ** has not yet been analyzed and thus has not yet been disqualified. */
+    return 1;
+  }
+  if( (pOrTerm->flags & TERM_VIRTUAL)!=0
+     && (pOr->a[pOrTerm->iParent].flags & TERM_OR_OK)!=0 ){
+    /* This is a duplicate term.  The original qualified so this one
+    ** does not have to. */
+    return 1;
+  }
+  /* This is either a singleton term or else it is a duplicate for
+  ** which the original did not qualify.  Either way we are done for. */
+  return 0;
+}
+#endif /* !SQLITE_OMIT_OR_OPTIMIZATION && !SQLITE_OMIT_SUBQUERY */
+
+/*
+** The input to this routine is an WhereTerm structure with only the
+** "pExpr" field filled in.  The job of this routine is to analyze the
+** subexpression and populate all the other fields of the WhereTerm
+** structure.
+**
+** If the expression is of the form "<expr> <op> X" it gets commuted
+** to the standard form of "X <op> <expr>".  If the expression is of
+** the form "X <op> Y" where both X and Y are columns, then the original
+** expression is unchanged and a new virtual expression of the form
+** "Y <op> X" is added to the WHERE clause and analyzed separately.
+*/
+static void exprAnalyze(
+  SrcList *pSrc,            /* the FROM clause */
+  WhereClause *pWC,         /* the WHERE clause */
+  int idxTerm               /* Index of the term to be analyzed */
+){
+  WhereTerm *pTerm;
+  ExprMaskSet *pMaskSet;
+  Expr *pExpr;
+  Bitmask prereqLeft;
+  Bitmask prereqAll;
+  int nPattern;
+  int isComplete;
+  int noCase;
+  int op;
+  Parse *pParse = pWC->pParse;
+  sqlite3 *db = pParse->db;
+
+  if( db->mallocFailed ){
+    return;
+  }
+  pTerm = &pWC->a[idxTerm];
+  pMaskSet = pWC->pMaskSet;
+  pExpr = pTerm->pExpr;
+  prereqLeft = exprTableUsage(pMaskSet, pExpr->pLeft);
+  op = pExpr->op;
+  if( op==TK_IN ){
+    assert( pExpr->pRight==0 );
+    pTerm->prereqRight = exprListTableUsage(pMaskSet, pExpr->pList)
+                          | exprSelectTableUsage(pMaskSet, pExpr->pSelect);
+  }else if( op==TK_ISNULL ){
+    pTerm->prereqRight = 0;
+  }else{
+    pTerm->prereqRight = exprTableUsage(pMaskSet, pExpr->pRight);
+  }
+  prereqAll = exprTableUsage(pMaskSet, pExpr);
+  if( ExprHasProperty(pExpr, EP_FromJoin) ){
+    prereqAll |= getMask(pMaskSet, pExpr->iRightJoinTable);
+  }
+  pTerm->prereqAll = prereqAll;
+  pTerm->leftCursor = -1;
+  pTerm->iParent = -1;
+  pTerm->eOperator = 0;
+  if( allowedOp(op) && (pTerm->prereqRight & prereqLeft)==0 ){
+    Expr *pLeft = pExpr->pLeft;
+    Expr *pRight = pExpr->pRight;
+    if( pLeft->op==TK_COLUMN ){
+      pTerm->leftCursor = pLeft->iTable;
+      pTerm->leftColumn = pLeft->iColumn;
+      pTerm->eOperator = operatorMask(op);
+    }
+    if( pRight && pRight->op==TK_COLUMN ){
+      WhereTerm *pNew;
+      Expr *pDup;
+      if( pTerm->leftCursor>=0 ){
+        int idxNew;
+        pDup = sqlite3ExprDup(db, pExpr);
+        if( db->mallocFailed ){
+          sqlite3ExprDelete(pDup);
+          return;
+        }
+        idxNew = whereClauseInsert(pWC, pDup, TERM_VIRTUAL|TERM_DYNAMIC);
+        if( idxNew==0 ) return;
+        pNew = &pWC->a[idxNew];
+        pNew->iParent = idxTerm;
+        pTerm = &pWC->a[idxTerm];
+        pTerm->nChild = 1;
+        pTerm->flags |= TERM_COPIED;
+      }else{
+        pDup = pExpr;
+        pNew = pTerm;
+      }
+      exprCommute(pDup);
+      pLeft = pDup->pLeft;
+      pNew->leftCursor = pLeft->iTable;
+      pNew->leftColumn = pLeft->iColumn;
+      pNew->prereqRight = prereqLeft;
+      pNew->prereqAll = prereqAll;
+      pNew->eOperator = operatorMask(pDup->op);
+    }
+  }
+
+#ifndef SQLITE_OMIT_BETWEEN_OPTIMIZATION
+  /* If a term is the BETWEEN operator, create two new virtual terms
+  ** that define the range that the BETWEEN implements.
+  */
+  else if( pExpr->op==TK_BETWEEN ){
+    ExprList *pList = pExpr->pList;
+    int i;
+    static const u8 ops[] = {TK_GE, TK_LE};
+    assert( pList!=0 );
+    assert( pList->nExpr==2 );
+    for(i=0; i<2; i++){
+      Expr *pNewExpr;
+      int idxNew;
+      pNewExpr = sqlite3Expr(db, ops[i], sqlite3ExprDup(db, pExpr->pLeft),
+                             sqlite3ExprDup(db, pList->a[i].pExpr), 0);
+      idxNew = whereClauseInsert(pWC, pNewExpr, TERM_VIRTUAL|TERM_DYNAMIC);
+      exprAnalyze(pSrc, pWC, idxNew);
+      pTerm = &pWC->a[idxTerm];
+      pWC->a[idxNew].iParent = idxTerm;
+    }
+    pTerm->nChild = 2;
+  }
+#endif /* SQLITE_OMIT_BETWEEN_OPTIMIZATION */
+
+#if !defined(SQLITE_OMIT_OR_OPTIMIZATION) && !defined(SQLITE_OMIT_SUBQUERY)
+  /* Attempt to convert OR-connected terms into an IN operator so that
+  ** they can make use of indices.  Example:
+  **
+  **      x = expr1  OR  expr2 = x  OR  x = expr3
+  **
+  ** is converted into
+  **
+  **      x IN (expr1,expr2,expr3)
+  **
+  ** This optimization must be omitted if OMIT_SUBQUERY is defined because
+  ** the compiler for the the IN operator is part of sub-queries.
+  */
+  else if( pExpr->op==TK_OR ){
+    int ok;
+    int i, j;
+    int iColumn, iCursor;
+    WhereClause sOr;
+    WhereTerm *pOrTerm;
+
+    assert( (pTerm->flags & TERM_DYNAMIC)==0 );
+    whereClauseInit(&sOr, pWC->pParse, pMaskSet);
+    whereSplit(&sOr, pExpr, TK_OR);
+    exprAnalyzeAll(pSrc, &sOr);
+    assert( sOr.nTerm>=2 );
+    j = 0;
+    if( db->mallocFailed ) goto or_not_possible;
+    do{
+      assert( j<sOr.nTerm );
+      iColumn = sOr.a[j].leftColumn;
+      iCursor = sOr.a[j].leftCursor;
+      ok = iCursor>=0;
+      for(i=sOr.nTerm-1, pOrTerm=sOr.a; i>=0 && ok; i--, pOrTerm++){
+        if( pOrTerm->eOperator!=WO_EQ ){
+          goto or_not_possible;
+        }
+        if( orTermIsOptCandidate(pOrTerm, iCursor, iColumn) ){
+          pOrTerm->flags |= TERM_OR_OK;
+        }else if( orTermHasOkDuplicate(&sOr, pOrTerm) ){
+          pOrTerm->flags &= ~TERM_OR_OK;
+        }else{
+          ok = 0;
+        }
+      }
+    }while( !ok && (sOr.a[j++].flags & TERM_COPIED)!=0 && j<2 );
+    if( ok ){
+      ExprList *pList = 0;
+      Expr *pNew, *pDup;
+      Expr *pLeft = 0;
+      for(i=sOr.nTerm-1, pOrTerm=sOr.a; i>=0 && ok; i--, pOrTerm++){
+        if( (pOrTerm->flags & TERM_OR_OK)==0 ) continue;
+        pDup = sqlite3ExprDup(db, pOrTerm->pExpr->pRight);
+        pList = sqlite3ExprListAppend(pWC->pParse, pList, pDup, 0);
+        pLeft = pOrTerm->pExpr->pLeft;
+      }
+      assert( pLeft!=0 );
+      pDup = sqlite3ExprDup(db, pLeft);
+      pNew = sqlite3Expr(db, TK_IN, pDup, 0, 0);
+      if( pNew ){
+        int idxNew;
+        transferJoinMarkings(pNew, pExpr);
+        pNew->pList = pList;
+        idxNew = whereClauseInsert(pWC, pNew, TERM_VIRTUAL|TERM_DYNAMIC);
+        exprAnalyze(pSrc, pWC, idxNew);
+        pTerm = &pWC->a[idxTerm];
+        pWC->a[idxNew].iParent = idxTerm;
+        pTerm->nChild = 1;
+      }else{
+        sqlite3ExprListDelete(pList);
+      }
+    }
+or_not_possible:
+    whereClauseClear(&sOr);
+  }
+#endif /* SQLITE_OMIT_OR_OPTIMIZATION */
+
+#ifndef SQLITE_OMIT_LIKE_OPTIMIZATION
+  /* Add constraints to reduce the search space on a LIKE or GLOB
+  ** operator.
+  **
+  ** A like pattern of the form "x LIKE 'abc%'" is changed into constraints
+  **
+  **          x>='abc' AND x<'abd' AND x LIKE 'abc%'
+  **
+  ** The last character of the prefix "abc" is incremented to form the
+  ** termination condidtion "abd".  This trick of incrementing the last
+  ** is not 255 and if the character set is not EBCDIC.
+  */
+  if( isLikeOrGlob(db, pExpr, &nPattern, &isComplete, &noCase) ){
+    Expr *pLeft, *pRight;
+    Expr *pStr1, *pStr2;
+    Expr *pNewExpr1, *pNewExpr2;
+    int idxNew1, idxNew2;
+
+    pLeft = pExpr->pList->a[1].pExpr;
+    pRight = pExpr->pList->a[0].pExpr;
+    pStr1 = sqlite3PExpr(pParse, TK_STRING, 0, 0, 0);
+    if( pStr1 ){
+      sqlite3TokenCopy(db, &pStr1->token, &pRight->token);
+      pStr1->token.n = nPattern;
+      pStr1->flags = EP_Dequoted;
+    }
+    pStr2 = sqlite3ExprDup(db, pStr1);
+    if( !db->mallocFailed ){
+      u8 c, *pC;
+      assert( pStr2->token.dyn );
+      pC = (u8*)&pStr2->token.z[nPattern-1];
+      c = *pC;
+      if( noCase ) c = sqlite3UpperToLower[c];
+      *pC = c + 1;
+    }
+    pNewExpr1 = sqlite3PExpr(pParse, TK_GE, sqlite3ExprDup(db,pLeft), pStr1, 0);
+    idxNew1 = whereClauseInsert(pWC, pNewExpr1, TERM_VIRTUAL|TERM_DYNAMIC);
+    exprAnalyze(pSrc, pWC, idxNew1);
+    pNewExpr2 = sqlite3PExpr(pParse, TK_LT, sqlite3ExprDup(db,pLeft), pStr2, 0);
+    idxNew2 = whereClauseInsert(pWC, pNewExpr2, TERM_VIRTUAL|TERM_DYNAMIC);
+    exprAnalyze(pSrc, pWC, idxNew2);
+    pTerm = &pWC->a[idxTerm];
+    if( isComplete ){
+      pWC->a[idxNew1].iParent = idxTerm;
+      pWC->a[idxNew2].iParent = idxTerm;
+      pTerm->nChild = 2;
+    }
+  }
+#endif /* SQLITE_OMIT_LIKE_OPTIMIZATION */
+
+#ifndef SQLITE_OMIT_VIRTUALTABLE
+  /* Add a WO_MATCH auxiliary term to the constraint set if the
+  ** current expression is of the form:  column MATCH expr.
+  ** This information is used by the xBestIndex methods of
+  ** virtual tables.  The native query optimizer does not attempt
+  ** to do anything with MATCH functions.
+  */
+  if( isMatchOfColumn(pExpr) ){
+    int idxNew;
+    Expr *pRight, *pLeft;
+    WhereTerm *pNewTerm;
+    Bitmask prereqColumn, prereqExpr;
+
+    pRight = pExpr->pList->a[0].pExpr;
+    pLeft = pExpr->pList->a[1].pExpr;
+    prereqExpr = exprTableUsage(pMaskSet, pRight);
+    prereqColumn = exprTableUsage(pMaskSet, pLeft);
+    if( (prereqExpr & prereqColumn)==0 ){
+      Expr *pNewExpr;
+      pNewExpr = sqlite3Expr(db, TK_MATCH, 0, sqlite3ExprDup(db, pRight), 0);
+      idxNew = whereClauseInsert(pWC, pNewExpr, TERM_VIRTUAL|TERM_DYNAMIC);
+      pNewTerm = &pWC->a[idxNew];
+      pNewTerm->prereqRight = prereqExpr;
+      pNewTerm->leftCursor = pLeft->iTable;
+      pNewTerm->leftColumn = pLeft->iColumn;
+      pNewTerm->eOperator = WO_MATCH;
+      pNewTerm->iParent = idxTerm;
+      pTerm = &pWC->a[idxTerm];
+      pTerm->nChild = 1;
+      pTerm->flags |= TERM_COPIED;
+      pNewTerm->prereqAll = pTerm->prereqAll;
+    }
+  }
+#endif /* SQLITE_OMIT_VIRTUALTABLE */
+}
+
+/*
+** Return TRUE if any of the expressions in pList->a[iFirst...] contain
+** a reference to any table other than the iBase table.
+*/
+static int referencesOtherTables(
+  ExprList *pList,          /* Search expressions in ths list */
+  ExprMaskSet *pMaskSet,    /* Mapping from tables to bitmaps */
+  int iFirst,               /* Be searching with the iFirst-th expression */
+  int iBase                 /* Ignore references to this table */
+){
+  Bitmask allowed = ~getMask(pMaskSet, iBase);
+  while( iFirst<pList->nExpr ){
+    if( (exprTableUsage(pMaskSet, pList->a[iFirst++].pExpr)&allowed)!=0 ){
+      return 1;
+    }
+  }
+  return 0;
+}
+
+
+/*
+** This routine decides if pIdx can be used to satisfy the ORDER BY
+** clause.  If it can, it returns 1.  If pIdx cannot satisfy the
+** ORDER BY clause, this routine returns 0.
+**
+** pOrderBy is an ORDER BY clause from a SELECT statement.  pTab is the
+** left-most table in the FROM clause of that same SELECT statement and
+** the table has a cursor number of "base".  pIdx is an index on pTab.
+**
+** nEqCol is the number of columns of pIdx that are used as equality
+** constraints.  Any of these columns may be missing from the ORDER BY
+** clause and the match can still be a success.
+**
+** All terms of the ORDER BY that match against the index must be either
+** ASC or DESC.  (Terms of the ORDER BY clause past the end of a UNIQUE
+** index do not need to satisfy this constraint.)  The *pbRev value is
+** set to 1 if the ORDER BY clause is all DESC and it is set to 0 if
+** the ORDER BY clause is all ASC.
+*/
+static int isSortingIndex(
+  Parse *pParse,          /* Parsing context */
+  ExprMaskSet *pMaskSet,  /* Mapping from table indices to bitmaps */
+  Index *pIdx,            /* The index we are testing */
+  int base,               /* Cursor number for the table to be sorted */
+  ExprList *pOrderBy,     /* The ORDER BY clause */
+  int nEqCol,             /* Number of index columns with == constraints */
+  int *pbRev              /* Set to 1 if ORDER BY is DESC */
+){
+  int i, j;                       /* Loop counters */
+  int sortOrder = 0;              /* XOR of index and ORDER BY sort direction */
+  int nTerm;                      /* Number of ORDER BY terms */
+  struct ExprList_item *pTerm;    /* A term of the ORDER BY clause */
+  sqlite3 *db = pParse->db;
+
+  assert( pOrderBy!=0 );
+  nTerm = pOrderBy->nExpr;
+  assert( nTerm>0 );
+
+  /* Match terms of the ORDER BY clause against columns of
+  ** the index.
+  **
+  ** Note that indices have pIdx->nColumn regular columns plus
+  ** one additional column containing the rowid.  The rowid column
+  ** of the index is also allowed to match against the ORDER BY
+  ** clause.
+  */
+  for(i=j=0, pTerm=pOrderBy->a; j<nTerm && i<=pIdx->nColumn; i++){
+    Expr *pExpr;       /* The expression of the ORDER BY pTerm */
+    CollSeq *pColl;    /* The collating sequence of pExpr */
+    int termSortOrder; /* Sort order for this term */
+    int iColumn;       /* The i-th column of the index.  -1 for rowid */
+    int iSortOrder;    /* 1 for DESC, 0 for ASC on the i-th index term */
+    const char *zColl; /* Name of the collating sequence for i-th index term */
+
+    pExpr = pTerm->pExpr;
+    if( pExpr->op!=TK_COLUMN || pExpr->iTable!=base ){
+      /* Can not use an index sort on anything that is not a column in the
+      ** left-most table of the FROM clause */
+      break;
+    }
+    pColl = sqlite3ExprCollSeq(pParse, pExpr);
+    if( !pColl ){
+      pColl = db->pDfltColl;
+    }
+    if( i<pIdx->nColumn ){
+      iColumn = pIdx->aiColumn[i];
+      if( iColumn==pIdx->pTable->iPKey ){
+        iColumn = -1;
+      }
+      iSortOrder = pIdx->aSortOrder[i];
+      zColl = pIdx->azColl[i];
+    }else{
+      iColumn = -1;
+      iSortOrder = 0;
+      zColl = pColl->zName;
+    }
+    if( pExpr->iColumn!=iColumn || sqlite3StrICmp(pColl->zName, zColl) ){
+      /* Term j of the ORDER BY clause does not match column i of the index */
+      if( i<nEqCol ){
+        /* If an index column that is constrained by == fails to match an
+        ** ORDER BY term, that is OK.  Just ignore that column of the index
+        */
+        continue;
+      }else{
+        /* If an index column fails to match and is not constrained by ==
+        ** then the index cannot satisfy the ORDER BY constraint.
+        */
+        return 0;
+      }
+    }
+    assert( pIdx->aSortOrder!=0 );
+    assert( pTerm->sortOrder==0 || pTerm->sortOrder==1 );
+    assert( iSortOrder==0 || iSortOrder==1 );
+    termSortOrder = iSortOrder ^ pTerm->sortOrder;
+    if( i>nEqCol ){
+      if( termSortOrder!=sortOrder ){
+        /* Indices can only be used if all ORDER BY terms past the
+        ** equality constraints are all either DESC or ASC. */
+        return 0;
+      }
+    }else{
+      sortOrder = termSortOrder;
+    }
+    j++;
+    pTerm++;
+    if( iColumn<0 && !referencesOtherTables(pOrderBy, pMaskSet, j, base) ){
+      /* If the indexed column is the primary key and everything matches
+      ** so far and none of the ORDER BY terms to the right reference other
+      ** tables in the join, then we are assured that the index can be used
+      ** to sort because the primary key is unique and so none of the other
+      ** columns will make any difference
+      */
+      j = nTerm;
+    }
+  }
+
+  *pbRev = sortOrder!=0;
+  if( j>=nTerm ){
+    /* All terms of the ORDER BY clause are covered by this index so
+    ** this index can be used for sorting. */
+    return 1;
+  }
+  if( pIdx->onError!=OE_None && i==pIdx->nColumn
+      && !referencesOtherTables(pOrderBy, pMaskSet, j, base) ){
+    /* All terms of this index match some prefix of the ORDER BY clause
+    ** and the index is UNIQUE and no terms on the tail of the ORDER BY
+    ** clause reference other tables in a join.  If this is all true then
+    ** the order by clause is superfluous. */
+    return 1;
+  }
+  return 0;
+}
+
+/*
+** Check table to see if the ORDER BY clause in pOrderBy can be satisfied
+** by sorting in order of ROWID.  Return true if so and set *pbRev to be
+** true for reverse ROWID and false for forward ROWID order.
+*/
+static int sortableByRowid(
+  int base,               /* Cursor number for table to be sorted */
+  ExprList *pOrderBy,     /* The ORDER BY clause */
+  ExprMaskSet *pMaskSet,  /* Mapping from tables to bitmaps */
+  int *pbRev              /* Set to 1 if ORDER BY is DESC */
+){
+  Expr *p;
+
+  assert( pOrderBy!=0 );
+  assert( pOrderBy->nExpr>0 );
+  p = pOrderBy->a[0].pExpr;
+  if( p->op==TK_COLUMN && p->iTable==base && p->iColumn==-1
+    && !referencesOtherTables(pOrderBy, pMaskSet, 1, base) ){
+    *pbRev = pOrderBy->a[0].sortOrder;
+    return 1;
+  }
+  return 0;
+}
+
+/*
+** Prepare a crude estimate of the logarithm of the input value.
+** The results need not be exact.  This is only used for estimating
+** the total cost of performing operatings with O(logN) or O(NlogN)
+** complexity.  Because N is just a guess, it is no great tragedy if
+** logN is a little off.
+*/
+static double estLog(double N){
+  double logN = 1;
+  double x = 10;
+  while( N>x ){
+    logN += 1;
+    x *= 10;
+  }
+  return logN;
+}
+
+/*
+** Two routines for printing the content of an sqlite3_index_info
+** structure.  Used for testing and debugging only.  If neither
+** SQLITE_TEST or SQLITE_DEBUG are defined, then these routines
+** are no-ops.
+*/
+#if !defined(SQLITE_OMIT_VIRTUALTABLE) && defined(SQLITE_DEBUG)
+static void TRACE_IDX_INPUTS(sqlite3_index_info *p){
+  int i;
+  if( !sqlite3WhereTrace ) return;
+  for(i=0; i<p->nConstraint; i++){
+    sqlite3DebugPrintf("  constraint[%d]: col=%d termid=%d op=%d usabled=%d\n",
+       i,
+       p->aConstraint[i].iColumn,
+       p->aConstraint[i].iTermOffset,
+       p->aConstraint[i].op,
+       p->aConstraint[i].usable);
+  }
+  for(i=0; i<p->nOrderBy; i++){
+    sqlite3DebugPrintf("  orderby[%d]: col=%d desc=%d\n",
+       i,
+       p->aOrderBy[i].iColumn,
+       p->aOrderBy[i].desc);
+  }
+}
+static void TRACE_IDX_OUTPUTS(sqlite3_index_info *p){
+  int i;
+  if( !sqlite3WhereTrace ) return;
+  for(i=0; i<p->nConstraint; i++){
+    sqlite3DebugPrintf("  usage[%d]: argvIdx=%d omit=%d\n",
+       i,
+       p->aConstraintUsage[i].argvIndex,
+       p->aConstraintUsage[i].omit);
+  }
+  sqlite3DebugPrintf("  idxNum=%d\n", p->idxNum);
+  sqlite3DebugPrintf("  idxStr=%s\n", p->idxStr);
+  sqlite3DebugPrintf("  orderByConsumed=%d\n", p->orderByConsumed);
+  sqlite3DebugPrintf("  estimatedCost=%g\n", p->estimatedCost);
+}
+#else
+#define TRACE_IDX_INPUTS(A)
+#define TRACE_IDX_OUTPUTS(A)
+#endif
+
+#ifndef SQLITE_OMIT_VIRTUALTABLE
+/*
+** Compute the best index for a virtual table.
+**
+** The best index is computed by the xBestIndex method of the virtual
+** table module.  This routine is really just a wrapper that sets up
+** the sqlite3_index_info structure that is used to communicate with
+** xBestIndex.
+**
+** In a join, this routine might be called multiple times for the
+** same virtual table.  The sqlite3_index_info structure is created
+** and initialized on the first invocation and reused on all subsequent
+** invocations.  The sqlite3_index_info structure is also used when
+** code is generated to access the virtual table.  The whereInfoDelete()
+** routine takes care of freeing the sqlite3_index_info structure after
+** everybody has finished with it.
+*/
+static double bestVirtualIndex(
+  Parse *pParse,                 /* The parsing context */
+  WhereClause *pWC,              /* The WHERE clause */
+  struct SrcList_item *pSrc,     /* The FROM clause term to search */
+  Bitmask notReady,              /* Mask of cursors that are not available */
+  ExprList *pOrderBy,            /* The order by clause */
+  int orderByUsable,             /* True if we can potential sort */
+  sqlite3_index_info **ppIdxInfo /* Index information passed to xBestIndex */
+){
+  Table *pTab = pSrc->pTab;
+  sqlite3_index_info *pIdxInfo;
+  struct sqlite3_index_constraint *pIdxCons;
+  struct sqlite3_index_orderby *pIdxOrderBy;
+  struct sqlite3_index_constraint_usage *pUsage;
+  WhereTerm *pTerm;
+  int i, j;
+  int nOrderBy;
+  int rc;
+
+  /* If the sqlite3_index_info structure has not been previously
+  ** allocated and initialized for this virtual table, then allocate
+  ** and initialize it now
+  */
+  pIdxInfo = *ppIdxInfo;
+  if( pIdxInfo==0 ){
+    WhereTerm *pTerm;
+    int nTerm;
+    WHERETRACE(("Recomputing index info for %s...\n", pTab->zName));
+
+    /* Count the number of possible WHERE clause constraints referring
+    ** to this virtual table */
+    for(i=nTerm=0, pTerm=pWC->a; i<pWC->nTerm; i++, pTerm++){
+      if( pTerm->leftCursor != pSrc->iCursor ) continue;
+      if( pTerm->eOperator==WO_IN ) continue;
+      if( pTerm->eOperator==WO_ISNULL ) continue;
+      nTerm++;
+    }
+
+    /* If the ORDER BY clause contains only columns in the current
+    ** virtual table then allocate space for the aOrderBy part of
+    ** the sqlite3_index_info structure.
+    */
+    nOrderBy = 0;
+    if( pOrderBy ){
+      for(i=0; i<pOrderBy->nExpr; i++){
+        Expr *pExpr = pOrderBy->a[i].pExpr;
+        if( pExpr->op!=TK_COLUMN || pExpr->iTable!=pSrc->iCursor ) break;
+      }
+      if( i==pOrderBy->nExpr ){
+        nOrderBy = pOrderBy->nExpr;
+      }
+    }
+
+    /* Allocate the sqlite3_index_info structure
+    */
+    pIdxInfo = sqlite3DbMallocZero(pParse->db, sizeof(*pIdxInfo)
+                             + (sizeof(*pIdxCons) + sizeof(*pUsage))*nTerm
+                             + sizeof(*pIdxOrderBy)*nOrderBy );
+    if( pIdxInfo==0 ){
+      sqlite3ErrorMsg(pParse, "out of memory");
+      return 0.0;
+    }
+    *ppIdxInfo = pIdxInfo;
+
+    /* Initialize the structure.  The sqlite3_index_info structure contains
+    ** many fields that are declared "const" to prevent xBestIndex from
+    ** changing them.  We have to do some funky casting in order to
+    ** initialize those fields.
+    */
+    pIdxCons = (struct sqlite3_index_constraint*)&pIdxInfo[1];
+    pIdxOrderBy = (struct sqlite3_index_orderby*)&pIdxCons[nTerm];
+    pUsage = (struct sqlite3_index_constraint_usage*)&pIdxOrderBy[nOrderBy];
+    *(int*)&pIdxInfo->nConstraint = nTerm;
+    *(int*)&pIdxInfo->nOrderBy = nOrderBy;
+    *(struct sqlite3_index_constraint**)&pIdxInfo->aConstraint = pIdxCons;
+    *(struct sqlite3_index_orderby**)&pIdxInfo->aOrderBy = pIdxOrderBy;
+    *(struct sqlite3_index_constraint_usage**)&pIdxInfo->aConstraintUsage =
+                                                                     pUsage;
+
+    for(i=j=0, pTerm=pWC->a; i<pWC->nTerm; i++, pTerm++){
+      if( pTerm->leftCursor != pSrc->iCursor ) continue;
+      if( pTerm->eOperator==WO_IN ) continue;
+      if( pTerm->eOperator==WO_ISNULL ) continue;
+      pIdxCons[j].iColumn = pTerm->leftColumn;
+      pIdxCons[j].iTermOffset = i;
+      pIdxCons[j].op = pTerm->eOperator;
+      /* The direct assignment in the previous line is possible only because
+      ** the WO_ and SQLITE_INDEX_CONSTRAINT_ codes are identical.  The
+      ** following asserts verify this fact. */
+      assert( WO_EQ==SQLITE_INDEX_CONSTRAINT_EQ );
+      assert( WO_LT==SQLITE_INDEX_CONSTRAINT_LT );
+      assert( WO_LE==SQLITE_INDEX_CONSTRAINT_LE );
+      assert( WO_GT==SQLITE_INDEX_CONSTRAINT_GT );
+      assert( WO_GE==SQLITE_INDEX_CONSTRAINT_GE );
+      assert( WO_MATCH==SQLITE_INDEX_CONSTRAINT_MATCH );
+      assert( pTerm->eOperator & (WO_EQ|WO_LT|WO_LE|WO_GT|WO_GE|WO_MATCH) );
+      j++;
+    }
+    for(i=0; i<nOrderBy; i++){
+      Expr *pExpr = pOrderBy->a[i].pExpr;
+      pIdxOrderBy[i].iColumn = pExpr->iColumn;
+      pIdxOrderBy[i].desc = pOrderBy->a[i].sortOrder;
+    }
+  }
+
+  /* At this point, the sqlite3_index_info structure that pIdxInfo points
+  ** to will have been initialized, either during the current invocation or
+  ** during some prior invocation.  Now we just have to customize the
+  ** details of pIdxInfo for the current invocation and pass it to
+  ** xBestIndex.
+  */
+
+  /* The module name must be defined. Also, by this point there must
+  ** be a pointer to an sqlite3_vtab structure. Otherwise
+  ** sqlite3ViewGetColumnNames() would have picked up the error.
+  */
+  assert( pTab->azModuleArg && pTab->azModuleArg[0] );
+  assert( pTab->pVtab );
+#if 0
+  if( pTab->pVtab==0 ){
+    sqlite3ErrorMsg(pParse, "undefined module %s for table %s",
+        pTab->azModuleArg[0], pTab->zName);
+    return 0.0;
+  }
+#endif
+
+  /* Set the aConstraint[].usable fields and initialize all
+  ** output variables to zero.
+  **
+  ** aConstraint[].usable is true for constraints where the right-hand
+  ** side contains only references to tables to the left of the current
+  ** table.  In other words, if the constraint is of the form:
+  **
+  **           column = expr
+  **
+  ** and we are evaluating a join, then the constraint on column is
+  ** only valid if all tables referenced in expr occur to the left
+  ** of the table containing column.
+  **
+  ** The aConstraints[] array contains entries for all constraints
+  ** on the current table.  That way we only have to compute it once
+  ** even though we might try to pick the best index multiple times.
+  ** For each attempt at picking an index, the order of tables in the
+  ** join might be different so we have to recompute the usable flag
+  ** each time.
+  */
+  pIdxCons = *(struct sqlite3_index_constraint**)&pIdxInfo->aConstraint;
+  pUsage = pIdxInfo->aConstraintUsage;
+  for(i=0; i<pIdxInfo->nConstraint; i++, pIdxCons++){
+    j = pIdxCons->iTermOffset;
+    pTerm = &pWC->a[j];
+    pIdxCons->usable =  (pTerm->prereqRight & notReady)==0;
+  }
+  memset(pUsage, 0, sizeof(pUsage[0])*pIdxInfo->nConstraint);
+  if( pIdxInfo->needToFreeIdxStr ){
+    sqlite3_free(pIdxInfo->idxStr);
+  }
+  pIdxInfo->idxStr = 0;
+  pIdxInfo->idxNum = 0;
+  pIdxInfo->needToFreeIdxStr = 0;
+  pIdxInfo->orderByConsumed = 0;
+  pIdxInfo->estimatedCost = SQLITE_BIG_DBL / 2.0;
+  nOrderBy = pIdxInfo->nOrderBy;
+  if( pIdxInfo->nOrderBy && !orderByUsable ){
+    *(int*)&pIdxInfo->nOrderBy = 0;
+  }
+
+  (void)sqlite3SafetyOff(pParse->db);
+  WHERETRACE(("xBestIndex for %s\n", pTab->zName));
+  TRACE_IDX_INPUTS(pIdxInfo);
+  rc = pTab->pVtab->pModule->xBestIndex(pTab->pVtab, pIdxInfo);
+  TRACE_IDX_OUTPUTS(pIdxInfo);
+  (void)sqlite3SafetyOn(pParse->db);
+
+  for(i=0; i<pIdxInfo->nConstraint; i++){
+    if( !pIdxInfo->aConstraint[i].usable && pUsage[i].argvIndex>0 ){
+      sqlite3ErrorMsg(pParse,
+          "table %s: xBestIndex returned an invalid plan", pTab->zName);
+      return 0.0;
+    }
+  }
+
+  if( rc!=SQLITE_OK ){
+    if( rc==SQLITE_NOMEM ){
+      pParse->db->mallocFailed = 1;
+    }else {
+      sqlite3ErrorMsg(pParse, "%s", sqlite3ErrStr(rc));
+    }
+  }
+  *(int*)&pIdxInfo->nOrderBy = nOrderBy;
+
+  return pIdxInfo->estimatedCost;
+}
+#endif /* SQLITE_OMIT_VIRTUALTABLE */
+
+/*
+** Find the best index for accessing a particular table.  Return a pointer
+** to the index, flags that describe how the index should be used, the
+** number of equality constraints, and the "cost" for this index.
+**
+** The lowest cost index wins.  The cost is an estimate of the amount of
+** CPU and disk I/O need to process the request using the selected index.
+** Factors that influence cost include:
+**
+**    *  The estimated number of rows that will be retrieved.  (The
+**       fewer the better.)
+**
+**    *  Whether or not sorting must occur.
+**
+**    *  Whether or not there must be separate lookups in the
+**       index and in the main table.
+**
+*/
+static double bestIndex(
+  Parse *pParse,              /* The parsing context */
+  WhereClause *pWC,           /* The WHERE clause */
+  struct SrcList_item *pSrc,  /* The FROM clause term to search */
+  Bitmask notReady,           /* Mask of cursors that are not available */
+  ExprList *pOrderBy,         /* The order by clause */
+  Index **ppIndex,            /* Make *ppIndex point to the best index */
+  int *pFlags,                /* Put flags describing this choice in *pFlags */
+  int *pnEq                   /* Put the number of == or IN constraints here */
+){
+  WhereTerm *pTerm;
+  Index *bestIdx = 0;         /* Index that gives the lowest cost */
+  double lowestCost;          /* The cost of using bestIdx */
+  int bestFlags = 0;          /* Flags associated with bestIdx */
+  int bestNEq = 0;            /* Best value for nEq */
+  int iCur = pSrc->iCursor;   /* The cursor of the table to be accessed */
+  Index *pProbe;              /* An index we are evaluating */
+  int rev;                    /* True to scan in reverse order */
+  int flags;                  /* Flags associated with pProbe */
+  int nEq;                    /* Number of == or IN constraints */
+  int eqTermMask;             /* Mask of valid equality operators */
+  double cost;                /* Cost of using pProbe */
+
+  WHERETRACE(("bestIndex: tbl=%s notReady=%x\n", pSrc->pTab->zName, notReady));
+  lowestCost = SQLITE_BIG_DBL;
+  pProbe = pSrc->pTab->pIndex;
+
+  /* If the table has no indices and there are no terms in the where
+  ** clause that refer to the ROWID, then we will never be able to do
+  ** anything other than a full table scan on this table.  We might as
+  ** well put it first in the join order.  That way, perhaps it can be
+  ** referenced by other tables in the join.
+  */
+  if( pProbe==0 &&
+     findTerm(pWC, iCur, -1, 0, WO_EQ|WO_IN|WO_LT|WO_LE|WO_GT|WO_GE,0)==0 &&
+     (pOrderBy==0 || !sortableByRowid(iCur, pOrderBy, pWC->pMaskSet, &rev)) ){
+    *pFlags = 0;
+    *ppIndex = 0;
+    *pnEq = 0;
+    return 0.0;
+  }
+
+  /* Check for a rowid=EXPR or rowid IN (...) constraints
+  */
+  pTerm = findTerm(pWC, iCur, -1, notReady, WO_EQ|WO_IN, 0);
+  if( pTerm ){
+    Expr *pExpr;
+    *ppIndex = 0;
+    bestFlags = WHERE_ROWID_EQ;
+    if( pTerm->eOperator & WO_EQ ){
+      /* Rowid== is always the best pick.  Look no further.  Because only
+      ** a single row is generated, output is always in sorted order */
+      *pFlags = WHERE_ROWID_EQ | WHERE_UNIQUE;
+      *pnEq = 1;
+      WHERETRACE(("... best is rowid\n"));
+      return 0.0;
+    }else if( (pExpr = pTerm->pExpr)->pList!=0 ){
+      /* Rowid IN (LIST): cost is NlogN where N is the number of list
+      ** elements.  */
+      lowestCost = pExpr->pList->nExpr;
+      lowestCost *= estLog(lowestCost);
+    }else{
+      /* Rowid IN (SELECT): cost is NlogN where N is the number of rows
+      ** in the result of the inner select.  We have no way to estimate
+      ** that value so make a wild guess. */
+      lowestCost = 200;
+    }
+    WHERETRACE(("... rowid IN cost: %.9g\n", lowestCost));
+  }
+
+  /* Estimate the cost of a table scan.  If we do not know how many
+  ** entries are in the table, use 1 million as a guess.
+  */
+  cost = pProbe ? pProbe->aiRowEst[0] : 1000000;
+  WHERETRACE(("... table scan base cost: %.9g\n", cost));
+  flags = WHERE_ROWID_RANGE;
+
+  /* Check for constraints on a range of rowids in a table scan.
+  */
+  pTerm = findTerm(pWC, iCur, -1, notReady, WO_LT|WO_LE|WO_GT|WO_GE, 0);
+  if( pTerm ){
+    if( findTerm(pWC, iCur, -1, notReady, WO_LT|WO_LE, 0) ){
+      flags |= WHERE_TOP_LIMIT;
+      cost /= 3;  /* Guess that rowid<EXPR eliminates two-thirds or rows */
+    }
+    if( findTerm(pWC, iCur, -1, notReady, WO_GT|WO_GE, 0) ){
+      flags |= WHERE_BTM_LIMIT;
+      cost /= 3;  /* Guess that rowid>EXPR eliminates two-thirds of rows */
+    }
+    WHERETRACE(("... rowid range reduces cost to %.9g\n", cost));
+  }else{
+    flags = 0;
+  }
+
+  /* If the table scan does not satisfy the ORDER BY clause, increase
+  ** the cost by NlogN to cover the expense of sorting. */
+  if( pOrderBy ){
+    if( sortableByRowid(iCur, pOrderBy, pWC->pMaskSet, &rev) ){
+      flags |= WHERE_ORDERBY|WHERE_ROWID_RANGE;
+      if( rev ){
+        flags |= WHERE_REVERSE;
+      }
+    }else{
+      cost += cost*estLog(cost);
+      WHERETRACE(("... sorting increases cost to %.9g\n", cost));
+    }
+  }
+  if( cost<lowestCost ){
+    lowestCost = cost;
+    bestFlags = flags;
+  }
+
+  /* If the pSrc table is the right table of a LEFT JOIN then we may not
+  ** use an index to satisfy IS NULL constraints on that table.  This is
+  ** because columns might end up being NULL if the table does not match -
+  ** a circumstance which the index cannot help us discover.  Ticket #2177.
+  */
+  if( (pSrc->jointype & JT_LEFT)!=0 ){
+    eqTermMask = WO_EQ|WO_IN;
+  }else{
+    eqTermMask = WO_EQ|WO_IN|WO_ISNULL;
+  }
+
+  /* Look at each index.
+  */
+  for(; pProbe; pProbe=pProbe->pNext){
+    int i;                       /* Loop counter */
+    double inMultiplier = 1;
+
+    WHERETRACE(("... index %s:\n", pProbe->zName));
+
+    /* Count the number of columns in the index that are satisfied
+    ** by x=EXPR constraints or x IN (...) constraints.
+    */
+    flags = 0;
+    for(i=0; i<pProbe->nColumn; i++){
+      int j = pProbe->aiColumn[i];
+      pTerm = findTerm(pWC, iCur, j, notReady, eqTermMask, pProbe);
+      if( pTerm==0 ) break;
+      flags |= WHERE_COLUMN_EQ;
+      if( pTerm->eOperator & WO_IN ){
+        Expr *pExpr = pTerm->pExpr;
+        flags |= WHERE_COLUMN_IN;
+        if( pExpr->pSelect!=0 ){
+          inMultiplier *= 25;
+        }else if( pExpr->pList!=0 ){
+          inMultiplier *= pExpr->pList->nExpr + 1;
+        }
+      }
+    }
+    cost = pProbe->aiRowEst[i] * inMultiplier * estLog(inMultiplier);
+    nEq = i;
+    if( pProbe->onError!=OE_None && (flags & WHERE_COLUMN_IN)==0
+         && nEq==pProbe->nColumn ){
+      flags |= WHERE_UNIQUE;
+    }
+    WHERETRACE(("...... nEq=%d inMult=%.9g cost=%.9g\n",nEq,inMultiplier,cost));
+
+    /* Look for range constraints
+    */
+    if( nEq<pProbe->nColumn ){
+      int j = pProbe->aiColumn[nEq];
+      pTerm = findTerm(pWC, iCur, j, notReady, WO_LT|WO_LE|WO_GT|WO_GE, pProbe);
+      if( pTerm ){
+        flags |= WHERE_COLUMN_RANGE;
+        if( findTerm(pWC, iCur, j, notReady, WO_LT|WO_LE, pProbe) ){
+          flags |= WHERE_TOP_LIMIT;
+          cost /= 3;
+        }
+        if( findTerm(pWC, iCur, j, notReady, WO_GT|WO_GE, pProbe) ){
+          flags |= WHERE_BTM_LIMIT;
+          cost /= 3;
+        }
+        WHERETRACE(("...... range reduces cost to %.9g\n", cost));
+      }
+    }
+
+    /* Add the additional cost of sorting if that is a factor.
+    */
+    if( pOrderBy ){
+      if( (flags & WHERE_COLUMN_IN)==0 &&
+           isSortingIndex(pParse,pWC->pMaskSet,pProbe,iCur,pOrderBy,nEq,&rev) ){
+        if( flags==0 ){
+          flags = WHERE_COLUMN_RANGE;
+        }
+        flags |= WHERE_ORDERBY;
+        if( rev ){
+          flags |= WHERE_REVERSE;
+        }
+      }else{
+        cost += cost*estLog(cost);
+        WHERETRACE(("...... orderby increases cost to %.9g\n", cost));
+      }
+    }
+
+    /* Check to see if we can get away with using just the index without
+    ** ever reading the table.  If that is the case, then halve the
+    ** cost of this index.
+    */
+    if( flags && pSrc->colUsed < (((Bitmask)1)<<(BMS-1)) ){
+      Bitmask m = pSrc->colUsed;
+      int j;
+      for(j=0; j<pProbe->nColumn; j++){
+        int x = pProbe->aiColumn[j];
+        if( x<BMS-1 ){
+          m &= ~(((Bitmask)1)<<x);
+        }
+      }
+      if( m==0 ){
+        flags |= WHERE_IDX_ONLY;
+        cost /= 2;
+        WHERETRACE(("...... idx-only reduces cost to %.9g\n", cost));
+      }
+    }
+
+    /* If this index has achieved the lowest cost so far, then use it.
+    */
+    if( flags && cost < lowestCost ){
+      bestIdx = pProbe;
+      lowestCost = cost;
+      bestFlags = flags;
+      bestNEq = nEq;
+    }
+  }
+
+  /* Report the best result
+  */
+  *ppIndex = bestIdx;
+  WHERETRACE(("best index is %s, cost=%.9g, flags=%x, nEq=%d\n",
+        bestIdx ? bestIdx->zName : "(none)", lowestCost, bestFlags, bestNEq));
+  *pFlags = bestFlags | eqTermMask;
+  *pnEq = bestNEq;
+  return lowestCost;
+}
+
+
+/*
+** Disable a term in the WHERE clause.  Except, do not disable the term
+** if it controls a LEFT OUTER JOIN and it did not originate in the ON
+** or USING clause of that join.
+**
+** Consider the term t2.z='ok' in the following queries:
+**
+**   (1)  SELECT * FROM t1 LEFT JOIN t2 ON t1.a=t2.x WHERE t2.z='ok'
+**   (2)  SELECT * FROM t1 LEFT JOIN t2 ON t1.a=t2.x AND t2.z='ok'
+**   (3)  SELECT * FROM t1, t2 WHERE t1.a=t2.x AND t2.z='ok'
+**
+** The t2.z='ok' is disabled in the in (2) because it originates
+** in the ON clause.  The term is disabled in (3) because it is not part
+** of a LEFT OUTER JOIN.  In (1), the term is not disabled.
+**
+** Disabling a term causes that term to not be tested in the inner loop
+** of the join.  Disabling is an optimization.  When terms are satisfied
+** by indices, we disable them to prevent redundant tests in the inner
+** loop.  We would get the correct results if nothing were ever disabled,
+** but joins might run a little slower.  The trick is to disable as much
+** as we can without disabling too much.  If we disabled in (1), we'd get
+** the wrong answer.  See ticket #813.
+*/
+static void disableTerm(WhereLevel *pLevel, WhereTerm *pTerm){
+  if( pTerm
+      && (pTerm->flags & TERM_CODED)==0
+      && (pLevel->iLeftJoin==0 || ExprHasProperty(pTerm->pExpr, EP_FromJoin))
+  ){
+    pTerm->flags |= TERM_CODED;
+    if( pTerm->iParent>=0 ){
+      WhereTerm *pOther = &pTerm->pWC->a[pTerm->iParent];
+      if( (--pOther->nChild)==0 ){
+        disableTerm(pLevel, pOther);
+      }
+    }
+  }
+}
+
+/*
+** Generate code that builds a probe for an index.
+**
+** There should be nColumn values on the stack.  The index
+** to be probed is pIdx.  Pop the values from the stack and
+** replace them all with a single record that is the index
+** problem.
+*/
+static void buildIndexProbe(
+  Vdbe *v,        /* Generate code into this VM */
+  int nColumn,    /* The number of columns to check for NULL */
+  Index *pIdx,    /* Index that we will be searching */
+  int regSrc,     /* Take values from this register */
+  int regDest     /* Write the result into this register */
+){
+  assert( regSrc>0 );
+  assert( regDest>0 );
+  sqlite3VdbeAddOp3(v, OP_MakeRecord, regSrc, nColumn, regDest);
+  sqlite3IndexAffinityStr(v, pIdx);
+}
+
+
+/*
+** Generate code for a single equality term of the WHERE clause.  An equality
+** term can be either X=expr or X IN (...).   pTerm is the term to be
+** coded.
+**
+** The current value for the constraint is left in register iReg.
+**
+** For a constraint of the form X=expr, the expression is evaluated and its
+** result is left on the stack.  For constraints of the form X IN (...)
+** this routine sets up a loop that will iterate over all values of X.
+*/
+static void codeEqualityTerm(
+  Parse *pParse,      /* The parsing context */
+  WhereTerm *pTerm,   /* The term of the WHERE clause to be coded */
+  WhereLevel *pLevel, /* When level of the FROM clause we are working on */
+  int iReg            /* Leave results in this register */
+){
+  Expr *pX = pTerm->pExpr;
+  Vdbe *v = pParse->pVdbe;
+
+  assert( iReg>0 && iReg<=pParse->nMem );
+  if( pX->op==TK_EQ ){
+    sqlite3ExprCode(pParse, pX->pRight, iReg);
+  }else if( pX->op==TK_ISNULL ){
+    sqlite3VdbeAddOp2(v, OP_Null, 0, iReg);
+#ifndef SQLITE_OMIT_SUBQUERY
+  }else{
+    int eType;
+    int iTab;
+    struct InLoop *pIn;
+
+    assert( pX->op==TK_IN );
+    eType = sqlite3FindInIndex(pParse, pX, 1);
+    iTab = pX->iTable;
+    sqlite3VdbeAddOp2(v, OP_Rewind, iTab, 0);
+    VdbeComment((v, "%.*s", pX->span.n, pX->span.z));
+    if( pLevel->nIn==0 ){
+      pLevel->nxt = sqlite3VdbeMakeLabel(v);
+    }
+    pLevel->nIn++;
+    pLevel->aInLoop = sqlite3DbReallocOrFree(pParse->db, pLevel->aInLoop,
+                                    sizeof(pLevel->aInLoop[0])*pLevel->nIn);
+    pIn = pLevel->aInLoop;
+    if( pIn ){
+      pIn += pLevel->nIn - 1;
+      pIn->iCur = iTab;
+      if( eType==IN_INDEX_ROWID ){
+        pIn->topAddr = sqlite3VdbeAddOp2(v, OP_Rowid, iTab, iReg);
+      }else{
+        pIn->topAddr = sqlite3VdbeAddOp3(v, OP_Column, iTab, 0, iReg);
+      }
+      sqlite3VdbeAddOp1(v, OP_IsNull, iReg);
+    }else{
+      pLevel->nIn = 0;
+    }
+#endif
+  }
+  disableTerm(pLevel, pTerm);
+}
+
+/*
+** Generate code that will evaluate all == and IN constraints for an
+** index.  The values for all constraints are left on the stack.
+**
+** For example, consider table t1(a,b,c,d,e,f) with index i1(a,b,c).
+** Suppose the WHERE clause is this:  a==5 AND b IN (1,2,3) AND c>5 AND c<10
+** The index has as many as three equality constraints, but in this
+** example, the third "c" value is an inequality.  So only two
+** constraints are coded.  This routine will generate code to evaluate
+** a==5 and b IN (1,2,3).  The current values for a and b will be left
+** on the stack - a is the deepest and b the shallowest.
+**
+** In the example above nEq==2.  But this subroutine works for any value
+** of nEq including 0.  If nEq==0, this routine is nearly a no-op.
+** The only thing it does is allocate the pLevel->iMem memory cell.
+**
+** This routine always allocates at least one memory cell and puts
+** the address of that memory cell in pLevel->iMem.  The code that
+** calls this routine will use pLevel->iMem to store the termination
+** key value of the loop.  If one or more IN operators appear, then
+** this routine allocates an additional nEq memory cells for internal
+** use.
+*/
+static int codeAllEqualityTerms(
+  Parse *pParse,        /* Parsing context */
+  WhereLevel *pLevel,   /* Which nested loop of the FROM we are coding */
+  WhereClause *pWC,     /* The WHERE clause */
+  Bitmask notReady,     /* Which parts of FROM have not yet been coded */
+  int nExtraReg         /* Number of extra registers to allocate */
+){
+  int nEq = pLevel->nEq;        /* The number of == or IN constraints to code */
+  Vdbe *v = pParse->pVdbe;      /* The virtual machine under construction */
+  Index *pIdx = pLevel->pIdx;   /* The index being used for this loop */
+  int iCur = pLevel->iTabCur;   /* The cursor of the table */
+  WhereTerm *pTerm;             /* A single constraint term */
+  int j;                        /* Loop counter */
+  int regBase;                  /* Base register */
+
+  /* Figure out how many memory cells we will need then allocate them.
+  ** We always need at least one used to store the loop terminator
+  ** value.  If there are IN operators we'll need one for each == or
+  ** IN constraint.
+  */
+  pLevel->iMem = pParse->nMem + 1;
+  regBase = pParse->nMem + 2;
+  pParse->nMem += pLevel->nEq + 2 + nExtraReg;
+
+  /* Evaluate the equality constraints
+  */
+  assert( pIdx->nColumn>=nEq );
+  for(j=0; j<nEq; j++){
+    int k = pIdx->aiColumn[j];
+    pTerm = findTerm(pWC, iCur, k, notReady, pLevel->flags, pIdx);
+    if( pTerm==0 ) break;
+    assert( (pTerm->flags & TERM_CODED)==0 );
+    codeEqualityTerm(pParse, pTerm, pLevel, regBase+j);
+    if( (pTerm->eOperator & (WO_ISNULL|WO_IN))==0 ){
+      sqlite3VdbeAddOp2(v, OP_IsNull, regBase+j, pLevel->brk);
+    }
+  }
+  return regBase;
+}
+
+#if defined(SQLITE_TEST)
+/*
+** The following variable holds a text description of query plan generated
+** by the most recent call to sqlite3WhereBegin().  Each call to WhereBegin
+** overwrites the previous.  This information is used for testing and
+** analysis only.
+*/
+char sqlite3_query_plan[BMS*2*40];  /* Text of the join */
+static int nQPlan = 0;              /* Next free slow in _query_plan[] */
+
+#endif /* SQLITE_TEST */
+
+
+/*
+** Free a WhereInfo structure
+*/
+static void whereInfoFree(WhereInfo *pWInfo){
+  if( pWInfo ){
+    int i;
+    for(i=0; i<pWInfo->nLevel; i++){
+      sqlite3_index_info *pInfo = pWInfo->a[i].pIdxInfo;
+      if( pInfo ){
+        assert( pInfo->needToFreeIdxStr==0 );
+        sqlite3_free(pInfo);
+      }
+    }
+    sqlite3_free(pWInfo);
+  }
+}
+
+
+/*
+** Generate the beginning of the loop used for WHERE clause processing.
+** The return value is a pointer to an opaque structure that contains
+** information needed to terminate the loop.  Later, the calling routine
+** should invoke sqlite3WhereEnd() with the return value of this function
+** in order to complete the WHERE clause processing.
+**
+** If an error occurs, this routine returns NULL.
+**
+** The basic idea is to do a nested loop, one loop for each table in
+** the FROM clause of a select.  (INSERT and UPDATE statements are the
+** same as a SELECT with only a single table in the FROM clause.)  For
+** example, if the SQL is this:
+**
+**       SELECT * FROM t1, t2, t3 WHERE ...;
+**
+** Then the code generated is conceptually like the following:
+**
+**      foreach row1 in t1 do       \    Code generated
+**        foreach row2 in t2 do      |-- by sqlite3WhereBegin()
+**          foreach row3 in t3 do   /
+**            ...
+**          end                     \    Code generated
+**        end                        |-- by sqlite3WhereEnd()
+**      end                         /
+**
+** Note that the loops might not be nested in the order in which they
+** appear in the FROM clause if a different order is better able to make
+** use of indices.  Note also that when the IN operator appears in
+** the WHERE clause, it might result in additional nested loops for
+** scanning through all values on the right-hand side of the IN.
+**
+** There are Btree cursors associated with each table.  t1 uses cursor
+** number pTabList->a[0].iCursor.  t2 uses the cursor pTabList->a[1].iCursor.
+** And so forth.  This routine generates code to open those VDBE cursors
+** and sqlite3WhereEnd() generates the code to close them.
+**
+** The code that sqlite3WhereBegin() generates leaves the cursors named
+** in pTabList pointing at their appropriate entries.  The [...] code
+** can use OP_Column and OP_Rowid opcodes on these cursors to extract
+** data from the various tables of the loop.
+**
+** If the WHERE clause is empty, the foreach loops must each scan their
+** entire tables.  Thus a three-way join is an O(N^3) operation.  But if
+** the tables have indices and there are terms in the WHERE clause that
+** refer to those indices, a complete table scan can be avoided and the
+** code will run much faster.  Most of the work of this routine is checking
+** to see if there are indices that can be used to speed up the loop.
+**
+** Terms of the WHERE clause are also used to limit which rows actually
+** make it to the "..." in the middle of the loop.  After each "foreach",
+** terms of the WHERE clause that use only terms in that loop and outer
+** loops are evaluated and if false a jump is made around all subsequent
+** inner loops (or around the "..." if the test occurs within the inner-
+** most loop)
+**
+** OUTER JOINS
+**
+** An outer join of tables t1 and t2 is conceptally coded as follows:
+**
+**    foreach row1 in t1 do
+**      flag = 0
+**      foreach row2 in t2 do
+**        start:
+**          ...
+**          flag = 1
+**      end
+**      if flag==0 then
+**        move the row2 cursor to a null row
+**        goto start
+**      fi
+**    end
+**
+** ORDER BY CLAUSE PROCESSING
+**
+** *ppOrderBy is a pointer to the ORDER BY clause of a SELECT statement,
+** if there is one.  If there is no ORDER BY clause or if this routine
+** is called from an UPDATE or DELETE statement, then ppOrderBy is NULL.
+**
+** If an index can be used so that the natural output order of the table
+** scan is correct for the ORDER BY clause, then that index is used and
+** *ppOrderBy is set to NULL.  This is an optimization that prevents an
+** unnecessary sort of the result set if an index appropriate for the
+** ORDER BY clause already exists.
+**
+** If the where clause loops cannot be arranged to provide the correct
+** output order, then the *ppOrderBy is unchanged.
+*/
+WhereInfo *sqlite3WhereBegin(
+  Parse *pParse,        /* The parser context */
+  SrcList *pTabList,    /* A list of all tables to be scanned */
+  Expr *pWhere,         /* The WHERE clause */
+  ExprList **ppOrderBy, /* An ORDER BY clause, or NULL */
+  u8 obflag             /* One of ORDERBY_MIN, ORDERBY_MAX or ORDERBY_NORMAL */
+){
+  int i;                     /* Loop counter */
+  WhereInfo *pWInfo;         /* Will become the return value of this function */
+  Vdbe *v = pParse->pVdbe;   /* The virtual database engine */
+  int brk, cont = 0;         /* Addresses used during code generation */
+  Bitmask notReady;          /* Cursors that are not yet positioned */
+  WhereTerm *pTerm;          /* A single term in the WHERE clause */
+  ExprMaskSet maskSet;       /* The expression mask set */
+  WhereClause wc;            /* The WHERE clause is divided into these terms */
+  struct SrcList_item *pTabItem;  /* A single entry from pTabList */
+  WhereLevel *pLevel;             /* A single level in the pWInfo list */
+  int iFrom;                      /* First unused FROM clause element */
+  int andFlags;              /* AND-ed combination of all wc.a[].flags */
+  sqlite3 *db;               /* Database connection */
+  ExprList *pOrderBy = 0;
+
+  /* The number of tables in the FROM clause is limited by the number of
+  ** bits in a Bitmask
+  */
+  if( pTabList->nSrc>BMS ){
+    sqlite3ErrorMsg(pParse, "at most %d tables in a join", BMS);
+    return 0;
+  }
+
+  if( ppOrderBy ){
+    pOrderBy = *ppOrderBy;
+  }
+
+  /* Split the WHERE clause into separate subexpressions where each
+  ** subexpression is separated by an AND operator.
+  */
+  initMaskSet(&maskSet);
+  whereClauseInit(&wc, pParse, &maskSet);
+  whereSplit(&wc, pWhere, TK_AND);
+
+  /* Allocate and initialize the WhereInfo structure that will become the
+  ** return value.
+  */
+  db = pParse->db;
+  pWInfo = sqlite3DbMallocZero(db,
+                      sizeof(WhereInfo) + pTabList->nSrc*sizeof(WhereLevel));
+  if( db->mallocFailed ){
+    goto whereBeginNoMem;
+  }
+  pWInfo->nLevel = pTabList->nSrc;
+  pWInfo->pParse = pParse;
+  pWInfo->pTabList = pTabList;
+  pWInfo->iBreak = sqlite3VdbeMakeLabel(v);
+
+  /* Special case: a WHERE clause that is constant.  Evaluate the
+  ** expression and either jump over all of the code or fall thru.
+  */
+  if( pWhere && (pTabList->nSrc==0 || sqlite3ExprIsConstantNotJoin(pWhere)) ){
+    sqlite3ExprIfFalse(pParse, pWhere, pWInfo->iBreak, SQLITE_JUMPIFNULL);
+    pWhere = 0;
+  }
+
+  /* Analyze all of the subexpressions.  Note that exprAnalyze() might
+  ** add new virtual terms onto the end of the WHERE clause.  We do not
+  ** want to analyze these virtual terms, so start analyzing at the end
+  ** and work forward so that the added virtual terms are never processed.
+  */
+  for(i=0; i<pTabList->nSrc; i++){
+    createMask(&maskSet, pTabList->a[i].iCursor);
+  }
+  exprAnalyzeAll(pTabList, &wc);
+  if( db->mallocFailed ){
+    goto whereBeginNoMem;
+  }
+
+  /* Chose the best index to use for each table in the FROM clause.
+  **
+  ** This loop fills in the following fields:
+  **
+  **   pWInfo->a[].pIdx      The index to use for this level of the loop.
+  **   pWInfo->a[].flags     WHERE_xxx flags associated with pIdx
+  **   pWInfo->a[].nEq       The number of == and IN constraints
+  **   pWInfo->a[].iFrom     When term of the FROM clause is being coded
+  **   pWInfo->a[].iTabCur   The VDBE cursor for the database table
+  **   pWInfo->a[].iIdxCur   The VDBE cursor for the index
+  **
+  ** This loop also figures out the nesting order of tables in the FROM
+  ** clause.
+  */
+  notReady = ~(Bitmask)0;
+  pTabItem = pTabList->a;
+  pLevel = pWInfo->a;
+  andFlags = ~0;
+  WHERETRACE(("*** Optimizer Start ***\n"));
+  for(i=iFrom=0, pLevel=pWInfo->a; i<pTabList->nSrc; i++, pLevel++){
+    Index *pIdx;                /* Index for FROM table at pTabItem */
+    int flags;                  /* Flags asssociated with pIdx */
+    int nEq;                    /* Number of == or IN constraints */
+    double cost;                /* The cost for pIdx */
+    int j;                      /* For looping over FROM tables */
+    Index *pBest = 0;           /* The best index seen so far */
+    int bestFlags = 0;          /* Flags associated with pBest */
+    int bestNEq = 0;            /* nEq associated with pBest */
+    double lowestCost;          /* Cost of the pBest */
+    int bestJ = 0;              /* The value of j */
+    Bitmask m;                  /* Bitmask value for j or bestJ */
+    int once = 0;               /* True when first table is seen */
+    sqlite3_index_info *pIndex; /* Current virtual index */
+
+    lowestCost = SQLITE_BIG_DBL;
+    for(j=iFrom, pTabItem=&pTabList->a[j]; j<pTabList->nSrc; j++, pTabItem++){
+      int doNotReorder;  /* True if this table should not be reordered */
+
+      doNotReorder =  (pTabItem->jointype & (JT_LEFT|JT_CROSS))!=0;
+      if( once && doNotReorder ) break;
+      m = getMask(&maskSet, pTabItem->iCursor);
+      if( (m & notReady)==0 ){
+        if( j==iFrom ) iFrom++;
+        continue;
+      }
+      assert( pTabItem->pTab );
+#ifndef SQLITE_OMIT_VIRTUALTABLE
+      if( IsVirtual(pTabItem->pTab) ){
+        sqlite3_index_info **ppIdxInfo = &pWInfo->a[j].pIdxInfo;
+        cost = bestVirtualIndex(pParse, &wc, pTabItem, notReady,
+                                ppOrderBy ? *ppOrderBy : 0, i==0,
+                                ppIdxInfo);
+        flags = WHERE_VIRTUALTABLE;
+        pIndex = *ppIdxInfo;
+        if( pIndex && pIndex->orderByConsumed ){
+          flags = WHERE_VIRTUALTABLE | WHERE_ORDERBY;
+        }
+        pIdx = 0;
+        nEq = 0;
+        if( (SQLITE_BIG_DBL/2.0)<cost ){
+          /* The cost is not allowed to be larger than SQLITE_BIG_DBL (the
+          ** inital value of lowestCost in this loop. If it is, then
+          ** the (cost<lowestCost) test below will never be true and
+          ** pLevel->pBestIdx never set.
+          */
+          cost = (SQLITE_BIG_DBL/2.0);
+        }
+      }else
+#endif
+      {
+        cost = bestIndex(pParse, &wc, pTabItem, notReady,
+                         (i==0 && ppOrderBy) ? *ppOrderBy : 0,
+                         &pIdx, &flags, &nEq);
+        pIndex = 0;
+      }
+      if( cost<lowestCost ){
+        once = 1;
+        lowestCost = cost;
+        pBest = pIdx;
+        bestFlags = flags;
+        bestNEq = nEq;
+        bestJ = j;
+        pLevel->pBestIdx = pIndex;
+      }
+      if( doNotReorder ) break;
+    }
+    WHERETRACE(("*** Optimizer choose table %d for loop %d\n", bestJ,
+           pLevel-pWInfo->a));
+    if( (bestFlags & WHERE_ORDERBY)!=0 ){
+      *ppOrderBy = 0;
+    }
+    andFlags &= bestFlags;
+    pLevel->flags = bestFlags;
+    pLevel->pIdx = pBest;
+    pLevel->nEq = bestNEq;
+    pLevel->aInLoop = 0;
+    pLevel->nIn = 0;
+    if( pBest ){
+      pLevel->iIdxCur = pParse->nTab++;
+    }else{
+      pLevel->iIdxCur = -1;
+    }
+    notReady &= ~getMask(&maskSet, pTabList->a[bestJ].iCursor);
+    pLevel->iFrom = bestJ;
+  }
+  WHERETRACE(("*** Optimizer Finished ***\n"));
+
+  /* If the total query only selects a single row, then the ORDER BY
+  ** clause is irrelevant.
+  */
+  if( (andFlags & WHERE_UNIQUE)!=0 && ppOrderBy ){
+    *ppOrderBy = 0;
+  }
+
+  /* Open all tables in the pTabList and any indices selected for
+  ** searching those tables.
+  */
+  sqlite3CodeVerifySchema(pParse, -1); /* Insert the cookie verifier Goto */
+  for(i=0, pLevel=pWInfo->a; i<pTabList->nSrc; i++, pLevel++){
+    Table *pTab;     /* Table to open */
+    Index *pIx;      /* Index used to access pTab (if any) */
+    int iDb;         /* Index of database containing table/index */
+    int iIdxCur = pLevel->iIdxCur;
+
+#ifndef SQLITE_OMIT_EXPLAIN
+    if( pParse->explain==2 ){
+      char *zMsg;
+      struct SrcList_item *pItem = &pTabList->a[pLevel->iFrom];
+      zMsg = sqlite3MPrintf(db, "TABLE %s", pItem->zName);
+      if( pItem->zAlias ){
+        zMsg = sqlite3MPrintf(db, "%z AS %s", zMsg, pItem->zAlias);
+      }
+      if( (pIx = pLevel->pIdx)!=0 ){
+        zMsg = sqlite3MPrintf(db, "%z WITH INDEX %s", zMsg, pIx->zName);
+      }else if( pLevel->flags & (WHERE_ROWID_EQ|WHERE_ROWID_RANGE) ){
+        zMsg = sqlite3MPrintf(db, "%z USING PRIMARY KEY", zMsg);
+      }
+#ifndef SQLITE_OMIT_VIRTUALTABLE
+      else if( pLevel->pBestIdx ){
+        sqlite3_index_info *pBestIdx = pLevel->pBestIdx;
+        zMsg = sqlite3MPrintf(db, "%z VIRTUAL TABLE INDEX %d:%s", zMsg,
+                    pBestIdx->idxNum, pBestIdx->idxStr);
+      }
+#endif
+      if( pLevel->flags & WHERE_ORDERBY ){
+        zMsg = sqlite3MPrintf(db, "%z ORDER BY", zMsg);
+      }
+      sqlite3VdbeAddOp4(v, OP_Explain, i, pLevel->iFrom, 0, zMsg, P4_DYNAMIC);
+    }
+#endif /* SQLITE_OMIT_EXPLAIN */
+    pTabItem = &pTabList->a[pLevel->iFrom];
+    pTab = pTabItem->pTab;
+    iDb = sqlite3SchemaToIndex(pParse->db, pTab->pSchema);
+    if( pTab->isEphem || pTab->pSelect ) continue;
+#ifndef SQLITE_OMIT_VIRTUALTABLE
+    if( pLevel->pBestIdx ){
+      int iCur = pTabItem->iCursor;
+      sqlite3VdbeAddOp4(v, OP_VOpen, iCur, 0, 0,
+                        (const char*)pTab->pVtab, P4_VTAB);
+    }else
+#endif
+    if( (pLevel->flags & WHERE_IDX_ONLY)==0 ){
+      sqlite3OpenTable(pParse, pTabItem->iCursor, iDb, pTab, OP_OpenRead);
+      if( pTab->nCol<(sizeof(Bitmask)*8) ){
+        Bitmask b = pTabItem->colUsed;
+        int n = 0;
+        for(; b; b=b>>1, n++){}
+        sqlite3VdbeChangeP2(v, sqlite3VdbeCurrentAddr(v)-1, n);
+        assert( n<=pTab->nCol );
+      }
+    }else{
+      sqlite3TableLock(pParse, iDb, pTab->tnum, 0, pTab->zName);
+    }
+    pLevel->iTabCur = pTabItem->iCursor;
+    if( (pIx = pLevel->pIdx)!=0 ){
+      KeyInfo *pKey = sqlite3IndexKeyinfo(pParse, pIx);
+      assert( pIx->pSchema==pTab->pSchema );
+      sqlite3VdbeAddOp4(v, OP_OpenRead, iIdxCur, pIx->tnum, iDb,
+                        (char*)pKey, P4_KEYINFO_HANDOFF);
+      VdbeComment((v, "%s", pIx->zName));
+      sqlite3VdbeAddOp2(v, OP_SetNumColumns, iIdxCur, pIx->nColumn+1);
+    }
+    sqlite3CodeVerifySchema(pParse, iDb);
+  }
+  pWInfo->iTop = sqlite3VdbeCurrentAddr(v);
+
+  /* Generate the code to do the search.  Each iteration of the for
+  ** loop below generates code for a single nested loop of the VM
+  ** program.
+  */
+  notReady = ~(Bitmask)0;
+  for(i=0, pLevel=pWInfo->a; i<pTabList->nSrc; i++, pLevel++){
+    int j;
+    int iCur = pTabItem->iCursor;  /* The VDBE cursor for the table */
+    Index *pIdx;       /* The index we will be using */
+    int nxt;           /* Where to jump to continue with the next IN case */
+    int iIdxCur;       /* The VDBE cursor for the index */
+    int omitTable;     /* True if we use the index only */
+    int bRev;          /* True if we need to scan in reverse order */
+
+    pTabItem = &pTabList->a[pLevel->iFrom];
+    iCur = pTabItem->iCursor;
+    pIdx = pLevel->pIdx;
+    iIdxCur = pLevel->iIdxCur;
+    bRev = (pLevel->flags & WHERE_REVERSE)!=0;
+    omitTable = (pLevel->flags & WHERE_IDX_ONLY)!=0;
+
+    /* Create labels for the "break" and "continue" instructions
+    ** for the current loop.  Jump to brk to break out of a loop.
+    ** Jump to cont to go immediately to the next iteration of the
+    ** loop.
+    **
+    ** When there is an IN operator, we also have a "nxt" label that
+    ** means to continue with the next IN value combination.  When
+    ** there are no IN operators in the constraints, the "nxt" label
+    ** is the same as "brk".
+    */
+    brk = pLevel->brk = pLevel->nxt = sqlite3VdbeMakeLabel(v);
+    cont = pLevel->cont = sqlite3VdbeMakeLabel(v);
+
+    /* If this is the right table of a LEFT OUTER JOIN, allocate and
+    ** initialize a memory cell that records if this table matches any
+    ** row of the left table of the join.
+    */
+    if( pLevel->iFrom>0 && (pTabItem[0].jointype & JT_LEFT)!=0 ){
+      pLevel->iLeftJoin = ++pParse->nMem;
+      sqlite3VdbeAddOp2(v, OP_Integer, 0, pLevel->iLeftJoin);
+      VdbeComment((v, "init LEFT JOIN no-match flag"));
+    }
+
+#ifndef SQLITE_OMIT_VIRTUALTABLE
+    if( pLevel->pBestIdx ){
+      /* Case 0:  The table is a virtual-table.  Use the VFilter and VNext
+      **          to access the data.
+      */
+      int j;
+      int iReg;   /* P3 Value for OP_VFilter */
+      sqlite3_index_info *pBestIdx = pLevel->pBestIdx;
+      int nConstraint = pBestIdx->nConstraint;
+      struct sqlite3_index_constraint_usage *aUsage =
+                                                  pBestIdx->aConstraintUsage;
+      const struct sqlite3_index_constraint *aConstraint =
+                                                  pBestIdx->aConstraint;
+
+      iReg = sqlite3GetTempRange(pParse, nConstraint+2);
+      for(j=1; j<=nConstraint; j++){
+        int k;
+        for(k=0; k<nConstraint; k++){
+          if( aUsage[k].argvIndex==j ){
+            int iTerm = aConstraint[k].iTermOffset;
+            sqlite3ExprCode(pParse, wc.a[iTerm].pExpr->pRight, iReg+j+1);
+            break;
+          }
+        }
+        if( k==nConstraint ) break;
+      }
+      sqlite3VdbeAddOp2(v, OP_Integer, pBestIdx->idxNum, iReg);
+      sqlite3VdbeAddOp2(v, OP_Integer, j-1, iReg+1);
+      sqlite3VdbeAddOp4(v, OP_VFilter, iCur, brk, iReg, pBestIdx->idxStr,
+                        pBestIdx->needToFreeIdxStr ? P4_MPRINTF : P4_STATIC);
+      sqlite3ReleaseTempRange(pParse, iReg, nConstraint+2);
+      pBestIdx->needToFreeIdxStr = 0;
+      for(j=0; j<pBestIdx->nConstraint; j++){
+        if( aUsage[j].omit ){
+          int iTerm = aConstraint[j].iTermOffset;
+          disableTerm(pLevel, &wc.a[iTerm]);
+        }
+      }
+      pLevel->op = OP_VNext;
+      pLevel->p1 = iCur;
+      pLevel->p2 = sqlite3VdbeCurrentAddr(v);
+    }else
+#endif /* SQLITE_OMIT_VIRTUALTABLE */
+
+    if( pLevel->flags & WHERE_ROWID_EQ ){
+      /* Case 1:  We can directly reference a single row using an
+      **          equality comparison against the ROWID field.  Or
+      **          we reference multiple rows using a "rowid IN (...)"
+      **          construct.
+      */
+      int r1;
+      pTerm = findTerm(&wc, iCur, -1, notReady, WO_EQ|WO_IN, 0);
+      assert( pTerm!=0 );
+      assert( pTerm->pExpr!=0 );
+      assert( pTerm->leftCursor==iCur );
+      assert( omitTable==0 );
+      r1 = sqlite3GetTempReg(pParse);
+      codeEqualityTerm(pParse, pTerm, pLevel, r1);
+      nxt = pLevel->nxt;
+      sqlite3VdbeAddOp3(v, OP_MustBeInt, r1, nxt, 1);
+      sqlite3VdbeAddOp3(v, OP_NotExists, iCur, nxt, r1);
+      VdbeComment((v, "pk"));
+      sqlite3ReleaseTempReg(pParse, r1);
+      pLevel->op = OP_Noop;
+    }else if( pLevel->flags & WHERE_ROWID_RANGE ){
+      /* Case 2:  We have an inequality comparison against the ROWID field.
+      */
+      int testOp = OP_Noop;
+      int start;
+      WhereTerm *pStart, *pEnd;
+
+      assert( omitTable==0 );
+      pStart = findTerm(&wc, iCur, -1, notReady, WO_GT|WO_GE, 0);
+      pEnd = findTerm(&wc, iCur, -1, notReady, WO_LT|WO_LE, 0);
+      if( bRev ){
+        pTerm = pStart;
+        pStart = pEnd;
+        pEnd = pTerm;
+      }
+      if( pStart ){
+        Expr *pX;
+        int r1, regFree1;
+        pX = pStart->pExpr;
+        assert( pX!=0 );
+        assert( pStart->leftCursor==iCur );
+        r1 = sqlite3ExprCodeTemp(pParse, pX->pRight, &regFree1);
+        sqlite3VdbeAddOp3(v, OP_ForceInt, r1, brk,
+                             pX->op==TK_LE || pX->op==TK_GT);
+        sqlite3VdbeAddOp3(v, bRev ? OP_MoveLt : OP_MoveGe, iCur, brk, r1);
+        VdbeComment((v, "pk"));
+        sqlite3ReleaseTempReg(pParse, regFree1);
+        disableTerm(pLevel, pStart);
+      }else{
+        sqlite3VdbeAddOp2(v, bRev ? OP_Last : OP_Rewind, iCur, brk);
+      }
+      if( pEnd ){
+        Expr *pX;
+        pX = pEnd->pExpr;
+        assert( pX!=0 );
+        assert( pEnd->leftCursor==iCur );
+        pLevel->iMem = ++pParse->nMem;
+        sqlite3ExprCode(pParse, pX->pRight, pLevel->iMem);
+        if( pX->op==TK_LT || pX->op==TK_GT ){
+          testOp = bRev ? OP_Le : OP_Ge;
+        }else{
+          testOp = bRev ? OP_Lt : OP_Gt;
+        }
+        disableTerm(pLevel, pEnd);
+      }
+      start = sqlite3VdbeCurrentAddr(v);
+      pLevel->op = bRev ? OP_Prev : OP_Next;
+      pLevel->p1 = iCur;
+      pLevel->p2 = start;
+      if( testOp!=OP_Noop ){
+        int r1 = sqlite3GetTempReg(pParse);
+        sqlite3VdbeAddOp2(v, OP_Rowid, iCur, r1);
+        /* sqlite3VdbeAddOp2(v, OP_SCopy, pLevel->iMem, 0); */
+        sqlite3VdbeAddOp3(v, testOp, pLevel->iMem, brk, r1);
+        sqlite3VdbeChangeP5(v, SQLITE_AFF_NUMERIC | SQLITE_JUMPIFNULL);
+        sqlite3ReleaseTempReg(pParse, r1);
+      }
+    }else if( pLevel->flags & WHERE_COLUMN_RANGE ){
+      /* Case 3: The WHERE clause term that refers to the right-most
+      **         column of the index is an inequality.  For example, if
+      **         the index is on (x,y,z) and the WHERE clause is of the
+      **         form "x=5 AND y<10" then this case is used.  Only the
+      **         right-most column can be an inequality - the rest must
+      **         use the "==" and "IN" operators.
+      **
+      **         This case is also used when there are no WHERE clause
+      **         constraints but an index is selected anyway, in order
+      **         to force the output order to conform to an ORDER BY.
+      */
+      int start;
+      int nEq = pLevel->nEq;
+      int topEq=0;        /* True if top limit uses ==. False is strictly < */
+      int btmEq=0;        /* True if btm limit uses ==. False if strictly > */
+      int topOp, btmOp;   /* Operators for the top and bottom search bounds */
+      int testOp;
+      int topLimit = (pLevel->flags & WHERE_TOP_LIMIT)!=0;
+      int btmLimit = (pLevel->flags & WHERE_BTM_LIMIT)!=0;
+      int isMinQuery = 0;      /* If this is an optimized SELECT min(x) ... */
+      int regBase;        /* Base register holding constraint values */
+      int r1;             /* Temp register */
+
+      /* Generate code to evaluate all constraint terms using == or IN
+      ** and level the values of those terms on the stack.
+      */
+      regBase = codeAllEqualityTerms(pParse, pLevel, &wc, notReady, 2);
+
+      /* Figure out what comparison operators to use for top and bottom
+      ** search bounds. For an ascending index, the bottom bound is a > or >=
+      ** operator and the top bound is a < or <= operator.  For a descending
+      ** index the operators are reversed.
+      */
+      if( pIdx->aSortOrder[nEq]==SQLITE_SO_ASC ){
+        topOp = WO_LT|WO_LE;
+        btmOp = WO_GT|WO_GE;
+      }else{
+        topOp = WO_GT|WO_GE;
+        btmOp = WO_LT|WO_LE;
+        SWAP(int, topLimit, btmLimit);
+      }
+
+      /* If this loop satisfies a sort order (pOrderBy) request that
+      ** was passed to this function to implement a "SELECT min(x) ..."
+      ** query, then the caller will only allow the loop to run for
+      ** a single iteration. This means that the first row returned
+      ** should not have a NULL value stored in 'x'. If column 'x' is
+      ** the first one after the nEq equality constraints in the index,
+      ** this requires some special handling.
+      */
+      if( (obflag==ORDERBY_MIN)
+       && (pLevel->flags&WHERE_ORDERBY)
+       && (pIdx->nColumn>nEq)
+       && (pOrderBy->a[0].pExpr->iColumn==pIdx->aiColumn[nEq])
+      ){
+        isMinQuery = 1;
+      }
+
+      /* Generate the termination key.  This is the key value that
+      ** will end the search.  There is no termination key if there
+      ** are no equality terms and no "X<..." term.
+      **
+      ** 2002-Dec-04: On a reverse-order scan, the so-called "termination"
+      ** key computed here really ends up being the start key.
+      */
+      nxt = pLevel->nxt;
+      if( topLimit ){
+        Expr *pX;
+        int k = pIdx->aiColumn[nEq];
+        pTerm = findTerm(&wc, iCur, k, notReady, topOp, pIdx);
+        assert( pTerm!=0 );
+        pX = pTerm->pExpr;
+        assert( (pTerm->flags & TERM_CODED)==0 );
+        sqlite3ExprCode(pParse, pX->pRight, regBase+nEq);
+        sqlite3VdbeAddOp2(v, OP_IsNull, regBase+nEq, nxt);
+        topEq = pTerm->eOperator & (WO_LE|WO_GE);
+        disableTerm(pLevel, pTerm);
+        testOp = OP_IdxGE;
+      }else{
+        testOp = nEq>0 ? OP_IdxGE : OP_Noop;
+        topEq = 1;
+      }
+      if( testOp!=OP_Noop || (isMinQuery&&bRev) ){
+        int nCol = nEq + topLimit;
+        if( isMinQuery && !topLimit ){
+          sqlite3VdbeAddOp2(v, OP_Null, 0, regBase+nCol);
+          nCol++;
+          topEq = 0;
+        }
+        buildIndexProbe(v, nCol, pIdx, regBase, pLevel->iMem);
+        if( bRev ){
+          int op = topEq ? OP_MoveLe : OP_MoveLt;
+          sqlite3VdbeAddOp3(v, op, iIdxCur, nxt, pLevel->iMem);
+        }
+      }else if( bRev ){
+        sqlite3VdbeAddOp2(v, OP_Last, iIdxCur, brk);
+      }
+
+      /* Generate the start key.  This is the key that defines the lower
+      ** bound on the search.  There is no start key if there are no
+      ** equality terms and if there is no "X>..." term.  In
+      ** that case, generate a "Rewind" instruction in place of the
+      ** start key search.
+      **
+      ** 2002-Dec-04: In the case of a reverse-order search, the so-called
+      ** "start" key really ends up being used as the termination key.
+      */
+      if( btmLimit ){
+        Expr *pX;
+        int k = pIdx->aiColumn[nEq];
+        pTerm = findTerm(&wc, iCur, k, notReady, btmOp, pIdx);
+        assert( pTerm!=0 );
+        pX = pTerm->pExpr;
+        assert( (pTerm->flags & TERM_CODED)==0 );
+        sqlite3ExprCode(pParse, pX->pRight, regBase+nEq);
+        sqlite3VdbeAddOp2(v, OP_IsNull, regBase+nEq, nxt);
+        btmEq = pTerm->eOperator & (WO_LE|WO_GE);
+        disableTerm(pLevel, pTerm);
+      }else{
+        btmEq = 1;
+      }
+      if( nEq>0 || btmLimit || (isMinQuery&&!bRev) ){
+        int nCol = nEq + btmLimit;
+        if( isMinQuery && !btmLimit ){
+          sqlite3VdbeAddOp2(v, OP_Null, 0, regBase+nCol);
+          nCol++;
+          btmEq = 0;
+        }
+        if( bRev ){
+          r1 = pLevel->iMem;
+          testOp = OP_IdxLT;
+        }else{
+          r1 = sqlite3GetTempReg(pParse);
+        }
+        buildIndexProbe(v, nCol, pIdx, regBase, r1);
+        if( !bRev ){
+          int op = btmEq ? OP_MoveGe : OP_MoveGt;
+          sqlite3VdbeAddOp3(v, op, iIdxCur, nxt, r1);
+          sqlite3ReleaseTempReg(pParse, r1);
+        }
+      }else if( bRev ){
+        testOp = OP_Noop;
+      }else{
+        sqlite3VdbeAddOp2(v, OP_Rewind, iIdxCur, brk);
+      }
+
+      /* Generate the the top of the loop.  If there is a termination
+      ** key we have to test for that key and abort at the top of the
+      ** loop.
+      */
+      start = sqlite3VdbeCurrentAddr(v);
+      if( testOp!=OP_Noop ){
+        sqlite3VdbeAddOp3(v, testOp, iIdxCur, nxt, pLevel->iMem);
+        if( (topEq && !bRev) || (!btmEq && bRev) ){
+          sqlite3VdbeChangeP5(v, 1);
+        }
+      }
+      r1 = sqlite3GetTempReg(pParse);
+      if( topLimit | btmLimit ){
+        sqlite3VdbeAddOp3(v, OP_Column, iIdxCur, nEq, r1);
+        sqlite3VdbeAddOp2(v, OP_IsNull, r1, cont);
+      }
+      if( !omitTable ){
+        sqlite3VdbeAddOp2(v, OP_IdxRowid, iIdxCur, r1);
+        sqlite3VdbeAddOp3(v, OP_MoveGe, iCur, 0, r1);  /* Deferred seek */
+      }
+      sqlite3ReleaseTempReg(pParse, r1);
+
+      /* Record the instruction used to terminate the loop.
+      */
+      pLevel->op = bRev ? OP_Prev : OP_Next;
+      pLevel->p1 = iIdxCur;
+      pLevel->p2 = start;
+    }else if( pLevel->flags & WHERE_COLUMN_EQ ){
+      /* Case 4:  There is an index and all terms of the WHERE clause that
+      **          refer to the index using the "==" or "IN" operators.
+      */
+      int start;
+      int nEq = pLevel->nEq;
+      int isMinQuery = 0;      /* If this is an optimized SELECT min(x) ... */
+      int regBase;             /* Base register of array holding constraints */
+      int r1;
+
+      /* Generate code to evaluate all constraint terms using == or IN
+      ** and leave the values of those terms on the stack.
+      */
+      regBase = codeAllEqualityTerms(pParse, pLevel, &wc, notReady, 1);
+      nxt = pLevel->nxt;
+
+      if( (obflag==ORDERBY_MIN)
+       && (pLevel->flags&WHERE_ORDERBY)
+       && (pIdx->nColumn>nEq)
+       && (pOrderBy->a[0].pExpr->iColumn==pIdx->aiColumn[nEq])
+      ){
+        isMinQuery = 1;
+        buildIndexProbe(v, nEq, pIdx, regBase, pLevel->iMem);
+        sqlite3VdbeAddOp2(v, OP_Null, 0, regBase+nEq);
+        r1 = ++pParse->nMem;
+        buildIndexProbe(v, nEq+1, pIdx, regBase, r1);
+      }else{
+        /* Generate a single key that will be used to both start and
+        ** terminate the search
+        */
+        r1 = pLevel->iMem;
+        buildIndexProbe(v, nEq, pIdx, regBase, r1);
+      }
+
+      /* Generate code (1) to move to the first matching element of the table.
+      ** Then generate code (2) that jumps to "nxt" after the cursor is past
+      ** the last matching element of the table.  The code (1) is executed
+      ** once to initialize the search, the code (2) is executed before each
+      ** iteration of the scan to see if the scan has finished. */
+      if( bRev ){
+        /* Scan in reverse order */
+        int op;
+        if( isMinQuery ){
+          op = OP_MoveLt;
+        }else{
+          op = OP_MoveLe;
+        }
+        sqlite3VdbeAddOp3(v, op, iIdxCur, nxt, r1);
+        start = sqlite3VdbeAddOp3(v, OP_IdxLT, iIdxCur, nxt, pLevel->iMem);
+        pLevel->op = OP_Prev;
+      }else{
+        /* Scan in the forward order */
+        int op;
+        if( isMinQuery ){
+          op = OP_MoveGt;
+        }else{
+          op = OP_MoveGe;
+        }
+        sqlite3VdbeAddOp3(v, op, iIdxCur, nxt, r1);
+        start = sqlite3VdbeAddOp3(v, OP_IdxGE, iIdxCur, nxt, pLevel->iMem);
+        sqlite3VdbeChangeP5(v, 1);
+        pLevel->op = OP_Next;
+      }
+      if( !omitTable ){
+        r1 = sqlite3GetTempReg(pParse);
+        sqlite3VdbeAddOp2(v, OP_IdxRowid, iIdxCur, r1);
+        sqlite3VdbeAddOp3(v, OP_MoveGe, iCur, 0, r1);  /* Deferred seek */
+        sqlite3ReleaseTempReg(pParse, r1);
+      }
+      pLevel->p1 = iIdxCur;
+      pLevel->p2 = start;
+    }else{
+      /* Case 5:  There is no usable index.  We must do a complete
+      **          scan of the entire table.
+      */
+      assert( omitTable==0 );
+      assert( bRev==0 );
+      pLevel->op = OP_Next;
+      pLevel->p1 = iCur;
+      pLevel->p2 = 1 + sqlite3VdbeAddOp2(v, OP_Rewind, iCur, brk);
+    }
+    notReady &= ~getMask(&maskSet, iCur);
+
+    /* Insert code to test every subexpression that can be completely
+    ** computed using the current set of tables.
+    */
+    for(pTerm=wc.a, j=wc.nTerm; j>0; j--, pTerm++){
+      Expr *pE;
+      if( pTerm->flags & (TERM_VIRTUAL|TERM_CODED) ) continue;
+      if( (pTerm->prereqAll & notReady)!=0 ) continue;
+      pE = pTerm->pExpr;
+      assert( pE!=0 );
+      if( pLevel->iLeftJoin && !ExprHasProperty(pE, EP_FromJoin) ){
+        continue;
+      }
+      sqlite3ExprIfFalse(pParse, pE, cont, SQLITE_JUMPIFNULL);
+      pTerm->flags |= TERM_CODED;
+    }
+
+    /* For a LEFT OUTER JOIN, generate code that will record the fact that
+    ** at least one row of the right table has matched the left table.
+    */
+    if( pLevel->iLeftJoin ){
+      pLevel->top = sqlite3VdbeCurrentAddr(v);
+      sqlite3VdbeAddOp2(v, OP_Integer, 1, pLevel->iLeftJoin);
+      VdbeComment((v, "record LEFT JOIN hit"));
+      for(pTerm=wc.a, j=0; j<wc.nTerm; j++, pTerm++){
+        if( pTerm->flags & (TERM_VIRTUAL|TERM_CODED) ) continue;
+        if( (pTerm->prereqAll & notReady)!=0 ) continue;
+        assert( pTerm->pExpr );
+        sqlite3ExprIfFalse(pParse, pTerm->pExpr, cont, SQLITE_JUMPIFNULL);
+        pTerm->flags |= TERM_CODED;
+      }
+    }
+  }
+
+#ifdef SQLITE_TEST  /* For testing and debugging use only */
+  /* Record in the query plan information about the current table
+  ** and the index used to access it (if any).  If the table itself
+  ** is not used, its name is just '{}'.  If no index is used
+  ** the index is listed as "{}".  If the primary key is used the
+  ** index name is '*'.
+  */
+  for(i=0; i<pTabList->nSrc; i++){
+    char *z;
+    int n;
+    pLevel = &pWInfo->a[i];
+    pTabItem = &pTabList->a[pLevel->iFrom];
+    z = pTabItem->zAlias;
+    if( z==0 ) z = pTabItem->pTab->zName;
+    n = strlen(z);
+    if( n+nQPlan < sizeof(sqlite3_query_plan)-10 ){
+      if( pLevel->flags & WHERE_IDX_ONLY ){
+        memcpy(&sqlite3_query_plan[nQPlan], "{}", 2);
+        nQPlan += 2;
+      }else{
+        memcpy(&sqlite3_query_plan[nQPlan], z, n);
+        nQPlan += n;
+      }
+      sqlite3_query_plan[nQPlan++] = ' ';
+    }
+    if( pLevel->flags & (WHERE_ROWID_EQ|WHERE_ROWID_RANGE) ){
+      memcpy(&sqlite3_query_plan[nQPlan], "* ", 2);
+      nQPlan += 2;
+    }else if( pLevel->pIdx==0 ){
+      memcpy(&sqlite3_query_plan[nQPlan], "{} ", 3);
+      nQPlan += 3;
+    }else{
+      n = strlen(pLevel->pIdx->zName);
+      if( n+nQPlan < sizeof(sqlite3_query_plan)-2 ){
+        memcpy(&sqlite3_query_plan[nQPlan], pLevel->pIdx->zName, n);
+        nQPlan += n;
+        sqlite3_query_plan[nQPlan++] = ' ';
+      }
+    }
+  }
+  while( nQPlan>0 && sqlite3_query_plan[nQPlan-1]==' ' ){
+    sqlite3_query_plan[--nQPlan] = 0;
+  }
+  sqlite3_query_plan[nQPlan] = 0;
+  nQPlan = 0;
+#endif /* SQLITE_TEST // Testing and debugging use only */
+
+  /* Record the continuation address in the WhereInfo structure.  Then
+  ** clean up and return.
+  */
+  pWInfo->iContinue = cont;
+  whereClauseClear(&wc);
+  return pWInfo;
+
+  /* Jump here if malloc fails */
+whereBeginNoMem:
+  whereClauseClear(&wc);
+  whereInfoFree(pWInfo);
+  return 0;
+}
+
+/*
+** Generate the end of the WHERE loop.  See comments on
+** sqlite3WhereBegin() for additional information.
+*/
+void sqlite3WhereEnd(WhereInfo *pWInfo){
+  Vdbe *v = pWInfo->pParse->pVdbe;
+  int i;
+  WhereLevel *pLevel;
+  SrcList *pTabList = pWInfo->pTabList;
+
+  /* Generate loop termination code.
+  */
+  for(i=pTabList->nSrc-1; i>=0; i--){
+    pLevel = &pWInfo->a[i];
+    sqlite3VdbeResolveLabel(v, pLevel->cont);
+    if( pLevel->op!=OP_Noop ){
+      sqlite3VdbeAddOp2(v, pLevel->op, pLevel->p1, pLevel->p2);
+    }
+    if( pLevel->nIn ){
+      struct InLoop *pIn;
+      int j;
+      sqlite3VdbeResolveLabel(v, pLevel->nxt);
+      for(j=pLevel->nIn, pIn=&pLevel->aInLoop[j-1]; j>0; j--, pIn--){
+        sqlite3VdbeJumpHere(v, pIn->topAddr+1);
+        sqlite3VdbeAddOp2(v, OP_Next, pIn->iCur, pIn->topAddr);
+        sqlite3VdbeJumpHere(v, pIn->topAddr-1);
+      }
+      sqlite3_free(pLevel->aInLoop);
+    }
+    sqlite3VdbeResolveLabel(v, pLevel->brk);
+    if( pLevel->iLeftJoin ){
+      int addr;
+      addr = sqlite3VdbeAddOp1(v, OP_IfPos, pLevel->iLeftJoin);
+      sqlite3VdbeAddOp1(v, OP_NullRow, pTabList->a[i].iCursor);
+      if( pLevel->iIdxCur>=0 ){
+        sqlite3VdbeAddOp1(v, OP_NullRow, pLevel->iIdxCur);
+      }
+      sqlite3VdbeAddOp2(v, OP_Goto, 0, pLevel->top);
+      sqlite3VdbeJumpHere(v, addr);
+    }
+  }
+
+  /* The "break" point is here, just past the end of the outer loop.
+  ** Set it.
+  */
+  sqlite3VdbeResolveLabel(v, pWInfo->iBreak);
+
+  /* Close all of the cursors that were opened by sqlite3WhereBegin.
+  */
+  for(i=0, pLevel=pWInfo->a; i<pTabList->nSrc; i++, pLevel++){
+    struct SrcList_item *pTabItem = &pTabList->a[pLevel->iFrom];
+    Table *pTab = pTabItem->pTab;
+    assert( pTab!=0 );
+    if( pTab->isEphem || pTab->pSelect ) continue;
+    if( (pLevel->flags & WHERE_IDX_ONLY)==0 ){
+      sqlite3VdbeAddOp1(v, OP_Close, pTabItem->iCursor);
+    }
+    if( pLevel->pIdx!=0 ){
+      sqlite3VdbeAddOp1(v, OP_Close, pLevel->iIdxCur);
+    }
+
+    /* If this scan uses an index, make code substitutions to read data
+    ** from the index in preference to the table. Sometimes, this means
+    ** the table need never be read from. This is a performance boost,
+    ** as the vdbe level waits until the table is read before actually
+    ** seeking the table cursor to the record corresponding to the current
+    ** position in the index.
+    **
+    ** Calls to the code generator in between sqlite3WhereBegin and
+    ** sqlite3WhereEnd will have created code that references the table
+    ** directly.  This loop scans all that code looking for opcodes
+    ** that reference the table and converts them into opcodes that
+    ** reference the index.
+    */
+    if( pLevel->pIdx ){
+      int k, j, last;
+      VdbeOp *pOp;
+      Index *pIdx = pLevel->pIdx;
+      int useIndexOnly = pLevel->flags & WHERE_IDX_ONLY;
+
+      assert( pIdx!=0 );
+      pOp = sqlite3VdbeGetOp(v, pWInfo->iTop);
+      last = sqlite3VdbeCurrentAddr(v);
+      for(k=pWInfo->iTop; k<last; k++, pOp++){
+        if( pOp->p1!=pLevel->iTabCur ) continue;
+        if( pOp->opcode==OP_Column ){
+          for(j=0; j<pIdx->nColumn; j++){
+            if( pOp->p2==pIdx->aiColumn[j] ){
+              pOp->p2 = j;
+              pOp->p1 = pLevel->iIdxCur;
+              break;
+            }
+          }
+          assert(!useIndexOnly || j<pIdx->nColumn);
+        }else if( pOp->opcode==OP_Rowid ){
+          pOp->p1 = pLevel->iIdxCur;
+          pOp->opcode = OP_IdxRowid;
+        }else if( pOp->opcode==OP_NullRow && useIndexOnly ){
+          pOp->opcode = OP_Noop;
+        }
+      }
+    }
+  }
+
+  /* Final cleanup
+  */
+  whereInfoFree(pWInfo);
+  return;
+}
diff --git a/uppsrc/plugin/sqlite3/sqlite3.upp b/uppsrc/plugin/sqlite3/sqlite3.upp
new file mode 100644
index 000000000..a64a25d2d
--- /dev/null
+++ b/uppsrc/plugin/sqlite3/sqlite3.upp
@@ -0,0 +1,104 @@
+description "Sqlite3 database engine and U++ interface";
+
+flags(NOTMFC) "!GUI !CONSOLE";
+
+uses
+	Sql;
+
+options
+	-DSQLITE_CORE;
+
+file
+	Wrapper readonly separator,
+	Sqlite3.h,
+	Sqlite3Schema.h,
+	Sqlite3upp.cpp,
+	"Original files" readonly separator,
+	lib\alter.c,
+	lib\analyze.c,
+	lib\attach.c,
+	lib\auth.c,
+	lib\bitvec.c,
+	lib\btmutex.c,
+	lib\btree.c,
+	lib\btree.h,
+	lib\btreeInt.h,
+	lib\build.c,
+	lib\callback.c,
+	lib\config.h,
+	lib\complete.c,
+	lib\date.c,
+	lib\delete.c,
+	lib\expr.c,
+	lib\fault.c,
+	lib\fts3.c,
+	lib\fts3.h,
+	lib\fts3_hash.c,
+	lib\fts3_hash.h,
+	lib\fts3_icu.c,
+	lib\fts3_porter.c,
+	lib\fts3_tokenizer.c,
+	lib\fts3_tokenizer.h,
+	lib\fts3_tokenizer1.c,
+	lib\func.c,
+	lib\hash.c,
+	lib\hash.h,
+	lib\insert.c,
+	lib\journal.c,
+	lib\keywordhash.h,
+	lib\legacy.c,
+	lib\loadext.c,
+	lib\main.c,
+	lib\malloc.c,
+	lib\mem1.c,
+	lib\mem2.c,
+	lib\mem3.c,
+	lib\mem4.c,
+	lib\mem5.c,
+	lib\mutex.c,
+	lib\mutex.h,
+	lib\mutex_os2.c,
+	lib\mutex_unix.c,
+	lib\mutex_w32.c,
+	lib\opcodes.c,
+	lib\opcodes.h,
+	lib\os.c,
+	lib\os.h,
+	lib\os_common.h,
+	lib\os_os2.c,
+	lib\os_unix.c,
+	lib\os_win.c,
+	lib\pager.c,
+	lib\pager.h,
+	lib\parse.c,
+	lib\parse.h,
+	lib\pragma.c,
+	lib\prepare.c,
+	lib\printf.c,
+	lib\random.c,
+	lib\select.c,
+	lib\sqlite3.h,
+	lib\sqlite3ext.h,
+	lib\sqliteInt.h,
+	lib\sqliteLimit.h,
+	lib\table.c,
+	lib\tokenize.c,
+	lib\trigger.c,
+	lib\update.c,
+	lib\utf.c,
+	lib\util.c,
+	lib\vacuum.c,
+	lib\vdbe.c,
+	lib\vdbe.h,
+	lib\vdbeapi.c,
+	lib\vdbeaux.c,
+	lib\vdbeblob.c,
+	lib\vdbefifo.c,
+	lib\vdbeInt.h,
+	lib\vdbemem.c,
+	lib\vtab.c,
+	lib\where.c;
+
+Core
+
+;
diff --git a/uppsrc/plugin/tif/lib/Copyright b/uppsrc/plugin/tif/lib/Copyright
new file mode 100644
index 000000000..dc255dec6
--- /dev/null
+++ b/uppsrc/plugin/tif/lib/Copyright
@@ -0,0 +1,21 @@
+Copyright (c) 1988-1997 Sam Leffler
+Copyright (c) 1991-1997 Silicon Graphics, Inc.
+
+Permission to use, copy, modify, distribute, and sell this software and
+its documentation for any purpose is hereby granted without fee, provided
+that (i) the above copyright notices and this permission notice appear in
+all copies of the software and related documentation, and (ii) the names of
+Sam Leffler and Silicon Graphics may not be used in any advertising or
+publicity relating to the software without the specific, prior written
+permission of Sam Leffler and Silicon Graphics.
+
+THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
+EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+
+IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
+ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
+OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
+LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+OF THIS SOFTWARE.
diff --git a/uppsrc/plugin/tif/lib/HOWTO-RELEASE b/uppsrc/plugin/tif/lib/HOWTO-RELEASE
new file mode 100644
index 000000000..dcb072cb9
--- /dev/null
+++ b/uppsrc/plugin/tif/lib/HOWTO-RELEASE
@@ -0,0 +1,55 @@
+HOWTO-RELEASE:
+
+Notes on releasing. You will need appropriate autoconf, automake and libtool
+utilities to release a package.
+
+1. Commit any unsaved changes.
+
+2. "make clean"
+
+3. Create html/vX.X.html.  Take ChangeLog entries and html-ify in there.
+   Easist thing to do is take html/vX.(X-1).html and use it as a template.
+   Add that file to the list of EXTRA_DIST files in the html/Makefile.am.
+
+3.5. Update html/index.html to refer to this new page as the current release.
+
+4. Increment version in configure.ac.  Put 'alpha' or 'beta' after
+   the version, if applicable.
+
+   eg.
+   3.5.7
+    or
+   3.5.8beta
+
+   Version should be updated in two places: in the second argument of the
+   AC_INIT macro and in LIBTIFF_xxx_VERSION variables.
+
+5. autoconf
+
+6. sh configure
+
+7. make release -- this will update "RELEASE-DATE" and "VERSION" in the top
+   level dir, and libtiff/tiffvers.h.
+
+8. Please verify that the version info in RELEASE-DATE, VERSION and
+   libtiff/tiffvers.h is right.
+
+9. make; make distcheck (to test).
+
+10. make distclean
+
+11. cvs commit
+
+12. cvs tag Release-v3-5-7 (or the appropriate name for the release)
+
+13. configure; make dist
+    Two files with names tiff-version.tar.gz and tiff-version.zip will
+    be created in the top level package directory.
+
+14. Copy to ftp.remotesensing.org ftp site.
+    scp tiff-*.tar.gz ftp.remotesensing.org:/var/ftp/libtiff/
+    scp tiff-*.zip ftp.remotesensing.org:/var/ftp/libtiff/
+
+15. Announce to list, tiff@lists.maptools.org
+
+16. Update libtiff page on freshmeat with new version announcement.
diff --git a/uppsrc/plugin/tif/lib/Makefile.am b/uppsrc/plugin/tif/lib/Makefile.am
new file mode 100644
index 000000000..48914c6e6
--- /dev/null
+++ b/uppsrc/plugin/tif/lib/Makefile.am
@@ -0,0 +1,137 @@
+# Tag Image File Format (TIFF) Software
+#
+# Copyright (C) 2004, Andrey Kiselev <dron@ak4719.spb.edu>
+#
+# Permission to use, copy, modify, distribute, and sell this software and
+# its documentation for any purpose is hereby granted without fee, provided
+# that (i) the above copyright notices and this permission notice appear in
+# all copies of the software and related documentation, and (ii) the names of
+# Sam Leffler and Silicon Graphics may not be used in any advertising or
+# publicity relating to the software without the specific, prior written
+# permission of Sam Leffler and Silicon Graphics.
+#
+# THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+# WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+#
+# IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
+# ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
+# OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+# WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
+# LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+# OF THIS SOFTWARE.
+
+# Process this file with automake to produce Makefile.in.
+
+LIBPORT = $(top_builddir)/port/libport.la
+LIBTIFF = $(top_builddir)/libtiff/libtiff.la
+
+EXTRA_DIST = Makefile.vc SConstruct tif_config.h.vc tiffconf.h.vc libtiff.def \
+	     $(EXTRA_SRCS)
+
+HDRS = \
+	tiff.h \
+        tiffconf.h \
+	tiffio.h \
+	tiffvers.h
+
+if HAVE_CXX
+HDRS +=	tiffio.hxx
+endif
+
+EXTRA_HDRS = \
+	t4.h \
+	tif_dir.h \
+	tif_predict.h \
+	tiffiop.h \
+	uvcode.h
+
+SRCS = \
+	tif_aux.c \
+	tif_close.c \
+	tif_codec.c \
+	tif_color.c \
+	tif_compress.c \
+	tif_dir.c \
+	tif_dirinfo.c \
+	tif_dirread.c \
+	tif_dirwrite.c \
+	tif_dumpmode.c \
+	tif_error.c \
+	tif_extension.c \
+	tif_fax3.c \
+	tif_fax3sm.c \
+	tif_flush.c \
+	tif_getimage.c \
+	tif_jpeg.c \
+	tif_luv.c \
+	tif_lzw.c \
+	tif_next.c \
+	tif_ojpeg.c \
+	tif_open.c \
+	tif_packbits.c \
+	tif_pixarlog.c \
+	tif_predict.c \
+	tif_print.c \
+	tif_read.c \
+	tif_strip.c \
+	tif_swab.c \
+	tif_thunder.c \
+	tif_tile.c \
+	tif_unix.c \
+	tif_version.c \
+	tif_warning.c \
+	tif_write.c \
+	tif_zip.c
+
+SRCSXX = \
+	tif_stream.cxx
+
+EXTRA_SRCS = \
+	tif_acorn.c \
+	tif_apple.c \
+	tif_atari.c \
+	tif_msdos.c \
+	tif_next.c \
+	tif_win3.c \
+	tif_win32.c
+
+libtiffincludedir = $(includedir)
+libtiffinclude_HEADERS = $(HDRS)
+noinst_HEADERS = $(EXTRA_HDRS)
+
+lib_LTLIBRARIES = libtiff.la
+if HAVE_CXX
+lib_LTLIBRARIES += libtiffxx.la
+endif
+
+libtiff_la_SOURCES = $(SRCS)
+libtiff_la_LDFLAGS = \
+	-no-undefined \
+	-version-number $(LIBTIFF_VERSION_INFO)
+if HAVE_RPATH
+libtiff_la_LDFLAGS += $(LIBDIR)
+endif
+libtiff_la_LIBADD = $(LIBPORT)
+
+libtiffxx_la_SOURCES = $(SRCSXX)
+libtiffxx_la_LDFLAGS = \
+	-no-undefined \
+	-version-number $(LIBTIFF_VERSION_INFO)
+if HAVE_RPATH
+libtiffxx_la_LDFLAGS += $(LIBDIR)
+endif
+libtiffxx_la_LIBADD = $(LIBTIFF) $(LIBPORT)
+libtiffxx_la_DEPENDENCIES = libtiff.la
+
+#
+# The finite state machine tables used by the G3/G4 decoders
+# are generated by the mkg3states program.  On systems without
+# make these rules have to be manually carried out.
+#
+noinst_PROGRAMS = mkg3states
+mkg3states_SOURCES = mkg3states.c tif_fax3.h
+mkg3states_LDADD = $(LIBPORT)
+
+faxtable: mkg3states
+	(rm -f tif_fax3sm.c && ./mkg3states -b -c const tif_fax3sm.c)
diff --git a/uppsrc/plugin/tif/lib/Makefile.in b/uppsrc/plugin/tif/lib/Makefile.in
new file mode 100644
index 000000000..864cfad57
--- /dev/null
+++ b/uppsrc/plugin/tif/lib/Makefile.in
@@ -0,0 +1,763 @@
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+# Tag Image File Format (TIFF) Software
+#
+# Copyright (C) 2004, Andrey Kiselev <dron@ak4719.spb.edu>
+#
+# Permission to use, copy, modify, distribute, and sell this software and
+# its documentation for any purpose is hereby granted without fee, provided
+# that (i) the above copyright notices and this permission notice appear in
+# all copies of the software and related documentation, and (ii) the names of
+# Sam Leffler and Silicon Graphics may not be used in any advertising or
+# publicity relating to the software without the specific, prior written
+# permission of Sam Leffler and Silicon Graphics.
+#
+# THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+# WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+#
+# IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
+# ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
+# OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+# WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
+# LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+# OF THIS SOFTWARE.
+
+# Process this file with automake to produce Makefile.in.
+
+
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ..
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+target_triplet = @target@
+@HAVE_CXX_TRUE@am__append_1 = tiffio.hxx
+@HAVE_CXX_TRUE@am__append_2 = libtiffxx.la
+@HAVE_RPATH_TRUE@am__append_3 = $(LIBDIR)
+@HAVE_RPATH_TRUE@am__append_4 = $(LIBDIR)
+noinst_PROGRAMS = mkg3states$(EXEEXT)
+subdir = libtiff
+DIST_COMMON = $(am__libtiffinclude_HEADERS_DIST) $(noinst_HEADERS) \
+	$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	$(srcdir)/tif_config.h.in $(srcdir)/tiffconf.h.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
+	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
+CONFIG_HEADER = tif_config.h tiffconf.h
+CONFIG_CLEAN_FILES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(libdir)" \
+	"$(DESTDIR)$(libtiffincludedir)"
+libLTLIBRARIES_INSTALL = $(INSTALL)
+LTLIBRARIES = $(lib_LTLIBRARIES)
+am__DEPENDENCIES_1 = $(top_builddir)/port/libport.la
+libtiff_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+am__objects_1 = tif_aux.lo tif_close.lo tif_codec.lo tif_color.lo \
+	tif_compress.lo tif_dir.lo tif_dirinfo.lo tif_dirread.lo \
+	tif_dirwrite.lo tif_dumpmode.lo tif_error.lo tif_extension.lo \
+	tif_fax3.lo tif_fax3sm.lo tif_flush.lo tif_getimage.lo \
+	tif_jpeg.lo tif_luv.lo tif_lzw.lo tif_next.lo tif_ojpeg.lo \
+	tif_open.lo tif_packbits.lo tif_pixarlog.lo tif_predict.lo \
+	tif_print.lo tif_read.lo tif_strip.lo tif_swab.lo \
+	tif_thunder.lo tif_tile.lo tif_unix.lo tif_version.lo \
+	tif_warning.lo tif_write.lo tif_zip.lo
+am_libtiff_la_OBJECTS = $(am__objects_1)
+libtiff_la_OBJECTS = $(am_libtiff_la_OBJECTS)
+am__DEPENDENCIES_2 = $(top_builddir)/libtiff/libtiff.la
+am__objects_2 = tif_stream.lo
+am_libtiffxx_la_OBJECTS = $(am__objects_2)
+libtiffxx_la_OBJECTS = $(am_libtiffxx_la_OBJECTS)
+@HAVE_CXX_TRUE@am_libtiffxx_la_rpath = -rpath $(libdir)
+PROGRAMS = $(noinst_PROGRAMS)
+am_mkg3states_OBJECTS = mkg3states.$(OBJEXT)
+mkg3states_OBJECTS = $(am_mkg3states_OBJECTS)
+mkg3states_DEPENDENCIES = $(am__DEPENDENCIES_1)
+DEFAULT_INCLUDES = -I. -I$(srcdir) -I. -I.
+depcomp = $(SHELL) $(top_srcdir)/config/depcomp
+am__depfiles_maybe = depfiles
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CXXFLAGS) $(CXXFLAGS)
+CXXLD = $(CXX)
+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+SOURCES = $(libtiff_la_SOURCES) $(libtiffxx_la_SOURCES) \
+	$(mkg3states_SOURCES)
+DIST_SOURCES = $(libtiff_la_SOURCES) $(libtiffxx_la_SOURCES) \
+	$(mkg3states_SOURCES)
+am__libtiffinclude_HEADERS_DIST = tiff.h tiffconf.h tiffio.h \
+	tiffvers.h tiffio.hxx
+libtiffincludeHEADERS_INSTALL = $(INSTALL_HEADER)
+HEADERS = $(libtiffinclude_HEADERS) $(noinst_HEADERS)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AR = @AR@
+AS = @AS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+GLUT_CFLAGS = @GLUT_CFLAGS@
+GLUT_LIBS = @GLUT_LIBS@
+GLU_CFLAGS = @GLU_CFLAGS@
+GLU_LIBS = @GLU_LIBS@
+GL_CFLAGS = @GL_CFLAGS@
+GL_LIBS = @GL_LIBS@
+GREP = @GREP@
+HAVE_CXX_FALSE = @HAVE_CXX_FALSE@
+HAVE_CXX_TRUE = @HAVE_CXX_TRUE@
+HAVE_OPENGL_FALSE = @HAVE_OPENGL_FALSE@
+HAVE_OPENGL_TRUE = @HAVE_OPENGL_TRUE@
+HAVE_RPATH_FALSE = @HAVE_RPATH_FALSE@
+HAVE_RPATH_TRUE = @HAVE_RPATH_TRUE@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBDIR = @LIBDIR@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTIFF_ALPHA_VERSION = @LIBTIFF_ALPHA_VERSION@
+LIBTIFF_DOCDIR = @LIBTIFF_DOCDIR@
+LIBTIFF_MAJOR_VERSION = @LIBTIFF_MAJOR_VERSION@
+LIBTIFF_MICRO_VERSION = @LIBTIFF_MICRO_VERSION@
+LIBTIFF_MINOR_VERSION = @LIBTIFF_MINOR_VERSION@
+LIBTIFF_RELEASE_DATE = @LIBTIFF_RELEASE_DATE@
+LIBTIFF_VERSION = @LIBTIFF_VERSION@
+LIBTIFF_VERSION_INFO = @LIBTIFF_VERSION_INFO@
+LIBTOOL = @LIBTOOL@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+MAKEINFO = @MAKEINFO@
+NM = @NM@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PTHREAD_CC = @PTHREAD_CC@
+PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
+PTHREAD_LIBS = @PTHREAD_LIBS@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+X_CFLAGS = @X_CFLAGS@
+X_EXTRA_LIBS = @X_EXTRA_LIBS@
+X_LIBS = @X_LIBS@
+X_PRE_LIBS = @X_PRE_LIBS@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_AS = @ac_ct_AS@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
+ac_ct_RANLIB = @ac_ct_RANLIB@
+ac_ct_STRIP = @ac_ct_STRIP@
+acx_pthread_config = @acx_pthread_config@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target = @target@
+target_alias = @target_alias@
+target_cpu = @target_cpu@
+target_os = @target_os@
+target_vendor = @target_vendor@
+LIBPORT = $(top_builddir)/port/libport.la
+LIBTIFF = $(top_builddir)/libtiff/libtiff.la
+EXTRA_DIST = Makefile.vc SConstruct tif_config.h.vc tiffconf.h.vc libtiff.def \
+	     $(EXTRA_SRCS)
+
+HDRS = tiff.h tiffconf.h tiffio.h tiffvers.h $(am__append_1)
+EXTRA_HDRS = \
+	t4.h \
+	tif_dir.h \
+	tif_predict.h \
+	tiffiop.h \
+	uvcode.h
+
+SRCS = \
+	tif_aux.c \
+	tif_close.c \
+	tif_codec.c \
+	tif_color.c \
+	tif_compress.c \
+	tif_dir.c \
+	tif_dirinfo.c \
+	tif_dirread.c \
+	tif_dirwrite.c \
+	tif_dumpmode.c \
+	tif_error.c \
+	tif_extension.c \
+	tif_fax3.c \
+	tif_fax3sm.c \
+	tif_flush.c \
+	tif_getimage.c \
+	tif_jpeg.c \
+	tif_luv.c \
+	tif_lzw.c \
+	tif_next.c \
+	tif_ojpeg.c \
+	tif_open.c \
+	tif_packbits.c \
+	tif_pixarlog.c \
+	tif_predict.c \
+	tif_print.c \
+	tif_read.c \
+	tif_strip.c \
+	tif_swab.c \
+	tif_thunder.c \
+	tif_tile.c \
+	tif_unix.c \
+	tif_version.c \
+	tif_warning.c \
+	tif_write.c \
+	tif_zip.c
+
+SRCSXX = \
+	tif_stream.cxx
+
+EXTRA_SRCS = \
+	tif_acorn.c \
+	tif_apple.c \
+	tif_atari.c \
+	tif_msdos.c \
+	tif_next.c \
+	tif_win3.c \
+	tif_win32.c
+
+libtiffincludedir = $(includedir)
+libtiffinclude_HEADERS = $(HDRS)
+noinst_HEADERS = $(EXTRA_HDRS)
+lib_LTLIBRARIES = libtiff.la $(am__append_2)
+libtiff_la_SOURCES = $(SRCS)
+libtiff_la_LDFLAGS = -no-undefined -version-number \
+	$(LIBTIFF_VERSION_INFO) $(am__append_3)
+libtiff_la_LIBADD = $(LIBPORT)
+libtiffxx_la_SOURCES = $(SRCSXX)
+libtiffxx_la_LDFLAGS = -no-undefined -version-number \
+	$(LIBTIFF_VERSION_INFO) $(am__append_4)
+libtiffxx_la_LIBADD = $(LIBTIFF) $(LIBPORT)
+libtiffxx_la_DEPENDENCIES = libtiff.la
+mkg3states_SOURCES = mkg3states.c tif_fax3.h
+mkg3states_LDADD = $(LIBPORT)
+all: tif_config.h tiffconf.h
+	$(MAKE) $(AM_MAKEFLAGS) all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .cxx .lo .o .obj
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  libtiff/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign  libtiff/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+tif_config.h: stamp-h1
+	@if test ! -f $@; then \
+	  rm -f stamp-h1; \
+	  $(MAKE) stamp-h1; \
+	else :; fi
+
+stamp-h1: $(srcdir)/tif_config.h.in $(top_builddir)/config.status
+	@rm -f stamp-h1
+	cd $(top_builddir) && $(SHELL) ./config.status libtiff/tif_config.h
+$(srcdir)/tif_config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_srcdir) && $(AUTOHEADER)
+	rm -f stamp-h1
+	touch $@
+
+tiffconf.h: stamp-h2
+	@if test ! -f $@; then \
+	  rm -f stamp-h2; \
+	  $(MAKE) stamp-h2; \
+	else :; fi
+
+stamp-h2: $(srcdir)/tiffconf.h.in $(top_builddir)/config.status
+	@rm -f stamp-h2
+	cd $(top_builddir) && $(SHELL) ./config.status libtiff/tiffconf.h
+
+distclean-hdr:
+	-rm -f tif_config.h stamp-h1 tiffconf.h stamp-h2
+install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+	@$(NORMAL_INSTALL)
+	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+	  if test -f $$p; then \
+	    f=$(am__strip_dir) \
+	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+	  else :; fi; \
+	done
+
+uninstall-libLTLIBRARIES:
+	@$(NORMAL_UNINSTALL)
+	@set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+	  p=$(am__strip_dir) \
+	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+	done
+
+clean-libLTLIBRARIES:
+	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
+	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+	  test "$$dir" != "$$p" || dir=.; \
+	  echo "rm -f \"$${dir}/so_locations\""; \
+	  rm -f "$${dir}/so_locations"; \
+	done
+libtiff.la: $(libtiff_la_OBJECTS) $(libtiff_la_DEPENDENCIES)
+	$(LINK) -rpath $(libdir) $(libtiff_la_LDFLAGS) $(libtiff_la_OBJECTS) $(libtiff_la_LIBADD) $(LIBS)
+libtiffxx.la: $(libtiffxx_la_OBJECTS) $(libtiffxx_la_DEPENDENCIES)
+	$(CXXLINK) $(am_libtiffxx_la_rpath) $(libtiffxx_la_LDFLAGS) $(libtiffxx_la_OBJECTS) $(libtiffxx_la_LIBADD) $(LIBS)
+
+clean-noinstPROGRAMS:
+	@list='$(noinst_PROGRAMS)'; for p in $$list; do \
+	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+	  echo " rm -f $$p $$f"; \
+	  rm -f $$p $$f ; \
+	done
+mkg3states$(EXEEXT): $(mkg3states_OBJECTS) $(mkg3states_DEPENDENCIES)
+	@rm -f mkg3states$(EXEEXT)
+	$(LINK) $(mkg3states_LDFLAGS) $(mkg3states_OBJECTS) $(mkg3states_LDADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mkg3states.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tif_aux.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tif_close.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tif_codec.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tif_color.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tif_compress.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tif_dir.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tif_dirinfo.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tif_dirread.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tif_dirwrite.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tif_dumpmode.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tif_error.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tif_extension.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tif_fax3.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tif_fax3sm.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tif_flush.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tif_getimage.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tif_jpeg.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tif_luv.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tif_lzw.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tif_next.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tif_ojpeg.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tif_open.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tif_packbits.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tif_pixarlog.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tif_predict.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tif_print.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tif_read.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tif_stream.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tif_strip.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tif_swab.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tif_thunder.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tif_tile.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tif_unix.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tif_version.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tif_warning.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tif_write.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tif_zip.Plo@am__quote@
+
+.c.o:
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
+
+.c.obj:
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+
+.cxx.o:
+@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+
+.cxx.obj:
+@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.cxx.lo:
+@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+distclean-libtool:
+	-rm -f libtool
+uninstall-info-am:
+install-libtiffincludeHEADERS: $(libtiffinclude_HEADERS)
+	@$(NORMAL_INSTALL)
+	test -z "$(libtiffincludedir)" || $(mkdir_p) "$(DESTDIR)$(libtiffincludedir)"
+	@list='$(libtiffinclude_HEADERS)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(libtiffincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(libtiffincludedir)/$$f'"; \
+	  $(libtiffincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(libtiffincludedir)/$$f"; \
+	done
+
+uninstall-libtiffincludeHEADERS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(libtiffinclude_HEADERS)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(libtiffincludedir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(libtiffincludedir)/$$f"; \
+	done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES) tif_config.h.in tiffconf.h.in $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS) tif_config.h.in tiffconf.h.in $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES) tif_config.h.in tiffconf.h.in $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS) tif_config.h.in tiffconf.h.in $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS) tif_config.h \
+		tiffconf.h
+installdirs:
+	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(libtiffincludedir)"; do \
+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
+	clean-noinstPROGRAMS mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-hdr distclean-libtool distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am: install-libtiffincludeHEADERS
+
+install-exec-am: install-libLTLIBRARIES
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES \
+	uninstall-libtiffincludeHEADERS
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+	clean-libLTLIBRARIES clean-libtool clean-noinstPROGRAMS ctags \
+	distclean distclean-compile distclean-generic distclean-hdr \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-exec install-exec-am install-info \
+	install-info-am install-libLTLIBRARIES \
+	install-libtiffincludeHEADERS install-man install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags uninstall uninstall-am uninstall-info-am \
+	uninstall-libLTLIBRARIES uninstall-libtiffincludeHEADERS
+
+
+faxtable: mkg3states
+	(rm -f tif_fax3sm.c && ./mkg3states -b -c const tif_fax3sm.c)
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/uppsrc/plugin/tif/lib/Makefile.lcc b/uppsrc/plugin/tif/lib/Makefile.lcc
new file mode 100644
index 000000000..aa1906295
--- /dev/null
+++ b/uppsrc/plugin/tif/lib/Makefile.lcc
@@ -0,0 +1,129 @@
+# $Header: /cvsroot/upp/uppsrc/plugin/tif/lib/Makefile.lcc,v 1.1 2005/02/07 00:26:05 rylek Exp $
+#
+# Tag Image File Format Library
+#
+# Copyright (c) 1988-1997 Sam Leffler
+# Copyright (c) 1991-1997 Silicon Graphics, Inc.
+#
+# Permission to use, copy, modify, distribute, and sell this software and
+# its documentation for any purpose is hereby granted without fee, provided
+# that (i) the above copyright notices and this permission notice appear in
+# all copies of the software and related documentation, and (ii) the names of
+# Sam Leffler and Silicon Graphics may not be used in any advertising or
+# publicity relating to the software without the specific, prior written
+# permission of Stanford and Silicon Graphics.
+#
+# THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+# WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+#
+# IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
+# ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
+# OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+# WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
+# LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+# OF THIS SOFTWARE.
+#
+DESTDIR=.
+#
+INSTALL=install
+NULL=
+
+IPATH=	-I. -I../jpeg
+CONF_LIBRARY=\
+	${NULL}
+COPTS=	-Oloop -cwagshf -d1 -b0 -v -DNDEBUG -rr -j135i
+CFLAGS=	${COPTS} ${IPATH} ${CONF_LIBRARY}
+#
+INCS=	tiff.h tiffio.h
+SRCS=	tif_fax3.c \
+	tif_fax4.c \
+	tif_aux.c \
+	tif_atari.c \
+	tif_ccittrle.c \
+	tif_close.c \
+	tif_compress.c \
+	tif_dir.c \
+	tif_dirinfo.c \
+	tif_dirread.c \
+	tif_dirwrite.c \
+	tif_dumpmode.c \
+	tif_error.c \
+	tif_getimage.c \
+	tif_jpeg.c \
+	tif_flush.c \
+	tif_lzw.c \
+	tif_next.c \
+	tif_open.c \
+	tif_packbits.c \
+	tif_print.c \
+	tif_read.c \
+	tif_swab.c \
+	tif_strip.c \
+	tif_thunder.c \
+	tif_tile.c \
+	tif_version.c \
+	tif_warning.c \
+	tif_write.c \
+	${NULL}
+OBJS=	tif_fax3.o \
+	tif_fax4.o \
+	tif_aux.o \
+	tif_atari.o \
+	tif_ccittrle.o \
+	tif_close.o \
+	tif_compress.o \
+	tif_dir.o \
+	tif_dirinfo.o \
+	tif_dirread.o \
+	tif_dirwrite.o \
+	tif_dumpmode.o \
+	tif_error.o \
+	tif_getimage.o \
+	tif_jpeg.o \
+	tif_flush.o \
+	tif_lzw.o \
+	tif_next.o \
+	tif_open.o \
+	tif_packbits.o \
+	tif_print.o \
+	tif_read.o \
+	tif_swab.o \
+	tif_strip.o \
+	tif_thunder.o \
+	tif_tile.o \
+	tif_version.o \
+	tif_warning.o \
+	tif_write.o \
+	${NULL}
+ALL=	tiffrnb.lib
+
+all:	${ALL}
+
+${ALL}:	${OBJS}
+	${AR} ${ARFLAGS} $@ r $<
+
+${OBJS}: tiffio.h tiff.h tiffcomp.h tiffiop.h tiffconf.h
+tif_fax3.o: tif_fax3.c g3states.h t4.h tif_fax3.h
+
+g3states.h: mkg3states.c t4.h
+	${CC} -o mkg3states.ttp ${CFLAGS} mkg3states.c
+	./mkg3states -c > g3states.h
+
+install: all installh
+	-for i in ${ALL}; do \
+	${INSTALL} -c -m 644 $$i ${DESTDIR}/lib/$$i; \
+	done
+
+installh: ${INCS}
+	-for i in ${INCS}; do \
+		h=`basename $$i`; \
+		cmp -s $$i ${DESTDIR}/include/$$h || \
+		  ${INSTALL} -c -m 444 $$i ${DESTDIR}/include/$$h; \
+	done
+
+clean:
+	rm -f ${ALL} ${OBJS} mkg3states.ttp mkg3states.o g3states.h
+
+tags:	${SRCS}
+	${CTAGS} ${SRCS}
diff --git a/uppsrc/plugin/tif/lib/Makefile.vc b/uppsrc/plugin/tif/lib/Makefile.vc
new file mode 100644
index 000000000..c113b5b89
--- /dev/null
+++ b/uppsrc/plugin/tif/lib/Makefile.vc
@@ -0,0 +1,98 @@
+# $Id: Makefile.vc,v 1.15 2006/03/23 14:54:02 dron Exp $
+#
+# Copyright (C) 2004, Andrey Kiselev <dron@ak4719.spb.edu>
+#
+# Permission to use, copy, modify, distribute, and sell this software and
+# its documentation for any purpose is hereby granted without fee, provided
+# that (i) the above copyright notices and this permission notice appear in
+# all copies of the software and related documentation, and (ii) the names of
+# Sam Leffler and Silicon Graphics may not be used in any advertising or
+# publicity relating to the software without the specific, prior written
+# permission of Sam Leffler and Silicon Graphics.
+#
+# THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+# WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+#
+# IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
+# ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
+# OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+# WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
+# LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+# OF THIS SOFTWARE.
+#
+# Makefile for MS Visual C and Watcom C compilers.
+#
+# To build:
+# C:\libtiff\libtiff> nmake /f makefile.vc all
+#
+
+!INCLUDE ..\nmake.opt
+
+INCL	= -I. $(JPEG_INCLUDE) $(ZLIB_INCLUDE)
+
+!IFDEF USE_WIN_CRT_LIB
+OBJ_SYSDEP_MODULE = tif_unix.obj
+!ELSE
+OBJ_SYSDEP_MODULE = tif_win32.obj
+!ENDIF
+
+OBJ	= \
+	tif_aux.obj \
+	tif_close.obj \
+	tif_codec.obj \
+	tif_color.obj \
+	tif_compress.obj \
+	tif_dir.obj \
+	tif_dirinfo.obj \
+	tif_dirread.obj \
+	tif_dirwrite.obj \
+	tif_dumpmode.obj \
+	tif_error.obj \
+	tif_extension.obj \
+	tif_fax3.obj \
+	tif_fax3sm.obj \
+	tif_getimage.obj \
+	tif_jpeg.obj \
+	tif_ojpeg.obj \
+	tif_flush.obj \
+	tif_luv.obj \
+	tif_lzw.obj \
+	tif_next.obj \
+	tif_open.obj \
+	tif_packbits.obj \
+	tif_pixarlog.obj \
+	tif_predict.obj \
+	tif_print.obj \
+	tif_read.obj \
+	tif_stream.obj \
+	tif_swab.obj \
+	tif_strip.obj \
+	tif_thunder.obj \
+	tif_tile.obj \
+	tif_version.obj \
+	tif_warning.obj \
+	tif_write.obj \
+	tif_zip.obj \
+	$(OBJ_SYSDEP_MODULE)
+
+all:	libtiff.lib $(DLLNAME)
+
+tif_config.h:	tif_config.h.vc
+	copy tif_config.h.vc tif_config.h
+
+tiffconf.h:	tiffconf.h.vc
+	copy tiffconf.h.vc tiffconf.h
+
+libtiff.lib:	tif_config.h tiffconf.h $(OBJ)
+	$(AR) /out:libtiff.lib $(OBJ) $(LIBS)
+
+$(DLLNAME):	tif_config.h tiffconf.h libtiff.def $(OBJ)
+	$(LD) /debug /dll /def:libtiff.def /out:$(DLLNAME) \
+	/implib:libtiff_i.lib $(OBJ) $(LIBS)
+
+clean:
+	-del *.obj
+	-del *.lib
+	-del *.dll
+	-del *.exe
diff --git a/uppsrc/plugin/tif/lib/Readme b/uppsrc/plugin/tif/lib/Readme
new file mode 100644
index 000000000..8456107a9
--- /dev/null
+++ b/uppsrc/plugin/tif/lib/Readme
@@ -0,0 +1,59 @@
+$Header: /cvs/maptools/cvsroot/libtiff/README,v 1.5 2004/10/30 13:44:45 dron Exp $
+
+
+TIFF Software Distribution
+--------------------------
+This file is just a placeholder; all the documentation is now in
+HTML in the html directory.  To view the documentation point your
+favorite WWW viewer at html/index.html; e.g.
+
+    netscape html/index.html
+
+If you don't have an HTML viewer then you can read the HTML source
+or fetch a PostScript version of this documentation from the directory
+
+    ftp://ftp.remotesensing.org/pub/libtiff/
+
+If you can't hack either of these options then basically what you
+want to do is:
+
+    % ./configure
+    % make
+    % su
+    # make install
+
+More information, email contacts, and mailing list information can be
+found online at http://www.remotesensing.org/libtiff/.
+
+
+Use and Copyright
+-----------------
+Silicon Graphics has seen fit to allow us to give this work away.  It
+is free.  There is no support or guarantee of any sort as to its
+operations, correctness, or whatever.  If you do anything useful with
+all or parts of it you need to honor the copyright notices.   I would
+also be interested in knowing about it and, hopefully, be acknowledged.
+
+The legal way of saying that is:
+
+Copyright (c) 1988-1997 Sam Leffler
+Copyright (c) 1991-1997 Silicon Graphics, Inc.
+
+Permission to use, copy, modify, distribute, and sell this software and
+its documentation for any purpose is hereby granted without fee, provided
+that (i) the above copyright notices and this permission notice appear in
+all copies of the software and related documentation, and (ii) the names of
+Sam Leffler and Silicon Graphics may not be used in any advertising or
+publicity relating to the software without the specific, prior written
+permission of Sam Leffler and Silicon Graphics.
+
+THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
+EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+
+IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
+ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
+OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
+LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+OF THIS SOFTWARE.
diff --git a/uppsrc/plugin/tif/lib/Release-date b/uppsrc/plugin/tif/lib/Release-date
new file mode 100644
index 000000000..14ad11c67
--- /dev/null
+++ b/uppsrc/plugin/tif/lib/Release-date
@@ -0,0 +1 @@
+20060323
diff --git a/uppsrc/plugin/tif/lib/SConstruct b/uppsrc/plugin/tif/lib/SConstruct
new file mode 100644
index 000000000..9bac8b715
--- /dev/null
+++ b/uppsrc/plugin/tif/lib/SConstruct
@@ -0,0 +1,169 @@
+# $Id: SConstruct,v 1.2 2006/03/23 14:54:00 dron Exp $
+
+# Tag Image File Format (TIFF) Software
+#
+# Copyright (C) 2005, Andrey Kiselev <dron@ak4719.spb.edu>
+#
+# Permission to use, copy, modify, distribute, and sell this software and
+# its documentation for any purpose is hereby granted without fee, provided
+# that (i) the above copyright notices and this permission notice appear in
+# all copies of the software and related documentation, and (ii) the names of
+# Sam Leffler and Silicon Graphics may not be used in any advertising or
+# publicity relating to the software without the specific, prior written
+# permission of Sam Leffler and Silicon Graphics.
+#
+# THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+# WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+#
+# IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
+# ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
+# OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+# WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
+# LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+# OF THIS SOFTWARE.
+
+# This file contains rules to build software with the SCons tool
+# (see the http://www.scons.org/ for details on SCons).
+
+import os
+
+env = Environment()
+
+# Read the user supplied options
+opts = Options('libtiff.conf')
+opts.Add(PathOption('PREFIX', \
+    'install architecture-independent files in this directory', \
+    '/usr/local', PathOption.PathIsDirCreate))
+opts.Add(BoolOption('ccitt', \
+    'enable support for CCITT Group 3 & 4 algorithms', \
+    'yes'))
+opts.Add(BoolOption('packbits', \
+    'enable support for Macintosh PackBits algorithm', \
+    'yes'))
+opts.Add(BoolOption('lzw', \
+    'enable support for LZW algorithm', \
+    'yes'))
+opts.Add(BoolOption('thunder', \
+    'enable support for ThunderScan 4-bit RLE algorithm', \
+    'yes'))
+opts.Add(BoolOption('next', \
+    'enable support for NeXT 2-bit RLE algorithm', \
+    'yes'))
+opts.Add(BoolOption('logluv', \
+    'enable support for LogLuv high dynamic range encoding', \
+    'yes'))
+opts.Add(BoolOption('strip_chopping', \
+    'support for strip chopping (whether or not to convert single-strip uncompressed images to mutiple strips of ~8Kb to reduce memory usage)', \
+    'yes'))
+opts.Add(BoolOption('extrasample_as_alpha', \
+    'the RGBA interface will treat a fourth sample with no EXTRASAMPLE_ value as being ASSOCALPHA. Many packages produce RGBA files but don\'t mark the alpha properly', \
+    'yes'))
+opts.Add(BoolOption('check_ycbcr_subsampling', \
+    'disable picking up YCbCr subsampling info from the JPEG data stream to support files lacking the tag', \
+    'yes'))
+opts.Update(env)
+opts.Save('libtiff.conf', env)
+Help(opts.GenerateHelpText(env))
+
+# Here are our installation paths:
+idir_prefix = '$PREFIX'
+idir_lib = '$PREFIX/lib'
+idir_bin = '$PREFIX/bin'
+idir_inc = '$PREFIX/include'
+idir_doc = '$PREFIX/doc'
+Export([ 'env', 'idir_prefix', 'idir_lib', 'idir_bin', 'idir_inc', 'idir_doc' ])
+
+# Now proceed to system feature checks
+target_cpu, target_vendor, target_kernel, target_os = \
+    os.popen("./config.guess").readlines()[0].split("-")
+
+def Define(context, key, have):
+    import SCons.Conftest
+    SCons.Conftest._Have(context, key, have)
+
+def CheckCustomOption(context, name):
+    context.Message('Checking is the ' + name + ' option set... ')
+    ret = env[name]
+    Define(context, name + '_SUPPORT', ret)
+    context.Result(ret)
+    return ret
+
+def CheckFillorderOption(context):
+    context.Message('Checking for the native cpu bit order... ')
+    if target_cpu[0] == 'i' and target_cpu[2:] == '86':
+	Define(context, 'HOST_FILLORDER', 'FILLORDER_LSB2MSB')
+	context.Result('lsb2msb')
+    else:
+	Define(context, 'HOST_FILLORDER', 'FILLORDER_MSB2LSB')
+	context.Result('msb2lsb')
+    return 1
+
+def CheckIEEEFPOption(context):
+    context.Message('Checking for the IEEE floating point format... ')
+    Define(context, 'HAVE_IEEEFP', 1)
+    context.Result(1)
+    return 1
+
+def CheckOtherOption(context, name):
+    context.Message('Checking is the ' + name + ' option set... ')
+    ret = env[name]
+    Define(context, 'HAVE_' + name, ret)
+    context.Result(ret)
+    return ret
+
+custom_tests = { \
+    'CheckCustomOption' : CheckCustomOption, \
+    'CheckFillorderOption' : CheckFillorderOption, \
+    'CheckIEEEFPOption' : CheckIEEEFPOption, \
+    'CheckOtherOption' : CheckOtherOption \
+    }
+conf = Configure(env, custom_tests = custom_tests, \
+    config_h = 'libtiff/tif_config.h')
+
+# Check for standard library
+conf.CheckLib('c')
+if target_os != 'cygwin' \
+    and target_os != 'mingw32' \
+    and target_os != 'beos' \
+    and target_os != 'darwin':
+    conf.CheckLib('m')
+
+# Check for system headers
+conf.CheckCHeader('assert.h')
+conf.CheckCHeader('fcntl.h')
+conf.CheckCHeader('limits.h')
+conf.CheckCHeader('malloc.h')
+conf.CheckCHeader('search.h')
+conf.CheckCHeader('sys/time.h')
+conf.CheckCHeader('unistd.h')
+
+# Check for standard library functions
+conf.CheckFunc('floor')
+conf.CheckFunc('isascii')
+conf.CheckFunc('memmove')
+conf.CheckFunc('memset')
+conf.CheckFunc('mmap')
+conf.CheckFunc('pow')
+conf.CheckFunc('sqrt')
+conf.CheckFunc('strchr')
+conf.CheckFunc('strrchr')
+conf.CheckFunc('strstr')
+conf.CheckFunc('strtol')
+
+conf.CheckFillorderOption()
+conf.CheckIEEEFPOption()
+conf.CheckCustomOption('ccitt')
+conf.CheckCustomOption('packbits')
+conf.CheckCustomOption('lzw')
+conf.CheckCustomOption('thunder')
+conf.CheckCustomOption('next')
+conf.CheckCustomOption('logluv')
+conf.CheckOtherOption('strip_chopping')
+conf.CheckOtherOption('extrasample_as_alpha')
+conf.CheckOtherOption('check_ycbcr_subsampling')
+
+env = conf.Finish()
+
+# Ok, now go to build files in the subdirectories
+SConscript(dirs = [ 'libtiff' ], name = 'SConstruct')
diff --git a/uppsrc/plugin/tif/lib/Version b/uppsrc/plugin/tif/lib/Version
new file mode 100644
index 000000000..a08ffae0c
--- /dev/null
+++ b/uppsrc/plugin/tif/lib/Version
@@ -0,0 +1 @@
+3.8.2
diff --git a/uppsrc/plugin/tif/lib/fax3sm_winnt.c b/uppsrc/plugin/tif/lib/fax3sm_winnt.c
new file mode 100644
index 000000000..564c9aa4d
--- /dev/null
+++ b/uppsrc/plugin/tif/lib/fax3sm_winnt.c
@@ -0,0 +1,1046 @@
+/* WARNING, this file was automatically generated by the
+    mkg3states program */
+#include "tiff.h"
+#include "tif_fax3.h"
+ const  TIFFFaxTabEnt TIFFFaxMainTable[128] = {
+12,7,0,3,1,0,5,3,1,3,1,0,2,3,0,3,1,0,4,3,1,3,1,0,1,4,0,3,1,0,5,3,1,3,1,0,
+2,3,0,3,1,0,4,3,1,3,1,0,5,6,2,3,1,0,5,3,1,3,1,0,2,3,0,3,1,0,4,3,1,3,1,0,
+1,4,0,3,1,0,5,3,1,3,1,0,2,3,0,3,1,0,4,3,1,3,1,0,5,7,3,3,1,0,5,3,1,3,1,0,
+2,3,0,3,1,0,4,3,1,3,1,0,1,4,0,3,1,0,5,3,1,3,1,0,2,3,0,3,1,0,4,3,1,3,1,0,
+4,6,2,3,1,0,5,3,1,3,1,0,2,3,0,3,1,0,4,3,1,3,1,0,1,4,0,3,1,0,5,3,1,3,1,0,
+2,3,0,3,1,0,4,3,1,3,1,0,6,7,0,3,1,0,5,3,1,3,1,0,2,3,0,3,1,0,4,3,1,3,1,0,
+1,4,0,3,1,0,5,3,1,3,1,0,2,3,0,3,1,0,4,3,1,3,1,0,5,6,2,3,1,0,5,3,1,3,1,0,
+2,3,0,3,1,0,4,3,1,3,1,0,1,4,0,3,1,0,5,3,1,3,1,0,2,3,0,3,1,0,4,3,1,3,1,0,
+4,7,3,3,1,0,5,3,1,3,1,0,2,3,0,3,1,0,4,3,1,3,1,0,1,4,0,3,1,0,5,3,1,3,1,0,
+2,3,0,3,1,0,4,3,1,3,1,0,4,6,2,3,1,0,5,3,1,3,1,0,2,3,0,3,1,0,4,3,1,3,1,0,
+1,4,0,3,1,0,5,3,1,3,1,0,2,3,0,3,1,0,4,3,1,3,1,0
+};
+const TIFFFaxTabEnt TIFFFaxWhiteTable[4096] = {
+12,11,0,7,4,3,7,5,11,7,4,5,7,6,12,7,5,9,9,6,1664,7,4,6,7,7,20,9,5,128,7,7,24,7,6,14,
+7,7,28,7,4,4,7,4,2,7,4,7,7,7,23,7,4,3,7,7,27,7,4,5,7,8,39,7,6,16,9,8,576,7,4,6,
+7,7,19,7,5,8,7,8,55,9,5,64,7,5,10,7,4,4,7,4,2,7,4,7,7,8,45,7,4,3,7,5,11,7,4,5,
+7,8,53,7,5,9,9,8,448,7,4,6,7,8,35,9,5,128,7,8,51,7,6,15,7,8,63,7,4,4,7,4,2,7,4,7,
+7,6,13,7,4,3,9,9,1472,7,4,5,7,8,43,7,6,17,9,9,1216,7,4,6,7,6,1,7,5,8,9,6,192,9,5,64,
+7,5,10,7,4,4,7,4,2,7,4,7,7,8,29,7,4,3,7,5,11,7,4,5,7,6,12,7,5,9,9,6,1664,7,4,6,
+7,8,33,9,5,128,7,8,49,7,6,14,7,8,61,7,4,4,7,4,2,7,4,7,7,8,47,7,4,3,7,8,59,7,4,5,
+7,8,41,7,6,16,9,9,960,7,4,6,7,8,31,7,5,8,7,8,57,9,5,64,7,5,10,7,4,4,7,4,2,7,4,7,
+7,7,22,7,4,3,7,5,11,7,4,5,7,7,26,7,5,9,9,9,704,7,4,6,7,8,37,9,5,128,7,7,25,7,6,15,
+9,8,320,7,4,4,7,4,2,7,4,7,7,6,13,7,4,3,7,7,18,7,4,5,7,7,21,7,6,17,9,7,256,7,4,6,
+7,6,1,7,5,8,9,6,192,9,5,64,7,5,10,7,4,4,7,4,2,7,4,7,11,11,1792,7,4,3,7,5,11,7,4,5,
+7,6,12,7,5,9,9,6,1664,7,4,6,7,7,20,9,5,128,7,7,24,7,6,14,7,7,28,7,4,4,7,4,2,7,4,7,
+7,7,23,7,4,3,7,7,27,7,4,5,7,8,40,7,6,16,9,9,832,7,4,6,7,7,19,7,5,8,7,8,56,9,5,64,
+7,5,10,7,4,4,7,4,2,7,4,7,7,8,46,7,4,3,7,5,11,7,4,5,7,8,54,7,5,9,9,8,512,7,4,6,
+7,8,36,9,5,128,7,8,52,7,6,15,7,8,0,7,4,4,7,4,2,7,4,7,7,6,13,7,4,3,9,9,1600,7,4,5,
+7,8,44,7,6,17,9,9,1344,7,4,6,7,6,1,7,5,8,9,6,192,9,5,64,7,5,10,7,4,4,7,4,2,7,4,7,
+7,8,30,7,4,3,7,5,11,7,4,5,7,6,12,7,5,9,9,6,1664,7,4,6,7,8,34,9,5,128,7,8,50,7,6,14,
+7,8,62,7,4,4,7,4,2,7,4,7,7,8,48,7,4,3,7,8,60,7,4,5,7,8,42,7,6,16,9,9,1088,7,4,6,
+7,8,32,7,5,8,7,8,58,9,5,64,7,5,10,7,4,4,7,4,2,7,4,7,7,7,22,7,4,3,7,5,11,7,4,5,
+7,7,26,7,5,9,9,8,640,7,4,6,7,8,38,9,5,128,7,7,25,7,6,15,9,8,384,7,4,4,7,4,2,7,4,7,
+7,6,13,7,4,3,7,7,18,7,4,5,7,7,21,7,6,17,9,7,256,7,4,6,7,6,1,7,5,8,9,6,192,9,5,64,
+7,5,10,7,4,4,7,4,2,7,4,7,0,0,0,7,4,3,7,5,11,7,4,5,7,6,12,7,5,9,9,6,1664,7,4,6,
+7,7,20,9,5,128,7,7,24,7,6,14,7,7,28,7,4,4,7,4,2,7,4,7,7,7,23,7,4,3,7,7,27,7,4,5,
+7,8,39,7,6,16,9,8,576,7,4,6,7,7,19,7,5,8,7,8,55,9,5,64,7,5,10,7,4,4,7,4,2,7,4,7,
+7,8,45,7,4,3,7,5,11,7,4,5,7,8,53,7,5,9,9,8,448,7,4,6,7,8,35,9,5,128,7,8,51,7,6,15,
+7,8,63,7,4,4,7,4,2,7,4,7,7,6,13,7,4,3,9,9,1536,7,4,5,7,8,43,7,6,17,9,9,1280,7,4,6,
+7,6,1,7,5,8,9,6,192,9,5,64,7,5,10,7,4,4,7,4,2,7,4,7,7,8,29,7,4,3,7,5,11,7,4,5,
+7,6,12,7,5,9,9,6,1664,7,4,6,7,8,33,9,5,128,7,8,49,7,6,14,7,8,61,7,4,4,7,4,2,7,4,7,
+7,8,47,7,4,3,7,8,59,7,4,5,7,8,41,7,6,16,9,9,1024,7,4,6,7,8,31,7,5,8,7,8,57,9,5,64,
+7,5,10,7,4,4,7,4,2,7,4,7,7,7,22,7,4,3,7,5,11,7,4,5,7,7,26,7,5,9,9,9,768,7,4,6,
+7,8,37,9,5,128,7,7,25,7,6,15,9,8,320,7,4,4,7,4,2,7,4,7,7,6,13,7,4,3,7,7,18,7,4,5,
+7,7,21,7,6,17,9,7,256,7,4,6,7,6,1,7,5,8,9,6,192,9,5,64,7,5,10,7,4,4,7,4,2,7,4,7,
+11,11,1856,7,4,3,7,5,11,7,4,5,7,6,12,7,5,9,9,6,1664,7,4,6,7,7,20,9,5,128,7,7,24,7,6,14,
+7,7,28,7,4,4,7,4,2,7,4,7,7,7,23,7,4,3,7,7,27,7,4,5,7,8,40,7,6,16,9,9,896,7,4,6,
+7,7,19,7,5,8,7,8,56,9,5,64,7,5,10,7,4,4,7,4,2,7,4,7,7,8,46,7,4,3,7,5,11,7,4,5,
+7,8,54,7,5,9,9,8,512,7,4,6,7,8,36,9,5,128,7,8,52,7,6,15,7,8,0,7,4,4,7,4,2,7,4,7,
+7,6,13,7,4,3,9,9,1728,7,4,5,7,8,44,7,6,17,9,9,1408,7,4,6,7,6,1,7,5,8,9,6,192,9,5,64,
+7,5,10,7,4,4,7,4,2,7,4,7,7,8,30,7,4,3,7,5,11,7,4,5,7,6,12,7,5,9,9,6,1664,7,4,6,
+7,8,34,9,5,128,7,8,50,7,6,14,7,8,62,7,4,4,7,4,2,7,4,7,7,8,48,7,4,3,7,8,60,7,4,5,
+7,8,42,7,6,16,9,9,1152,7,4,6,7,8,32,7,5,8,7,8,58,9,5,64,7,5,10,7,4,4,7,4,2,7,4,7,
+7,7,22,7,4,3,7,5,11,7,4,5,7,7,26,7,5,9,9,8,640,7,4,6,7,8,38,9,5,128,7,7,25,7,6,15,
+9,8,384,7,4,4,7,4,2,7,4,7,7,6,13,7,4,3,7,7,18,7,4,5,7,7,21,7,6,17,9,7,256,7,4,6,
+7,6,1,7,5,8,9,6,192,9,5,64,7,5,10,7,4,4,7,4,2,7,4,7,0,0,0,7,4,3,7,5,11,7,4,5,
+7,6,12,7,5,9,9,6,1664,7,4,6,7,7,20,9,5,128,7,7,24,7,6,14,7,7,28,7,4,4,7,4,2,7,4,7,
+7,7,23,7,4,3,7,7,27,7,4,5,7,8,39,7,6,16,9,8,576,7,4,6,7,7,19,7,5,8,7,8,55,9,5,64,
+7,5,10,7,4,4,7,4,2,7,4,7,7,8,45,7,4,3,7,5,11,7,4,5,7,8,53,7,5,9,9,8,448,7,4,6,
+7,8,35,9,5,128,7,8,51,7,6,15,7,8,63,7,4,4,7,4,2,7,4,7,7,6,13,7,4,3,9,9,1472,7,4,5,
+7,8,43,7,6,17,9,9,1216,7,4,6,7,6,1,7,5,8,9,6,192,9,5,64,7,5,10,7,4,4,7,4,2,7,4,7,
+7,8,29,7,4,3,7,5,11,7,4,5,7,6,12,7,5,9,9,6,1664,7,4,6,7,8,33,9,5,128,7,8,49,7,6,14,
+7,8,61,7,4,4,7,4,2,7,4,7,7,8,47,7,4,3,7,8,59,7,4,5,7,8,41,7,6,16,9,9,960,7,4,6,
+7,8,31,7,5,8,7,8,57,9,5,64,7,5,10,7,4,4,7,4,2,7,4,7,7,7,22,7,4,3,7,5,11,7,4,5,
+7,7,26,7,5,9,9,9,704,7,4,6,7,8,37,9,5,128,7,7,25,7,6,15,9,8,320,7,4,4,7,4,2,7,4,7,
+7,6,13,7,4,3,7,7,18,7,4,5,7,7,21,7,6,17,9,7,256,7,4,6,7,6,1,7,5,8,9,6,192,9,5,64,
+7,5,10,7,4,4,7,4,2,7,4,7,11,12,2112,7,4,3,7,5,11,7,4,5,7,6,12,7,5,9,9,6,1664,7,4,6,
+7,7,20,9,5,128,7,7,24,7,6,14,7,7,28,7,4,4,7,4,2,7,4,7,7,7,23,7,4,3,7,7,27,7,4,5,
+7,8,40,7,6,16,9,9,832,7,4,6,7,7,19,7,5,8,7,8,56,9,5,64,7,5,10,7,4,4,7,4,2,7,4,7,
+7,8,46,7,4,3,7,5,11,7,4,5,7,8,54,7,5,9,9,8,512,7,4,6,7,8,36,9,5,128,7,8,52,7,6,15,
+7,8,0,7,4,4,7,4,2,7,4,7,7,6,13,7,4,3,9,9,1600,7,4,5,7,8,44,7,6,17,9,9,1344,7,4,6,
+7,6,1,7,5,8,9,6,192,9,5,64,7,5,10,7,4,4,7,4,2,7,4,7,7,8,30,7,4,3,7,5,11,7,4,5,
+7,6,12,7,5,9,9,6,1664,7,4,6,7,8,34,9,5,128,7,8,50,7,6,14,7,8,62,7,4,4,7,4,2,7,4,7,
+7,8,48,7,4,3,7,8,60,7,4,5,7,8,42,7,6,16,9,9,1088,7,4,6,7,8,32,7,5,8,7,8,58,9,5,64,
+7,5,10,7,4,4,7,4,2,7,4,7,7,7,22,7,4,3,7,5,11,7,4,5,7,7,26,7,5,9,9,8,640,7,4,6,
+7,8,38,9,5,128,7,7,25,7,6,15,9,8,384,7,4,4,7,4,2,7,4,7,7,6,13,7,4,3,7,7,18,7,4,5,
+7,7,21,7,6,17,9,7,256,7,4,6,7,6,1,7,5,8,9,6,192,9,5,64,7,5,10,7,4,4,7,4,2,7,4,7,
+0,0,0,7,4,3,7,5,11,7,4,5,7,6,12,7,5,9,9,6,1664,7,4,6,7,7,20,9,5,128,7,7,24,7,6,14,
+7,7,28,7,4,4,7,4,2,7,4,7,7,7,23,7,4,3,7,7,27,7,4,5,7,8,39,7,6,16,9,8,576,7,4,6,
+7,7,19,7,5,8,7,8,55,9,5,64,7,5,10,7,4,4,7,4,2,7,4,7,7,8,45,7,4,3,7,5,11,7,4,5,
+7,8,53,7,5,9,9,8,448,7,4,6,7,8,35,9,5,128,7,8,51,7,6,15,7,8,63,7,4,4,7,4,2,7,4,7,
+7,6,13,7,4,3,9,9,1536,7,4,5,7,8,43,7,6,17,9,9,1280,7,4,6,7,6,1,7,5,8,9,6,192,9,5,64,
+7,5,10,7,4,4,7,4,2,7,4,7,7,8,29,7,4,3,7,5,11,7,4,5,7,6,12,7,5,9,9,6,1664,7,4,6,
+7,8,33,9,5,128,7,8,49,7,6,14,7,8,61,7,4,4,7,4,2,7,4,7,7,8,47,7,4,3,7,8,59,7,4,5,
+7,8,41,7,6,16,9,9,1024,7,4,6,7,8,31,7,5,8,7,8,57,9,5,64,7,5,10,7,4,4,7,4,2,7,4,7,
+7,7,22,7,4,3,7,5,11,7,4,5,7,7,26,7,5,9,9,9,768,7,4,6,7,8,37,9,5,128,7,7,25,7,6,15,
+9,8,320,7,4,4,7,4,2,7,4,7,7,6,13,7,4,3,7,7,18,7,4,5,7,7,21,7,6,17,9,7,256,7,4,6,
+7,6,1,7,5,8,9,6,192,9,5,64,7,5,10,7,4,4,7,4,2,7,4,7,11,12,2368,7,4,3,7,5,11,7,4,5,
+7,6,12,7,5,9,9,6,1664,7,4,6,7,7,20,9,5,128,7,7,24,7,6,14,7,7,28,7,4,4,7,4,2,7,4,7,
+7,7,23,7,4,3,7,7,27,7,4,5,7,8,40,7,6,16,9,9,896,7,4,6,7,7,19,7,5,8,7,8,56,9,5,64,
+7,5,10,7,4,4,7,4,2,7,4,7,7,8,46,7,4,3,7,5,11,7,4,5,7,8,54,7,5,9,9,8,512,7,4,6,
+7,8,36,9,5,128,7,8,52,7,6,15,7,8,0,7,4,4,7,4,2,7,4,7,7,6,13,7,4,3,9,9,1728,7,4,5,
+7,8,44,7,6,17,9,9,1408,7,4,6,7,6,1,7,5,8,9,6,192,9,5,64,7,5,10,7,4,4,7,4,2,7,4,7,
+7,8,30,7,4,3,7,5,11,7,4,5,7,6,12,7,5,9,9,6,1664,7,4,6,7,8,34,9,5,128,7,8,50,7,6,14,
+7,8,62,7,4,4,7,4,2,7,4,7,7,8,48,7,4,3,7,8,60,7,4,5,7,8,42,7,6,16,9,9,1152,7,4,6,
+7,8,32,7,5,8,7,8,58,9,5,64,7,5,10,7,4,4,7,4,2,7,4,7,7,7,22,7,4,3,7,5,11,7,4,5,
+7,7,26,7,5,9,9,8,640,7,4,6,7,8,38,9,5,128,7,7,25,7,6,15,9,8,384,7,4,4,7,4,2,7,4,7,
+7,6,13,7,4,3,7,7,18,7,4,5,7,7,21,7,6,17,9,7,256,7,4,6,7,6,1,7,5,8,9,6,192,9,5,64,
+7,5,10,7,4,4,7,4,2,7,4,7,0,0,0,7,4,3,7,5,11,7,4,5,7,6,12,7,5,9,9,6,1664,7,4,6,
+7,7,20,9,5,128,7,7,24,7,6,14,7,7,28,7,4,4,7,4,2,7,4,7,7,7,23,7,4,3,7,7,27,7,4,5,
+7,8,39,7,6,16,9,8,576,7,4,6,7,7,19,7,5,8,7,8,55,9,5,64,7,5,10,7,4,4,7,4,2,7,4,7,
+7,8,45,7,4,3,7,5,11,7,4,5,7,8,53,7,5,9,9,8,448,7,4,6,7,8,35,9,5,128,7,8,51,7,6,15,
+7,8,63,7,4,4,7,4,2,7,4,7,7,6,13,7,4,3,9,9,1472,7,4,5,7,8,43,7,6,17,9,9,1216,7,4,6,
+7,6,1,7,5,8,9,6,192,9,5,64,7,5,10,7,4,4,7,4,2,7,4,7,7,8,29,7,4,3,7,5,11,7,4,5,
+7,6,12,7,5,9,9,6,1664,7,4,6,7,8,33,9,5,128,7,8,49,7,6,14,7,8,61,7,4,4,7,4,2,7,4,7,
+7,8,47,7,4,3,7,8,59,7,4,5,7,8,41,7,6,16,9,9,960,7,4,6,7,8,31,7,5,8,7,8,57,9,5,64,
+7,5,10,7,4,4,7,4,2,7,4,7,7,7,22,7,4,3,7,5,11,7,4,5,7,7,26,7,5,9,9,9,704,7,4,6,
+7,8,37,9,5,128,7,7,25,7,6,15,9,8,320,7,4,4,7,4,2,7,4,7,7,6,13,7,4,3,7,7,18,7,4,5,
+7,7,21,7,6,17,9,7,256,7,4,6,7,6,1,7,5,8,9,6,192,9,5,64,7,5,10,7,4,4,7,4,2,7,4,7,
+11,12,1984,7,4,3,7,5,11,7,4,5,7,6,12,7,5,9,9,6,1664,7,4,6,7,7,20,9,5,128,7,7,24,7,6,14,
+7,7,28,7,4,4,7,4,2,7,4,7,7,7,23,7,4,3,7,7,27,7,4,5,7,8,40,7,6,16,9,9,832,7,4,6,
+7,7,19,7,5,8,7,8,56,9,5,64,7,5,10,7,4,4,7,4,2,7,4,7,7,8,46,7,4,3,7,5,11,7,4,5,
+7,8,54,7,5,9,9,8,512,7,4,6,7,8,36,9,5,128,7,8,52,7,6,15,7,8,0,7,4,4,7,4,2,7,4,7,
+7,6,13,7,4,3,9,9,1600,7,4,5,7,8,44,7,6,17,9,9,1344,7,4,6,7,6,1,7,5,8,9,6,192,9,5,64,
+7,5,10,7,4,4,7,4,2,7,4,7,7,8,30,7,4,3,7,5,11,7,4,5,7,6,12,7,5,9,9,6,1664,7,4,6,
+7,8,34,9,5,128,7,8,50,7,6,14,7,8,62,7,4,4,7,4,2,7,4,7,7,8,48,7,4,3,7,8,60,7,4,5,
+7,8,42,7,6,16,9,9,1088,7,4,6,7,8,32,7,5,8,7,8,58,9,5,64,7,5,10,7,4,4,7,4,2,7,4,7,
+7,7,22,7,4,3,7,5,11,7,4,5,7,7,26,7,5,9,9,8,640,7,4,6,7,8,38,9,5,128,7,7,25,7,6,15,
+9,8,384,7,4,4,7,4,2,7,4,7,7,6,13,7,4,3,7,7,18,7,4,5,7,7,21,7,6,17,9,7,256,7,4,6,
+7,6,1,7,5,8,9,6,192,9,5,64,7,5,10,7,4,4,7,4,2,7,4,7,0,0,0,7,4,3,7,5,11,7,4,5,
+7,6,12,7,5,9,9,6,1664,7,4,6,7,7,20,9,5,128,7,7,24,7,6,14,7,7,28,7,4,4,7,4,2,7,4,7,
+7,7,23,7,4,3,7,7,27,7,4,5,7,8,39,7,6,16,9,8,576,7,4,6,7,7,19,7,5,8,7,8,55,9,5,64,
+7,5,10,7,4,4,7,4,2,7,4,7,7,8,45,7,4,3,7,5,11,7,4,5,7,8,53,7,5,9,9,8,448,7,4,6,
+7,8,35,9,5,128,7,8,51,7,6,15,7,8,63,7,4,4,7,4,2,7,4,7,7,6,13,7,4,3,9,9,1536,7,4,5,
+7,8,43,7,6,17,9,9,1280,7,4,6,7,6,1,7,5,8,9,6,192,9,5,64,7,5,10,7,4,4,7,4,2,7,4,7,
+7,8,29,7,4,3,7,5,11,7,4,5,7,6,12,7,5,9,9,6,1664,7,4,6,7,8,33,9,5,128,7,8,49,7,6,14,
+7,8,61,7,4,4,7,4,2,7,4,7,7,8,47,7,4,3,7,8,59,7,4,5,7,8,41,7,6,16,9,9,1024,7,4,6,
+7,8,31,7,5,8,7,8,57,9,5,64,7,5,10,7,4,4,7,4,2,7,4,7,7,7,22,7,4,3,7,5,11,7,4,5,
+7,7,26,7,5,9,9,9,768,7,4,6,7,8,37,9,5,128,7,7,25,7,6,15,9,8,320,7,4,4,7,4,2,7,4,7,
+7,6,13,7,4,3,7,7,18,7,4,5,7,7,21,7,6,17,9,7,256,7,4,6,7,6,1,7,5,8,9,6,192,9,5,64,
+7,5,10,7,4,4,7,4,2,7,4,7,11,11,1920,7,4,3,7,5,11,7,4,5,7,6,12,7,5,9,9,6,1664,7,4,6,
+7,7,20,9,5,128,7,7,24,7,6,14,7,7,28,7,4,4,7,4,2,7,4,7,7,7,23,7,4,3,7,7,27,7,4,5,
+7,8,40,7,6,16,9,9,896,7,4,6,7,7,19,7,5,8,7,8,56,9,5,64,7,5,10,7,4,4,7,4,2,7,4,7,
+7,8,46,7,4,3,7,5,11,7,4,5,7,8,54,7,5,9,9,8,512,7,4,6,7,8,36,9,5,128,7,8,52,7,6,15,
+7,8,0,7,4,4,7,4,2,7,4,7,7,6,13,7,4,3,9,9,1728,7,4,5,7,8,44,7,6,17,9,9,1408,7,4,6,
+7,6,1,7,5,8,9,6,192,9,5,64,7,5,10,7,4,4,7,4,2,7,4,7,7,8,30,7,4,3,7,5,11,7,4,5,
+7,6,12,7,5,9,9,6,1664,7,4,6,7,8,34,9,5,128,7,8,50,7,6,14,7,8,62,7,4,4,7,4,2,7,4,7,
+7,8,48,7,4,3,7,8,60,7,4,5,7,8,42,7,6,16,9,9,1152,7,4,6,7,8,32,7,5,8,7,8,58,9,5,64,
+7,5,10,7,4,4,7,4,2,7,4,7,7,7,22,7,4,3,7,5,11,7,4,5,7,7,26,7,5,9,9,8,640,7,4,6,
+7,8,38,9,5,128,7,7,25,7,6,15,9,8,384,7,4,4,7,4,2,7,4,7,7,6,13,7,4,3,7,7,18,7,4,5,
+7,7,21,7,6,17,9,7,256,7,4,6,7,6,1,7,5,8,9,6,192,9,5,64,7,5,10,7,4,4,7,4,2,7,4,7,
+0,0,0,7,4,3,7,5,11,7,4,5,7,6,12,7,5,9,9,6,1664,7,4,6,7,7,20,9,5,128,7,7,24,7,6,14,
+7,7,28,7,4,4,7,4,2,7,4,7,7,7,23,7,4,3,7,7,27,7,4,5,7,8,39,7,6,16,9,8,576,7,4,6,
+7,7,19,7,5,8,7,8,55,9,5,64,7,5,10,7,4,4,7,4,2,7,4,7,7,8,45,7,4,3,7,5,11,7,4,5,
+7,8,53,7,5,9,9,8,448,7,4,6,7,8,35,9,5,128,7,8,51,7,6,15,7,8,63,7,4,4,7,4,2,7,4,7,
+7,6,13,7,4,3,9,9,1472,7,4,5,7,8,43,7,6,17,9,9,1216,7,4,6,7,6,1,7,5,8,9,6,192,9,5,64,
+7,5,10,7,4,4,7,4,2,7,4,7,7,8,29,7,4,3,7,5,11,7,4,5,7,6,12,7,5,9,9,6,1664,7,4,6,
+7,8,33,9,5,128,7,8,49,7,6,14,7,8,61,7,4,4,7,4,2,7,4,7,7,8,47,7,4,3,7,8,59,7,4,5,
+7,8,41,7,6,16,9,9,960,7,4,6,7,8,31,7,5,8,7,8,57,9,5,64,7,5,10,7,4,4,7,4,2,7,4,7,
+7,7,22,7,4,3,7,5,11,7,4,5,7,7,26,7,5,9,9,9,704,7,4,6,7,8,37,9,5,128,7,7,25,7,6,15,
+9,8,320,7,4,4,7,4,2,7,4,7,7,6,13,7,4,3,7,7,18,7,4,5,7,7,21,7,6,17,9,7,256,7,4,6,
+7,6,1,7,5,8,9,6,192,9,5,64,7,5,10,7,4,4,7,4,2,7,4,7,11,12,2240,7,4,3,7,5,11,7,4,5,
+7,6,12,7,5,9,9,6,1664,7,4,6,7,7,20,9,5,128,7,7,24,7,6,14,7,7,28,7,4,4,7,4,2,7,4,7,
+7,7,23,7,4,3,7,7,27,7,4,5,7,8,40,7,6,16,9,9,832,7,4,6,7,7,19,7,5,8,7,8,56,9,5,64,
+7,5,10,7,4,4,7,4,2,7,4,7,7,8,46,7,4,3,7,5,11,7,4,5,7,8,54,7,5,9,9,8,512,7,4,6,
+7,8,36,9,5,128,7,8,52,7,6,15,7,8,0,7,4,4,7,4,2,7,4,7,7,6,13,7,4,3,9,9,1600,7,4,5,
+7,8,44,7,6,17,9,9,1344,7,4,6,7,6,1,7,5,8,9,6,192,9,5,64,7,5,10,7,4,4,7,4,2,7,4,7,
+7,8,30,7,4,3,7,5,11,7,4,5,7,6,12,7,5,9,9,6,1664,7,4,6,7,8,34,9,5,128,7,8,50,7,6,14,
+7,8,62,7,4,4,7,4,2,7,4,7,7,8,48,7,4,3,7,8,60,7,4,5,7,8,42,7,6,16,9,9,1088,7,4,6,
+7,8,32,7,5,8,7,8,58,9,5,64,7,5,10,7,4,4,7,4,2,7,4,7,7,7,22,7,4,3,7,5,11,7,4,5,
+7,7,26,7,5,9,9,8,640,7,4,6,7,8,38,9,5,128,7,7,25,7,6,15,9,8,384,7,4,4,7,4,2,7,4,7,
+7,6,13,7,4,3,7,7,18,7,4,5,7,7,21,7,6,17,9,7,256,7,4,6,7,6,1,7,5,8,9,6,192,9,5,64,
+7,5,10,7,4,4,7,4,2,7,4,7,0,0,0,7,4,3,7,5,11,7,4,5,7,6,12,7,5,9,9,6,1664,7,4,6,
+7,7,20,9,5,128,7,7,24,7,6,14,7,7,28,7,4,4,7,4,2,7,4,7,7,7,23,7,4,3,7,7,27,7,4,5,
+7,8,39,7,6,16,9,8,576,7,4,6,7,7,19,7,5,8,7,8,55,9,5,64,7,5,10,7,4,4,7,4,2,7,4,7,
+7,8,45,7,4,3,7,5,11,7,4,5,7,8,53,7,5,9,9,8,448,7,4,6,7,8,35,9,5,128,7,8,51,7,6,15,
+7,8,63,7,4,4,7,4,2,7,4,7,7,6,13,7,4,3,9,9,1536,7,4,5,7,8,43,7,6,17,9,9,1280,7,4,6,
+7,6,1,7,5,8,9,6,192,9,5,64,7,5,10,7,4,4,7,4,2,7,4,7,7,8,29,7,4,3,7,5,11,7,4,5,
+7,6,12,7,5,9,9,6,1664,7,4,6,7,8,33,9,5,128,7,8,49,7,6,14,7,8,61,7,4,4,7,4,2,7,4,7,
+7,8,47,7,4,3,7,8,59,7,4,5,7,8,41,7,6,16,9,9,1024,7,4,6,7,8,31,7,5,8,7,8,57,9,5,64,
+7,5,10,7,4,4,7,4,2,7,4,7,7,7,22,7,4,3,7,5,11,7,4,5,7,7,26,7,5,9,9,9,768,7,4,6,
+7,8,37,9,5,128,7,7,25,7,6,15,9,8,320,7,4,4,7,4,2,7,4,7,7,6,13,7,4,3,7,7,18,7,4,5,
+7,7,21,7,6,17,9,7,256,7,4,6,7,6,1,7,5,8,9,6,192,9,5,64,7,5,10,7,4,4,7,4,2,7,4,7,
+11,12,2496,7,4,3,7,5,11,7,4,5,7,6,12,7,5,9,9,6,1664,7,4,6,7,7,20,9,5,128,7,7,24,7,6,14,
+7,7,28,7,4,4,7,4,2,7,4,7,7,7,23,7,4,3,7,7,27,7,4,5,7,8,40,7,6,16,9,9,896,7,4,6,
+7,7,19,7,5,8,7,8,56,9,5,64,7,5,10,7,4,4,7,4,2,7,4,7,7,8,46,7,4,3,7,5,11,7,4,5,
+7,8,54,7,5,9,9,8,512,7,4,6,7,8,36,9,5,128,7,8,52,7,6,15,7,8,0,7,4,4,7,4,2,7,4,7,
+7,6,13,7,4,3,9,9,1728,7,4,5,7,8,44,7,6,17,9,9,1408,7,4,6,7,6,1,7,5,8,9,6,192,9,5,64,
+7,5,10,7,4,4,7,4,2,7,4,7,7,8,30,7,4,3,7,5,11,7,4,5,7,6,12,7,5,9,9,6,1664,7,4,6,
+7,8,34,9,5,128,7,8,50,7,6,14,7,8,62,7,4,4,7,4,2,7,4,7,7,8,48,7,4,3,7,8,60,7,4,5,
+7,8,42,7,6,16,9,9,1152,7,4,6,7,8,32,7,5,8,7,8,58,9,5,64,7,5,10,7,4,4,7,4,2,7,4,7,
+7,7,22,7,4,3,7,5,11,7,4,5,7,7,26,7,5,9,9,8,640,7,4,6,7,8,38,9,5,128,7,7,25,7,6,15,
+9,8,384,7,4,4,7,4,2,7,4,7,7,6,13,7,4,3,7,7,18,7,4,5,7,7,21,7,6,17,9,7,256,7,4,6,
+7,6,1,7,5,8,9,6,192,9,5,64,7,5,10,7,4,4,7,4,2,7,4,7,12,11,0,7,4,3,7,5,11,7,4,5,
+7,6,12,7,5,9,9,6,1664,7,4,6,7,7,20,9,5,128,7,7,24,7,6,14,7,7,28,7,4,4,7,4,2,7,4,7,
+7,7,23,7,4,3,7,7,27,7,4,5,7,8,39,7,6,16,9,8,576,7,4,6,7,7,19,7,5,8,7,8,55,9,5,64,
+7,5,10,7,4,4,7,4,2,7,4,7,7,8,45,7,4,3,7,5,11,7,4,5,7,8,53,7,5,9,9,8,448,7,4,6,
+7,8,35,9,5,128,7,8,51,7,6,15,7,8,63,7,4,4,7,4,2,7,4,7,7,6,13,7,4,3,9,9,1472,7,4,5,
+7,8,43,7,6,17,9,9,1216,7,4,6,7,6,1,7,5,8,9,6,192,9,5,64,7,5,10,7,4,4,7,4,2,7,4,7,
+7,8,29,7,4,3,7,5,11,7,4,5,7,6,12,7,5,9,9,6,1664,7,4,6,7,8,33,9,5,128,7,8,49,7,6,14,
+7,8,61,7,4,4,7,4,2,7,4,7,7,8,47,7,4,3,7,8,59,7,4,5,7,8,41,7,6,16,9,9,960,7,4,6,
+7,8,31,7,5,8,7,8,57,9,5,64,7,5,10,7,4,4,7,4,2,7,4,7,7,7,22,7,4,3,7,5,11,7,4,5,
+7,7,26,7,5,9,9,9,704,7,4,6,7,8,37,9,5,128,7,7,25,7,6,15,9,8,320,7,4,4,7,4,2,7,4,7,
+7,6,13,7,4,3,7,7,18,7,4,5,7,7,21,7,6,17,9,7,256,7,4,6,7,6,1,7,5,8,9,6,192,9,5,64,
+7,5,10,7,4,4,7,4,2,7,4,7,11,11,1792,7,4,3,7,5,11,7,4,5,7,6,12,7,5,9,9,6,1664,7,4,6,
+7,7,20,9,5,128,7,7,24,7,6,14,7,7,28,7,4,4,7,4,2,7,4,7,7,7,23,7,4,3,7,7,27,7,4,5,
+7,8,40,7,6,16,9,9,832,7,4,6,7,7,19,7,5,8,7,8,56,9,5,64,7,5,10,7,4,4,7,4,2,7,4,7,
+7,8,46,7,4,3,7,5,11,7,4,5,7,8,54,7,5,9,9,8,512,7,4,6,7,8,36,9,5,128,7,8,52,7,6,15,
+7,8,0,7,4,4,7,4,2,7,4,7,7,6,13,7,4,3,9,9,1600,7,4,5,7,8,44,7,6,17,9,9,1344,7,4,6,
+7,6,1,7,5,8,9,6,192,9,5,64,7,5,10,7,4,4,7,4,2,7,4,7,7,8,30,7,4,3,7,5,11,7,4,5,
+7,6,12,7,5,9,9,6,1664,7,4,6,7,8,34,9,5,128,7,8,50,7,6,14,7,8,62,7,4,4,7,4,2,7,4,7,
+7,8,48,7,4,3,7,8,60,7,4,5,7,8,42,7,6,16,9,9,1088,7,4,6,7,8,32,7,5,8,7,8,58,9,5,64,
+7,5,10,7,4,4,7,4,2,7,4,7,7,7,22,7,4,3,7,5,11,7,4,5,7,7,26,7,5,9,9,8,640,7,4,6,
+7,8,38,9,5,128,7,7,25,7,6,15,9,8,384,7,4,4,7,4,2,7,4,7,7,6,13,7,4,3,7,7,18,7,4,5,
+7,7,21,7,6,17,9,7,256,7,4,6,7,6,1,7,5,8,9,6,192,9,5,64,7,5,10,7,4,4,7,4,2,7,4,7,
+0,0,0,7,4,3,7,5,11,7,4,5,7,6,12,7,5,9,9,6,1664,7,4,6,7,7,20,9,5,128,7,7,24,7,6,14,
+7,7,28,7,4,4,7,4,2,7,4,7,7,7,23,7,4,3,7,7,27,7,4,5,7,8,39,7,6,16,9,8,576,7,4,6,
+7,7,19,7,5,8,7,8,55,9,5,64,7,5,10,7,4,4,7,4,2,7,4,7,7,8,45,7,4,3,7,5,11,7,4,5,
+7,8,53,7,5,9,9,8,448,7,4,6,7,8,35,9,5,128,7,8,51,7,6,15,7,8,63,7,4,4,7,4,2,7,4,7,
+7,6,13,7,4,3,9,9,1536,7,4,5,7,8,43,7,6,17,9,9,1280,7,4,6,7,6,1,7,5,8,9,6,192,9,5,64,
+7,5,10,7,4,4,7,4,2,7,4,7,7,8,29,7,4,3,7,5,11,7,4,5,7,6,12,7,5,9,9,6,1664,7,4,6,
+7,8,33,9,5,128,7,8,49,7,6,14,7,8,61,7,4,4,7,4,2,7,4,7,7,8,47,7,4,3,7,8,59,7,4,5,
+7,8,41,7,6,16,9,9,1024,7,4,6,7,8,31,7,5,8,7,8,57,9,5,64,7,5,10,7,4,4,7,4,2,7,4,7,
+7,7,22,7,4,3,7,5,11,7,4,5,7,7,26,7,5,9,9,9,768,7,4,6,7,8,37,9,5,128,7,7,25,7,6,15,
+9,8,320,7,4,4,7,4,2,7,4,7,7,6,13,7,4,3,7,7,18,7,4,5,7,7,21,7,6,17,9,7,256,7,4,6,
+7,6,1,7,5,8,9,6,192,9,5,64,7,5,10,7,4,4,7,4,2,7,4,7,11,11,1856,7,4,3,7,5,11,7,4,5,
+7,6,12,7,5,9,9,6,1664,7,4,6,7,7,20,9,5,128,7,7,24,7,6,14,7,7,28,7,4,4,7,4,2,7,4,7,
+7,7,23,7,4,3,7,7,27,7,4,5,7,8,40,7,6,16,9,9,896,7,4,6,7,7,19,7,5,8,7,8,56,9,5,64,
+7,5,10,7,4,4,7,4,2,7,4,7,7,8,46,7,4,3,7,5,11,7,4,5,7,8,54,7,5,9,9,8,512,7,4,6,
+7,8,36,9,5,128,7,8,52,7,6,15,7,8,0,7,4,4,7,4,2,7,4,7,7,6,13,7,4,3,9,9,1728,7,4,5,
+7,8,44,7,6,17,9,9,1408,7,4,6,7,6,1,7,5,8,9,6,192,9,5,64,7,5,10,7,4,4,7,4,2,7,4,7,
+7,8,30,7,4,3,7,5,11,7,4,5,7,6,12,7,5,9,9,6,1664,7,4,6,7,8,34,9,5,128,7,8,50,7,6,14,
+7,8,62,7,4,4,7,4,2,7,4,7,7,8,48,7,4,3,7,8,60,7,4,5,7,8,42,7,6,16,9,9,1152,7,4,6,
+7,8,32,7,5,8,7,8,58,9,5,64,7,5,10,7,4,4,7,4,2,7,4,7,7,7,22,7,4,3,7,5,11,7,4,5,
+7,7,26,7,5,9,9,8,640,7,4,6,7,8,38,9,5,128,7,7,25,7,6,15,9,8,384,7,4,4,7,4,2,7,4,7,
+7,6,13,7,4,3,7,7,18,7,4,5,7,7,21,7,6,17,9,7,256,7,4,6,7,6,1,7,5,8,9,6,192,9,5,64,
+7,5,10,7,4,4,7,4,2,7,4,7,0,0,0,7,4,3,7,5,11,7,4,5,7,6,12,7,5,9,9,6,1664,7,4,6,
+7,7,20,9,5,128,7,7,24,7,6,14,7,7,28,7,4,4,7,4,2,7,4,7,7,7,23,7,4,3,7,7,27,7,4,5,
+7,8,39,7,6,16,9,8,576,7,4,6,7,7,19,7,5,8,7,8,55,9,5,64,7,5,10,7,4,4,7,4,2,7,4,7,
+7,8,45,7,4,3,7,5,11,7,4,5,7,8,53,7,5,9,9,8,448,7,4,6,7,8,35,9,5,128,7,8,51,7,6,15,
+7,8,63,7,4,4,7,4,2,7,4,7,7,6,13,7,4,3,9,9,1472,7,4,5,7,8,43,7,6,17,9,9,1216,7,4,6,
+7,6,1,7,5,8,9,6,192,9,5,64,7,5,10,7,4,4,7,4,2,7,4,7,7,8,29,7,4,3,7,5,11,7,4,5,
+7,6,12,7,5,9,9,6,1664,7,4,6,7,8,33,9,5,128,7,8,49,7,6,14,7,8,61,7,4,4,7,4,2,7,4,7,
+7,8,47,7,4,3,7,8,59,7,4,5,7,8,41,7,6,16,9,9,960,7,4,6,7,8,31,7,5,8,7,8,57,9,5,64,
+7,5,10,7,4,4,7,4,2,7,4,7,7,7,22,7,4,3,7,5,11,7,4,5,7,7,26,7,5,9,9,9,704,7,4,6,
+7,8,37,9,5,128,7,7,25,7,6,15,9,8,320,7,4,4,7,4,2,7,4,7,7,6,13,7,4,3,7,7,18,7,4,5,
+7,7,21,7,6,17,9,7,256,7,4,6,7,6,1,7,5,8,9,6,192,9,5,64,7,5,10,7,4,4,7,4,2,7,4,7,
+11,12,2176,7,4,3,7,5,11,7,4,5,7,6,12,7,5,9,9,6,1664,7,4,6,7,7,20,9,5,128,7,7,24,7,6,14,
+7,7,28,7,4,4,7,4,2,7,4,7,7,7,23,7,4,3,7,7,27,7,4,5,7,8,40,7,6,16,9,9,832,7,4,6,
+7,7,19,7,5,8,7,8,56,9,5,64,7,5,10,7,4,4,7,4,2,7,4,7,7,8,46,7,4,3,7,5,11,7,4,5,
+7,8,54,7,5,9,9,8,512,7,4,6,7,8,36,9,5,128,7,8,52,7,6,15,7,8,0,7,4,4,7,4,2,7,4,7,
+7,6,13,7,4,3,9,9,1600,7,4,5,7,8,44,7,6,17,9,9,1344,7,4,6,7,6,1,7,5,8,9,6,192,9,5,64,
+7,5,10,7,4,4,7,4,2,7,4,7,7,8,30,7,4,3,7,5,11,7,4,5,7,6,12,7,5,9,9,6,1664,7,4,6,
+7,8,34,9,5,128,7,8,50,7,6,14,7,8,62,7,4,4,7,4,2,7,4,7,7,8,48,7,4,3,7,8,60,7,4,5,
+7,8,42,7,6,16,9,9,1088,7,4,6,7,8,32,7,5,8,7,8,58,9,5,64,7,5,10,7,4,4,7,4,2,7,4,7,
+7,7,22,7,4,3,7,5,11,7,4,5,7,7,26,7,5,9,9,8,640,7,4,6,7,8,38,9,5,128,7,7,25,7,6,15,
+9,8,384,7,4,4,7,4,2,7,4,7,7,6,13,7,4,3,7,7,18,7,4,5,7,7,21,7,6,17,9,7,256,7,4,6,
+7,6,1,7,5,8,9,6,192,9,5,64,7,5,10,7,4,4,7,4,2,7,4,7,0,0,0,7,4,3,7,5,11,7,4,5,
+7,6,12,7,5,9,9,6,1664,7,4,6,7,7,20,9,5,128,7,7,24,7,6,14,7,7,28,7,4,4,7,4,2,7,4,7,
+7,7,23,7,4,3,7,7,27,7,4,5,7,8,39,7,6,16,9,8,576,7,4,6,7,7,19,7,5,8,7,8,55,9,5,64,
+7,5,10,7,4,4,7,4,2,7,4,7,7,8,45,7,4,3,7,5,11,7,4,5,7,8,53,7,5,9,9,8,448,7,4,6,
+7,8,35,9,5,128,7,8,51,7,6,15,7,8,63,7,4,4,7,4,2,7,4,7,7,6,13,7,4,3,9,9,1536,7,4,5,
+7,8,43,7,6,17,9,9,1280,7,4,6,7,6,1,7,5,8,9,6,192,9,5,64,7,5,10,7,4,4,7,4,2,7,4,7,
+7,8,29,7,4,3,7,5,11,7,4,5,7,6,12,7,5,9,9,6,1664,7,4,6,7,8,33,9,5,128,7,8,49,7,6,14,
+7,8,61,7,4,4,7,4,2,7,4,7,7,8,47,7,4,3,7,8,59,7,4,5,7,8,41,7,6,16,9,9,1024,7,4,6,
+7,8,31,7,5,8,7,8,57,9,5,64,7,5,10,7,4,4,7,4,2,7,4,7,7,7,22,7,4,3,7,5,11,7,4,5,
+7,7,26,7,5,9,9,9,768,7,4,6,7,8,37,9,5,128,7,7,25,7,6,15,9,8,320,7,4,4,7,4,2,7,4,7,
+7,6,13,7,4,3,7,7,18,7,4,5,7,7,21,7,6,17,9,7,256,7,4,6,7,6,1,7,5,8,9,6,192,9,5,64,
+7,5,10,7,4,4,7,4,2,7,4,7,11,12,2432,7,4,3,7,5,11,7,4,5,7,6,12,7,5,9,9,6,1664,7,4,6,
+7,7,20,9,5,128,7,7,24,7,6,14,7,7,28,7,4,4,7,4,2,7,4,7,7,7,23,7,4,3,7,7,27,7,4,5,
+7,8,40,7,6,16,9,9,896,7,4,6,7,7,19,7,5,8,7,8,56,9,5,64,7,5,10,7,4,4,7,4,2,7,4,7,
+7,8,46,7,4,3,7,5,11,7,4,5,7,8,54,7,5,9,9,8,512,7,4,6,7,8,36,9,5,128,7,8,52,7,6,15,
+7,8,0,7,4,4,7,4,2,7,4,7,7,6,13,7,4,3,9,9,1728,7,4,5,7,8,44,7,6,17,9,9,1408,7,4,6,
+7,6,1,7,5,8,9,6,192,9,5,64,7,5,10,7,4,4,7,4,2,7,4,7,7,8,30,7,4,3,7,5,11,7,4,5,
+7,6,12,7,5,9,9,6,1664,7,4,6,7,8,34,9,5,128,7,8,50,7,6,14,7,8,62,7,4,4,7,4,2,7,4,7,
+7,8,48,7,4,3,7,8,60,7,4,5,7,8,42,7,6,16,9,9,1152,7,4,6,7,8,32,7,5,8,7,8,58,9,5,64,
+7,5,10,7,4,4,7,4,2,7,4,7,7,7,22,7,4,3,7,5,11,7,4,5,7,7,26,7,5,9,9,8,640,7,4,6,
+7,8,38,9,5,128,7,7,25,7,6,15,9,8,384,7,4,4,7,4,2,7,4,7,7,6,13,7,4,3,7,7,18,7,4,5,
+7,7,21,7,6,17,9,7,256,7,4,6,7,6,1,7,5,8,9,6,192,9,5,64,7,5,10,7,4,4,7,4,2,7,4,7,
+0,0,0,7,4,3,7,5,11,7,4,5,7,6,12,7,5,9,9,6,1664,7,4,6,7,7,20,9,5,128,7,7,24,7,6,14,
+7,7,28,7,4,4,7,4,2,7,4,7,7,7,23,7,4,3,7,7,27,7,4,5,7,8,39,7,6,16,9,8,576,7,4,6,
+7,7,19,7,5,8,7,8,55,9,5,64,7,5,10,7,4,4,7,4,2,7,4,7,7,8,45,7,4,3,7,5,11,7,4,5,
+7,8,53,7,5,9,9,8,448,7,4,6,7,8,35,9,5,128,7,8,51,7,6,15,7,8,63,7,4,4,7,4,2,7,4,7,
+7,6,13,7,4,3,9,9,1472,7,4,5,7,8,43,7,6,17,9,9,1216,7,4,6,7,6,1,7,5,8,9,6,192,9,5,64,
+7,5,10,7,4,4,7,4,2,7,4,7,7,8,29,7,4,3,7,5,11,7,4,5,7,6,12,7,5,9,9,6,1664,7,4,6,
+7,8,33,9,5,128,7,8,49,7,6,14,7,8,61,7,4,4,7,4,2,7,4,7,7,8,47,7,4,3,7,8,59,7,4,5,
+7,8,41,7,6,16,9,9,960,7,4,6,7,8,31,7,5,8,7,8,57,9,5,64,7,5,10,7,4,4,7,4,2,7,4,7,
+7,7,22,7,4,3,7,5,11,7,4,5,7,7,26,7,5,9,9,9,704,7,4,6,7,8,37,9,5,128,7,7,25,7,6,15,
+9,8,320,7,4,4,7,4,2,7,4,7,7,6,13,7,4,3,7,7,18,7,4,5,7,7,21,7,6,17,9,7,256,7,4,6,
+7,6,1,7,5,8,9,6,192,9,5,64,7,5,10,7,4,4,7,4,2,7,4,7,11,12,2048,7,4,3,7,5,11,7,4,5,
+7,6,12,7,5,9,9,6,1664,7,4,6,7,7,20,9,5,128,7,7,24,7,6,14,7,7,28,7,4,4,7,4,2,7,4,7,
+7,7,23,7,4,3,7,7,27,7,4,5,7,8,40,7,6,16,9,9,832,7,4,6,7,7,19,7,5,8,7,8,56,9,5,64,
+7,5,10,7,4,4,7,4,2,7,4,7,7,8,46,7,4,3,7,5,11,7,4,5,7,8,54,7,5,9,9,8,512,7,4,6,
+7,8,36,9,5,128,7,8,52,7,6,15,7,8,0,7,4,4,7,4,2,7,4,7,7,6,13,7,4,3,9,9,1600,7,4,5,
+7,8,44,7,6,17,9,9,1344,7,4,6,7,6,1,7,5,8,9,6,192,9,5,64,7,5,10,7,4,4,7,4,2,7,4,7,
+7,8,30,7,4,3,7,5,11,7,4,5,7,6,12,7,5,9,9,6,1664,7,4,6,7,8,34,9,5,128,7,8,50,7,6,14,
+7,8,62,7,4,4,7,4,2,7,4,7,7,8,48,7,4,3,7,8,60,7,4,5,7,8,42,7,6,16,9,9,1088,7,4,6,
+7,8,32,7,5,8,7,8,58,9,5,64,7,5,10,7,4,4,7,4,2,7,4,7,7,7,22,7,4,3,7,5,11,7,4,5,
+7,7,26,7,5,9,9,8,640,7,4,6,7,8,38,9,5,128,7,7,25,7,6,15,9,8,384,7,4,4,7,4,2,7,4,7,
+7,6,13,7,4,3,7,7,18,7,4,5,7,7,21,7,6,17,9,7,256,7,4,6,7,6,1,7,5,8,9,6,192,9,5,64,
+7,5,10,7,4,4,7,4,2,7,4,7,0,0,0,7,4,3,7,5,11,7,4,5,7,6,12,7,5,9,9,6,1664,7,4,6,
+7,7,20,9,5,128,7,7,24,7,6,14,7,7,28,7,4,4,7,4,2,7,4,7,7,7,23,7,4,3,7,7,27,7,4,5,
+7,8,39,7,6,16,9,8,576,7,4,6,7,7,19,7,5,8,7,8,55,9,5,64,7,5,10,7,4,4,7,4,2,7,4,7,
+7,8,45,7,4,3,7,5,11,7,4,5,7,8,53,7,5,9,9,8,448,7,4,6,7,8,35,9,5,128,7,8,51,7,6,15,
+7,8,63,7,4,4,7,4,2,7,4,7,7,6,13,7,4,3,9,9,1536,7,4,5,7,8,43,7,6,17,9,9,1280,7,4,6,
+7,6,1,7,5,8,9,6,192,9,5,64,7,5,10,7,4,4,7,4,2,7,4,7,7,8,29,7,4,3,7,5,11,7,4,5,
+7,6,12,7,5,9,9,6,1664,7,4,6,7,8,33,9,5,128,7,8,49,7,6,14,7,8,61,7,4,4,7,4,2,7,4,7,
+7,8,47,7,4,3,7,8,59,7,4,5,7,8,41,7,6,16,9,9,1024,7,4,6,7,8,31,7,5,8,7,8,57,9,5,64,
+7,5,10,7,4,4,7,4,2,7,4,7,7,7,22,7,4,3,7,5,11,7,4,5,7,7,26,7,5,9,9,9,768,7,4,6,
+7,8,37,9,5,128,7,7,25,7,6,15,9,8,320,7,4,4,7,4,2,7,4,7,7,6,13,7,4,3,7,7,18,7,4,5,
+7,7,21,7,6,17,9,7,256,7,4,6,7,6,1,7,5,8,9,6,192,9,5,64,7,5,10,7,4,4,7,4,2,7,4,7,
+11,11,1920,7,4,3,7,5,11,7,4,5,7,6,12,7,5,9,9,6,1664,7,4,6,7,7,20,9,5,128,7,7,24,7,6,14,
+7,7,28,7,4,4,7,4,2,7,4,7,7,7,23,7,4,3,7,7,27,7,4,5,7,8,40,7,6,16,9,9,896,7,4,6,
+7,7,19,7,5,8,7,8,56,9,5,64,7,5,10,7,4,4,7,4,2,7,4,7,7,8,46,7,4,3,7,5,11,7,4,5,
+7,8,54,7,5,9,9,8,512,7,4,6,7,8,36,9,5,128,7,8,52,7,6,15,7,8,0,7,4,4,7,4,2,7,4,7,
+7,6,13,7,4,3,9,9,1728,7,4,5,7,8,44,7,6,17,9,9,1408,7,4,6,7,6,1,7,5,8,9,6,192,9,5,64,
+7,5,10,7,4,4,7,4,2,7,4,7,7,8,30,7,4,3,7,5,11,7,4,5,7,6,12,7,5,9,9,6,1664,7,4,6,
+7,8,34,9,5,128,7,8,50,7,6,14,7,8,62,7,4,4,7,4,2,7,4,7,7,8,48,7,4,3,7,8,60,7,4,5,
+7,8,42,7,6,16,9,9,1152,7,4,6,7,8,32,7,5,8,7,8,58,9,5,64,7,5,10,7,4,4,7,4,2,7,4,7,
+7,7,22,7,4,3,7,5,11,7,4,5,7,7,26,7,5,9,9,8,640,7,4,6,7,8,38,9,5,128,7,7,25,7,6,15,
+9,8,384,7,4,4,7,4,2,7,4,7,7,6,13,7,4,3,7,7,18,7,4,5,7,7,21,7,6,17,9,7,256,7,4,6,
+7,6,1,7,5,8,9,6,192,9,5,64,7,5,10,7,4,4,7,4,2,7,4,7,0,0,0,7,4,3,7,5,11,7,4,5,
+7,6,12,7,5,9,9,6,1664,7,4,6,7,7,20,9,5,128,7,7,24,7,6,14,7,7,28,7,4,4,7,4,2,7,4,7,
+7,7,23,7,4,3,7,7,27,7,4,5,7,8,39,7,6,16,9,8,576,7,4,6,7,7,19,7,5,8,7,8,55,9,5,64,
+7,5,10,7,4,4,7,4,2,7,4,7,7,8,45,7,4,3,7,5,11,7,4,5,7,8,53,7,5,9,9,8,448,7,4,6,
+7,8,35,9,5,128,7,8,51,7,6,15,7,8,63,7,4,4,7,4,2,7,4,7,7,6,13,7,4,3,9,9,1472,7,4,5,
+7,8,43,7,6,17,9,9,1216,7,4,6,7,6,1,7,5,8,9,6,192,9,5,64,7,5,10,7,4,4,7,4,2,7,4,7,
+7,8,29,7,4,3,7,5,11,7,4,5,7,6,12,7,5,9,9,6,1664,7,4,6,7,8,33,9,5,128,7,8,49,7,6,14,
+7,8,61,7,4,4,7,4,2,7,4,7,7,8,47,7,4,3,7,8,59,7,4,5,7,8,41,7,6,16,9,9,960,7,4,6,
+7,8,31,7,5,8,7,8,57,9,5,64,7,5,10,7,4,4,7,4,2,7,4,7,7,7,22,7,4,3,7,5,11,7,4,5,
+7,7,26,7,5,9,9,9,704,7,4,6,7,8,37,9,5,128,7,7,25,7,6,15,9,8,320,7,4,4,7,4,2,7,4,7,
+7,6,13,7,4,3,7,7,18,7,4,5,7,7,21,7,6,17,9,7,256,7,4,6,7,6,1,7,5,8,9,6,192,9,5,64,
+7,5,10,7,4,4,7,4,2,7,4,7,11,12,2304,7,4,3,7,5,11,7,4,5,7,6,12,7,5,9,9,6,1664,7,4,6,
+7,7,20,9,5,128,7,7,24,7,6,14,7,7,28,7,4,4,7,4,2,7,4,7,7,7,23,7,4,3,7,7,27,7,4,5,
+7,8,40,7,6,16,9,9,832,7,4,6,7,7,19,7,5,8,7,8,56,9,5,64,7,5,10,7,4,4,7,4,2,7,4,7,
+7,8,46,7,4,3,7,5,11,7,4,5,7,8,54,7,5,9,9,8,512,7,4,6,7,8,36,9,5,128,7,8,52,7,6,15,
+7,8,0,7,4,4,7,4,2,7,4,7,7,6,13,7,4,3,9,9,1600,7,4,5,7,8,44,7,6,17,9,9,1344,7,4,6,
+7,6,1,7,5,8,9,6,192,9,5,64,7,5,10,7,4,4,7,4,2,7,4,7,7,8,30,7,4,3,7,5,11,7,4,5,
+7,6,12,7,5,9,9,6,1664,7,4,6,7,8,34,9,5,128,7,8,50,7,6,14,7,8,62,7,4,4,7,4,2,7,4,7,
+7,8,48,7,4,3,7,8,60,7,4,5,7,8,42,7,6,16,9,9,1088,7,4,6,7,8,32,7,5,8,7,8,58,9,5,64,
+7,5,10,7,4,4,7,4,2,7,4,7,7,7,22,7,4,3,7,5,11,7,4,5,7,7,26,7,5,9,9,8,640,7,4,6,
+7,8,38,9,5,128,7,7,25,7,6,15,9,8,384,7,4,4,7,4,2,7,4,7,7,6,13,7,4,3,7,7,18,7,4,5,
+7,7,21,7,6,17,9,7,256,7,4,6,7,6,1,7,5,8,9,6,192,9,5,64,7,5,10,7,4,4,7,4,2,7,4,7,
+0,0,0,7,4,3,7,5,11,7,4,5,7,6,12,7,5,9,9,6,1664,7,4,6,7,7,20,9,5,128,7,7,24,7,6,14,
+7,7,28,7,4,4,7,4,2,7,4,7,7,7,23,7,4,3,7,7,27,7,4,5,7,8,39,7,6,16,9,8,576,7,4,6,
+7,7,19,7,5,8,7,8,55,9,5,64,7,5,10,7,4,4,7,4,2,7,4,7,7,8,45,7,4,3,7,5,11,7,4,5,
+7,8,53,7,5,9,9,8,448,7,4,6,7,8,35,9,5,128,7,8,51,7,6,15,7,8,63,7,4,4,7,4,2,7,4,7,
+7,6,13,7,4,3,9,9,1536,7,4,5,7,8,43,7,6,17,9,9,1280,7,4,6,7,6,1,7,5,8,9,6,192,9,5,64,
+7,5,10,7,4,4,7,4,2,7,4,7,7,8,29,7,4,3,7,5,11,7,4,5,7,6,12,7,5,9,9,6,1664,7,4,6,
+7,8,33,9,5,128,7,8,49,7,6,14,7,8,61,7,4,4,7,4,2,7,4,7,7,8,47,7,4,3,7,8,59,7,4,5,
+7,8,41,7,6,16,9,9,1024,7,4,6,7,8,31,7,5,8,7,8,57,9,5,64,7,5,10,7,4,4,7,4,2,7,4,7,
+7,7,22,7,4,3,7,5,11,7,4,5,7,7,26,7,5,9,9,9,768,7,4,6,7,8,37,9,5,128,7,7,25,7,6,15,
+9,8,320,7,4,4,7,4,2,7,4,7,7,6,13,7,4,3,7,7,18,7,4,5,7,7,21,7,6,17,9,7,256,7,4,6,
+7,6,1,7,5,8,9,6,192,9,5,64,7,5,10,7,4,4,7,4,2,7,4,7,11,12,2560,7,4,3,7,5,11,7,4,5,
+7,6,12,7,5,9,9,6,1664,7,4,6,7,7,20,9,5,128,7,7,24,7,6,14,7,7,28,7,4,4,7,4,2,7,4,7,
+7,7,23,7,4,3,7,7,27,7,4,5,7,8,40,7,6,16,9,9,896,7,4,6,7,7,19,7,5,8,7,8,56,9,5,64,
+7,5,10,7,4,4,7,4,2,7,4,7,7,8,46,7,4,3,7,5,11,7,4,5,7,8,54,7,5,9,9,8,512,7,4,6,
+7,8,36,9,5,128,7,8,52,7,6,15,7,8,0,7,4,4,7,4,2,7,4,7,7,6,13,7,4,3,9,9,1728,7,4,5,
+7,8,44,7,6,17,9,9,1408,7,4,6,7,6,1,7,5,8,9,6,192,9,5,64,7,5,10,7,4,4,7,4,2,7,4,7,
+7,8,30,7,4,3,7,5,11,7,4,5,7,6,12,7,5,9,9,6,1664,7,4,6,7,8,34,9,5,128,7,8,50,7,6,14,
+7,8,62,7,4,4,7,4,2,7,4,7,7,8,48,7,4,3,7,8,60,7,4,5,7,8,42,7,6,16,9,9,1152,7,4,6,
+7,8,32,7,5,8,7,8,58,9,5,64,7,5,10,7,4,4,7,4,2,7,4,7,7,7,22,7,4,3,7,5,11,7,4,5,
+7,7,26,7,5,9,9,8,640,7,4,6,7,8,38,9,5,128,7,7,25,7,6,15,9,8,384,7,4,4,7,4,2,7,4,7,
+7,6,13,7,4,3,7,7,18,7,4,5,7,7,21,7,6,17,9,7,256,7,4,6,7,6,1,7,5,8,9,6,192,9,5,64,
+7,5,10,7,4,4,7,4,2,7,4,7
+};
+const  TIFFFaxTabEnt TIFFFaxBlackTable[8192] = {
+12,11,0,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,6,9,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,8,7,10,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,8,8,13,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,6,8,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+8,9,15,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,8,10,18,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,6,9,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,8,7,11,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+8,10,17,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,6,8,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,8,7,12,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,11,11,1792,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,6,9,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+8,7,10,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,8,11,23,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,6,8,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,8,11,20,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+8,11,25,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,6,9,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,8,7,11,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,8,8,14,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,6,8,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+8,7,12,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,0,0,0,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,6,9,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,8,7,10,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+8,8,13,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,6,8,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,10,12,128,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,8,12,56,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,6,9,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+8,7,11,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,8,12,30,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,6,8,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,8,7,12,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+11,11,1856,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,6,9,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,8,7,10,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,8,12,57,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,6,8,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+8,11,21,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,8,12,54,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,6,9,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,8,7,11,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+8,8,14,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,6,8,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,8,7,12,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,0,0,0,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,6,9,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+8,7,10,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,8,8,13,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,6,8,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,8,9,15,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+8,12,52,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,6,9,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,8,7,11,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,8,12,48,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,6,8,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+8,7,12,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,11,12,2112,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,6,9,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,8,7,10,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+8,12,44,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,6,8,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,8,12,36,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,10,12,384,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,6,9,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+8,7,11,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,8,8,14,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,6,8,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,8,7,12,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+0,0,0,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,6,9,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,8,7,10,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,8,8,13,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,6,8,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+8,12,28,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,8,12,60,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,6,9,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,8,7,11,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+8,12,40,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,6,8,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,8,7,12,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,11,12,2368,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,6,9,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+8,7,10,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,8,10,16,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,6,8,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,8,10,0,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+10,10,64,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,6,9,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,8,7,11,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,8,8,14,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,6,8,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+8,7,12,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,0,0,0,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,6,9,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,8,7,10,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+8,8,13,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,6,8,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,8,9,15,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,8,10,18,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,6,9,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+8,7,11,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,8,10,17,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,6,8,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,8,7,12,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+11,12,1984,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,6,9,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,8,7,10,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,8,12,50,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,6,8,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+8,12,34,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,10,13,1664,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,6,9,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,8,7,11,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+8,8,14,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,6,8,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,8,7,12,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,0,0,0,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,6,9,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+8,7,10,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,8,8,13,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,6,8,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,8,12,26,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+10,13,1408,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,6,9,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,8,7,11,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,8,12,32,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,6,8,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+8,7,12,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,11,11,1920,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,6,9,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,8,7,10,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+8,12,61,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,6,8,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,8,12,42,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,10,13,1024,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,6,9,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+8,7,11,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,8,8,14,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,6,8,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,8,7,12,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+0,0,0,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,6,9,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,8,7,10,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,8,8,13,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,6,8,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+8,9,15,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,10,13,768,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,6,9,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,8,7,11,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+8,12,62,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,6,8,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,8,7,12,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,11,12,2240,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,6,9,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+8,7,10,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,8,12,46,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,6,8,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,8,12,38,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+10,13,512,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,6,9,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,8,7,11,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,8,8,14,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,6,8,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+8,7,12,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,0,0,0,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,6,9,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,8,7,10,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+8,8,13,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,6,8,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,8,11,19,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,8,11,24,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,6,9,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+8,7,11,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,8,11,22,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,6,8,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,8,7,12,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+11,12,2496,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,6,9,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,8,7,10,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,8,10,16,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,6,8,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+8,10,0,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,10,10,64,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,6,9,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,8,7,11,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+8,8,14,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,6,8,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,8,7,12,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,12,11,0,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,6,9,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+8,7,10,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,8,8,13,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,6,8,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,8,9,15,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+8,10,18,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,6,9,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,8,7,11,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,8,10,17,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,6,8,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+8,7,12,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,11,11,1792,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,6,9,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,8,7,10,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+8,11,23,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,6,8,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,8,11,20,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,8,11,25,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,6,9,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+8,7,11,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,8,8,14,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,6,8,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,8,7,12,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+0,0,0,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,6,9,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,8,7,10,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,8,8,13,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,6,8,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+10,12,192,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,10,13,1280,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,6,9,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,8,7,11,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+8,12,31,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,6,8,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,8,7,12,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,11,11,1856,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,6,9,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+8,7,10,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,8,12,58,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,6,8,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,8,11,21,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+10,13,896,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,6,9,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,8,7,11,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,8,8,14,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,6,8,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+8,7,12,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,0,0,0,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,6,9,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,8,7,10,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+8,8,13,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,6,8,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,8,9,15,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,10,13,640,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,6,9,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+8,7,11,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,8,12,49,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,6,8,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,8,7,12,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+11,12,2176,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,6,9,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,8,7,10,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,8,12,45,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,6,8,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+8,12,37,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,10,12,448,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,6,9,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,8,7,11,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+8,8,14,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,6,8,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,8,7,12,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,0,0,0,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,6,9,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+8,7,10,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,8,8,13,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,6,8,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,8,12,29,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+10,13,1536,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,6,9,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,8,7,11,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,8,12,41,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,6,8,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+8,7,12,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,11,12,2432,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,6,9,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,8,7,10,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+8,10,16,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,6,8,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,8,10,0,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,10,10,64,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,6,9,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+8,7,11,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,8,8,14,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,6,8,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,8,7,12,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+0,0,0,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,6,9,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,8,7,10,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,8,8,13,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,6,8,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+8,9,15,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,8,10,18,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,6,9,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,8,7,11,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+8,10,17,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,6,8,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,8,7,12,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,11,12,2048,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,6,9,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+8,7,10,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,8,12,51,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,6,8,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,8,12,35,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+10,12,320,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,6,9,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,8,7,11,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,8,8,14,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,6,8,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+8,7,12,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,0,0,0,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,6,9,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,8,7,10,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+8,8,13,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,6,8,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,8,12,27,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,8,12,59,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,6,9,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+8,7,11,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,8,12,33,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,6,8,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,8,7,12,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+11,11,1920,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,6,9,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,8,7,10,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,10,12,256,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,6,8,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+8,12,43,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,10,13,1152,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,6,9,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,8,7,11,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+8,8,14,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,6,8,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,8,7,12,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,0,0,0,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,6,9,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+8,7,10,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,8,8,13,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,6,8,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,8,9,15,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+8,12,55,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,6,9,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,8,7,11,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,8,12,63,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,6,8,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+8,7,12,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,11,12,2304,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,6,9,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,8,7,10,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+8,12,47,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,6,8,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,8,12,39,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,8,12,53,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,6,9,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+8,7,11,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,8,8,14,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,6,8,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,8,7,12,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+0,0,0,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,6,9,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,8,7,10,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,8,8,13,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,6,8,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+8,11,19,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,8,11,24,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,6,9,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,8,7,11,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+8,11,22,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,6,8,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,8,7,12,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,11,12,2560,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,6,9,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+8,7,10,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,8,10,16,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,6,8,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,8,10,0,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+10,10,64,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,6,9,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,8,7,11,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,8,8,14,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,6,8,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+8,7,12,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,12,11,0,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,6,9,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,8,7,10,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+8,8,13,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,6,8,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,8,9,15,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,8,10,18,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,6,9,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+8,7,11,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,8,10,17,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,6,8,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,8,7,12,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+11,11,1792,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,6,9,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,8,7,10,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,8,11,23,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,6,8,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+8,11,20,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,8,11,25,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,6,9,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,8,7,11,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+8,8,14,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,6,8,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,8,7,12,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,0,0,0,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,6,9,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+8,7,10,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,8,8,13,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,6,8,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,10,12,128,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+8,12,56,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,6,9,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,8,7,11,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,8,12,30,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,6,8,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+8,7,12,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,11,11,1856,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,6,9,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,8,7,10,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+8,12,57,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,6,8,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,8,11,21,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,8,12,54,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,6,9,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+8,7,11,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,8,8,14,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,6,8,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,8,7,12,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+0,0,0,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,6,9,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,8,7,10,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,8,8,13,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,6,8,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+8,9,15,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,8,12,52,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,6,9,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,8,7,11,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+8,12,48,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,6,8,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,8,7,12,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,11,12,2112,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,6,9,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+8,7,10,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,8,12,44,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,6,8,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,8,12,36,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+10,12,384,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,6,9,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,8,7,11,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,8,8,14,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,6,8,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+8,7,12,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,0,0,0,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,6,9,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,8,7,10,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+8,8,13,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,6,8,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,8,12,28,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,8,12,60,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,6,9,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+8,7,11,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,8,12,40,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,6,8,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,8,7,12,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+11,12,2368,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,6,9,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,8,7,10,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,8,10,16,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,6,8,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+8,10,0,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,10,10,64,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,6,9,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,8,7,11,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+8,8,14,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,6,8,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,8,7,12,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,0,0,0,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,6,9,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+8,7,10,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,8,8,13,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,6,8,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,8,9,15,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+8,10,18,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,6,9,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,8,7,11,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,8,10,17,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,6,8,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+8,7,12,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,11,12,1984,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,6,9,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,8,7,10,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+8,12,50,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,6,8,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,8,12,34,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,10,13,1728,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,6,9,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+8,7,11,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,8,8,14,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,6,8,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,8,7,12,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+0,0,0,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,6,9,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,8,7,10,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,8,8,13,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,6,8,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+8,12,26,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,10,13,1472,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,6,9,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,8,7,11,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+8,12,32,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,6,8,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,8,7,12,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,11,11,1920,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,6,9,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+8,7,10,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,8,12,61,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,6,8,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,8,12,42,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+10,13,1088,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,6,9,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,8,7,11,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,8,8,14,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,6,8,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+8,7,12,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,0,0,0,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,6,9,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,8,7,10,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+8,8,13,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,6,8,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,8,9,15,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,10,13,832,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,6,9,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+8,7,11,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,8,12,62,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,6,8,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,8,7,12,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+11,12,2240,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,6,9,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,8,7,10,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,8,12,46,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,6,8,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+8,12,38,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,10,13,576,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,6,9,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,8,7,11,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+8,8,14,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,6,8,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,8,7,12,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,0,0,0,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,6,9,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+8,7,10,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,8,8,13,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,6,8,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,8,11,19,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+8,11,24,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,6,9,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,8,7,11,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,8,11,22,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,6,8,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+8,7,12,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,11,12,2496,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,6,9,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,8,7,10,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+8,10,16,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,6,8,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,8,10,0,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,10,10,64,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,6,9,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+8,7,11,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,8,8,14,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,6,8,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,8,7,12,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+12,11,0,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,6,9,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,8,7,10,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,8,8,13,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,6,8,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+8,9,15,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,8,10,18,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,6,9,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,8,7,11,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+8,10,17,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,6,8,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,8,7,12,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,11,11,1792,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,6,9,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+8,7,10,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,8,11,23,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,6,8,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,8,11,20,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+8,11,25,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,6,9,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,8,7,11,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,8,8,14,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,6,8,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+8,7,12,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,0,0,0,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,6,9,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,8,7,10,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+8,8,13,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,6,8,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,10,12,192,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,10,13,1344,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,6,9,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+8,7,11,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,8,12,31,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,6,8,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,8,7,12,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+11,11,1856,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,6,9,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,8,7,10,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,8,12,58,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,6,8,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+8,11,21,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,10,13,960,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,6,9,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,8,7,11,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+8,8,14,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,6,8,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,8,7,12,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,0,0,0,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,6,9,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+8,7,10,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,8,8,13,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,6,8,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,8,9,15,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+10,13,704,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,6,9,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,8,7,11,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,8,12,49,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,6,8,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+8,7,12,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,11,12,2176,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,6,9,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,8,7,10,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+8,12,45,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,6,8,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,8,12,37,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,10,12,448,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,6,9,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+8,7,11,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,8,8,14,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,6,8,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,8,7,12,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+0,0,0,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,6,9,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,8,7,10,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,8,8,13,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,6,8,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+8,12,29,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,10,13,1600,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,6,9,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,8,7,11,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+8,12,41,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,6,8,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,8,7,12,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,11,12,2432,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,6,9,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+8,7,10,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,8,10,16,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,6,8,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,8,10,0,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+10,10,64,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,6,9,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,8,7,11,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,8,8,14,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,6,8,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+8,7,12,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,0,0,0,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,6,9,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,8,7,10,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+8,8,13,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,6,8,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,8,9,15,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,8,10,18,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,6,9,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+8,7,11,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,8,10,17,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,6,8,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,8,7,12,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+11,12,2048,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,6,9,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,8,7,10,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,8,12,51,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,6,8,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+8,12,35,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,10,12,320,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,6,9,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,8,7,11,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+8,8,14,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,6,8,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,8,7,12,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,0,0,0,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,6,9,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+8,7,10,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,8,8,13,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,6,8,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,8,12,27,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+8,12,59,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,6,9,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,8,7,11,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,8,12,33,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,6,8,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+8,7,12,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,11,11,1920,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,6,9,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,8,7,10,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+10,12,256,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,6,8,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,8,12,43,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,10,13,1216,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,6,9,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+8,7,11,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,8,8,14,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,6,8,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,8,7,12,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+0,0,0,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,6,9,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,8,7,10,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,8,8,13,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,6,8,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+8,9,15,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,8,12,55,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,6,9,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,8,7,11,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+8,12,63,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,6,8,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,8,7,12,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,11,12,2304,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,6,9,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+8,7,10,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,8,12,47,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,6,8,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,8,12,39,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+8,12,53,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,6,9,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,8,7,11,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,8,8,14,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,6,8,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+8,7,12,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,0,0,0,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,6,9,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,8,7,10,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+8,8,13,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,6,8,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,8,11,19,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,8,11,24,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,6,9,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+8,7,11,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,8,11,22,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,6,8,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,8,7,12,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+11,12,2560,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,6,9,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,8,7,10,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,8,10,16,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,6,8,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+8,10,0,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,10,10,64,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,6,9,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,8,7,11,8,2,3,8,3,1,8,2,2,
+8,4,6,8,2,3,8,3,4,8,2,2,8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2,
+8,8,14,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,8,6,8,8,2,3,8,3,1,8,2,2,
+8,4,5,8,2,3,8,3,4,8,2,2,8,7,12,8,2,3,8,3,1,8,2,2,8,4,6,8,2,3,8,3,4,8,2,2,
+8,5,7,8,2,3,8,3,1,8,2,2,8,4,5,8,2,3,8,3,4,8,2,2
+};
diff --git a/uppsrc/plugin/tif/lib/jerror.h b/uppsrc/plugin/tif/lib/jerror.h
new file mode 100644
index 000000000..4f04e4999
--- /dev/null
+++ b/uppsrc/plugin/tif/lib/jerror.h
@@ -0,0 +1,5 @@
+#ifndef jpeg_boolean
+#define boolean jpeg_boolean
+#define jpeg_boolean int
+#endif
+#include <plugin/jpg/lib/jerror.h>
diff --git a/uppsrc/plugin/tif/lib/jpeglib.h b/uppsrc/plugin/tif/lib/jpeglib.h
new file mode 100644
index 000000000..ee2d0c7ab
--- /dev/null
+++ b/uppsrc/plugin/tif/lib/jpeglib.h
@@ -0,0 +1,5 @@
+#ifndef jpeg_boolean
+#define boolean jpeg_boolean
+#define jpeg_boolean int
+#endif
+#include <plugin/jpg/lib/jpeglib.h>
diff --git a/uppsrc/plugin/tif/lib/libtiff.def b/uppsrc/plugin/tif/lib/libtiff.def
new file mode 100644
index 000000000..3caefd836
--- /dev/null
+++ b/uppsrc/plugin/tif/lib/libtiff.def
@@ -0,0 +1,140 @@
+EXPORTS TIFFOpen
+	TIFFOpenW
+	TIFFGetVersion
+	TIFFCleanup
+	TIFFClose
+	TIFFFlush
+	TIFFFlushData
+	TIFFGetField
+	TIFFVGetField
+	TIFFGetFieldDefaulted
+	TIFFVGetFieldDefaulted
+	TIFFGetTagListEntry
+	TIFFGetTagListCount
+	TIFFReadDirectory
+	TIFFScanlineSize
+	TIFFStripSize
+	TIFFVStripSize
+	TIFFRawStripSize
+	TIFFTileRowSize
+	TIFFTileSize
+	TIFFVTileSize
+	TIFFFileno
+	TIFFSetFileno
+	TIFFGetMode
+	TIFFIsTiled
+	TIFFIsByteSwapped
+	TIFFIsBigEndian
+	TIFFIsMSB2LSB
+	TIFFIsUpSampled
+	TIFFCIELabToRGBInit
+	TIFFCIELabToXYZ
+	TIFFXYZToRGB
+	TIFFYCbCrToRGBInit
+	TIFFYCbCrtoRGB
+	TIFFCurrentRow
+	TIFFCurrentDirectory
+	TIFFCurrentStrip
+	TIFFCurrentTile
+	TIFFDataWidth
+	TIFFReadBufferSetup
+	TIFFWriteBufferSetup
+	TIFFSetupStrips
+	TIFFLastDirectory
+	TIFFSetDirectory
+	TIFFSetSubDirectory
+	TIFFUnlinkDirectory
+	TIFFSetField
+	TIFFVSetField
+	TIFFCheckpointDirectory
+	TIFFWriteDirectory
+	TIFFRewriteDirectory
+	TIFFPrintDirectory
+	TIFFReadScanline
+	TIFFWriteScanline
+	TIFFReadRGBAImage
+	TIFFReadRGBAImageOriented
+	TIFFFdOpen
+	TIFFClientOpen
+	TIFFFileName
+	TIFFError
+	TIFFErrorExt
+	TIFFWarning
+	TIFFWarningExt
+	TIFFSetErrorHandler
+	TIFFSetErrorHandlerExt
+	TIFFSetWarningHandler
+	TIFFSetWarningHandlerExt
+	TIFFComputeTile
+	TIFFCheckTile
+	TIFFNumberOfTiles
+	TIFFReadTile
+	TIFFWriteTile
+	TIFFComputeStrip
+	TIFFNumberOfStrips
+	TIFFRGBAImageBegin
+	TIFFRGBAImageGet
+	TIFFRGBAImageEnd
+	TIFFReadEncodedStrip
+	TIFFReadRawStrip
+	TIFFReadEncodedTile
+	TIFFReadRawTile
+	TIFFReadRGBATile
+	TIFFReadRGBAStrip
+	TIFFWriteEncodedStrip
+	TIFFWriteRawStrip
+	TIFFWriteEncodedTile
+	TIFFWriteRawTile
+	TIFFSetWriteOffset
+	TIFFSwabDouble
+	TIFFSwabShort
+	TIFFSwabLong
+	TIFFSwabArrayOfShort
+	TIFFSwabArrayOfLong
+	TIFFSwabArrayOfDouble
+	TIFFSwabArrayOfTriples
+	TIFFReverseBits
+	TIFFGetBitRevTable
+	TIFFDefaultStripSize
+	TIFFDefaultTileSize
+	TIFFRasterScanlineSize
+	_TIFFmalloc
+	_TIFFrealloc
+	_TIFFfree
+	_TIFFmemset
+	_TIFFmemcpy
+	_TIFFmemcmp
+	TIFFCreateDirectory
+	TIFFSetTagExtender
+	TIFFMergeFieldInfo
+	TIFFFindFieldInfo
+	TIFFFindFieldInfoByName
+	TIFFFieldWithName
+	TIFFFieldWithTag
+	TIFFCurrentDirOffset
+	TIFFWriteCheck
+	TIFFRGBAImageOK
+	TIFFNumberOfDirectories
+	TIFFSetFileName
+	TIFFSetClientdata
+	TIFFSetMode
+	TIFFClientdata
+	TIFFGetReadProc
+	TIFFGetWriteProc
+	TIFFGetSeekProc
+	TIFFGetCloseProc
+	TIFFGetSizeProc
+	TIFFGetMapFileProc
+	TIFFGetUnmapFileProc
+	TIFFIsCODECConfigured
+	TIFFGetConfiguredCODECs
+ 	TIFFFindCODEC
+ 	TIFFRegisterCODEC
+ 	TIFFUnRegisterCODEC
+	TIFFFreeDirectory
+	TIFFReadCustomDirectory
+	TIFFReadEXIFDirectory
+ 	TIFFAccessTagMethods
+ 	TIFFGetClientInfo
+ 	TIFFSetClientInfo
+ 	TIFFReassignTagToIgnore
diff --git a/uppsrc/plugin/tif/lib/mkg3states.c b/uppsrc/plugin/tif/lib/mkg3states.c
new file mode 100644
index 000000000..7b6cbb1e5
--- /dev/null
+++ b/uppsrc/plugin/tif/lib/mkg3states.c
@@ -0,0 +1,440 @@
+/* "$Id: mkg3states.c,v 1.9 2004/10/10 11:46:16 dron Exp $ */
+
+/*
+ * Copyright (c) 1991-1997 Sam Leffler
+ * Copyright (c) 1991-1997 Silicon Graphics, Inc.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and
+ * its documentation for any purpose is hereby granted without fee, provided
+ * that (i) the above copyright notices and this permission notice appear in
+ * all copies of the software and related documentation, and (ii) the names of
+ * Sam Leffler and Silicon Graphics may not be used in any advertising or
+ * publicity relating to the software without the specific, prior written
+ * permission of Sam Leffler and Silicon Graphics.
+ *
+ * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+ * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
+ * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
+ * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+ * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
+ * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.
+ */
+
+/* Initialise fax decoder tables
+ * Decoder support is derived, with permission, from the code
+ * in Frank Cringle's viewfax program;
+ *      Copyright (C) 1990, 1995  Frank D. Cringle.
+ */
+#include "tif_config.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
+
+#include "tif_fax3.h"
+
+#define	streq(a,b)	(strcmp(a,b) == 0)
+
+/* NB: can't use names in tif_fax3.h 'cuz they are declared const */
+TIFFFaxTabEnt MainTable[128];
+TIFFFaxTabEnt WhiteTable[4096];
+TIFFFaxTabEnt BlackTable[8192];
+
+struct proto {
+    uint16 code;		/* right justified, lsb-first, zero filled */
+    uint16 val;		/* (pixel count)<<4 + code width  */
+};
+
+static struct proto Pass[] = {
+{ 0x0008, 4 },
+{ 0, 0 }
+};
+
+static struct proto Horiz[]  = {
+{ 0x0004, 3 },
+{ 0, 0 }
+};
+
+static struct proto V0[]  = {
+{ 0x0001, 1 },
+{ 0, 0 }
+};
+
+static struct proto VR[]  = {
+{ 0x0006, (1<<4)+3 },
+{ 0x0030, (2<<4)+6 },
+{ 0x0060, (3<<4)+7 },
+{ 0, 0 }
+};
+
+static struct proto VL[]  = {
+{ 0x0002, (1<<4)+3 },
+{ 0x0010, (2<<4)+6 },
+{ 0x0020, (3<<4)+7 },
+{ 0, 0 }
+};
+
+static struct proto Ext[]  = {
+{ 0x0040, 7 },
+{ 0, 0 }
+};
+
+static struct proto EOLV[]  = {
+{ 0x0000, 7 },
+{ 0, 0 }
+};
+
+static struct proto MakeUpW[] = {
+{ 0x001b, 1029 },
+{ 0x0009, 2053 },
+{ 0x003a, 3078 },
+{ 0x0076, 4103 },
+{ 0x006c, 5128 },
+{ 0x00ec, 6152 },
+{ 0x0026, 7176 },
+{ 0x00a6, 8200 },
+{ 0x0016, 9224 },
+{ 0x00e6, 10248 },
+{ 0x0066, 11273 },
+{ 0x0166, 12297 },
+{ 0x0096, 13321 },
+{ 0x0196, 14345 },
+{ 0x0056, 15369 },
+{ 0x0156, 16393 },
+{ 0x00d6, 17417 },
+{ 0x01d6, 18441 },
+{ 0x0036, 19465 },
+{ 0x0136, 20489 },
+{ 0x00b6, 21513 },
+{ 0x01b6, 22537 },
+{ 0x0032, 23561 },
+{ 0x0132, 24585 },
+{ 0x00b2, 25609 },
+{ 0x0006, 26630 },
+{ 0x01b2, 27657 },
+{ 0, 0 }
+};
+
+static struct proto MakeUpB[] = {
+{ 0x03c0, 1034 },
+{ 0x0130, 2060 },
+{ 0x0930, 3084 },
+{ 0x0da0, 4108 },
+{ 0x0cc0, 5132 },
+{ 0x02c0, 6156 },
+{ 0x0ac0, 7180 },
+{ 0x06c0, 8205 },
+{ 0x16c0, 9229 },
+{ 0x0a40, 10253 },
+{ 0x1a40, 11277 },
+{ 0x0640, 12301 },
+{ 0x1640, 13325 },
+{ 0x09c0, 14349 },
+{ 0x19c0, 15373 },
+{ 0x05c0, 16397 },
+{ 0x15c0, 17421 },
+{ 0x0dc0, 18445 },
+{ 0x1dc0, 19469 },
+{ 0x0940, 20493 },
+{ 0x1940, 21517 },
+{ 0x0540, 22541 },
+{ 0x1540, 23565 },
+{ 0x0b40, 24589 },
+{ 0x1b40, 25613 },
+{ 0x04c0, 26637 },
+{ 0x14c0, 27661 },
+{ 0, 0 }
+};
+
+static struct proto MakeUp[] = {
+{ 0x0080, 28683 },
+{ 0x0180, 29707 },
+{ 0x0580, 30731 },
+{ 0x0480, 31756 },
+{ 0x0c80, 32780 },
+{ 0x0280, 33804 },
+{ 0x0a80, 34828 },
+{ 0x0680, 35852 },
+{ 0x0e80, 36876 },
+{ 0x0380, 37900 },
+{ 0x0b80, 38924 },
+{ 0x0780, 39948 },
+{ 0x0f80, 40972 },
+{ 0, 0 }
+};
+
+static struct proto TermW[] = {
+{ 0x00ac, 8 },
+{ 0x0038, 22 },
+{ 0x000e, 36 },
+{ 0x0001, 52 },
+{ 0x000d, 68 },
+{ 0x0003, 84 },
+{ 0x0007, 100 },
+{ 0x000f, 116 },
+{ 0x0019, 133 },
+{ 0x0005, 149 },
+{ 0x001c, 165 },
+{ 0x0002, 181 },
+{ 0x0004, 198 },
+{ 0x0030, 214 },
+{ 0x000b, 230 },
+{ 0x002b, 246 },
+{ 0x0015, 262 },
+{ 0x0035, 278 },
+{ 0x0072, 295 },
+{ 0x0018, 311 },
+{ 0x0008, 327 },
+{ 0x0074, 343 },
+{ 0x0060, 359 },
+{ 0x0010, 375 },
+{ 0x000a, 391 },
+{ 0x006a, 407 },
+{ 0x0064, 423 },
+{ 0x0012, 439 },
+{ 0x000c, 455 },
+{ 0x0040, 472 },
+{ 0x00c0, 488 },
+{ 0x0058, 504 },
+{ 0x00d8, 520 },
+{ 0x0048, 536 },
+{ 0x00c8, 552 },
+{ 0x0028, 568 },
+{ 0x00a8, 584 },
+{ 0x0068, 600 },
+{ 0x00e8, 616 },
+{ 0x0014, 632 },
+{ 0x0094, 648 },
+{ 0x0054, 664 },
+{ 0x00d4, 680 },
+{ 0x0034, 696 },
+{ 0x00b4, 712 },
+{ 0x0020, 728 },
+{ 0x00a0, 744 },
+{ 0x0050, 760 },
+{ 0x00d0, 776 },
+{ 0x004a, 792 },
+{ 0x00ca, 808 },
+{ 0x002a, 824 },
+{ 0x00aa, 840 },
+{ 0x0024, 856 },
+{ 0x00a4, 872 },
+{ 0x001a, 888 },
+{ 0x009a, 904 },
+{ 0x005a, 920 },
+{ 0x00da, 936 },
+{ 0x0052, 952 },
+{ 0x00d2, 968 },
+{ 0x004c, 984 },
+{ 0x00cc, 1000 },
+{ 0x002c, 1016 },
+{ 0, 0 }
+};
+
+static struct proto TermB[] = {
+{ 0x03b0, 10 },
+{ 0x0002, 19 },
+{ 0x0003, 34 },
+{ 0x0001, 50 },
+{ 0x0006, 67 },
+{ 0x000c, 84 },
+{ 0x0004, 100 },
+{ 0x0018, 117 },
+{ 0x0028, 134 },
+{ 0x0008, 150 },
+{ 0x0010, 167 },
+{ 0x0050, 183 },
+{ 0x0070, 199 },
+{ 0x0020, 216 },
+{ 0x00e0, 232 },
+{ 0x0030, 249 },
+{ 0x03a0, 266 },
+{ 0x0060, 282 },
+{ 0x0040, 298 },
+{ 0x0730, 315 },
+{ 0x00b0, 331 },
+{ 0x01b0, 347 },
+{ 0x0760, 363 },
+{ 0x00a0, 379 },
+{ 0x0740, 395 },
+{ 0x00c0, 411 },
+{ 0x0530, 428 },
+{ 0x0d30, 444 },
+{ 0x0330, 460 },
+{ 0x0b30, 476 },
+{ 0x0160, 492 },
+{ 0x0960, 508 },
+{ 0x0560, 524 },
+{ 0x0d60, 540 },
+{ 0x04b0, 556 },
+{ 0x0cb0, 572 },
+{ 0x02b0, 588 },
+{ 0x0ab0, 604 },
+{ 0x06b0, 620 },
+{ 0x0eb0, 636 },
+{ 0x0360, 652 },
+{ 0x0b60, 668 },
+{ 0x05b0, 684 },
+{ 0x0db0, 700 },
+{ 0x02a0, 716 },
+{ 0x0aa0, 732 },
+{ 0x06a0, 748 },
+{ 0x0ea0, 764 },
+{ 0x0260, 780 },
+{ 0x0a60, 796 },
+{ 0x04a0, 812 },
+{ 0x0ca0, 828 },
+{ 0x0240, 844 },
+{ 0x0ec0, 860 },
+{ 0x01c0, 876 },
+{ 0x0e40, 892 },
+{ 0x0140, 908 },
+{ 0x01a0, 924 },
+{ 0x09a0, 940 },
+{ 0x0d40, 956 },
+{ 0x0340, 972 },
+{ 0x05a0, 988 },
+{ 0x0660, 1004 },
+{ 0x0e60, 1020 },
+{ 0, 0 }
+};
+
+static struct proto EOLH[] = {
+{ 0x0000, 11 },
+{ 0, 0 }
+};
+
+static void
+FillTable(TIFFFaxTabEnt *T, int Size, struct proto *P, int State)
+{
+    int limit = 1 << Size;
+
+    while (P->val) {
+	int width = P->val & 15;
+	int param = P->val >> 4;
+	int incr = 1 << width;
+	int code;
+	for (code = P->code; code < limit; code += incr) {
+	    TIFFFaxTabEnt *E = T+code;
+	    E->State = State;
+	    E->Width = width;
+	    E->Param = param;
+	}
+	P++;
+    }
+}
+
+static	char* storage_class = "";
+static	char* const_class = "";
+static	int packoutput = 1;
+static	char* prebrace = "";
+static	char* postbrace = "";
+
+void
+WriteTable(FILE* fd, const TIFFFaxTabEnt* T, int Size, const char* name)
+{
+    int i;
+    char* sep;
+
+    fprintf(fd, "%s %s TIFFFaxTabEnt %s[%d] = {",
+	storage_class, const_class, name, Size);
+    if (packoutput) {
+	sep = "\n";
+	for (i = 0; i < Size; i++) {
+	    fprintf(fd, "%s%s%d,%d,%d%s",
+		sep, prebrace, T->State, T->Width, (int) T->Param, postbrace);
+	    if (((i+1) % 10) == 0)
+		    sep = ",\n";
+	    else
+		    sep = ",";
+	    T++;
+	}
+    } else {
+	sep = "\n ";
+	for (i = 0; i < Size; i++) {
+	    fprintf(fd, "%s%s%3d,%3d,%4d%s",
+		sep, prebrace, T->State, T->Width, (int) T->Param, postbrace);
+	    if (((i+1) % 6) == 0)
+		    sep = ",\n ";
+	    else
+		    sep = ",";
+	    T++;
+	}
+    }
+    fprintf(fd, "\n};\n");
+}
+
+/* initialise the huffman code tables */
+int
+main(int argc, char* argv[])
+{
+    FILE* fd;
+    char* outputfile;
+    int c;
+    extern int optind;
+    extern char* optarg;
+
+    while ((c = getopt(argc, argv, "c:s:bp")) != -1)
+	switch (c) {
+	case 'c':
+	    const_class = optarg;
+	    break;
+	case 's':
+	    storage_class = optarg;
+	    break;
+	case 'p':
+	    packoutput = 0;
+	    break;
+	case 'b':
+	    prebrace = "{";
+	    postbrace = "}";
+	    break;
+	case '?':
+	    fprintf(stderr,
+		"usage: %s [-c const] [-s storage] [-p] [-b] file\n",
+		argv[0]);
+	    return (-1);
+	}
+    outputfile = optind < argc ? argv[optind] : "g3states.h";
+    fd = fopen(outputfile, "w");
+    if (fd == NULL) {
+	fprintf(stderr, "%s: %s: Cannot create output file.\n",
+	    argv[0], outputfile);
+	return (-2);
+    }
+    FillTable(MainTable, 7, Pass, S_Pass);
+    FillTable(MainTable, 7, Horiz, S_Horiz);
+    FillTable(MainTable, 7, V0, S_V0);
+    FillTable(MainTable, 7, VR, S_VR);
+    FillTable(MainTable, 7, VL, S_VL);
+    FillTable(MainTable, 7, Ext, S_Ext);
+    FillTable(MainTable, 7, EOLV, S_EOL);
+    FillTable(WhiteTable, 12, MakeUpW, S_MakeUpW);
+    FillTable(WhiteTable, 12, MakeUp, S_MakeUp);
+    FillTable(WhiteTable, 12, TermW, S_TermW);
+    FillTable(WhiteTable, 12, EOLH, S_EOL);
+    FillTable(BlackTable, 13, MakeUpB, S_MakeUpB);
+    FillTable(BlackTable, 13, MakeUp, S_MakeUp);
+    FillTable(BlackTable, 13, TermB, S_TermB);
+    FillTable(BlackTable, 13, EOLH, S_EOL);
+
+    fprintf(fd, "/* WARNING, this file was automatically generated by the\n");
+    fprintf(fd, "    mkg3states program */\n");
+    fprintf(fd, "#include \"tiff.h\"\n");
+    fprintf(fd, "#include \"tif_fax3.h\"\n");
+    WriteTable(fd, MainTable, 128, "TIFFFaxMainTable");
+    WriteTable(fd, WhiteTable, 4096, "TIFFFaxWhiteTable");
+    WriteTable(fd, BlackTable, 8192, "TIFFFaxBlackTable");
+    fclose(fd);
+    return (0);
+}
+
+/* vim: set ts=8 sts=8 sw=8 noet: */
diff --git a/uppsrc/plugin/tif/lib/mkspans.c b/uppsrc/plugin/tif/lib/mkspans.c
new file mode 100644
index 000000000..dc030913f
--- /dev/null
+++ b/uppsrc/plugin/tif/lib/mkspans.c
@@ -0,0 +1,72 @@
+/* $Header: /cvsroot/upp/uppsrc/plugin/tif/lib/mkspans.c,v 1.1 2005/02/07 00:26:06 rylek Exp $ */
+
+/*
+ * Copyright (c) 1991-1997 Sam Leffler
+ * Copyright (c) 1991-1997 Silicon Graphics, Inc.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and
+ * its documentation for any purpose is hereby granted without fee, provided
+ * that (i) the above copyright notices and this permission notice appear in
+ * all copies of the software and related documentation, and (ii) the names of
+ * Sam Leffler and Silicon Graphics may not be used in any advertising or
+ * publicity relating to the software without the specific, prior written
+ * permission of Sam Leffler and Silicon Graphics.
+ *
+ * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+ * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
+ * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
+ * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+ * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
+ * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.
+ */
+
+#include "tiffcomp.h"
+
+/*
+ * Hack program to construct tables used to find
+ * runs of zeros and ones in Group 3 Fax encoding.
+ */
+
+dumparray(name, runs)
+	char *name;
+	unsigned char runs[256];
+{
+	register int i;
+	register char *sep;
+	printf("static u_char %s[256] = {\n", name);
+	sep = "    ";
+	for (i = 0; i < 256; i++) {
+		printf("%s%d", sep, runs[i]);
+		if (((i + 1) % 16) == 0) {
+			printf(",	/* 0x%02x - 0x%02x */\n", i-15, i);
+			sep = "    ";
+		} else
+			sep = ", ";
+	}
+	printf("\n};\n");
+}
+
+main()
+{
+	unsigned char runs[2][256];
+
+	memset(runs[0], 0, 256*sizeof (char));
+	memset(runs[1], 0, 256*sizeof (char));
+	{ register int run, runlen, i;
+	  runlen = 1;
+	  for (run = 0x80; run != 0xff; run = (run>>1)|0x80) {
+		for (i = run-1; i >= 0; i--) {
+			runs[1][run|i] = runlen;
+			runs[0][(~(run|i)) & 0xff] = runlen;
+		}
+		runlen++;
+	  }
+	  runs[1][0xff] = runs[0][0] = 8;
+	}
+	dumparray("bruns", runs[0]);
+	dumparray("wruns", runs[1]);
+}
diff --git a/uppsrc/plugin/tif/lib/mkversion.c b/uppsrc/plugin/tif/lib/mkversion.c
new file mode 100644
index 000000000..4c5d5c598
--- /dev/null
+++ b/uppsrc/plugin/tif/lib/mkversion.c
@@ -0,0 +1,175 @@
+/* "$Header: /cvsroot/upp/uppsrc/plugin/tif/lib/mkversion.c,v 1.1 2005/02/07 00:26:06 rylek Exp $ */
+
+/*
+ * Copyright (c) 1995-1997 Sam Leffler
+ * Copyright (c) 1995-1997 Silicon Graphics, Inc.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and
+ * its documentation for any purpose is hereby granted without fee, provided
+ * that (i) the above copyright notices and this permission notice appear in
+ * all copies of the software and related documentation, and (ii) the names of
+ * Sam Leffler and Silicon Graphics may not be used in any advertising or
+ * publicity relating to the software without the specific, prior written
+ * permission of Sam Leffler and Silicon Graphics.
+ *
+ * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+ * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
+ * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
+ * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+ * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
+ * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.
+ */
+
+/*
+ * Generate a library version string for systems that
+ * do not have a shell (by default this is done with
+ * awk and echo from the Makefile).
+ *
+ * This was written by Peter Greenham for Acorn systems.
+ *
+ * Syntax: mkversion [-v version-file] [-a alpha-file] [<outfile>]
+ */
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+static void
+usage(void)
+{
+    fprintf(stderr,
+            "usage: mkversion [-v version-file] [-a alpha-file]\n"
+            "                 [-r releasedate-file] [outfile]\n");
+    exit(-1);
+}
+
+static FILE*
+openFile(char* filename)
+{
+    FILE* fd = fopen(filename, "r");
+    if (fd == NULL) {
+	fprintf(stderr, "mkversion: %s: Could not open for reading.\n",
+	    filename);
+	exit(-1);
+    }
+    return (fd);
+}
+
+int
+main(int argc, char* argv[])
+{
+    char* versionFile = "../VERSION";
+    char* releaseDateFile = "../RELEASE-DATE";
+    char* alphaFile = "../dist/tiff.alpha";
+    char version[128];
+    char rawReleaseDate[128];
+    char tiffLibVersion[128];
+    char alpha[128];
+    FILE* fd;
+    char* cp;
+
+    argc--, argv++;
+    while (argc > 0 && argv[0][0] == '-') {
+	if (strcmp(argv[0], "-v") == 0) {
+	    if (argc < 1)
+		usage();
+	    argc--, argv++;
+	    versionFile = argv[0];
+	} else if (strcmp(argv[0], "-a") == 0) {
+	    if (argc < 1)
+		usage();
+	    argc--, argv++;
+	    alphaFile = argv[0];
+	} else if (strcmp(argv[0], "-r") == 0) {
+	    if (argc < 1)
+		usage();
+	    argc--, argv++;
+	    releaseDateFile = argv[0];
+	} else
+	    usage();
+	argc--, argv++;
+    }
+
+    /*
+     * Read the VERSION file.
+     */
+    fd = openFile(versionFile);
+    if (fgets(version, sizeof (version)-1, fd) == NULL) {
+	fprintf(stderr, "mkversion: No version information in %s.\n",
+	    versionFile);
+	exit(-1);
+    }
+    cp = strchr(version, '\n');
+    if (cp)
+	*cp = '\0';
+    fclose(fd);
+    fd = openFile(alphaFile);
+    if (fgets(alpha, sizeof (alpha)-1, fd) == NULL) {
+	fprintf(stderr, "mkversion: No alpha information in %s.\n", alphaFile);
+	exit(-1);
+    }
+    fclose(fd);
+    cp = strchr(alpha, ' ');		/* skip to 3rd blank-separated field */
+    if (cp)
+	cp = strchr(cp+1, ' ');
+    if (cp) {				/* append alpha to version */
+	char* tp;
+	for (tp = strchr(version, '\0'), cp++; (*tp = *cp) != 0; tp++, cp++)
+	    ;
+	if (tp[-1] == '\n')
+	    tp[-1] = '\0';
+    } else {
+	fprintf(stderr, "mkversion: Malformed alpha information in %s.\n",
+	    alphaFile);
+	exit(-1);
+    }
+
+    /*
+     * Read the RELEASE-DATE, and translate format to emit TIFFLIB_VERSION.
+     */
+    fd = openFile(releaseDateFile);
+    if (fgets(rawReleaseDate, sizeof (version)-1, fd) == NULL) {
+	fprintf(stderr, "mkversion: No release date information in %s.\n",
+                releaseDateFile);
+	exit(-1);
+    }
+    fclose(fd);
+
+    sprintf( tiffLibVersion, "#define TIFFLIB_VERSION %4.4s%2.2s%2.2s",
+             rawReleaseDate+6,
+             rawReleaseDate+0,
+             rawReleaseDate+3 );
+
+    /*
+     * Emit the version.h file.
+     */
+    if (argc > 0) {
+	fd = fopen(argv[0], "w");
+	if (fd == NULL) {
+	    fprintf(stderr, "mkversion: %s: Could not open for writing.\n",
+		argv[0]);
+	    exit(-1);
+	}
+    } else
+	fd = stdout;
+    fprintf(fd, "#define TIFFLIB_VERSION_STR \"LIBTIFF, Version %s\\n", version);
+    fprintf(fd, "Copyright (c) 1988-1996 Sam Leffler\\n");
+    fprintf(fd, "Copyright (c) 1991-1996 Silicon Graphics, Inc.\"\n");
+
+    fprintf( fd,
+             "/*\n"
+             " * This define can be used in code that requires\n"
+             " * compilation-related definitions specific to a\n"
+             " * version or versions of the library.  Runtime\n"
+             " * version checking should be done based on the\n"
+             " * string returned by TIFFGetVersion.\n"
+             " */\n" );
+    fprintf(fd, "%s\n", tiffLibVersion );
+
+    if (fd != stdout)
+	fclose(fd);
+    return (0);
+}
diff --git a/uppsrc/plugin/tif/lib/t4.h b/uppsrc/plugin/tif/lib/t4.h
new file mode 100644
index 000000000..104fa72a9
--- /dev/null
+++ b/uppsrc/plugin/tif/lib/t4.h
@@ -0,0 +1,285 @@
+/* $Id: t4.h,v 1.1.1.1 1999/07/27 21:50:27 mike Exp $ */
+
+/*
+ * Copyright (c) 1988-1997 Sam Leffler
+ * Copyright (c) 1991-1997 Silicon Graphics, Inc.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and
+ * its documentation for any purpose is hereby granted without fee, provided
+ * that (i) the above copyright notices and this permission notice appear in
+ * all copies of the software and related documentation, and (ii) the names of
+ * Sam Leffler and Silicon Graphics may not be used in any advertising or
+ * publicity relating to the software without the specific, prior written
+ * permission of Sam Leffler and Silicon Graphics.
+ *
+ * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+ * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
+ * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
+ * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+ * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
+ * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.
+ */
+
+#ifndef _T4_
+#define	_T4_
+/*
+ * CCITT T.4 1D Huffman runlength codes and
+ * related definitions.  Given the small sizes
+ * of these tables it does not seem
+ * worthwhile to make code & length 8 bits.
+ */
+typedef struct tableentry {
+    unsigned short length;	/* bit length of g3 code */
+    unsigned short code;	/* g3 code */
+    short	runlen;		/* run length in bits */
+} tableentry;
+
+#define	EOL	0x001	/* EOL code value - 0000 0000 0000 1 */
+
+/* status values returned instead of a run length */
+#define	G3CODE_EOL	-1	/* NB: ACT_EOL - ACT_WRUNT */
+#define	G3CODE_INVALID	-2	/* NB: ACT_INVALID - ACT_WRUNT */
+#define	G3CODE_EOF	-3	/* end of input data */
+#define	G3CODE_INCOMP	-4	/* incomplete run code */
+
+/*
+ * Note that these tables are ordered such that the
+ * index into the table is known to be either the
+ * run length, or (run length / 64) + a fixed offset.
+ *
+ * NB: The G3CODE_INVALID entries are only used
+ *     during state generation (see mkg3states.c).
+ */
+#ifdef G3CODES
+const tableentry TIFFFaxWhiteCodes[] = {
+    { 8, 0x35, 0 },	/* 0011 0101 */
+    { 6, 0x7, 1 },	/* 0001 11 */
+    { 4, 0x7, 2 },	/* 0111 */
+    { 4, 0x8, 3 },	/* 1000 */
+    { 4, 0xB, 4 },	/* 1011 */
+    { 4, 0xC, 5 },	/* 1100 */
+    { 4, 0xE, 6 },	/* 1110 */
+    { 4, 0xF, 7 },	/* 1111 */
+    { 5, 0x13, 8 },	/* 1001 1 */
+    { 5, 0x14, 9 },	/* 1010 0 */
+    { 5, 0x7, 10 },	/* 0011 1 */
+    { 5, 0x8, 11 },	/* 0100 0 */
+    { 6, 0x8, 12 },	/* 0010 00 */
+    { 6, 0x3, 13 },	/* 0000 11 */
+    { 6, 0x34, 14 },	/* 1101 00 */
+    { 6, 0x35, 15 },	/* 1101 01 */
+    { 6, 0x2A, 16 },	/* 1010 10 */
+    { 6, 0x2B, 17 },	/* 1010 11 */
+    { 7, 0x27, 18 },	/* 0100 111 */
+    { 7, 0xC, 19 },	/* 0001 100 */
+    { 7, 0x8, 20 },	/* 0001 000 */
+    { 7, 0x17, 21 },	/* 0010 111 */
+    { 7, 0x3, 22 },	/* 0000 011 */
+    { 7, 0x4, 23 },	/* 0000 100 */
+    { 7, 0x28, 24 },	/* 0101 000 */
+    { 7, 0x2B, 25 },	/* 0101 011 */
+    { 7, 0x13, 26 },	/* 0010 011 */
+    { 7, 0x24, 27 },	/* 0100 100 */
+    { 7, 0x18, 28 },	/* 0011 000 */
+    { 8, 0x2, 29 },	/* 0000 0010 */
+    { 8, 0x3, 30 },	/* 0000 0011 */
+    { 8, 0x1A, 31 },	/* 0001 1010 */
+    { 8, 0x1B, 32 },	/* 0001 1011 */
+    { 8, 0x12, 33 },	/* 0001 0010 */
+    { 8, 0x13, 34 },	/* 0001 0011 */
+    { 8, 0x14, 35 },	/* 0001 0100 */
+    { 8, 0x15, 36 },	/* 0001 0101 */
+    { 8, 0x16, 37 },	/* 0001 0110 */
+    { 8, 0x17, 38 },	/* 0001 0111 */
+    { 8, 0x28, 39 },	/* 0010 1000 */
+    { 8, 0x29, 40 },	/* 0010 1001 */
+    { 8, 0x2A, 41 },	/* 0010 1010 */
+    { 8, 0x2B, 42 },	/* 0010 1011 */
+    { 8, 0x2C, 43 },	/* 0010 1100 */
+    { 8, 0x2D, 44 },	/* 0010 1101 */
+    { 8, 0x4, 45 },	/* 0000 0100 */
+    { 8, 0x5, 46 },	/* 0000 0101 */
+    { 8, 0xA, 47 },	/* 0000 1010 */
+    { 8, 0xB, 48 },	/* 0000 1011 */
+    { 8, 0x52, 49 },	/* 0101 0010 */
+    { 8, 0x53, 50 },	/* 0101 0011 */
+    { 8, 0x54, 51 },	/* 0101 0100 */
+    { 8, 0x55, 52 },	/* 0101 0101 */
+    { 8, 0x24, 53 },	/* 0010 0100 */
+    { 8, 0x25, 54 },	/* 0010 0101 */
+    { 8, 0x58, 55 },	/* 0101 1000 */
+    { 8, 0x59, 56 },	/* 0101 1001 */
+    { 8, 0x5A, 57 },	/* 0101 1010 */
+    { 8, 0x5B, 58 },	/* 0101 1011 */
+    { 8, 0x4A, 59 },	/* 0100 1010 */
+    { 8, 0x4B, 60 },	/* 0100 1011 */
+    { 8, 0x32, 61 },	/* 0011 0010 */
+    { 8, 0x33, 62 },	/* 0011 0011 */
+    { 8, 0x34, 63 },	/* 0011 0100 */
+    { 5, 0x1B, 64 },	/* 1101 1 */
+    { 5, 0x12, 128 },	/* 1001 0 */
+    { 6, 0x17, 192 },	/* 0101 11 */
+    { 7, 0x37, 256 },	/* 0110 111 */
+    { 8, 0x36, 320 },	/* 0011 0110 */
+    { 8, 0x37, 384 },	/* 0011 0111 */
+    { 8, 0x64, 448 },	/* 0110 0100 */
+    { 8, 0x65, 512 },	/* 0110 0101 */
+    { 8, 0x68, 576 },	/* 0110 1000 */
+    { 8, 0x67, 640 },	/* 0110 0111 */
+    { 9, 0xCC, 704 },	/* 0110 0110 0 */
+    { 9, 0xCD, 768 },	/* 0110 0110 1 */
+    { 9, 0xD2, 832 },	/* 0110 1001 0 */
+    { 9, 0xD3, 896 },	/* 0110 1001 1 */
+    { 9, 0xD4, 960 },	/* 0110 1010 0 */
+    { 9, 0xD5, 1024 },	/* 0110 1010 1 */
+    { 9, 0xD6, 1088 },	/* 0110 1011 0 */
+    { 9, 0xD7, 1152 },	/* 0110 1011 1 */
+    { 9, 0xD8, 1216 },	/* 0110 1100 0 */
+    { 9, 0xD9, 1280 },	/* 0110 1100 1 */
+    { 9, 0xDA, 1344 },	/* 0110 1101 0 */
+    { 9, 0xDB, 1408 },	/* 0110 1101 1 */
+    { 9, 0x98, 1472 },	/* 0100 1100 0 */
+    { 9, 0x99, 1536 },	/* 0100 1100 1 */
+    { 9, 0x9A, 1600 },	/* 0100 1101 0 */
+    { 6, 0x18, 1664 },	/* 0110 00 */
+    { 9, 0x9B, 1728 },	/* 0100 1101 1 */
+    { 11, 0x8, 1792 },	/* 0000 0001 000 */
+    { 11, 0xC, 1856 },	/* 0000 0001 100 */
+    { 11, 0xD, 1920 },	/* 0000 0001 101 */
+    { 12, 0x12, 1984 },	/* 0000 0001 0010 */
+    { 12, 0x13, 2048 },	/* 0000 0001 0011 */
+    { 12, 0x14, 2112 },	/* 0000 0001 0100 */
+    { 12, 0x15, 2176 },	/* 0000 0001 0101 */
+    { 12, 0x16, 2240 },	/* 0000 0001 0110 */
+    { 12, 0x17, 2304 },	/* 0000 0001 0111 */
+    { 12, 0x1C, 2368 },	/* 0000 0001 1100 */
+    { 12, 0x1D, 2432 },	/* 0000 0001 1101 */
+    { 12, 0x1E, 2496 },	/* 0000 0001 1110 */
+    { 12, 0x1F, 2560 },	/* 0000 0001 1111 */
+    { 12, 0x1, G3CODE_EOL },	/* 0000 0000 0001 */
+    { 9, 0x1, G3CODE_INVALID },	/* 0000 0000 1 */
+    { 10, 0x1, G3CODE_INVALID },	/* 0000 0000 01 */
+    { 11, 0x1, G3CODE_INVALID },	/* 0000 0000 001 */
+    { 12, 0x0, G3CODE_INVALID },	/* 0000 0000 0000 */
+};
+
+const tableentry TIFFFaxBlackCodes[] = {
+    { 10, 0x37, 0 },	/* 0000 1101 11 */
+    { 3, 0x2, 1 },	/* 010 */
+    { 2, 0x3, 2 },	/* 11 */
+    { 2, 0x2, 3 },	/* 10 */
+    { 3, 0x3, 4 },	/* 011 */
+    { 4, 0x3, 5 },	/* 0011 */
+    { 4, 0x2, 6 },	/* 0010 */
+    { 5, 0x3, 7 },	/* 0001 1 */
+    { 6, 0x5, 8 },	/* 0001 01 */
+    { 6, 0x4, 9 },	/* 0001 00 */
+    { 7, 0x4, 10 },	/* 0000 100 */
+    { 7, 0x5, 11 },	/* 0000 101 */
+    { 7, 0x7, 12 },	/* 0000 111 */
+    { 8, 0x4, 13 },	/* 0000 0100 */
+    { 8, 0x7, 14 },	/* 0000 0111 */
+    { 9, 0x18, 15 },	/* 0000 1100 0 */
+    { 10, 0x17, 16 },	/* 0000 0101 11 */
+    { 10, 0x18, 17 },	/* 0000 0110 00 */
+    { 10, 0x8, 18 },	/* 0000 0010 00 */
+    { 11, 0x67, 19 },	/* 0000 1100 111 */
+    { 11, 0x68, 20 },	/* 0000 1101 000 */
+    { 11, 0x6C, 21 },	/* 0000 1101 100 */
+    { 11, 0x37, 22 },	/* 0000 0110 111 */
+    { 11, 0x28, 23 },	/* 0000 0101 000 */
+    { 11, 0x17, 24 },	/* 0000 0010 111 */
+    { 11, 0x18, 25 },	/* 0000 0011 000 */
+    { 12, 0xCA, 26 },	/* 0000 1100 1010 */
+    { 12, 0xCB, 27 },	/* 0000 1100 1011 */
+    { 12, 0xCC, 28 },	/* 0000 1100 1100 */
+    { 12, 0xCD, 29 },	/* 0000 1100 1101 */
+    { 12, 0x68, 30 },	/* 0000 0110 1000 */
+    { 12, 0x69, 31 },	/* 0000 0110 1001 */
+    { 12, 0x6A, 32 },	/* 0000 0110 1010 */
+    { 12, 0x6B, 33 },	/* 0000 0110 1011 */
+    { 12, 0xD2, 34 },	/* 0000 1101 0010 */
+    { 12, 0xD3, 35 },	/* 0000 1101 0011 */
+    { 12, 0xD4, 36 },	/* 0000 1101 0100 */
+    { 12, 0xD5, 37 },	/* 0000 1101 0101 */
+    { 12, 0xD6, 38 },	/* 0000 1101 0110 */
+    { 12, 0xD7, 39 },	/* 0000 1101 0111 */
+    { 12, 0x6C, 40 },	/* 0000 0110 1100 */
+    { 12, 0x6D, 41 },	/* 0000 0110 1101 */
+    { 12, 0xDA, 42 },	/* 0000 1101 1010 */
+    { 12, 0xDB, 43 },	/* 0000 1101 1011 */
+    { 12, 0x54, 44 },	/* 0000 0101 0100 */
+    { 12, 0x55, 45 },	/* 0000 0101 0101 */
+    { 12, 0x56, 46 },	/* 0000 0101 0110 */
+    { 12, 0x57, 47 },	/* 0000 0101 0111 */
+    { 12, 0x64, 48 },	/* 0000 0110 0100 */
+    { 12, 0x65, 49 },	/* 0000 0110 0101 */
+    { 12, 0x52, 50 },	/* 0000 0101 0010 */
+    { 12, 0x53, 51 },	/* 0000 0101 0011 */
+    { 12, 0x24, 52 },	/* 0000 0010 0100 */
+    { 12, 0x37, 53 },	/* 0000 0011 0111 */
+    { 12, 0x38, 54 },	/* 0000 0011 1000 */
+    { 12, 0x27, 55 },	/* 0000 0010 0111 */
+    { 12, 0x28, 56 },	/* 0000 0010 1000 */
+    { 12, 0x58, 57 },	/* 0000 0101 1000 */
+    { 12, 0x59, 58 },	/* 0000 0101 1001 */
+    { 12, 0x2B, 59 },	/* 0000 0010 1011 */
+    { 12, 0x2C, 60 },	/* 0000 0010 1100 */
+    { 12, 0x5A, 61 },	/* 0000 0101 1010 */
+    { 12, 0x66, 62 },	/* 0000 0110 0110 */
+    { 12, 0x67, 63 },	/* 0000 0110 0111 */
+    { 10, 0xF, 64 },	/* 0000 0011 11 */
+    { 12, 0xC8, 128 },	/* 0000 1100 1000 */
+    { 12, 0xC9, 192 },	/* 0000 1100 1001 */
+    { 12, 0x5B, 256 },	/* 0000 0101 1011 */
+    { 12, 0x33, 320 },	/* 0000 0011 0011 */
+    { 12, 0x34, 384 },	/* 0000 0011 0100 */
+    { 12, 0x35, 448 },	/* 0000 0011 0101 */
+    { 13, 0x6C, 512 },	/* 0000 0011 0110 0 */
+    { 13, 0x6D, 576 },	/* 0000 0011 0110 1 */
+    { 13, 0x4A, 640 },	/* 0000 0010 0101 0 */
+    { 13, 0x4B, 704 },	/* 0000 0010 0101 1 */
+    { 13, 0x4C, 768 },	/* 0000 0010 0110 0 */
+    { 13, 0x4D, 832 },	/* 0000 0010 0110 1 */
+    { 13, 0x72, 896 },	/* 0000 0011 1001 0 */
+    { 13, 0x73, 960 },	/* 0000 0011 1001 1 */
+    { 13, 0x74, 1024 },	/* 0000 0011 1010 0 */
+    { 13, 0x75, 1088 },	/* 0000 0011 1010 1 */
+    { 13, 0x76, 1152 },	/* 0000 0011 1011 0 */
+    { 13, 0x77, 1216 },	/* 0000 0011 1011 1 */
+    { 13, 0x52, 1280 },	/* 0000 0010 1001 0 */
+    { 13, 0x53, 1344 },	/* 0000 0010 1001 1 */
+    { 13, 0x54, 1408 },	/* 0000 0010 1010 0 */
+    { 13, 0x55, 1472 },	/* 0000 0010 1010 1 */
+    { 13, 0x5A, 1536 },	/* 0000 0010 1101 0 */
+    { 13, 0x5B, 1600 },	/* 0000 0010 1101 1 */
+    { 13, 0x64, 1664 },	/* 0000 0011 0010 0 */
+    { 13, 0x65, 1728 },	/* 0000 0011 0010 1 */
+    { 11, 0x8, 1792 },	/* 0000 0001 000 */
+    { 11, 0xC, 1856 },	/* 0000 0001 100 */
+    { 11, 0xD, 1920 },	/* 0000 0001 101 */
+    { 12, 0x12, 1984 },	/* 0000 0001 0010 */
+    { 12, 0x13, 2048 },	/* 0000 0001 0011 */
+    { 12, 0x14, 2112 },	/* 0000 0001 0100 */
+    { 12, 0x15, 2176 },	/* 0000 0001 0101 */
+    { 12, 0x16, 2240 },	/* 0000 0001 0110 */
+    { 12, 0x17, 2304 },	/* 0000 0001 0111 */
+    { 12, 0x1C, 2368 },	/* 0000 0001 1100 */
+    { 12, 0x1D, 2432 },	/* 0000 0001 1101 */
+    { 12, 0x1E, 2496 },	/* 0000 0001 1110 */
+    { 12, 0x1F, 2560 },	/* 0000 0001 1111 */
+    { 12, 0x1, G3CODE_EOL },	/* 0000 0000 0001 */
+    { 9, 0x1, G3CODE_INVALID },	/* 0000 0000 1 */
+    { 10, 0x1, G3CODE_INVALID },	/* 0000 0000 01 */
+    { 11, 0x1, G3CODE_INVALID },	/* 0000 0000 001 */
+    { 12, 0x0, G3CODE_INVALID },	/* 0000 0000 0000 */
+};
+#else
+extern	const tableentry TIFFFaxWhiteCodes[];
+extern	const tableentry TIFFFaxBlackCodes[];
+#endif
+#endif /* _T4_ */
diff --git a/uppsrc/plugin/tif/lib/tif_acorn.c b/uppsrc/plugin/tif/lib/tif_acorn.c
new file mode 100644
index 000000000..478390fc5
--- /dev/null
+++ b/uppsrc/plugin/tif/lib/tif_acorn.c
@@ -0,0 +1,519 @@
+/* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/tif_acorn.c,v 1.2 2005/12/21 12:23:13 joris Exp $ */
+
+/*
+ * Copyright (c) 1988-1997 Sam Leffler
+ * Copyright (c) 1991-1997 Silicon Graphics, Inc.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and
+ * its documentation for any purpose is hereby granted without fee, provided
+ * that (i) the above copyright notices and this permission notice appear in
+ * all copies of the software and related documentation, and (ii) the names of
+ * Sam Leffler and Silicon Graphics may not be used in any advertising or
+ * publicity relating to the software without the specific, prior written
+ * permission of Sam Leffler and Silicon Graphics.
+ *
+ * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+ * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
+ * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
+ * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+ * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
+ * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.
+ */
+
+/*
+ * TIFF Library RISC OS specific Routines.
+ * Developed out of the Unix version.
+ * Peter Greenham, May 1995
+ */
+#include "tiffiop.h"
+#include <stdio.h>
+#include <stdlib.h>
+
+/*
+Low-level file handling
+~~~~~~~~~~~~~~~~~~~~~~~
+The functions in osfcn.h are unavailable when compiling under C, as it's a
+C++ header. Therefore they have been implemented here.
+
+Now, why have I done it this way?
+
+The definitive API library for RISC OS is Jonathan Coxhead's OSLib, which
+uses heavily optimised ARM assembler or even plain inline SWI calls for
+maximum performance and minimum runtime size. However, I don't want to make
+LIBTIFF need that to survive. Therefore I have also emulated the functions
+using macros to _swi() and _swix() defined in the swis.h header, and
+borrowing types from kernel.h, which is less efficient but doesn't need any
+third-party libraries.
+ */
+
+#ifdef INCLUDE_OSLIB
+
+#include "osfile.h"
+#include "osgbpb.h"
+#include "osargs.h"
+#include "osfind.h"
+
+#else
+
+/* OSLIB EMULATION STARTS */
+
+#include "kernel.h"
+#include "swis.h"
+
+/* From oslib:types.h */
+typedef unsigned int                            bits;
+typedef unsigned char                           byte;
+#ifndef TRUE
+#define TRUE                                    1
+#endif
+#ifndef FALSE
+#define FALSE                                   0
+#endif
+#ifndef NULL
+#define NULL                                    0
+#endif
+#ifndef SKIP
+#define SKIP                                    0
+#endif
+
+/* From oslib:os.h */
+typedef _kernel_oserror os_error;
+typedef byte os_f;
+
+/* From oslib:osfile.h */
+#undef  OS_File
+#define OS_File                                 0x8
+
+/* From oslib:osgbpb.h */
+#undef  OS_GBPB
+#define OS_GBPB                                 0xC
+#undef  OSGBPB_Write
+#define OSGBPB_Write                            0x2
+#undef  OSGBPB_Read
+#define OSGBPB_Read                             0x4
+
+extern os_error *xosgbpb_write (os_f file,
+      byte *data,
+      int size,
+      int *unwritten);
+extern int osgbpb_write (os_f file,
+      byte *data,
+      int size);
+
+#define	xosgbpb_write(file, data, size, unwritten) \
+	(os_error*) _swix(OS_GBPB, _IN(0)|_IN(1)|_IN(2)|_IN(3)|_IN(4)|_OUT(3), \
+		OSGBPB_WriteAt, \
+		file, \
+		data, \
+		size, \
+		unwritten)
+
+#define	osgbpb_write(file, data, size) \
+	_swi(OS_GBPB, _IN(0)|_IN(1)|_IN(2)|_IN(3)|_RETURN(3), \
+		OSGBPB_Write, \
+		file, \
+		data, \
+		size)
+
+extern os_error *xosgbpb_read (os_f file,
+      byte *buffer,
+      int size,
+      int *unread);
+extern int osgbpb_read (os_f file,
+      byte *buffer,
+      int size);
+
+#define	xosgbpb_read(file, buffer, size, unread) \
+	(os_error*) _swix(OS_GBPB, _IN(0)|_IN(1)|_IN(2)|_IN(3)|_OUT(3), \
+		OSGBPB_Read, \
+		file, \
+		buffer, \
+		size, \
+		unread)
+
+#define	osgbpb_read(file, buffer, size) \
+	_swi(OS_GBPB, _IN(0)|_IN(1)|_IN(2)|_IN(3)|_RETURN(3), \
+		OSGBPB_Read, \
+		file, \
+		buffer, \
+		size)
+
+/* From oslib:osfind.h */
+#undef  OS_Find
+#define OS_Find                                 0xD
+#undef  OSFind_Openin
+#define OSFind_Openin                           0x40
+#undef  OSFind_Openout
+#define OSFind_Openout                          0x80
+#undef  OSFind_Openup
+#define OSFind_Openup                           0xC0
+#undef  OSFind_Close
+#define OSFind_Close                            0x0
+
+#define	xosfind_open(reason, file_name, path, file) \
+	(os_error*) _swix(OS_Find, _IN(0)|_IN(1)|_IN(2)|_OUT(0), \
+		reason, file_name, path, file)
+
+#define	osfind_open(reason, file_name, path) \
+	(os_f) _swi(OS_Find, _IN(0)|_IN(1)|_IN(2)|_RETURN(0), \
+		reason, file_name, path)
+
+extern os_error *xosfind_openin (bits flags,
+      char *file_name,
+      char *path,
+      os_f *file);
+extern os_f osfind_openin (bits flags,
+      char *file_name,
+      char *path);
+
+#define	xosfind_openin(flags, file_name, path, file) \
+	xosfind_open(flags | OSFind_Openin, file_name, path, file)
+
+#define	osfind_openin(flags, file_name, path) \
+	osfind_open(flags | OSFind_Openin, file_name, path)
+
+extern os_error *xosfind_openout (bits flags,
+      char *file_name,
+      char *path,
+      os_f *file);
+extern os_f osfind_openout (bits flags,
+      char *file_name,
+      char *path);
+
+#define	xosfind_openout(flags, file_name, path, file) \
+	xosfind_open(flags | OSFind_Openout, file_name, path, file)
+
+#define	osfind_openout(flags, file_name, path) \
+	osfind_open(flags | OSFind_Openout, file_name, path)
+
+extern os_error *xosfind_openup (bits flags,
+      char *file_name,
+      char *path,
+      os_f *file);
+extern os_f osfind_openup (bits flags,
+      char *file_name,
+      char *path);
+
+#define	xosfind_openup(flags, file_name, path, file) \
+	xosfind_open(flags | OSFind_Openup, file_name, path, file)
+
+#define	osfind_openup(flags, file_name, path) \
+	osfind_open(flags | OSFind_Openup, file_name, path)
+
+extern os_error *xosfind_close (os_f file);
+extern void osfind_close (os_f file);
+
+#define	xosfind_close(file) \
+	(os_error*) _swix(OS_Find, _IN(0)|_IN(1), \
+		OSFind_Close, \
+		file)
+
+#define	osfind_close(file) \
+	(void) _swi(OS_Find, _IN(0)|_IN(1), \
+		OSFind_Close, \
+		file)
+
+/* From oslib:osargs.h */
+#undef  OS_Args
+#define OS_Args                                 0x9
+#undef  OSArgs_ReadPtr
+#define OSArgs_ReadPtr                          0x0
+#undef  OSArgs_SetPtr
+#define OSArgs_SetPtr                           0x1
+#undef  OSArgs_ReadExt
+#define OSArgs_ReadExt                          0x2
+
+extern os_error *xosargs_read_ptr (os_f file,
+      int *ptr);
+extern int osargs_read_ptr (os_f file);
+
+#define	xosargs_read_ptr(file, ptr) \
+	(os_error*) _swix(OS_Args, _IN(0)|_IN(1)|_OUT(2), \
+		OSArgs_ReadPtr, \
+		file, \
+		ptr)
+
+#define	osargs_read_ptr(file) \
+	_swi(OS_Args, _IN(0)|_IN(1)|_RETURN(2), \
+		OSArgs_ReadPtr, \
+		file)
+
+extern os_error *xosargs_set_ptr (os_f file,
+      int ptr);
+extern void osargs_set_ptr (os_f file,
+      int ptr);
+
+#define	xosargs_set_ptr(file, ptr) \
+	(os_error*) _swix(OS_Args, _IN(0)|_IN(1)|_IN(2), \
+		OSArgs_SetPtr, \
+		file, \
+		ptr)
+
+#define	osargs_set_ptr(file, ptr) \
+	(void) _swi(OS_Args, _IN(0)|_IN(1)|_IN(2), \
+		OSArgs_SetPtr, \
+		file, \
+		ptr)
+
+extern os_error *xosargs_read_ext (os_f file,
+      int *ext);
+extern int osargs_read_ext (os_f file);
+
+#define	xosargs_read_ext(file, ext) \
+	(os_error*) _swix(OS_Args, _IN(0)|_IN(1)|_OUT(2), \
+		OSArgs_ReadExt, \
+		file, \
+		ext)
+
+#define	osargs_read_ext(file) \
+	_swi(OS_Args, _IN(0)|_IN(1)|_RETURN(2), \
+		OSArgs_ReadExt, \
+		file)
+
+/* OSLIB EMULATION ENDS */
+
+#endif
+
+#ifndef __osfcn_h
+/* Will be set or not during tiffcomp.h */
+/* You get this to compile under C++? Please say how! */
+
+extern int open(const char* name, int flags, int mode)
+{
+	/* From what I can tell, should return <0 for failure */
+	os_error* e = (os_error*) 1; /* Cheeky way to use a pointer eh? :-) */
+	os_f file = (os_f) -1;
+
+	flags = flags;
+
+	switch(mode)
+	{
+		case O_RDONLY:
+		{
+			e = xosfind_openin(SKIP, name, SKIP, &file);
+			break;
+		}
+		case O_WRONLY:
+		case O_RDWR|O_CREAT:
+		case O_RDWR|O_CREAT|O_TRUNC:
+		{
+			e = xosfind_openout(SKIP, name, SKIP, &file);
+			break;
+		}
+		case O_RDWR:
+		{
+			e = xosfind_openup(SKIP, name, SKIP, &file);
+			break;
+		}
+	}
+	if (e)
+	{
+		file = (os_f) -1;
+	}
+	return (file);
+}
+
+extern int close(int fd)
+{
+	return ((int) xosfind_close((os_f) fd));
+}
+
+extern int write(int fd, const char *buf, int nbytes)
+{
+	/* Returns number of bytes written */
+	return (nbytes - osgbpb_write((os_f) fd, (const byte*) buf, nbytes));
+}
+
+extern int read(int fd, char *buf, int nbytes)
+{
+	/* Returns number of bytes read */
+	return (nbytes - osgbpb_read((os_f) fd, (byte*) buf, nbytes));
+}
+
+extern off_t lseek(int fd, off_t offset, int whence)
+{
+	int absolute = 0;
+
+	switch (whence)
+	{
+		case SEEK_SET:
+		{
+			absolute = (int) offset;
+			break;
+		}
+		case SEEK_CUR:
+		{
+			absolute = osargs_read_ptr((os_f) fd) + (int) offset;
+			break;
+		}
+		case SEEK_END:
+		{
+			absolute = osargs_read_ext((os_f) fd) + (int) offset;
+			break;
+		}
+	}
+
+	osargs_set_ptr((os_f) fd, absolute);
+
+	return ((off_t) osargs_read_ptr((os_f) fd));
+}
+#endif
+
+static tsize_t
+_tiffReadProc(thandle_t fd, tdata_t buf, tsize_t size)
+{
+	return ((tsize_t) read((int) fd, buf, (size_t) size));
+}
+
+static tsize_t
+_tiffWriteProc(thandle_t fd, tdata_t buf, tsize_t size)
+{
+	return ((tsize_t) write((int) fd, buf, (size_t) size));
+}
+
+static toff_t
+_tiffSeekProc(thandle_t fd, toff_t off, int whence)
+{
+	return ((toff_t) lseek((int) fd, (off_t) off, whence));
+}
+
+static int
+_tiffCloseProc(thandle_t fd)
+{
+	return (close((int) fd));
+}
+
+static toff_t
+_tiffSizeProc(thandle_t fd)
+{
+	return (lseek((int) fd, SEEK_END, SEEK_SET));
+}
+
+#ifdef HAVE_MMAP
+#error "I didn't know Acorn had that!"
+#endif
+
+/* !HAVE_MMAP */
+static int
+_tiffMapProc(thandle_t fd, tdata_t* pbase, toff_t* psize)
+{
+	(void) fd; (void) pbase; (void) psize;
+	return (0);
+}
+
+static void
+_tiffUnmapProc(thandle_t fd, tdata_t base, toff_t size)
+{
+	(void) fd; (void) base; (void) size;
+}
+
+/*
+ * Open a TIFF file descriptor for read/writing.
+ */
+TIFF*
+TIFFFdOpen(int fd, const char* name, const char* mode)
+{
+	TIFF* tif;
+
+	tif = TIFFClientOpen(name, mode,
+		(thandle_t) fd,
+		_tiffReadProc, _tiffWriteProc,
+		_tiffSeekProc, _tiffCloseProc, _tiffSizeProc,
+		_tiffMapProc, _tiffUnmapProc);
+	if (tif)
+	{
+		tif->tif_fd = fd;
+	}
+	return (tif);
+}
+
+/*
+ * Open a TIFF file for read/writing.
+ */
+TIFF*
+TIFFOpen(const char* name, const char* mode)
+{
+	static const char module[] = "TIFFOpen";
+	int m, fd;
+
+	m = _TIFFgetMode(mode, module);
+
+	if (m == -1)
+	{
+		return ((TIFF*) 0);
+	}
+
+	fd = open(name, 0, m);
+
+	if (fd < 0)
+	{
+		TIFFErrorExt(0, module, "%s: Cannot open", name);
+		return ((TIFF *)0);
+	}
+	return (TIFFFdOpen(fd, name, mode));
+}
+
+void*
+_TIFFmalloc(tsize_t s)
+{
+	return (malloc((size_t) s));
+}
+
+void
+_TIFFfree(tdata_t p)
+{
+	free(p);
+}
+
+void*
+_TIFFrealloc(tdata_t p, tsize_t s)
+{
+	return (realloc(p, (size_t) s));
+}
+
+void
+_TIFFmemset(tdata_t p, int v, tsize_t c)
+{
+	memset(p, v, (size_t) c);
+}
+
+void
+_TIFFmemcpy(tdata_t d, const tdata_t s, tsize_t c)
+{
+	memcpy(d, s, (size_t) c);
+}
+
+int
+_TIFFmemcmp(const tdata_t p1, const tdata_t p2, tsize_t c)
+{
+	return (memcmp(p1, p2, (size_t) c));
+}
+
+static void
+acornWarningHandler(const char* module, const char* fmt, va_list ap)
+{
+	if (module != NULL)
+	{
+		fprintf(stderr, "%s: ", module);
+	}
+	fprintf(stderr, "Warning, ");
+	vfprintf(stderr, fmt, ap);
+	fprintf(stderr, ".\n");
+}
+TIFFErrorHandler _TIFFwarningHandler = acornWarningHandler;
+
+static void
+acornErrorHandler(const char* module, const char* fmt, va_list ap)
+{
+	if (module != NULL)
+	{
+		fprintf(stderr, "%s: ", module);
+	}
+	vfprintf(stderr, fmt, ap);
+	fprintf(stderr, ".\n");
+}
+TIFFErrorHandler _TIFFerrorHandler = acornErrorHandler;
diff --git a/uppsrc/plugin/tif/lib/tif_apple.c b/uppsrc/plugin/tif/lib/tif_apple.c
new file mode 100644
index 000000000..c53452617
--- /dev/null
+++ b/uppsrc/plugin/tif/lib/tif_apple.c
@@ -0,0 +1,274 @@
+/* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/tif_apple.c,v 1.3 2005/12/21 12:23:13 joris Exp $ */
+
+/*
+ * Copyright (c) 1988-1997 Sam Leffler
+ * Copyright (c) 1991-1997 Silicon Graphics, Inc.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and
+ * its documentation for any purpose is hereby granted without fee, provided
+ * that (i) the above copyright notices and this permission notice appear in
+ * all copies of the software and related documentation, and (ii) the names of
+ * Sam Leffler and Silicon Graphics may not be used in any advertising or
+ * publicity relating to the software without the specific, prior written
+ * permission of Sam Leffler and Silicon Graphics.
+ *
+ * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+ * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
+ * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
+ * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+ * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
+ * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.
+ */
+
+/*
+ * TIFF Library Macintosh-specific routines.
+ *
+ * These routines use only Toolbox and high-level File Manager traps.
+ * They make no calls to the THINK C "unix" compatibility library.  Also,
+ * malloc is not used directly but it is still referenced internally by
+ * the ANSI library in rare cases.  Heap fragmentation by the malloc ring
+ * buffer is therefore minimized.
+ *
+ * O_RDONLY and O_RDWR are treated identically here.  The tif_mode flag is
+ * checked in TIFFWriteCheck().
+ *
+ * Create below fills in a blank creator signature and sets the file type
+ * to 'TIFF'.  It is much better for the application to do this by Create'ing
+ * the file first and TIFFOpen'ing it later.
+ * ---------
+ * This code has been "Carbonized", and may not work with older MacOS versions.
+ * If so, grab the tif_apple.c out of an older libtiff distribution, like
+ * 3.5.5 from www.libtiff.org.
+ */
+
+#include "tiffiop.h"
+#include <Errors.h>
+#include <Files.h>
+#include <Memory.h>
+#include <Script.h>
+
+#if defined(__PPCC__) || defined(__SC__) || defined(__MRC__) || defined(applec)
+#define	CtoPstr	c2pstr
+#endif
+
+static tsize_t
+_tiffReadProc(thandle_t fd, tdata_t buf, tsize_t size)
+{
+	return (FSRead((short) fd, (long*) &size, (char*) buf) == noErr ?
+	    size : (tsize_t) -1);
+}
+
+static tsize_t
+_tiffWriteProc(thandle_t fd, tdata_t buf, tsize_t size)
+{
+	return (FSWrite((short) fd, (long*) &size, (char*) buf) == noErr ?
+	    size : (tsize_t) -1);
+}
+
+static toff_t
+_tiffSeekProc(thandle_t fd, toff_t off, int whence)
+{
+	long fpos, size;
+
+	if (GetEOF((short) fd, &size) != noErr)
+		return EOF;
+	(void) GetFPos((short) fd, &fpos);
+
+	switch (whence) {
+	case SEEK_CUR:
+		if (off + fpos > size)
+			SetEOF((short) fd, off + fpos);
+		if (SetFPos((short) fd, fsFromMark, off) != noErr)
+			return EOF;
+		break;
+	case SEEK_END:
+		if (off > 0)
+			SetEOF((short) fd, off + size);
+		if (SetFPos((short) fd, fsFromStart, off + size) != noErr)
+			return EOF;
+		break;
+	case SEEK_SET:
+		if (off > size)
+			SetEOF((short) fd, off);
+		if (SetFPos((short) fd, fsFromStart, off) != noErr)
+			return EOF;
+		break;
+	}
+
+	return (toff_t)(GetFPos((short) fd, &fpos) == noErr ? fpos : EOF);
+}
+
+static int
+_tiffMapProc(thandle_t fd, tdata_t* pbase, toff_t* psize)
+{
+	return (0);
+}
+
+static void
+_tiffUnmapProc(thandle_t fd, tdata_t base, toff_t size)
+{
+}
+
+static int
+_tiffCloseProc(thandle_t fd)
+{
+	return (FSClose((short) fd));
+}
+
+static toff_t
+_tiffSizeProc(thandle_t fd)
+{
+	long size;
+
+	if (GetEOF((short) fd, &size) != noErr) {
+		TIFFErrorExt(fd, "_tiffSizeProc", "%s: Cannot get file size");
+		return (-1L);
+	}
+	return ((toff_t) size);
+}
+
+/*
+ * Open a TIFF file descriptor for read/writing.
+ */
+TIFF*
+TIFFFdOpen(int fd, const char* name, const char* mode)
+{
+	TIFF* tif;
+
+	tif = TIFFClientOpen(name, mode, (thandle_t) fd,
+	    _tiffReadProc, _tiffWriteProc, _tiffSeekProc, _tiffCloseProc,
+	    _tiffSizeProc, _tiffMapProc, _tiffUnmapProc);
+	if (tif)
+		tif->tif_fd = fd;
+	return (tif);
+}
+
+static void ourc2pstr( char* inString )
+{
+	int	sLen = strlen( inString );
+	BlockMoveData( inString, &inString[1], sLen );
+	inString[0] = sLen;
+}
+
+/*
+ * Open a TIFF file for read/writing.
+ */
+TIFF*
+TIFFOpen(const char* name, const char* mode)
+{
+	static const char module[] = "TIFFOpen";
+	Str255 pname;
+	FInfo finfo;
+	short fref;
+	OSErr err;
+	FSSpec	fSpec;
+
+	strcpy((char*) pname, name);
+	ourc2pstr((char*) pname);
+
+	err = FSMakeFSSpec( 0, 0, pname, &fSpec );
+
+	switch (_TIFFgetMode(mode, module)) {
+	default:
+		return ((TIFF*) 0);
+	case O_RDWR | O_CREAT | O_TRUNC:
+		if (FSpGetFInfo(&fSpec, &finfo) == noErr)
+			FSpDelete(&fSpec);
+		/* fall through */
+	case O_RDWR | O_CREAT:
+		if ((err = FSpGetFInfo(&fSpec, &finfo)) == fnfErr) {
+			if (FSpCreate(&fSpec, '    ', 'TIFF', smSystemScript) != noErr)
+				goto badCreate;
+			if (FSpOpenDF(&fSpec, fsRdWrPerm, &fref) != noErr)
+				goto badOpen;
+		} else if (err == noErr) {
+			if (FSpOpenDF(&fSpec, fsRdWrPerm, &fref) != noErr)
+				goto badOpen;
+		} else
+			goto badOpen;
+		break;
+	case O_RDONLY:
+		if (FSpOpenDF(&fSpec, fsRdPerm, &fref) != noErr)
+			goto badOpen;
+		break;
+	case O_RDWR:
+		if (FSpOpenDF(&fSpec, fsRdWrPerm, &fref) != noErr)
+			goto badOpen;
+		break;
+	}
+	return (TIFFFdOpen((int) fref, name, mode));
+badCreate:
+	TIFFErrorExt(0, module, "%s: Cannot create", name);
+	return ((TIFF*) 0);
+badOpen:
+	TIFFErrorExt(0, module, "%s: Cannot open", name);
+	return ((TIFF*) 0);
+}
+
+void
+_TIFFmemset(tdata_t p, int v, tsize_t c)
+{
+	memset(p, v, (size_t) c);
+}
+
+void
+_TIFFmemcpy(tdata_t d, const tdata_t s, tsize_t c)
+{
+	memcpy(d, s, (size_t) c);
+}
+
+int
+_TIFFmemcmp(const tdata_t p1, const tdata_t p2, tsize_t c)
+{
+	return (memcmp(p1, p2, (size_t) c));
+}
+
+tdata_t
+_TIFFmalloc(tsize_t s)
+{
+	return (NewPtr((size_t) s));
+}
+
+void
+_TIFFfree(tdata_t p)
+{
+	DisposePtr(p);
+}
+
+tdata_t
+_TIFFrealloc(tdata_t p, tsize_t s)
+{
+	Ptr n = p;
+
+	SetPtrSize(p, (size_t) s);
+	if (MemError() && (n = NewPtr((size_t) s)) != NULL) {
+		BlockMove(p, n, GetPtrSize(p));
+		DisposePtr(p);
+	}
+	return ((tdata_t) n);
+}
+
+static void
+appleWarningHandler(const char* module, const char* fmt, va_list ap)
+{
+	if (module != NULL)
+		fprintf(stderr, "%s: ", module);
+	fprintf(stderr, "Warning, ");
+	vfprintf(stderr, fmt, ap);
+	fprintf(stderr, ".\n");
+}
+TIFFErrorHandler _TIFFwarningHandler = appleWarningHandler;
+
+static void
+appleErrorHandler(const char* module, const char* fmt, va_list ap)
+{
+	if (module != NULL)
+		fprintf(stderr, "%s: ", module);
+	vfprintf(stderr, fmt, ap);
+	fprintf(stderr, ".\n");
+}
+TIFFErrorHandler _TIFFerrorHandler = appleErrorHandler;
diff --git a/uppsrc/plugin/tif/lib/tif_atari.c b/uppsrc/plugin/tif/lib/tif_atari.c
new file mode 100644
index 000000000..a78c8af25
--- /dev/null
+++ b/uppsrc/plugin/tif/lib/tif_atari.c
@@ -0,0 +1,243 @@
+/* "$Header: /cvs/maptools/cvsroot/libtiff/libtiff/tif_atari.c,v 1.2 2005/12/21 12:23:13 joris Exp $" */
+
+/*
+ * Copyright (c) 1988-1997 Sam Leffler
+ * Copyright (c) 1991-1997 Silicon Graphics, Inc.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and
+ * its documentation for any purpose is hereby granted without fee, provided
+ * that (i) the above copyright notices and this permission notice appear in
+ * all copies of the software and related documentation, and (ii) the names of
+ * Sam Leffler and Silicon Graphics may not be used in any advertising or
+ * publicity relating to the software without the specific, prior written
+ * permission of Sam Leffler and Silicon Graphics.
+ *
+ * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+ * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
+ * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
+ * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+ * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
+ * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.
+ */
+
+/*
+ * TIFF Library ATARI-specific Routines.
+ */
+#include "tiffiop.h"
+#if defined(__TURBOC__)
+#include <tos.h>
+#include <stdio.h>
+#else
+#include <osbind.h>
+#include <fcntl.h>
+#endif
+
+#ifndef O_ACCMODE
+#define O_ACCMODE 3
+#endif
+
+#include <errno.h>
+
+#define AEFILNF   -33
+
+static tsize_t
+_tiffReadProc(thandle_t fd, tdata_t buf, tsize_t size)
+{
+	long r;
+
+	r = Fread((int) fd, size, buf);
+	if (r < 0) {
+		errno = (int)-r;
+		r = -1;
+	}
+	return r;
+}
+
+static tsize_t
+_tiffWriteProc(thandle_t fd, tdata_t buf, tsize_t size)
+{
+	long r;
+
+	r = Fwrite((int) fd, size, buf);
+	if (r < 0) {
+		errno = (int)-r;
+		r = -1;
+	}
+	return r;
+}
+
+static toff_t
+_tiffSeekProc(thandle_t fd, off_t off, int whence)
+{
+	char buf[256];
+	long current_off, expected_off, new_off;
+
+	if (whence == SEEK_END || off <= 0)
+		return Fseek(off, (int) fd, whence);
+	current_off = Fseek(0, (int) fd, SEEK_CUR); /* find out where we are */
+	if (whence == SEEK_SET)
+		expected_off = off;
+	else
+		expected_off = off + current_off;
+	new_off = Fseek(off, (int) fd, whence);
+	if (new_off == expected_off)
+		return new_off;
+	/* otherwise extend file -- zero filling the hole */
+	if (new_off < 0)            /* error? */
+		new_off = Fseek(0, (int) fd, SEEK_END); /* go to eof */
+	_TIFFmemset(buf, 0, sizeof(buf));
+	while (expected_off > new_off) {
+		off = expected_off - new_off;
+		if (off > sizeof(buf))
+			off = sizeof(buf);
+		if ((current_off = Fwrite((int) fd, off, buf)) != off)
+			return (current_off > 0) ?
+			    new_off + current_off : new_off;
+		new_off += off;
+	}
+	return new_off;
+}
+
+static int
+_tiffCloseProc(thandle_t fd)
+{
+	long r;
+
+	r = Fclose((int) fd);
+	if (r < 0) {
+		errno = (int)-r;
+		r = -1;
+	}
+	return (int)r;
+}
+
+static toff_t
+_tiffSizeProc(thandle_t fd)
+{
+	long pos, eof;
+
+	pos = Fseek(0, (int) fd, SEEK_CUR);
+	eof = Fseek(0, (int) fd, SEEK_END);
+	Fseek(pos, (int) fd, SEEK_SET);
+	return eof;
+}
+
+static int
+_tiffMapProc(thandle_t fd, tdata_t* pbase, toff_t* psize)
+{
+	return (0);
+}
+
+static void
+_tiffUnmapProc(thandle_t fd, tdata_t base, toff_t size)
+{
+}
+
+/*
+* Open a TIFF file descriptor for read/writing.
+*/
+TIFF*
+TIFFFdOpen(int fd, const char* name, const char* mode)
+{
+	TIFF* tif;
+
+	tif = TIFFClientOpen(name, mode,
+		(thandle_t) fd,
+		_tiffReadProc, _tiffWriteProc, _tiffSeekProc, _tiffCloseProc,
+		_tiffSizeProc, _tiffMapProc, _tiffUnmapProc);
+	if (tif)
+		tif->tif_fd = fd;
+	return (tif);
+}
+
+/*
+* Open a TIFF file for read/writing.
+*/
+TIFF*
+TIFFOpen(const char* name, const char* mode)
+{
+	static const char module[] = "TIFFOpen";
+	int m;
+	long fd;
+
+	m = _TIFFgetMode(mode, module);
+	if (m == -1)
+		return ((TIFF*)0);
+	if (m & O_TRUNC) {
+		fd = Fcreate(name, 0);
+	} else {
+		fd = Fopen(name, m & O_ACCMODE);
+		if (fd == AEFILNF && m & O_CREAT)
+			fd = Fcreate(name, 0);
+	}
+	if (fd < 0)
+		errno = (int)fd;
+	if (fd < 0) {
+		TIFFErrorExt(0, module, "%s: Cannot open", name);
+		return ((TIFF*)0);
+	}
+	return (TIFFFdOpen(fd, name, mode));
+}
+
+#include <stdlib.h>
+
+tdata_t
+_TIFFmalloc(tsize_t s)
+{
+	return (malloc((size_t) s));
+}
+
+void
+_TIFFfree(tdata_t p)
+{
+	free(p);
+}
+
+tdata_t
+_TIFFrealloc(tdata_t p, tsize_t s)
+{
+	return (realloc(p, (size_t) s));
+}
+
+void
+_TIFFmemset(tdata_t p, int v, size_t c)
+{
+	memset(p, v, (size_t) c);
+}
+
+void
+_TIFFmemcpy(tdata_t d, const tdata_t s, size_t c)
+{
+	memcpy(d, s, (size_t) c);
+}
+
+int
+_TIFFmemcmp(const tdata_t p1, const tdata_t p2, tsize_t c)
+{
+	return (memcmp(p1, p2, (size_t) c));
+}
+
+static void
+atariWarningHandler(const char* module, const char* fmt, va_list ap)
+{
+	if (module != NULL)
+		fprintf(stderr, "%s: ", module);
+	fprintf(stderr, "Warning, ");
+	vfprintf(stderr, fmt, ap);
+	fprintf(stderr, ".\n");
+}
+TIFFErrorHandler _TIFFwarningHandler = atariWarningHandler;
+
+static void
+atariErrorHandler(const char* module, const char* fmt, va_list ap)
+{
+	if (module != NULL)
+		fprintf(stderr, "%s: ", module);
+	vfprintf(stderr, fmt, ap);
+	fprintf(stderr, ".\n");
+}
+TIFFErrorHandler _TIFFerrorHandler = atariErrorHandler;
diff --git a/uppsrc/plugin/tif/lib/tif_aux.c b/uppsrc/plugin/tif/lib/tif_aux.c
new file mode 100644
index 000000000..d99e59248
--- /dev/null
+++ b/uppsrc/plugin/tif/lib/tif_aux.c
@@ -0,0 +1,267 @@
+/* $Id: tif_aux.c,v 1.19 2006/02/07 10:41:30 dron Exp $ */
+
+/*
+ * Copyright (c) 1991-1997 Sam Leffler
+ * Copyright (c) 1991-1997 Silicon Graphics, Inc.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and
+ * its documentation for any purpose is hereby granted without fee, provided
+ * that (i) the above copyright notices and this permission notice appear in
+ * all copies of the software and related documentation, and (ii) the names of
+ * Sam Leffler and Silicon Graphics may not be used in any advertising or
+ * publicity relating to the software without the specific, prior written
+ * permission of Sam Leffler and Silicon Graphics.
+ *
+ * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+ * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
+ * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
+ * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+ * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
+ * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.
+ */
+
+/*
+ * TIFF Library.
+ *
+ * Auxiliary Support Routines.
+ */
+#include "tiffiop.h"
+#include "tif_predict.h"
+#include <math.h>
+
+tdata_t
+_TIFFCheckMalloc(TIFF* tif, size_t nmemb, size_t elem_size, const char* what)
+{
+	tdata_t cp = NULL;
+	tsize_t	bytes = nmemb * elem_size;
+
+	/*
+	 * XXX: Check for integer overflow.
+	 */
+	if (nmemb && elem_size && bytes / elem_size == nmemb)
+		cp = _TIFFmalloc(bytes);
+
+	if (cp == NULL)
+		TIFFErrorExt(tif->tif_clientdata, tif->tif_name, "No space %s", what);
+
+	return (cp);
+}
+
+static int
+TIFFDefaultTransferFunction(TIFFDirectory* td)
+{
+	uint16 **tf = td->td_transferfunction;
+	tsize_t i, n, nbytes;
+
+	tf[0] = tf[1] = tf[2] = 0;
+	if (td->td_bitspersample >= sizeof(tsize_t) * 8 - 2)
+		return 0;
+
+	n = 1<<td->td_bitspersample;
+	nbytes = n * sizeof (uint16);
+	if (!(tf[0] = (uint16 *)_TIFFmalloc(nbytes)))
+		return 0;
+	tf[0][0] = 0;
+	for (i = 1; i < n; i++) {
+		double t = (double)i/((double) n-1.);
+		tf[0][i] = (uint16)floor(65535.*pow(t, 2.2) + .5);
+	}
+
+	if (td->td_samplesperpixel - td->td_extrasamples > 1) {
+		if (!(tf[1] = (uint16 *)_TIFFmalloc(nbytes)))
+			goto bad;
+		_TIFFmemcpy(tf[1], tf[0], nbytes);
+		if (!(tf[2] = (uint16 *)_TIFFmalloc(nbytes)))
+			goto bad;
+		_TIFFmemcpy(tf[2], tf[0], nbytes);
+	}
+	return 1;
+
+bad:
+	if (tf[0])
+		_TIFFfree(tf[0]);
+	if (tf[1])
+		_TIFFfree(tf[1]);
+	if (tf[2])
+		_TIFFfree(tf[2]);
+	tf[0] = tf[1] = tf[2] = 0;
+	return 0;
+}
+
+/*
+ * Like TIFFGetField, but return any default
+ * value if the tag is not present in the directory.
+ *
+ * NB:	We use the value in the directory, rather than
+ *	explcit values so that defaults exist only one
+ *	place in the library -- in TIFFDefaultDirectory.
+ */
+int
+TIFFVGetFieldDefaulted(TIFF* tif, ttag_t tag, va_list ap)
+{
+	TIFFDirectory *td = &tif->tif_dir;
+
+	if (TIFFVGetField(tif, tag, ap))
+		return (1);
+	switch (tag) {
+	case TIFFTAG_SUBFILETYPE:
+		*va_arg(ap, uint32 *) = td->td_subfiletype;
+		return (1);
+	case TIFFTAG_BITSPERSAMPLE:
+		*va_arg(ap, uint16 *) = td->td_bitspersample;
+		return (1);
+	case TIFFTAG_THRESHHOLDING:
+		*va_arg(ap, uint16 *) = td->td_threshholding;
+		return (1);
+	case TIFFTAG_FILLORDER:
+		*va_arg(ap, uint16 *) = td->td_fillorder;
+		return (1);
+	case TIFFTAG_ORIENTATION:
+		*va_arg(ap, uint16 *) = td->td_orientation;
+		return (1);
+	case TIFFTAG_SAMPLESPERPIXEL:
+		*va_arg(ap, uint16 *) = td->td_samplesperpixel;
+		return (1);
+	case TIFFTAG_ROWSPERSTRIP:
+		*va_arg(ap, uint32 *) = td->td_rowsperstrip;
+		return (1);
+	case TIFFTAG_MINSAMPLEVALUE:
+		*va_arg(ap, uint16 *) = td->td_minsamplevalue;
+		return (1);
+	case TIFFTAG_MAXSAMPLEVALUE:
+		*va_arg(ap, uint16 *) = td->td_maxsamplevalue;
+		return (1);
+	case TIFFTAG_PLANARCONFIG:
+		*va_arg(ap, uint16 *) = td->td_planarconfig;
+		return (1);
+	case TIFFTAG_RESOLUTIONUNIT:
+		*va_arg(ap, uint16 *) = td->td_resolutionunit;
+		return (1);
+	case TIFFTAG_PREDICTOR:
+                {
+			TIFFPredictorState* sp = (TIFFPredictorState*) tif->tif_data;
+			*va_arg(ap, uint16*) = (uint16) sp->predictor;
+			return 1;
+                }
+	case TIFFTAG_DOTRANGE:
+		*va_arg(ap, uint16 *) = 0;
+		*va_arg(ap, uint16 *) = (1<<td->td_bitspersample)-1;
+		return (1);
+	case TIFFTAG_INKSET:
+		*va_arg(ap, uint16 *) = INKSET_CMYK;
+		return 1;
+	case TIFFTAG_NUMBEROFINKS:
+		*va_arg(ap, uint16 *) = 4;
+		return (1);
+	case TIFFTAG_EXTRASAMPLES:
+		*va_arg(ap, uint16 *) = td->td_extrasamples;
+		*va_arg(ap, uint16 **) = td->td_sampleinfo;
+		return (1);
+	case TIFFTAG_MATTEING:
+		*va_arg(ap, uint16 *) =
+		    (td->td_extrasamples == 1 &&
+		     td->td_sampleinfo[0] == EXTRASAMPLE_ASSOCALPHA);
+		return (1);
+	case TIFFTAG_TILEDEPTH:
+		*va_arg(ap, uint32 *) = td->td_tiledepth;
+		return (1);
+	case TIFFTAG_DATATYPE:
+		*va_arg(ap, uint16 *) = td->td_sampleformat-1;
+		return (1);
+	case TIFFTAG_SAMPLEFORMAT:
+		*va_arg(ap, uint16 *) = td->td_sampleformat;
+                return(1);
+	case TIFFTAG_IMAGEDEPTH:
+		*va_arg(ap, uint32 *) = td->td_imagedepth;
+		return (1);
+	case TIFFTAG_YCBCRCOEFFICIENTS:
+		{
+			/* defaults are from CCIR Recommendation 601-1 */
+			static float ycbcrcoeffs[] = { 0.299f, 0.587f, 0.114f };
+			*va_arg(ap, float **) = ycbcrcoeffs;
+			return 1;
+		}
+	case TIFFTAG_YCBCRSUBSAMPLING:
+		*va_arg(ap, uint16 *) = td->td_ycbcrsubsampling[0];
+		*va_arg(ap, uint16 *) = td->td_ycbcrsubsampling[1];
+		return (1);
+	case TIFFTAG_YCBCRPOSITIONING:
+		*va_arg(ap, uint16 *) = td->td_ycbcrpositioning;
+		return (1);
+	case TIFFTAG_WHITEPOINT:
+		{
+			static float whitepoint[2];
+
+			/* TIFF 6.0 specification tells that it is no default
+			   value for the WhitePoint, but AdobePhotoshop TIFF
+			   Technical Note tells that it should be CIE D50. */
+			whitepoint[0] =	D50_X0 / (D50_X0 + D50_Y0 + D50_Z0);
+			whitepoint[1] =	D50_Y0 / (D50_X0 + D50_Y0 + D50_Z0);
+			*va_arg(ap, float **) = whitepoint;
+			return 1;
+		}
+	case TIFFTAG_TRANSFERFUNCTION:
+		if (!td->td_transferfunction[0] &&
+		    !TIFFDefaultTransferFunction(td)) {
+			TIFFErrorExt(tif->tif_clientdata, tif->tif_name, "No space for \"TransferFunction\" tag");
+			return (0);
+		}
+		*va_arg(ap, uint16 **) = td->td_transferfunction[0];
+		if (td->td_samplesperpixel - td->td_extrasamples > 1) {
+			*va_arg(ap, uint16 **) = td->td_transferfunction[1];
+			*va_arg(ap, uint16 **) = td->td_transferfunction[2];
+		}
+		return (1);
+	case TIFFTAG_REFERENCEBLACKWHITE:
+		{
+			int i;
+			static float ycbcr_refblackwhite[] =
+			{ 0.0F, 255.0F, 128.0F, 255.0F, 128.0F, 255.0F };
+			static float rgb_refblackwhite[6];
+
+			for (i = 0; i < 3; i++) {
+				rgb_refblackwhite[2 * i + 0] = 0.0F;
+				rgb_refblackwhite[2 * i + 1] =
+					(float)((1L<<td->td_bitspersample)-1L);
+			}
+
+			if (td->td_photometric == PHOTOMETRIC_YCBCR) {
+				/*
+				 * YCbCr (Class Y) images must have the
+				 * ReferenceBlackWhite tag set. Fix the
+				 * broken images, which lacks that tag.
+				 */
+				*va_arg(ap, float **) = ycbcr_refblackwhite;
+			} else {
+				/*
+				 * Assume RGB (Class R)
+				 */
+				*va_arg(ap, float **) = rgb_refblackwhite;
+			}
+			return 1;
+		}
+	}
+	return 0;
+}
+
+/*
+ * Like TIFFGetField, but return any default
+ * value if the tag is not present in the directory.
+ */
+int
+TIFFGetFieldDefaulted(TIFF* tif, ttag_t tag, ...)
+{
+	int ok;
+	va_list ap;
+
+	va_start(ap, tag);
+	ok =  TIFFVGetFieldDefaulted(tif, tag, ap);
+	va_end(ap);
+	return (ok);
+}
+
+/* vim: set ts=8 sts=8 sw=8 noet: */
diff --git a/uppsrc/plugin/tif/lib/tif_close.c b/uppsrc/plugin/tif/lib/tif_close.c
new file mode 100644
index 000000000..021f157ed
--- /dev/null
+++ b/uppsrc/plugin/tif/lib/tif_close.c
@@ -0,0 +1,118 @@
+/* $Id: tif_close.c,v 1.9 2005/11/23 22:20:56 dron Exp $ */
+
+/*
+ * Copyright (c) 1988-1997 Sam Leffler
+ * Copyright (c) 1991-1997 Silicon Graphics, Inc.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and
+ * its documentation for any purpose is hereby granted without fee, provided
+ * that (i) the above copyright notices and this permission notice appear in
+ * all copies of the software and related documentation, and (ii) the names of
+ * Sam Leffler and Silicon Graphics may not be used in any advertising or
+ * publicity relating to the software without the specific, prior written
+ * permission of Sam Leffler and Silicon Graphics.
+ *
+ * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+ * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
+ * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
+ * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+ * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
+ * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.
+ */
+
+/*
+ * TIFF Library.
+ */
+#include "tiffiop.h"
+
+/************************************************************************/
+/*                            TIFFCleanup()                             */
+/************************************************************************/
+
+/**
+ * Auxiliary function to free the TIFF structure. Given structure will be
+ * completetly freed, so you should save opened file handle and pointer
+ * to the close procedure in external variables before calling
+ * _TIFFCleanup(), if you will need these ones to close the file.
+ *
+ * @param tif A TIFF pointer.
+ */
+
+void
+TIFFCleanup(TIFF* tif)
+{
+	if (tif->tif_mode != O_RDONLY)
+	    /*
+	     * Flush buffered data and directory (if dirty).
+	     */
+	    TIFFFlush(tif);
+	(*tif->tif_cleanup)(tif);
+	TIFFFreeDirectory(tif);
+
+	if (tif->tif_dirlist)
+	    _TIFFfree(tif->tif_dirlist);
+
+	/* Clean up client info links */
+	while( tif->tif_clientinfo )
+	{
+	    TIFFClientInfoLink *link = tif->tif_clientinfo;
+
+	    tif->tif_clientinfo = link->next;
+	    _TIFFfree( link->name );
+	    _TIFFfree( link );
+	}
+
+	if (tif->tif_rawdata && (tif->tif_flags&TIFF_MYBUFFER))
+	    _TIFFfree(tif->tif_rawdata);
+	if (isMapped(tif))
+	    TIFFUnmapFileContents(tif, tif->tif_base, tif->tif_size);
+
+	/* Clean up custom fields */
+	if (tif->tif_nfields > 0)
+	{
+	    size_t  i;
+
+	    for (i = 0; i < tif->tif_nfields; i++)
+	    {
+		TIFFFieldInfo *fld = tif->tif_fieldinfo[i];
+		if (fld->field_bit == FIELD_CUSTOM &&
+		    strncmp("Tag ", fld->field_name, 4) == 0)
+		{
+		    _TIFFfree(fld->field_name);
+		    _TIFFfree(fld);
+		}
+	    }
+
+	    _TIFFfree(tif->tif_fieldinfo);
+	}
+
+	_TIFFfree(tif);
+}
+
+/************************************************************************/
+/*                            TIFFClose()                               */
+/************************************************************************/
+
+/**
+ * Close a previously opened TIFF file.
+ *
+ * TIFFClose closes a file that was previously opened with TIFFOpen().
+ * Any buffered data are flushed to the file, including the contents of
+ * the current directory (if modified); and all resources are reclaimed.
+ *
+ * @param tif A TIFF pointer.
+ */
+
+void
+TIFFClose(TIFF* tif)
+{
+	TIFFCloseProc closeproc = tif->tif_closeproc;
+	thandle_t fd = tif->tif_clientdata;
+
+	TIFFCleanup(tif);
+	(void) (*closeproc)(fd);
+}
diff --git a/uppsrc/plugin/tif/lib/tif_codec.c b/uppsrc/plugin/tif/lib/tif_codec.c
new file mode 100644
index 000000000..27911c35f
--- /dev/null
+++ b/uppsrc/plugin/tif/lib/tif_codec.c
@@ -0,0 +1,149 @@
+/* $Id: tif_codec.c,v 1.10 2005/12/21 12:23:13 joris Exp $ */
+
+/*
+ * Copyright (c) 1988-1997 Sam Leffler
+ * Copyright (c) 1991-1997 Silicon Graphics, Inc.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and
+ * its documentation for any purpose is hereby granted without fee, provided
+ * that (i) the above copyright notices and this permission notice appear in
+ * all copies of the software and related documentation, and (ii) the names of
+ * Sam Leffler and Silicon Graphics may not be used in any advertising or
+ * publicity relating to the software without the specific, prior written
+ * permission of Sam Leffler and Silicon Graphics.
+ *
+ * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+ * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
+ * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
+ * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+ * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
+ * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.
+ */
+
+/*
+ * TIFF Library
+ *
+ * Builtin Compression Scheme Configuration Support.
+ */
+#include "tiffiop.h"
+
+static	int NotConfigured(TIFF*, int);
+
+#ifndef	LZW_SUPPORT
+#define	TIFFInitLZW		NotConfigured
+#endif
+#ifndef	PACKBITS_SUPPORT
+#define	TIFFInitPackBits	NotConfigured
+#endif
+#ifndef	THUNDER_SUPPORT
+#define	TIFFInitThunderScan	NotConfigured
+#endif
+#ifndef	NEXT_SUPPORT
+#define	TIFFInitNeXT		NotConfigured
+#endif
+#ifndef	JPEG_SUPPORT
+#define	TIFFInitJPEG		NotConfigured
+#endif
+#ifndef	OJPEG_SUPPORT
+#define	TIFFInitOJPEG		NotConfigured
+#endif
+#ifndef	CCITT_SUPPORT
+#define	TIFFInitCCITTRLE	NotConfigured
+#define	TIFFInitCCITTRLEW	NotConfigured
+#define	TIFFInitCCITTFax3	NotConfigured
+#define	TIFFInitCCITTFax4	NotConfigured
+#endif
+#ifndef JBIG_SUPPORT
+#define	TIFFInitJBIG		NotConfigured
+#endif
+#ifndef	ZIP_SUPPORT
+#define	TIFFInitZIP		NotConfigured
+#endif
+#ifndef	PIXARLOG_SUPPORT
+#define	TIFFInitPixarLog	NotConfigured
+#endif
+#ifndef LOGLUV_SUPPORT
+#define TIFFInitSGILog		NotConfigured
+#endif
+
+/*
+ * Compression schemes statically built into the library.
+ */
+#ifdef VMS
+const TIFFCodec _TIFFBuiltinCODECS[] = {
+#else
+TIFFCodec _TIFFBuiltinCODECS[] = {
+#endif
+    { "None",		COMPRESSION_NONE,	TIFFInitDumpMode },
+    { "LZW",		COMPRESSION_LZW,	TIFFInitLZW },
+    { "PackBits",	COMPRESSION_PACKBITS,	TIFFInitPackBits },
+    { "ThunderScan",	COMPRESSION_THUNDERSCAN,TIFFInitThunderScan },
+    { "NeXT",		COMPRESSION_NEXT,	TIFFInitNeXT },
+    { "JPEG",		COMPRESSION_JPEG,	TIFFInitJPEG },
+    { "Old-style JPEG",	COMPRESSION_OJPEG,	TIFFInitOJPEG },
+    { "CCITT RLE",	COMPRESSION_CCITTRLE,	TIFFInitCCITTRLE },
+    { "CCITT RLE/W",	COMPRESSION_CCITTRLEW,	TIFFInitCCITTRLEW },
+    { "CCITT Group 3",	COMPRESSION_CCITTFAX3,	TIFFInitCCITTFax3 },
+    { "CCITT Group 4",	COMPRESSION_CCITTFAX4,	TIFFInitCCITTFax4 },
+    { "ISO JBIG",	COMPRESSION_JBIG,	TIFFInitJBIG },
+    { "Deflate",	COMPRESSION_DEFLATE,	TIFFInitZIP },
+    { "AdobeDeflate",   COMPRESSION_ADOBE_DEFLATE , TIFFInitZIP },
+    { "PixarLog",	COMPRESSION_PIXARLOG,	TIFFInitPixarLog },
+    { "SGILog",		COMPRESSION_SGILOG,	TIFFInitSGILog },
+    { "SGILog24",	COMPRESSION_SGILOG24,	TIFFInitSGILog },
+    { NULL,             0,                      NULL }
+};
+
+static int
+_notConfigured(TIFF* tif)
+{
+	const TIFFCodec* c = TIFFFindCODEC(tif->tif_dir.td_compression);
+
+	TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
+	    "%s compression support is not configured", c->name);
+	return (0);
+}
+
+static int
+NotConfigured(TIFF* tif, int scheme)
+{
+    (void) scheme;
+
+    tif->tif_decodestatus = FALSE;
+    tif->tif_setupdecode = _notConfigured;
+    tif->tif_encodestatus = FALSE;
+    tif->tif_setupencode = _notConfigured;
+    return (1);
+}
+
+/************************************************************************/
+/*                       TIFFIsCODECConfigured()                        */
+/************************************************************************/
+
+/**
+ * Check whether we have working codec for the specific coding scheme.
+ *
+ * @return returns 1 if the codec is configured and working. Otherwise
+ * 0 will be returned.
+ */
+
+int
+TIFFIsCODECConfigured(uint16 scheme)
+{
+	const TIFFCodec* codec = TIFFFindCODEC(scheme);
+
+	if(codec == NULL) {
+            return 0;
+        }
+        if(codec->init == NULL) {
+            return 0;
+        }
+	if(codec->init != NotConfigured){
+            return 1;
+        }
+	return 0;
+}
diff --git a/uppsrc/plugin/tif/lib/tif_color.c b/uppsrc/plugin/tif/lib/tif_color.c
new file mode 100644
index 000000000..066c3260f
--- /dev/null
+++ b/uppsrc/plugin/tif/lib/tif_color.c
@@ -0,0 +1,275 @@
+/* $Id: tif_color.c,v 1.12 2006/02/09 15:42:20 dron Exp $ */
+
+/*
+ * Copyright (c) 1988-1997 Sam Leffler
+ * Copyright (c) 1991-1997 Silicon Graphics, Inc.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and
+ * its documentation for any purpose is hereby granted without fee, provided
+ * that (i) the above copyright notices and this permission notice appear in
+ * all copies of the software and related documentation, and (ii) the names of
+ * Sam Leffler and Silicon Graphics may not be used in any advertising or
+ * publicity relating to the software without the specific, prior written
+ * permission of Sam Leffler and Silicon Graphics.
+ *
+ * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+ * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
+ * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
+ * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+ * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
+ * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.
+ */
+
+/*
+ * CIE L*a*b* to CIE XYZ and CIE XYZ to RGB conversion routines are taken
+ * from the VIPS library (http://www.vips.ecs.soton.ac.uk) with
+ * the permission of John Cupitt, the VIPS author.
+ */
+
+/*
+ * TIFF Library.
+ *
+ * Color space conversion routines.
+ */
+
+#include "tiffiop.h"
+#include <math.h>
+
+/*
+ * Convert color value from the CIE L*a*b* 1976 space to CIE XYZ.
+ */
+void
+TIFFCIELabToXYZ(TIFFCIELabToRGB *cielab, uint32 l, int32 a, int32 b,
+		float *X, float *Y, float *Z)
+{
+	float L = (float)l * 100.0F / 255.0F;
+	float cby, tmp;
+
+	if( L < 8.856F ) {
+		*Y = (L * cielab->Y0) / 903.292F;
+		cby = 7.787F * (*Y / cielab->Y0) + 16.0F / 116.0F;
+	} else {
+		cby = (L + 16.0F) / 116.0F;
+		*Y = cielab->Y0 * cby * cby * cby;
+	}
+
+	tmp = (float)a / 500.0F + cby;
+	if( tmp < 0.2069F )
+		*X = cielab->X0 * (tmp - 0.13793F) / 7.787F;
+	else
+		*X = cielab->X0 * tmp * tmp * tmp;
+
+	tmp = cby - (float)b / 200.0F;
+	if( tmp < 0.2069F )
+		*Z = cielab->Z0 * (tmp - 0.13793F) / 7.787F;
+	else
+		*Z = cielab->Z0 * tmp * tmp * tmp;
+}
+
+#define RINT(R) ((uint32)((R)>0?((R)+0.5):((R)-0.5)))
+/*
+ * Convert color value from the XYZ space to RGB.
+ */
+void
+TIFFXYZToRGB(TIFFCIELabToRGB *cielab, float X, float Y, float Z,
+	     uint32 *r, uint32 *g, uint32 *b)
+{
+	int i;
+	float Yr, Yg, Yb;
+	float *matrix = &cielab->display.d_mat[0][0];
+
+	/* Multiply through the matrix to get luminosity values. */
+	Yr =  matrix[0] * X + matrix[1] * Y + matrix[2] * Z;
+	Yg =  matrix[3] * X + matrix[4] * Y + matrix[5] * Z;
+	Yb =  matrix[6] * X + matrix[7] * Y + matrix[8] * Z;
+
+	/* Clip input */
+	Yr = TIFFmax(Yr, cielab->display.d_Y0R);
+	Yg = TIFFmax(Yg, cielab->display.d_Y0G);
+	Yb = TIFFmax(Yb, cielab->display.d_Y0B);
+
+	/* Avoid overflow in case of wrong input values */
+	Yr = TIFFmin(Yr, cielab->display.d_YCR);
+	Yg = TIFFmin(Yg, cielab->display.d_YCG);
+	Yb = TIFFmin(Yb, cielab->display.d_YCB);
+
+	/* Turn luminosity to colour value. */
+	i = (int)((Yr - cielab->display.d_Y0R) / cielab->rstep);
+	i = TIFFmin(cielab->range, i);
+	*r = RINT(cielab->Yr2r[i]);
+
+	i = (int)((Yg - cielab->display.d_Y0G) / cielab->gstep);
+	i = TIFFmin(cielab->range, i);
+	*g = RINT(cielab->Yg2g[i]);
+
+	i = (int)((Yb - cielab->display.d_Y0B) / cielab->bstep);
+	i = TIFFmin(cielab->range, i);
+	*b = RINT(cielab->Yb2b[i]);
+
+	/* Clip output. */
+	*r = TIFFmin(*r, cielab->display.d_Vrwr);
+	*g = TIFFmin(*g, cielab->display.d_Vrwg);
+	*b = TIFFmin(*b, cielab->display.d_Vrwb);
+}
+#undef RINT
+
+/*
+ * Allocate conversion state structures and make look_up tables for
+ * the Yr,Yb,Yg <=> r,g,b conversions.
+ */
+int
+TIFFCIELabToRGBInit(TIFFCIELabToRGB* cielab,
+		    TIFFDisplay *display, float *refWhite)
+{
+	int i;
+	double gamma;
+
+	cielab->range = CIELABTORGB_TABLE_RANGE;
+
+	_TIFFmemcpy(&cielab->display, display, sizeof(TIFFDisplay));
+
+	/* Red */
+	gamma = 1.0 / cielab->display.d_gammaR ;
+	cielab->rstep =
+		(cielab->display.d_YCR - cielab->display.d_Y0R)	/ cielab->range;
+	for(i = 0; i <= cielab->range; i++) {
+		cielab->Yr2r[i] = cielab->display.d_Vrwr
+		    * ((float)pow((double)i / cielab->range, gamma));
+	}
+
+	/* Green */
+	gamma = 1.0 / cielab->display.d_gammaG ;
+	cielab->gstep =
+	    (cielab->display.d_YCR - cielab->display.d_Y0R) / cielab->range;
+	for(i = 0; i <= cielab->range; i++) {
+		cielab->Yg2g[i] = cielab->display.d_Vrwg
+		    * ((float)pow((double)i / cielab->range, gamma));
+	}
+
+	/* Blue */
+	gamma = 1.0 / cielab->display.d_gammaB ;
+	cielab->bstep =
+	    (cielab->display.d_YCR - cielab->display.d_Y0R) / cielab->range;
+	for(i = 0; i <= cielab->range; i++) {
+		cielab->Yb2b[i] = cielab->display.d_Vrwb
+		    * ((float)pow((double)i / cielab->range, gamma));
+	}
+
+	/* Init reference white point */
+	cielab->X0 = refWhite[0];
+	cielab->Y0 = refWhite[1];
+	cielab->Z0 = refWhite[2];
+
+	return 0;
+}
+
+/*
+ * Convert color value from the YCbCr space to CIE XYZ.
+ * The colorspace conversion algorithm comes from the IJG v5a code;
+ * see below for more information on how it works.
+ */
+#define	SHIFT			16
+#define	FIX(x)			((int32)((x) * (1L<<SHIFT) + 0.5))
+#define	ONE_HALF		((int32)(1<<(SHIFT-1)))
+#define	Code2V(c, RB, RW, CR)	((((c)-(int32)(RB))*(float)(CR))/(float)(((RW)-(RB)) ? ((RW)-(RB)) : 1))
+#define	CLAMP(f,min,max)	((f)<(min)?(min):(f)>(max)?(max):(f))
+#define HICLAMP(f,max)		((f)>(max)?(max):(f))
+
+void
+TIFFYCbCrtoRGB(TIFFYCbCrToRGB *ycbcr, uint32 Y, int32 Cb, int32 Cr,
+	       uint32 *r, uint32 *g, uint32 *b)
+{
+	/* XXX: Only 8-bit YCbCr input supported for now */
+	Y = HICLAMP(Y, 255), Cb = CLAMP(Cb, 0, 255), Cr = CLAMP(Cr, 0, 255);
+
+	*r = ycbcr->clamptab[ycbcr->Y_tab[Y] + ycbcr->Cr_r_tab[Cr]];
+	*g = ycbcr->clamptab[ycbcr->Y_tab[Y]
+	    + (int)((ycbcr->Cb_g_tab[Cb] + ycbcr->Cr_g_tab[Cr]) >> SHIFT)];
+	*b = ycbcr->clamptab[ycbcr->Y_tab[Y] + ycbcr->Cb_b_tab[Cb]];
+}
+
+/*
+ * Initialize the YCbCr->RGB conversion tables.  The conversion
+ * is done according to the 6.0 spec:
+ *
+ *    R = Y + Cr*(2 - 2*LumaRed)
+ *    B = Y + Cb*(2 - 2*LumaBlue)
+ *    G =   Y
+ *        - LumaBlue*Cb*(2-2*LumaBlue)/LumaGreen
+ *        - LumaRed*Cr*(2-2*LumaRed)/LumaGreen
+ *
+ * To avoid floating point arithmetic the fractional constants that
+ * come out of the equations are represented as fixed point values
+ * in the range 0...2^16.  We also eliminate multiplications by
+ * pre-calculating possible values indexed by Cb and Cr (this code
+ * assumes conversion is being done for 8-bit samples).
+ */
+int
+TIFFYCbCrToRGBInit(TIFFYCbCrToRGB* ycbcr, float *luma, float *refBlackWhite)
+{
+    TIFFRGBValue* clamptab;
+    int i;
+
+#define LumaRed	    luma[0]
+#define LumaGreen   luma[1]
+#define LumaBlue    luma[2]
+
+    clamptab = (TIFFRGBValue*)(
+	(tidata_t) ycbcr+TIFFroundup(sizeof (TIFFYCbCrToRGB), sizeof (long)));
+    _TIFFmemset(clamptab, 0, 256);		/* v < 0 => 0 */
+    ycbcr->clamptab = (clamptab += 256);
+    for (i = 0; i < 256; i++)
+	clamptab[i] = (TIFFRGBValue) i;
+    _TIFFmemset(clamptab+256, 255, 2*256);	/* v > 255 => 255 */
+    ycbcr->Cr_r_tab = (int*) (clamptab + 3*256);
+    ycbcr->Cb_b_tab = ycbcr->Cr_r_tab + 256;
+    ycbcr->Cr_g_tab = (int32*) (ycbcr->Cb_b_tab + 256);
+    ycbcr->Cb_g_tab = ycbcr->Cr_g_tab + 256;
+    ycbcr->Y_tab = ycbcr->Cb_g_tab + 256;
+
+    { float f1 = 2-2*LumaRed;		int32 D1 = FIX(f1);
+      float f2 = LumaRed*f1/LumaGreen;	int32 D2 = -FIX(f2);
+      float f3 = 2-2*LumaBlue;		int32 D3 = FIX(f3);
+      float f4 = LumaBlue*f3/LumaGreen;	int32 D4 = -FIX(f4);
+      int x;
+
+#undef LumaBlue
+#undef LumaGreen
+#undef LumaRed
+
+      /*
+       * i is the actual input pixel value in the range 0..255
+       * Cb and Cr values are in the range -128..127 (actually
+       * they are in a range defined by the ReferenceBlackWhite
+       * tag) so there is some range shifting to do here when
+       * constructing tables indexed by the raw pixel data.
+       */
+      for (i = 0, x = -128; i < 256; i++, x++) {
+	    int32 Cr = (int32)Code2V(x, refBlackWhite[4] - 128.0F,
+			    refBlackWhite[5] - 128.0F, 127);
+	    int32 Cb = (int32)Code2V(x, refBlackWhite[2] - 128.0F,
+			    refBlackWhite[3] - 128.0F, 127);
+
+	    ycbcr->Cr_r_tab[i] = (int32)((D1*Cr + ONE_HALF)>>SHIFT);
+	    ycbcr->Cb_b_tab[i] = (int32)((D3*Cb + ONE_HALF)>>SHIFT);
+	    ycbcr->Cr_g_tab[i] = D2*Cr;
+	    ycbcr->Cb_g_tab[i] = D4*Cb + ONE_HALF;
+	    ycbcr->Y_tab[i] =
+		    (int32)Code2V(x + 128, refBlackWhite[0], refBlackWhite[1], 255);
+      }
+    }
+
+    return 0;
+}
+#undef	HICLAMP
+#undef	CLAMP
+#undef	Code2V
+#undef	SHIFT
+#undef	ONE_HALF
+#undef	FIX
+
+/* vim: set ts=8 sts=8 sw=8 noet: */
diff --git a/uppsrc/plugin/tif/lib/tif_compress.c b/uppsrc/plugin/tif/lib/tif_compress.c
new file mode 100644
index 000000000..d0ad95f27
--- /dev/null
+++ b/uppsrc/plugin/tif/lib/tif_compress.c
@@ -0,0 +1,286 @@
+/* $Id: tif_compress.c,v 1.11 2005/12/21 12:23:13 joris Exp $ */
+
+/*
+ * Copyright (c) 1988-1997 Sam Leffler
+ * Copyright (c) 1991-1997 Silicon Graphics, Inc.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and
+ * its documentation for any purpose is hereby granted without fee, provided
+ * that (i) the above copyright notices and this permission notice appear in
+ * all copies of the software and related documentation, and (ii) the names of
+ * Sam Leffler and Silicon Graphics may not be used in any advertising or
+ * publicity relating to the software without the specific, prior written
+ * permission of Sam Leffler and Silicon Graphics.
+ *
+ * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+ * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
+ * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
+ * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+ * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
+ * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.
+ */
+
+/*
+ * TIFF Library
+ *
+ * Compression Scheme Configuration Support.
+ */
+#include "tiffiop.h"
+
+static int
+TIFFNoEncode(TIFF* tif, const char* method)
+{
+	const TIFFCodec* c = TIFFFindCODEC(tif->tif_dir.td_compression);
+
+	if (c) {
+			TIFFErrorExt(tif->tif_clientdata, tif->tif_name, "%s %s encoding is not implemented",
+                          c->name, method);
+	} else {
+		TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
+			  "Compression scheme %u %s encoding is not implemented",
+		    tif->tif_dir.td_compression, method);
+	}
+	return (-1);
+}
+
+int
+_TIFFNoRowEncode(TIFF* tif, tidata_t pp, tsize_t cc, tsample_t s)
+{
+	(void) pp; (void) cc; (void) s;
+	return (TIFFNoEncode(tif, "scanline"));
+}
+
+int
+_TIFFNoStripEncode(TIFF* tif, tidata_t pp, tsize_t cc, tsample_t s)
+{
+	(void) pp; (void) cc; (void) s;
+	return (TIFFNoEncode(tif, "strip"));
+}
+
+int
+_TIFFNoTileEncode(TIFF* tif, tidata_t pp, tsize_t cc, tsample_t s)
+{
+	(void) pp; (void) cc; (void) s;
+	return (TIFFNoEncode(tif, "tile"));
+}
+
+static int
+TIFFNoDecode(TIFF* tif, const char* method)
+{
+	const TIFFCodec* c = TIFFFindCODEC(tif->tif_dir.td_compression);
+
+	if (c)
+		TIFFErrorExt(tif->tif_clientdata, tif->tif_name, "%s %s decoding is not implemented",
+		    c->name, method);
+	else
+		TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
+		    "Compression scheme %u %s decoding is not implemented",
+		    tif->tif_dir.td_compression, method);
+	return (-1);
+}
+
+int
+_TIFFNoRowDecode(TIFF* tif, tidata_t pp, tsize_t cc, tsample_t s)
+{
+	(void) pp; (void) cc; (void) s;
+	return (TIFFNoDecode(tif, "scanline"));
+}
+
+int
+_TIFFNoStripDecode(TIFF* tif, tidata_t pp, tsize_t cc, tsample_t s)
+{
+	(void) pp; (void) cc; (void) s;
+	return (TIFFNoDecode(tif, "strip"));
+}
+
+int
+_TIFFNoTileDecode(TIFF* tif, tidata_t pp, tsize_t cc, tsample_t s)
+{
+	(void) pp; (void) cc; (void) s;
+	return (TIFFNoDecode(tif, "tile"));
+}
+
+int
+_TIFFNoSeek(TIFF* tif, uint32 off)
+{
+	(void) off;
+	TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
+	    "Compression algorithm does not support random access");
+	return (0);
+}
+
+int
+_TIFFNoPreCode(TIFF* tif, tsample_t s)
+{
+	(void) tif; (void) s;
+	return (1);
+}
+
+static int _TIFFtrue(TIFF* tif) { (void) tif; return (1); }
+static void _TIFFvoid(TIFF* tif) { (void) tif; }
+
+void
+_TIFFSetDefaultCompressionState(TIFF* tif)
+{
+	tif->tif_decodestatus = TRUE;
+	tif->tif_setupdecode = _TIFFtrue;
+	tif->tif_predecode = _TIFFNoPreCode;
+	tif->tif_decoderow = _TIFFNoRowDecode;
+	tif->tif_decodestrip = _TIFFNoStripDecode;
+	tif->tif_decodetile = _TIFFNoTileDecode;
+	tif->tif_encodestatus = TRUE;
+	tif->tif_setupencode = _TIFFtrue;
+	tif->tif_preencode = _TIFFNoPreCode;
+	tif->tif_postencode = _TIFFtrue;
+	tif->tif_encoderow = _TIFFNoRowEncode;
+	tif->tif_encodestrip = _TIFFNoStripEncode;
+	tif->tif_encodetile = _TIFFNoTileEncode;
+	tif->tif_close = _TIFFvoid;
+	tif->tif_seek = _TIFFNoSeek;
+	tif->tif_cleanup = _TIFFvoid;
+	tif->tif_defstripsize = _TIFFDefaultStripSize;
+	tif->tif_deftilesize = _TIFFDefaultTileSize;
+	tif->tif_flags &= ~TIFF_NOBITREV;
+}
+
+int
+TIFFSetCompressionScheme(TIFF* tif, int scheme)
+{
+	const TIFFCodec *c = TIFFFindCODEC((uint16) scheme);
+
+	_TIFFSetDefaultCompressionState(tif);
+	/*
+	 * Don't treat an unknown compression scheme as an error.
+	 * This permits applications to open files with data that
+	 * the library does not have builtin support for, but which
+	 * may still be meaningful.
+	 */
+	return (c ? (*c->init)(tif, scheme) : 1);
+}
+
+/*
+ * Other compression schemes may be registered.  Registered
+ * schemes can also override the builtin versions provided
+ * by this library.
+ */
+typedef struct _codec {
+	struct _codec*	next;
+	TIFFCodec*	info;
+} codec_t;
+static	codec_t* registeredCODECS = NULL;
+
+const TIFFCodec*
+TIFFFindCODEC(uint16 scheme)
+{
+	const TIFFCodec* c;
+	codec_t* cd;
+
+	for (cd = registeredCODECS; cd; cd = cd->next)
+		if (cd->info->scheme == scheme)
+			return ((const TIFFCodec*) cd->info);
+	for (c = _TIFFBuiltinCODECS; c->name; c++)
+		if (c->scheme == scheme)
+			return (c);
+	return ((const TIFFCodec*) 0);
+}
+
+TIFFCodec*
+TIFFRegisterCODEC(uint16 scheme, const char* name, TIFFInitMethod init)
+{
+	codec_t* cd = (codec_t*)
+	    _TIFFmalloc(sizeof (codec_t) + sizeof (TIFFCodec) + strlen(name)+1);
+
+	if (cd != NULL) {
+		cd->info = (TIFFCodec*) ((tidata_t) cd + sizeof (codec_t));
+		cd->info->name = (char*)
+		    ((tidata_t) cd->info + sizeof (TIFFCodec));
+		strcpy(cd->info->name, name);
+		cd->info->scheme = scheme;
+		cd->info->init = init;
+		cd->next = registeredCODECS;
+		registeredCODECS = cd;
+	} else {
+		TIFFErrorExt(0, "TIFFRegisterCODEC",
+		    "No space to register compression scheme %s", name);
+		return NULL;
+	}
+	return (cd->info);
+}
+
+void
+TIFFUnRegisterCODEC(TIFFCodec* c)
+{
+	codec_t* cd;
+	codec_t** pcd;
+
+	for (pcd = &registeredCODECS; (cd = *pcd); pcd = &cd->next)
+		if (cd->info == c) {
+			*pcd = cd->next;
+			_TIFFfree(cd);
+			return;
+		}
+	TIFFErrorExt(0, "TIFFUnRegisterCODEC",
+	    "Cannot remove compression scheme %s; not registered", c->name);
+}
+
+/************************************************************************/
+/*                       TIFFGetConfisuredCODECs()                      */
+/************************************************************************/
+
+/**
+ * Get list of configured codecs, both built-in and registered by user.
+ * Caller is responsible to free this structure.
+ *
+ * @return returns array of TIFFCodec records (the last record should be NULL)
+ * or NULL if function failed.
+ */
+
+TIFFCodec*
+TIFFGetConfiguredCODECs()
+{
+	int		i = 1;
+        codec_t		*cd;
+        const TIFFCodec	*c;
+	TIFFCodec	*codecs = NULL, *new_codecs;
+
+        for (cd = registeredCODECS; cd; cd = cd->next) {
+                new_codecs = (TIFFCodec *)
+			_TIFFrealloc(codecs, i * sizeof(TIFFCodec));
+		if (!new_codecs) {
+			_TIFFfree (codecs);
+			return NULL;
+		}
+		codecs = new_codecs;
+		_TIFFmemcpy(codecs + i - 1, cd, sizeof(TIFFCodec));
+		i++;
+	}
+        for (c = _TIFFBuiltinCODECS; c->name; c++) {
+                if (TIFFIsCODECConfigured(c->scheme)) {
+                        new_codecs = (TIFFCodec *)
+				_TIFFrealloc(codecs, i * sizeof(TIFFCodec));
+			if (!new_codecs) {
+				_TIFFfree (codecs);
+				return NULL;
+			}
+			codecs = new_codecs;
+			_TIFFmemcpy(codecs + i - 1, (const tdata_t)c, sizeof(TIFFCodec));
+			i++;
+		}
+	}
+
+	new_codecs = (TIFFCodec *) _TIFFrealloc(codecs, i * sizeof(TIFFCodec));
+	if (!new_codecs) {
+		_TIFFfree (codecs);
+		return NULL;
+	}
+	codecs = new_codecs;
+	_TIFFmemset(codecs + i - 1, 0, sizeof(TIFFCodec));
+
+        return codecs;
+}
+
+/* vim: set ts=8 sts=8 sw=8 noet: */
diff --git a/uppsrc/plugin/tif/lib/tif_config.h b/uppsrc/plugin/tif/lib/tif_config.h
new file mode 100644
index 000000000..55f3c09a2
--- /dev/null
+++ b/uppsrc/plugin/tif/lib/tif_config.h
@@ -0,0 +1,37 @@
+/* Define to 1 if you have the <assert.h> header file. */
+#define HAVE_ASSERT_H 1
+
+/* Define to 1 if you have the <fcntl.h> header file. */
+#define HAVE_FCNTL_H 1
+
+/* Define as 0 or 1 according to the floating point format suported by the
+   machine */
+#define HAVE_IEEEFP 1
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#define HAVE_SYS_TYPES_H 1
+
+/* Define to 1 if you have the <io.h> header file. */
+#define HAVE_IO_H 1
+
+/* The size of a `int', as computed by sizeof. */
+#define SIZEOF_INT 4
+
+/* The size of a `long', as computed by sizeof. */
+#define SIZEOF_LONG 4
+
+/* Define to 1 if you have the <search.h> header file. */
+#define HAVE_SEARCH_H 1
+
+/* Set the native cpu bit order */
+#define HOST_FILLORDER FILLORDER_LSB2MSB
+
+/* Define to 1 if your processor stores words with the most significant byte
+   first (like Motorola and SPARC, unlike Intel and VAX). */
+/* #undef WORDS_BIGENDIAN */
+
+/* Define to `__inline__' or `__inline' if that's what the C compiler
+   calls it, or to nothing if 'inline' is not supported under any name.  */
+#ifndef __cplusplus
+#define inline __inline
+#endif
diff --git a/uppsrc/plugin/tif/lib/tif_config.h.in b/uppsrc/plugin/tif/lib/tif_config.h.in
new file mode 100644
index 000000000..fef3a6101
--- /dev/null
+++ b/uppsrc/plugin/tif/lib/tif_config.h.in
@@ -0,0 +1,260 @@
+/* libtiff/tif_config.h.in.  Generated from configure.ac by autoheader.  */
+
+/* Support CCITT Group 3 & 4 algorithms */
+#undef CCITT_SUPPORT
+
+/* Pick up YCbCr subsampling info from the JPEG data stream to support files
+   lacking the tag (default enabled). */
+#undef CHECK_JPEG_YCBCR_SUBSAMPLING
+
+/* Support C++ stream API (requires C++ compiler) */
+#undef CXX_SUPPORT
+
+/* Treat extra sample as alpha (default enabled). The RGBA interface will
+   treat a fourth sample with no EXTRASAMPLE_ value as being ASSOCALPHA. Many
+   packages produce RGBA files but don't mark the alpha properly. */
+#undef DEFAULT_EXTRASAMPLE_AS_ALPHA
+
+/* Use the Apple OpenGL framework. */
+#undef HAVE_APPLE_OPENGL_FRAMEWORK
+
+/* Define to 1 if you have the <assert.h> header file. */
+#undef HAVE_ASSERT_H
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#undef HAVE_DLFCN_H
+
+/* Define to 1 if you have the <fcntl.h> header file. */
+#undef HAVE_FCNTL_H
+
+/* Define to 1 if you have the `floor' function. */
+#undef HAVE_FLOOR
+
+/* Define to 1 if you have the `getopt' function. */
+#undef HAVE_GETOPT
+
+/* Define as 0 or 1 according to the floating point format suported by the
+   machine */
+#undef HAVE_IEEEFP
+
+/* Define to 1 if the system has the type `int16'. */
+#undef HAVE_INT16
+
+/* Define to 1 if the system has the type `int32'. */
+#undef HAVE_INT32
+
+/* Define to 1 if the system has the type `int8'. */
+#undef HAVE_INT8
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#undef HAVE_INTTYPES_H
+
+/* Define to 1 if you have the `isascii' function. */
+#undef HAVE_ISASCII
+
+/* Define to 1 if you have the `lfind' function. */
+#undef HAVE_LFIND
+
+/* Define to 1 if you have the `c' library (-lc). */
+#undef HAVE_LIBC
+
+/* Define to 1 if you have the `m' library (-lm). */
+#undef HAVE_LIBM
+
+/* Define to 1 if you have the <limits.h> header file. */
+#undef HAVE_LIMITS_H
+
+/* Define to 1 if you have the <malloc.h> header file. */
+#undef HAVE_MALLOC_H
+
+/* Define to 1 if you have the `memmove' function. */
+#undef HAVE_MEMMOVE
+
+/* Define to 1 if you have the <memory.h> header file. */
+#undef HAVE_MEMORY_H
+
+/* Define to 1 if you have the `memset' function. */
+#undef HAVE_MEMSET
+
+/* Define to 1 if you have the `mmap' function. */
+#undef HAVE_MMAP
+
+/* Define to 1 if you have the `pow' function. */
+#undef HAVE_POW
+
+/* Define if you have POSIX threads libraries and header files. */
+#undef HAVE_PTHREAD
+
+/* Define to 1 if you have the <search.h> header file. */
+#undef HAVE_SEARCH_H
+
+/* Define to 1 if you have the `sqrt' function. */
+#undef HAVE_SQRT
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#undef HAVE_STDINT_H
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#undef HAVE_STDLIB_H
+
+/* Define to 1 if you have the `strcasecmp' function. */
+#undef HAVE_STRCASECMP
+
+/* Define to 1 if you have the `strchr' function. */
+#undef HAVE_STRCHR
+
+/* Define to 1 if you have the <strings.h> header file. */
+#undef HAVE_STRINGS_H
+
+/* Define to 1 if you have the <string.h> header file. */
+#undef HAVE_STRING_H
+
+/* Define to 1 if you have the `strrchr' function. */
+#undef HAVE_STRRCHR
+
+/* Define to 1 if you have the `strstr' function. */
+#undef HAVE_STRSTR
+
+/* Define to 1 if you have the `strtol' function. */
+#undef HAVE_STRTOL
+
+/* Define to 1 if you have the `strtoul' function. */
+#undef HAVE_STRTOUL
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#undef HAVE_SYS_STAT_H
+
+/* Define to 1 if you have the <sys/time.h> header file. */
+#undef HAVE_SYS_TIME_H
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#undef HAVE_SYS_TYPES_H
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#undef HAVE_UNISTD_H
+
+/* Define to 1 if you have the <windows.h> header file. */
+#undef HAVE_WINDOWS_H
+
+/* Native cpu byte order: 1 if big-endian (Motorola) or 0 if little-endian
+   (Intel) */
+#undef HOST_BIGENDIAN
+
+/* Set the native cpu bit order (FILLORDER_LSB2MSB or FILLORDER_MSB2LSB) */
+#undef HOST_FILLORDER
+
+/* Support JPEG compression (requires IJG JPEG library) */
+#undef JPEG_SUPPORT
+
+/* Support LogLuv high dynamic range encoding */
+#undef LOGLUV_SUPPORT
+
+/* Define to the sub-directory in which libtool stores uninstalled libraries.
+   */
+#undef LT_OBJDIR
+
+/* Support LZW algorithm */
+#undef LZW_SUPPORT
+
+/* Support Microsoft Document Imaging format */
+#undef MDI_SUPPORT
+
+/* Support NeXT 2-bit RLE algorithm */
+#undef NEXT_SUPPORT
+
+/* Define to 1 if your C compiler doesn't accept -c and -o together. */
+#undef NO_MINUS_C_MINUS_O
+
+/* Support Old JPEG compresson (read contrib/ojpeg/README first! Compilation
+   fails with unpatched IJG JPEG library) */
+#undef OJPEG_SUPPORT
+
+/* Name of package */
+#undef PACKAGE
+
+/* Define to the address where bug reports for this package should be sent. */
+#undef PACKAGE_BUGREPORT
+
+/* Define to the full name of this package. */
+#undef PACKAGE_NAME
+
+/* Define to the full name and version of this package. */
+#undef PACKAGE_STRING
+
+/* Define to the one symbol short name of this package. */
+#undef PACKAGE_TARNAME
+
+/* Define to the version of this package. */
+#undef PACKAGE_VERSION
+
+/* Support Macintosh PackBits algorithm */
+#undef PACKBITS_SUPPORT
+
+/* Support Pixar log-format algorithm (requires Zlib) */
+#undef PIXARLOG_SUPPORT
+
+/* Define to necessary symbol if this constant uses a non-standard name on
+   your system. */
+#undef PTHREAD_CREATE_JOINABLE
+
+/* The size of a `int', as computed by sizeof. */
+#undef SIZEOF_INT
+
+/* The size of a `long', as computed by sizeof. */
+#undef SIZEOF_LONG
+
+/* Define to 1 if you have the ANSI C header files. */
+#undef STDC_HEADERS
+
+/* Support strip chopping (whether or not to convert single-strip uncompressed
+   images to mutiple strips of specified size to reduce memory usage) */
+#undef STRIPCHOP_DEFAULT
+
+/* Default size of the strip in bytes (when strip chopping enabled) */
+#undef STRIP_SIZE_DEFAULT
+
+/* Enable SubIFD tag (330) support */
+#undef SUBIFD_SUPPORT
+
+/* Support ThunderScan 4-bit RLE algorithm */
+#undef THUNDER_SUPPORT
+
+/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
+#undef TIME_WITH_SYS_TIME
+
+/* Define to 1 if your <sys/time.h> declares `struct tm'. */
+#undef TM_IN_SYS_TIME
+
+/* Version number of package */
+#undef VERSION
+
+/* Define to 1 if your processor stores words with the most significant byte
+   first (like Motorola and SPARC, unlike Intel and VAX). */
+#undef WORDS_BIGENDIAN
+
+/* Define to 1 if the X Window System is missing or not being used. */
+#undef X_DISPLAY_MISSING
+
+/* Support Deflate compression */
+#undef ZIP_SUPPORT
+
+/* Number of bits in a file offset, on hosts where this is settable. */
+#undef _FILE_OFFSET_BITS
+
+/* Define for large files, on AIX-style hosts. */
+#undef _LARGE_FILES
+
+/* Define to empty if `const' does not conform to ANSI C. */
+#undef const
+
+/* Define to `__inline__' or `__inline' if that's what the C compiler
+   calls it, or to nothing if 'inline' is not supported under any name.  */
+#ifndef __cplusplus
+#undef inline
+#endif
+
+/* Define to `long' if <sys/types.h> does not define. */
+#undef off_t
+
+/* Define to `unsigned' if <sys/types.h> does not define. */
+#undef size_t
diff --git a/uppsrc/plugin/tif/lib/tif_config.h.vc b/uppsrc/plugin/tif/lib/tif_config.h.vc
new file mode 100644
index 000000000..98e40fae8
--- /dev/null
+++ b/uppsrc/plugin/tif/lib/tif_config.h.vc
@@ -0,0 +1,44 @@
+/* Define to 1 if you have the <assert.h> header file. */
+#define HAVE_ASSERT_H 1
+
+/* Define to 1 if you have the <fcntl.h> header file. */
+#define HAVE_FCNTL_H 1
+
+/* Define as 0 or 1 according to the floating point format suported by the
+   machine */
+#define HAVE_IEEEFP 1
+
+/* Define to 1 if you have the <string.h> header file. */
+#define HAVE_STRING_H 1
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#define HAVE_SYS_TYPES_H 1
+
+/* Define to 1 if you have the <io.h> header file. */
+#define HAVE_IO_H 1
+
+/* Define to 1 if you have the <search.h> header file. */
+#define HAVE_SEARCH_H 1
+
+/* The size of a `int', as computed by sizeof. */
+#define SIZEOF_INT 4
+
+/* The size of a `long', as computed by sizeof. */
+#define SIZEOF_LONG 4
+
+/* Set the native cpu bit order */
+#define HOST_FILLORDER FILLORDER_LSB2MSB
+
+/* Define to 1 if your processor stores words with the most significant byte
+   first (like Motorola and SPARC, unlike Intel and VAX). */
+/* #undef WORDS_BIGENDIAN */
+
+/* Define to `__inline__' or `__inline' if that's what the C compiler
+   calls it, or to nothing if 'inline' is not supported under any name.  */
+#ifndef __cplusplus
+# ifndef inline
+#  define inline __inline
+# endif
+#endif
+
+#define lfind _lfind
diff --git a/uppsrc/plugin/tif/lib/tif_dir.c b/uppsrc/plugin/tif/lib/tif_dir.c
new file mode 100644
index 000000000..985a17389
--- /dev/null
+++ b/uppsrc/plugin/tif/lib/tif_dir.c
@@ -0,0 +1,1350 @@
+/* $Id: tif_dir.c,v 1.72 2006/03/15 12:49:35 dron Exp $ */
+
+/*
+ * Copyright (c) 1988-1997 Sam Leffler
+ * Copyright (c) 1991-1997 Silicon Graphics, Inc.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and
+ * its documentation for any purpose is hereby granted without fee, provided
+ * that (i) the above copyright notices and this permission notice appear in
+ * all copies of the software and related documentation, and (ii) the names of
+ * Sam Leffler and Silicon Graphics may not be used in any advertising or
+ * publicity relating to the software without the specific, prior written
+ * permission of Sam Leffler and Silicon Graphics.
+ *
+ * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+ * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
+ * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
+ * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+ * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
+ * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.
+ */
+
+/*
+ * TIFF Library.
+ *
+ * Directory Tag Get & Set Routines.
+ * (and also some miscellaneous stuff)
+ */
+#include "tiffiop.h"
+
+/*
+ * These are used in the backwards compatibility code...
+ */
+#define DATATYPE_VOID		0       /* !untyped data */
+#define DATATYPE_INT		1       /* !signed integer data */
+#define DATATYPE_UINT		2       /* !unsigned integer data */
+#define DATATYPE_IEEEFP		3       /* !IEEE floating point data */
+
+static void
+setByteArray(void** vpp, void* vp, size_t nmemb, size_t elem_size)
+{
+	if (*vpp)
+		_TIFFfree(*vpp), *vpp = 0;
+	if (vp) {
+		tsize_t	bytes = nmemb * elem_size;
+		if (elem_size && bytes / elem_size == nmemb)
+			*vpp = (void*) _TIFFmalloc(bytes);
+		if (*vpp)
+			_TIFFmemcpy(*vpp, vp, bytes);
+	}
+}
+void _TIFFsetByteArray(void** vpp, void* vp, uint32 n)
+    { setByteArray(vpp, vp, n, 1); }
+void _TIFFsetString(char** cpp, char* cp)
+    { setByteArray((void**) cpp, (void*) cp, strlen(cp)+1, 1); }
+void _TIFFsetNString(char** cpp, char* cp, uint32 n)
+    { setByteArray((void**) cpp, (void*) cp, n, 1); }
+void _TIFFsetShortArray(uint16** wpp, uint16* wp, uint32 n)
+    { setByteArray((void**) wpp, (void*) wp, n, sizeof (uint16)); }
+void _TIFFsetLongArray(uint32** lpp, uint32* lp, uint32 n)
+    { setByteArray((void**) lpp, (void*) lp, n, sizeof (uint32)); }
+void _TIFFsetFloatArray(float** fpp, float* fp, uint32 n)
+    { setByteArray((void**) fpp, (void*) fp, n, sizeof (float)); }
+void _TIFFsetDoubleArray(double** dpp, double* dp, uint32 n)
+    { setByteArray((void**) dpp, (void*) dp, n, sizeof (double)); }
+
+/*
+ * Install extra samples information.
+ */
+static int
+setExtraSamples(TIFFDirectory* td, va_list ap, uint32* v)
+{
+	uint16* va;
+	uint32 i;
+
+	*v = va_arg(ap, uint32);
+	if ((uint16) *v > td->td_samplesperpixel)
+		return (0);
+	va = va_arg(ap, uint16*);
+	if (*v > 0 && va == NULL)		/* typically missing param */
+		return (0);
+	for (i = 0; i < *v; i++)
+		if (va[i] > EXTRASAMPLE_UNASSALPHA)
+			return (0);
+	td->td_extrasamples = (uint16) *v;
+	_TIFFsetShortArray(&td->td_sampleinfo, va, td->td_extrasamples);
+	return (1);
+}
+
+static uint32
+checkInkNamesString(TIFF* tif, uint32 slen, const char* s)
+{
+	TIFFDirectory* td = &tif->tif_dir;
+	uint16 i = td->td_samplesperpixel;
+
+	if (slen > 0) {
+		const char* ep = s+slen;
+		const char* cp = s;
+		for (; i > 0; i--) {
+			for (; *cp != '\0'; cp++)
+				if (cp >= ep)
+					goto bad;
+			cp++;				/* skip \0 */
+		}
+		return (cp-s);
+	}
+bad:
+	TIFFErrorExt(tif->tif_clientdata, "TIFFSetField",
+	    "%s: Invalid InkNames value; expecting %d names, found %d",
+	    tif->tif_name,
+	    td->td_samplesperpixel,
+	    td->td_samplesperpixel-i);
+	return (0);
+}
+
+static int
+_TIFFVSetField(TIFF* tif, ttag_t tag, va_list ap)
+{
+	static const char module[] = "_TIFFVSetField";
+
+	TIFFDirectory* td = &tif->tif_dir;
+	int status = 1;
+	uint32 v32, i, v;
+	char* s;
+
+	switch (tag) {
+	case TIFFTAG_SUBFILETYPE:
+		td->td_subfiletype = va_arg(ap, uint32);
+		break;
+	case TIFFTAG_IMAGEWIDTH:
+		td->td_imagewidth = va_arg(ap, uint32);
+		break;
+	case TIFFTAG_IMAGELENGTH:
+		td->td_imagelength = va_arg(ap, uint32);
+		break;
+	case TIFFTAG_BITSPERSAMPLE:
+		td->td_bitspersample = (uint16) va_arg(ap, int);
+		/*
+		 * If the data require post-decoding processing to byte-swap
+		 * samples, set it up here.  Note that since tags are required
+		 * to be ordered, compression code can override this behaviour
+		 * in the setup method if it wants to roll the post decoding
+		 * work in with its normal work.
+		 */
+		if (tif->tif_flags & TIFF_SWAB) {
+			if (td->td_bitspersample == 16)
+				tif->tif_postdecode = _TIFFSwab16BitData;
+			else if (td->td_bitspersample == 24)
+				tif->tif_postdecode = _TIFFSwab24BitData;
+			else if (td->td_bitspersample == 32)
+				tif->tif_postdecode = _TIFFSwab32BitData;
+			else if (td->td_bitspersample == 64)
+				tif->tif_postdecode = _TIFFSwab64BitData;
+			else if (td->td_bitspersample == 128) /* two 64's */
+				tif->tif_postdecode = _TIFFSwab64BitData;
+		}
+		break;
+	case TIFFTAG_COMPRESSION:
+		v = va_arg(ap, uint32) & 0xffff;
+		/*
+		 * If we're changing the compression scheme, the notify the
+		 * previous module so that it can cleanup any state it's
+		 * setup.
+		 */
+		if (TIFFFieldSet(tif, FIELD_COMPRESSION)) {
+			if (td->td_compression == v)
+				break;
+			(*tif->tif_cleanup)(tif);
+			tif->tif_flags &= ~TIFF_CODERSETUP;
+		}
+		/*
+		 * Setup new compression routine state.
+		 */
+		if( (status = TIFFSetCompressionScheme(tif, v)) != 0 )
+                    td->td_compression = (uint16) v;
+                else
+                    status = 0;
+		break;
+	case TIFFTAG_PHOTOMETRIC:
+		td->td_photometric = (uint16) va_arg(ap, int);
+		break;
+	case TIFFTAG_THRESHHOLDING:
+		td->td_threshholding = (uint16) va_arg(ap, int);
+		break;
+	case TIFFTAG_FILLORDER:
+		v = va_arg(ap, uint32);
+		if (v != FILLORDER_LSB2MSB && v != FILLORDER_MSB2LSB)
+			goto badvalue;
+		td->td_fillorder = (uint16) v;
+		break;
+		break;
+	case TIFFTAG_ORIENTATION:
+		v = va_arg(ap, uint32);
+		if (v < ORIENTATION_TOPLEFT || ORIENTATION_LEFTBOT < v) {
+			TIFFWarningExt(tif->tif_clientdata, tif->tif_name,
+			    "Bad value %lu for \"%s\" tag ignored",
+			    v, _TIFFFieldWithTag(tif, tag)->field_name);
+		} else
+			td->td_orientation = (uint16) v;
+		break;
+	case TIFFTAG_SAMPLESPERPIXEL:
+		/* XXX should cross check -- e.g. if pallette, then 1 */
+		v = va_arg(ap, uint32);
+		if (v == 0)
+			goto badvalue;
+		td->td_samplesperpixel = (uint16) v;
+		break;
+	case TIFFTAG_ROWSPERSTRIP:
+		v32 = va_arg(ap, uint32);
+		if (v32 == 0)
+			goto badvalue32;
+		td->td_rowsperstrip = v32;
+		if (!TIFFFieldSet(tif, FIELD_TILEDIMENSIONS)) {
+			td->td_tilelength = v32;
+			td->td_tilewidth = td->td_imagewidth;
+		}
+		break;
+	case TIFFTAG_MINSAMPLEVALUE:
+		td->td_minsamplevalue = (uint16) va_arg(ap, int);
+		break;
+	case TIFFTAG_MAXSAMPLEVALUE:
+		td->td_maxsamplevalue = (uint16) va_arg(ap, int);
+		break;
+	case TIFFTAG_SMINSAMPLEVALUE:
+		td->td_sminsamplevalue = va_arg(ap, double);
+		break;
+	case TIFFTAG_SMAXSAMPLEVALUE:
+		td->td_smaxsamplevalue = va_arg(ap, double);
+		break;
+	case TIFFTAG_XRESOLUTION:
+		td->td_xresolution = (float) va_arg(ap, double);
+		break;
+	case TIFFTAG_YRESOLUTION:
+		td->td_yresolution = (float) va_arg(ap, double);
+		break;
+	case TIFFTAG_PLANARCONFIG:
+		v = va_arg(ap, uint32);
+		if (v != PLANARCONFIG_CONTIG && v != PLANARCONFIG_SEPARATE)
+			goto badvalue;
+		td->td_planarconfig = (uint16) v;
+		break;
+	case TIFFTAG_XPOSITION:
+		td->td_xposition = (float) va_arg(ap, double);
+		break;
+	case TIFFTAG_YPOSITION:
+		td->td_yposition = (float) va_arg(ap, double);
+		break;
+	case TIFFTAG_RESOLUTIONUNIT:
+		v = va_arg(ap, uint32);
+		if (v < RESUNIT_NONE || RESUNIT_CENTIMETER < v)
+			goto badvalue;
+		td->td_resolutionunit = (uint16) v;
+		break;
+	case TIFFTAG_PAGENUMBER:
+		td->td_pagenumber[0] = (uint16) va_arg(ap, int);
+		td->td_pagenumber[1] = (uint16) va_arg(ap, int);
+		break;
+	case TIFFTAG_HALFTONEHINTS:
+		td->td_halftonehints[0] = (uint16) va_arg(ap, int);
+		td->td_halftonehints[1] = (uint16) va_arg(ap, int);
+		break;
+	case TIFFTAG_COLORMAP:
+		v32 = (uint32)(1L<<td->td_bitspersample);
+		_TIFFsetShortArray(&td->td_colormap[0], va_arg(ap, uint16*), v32);
+		_TIFFsetShortArray(&td->td_colormap[1], va_arg(ap, uint16*), v32);
+		_TIFFsetShortArray(&td->td_colormap[2], va_arg(ap, uint16*), v32);
+		break;
+	case TIFFTAG_EXTRASAMPLES:
+		if (!setExtraSamples(td, ap, &v))
+			goto badvalue;
+		break;
+	case TIFFTAG_MATTEING:
+		td->td_extrasamples = (uint16) (va_arg(ap, int) != 0);
+		if (td->td_extrasamples) {
+			uint16 sv = EXTRASAMPLE_ASSOCALPHA;
+			_TIFFsetShortArray(&td->td_sampleinfo, &sv, 1);
+		}
+		break;
+	case TIFFTAG_TILEWIDTH:
+		v32 = va_arg(ap, uint32);
+		if (v32 % 16) {
+			if (tif->tif_mode != O_RDONLY)
+				goto badvalue32;
+			TIFFWarningExt(tif->tif_clientdata, tif->tif_name,
+				"Nonstandard tile width %d, convert file", v32);
+		}
+		td->td_tilewidth = v32;
+		tif->tif_flags |= TIFF_ISTILED;
+		break;
+	case TIFFTAG_TILELENGTH:
+		v32 = va_arg(ap, uint32);
+		if (v32 % 16) {
+			if (tif->tif_mode != O_RDONLY)
+				goto badvalue32;
+			TIFFWarningExt(tif->tif_clientdata, tif->tif_name,
+			    "Nonstandard tile length %d, convert file", v32);
+		}
+		td->td_tilelength = v32;
+		tif->tif_flags |= TIFF_ISTILED;
+		break;
+	case TIFFTAG_TILEDEPTH:
+		v32 = va_arg(ap, uint32);
+		if (v32 == 0)
+			goto badvalue32;
+		td->td_tiledepth = v32;
+		break;
+	case TIFFTAG_DATATYPE:
+		v = va_arg(ap, uint32);
+		switch (v) {
+		case DATATYPE_VOID:	v = SAMPLEFORMAT_VOID;	break;
+		case DATATYPE_INT:	v = SAMPLEFORMAT_INT;	break;
+		case DATATYPE_UINT:	v = SAMPLEFORMAT_UINT;	break;
+		case DATATYPE_IEEEFP:	v = SAMPLEFORMAT_IEEEFP;break;
+		default:		goto badvalue;
+		}
+		td->td_sampleformat = (uint16) v;
+		break;
+	case TIFFTAG_SAMPLEFORMAT:
+		v = va_arg(ap, uint32);
+		if (v < SAMPLEFORMAT_UINT || SAMPLEFORMAT_COMPLEXIEEEFP < v)
+			goto badvalue;
+		td->td_sampleformat = (uint16) v;
+
+                /*  Try to fix up the SWAB function for complex data. */
+                if( td->td_sampleformat == SAMPLEFORMAT_COMPLEXINT
+                    && td->td_bitspersample == 32
+                    && tif->tif_postdecode == _TIFFSwab32BitData )
+                    tif->tif_postdecode = _TIFFSwab16BitData;
+                else if( (td->td_sampleformat == SAMPLEFORMAT_COMPLEXINT
+                          || td->td_sampleformat == SAMPLEFORMAT_COMPLEXIEEEFP)
+                         && td->td_bitspersample == 64
+                         && tif->tif_postdecode == _TIFFSwab64BitData )
+                    tif->tif_postdecode = _TIFFSwab32BitData;
+		break;
+	case TIFFTAG_IMAGEDEPTH:
+		td->td_imagedepth = va_arg(ap, uint32);
+		break;
+	case TIFFTAG_SUBIFD:
+		if ((tif->tif_flags & TIFF_INSUBIFD) == 0) {
+			td->td_nsubifd = (uint16) va_arg(ap, int);
+			_TIFFsetLongArray(&td->td_subifd, va_arg(ap, uint32*),
+			    (long) td->td_nsubifd);
+		} else {
+			TIFFErrorExt(tif->tif_clientdata, module, "%s: Sorry, cannot nest SubIFDs",
+				  tif->tif_name);
+			status = 0;
+		}
+		break;
+	case TIFFTAG_YCBCRPOSITIONING:
+		td->td_ycbcrpositioning = (uint16) va_arg(ap, int);
+		break;
+	case TIFFTAG_YCBCRSUBSAMPLING:
+		td->td_ycbcrsubsampling[0] = (uint16) va_arg(ap, int);
+		td->td_ycbcrsubsampling[1] = (uint16) va_arg(ap, int);
+		break;
+	case TIFFTAG_TRANSFERFUNCTION:
+		v = (td->td_samplesperpixel - td->td_extrasamples) > 1 ? 3 : 1;
+		for (i = 0; i < v; i++)
+			_TIFFsetShortArray(&td->td_transferfunction[i],
+			    va_arg(ap, uint16*), 1L<<td->td_bitspersample);
+		break;
+	case TIFFTAG_INKNAMES:
+		v = va_arg(ap, uint32);
+		s = va_arg(ap, char*);
+		v = checkInkNamesString(tif, v, s);
+                status = v > 0;
+		if( v > 0 ) {
+			_TIFFsetNString(&td->td_inknames, s, v);
+			td->td_inknameslen = v;
+		}
+		break;
+        default: {
+            const TIFFFieldInfo* fip = _TIFFFindFieldInfo(tif, tag, TIFF_ANY);
+            TIFFTagValue *tv;
+            int tv_size, iCustom;
+
+            /*
+	     * This can happen if multiple images are open with different
+	     * codecs which have private tags.  The global tag information
+	     * table may then have tags that are valid for one file but not
+	     * the other. If the client tries to set a tag that is not valid
+	     * for the image's codec then we'll arrive here.  This
+	     * happens, for example, when tiffcp is used to convert between
+	     * compression schemes and codec-specific tags are blindly copied.
+             */
+            if(fip == NULL || fip->field_bit != FIELD_CUSTOM) {
+		TIFFErrorExt(tif->tif_clientdata, module,
+		    "%s: Invalid %stag \"%s\" (not supported by codec)",
+		    tif->tif_name, isPseudoTag(tag) ? "pseudo-" : "",
+		    _TIFFFieldWithTag(tif, tag)->field_name);
+		status = 0;
+		break;
+            }
+
+            /*
+             * Find the existing entry for this custom value.
+             */
+            tv = NULL;
+            for(iCustom = 0; iCustom < td->td_customValueCount; iCustom++) {
+                if(td->td_customValues[iCustom].info == fip) {
+                    tv = td->td_customValues + iCustom;
+                    if(tv->value != NULL)
+                    {
+                        _TIFFfree(tv->value);
+                        tv->value = NULL;
+                    }
+                    break;
+                }
+            }
+
+            /*
+             * Grow the custom list if the entry was not found.
+             */
+            if(tv == NULL) {
+		TIFFTagValue	*new_customValues;
+
+		td->td_customValueCount++;
+		new_customValues = (TIFFTagValue *)
+			_TIFFrealloc(td->td_customValues,
+				     sizeof(TIFFTagValue) * td->td_customValueCount);
+		if (!new_customValues) {
+			TIFFErrorExt(tif->tif_clientdata, module,
+		"%s: Failed to allocate space for list of custom values",
+				  tif->tif_name);
+			status = 0;
+			goto end;
+		}
+
+		td->td_customValues = new_customValues;
+
+                tv = td->td_customValues + (td->td_customValueCount-1);
+                tv->info = fip;
+                tv->value = NULL;
+                tv->count = 0;
+            }
+
+            /*
+             * Set custom value ... save a copy of the custom tag value.
+             */
+	    tv_size = _TIFFDataSize(fip->field_type);
+	    if (tv_size == 0) {
+		    status = 0;
+		    TIFFErrorExt(tif->tif_clientdata, module,
+				 "%s: Bad field type %d for \"%s\"",
+				 tif->tif_name, fip->field_type,
+				 fip->field_name);
+		    goto end;
+	    }
+
+            if(fip->field_passcount) {
+		    if (fip->field_writecount == TIFF_VARIABLE2)
+			tv->count = (uint32) va_arg(ap, uint32);
+		    else
+			tv->count = (int) va_arg(ap, int);
+	    } else if (fip->field_writecount == TIFF_VARIABLE
+		       || fip->field_writecount == TIFF_VARIABLE2)
+		tv->count = 1;
+	    else if (fip->field_writecount == TIFF_SPP)
+		tv->count = td->td_samplesperpixel;
+	    else
+                tv->count = fip->field_writecount;
+
+
+	    if (fip->field_type == TIFF_ASCII)
+		    _TIFFsetString((char **)&tv->value, va_arg(ap, char *));
+	    else {
+                tv->value = _TIFFmalloc(tv_size * tv->count);
+		if (!tv->value) {
+		    status = 0;
+		    goto end;
+		}
+
+		if ((fip->field_passcount
+		    || fip->field_writecount == TIFF_VARIABLE
+		    || fip->field_writecount == TIFF_VARIABLE2
+		    || fip->field_writecount == TIFF_SPP
+		    || tv->count > 1)
+		    && fip->field_tag != TIFFTAG_PAGENUMBER
+		    && fip->field_tag != TIFFTAG_HALFTONEHINTS
+		    && fip->field_tag != TIFFTAG_YCBCRSUBSAMPLING
+		    && fip->field_tag != TIFFTAG_DOTRANGE) {
+                    _TIFFmemcpy(tv->value, va_arg(ap, void *),
+				tv->count * tv_size);
+		} else {
+		    /*
+		     * XXX: The following loop required to handle
+		     * TIFFTAG_PAGENUMBER, TIFFTAG_HALFTONEHINTS,
+		     * TIFFTAG_YCBCRSUBSAMPLING and TIFFTAG_DOTRANGE tags.
+		     * These tags are actually arrays and should be passed as
+		     * array pointers to TIFFSetField() function, but actually
+		     * passed as a list of separate values. This behaviour
+		     * must be changed in the future!
+		     */
+		    int i;
+		    char *val = (char *)tv->value;
+
+		    for (i = 0; i < tv->count; i++, val += tv_size) {
+			    switch (fip->field_type) {
+				case TIFF_BYTE:
+				case TIFF_UNDEFINED:
+				    {
+					uint8 v = (uint8)va_arg(ap, int);
+					_TIFFmemcpy(val, &v, tv_size);
+				    }
+				    break;
+				case TIFF_SBYTE:
+				    {
+					int8 v = (int8)va_arg(ap, int);
+					_TIFFmemcpy(val, &v, tv_size);
+				    }
+				    break;
+				case TIFF_SHORT:
+				    {
+					uint16 v = (uint16)va_arg(ap, int);
+					_TIFFmemcpy(val, &v, tv_size);
+				    }
+				    break;
+				case TIFF_SSHORT:
+				    {
+					int16 v = (int16)va_arg(ap, int);
+					_TIFFmemcpy(val, &v, tv_size);
+				    }
+				    break;
+				case TIFF_LONG:
+				case TIFF_IFD:
+				    {
+					uint32 v = va_arg(ap, uint32);
+					_TIFFmemcpy(val, &v, tv_size);
+				    }
+				    break;
+				case TIFF_SLONG:
+				    {
+					int32 v = va_arg(ap, int32);
+					_TIFFmemcpy(val, &v, tv_size);
+				    }
+				    break;
+				case TIFF_RATIONAL:
+				case TIFF_SRATIONAL:
+				case TIFF_FLOAT:
+				    {
+					float v = (float)va_arg(ap, double);
+					_TIFFmemcpy(val, &v, tv_size);
+				    }
+				    break;
+				case TIFF_DOUBLE:
+				    {
+					double v = va_arg(ap, double);
+					_TIFFmemcpy(val, &v, tv_size);
+				    }
+				    break;
+				default:
+				    _TIFFmemset(val, 0, tv_size);
+				    status = 0;
+				    break;
+			    }
+		    }
+		}
+	    }
+          }
+	}
+	if (status) {
+		TIFFSetFieldBit(tif, _TIFFFieldWithTag(tif, tag)->field_bit);
+		tif->tif_flags |= TIFF_DIRTYDIRECT;
+	}
+
+end:
+	va_end(ap);
+	return (status);
+badvalue:
+	TIFFErrorExt(tif->tif_clientdata, module, "%s: Bad value %d for \"%s\"",
+		  tif->tif_name, v, _TIFFFieldWithTag(tif, tag)->field_name);
+	va_end(ap);
+	return (0);
+badvalue32:
+	TIFFErrorExt(tif->tif_clientdata, module, "%s: Bad value %ld for \"%s\"",
+		   tif->tif_name, v32, _TIFFFieldWithTag(tif, tag)->field_name);
+	va_end(ap);
+	return (0);
+}
+
+/*
+ * Return 1/0 according to whether or not
+ * it is permissible to set the tag's value.
+ * Note that we allow ImageLength to be changed
+ * so that we can append and extend to images.
+ * Any other tag may not be altered once writing
+ * has commenced, unless its value has no effect
+ * on the format of the data that is written.
+ */
+static int
+OkToChangeTag(TIFF* tif, ttag_t tag)
+{
+	const TIFFFieldInfo* fip = _TIFFFindFieldInfo(tif, tag, TIFF_ANY);
+	if (!fip) {			/* unknown tag */
+		TIFFErrorExt(tif->tif_clientdata, "TIFFSetField", "%s: Unknown %stag %u",
+		    tif->tif_name, isPseudoTag(tag) ? "pseudo-" : "", tag);
+		return (0);
+	}
+	if (tag != TIFFTAG_IMAGELENGTH && (tif->tif_flags & TIFF_BEENWRITING) &&
+	    !fip->field_oktochange) {
+		/*
+		 * Consult info table to see if tag can be changed
+		 * after we've started writing.  We only allow changes
+		 * to those tags that don't/shouldn't affect the
+		 * compression and/or format of the data.
+		 */
+		TIFFErrorExt(tif->tif_clientdata, "TIFFSetField",
+		    "%s: Cannot modify tag \"%s\" while writing",
+		    tif->tif_name, fip->field_name);
+		return (0);
+	}
+	return (1);
+}
+
+/*
+ * Record the value of a field in the
+ * internal directory structure.  The
+ * field will be written to the file
+ * when/if the directory structure is
+ * updated.
+ */
+int
+TIFFSetField(TIFF* tif, ttag_t tag, ...)
+{
+	va_list ap;
+	int status;
+
+	va_start(ap, tag);
+	status = TIFFVSetField(tif, tag, ap);
+	va_end(ap);
+	return (status);
+}
+
+/*
+ * Like TIFFSetField, but taking a varargs
+ * parameter list.  This routine is useful
+ * for building higher-level interfaces on
+ * top of the library.
+ */
+int
+TIFFVSetField(TIFF* tif, ttag_t tag, va_list ap)
+{
+	return OkToChangeTag(tif, tag) ?
+	    (*tif->tif_tagmethods.vsetfield)(tif, tag, ap) : 0;
+}
+
+static int
+_TIFFVGetField(TIFF* tif, ttag_t tag, va_list ap)
+{
+    TIFFDirectory* td = &tif->tif_dir;
+    int            ret_val = 1;
+
+    switch (tag) {
+	case TIFFTAG_SUBFILETYPE:
+            *va_arg(ap, uint32*) = td->td_subfiletype;
+            break;
+	case TIFFTAG_IMAGEWIDTH:
+            *va_arg(ap, uint32*) = td->td_imagewidth;
+            break;
+	case TIFFTAG_IMAGELENGTH:
+            *va_arg(ap, uint32*) = td->td_imagelength;
+            break;
+	case TIFFTAG_BITSPERSAMPLE:
+            *va_arg(ap, uint16*) = td->td_bitspersample;
+            break;
+	case TIFFTAG_COMPRESSION:
+            *va_arg(ap, uint16*) = td->td_compression;
+            break;
+	case TIFFTAG_PHOTOMETRIC:
+            *va_arg(ap, uint16*) = td->td_photometric;
+            break;
+	case TIFFTAG_THRESHHOLDING:
+            *va_arg(ap, uint16*) = td->td_threshholding;
+            break;
+	case TIFFTAG_FILLORDER:
+            *va_arg(ap, uint16*) = td->td_fillorder;
+            break;
+	case TIFFTAG_ORIENTATION:
+            *va_arg(ap, uint16*) = td->td_orientation;
+            break;
+	case TIFFTAG_SAMPLESPERPIXEL:
+            *va_arg(ap, uint16*) = td->td_samplesperpixel;
+            break;
+	case TIFFTAG_ROWSPERSTRIP:
+            *va_arg(ap, uint32*) = td->td_rowsperstrip;
+            break;
+	case TIFFTAG_MINSAMPLEVALUE:
+            *va_arg(ap, uint16*) = td->td_minsamplevalue;
+            break;
+	case TIFFTAG_MAXSAMPLEVALUE:
+            *va_arg(ap, uint16*) = td->td_maxsamplevalue;
+            break;
+	case TIFFTAG_SMINSAMPLEVALUE:
+            *va_arg(ap, double*) = td->td_sminsamplevalue;
+            break;
+	case TIFFTAG_SMAXSAMPLEVALUE:
+            *va_arg(ap, double*) = td->td_smaxsamplevalue;
+            break;
+	case TIFFTAG_XRESOLUTION:
+            *va_arg(ap, float*) = td->td_xresolution;
+            break;
+	case TIFFTAG_YRESOLUTION:
+            *va_arg(ap, float*) = td->td_yresolution;
+            break;
+	case TIFFTAG_PLANARCONFIG:
+            *va_arg(ap, uint16*) = td->td_planarconfig;
+            break;
+	case TIFFTAG_XPOSITION:
+            *va_arg(ap, float*) = td->td_xposition;
+            break;
+	case TIFFTAG_YPOSITION:
+            *va_arg(ap, float*) = td->td_yposition;
+            break;
+	case TIFFTAG_RESOLUTIONUNIT:
+            *va_arg(ap, uint16*) = td->td_resolutionunit;
+            break;
+	case TIFFTAG_PAGENUMBER:
+            *va_arg(ap, uint16*) = td->td_pagenumber[0];
+            *va_arg(ap, uint16*) = td->td_pagenumber[1];
+            break;
+	case TIFFTAG_HALFTONEHINTS:
+            *va_arg(ap, uint16*) = td->td_halftonehints[0];
+            *va_arg(ap, uint16*) = td->td_halftonehints[1];
+            break;
+	case TIFFTAG_COLORMAP:
+            *va_arg(ap, uint16**) = td->td_colormap[0];
+            *va_arg(ap, uint16**) = td->td_colormap[1];
+            *va_arg(ap, uint16**) = td->td_colormap[2];
+            break;
+	case TIFFTAG_STRIPOFFSETS:
+	case TIFFTAG_TILEOFFSETS:
+            *va_arg(ap, uint32**) = td->td_stripoffset;
+            break;
+	case TIFFTAG_STRIPBYTECOUNTS:
+	case TIFFTAG_TILEBYTECOUNTS:
+            *va_arg(ap, uint32**) = td->td_stripbytecount;
+            break;
+	case TIFFTAG_MATTEING:
+            *va_arg(ap, uint16*) =
+                (td->td_extrasamples == 1 &&
+                 td->td_sampleinfo[0] == EXTRASAMPLE_ASSOCALPHA);
+            break;
+	case TIFFTAG_EXTRASAMPLES:
+            *va_arg(ap, uint16*) = td->td_extrasamples;
+            *va_arg(ap, uint16**) = td->td_sampleinfo;
+            break;
+	case TIFFTAG_TILEWIDTH:
+            *va_arg(ap, uint32*) = td->td_tilewidth;
+            break;
+	case TIFFTAG_TILELENGTH:
+            *va_arg(ap, uint32*) = td->td_tilelength;
+            break;
+	case TIFFTAG_TILEDEPTH:
+            *va_arg(ap, uint32*) = td->td_tiledepth;
+            break;
+	case TIFFTAG_DATATYPE:
+            switch (td->td_sampleformat) {
+		case SAMPLEFORMAT_UINT:
+                    *va_arg(ap, uint16*) = DATATYPE_UINT;
+                    break;
+		case SAMPLEFORMAT_INT:
+                    *va_arg(ap, uint16*) = DATATYPE_INT;
+                    break;
+		case SAMPLEFORMAT_IEEEFP:
+                    *va_arg(ap, uint16*) = DATATYPE_IEEEFP;
+                    break;
+		case SAMPLEFORMAT_VOID:
+                    *va_arg(ap, uint16*) = DATATYPE_VOID;
+                    break;
+            }
+            break;
+	case TIFFTAG_SAMPLEFORMAT:
+            *va_arg(ap, uint16*) = td->td_sampleformat;
+            break;
+	case TIFFTAG_IMAGEDEPTH:
+            *va_arg(ap, uint32*) = td->td_imagedepth;
+            break;
+	case TIFFTAG_SUBIFD:
+            *va_arg(ap, uint16*) = td->td_nsubifd;
+            *va_arg(ap, uint32**) = td->td_subifd;
+            break;
+	case TIFFTAG_YCBCRPOSITIONING:
+            *va_arg(ap, uint16*) = td->td_ycbcrpositioning;
+            break;
+	case TIFFTAG_YCBCRSUBSAMPLING:
+            *va_arg(ap, uint16*) = td->td_ycbcrsubsampling[0];
+            *va_arg(ap, uint16*) = td->td_ycbcrsubsampling[1];
+            break;
+	case TIFFTAG_TRANSFERFUNCTION:
+            *va_arg(ap, uint16**) = td->td_transferfunction[0];
+            if (td->td_samplesperpixel - td->td_extrasamples > 1) {
+                *va_arg(ap, uint16**) = td->td_transferfunction[1];
+                *va_arg(ap, uint16**) = td->td_transferfunction[2];
+            }
+            break;
+	case TIFFTAG_INKNAMES:
+            *va_arg(ap, char**) = td->td_inknames;
+            break;
+        default:
+        {
+            const TIFFFieldInfo* fip = _TIFFFindFieldInfo(tif, tag, TIFF_ANY);
+            int           i;
+
+            /*
+             * This can happen if multiple images are open with
+             * different codecs which have private tags.  The
+             * global tag information table may then have tags
+             * that are valid for one file but not the other.
+             * If the client tries to get a tag that is not valid
+             * for the image's codec then we'll arrive here.
+             */
+            if( fip == NULL || fip->field_bit != FIELD_CUSTOM )
+            {
+				TIFFErrorExt(tif->tif_clientdata, "_TIFFVGetField",
+                          "%s: Invalid %stag \"%s\" (not supported by codec)",
+                          tif->tif_name, isPseudoTag(tag) ? "pseudo-" : "",
+                          _TIFFFieldWithTag(tif, tag)->field_name);
+                ret_val = 0;
+                break;
+            }
+
+            /*
+	     * Do we have a custom value?
+	     */
+            ret_val = 0;
+            for (i = 0; i < td->td_customValueCount; i++) {
+		TIFFTagValue *tv = td->td_customValues + i;
+
+		if (tv->info->field_tag != tag)
+			continue;
+
+		if (fip->field_passcount) {
+			if (fip->field_readcount == TIFF_VARIABLE2)
+				*va_arg(ap, uint32*) = (uint32)tv->count;
+			else	/* Assume TIFF_VARIABLE */
+				*va_arg(ap, uint16*) = (uint16)tv->count;
+			*va_arg(ap, void **) = tv->value;
+			ret_val = 1;
+                } else {
+			if ((fip->field_type == TIFF_ASCII
+			    || fip->field_readcount == TIFF_VARIABLE
+			    || fip->field_readcount == TIFF_VARIABLE2
+			    || fip->field_readcount == TIFF_SPP
+			    || tv->count > 1)
+			    && fip->field_tag != TIFFTAG_PAGENUMBER
+			    && fip->field_tag != TIFFTAG_HALFTONEHINTS
+			    && fip->field_tag != TIFFTAG_YCBCRSUBSAMPLING
+			    && fip->field_tag != TIFFTAG_DOTRANGE) {
+				*va_arg(ap, void **) = tv->value;
+				ret_val = 1;
+			} else {
+			    int j;
+			    char *val = (char *)tv->value;
+
+			    for (j = 0; j < tv->count;
+				 j++, val += _TIFFDataSize(tv->info->field_type)) {
+				switch (fip->field_type) {
+					case TIFF_BYTE:
+					case TIFF_UNDEFINED:
+						*va_arg(ap, uint8*) =
+							*(uint8 *)val;
+						ret_val = 1;
+						break;
+					case TIFF_SBYTE:
+						*va_arg(ap, int8*) =
+							*(int8 *)val;
+						ret_val = 1;
+						break;
+					case TIFF_SHORT:
+						*va_arg(ap, uint16*) =
+							*(uint16 *)val;
+						ret_val = 1;
+						break;
+					case TIFF_SSHORT:
+						*va_arg(ap, int16*) =
+							*(int16 *)val;
+						ret_val = 1;
+						break;
+					case TIFF_LONG:
+					case TIFF_IFD:
+						*va_arg(ap, uint32*) =
+							*(uint32 *)val;
+						ret_val = 1;
+						break;
+					case TIFF_SLONG:
+						*va_arg(ap, int32*) =
+							*(int32 *)val;
+						ret_val = 1;
+						break;
+					case TIFF_RATIONAL:
+					case TIFF_SRATIONAL:
+					case TIFF_FLOAT:
+						*va_arg(ap, float*) =
+							*(float *)val;
+						ret_val = 1;
+						break;
+					case TIFF_DOUBLE:
+						*va_arg(ap, double*) =
+							*(double *)val;
+						ret_val = 1;
+						break;
+					default:
+						ret_val = 0;
+						break;
+				}
+			    }
+			}
+                }
+		break;
+            }
+        }
+    }
+    return(ret_val);
+}
+
+/*
+ * Return the value of a field in the
+ * internal directory structure.
+ */
+int
+TIFFGetField(TIFF* tif, ttag_t tag, ...)
+{
+	int status;
+	va_list ap;
+
+	va_start(ap, tag);
+	status = TIFFVGetField(tif, tag, ap);
+	va_end(ap);
+	return (status);
+}
+
+/*
+ * Like TIFFGetField, but taking a varargs
+ * parameter list.  This routine is useful
+ * for building higher-level interfaces on
+ * top of the library.
+ */
+int
+TIFFVGetField(TIFF* tif, ttag_t tag, va_list ap)
+{
+	const TIFFFieldInfo* fip = _TIFFFindFieldInfo(tif, tag, TIFF_ANY);
+	return (fip && (isPseudoTag(tag) || TIFFFieldSet(tif, fip->field_bit)) ?
+	    (*tif->tif_tagmethods.vgetfield)(tif, tag, ap) : 0);
+}
+
+#define	CleanupField(member) {		\
+    if (td->member) {			\
+	_TIFFfree(td->member);		\
+	td->member = 0;			\
+    }					\
+}
+
+/*
+ * Release storage associated with a directory.
+ */
+void
+TIFFFreeDirectory(TIFF* tif)
+{
+	TIFFDirectory *td = &tif->tif_dir;
+	int            i;
+
+	_TIFFmemset(td->td_fieldsset, 0, FIELD_SETLONGS);
+	CleanupField(td_colormap[0]);
+	CleanupField(td_colormap[1]);
+	CleanupField(td_colormap[2]);
+	CleanupField(td_sampleinfo);
+	CleanupField(td_subifd);
+	CleanupField(td_inknames);
+	CleanupField(td_transferfunction[0]);
+	CleanupField(td_transferfunction[1]);
+	CleanupField(td_transferfunction[2]);
+	CleanupField(td_stripoffset);
+	CleanupField(td_stripbytecount);
+	TIFFClrFieldBit(tif, FIELD_YCBCRSUBSAMPLING);
+	TIFFClrFieldBit(tif, FIELD_YCBCRPOSITIONING);
+
+	/* Cleanup custom tag values */
+	for( i = 0; i < td->td_customValueCount; i++ ) {
+		if (td->td_customValues[i].value)
+			_TIFFfree(td->td_customValues[i].value);
+	}
+
+	td->td_customValueCount = 0;
+	CleanupField(td_customValues);
+}
+#undef CleanupField
+
+/*
+ * Client Tag extension support (from Niles Ritter).
+ */
+static TIFFExtendProc _TIFFextender = (TIFFExtendProc) NULL;
+
+TIFFExtendProc
+TIFFSetTagExtender(TIFFExtendProc extender)
+{
+	TIFFExtendProc prev = _TIFFextender;
+	_TIFFextender = extender;
+	return (prev);
+}
+
+/*
+ * Setup for a new directory.  Should we automatically call
+ * TIFFWriteDirectory() if the current one is dirty?
+ *
+ * The newly created directory will not exist on the file till
+ * TIFFWriteDirectory(), TIFFFlush() or TIFFClose() is called.
+ */
+int
+TIFFCreateDirectory(TIFF* tif)
+{
+    TIFFDefaultDirectory(tif);
+    tif->tif_diroff = 0;
+    tif->tif_nextdiroff = 0;
+    tif->tif_curoff = 0;
+    tif->tif_row = (uint32) -1;
+    tif->tif_curstrip = (tstrip_t) -1;
+
+    return 0;
+}
+
+/*
+ * Setup a default directory structure.
+ */
+int
+TIFFDefaultDirectory(TIFF* tif)
+{
+	register TIFFDirectory* td = &tif->tif_dir;
+
+	size_t tiffFieldInfoCount;
+	const TIFFFieldInfo *tiffFieldInfo =
+		_TIFFGetFieldInfo(&tiffFieldInfoCount);
+	_TIFFSetupFieldInfo(tif, tiffFieldInfo, tiffFieldInfoCount);
+
+	_TIFFmemset(td, 0, sizeof (*td));
+	td->td_fillorder = FILLORDER_MSB2LSB;
+	td->td_bitspersample = 1;
+	td->td_threshholding = THRESHHOLD_BILEVEL;
+	td->td_orientation = ORIENTATION_TOPLEFT;
+	td->td_samplesperpixel = 1;
+	td->td_rowsperstrip = (uint32) -1;
+	td->td_tilewidth = 0;
+	td->td_tilelength = 0;
+	td->td_tiledepth = 1;
+	td->td_stripbytecountsorted = 1; /* Our own arrays always sorted. */
+	td->td_resolutionunit = RESUNIT_INCH;
+	td->td_sampleformat = SAMPLEFORMAT_UINT;
+	td->td_imagedepth = 1;
+	td->td_ycbcrsubsampling[0] = 2;
+	td->td_ycbcrsubsampling[1] = 2;
+	td->td_ycbcrpositioning = YCBCRPOSITION_CENTERED;
+	tif->tif_postdecode = _TIFFNoPostDecode;
+        tif->tif_foundfield = NULL;
+	tif->tif_tagmethods.vsetfield = _TIFFVSetField;
+	tif->tif_tagmethods.vgetfield = _TIFFVGetField;
+	tif->tif_tagmethods.printdir = NULL;
+	/*
+	 *  Give client code a chance to install their own
+	 *  tag extensions & methods, prior to compression overloads.
+	 */
+	if (_TIFFextender)
+		(*_TIFFextender)(tif);
+	(void) TIFFSetField(tif, TIFFTAG_COMPRESSION, COMPRESSION_NONE);
+	/*
+	 * NB: The directory is marked dirty as a result of setting
+	 * up the default compression scheme.  However, this really
+	 * isn't correct -- we want TIFF_DIRTYDIRECT to be set only
+	 * if the user does something.  We could just do the setup
+	 * by hand, but it seems better to use the normal mechanism
+	 * (i.e. TIFFSetField).
+	 */
+	tif->tif_flags &= ~TIFF_DIRTYDIRECT;
+
+        /*
+         * As per http://bugzilla.remotesensing.org/show_bug.cgi?id=19
+         * we clear the ISTILED flag when setting up a new directory.
+         * Should we also be clearing stuff like INSUBIFD?
+         */
+        tif->tif_flags &= ~TIFF_ISTILED;
+
+	return (1);
+}
+
+static int
+TIFFAdvanceDirectory(TIFF* tif, uint32* nextdir, toff_t* off)
+{
+    static const char module[] = "TIFFAdvanceDirectory";
+    uint16 dircount;
+    if (isMapped(tif))
+    {
+        toff_t poff=*nextdir;
+        if (poff+sizeof(uint16) > tif->tif_size)
+        {
+			TIFFErrorExt(tif->tif_clientdata, module, "%s: Error fetching directory count",
+                      tif->tif_name);
+            return (0);
+        }
+        _TIFFmemcpy(&dircount, tif->tif_base+poff, sizeof (uint16));
+        if (tif->tif_flags & TIFF_SWAB)
+            TIFFSwabShort(&dircount);
+        poff+=sizeof (uint16)+dircount*sizeof (TIFFDirEntry);
+        if (off != NULL)
+            *off = poff;
+        if (((toff_t) (poff+sizeof (uint32))) > tif->tif_size)
+        {
+			TIFFErrorExt(tif->tif_clientdata, module, "%s: Error fetching directory link",
+                      tif->tif_name);
+            return (0);
+        }
+        _TIFFmemcpy(nextdir, tif->tif_base+poff, sizeof (uint32));
+        if (tif->tif_flags & TIFF_SWAB)
+            TIFFSwabLong(nextdir);
+        return (1);
+    }
+    else
+    {
+        if (!SeekOK(tif, *nextdir) ||
+            !ReadOK(tif, &dircount, sizeof (uint16))) {
+			TIFFErrorExt(tif->tif_clientdata, module, "%s: Error fetching directory count",
+                      tif->tif_name);
+            return (0);
+        }
+        if (tif->tif_flags & TIFF_SWAB)
+            TIFFSwabShort(&dircount);
+        if (off != NULL)
+            *off = TIFFSeekFile(tif,
+                                dircount*sizeof (TIFFDirEntry), SEEK_CUR);
+        else
+            (void) TIFFSeekFile(tif,
+                                dircount*sizeof (TIFFDirEntry), SEEK_CUR);
+        if (!ReadOK(tif, nextdir, sizeof (uint32))) {
+			TIFFErrorExt(tif->tif_clientdata, module, "%s: Error fetching directory link",
+                      tif->tif_name);
+            return (0);
+        }
+        if (tif->tif_flags & TIFF_SWAB)
+            TIFFSwabLong(nextdir);
+        return (1);
+    }
+}
+
+/*
+ * Count the number of directories in a file.
+ */
+tdir_t
+TIFFNumberOfDirectories(TIFF* tif)
+{
+    toff_t nextdir = tif->tif_header.tiff_diroff;
+    tdir_t n = 0;
+
+    while (nextdir != 0 && TIFFAdvanceDirectory(tif, &nextdir, NULL))
+        n++;
+    return (n);
+}
+
+/*
+ * Set the n-th directory as the current directory.
+ * NB: Directories are numbered starting at 0.
+ */
+int
+TIFFSetDirectory(TIFF* tif, tdir_t dirn)
+{
+	toff_t nextdir;
+	tdir_t n;
+
+	nextdir = tif->tif_header.tiff_diroff;
+	for (n = dirn; n > 0 && nextdir != 0; n--)
+		if (!TIFFAdvanceDirectory(tif, &nextdir, NULL))
+			return (0);
+	tif->tif_nextdiroff = nextdir;
+	/*
+	 * Set curdir to the actual directory index.  The
+	 * -1 is because TIFFReadDirectory will increment
+	 * tif_curdir after successfully reading the directory.
+	 */
+	tif->tif_curdir = (dirn - n) - 1;
+	/*
+	 * Reset tif_dirnumber counter and start new list of seen directories.
+	 * We need this to prevent IFD loops.
+	 */
+	tif->tif_dirnumber = 0;
+	return (TIFFReadDirectory(tif));
+}
+
+/*
+ * Set the current directory to be the directory
+ * located at the specified file offset.  This interface
+ * is used mainly to access directories linked with
+ * the SubIFD tag (e.g. thumbnail images).
+ */
+int
+TIFFSetSubDirectory(TIFF* tif, uint32 diroff)
+{
+	tif->tif_nextdiroff = diroff;
+	/*
+	 * Reset tif_dirnumber counter and start new list of seen directories.
+	 * We need this to prevent IFD loops.
+	 */
+	tif->tif_dirnumber = 0;
+	return (TIFFReadDirectory(tif));
+}
+
+/*
+ * Return file offset of the current directory.
+ */
+uint32
+TIFFCurrentDirOffset(TIFF* tif)
+{
+	return (tif->tif_diroff);
+}
+
+/*
+ * Return an indication of whether or not we are
+ * at the last directory in the file.
+ */
+int
+TIFFLastDirectory(TIFF* tif)
+{
+	return (tif->tif_nextdiroff == 0);
+}
+
+/*
+ * Unlink the specified directory from the directory chain.
+ */
+int
+TIFFUnlinkDirectory(TIFF* tif, tdir_t dirn)
+{
+	static const char module[] = "TIFFUnlinkDirectory";
+	toff_t nextdir;
+	toff_t off;
+	tdir_t n;
+
+	if (tif->tif_mode == O_RDONLY) {
+		TIFFErrorExt(tif->tif_clientdata, module,
+                             "Can not unlink directory in read-only file");
+		return (0);
+	}
+	/*
+	 * Go to the directory before the one we want
+	 * to unlink and nab the offset of the link
+	 * field we'll need to patch.
+	 */
+	nextdir = tif->tif_header.tiff_diroff;
+	off = sizeof (uint16) + sizeof (uint16);
+	for (n = dirn-1; n > 0; n--) {
+		if (nextdir == 0) {
+			TIFFErrorExt(tif->tif_clientdata, module, "Directory %d does not exist", dirn);
+			return (0);
+		}
+		if (!TIFFAdvanceDirectory(tif, &nextdir, &off))
+			return (0);
+	}
+	/*
+	 * Advance to the directory to be unlinked and fetch
+	 * the offset of the directory that follows.
+	 */
+	if (!TIFFAdvanceDirectory(tif, &nextdir, NULL))
+		return (0);
+	/*
+	 * Go back and patch the link field of the preceding
+	 * directory to point to the offset of the directory
+	 * that follows.
+	 */
+	(void) TIFFSeekFile(tif, off, SEEK_SET);
+	if (tif->tif_flags & TIFF_SWAB)
+		TIFFSwabLong(&nextdir);
+	if (!WriteOK(tif, &nextdir, sizeof (uint32))) {
+		TIFFErrorExt(tif->tif_clientdata, module, "Error writing directory link");
+		return (0);
+	}
+	/*
+	 * Leave directory state setup safely.  We don't have
+	 * facilities for doing inserting and removing directories,
+	 * so it's safest to just invalidate everything.  This
+	 * means that the caller can only append to the directory
+	 * chain.
+	 */
+	(*tif->tif_cleanup)(tif);
+	if ((tif->tif_flags & TIFF_MYBUFFER) && tif->tif_rawdata) {
+		_TIFFfree(tif->tif_rawdata);
+		tif->tif_rawdata = NULL;
+		tif->tif_rawcc = 0;
+	}
+	tif->tif_flags &= ~(TIFF_BEENWRITING|TIFF_BUFFERSETUP|TIFF_POSTENCODE);
+	TIFFFreeDirectory(tif);
+	TIFFDefaultDirectory(tif);
+	tif->tif_diroff = 0;			/* force link on next write */
+	tif->tif_nextdiroff = 0;		/* next write must be at end */
+	tif->tif_curoff = 0;
+	tif->tif_row = (uint32) -1;
+	tif->tif_curstrip = (tstrip_t) -1;
+	return (1);
+}
+
+/*			[BFC]
+ *
+ * Author: Bruce Cameron <cameron@petris.com>
+ *
+ * Set a table of tags that are to be replaced during directory process by the
+ * 'IGNORE' state - or return TRUE/FALSE for the requested tag such that
+ * 'ReadDirectory' can use the stored information.
+ *
+ * FIXME: this is never used properly. Should be removed in the future.
+ */
+int
+TIFFReassignTagToIgnore (enum TIFFIgnoreSense task, int TIFFtagID)
+{
+    static int TIFFignoretags [FIELD_LAST];
+    static int tagcount = 0 ;
+    int		i;					/* Loop index */
+    int		j;					/* Loop index */
+
+    switch (task)
+    {
+      case TIS_STORE:
+        if ( tagcount < (FIELD_LAST - 1) )
+        {
+            for ( j = 0 ; j < tagcount ; ++j )
+            {					/* Do not add duplicate tag */
+                if ( TIFFignoretags [j] == TIFFtagID )
+                    return (TRUE) ;
+            }
+            TIFFignoretags [tagcount++] = TIFFtagID ;
+            return (TRUE) ;
+        }
+        break ;
+
+      case TIS_EXTRACT:
+        for ( i = 0 ; i < tagcount ; ++i )
+        {
+            if ( TIFFignoretags [i] == TIFFtagID )
+                return (TRUE) ;
+        }
+        break;
+
+      case TIS_EMPTY:
+        tagcount = 0 ;			/* Clear the list */
+        return (TRUE) ;
+
+      default:
+        break;
+    }
+
+    return (FALSE);
+}
+
+/* vim: set ts=8 sts=8 sw=8 noet: */
diff --git a/uppsrc/plugin/tif/lib/tif_dir.h b/uppsrc/plugin/tif/lib/tif_dir.h
new file mode 100644
index 000000000..db086d801
--- /dev/null
+++ b/uppsrc/plugin/tif/lib/tif_dir.h
@@ -0,0 +1,199 @@
+/* $Id: tif_dir.h,v 1.28 2005/12/26 14:31:25 dron Exp $ */
+
+/*
+ * Copyright (c) 1988-1997 Sam Leffler
+ * Copyright (c) 1991-1997 Silicon Graphics, Inc.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and
+ * its documentation for any purpose is hereby granted without fee, provided
+ * that (i) the above copyright notices and this permission notice appear in
+ * all copies of the software and related documentation, and (ii) the names of
+ * Sam Leffler and Silicon Graphics may not be used in any advertising or
+ * publicity relating to the software without the specific, prior written
+ * permission of Sam Leffler and Silicon Graphics.
+ *
+ * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+ * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
+ * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
+ * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+ * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
+ * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.
+ */
+
+#ifndef _TIFFDIR_
+#define	_TIFFDIR_
+/*
+ * ``Library-private'' Directory-related Definitions.
+ */
+
+/*
+ * Internal format of a TIFF directory entry.
+ */
+typedef	struct {
+#define	FIELD_SETLONGS	4
+	/* bit vector of fields that are set */
+	unsigned long	td_fieldsset[FIELD_SETLONGS];
+
+	uint32	td_imagewidth, td_imagelength, td_imagedepth;
+	uint32	td_tilewidth, td_tilelength, td_tiledepth;
+	uint32	td_subfiletype;
+	uint16	td_bitspersample;
+	uint16	td_sampleformat;
+	uint16	td_compression;
+	uint16	td_photometric;
+	uint16	td_threshholding;
+	uint16	td_fillorder;
+	uint16	td_orientation;
+	uint16	td_samplesperpixel;
+	uint32	td_rowsperstrip;
+	uint16	td_minsamplevalue, td_maxsamplevalue;
+	double	td_sminsamplevalue, td_smaxsamplevalue;
+	float	td_xresolution, td_yresolution;
+	uint16	td_resolutionunit;
+	uint16	td_planarconfig;
+	float	td_xposition, td_yposition;
+	uint16	td_pagenumber[2];
+	uint16*	td_colormap[3];
+	uint16	td_halftonehints[2];
+	uint16	td_extrasamples;
+	uint16*	td_sampleinfo;
+	tstrip_t td_stripsperimage;
+	tstrip_t td_nstrips;		/* size of offset & bytecount arrays */
+	uint32*	td_stripoffset;
+	uint32*	td_stripbytecount;
+	int	td_stripbytecountsorted; /* is the bytecount array sorted ascending? */
+	uint16	td_nsubifd;
+	uint32*	td_subifd;
+	/* YCbCr parameters */
+	uint16	td_ycbcrsubsampling[2];
+	uint16	td_ycbcrpositioning;
+	/* Colorimetry parameters */
+	uint16*	td_transferfunction[3];
+	/* CMYK parameters */
+	int	td_inknameslen;
+	char*	td_inknames;
+
+	int     td_customValueCount;
+        TIFFTagValue *td_customValues;
+} TIFFDirectory;
+
+/*
+ * Field flags used to indicate fields that have
+ * been set in a directory, and to reference fields
+ * when manipulating a directory.
+ */
+
+/*
+ * FIELD_IGNORE is used to signify tags that are to
+ * be processed but otherwise ignored.  This permits
+ * antiquated tags to be quietly read and discarded.
+ * Note that a bit *is* allocated for ignored tags;
+ * this is understood by the directory reading logic
+ * which uses this fact to avoid special-case handling
+ */
+#define	FIELD_IGNORE			0
+
+/* multi-item fields */
+#define	FIELD_IMAGEDIMENSIONS		1
+#define FIELD_TILEDIMENSIONS		2
+#define	FIELD_RESOLUTION		3
+#define	FIELD_POSITION			4
+
+/* single-item fields */
+#define	FIELD_SUBFILETYPE		5
+#define	FIELD_BITSPERSAMPLE		6
+#define	FIELD_COMPRESSION		7
+#define	FIELD_PHOTOMETRIC		8
+#define	FIELD_THRESHHOLDING		9
+#define	FIELD_FILLORDER			10
+#define	FIELD_ORIENTATION		15
+#define	FIELD_SAMPLESPERPIXEL		16
+#define	FIELD_ROWSPERSTRIP		17
+#define	FIELD_MINSAMPLEVALUE		18
+#define	FIELD_MAXSAMPLEVALUE		19
+#define	FIELD_PLANARCONFIG		20
+#define	FIELD_RESOLUTIONUNIT		22
+#define	FIELD_PAGENUMBER		23
+#define	FIELD_STRIPBYTECOUNTS		24
+#define	FIELD_STRIPOFFSETS		25
+#define	FIELD_COLORMAP			26
+#define	FIELD_EXTRASAMPLES		31
+#define FIELD_SAMPLEFORMAT		32
+#define	FIELD_SMINSAMPLEVALUE		33
+#define	FIELD_SMAXSAMPLEVALUE		34
+#define FIELD_IMAGEDEPTH		35
+#define FIELD_TILEDEPTH			36
+#define	FIELD_HALFTONEHINTS		37
+#define FIELD_YCBCRSUBSAMPLING		39
+#define FIELD_YCBCRPOSITIONING		40
+#define	FIELD_TRANSFERFUNCTION		44
+#define	FIELD_INKNAMES			46
+#define	FIELD_SUBIFD			49
+/*      FIELD_CUSTOM (see tiffio.h)     65 */
+/* end of support for well-known tags; codec-private tags follow */
+#define	FIELD_CODEC			66	/* base of codec-private tags */
+
+
+/*
+ * Pseudo-tags don't normally need field bits since they
+ * are not written to an output file (by definition).
+ * The library also has express logic to always query a
+ * codec for a pseudo-tag so allocating a field bit for
+ * one is a waste.   If codec wants to promote the notion
+ * of a pseudo-tag being ``set'' or ``unset'' then it can
+ * do using internal state flags without polluting the
+ * field bit space defined for real tags.
+ */
+#define	FIELD_PSEUDO			0
+
+#define	FIELD_LAST			(32*FIELD_SETLONGS-1)
+
+#define	TIFFExtractData(tif, type, v) \
+    ((uint32) ((tif)->tif_header.tiff_magic == TIFF_BIGENDIAN ? \
+        ((v) >> (tif)->tif_typeshift[type]) & (tif)->tif_typemask[type] : \
+	(v) & (tif)->tif_typemask[type]))
+#define	TIFFInsertData(tif, type, v) \
+    ((uint32) ((tif)->tif_header.tiff_magic == TIFF_BIGENDIAN ? \
+        ((v) & (tif)->tif_typemask[type]) << (tif)->tif_typeshift[type] : \
+	(v) & (tif)->tif_typemask[type]))
+
+
+#define BITn(n)				(((unsigned long)1L)<<((n)&0x1f))
+#define BITFIELDn(tif, n)		((tif)->tif_dir.td_fieldsset[(n)/32])
+#define TIFFFieldSet(tif, field)	(BITFIELDn(tif, field) & BITn(field))
+#define TIFFSetFieldBit(tif, field)	(BITFIELDn(tif, field) |= BITn(field))
+#define TIFFClrFieldBit(tif, field)	(BITFIELDn(tif, field) &= ~BITn(field))
+
+#define	FieldSet(fields, f)		(fields[(f)/32] & BITn(f))
+#define	ResetFieldBit(fields, f)	(fields[(f)/32] &= ~BITn(f))
+
+#if defined(__cplusplus)
+extern "C" {
+#endif
+extern	const TIFFFieldInfo *_TIFFGetFieldInfo(size_t *);
+extern	const TIFFFieldInfo *_TIFFGetExifFieldInfo(size_t *);
+extern	void _TIFFSetupFieldInfo(TIFF*, const TIFFFieldInfo[], size_t);
+extern	void _TIFFPrintFieldInfo(TIFF*, FILE*);
+extern	TIFFDataType _TIFFSampleToTagType(TIFF*);
+extern  const TIFFFieldInfo* _TIFFFindOrRegisterFieldInfo( TIFF *tif,
+							   ttag_t tag,
+							   TIFFDataType dt );
+extern  TIFFFieldInfo* _TIFFCreateAnonFieldInfo( TIFF *tif, ttag_t tag,
+                                                 TIFFDataType dt );
+
+#define _TIFFMergeFieldInfo	    TIFFMergeFieldInfo
+#define _TIFFFindFieldInfo	    TIFFFindFieldInfo
+#define _TIFFFindFieldInfoByName    TIFFFindFieldInfoByName
+#define _TIFFFieldWithTag	    TIFFFieldWithTag
+#define _TIFFFieldWithName	    TIFFFieldWithName
+
+#if defined(__cplusplus)
+}
+#endif
+#endif /* _TIFFDIR_ */
+
+/* vim: set ts=8 sts=8 sw=8 noet: */
diff --git a/uppsrc/plugin/tif/lib/tif_dirinfo.c b/uppsrc/plugin/tif/lib/tif_dirinfo.c
new file mode 100644
index 000000000..32d0c7250
--- /dev/null
+++ b/uppsrc/plugin/tif/lib/tif_dirinfo.c
@@ -0,0 +1,846 @@
+/* $Id: tif_dirinfo.c,v 1.62 2006/02/07 10:45:38 dron Exp $ */
+
+/*
+ * Copyright (c) 1988-1997 Sam Leffler
+ * Copyright (c) 1991-1997 Silicon Graphics, Inc.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and
+ * its documentation for any purpose is hereby granted without fee, provided
+ * that (i) the above copyright notices and this permission notice appear in
+ * all copies of the software and related documentation, and (ii) the names of
+ * Sam Leffler and Silicon Graphics may not be used in any advertising or
+ * publicity relating to the software without the specific, prior written
+ * permission of Sam Leffler and Silicon Graphics.
+ *
+ * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+ * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
+ * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
+ * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+ * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
+ * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.
+ */
+
+/*
+ * TIFF Library.
+ *
+ * Core Directory Tag Support.
+ */
+#include "tiffiop.h"
+#include <stdlib.h>
+
+/*
+ * NB: NB: THIS ARRAY IS ASSUMED TO BE SORTED BY TAG.
+ *       If a tag can have both LONG and SHORT types then the LONG must be
+ *       placed before the SHORT for writing to work properly.
+ *
+ * NOTE: The second field (field_readcount) and third field (field_writecount)
+ *       sometimes use the values TIFF_VARIABLE (-1), TIFF_VARIABLE2 (-3)
+ *       and TIFFTAG_SPP (-2). The macros should be used but would throw off
+ *       the formatting of the code, so please interprete the -1, -2 and -3
+ *       values accordingly.
+ */
+static const TIFFFieldInfo
+tiffFieldInfo[] = {
+    { TIFFTAG_SUBFILETYPE,	 1, 1,	TIFF_LONG,	FIELD_SUBFILETYPE,
+      1,	0,	"SubfileType" },
+/* XXX SHORT for compatibility w/ old versions of the library */
+    { TIFFTAG_SUBFILETYPE,	 1, 1,	TIFF_SHORT,	FIELD_SUBFILETYPE,
+      1,	0,	"SubfileType" },
+    { TIFFTAG_OSUBFILETYPE,	 1, 1,	TIFF_SHORT,	FIELD_SUBFILETYPE,
+      1,	0,	"OldSubfileType" },
+    { TIFFTAG_IMAGEWIDTH,	 1, 1,	TIFF_LONG,	FIELD_IMAGEDIMENSIONS,
+      0,	0,	"ImageWidth" },
+    { TIFFTAG_IMAGEWIDTH,	 1, 1,	TIFF_SHORT,	FIELD_IMAGEDIMENSIONS,
+      0,	0,	"ImageWidth" },
+    { TIFFTAG_IMAGELENGTH,	 1, 1,	TIFF_LONG,	FIELD_IMAGEDIMENSIONS,
+      1,	0,	"ImageLength" },
+    { TIFFTAG_IMAGELENGTH,	 1, 1,	TIFF_SHORT,	FIELD_IMAGEDIMENSIONS,
+      1,	0,	"ImageLength" },
+    { TIFFTAG_BITSPERSAMPLE,	-1,-1,	TIFF_SHORT,	FIELD_BITSPERSAMPLE,
+      0,	0,	"BitsPerSample" },
+/* XXX LONG for compatibility with some broken TIFF writers */
+    { TIFFTAG_BITSPERSAMPLE,	-1,-1,	TIFF_LONG,	FIELD_BITSPERSAMPLE,
+      0,	0,	"BitsPerSample" },
+    { TIFFTAG_COMPRESSION,	-1, 1,	TIFF_SHORT,	FIELD_COMPRESSION,
+      0,	0,	"Compression" },
+/* XXX LONG for compatibility with some broken TIFF writers */
+    { TIFFTAG_COMPRESSION,	-1, 1,	TIFF_LONG,	FIELD_COMPRESSION,
+      0,	0,	"Compression" },
+    { TIFFTAG_PHOTOMETRIC,	 1, 1,	TIFF_SHORT,	FIELD_PHOTOMETRIC,
+      0,	0,	"PhotometricInterpretation" },
+/* XXX LONG for compatibility with some broken TIFF writers */
+    { TIFFTAG_PHOTOMETRIC,	 1, 1,	TIFF_LONG,	FIELD_PHOTOMETRIC,
+      0,	0,	"PhotometricInterpretation" },
+    { TIFFTAG_THRESHHOLDING,	 1, 1,	TIFF_SHORT,	FIELD_THRESHHOLDING,
+      1,	0,	"Threshholding" },
+    { TIFFTAG_CELLWIDTH,	 1, 1,	TIFF_SHORT,	FIELD_IGNORE,
+      1,	0,	"CellWidth" },
+    { TIFFTAG_CELLLENGTH,	 1, 1,	TIFF_SHORT,	FIELD_IGNORE,
+      1,	0,	"CellLength" },
+    { TIFFTAG_FILLORDER,	 1, 1,	TIFF_SHORT,	FIELD_FILLORDER,
+      0,	0,	"FillOrder" },
+    { TIFFTAG_DOCUMENTNAME,	-1,-1,	TIFF_ASCII,	FIELD_CUSTOM,
+      1,	0,	"DocumentName" },
+    { TIFFTAG_IMAGEDESCRIPTION,	-1,-1,	TIFF_ASCII,	FIELD_CUSTOM,
+      1,	0,	"ImageDescription" },
+    { TIFFTAG_MAKE,		-1,-1,	TIFF_ASCII,	FIELD_CUSTOM,
+      1,	0,	"Make" },
+    { TIFFTAG_MODEL,		-1,-1,	TIFF_ASCII,	FIELD_CUSTOM,
+      1,	0,	"Model" },
+    { TIFFTAG_STRIPOFFSETS,	-1,-1,	TIFF_LONG,	FIELD_STRIPOFFSETS,
+      0,	0,	"StripOffsets" },
+    { TIFFTAG_STRIPOFFSETS,	-1,-1,	TIFF_SHORT,	FIELD_STRIPOFFSETS,
+      0,	0,	"StripOffsets" },
+    { TIFFTAG_ORIENTATION,	 1, 1,	TIFF_SHORT,	FIELD_ORIENTATION,
+      0,	0,	"Orientation" },
+    { TIFFTAG_SAMPLESPERPIXEL,	 1, 1,	TIFF_SHORT,	FIELD_SAMPLESPERPIXEL,
+      0,	0,	"SamplesPerPixel" },
+    { TIFFTAG_ROWSPERSTRIP,	 1, 1,	TIFF_LONG,	FIELD_ROWSPERSTRIP,
+      0,	0,	"RowsPerStrip" },
+    { TIFFTAG_ROWSPERSTRIP,	 1, 1,	TIFF_SHORT,	FIELD_ROWSPERSTRIP,
+      0,	0,	"RowsPerStrip" },
+    { TIFFTAG_STRIPBYTECOUNTS,	-1,-1,	TIFF_LONG,	FIELD_STRIPBYTECOUNTS,
+      0,	0,	"StripByteCounts" },
+    { TIFFTAG_STRIPBYTECOUNTS,	-1,-1,	TIFF_SHORT,	FIELD_STRIPBYTECOUNTS,
+      0,	0,	"StripByteCounts" },
+    { TIFFTAG_MINSAMPLEVALUE,	-2,-1,	TIFF_SHORT,	FIELD_MINSAMPLEVALUE,
+      1,	0,	"MinSampleValue" },
+    { TIFFTAG_MAXSAMPLEVALUE,	-2,-1,	TIFF_SHORT,	FIELD_MAXSAMPLEVALUE,
+      1,	0,	"MaxSampleValue" },
+    { TIFFTAG_XRESOLUTION,	 1, 1,	TIFF_RATIONAL,	FIELD_RESOLUTION,
+      1,	0,	"XResolution" },
+    { TIFFTAG_YRESOLUTION,	 1, 1,	TIFF_RATIONAL,	FIELD_RESOLUTION,
+      1,	0,	"YResolution" },
+    { TIFFTAG_PLANARCONFIG,	 1, 1,	TIFF_SHORT,	FIELD_PLANARCONFIG,
+      0,	0,	"PlanarConfiguration" },
+    { TIFFTAG_PAGENAME,		-1,-1,	TIFF_ASCII,	FIELD_CUSTOM,
+      1,	0,	"PageName" },
+    { TIFFTAG_XPOSITION,	 1, 1,	TIFF_RATIONAL,	FIELD_POSITION,
+      1,	0,	"XPosition" },
+    { TIFFTAG_YPOSITION,	 1, 1,	TIFF_RATIONAL,	FIELD_POSITION,
+      1,	0,	"YPosition" },
+    { TIFFTAG_FREEOFFSETS,	-1,-1,	TIFF_LONG,	FIELD_IGNORE,
+      0,	0,	"FreeOffsets" },
+    { TIFFTAG_FREEBYTECOUNTS,	-1,-1,	TIFF_LONG,	FIELD_IGNORE,
+      0,	0,	"FreeByteCounts" },
+    { TIFFTAG_GRAYRESPONSEUNIT,	 1, 1,	TIFF_SHORT,	FIELD_IGNORE,
+      1,	0,	"GrayResponseUnit" },
+    { TIFFTAG_GRAYRESPONSECURVE,-1,-1,	TIFF_SHORT,	FIELD_IGNORE,
+      1,	0,	"GrayResponseCurve" },
+    { TIFFTAG_RESOLUTIONUNIT,	 1, 1,	TIFF_SHORT,	FIELD_RESOLUTIONUNIT,
+      1,	0,	"ResolutionUnit" },
+    { TIFFTAG_PAGENUMBER,	 2, 2,	TIFF_SHORT,	FIELD_PAGENUMBER,
+      1,	0,	"PageNumber" },
+    { TIFFTAG_COLORRESPONSEUNIT, 1, 1,	TIFF_SHORT,	FIELD_IGNORE,
+      1,	0,	"ColorResponseUnit" },
+    { TIFFTAG_TRANSFERFUNCTION,	-1,-1,	TIFF_SHORT,	FIELD_TRANSFERFUNCTION,
+      1,	0,	"TransferFunction" },
+    { TIFFTAG_SOFTWARE,		-1,-1,	TIFF_ASCII,	FIELD_CUSTOM,
+      1,	0,	"Software" },
+    { TIFFTAG_DATETIME,		20,20,	TIFF_ASCII,	FIELD_CUSTOM,
+      1,	0,	"DateTime" },
+    { TIFFTAG_ARTIST,		-1,-1,	TIFF_ASCII,	FIELD_CUSTOM,
+      1,	0,	"Artist" },
+    { TIFFTAG_HOSTCOMPUTER,	-1,-1,	TIFF_ASCII,	FIELD_CUSTOM,
+      1,	0,	"HostComputer" },
+    { TIFFTAG_WHITEPOINT,	 2, 2,	TIFF_RATIONAL,	FIELD_CUSTOM,
+      1,	0,	"WhitePoint" },
+    { TIFFTAG_PRIMARYCHROMATICITIES,6,6,TIFF_RATIONAL,	FIELD_CUSTOM,
+      1,	0,	"PrimaryChromaticities" },
+    { TIFFTAG_COLORMAP,		-1,-1,	TIFF_SHORT,	FIELD_COLORMAP,
+      1,	0,	"ColorMap" },
+    { TIFFTAG_HALFTONEHINTS,	 2, 2,	TIFF_SHORT,	FIELD_HALFTONEHINTS,
+      1,	0,	"HalftoneHints" },
+    { TIFFTAG_TILEWIDTH,	 1, 1,	TIFF_LONG,	FIELD_TILEDIMENSIONS,
+      0,	0,	"TileWidth" },
+    { TIFFTAG_TILEWIDTH,	 1, 1,	TIFF_SHORT,	FIELD_TILEDIMENSIONS,
+      0,	0,	"TileWidth" },
+    { TIFFTAG_TILELENGTH,	 1, 1,	TIFF_LONG,	FIELD_TILEDIMENSIONS,
+      0,	0,	"TileLength" },
+    { TIFFTAG_TILELENGTH,	 1, 1,	TIFF_SHORT,	FIELD_TILEDIMENSIONS,
+      0,	0,	"TileLength" },
+    { TIFFTAG_TILEOFFSETS,	-1, 1,	TIFF_LONG,	FIELD_STRIPOFFSETS,
+      0,	0,	"TileOffsets" },
+    { TIFFTAG_TILEBYTECOUNTS,	-1, 1,	TIFF_LONG,	FIELD_STRIPBYTECOUNTS,
+      0,	0,	"TileByteCounts" },
+    { TIFFTAG_TILEBYTECOUNTS,	-1, 1,	TIFF_SHORT,	FIELD_STRIPBYTECOUNTS,
+      0,	0,	"TileByteCounts" },
+    { TIFFTAG_SUBIFD,		-1,-1,	TIFF_IFD,	FIELD_SUBIFD,
+      1,	1,	"SubIFD" },
+    { TIFFTAG_SUBIFD,		-1,-1,	TIFF_LONG,	FIELD_SUBIFD,
+      1,	1,	"SubIFD" },
+    { TIFFTAG_INKSET,		 1, 1,	TIFF_SHORT,	FIELD_CUSTOM,
+      0,	0,	"InkSet" },
+    { TIFFTAG_INKNAMES,		-1,-1,	TIFF_ASCII,	FIELD_INKNAMES,
+      1,	1,	"InkNames" },
+    { TIFFTAG_NUMBEROFINKS,	 1, 1,	TIFF_SHORT,	FIELD_CUSTOM,
+      1,	0,	"NumberOfInks" },
+    { TIFFTAG_DOTRANGE,		 2, 2,	TIFF_SHORT,	FIELD_CUSTOM,
+      0,	0,	"DotRange" },
+    { TIFFTAG_DOTRANGE,		 2, 2,	TIFF_BYTE,	FIELD_CUSTOM,
+      0,	0,	"DotRange" },
+    { TIFFTAG_TARGETPRINTER,	-1,-1,	TIFF_ASCII,	FIELD_CUSTOM,
+      1,	0,	"TargetPrinter" },
+    { TIFFTAG_EXTRASAMPLES,	-1,-1,	TIFF_SHORT,	FIELD_EXTRASAMPLES,
+      0,	1,	"ExtraSamples" },
+/* XXX for bogus Adobe Photoshop v2.5 files */
+    { TIFFTAG_EXTRASAMPLES,	-1,-1,	TIFF_BYTE,	FIELD_EXTRASAMPLES,
+      0,	1,	"ExtraSamples" },
+    { TIFFTAG_SAMPLEFORMAT,	-1,-1,	TIFF_SHORT,	FIELD_SAMPLEFORMAT,
+      0,	0,	"SampleFormat" },
+    { TIFFTAG_SMINSAMPLEVALUE,	-2,-1,	TIFF_ANY,	FIELD_SMINSAMPLEVALUE,
+      1,	0,	"SMinSampleValue" },
+    { TIFFTAG_SMAXSAMPLEVALUE,	-2,-1,	TIFF_ANY,	FIELD_SMAXSAMPLEVALUE,
+      1,	0,	"SMaxSampleValue" },
+    { TIFFTAG_CLIPPATH,		-1, -3, TIFF_BYTE,	FIELD_CUSTOM,
+      0,	1,	"ClipPath" },
+    { TIFFTAG_XCLIPPATHUNITS,	 1, 1,	TIFF_SLONG,	FIELD_CUSTOM,
+      0,	0,	"XClipPathUnits" },
+    { TIFFTAG_XCLIPPATHUNITS,	 1, 1,	TIFF_SSHORT,	FIELD_CUSTOM,
+      0,	0,	"XClipPathUnits" },
+    { TIFFTAG_XCLIPPATHUNITS,	 1, 1,	TIFF_SBYTE,	FIELD_CUSTOM,
+      0,	0,	"XClipPathUnits" },
+    { TIFFTAG_YCLIPPATHUNITS,	 1, 1,	TIFF_SLONG,	FIELD_CUSTOM,
+      0,	0,	"YClipPathUnits" },
+    { TIFFTAG_YCLIPPATHUNITS,	 1, 1,	TIFF_SSHORT,	FIELD_CUSTOM,
+      0,	0,	"YClipPathUnits" },
+    { TIFFTAG_YCLIPPATHUNITS,	 1, 1,	TIFF_SBYTE,	FIELD_CUSTOM,
+      0,	0,	"YClipPathUnits" },
+    { TIFFTAG_YCBCRCOEFFICIENTS, 3, 3,	TIFF_RATIONAL,	FIELD_CUSTOM,
+      0,	0,	"YCbCrCoefficients" },
+    { TIFFTAG_YCBCRSUBSAMPLING,	 2, 2,	TIFF_SHORT,	FIELD_YCBCRSUBSAMPLING,
+      0,	0,	"YCbCrSubsampling" },
+    { TIFFTAG_YCBCRPOSITIONING,	 1, 1,	TIFF_SHORT,	FIELD_YCBCRPOSITIONING,
+      0,	0,	"YCbCrPositioning" },
+    { TIFFTAG_REFERENCEBLACKWHITE, 6, 6, TIFF_RATIONAL,	FIELD_CUSTOM,
+      1,	0,	"ReferenceBlackWhite" },
+/* XXX temporarily accept LONG for backwards compatibility */
+    { TIFFTAG_REFERENCEBLACKWHITE, 6, 6, TIFF_LONG,	FIELD_CUSTOM,
+      1,	0,	"ReferenceBlackWhite" },
+    { TIFFTAG_XMLPACKET,	-3,-3,	TIFF_BYTE,	FIELD_CUSTOM,
+      0,	1,	"XMLPacket" },
+/* begin SGI tags */
+    { TIFFTAG_MATTEING,		 1, 1,	TIFF_SHORT,	FIELD_EXTRASAMPLES,
+      0,	0,	"Matteing" },
+    { TIFFTAG_DATATYPE,		-2,-1,	TIFF_SHORT,	FIELD_SAMPLEFORMAT,
+      0,	0,	"DataType" },
+    { TIFFTAG_IMAGEDEPTH,	 1, 1,	TIFF_LONG,	FIELD_IMAGEDEPTH,
+      0,	0,	"ImageDepth" },
+    { TIFFTAG_IMAGEDEPTH,	 1, 1,	TIFF_SHORT,	FIELD_IMAGEDEPTH,
+      0,	0,	"ImageDepth" },
+    { TIFFTAG_TILEDEPTH,	 1, 1,	TIFF_LONG,	FIELD_TILEDEPTH,
+      0,	0,	"TileDepth" },
+    { TIFFTAG_TILEDEPTH,	 1, 1,	TIFF_SHORT,	FIELD_TILEDEPTH,
+      0,	0,	"TileDepth" },
+/* end SGI tags */
+/* begin Pixar tags */
+    { TIFFTAG_PIXAR_IMAGEFULLWIDTH,  1, 1, TIFF_LONG,	FIELD_CUSTOM,
+      1,	0,	"ImageFullWidth" },
+    { TIFFTAG_PIXAR_IMAGEFULLLENGTH, 1, 1, TIFF_LONG,	FIELD_CUSTOM,
+      1,	0,	"ImageFullLength" },
+    { TIFFTAG_PIXAR_TEXTUREFORMAT,  -1, -1, TIFF_ASCII,	FIELD_CUSTOM,
+      1,	0,	"TextureFormat" },
+    { TIFFTAG_PIXAR_WRAPMODES,	    -1, -1, TIFF_ASCII,	FIELD_CUSTOM,
+      1,	0,	"TextureWrapModes" },
+    { TIFFTAG_PIXAR_FOVCOT,	     1, 1, TIFF_FLOAT,	FIELD_CUSTOM,
+      1,	0,	"FieldOfViewCotangent" },
+    { TIFFTAG_PIXAR_MATRIX_WORLDTOSCREEN,	16,16,	TIFF_FLOAT,
+      FIELD_CUSTOM,	1,	0,	"MatrixWorldToScreen" },
+    { TIFFTAG_PIXAR_MATRIX_WORLDTOCAMERA,	16,16,	TIFF_FLOAT,
+       FIELD_CUSTOM,	1,	0,	"MatrixWorldToCamera" },
+    { TIFFTAG_COPYRIGHT,	-1, -1,	TIFF_ASCII,	FIELD_CUSTOM,
+      1,	0,	"Copyright" },
+/* end Pixar tags */
+    { TIFFTAG_RICHTIFFIPTC, -3, -3,	TIFF_LONG,	FIELD_CUSTOM,
+      0,    1,   "RichTIFFIPTC" },
+    { TIFFTAG_PHOTOSHOP,    -3, -3,	TIFF_BYTE,	FIELD_CUSTOM,
+      0,    1,   "Photoshop" },
+    { TIFFTAG_EXIFIFD,		1, 1,	TIFF_LONG,	FIELD_CUSTOM,
+      0,	0,	"EXIFIFDOffset" },
+    { TIFFTAG_ICCPROFILE,	-3, -3,	TIFF_UNDEFINED,	FIELD_CUSTOM,
+      0,	1,	"ICC Profile" },
+    { TIFFTAG_GPSIFD,		1, 1,	TIFF_LONG,	FIELD_CUSTOM,
+      0,	0,	"GPSIFDOffset" },
+    { TIFFTAG_STONITS,		 1, 1,	TIFF_DOUBLE,	FIELD_CUSTOM,
+      0,	0,	"StoNits" },
+    { TIFFTAG_INTEROPERABILITYIFD, 1, 1, TIFF_LONG,	FIELD_CUSTOM,
+      0,	0,	"InteroperabilityIFDOffset" },
+/* begin DNG tags */
+    { TIFFTAG_DNGVERSION,	4, 4,	TIFF_BYTE,	FIELD_CUSTOM,
+      0,	0,	"DNGVersion" },
+    { TIFFTAG_DNGBACKWARDVERSION, 4, 4,	TIFF_BYTE,	FIELD_CUSTOM,
+      0,	0,	"DNGBackwardVersion" },
+    { TIFFTAG_UNIQUECAMERAMODEL,    -1, -1, TIFF_ASCII,	FIELD_CUSTOM,
+      1,	0,	"UniqueCameraModel" },
+    { TIFFTAG_LOCALIZEDCAMERAMODEL, -1, -1, TIFF_ASCII,	FIELD_CUSTOM,
+      1,	0,	"LocalizedCameraModel" },
+    { TIFFTAG_LOCALIZEDCAMERAMODEL, -1, -1, TIFF_BYTE,	FIELD_CUSTOM,
+      1,	1,	"LocalizedCameraModel" },
+    { TIFFTAG_CFAPLANECOLOR,	-1, -1,	TIFF_BYTE,	FIELD_CUSTOM,
+      0,	1,	"CFAPlaneColor" },
+    { TIFFTAG_CFALAYOUT,	1, 1,	TIFF_SHORT,	FIELD_CUSTOM,
+      0,	0,	"CFALayout" },
+    { TIFFTAG_LINEARIZATIONTABLE, -1, -1, TIFF_SHORT,	FIELD_CUSTOM,
+      0,	1,	"LinearizationTable" },
+    { TIFFTAG_BLACKLEVELREPEATDIM, 2, 2, TIFF_SHORT,	FIELD_CUSTOM,
+      0,	0,	"BlackLevelRepeatDim" },
+    { TIFFTAG_BLACKLEVEL,	-1, -1,	TIFF_LONG,	FIELD_CUSTOM,
+      0,	1,	"BlackLevel" },
+    { TIFFTAG_BLACKLEVEL,	-1, -1,	TIFF_SHORT,	FIELD_CUSTOM,
+      0,	1,	"BlackLevel" },
+    { TIFFTAG_BLACKLEVEL,	-1, -1,	TIFF_RATIONAL,	FIELD_CUSTOM,
+      0,	1,	"BlackLevel" },
+    { TIFFTAG_BLACKLEVELDELTAH,	-1, -1,	TIFF_SRATIONAL,	FIELD_CUSTOM,
+      0,	1,	"BlackLevelDeltaH" },
+    { TIFFTAG_BLACKLEVELDELTAV,	-1, -1,	TIFF_SRATIONAL,	FIELD_CUSTOM,
+      0,	1,	"BlackLevelDeltaV" },
+    { TIFFTAG_WHITELEVEL,	-2, -2,	TIFF_LONG,	FIELD_CUSTOM,
+      0,	0,	"WhiteLevel" },
+    { TIFFTAG_WHITELEVEL,	-2, -2,	TIFF_SHORT,	FIELD_CUSTOM,
+      0,	0,	"WhiteLevel" },
+    { TIFFTAG_DEFAULTSCALE,	2, 2,	TIFF_RATIONAL,	FIELD_CUSTOM,
+      0,	0,	"DefaultScale" },
+    { TIFFTAG_BESTQUALITYSCALE,	1, 1,	TIFF_RATIONAL,	FIELD_CUSTOM,
+      0,	0,	"BestQualityScale" },
+    { TIFFTAG_DEFAULTCROPORIGIN,	2, 2,	TIFF_LONG,	FIELD_CUSTOM,
+      0,	0,	"DefaultCropOrigin" },
+    { TIFFTAG_DEFAULTCROPORIGIN,	2, 2,	TIFF_SHORT,	FIELD_CUSTOM,
+      0,	0,	"DefaultCropOrigin" },
+    { TIFFTAG_DEFAULTCROPORIGIN,	2, 2,	TIFF_RATIONAL,	FIELD_CUSTOM,
+      0,	0,	"DefaultCropOrigin" },
+    { TIFFTAG_DEFAULTCROPSIZE,	2, 2,	TIFF_LONG,	FIELD_CUSTOM,
+      0,	0,	"DefaultCropSize" },
+    { TIFFTAG_DEFAULTCROPSIZE,	2, 2,	TIFF_SHORT,	FIELD_CUSTOM,
+      0,	0,	"DefaultCropSize" },
+    { TIFFTAG_DEFAULTCROPSIZE,	2, 2,	TIFF_RATIONAL,	FIELD_CUSTOM,
+      0,	0,	"DefaultCropSize" },
+    { TIFFTAG_COLORMATRIX1,	-1, -1,	TIFF_SRATIONAL,	FIELD_CUSTOM,
+      0,	1,	"ColorMatrix1" },
+    { TIFFTAG_COLORMATRIX2,	-1, -1,	TIFF_SRATIONAL,	FIELD_CUSTOM,
+      0,	1,	"ColorMatrix2" },
+    { TIFFTAG_CAMERACALIBRATION1,	-1, -1,	TIFF_SRATIONAL,	FIELD_CUSTOM,
+      0,	1,	"CameraCalibration1" },
+    { TIFFTAG_CAMERACALIBRATION2,	-1, -1,	TIFF_SRATIONAL,	FIELD_CUSTOM,
+      0,	1,	"CameraCalibration2" },
+    { TIFFTAG_REDUCTIONMATRIX1,	-1, -1,	TIFF_SRATIONAL,	FIELD_CUSTOM,
+      0,	1,	"ReductionMatrix1" },
+    { TIFFTAG_REDUCTIONMATRIX2,	-1, -1,	TIFF_SRATIONAL,	FIELD_CUSTOM,
+      0,	1,	"ReductionMatrix2" },
+    { TIFFTAG_ANALOGBALANCE,	-1, -1,	TIFF_RATIONAL,	FIELD_CUSTOM,
+      0,	1,	"AnalogBalance" },
+    { TIFFTAG_ASSHOTNEUTRAL,	-1, -1,	TIFF_SHORT,	FIELD_CUSTOM,
+      0,	1,	"AsShotNeutral" },
+    { TIFFTAG_ASSHOTNEUTRAL,	-1, -1,	TIFF_RATIONAL,	FIELD_CUSTOM,
+      0,	1,	"AsShotNeutral" },
+    { TIFFTAG_ASSHOTWHITEXY,	2, 2,	TIFF_RATIONAL,	FIELD_CUSTOM,
+      0,	0,	"AsShotWhiteXY" },
+    { TIFFTAG_BASELINEEXPOSURE,	1, 1,	TIFF_SRATIONAL,	FIELD_CUSTOM,
+      0,	0,	"BaselineExposure" },
+    { TIFFTAG_BASELINENOISE,	1, 1,	TIFF_RATIONAL,	FIELD_CUSTOM,
+      0,	0,	"BaselineNoise" },
+    { TIFFTAG_BASELINESHARPNESS,	1, 1,	TIFF_RATIONAL,	FIELD_CUSTOM,
+      0,	0,	"BaselineSharpness" },
+    { TIFFTAG_BAYERGREENSPLIT,	1, 1,	TIFF_LONG,	FIELD_CUSTOM,
+      0,	0,	"BayerGreenSplit" },
+    { TIFFTAG_LINEARRESPONSELIMIT,	1, 1,	TIFF_RATIONAL,	FIELD_CUSTOM,
+      0,	0,	"LinearResponseLimit" },
+    { TIFFTAG_CAMERASERIALNUMBER,    -1, -1, TIFF_ASCII,	FIELD_CUSTOM,
+      1,	0,	"CameraSerialNumber" },
+    { TIFFTAG_LENSINFO,	4, 4,	TIFF_RATIONAL,	FIELD_CUSTOM,
+      0,	0,	"LensInfo" },
+    { TIFFTAG_CHROMABLURRADIUS,	1, 1,	TIFF_RATIONAL,	FIELD_CUSTOM,
+      0,	0,	"ChromaBlurRadius" },
+    { TIFFTAG_ANTIALIASSTRENGTH,	1, 1,	TIFF_RATIONAL,	FIELD_CUSTOM,
+      0,	0,	"AntiAliasStrength" },
+    { TIFFTAG_SHADOWSCALE,	1, 1,	TIFF_RATIONAL,	FIELD_CUSTOM,
+      0,	0,	"ShadowScale" },
+    { TIFFTAG_DNGPRIVATEDATA,    -1, -1, TIFF_BYTE,	FIELD_CUSTOM,
+      0,	1,	"DNGPrivateData" },
+    { TIFFTAG_MAKERNOTESAFETY,	1, 1,	TIFF_SHORT,	FIELD_CUSTOM,
+      0,	0,	"MakerNoteSafety" },
+    { TIFFTAG_CALIBRATIONILLUMINANT1,	1, 1,	TIFF_SHORT,	FIELD_CUSTOM,
+      0,	0,	"CalibrationIlluminant1" },
+    { TIFFTAG_CALIBRATIONILLUMINANT2,	1, 1,	TIFF_SHORT,	FIELD_CUSTOM,
+      0,	0,	"CalibrationIlluminant2" },
+    { TIFFTAG_RAWDATAUNIQUEID,	16, 16,	TIFF_BYTE,	FIELD_CUSTOM,
+      0,	0,	"RawDataUniqueID" },
+    { TIFFTAG_ORIGINALRAWFILENAME,    -1, -1, TIFF_ASCII,	FIELD_CUSTOM,
+      1,	0,	"OriginalRawFileName" },
+    { TIFFTAG_ORIGINALRAWFILENAME,    -1, -1, TIFF_BYTE,	FIELD_CUSTOM,
+      1,	1,	"OriginalRawFileName" },
+    { TIFFTAG_ORIGINALRAWFILEDATA,    -1, -1, TIFF_UNDEFINED,	FIELD_CUSTOM,
+      0,	1,	"OriginalRawFileData" },
+    { TIFFTAG_ACTIVEAREA,	4, 4,	TIFF_LONG,	FIELD_CUSTOM,
+      0,	0,	"ActiveArea" },
+    { TIFFTAG_ACTIVEAREA,	4, 4,	TIFF_SHORT,	FIELD_CUSTOM,
+      0,	0,	"ActiveArea" },
+    { TIFFTAG_MASKEDAREAS,	-1, -1,	TIFF_LONG,	FIELD_CUSTOM,
+      0,	1,	"MaskedAreas" },
+    { TIFFTAG_ASSHOTICCPROFILE,    -1, -1, TIFF_UNDEFINED,	FIELD_CUSTOM,
+      0,	1,	"AsShotICCProfile" },
+    { TIFFTAG_ASSHOTPREPROFILEMATRIX,	-1, -1,	TIFF_SRATIONAL,	FIELD_CUSTOM,
+      0,	1,	"AsShotPreProfileMatrix" },
+    { TIFFTAG_CURRENTICCPROFILE,    -1, -1, TIFF_UNDEFINED,	FIELD_CUSTOM,
+      0,	1,	"CurrentICCProfile" },
+    { TIFFTAG_CURRENTPREPROFILEMATRIX,	-1, -1,	TIFF_SRATIONAL,	FIELD_CUSTOM,
+      0,	1,	"CurrentPreProfileMatrix" },
+/* end DNG tags */
+};
+
+static const TIFFFieldInfo
+exifFieldInfo[] = {
+    { EXIFTAG_EXPOSURETIME,	1, 1,		TIFF_RATIONAL,	FIELD_CUSTOM,
+      1,	0,	"ExposureTime" },
+    { EXIFTAG_FNUMBER,		1, 1,		TIFF_RATIONAL,	FIELD_CUSTOM,
+      1,	0,	"FNumber" },
+    { EXIFTAG_EXPOSUREPROGRAM,	1, 1,		TIFF_SHORT,	FIELD_CUSTOM,
+      1,	0,	"ExposureProgram" },
+    { EXIFTAG_SPECTRALSENSITIVITY,    -1, -1,	TIFF_ASCII,	FIELD_CUSTOM,
+      1,	0,	"SpectralSensitivity" },
+    { EXIFTAG_ISOSPEEDRATINGS,  -1, -1,		TIFF_SHORT,	FIELD_CUSTOM,
+      1,	1,	"ISOSpeedRatings" },
+    { EXIFTAG_OECF,	-1, -1,			TIFF_UNDEFINED,	FIELD_CUSTOM,
+      1,	1,	"OptoelectricConversionFactor" },
+    { EXIFTAG_EXIFVERSION,	4, 4,		TIFF_UNDEFINED,	FIELD_CUSTOM,
+      1,	0,	"ExifVersion" },
+    { EXIFTAG_DATETIMEORIGINAL,	20, 20,		TIFF_ASCII,	FIELD_CUSTOM,
+      1,	0,	"DateTimeOriginal" },
+    { EXIFTAG_DATETIMEDIGITIZED, 20, 20,	TIFF_ASCII,	FIELD_CUSTOM,
+      1,	0,	"DateTimeDigitized" },
+    { EXIFTAG_COMPONENTSCONFIGURATION,	 4, 4,	TIFF_UNDEFINED,	FIELD_CUSTOM,
+      1,	0,	"ComponentsConfiguration" },
+    { EXIFTAG_COMPRESSEDBITSPERPIXEL,	 1, 1,	TIFF_RATIONAL,	FIELD_CUSTOM,
+      1,	0,	"CompressedBitsPerPixel" },
+    { EXIFTAG_SHUTTERSPEEDVALUE,	1, 1,	TIFF_SRATIONAL,	FIELD_CUSTOM,
+      1,	0,	"ShutterSpeedValue" },
+    { EXIFTAG_APERTUREVALUE,	1, 1,		TIFF_RATIONAL,	FIELD_CUSTOM,
+      1,	0,	"ApertureValue" },
+    { EXIFTAG_BRIGHTNESSVALUE,	1, 1,		TIFF_SRATIONAL,	FIELD_CUSTOM,
+      1,	0,	"BrightnessValue" },
+    { EXIFTAG_EXPOSUREBIASVALUE,	1, 1,	TIFF_SRATIONAL,	FIELD_CUSTOM,
+      1,	0,	"ExposureBiasValue" },
+    { EXIFTAG_MAXAPERTUREVALUE,	1, 1,		TIFF_RATIONAL,	FIELD_CUSTOM,
+      1,	0,	"MaxApertureValue" },
+    { EXIFTAG_SUBJECTDISTANCE,	1, 1,		TIFF_RATIONAL,	FIELD_CUSTOM,
+      1,	0,	"SubjectDistance" },
+    { EXIFTAG_METERINGMODE,	1, 1,		TIFF_SHORT,	FIELD_CUSTOM,
+      1,	0,	"MeteringMode" },
+    { EXIFTAG_LIGHTSOURCE,	1, 1,		TIFF_SHORT,	FIELD_CUSTOM,
+      1,	0,	"LightSource" },
+    { EXIFTAG_FLASH,	1, 1,			TIFF_SHORT,	FIELD_CUSTOM,
+      1,	0,	"Flash" },
+    { EXIFTAG_FOCALLENGTH,	1, 1,		TIFF_RATIONAL,	FIELD_CUSTOM,
+      1,	0,	"FocalLength" },
+    { EXIFTAG_SUBJECTAREA,	-1, -1,		TIFF_SHORT,	FIELD_CUSTOM,
+      1,	1,	"SubjectArea" },
+    { EXIFTAG_MAKERNOTE,	-1, -1,		TIFF_UNDEFINED,	FIELD_CUSTOM,
+      1,	1,	"MakerNote" },
+    { EXIFTAG_USERCOMMENT,	-1, -1,		TIFF_UNDEFINED,	FIELD_CUSTOM,
+      1,	1,	"UserComment" },
+    { EXIFTAG_SUBSECTIME,    -1, -1,		TIFF_ASCII,	FIELD_CUSTOM,
+      1,	0,	"SubSecTime" },
+    { EXIFTAG_SUBSECTIMEORIGINAL, -1, -1,	TIFF_ASCII,	FIELD_CUSTOM,
+      1,	0,	"SubSecTimeOriginal" },
+    { EXIFTAG_SUBSECTIMEDIGITIZED,-1, -1,	TIFF_ASCII,	FIELD_CUSTOM,
+      1,	0,	"SubSecTimeDigitized" },
+    { EXIFTAG_FLASHPIXVERSION,	4, 4,		TIFF_UNDEFINED,	FIELD_CUSTOM,
+      1,	0,	"FlashpixVersion" },
+    { EXIFTAG_PIXELXDIMENSION,	1, 1,		TIFF_LONG,	FIELD_CUSTOM,
+      1,	0,	"PixelXDimension" },
+    { EXIFTAG_PIXELXDIMENSION,	1, 1,		TIFF_SHORT,	FIELD_CUSTOM,
+      1,	0,	"PixelXDimension" },
+    { EXIFTAG_PIXELYDIMENSION,	1, 1,		TIFF_LONG,	FIELD_CUSTOM,
+      1,	0,	"PixelYDimension" },
+    { EXIFTAG_PIXELYDIMENSION,	1, 1,		TIFF_SHORT,	FIELD_CUSTOM,
+      1,	0,	"PixelYDimension" },
+    { EXIFTAG_RELATEDSOUNDFILE,	13, 13,		TIFF_ASCII,	FIELD_CUSTOM,
+      1,	0,	"RelatedSoundFile" },
+    { EXIFTAG_FLASHENERGY,	1, 1,		TIFF_RATIONAL,	FIELD_CUSTOM,
+      1,	0,	"FlashEnergy" },
+    { EXIFTAG_SPATIALFREQUENCYRESPONSE,	-1, -1,	TIFF_UNDEFINED,	FIELD_CUSTOM,
+      1,	1,	"SpatialFrequencyResponse" },
+    { EXIFTAG_FOCALPLANEXRESOLUTION,	1, 1,	TIFF_RATIONAL,	FIELD_CUSTOM,
+      1,	0,	"FocalPlaneXResolution" },
+    { EXIFTAG_FOCALPLANEYRESOLUTION,	1, 1,	TIFF_RATIONAL,	FIELD_CUSTOM,
+      1,	0,	"FocalPlaneYResolution" },
+    { EXIFTAG_FOCALPLANERESOLUTIONUNIT,	1, 1,	TIFF_SHORT,	FIELD_CUSTOM,
+      1,	0,	"FocalPlaneResolutionUnit" },
+    { EXIFTAG_SUBJECTLOCATION,	2, 2,		TIFF_SHORT,	FIELD_CUSTOM,
+      1,	0,	"SubjectLocation" },
+    { EXIFTAG_EXPOSUREINDEX,	1, 1,		TIFF_RATIONAL,	FIELD_CUSTOM,
+      1,	0,	"ExposureIndex" },
+    { EXIFTAG_SENSINGMETHOD,	1, 1,		TIFF_SHORT,	FIELD_CUSTOM,
+      1,	0,	"SensingMethod" },
+    { EXIFTAG_FILESOURCE,	1, 1,		TIFF_UNDEFINED,	FIELD_CUSTOM,
+      1,	0,	"FileSource" },
+    { EXIFTAG_SCENETYPE,	1, 1,		TIFF_UNDEFINED,	FIELD_CUSTOM,
+      1,	0,	"SceneType" },
+    { EXIFTAG_CFAPATTERN,	-1, -1,		TIFF_UNDEFINED,	FIELD_CUSTOM,
+      1,	1,	"CFAPattern" },
+    { EXIFTAG_CUSTOMRENDERED,	1, 1,		TIFF_SHORT,	FIELD_CUSTOM,
+      1,	0,	"CustomRendered" },
+    { EXIFTAG_EXPOSUREMODE,	1, 1,		TIFF_SHORT,	FIELD_CUSTOM,
+      1,	0,	"ExposureMode" },
+    { EXIFTAG_WHITEBALANCE,	1, 1,		TIFF_SHORT,	FIELD_CUSTOM,
+      1,	0,	"WhiteBalance" },
+    { EXIFTAG_DIGITALZOOMRATIO,	1, 1,		TIFF_RATIONAL,	FIELD_CUSTOM,
+      1,	0,	"DigitalZoomRatio" },
+    { EXIFTAG_FOCALLENGTHIN35MMFILM, 1, 1,	TIFF_SHORT,	FIELD_CUSTOM,
+      1,	0,	"FocalLengthIn35mmFilm" },
+    { EXIFTAG_SCENECAPTURETYPE,	1, 1,		TIFF_SHORT,	FIELD_CUSTOM,
+      1,	0,	"SceneCaptureType" },
+    { EXIFTAG_GAINCONTROL,	1, 1,		TIFF_RATIONAL,	FIELD_CUSTOM,
+      1,	0,	"GainControl" },
+    { EXIFTAG_CONTRAST,		1, 1,		TIFF_SHORT,	FIELD_CUSTOM,
+      1,	0,	"Contrast" },
+    { EXIFTAG_SATURATION,	1, 1,		TIFF_SHORT,	FIELD_CUSTOM,
+      1,	0,	"Saturation" },
+    { EXIFTAG_SHARPNESS,	1, 1,		TIFF_SHORT,	FIELD_CUSTOM,
+      1,	0,	"Sharpness" },
+    { EXIFTAG_DEVICESETTINGDESCRIPTION,	-1, -1,	TIFF_UNDEFINED,	FIELD_CUSTOM,
+      1,	1,	"DeviceSettingDescription" },
+    { EXIFTAG_SUBJECTDISTANCERANGE, 1, 1,	TIFF_SHORT,	FIELD_CUSTOM,
+      1,	0,	"SubjectDistanceRange" },
+    { EXIFTAG_IMAGEUNIQUEID,	33, 33,		TIFF_ASCII,	FIELD_CUSTOM,
+      1,	0,	"ImageUniqueID" }
+};
+
+const TIFFFieldInfo *
+_TIFFGetFieldInfo(size_t *size)
+{
+	*size = TIFFArrayCount(tiffFieldInfo);
+	return tiffFieldInfo;
+}
+
+const TIFFFieldInfo *
+_TIFFGetExifFieldInfo(size_t *size)
+{
+	*size = TIFFArrayCount(exifFieldInfo);
+	return exifFieldInfo;
+}
+
+void
+_TIFFSetupFieldInfo(TIFF* tif, const TIFFFieldInfo info[], size_t n)
+{
+	if (tif->tif_fieldinfo) {
+		size_t  i;
+
+		for (i = 0; i < tif->tif_nfields; i++)
+		{
+			TIFFFieldInfo *fld = tif->tif_fieldinfo[i];
+			if (fld->field_bit == FIELD_CUSTOM &&
+				strncmp("Tag ", fld->field_name, 4) == 0) {
+					_TIFFfree(fld->field_name);
+					_TIFFfree(fld);
+				}
+		}
+
+		_TIFFfree(tif->tif_fieldinfo);
+		tif->tif_nfields = 0;
+	}
+	_TIFFMergeFieldInfo(tif, info, n);
+}
+
+static int
+tagCompare(const void* a, const void* b)
+{
+	const TIFFFieldInfo* ta = *(const TIFFFieldInfo**) a;
+	const TIFFFieldInfo* tb = *(const TIFFFieldInfo**) b;
+	/* NB: be careful of return values for 16-bit platforms */
+	if (ta->field_tag != tb->field_tag)
+		return (ta->field_tag < tb->field_tag ? -1 : 1);
+	else
+		return ((int)tb->field_type - (int)ta->field_type);
+}
+
+static int
+tagNameCompare(const void* a, const void* b)
+{
+	const TIFFFieldInfo* ta = *(const TIFFFieldInfo**) a;
+	const TIFFFieldInfo* tb = *(const TIFFFieldInfo**) b;
+
+        return strcmp(ta->field_name, tb->field_name);
+}
+
+void
+_TIFFMergeFieldInfo(TIFF* tif, const TIFFFieldInfo info[], int n)
+{
+	TIFFFieldInfo** tp;
+	int i;
+
+        tif->tif_foundfield = NULL;
+
+	if (tif->tif_nfields > 0) {
+		tif->tif_fieldinfo = (TIFFFieldInfo**)
+		    _TIFFrealloc(tif->tif_fieldinfo,
+			(tif->tif_nfields+n) * sizeof (TIFFFieldInfo*));
+	} else {
+		tif->tif_fieldinfo = (TIFFFieldInfo**)
+		    _TIFFmalloc(n * sizeof (TIFFFieldInfo*));
+	}
+	assert(tif->tif_fieldinfo != NULL);
+	tp = tif->tif_fieldinfo + tif->tif_nfields;
+	for (i = 0; i < n; i++)
+		*tp++ = (TIFFFieldInfo*) (info + i);	/* XXX */
+
+        /* Sort the field info by tag number */
+        qsort(tif->tif_fieldinfo, tif->tif_nfields += n,
+	      sizeof (TIFFFieldInfo*), tagCompare);
+}
+
+void
+_TIFFPrintFieldInfo(TIFF* tif, FILE* fd)
+{
+	size_t i;
+
+	fprintf(fd, "%s: \n", tif->tif_name);
+	for (i = 0; i < tif->tif_nfields; i++) {
+		const TIFFFieldInfo* fip = tif->tif_fieldinfo[i];
+		fprintf(fd, "field[%2d] %5lu, %2d, %2d, %d, %2d, %5s, %5s, %s\n"
+			, (int)i
+			, (unsigned long) fip->field_tag
+			, fip->field_readcount, fip->field_writecount
+			, fip->field_type
+			, fip->field_bit
+			, fip->field_oktochange ? "TRUE" : "FALSE"
+			, fip->field_passcount ? "TRUE" : "FALSE"
+			, fip->field_name
+		);
+	}
+}
+
+/*
+ * Return size of TIFFDataType in bytes
+ */
+int
+TIFFDataWidth(TIFFDataType type)
+{
+	switch(type)
+	{
+	case 0:  /* nothing */
+	case 1:  /* TIFF_BYTE */
+	case 2:  /* TIFF_ASCII */
+	case 6:  /* TIFF_SBYTE */
+	case 7:  /* TIFF_UNDEFINED */
+		return 1;
+	case 3:  /* TIFF_SHORT */
+	case 8:  /* TIFF_SSHORT */
+		return 2;
+	case 4:  /* TIFF_LONG */
+	case 9:  /* TIFF_SLONG */
+	case 11: /* TIFF_FLOAT */
+        case 13: /* TIFF_IFD */
+		return 4;
+	case 5:  /* TIFF_RATIONAL */
+	case 10: /* TIFF_SRATIONAL */
+	case 12: /* TIFF_DOUBLE */
+		return 8;
+	default:
+		return 0; /* will return 0 for unknown types */
+	}
+}
+
+/*
+ * Return size of TIFFDataType in bytes.
+ *
+ * XXX: We need a separate function to determine the space needed
+ * to store the value. For TIFF_RATIONAL values TIFFDataWidth() returns 8,
+ * but we use 4-byte float to represent rationals.
+ */
+int
+_TIFFDataSize(TIFFDataType type)
+{
+	switch (type) {
+		case TIFF_BYTE:
+		case TIFF_SBYTE:
+		case TIFF_ASCII:
+		case TIFF_UNDEFINED:
+		    return 1;
+		case TIFF_SHORT:
+		case TIFF_SSHORT:
+		    return 2;
+		case TIFF_LONG:
+		case TIFF_SLONG:
+		case TIFF_FLOAT:
+		case TIFF_IFD:
+		case TIFF_RATIONAL:
+		case TIFF_SRATIONAL:
+		    return 4;
+		case TIFF_DOUBLE:
+		    return 8;
+		default:
+		    return 0;
+	}
+}
+
+/*
+ * Return nearest TIFFDataType to the sample type of an image.
+ */
+TIFFDataType
+_TIFFSampleToTagType(TIFF* tif)
+{
+	uint32 bps = TIFFhowmany8(tif->tif_dir.td_bitspersample);
+
+	switch (tif->tif_dir.td_sampleformat) {
+	case SAMPLEFORMAT_IEEEFP:
+		return (bps == 4 ? TIFF_FLOAT : TIFF_DOUBLE);
+	case SAMPLEFORMAT_INT:
+		return (bps <= 1 ? TIFF_SBYTE :
+		    bps <= 2 ? TIFF_SSHORT : TIFF_SLONG);
+	case SAMPLEFORMAT_UINT:
+		return (bps <= 1 ? TIFF_BYTE :
+		    bps <= 2 ? TIFF_SHORT : TIFF_LONG);
+	case SAMPLEFORMAT_VOID:
+		return (TIFF_UNDEFINED);
+	}
+	/*NOTREACHED*/
+	return (TIFF_UNDEFINED);
+}
+
+const TIFFFieldInfo*
+_TIFFFindFieldInfo(TIFF* tif, ttag_t tag, TIFFDataType dt)
+{
+	int i, n;
+
+	if (tif->tif_foundfield && tif->tif_foundfield->field_tag == tag &&
+	    (dt == TIFF_ANY || dt == tif->tif_foundfield->field_type))
+		return (tif->tif_foundfield);
+	/* NB: use sorted search (e.g. binary search) */
+	if(dt != TIFF_ANY) {
+            TIFFFieldInfo key = {0, 0, 0, TIFF_NOTYPE, 0, 0, 0, 0};
+	    TIFFFieldInfo* pkey = &key;
+	    const TIFFFieldInfo **ret;
+
+	    key.field_tag = tag;
+            key.field_type = dt;
+
+	    ret = (const TIFFFieldInfo **) bsearch(&pkey,
+						   tif->tif_fieldinfo,
+						   tif->tif_nfields,
+						   sizeof(TIFFFieldInfo *),
+						   tagCompare);
+	    return (ret) ? (*ret) : NULL;
+        } else for (i = 0, n = tif->tif_nfields; i < n; i++) {
+		const TIFFFieldInfo* fip = tif->tif_fieldinfo[i];
+		if (fip->field_tag == tag &&
+		    (dt == TIFF_ANY || fip->field_type == dt))
+			return (tif->tif_foundfield = fip);
+	}
+	return ((const TIFFFieldInfo *)0);
+}
+
+const TIFFFieldInfo*
+_TIFFFindFieldInfoByName(TIFF* tif, const char *field_name, TIFFDataType dt)
+{
+	int i, n;
+
+	if (tif->tif_foundfield
+	    && streq(tif->tif_foundfield->field_name, field_name)
+	    && (dt == TIFF_ANY || dt == tif->tif_foundfield->field_type))
+		return (tif->tif_foundfield);
+	/* NB: use sorted search (e.g. binary search) */
+	if(dt != TIFF_ANY) {
+            TIFFFieldInfo key = {0, 0, 0, TIFF_NOTYPE, 0, 0, 0, 0};
+	    TIFFFieldInfo* pkey = &key;
+	    const TIFFFieldInfo **ret;
+
+            key.field_name = (char *)field_name;
+            key.field_type = dt;
+
+            ret = (const TIFFFieldInfo **) lfind(&pkey,
+						 tif->tif_fieldinfo,
+						 &tif->tif_nfields,
+						 sizeof(TIFFFieldInfo *),
+						 tagNameCompare);
+	    return (ret) ? (*ret) : NULL;
+        } else
+		for (i = 0, n = tif->tif_nfields; i < n; i++) {
+			const TIFFFieldInfo* fip = tif->tif_fieldinfo[i];
+			if (streq(fip->field_name, field_name) &&
+			    (dt == TIFF_ANY || fip->field_type == dt))
+				return (tif->tif_foundfield = fip);
+		}
+	return ((const TIFFFieldInfo *)0);
+}
+
+const TIFFFieldInfo*
+_TIFFFieldWithTag(TIFF* tif, ttag_t tag)
+{
+	const TIFFFieldInfo* fip = _TIFFFindFieldInfo(tif, tag, TIFF_ANY);
+	if (!fip) {
+		TIFFErrorExt(tif->tif_clientdata, "TIFFFieldWithTag",
+			  "Internal error, unknown tag 0x%x",
+                          (unsigned int) tag);
+		assert(fip != NULL);
+		/*NOTREACHED*/
+	}
+	return (fip);
+}
+
+const TIFFFieldInfo*
+_TIFFFieldWithName(TIFF* tif, const char *field_name)
+{
+	const TIFFFieldInfo* fip =
+		_TIFFFindFieldInfoByName(tif, field_name, TIFF_ANY);
+	if (!fip) {
+		TIFFErrorExt(tif->tif_clientdata, "TIFFFieldWithName",
+			  "Internal error, unknown tag %s", field_name);
+		assert(fip != NULL);
+		/*NOTREACHED*/
+	}
+	return (fip);
+}
+
+const TIFFFieldInfo*
+_TIFFFindOrRegisterFieldInfo( TIFF *tif, ttag_t tag, TIFFDataType dt )
+
+{
+    const TIFFFieldInfo *fld;
+
+    fld = _TIFFFindFieldInfo( tif, tag, dt );
+    if( fld == NULL )
+    {
+        fld = _TIFFCreateAnonFieldInfo( tif, tag, dt );
+        _TIFFMergeFieldInfo( tif, fld, 1 );
+    }
+
+    return fld;
+}
+
+TIFFFieldInfo*
+_TIFFCreateAnonFieldInfo(TIFF *tif, ttag_t tag, TIFFDataType field_type)
+{
+	TIFFFieldInfo *fld;
+	(void) tif;
+
+	fld = (TIFFFieldInfo *) _TIFFmalloc(sizeof (TIFFFieldInfo));
+	if (fld == NULL)
+	    return NULL;
+	_TIFFmemset( fld, 0, sizeof(TIFFFieldInfo) );
+
+	fld->field_tag = tag;
+	fld->field_readcount = TIFF_VARIABLE;
+	fld->field_writecount = TIFF_VARIABLE;
+	fld->field_type = field_type;
+	fld->field_bit = FIELD_CUSTOM;
+	fld->field_oktochange = TRUE;
+	fld->field_passcount = TRUE;
+	fld->field_name = (char *) _TIFFmalloc(32);
+	if (fld->field_name == NULL) {
+	    _TIFFfree(fld);
+	    return NULL;
+	}
+
+	/* note that this name is a special sign to TIFFClose() and
+	 * _TIFFSetupFieldInfo() to free the field
+	 */
+	sprintf(fld->field_name, "Tag %d", (int) tag);
+
+	return fld;
+}
+
+/* vim: set ts=8 sts=8 sw=8 noet: */
diff --git a/uppsrc/plugin/tif/lib/tif_dirread.c b/uppsrc/plugin/tif/lib/tif_dirread.c
new file mode 100644
index 000000000..2d18208b0
--- /dev/null
+++ b/uppsrc/plugin/tif/lib/tif_dirread.c
@@ -0,0 +1,1789 @@
+/* $Id: tif_dirread.c,v 1.82 2006/03/16 12:24:53 dron Exp $ */
+
+/*
+ * Copyright (c) 1988-1997 Sam Leffler
+ * Copyright (c) 1991-1997 Silicon Graphics, Inc.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and
+ * its documentation for any purpose is hereby granted without fee, provided
+ * that (i) the above copyright notices and this permission notice appear in
+ * all copies of the software and related documentation, and (ii) the names of
+ * Sam Leffler and Silicon Graphics may not be used in any advertising or
+ * publicity relating to the software without the specific, prior written
+ * permission of Sam Leffler and Silicon Graphics.
+ *
+ * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+ * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
+ * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
+ * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+ * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
+ * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.
+ */
+
+/*
+ * TIFF Library.
+ *
+ * Directory Read Support Routines.
+ */
+#include "tiffiop.h"
+
+#define	IGNORE	0		/* tag placeholder used below */
+
+#ifdef HAVE_IEEEFP
+# define	TIFFCvtIEEEFloatToNative(tif, n, fp)
+# define	TIFFCvtIEEEDoubleToNative(tif, n, dp)
+#else
+extern	void TIFFCvtIEEEFloatToNative(TIFF*, uint32, float*);
+extern	void TIFFCvtIEEEDoubleToNative(TIFF*, uint32, double*);
+#endif
+
+static	int EstimateStripByteCounts(TIFF*, TIFFDirEntry*, uint16);
+static	void MissingRequired(TIFF*, const char*);
+static	int CheckDirCount(TIFF*, TIFFDirEntry*, uint32);
+static	tsize_t TIFFFetchData(TIFF*, TIFFDirEntry*, char*);
+static	tsize_t TIFFFetchString(TIFF*, TIFFDirEntry*, char*);
+static	float TIFFFetchRational(TIFF*, TIFFDirEntry*);
+static	int TIFFFetchNormalTag(TIFF*, TIFFDirEntry*);
+static	int TIFFFetchPerSampleShorts(TIFF*, TIFFDirEntry*, uint16*);
+static	int TIFFFetchPerSampleLongs(TIFF*, TIFFDirEntry*, uint32*);
+static	int TIFFFetchPerSampleAnys(TIFF*, TIFFDirEntry*, double*);
+static	int TIFFFetchShortArray(TIFF*, TIFFDirEntry*, uint16*);
+static	int TIFFFetchStripThing(TIFF*, TIFFDirEntry*, long, uint32**);
+static	int TIFFFetchRefBlackWhite(TIFF*, TIFFDirEntry*);
+static	float TIFFFetchFloat(TIFF*, TIFFDirEntry*);
+static	int TIFFFetchFloatArray(TIFF*, TIFFDirEntry*, float*);
+static	int TIFFFetchDoubleArray(TIFF*, TIFFDirEntry*, double*);
+static	int TIFFFetchAnyArray(TIFF*, TIFFDirEntry*, double*);
+static	int TIFFFetchShortPair(TIFF*, TIFFDirEntry*);
+static	void ChopUpSingleUncompressedStrip(TIFF*);
+
+/*
+ * Read the next TIFF directory from a file
+ * and convert it to the internal format.
+ * We read directories sequentially.
+ */
+int
+TIFFReadDirectory(TIFF* tif)
+{
+	static const char module[] = "TIFFReadDirectory";
+
+	int n;
+	TIFFDirectory* td;
+	TIFFDirEntry *dp, *dir = NULL;
+	uint16 iv;
+	uint32 v;
+	const TIFFFieldInfo* fip;
+	size_t fix;
+	uint16 dircount;
+	toff_t nextdiroff;
+	int diroutoforderwarning = 0;
+	toff_t* new_dirlist;
+
+	tif->tif_diroff = tif->tif_nextdiroff;
+	if (tif->tif_diroff == 0)		/* no more directories */
+		return (0);
+
+	/*
+	 * XXX: Trick to prevent IFD looping. The one can create TIFF file
+	 * with looped directory pointers. We will maintain a list of already
+	 * seen directories and check every IFD offset against this list.
+	 */
+	for (n = 0; n < tif->tif_dirnumber; n++) {
+		if (tif->tif_dirlist[n] == tif->tif_diroff)
+			return (0);
+	}
+	tif->tif_dirnumber++;
+	new_dirlist = (toff_t *)_TIFFrealloc(tif->tif_dirlist,
+					tif->tif_dirnumber * sizeof(toff_t));
+	if (!new_dirlist) {
+		TIFFErrorExt(tif->tif_clientdata, module,
+			  "%s: Failed to allocate space for IFD list",
+			  tif->tif_name);
+		return (0);
+	}
+	tif->tif_dirlist = new_dirlist;
+	tif->tif_dirlist[tif->tif_dirnumber - 1] = tif->tif_diroff;
+
+	/*
+	 * Cleanup any previous compression state.
+	 */
+	(*tif->tif_cleanup)(tif);
+	tif->tif_curdir++;
+	nextdiroff = 0;
+	if (!isMapped(tif)) {
+		if (!SeekOK(tif, tif->tif_diroff)) {
+			TIFFErrorExt(tif->tif_clientdata, module,
+			    "%s: Seek error accessing TIFF directory",
+                            tif->tif_name);
+			return (0);
+		}
+		if (!ReadOK(tif, &dircount, sizeof (uint16))) {
+			TIFFErrorExt(tif->tif_clientdata, module,
+			    "%s: Can not read TIFF directory count",
+                            tif->tif_name);
+			return (0);
+		}
+		if (tif->tif_flags & TIFF_SWAB)
+			TIFFSwabShort(&dircount);
+		dir = (TIFFDirEntry *)_TIFFCheckMalloc(tif, dircount,
+						       sizeof (TIFFDirEntry),
+						"to read TIFF directory");
+		if (dir == NULL)
+			return (0);
+		if (!ReadOK(tif, dir, dircount*sizeof (TIFFDirEntry))) {
+			TIFFErrorExt(tif->tif_clientdata, module,
+                                  "%.100s: Can not read TIFF directory",
+                                  tif->tif_name);
+			goto bad;
+		}
+		/*
+		 * Read offset to next directory for sequential scans.
+		 */
+		(void) ReadOK(tif, &nextdiroff, sizeof (uint32));
+	} else {
+		toff_t off = tif->tif_diroff;
+
+		if (off + sizeof (uint16) > tif->tif_size) {
+			TIFFErrorExt(tif->tif_clientdata, module,
+			    "%s: Can not read TIFF directory count",
+                            tif->tif_name);
+			return (0);
+		} else
+			_TIFFmemcpy(&dircount, tif->tif_base + off, sizeof (uint16));
+		off += sizeof (uint16);
+		if (tif->tif_flags & TIFF_SWAB)
+			TIFFSwabShort(&dircount);
+		dir = (TIFFDirEntry *)_TIFFCheckMalloc(tif, dircount,
+						       sizeof (TIFFDirEntry),
+						"to read TIFF directory");
+		if (dir == NULL)
+			return (0);
+		if (off + dircount*sizeof (TIFFDirEntry) > tif->tif_size) {
+			TIFFErrorExt(tif->tif_clientdata, module,
+                                  "%s: Can not read TIFF directory",
+                                  tif->tif_name);
+			goto bad;
+		} else {
+			_TIFFmemcpy(dir, tif->tif_base + off,
+				    dircount*sizeof (TIFFDirEntry));
+		}
+		off += dircount* sizeof (TIFFDirEntry);
+		if (off + sizeof (uint32) <= tif->tif_size)
+			_TIFFmemcpy(&nextdiroff, tif->tif_base+off, sizeof (uint32));
+	}
+	if (tif->tif_flags & TIFF_SWAB)
+		TIFFSwabLong(&nextdiroff);
+	tif->tif_nextdiroff = nextdiroff;
+
+	tif->tif_flags &= ~TIFF_BEENWRITING;	/* reset before new dir */
+	/*
+	 * Setup default value and then make a pass over
+	 * the fields to check type and tag information,
+	 * and to extract info required to size data
+	 * structures.  A second pass is made afterwards
+	 * to read in everthing not taken in the first pass.
+	 */
+	td = &tif->tif_dir;
+	/* free any old stuff and reinit */
+	TIFFFreeDirectory(tif);
+	TIFFDefaultDirectory(tif);
+	/*
+	 * Electronic Arts writes gray-scale TIFF files
+	 * without a PlanarConfiguration directory entry.
+	 * Thus we setup a default value here, even though
+	 * the TIFF spec says there is no default value.
+	 */
+	TIFFSetField(tif, TIFFTAG_PLANARCONFIG, PLANARCONFIG_CONTIG);
+
+	/*
+	 * Sigh, we must make a separate pass through the
+	 * directory for the following reason:
+	 *
+	 * We must process the Compression tag in the first pass
+	 * in order to merge in codec-private tag definitions (otherwise
+	 * we may get complaints about unknown tags).  However, the
+	 * Compression tag may be dependent on the SamplesPerPixel
+	 * tag value because older TIFF specs permited Compression
+	 * to be written as a SamplesPerPixel-count tag entry.
+	 * Thus if we don't first figure out the correct SamplesPerPixel
+	 * tag value then we may end up ignoring the Compression tag
+	 * value because it has an incorrect count value (if the
+	 * true value of SamplesPerPixel is not 1).
+	 *
+	 * It sure would have been nice if Aldus had really thought
+	 * this stuff through carefully.
+	 */
+	for (dp = dir, n = dircount; n > 0; n--, dp++) {
+		if (tif->tif_flags & TIFF_SWAB) {
+			TIFFSwabArrayOfShort(&dp->tdir_tag, 2);
+			TIFFSwabArrayOfLong(&dp->tdir_count, 2);
+		}
+		if (dp->tdir_tag == TIFFTAG_SAMPLESPERPIXEL) {
+			if (!TIFFFetchNormalTag(tif, dp))
+				goto bad;
+			dp->tdir_tag = IGNORE;
+		}
+	}
+	/*
+	 * First real pass over the directory.
+	 */
+	fix = 0;
+	for (dp = dir, n = dircount; n > 0; n--, dp++) {
+
+		if (fix >= tif->tif_nfields || dp->tdir_tag == IGNORE)
+			continue;
+
+		/*
+		 * Silicon Beach (at least) writes unordered
+		 * directory tags (violating the spec).  Handle
+		 * it here, but be obnoxious (maybe they'll fix it?).
+		 */
+		if (dp->tdir_tag < tif->tif_fieldinfo[fix]->field_tag) {
+			if (!diroutoforderwarning) {
+				TIFFWarningExt(tif->tif_clientdata, module,
+	"%s: invalid TIFF directory; tags are not sorted in ascending order",
+					       tif->tif_name);
+				diroutoforderwarning = 1;
+			}
+			fix = 0;			/* O(n^2) */
+		}
+		while (fix < tif->tif_nfields &&
+		       tif->tif_fieldinfo[fix]->field_tag < dp->tdir_tag)
+			fix++;
+		if (fix >= tif->tif_nfields ||
+		    tif->tif_fieldinfo[fix]->field_tag != dp->tdir_tag) {
+
+					TIFFWarningExt(tif->tif_clientdata,
+						       module,
+                        "%s: unknown field with tag %d (0x%x) encountered",
+						       tif->tif_name,
+						       dp->tdir_tag,
+						       dp->tdir_tag,
+						       dp->tdir_type);
+
+                    TIFFMergeFieldInfo(tif,
+                                       _TIFFCreateAnonFieldInfo(tif,
+						dp->tdir_tag,
+						(TIFFDataType) dp->tdir_type),
+				       1 );
+                    fix = 0;
+                    while (fix < tif->tif_nfields &&
+                           tif->tif_fieldinfo[fix]->field_tag < dp->tdir_tag)
+			fix++;
+		}
+		/*
+		 * Null out old tags that we ignore.
+		 */
+		if (tif->tif_fieldinfo[fix]->field_bit == FIELD_IGNORE) {
+	ignore:
+			dp->tdir_tag = IGNORE;
+			continue;
+		}
+		/*
+		 * Check data type.
+		 */
+		fip = tif->tif_fieldinfo[fix];
+		while (dp->tdir_type != (unsigned short) fip->field_type
+                       && fix < tif->tif_nfields) {
+			if (fip->field_type == TIFF_ANY)	/* wildcard */
+				break;
+                        fip = tif->tif_fieldinfo[++fix];
+			if (fix >= tif->tif_nfields ||
+			    fip->field_tag != dp->tdir_tag) {
+				TIFFWarningExt(tif->tif_clientdata, module,
+			"%s: wrong data type %d for \"%s\"; tag ignored",
+					    tif->tif_name, dp->tdir_type,
+					    tif->tif_fieldinfo[fix-1]->field_name);
+				goto ignore;
+			}
+		}
+		/*
+		 * Check count if known in advance.
+		 */
+		if (fip->field_readcount != TIFF_VARIABLE
+		    && fip->field_readcount != TIFF_VARIABLE2) {
+			uint32 expected = (fip->field_readcount == TIFF_SPP) ?
+			    (uint32) td->td_samplesperpixel :
+			    (uint32) fip->field_readcount;
+			if (!CheckDirCount(tif, dp, expected))
+				goto ignore;
+		}
+
+		switch (dp->tdir_tag) {
+		case TIFFTAG_COMPRESSION:
+			/*
+			 * The 5.0 spec says the Compression tag has
+			 * one value, while earlier specs say it has
+			 * one value per sample.  Because of this, we
+			 * accept the tag if one value is supplied.
+			 */
+			if (dp->tdir_count == 1) {
+				v = TIFFExtractData(tif,
+				    dp->tdir_type, dp->tdir_offset);
+				if (!TIFFSetField(tif, dp->tdir_tag, (uint16)v))
+					goto bad;
+				break;
+			/* XXX: workaround for broken TIFFs */
+			} else if (dp->tdir_type == TIFF_LONG) {
+				if (!TIFFFetchPerSampleLongs(tif, dp, &v) ||
+				    !TIFFSetField(tif, dp->tdir_tag, (uint16)v))
+					goto bad;
+			} else {
+				if (!TIFFFetchPerSampleShorts(tif, dp, &iv)
+				    || !TIFFSetField(tif, dp->tdir_tag, iv))
+					goto bad;
+			}
+			dp->tdir_tag = IGNORE;
+			break;
+		case TIFFTAG_STRIPOFFSETS:
+		case TIFFTAG_STRIPBYTECOUNTS:
+		case TIFFTAG_TILEOFFSETS:
+		case TIFFTAG_TILEBYTECOUNTS:
+			TIFFSetFieldBit(tif, fip->field_bit);
+			break;
+		case TIFFTAG_IMAGEWIDTH:
+		case TIFFTAG_IMAGELENGTH:
+		case TIFFTAG_IMAGEDEPTH:
+		case TIFFTAG_TILELENGTH:
+		case TIFFTAG_TILEWIDTH:
+		case TIFFTAG_TILEDEPTH:
+		case TIFFTAG_PLANARCONFIG:
+		case TIFFTAG_ROWSPERSTRIP:
+		case TIFFTAG_EXTRASAMPLES:
+			if (!TIFFFetchNormalTag(tif, dp))
+				goto bad;
+			dp->tdir_tag = IGNORE;
+			break;
+		}
+	}
+
+	/*
+	 * Allocate directory structure and setup defaults.
+	 */
+	if (!TIFFFieldSet(tif, FIELD_IMAGEDIMENSIONS)) {
+		MissingRequired(tif, "ImageLength");
+		goto bad;
+	}
+	/*
+ 	 * Setup appropriate structures (by strip or by tile)
+	 */
+	if (!TIFFFieldSet(tif, FIELD_TILEDIMENSIONS)) {
+		td->td_nstrips = TIFFNumberOfStrips(tif);
+		td->td_tilewidth = td->td_imagewidth;
+		td->td_tilelength = td->td_rowsperstrip;
+		td->td_tiledepth = td->td_imagedepth;
+		tif->tif_flags &= ~TIFF_ISTILED;
+	} else {
+		td->td_nstrips = TIFFNumberOfTiles(tif);
+		tif->tif_flags |= TIFF_ISTILED;
+	}
+	if (!td->td_nstrips) {
+		TIFFErrorExt(tif->tif_clientdata, module,
+			     "%s: cannot handle zero number of %s",
+			     tif->tif_name, isTiled(tif) ? "tiles" : "strips");
+		goto bad;
+	}
+	td->td_stripsperimage = td->td_nstrips;
+	if (td->td_planarconfig == PLANARCONFIG_SEPARATE)
+		td->td_stripsperimage /= td->td_samplesperpixel;
+	if (!TIFFFieldSet(tif, FIELD_STRIPOFFSETS)) {
+		MissingRequired(tif,
+				isTiled(tif) ? "TileOffsets" : "StripOffsets");
+		goto bad;
+	}
+
+	/*
+	 * Second pass: extract other information.
+	 */
+	for (dp = dir, n = dircount; n > 0; n--, dp++) {
+		if (dp->tdir_tag == IGNORE)
+			continue;
+		switch (dp->tdir_tag) {
+		case TIFFTAG_MINSAMPLEVALUE:
+		case TIFFTAG_MAXSAMPLEVALUE:
+		case TIFFTAG_BITSPERSAMPLE:
+		case TIFFTAG_DATATYPE:
+		case TIFFTAG_SAMPLEFORMAT:
+			/*
+			 * The 5.0 spec says the Compression tag has
+			 * one value, while earlier specs say it has
+			 * one value per sample.  Because of this, we
+			 * accept the tag if one value is supplied.
+			 *
+                         * The MinSampleValue, MaxSampleValue, BitsPerSample
+                         * DataType and SampleFormat tags are supposed to be
+                         * written as one value/sample, but some vendors
+                         * incorrectly write one value only -- so we accept
+                         * that as well (yech). Other vendors write correct
+			 * value for NumberOfSamples, but incorrect one for
+			 * BitsPerSample and friends, and we will read this
+			 * too.
+			 */
+			if (dp->tdir_count == 1) {
+				v = TIFFExtractData(tif,
+				    dp->tdir_type, dp->tdir_offset);
+				if (!TIFFSetField(tif, dp->tdir_tag, (uint16)v))
+					goto bad;
+			/* XXX: workaround for broken TIFFs */
+			} else if (dp->tdir_tag == TIFFTAG_BITSPERSAMPLE
+				   && dp->tdir_type == TIFF_LONG) {
+				if (!TIFFFetchPerSampleLongs(tif, dp, &v) ||
+				    !TIFFSetField(tif, dp->tdir_tag, (uint16)v))
+					goto bad;
+			} else {
+				if (!TIFFFetchPerSampleShorts(tif, dp, &iv) ||
+				    !TIFFSetField(tif, dp->tdir_tag, iv))
+					goto bad;
+			}
+			break;
+		case TIFFTAG_SMINSAMPLEVALUE:
+		case TIFFTAG_SMAXSAMPLEVALUE:
+			{
+				double dv = 0.0;
+				if (!TIFFFetchPerSampleAnys(tif, dp, &dv) ||
+				    !TIFFSetField(tif, dp->tdir_tag, dv))
+					goto bad;
+			}
+			break;
+		case TIFFTAG_STRIPOFFSETS:
+		case TIFFTAG_TILEOFFSETS:
+			if (!TIFFFetchStripThing(tif, dp,
+			    td->td_nstrips, &td->td_stripoffset))
+				goto bad;
+			break;
+		case TIFFTAG_STRIPBYTECOUNTS:
+		case TIFFTAG_TILEBYTECOUNTS:
+			if (!TIFFFetchStripThing(tif, dp,
+			    td->td_nstrips, &td->td_stripbytecount))
+				goto bad;
+			break;
+		case TIFFTAG_COLORMAP:
+		case TIFFTAG_TRANSFERFUNCTION:
+			{
+				char* cp;
+				/*
+				 * TransferFunction can have either 1x or 3x
+				 * data values; Colormap can have only 3x
+				 * items.
+				 */
+				v = 1L<<td->td_bitspersample;
+				if (dp->tdir_tag == TIFFTAG_COLORMAP ||
+				    dp->tdir_count != v) {
+					if (!CheckDirCount(tif, dp, 3 * v))
+						break;
+				}
+				v *= sizeof(uint16);
+				cp = (char *)_TIFFCheckMalloc(tif,
+							      dp->tdir_count,
+							      sizeof (uint16),
+					"to read \"TransferFunction\" tag");
+				if (cp != NULL) {
+					if (TIFFFetchData(tif, dp, cp)) {
+						/*
+						 * This deals with there being
+						 * only one array to apply to
+						 * all samples.
+						 */
+						uint32 c = 1L << td->td_bitspersample;
+						if (dp->tdir_count == c)
+							v = 0L;
+						TIFFSetField(tif, dp->tdir_tag,
+						    cp, cp+v, cp+2*v);
+					}
+					_TIFFfree(cp);
+				}
+				break;
+			}
+		case TIFFTAG_PAGENUMBER:
+		case TIFFTAG_HALFTONEHINTS:
+		case TIFFTAG_YCBCRSUBSAMPLING:
+		case TIFFTAG_DOTRANGE:
+			(void) TIFFFetchShortPair(tif, dp);
+			break;
+		case TIFFTAG_REFERENCEBLACKWHITE:
+			(void) TIFFFetchRefBlackWhite(tif, dp);
+			break;
+/* BEGIN REV 4.0 COMPATIBILITY */
+		case TIFFTAG_OSUBFILETYPE:
+			v = 0L;
+			switch (TIFFExtractData(tif, dp->tdir_type,
+			    dp->tdir_offset)) {
+			case OFILETYPE_REDUCEDIMAGE:
+				v = FILETYPE_REDUCEDIMAGE;
+				break;
+			case OFILETYPE_PAGE:
+				v = FILETYPE_PAGE;
+				break;
+			}
+			if (v)
+				TIFFSetField(tif, TIFFTAG_SUBFILETYPE, v);
+			break;
+/* END REV 4.0 COMPATIBILITY */
+		default:
+			(void) TIFFFetchNormalTag(tif, dp);
+			break;
+		}
+	}
+	/*
+	 * Verify Palette image has a Colormap.
+	 */
+	if (td->td_photometric == PHOTOMETRIC_PALETTE &&
+	    !TIFFFieldSet(tif, FIELD_COLORMAP)) {
+		MissingRequired(tif, "Colormap");
+		goto bad;
+	}
+	/*
+	 * Attempt to deal with a missing StripByteCounts tag.
+	 */
+	if (!TIFFFieldSet(tif, FIELD_STRIPBYTECOUNTS)) {
+		/*
+		 * Some manufacturers violate the spec by not giving
+		 * the size of the strips.  In this case, assume there
+		 * is one uncompressed strip of data.
+		 */
+		if ((td->td_planarconfig == PLANARCONFIG_CONTIG &&
+		    td->td_nstrips > 1) ||
+		    (td->td_planarconfig == PLANARCONFIG_SEPARATE &&
+		     td->td_nstrips != td->td_samplesperpixel)) {
+		    MissingRequired(tif, "StripByteCounts");
+		    goto bad;
+		}
+		TIFFWarningExt(tif->tif_clientdata, module,
+			"%s: TIFF directory is missing required "
+			"\"%s\" field, calculating from imagelength",
+			tif->tif_name,
+		        _TIFFFieldWithTag(tif,TIFFTAG_STRIPBYTECOUNTS)->field_name);
+		if (EstimateStripByteCounts(tif, dir, dircount) < 0)
+		    goto bad;
+/*
+ * Assume we have wrong StripByteCount value (in case of single strip) in
+ * following cases:
+ *   - it is equal to zero along with StripOffset;
+ *   - it is larger than file itself (in case of uncompressed image);
+ *   - it is smaller than the size of the bytes per row multiplied on the
+ *     number of rows.  The last case should not be checked in the case of
+ *     writing new image, because we may do not know the exact strip size
+ *     until the whole image will be written and directory dumped out.
+ */
+#define	BYTECOUNTLOOKSBAD \
+    ( (td->td_stripbytecount[0] == 0 && td->td_stripoffset[0] != 0) || \
+      (td->td_compression == COMPRESSION_NONE && \
+       td->td_stripbytecount[0] > TIFFGetFileSize(tif) - td->td_stripoffset[0]) || \
+      (tif->tif_mode == O_RDONLY && \
+       td->td_compression == COMPRESSION_NONE && \
+       td->td_stripbytecount[0] < TIFFScanlineSize(tif) * td->td_imagelength) )
+
+	} else if (td->td_nstrips == 1
+                   && td->td_stripoffset[0] != 0
+                   && BYTECOUNTLOOKSBAD) {
+		/*
+		 * XXX: Plexus (and others) sometimes give a value of zero for
+		 * a tag when they don't know what the correct value is!  Try
+		 * and handle the simple case of estimating the size of a one
+		 * strip image.
+		 */
+		TIFFWarningExt(tif->tif_clientdata, module,
+	"%s: Bogus \"%s\" field, ignoring and calculating from imagelength",
+                            tif->tif_name,
+		            _TIFFFieldWithTag(tif,TIFFTAG_STRIPBYTECOUNTS)->field_name);
+		if(EstimateStripByteCounts(tif, dir, dircount) < 0)
+		    goto bad;
+	} else if (td->td_planarconfig == PLANARCONFIG_CONTIG
+		   && td->td_nstrips > 2
+		   && td->td_compression == COMPRESSION_NONE
+		   && td->td_stripbytecount[0] != td->td_stripbytecount[1]) {
+		/*
+		 * XXX: Some vendors fill StripByteCount array with absolutely
+		 * wrong values (it can be equal to StripOffset array, for
+		 * example). Catch this case here.
+		 */
+		TIFFWarningExt(tif->tif_clientdata, module,
+	"%s: Wrong \"%s\" field, ignoring and calculating from imagelength",
+                            tif->tif_name,
+		            _TIFFFieldWithTag(tif,TIFFTAG_STRIPBYTECOUNTS)->field_name);
+		if (EstimateStripByteCounts(tif, dir, dircount) < 0)
+		    goto bad;
+	}
+	if (dir) {
+		_TIFFfree((char *)dir);
+		dir = NULL;
+	}
+	if (!TIFFFieldSet(tif, FIELD_MAXSAMPLEVALUE))
+		td->td_maxsamplevalue = (uint16)((1L<<td->td_bitspersample)-1);
+	/*
+	 * Setup default compression scheme.
+	 */
+
+	/*
+	 * XXX: We can optimize checking for the strip bounds using the sorted
+	 * bytecounts array. See also comments for TIFFAppendToStrip()
+	 * function in tif_write.c.
+	 */
+	if (td->td_nstrips > 1) {
+		tstrip_t strip;
+
+		td->td_stripbytecountsorted = 1;
+		for (strip = 1; strip < td->td_nstrips; strip++) {
+			if (td->td_stripoffset[strip - 1] >
+			    td->td_stripoffset[strip]) {
+				td->td_stripbytecountsorted = 0;
+				break;
+			}
+		}
+	}
+
+	if (!TIFFFieldSet(tif, FIELD_COMPRESSION))
+		TIFFSetField(tif, TIFFTAG_COMPRESSION, COMPRESSION_NONE);
+        /*
+         * Some manufacturers make life difficult by writing
+	 * large amounts of uncompressed data as a single strip.
+	 * This is contrary to the recommendations of the spec.
+         * The following makes an attempt at breaking such images
+	 * into strips closer to the recommended 8k bytes.  A
+	 * side effect, however, is that the RowsPerStrip tag
+	 * value may be changed.
+         */
+	if (td->td_nstrips == 1 && td->td_compression == COMPRESSION_NONE &&
+	    (tif->tif_flags & (TIFF_STRIPCHOP|TIFF_ISTILED)) == TIFF_STRIPCHOP)
+		ChopUpSingleUncompressedStrip(tif);
+
+	/*
+	 * Reinitialize i/o since we are starting on a new directory.
+	 */
+	tif->tif_row = (uint32) -1;
+	tif->tif_curstrip = (tstrip_t) -1;
+	tif->tif_col = (uint32) -1;
+	tif->tif_curtile = (ttile_t) -1;
+	tif->tif_tilesize = (tsize_t) -1;
+
+	tif->tif_scanlinesize = TIFFScanlineSize(tif);
+	if (!tif->tif_scanlinesize) {
+		TIFFErrorExt(tif->tif_clientdata, module, "%s: cannot handle zero scanline size",
+			  tif->tif_name);
+		return (0);
+	}
+
+	if (isTiled(tif)) {
+		tif->tif_tilesize = TIFFTileSize(tif);
+		if (!tif->tif_tilesize) {
+			TIFFErrorExt(tif->tif_clientdata, module, "%s: cannot handle zero tile size",
+				  tif->tif_name);
+			return (0);
+		}
+	} else {
+		if (!TIFFStripSize(tif)) {
+			TIFFErrorExt(tif->tif_clientdata, module, "%s: cannot handle zero strip size",
+				  tif->tif_name);
+			return (0);
+		}
+	}
+	return (1);
+bad:
+	if (dir)
+		_TIFFfree(dir);
+	return (0);
+}
+
+/*
+ * Read custom directory from the arbitarry offset.
+ * The code is very similar to TIFFReadDirectory().
+ */
+int
+TIFFReadCustomDirectory(TIFF* tif, toff_t diroff,
+			const TIFFFieldInfo info[], size_t n)
+{
+	static const char module[] = "TIFFReadCustomDirectory";
+
+	TIFFDirectory* td = &tif->tif_dir;
+	TIFFDirEntry *dp, *dir = NULL;
+	const TIFFFieldInfo* fip;
+	size_t fix;
+	uint16 i, dircount;
+
+	_TIFFSetupFieldInfo(tif, info, n);
+
+	tif->tif_diroff = diroff;
+
+	if (!isMapped(tif)) {
+		if (!SeekOK(tif, diroff)) {
+			TIFFErrorExt(tif->tif_clientdata, module,
+			    "%s: Seek error accessing TIFF directory",
+                            tif->tif_name);
+			return (0);
+		}
+		if (!ReadOK(tif, &dircount, sizeof (uint16))) {
+			TIFFErrorExt(tif->tif_clientdata, module,
+			    "%s: Can not read TIFF directory count",
+                            tif->tif_name);
+			return (0);
+		}
+		if (tif->tif_flags & TIFF_SWAB)
+			TIFFSwabShort(&dircount);
+		dir = (TIFFDirEntry *)_TIFFCheckMalloc(tif, dircount,
+						       sizeof (TIFFDirEntry),
+					"to read TIFF custom directory");
+		if (dir == NULL)
+			return (0);
+		if (!ReadOK(tif, dir, dircount * sizeof (TIFFDirEntry))) {
+			TIFFErrorExt(tif->tif_clientdata, module,
+                                  "%.100s: Can not read TIFF directory",
+                                  tif->tif_name);
+			goto bad;
+		}
+	} else {
+		toff_t off = diroff;
+
+		if (off + sizeof (uint16) > tif->tif_size) {
+			TIFFErrorExt(tif->tif_clientdata, module,
+			    "%s: Can not read TIFF directory count",
+                            tif->tif_name);
+			return (0);
+		} else
+			_TIFFmemcpy(&dircount, tif->tif_base + off, sizeof (uint16));
+		off += sizeof (uint16);
+		if (tif->tif_flags & TIFF_SWAB)
+			TIFFSwabShort(&dircount);
+		dir = (TIFFDirEntry *)_TIFFCheckMalloc(tif, dircount,
+						       sizeof (TIFFDirEntry),
+					"to read TIFF custom directory");
+		if (dir == NULL)
+			return (0);
+		if (off + dircount * sizeof (TIFFDirEntry) > tif->tif_size) {
+			TIFFErrorExt(tif->tif_clientdata, module,
+                                  "%s: Can not read TIFF directory",
+                                  tif->tif_name);
+			goto bad;
+		} else {
+			_TIFFmemcpy(dir, tif->tif_base + off,
+				    dircount * sizeof (TIFFDirEntry));
+		}
+	}
+
+	TIFFFreeDirectory(tif);
+
+	fix = 0;
+	for (dp = dir, i = dircount; i > 0; i--, dp++) {
+		if (tif->tif_flags & TIFF_SWAB) {
+			TIFFSwabArrayOfShort(&dp->tdir_tag, 2);
+			TIFFSwabArrayOfLong(&dp->tdir_count, 2);
+		}
+
+		if (fix >= tif->tif_nfields || dp->tdir_tag == IGNORE)
+			continue;
+
+		while (fix < tif->tif_nfields &&
+		       tif->tif_fieldinfo[fix]->field_tag < dp->tdir_tag)
+			fix++;
+
+		if (fix >= tif->tif_nfields ||
+		    tif->tif_fieldinfo[fix]->field_tag != dp->tdir_tag) {
+
+			TIFFWarningExt(tif->tif_clientdata, module,
+                        "%s: unknown field with tag %d (0x%x) encountered",
+				    tif->tif_name, dp->tdir_tag, dp->tdir_tag,
+				    dp->tdir_type);
+
+			TIFFMergeFieldInfo(tif,
+					   _TIFFCreateAnonFieldInfo(tif,
+						dp->tdir_tag,
+						(TIFFDataType)dp->tdir_type),
+					   1);
+
+			fix = 0;
+			while (fix < tif->tif_nfields &&
+			       tif->tif_fieldinfo[fix]->field_tag < dp->tdir_tag)
+				fix++;
+		}
+		/*
+		 * Null out old tags that we ignore.
+		 */
+		if (tif->tif_fieldinfo[fix]->field_bit == FIELD_IGNORE) {
+	ignore:
+			dp->tdir_tag = IGNORE;
+			continue;
+		}
+		/*
+		 * Check data type.
+		 */
+		fip = tif->tif_fieldinfo[fix];
+		while (dp->tdir_type != (unsigned short) fip->field_type
+                       && fix < tif->tif_nfields) {
+			if (fip->field_type == TIFF_ANY)	/* wildcard */
+				break;
+                        fip = tif->tif_fieldinfo[++fix];
+			if (fix >= tif->tif_nfields ||
+			    fip->field_tag != dp->tdir_tag) {
+				TIFFWarningExt(tif->tif_clientdata, module,
+			"%s: wrong data type %d for \"%s\"; tag ignored",
+					    tif->tif_name, dp->tdir_type,
+					    tif->tif_fieldinfo[fix-1]->field_name);
+				goto ignore;
+			}
+		}
+		/*
+		 * Check count if known in advance.
+		 */
+		if (fip->field_readcount != TIFF_VARIABLE
+		    && fip->field_readcount != TIFF_VARIABLE2) {
+			uint32 expected = (fip->field_readcount == TIFF_SPP) ?
+			    (uint32) td->td_samplesperpixel :
+			    (uint32) fip->field_readcount;
+			if (!CheckDirCount(tif, dp, expected))
+				goto ignore;
+		}
+
+		(void) TIFFFetchNormalTag(tif, dp);
+	}
+
+	if (dir)
+		_TIFFfree(dir);
+	return 1;
+
+bad:
+	if (dir)
+		_TIFFfree(dir);
+	return 0;
+}
+
+/*
+ * EXIF is important special case of custom IFD, so we have a special
+ * function to read it.
+ */
+int
+TIFFReadEXIFDirectory(TIFF* tif, toff_t diroff)
+{
+	size_t exifFieldInfoCount;
+	const TIFFFieldInfo *exifFieldInfo =
+		_TIFFGetExifFieldInfo(&exifFieldInfoCount);
+	return TIFFReadCustomDirectory(tif, diroff, exifFieldInfo,
+				       exifFieldInfoCount);
+}
+
+static int
+EstimateStripByteCounts(TIFF* tif, TIFFDirEntry* dir, uint16 dircount)
+{
+	static const char module[] = "EstimateStripByteCounts";
+
+	register TIFFDirEntry *dp;
+	register TIFFDirectory *td = &tif->tif_dir;
+	uint16 i;
+
+	if (td->td_stripbytecount)
+		_TIFFfree(td->td_stripbytecount);
+	td->td_stripbytecount = (uint32*)
+	    _TIFFCheckMalloc(tif, td->td_nstrips, sizeof (uint32),
+		"for \"StripByteCounts\" array");
+	if (td->td_compression != COMPRESSION_NONE) {
+		uint32 space = (uint32)(sizeof (TIFFHeader)
+		    + sizeof (uint16)
+		    + (dircount * sizeof (TIFFDirEntry))
+		    + sizeof (uint32));
+		toff_t filesize = TIFFGetFileSize(tif);
+		uint16 n;
+
+		/* calculate amount of space used by indirect values */
+		for (dp = dir, n = dircount; n > 0; n--, dp++)
+		{
+			uint32 cc = TIFFDataWidth((TIFFDataType) dp->tdir_type);
+			if (cc == 0) {
+				TIFFErrorExt(tif->tif_clientdata, module,
+			"%s: Cannot determine size of unknown tag type %d",
+					  tif->tif_name, dp->tdir_type);
+				return -1;
+			}
+			cc = cc * dp->tdir_count;
+			if (cc > sizeof (uint32))
+				space += cc;
+		}
+		space = filesize - space;
+		if (td->td_planarconfig == PLANARCONFIG_SEPARATE)
+			space /= td->td_samplesperpixel;
+		for (i = 0; i < td->td_nstrips; i++)
+			td->td_stripbytecount[i] = space;
+		/*
+		 * This gross hack handles the case were the offset to
+		 * the last strip is past the place where we think the strip
+		 * should begin.  Since a strip of data must be contiguous,
+		 * it's safe to assume that we've overestimated the amount
+		 * of data in the strip and trim this number back accordingly.
+		 */
+		i--;
+		if (((toff_t)(td->td_stripoffset[i]+td->td_stripbytecount[i]))
+                                                               > filesize)
+			td->td_stripbytecount[i] =
+			    filesize - td->td_stripoffset[i];
+	} else {
+		uint32 rowbytes = TIFFScanlineSize(tif);
+		uint32 rowsperstrip = td->td_imagelength/td->td_stripsperimage;
+		for (i = 0; i < td->td_nstrips; i++)
+			td->td_stripbytecount[i] = rowbytes*rowsperstrip;
+	}
+	TIFFSetFieldBit(tif, FIELD_STRIPBYTECOUNTS);
+	if (!TIFFFieldSet(tif, FIELD_ROWSPERSTRIP))
+		td->td_rowsperstrip = td->td_imagelength;
+	return 1;
+}
+
+static void
+MissingRequired(TIFF* tif, const char* tagname)
+{
+	static const char module[] = "MissingRequired";
+
+	TIFFErrorExt(tif->tif_clientdata, module,
+		  "%s: TIFF directory is missing required \"%s\" field",
+		  tif->tif_name, tagname);
+}
+
+/*
+ * Check the count field of a directory
+ * entry against a known value.  The caller
+ * is expected to skip/ignore the tag if
+ * there is a mismatch.
+ */
+static int
+CheckDirCount(TIFF* tif, TIFFDirEntry* dir, uint32 count)
+{
+	if (count > dir->tdir_count) {
+		TIFFWarningExt(tif->tif_clientdata, tif->tif_name,
+	"incorrect count for field \"%s\" (%lu, expecting %lu); tag ignored",
+		    _TIFFFieldWithTag(tif, dir->tdir_tag)->field_name,
+		    dir->tdir_count, count);
+		return (0);
+	} else if (count < dir->tdir_count) {
+		TIFFWarningExt(tif->tif_clientdata, tif->tif_name,
+	"incorrect count for field \"%s\" (%lu, expecting %lu); tag trimmed",
+		    _TIFFFieldWithTag(tif, dir->tdir_tag)->field_name,
+		    dir->tdir_count, count);
+		return (1);
+	}
+	return (1);
+}
+
+/*
+ * Fetch a contiguous directory item.
+ */
+static tsize_t
+TIFFFetchData(TIFF* tif, TIFFDirEntry* dir, char* cp)
+{
+	int w = TIFFDataWidth((TIFFDataType) dir->tdir_type);
+	tsize_t cc = dir->tdir_count * w;
+
+	/* Check for overflow. */
+	if (!dir->tdir_count || !w || cc / w != (tsize_t)dir->tdir_count)
+		goto bad;
+
+	if (!isMapped(tif)) {
+		if (!SeekOK(tif, dir->tdir_offset))
+			goto bad;
+		if (!ReadOK(tif, cp, cc))
+			goto bad;
+	} else {
+		/* Check for overflow. */
+		if ((tsize_t)dir->tdir_offset + cc < (tsize_t)dir->tdir_offset
+		    || (tsize_t)dir->tdir_offset + cc < cc
+		    || (tsize_t)dir->tdir_offset + cc > (tsize_t)tif->tif_size)
+			goto bad;
+		_TIFFmemcpy(cp, tif->tif_base + dir->tdir_offset, cc);
+	}
+	if (tif->tif_flags & TIFF_SWAB) {
+		switch (dir->tdir_type) {
+		case TIFF_SHORT:
+		case TIFF_SSHORT:
+			TIFFSwabArrayOfShort((uint16*) cp, dir->tdir_count);
+			break;
+		case TIFF_LONG:
+		case TIFF_SLONG:
+		case TIFF_FLOAT:
+			TIFFSwabArrayOfLong((uint32*) cp, dir->tdir_count);
+			break;
+		case TIFF_RATIONAL:
+		case TIFF_SRATIONAL:
+			TIFFSwabArrayOfLong((uint32*) cp, 2*dir->tdir_count);
+			break;
+		case TIFF_DOUBLE:
+			TIFFSwabArrayOfDouble((double*) cp, dir->tdir_count);
+			break;
+		}
+	}
+	return (cc);
+bad:
+	TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
+		     "Error fetching data for field \"%s\"",
+		     _TIFFFieldWithTag(tif, dir->tdir_tag)->field_name);
+	return (tsize_t) 0;
+}
+
+/*
+ * Fetch an ASCII item from the file.
+ */
+static tsize_t
+TIFFFetchString(TIFF* tif, TIFFDirEntry* dir, char* cp)
+{
+	if (dir->tdir_count <= 4) {
+		uint32 l = dir->tdir_offset;
+		if (tif->tif_flags & TIFF_SWAB)
+			TIFFSwabLong(&l);
+		_TIFFmemcpy(cp, &l, dir->tdir_count);
+		return (1);
+	}
+	return (TIFFFetchData(tif, dir, cp));
+}
+
+/*
+ * Convert numerator+denominator to float.
+ */
+static int
+cvtRational(TIFF* tif, TIFFDirEntry* dir, uint32 num, uint32 denom, float* rv)
+{
+	if (denom == 0) {
+		TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
+		    "%s: Rational with zero denominator (num = %lu)",
+		    _TIFFFieldWithTag(tif, dir->tdir_tag)->field_name, num);
+		return (0);
+	} else {
+		if (dir->tdir_type == TIFF_RATIONAL)
+			*rv = ((float)num / (float)denom);
+		else
+			*rv = ((float)(int32)num / (float)(int32)denom);
+		return (1);
+	}
+}
+
+/*
+ * Fetch a rational item from the file
+ * at offset off and return the value
+ * as a floating point number.
+ */
+static float
+TIFFFetchRational(TIFF* tif, TIFFDirEntry* dir)
+{
+	uint32 l[2];
+	float v;
+
+	return (!TIFFFetchData(tif, dir, (char *)l) ||
+	    !cvtRational(tif, dir, l[0], l[1], &v) ? 1.0f : v);
+}
+
+/*
+ * Fetch a single floating point value
+ * from the offset field and return it
+ * as a native float.
+ */
+static float
+TIFFFetchFloat(TIFF* tif, TIFFDirEntry* dir)
+{
+	float v;
+	int32 l = TIFFExtractData(tif, dir->tdir_type, dir->tdir_offset);
+        _TIFFmemcpy(&v, &l, sizeof(float));
+	TIFFCvtIEEEFloatToNative(tif, 1, &v);
+	return (v);
+}
+
+/*
+ * Fetch an array of BYTE or SBYTE values.
+ */
+static int
+TIFFFetchByteArray(TIFF* tif, TIFFDirEntry* dir, uint8* v)
+{
+    if (dir->tdir_count <= 4) {
+        /*
+         * Extract data from offset field.
+         */
+        if (tif->tif_header.tiff_magic == TIFF_BIGENDIAN) {
+	    if (dir->tdir_type == TIFF_SBYTE)
+                switch (dir->tdir_count) {
+                    case 4: v[3] = dir->tdir_offset & 0xff;
+                    case 3: v[2] = (dir->tdir_offset >> 8) & 0xff;
+                    case 2: v[1] = (dir->tdir_offset >> 16) & 0xff;
+		    case 1: v[0] = dir->tdir_offset >> 24;
+                }
+	    else
+                switch (dir->tdir_count) {
+                    case 4: v[3] = dir->tdir_offset & 0xff;
+                    case 3: v[2] = (dir->tdir_offset >> 8) & 0xff;
+                    case 2: v[1] = (dir->tdir_offset >> 16) & 0xff;
+		    case 1: v[0] = dir->tdir_offset >> 24;
+                }
+	} else {
+	    if (dir->tdir_type == TIFF_SBYTE)
+                switch (dir->tdir_count) {
+                    case 4: v[3] = dir->tdir_offset >> 24;
+                    case 3: v[2] = (dir->tdir_offset >> 16) & 0xff;
+                    case 2: v[1] = (dir->tdir_offset >> 8) & 0xff;
+                    case 1: v[0] = dir->tdir_offset & 0xff;
+		}
+	    else
+                switch (dir->tdir_count) {
+                    case 4: v[3] = dir->tdir_offset >> 24;
+                    case 3: v[2] = (dir->tdir_offset >> 16) & 0xff;
+                    case 2: v[1] = (dir->tdir_offset >> 8) & 0xff;
+                    case 1: v[0] = dir->tdir_offset & 0xff;
+		}
+	}
+        return (1);
+    } else
+        return (TIFFFetchData(tif, dir, (char*) v) != 0);	/* XXX */
+}
+
+/*
+ * Fetch an array of SHORT or SSHORT values.
+ */
+static int
+TIFFFetchShortArray(TIFF* tif, TIFFDirEntry* dir, uint16* v)
+{
+	if (dir->tdir_count <= 2) {
+		if (tif->tif_header.tiff_magic == TIFF_BIGENDIAN) {
+			switch (dir->tdir_count) {
+			case 2: v[1] = (uint16) (dir->tdir_offset & 0xffff);
+			case 1: v[0] = (uint16) (dir->tdir_offset >> 16);
+			}
+		} else {
+			switch (dir->tdir_count) {
+			case 2: v[1] = (uint16) (dir->tdir_offset >> 16);
+			case 1: v[0] = (uint16) (dir->tdir_offset & 0xffff);
+			}
+		}
+		return (1);
+	} else
+		return (TIFFFetchData(tif, dir, (char *)v) != 0);
+}
+
+/*
+ * Fetch a pair of SHORT or BYTE values. Some tags may have either BYTE
+ * or SHORT type and this function works with both ones.
+ */
+static int
+TIFFFetchShortPair(TIFF* tif, TIFFDirEntry* dir)
+{
+	switch (dir->tdir_type) {
+		case TIFF_BYTE:
+		case TIFF_SBYTE:
+			{
+			uint8 v[4];
+			return TIFFFetchByteArray(tif, dir, v)
+				&& TIFFSetField(tif, dir->tdir_tag, v[0], v[1]);
+			}
+		case TIFF_SHORT:
+		case TIFF_SSHORT:
+			{
+			uint16 v[2];
+			return TIFFFetchShortArray(tif, dir, v)
+				&& TIFFSetField(tif, dir->tdir_tag, v[0], v[1]);
+			}
+		default:
+			return 0;
+	}
+}
+
+/*
+ * Fetch an array of LONG or SLONG values.
+ */
+static int
+TIFFFetchLongArray(TIFF* tif, TIFFDirEntry* dir, uint32* v)
+{
+	if (dir->tdir_count == 1) {
+		v[0] = dir->tdir_offset;
+		return (1);
+	} else
+		return (TIFFFetchData(tif, dir, (char*) v) != 0);
+}
+
+/*
+ * Fetch an array of RATIONAL or SRATIONAL values.
+ */
+static int
+TIFFFetchRationalArray(TIFF* tif, TIFFDirEntry* dir, float* v)
+{
+	int ok = 0;
+	uint32* l;
+
+	l = (uint32*)_TIFFCheckMalloc(tif,
+	    dir->tdir_count, TIFFDataWidth((TIFFDataType) dir->tdir_type),
+	    "to fetch array of rationals");
+	if (l) {
+		if (TIFFFetchData(tif, dir, (char *)l)) {
+			uint32 i;
+			for (i = 0; i < dir->tdir_count; i++) {
+				ok = cvtRational(tif, dir,
+				    l[2*i+0], l[2*i+1], &v[i]);
+				if (!ok)
+					break;
+			}
+		}
+		_TIFFfree((char *)l);
+	}
+	return (ok);
+}
+
+/*
+ * Fetch an array of FLOAT values.
+ */
+static int
+TIFFFetchFloatArray(TIFF* tif, TIFFDirEntry* dir, float* v)
+{
+
+	if (dir->tdir_count == 1) {
+		v[0] = *(float*) &dir->tdir_offset;
+		TIFFCvtIEEEFloatToNative(tif, dir->tdir_count, v);
+		return (1);
+	} else	if (TIFFFetchData(tif, dir, (char*) v)) {
+		TIFFCvtIEEEFloatToNative(tif, dir->tdir_count, v);
+		return (1);
+	} else
+		return (0);
+}
+
+/*
+ * Fetch an array of DOUBLE values.
+ */
+static int
+TIFFFetchDoubleArray(TIFF* tif, TIFFDirEntry* dir, double* v)
+{
+	if (TIFFFetchData(tif, dir, (char*) v)) {
+		TIFFCvtIEEEDoubleToNative(tif, dir->tdir_count, v);
+		return (1);
+	} else
+		return (0);
+}
+
+/*
+ * Fetch an array of ANY values.  The actual values are
+ * returned as doubles which should be able hold all the
+ * types.  Yes, there really should be an tany_t to avoid
+ * this potential non-portability ...  Note in particular
+ * that we assume that the double return value vector is
+ * large enough to read in any fundamental type.  We use
+ * that vector as a buffer to read in the base type vector
+ * and then convert it in place to double (from end
+ * to front of course).
+ */
+static int
+TIFFFetchAnyArray(TIFF* tif, TIFFDirEntry* dir, double* v)
+{
+	int i;
+
+	switch (dir->tdir_type) {
+	case TIFF_BYTE:
+	case TIFF_SBYTE:
+		if (!TIFFFetchByteArray(tif, dir, (uint8*) v))
+			return (0);
+		if (dir->tdir_type == TIFF_BYTE) {
+			uint8* vp = (uint8*) v;
+			for (i = dir->tdir_count-1; i >= 0; i--)
+				v[i] = vp[i];
+		} else {
+			int8* vp = (int8*) v;
+			for (i = dir->tdir_count-1; i >= 0; i--)
+				v[i] = vp[i];
+		}
+		break;
+	case TIFF_SHORT:
+	case TIFF_SSHORT:
+		if (!TIFFFetchShortArray(tif, dir, (uint16*) v))
+			return (0);
+		if (dir->tdir_type == TIFF_SHORT) {
+			uint16* vp = (uint16*) v;
+			for (i = dir->tdir_count-1; i >= 0; i--)
+				v[i] = vp[i];
+		} else {
+			int16* vp = (int16*) v;
+			for (i = dir->tdir_count-1; i >= 0; i--)
+				v[i] = vp[i];
+		}
+		break;
+	case TIFF_LONG:
+	case TIFF_SLONG:
+		if (!TIFFFetchLongArray(tif, dir, (uint32*) v))
+			return (0);
+		if (dir->tdir_type == TIFF_LONG) {
+			uint32* vp = (uint32*) v;
+			for (i = dir->tdir_count-1; i >= 0; i--)
+				v[i] = vp[i];
+		} else {
+			int32* vp = (int32*) v;
+			for (i = dir->tdir_count-1; i >= 0; i--)
+				v[i] = vp[i];
+		}
+		break;
+	case TIFF_RATIONAL:
+	case TIFF_SRATIONAL:
+		if (!TIFFFetchRationalArray(tif, dir, (float*) v))
+			return (0);
+		{ float* vp = (float*) v;
+		  for (i = dir->tdir_count-1; i >= 0; i--)
+			v[i] = vp[i];
+		}
+		break;
+	case TIFF_FLOAT:
+		if (!TIFFFetchFloatArray(tif, dir, (float*) v))
+			return (0);
+		{ float* vp = (float*) v;
+		  for (i = dir->tdir_count-1; i >= 0; i--)
+			v[i] = vp[i];
+		}
+		break;
+	case TIFF_DOUBLE:
+		return (TIFFFetchDoubleArray(tif, dir, (double*) v));
+	default:
+		/* TIFF_NOTYPE */
+		/* TIFF_ASCII */
+		/* TIFF_UNDEFINED */
+		TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
+			     "cannot read TIFF_ANY type %d for field \"%s\"",
+			     dir->tdir_type,
+			     _TIFFFieldWithTag(tif, dir->tdir_tag)->field_name);
+		return (0);
+	}
+	return (1);
+}
+
+/*
+ * Fetch a tag that is not handled by special case code.
+ */
+static int
+TIFFFetchNormalTag(TIFF* tif, TIFFDirEntry* dp)
+{
+	static const char mesg[] = "to fetch tag value";
+	int ok = 0;
+	const TIFFFieldInfo* fip = _TIFFFieldWithTag(tif, dp->tdir_tag);
+
+	if (dp->tdir_count > 1) {		/* array of values */
+		char* cp = NULL;
+
+		switch (dp->tdir_type) {
+		case TIFF_BYTE:
+		case TIFF_SBYTE:
+			cp = (char *)_TIFFCheckMalloc(tif,
+			    dp->tdir_count, sizeof (uint8), mesg);
+			ok = cp && TIFFFetchByteArray(tif, dp, (uint8*) cp);
+			break;
+		case TIFF_SHORT:
+		case TIFF_SSHORT:
+			cp = (char *)_TIFFCheckMalloc(tif,
+			    dp->tdir_count, sizeof (uint16), mesg);
+			ok = cp && TIFFFetchShortArray(tif, dp, (uint16*) cp);
+			break;
+		case TIFF_LONG:
+		case TIFF_SLONG:
+			cp = (char *)_TIFFCheckMalloc(tif,
+			    dp->tdir_count, sizeof (uint32), mesg);
+			ok = cp && TIFFFetchLongArray(tif, dp, (uint32*) cp);
+			break;
+		case TIFF_RATIONAL:
+		case TIFF_SRATIONAL:
+			cp = (char *)_TIFFCheckMalloc(tif,
+			    dp->tdir_count, sizeof (float), mesg);
+			ok = cp && TIFFFetchRationalArray(tif, dp, (float*) cp);
+			break;
+		case TIFF_FLOAT:
+			cp = (char *)_TIFFCheckMalloc(tif,
+			    dp->tdir_count, sizeof (float), mesg);
+			ok = cp && TIFFFetchFloatArray(tif, dp, (float*) cp);
+			break;
+		case TIFF_DOUBLE:
+			cp = (char *)_TIFFCheckMalloc(tif,
+			    dp->tdir_count, sizeof (double), mesg);
+			ok = cp && TIFFFetchDoubleArray(tif, dp, (double*) cp);
+			break;
+		case TIFF_ASCII:
+		case TIFF_UNDEFINED:		/* bit of a cheat... */
+			/*
+			 * Some vendors write strings w/o the trailing
+			 * NULL byte, so always append one just in case.
+			 */
+			cp = (char *)_TIFFCheckMalloc(tif, dp->tdir_count + 1,
+						      1, mesg);
+			if( (ok = (cp && TIFFFetchString(tif, dp, cp))) != 0 )
+				cp[dp->tdir_count] = '\0';	/* XXX */
+			break;
+		}
+		if (ok) {
+			ok = (fip->field_passcount ?
+			    TIFFSetField(tif, dp->tdir_tag, dp->tdir_count, cp)
+			  : TIFFSetField(tif, dp->tdir_tag, cp));
+		}
+		if (cp != NULL)
+			_TIFFfree(cp);
+	} else if (CheckDirCount(tif, dp, 1)) {	/* singleton value */
+		switch (dp->tdir_type) {
+		case TIFF_BYTE:
+		case TIFF_SBYTE:
+		case TIFF_SHORT:
+		case TIFF_SSHORT:
+			/*
+			 * If the tag is also acceptable as a LONG or SLONG
+			 * then TIFFSetField will expect an uint32 parameter
+			 * passed to it (through varargs).  Thus, for machines
+			 * where sizeof (int) != sizeof (uint32) we must do
+			 * a careful check here.  It's hard to say if this
+			 * is worth optimizing.
+			 *
+			 * NB: We use TIFFFieldWithTag here knowing that
+			 *     it returns us the first entry in the table
+			 *     for the tag and that that entry is for the
+			 *     widest potential data type the tag may have.
+			 */
+			{ TIFFDataType type = fip->field_type;
+			  if (type != TIFF_LONG && type != TIFF_SLONG) {
+				uint16 v = (uint16)
+			   TIFFExtractData(tif, dp->tdir_type, dp->tdir_offset);
+				ok = (fip->field_passcount ?
+				    TIFFSetField(tif, dp->tdir_tag, 1, &v)
+				  : TIFFSetField(tif, dp->tdir_tag, v));
+				break;
+			  }
+			}
+			/* fall thru... */
+		case TIFF_LONG:
+		case TIFF_SLONG:
+			{ uint32 v32 =
+		    TIFFExtractData(tif, dp->tdir_type, dp->tdir_offset);
+			  ok = (fip->field_passcount ?
+			      TIFFSetField(tif, dp->tdir_tag, 1, &v32)
+			    : TIFFSetField(tif, dp->tdir_tag, v32));
+			}
+			break;
+		case TIFF_RATIONAL:
+		case TIFF_SRATIONAL:
+		case TIFF_FLOAT:
+			{ float v = (dp->tdir_type == TIFF_FLOAT ?
+			      TIFFFetchFloat(tif, dp)
+			    : TIFFFetchRational(tif, dp));
+			  ok = (fip->field_passcount ?
+			      TIFFSetField(tif, dp->tdir_tag, 1, &v)
+			    : TIFFSetField(tif, dp->tdir_tag, v));
+			}
+			break;
+		case TIFF_DOUBLE:
+			{ double v;
+			  ok = (TIFFFetchDoubleArray(tif, dp, &v) &&
+			    (fip->field_passcount ?
+			      TIFFSetField(tif, dp->tdir_tag, 1, &v)
+			    : TIFFSetField(tif, dp->tdir_tag, v))
+			  );
+			}
+			break;
+		case TIFF_ASCII:
+		case TIFF_UNDEFINED:		/* bit of a cheat... */
+			{ char c[2];
+			  if( (ok = (TIFFFetchString(tif, dp, c) != 0)) != 0 ) {
+				c[1] = '\0';		/* XXX paranoid */
+				ok = (fip->field_passcount ?
+					TIFFSetField(tif, dp->tdir_tag, 1, c)
+				      : TIFFSetField(tif, dp->tdir_tag, c));
+			  }
+			}
+			break;
+		}
+	}
+	return (ok);
+}
+
+#define	NITEMS(x)	(sizeof (x) / sizeof (x[0]))
+/*
+ * Fetch samples/pixel short values for
+ * the specified tag and verify that
+ * all values are the same.
+ */
+static int
+TIFFFetchPerSampleShorts(TIFF* tif, TIFFDirEntry* dir, uint16* pl)
+{
+    uint16 samples = tif->tif_dir.td_samplesperpixel;
+    int status = 0;
+
+    if (CheckDirCount(tif, dir, (uint32) samples)) {
+        uint16 buf[10];
+        uint16* v = buf;
+
+        if (dir->tdir_count > NITEMS(buf))
+            v = (uint16*) _TIFFCheckMalloc(tif, dir->tdir_count, sizeof(uint16),
+                                      "to fetch per-sample values");
+        if (v && TIFFFetchShortArray(tif, dir, v)) {
+            uint16 i;
+            int check_count = dir->tdir_count;
+            if( samples < check_count )
+                check_count = samples;
+
+            for (i = 1; i < check_count; i++)
+                if (v[i] != v[0]) {
+					TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
+                              "Cannot handle different per-sample values for field \"%s\"",
+                              _TIFFFieldWithTag(tif, dir->tdir_tag)->field_name);
+                    goto bad;
+                }
+            *pl = v[0];
+            status = 1;
+        }
+      bad:
+        if (v && v != buf)
+            _TIFFfree(v);
+    }
+    return (status);
+}
+
+/*
+ * Fetch samples/pixel long values for
+ * the specified tag and verify that
+ * all values are the same.
+ */
+static int
+TIFFFetchPerSampleLongs(TIFF* tif, TIFFDirEntry* dir, uint32* pl)
+{
+    uint16 samples = tif->tif_dir.td_samplesperpixel;
+    int status = 0;
+
+    if (CheckDirCount(tif, dir, (uint32) samples)) {
+        uint32 buf[10];
+        uint32* v = buf;
+
+        if (dir->tdir_count > NITEMS(buf))
+            v = (uint32*) _TIFFCheckMalloc(tif, dir->tdir_count, sizeof(uint32),
+                                      "to fetch per-sample values");
+        if (v && TIFFFetchLongArray(tif, dir, v)) {
+            uint16 i;
+            int check_count = dir->tdir_count;
+
+            if( samples < check_count )
+                check_count = samples;
+            for (i = 1; i < check_count; i++)
+                if (v[i] != v[0]) {
+					TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
+                              "Cannot handle different per-sample values for field \"%s\"",
+                              _TIFFFieldWithTag(tif, dir->tdir_tag)->field_name);
+                    goto bad;
+                }
+            *pl = v[0];
+            status = 1;
+        }
+      bad:
+        if (v && v != buf)
+            _TIFFfree(v);
+    }
+    return (status);
+}
+
+/*
+ * Fetch samples/pixel ANY values for the specified tag and verify that all
+ * values are the same.
+ */
+static int
+TIFFFetchPerSampleAnys(TIFF* tif, TIFFDirEntry* dir, double* pl)
+{
+    uint16 samples = tif->tif_dir.td_samplesperpixel;
+    int status = 0;
+
+    if (CheckDirCount(tif, dir, (uint32) samples)) {
+        double buf[10];
+        double* v = buf;
+
+        if (dir->tdir_count > NITEMS(buf))
+            v = (double*) _TIFFCheckMalloc(tif, dir->tdir_count, sizeof (double),
+                                      "to fetch per-sample values");
+        if (v && TIFFFetchAnyArray(tif, dir, v)) {
+            uint16 i;
+            int check_count = dir->tdir_count;
+            if( samples < check_count )
+                check_count = samples;
+
+            for (i = 1; i < check_count; i++)
+                if (v[i] != v[0]) {
+                    TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
+                              "Cannot handle different per-sample values for field \"%s\"",
+                              _TIFFFieldWithTag(tif, dir->tdir_tag)->field_name);
+                    goto bad;
+                }
+            *pl = v[0];
+            status = 1;
+        }
+      bad:
+        if (v && v != buf)
+            _TIFFfree(v);
+    }
+    return (status);
+}
+#undef NITEMS
+
+/*
+ * Fetch a set of offsets or lengths.
+ * While this routine says "strips", in fact it's also used for tiles.
+ */
+static int
+TIFFFetchStripThing(TIFF* tif, TIFFDirEntry* dir, long nstrips, uint32** lpp)
+{
+	register uint32* lp;
+	int status;
+
+        CheckDirCount(tif, dir, (uint32) nstrips);
+
+	/*
+	 * Allocate space for strip information.
+	 */
+	if (*lpp == NULL &&
+	    (*lpp = (uint32 *)_TIFFCheckMalloc(tif,
+	      nstrips, sizeof (uint32), "for strip array")) == NULL)
+		return (0);
+	lp = *lpp;
+        _TIFFmemset( lp, 0, sizeof(uint32) * nstrips );
+
+	if (dir->tdir_type == (int)TIFF_SHORT) {
+		/*
+		 * Handle uint16->uint32 expansion.
+		 */
+		uint16* dp = (uint16*) _TIFFCheckMalloc(tif,
+		    dir->tdir_count, sizeof (uint16), "to fetch strip tag");
+		if (dp == NULL)
+			return (0);
+		if( (status = TIFFFetchShortArray(tif, dir, dp)) != 0 ) {
+                    int i;
+
+                    for( i = 0; i < nstrips && i < (int) dir->tdir_count; i++ )
+                    {
+                        lp[i] = dp[i];
+                    }
+		}
+		_TIFFfree((char*) dp);
+
+        } else if( nstrips != (int) dir->tdir_count ) {
+            /* Special case to correct length */
+
+            uint32* dp = (uint32*) _TIFFCheckMalloc(tif,
+		    dir->tdir_count, sizeof (uint32), "to fetch strip tag");
+            if (dp == NULL)
+                return (0);
+
+            status = TIFFFetchLongArray(tif, dir, dp);
+            if( status != 0 ) {
+                int i;
+
+                for( i = 0; i < nstrips && i < (int) dir->tdir_count; i++ )
+                {
+                    lp[i] = dp[i];
+                }
+            }
+
+            _TIFFfree( (char *) dp );
+	} else
+            status = TIFFFetchLongArray(tif, dir, lp);
+
+	return (status);
+}
+
+/*
+ * Fetch and set the RefBlackWhite tag.
+ */
+static int
+TIFFFetchRefBlackWhite(TIFF* tif, TIFFDirEntry* dir)
+{
+	static const char mesg[] = "for \"ReferenceBlackWhite\" array";
+	char* cp;
+	int ok;
+
+	if (dir->tdir_type == TIFF_RATIONAL)
+		return (TIFFFetchNormalTag(tif, dir));
+	/*
+	 * Handle LONG's for backward compatibility.
+	 */
+	cp = (char *)_TIFFCheckMalloc(tif, dir->tdir_count,
+				      sizeof (uint32), mesg);
+	if( (ok = (cp && TIFFFetchLongArray(tif, dir, (uint32*) cp))) != 0) {
+		float* fp = (float*)
+		    _TIFFCheckMalloc(tif, dir->tdir_count, sizeof (float), mesg);
+		if( (ok = (fp != NULL)) != 0 ) {
+			uint32 i;
+			for (i = 0; i < dir->tdir_count; i++)
+				fp[i] = (float)((uint32*) cp)[i];
+			ok = TIFFSetField(tif, dir->tdir_tag, fp);
+			_TIFFfree((char*) fp);
+		}
+	}
+	if (cp)
+		_TIFFfree(cp);
+	return (ok);
+}
+
+/*
+ * Replace a single strip (tile) of uncompressed data by
+ * multiple strips (tiles), each approximately 8Kbytes.
+ * This is useful for dealing with large images or
+ * for dealing with machines with a limited amount
+ * memory.
+ */
+static void
+ChopUpSingleUncompressedStrip(TIFF* tif)
+{
+	register TIFFDirectory *td = &tif->tif_dir;
+	uint32 bytecount = td->td_stripbytecount[0];
+	uint32 offset = td->td_stripoffset[0];
+	tsize_t rowbytes = TIFFVTileSize(tif, 1), stripbytes;
+	tstrip_t strip, nstrips, rowsperstrip;
+	uint32* newcounts;
+	uint32* newoffsets;
+
+	/*
+	 * Make the rows hold at least one scanline, but fill specified amount
+	 * of data if possible.
+	 */
+	if (rowbytes > STRIP_SIZE_DEFAULT) {
+		stripbytes = rowbytes;
+		rowsperstrip = 1;
+	} else if (rowbytes > 0 ) {
+		rowsperstrip = STRIP_SIZE_DEFAULT / rowbytes;
+		stripbytes = rowbytes * rowsperstrip;
+	}
+        else
+            return;
+
+	/*
+	 * never increase the number of strips in an image
+	 */
+	if (rowsperstrip >= td->td_rowsperstrip)
+		return;
+	nstrips = (tstrip_t) TIFFhowmany(bytecount, stripbytes);
+        if( nstrips == 0 ) /* something is wonky, do nothing. */
+            return;
+
+	newcounts = (uint32*) _TIFFCheckMalloc(tif, nstrips, sizeof (uint32),
+				"for chopped \"StripByteCounts\" array");
+	newoffsets = (uint32*) _TIFFCheckMalloc(tif, nstrips, sizeof (uint32),
+				"for chopped \"StripOffsets\" array");
+	if (newcounts == NULL || newoffsets == NULL) {
+	        /*
+		 * Unable to allocate new strip information, give
+		 * up and use the original one strip information.
+		 */
+		if (newcounts != NULL)
+			_TIFFfree(newcounts);
+		if (newoffsets != NULL)
+			_TIFFfree(newoffsets);
+		return;
+	}
+	/*
+	 * Fill the strip information arrays with new bytecounts and offsets
+	 * that reflect the broken-up format.
+	 */
+	for (strip = 0; strip < nstrips; strip++) {
+		if (stripbytes > (tsize_t) bytecount)
+			stripbytes = bytecount;
+		newcounts[strip] = stripbytes;
+		newoffsets[strip] = offset;
+		offset += stripbytes;
+		bytecount -= stripbytes;
+	}
+	/*
+	 * Replace old single strip info with multi-strip info.
+	 */
+	td->td_stripsperimage = td->td_nstrips = nstrips;
+	TIFFSetField(tif, TIFFTAG_ROWSPERSTRIP, rowsperstrip);
+
+	_TIFFfree(td->td_stripbytecount);
+	_TIFFfree(td->td_stripoffset);
+	td->td_stripbytecount = newcounts;
+	td->td_stripoffset = newoffsets;
+	td->td_stripbytecountsorted = 1;
+}
+
+/* vim: set ts=8 sts=8 sw=8 noet: */
diff --git a/uppsrc/plugin/tif/lib/tif_dirwrite.c b/uppsrc/plugin/tif/lib/tif_dirwrite.c
new file mode 100644
index 000000000..c87221de0
--- /dev/null
+++ b/uppsrc/plugin/tif/lib/tif_dirwrite.c
@@ -0,0 +1,1243 @@
+/* $Id: tif_dirwrite.c,v 1.34 2006/02/23 16:07:45 dron Exp $ */
+
+/*
+ * Copyright (c) 1988-1997 Sam Leffler
+ * Copyright (c) 1991-1997 Silicon Graphics, Inc.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and
+ * its documentation for any purpose is hereby granted without fee, provided
+ * that (i) the above copyright notices and this permission notice appear in
+ * all copies of the software and related documentation, and (ii) the names of
+ * Sam Leffler and Silicon Graphics may not be used in any advertising or
+ * publicity relating to the software without the specific, prior written
+ * permission of Sam Leffler and Silicon Graphics.
+ *
+ * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+ * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
+ * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
+ * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+ * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
+ * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.
+ */
+
+/*
+ * TIFF Library.
+ *
+ * Directory Write Support Routines.
+ */
+#include "tiffiop.h"
+
+#ifdef HAVE_IEEEFP
+# define	TIFFCvtNativeToIEEEFloat(tif, n, fp)
+# define	TIFFCvtNativeToIEEEDouble(tif, n, dp)
+#else
+extern	void TIFFCvtNativeToIEEEFloat(TIFF*, uint32, float*);
+extern	void TIFFCvtNativeToIEEEDouble(TIFF*, uint32, double*);
+#endif
+
+static	int TIFFWriteNormalTag(TIFF*, TIFFDirEntry*, const TIFFFieldInfo*);
+static	void TIFFSetupShortLong(TIFF*, ttag_t, TIFFDirEntry*, uint32);
+static	void TIFFSetupShort(TIFF*, ttag_t, TIFFDirEntry*, uint16);
+static	int TIFFSetupShortPair(TIFF*, ttag_t, TIFFDirEntry*);
+static	int TIFFWritePerSampleShorts(TIFF*, ttag_t, TIFFDirEntry*);
+static	int TIFFWritePerSampleAnys(TIFF*, TIFFDataType, ttag_t, TIFFDirEntry*);
+static	int TIFFWriteShortTable(TIFF*, ttag_t, TIFFDirEntry*, uint32, uint16**);
+static	int TIFFWriteShortArray(TIFF*, TIFFDirEntry*, uint16*);
+static	int TIFFWriteLongArray(TIFF *, TIFFDirEntry*, uint32*);
+static	int TIFFWriteRationalArray(TIFF *, TIFFDirEntry*, float*);
+static	int TIFFWriteFloatArray(TIFF *, TIFFDirEntry*, float*);
+static	int TIFFWriteDoubleArray(TIFF *, TIFFDirEntry*, double*);
+static	int TIFFWriteByteArray(TIFF*, TIFFDirEntry*, char*);
+static	int TIFFWriteAnyArray(TIFF*,
+	    TIFFDataType, ttag_t, TIFFDirEntry*, uint32, double*);
+static	int TIFFWriteTransferFunction(TIFF*, TIFFDirEntry*);
+static	int TIFFWriteInkNames(TIFF*, TIFFDirEntry*);
+static	int TIFFWriteData(TIFF*, TIFFDirEntry*, char*);
+static	int TIFFLinkDirectory(TIFF*);
+
+#define	WriteRationalPair(type, tag1, v1, tag2, v2) {		\
+	TIFFWriteRational((tif), (type), (tag1), (dir), (v1))	\
+	TIFFWriteRational((tif), (type), (tag2), (dir)+1, (v2))	\
+	(dir)++;						\
+}
+#define	TIFFWriteRational(tif, type, tag, dir, v)		\
+	(dir)->tdir_tag = (tag);				\
+	(dir)->tdir_type = (type);				\
+	(dir)->tdir_count = 1;					\
+	if (!TIFFWriteRationalArray((tif), (dir), &(v)))	\
+		goto bad;
+
+/*
+ * Write the contents of the current directory
+ * to the specified file.  This routine doesn't
+ * handle overwriting a directory with auxiliary
+ * storage that's been changed.
+ */
+static int
+_TIFFWriteDirectory(TIFF* tif, int done)
+{
+	uint16 dircount;
+	toff_t diroff;
+	ttag_t tag;
+	uint32 nfields;
+	tsize_t dirsize;
+	char* data;
+	TIFFDirEntry* dir;
+	TIFFDirectory* td;
+	unsigned long b, fields[FIELD_SETLONGS];
+	int fi, nfi;
+
+	if (tif->tif_mode == O_RDONLY)
+		return (1);
+	/*
+	 * Clear write state so that subsequent images with
+	 * different characteristics get the right buffers
+	 * setup for them.
+	 */
+	if (done)
+	{
+	    if (tif->tif_flags & TIFF_POSTENCODE) {
+		    tif->tif_flags &= ~TIFF_POSTENCODE;
+		    if (!(*tif->tif_postencode)(tif)) {
+				TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
+				"Error post-encoding before directory write");
+			    return (0);
+		    }
+	    }
+	    (*tif->tif_close)(tif);		/* shutdown encoder */
+	    /*
+	     * Flush any data that might have been written
+	     * by the compression close+cleanup routines.
+	     */
+	    if (tif->tif_rawcc > 0 && !TIFFFlushData1(tif)) {
+			TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
+			"Error flushing data before directory write");
+		    return (0);
+	    }
+	    if ((tif->tif_flags & TIFF_MYBUFFER) && tif->tif_rawdata) {
+		    _TIFFfree(tif->tif_rawdata);
+		    tif->tif_rawdata = NULL;
+		    tif->tif_rawcc = 0;
+		    tif->tif_rawdatasize = 0;
+	    }
+	    tif->tif_flags &= ~(TIFF_BEENWRITING|TIFF_BUFFERSETUP);
+	}
+
+	td = &tif->tif_dir;
+	/*
+	 * Size the directory so that we can calculate
+	 * offsets for the data items that aren't kept
+	 * in-place in each field.
+	 */
+	nfields = 0;
+	for (b = 0; b <= FIELD_LAST; b++)
+		if (TIFFFieldSet(tif, b) && b != FIELD_CUSTOM)
+			nfields += (b < FIELD_SUBFILETYPE ? 2 : 1);
+        nfields += td->td_customValueCount;
+	dirsize = nfields * sizeof (TIFFDirEntry);
+	data = (char*) _TIFFmalloc(dirsize);
+	if (data == NULL) {
+		TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
+		    "Cannot write directory, out of space");
+		return (0);
+	}
+	/*
+	 * Directory hasn't been placed yet, put
+	 * it at the end of the file and link it
+	 * into the existing directory structure.
+	 */
+	if (tif->tif_diroff == 0 && !TIFFLinkDirectory(tif))
+		goto bad;
+	tif->tif_dataoff = (toff_t)(
+	    tif->tif_diroff + sizeof (uint16) + dirsize + sizeof (toff_t));
+	if (tif->tif_dataoff & 1)
+		tif->tif_dataoff++;
+	(void) TIFFSeekFile(tif, tif->tif_dataoff, SEEK_SET);
+	tif->tif_curdir++;
+	dir = (TIFFDirEntry*) data;
+	/*
+	 * Setup external form of directory
+	 * entries and write data items.
+	 */
+	_TIFFmemcpy(fields, td->td_fieldsset, sizeof (fields));
+	/*
+	 * Write out ExtraSamples tag only if
+	 * extra samples are present in the data.
+	 */
+	if (FieldSet(fields, FIELD_EXTRASAMPLES) && !td->td_extrasamples) {
+		ResetFieldBit(fields, FIELD_EXTRASAMPLES);
+		nfields--;
+		dirsize -= sizeof (TIFFDirEntry);
+	}								/*XXX*/
+	for (fi = 0, nfi = tif->tif_nfields; nfi > 0; nfi--, fi++) {
+		const TIFFFieldInfo* fip = tif->tif_fieldinfo[fi];
+
+                /*
+                ** For custom fields, we test to see if the custom field
+                ** is set or not.  For normal fields, we just use the
+                ** FieldSet test.
+                */
+                if( fip->field_bit == FIELD_CUSTOM )
+                {
+                    int ci, is_set = FALSE;
+
+                    for( ci = 0; ci < td->td_customValueCount; ci++ )
+                        is_set |= (td->td_customValues[ci].info == fip);
+
+                    if( !is_set )
+                        continue;
+                }
+		else if (!FieldSet(fields, fip->field_bit))
+                    continue;
+
+
+                /*
+                ** Handle other fields.
+                */
+		switch (fip->field_bit)
+                {
+		case FIELD_STRIPOFFSETS:
+			/*
+			 * We use one field bit for both strip and tile
+
+			 * offsets, and so must be careful in selecting
+			 * the appropriate field descriptor (so that tags
+			 * are written in sorted order).
+			 */
+			tag = isTiled(tif) ?
+			    TIFFTAG_TILEOFFSETS : TIFFTAG_STRIPOFFSETS;
+			if (tag != fip->field_tag)
+				continue;
+
+			dir->tdir_tag = (uint16) tag;
+			dir->tdir_type = (uint16) TIFF_LONG;
+			dir->tdir_count = (uint32) td->td_nstrips;
+			if (!TIFFWriteLongArray(tif, dir, td->td_stripoffset))
+				goto bad;
+			break;
+		case FIELD_STRIPBYTECOUNTS:
+			/*
+			 * We use one field bit for both strip and tile
+			 * byte counts, and so must be careful in selecting
+			 * the appropriate field descriptor (so that tags
+			 * are written in sorted order).
+			 */
+			tag = isTiled(tif) ?
+			    TIFFTAG_TILEBYTECOUNTS : TIFFTAG_STRIPBYTECOUNTS;
+			if (tag != fip->field_tag)
+				continue;
+
+			dir->tdir_tag = (uint16) tag;
+			dir->tdir_type = (uint16) TIFF_LONG;
+			dir->tdir_count = (uint32) td->td_nstrips;
+			if (!TIFFWriteLongArray(tif, dir,
+						td->td_stripbytecount))
+				goto bad;
+			break;
+		case FIELD_ROWSPERSTRIP:
+			TIFFSetupShortLong(tif, TIFFTAG_ROWSPERSTRIP,
+			    dir, td->td_rowsperstrip);
+			break;
+		case FIELD_COLORMAP:
+			if (!TIFFWriteShortTable(tif, TIFFTAG_COLORMAP, dir,
+			    3, td->td_colormap))
+				goto bad;
+			break;
+		case FIELD_IMAGEDIMENSIONS:
+			TIFFSetupShortLong(tif, TIFFTAG_IMAGEWIDTH,
+			    dir++, td->td_imagewidth);
+			TIFFSetupShortLong(tif, TIFFTAG_IMAGELENGTH,
+			    dir, td->td_imagelength);
+			break;
+		case FIELD_TILEDIMENSIONS:
+			TIFFSetupShortLong(tif, TIFFTAG_TILEWIDTH,
+			    dir++, td->td_tilewidth);
+			TIFFSetupShortLong(tif, TIFFTAG_TILELENGTH,
+			    dir, td->td_tilelength);
+			break;
+		case FIELD_COMPRESSION:
+			TIFFSetupShort(tif, TIFFTAG_COMPRESSION,
+			    dir, td->td_compression);
+			break;
+		case FIELD_PHOTOMETRIC:
+			TIFFSetupShort(tif, TIFFTAG_PHOTOMETRIC,
+			    dir, td->td_photometric);
+			break;
+		case FIELD_POSITION:
+			WriteRationalPair(TIFF_RATIONAL,
+			    TIFFTAG_XPOSITION, td->td_xposition,
+			    TIFFTAG_YPOSITION, td->td_yposition);
+			break;
+		case FIELD_RESOLUTION:
+			WriteRationalPair(TIFF_RATIONAL,
+			    TIFFTAG_XRESOLUTION, td->td_xresolution,
+			    TIFFTAG_YRESOLUTION, td->td_yresolution);
+			break;
+		case FIELD_BITSPERSAMPLE:
+		case FIELD_MINSAMPLEVALUE:
+		case FIELD_MAXSAMPLEVALUE:
+		case FIELD_SAMPLEFORMAT:
+			if (!TIFFWritePerSampleShorts(tif, fip->field_tag, dir))
+				goto bad;
+			break;
+		case FIELD_SMINSAMPLEVALUE:
+		case FIELD_SMAXSAMPLEVALUE:
+			if (!TIFFWritePerSampleAnys(tif,
+			    _TIFFSampleToTagType(tif), fip->field_tag, dir))
+				goto bad;
+			break;
+		case FIELD_PAGENUMBER:
+		case FIELD_HALFTONEHINTS:
+		case FIELD_YCBCRSUBSAMPLING:
+			if (!TIFFSetupShortPair(tif, fip->field_tag, dir))
+				goto bad;
+			break;
+		case FIELD_INKNAMES:
+			if (!TIFFWriteInkNames(tif, dir))
+				goto bad;
+			break;
+		case FIELD_TRANSFERFUNCTION:
+			if (!TIFFWriteTransferFunction(tif, dir))
+				goto bad;
+			break;
+		case FIELD_SUBIFD:
+			/*
+			 * XXX: Always write this field using LONG type
+			 * for backward compatibility.
+			 */
+			dir->tdir_tag = (uint16) fip->field_tag;
+			dir->tdir_type = (uint16) TIFF_LONG;
+			dir->tdir_count = (uint32) td->td_nsubifd;
+			if (!TIFFWriteLongArray(tif, dir, td->td_subifd))
+				goto bad;
+			/*
+			 * Total hack: if this directory includes a SubIFD
+			 * tag then force the next <n> directories to be
+			 * written as ``sub directories'' of this one.  This
+			 * is used to write things like thumbnails and
+			 * image masks that one wants to keep out of the
+			 * normal directory linkage access mechanism.
+			 */
+			if (dir->tdir_count > 0) {
+				tif->tif_flags |= TIFF_INSUBIFD;
+				tif->tif_nsubifd = (uint16) dir->tdir_count;
+				if (dir->tdir_count > 1)
+					tif->tif_subifdoff = dir->tdir_offset;
+				else
+					tif->tif_subifdoff = (uint32)(
+					      tif->tif_diroff
+					    + sizeof (uint16)
+					    + ((char*)&dir->tdir_offset-data));
+			}
+			break;
+		default:
+			/* XXX: Should be fixed and removed. */
+			if (fip->field_tag == TIFFTAG_DOTRANGE) {
+				if (!TIFFSetupShortPair(tif, fip->field_tag, dir))
+					goto bad;
+			}
+			else if (!TIFFWriteNormalTag(tif, dir, fip))
+				goto bad;
+			break;
+		}
+		dir++;
+
+                if( fip->field_bit != FIELD_CUSTOM )
+                    ResetFieldBit(fields, fip->field_bit);
+	}
+
+	/*
+	 * Write directory.
+	 */
+	dircount = (uint16) nfields;
+	diroff = (uint32) tif->tif_nextdiroff;
+	if (tif->tif_flags & TIFF_SWAB) {
+		/*
+		 * The file's byte order is opposite to the
+		 * native machine architecture.  We overwrite
+		 * the directory information with impunity
+		 * because it'll be released below after we
+		 * write it to the file.  Note that all the
+		 * other tag construction routines assume that
+		 * we do this byte-swapping; i.e. they only
+		 * byte-swap indirect data.
+		 */
+		for (dir = (TIFFDirEntry*) data; dircount; dir++, dircount--) {
+			TIFFSwabArrayOfShort(&dir->tdir_tag, 2);
+			TIFFSwabArrayOfLong(&dir->tdir_count, 2);
+		}
+		dircount = (uint16) nfields;
+		TIFFSwabShort(&dircount);
+		TIFFSwabLong(&diroff);
+	}
+	(void) TIFFSeekFile(tif, tif->tif_diroff, SEEK_SET);
+	if (!WriteOK(tif, &dircount, sizeof (dircount))) {
+		TIFFErrorExt(tif->tif_clientdata, tif->tif_name, "Error writing directory count");
+		goto bad;
+	}
+	if (!WriteOK(tif, data, dirsize)) {
+		TIFFErrorExt(tif->tif_clientdata, tif->tif_name, "Error writing directory contents");
+		goto bad;
+	}
+	if (!WriteOK(tif, &diroff, sizeof (diroff))) {
+		TIFFErrorExt(tif->tif_clientdata, tif->tif_name, "Error writing directory link");
+		goto bad;
+	}
+	if (done) {
+		TIFFFreeDirectory(tif);
+		tif->tif_flags &= ~TIFF_DIRTYDIRECT;
+		(*tif->tif_cleanup)(tif);
+
+		/*
+		* Reset directory-related state for subsequent
+		* directories.
+		*/
+		TIFFCreateDirectory(tif);
+	}
+	_TIFFfree(data);
+	return (1);
+bad:
+	_TIFFfree(data);
+	return (0);
+}
+#undef WriteRationalPair
+
+int
+TIFFWriteDirectory(TIFF* tif)
+{
+	return _TIFFWriteDirectory(tif, TRUE);
+}
+
+/*
+ * Similar to TIFFWriteDirectory(), writes the directory out
+ * but leaves all data structures in memory so that it can be
+ * written again.  This will make a partially written TIFF file
+ * readable before it is successfully completed/closed.
+ */
+int
+TIFFCheckpointDirectory(TIFF* tif)
+{
+	int rc;
+	/* Setup the strips arrays, if they haven't already been. */
+	if (tif->tif_dir.td_stripoffset == NULL)
+	    (void) TIFFSetupStrips(tif);
+	rc = _TIFFWriteDirectory(tif, FALSE);
+	(void) TIFFSetWriteOffset(tif, TIFFSeekFile(tif, 0, SEEK_END));
+	return rc;
+}
+
+/*
+ * Process tags that are not special cased.
+ */
+static int
+TIFFWriteNormalTag(TIFF* tif, TIFFDirEntry* dir, const TIFFFieldInfo* fip)
+{
+	uint16 wc = (uint16) fip->field_writecount;
+	uint32 wc2;
+
+	dir->tdir_tag = (uint16) fip->field_tag;
+	dir->tdir_type = (uint16) fip->field_type;
+	dir->tdir_count = wc;
+
+	switch (fip->field_type) {
+	case TIFF_SHORT:
+	case TIFF_SSHORT:
+		if (fip->field_passcount) {
+			uint16* wp;
+			if (wc == (uint16) TIFF_VARIABLE2) {
+				TIFFGetField(tif, fip->field_tag, &wc2, &wp);
+				dir->tdir_count = wc2;
+			} else {	/* Assume TIFF_VARIABLE */
+				TIFFGetField(tif, fip->field_tag, &wc, &wp);
+				dir->tdir_count = wc;
+			}
+			if (!TIFFWriteShortArray(tif, dir, wp))
+				return 0;
+		} else {
+			if (wc == 1) {
+				uint16 sv;
+				TIFFGetField(tif, fip->field_tag, &sv);
+				dir->tdir_offset =
+					TIFFInsertData(tif, dir->tdir_type, sv);
+			} else {
+				uint16* wp;
+				TIFFGetField(tif, fip->field_tag, &wp);
+				if (!TIFFWriteShortArray(tif, dir, wp))
+					return 0;
+			}
+		}
+		break;
+	case TIFF_LONG:
+	case TIFF_SLONG:
+	case TIFF_IFD:
+		if (fip->field_passcount) {
+			uint32* lp;
+			if (wc == (uint16) TIFF_VARIABLE2) {
+				TIFFGetField(tif, fip->field_tag, &wc2, &lp);
+				dir->tdir_count = wc2;
+			} else {	/* Assume TIFF_VARIABLE */
+				TIFFGetField(tif, fip->field_tag, &wc, &lp);
+				dir->tdir_count = wc;
+			}
+			if (!TIFFWriteLongArray(tif, dir, lp))
+				return 0;
+		} else {
+			if (wc == 1) {
+				/* XXX handle LONG->SHORT conversion */
+				TIFFGetField(tif, fip->field_tag,
+					     &dir->tdir_offset);
+			} else {
+				uint32* lp;
+				TIFFGetField(tif, fip->field_tag, &lp);
+				if (!TIFFWriteLongArray(tif, dir, lp))
+					return 0;
+			}
+		}
+		break;
+	case TIFF_RATIONAL:
+	case TIFF_SRATIONAL:
+		if (fip->field_passcount) {
+			float* fp;
+			if (wc == (uint16) TIFF_VARIABLE2) {
+				TIFFGetField(tif, fip->field_tag, &wc2, &fp);
+				dir->tdir_count = wc2;
+			} else {	/* Assume TIFF_VARIABLE */
+				TIFFGetField(tif, fip->field_tag, &wc, &fp);
+				dir->tdir_count = wc;
+			}
+			if (!TIFFWriteRationalArray(tif, dir, fp))
+				return 0;
+		} else {
+			if (wc == 1) {
+				float fv;
+				TIFFGetField(tif, fip->field_tag, &fv);
+				if (!TIFFWriteRationalArray(tif, dir, &fv))
+					return 0;
+			} else {
+				float* fp;
+				TIFFGetField(tif, fip->field_tag, &fp);
+				if (!TIFFWriteRationalArray(tif, dir, fp))
+					return 0;
+			}
+		}
+		break;
+	case TIFF_FLOAT:
+		if (fip->field_passcount) {
+			float* fp;
+			if (wc == (uint16) TIFF_VARIABLE2) {
+				TIFFGetField(tif, fip->field_tag, &wc2, &fp);
+				dir->tdir_count = wc2;
+			} else {	/* Assume TIFF_VARIABLE */
+				TIFFGetField(tif, fip->field_tag, &wc, &fp);
+				dir->tdir_count = wc;
+			}
+			if (!TIFFWriteFloatArray(tif, dir, fp))
+				return 0;
+		} else {
+			if (wc == 1) {
+				float fv;
+				TIFFGetField(tif, fip->field_tag, &fv);
+				if (!TIFFWriteFloatArray(tif, dir, &fv))
+					return 0;
+			} else {
+				float* fp;
+				TIFFGetField(tif, fip->field_tag, &fp);
+				if (!TIFFWriteFloatArray(tif, dir, fp))
+					return 0;
+			}
+		}
+		break;
+	case TIFF_DOUBLE:
+		if (fip->field_passcount) {
+			double* dp;
+			if (wc == (uint16) TIFF_VARIABLE2) {
+				TIFFGetField(tif, fip->field_tag, &wc2, &dp);
+				dir->tdir_count = wc2;
+			} else {	/* Assume TIFF_VARIABLE */
+				TIFFGetField(tif, fip->field_tag, &wc, &dp);
+				dir->tdir_count = wc;
+			}
+			if (!TIFFWriteDoubleArray(tif, dir, dp))
+				return 0;
+		} else {
+			if (wc == 1) {
+				double dv;
+				TIFFGetField(tif, fip->field_tag, &dv);
+				if (!TIFFWriteDoubleArray(tif, dir, &dv))
+					return 0;
+			} else {
+				double* dp;
+				TIFFGetField(tif, fip->field_tag, &dp);
+				if (!TIFFWriteDoubleArray(tif, dir, dp))
+					return 0;
+			}
+		}
+		break;
+	case TIFF_ASCII:
+		{
+                    char* cp;
+                    if (fip->field_passcount)
+                        TIFFGetField(tif, fip->field_tag, &wc, &cp);
+                    else
+                        TIFFGetField(tif, fip->field_tag, &cp);
+
+                    dir->tdir_count = (uint32) (strlen(cp) + 1);
+                    if (!TIFFWriteByteArray(tif, dir, cp))
+                        return (0);
+		}
+		break;
+
+        case TIFF_BYTE:
+        case TIFF_SBYTE:
+		if (fip->field_passcount) {
+			char* cp;
+			if (wc == (uint16) TIFF_VARIABLE2) {
+				TIFFGetField(tif, fip->field_tag, &wc2, &cp);
+				dir->tdir_count = wc2;
+			} else {	/* Assume TIFF_VARIABLE */
+				TIFFGetField(tif, fip->field_tag, &wc, &cp);
+				dir->tdir_count = wc;
+			}
+			if (!TIFFWriteByteArray(tif, dir, cp))
+				return 0;
+		} else {
+			if (wc == 1) {
+				char cv;
+				TIFFGetField(tif, fip->field_tag, &cv);
+				if (!TIFFWriteByteArray(tif, dir, &cv))
+					return 0;
+			} else {
+				char* cp;
+				TIFFGetField(tif, fip->field_tag, &cp);
+				if (!TIFFWriteByteArray(tif, dir, cp))
+					return 0;
+			}
+		}
+                break;
+
+	case TIFF_UNDEFINED:
+		{ char* cp;
+		  if (wc == (unsigned short) TIFF_VARIABLE) {
+			TIFFGetField(tif, fip->field_tag, &wc, &cp);
+			dir->tdir_count = wc;
+		  } else if (wc == (unsigned short) TIFF_VARIABLE2) {
+			TIFFGetField(tif, fip->field_tag, &wc2, &cp);
+			dir->tdir_count = wc2;
+		  } else
+			TIFFGetField(tif, fip->field_tag, &cp);
+		  if (!TIFFWriteByteArray(tif, dir, cp))
+			return (0);
+		}
+		break;
+
+        case TIFF_NOTYPE:
+                break;
+	}
+	return (1);
+}
+
+/*
+ * Setup a directory entry with either a SHORT
+ * or LONG type according to the value.
+ */
+static void
+TIFFSetupShortLong(TIFF* tif, ttag_t tag, TIFFDirEntry* dir, uint32 v)
+{
+	dir->tdir_tag = (uint16) tag;
+	dir->tdir_count = 1;
+	if (v > 0xffffL) {
+		dir->tdir_type = (short) TIFF_LONG;
+		dir->tdir_offset = v;
+	} else {
+		dir->tdir_type = (short) TIFF_SHORT;
+		dir->tdir_offset = TIFFInsertData(tif, (int) TIFF_SHORT, v);
+	}
+}
+
+/*
+ * Setup a SHORT directory entry
+ */
+static void
+TIFFSetupShort(TIFF* tif, ttag_t tag, TIFFDirEntry* dir, uint16 v)
+{
+	dir->tdir_tag = (uint16) tag;
+	dir->tdir_count = 1;
+	dir->tdir_type = (short) TIFF_SHORT;
+	dir->tdir_offset = TIFFInsertData(tif, (int) TIFF_SHORT, v);
+}
+#undef MakeShortDirent
+
+#define	NITEMS(x)	(sizeof (x) / sizeof (x[0]))
+/*
+ * Setup a directory entry that references a
+ * samples/pixel array of SHORT values and
+ * (potentially) write the associated indirect
+ * values.
+ */
+static int
+TIFFWritePerSampleShorts(TIFF* tif, ttag_t tag, TIFFDirEntry* dir)
+{
+	uint16 buf[10], v;
+	uint16* w = buf;
+	uint16 i, samples = tif->tif_dir.td_samplesperpixel;
+	int status;
+
+	if (samples > NITEMS(buf)) {
+		w = (uint16*) _TIFFmalloc(samples * sizeof (uint16));
+		if (w == NULL) {
+			TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
+			    "No space to write per-sample shorts");
+			return (0);
+		}
+	}
+	TIFFGetField(tif, tag, &v);
+	for (i = 0; i < samples; i++)
+		w[i] = v;
+
+	dir->tdir_tag = (uint16) tag;
+	dir->tdir_type = (uint16) TIFF_SHORT;
+	dir->tdir_count = samples;
+	status = TIFFWriteShortArray(tif, dir, w);
+	if (w != buf)
+		_TIFFfree((char*) w);
+	return (status);
+}
+
+/*
+ * Setup a directory entry that references a samples/pixel array of ``type''
+ * values and (potentially) write the associated indirect values.  The source
+ * data from TIFFGetField() for the specified tag must be returned as double.
+ */
+static int
+TIFFWritePerSampleAnys(TIFF* tif,
+    TIFFDataType type, ttag_t tag, TIFFDirEntry* dir)
+{
+	double buf[10], v;
+	double* w = buf;
+	uint16 i, samples = tif->tif_dir.td_samplesperpixel;
+	int status;
+
+	if (samples > NITEMS(buf)) {
+		w = (double*) _TIFFmalloc(samples * sizeof (double));
+		if (w == NULL) {
+			TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
+			    "No space to write per-sample values");
+			return (0);
+		}
+	}
+	TIFFGetField(tif, tag, &v);
+	for (i = 0; i < samples; i++)
+		w[i] = v;
+	status = TIFFWriteAnyArray(tif, type, tag, dir, samples, w);
+	if (w != buf)
+		_TIFFfree(w);
+	return (status);
+}
+#undef NITEMS
+
+/*
+ * Setup a pair of shorts that are returned by
+ * value, rather than as a reference to an array.
+ */
+static int
+TIFFSetupShortPair(TIFF* tif, ttag_t tag, TIFFDirEntry* dir)
+{
+	uint16 v[2];
+
+	TIFFGetField(tif, tag, &v[0], &v[1]);
+
+	dir->tdir_tag = (uint16) tag;
+	dir->tdir_type = (uint16) TIFF_SHORT;
+	dir->tdir_count = 2;
+	return (TIFFWriteShortArray(tif, dir, v));
+}
+
+/*
+ * Setup a directory entry for an NxM table of shorts,
+ * where M is known to be 2**bitspersample, and write
+ * the associated indirect data.
+ */
+static int
+TIFFWriteShortTable(TIFF* tif,
+    ttag_t tag, TIFFDirEntry* dir, uint32 n, uint16** table)
+{
+	uint32 i, off;
+
+	dir->tdir_tag = (uint16) tag;
+	dir->tdir_type = (short) TIFF_SHORT;
+	/* XXX -- yech, fool TIFFWriteData */
+	dir->tdir_count = (uint32) (1L<<tif->tif_dir.td_bitspersample);
+	off = tif->tif_dataoff;
+	for (i = 0; i < n; i++)
+		if (!TIFFWriteData(tif, dir, (char *)table[i]))
+			return (0);
+	dir->tdir_count *= n;
+	dir->tdir_offset = off;
+	return (1);
+}
+
+/*
+ * Write/copy data associated with an ASCII or opaque tag value.
+ */
+static int
+TIFFWriteByteArray(TIFF* tif, TIFFDirEntry* dir, char* cp)
+{
+	if (dir->tdir_count > 4) {
+		if (!TIFFWriteData(tif, dir, cp))
+			return (0);
+	} else
+		_TIFFmemcpy(&dir->tdir_offset, cp, dir->tdir_count);
+	return (1);
+}
+
+/*
+ * Setup a directory entry of an array of SHORT
+ * or SSHORT and write the associated indirect values.
+ */
+static int
+TIFFWriteShortArray(TIFF* tif, TIFFDirEntry* dir, uint16* v)
+{
+	if (dir->tdir_count <= 2) {
+		if (tif->tif_header.tiff_magic == TIFF_BIGENDIAN) {
+			dir->tdir_offset = (uint32) ((long) v[0] << 16);
+			if (dir->tdir_count == 2)
+				dir->tdir_offset |= v[1] & 0xffff;
+		} else {
+			dir->tdir_offset = v[0] & 0xffff;
+			if (dir->tdir_count == 2)
+				dir->tdir_offset |= (long) v[1] << 16;
+		}
+		return (1);
+	} else
+		return (TIFFWriteData(tif, dir, (char*) v));
+}
+
+/*
+ * Setup a directory entry of an array of LONG
+ * or SLONG and write the associated indirect values.
+ */
+static int
+TIFFWriteLongArray(TIFF* tif, TIFFDirEntry* dir, uint32* v)
+{
+	if (dir->tdir_count == 1) {
+		dir->tdir_offset = v[0];
+		return (1);
+	} else
+		return (TIFFWriteData(tif, dir, (char*) v));
+}
+
+/*
+ * Setup a directory entry of an array of RATIONAL
+ * or SRATIONAL and write the associated indirect values.
+ */
+static int
+TIFFWriteRationalArray(TIFF* tif, TIFFDirEntry* dir, float* v)
+{
+	uint32 i;
+	uint32* t;
+	int status;
+
+	t = (uint32*) _TIFFmalloc(2 * dir->tdir_count * sizeof (uint32));
+	if (t == NULL) {
+		TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
+		    "No space to write RATIONAL array");
+		return (0);
+	}
+	for (i = 0; i < dir->tdir_count; i++) {
+		float fv = v[i];
+		int sign = 1;
+		uint32 den;
+
+		if (fv < 0) {
+			if (dir->tdir_type == TIFF_RATIONAL) {
+				TIFFWarningExt(tif->tif_clientdata, tif->tif_name,
+	"\"%s\": Information lost writing value (%g) as (unsigned) RATIONAL",
+				_TIFFFieldWithTag(tif,dir->tdir_tag)->field_name,
+				fv);
+				fv = 0;
+			} else
+				fv = -fv, sign = -1;
+		}
+		den = 1L;
+		if (fv > 0) {
+			while (fv < 1L<<(31-3) && den < 1L<<(31-3))
+				fv *= 1<<3, den *= 1L<<3;
+		}
+		t[2*i+0] = (uint32) (sign * (fv + 0.5));
+		t[2*i+1] = den;
+	}
+	status = TIFFWriteData(tif, dir, (char *)t);
+	_TIFFfree((char*) t);
+	return (status);
+}
+
+static int
+TIFFWriteFloatArray(TIFF* tif, TIFFDirEntry* dir, float* v)
+{
+	TIFFCvtNativeToIEEEFloat(tif, dir->tdir_count, v);
+	if (dir->tdir_count == 1) {
+		dir->tdir_offset = *(uint32*) &v[0];
+		return (1);
+	} else
+		return (TIFFWriteData(tif, dir, (char*) v));
+}
+
+static int
+TIFFWriteDoubleArray(TIFF* tif, TIFFDirEntry* dir, double* v)
+{
+	TIFFCvtNativeToIEEEDouble(tif, dir->tdir_count, v);
+	return (TIFFWriteData(tif, dir, (char*) v));
+}
+
+/*
+ * Write an array of ``type'' values for a specified tag (i.e. this is a tag
+ * which is allowed to have different types, e.g. SMaxSampleType).
+ * Internally the data values are represented as double since a double can
+ * hold any of the TIFF tag types (yes, this should really be an abstract
+ * type tany_t for portability).  The data is converted into the specified
+ * type in a temporary buffer and then handed off to the appropriate array
+ * writer.
+ */
+static int
+TIFFWriteAnyArray(TIFF* tif,
+    TIFFDataType type, ttag_t tag, TIFFDirEntry* dir, uint32 n, double* v)
+{
+	char buf[10 * sizeof(double)];
+	char* w = buf;
+	int i, status = 0;
+
+	if (n * TIFFDataWidth(type) > sizeof buf) {
+		w = (char*) _TIFFmalloc(n * TIFFDataWidth(type));
+		if (w == NULL) {
+			TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
+			    "No space to write array");
+			return (0);
+		}
+	}
+
+	dir->tdir_tag = (uint16) tag;
+	dir->tdir_type = (uint16) type;
+	dir->tdir_count = n;
+
+	switch (type) {
+	case TIFF_BYTE:
+		{
+			uint8* bp = (uint8*) w;
+			for (i = 0; i < (int) n; i++)
+				bp[i] = (uint8) v[i];
+			if (!TIFFWriteByteArray(tif, dir, (char*) bp))
+				goto out;
+		}
+		break;
+	case TIFF_SBYTE:
+		{
+			int8* bp = (int8*) w;
+			for (i = 0; i < (int) n; i++)
+				bp[i] = (int8) v[i];
+			if (!TIFFWriteByteArray(tif, dir, (char*) bp))
+				goto out;
+		}
+		break;
+	case TIFF_SHORT:
+		{
+			uint16* bp = (uint16*) w;
+			for (i = 0; i < (int) n; i++)
+				bp[i] = (uint16) v[i];
+			if (!TIFFWriteShortArray(tif, dir, (uint16*)bp))
+				goto out;
+		}
+		break;
+	case TIFF_SSHORT:
+		{
+			int16* bp = (int16*) w;
+			for (i = 0; i < (int) n; i++)
+				bp[i] = (int16) v[i];
+			if (!TIFFWriteShortArray(tif, dir, (uint16*)bp))
+				goto out;
+		}
+		break;
+	case TIFF_LONG:
+		{
+			uint32* bp = (uint32*) w;
+			for (i = 0; i < (int) n; i++)
+				bp[i] = (uint32) v[i];
+			if (!TIFFWriteLongArray(tif, dir, bp))
+				goto out;
+		}
+		break;
+	case TIFF_SLONG:
+		{
+			int32* bp = (int32*) w;
+			for (i = 0; i < (int) n; i++)
+				bp[i] = (int32) v[i];
+			if (!TIFFWriteLongArray(tif, dir, (uint32*) bp))
+				goto out;
+		}
+		break;
+	case TIFF_FLOAT:
+		{
+			float* bp = (float*) w;
+			for (i = 0; i < (int) n; i++)
+				bp[i] = (float) v[i];
+			if (!TIFFWriteFloatArray(tif, dir, bp))
+				goto out;
+		}
+		break;
+	case TIFF_DOUBLE:
+		return (TIFFWriteDoubleArray(tif, dir, v));
+	default:
+		/* TIFF_NOTYPE */
+		/* TIFF_ASCII */
+		/* TIFF_UNDEFINED */
+		/* TIFF_RATIONAL */
+		/* TIFF_SRATIONAL */
+		goto out;
+	}
+	status = 1;
+ out:
+	if (w != buf)
+		_TIFFfree(w);
+	return (status);
+}
+
+static int
+TIFFWriteTransferFunction(TIFF* tif, TIFFDirEntry* dir)
+{
+	TIFFDirectory* td = &tif->tif_dir;
+	tsize_t n = (1L<<td->td_bitspersample) * sizeof (uint16);
+	uint16** tf = td->td_transferfunction;
+	int ncols;
+
+	/*
+	 * Check if the table can be written as a single column,
+	 * or if it must be written as 3 columns.  Note that we
+	 * write a 3-column tag if there are 2 samples/pixel and
+	 * a single column of data won't suffice--hmm.
+	 */
+	switch (td->td_samplesperpixel - td->td_extrasamples) {
+	default:	if (_TIFFmemcmp(tf[0], tf[2], n)) { ncols = 3; break; }
+	case 2:		if (_TIFFmemcmp(tf[0], tf[1], n)) { ncols = 3; break; }
+	case 1: case 0:	ncols = 1;
+	}
+	return (TIFFWriteShortTable(tif,
+	    TIFFTAG_TRANSFERFUNCTION, dir, ncols, tf));
+}
+
+static int
+TIFFWriteInkNames(TIFF* tif, TIFFDirEntry* dir)
+{
+	TIFFDirectory* td = &tif->tif_dir;
+
+	dir->tdir_tag = TIFFTAG_INKNAMES;
+	dir->tdir_type = (short) TIFF_ASCII;
+	dir->tdir_count = td->td_inknameslen;
+	return (TIFFWriteByteArray(tif, dir, td->td_inknames));
+}
+
+/*
+ * Write a contiguous directory item.
+ */
+static int
+TIFFWriteData(TIFF* tif, TIFFDirEntry* dir, char* cp)
+{
+	tsize_t cc;
+
+	if (tif->tif_flags & TIFF_SWAB) {
+		switch (dir->tdir_type) {
+		case TIFF_SHORT:
+		case TIFF_SSHORT:
+			TIFFSwabArrayOfShort((uint16*) cp, dir->tdir_count);
+			break;
+		case TIFF_LONG:
+		case TIFF_SLONG:
+		case TIFF_FLOAT:
+			TIFFSwabArrayOfLong((uint32*) cp, dir->tdir_count);
+			break;
+		case TIFF_RATIONAL:
+		case TIFF_SRATIONAL:
+			TIFFSwabArrayOfLong((uint32*) cp, 2*dir->tdir_count);
+			break;
+		case TIFF_DOUBLE:
+			TIFFSwabArrayOfDouble((double*) cp, dir->tdir_count);
+			break;
+		}
+	}
+	dir->tdir_offset = tif->tif_dataoff;
+	cc = dir->tdir_count * TIFFDataWidth((TIFFDataType) dir->tdir_type);
+	if (SeekOK(tif, dir->tdir_offset) &&
+	    WriteOK(tif, cp, cc)) {
+		tif->tif_dataoff += (cc + 1) & ~1;
+		return (1);
+	}
+	TIFFErrorExt(tif->tif_clientdata, tif->tif_name, "Error writing data for field \"%s\"",
+	    _TIFFFieldWithTag(tif, dir->tdir_tag)->field_name);
+	return (0);
+}
+
+/*
+ * Similar to TIFFWriteDirectory(), but if the directory has already
+ * been written once, it is relocated to the end of the file, in case it
+ * has changed in size.  Note that this will result in the loss of the
+ * previously used directory space.
+ */
+
+int
+TIFFRewriteDirectory( TIFF *tif )
+{
+    static const char module[] = "TIFFRewriteDirectory";
+
+    /* We don't need to do anything special if it hasn't been written. */
+    if( tif->tif_diroff == 0 )
+        return TIFFWriteDirectory( tif );
+
+    /*
+    ** Find and zero the pointer to this directory, so that TIFFLinkDirectory
+    ** will cause it to be added after this directories current pre-link.
+    */
+
+    /* Is it the first directory in the file? */
+    if (tif->tif_header.tiff_diroff == tif->tif_diroff)
+    {
+        tif->tif_header.tiff_diroff = 0;
+        tif->tif_diroff = 0;
+
+        TIFFSeekFile(tif, (toff_t)(TIFF_MAGIC_SIZE+TIFF_VERSION_SIZE),
+		     SEEK_SET);
+        if (!WriteOK(tif, &(tif->tif_header.tiff_diroff),
+                     sizeof (tif->tif_diroff)))
+        {
+			TIFFErrorExt(tif->tif_clientdata, tif->tif_name, "Error updating TIFF header");
+            return (0);
+        }
+    }
+    else
+    {
+        toff_t  nextdir, off;
+
+	nextdir = tif->tif_header.tiff_diroff;
+	do {
+		uint16 dircount;
+
+		if (!SeekOK(tif, nextdir) ||
+		    !ReadOK(tif, &dircount, sizeof (dircount))) {
+			TIFFErrorExt(tif->tif_clientdata, module, "Error fetching directory count");
+			return (0);
+		}
+		if (tif->tif_flags & TIFF_SWAB)
+			TIFFSwabShort(&dircount);
+		(void) TIFFSeekFile(tif,
+		    dircount * sizeof (TIFFDirEntry), SEEK_CUR);
+		if (!ReadOK(tif, &nextdir, sizeof (nextdir))) {
+			TIFFErrorExt(tif->tif_clientdata, module, "Error fetching directory link");
+			return (0);
+		}
+		if (tif->tif_flags & TIFF_SWAB)
+			TIFFSwabLong(&nextdir);
+	} while (nextdir != tif->tif_diroff && nextdir != 0);
+        off = TIFFSeekFile(tif, 0, SEEK_CUR); /* get current offset */
+        (void) TIFFSeekFile(tif, off - (toff_t)sizeof(nextdir), SEEK_SET);
+        tif->tif_diroff = 0;
+	if (!WriteOK(tif, &(tif->tif_diroff), sizeof (nextdir))) {
+		TIFFErrorExt(tif->tif_clientdata, module, "Error writing directory link");
+		return (0);
+	}
+    }
+
+    /*
+    ** Now use TIFFWriteDirectory() normally.
+    */
+
+    return TIFFWriteDirectory( tif );
+}
+
+
+/*
+ * Link the current directory into the
+ * directory chain for the file.
+ */
+static int
+TIFFLinkDirectory(TIFF* tif)
+{
+	static const char module[] = "TIFFLinkDirectory";
+	toff_t nextdir;
+	toff_t diroff, off;
+
+	tif->tif_diroff = (TIFFSeekFile(tif, (toff_t) 0, SEEK_END)+1) &~ 1;
+	diroff = tif->tif_diroff;
+	if (tif->tif_flags & TIFF_SWAB)
+		TIFFSwabLong(&diroff);
+
+	/*
+	 * Handle SubIFDs
+	 */
+        if (tif->tif_flags & TIFF_INSUBIFD) {
+		(void) TIFFSeekFile(tif, tif->tif_subifdoff, SEEK_SET);
+		if (!WriteOK(tif, &diroff, sizeof (diroff))) {
+			TIFFErrorExt(tif->tif_clientdata, module,
+			    "%s: Error writing SubIFD directory link",
+			    tif->tif_name);
+			return (0);
+		}
+		/*
+		 * Advance to the next SubIFD or, if this is
+		 * the last one configured, revert back to the
+		 * normal directory linkage.
+		 */
+		if (--tif->tif_nsubifd)
+			tif->tif_subifdoff += sizeof (diroff);
+		else
+			tif->tif_flags &= ~TIFF_INSUBIFD;
+		return (1);
+	}
+
+	if (tif->tif_header.tiff_diroff == 0) {
+		/*
+		 * First directory, overwrite offset in header.
+		 */
+		tif->tif_header.tiff_diroff = tif->tif_diroff;
+		(void) TIFFSeekFile(tif,
+				    (toff_t)(TIFF_MAGIC_SIZE+TIFF_VERSION_SIZE),
+                                    SEEK_SET);
+		if (!WriteOK(tif, &diroff, sizeof (diroff))) {
+			TIFFErrorExt(tif->tif_clientdata, tif->tif_name, "Error writing TIFF header");
+			return (0);
+		}
+		return (1);
+	}
+	/*
+	 * Not the first directory, search to the last and append.
+	 */
+	nextdir = tif->tif_header.tiff_diroff;
+	do {
+		uint16 dircount;
+
+		if (!SeekOK(tif, nextdir) ||
+		    !ReadOK(tif, &dircount, sizeof (dircount))) {
+			TIFFErrorExt(tif->tif_clientdata, module, "Error fetching directory count");
+			return (0);
+		}
+		if (tif->tif_flags & TIFF_SWAB)
+			TIFFSwabShort(&dircount);
+		(void) TIFFSeekFile(tif,
+		    dircount * sizeof (TIFFDirEntry), SEEK_CUR);
+		if (!ReadOK(tif, &nextdir, sizeof (nextdir))) {
+			TIFFErrorExt(tif->tif_clientdata, module, "Error fetching directory link");
+			return (0);
+		}
+		if (tif->tif_flags & TIFF_SWAB)
+			TIFFSwabLong(&nextdir);
+	} while (nextdir != 0);
+        off = TIFFSeekFile(tif, 0, SEEK_CUR); /* get current offset */
+        (void) TIFFSeekFile(tif, off - (toff_t)sizeof(nextdir), SEEK_SET);
+	if (!WriteOK(tif, &diroff, sizeof (diroff))) {
+		TIFFErrorExt(tif->tif_clientdata, module, "Error writing directory link");
+		return (0);
+	}
+	return (1);
+}
+
+/* vim: set ts=8 sts=8 sw=8 noet: */
diff --git a/uppsrc/plugin/tif/lib/tif_dumpmode.c b/uppsrc/plugin/tif/lib/tif_dumpmode.c
new file mode 100644
index 000000000..8b749fbda
--- /dev/null
+++ b/uppsrc/plugin/tif/lib/tif_dumpmode.c
@@ -0,0 +1,117 @@
+/* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/tif_dumpmode.c,v 1.4 2005/12/21 12:23:13 joris Exp $ */
+
+/*
+ * Copyright (c) 1988-1997 Sam Leffler
+ * Copyright (c) 1991-1997 Silicon Graphics, Inc.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and
+ * its documentation for any purpose is hereby granted without fee, provided
+ * that (i) the above copyright notices and this permission notice appear in
+ * all copies of the software and related documentation, and (ii) the names of
+ * Sam Leffler and Silicon Graphics may not be used in any advertising or
+ * publicity relating to the software without the specific, prior written
+ * permission of Sam Leffler and Silicon Graphics.
+ *
+ * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+ * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
+ * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
+ * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+ * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
+ * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.
+ */
+
+/*
+ * TIFF Library.
+ *
+ * "Null" Compression Algorithm Support.
+ */
+#include "tiffiop.h"
+
+/*
+ * Encode a hunk of pixels.
+ */
+static int
+DumpModeEncode(TIFF* tif, tidata_t pp, tsize_t cc, tsample_t s)
+{
+	(void) s;
+	while (cc > 0) {
+		tsize_t n;
+
+		n = cc;
+		if (tif->tif_rawcc + n > tif->tif_rawdatasize)
+			n = tif->tif_rawdatasize - tif->tif_rawcc;
+
+                assert( n > 0 );
+
+		/*
+		 * Avoid copy if client has setup raw
+		 * data buffer to avoid extra copy.
+		 */
+		if (tif->tif_rawcp != pp)
+			_TIFFmemcpy(tif->tif_rawcp, pp, n);
+		tif->tif_rawcp += n;
+		tif->tif_rawcc += n;
+		pp += n;
+		cc -= n;
+		if (tif->tif_rawcc >= tif->tif_rawdatasize &&
+		    !TIFFFlushData1(tif))
+			return (-1);
+	}
+	return (1);
+}
+
+/*
+ * Decode a hunk of pixels.
+ */
+static int
+DumpModeDecode(TIFF* tif, tidata_t buf, tsize_t cc, tsample_t s)
+{
+	(void) s;
+	if (tif->tif_rawcc < cc) {
+		TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
+		    "DumpModeDecode: Not enough data for scanline %d",
+		    tif->tif_row);
+		return (0);
+	}
+	/*
+	 * Avoid copy if client has setup raw
+	 * data buffer to avoid extra copy.
+	 */
+	if (tif->tif_rawcp != buf)
+		_TIFFmemcpy(buf, tif->tif_rawcp, cc);
+	tif->tif_rawcp += cc;
+	tif->tif_rawcc -= cc;
+	return (1);
+}
+
+/*
+ * Seek forwards nrows in the current strip.
+ */
+static int
+DumpModeSeek(TIFF* tif, uint32 nrows)
+{
+	tif->tif_rawcp += nrows * tif->tif_scanlinesize;
+	tif->tif_rawcc -= nrows * tif->tif_scanlinesize;
+	return (1);
+}
+
+/*
+ * Initialize dump mode.
+ */
+int
+TIFFInitDumpMode(TIFF* tif, int scheme)
+{
+	(void) scheme;
+	tif->tif_decoderow = DumpModeDecode;
+	tif->tif_decodestrip = DumpModeDecode;
+	tif->tif_decodetile = DumpModeDecode;
+	tif->tif_encoderow = DumpModeEncode;
+	tif->tif_encodestrip = DumpModeEncode;
+	tif->tif_encodetile = DumpModeEncode;
+	tif->tif_seek = DumpModeSeek;
+	return (1);
+}
diff --git a/uppsrc/plugin/tif/lib/tif_error.c b/uppsrc/plugin/tif/lib/tif_error.c
new file mode 100644
index 000000000..3ac5b5f83
--- /dev/null
+++ b/uppsrc/plugin/tif/lib/tif_error.c
@@ -0,0 +1,72 @@
+/* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/tif_error.c,v 1.4 2005/12/23 01:18:59 joris Exp $ */
+
+/*
+ * Copyright (c) 1988-1997 Sam Leffler
+ * Copyright (c) 1991-1997 Silicon Graphics, Inc.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and
+ * its documentation for any purpose is hereby granted without fee, provided
+ * that (i) the above copyright notices and this permission notice appear in
+ * all copies of the software and related documentation, and (ii) the names of
+ * Sam Leffler and Silicon Graphics may not be used in any advertising or
+ * publicity relating to the software without the specific, prior written
+ * permission of Sam Leffler and Silicon Graphics.
+ *
+ * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+ * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
+ * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
+ * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+ * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
+ * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.
+ */
+
+/*
+ * TIFF Library.
+ */
+#include "tiffiop.h"
+
+TIFFErrorHandlerExt _TIFFerrorHandlerExt = NULL;
+
+TIFFErrorHandler
+TIFFSetErrorHandler(TIFFErrorHandler handler)
+{
+	TIFFErrorHandler prev = _TIFFerrorHandler;
+	_TIFFerrorHandler = handler;
+	return (prev);
+}
+
+TIFFErrorHandlerExt
+TIFFSetErrorHandlerExt(TIFFErrorHandlerExt handler)
+{
+	TIFFErrorHandlerExt prev = _TIFFerrorHandlerExt;
+	_TIFFerrorHandlerExt = handler;
+	return (prev);
+}
+
+void
+TIFFError(const char* module, const char* fmt, ...)
+{
+	va_list ap;
+	va_start(ap, fmt);
+	if (_TIFFerrorHandler)
+		(*_TIFFerrorHandler)(module, fmt, ap);
+	if (_TIFFerrorHandlerExt)
+		(*_TIFFerrorHandlerExt)(0, module, fmt, ap);
+	va_end(ap);
+}
+
+void
+TIFFErrorExt(thandle_t fd, const char* module, const char* fmt, ...)
+{
+	va_list ap;
+	va_start(ap, fmt);
+	if (_TIFFerrorHandler)
+		(*_TIFFerrorHandler)(module, fmt, ap);
+	if (_TIFFerrorHandlerExt)
+		(*_TIFFerrorHandlerExt)(fd, module, fmt, ap);
+	va_end(ap);
+}
diff --git a/uppsrc/plugin/tif/lib/tif_extension.c b/uppsrc/plugin/tif/lib/tif_extension.c
new file mode 100644
index 000000000..e480e2fd3
--- /dev/null
+++ b/uppsrc/plugin/tif/lib/tif_extension.c
@@ -0,0 +1,111 @@
+/* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/tif_extension.c,v 1.4 2004/10/02 13:29:41 dron Exp $ */
+
+/*
+ * Copyright (c) 1988-1997 Sam Leffler
+ * Copyright (c) 1991-1997 Silicon Graphics, Inc.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and
+ * its documentation for any purpose is hereby granted without fee, provided
+ * that (i) the above copyright notices and this permission notice appear in
+ * all copies of the software and related documentation, and (ii) the names of
+ * Sam Leffler and Silicon Graphics may not be used in any advertising or
+ * publicity relating to the software without the specific, prior written
+ * permission of Sam Leffler and Silicon Graphics.
+ *
+ * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+ * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
+ * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
+ * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+ * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
+ * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.
+ */
+
+/*
+ * TIFF Library.
+ *
+ * Various routines support external extension of the tag set, and other
+ * application extension capabilities.
+ */
+
+#include "tiffiop.h"
+
+int TIFFGetTagListCount( TIFF *tif )
+
+{
+    TIFFDirectory* td = &tif->tif_dir;
+
+    return td->td_customValueCount;
+}
+
+ttag_t TIFFGetTagListEntry( TIFF *tif, int tag_index )
+
+{
+    TIFFDirectory* td = &tif->tif_dir;
+
+    if( tag_index < 0 || tag_index >= td->td_customValueCount )
+        return (ttag_t) -1;
+    else
+        return td->td_customValues[tag_index].info->field_tag;
+}
+
+/*
+** This provides read/write access to the TIFFTagMethods within the TIFF
+** structure to application code without giving access to the private
+** TIFF structure.
+*/
+TIFFTagMethods *TIFFAccessTagMethods( TIFF *tif )
+
+{
+    return &(tif->tif_tagmethods);
+}
+
+void *TIFFGetClientInfo( TIFF *tif, const char *name )
+
+{
+    TIFFClientInfoLink *link = tif->tif_clientinfo;
+
+    while( link != NULL && strcmp(link->name,name) != 0 )
+        link = link->next;
+
+    if( link != NULL )
+        return link->data;
+    else
+        return NULL;
+}
+
+void TIFFSetClientInfo( TIFF *tif, void *data, const char *name )
+
+{
+    TIFFClientInfoLink *link = tif->tif_clientinfo;
+
+    /*
+    ** Do we have an existing link with this name?  If so, just
+    ** set it.
+    */
+    while( link != NULL && strcmp(link->name,name) != 0 )
+        link = link->next;
+
+    if( link != NULL )
+    {
+        link->data = data;
+        return;
+    }
+
+    /*
+    ** Create a new link.
+    */
+
+    link = (TIFFClientInfoLink *) _TIFFmalloc(sizeof(TIFFClientInfoLink));
+    assert (link != NULL);
+    link->next = tif->tif_clientinfo;
+    link->name = (char *) _TIFFmalloc(strlen(name)+1);
+    assert (link->name != NULL);
+    strcpy(link->name, name);
+    link->data = data;
+
+    tif->tif_clientinfo = link;
+}
diff --git a/uppsrc/plugin/tif/lib/tif_fax3.c b/uppsrc/plugin/tif/lib/tif_fax3.c
new file mode 100644
index 000000000..2d5300383
--- /dev/null
+++ b/uppsrc/plugin/tif/lib/tif_fax3.c
@@ -0,0 +1,1572 @@
+/* $Id: tif_fax3.c,v 1.40 2006/03/16 12:38:24 dron Exp $ */
+
+/*
+ * Copyright (c) 1990-1997 Sam Leffler
+ * Copyright (c) 1991-1997 Silicon Graphics, Inc.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and
+ * its documentation for any purpose is hereby granted without fee, provided
+ * that (i) the above copyright notices and this permission notice appear in
+ * all copies of the software and related documentation, and (ii) the names of
+ * Sam Leffler and Silicon Graphics may not be used in any advertising or
+ * publicity relating to the software without the specific, prior written
+ * permission of Sam Leffler and Silicon Graphics.
+ *
+ * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+ * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
+ * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
+ * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+ * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
+ * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.
+ */
+
+#include "tiffiop.h"
+#ifdef CCITT_SUPPORT
+/*
+ * TIFF Library.
+ *
+ * CCITT Group 3 (T.4) and Group 4 (T.6) Compression Support.
+ *
+ * This file contains support for decoding and encoding TIFF
+ * compression algorithms 2, 3, 4, and 32771.
+ *
+ * Decoder support is derived, with permission, from the code
+ * in Frank Cringle's viewfax program;
+ *      Copyright (C) 1990, 1995  Frank D. Cringle.
+ */
+#include "tif_fax3.h"
+#define	G3CODES
+#include "t4.h"
+#include <stdio.h>
+
+/*
+ * Compression+decompression state blocks are
+ * derived from this ``base state'' block.
+ */
+typedef struct {
+        int     rw_mode;                /* O_RDONLY for decode, else encode */
+	int	mode;			/* operating mode */
+	uint32	rowbytes;		/* bytes in a decoded scanline */
+	uint32	rowpixels;		/* pixels in a scanline */
+
+	uint16	cleanfaxdata;		/* CleanFaxData tag */
+	uint32	badfaxrun;		/* BadFaxRun tag */
+	uint32	badfaxlines;		/* BadFaxLines tag */
+	uint32	groupoptions;		/* Group 3/4 options tag */
+	uint32	recvparams;		/* encoded Class 2 session params */
+	char*	subaddress;		/* subaddress string */
+	uint32	recvtime;		/* time spent receiving (secs) */
+	char*	faxdcs;			/* Table 2/T.30 encoded session params */
+	TIFFVGetMethod vgetparent;	/* super-class method */
+	TIFFVSetMethod vsetparent;	/* super-class method */
+} Fax3BaseState;
+#define	Fax3State(tif)		((Fax3BaseState*) (tif)->tif_data)
+
+typedef enum { G3_1D, G3_2D } Ttag;
+typedef struct {
+	Fax3BaseState b;
+
+	/* Decoder state info */
+	const unsigned char* bitmap;	/* bit reversal table */
+	uint32	data;			/* current i/o byte/word */
+	int	bit;			/* current i/o bit in byte */
+	int	EOLcnt;			/* count of EOL codes recognized */
+	TIFFFaxFillFunc fill;		/* fill routine */
+	uint32*	runs;			/* b&w runs for current/previous row */
+	uint32*	refruns;		/* runs for reference line */
+	uint32*	curruns;		/* runs for current line */
+
+	/* Encoder state info */
+	Ttag    tag;			/* encoding state */
+	unsigned char*	refline;	/* reference line for 2d decoding */
+	int	k;			/* #rows left that can be 2d encoded */
+	int	maxk;			/* max #rows that can be 2d encoded */
+} Fax3CodecState;
+#define	DecoderState(tif)	((Fax3CodecState*) Fax3State(tif))
+#define	EncoderState(tif)	((Fax3CodecState*) Fax3State(tif))
+
+#define	is2DEncoding(sp) \
+	(sp->b.groupoptions & GROUP3OPT_2DENCODING)
+#define	isAligned(p,t)	((((unsigned long)(p)) & (sizeof (t)-1)) == 0)
+
+/*
+ * Group 3 and Group 4 Decoding.
+ */
+
+/*
+ * These macros glue the TIFF library state to
+ * the state expected by Frank's decoder.
+ */
+#define	DECLARE_STATE(tif, sp, mod)					\
+    static const char module[] = mod;					\
+    Fax3CodecState* sp = DecoderState(tif);				\
+    int a0;				/* reference element */		\
+    int lastx = sp->b.rowpixels;	/* last element in row */	\
+    uint32 BitAcc;			/* bit accumulator */		\
+    int BitsAvail;			/* # valid bits in BitAcc */	\
+    int RunLength;			/* length of current run */	\
+    unsigned char* cp;			/* next byte of input data */	\
+    unsigned char* ep;			/* end of input data */		\
+    uint32* pa;				/* place to stuff next run */	\
+    uint32* thisrun;			/* current row's run array */	\
+    int EOLcnt;				/* # EOL codes recognized */	\
+    const unsigned char* bitmap = sp->bitmap;	/* input data bit reverser */	\
+    const TIFFFaxTabEnt* TabEnt
+#define	DECLARE_STATE_2D(tif, sp, mod)					\
+    DECLARE_STATE(tif, sp, mod);					\
+    int b1;				/* next change on prev line */	\
+    uint32* pb				/* next run in reference line */\
+/*
+ * Load any state that may be changed during decoding.
+ */
+#define	CACHE_STATE(tif, sp) do {					\
+    BitAcc = sp->data;							\
+    BitsAvail = sp->bit;						\
+    EOLcnt = sp->EOLcnt;						\
+    cp = (unsigned char*) tif->tif_rawcp;				\
+    ep = cp + tif->tif_rawcc;						\
+} while (0)
+/*
+ * Save state possibly changed during decoding.
+ */
+#define	UNCACHE_STATE(tif, sp) do {					\
+    sp->bit = BitsAvail;						\
+    sp->data = BitAcc;							\
+    sp->EOLcnt = EOLcnt;						\
+    tif->tif_rawcc -= (tidata_t) cp - tif->tif_rawcp;			\
+    tif->tif_rawcp = (tidata_t) cp;					\
+} while (0)
+
+/*
+ * Setup state for decoding a strip.
+ */
+static int
+Fax3PreDecode(TIFF* tif, tsample_t s)
+{
+	Fax3CodecState* sp = DecoderState(tif);
+
+	(void) s;
+	assert(sp != NULL);
+	sp->bit = 0;			/* force initial read */
+	sp->data = 0;
+	sp->EOLcnt = 0;			/* force initial scan for EOL */
+	/*
+	 * Decoder assumes lsb-to-msb bit order.  Note that we select
+	 * this here rather than in Fax3SetupState so that viewers can
+	 * hold the image open, fiddle with the FillOrder tag value,
+	 * and then re-decode the image.  Otherwise they'd need to close
+	 * and open the image to get the state reset.
+	 */
+	sp->bitmap =
+	    TIFFGetBitRevTable(tif->tif_dir.td_fillorder != FILLORDER_LSB2MSB);
+	if (sp->refruns) {		/* init reference line to white */
+		sp->refruns[0] = (uint32) sp->b.rowpixels;
+		sp->refruns[1] = 0;
+	}
+	return (1);
+}
+
+/*
+ * Routine for handling various errors/conditions.
+ * Note how they are "glued into the decoder" by
+ * overriding the definitions used by the decoder.
+ */
+
+static void
+Fax3Unexpected(const char* module, TIFF* tif, uint32 line, uint32 a0)
+{
+	TIFFErrorExt(tif->tif_clientdata, module, "%s: Bad code word at line %lu of %s %lu (x %lu)",
+		tif->tif_name, (unsigned long) line, isTiled(tif) ? "tile" : "strip",
+	   (unsigned long) (isTiled(tif) ? tif->tif_curtile : tif->tif_curstrip),
+	   (unsigned long) a0);
+}
+#define	unexpected(table, a0)	Fax3Unexpected(module, tif, line, a0)
+
+static void
+Fax3Extension(const char* module, TIFF* tif, uint32 line, uint32 a0)
+{
+	TIFFErrorExt(tif->tif_clientdata, module,
+	    "%s: Uncompressed data (not supported) at line %lu of %s %lu (x %lu)",
+	    tif->tif_name, (unsigned long) line, isTiled(tif) ? "tile" : "strip",
+       (unsigned long) (isTiled(tif) ? tif->tif_curtile : tif->tif_curstrip),
+       (unsigned long) a0);
+}
+#define	extension(a0)	Fax3Extension(module, tif, line, a0)
+
+static void
+Fax3BadLength(const char* module, TIFF* tif, uint32 line, uint32 a0, uint32 lastx)
+{
+	TIFFWarningExt(tif->tif_clientdata, module, "%s: %s at line %lu of %s %lu (got %lu, expected %lu)",
+	    tif->tif_name,
+	    a0 < lastx ? "Premature EOL" : "Line length mismatch",
+	    (unsigned long) line, isTiled(tif) ? "tile" : "strip",
+        (unsigned long) (isTiled(tif) ? tif->tif_curtile : tif->tif_curstrip),
+        (unsigned long) a0, lastx);
+}
+#define	badlength(a0,lastx)	Fax3BadLength(module, tif, line, a0, lastx)
+
+static void
+Fax3PrematureEOF(const char* module, TIFF* tif, uint32 line, uint32 a0)
+{
+	TIFFWarningExt(tif->tif_clientdata, module, "%s: Premature EOF at line %lu of %s %lu (x %lu)",
+	    tif->tif_name,
+	    (unsigned long) line, isTiled(tif) ? "tile" : "strip",
+        (unsigned long) (isTiled(tif) ? tif->tif_curtile : tif->tif_curstrip),
+        (unsigned long) a0);
+}
+#define	prematureEOF(a0)	Fax3PrematureEOF(module, tif, line, a0)
+
+#define	Nop
+
+/*
+ * Decode the requested amount of G3 1D-encoded data.
+ */
+static int
+Fax3Decode1D(TIFF* tif, tidata_t buf, tsize_t occ, tsample_t s)
+{
+	DECLARE_STATE(tif, sp, "Fax3Decode1D");
+        int line = 0;
+
+	(void) s;
+	CACHE_STATE(tif, sp);
+	thisrun = sp->curruns;
+	while ((long)occ > 0) {
+		a0 = 0;
+		RunLength = 0;
+		pa = thisrun;
+#ifdef FAX3_DEBUG
+		printf("\nBitAcc=%08X, BitsAvail = %d\n", BitAcc, BitsAvail);
+		printf("-------------------- %d\n", tif->tif_row);
+		fflush(stdout);
+#endif
+		SYNC_EOL(EOF1D);
+		EXPAND1D(EOF1Da);
+		(*sp->fill)(buf, thisrun, pa, lastx);
+		buf += sp->b.rowbytes;
+		occ -= sp->b.rowbytes;
+                line++;
+		continue;
+	EOF1D:				/* premature EOF */
+		CLEANUP_RUNS();
+	EOF1Da:				/* premature EOF */
+		(*sp->fill)(buf, thisrun, pa, lastx);
+		UNCACHE_STATE(tif, sp);
+		return (-1);
+	}
+	UNCACHE_STATE(tif, sp);
+	return (1);
+}
+
+#define	SWAP(t,a,b)	{ t x; x = (a); (a) = (b); (b) = x; }
+/*
+ * Decode the requested amount of G3 2D-encoded data.
+ */
+static int
+Fax3Decode2D(TIFF* tif, tidata_t buf, tsize_t occ, tsample_t s)
+{
+	DECLARE_STATE_2D(tif, sp, "Fax3Decode2D");
+        int line = 0;
+	int is1D;			/* current line is 1d/2d-encoded */
+
+	(void) s;
+	CACHE_STATE(tif, sp);
+	while ((long)occ > 0) {
+		a0 = 0;
+		RunLength = 0;
+		pa = thisrun = sp->curruns;
+#ifdef FAX3_DEBUG
+		printf("\nBitAcc=%08X, BitsAvail = %d EOLcnt = %d",
+		    BitAcc, BitsAvail, EOLcnt);
+#endif
+		SYNC_EOL(EOF2D);
+		NeedBits8(1, EOF2D);
+		is1D = GetBits(1);	/* 1D/2D-encoding tag bit */
+		ClrBits(1);
+#ifdef FAX3_DEBUG
+		printf(" %s\n-------------------- %d\n",
+		    is1D ? "1D" : "2D", tif->tif_row);
+		fflush(stdout);
+#endif
+		pb = sp->refruns;
+		b1 = *pb++;
+		if (is1D)
+			EXPAND1D(EOF2Da);
+		else
+			EXPAND2D(EOF2Da);
+		(*sp->fill)(buf, thisrun, pa, lastx);
+		SETVALUE(0);		/* imaginary change for reference */
+		SWAP(uint32*, sp->curruns, sp->refruns);
+		buf += sp->b.rowbytes;
+		occ -= sp->b.rowbytes;
+                line++;
+		continue;
+	EOF2D:				/* premature EOF */
+		CLEANUP_RUNS();
+	EOF2Da:				/* premature EOF */
+		(*sp->fill)(buf, thisrun, pa, lastx);
+		UNCACHE_STATE(tif, sp);
+		return (-1);
+	}
+	UNCACHE_STATE(tif, sp);
+	return (1);
+}
+#undef SWAP
+
+/*
+ * The ZERO & FILL macros must handle spans < 2*sizeof(long) bytes.
+ * For machines with 64-bit longs this is <16 bytes; otherwise
+ * this is <8 bytes.  We optimize the code here to reflect the
+ * machine characteristics.
+ */
+#if SIZEOF_LONG == 8
+# define FILL(n, cp)							    \
+    switch (n) {							    \
+    case 15:(cp)[14] = 0xff; case 14:(cp)[13] = 0xff; case 13: (cp)[12] = 0xff;\
+    case 12:(cp)[11] = 0xff; case 11:(cp)[10] = 0xff; case 10: (cp)[9] = 0xff;\
+    case  9: (cp)[8] = 0xff; case  8: (cp)[7] = 0xff; case  7: (cp)[6] = 0xff;\
+    case  6: (cp)[5] = 0xff; case  5: (cp)[4] = 0xff; case  4: (cp)[3] = 0xff;\
+    case  3: (cp)[2] = 0xff; case  2: (cp)[1] = 0xff;			      \
+    case  1: (cp)[0] = 0xff; (cp) += (n); case 0:  ;			      \
+    }
+# define ZERO(n, cp)							\
+    switch (n) {							\
+    case 15:(cp)[14] = 0; case 14:(cp)[13] = 0; case 13: (cp)[12] = 0;	\
+    case 12:(cp)[11] = 0; case 11:(cp)[10] = 0; case 10: (cp)[9] = 0;	\
+    case  9: (cp)[8] = 0; case  8: (cp)[7] = 0; case  7: (cp)[6] = 0;	\
+    case  6: (cp)[5] = 0; case  5: (cp)[4] = 0; case  4: (cp)[3] = 0;	\
+    case  3: (cp)[2] = 0; case  2: (cp)[1] = 0;				\
+    case  1: (cp)[0] = 0; (cp) += (n); case 0:  ;			\
+    }
+#else
+# define FILL(n, cp)							    \
+    switch (n) {							    \
+    case 7: (cp)[6] = 0xff; case 6: (cp)[5] = 0xff; case 5: (cp)[4] = 0xff; \
+    case 4: (cp)[3] = 0xff; case 3: (cp)[2] = 0xff; case 2: (cp)[1] = 0xff; \
+    case 1: (cp)[0] = 0xff; (cp) += (n); case 0:  ;			    \
+    }
+# define ZERO(n, cp)							\
+    switch (n) {							\
+    case 7: (cp)[6] = 0; case 6: (cp)[5] = 0; case 5: (cp)[4] = 0;	\
+    case 4: (cp)[3] = 0; case 3: (cp)[2] = 0; case 2: (cp)[1] = 0;	\
+    case 1: (cp)[0] = 0; (cp) += (n); case 0:  ;			\
+    }
+#endif
+
+/*
+ * Bit-fill a row according to the white/black
+ * runs generated during G3/G4 decoding.
+ */
+void
+_TIFFFax3fillruns(unsigned char* buf, uint32* runs, uint32* erun, uint32 lastx)
+{
+	static const unsigned char _fillmasks[] =
+	    { 0x00, 0x80, 0xc0, 0xe0, 0xf0, 0xf8, 0xfc, 0xfe, 0xff };
+	unsigned char* cp;
+	uint32 x, bx, run;
+	int32 n, nw;
+	long* lp;
+
+	if ((erun-runs)&1)
+	    *erun++ = 0;
+	x = 0;
+	for (; runs < erun; runs += 2) {
+	    run = runs[0];
+	    if (x+run > lastx || run > lastx )
+		run = runs[0] = (uint32) (lastx - x);
+	    if (run) {
+		cp = buf + (x>>3);
+		bx = x&7;
+		if (run > 8-bx) {
+		    if (bx) {			/* align to byte boundary */
+			*cp++ &= 0xff << (8-bx);
+			run -= 8-bx;
+		    }
+		    if( (n = run >> 3) != 0 ) {	/* multiple bytes to fill */
+			if ((n/sizeof (long)) > 1) {
+			    /*
+			     * Align to longword boundary and fill.
+			     */
+			    for (; n && !isAligned(cp, long); n--)
+				    *cp++ = 0x00;
+			    lp = (long*) cp;
+			    nw = (int32)(n / sizeof (long));
+			    n -= nw * sizeof (long);
+			    do {
+				    *lp++ = 0L;
+			    } while (--nw);
+			    cp = (unsigned char*) lp;
+			}
+			ZERO(n, cp);
+			run &= 7;
+		    }
+		    if (run)
+			cp[0] &= 0xff >> run;
+		} else
+		    cp[0] &= ~(_fillmasks[run]>>bx);
+		x += runs[0];
+	    }
+	    run = runs[1];
+	    if (x+run > lastx || run > lastx )
+		run = runs[1] = lastx - x;
+	    if (run) {
+		cp = buf + (x>>3);
+		bx = x&7;
+		if (run > 8-bx) {
+		    if (bx) {			/* align to byte boundary */
+			*cp++ |= 0xff >> bx;
+			run -= 8-bx;
+		    }
+		    if( (n = run>>3) != 0 ) {	/* multiple bytes to fill */
+			if ((n/sizeof (long)) > 1) {
+			    /*
+			     * Align to longword boundary and fill.
+			     */
+			    for (; n && !isAligned(cp, long); n--)
+				*cp++ = 0xff;
+			    lp = (long*) cp;
+			    nw = (int32)(n / sizeof (long));
+			    n -= nw * sizeof (long);
+			    do {
+				*lp++ = -1L;
+			    } while (--nw);
+			    cp = (unsigned char*) lp;
+			}
+			FILL(n, cp);
+			run &= 7;
+		    }
+		    if (run)
+			cp[0] |= 0xff00 >> run;
+		} else
+		    cp[0] |= _fillmasks[run]>>bx;
+		x += runs[1];
+	    }
+	}
+	assert(x == lastx);
+}
+#undef	ZERO
+#undef	FILL
+
+/*
+ * Setup G3/G4-related compression/decompression state
+ * before data is processed.  This routine is called once
+ * per image -- it sets up different state based on whether
+ * or not decoding or encoding is being done and whether
+ * 1D- or 2D-encoded data is involved.
+ */
+static int
+Fax3SetupState(TIFF* tif)
+{
+	TIFFDirectory* td = &tif->tif_dir;
+	Fax3BaseState* sp = Fax3State(tif);
+	int needsRefLine;
+	Fax3CodecState* dsp = (Fax3CodecState*) Fax3State(tif);
+	uint32 rowbytes, rowpixels, nruns;
+
+	if (td->td_bitspersample != 1) {
+		TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
+		    "Bits/sample must be 1 for Group 3/4 encoding/decoding");
+		return (0);
+	}
+	/*
+	 * Calculate the scanline/tile widths.
+	 */
+	if (isTiled(tif)) {
+		rowbytes = TIFFTileRowSize(tif);
+		rowpixels = td->td_tilewidth;
+	} else {
+		rowbytes = TIFFScanlineSize(tif);
+		rowpixels = td->td_imagewidth;
+	}
+	sp->rowbytes = (uint32) rowbytes;
+	sp->rowpixels = (uint32) rowpixels;
+	/*
+	 * Allocate any additional space required for decoding/encoding.
+	 */
+	needsRefLine = (
+	    (sp->groupoptions & GROUP3OPT_2DENCODING) ||
+	    td->td_compression == COMPRESSION_CCITTFAX4
+	);
+
+	nruns = needsRefLine ? 2*TIFFroundup(rowpixels,32) : rowpixels;
+
+	dsp->runs = (uint32*) _TIFFCheckMalloc(tif, 2*nruns+3, sizeof (uint32),
+					  "for Group 3/4 run arrays");
+	if (dsp->runs == NULL)
+		return (0);
+	dsp->curruns = dsp->runs;
+	if (needsRefLine)
+		dsp->refruns = dsp->runs + (nruns>>1);
+	else
+		dsp->refruns = NULL;
+	if (td->td_compression == COMPRESSION_CCITTFAX3
+	    && is2DEncoding(dsp)) {	/* NB: default is 1D routine */
+		tif->tif_decoderow = Fax3Decode2D;
+		tif->tif_decodestrip = Fax3Decode2D;
+		tif->tif_decodetile = Fax3Decode2D;
+	}
+
+	if (needsRefLine) {		/* 2d encoding */
+		Fax3CodecState* esp = EncoderState(tif);
+		/*
+		 * 2d encoding requires a scanline
+		 * buffer for the ``reference line''; the
+		 * scanline against which delta encoding
+		 * is referenced.  The reference line must
+		 * be initialized to be ``white'' (done elsewhere).
+		 */
+		esp->refline = (unsigned char*) _TIFFmalloc(rowbytes);
+		if (esp->refline == NULL) {
+			TIFFErrorExt(tif->tif_clientdata, "Fax3SetupState",
+			    "%s: No space for Group 3/4 reference line",
+			    tif->tif_name);
+			return (0);
+		}
+	} else					/* 1d encoding */
+		EncoderState(tif)->refline = NULL;
+
+	return (1);
+}
+
+/*
+ * CCITT Group 3 FAX Encoding.
+ */
+
+#define	Fax3FlushBits(tif, sp) {				\
+	if ((tif)->tif_rawcc >= (tif)->tif_rawdatasize)		\
+		(void) TIFFFlushData1(tif);			\
+	*(tif)->tif_rawcp++ = (tidataval_t) (sp)->data;		\
+	(tif)->tif_rawcc++;					\
+	(sp)->data = 0, (sp)->bit = 8;				\
+}
+#define	_FlushBits(tif) {					\
+	if ((tif)->tif_rawcc >= (tif)->tif_rawdatasize)		\
+		(void) TIFFFlushData1(tif);			\
+	*(tif)->tif_rawcp++ = (tidataval_t) data;		\
+	(tif)->tif_rawcc++;					\
+	data = 0, bit = 8;					\
+}
+static const int _msbmask[9] =
+    { 0x00, 0x01, 0x03, 0x07, 0x0f, 0x1f, 0x3f, 0x7f, 0xff };
+#define	_PutBits(tif, bits, length) {				\
+	while (length > bit) {					\
+		data |= bits >> (length - bit);			\
+		length -= bit;					\
+		_FlushBits(tif);				\
+	}							\
+	data |= (bits & _msbmask[length]) << (bit - length);	\
+	bit -= length;						\
+	if (bit == 0)						\
+		_FlushBits(tif);				\
+}
+
+/*
+ * Write a variable-length bit-value to
+ * the output stream.  Values are
+ * assumed to be at most 16 bits.
+ */
+static void
+Fax3PutBits(TIFF* tif, unsigned int bits, unsigned int length)
+{
+	Fax3CodecState* sp = EncoderState(tif);
+	unsigned int bit = sp->bit;
+	int data = sp->data;
+
+	_PutBits(tif, bits, length);
+
+	sp->data = data;
+	sp->bit = bit;
+}
+
+/*
+ * Write a code to the output stream.
+ */
+#define putcode(tif, te)	Fax3PutBits(tif, (te)->code, (te)->length)
+
+#ifdef FAX3_DEBUG
+#define	DEBUG_COLOR(w) (tab == TIFFFaxWhiteCodes ? w "W" : w "B")
+#define	DEBUG_PRINT(what,len) {						\
+    int t;								\
+    printf("%08X/%-2d: %s%5d\t", data, bit, DEBUG_COLOR(what), len);	\
+    for (t = length-1; t >= 0; t--)					\
+	putchar(code & (1<<t) ? '1' : '0');				\
+    putchar('\n');							\
+}
+#endif
+
+/*
+ * Write the sequence of codes that describes
+ * the specified span of zero's or one's.  The
+ * appropriate table that holds the make-up and
+ * terminating codes is supplied.
+ */
+static void
+putspan(TIFF* tif, int32 span, const tableentry* tab)
+{
+	Fax3CodecState* sp = EncoderState(tif);
+	unsigned int bit = sp->bit;
+	int data = sp->data;
+	unsigned int code, length;
+
+	while (span >= 2624) {
+		const tableentry* te = &tab[63 + (2560>>6)];
+		code = te->code, length = te->length;
+#ifdef FAX3_DEBUG
+		DEBUG_PRINT("MakeUp", te->runlen);
+#endif
+		_PutBits(tif, code, length);
+		span -= te->runlen;
+	}
+	if (span >= 64) {
+		const tableentry* te = &tab[63 + (span>>6)];
+		assert(te->runlen == 64*(span>>6));
+		code = te->code, length = te->length;
+#ifdef FAX3_DEBUG
+		DEBUG_PRINT("MakeUp", te->runlen);
+#endif
+		_PutBits(tif, code, length);
+		span -= te->runlen;
+	}
+	code = tab[span].code, length = tab[span].length;
+#ifdef FAX3_DEBUG
+	DEBUG_PRINT("  Term", tab[span].runlen);
+#endif
+	_PutBits(tif, code, length);
+
+	sp->data = data;
+	sp->bit = bit;
+}
+
+/*
+ * Write an EOL code to the output stream.  The zero-fill
+ * logic for byte-aligning encoded scanlines is handled
+ * here.  We also handle writing the tag bit for the next
+ * scanline when doing 2d encoding.
+ */
+static void
+Fax3PutEOL(TIFF* tif)
+{
+	Fax3CodecState* sp = EncoderState(tif);
+	unsigned int bit = sp->bit;
+	int data = sp->data;
+	unsigned int code, length, tparm;
+
+	if (sp->b.groupoptions & GROUP3OPT_FILLBITS) {
+		/*
+		 * Force bit alignment so EOL will terminate on
+		 * a byte boundary.  That is, force the bit alignment
+		 * to 16-12 = 4 before putting out the EOL code.
+		 */
+		int align = 8 - 4;
+		if (align != sp->bit) {
+			if (align > sp->bit)
+				align = sp->bit + (8 - align);
+			else
+				align = sp->bit - align;
+			code = 0;
+			tparm=align;
+			_PutBits(tif, 0, tparm);
+		}
+	}
+	code = EOL, length = 12;
+	if (is2DEncoding(sp))
+		code = (code<<1) | (sp->tag == G3_1D), length++;
+	_PutBits(tif, code, length);
+
+	sp->data = data;
+	sp->bit = bit;
+}
+
+/*
+ * Reset encoding state at the start of a strip.
+ */
+static int
+Fax3PreEncode(TIFF* tif, tsample_t s)
+{
+	Fax3CodecState* sp = EncoderState(tif);
+
+	(void) s;
+	assert(sp != NULL);
+	sp->bit = 8;
+	sp->data = 0;
+	sp->tag = G3_1D;
+	/*
+	 * This is necessary for Group 4; otherwise it isn't
+	 * needed because the first scanline of each strip ends
+	 * up being copied into the refline.
+	 */
+	if (sp->refline)
+		_TIFFmemset(sp->refline, 0x00, sp->b.rowbytes);
+	if (is2DEncoding(sp)) {
+		float res = tif->tif_dir.td_yresolution;
+		/*
+		 * The CCITT spec says that when doing 2d encoding, you
+		 * should only do it on K consecutive scanlines, where K
+		 * depends on the resolution of the image being encoded
+		 * (2 for <= 200 lpi, 4 for > 200 lpi).  Since the directory
+		 * code initializes td_yresolution to 0, this code will
+		 * select a K of 2 unless the YResolution tag is set
+		 * appropriately.  (Note also that we fudge a little here
+		 * and use 150 lpi to avoid problems with units conversion.)
+		 */
+		if (tif->tif_dir.td_resolutionunit == RESUNIT_CENTIMETER)
+			res *= 2.54f;		/* convert to inches */
+		sp->maxk = (res > 150 ? 4 : 2);
+		sp->k = sp->maxk-1;
+	} else
+		sp->k = sp->maxk = 0;
+	return (1);
+}
+
+static const unsigned char zeroruns[256] = {
+    8, 7, 6, 6, 5, 5, 5, 5, 4, 4, 4, 4, 4, 4, 4, 4,	/* 0x00 - 0x0f */
+    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,	/* 0x10 - 0x1f */
+    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,	/* 0x20 - 0x2f */
+    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,	/* 0x30 - 0x3f */
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,	/* 0x40 - 0x4f */
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,	/* 0x50 - 0x5f */
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,	/* 0x60 - 0x6f */
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,	/* 0x70 - 0x7f */
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,	/* 0x80 - 0x8f */
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,	/* 0x90 - 0x9f */
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,	/* 0xa0 - 0xaf */
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,	/* 0xb0 - 0xbf */
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,	/* 0xc0 - 0xcf */
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,	/* 0xd0 - 0xdf */
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,	/* 0xe0 - 0xef */
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,	/* 0xf0 - 0xff */
+};
+static const unsigned char oneruns[256] = {
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,	/* 0x00 - 0x0f */
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,	/* 0x10 - 0x1f */
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,	/* 0x20 - 0x2f */
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,	/* 0x30 - 0x3f */
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,	/* 0x40 - 0x4f */
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,	/* 0x50 - 0x5f */
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,	/* 0x60 - 0x6f */
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,	/* 0x70 - 0x7f */
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,	/* 0x80 - 0x8f */
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,	/* 0x90 - 0x9f */
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,	/* 0xa0 - 0xaf */
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,	/* 0xb0 - 0xbf */
+    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,	/* 0xc0 - 0xcf */
+    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,	/* 0xd0 - 0xdf */
+    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,	/* 0xe0 - 0xef */
+    4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 6, 6, 7, 8,	/* 0xf0 - 0xff */
+};
+
+/*
+ * On certain systems it pays to inline
+ * the routines that find pixel spans.
+ */
+#ifdef VAXC
+static	int32 find0span(unsigned char*, int32, int32);
+static	int32 find1span(unsigned char*, int32, int32);
+#pragma inline(find0span,find1span)
+#endif
+
+/*
+ * Find a span of ones or zeros using the supplied
+ * table.  The ``base'' of the bit string is supplied
+ * along with the start+end bit indices.
+ */
+inline static int32
+find0span(unsigned char* bp, int32 bs, int32 be)
+{
+	int32 bits = be - bs;
+	int32 n, span;
+
+	bp += bs>>3;
+	/*
+	 * Check partial byte on lhs.
+	 */
+	if (bits > 0 && (n = (bs & 7))) {
+		span = zeroruns[(*bp << n) & 0xff];
+		if (span > 8-n)		/* table value too generous */
+			span = 8-n;
+		if (span > bits)	/* constrain span to bit range */
+			span = bits;
+		if (n+span < 8)		/* doesn't extend to edge of byte */
+			return (span);
+		bits -= span;
+		bp++;
+	} else
+		span = 0;
+	if (bits >= (int32)(2 * 8 * sizeof(long))) {
+		long* lp;
+		/*
+		 * Align to longword boundary and check longwords.
+		 */
+		while (!isAligned(bp, long)) {
+			if (*bp != 0x00)
+				return (span + zeroruns[*bp]);
+			span += 8, bits -= 8;
+			bp++;
+		}
+		lp = (long*) bp;
+		while ((bits >= (int32)(8 * sizeof(long))) && (0 == *lp)) {
+			span += 8*sizeof (long), bits -= 8*sizeof (long);
+			lp++;
+		}
+		bp = (unsigned char*) lp;
+	}
+	/*
+	 * Scan full bytes for all 0's.
+	 */
+	while (bits >= 8) {
+		if (*bp != 0x00)	/* end of run */
+			return (span + zeroruns[*bp]);
+		span += 8, bits -= 8;
+		bp++;
+	}
+	/*
+	 * Check partial byte on rhs.
+	 */
+	if (bits > 0) {
+		n = zeroruns[*bp];
+		span += (n > bits ? bits : n);
+	}
+	return (span);
+}
+
+inline static int32
+find1span(unsigned char* bp, int32 bs, int32 be)
+{
+	int32 bits = be - bs;
+	int32 n, span;
+
+	bp += bs>>3;
+	/*
+	 * Check partial byte on lhs.
+	 */
+	if (bits > 0 && (n = (bs & 7))) {
+		span = oneruns[(*bp << n) & 0xff];
+		if (span > 8-n)		/* table value too generous */
+			span = 8-n;
+		if (span > bits)	/* constrain span to bit range */
+			span = bits;
+		if (n+span < 8)		/* doesn't extend to edge of byte */
+			return (span);
+		bits -= span;
+		bp++;
+	} else
+		span = 0;
+	if (bits >= (int32)(2 * 8 * sizeof(long))) {
+		long* lp;
+		/*
+		 * Align to longword boundary and check longwords.
+		 */
+		while (!isAligned(bp, long)) {
+			if (*bp != 0xff)
+				return (span + oneruns[*bp]);
+			span += 8, bits -= 8;
+			bp++;
+		}
+		lp = (long*) bp;
+		while ((bits >= (int32)(8 * sizeof(long))) && (~0 == *lp)) {
+			span += 8*sizeof (long), bits -= 8*sizeof (long);
+			lp++;
+		}
+		bp = (unsigned char*) lp;
+	}
+	/*
+	 * Scan full bytes for all 1's.
+	 */
+	while (bits >= 8) {
+		if (*bp != 0xff)	/* end of run */
+			return (span + oneruns[*bp]);
+		span += 8, bits -= 8;
+		bp++;
+	}
+	/*
+	 * Check partial byte on rhs.
+	 */
+	if (bits > 0) {
+		n = oneruns[*bp];
+		span += (n > bits ? bits : n);
+	}
+	return (span);
+}
+
+/*
+ * Return the offset of the next bit in the range
+ * [bs..be] that is different from the specified
+ * color.  The end, be, is returned if no such bit
+ * exists.
+ */
+#define	finddiff(_cp, _bs, _be, _color)	\
+	(_bs + (_color ? find1span(_cp,_bs,_be) : find0span(_cp,_bs,_be)))
+/*
+ * Like finddiff, but also check the starting bit
+ * against the end in case start > end.
+ */
+#define	finddiff2(_cp, _bs, _be, _color) \
+	(_bs < _be ? finddiff(_cp,_bs,_be,_color) : _be)
+
+/*
+ * 1d-encode a row of pixels.  The encoding is
+ * a sequence of all-white or all-black spans
+ * of pixels encoded with Huffman codes.
+ */
+static int
+Fax3Encode1DRow(TIFF* tif, unsigned char* bp, uint32 bits)
+{
+	Fax3CodecState* sp = EncoderState(tif);
+	int32 span;
+        uint32 bs = 0;
+
+	for (;;) {
+		span = find0span(bp, bs, bits);		/* white span */
+		putspan(tif, span, TIFFFaxWhiteCodes);
+		bs += span;
+		if (bs >= bits)
+			break;
+		span = find1span(bp, bs, bits);		/* black span */
+		putspan(tif, span, TIFFFaxBlackCodes);
+		bs += span;
+		if (bs >= bits)
+			break;
+	}
+	if (sp->b.mode & (FAXMODE_BYTEALIGN|FAXMODE_WORDALIGN)) {
+		if (sp->bit != 8)			/* byte-align */
+			Fax3FlushBits(tif, sp);
+		if ((sp->b.mode&FAXMODE_WORDALIGN) &&
+		    !isAligned(tif->tif_rawcp, uint16))
+			Fax3FlushBits(tif, sp);
+	}
+	return (1);
+}
+
+static const tableentry horizcode =
+    { 3, 0x1, 0 };	/* 001 */
+static const tableentry passcode =
+    { 4, 0x1, 0 };	/* 0001 */
+static const tableentry vcodes[7] = {
+    { 7, 0x03, 0 },	/* 0000 011 */
+    { 6, 0x03, 0 },	/* 0000 11 */
+    { 3, 0x03, 0 },	/* 011 */
+    { 1, 0x1, 0 },	/* 1 */
+    { 3, 0x2, 0 },	/* 010 */
+    { 6, 0x02, 0 },	/* 0000 10 */
+    { 7, 0x02, 0 }	/* 0000 010 */
+};
+
+/*
+ * 2d-encode a row of pixels.  Consult the CCITT
+ * documentation for the algorithm.
+ */
+static int
+Fax3Encode2DRow(TIFF* tif, unsigned char* bp, unsigned char* rp, uint32 bits)
+{
+#define	PIXEL(buf,ix)	((((buf)[(ix)>>3]) >> (7-((ix)&7))) & 1)
+        uint32 a0 = 0;
+	uint32 a1 = (PIXEL(bp, 0) != 0 ? 0 : finddiff(bp, 0, bits, 0));
+	uint32 b1 = (PIXEL(rp, 0) != 0 ? 0 : finddiff(rp, 0, bits, 0));
+	uint32 a2, b2;
+
+	for (;;) {
+		b2 = finddiff2(rp, b1, bits, PIXEL(rp,b1));
+		if (b2 >= a1) {
+			int32 d = b1 - a1;
+			if (!(-3 <= d && d <= 3)) {	/* horizontal mode */
+				a2 = finddiff2(bp, a1, bits, PIXEL(bp,a1));
+				putcode(tif, &horizcode);
+				if (a0+a1 == 0 || PIXEL(bp, a0) == 0) {
+					putspan(tif, a1-a0, TIFFFaxWhiteCodes);
+					putspan(tif, a2-a1, TIFFFaxBlackCodes);
+				} else {
+					putspan(tif, a1-a0, TIFFFaxBlackCodes);
+					putspan(tif, a2-a1, TIFFFaxWhiteCodes);
+				}
+				a0 = a2;
+			} else {			/* vertical mode */
+				putcode(tif, &vcodes[d+3]);
+				a0 = a1;
+			}
+		} else {				/* pass mode */
+			putcode(tif, &passcode);
+			a0 = b2;
+		}
+		if (a0 >= bits)
+			break;
+		a1 = finddiff(bp, a0, bits, PIXEL(bp,a0));
+		b1 = finddiff(rp, a0, bits, !PIXEL(bp,a0));
+		b1 = finddiff(rp, b1, bits, PIXEL(bp,a0));
+	}
+	return (1);
+#undef PIXEL
+}
+
+/*
+ * Encode a buffer of pixels.
+ */
+static int
+Fax3Encode(TIFF* tif, tidata_t bp, tsize_t cc, tsample_t s)
+{
+	Fax3CodecState* sp = EncoderState(tif);
+
+	(void) s;
+	while ((long)cc > 0) {
+		if ((sp->b.mode & FAXMODE_NOEOL) == 0)
+			Fax3PutEOL(tif);
+		if (is2DEncoding(sp)) {
+			if (sp->tag == G3_1D) {
+				if (!Fax3Encode1DRow(tif, bp, sp->b.rowpixels))
+					return (0);
+				sp->tag = G3_2D;
+			} else {
+				if (!Fax3Encode2DRow(tif, bp, sp->refline,
+                                                     sp->b.rowpixels))
+					return (0);
+				sp->k--;
+			}
+			if (sp->k == 0) {
+				sp->tag = G3_1D;
+				sp->k = sp->maxk-1;
+			} else
+				_TIFFmemcpy(sp->refline, bp, sp->b.rowbytes);
+		} else {
+			if (!Fax3Encode1DRow(tif, bp, sp->b.rowpixels))
+				return (0);
+		}
+		bp += sp->b.rowbytes;
+		cc -= sp->b.rowbytes;
+	}
+	return (1);
+}
+
+static int
+Fax3PostEncode(TIFF* tif)
+{
+	Fax3CodecState* sp = EncoderState(tif);
+
+	if (sp->bit != 8)
+		Fax3FlushBits(tif, sp);
+	return (1);
+}
+
+static void
+Fax3Close(TIFF* tif)
+{
+	if ((Fax3State(tif)->mode & FAXMODE_NORTC) == 0) {
+		Fax3CodecState* sp = EncoderState(tif);
+		unsigned int code = EOL;
+		unsigned int length = 12;
+		int i;
+
+		if (is2DEncoding(sp))
+			code = (code<<1) | (sp->tag == G3_1D), length++;
+		for (i = 0; i < 6; i++)
+			Fax3PutBits(tif, code, length);
+		Fax3FlushBits(tif, sp);
+	}
+}
+
+static void
+Fax3Cleanup(TIFF* tif)
+{
+	Fax3CodecState* sp = DecoderState(tif);
+
+	assert(sp != 0);
+
+	tif->tif_tagmethods.vgetfield = sp->b.vgetparent;
+	tif->tif_tagmethods.vsetfield = sp->b.vsetparent;
+
+	if (sp->runs)
+		_TIFFfree(sp->runs);
+	if (sp->refline)
+		_TIFFfree(sp->refline);
+
+	if (Fax3State(tif)->subaddress)
+		_TIFFfree(Fax3State(tif)->subaddress);
+
+//Patch by cxl, 08-01-29
+	if (Fax3State(tif)->faxdcs)
+		_TIFFfree(Fax3State(tif)->faxdcs);
+//end of patch
+
+	_TIFFfree(tif->tif_data);
+	tif->tif_data = NULL;
+
+	_TIFFSetDefaultCompressionState(tif);
+}
+
+#define	FIELD_BADFAXLINES	(FIELD_CODEC+0)
+#define	FIELD_CLEANFAXDATA	(FIELD_CODEC+1)
+#define	FIELD_BADFAXRUN		(FIELD_CODEC+2)
+#define	FIELD_RECVPARAMS	(FIELD_CODEC+3)
+#define	FIELD_SUBADDRESS	(FIELD_CODEC+4)
+#define	FIELD_RECVTIME		(FIELD_CODEC+5)
+#define	FIELD_FAXDCS		(FIELD_CODEC+6)
+
+#define	FIELD_OPTIONS		(FIELD_CODEC+7)
+
+static const TIFFFieldInfo faxFieldInfo[] = {
+    { TIFFTAG_FAXMODE,		 0, 0,	TIFF_ANY,	FIELD_PSEUDO,
+      FALSE,	FALSE,	"FaxMode" },
+    { TIFFTAG_FAXFILLFUNC,	 0, 0,	TIFF_ANY,	FIELD_PSEUDO,
+      FALSE,	FALSE,	"FaxFillFunc" },
+    { TIFFTAG_BADFAXLINES,	 1, 1,	TIFF_LONG,	FIELD_BADFAXLINES,
+      TRUE,	FALSE,	"BadFaxLines" },
+    { TIFFTAG_BADFAXLINES,	 1, 1,	TIFF_SHORT,	FIELD_BADFAXLINES,
+      TRUE,	FALSE,	"BadFaxLines" },
+    { TIFFTAG_CLEANFAXDATA,	 1, 1,	TIFF_SHORT,	FIELD_CLEANFAXDATA,
+      TRUE,	FALSE,	"CleanFaxData" },
+    { TIFFTAG_CONSECUTIVEBADFAXLINES,1,1, TIFF_LONG,	FIELD_BADFAXRUN,
+      TRUE,	FALSE,	"ConsecutiveBadFaxLines" },
+    { TIFFTAG_CONSECUTIVEBADFAXLINES,1,1, TIFF_SHORT,	FIELD_BADFAXRUN,
+      TRUE,	FALSE,	"ConsecutiveBadFaxLines" },
+    { TIFFTAG_FAXRECVPARAMS,	 1, 1, TIFF_LONG,	FIELD_RECVPARAMS,
+      TRUE,	FALSE,	"FaxRecvParams" },
+    { TIFFTAG_FAXSUBADDRESS,	-1,-1, TIFF_ASCII,	FIELD_SUBADDRESS,
+      TRUE,	FALSE,	"FaxSubAddress" },
+    { TIFFTAG_FAXRECVTIME,	 1, 1, TIFF_LONG,	FIELD_RECVTIME,
+      TRUE,	FALSE,	"FaxRecvTime" },
+    { TIFFTAG_FAXDCS,		-1,-1, TIFF_ASCII,	FIELD_FAXDCS,
+      TRUE,	FALSE,	"FaxDcs" },
+};
+static const TIFFFieldInfo fax3FieldInfo[] = {
+    { TIFFTAG_GROUP3OPTIONS,	 1, 1,	TIFF_LONG,	FIELD_OPTIONS,
+      FALSE,	FALSE,	"Group3Options" },
+};
+static const TIFFFieldInfo fax4FieldInfo[] = {
+    { TIFFTAG_GROUP4OPTIONS,	 1, 1,	TIFF_LONG,	FIELD_OPTIONS,
+      FALSE,	FALSE,	"Group4Options" },
+};
+#define	N(a)	(sizeof (a) / sizeof (a[0]))
+
+static int
+Fax3VSetField(TIFF* tif, ttag_t tag, va_list ap)
+{
+	Fax3BaseState* sp = Fax3State(tif);
+
+	assert(sp != 0);
+	assert(sp->vsetparent != 0);
+
+	switch (tag) {
+	case TIFFTAG_FAXMODE:
+		sp->mode = va_arg(ap, int);
+		return (1);			/* NB: pseudo tag */
+	case TIFFTAG_FAXFILLFUNC:
+		DecoderState(tif)->fill = va_arg(ap, TIFFFaxFillFunc);
+		return (1);			/* NB: pseudo tag */
+	case TIFFTAG_GROUP3OPTIONS:
+		/* XXX: avoid reading options if compression mismatches. */
+		if (tif->tif_dir.td_compression == COMPRESSION_CCITTFAX3)
+			sp->groupoptions = va_arg(ap, uint32);
+		break;
+	case TIFFTAG_GROUP4OPTIONS:
+		/* XXX: avoid reading options if compression mismatches. */
+		if (tif->tif_dir.td_compression == COMPRESSION_CCITTFAX4)
+			sp->groupoptions = va_arg(ap, uint32);
+		break;
+	case TIFFTAG_BADFAXLINES:
+		sp->badfaxlines = va_arg(ap, uint32);
+		break;
+	case TIFFTAG_CLEANFAXDATA:
+		sp->cleanfaxdata = (uint16) va_arg(ap, int);
+		break;
+	case TIFFTAG_CONSECUTIVEBADFAXLINES:
+		sp->badfaxrun = va_arg(ap, uint32);
+		break;
+	case TIFFTAG_FAXRECVPARAMS:
+		sp->recvparams = va_arg(ap, uint32);
+		break;
+	case TIFFTAG_FAXSUBADDRESS:
+		_TIFFsetString(&sp->subaddress, va_arg(ap, char*));
+		break;
+	case TIFFTAG_FAXRECVTIME:
+		sp->recvtime = va_arg(ap, uint32);
+		break;
+	case TIFFTAG_FAXDCS:
+		_TIFFsetString(&sp->faxdcs, va_arg(ap, char*));
+		break;
+	default:
+		return (*sp->vsetparent)(tif, tag, ap);
+	}
+	TIFFSetFieldBit(tif, _TIFFFieldWithTag(tif, tag)->field_bit);
+	tif->tif_flags |= TIFF_DIRTYDIRECT;
+	return (1);
+}
+
+static int
+Fax3VGetField(TIFF* tif, ttag_t tag, va_list ap)
+{
+	Fax3BaseState* sp = Fax3State(tif);
+
+	switch (tag) {
+	case TIFFTAG_FAXMODE:
+		*va_arg(ap, int*) = sp->mode;
+		break;
+	case TIFFTAG_FAXFILLFUNC:
+		*va_arg(ap, TIFFFaxFillFunc*) = DecoderState(tif)->fill;
+		break;
+	case TIFFTAG_GROUP3OPTIONS:
+	case TIFFTAG_GROUP4OPTIONS:
+		*va_arg(ap, uint32*) = sp->groupoptions;
+		break;
+	case TIFFTAG_BADFAXLINES:
+		*va_arg(ap, uint32*) = sp->badfaxlines;
+		break;
+	case TIFFTAG_CLEANFAXDATA:
+		*va_arg(ap, uint16*) = sp->cleanfaxdata;
+		break;
+	case TIFFTAG_CONSECUTIVEBADFAXLINES:
+		*va_arg(ap, uint32*) = sp->badfaxrun;
+		break;
+	case TIFFTAG_FAXRECVPARAMS:
+		*va_arg(ap, uint32*) = sp->recvparams;
+		break;
+	case TIFFTAG_FAXSUBADDRESS:
+		*va_arg(ap, char**) = sp->subaddress;
+		break;
+	case TIFFTAG_FAXRECVTIME:
+		*va_arg(ap, uint32*) = sp->recvtime;
+		break;
+	case TIFFTAG_FAXDCS:
+		*va_arg(ap, char**) = sp->faxdcs;
+		break;
+	default:
+		return (*sp->vgetparent)(tif, tag, ap);
+	}
+	return (1);
+}
+
+static void
+Fax3PrintDir(TIFF* tif, FILE* fd, long flags)
+{
+	Fax3BaseState* sp = Fax3State(tif);
+
+	(void) flags;
+	if (TIFFFieldSet(tif,FIELD_OPTIONS)) {
+		const char* sep = " ";
+		if (tif->tif_dir.td_compression == COMPRESSION_CCITTFAX4) {
+			fprintf(fd, "  Group 4 Options:");
+			if (sp->groupoptions & GROUP4OPT_UNCOMPRESSED)
+				fprintf(fd, "%suncompressed data", sep);
+		} else {
+
+			fprintf(fd, "  Group 3 Options:");
+			if (sp->groupoptions & GROUP3OPT_2DENCODING)
+				fprintf(fd, "%s2-d encoding", sep), sep = "+";
+			if (sp->groupoptions & GROUP3OPT_FILLBITS)
+				fprintf(fd, "%sEOL padding", sep), sep = "+";
+			if (sp->groupoptions & GROUP3OPT_UNCOMPRESSED)
+				fprintf(fd, "%suncompressed data", sep);
+		}
+		fprintf(fd, " (%lu = 0x%lx)\n",
+                        (unsigned long) sp->groupoptions,
+                        (unsigned long) sp->groupoptions);
+	}
+	if (TIFFFieldSet(tif,FIELD_CLEANFAXDATA)) {
+		fprintf(fd, "  Fax Data:");
+		switch (sp->cleanfaxdata) {
+		case CLEANFAXDATA_CLEAN:
+			fprintf(fd, " clean");
+			break;
+		case CLEANFAXDATA_REGENERATED:
+			fprintf(fd, " receiver regenerated");
+			break;
+		case CLEANFAXDATA_UNCLEAN:
+			fprintf(fd, " uncorrected errors");
+			break;
+		}
+		fprintf(fd, " (%u = 0x%x)\n",
+		    sp->cleanfaxdata, sp->cleanfaxdata);
+	}
+	if (TIFFFieldSet(tif,FIELD_BADFAXLINES))
+		fprintf(fd, "  Bad Fax Lines: %lu\n",
+                        (unsigned long) sp->badfaxlines);
+	if (TIFFFieldSet(tif,FIELD_BADFAXRUN))
+		fprintf(fd, "  Consecutive Bad Fax Lines: %lu\n",
+		    (unsigned long) sp->badfaxrun);
+	if (TIFFFieldSet(tif,FIELD_RECVPARAMS))
+		fprintf(fd, "  Fax Receive Parameters: %08lx\n",
+		   (unsigned long) sp->recvparams);
+	if (TIFFFieldSet(tif,FIELD_SUBADDRESS))
+		fprintf(fd, "  Fax SubAddress: %s\n", sp->subaddress);
+	if (TIFFFieldSet(tif,FIELD_RECVTIME))
+		fprintf(fd, "  Fax Receive Time: %lu secs\n",
+		    (unsigned long) sp->recvtime);
+	if (TIFFFieldSet(tif,FIELD_FAXDCS))
+		fprintf(fd, "  Fax DCS: %s\n", sp->faxdcs);
+}
+
+static int
+InitCCITTFax3(TIFF* tif)
+{
+	Fax3BaseState* sp;
+
+	/*
+	 * Allocate state block so tag methods have storage to record values.
+	 */
+	tif->tif_data = (tidata_t)
+		_TIFFmalloc(sizeof (Fax3CodecState));
+
+	if (tif->tif_data == NULL) {
+		TIFFErrorExt(tif->tif_clientdata, "TIFFInitCCITTFax3",
+		    "%s: No space for state block", tif->tif_name);
+		return (0);
+	}
+
+	sp = Fax3State(tif);
+        sp->rw_mode = tif->tif_mode;
+
+	/*
+	 * Merge codec-specific tag information and
+	 * override parent get/set field methods.
+	 */
+	_TIFFMergeFieldInfo(tif, faxFieldInfo, N(faxFieldInfo));
+	sp->vgetparent = tif->tif_tagmethods.vgetfield;
+	tif->tif_tagmethods.vgetfield = Fax3VGetField; /* hook for codec tags */
+	sp->vsetparent = tif->tif_tagmethods.vsetfield;
+	tif->tif_tagmethods.vsetfield = Fax3VSetField; /* hook for codec tags */
+	tif->tif_tagmethods.printdir = Fax3PrintDir;   /* hook for codec tags */
+	sp->groupoptions = 0;
+	sp->recvparams = 0;
+	sp->subaddress = NULL;
+	sp->faxdcs = NULL;
+
+	if (sp->rw_mode == O_RDONLY) /* FIXME: improve for in place update */
+		tif->tif_flags |= TIFF_NOBITREV; /* decoder does bit reversal */
+	DecoderState(tif)->runs = NULL;
+	TIFFSetField(tif, TIFFTAG_FAXFILLFUNC, _TIFFFax3fillruns);
+	EncoderState(tif)->refline = NULL;
+
+	/*
+	 * Install codec methods.
+	 */
+	tif->tif_setupdecode = Fax3SetupState;
+	tif->tif_predecode = Fax3PreDecode;
+	tif->tif_decoderow = Fax3Decode1D;
+	tif->tif_decodestrip = Fax3Decode1D;
+	tif->tif_decodetile = Fax3Decode1D;
+	tif->tif_setupencode = Fax3SetupState;
+	tif->tif_preencode = Fax3PreEncode;
+	tif->tif_postencode = Fax3PostEncode;
+	tif->tif_encoderow = Fax3Encode;
+	tif->tif_encodestrip = Fax3Encode;
+	tif->tif_encodetile = Fax3Encode;
+	tif->tif_close = Fax3Close;
+	tif->tif_cleanup = Fax3Cleanup;
+
+	return (1);
+}
+
+int
+TIFFInitCCITTFax3(TIFF* tif, int scheme)
+{
+	(void) scheme;
+	if (InitCCITTFax3(tif)) {
+		_TIFFMergeFieldInfo(tif, fax3FieldInfo, N(fax3FieldInfo));
+
+		/*
+		 * The default format is Class/F-style w/o RTC.
+		 */
+		return TIFFSetField(tif, TIFFTAG_FAXMODE, FAXMODE_CLASSF);
+	} else
+		return (0);
+}
+
+/*
+ * CCITT Group 4 (T.6) Facsimile-compatible
+ * Compression Scheme Support.
+ */
+
+#define	SWAP(t,a,b)	{ t x; x = (a); (a) = (b); (b) = x; }
+/*
+ * Decode the requested amount of G4-encoded data.
+ */
+static int
+Fax4Decode(TIFF* tif, tidata_t buf, tsize_t occ, tsample_t s)
+{
+	DECLARE_STATE_2D(tif, sp, "Fax4Decode");
+        int line = 0;
+
+	(void) s;
+	CACHE_STATE(tif, sp);
+	while ((long)occ > 0) {
+		a0 = 0;
+		RunLength = 0;
+		pa = thisrun = sp->curruns;
+		pb = sp->refruns;
+		b1 = *pb++;
+#ifdef FAX3_DEBUG
+		printf("\nBitAcc=%08X, BitsAvail = %d\n", BitAcc, BitsAvail);
+		printf("-------------------- %d\n", tif->tif_row);
+		fflush(stdout);
+#endif
+		EXPAND2D(EOFG4);
+                if (EOLcnt)
+                    goto EOFG4;
+		(*sp->fill)(buf, thisrun, pa, lastx);
+		SETVALUE(0);		/* imaginary change for reference */
+		SWAP(uint32*, sp->curruns, sp->refruns);
+		buf += sp->b.rowbytes;
+		occ -= sp->b.rowbytes;
+                line++;
+		continue;
+	EOFG4:
+                NeedBits16( 13, BADG4 );
+        BADG4:
+#ifdef FAX3_DEBUG
+                if( GetBits(13) != 0x1001 )
+                    fputs( "Bad RTC\n", stderr );
+#endif
+                ClrBits( 13 );
+		(*sp->fill)(buf, thisrun, pa, lastx);
+		UNCACHE_STATE(tif, sp);
+		return (-1);
+	}
+	UNCACHE_STATE(tif, sp);
+	return (1);
+}
+#undef	SWAP
+
+/*
+ * Encode the requested amount of data.
+ */
+static int
+Fax4Encode(TIFF* tif, tidata_t bp, tsize_t cc, tsample_t s)
+{
+	Fax3CodecState *sp = EncoderState(tif);
+
+	(void) s;
+	while ((long)cc > 0) {
+		if (!Fax3Encode2DRow(tif, bp, sp->refline, sp->b.rowpixels))
+			return (0);
+		_TIFFmemcpy(sp->refline, bp, sp->b.rowbytes);
+		bp += sp->b.rowbytes;
+		cc -= sp->b.rowbytes;
+	}
+	return (1);
+}
+
+static int
+Fax4PostEncode(TIFF* tif)
+{
+	Fax3CodecState *sp = EncoderState(tif);
+
+	/* terminate strip w/ EOFB */
+	Fax3PutBits(tif, EOL, 12);
+	Fax3PutBits(tif, EOL, 12);
+	if (sp->bit != 8)
+		Fax3FlushBits(tif, sp);
+	return (1);
+}
+
+int
+TIFFInitCCITTFax4(TIFF* tif, int scheme)
+{
+	(void) scheme;
+	if (InitCCITTFax3(tif)) {		/* reuse G3 support */
+		_TIFFMergeFieldInfo(tif, fax4FieldInfo, N(fax4FieldInfo));
+
+		tif->tif_decoderow = Fax4Decode;
+		tif->tif_decodestrip = Fax4Decode;
+		tif->tif_decodetile = Fax4Decode;
+		tif->tif_encoderow = Fax4Encode;
+		tif->tif_encodestrip = Fax4Encode;
+		tif->tif_encodetile = Fax4Encode;
+		tif->tif_postencode = Fax4PostEncode;
+		/*
+		 * Suppress RTC at the end of each strip.
+		 */
+		return TIFFSetField(tif, TIFFTAG_FAXMODE, FAXMODE_NORTC);
+	} else
+		return (0);
+}
+
+/*
+ * CCITT Group 3 1-D Modified Huffman RLE Compression Support.
+ * (Compression algorithms 2 and 32771)
+ */
+
+/*
+ * Decode the requested amount of RLE-encoded data.
+ */
+static int
+Fax3DecodeRLE(TIFF* tif, tidata_t buf, tsize_t occ, tsample_t s)
+{
+	DECLARE_STATE(tif, sp, "Fax3DecodeRLE");
+	int mode = sp->b.mode;
+        int line = 0;
+
+	(void) s;
+	CACHE_STATE(tif, sp);
+	thisrun = sp->curruns;
+	while ((long)occ > 0) {
+		a0 = 0;
+		RunLength = 0;
+		pa = thisrun;
+#ifdef FAX3_DEBUG
+		printf("\nBitAcc=%08X, BitsAvail = %d\n", BitAcc, BitsAvail);
+		printf("-------------------- %d\n", tif->tif_row);
+		fflush(stdout);
+#endif
+		EXPAND1D(EOFRLE);
+		(*sp->fill)(buf, thisrun, pa, lastx);
+		/*
+		 * Cleanup at the end of the row.
+		 */
+		if (mode & FAXMODE_BYTEALIGN) {
+			int n = BitsAvail - (BitsAvail &~ 7);
+			ClrBits(n);
+		} else if (mode & FAXMODE_WORDALIGN) {
+			int n = BitsAvail - (BitsAvail &~ 15);
+			ClrBits(n);
+			if (BitsAvail == 0 && !isAligned(cp, uint16))
+			    cp++;
+		}
+		buf += sp->b.rowbytes;
+		occ -= sp->b.rowbytes;
+                line++;
+		continue;
+	EOFRLE:				/* premature EOF */
+		(*sp->fill)(buf, thisrun, pa, lastx);
+		UNCACHE_STATE(tif, sp);
+		return (-1);
+	}
+	UNCACHE_STATE(tif, sp);
+	return (1);
+}
+
+int
+TIFFInitCCITTRLE(TIFF* tif, int scheme)
+{
+	(void) scheme;
+	if (InitCCITTFax3(tif)) {		/* reuse G3 support */
+		tif->tif_decoderow = Fax3DecodeRLE;
+		tif->tif_decodestrip = Fax3DecodeRLE;
+		tif->tif_decodetile = Fax3DecodeRLE;
+		/*
+		 * Suppress RTC+EOLs when encoding and byte-align data.
+		 */
+		return TIFFSetField(tif, TIFFTAG_FAXMODE,
+		    FAXMODE_NORTC|FAXMODE_NOEOL|FAXMODE_BYTEALIGN);
+	} else
+		return (0);
+}
+
+int
+TIFFInitCCITTRLEW(TIFF* tif, int scheme)
+{
+	(void) scheme;
+	if (InitCCITTFax3(tif)) {		/* reuse G3 support */
+		tif->tif_decoderow = Fax3DecodeRLE;
+		tif->tif_decodestrip = Fax3DecodeRLE;
+		tif->tif_decodetile = Fax3DecodeRLE;
+		/*
+		 * Suppress RTC+EOLs when encoding and word-align data.
+		 */
+		return TIFFSetField(tif, TIFFTAG_FAXMODE,
+		    FAXMODE_NORTC|FAXMODE_NOEOL|FAXMODE_WORDALIGN);
+	} else
+		return (0);
+}
+#endif /* CCITT_SUPPORT */
+
+/* vim: set ts=8 sts=8 sw=8 noet: */
diff --git a/uppsrc/plugin/tif/lib/tif_fax3.h b/uppsrc/plugin/tif/lib/tif_fax3.h
new file mode 100644
index 000000000..e994de9fa
--- /dev/null
+++ b/uppsrc/plugin/tif/lib/tif_fax3.h
@@ -0,0 +1,525 @@
+/* $Id: tif_fax3.h,v 1.5 2005/12/12 09:23:11 dron Exp $ */
+
+/*
+ * Copyright (c) 1990-1997 Sam Leffler
+ * Copyright (c) 1991-1997 Silicon Graphics, Inc.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and
+ * its documentation for any purpose is hereby granted without fee, provided
+ * that (i) the above copyright notices and this permission notice appear in
+ * all copies of the software and related documentation, and (ii) the names of
+ * Sam Leffler and Silicon Graphics may not be used in any advertising or
+ * publicity relating to the software without the specific, prior written
+ * permission of Sam Leffler and Silicon Graphics.
+ *
+ * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+ * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
+ * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
+ * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+ * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
+ * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.
+ */
+
+#ifndef _FAX3_
+#define	_FAX3_
+/*
+ * TIFF Library.
+ *
+ * CCITT Group 3 (T.4) and Group 4 (T.6) Decompression Support.
+ *
+ * Decoder support is derived, with permission, from the code
+ * in Frank Cringle's viewfax program;
+ *      Copyright (C) 1990, 1995  Frank D. Cringle.
+ */
+#include "tiff.h"
+
+/*
+ * To override the default routine used to image decoded
+ * spans one can use the pseduo tag TIFFTAG_FAXFILLFUNC.
+ * The routine must have the type signature given below;
+ * for example:
+ *
+ * fillruns(unsigned char* buf, uint32* runs, uint32* erun, uint32 lastx)
+ *
+ * where buf is place to set the bits, runs is the array of b&w run
+ * lengths (white then black), erun is the last run in the array, and
+ * lastx is the width of the row in pixels.  Fill routines can assume
+ * the run array has room for at least lastx runs and can overwrite
+ * data in the run array as needed (e.g. to append zero runs to bring
+ * the count up to a nice multiple).
+ */
+typedef	void (*TIFFFaxFillFunc)(unsigned char*, uint32*, uint32*, uint32);
+
+/*
+ * The default run filler; made external for other decoders.
+ */
+#if defined(__cplusplus)
+extern "C" {
+#endif
+extern	void _TIFFFax3fillruns(unsigned char*, uint32*, uint32*, uint32);
+#if defined(__cplusplus)
+}
+#endif
+
+
+/* finite state machine codes */
+#define S_Null		0
+#define S_Pass		1
+#define S_Horiz		2
+#define S_V0		3
+#define S_VR		4
+#define S_VL		5
+#define S_Ext		6
+#define S_TermW		7
+#define S_TermB		8
+#define S_MakeUpW	9
+#define S_MakeUpB	10
+#define S_MakeUp	11
+#define S_EOL		12
+
+typedef struct {		/* state table entry */
+	unsigned char State;	/* see above */
+	unsigned char Width;	/* width of code in bits */
+	uint32	Param;		/* unsigned 32-bit run length in bits */
+} TIFFFaxTabEnt;
+
+extern	const TIFFFaxTabEnt TIFFFaxMainTable[];
+extern	const TIFFFaxTabEnt TIFFFaxWhiteTable[];
+extern	const TIFFFaxTabEnt TIFFFaxBlackTable[];
+
+/*
+ * The following macros define the majority of the G3/G4 decoder
+ * algorithm using the state tables defined elsewhere.  To build
+ * a decoder you need some setup code and some glue code. Note
+ * that you may also need/want to change the way the NeedBits*
+ * macros get input data if, for example, you know the data to be
+ * decoded is properly aligned and oriented (doing so before running
+ * the decoder can be a big performance win).
+ *
+ * Consult the decoder in the TIFF library for an idea of what you
+ * need to define and setup to make use of these definitions.
+ *
+ * NB: to enable a debugging version of these macros define FAX3_DEBUG
+ *     before including this file.  Trace output goes to stdout.
+ */
+
+#ifndef EndOfData
+#define EndOfData()	(cp >= ep)
+#endif
+/*
+ * Need <=8 or <=16 bits of input data.  Unlike viewfax we
+ * cannot use/assume a word-aligned, properly bit swizzled
+ * input data set because data may come from an arbitrarily
+ * aligned, read-only source such as a memory-mapped file.
+ * Note also that the viewfax decoder does not check for
+ * running off the end of the input data buffer.  This is
+ * possible for G3-encoded data because it prescans the input
+ * data to count EOL markers, but can cause problems for G4
+ * data.  In any event, we don't prescan and must watch for
+ * running out of data since we can't permit the library to
+ * scan past the end of the input data buffer.
+ *
+ * Finally, note that we must handle remaindered data at the end
+ * of a strip specially.  The coder asks for a fixed number of
+ * bits when scanning for the next code.  This may be more bits
+ * than are actually present in the data stream.  If we appear
+ * to run out of data but still have some number of valid bits
+ * remaining then we makeup the requested amount with zeros and
+ * return successfully.  If the returned data is incorrect then
+ * we should be called again and get a premature EOF error;
+ * otherwise we should get the right answer.
+ */
+#ifndef NeedBits8
+#define NeedBits8(n,eoflab) do {					\
+    if (BitsAvail < (n)) {						\
+	if (EndOfData()) {						\
+	    if (BitsAvail == 0)			/* no valid bits */	\
+		goto eoflab;						\
+	    BitsAvail = (n);			/* pad with zeros */	\
+	} else {							\
+	    BitAcc |= ((uint32) bitmap[*cp++])<<BitsAvail;		\
+	    BitsAvail += 8;						\
+	}								\
+    }									\
+} while (0)
+#endif
+#ifndef NeedBits16
+#define NeedBits16(n,eoflab) do {					\
+    if (BitsAvail < (n)) {						\
+	if (EndOfData()) {						\
+	    if (BitsAvail == 0)			/* no valid bits */	\
+		goto eoflab;						\
+	    BitsAvail = (n);			/* pad with zeros */	\
+	} else {							\
+	    BitAcc |= ((uint32) bitmap[*cp++])<<BitsAvail;		\
+	    if ((BitsAvail += 8) < (n)) {				\
+		if (EndOfData()) {					\
+		    /* NB: we know BitsAvail is non-zero here */	\
+		    BitsAvail = (n);		/* pad with zeros */	\
+		} else {						\
+		    BitAcc |= ((uint32) bitmap[*cp++])<<BitsAvail;	\
+		    BitsAvail += 8;					\
+		}							\
+	    }								\
+	}								\
+    }									\
+} while (0)
+#endif
+#define GetBits(n)	(BitAcc & ((1<<(n))-1))
+#define ClrBits(n) do {							\
+    BitsAvail -= (n);							\
+    BitAcc >>= (n);							\
+} while (0)
+
+#ifdef FAX3_DEBUG
+static const char* StateNames[] = {
+    "Null   ",
+    "Pass   ",
+    "Horiz  ",
+    "V0     ",
+    "VR     ",
+    "VL     ",
+    "Ext    ",
+    "TermW  ",
+    "TermB  ",
+    "MakeUpW",
+    "MakeUpB",
+    "MakeUp ",
+    "EOL    ",
+};
+#define DEBUG_SHOW putchar(BitAcc & (1 << t) ? '1' : '0')
+#define LOOKUP8(wid,tab,eoflab) do {					\
+    int t;								\
+    NeedBits8(wid,eoflab);						\
+    TabEnt = tab + GetBits(wid);					\
+    printf("%08lX/%d: %s%5d\t", (long) BitAcc, BitsAvail,		\
+	   StateNames[TabEnt->State], TabEnt->Param);			\
+    for (t = 0; t < TabEnt->Width; t++)					\
+	DEBUG_SHOW;							\
+    putchar('\n');							\
+    fflush(stdout);							\
+    ClrBits(TabEnt->Width);						\
+} while (0)
+#define LOOKUP16(wid,tab,eoflab) do {					\
+    int t;								\
+    NeedBits16(wid,eoflab);						\
+    TabEnt = tab + GetBits(wid);					\
+    printf("%08lX/%d: %s%5d\t", (long) BitAcc, BitsAvail,		\
+	   StateNames[TabEnt->State], TabEnt->Param);			\
+    for (t = 0; t < TabEnt->Width; t++)					\
+	DEBUG_SHOW;							\
+    putchar('\n');							\
+    fflush(stdout);							\
+    ClrBits(TabEnt->Width);						\
+} while (0)
+
+#define SETVALUE(x) do {							\
+    *pa++ = RunLength + (x);						\
+    printf("SETVALUE: %d\t%d\n", RunLength + (x), a0);			\
+    a0 += x;								\
+    RunLength = 0;							\
+} while (0)
+#else
+#define LOOKUP8(wid,tab,eoflab) do {					\
+    NeedBits8(wid,eoflab);						\
+    TabEnt = tab + GetBits(wid);					\
+    ClrBits(TabEnt->Width);						\
+} while (0)
+#define LOOKUP16(wid,tab,eoflab) do {					\
+    NeedBits16(wid,eoflab);						\
+    TabEnt = tab + GetBits(wid);					\
+    ClrBits(TabEnt->Width);						\
+} while (0)
+
+/*
+ * Append a run to the run length array for the
+ * current row and reset decoding state.
+ */
+#define SETVALUE(x) do {							\
+    *pa++ = RunLength + (x);						\
+    a0 += (x);								\
+    RunLength = 0;							\
+} while (0)
+#endif
+
+/*
+ * Synchronize input decoding at the start of each
+ * row by scanning for an EOL (if appropriate) and
+ * skipping any trash data that might be present
+ * after a decoding error.  Note that the decoding
+ * done elsewhere that recognizes an EOL only consumes
+ * 11 consecutive zero bits.  This means that if EOLcnt
+ * is non-zero then we still need to scan for the final flag
+ * bit that is part of the EOL code.
+ */
+#define	SYNC_EOL(eoflab) do {						\
+    if (EOLcnt == 0) {							\
+	for (;;) {							\
+	    NeedBits16(11,eoflab);					\
+	    if (GetBits(11) == 0)					\
+		break;							\
+	    ClrBits(1);							\
+	}								\
+    }									\
+    for (;;) {								\
+	NeedBits8(8,eoflab);						\
+	if (GetBits(8))							\
+	    break;							\
+	ClrBits(8);							\
+    }									\
+    while (GetBits(1) == 0)						\
+	ClrBits(1);							\
+    ClrBits(1);				/* EOL bit */			\
+    EOLcnt = 0;				/* reset EOL counter/flag */	\
+} while (0)
+
+/*
+ * Cleanup the array of runs after decoding a row.
+ * We adjust final runs to insure the user buffer is not
+ * overwritten and/or undecoded area is white filled.
+ */
+#define	CLEANUP_RUNS() do {						\
+    if (RunLength)							\
+	SETVALUE(0);							\
+    if (a0 != lastx) {							\
+	badlength(a0, lastx);						\
+	while (a0 > lastx && pa > thisrun)				\
+	    a0 -= *--pa;						\
+	if (a0 < lastx) {						\
+	    if (a0 < 0)							\
+		a0 = 0;							\
+	    if ((pa-thisrun)&1)						\
+		SETVALUE(0);						\
+	    SETVALUE(lastx - a0);						\
+	} else if (a0 > lastx) {					\
+	    SETVALUE(lastx);						\
+	    SETVALUE(0);							\
+	}								\
+    }									\
+} while (0)
+
+/*
+ * Decode a line of 1D-encoded data.
+ *
+ * The line expanders are written as macros so that they can be reused
+ * but still have direct access to the local variables of the "calling"
+ * function.
+ *
+ * Note that unlike the original version we have to explicitly test for
+ * a0 >= lastx after each black/white run is decoded.  This is because
+ * the original code depended on the input data being zero-padded to
+ * insure the decoder recognized an EOL before running out of data.
+ */
+#define EXPAND1D(eoflab) do {						\
+    for (;;) {								\
+	for (;;) {							\
+	    LOOKUP16(12, TIFFFaxWhiteTable, eof1d);			\
+	    switch (TabEnt->State) {					\
+	    case S_EOL:							\
+		EOLcnt = 1;						\
+		goto done1d;						\
+	    case S_TermW:						\
+		SETVALUE(TabEnt->Param);					\
+		goto doneWhite1d;					\
+	    case S_MakeUpW:						\
+	    case S_MakeUp:						\
+		a0 += TabEnt->Param;					\
+		RunLength += TabEnt->Param;				\
+		break;							\
+	    default:							\
+		unexpected("WhiteTable", a0);				\
+		goto done1d;						\
+	    }								\
+	}								\
+    doneWhite1d:							\
+	if (a0 >= lastx)						\
+	    goto done1d;						\
+	for (;;) {							\
+	    LOOKUP16(13, TIFFFaxBlackTable, eof1d);			\
+	    switch (TabEnt->State) {					\
+	    case S_EOL:							\
+		EOLcnt = 1;						\
+		goto done1d;						\
+	    case S_TermB:						\
+		SETVALUE(TabEnt->Param);					\
+		goto doneBlack1d;					\
+	    case S_MakeUpB:						\
+	    case S_MakeUp:						\
+		a0 += TabEnt->Param;					\
+		RunLength += TabEnt->Param;				\
+		break;							\
+	    default:							\
+		unexpected("BlackTable", a0);				\
+		goto done1d;						\
+	    }								\
+	}								\
+    doneBlack1d:							\
+	if (a0 >= lastx)						\
+	    goto done1d;						\
+        if( *(pa-1) == 0 && *(pa-2) == 0 )				\
+            pa -= 2;                                                    \
+    }									\
+eof1d:									\
+    prematureEOF(a0);							\
+    CLEANUP_RUNS();							\
+    goto eoflab;							\
+done1d:									\
+    CLEANUP_RUNS();							\
+} while (0)
+
+/*
+ * Update the value of b1 using the array
+ * of runs for the reference line.
+ */
+#define CHECK_b1 do {							\
+    if (pa != thisrun) while (b1 <= a0 && b1 < lastx) {			\
+	b1 += pb[0] + pb[1];						\
+	pb += 2;							\
+    }									\
+} while (0)
+
+/*
+ * Expand a row of 2D-encoded data.
+ */
+#define EXPAND2D(eoflab) do {						\
+    while (a0 < lastx) {						\
+	LOOKUP8(7, TIFFFaxMainTable, eof2d);				\
+	switch (TabEnt->State) {					\
+	case S_Pass:							\
+	    CHECK_b1;							\
+	    b1 += *pb++;						\
+	    RunLength += b1 - a0;					\
+	    a0 = b1;							\
+	    b1 += *pb++;						\
+	    break;							\
+	case S_Horiz:							\
+	    if ((pa-thisrun)&1) {					\
+		for (;;) {	/* black first */			\
+		    LOOKUP16(13, TIFFFaxBlackTable, eof2d);		\
+		    switch (TabEnt->State) {				\
+		    case S_TermB:					\
+			SETVALUE(TabEnt->Param);				\
+			goto doneWhite2da;				\
+		    case S_MakeUpB:					\
+		    case S_MakeUp:					\
+			a0 += TabEnt->Param;				\
+			RunLength += TabEnt->Param;			\
+			break;						\
+		    default:						\
+			goto badBlack2d;				\
+		    }							\
+		}							\
+	    doneWhite2da:;						\
+		for (;;) {	/* then white */			\
+		    LOOKUP16(12, TIFFFaxWhiteTable, eof2d);		\
+		    switch (TabEnt->State) {				\
+		    case S_TermW:					\
+			SETVALUE(TabEnt->Param);				\
+			goto doneBlack2da;				\
+		    case S_MakeUpW:					\
+		    case S_MakeUp:					\
+			a0 += TabEnt->Param;				\
+			RunLength += TabEnt->Param;			\
+			break;						\
+		    default:						\
+			goto badWhite2d;				\
+		    }							\
+		}							\
+	    doneBlack2da:;						\
+	    } else {							\
+		for (;;) {	/* white first */			\
+		    LOOKUP16(12, TIFFFaxWhiteTable, eof2d);		\
+		    switch (TabEnt->State) {				\
+		    case S_TermW:					\
+			SETVALUE(TabEnt->Param);				\
+			goto doneWhite2db;				\
+		    case S_MakeUpW:					\
+		    case S_MakeUp:					\
+			a0 += TabEnt->Param;				\
+			RunLength += TabEnt->Param;			\
+			break;						\
+		    default:						\
+			goto badWhite2d;				\
+		    }							\
+		}							\
+	    doneWhite2db:;						\
+		for (;;) {	/* then black */			\
+		    LOOKUP16(13, TIFFFaxBlackTable, eof2d);		\
+		    switch (TabEnt->State) {				\
+		    case S_TermB:					\
+			SETVALUE(TabEnt->Param);				\
+			goto doneBlack2db;				\
+		    case S_MakeUpB:					\
+		    case S_MakeUp:					\
+			a0 += TabEnt->Param;				\
+			RunLength += TabEnt->Param;			\
+			break;						\
+		    default:						\
+			goto badBlack2d;				\
+		    }							\
+		}							\
+	    doneBlack2db:;						\
+	    }								\
+	    CHECK_b1;							\
+	    break;							\
+	case S_V0:							\
+	    CHECK_b1;							\
+	    SETVALUE(b1 - a0);						\
+	    b1 += *pb++;						\
+	    break;							\
+	case S_VR:							\
+	    CHECK_b1;							\
+	    SETVALUE(b1 - a0 + TabEnt->Param);				\
+	    b1 += *pb++;						\
+	    break;							\
+	case S_VL:							\
+	    CHECK_b1;							\
+	    SETVALUE(b1 - a0 - TabEnt->Param);				\
+	    b1 -= *--pb;						\
+	    break;							\
+	case S_Ext:							\
+	    *pa++ = lastx - a0;						\
+	    extension(a0);						\
+	    goto eol2d;							\
+	case S_EOL:							\
+	    *pa++ = lastx - a0;						\
+	    NeedBits8(4,eof2d);						\
+	    if (GetBits(4))						\
+		unexpected("EOL", a0);					\
+            ClrBits(4);                                                 \
+	    EOLcnt = 1;							\
+	    goto eol2d;							\
+	default:							\
+	badMain2d:							\
+	    unexpected("MainTable", a0);				\
+	    goto eol2d;							\
+	badBlack2d:							\
+	    unexpected("BlackTable", a0);				\
+	    goto eol2d;							\
+	badWhite2d:							\
+	    unexpected("WhiteTable", a0);				\
+	    goto eol2d;							\
+	eof2d:								\
+	    prematureEOF(a0);						\
+	    CLEANUP_RUNS();						\
+	    goto eoflab;						\
+	}								\
+    }									\
+    if (RunLength) {							\
+	if (RunLength + a0 < lastx) {					\
+	    /* expect a final V0 */					\
+	    NeedBits8(1,eof2d);						\
+	    if (!GetBits(1))						\
+		goto badMain2d;						\
+	    ClrBits(1);							\
+	}								\
+	SETVALUE(0);							\
+    }									\
+eol2d:									\
+    CLEANUP_RUNS();							\
+} while (0)
+#endif /* _FAX3_ */
diff --git a/uppsrc/plugin/tif/lib/tif_fax3sm.c b/uppsrc/plugin/tif/lib/tif_fax3sm.c
new file mode 100644
index 000000000..08ce1ad60
--- /dev/null
+++ b/uppsrc/plugin/tif/lib/tif_fax3sm.c
@@ -0,0 +1,1253 @@
+/* WARNING, this file was automatically generated by the
+    mkg3states program */
+#include "tiff.h"
+#include "tif_fax3.h"
+ const TIFFFaxTabEnt TIFFFaxMainTable[128] = {
+{12,7,0},{3,1,0},{5,3,1},{3,1,0},{2,3,0},{3,1,0},{4,3,1},{3,1,0},{1,4,0},{3,1,0},
+{5,3,1},{3,1,0},{2,3,0},{3,1,0},{4,3,1},{3,1,0},{5,6,2},{3,1,0},{5,3,1},{3,1,0},
+{2,3,0},{3,1,0},{4,3,1},{3,1,0},{1,4,0},{3,1,0},{5,3,1},{3,1,0},{2,3,0},{3,1,0},
+{4,3,1},{3,1,0},{5,7,3},{3,1,0},{5,3,1},{3,1,0},{2,3,0},{3,1,0},{4,3,1},{3,1,0},
+{1,4,0},{3,1,0},{5,3,1},{3,1,0},{2,3,0},{3,1,0},{4,3,1},{3,1,0},{4,6,2},{3,1,0},
+{5,3,1},{3,1,0},{2,3,0},{3,1,0},{4,3,1},{3,1,0},{1,4,0},{3,1,0},{5,3,1},{3,1,0},
+{2,3,0},{3,1,0},{4,3,1},{3,1,0},{6,7,0},{3,1,0},{5,3,1},{3,1,0},{2,3,0},{3,1,0},
+{4,3,1},{3,1,0},{1,4,0},{3,1,0},{5,3,1},{3,1,0},{2,3,0},{3,1,0},{4,3,1},{3,1,0},
+{5,6,2},{3,1,0},{5,3,1},{3,1,0},{2,3,0},{3,1,0},{4,3,1},{3,1,0},{1,4,0},{3,1,0},
+{5,3,1},{3,1,0},{2,3,0},{3,1,0},{4,3,1},{3,1,0},{4,7,3},{3,1,0},{5,3,1},{3,1,0},
+{2,3,0},{3,1,0},{4,3,1},{3,1,0},{1,4,0},{3,1,0},{5,3,1},{3,1,0},{2,3,0},{3,1,0},
+{4,3,1},{3,1,0},{4,6,2},{3,1,0},{5,3,1},{3,1,0},{2,3,0},{3,1,0},{4,3,1},{3,1,0},
+{1,4,0},{3,1,0},{5,3,1},{3,1,0},{2,3,0},{3,1,0},{4,3,1},{3,1,0}
+};
+ const TIFFFaxTabEnt TIFFFaxWhiteTable[4096] = {
+{12,11,0},{7,4,3},{7,5,11},{7,4,5},{7,6,12},{7,5,9},{9,6,1664},{7,4,6},{7,7,20},{9,5,128},
+{7,7,24},{7,6,14},{7,7,28},{7,4,4},{7,4,2},{7,4,7},{7,7,23},{7,4,3},{7,7,27},{7,4,5},
+{7,8,39},{7,6,16},{9,8,576},{7,4,6},{7,7,19},{7,5,8},{7,8,55},{9,5,64},{7,5,10},{7,4,4},
+{7,4,2},{7,4,7},{7,8,45},{7,4,3},{7,5,11},{7,4,5},{7,8,53},{7,5,9},{9,8,448},{7,4,6},
+{7,8,35},{9,5,128},{7,8,51},{7,6,15},{7,8,63},{7,4,4},{7,4,2},{7,4,7},{7,6,13},{7,4,3},
+{9,9,1472},{7,4,5},{7,8,43},{7,6,17},{9,9,1216},{7,4,6},{7,6,1},{7,5,8},{9,6,192},{9,5,64},
+{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,8,29},{7,4,3},{7,5,11},{7,4,5},{7,6,12},{7,5,9},
+{9,6,1664},{7,4,6},{7,8,33},{9,5,128},{7,8,49},{7,6,14},{7,8,61},{7,4,4},{7,4,2},{7,4,7},
+{7,8,47},{7,4,3},{7,8,59},{7,4,5},{7,8,41},{7,6,16},{9,9,960},{7,4,6},{7,8,31},{7,5,8},
+{7,8,57},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,7,22},{7,4,3},{7,5,11},{7,4,5},
+{7,7,26},{7,5,9},{9,9,704},{7,4,6},{7,8,37},{9,5,128},{7,7,25},{7,6,15},{9,8,320},{7,4,4},
+{7,4,2},{7,4,7},{7,6,13},{7,4,3},{7,7,18},{7,4,5},{7,7,21},{7,6,17},{9,7,256},{7,4,6},
+{7,6,1},{7,5,8},{9,6,192},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{11,11,1792},{7,4,3},
+{7,5,11},{7,4,5},{7,6,12},{7,5,9},{9,6,1664},{7,4,6},{7,7,20},{9,5,128},{7,7,24},{7,6,14},
+{7,7,28},{7,4,4},{7,4,2},{7,4,7},{7,7,23},{7,4,3},{7,7,27},{7,4,5},{7,8,40},{7,6,16},
+{9,9,832},{7,4,6},{7,7,19},{7,5,8},{7,8,56},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},
+{7,8,46},{7,4,3},{7,5,11},{7,4,5},{7,8,54},{7,5,9},{9,8,512},{7,4,6},{7,8,36},{9,5,128},
+{7,8,52},{7,6,15},{7,8,0},{7,4,4},{7,4,2},{7,4,7},{7,6,13},{7,4,3},{9,9,1600},{7,4,5},
+{7,8,44},{7,6,17},{9,9,1344},{7,4,6},{7,6,1},{7,5,8},{9,6,192},{9,5,64},{7,5,10},{7,4,4},
+{7,4,2},{7,4,7},{7,8,30},{7,4,3},{7,5,11},{7,4,5},{7,6,12},{7,5,9},{9,6,1664},{7,4,6},
+{7,8,34},{9,5,128},{7,8,50},{7,6,14},{7,8,62},{7,4,4},{7,4,2},{7,4,7},{7,8,48},{7,4,3},
+{7,8,60},{7,4,5},{7,8,42},{7,6,16},{9,9,1088},{7,4,6},{7,8,32},{7,5,8},{7,8,58},{9,5,64},
+{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,7,22},{7,4,3},{7,5,11},{7,4,5},{7,7,26},{7,5,9},
+{9,8,640},{7,4,6},{7,8,38},{9,5,128},{7,7,25},{7,6,15},{9,8,384},{7,4,4},{7,4,2},{7,4,7},
+{7,6,13},{7,4,3},{7,7,18},{7,4,5},{7,7,21},{7,6,17},{9,7,256},{7,4,6},{7,6,1},{7,5,8},
+{9,6,192},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{0,0,0},{7,4,3},{7,5,11},{7,4,5},
+{7,6,12},{7,5,9},{9,6,1664},{7,4,6},{7,7,20},{9,5,128},{7,7,24},{7,6,14},{7,7,28},{7,4,4},
+{7,4,2},{7,4,7},{7,7,23},{7,4,3},{7,7,27},{7,4,5},{7,8,39},{7,6,16},{9,8,576},{7,4,6},
+{7,7,19},{7,5,8},{7,8,55},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,8,45},{7,4,3},
+{7,5,11},{7,4,5},{7,8,53},{7,5,9},{9,8,448},{7,4,6},{7,8,35},{9,5,128},{7,8,51},{7,6,15},
+{7,8,63},{7,4,4},{7,4,2},{7,4,7},{7,6,13},{7,4,3},{9,9,1536},{7,4,5},{7,8,43},{7,6,17},
+{9,9,1280},{7,4,6},{7,6,1},{7,5,8},{9,6,192},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},
+{7,8,29},{7,4,3},{7,5,11},{7,4,5},{7,6,12},{7,5,9},{9,6,1664},{7,4,6},{7,8,33},{9,5,128},
+{7,8,49},{7,6,14},{7,8,61},{7,4,4},{7,4,2},{7,4,7},{7,8,47},{7,4,3},{7,8,59},{7,4,5},
+{7,8,41},{7,6,16},{9,9,1024},{7,4,6},{7,8,31},{7,5,8},{7,8,57},{9,5,64},{7,5,10},{7,4,4},
+{7,4,2},{7,4,7},{7,7,22},{7,4,3},{7,5,11},{7,4,5},{7,7,26},{7,5,9},{9,9,768},{7,4,6},
+{7,8,37},{9,5,128},{7,7,25},{7,6,15},{9,8,320},{7,4,4},{7,4,2},{7,4,7},{7,6,13},{7,4,3},
+{7,7,18},{7,4,5},{7,7,21},{7,6,17},{9,7,256},{7,4,6},{7,6,1},{7,5,8},{9,6,192},{9,5,64},
+{7,5,10},{7,4,4},{7,4,2},{7,4,7},{11,11,1856},{7,4,3},{7,5,11},{7,4,5},{7,6,12},{7,5,9},
+{9,6,1664},{7,4,6},{7,7,20},{9,5,128},{7,7,24},{7,6,14},{7,7,28},{7,4,4},{7,4,2},{7,4,7},
+{7,7,23},{7,4,3},{7,7,27},{7,4,5},{7,8,40},{7,6,16},{9,9,896},{7,4,6},{7,7,19},{7,5,8},
+{7,8,56},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,8,46},{7,4,3},{7,5,11},{7,4,5},
+{7,8,54},{7,5,9},{9,8,512},{7,4,6},{7,8,36},{9,5,128},{7,8,52},{7,6,15},{7,8,0},{7,4,4},
+{7,4,2},{7,4,7},{7,6,13},{7,4,3},{9,9,1728},{7,4,5},{7,8,44},{7,6,17},{9,9,1408},{7,4,6},
+{7,6,1},{7,5,8},{9,6,192},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,8,30},{7,4,3},
+{7,5,11},{7,4,5},{7,6,12},{7,5,9},{9,6,1664},{7,4,6},{7,8,34},{9,5,128},{7,8,50},{7,6,14},
+{7,8,62},{7,4,4},{7,4,2},{7,4,7},{7,8,48},{7,4,3},{7,8,60},{7,4,5},{7,8,42},{7,6,16},
+{9,9,1152},{7,4,6},{7,8,32},{7,5,8},{7,8,58},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},
+{7,7,22},{7,4,3},{7,5,11},{7,4,5},{7,7,26},{7,5,9},{9,8,640},{7,4,6},{7,8,38},{9,5,128},
+{7,7,25},{7,6,15},{9,8,384},{7,4,4},{7,4,2},{7,4,7},{7,6,13},{7,4,3},{7,7,18},{7,4,5},
+{7,7,21},{7,6,17},{9,7,256},{7,4,6},{7,6,1},{7,5,8},{9,6,192},{9,5,64},{7,5,10},{7,4,4},
+{7,4,2},{7,4,7},{0,0,0},{7,4,3},{7,5,11},{7,4,5},{7,6,12},{7,5,9},{9,6,1664},{7,4,6},
+{7,7,20},{9,5,128},{7,7,24},{7,6,14},{7,7,28},{7,4,4},{7,4,2},{7,4,7},{7,7,23},{7,4,3},
+{7,7,27},{7,4,5},{7,8,39},{7,6,16},{9,8,576},{7,4,6},{7,7,19},{7,5,8},{7,8,55},{9,5,64},
+{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,8,45},{7,4,3},{7,5,11},{7,4,5},{7,8,53},{7,5,9},
+{9,8,448},{7,4,6},{7,8,35},{9,5,128},{7,8,51},{7,6,15},{7,8,63},{7,4,4},{7,4,2},{7,4,7},
+{7,6,13},{7,4,3},{9,9,1472},{7,4,5},{7,8,43},{7,6,17},{9,9,1216},{7,4,6},{7,6,1},{7,5,8},
+{9,6,192},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,8,29},{7,4,3},{7,5,11},{7,4,5},
+{7,6,12},{7,5,9},{9,6,1664},{7,4,6},{7,8,33},{9,5,128},{7,8,49},{7,6,14},{7,8,61},{7,4,4},
+{7,4,2},{7,4,7},{7,8,47},{7,4,3},{7,8,59},{7,4,5},{7,8,41},{7,6,16},{9,9,960},{7,4,6},
+{7,8,31},{7,5,8},{7,8,57},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,7,22},{7,4,3},
+{7,5,11},{7,4,5},{7,7,26},{7,5,9},{9,9,704},{7,4,6},{7,8,37},{9,5,128},{7,7,25},{7,6,15},
+{9,8,320},{7,4,4},{7,4,2},{7,4,7},{7,6,13},{7,4,3},{7,7,18},{7,4,5},{7,7,21},{7,6,17},
+{9,7,256},{7,4,6},{7,6,1},{7,5,8},{9,6,192},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},
+{11,12,2112},{7,4,3},{7,5,11},{7,4,5},{7,6,12},{7,5,9},{9,6,1664},{7,4,6},{7,7,20},{9,5,128},
+{7,7,24},{7,6,14},{7,7,28},{7,4,4},{7,4,2},{7,4,7},{7,7,23},{7,4,3},{7,7,27},{7,4,5},
+{7,8,40},{7,6,16},{9,9,832},{7,4,6},{7,7,19},{7,5,8},{7,8,56},{9,5,64},{7,5,10},{7,4,4},
+{7,4,2},{7,4,7},{7,8,46},{7,4,3},{7,5,11},{7,4,5},{7,8,54},{7,5,9},{9,8,512},{7,4,6},
+{7,8,36},{9,5,128},{7,8,52},{7,6,15},{7,8,0},{7,4,4},{7,4,2},{7,4,7},{7,6,13},{7,4,3},
+{9,9,1600},{7,4,5},{7,8,44},{7,6,17},{9,9,1344},{7,4,6},{7,6,1},{7,5,8},{9,6,192},{9,5,64},
+{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,8,30},{7,4,3},{7,5,11},{7,4,5},{7,6,12},{7,5,9},
+{9,6,1664},{7,4,6},{7,8,34},{9,5,128},{7,8,50},{7,6,14},{7,8,62},{7,4,4},{7,4,2},{7,4,7},
+{7,8,48},{7,4,3},{7,8,60},{7,4,5},{7,8,42},{7,6,16},{9,9,1088},{7,4,6},{7,8,32},{7,5,8},
+{7,8,58},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,7,22},{7,4,3},{7,5,11},{7,4,5},
+{7,7,26},{7,5,9},{9,8,640},{7,4,6},{7,8,38},{9,5,128},{7,7,25},{7,6,15},{9,8,384},{7,4,4},
+{7,4,2},{7,4,7},{7,6,13},{7,4,3},{7,7,18},{7,4,5},{7,7,21},{7,6,17},{9,7,256},{7,4,6},
+{7,6,1},{7,5,8},{9,6,192},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{0,0,0},{7,4,3},
+{7,5,11},{7,4,5},{7,6,12},{7,5,9},{9,6,1664},{7,4,6},{7,7,20},{9,5,128},{7,7,24},{7,6,14},
+{7,7,28},{7,4,4},{7,4,2},{7,4,7},{7,7,23},{7,4,3},{7,7,27},{7,4,5},{7,8,39},{7,6,16},
+{9,8,576},{7,4,6},{7,7,19},{7,5,8},{7,8,55},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},
+{7,8,45},{7,4,3},{7,5,11},{7,4,5},{7,8,53},{7,5,9},{9,8,448},{7,4,6},{7,8,35},{9,5,128},
+{7,8,51},{7,6,15},{7,8,63},{7,4,4},{7,4,2},{7,4,7},{7,6,13},{7,4,3},{9,9,1536},{7,4,5},
+{7,8,43},{7,6,17},{9,9,1280},{7,4,6},{7,6,1},{7,5,8},{9,6,192},{9,5,64},{7,5,10},{7,4,4},
+{7,4,2},{7,4,7},{7,8,29},{7,4,3},{7,5,11},{7,4,5},{7,6,12},{7,5,9},{9,6,1664},{7,4,6},
+{7,8,33},{9,5,128},{7,8,49},{7,6,14},{7,8,61},{7,4,4},{7,4,2},{7,4,7},{7,8,47},{7,4,3},
+{7,8,59},{7,4,5},{7,8,41},{7,6,16},{9,9,1024},{7,4,6},{7,8,31},{7,5,8},{7,8,57},{9,5,64},
+{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,7,22},{7,4,3},{7,5,11},{7,4,5},{7,7,26},{7,5,9},
+{9,9,768},{7,4,6},{7,8,37},{9,5,128},{7,7,25},{7,6,15},{9,8,320},{7,4,4},{7,4,2},{7,4,7},
+{7,6,13},{7,4,3},{7,7,18},{7,4,5},{7,7,21},{7,6,17},{9,7,256},{7,4,6},{7,6,1},{7,5,8},
+{9,6,192},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{11,12,2368},{7,4,3},{7,5,11},{7,4,5},
+{7,6,12},{7,5,9},{9,6,1664},{7,4,6},{7,7,20},{9,5,128},{7,7,24},{7,6,14},{7,7,28},{7,4,4},
+{7,4,2},{7,4,7},{7,7,23},{7,4,3},{7,7,27},{7,4,5},{7,8,40},{7,6,16},{9,9,896},{7,4,6},
+{7,7,19},{7,5,8},{7,8,56},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,8,46},{7,4,3},
+{7,5,11},{7,4,5},{7,8,54},{7,5,9},{9,8,512},{7,4,6},{7,8,36},{9,5,128},{7,8,52},{7,6,15},
+{7,8,0},{7,4,4},{7,4,2},{7,4,7},{7,6,13},{7,4,3},{9,9,1728},{7,4,5},{7,8,44},{7,6,17},
+{9,9,1408},{7,4,6},{7,6,1},{7,5,8},{9,6,192},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},
+{7,8,30},{7,4,3},{7,5,11},{7,4,5},{7,6,12},{7,5,9},{9,6,1664},{7,4,6},{7,8,34},{9,5,128},
+{7,8,50},{7,6,14},{7,8,62},{7,4,4},{7,4,2},{7,4,7},{7,8,48},{7,4,3},{7,8,60},{7,4,5},
+{7,8,42},{7,6,16},{9,9,1152},{7,4,6},{7,8,32},{7,5,8},{7,8,58},{9,5,64},{7,5,10},{7,4,4},
+{7,4,2},{7,4,7},{7,7,22},{7,4,3},{7,5,11},{7,4,5},{7,7,26},{7,5,9},{9,8,640},{7,4,6},
+{7,8,38},{9,5,128},{7,7,25},{7,6,15},{9,8,384},{7,4,4},{7,4,2},{7,4,7},{7,6,13},{7,4,3},
+{7,7,18},{7,4,5},{7,7,21},{7,6,17},{9,7,256},{7,4,6},{7,6,1},{7,5,8},{9,6,192},{9,5,64},
+{7,5,10},{7,4,4},{7,4,2},{7,4,7},{0,0,0},{7,4,3},{7,5,11},{7,4,5},{7,6,12},{7,5,9},
+{9,6,1664},{7,4,6},{7,7,20},{9,5,128},{7,7,24},{7,6,14},{7,7,28},{7,4,4},{7,4,2},{7,4,7},
+{7,7,23},{7,4,3},{7,7,27},{7,4,5},{7,8,39},{7,6,16},{9,8,576},{7,4,6},{7,7,19},{7,5,8},
+{7,8,55},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,8,45},{7,4,3},{7,5,11},{7,4,5},
+{7,8,53},{7,5,9},{9,8,448},{7,4,6},{7,8,35},{9,5,128},{7,8,51},{7,6,15},{7,8,63},{7,4,4},
+{7,4,2},{7,4,7},{7,6,13},{7,4,3},{9,9,1472},{7,4,5},{7,8,43},{7,6,17},{9,9,1216},{7,4,6},
+{7,6,1},{7,5,8},{9,6,192},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,8,29},{7,4,3},
+{7,5,11},{7,4,5},{7,6,12},{7,5,9},{9,6,1664},{7,4,6},{7,8,33},{9,5,128},{7,8,49},{7,6,14},
+{7,8,61},{7,4,4},{7,4,2},{7,4,7},{7,8,47},{7,4,3},{7,8,59},{7,4,5},{7,8,41},{7,6,16},
+{9,9,960},{7,4,6},{7,8,31},{7,5,8},{7,8,57},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},
+{7,7,22},{7,4,3},{7,5,11},{7,4,5},{7,7,26},{7,5,9},{9,9,704},{7,4,6},{7,8,37},{9,5,128},
+{7,7,25},{7,6,15},{9,8,320},{7,4,4},{7,4,2},{7,4,7},{7,6,13},{7,4,3},{7,7,18},{7,4,5},
+{7,7,21},{7,6,17},{9,7,256},{7,4,6},{7,6,1},{7,5,8},{9,6,192},{9,5,64},{7,5,10},{7,4,4},
+{7,4,2},{7,4,7},{11,12,1984},{7,4,3},{7,5,11},{7,4,5},{7,6,12},{7,5,9},{9,6,1664},{7,4,6},
+{7,7,20},{9,5,128},{7,7,24},{7,6,14},{7,7,28},{7,4,4},{7,4,2},{7,4,7},{7,7,23},{7,4,3},
+{7,7,27},{7,4,5},{7,8,40},{7,6,16},{9,9,832},{7,4,6},{7,7,19},{7,5,8},{7,8,56},{9,5,64},
+{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,8,46},{7,4,3},{7,5,11},{7,4,5},{7,8,54},{7,5,9},
+{9,8,512},{7,4,6},{7,8,36},{9,5,128},{7,8,52},{7,6,15},{7,8,0},{7,4,4},{7,4,2},{7,4,7},
+{7,6,13},{7,4,3},{9,9,1600},{7,4,5},{7,8,44},{7,6,17},{9,9,1344},{7,4,6},{7,6,1},{7,5,8},
+{9,6,192},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,8,30},{7,4,3},{7,5,11},{7,4,5},
+{7,6,12},{7,5,9},{9,6,1664},{7,4,6},{7,8,34},{9,5,128},{7,8,50},{7,6,14},{7,8,62},{7,4,4},
+{7,4,2},{7,4,7},{7,8,48},{7,4,3},{7,8,60},{7,4,5},{7,8,42},{7,6,16},{9,9,1088},{7,4,6},
+{7,8,32},{7,5,8},{7,8,58},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,7,22},{7,4,3},
+{7,5,11},{7,4,5},{7,7,26},{7,5,9},{9,8,640},{7,4,6},{7,8,38},{9,5,128},{7,7,25},{7,6,15},
+{9,8,384},{7,4,4},{7,4,2},{7,4,7},{7,6,13},{7,4,3},{7,7,18},{7,4,5},{7,7,21},{7,6,17},
+{9,7,256},{7,4,6},{7,6,1},{7,5,8},{9,6,192},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},
+{0,0,0},{7,4,3},{7,5,11},{7,4,5},{7,6,12},{7,5,9},{9,6,1664},{7,4,6},{7,7,20},{9,5,128},
+{7,7,24},{7,6,14},{7,7,28},{7,4,4},{7,4,2},{7,4,7},{7,7,23},{7,4,3},{7,7,27},{7,4,5},
+{7,8,39},{7,6,16},{9,8,576},{7,4,6},{7,7,19},{7,5,8},{7,8,55},{9,5,64},{7,5,10},{7,4,4},
+{7,4,2},{7,4,7},{7,8,45},{7,4,3},{7,5,11},{7,4,5},{7,8,53},{7,5,9},{9,8,448},{7,4,6},
+{7,8,35},{9,5,128},{7,8,51},{7,6,15},{7,8,63},{7,4,4},{7,4,2},{7,4,7},{7,6,13},{7,4,3},
+{9,9,1536},{7,4,5},{7,8,43},{7,6,17},{9,9,1280},{7,4,6},{7,6,1},{7,5,8},{9,6,192},{9,5,64},
+{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,8,29},{7,4,3},{7,5,11},{7,4,5},{7,6,12},{7,5,9},
+{9,6,1664},{7,4,6},{7,8,33},{9,5,128},{7,8,49},{7,6,14},{7,8,61},{7,4,4},{7,4,2},{7,4,7},
+{7,8,47},{7,4,3},{7,8,59},{7,4,5},{7,8,41},{7,6,16},{9,9,1024},{7,4,6},{7,8,31},{7,5,8},
+{7,8,57},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,7,22},{7,4,3},{7,5,11},{7,4,5},
+{7,7,26},{7,5,9},{9,9,768},{7,4,6},{7,8,37},{9,5,128},{7,7,25},{7,6,15},{9,8,320},{7,4,4},
+{7,4,2},{7,4,7},{7,6,13},{7,4,3},{7,7,18},{7,4,5},{7,7,21},{7,6,17},{9,7,256},{7,4,6},
+{7,6,1},{7,5,8},{9,6,192},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{11,11,1920},{7,4,3},
+{7,5,11},{7,4,5},{7,6,12},{7,5,9},{9,6,1664},{7,4,6},{7,7,20},{9,5,128},{7,7,24},{7,6,14},
+{7,7,28},{7,4,4},{7,4,2},{7,4,7},{7,7,23},{7,4,3},{7,7,27},{7,4,5},{7,8,40},{7,6,16},
+{9,9,896},{7,4,6},{7,7,19},{7,5,8},{7,8,56},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},
+{7,8,46},{7,4,3},{7,5,11},{7,4,5},{7,8,54},{7,5,9},{9,8,512},{7,4,6},{7,8,36},{9,5,128},
+{7,8,52},{7,6,15},{7,8,0},{7,4,4},{7,4,2},{7,4,7},{7,6,13},{7,4,3},{9,9,1728},{7,4,5},
+{7,8,44},{7,6,17},{9,9,1408},{7,4,6},{7,6,1},{7,5,8},{9,6,192},{9,5,64},{7,5,10},{7,4,4},
+{7,4,2},{7,4,7},{7,8,30},{7,4,3},{7,5,11},{7,4,5},{7,6,12},{7,5,9},{9,6,1664},{7,4,6},
+{7,8,34},{9,5,128},{7,8,50},{7,6,14},{7,8,62},{7,4,4},{7,4,2},{7,4,7},{7,8,48},{7,4,3},
+{7,8,60},{7,4,5},{7,8,42},{7,6,16},{9,9,1152},{7,4,6},{7,8,32},{7,5,8},{7,8,58},{9,5,64},
+{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,7,22},{7,4,3},{7,5,11},{7,4,5},{7,7,26},{7,5,9},
+{9,8,640},{7,4,6},{7,8,38},{9,5,128},{7,7,25},{7,6,15},{9,8,384},{7,4,4},{7,4,2},{7,4,7},
+{7,6,13},{7,4,3},{7,7,18},{7,4,5},{7,7,21},{7,6,17},{9,7,256},{7,4,6},{7,6,1},{7,5,8},
+{9,6,192},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{0,0,0},{7,4,3},{7,5,11},{7,4,5},
+{7,6,12},{7,5,9},{9,6,1664},{7,4,6},{7,7,20},{9,5,128},{7,7,24},{7,6,14},{7,7,28},{7,4,4},
+{7,4,2},{7,4,7},{7,7,23},{7,4,3},{7,7,27},{7,4,5},{7,8,39},{7,6,16},{9,8,576},{7,4,6},
+{7,7,19},{7,5,8},{7,8,55},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,8,45},{7,4,3},
+{7,5,11},{7,4,5},{7,8,53},{7,5,9},{9,8,448},{7,4,6},{7,8,35},{9,5,128},{7,8,51},{7,6,15},
+{7,8,63},{7,4,4},{7,4,2},{7,4,7},{7,6,13},{7,4,3},{9,9,1472},{7,4,5},{7,8,43},{7,6,17},
+{9,9,1216},{7,4,6},{7,6,1},{7,5,8},{9,6,192},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},
+{7,8,29},{7,4,3},{7,5,11},{7,4,5},{7,6,12},{7,5,9},{9,6,1664},{7,4,6},{7,8,33},{9,5,128},
+{7,8,49},{7,6,14},{7,8,61},{7,4,4},{7,4,2},{7,4,7},{7,8,47},{7,4,3},{7,8,59},{7,4,5},
+{7,8,41},{7,6,16},{9,9,960},{7,4,6},{7,8,31},{7,5,8},{7,8,57},{9,5,64},{7,5,10},{7,4,4},
+{7,4,2},{7,4,7},{7,7,22},{7,4,3},{7,5,11},{7,4,5},{7,7,26},{7,5,9},{9,9,704},{7,4,6},
+{7,8,37},{9,5,128},{7,7,25},{7,6,15},{9,8,320},{7,4,4},{7,4,2},{7,4,7},{7,6,13},{7,4,3},
+{7,7,18},{7,4,5},{7,7,21},{7,6,17},{9,7,256},{7,4,6},{7,6,1},{7,5,8},{9,6,192},{9,5,64},
+{7,5,10},{7,4,4},{7,4,2},{7,4,7},{11,12,2240},{7,4,3},{7,5,11},{7,4,5},{7,6,12},{7,5,9},
+{9,6,1664},{7,4,6},{7,7,20},{9,5,128},{7,7,24},{7,6,14},{7,7,28},{7,4,4},{7,4,2},{7,4,7},
+{7,7,23},{7,4,3},{7,7,27},{7,4,5},{7,8,40},{7,6,16},{9,9,832},{7,4,6},{7,7,19},{7,5,8},
+{7,8,56},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,8,46},{7,4,3},{7,5,11},{7,4,5},
+{7,8,54},{7,5,9},{9,8,512},{7,4,6},{7,8,36},{9,5,128},{7,8,52},{7,6,15},{7,8,0},{7,4,4},
+{7,4,2},{7,4,7},{7,6,13},{7,4,3},{9,9,1600},{7,4,5},{7,8,44},{7,6,17},{9,9,1344},{7,4,6},
+{7,6,1},{7,5,8},{9,6,192},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,8,30},{7,4,3},
+{7,5,11},{7,4,5},{7,6,12},{7,5,9},{9,6,1664},{7,4,6},{7,8,34},{9,5,128},{7,8,50},{7,6,14},
+{7,8,62},{7,4,4},{7,4,2},{7,4,7},{7,8,48},{7,4,3},{7,8,60},{7,4,5},{7,8,42},{7,6,16},
+{9,9,1088},{7,4,6},{7,8,32},{7,5,8},{7,8,58},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},
+{7,7,22},{7,4,3},{7,5,11},{7,4,5},{7,7,26},{7,5,9},{9,8,640},{7,4,6},{7,8,38},{9,5,128},
+{7,7,25},{7,6,15},{9,8,384},{7,4,4},{7,4,2},{7,4,7},{7,6,13},{7,4,3},{7,7,18},{7,4,5},
+{7,7,21},{7,6,17},{9,7,256},{7,4,6},{7,6,1},{7,5,8},{9,6,192},{9,5,64},{7,5,10},{7,4,4},
+{7,4,2},{7,4,7},{0,0,0},{7,4,3},{7,5,11},{7,4,5},{7,6,12},{7,5,9},{9,6,1664},{7,4,6},
+{7,7,20},{9,5,128},{7,7,24},{7,6,14},{7,7,28},{7,4,4},{7,4,2},{7,4,7},{7,7,23},{7,4,3},
+{7,7,27},{7,4,5},{7,8,39},{7,6,16},{9,8,576},{7,4,6},{7,7,19},{7,5,8},{7,8,55},{9,5,64},
+{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,8,45},{7,4,3},{7,5,11},{7,4,5},{7,8,53},{7,5,9},
+{9,8,448},{7,4,6},{7,8,35},{9,5,128},{7,8,51},{7,6,15},{7,8,63},{7,4,4},{7,4,2},{7,4,7},
+{7,6,13},{7,4,3},{9,9,1536},{7,4,5},{7,8,43},{7,6,17},{9,9,1280},{7,4,6},{7,6,1},{7,5,8},
+{9,6,192},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,8,29},{7,4,3},{7,5,11},{7,4,5},
+{7,6,12},{7,5,9},{9,6,1664},{7,4,6},{7,8,33},{9,5,128},{7,8,49},{7,6,14},{7,8,61},{7,4,4},
+{7,4,2},{7,4,7},{7,8,47},{7,4,3},{7,8,59},{7,4,5},{7,8,41},{7,6,16},{9,9,1024},{7,4,6},
+{7,8,31},{7,5,8},{7,8,57},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,7,22},{7,4,3},
+{7,5,11},{7,4,5},{7,7,26},{7,5,9},{9,9,768},{7,4,6},{7,8,37},{9,5,128},{7,7,25},{7,6,15},
+{9,8,320},{7,4,4},{7,4,2},{7,4,7},{7,6,13},{7,4,3},{7,7,18},{7,4,5},{7,7,21},{7,6,17},
+{9,7,256},{7,4,6},{7,6,1},{7,5,8},{9,6,192},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},
+{11,12,2496},{7,4,3},{7,5,11},{7,4,5},{7,6,12},{7,5,9},{9,6,1664},{7,4,6},{7,7,20},{9,5,128},
+{7,7,24},{7,6,14},{7,7,28},{7,4,4},{7,4,2},{7,4,7},{7,7,23},{7,4,3},{7,7,27},{7,4,5},
+{7,8,40},{7,6,16},{9,9,896},{7,4,6},{7,7,19},{7,5,8},{7,8,56},{9,5,64},{7,5,10},{7,4,4},
+{7,4,2},{7,4,7},{7,8,46},{7,4,3},{7,5,11},{7,4,5},{7,8,54},{7,5,9},{9,8,512},{7,4,6},
+{7,8,36},{9,5,128},{7,8,52},{7,6,15},{7,8,0},{7,4,4},{7,4,2},{7,4,7},{7,6,13},{7,4,3},
+{9,9,1728},{7,4,5},{7,8,44},{7,6,17},{9,9,1408},{7,4,6},{7,6,1},{7,5,8},{9,6,192},{9,5,64},
+{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,8,30},{7,4,3},{7,5,11},{7,4,5},{7,6,12},{7,5,9},
+{9,6,1664},{7,4,6},{7,8,34},{9,5,128},{7,8,50},{7,6,14},{7,8,62},{7,4,4},{7,4,2},{7,4,7},
+{7,8,48},{7,4,3},{7,8,60},{7,4,5},{7,8,42},{7,6,16},{9,9,1152},{7,4,6},{7,8,32},{7,5,8},
+{7,8,58},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,7,22},{7,4,3},{7,5,11},{7,4,5},
+{7,7,26},{7,5,9},{9,8,640},{7,4,6},{7,8,38},{9,5,128},{7,7,25},{7,6,15},{9,8,384},{7,4,4},
+{7,4,2},{7,4,7},{7,6,13},{7,4,3},{7,7,18},{7,4,5},{7,7,21},{7,6,17},{9,7,256},{7,4,6},
+{7,6,1},{7,5,8},{9,6,192},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{12,11,0},{7,4,3},
+{7,5,11},{7,4,5},{7,6,12},{7,5,9},{9,6,1664},{7,4,6},{7,7,20},{9,5,128},{7,7,24},{7,6,14},
+{7,7,28},{7,4,4},{7,4,2},{7,4,7},{7,7,23},{7,4,3},{7,7,27},{7,4,5},{7,8,39},{7,6,16},
+{9,8,576},{7,4,6},{7,7,19},{7,5,8},{7,8,55},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},
+{7,8,45},{7,4,3},{7,5,11},{7,4,5},{7,8,53},{7,5,9},{9,8,448},{7,4,6},{7,8,35},{9,5,128},
+{7,8,51},{7,6,15},{7,8,63},{7,4,4},{7,4,2},{7,4,7},{7,6,13},{7,4,3},{9,9,1472},{7,4,5},
+{7,8,43},{7,6,17},{9,9,1216},{7,4,6},{7,6,1},{7,5,8},{9,6,192},{9,5,64},{7,5,10},{7,4,4},
+{7,4,2},{7,4,7},{7,8,29},{7,4,3},{7,5,11},{7,4,5},{7,6,12},{7,5,9},{9,6,1664},{7,4,6},
+{7,8,33},{9,5,128},{7,8,49},{7,6,14},{7,8,61},{7,4,4},{7,4,2},{7,4,7},{7,8,47},{7,4,3},
+{7,8,59},{7,4,5},{7,8,41},{7,6,16},{9,9,960},{7,4,6},{7,8,31},{7,5,8},{7,8,57},{9,5,64},
+{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,7,22},{7,4,3},{7,5,11},{7,4,5},{7,7,26},{7,5,9},
+{9,9,704},{7,4,6},{7,8,37},{9,5,128},{7,7,25},{7,6,15},{9,8,320},{7,4,4},{7,4,2},{7,4,7},
+{7,6,13},{7,4,3},{7,7,18},{7,4,5},{7,7,21},{7,6,17},{9,7,256},{7,4,6},{7,6,1},{7,5,8},
+{9,6,192},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{11,11,1792},{7,4,3},{7,5,11},{7,4,5},
+{7,6,12},{7,5,9},{9,6,1664},{7,4,6},{7,7,20},{9,5,128},{7,7,24},{7,6,14},{7,7,28},{7,4,4},
+{7,4,2},{7,4,7},{7,7,23},{7,4,3},{7,7,27},{7,4,5},{7,8,40},{7,6,16},{9,9,832},{7,4,6},
+{7,7,19},{7,5,8},{7,8,56},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,8,46},{7,4,3},
+{7,5,11},{7,4,5},{7,8,54},{7,5,9},{9,8,512},{7,4,6},{7,8,36},{9,5,128},{7,8,52},{7,6,15},
+{7,8,0},{7,4,4},{7,4,2},{7,4,7},{7,6,13},{7,4,3},{9,9,1600},{7,4,5},{7,8,44},{7,6,17},
+{9,9,1344},{7,4,6},{7,6,1},{7,5,8},{9,6,192},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},
+{7,8,30},{7,4,3},{7,5,11},{7,4,5},{7,6,12},{7,5,9},{9,6,1664},{7,4,6},{7,8,34},{9,5,128},
+{7,8,50},{7,6,14},{7,8,62},{7,4,4},{7,4,2},{7,4,7},{7,8,48},{7,4,3},{7,8,60},{7,4,5},
+{7,8,42},{7,6,16},{9,9,1088},{7,4,6},{7,8,32},{7,5,8},{7,8,58},{9,5,64},{7,5,10},{7,4,4},
+{7,4,2},{7,4,7},{7,7,22},{7,4,3},{7,5,11},{7,4,5},{7,7,26},{7,5,9},{9,8,640},{7,4,6},
+{7,8,38},{9,5,128},{7,7,25},{7,6,15},{9,8,384},{7,4,4},{7,4,2},{7,4,7},{7,6,13},{7,4,3},
+{7,7,18},{7,4,5},{7,7,21},{7,6,17},{9,7,256},{7,4,6},{7,6,1},{7,5,8},{9,6,192},{9,5,64},
+{7,5,10},{7,4,4},{7,4,2},{7,4,7},{0,0,0},{7,4,3},{7,5,11},{7,4,5},{7,6,12},{7,5,9},
+{9,6,1664},{7,4,6},{7,7,20},{9,5,128},{7,7,24},{7,6,14},{7,7,28},{7,4,4},{7,4,2},{7,4,7},
+{7,7,23},{7,4,3},{7,7,27},{7,4,5},{7,8,39},{7,6,16},{9,8,576},{7,4,6},{7,7,19},{7,5,8},
+{7,8,55},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,8,45},{7,4,3},{7,5,11},{7,4,5},
+{7,8,53},{7,5,9},{9,8,448},{7,4,6},{7,8,35},{9,5,128},{7,8,51},{7,6,15},{7,8,63},{7,4,4},
+{7,4,2},{7,4,7},{7,6,13},{7,4,3},{9,9,1536},{7,4,5},{7,8,43},{7,6,17},{9,9,1280},{7,4,6},
+{7,6,1},{7,5,8},{9,6,192},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,8,29},{7,4,3},
+{7,5,11},{7,4,5},{7,6,12},{7,5,9},{9,6,1664},{7,4,6},{7,8,33},{9,5,128},{7,8,49},{7,6,14},
+{7,8,61},{7,4,4},{7,4,2},{7,4,7},{7,8,47},{7,4,3},{7,8,59},{7,4,5},{7,8,41},{7,6,16},
+{9,9,1024},{7,4,6},{7,8,31},{7,5,8},{7,8,57},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},
+{7,7,22},{7,4,3},{7,5,11},{7,4,5},{7,7,26},{7,5,9},{9,9,768},{7,4,6},{7,8,37},{9,5,128},
+{7,7,25},{7,6,15},{9,8,320},{7,4,4},{7,4,2},{7,4,7},{7,6,13},{7,4,3},{7,7,18},{7,4,5},
+{7,7,21},{7,6,17},{9,7,256},{7,4,6},{7,6,1},{7,5,8},{9,6,192},{9,5,64},{7,5,10},{7,4,4},
+{7,4,2},{7,4,7},{11,11,1856},{7,4,3},{7,5,11},{7,4,5},{7,6,12},{7,5,9},{9,6,1664},{7,4,6},
+{7,7,20},{9,5,128},{7,7,24},{7,6,14},{7,7,28},{7,4,4},{7,4,2},{7,4,7},{7,7,23},{7,4,3},
+{7,7,27},{7,4,5},{7,8,40},{7,6,16},{9,9,896},{7,4,6},{7,7,19},{7,5,8},{7,8,56},{9,5,64},
+{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,8,46},{7,4,3},{7,5,11},{7,4,5},{7,8,54},{7,5,9},
+{9,8,512},{7,4,6},{7,8,36},{9,5,128},{7,8,52},{7,6,15},{7,8,0},{7,4,4},{7,4,2},{7,4,7},
+{7,6,13},{7,4,3},{9,9,1728},{7,4,5},{7,8,44},{7,6,17},{9,9,1408},{7,4,6},{7,6,1},{7,5,8},
+{9,6,192},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,8,30},{7,4,3},{7,5,11},{7,4,5},
+{7,6,12},{7,5,9},{9,6,1664},{7,4,6},{7,8,34},{9,5,128},{7,8,50},{7,6,14},{7,8,62},{7,4,4},
+{7,4,2},{7,4,7},{7,8,48},{7,4,3},{7,8,60},{7,4,5},{7,8,42},{7,6,16},{9,9,1152},{7,4,6},
+{7,8,32},{7,5,8},{7,8,58},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,7,22},{7,4,3},
+{7,5,11},{7,4,5},{7,7,26},{7,5,9},{9,8,640},{7,4,6},{7,8,38},{9,5,128},{7,7,25},{7,6,15},
+{9,8,384},{7,4,4},{7,4,2},{7,4,7},{7,6,13},{7,4,3},{7,7,18},{7,4,5},{7,7,21},{7,6,17},
+{9,7,256},{7,4,6},{7,6,1},{7,5,8},{9,6,192},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},
+{0,0,0},{7,4,3},{7,5,11},{7,4,5},{7,6,12},{7,5,9},{9,6,1664},{7,4,6},{7,7,20},{9,5,128},
+{7,7,24},{7,6,14},{7,7,28},{7,4,4},{7,4,2},{7,4,7},{7,7,23},{7,4,3},{7,7,27},{7,4,5},
+{7,8,39},{7,6,16},{9,8,576},{7,4,6},{7,7,19},{7,5,8},{7,8,55},{9,5,64},{7,5,10},{7,4,4},
+{7,4,2},{7,4,7},{7,8,45},{7,4,3},{7,5,11},{7,4,5},{7,8,53},{7,5,9},{9,8,448},{7,4,6},
+{7,8,35},{9,5,128},{7,8,51},{7,6,15},{7,8,63},{7,4,4},{7,4,2},{7,4,7},{7,6,13},{7,4,3},
+{9,9,1472},{7,4,5},{7,8,43},{7,6,17},{9,9,1216},{7,4,6},{7,6,1},{7,5,8},{9,6,192},{9,5,64},
+{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,8,29},{7,4,3},{7,5,11},{7,4,5},{7,6,12},{7,5,9},
+{9,6,1664},{7,4,6},{7,8,33},{9,5,128},{7,8,49},{7,6,14},{7,8,61},{7,4,4},{7,4,2},{7,4,7},
+{7,8,47},{7,4,3},{7,8,59},{7,4,5},{7,8,41},{7,6,16},{9,9,960},{7,4,6},{7,8,31},{7,5,8},
+{7,8,57},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,7,22},{7,4,3},{7,5,11},{7,4,5},
+{7,7,26},{7,5,9},{9,9,704},{7,4,6},{7,8,37},{9,5,128},{7,7,25},{7,6,15},{9,8,320},{7,4,4},
+{7,4,2},{7,4,7},{7,6,13},{7,4,3},{7,7,18},{7,4,5},{7,7,21},{7,6,17},{9,7,256},{7,4,6},
+{7,6,1},{7,5,8},{9,6,192},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{11,12,2176},{7,4,3},
+{7,5,11},{7,4,5},{7,6,12},{7,5,9},{9,6,1664},{7,4,6},{7,7,20},{9,5,128},{7,7,24},{7,6,14},
+{7,7,28},{7,4,4},{7,4,2},{7,4,7},{7,7,23},{7,4,3},{7,7,27},{7,4,5},{7,8,40},{7,6,16},
+{9,9,832},{7,4,6},{7,7,19},{7,5,8},{7,8,56},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},
+{7,8,46},{7,4,3},{7,5,11},{7,4,5},{7,8,54},{7,5,9},{9,8,512},{7,4,6},{7,8,36},{9,5,128},
+{7,8,52},{7,6,15},{7,8,0},{7,4,4},{7,4,2},{7,4,7},{7,6,13},{7,4,3},{9,9,1600},{7,4,5},
+{7,8,44},{7,6,17},{9,9,1344},{7,4,6},{7,6,1},{7,5,8},{9,6,192},{9,5,64},{7,5,10},{7,4,4},
+{7,4,2},{7,4,7},{7,8,30},{7,4,3},{7,5,11},{7,4,5},{7,6,12},{7,5,9},{9,6,1664},{7,4,6},
+{7,8,34},{9,5,128},{7,8,50},{7,6,14},{7,8,62},{7,4,4},{7,4,2},{7,4,7},{7,8,48},{7,4,3},
+{7,8,60},{7,4,5},{7,8,42},{7,6,16},{9,9,1088},{7,4,6},{7,8,32},{7,5,8},{7,8,58},{9,5,64},
+{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,7,22},{7,4,3},{7,5,11},{7,4,5},{7,7,26},{7,5,9},
+{9,8,640},{7,4,6},{7,8,38},{9,5,128},{7,7,25},{7,6,15},{9,8,384},{7,4,4},{7,4,2},{7,4,7},
+{7,6,13},{7,4,3},{7,7,18},{7,4,5},{7,7,21},{7,6,17},{9,7,256},{7,4,6},{7,6,1},{7,5,8},
+{9,6,192},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{0,0,0},{7,4,3},{7,5,11},{7,4,5},
+{7,6,12},{7,5,9},{9,6,1664},{7,4,6},{7,7,20},{9,5,128},{7,7,24},{7,6,14},{7,7,28},{7,4,4},
+{7,4,2},{7,4,7},{7,7,23},{7,4,3},{7,7,27},{7,4,5},{7,8,39},{7,6,16},{9,8,576},{7,4,6},
+{7,7,19},{7,5,8},{7,8,55},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,8,45},{7,4,3},
+{7,5,11},{7,4,5},{7,8,53},{7,5,9},{9,8,448},{7,4,6},{7,8,35},{9,5,128},{7,8,51},{7,6,15},
+{7,8,63},{7,4,4},{7,4,2},{7,4,7},{7,6,13},{7,4,3},{9,9,1536},{7,4,5},{7,8,43},{7,6,17},
+{9,9,1280},{7,4,6},{7,6,1},{7,5,8},{9,6,192},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},
+{7,8,29},{7,4,3},{7,5,11},{7,4,5},{7,6,12},{7,5,9},{9,6,1664},{7,4,6},{7,8,33},{9,5,128},
+{7,8,49},{7,6,14},{7,8,61},{7,4,4},{7,4,2},{7,4,7},{7,8,47},{7,4,3},{7,8,59},{7,4,5},
+{7,8,41},{7,6,16},{9,9,1024},{7,4,6},{7,8,31},{7,5,8},{7,8,57},{9,5,64},{7,5,10},{7,4,4},
+{7,4,2},{7,4,7},{7,7,22},{7,4,3},{7,5,11},{7,4,5},{7,7,26},{7,5,9},{9,9,768},{7,4,6},
+{7,8,37},{9,5,128},{7,7,25},{7,6,15},{9,8,320},{7,4,4},{7,4,2},{7,4,7},{7,6,13},{7,4,3},
+{7,7,18},{7,4,5},{7,7,21},{7,6,17},{9,7,256},{7,4,6},{7,6,1},{7,5,8},{9,6,192},{9,5,64},
+{7,5,10},{7,4,4},{7,4,2},{7,4,7},{11,12,2432},{7,4,3},{7,5,11},{7,4,5},{7,6,12},{7,5,9},
+{9,6,1664},{7,4,6},{7,7,20},{9,5,128},{7,7,24},{7,6,14},{7,7,28},{7,4,4},{7,4,2},{7,4,7},
+{7,7,23},{7,4,3},{7,7,27},{7,4,5},{7,8,40},{7,6,16},{9,9,896},{7,4,6},{7,7,19},{7,5,8},
+{7,8,56},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,8,46},{7,4,3},{7,5,11},{7,4,5},
+{7,8,54},{7,5,9},{9,8,512},{7,4,6},{7,8,36},{9,5,128},{7,8,52},{7,6,15},{7,8,0},{7,4,4},
+{7,4,2},{7,4,7},{7,6,13},{7,4,3},{9,9,1728},{7,4,5},{7,8,44},{7,6,17},{9,9,1408},{7,4,6},
+{7,6,1},{7,5,8},{9,6,192},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,8,30},{7,4,3},
+{7,5,11},{7,4,5},{7,6,12},{7,5,9},{9,6,1664},{7,4,6},{7,8,34},{9,5,128},{7,8,50},{7,6,14},
+{7,8,62},{7,4,4},{7,4,2},{7,4,7},{7,8,48},{7,4,3},{7,8,60},{7,4,5},{7,8,42},{7,6,16},
+{9,9,1152},{7,4,6},{7,8,32},{7,5,8},{7,8,58},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},
+{7,7,22},{7,4,3},{7,5,11},{7,4,5},{7,7,26},{7,5,9},{9,8,640},{7,4,6},{7,8,38},{9,5,128},
+{7,7,25},{7,6,15},{9,8,384},{7,4,4},{7,4,2},{7,4,7},{7,6,13},{7,4,3},{7,7,18},{7,4,5},
+{7,7,21},{7,6,17},{9,7,256},{7,4,6},{7,6,1},{7,5,8},{9,6,192},{9,5,64},{7,5,10},{7,4,4},
+{7,4,2},{7,4,7},{0,0,0},{7,4,3},{7,5,11},{7,4,5},{7,6,12},{7,5,9},{9,6,1664},{7,4,6},
+{7,7,20},{9,5,128},{7,7,24},{7,6,14},{7,7,28},{7,4,4},{7,4,2},{7,4,7},{7,7,23},{7,4,3},
+{7,7,27},{7,4,5},{7,8,39},{7,6,16},{9,8,576},{7,4,6},{7,7,19},{7,5,8},{7,8,55},{9,5,64},
+{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,8,45},{7,4,3},{7,5,11},{7,4,5},{7,8,53},{7,5,9},
+{9,8,448},{7,4,6},{7,8,35},{9,5,128},{7,8,51},{7,6,15},{7,8,63},{7,4,4},{7,4,2},{7,4,7},
+{7,6,13},{7,4,3},{9,9,1472},{7,4,5},{7,8,43},{7,6,17},{9,9,1216},{7,4,6},{7,6,1},{7,5,8},
+{9,6,192},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,8,29},{7,4,3},{7,5,11},{7,4,5},
+{7,6,12},{7,5,9},{9,6,1664},{7,4,6},{7,8,33},{9,5,128},{7,8,49},{7,6,14},{7,8,61},{7,4,4},
+{7,4,2},{7,4,7},{7,8,47},{7,4,3},{7,8,59},{7,4,5},{7,8,41},{7,6,16},{9,9,960},{7,4,6},
+{7,8,31},{7,5,8},{7,8,57},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,7,22},{7,4,3},
+{7,5,11},{7,4,5},{7,7,26},{7,5,9},{9,9,704},{7,4,6},{7,8,37},{9,5,128},{7,7,25},{7,6,15},
+{9,8,320},{7,4,4},{7,4,2},{7,4,7},{7,6,13},{7,4,3},{7,7,18},{7,4,5},{7,7,21},{7,6,17},
+{9,7,256},{7,4,6},{7,6,1},{7,5,8},{9,6,192},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},
+{11,12,2048},{7,4,3},{7,5,11},{7,4,5},{7,6,12},{7,5,9},{9,6,1664},{7,4,6},{7,7,20},{9,5,128},
+{7,7,24},{7,6,14},{7,7,28},{7,4,4},{7,4,2},{7,4,7},{7,7,23},{7,4,3},{7,7,27},{7,4,5},
+{7,8,40},{7,6,16},{9,9,832},{7,4,6},{7,7,19},{7,5,8},{7,8,56},{9,5,64},{7,5,10},{7,4,4},
+{7,4,2},{7,4,7},{7,8,46},{7,4,3},{7,5,11},{7,4,5},{7,8,54},{7,5,9},{9,8,512},{7,4,6},
+{7,8,36},{9,5,128},{7,8,52},{7,6,15},{7,8,0},{7,4,4},{7,4,2},{7,4,7},{7,6,13},{7,4,3},
+{9,9,1600},{7,4,5},{7,8,44},{7,6,17},{9,9,1344},{7,4,6},{7,6,1},{7,5,8},{9,6,192},{9,5,64},
+{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,8,30},{7,4,3},{7,5,11},{7,4,5},{7,6,12},{7,5,9},
+{9,6,1664},{7,4,6},{7,8,34},{9,5,128},{7,8,50},{7,6,14},{7,8,62},{7,4,4},{7,4,2},{7,4,7},
+{7,8,48},{7,4,3},{7,8,60},{7,4,5},{7,8,42},{7,6,16},{9,9,1088},{7,4,6},{7,8,32},{7,5,8},
+{7,8,58},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,7,22},{7,4,3},{7,5,11},{7,4,5},
+{7,7,26},{7,5,9},{9,8,640},{7,4,6},{7,8,38},{9,5,128},{7,7,25},{7,6,15},{9,8,384},{7,4,4},
+{7,4,2},{7,4,7},{7,6,13},{7,4,3},{7,7,18},{7,4,5},{7,7,21},{7,6,17},{9,7,256},{7,4,6},
+{7,6,1},{7,5,8},{9,6,192},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{0,0,0},{7,4,3},
+{7,5,11},{7,4,5},{7,6,12},{7,5,9},{9,6,1664},{7,4,6},{7,7,20},{9,5,128},{7,7,24},{7,6,14},
+{7,7,28},{7,4,4},{7,4,2},{7,4,7},{7,7,23},{7,4,3},{7,7,27},{7,4,5},{7,8,39},{7,6,16},
+{9,8,576},{7,4,6},{7,7,19},{7,5,8},{7,8,55},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},
+{7,8,45},{7,4,3},{7,5,11},{7,4,5},{7,8,53},{7,5,9},{9,8,448},{7,4,6},{7,8,35},{9,5,128},
+{7,8,51},{7,6,15},{7,8,63},{7,4,4},{7,4,2},{7,4,7},{7,6,13},{7,4,3},{9,9,1536},{7,4,5},
+{7,8,43},{7,6,17},{9,9,1280},{7,4,6},{7,6,1},{7,5,8},{9,6,192},{9,5,64},{7,5,10},{7,4,4},
+{7,4,2},{7,4,7},{7,8,29},{7,4,3},{7,5,11},{7,4,5},{7,6,12},{7,5,9},{9,6,1664},{7,4,6},
+{7,8,33},{9,5,128},{7,8,49},{7,6,14},{7,8,61},{7,4,4},{7,4,2},{7,4,7},{7,8,47},{7,4,3},
+{7,8,59},{7,4,5},{7,8,41},{7,6,16},{9,9,1024},{7,4,6},{7,8,31},{7,5,8},{7,8,57},{9,5,64},
+{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,7,22},{7,4,3},{7,5,11},{7,4,5},{7,7,26},{7,5,9},
+{9,9,768},{7,4,6},{7,8,37},{9,5,128},{7,7,25},{7,6,15},{9,8,320},{7,4,4},{7,4,2},{7,4,7},
+{7,6,13},{7,4,3},{7,7,18},{7,4,5},{7,7,21},{7,6,17},{9,7,256},{7,4,6},{7,6,1},{7,5,8},
+{9,6,192},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{11,11,1920},{7,4,3},{7,5,11},{7,4,5},
+{7,6,12},{7,5,9},{9,6,1664},{7,4,6},{7,7,20},{9,5,128},{7,7,24},{7,6,14},{7,7,28},{7,4,4},
+{7,4,2},{7,4,7},{7,7,23},{7,4,3},{7,7,27},{7,4,5},{7,8,40},{7,6,16},{9,9,896},{7,4,6},
+{7,7,19},{7,5,8},{7,8,56},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,8,46},{7,4,3},
+{7,5,11},{7,4,5},{7,8,54},{7,5,9},{9,8,512},{7,4,6},{7,8,36},{9,5,128},{7,8,52},{7,6,15},
+{7,8,0},{7,4,4},{7,4,2},{7,4,7},{7,6,13},{7,4,3},{9,9,1728},{7,4,5},{7,8,44},{7,6,17},
+{9,9,1408},{7,4,6},{7,6,1},{7,5,8},{9,6,192},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},
+{7,8,30},{7,4,3},{7,5,11},{7,4,5},{7,6,12},{7,5,9},{9,6,1664},{7,4,6},{7,8,34},{9,5,128},
+{7,8,50},{7,6,14},{7,8,62},{7,4,4},{7,4,2},{7,4,7},{7,8,48},{7,4,3},{7,8,60},{7,4,5},
+{7,8,42},{7,6,16},{9,9,1152},{7,4,6},{7,8,32},{7,5,8},{7,8,58},{9,5,64},{7,5,10},{7,4,4},
+{7,4,2},{7,4,7},{7,7,22},{7,4,3},{7,5,11},{7,4,5},{7,7,26},{7,5,9},{9,8,640},{7,4,6},
+{7,8,38},{9,5,128},{7,7,25},{7,6,15},{9,8,384},{7,4,4},{7,4,2},{7,4,7},{7,6,13},{7,4,3},
+{7,7,18},{7,4,5},{7,7,21},{7,6,17},{9,7,256},{7,4,6},{7,6,1},{7,5,8},{9,6,192},{9,5,64},
+{7,5,10},{7,4,4},{7,4,2},{7,4,7},{0,0,0},{7,4,3},{7,5,11},{7,4,5},{7,6,12},{7,5,9},
+{9,6,1664},{7,4,6},{7,7,20},{9,5,128},{7,7,24},{7,6,14},{7,7,28},{7,4,4},{7,4,2},{7,4,7},
+{7,7,23},{7,4,3},{7,7,27},{7,4,5},{7,8,39},{7,6,16},{9,8,576},{7,4,6},{7,7,19},{7,5,8},
+{7,8,55},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,8,45},{7,4,3},{7,5,11},{7,4,5},
+{7,8,53},{7,5,9},{9,8,448},{7,4,6},{7,8,35},{9,5,128},{7,8,51},{7,6,15},{7,8,63},{7,4,4},
+{7,4,2},{7,4,7},{7,6,13},{7,4,3},{9,9,1472},{7,4,5},{7,8,43},{7,6,17},{9,9,1216},{7,4,6},
+{7,6,1},{7,5,8},{9,6,192},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,8,29},{7,4,3},
+{7,5,11},{7,4,5},{7,6,12},{7,5,9},{9,6,1664},{7,4,6},{7,8,33},{9,5,128},{7,8,49},{7,6,14},
+{7,8,61},{7,4,4},{7,4,2},{7,4,7},{7,8,47},{7,4,3},{7,8,59},{7,4,5},{7,8,41},{7,6,16},
+{9,9,960},{7,4,6},{7,8,31},{7,5,8},{7,8,57},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},
+{7,7,22},{7,4,3},{7,5,11},{7,4,5},{7,7,26},{7,5,9},{9,9,704},{7,4,6},{7,8,37},{9,5,128},
+{7,7,25},{7,6,15},{9,8,320},{7,4,4},{7,4,2},{7,4,7},{7,6,13},{7,4,3},{7,7,18},{7,4,5},
+{7,7,21},{7,6,17},{9,7,256},{7,4,6},{7,6,1},{7,5,8},{9,6,192},{9,5,64},{7,5,10},{7,4,4},
+{7,4,2},{7,4,7},{11,12,2304},{7,4,3},{7,5,11},{7,4,5},{7,6,12},{7,5,9},{9,6,1664},{7,4,6},
+{7,7,20},{9,5,128},{7,7,24},{7,6,14},{7,7,28},{7,4,4},{7,4,2},{7,4,7},{7,7,23},{7,4,3},
+{7,7,27},{7,4,5},{7,8,40},{7,6,16},{9,9,832},{7,4,6},{7,7,19},{7,5,8},{7,8,56},{9,5,64},
+{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,8,46},{7,4,3},{7,5,11},{7,4,5},{7,8,54},{7,5,9},
+{9,8,512},{7,4,6},{7,8,36},{9,5,128},{7,8,52},{7,6,15},{7,8,0},{7,4,4},{7,4,2},{7,4,7},
+{7,6,13},{7,4,3},{9,9,1600},{7,4,5},{7,8,44},{7,6,17},{9,9,1344},{7,4,6},{7,6,1},{7,5,8},
+{9,6,192},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,8,30},{7,4,3},{7,5,11},{7,4,5},
+{7,6,12},{7,5,9},{9,6,1664},{7,4,6},{7,8,34},{9,5,128},{7,8,50},{7,6,14},{7,8,62},{7,4,4},
+{7,4,2},{7,4,7},{7,8,48},{7,4,3},{7,8,60},{7,4,5},{7,8,42},{7,6,16},{9,9,1088},{7,4,6},
+{7,8,32},{7,5,8},{7,8,58},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,7,22},{7,4,3},
+{7,5,11},{7,4,5},{7,7,26},{7,5,9},{9,8,640},{7,4,6},{7,8,38},{9,5,128},{7,7,25},{7,6,15},
+{9,8,384},{7,4,4},{7,4,2},{7,4,7},{7,6,13},{7,4,3},{7,7,18},{7,4,5},{7,7,21},{7,6,17},
+{9,7,256},{7,4,6},{7,6,1},{7,5,8},{9,6,192},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},
+{0,0,0},{7,4,3},{7,5,11},{7,4,5},{7,6,12},{7,5,9},{9,6,1664},{7,4,6},{7,7,20},{9,5,128},
+{7,7,24},{7,6,14},{7,7,28},{7,4,4},{7,4,2},{7,4,7},{7,7,23},{7,4,3},{7,7,27},{7,4,5},
+{7,8,39},{7,6,16},{9,8,576},{7,4,6},{7,7,19},{7,5,8},{7,8,55},{9,5,64},{7,5,10},{7,4,4},
+{7,4,2},{7,4,7},{7,8,45},{7,4,3},{7,5,11},{7,4,5},{7,8,53},{7,5,9},{9,8,448},{7,4,6},
+{7,8,35},{9,5,128},{7,8,51},{7,6,15},{7,8,63},{7,4,4},{7,4,2},{7,4,7},{7,6,13},{7,4,3},
+{9,9,1536},{7,4,5},{7,8,43},{7,6,17},{9,9,1280},{7,4,6},{7,6,1},{7,5,8},{9,6,192},{9,5,64},
+{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,8,29},{7,4,3},{7,5,11},{7,4,5},{7,6,12},{7,5,9},
+{9,6,1664},{7,4,6},{7,8,33},{9,5,128},{7,8,49},{7,6,14},{7,8,61},{7,4,4},{7,4,2},{7,4,7},
+{7,8,47},{7,4,3},{7,8,59},{7,4,5},{7,8,41},{7,6,16},{9,9,1024},{7,4,6},{7,8,31},{7,5,8},
+{7,8,57},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,7,22},{7,4,3},{7,5,11},{7,4,5},
+{7,7,26},{7,5,9},{9,9,768},{7,4,6},{7,8,37},{9,5,128},{7,7,25},{7,6,15},{9,8,320},{7,4,4},
+{7,4,2},{7,4,7},{7,6,13},{7,4,3},{7,7,18},{7,4,5},{7,7,21},{7,6,17},{9,7,256},{7,4,6},
+{7,6,1},{7,5,8},{9,6,192},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{11,12,2560},{7,4,3},
+{7,5,11},{7,4,5},{7,6,12},{7,5,9},{9,6,1664},{7,4,6},{7,7,20},{9,5,128},{7,7,24},{7,6,14},
+{7,7,28},{7,4,4},{7,4,2},{7,4,7},{7,7,23},{7,4,3},{7,7,27},{7,4,5},{7,8,40},{7,6,16},
+{9,9,896},{7,4,6},{7,7,19},{7,5,8},{7,8,56},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},
+{7,8,46},{7,4,3},{7,5,11},{7,4,5},{7,8,54},{7,5,9},{9,8,512},{7,4,6},{7,8,36},{9,5,128},
+{7,8,52},{7,6,15},{7,8,0},{7,4,4},{7,4,2},{7,4,7},{7,6,13},{7,4,3},{9,9,1728},{7,4,5},
+{7,8,44},{7,6,17},{9,9,1408},{7,4,6},{7,6,1},{7,5,8},{9,6,192},{9,5,64},{7,5,10},{7,4,4},
+{7,4,2},{7,4,7},{7,8,30},{7,4,3},{7,5,11},{7,4,5},{7,6,12},{7,5,9},{9,6,1664},{7,4,6},
+{7,8,34},{9,5,128},{7,8,50},{7,6,14},{7,8,62},{7,4,4},{7,4,2},{7,4,7},{7,8,48},{7,4,3},
+{7,8,60},{7,4,5},{7,8,42},{7,6,16},{9,9,1152},{7,4,6},{7,8,32},{7,5,8},{7,8,58},{9,5,64},
+{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,7,22},{7,4,3},{7,5,11},{7,4,5},{7,7,26},{7,5,9},
+{9,8,640},{7,4,6},{7,8,38},{9,5,128},{7,7,25},{7,6,15},{9,8,384},{7,4,4},{7,4,2},{7,4,7},
+{7,6,13},{7,4,3},{7,7,18},{7,4,5},{7,7,21},{7,6,17},{9,7,256},{7,4,6},{7,6,1},{7,5,8},
+{9,6,192},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7}
+};
+ const TIFFFaxTabEnt TIFFFaxBlackTable[8192] = {
+{12,11,0},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},
+{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,10},{8,2,3},{8,3,1},{8,2,2},
+{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
+{8,3,4},{8,2,2},{8,8,13},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
+{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,9,15},{8,2,3},
+{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
+{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,10,18},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
+{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
+{8,7,11},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
+{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,10,17},{8,2,3},{8,3,1},{8,2,2},
+{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
+{8,3,4},{8,2,2},{8,7,12},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
+{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{11,11,1792},{8,2,3},
+{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},
+{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,10},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
+{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
+{8,11,23},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},
+{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,11,20},{8,2,3},{8,3,1},{8,2,2},
+{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
+{8,3,4},{8,2,2},{8,11,25},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
+{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,11},{8,2,3},
+{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
+{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,8,14},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
+{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
+{8,7,12},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
+{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{0,0,0},{8,2,3},{8,3,1},{8,2,2},
+{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
+{8,3,4},{8,2,2},{8,7,10},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
+{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,8,13},{8,2,3},
+{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},
+{8,4,5},{8,2,3},{8,3,4},{8,2,2},{10,12,128},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
+{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
+{8,12,56},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},
+{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,11},{8,2,3},{8,3,1},{8,2,2},
+{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
+{8,3,4},{8,2,2},{8,12,30},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
+{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,12},{8,2,3},
+{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
+{8,4,5},{8,2,3},{8,3,4},{8,2,2},{11,11,1856},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
+{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
+{8,7,10},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
+{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,12,57},{8,2,3},{8,3,1},{8,2,2},
+{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
+{8,3,4},{8,2,2},{8,11,21},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
+{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,12,54},{8,2,3},
+{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},
+{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,11},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
+{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
+{8,8,14},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},
+{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,12},{8,2,3},{8,3,1},{8,2,2},
+{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
+{8,3,4},{8,2,2},{0,0,0},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
+{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,10},{8,2,3},
+{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
+{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,8,13},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
+{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
+{8,9,15},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
+{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,12,52},{8,2,3},{8,3,1},{8,2,2},
+{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
+{8,3,4},{8,2,2},{8,7,11},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
+{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,12,48},{8,2,3},
+{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},
+{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,12},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
+{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
+{11,12,2112},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},
+{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,10},{8,2,3},{8,3,1},{8,2,2},
+{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
+{8,3,4},{8,2,2},{8,12,44},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
+{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,12,36},{8,2,3},
+{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
+{8,4,5},{8,2,3},{8,3,4},{8,2,2},{10,12,384},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
+{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
+{8,7,11},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
+{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,8,14},{8,2,3},{8,3,1},{8,2,2},
+{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
+{8,3,4},{8,2,2},{8,7,12},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
+{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{0,0,0},{8,2,3},
+{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},
+{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,10},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
+{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
+{8,8,13},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},
+{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,12,28},{8,2,3},{8,3,1},{8,2,2},
+{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
+{8,3,4},{8,2,2},{8,12,60},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
+{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,11},{8,2,3},
+{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
+{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,12,40},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
+{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
+{8,7,12},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
+{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{11,12,2368},{8,2,3},{8,3,1},{8,2,2},
+{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
+{8,3,4},{8,2,2},{8,7,10},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
+{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,10,16},{8,2,3},
+{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},
+{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,10,0},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
+{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
+{10,10,64},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},
+{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,11},{8,2,3},{8,3,1},{8,2,2},
+{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
+{8,3,4},{8,2,2},{8,8,14},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
+{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,12},{8,2,3},
+{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
+{8,4,5},{8,2,3},{8,3,4},{8,2,2},{0,0,0},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
+{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
+{8,7,10},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
+{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,8,13},{8,2,3},{8,3,1},{8,2,2},
+{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
+{8,3,4},{8,2,2},{8,9,15},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
+{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,10,18},{8,2,3},
+{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},
+{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,11},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
+{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
+{8,10,17},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},
+{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,12},{8,2,3},{8,3,1},{8,2,2},
+{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
+{8,3,4},{8,2,2},{11,12,1984},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
+{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,10},{8,2,3},
+{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
+{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,12,50},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
+{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
+{8,12,34},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
+{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{10,13,1664},{8,2,3},{8,3,1},{8,2,2},
+{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
+{8,3,4},{8,2,2},{8,7,11},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
+{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,8,14},{8,2,3},
+{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},
+{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,12},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
+{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
+{0,0,0},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},
+{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,10},{8,2,3},{8,3,1},{8,2,2},
+{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
+{8,3,4},{8,2,2},{8,8,13},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
+{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,12,26},{8,2,3},
+{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
+{8,4,5},{8,2,3},{8,3,4},{8,2,2},{10,13,1408},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
+{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
+{8,7,11},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
+{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,12,32},{8,2,3},{8,3,1},{8,2,2},
+{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
+{8,3,4},{8,2,2},{8,7,12},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
+{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{11,11,1920},{8,2,3},
+{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},
+{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,10},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
+{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
+{8,12,61},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},
+{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,12,42},{8,2,3},{8,3,1},{8,2,2},
+{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
+{8,3,4},{8,2,2},{10,13,1024},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
+{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,11},{8,2,3},
+{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
+{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,8,14},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
+{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
+{8,7,12},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
+{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{0,0,0},{8,2,3},{8,3,1},{8,2,2},
+{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
+{8,3,4},{8,2,2},{8,7,10},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
+{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,8,13},{8,2,3},
+{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},
+{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,9,15},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
+{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
+{10,13,768},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},
+{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,11},{8,2,3},{8,3,1},{8,2,2},
+{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
+{8,3,4},{8,2,2},{8,12,62},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
+{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,12},{8,2,3},
+{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
+{8,4,5},{8,2,3},{8,3,4},{8,2,2},{11,12,2240},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
+{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
+{8,7,10},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
+{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,12,46},{8,2,3},{8,3,1},{8,2,2},
+{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
+{8,3,4},{8,2,2},{8,12,38},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
+{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{10,13,512},{8,2,3},
+{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},
+{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,11},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
+{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
+{8,8,14},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},
+{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,12},{8,2,3},{8,3,1},{8,2,2},
+{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
+{8,3,4},{8,2,2},{0,0,0},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
+{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,10},{8,2,3},
+{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
+{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,8,13},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
+{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
+{8,11,19},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
+{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,11,24},{8,2,3},{8,3,1},{8,2,2},
+{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
+{8,3,4},{8,2,2},{8,7,11},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
+{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,11,22},{8,2,3},
+{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},
+{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,12},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
+{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
+{11,12,2496},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},
+{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,10},{8,2,3},{8,3,1},{8,2,2},
+{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
+{8,3,4},{8,2,2},{8,10,16},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
+{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,10,0},{8,2,3},
+{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
+{8,4,5},{8,2,3},{8,3,4},{8,2,2},{10,10,64},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
+{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
+{8,7,11},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
+{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,8,14},{8,2,3},{8,3,1},{8,2,2},
+{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
+{8,3,4},{8,2,2},{8,7,12},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
+{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{12,11,0},{8,2,3},
+{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},
+{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,10},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
+{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
+{8,8,13},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},
+{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,9,15},{8,2,3},{8,3,1},{8,2,2},
+{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
+{8,3,4},{8,2,2},{8,10,18},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
+{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,11},{8,2,3},
+{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
+{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,10,17},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
+{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
+{8,7,12},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
+{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{11,11,1792},{8,2,3},{8,3,1},{8,2,2},
+{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
+{8,3,4},{8,2,2},{8,7,10},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
+{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,11,23},{8,2,3},
+{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},
+{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,11,20},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
+{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
+{8,11,25},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},
+{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,11},{8,2,3},{8,3,1},{8,2,2},
+{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
+{8,3,4},{8,2,2},{8,8,14},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
+{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,12},{8,2,3},
+{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
+{8,4,5},{8,2,3},{8,3,4},{8,2,2},{0,0,0},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
+{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
+{8,7,10},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
+{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,8,13},{8,2,3},{8,3,1},{8,2,2},
+{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
+{8,3,4},{8,2,2},{10,12,192},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
+{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{10,13,1280},{8,2,3},
+{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},
+{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,11},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
+{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
+{8,12,31},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},
+{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,12},{8,2,3},{8,3,1},{8,2,2},
+{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
+{8,3,4},{8,2,2},{11,11,1856},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
+{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,10},{8,2,3},
+{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
+{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,12,58},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
+{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
+{8,11,21},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
+{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{10,13,896},{8,2,3},{8,3,1},{8,2,2},
+{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
+{8,3,4},{8,2,2},{8,7,11},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
+{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,8,14},{8,2,3},
+{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},
+{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,12},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
+{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
+{0,0,0},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},
+{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,10},{8,2,3},{8,3,1},{8,2,2},
+{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
+{8,3,4},{8,2,2},{8,8,13},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
+{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,9,15},{8,2,3},
+{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
+{8,4,5},{8,2,3},{8,3,4},{8,2,2},{10,13,640},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
+{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
+{8,7,11},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
+{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,12,49},{8,2,3},{8,3,1},{8,2,2},
+{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
+{8,3,4},{8,2,2},{8,7,12},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
+{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{11,12,2176},{8,2,3},
+{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},
+{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,10},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
+{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
+{8,12,45},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},
+{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,12,37},{8,2,3},{8,3,1},{8,2,2},
+{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
+{8,3,4},{8,2,2},{10,12,448},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
+{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,11},{8,2,3},
+{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
+{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,8,14},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
+{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
+{8,7,12},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
+{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{0,0,0},{8,2,3},{8,3,1},{8,2,2},
+{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
+{8,3,4},{8,2,2},{8,7,10},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
+{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,8,13},{8,2,3},
+{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},
+{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,12,29},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
+{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
+{10,13,1536},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},
+{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,11},{8,2,3},{8,3,1},{8,2,2},
+{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
+{8,3,4},{8,2,2},{8,12,41},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
+{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,12},{8,2,3},
+{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
+{8,4,5},{8,2,3},{8,3,4},{8,2,2},{11,12,2432},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
+{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
+{8,7,10},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
+{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,10,16},{8,2,3},{8,3,1},{8,2,2},
+{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
+{8,3,4},{8,2,2},{8,10,0},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
+{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{10,10,64},{8,2,3},
+{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},
+{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,11},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
+{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
+{8,8,14},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},
+{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,12},{8,2,3},{8,3,1},{8,2,2},
+{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
+{8,3,4},{8,2,2},{0,0,0},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
+{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,10},{8,2,3},
+{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
+{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,8,13},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
+{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
+{8,9,15},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
+{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,10,18},{8,2,3},{8,3,1},{8,2,2},
+{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
+{8,3,4},{8,2,2},{8,7,11},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
+{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,10,17},{8,2,3},
+{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},
+{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,12},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
+{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
+{11,12,2048},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},
+{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,10},{8,2,3},{8,3,1},{8,2,2},
+{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
+{8,3,4},{8,2,2},{8,12,51},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
+{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,12,35},{8,2,3},
+{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
+{8,4,5},{8,2,3},{8,3,4},{8,2,2},{10,12,320},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
+{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
+{8,7,11},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
+{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,8,14},{8,2,3},{8,3,1},{8,2,2},
+{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
+{8,3,4},{8,2,2},{8,7,12},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
+{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{0,0,0},{8,2,3},
+{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},
+{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,10},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
+{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
+{8,8,13},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},
+{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,12,27},{8,2,3},{8,3,1},{8,2,2},
+{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
+{8,3,4},{8,2,2},{8,12,59},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
+{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,11},{8,2,3},
+{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
+{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,12,33},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
+{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
+{8,7,12},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
+{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{11,11,1920},{8,2,3},{8,3,1},{8,2,2},
+{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
+{8,3,4},{8,2,2},{8,7,10},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
+{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{10,12,256},{8,2,3},
+{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},
+{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,12,43},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
+{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
+{10,13,1152},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},
+{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,11},{8,2,3},{8,3,1},{8,2,2},
+{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
+{8,3,4},{8,2,2},{8,8,14},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
+{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,12},{8,2,3},
+{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
+{8,4,5},{8,2,3},{8,3,4},{8,2,2},{0,0,0},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
+{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
+{8,7,10},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
+{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,8,13},{8,2,3},{8,3,1},{8,2,2},
+{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
+{8,3,4},{8,2,2},{8,9,15},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
+{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,12,55},{8,2,3},
+{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},
+{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,11},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
+{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
+{8,12,63},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},
+{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,12},{8,2,3},{8,3,1},{8,2,2},
+{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
+{8,3,4},{8,2,2},{11,12,2304},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
+{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,10},{8,2,3},
+{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
+{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,12,47},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
+{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
+{8,12,39},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
+{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,12,53},{8,2,3},{8,3,1},{8,2,2},
+{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
+{8,3,4},{8,2,2},{8,7,11},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
+{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,8,14},{8,2,3},
+{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},
+{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,12},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
+{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
+{0,0,0},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},
+{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,10},{8,2,3},{8,3,1},{8,2,2},
+{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
+{8,3,4},{8,2,2},{8,8,13},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
+{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,11,19},{8,2,3},
+{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
+{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,11,24},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
+{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
+{8,7,11},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
+{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,11,22},{8,2,3},{8,3,1},{8,2,2},
+{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
+{8,3,4},{8,2,2},{8,7,12},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
+{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{11,12,2560},{8,2,3},
+{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},
+{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,10},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
+{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
+{8,10,16},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},
+{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,10,0},{8,2,3},{8,3,1},{8,2,2},
+{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
+{8,3,4},{8,2,2},{10,10,64},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
+{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,11},{8,2,3},
+{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
+{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,8,14},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
+{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
+{8,7,12},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
+{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{12,11,0},{8,2,3},{8,3,1},{8,2,2},
+{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
+{8,3,4},{8,2,2},{8,7,10},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
+{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,8,13},{8,2,3},
+{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},
+{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,9,15},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
+{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
+{8,10,18},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},
+{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,11},{8,2,3},{8,3,1},{8,2,2},
+{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
+{8,3,4},{8,2,2},{8,10,17},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
+{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,12},{8,2,3},
+{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
+{8,4,5},{8,2,3},{8,3,4},{8,2,2},{11,11,1792},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
+{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
+{8,7,10},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
+{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,11,23},{8,2,3},{8,3,1},{8,2,2},
+{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
+{8,3,4},{8,2,2},{8,11,20},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
+{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,11,25},{8,2,3},
+{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},
+{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,11},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
+{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
+{8,8,14},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},
+{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,12},{8,2,3},{8,3,1},{8,2,2},
+{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
+{8,3,4},{8,2,2},{0,0,0},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
+{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,10},{8,2,3},
+{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
+{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,8,13},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
+{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
+{10,12,128},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
+{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,12,56},{8,2,3},{8,3,1},{8,2,2},
+{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
+{8,3,4},{8,2,2},{8,7,11},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
+{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,12,30},{8,2,3},
+{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},
+{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,12},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
+{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
+{11,11,1856},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},
+{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,10},{8,2,3},{8,3,1},{8,2,2},
+{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
+{8,3,4},{8,2,2},{8,12,57},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
+{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,11,21},{8,2,3},
+{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
+{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,12,54},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
+{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
+{8,7,11},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
+{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,8,14},{8,2,3},{8,3,1},{8,2,2},
+{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
+{8,3,4},{8,2,2},{8,7,12},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
+{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{0,0,0},{8,2,3},
+{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},
+{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,10},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
+{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
+{8,8,13},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},
+{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,9,15},{8,2,3},{8,3,1},{8,2,2},
+{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
+{8,3,4},{8,2,2},{8,12,52},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
+{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,11},{8,2,3},
+{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
+{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,12,48},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
+{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
+{8,7,12},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
+{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{11,12,2112},{8,2,3},{8,3,1},{8,2,2},
+{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
+{8,3,4},{8,2,2},{8,7,10},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
+{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,12,44},{8,2,3},
+{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},
+{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,12,36},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
+{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
+{10,12,384},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},
+{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,11},{8,2,3},{8,3,1},{8,2,2},
+{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
+{8,3,4},{8,2,2},{8,8,14},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
+{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,12},{8,2,3},
+{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
+{8,4,5},{8,2,3},{8,3,4},{8,2,2},{0,0,0},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
+{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
+{8,7,10},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
+{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,8,13},{8,2,3},{8,3,1},{8,2,2},
+{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
+{8,3,4},{8,2,2},{8,12,28},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
+{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,12,60},{8,2,3},
+{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},
+{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,11},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
+{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
+{8,12,40},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},
+{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,12},{8,2,3},{8,3,1},{8,2,2},
+{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
+{8,3,4},{8,2,2},{11,12,2368},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
+{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,10},{8,2,3},
+{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
+{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,10,16},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
+{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
+{8,10,0},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
+{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{10,10,64},{8,2,3},{8,3,1},{8,2,2},
+{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
+{8,3,4},{8,2,2},{8,7,11},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
+{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,8,14},{8,2,3},
+{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},
+{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,12},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
+{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
+{0,0,0},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},
+{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,10},{8,2,3},{8,3,1},{8,2,2},
+{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
+{8,3,4},{8,2,2},{8,8,13},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
+{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,9,15},{8,2,3},
+{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
+{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,10,18},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
+{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
+{8,7,11},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
+{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,10,17},{8,2,3},{8,3,1},{8,2,2},
+{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
+{8,3,4},{8,2,2},{8,7,12},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
+{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{11,12,1984},{8,2,3},
+{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},
+{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,10},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
+{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
+{8,12,50},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},
+{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,12,34},{8,2,3},{8,3,1},{8,2,2},
+{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
+{8,3,4},{8,2,2},{10,13,1728},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
+{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,11},{8,2,3},
+{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
+{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,8,14},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
+{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
+{8,7,12},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
+{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{0,0,0},{8,2,3},{8,3,1},{8,2,2},
+{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
+{8,3,4},{8,2,2},{8,7,10},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
+{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,8,13},{8,2,3},
+{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},
+{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,12,26},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
+{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
+{10,13,1472},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},
+{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,11},{8,2,3},{8,3,1},{8,2,2},
+{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
+{8,3,4},{8,2,2},{8,12,32},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
+{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,12},{8,2,3},
+{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
+{8,4,5},{8,2,3},{8,3,4},{8,2,2},{11,11,1920},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
+{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
+{8,7,10},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
+{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,12,61},{8,2,3},{8,3,1},{8,2,2},
+{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
+{8,3,4},{8,2,2},{8,12,42},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
+{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{10,13,1088},{8,2,3},
+{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},
+{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,11},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
+{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
+{8,8,14},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},
+{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,12},{8,2,3},{8,3,1},{8,2,2},
+{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
+{8,3,4},{8,2,2},{0,0,0},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
+{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,10},{8,2,3},
+{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
+{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,8,13},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
+{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
+{8,9,15},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
+{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{10,13,832},{8,2,3},{8,3,1},{8,2,2},
+{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
+{8,3,4},{8,2,2},{8,7,11},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
+{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,12,62},{8,2,3},
+{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},
+{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,12},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
+{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
+{11,12,2240},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},
+{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,10},{8,2,3},{8,3,1},{8,2,2},
+{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
+{8,3,4},{8,2,2},{8,12,46},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
+{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,12,38},{8,2,3},
+{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
+{8,4,5},{8,2,3},{8,3,4},{8,2,2},{10,13,576},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
+{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
+{8,7,11},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
+{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,8,14},{8,2,3},{8,3,1},{8,2,2},
+{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
+{8,3,4},{8,2,2},{8,7,12},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
+{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{0,0,0},{8,2,3},
+{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},
+{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,10},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
+{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
+{8,8,13},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},
+{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,11,19},{8,2,3},{8,3,1},{8,2,2},
+{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
+{8,3,4},{8,2,2},{8,11,24},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
+{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,11},{8,2,3},
+{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
+{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,11,22},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
+{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
+{8,7,12},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
+{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{11,12,2496},{8,2,3},{8,3,1},{8,2,2},
+{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
+{8,3,4},{8,2,2},{8,7,10},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
+{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,10,16},{8,2,3},
+{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},
+{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,10,0},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
+{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
+{10,10,64},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},
+{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,11},{8,2,3},{8,3,1},{8,2,2},
+{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
+{8,3,4},{8,2,2},{8,8,14},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
+{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,12},{8,2,3},
+{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
+{8,4,5},{8,2,3},{8,3,4},{8,2,2},{12,11,0},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
+{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
+{8,7,10},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
+{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,8,13},{8,2,3},{8,3,1},{8,2,2},
+{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
+{8,3,4},{8,2,2},{8,9,15},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
+{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,10,18},{8,2,3},
+{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},
+{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,11},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
+{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
+{8,10,17},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},
+{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,12},{8,2,3},{8,3,1},{8,2,2},
+{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
+{8,3,4},{8,2,2},{11,11,1792},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
+{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,10},{8,2,3},
+{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
+{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,11,23},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
+{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
+{8,11,20},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
+{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,11,25},{8,2,3},{8,3,1},{8,2,2},
+{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
+{8,3,4},{8,2,2},{8,7,11},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
+{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,8,14},{8,2,3},
+{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},
+{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,12},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
+{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
+{0,0,0},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},
+{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,10},{8,2,3},{8,3,1},{8,2,2},
+{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
+{8,3,4},{8,2,2},{8,8,13},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
+{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{10,12,192},{8,2,3},
+{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
+{8,4,5},{8,2,3},{8,3,4},{8,2,2},{10,13,1344},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
+{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
+{8,7,11},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
+{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,12,31},{8,2,3},{8,3,1},{8,2,2},
+{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
+{8,3,4},{8,2,2},{8,7,12},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
+{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{11,11,1856},{8,2,3},
+{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},
+{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,10},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
+{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
+{8,12,58},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},
+{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,11,21},{8,2,3},{8,3,1},{8,2,2},
+{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
+{8,3,4},{8,2,2},{10,13,960},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
+{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,11},{8,2,3},
+{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
+{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,8,14},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
+{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
+{8,7,12},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
+{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{0,0,0},{8,2,3},{8,3,1},{8,2,2},
+{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
+{8,3,4},{8,2,2},{8,7,10},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
+{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,8,13},{8,2,3},
+{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},
+{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,9,15},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
+{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
+{10,13,704},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},
+{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,11},{8,2,3},{8,3,1},{8,2,2},
+{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
+{8,3,4},{8,2,2},{8,12,49},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
+{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,12},{8,2,3},
+{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
+{8,4,5},{8,2,3},{8,3,4},{8,2,2},{11,12,2176},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
+{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
+{8,7,10},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
+{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,12,45},{8,2,3},{8,3,1},{8,2,2},
+{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
+{8,3,4},{8,2,2},{8,12,37},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
+{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{10,12,448},{8,2,3},
+{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},
+{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,11},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
+{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
+{8,8,14},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},
+{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,12},{8,2,3},{8,3,1},{8,2,2},
+{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
+{8,3,4},{8,2,2},{0,0,0},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
+{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,10},{8,2,3},
+{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
+{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,8,13},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
+{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
+{8,12,29},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
+{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{10,13,1600},{8,2,3},{8,3,1},{8,2,2},
+{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
+{8,3,4},{8,2,2},{8,7,11},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
+{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,12,41},{8,2,3},
+{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},
+{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,12},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
+{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
+{11,12,2432},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},
+{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,10},{8,2,3},{8,3,1},{8,2,2},
+{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
+{8,3,4},{8,2,2},{8,10,16},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
+{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,10,0},{8,2,3},
+{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
+{8,4,5},{8,2,3},{8,3,4},{8,2,2},{10,10,64},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
+{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
+{8,7,11},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
+{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,8,14},{8,2,3},{8,3,1},{8,2,2},
+{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
+{8,3,4},{8,2,2},{8,7,12},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
+{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{0,0,0},{8,2,3},
+{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},
+{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,10},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
+{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
+{8,8,13},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},
+{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,9,15},{8,2,3},{8,3,1},{8,2,2},
+{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
+{8,3,4},{8,2,2},{8,10,18},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
+{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,11},{8,2,3},
+{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
+{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,10,17},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
+{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
+{8,7,12},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
+{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{11,12,2048},{8,2,3},{8,3,1},{8,2,2},
+{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
+{8,3,4},{8,2,2},{8,7,10},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
+{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,12,51},{8,2,3},
+{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},
+{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,12,35},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
+{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
+{10,12,320},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},
+{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,11},{8,2,3},{8,3,1},{8,2,2},
+{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
+{8,3,4},{8,2,2},{8,8,14},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
+{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,12},{8,2,3},
+{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
+{8,4,5},{8,2,3},{8,3,4},{8,2,2},{0,0,0},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
+{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
+{8,7,10},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
+{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,8,13},{8,2,3},{8,3,1},{8,2,2},
+{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
+{8,3,4},{8,2,2},{8,12,27},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
+{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,12,59},{8,2,3},
+{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},
+{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,11},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
+{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
+{8,12,33},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},
+{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,12},{8,2,3},{8,3,1},{8,2,2},
+{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
+{8,3,4},{8,2,2},{11,11,1920},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
+{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,10},{8,2,3},
+{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
+{8,4,5},{8,2,3},{8,3,4},{8,2,2},{10,12,256},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
+{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
+{8,12,43},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
+{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{10,13,1216},{8,2,3},{8,3,1},{8,2,2},
+{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
+{8,3,4},{8,2,2},{8,7,11},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
+{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,8,14},{8,2,3},
+{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},
+{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,12},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
+{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
+{0,0,0},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},
+{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,10},{8,2,3},{8,3,1},{8,2,2},
+{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
+{8,3,4},{8,2,2},{8,8,13},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
+{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,9,15},{8,2,3},
+{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
+{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,12,55},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
+{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
+{8,7,11},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
+{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,12,63},{8,2,3},{8,3,1},{8,2,2},
+{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
+{8,3,4},{8,2,2},{8,7,12},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
+{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{11,12,2304},{8,2,3},
+{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},
+{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,10},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
+{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
+{8,12,47},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},
+{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,12,39},{8,2,3},{8,3,1},{8,2,2},
+{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
+{8,3,4},{8,2,2},{8,12,53},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
+{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,11},{8,2,3},
+{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
+{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,8,14},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
+{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
+{8,7,12},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
+{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{0,0,0},{8,2,3},{8,3,1},{8,2,2},
+{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
+{8,3,4},{8,2,2},{8,7,10},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
+{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,8,13},{8,2,3},
+{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},
+{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,11,19},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
+{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
+{8,11,24},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},
+{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,11},{8,2,3},{8,3,1},{8,2,2},
+{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
+{8,3,4},{8,2,2},{8,11,22},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
+{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,12},{8,2,3},
+{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
+{8,4,5},{8,2,3},{8,3,4},{8,2,2},{11,12,2560},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
+{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
+{8,7,10},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
+{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,10,16},{8,2,3},{8,3,1},{8,2,2},
+{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
+{8,3,4},{8,2,2},{8,10,0},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
+{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{10,10,64},{8,2,3},
+{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},
+{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,11},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
+{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
+{8,8,14},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},
+{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,12},{8,2,3},{8,3,1},{8,2,2},
+{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
+{8,3,4},{8,2,2}
+};
diff --git a/uppsrc/plugin/tif/lib/tif_flush.c b/uppsrc/plugin/tif/lib/tif_flush.c
new file mode 100644
index 000000000..1e7e44329
--- /dev/null
+++ b/uppsrc/plugin/tif/lib/tif_flush.c
@@ -0,0 +1,66 @@
+/* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/tif_flush.c,v 1.3 2000/09/15 20:52:42 warmerda Exp $ */
+
+/*
+ * Copyright (c) 1988-1997 Sam Leffler
+ * Copyright (c) 1991-1997 Silicon Graphics, Inc.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and
+ * its documentation for any purpose is hereby granted without fee, provided
+ * that (i) the above copyright notices and this permission notice appear in
+ * all copies of the software and related documentation, and (ii) the names of
+ * Sam Leffler and Silicon Graphics may not be used in any advertising or
+ * publicity relating to the software without the specific, prior written
+ * permission of Sam Leffler and Silicon Graphics.
+ *
+ * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+ * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
+ * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
+ * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+ * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
+ * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.
+ */
+
+/*
+ * TIFF Library.
+ */
+#include "tiffiop.h"
+
+int
+TIFFFlush(TIFF* tif)
+{
+
+	if (tif->tif_mode != O_RDONLY) {
+		if (!TIFFFlushData(tif))
+			return (0);
+		if ((tif->tif_flags & TIFF_DIRTYDIRECT) &&
+		    !TIFFWriteDirectory(tif))
+			return (0);
+	}
+	return (1);
+}
+
+/*
+ * Flush buffered data to the file.
+ *
+ * Frank Warmerdam'2000: I modified this to return 1 if TIFF_BEENWRITING
+ * is not set, so that TIFFFlush() will proceed to write out the directory.
+ * The documentation says returning 1 is an error indicator, but not having
+ * been writing isn't exactly a an error.  Hopefully this doesn't cause
+ * problems for other people.
+ */
+int
+TIFFFlushData(TIFF* tif)
+{
+	if ((tif->tif_flags & TIFF_BEENWRITING) == 0)
+		return (0);
+	if (tif->tif_flags & TIFF_POSTENCODE) {
+		tif->tif_flags &= ~TIFF_POSTENCODE;
+		if (!(*tif->tif_postencode)(tif))
+			return (0);
+	}
+	return (TIFFFlushData1(tif));
+}
diff --git a/uppsrc/plugin/tif/lib/tif_getimage.c b/uppsrc/plugin/tif/lib/tif_getimage.c
new file mode 100644
index 000000000..daab839a2
--- /dev/null
+++ b/uppsrc/plugin/tif/lib/tif_getimage.c
@@ -0,0 +1,2598 @@
+/* $Id: tif_getimage.c,v 1.49 2005/12/24 15:36:16 dron Exp $ */
+
+/*
+ * Copyright (c) 1991-1997 Sam Leffler
+ * Copyright (c) 1991-1997 Silicon Graphics, Inc.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and
+ * its documentation for any purpose is hereby granted without fee, provided
+ * that (i) the above copyright notices and this permission notice appear in
+ * all copies of the software and related documentation, and (ii) the names of
+ * Sam Leffler and Silicon Graphics may not be used in any advertising or
+ * publicity relating to the software without the specific, prior written
+ * permission of Sam Leffler and Silicon Graphics.
+ *
+ * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+ * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
+ * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
+ * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+ * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
+ * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.
+ */
+
+/*
+ * TIFF Library
+ *
+ * Read and return a packed RGBA image.
+ */
+#include "tiffiop.h"
+#include <stdio.h>
+
+static	int gtTileContig(TIFFRGBAImage*, uint32*, uint32, uint32);
+static	int gtTileSeparate(TIFFRGBAImage*, uint32*, uint32, uint32);
+static	int gtStripContig(TIFFRGBAImage*, uint32*, uint32, uint32);
+static	int gtStripSeparate(TIFFRGBAImage*, uint32*, uint32, uint32);
+static	int pickTileContigCase(TIFFRGBAImage*);
+static	int pickTileSeparateCase(TIFFRGBAImage*);
+
+static	const char photoTag[] = "PhotometricInterpretation";
+
+/*
+ * Helper constants used in Orientation tag handling
+ */
+#define FLIP_VERTICALLY 0x01
+#define FLIP_HORIZONTALLY 0x02
+
+/*
+ * Color conversion constants. We will define display types here.
+ */
+
+TIFFDisplay display_sRGB = {
+	{			/* XYZ -> luminance matrix */
+		{  3.2410F, -1.5374F, -0.4986F },
+		{  -0.9692F, 1.8760F, 0.0416F },
+		{  0.0556F, -0.2040F, 1.0570F }
+	},
+	100.0F, 100.0F, 100.0F,	/* Light o/p for reference white */
+	255, 255, 255,		/* Pixel values for ref. white */
+	1.0F, 1.0F, 1.0F,	/* Residual light o/p for black pixel */
+	2.4F, 2.4F, 2.4F,	/* Gamma values for the three guns */
+};
+
+/*
+ * Check the image to see if TIFFReadRGBAImage can deal with it.
+ * 1/0 is returned according to whether or not the image can
+ * be handled.  If 0 is returned, emsg contains the reason
+ * why it is being rejected.
+ */
+int
+TIFFRGBAImageOK(TIFF* tif, char emsg[1024])
+{
+    TIFFDirectory* td = &tif->tif_dir;
+    uint16 photometric;
+    int colorchannels;
+
+    if (!tif->tif_decodestatus) {
+	sprintf(emsg, "Sorry, requested compression method is not configured");
+	return (0);
+    }
+    switch (td->td_bitspersample) {
+    case 1: case 2: case 4:
+    case 8: case 16:
+	break;
+    default:
+	sprintf(emsg, "Sorry, can not handle images with %d-bit samples",
+	    td->td_bitspersample);
+	return (0);
+    }
+    colorchannels = td->td_samplesperpixel - td->td_extrasamples;
+    if (!TIFFGetField(tif, TIFFTAG_PHOTOMETRIC, &photometric)) {
+	switch (colorchannels) {
+	case 1:
+	    photometric = PHOTOMETRIC_MINISBLACK;
+	    break;
+	case 3:
+	    photometric = PHOTOMETRIC_RGB;
+	    break;
+	default:
+	    sprintf(emsg, "Missing needed %s tag", photoTag);
+	    return (0);
+	}
+    }
+    switch (photometric) {
+    case PHOTOMETRIC_MINISWHITE:
+    case PHOTOMETRIC_MINISBLACK:
+    case PHOTOMETRIC_PALETTE:
+	if (td->td_planarconfig == PLANARCONFIG_CONTIG
+            && td->td_samplesperpixel != 1
+            && td->td_bitspersample < 8 ) {
+	    sprintf(emsg,
+                    "Sorry, can not handle contiguous data with %s=%d, "
+                    "and %s=%d and Bits/Sample=%d",
+                    photoTag, photometric,
+                    "Samples/pixel", td->td_samplesperpixel,
+                    td->td_bitspersample);
+	    return (0);
+	}
+        /*
+        ** We should likely validate that any extra samples are either
+        ** to be ignored, or are alpha, and if alpha we should try to use
+        ** them.  But for now we won't bother with this.
+        */
+	break;
+    case PHOTOMETRIC_YCBCR:
+	if (td->td_planarconfig != PLANARCONFIG_CONTIG) {
+	    sprintf(emsg, "Sorry, can not handle YCbCr images with %s=%d",
+		"Planarconfiguration", td->td_planarconfig);
+	    return (0);
+	}
+	break;
+    case PHOTOMETRIC_RGB:
+	if (colorchannels < 3) {
+	    sprintf(emsg, "Sorry, can not handle RGB image with %s=%d",
+		"Color channels", colorchannels);
+	    return (0);
+	}
+	break;
+    case PHOTOMETRIC_SEPARATED:
+	{
+		uint16 inkset;
+		TIFFGetFieldDefaulted(tif, TIFFTAG_INKSET, &inkset);
+		if (inkset != INKSET_CMYK) {
+		    sprintf(emsg,
+			    "Sorry, can not handle separated image with %s=%d",
+			    "InkSet", inkset);
+		    return 0;
+		}
+		if (td->td_samplesperpixel < 4) {
+		    sprintf(emsg,
+			    "Sorry, can not handle separated image with %s=%d",
+			    "Samples/pixel", td->td_samplesperpixel);
+		    return 0;
+		}
+		break;
+	}
+    case PHOTOMETRIC_LOGL:
+	if (td->td_compression != COMPRESSION_SGILOG) {
+	    sprintf(emsg, "Sorry, LogL data must have %s=%d",
+		"Compression", COMPRESSION_SGILOG);
+	    return (0);
+	}
+	break;
+    case PHOTOMETRIC_LOGLUV:
+	if (td->td_compression != COMPRESSION_SGILOG &&
+		td->td_compression != COMPRESSION_SGILOG24) {
+	    sprintf(emsg, "Sorry, LogLuv data must have %s=%d or %d",
+		"Compression", COMPRESSION_SGILOG, COMPRESSION_SGILOG24);
+	    return (0);
+	}
+	if (td->td_planarconfig != PLANARCONFIG_CONTIG) {
+	    sprintf(emsg, "Sorry, can not handle LogLuv images with %s=%d",
+		"Planarconfiguration", td->td_planarconfig);
+	    return (0);
+	}
+	break;
+    case PHOTOMETRIC_CIELAB:
+	break;
+    default:
+	sprintf(emsg, "Sorry, can not handle image with %s=%d",
+	    photoTag, photometric);
+	return (0);
+    }
+    return (1);
+}
+
+void
+TIFFRGBAImageEnd(TIFFRGBAImage* img)
+{
+	if (img->Map)
+		_TIFFfree(img->Map), img->Map = NULL;
+	if (img->BWmap)
+		_TIFFfree(img->BWmap), img->BWmap = NULL;
+	if (img->PALmap)
+		_TIFFfree(img->PALmap), img->PALmap = NULL;
+	if (img->ycbcr)
+		_TIFFfree(img->ycbcr), img->ycbcr = NULL;
+	if (img->cielab)
+		_TIFFfree(img->cielab), img->cielab = NULL;
+
+	if( img->redcmap ) {
+		_TIFFfree( img->redcmap );
+		_TIFFfree( img->greencmap );
+		_TIFFfree( img->bluecmap );
+	}
+}
+
+static int
+isCCITTCompression(TIFF* tif)
+{
+    uint16 compress;
+    TIFFGetField(tif, TIFFTAG_COMPRESSION, &compress);
+    return (compress == COMPRESSION_CCITTFAX3 ||
+	    compress == COMPRESSION_CCITTFAX4 ||
+	    compress == COMPRESSION_CCITTRLE ||
+	    compress == COMPRESSION_CCITTRLEW);
+}
+
+int
+TIFFRGBAImageBegin(TIFFRGBAImage* img, TIFF* tif, int stop, char emsg[1024])
+{
+    uint16* sampleinfo;
+    uint16 extrasamples;
+    uint16 planarconfig;
+    uint16 compress;
+    int colorchannels;
+    uint16 *red_orig, *green_orig, *blue_orig;
+    int n_color;
+
+    /* Initialize to normal values */
+    img->row_offset = 0;
+    img->col_offset = 0;
+    img->redcmap = NULL;
+    img->greencmap = NULL;
+    img->bluecmap = NULL;
+    img->req_orientation = ORIENTATION_BOTLEFT;	    /* It is the default */
+
+    img->tif = tif;
+    img->stoponerr = stop;
+    TIFFGetFieldDefaulted(tif, TIFFTAG_BITSPERSAMPLE, &img->bitspersample);
+    switch (img->bitspersample) {
+    case 1: case 2: case 4:
+    case 8: case 16:
+	break;
+    default:
+	sprintf(emsg, "Sorry, can not handle images with %d-bit samples",
+	    img->bitspersample);
+	return (0);
+    }
+    img->alpha = 0;
+    TIFFGetFieldDefaulted(tif, TIFFTAG_SAMPLESPERPIXEL, &img->samplesperpixel);
+    TIFFGetFieldDefaulted(tif, TIFFTAG_EXTRASAMPLES,
+	&extrasamples, &sampleinfo);
+    if (extrasamples >= 1)
+    {
+	switch (sampleinfo[0]) {
+	case EXTRASAMPLE_UNSPECIFIED:	/* Workaround for some images without */
+		if (img->samplesperpixel > 3)	/* correct info about alpha channel */
+			img->alpha = EXTRASAMPLE_ASSOCALPHA;
+		break;
+	case EXTRASAMPLE_ASSOCALPHA:	/* data is pre-multiplied */
+	case EXTRASAMPLE_UNASSALPHA:	/* data is not pre-multiplied */
+		img->alpha = sampleinfo[0];
+		break;
+	}
+    }
+
+#ifdef DEFAULT_EXTRASAMPLE_AS_ALPHA
+    if( !TIFFGetField(tif, TIFFTAG_PHOTOMETRIC, &img->photometric))
+        img->photometric = PHOTOMETRIC_MINISWHITE;
+
+    if( extrasamples == 0
+        && img->samplesperpixel == 4
+        && img->photometric == PHOTOMETRIC_RGB )
+    {
+        img->alpha = EXTRASAMPLE_ASSOCALPHA;
+        extrasamples = 1;
+    }
+#endif
+
+    colorchannels = img->samplesperpixel - extrasamples;
+    TIFFGetFieldDefaulted(tif, TIFFTAG_COMPRESSION, &compress);
+    TIFFGetFieldDefaulted(tif, TIFFTAG_PLANARCONFIG, &planarconfig);
+    if (!TIFFGetField(tif, TIFFTAG_PHOTOMETRIC, &img->photometric)) {
+	switch (colorchannels) {
+	case 1:
+	    if (isCCITTCompression(tif))
+		img->photometric = PHOTOMETRIC_MINISWHITE;
+	    else
+		img->photometric = PHOTOMETRIC_MINISBLACK;
+	    break;
+	case 3:
+	    img->photometric = PHOTOMETRIC_RGB;
+	    break;
+	default:
+	    sprintf(emsg, "Missing needed %s tag", photoTag);
+	    return (0);
+	}
+    }
+    switch (img->photometric) {
+    case PHOTOMETRIC_PALETTE:
+	if (!TIFFGetField(tif, TIFFTAG_COLORMAP,
+	    &red_orig, &green_orig, &blue_orig)) {
+	    sprintf(emsg, "Missing required \"Colormap\" tag");
+	    return (0);
+	}
+
+        /* copy the colormaps so we can modify them */
+        n_color = (1L << img->bitspersample);
+        img->redcmap = (uint16 *) _TIFFmalloc(sizeof(uint16)*n_color);
+        img->greencmap = (uint16 *) _TIFFmalloc(sizeof(uint16)*n_color);
+        img->bluecmap = (uint16 *) _TIFFmalloc(sizeof(uint16)*n_color);
+        if( !img->redcmap || !img->greencmap || !img->bluecmap ) {
+	    sprintf(emsg, "Out of memory for colormap copy");
+	    return (0);
+        }
+
+        _TIFFmemcpy( img->redcmap, red_orig, n_color * 2 );
+        _TIFFmemcpy( img->greencmap, green_orig, n_color * 2 );
+        _TIFFmemcpy( img->bluecmap, blue_orig, n_color * 2 );
+
+	/* fall thru... */
+    case PHOTOMETRIC_MINISWHITE:
+    case PHOTOMETRIC_MINISBLACK:
+	if (planarconfig == PLANARCONFIG_CONTIG
+            && img->samplesperpixel != 1
+            && img->bitspersample < 8 ) {
+	    sprintf(emsg,
+                    "Sorry, can not handle contiguous data with %s=%d, "
+                    "and %s=%d and Bits/Sample=%d",
+                    photoTag, img->photometric,
+                    "Samples/pixel", img->samplesperpixel,
+                    img->bitspersample);
+	    return (0);
+	}
+	break;
+    case PHOTOMETRIC_YCBCR:
+	if (planarconfig != PLANARCONFIG_CONTIG) {
+	    sprintf(emsg, "Sorry, can not handle YCbCr images with %s=%d",
+		"Planarconfiguration", planarconfig);
+	    return (0);
+	}
+	/* It would probably be nice to have a reality check here. */
+	if (planarconfig == PLANARCONFIG_CONTIG)
+	    /* can rely on libjpeg to convert to RGB */
+	    /* XXX should restore current state on exit */
+	    switch (compress) {
+		case COMPRESSION_OJPEG:
+		case COMPRESSION_JPEG:
+		    TIFFSetField(tif, TIFFTAG_JPEGCOLORMODE, JPEGCOLORMODE_RGB);
+		    img->photometric = PHOTOMETRIC_RGB;
+                    break;
+
+                default:
+                    /* do nothing */;
+                    break;
+	    }
+	break;
+    case PHOTOMETRIC_RGB:
+	if (colorchannels < 3) {
+	    sprintf(emsg, "Sorry, can not handle RGB image with %s=%d",
+		"Color channels", colorchannels);
+	    return (0);
+	}
+	break;
+    case PHOTOMETRIC_SEPARATED: {
+	uint16 inkset;
+	TIFFGetFieldDefaulted(tif, TIFFTAG_INKSET, &inkset);
+	if (inkset != INKSET_CMYK) {
+	    sprintf(emsg, "Sorry, can not handle separated image with %s=%d",
+		"InkSet", inkset);
+	    return (0);
+	}
+	if (img->samplesperpixel < 4) {
+	    sprintf(emsg, "Sorry, can not handle separated image with %s=%d",
+		"Samples/pixel", img->samplesperpixel);
+	    return (0);
+	}
+	break;
+    }
+    case PHOTOMETRIC_LOGL:
+	if (compress != COMPRESSION_SGILOG) {
+	    sprintf(emsg, "Sorry, LogL data must have %s=%d",
+		"Compression", COMPRESSION_SGILOG);
+	    return (0);
+	}
+	TIFFSetField(tif, TIFFTAG_SGILOGDATAFMT, SGILOGDATAFMT_8BIT);
+	img->photometric = PHOTOMETRIC_MINISBLACK;	/* little white lie */
+	img->bitspersample = 8;
+	break;
+    case PHOTOMETRIC_LOGLUV:
+	if (compress != COMPRESSION_SGILOG && compress != COMPRESSION_SGILOG24) {
+	    sprintf(emsg, "Sorry, LogLuv data must have %s=%d or %d",
+		"Compression", COMPRESSION_SGILOG, COMPRESSION_SGILOG24);
+	    return (0);
+	}
+	if (planarconfig != PLANARCONFIG_CONTIG) {
+	    sprintf(emsg, "Sorry, can not handle LogLuv images with %s=%d",
+		"Planarconfiguration", planarconfig);
+	    return (0);
+	}
+	TIFFSetField(tif, TIFFTAG_SGILOGDATAFMT, SGILOGDATAFMT_8BIT);
+	img->photometric = PHOTOMETRIC_RGB;		/* little white lie */
+	img->bitspersample = 8;
+	break;
+    case PHOTOMETRIC_CIELAB:
+	break;
+    default:
+	sprintf(emsg, "Sorry, can not handle image with %s=%d",
+	    photoTag, img->photometric);
+	return (0);
+    }
+    img->Map = NULL;
+    img->BWmap = NULL;
+    img->PALmap = NULL;
+    img->ycbcr = NULL;
+    img->cielab = NULL;
+    TIFFGetField(tif, TIFFTAG_IMAGEWIDTH, &img->width);
+    TIFFGetField(tif, TIFFTAG_IMAGELENGTH, &img->height);
+    TIFFGetFieldDefaulted(tif, TIFFTAG_ORIENTATION, &img->orientation);
+    img->isContig =
+	!(planarconfig == PLANARCONFIG_SEPARATE && colorchannels > 1);
+    if (img->isContig) {
+	img->get = TIFFIsTiled(tif) ? gtTileContig : gtStripContig;
+	if (!pickTileContigCase(img)) {
+		sprintf(emsg, "Sorry, can not handle image");
+		return 0;
+	}
+    } else {
+	img->get = TIFFIsTiled(tif) ? gtTileSeparate : gtStripSeparate;
+	if (!pickTileSeparateCase(img)) {
+		sprintf(emsg, "Sorry, can not handle image");
+		return 0;
+	}
+    }
+    return 1;
+}
+
+int
+TIFFRGBAImageGet(TIFFRGBAImage* img, uint32* raster, uint32 w, uint32 h)
+{
+    if (img->get == NULL) {
+		TIFFErrorExt(img->tif->tif_clientdata, TIFFFileName(img->tif), "No \"get\" routine setup");
+		return (0);
+	}
+	if (img->put.any == NULL) {
+		TIFFErrorExt(img->tif->tif_clientdata, TIFFFileName(img->tif),
+		"No \"put\" routine setupl; probably can not handle image format");
+		return (0);
+    }
+    return (*img->get)(img, raster, w, h);
+}
+
+/*
+ * Read the specified image into an ABGR-format rastertaking in account
+ * specified orientation.
+ */
+int
+TIFFReadRGBAImageOriented(TIFF* tif,
+			  uint32 rwidth, uint32 rheight, uint32* raster,
+			  int orientation, int stop)
+{
+    char emsg[1024] = "";
+    TIFFRGBAImage img;
+    int ok;
+
+	if (TIFFRGBAImageOK(tif, emsg) && TIFFRGBAImageBegin(&img, tif, stop, emsg)) {
+		img.req_orientation = orientation;
+		/* XXX verify rwidth and rheight against width and height */
+		ok = TIFFRGBAImageGet(&img, raster+(rheight-img.height)*rwidth,
+			rwidth, img.height);
+		TIFFRGBAImageEnd(&img);
+	} else {
+		TIFFErrorExt(tif->tif_clientdata, TIFFFileName(tif), emsg);
+		ok = 0;
+    }
+    return (ok);
+}
+
+/*
+ * Read the specified image into an ABGR-format raster. Use bottom left
+ * origin for raster by default.
+ */
+int
+TIFFReadRGBAImage(TIFF* tif,
+		  uint32 rwidth, uint32 rheight, uint32* raster, int stop)
+{
+	return TIFFReadRGBAImageOriented(tif, rwidth, rheight, raster,
+					 ORIENTATION_BOTLEFT, stop);
+}
+
+static int
+setorientation(TIFFRGBAImage* img)
+{
+	switch (img->orientation) {
+		case ORIENTATION_TOPLEFT:
+		case ORIENTATION_LEFTTOP:
+			if (img->req_orientation == ORIENTATION_TOPRIGHT ||
+			    img->req_orientation == ORIENTATION_RIGHTTOP)
+				return FLIP_HORIZONTALLY;
+			else if (img->req_orientation == ORIENTATION_BOTRIGHT ||
+			    img->req_orientation == ORIENTATION_RIGHTBOT)
+				return FLIP_HORIZONTALLY | FLIP_VERTICALLY;
+			else if (img->req_orientation == ORIENTATION_BOTLEFT ||
+			    img->req_orientation == ORIENTATION_LEFTBOT)
+				return FLIP_VERTICALLY;
+			else
+				return 0;
+		case ORIENTATION_TOPRIGHT:
+		case ORIENTATION_RIGHTTOP:
+			if (img->req_orientation == ORIENTATION_TOPLEFT ||
+			    img->req_orientation == ORIENTATION_LEFTTOP)
+				return FLIP_HORIZONTALLY;
+			else if (img->req_orientation == ORIENTATION_BOTRIGHT ||
+			    img->req_orientation == ORIENTATION_RIGHTBOT)
+				return FLIP_VERTICALLY;
+			else if (img->req_orientation == ORIENTATION_BOTLEFT ||
+			    img->req_orientation == ORIENTATION_LEFTBOT)
+				return FLIP_HORIZONTALLY | FLIP_VERTICALLY;
+			else
+				return 0;
+		case ORIENTATION_BOTRIGHT:
+		case ORIENTATION_RIGHTBOT:
+			if (img->req_orientation == ORIENTATION_TOPLEFT ||
+			    img->req_orientation == ORIENTATION_LEFTTOP)
+				return FLIP_HORIZONTALLY | FLIP_VERTICALLY;
+			else if (img->req_orientation == ORIENTATION_TOPRIGHT ||
+			    img->req_orientation == ORIENTATION_RIGHTTOP)
+				return FLIP_VERTICALLY;
+			else if (img->req_orientation == ORIENTATION_BOTLEFT ||
+			    img->req_orientation == ORIENTATION_LEFTBOT)
+				return FLIP_HORIZONTALLY;
+			else
+				return 0;
+		case ORIENTATION_BOTLEFT:
+		case ORIENTATION_LEFTBOT:
+			if (img->req_orientation == ORIENTATION_TOPLEFT ||
+			    img->req_orientation == ORIENTATION_LEFTTOP)
+				return FLIP_VERTICALLY;
+			else if (img->req_orientation == ORIENTATION_TOPRIGHT ||
+			    img->req_orientation == ORIENTATION_RIGHTTOP)
+				return FLIP_HORIZONTALLY | FLIP_VERTICALLY;
+			else if (img->req_orientation == ORIENTATION_BOTRIGHT ||
+			    img->req_orientation == ORIENTATION_RIGHTBOT)
+				return FLIP_HORIZONTALLY;
+			else
+				return 0;
+		default:	/* NOTREACHED */
+			return 0;
+	}
+}
+
+/*
+ * Get an tile-organized image that has
+ *	PlanarConfiguration contiguous if SamplesPerPixel > 1
+ * or
+ *	SamplesPerPixel == 1
+ */
+static int
+gtTileContig(TIFFRGBAImage* img, uint32* raster, uint32 w, uint32 h)
+{
+    TIFF* tif = img->tif;
+    tileContigRoutine put = img->put.contig;
+    uint32 col, row, y, rowstoread;
+    uint32 pos;
+    uint32 tw, th;
+    unsigned char* buf;
+    int32 fromskew, toskew;
+    uint32 nrow;
+    int ret = 1, flip;
+
+    buf = (unsigned char*) _TIFFmalloc(TIFFTileSize(tif));
+    if (buf == 0) {
+		TIFFErrorExt(tif->tif_clientdata, TIFFFileName(tif), "No space for tile buffer");
+		return (0);
+    }
+    _TIFFmemset(buf, 0, TIFFTileSize(tif));
+    TIFFGetField(tif, TIFFTAG_TILEWIDTH, &tw);
+    TIFFGetField(tif, TIFFTAG_TILELENGTH, &th);
+
+    flip = setorientation(img);
+    if (flip & FLIP_VERTICALLY) {
+	    y = h - 1;
+	    toskew = -(int32)(tw + w);
+    }
+    else {
+	    y = 0;
+	    toskew = -(int32)(tw - w);
+    }
+
+    for (row = 0; row < h; row += nrow)
+    {
+        rowstoread = th - (row + img->row_offset) % th;
+    	nrow = (row + rowstoread > h ? h - row : rowstoread);
+	for (col = 0; col < w; col += tw)
+        {
+            if (TIFFReadTile(tif, buf, col+img->col_offset,
+                             row+img->row_offset, 0, 0) < 0 && img->stoponerr)
+            {
+                ret = 0;
+                break;
+            }
+
+            pos = ((row+img->row_offset) % th) * TIFFTileRowSize(tif);
+
+    	    if (col + tw > w)
+            {
+                /*
+                 * Tile is clipped horizontally.  Calculate
+                 * visible portion and skewing factors.
+                 */
+                uint32 npix = w - col;
+                fromskew = tw - npix;
+                (*put)(img, raster+y*w+col, col, y,
+                       npix, nrow, fromskew, toskew + fromskew, buf + pos);
+            }
+            else
+            {
+                (*put)(img, raster+y*w+col, col, y, tw, nrow, 0, toskew, buf + pos);
+            }
+        }
+
+        y += (flip & FLIP_VERTICALLY ? -(int32) nrow : (int32) nrow);
+    }
+    _TIFFfree(buf);
+
+    if (flip & FLIP_HORIZONTALLY) {
+	    uint32 line;
+
+	    for (line = 0; line < h; line++) {
+		    uint32 *left = raster + (line * w);
+		    uint32 *right = left + w - 1;
+
+		    while ( left < right ) {
+			    uint32 temp = *left;
+			    *left = *right;
+			    *right = temp;
+			    left++, right--;
+		    }
+	    }
+    }
+
+    return (ret);
+}
+
+/*
+ * Get an tile-organized image that has
+ *	 SamplesPerPixel > 1
+ *	 PlanarConfiguration separated
+ * We assume that all such images are RGB.
+ */
+static int
+gtTileSeparate(TIFFRGBAImage* img, uint32* raster, uint32 w, uint32 h)
+{
+    TIFF* tif = img->tif;
+    tileSeparateRoutine put = img->put.separate;
+    uint32 col, row, y, rowstoread;
+    uint32 pos;
+    uint32 tw, th;
+    unsigned char* buf;
+    unsigned char* r;
+    unsigned char* g;
+    unsigned char* b;
+    unsigned char* a;
+    tsize_t tilesize;
+    int32 fromskew, toskew;
+    int alpha = img->alpha;
+    uint32 nrow;
+    int ret = 1, flip;
+
+    tilesize = TIFFTileSize(tif);
+    buf = (unsigned char*) _TIFFmalloc(4*tilesize);
+    if (buf == 0) {
+		TIFFErrorExt(tif->tif_clientdata, TIFFFileName(tif), "No space for tile buffer");
+		return (0);
+    }
+    _TIFFmemset(buf, 0, 4*tilesize);
+    r = buf;
+    g = r + tilesize;
+    b = g + tilesize;
+    a = b + tilesize;
+    if (!alpha)
+	_TIFFmemset(a, 0xff, tilesize);
+    TIFFGetField(tif, TIFFTAG_TILEWIDTH, &tw);
+    TIFFGetField(tif, TIFFTAG_TILELENGTH, &th);
+
+    flip = setorientation(img);
+    if (flip & FLIP_VERTICALLY) {
+	    y = h - 1;
+	    toskew = -(int32)(tw + w);
+    }
+    else {
+	    y = 0;
+	    toskew = -(int32)(tw - w);
+    }
+
+    for (row = 0; row < h; row += nrow)
+    {
+        rowstoread = th - (row + img->row_offset) % th;
+    	nrow = (row + rowstoread > h ? h - row : rowstoread);
+        for (col = 0; col < w; col += tw)
+        {
+            if (TIFFReadTile(tif, r, col+img->col_offset,
+                             row+img->row_offset,0,0) < 0 && img->stoponerr)
+            {
+                ret = 0;
+                break;
+            }
+            if (TIFFReadTile(tif, g, col+img->col_offset,
+                             row+img->row_offset,0,1) < 0 && img->stoponerr)
+            {
+                ret = 0;
+                break;
+            }
+            if (TIFFReadTile(tif, b, col+img->col_offset,
+                             row+img->row_offset,0,2) < 0 && img->stoponerr)
+            {
+                ret = 0;
+                break;
+            }
+            if (alpha && TIFFReadTile(tif,a,col+img->col_offset,
+                                      row+img->row_offset,0,3) < 0 && img->stoponerr)
+            {
+                ret = 0;
+                break;
+            }
+
+            pos = ((row+img->row_offset) % th) * TIFFTileRowSize(tif);
+
+            if (col + tw > w)
+            {
+                /*
+                 * Tile is clipped horizontally.  Calculate
+                 * visible portion and skewing factors.
+                 */
+                uint32 npix = w - col;
+                fromskew = tw - npix;
+                (*put)(img, raster+y*w+col, col, y,
+                       npix, nrow, fromskew, toskew + fromskew,
+                       r + pos, g + pos, b + pos, a + pos);
+            } else {
+                (*put)(img, raster+y*w+col, col, y,
+                       tw, nrow, 0, toskew, r + pos, g + pos, b + pos, a + pos);
+            }
+        }
+
+        y += (flip & FLIP_VERTICALLY ?-(int32) nrow : (int32) nrow);
+    }
+
+    if (flip & FLIP_HORIZONTALLY) {
+	    uint32 line;
+
+	    for (line = 0; line < h; line++) {
+		    uint32 *left = raster + (line * w);
+		    uint32 *right = left + w - 1;
+
+		    while ( left < right ) {
+			    uint32 temp = *left;
+			    *left = *right;
+			    *right = temp;
+			    left++, right--;
+		    }
+	    }
+    }
+
+    _TIFFfree(buf);
+    return (ret);
+}
+
+/*
+ * Get a strip-organized image that has
+ *	PlanarConfiguration contiguous if SamplesPerPixel > 1
+ * or
+ *	SamplesPerPixel == 1
+ */
+static int
+gtStripContig(TIFFRGBAImage* img, uint32* raster, uint32 w, uint32 h)
+{
+    TIFF* tif = img->tif;
+    tileContigRoutine put = img->put.contig;
+    uint32 row, y, nrow, rowstoread;
+    uint32 pos;
+    unsigned char* buf;
+    uint32 rowsperstrip;
+    uint32 imagewidth = img->width;
+    tsize_t scanline;
+    int32 fromskew, toskew;
+    int ret = 1, flip;
+
+    buf = (unsigned char*) _TIFFmalloc(TIFFStripSize(tif));
+    if (buf == 0) {
+		TIFFErrorExt(tif->tif_clientdata, TIFFFileName(tif), "No space for strip buffer");
+		return (0);
+    }
+    _TIFFmemset(buf, 0, TIFFStripSize(tif));
+
+    flip = setorientation(img);
+    if (flip & FLIP_VERTICALLY) {
+	    y = h - 1;
+	    toskew = -(int32)(w + w);
+    } else {
+	    y = 0;
+	    toskew = -(int32)(w - w);
+    }
+
+    TIFFGetFieldDefaulted(tif, TIFFTAG_ROWSPERSTRIP, &rowsperstrip);
+    scanline = TIFFScanlineSize(tif);
+    fromskew = (w < imagewidth ? imagewidth - w : 0);
+    for (row = 0; row < h; row += nrow)
+    {
+        rowstoread = rowsperstrip - (row + img->row_offset) % rowsperstrip;
+        nrow = (row + rowstoread > h ? h - row : rowstoread);
+        if (TIFFReadEncodedStrip(tif,
+                                 TIFFComputeStrip(tif,row+img->row_offset, 0),
+                                 buf,
+                                 ((row + img->row_offset)%rowsperstrip + nrow) * scanline) < 0
+            && img->stoponerr)
+        {
+            ret = 0;
+            break;
+        }
+
+        pos = ((row + img->row_offset) % rowsperstrip) * scanline;
+        (*put)(img, raster+y*w, 0, y, w, nrow, fromskew, toskew, buf + pos);
+        y += (flip & FLIP_VERTICALLY ? -(int32) nrow : (int32) nrow);
+    }
+
+    if (flip & FLIP_HORIZONTALLY) {
+	    uint32 line;
+
+	    for (line = 0; line < h; line++) {
+		    uint32 *left = raster + (line * w);
+		    uint32 *right = left + w - 1;
+
+		    while ( left < right ) {
+			    uint32 temp = *left;
+			    *left = *right;
+			    *right = temp;
+			    left++, right--;
+		    }
+	    }
+    }
+
+    _TIFFfree(buf);
+    return (ret);
+}
+
+/*
+ * Get a strip-organized image with
+ *	 SamplesPerPixel > 1
+ *	 PlanarConfiguration separated
+ * We assume that all such images are RGB.
+ */
+static int
+gtStripSeparate(TIFFRGBAImage* img, uint32* raster, uint32 w, uint32 h)
+{
+    TIFF* tif = img->tif;
+    tileSeparateRoutine put = img->put.separate;
+    unsigned char *buf;
+    unsigned char *r, *g, *b, *a;
+    uint32 row, y, nrow, rowstoread;
+    uint32 pos;
+    tsize_t scanline;
+    uint32 rowsperstrip, offset_row;
+    uint32 imagewidth = img->width;
+    tsize_t stripsize;
+    int32 fromskew, toskew;
+    int alpha = img->alpha;
+    int	ret = 1, flip;
+
+    stripsize = TIFFStripSize(tif);
+    r = buf = (unsigned char *)_TIFFmalloc(4*stripsize);
+    if (buf == 0) {
+		TIFFErrorExt(tif->tif_clientdata, TIFFFileName(tif), "No space for tile buffer");
+		return (0);
+    }
+    _TIFFmemset(buf, 0, 4*stripsize);
+    g = r + stripsize;
+    b = g + stripsize;
+    a = b + stripsize;
+    if (!alpha)
+	_TIFFmemset(a, 0xff, stripsize);
+
+    flip = setorientation(img);
+    if (flip & FLIP_VERTICALLY) {
+	    y = h - 1;
+	    toskew = -(int32)(w + w);
+    }
+    else {
+	    y = 0;
+	    toskew = -(int32)(w - w);
+    }
+
+    TIFFGetFieldDefaulted(tif, TIFFTAG_ROWSPERSTRIP, &rowsperstrip);
+    scanline = TIFFScanlineSize(tif);
+    fromskew = (w < imagewidth ? imagewidth - w : 0);
+    for (row = 0; row < h; row += nrow)
+    {
+        rowstoread = rowsperstrip - (row + img->row_offset) % rowsperstrip;
+        nrow = (row + rowstoread > h ? h - row : rowstoread);
+        offset_row = row + img->row_offset;
+    	if (TIFFReadEncodedStrip(tif, TIFFComputeStrip(tif, offset_row, 0),
+                                 r, ((row + img->row_offset)%rowsperstrip + nrow) * scanline) < 0
+            && img->stoponerr)
+        {
+            ret = 0;
+            break;
+        }
+        if (TIFFReadEncodedStrip(tif, TIFFComputeStrip(tif, offset_row, 1),
+                                 g, ((row + img->row_offset)%rowsperstrip + nrow) * scanline) < 0
+            && img->stoponerr)
+        {
+            ret = 0;
+            break;
+        }
+        if (TIFFReadEncodedStrip(tif, TIFFComputeStrip(tif, offset_row, 2),
+                                 b, ((row + img->row_offset)%rowsperstrip + nrow) * scanline) < 0
+            && img->stoponerr)
+        {
+            ret = 0;
+            break;
+        }
+        if (alpha &&
+            (TIFFReadEncodedStrip(tif, TIFFComputeStrip(tif, offset_row, 3),
+                                  a, ((row + img->row_offset)%rowsperstrip + nrow) * scanline) < 0
+             && img->stoponerr))
+        {
+            ret = 0;
+            break;
+        }
+
+        pos = ((row + img->row_offset) % rowsperstrip) * scanline;
+        (*put)(img, raster+y*w, 0, y, w, nrow, fromskew, toskew, r + pos, g + pos,
+               b + pos, a + pos);
+        y += (flip & FLIP_VERTICALLY ? -(int32) nrow : (int32) nrow);
+    }
+
+    if (flip & FLIP_HORIZONTALLY) {
+	    uint32 line;
+
+	    for (line = 0; line < h; line++) {
+		    uint32 *left = raster + (line * w);
+		    uint32 *right = left + w - 1;
+
+		    while ( left < right ) {
+			    uint32 temp = *left;
+			    *left = *right;
+			    *right = temp;
+			    left++, right--;
+		    }
+	    }
+    }
+
+    _TIFFfree(buf);
+    return (ret);
+}
+
+/*
+ * The following routines move decoded data returned
+ * from the TIFF library into rasters filled with packed
+ * ABGR pixels (i.e. suitable for passing to lrecwrite.)
+ *
+ * The routines have been created according to the most
+ * important cases and optimized.  pickTileContigCase and
+ * pickTileSeparateCase analyze the parameters and select
+ * the appropriate "put" routine to use.
+ */
+#define	REPEAT8(op)	REPEAT4(op); REPEAT4(op)
+#define	REPEAT4(op)	REPEAT2(op); REPEAT2(op)
+#define	REPEAT2(op)	op; op
+#define	CASE8(x,op)			\
+    switch (x) {			\
+    case 7: op; case 6: op; case 5: op;	\
+    case 4: op; case 3: op; case 2: op;	\
+    case 1: op;				\
+    }
+#define	CASE4(x,op)	switch (x) { case 3: op; case 2: op; case 1: op; }
+#define	NOP
+
+#define	UNROLL8(w, op1, op2) {		\
+    uint32 _x;				\
+    for (_x = w; _x >= 8; _x -= 8) {	\
+	op1;				\
+	REPEAT8(op2);			\
+    }					\
+    if (_x > 0) {			\
+	op1;				\
+	CASE8(_x,op2);			\
+    }					\
+}
+#define	UNROLL4(w, op1, op2) {		\
+    uint32 _x;				\
+    for (_x = w; _x >= 4; _x -= 4) {	\
+	op1;				\
+	REPEAT4(op2);			\
+    }					\
+    if (_x > 0) {			\
+	op1;				\
+	CASE4(_x,op2);			\
+    }					\
+}
+#define	UNROLL2(w, op1, op2) {		\
+    uint32 _x;				\
+    for (_x = w; _x >= 2; _x -= 2) {	\
+	op1;				\
+	REPEAT2(op2);			\
+    }					\
+    if (_x) {				\
+	op1;				\
+	op2;				\
+    }					\
+}
+
+#define	SKEW(r,g,b,skew)	{ r += skew; g += skew; b += skew; }
+#define	SKEW4(r,g,b,a,skew)	{ r += skew; g += skew; b += skew; a+= skew; }
+
+#define A1 (((uint32)0xffL)<<24)
+#define	PACK(r,g,b)	\
+	((uint32)(r)|((uint32)(g)<<8)|((uint32)(b)<<16)|A1)
+#define	PACK4(r,g,b,a)	\
+	((uint32)(r)|((uint32)(g)<<8)|((uint32)(b)<<16)|((uint32)(a)<<24))
+#define W2B(v) (((v)>>8)&0xff)
+#define	PACKW(r,g,b)	\
+	((uint32)W2B(r)|((uint32)W2B(g)<<8)|((uint32)W2B(b)<<16)|A1)
+#define	PACKW4(r,g,b,a)	\
+	((uint32)W2B(r)|((uint32)W2B(g)<<8)|((uint32)W2B(b)<<16)|((uint32)W2B(a)<<24))
+
+#define	DECLAREContigPutFunc(name) \
+static void name(\
+    TIFFRGBAImage* img, \
+    uint32* cp, \
+    uint32 x, uint32 y, \
+    uint32 w, uint32 h, \
+    int32 fromskew, int32 toskew, \
+    unsigned char* pp \
+)
+
+/*
+ * 8-bit palette => colormap/RGB
+ */
+DECLAREContigPutFunc(put8bitcmaptile)
+{
+    uint32** PALmap = img->PALmap;
+    int samplesperpixel = img->samplesperpixel;
+
+    (void) y;
+    while (h-- > 0) {
+	for (x = w; x-- > 0;)
+        {
+	    *cp++ = PALmap[*pp][0];
+            pp += samplesperpixel;
+        }
+	cp += toskew;
+	pp += fromskew;
+    }
+}
+
+/*
+ * 4-bit palette => colormap/RGB
+ */
+DECLAREContigPutFunc(put4bitcmaptile)
+{
+    uint32** PALmap = img->PALmap;
+
+    (void) x; (void) y;
+    fromskew /= 2;
+    while (h-- > 0) {
+	uint32* bw;
+	UNROLL2(w, bw = PALmap[*pp++], *cp++ = *bw++);
+	cp += toskew;
+	pp += fromskew;
+    }
+}
+
+/*
+ * 2-bit palette => colormap/RGB
+ */
+DECLAREContigPutFunc(put2bitcmaptile)
+{
+    uint32** PALmap = img->PALmap;
+
+    (void) x; (void) y;
+    fromskew /= 4;
+    while (h-- > 0) {
+	uint32* bw;
+	UNROLL4(w, bw = PALmap[*pp++], *cp++ = *bw++);
+	cp += toskew;
+	pp += fromskew;
+    }
+}
+
+/*
+ * 1-bit palette => colormap/RGB
+ */
+DECLAREContigPutFunc(put1bitcmaptile)
+{
+    uint32** PALmap = img->PALmap;
+
+    (void) x; (void) y;
+    fromskew /= 8;
+    while (h-- > 0) {
+	uint32* bw;
+	UNROLL8(w, bw = PALmap[*pp++], *cp++ = *bw++);
+	cp += toskew;
+	pp += fromskew;
+    }
+}
+
+/*
+ * 8-bit greyscale => colormap/RGB
+ */
+DECLAREContigPutFunc(putgreytile)
+{
+    int samplesperpixel = img->samplesperpixel;
+    uint32** BWmap = img->BWmap;
+
+    (void) y;
+    while (h-- > 0) {
+	for (x = w; x-- > 0;)
+        {
+	    *cp++ = BWmap[*pp][0];
+            pp += samplesperpixel;
+        }
+	cp += toskew;
+	pp += fromskew;
+    }
+}
+
+/*
+ * 16-bit greyscale => colormap/RGB
+ */
+DECLAREContigPutFunc(put16bitbwtile)
+{
+    int samplesperpixel = img->samplesperpixel;
+    uint32** BWmap = img->BWmap;
+
+    (void) y;
+    while (h-- > 0) {
+        uint16 *wp = (uint16 *) pp;
+
+	for (x = w; x-- > 0;)
+        {
+            /* use high order byte of 16bit value */
+
+	    *cp++ = BWmap[*wp >> 8][0];
+            pp += 2 * samplesperpixel;
+            wp += samplesperpixel;
+        }
+	cp += toskew;
+	pp += fromskew;
+    }
+}
+
+/*
+ * 1-bit bilevel => colormap/RGB
+ */
+DECLAREContigPutFunc(put1bitbwtile)
+{
+    uint32** BWmap = img->BWmap;
+
+    (void) x; (void) y;
+    fromskew /= 8;
+    while (h-- > 0) {
+	uint32* bw;
+	UNROLL8(w, bw = BWmap[*pp++], *cp++ = *bw++);
+	cp += toskew;
+	pp += fromskew;
+    }
+}
+
+/*
+ * 2-bit greyscale => colormap/RGB
+ */
+DECLAREContigPutFunc(put2bitbwtile)
+{
+    uint32** BWmap = img->BWmap;
+
+    (void) x; (void) y;
+    fromskew /= 4;
+    while (h-- > 0) {
+	uint32* bw;
+	UNROLL4(w, bw = BWmap[*pp++], *cp++ = *bw++);
+	cp += toskew;
+	pp += fromskew;
+    }
+}
+
+/*
+ * 4-bit greyscale => colormap/RGB
+ */
+DECLAREContigPutFunc(put4bitbwtile)
+{
+    uint32** BWmap = img->BWmap;
+
+    (void) x; (void) y;
+    fromskew /= 2;
+    while (h-- > 0) {
+	uint32* bw;
+	UNROLL2(w, bw = BWmap[*pp++], *cp++ = *bw++);
+	cp += toskew;
+	pp += fromskew;
+    }
+}
+
+/*
+ * 8-bit packed samples, no Map => RGB
+ */
+DECLAREContigPutFunc(putRGBcontig8bittile)
+{
+    int samplesperpixel = img->samplesperpixel;
+
+    (void) x; (void) y;
+    fromskew *= samplesperpixel;
+    while (h-- > 0) {
+	UNROLL8(w, NOP,
+	    *cp++ = PACK(pp[0], pp[1], pp[2]);
+	    pp += samplesperpixel);
+	cp += toskew;
+	pp += fromskew;
+    }
+}
+
+/*
+ * 8-bit packed samples, w/ Map => RGB
+ */
+DECLAREContigPutFunc(putRGBcontig8bitMaptile)
+{
+    TIFFRGBValue* Map = img->Map;
+    int samplesperpixel = img->samplesperpixel;
+
+    (void) y;
+    fromskew *= samplesperpixel;
+    while (h-- > 0) {
+	for (x = w; x-- > 0;) {
+	    *cp++ = PACK(Map[pp[0]], Map[pp[1]], Map[pp[2]]);
+	    pp += samplesperpixel;
+	}
+	pp += fromskew;
+	cp += toskew;
+    }
+}
+
+/*
+ * 8-bit packed samples => RGBA w/ associated alpha
+ * (known to have Map == NULL)
+ */
+DECLAREContigPutFunc(putRGBAAcontig8bittile)
+{
+    int samplesperpixel = img->samplesperpixel;
+
+    (void) x; (void) y;
+    fromskew *= samplesperpixel;
+    while (h-- > 0) {
+	UNROLL8(w, NOP,
+	    *cp++ = PACK4(pp[0], pp[1], pp[2], pp[3]);
+	    pp += samplesperpixel);
+	cp += toskew;
+	pp += fromskew;
+    }
+}
+
+/*
+ * 8-bit packed samples => RGBA w/ unassociated alpha
+ * (known to have Map == NULL)
+ */
+DECLAREContigPutFunc(putRGBUAcontig8bittile)
+{
+    int samplesperpixel = img->samplesperpixel;
+
+    (void) y;
+    fromskew *= samplesperpixel;
+    while (h-- > 0) {
+	uint32 r, g, b, a;
+	for (x = w; x-- > 0;) {
+	    a = pp[3];
+	    r = (pp[0] * a) / 255;
+	    g = (pp[1] * a) / 255;
+	    b = (pp[2] * a) / 255;
+	    *cp++ = PACK4(r,g,b,a);
+	    pp += samplesperpixel;
+	}
+	cp += toskew;
+	pp += fromskew;
+    }
+}
+
+/*
+ * 16-bit packed samples => RGB
+ */
+DECLAREContigPutFunc(putRGBcontig16bittile)
+{
+    int samplesperpixel = img->samplesperpixel;
+    uint16 *wp = (uint16 *)pp;
+
+    (void) y;
+    fromskew *= samplesperpixel;
+    while (h-- > 0) {
+	for (x = w; x-- > 0;) {
+	    *cp++ = PACKW(wp[0], wp[1], wp[2]);
+	    wp += samplesperpixel;
+	}
+	cp += toskew;
+	wp += fromskew;
+    }
+}
+
+/*
+ * 16-bit packed samples => RGBA w/ associated alpha
+ * (known to have Map == NULL)
+ */
+DECLAREContigPutFunc(putRGBAAcontig16bittile)
+{
+    int samplesperpixel = img->samplesperpixel;
+    uint16 *wp = (uint16 *)pp;
+
+    (void) y;
+    fromskew *= samplesperpixel;
+    while (h-- > 0) {
+	for (x = w; x-- > 0;) {
+	    *cp++ = PACKW4(wp[0], wp[1], wp[2], wp[3]);
+	    wp += samplesperpixel;
+	}
+	cp += toskew;
+	wp += fromskew;
+    }
+}
+
+/*
+ * 16-bit packed samples => RGBA w/ unassociated alpha
+ * (known to have Map == NULL)
+ */
+DECLAREContigPutFunc(putRGBUAcontig16bittile)
+{
+    int samplesperpixel = img->samplesperpixel;
+    uint16 *wp = (uint16 *)pp;
+
+    (void) y;
+    fromskew *= samplesperpixel;
+    while (h-- > 0) {
+	uint32 r,g,b,a;
+	/*
+	 * We shift alpha down four bits just in case unsigned
+	 * arithmetic doesn't handle the full range.
+	 * We still have plenty of accuracy, since the output is 8 bits.
+	 * So we have (r * 0xffff) * (a * 0xfff)) = r*a * (0xffff*0xfff)
+	 * Since we want r*a * 0xff for eight bit output,
+	 * we divide by (0xffff * 0xfff) / 0xff == 0x10eff.
+	 */
+	for (x = w; x-- > 0;) {
+	    a = wp[3] >> 4;
+	    r = (wp[0] * a) / 0x10eff;
+	    g = (wp[1] * a) / 0x10eff;
+	    b = (wp[2] * a) / 0x10eff;
+	    *cp++ = PACK4(r,g,b,a);
+	    wp += samplesperpixel;
+	}
+	cp += toskew;
+	wp += fromskew;
+    }
+}
+
+/*
+ * 8-bit packed CMYK samples w/o Map => RGB
+ *
+ * NB: The conversion of CMYK->RGB is *very* crude.
+ */
+DECLAREContigPutFunc(putRGBcontig8bitCMYKtile)
+{
+    int samplesperpixel = img->samplesperpixel;
+    uint16 r, g, b, k;
+
+    (void) x; (void) y;
+    fromskew *= samplesperpixel;
+    while (h-- > 0) {
+	UNROLL8(w, NOP,
+	    k = 255 - pp[3];
+	    r = (k*(255-pp[0]))/255;
+	    g = (k*(255-pp[1]))/255;
+	    b = (k*(255-pp[2]))/255;
+	    *cp++ = PACK(r, g, b);
+	    pp += samplesperpixel);
+	cp += toskew;
+	pp += fromskew;
+    }
+}
+
+/*
+ * 8-bit packed CMYK samples w/Map => RGB
+ *
+ * NB: The conversion of CMYK->RGB is *very* crude.
+ */
+DECLAREContigPutFunc(putRGBcontig8bitCMYKMaptile)
+{
+    int samplesperpixel = img->samplesperpixel;
+    TIFFRGBValue* Map = img->Map;
+    uint16 r, g, b, k;
+
+    (void) y;
+    fromskew *= samplesperpixel;
+    while (h-- > 0) {
+	for (x = w; x-- > 0;) {
+	    k = 255 - pp[3];
+	    r = (k*(255-pp[0]))/255;
+	    g = (k*(255-pp[1]))/255;
+	    b = (k*(255-pp[2]))/255;
+	    *cp++ = PACK(Map[r], Map[g], Map[b]);
+	    pp += samplesperpixel;
+	}
+	pp += fromskew;
+	cp += toskew;
+    }
+}
+
+#define	DECLARESepPutFunc(name) \
+static void name(\
+    TIFFRGBAImage* img,\
+    uint32* cp,\
+    uint32 x, uint32 y, \
+    uint32 w, uint32 h,\
+    int32 fromskew, int32 toskew,\
+    unsigned char* r, unsigned char* g, unsigned char* b, unsigned char* a\
+)
+
+/*
+ * 8-bit unpacked samples => RGB
+ */
+DECLARESepPutFunc(putRGBseparate8bittile)
+{
+    (void) img; (void) x; (void) y; (void) a;
+    while (h-- > 0) {
+	UNROLL8(w, NOP, *cp++ = PACK(*r++, *g++, *b++));
+	SKEW(r, g, b, fromskew);
+	cp += toskew;
+    }
+}
+
+/*
+ * 8-bit unpacked samples => RGB
+ */
+DECLARESepPutFunc(putRGBseparate8bitMaptile)
+{
+    TIFFRGBValue* Map = img->Map;
+
+    (void) y; (void) a;
+    while (h-- > 0) {
+	for (x = w; x > 0; x--)
+	    *cp++ = PACK(Map[*r++], Map[*g++], Map[*b++]);
+	SKEW(r, g, b, fromskew);
+	cp += toskew;
+    }
+}
+
+/*
+ * 8-bit unpacked samples => RGBA w/ associated alpha
+ */
+DECLARESepPutFunc(putRGBAAseparate8bittile)
+{
+    (void) img; (void) x; (void) y;
+    while (h-- > 0) {
+	UNROLL8(w, NOP, *cp++ = PACK4(*r++, *g++, *b++, *a++));
+	SKEW4(r, g, b, a, fromskew);
+	cp += toskew;
+    }
+}
+
+/*
+ * 8-bit unpacked samples => RGBA w/ unassociated alpha
+ */
+DECLARESepPutFunc(putRGBUAseparate8bittile)
+{
+    (void) img; (void) y;
+    while (h-- > 0) {
+	uint32 rv, gv, bv, av;
+	for (x = w; x-- > 0;) {
+	    av = *a++;
+	    rv = (*r++ * av) / 255;
+	    gv = (*g++ * av) / 255;
+	    bv = (*b++ * av) / 255;
+	    *cp++ = PACK4(rv,gv,bv,av);
+	}
+	SKEW4(r, g, b, a, fromskew);
+	cp += toskew;
+    }
+}
+
+/*
+ * 16-bit unpacked samples => RGB
+ */
+DECLARESepPutFunc(putRGBseparate16bittile)
+{
+    uint16 *wr = (uint16*) r;
+    uint16 *wg = (uint16*) g;
+    uint16 *wb = (uint16*) b;
+
+    (void) img; (void) y; (void) a;
+    while (h-- > 0) {
+	for (x = 0; x < w; x++)
+	    *cp++ = PACKW(*wr++, *wg++, *wb++);
+	SKEW(wr, wg, wb, fromskew);
+	cp += toskew;
+    }
+}
+
+/*
+ * 16-bit unpacked samples => RGBA w/ associated alpha
+ */
+DECLARESepPutFunc(putRGBAAseparate16bittile)
+{
+    uint16 *wr = (uint16*) r;
+    uint16 *wg = (uint16*) g;
+    uint16 *wb = (uint16*) b;
+    uint16 *wa = (uint16*) a;
+
+    (void) img; (void) y;
+    while (h-- > 0) {
+	for (x = 0; x < w; x++)
+	    *cp++ = PACKW4(*wr++, *wg++, *wb++, *wa++);
+	SKEW4(wr, wg, wb, wa, fromskew);
+	cp += toskew;
+    }
+}
+
+/*
+ * 16-bit unpacked samples => RGBA w/ unassociated alpha
+ */
+DECLARESepPutFunc(putRGBUAseparate16bittile)
+{
+    uint16 *wr = (uint16*) r;
+    uint16 *wg = (uint16*) g;
+    uint16 *wb = (uint16*) b;
+    uint16 *wa = (uint16*) a;
+
+    (void) img; (void) y;
+    while (h-- > 0) {
+	uint32 r,g,b,a;
+	/*
+	 * We shift alpha down four bits just in case unsigned
+	 * arithmetic doesn't handle the full range.
+	 * We still have plenty of accuracy, since the output is 8 bits.
+	 * So we have (r * 0xffff) * (a * 0xfff)) = r*a * (0xffff*0xfff)
+	 * Since we want r*a * 0xff for eight bit output,
+	 * we divide by (0xffff * 0xfff) / 0xff == 0x10eff.
+	 */
+	for (x = w; x-- > 0;) {
+	    a = *wa++ >> 4;
+	    r = (*wr++ * a) / 0x10eff;
+	    g = (*wg++ * a) / 0x10eff;
+	    b = (*wb++ * a) / 0x10eff;
+	    *cp++ = PACK4(r,g,b,a);
+	}
+	SKEW4(wr, wg, wb, wa, fromskew);
+	cp += toskew;
+    }
+}
+
+/*
+ * 8-bit packed CIE L*a*b 1976 samples => RGB
+ */
+DECLAREContigPutFunc(putcontig8bitCIELab)
+{
+	float X, Y, Z;
+	uint32 r, g, b;
+	(void) y;
+	fromskew *= 3;
+	while (h-- > 0) {
+		for (x = w; x-- > 0;) {
+			TIFFCIELabToXYZ(img->cielab,
+					(unsigned char)pp[0],
+					(signed char)pp[1],
+					(signed char)pp[2],
+					&X, &Y, &Z);
+			TIFFXYZToRGB(img->cielab, X, Y, Z, &r, &g, &b);
+			*cp++ = PACK(r, g, b);
+			pp += 3;
+		}
+		cp += toskew;
+		pp += fromskew;
+	}
+}
+
+/*
+ * YCbCr -> RGB conversion and packing routines.
+ */
+
+#define	YCbCrtoRGB(dst, Y) {						\
+	uint32 r, g, b;							\
+	TIFFYCbCrtoRGB(img->ycbcr, (Y), Cb, Cr, &r, &g, &b);		\
+	dst = PACK(r, g, b);						\
+}
+
+/*
+ * 8-bit packed YCbCr samples => RGB
+ * This function is generic for different sampling sizes,
+ * and can handle blocks sizes that aren't multiples of the
+ * sampling size.  However, it is substantially less optimized
+ * than the specific sampling cases.  It is used as a fallback
+ * for difficult blocks.
+ */
+#ifdef notdef
+static void putcontig8bitYCbCrGenericTile(
+    TIFFRGBAImage* img,
+    uint32* cp,
+    uint32 x, uint32 y,
+    uint32 w, uint32 h,
+    int32 fromskew, int32 toskew,
+    unsigned char* pp,
+    int h_group,
+    int v_group )
+
+{
+    uint32* cp1 = cp+w+toskew;
+    uint32* cp2 = cp1+w+toskew;
+    uint32* cp3 = cp2+w+toskew;
+    int32 incr = 3*w+4*toskew;
+    int32   Cb, Cr;
+    int     group_size = v_group * h_group + 2;
+
+    (void) y;
+    fromskew = (fromskew * group_size) / h_group;
+
+    for( yy = 0; yy < h; yy++ )
+    {
+        unsigned char *pp_line;
+        int     y_line_group = yy / v_group;
+        int     y_remainder = yy - y_line_group * v_group;
+
+        pp_line = pp + v_line_group *
+
+
+        for( xx = 0; xx < w; xx++ )
+        {
+            Cb = pp
+        }
+    }
+    for (; h >= 4; h -= 4) {
+	x = w>>2;
+	do {
+	    Cb = pp[16];
+	    Cr = pp[17];
+
+	    YCbCrtoRGB(cp [0], pp[ 0]);
+	    YCbCrtoRGB(cp [1], pp[ 1]);
+	    YCbCrtoRGB(cp [2], pp[ 2]);
+	    YCbCrtoRGB(cp [3], pp[ 3]);
+	    YCbCrtoRGB(cp1[0], pp[ 4]);
+	    YCbCrtoRGB(cp1[1], pp[ 5]);
+	    YCbCrtoRGB(cp1[2], pp[ 6]);
+	    YCbCrtoRGB(cp1[3], pp[ 7]);
+	    YCbCrtoRGB(cp2[0], pp[ 8]);
+	    YCbCrtoRGB(cp2[1], pp[ 9]);
+	    YCbCrtoRGB(cp2[2], pp[10]);
+	    YCbCrtoRGB(cp2[3], pp[11]);
+	    YCbCrtoRGB(cp3[0], pp[12]);
+	    YCbCrtoRGB(cp3[1], pp[13]);
+	    YCbCrtoRGB(cp3[2], pp[14]);
+	    YCbCrtoRGB(cp3[3], pp[15]);
+
+	    cp += 4, cp1 += 4, cp2 += 4, cp3 += 4;
+	    pp += 18;
+	} while (--x);
+	cp += incr, cp1 += incr, cp2 += incr, cp3 += incr;
+	pp += fromskew;
+    }
+}
+#endif
+
+/*
+ * 8-bit packed YCbCr samples w/ 4,4 subsampling => RGB
+ */
+DECLAREContigPutFunc(putcontig8bitYCbCr44tile)
+{
+    uint32* cp1 = cp+w+toskew;
+    uint32* cp2 = cp1+w+toskew;
+    uint32* cp3 = cp2+w+toskew;
+    int32 incr = 3*w+4*toskew;
+
+    (void) y;
+    /* adjust fromskew */
+    fromskew = (fromskew * 18) / 4;
+    if ((h & 3) == 0 && (w & 3) == 0) {
+        for (; h >= 4; h -= 4) {
+            x = w>>2;
+            do {
+                int32 Cb = pp[16];
+                int32 Cr = pp[17];
+
+                YCbCrtoRGB(cp [0], pp[ 0]);
+                YCbCrtoRGB(cp [1], pp[ 1]);
+                YCbCrtoRGB(cp [2], pp[ 2]);
+                YCbCrtoRGB(cp [3], pp[ 3]);
+                YCbCrtoRGB(cp1[0], pp[ 4]);
+                YCbCrtoRGB(cp1[1], pp[ 5]);
+                YCbCrtoRGB(cp1[2], pp[ 6]);
+                YCbCrtoRGB(cp1[3], pp[ 7]);
+                YCbCrtoRGB(cp2[0], pp[ 8]);
+                YCbCrtoRGB(cp2[1], pp[ 9]);
+                YCbCrtoRGB(cp2[2], pp[10]);
+                YCbCrtoRGB(cp2[3], pp[11]);
+                YCbCrtoRGB(cp3[0], pp[12]);
+                YCbCrtoRGB(cp3[1], pp[13]);
+                YCbCrtoRGB(cp3[2], pp[14]);
+                YCbCrtoRGB(cp3[3], pp[15]);
+
+                cp += 4, cp1 += 4, cp2 += 4, cp3 += 4;
+                pp += 18;
+            } while (--x);
+            cp += incr, cp1 += incr, cp2 += incr, cp3 += incr;
+            pp += fromskew;
+        }
+    } else {
+        while (h > 0) {
+            for (x = w; x > 0;) {
+                int32 Cb = pp[16];
+                int32 Cr = pp[17];
+                switch (x) {
+                default:
+                    switch (h) {
+                    default: YCbCrtoRGB(cp3[3], pp[15]); /* FALLTHROUGH */
+                    case 3:  YCbCrtoRGB(cp2[3], pp[11]); /* FALLTHROUGH */
+                    case 2:  YCbCrtoRGB(cp1[3], pp[ 7]); /* FALLTHROUGH */
+                    case 1:  YCbCrtoRGB(cp [3], pp[ 3]); /* FALLTHROUGH */
+                    }                                    /* FALLTHROUGH */
+                case 3:
+                    switch (h) {
+                    default: YCbCrtoRGB(cp3[2], pp[14]); /* FALLTHROUGH */
+                    case 3:  YCbCrtoRGB(cp2[2], pp[10]); /* FALLTHROUGH */
+                    case 2:  YCbCrtoRGB(cp1[2], pp[ 6]); /* FALLTHROUGH */
+                    case 1:  YCbCrtoRGB(cp [2], pp[ 2]); /* FALLTHROUGH */
+                    }                                    /* FALLTHROUGH */
+                case 2:
+                    switch (h) {
+                    default: YCbCrtoRGB(cp3[1], pp[13]); /* FALLTHROUGH */
+                    case 3:  YCbCrtoRGB(cp2[1], pp[ 9]); /* FALLTHROUGH */
+                    case 2:  YCbCrtoRGB(cp1[1], pp[ 5]); /* FALLTHROUGH */
+                    case 1:  YCbCrtoRGB(cp [1], pp[ 1]); /* FALLTHROUGH */
+                    }                                    /* FALLTHROUGH */
+                case 1:
+                    switch (h) {
+                    default: YCbCrtoRGB(cp3[0], pp[12]); /* FALLTHROUGH */
+                    case 3:  YCbCrtoRGB(cp2[0], pp[ 8]); /* FALLTHROUGH */
+                    case 2:  YCbCrtoRGB(cp1[0], pp[ 4]); /* FALLTHROUGH */
+                    case 1:  YCbCrtoRGB(cp [0], pp[ 0]); /* FALLTHROUGH */
+                    }                                    /* FALLTHROUGH */
+                }
+                if (x < 4) {
+                    cp += x; cp1 += x; cp2 += x; cp3 += x;
+                    x = 0;
+                }
+                else {
+                    cp += 4; cp1 += 4; cp2 += 4; cp3 += 4;
+                    x -= 4;
+                }
+                pp += 18;
+            }
+            if (h <= 4)
+                break;
+            h -= 4;
+            cp += incr, cp1 += incr, cp2 += incr, cp3 += incr;
+            pp += fromskew;
+        }
+    }
+}
+
+/*
+ * 8-bit packed YCbCr samples w/ 4,2 subsampling => RGB
+ */
+DECLAREContigPutFunc(putcontig8bitYCbCr42tile)
+{
+    uint32* cp1 = cp+w+toskew;
+    int32 incr = 2*toskew+w;
+
+    (void) y;
+    fromskew = (fromskew * 10) / 4;
+    if ((h & 3) == 0 && (w & 1) == 0) {
+        for (; h >= 2; h -= 2) {
+            x = w>>2;
+            do {
+                int32 Cb = pp[8];
+                int32 Cr = pp[9];
+
+                YCbCrtoRGB(cp [0], pp[0]);
+                YCbCrtoRGB(cp [1], pp[1]);
+                YCbCrtoRGB(cp [2], pp[2]);
+                YCbCrtoRGB(cp [3], pp[3]);
+                YCbCrtoRGB(cp1[0], pp[4]);
+                YCbCrtoRGB(cp1[1], pp[5]);
+                YCbCrtoRGB(cp1[2], pp[6]);
+                YCbCrtoRGB(cp1[3], pp[7]);
+
+                cp += 4, cp1 += 4;
+                pp += 10;
+            } while (--x);
+            cp += incr, cp1 += incr;
+            pp += fromskew;
+        }
+    } else {
+        while (h > 0) {
+            for (x = w; x > 0;) {
+                int32 Cb = pp[8];
+                int32 Cr = pp[9];
+                switch (x) {
+                default:
+                    switch (h) {
+                    default: YCbCrtoRGB(cp1[3], pp[ 7]); /* FALLTHROUGH */
+                    case 1:  YCbCrtoRGB(cp [3], pp[ 3]); /* FALLTHROUGH */
+                    }                                    /* FALLTHROUGH */
+                case 3:
+                    switch (h) {
+                    default: YCbCrtoRGB(cp1[2], pp[ 6]); /* FALLTHROUGH */
+                    case 1:  YCbCrtoRGB(cp [2], pp[ 2]); /* FALLTHROUGH */
+                    }                                    /* FALLTHROUGH */
+                case 2:
+                    switch (h) {
+                    default: YCbCrtoRGB(cp1[1], pp[ 5]); /* FALLTHROUGH */
+                    case 1:  YCbCrtoRGB(cp [1], pp[ 1]); /* FALLTHROUGH */
+                    }                                    /* FALLTHROUGH */
+                case 1:
+                    switch (h) {
+                    default: YCbCrtoRGB(cp1[0], pp[ 4]); /* FALLTHROUGH */
+                    case 1:  YCbCrtoRGB(cp [0], pp[ 0]); /* FALLTHROUGH */
+                    }                                    /* FALLTHROUGH */
+                }
+                if (x < 4) {
+                    cp += x; cp1 += x;
+                    x = 0;
+                }
+                else {
+                    cp += 4; cp1 += 4;
+                    x -= 4;
+                }
+                pp += 10;
+            }
+            if (h <= 2)
+                break;
+            h -= 2;
+            cp += incr, cp1 += incr;
+            pp += fromskew;
+        }
+    }
+}
+
+/*
+ * 8-bit packed YCbCr samples w/ 4,1 subsampling => RGB
+ */
+DECLAREContigPutFunc(putcontig8bitYCbCr41tile)
+{
+    (void) y;
+    /* XXX adjust fromskew */
+    do {
+	x = w>>2;
+	do {
+	    int32 Cb = pp[4];
+	    int32 Cr = pp[5];
+
+	    YCbCrtoRGB(cp [0], pp[0]);
+	    YCbCrtoRGB(cp [1], pp[1]);
+	    YCbCrtoRGB(cp [2], pp[2]);
+	    YCbCrtoRGB(cp [3], pp[3]);
+
+	    cp += 4;
+	    pp += 6;
+	} while (--x);
+
+        if( (w&3) != 0 )
+        {
+	    int32 Cb = pp[4];
+	    int32 Cr = pp[5];
+
+            switch( (w&3) ) {
+              case 3: YCbCrtoRGB(cp [2], pp[2]);
+              case 2: YCbCrtoRGB(cp [1], pp[1]);
+              case 1: YCbCrtoRGB(cp [0], pp[0]);
+              case 0: break;
+            }
+
+            cp += (w&3);
+            pp += 6;
+        }
+
+	cp += toskew;
+	pp += fromskew;
+    } while (--h);
+
+}
+
+/*
+ * 8-bit packed YCbCr samples w/ 2,2 subsampling => RGB
+ */
+DECLAREContigPutFunc(putcontig8bitYCbCr22tile)
+{
+    uint32* cp1 = cp+w+toskew;
+    int32 incr = 2*toskew+w;
+
+    (void) y;
+    fromskew = (fromskew * 6) / 2;
+    if ((h & 1) == 0 && (w & 1) == 0) {
+        for (; h >= 2; h -= 2) {
+            x = w>>1;
+            do {
+                int32 Cb = pp[4];
+                int32 Cr = pp[5];
+
+                YCbCrtoRGB(cp [0], pp[0]);
+                YCbCrtoRGB(cp [1], pp[1]);
+                YCbCrtoRGB(cp1[0], pp[2]);
+                YCbCrtoRGB(cp1[1], pp[3]);
+
+                cp += 2, cp1 += 2;
+                pp += 6;
+            } while (--x);
+            cp += incr, cp1 += incr;
+            pp += fromskew;
+        }
+    } else {
+        while (h > 0) {
+            for (x = w; x > 0;) {
+                int32 Cb = pp[4];
+                int32 Cr = pp[5];
+                switch (x) {
+                default:
+                    switch (h) {
+                    default: YCbCrtoRGB(cp1[1], pp[ 3]); /* FALLTHROUGH */
+                    case 1:  YCbCrtoRGB(cp [1], pp[ 1]); /* FALLTHROUGH */
+                    }                                    /* FALLTHROUGH */
+                case 1:
+                    switch (h) {
+                    default: YCbCrtoRGB(cp1[0], pp[ 2]); /* FALLTHROUGH */
+                    case 1:  YCbCrtoRGB(cp [0], pp[ 0]); /* FALLTHROUGH */
+                    }                                    /* FALLTHROUGH */
+                }
+                if (x < 2) {
+                    cp += x; cp1 += x;
+                    x = 0;
+                }
+                else {
+                    cp += 2; cp1 += 2;
+                    x -= 2;
+                }
+                pp += 6;
+            }
+            if (h <= 2)
+                break;
+            h -= 2;
+            cp += incr, cp1 += incr;
+            pp += fromskew;
+        }
+    }
+}
+
+/*
+ * 8-bit packed YCbCr samples w/ 2,1 subsampling => RGB
+ */
+DECLAREContigPutFunc(putcontig8bitYCbCr21tile)
+{
+    (void) y;
+    fromskew = (fromskew * 4) / 2;
+    do {
+	x = w>>1;
+	do {
+	    int32 Cb = pp[2];
+	    int32 Cr = pp[3];
+
+	    YCbCrtoRGB(cp[0], pp[0]);
+	    YCbCrtoRGB(cp[1], pp[1]);
+
+	    cp += 2;
+	    pp += 4;
+	} while (--x);
+
+        if( (w&1) != 0 )
+        {
+	    int32 Cb = pp[2];
+	    int32 Cr = pp[3];
+
+            YCbCrtoRGB(cp [0], pp[0]);
+
+	    cp += 1;
+	    pp += 4;
+        }
+
+	cp += toskew;
+	pp += fromskew;
+    } while (--h);
+}
+
+/*
+ * 8-bit packed YCbCr samples w/ no subsampling => RGB
+ */
+DECLAREContigPutFunc(putcontig8bitYCbCr11tile)
+{
+    (void) y;
+    fromskew *= 3;
+    do {
+        x = w; /* was x = w>>1; patched 2000/09/25 warmerda@home.com */
+	do {
+	    int32 Cb = pp[1];
+	    int32 Cr = pp[2];
+
+	    YCbCrtoRGB(*cp++, pp[0]);
+
+	    pp += 3;
+	} while (--x);
+	cp += toskew;
+	pp += fromskew;
+    } while (--h);
+}
+#undef	YCbCrtoRGB
+
+static tileContigRoutine
+initYCbCrConversion(TIFFRGBAImage* img)
+{
+	static char module[] = "initCIELabConversion";
+
+	float *luma, *refBlackWhite;
+	uint16 hs, vs;
+
+	if (img->ycbcr == NULL) {
+	    img->ycbcr = (TIFFYCbCrToRGB*) _TIFFmalloc(
+		    TIFFroundup(sizeof (TIFFYCbCrToRGB), sizeof (long))
+		    + 4*256*sizeof (TIFFRGBValue)
+		    + 2*256*sizeof (int)
+		    + 3*256*sizeof (int32)
+	    );
+	    if (img->ycbcr == NULL) {
+			TIFFErrorExt(img->tif->tif_clientdata, module,
+			      "No space for YCbCr->RGB conversion state");
+		    return (NULL);
+	    }
+	}
+
+	TIFFGetFieldDefaulted(img->tif, TIFFTAG_YCBCRCOEFFICIENTS, &luma);
+	TIFFGetFieldDefaulted(img->tif, TIFFTAG_REFERENCEBLACKWHITE,
+			      &refBlackWhite);
+	if (TIFFYCbCrToRGBInit(img->ycbcr, luma, refBlackWhite) < 0)
+		return NULL;
+
+	/*
+	 * The 6.0 spec says that subsampling must be
+	 * one of 1, 2, or 4, and that vertical subsampling
+	 * must always be <= horizontal subsampling; so
+	 * there are only a few possibilities and we just
+	 * enumerate the cases.
+	 */
+	TIFFGetFieldDefaulted(img->tif, TIFFTAG_YCBCRSUBSAMPLING, &hs, &vs);
+	switch ((hs<<4)|vs) {
+		case 0x44: return (putcontig8bitYCbCr44tile);
+		case 0x42: return (putcontig8bitYCbCr42tile);
+		case 0x41: return (putcontig8bitYCbCr41tile);
+		case 0x22: return (putcontig8bitYCbCr22tile);
+		case 0x21: return (putcontig8bitYCbCr21tile);
+		case 0x11: return (putcontig8bitYCbCr11tile);
+	}
+
+	return (NULL);
+}
+
+static tileContigRoutine
+initCIELabConversion(TIFFRGBAImage* img)
+{
+	static char module[] = "initCIELabConversion";
+
+	float   *whitePoint;
+	float   refWhite[3];
+
+	if (!img->cielab) {
+		img->cielab = (TIFFCIELabToRGB *)
+			_TIFFmalloc(sizeof(TIFFCIELabToRGB));
+		if (!img->cielab) {
+			TIFFErrorExt(img->tif->tif_clientdata, module,
+			    "No space for CIE L*a*b*->RGB conversion state.");
+			return NULL;
+		}
+	}
+
+	TIFFGetFieldDefaulted(img->tif, TIFFTAG_WHITEPOINT, &whitePoint);
+	refWhite[1] = 100.0F;
+	refWhite[0] = whitePoint[0] / whitePoint[1] * refWhite[1];
+	refWhite[2] = (1.0F - whitePoint[0] - whitePoint[1])
+		      / whitePoint[1] * refWhite[1];
+	if (TIFFCIELabToRGBInit(img->cielab, &display_sRGB, refWhite) < 0) {
+		TIFFErrorExt(img->tif->tif_clientdata, module,
+		    "Failed to initialize CIE L*a*b*->RGB conversion state.");
+		_TIFFfree(img->cielab);
+		return NULL;
+	}
+
+	return putcontig8bitCIELab;
+}
+
+/*
+ * Greyscale images with less than 8 bits/sample are handled
+ * with a table to avoid lots of shifts and masks.  The table
+ * is setup so that put*bwtile (below) can retrieve 8/bitspersample
+ * pixel values simply by indexing into the table with one
+ * number.
+ */
+static int
+makebwmap(TIFFRGBAImage* img)
+{
+    TIFFRGBValue* Map = img->Map;
+    int bitspersample = img->bitspersample;
+    int nsamples = 8 / bitspersample;
+    int i;
+    uint32* p;
+
+    if( nsamples == 0 )
+        nsamples = 1;
+
+    img->BWmap = (uint32**) _TIFFmalloc(
+	256*sizeof (uint32 *)+(256*nsamples*sizeof(uint32)));
+    if (img->BWmap == NULL) {
+		TIFFErrorExt(img->tif->tif_clientdata, TIFFFileName(img->tif), "No space for B&W mapping table");
+		return (0);
+    }
+    p = (uint32*)(img->BWmap + 256);
+    for (i = 0; i < 256; i++) {
+	TIFFRGBValue c;
+	img->BWmap[i] = p;
+	switch (bitspersample) {
+#define	GREY(x)	c = Map[x]; *p++ = PACK(c,c,c);
+	case 1:
+	    GREY(i>>7);
+	    GREY((i>>6)&1);
+	    GREY((i>>5)&1);
+	    GREY((i>>4)&1);
+	    GREY((i>>3)&1);
+	    GREY((i>>2)&1);
+	    GREY((i>>1)&1);
+	    GREY(i&1);
+	    break;
+	case 2:
+	    GREY(i>>6);
+	    GREY((i>>4)&3);
+	    GREY((i>>2)&3);
+	    GREY(i&3);
+	    break;
+	case 4:
+	    GREY(i>>4);
+	    GREY(i&0xf);
+	    break;
+	case 8:
+        case 16:
+	    GREY(i);
+	    break;
+	}
+#undef	GREY
+    }
+    return (1);
+}
+
+/*
+ * Construct a mapping table to convert from the range
+ * of the data samples to [0,255] --for display.  This
+ * process also handles inverting B&W images when needed.
+ */
+static int
+setupMap(TIFFRGBAImage* img)
+{
+    int32 x, range;
+
+    range = (int32)((1L<<img->bitspersample)-1);
+
+    /* treat 16 bit the same as eight bit */
+    if( img->bitspersample == 16 )
+        range = (int32) 255;
+
+    img->Map = (TIFFRGBValue*) _TIFFmalloc((range+1) * sizeof (TIFFRGBValue));
+    if (img->Map == NULL) {
+		TIFFErrorExt(img->tif->tif_clientdata, TIFFFileName(img->tif),
+			"No space for photometric conversion table");
+		return (0);
+    }
+    if (img->photometric == PHOTOMETRIC_MINISWHITE) {
+	for (x = 0; x <= range; x++)
+	    img->Map[x] = (TIFFRGBValue) (((range - x) * 255) / range);
+    } else {
+	for (x = 0; x <= range; x++)
+	    img->Map[x] = (TIFFRGBValue) ((x * 255) / range);
+    }
+    if (img->bitspersample <= 16 &&
+	(img->photometric == PHOTOMETRIC_MINISBLACK ||
+	 img->photometric == PHOTOMETRIC_MINISWHITE)) {
+	/*
+	 * Use photometric mapping table to construct
+	 * unpacking tables for samples <= 8 bits.
+	 */
+	if (!makebwmap(img))
+	    return (0);
+	/* no longer need Map, free it */
+	_TIFFfree(img->Map), img->Map = NULL;
+    }
+    return (1);
+}
+
+static int
+checkcmap(TIFFRGBAImage* img)
+{
+    uint16* r = img->redcmap;
+    uint16* g = img->greencmap;
+    uint16* b = img->bluecmap;
+    long n = 1L<<img->bitspersample;
+
+    while (n-- > 0)
+	if (*r++ >= 256 || *g++ >= 256 || *b++ >= 256)
+	    return (16);
+    return (8);
+}
+
+static void
+cvtcmap(TIFFRGBAImage* img)
+{
+    uint16* r = img->redcmap;
+    uint16* g = img->greencmap;
+    uint16* b = img->bluecmap;
+    long i;
+
+    for (i = (1L<<img->bitspersample)-1; i >= 0; i--) {
+#define	CVT(x)		((uint16)((x)>>8))
+	r[i] = CVT(r[i]);
+	g[i] = CVT(g[i]);
+	b[i] = CVT(b[i]);
+#undef	CVT
+    }
+}
+
+/*
+ * Palette images with <= 8 bits/sample are handled
+ * with a table to avoid lots of shifts and masks.  The table
+ * is setup so that put*cmaptile (below) can retrieve 8/bitspersample
+ * pixel values simply by indexing into the table with one
+ * number.
+ */
+static int
+makecmap(TIFFRGBAImage* img)
+{
+    int bitspersample = img->bitspersample;
+    int nsamples = 8 / bitspersample;
+    uint16* r = img->redcmap;
+    uint16* g = img->greencmap;
+    uint16* b = img->bluecmap;
+    uint32 *p;
+    int i;
+
+    img->PALmap = (uint32**) _TIFFmalloc(
+	256*sizeof (uint32 *)+(256*nsamples*sizeof(uint32)));
+    if (img->PALmap == NULL) {
+		TIFFErrorExt(img->tif->tif_clientdata, TIFFFileName(img->tif), "No space for Palette mapping table");
+		return (0);
+	}
+    p = (uint32*)(img->PALmap + 256);
+    for (i = 0; i < 256; i++) {
+	TIFFRGBValue c;
+	img->PALmap[i] = p;
+#define	CMAP(x)	c = (TIFFRGBValue) x; *p++ = PACK(r[c]&0xff, g[c]&0xff, b[c]&0xff);
+	switch (bitspersample) {
+	case 1:
+	    CMAP(i>>7);
+	    CMAP((i>>6)&1);
+	    CMAP((i>>5)&1);
+	    CMAP((i>>4)&1);
+	    CMAP((i>>3)&1);
+	    CMAP((i>>2)&1);
+	    CMAP((i>>1)&1);
+	    CMAP(i&1);
+	    break;
+	case 2:
+	    CMAP(i>>6);
+	    CMAP((i>>4)&3);
+	    CMAP((i>>2)&3);
+	    CMAP(i&3);
+	    break;
+	case 4:
+	    CMAP(i>>4);
+	    CMAP(i&0xf);
+	    break;
+	case 8:
+	    CMAP(i);
+	    break;
+	}
+#undef CMAP
+    }
+    return (1);
+}
+
+/*
+ * Construct any mapping table used
+ * by the associated put routine.
+ */
+static int
+buildMap(TIFFRGBAImage* img)
+{
+    switch (img->photometric) {
+    case PHOTOMETRIC_RGB:
+    case PHOTOMETRIC_YCBCR:
+    case PHOTOMETRIC_SEPARATED:
+	if (img->bitspersample == 8)
+	    break;
+	/* fall thru... */
+    case PHOTOMETRIC_MINISBLACK:
+    case PHOTOMETRIC_MINISWHITE:
+	if (!setupMap(img))
+	    return (0);
+	break;
+    case PHOTOMETRIC_PALETTE:
+	/*
+	 * Convert 16-bit colormap to 8-bit (unless it looks
+	 * like an old-style 8-bit colormap).
+	 */
+	if (checkcmap(img) == 16)
+	    cvtcmap(img);
+	else
+	    TIFFWarningExt(img->tif->tif_clientdata, TIFFFileName(img->tif), "Assuming 8-bit colormap");
+	/*
+	 * Use mapping table and colormap to construct
+	 * unpacking tables for samples < 8 bits.
+	 */
+	if (img->bitspersample <= 8 && !makecmap(img))
+	    return (0);
+	break;
+    }
+    return (1);
+}
+
+/*
+ * Select the appropriate conversion routine for packed data.
+ */
+static int
+pickTileContigCase(TIFFRGBAImage* img)
+{
+    tileContigRoutine put = 0;
+
+    if (buildMap(img)) {
+	switch (img->photometric) {
+	case PHOTOMETRIC_RGB:
+	    switch (img->bitspersample) {
+	    case 8:
+		if (!img->Map) {
+		    if (img->alpha == EXTRASAMPLE_ASSOCALPHA)
+			put = putRGBAAcontig8bittile;
+		    else if (img->alpha == EXTRASAMPLE_UNASSALPHA)
+			put = putRGBUAcontig8bittile;
+		    else
+			put = putRGBcontig8bittile;
+		} else
+		    put = putRGBcontig8bitMaptile;
+		break;
+	    case 16:
+		put = putRGBcontig16bittile;
+		if (!img->Map) {
+		    if (img->alpha == EXTRASAMPLE_ASSOCALPHA)
+			put = putRGBAAcontig16bittile;
+		    else if (img->alpha == EXTRASAMPLE_UNASSALPHA)
+			put = putRGBUAcontig16bittile;
+		}
+		break;
+	    }
+	    break;
+	case PHOTOMETRIC_SEPARATED:
+	    if (img->bitspersample == 8) {
+		if (!img->Map)
+		    put = putRGBcontig8bitCMYKtile;
+		else
+		    put = putRGBcontig8bitCMYKMaptile;
+	    }
+	    break;
+	case PHOTOMETRIC_PALETTE:
+	    switch (img->bitspersample) {
+	    case 8:	put = put8bitcmaptile; break;
+	    case 4: put = put4bitcmaptile; break;
+	    case 2: put = put2bitcmaptile; break;
+	    case 1: put = put1bitcmaptile; break;
+	    }
+	    break;
+	case PHOTOMETRIC_MINISWHITE:
+	case PHOTOMETRIC_MINISBLACK:
+	    switch (img->bitspersample) {
+            case 16: put = put16bitbwtile; break;
+	    case 8:  put = putgreytile; break;
+	    case 4:  put = put4bitbwtile; break;
+	    case 2:  put = put2bitbwtile; break;
+	    case 1:  put = put1bitbwtile; break;
+	    }
+	    break;
+	case PHOTOMETRIC_YCBCR:
+	    if (img->bitspersample == 8)
+		put = initYCbCrConversion(img);
+	    break;
+	case PHOTOMETRIC_CIELAB:
+	    if (img->bitspersample == 8)
+		put = initCIELabConversion(img);
+	    break;
+	}
+    }
+    return ((img->put.contig = put) != 0);
+}
+
+/*
+ * Select the appropriate conversion routine for unpacked data.
+ *
+ * NB: we assume that unpacked single channel data is directed
+ *	 to the "packed routines.
+ */
+static int
+pickTileSeparateCase(TIFFRGBAImage* img)
+{
+    tileSeparateRoutine put = 0;
+
+    if (buildMap(img)) {
+	switch (img->photometric) {
+	case PHOTOMETRIC_RGB:
+	    switch (img->bitspersample) {
+	    case 8:
+		if (!img->Map) {
+		    if (img->alpha == EXTRASAMPLE_ASSOCALPHA)
+			put = putRGBAAseparate8bittile;
+		    else if (img->alpha == EXTRASAMPLE_UNASSALPHA)
+			put = putRGBUAseparate8bittile;
+		    else
+			put = putRGBseparate8bittile;
+		} else
+		    put = putRGBseparate8bitMaptile;
+		break;
+	    case 16:
+		put = putRGBseparate16bittile;
+		if (!img->Map) {
+		    if (img->alpha == EXTRASAMPLE_ASSOCALPHA)
+			put = putRGBAAseparate16bittile;
+		    else if (img->alpha == EXTRASAMPLE_UNASSALPHA)
+			put = putRGBUAseparate16bittile;
+		}
+		break;
+	    }
+	    break;
+	}
+    }
+    return ((img->put.separate = put) != 0);
+}
+
+/*
+ * Read a whole strip off data from the file, and convert to RGBA form.
+ * If this is the last strip, then it will only contain the portion of
+ * the strip that is actually within the image space.  The result is
+ * organized in bottom to top form.
+ */
+
+
+int
+TIFFReadRGBAStrip(TIFF* tif, uint32 row, uint32 * raster )
+
+{
+    char 	emsg[1024] = "";
+    TIFFRGBAImage img;
+    int 	ok;
+    uint32	rowsperstrip, rows_to_read;
+
+    if( TIFFIsTiled( tif ) )
+    {
+		TIFFErrorExt(tif->tif_clientdata, TIFFFileName(tif),
+                  "Can't use TIFFReadRGBAStrip() with tiled file.");
+	return (0);
+    }
+
+    TIFFGetFieldDefaulted(tif, TIFFTAG_ROWSPERSTRIP, &rowsperstrip);
+    if( (row % rowsperstrip) != 0 )
+    {
+		TIFFErrorExt(tif->tif_clientdata, TIFFFileName(tif),
+				"Row passed to TIFFReadRGBAStrip() must be first in a strip.");
+		return (0);
+    }
+
+    if (TIFFRGBAImageOK(tif, emsg) && TIFFRGBAImageBegin(&img, tif, 0, emsg)) {
+
+        img.row_offset = row;
+        img.col_offset = 0;
+
+        if( row + rowsperstrip > img.height )
+            rows_to_read = img.height - row;
+        else
+            rows_to_read = rowsperstrip;
+
+	ok = TIFFRGBAImageGet(&img, raster, img.width, rows_to_read );
+
+	TIFFRGBAImageEnd(&img);
+    } else {
+		TIFFErrorExt(tif->tif_clientdata, TIFFFileName(tif), emsg);
+		ok = 0;
+    }
+
+    return (ok);
+}
+
+/*
+ * Read a whole tile off data from the file, and convert to RGBA form.
+ * The returned RGBA data is organized from bottom to top of tile,
+ * and may include zeroed areas if the tile extends off the image.
+ */
+
+int
+TIFFReadRGBATile(TIFF* tif, uint32 col, uint32 row, uint32 * raster)
+
+{
+    char 	emsg[1024] = "";
+    TIFFRGBAImage img;
+    int 	ok;
+    uint32	tile_xsize, tile_ysize;
+    uint32	read_xsize, read_ysize;
+    uint32	i_row;
+
+    /*
+     * Verify that our request is legal - on a tile file, and on a
+     * tile boundary.
+     */
+
+    if( !TIFFIsTiled( tif ) )
+    {
+		TIFFErrorExt(tif->tif_clientdata, TIFFFileName(tif),
+				  "Can't use TIFFReadRGBATile() with stripped file.");
+		return (0);
+    }
+
+    TIFFGetFieldDefaulted(tif, TIFFTAG_TILEWIDTH, &tile_xsize);
+    TIFFGetFieldDefaulted(tif, TIFFTAG_TILELENGTH, &tile_ysize);
+    if( (col % tile_xsize) != 0 || (row % tile_ysize) != 0 )
+    {
+		TIFFErrorExt(tif->tif_clientdata, TIFFFileName(tif),
+                  "Row/col passed to TIFFReadRGBATile() must be top"
+                  "left corner of a tile.");
+	return (0);
+    }
+
+    /*
+     * Setup the RGBA reader.
+     */
+
+    if (!TIFFRGBAImageOK(tif, emsg)
+	|| !TIFFRGBAImageBegin(&img, tif, 0, emsg)) {
+	    TIFFErrorExt(tif->tif_clientdata, TIFFFileName(tif), emsg);
+	    return( 0 );
+    }
+
+    /*
+     * The TIFFRGBAImageGet() function doesn't allow us to get off the
+     * edge of the image, even to fill an otherwise valid tile.  So we
+     * figure out how much we can read, and fix up the tile buffer to
+     * a full tile configuration afterwards.
+     */
+
+    if( row + tile_ysize > img.height )
+        read_ysize = img.height - row;
+    else
+        read_ysize = tile_ysize;
+
+    if( col + tile_xsize > img.width )
+        read_xsize = img.width - col;
+    else
+        read_xsize = tile_xsize;
+
+    /*
+     * Read the chunk of imagery.
+     */
+
+    img.row_offset = row;
+    img.col_offset = col;
+
+    ok = TIFFRGBAImageGet(&img, raster, read_xsize, read_ysize );
+
+    TIFFRGBAImageEnd(&img);
+
+    /*
+     * If our read was incomplete we will need to fix up the tile by
+     * shifting the data around as if a full tile of data is being returned.
+     *
+     * This is all the more complicated because the image is organized in
+     * bottom to top format.
+     */
+
+    if( read_xsize == tile_xsize && read_ysize == tile_ysize )
+        return( ok );
+
+    for( i_row = 0; i_row < read_ysize; i_row++ ) {
+        memmove( raster + (tile_ysize - i_row - 1) * tile_xsize,
+                 raster + (read_ysize - i_row - 1) * read_xsize,
+                 read_xsize * sizeof(uint32) );
+        _TIFFmemset( raster + (tile_ysize - i_row - 1) * tile_xsize+read_xsize,
+                     0, sizeof(uint32) * (tile_xsize - read_xsize) );
+    }
+
+    for( i_row = read_ysize; i_row < tile_ysize; i_row++ ) {
+        _TIFFmemset( raster + (tile_ysize - i_row - 1) * tile_xsize,
+                     0, sizeof(uint32) * tile_xsize );
+    }
+
+    return (ok);
+}
+
+/* vim: set ts=8 sts=8 sw=8 noet: */
diff --git a/uppsrc/plugin/tif/lib/tif_jpeg.c b/uppsrc/plugin/tif/lib/tif_jpeg.c
new file mode 100644
index 000000000..ba6ffe3da
--- /dev/null
+++ b/uppsrc/plugin/tif/lib/tif_jpeg.c
@@ -0,0 +1,1942 @@
+/* $Id: tif_jpeg.c,v 1.45 2006/03/16 12:38:24 dron Exp $ */
+
+/*
+ * Copyright (c) 1994-1997 Sam Leffler
+ * Copyright (c) 1994-1997 Silicon Graphics, Inc.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and
+ * its documentation for any purpose is hereby granted without fee, provided
+ * that (i) the above copyright notices and this permission notice appear in
+ * all copies of the software and related documentation, and (ii) the names of
+ * Sam Leffler and Silicon Graphics may not be used in any advertising or
+ * publicity relating to the software without the specific, prior written
+ * permission of Sam Leffler and Silicon Graphics.
+ *
+ * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+ * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
+ * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
+ * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+ * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
+ * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.
+ */
+
+#define WIN32_LEAN_AND_MEAN
+#define VC_EXTRALEAN
+
+#include "tiffiop.h"
+#ifdef JPEG_SUPPORT
+
+/*
+ * TIFF Library
+ *
+ * JPEG Compression support per TIFF Technical Note #2
+ * (*not* per the original TIFF 6.0 spec).
+ *
+ * This file is simply an interface to the libjpeg library written by
+ * the Independent JPEG Group.  You need release 5 or later of the IJG
+ * code, which you can find on the Internet at ftp.uu.net:/graphics/jpeg/.
+ *
+ * Contributed by Tom Lane <tgl@sss.pgh.pa.us>.
+ */
+#include <setjmp.h>
+
+int TIFFFillStrip(TIFF*, tstrip_t);
+int TIFFFillTile(TIFF*, ttile_t);
+
+/* We undefine FAR to avoid conflict with JPEG definition */
+
+#ifdef FAR
+#undef FAR
+#endif
+
+/*
+  Libjpeg's jmorecfg.h defines INT16 and INT32, but only if XMD_H is
+  not defined.  Unfortunately, the MinGW and Borland compilers include
+  a typedef for INT32, which causes a conflict.  MSVC does not include
+  a conficting typedef given the headers which are included.
+*/
+#if defined(__BORLANDC__) || defined(__MINGW32__)
+# define XMD_H 1
+#endif
+
+/*
+   The windows RPCNDR.H file defines boolean, but defines it with the
+   unsigned char size.  You should compile JPEG library using appropriate
+   definitions in jconfig.h header, but many users compile library in wrong
+   way. That causes errors of the following type:
+
+   "JPEGLib: JPEG parameter struct mismatch: library thinks size is 432,
+   caller expects 464"
+
+   For such users we wil fix the problem here. See install.doc file from
+   the JPEG library distribution for details.
+*/
+
+/* Define "boolean" as unsigned char, not int, per Windows custom. */
+#if defined(WIN32) && !defined(__MINGW32__)
+# ifndef __RPCNDR_H__            /* don't conflict if rpcndr.h already read */
+   typedef unsigned char boolean;
+# endif
+# define HAVE_BOOLEAN            /* prevent jmorecfg.h from redefining it */
+#endif
+
+#include "jpeglib.h"
+#include "jerror.h"
+
+/*
+ * We are using width_in_blocks which is supposed to be private to
+ * libjpeg. Unfortunately, the libjpeg delivered with Cygwin has
+ * renamed this member to width_in_data_units.  Since the header has
+ * also renamed a define, use that unique define name in order to
+ * detect the problem header and adjust to suit.
+ */
+#if defined(D_MAX_DATA_UNITS_IN_MCU)
+#define width_in_blocks width_in_data_units
+#endif
+
+/*
+ * On some machines it may be worthwhile to use _setjmp or sigsetjmp
+ * in place of plain setjmp.  These macros will make it easier.
+ */
+#define SETJMP(jbuf)		setjmp(jbuf)
+#define LONGJMP(jbuf,code)	longjmp(jbuf,code)
+#define JMP_BUF			jmp_buf
+
+typedef struct jpeg_destination_mgr jpeg_destination_mgr;
+typedef struct jpeg_source_mgr jpeg_source_mgr;
+typedef	struct jpeg_error_mgr jpeg_error_mgr;
+
+/*
+ * State block for each open TIFF file using
+ * libjpeg to do JPEG compression/decompression.
+ *
+ * libjpeg's visible state is either a jpeg_compress_struct
+ * or jpeg_decompress_struct depending on which way we
+ * are going.  comm can be used to refer to the fields
+ * which are common to both.
+ *
+ * NB: cinfo is required to be the first member of JPEGState,
+ *     so we can safely cast JPEGState* -> jpeg_xxx_struct*
+ *     and vice versa!
+ */
+typedef	struct {
+	union {
+		struct jpeg_compress_struct c;
+		struct jpeg_decompress_struct d;
+		struct jpeg_common_struct comm;
+	} cinfo;			/* NB: must be first */
+        int             cinfo_initialized;
+
+	jpeg_error_mgr	err;		/* libjpeg error manager */
+	JMP_BUF		exit_jmpbuf;	/* for catching libjpeg failures */
+	/*
+	 * The following two members could be a union, but
+	 * they're small enough that it's not worth the effort.
+	 */
+	jpeg_destination_mgr dest;	/* data dest for compression */
+	jpeg_source_mgr	src;		/* data source for decompression */
+					/* private state */
+	TIFF*		tif;		/* back link needed by some code */
+	uint16		photometric;	/* copy of PhotometricInterpretation */
+	uint16		h_sampling;	/* luminance sampling factors */
+	uint16		v_sampling;
+	tsize_t		bytesperline;	/* decompressed bytes per scanline */
+	/* pointers to intermediate buffers when processing downsampled data */
+	JSAMPARRAY	ds_buffer[MAX_COMPONENTS];
+	int		scancount;	/* number of "scanlines" accumulated */
+	int		samplesperclump;
+
+	TIFFVGetMethod	vgetparent;	/* super-class method */
+	TIFFVSetMethod	vsetparent;	/* super-class method */
+	TIFFStripMethod	defsparent;	/* super-class method */
+	TIFFTileMethod	deftparent;	/* super-class method */
+					/* pseudo-tag fields */
+	void*		jpegtables;	/* JPEGTables tag value, or NULL */
+	uint32		jpegtables_length; /* number of bytes in same */
+	int		jpegquality;	/* Compression quality level */
+	int		jpegcolormode;	/* Auto RGB<=>YCbCr convert? */
+	int		jpegtablesmode;	/* What to put in JPEGTables */
+
+        int             ycbcrsampling_fetched;
+	uint32		recvparams;	/* encoded Class 2 session params */
+	char*		subaddress;	/* subaddress string */
+	uint32		recvtime;	/* time spent receiving (secs) */
+	char*		faxdcs;		/* encoded fax parameters (DCS, Table 2/T.30) */
+} JPEGState;
+
+#define	JState(tif)	((JPEGState*)(tif)->tif_data)
+
+static	int JPEGDecode(TIFF*, tidata_t, tsize_t, tsample_t);
+static	int JPEGDecodeRaw(TIFF*, tidata_t, tsize_t, tsample_t);
+static	int JPEGEncode(TIFF*, tidata_t, tsize_t, tsample_t);
+static	int JPEGEncodeRaw(TIFF*, tidata_t, tsize_t, tsample_t);
+static  int JPEGInitializeLibJPEG( TIFF * tif,
+								   int force_encode, int force_decode );
+
+#define	FIELD_JPEGTABLES	(FIELD_CODEC+0)
+#define	FIELD_RECVPARAMS	(FIELD_CODEC+1)
+#define	FIELD_SUBADDRESS	(FIELD_CODEC+2)
+#define	FIELD_RECVTIME		(FIELD_CODEC+3)
+#define	FIELD_FAXDCS		(FIELD_CODEC+4)
+
+static const TIFFFieldInfo jpegFieldInfo[] = {
+    { TIFFTAG_JPEGTABLES,	 -3,-3,	TIFF_UNDEFINED,	FIELD_JPEGTABLES,
+      FALSE,	TRUE,	"JPEGTables" },
+    { TIFFTAG_JPEGQUALITY,	 0, 0,	TIFF_ANY,	FIELD_PSEUDO,
+      TRUE,	FALSE,	"" },
+    { TIFFTAG_JPEGCOLORMODE,	 0, 0,	TIFF_ANY,	FIELD_PSEUDO,
+      FALSE,	FALSE,	"" },
+    { TIFFTAG_JPEGTABLESMODE,	 0, 0,	TIFF_ANY,	FIELD_PSEUDO,
+      FALSE,	FALSE,	"" },
+    /* Specific for JPEG in faxes */
+    { TIFFTAG_FAXRECVPARAMS,	 1, 1, TIFF_LONG,	FIELD_RECVPARAMS,
+      TRUE,	FALSE,	"FaxRecvParams" },
+    { TIFFTAG_FAXSUBADDRESS,	-1,-1, TIFF_ASCII,	FIELD_SUBADDRESS,
+      TRUE,	FALSE,	"FaxSubAddress" },
+    { TIFFTAG_FAXRECVTIME,	 1, 1, TIFF_LONG,	FIELD_RECVTIME,
+      TRUE,	FALSE,	"FaxRecvTime" },
+    { TIFFTAG_FAXDCS,		-1, -1, TIFF_ASCII,	FIELD_FAXDCS,
+	  TRUE,	FALSE,	"FaxDcs" },
+};
+#define	N(a)	(sizeof (a) / sizeof (a[0]))
+
+/*
+ * libjpeg interface layer.
+ *
+ * We use setjmp/longjmp to return control to libtiff
+ * when a fatal error is encountered within the JPEG
+ * library.  We also direct libjpeg error and warning
+ * messages through the appropriate libtiff handlers.
+ */
+
+/*
+ * Error handling routines (these replace corresponding
+ * IJG routines from jerror.c).  These are used for both
+ * compression and decompression.
+ */
+static void
+TIFFjpeg_error_exit(j_common_ptr cinfo)
+{
+	JPEGState *sp = (JPEGState *) cinfo;	/* NB: cinfo assumed first */
+	char buffer[JMSG_LENGTH_MAX];
+
+	(*cinfo->err->format_message) (cinfo, buffer);
+	TIFFErrorExt(sp->tif->tif_clientdata, "JPEGLib", buffer);		/* display the error message */
+	jpeg_abort(cinfo);			/* clean up libjpeg state */
+	LONGJMP(sp->exit_jmpbuf, 1);		/* return to libtiff caller */
+}
+
+/*
+ * This routine is invoked only for warning messages,
+ * since error_exit does its own thing and trace_level
+ * is never set > 0.
+ */
+static void
+TIFFjpeg_output_message(j_common_ptr cinfo)
+{
+	char buffer[JMSG_LENGTH_MAX];
+
+	(*cinfo->err->format_message) (cinfo, buffer);
+	TIFFWarningExt(((JPEGState *) cinfo)->tif->tif_clientdata, "JPEGLib", buffer);
+}
+
+/*
+ * Interface routines.  This layer of routines exists
+ * primarily to limit side-effects from using setjmp.
+ * Also, normal/error returns are converted into return
+ * values per libtiff practice.
+ */
+#define	CALLJPEG(sp, fail, op)	(SETJMP((sp)->exit_jmpbuf) ? (fail) : (op))
+#define	CALLVJPEG(sp, op)	CALLJPEG(sp, 0, ((op),1))
+
+static int
+TIFFjpeg_create_compress(JPEGState* sp)
+{
+	/* initialize JPEG error handling */
+	sp->cinfo.c.err = jpeg_std_error(&sp->err);
+	sp->err.error_exit = TIFFjpeg_error_exit;
+	sp->err.output_message = TIFFjpeg_output_message;
+
+	return CALLVJPEG(sp, jpeg_create_compress(&sp->cinfo.c));
+}
+
+static int
+TIFFjpeg_create_decompress(JPEGState* sp)
+{
+	/* initialize JPEG error handling */
+	sp->cinfo.d.err = jpeg_std_error(&sp->err);
+	sp->err.error_exit = TIFFjpeg_error_exit;
+	sp->err.output_message = TIFFjpeg_output_message;
+
+	return CALLVJPEG(sp, jpeg_create_decompress(&sp->cinfo.d));
+}
+
+static int
+TIFFjpeg_set_defaults(JPEGState* sp)
+{
+	return CALLVJPEG(sp, jpeg_set_defaults(&sp->cinfo.c));
+}
+
+static int
+TIFFjpeg_set_colorspace(JPEGState* sp, J_COLOR_SPACE colorspace)
+{
+	return CALLVJPEG(sp, jpeg_set_colorspace(&sp->cinfo.c, colorspace));
+}
+
+static int
+TIFFjpeg_set_quality(JPEGState* sp, int quality, boolean force_baseline)
+{
+	return CALLVJPEG(sp,
+	    jpeg_set_quality(&sp->cinfo.c, quality, force_baseline));
+}
+
+static int
+TIFFjpeg_suppress_tables(JPEGState* sp, boolean suppress)
+{
+	return CALLVJPEG(sp, jpeg_suppress_tables(&sp->cinfo.c, suppress));
+}
+
+static int
+TIFFjpeg_start_compress(JPEGState* sp, boolean write_all_tables)
+{
+	return CALLVJPEG(sp,
+	    jpeg_start_compress(&sp->cinfo.c, write_all_tables));
+}
+
+static int
+TIFFjpeg_write_scanlines(JPEGState* sp, JSAMPARRAY scanlines, int num_lines)
+{
+	return CALLJPEG(sp, -1, (int) jpeg_write_scanlines(&sp->cinfo.c,
+	    scanlines, (JDIMENSION) num_lines));
+}
+
+static int
+TIFFjpeg_write_raw_data(JPEGState* sp, JSAMPIMAGE data, int num_lines)
+{
+	return CALLJPEG(sp, -1, (int) jpeg_write_raw_data(&sp->cinfo.c,
+	    data, (JDIMENSION) num_lines));
+}
+
+static int
+TIFFjpeg_finish_compress(JPEGState* sp)
+{
+	return CALLVJPEG(sp, jpeg_finish_compress(&sp->cinfo.c));
+}
+
+static int
+TIFFjpeg_write_tables(JPEGState* sp)
+{
+	return CALLVJPEG(sp, jpeg_write_tables(&sp->cinfo.c));
+}
+
+static int
+TIFFjpeg_read_header(JPEGState* sp, boolean require_image)
+{
+	return CALLJPEG(sp, -1, jpeg_read_header(&sp->cinfo.d, require_image));
+}
+
+static int
+TIFFjpeg_start_decompress(JPEGState* sp)
+{
+	return CALLVJPEG(sp, jpeg_start_decompress(&sp->cinfo.d));
+}
+
+static int
+TIFFjpeg_read_scanlines(JPEGState* sp, JSAMPARRAY scanlines, int max_lines)
+{
+	return CALLJPEG(sp, -1, (int) jpeg_read_scanlines(&sp->cinfo.d,
+	    scanlines, (JDIMENSION) max_lines));
+}
+
+static int
+TIFFjpeg_read_raw_data(JPEGState* sp, JSAMPIMAGE data, int max_lines)
+{
+	return CALLJPEG(sp, -1, (int) jpeg_read_raw_data(&sp->cinfo.d,
+	    data, (JDIMENSION) max_lines));
+}
+
+static int
+TIFFjpeg_finish_decompress(JPEGState* sp)
+{
+	return CALLJPEG(sp, -1, (int) jpeg_finish_decompress(&sp->cinfo.d));
+}
+
+static int
+TIFFjpeg_abort(JPEGState* sp)
+{
+	return CALLVJPEG(sp, jpeg_abort(&sp->cinfo.comm));
+}
+
+static int
+TIFFjpeg_destroy(JPEGState* sp)
+{
+	return CALLVJPEG(sp, jpeg_destroy(&sp->cinfo.comm));
+}
+
+static JSAMPARRAY
+TIFFjpeg_alloc_sarray(JPEGState* sp, int pool_id,
+		      JDIMENSION samplesperrow, JDIMENSION numrows)
+{
+	return CALLJPEG(sp, (JSAMPARRAY) NULL,
+	    (*sp->cinfo.comm.mem->alloc_sarray)
+		(&sp->cinfo.comm, pool_id, samplesperrow, numrows));
+}
+
+/*
+ * JPEG library destination data manager.
+ * These routines direct compressed data from libjpeg into the
+ * libtiff output buffer.
+ */
+
+static void
+std_init_destination(j_compress_ptr cinfo)
+{
+	JPEGState* sp = (JPEGState*) cinfo;
+	TIFF* tif = sp->tif;
+
+	sp->dest.next_output_byte = (JOCTET*) tif->tif_rawdata;
+	sp->dest.free_in_buffer = (size_t) tif->tif_rawdatasize;
+}
+
+static boolean
+std_empty_output_buffer(j_compress_ptr cinfo)
+{
+	JPEGState* sp = (JPEGState*) cinfo;
+	TIFF* tif = sp->tif;
+
+	/* the entire buffer has been filled */
+	tif->tif_rawcc = tif->tif_rawdatasize;
+	TIFFFlushData1(tif);
+	sp->dest.next_output_byte = (JOCTET*) tif->tif_rawdata;
+	sp->dest.free_in_buffer = (size_t) tif->tif_rawdatasize;
+
+	return (TRUE);
+}
+
+static void
+std_term_destination(j_compress_ptr cinfo)
+{
+	JPEGState* sp = (JPEGState*) cinfo;
+	TIFF* tif = sp->tif;
+
+	tif->tif_rawcp = (tidata_t) sp->dest.next_output_byte;
+	tif->tif_rawcc =
+	    tif->tif_rawdatasize - (tsize_t) sp->dest.free_in_buffer;
+	/* NB: libtiff does the final buffer flush */
+}
+
+static void
+TIFFjpeg_data_dest(JPEGState* sp, TIFF* tif)
+{
+	(void) tif;
+	sp->cinfo.c.dest = &sp->dest;
+	sp->dest.init_destination = std_init_destination;
+	sp->dest.empty_output_buffer = std_empty_output_buffer;
+	sp->dest.term_destination = std_term_destination;
+}
+
+/*
+ * Alternate destination manager for outputting to JPEGTables field.
+ */
+
+static void
+tables_init_destination(j_compress_ptr cinfo)
+{
+	JPEGState* sp = (JPEGState*) cinfo;
+
+	/* while building, jpegtables_length is allocated buffer size */
+	sp->dest.next_output_byte = (JOCTET*) sp->jpegtables;
+	sp->dest.free_in_buffer = (size_t) sp->jpegtables_length;
+}
+
+static boolean
+tables_empty_output_buffer(j_compress_ptr cinfo)
+{
+	JPEGState* sp = (JPEGState*) cinfo;
+	void* newbuf;
+
+	/* the entire buffer has been filled; enlarge it by 1000 bytes */
+	newbuf = _TIFFrealloc((tdata_t) sp->jpegtables,
+			      (tsize_t) (sp->jpegtables_length + 1000));
+	if (newbuf == NULL)
+		ERREXIT1(cinfo, JERR_OUT_OF_MEMORY, 100);
+	sp->dest.next_output_byte = (JOCTET*) newbuf + sp->jpegtables_length;
+	sp->dest.free_in_buffer = (size_t) 1000;
+	sp->jpegtables = newbuf;
+	sp->jpegtables_length += 1000;
+	return (TRUE);
+}
+
+static void
+tables_term_destination(j_compress_ptr cinfo)
+{
+	JPEGState* sp = (JPEGState*) cinfo;
+
+	/* set tables length to number of bytes actually emitted */
+	sp->jpegtables_length -= sp->dest.free_in_buffer;
+}
+
+static int
+TIFFjpeg_tables_dest(JPEGState* sp, TIFF* tif)
+{
+	(void) tif;
+	/*
+	 * Allocate a working buffer for building tables.
+	 * Initial size is 1000 bytes, which is usually adequate.
+	 */
+	if (sp->jpegtables)
+		_TIFFfree(sp->jpegtables);
+	sp->jpegtables_length = 1000;
+	sp->jpegtables = (void*) _TIFFmalloc((tsize_t) sp->jpegtables_length);
+	if (sp->jpegtables == NULL) {
+		sp->jpegtables_length = 0;
+		TIFFErrorExt(sp->tif->tif_clientdata, "TIFFjpeg_tables_dest", "No space for JPEGTables");
+		return (0);
+	}
+	sp->cinfo.c.dest = &sp->dest;
+	sp->dest.init_destination = tables_init_destination;
+	sp->dest.empty_output_buffer = tables_empty_output_buffer;
+	sp->dest.term_destination = tables_term_destination;
+	return (1);
+}
+
+/*
+ * JPEG library source data manager.
+ * These routines supply compressed data to libjpeg.
+ */
+
+static void
+std_init_source(j_decompress_ptr cinfo)
+{
+	JPEGState* sp = (JPEGState*) cinfo;
+	TIFF* tif = sp->tif;
+
+	sp->src.next_input_byte = (const JOCTET*) tif->tif_rawdata;
+	sp->src.bytes_in_buffer = (size_t) tif->tif_rawcc;
+}
+
+static boolean
+std_fill_input_buffer(j_decompress_ptr cinfo)
+{
+	JPEGState* sp = (JPEGState* ) cinfo;
+	static const JOCTET dummy_EOI[2] = { 0xFF, JPEG_EOI };
+
+	/*
+	 * Should never get here since entire strip/tile is
+	 * read into memory before the decompressor is called,
+	 * and thus was supplied by init_source.
+	 */
+	WARNMS(cinfo, JWRN_JPEG_EOF);
+	/* insert a fake EOI marker */
+	sp->src.next_input_byte = dummy_EOI;
+	sp->src.bytes_in_buffer = 2;
+	return (TRUE);
+}
+
+static void
+std_skip_input_data(j_decompress_ptr cinfo, long num_bytes)
+{
+	JPEGState* sp = (JPEGState*) cinfo;
+
+	if (num_bytes > 0) {
+		if (num_bytes > (long) sp->src.bytes_in_buffer) {
+			/* oops, buffer overrun */
+			(void) std_fill_input_buffer(cinfo);
+		} else {
+			sp->src.next_input_byte += (size_t) num_bytes;
+			sp->src.bytes_in_buffer -= (size_t) num_bytes;
+		}
+	}
+}
+
+static void
+std_term_source(j_decompress_ptr cinfo)
+{
+	/* No work necessary here */
+	/* Or must we update tif->tif_rawcp, tif->tif_rawcc ??? */
+	/* (if so, need empty tables_term_source!) */
+	(void) cinfo;
+}
+
+static void
+TIFFjpeg_data_src(JPEGState* sp, TIFF* tif)
+{
+	(void) tif;
+	sp->cinfo.d.src = &sp->src;
+	sp->src.init_source = std_init_source;
+	sp->src.fill_input_buffer = std_fill_input_buffer;
+	sp->src.skip_input_data = std_skip_input_data;
+	sp->src.resync_to_restart = jpeg_resync_to_restart;
+	sp->src.term_source = std_term_source;
+	sp->src.bytes_in_buffer = 0;		/* for safety */
+	sp->src.next_input_byte = NULL;
+}
+
+/*
+ * Alternate source manager for reading from JPEGTables.
+ * We can share all the code except for the init routine.
+ */
+
+static void
+tables_init_source(j_decompress_ptr cinfo)
+{
+	JPEGState* sp = (JPEGState*) cinfo;
+
+	sp->src.next_input_byte = (const JOCTET*) sp->jpegtables;
+	sp->src.bytes_in_buffer = (size_t) sp->jpegtables_length;
+}
+
+static void
+TIFFjpeg_tables_src(JPEGState* sp, TIFF* tif)
+{
+	TIFFjpeg_data_src(sp, tif);
+	sp->src.init_source = tables_init_source;
+}
+
+/*
+ * Allocate downsampled-data buffers needed for downsampled I/O.
+ * We use values computed in jpeg_start_compress or jpeg_start_decompress.
+ * We use libjpeg's allocator so that buffers will be released automatically
+ * when done with strip/tile.
+ * This is also a handy place to compute samplesperclump, bytesperline.
+ */
+static int
+alloc_downsampled_buffers(TIFF* tif, jpeg_component_info* comp_info,
+			  int num_components)
+{
+	JPEGState* sp = JState(tif);
+	int ci;
+	jpeg_component_info* compptr;
+	JSAMPARRAY buf;
+	int samples_per_clump = 0;
+
+	for (ci = 0, compptr = comp_info; ci < num_components;
+	     ci++, compptr++) {
+		samples_per_clump += compptr->h_samp_factor *
+			compptr->v_samp_factor;
+		buf = TIFFjpeg_alloc_sarray(sp, JPOOL_IMAGE,
+				compptr->width_in_blocks * DCTSIZE,
+				(JDIMENSION) (compptr->v_samp_factor*DCTSIZE));
+		if (buf == NULL)
+			return (0);
+		sp->ds_buffer[ci] = buf;
+	}
+	sp->samplesperclump = samples_per_clump;
+	return (1);
+}
+
+
+/*
+ * JPEG Decoding.
+ */
+
+static int
+JPEGSetupDecode(TIFF* tif)
+{
+	JPEGState* sp = JState(tif);
+	TIFFDirectory *td = &tif->tif_dir;
+
+        JPEGInitializeLibJPEG( tif, 0, 1 );
+
+	assert(sp != NULL);
+	assert(sp->cinfo.comm.is_decompressor);
+
+	/* Read JPEGTables if it is present */
+	if (TIFFFieldSet(tif,FIELD_JPEGTABLES)) {
+		TIFFjpeg_tables_src(sp, tif);
+		if(TIFFjpeg_read_header(sp,FALSE) != JPEG_HEADER_TABLES_ONLY) {
+			TIFFErrorExt(tif->tif_clientdata, "JPEGSetupDecode", "Bogus JPEGTables field");
+			return (0);
+		}
+	}
+
+	/* Grab parameters that are same for all strips/tiles */
+	sp->photometric = td->td_photometric;
+	switch (sp->photometric) {
+	case PHOTOMETRIC_YCBCR:
+		sp->h_sampling = td->td_ycbcrsubsampling[0];
+		sp->v_sampling = td->td_ycbcrsubsampling[1];
+		break;
+	default:
+		/* TIFF 6.0 forbids subsampling of all other color spaces */
+		sp->h_sampling = 1;
+		sp->v_sampling = 1;
+		break;
+	}
+
+	/* Set up for reading normal data */
+	TIFFjpeg_data_src(sp, tif);
+	tif->tif_postdecode = _TIFFNoPostDecode; /* override byte swapping */
+	return (1);
+}
+
+/*
+ * Set up for decoding a strip or tile.
+ */
+static int
+JPEGPreDecode(TIFF* tif, tsample_t s)
+{
+	JPEGState *sp = JState(tif);
+	TIFFDirectory *td = &tif->tif_dir;
+	static const char module[] = "JPEGPreDecode";
+	uint32 segment_width, segment_height;
+	int downsampled_output;
+	int ci;
+
+	assert(sp != NULL);
+	assert(sp->cinfo.comm.is_decompressor);
+	/*
+	 * Reset decoder state from any previous strip/tile,
+	 * in case application didn't read the whole strip.
+	 */
+	if (!TIFFjpeg_abort(sp))
+		return (0);
+	/*
+	 * Read the header for this strip/tile.
+	 */
+	if (TIFFjpeg_read_header(sp, TRUE) != JPEG_HEADER_OK)
+		return (0);
+	/*
+	 * Check image parameters and set decompression parameters.
+	 */
+	segment_width = td->td_imagewidth;
+	segment_height = td->td_imagelength - tif->tif_row;
+	if (isTiled(tif)) {
+                segment_width = td->td_tilewidth;
+                segment_height = td->td_tilelength;
+		sp->bytesperline = TIFFTileRowSize(tif);
+	} else {
+		if (segment_height > td->td_rowsperstrip)
+			segment_height = td->td_rowsperstrip;
+		sp->bytesperline = TIFFScanlineSize(tif);
+	}
+	if (td->td_planarconfig == PLANARCONFIG_SEPARATE && s > 0) {
+		/*
+		 * For PC 2, scale down the expected strip/tile size
+		 * to match a downsampled component
+		 */
+		segment_width = TIFFhowmany(segment_width, sp->h_sampling);
+		segment_height = TIFFhowmany(segment_height, sp->v_sampling);
+	}
+	if (sp->cinfo.d.image_width != segment_width ||
+	    sp->cinfo.d.image_height != segment_height) {
+		TIFFWarningExt(tif->tif_clientdata, module,
+                 "Improper JPEG strip/tile size, expected %dx%d, got %dx%d",
+                          segment_width,
+                          segment_height,
+                          sp->cinfo.d.image_width,
+                          sp->cinfo.d.image_height);
+	}
+	if (sp->cinfo.d.num_components !=
+	    (td->td_planarconfig == PLANARCONFIG_CONTIG ?
+	     td->td_samplesperpixel : 1)) {
+		TIFFErrorExt(tif->tif_clientdata, module, "Improper JPEG component count");
+		return (0);
+	}
+#ifdef JPEG_LIB_MK1
+	if (12 != td->td_bitspersample && 8 != td->td_bitspersample) {
+			TIFFErrorExt(tif->tif_clientdata, module, "Improper JPEG data precision");
+            return (0);
+	}
+        sp->cinfo.d.data_precision = td->td_bitspersample;
+        sp->cinfo.d.bits_in_jsample = td->td_bitspersample;
+#else
+	if (sp->cinfo.d.data_precision != td->td_bitspersample) {
+			TIFFErrorExt(tif->tif_clientdata, module, "Improper JPEG data precision");
+            return (0);
+	}
+#endif
+	if (td->td_planarconfig == PLANARCONFIG_CONTIG) {
+		/* Component 0 should have expected sampling factors */
+		if (sp->cinfo.d.comp_info[0].h_samp_factor != sp->h_sampling ||
+		    sp->cinfo.d.comp_info[0].v_samp_factor != sp->v_sampling) {
+				TIFFWarningExt(tif->tif_clientdata, module,
+                                    "Improper JPEG sampling factors %d,%d\n"
+                                    "Apparently should be %d,%d.",
+                                    sp->cinfo.d.comp_info[0].h_samp_factor,
+                                    sp->cinfo.d.comp_info[0].v_samp_factor,
+                                    sp->h_sampling, sp->v_sampling);
+
+			    /*
+			     * XXX: Files written by the Intergraph software
+			     * has different sampling factors stored in the
+			     * TIFF tags and in the JPEG structures. We will
+			     * try to deduce Intergraph files by the presense
+			     * of the tag 33918.
+			     */
+			    if (!_TIFFFindFieldInfo(tif, 33918, TIFF_ANY)) {
+					TIFFWarningExt(tif->tif_clientdata, module,
+					"Decompressor will try reading with "
+					"sampling %d,%d.",
+					sp->cinfo.d.comp_info[0].h_samp_factor,
+					sp->cinfo.d.comp_info[0].v_samp_factor);
+
+				    sp->h_sampling = (uint16)
+					sp->cinfo.d.comp_info[0].h_samp_factor;
+				    sp->v_sampling = (uint16)
+					sp->cinfo.d.comp_info[0].v_samp_factor;
+			    }
+		}
+		/* Rest should have sampling factors 1,1 */
+		for (ci = 1; ci < sp->cinfo.d.num_components; ci++) {
+			if (sp->cinfo.d.comp_info[ci].h_samp_factor != 1 ||
+			    sp->cinfo.d.comp_info[ci].v_samp_factor != 1) {
+				TIFFErrorExt(tif->tif_clientdata, module, "Improper JPEG sampling factors");
+				return (0);
+			}
+		}
+	} else {
+		/* PC 2's single component should have sampling factors 1,1 */
+		if (sp->cinfo.d.comp_info[0].h_samp_factor != 1 ||
+		    sp->cinfo.d.comp_info[0].v_samp_factor != 1) {
+			TIFFErrorExt(tif->tif_clientdata, module, "Improper JPEG sampling factors");
+			return (0);
+		}
+	}
+	downsampled_output = FALSE;
+	if (td->td_planarconfig == PLANARCONFIG_CONTIG &&
+	    sp->photometric == PHOTOMETRIC_YCBCR &&
+	    sp->jpegcolormode == JPEGCOLORMODE_RGB) {
+	/* Convert YCbCr to RGB */
+		sp->cinfo.d.jpeg_color_space = JCS_YCbCr;
+		sp->cinfo.d.out_color_space = JCS_RGB;
+	} else {
+			/* Suppress colorspace handling */
+		sp->cinfo.d.jpeg_color_space = JCS_UNKNOWN;
+		sp->cinfo.d.out_color_space = JCS_UNKNOWN;
+		if (td->td_planarconfig == PLANARCONFIG_CONTIG &&
+		    (sp->h_sampling != 1 || sp->v_sampling != 1))
+			downsampled_output = TRUE;
+		/* XXX what about up-sampling? */
+	}
+	if (downsampled_output) {
+		/* Need to use raw-data interface to libjpeg */
+		sp->cinfo.d.raw_data_out = TRUE;
+		tif->tif_decoderow = JPEGDecodeRaw;
+		tif->tif_decodestrip = JPEGDecodeRaw;
+		tif->tif_decodetile = JPEGDecodeRaw;
+	} else {
+		/* Use normal interface to libjpeg */
+		sp->cinfo.d.raw_data_out = FALSE;
+		tif->tif_decoderow = JPEGDecode;
+		tif->tif_decodestrip = JPEGDecode;
+		tif->tif_decodetile = JPEGDecode;
+	}
+	/* Start JPEG decompressor */
+	if (!TIFFjpeg_start_decompress(sp))
+		return (0);
+	/* Allocate downsampled-data buffers if needed */
+	if (downsampled_output) {
+		if (!alloc_downsampled_buffers(tif, sp->cinfo.d.comp_info,
+					       sp->cinfo.d.num_components))
+			return (0);
+		sp->scancount = DCTSIZE;	/* mark buffer empty */
+	}
+	return (1);
+}
+
+/*
+ * Decode a chunk of pixels.
+ * "Standard" case: returned data is not downsampled.
+ */
+/*ARGSUSED*/ static int
+JPEGDecode(TIFF* tif, tidata_t buf, tsize_t cc, tsample_t s)
+{
+    JPEGState *sp = JState(tif);
+    tsize_t nrows;
+    (void) s;
+
+    nrows = cc / sp->bytesperline;
+    if (cc % sp->bytesperline)
+		TIFFWarningExt(tif->tif_clientdata, tif->tif_name, "fractional scanline not read");
+
+    if( nrows > (int) sp->cinfo.d.image_height )
+        nrows = sp->cinfo.d.image_height;
+
+    /* data is expected to be read in multiples of a scanline */
+    if (nrows)
+    {
+        JSAMPROW line_work_buf = NULL;
+
+        /*
+        ** For 6B, only use temporary buffer for 12 bit imagery.
+        ** For Mk1 always use it.
+        */
+#if !defined(JPEG_LIB_MK1)
+        if( sp->cinfo.d.data_precision == 12 )
+#endif
+        {
+            line_work_buf = (JSAMPROW)
+                _TIFFmalloc(sizeof(short) * sp->cinfo.d.output_width
+                            * sp->cinfo.d.num_components );
+        }
+
+        do {
+            if( line_work_buf != NULL )
+            {
+                /*
+                ** In the MK1 case, we aways read into a 16bit buffer, and then
+                ** pack down to 12bit or 8bit.  In 6B case we only read into 16
+                ** bit buffer for 12bit data, which we need to repack.
+                */
+                if (TIFFjpeg_read_scanlines(sp, &line_work_buf, 1) != 1)
+                    return (0);
+
+                if( sp->cinfo.d.data_precision == 12 )
+                {
+                    int value_pairs = (sp->cinfo.d.output_width
+                                       * sp->cinfo.d.num_components) / 2;
+                    int iPair;
+
+                    for( iPair = 0; iPair < value_pairs; iPair++ )
+                    {
+                        unsigned char *out_ptr =
+                            ((unsigned char *) buf) + iPair * 3;
+                        JSAMPLE *in_ptr = line_work_buf + iPair * 2;
+
+                        out_ptr[0] = (in_ptr[0] & 0xff0) >> 4;
+                        out_ptr[1] = ((in_ptr[0] & 0xf) << 4)
+                            | ((in_ptr[1] & 0xf00) >> 8);
+                        out_ptr[2] = ((in_ptr[1] & 0xff) >> 0);
+                    }
+                }
+                else if( sp->cinfo.d.data_precision == 8 )
+                {
+                    int value_count = (sp->cinfo.d.output_width
+                                       * sp->cinfo.d.num_components);
+                    int iValue;
+
+                    for( iValue = 0; iValue < value_count; iValue++ )
+                    {
+                        ((unsigned char *) buf)[iValue] =
+                            line_work_buf[iValue] & 0xff;
+                    }
+                }
+            }
+            else
+            {
+                /*
+                ** In the libjpeg6b 8bit case.  We read directly into the
+                ** TIFF buffer.
+                */
+                JSAMPROW bufptr = (JSAMPROW)buf;
+
+                if (TIFFjpeg_read_scanlines(sp, &bufptr, 1) != 1)
+                    return (0);
+            }
+
+            ++tif->tif_row;
+            buf += sp->bytesperline;
+            cc -= sp->bytesperline;
+        } while (--nrows > 0);
+
+        if( line_work_buf != NULL )
+            _TIFFfree( line_work_buf );
+    }
+
+    /* Close down the decompressor if we've finished the strip or tile. */
+    return sp->cinfo.d.output_scanline < sp->cinfo.d.output_height
+        || TIFFjpeg_finish_decompress(sp);
+}
+
+/*
+ * Decode a chunk of pixels.
+ * Returned data is downsampled per sampling factors.
+ */
+/*ARGSUSED*/ static int
+JPEGDecodeRaw(TIFF* tif, tidata_t buf, tsize_t cc, tsample_t s)
+{
+    JPEGState *sp = JState(tif);
+    tsize_t nrows;
+    (void) s;
+
+    /* data is expected to be read in multiples of a scanline */
+    if ( (nrows = sp->cinfo.d.image_height) ) {
+        /* Cb,Cr both have sampling factors 1, so this is correct */
+        JDIMENSION clumps_per_line = sp->cinfo.d.comp_info[1].downsampled_width;
+        int samples_per_clump = sp->samplesperclump;
+
+#ifdef JPEG_LIB_MK1
+        unsigned short* tmpbuf = _TIFFmalloc(sizeof(unsigned short) *
+                                             sp->cinfo.d.output_width *
+                                             sp->cinfo.d.num_components);
+#endif
+
+        do {
+            jpeg_component_info *compptr;
+            int ci, clumpoffset;
+
+            /* Reload downsampled-data buffer if needed */
+            if (sp->scancount >= DCTSIZE) {
+                int n = sp->cinfo.d.max_v_samp_factor * DCTSIZE;
+                if (TIFFjpeg_read_raw_data(sp, sp->ds_buffer, n)
+                    != n)
+                    return (0);
+                sp->scancount = 0;
+            }
+            /*
+             * Fastest way to unseparate data is to make one pass
+             * over the scanline for each row of each component.
+             */
+            clumpoffset = 0;	/* first sample in clump */
+            for (ci = 0, compptr = sp->cinfo.d.comp_info;
+                 ci < sp->cinfo.d.num_components;
+                 ci++, compptr++) {
+                int hsamp = compptr->h_samp_factor;
+                int vsamp = compptr->v_samp_factor;
+                int ypos;
+
+                for (ypos = 0; ypos < vsamp; ypos++) {
+                    JSAMPLE *inptr = sp->ds_buffer[ci][sp->scancount*vsamp + ypos];
+#ifdef JPEG_LIB_MK1
+                    JSAMPLE *outptr = (JSAMPLE*)tmpbuf + clumpoffset;
+#else
+                    JSAMPLE *outptr = (JSAMPLE*)buf + clumpoffset;
+#endif
+                    JDIMENSION nclump;
+
+                    if (hsamp == 1) {
+                        /* fast path for at least Cb and Cr */
+                        for (nclump = clumps_per_line; nclump-- > 0; ) {
+                            outptr[0] = *inptr++;
+                            outptr += samples_per_clump;
+                        }
+                    } else {
+                        int xpos;
+
+                        /* general case */
+                        for (nclump = clumps_per_line; nclump-- > 0; ) {
+                            for (xpos = 0; xpos < hsamp; xpos++)
+                                outptr[xpos] = *inptr++;
+                            outptr += samples_per_clump;
+                        }
+                    }
+                    clumpoffset += hsamp;
+                }
+            }
+
+#ifdef JPEG_LIB_MK1
+            {
+                if (sp->cinfo.d.data_precision == 8)
+                {
+                    int i=0;
+                    int len = sp->cinfo.d.output_width * sp->cinfo.d.num_components;
+                    for (i=0; i<len; i++)
+                    {
+                        ((unsigned char*)buf)[i] = tmpbuf[i] & 0xff;
+                    }
+                }
+                else
+                {         // 12-bit
+                    int value_pairs = (sp->cinfo.d.output_width
+                                       * sp->cinfo.d.num_components) / 2;
+                    int iPair;
+                    for( iPair = 0; iPair < value_pairs; iPair++ )
+                    {
+                        unsigned char *out_ptr = ((unsigned char *) buf) + iPair * 3;
+                        JSAMPLE *in_ptr = tmpbuf + iPair * 2;
+                        out_ptr[0] = (in_ptr[0] & 0xff0) >> 4;
+                        out_ptr[1] = ((in_ptr[0] & 0xf) << 4)
+                            | ((in_ptr[1] & 0xf00) >> 8);
+                        out_ptr[2] = ((in_ptr[1] & 0xff) >> 0);
+                    }
+                }
+            }
+#endif
+
+            ++sp->scancount;
+            ++tif->tif_row;
+            buf += sp->bytesperline;
+            cc -= sp->bytesperline;
+        } while (--nrows > 0);
+
+#ifdef JPEG_LIB_MK1
+        _TIFFfree(tmpbuf);
+#endif
+
+    }
+
+    /* Close down the decompressor if done. */
+    return sp->cinfo.d.output_scanline < sp->cinfo.d.output_height
+        || TIFFjpeg_finish_decompress(sp);
+}
+
+
+/*
+ * JPEG Encoding.
+ */
+
+static void
+unsuppress_quant_table (JPEGState* sp, int tblno)
+{
+	JQUANT_TBL* qtbl;
+
+	if ((qtbl = sp->cinfo.c.quant_tbl_ptrs[tblno]) != NULL)
+		qtbl->sent_table = FALSE;
+}
+
+static void
+unsuppress_huff_table (JPEGState* sp, int tblno)
+{
+	JHUFF_TBL* htbl;
+
+	if ((htbl = sp->cinfo.c.dc_huff_tbl_ptrs[tblno]) != NULL)
+		htbl->sent_table = FALSE;
+	if ((htbl = sp->cinfo.c.ac_huff_tbl_ptrs[tblno]) != NULL)
+		htbl->sent_table = FALSE;
+}
+
+static int
+prepare_JPEGTables(TIFF* tif)
+{
+	JPEGState* sp = JState(tif);
+
+        JPEGInitializeLibJPEG( tif, 0, 0 );
+
+	/* Initialize quant tables for current quality setting */
+	if (!TIFFjpeg_set_quality(sp, sp->jpegquality, FALSE))
+		return (0);
+	/* Mark only the tables we want for output */
+	/* NB: chrominance tables are currently used only with YCbCr */
+	if (!TIFFjpeg_suppress_tables(sp, TRUE))
+		return (0);
+	if (sp->jpegtablesmode & JPEGTABLESMODE_QUANT) {
+		unsuppress_quant_table(sp, 0);
+		if (sp->photometric == PHOTOMETRIC_YCBCR)
+			unsuppress_quant_table(sp, 1);
+	}
+	if (sp->jpegtablesmode & JPEGTABLESMODE_HUFF) {
+		unsuppress_huff_table(sp, 0);
+		if (sp->photometric == PHOTOMETRIC_YCBCR)
+			unsuppress_huff_table(sp, 1);
+	}
+	/* Direct libjpeg output into jpegtables */
+	if (!TIFFjpeg_tables_dest(sp, tif))
+		return (0);
+	/* Emit tables-only datastream */
+	if (!TIFFjpeg_write_tables(sp))
+		return (0);
+
+	return (1);
+}
+
+static int
+JPEGSetupEncode(TIFF* tif)
+{
+	JPEGState* sp = JState(tif);
+	TIFFDirectory *td = &tif->tif_dir;
+	static const char module[] = "JPEGSetupEncode";
+
+        JPEGInitializeLibJPEG( tif, 1, 0 );
+
+	assert(sp != NULL);
+	assert(!sp->cinfo.comm.is_decompressor);
+
+	/*
+	 * Initialize all JPEG parameters to default values.
+	 * Note that jpeg_set_defaults needs legal values for
+	 * in_color_space and input_components.
+	 */
+	sp->cinfo.c.in_color_space = JCS_UNKNOWN;
+	sp->cinfo.c.input_components = 1;
+	if (!TIFFjpeg_set_defaults(sp))
+		return (0);
+	/* Set per-file parameters */
+	sp->photometric = td->td_photometric;
+	switch (sp->photometric) {
+	case PHOTOMETRIC_YCBCR:
+		sp->h_sampling = td->td_ycbcrsubsampling[0];
+		sp->v_sampling = td->td_ycbcrsubsampling[1];
+		/*
+		 * A ReferenceBlackWhite field *must* be present since the
+		 * default value is inappropriate for YCbCr.  Fill in the
+		 * proper value if application didn't set it.
+		 */
+		{
+			float *ref;
+			if (!TIFFGetField(tif, TIFFTAG_REFERENCEBLACKWHITE,
+					  &ref)) {
+				float refbw[6];
+				long top = 1L << td->td_bitspersample;
+				refbw[0] = 0;
+				refbw[1] = (float)(top-1L);
+				refbw[2] = (float)(top>>1);
+				refbw[3] = refbw[1];
+				refbw[4] = refbw[2];
+				refbw[5] = refbw[1];
+				TIFFSetField(tif, TIFFTAG_REFERENCEBLACKWHITE,
+					     refbw);
+			}
+		}
+		break;
+	case PHOTOMETRIC_PALETTE:		/* disallowed by Tech Note */
+	case PHOTOMETRIC_MASK:
+		TIFFErrorExt(tif->tif_clientdata, module,
+			  "PhotometricInterpretation %d not allowed for JPEG",
+			  (int) sp->photometric);
+		return (0);
+	default:
+		/* TIFF 6.0 forbids subsampling of all other color spaces */
+		sp->h_sampling = 1;
+		sp->v_sampling = 1;
+		break;
+	}
+
+	/* Verify miscellaneous parameters */
+
+	/*
+	 * This would need work if libtiff ever supports different
+	 * depths for different components, or if libjpeg ever supports
+	 * run-time selection of depth.  Neither is imminent.
+	 */
+#ifdef JPEG_LIB_MK1
+        /* BITS_IN_JSAMPLE now permits 8 and 12 --- dgilbert */
+	if (td->td_bitspersample != 8 && td->td_bitspersample != 12)
+#else
+	if (td->td_bitspersample != BITS_IN_JSAMPLE )
+#endif
+        {
+		TIFFErrorExt(tif->tif_clientdata, module, "BitsPerSample %d not allowed for JPEG",
+			  (int) td->td_bitspersample);
+		return (0);
+	}
+	sp->cinfo.c.data_precision = td->td_bitspersample;
+#ifdef JPEG_LIB_MK1
+        sp->cinfo.c.bits_in_jsample = td->td_bitspersample;
+#endif
+	if (isTiled(tif)) {
+		if ((td->td_tilelength % (sp->v_sampling * DCTSIZE)) != 0) {
+			TIFFErrorExt(tif->tif_clientdata, module,
+				  "JPEG tile height must be multiple of %d",
+				  sp->v_sampling * DCTSIZE);
+			return (0);
+		}
+		if ((td->td_tilewidth % (sp->h_sampling * DCTSIZE)) != 0) {
+			TIFFErrorExt(tif->tif_clientdata, module,
+				  "JPEG tile width must be multiple of %d",
+				  sp->h_sampling * DCTSIZE);
+			return (0);
+		}
+	} else {
+		if (td->td_rowsperstrip < td->td_imagelength &&
+		    (td->td_rowsperstrip % (sp->v_sampling * DCTSIZE)) != 0) {
+			TIFFErrorExt(tif->tif_clientdata, module,
+				  "RowsPerStrip must be multiple of %d for JPEG",
+				  sp->v_sampling * DCTSIZE);
+			return (0);
+		}
+	}
+
+	/* Create a JPEGTables field if appropriate */
+	if (sp->jpegtablesmode & (JPEGTABLESMODE_QUANT|JPEGTABLESMODE_HUFF)) {
+		if (!prepare_JPEGTables(tif))
+			return (0);
+		/* Mark the field present */
+		/* Can't use TIFFSetField since BEENWRITING is already set! */
+		TIFFSetFieldBit(tif, FIELD_JPEGTABLES);
+		tif->tif_flags |= TIFF_DIRTYDIRECT;
+	} else {
+		/* We do not support application-supplied JPEGTables, */
+		/* so mark the field not present */
+		TIFFClrFieldBit(tif, FIELD_JPEGTABLES);
+	}
+
+	/* Direct libjpeg output to libtiff's output buffer */
+	TIFFjpeg_data_dest(sp, tif);
+
+	return (1);
+}
+
+/*
+ * Set encoding state at the start of a strip or tile.
+ */
+static int
+JPEGPreEncode(TIFF* tif, tsample_t s)
+{
+	JPEGState *sp = JState(tif);
+	TIFFDirectory *td = &tif->tif_dir;
+	static const char module[] = "JPEGPreEncode";
+	uint32 segment_width, segment_height;
+	int downsampled_input;
+
+	assert(sp != NULL);
+	assert(!sp->cinfo.comm.is_decompressor);
+	/*
+	 * Set encoding parameters for this strip/tile.
+	 */
+	if (isTiled(tif)) {
+		segment_width = td->td_tilewidth;
+		segment_height = td->td_tilelength;
+		sp->bytesperline = TIFFTileRowSize(tif);
+	} else {
+		segment_width = td->td_imagewidth;
+		segment_height = td->td_imagelength - tif->tif_row;
+		if (segment_height > td->td_rowsperstrip)
+			segment_height = td->td_rowsperstrip;
+		sp->bytesperline = TIFFScanlineSize(tif);
+	}
+	if (td->td_planarconfig == PLANARCONFIG_SEPARATE && s > 0) {
+		/* for PC 2, scale down the strip/tile size
+		 * to match a downsampled component
+		 */
+		segment_width = TIFFhowmany(segment_width, sp->h_sampling);
+		segment_height = TIFFhowmany(segment_height, sp->v_sampling);
+	}
+	if (segment_width > 65535 || segment_height > 65535) {
+		TIFFErrorExt(tif->tif_clientdata, module, "Strip/tile too large for JPEG");
+		return (0);
+	}
+	sp->cinfo.c.image_width = segment_width;
+	sp->cinfo.c.image_height = segment_height;
+	downsampled_input = FALSE;
+	if (td->td_planarconfig == PLANARCONFIG_CONTIG) {
+		sp->cinfo.c.input_components = td->td_samplesperpixel;
+		if (sp->photometric == PHOTOMETRIC_YCBCR) {
+			if (sp->jpegcolormode == JPEGCOLORMODE_RGB) {
+				sp->cinfo.c.in_color_space = JCS_RGB;
+			} else {
+				sp->cinfo.c.in_color_space = JCS_YCbCr;
+				if (sp->h_sampling != 1 || sp->v_sampling != 1)
+					downsampled_input = TRUE;
+			}
+			if (!TIFFjpeg_set_colorspace(sp, JCS_YCbCr))
+				return (0);
+			/*
+			 * Set Y sampling factors;
+			 * we assume jpeg_set_colorspace() set the rest to 1
+			 */
+			sp->cinfo.c.comp_info[0].h_samp_factor = sp->h_sampling;
+			sp->cinfo.c.comp_info[0].v_samp_factor = sp->v_sampling;
+		} else {
+			sp->cinfo.c.in_color_space = JCS_UNKNOWN;
+			if (!TIFFjpeg_set_colorspace(sp, JCS_UNKNOWN))
+				return (0);
+			/* jpeg_set_colorspace set all sampling factors to 1 */
+		}
+	} else {
+		sp->cinfo.c.input_components = 1;
+		sp->cinfo.c.in_color_space = JCS_UNKNOWN;
+		if (!TIFFjpeg_set_colorspace(sp, JCS_UNKNOWN))
+			return (0);
+		sp->cinfo.c.comp_info[0].component_id = s;
+		/* jpeg_set_colorspace() set sampling factors to 1 */
+		if (sp->photometric == PHOTOMETRIC_YCBCR && s > 0) {
+			sp->cinfo.c.comp_info[0].quant_tbl_no = 1;
+			sp->cinfo.c.comp_info[0].dc_tbl_no = 1;
+			sp->cinfo.c.comp_info[0].ac_tbl_no = 1;
+		}
+	}
+	/* ensure libjpeg won't write any extraneous markers */
+	sp->cinfo.c.write_JFIF_header = FALSE;
+	sp->cinfo.c.write_Adobe_marker = FALSE;
+	/* set up table handling correctly */
+	if (! (sp->jpegtablesmode & JPEGTABLESMODE_QUANT)) {
+		if (!TIFFjpeg_set_quality(sp, sp->jpegquality, FALSE))
+			return (0);
+		unsuppress_quant_table(sp, 0);
+		unsuppress_quant_table(sp, 1);
+	}
+	if (sp->jpegtablesmode & JPEGTABLESMODE_HUFF)
+		sp->cinfo.c.optimize_coding = FALSE;
+	else
+		sp->cinfo.c.optimize_coding = TRUE;
+	if (downsampled_input) {
+		/* Need to use raw-data interface to libjpeg */
+		sp->cinfo.c.raw_data_in = TRUE;
+		tif->tif_encoderow = JPEGEncodeRaw;
+		tif->tif_encodestrip = JPEGEncodeRaw;
+		tif->tif_encodetile = JPEGEncodeRaw;
+	} else {
+		/* Use normal interface to libjpeg */
+		sp->cinfo.c.raw_data_in = FALSE;
+		tif->tif_encoderow = JPEGEncode;
+		tif->tif_encodestrip = JPEGEncode;
+		tif->tif_encodetile = JPEGEncode;
+	}
+	/* Start JPEG compressor */
+	if (!TIFFjpeg_start_compress(sp, FALSE))
+		return (0);
+	/* Allocate downsampled-data buffers if needed */
+	if (downsampled_input) {
+		if (!alloc_downsampled_buffers(tif, sp->cinfo.c.comp_info,
+					       sp->cinfo.c.num_components))
+			return (0);
+	}
+	sp->scancount = 0;
+
+	return (1);
+}
+
+/*
+ * Encode a chunk of pixels.
+ * "Standard" case: incoming data is not downsampled.
+ */
+static int
+JPEGEncode(TIFF* tif, tidata_t buf, tsize_t cc, tsample_t s)
+{
+	JPEGState *sp = JState(tif);
+	tsize_t nrows;
+	JSAMPROW bufptr[1];
+
+	(void) s;
+	assert(sp != NULL);
+	/* data is expected to be supplied in multiples of a scanline */
+	nrows = cc / sp->bytesperline;
+	if (cc % sp->bytesperline)
+		TIFFWarningExt(tif->tif_clientdata, tif->tif_name, "fractional scanline discarded");
+
+	while (nrows-- > 0) {
+		bufptr[0] = (JSAMPROW) buf;
+		if (TIFFjpeg_write_scanlines(sp, bufptr, 1) != 1)
+			return (0);
+		if (nrows > 0)
+			tif->tif_row++;
+		buf += sp->bytesperline;
+	}
+	return (1);
+}
+
+/*
+ * Encode a chunk of pixels.
+ * Incoming data is expected to be downsampled per sampling factors.
+ */
+static int
+JPEGEncodeRaw(TIFF* tif, tidata_t buf, tsize_t cc, tsample_t s)
+{
+	JPEGState *sp = JState(tif);
+	JSAMPLE* inptr;
+	JSAMPLE* outptr;
+	tsize_t nrows;
+	JDIMENSION clumps_per_line, nclump;
+	int clumpoffset, ci, xpos, ypos;
+	jpeg_component_info* compptr;
+	int samples_per_clump = sp->samplesperclump;
+
+	(void) s;
+	assert(sp != NULL);
+	/* data is expected to be supplied in multiples of a scanline */
+	nrows = cc / sp->bytesperline;
+	if (cc % sp->bytesperline)
+		TIFFWarningExt(tif->tif_clientdata, tif->tif_name, "fractional scanline discarded");
+
+	/* Cb,Cr both have sampling factors 1, so this is correct */
+	clumps_per_line = sp->cinfo.c.comp_info[1].downsampled_width;
+
+	while (nrows-- > 0) {
+		/*
+		 * Fastest way to separate the data is to make one pass
+		 * over the scanline for each row of each component.
+		 */
+		clumpoffset = 0;		/* first sample in clump */
+		for (ci = 0, compptr = sp->cinfo.c.comp_info;
+		     ci < sp->cinfo.c.num_components;
+		     ci++, compptr++) {
+		    int hsamp = compptr->h_samp_factor;
+		    int vsamp = compptr->v_samp_factor;
+		    int padding = (int) (compptr->width_in_blocks * DCTSIZE -
+					 clumps_per_line * hsamp);
+		    for (ypos = 0; ypos < vsamp; ypos++) {
+			inptr = ((JSAMPLE*) buf) + clumpoffset;
+			outptr = sp->ds_buffer[ci][sp->scancount*vsamp + ypos];
+			if (hsamp == 1) {
+			    /* fast path for at least Cb and Cr */
+			    for (nclump = clumps_per_line; nclump-- > 0; ) {
+				*outptr++ = inptr[0];
+				inptr += samples_per_clump;
+			    }
+			} else {
+			    /* general case */
+			    for (nclump = clumps_per_line; nclump-- > 0; ) {
+				for (xpos = 0; xpos < hsamp; xpos++)
+				    *outptr++ = inptr[xpos];
+				inptr += samples_per_clump;
+			    }
+			}
+			/* pad each scanline as needed */
+			for (xpos = 0; xpos < padding; xpos++) {
+			    *outptr = outptr[-1];
+			    outptr++;
+			}
+			clumpoffset += hsamp;
+		    }
+		}
+		sp->scancount++;
+		if (sp->scancount >= DCTSIZE) {
+			int n = sp->cinfo.c.max_v_samp_factor * DCTSIZE;
+			if (TIFFjpeg_write_raw_data(sp, sp->ds_buffer, n) != n)
+				return (0);
+			sp->scancount = 0;
+		}
+		if (nrows > 0)
+			tif->tif_row++;
+		buf += sp->bytesperline;
+	}
+	return (1);
+}
+
+/*
+ * Finish up at the end of a strip or tile.
+ */
+static int
+JPEGPostEncode(TIFF* tif)
+{
+	JPEGState *sp = JState(tif);
+
+	if (sp->scancount > 0) {
+		/*
+		 * Need to emit a partial bufferload of downsampled data.
+		 * Pad the data vertically.
+		 */
+		int ci, ypos, n;
+		jpeg_component_info* compptr;
+
+		for (ci = 0, compptr = sp->cinfo.c.comp_info;
+		     ci < sp->cinfo.c.num_components;
+		     ci++, compptr++) {
+			int vsamp = compptr->v_samp_factor;
+			tsize_t row_width = compptr->width_in_blocks * DCTSIZE
+				* sizeof(JSAMPLE);
+			for (ypos = sp->scancount * vsamp;
+			     ypos < DCTSIZE * vsamp; ypos++) {
+				_TIFFmemcpy((tdata_t)sp->ds_buffer[ci][ypos],
+					    (tdata_t)sp->ds_buffer[ci][ypos-1],
+					    row_width);
+
+			}
+		}
+		n = sp->cinfo.c.max_v_samp_factor * DCTSIZE;
+		if (TIFFjpeg_write_raw_data(sp, sp->ds_buffer, n) != n)
+			return (0);
+	}
+
+	return (TIFFjpeg_finish_compress(JState(tif)));
+}
+
+static void
+JPEGCleanup(TIFF* tif)
+{
+	JPEGState *sp = JState(tif);
+
+	assert(sp != 0);
+
+	tif->tif_tagmethods.vgetfield = sp->vgetparent;
+	tif->tif_tagmethods.vsetfield = sp->vsetparent;
+
+	if( sp->cinfo_initialized )
+	    TIFFjpeg_destroy(sp);	/* release libjpeg resources */
+	if (sp->jpegtables)		/* tag value */
+		_TIFFfree(sp->jpegtables);
+	_TIFFfree(tif->tif_data);	/* release local state */
+	tif->tif_data = NULL;
+
+	_TIFFSetDefaultCompressionState(tif);
+}
+
+static int
+JPEGVSetField(TIFF* tif, ttag_t tag, va_list ap)
+{
+	JPEGState* sp = JState(tif);
+	TIFFDirectory* td = &tif->tif_dir;
+	uint32 v32;
+
+	assert(sp != NULL);
+
+	switch (tag) {
+	case TIFFTAG_JPEGTABLES:
+		v32 = va_arg(ap, uint32);
+		if (v32 == 0) {
+			/* XXX */
+			return (0);
+		}
+		_TIFFsetByteArray(&sp->jpegtables, va_arg(ap, void*),
+		    (long) v32);
+		sp->jpegtables_length = v32;
+		TIFFSetFieldBit(tif, FIELD_JPEGTABLES);
+		break;
+	case TIFFTAG_JPEGQUALITY:
+		sp->jpegquality = va_arg(ap, int);
+		return (1);			/* pseudo tag */
+	case TIFFTAG_JPEGCOLORMODE:
+		sp->jpegcolormode = va_arg(ap, int);
+		/*
+		 * Mark whether returned data is up-sampled or not
+		 * so TIFFStripSize and TIFFTileSize return values
+		 * that reflect the true amount of data.
+		 */
+		tif->tif_flags &= ~TIFF_UPSAMPLED;
+		if (td->td_planarconfig == PLANARCONFIG_CONTIG) {
+		    if (td->td_photometric == PHOTOMETRIC_YCBCR &&
+		      sp->jpegcolormode == JPEGCOLORMODE_RGB) {
+			tif->tif_flags |= TIFF_UPSAMPLED;
+		    } else {
+			if (td->td_ycbcrsubsampling[0] != 1 ||
+			    td->td_ycbcrsubsampling[1] != 1)
+			    ; /* XXX what about up-sampling? */
+		    }
+		}
+		/*
+		 * Must recalculate cached tile size
+		 * in case sampling state changed.
+		 */
+		tif->tif_tilesize = isTiled(tif) ? TIFFTileSize(tif) : (tsize_t) -1;
+		return (1);			/* pseudo tag */
+	case TIFFTAG_JPEGTABLESMODE:
+		sp->jpegtablesmode = va_arg(ap, int);
+		return (1);			/* pseudo tag */
+	case TIFFTAG_YCBCRSUBSAMPLING:
+                /* mark the fact that we have a real ycbcrsubsampling! */
+		sp->ycbcrsampling_fetched = 1;
+		return (*sp->vsetparent)(tif, tag, ap);
+	case TIFFTAG_FAXRECVPARAMS:
+		sp->recvparams = va_arg(ap, uint32);
+		break;
+	case TIFFTAG_FAXSUBADDRESS:
+		_TIFFsetString(&sp->subaddress, va_arg(ap, char*));
+		break;
+	case TIFFTAG_FAXRECVTIME:
+		sp->recvtime = va_arg(ap, uint32);
+		break;
+	case TIFFTAG_FAXDCS:
+		_TIFFsetString(&sp->faxdcs, va_arg(ap, char*));
+		break;
+	default:
+		return (*sp->vsetparent)(tif, tag, ap);
+	}
+	TIFFSetFieldBit(tif, _TIFFFieldWithTag(tif, tag)->field_bit);
+	tif->tif_flags |= TIFF_DIRTYDIRECT;
+	return (1);
+}
+
+/*
+ * Some JPEG-in-TIFF produces do not emit the YCBCRSUBSAMPLING values in
+ * the TIFF tags, but still use non-default (2,2) values within the jpeg
+ * data stream itself.  In order for TIFF applications to work properly
+ * - for instance to get the strip buffer size right - it is imperative
+ * that the subsampling be available before we start reading the image
+ * data normally.  This function will attempt to load the first strip in
+ * order to get the sampling values from the jpeg data stream.  Various
+ * hacks are various places are done to ensure this function gets called
+ * before the td_ycbcrsubsampling values are used from the directory structure,
+ * including calling TIFFGetField() for the YCBCRSUBSAMPLING field from
+ * TIFFStripSize(), and the printing code in tif_print.c.
+ *
+ * Note that JPEGPreDeocode() will produce a fairly loud warning when the
+ * discovered sampling does not match the default sampling (2,2) or whatever
+ * was actually in the tiff tags.
+ *
+ * Problems:
+ *  o This code will cause one whole strip/tile of compressed data to be
+ *    loaded just to get the tags right, even if the imagery is never read.
+ *    It would be more efficient to just load a bit of the header, and
+ *    initialize things from that.
+ *
+ * See the bug in bugzilla for details:
+ *
+ * http://bugzilla.remotesensing.org/show_bug.cgi?id=168
+ *
+ * Frank Warmerdam, July 2002
+ */
+
+static void
+JPEGFixupTestSubsampling( TIFF * tif )
+{
+#ifdef CHECK_JPEG_YCBCR_SUBSAMPLING
+    JPEGState *sp = JState(tif);
+    TIFFDirectory *td = &tif->tif_dir;
+
+    JPEGInitializeLibJPEG( tif, 0, 0 );
+
+    /*
+     * Some JPEG-in-TIFF files don't provide the ycbcrsampling tags,
+     * and use a sampling schema other than the default 2,2.  To handle
+     * this we actually have to scan the header of a strip or tile of
+     * jpeg data to get the sampling.
+     */
+    if( !sp->cinfo.comm.is_decompressor
+        || sp->ycbcrsampling_fetched
+        || td->td_photometric != PHOTOMETRIC_YCBCR )
+        return;
+
+    sp->ycbcrsampling_fetched = 1;
+    if( TIFFIsTiled( tif ) )
+    {
+        if( !TIFFFillTile( tif, 0 ) )
+			return;
+    }
+    else
+	{
+        if( !TIFFFillStrip( tif, 0 ) )
+            return;
+    }
+
+    TIFFSetField( tif, TIFFTAG_YCBCRSUBSAMPLING,
+                  (uint16) sp->h_sampling, (uint16) sp->v_sampling );
+#endif /* CHECK_JPEG_YCBCR_SUBSAMPLING */
+}
+
+static int
+JPEGVGetField(TIFF* tif, ttag_t tag, va_list ap)
+{
+	JPEGState* sp = JState(tif);
+
+	assert(sp != NULL);
+
+	switch (tag) {
+		case TIFFTAG_JPEGTABLES:
+			*va_arg(ap, uint32*) = sp->jpegtables_length;
+			*va_arg(ap, void**) = sp->jpegtables;
+			break;
+		case TIFFTAG_JPEGQUALITY:
+			*va_arg(ap, int*) = sp->jpegquality;
+			break;
+		case TIFFTAG_JPEGCOLORMODE:
+			*va_arg(ap, int*) = sp->jpegcolormode;
+			break;
+		case TIFFTAG_JPEGTABLESMODE:
+			*va_arg(ap, int*) = sp->jpegtablesmode;
+			break;
+		case TIFFTAG_YCBCRSUBSAMPLING:
+			JPEGFixupTestSubsampling( tif );
+			return (*sp->vgetparent)(tif, tag, ap);
+			break;
+		case TIFFTAG_FAXRECVPARAMS:
+			*va_arg(ap, uint32*) = sp->recvparams;
+			break;
+		case TIFFTAG_FAXSUBADDRESS:
+			*va_arg(ap, char**) = sp->subaddress;
+			break;
+		case TIFFTAG_FAXRECVTIME:
+			*va_arg(ap, uint32*) = sp->recvtime;
+			break;
+		case TIFFTAG_FAXDCS:
+			*va_arg(ap, char**) = sp->faxdcs;
+			break;
+		default:
+			return (*sp->vgetparent)(tif, tag, ap);
+	}
+	return (1);
+}
+
+static void
+JPEGPrintDir(TIFF* tif, FILE* fd, long flags)
+{
+	JPEGState* sp = JState(tif);
+
+	assert(sp != NULL);
+
+	(void) flags;
+	if (TIFFFieldSet(tif,FIELD_JPEGTABLES))
+		fprintf(fd, "  JPEG Tables: (%lu bytes)\n",
+			(unsigned long) sp->jpegtables_length);
+        if (TIFFFieldSet(tif,FIELD_RECVPARAMS))
+                fprintf(fd, "  Fax Receive Parameters: %08lx\n",
+                   (unsigned long) sp->recvparams);
+        if (TIFFFieldSet(tif,FIELD_SUBADDRESS))
+                fprintf(fd, "  Fax SubAddress: %s\n", sp->subaddress);
+        if (TIFFFieldSet(tif,FIELD_RECVTIME))
+                fprintf(fd, "  Fax Receive Time: %lu secs\n",
+                    (unsigned long) sp->recvtime);
+        if (TIFFFieldSet(tif,FIELD_FAXDCS))
+                fprintf(fd, "  Fax DCS: %s\n", sp->faxdcs);
+}
+
+static uint32
+JPEGDefaultStripSize(TIFF* tif, uint32 s)
+{
+	JPEGState* sp = JState(tif);
+	TIFFDirectory *td = &tif->tif_dir;
+
+	s = (*sp->defsparent)(tif, s);
+	if (s < td->td_imagelength)
+		s = TIFFroundup(s, td->td_ycbcrsubsampling[1] * DCTSIZE);
+	return (s);
+}
+
+static void
+JPEGDefaultTileSize(TIFF* tif, uint32* tw, uint32* th)
+{
+	JPEGState* sp = JState(tif);
+	TIFFDirectory *td = &tif->tif_dir;
+
+	(*sp->deftparent)(tif, tw, th);
+	*tw = TIFFroundup(*tw, td->td_ycbcrsubsampling[0] * DCTSIZE);
+	*th = TIFFroundup(*th, td->td_ycbcrsubsampling[1] * DCTSIZE);
+}
+
+/*
+ * The JPEG library initialized used to be done in TIFFInitJPEG(), but
+ * now that we allow a TIFF file to be opened in update mode it is necessary
+ * to have some way of deciding whether compression or decompression is
+ * desired other than looking at tif->tif_mode.  We accomplish this by
+ * examining {TILE/STRIP}BYTECOUNTS to see if there is a non-zero entry.
+ * If so, we assume decompression is desired.
+ *
+ * This is tricky, because TIFFInitJPEG() is called while the directory is
+ * being read, and generally speaking the BYTECOUNTS tag won't have been read
+ * at that point.  So we try to defer jpeg library initialization till we
+ * do have that tag ... basically any access that might require the compressor
+ * or decompressor that occurs after the reading of the directory.
+ *
+ * In an ideal world compressors or decompressors would be setup
+ * at the point where a single tile or strip was accessed (for read or write)
+ * so that stuff like update of missing tiles, or replacement of tiles could
+ * be done. However, we aren't trying to crack that nut just yet ...
+ *
+ * NFW, Feb 3rd, 2003.
+ */
+
+static int JPEGInitializeLibJPEG( TIFF * tif, int force_encode, int force_decode )
+{
+    JPEGState* sp = JState(tif);
+    uint32 *byte_counts = NULL;
+    int     data_is_empty = TRUE;
+    int     decompress;
+
+    if( sp->cinfo_initialized )
+        return 1;
+
+    /*
+     * Do we have tile data already?  Make sure we initialize the
+     * the state in decompressor mode if we have tile data, even if we
+     * are not in read-only file access mode.
+     */
+    if( TIFFIsTiled( tif )
+        && TIFFGetField( tif, TIFFTAG_TILEBYTECOUNTS, &byte_counts )
+        && byte_counts != NULL )
+    {
+        data_is_empty = byte_counts[0] == 0;
+    }
+    if( !TIFFIsTiled( tif )
+        && TIFFGetField( tif, TIFFTAG_STRIPBYTECOUNTS, &byte_counts)
+        && byte_counts != NULL )
+    {
+        data_is_empty = byte_counts[0] == 0;
+    }
+
+    if( force_decode )
+        decompress = 1;
+    else if( force_encode )
+        decompress = 0;
+    else if( tif->tif_mode == O_RDONLY )
+        decompress = 1;
+    else if( data_is_empty )
+        decompress = 0;
+    else
+        decompress = 1;
+
+    /*
+     * Initialize libjpeg.
+     */
+    if ( decompress ) {
+        if (!TIFFjpeg_create_decompress(sp))
+            return (0);
+
+    } else {
+        if (!TIFFjpeg_create_compress(sp))
+            return (0);
+    }
+
+    sp->cinfo_initialized = TRUE;
+
+    return 1;
+}
+
+int
+TIFFInitJPEG(TIFF* tif, int scheme)
+{
+	JPEGState* sp;
+
+	assert(scheme == COMPRESSION_JPEG);
+
+	/*
+	 * Allocate state block so tag methods have storage to record values.
+	 */
+	tif->tif_data = (tidata_t) _TIFFmalloc(sizeof (JPEGState));
+
+	if (tif->tif_data == NULL) {
+		TIFFErrorExt(tif->tif_clientdata, "TIFFInitJPEG", "No space for JPEG state block");
+		return (0);
+	}
+        _TIFFmemset( tif->tif_data, 0, sizeof(JPEGState));
+
+	sp = JState(tif);
+	sp->tif = tif;				/* back link */
+
+	/*
+	 * Merge codec-specific tag information and override parent get/set
+	 * field methods.
+	 */
+	_TIFFMergeFieldInfo(tif, jpegFieldInfo, N(jpegFieldInfo));
+	sp->vgetparent = tif->tif_tagmethods.vgetfield;
+	tif->tif_tagmethods.vgetfield = JPEGVGetField; /* hook for codec tags */
+	sp->vsetparent = tif->tif_tagmethods.vsetfield;
+	tif->tif_tagmethods.vsetfield = JPEGVSetField; /* hook for codec tags */
+	tif->tif_tagmethods.printdir = JPEGPrintDir;   /* hook for codec tags */
+
+	/* Default values for codec-specific fields */
+	sp->jpegtables = NULL;
+	sp->jpegtables_length = 0;
+	sp->jpegquality = 75;			/* Default IJG quality */
+	sp->jpegcolormode = JPEGCOLORMODE_RAW;
+	sp->jpegtablesmode = JPEGTABLESMODE_QUANT | JPEGTABLESMODE_HUFF;
+
+        sp->recvparams = 0;
+        sp->subaddress = NULL;
+        sp->faxdcs = NULL;
+
+        sp->ycbcrsampling_fetched = 0;
+
+	/*
+	 * Install codec methods.
+	 */
+	tif->tif_setupdecode = JPEGSetupDecode;
+	tif->tif_predecode = JPEGPreDecode;
+	tif->tif_decoderow = JPEGDecode;
+	tif->tif_decodestrip = JPEGDecode;
+	tif->tif_decodetile = JPEGDecode;
+	tif->tif_setupencode = JPEGSetupEncode;
+	tif->tif_preencode = JPEGPreEncode;
+	tif->tif_postencode = JPEGPostEncode;
+	tif->tif_encoderow = JPEGEncode;
+	tif->tif_encodestrip = JPEGEncode;
+	tif->tif_encodetile = JPEGEncode;
+	tif->tif_cleanup = JPEGCleanup;
+	sp->defsparent = tif->tif_defstripsize;
+	tif->tif_defstripsize = JPEGDefaultStripSize;
+	sp->deftparent = tif->tif_deftilesize;
+	tif->tif_deftilesize = JPEGDefaultTileSize;
+	tif->tif_flags |= TIFF_NOBITREV;	/* no bit reversal, please */
+
+        sp->cinfo_initialized = FALSE;
+
+	/*
+        ** Create a JPEGTables field if no directory has yet been created.
+        ** We do this just to ensure that sufficient space is reserved for
+        ** the JPEGTables field.  It will be properly created the right
+        ** size later.
+        */
+        if( tif->tif_diroff == 0 )
+        {
+#define SIZE_OF_JPEGTABLES 2000
+            TIFFSetFieldBit(tif, FIELD_JPEGTABLES);
+            sp->jpegtables_length = SIZE_OF_JPEGTABLES;
+            sp->jpegtables = (void *) _TIFFmalloc(sp->jpegtables_length);
+	    _TIFFmemset(sp->jpegtables, 0, SIZE_OF_JPEGTABLES);
+#undef SIZE_OF_JPEGTABLES
+        }
+
+        /*
+         * Mark the TIFFTAG_YCBCRSAMPLES as present even if it is not
+         * see: JPEGFixupTestSubsampling().
+         */
+        TIFFSetFieldBit( tif, FIELD_YCBCRSUBSAMPLING );
+
+	return 1;
+}
+#endif /* JPEG_SUPPORT */
+
+/* vim: set ts=8 sts=8 sw=8 noet: */
diff --git a/uppsrc/plugin/tif/lib/tif_luv.c b/uppsrc/plugin/tif/lib/tif_luv.c
new file mode 100644
index 000000000..c2a990f2e
--- /dev/null
+++ b/uppsrc/plugin/tif/lib/tif_luv.c
@@ -0,0 +1,1606 @@
+/* $Id: tif_luv.c,v 1.17 2006/03/16 12:38:24 dron Exp $ */
+
+/*
+ * Copyright (c) 1997 Greg Ward Larson
+ * Copyright (c) 1997 Silicon Graphics, Inc.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and
+ * its documentation for any purpose is hereby granted without fee, provided
+ * that (i) the above copyright notices and this permission notice appear in
+ * all copies of the software and related documentation, and (ii) the names of
+ * Sam Leffler, Greg Larson and Silicon Graphics may not be used in any
+ * advertising or publicity relating to the software without the specific,
+ * prior written permission of Sam Leffler, Greg Larson and Silicon Graphics.
+ *
+ * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+ * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * IN NO EVENT SHALL SAM LEFFLER, GREG LARSON OR SILICON GRAPHICS BE LIABLE
+ * FOR ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
+ * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+ * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
+ * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.
+ */
+
+#include "tiffiop.h"
+#ifdef LOGLUV_SUPPORT
+
+/*
+ * TIFF Library.
+ * LogLuv compression support for high dynamic range images.
+ *
+ * Contributed by Greg Larson.
+ *
+ * LogLuv image support uses the TIFF library to store 16 or 10-bit
+ * log luminance values with 8 bits each of u and v or a 14-bit index.
+ *
+ * The codec can take as input and produce as output 32-bit IEEE float values
+ * as well as 16-bit integer values.  A 16-bit luminance is interpreted
+ * as a sign bit followed by a 15-bit integer that is converted
+ * to and from a linear magnitude using the transformation:
+ *
+ *	L = 2^( (Le+.5)/256 - 64 )		# real from 15-bit
+ *
+ *	Le = floor( 256*(log2(L) + 64) )	# 15-bit from real
+ *
+ * The actual conversion to world luminance units in candelas per sq. meter
+ * requires an additional multiplier, which is stored in the TIFFTAG_STONITS.
+ * This value is usually set such that a reasonable exposure comes from
+ * clamping decoded luminances above 1 to 1 in the displayed image.
+ *
+ * The 16-bit values for u and v may be converted to real values by dividing
+ * each by 32768.  (This allows for negative values, which aren't useful as
+ * far as we know, but are left in case of future improvements in human
+ * color vision.)
+ *
+ * Conversion from (u,v), which is actually the CIE (u',v') system for
+ * you color scientists, is accomplished by the following transformation:
+ *
+ *	u = 4*x / (-2*x + 12*y + 3)
+ *	v = 9*y / (-2*x + 12*y + 3)
+ *
+ *	x = 9*u / (6*u - 16*v + 12)
+ *	y = 4*v / (6*u - 16*v + 12)
+ *
+ * This process is greatly simplified by passing 32-bit IEEE floats
+ * for each of three CIE XYZ coordinates.  The codec then takes care
+ * of conversion to and from LogLuv, though the application is still
+ * responsible for interpreting the TIFFTAG_STONITS calibration factor.
+ *
+ * By definition, a CIE XYZ vector of [1 1 1] corresponds to a neutral white
+ * point of (x,y)=(1/3,1/3).  However, most color systems assume some other
+ * white point, such as D65, and an absolute color conversion to XYZ then
+ * to another color space with a different white point may introduce an
+ * unwanted color cast to the image.  It is often desirable, therefore, to
+ * perform a white point conversion that maps the input white to [1 1 1]
+ * in XYZ, then record the original white point using the TIFFTAG_WHITEPOINT
+ * tag value.  A decoder that demands absolute color calibration may use
+ * this white point tag to get back the original colors, but usually it
+ * will be ignored and the new white point will be used instead that
+ * matches the output color space.
+ *
+ * Pixel information is compressed into one of two basic encodings, depending
+ * on the setting of the compression tag, which is one of COMPRESSION_SGILOG
+ * or COMPRESSION_SGILOG24.  For COMPRESSION_SGILOG, greyscale data is
+ * stored as:
+ *
+ *	 1       15
+ *	|-+---------------|
+ *
+ * COMPRESSION_SGILOG color data is stored as:
+ *
+ *	 1       15           8        8
+ *	|-+---------------|--------+--------|
+ *	 S       Le           ue       ve
+ *
+ * For the 24-bit COMPRESSION_SGILOG24 color format, the data is stored as:
+ *
+ *	     10           14
+ *	|----------|--------------|
+ *	     Le'          Ce
+ *
+ * There is no sign bit in the 24-bit case, and the (u,v) chromaticity is
+ * encoded as an index for optimal color resolution.  The 10 log bits are
+ * defined by the following conversions:
+ *
+ *	L = 2^((Le'+.5)/64 - 12)		# real from 10-bit
+ *
+ *	Le' = floor( 64*(log2(L) + 12) )	# 10-bit from real
+ *
+ * The 10 bits of the smaller format may be converted into the 15 bits of
+ * the larger format by multiplying by 4 and adding 13314.  Obviously,
+ * a smaller range of magnitudes is covered (about 5 orders of magnitude
+ * instead of 38), and the lack of a sign bit means that negative luminances
+ * are not allowed.  (Well, they aren't allowed in the real world, either,
+ * but they are useful for certain types of image processing.)
+ *
+ * The desired user format is controlled by the setting the internal
+ * pseudo tag TIFFTAG_SGILOGDATAFMT to one of:
+ *  SGILOGDATAFMT_FLOAT       = IEEE 32-bit float XYZ values
+ *  SGILOGDATAFMT_16BIT	      = 16-bit integer encodings of logL, u and v
+ * Raw data i/o is also possible using:
+ *  SGILOGDATAFMT_RAW         = 32-bit unsigned integer with encoded pixel
+ * In addition, the following decoding is provided for ease of display:
+ *  SGILOGDATAFMT_8BIT        = 8-bit default RGB gamma-corrected values
+ *
+ * For grayscale images, we provide the following data formats:
+ *  SGILOGDATAFMT_FLOAT       = IEEE 32-bit float Y values
+ *  SGILOGDATAFMT_16BIT       = 16-bit integer w/ encoded luminance
+ *  SGILOGDATAFMT_8BIT        = 8-bit gray monitor values
+ *
+ * Note that the COMPRESSION_SGILOG applies a simple run-length encoding
+ * scheme by separating the logL, u and v bytes for each row and applying
+ * a PackBits type of compression.  Since the 24-bit encoding is not
+ * adaptive, the 32-bit color format takes less space in many cases.
+ *
+ * Further control is provided over the conversion from higher-resolution
+ * formats to final encoded values through the pseudo tag
+ * TIFFTAG_SGILOGENCODE:
+ *  SGILOGENCODE_NODITHER     = do not dither encoded values
+ *  SGILOGENCODE_RANDITHER    = apply random dithering during encoding
+ *
+ * The default value of this tag is SGILOGENCODE_NODITHER for
+ * COMPRESSION_SGILOG to maximize run-length encoding and
+ * SGILOGENCODE_RANDITHER for COMPRESSION_SGILOG24 to turn
+ * quantization errors into noise.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <math.h>
+
+/*
+ * State block for each open TIFF
+ * file using LogLuv compression/decompression.
+ */
+typedef	struct logLuvState LogLuvState;
+
+struct logLuvState {
+	int			user_datafmt;	/* user data format */
+	int			encode_meth;	/* encoding method */
+	int			pixel_size;	/* bytes per pixel */
+
+	tidata_t*		tbuf;		/* translation buffer */
+	int			tbuflen;	/* buffer length */
+	void (*tfunc)(LogLuvState*, tidata_t, int);
+
+	TIFFVSetMethod		vgetparent;	/* super-class method */
+	TIFFVSetMethod		vsetparent;	/* super-class method */
+};
+
+#define	DecoderState(tif)	((LogLuvState*) (tif)->tif_data)
+#define	EncoderState(tif)	((LogLuvState*) (tif)->tif_data)
+
+#define SGILOGDATAFMT_UNKNOWN	-1
+
+#define MINRUN		4	/* minimum run length */
+
+/*
+ * Decode a string of 16-bit gray pixels.
+ */
+static int
+LogL16Decode(TIFF* tif, tidata_t op, tsize_t occ, tsample_t s)
+{
+	LogLuvState* sp = DecoderState(tif);
+	int shft, i, npixels;
+	unsigned char* bp;
+	int16* tp;
+	int16 b;
+	int cc, rc;
+
+	assert(s == 0);
+	assert(sp != NULL);
+
+	npixels = occ / sp->pixel_size;
+
+	if (sp->user_datafmt == SGILOGDATAFMT_16BIT)
+		tp = (int16*) op;
+	else {
+		assert(sp->tbuflen >= npixels);
+		tp = (int16*) sp->tbuf;
+	}
+	_TIFFmemset((tdata_t) tp, 0, npixels*sizeof (tp[0]));
+
+	bp = (unsigned char*) tif->tif_rawcp;
+	cc = tif->tif_rawcc;
+					/* get each byte string */
+	for (shft = 2*8; (shft -= 8) >= 0; ) {
+		for (i = 0; i < npixels && cc > 0; )
+			if (*bp >= 128) {		/* run */
+				rc = *bp++ + (2-128);
+				b = (int16)(*bp++ << shft);
+				cc -= 2;
+				while (rc-- && i < npixels)
+					tp[i++] |= b;
+			} else {			/* non-run */
+				rc = *bp++;		/* nul is noop */
+				while (--cc && rc-- && i < npixels)
+					tp[i++] |= (int16)*bp++ << shft;
+			}
+		if (i != npixels) {
+			TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
+		"LogL16Decode: Not enough data at row %d (short %d pixels)",
+			    tif->tif_row, npixels - i);
+			tif->tif_rawcp = (tidata_t) bp;
+			tif->tif_rawcc = cc;
+			return (0);
+		}
+	}
+	(*sp->tfunc)(sp, op, npixels);
+	tif->tif_rawcp = (tidata_t) bp;
+	tif->tif_rawcc = cc;
+	return (1);
+}
+
+/*
+ * Decode a string of 24-bit pixels.
+ */
+static int
+LogLuvDecode24(TIFF* tif, tidata_t op, tsize_t occ, tsample_t s)
+{
+	LogLuvState* sp = DecoderState(tif);
+	int cc, i, npixels;
+	unsigned char* bp;
+	uint32* tp;
+
+	assert(s == 0);
+	assert(sp != NULL);
+
+	npixels = occ / sp->pixel_size;
+
+	if (sp->user_datafmt == SGILOGDATAFMT_RAW)
+		tp = (uint32 *)op;
+	else {
+		assert(sp->tbuflen >= npixels);
+		tp = (uint32 *) sp->tbuf;
+	}
+					/* copy to array of uint32 */
+	bp = (unsigned char*) tif->tif_rawcp;
+	cc = tif->tif_rawcc;
+	for (i = 0; i < npixels && cc > 0; i++) {
+		tp[i] = bp[0] << 16 | bp[1] << 8 | bp[2];
+		bp += 3;
+		cc -= 3;
+	}
+	tif->tif_rawcp = (tidata_t) bp;
+	tif->tif_rawcc = cc;
+	if (i != npixels) {
+		TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
+	    "LogLuvDecode24: Not enough data at row %d (short %d pixels)",
+		    tif->tif_row, npixels - i);
+		return (0);
+	}
+	(*sp->tfunc)(sp, op, npixels);
+	return (1);
+}
+
+/*
+ * Decode a string of 32-bit pixels.
+ */
+static int
+LogLuvDecode32(TIFF* tif, tidata_t op, tsize_t occ, tsample_t s)
+{
+	LogLuvState* sp;
+	int shft, i, npixels;
+	unsigned char* bp;
+	uint32* tp;
+	uint32 b;
+	int cc, rc;
+
+	assert(s == 0);
+	sp = DecoderState(tif);
+	assert(sp != NULL);
+
+	npixels = occ / sp->pixel_size;
+
+	if (sp->user_datafmt == SGILOGDATAFMT_RAW)
+		tp = (uint32*) op;
+	else {
+		assert(sp->tbuflen >= npixels);
+		tp = (uint32*) sp->tbuf;
+	}
+	_TIFFmemset((tdata_t) tp, 0, npixels*sizeof (tp[0]));
+
+	bp = (unsigned char*) tif->tif_rawcp;
+	cc = tif->tif_rawcc;
+					/* get each byte string */
+	for (shft = 4*8; (shft -= 8) >= 0; ) {
+		for (i = 0; i < npixels && cc > 0; )
+			if (*bp >= 128) {		/* run */
+				rc = *bp++ + (2-128);
+				b = (uint32)*bp++ << shft;
+				cc -= 2;
+				while (rc-- && i < npixels)
+					tp[i++] |= b;
+			} else {			/* non-run */
+				rc = *bp++;		/* nul is noop */
+				while (--cc && rc-- && i < npixels)
+					tp[i++] |= (uint32)*bp++ << shft;
+			}
+		if (i != npixels) {
+			TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
+		"LogLuvDecode32: Not enough data at row %d (short %d pixels)",
+			    tif->tif_row, npixels - i);
+			tif->tif_rawcp = (tidata_t) bp;
+			tif->tif_rawcc = cc;
+			return (0);
+		}
+	}
+	(*sp->tfunc)(sp, op, npixels);
+	tif->tif_rawcp = (tidata_t) bp;
+	tif->tif_rawcc = cc;
+	return (1);
+}
+
+/*
+ * Decode a strip of pixels.  We break it into rows to
+ * maintain synchrony with the encode algorithm, which
+ * is row by row.
+ */
+static int
+LogLuvDecodeStrip(TIFF* tif, tidata_t bp, tsize_t cc, tsample_t s)
+{
+	tsize_t rowlen = TIFFScanlineSize(tif);
+
+	assert(cc%rowlen == 0);
+	while (cc && (*tif->tif_decoderow)(tif, bp, rowlen, s))
+		bp += rowlen, cc -= rowlen;
+	return (cc == 0);
+}
+
+/*
+ * Decode a tile of pixels.  We break it into rows to
+ * maintain synchrony with the encode algorithm, which
+ * is row by row.
+ */
+static int
+LogLuvDecodeTile(TIFF* tif, tidata_t bp, tsize_t cc, tsample_t s)
+{
+	tsize_t rowlen = TIFFTileRowSize(tif);
+
+	assert(cc%rowlen == 0);
+	while (cc && (*tif->tif_decoderow)(tif, bp, rowlen, s))
+		bp += rowlen, cc -= rowlen;
+	return (cc == 0);
+}
+
+/*
+ * Encode a row of 16-bit pixels.
+ */
+static int
+LogL16Encode(TIFF* tif, tidata_t bp, tsize_t cc, tsample_t s)
+{
+	LogLuvState* sp = EncoderState(tif);
+	int shft, i, j, npixels;
+	tidata_t op;
+	int16* tp;
+	int16 b;
+	int occ, rc=0, mask, beg;
+
+	assert(s == 0);
+	assert(sp != NULL);
+	npixels = cc / sp->pixel_size;
+
+	if (sp->user_datafmt == SGILOGDATAFMT_16BIT)
+		tp = (int16*) bp;
+	else {
+		tp = (int16*) sp->tbuf;
+		assert(sp->tbuflen >= npixels);
+		(*sp->tfunc)(sp, bp, npixels);
+	}
+					/* compress each byte string */
+	op = tif->tif_rawcp;
+	occ = tif->tif_rawdatasize - tif->tif_rawcc;
+	for (shft = 2*8; (shft -= 8) >= 0; )
+		for (i = 0; i < npixels; i += rc) {
+			if (occ < 4) {
+				tif->tif_rawcp = op;
+				tif->tif_rawcc = tif->tif_rawdatasize - occ;
+				if (!TIFFFlushData1(tif))
+					return (-1);
+				op = tif->tif_rawcp;
+				occ = tif->tif_rawdatasize - tif->tif_rawcc;
+			}
+			mask = 0xff << shft;		/* find next run */
+			for (beg = i; beg < npixels; beg += rc) {
+				b = (int16) (tp[beg] & mask);
+				rc = 1;
+				while (rc < 127+2 && beg+rc < npixels &&
+						(tp[beg+rc] & mask) == b)
+					rc++;
+				if (rc >= MINRUN)
+					break;		/* long enough */
+			}
+			if (beg-i > 1 && beg-i < MINRUN) {
+				b = (int16) (tp[i] & mask);/*check short run */
+				j = i+1;
+				while ((tp[j++] & mask) == b)
+                                    if (j == beg) {
+                                        *op++ = (tidataval_t)(128-2+j-i);
+                                        *op++ = (tidataval_t) (b >> shft);
+                                        occ -= 2;
+                                        i = beg;
+                                        break;
+                                    }
+			}
+			while (i < beg) {		/* write out non-run */
+				if ((j = beg-i) > 127) j = 127;
+				if (occ < j+3) {
+                                    tif->tif_rawcp = op;
+                                    tif->tif_rawcc = tif->tif_rawdatasize - occ;
+                                    if (!TIFFFlushData1(tif))
+                                        return (-1);
+                                    op = tif->tif_rawcp;
+                                    occ = tif->tif_rawdatasize - tif->tif_rawcc;
+				}
+				*op++ = (tidataval_t) j; occ--;
+				while (j--) {
+					*op++ = (tidataval_t) (tp[i++] >> shft & 0xff);
+					occ--;
+				}
+			}
+			if (rc >= MINRUN) {		/* write out run */
+				*op++ = (tidataval_t) (128-2+rc);
+				*op++ = (tidataval_t) (tp[beg] >> shft & 0xff);
+				occ -= 2;
+			} else
+				rc = 0;
+		}
+	tif->tif_rawcp = op;
+	tif->tif_rawcc = tif->tif_rawdatasize - occ;
+
+	return (0);
+}
+
+/*
+ * Encode a row of 24-bit pixels.
+ */
+static int
+LogLuvEncode24(TIFF* tif, tidata_t bp, tsize_t cc, tsample_t s)
+{
+	LogLuvState* sp = EncoderState(tif);
+	int i, npixels, occ;
+	tidata_t op;
+	uint32* tp;
+
+	assert(s == 0);
+	assert(sp != NULL);
+	npixels = cc / sp->pixel_size;
+
+	if (sp->user_datafmt == SGILOGDATAFMT_RAW)
+		tp = (uint32*) bp;
+	else {
+		tp = (uint32*) sp->tbuf;
+		assert(sp->tbuflen >= npixels);
+		(*sp->tfunc)(sp, bp, npixels);
+	}
+					/* write out encoded pixels */
+	op = tif->tif_rawcp;
+	occ = tif->tif_rawdatasize - tif->tif_rawcc;
+	for (i = npixels; i--; ) {
+		if (occ < 3) {
+			tif->tif_rawcp = op;
+			tif->tif_rawcc = tif->tif_rawdatasize - occ;
+			if (!TIFFFlushData1(tif))
+				return (-1);
+			op = tif->tif_rawcp;
+			occ = tif->tif_rawdatasize - tif->tif_rawcc;
+		}
+		*op++ = (tidataval_t)(*tp >> 16);
+		*op++ = (tidataval_t)(*tp >> 8 & 0xff);
+		*op++ = (tidataval_t)(*tp++ & 0xff);
+		occ -= 3;
+	}
+	tif->tif_rawcp = op;
+	tif->tif_rawcc = tif->tif_rawdatasize - occ;
+
+	return (0);
+}
+
+/*
+ * Encode a row of 32-bit pixels.
+ */
+static int
+LogLuvEncode32(TIFF* tif, tidata_t bp, tsize_t cc, tsample_t s)
+{
+	LogLuvState* sp = EncoderState(tif);
+	int shft, i, j, npixels;
+	tidata_t op;
+	uint32* tp;
+	uint32 b;
+	int occ, rc=0, mask, beg;
+
+	assert(s == 0);
+	assert(sp != NULL);
+
+	npixels = cc / sp->pixel_size;
+
+	if (sp->user_datafmt == SGILOGDATAFMT_RAW)
+		tp = (uint32*) bp;
+	else {
+		tp = (uint32*) sp->tbuf;
+		assert(sp->tbuflen >= npixels);
+		(*sp->tfunc)(sp, bp, npixels);
+	}
+					/* compress each byte string */
+	op = tif->tif_rawcp;
+	occ = tif->tif_rawdatasize - tif->tif_rawcc;
+	for (shft = 4*8; (shft -= 8) >= 0; )
+		for (i = 0; i < npixels; i += rc) {
+			if (occ < 4) {
+				tif->tif_rawcp = op;
+				tif->tif_rawcc = tif->tif_rawdatasize - occ;
+				if (!TIFFFlushData1(tif))
+					return (-1);
+				op = tif->tif_rawcp;
+				occ = tif->tif_rawdatasize - tif->tif_rawcc;
+			}
+			mask = 0xff << shft;		/* find next run */
+			for (beg = i; beg < npixels; beg += rc) {
+				b = tp[beg] & mask;
+				rc = 1;
+				while (rc < 127+2 && beg+rc < npixels &&
+						(tp[beg+rc] & mask) == b)
+					rc++;
+				if (rc >= MINRUN)
+					break;		/* long enough */
+			}
+			if (beg-i > 1 && beg-i < MINRUN) {
+				b = tp[i] & mask;	/* check short run */
+				j = i+1;
+				while ((tp[j++] & mask) == b)
+					if (j == beg) {
+						*op++ = (tidataval_t)(128-2+j-i);
+						*op++ = (tidataval_t)(b >> shft);
+						occ -= 2;
+						i = beg;
+						break;
+					}
+			}
+			while (i < beg) {		/* write out non-run */
+				if ((j = beg-i) > 127) j = 127;
+				if (occ < j+3) {
+					tif->tif_rawcp = op;
+					tif->tif_rawcc = tif->tif_rawdatasize - occ;
+					if (!TIFFFlushData1(tif))
+						return (-1);
+					op = tif->tif_rawcp;
+					occ = tif->tif_rawdatasize - tif->tif_rawcc;
+				}
+				*op++ = (tidataval_t) j; occ--;
+				while (j--) {
+					*op++ = (tidataval_t)(tp[i++] >> shft & 0xff);
+					occ--;
+				}
+			}
+			if (rc >= MINRUN) {		/* write out run */
+				*op++ = (tidataval_t) (128-2+rc);
+				*op++ = (tidataval_t)(tp[beg] >> shft & 0xff);
+				occ -= 2;
+			} else
+				rc = 0;
+		}
+	tif->tif_rawcp = op;
+	tif->tif_rawcc = tif->tif_rawdatasize - occ;
+
+	return (0);
+}
+
+/*
+ * Encode a strip of pixels.  We break it into rows to
+ * avoid encoding runs across row boundaries.
+ */
+static int
+LogLuvEncodeStrip(TIFF* tif, tidata_t bp, tsize_t cc, tsample_t s)
+{
+	tsize_t rowlen = TIFFScanlineSize(tif);
+
+	assert(cc%rowlen == 0);
+	while (cc && (*tif->tif_encoderow)(tif, bp, rowlen, s) == 0)
+		bp += rowlen, cc -= rowlen;
+	return (cc == 0);
+}
+
+/*
+ * Encode a tile of pixels.  We break it into rows to
+ * avoid encoding runs across row boundaries.
+ */
+static int
+LogLuvEncodeTile(TIFF* tif, tidata_t bp, tsize_t cc, tsample_t s)
+{
+	tsize_t rowlen = TIFFTileRowSize(tif);
+
+	assert(cc%rowlen == 0);
+	while (cc && (*tif->tif_encoderow)(tif, bp, rowlen, s) == 0)
+		bp += rowlen, cc -= rowlen;
+	return (cc == 0);
+}
+
+/*
+ * Encode/Decode functions for converting to and from user formats.
+ */
+
+#include "uvcode.h"
+
+#ifndef UVSCALE
+#define U_NEU		0.210526316
+#define V_NEU		0.473684211
+#define UVSCALE		410.
+#endif
+
+#ifndef	M_LN2
+#define M_LN2		0.69314718055994530942
+#endif
+#ifndef M_PI
+#define M_PI		3.14159265358979323846
+#endif
+#define log2(x)		((1./M_LN2)*log(x))
+#define exp2(x)		exp(M_LN2*(x))
+
+#define itrunc(x,m)	((m)==SGILOGENCODE_NODITHER ? \
+				(int)(x) : \
+				(int)((x) + rand()*(1./RAND_MAX) - .5))
+
+#if !LOGLUV_PUBLIC
+static
+#endif
+double
+LogL16toY(int p16)		/* compute luminance from 16-bit LogL */
+{
+	int	Le = p16 & 0x7fff;
+	double	Y;
+
+	if (!Le)
+		return (0.);
+	Y = exp(M_LN2/256.*(Le+.5) - M_LN2*64.);
+	return (!(p16 & 0x8000) ? Y : -Y);
+}
+
+#if !LOGLUV_PUBLIC
+static
+#endif
+int
+LogL16fromY(double Y, int em)	/* get 16-bit LogL from Y */
+{
+	if (Y >= 1.8371976e19)
+		return (0x7fff);
+	if (Y <= -1.8371976e19)
+		return (0xffff);
+	if (Y > 5.4136769e-20)
+		return itrunc(256.*(log2(Y) + 64.), em);
+	if (Y < -5.4136769e-20)
+		return (~0x7fff | itrunc(256.*(log2(-Y) + 64.), em));
+	return (0);
+}
+
+static void
+L16toY(LogLuvState* sp, tidata_t op, int n)
+{
+	int16* l16 = (int16*) sp->tbuf;
+	float* yp = (float*) op;
+
+	while (n-- > 0)
+		*yp++ = (float)LogL16toY(*l16++);
+}
+
+static void
+L16toGry(LogLuvState* sp, tidata_t op, int n)
+{
+	int16* l16 = (int16*) sp->tbuf;
+	uint8* gp = (uint8*) op;
+
+	while (n-- > 0) {
+		double Y = LogL16toY(*l16++);
+		*gp++ = (uint8) ((Y <= 0.) ? 0 : (Y >= 1.) ? 255 : (int)(256.*sqrt(Y)));
+	}
+}
+
+static void
+L16fromY(LogLuvState* sp, tidata_t op, int n)
+{
+	int16* l16 = (int16*) sp->tbuf;
+	float* yp = (float*) op;
+
+	while (n-- > 0)
+		*l16++ = (int16) (LogL16fromY(*yp++, sp->encode_meth));
+}
+
+#if !LOGLUV_PUBLIC
+static
+#endif
+void
+XYZtoRGB24(float xyz[3], uint8 rgb[3])
+{
+	double	r, g, b;
+					/* assume CCIR-709 primaries */
+	r =  2.690*xyz[0] + -1.276*xyz[1] + -0.414*xyz[2];
+	g = -1.022*xyz[0] +  1.978*xyz[1] +  0.044*xyz[2];
+	b =  0.061*xyz[0] + -0.224*xyz[1] +  1.163*xyz[2];
+					/* assume 2.0 gamma for speed */
+	/* could use integer sqrt approx., but this is probably faster */
+	rgb[0] = (uint8)((r<=0.) ? 0 : (r >= 1.) ? 255 : (int)(256.*sqrt(r)));
+	rgb[1] = (uint8)((g<=0.) ? 0 : (g >= 1.) ? 255 : (int)(256.*sqrt(g)));
+	rgb[2] = (uint8)((b<=0.) ? 0 : (b >= 1.) ? 255 : (int)(256.*sqrt(b)));
+}
+
+#if !LOGLUV_PUBLIC
+static
+#endif
+double
+LogL10toY(int p10)		/* compute luminance from 10-bit LogL */
+{
+	if (p10 == 0)
+		return (0.);
+	return (exp(M_LN2/64.*(p10+.5) - M_LN2*12.));
+}
+
+#if !LOGLUV_PUBLIC
+static
+#endif
+int
+LogL10fromY(double Y, int em)	/* get 10-bit LogL from Y */
+{
+	if (Y >= 15.742)
+		return (0x3ff);
+	else if (Y <= .00024283)
+		return (0);
+	else
+		return itrunc(64.*(log2(Y) + 12.), em);
+}
+
+#define NANGLES		100
+#define uv2ang(u, v)	( (NANGLES*.499999999/M_PI) \
+				* atan2((v)-V_NEU,(u)-U_NEU) + .5*NANGLES )
+
+static int
+oog_encode(double u, double v)		/* encode out-of-gamut chroma */
+{
+	static int	oog_table[NANGLES];
+	static int	initialized = 0;
+	register int	i;
+
+	if (!initialized) {		/* set up perimeter table */
+		double	eps[NANGLES], ua, va, ang, epsa;
+		int	ui, vi, ustep;
+		for (i = NANGLES; i--; )
+			eps[i] = 2.;
+		for (vi = UV_NVS; vi--; ) {
+			va = UV_VSTART + (vi+.5)*UV_SQSIZ;
+			ustep = uv_row[vi].nus-1;
+			if (vi == UV_NVS-1 || vi == 0 || ustep <= 0)
+				ustep = 1;
+			for (ui = uv_row[vi].nus-1; ui >= 0; ui -= ustep) {
+				ua = uv_row[vi].ustart + (ui+.5)*UV_SQSIZ;
+				ang = uv2ang(ua, va);
+                                i = (int) ang;
+				epsa = fabs(ang - (i+.5));
+				if (epsa < eps[i]) {
+					oog_table[i] = uv_row[vi].ncum + ui;
+					eps[i] = epsa;
+				}
+			}
+		}
+		for (i = NANGLES; i--; )	/* fill any holes */
+			if (eps[i] > 1.5) {
+				int	i1, i2;
+				for (i1 = 1; i1 < NANGLES/2; i1++)
+					if (eps[(i+i1)%NANGLES] < 1.5)
+						break;
+				for (i2 = 1; i2 < NANGLES/2; i2++)
+					if (eps[(i+NANGLES-i2)%NANGLES] < 1.5)
+						break;
+				if (i1 < i2)
+					oog_table[i] =
+						oog_table[(i+i1)%NANGLES];
+				else
+					oog_table[i] =
+						oog_table[(i+NANGLES-i2)%NANGLES];
+			}
+		initialized = 1;
+	}
+	i = (int) uv2ang(u, v);		/* look up hue angle */
+	return (oog_table[i]);
+}
+
+#undef uv2ang
+#undef NANGLES
+
+#if !LOGLUV_PUBLIC
+static
+#endif
+int
+uv_encode(double u, double v, int em)	/* encode (u',v') coordinates */
+{
+	register int	vi, ui;
+
+	if (v < UV_VSTART)
+		return oog_encode(u, v);
+	vi = itrunc((v - UV_VSTART)*(1./UV_SQSIZ), em);
+	if (vi >= UV_NVS)
+		return oog_encode(u, v);
+	if (u < uv_row[vi].ustart)
+		return oog_encode(u, v);
+	ui = itrunc((u - uv_row[vi].ustart)*(1./UV_SQSIZ), em);
+	if (ui >= uv_row[vi].nus)
+		return oog_encode(u, v);
+
+	return (uv_row[vi].ncum + ui);
+}
+
+#if !LOGLUV_PUBLIC
+static
+#endif
+int
+uv_decode(double *up, double *vp, int c)	/* decode (u',v') index */
+{
+	int	upper, lower;
+	register int	ui, vi;
+
+	if (c < 0 || c >= UV_NDIVS)
+		return (-1);
+	lower = 0;				/* binary search */
+	upper = UV_NVS;
+	while (upper - lower > 1) {
+		vi = (lower + upper) >> 1;
+		ui = c - uv_row[vi].ncum;
+		if (ui > 0)
+			lower = vi;
+		else if (ui < 0)
+			upper = vi;
+		else {
+			lower = vi;
+			break;
+		}
+	}
+	vi = lower;
+	ui = c - uv_row[vi].ncum;
+	*up = uv_row[vi].ustart + (ui+.5)*UV_SQSIZ;
+	*vp = UV_VSTART + (vi+.5)*UV_SQSIZ;
+	return (0);
+}
+
+#if !LOGLUV_PUBLIC
+static
+#endif
+void
+LogLuv24toXYZ(uint32 p, float XYZ[3])
+{
+	int	Ce;
+	double	L, u, v, s, x, y;
+					/* decode luminance */
+	L = LogL10toY(p>>14 & 0x3ff);
+	if (L <= 0.) {
+		XYZ[0] = XYZ[1] = XYZ[2] = 0.;
+		return;
+	}
+					/* decode color */
+	Ce = p & 0x3fff;
+	if (uv_decode(&u, &v, Ce) < 0) {
+		u = U_NEU; v = V_NEU;
+	}
+	s = 1./(6.*u - 16.*v + 12.);
+	x = 9.*u * s;
+	y = 4.*v * s;
+					/* convert to XYZ */
+	XYZ[0] = (float)(x/y * L);
+	XYZ[1] = (float)L;
+	XYZ[2] = (float)((1.-x-y)/y * L);
+}
+
+#if !LOGLUV_PUBLIC
+static
+#endif
+uint32
+LogLuv24fromXYZ(float XYZ[3], int em)
+{
+	int	Le, Ce;
+	double	u, v, s;
+					/* encode luminance */
+	Le = LogL10fromY(XYZ[1], em);
+					/* encode color */
+	s = XYZ[0] + 15.*XYZ[1] + 3.*XYZ[2];
+	if (!Le || s <= 0.) {
+		u = U_NEU;
+		v = V_NEU;
+	} else {
+		u = 4.*XYZ[0] / s;
+		v = 9.*XYZ[1] / s;
+	}
+	Ce = uv_encode(u, v, em);
+	if (Ce < 0)			/* never happens */
+		Ce = uv_encode(U_NEU, V_NEU, SGILOGENCODE_NODITHER);
+					/* combine encodings */
+	return (Le << 14 | Ce);
+}
+
+static void
+Luv24toXYZ(LogLuvState* sp, tidata_t op, int n)
+{
+	uint32* luv = (uint32*) sp->tbuf;
+	float* xyz = (float*) op;
+
+	while (n-- > 0) {
+		LogLuv24toXYZ(*luv, xyz);
+		xyz += 3;
+		luv++;
+	}
+}
+
+static void
+Luv24toLuv48(LogLuvState* sp, tidata_t op, int n)
+{
+	uint32* luv = (uint32*) sp->tbuf;
+	int16* luv3 = (int16*) op;
+
+	while (n-- > 0) {
+		double u, v;
+
+		*luv3++ = (int16)((*luv >> 12 & 0xffd) + 13314);
+		if (uv_decode(&u, &v, *luv&0x3fff) < 0) {
+			u = U_NEU;
+			v = V_NEU;
+		}
+		*luv3++ = (int16)(u * (1L<<15));
+		*luv3++ = (int16)(v * (1L<<15));
+		luv++;
+	}
+}
+
+static void
+Luv24toRGB(LogLuvState* sp, tidata_t op, int n)
+{
+	uint32* luv = (uint32*) sp->tbuf;
+	uint8* rgb = (uint8*) op;
+
+	while (n-- > 0) {
+		float xyz[3];
+
+		LogLuv24toXYZ(*luv++, xyz);
+		XYZtoRGB24(xyz, rgb);
+		rgb += 3;
+	}
+}
+
+static void
+Luv24fromXYZ(LogLuvState* sp, tidata_t op, int n)
+{
+	uint32* luv = (uint32*) sp->tbuf;
+	float* xyz = (float*) op;
+
+	while (n-- > 0) {
+		*luv++ = LogLuv24fromXYZ(xyz, sp->encode_meth);
+		xyz += 3;
+	}
+}
+
+static void
+Luv24fromLuv48(LogLuvState* sp, tidata_t op, int n)
+{
+	uint32* luv = (uint32*) sp->tbuf;
+	int16* luv3 = (int16*) op;
+
+	while (n-- > 0) {
+		int Le, Ce;
+
+		if (luv3[0] <= 0)
+			Le = 0;
+		else if (luv3[0] >= (1<<12)+3314)
+			Le = (1<<10) - 1;
+		else if (sp->encode_meth == SGILOGENCODE_NODITHER)
+			Le = (luv3[0]-3314) >> 2;
+		else
+			Le = itrunc(.25*(luv3[0]-3314.), sp->encode_meth);
+
+		Ce = uv_encode((luv3[1]+.5)/(1<<15), (luv3[2]+.5)/(1<<15),
+					sp->encode_meth);
+		if (Ce < 0)	/* never happens */
+			Ce = uv_encode(U_NEU, V_NEU, SGILOGENCODE_NODITHER);
+		*luv++ = (uint32)Le << 14 | Ce;
+		luv3 += 3;
+	}
+}
+
+#if !LOGLUV_PUBLIC
+static
+#endif
+void
+LogLuv32toXYZ(uint32 p, float XYZ[3])
+{
+	double	L, u, v, s, x, y;
+					/* decode luminance */
+	L = LogL16toY((int)p >> 16);
+	if (L <= 0.) {
+		XYZ[0] = XYZ[1] = XYZ[2] = 0.;
+		return;
+	}
+					/* decode color */
+	u = 1./UVSCALE * ((p>>8 & 0xff) + .5);
+	v = 1./UVSCALE * ((p & 0xff) + .5);
+	s = 1./(6.*u - 16.*v + 12.);
+	x = 9.*u * s;
+	y = 4.*v * s;
+					/* convert to XYZ */
+	XYZ[0] = (float)(x/y * L);
+	XYZ[1] = (float)L;
+	XYZ[2] = (float)((1.-x-y)/y * L);
+}
+
+#if !LOGLUV_PUBLIC
+static
+#endif
+uint32
+LogLuv32fromXYZ(float XYZ[3], int em)
+{
+	unsigned int	Le, ue, ve;
+	double	u, v, s;
+					/* encode luminance */
+	Le = (unsigned int)LogL16fromY(XYZ[1], em);
+					/* encode color */
+	s = XYZ[0] + 15.*XYZ[1] + 3.*XYZ[2];
+	if (!Le || s <= 0.) {
+		u = U_NEU;
+		v = V_NEU;
+	} else {
+		u = 4.*XYZ[0] / s;
+		v = 9.*XYZ[1] / s;
+	}
+	if (u <= 0.) ue = 0;
+	else ue = itrunc(UVSCALE*u, em);
+	if (ue > 255) ue = 255;
+	if (v <= 0.) ve = 0;
+	else ve = itrunc(UVSCALE*v, em);
+	if (ve > 255) ve = 255;
+					/* combine encodings */
+	return (Le << 16 | ue << 8 | ve);
+}
+
+static void
+Luv32toXYZ(LogLuvState* sp, tidata_t op, int n)
+{
+	uint32* luv = (uint32*) sp->tbuf;
+	float* xyz = (float*) op;
+
+	while (n-- > 0) {
+		LogLuv32toXYZ(*luv++, xyz);
+		xyz += 3;
+	}
+}
+
+static void
+Luv32toLuv48(LogLuvState* sp, tidata_t op, int n)
+{
+	uint32* luv = (uint32*) sp->tbuf;
+	int16* luv3 = (int16*) op;
+
+	while (n-- > 0) {
+		double u, v;
+
+		*luv3++ = (int16)(*luv >> 16);
+		u = 1./UVSCALE * ((*luv>>8 & 0xff) + .5);
+		v = 1./UVSCALE * ((*luv & 0xff) + .5);
+		*luv3++ = (int16)(u * (1L<<15));
+		*luv3++ = (int16)(v * (1L<<15));
+		luv++;
+	}
+}
+
+static void
+Luv32toRGB(LogLuvState* sp, tidata_t op, int n)
+{
+	uint32* luv = (uint32*) sp->tbuf;
+	uint8* rgb = (uint8*) op;
+
+	while (n-- > 0) {
+		float xyz[3];
+
+		LogLuv32toXYZ(*luv++, xyz);
+		XYZtoRGB24(xyz, rgb);
+		rgb += 3;
+	}
+}
+
+static void
+Luv32fromXYZ(LogLuvState* sp, tidata_t op, int n)
+{
+	uint32* luv = (uint32*) sp->tbuf;
+	float* xyz = (float*) op;
+
+	while (n-- > 0) {
+		*luv++ = LogLuv32fromXYZ(xyz, sp->encode_meth);
+		xyz += 3;
+	}
+}
+
+static void
+Luv32fromLuv48(LogLuvState* sp, tidata_t op, int n)
+{
+	uint32* luv = (uint32*) sp->tbuf;
+	int16* luv3 = (int16*) op;
+
+	if (sp->encode_meth == SGILOGENCODE_NODITHER) {
+		while (n-- > 0) {
+			*luv++ = (uint32)luv3[0] << 16 |
+				(luv3[1]*(uint32)(UVSCALE+.5) >> 7 & 0xff00) |
+				(luv3[2]*(uint32)(UVSCALE+.5) >> 15 & 0xff);
+			luv3 += 3;
+		}
+		return;
+	}
+	while (n-- > 0) {
+		*luv++ = (uint32)luv3[0] << 16 |
+	(itrunc(luv3[1]*(UVSCALE/(1<<15)), sp->encode_meth) << 8 & 0xff00) |
+		(itrunc(luv3[2]*(UVSCALE/(1<<15)), sp->encode_meth) & 0xff);
+		luv3 += 3;
+	}
+}
+
+static void
+_logLuvNop(LogLuvState* sp, tidata_t op, int n)
+{
+	(void) sp; (void) op; (void) n;
+}
+
+static int
+LogL16GuessDataFmt(TIFFDirectory *td)
+{
+#define	PACK(s,b,f)	(((b)<<6)|((s)<<3)|(f))
+	switch (PACK(td->td_samplesperpixel, td->td_bitspersample, td->td_sampleformat)) {
+	case PACK(1, 32, SAMPLEFORMAT_IEEEFP):
+		return (SGILOGDATAFMT_FLOAT);
+	case PACK(1, 16, SAMPLEFORMAT_VOID):
+	case PACK(1, 16, SAMPLEFORMAT_INT):
+	case PACK(1, 16, SAMPLEFORMAT_UINT):
+		return (SGILOGDATAFMT_16BIT);
+	case PACK(1,  8, SAMPLEFORMAT_VOID):
+	case PACK(1,  8, SAMPLEFORMAT_UINT):
+		return (SGILOGDATAFMT_8BIT);
+	}
+#undef PACK
+	return (SGILOGDATAFMT_UNKNOWN);
+}
+
+static uint32
+multiply(size_t m1, size_t m2)
+{
+	uint32	bytes = m1 * m2;
+
+	if (m1 && bytes / m1 != m2)
+		bytes = 0;
+
+	return bytes;
+}
+
+static int
+LogL16InitState(TIFF* tif)
+{
+	TIFFDirectory *td = &tif->tif_dir;
+	LogLuvState* sp = DecoderState(tif);
+	static const char module[] = "LogL16InitState";
+
+	assert(sp != NULL);
+	assert(td->td_photometric == PHOTOMETRIC_LOGL);
+
+	/* for some reason, we can't do this in TIFFInitLogL16 */
+	if (sp->user_datafmt == SGILOGDATAFMT_UNKNOWN)
+		sp->user_datafmt = LogL16GuessDataFmt(td);
+	switch (sp->user_datafmt) {
+	case SGILOGDATAFMT_FLOAT:
+		sp->pixel_size = sizeof (float);
+		break;
+	case SGILOGDATAFMT_16BIT:
+		sp->pixel_size = sizeof (int16);
+		break;
+	case SGILOGDATAFMT_8BIT:
+		sp->pixel_size = sizeof (uint8);
+		break;
+	default:
+		TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
+		    "No support for converting user data format to LogL");
+		return (0);
+	}
+	sp->tbuflen = multiply(td->td_imagewidth, td->td_rowsperstrip);
+	if (multiply(sp->tbuflen, sizeof (int16)) == 0 ||
+	    (sp->tbuf = (tidata_t*) _TIFFmalloc(sp->tbuflen * sizeof (int16))) == NULL) {
+		TIFFErrorExt(tif->tif_clientdata, module, "%s: No space for SGILog translation buffer",
+		    tif->tif_name);
+		return (0);
+	}
+	return (1);
+}
+
+static int
+LogLuvGuessDataFmt(TIFFDirectory *td)
+{
+	int guess;
+
+	/*
+	 * If the user didn't tell us their datafmt,
+	 * take our best guess from the bitspersample.
+	 */
+#define	PACK(a,b)	(((a)<<3)|(b))
+	switch (PACK(td->td_bitspersample, td->td_sampleformat)) {
+	case PACK(32, SAMPLEFORMAT_IEEEFP):
+		guess = SGILOGDATAFMT_FLOAT;
+		break;
+	case PACK(32, SAMPLEFORMAT_VOID):
+	case PACK(32, SAMPLEFORMAT_UINT):
+	case PACK(32, SAMPLEFORMAT_INT):
+		guess = SGILOGDATAFMT_RAW;
+		break;
+	case PACK(16, SAMPLEFORMAT_VOID):
+	case PACK(16, SAMPLEFORMAT_INT):
+	case PACK(16, SAMPLEFORMAT_UINT):
+		guess = SGILOGDATAFMT_16BIT;
+		break;
+	case PACK( 8, SAMPLEFORMAT_VOID):
+	case PACK( 8, SAMPLEFORMAT_UINT):
+		guess = SGILOGDATAFMT_8BIT;
+		break;
+	default:
+		guess = SGILOGDATAFMT_UNKNOWN;
+		break;
+#undef PACK
+	}
+	/*
+	 * Double-check samples per pixel.
+	 */
+	switch (td->td_samplesperpixel) {
+	case 1:
+		if (guess != SGILOGDATAFMT_RAW)
+			guess = SGILOGDATAFMT_UNKNOWN;
+		break;
+	case 3:
+		if (guess == SGILOGDATAFMT_RAW)
+			guess = SGILOGDATAFMT_UNKNOWN;
+		break;
+	default:
+		guess = SGILOGDATAFMT_UNKNOWN;
+		break;
+	}
+	return (guess);
+}
+
+static int
+LogLuvInitState(TIFF* tif)
+{
+	TIFFDirectory* td = &tif->tif_dir;
+	LogLuvState* sp = DecoderState(tif);
+	static const char module[] = "LogLuvInitState";
+
+	assert(sp != NULL);
+	assert(td->td_photometric == PHOTOMETRIC_LOGLUV);
+
+	/* for some reason, we can't do this in TIFFInitLogLuv */
+	if (td->td_planarconfig != PLANARCONFIG_CONTIG) {
+		TIFFErrorExt(tif->tif_clientdata, module,
+		    "SGILog compression cannot handle non-contiguous data");
+		return (0);
+	}
+	if (sp->user_datafmt == SGILOGDATAFMT_UNKNOWN)
+		sp->user_datafmt = LogLuvGuessDataFmt(td);
+	switch (sp->user_datafmt) {
+	case SGILOGDATAFMT_FLOAT:
+		sp->pixel_size = 3*sizeof (float);
+		break;
+	case SGILOGDATAFMT_16BIT:
+		sp->pixel_size = 3*sizeof (int16);
+		break;
+	case SGILOGDATAFMT_RAW:
+		sp->pixel_size = sizeof (uint32);
+		break;
+	case SGILOGDATAFMT_8BIT:
+		sp->pixel_size = 3*sizeof (uint8);
+		break;
+	default:
+		TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
+		    "No support for converting user data format to LogLuv");
+		return (0);
+	}
+	sp->tbuflen = multiply(td->td_imagewidth, td->td_rowsperstrip);
+	if (multiply(sp->tbuflen, sizeof (uint32)) == 0 ||
+	    (sp->tbuf = (tidata_t*) _TIFFmalloc(sp->tbuflen * sizeof (uint32))) == NULL) {
+		TIFFErrorExt(tif->tif_clientdata, module, "%s: No space for SGILog translation buffer",
+		    tif->tif_name);
+		return (0);
+	}
+	return (1);
+}
+
+static int
+LogLuvSetupDecode(TIFF* tif)
+{
+	LogLuvState* sp = DecoderState(tif);
+	TIFFDirectory* td = &tif->tif_dir;
+
+	tif->tif_postdecode = _TIFFNoPostDecode;
+	switch (td->td_photometric) {
+	case PHOTOMETRIC_LOGLUV:
+		if (!LogLuvInitState(tif))
+			break;
+		if (td->td_compression == COMPRESSION_SGILOG24) {
+			tif->tif_decoderow = LogLuvDecode24;
+			switch (sp->user_datafmt) {
+			case SGILOGDATAFMT_FLOAT:
+				sp->tfunc = Luv24toXYZ;
+				break;
+			case SGILOGDATAFMT_16BIT:
+				sp->tfunc = Luv24toLuv48;
+				break;
+			case SGILOGDATAFMT_8BIT:
+				sp->tfunc = Luv24toRGB;
+				break;
+			}
+		} else {
+			tif->tif_decoderow = LogLuvDecode32;
+			switch (sp->user_datafmt) {
+			case SGILOGDATAFMT_FLOAT:
+				sp->tfunc = Luv32toXYZ;
+				break;
+			case SGILOGDATAFMT_16BIT:
+				sp->tfunc = Luv32toLuv48;
+				break;
+			case SGILOGDATAFMT_8BIT:
+				sp->tfunc = Luv32toRGB;
+				break;
+			}
+		}
+		return (1);
+	case PHOTOMETRIC_LOGL:
+		if (!LogL16InitState(tif))
+			break;
+		tif->tif_decoderow = LogL16Decode;
+		switch (sp->user_datafmt) {
+		case SGILOGDATAFMT_FLOAT:
+			sp->tfunc = L16toY;
+			break;
+		case SGILOGDATAFMT_8BIT:
+			sp->tfunc = L16toGry;
+			break;
+		}
+		return (1);
+	default:
+		TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
+    "Inappropriate photometric interpretation %d for SGILog compression; %s",
+		    td->td_photometric, "must be either LogLUV or LogL");
+		break;
+	}
+	return (0);
+}
+
+static int
+LogLuvSetupEncode(TIFF* tif)
+{
+	LogLuvState* sp = EncoderState(tif);
+	TIFFDirectory* td = &tif->tif_dir;
+
+	switch (td->td_photometric) {
+	case PHOTOMETRIC_LOGLUV:
+		if (!LogLuvInitState(tif))
+			break;
+		if (td->td_compression == COMPRESSION_SGILOG24) {
+			tif->tif_encoderow = LogLuvEncode24;
+			switch (sp->user_datafmt) {
+			case SGILOGDATAFMT_FLOAT:
+				sp->tfunc = Luv24fromXYZ;
+				break;
+			case SGILOGDATAFMT_16BIT:
+				sp->tfunc = Luv24fromLuv48;
+				break;
+			case SGILOGDATAFMT_RAW:
+				break;
+			default:
+				goto notsupported;
+			}
+		} else {
+			tif->tif_encoderow = LogLuvEncode32;
+			switch (sp->user_datafmt) {
+			case SGILOGDATAFMT_FLOAT:
+				sp->tfunc = Luv32fromXYZ;
+				break;
+			case SGILOGDATAFMT_16BIT:
+				sp->tfunc = Luv32fromLuv48;
+				break;
+			case SGILOGDATAFMT_RAW:
+				break;
+			default:
+				goto notsupported;
+			}
+		}
+		break;
+	case PHOTOMETRIC_LOGL:
+		if (!LogL16InitState(tif))
+			break;
+		tif->tif_encoderow = LogL16Encode;
+		switch (sp->user_datafmt) {
+		case SGILOGDATAFMT_FLOAT:
+			sp->tfunc = L16fromY;
+			break;
+		case SGILOGDATAFMT_16BIT:
+			break;
+		default:
+			goto notsupported;
+		}
+		break;
+	default:
+		TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
+    "Inappropriate photometric interpretation %d for SGILog compression; %s",
+    		    td->td_photometric, "must be either LogLUV or LogL");
+		break;
+	}
+	return (1);
+notsupported:
+	TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
+	    "SGILog compression supported only for %s, or raw data",
+	    td->td_photometric == PHOTOMETRIC_LOGL ? "Y, L" : "XYZ, Luv");
+	return (0);
+}
+
+static void
+LogLuvClose(TIFF* tif)
+{
+	TIFFDirectory *td = &tif->tif_dir;
+
+	/*
+	 * For consistency, we always want to write out the same
+	 * bitspersample and sampleformat for our TIFF file,
+	 * regardless of the data format being used by the application.
+	 * Since this routine is called after tags have been set but
+	 * before they have been recorded in the file, we reset them here.
+	 */
+	td->td_samplesperpixel =
+	    (td->td_photometric == PHOTOMETRIC_LOGL) ? 1 : 3;
+	td->td_bitspersample = 16;
+	td->td_sampleformat = SAMPLEFORMAT_INT;
+}
+
+static void
+LogLuvCleanup(TIFF* tif)
+{
+	LogLuvState* sp = (LogLuvState *)tif->tif_data;
+
+	assert(sp != 0);
+
+	tif->tif_tagmethods.vgetfield = sp->vgetparent;
+	tif->tif_tagmethods.vsetfield = sp->vsetparent;
+
+	if (sp->tbuf)
+		_TIFFfree(sp->tbuf);
+	_TIFFfree(sp);
+	tif->tif_data = NULL;
+
+	_TIFFSetDefaultCompressionState(tif);
+}
+
+static int
+LogLuvVSetField(TIFF* tif, ttag_t tag, va_list ap)
+{
+	LogLuvState* sp = DecoderState(tif);
+	int bps, fmt;
+
+	switch (tag) {
+	case TIFFTAG_SGILOGDATAFMT:
+		sp->user_datafmt = va_arg(ap, int);
+		/*
+		 * Tweak the TIFF header so that the rest of libtiff knows what
+		 * size of data will be passed between app and library, and
+		 * assume that the app knows what it is doing and is not
+		 * confused by these header manipulations...
+		 */
+		switch (sp->user_datafmt) {
+		case SGILOGDATAFMT_FLOAT:
+			bps = 32, fmt = SAMPLEFORMAT_IEEEFP;
+			break;
+		case SGILOGDATAFMT_16BIT:
+			bps = 16, fmt = SAMPLEFORMAT_INT;
+			break;
+		case SGILOGDATAFMT_RAW:
+			bps = 32, fmt = SAMPLEFORMAT_UINT;
+			TIFFSetField(tif, TIFFTAG_SAMPLESPERPIXEL, 1);
+			break;
+		case SGILOGDATAFMT_8BIT:
+			bps = 8, fmt = SAMPLEFORMAT_UINT;
+			break;
+		default:
+			TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
+			    "Unknown data format %d for LogLuv compression",
+			    sp->user_datafmt);
+			return (0);
+		}
+		TIFFSetField(tif, TIFFTAG_BITSPERSAMPLE, bps);
+		TIFFSetField(tif, TIFFTAG_SAMPLEFORMAT, fmt);
+		/*
+		 * Must recalculate sizes should bits/sample change.
+		 */
+		tif->tif_tilesize = isTiled(tif) ? TIFFTileSize(tif) : (tsize_t) -1;
+		tif->tif_scanlinesize = TIFFScanlineSize(tif);
+		return (1);
+	case TIFFTAG_SGILOGENCODE:
+		sp->encode_meth = va_arg(ap, int);
+		if (sp->encode_meth != SGILOGENCODE_NODITHER &&
+				sp->encode_meth != SGILOGENCODE_RANDITHER) {
+			TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
+				"Unknown encoding %d for LogLuv compression",
+				sp->encode_meth);
+			return (0);
+		}
+		return (1);
+	default:
+		return (*sp->vsetparent)(tif, tag, ap);
+	}
+}
+
+static int
+LogLuvVGetField(TIFF* tif, ttag_t tag, va_list ap)
+{
+	LogLuvState *sp = (LogLuvState *)tif->tif_data;
+
+	switch (tag) {
+	case TIFFTAG_SGILOGDATAFMT:
+		*va_arg(ap, int*) = sp->user_datafmt;
+		return (1);
+	default:
+		return (*sp->vgetparent)(tif, tag, ap);
+	}
+}
+
+static const TIFFFieldInfo LogLuvFieldInfo[] = {
+    { TIFFTAG_SGILOGDATAFMT,	  0, 0,	TIFF_SHORT,	FIELD_PSEUDO,
+      TRUE,	FALSE,	"SGILogDataFmt"},
+    { TIFFTAG_SGILOGENCODE,	  0, 0, TIFF_SHORT,	FIELD_PSEUDO,
+      TRUE,	FALSE,	"SGILogEncode"}
+};
+
+int
+TIFFInitSGILog(TIFF* tif, int scheme)
+{
+	static const char module[] = "TIFFInitSGILog";
+	LogLuvState* sp;
+
+	assert(scheme == COMPRESSION_SGILOG24 || scheme == COMPRESSION_SGILOG);
+
+	/*
+	 * Allocate state block so tag methods have storage to record values.
+	 */
+	tif->tif_data = (tidata_t) _TIFFmalloc(sizeof (LogLuvState));
+	if (tif->tif_data == NULL)
+		goto bad;
+	sp = (LogLuvState*) tif->tif_data;
+	_TIFFmemset((tdata_t)sp, 0, sizeof (*sp));
+	sp->user_datafmt = SGILOGDATAFMT_UNKNOWN;
+	sp->encode_meth = (scheme == COMPRESSION_SGILOG24) ?
+				SGILOGENCODE_RANDITHER : SGILOGENCODE_NODITHER;
+	sp->tfunc = _logLuvNop;
+
+	/*
+	 * Install codec methods.
+	 * NB: tif_decoderow & tif_encoderow are filled
+	 *     in at setup time.
+	 */
+	tif->tif_setupdecode = LogLuvSetupDecode;
+	tif->tif_decodestrip = LogLuvDecodeStrip;
+	tif->tif_decodetile = LogLuvDecodeTile;
+	tif->tif_setupencode = LogLuvSetupEncode;
+	tif->tif_encodestrip = LogLuvEncodeStrip;
+	tif->tif_encodetile = LogLuvEncodeTile;
+	tif->tif_close = LogLuvClose;
+	tif->tif_cleanup = LogLuvCleanup;
+
+	/* override SetField so we can handle our private pseudo-tag */
+	_TIFFMergeFieldInfo(tif, LogLuvFieldInfo,
+			    TIFFArrayCount(LogLuvFieldInfo));
+	sp->vgetparent = tif->tif_tagmethods.vgetfield;
+	tif->tif_tagmethods.vgetfield = LogLuvVGetField;   /* hook for codec tags */
+	sp->vsetparent = tif->tif_tagmethods.vsetfield;
+	tif->tif_tagmethods.vsetfield = LogLuvVSetField;   /* hook for codec tags */
+
+	return (1);
+bad:
+	TIFFErrorExt(tif->tif_clientdata, module,
+		     "%s: No space for LogLuv state block", tif->tif_name);
+	return (0);
+}
+#endif /* LOGLUV_SUPPORT */
+
+/* vim: set ts=8 sts=8 sw=8 noet: */
diff --git a/uppsrc/plugin/tif/lib/tif_lzw.c b/uppsrc/plugin/tif/lib/tif_lzw.c
new file mode 100644
index 000000000..2f3698009
--- /dev/null
+++ b/uppsrc/plugin/tif/lib/tif_lzw.c
@@ -0,0 +1,1084 @@
+/* $Id: tif_lzw.c,v 1.28 2006/03/16 12:38:24 dron Exp $ */
+
+/*
+ * Copyright (c) 1988-1997 Sam Leffler
+ * Copyright (c) 1991-1997 Silicon Graphics, Inc.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and
+ * its documentation for any purpose is hereby granted without fee, provided
+ * that (i) the above copyright notices and this permission notice appear in
+ * all copies of the software and related documentation, and (ii) the names of
+ * Sam Leffler and Silicon Graphics may not be used in any advertising or
+ * publicity relating to the software without the specific, prior written
+ * permission of Sam Leffler and Silicon Graphics.
+ *
+ * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+ * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
+ * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
+ * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+ * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
+ * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.
+ */
+
+#include "tiffiop.h"
+#ifdef LZW_SUPPORT
+/*
+ * TIFF Library.
+ * Rev 5.0 Lempel-Ziv & Welch Compression Support
+ *
+ * This code is derived from the compress program whose code is
+ * derived from software contributed to Berkeley by James A. Woods,
+ * derived from original work by Spencer Thomas and Joseph Orost.
+ *
+ * The original Berkeley copyright notice appears below in its entirety.
+ */
+#include "tif_predict.h"
+
+#include <stdio.h>
+
+/*
+ * NB: The 5.0 spec describes a different algorithm than Aldus
+ *     implements.  Specifically, Aldus does code length transitions
+ *     one code earlier than should be done (for real LZW).
+ *     Earlier versions of this library implemented the correct
+ *     LZW algorithm, but emitted codes in a bit order opposite
+ *     to the TIFF spec.  Thus, to maintain compatibility w/ Aldus
+ *     we interpret MSB-LSB ordered codes to be images written w/
+ *     old versions of this library, but otherwise adhere to the
+ *     Aldus "off by one" algorithm.
+ *
+ * Future revisions to the TIFF spec are expected to "clarify this issue".
+ */
+#define	LZW_COMPAT		/* include backwards compatibility code */
+/*
+ * Each strip of data is supposed to be terminated by a CODE_EOI.
+ * If the following #define is included, the decoder will also
+ * check for end-of-strip w/o seeing this code.  This makes the
+ * library more robust, but also slower.
+ */
+#define	LZW_CHECKEOS		/* include checks for strips w/o EOI code */
+
+#define MAXCODE(n)	((1L<<(n))-1)
+/*
+ * The TIFF spec specifies that encoded bit
+ * strings range from 9 to 12 bits.
+ */
+#define	BITS_MIN	9		/* start with 9 bits */
+#define	BITS_MAX	12		/* max of 12 bit strings */
+/* predefined codes */
+#define	CODE_CLEAR	256		/* code to clear string table */
+#define	CODE_EOI	257		/* end-of-information code */
+#define CODE_FIRST	258		/* first free code entry */
+#define	CODE_MAX	MAXCODE(BITS_MAX)
+#define	HSIZE		9001L		/* 91% occupancy */
+#define	HSHIFT		(13-8)
+#ifdef LZW_COMPAT
+/* NB: +1024 is for compatibility with old files */
+#define	CSIZE		(MAXCODE(BITS_MAX)+1024L)
+#else
+#define	CSIZE		(MAXCODE(BITS_MAX)+1L)
+#endif
+
+/*
+ * State block for each open TIFF file using LZW
+ * compression/decompression.  Note that the predictor
+ * state block must be first in this data structure.
+ */
+typedef	struct {
+	TIFFPredictorState predict;	/* predictor super class */
+
+	unsigned short	nbits;		/* # of bits/code */
+	unsigned short	maxcode;	/* maximum code for lzw_nbits */
+	unsigned short	free_ent;	/* next free entry in hash table */
+	long		nextdata;	/* next bits of i/o */
+	long		nextbits;	/* # of valid bits in lzw_nextdata */
+
+        int             rw_mode;        /* preserve rw_mode from init */
+} LZWBaseState;
+
+#define	lzw_nbits	base.nbits
+#define	lzw_maxcode	base.maxcode
+#define	lzw_free_ent	base.free_ent
+#define	lzw_nextdata	base.nextdata
+#define	lzw_nextbits	base.nextbits
+
+/*
+ * Encoding-specific state.
+ */
+typedef uint16 hcode_t;			/* codes fit in 16 bits */
+typedef struct {
+	long	hash;
+	hcode_t	code;
+} hash_t;
+
+/*
+ * Decoding-specific state.
+ */
+typedef struct code_ent {
+	struct code_ent *next;
+	unsigned short	length;		/* string len, including this token */
+	unsigned char	value;		/* data value */
+	unsigned char	firstchar;	/* first token of string */
+} code_t;
+
+typedef	int (*decodeFunc)(TIFF*, tidata_t, tsize_t, tsample_t);
+
+typedef struct {
+	LZWBaseState base;
+
+	/* Decoding specific data */
+	long	dec_nbitsmask;		/* lzw_nbits 1 bits, right adjusted */
+	long	dec_restart;		/* restart count */
+#ifdef LZW_CHECKEOS
+	long	dec_bitsleft;		/* available bits in raw data */
+#endif
+	decodeFunc dec_decode;		/* regular or backwards compatible */
+	code_t*	dec_codep;		/* current recognized code */
+	code_t*	dec_oldcodep;		/* previously recognized code */
+	code_t*	dec_free_entp;		/* next free entry */
+	code_t*	dec_maxcodep;		/* max available entry */
+	code_t*	dec_codetab;		/* kept separate for small machines */
+
+	/* Encoding specific data */
+	int	enc_oldcode;		/* last code encountered */
+	long	enc_checkpoint;		/* point at which to clear table */
+#define CHECK_GAP	10000		/* enc_ratio check interval */
+	long	enc_ratio;		/* current compression ratio */
+	long	enc_incount;		/* (input) data bytes encoded */
+	long	enc_outcount;		/* encoded (output) bytes */
+	tidata_t enc_rawlimit;		/* bound on tif_rawdata buffer */
+	hash_t*	enc_hashtab;		/* kept separate for small machines */
+} LZWCodecState;
+
+#define	LZWState(tif)		((LZWBaseState*) (tif)->tif_data)
+#define	DecoderState(tif)	((LZWCodecState*) LZWState(tif))
+#define	EncoderState(tif)	((LZWCodecState*) LZWState(tif))
+
+static	int LZWDecode(TIFF*, tidata_t, tsize_t, tsample_t);
+#ifdef LZW_COMPAT
+static	int LZWDecodeCompat(TIFF*, tidata_t, tsize_t, tsample_t);
+#endif
+static  void cl_hash(LZWCodecState*);
+
+/*
+ * LZW Decoder.
+ */
+
+#ifdef LZW_CHECKEOS
+/*
+ * This check shouldn't be necessary because each
+ * strip is suppose to be terminated with CODE_EOI.
+ */
+#define	NextCode(_tif, _sp, _bp, _code, _get) {				\
+	if ((_sp)->dec_bitsleft < nbits) {				\
+		TIFFWarningExt(_tif->tif_clientdata, _tif->tif_name,				\
+		    "LZWDecode: Strip %d not terminated with EOI code", \
+		    _tif->tif_curstrip);				\
+		_code = CODE_EOI;					\
+	} else {							\
+		_get(_sp,_bp,_code);					\
+		(_sp)->dec_bitsleft -= nbits;				\
+	}								\
+}
+#else
+#define	NextCode(tif, sp, bp, code, get) get(sp, bp, code)
+#endif
+
+static int
+LZWSetupDecode(TIFF* tif)
+{
+	LZWCodecState* sp = DecoderState(tif);
+	static const char module[] = " LZWSetupDecode";
+	int code;
+
+        if( sp == NULL )
+        {
+            /*
+             * Allocate state block so tag methods have storage to record
+			 * values.
+             */
+            tif->tif_data = (tidata_t) _TIFFmalloc(sizeof(LZWCodecState));
+            if (tif->tif_data == NULL)
+            {
+				TIFFErrorExt(tif->tif_clientdata, "LZWPreDecode", "No space for LZW state block");
+                return (0);
+            }
+
+            DecoderState(tif)->dec_codetab = NULL;
+            DecoderState(tif)->dec_decode = NULL;
+
+            /*
+             * Setup predictor setup.
+             */
+            (void) TIFFPredictorInit(tif);
+
+            sp = DecoderState(tif);
+        }
+
+	assert(sp != NULL);
+
+	if (sp->dec_codetab == NULL) {
+		sp->dec_codetab = (code_t*)_TIFFmalloc(CSIZE*sizeof (code_t));
+		if (sp->dec_codetab == NULL) {
+			TIFFErrorExt(tif->tif_clientdata, module, "No space for LZW code table");
+			return (0);
+		}
+		/*
+		 * Pre-load the table.
+		 */
+                code = 255;
+                do {
+                    sp->dec_codetab[code].value = code;
+                    sp->dec_codetab[code].firstchar = code;
+                    sp->dec_codetab[code].length = 1;
+                    sp->dec_codetab[code].next = NULL;
+                } while (code--);
+	}
+	return (1);
+}
+
+/*
+ * Setup state for decoding a strip.
+ */
+static int
+LZWPreDecode(TIFF* tif, tsample_t s)
+{
+	LZWCodecState *sp = DecoderState(tif);
+
+	(void) s;
+	assert(sp != NULL);
+	/*
+	 * Check for old bit-reversed codes.
+	 */
+	if (tif->tif_rawdata[0] == 0 && (tif->tif_rawdata[1] & 0x1)) {
+#ifdef LZW_COMPAT
+		if (!sp->dec_decode) {
+			TIFFWarningExt(tif->tif_clientdata, tif->tif_name,
+			    "Old-style LZW codes, convert file");
+			/*
+			 * Override default decoding methods with
+			 * ones that deal with the old coding.
+			 * Otherwise the predictor versions set
+			 * above will call the compatibility routines
+			 * through the dec_decode method.
+			 */
+			tif->tif_decoderow = LZWDecodeCompat;
+			tif->tif_decodestrip = LZWDecodeCompat;
+			tif->tif_decodetile = LZWDecodeCompat;
+			/*
+			 * If doing horizontal differencing, must
+			 * re-setup the predictor logic since we
+			 * switched the basic decoder methods...
+			 */
+			(*tif->tif_setupdecode)(tif);
+			sp->dec_decode = LZWDecodeCompat;
+		}
+		sp->lzw_maxcode = MAXCODE(BITS_MIN);
+#else /* !LZW_COMPAT */
+		if (!sp->dec_decode) {
+			TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
+			    "Old-style LZW codes not supported");
+			sp->dec_decode = LZWDecode;
+		}
+		return (0);
+#endif/* !LZW_COMPAT */
+	} else {
+		sp->lzw_maxcode = MAXCODE(BITS_MIN)-1;
+		sp->dec_decode = LZWDecode;
+	}
+	sp->lzw_nbits = BITS_MIN;
+	sp->lzw_nextbits = 0;
+	sp->lzw_nextdata = 0;
+
+	sp->dec_restart = 0;
+	sp->dec_nbitsmask = MAXCODE(BITS_MIN);
+#ifdef LZW_CHECKEOS
+	sp->dec_bitsleft = tif->tif_rawcc << 3;
+#endif
+	sp->dec_free_entp = sp->dec_codetab + CODE_FIRST;
+	/*
+	 * Zero entries that are not yet filled in.  We do
+	 * this to guard against bogus input data that causes
+	 * us to index into undefined entries.  If you can
+	 * come up with a way to safely bounds-check input codes
+	 * while decoding then you can remove this operation.
+	 */
+	_TIFFmemset(sp->dec_free_entp, 0, (CSIZE-CODE_FIRST)*sizeof (code_t));
+	sp->dec_oldcodep = &sp->dec_codetab[-1];
+	sp->dec_maxcodep = &sp->dec_codetab[sp->dec_nbitsmask-1];
+	return (1);
+}
+
+/*
+ * Decode a "hunk of data".
+ */
+#define	GetNextCode(sp, bp, code) {				\
+	nextdata = (nextdata<<8) | *(bp)++;			\
+	nextbits += 8;						\
+	if (nextbits < nbits) {					\
+		nextdata = (nextdata<<8) | *(bp)++;		\
+		nextbits += 8;					\
+	}							\
+	code = (hcode_t)((nextdata >> (nextbits-nbits)) & nbitsmask);	\
+	nextbits -= nbits;					\
+}
+
+static void
+codeLoop(TIFF* tif)
+{
+	TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
+	    "LZWDecode: Bogus encoding, loop in the code table; scanline %d",
+	    tif->tif_row);
+}
+
+static int
+LZWDecode(TIFF* tif, tidata_t op0, tsize_t occ0, tsample_t s)
+{
+	LZWCodecState *sp = DecoderState(tif);
+	char *op = (char*) op0;
+	long occ = (long) occ0;
+	char *tp;
+	unsigned char *bp;
+	hcode_t code;
+	int len;
+	long nbits, nextbits, nextdata, nbitsmask;
+	code_t *codep, *free_entp, *maxcodep, *oldcodep;
+
+	(void) s;
+	assert(sp != NULL);
+	/*
+	 * Restart interrupted output operation.
+	 */
+	if (sp->dec_restart) {
+		long residue;
+
+		codep = sp->dec_codep;
+		residue = codep->length - sp->dec_restart;
+		if (residue > occ) {
+			/*
+			 * Residue from previous decode is sufficient
+			 * to satisfy decode request.  Skip to the
+			 * start of the decoded string, place decoded
+			 * values in the output buffer, and return.
+			 */
+			sp->dec_restart += occ;
+			do {
+				codep = codep->next;
+			} while (--residue > occ && codep);
+			if (codep) {
+				tp = op + occ;
+				do {
+					*--tp = codep->value;
+					codep = codep->next;
+				} while (--occ && codep);
+			}
+			return (1);
+		}
+		/*
+		 * Residue satisfies only part of the decode request.
+		 */
+		op += residue, occ -= residue;
+		tp = op;
+		do {
+			int t;
+			--tp;
+			t = codep->value;
+			codep = codep->next;
+			*tp = t;
+		} while (--residue && codep);
+		sp->dec_restart = 0;
+	}
+
+	bp = (unsigned char *)tif->tif_rawcp;
+	nbits = sp->lzw_nbits;
+	nextdata = sp->lzw_nextdata;
+	nextbits = sp->lzw_nextbits;
+	nbitsmask = sp->dec_nbitsmask;
+	oldcodep = sp->dec_oldcodep;
+	free_entp = sp->dec_free_entp;
+	maxcodep = sp->dec_maxcodep;
+
+	while (occ > 0) {
+		NextCode(tif, sp, bp, code, GetNextCode);
+		if (code == CODE_EOI)
+			break;
+		if (code == CODE_CLEAR) {
+			free_entp = sp->dec_codetab + CODE_FIRST;
+			nbits = BITS_MIN;
+			nbitsmask = MAXCODE(BITS_MIN);
+			maxcodep = sp->dec_codetab + nbitsmask-1;
+			NextCode(tif, sp, bp, code, GetNextCode);
+			if (code == CODE_EOI)
+				break;
+			*op++ = (char)code, occ--;
+			oldcodep = sp->dec_codetab + code;
+			continue;
+		}
+		codep = sp->dec_codetab + code;
+
+		/*
+	 	 * Add the new entry to the code table.
+	 	 */
+		if (free_entp < &sp->dec_codetab[0] ||
+			free_entp >= &sp->dec_codetab[CSIZE]) {
+			TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
+			"LZWDecode: Corrupted LZW table at scanline %d",
+			tif->tif_row);
+			return (0);
+		}
+
+		free_entp->next = oldcodep;
+		if (free_entp->next < &sp->dec_codetab[0] ||
+			free_entp->next >= &sp->dec_codetab[CSIZE]) {
+			TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
+			"LZWDecode: Corrupted LZW table at scanline %d",
+			tif->tif_row);
+			return (0);
+		}
+		free_entp->firstchar = free_entp->next->firstchar;
+		free_entp->length = free_entp->next->length+1;
+		free_entp->value = (codep < free_entp) ?
+		    codep->firstchar : free_entp->firstchar;
+		if (++free_entp > maxcodep) {
+			if (++nbits > BITS_MAX)		/* should not happen */
+				nbits = BITS_MAX;
+			nbitsmask = MAXCODE(nbits);
+			maxcodep = sp->dec_codetab + nbitsmask-1;
+		}
+		oldcodep = codep;
+		if (code >= 256) {
+			/*
+		 	 * Code maps to a string, copy string
+			 * value to output (written in reverse).
+		 	 */
+			if(codep->length == 0) {
+				TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
+	    		    "LZWDecode: Wrong length of decoded string: "
+			    "data probably corrupted at scanline %d",
+			    tif->tif_row);
+			    return (0);
+			}
+			if (codep->length > occ) {
+				/*
+				 * String is too long for decode buffer,
+				 * locate portion that will fit, copy to
+				 * the decode buffer, and setup restart
+				 * logic for the next decoding call.
+				 */
+				sp->dec_codep = codep;
+				do {
+					codep = codep->next;
+				} while (codep && codep->length > occ);
+				if (codep) {
+					sp->dec_restart = occ;
+					tp = op + occ;
+					do  {
+						*--tp = codep->value;
+						codep = codep->next;
+					}  while (--occ && codep);
+					if (codep)
+						codeLoop(tif);
+				}
+				break;
+			}
+			len = codep->length;
+			tp = op + len;
+			do {
+				int t;
+				--tp;
+				t = codep->value;
+				codep = codep->next;
+				*tp = t;
+			} while (codep && tp > op);
+			if (codep) {
+			    codeLoop(tif);
+			    break;
+			}
+			op += len, occ -= len;
+		} else
+			*op++ = (char)code, occ--;
+	}
+
+	tif->tif_rawcp = (tidata_t) bp;
+	sp->lzw_nbits = (unsigned short) nbits;
+	sp->lzw_nextdata = nextdata;
+	sp->lzw_nextbits = nextbits;
+	sp->dec_nbitsmask = nbitsmask;
+	sp->dec_oldcodep = oldcodep;
+	sp->dec_free_entp = free_entp;
+	sp->dec_maxcodep = maxcodep;
+
+	if (occ > 0) {
+		TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
+		"LZWDecode: Not enough data at scanline %d (short %d bytes)",
+		    tif->tif_row, occ);
+		return (0);
+	}
+	return (1);
+}
+
+#ifdef LZW_COMPAT
+/*
+ * Decode a "hunk of data" for old images.
+ */
+#define	GetNextCodeCompat(sp, bp, code) {			\
+	nextdata |= (unsigned long) *(bp)++ << nextbits;	\
+	nextbits += 8;						\
+	if (nextbits < nbits) {					\
+		nextdata |= (unsigned long) *(bp)++ << nextbits;\
+		nextbits += 8;					\
+	}							\
+	code = (hcode_t)(nextdata & nbitsmask);			\
+	nextdata >>= nbits;					\
+	nextbits -= nbits;					\
+}
+
+static int
+LZWDecodeCompat(TIFF* tif, tidata_t op0, tsize_t occ0, tsample_t s)
+{
+	LZWCodecState *sp = DecoderState(tif);
+	char *op = (char*) op0;
+	long occ = (long) occ0;
+	char *tp;
+	unsigned char *bp;
+	int code, nbits;
+	long nextbits, nextdata, nbitsmask;
+	code_t *codep, *free_entp, *maxcodep, *oldcodep;
+
+	(void) s;
+	assert(sp != NULL);
+	/*
+	 * Restart interrupted output operation.
+	 */
+	if (sp->dec_restart) {
+		long residue;
+
+		codep = sp->dec_codep;
+		residue = codep->length - sp->dec_restart;
+		if (residue > occ) {
+			/*
+			 * Residue from previous decode is sufficient
+			 * to satisfy decode request.  Skip to the
+			 * start of the decoded string, place decoded
+			 * values in the output buffer, and return.
+			 */
+			sp->dec_restart += occ;
+			do {
+				codep = codep->next;
+			} while (--residue > occ);
+			tp = op + occ;
+			do {
+				*--tp = codep->value;
+				codep = codep->next;
+			} while (--occ);
+			return (1);
+		}
+		/*
+		 * Residue satisfies only part of the decode request.
+		 */
+		op += residue, occ -= residue;
+		tp = op;
+		do {
+			*--tp = codep->value;
+			codep = codep->next;
+		} while (--residue);
+		sp->dec_restart = 0;
+	}
+
+	bp = (unsigned char *)tif->tif_rawcp;
+	nbits = sp->lzw_nbits;
+	nextdata = sp->lzw_nextdata;
+	nextbits = sp->lzw_nextbits;
+	nbitsmask = sp->dec_nbitsmask;
+	oldcodep = sp->dec_oldcodep;
+	free_entp = sp->dec_free_entp;
+	maxcodep = sp->dec_maxcodep;
+
+	while (occ > 0) {
+		NextCode(tif, sp, bp, code, GetNextCodeCompat);
+		if (code == CODE_EOI)
+			break;
+		if (code == CODE_CLEAR) {
+			free_entp = sp->dec_codetab + CODE_FIRST;
+			nbits = BITS_MIN;
+			nbitsmask = MAXCODE(BITS_MIN);
+			maxcodep = sp->dec_codetab + nbitsmask;
+			NextCode(tif, sp, bp, code, GetNextCodeCompat);
+			if (code == CODE_EOI)
+				break;
+			*op++ = code, occ--;
+			oldcodep = sp->dec_codetab + code;
+			continue;
+		}
+		codep = sp->dec_codetab + code;
+
+		/*
+	 	 * Add the new entry to the code table.
+	 	 */
+		if (free_entp < &sp->dec_codetab[0] ||
+			free_entp >= &sp->dec_codetab[CSIZE]) {
+			TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
+			"LZWDecodeCompat: Corrupted LZW table at scanline %d",
+			tif->tif_row);
+			return (0);
+		}
+
+		free_entp->next = oldcodep;
+		if (free_entp->next < &sp->dec_codetab[0] ||
+			free_entp->next >= &sp->dec_codetab[CSIZE]) {
+			TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
+			"LZWDecodeCompat: Corrupted LZW table at scanline %d",
+			tif->tif_row);
+			return (0);
+		}
+		free_entp->firstchar = free_entp->next->firstchar;
+		free_entp->length = free_entp->next->length+1;
+		free_entp->value = (codep < free_entp) ?
+		    codep->firstchar : free_entp->firstchar;
+		if (++free_entp > maxcodep) {
+			if (++nbits > BITS_MAX)		/* should not happen */
+				nbits = BITS_MAX;
+			nbitsmask = MAXCODE(nbits);
+			maxcodep = sp->dec_codetab + nbitsmask;
+		}
+		oldcodep = codep;
+		if (code >= 256) {
+			/*
+		 	 * Code maps to a string, copy string
+			 * value to output (written in reverse).
+		 	 */
+			if(codep->length == 0) {
+				TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
+	    		    "LZWDecodeCompat: Wrong length of decoded "
+			    "string: data probably corrupted at scanline %d",
+			    tif->tif_row);
+			    return (0);
+			}
+			if (codep->length > occ) {
+				/*
+				 * String is too long for decode buffer,
+				 * locate portion that will fit, copy to
+				 * the decode buffer, and setup restart
+				 * logic for the next decoding call.
+				 */
+				sp->dec_codep = codep;
+				do {
+					codep = codep->next;
+				} while (codep->length > occ);
+				sp->dec_restart = occ;
+				tp = op + occ;
+				do  {
+					*--tp = codep->value;
+					codep = codep->next;
+				}  while (--occ);
+				break;
+			}
+			op += codep->length, occ -= codep->length;
+			tp = op;
+			do {
+				*--tp = codep->value;
+			} while( (codep = codep->next) != NULL);
+		} else
+			*op++ = code, occ--;
+	}
+
+	tif->tif_rawcp = (tidata_t) bp;
+	sp->lzw_nbits = nbits;
+	sp->lzw_nextdata = nextdata;
+	sp->lzw_nextbits = nextbits;
+	sp->dec_nbitsmask = nbitsmask;
+	sp->dec_oldcodep = oldcodep;
+	sp->dec_free_entp = free_entp;
+	sp->dec_maxcodep = maxcodep;
+
+	if (occ > 0) {
+		TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
+	    "LZWDecodeCompat: Not enough data at scanline %d (short %d bytes)",
+		    tif->tif_row, occ);
+		return (0);
+	}
+	return (1);
+}
+#endif /* LZW_COMPAT */
+
+/*
+ * LZW Encoding.
+ */
+
+static int
+LZWSetupEncode(TIFF* tif)
+{
+	LZWCodecState* sp = EncoderState(tif);
+	static const char module[] = "LZWSetupEncode";
+
+	assert(sp != NULL);
+	sp->enc_hashtab = (hash_t*) _TIFFmalloc(HSIZE*sizeof (hash_t));
+	if (sp->enc_hashtab == NULL) {
+		TIFFErrorExt(tif->tif_clientdata, module, "No space for LZW hash table");
+		return (0);
+	}
+	return (1);
+}
+
+/*
+ * Reset encoding state at the start of a strip.
+ */
+static int
+LZWPreEncode(TIFF* tif, tsample_t s)
+{
+	LZWCodecState *sp = EncoderState(tif);
+
+	(void) s;
+	assert(sp != NULL);
+	sp->lzw_nbits = BITS_MIN;
+	sp->lzw_maxcode = MAXCODE(BITS_MIN);
+	sp->lzw_free_ent = CODE_FIRST;
+	sp->lzw_nextbits = 0;
+	sp->lzw_nextdata = 0;
+	sp->enc_checkpoint = CHECK_GAP;
+	sp->enc_ratio = 0;
+	sp->enc_incount = 0;
+	sp->enc_outcount = 0;
+	/*
+	 * The 4 here insures there is space for 2 max-sized
+	 * codes in LZWEncode and LZWPostDecode.
+	 */
+	sp->enc_rawlimit = tif->tif_rawdata + tif->tif_rawdatasize-1 - 4;
+	cl_hash(sp);		/* clear hash table */
+	sp->enc_oldcode = (hcode_t) -1;	/* generates CODE_CLEAR in LZWEncode */
+	return (1);
+}
+
+#define	CALCRATIO(sp, rat) {					\
+	if (incount > 0x007fffff) { /* NB: shift will overflow */\
+		rat = outcount >> 8;				\
+		rat = (rat == 0 ? 0x7fffffff : incount/rat);	\
+	} else							\
+		rat = (incount<<8) / outcount;			\
+}
+#define	PutNextCode(op, c) {					\
+	nextdata = (nextdata << nbits) | c;			\
+	nextbits += nbits;					\
+	*op++ = (unsigned char)(nextdata >> (nextbits-8));		\
+	nextbits -= 8;						\
+	if (nextbits >= 8) {					\
+		*op++ = (unsigned char)(nextdata >> (nextbits-8));	\
+		nextbits -= 8;					\
+	}							\
+	outcount += nbits;					\
+}
+
+/*
+ * Encode a chunk of pixels.
+ *
+ * Uses an open addressing double hashing (no chaining) on the
+ * prefix code/next character combination.  We do a variant of
+ * Knuth's algorithm D (vol. 3, sec. 6.4) along with G. Knott's
+ * relatively-prime secondary probe.  Here, the modular division
+ * first probe is gives way to a faster exclusive-or manipulation.
+ * Also do block compression with an adaptive reset, whereby the
+ * code table is cleared when the compression ratio decreases,
+ * but after the table fills.  The variable-length output codes
+ * are re-sized at this point, and a CODE_CLEAR is generated
+ * for the decoder.
+ */
+static int
+LZWEncode(TIFF* tif, tidata_t bp, tsize_t cc, tsample_t s)
+{
+	register LZWCodecState *sp = EncoderState(tif);
+	register long fcode;
+	register hash_t *hp;
+	register int h, c;
+	hcode_t ent;
+	long disp;
+	long incount, outcount, checkpoint;
+	long nextdata, nextbits;
+	int free_ent, maxcode, nbits;
+	tidata_t op, limit;
+
+	(void) s;
+	if (sp == NULL)
+		return (0);
+	/*
+	 * Load local state.
+	 */
+	incount = sp->enc_incount;
+	outcount = sp->enc_outcount;
+	checkpoint = sp->enc_checkpoint;
+	nextdata = sp->lzw_nextdata;
+	nextbits = sp->lzw_nextbits;
+	free_ent = sp->lzw_free_ent;
+	maxcode = sp->lzw_maxcode;
+	nbits = sp->lzw_nbits;
+	op = tif->tif_rawcp;
+	limit = sp->enc_rawlimit;
+	ent = sp->enc_oldcode;
+
+	if (ent == (hcode_t) -1 && cc > 0) {
+		/*
+		 * NB: This is safe because it can only happen
+		 *     at the start of a strip where we know there
+		 *     is space in the data buffer.
+		 */
+		PutNextCode(op, CODE_CLEAR);
+		ent = *bp++; cc--; incount++;
+	}
+	while (cc > 0) {
+		c = *bp++; cc--; incount++;
+		fcode = ((long)c << BITS_MAX) + ent;
+		h = (c << HSHIFT) ^ ent;	/* xor hashing */
+#ifdef _WINDOWS
+		/*
+		 * Check hash index for an overflow.
+		 */
+		if (h >= HSIZE)
+			h -= HSIZE;
+#endif
+		hp = &sp->enc_hashtab[h];
+		if (hp->hash == fcode) {
+			ent = hp->code;
+			continue;
+		}
+		if (hp->hash >= 0) {
+			/*
+			 * Primary hash failed, check secondary hash.
+			 */
+			disp = HSIZE - h;
+			if (h == 0)
+				disp = 1;
+			do {
+				/*
+				 * Avoid pointer arithmetic 'cuz of
+				 * wraparound problems with segments.
+				 */
+				if ((h -= disp) < 0)
+					h += HSIZE;
+				hp = &sp->enc_hashtab[h];
+				if (hp->hash == fcode) {
+					ent = hp->code;
+					goto hit;
+				}
+			} while (hp->hash >= 0);
+		}
+		/*
+		 * New entry, emit code and add to table.
+		 */
+		/*
+		 * Verify there is space in the buffer for the code
+		 * and any potential Clear code that might be emitted
+		 * below.  The value of limit is setup so that there
+		 * are at least 4 bytes free--room for 2 codes.
+		 */
+		if (op > limit) {
+			tif->tif_rawcc = (tsize_t)(op - tif->tif_rawdata);
+			TIFFFlushData1(tif);
+			op = tif->tif_rawdata;
+		}
+		PutNextCode(op, ent);
+		ent = c;
+		hp->code = free_ent++;
+		hp->hash = fcode;
+		if (free_ent == CODE_MAX-1) {
+			/* table is full, emit clear code and reset */
+			cl_hash(sp);
+			sp->enc_ratio = 0;
+			incount = 0;
+			outcount = 0;
+			free_ent = CODE_FIRST;
+			PutNextCode(op, CODE_CLEAR);
+			nbits = BITS_MIN;
+			maxcode = MAXCODE(BITS_MIN);
+		} else {
+			/*
+			 * If the next entry is going to be too big for
+			 * the code size, then increase it, if possible.
+			 */
+			if (free_ent > maxcode) {
+				nbits++;
+				assert(nbits <= BITS_MAX);
+				maxcode = (int) MAXCODE(nbits);
+			} else if (incount >= checkpoint) {
+				long rat;
+				/*
+				 * Check compression ratio and, if things seem
+				 * to be slipping, clear the hash table and
+				 * reset state.  The compression ratio is a
+				 * 24+8-bit fractional number.
+				 */
+				checkpoint = incount+CHECK_GAP;
+				CALCRATIO(sp, rat);
+				if (rat <= sp->enc_ratio) {
+					cl_hash(sp);
+					sp->enc_ratio = 0;
+					incount = 0;
+					outcount = 0;
+					free_ent = CODE_FIRST;
+					PutNextCode(op, CODE_CLEAR);
+					nbits = BITS_MIN;
+					maxcode = MAXCODE(BITS_MIN);
+				} else
+					sp->enc_ratio = rat;
+			}
+		}
+	hit:
+		;
+	}
+
+	/*
+	 * Restore global state.
+	 */
+	sp->enc_incount = incount;
+	sp->enc_outcount = outcount;
+	sp->enc_checkpoint = checkpoint;
+	sp->enc_oldcode = ent;
+	sp->lzw_nextdata = nextdata;
+	sp->lzw_nextbits = nextbits;
+	sp->lzw_free_ent = free_ent;
+	sp->lzw_maxcode = maxcode;
+	sp->lzw_nbits = nbits;
+	tif->tif_rawcp = op;
+	return (1);
+}
+
+/*
+ * Finish off an encoded strip by flushing the last
+ * string and tacking on an End Of Information code.
+ */
+static int
+LZWPostEncode(TIFF* tif)
+{
+	register LZWCodecState *sp = EncoderState(tif);
+	tidata_t op = tif->tif_rawcp;
+	long nextbits = sp->lzw_nextbits;
+	long nextdata = sp->lzw_nextdata;
+	long outcount = sp->enc_outcount;
+	int nbits = sp->lzw_nbits;
+
+	if (op > sp->enc_rawlimit) {
+		tif->tif_rawcc = (tsize_t)(op - tif->tif_rawdata);
+		TIFFFlushData1(tif);
+		op = tif->tif_rawdata;
+	}
+	if (sp->enc_oldcode != (hcode_t) -1) {
+		PutNextCode(op, sp->enc_oldcode);
+		sp->enc_oldcode = (hcode_t) -1;
+	}
+	PutNextCode(op, CODE_EOI);
+	if (nextbits > 0)
+		*op++ = (unsigned char)(nextdata << (8-nextbits));
+	tif->tif_rawcc = (tsize_t)(op - tif->tif_rawdata);
+	return (1);
+}
+
+/*
+ * Reset encoding hash table.
+ */
+static void
+cl_hash(LZWCodecState* sp)
+{
+	register hash_t *hp = &sp->enc_hashtab[HSIZE-1];
+	register long i = HSIZE-8;
+
+ 	do {
+		i -= 8;
+		hp[-7].hash = -1;
+		hp[-6].hash = -1;
+		hp[-5].hash = -1;
+		hp[-4].hash = -1;
+		hp[-3].hash = -1;
+		hp[-2].hash = -1;
+		hp[-1].hash = -1;
+		hp[ 0].hash = -1;
+		hp -= 8;
+	} while (i >= 0);
+    	for (i += 8; i > 0; i--, hp--)
+		hp->hash = -1;
+}
+
+static void
+LZWCleanup(TIFF* tif)
+{
+	(void)TIFFPredictorCleanup(tif);
+
+	assert(tif->tif_data != 0);
+
+	if (DecoderState(tif)->dec_codetab)
+		_TIFFfree(DecoderState(tif)->dec_codetab);
+
+	if (EncoderState(tif)->enc_hashtab)
+		_TIFFfree(EncoderState(tif)->enc_hashtab);
+
+	_TIFFfree(tif->tif_data);
+	tif->tif_data = NULL;
+
+	_TIFFSetDefaultCompressionState(tif);
+}
+
+int
+TIFFInitLZW(TIFF* tif, int scheme)
+{
+	assert(scheme == COMPRESSION_LZW);
+	/*
+	 * Allocate state block so tag methods have storage to record values.
+	 */
+	tif->tif_data = (tidata_t) _TIFFmalloc(sizeof (LZWCodecState));
+	if (tif->tif_data == NULL)
+		goto bad;
+	DecoderState(tif)->dec_codetab = NULL;
+	DecoderState(tif)->dec_decode = NULL;
+	EncoderState(tif)->enc_hashtab = NULL;
+        LZWState(tif)->rw_mode = tif->tif_mode;
+
+	/*
+	 * Install codec methods.
+	 */
+	tif->tif_setupdecode = LZWSetupDecode;
+	tif->tif_predecode = LZWPreDecode;
+	tif->tif_decoderow = LZWDecode;
+	tif->tif_decodestrip = LZWDecode;
+	tif->tif_decodetile = LZWDecode;
+	tif->tif_setupencode = LZWSetupEncode;
+	tif->tif_preencode = LZWPreEncode;
+	tif->tif_postencode = LZWPostEncode;
+	tif->tif_encoderow = LZWEncode;
+	tif->tif_encodestrip = LZWEncode;
+	tif->tif_encodetile = LZWEncode;
+	tif->tif_cleanup = LZWCleanup;
+	/*
+	 * Setup predictor setup.
+	 */
+	(void) TIFFPredictorInit(tif);
+	return (1);
+bad:
+	TIFFErrorExt(tif->tif_clientdata, "TIFFInitLZW",
+		     "No space for LZW state block");
+	return (0);
+}
+
+/*
+ * Copyright (c) 1985, 1986 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * James A. Woods, derived from original work by Spencer Thomas
+ * and Joseph Orost.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by the University of California, Berkeley.  The name of the
+ * University may not be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ */
+#endif /* LZW_SUPPORT */
+
+/* vim: set ts=8 sts=8 sw=8 noet: */
diff --git a/uppsrc/plugin/tif/lib/tif_msdos.c b/uppsrc/plugin/tif/lib/tif_msdos.c
new file mode 100644
index 000000000..27bdb4f35
--- /dev/null
+++ b/uppsrc/plugin/tif/lib/tif_msdos.c
@@ -0,0 +1,179 @@
+/* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/tif_msdos.c,v 1.2 2005/12/21 12:23:13 joris Exp $ */
+
+/*
+ * Copyright (c) 1988-1997 Sam Leffler
+ * Copyright (c) 1991-1997 Silicon Graphics, Inc.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and
+ * its documentation for any purpose is hereby granted without fee, provided
+ * that (i) the above copyright notices and this permission notice appear in
+ * all copies of the software and related documentation, and (ii) the names of
+ * Sam Leffler and Silicon Graphics may not be used in any advertising or
+ * publicity relating to the software without the specific, prior written
+ * permission of Sam Leffler and Silicon Graphics.
+ *
+ * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+ * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
+ * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
+ * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+ * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
+ * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.
+ */
+
+/*
+ * TIFF Library MSDOS-specific Routines.
+ */
+#if defined(__WATCOMC__) || defined(__BORLANDC__) || defined(_MSC_VER)
+#include <io.h>		/* for open, close, etc. function prototypes */
+#include <stdio.h>
+#endif
+#include "tiffiop.h"
+
+static tsize_t
+_tiffReadProc(thandle_t fd, tdata_t buf, tsize_t size)
+{
+	return (read((int) fd, buf, size));
+}
+
+static tsize_t
+_tiffWriteProc(thandle_t fd, tdata_t buf, tsize_t size)
+{
+	return (write((int) fd, buf, size));
+}
+
+static toff_t
+_tiffSeekProc(thandle_t fd, toff_t off, int whence)
+{
+	return (lseek((int) fd, (off_t) off, whence));
+}
+
+static int
+_tiffCloseProc(thandle_t fd)
+{
+	return (close((int) fd));
+}
+
+#include <sys/stat.h>
+
+static toff_t
+_tiffSizeProc(thandle_t fd)
+{
+	struct stat sb;
+	return (fstat((int) fd, &sb) < 0 ? 0 : sb.st_size);
+}
+
+static int
+_tiffMapProc(thandle_t fd, tdata_t* pbase, toff_t* psize)
+{
+	return (0);
+}
+
+static void
+_tiffUnmapProc(thandle_t fd, tdata_t base, toff_t size)
+{
+}
+
+/*
+ * Open a TIFF file descriptor for read/writing.
+ */
+TIFF*
+TIFFFdOpen(int fd, const char* name, const char* mode)
+{
+	TIFF* tif;
+
+	tif = TIFFClientOpen(name, mode,
+	    (void*) fd,
+	    _tiffReadProc, _tiffWriteProc, _tiffSeekProc, _tiffCloseProc,
+	    _tiffSizeProc, _tiffMapProc, _tiffUnmapProc);
+	if (tif)
+		tif->tif_fd = fd;
+	return (tif);
+}
+
+/*
+ * Open a TIFF file for read/writing.
+ */
+TIFF*
+TIFFOpen(const char* name, const char* mode)
+{
+	static const char module[] = "TIFFOpen";
+	int m, fd;
+
+	m = _TIFFgetMode(mode, module);
+	if (m == -1)
+		return ((TIFF*)0);
+	fd = open(name, m|O_BINARY, 0666);
+	if (fd < 0) {
+		TIFFErrorExt(0, module, "%s: Cannot open", name);
+		return ((TIFF*)0);
+	}
+	return (TIFFFdOpen(fd, name, mode));
+}
+
+#ifdef __GNUC__
+extern	char* malloc();
+extern	char* realloc();
+#else
+#include <malloc.h>
+#endif
+
+tdata_t
+_TIFFmalloc(tsize_t s)
+{
+	return (malloc((size_t) s));
+}
+
+void
+_TIFFfree(tdata_t p)
+{
+	free(p);
+}
+
+tdata_t
+_TIFFrealloc(tdata_t p, tsize_t s)
+{
+	return (realloc(p, (size_t) s));
+}
+
+void
+_TIFFmemset(tdata_t p, int v, tsize_t c)
+{
+	memset(p, v, (size_t) c);
+}
+
+void
+_TIFFmemcpy(tdata_t d, const tdata_t s, tsize_t c)
+{
+	memcpy(d, s, (size_t) c);
+}
+
+int
+_TIFFmemcmp(const tdata_t p1, const tdata_t p2, tsize_t c)
+{
+	return (memcmp(p1, p2, (size_t) c));
+}
+
+static void
+msdosWarningHandler(const char* module, const char* fmt, va_list ap)
+{
+	if (module != NULL)
+		fprintf(stderr, "%s: ", module);
+	fprintf(stderr, "Warning, ");
+	vfprintf(stderr, fmt, ap);
+	fprintf(stderr, ".\n");
+}
+TIFFErrorHandler _TIFFwarningHandler = msdosWarningHandler;
+
+static void
+msdosErrorHandler(const char* module, const char* fmt, va_list ap)
+{
+	if (module != NULL)
+		fprintf(stderr, "%s: ", module);
+	vfprintf(stderr, fmt, ap);
+	fprintf(stderr, ".\n");
+}
+TIFFErrorHandler _TIFFerrorHandler = msdosErrorHandler;
diff --git a/uppsrc/plugin/tif/lib/tif_next.c b/uppsrc/plugin/tif/lib/tif_next.c
new file mode 100644
index 000000000..55f5b0de8
--- /dev/null
+++ b/uppsrc/plugin/tif/lib/tif_next.c
@@ -0,0 +1,144 @@
+/* $Id: tif_next.c,v 1.6 2005/12/21 12:23:13 joris Exp $ */
+
+/*
+ * Copyright (c) 1988-1997 Sam Leffler
+ * Copyright (c) 1991-1997 Silicon Graphics, Inc.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and
+ * its documentation for any purpose is hereby granted without fee, provided
+ * that (i) the above copyright notices and this permission notice appear in
+ * all copies of the software and related documentation, and (ii) the names of
+ * Sam Leffler and Silicon Graphics may not be used in any advertising or
+ * publicity relating to the software without the specific, prior written
+ * permission of Sam Leffler and Silicon Graphics.
+ *
+ * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+ * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
+ * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
+ * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+ * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
+ * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.
+ */
+
+#include "tiffiop.h"
+#ifdef NEXT_SUPPORT
+/*
+ * TIFF Library.
+ *
+ * NeXT 2-bit Grey Scale Compression Algorithm Support
+ */
+
+#define SETPIXEL(op, v) {			\
+	switch (npixels++ & 3) {		\
+	case 0:	op[0]  = (unsigned char) ((v) << 6); break;	\
+	case 1:	op[0] |= (v) << 4; break;	\
+	case 2:	op[0] |= (v) << 2; break;	\
+	case 3:	*op++ |= (v);	   break;	\
+	}					\
+}
+
+#define LITERALROW	0x00
+#define LITERALSPAN	0x40
+#define WHITE   	((1<<2)-1)
+
+static int
+NeXTDecode(TIFF* tif, tidata_t buf, tsize_t occ, tsample_t s)
+{
+	register unsigned char *bp, *op;
+	register tsize_t cc;
+	register int n;
+	tidata_t row;
+	tsize_t scanline;
+
+	(void) s;
+	/*
+	 * Each scanline is assumed to start off as all
+	 * white (we assume a PhotometricInterpretation
+	 * of ``min-is-black'').
+	 */
+	for (op = buf, cc = occ; cc-- > 0;)
+		*op++ = 0xff;
+
+	bp = (unsigned char *)tif->tif_rawcp;
+	cc = tif->tif_rawcc;
+	scanline = tif->tif_scanlinesize;
+	for (row = buf; (long)occ > 0; occ -= scanline, row += scanline) {
+		n = *bp++, cc--;
+		switch (n) {
+		case LITERALROW:
+			/*
+			 * The entire scanline is given as literal values.
+			 */
+			if (cc < scanline)
+				goto bad;
+			_TIFFmemcpy(row, bp, scanline);
+			bp += scanline;
+			cc -= scanline;
+			break;
+		case LITERALSPAN: {
+			int off;
+			/*
+			 * The scanline has a literal span
+			 * that begins at some offset.
+			 */
+			off = (bp[0] * 256) + bp[1];
+			n = (bp[2] * 256) + bp[3];
+			if (cc < 4+n || off+n > scanline)
+				goto bad;
+			_TIFFmemcpy(row+off, bp+4, n);
+			bp += 4+n;
+			cc -= 4+n;
+			break;
+		}
+		default: {
+			register int npixels = 0, grey;
+			unsigned long imagewidth = tif->tif_dir.td_imagewidth;
+
+			/*
+			 * The scanline is composed of a sequence
+			 * of constant color ``runs''.  We shift
+			 * into ``run mode'' and interpret bytes
+			 * as codes of the form <color><npixels>
+			 * until we've filled the scanline.
+			 */
+			op = row;
+			for (;;) {
+				grey = (n>>6) & 0x3;
+				n &= 0x3f;
+				while (n-- > 0)
+					SETPIXEL(op, grey);
+				if (npixels >= (int) imagewidth)
+					break;
+				if (cc == 0)
+					goto bad;
+				n = *bp++, cc--;
+			}
+			break;
+		}
+		}
+	}
+	tif->tif_rawcp = (tidata_t) bp;
+	tif->tif_rawcc = cc;
+	return (1);
+bad:
+	TIFFErrorExt(tif->tif_clientdata, tif->tif_name, "NeXTDecode: Not enough data for scanline %ld",
+	    (long) tif->tif_row);
+	return (0);
+}
+
+int
+TIFFInitNeXT(TIFF* tif, int scheme)
+{
+	(void) scheme;
+	tif->tif_decoderow = NeXTDecode;
+	tif->tif_decodestrip = NeXTDecode;
+	tif->tif_decodetile = NeXTDecode;
+	return (1);
+}
+#endif /* NEXT_SUPPORT */
+
+/* vim: set ts=8 sts=8 sw=8 noet: */
diff --git a/uppsrc/plugin/tif/lib/tif_ojpeg.c b/uppsrc/plugin/tif/lib/tif_ojpeg.c
new file mode 100644
index 000000000..2932acd52
--- /dev/null
+++ b/uppsrc/plugin/tif/lib/tif_ojpeg.c
@@ -0,0 +1,2629 @@
+/* $Id: tif_ojpeg.c,v 1.16 2006/03/01 11:09:13 dron Exp $ */
+
+#include "tiffiop.h"
+#ifdef OJPEG_SUPPORT
+
+/* JPEG Compression support, as per the original TIFF 6.0 specification.
+
+   WARNING: KLUDGE ALERT!  The type of JPEG encapsulation defined by the TIFF
+                           Version 6.0 specification is now totally obsolete and
+   deprecated for new applications and images.  This file is an unsupported hack
+   that was created solely in order to read (but NOT write!) a few old,
+   unconverted images still present on some users' computer systems.  The code
+   isn't pretty or robust, and it won't read every "old format" JPEG-in-TIFF
+   file (see Samuel Leffler's draft "TIFF Technical Note No. 2" for a long and
+   incomplete list of known problems), but it seems to work well enough in the
+   few cases of practical interest to the author; so, "caveat emptor"!  This
+   file should NEVER be enhanced to write new images using anything other than
+   the latest approved JPEG-in-TIFF encapsulation method, implemented by the
+   "tif_jpeg.c" file elsewhere in this library.
+
+   This file interfaces with Release 6B of the JPEG Library written by theu
+   Independent JPEG Group, which you can find on the Internet at:
+   ftp://ftp.uu.net:/graphics/jpeg/.
+
+   The "C" Preprocessor macros, "[CD]_LOSSLESS_SUPPORTED", are defined by your
+   JPEG Library Version 6B only if you have applied a (massive!) patch by Ken
+   Murchison of Oceana Matrix Ltd. <ken@oceana.com> to support lossless Huffman
+   encoding (TIFF "JPEGProc" tag value = 14).  This patch can be found on the
+   Internet at: ftp://ftp.oceana.com/pub/ljpeg-6b.tar.gz.
+
+   Some old files produced by the Wang Imaging application for Microsoft Windows
+   apparently can be decoded only with a special patch to the JPEG Library,
+   which defines a subroutine named "jpeg_reset_huff_decode()" in its "jdhuff.c"
+   module (the "jdshuff.c" module, if Ken Murchison's patch has been applied).
+   Unfortunately the patch differs slightly in each case, and some TIFF Library
+   have reported problems finding the code, so both versions appear below; you
+   should carefully extract and apply only the version that applies to your JPEG
+   Library!
+
+   Contributed by Scott Marovich <marovich@hpl.hp.com> with considerable help
+   from Charles Auer <Bumble731@msn.com> to unravel the mysteries of image files
+   created by the Wang Imaging application for Microsoft Windows.
+*/
+#if 0  /* Patch for JPEG Library WITHOUT lossless Huffman coding */
+*** jdhuff.c.orig	Mon Oct 20 17:51:10 1997
+--- jdhuff.c	Sun Nov 11 17:33:58 2001
+***************
+*** 648,651 ****
+--- 648,683 ----
+    for (i = 0; i < NUM_HUFF_TBLS; i++) {
+      entropy->dc_derived_tbls[i] = entropy->ac_derived_tbls[i] = NULL;
+    }
+  }
++
++ /*
++  * BEWARE OF KLUDGE:  This subroutine is a hack for decoding illegal JPEG-in-
++  *                    TIFF encapsulations produced by Microsoft's Wang Imaging
++  * for Windows application with the public-domain TIFF Library.  Based upon an
++  * examination of selected output files, this program apparently divides a JPEG
++  * bit-stream into consecutive horizontal TIFF "strips", such that the JPEG
++  * encoder's/decoder's DC coefficients for each image component are reset before
++  * each "strip".  Moreover, a "strip" is not necessarily encoded in a multiple
++  * of 8 bits, so one must sometimes discard 1-7 bits at the end of each "strip"
++  * for alignment to the next input-Byte storage boundary.  IJG JPEG Library
++  * decoder state is not normally exposed to client applications, so this sub-
++  * routine provides the TIFF Library with a "hook" to make these corrections.
++  * It should be called after "jpeg_start_decompress()" and before
++  * "jpeg_finish_decompress()", just before decoding each "strip" using
++  * "jpeg_read_raw_data()" or "jpeg_read_scanlines()".
++  *
++  * This kludge is not sanctioned or supported by the Independent JPEG Group, and
++  * future changes to the IJG JPEG Library might invalidate it.  Do not send bug
++  * reports about this code to IJG developers.  Instead, contact the author for
++  * advice: Scott B. Marovich <marovich@hpl.hp.com>, Hewlett-Packard Labs, 6/01.
++  */
++ GLOBAL(void)
++ jpeg_reset_huff_decode (register j_decompress_ptr cinfo)
++ { register huff_entropy_ptr entropy = (huff_entropy_ptr)cinfo->entropy;
++   register int ci = 0;
++
++   /* Discard encoded input bits, up to the next Byte boundary */
++   entropy->bitstate.bits_left &= ~7;
++   /* Re-initialize DC predictions to 0 */
++   do entropy->saved.last_dc_val[ci] = 0; while (++ci < cinfo->comps_in_scan);
++ }
+#endif /* Patch for JPEG Library WITHOUT lossless Huffman coding */
+#if 0  /* Patch for JPEG Library WITH lossless Huffman coding */
+*** jdshuff.c.orig	Mon Mar 11 16:44:54 2002
+--- jdshuff.c	Mon Mar 11 16:44:54 2002
+***************
+*** 357,360 ****
+--- 357,393 ----
+    for (i = 0; i < NUM_HUFF_TBLS; i++) {
+      entropy->dc_derived_tbls[i] = entropy->ac_derived_tbls[i] = NULL;
+    }
+  }
++
++ /*
++  * BEWARE OF KLUDGE:  This subroutine is a hack for decoding illegal JPEG-in-
++  *                    TIFF encapsulations produced by Microsoft's Wang Imaging
++  * for Windows application with the public-domain TIFF Library.  Based upon an
++  * examination of selected output files, this program apparently divides a JPEG
++  * bit-stream into consecutive horizontal TIFF "strips", such that the JPEG
++  * encoder's/decoder's DC coefficients for each image component are reset before
++  * each "strip".  Moreover, a "strip" is not necessarily encoded in a multiple
++  * of 8 bits, so one must sometimes discard 1-7 bits at the end of each "strip"
++  * for alignment to the next input-Byte storage boundary.  IJG JPEG Library
++  * decoder state is not normally exposed to client applications, so this sub-
++  * routine provides the TIFF Library with a "hook" to make these corrections.
++  * It should be called after "jpeg_start_decompress()" and before
++  * "jpeg_finish_decompress()", just before decoding each "strip" using
++  * "jpeg_read_raw_data()" or "jpeg_read_scanlines()".
++  *
++  * This kludge is not sanctioned or supported by the Independent JPEG Group, and
++  * future changes to the IJG JPEG Library might invalidate it.  Do not send bug
++  * reports about this code to IJG developers.  Instead, contact the author for
++  * advice: Scott B. Marovich <marovich@hpl.hp.com>, Hewlett-Packard Labs, 6/01.
++  */
++ GLOBAL(void)
++ jpeg_reset_huff_decode (register j_decompress_ptr cinfo)
++ { register shuff_entropy_ptr entropy = (shuff_entropy_ptr)
++                                        ((j_lossy_d_ptr)cinfo->codec)->entropy_private;
++   register int ci = 0;
++
++   /* Discard encoded input bits, up to the next Byte boundary */
++   entropy->bitstate.bits_left &= ~7;
++   /* Re-initialize DC predictions to 0 */
++   do entropy->saved.last_dc_val[ci] = 0; while (++ci < cinfo->comps_in_scan);
++ }
+#endif /* Patch for JPEG Library WITH lossless Huffman coding */
+#include <setjmp.h>
+#include <stdio.h>
+#ifdef FAR
+#undef FAR /* Undefine FAR to avoid conflict with JPEG definition */
+#endif
+#define JPEG_INTERNALS /* Include "jpegint.h" for "DSTATE_*" symbols */
+#define JPEG_CJPEG_DJPEG /* Include all Version 6B+ "jconfig.h" options */
+#undef INLINE
+#include "jpeglib.h"
+#undef JPEG_CJPEG_DJPEG
+#undef JPEG_INTERNALS
+
+/* Hack for files produced by Wang Imaging application on Microsoft Windows */
+extern void jpeg_reset_huff_decode(j_decompress_ptr);
+
+/* On some machines, it may be worthwhile to use "_setjmp()" or "sigsetjmp()"
+   instead of "setjmp()".  These macros make it easier:
+*/
+#define SETJMP(jbuf)setjmp(jbuf)
+#define LONGJMP(jbuf,code)longjmp(jbuf,code)
+#define JMP_BUF jmp_buf
+
+#define TIFFTAG_WANG_PAGECONTROL 32934
+
+/* Bit-vector offsets for keeping track of TIFF records that we've parsed. */
+
+#define FIELD_JPEGPROC FIELD_CODEC
+#define FIELD_JPEGIFOFFSET (FIELD_CODEC+1)
+#define FIELD_JPEGIFBYTECOUNT (FIELD_CODEC+2)
+#define FIELD_JPEGRESTARTINTERVAL (FIELD_CODEC+3)
+#define FIELD_JPEGTABLES (FIELD_CODEC+4) /* New, post-6.0 JPEG-in-TIFF tag! */
+#define FIELD_JPEGLOSSLESSPREDICTORS (FIELD_CODEC+5)
+#define FIELD_JPEGPOINTTRANSFORM (FIELD_CODEC+6)
+#define FIELD_JPEGQTABLES (FIELD_CODEC+7)
+#define FIELD_JPEGDCTABLES (FIELD_CODEC+8)
+#define FIELD_JPEGACTABLES (FIELD_CODEC+9)
+#define FIELD_WANG_PAGECONTROL (FIELD_CODEC+10)
+#define FIELD_JPEGCOLORMODE (FIELD_CODEC+11)
+
+typedef struct jpeg_destination_mgr jpeg_destination_mgr;
+typedef struct jpeg_source_mgr jpeg_source_mgr;
+typedef struct jpeg_error_mgr jpeg_error_mgr;
+
+/* State variable for each open TIFF file that uses "libjpeg" for JPEG
+   decompression.  (Note:  This file should NEVER perform JPEG compression
+   except in the manner implemented by the "tif_jpeg.c" file, elsewhere in this
+   library; see comments above.)  JPEG Library internal state is recorded in a
+   "jpeg_{de}compress_struct", while a "jpeg_common_struct" records a few items
+   common to both compression and expansion.  The "cinfo" field containing JPEG
+   Library state MUST be the 1st member of our own state variable, so that we
+   can safely "cast" pointers back and forth.
+*/
+typedef struct             /* This module's private, per-image state variable */
+  {
+    union         /* JPEG Library state variable; this MUST be our 1st field! */
+      {
+        struct jpeg_compress_struct c;
+        struct jpeg_decompress_struct d;
+        struct jpeg_common_struct comm;
+      } cinfo;
+    jpeg_error_mgr err;                         /* JPEG Library error manager */
+    JMP_BUF exit_jmpbuf;             /* ...for catching JPEG Library failures */
+#   ifdef never
+
+ /* (The following two fields could be a "union", but they're small enough that
+    it's not worth the effort.)
+ */
+    jpeg_destination_mgr dest;             /* Destination for compressed data */
+#   endif
+    jpeg_source_mgr src;                           /* Source of expanded data */
+    JSAMPARRAY ds_buffer[MAX_COMPONENTS]; /* ->Temporary downsampling buffers */
+    TIFF *tif;                        /* Reverse pointer, needed by some code */
+    TIFFVGetMethod vgetparent;                    /* "Super class" methods... */
+    TIFFVSetMethod vsetparent;
+    TIFFStripMethod defsparent;
+    TIFFTileMethod deftparent;
+    void *jpegtables;           /* ->"New" JPEG tables, if we synthesized any */
+    uint32 is_WANG,    /* <=> Wang Imaging for Microsoft Windows output file? */
+           jpegtables_length;   /* Length of "new" JPEG tables, if they exist */
+    tsize_t bytesperline;          /* No. of decompressed Bytes per scan line */
+    int jpegquality,                             /* Compression quality level */
+        jpegtablesmode,                          /* What to put in JPEGTables */
+        samplesperclump,
+        scancount;                           /* No. of scan lines accumulated */
+    J_COLOR_SPACE photometric;          /* IJG JPEG Library's photometry code */
+    unsigned char h_sampling,                          /* Luminance sampling factors */
+           v_sampling,
+           jpegcolormode;           /* Who performs RGB <-> YCbCr conversion? */
+			/* JPEGCOLORMODE_RAW <=> TIFF Library or its client */
+			/* JPEGCOLORMODE_RGB <=> JPEG Library               */
+    /* These fields are added to support TIFFGetField */
+    uint16 jpegproc;
+    uint32 jpegifoffset;
+    uint32 jpegifbytecount;
+    uint32 jpegrestartinterval;
+    void* jpeglosslesspredictors;
+    uint16 jpeglosslesspredictors_length;
+    void* jpegpointtransform;
+    uint32 jpegpointtransform_length;
+    void* jpegqtables;
+    uint32 jpegqtables_length;
+    void* jpegdctables;
+    uint32 jpegdctables_length;
+    void* jpegactables;
+    uint32 jpegactables_length;
+
+  } OJPEGState;
+#define OJState(tif)((OJPEGState*)(tif)->tif_data)
+
+static const TIFFFieldInfo ojpegFieldInfo[]=/* JPEG-specific TIFF-record tags */
+  {
+
+ /* This is the current JPEG-in-TIFF metadata-encapsulation tag, and its
+    treatment in this file is idiosyncratic.  It should never appear in a
+    "source" image conforming to the TIFF Version 6.0 specification, so we
+    arrange to report an error if it appears.  But in order to support possible
+    future conversion of "old" JPEG-in-TIFF encapsulations to "new" ones, we
+    might wish to synthesize an equivalent value to be returned by the TIFF
+    Library's "getfield" method.  So, this table tells the TIFF Library to pass
+    these records to us in order to filter them below.
+ */
+    {
+      TIFFTAG_JPEGTABLES            ,TIFF_VARIABLE2,TIFF_VARIABLE2,
+      TIFF_UNDEFINED,FIELD_JPEGTABLES            ,FALSE,TRUE ,"JPEGTables"
+    },
+
+ /* These tags are defined by the TIFF Version 6.0 specification and are now
+    obsolete.  This module reads them from an old "source" image, but it never
+    writes them to a new "destination" image.
+ */
+    {
+      TIFFTAG_JPEGPROC              ,1            ,1            ,
+      TIFF_SHORT    ,FIELD_JPEGPROC              ,FALSE,FALSE,"JPEGProc"
+    },
+    {
+      TIFFTAG_JPEGIFOFFSET          ,1            ,1            ,
+      TIFF_LONG     ,FIELD_JPEGIFOFFSET          ,FALSE,FALSE,"JPEGInterchangeFormat"
+    },
+    {
+      TIFFTAG_JPEGIFBYTECOUNT       ,1            ,1            ,
+      TIFF_LONG     ,FIELD_JPEGIFBYTECOUNT       ,FALSE,FALSE,"JPEGInterchangeFormatLength"
+    },
+    {
+      TIFFTAG_JPEGRESTARTINTERVAL   ,1            ,1            ,
+      TIFF_SHORT    ,FIELD_JPEGRESTARTINTERVAL   ,FALSE,FALSE,"JPEGRestartInterval"
+    },
+    {
+      TIFFTAG_JPEGLOSSLESSPREDICTORS,TIFF_VARIABLE,TIFF_VARIABLE,
+      TIFF_SHORT    ,FIELD_JPEGLOSSLESSPREDICTORS,FALSE,TRUE ,"JPEGLosslessPredictors"
+    },
+    {
+      TIFFTAG_JPEGPOINTTRANSFORM    ,TIFF_VARIABLE,TIFF_VARIABLE,
+      TIFF_SHORT    ,FIELD_JPEGPOINTTRANSFORM    ,FALSE,TRUE ,"JPEGPointTransforms"
+    },
+    {
+      TIFFTAG_JPEGQTABLES           ,TIFF_VARIABLE,TIFF_VARIABLE,
+      TIFF_LONG     ,FIELD_JPEGQTABLES           ,FALSE,TRUE ,"JPEGQTables"
+    },
+    {
+      TIFFTAG_JPEGDCTABLES          ,TIFF_VARIABLE,TIFF_VARIABLE,
+      TIFF_LONG     ,FIELD_JPEGDCTABLES          ,FALSE,TRUE ,"JPEGDCTables"
+    },
+    {
+      TIFFTAG_JPEGACTABLES          ,TIFF_VARIABLE,TIFF_VARIABLE,
+      TIFF_LONG     ,FIELD_JPEGACTABLES          ,FALSE,TRUE ,"JPEGACTables"
+    },
+    {
+      TIFFTAG_WANG_PAGECONTROL      ,TIFF_VARIABLE,1            ,
+      TIFF_LONG     ,FIELD_WANG_PAGECONTROL      ,FALSE,FALSE,"WANG PageControl"
+    },
+
+ /* This is a pseudo tag intended for internal use only by the TIFF Library and
+    its clients, which should never appear in an input/output image file.  It
+    specifies whether the TIFF Library (or its client) should do YCbCr <-> RGB
+    color-space conversion (JPEGCOLORMODE_RAW <=> 0) or whether we should ask
+    the JPEG Library to do it (JPEGCOLORMODE_RGB <=> 1).
+ */
+    {
+      TIFFTAG_JPEGCOLORMODE         ,0            ,0            ,
+      TIFF_ANY      ,FIELD_PSEUDO                ,FALSE,FALSE,"JPEGColorMode"
+    }
+  };
+static const char JPEGLib_name[]={"JPEG Library"},
+                  bad_bps[]={"%u BitsPerSample not allowed for JPEG"},
+                  bad_photometry[]={"PhotometricInterpretation %u not allowed for JPEG"},
+                  bad_subsampling[]={"invalid YCbCr subsampling factor(s)"},
+#                 ifdef never
+                  no_write_frac[]={"fractional scan line discarded"},
+#                 endif
+                  no_read_frac[]={"fractional scan line not read"},
+                  no_jtable_space[]={"No space for JPEGTables"};
+
+/* The following diagnostic subroutines interface with and replace default
+   subroutines in the JPEG Library.  Our basic strategy is to use "setjmp()"/
+   "longjmp()" in order to return control to the TIFF Library when the JPEG
+   library detects an error, and to use TIFF Library subroutines for displaying
+   diagnostic messages to a client application.
+*/
+static void
+TIFFojpeg_error_exit(register j_common_ptr cinfo)
+{
+    char buffer[JMSG_LENGTH_MAX];
+    int code = cinfo->err->msg_code;
+
+    if (((OJPEGState *)cinfo)->is_WANG) {
+	if (code == JERR_SOF_DUPLICATE || code == JERR_SOI_DUPLICATE)
+	    return;	    /* ignore it */
+    }
+
+    (*cinfo->err->format_message)(cinfo,buffer);
+    TIFFError(JPEGLib_name,buffer); /* Display error message */
+    jpeg_abort(cinfo); /* Clean up JPEG Library state */
+    LONGJMP(((OJPEGState *)cinfo)->exit_jmpbuf,1); /* Return to TIFF client */
+}
+
+static void
+TIFFojpeg_output_message(register j_common_ptr cinfo)
+  { char buffer[JMSG_LENGTH_MAX];
+
+ /* This subroutine is invoked only for warning messages, since the JPEG
+    Library's "error_exit" method does its own thing and "trace_level" is never
+    set > 0.
+ */
+    (*cinfo->err->format_message)(cinfo,buffer);
+    TIFFWarning(JPEGLib_name,buffer);
+  }
+
+/* The following subroutines, which also interface with the JPEG Library, exist
+   mainly in limit the side effects of "setjmp()" and convert JPEG normal/error
+   conditions into TIFF Library return codes.
+*/
+#define CALLJPEG(sp,fail,op)(SETJMP((sp)->exit_jmpbuf)?(fail):(op))
+#define CALLVJPEG(sp,op)CALLJPEG(sp,0,((op),1))
+#ifdef never
+
+static int
+TIFFojpeg_create_compress(register OJPEGState *sp)
+  {
+    sp->cinfo.c.err = jpeg_std_error(&sp->err); /* Initialize error handling */
+    sp->err.error_exit = TIFFojpeg_error_exit;
+    sp->err.output_message = TIFFojpeg_output_message;
+    return CALLVJPEG(sp,jpeg_create_compress(&sp->cinfo.c));
+  }
+
+/* The following subroutines comprise a JPEG Library "destination" data manager
+   by directing compressed data from the JPEG Library to a TIFF Library output
+   buffer.
+*/
+static void
+std_init_destination(register j_compress_ptr cinfo){} /* "Dummy" stub */
+
+static boolean
+std_empty_output_buffer(register j_compress_ptr cinfo)
+  {
+#   define sp ((OJPEGState *)cinfo)
+    register TIFF *tif = sp->tif;
+
+    tif->tif_rawcc = tif->tif_rawdatasize; /* Entire buffer has been filled */
+    TIFFFlushData1(tif);
+    sp->dest.next_output_byte = (JOCTET *)tif->tif_rawdata;
+    sp->dest.free_in_buffer = (size_t)tif->tif_rawdatasize;
+    return TRUE;
+#   undef sp
+  }
+
+static void
+std_term_destination(register j_compress_ptr cinfo)
+  {
+#   define sp ((OJPEGState *)cinfo)
+    register TIFF *tif = sp->tif;
+
+ /* NB: The TIFF Library does the final buffer flush. */
+    tif->tif_rawcp = (tidata_t)sp->dest.next_output_byte;
+    tif->tif_rawcc = tif->tif_rawdatasize - (tsize_t)sp->dest.free_in_buffer;
+#   undef sp
+  }
+
+/* Alternate destination manager to output JPEGTables field: */
+
+static void
+tables_init_destination(register j_compress_ptr cinfo)
+  {
+#   define sp ((OJPEGState *)cinfo)
+ /* The "jpegtables_length" field is the allocated buffer size while building */
+    sp->dest.next_output_byte = (JOCTET *)sp->jpegtables;
+    sp->dest.free_in_buffer = (size_t)sp->jpegtables_length;
+#   undef sp
+  }
+
+static boolean
+tables_empty_output_buffer(register j_compress_ptr cinfo)
+  { void *newbuf;
+#   define sp ((OJPEGState *)cinfo)
+
+ /* The entire buffer has been filled, so enlarge it by 1000 bytes. */
+    if (!( newbuf = _TIFFrealloc( (tdata_t)sp->jpegtables
+                                , (tsize_t)(sp->jpegtables_length + 1000)
+                                )
+         )
+       ) ERREXIT1(cinfo,JERR_OUT_OF_MEMORY,100);
+    sp->dest.next_output_byte = (JOCTET *)newbuf + sp->jpegtables_length;
+    sp->dest.free_in_buffer = (size_t)1000;
+    sp->jpegtables = newbuf;
+    sp->jpegtables_length += 1000;
+    return TRUE;
+#   undef sp
+  }
+
+static void
+tables_term_destination(register j_compress_ptr cinfo)
+  {
+#   define sp ((OJPEGState *)cinfo)
+ /* Set tables length to no. of Bytes actually emitted. */
+    sp->jpegtables_length -= sp->dest.free_in_buffer;
+#   undef sp
+  }
+
+/*ARGSUSED*/ static int
+TIFFojpeg_tables_dest(register OJPEGState *sp, TIFF *tif)
+  {
+
+ /* Allocate a working buffer for building tables.  The initial size is 1000
+    Bytes, which is usually adequate.
+ */
+    if (sp->jpegtables) _TIFFfree(sp->jpegtables);
+    if (!(sp->jpegtables = (void*)
+                           _TIFFmalloc((tsize_t)(sp->jpegtables_length = 1000))
+         )
+       )
+      {
+        sp->jpegtables_length = 0;
+        TIFFError("TIFFojpeg_tables_dest",no_jtable_space);
+        return 0;
+      };
+    sp->cinfo.c.dest = &sp->dest;
+    sp->dest.init_destination = tables_init_destination;
+    sp->dest.empty_output_buffer = tables_empty_output_buffer;
+    sp->dest.term_destination = tables_term_destination;
+    return 1;
+  }
+#else /* well, hardly ever */
+
+static int
+_notSupported(register TIFF *tif)
+  { const TIFFCodec *c = TIFFFindCODEC(tif->tif_dir.td_compression);
+
+    TIFFError(tif->tif_name,"%s compression not supported",c->name);
+    return 0;
+  }
+#endif /* never */
+
+/* The following subroutines comprise a JPEG Library "source" data manager by
+   by directing compressed data to the JPEG Library from a TIFF Library input
+   buffer.
+*/
+static void
+std_init_source(register j_decompress_ptr cinfo)
+  {
+#   define sp ((OJPEGState *)cinfo)
+    register TIFF *tif = sp->tif;
+
+    if (sp->src.bytes_in_buffer == 0)
+      {
+        sp->src.next_input_byte = (const JOCTET *)tif->tif_rawdata;
+        sp->src.bytes_in_buffer = (size_t)tif->tif_rawcc;
+      };
+#   undef sp
+  }
+
+static boolean
+std_fill_input_buffer(register j_decompress_ptr cinfo)
+  { static const JOCTET dummy_EOI[2]={0xFF,JPEG_EOI};
+#   define sp ((OJPEGState *)cinfo)
+
+ /* Control should never get here, since an entire strip/tile is read into
+    memory before the decompressor is called; thus, data should have been
+    supplied by the "init_source" method.  ...But, sometimes things fail.
+ */
+    WARNMS(cinfo,JWRN_JPEG_EOF);
+    sp->src.next_input_byte = dummy_EOI; /* Insert a fake EOI marker */
+    sp->src.bytes_in_buffer = sizeof dummy_EOI;
+    return TRUE;
+#   undef sp
+  }
+
+static void
+std_skip_input_data(register j_decompress_ptr cinfo, long num_bytes)
+  {
+#   define sp ((OJPEGState *)cinfo)
+
+    if (num_bytes > 0)
+    {
+      if (num_bytes > (long)sp->src.bytes_in_buffer) /* oops: buffer overrun */
+        (void)std_fill_input_buffer(cinfo);
+      else
+        {
+          sp->src.next_input_byte += (size_t)num_bytes;
+          sp->src.bytes_in_buffer -= (size_t)num_bytes;
+        }
+    }
+#   undef sp
+  }
+
+/*ARGSUSED*/ static void
+std_term_source(register j_decompress_ptr cinfo){} /* "Dummy" stub */
+
+/* Allocate temporary I/O buffers for downsampled data, using values computed in
+   "jpeg_start_{de}compress()".  We use the JPEG Library's allocator so that
+   buffers will be released automatically when done with a strip/tile.  This is
+   also a handy place to compute samplesperclump, bytesperline, etc.
+*/
+static int
+alloc_downsampled_buffers(TIFF *tif,jpeg_component_info *comp_info,
+                          int num_components)
+  { register OJPEGState *sp = OJState(tif);
+
+    sp->samplesperclump = 0;
+    if (num_components > 0)
+      { tsize_t size = sp->cinfo.comm.is_decompressor
+#                    ifdef D_LOSSLESS_SUPPORTED
+                     ? sp->cinfo.d.min_codec_data_unit
+#                    else
+                     ? DCTSIZE
+#                    endif
+#                    ifdef C_LOSSLESS_SUPPORTED
+                     : sp->cinfo.c.data_unit;
+#                    else
+                     : DCTSIZE;
+#                    endif
+        int ci = 0;
+        register jpeg_component_info *compptr = comp_info;
+
+        do
+          { JSAMPARRAY buf;
+
+            sp->samplesperclump +=
+              compptr->h_samp_factor * compptr->v_samp_factor;
+#           if defined(C_LOSSLESS_SUPPORTED) || defined(D_LOSSLESS_SUPPORTED)
+            if (!(buf = CALLJPEG(sp,0,(*sp->cinfo.comm.mem->alloc_sarray)(&sp->cinfo.comm,JPOOL_IMAGE,compptr->width_in_data_units*size,compptr->v_samp_factor*size))))
+#           else
+            if (!(buf = CALLJPEG(sp,0,(*sp->cinfo.comm.mem->alloc_sarray)(&sp->cinfo.comm,JPOOL_IMAGE,compptr->width_in_blocks*size,compptr->v_samp_factor*size))))
+#           endif
+              return 0;
+            sp->ds_buffer[ci] = buf;
+          }
+        while (++compptr,++ci < num_components);
+      };
+    return 1;
+  }
+#ifdef never
+
+/* JPEG Encoding begins here. */
+
+/*ARGSUSED*/ static int
+OJPEGEncode(register TIFF *tif,tidata_t buf,tsize_t cc,tsample_t s)
+  { tsize_t rows;                          /* No. of unprocessed rows in file */
+    register OJPEGState *sp = OJState(tif);
+
+ /* Encode a chunk of pixels, where returned data is NOT down-sampled (the
+    standard case).  The data is expected to be written in scan-line multiples.
+ */
+    if (cc % sp->bytesperline) TIFFWarning(tif->tif_name,no_write_frac);
+    if ( (cc /= bytesperline)      /* No. of complete rows in caller's buffer */
+       > (rows = sp->cinfo.c.image_height - sp->cinfo.c.next_scanline)
+       ) cc = rows;
+    while (--cc >= 0)
+      {
+        if (   CALLJPEG(sp,-1,jpeg_write_scanlines(&sp->cinfo.c,(JSAMPARRAY)&buf,1))
+            != 1
+           ) return 0;
+        ++tif->tif_row;
+        buf += sp->bytesperline;
+      };
+    return 1;
+  }
+
+/*ARGSUSED*/ static int
+OJPEGEncodeRaw(register TIFF *tif,tidata_t buf,tsize_t cc,tsample_t s)
+  { tsize_t rows;                          /* No. of unprocessed rows in file */
+    JDIMENSION lines_per_MCU, size;
+    register OJPEGState *sp = OJState(tif);
+
+ /* Encode a chunk of pixels, where returned data is down-sampled as per the
+    sampling factors.  The data is expected to be written in scan-line
+    multiples.
+ */
+    cc /= sp->bytesperline;
+    if (cc % sp->bytesperline) TIFFWarning(tif->tif_name,no_write_frac);
+    if ( (cc /= bytesperline)      /* No. of complete rows in caller's buffer */
+       > (rows = sp->cinfo.c.image_height - sp->cinfo.c.next_scanline)
+       ) cc = rows;
+#   ifdef C_LOSSLESS_SUPPORTED
+    lines_per_MCU = sp->cinfo.c.max_samp_factor*(size = sp->cinfo.d.data_unit);
+#   else
+    lines_per_MCU = sp->cinfo.c.max_samp_factor*(size = DCTSIZE);
+#   endif
+    while (--cc >= 0)
+      { int ci = 0, clumpoffset = 0;
+        register jpeg_component_info *compptr = sp->cinfo.c.comp_info;
+
+     /* The fastest way to separate the data is to make 1 pass over the scan
+        line for each row of each component.
+     */
+        do
+          { int ypos = 0;
+
+            do
+              { int padding;
+                register JSAMPLE *inptr = (JSAMPLE*)buf + clumpoffset,
+                                 *outptr =
+                  sp->ds_buffer[ci][sp->scancount*compptr->v_samp_factor+ypos];
+             /* Cb,Cr both have sampling factors 1, so this is correct */
+                register int clumps_per_line =
+                  sp->cinfo.c.comp_info[1].downsampled_width,
+                             xpos;
+
+                padding = (int)
+#                         ifdef C_LOSSLESS_SUPPORTED
+                          ( compptr->width_in_data_units * size
+#                         else
+                          ( compptr->width_in_blocks * size
+#                         endif
+                          - clumps_per_line * compptr->h_samp_factor
+                          );
+                if (compptr->h_samp_factor == 1) /* Cb & Cr fast path */
+                  do *outptr++ = *inptr;
+                  while ((inptr += sp->samplesperclump),--clumps_per_line > 0);
+                else /* general case */
+                  do
+                    {
+                      xpos = 0;
+                      do *outptr++ = inptr[xpos];
+                      while (++xpos < compptr->h_samp_factor);
+                    }
+                  while ((inptr += sp->samplesperclump),--clumps_per_line > 0);
+                xpos = 0; /* Pad each scan line as needed */
+                do outptr[0] = outptr[-1]; while (++outptr,++xpos < padding);
+                clumpoffset += compptr->h_samp_factor;
+              }
+            while (++ypos < compptr->v_samp_factor);
+          }
+        while (++compptr,++ci < sp->cinfo.c.num_components);
+        if (++sp->scancount >= size)
+          {
+            if (   CALLJPEG(sp,-1,jpeg_write_raw_data(&sp->cinfo.c,sp->ds_buffer,lines_per_MCU))
+                != lines_per_MCU
+               ) return 0;
+            sp->scancount = 0;
+          };
+        ++tif->tif_row++
+        buf += sp->bytesperline;
+      };
+    return 1;
+  }
+
+static int
+OJPEGSetupEncode(register TIFF *tif)
+  { static const char module[]={"OJPEGSetupEncode"};
+    uint32 segment_height, segment_width;
+    int status = 1;                              /* Assume success by default */
+    register OJPEGState *sp = OJState(tif);
+#   define td (&tif->tif_dir)
+
+ /* Verify miscellaneous parameters.  This will need work if the TIFF Library
+    ever supports different depths for different components, or if the JPEG
+    Library ever supports run-time depth selection.  Neither seems imminent.
+ */
+    if (td->td_bitspersample != 8)
+      {
+        TIFFError(module,bad_bps,td->td_bitspersample);
+        status = 0;
+      };
+
+ /* The TIFF Version 6.0 specification and IJG JPEG Library accept different
+    sets of color spaces, so verify that our image belongs to the common subset
+    and map its photometry code, then initialize to handle subsampling and
+    optional JPEG Library YCbCr <-> RGB color-space conversion.
+ */
+    switch (td->td_photometric)
+      {
+        case PHOTOMETRIC_YCBCR     :
+
+       /* ISO IS 10918-1 requires that JPEG subsampling factors be 1-4, but
+          TIFF Version 6.0 is more restrictive: only 1, 2, and 4 are allowed.
+       */
+          if (   (   td->td_ycbcrsubsampling[0] == 1
+                  || td->td_ycbcrsubsampling[0] == 2
+                  || td->td_ycbcrsubsampling[0] == 4
+                 )
+              && (   td->td_ycbcrsubsampling[1] == 1
+                  || td->td_ycbcrsubsampling[1] == 2
+                  || td->td_ycbcrsubsampling[1] == 4
+                 )
+             )
+            sp->cinfo.c.raw_data_in =
+              ( (sp->h_sampling = td->td_ycbcrsubsampling[0]) << 3
+              | (sp->v_sampling = td->td_ycbcrsubsampling[1])
+              ) != 011;
+          else
+            {
+              TIFFError(module,bad_subsampling);
+              status = 0;
+            };
+
+       /* A ReferenceBlackWhite field MUST be present, since the default value
+          is inapproriate for YCbCr.  Fill in the proper value if the
+          application didn't set it.
+       */
+          if (!TIFFFieldSet(tif,FIELD_REFBLACKWHITE))
+            { float refbw[6];
+              long top = 1L << td->td_bitspersample;
+
+              refbw[0] = 0;
+              refbw[1] = (float)(top-1L);
+              refbw[2] = (float)(top>>1);
+              refbw[3] = refbw[1];
+              refbw[4] = refbw[2];
+              refbw[5] = refbw[1];
+              TIFFSetField(tif,TIFFTAG_REFERENCEBLACKWHITE,refbw);
+            };
+          sp->cinfo.c.jpeg_color_space = JCS_YCbCr;
+          if (sp->jpegcolormode == JPEGCOLORMODE_RGB)
+            {
+              sp->cinfo.c.raw_data_in = FALSE;
+              sp->in_color_space = JCS_RGB;
+              break;
+            };
+          goto L2;
+        case PHOTOMETRIC_MINISBLACK:
+          sp->cinfo.c.jpeg_color_space = JCS_GRAYSCALE;
+          goto L1;
+        case PHOTOMETRIC_RGB       :
+          sp->cinfo.c.jpeg_color_space = JCS_RGB;
+          goto L1;
+        case PHOTOMETRIC_SEPARATED :
+          sp->cinfo.c.jpeg_color_space = JCS_CMYK;
+      L1: sp->jpegcolormode = JPEGCOLORMODE_RAW; /* No JPEG Lib. conversion */
+      L2: sp->cinfo.d.in_color_space = sp->cinfo.d.jpeg_color-space;
+          break;
+        default                    :
+          TIFFError(module,bad_photometry,td->td_photometric);
+          status = 0;
+      };
+    tif->tif_encoderow = tif->tif_encodestrip = tif->tif_encodetile =
+      sp->cinfo.c.raw_data_in ? OJPEGEncodeRaw : OJPEGEncode;
+    if (isTiled(tif))
+      { tsize_t size;
+
+#       ifdef C_LOSSLESS_SUPPORTED
+        if ((size = sp->v_sampling*sp->cinfo.c.data_unit) < 16) size = 16;
+#       else
+        if ((size = sp->v_sampling*DCTSIZE) < 16) size = 16;
+#       endif
+        if ((segment_height = td->td_tilelength) % size)
+          {
+            TIFFError(module,"JPEG tile height must be multiple of %d",size);
+            status = 0;
+          };
+#       ifdef C_LOSSLESS_SUPPORTED
+        if ((size = sp->h_sampling*sp->cinfo.c.data_unit) < 16) size = 16;
+#       else
+        if ((size = sp->h_sampling*DCTSIZE) < 16) size = 16;
+#       endif
+        if ((segment_width = td->td_tilewidth) % size)
+          {
+            TIFFError(module,"JPEG tile width must be multiple of %d",size);
+            status = 0;
+          };
+        sp->bytesperline = TIFFTileRowSize(tif);
+      }
+    else
+      { tsize_t size;
+
+#       ifdef C_LOSSLESS_SUPPORTED
+        if ((size = sp->v_sampling*sp->cinfo.c.data_unit) < 16) size = 16;
+#       else
+        if ((size = sp->v_sampling*DCTSIZE) < 16) size = 16;
+#       endif
+        if (td->td_rowsperstrip < (segment_height = td->td_imagelength))
+          {
+            if (td->td_rowsperstrip % size)
+              {
+                TIFFError(module,"JPEG RowsPerStrip must be multiple of %d",size);
+                status = 0;
+              };
+            segment_height = td->td_rowsperstrip;
+          };
+        segment_width = td->td_imagewidth;
+        sp->bytesperline = tif->tif_scanlinesize;
+      };
+    if (segment_width > 65535 || segment_height > 65535)
+      {
+        TIFFError(module,"Strip/tile too large for JPEG");
+        status = 0;
+      };
+
+ /* Initialize all JPEG parameters to default values.  Note that the JPEG
+    Library's "jpeg_set_defaults()" method needs legal values for the
+    "in_color_space" and "input_components" fields.
+ */
+    sp->cinfo.c.input_components = 1; /* Default for JCS_UNKNOWN */
+    if (!CALLVJPEG(sp,jpeg_set_defaults(&sp->cinfo.c))) status = 0;
+    switch (sp->jpegtablesmode & (JPEGTABLESMODE_HUFF|JPEGTABLESMODE_QUANT))
+      { register JHUFF_TBL *htbl;
+        register JQUANT_TBL *qtbl;
+
+        case 0                                       :
+          sp->cinfo.c.optimize_coding = TRUE;
+        case JPEGTABLESMODE_HUFF                     :
+          if (!CALLVJPEG(sp,jpeg_set_quality(&sp->cinfo.c,sp->jpegquality,FALSE)))
+            return 0;
+          if (qtbl = sp->cinfo.c.quant_tbl_ptrs[0]) qtbl->sent_table = FALSE;
+          if (qtbl = sp->cinfo.c.quant_tbl_ptrs[1]) qtbl->sent_table = FALSE;
+          goto L3;
+        case JPEGTABLESMODE_QUANT                    :
+          sp->cinfo.c.optimize_coding = TRUE;
+
+       /* We do not support application-supplied JPEG tables, so mark the field
+          "not present".
+       */
+      L3: TIFFClrFieldBit(tif,FIELD_JPEGTABLES);
+          break;
+        case JPEGTABLESMODE_HUFF|JPEGTABLESMODE_QUANT:
+          if (   !CALLVJPEG(sp,jpeg_set_quality(&sp->cinfo.c,sp->jpegquality,FALSE))
+              || !CALLVJPEG(sp,jpeg_suppress_tables(&sp->cinfo.c,TRUE))
+             )
+            {
+              status = 0;
+              break;
+            };
+          if (qtbl = sp->cinfo.c.quant_tbl_ptrs[0]) qtbl->sent_table = FALSE;
+          if (htbl = sp->cinfo.c.dc_huff_tbl_ptrs[0]) htbl->sent_table = FALSE;
+          if (htbl = sp->cinfo.c.ac_huff_tbl_ptrs[0]) htbl->sent_table = FALSE;
+          if (sp->cinfo.c.jpeg_color_space == JCS_YCbCr)
+            {
+              if (qtbl = sp->cinfo.c.quant_tbl_ptrs[1])
+                qtbl->sent_table = FALSE;
+              if (htbl = sp->cinfo.c.dc_huff_tbl_ptrs[1])
+                htbl->sent_table = FALSE;
+              if (htbl = sp->cinfo.c.ac_huff_tbl_ptrs[1])
+                htbl->sent_table = FALSE;
+            };
+          if (   TIFFojpeg_tables_dest(sp,tif)
+              && CALLVJPEG(sp,jpeg_write_tables(&sp->cinfo.c))
+             )
+            {
+
+           /* Mark the field "present".  We can't use "TIFFSetField()" because
+              "BEENWRITING" is already set!
+           */
+              TIFFSetFieldBit(tif,FIELD_JPEGTABLES);
+              tif->tif_flags |= TIFF_DIRTYDIRECT;
+            }
+          else status = 0;
+      };
+    if (   sp->cinfo.c.raw_data_in
+        && !alloc_downsampled_buffers(tif,sp->cinfo.c.comp_info,
+                                      sp->cinfo.c.num_components)
+       ) status = 0;
+    if (status == 0) return 0; /* If TIFF errors, don't bother to continue */
+ /* Grab parameters that are same for all strips/tiles. */
+
+    sp->dest.init_destination = std_init_destination;
+    sp->dest.empty_output_buffer = std_empty_output_buffer;
+    sp->dest.term_destination = std_term_destination;
+    sp->cinfo.c.dest = &sp->dest;
+    sp->cinfo.c.data_precision = td->td_bitspersample;
+    sp->cinfo.c.write_JFIF_header = /* Don't write extraneous markers */
+    sp->cinfo.c.write_Adobe_marker = FALSE;
+    sp->cinfo.c.image_width = segment_width;
+    sp->cinfo.c.image_height = segment_height;
+    sp->cinfo.c.comp_info[0].h_samp_factor =
+    sp->cinfo.c.comp_info[0].v_samp_factor = 1;
+    return CALLVJPEG(sp,jpeg_start_compress(&sp->cinfo.c,FALSE));
+#   undef td
+  }
+
+static int
+OJPEGPreEncode(register TIFF *tif,tsample_t s)
+  { register OJPEGState *sp = OJState(tif);
+#   define td (&tif->tif_dir)
+
+ /* If we are about to write the first row of an image plane, which should
+    coincide with a JPEG "scan", reset the JPEG Library's compressor.  Otherwise
+    let the compressor run "as is" and return a "success" status without further
+    ado.
+ */
+    if (     (isTiled(tif) ? tif->tif_curtile : tif->tif_curstrip)
+           % td->td_stripsperimage
+        == 0
+       )
+      {
+        if (   (sp->cinfo.c.comp_info[0].component_id = s) == 1)
+            && sp->cinfo.c.jpeg_color_space == JCS_YCbCr
+           )
+          {
+            sp->cinfo.c.comp_info[0].quant_tbl_no =
+            sp->cinfo.c.comp_info[0].dc_tbl_no =
+            sp->cinfo.c.comp_info[0].ac_tbl_no = 1;
+            sp->cinfo.c.comp_info[0].h_samp_factor = sp->h_sampling;
+            sp->cinfo.c.comp_info[0].v_samp_factor = sp->v_sampling;
+
+         /* Scale expected strip/tile size to match a downsampled component. */
+
+            sp->cinfo.c.image_width = TIFFhowmany(segment_width,sp->h_sampling);
+            sp->cinfo.c.image_height=TIFFhowmany(segment_height,sp->v_sampling);
+          };
+        sp->scancount = 0; /* Mark subsampling buffer(s) empty */
+      };
+    return 1;
+#   undef td
+  }
+
+static int
+OJPEGPostEncode(register TIFF *tif)
+  { register OJPEGState *sp = OJState(tif);
+
+ /* Finish up at the end of a strip or tile. */
+
+    if (sp->scancount > 0) /* emit partial buffer of down-sampled data */
+      { JDIMENSION n;
+
+#       ifdef C_LOSSLESS_SUPPORTED
+        if (   sp->scancount < sp->cinfo.c.data_unit
+            && sp->cinfo.c.num_components > 0
+           )
+#       else
+        if (sp->scancount < DCTSIZE && sp->cinfo.c.num_components > 0)
+#       endif
+          { int ci = 0,                            /* Pad the data vertically */
+#           ifdef C_LOSSLESS_SUPPORTED
+                size = sp->cinfo.c.data_unit;
+#           else
+                size = DCTSIZE;
+#           endif
+            register jpeg_component_info *compptr = sp->cinfo.c.comp_info;
+
+            do
+#              ifdef C_LOSSLESS_SUPPORTED
+               { tsize_t row_width = compptr->width_in_data_units
+#              else
+                 tsize_t row_width = compptr->width_in_blocks
+#              endif
+                   *size*sizeof(JSAMPLE);
+                 int ypos = sp->scancount*compptr->v_samp_factor;
+
+                 do _TIFFmemcpy( (tdata_t)sp->ds_buffer[ci][ypos]
+                               , (tdata_t)sp->ds_buffer[ci][ypos-1]
+                               , row_width
+                               );
+                 while (++ypos < compptr->v_samp_factor*size);
+               }
+            while (++compptr,++ci < sp->cinfo.c.num_components);
+          };
+        n = sp->cinfo.c.max_v_samp_factor*size;
+        if (CALLJPEG(sp,-1,jpeg_write_raw_data(&sp->cinfo.c,sp->ds_buffer,n)) != n)
+          return 0;
+      };
+    return CALLVJPEG(sp,jpeg_finish_compress(&sp->cinfo.c));
+  }
+#endif /* never */
+
+/* JPEG Decoding begins here. */
+
+/*ARGSUSED*/ static int
+OJPEGDecode(register TIFF *tif,tidata_t buf,tsize_t cc,tsample_t s)
+  { tsize_t bytesperline = isTiled(tif)
+                         ? TIFFTileRowSize(tif)
+                         : tif->tif_scanlinesize,
+            rows;                          /* No. of unprocessed rows in file */
+    register OJPEGState *sp = OJState(tif);
+
+ /* Decode a chunk of pixels, where the input data has not NOT been down-
+    sampled, or else the TIFF Library's client has used the "JPEGColorMode" TIFF
+    pseudo-tag to request that the JPEG Library do color-space conversion; this
+    is the normal case.  The data is expected to be read in scan-line multiples,
+    and this subroutine is called for both pixel-interleaved and separate color
+    planes.
+
+    WARNING:  Unlike "OJPEGDecodeRawContig()", below, the no. of Bytes in each
+              decoded row is calculated here as "bytesperline" instead of
+    using "sp->bytesperline", which might be a little smaller.  This can
+    occur for an old tiled image whose width isn't a multiple of 8 pixels.
+    That's illegal according to the TIFF Version 6 specification, but some
+    test files, like "zackthecat.tif", were built that way.  In those cases,
+    we want to embed the image's true width in our caller's buffer (which is
+    presumably allocated according to the expected tile width) by
+    effectively "padding" it with unused Bytes at the end of each row.
+ */
+    if ( (cc /= bytesperline)      /* No. of complete rows in caller's buffer */
+       > (rows = sp->cinfo.d.output_height - sp->cinfo.d.output_scanline)
+       ) cc = rows;
+    while (--cc >= 0)
+      {
+        if (   CALLJPEG(sp,-1,jpeg_read_scanlines(&sp->cinfo.d,(JSAMPARRAY)&buf,1))
+            != 1
+           ) return 0;
+        buf += bytesperline;
+        ++tif->tif_row;
+      };
+
+ /* BEWARE OF KLUDGE:  If our input file was produced by Microsoft's Wang
+                       Imaging for Windows application, the DC coefficients of
+    each JPEG image component (Y,Cb,Cr) must be reset at the end of each TIFF
+    "strip", and any JPEG data bits remaining in the current Byte of the
+    decoder's input buffer must be discarded.  To do so, we create an "ad hoc"
+    interface in the "jdhuff.c" module of IJG JPEG Library Version 6 (module
+    "jdshuff.c", if Ken Murchison's lossless-Huffman patch is applied), and we
+    invoke that interface here after decoding each "strip".
+ */
+    if (sp->is_WANG) jpeg_reset_huff_decode(&sp->cinfo.d);
+    return 1;
+  }
+
+/*ARGSUSED*/ static int
+OJPEGDecodeRawContig(register TIFF *tif,tidata_t buf,tsize_t cc,tsample_t s)
+  { tsize_t rows;                          /* No. of unprocessed rows in file */
+    JDIMENSION lines_per_MCU, size;
+    register OJPEGState *sp = OJState(tif);
+
+ /* Decode a chunk of pixels, where the input data has pixel-interleaved color
+    planes, some of which have been down-sampled, but the TIFF Library's client
+    has NOT used the "JPEGColorMode" TIFF pseudo-tag to request that the JPEG
+    Library do color-space conversion.  In other words, we must up-sample/
+    expand/duplicate image components according to the image's sampling factors,
+    without changing its color space.  The data is expected to be read in scan-
+    line multiples.
+ */
+    if ( (cc /= sp->bytesperline)  /* No. of complete rows in caller's buffer */
+       > (rows = sp->cinfo.d.output_height - sp->cinfo.d.output_scanline)
+       ) cc = rows;
+    lines_per_MCU = sp->cinfo.d.max_v_samp_factor
+#   ifdef D_LOSSLESS_SUPPORTED
+                  * (size = sp->cinfo.d.min_codec_data_unit);
+#   else
+                  * (size = DCTSIZE);
+#   endif
+    while (--cc >= 0)
+      { int clumpoffset, ci;
+        register jpeg_component_info *compptr;
+
+        if (sp->scancount >= size) /* reload downsampled-data buffers */
+          {
+            if (   CALLJPEG(sp,-1,jpeg_read_raw_data(&sp->cinfo.d,sp->ds_buffer,lines_per_MCU))
+                != lines_per_MCU
+               ) return 0;
+            sp->scancount = 0;
+          };
+
+     /* The fastest way to separate the data is: make 1 pass over the scan
+        line for each row of each component.
+     */
+        clumpoffset = ci = 0;
+        compptr = sp->cinfo.d.comp_info;
+        do
+          { int ypos = 0;
+
+            if (compptr->h_samp_factor == 1) /* fast path */
+              do
+                { register JSAMPLE *inptr =
+                    sp->ds_buffer[ci][sp->scancount*compptr->v_samp_factor+ypos],
+                                   *outptr = (JSAMPLE *)buf + clumpoffset;
+                  register int clumps_per_line = compptr->downsampled_width;
+
+                  do *outptr = *inptr++;
+                  while ((outptr += sp->samplesperclump),--clumps_per_line > 0);
+                }
+              while ( (clumpoffset += compptr->h_samp_factor)
+                    , ++ypos < compptr->v_samp_factor
+                    );
+            else /* general case */
+              do
+                { register JSAMPLE *inptr =
+                    sp->ds_buffer[ci][sp->scancount*compptr->v_samp_factor+ypos],
+                                   *outptr = (JSAMPLE *)buf + clumpoffset;
+                  register int clumps_per_line = compptr->downsampled_width;
+
+                  do
+                    { register int xpos = 0;
+
+                      do outptr[xpos] = *inptr++;
+                      while (++xpos < compptr->h_samp_factor);
+                    }
+                  while ((outptr += sp->samplesperclump),--clumps_per_line > 0);
+                }
+              while ( (clumpoffset += compptr->h_samp_factor)
+                    , ++ypos < compptr->v_samp_factor
+                    );
+          }
+        while (++compptr,++ci < sp->cinfo.d.num_components);
+        ++sp->scancount;
+        buf += sp->bytesperline;
+        ++tif->tif_row;
+      };
+
+ /* BEWARE OF KLUDGE:  If our input file was produced by Microsoft's Wang
+                       Imaging for Windows application, the DC coefficients of
+    each JPEG image component (Y,Cb,Cr) must be reset at the end of each TIFF
+    "strip", and any JPEG data bits remaining in the current Byte of the
+    decoder's input buffer must be discarded.  To do so, we create an "ad hoc"
+    interface in the "jdhuff.c" module of IJG JPEG Library Version 6 (module
+    "jdshuff.c", if Ken Murchison's lossless-Huffman patch is applied), and we
+    invoke that interface here after decoding each "strip".
+ */
+    if (sp->is_WANG) jpeg_reset_huff_decode(&sp->cinfo.d);
+    return 1;
+  }
+
+/*ARGSUSED*/ static int
+OJPEGDecodeRawSeparate(TIFF *tif,register tidata_t buf,tsize_t cc,tsample_t s)
+  { tsize_t rows;                          /* No. of unprocessed rows in file */
+    JDIMENSION lines_per_MCU,
+               size,                                             /* ...of MCU */
+               v;                   /* Component's vertical up-sampling ratio */
+    register OJPEGState *sp = OJState(tif);
+    register jpeg_component_info *compptr = sp->cinfo.d.comp_info + s;
+
+ /* Decode a chunk of pixels, where the input data has separate color planes,
+    some of which have been down-sampled, but the TIFF Library's client has NOT
+    used the "JPEGColorMode" TIFF pseudo-tag to request that the JPEG Library
+    do color-space conversion.  The data is expected to be read in scan-line
+    multiples.
+ */
+    v = sp->cinfo.d.max_v_samp_factor/compptr->v_samp_factor;
+    if ( (cc /= compptr->downsampled_width) /* No. of rows in caller's buffer */
+       > (rows = (sp->cinfo.d.output_height-sp->cinfo.d.output_scanline+v-1)/v)
+       ) cc = rows; /* No. of rows of "clumps" to read */
+    lines_per_MCU = sp->cinfo.d.max_v_samp_factor
+#   ifdef D_LOSSLESS_SUPPORTED
+                  * (size = sp->cinfo.d.min_codec_data_unit);
+#   else
+                  * (size = DCTSIZE);
+#   endif
+ L: if (sp->scancount >= size) /* reload downsampled-data buffers */
+      {
+        if (   CALLJPEG(sp,-1,jpeg_read_raw_data(&sp->cinfo.d,sp->ds_buffer,lines_per_MCU))
+            != lines_per_MCU
+           ) return 0;
+        sp->scancount = 0;
+      };
+    rows = 0;
+    do
+      { register JSAMPLE *inptr =
+          sp->ds_buffer[s][sp->scancount*compptr->v_samp_factor + rows];
+        register int clumps_per_line = compptr->downsampled_width;
+
+        do *buf++ = *inptr++; while (--clumps_per_line > 0); /* Copy scanline */
+        tif->tif_row += v;
+        if (--cc <= 0) return 1; /* End of caller's buffer? */
+      }
+    while (++rows < compptr->v_samp_factor);
+    ++sp->scancount;
+    goto L;
+  }
+
+/* "OJPEGSetupDecode()" temporarily forces the JPEG Library to use the following
+   subroutine as a "dummy" input reader in order to fool the library into
+   thinking that it has read the image's first "Start of Scan" (SOS) marker, so
+   that it initializes accordingly.
+*/
+/*ARGSUSED*/ METHODDEF(int)
+fake_SOS_marker(j_decompress_ptr cinfo){return JPEG_REACHED_SOS;}
+
+/*ARGSUSED*/ METHODDEF(int)
+suspend(j_decompress_ptr cinfo){return JPEG_SUSPENDED;}
+
+/* The JPEG Library's "null" color-space converter actually re-packs separate
+   color planes (it's native image representation) into a pixel-interleaved,
+   contiguous plane.  But if our TIFF Library client is tryng to process a
+   PLANARCONFIG_SEPARATE image, we don't want that; so here are modifications of
+   code in the JPEG Library's "jdcolor.c" file, which simply copy Bytes to a
+   color plane specified by the current JPEG "scan".
+*/
+METHODDEF(void)
+ycc_rgb_convert(register j_decompress_ptr cinfo,JSAMPIMAGE in,JDIMENSION row,
+                register JSAMPARRAY out,register int nrows)
+  { typedef struct                /* "jdcolor.c" color-space conversion state */
+      {
+
+     /* WARNING:  This declaration is ugly and dangerous!  It's supposed to be
+                  private to the JPEG Library's "jdcolor.c" module, but we also
+        need it here.  Since the library's copy might change without notice, be
+        sure to keep this one synchronized or the following code will break!
+     */
+        struct jpeg_color_deconverter pub; /* Public fields */
+     /* Private state for YCC->RGB conversion */
+        int *Cr_r_tab,   /* ->Cr to R conversion table */
+            *Cb_b_tab;   /* ->Cb to B conversion table */
+        INT32 *Cr_g_tab, /* ->Cr to G conversion table */
+              *Cb_g_tab; /* ->Cb to G conversion table */
+      } *my_cconvert_ptr;
+    my_cconvert_ptr cconvert = (my_cconvert_ptr)cinfo->cconvert;
+    JSAMPARRAY irow0p = in[0] + row;
+    register JSAMPLE *range_limit = cinfo->sample_range_limit;
+    register JSAMPROW outp, Y;
+
+    switch (cinfo->output_scan_number - 1)
+      { JSAMPARRAY irow1p, irow2p;
+        register INT32 *table0, *table1;
+        SHIFT_TEMPS
+
+        case RGB_RED  : irow2p = in[2] + row;
+                        table0 = (INT32 *)cconvert->Cr_r_tab;
+                        while (--nrows >= 0)
+                          { register JSAMPROW Cr = *irow2p++;
+                             register int i = cinfo->output_width;
+
+                             Y = *irow0p++;
+                             outp = *out++;
+                             while (--i >= 0)
+                               *outp++ = range_limit[*Y++ + table0[*Cr++]];
+                          };
+                        return;
+        case RGB_GREEN: irow1p = in[1] + row;
+                        irow2p = in[2] + row;
+                        table0 = cconvert->Cb_g_tab;
+                        table1 = cconvert->Cr_g_tab;
+                        while (--nrows >= 0)
+                          { register JSAMPROW Cb = *irow1p++,
+                                              Cr = *irow2p++;
+                             register int i = cinfo->output_width;
+
+                             Y = *irow0p++;
+                             outp = *out++;
+                             while (--i >= 0)
+                               *outp++ =
+                                 range_limit[ *Y++
+                                            + RIGHT_SHIFT(table0[*Cb++]+table1[*Cr++],16)
+                                            ];
+                          };
+                        return;
+        case RGB_BLUE : irow1p = in[1] + row;
+                        table0 = (INT32 *)cconvert->Cb_b_tab;
+                        while (--nrows >= 0)
+                          { register JSAMPROW Cb = *irow1p++;
+                             register int i = cinfo->output_width;
+
+                             Y = *irow0p++;
+                             outp = *out++;
+                             while (--i >= 0)
+                               *outp++ = range_limit[*Y++ + table0[*Cb++]];
+                          }
+      }
+  }
+
+METHODDEF(void)
+null_convert(register j_decompress_ptr cinfo,JSAMPIMAGE in,JDIMENSION row,
+             register JSAMPARRAY out,register int nrows)
+  { register JSAMPARRAY irowp = in[cinfo->output_scan_number - 1] + row;
+
+    while (--nrows >= 0) _TIFFmemcpy(*out++,*irowp++,cinfo->output_width);
+  }
+
+static int
+OJPEGSetupDecode(register TIFF *tif)
+  { static char module[]={"OJPEGSetupDecode"};
+    J_COLOR_SPACE jpeg_color_space,   /* Color space of JPEG-compressed image */
+                  out_color_space;       /* Color space of decompressed image */
+    uint32 segment_width;
+    int status = 1;                              /* Assume success by default */
+    boolean downsampled_output=FALSE, /* <=> Want JPEG Library's "raw" image? */
+            is_JFIF;                                       /* <=> JFIF image? */
+    register OJPEGState *sp = OJState(tif);
+#   define td (&tif->tif_dir)
+
+ /* Verify miscellaneous parameters.  This will need work if the TIFF Library
+    ever supports different depths for different components, or if the JPEG
+    Library ever supports run-time depth selection.  Neither seems imminent.
+ */
+    if (td->td_bitspersample != sp->cinfo.d.data_precision)
+      {
+        TIFFError(module,bad_bps,td->td_bitspersample);
+        status = 0;
+      };
+
+ /* The TIFF Version 6.0 specification and IJG JPEG Library accept different
+    sets of color spaces, so verify that our image belongs to the common subset
+    and map its photometry code, then initialize to handle subsampling and
+    optional JPEG Library YCbCr <-> RGB color-space conversion.
+ */
+    switch (td->td_photometric)
+      {
+        case PHOTOMETRIC_YCBCR     :
+
+       /* ISO IS 10918-1 requires that JPEG subsampling factors be 1-4, but
+          TIFF Version 6.0 is more restrictive: only 1, 2, and 4 are allowed.
+       */
+          if (   (   td->td_ycbcrsubsampling[0] == 1
+                  || td->td_ycbcrsubsampling[0] == 2
+                  || td->td_ycbcrsubsampling[0] == 4
+                 )
+              && (   td->td_ycbcrsubsampling[1] == 1
+                  || td->td_ycbcrsubsampling[1] == 2
+                  || td->td_ycbcrsubsampling[1] == 4
+                 )
+             )
+            downsampled_output =
+              (
+                (sp->h_sampling = td->td_ycbcrsubsampling[0]) << 3
+              | (sp->v_sampling = td->td_ycbcrsubsampling[1])
+              ) != 011;
+          else
+            {
+              TIFFError(module,bad_subsampling);
+              status = 0;
+            };
+          jpeg_color_space = JCS_YCbCr;
+          if (sp->jpegcolormode == JPEGCOLORMODE_RGB)
+            {
+              downsampled_output = FALSE;
+              out_color_space = JCS_RGB;
+              break;
+            };
+          goto L2;
+        case PHOTOMETRIC_MINISBLACK:
+          jpeg_color_space = JCS_GRAYSCALE;
+          goto L1;
+        case PHOTOMETRIC_RGB       :
+          jpeg_color_space = JCS_RGB;
+          goto L1;
+        case PHOTOMETRIC_SEPARATED :
+          jpeg_color_space = JCS_CMYK;
+      L1: sp->jpegcolormode = JPEGCOLORMODE_RAW; /* No JPEG Lib. conversion */
+      L2: out_color_space = jpeg_color_space;
+          break;
+        default                    :
+          TIFFError(module,bad_photometry,td->td_photometric);
+          status = 0;
+      };
+    if (status == 0) return 0; /* If TIFF errors, don't bother to continue */
+
+ /* Set parameters that are same for all strips/tiles. */
+
+    sp->cinfo.d.src = &sp->src;
+    sp->src.init_source = std_init_source;
+    sp->src.fill_input_buffer = std_fill_input_buffer;
+    sp->src.skip_input_data = std_skip_input_data;
+    sp->src.resync_to_restart = jpeg_resync_to_restart;
+    sp->src.term_source = std_term_source;
+
+ /* BOGOSITY ALERT!  The Wang Imaging application for Microsoft Windows produces
+                     images containing "JPEGInterchangeFormat[Length]" TIFF
+    records that resemble JFIF-in-TIFF encapsulations but, in fact, violate the
+    TIFF Version 6 specification in several ways; nevertheless, we try to handle
+    them gracefully because there are apparently a lot of them around.  The
+    purported "JFIF" data stream in one of these files vaguely resembles a JPEG
+    "tables only" data stream, except that there's no trailing EOI marker.  The
+    rest of the JPEG data stream lies in a discontiguous file region, identified
+    by the 0th Strip offset (which is *also* illegal!), where it begins with an
+    SOS marker and apparently continues to the end of the file.  There is no
+    trailing EOI marker here, either.
+ */
+    is_JFIF = !sp->is_WANG && TIFFFieldSet(tif,FIELD_JPEGIFOFFSET);
+
+ /* Initialize decompression parameters that won't be overridden by JPEG Library
+    defaults set during the "jpeg_read_header()" call, below.
+ */
+    segment_width = td->td_imagewidth;
+    if (isTiled(tif))
+      {
+        if (sp->is_WANG) /* we don't know how to handle it */
+          {
+            TIFFError(module,"Tiled Wang image not supported");
+            return 0;
+          };
+
+     /* BOGOSITY ALERT!  "TIFFTileRowSize()" seems to work fine for modern JPEG-
+                         in-TIFF encapsulations where the image width--like the
+        tile width--is a multiple of 8 or 16 pixels.  But image widths and
+        heights are aren't restricted to 8- or 16-bit multiples, and we need
+        the exact Byte count of decompressed scan lines when we call the JPEG
+        Library.  At least one old file ("zackthecat.tif") in the TIFF Library
+        test suite has widths and heights slightly less than the tile sizes, and
+        it apparently used the bogus computation below to determine the number
+        of Bytes per scan line (was this due to an old, broken version of
+        "TIFFhowmany()"?).  Before we get here, "OJPEGSetupDecode()" verified
+        that our image uses 8-bit samples, so the following check appears to
+        return the correct answer in all known cases tested to date.
+     */
+        if (is_JFIF || (segment_width & 7) == 0)
+          sp->bytesperline = TIFFTileRowSize(tif); /* Normal case */
+        else
+          {
+            /* Was the file-encoder's segment-width calculation bogus? */
+            segment_width = (segment_width/sp->h_sampling + 1) * sp->h_sampling;
+            sp->bytesperline = segment_width * td->td_samplesperpixel;
+          }
+      }
+    else sp->bytesperline = TIFFVStripSize(tif,1);
+
+ /* BEWARE OF KLUDGE:  If we have JPEG Interchange File Format (JFIF) image,
+                       then we want to read "metadata" in the bit-stream's
+    header and validate it against corresponding information in TIFF records.
+    But if we have a *really old* JPEG file that's not JFIF, then we simply
+    assign TIFF-record values to JPEG Library variables without checking.
+ */
+    if (is_JFIF) /* JFIF image */
+      { unsigned char *end_of_data;
+        int subsampling_factors;
+        register unsigned char *p;
+        register int i;
+
+     /* WARNING:  Although the image file contains a JFIF bit stream, it might
+                  also contain some old TIFF records causing "OJPEGVSetField()"
+        to have allocated quantization or Huffman decoding tables.  But when the
+        JPEG Library reads and parses the JFIF header below, it reallocate these
+        tables anew without checking for "dangling" pointers, thereby causing a
+        memory "leak".  We have enough information to potentially deallocate the
+        old tables here, but unfortunately JPEG Library Version 6B uses a "pool"
+        allocator for small objects, with no deallocation procedure; instead, it
+        reclaims a whole pool when an image is closed/destroyed, so well-behaved
+        TIFF client applications (i.e., those which close their JPEG images as
+        soon as they're no longer needed) will waste memory for a short time but
+        recover it eventually.  But ill-behaved TIFF clients (i.e., those which
+        keep many JPEG images open gratuitously) can exhaust memory prematurely.
+        If the JPEG Library ever implements a deallocation procedure, insert
+        this clean-up code:
+     */
+#       ifdef someday
+        if (sp->jpegtablesmode & JPEGTABLESMODE_QUANT) /* free quant. tables */
+          { register int i = 0;
+
+            do
+              { register JQUANT_TBL *q;
+
+                if (q = sp->cinfo.d.quant_tbl_ptrs[i])
+                  {
+                    jpeg_free_small(&sp->cinfo.comm,q,sizeof *q);
+                    sp->cinfo.d.quant_tbl_ptrs[i] = 0;
+                  }
+              }
+            while (++i < NUM_QUANT_TBLS);
+          };
+        if (sp->jpegtablesmode & JPEGTABLESMODE_HUFF) /* free Huffman tables */
+          { register int i = 0;
+
+            do
+              { register JHUFF_TBL *h;
+
+                if (h = sp->cinfo.d.dc_huff_tbl_ptrs[i])
+                  {
+                    jpeg_free_small(&sp->cinfo.comm,h,sizeof *h);
+                    sp->cinfo.d.dc_huff_tbl_ptrs[i] = 0;
+                  };
+                if (h = sp->cinfo.d.ac_huff_tbl_ptrs[i])
+                  {
+                    jpeg_free_small(&sp->cinfo.comm,h,sizeof *h);
+                    sp->cinfo.d.ac_huff_tbl_ptrs[i] = 0;
+                  }
+              }
+            while (++i < NUM_HUFF_TBLS);
+          };
+#       endif /* someday */
+
+     /* Since we might someday wish to try rewriting "old format" JPEG-in-TIFF
+        encapsulations in "new format" files, try to synthesize the value of a
+        modern "JPEGTables" TIFF record by scanning the JPEG data from just past
+        the "Start of Information" (SOI) marker until something other than a
+        legitimate "table" marker is found, as defined in ISO IS 10918-1
+        Appending B.2.4; namely:
+
+        -- Define Quantization Table (DQT)
+        -- Define Huffman Table (DHT)
+        -- Define Arithmetic Coding table (DAC)
+        -- Define Restart Interval (DRI)
+        -- Comment (COM)
+        -- Application data (APPn)
+
+        For convenience, we also accept "Expansion" (EXP) markers, although they
+        are apparently not a part of normal "table" data.
+     */
+        sp->jpegtables = p = (unsigned char *)sp->src.next_input_byte;
+        end_of_data = p + sp->src.bytes_in_buffer;
+        p += 2;
+        while (p < end_of_data && p[0] == 0xFF)
+          switch (p[1])
+            {
+              default  : goto L;
+              case 0xC0: /* SOF0  */
+              case 0xC1: /* SOF1  */
+              case 0xC2: /* SOF2  */
+              case 0xC3: /* SOF3  */
+              case 0xC4: /* DHT   */
+              case 0xC5: /* SOF5  */
+              case 0xC6: /* SOF6  */
+              case 0xC7: /* SOF7  */
+              case 0xC9: /* SOF9  */
+              case 0xCA: /* SOF10 */
+              case 0xCB: /* SOF11 */
+              case 0xCC: /* DAC   */
+              case 0xCD: /* SOF13 */
+              case 0xCE: /* SOF14 */
+              case 0xCF: /* SOF15 */
+              case 0xDB: /* DQT   */
+              case 0xDD: /* DRI   */
+              case 0xDF: /* EXP   */
+              case 0xE0: /* APP0  */
+              case 0xE1: /* APP1  */
+              case 0xE2: /* APP2  */
+              case 0xE3: /* APP3  */
+              case 0xE4: /* APP4  */
+              case 0xE5: /* APP5  */
+              case 0xE6: /* APP6  */
+              case 0xE7: /* APP7  */
+              case 0xE8: /* APP8  */
+              case 0xE9: /* APP9  */
+              case 0xEA: /* APP10 */
+              case 0xEB: /* APP11 */
+              case 0xEC: /* APP12 */
+              case 0xED: /* APP13 */
+              case 0xEE: /* APP14 */
+              case 0xEF: /* APP15 */
+              case 0xFE: /* COM   */
+                         p += (p[2] << 8 | p[3]) + 2;
+            };
+     L: if (p - (unsigned char *)sp->jpegtables > 2) /* fake "JPEGTables" */
+          {
+
+         /* In case our client application asks, pretend that this image file
+            contains a modern "JPEGTables" TIFF record by copying to a buffer
+            the initial part of the JFIF bit-stream that we just scanned, from
+            the SOI marker through the "metadata" tables, then append an EOI
+            marker and flag the "JPEGTables" TIFF record as "present".
+         */
+            sp->jpegtables_length = p - (unsigned char*)sp->jpegtables + 2;
+            p = sp->jpegtables;
+            if (!(sp->jpegtables = _TIFFmalloc(sp->jpegtables_length)))
+              {
+                TIFFError(module,no_jtable_space);
+                return 0;
+              };
+            _TIFFmemcpy(sp->jpegtables,p,sp->jpegtables_length-2);
+            p = (unsigned char *)sp->jpegtables + sp->jpegtables_length;
+            p[-2] = 0xFF; p[-1] = JPEG_EOI; /* Append EOI marker */
+            TIFFSetFieldBit(tif,FIELD_JPEGTABLES);
+            tif->tif_flags |= TIFF_DIRTYDIRECT;
+          }
+        else sp->jpegtables = 0; /* Don't simulate "JPEGTables" */
+        if (   CALLJPEG(sp,-1,jpeg_read_header(&sp->cinfo.d,TRUE))
+            != JPEG_HEADER_OK
+           ) return 0;
+        if (   sp->cinfo.d.image_width  != segment_width
+            || sp->cinfo.d.image_height != td->td_imagelength
+           )
+          {
+            TIFFError(module,"Improper JPEG strip/tile size");
+            return 0;
+          };
+        if (sp->cinfo.d.num_components != td->td_samplesperpixel)
+          {
+            TIFFError(module,"Improper JPEG component count");
+            return 0;
+          };
+        if (sp->cinfo.d.data_precision != td->td_bitspersample)
+          {
+            TIFFError(module,"Improper JPEG data precision");
+            return 0;
+          };
+
+     /* Check that JPEG image components all have the same subsampling factors
+        declared (or defaulted) in the TIFF file, since TIFF Version 6.0 is more
+        restrictive than JPEG:  Only the 0th component may have horizontal and
+        vertical subsampling factors other than <1,1>.
+     */
+        subsampling_factors = sp->h_sampling << 3 | sp->v_sampling;
+        i = 0;
+        do
+          {
+            if (   ( sp->cinfo.d.comp_info[i].h_samp_factor << 3
+                   | sp->cinfo.d.comp_info[i].v_samp_factor
+                   )
+                != subsampling_factors
+               )
+              {
+                TIFFError(module,"Improper JPEG subsampling factors");
+                return 0;
+              };
+            subsampling_factors = 011; /* Required for image components > 0 */
+          }
+        while (++i < sp->cinfo.d.num_components);
+      }
+    else /* not JFIF image */
+      { int (*save)(j_decompress_ptr cinfo) = sp->cinfo.d.marker->read_markers;
+        register int i;
+
+     /* We're not assuming that this file's JPEG bit stream has any header
+        "metadata", so fool the JPEG Library into thinking that we read a
+        "Start of Input" (SOI) marker and a "Start of Frame" (SOFx) marker, then
+        force it to read a simulated "Start of Scan" (SOS) marker when we call
+        "jpeg_read_header()" below.  This should cause the JPEG Library to
+        establish reasonable defaults.
+     */
+        sp->cinfo.d.marker->saw_SOI =       /* Pretend we saw SOI marker */
+        sp->cinfo.d.marker->saw_SOF = TRUE; /* Pretend we saw SOF marker */
+        sp->cinfo.d.marker->read_markers =
+          sp->is_WANG ? suspend : fake_SOS_marker;
+        sp->cinfo.d.global_state = DSTATE_INHEADER;
+        sp->cinfo.d.Se = DCTSIZE2-1; /* Suppress JPEG Library warning */
+        sp->cinfo.d.image_width  = segment_width;
+        sp->cinfo.d.image_height = td->td_imagelength;
+
+     /* The following color-space initialization, including the complicated
+        "switch"-statement below, essentially duplicates the logic used by the
+        JPEG Library's "jpeg_init_colorspace()" subroutine during compression.
+     */
+        sp->cinfo.d.num_components = td->td_samplesperpixel;
+        sp->cinfo.d.comp_info = (jpeg_component_info *)
+          (*sp->cinfo.d.mem->alloc_small)
+            ( &sp->cinfo.comm
+            , JPOOL_IMAGE
+            , sp->cinfo.d.num_components * sizeof *sp->cinfo.d.comp_info
+            );
+        i = 0;
+        do
+          {
+            sp->cinfo.d.comp_info[i].component_index = i;
+            sp->cinfo.d.comp_info[i].component_needed = TRUE;
+            sp->cinfo.d.cur_comp_info[i] = &sp->cinfo.d.comp_info[i];
+          }
+        while (++i < sp->cinfo.d.num_components);
+        switch (jpeg_color_space)
+          {
+            case JCS_UNKNOWN  :
+              i = 0;
+              do
+                {
+                  sp->cinfo.d.comp_info[i].component_id = i;
+                  sp->cinfo.d.comp_info[i].h_samp_factor =
+                  sp->cinfo.d.comp_info[i].v_samp_factor = 1;
+                }
+              while (++i < sp->cinfo.d.num_components);
+              break;
+            case JCS_GRAYSCALE:
+              sp->cinfo.d.comp_info[0].component_id =
+              sp->cinfo.d.comp_info[0].h_samp_factor =
+              sp->cinfo.d.comp_info[0].v_samp_factor = 1;
+              break;
+            case JCS_RGB      :
+              sp->cinfo.d.comp_info[0].component_id = 'R';
+              sp->cinfo.d.comp_info[1].component_id = 'G';
+              sp->cinfo.d.comp_info[2].component_id = 'B';
+              i = 0;
+              do sp->cinfo.d.comp_info[i].h_samp_factor =
+                 sp->cinfo.d.comp_info[i].v_samp_factor = 1;
+              while (++i < sp->cinfo.d.num_components);
+              break;
+            case JCS_CMYK     :
+              sp->cinfo.d.comp_info[0].component_id = 'C';
+              sp->cinfo.d.comp_info[1].component_id = 'M';
+              sp->cinfo.d.comp_info[2].component_id = 'Y';
+              sp->cinfo.d.comp_info[3].component_id = 'K';
+              i = 0;
+              do sp->cinfo.d.comp_info[i].h_samp_factor =
+                 sp->cinfo.d.comp_info[i].v_samp_factor = 1;
+              while (++i < sp->cinfo.d.num_components);
+              break;
+            case JCS_YCbCr    :
+              i = 0;
+              do
+                {
+                  sp->cinfo.d.comp_info[i].component_id = i+1;
+                  sp->cinfo.d.comp_info[i].h_samp_factor =
+                  sp->cinfo.d.comp_info[i].v_samp_factor = 1;
+                  sp->cinfo.d.comp_info[i].quant_tbl_no =
+                  sp->cinfo.d.comp_info[i].dc_tbl_no =
+                  sp->cinfo.d.comp_info[i].ac_tbl_no = i > 0;
+                }
+              while (++i < sp->cinfo.d.num_components);
+              sp->cinfo.d.comp_info[0].h_samp_factor = sp->h_sampling;
+              sp->cinfo.d.comp_info[0].v_samp_factor = sp->v_sampling;
+          };
+        sp->cinfo.d.comps_in_scan = td->td_planarconfig == PLANARCONFIG_CONTIG
+                                  ? sp->cinfo.d.num_components
+                                  : 1;
+        i = CALLJPEG(sp,-1,jpeg_read_header(&sp->cinfo.d,!sp->is_WANG));
+        sp->cinfo.d.marker->read_markers = save; /* Restore input method */
+        if (sp->is_WANG) /* produced by Wang Imaging on Microsoft Windows */
+          {
+            if (i != JPEG_SUSPENDED) return 0;
+
+         /* BOGOSITY ALERT!  Files prooduced by the Wang Imaging application for
+                             Microsoft Windows are a special--and, technically
+            illegal--case.  A JPEG SOS marker and rest of the data stream should
+            be located at the end of the file, in a position identified by the
+            0th Strip offset.
+         */
+            i = td->td_nstrips - 1;
+            sp->src.next_input_byte = tif->tif_base + td->td_stripoffset[0];
+            sp->src.bytes_in_buffer = td->td_stripoffset[i] -
+              td->td_stripoffset[0] + td->td_stripbytecount[i];
+            i = CALLJPEG(sp,-1,jpeg_read_header(&sp->cinfo.d,TRUE));
+          };
+        if (i != JPEG_HEADER_OK) return 0;
+      };
+
+ /* Some of our initialization must wait until the JPEG Library is initialized
+    above, in order to override its defaults.
+ */
+    if (   (sp->cinfo.d.raw_data_out = downsampled_output)
+        && !alloc_downsampled_buffers(tif,sp->cinfo.d.comp_info,
+                                      sp->cinfo.d.num_components)
+       ) return 0;
+    sp->cinfo.d.jpeg_color_space = jpeg_color_space;
+    sp->cinfo.d.out_color_space = out_color_space;
+    sp->cinfo.d.dither_mode = JDITHER_NONE; /* Reduce image "noise" */
+    sp->cinfo.d.two_pass_quantize = FALSE;
+
+ /* If the image consists of separate, discontiguous TIFF "samples" (= color
+    planes, hopefully = JPEG "scans"), then we must use the JPEG Library's
+    "buffered image" mode to decompress the entire image into temporary buffers,
+    because the JPEG Library must parse the entire JPEG bit-stream in order to
+    be satsified that it has a complete set of color components for each pixel,
+    but the TIFF Library must allow our client to extract 1 component at a time.
+    Initializing the JPEG Library's "buffered image" mode is tricky:  First, we
+    start its decompressor, then we tell the decompressor to "consume" (i.e.,
+    buffer) the entire bit-stream.
+
+    WARNING:  Disabling "fancy" up-sampling seems to slightly reduce "noise" for
+              certain old Wang Imaging files, but it absolutely *must* be
+    enabled if the image has separate color planes, since in that case, the JPEG
+    Library doesn't use an "sp->cinfo.d.cconvert" structure (so de-referencing
+    this pointer below will cause a fatal crash) but writing our own code to up-
+    sample separate color planes is too much work for right now.  Maybe someday?
+ */
+    sp->cinfo.d.do_fancy_upsampling = /* Always let this default (to TRUE)? */
+    sp->cinfo.d.buffered_image = td->td_planarconfig == PLANARCONFIG_SEPARATE;
+    if (!CALLJPEG(sp,0,jpeg_start_decompress(&sp->cinfo.d))) return 0;
+    if (sp->cinfo.d.buffered_image) /* separate color planes */
+      {
+        if (sp->cinfo.d.raw_data_out)
+          tif->tif_decoderow = tif->tif_decodestrip = tif->tif_decodetile =
+            OJPEGDecodeRawSeparate;
+        else
+          {
+            tif->tif_decoderow = tif->tif_decodestrip = tif->tif_decodetile =
+              OJPEGDecode;
+
+         /* In JPEG Library Version 6B, color-space conversion isn't implemented
+            for separate color planes, so we must do it ourself if our TIFF
+            client doesn't want to:
+         */
+            sp->cinfo.d.cconvert->color_convert =
+              sp->cinfo.d.jpeg_color_space == sp->cinfo.d.out_color_space
+              ? null_convert : ycc_rgb_convert;
+          };
+    L3: switch (CALLJPEG(sp,0,jpeg_consume_input(&sp->cinfo.d)))
+          {
+            default              : goto L3;
+
+         /* If no JPEG "End of Information" (EOI) marker is found when bit-
+            stream parsing ends, check whether we have enough data to proceed
+            before reporting an error.
+         */
+            case JPEG_SUSPENDED  : if (  sp->cinfo.d.input_scan_number
+                                        *sp->cinfo.d.image_height
+                                       + sp->cinfo.d.input_iMCU_row
+                                        *sp->cinfo.d.max_v_samp_factor
+#                                       ifdef D_LOSSLESS_SUPPORTED
+                                        *sp->cinfo.d.data_units_in_MCU
+                                        *sp->cinfo.d.min_codec_data_unit
+#                                       else
+                                        *sp->cinfo.d.blocks_in_MCU
+                                        *DCTSIZE
+#                                       endif
+                                      < td->td_samplesperpixel
+                                       *sp->cinfo.d.image_height
+                                      )
+                                     {
+                                       TIFFError(tif->tif_name,
+                                         "Premature end of JPEG bit-stream");
+                                       return 0;
+                                     }
+            case JPEG_REACHED_EOI: ;
+          }
+      }
+    else /* pixel-interleaved color planes */
+      tif->tif_decoderow = tif->tif_decodestrip = tif->tif_decodetile =
+        downsampled_output ? OJPEGDecodeRawContig : OJPEGDecode;
+    return 1;
+#   undef td
+  }
+
+static int
+OJPEGPreDecode(register TIFF *tif,tsample_t s)
+  { register OJPEGState *sp = OJState(tif);
+#   define td (&tif->tif_dir)
+
+ /* If we are about to read the first row of an image plane (hopefully, these
+    are coincident with JPEG "scans"!), reset the JPEG Library's decompressor
+    appropriately.  Otherwise, let the decompressor run "as is" and return a
+    "success" status without further ado.
+ */
+    if (     (isTiled(tif) ? tif->tif_curtile : tif->tif_curstrip)
+           % td->td_stripsperimage
+        == 0
+       )
+      {
+        if (   sp->cinfo.d.buffered_image
+            && !CALLJPEG(sp,0,jpeg_start_output(&sp->cinfo.d,s+1))
+           ) return 0;
+        sp->cinfo.d.output_scanline = 0;
+
+     /* Mark subsampling buffers "empty". */
+
+#       ifdef D_LOSSLESS_SUPPORTED
+        sp->scancount = sp->cinfo.d.min_codec_data_unit;
+#       else
+        sp->scancount = DCTSIZE;
+#       endif
+      };
+    return 1;
+#   undef td
+  }
+
+/*ARGSUSED*/ static void
+OJPEGPostDecode(register TIFF *tif,tidata_t buf,tsize_t cc)
+  { register OJPEGState *sp = OJState(tif);
+#   define td (&tif->tif_dir)
+
+ /* The JPEG Library decompressor has reached the end of a strip/tile.  If this
+    is the end of a TIFF image "sample" (= JPEG "scan") in a file with separate
+    components (color planes), then end the "scan".  If it ends the image's last
+    sample/scan, then also stop the JPEG Library's decompressor.
+ */
+    if (sp->cinfo.d.output_scanline >= sp->cinfo.d.output_height)
+      {
+        if (sp->cinfo.d.buffered_image)
+          CALLJPEG(sp,-1,jpeg_finish_output(&sp->cinfo.d)); /* End JPEG scan */
+        if (   (isTiled(tif) ? tif->tif_curtile : tif->tif_curstrip)
+            >= td->td_nstrips-1
+           ) CALLJPEG(sp,0,jpeg_finish_decompress(&sp->cinfo.d));
+      }
+#   undef td
+  }
+
+static int
+OJPEGVSetField(register TIFF *tif,ttag_t tag,va_list ap)
+{
+    uint32 v32;
+    register OJPEGState *sp = OJState(tif);
+#   define td (&tif->tif_dir)
+    toff_t tiffoff=0;
+    uint32 bufoff=0;
+    uint32 code_count=0;
+    int i2=0;
+    int k2=0;
+
+    switch (tag)
+      {
+        default                            : return
+                                               (*sp->vsetparent)(tif,tag,ap);
+
+     /* BEWARE OF KLUDGE:  Some old-format JPEG-in-TIFF files, including those
+                           produced by the Wang Imaging application for Micro-
+        soft Windows, illegally omit a "ReferenceBlackWhite" TIFF tag, even
+        though the TIFF specification's default is intended for the RGB color
+        space and is inappropriate for the YCbCr color space ordinarily used for
+        JPEG images.  Since many TIFF client applications request the value of
+        this tag immediately after a TIFF image directory is parsed, and before
+        any other code in this module receives control, we are forced to fix
+        this problem very early in image-file processing.  Fortunately, legal
+        TIFF files are supposed to store their tags in numeric order, so a
+        mandatory "PhotometricInterpretation" tag should always appear before
+        an optional "ReferenceBlackWhite" tag.  Hence, we slyly peek ahead when
+        we discover the desired photometry, by installing modified black and
+        white reference levels.
+     */
+        case TIFFTAG_PHOTOMETRIC           :
+          if (   (v32 = (*sp->vsetparent)(tif,tag,ap))
+              && td->td_photometric == PHOTOMETRIC_YCBCR
+             )
+	  {
+		float *ref;
+		if (!TIFFGetField(tif, TIFFTAG_REFERENCEBLACKWHITE, &ref)) {
+			float refbw[6];
+			long top = 1L << td->td_bitspersample;
+			refbw[0] = 0;
+			refbw[1] = (float)(top-1L);
+			refbw[2] = (float)(top>>1);
+			refbw[3] = refbw[1];
+			refbw[4] = refbw[2];
+			refbw[5] = refbw[1];
+			TIFFSetField(tif, TIFFTAG_REFERENCEBLACKWHITE, refbw);
+		}
+	  }
+          return v32;
+
+     /* BEWARE OF KLUDGE:  According to Charles Auer <Bumble731@msn.com>, if our
+                           input is a multi-image (multi-directory) JPEG-in-TIFF
+        file is produced by the Wang Imaging application on Microsoft Windows,
+        for some reason the first directory excludes the vendor-specific "WANG
+        PageControl" tag (32934) that we check below, so the only other way to
+        identify these directories is apparently to look for a software-
+        identification tag with the substring, "Wang Labs".  Single-image files
+        can apparently pass both tests, which causes no harm here, but what a
+        mess this is!
+     */
+        case TIFFTAG_SOFTWARE              :
+        {
+            char *software;
+
+            v32 = (*sp->vsetparent)(tif,tag,ap);
+            if( TIFFGetField( tif, TIFFTAG_SOFTWARE, &software )
+                && strstr( software, "Wang Labs" ) )
+                sp->is_WANG = 1;
+            return v32;
+        }
+
+        case TIFFTAG_JPEGPROC              :
+        case TIFFTAG_JPEGIFOFFSET          :
+        case TIFFTAG_JPEGIFBYTECOUNT       :
+        case TIFFTAG_JPEGRESTARTINTERVAL   :
+        case TIFFTAG_JPEGLOSSLESSPREDICTORS:
+        case TIFFTAG_JPEGPOINTTRANSFORM    :
+        case TIFFTAG_JPEGQTABLES           :
+        case TIFFTAG_JPEGDCTABLES          :
+        case TIFFTAG_JPEGACTABLES          :
+        case TIFFTAG_WANG_PAGECONTROL      :
+        case TIFFTAG_JPEGCOLORMODE         : ;
+      };
+    v32 = va_arg(ap,uint32); /* No. of values in this TIFF record */
+
+    /* This switch statement is added for OJPEGVSetField */
+    if(v32 !=0){
+        switch(tag){
+            case TIFFTAG_JPEGPROC:
+                sp->jpegproc=v32;
+                break;
+            case TIFFTAG_JPEGIFOFFSET:
+                sp->jpegifoffset=v32;
+		break;
+            case TIFFTAG_JPEGIFBYTECOUNT:
+		sp->jpegifbytecount=v32;
+		break;
+            case TIFFTAG_JPEGRESTARTINTERVAL:
+		sp->jpegrestartinterval=v32;
+		break;
+            case TIFFTAG_JPEGLOSSLESSPREDICTORS:
+		sp->jpeglosslesspredictors_length=v32;
+		break;
+            case TIFFTAG_JPEGPOINTTRANSFORM:
+		sp->jpegpointtransform_length=v32;
+		break;
+            case TIFFTAG_JPEGQTABLES:
+		sp->jpegqtables_length=v32;
+		break;
+            case TIFFTAG_JPEGACTABLES:
+		sp->jpegactables_length=v32;
+		break;
+            case TIFFTAG_JPEGDCTABLES:
+		sp->jpegdctables_length=v32;
+		break;
+            default:
+		break;
+        }
+    }
+
+ /* BEWARE:  The following actions apply only if we are reading a "source" TIFF
+             image to be decompressed for a client application program.  If we
+    ever enhance this file's CODEC to write "destination" JPEG-in-TIFF images,
+    we'll need an "if"- and another "switch"-statement below, because we'll
+    probably want to store these records' values in some different places.  Most
+    of these need not be parsed here in order to decode JPEG bit stream, so we
+    set boolean flags to note that they have been seen, but we otherwise ignore
+    them.
+ */
+    switch (tag)
+      { JHUFF_TBL **h;
+
+     /* Validate the JPEG-process code. */
+
+        case TIFFTAG_JPEGPROC              :
+          switch (v32)
+            {
+              default               : TIFFError(tif->tif_name,
+                                        "Unknown JPEG process");
+                                      return 0;
+#             ifdef C_LOSSLESS_SUPPORTED
+
+           /* Image uses (lossy) baseline sequential coding. */
+
+              case JPEGPROC_BASELINE: sp->cinfo.d.process = JPROC_SEQUENTIAL;
+                                      sp->cinfo.d.data_unit = DCTSIZE;
+                                      break;
+
+           /* Image uses (lossless) Huffman coding. */
+
+              case JPEGPROC_LOSSLESS: sp->cinfo.d.process = JPROC_LOSSLESS;
+                                      sp->cinfo.d.data_unit = 1;
+#             else /* not C_LOSSLESS_SUPPORTED */
+              case JPEGPROC_LOSSLESS: TIFFError(JPEGLib_name,
+                                        "Does not support lossless Huffman coding");
+                                      return 0;
+              case JPEGPROC_BASELINE: ;
+#             endif /* C_LOSSLESS_SUPPORTED */
+            };
+          break;
+
+     /* The TIFF Version 6.0 specification says that if the value of a TIFF
+        "JPEGInterchangeFormat" record is 0, then we are to behave as if this
+        record were absent; i.e., the data does *not* represent a JPEG Inter-
+        change Format File (JFIF), so don't even set the boolean "I've been
+        here" flag below.  Otherwise, the field's value represents the file
+        offset of the JPEG SOI marker.
+     */
+        case TIFFTAG_JPEGIFOFFSET          :
+          if (v32)
+            {
+              sp->src.next_input_byte = tif->tif_base + v32;
+              break;
+            };
+          return 1;
+        case TIFFTAG_JPEGIFBYTECOUNT       :
+          sp->src.bytes_in_buffer = v32;
+          break;
+
+     /* The TIFF Version 6.0 specification says that if the JPEG "Restart"
+        marker interval is 0, then the data has no "Restart" markers; i.e., we
+        must behave as if this TIFF record were absent.  So, don't even set the
+        boolean "I've been here" flag below.
+     */
+     /*
+      * Instead, set the field bit so TIFFGetField can get whether or not
+      * it was set.
+      */
+        case TIFFTAG_JPEGRESTARTINTERVAL   :
+          if (v32)
+              sp->cinfo.d.restart_interval = v32;
+              break;
+     /* The TIFF Version 6.0 specification says that this tag is supposed to be
+        a vector containing a value for each image component, but for lossless
+        Huffman coding (the only JPEG process defined by the specification for
+        which this tag should be needed), ISO IS 10918-1 uses only a single
+        value, equivalent to the "Ss" field in a JPEG bit-stream's "Start of
+        Scan" (SOS) marker.  So, we extract the first vector element and ignore
+        the rest.  (I hope this is correct!)
+     */
+        case TIFFTAG_JPEGLOSSLESSPREDICTORS:
+           if (v32)
+             {
+               sp->cinfo.d.Ss = *va_arg(ap,uint16 *);
+               sp->jpeglosslesspredictors =
+		    _TIFFmalloc(sp->jpeglosslesspredictors_length
+				* sizeof(uint16));
+               if(sp->jpeglosslesspredictors==NULL){return(0);}
+               for(i2=0;i2<sp->jpeglosslesspredictors_length;i2++){
+                ((uint16*)sp->jpeglosslesspredictors)[i2] =
+			((uint16*)sp->cinfo.d.Ss)[i2];
+               }
+               sp->jpeglosslesspredictors_length*=sizeof(uint16);
+               break;
+             };
+           return v32;
+
+     /* The TIFF Version 6.0 specification says that this tag is supposed to be
+        a vector containing a value for each image component, but for lossless
+        Huffman coding (the only JPEG process defined by the specification for
+        which this tag should be needed), ISO IS 10918-1 uses only a single
+        value, equivalent to the "Al" field in a JPEG bit-stream's "Start of
+        Scan" (SOS) marker.  So, we extract the first vector element and ignore
+        the rest.  (I hope this is correct!)
+     */
+        case TIFFTAG_JPEGPOINTTRANSFORM    :
+           if (v32)
+             {
+               sp->cinfo.d.Al = *va_arg(ap,uint16 *);
+               sp->jpegpointtransform =
+		    _TIFFmalloc(sp->jpegpointtransform_length*sizeof(uint16));
+               if(sp->jpegpointtransform==NULL){return(0);}
+               for(i2=0;i2<sp->jpegpointtransform_length;i2++) {
+                ((uint16*)sp->jpegpointtransform)[i2] =
+			((uint16*)sp->cinfo.d.Al)[i2];
+               }
+               sp->jpegpointtransform_length*=sizeof(uint16);
+               break;
+             }
+           return v32;
+
+     /* We have a vector of offsets to quantization tables, so load 'em! */
+
+        case TIFFTAG_JPEGQTABLES           :
+          if (v32)
+            { uint32 *v;
+              int i;
+              if (v32 > NUM_QUANT_TBLS)
+                {
+                  TIFFError(tif->tif_name,"Too many quantization tables");
+                  return 0;
+                };
+              i = 0;
+              v = va_arg(ap,uint32 *);
+                sp->jpegqtables=_TIFFmalloc(64*sp->jpegqtables_length);
+                if(sp->jpegqtables==NULL){return(0);}
+                tiffoff = TIFFSeekFile(tif, 0, SEEK_CUR);
+                bufoff=0;
+                for(i2=0;i2<sp->jpegqtables_length;i2++){
+                    TIFFSeekFile(tif, v[i2], SEEK_SET);
+                    TIFFReadFile(tif, &(((unsigned char*)(sp->jpegqtables))[bufoff]),
+				 64);
+                    bufoff+=64;
+                }
+                sp->jpegqtables_length=bufoff;
+                TIFFSeekFile(tif, tiffoff, SEEK_SET);
+
+              do /* read quantization table */
+                { register UINT8 *from = tif->tif_base + *v++;
+                  register UINT16 *to;
+                  register int j = DCTSIZE2;
+
+                  if (!( sp->cinfo.d.quant_tbl_ptrs[i]
+                       = CALLJPEG(sp,0,jpeg_alloc_quant_table(&sp->cinfo.comm))
+                       )
+                     )
+                    {
+                      TIFFError(JPEGLib_name,"No space for quantization table");
+                      return 0;
+                    };
+                  to = sp->cinfo.d.quant_tbl_ptrs[i]->quantval;
+                  do *to++ = *from++; while (--j > 0);
+                }
+              while (++i < v32);
+              sp->jpegtablesmode |= JPEGTABLESMODE_QUANT;
+            };
+          break;
+
+     /* We have a vector of offsets to DC Huffman tables, so load 'em! */
+
+        case TIFFTAG_JPEGDCTABLES          :
+          h = sp->cinfo.d.dc_huff_tbl_ptrs;
+          goto L;
+
+     /* We have a vector of offsets to AC Huffman tables, so load 'em! */
+
+        case TIFFTAG_JPEGACTABLES          :
+          h = sp->cinfo.d.ac_huff_tbl_ptrs;
+       L: if (v32)
+            { uint32 *v;
+              int i;
+              if (v32 > NUM_HUFF_TBLS)
+                {
+                  TIFFError(tif->tif_name,"Too many Huffman tables");
+                  return 0;
+                };
+              v = va_arg(ap,uint32 *);
+                if(tag == TIFFTAG_JPEGDCTABLES) {
+                    sp->jpegdctables=_TIFFmalloc(272*sp->jpegdctables_length);
+                    if(sp->jpegdctables==NULL){return(0);}
+                    tiffoff = TIFFSeekFile(tif, 0, SEEK_CUR);
+                    bufoff=0;
+                    code_count=0;
+                    for(i2=0;i2<sp->jpegdctables_length;i2++){
+                        TIFFSeekFile(tif, v[i2], SEEK_SET);
+                        TIFFReadFile(tif,
+				     &(((unsigned char*)(sp->jpegdctables))[bufoff]),
+				     16);
+                        code_count=0;
+                        for(k2=0;k2<16;k2++){
+                            code_count+=((unsigned char*)(sp->jpegdctables))[k2+bufoff];
+                        }
+                        TIFFReadFile(tif,
+				     &(((unsigned char*)(sp->jpegdctables))[bufoff+16]),
+				     code_count);
+                        bufoff+=16;
+                        bufoff+=code_count;
+                    }
+                    sp->jpegdctables_length=bufoff;
+                    TIFFSeekFile(tif, tiffoff, SEEK_SET);
+                }
+                if(tag==TIFFTAG_JPEGACTABLES){
+                    sp->jpegactables=_TIFFmalloc(272*sp->jpegactables_length);
+                    if(sp->jpegactables==NULL){return(0);}
+                    tiffoff = TIFFSeekFile(tif, 0, SEEK_CUR);
+                    bufoff=0;
+                    code_count=0;
+                    for(i2=0;i2<sp->jpegactables_length;i2++){
+                        TIFFSeekFile(tif, v[i2], SEEK_SET);
+                        TIFFReadFile(tif, &(((unsigned char*)(sp->jpegactables))[bufoff]), 16);
+                        code_count=0;
+                        for(k2=0;k2<16;k2++){
+                            code_count+=((unsigned char*)(sp->jpegactables))[k2+bufoff];
+                        }
+                        TIFFReadFile(tif, &(((unsigned char*)(sp->jpegactables))[bufoff+16]), code_count);
+                        bufoff+=16;
+                        bufoff+=code_count;
+                    }
+                    sp->jpegactables_length=bufoff;
+                    TIFFSeekFile(tif, tiffoff, SEEK_SET);
+                }
+              i = 0;
+              do /* copy each Huffman table */
+                { int size = 0;
+                  register UINT8 *from = tif->tif_base + *v++, *to;
+                  register int j = sizeof (*h)->bits;
+
+               /* WARNING:  This code relies on the fact that an image file not
+                            "memory mapped" was read entirely into a single
+                  buffer by "TIFFInitOJPEG()", so we can do a fast memory-to-
+                  memory copy here.  Each table consists of 16 Bytes, which are
+                  suffixed to a 0 Byte when copied, followed by a variable
+                  number of Bytes whose length is the sum of the first 16.
+               */
+                  if (!( *h
+                       = CALLJPEG(sp,0,jpeg_alloc_huff_table(&sp->cinfo.comm))
+                       )
+                     )
+                    {
+                      TIFFError(JPEGLib_name,"No space for Huffman table");
+                      return 0;
+                    };
+                  to = (*h++)->bits;
+                  *to++ = 0;
+                  while (--j > 0) size += *to++ = *from++; /* Copy 16 Bytes */
+                  if (size > sizeof (*h)->huffval/sizeof *(*h)->huffval)
+                    {
+                      TIFFError(tif->tif_name,"Huffman table too big");
+                      return 0;
+                    };
+                  if ((j = size) > 0) do *to++ = *from++; while (--j > 0);
+                  while (++size <= sizeof (*h)->huffval/sizeof *(*h)->huffval)
+                    *to++ = 0; /* Zero the rest of the table for cleanliness */
+                }
+              while (++i < v32);
+              sp->jpegtablesmode |= JPEGTABLESMODE_HUFF;
+            };
+          break;
+
+     /* The following vendor-specific TIFF tag occurs in (highly illegal) files
+        produced by the Wang Imaging application for Microsoft Windows.  These
+        can apparently have several "pages", in which case this tag specifies
+        the offset of a "page control" structure, which we don't currently know
+        how to handle.  0 indicates a 1-page image with no "page control", which
+        we make a feeble effort to handle.
+     */
+        case TIFFTAG_WANG_PAGECONTROL      :
+          if (v32 == 0) v32 = -1;
+          sp->is_WANG = v32;
+          tag = TIFFTAG_JPEGPROC+FIELD_WANG_PAGECONTROL-FIELD_JPEGPROC;
+          break;
+
+     /* This pseudo tag indicates whether our caller is expected to do YCbCr <->
+        RGB color-space conversion (JPEGCOLORMODE_RAW <=> 0) or whether we must
+        ask the JPEG Library to do it (JPEGCOLORMODE_RGB <=> 1).
+     */
+        case TIFFTAG_JPEGCOLORMODE         :
+          sp->jpegcolormode = v32;
+
+       /* Mark the image to indicate whether returned data is up-sampled, so
+          that "TIFF{Strip,Tile}Size()" reflect the true amount of data present.
+       */
+          v32 = tif->tif_flags; /* Save flags temporarily */
+          tif->tif_flags &= ~TIFF_UPSAMPLED;
+          if (   td->td_photometric == PHOTOMETRIC_YCBCR
+              &&    (td->td_ycbcrsubsampling[0]<<3 | td->td_ycbcrsubsampling[1])
+                 != 011
+              && sp->jpegcolormode == JPEGCOLORMODE_RGB
+             ) tif->tif_flags |= TIFF_UPSAMPLED;
+
+       /* If the up-sampling state changed, re-calculate tile size. */
+
+          if ((tif->tif_flags ^ v32) & TIFF_UPSAMPLED)
+            {
+              tif->tif_tilesize = isTiled(tif) ? TIFFTileSize(tif) : (tsize_t) -1;
+              tif->tif_flags |= TIFF_DIRTYDIRECT;
+            };
+          return 1;
+      };
+    TIFFSetFieldBit(tif,tag-TIFFTAG_JPEGPROC+FIELD_JPEGPROC);
+    return 1;
+#   undef td
+  }
+
+static int
+OJPEGVGetField(register TIFF *tif,ttag_t tag,va_list ap)
+  { register OJPEGState *sp = OJState(tif);
+
+    switch (tag)
+      {
+
+     /* If this file has managed to synthesize a set of consolidated "metadata"
+        tables for the current (post-TIFF Version 6.0 specification) JPEG-in-
+        TIFF encapsulation strategy, then tell our caller about them; otherwise,
+        keep mum.
+     */
+        case TIFFTAG_JPEGTABLES            :
+          if (sp->jpegtables_length) /* we have "new"-style JPEG tables */
+            {
+              *va_arg(ap,uint32 *) = sp->jpegtables_length;
+              *va_arg(ap,char **) = sp->jpegtables;
+              return 1;
+            };
+
+     /* This pseudo tag indicates whether our caller is expected to do YCbCr <->
+        RGB color-space conversion (JPEGCOLORMODE_RAW <=> 0) or whether we must
+        ask the JPEG Library to do it (JPEGCOLORMODE_RGB <=> 1).
+     */
+        case TIFFTAG_JPEGCOLORMODE         :
+          *va_arg(ap,uint32 *) = sp->jpegcolormode;
+          return 1;
+
+     /* The following tags are defined by the TIFF Version 6.0 specification
+        and are obsolete.  If our caller asks for information about them, do not
+        return anything, even if we parsed them in an old-format "source" image.
+     */
+        case TIFFTAG_JPEGPROC              :
+		*va_arg(ap, uint16*)=sp->jpegproc;
+		return(1);
+		break;
+        case TIFFTAG_JPEGIFOFFSET          :
+		*va_arg(ap, uint32*)=sp->jpegifoffset;
+		return(1);
+		break;
+        case TIFFTAG_JPEGIFBYTECOUNT       :
+		*va_arg(ap, uint32*)=sp->jpegifbytecount;
+		return(1);
+		break;
+        case TIFFTAG_JPEGRESTARTINTERVAL   :
+		*va_arg(ap, uint32*)=sp->jpegrestartinterval;
+		return(1);
+		break;
+        case TIFFTAG_JPEGLOSSLESSPREDICTORS:
+                *va_arg(ap, uint32*)=sp->jpeglosslesspredictors_length;
+                *va_arg(ap, void**)=sp->jpeglosslesspredictors;
+                return(1);
+                break;
+        case TIFFTAG_JPEGPOINTTRANSFORM    :
+                *va_arg(ap, uint32*)=sp->jpegpointtransform_length;
+                *va_arg(ap, void**)=sp->jpegpointtransform;
+                return(1);
+                break;
+        case TIFFTAG_JPEGQTABLES           :
+                *va_arg(ap, uint32*)=sp->jpegqtables_length;
+                *va_arg(ap, void**)=sp->jpegqtables;
+                return(1);
+                break;
+        case TIFFTAG_JPEGDCTABLES          :
+                *va_arg(ap, uint32*)=sp->jpegdctables_length;
+                *va_arg(ap, void**)=sp->jpegdctables;
+                return(1);
+                break;
+        case TIFFTAG_JPEGACTABLES          :
+                *va_arg(ap, uint32*)=sp->jpegactables_length;
+                *va_arg(ap, void**)=sp->jpegactables;
+                return(1);
+                break;
+      };
+    return (*sp->vgetparent)(tif,tag,ap);
+  }
+
+static void
+OJPEGPrintDir(register TIFF *tif,FILE *fd,long flags)
+  { register OJPEGState *sp = OJState(tif);
+
+    if (   ( flags
+           & (TIFFPRINT_JPEGQTABLES|TIFFPRINT_JPEGDCTABLES|TIFFPRINT_JPEGACTABLES)
+           )
+        && sp->jpegtables_length
+       )
+      fprintf(fd,"  JPEG Table Data: <present>, %lu bytes\n",
+        sp->jpegtables_length);
+  }
+
+static uint32
+OJPEGDefaultStripSize(register TIFF *tif,register uint32 s)
+  { register OJPEGState *sp = OJState(tif);
+#   define td (&tif->tif_dir)
+
+    if ((s = (*sp->defsparent)(tif,s)) < td->td_imagelength)
+      { register tsize_t size = sp->cinfo.comm.is_decompressor
+#                             ifdef D_LOSSLESS_SUPPORTED
+                              ? sp->cinfo.d.min_codec_data_unit
+#                             else
+                              ? DCTSIZE
+#                             endif
+#                             ifdef C_LOSSLESS_SUPPORTED
+                              : sp->cinfo.c.data_unit;
+#                             else
+                              : DCTSIZE;
+#                             endif
+
+        size = TIFFroundup(size,16);
+        s = TIFFroundup(s,td->td_ycbcrsubsampling[1]*size);
+      };
+    return s;
+#   undef td
+  }
+
+static void
+OJPEGDefaultTileSize(register TIFF *tif,register uint32 *tw,register uint32 *th)
+  { register OJPEGState *sp = OJState(tif);
+    register tsize_t size;
+#   define td (&tif->tif_dir)
+
+    size = sp->cinfo.comm.is_decompressor
+#        ifdef D_LOSSLESS_SUPPORTED
+         ? sp->cinfo.d.min_codec_data_unit
+#        else
+         ? DCTSIZE
+#        endif
+#        ifdef C_LOSSLESS_SUPPORTED
+         : sp->cinfo.c.data_unit;
+#        else
+         : DCTSIZE;
+#        endif
+    size = TIFFroundup(size,16);
+    (*sp->deftparent)(tif,tw,th);
+    *tw = TIFFroundup(*tw,td->td_ycbcrsubsampling[0]*size);
+    *th = TIFFroundup(*th,td->td_ycbcrsubsampling[1]*size);
+#   undef td
+  }
+
+static void
+OJPEGCleanUp(register TIFF *tif)
+  { register OJPEGState *sp;
+
+    if ( (sp = OJState(tif)) )
+      {
+        CALLVJPEG(sp,jpeg_destroy(&sp->cinfo.comm)); /* Free JPEG Lib. vars. */
+        if (sp->jpegtables) {_TIFFfree(sp->jpegtables);sp->jpegtables=0;}
+        if (sp->jpeglosslesspredictors) {
+		_TIFFfree(sp->jpeglosslesspredictors);
+		sp->jpeglosslesspredictors = 0;
+	}
+        if (sp->jpegpointtransform) {
+		_TIFFfree(sp->jpegpointtransform);
+		sp->jpegpointtransform=0;
+	}
+        if (sp->jpegqtables) {_TIFFfree(sp->jpegqtables);sp->jpegqtables=0;}
+        if (sp->jpegactables) {_TIFFfree(sp->jpegactables);sp->jpegactables=0;}
+        if (sp->jpegdctables) {_TIFFfree(sp->jpegdctables);sp->jpegdctables=0;}
+     /* If the image file isn't "memory mapped" and we read it all into a
+        single, large memory buffer, free the buffer now.
+     */
+        if (!isMapped(tif) && tif->tif_base) /* free whole-file buffer */
+          {
+            _TIFFfree(tif->tif_base);
+            tif->tif_base = 0;
+            tif->tif_size = 0;
+          };
+        _TIFFfree(sp); /* Release local variables */
+        tif->tif_data = 0;
+      }
+  }
+
+int
+TIFFInitOJPEG(register TIFF *tif,int scheme)
+  { register OJPEGState *sp;
+#   define td (&tif->tif_dir)
+#   ifndef never
+
+ /* This module supports a decompression-only CODEC, which is intended strictly
+    for viewing old image files using the obsolete JPEG-in-TIFF encapsulation
+    specified by the TIFF Version 6.0 specification.  It does not, and never
+    should, support compression for new images.  If a client application asks us
+    to, refuse and complain loudly!
+ */
+    if (tif->tif_mode != O_RDONLY) return _notSupported(tif);
+#   endif /* never */
+    if (!isMapped(tif))
+      {
+
+     /* BEWARE OF KLUDGE:  If our host operating-system doesn't let an image
+                           file be "memory mapped", then we want to read the
+        entire file into a single (possibly large) memory buffer as if it had
+        been "memory mapped".  Although this is likely to waste space, because
+        analysis of the file's content might cause parts of it to be read into
+        smaller buffers duplicatively, it appears to be the lesser of several
+        evils.  Very old JPEG-in-TIFF encapsulations aren't guaranteed to be
+        JFIF bit streams, or to have a TIFF "JPEGTables" record or much other
+        "metadata" to help us locate the decoding tables and entropy-coded data,
+        so we're likely do a lot of random-access grokking around, and we must
+        ultimately tell the JPEG Library to sequentially scan much of the file
+        anyway.  This is all likely to be easier if we use "brute force" to
+        read the entire file, once, and don't use incremental disc I/O.  If our
+        client application tries to process a file so big that we can't buffer
+        it entirely, then tough shit: we'll give up and exit!
+     */
+        if (!(tif->tif_base = _TIFFmalloc(tif->tif_size=TIFFGetFileSize(tif))))
+          {
+            TIFFError(tif->tif_name,"Cannot allocate file buffer");
+            return 0;
+          };
+        if (!SeekOK(tif,0) || !ReadOK(tif,tif->tif_base,tif->tif_size))
+          {
+            TIFFError(tif->tif_name,"Cannot read file");
+            return 0;
+          }
+      };
+
+ /* Allocate storage for this module's per-file variables. */
+
+    if (!(tif->tif_data = (tidata_t)_TIFFmalloc(sizeof *sp)))
+      {
+        TIFFError("TIFFInitOJPEG","No space for JPEG state block");
+        return 0;
+      };
+    (sp = OJState(tif))->tif = tif; /* Initialize reverse pointer */
+    sp->cinfo.d.err = jpeg_std_error(&sp->err); /* Initialize error handling */
+    sp->err.error_exit = TIFFojpeg_error_exit;
+    sp->err.output_message = TIFFojpeg_output_message;
+    if (!CALLVJPEG(sp,jpeg_create_decompress(&sp->cinfo.d))) return 0;
+
+ /* Install CODEC-specific tag information and override default TIFF Library
+    "method" subroutines with our own, CODEC-specific methods.  Like all good
+    members of an object-class, we save some of these subroutine pointers for
+    "fall back" in case our own methods fail.
+ */
+    _TIFFMergeFieldInfo(tif,ojpegFieldInfo,
+      sizeof ojpegFieldInfo/sizeof *ojpegFieldInfo);
+    sp->defsparent = tif->tif_defstripsize;
+    sp->deftparent = tif->tif_deftilesize;
+    sp->vgetparent = tif->tif_tagmethods.vgetfield;
+    sp->vsetparent = tif->tif_tagmethods.vsetfield;
+    tif->tif_defstripsize = OJPEGDefaultStripSize;
+    tif->tif_deftilesize = OJPEGDefaultTileSize;
+    tif->tif_tagmethods.vgetfield = OJPEGVGetField;
+    tif->tif_tagmethods.vsetfield = OJPEGVSetField;
+    tif->tif_tagmethods.printdir = OJPEGPrintDir;
+#   ifdef never
+    tif->tif_setupencode = OJPEGSetupEncode;
+    tif->tif_preencode = OJPEGPreEncode;
+    tif->tif_postencode = OJPEGPostEncode;
+#   else /* well, hardly ever */
+    tif->tif_setupencode = tif->tif_postencode = _notSupported;
+    tif->tif_preencode = (TIFFPreMethod)_notSupported;
+#   endif /* never */
+    tif->tif_setupdecode = OJPEGSetupDecode;
+    tif->tif_predecode = OJPEGPreDecode;
+    tif->tif_postdecode = OJPEGPostDecode;
+    tif->tif_cleanup = OJPEGCleanUp;
+
+ /* If the image file doesn't have "JPEGInterchangeFormat[Length]" TIFF records
+    to guide us, we have few clues about where its encapsulated JPEG bit stream
+    is located, so establish intelligent defaults:  If the Image File Directory
+    doesn't immediately follow the TIFF header, assume that the JPEG data lies
+    in between; otherwise, assume that it follows the Image File Directory.
+ */
+    if (tif->tif_header.tiff_diroff > sizeof tif->tif_header)
+      {
+        sp->src.next_input_byte = tif->tif_base + sizeof tif->tif_header;
+        sp->src.bytes_in_buffer = tif->tif_header.tiff_diroff
+                                - sizeof tif->tif_header;
+      }
+    else /* this case is ugly! */
+      { uint32 maxoffset = tif->tif_size;
+        uint16 dircount;
+
+     /* Calculate the offset to the next Image File Directory, if there is one,
+        or to the end of the file, if not.  Then arrange to read the file from
+        the end of the Image File Directory to that offset.
+     */
+        if (tif->tif_nextdiroff) maxoffset = tif->tif_nextdiroff; /* Not EOF */
+        _TIFFmemcpy(&dircount,(const tdata_t)
+          (sp->src.next_input_byte = tif->tif_base+tif->tif_header.tiff_diroff),
+          sizeof dircount);
+        if (tif->tif_flags & TIFF_SWAB) TIFFSwabShort(&dircount);
+        sp->src.next_input_byte += dircount*sizeof(TIFFDirEntry)
+                                + sizeof maxoffset + sizeof dircount;
+        sp->src.bytes_in_buffer = tif->tif_base - sp->src.next_input_byte
+                                + maxoffset;
+      };
+
+ /* IJG JPEG Library Version 6B can be configured for either 8- or 12-bit sample
+    precision, but we assume that "old JPEG" TIFF clients only need 8 bits.
+ */
+    sp->cinfo.d.data_precision = 8;
+#   ifdef C_LOSSLESS_SUPPORTED
+
+ /* If the "JPEGProc" TIFF tag is missing from the Image File Dictionary, the
+    JPEG Library will use its (lossy) baseline sequential process by default.
+ */
+    sp->cinfo.d.data_unit = DCTSIZE;
+#   endif /* C_LOSSLESS_SUPPORTED */
+
+ /* Initialize other CODEC-specific variables requiring default values. */
+
+    tif->tif_flags |= TIFF_NOBITREV; /* No bit-reversal within data bytes */
+    sp->h_sampling = sp->v_sampling = 1; /* No subsampling by default */
+    sp->is_WANG = 0; /* Assume not a MS Windows Wang Imaging file by default */
+    sp->jpegtables = 0; /* No "new"-style JPEG tables synthesized yet */
+    sp->jpegtables_length = 0;
+    sp->jpegquality = 75; /* Default IJG quality */
+    sp->jpegcolormode = JPEGCOLORMODE_RAW;
+    sp->jpegtablesmode = 0; /* No tables found yet */
+    sp->jpeglosslesspredictors=0;
+    sp->jpeglosslesspredictors_length=0;
+    sp->jpegpointtransform=0;
+    sp->jpegpointtransform_length=0;
+    sp->jpegqtables=0;
+    sp->jpegqtables_length=0;
+    sp->jpegdctables=0;
+    sp->jpegdctables_length=0;
+    sp->jpegactables=0;
+    sp->jpegactables_length=0;
+    return 1;
+#   undef td
+  }
+#endif /* OJPEG_SUPPORT */
+
+/* vim: set ts=8 sts=8 sw=8 noet: */
diff --git a/uppsrc/plugin/tif/lib/tif_open.c b/uppsrc/plugin/tif/lib/tif_open.c
new file mode 100644
index 000000000..205820ee6
--- /dev/null
+++ b/uppsrc/plugin/tif/lib/tif_open.c
@@ -0,0 +1,683 @@
+/* $Id: tif_open.c,v 1.31 2006/03/16 12:23:02 dron Exp $ */
+
+/*
+ * Copyright (c) 1988-1997 Sam Leffler
+ * Copyright (c) 1991-1997 Silicon Graphics, Inc.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and
+ * its documentation for any purpose is hereby granted without fee, provided
+ * that (i) the above copyright notices and this permission notice appear in
+ * all copies of the software and related documentation, and (ii) the names of
+ * Sam Leffler and Silicon Graphics may not be used in any advertising or
+ * publicity relating to the software without the specific, prior written
+ * permission of Sam Leffler and Silicon Graphics.
+ *
+ * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+ * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
+ * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
+ * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+ * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
+ * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.
+ */
+
+/*
+ * TIFF Library.
+ */
+#include "tiffiop.h"
+
+static const long typemask[13] = {
+	(long)0L,		/* TIFF_NOTYPE */
+	(long)0x000000ffL,	/* TIFF_BYTE */
+	(long)0xffffffffL,	/* TIFF_ASCII */
+	(long)0x0000ffffL,	/* TIFF_SHORT */
+	(long)0xffffffffL,	/* TIFF_LONG */
+	(long)0xffffffffL,	/* TIFF_RATIONAL */
+	(long)0x000000ffL,	/* TIFF_SBYTE */
+	(long)0x000000ffL,	/* TIFF_UNDEFINED */
+	(long)0x0000ffffL,	/* TIFF_SSHORT */
+	(long)0xffffffffL,	/* TIFF_SLONG */
+	(long)0xffffffffL,	/* TIFF_SRATIONAL */
+	(long)0xffffffffL,	/* TIFF_FLOAT */
+	(long)0xffffffffL,	/* TIFF_DOUBLE */
+};
+static const int bigTypeshift[13] = {
+	0,		/* TIFF_NOTYPE */
+	24,		/* TIFF_BYTE */
+	0,		/* TIFF_ASCII */
+	16,		/* TIFF_SHORT */
+	0,		/* TIFF_LONG */
+	0,		/* TIFF_RATIONAL */
+	24,		/* TIFF_SBYTE */
+	24,		/* TIFF_UNDEFINED */
+	16,		/* TIFF_SSHORT */
+	0,		/* TIFF_SLONG */
+	0,		/* TIFF_SRATIONAL */
+	0,		/* TIFF_FLOAT */
+	0,		/* TIFF_DOUBLE */
+};
+static const int litTypeshift[13] = {
+	0,		/* TIFF_NOTYPE */
+	0,		/* TIFF_BYTE */
+	0,		/* TIFF_ASCII */
+	0,		/* TIFF_SHORT */
+	0,		/* TIFF_LONG */
+	0,		/* TIFF_RATIONAL */
+	0,		/* TIFF_SBYTE */
+	0,		/* TIFF_UNDEFINED */
+	0,		/* TIFF_SSHORT */
+	0,		/* TIFF_SLONG */
+	0,		/* TIFF_SRATIONAL */
+	0,		/* TIFF_FLOAT */
+	0,		/* TIFF_DOUBLE */
+};
+
+/*
+ * Dummy functions to fill the omitted client procedures.
+ */
+static int
+_tiffDummyMapProc(thandle_t fd, tdata_t* pbase, toff_t* psize)
+{
+	(void) fd; (void) pbase; (void) psize;
+	return (0);
+}
+
+static void
+_tiffDummyUnmapProc(thandle_t fd, tdata_t base, toff_t size)
+{
+	(void) fd; (void) base; (void) size;
+}
+
+/*
+ * Initialize the shift & mask tables, and the
+ * byte swapping state according to the file
+ * contents and the machine architecture.
+ */
+static void
+TIFFInitOrder(TIFF* tif, int magic)
+{
+	tif->tif_typemask = typemask;
+	if (magic == TIFF_BIGENDIAN) {
+		tif->tif_typeshift = bigTypeshift;
+#ifndef WORDS_BIGENDIAN
+		tif->tif_flags |= TIFF_SWAB;
+#endif
+	} else {
+		tif->tif_typeshift = litTypeshift;
+#ifdef WORDS_BIGENDIAN
+		tif->tif_flags |= TIFF_SWAB;
+#endif
+	}
+}
+
+int
+_TIFFgetMode(const char* mode, const char* module)
+{
+	int m = -1;
+
+	switch (mode[0]) {
+	case 'r':
+		m = O_RDONLY;
+		if (mode[1] == '+')
+			m = O_RDWR;
+		break;
+	case 'w':
+	case 'a':
+		m = O_RDWR|O_CREAT;
+		if (mode[0] == 'w')
+			m |= O_TRUNC;
+		break;
+	default:
+		TIFFErrorExt(0, module, "\"%s\": Bad mode", mode);
+		break;
+	}
+	return (m);
+}
+
+TIFF*
+TIFFClientOpen(
+	const char* name, const char* mode,
+	thandle_t clientdata,
+	TIFFReadWriteProc readproc,
+	TIFFReadWriteProc writeproc,
+	TIFFSeekProc seekproc,
+	TIFFCloseProc closeproc,
+	TIFFSizeProc sizeproc,
+	TIFFMapFileProc mapproc,
+	TIFFUnmapFileProc unmapproc
+)
+{
+	static const char module[] = "TIFFClientOpen";
+	TIFF *tif;
+	int m;
+	const char* cp;
+
+	m = _TIFFgetMode(mode, module);
+	if (m == -1)
+		goto bad2;
+	tif = (TIFF *)_TIFFmalloc(sizeof (TIFF) + strlen(name) + 1);
+	if (tif == NULL) {
+		TIFFErrorExt(clientdata, module, "%s: Out of memory (TIFF structure)", name);
+		goto bad2;
+	}
+	_TIFFmemset(tif, 0, sizeof (*tif));
+	tif->tif_name = (char *)tif + sizeof (TIFF);
+	strcpy(tif->tif_name, name);
+	tif->tif_mode = m &~ (O_CREAT|O_TRUNC);
+	tif->tif_curdir = (tdir_t) -1;		/* non-existent directory */
+	tif->tif_curoff = 0;
+	tif->tif_curstrip = (tstrip_t) -1;	/* invalid strip */
+	tif->tif_row = (uint32) -1;		/* read/write pre-increment */
+	tif->tif_clientdata = clientdata;
+	if (!readproc || !writeproc || !seekproc || !closeproc || !sizeproc) {
+		TIFFErrorExt(clientdata, module,
+			  "One of the client procedures is NULL pointer.");
+		goto bad2;
+	}
+	tif->tif_readproc = readproc;
+	tif->tif_writeproc = writeproc;
+	tif->tif_seekproc = seekproc;
+	tif->tif_closeproc = closeproc;
+	tif->tif_sizeproc = sizeproc;
+        if (mapproc)
+		tif->tif_mapproc = mapproc;
+	else
+		tif->tif_mapproc = _tiffDummyMapProc;
+	if (unmapproc)
+		tif->tif_unmapproc = unmapproc;
+	else
+		tif->tif_unmapproc = _tiffDummyUnmapProc;
+	_TIFFSetDefaultCompressionState(tif);	/* setup default state */
+	/*
+	 * Default is to return data MSB2LSB and enable the
+	 * use of memory-mapped files and strip chopping when
+	 * a file is opened read-only.
+	 */
+	tif->tif_flags = FILLORDER_MSB2LSB;
+	if (m == O_RDONLY )
+            tif->tif_flags |= TIFF_MAPPED;
+
+#ifdef STRIPCHOP_DEFAULT
+	if (m == O_RDONLY || m == O_RDWR)
+		tif->tif_flags |= STRIPCHOP_DEFAULT;
+#endif
+
+	/*
+	 * Process library-specific flags in the open mode string.
+	 * The following flags may be used to control intrinsic library
+	 * behaviour that may or may not be desirable (usually for
+	 * compatibility with some application that claims to support
+	 * TIFF but only supports some braindead idea of what the
+	 * vendor thinks TIFF is):
+	 *
+	 * 'l'		use little-endian byte order for creating a file
+	 * 'b'		use big-endian byte order for creating a file
+	 * 'L'		read/write information using LSB2MSB bit order
+	 * 'B'		read/write information using MSB2LSB bit order
+	 * 'H'		read/write information using host bit order
+	 * 'M'		enable use of memory-mapped files when supported
+	 * 'm'		disable use of memory-mapped files
+	 * 'C'		enable strip chopping support when reading
+	 * 'c'		disable strip chopping support
+	 * 'h'		read TIFF header only, do not load the first IFD
+	 *
+	 * The use of the 'l' and 'b' flags is strongly discouraged.
+	 * These flags are provided solely because numerous vendors,
+	 * typically on the PC, do not correctly support TIFF; they
+	 * only support the Intel little-endian byte order.  This
+	 * support is not configured by default because it supports
+	 * the violation of the TIFF spec that says that readers *MUST*
+	 * support both byte orders.  It is strongly recommended that
+	 * you not use this feature except to deal with busted apps
+	 * that write invalid TIFF.  And even in those cases you should
+	 * bang on the vendors to fix their software.
+	 *
+	 * The 'L', 'B', and 'H' flags are intended for applications
+	 * that can optimize operations on data by using a particular
+	 * bit order.  By default the library returns data in MSB2LSB
+	 * bit order for compatibiltiy with older versions of this
+	 * library.  Returning data in the bit order of the native cpu
+	 * makes the most sense but also requires applications to check
+	 * the value of the FillOrder tag; something they probably do
+	 * not do right now.
+	 *
+	 * The 'M' and 'm' flags are provided because some virtual memory
+	 * systems exhibit poor behaviour when large images are mapped.
+	 * These options permit clients to control the use of memory-mapped
+	 * files on a per-file basis.
+	 *
+	 * The 'C' and 'c' flags are provided because the library support
+	 * for chopping up large strips into multiple smaller strips is not
+	 * application-transparent and as such can cause problems.  The 'c'
+	 * option permits applications that only want to look at the tags,
+	 * for example, to get the unadulterated TIFF tag information.
+	 */
+	for (cp = mode; *cp; cp++)
+		switch (*cp) {
+		case 'b':
+#ifndef WORDS_BIGENDIAN
+		    if (m&O_CREAT)
+				tif->tif_flags |= TIFF_SWAB;
+#endif
+			break;
+		case 'l':
+#ifdef WORDS_BIGENDIAN
+			if ((m&O_CREAT))
+				tif->tif_flags |= TIFF_SWAB;
+#endif
+			break;
+		case 'B':
+			tif->tif_flags = (tif->tif_flags &~ TIFF_FILLORDER) |
+			    FILLORDER_MSB2LSB;
+			break;
+		case 'L':
+			tif->tif_flags = (tif->tif_flags &~ TIFF_FILLORDER) |
+			    FILLORDER_LSB2MSB;
+			break;
+		case 'H':
+			tif->tif_flags = (tif->tif_flags &~ TIFF_FILLORDER) |
+			    HOST_FILLORDER;
+			break;
+		case 'M':
+			if (m == O_RDONLY)
+				tif->tif_flags |= TIFF_MAPPED;
+			break;
+		case 'm':
+			if (m == O_RDONLY)
+				tif->tif_flags &= ~TIFF_MAPPED;
+			break;
+		case 'C':
+			if (m == O_RDONLY)
+				tif->tif_flags |= TIFF_STRIPCHOP;
+			break;
+		case 'c':
+			if (m == O_RDONLY)
+				tif->tif_flags &= ~TIFF_STRIPCHOP;
+			break;
+		case 'h':
+			tif->tif_flags |= TIFF_HEADERONLY;
+			break;
+		}
+	/*
+	 * Read in TIFF header.
+	 */
+	if (tif->tif_mode & O_TRUNC ||
+	    !ReadOK(tif, &tif->tif_header, sizeof (TIFFHeader))) {
+		if (tif->tif_mode == O_RDONLY) {
+			TIFFErrorExt(tif->tif_clientdata, name, "Cannot read TIFF header");
+			goto bad;
+		}
+		/*
+		 * Setup header and write.
+		 */
+#ifdef WORDS_BIGENDIAN
+		tif->tif_header.tiff_magic = tif->tif_flags & TIFF_SWAB
+		    ? TIFF_LITTLEENDIAN : TIFF_BIGENDIAN;
+#else
+		tif->tif_header.tiff_magic = tif->tif_flags & TIFF_SWAB
+		    ? TIFF_BIGENDIAN : TIFF_LITTLEENDIAN;
+#endif
+		tif->tif_header.tiff_version = TIFF_VERSION;
+		if (tif->tif_flags & TIFF_SWAB)
+			TIFFSwabShort(&tif->tif_header.tiff_version);
+		tif->tif_header.tiff_diroff = 0;	/* filled in later */
+
+
+                /*
+                 * The doc for "fopen" for some STD_C_LIBs says that if you
+                 * open a file for modify ("+"), then you must fseek (or
+                 * fflush?) between any freads and fwrites.  This is not
+                 * necessary on most systems, but has been shown to be needed
+                 * on Solaris.
+                 */
+                TIFFSeekFile( tif, 0, SEEK_SET );
+
+		if (!WriteOK(tif, &tif->tif_header, sizeof (TIFFHeader))) {
+			TIFFErrorExt(tif->tif_clientdata, name, "Error writing TIFF header");
+			goto bad;
+		}
+		/*
+		 * Setup the byte order handling.
+		 */
+		TIFFInitOrder(tif, tif->tif_header.tiff_magic);
+		/*
+		 * Setup default directory.
+		 */
+		if (!TIFFDefaultDirectory(tif))
+			goto bad;
+		tif->tif_diroff = 0;
+		tif->tif_dirlist = NULL;
+		tif->tif_dirnumber = 0;
+		return (tif);
+	}
+	/*
+	 * Setup the byte order handling.
+	 */
+	if (tif->tif_header.tiff_magic != TIFF_BIGENDIAN &&
+	    tif->tif_header.tiff_magic != TIFF_LITTLEENDIAN
+#if MDI_SUPPORT
+	    &&
+#if HOST_BIGENDIAN
+	    tif->tif_header.tiff_magic != MDI_BIGENDIAN
+#else
+	    tif->tif_header.tiff_magic != MDI_LITTLEENDIAN
+#endif
+	    ) {
+		TIFFErrorExt(tif->tif_clientdata, name,  "Not a TIFF or MDI file, bad magic number %d (0x%x)",
+#else
+	    ) {
+		TIFFErrorExt(tif->tif_clientdata, name,  "Not a TIFF file, bad magic number %d (0x%x)",
+#endif
+		    tif->tif_header.tiff_magic,
+		    tif->tif_header.tiff_magic);
+		goto bad;
+	}
+	TIFFInitOrder(tif, tif->tif_header.tiff_magic);
+	/*
+	 * Swap header if required.
+	 */
+	if (tif->tif_flags & TIFF_SWAB) {
+		TIFFSwabShort(&tif->tif_header.tiff_version);
+		TIFFSwabLong(&tif->tif_header.tiff_diroff);
+	}
+	/*
+	 * Now check version (if needed, it's been byte-swapped).
+	 * Note that this isn't actually a version number, it's a
+	 * magic number that doesn't change (stupid).
+	 */
+	if (tif->tif_header.tiff_version == TIFF_BIGTIFF_VERSION) {
+		TIFFErrorExt(tif->tif_clientdata, name,
+                          "This is a BigTIFF file.  This format not supported\n"
+                          "by this version of libtiff." );
+		goto bad;
+	}
+	if (tif->tif_header.tiff_version != TIFF_VERSION) {
+		TIFFErrorExt(tif->tif_clientdata, name,
+		    "Not a TIFF file, bad version number %d (0x%x)",
+		    tif->tif_header.tiff_version,
+		    tif->tif_header.tiff_version);
+		goto bad;
+	}
+	tif->tif_flags |= TIFF_MYBUFFER;
+	tif->tif_rawcp = tif->tif_rawdata = 0;
+	tif->tif_rawdatasize = 0;
+
+	/*
+	 * Sometimes we do not want to read the first directory (for example,
+	 * it may be broken) and want to proceed to other directories. I this
+	 * case we use the TIFF_HEADERONLY flag to open file and return
+	 * immediately after reading TIFF header.
+	 */
+	if (tif->tif_flags & TIFF_HEADERONLY)
+		return (tif);
+
+	/*
+	 * Setup initial directory.
+	 */
+	switch (mode[0]) {
+	case 'r':
+		tif->tif_nextdiroff = tif->tif_header.tiff_diroff;
+		/*
+		 * Try to use a memory-mapped file if the client
+		 * has not explicitly suppressed usage with the
+		 * 'm' flag in the open mode (see above).
+		 */
+		if ((tif->tif_flags & TIFF_MAPPED) &&
+	!TIFFMapFileContents(tif, (tdata_t*) &tif->tif_base, &tif->tif_size))
+			tif->tif_flags &= ~TIFF_MAPPED;
+		if (TIFFReadDirectory(tif)) {
+			tif->tif_rawcc = -1;
+			tif->tif_flags |= TIFF_BUFFERSETUP;
+			return (tif);
+		}
+		break;
+	case 'a':
+		/*
+		 * New directories are automatically append
+		 * to the end of the directory chain when they
+		 * are written out (see TIFFWriteDirectory).
+		 */
+		if (!TIFFDefaultDirectory(tif))
+			goto bad;
+		return (tif);
+	}
+bad:
+	tif->tif_mode = O_RDONLY;	/* XXX avoid flush */
+        TIFFCleanup(tif);
+bad2:
+	return ((TIFF*)0);
+}
+
+/*
+ * Query functions to access private data.
+ */
+
+/*
+ * Return open file's name.
+ */
+const char *
+TIFFFileName(TIFF* tif)
+{
+	return (tif->tif_name);
+}
+
+/*
+ * Set the file name.
+ */
+const char *
+TIFFSetFileName(TIFF* tif, const char *name)
+{
+	const char* old_name = tif->tif_name;
+	tif->tif_name = (char *)name;
+	return (old_name);
+}
+
+/*
+ * Return open file's I/O descriptor.
+ */
+int
+TIFFFileno(TIFF* tif)
+{
+	return (tif->tif_fd);
+}
+
+/*
+ * Set open file's I/O descriptor, and return previous value.
+ */
+int
+TIFFSetFileno(TIFF* tif, int fd)
+{
+        int old_fd = tif->tif_fd;
+	tif->tif_fd = fd;
+	return old_fd;
+}
+
+/*
+ * Return open file's clientdata.
+ */
+thandle_t
+TIFFClientdata(TIFF* tif)
+{
+	return (tif->tif_clientdata);
+}
+
+/*
+ * Set open file's clientdata, and return previous value.
+ */
+thandle_t
+TIFFSetClientdata(TIFF* tif, thandle_t newvalue)
+{
+	thandle_t m = tif->tif_clientdata;
+	tif->tif_clientdata = newvalue;
+	return m;
+}
+
+/*
+ * Return read/write mode.
+ */
+int
+TIFFGetMode(TIFF* tif)
+{
+	return (tif->tif_mode);
+}
+
+/*
+ * Return read/write mode.
+ */
+int
+TIFFSetMode(TIFF* tif, int mode)
+{
+	int old_mode = tif->tif_mode;
+	tif->tif_mode = mode;
+	return (old_mode);
+}
+
+/*
+ * Return nonzero if file is organized in
+ * tiles; zero if organized as strips.
+ */
+int
+TIFFIsTiled(TIFF* tif)
+{
+	return (isTiled(tif));
+}
+
+/*
+ * Return current row being read/written.
+ */
+uint32
+TIFFCurrentRow(TIFF* tif)
+{
+	return (tif->tif_row);
+}
+
+/*
+ * Return index of the current directory.
+ */
+tdir_t
+TIFFCurrentDirectory(TIFF* tif)
+{
+	return (tif->tif_curdir);
+}
+
+/*
+ * Return current strip.
+ */
+tstrip_t
+TIFFCurrentStrip(TIFF* tif)
+{
+	return (tif->tif_curstrip);
+}
+
+/*
+ * Return current tile.
+ */
+ttile_t
+TIFFCurrentTile(TIFF* tif)
+{
+	return (tif->tif_curtile);
+}
+
+/*
+ * Return nonzero if the file has byte-swapped data.
+ */
+int
+TIFFIsByteSwapped(TIFF* tif)
+{
+	return ((tif->tif_flags & TIFF_SWAB) != 0);
+}
+
+/*
+ * Return nonzero if the data is returned up-sampled.
+ */
+int
+TIFFIsUpSampled(TIFF* tif)
+{
+	return (isUpSampled(tif));
+}
+
+/*
+ * Return nonzero if the data is returned in MSB-to-LSB bit order.
+ */
+int
+TIFFIsMSB2LSB(TIFF* tif)
+{
+	return (isFillOrder(tif, FILLORDER_MSB2LSB));
+}
+
+/*
+ * Return nonzero if given file was written in big-endian order.
+ */
+int
+TIFFIsBigEndian(TIFF* tif)
+{
+	return (tif->tif_header.tiff_magic == TIFF_BIGENDIAN);
+}
+
+/*
+ * Return pointer to file read method.
+ */
+TIFFReadWriteProc
+TIFFGetReadProc(TIFF* tif)
+{
+	return (tif->tif_readproc);
+}
+
+/*
+ * Return pointer to file write method.
+ */
+TIFFReadWriteProc
+TIFFGetWriteProc(TIFF* tif)
+{
+	return (tif->tif_writeproc);
+}
+
+/*
+ * Return pointer to file seek method.
+ */
+TIFFSeekProc
+TIFFGetSeekProc(TIFF* tif)
+{
+	return (tif->tif_seekproc);
+}
+
+/*
+ * Return pointer to file close method.
+ */
+TIFFCloseProc
+TIFFGetCloseProc(TIFF* tif)
+{
+	return (tif->tif_closeproc);
+}
+
+/*
+ * Return pointer to file size requesting method.
+ */
+TIFFSizeProc
+TIFFGetSizeProc(TIFF* tif)
+{
+	return (tif->tif_sizeproc);
+}
+
+/*
+ * Return pointer to memory mapping method.
+ */
+TIFFMapFileProc
+TIFFGetMapFileProc(TIFF* tif)
+{
+	return (tif->tif_mapproc);
+}
+
+/*
+ * Return pointer to memory unmapping method.
+ */
+TIFFUnmapFileProc
+TIFFGetUnmapFileProc(TIFF* tif)
+{
+	return (tif->tif_unmapproc);
+}
+
+/* vim: set ts=8 sts=8 sw=8 noet: */
diff --git a/uppsrc/plugin/tif/lib/tif_packbits.c b/uppsrc/plugin/tif/lib/tif_packbits.c
new file mode 100644
index 000000000..77edce55a
--- /dev/null
+++ b/uppsrc/plugin/tif/lib/tif_packbits.c
@@ -0,0 +1,293 @@
+/* $Id: tif_packbits.c,v 1.13 2006/02/07 11:03:29 dron Exp $ */
+
+/*
+ * Copyright (c) 1988-1997 Sam Leffler
+ * Copyright (c) 1991-1997 Silicon Graphics, Inc.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and
+ * its documentation for any purpose is hereby granted without fee, provided
+ * that (i) the above copyright notices and this permission notice appear in
+ * all copies of the software and related documentation, and (ii) the names of
+ * Sam Leffler and Silicon Graphics may not be used in any advertising or
+ * publicity relating to the software without the specific, prior written
+ * permission of Sam Leffler and Silicon Graphics.
+ *
+ * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+ * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
+ * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
+ * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+ * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
+ * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.
+ */
+
+#include "tiffiop.h"
+#ifdef PACKBITS_SUPPORT
+/*
+ * TIFF Library.
+ *
+ * PackBits Compression Algorithm Support
+ */
+#include <stdio.h>
+
+static int
+PackBitsPreEncode(TIFF* tif, tsample_t s)
+{
+	(void) s;
+
+        if (!(tif->tif_data = (tidata_t)_TIFFmalloc(sizeof(tsize_t))))
+		return (0);
+	/*
+	 * Calculate the scanline/tile-width size in bytes.
+	 */
+	if (isTiled(tif))
+		*(tsize_t*)tif->tif_data = TIFFTileRowSize(tif);
+	else
+		*(tsize_t*)tif->tif_data = TIFFScanlineSize(tif);
+	return (1);
+}
+
+static int
+PackBitsPostEncode(TIFF* tif)
+{
+        if (tif->tif_data)
+            _TIFFfree(tif->tif_data);
+	return (1);
+}
+
+/*
+ * NB: tidata is the type representing *(tidata_t);
+ *     if tidata_t is made signed then this type must
+ *     be adjusted accordingly.
+ */
+typedef unsigned char tidata;
+
+/*
+ * Encode a run of pixels.
+ */
+static int
+PackBitsEncode(TIFF* tif, tidata_t buf, tsize_t cc, tsample_t s)
+{
+	unsigned char* bp = (unsigned char*) buf;
+	tidata_t op, ep, lastliteral;
+	long n, slop;
+	int b;
+	enum { BASE, LITERAL, RUN, LITERAL_RUN } state;
+
+	(void) s;
+	op = tif->tif_rawcp;
+	ep = tif->tif_rawdata + tif->tif_rawdatasize;
+	state = BASE;
+	lastliteral = 0;
+	while (cc > 0) {
+		/*
+		 * Find the longest string of identical bytes.
+		 */
+		b = *bp++, cc--, n = 1;
+		for (; cc > 0 && b == *bp; cc--, bp++)
+			n++;
+	again:
+		if (op + 2 >= ep) {		/* insure space for new data */
+			/*
+			 * Be careful about writing the last
+			 * literal.  Must write up to that point
+			 * and then copy the remainder to the
+			 * front of the buffer.
+			 */
+			if (state == LITERAL || state == LITERAL_RUN) {
+				slop = op - lastliteral;
+				tif->tif_rawcc += lastliteral - tif->tif_rawcp;
+				if (!TIFFFlushData1(tif))
+					return (-1);
+				op = tif->tif_rawcp;
+				while (slop-- > 0)
+					*op++ = *lastliteral++;
+				lastliteral = tif->tif_rawcp;
+			} else {
+				tif->tif_rawcc += op - tif->tif_rawcp;
+				if (!TIFFFlushData1(tif))
+					return (-1);
+				op = tif->tif_rawcp;
+			}
+		}
+		switch (state) {
+		case BASE:		/* initial state, set run/literal */
+			if (n > 1) {
+				state = RUN;
+				if (n > 128) {
+					*op++ = (tidata) -127;
+					*op++ = (tidataval_t) b;
+					n -= 128;
+					goto again;
+				}
+				*op++ = (tidataval_t)(-(n-1));
+				*op++ = (tidataval_t) b;
+			} else {
+				lastliteral = op;
+				*op++ = 0;
+				*op++ = (tidataval_t) b;
+				state = LITERAL;
+			}
+			break;
+		case LITERAL:		/* last object was literal string */
+			if (n > 1) {
+				state = LITERAL_RUN;
+				if (n > 128) {
+					*op++ = (tidata) -127;
+					*op++ = (tidataval_t) b;
+					n -= 128;
+					goto again;
+				}
+				*op++ = (tidataval_t)(-(n-1));	/* encode run */
+				*op++ = (tidataval_t) b;
+			} else {			/* extend literal */
+				if (++(*lastliteral) == 127)
+					state = BASE;
+				*op++ = (tidataval_t) b;
+			}
+			break;
+		case RUN:		/* last object was run */
+			if (n > 1) {
+				if (n > 128) {
+					*op++ = (tidata) -127;
+					*op++ = (tidataval_t) b;
+					n -= 128;
+					goto again;
+				}
+				*op++ = (tidataval_t)(-(n-1));
+				*op++ = (tidataval_t) b;
+			} else {
+				lastliteral = op;
+				*op++ = 0;
+				*op++ = (tidataval_t) b;
+				state = LITERAL;
+			}
+			break;
+		case LITERAL_RUN:	/* literal followed by a run */
+			/*
+			 * Check to see if previous run should
+			 * be converted to a literal, in which
+			 * case we convert literal-run-literal
+			 * to a single literal.
+			 */
+			if (n == 1 && op[-2] == (tidata) -1 &&
+			    *lastliteral < 126) {
+				state = (((*lastliteral) += 2) == 127 ?
+				    BASE : LITERAL);
+				op[-2] = op[-1];	/* replicate */
+			} else
+				state = RUN;
+			goto again;
+		}
+	}
+	tif->tif_rawcc += op - tif->tif_rawcp;
+	tif->tif_rawcp = op;
+	return (1);
+}
+
+/*
+ * Encode a rectangular chunk of pixels.  We break it up
+ * into row-sized pieces to insure that encoded runs do
+ * not span rows.  Otherwise, there can be problems with
+ * the decoder if data is read, for example, by scanlines
+ * when it was encoded by strips.
+ */
+static int
+PackBitsEncodeChunk(TIFF* tif, tidata_t bp, tsize_t cc, tsample_t s)
+{
+	tsize_t rowsize = *(tsize_t*)tif->tif_data;
+
+	while ((long)cc > 0) {
+		int	chunk = rowsize;
+
+		if( cc < chunk )
+		    chunk = cc;
+
+		if (PackBitsEncode(tif, bp, chunk, s) < 0)
+		    return (-1);
+		bp += chunk;
+		cc -= chunk;
+	}
+	return (1);
+}
+
+static int
+PackBitsDecode(TIFF* tif, tidata_t op, tsize_t occ, tsample_t s)
+{
+	char *bp;
+	tsize_t cc;
+	long n;
+	int b;
+
+	(void) s;
+	bp = (char*) tif->tif_rawcp;
+	cc = tif->tif_rawcc;
+	while (cc > 0 && (long)occ > 0) {
+		n = (long) *bp++, cc--;
+		/*
+		 * Watch out for compilers that
+		 * don't sign extend chars...
+		 */
+		if (n >= 128)
+			n -= 256;
+		if (n < 0) {		/* replicate next byte -n+1 times */
+			if (n == -128)	/* nop */
+				continue;
+                        n = -n + 1;
+                        if( occ < n )
+                        {
+							TIFFWarningExt(tif->tif_clientdata, tif->tif_name,
+                                        "PackBitsDecode: discarding %d bytes "
+                                        "to avoid buffer overrun",
+                                        n - occ);
+                            n = occ;
+                        }
+			occ -= n;
+			b = *bp++, cc--;
+			while (n-- > 0)
+				*op++ = (tidataval_t) b;
+		} else {		/* copy next n+1 bytes literally */
+			if (occ < n + 1)
+                        {
+                            TIFFWarningExt(tif->tif_clientdata, tif->tif_name,
+                                        "PackBitsDecode: discarding %d bytes "
+                                        "to avoid buffer overrun",
+                                        n - occ + 1);
+                            n = occ - 1;
+                        }
+                        _TIFFmemcpy(op, bp, ++n);
+			op += n; occ -= n;
+			bp += n; cc -= n;
+		}
+	}
+	tif->tif_rawcp = (tidata_t) bp;
+	tif->tif_rawcc = cc;
+	if (occ > 0) {
+		TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
+		    "PackBitsDecode: Not enough data for scanline %ld",
+		    (long) tif->tif_row);
+		return (0);
+	}
+	return (1);
+}
+
+int
+TIFFInitPackBits(TIFF* tif, int scheme)
+{
+	(void) scheme;
+	tif->tif_decoderow = PackBitsDecode;
+	tif->tif_decodestrip = PackBitsDecode;
+	tif->tif_decodetile = PackBitsDecode;
+	tif->tif_preencode = PackBitsPreEncode;
+        tif->tif_postencode = PackBitsPostEncode;
+	tif->tif_encoderow = PackBitsEncode;
+	tif->tif_encodestrip = PackBitsEncodeChunk;
+	tif->tif_encodetile = PackBitsEncodeChunk;
+	return (1);
+}
+#endif /* PACKBITS_SUPPORT */
+
+/* vim: set ts=8 sts=8 sw=8 noet: */
diff --git a/uppsrc/plugin/tif/lib/tif_pixarlog.c b/uppsrc/plugin/tif/lib/tif_pixarlog.c
new file mode 100644
index 000000000..97a2de0d7
--- /dev/null
+++ b/uppsrc/plugin/tif/lib/tif_pixarlog.c
@@ -0,0 +1,1342 @@
+/* $Id: tif_pixarlog.c,v 1.14 2006/03/16 12:38:24 dron Exp $ */
+
+/*
+ * Copyright (c) 1996-1997 Sam Leffler
+ * Copyright (c) 1996 Pixar
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and
+ * its documentation for any purpose is hereby granted without fee, provided
+ * that (i) the above copyright notices and this permission notice appear in
+ * all copies of the software and related documentation, and (ii) the names of
+ * Pixar, Sam Leffler and Silicon Graphics may not be used in any advertising or
+ * publicity relating to the software without the specific, prior written
+ * permission of Pixar, Sam Leffler and Silicon Graphics.
+ *
+ * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+ * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * IN NO EVENT SHALL PIXAR, SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
+ * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
+ * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+ * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
+ * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.
+ */
+
+#include "tiffiop.h"
+#ifdef PIXARLOG_SUPPORT
+
+/*
+ * TIFF Library.
+ * PixarLog Compression Support
+ *
+ * Contributed by Dan McCoy.
+ *
+ * PixarLog film support uses the TIFF library to store companded
+ * 11 bit values into a tiff file, which are compressed using the
+ * zip compressor.
+ *
+ * The codec can take as input and produce as output 32-bit IEEE float values
+ * as well as 16-bit or 8-bit unsigned integer values.
+ *
+ * On writing any of the above are converted into the internal
+ * 11-bit log format.   In the case of  8 and 16 bit values, the
+ * input is assumed to be unsigned linear color values that represent
+ * the range 0-1.  In the case of IEEE values, the 0-1 range is assumed to
+ * be the normal linear color range, in addition over 1 values are
+ * accepted up to a value of about 25.0 to encode "hot" hightlights and such.
+ * The encoding is lossless for 8-bit values, slightly lossy for the
+ * other bit depths.  The actual color precision should be better
+ * than the human eye can perceive with extra room to allow for
+ * error introduced by further image computation.  As with any quantized
+ * color format, it is possible to perform image calculations which
+ * expose the quantization error. This format should certainly be less
+ * susceptable to such errors than standard 8-bit encodings, but more
+ * susceptable than straight 16-bit or 32-bit encodings.
+ *
+ * On reading the internal format is converted to the desired output format.
+ * The program can request which format it desires by setting the internal
+ * pseudo tag TIFFTAG_PIXARLOGDATAFMT to one of these possible values:
+ *  PIXARLOGDATAFMT_FLOAT     = provide IEEE float values.
+ *  PIXARLOGDATAFMT_16BIT     = provide unsigned 16-bit integer values
+ *  PIXARLOGDATAFMT_8BIT      = provide unsigned 8-bit integer values
+ *
+ * alternately PIXARLOGDATAFMT_8BITABGR provides unsigned 8-bit integer
+ * values with the difference that if there are exactly three or four channels
+ * (rgb or rgba) it swaps the channel order (bgr or abgr).
+ *
+ * PIXARLOGDATAFMT_11BITLOG provides the internal encoding directly
+ * packed in 16-bit values.   However no tools are supplied for interpreting
+ * these values.
+ *
+ * "hot" (over 1.0) areas written in floating point get clamped to
+ * 1.0 in the integer data types.
+ *
+ * When the file is closed after writing, the bit depth and sample format
+ * are set always to appear as if 8-bit data has been written into it.
+ * That way a naive program unaware of the particulars of the encoding
+ * gets the format it is most likely able to handle.
+ *
+ * The codec does it's own horizontal differencing step on the coded
+ * values so the libraries predictor stuff should be turned off.
+ * The codec also handle byte swapping the encoded values as necessary
+ * since the library does not have the information necessary
+ * to know the bit depth of the raw unencoded buffer.
+ *
+ */
+
+#include "tif_predict.h"
+#include <plugin/z/lib/zlib.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <math.h>
+
+/* Tables for converting to/from 11 bit coded values */
+
+#define  TSIZE	 2048		/* decode table size (11-bit tokens) */
+#define  TSIZEP1 2049		/* Plus one for slop */
+#define  ONE	 1250		/* token value of 1.0 exactly */
+#define  RATIO	 1.004		/* nominal ratio for log part */
+
+#define CODE_MASK 0x7ff         /* 11 bits. */
+
+static float  Fltsize;
+static float  LogK1, LogK2;
+
+#define REPEAT(n, op)   { int i; i=n; do { i--; op; } while (i>0); }
+
+static void
+horizontalAccumulateF(uint16 *wp, int n, int stride, float *op,
+	float *ToLinearF)
+{
+    register unsigned int  cr, cg, cb, ca, mask;
+    register float  t0, t1, t2, t3;
+
+    if (n >= stride) {
+	mask = CODE_MASK;
+	if (stride == 3) {
+	    t0 = ToLinearF[cr = wp[0]];
+	    t1 = ToLinearF[cg = wp[1]];
+	    t2 = ToLinearF[cb = wp[2]];
+	    op[0] = t0;
+	    op[1] = t1;
+	    op[2] = t2;
+	    n -= 3;
+	    while (n > 0) {
+		wp += 3;
+		op += 3;
+		n -= 3;
+		t0 = ToLinearF[(cr += wp[0]) & mask];
+		t1 = ToLinearF[(cg += wp[1]) & mask];
+		t2 = ToLinearF[(cb += wp[2]) & mask];
+		op[0] = t0;
+		op[1] = t1;
+		op[2] = t2;
+	    }
+	} else if (stride == 4) {
+	    t0 = ToLinearF[cr = wp[0]];
+	    t1 = ToLinearF[cg = wp[1]];
+	    t2 = ToLinearF[cb = wp[2]];
+	    t3 = ToLinearF[ca = wp[3]];
+	    op[0] = t0;
+	    op[1] = t1;
+	    op[2] = t2;
+	    op[3] = t3;
+	    n -= 4;
+	    while (n > 0) {
+		wp += 4;
+		op += 4;
+		n -= 4;
+		t0 = ToLinearF[(cr += wp[0]) & mask];
+		t1 = ToLinearF[(cg += wp[1]) & mask];
+		t2 = ToLinearF[(cb += wp[2]) & mask];
+		t3 = ToLinearF[(ca += wp[3]) & mask];
+		op[0] = t0;
+		op[1] = t1;
+		op[2] = t2;
+		op[3] = t3;
+	    }
+	} else {
+	    REPEAT(stride, *op = ToLinearF[*wp&mask]; wp++; op++)
+	    n -= stride;
+	    while (n > 0) {
+		REPEAT(stride,
+		    wp[stride] += *wp; *op = ToLinearF[*wp&mask]; wp++; op++)
+		n -= stride;
+	    }
+	}
+    }
+}
+
+static void
+horizontalAccumulate12(uint16 *wp, int n, int stride, int16 *op,
+	float *ToLinearF)
+{
+    register unsigned int  cr, cg, cb, ca, mask;
+    register float  t0, t1, t2, t3;
+
+#define SCALE12 2048.0F
+#define CLAMP12(t) (((t) < 3071) ? (uint16) (t) : 3071)
+
+    if (n >= stride) {
+	mask = CODE_MASK;
+	if (stride == 3) {
+	    t0 = ToLinearF[cr = wp[0]] * SCALE12;
+	    t1 = ToLinearF[cg = wp[1]] * SCALE12;
+	    t2 = ToLinearF[cb = wp[2]] * SCALE12;
+	    op[0] = CLAMP12(t0);
+	    op[1] = CLAMP12(t1);
+	    op[2] = CLAMP12(t2);
+	    n -= 3;
+	    while (n > 0) {
+		wp += 3;
+		op += 3;
+		n -= 3;
+		t0 = ToLinearF[(cr += wp[0]) & mask] * SCALE12;
+		t1 = ToLinearF[(cg += wp[1]) & mask] * SCALE12;
+		t2 = ToLinearF[(cb += wp[2]) & mask] * SCALE12;
+		op[0] = CLAMP12(t0);
+		op[1] = CLAMP12(t1);
+		op[2] = CLAMP12(t2);
+	    }
+	} else if (stride == 4) {
+	    t0 = ToLinearF[cr = wp[0]] * SCALE12;
+	    t1 = ToLinearF[cg = wp[1]] * SCALE12;
+	    t2 = ToLinearF[cb = wp[2]] * SCALE12;
+	    t3 = ToLinearF[ca = wp[3]] * SCALE12;
+	    op[0] = CLAMP12(t0);
+	    op[1] = CLAMP12(t1);
+	    op[2] = CLAMP12(t2);
+	    op[3] = CLAMP12(t3);
+	    n -= 4;
+	    while (n > 0) {
+		wp += 4;
+		op += 4;
+		n -= 4;
+		t0 = ToLinearF[(cr += wp[0]) & mask] * SCALE12;
+		t1 = ToLinearF[(cg += wp[1]) & mask] * SCALE12;
+		t2 = ToLinearF[(cb += wp[2]) & mask] * SCALE12;
+		t3 = ToLinearF[(ca += wp[3]) & mask] * SCALE12;
+		op[0] = CLAMP12(t0);
+		op[1] = CLAMP12(t1);
+		op[2] = CLAMP12(t2);
+		op[3] = CLAMP12(t3);
+	    }
+	} else {
+	    REPEAT(stride, t0 = ToLinearF[*wp&mask] * SCALE12;
+                           *op = CLAMP12(t0); wp++; op++)
+	    n -= stride;
+	    while (n > 0) {
+		REPEAT(stride,
+		    wp[stride] += *wp; t0 = ToLinearF[wp[stride]&mask]*SCALE12;
+		    *op = CLAMP12(t0);  wp++; op++)
+		n -= stride;
+	    }
+	}
+    }
+}
+
+static void
+horizontalAccumulate16(uint16 *wp, int n, int stride, uint16 *op,
+	uint16 *ToLinear16)
+{
+    register unsigned int  cr, cg, cb, ca, mask;
+
+    if (n >= stride) {
+	mask = CODE_MASK;
+	if (stride == 3) {
+	    op[0] = ToLinear16[cr = wp[0]];
+	    op[1] = ToLinear16[cg = wp[1]];
+	    op[2] = ToLinear16[cb = wp[2]];
+	    n -= 3;
+	    while (n > 0) {
+		wp += 3;
+		op += 3;
+		n -= 3;
+		op[0] = ToLinear16[(cr += wp[0]) & mask];
+		op[1] = ToLinear16[(cg += wp[1]) & mask];
+		op[2] = ToLinear16[(cb += wp[2]) & mask];
+	    }
+	} else if (stride == 4) {
+	    op[0] = ToLinear16[cr = wp[0]];
+	    op[1] = ToLinear16[cg = wp[1]];
+	    op[2] = ToLinear16[cb = wp[2]];
+	    op[3] = ToLinear16[ca = wp[3]];
+	    n -= 4;
+	    while (n > 0) {
+		wp += 4;
+		op += 4;
+		n -= 4;
+		op[0] = ToLinear16[(cr += wp[0]) & mask];
+		op[1] = ToLinear16[(cg += wp[1]) & mask];
+		op[2] = ToLinear16[(cb += wp[2]) & mask];
+		op[3] = ToLinear16[(ca += wp[3]) & mask];
+	    }
+	} else {
+	    REPEAT(stride, *op = ToLinear16[*wp&mask]; wp++; op++)
+	    n -= stride;
+	    while (n > 0) {
+		REPEAT(stride,
+		    wp[stride] += *wp; *op = ToLinear16[*wp&mask]; wp++; op++)
+		n -= stride;
+	    }
+	}
+    }
+}
+
+/*
+ * Returns the log encoded 11-bit values with the horizontal
+ * differencing undone.
+ */
+static void
+horizontalAccumulate11(uint16 *wp, int n, int stride, uint16 *op)
+{
+    register unsigned int  cr, cg, cb, ca, mask;
+
+    if (n >= stride) {
+	mask = CODE_MASK;
+	if (stride == 3) {
+	    op[0] = cr = wp[0];  op[1] = cg = wp[1];  op[2] = cb = wp[2];
+	    n -= 3;
+	    while (n > 0) {
+		wp += 3;
+		op += 3;
+		n -= 3;
+		op[0] = (cr += wp[0]) & mask;
+		op[1] = (cg += wp[1]) & mask;
+		op[2] = (cb += wp[2]) & mask;
+	    }
+	} else if (stride == 4) {
+	    op[0] = cr = wp[0];  op[1] = cg = wp[1];
+	    op[2] = cb = wp[2];  op[3] = ca = wp[3];
+	    n -= 4;
+	    while (n > 0) {
+		wp += 4;
+		op += 4;
+		n -= 4;
+		op[0] = (cr += wp[0]) & mask;
+		op[1] = (cg += wp[1]) & mask;
+		op[2] = (cb += wp[2]) & mask;
+		op[3] = (ca += wp[3]) & mask;
+	    }
+	} else {
+	    REPEAT(stride, *op = *wp&mask; wp++; op++)
+	    n -= stride;
+	    while (n > 0) {
+		REPEAT(stride,
+		    wp[stride] += *wp; *op = *wp&mask; wp++; op++)
+	    	n -= stride;
+	    }
+	}
+    }
+}
+
+static void
+horizontalAccumulate8(uint16 *wp, int n, int stride, unsigned char *op,
+	unsigned char *ToLinear8)
+{
+    register unsigned int  cr, cg, cb, ca, mask;
+
+    if (n >= stride) {
+	mask = CODE_MASK;
+	if (stride == 3) {
+	    op[0] = ToLinear8[cr = wp[0]];
+	    op[1] = ToLinear8[cg = wp[1]];
+	    op[2] = ToLinear8[cb = wp[2]];
+	    n -= 3;
+	    while (n > 0) {
+		n -= 3;
+		wp += 3;
+		op += 3;
+		op[0] = ToLinear8[(cr += wp[0]) & mask];
+		op[1] = ToLinear8[(cg += wp[1]) & mask];
+		op[2] = ToLinear8[(cb += wp[2]) & mask];
+	    }
+	} else if (stride == 4) {
+	    op[0] = ToLinear8[cr = wp[0]];
+	    op[1] = ToLinear8[cg = wp[1]];
+	    op[2] = ToLinear8[cb = wp[2]];
+	    op[3] = ToLinear8[ca = wp[3]];
+	    n -= 4;
+	    while (n > 0) {
+		n -= 4;
+		wp += 4;
+		op += 4;
+		op[0] = ToLinear8[(cr += wp[0]) & mask];
+		op[1] = ToLinear8[(cg += wp[1]) & mask];
+		op[2] = ToLinear8[(cb += wp[2]) & mask];
+		op[3] = ToLinear8[(ca += wp[3]) & mask];
+	    }
+	} else {
+	    REPEAT(stride, *op = ToLinear8[*wp&mask]; wp++; op++)
+	    n -= stride;
+	    while (n > 0) {
+		REPEAT(stride,
+		    wp[stride] += *wp; *op = ToLinear8[*wp&mask]; wp++; op++)
+		n -= stride;
+	    }
+	}
+    }
+}
+
+
+static void
+horizontalAccumulate8abgr(uint16 *wp, int n, int stride, unsigned char *op,
+	unsigned char *ToLinear8)
+{
+    register unsigned int  cr, cg, cb, ca, mask;
+    register unsigned char  t0, t1, t2, t3;
+
+    if (n >= stride) {
+	mask = CODE_MASK;
+	if (stride == 3) {
+	    op[0] = 0;
+	    t1 = ToLinear8[cb = wp[2]];
+	    t2 = ToLinear8[cg = wp[1]];
+	    t3 = ToLinear8[cr = wp[0]];
+	    op[1] = t1;
+	    op[2] = t2;
+	    op[3] = t3;
+	    n -= 3;
+	    while (n > 0) {
+		n -= 3;
+		wp += 3;
+		op += 4;
+		op[0] = 0;
+		t1 = ToLinear8[(cb += wp[2]) & mask];
+		t2 = ToLinear8[(cg += wp[1]) & mask];
+		t3 = ToLinear8[(cr += wp[0]) & mask];
+		op[1] = t1;
+		op[2] = t2;
+		op[3] = t3;
+	    }
+	} else if (stride == 4) {
+	    t0 = ToLinear8[ca = wp[3]];
+	    t1 = ToLinear8[cb = wp[2]];
+	    t2 = ToLinear8[cg = wp[1]];
+	    t3 = ToLinear8[cr = wp[0]];
+	    op[0] = t0;
+	    op[1] = t1;
+	    op[2] = t2;
+	    op[3] = t3;
+	    n -= 4;
+	    while (n > 0) {
+		n -= 4;
+		wp += 4;
+		op += 4;
+		t0 = ToLinear8[(ca += wp[3]) & mask];
+		t1 = ToLinear8[(cb += wp[2]) & mask];
+		t2 = ToLinear8[(cg += wp[1]) & mask];
+		t3 = ToLinear8[(cr += wp[0]) & mask];
+		op[0] = t0;
+		op[1] = t1;
+		op[2] = t2;
+		op[3] = t3;
+	    }
+	} else {
+	    REPEAT(stride, *op = ToLinear8[*wp&mask]; wp++; op++)
+	    n -= stride;
+	    while (n > 0) {
+		REPEAT(stride,
+		    wp[stride] += *wp; *op = ToLinear8[*wp&mask]; wp++; op++)
+		n -= stride;
+	    }
+	}
+    }
+}
+
+/*
+ * State block for each open TIFF
+ * file using PixarLog compression/decompression.
+ */
+typedef	struct {
+	TIFFPredictorState	predict;
+	z_stream		stream;
+	uint16			*tbuf;
+	uint16			stride;
+	int			state;
+	int			user_datafmt;
+	int			quality;
+#define PLSTATE_INIT 1
+
+	TIFFVSetMethod		vgetparent;	/* super-class method */
+	TIFFVSetMethod		vsetparent;	/* super-class method */
+
+	float *ToLinearF;
+	uint16 *ToLinear16;
+	unsigned char *ToLinear8;
+	uint16  *FromLT2;
+	uint16  *From14; /* Really for 16-bit data, but we shift down 2 */
+	uint16  *From8;
+
+} PixarLogState;
+
+static int
+PixarLogMakeTables(PixarLogState *sp)
+{
+
+/*
+ *    We make several tables here to convert between various external
+ *    representations (float, 16-bit, and 8-bit) and the internal
+ *    11-bit companded representation.  The 11-bit representation has two
+ *    distinct regions.  A linear bottom end up through .018316 in steps
+ *    of about .000073, and a region of constant ratio up to about 25.
+ *    These floating point numbers are stored in the main table ToLinearF.
+ *    All other tables are derived from this one.  The tables (and the
+ *    ratios) are continuous at the internal seam.
+ */
+
+    int  nlin, lt2size;
+    int  i, j;
+    double  b, c, linstep, v;
+    float *ToLinearF;
+    uint16 *ToLinear16;
+    unsigned char *ToLinear8;
+    uint16  *FromLT2;
+    uint16  *From14; /* Really for 16-bit data, but we shift down 2 */
+    uint16  *From8;
+
+    c = log(RATIO);
+    nlin = (int)(1./c);	/* nlin must be an integer */
+    c = 1./nlin;
+    b = exp(-c*ONE);	/* multiplicative scale factor [b*exp(c*ONE) = 1] */
+    linstep = b*c*exp(1.);
+
+    LogK1 = (float)(1./c);	/* if (v >= 2)  token = k1*log(v*k2) */
+    LogK2 = (float)(1./b);
+    lt2size = (int)(2./linstep) + 1;
+    FromLT2 = (uint16 *)_TIFFmalloc(lt2size*sizeof(uint16));
+    From14 = (uint16 *)_TIFFmalloc(16384*sizeof(uint16));
+    From8 = (uint16 *)_TIFFmalloc(256*sizeof(uint16));
+    ToLinearF = (float *)_TIFFmalloc(TSIZEP1 * sizeof(float));
+    ToLinear16 = (uint16 *)_TIFFmalloc(TSIZEP1 * sizeof(uint16));
+    ToLinear8 = (unsigned char *)_TIFFmalloc(TSIZEP1 * sizeof(unsigned char));
+    if (FromLT2 == NULL || From14  == NULL || From8   == NULL ||
+	 ToLinearF == NULL || ToLinear16 == NULL || ToLinear8 == NULL) {
+	if (FromLT2) _TIFFfree(FromLT2);
+	if (From14) _TIFFfree(From14);
+	if (From8) _TIFFfree(From8);
+	if (ToLinearF) _TIFFfree(ToLinearF);
+	if (ToLinear16) _TIFFfree(ToLinear16);
+	if (ToLinear8) _TIFFfree(ToLinear8);
+	sp->FromLT2 = NULL;
+	sp->From14 = NULL;
+	sp->From8 = NULL;
+	sp->ToLinearF = NULL;
+	sp->ToLinear16 = NULL;
+	sp->ToLinear8 = NULL;
+	return 0;
+    }
+
+    j = 0;
+
+    for (i = 0; i < nlin; i++)  {
+	v = i * linstep;
+	ToLinearF[j++] = (float)v;
+    }
+
+    for (i = nlin; i < TSIZE; i++)
+	ToLinearF[j++] = (float)(b*exp(c*i));
+
+    ToLinearF[2048] = ToLinearF[2047];
+
+    for (i = 0; i < TSIZEP1; i++)  {
+	v = ToLinearF[i]*65535.0 + 0.5;
+	ToLinear16[i] = (v > 65535.0) ? 65535 : (uint16)v;
+	v = ToLinearF[i]*255.0  + 0.5;
+	ToLinear8[i]  = (v > 255.0) ? 255 : (unsigned char)v;
+    }
+
+    j = 0;
+    for (i = 0; i < lt2size; i++)  {
+	if ((i*linstep)*(i*linstep) > ToLinearF[j]*ToLinearF[j+1])
+	    j++;
+	FromLT2[i] = j;
+    }
+
+    /*
+     * Since we lose info anyway on 16-bit data, we set up a 14-bit
+     * table and shift 16-bit values down two bits on input.
+     * saves a little table space.
+     */
+    j = 0;
+    for (i = 0; i < 16384; i++)  {
+	while ((i/16383.)*(i/16383.) > ToLinearF[j]*ToLinearF[j+1])
+	    j++;
+	From14[i] = j;
+    }
+
+    j = 0;
+    for (i = 0; i < 256; i++)  {
+	while ((i/255.)*(i/255.) > ToLinearF[j]*ToLinearF[j+1])
+	    j++;
+	From8[i] = j;
+    }
+
+    Fltsize = (float)(lt2size/2);
+
+    sp->ToLinearF = ToLinearF;
+    sp->ToLinear16 = ToLinear16;
+    sp->ToLinear8 = ToLinear8;
+    sp->FromLT2 = FromLT2;
+    sp->From14 = From14;
+    sp->From8 = From8;
+
+    return 1;
+}
+
+#define	DecoderState(tif)	((PixarLogState*) (tif)->tif_data)
+#define	EncoderState(tif)	((PixarLogState*) (tif)->tif_data)
+
+static	int PixarLogEncode(TIFF*, tidata_t, tsize_t, tsample_t);
+static	int PixarLogDecode(TIFF*, tidata_t, tsize_t, tsample_t);
+
+#define N(a)   (sizeof(a)/sizeof(a[0]))
+#define PIXARLOGDATAFMT_UNKNOWN	-1
+
+static int
+PixarLogGuessDataFmt(TIFFDirectory *td)
+{
+	int guess = PIXARLOGDATAFMT_UNKNOWN;
+	int format = td->td_sampleformat;
+
+	/* If the user didn't tell us his datafmt,
+	 * take our best guess from the bitspersample.
+	 */
+	switch (td->td_bitspersample) {
+	 case 32:
+		if (format == SAMPLEFORMAT_IEEEFP)
+			guess = PIXARLOGDATAFMT_FLOAT;
+		break;
+	 case 16:
+		if (format == SAMPLEFORMAT_VOID || format == SAMPLEFORMAT_UINT)
+			guess = PIXARLOGDATAFMT_16BIT;
+		break;
+	 case 12:
+		if (format == SAMPLEFORMAT_VOID || format == SAMPLEFORMAT_INT)
+			guess = PIXARLOGDATAFMT_12BITPICIO;
+		break;
+	 case 11:
+		if (format == SAMPLEFORMAT_VOID || format == SAMPLEFORMAT_UINT)
+			guess = PIXARLOGDATAFMT_11BITLOG;
+		break;
+	 case 8:
+		if (format == SAMPLEFORMAT_VOID || format == SAMPLEFORMAT_UINT)
+			guess = PIXARLOGDATAFMT_8BIT;
+		break;
+	}
+
+	return guess;
+}
+
+static uint32
+multiply(size_t m1, size_t m2)
+{
+	uint32	bytes = m1 * m2;
+
+	if (m1 && bytes / m1 != m2)
+		bytes = 0;
+
+	return bytes;
+}
+
+static int
+PixarLogSetupDecode(TIFF* tif)
+{
+	TIFFDirectory *td = &tif->tif_dir;
+	PixarLogState* sp = DecoderState(tif);
+	tsize_t tbuf_size;
+	static const char module[] = "PixarLogSetupDecode";
+
+	assert(sp != NULL);
+
+	/* Make sure no byte swapping happens on the data
+	 * after decompression. */
+	tif->tif_postdecode = _TIFFNoPostDecode;
+
+	/* for some reason, we can't do this in TIFFInitPixarLog */
+
+	sp->stride = (td->td_planarconfig == PLANARCONFIG_CONTIG ?
+	    td->td_samplesperpixel : 1);
+	tbuf_size = multiply(multiply(multiply(sp->stride, td->td_imagewidth),
+				      td->td_rowsperstrip), sizeof(uint16));
+	if (tbuf_size == 0)
+		return (0);
+	sp->tbuf = (uint16 *) _TIFFmalloc(tbuf_size);
+	if (sp->tbuf == NULL)
+		return (0);
+	if (sp->user_datafmt == PIXARLOGDATAFMT_UNKNOWN)
+		sp->user_datafmt = PixarLogGuessDataFmt(td);
+	if (sp->user_datafmt == PIXARLOGDATAFMT_UNKNOWN) {
+		TIFFErrorExt(tif->tif_clientdata, module,
+			"PixarLog compression can't handle bits depth/data format combination (depth: %d)",
+			td->td_bitspersample);
+		return (0);
+	}
+
+	if (inflateInit(&sp->stream) != Z_OK) {
+		TIFFErrorExt(tif->tif_clientdata, module, "%s: %s", tif->tif_name, sp->stream.msg);
+		return (0);
+	} else {
+		sp->state |= PLSTATE_INIT;
+		return (1);
+	}
+}
+
+/*
+ * Setup state for decoding a strip.
+ */
+static int
+PixarLogPreDecode(TIFF* tif, tsample_t s)
+{
+	PixarLogState* sp = DecoderState(tif);
+
+	(void) s;
+	assert(sp != NULL);
+	sp->stream.next_in = tif->tif_rawdata;
+	sp->stream.avail_in = tif->tif_rawcc;
+	return (inflateReset(&sp->stream) == Z_OK);
+}
+
+static int
+PixarLogDecode(TIFF* tif, tidata_t op, tsize_t occ, tsample_t s)
+{
+	TIFFDirectory *td = &tif->tif_dir;
+	PixarLogState* sp = DecoderState(tif);
+	static const char module[] = "PixarLogDecode";
+	int i, nsamples, llen;
+	uint16 *up;
+
+	switch (sp->user_datafmt) {
+	case PIXARLOGDATAFMT_FLOAT:
+		nsamples = occ / sizeof(float);	/* XXX float == 32 bits */
+		break;
+	case PIXARLOGDATAFMT_16BIT:
+	case PIXARLOGDATAFMT_12BITPICIO:
+	case PIXARLOGDATAFMT_11BITLOG:
+		nsamples = occ / sizeof(uint16); /* XXX uint16 == 16 bits */
+		break;
+	case PIXARLOGDATAFMT_8BIT:
+	case PIXARLOGDATAFMT_8BITABGR:
+		nsamples = occ;
+		break;
+	default:
+		TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
+			"%d bit input not supported in PixarLog",
+			td->td_bitspersample);
+		return 0;
+	}
+
+	llen = sp->stride * td->td_imagewidth;
+
+	(void) s;
+	assert(sp != NULL);
+	sp->stream.next_out = (unsigned char *) sp->tbuf;
+	sp->stream.avail_out = nsamples * sizeof(uint16);
+	do {
+		int state = inflate(&sp->stream, Z_PARTIAL_FLUSH);
+		if (state == Z_STREAM_END) {
+			break;			/* XXX */
+		}
+		if (state == Z_DATA_ERROR) {
+			TIFFErrorExt(tif->tif_clientdata, module,
+			    "%s: Decoding error at scanline %d, %s",
+			    tif->tif_name, tif->tif_row, sp->stream.msg);
+			if (inflateSync(&sp->stream) != Z_OK)
+				return (0);
+			continue;
+		}
+		if (state != Z_OK) {
+			TIFFErrorExt(tif->tif_clientdata, module, "%s: zlib error: %s",
+			    tif->tif_name, sp->stream.msg);
+			return (0);
+		}
+	} while (sp->stream.avail_out > 0);
+
+	/* hopefully, we got all the bytes we needed */
+	if (sp->stream.avail_out != 0) {
+		TIFFErrorExt(tif->tif_clientdata, module,
+		    "%s: Not enough data at scanline %d (short %d bytes)",
+		    tif->tif_name, tif->tif_row, sp->stream.avail_out);
+		return (0);
+	}
+
+	up = sp->tbuf;
+	/* Swap bytes in the data if from a different endian machine. */
+	if (tif->tif_flags & TIFF_SWAB)
+		TIFFSwabArrayOfShort(up, nsamples);
+
+	for (i = 0; i < nsamples; i += llen, up += llen) {
+		switch (sp->user_datafmt)  {
+		case PIXARLOGDATAFMT_FLOAT:
+			horizontalAccumulateF(up, llen, sp->stride,
+					(float *)op, sp->ToLinearF);
+			op += llen * sizeof(float);
+			break;
+		case PIXARLOGDATAFMT_16BIT:
+			horizontalAccumulate16(up, llen, sp->stride,
+					(uint16 *)op, sp->ToLinear16);
+			op += llen * sizeof(uint16);
+			break;
+		case PIXARLOGDATAFMT_12BITPICIO:
+			horizontalAccumulate12(up, llen, sp->stride,
+					(int16 *)op, sp->ToLinearF);
+			op += llen * sizeof(int16);
+			break;
+		case PIXARLOGDATAFMT_11BITLOG:
+			horizontalAccumulate11(up, llen, sp->stride,
+					(uint16 *)op);
+			op += llen * sizeof(uint16);
+			break;
+		case PIXARLOGDATAFMT_8BIT:
+			horizontalAccumulate8(up, llen, sp->stride,
+					(unsigned char *)op, sp->ToLinear8);
+			op += llen * sizeof(unsigned char);
+			break;
+		case PIXARLOGDATAFMT_8BITABGR:
+			horizontalAccumulate8abgr(up, llen, sp->stride,
+					(unsigned char *)op, sp->ToLinear8);
+			op += llen * sizeof(unsigned char);
+			break;
+		default:
+			TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
+				  "PixarLogDecode: unsupported bits/sample: %d",
+				  td->td_bitspersample);
+			return (0);
+		}
+	}
+
+	return (1);
+}
+
+static int
+PixarLogSetupEncode(TIFF* tif)
+{
+	TIFFDirectory *td = &tif->tif_dir;
+	PixarLogState* sp = EncoderState(tif);
+	tsize_t tbuf_size;
+	static const char module[] = "PixarLogSetupEncode";
+
+	assert(sp != NULL);
+
+	/* for some reason, we can't do this in TIFFInitPixarLog */
+
+	sp->stride = (td->td_planarconfig == PLANARCONFIG_CONTIG ?
+	    td->td_samplesperpixel : 1);
+	tbuf_size = multiply(multiply(multiply(sp->stride, td->td_imagewidth),
+				      td->td_rowsperstrip), sizeof(uint16));
+	if (tbuf_size == 0)
+		return (0);
+	sp->tbuf = (uint16 *) _TIFFmalloc(tbuf_size);
+	if (sp->tbuf == NULL)
+		return (0);
+	if (sp->user_datafmt == PIXARLOGDATAFMT_UNKNOWN)
+		sp->user_datafmt = PixarLogGuessDataFmt(td);
+	if (sp->user_datafmt == PIXARLOGDATAFMT_UNKNOWN) {
+		TIFFErrorExt(tif->tif_clientdata, module, "PixarLog compression can't handle %d bit linear encodings", td->td_bitspersample);
+		return (0);
+	}
+
+	if (deflateInit(&sp->stream, sp->quality) != Z_OK) {
+		TIFFErrorExt(tif->tif_clientdata, module, "%s: %s", tif->tif_name, sp->stream.msg);
+		return (0);
+	} else {
+		sp->state |= PLSTATE_INIT;
+		return (1);
+	}
+}
+
+/*
+ * Reset encoding state at the start of a strip.
+ */
+static int
+PixarLogPreEncode(TIFF* tif, tsample_t s)
+{
+	PixarLogState *sp = EncoderState(tif);
+
+	(void) s;
+	assert(sp != NULL);
+	sp->stream.next_out = tif->tif_rawdata;
+	sp->stream.avail_out = tif->tif_rawdatasize;
+	return (deflateReset(&sp->stream) == Z_OK);
+}
+
+static void
+horizontalDifferenceF(float *ip, int n, int stride, uint16 *wp, uint16 *FromLT2)
+{
+
+    int32 r1, g1, b1, a1, r2, g2, b2, a2, mask;
+    float fltsize = Fltsize;
+
+#define  CLAMP(v) ( (v<(float)0.)   ? 0				\
+		  : (v<(float)2.)   ? FromLT2[(int)(v*fltsize)]	\
+		  : (v>(float)24.2) ? 2047			\
+		  : LogK1*log(v*LogK2) + 0.5 )
+
+    mask = CODE_MASK;
+    if (n >= stride) {
+	if (stride == 3) {
+	    r2 = wp[0] = (uint16) CLAMP(ip[0]);
+	    g2 = wp[1] = (uint16) CLAMP(ip[1]);
+	    b2 = wp[2] = (uint16) CLAMP(ip[2]);
+	    n -= 3;
+	    while (n > 0) {
+		n -= 3;
+		wp += 3;
+		ip += 3;
+		r1 = (int32) CLAMP(ip[0]); wp[0] = (r1-r2) & mask; r2 = r1;
+		g1 = (int32) CLAMP(ip[1]); wp[1] = (g1-g2) & mask; g2 = g1;
+		b1 = (int32) CLAMP(ip[2]); wp[2] = (b1-b2) & mask; b2 = b1;
+	    }
+	} else if (stride == 4) {
+	    r2 = wp[0] = (uint16) CLAMP(ip[0]);
+	    g2 = wp[1] = (uint16) CLAMP(ip[1]);
+	    b2 = wp[2] = (uint16) CLAMP(ip[2]);
+	    a2 = wp[3] = (uint16) CLAMP(ip[3]);
+	    n -= 4;
+	    while (n > 0) {
+		n -= 4;
+		wp += 4;
+		ip += 4;
+		r1 = (int32) CLAMP(ip[0]); wp[0] = (r1-r2) & mask; r2 = r1;
+		g1 = (int32) CLAMP(ip[1]); wp[1] = (g1-g2) & mask; g2 = g1;
+		b1 = (int32) CLAMP(ip[2]); wp[2] = (b1-b2) & mask; b2 = b1;
+		a1 = (int32) CLAMP(ip[3]); wp[3] = (a1-a2) & mask; a2 = a1;
+	    }
+	} else {
+	    ip += n - 1;	/* point to last one */
+	    wp += n - 1;	/* point to last one */
+	    n -= stride;
+	    while (n > 0) {
+		REPEAT(stride, wp[0] = (uint16) CLAMP(ip[0]);
+				wp[stride] -= wp[0];
+				wp[stride] &= mask;
+				wp--; ip--)
+		n -= stride;
+	    }
+	    REPEAT(stride, wp[0] = (uint16) CLAMP(ip[0]); wp--; ip--)
+	}
+    }
+}
+
+static void
+horizontalDifference16(unsigned short *ip, int n, int stride,
+	unsigned short *wp, uint16 *From14)
+{
+    register int  r1, g1, b1, a1, r2, g2, b2, a2, mask;
+
+/* assumption is unsigned pixel values */
+#undef   CLAMP
+#define  CLAMP(v) From14[(v) >> 2]
+
+    mask = CODE_MASK;
+    if (n >= stride) {
+	if (stride == 3) {
+	    r2 = wp[0] = CLAMP(ip[0]);  g2 = wp[1] = CLAMP(ip[1]);
+	    b2 = wp[2] = CLAMP(ip[2]);
+	    n -= 3;
+	    while (n > 0) {
+		n -= 3;
+		wp += 3;
+		ip += 3;
+		r1 = CLAMP(ip[0]); wp[0] = (r1-r2) & mask; r2 = r1;
+		g1 = CLAMP(ip[1]); wp[1] = (g1-g2) & mask; g2 = g1;
+		b1 = CLAMP(ip[2]); wp[2] = (b1-b2) & mask; b2 = b1;
+	    }
+	} else if (stride == 4) {
+	    r2 = wp[0] = CLAMP(ip[0]);  g2 = wp[1] = CLAMP(ip[1]);
+	    b2 = wp[2] = CLAMP(ip[2]);  a2 = wp[3] = CLAMP(ip[3]);
+	    n -= 4;
+	    while (n > 0) {
+		n -= 4;
+		wp += 4;
+		ip += 4;
+		r1 = CLAMP(ip[0]); wp[0] = (r1-r2) & mask; r2 = r1;
+		g1 = CLAMP(ip[1]); wp[1] = (g1-g2) & mask; g2 = g1;
+		b1 = CLAMP(ip[2]); wp[2] = (b1-b2) & mask; b2 = b1;
+		a1 = CLAMP(ip[3]); wp[3] = (a1-a2) & mask; a2 = a1;
+	    }
+	} else {
+	    ip += n - 1;	/* point to last one */
+	    wp += n - 1;	/* point to last one */
+	    n -= stride;
+	    while (n > 0) {
+		REPEAT(stride, wp[0] = CLAMP(ip[0]);
+				wp[stride] -= wp[0];
+				wp[stride] &= mask;
+				wp--; ip--)
+		n -= stride;
+	    }
+	    REPEAT(stride, wp[0] = CLAMP(ip[0]); wp--; ip--)
+	}
+    }
+}
+
+
+static void
+horizontalDifference8(unsigned char *ip, int n, int stride,
+	unsigned short *wp, uint16 *From8)
+{
+    register int  r1, g1, b1, a1, r2, g2, b2, a2, mask;
+
+#undef	 CLAMP
+#define  CLAMP(v) (From8[(v)])
+
+    mask = CODE_MASK;
+    if (n >= stride) {
+	if (stride == 3) {
+	    r2 = wp[0] = CLAMP(ip[0]);  g2 = wp[1] = CLAMP(ip[1]);
+	    b2 = wp[2] = CLAMP(ip[2]);
+	    n -= 3;
+	    while (n > 0) {
+		n -= 3;
+		r1 = CLAMP(ip[3]); wp[3] = (r1-r2) & mask; r2 = r1;
+		g1 = CLAMP(ip[4]); wp[4] = (g1-g2) & mask; g2 = g1;
+		b1 = CLAMP(ip[5]); wp[5] = (b1-b2) & mask; b2 = b1;
+		wp += 3;
+		ip += 3;
+	    }
+	} else if (stride == 4) {
+	    r2 = wp[0] = CLAMP(ip[0]);  g2 = wp[1] = CLAMP(ip[1]);
+	    b2 = wp[2] = CLAMP(ip[2]);  a2 = wp[3] = CLAMP(ip[3]);
+	    n -= 4;
+	    while (n > 0) {
+		n -= 4;
+		r1 = CLAMP(ip[4]); wp[4] = (r1-r2) & mask; r2 = r1;
+		g1 = CLAMP(ip[5]); wp[5] = (g1-g2) & mask; g2 = g1;
+		b1 = CLAMP(ip[6]); wp[6] = (b1-b2) & mask; b2 = b1;
+		a1 = CLAMP(ip[7]); wp[7] = (a1-a2) & mask; a2 = a1;
+		wp += 4;
+		ip += 4;
+	    }
+	} else {
+	    wp += n + stride - 1;	/* point to last one */
+	    ip += n + stride - 1;	/* point to last one */
+	    n -= stride;
+	    while (n > 0) {
+		REPEAT(stride, wp[0] = CLAMP(ip[0]);
+				wp[stride] -= wp[0];
+				wp[stride] &= mask;
+				wp--; ip--)
+		n -= stride;
+	    }
+	    REPEAT(stride, wp[0] = CLAMP(ip[0]); wp--; ip--)
+	}
+    }
+}
+
+/*
+ * Encode a chunk of pixels.
+ */
+static int
+PixarLogEncode(TIFF* tif, tidata_t bp, tsize_t cc, tsample_t s)
+{
+	TIFFDirectory *td = &tif->tif_dir;
+	PixarLogState *sp = EncoderState(tif);
+	static const char module[] = "PixarLogEncode";
+	int 	i, n, llen;
+	unsigned short * up;
+
+	(void) s;
+
+	switch (sp->user_datafmt) {
+	case PIXARLOGDATAFMT_FLOAT:
+		n = cc / sizeof(float);		/* XXX float == 32 bits */
+		break;
+	case PIXARLOGDATAFMT_16BIT:
+	case PIXARLOGDATAFMT_12BITPICIO:
+	case PIXARLOGDATAFMT_11BITLOG:
+		n = cc / sizeof(uint16);	/* XXX uint16 == 16 bits */
+		break;
+	case PIXARLOGDATAFMT_8BIT:
+	case PIXARLOGDATAFMT_8BITABGR:
+		n = cc;
+		break;
+	default:
+		TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
+			"%d bit input not supported in PixarLog",
+			td->td_bitspersample);
+		return 0;
+	}
+
+	llen = sp->stride * td->td_imagewidth;
+
+	for (i = 0, up = sp->tbuf; i < n; i += llen, up += llen) {
+		switch (sp->user_datafmt)  {
+		case PIXARLOGDATAFMT_FLOAT:
+			horizontalDifferenceF((float *)bp, llen,
+				sp->stride, up, sp->FromLT2);
+			bp += llen * sizeof(float);
+			break;
+		case PIXARLOGDATAFMT_16BIT:
+			horizontalDifference16((uint16 *)bp, llen,
+				sp->stride, up, sp->From14);
+			bp += llen * sizeof(uint16);
+			break;
+		case PIXARLOGDATAFMT_8BIT:
+			horizontalDifference8((unsigned char *)bp, llen,
+				sp->stride, up, sp->From8);
+			bp += llen * sizeof(unsigned char);
+			break;
+		default:
+			TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
+				"%d bit input not supported in PixarLog",
+				td->td_bitspersample);
+			return 0;
+		}
+	}
+
+	sp->stream.next_in = (unsigned char *) sp->tbuf;
+	sp->stream.avail_in = n * sizeof(uint16);
+
+	do {
+		if (deflate(&sp->stream, Z_NO_FLUSH) != Z_OK) {
+			TIFFErrorExt(tif->tif_clientdata, module, "%s: Encoder error: %s",
+			    tif->tif_name, sp->stream.msg);
+			return (0);
+		}
+		if (sp->stream.avail_out == 0) {
+			tif->tif_rawcc = tif->tif_rawdatasize;
+			TIFFFlushData1(tif);
+			sp->stream.next_out = tif->tif_rawdata;
+			sp->stream.avail_out = tif->tif_rawdatasize;
+		}
+	} while (sp->stream.avail_in > 0);
+	return (1);
+}
+
+/*
+ * Finish off an encoded strip by flushing the last
+ * string and tacking on an End Of Information code.
+ */
+
+static int
+PixarLogPostEncode(TIFF* tif)
+{
+	PixarLogState *sp = EncoderState(tif);
+	static const char module[] = "PixarLogPostEncode";
+	int state;
+
+	sp->stream.avail_in = 0;
+
+	do {
+		state = deflate(&sp->stream, Z_FINISH);
+		switch (state) {
+		case Z_STREAM_END:
+		case Z_OK:
+		    if (sp->stream.avail_out != (uint32)tif->tif_rawdatasize) {
+			    tif->tif_rawcc =
+				tif->tif_rawdatasize - sp->stream.avail_out;
+			    TIFFFlushData1(tif);
+			    sp->stream.next_out = tif->tif_rawdata;
+			    sp->stream.avail_out = tif->tif_rawdatasize;
+		    }
+		    break;
+		default:
+			TIFFErrorExt(tif->tif_clientdata, module, "%s: zlib error: %s",
+			tif->tif_name, sp->stream.msg);
+		    return (0);
+		}
+	} while (state != Z_STREAM_END);
+	return (1);
+}
+
+static void
+PixarLogClose(TIFF* tif)
+{
+	TIFFDirectory *td = &tif->tif_dir;
+
+	/* In a really sneaky maneuver, on close, we covertly modify both
+	 * bitspersample and sampleformat in the directory to indicate
+	 * 8-bit linear.  This way, the decode "just works" even for
+	 * readers that don't know about PixarLog, or how to set
+	 * the PIXARLOGDATFMT pseudo-tag.
+	 */
+	td->td_bitspersample = 8;
+	td->td_sampleformat = SAMPLEFORMAT_UINT;
+}
+
+static void
+PixarLogCleanup(TIFF* tif)
+{
+	PixarLogState* sp = (PixarLogState*) tif->tif_data;
+
+	assert(sp != 0);
+
+	(void)TIFFPredictorCleanup(tif);
+
+	tif->tif_tagmethods.vgetfield = sp->vgetparent;
+	tif->tif_tagmethods.vsetfield = sp->vsetparent;
+
+	if (sp->FromLT2) _TIFFfree(sp->FromLT2);
+	if (sp->From14) _TIFFfree(sp->From14);
+	if (sp->From8) _TIFFfree(sp->From8);
+	if (sp->ToLinearF) _TIFFfree(sp->ToLinearF);
+	if (sp->ToLinear16) _TIFFfree(sp->ToLinear16);
+	if (sp->ToLinear8) _TIFFfree(sp->ToLinear8);
+	if (sp->state&PLSTATE_INIT) {
+		if (tif->tif_mode == O_RDONLY)
+			inflateEnd(&sp->stream);
+		else
+			deflateEnd(&sp->stream);
+	}
+	if (sp->tbuf)
+		_TIFFfree(sp->tbuf);
+	_TIFFfree(sp);
+	tif->tif_data = NULL;
+
+	_TIFFSetDefaultCompressionState(tif);
+}
+
+static int
+PixarLogVSetField(TIFF* tif, ttag_t tag, va_list ap)
+{
+    PixarLogState *sp = (PixarLogState *)tif->tif_data;
+    int result;
+    static const char module[] = "PixarLogVSetField";
+
+    switch (tag) {
+     case TIFFTAG_PIXARLOGQUALITY:
+		sp->quality = va_arg(ap, int);
+		if (tif->tif_mode != O_RDONLY && (sp->state&PLSTATE_INIT)) {
+			if (deflateParams(&sp->stream,
+			    sp->quality, Z_DEFAULT_STRATEGY) != Z_OK) {
+				TIFFErrorExt(tif->tif_clientdata, module, "%s: zlib error: %s",
+					tif->tif_name, sp->stream.msg);
+				return (0);
+			}
+		}
+		return (1);
+     case TIFFTAG_PIXARLOGDATAFMT:
+	sp->user_datafmt = va_arg(ap, int);
+	/* Tweak the TIFF header so that the rest of libtiff knows what
+	 * size of data will be passed between app and library, and
+	 * assume that the app knows what it is doing and is not
+	 * confused by these header manipulations...
+	 */
+	switch (sp->user_datafmt) {
+	 case PIXARLOGDATAFMT_8BIT:
+	 case PIXARLOGDATAFMT_8BITABGR:
+	    TIFFSetField(tif, TIFFTAG_BITSPERSAMPLE, 8);
+	    TIFFSetField(tif, TIFFTAG_SAMPLEFORMAT, SAMPLEFORMAT_UINT);
+	    break;
+	 case PIXARLOGDATAFMT_11BITLOG:
+	    TIFFSetField(tif, TIFFTAG_BITSPERSAMPLE, 16);
+	    TIFFSetField(tif, TIFFTAG_SAMPLEFORMAT, SAMPLEFORMAT_UINT);
+	    break;
+	 case PIXARLOGDATAFMT_12BITPICIO:
+	    TIFFSetField(tif, TIFFTAG_BITSPERSAMPLE, 16);
+	    TIFFSetField(tif, TIFFTAG_SAMPLEFORMAT, SAMPLEFORMAT_INT);
+	    break;
+	 case PIXARLOGDATAFMT_16BIT:
+	    TIFFSetField(tif, TIFFTAG_BITSPERSAMPLE, 16);
+	    TIFFSetField(tif, TIFFTAG_SAMPLEFORMAT, SAMPLEFORMAT_UINT);
+	    break;
+	 case PIXARLOGDATAFMT_FLOAT:
+	    TIFFSetField(tif, TIFFTAG_BITSPERSAMPLE, 32);
+	    TIFFSetField(tif, TIFFTAG_SAMPLEFORMAT, SAMPLEFORMAT_IEEEFP);
+	    break;
+	}
+	/*
+	 * Must recalculate sizes should bits/sample change.
+	 */
+	tif->tif_tilesize = isTiled(tif) ? TIFFTileSize(tif) : (tsize_t) -1;
+	tif->tif_scanlinesize = TIFFScanlineSize(tif);
+	result = 1;		/* NB: pseudo tag */
+	break;
+     default:
+	result = (*sp->vsetparent)(tif, tag, ap);
+    }
+    return (result);
+}
+
+static int
+PixarLogVGetField(TIFF* tif, ttag_t tag, va_list ap)
+{
+    PixarLogState *sp = (PixarLogState *)tif->tif_data;
+
+    switch (tag) {
+     case TIFFTAG_PIXARLOGQUALITY:
+	*va_arg(ap, int*) = sp->quality;
+	break;
+     case TIFFTAG_PIXARLOGDATAFMT:
+	*va_arg(ap, int*) = sp->user_datafmt;
+	break;
+     default:
+	return (*sp->vgetparent)(tif, tag, ap);
+    }
+    return (1);
+}
+
+static const TIFFFieldInfo pixarlogFieldInfo[] = {
+    {TIFFTAG_PIXARLOGDATAFMT,0,0,TIFF_ANY,  FIELD_PSEUDO,FALSE,FALSE,""},
+    {TIFFTAG_PIXARLOGQUALITY,0,0,TIFF_ANY,  FIELD_PSEUDO,FALSE,FALSE,""}
+};
+
+int
+TIFFInitPixarLog(TIFF* tif, int scheme)
+{
+	PixarLogState* sp;
+
+	assert(scheme == COMPRESSION_PIXARLOG);
+
+	/*
+	 * Allocate state block so tag methods have storage to record values.
+	 */
+	tif->tif_data = (tidata_t) _TIFFmalloc(sizeof (PixarLogState));
+	if (tif->tif_data == NULL)
+		goto bad;
+	sp = (PixarLogState*) tif->tif_data;
+	_TIFFmemset(sp, 0, sizeof (*sp));
+	sp->stream.data_type = Z_BINARY;
+	sp->user_datafmt = PIXARLOGDATAFMT_UNKNOWN;
+
+	/*
+	 * Install codec methods.
+	 */
+	tif->tif_setupdecode = PixarLogSetupDecode;
+	tif->tif_predecode = PixarLogPreDecode;
+	tif->tif_decoderow = PixarLogDecode;
+	tif->tif_decodestrip = PixarLogDecode;
+	tif->tif_decodetile = PixarLogDecode;
+	tif->tif_setupencode = PixarLogSetupEncode;
+	tif->tif_preencode = PixarLogPreEncode;
+	tif->tif_postencode = PixarLogPostEncode;
+	tif->tif_encoderow = PixarLogEncode;
+	tif->tif_encodestrip = PixarLogEncode;
+	tif->tif_encodetile = PixarLogEncode;
+	tif->tif_close = PixarLogClose;
+	tif->tif_cleanup = PixarLogCleanup;
+
+	/* Override SetField so we can handle our private pseudo-tag */
+	_TIFFMergeFieldInfo(tif, pixarlogFieldInfo, N(pixarlogFieldInfo));
+	sp->vgetparent = tif->tif_tagmethods.vgetfield;
+	tif->tif_tagmethods.vgetfield = PixarLogVGetField;   /* hook for codec tags */
+	sp->vsetparent = tif->tif_tagmethods.vsetfield;
+	tif->tif_tagmethods.vsetfield = PixarLogVSetField;   /* hook for codec tags */
+
+	/* Default values for codec-specific fields */
+	sp->quality = Z_DEFAULT_COMPRESSION; /* default comp. level */
+	sp->state = 0;
+
+	/* we don't wish to use the predictor,
+	 * the default is none, which predictor value 1
+	 */
+	(void) TIFFPredictorInit(tif);
+
+	/*
+	 * build the companding tables
+	 */
+	PixarLogMakeTables(sp);
+
+	return (1);
+bad:
+	TIFFErrorExt(tif->tif_clientdata, "TIFFInitPixarLog",
+		     "No space for PixarLog state block");
+	return (0);
+}
+#endif /* PIXARLOG_SUPPORT */
+
+/* vim: set ts=8 sts=8 sw=8 noet: */
diff --git a/uppsrc/plugin/tif/lib/tif_predict.c b/uppsrc/plugin/tif/lib/tif_predict.c
new file mode 100644
index 000000000..5c848c8dc
--- /dev/null
+++ b/uppsrc/plugin/tif/lib/tif_predict.c
@@ -0,0 +1,626 @@
+/* $Id: tif_predict.c,v 1.11 2006/03/03 14:10:09 dron Exp $ */
+
+/*
+ * Copyright (c) 1988-1997 Sam Leffler
+ * Copyright (c) 1991-1997 Silicon Graphics, Inc.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and
+ * its documentation for any purpose is hereby granted without fee, provided
+ * that (i) the above copyright notices and this permission notice appear in
+ * all copies of the software and related documentation, and (ii) the names of
+ * Sam Leffler and Silicon Graphics may not be used in any advertising or
+ * publicity relating to the software without the specific, prior written
+ * permission of Sam Leffler and Silicon Graphics.
+ *
+ * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+ * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
+ * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
+ * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+ * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
+ * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.
+ */
+
+/*
+ * TIFF Library.
+ *
+ * Predictor Tag Support (used by multiple codecs).
+ */
+#include "tiffiop.h"
+#include "tif_predict.h"
+
+#define	PredictorState(tif)	((TIFFPredictorState*) (tif)->tif_data)
+
+static	void horAcc8(TIFF*, tidata_t, tsize_t);
+static	void horAcc16(TIFF*, tidata_t, tsize_t);
+static	void swabHorAcc16(TIFF*, tidata_t, tsize_t);
+static	void horDiff8(TIFF*, tidata_t, tsize_t);
+static	void horDiff16(TIFF*, tidata_t, tsize_t);
+static	void fpAcc(TIFF*, tidata_t, tsize_t);
+static	void fpDiff(TIFF*, tidata_t, tsize_t);
+static	int PredictorDecodeRow(TIFF*, tidata_t, tsize_t, tsample_t);
+static	int PredictorDecodeTile(TIFF*, tidata_t, tsize_t, tsample_t);
+static	int PredictorEncodeRow(TIFF*, tidata_t, tsize_t, tsample_t);
+static	int PredictorEncodeTile(TIFF*, tidata_t, tsize_t, tsample_t);
+
+static int
+PredictorSetup(TIFF* tif)
+{
+	static const char module[] = "PredictorSetup";
+
+	TIFFPredictorState* sp = PredictorState(tif);
+	TIFFDirectory* td = &tif->tif_dir;
+
+	switch (sp->predictor)		/* no differencing */
+	{
+		case PREDICTOR_NONE:
+			return 1;
+		case PREDICTOR_HORIZONTAL:
+			if (td->td_bitspersample != 8
+			    && td->td_bitspersample != 16) {
+				TIFFErrorExt(tif->tif_clientdata, module,
+    "Horizontal differencing \"Predictor\" not supported with %d-bit samples",
+					  td->td_bitspersample);
+				return 0;
+			}
+			break;
+		case PREDICTOR_FLOATINGPOINT:
+			if (td->td_sampleformat != SAMPLEFORMAT_IEEEFP) {
+				TIFFErrorExt(tif->tif_clientdata, module,
+	"Floating point \"Predictor\" not supported with %d data format",
+					  td->td_sampleformat);
+				return 0;
+			}
+			break;
+		default:
+			TIFFErrorExt(tif->tif_clientdata, module,
+				  "\"Predictor\" value %d not supported",
+				  sp->predictor);
+			return 0;
+	}
+	sp->stride = (td->td_planarconfig == PLANARCONFIG_CONTIG ?
+	    td->td_samplesperpixel : 1);
+	/*
+	 * Calculate the scanline/tile-width size in bytes.
+	 */
+	if (isTiled(tif))
+		sp->rowsize = TIFFTileRowSize(tif);
+	else
+		sp->rowsize = TIFFScanlineSize(tif);
+
+	return 1;
+}
+
+static int
+PredictorSetupDecode(TIFF* tif)
+{
+	TIFFPredictorState* sp = PredictorState(tif);
+	TIFFDirectory* td = &tif->tif_dir;
+
+	if (!(*sp->setupdecode)(tif) || !PredictorSetup(tif))
+		return 0;
+
+	if (sp->predictor == 2) {
+		switch (td->td_bitspersample) {
+			case 8:  sp->pfunc = horAcc8; break;
+			case 16: sp->pfunc = horAcc16; break;
+		}
+		/*
+		 * Override default decoding method with one that does the
+		 * predictor stuff.
+		 */
+		sp->coderow = tif->tif_decoderow;
+		tif->tif_decoderow = PredictorDecodeRow;
+		sp->codestrip = tif->tif_decodestrip;
+		tif->tif_decodestrip = PredictorDecodeTile;
+		sp->codetile = tif->tif_decodetile;
+		tif->tif_decodetile = PredictorDecodeTile;
+		/*
+		 * If the data is horizontally differenced 16-bit data that
+		 * requires byte-swapping, then it must be byte swapped before
+		 * the accumulation step.  We do this with a special-purpose
+		 * routine and override the normal post decoding logic that
+		 * the library setup when the directory was read.
+		 */
+		if (tif->tif_flags & TIFF_SWAB) {
+			if (sp->pfunc == horAcc16) {
+				sp->pfunc = swabHorAcc16;
+				tif->tif_postdecode = _TIFFNoPostDecode;
+			} /* else handle 32-bit case... */
+		}
+	}
+
+	else if (sp->predictor == 3) {
+		sp->pfunc = fpAcc;
+		/*
+		 * Override default decoding method with one that does the
+		 * predictor stuff.
+		 */
+		sp->coderow = tif->tif_decoderow;
+		tif->tif_decoderow = PredictorDecodeRow;
+		sp->codestrip = tif->tif_decodestrip;
+		tif->tif_decodestrip = PredictorDecodeTile;
+		sp->codetile = tif->tif_decodetile;
+		tif->tif_decodetile = PredictorDecodeTile;
+		/*
+		 * The data should not be swapped outside of the floating
+		 * point predictor, the accumulation routine should return
+		 * byres in the native order.
+		 */
+		if (tif->tif_flags & TIFF_SWAB) {
+			tif->tif_postdecode = _TIFFNoPostDecode;
+		}
+		/*
+		 * Allocate buffer to keep the decoded bytes before
+		 * rearranging in the ight order
+		 */
+	}
+
+	return 1;
+}
+
+static int
+PredictorSetupEncode(TIFF* tif)
+{
+	TIFFPredictorState* sp = PredictorState(tif);
+	TIFFDirectory* td = &tif->tif_dir;
+
+	if (!(*sp->setupencode)(tif) || !PredictorSetup(tif))
+		return 0;
+
+	if (sp->predictor == 2) {
+		switch (td->td_bitspersample) {
+			case 8:  sp->pfunc = horDiff8; break;
+			case 16: sp->pfunc = horDiff16; break;
+		}
+		/*
+		 * Override default encoding method with one that does the
+		 * predictor stuff.
+		 */
+		sp->coderow = tif->tif_encoderow;
+		tif->tif_encoderow = PredictorEncodeRow;
+		sp->codestrip = tif->tif_encodestrip;
+		tif->tif_encodestrip = PredictorEncodeTile;
+		sp->codetile = tif->tif_encodetile;
+		tif->tif_encodetile = PredictorEncodeTile;
+	}
+
+	else if (sp->predictor == 3) {
+		sp->pfunc = fpDiff;
+		/*
+		 * Override default encoding method with one that does the
+		 * predictor stuff.
+		 */
+		sp->coderow = tif->tif_encoderow;
+		tif->tif_encoderow = PredictorEncodeRow;
+		sp->codestrip = tif->tif_encodestrip;
+		tif->tif_encodestrip = PredictorEncodeTile;
+		sp->codetile = tif->tif_encodetile;
+		tif->tif_encodetile = PredictorEncodeTile;
+	}
+
+	return 1;
+}
+
+#define REPEAT4(n, op)		\
+    switch (n) {		\
+    default: { int i; for (i = n-4; i > 0; i--) { op; } } \
+    case 4:  op;		\
+    case 3:  op;		\
+    case 2:  op;		\
+    case 1:  op;		\
+    case 0:  ;			\
+    }
+
+static void
+horAcc8(TIFF* tif, tidata_t cp0, tsize_t cc)
+{
+	tsize_t stride = PredictorState(tif)->stride;
+
+	char* cp = (char*) cp0;
+	if (cc > stride) {
+		cc -= stride;
+		/*
+		 * Pipeline the most common cases.
+		 */
+		if (stride == 3)  {
+			unsigned int cr = cp[0];
+			unsigned int cg = cp[1];
+			unsigned int cb = cp[2];
+			do {
+				cc -= 3, cp += 3;
+				cp[0] = (char) (cr += cp[0]);
+				cp[1] = (char) (cg += cp[1]);
+				cp[2] = (char) (cb += cp[2]);
+			} while ((int32) cc > 0);
+		} else if (stride == 4)  {
+			unsigned int cr = cp[0];
+			unsigned int cg = cp[1];
+			unsigned int cb = cp[2];
+			unsigned int ca = cp[3];
+			do {
+				cc -= 4, cp += 4;
+				cp[0] = (char) (cr += cp[0]);
+				cp[1] = (char) (cg += cp[1]);
+				cp[2] = (char) (cb += cp[2]);
+				cp[3] = (char) (ca += cp[3]);
+			} while ((int32) cc > 0);
+		} else  {
+			do {
+				REPEAT4(stride, cp[stride] =
+					(char) (cp[stride] + *cp); cp++)
+				cc -= stride;
+			} while ((int32) cc > 0);
+		}
+	}
+}
+
+static void
+swabHorAcc16(TIFF* tif, tidata_t cp0, tsize_t cc)
+{
+	tsize_t stride = PredictorState(tif)->stride;
+	uint16* wp = (uint16*) cp0;
+	tsize_t wc = cc / 2;
+
+	if (wc > stride) {
+		TIFFSwabArrayOfShort(wp, wc);
+		wc -= stride;
+		do {
+			REPEAT4(stride, wp[stride] += wp[0]; wp++)
+			wc -= stride;
+		} while ((int32) wc > 0);
+	}
+}
+
+static void
+horAcc16(TIFF* tif, tidata_t cp0, tsize_t cc)
+{
+	tsize_t stride = PredictorState(tif)->stride;
+	uint16* wp = (uint16*) cp0;
+	tsize_t wc = cc / 2;
+
+	if (wc > stride) {
+		wc -= stride;
+		do {
+			REPEAT4(stride, wp[stride] += wp[0]; wp++)
+			wc -= stride;
+		} while ((int32) wc > 0);
+	}
+}
+
+/*
+ * Floating point predictor accumulation routine.
+ */
+static void
+fpAcc(TIFF* tif, tidata_t cp0, tsize_t cc)
+{
+	tsize_t stride = PredictorState(tif)->stride;
+	uint32 bps = tif->tif_dir.td_bitspersample / 8;
+	tsize_t wc = cc / bps;
+	tsize_t count = cc;
+	uint8 *cp = (uint8 *) cp0;
+	uint8 *tmp = (uint8 *)_TIFFmalloc(cc);
+
+	if (!tmp)
+		return;
+
+	while (count > stride) {
+		REPEAT4(stride, cp[stride] += cp[0]; cp++)
+		count -= stride;
+	}
+
+	_TIFFmemcpy(tmp, cp0, cc);
+	cp = (uint8 *) cp0;
+	for (count = 0; count < wc; count++) {
+		uint32 byte;
+		for (byte = 0; byte < bps; byte++) {
+#if WORDS_BIGENDIAN
+			cp[bps * count + byte] = tmp[byte * wc + count];
+#else
+			cp[bps * count + byte] =
+				tmp[(bps - byte - 1) * wc + count];
+#endif
+		}
+	}
+	_TIFFfree(tmp);
+}
+
+/*
+ * Decode a scanline and apply the predictor routine.
+ */
+static int
+PredictorDecodeRow(TIFF* tif, tidata_t op0, tsize_t occ0, tsample_t s)
+{
+	TIFFPredictorState *sp = PredictorState(tif);
+
+	assert(sp != NULL);
+	assert(sp->coderow != NULL);
+	assert(sp->pfunc != NULL);
+
+	if ((*sp->coderow)(tif, op0, occ0, s)) {
+		(*sp->pfunc)(tif, op0, occ0);
+		return 1;
+	} else
+		return 0;
+}
+
+/*
+ * Decode a tile/strip and apply the predictor routine.
+ * Note that horizontal differencing must be done on a
+ * row-by-row basis.  The width of a "row" has already
+ * been calculated at pre-decode time according to the
+ * strip/tile dimensions.
+ */
+static int
+PredictorDecodeTile(TIFF* tif, tidata_t op0, tsize_t occ0, tsample_t s)
+{
+	TIFFPredictorState *sp = PredictorState(tif);
+
+	assert(sp != NULL);
+	assert(sp->codetile != NULL);
+
+	if ((*sp->codetile)(tif, op0, occ0, s)) {
+		tsize_t rowsize = sp->rowsize;
+		assert(rowsize > 0);
+		assert(sp->pfunc != NULL);
+		while ((long)occ0 > 0) {
+			(*sp->pfunc)(tif, op0, (tsize_t) rowsize);
+			occ0 -= rowsize;
+			op0 += rowsize;
+		}
+		return 1;
+	} else
+		return 0;
+}
+
+static void
+horDiff8(TIFF* tif, tidata_t cp0, tsize_t cc)
+{
+	TIFFPredictorState* sp = PredictorState(tif);
+	tsize_t stride = sp->stride;
+	char* cp = (char*) cp0;
+
+	if (cc > stride) {
+		cc -= stride;
+		/*
+		 * Pipeline the most common cases.
+		 */
+		if (stride == 3) {
+			int r1, g1, b1;
+			int r2 = cp[0];
+			int g2 = cp[1];
+			int b2 = cp[2];
+			do {
+				r1 = cp[3]; cp[3] = r1-r2; r2 = r1;
+				g1 = cp[4]; cp[4] = g1-g2; g2 = g1;
+				b1 = cp[5]; cp[5] = b1-b2; b2 = b1;
+				cp += 3;
+			} while ((int32)(cc -= 3) > 0);
+		} else if (stride == 4) {
+			int r1, g1, b1, a1;
+			int r2 = cp[0];
+			int g2 = cp[1];
+			int b2 = cp[2];
+			int a2 = cp[3];
+			do {
+				r1 = cp[4]; cp[4] = r1-r2; r2 = r1;
+				g1 = cp[5]; cp[5] = g1-g2; g2 = g1;
+				b1 = cp[6]; cp[6] = b1-b2; b2 = b1;
+				a1 = cp[7]; cp[7] = a1-a2; a2 = a1;
+				cp += 4;
+			} while ((int32)(cc -= 4) > 0);
+		} else {
+			cp += cc - 1;
+			do {
+				REPEAT4(stride, cp[stride] -= cp[0]; cp--)
+			} while ((int32)(cc -= stride) > 0);
+		}
+	}
+}
+
+static void
+horDiff16(TIFF* tif, tidata_t cp0, tsize_t cc)
+{
+	TIFFPredictorState* sp = PredictorState(tif);
+	tsize_t stride = sp->stride;
+	int16 *wp = (int16*) cp0;
+	tsize_t wc = cc/2;
+
+	if (wc > stride) {
+		wc -= stride;
+		wp += wc - 1;
+		do {
+			REPEAT4(stride, wp[stride] -= wp[0]; wp--)
+			wc -= stride;
+		} while ((int32) wc > 0);
+	}
+}
+
+/*
+ * Floating point predictor differencing routine.
+ */
+static void
+fpDiff(TIFF* tif, tidata_t cp0, tsize_t cc)
+{
+	tsize_t stride = PredictorState(tif)->stride;
+	uint32 bps = tif->tif_dir.td_bitspersample / 8;
+	tsize_t wc = cc / bps;
+	tsize_t count;
+	uint8 *cp = (uint8 *) cp0;
+	uint8 *tmp = (uint8 *)_TIFFmalloc(cc);
+
+	if (!tmp)
+		return;
+
+	_TIFFmemcpy(tmp, cp0, cc);
+	for (count = 0; count < wc; count++) {
+		uint32 byte;
+		for (byte = 0; byte < bps; byte++) {
+#if WORDS_BIGENDIAN
+			cp[byte * wc + count] =	tmp[bps * count + byte];
+#else
+			cp[(bps - byte - 1) * wc + count] =
+				tmp[bps * count + byte];
+#endif
+		}
+	}
+	_TIFFfree(tmp);
+
+	cp = (uint8 *) cp0;
+	cp += cc - stride - 1;
+	for (count = cc; count > stride; count -= stride)
+		REPEAT4(stride, cp[stride] -= cp[0]; cp--)
+}
+
+static int
+PredictorEncodeRow(TIFF* tif, tidata_t bp, tsize_t cc, tsample_t s)
+{
+	TIFFPredictorState *sp = PredictorState(tif);
+
+	assert(sp != NULL);
+	assert(sp->pfunc != NULL);
+	assert(sp->coderow != NULL);
+
+	/* XXX horizontal differencing alters user's data XXX */
+	(*sp->pfunc)(tif, bp, cc);
+	return (*sp->coderow)(tif, bp, cc, s);
+}
+
+static int
+PredictorEncodeTile(TIFF* tif, tidata_t bp0, tsize_t cc0, tsample_t s)
+{
+	TIFFPredictorState *sp = PredictorState(tif);
+	tsize_t cc = cc0, rowsize;
+	unsigned char* bp = bp0;
+
+	assert(sp != NULL);
+	assert(sp->pfunc != NULL);
+	assert(sp->codetile != NULL);
+
+	rowsize = sp->rowsize;
+	assert(rowsize > 0);
+	while ((long)cc > 0) {
+		(*sp->pfunc)(tif, bp, (tsize_t) rowsize);
+		cc -= rowsize;
+		bp += rowsize;
+	}
+	return (*sp->codetile)(tif, bp0, cc0, s);
+}
+
+#define	FIELD_PREDICTOR	(FIELD_CODEC+0)		/* XXX */
+
+static const TIFFFieldInfo predictFieldInfo[] = {
+    { TIFFTAG_PREDICTOR,	 1, 1, TIFF_SHORT,	FIELD_PREDICTOR,
+      FALSE,	FALSE,	"Predictor" },
+};
+#define	N(a)	(sizeof (a) / sizeof (a[0]))
+
+static int
+PredictorVSetField(TIFF* tif, ttag_t tag, va_list ap)
+{
+	TIFFPredictorState *sp = PredictorState(tif);
+
+	assert(sp != NULL);
+	assert(sp->vsetparent != NULL);
+
+	switch (tag) {
+	case TIFFTAG_PREDICTOR:
+		sp->predictor = (uint16) va_arg(ap, int);
+		TIFFSetFieldBit(tif, FIELD_PREDICTOR);
+		break;
+	default:
+		return (*sp->vsetparent)(tif, tag, ap);
+	}
+	tif->tif_flags |= TIFF_DIRTYDIRECT;
+	return 1;
+}
+
+static int
+PredictorVGetField(TIFF* tif, ttag_t tag, va_list ap)
+{
+	TIFFPredictorState *sp = PredictorState(tif);
+
+	assert(sp != NULL);
+	assert(sp->vgetparent != NULL);
+
+	switch (tag) {
+	case TIFFTAG_PREDICTOR:
+		*va_arg(ap, uint16*) = sp->predictor;
+		break;
+	default:
+		return (*sp->vgetparent)(tif, tag, ap);
+	}
+	return 1;
+}
+
+static void
+PredictorPrintDir(TIFF* tif, FILE* fd, long flags)
+{
+	TIFFPredictorState* sp = PredictorState(tif);
+
+	(void) flags;
+	if (TIFFFieldSet(tif,FIELD_PREDICTOR)) {
+		fprintf(fd, "  Predictor: ");
+		switch (sp->predictor) {
+		case 1: fprintf(fd, "none "); break;
+		case 2: fprintf(fd, "horizontal differencing "); break;
+		case 3: fprintf(fd, "floating point predictor "); break;
+		}
+		fprintf(fd, "%u (0x%x)\n", sp->predictor, sp->predictor);
+	}
+	if (sp->printdir)
+		(*sp->printdir)(tif, fd, flags);
+}
+
+int
+TIFFPredictorInit(TIFF* tif)
+{
+	TIFFPredictorState* sp = PredictorState(tif);
+
+	assert(sp != 0);
+
+	/*
+	 * Merge codec-specific tag information and
+	 * override parent get/set field methods.
+	 */
+	_TIFFMergeFieldInfo(tif, predictFieldInfo, N(predictFieldInfo));
+	sp->vgetparent = tif->tif_tagmethods.vgetfield;
+	tif->tif_tagmethods.vgetfield =
+            PredictorVGetField;/* hook for predictor tag */
+	sp->vsetparent = tif->tif_tagmethods.vsetfield;
+	tif->tif_tagmethods.vsetfield =
+            PredictorVSetField;/* hook for predictor tag */
+	sp->printdir = tif->tif_tagmethods.printdir;
+	tif->tif_tagmethods.printdir =
+            PredictorPrintDir;	/* hook for predictor tag */
+
+	sp->setupdecode = tif->tif_setupdecode;
+	tif->tif_setupdecode = PredictorSetupDecode;
+	sp->setupencode = tif->tif_setupencode;
+	tif->tif_setupencode = PredictorSetupEncode;
+
+	sp->predictor = 1;			/* default value */
+	sp->pfunc = NULL;			/* no predictor routine */
+	return 1;
+}
+
+int
+TIFFPredictorCleanup(TIFF* tif)
+{
+	TIFFPredictorState* sp = PredictorState(tif);
+
+	assert(sp != 0);
+
+	tif->tif_tagmethods.vgetfield = sp->vgetparent;
+	tif->tif_tagmethods.vsetfield = sp->vsetparent;
+	tif->tif_tagmethods.printdir = sp->printdir;
+	tif->tif_setupdecode = sp->setupdecode;
+	tif->tif_setupencode = sp->setupencode;
+
+	return 1;
+}
+
+/* vim: set ts=8 sts=8 sw=8 noet: */
diff --git a/uppsrc/plugin/tif/lib/tif_predict.h b/uppsrc/plugin/tif/lib/tif_predict.h
new file mode 100644
index 000000000..d9405321b
--- /dev/null
+++ b/uppsrc/plugin/tif/lib/tif_predict.h
@@ -0,0 +1,64 @@
+/* $Id: tif_predict.h,v 1.3 2006/03/03 14:10:09 dron Exp $ */
+
+/*
+ * Copyright (c) 1995-1997 Sam Leffler
+ * Copyright (c) 1995-1997 Silicon Graphics, Inc.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and
+ * its documentation for any purpose is hereby granted without fee, provided
+ * that (i) the above copyright notices and this permission notice appear in
+ * all copies of the software and related documentation, and (ii) the names of
+ * Sam Leffler and Silicon Graphics may not be used in any advertising or
+ * publicity relating to the software without the specific, prior written
+ * permission of Sam Leffler and Silicon Graphics.
+ *
+ * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+ * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
+ * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
+ * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+ * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
+ * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.
+ */
+
+#ifndef _TIFFPREDICT_
+#define	_TIFFPREDICT_
+/*
+ * ``Library-private'' Support for the Predictor Tag
+ */
+
+/*
+ * Codecs that want to support the Predictor tag must place
+ * this structure first in their private state block so that
+ * the predictor code can cast tif_data to find its state.
+ */
+typedef struct {
+	int		predictor;	/* predictor tag value */
+	int		stride;		/* sample stride over data */
+	tsize_t		rowsize;	/* tile/strip row size */
+
+	TIFFPostMethod	pfunc;		/* horizontal differencer/accumulator */
+	TIFFCodeMethod	coderow;	/* parent codec encode/decode row */
+	TIFFCodeMethod	codestrip;	/* parent codec encode/decode strip */
+	TIFFCodeMethod	codetile;	/* parent codec encode/decode tile */
+	TIFFVGetMethod	vgetparent;	/* super-class method */
+	TIFFVSetMethod	vsetparent;	/* super-class method */
+	TIFFPrintMethod	printdir;	/* super-class method */
+	TIFFBoolMethod	setupdecode;	/* super-class method */
+	TIFFBoolMethod	setupencode;	/* super-class method */
+} TIFFPredictorState;
+
+#if defined(__cplusplus)
+extern "C" {
+#endif
+extern	int TIFFPredictorInit(TIFF*);
+extern	int TIFFPredictorCleanup(TIFF*);
+#if defined(__cplusplus)
+}
+#endif
+#endif /* _TIFFPREDICT_ */
+
+/* vim: set ts=8 sts=8 sw=8 noet: */
diff --git a/uppsrc/plugin/tif/lib/tif_print.c b/uppsrc/plugin/tif/lib/tif_print.c
new file mode 100644
index 000000000..b60ac2230
--- /dev/null
+++ b/uppsrc/plugin/tif/lib/tif_print.c
@@ -0,0 +1,639 @@
+/* $Id: tif_print.c,v 1.35 2006/03/13 07:53:28 dron Exp $ */
+
+/*
+ * Copyright (c) 1988-1997 Sam Leffler
+ * Copyright (c) 1991-1997 Silicon Graphics, Inc.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and
+ * its documentation for any purpose is hereby granted without fee, provided
+ * that (i) the above copyright notices and this permission notice appear in
+ * all copies of the software and related documentation, and (ii) the names of
+ * Sam Leffler and Silicon Graphics may not be used in any advertising or
+ * publicity relating to the software without the specific, prior written
+ * permission of Sam Leffler and Silicon Graphics.
+ *
+ * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+ * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
+ * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
+ * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+ * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
+ * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.
+ */
+
+/*
+ * TIFF Library.
+ *
+ * Directory Printing Support
+ */
+#include "tiffiop.h"
+#include <stdio.h>
+
+#include <ctype.h>
+
+static const char *photoNames[] = {
+    "min-is-white",				/* PHOTOMETRIC_MINISWHITE */
+    "min-is-black",				/* PHOTOMETRIC_MINISBLACK */
+    "RGB color",				/* PHOTOMETRIC_RGB */
+    "palette color (RGB from colormap)",	/* PHOTOMETRIC_PALETTE */
+    "transparency mask",			/* PHOTOMETRIC_MASK */
+    "separated",				/* PHOTOMETRIC_SEPARATED */
+    "YCbCr",					/* PHOTOMETRIC_YCBCR */
+    "7 (0x7)",
+    "CIE L*a*b*",				/* PHOTOMETRIC_CIELAB */
+};
+#define	NPHOTONAMES	(sizeof (photoNames) / sizeof (photoNames[0]))
+
+static const char *orientNames[] = {
+    "0 (0x0)",
+    "row 0 top, col 0 lhs",			/* ORIENTATION_TOPLEFT */
+    "row 0 top, col 0 rhs",			/* ORIENTATION_TOPRIGHT */
+    "row 0 bottom, col 0 rhs",			/* ORIENTATION_BOTRIGHT */
+    "row 0 bottom, col 0 lhs",			/* ORIENTATION_BOTLEFT */
+    "row 0 lhs, col 0 top",			/* ORIENTATION_LEFTTOP */
+    "row 0 rhs, col 0 top",			/* ORIENTATION_RIGHTTOP */
+    "row 0 rhs, col 0 bottom",			/* ORIENTATION_RIGHTBOT */
+    "row 0 lhs, col 0 bottom",			/* ORIENTATION_LEFTBOT */
+};
+#define	NORIENTNAMES	(sizeof (orientNames) / sizeof (orientNames[0]))
+
+static void
+_TIFFPrintField(FILE* fd, const TIFFFieldInfo *fip,
+		uint32 value_count, void *raw_data)
+{
+	uint32 j;
+
+	fprintf(fd, "  %s: ", fip->field_name);
+
+	for(j = 0; j < value_count; j++) {
+		if(fip->field_type == TIFF_BYTE)
+			fprintf(fd, "%u", ((uint8 *) raw_data)[j]);
+		else if(fip->field_type == TIFF_UNDEFINED)
+			fprintf(fd, "0x%x",
+				(unsigned int) ((unsigned char *) raw_data)[j]);
+		else if(fip->field_type == TIFF_SBYTE)
+			fprintf(fd, "%d", ((int8 *) raw_data)[j]);
+		else if(fip->field_type == TIFF_SHORT)
+			fprintf(fd, "%u", ((uint16 *) raw_data)[j]);
+		else if(fip->field_type == TIFF_SSHORT)
+			fprintf(fd, "%d", ((int16 *) raw_data)[j]);
+		else if(fip->field_type == TIFF_LONG)
+			fprintf(fd, "%lu",
+				(unsigned long)((uint32 *) raw_data)[j]);
+		else if(fip->field_type == TIFF_SLONG)
+			fprintf(fd, "%ld", (long)((int32 *) raw_data)[j]);
+		else if(fip->field_type == TIFF_RATIONAL
+			|| fip->field_type == TIFF_SRATIONAL
+			|| fip->field_type == TIFF_FLOAT)
+			fprintf(fd, "%f", ((float *) raw_data)[j]);
+		else if(fip->field_type == TIFF_IFD)
+			fprintf(fd, "0x%ulx", ((uint32 *) raw_data)[j]);
+		else if(fip->field_type == TIFF_ASCII) {
+			fprintf(fd, "%s", (char *) raw_data);
+			break;
+		}
+		else if(fip->field_type == TIFF_DOUBLE)
+			fprintf(fd, "%f", ((double *) raw_data)[j]);
+		else if(fip->field_type == TIFF_FLOAT)
+			fprintf(fd, "%f", ((float *)raw_data)[j]);
+		else {
+			fprintf(fd, "<unsupported data type in TIFFPrint>");
+			break;
+		}
+
+		if(j < value_count - 1)
+			fprintf(fd, ",");
+	}
+
+	fprintf(fd, "\n");
+}
+
+static int
+_TIFFPrettyPrintField(TIFF* tif, FILE* fd, ttag_t tag,
+		      uint32 value_count, void *raw_data)
+{
+	TIFFDirectory *td = &tif->tif_dir;
+
+	switch (tag)
+	{
+		case TIFFTAG_INKSET:
+			fprintf(fd, "  Ink Set: ");
+			switch (*((uint16*)raw_data)) {
+				case INKSET_CMYK:
+					fprintf(fd, "CMYK\n");
+					break;
+				default:
+					fprintf(fd, "%u (0x%x)\n",
+						*((uint16*)raw_data),
+						*((uint16*)raw_data));
+					break;
+			}
+			return 1;
+		case TIFFTAG_DOTRANGE:
+			fprintf(fd, "  Dot Range: %u-%u\n",
+				((uint16*)raw_data)[0], ((uint16*)raw_data)[1]);
+			return 1;
+		case TIFFTAG_WHITEPOINT:
+			fprintf(fd, "  White Point: %g-%g\n",
+				((float *)raw_data)[0], ((float *)raw_data)[1]);			return 1;
+		case TIFFTAG_REFERENCEBLACKWHITE:
+		{
+			uint16 i;
+
+			fprintf(fd, "  Reference Black/White:\n");
+			for (i = 0; i < td->td_samplesperpixel; i++)
+			fprintf(fd, "    %2d: %5g %5g\n", i,
+				((float *)raw_data)[2*i+0],
+				((float *)raw_data)[2*i+1]);
+			return 1;
+		}
+		case TIFFTAG_XMLPACKET:
+		{
+			uint32 i;
+
+			fprintf(fd, "  XMLPacket (XMP Metadata):\n" );
+			for(i = 0; i < value_count; i++)
+				fputc(((char *)raw_data)[i], fd);
+			fprintf( fd, "\n" );
+			return 1;
+		}
+		case TIFFTAG_RICHTIFFIPTC:
+			/*
+			 * XXX: for some weird reason RichTIFFIPTC tag
+			 * defined as array of LONG values.
+			 */
+			fprintf(fd,
+				"  RichTIFFIPTC Data: <present>, %lu bytes\n",
+				(unsigned long) value_count * 4);
+			return 1;
+		case TIFFTAG_PHOTOSHOP:
+			fprintf(fd, "  Photoshop Data: <present>, %lu bytes\n",
+				(unsigned long) value_count);
+			return 1;
+		case TIFFTAG_ICCPROFILE:
+			fprintf(fd, "  ICC Profile: <present>, %lu bytes\n",
+				(unsigned long) value_count);
+			return 1;
+		case TIFFTAG_STONITS:
+			fprintf(fd,
+				"  Sample to Nits conversion factor: %.4e\n",
+				*((double*)raw_data));
+			return 1;
+        }
+
+	return 0;
+}
+
+/*
+ * Print the contents of the current directory
+ * to the specified stdio file stream.
+ */
+void
+TIFFPrintDirectory(TIFF* tif, FILE* fd, long flags)
+{
+	TIFFDirectory *td = &tif->tif_dir;
+	char *sep;
+	uint16 i;
+	long l, n;
+
+	fprintf(fd, "TIFF Directory at offset 0x%lx (%lu)\n",
+		(unsigned long)tif->tif_diroff, (unsigned long)tif->tif_diroff);
+	if (TIFFFieldSet(tif,FIELD_SUBFILETYPE)) {
+		fprintf(fd, "  Subfile Type:");
+		sep = " ";
+		if (td->td_subfiletype & FILETYPE_REDUCEDIMAGE) {
+			fprintf(fd, "%sreduced-resolution image", sep);
+			sep = "/";
+		}
+		if (td->td_subfiletype & FILETYPE_PAGE) {
+			fprintf(fd, "%smulti-page document", sep);
+			sep = "/";
+		}
+		if (td->td_subfiletype & FILETYPE_MASK)
+			fprintf(fd, "%stransparency mask", sep);
+		fprintf(fd, " (%lu = 0x%lx)\n",
+		    (long) td->td_subfiletype, (long) td->td_subfiletype);
+	}
+	if (TIFFFieldSet(tif,FIELD_IMAGEDIMENSIONS)) {
+		fprintf(fd, "  Image Width: %lu Image Length: %lu",
+		    (unsigned long) td->td_imagewidth, (unsigned long) td->td_imagelength);
+		if (TIFFFieldSet(tif,FIELD_IMAGEDEPTH))
+			fprintf(fd, " Image Depth: %lu",
+			    (unsigned long) td->td_imagedepth);
+		fprintf(fd, "\n");
+	}
+	if (TIFFFieldSet(tif,FIELD_TILEDIMENSIONS)) {
+		fprintf(fd, "  Tile Width: %lu Tile Length: %lu",
+		    (unsigned long) td->td_tilewidth, (unsigned long) td->td_tilelength);
+		if (TIFFFieldSet(tif,FIELD_TILEDEPTH))
+			fprintf(fd, " Tile Depth: %lu",
+			    (unsigned long) td->td_tiledepth);
+		fprintf(fd, "\n");
+	}
+	if (TIFFFieldSet(tif,FIELD_RESOLUTION)) {
+		fprintf(fd, "  Resolution: %g, %g",
+		    td->td_xresolution, td->td_yresolution);
+		if (TIFFFieldSet(tif,FIELD_RESOLUTIONUNIT)) {
+			switch (td->td_resolutionunit) {
+			case RESUNIT_NONE:
+				fprintf(fd, " (unitless)");
+				break;
+			case RESUNIT_INCH:
+				fprintf(fd, " pixels/inch");
+				break;
+			case RESUNIT_CENTIMETER:
+				fprintf(fd, " pixels/cm");
+				break;
+			default:
+				fprintf(fd, " (unit %u = 0x%x)",
+				    td->td_resolutionunit,
+				    td->td_resolutionunit);
+				break;
+			}
+		}
+		fprintf(fd, "\n");
+	}
+	if (TIFFFieldSet(tif,FIELD_POSITION))
+		fprintf(fd, "  Position: %g, %g\n",
+		    td->td_xposition, td->td_yposition);
+	if (TIFFFieldSet(tif,FIELD_BITSPERSAMPLE))
+		fprintf(fd, "  Bits/Sample: %u\n", td->td_bitspersample);
+	if (TIFFFieldSet(tif,FIELD_SAMPLEFORMAT)) {
+		fprintf(fd, "  Sample Format: ");
+		switch (td->td_sampleformat) {
+		case SAMPLEFORMAT_VOID:
+			fprintf(fd, "void\n");
+			break;
+		case SAMPLEFORMAT_INT:
+			fprintf(fd, "signed integer\n");
+			break;
+		case SAMPLEFORMAT_UINT:
+			fprintf(fd, "unsigned integer\n");
+			break;
+		case SAMPLEFORMAT_IEEEFP:
+			fprintf(fd, "IEEE floating point\n");
+			break;
+		case SAMPLEFORMAT_COMPLEXINT:
+			fprintf(fd, "complex signed integer\n");
+			break;
+		case SAMPLEFORMAT_COMPLEXIEEEFP:
+			fprintf(fd, "complex IEEE floating point\n");
+			break;
+		default:
+			fprintf(fd, "%u (0x%x)\n",
+			    td->td_sampleformat, td->td_sampleformat);
+			break;
+		}
+	}
+	if (TIFFFieldSet(tif,FIELD_COMPRESSION)) {
+		const TIFFCodec* c = TIFFFindCODEC(td->td_compression);
+		fprintf(fd, "  Compression Scheme: ");
+		if (c)
+			fprintf(fd, "%s\n", c->name);
+		else
+			fprintf(fd, "%u (0x%x)\n",
+			    td->td_compression, td->td_compression);
+	}
+	if (TIFFFieldSet(tif,FIELD_PHOTOMETRIC)) {
+		fprintf(fd, "  Photometric Interpretation: ");
+		if (td->td_photometric < NPHOTONAMES)
+			fprintf(fd, "%s\n", photoNames[td->td_photometric]);
+		else {
+			switch (td->td_photometric) {
+			case PHOTOMETRIC_LOGL:
+				fprintf(fd, "CIE Log2(L)\n");
+				break;
+			case PHOTOMETRIC_LOGLUV:
+				fprintf(fd, "CIE Log2(L) (u',v')\n");
+				break;
+			default:
+				fprintf(fd, "%u (0x%x)\n",
+				    td->td_photometric, td->td_photometric);
+				break;
+			}
+		}
+	}
+	if (TIFFFieldSet(tif,FIELD_EXTRASAMPLES) && td->td_extrasamples) {
+		fprintf(fd, "  Extra Samples: %u<", td->td_extrasamples);
+		sep = "";
+		for (i = 0; i < td->td_extrasamples; i++) {
+			switch (td->td_sampleinfo[i]) {
+			case EXTRASAMPLE_UNSPECIFIED:
+				fprintf(fd, "%sunspecified", sep);
+				break;
+			case EXTRASAMPLE_ASSOCALPHA:
+				fprintf(fd, "%sassoc-alpha", sep);
+				break;
+			case EXTRASAMPLE_UNASSALPHA:
+				fprintf(fd, "%sunassoc-alpha", sep);
+				break;
+			default:
+				fprintf(fd, "%s%u (0x%x)", sep,
+				    td->td_sampleinfo[i], td->td_sampleinfo[i]);
+				break;
+			}
+			sep = ", ";
+		}
+		fprintf(fd, ">\n");
+	}
+	if (TIFFFieldSet(tif,FIELD_INKNAMES)) {
+		char* cp;
+		fprintf(fd, "  Ink Names: ");
+		i = td->td_samplesperpixel;
+		sep = "";
+		for (cp = td->td_inknames; i > 0; cp = strchr(cp,'\0')+1, i--) {
+			fputs(sep, fd);
+			_TIFFprintAscii(fd, cp);
+			sep = ", ";
+		}
+                fputs("\n", fd);
+	}
+	if (TIFFFieldSet(tif,FIELD_THRESHHOLDING)) {
+		fprintf(fd, "  Thresholding: ");
+		switch (td->td_threshholding) {
+		case THRESHHOLD_BILEVEL:
+			fprintf(fd, "bilevel art scan\n");
+			break;
+		case THRESHHOLD_HALFTONE:
+			fprintf(fd, "halftone or dithered scan\n");
+			break;
+		case THRESHHOLD_ERRORDIFFUSE:
+			fprintf(fd, "error diffused\n");
+			break;
+		default:
+			fprintf(fd, "%u (0x%x)\n",
+			    td->td_threshholding, td->td_threshholding);
+			break;
+		}
+	}
+	if (TIFFFieldSet(tif,FIELD_FILLORDER)) {
+		fprintf(fd, "  FillOrder: ");
+		switch (td->td_fillorder) {
+		case FILLORDER_MSB2LSB:
+			fprintf(fd, "msb-to-lsb\n");
+			break;
+		case FILLORDER_LSB2MSB:
+			fprintf(fd, "lsb-to-msb\n");
+			break;
+		default:
+			fprintf(fd, "%u (0x%x)\n",
+			    td->td_fillorder, td->td_fillorder);
+			break;
+		}
+	}
+	if (TIFFFieldSet(tif,FIELD_YCBCRSUBSAMPLING))
+        {
+            /*
+             * For hacky reasons (see tif_jpeg.c - JPEGFixupTestSubsampling),
+             * we need to fetch this rather than trust what is in our
+             * structures.
+             */
+            uint16 subsampling[2];
+
+            TIFFGetField( tif, TIFFTAG_YCBCRSUBSAMPLING,
+                          subsampling + 0, subsampling + 1 );
+		fprintf(fd, "  YCbCr Subsampling: %u, %u\n",
+                        subsampling[0], subsampling[1] );
+        }
+	if (TIFFFieldSet(tif,FIELD_YCBCRPOSITIONING)) {
+		fprintf(fd, "  YCbCr Positioning: ");
+		switch (td->td_ycbcrpositioning) {
+		case YCBCRPOSITION_CENTERED:
+			fprintf(fd, "centered\n");
+			break;
+		case YCBCRPOSITION_COSITED:
+			fprintf(fd, "cosited\n");
+			break;
+		default:
+			fprintf(fd, "%u (0x%x)\n",
+			    td->td_ycbcrpositioning, td->td_ycbcrpositioning);
+			break;
+		}
+	}
+	if (TIFFFieldSet(tif,FIELD_HALFTONEHINTS))
+		fprintf(fd, "  Halftone Hints: light %u dark %u\n",
+		    td->td_halftonehints[0], td->td_halftonehints[1]);
+	if (TIFFFieldSet(tif,FIELD_ORIENTATION)) {
+		fprintf(fd, "  Orientation: ");
+		if (td->td_orientation < NORIENTNAMES)
+			fprintf(fd, "%s\n", orientNames[td->td_orientation]);
+		else
+			fprintf(fd, "%u (0x%x)\n",
+			    td->td_orientation, td->td_orientation);
+	}
+	if (TIFFFieldSet(tif,FIELD_SAMPLESPERPIXEL))
+		fprintf(fd, "  Samples/Pixel: %u\n", td->td_samplesperpixel);
+	if (TIFFFieldSet(tif,FIELD_ROWSPERSTRIP)) {
+		fprintf(fd, "  Rows/Strip: ");
+		if (td->td_rowsperstrip == (uint32) -1)
+			fprintf(fd, "(infinite)\n");
+		else
+			fprintf(fd, "%lu\n", (unsigned long) td->td_rowsperstrip);
+	}
+	if (TIFFFieldSet(tif,FIELD_MINSAMPLEVALUE))
+		fprintf(fd, "  Min Sample Value: %u\n", td->td_minsamplevalue);
+	if (TIFFFieldSet(tif,FIELD_MAXSAMPLEVALUE))
+		fprintf(fd, "  Max Sample Value: %u\n", td->td_maxsamplevalue);
+	if (TIFFFieldSet(tif,FIELD_SMINSAMPLEVALUE))
+		fprintf(fd, "  SMin Sample Value: %g\n",
+		    td->td_sminsamplevalue);
+	if (TIFFFieldSet(tif,FIELD_SMAXSAMPLEVALUE))
+		fprintf(fd, "  SMax Sample Value: %g\n",
+		    td->td_smaxsamplevalue);
+	if (TIFFFieldSet(tif,FIELD_PLANARCONFIG)) {
+		fprintf(fd, "  Planar Configuration: ");
+		switch (td->td_planarconfig) {
+		case PLANARCONFIG_CONTIG:
+			fprintf(fd, "single image plane\n");
+			break;
+		case PLANARCONFIG_SEPARATE:
+			fprintf(fd, "separate image planes\n");
+			break;
+		default:
+			fprintf(fd, "%u (0x%x)\n",
+			    td->td_planarconfig, td->td_planarconfig);
+			break;
+		}
+	}
+	if (TIFFFieldSet(tif,FIELD_PAGENUMBER))
+		fprintf(fd, "  Page Number: %u-%u\n",
+		    td->td_pagenumber[0], td->td_pagenumber[1]);
+	if (TIFFFieldSet(tif,FIELD_COLORMAP)) {
+		fprintf(fd, "  Color Map: ");
+		if (flags & TIFFPRINT_COLORMAP) {
+			fprintf(fd, "\n");
+			n = 1L<<td->td_bitspersample;
+			for (l = 0; l < n; l++)
+				fprintf(fd, "   %5lu: %5u %5u %5u\n",
+				    l,
+				    td->td_colormap[0][l],
+				    td->td_colormap[1][l],
+				    td->td_colormap[2][l]);
+		} else
+			fprintf(fd, "(present)\n");
+	}
+	if (TIFFFieldSet(tif,FIELD_TRANSFERFUNCTION)) {
+		fprintf(fd, "  Transfer Function: ");
+		if (flags & TIFFPRINT_CURVES) {
+			fprintf(fd, "\n");
+			n = 1L<<td->td_bitspersample;
+			for (l = 0; l < n; l++) {
+				fprintf(fd, "    %2lu: %5u",
+				    l, td->td_transferfunction[0][l]);
+				for (i = 1; i < td->td_samplesperpixel; i++)
+					fprintf(fd, " %5u",
+					    td->td_transferfunction[i][l]);
+				fputc('\n', fd);
+			}
+		} else
+			fprintf(fd, "(present)\n");
+	}
+	if (TIFFFieldSet(tif, FIELD_SUBIFD)) {
+		fprintf(fd, "  SubIFD Offsets:");
+		for (i = 0; i < td->td_nsubifd; i++)
+			fprintf(fd, " %5lu", (long) td->td_subifd[i]);
+		fputc('\n', fd);
+	}
+
+        /*
+        ** Custom tag support.
+        */
+        {
+            int  i;
+            short count;
+
+            count = (short) TIFFGetTagListCount(tif);
+            for(i = 0; i < count; i++) {
+                ttag_t  tag = TIFFGetTagListEntry(tif, i);
+                const TIFFFieldInfo *fip;
+                uint16 value_count;
+                int mem_alloc = 0;
+                void *raw_data;
+
+                fip = TIFFFieldWithTag(tif, tag);
+                if(fip == NULL)
+			continue;
+
+		if(fip->field_passcount) {
+			if(TIFFGetField(tif, tag, &value_count, &raw_data) != 1)
+				continue;
+		} else {
+			if (fip->field_readcount == TIFF_VARIABLE
+			    || fip->field_readcount == TIFF_VARIABLE2)
+				value_count = 1;
+			else if (fip->field_readcount == TIFF_SPP)
+				value_count = td->td_samplesperpixel;
+			else
+				value_count = fip->field_readcount;
+			if ((fip->field_type == TIFF_ASCII
+			     || fip->field_readcount == TIFF_VARIABLE
+			     || fip->field_readcount == TIFF_VARIABLE2
+			     || fip->field_readcount == TIFF_SPP
+			     || value_count > 1)
+			    && fip->field_tag != TIFFTAG_PAGENUMBER
+			    && fip->field_tag != TIFFTAG_HALFTONEHINTS
+			    && fip->field_tag != TIFFTAG_YCBCRSUBSAMPLING
+			    && fip->field_tag != TIFFTAG_DOTRANGE) {
+				if(TIFFGetField(tif, tag, &raw_data) != 1)
+					continue;
+			} else if (fip->field_tag != TIFFTAG_PAGENUMBER
+				   && fip->field_tag != TIFFTAG_HALFTONEHINTS
+				   && fip->field_tag != TIFFTAG_YCBCRSUBSAMPLING
+				   && fip->field_tag != TIFFTAG_DOTRANGE) {
+				raw_data = _TIFFmalloc(
+					_TIFFDataSize(fip->field_type)
+					* value_count);
+				mem_alloc = 1;
+				if(TIFFGetField(tif, tag, raw_data) != 1) {
+					_TIFFfree(raw_data);
+					continue;
+				}
+			} else {
+				/*
+				 * XXX: Should be fixed and removed, see the
+				 * notes related to TIFFTAG_PAGENUMBER,
+				 * TIFFTAG_HALFTONEHINTS,
+				 * TIFFTAG_YCBCRSUBSAMPLING and
+				 * TIFFTAG_DOTRANGE tags in tif_dir.c. */
+				char *tmp;
+				raw_data = _TIFFmalloc(
+					_TIFFDataSize(fip->field_type)
+					* value_count);
+				tmp = raw_data;
+				mem_alloc = 1;
+				if(TIFFGetField(tif, tag, tmp,
+				tmp + _TIFFDataSize(fip->field_type)) != 1) {
+					_TIFFfree(raw_data);
+					continue;
+				}
+			}
+		}
+
+		/*
+		 * Catch the tags which needs to be specially handled and
+		 * pretty print them. If tag not handled in
+		 * _TIFFPrettyPrintField() fall down and print it as any other
+		 * tag.
+		 */
+		if (_TIFFPrettyPrintField(tif, fd, tag, value_count, raw_data)) {
+			if(mem_alloc)
+				_TIFFfree(raw_data);
+			continue;
+		}
+		else
+			_TIFFPrintField(fd, fip, value_count, raw_data);
+
+		if(mem_alloc)
+			_TIFFfree(raw_data);
+            }
+        }
+
+	if (tif->tif_tagmethods.printdir)
+		(*tif->tif_tagmethods.printdir)(tif, fd, flags);
+	if ((flags & TIFFPRINT_STRIPS) &&
+	    TIFFFieldSet(tif,FIELD_STRIPOFFSETS)) {
+		tstrip_t s;
+
+		fprintf(fd, "  %lu %s:\n",
+		    (long) td->td_nstrips,
+		    isTiled(tif) ? "Tiles" : "Strips");
+		for (s = 0; s < td->td_nstrips; s++)
+			fprintf(fd, "    %3lu: [%8lu, %8lu]\n",
+			    (unsigned long) s,
+			    (unsigned long) td->td_stripoffset[s],
+			    (unsigned long) td->td_stripbytecount[s]);
+	}
+}
+
+void
+_TIFFprintAscii(FILE* fd, const char* cp)
+{
+	for (; *cp != '\0'; cp++) {
+		const char* tp;
+
+		if (isprint((int)*cp)) {
+			fputc(*cp, fd);
+			continue;
+		}
+		for (tp = "\tt\bb\rr\nn\vv"; *tp; tp++)
+			if (*tp++ == *cp)
+				break;
+		if (*tp)
+			fprintf(fd, "\\%c", *tp);
+		else
+			fprintf(fd, "\\%03o", *cp & 0xff);
+	}
+}
+
+void
+_TIFFprintAsciiTag(FILE* fd, const char* name, const char* value)
+{
+	fprintf(fd, "  %s: \"", name);
+	_TIFFprintAscii(fd, value);
+	fprintf(fd, "\"\n");
+}
+
+/* vim: set ts=8 sts=8 sw=8 noet: */
diff --git a/uppsrc/plugin/tif/lib/tif_read.c b/uppsrc/plugin/tif/lib/tif_read.c
new file mode 100644
index 000000000..b993a8912
--- /dev/null
+++ b/uppsrc/plugin/tif/lib/tif_read.c
@@ -0,0 +1,650 @@
+/* $Id: tif_read.c,v 1.13 2005/12/21 12:23:13 joris Exp $ */
+
+/*
+ * Copyright (c) 1988-1997 Sam Leffler
+ * Copyright (c) 1991-1997 Silicon Graphics, Inc.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and
+ * its documentation for any purpose is hereby granted without fee, provided
+ * that (i) the above copyright notices and this permission notice appear in
+ * all copies of the software and related documentation, and (ii) the names of
+ * Sam Leffler and Silicon Graphics may not be used in any advertising or
+ * publicity relating to the software without the specific, prior written
+ * permission of Sam Leffler and Silicon Graphics.
+ *
+ * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+ * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
+ * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
+ * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+ * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
+ * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.
+ */
+
+/*
+ * TIFF Library.
+ * Scanline-oriented Read Support
+ */
+#include "tiffiop.h"
+#include <stdio.h>
+
+	int TIFFFillStrip(TIFF*, tstrip_t);
+	int TIFFFillTile(TIFF*, ttile_t);
+static	int TIFFStartStrip(TIFF*, tstrip_t);
+static	int TIFFStartTile(TIFF*, ttile_t);
+static	int TIFFCheckRead(TIFF*, int);
+
+#define	NOSTRIP	((tstrip_t) -1)			/* undefined state */
+#define	NOTILE	((ttile_t) -1)			/* undefined state */
+
+/*
+ * Seek to a random row+sample in a file.
+ */
+static int
+TIFFSeek(TIFF* tif, uint32 row, tsample_t sample)
+{
+	register TIFFDirectory *td = &tif->tif_dir;
+	tstrip_t strip;
+
+	if (row >= td->td_imagelength) {	/* out of range */
+		TIFFErrorExt(tif->tif_clientdata, tif->tif_name, "%lu: Row out of range, max %lu",
+		    (unsigned long) row, (unsigned long) td->td_imagelength);
+		return (0);
+	}
+	if (td->td_planarconfig == PLANARCONFIG_SEPARATE) {
+		if (sample >= td->td_samplesperpixel) {
+			TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
+			    "%lu: Sample out of range, max %lu",
+			    (unsigned long) sample, (unsigned long) td->td_samplesperpixel);
+			return (0);
+		}
+		strip = sample*td->td_stripsperimage + row/td->td_rowsperstrip;
+	} else
+		strip = row / td->td_rowsperstrip;
+	if (strip != tif->tif_curstrip) { 	/* different strip, refill */
+		if (!TIFFFillStrip(tif, strip))
+			return (0);
+	} else if (row < tif->tif_row) {
+		/*
+		 * Moving backwards within the same strip: backup
+		 * to the start and then decode forward (below).
+		 *
+		 * NB: If you're planning on lots of random access within a
+		 * strip, it's better to just read and decode the entire
+		 * strip, and then access the decoded data in a random fashion.
+		 */
+		if (!TIFFStartStrip(tif, strip))
+			return (0);
+	}
+	if (row != tif->tif_row) {
+		/*
+		 * Seek forward to the desired row.
+		 */
+		if (!(*tif->tif_seek)(tif, row - tif->tif_row))
+			return (0);
+		tif->tif_row = row;
+	}
+	return (1);
+}
+
+int
+TIFFReadScanline(TIFF* tif, tdata_t buf, uint32 row, tsample_t sample)
+{
+	int e;
+
+	if (!TIFFCheckRead(tif, 0))
+		return (-1);
+	if( (e = TIFFSeek(tif, row, sample)) != 0) {
+		/*
+		 * Decompress desired row into user buffer.
+		 */
+		e = (*tif->tif_decoderow)
+		    (tif, (tidata_t) buf, tif->tif_scanlinesize, sample);
+
+                /* we are now poised at the beginning of the next row */
+                tif->tif_row = row + 1;
+
+		if (e)
+			(*tif->tif_postdecode)(tif, (tidata_t) buf,
+			    tif->tif_scanlinesize);
+	}
+	return (e > 0 ? 1 : -1);
+}
+
+/*
+ * Read a strip of data and decompress the specified
+ * amount into the user-supplied buffer.
+ */
+tsize_t
+TIFFReadEncodedStrip(TIFF* tif, tstrip_t strip, tdata_t buf, tsize_t size)
+{
+	TIFFDirectory *td = &tif->tif_dir;
+	uint32 nrows;
+	tsize_t stripsize;
+        tstrip_t sep_strip, strips_per_sep;
+
+	if (!TIFFCheckRead(tif, 0))
+		return (-1);
+	if (strip >= td->td_nstrips) {
+		TIFFErrorExt(tif->tif_clientdata, tif->tif_name, "%ld: Strip out of range, max %ld",
+		    (long) strip, (long) td->td_nstrips);
+		return (-1);
+	}
+	/*
+	 * Calculate the strip size according to the number of
+	 * rows in the strip (check for truncated last strip on any
+         * of the separations).
+	 */
+        if( td->td_rowsperstrip >= td->td_imagelength )
+            strips_per_sep = 1;
+        else
+            strips_per_sep = (td->td_imagelength+td->td_rowsperstrip-1)
+                / td->td_rowsperstrip;
+
+        sep_strip = strip % strips_per_sep;
+
+	if (sep_strip != strips_per_sep-1 ||
+	    (nrows = td->td_imagelength % td->td_rowsperstrip) == 0)
+		nrows = td->td_rowsperstrip;
+
+	stripsize = TIFFVStripSize(tif, nrows);
+	if (size == (tsize_t) -1)
+		size = stripsize;
+	else if (size > stripsize)
+		size = stripsize;
+	if (TIFFFillStrip(tif, strip)
+            && (*tif->tif_decodestrip)(tif, (tidata_t) buf, size,
+                         (tsample_t)(strip / td->td_stripsperimage)) > 0 ) {
+		(*tif->tif_postdecode)(tif, (tidata_t) buf, size);
+		return (size);
+	} else
+		return ((tsize_t) -1);
+}
+
+static tsize_t
+TIFFReadRawStrip1(TIFF* tif,
+    tstrip_t strip, tdata_t buf, tsize_t size, const char* module)
+{
+	TIFFDirectory *td = &tif->tif_dir;
+
+	if (!isMapped(tif)) {
+		tsize_t cc;
+
+		if (!SeekOK(tif, td->td_stripoffset[strip])) {
+			TIFFErrorExt(tif->tif_clientdata, module,
+			    "%s: Seek error at scanline %lu, strip %lu",
+			    tif->tif_name,
+			    (unsigned long) tif->tif_row, (unsigned long) strip);
+			return (-1);
+		}
+		cc = TIFFReadFile(tif, buf, size);
+		if (cc != size) {
+			TIFFErrorExt(tif->tif_clientdata, module,
+		"%s: Read error at scanline %lu; got %lu bytes, expected %lu",
+			    tif->tif_name,
+			    (unsigned long) tif->tif_row,
+			    (unsigned long) cc,
+			    (unsigned long) size);
+			return (-1);
+		}
+	} else {
+		if (td->td_stripoffset[strip] + size > tif->tif_size) {
+			TIFFErrorExt(tif->tif_clientdata, module,
+    "%s: Read error at scanline %lu, strip %lu; got %lu bytes, expected %lu",
+			    tif->tif_name,
+			    (unsigned long) tif->tif_row,
+			    (unsigned long) strip,
+			    (unsigned long) tif->tif_size - td->td_stripoffset[strip],
+			    (unsigned long) size);
+			return (-1);
+		}
+		_TIFFmemcpy(buf, tif->tif_base + td->td_stripoffset[strip],
+                            size);
+	}
+	return (size);
+}
+
+/*
+ * Read a strip of data from the file.
+ */
+tsize_t
+TIFFReadRawStrip(TIFF* tif, tstrip_t strip, tdata_t buf, tsize_t size)
+{
+	static const char module[] = "TIFFReadRawStrip";
+	TIFFDirectory *td = &tif->tif_dir;
+	tsize_t bytecount;
+
+	if (!TIFFCheckRead(tif, 0))
+		return ((tsize_t) -1);
+	if (strip >= td->td_nstrips) {
+		TIFFErrorExt(tif->tif_clientdata, tif->tif_name, "%lu: Strip out of range, max %lu",
+		    (unsigned long) strip, (unsigned long) td->td_nstrips);
+		return ((tsize_t) -1);
+	}
+	bytecount = td->td_stripbytecount[strip];
+	if (bytecount <= 0) {
+		TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
+		    "%lu: Invalid strip byte count, strip %lu",
+		    (unsigned long) bytecount, (unsigned long) strip);
+		return ((tsize_t) -1);
+	}
+	if (size != (tsize_t)-1 && size < bytecount)
+		bytecount = size;
+	return (TIFFReadRawStrip1(tif, strip, buf, bytecount, module));
+}
+
+/*
+ * Read the specified strip and setup for decoding.
+ * The data buffer is expanded, as necessary, to
+ * hold the strip's data.
+ */
+int
+TIFFFillStrip(TIFF* tif, tstrip_t strip)
+{
+	static const char module[] = "TIFFFillStrip";
+	TIFFDirectory *td = &tif->tif_dir;
+	tsize_t bytecount;
+
+	bytecount = td->td_stripbytecount[strip];
+	if (bytecount <= 0) {
+		TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
+		    "%lu: Invalid strip byte count, strip %lu",
+		    (unsigned long) bytecount, (unsigned long) strip);
+		return (0);
+	}
+	if (isMapped(tif) &&
+	    (isFillOrder(tif, td->td_fillorder)
+             || (tif->tif_flags & TIFF_NOBITREV))) {
+		/*
+		 * The image is mapped into memory and we either don't
+		 * need to flip bits or the compression routine is going
+		 * to handle this operation itself.  In this case, avoid
+		 * copying the raw data and instead just reference the
+		 * data from the memory mapped file image.  This assumes
+		 * that the decompression routines do not modify the
+		 * contents of the raw data buffer (if they try to,
+		 * the application will get a fault since the file is
+		 * mapped read-only).
+		 */
+		if ((tif->tif_flags & TIFF_MYBUFFER) && tif->tif_rawdata)
+			_TIFFfree(tif->tif_rawdata);
+		tif->tif_flags &= ~TIFF_MYBUFFER;
+		if ( td->td_stripoffset[strip] + bytecount > tif->tif_size) {
+			/*
+			 * This error message might seem strange, but it's
+			 * what would happen if a read were done instead.
+			 */
+			TIFFErrorExt(tif->tif_clientdata, module,
+		    "%s: Read error on strip %lu; got %lu bytes, expected %lu",
+			    tif->tif_name,
+			    (unsigned long) strip,
+			    (unsigned long) tif->tif_size - td->td_stripoffset[strip],
+			    (unsigned long) bytecount);
+			tif->tif_curstrip = NOSTRIP;
+			return (0);
+		}
+		tif->tif_rawdatasize = bytecount;
+		tif->tif_rawdata = tif->tif_base + td->td_stripoffset[strip];
+	} else {
+		/*
+		 * Expand raw data buffer, if needed, to
+		 * hold data strip coming from file
+		 * (perhaps should set upper bound on
+		 *  the size of a buffer we'll use?).
+		 */
+		if (bytecount > tif->tif_rawdatasize) {
+			tif->tif_curstrip = NOSTRIP;
+			if ((tif->tif_flags & TIFF_MYBUFFER) == 0) {
+				TIFFErrorExt(tif->tif_clientdata, module,
+				"%s: Data buffer too small to hold strip %lu",
+				    tif->tif_name, (unsigned long) strip);
+				return (0);
+			}
+			if (!TIFFReadBufferSetup(tif, 0,
+			    TIFFroundup(bytecount, 1024)))
+				return (0);
+		}
+		if (TIFFReadRawStrip1(tif, strip, (unsigned char *)tif->tif_rawdata,
+		    bytecount, module) != bytecount)
+			return (0);
+		if (!isFillOrder(tif, td->td_fillorder) &&
+		    (tif->tif_flags & TIFF_NOBITREV) == 0)
+			TIFFReverseBits(tif->tif_rawdata, bytecount);
+	}
+	return (TIFFStartStrip(tif, strip));
+}
+
+/*
+ * Tile-oriented Read Support
+ * Contributed by Nancy Cam (Silicon Graphics).
+ */
+
+/*
+ * Read and decompress a tile of data.  The
+ * tile is selected by the (x,y,z,s) coordinates.
+ */
+tsize_t
+TIFFReadTile(TIFF* tif,
+    tdata_t buf, uint32 x, uint32 y, uint32 z, tsample_t s)
+{
+	if (!TIFFCheckRead(tif, 1) || !TIFFCheckTile(tif, x, y, z, s))
+		return (-1);
+	return (TIFFReadEncodedTile(tif,
+	    TIFFComputeTile(tif, x, y, z, s), buf, (tsize_t) -1));
+}
+
+/*
+ * Read a tile of data and decompress the specified
+ * amount into the user-supplied buffer.
+ */
+tsize_t
+TIFFReadEncodedTile(TIFF* tif, ttile_t tile, tdata_t buf, tsize_t size)
+{
+	TIFFDirectory *td = &tif->tif_dir;
+	tsize_t tilesize = tif->tif_tilesize;
+
+	if (!TIFFCheckRead(tif, 1))
+		return (-1);
+	if (tile >= td->td_nstrips) {
+		TIFFErrorExt(tif->tif_clientdata, tif->tif_name, "%ld: Tile out of range, max %ld",
+		    (long) tile, (unsigned long) td->td_nstrips);
+		return (-1);
+	}
+	if (size == (tsize_t) -1)
+		size = tilesize;
+	else if (size > tilesize)
+		size = tilesize;
+	if (TIFFFillTile(tif, tile) && (*tif->tif_decodetile)(tif,
+	    (tidata_t) buf, size, (tsample_t)(tile/td->td_stripsperimage))) {
+		(*tif->tif_postdecode)(tif, (tidata_t) buf, size);
+		return (size);
+	} else
+		return (-1);
+}
+
+static tsize_t
+TIFFReadRawTile1(TIFF* tif,
+    ttile_t tile, tdata_t buf, tsize_t size, const char* module)
+{
+	TIFFDirectory *td = &tif->tif_dir;
+
+	if (!isMapped(tif)) {
+		tsize_t cc;
+
+		if (!SeekOK(tif, td->td_stripoffset[tile])) {
+			TIFFErrorExt(tif->tif_clientdata, module,
+			    "%s: Seek error at row %ld, col %ld, tile %ld",
+			    tif->tif_name,
+			    (long) tif->tif_row,
+			    (long) tif->tif_col,
+			    (long) tile);
+			return ((tsize_t) -1);
+		}
+		cc = TIFFReadFile(tif, buf, size);
+		if (cc != size) {
+			TIFFErrorExt(tif->tif_clientdata, module,
+	    "%s: Read error at row %ld, col %ld; got %lu bytes, expected %lu",
+			    tif->tif_name,
+			    (long) tif->tif_row,
+			    (long) tif->tif_col,
+			    (unsigned long) cc,
+			    (unsigned long) size);
+			return ((tsize_t) -1);
+		}
+	} else {
+		if (td->td_stripoffset[tile] + size > tif->tif_size) {
+			TIFFErrorExt(tif->tif_clientdata, module,
+    "%s: Read error at row %ld, col %ld, tile %ld; got %lu bytes, expected %lu",
+			    tif->tif_name,
+			    (long) tif->tif_row,
+			    (long) tif->tif_col,
+			    (long) tile,
+			    (unsigned long) tif->tif_size - td->td_stripoffset[tile],
+			    (unsigned long) size);
+			return ((tsize_t) -1);
+		}
+		_TIFFmemcpy(buf, tif->tif_base + td->td_stripoffset[tile], size);
+	}
+	return (size);
+}
+
+/*
+ * Read a tile of data from the file.
+ */
+tsize_t
+TIFFReadRawTile(TIFF* tif, ttile_t tile, tdata_t buf, tsize_t size)
+{
+	static const char module[] = "TIFFReadRawTile";
+	TIFFDirectory *td = &tif->tif_dir;
+	tsize_t bytecount;
+
+	if (!TIFFCheckRead(tif, 1))
+		return ((tsize_t) -1);
+	if (tile >= td->td_nstrips) {
+		TIFFErrorExt(tif->tif_clientdata, tif->tif_name, "%lu: Tile out of range, max %lu",
+		    (unsigned long) tile, (unsigned long) td->td_nstrips);
+		return ((tsize_t) -1);
+	}
+	bytecount = td->td_stripbytecount[tile];
+	if (size != (tsize_t) -1 && size < bytecount)
+		bytecount = size;
+	return (TIFFReadRawTile1(tif, tile, buf, bytecount, module));
+}
+
+/*
+ * Read the specified tile and setup for decoding.
+ * The data buffer is expanded, as necessary, to
+ * hold the tile's data.
+ */
+int
+TIFFFillTile(TIFF* tif, ttile_t tile)
+{
+	static const char module[] = "TIFFFillTile";
+	TIFFDirectory *td = &tif->tif_dir;
+	tsize_t bytecount;
+
+	bytecount = td->td_stripbytecount[tile];
+	if (bytecount <= 0) {
+		TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
+		    "%lu: Invalid tile byte count, tile %lu",
+		    (unsigned long) bytecount, (unsigned long) tile);
+		return (0);
+	}
+	if (isMapped(tif) &&
+	    (isFillOrder(tif, td->td_fillorder)
+             || (tif->tif_flags & TIFF_NOBITREV))) {
+		/*
+		 * The image is mapped into memory and we either don't
+		 * need to flip bits or the compression routine is going
+		 * to handle this operation itself.  In this case, avoid
+		 * copying the raw data and instead just reference the
+		 * data from the memory mapped file image.  This assumes
+		 * that the decompression routines do not modify the
+		 * contents of the raw data buffer (if they try to,
+		 * the application will get a fault since the file is
+		 * mapped read-only).
+		 */
+		if ((tif->tif_flags & TIFF_MYBUFFER) && tif->tif_rawdata)
+			_TIFFfree(tif->tif_rawdata);
+		tif->tif_flags &= ~TIFF_MYBUFFER;
+		if ( td->td_stripoffset[tile] + bytecount > tif->tif_size) {
+			tif->tif_curtile = NOTILE;
+			return (0);
+		}
+		tif->tif_rawdatasize = bytecount;
+		tif->tif_rawdata = tif->tif_base + td->td_stripoffset[tile];
+	} else {
+		/*
+		 * Expand raw data buffer, if needed, to
+		 * hold data tile coming from file
+		 * (perhaps should set upper bound on
+		 *  the size of a buffer we'll use?).
+		 */
+		if (bytecount > tif->tif_rawdatasize) {
+			tif->tif_curtile = NOTILE;
+			if ((tif->tif_flags & TIFF_MYBUFFER) == 0) {
+				TIFFErrorExt(tif->tif_clientdata, module,
+				"%s: Data buffer too small to hold tile %ld",
+				    tif->tif_name, (long) tile);
+				return (0);
+			}
+			if (!TIFFReadBufferSetup(tif, 0,
+			    TIFFroundup(bytecount, 1024)))
+				return (0);
+		}
+		if (TIFFReadRawTile1(tif, tile,
+                                     (unsigned char *)tif->tif_rawdata,
+                                     bytecount, module) != bytecount)
+			return (0);
+		if (!isFillOrder(tif, td->td_fillorder) &&
+		    (tif->tif_flags & TIFF_NOBITREV) == 0)
+			TIFFReverseBits(tif->tif_rawdata, bytecount);
+	}
+	return (TIFFStartTile(tif, tile));
+}
+
+/*
+ * Setup the raw data buffer in preparation for
+ * reading a strip of raw data.  If the buffer
+ * is specified as zero, then a buffer of appropriate
+ * size is allocated by the library.  Otherwise,
+ * the client must guarantee that the buffer is
+ * large enough to hold any individual strip of
+ * raw data.
+ */
+int
+TIFFReadBufferSetup(TIFF* tif, tdata_t bp, tsize_t size)
+{
+	static const char module[] = "TIFFReadBufferSetup";
+
+	if (tif->tif_rawdata) {
+		if (tif->tif_flags & TIFF_MYBUFFER)
+			_TIFFfree(tif->tif_rawdata);
+		tif->tif_rawdata = NULL;
+	}
+	if (bp) {
+		tif->tif_rawdatasize = size;
+		tif->tif_rawdata = (tidata_t) bp;
+		tif->tif_flags &= ~TIFF_MYBUFFER;
+	} else {
+		tif->tif_rawdatasize = TIFFroundup(size, 1024);
+		tif->tif_rawdata = (tidata_t) _TIFFmalloc(tif->tif_rawdatasize);
+		tif->tif_flags |= TIFF_MYBUFFER;
+	}
+	if (tif->tif_rawdata == NULL) {
+		TIFFErrorExt(tif->tif_clientdata, module,
+		    "%s: No space for data buffer at scanline %ld",
+		    tif->tif_name, (long) tif->tif_row);
+		tif->tif_rawdatasize = 0;
+		return (0);
+	}
+	return (1);
+}
+
+/*
+ * Set state to appear as if a
+ * strip has just been read in.
+ */
+static int
+TIFFStartStrip(TIFF* tif, tstrip_t strip)
+{
+	TIFFDirectory *td = &tif->tif_dir;
+
+	if ((tif->tif_flags & TIFF_CODERSETUP) == 0) {
+		if (!(*tif->tif_setupdecode)(tif))
+			return (0);
+		tif->tif_flags |= TIFF_CODERSETUP;
+	}
+	tif->tif_curstrip = strip;
+	tif->tif_row = (strip % td->td_stripsperimage) * td->td_rowsperstrip;
+	tif->tif_rawcp = tif->tif_rawdata;
+	tif->tif_rawcc = td->td_stripbytecount[strip];
+	return ((*tif->tif_predecode)(tif,
+			(tsample_t)(strip / td->td_stripsperimage)));
+}
+
+/*
+ * Set state to appear as if a
+ * tile has just been read in.
+ */
+static int
+TIFFStartTile(TIFF* tif, ttile_t tile)
+{
+	TIFFDirectory *td = &tif->tif_dir;
+
+	if ((tif->tif_flags & TIFF_CODERSETUP) == 0) {
+		if (!(*tif->tif_setupdecode)(tif))
+			return (0);
+		tif->tif_flags |= TIFF_CODERSETUP;
+	}
+	tif->tif_curtile = tile;
+	tif->tif_row =
+	    (tile % TIFFhowmany(td->td_imagewidth, td->td_tilewidth)) *
+		td->td_tilelength;
+	tif->tif_col =
+	    (tile % TIFFhowmany(td->td_imagelength, td->td_tilelength)) *
+		td->td_tilewidth;
+	tif->tif_rawcp = tif->tif_rawdata;
+	tif->tif_rawcc = td->td_stripbytecount[tile];
+	return ((*tif->tif_predecode)(tif,
+			(tsample_t)(tile/td->td_stripsperimage)));
+}
+
+static int
+TIFFCheckRead(TIFF* tif, int tiles)
+{
+	if (tif->tif_mode == O_WRONLY) {
+		TIFFErrorExt(tif->tif_clientdata, tif->tif_name, "File not open for reading");
+		return (0);
+	}
+	if (tiles ^ isTiled(tif)) {
+		TIFFErrorExt(tif->tif_clientdata, tif->tif_name, tiles ?
+		    "Can not read tiles from a stripped image" :
+		    "Can not read scanlines from a tiled image");
+		return (0);
+	}
+	return (1);
+}
+
+void
+_TIFFNoPostDecode(TIFF* tif, tidata_t buf, tsize_t cc)
+{
+    (void) tif; (void) buf; (void) cc;
+}
+
+void
+_TIFFSwab16BitData(TIFF* tif, tidata_t buf, tsize_t cc)
+{
+    (void) tif;
+    assert((cc & 1) == 0);
+    TIFFSwabArrayOfShort((uint16*) buf, cc/2);
+}
+
+void
+_TIFFSwab24BitData(TIFF* tif, tidata_t buf, tsize_t cc)
+{
+    (void) tif;
+    assert((cc % 3) == 0);
+    TIFFSwabArrayOfTriples((uint8*) buf, cc/3);
+}
+
+void
+_TIFFSwab32BitData(TIFF* tif, tidata_t buf, tsize_t cc)
+{
+    (void) tif;
+    assert((cc & 3) == 0);
+    TIFFSwabArrayOfLong((uint32*) buf, cc/4);
+}
+
+void
+_TIFFSwab64BitData(TIFF* tif, tidata_t buf, tsize_t cc)
+{
+    (void) tif;
+    assert((cc & 7) == 0);
+    TIFFSwabArrayOfDouble((double*) buf, cc/8);
+}
+
+/* vim: set ts=8 sts=8 sw=8 noet: */
diff --git a/uppsrc/plugin/tif/lib/tif_stream.cxx b/uppsrc/plugin/tif/lib/tif_stream.cxx
new file mode 100644
index 000000000..75c7a33da
--- /dev/null
+++ b/uppsrc/plugin/tif/lib/tif_stream.cxx
@@ -0,0 +1,289 @@
+/* $Id: tif_stream.cxx,v 1.5 2005/07/26 08:11:13 dron Exp $ */
+
+/*
+ * Copyright (c) 1988-1996 Sam Leffler
+ * Copyright (c) 1991-1996 Silicon Graphics, Inc.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and
+ * its documentation for any purpose is hereby granted without fee, provided
+ * that (i) the above copyright notices and this permission notice appear in
+ * all copies of the software and related documentation, and (ii) the names of
+ * Sam Leffler and Silicon Graphics may not be used in any advertising or
+ * publicity relating to the software without the specific, prior written
+ * permission of Sam Leffler and Silicon Graphics.
+ *
+ * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+ * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
+ * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
+ * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+ * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
+ * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.
+ */
+
+/*
+ * TIFF Library UNIX-specific Routines.
+ */
+#include "tiffiop.h"
+#include <iostream>
+
+using namespace std;
+
+class tiffis_data
+{
+  public:
+
+	istream	*myIS;
+        long	myStreamStartPos;
+};
+
+class tiffos_data
+{
+  public:
+
+	ostream	*myOS;
+	long	myStreamStartPos;
+};
+
+static tsize_t
+_tiffosReadProc(thandle_t, tdata_t, tsize_t)
+{
+        return 0;
+}
+
+static tsize_t
+_tiffisReadProc(thandle_t fd, tdata_t buf, tsize_t size)
+{
+        tiffis_data	*data = (tiffis_data *)fd;
+
+        data->myIS->read((char *)buf, (int)size);
+
+        return data->myIS->gcount();
+}
+
+static tsize_t
+_tiffosWriteProc(thandle_t fd, tdata_t buf, tsize_t size)
+{
+	tiffos_data	*data = (tiffos_data *)fd;
+	ostream		*os = data->myOS;
+	int		pos = os->tellp();
+
+	os->write((const char *)buf, size);
+
+	return ((int)os->tellp()) - pos;
+}
+
+static tsize_t
+_tiffisWriteProc(thandle_t, tdata_t, tsize_t)
+{
+	return 0;
+}
+
+static toff_t
+_tiffosSeekProc(thandle_t fd, toff_t off, int whence)
+{
+	tiffos_data	*data = (tiffos_data *)fd;
+	ostream	*os = data->myOS;
+
+	// if the stream has already failed, don't do anything
+	if( os->fail() )
+		return os->tellp();
+
+	switch(whence) {
+	case SEEK_SET:
+	    os->seekp(data->myStreamStartPos + off, ios::beg);
+		break;
+	case SEEK_CUR:
+		os->seekp(off, ios::cur);
+		break;
+	case SEEK_END:
+		os->seekp(off, ios::end);
+		break;
+	}
+
+	// Attempt to workaround problems with seeking past the end of the
+	// stream.  ofstream doesn't have a problem with this but
+	// ostrstream/ostringstream does. In that situation, add intermediate
+	// '\0' characters.
+	if( os->fail() ) {
+		ios::iostate	old_state;
+		toff_t		origin;
+
+		old_state = os->rdstate();
+		// reset the fail bit or else tellp() won't work below
+		os->clear(os->rdstate() & ~ios::failbit);
+		switch( whence ) {
+			case SEEK_SET:
+				origin = data->myStreamStartPos;
+				break;
+			case SEEK_CUR:
+				origin = os->tellp();
+				break;
+			case SEEK_END:
+				os->seekp(0, ios::end);
+				origin = os->tellp();
+				break;
+		}
+		// restore original stream state
+		os->clear(old_state);
+
+		// only do something if desired seek position is valid
+		if( origin + off > data->myStreamStartPos ) {
+			toff_t	num_fill;
+
+			// clear the fail bit
+			os->clear(os->rdstate() & ~ios::failbit);
+
+			// extend the stream to the expected size
+			os->seekp(0, ios::end);
+			num_fill = origin + off - (toff_t)os->tellp();
+			for( toff_t i = 0; i < num_fill; i++ )
+				os->put('\0');
+
+			// retry the seek
+			os->seekp(origin + off, ios::beg);
+		}
+	}
+
+	return os->tellp();
+}
+
+static toff_t
+_tiffisSeekProc(thandle_t fd, toff_t off, int whence)
+{
+	tiffis_data	*data = (tiffis_data *)fd;
+
+	switch(whence) {
+	case SEEK_SET:
+		data->myIS->seekg(data->myStreamStartPos + off, ios::beg);
+		break;
+	case SEEK_CUR:
+		data->myIS->seekg(off, ios::cur);
+		break;
+	case SEEK_END:
+		data->myIS->seekg(off, ios::end);
+		break;
+	}
+
+	return ((long)data->myIS->tellg()) - data->myStreamStartPos;
+}
+
+static toff_t
+_tiffosSizeProc(thandle_t fd)
+{
+	tiffos_data	*data = (tiffos_data *)fd;
+	ostream		*os = data->myOS;
+	toff_t		pos = os->tellp();
+	toff_t		len;
+
+	os->seekp(0, ios::end);
+	len = os->tellp();
+	os->seekp(pos);
+
+	return len;
+}
+
+static toff_t
+_tiffisSizeProc(thandle_t fd)
+{
+	tiffis_data	*data = (tiffis_data *)fd;
+	int		pos = data->myIS->tellg();
+	int		len;
+
+	data->myIS->seekg(0, ios::end);
+	len = data->myIS->tellg();
+	data->myIS->seekg(pos);
+
+	return len;
+}
+
+static int
+_tiffosCloseProc(thandle_t fd)
+{
+	// Our stream was not allocated by us, so it shouldn't be closed by us.
+	delete (tiffos_data *)fd;
+	return 0;
+}
+
+static int
+_tiffisCloseProc(thandle_t fd)
+{
+	// Our stream was not allocated by us, so it shouldn't be closed by us.
+	delete (tiffis_data *)fd;
+	return 0;
+}
+
+static int
+_tiffDummyMapProc(thandle_t , tdata_t* , toff_t* )
+{
+	return (0);
+}
+
+static void
+_tiffDummyUnmapProc(thandle_t , tdata_t , toff_t )
+{
+}
+
+/*
+ * Open a TIFF file descriptor for read/writing.
+ */
+static TIFF*
+_tiffStreamOpen(const char* name, const char* mode, void *fd)
+{
+	TIFF*	tif;
+
+	if( strchr(mode, 'w') ) {
+		tiffos_data	*data = new tiffos_data;
+		data->myOS = (ostream *)fd;
+		data->myStreamStartPos = data->myOS->tellp();
+
+		// Open for writing.
+		tif = TIFFClientOpen(name, mode,
+				(thandle_t) data,
+				_tiffosReadProc, _tiffosWriteProc,
+				_tiffosSeekProc, _tiffosCloseProc,
+				_tiffosSizeProc,
+				_tiffDummyMapProc, _tiffDummyUnmapProc);
+	} else {
+		tiffis_data	*data = new tiffis_data;
+		data->myIS = (istream *)fd;
+		data->myStreamStartPos = data->myIS->tellg();
+		// Open for reading.
+		tif = TIFFClientOpen(name, mode,
+				(thandle_t) data,
+				_tiffisReadProc, _tiffisWriteProc,
+				_tiffisSeekProc, _tiffisCloseProc,
+				_tiffisSizeProc,
+				_tiffDummyMapProc, _tiffDummyUnmapProc);
+	}
+
+	return (tif);
+}
+
+TIFF*
+TIFFStreamOpen(const char* name, ostream *os)
+{
+	// If os is either a ostrstream or ostringstream, and has no data
+	// written to it yet, then tellp() will return -1 which will break us.
+	// We workaround this by writing out a dummy character and
+	// then seek back to the beginning.
+	if( !os->fail() && (int)os->tellp() < 0 ) {
+		*os << '\0';
+		os->seekp(0);
+	}
+
+	// NB: We don't support mapped files with streams so add 'm'
+	return _tiffStreamOpen(name, "wm", os);
+}
+
+TIFF*
+TIFFStreamOpen(const char* name, istream *is)
+{
+	// NB: We don't support mapped files with streams so add 'm'
+	return _tiffStreamOpen(name, "rm", is);
+}
+
+/* vim: set ts=8 sts=8 sw=8 noet: */
diff --git a/uppsrc/plugin/tif/lib/tif_strip.c b/uppsrc/plugin/tif/lib/tif_strip.c
new file mode 100644
index 000000000..647ee3121
--- /dev/null
+++ b/uppsrc/plugin/tif/lib/tif_strip.c
@@ -0,0 +1,294 @@
+/* $Id: tif_strip.c,v 1.17 2006/03/21 16:29:33 dron Exp $ */
+
+/*
+ * Copyright (c) 1991-1997 Sam Leffler
+ * Copyright (c) 1991-1997 Silicon Graphics, Inc.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and
+ * its documentation for any purpose is hereby granted without fee, provided
+ * that (i) the above copyright notices and this permission notice appear in
+ * all copies of the software and related documentation, and (ii) the names of
+ * Sam Leffler and Silicon Graphics may not be used in any advertising or
+ * publicity relating to the software without the specific, prior written
+ * permission of Sam Leffler and Silicon Graphics.
+ *
+ * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+ * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
+ * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
+ * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+ * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
+ * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.
+ */
+
+/*
+ * TIFF Library.
+ *
+ * Strip-organized Image Support Routines.
+ */
+#include "tiffiop.h"
+
+static uint32
+summarize(TIFF* tif, size_t summand1, size_t summand2, const char* where)
+{
+	/*
+	 * XXX: We are using casting to uint32 here, bacause sizeof(size_t)
+	 * may be larger than sizeof(uint32) on 64-bit architectures.
+	 */
+	uint32	bytes = summand1 + summand2;
+
+	if (bytes - summand1 != summand2) {
+		TIFFErrorExt(tif->tif_clientdata, tif->tif_name, "Integer overflow in %s", where);
+		bytes = 0;
+	}
+
+	return (bytes);
+}
+
+static uint32
+multiply(TIFF* tif, size_t nmemb, size_t elem_size, const char* where)
+{
+	uint32	bytes = nmemb * elem_size;
+
+	if (elem_size && bytes / elem_size != nmemb) {
+		TIFFErrorExt(tif->tif_clientdata, tif->tif_name, "Integer overflow in %s", where);
+		bytes = 0;
+	}
+
+	return (bytes);
+}
+
+/*
+ * Compute which strip a (row,sample) value is in.
+ */
+tstrip_t
+TIFFComputeStrip(TIFF* tif, uint32 row, tsample_t sample)
+{
+	TIFFDirectory *td = &tif->tif_dir;
+	tstrip_t strip;
+
+	strip = row / td->td_rowsperstrip;
+	if (td->td_planarconfig == PLANARCONFIG_SEPARATE) {
+		if (sample >= td->td_samplesperpixel) {
+			TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
+			    "%lu: Sample out of range, max %lu",
+			    (unsigned long) sample, (unsigned long) td->td_samplesperpixel);
+			return ((tstrip_t) 0);
+		}
+		strip += sample*td->td_stripsperimage;
+	}
+	return (strip);
+}
+
+/*
+ * Compute how many strips are in an image.
+ */
+tstrip_t
+TIFFNumberOfStrips(TIFF* tif)
+{
+	TIFFDirectory *td = &tif->tif_dir;
+	tstrip_t nstrips;
+
+	nstrips = (td->td_rowsperstrip == (uint32) -1 ? 1 :
+	     TIFFhowmany(td->td_imagelength, td->td_rowsperstrip));
+	if (td->td_planarconfig == PLANARCONFIG_SEPARATE)
+		nstrips = multiply(tif, nstrips, td->td_samplesperpixel,
+				   "TIFFNumberOfStrips");
+	return (nstrips);
+}
+
+/*
+ * Compute the # bytes in a variable height, row-aligned strip.
+ */
+tsize_t
+TIFFVStripSize(TIFF* tif, uint32 nrows)
+{
+	TIFFDirectory *td = &tif->tif_dir;
+
+	if (nrows == (uint32) -1)
+		nrows = td->td_imagelength;
+	if (td->td_planarconfig == PLANARCONFIG_CONTIG &&
+	    td->td_photometric == PHOTOMETRIC_YCBCR &&
+	    !isUpSampled(tif)) {
+		/*
+		 * Packed YCbCr data contain one Cb+Cr for every
+		 * HorizontalSampling*VerticalSampling Y values.
+		 * Must also roundup width and height when calculating
+		 * since images that are not a multiple of the
+		 * horizontal/vertical subsampling area include
+		 * YCbCr data for the extended image.
+		 */
+                uint16 ycbcrsubsampling[2];
+                tsize_t w, scanline, samplingarea;
+
+                TIFFGetField( tif, TIFFTAG_YCBCRSUBSAMPLING,
+                              ycbcrsubsampling + 0,
+                              ycbcrsubsampling + 1 );
+
+		samplingarea = ycbcrsubsampling[0]*ycbcrsubsampling[1];
+		if (samplingarea == 0) {
+			TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
+				     "Invalid YCbCr subsampling");
+			return 0;
+		}
+
+		w = TIFFroundup(td->td_imagewidth, ycbcrsubsampling[0]);
+		scanline = TIFFhowmany8(multiply(tif, w, td->td_bitspersample,
+						 "TIFFVStripSize"));
+		nrows = TIFFroundup(nrows, ycbcrsubsampling[1]);
+		/* NB: don't need TIFFhowmany here 'cuz everything is rounded */
+		scanline = multiply(tif, nrows, scanline, "TIFFVStripSize");
+		return ((tsize_t)
+		    summarize(tif, scanline,
+			      multiply(tif, 2, scanline / samplingarea,
+				       "TIFFVStripSize"), "TIFFVStripSize"));
+	} else
+		return ((tsize_t) multiply(tif, nrows, TIFFScanlineSize(tif),
+					   "TIFFVStripSize"));
+}
+
+
+/*
+ * Compute the # bytes in a raw strip.
+ */
+tsize_t
+TIFFRawStripSize(TIFF* tif, tstrip_t strip)
+{
+	TIFFDirectory* td = &tif->tif_dir;
+	tsize_t bytecount = td->td_stripbytecount[strip];
+
+	if (bytecount <= 0) {
+		TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
+			  "%lu: Invalid strip byte count, strip %lu",
+			  (unsigned long) bytecount, (unsigned long) strip);
+		bytecount = (tsize_t) -1;
+	}
+
+	return bytecount;
+}
+
+/*
+ * Compute the # bytes in a (row-aligned) strip.
+ *
+ * Note that if RowsPerStrip is larger than the
+ * recorded ImageLength, then the strip size is
+ * truncated to reflect the actual space required
+ * to hold the strip.
+ */
+tsize_t
+TIFFStripSize(TIFF* tif)
+{
+	TIFFDirectory* td = &tif->tif_dir;
+	uint32 rps = td->td_rowsperstrip;
+	if (rps > td->td_imagelength)
+		rps = td->td_imagelength;
+	return (TIFFVStripSize(tif, rps));
+}
+
+/*
+ * Compute a default strip size based on the image
+ * characteristics and a requested value.  If the
+ * request is <1 then we choose a strip size according
+ * to certain heuristics.
+ */
+uint32
+TIFFDefaultStripSize(TIFF* tif, uint32 request)
+{
+	return (*tif->tif_defstripsize)(tif, request);
+}
+
+uint32
+_TIFFDefaultStripSize(TIFF* tif, uint32 s)
+{
+	if ((int32) s < 1) {
+		/*
+		 * If RowsPerStrip is unspecified, try to break the
+		 * image up into strips that are approximately
+		 * STRIP_SIZE_DEFAULT bytes long.
+		 */
+		tsize_t scanline = TIFFScanlineSize(tif);
+		s = (uint32)STRIP_SIZE_DEFAULT / (scanline == 0 ? 1 : scanline);
+		if (s == 0)		/* very wide images */
+			s = 1;
+	}
+	return (s);
+}
+
+/*
+ * Return the number of bytes to read/write in a call to
+ * one of the scanline-oriented i/o routines.  Note that
+ * this number may be 1/samples-per-pixel if data is
+ * stored as separate planes.
+ */
+tsize_t
+TIFFScanlineSize(TIFF* tif)
+{
+	TIFFDirectory *td = &tif->tif_dir;
+	tsize_t scanline;
+
+	if (td->td_planarconfig == PLANARCONFIG_CONTIG) {
+		if (td->td_photometric == PHOTOMETRIC_YCBCR
+		    && !isUpSampled(tif)) {
+			uint16 ycbcrsubsampling[2];
+
+			TIFFGetField(tif, TIFFTAG_YCBCRSUBSAMPLING,
+				     ycbcrsubsampling + 0,
+				     ycbcrsubsampling + 1);
+
+			if (ycbcrsubsampling[0] == 0) {
+				TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
+					     "Invalid YCbCr subsampling");
+				return 0;
+			}
+
+			scanline = TIFFroundup(td->td_imagewidth,
+					       ycbcrsubsampling[0]);
+			scanline = TIFFhowmany8(multiply(tif, scanline,
+							 td->td_bitspersample,
+							 "TIFFScanlineSize"));
+			return ((tsize_t)
+				summarize(tif, scanline,
+					  multiply(tif, 2,
+						scanline / ycbcrsubsampling[0],
+						"TIFFVStripSize"),
+					  "TIFFVStripSize"));
+		} else {
+			scanline = multiply(tif, td->td_imagewidth,
+					    td->td_samplesperpixel,
+					    "TIFFScanlineSize");
+		}
+	} else
+		scanline = td->td_imagewidth;
+	return ((tsize_t) TIFFhowmany8(multiply(tif, scanline,
+						td->td_bitspersample,
+						"TIFFScanlineSize")));
+}
+
+/*
+ * Return the number of bytes required to store a complete
+ * decoded and packed raster scanline (as opposed to the
+ * I/O size returned by TIFFScanlineSize which may be less
+ * if data is store as separate planes).
+ */
+tsize_t
+TIFFRasterScanlineSize(TIFF* tif)
+{
+	TIFFDirectory *td = &tif->tif_dir;
+	tsize_t scanline;
+
+	scanline = multiply (tif, td->td_bitspersample, td->td_imagewidth,
+			     "TIFFRasterScanlineSize");
+	if (td->td_planarconfig == PLANARCONFIG_CONTIG) {
+		scanline = multiply (tif, scanline, td->td_samplesperpixel,
+				     "TIFFRasterScanlineSize");
+		return ((tsize_t) TIFFhowmany8(scanline));
+	} else
+		return ((tsize_t) multiply (tif, TIFFhowmany8(scanline),
+					    td->td_samplesperpixel,
+					    "TIFFRasterScanlineSize"));
+}
+
+/* vim: set ts=8 sts=8 sw=8 noet: */
diff --git a/uppsrc/plugin/tif/lib/tif_swab.c b/uppsrc/plugin/tif/lib/tif_swab.c
new file mode 100644
index 000000000..a72da455e
--- /dev/null
+++ b/uppsrc/plugin/tif/lib/tif_swab.c
@@ -0,0 +1,235 @@
+/* $Id: tif_swab.c,v 1.4 2005/04/13 14:06:21 dron Exp $ */
+
+/*
+ * Copyright (c) 1988-1997 Sam Leffler
+ * Copyright (c) 1991-1997 Silicon Graphics, Inc.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and
+ * its documentation for any purpose is hereby granted without fee, provided
+ * that (i) the above copyright notices and this permission notice appear in
+ * all copies of the software and related documentation, and (ii) the names of
+ * Sam Leffler and Silicon Graphics may not be used in any advertising or
+ * publicity relating to the software without the specific, prior written
+ * permission of Sam Leffler and Silicon Graphics.
+ *
+ * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+ * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
+ * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
+ * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+ * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
+ * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.
+ */
+
+/*
+ * TIFF Library Bit & Byte Swapping Support.
+ *
+ * XXX We assume short = 16-bits and long = 32-bits XXX
+ */
+#include "tiffiop.h"
+
+#ifndef TIFFSwabShort
+void
+TIFFSwabShort(uint16* wp)
+{
+	register unsigned char* cp = (unsigned char*) wp;
+	unsigned char t;
+
+	t = cp[1]; cp[1] = cp[0]; cp[0] = t;
+}
+#endif
+
+#ifndef TIFFSwabLong
+void
+TIFFSwabLong(uint32* lp)
+{
+	register unsigned char* cp = (unsigned char*) lp;
+	unsigned char t;
+
+	t = cp[3]; cp[3] = cp[0]; cp[0] = t;
+	t = cp[2]; cp[2] = cp[1]; cp[1] = t;
+}
+#endif
+
+#ifndef TIFFSwabArrayOfShort
+void
+TIFFSwabArrayOfShort(uint16* wp, register unsigned long n)
+{
+	register unsigned char* cp;
+	register unsigned char t;
+
+	/* XXX unroll loop some */
+	while (n-- > 0) {
+		cp = (unsigned char*) wp;
+		t = cp[1]; cp[1] = cp[0]; cp[0] = t;
+		wp++;
+	}
+}
+#endif
+
+#ifndef TIFFSwabArrayOfTriples
+void
+TIFFSwabArrayOfTriples(uint8* tp, unsigned long n)
+{
+	unsigned char* cp;
+	unsigned char t;
+
+	/* XXX unroll loop some */
+	while (n-- > 0) {
+		cp = (unsigned char*) tp;
+		t = cp[2]; cp[2] = cp[0]; cp[0] = t;
+		tp += 3;
+	}
+}
+#endif
+
+#ifndef TIFFSwabArrayOfLong
+void
+TIFFSwabArrayOfLong(register uint32* lp, register unsigned long n)
+{
+	register unsigned char *cp;
+	register unsigned char t;
+
+	/* XXX unroll loop some */
+	while (n-- > 0) {
+		cp = (unsigned char *)lp;
+		t = cp[3]; cp[3] = cp[0]; cp[0] = t;
+		t = cp[2]; cp[2] = cp[1]; cp[1] = t;
+		lp++;
+	}
+}
+#endif
+
+#ifndef TIFFSwabDouble
+void
+TIFFSwabDouble(double *dp)
+{
+        register uint32* lp = (uint32*) dp;
+        uint32 t;
+
+	TIFFSwabArrayOfLong(lp, 2);
+	t = lp[0]; lp[0] = lp[1]; lp[1] = t;
+}
+#endif
+
+#ifndef TIFFSwabArrayOfDouble
+void
+TIFFSwabArrayOfDouble(double* dp, register unsigned long n)
+{
+	register uint32* lp = (uint32*) dp;
+        register uint32 t;
+
+	TIFFSwabArrayOfLong(lp, n + n);
+        while (n-- > 0) {
+		t = lp[0]; lp[0] = lp[1]; lp[1] = t;
+                lp += 2;
+        }
+}
+#endif
+
+/*
+ * Bit reversal tables.  TIFFBitRevTable[<byte>] gives
+ * the bit reversed value of <byte>.  Used in various
+ * places in the library when the FillOrder requires
+ * bit reversal of byte values (e.g. CCITT Fax 3
+ * encoding/decoding).  TIFFNoBitRevTable is provided
+ * for algorithms that want an equivalent table that
+ * do not reverse bit values.
+ */
+static const unsigned char TIFFBitRevTable[256] = {
+    0x00, 0x80, 0x40, 0xc0, 0x20, 0xa0, 0x60, 0xe0,
+    0x10, 0x90, 0x50, 0xd0, 0x30, 0xb0, 0x70, 0xf0,
+    0x08, 0x88, 0x48, 0xc8, 0x28, 0xa8, 0x68, 0xe8,
+    0x18, 0x98, 0x58, 0xd8, 0x38, 0xb8, 0x78, 0xf8,
+    0x04, 0x84, 0x44, 0xc4, 0x24, 0xa4, 0x64, 0xe4,
+    0x14, 0x94, 0x54, 0xd4, 0x34, 0xb4, 0x74, 0xf4,
+    0x0c, 0x8c, 0x4c, 0xcc, 0x2c, 0xac, 0x6c, 0xec,
+    0x1c, 0x9c, 0x5c, 0xdc, 0x3c, 0xbc, 0x7c, 0xfc,
+    0x02, 0x82, 0x42, 0xc2, 0x22, 0xa2, 0x62, 0xe2,
+    0x12, 0x92, 0x52, 0xd2, 0x32, 0xb2, 0x72, 0xf2,
+    0x0a, 0x8a, 0x4a, 0xca, 0x2a, 0xaa, 0x6a, 0xea,
+    0x1a, 0x9a, 0x5a, 0xda, 0x3a, 0xba, 0x7a, 0xfa,
+    0x06, 0x86, 0x46, 0xc6, 0x26, 0xa6, 0x66, 0xe6,
+    0x16, 0x96, 0x56, 0xd6, 0x36, 0xb6, 0x76, 0xf6,
+    0x0e, 0x8e, 0x4e, 0xce, 0x2e, 0xae, 0x6e, 0xee,
+    0x1e, 0x9e, 0x5e, 0xde, 0x3e, 0xbe, 0x7e, 0xfe,
+    0x01, 0x81, 0x41, 0xc1, 0x21, 0xa1, 0x61, 0xe1,
+    0x11, 0x91, 0x51, 0xd1, 0x31, 0xb1, 0x71, 0xf1,
+    0x09, 0x89, 0x49, 0xc9, 0x29, 0xa9, 0x69, 0xe9,
+    0x19, 0x99, 0x59, 0xd9, 0x39, 0xb9, 0x79, 0xf9,
+    0x05, 0x85, 0x45, 0xc5, 0x25, 0xa5, 0x65, 0xe5,
+    0x15, 0x95, 0x55, 0xd5, 0x35, 0xb5, 0x75, 0xf5,
+    0x0d, 0x8d, 0x4d, 0xcd, 0x2d, 0xad, 0x6d, 0xed,
+    0x1d, 0x9d, 0x5d, 0xdd, 0x3d, 0xbd, 0x7d, 0xfd,
+    0x03, 0x83, 0x43, 0xc3, 0x23, 0xa3, 0x63, 0xe3,
+    0x13, 0x93, 0x53, 0xd3, 0x33, 0xb3, 0x73, 0xf3,
+    0x0b, 0x8b, 0x4b, 0xcb, 0x2b, 0xab, 0x6b, 0xeb,
+    0x1b, 0x9b, 0x5b, 0xdb, 0x3b, 0xbb, 0x7b, 0xfb,
+    0x07, 0x87, 0x47, 0xc7, 0x27, 0xa7, 0x67, 0xe7,
+    0x17, 0x97, 0x57, 0xd7, 0x37, 0xb7, 0x77, 0xf7,
+    0x0f, 0x8f, 0x4f, 0xcf, 0x2f, 0xaf, 0x6f, 0xef,
+    0x1f, 0x9f, 0x5f, 0xdf, 0x3f, 0xbf, 0x7f, 0xff
+};
+static const unsigned char TIFFNoBitRevTable[256] = {
+    0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+    0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
+    0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
+    0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f,
+    0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27,
+    0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f,
+    0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
+    0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f,
+    0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47,
+    0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f,
+    0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57,
+    0x58, 0x59, 0x5a, 0x5b, 0x5c, 0x5d, 0x5e, 0x5f,
+    0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67,
+    0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f,
+    0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77,
+    0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, 0x7f,
+    0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87,
+    0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f,
+    0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97,
+    0x98, 0x99, 0x9a, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f,
+    0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7,
+    0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf,
+    0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7,
+    0xb8, 0xb9, 0xba, 0xbb, 0xbc, 0xbd, 0xbe, 0xbf,
+    0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7,
+    0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf,
+    0xd0, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7,
+    0xd8, 0xd9, 0xda, 0xdb, 0xdc, 0xdd, 0xde, 0xdf,
+    0xe0, 0xe1, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7,
+    0xe8, 0xe9, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef,
+    0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7,
+    0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff,
+};
+
+const unsigned char*
+TIFFGetBitRevTable(int reversed)
+{
+	return (reversed ? TIFFBitRevTable : TIFFNoBitRevTable);
+}
+
+void
+TIFFReverseBits(register unsigned char* cp, register unsigned long n)
+{
+	for (; n > 8; n -= 8) {
+		cp[0] = TIFFBitRevTable[cp[0]];
+		cp[1] = TIFFBitRevTable[cp[1]];
+		cp[2] = TIFFBitRevTable[cp[2]];
+		cp[3] = TIFFBitRevTable[cp[3]];
+		cp[4] = TIFFBitRevTable[cp[4]];
+		cp[5] = TIFFBitRevTable[cp[5]];
+		cp[6] = TIFFBitRevTable[cp[6]];
+		cp[7] = TIFFBitRevTable[cp[7]];
+		cp += 8;
+	}
+	while (n-- > 0)
+		*cp = TIFFBitRevTable[*cp], cp++;
+}
+
+/* vim: set ts=8 sts=8 sw=8 noet: */
diff --git a/uppsrc/plugin/tif/lib/tif_thunder.c b/uppsrc/plugin/tif/lib/tif_thunder.c
new file mode 100644
index 000000000..f2096e12f
--- /dev/null
+++ b/uppsrc/plugin/tif/lib/tif_thunder.c
@@ -0,0 +1,158 @@
+/* $Id: tif_thunder.c,v 1.5 2005/12/21 12:23:13 joris Exp $ */
+
+/*
+ * Copyright (c) 1988-1997 Sam Leffler
+ * Copyright (c) 1991-1997 Silicon Graphics, Inc.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and
+ * its documentation for any purpose is hereby granted without fee, provided
+ * that (i) the above copyright notices and this permission notice appear in
+ * all copies of the software and related documentation, and (ii) the names of
+ * Sam Leffler and Silicon Graphics may not be used in any advertising or
+ * publicity relating to the software without the specific, prior written
+ * permission of Sam Leffler and Silicon Graphics.
+ *
+ * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+ * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
+ * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
+ * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+ * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
+ * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.
+ */
+
+#include "tiffiop.h"
+#ifdef THUNDER_SUPPORT
+/*
+ * TIFF Library.
+ *
+ * ThunderScan 4-bit Compression Algorithm Support
+ */
+
+/*
+ * ThunderScan uses an encoding scheme designed for
+ * 4-bit pixel values.  Data is encoded in bytes, with
+ * each byte split into a 2-bit code word and a 6-bit
+ * data value.  The encoding gives raw data, runs of
+ * pixels, or pixel values encoded as a delta from the
+ * previous pixel value.  For the latter, either 2-bit
+ * or 3-bit delta values are used, with the deltas packed
+ * into a single byte.
+ */
+#define	THUNDER_DATA		0x3f	/* mask for 6-bit data */
+#define	THUNDER_CODE		0xc0	/* mask for 2-bit code word */
+/* code values */
+#define	THUNDER_RUN		0x00	/* run of pixels w/ encoded count */
+#define	THUNDER_2BITDELTAS	0x40	/* 3 pixels w/ encoded 2-bit deltas */
+#define	    DELTA2_SKIP		2	/* skip code for 2-bit deltas */
+#define	THUNDER_3BITDELTAS	0x80	/* 2 pixels w/ encoded 3-bit deltas */
+#define	    DELTA3_SKIP		4	/* skip code for 3-bit deltas */
+#define	THUNDER_RAW		0xc0	/* raw data encoded */
+
+static const int twobitdeltas[4] = { 0, 1, 0, -1 };
+static const int threebitdeltas[8] = { 0, 1, 2, 3, 0, -3, -2, -1 };
+
+#define	SETPIXEL(op, v) { \
+	lastpixel = (v) & 0xf; \
+	if (npixels++ & 1) \
+	    *op++ |= lastpixel; \
+	else \
+	    op[0] = (tidataval_t) (lastpixel << 4); \
+}
+
+static int
+ThunderDecode(TIFF* tif, tidata_t op, tsize_t maxpixels)
+{
+	register unsigned char *bp;
+	register tsize_t cc;
+	unsigned int lastpixel;
+	tsize_t npixels;
+
+	bp = (unsigned char *)tif->tif_rawcp;
+	cc = tif->tif_rawcc;
+	lastpixel = 0;
+	npixels = 0;
+	while (cc > 0 && npixels < maxpixels) {
+		int n, delta;
+
+		n = *bp++, cc--;
+		switch (n & THUNDER_CODE) {
+		case THUNDER_RUN:		/* pixel run */
+			/*
+			 * Replicate the last pixel n times,
+			 * where n is the lower-order 6 bits.
+			 */
+			if (npixels & 1) {
+				op[0] |= lastpixel;
+				lastpixel = *op++; npixels++; n--;
+			} else
+				lastpixel |= lastpixel << 4;
+			npixels += n;
+			if (npixels < maxpixels) {
+				for (; n > 0; n -= 2)
+					*op++ = (tidataval_t) lastpixel;
+			}
+			if (n == -1)
+				*--op &= 0xf0;
+			lastpixel &= 0xf;
+			break;
+		case THUNDER_2BITDELTAS:	/* 2-bit deltas */
+			if ((delta = ((n >> 4) & 3)) != DELTA2_SKIP)
+				SETPIXEL(op, lastpixel + twobitdeltas[delta]);
+			if ((delta = ((n >> 2) & 3)) != DELTA2_SKIP)
+				SETPIXEL(op, lastpixel + twobitdeltas[delta]);
+			if ((delta = (n & 3)) != DELTA2_SKIP)
+				SETPIXEL(op, lastpixel + twobitdeltas[delta]);
+			break;
+		case THUNDER_3BITDELTAS:	/* 3-bit deltas */
+			if ((delta = ((n >> 3) & 7)) != DELTA3_SKIP)
+				SETPIXEL(op, lastpixel + threebitdeltas[delta]);
+			if ((delta = (n & 7)) != DELTA3_SKIP)
+				SETPIXEL(op, lastpixel + threebitdeltas[delta]);
+			break;
+		case THUNDER_RAW:		/* raw data */
+			SETPIXEL(op, n);
+			break;
+		}
+	}
+	tif->tif_rawcp = (tidata_t) bp;
+	tif->tif_rawcc = cc;
+	if (npixels != maxpixels) {
+		TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
+		    "ThunderDecode: %s data at scanline %ld (%lu != %lu)",
+		    npixels < maxpixels ? "Not enough" : "Too much",
+		    (long) tif->tif_row, (long) npixels, (long) maxpixels);
+		return (0);
+	}
+	return (1);
+}
+
+static int
+ThunderDecodeRow(TIFF* tif, tidata_t buf, tsize_t occ, tsample_t s)
+{
+	tidata_t row = buf;
+
+	(void) s;
+	while ((long)occ > 0) {
+		if (!ThunderDecode(tif, row, tif->tif_dir.td_imagewidth))
+			return (0);
+		occ -= tif->tif_scanlinesize;
+		row += tif->tif_scanlinesize;
+	}
+	return (1);
+}
+
+int
+TIFFInitThunderScan(TIFF* tif, int scheme)
+{
+	(void) scheme;
+	tif->tif_decoderow = ThunderDecodeRow;
+	tif->tif_decodestrip = ThunderDecodeRow;
+	return (1);
+}
+#endif /* THUNDER_SUPPORT */
+
+/* vim: set ts=8 sts=8 sw=8 noet: */
diff --git a/uppsrc/plugin/tif/lib/tif_tile.c b/uppsrc/plugin/tif/lib/tif_tile.c
new file mode 100644
index 000000000..c8935a3a0
--- /dev/null
+++ b/uppsrc/plugin/tif/lib/tif_tile.c
@@ -0,0 +1,273 @@
+/* $Id: tif_tile.c,v 1.12 2006/02/09 16:15:43 dron Exp $ */
+
+/*
+ * Copyright (c) 1991-1997 Sam Leffler
+ * Copyright (c) 1991-1997 Silicon Graphics, Inc.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and
+ * its documentation for any purpose is hereby granted without fee, provided
+ * that (i) the above copyright notices and this permission notice appear in
+ * all copies of the software and related documentation, and (ii) the names of
+ * Sam Leffler and Silicon Graphics may not be used in any advertising or
+ * publicity relating to the software without the specific, prior written
+ * permission of Sam Leffler and Silicon Graphics.
+ *
+ * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+ * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
+ * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
+ * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+ * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
+ * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.
+ */
+
+/*
+ * TIFF Library.
+ *
+ * Tiled Image Support Routines.
+ */
+#include "tiffiop.h"
+
+static uint32
+summarize(TIFF* tif, size_t summand1, size_t summand2, const char* where)
+{
+	/*
+	 * XXX: We are using casting to uint32 here, because sizeof(size_t)
+	 * may be larger than sizeof(uint32) on 64-bit architectures.
+	 */
+	uint32	bytes = summand1 + summand2;
+
+	if (bytes - summand1 != summand2) {
+		TIFFErrorExt(tif->tif_clientdata, tif->tif_name, "Integer overflow in %s", where);
+		bytes = 0;
+	}
+
+	return (bytes);
+}
+
+static uint32
+multiply(TIFF* tif, size_t nmemb, size_t elem_size, const char* where)
+{
+	uint32	bytes = nmemb * elem_size;
+
+	if (elem_size && bytes / elem_size != nmemb) {
+		TIFFErrorExt(tif->tif_clientdata, tif->tif_name, "Integer overflow in %s", where);
+		bytes = 0;
+	}
+
+	return (bytes);
+}
+
+/*
+ * Compute which tile an (x,y,z,s) value is in.
+ */
+ttile_t
+TIFFComputeTile(TIFF* tif, uint32 x, uint32 y, uint32 z, tsample_t s)
+{
+	TIFFDirectory *td = &tif->tif_dir;
+	uint32 dx = td->td_tilewidth;
+	uint32 dy = td->td_tilelength;
+	uint32 dz = td->td_tiledepth;
+	ttile_t tile = 1;
+
+	if (td->td_imagedepth == 1)
+		z = 0;
+	if (dx == (uint32) -1)
+		dx = td->td_imagewidth;
+	if (dy == (uint32) -1)
+		dy = td->td_imagelength;
+	if (dz == (uint32) -1)
+		dz = td->td_imagedepth;
+	if (dx != 0 && dy != 0 && dz != 0) {
+		uint32 xpt = TIFFhowmany(td->td_imagewidth, dx);
+		uint32 ypt = TIFFhowmany(td->td_imagelength, dy);
+		uint32 zpt = TIFFhowmany(td->td_imagedepth, dz);
+
+		if (td->td_planarconfig == PLANARCONFIG_SEPARATE)
+			tile = (xpt*ypt*zpt)*s +
+			     (xpt*ypt)*(z/dz) +
+			     xpt*(y/dy) +
+			     x/dx;
+		else
+			tile = (xpt*ypt)*(z/dz) + xpt*(y/dy) + x/dx;
+	}
+	return (tile);
+}
+
+/*
+ * Check an (x,y,z,s) coordinate
+ * against the image bounds.
+ */
+int
+TIFFCheckTile(TIFF* tif, uint32 x, uint32 y, uint32 z, tsample_t s)
+{
+	TIFFDirectory *td = &tif->tif_dir;
+
+	if (x >= td->td_imagewidth) {
+		TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
+			     "%lu: Col out of range, max %lu",
+			     (unsigned long) x,
+			     (unsigned long) (td->td_imagewidth - 1));
+		return (0);
+	}
+	if (y >= td->td_imagelength) {
+		TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
+			     "%lu: Row out of range, max %lu",
+			     (unsigned long) y,
+			     (unsigned long) (td->td_imagelength - 1));
+		return (0);
+	}
+	if (z >= td->td_imagedepth) {
+		TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
+			     "%lu: Depth out of range, max %lu",
+			     (unsigned long) z,
+			     (unsigned long) (td->td_imagedepth - 1));
+		return (0);
+	}
+	if (td->td_planarconfig == PLANARCONFIG_SEPARATE &&
+	    s >= td->td_samplesperpixel) {
+		TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
+			     "%lu: Sample out of range, max %lu",
+			     (unsigned long) s,
+			     (unsigned long) (td->td_samplesperpixel - 1));
+		return (0);
+	}
+	return (1);
+}
+
+/*
+ * Compute how many tiles are in an image.
+ */
+ttile_t
+TIFFNumberOfTiles(TIFF* tif)
+{
+	TIFFDirectory *td = &tif->tif_dir;
+	uint32 dx = td->td_tilewidth;
+	uint32 dy = td->td_tilelength;
+	uint32 dz = td->td_tiledepth;
+	ttile_t ntiles;
+
+	if (dx == (uint32) -1)
+		dx = td->td_imagewidth;
+	if (dy == (uint32) -1)
+		dy = td->td_imagelength;
+	if (dz == (uint32) -1)
+		dz = td->td_imagedepth;
+	ntiles = (dx == 0 || dy == 0 || dz == 0) ? 0 :
+	    multiply(tif, multiply(tif, TIFFhowmany(td->td_imagewidth, dx),
+				   TIFFhowmany(td->td_imagelength, dy),
+				   "TIFFNumberOfTiles"),
+		     TIFFhowmany(td->td_imagedepth, dz), "TIFFNumberOfTiles");
+	if (td->td_planarconfig == PLANARCONFIG_SEPARATE)
+		ntiles = multiply(tif, ntiles, td->td_samplesperpixel,
+				  "TIFFNumberOfTiles");
+	return (ntiles);
+}
+
+/*
+ * Compute the # bytes in each row of a tile.
+ */
+tsize_t
+TIFFTileRowSize(TIFF* tif)
+{
+	TIFFDirectory *td = &tif->tif_dir;
+	tsize_t rowsize;
+
+	if (td->td_tilelength == 0 || td->td_tilewidth == 0)
+		return ((tsize_t) 0);
+	rowsize = multiply(tif, td->td_bitspersample, td->td_tilewidth,
+			   "TIFFTileRowSize");
+	if (td->td_planarconfig == PLANARCONFIG_CONTIG)
+		rowsize = multiply(tif, rowsize, td->td_samplesperpixel,
+				   "TIFFTileRowSize");
+	return ((tsize_t) TIFFhowmany8(rowsize));
+}
+
+/*
+ * Compute the # bytes in a variable length, row-aligned tile.
+ */
+tsize_t
+TIFFVTileSize(TIFF* tif, uint32 nrows)
+{
+	TIFFDirectory *td = &tif->tif_dir;
+	tsize_t tilesize;
+
+	if (td->td_tilelength == 0 || td->td_tilewidth == 0 ||
+	    td->td_tiledepth == 0)
+		return ((tsize_t) 0);
+	if (td->td_planarconfig == PLANARCONFIG_CONTIG &&
+	    td->td_photometric == PHOTOMETRIC_YCBCR &&
+	    !isUpSampled(tif)) {
+		/*
+		 * Packed YCbCr data contain one Cb+Cr for every
+		 * HorizontalSampling*VerticalSampling Y values.
+		 * Must also roundup width and height when calculating
+		 * since images that are not a multiple of the
+		 * horizontal/vertical subsampling area include
+		 * YCbCr data for the extended image.
+		 */
+		tsize_t w =
+		    TIFFroundup(td->td_tilewidth, td->td_ycbcrsubsampling[0]);
+		tsize_t rowsize =
+		    TIFFhowmany8(multiply(tif, w, td->td_bitspersample,
+					  "TIFFVTileSize"));
+		tsize_t samplingarea =
+		    td->td_ycbcrsubsampling[0]*td->td_ycbcrsubsampling[1];
+		if (samplingarea == 0) {
+			TIFFErrorExt(tif->tif_clientdata, tif->tif_name, "Invalid YCbCr subsampling");
+			return 0;
+		}
+		nrows = TIFFroundup(nrows, td->td_ycbcrsubsampling[1]);
+		/* NB: don't need TIFFhowmany here 'cuz everything is rounded */
+		tilesize = multiply(tif, nrows, rowsize, "TIFFVTileSize");
+		tilesize = summarize(tif, tilesize,
+				     multiply(tif, 2, tilesize / samplingarea,
+					      "TIFFVTileSize"),
+				     "TIFFVTileSize");
+	} else
+		tilesize = multiply(tif, nrows, TIFFTileRowSize(tif),
+				    "TIFFVTileSize");
+	return ((tsize_t)
+	    multiply(tif, tilesize, td->td_tiledepth, "TIFFVTileSize"));
+}
+
+/*
+ * Compute the # bytes in a row-aligned tile.
+ */
+tsize_t
+TIFFTileSize(TIFF* tif)
+{
+	return (TIFFVTileSize(tif, tif->tif_dir.td_tilelength));
+}
+
+/*
+ * Compute a default tile size based on the image
+ * characteristics and a requested value.  If a
+ * request is <1 then we choose a size according
+ * to certain heuristics.
+ */
+void
+TIFFDefaultTileSize(TIFF* tif, uint32* tw, uint32* th)
+{
+	(*tif->tif_deftilesize)(tif, tw, th);
+}
+
+void
+_TIFFDefaultTileSize(TIFF* tif, uint32* tw, uint32* th)
+{
+	(void) tif;
+	if (*(int32*) tw < 1)
+		*tw = 256;
+	if (*(int32*) th < 1)
+		*th = 256;
+	/* roundup to a multiple of 16 per the spec */
+	if (*tw & 0xf)
+		*tw = TIFFroundup(*tw, 16);
+	if (*th & 0xf)
+		*th = TIFFroundup(*th, 16);
+}
+
+/* vim: set ts=8 sts=8 sw=8 noet: */
diff --git a/uppsrc/plugin/tif/lib/tif_unix.c b/uppsrc/plugin/tif/lib/tif_unix.c
new file mode 100644
index 000000000..6ef4d11c0
--- /dev/null
+++ b/uppsrc/plugin/tif/lib/tif_unix.c
@@ -0,0 +1,293 @@
+/* $Id: tif_unix.c,v 1.12 2006/03/21 16:37:51 dron Exp $ */
+
+/*
+ * Copyright (c) 1988-1997 Sam Leffler
+ * Copyright (c) 1991-1997 Silicon Graphics, Inc.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and
+ * its documentation for any purpose is hereby granted without fee, provided
+ * that (i) the above copyright notices and this permission notice appear in
+ * all copies of the software and related documentation, and (ii) the names of
+ * Sam Leffler and Silicon Graphics may not be used in any advertising or
+ * publicity relating to the software without the specific, prior written
+ * permission of Sam Leffler and Silicon Graphics.
+ *
+ * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+ * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
+ * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
+ * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+ * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
+ * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.
+ */
+
+/*
+ * TIFF Library UNIX-specific Routines. These are should also work with the
+ * Windows Common RunTime Library.
+ */
+#include "tif_config.h"
+
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+
+#include <stdarg.h>
+#include <stdlib.h>
+#include <sys/stat.h>
+
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
+
+#ifdef HAVE_FCNTL_H
+# include <fcntl.h>
+#endif
+
+#ifdef HAVE_IO_H
+# include <io.h>
+#endif
+
+#include "tiffiop.h"
+
+static tsize_t
+_tiffReadProc(thandle_t fd, tdata_t buf, tsize_t size)
+{
+	return ((tsize_t) read((int) fd, buf, (size_t) size));
+}
+
+static tsize_t
+_tiffWriteProc(thandle_t fd, tdata_t buf, tsize_t size)
+{
+	return ((tsize_t) write((int) fd, buf, (size_t) size));
+}
+
+static toff_t
+_tiffSeekProc(thandle_t fd, toff_t off, int whence)
+{
+	return ((toff_t) lseek((int) fd, (off_t) off, whence));
+}
+
+static int
+_tiffCloseProc(thandle_t fd)
+{
+	return (close((int) fd));
+}
+
+
+static toff_t
+_tiffSizeProc(thandle_t fd)
+{
+#ifdef _AM29K
+	long fsize;
+	return ((fsize = lseek((int) fd, 0, SEEK_END)) < 0 ? 0 : fsize);
+#else
+	struct stat sb;
+	return (toff_t) (fstat((int) fd, &sb) < 0 ? 0 : sb.st_size);
+#endif
+}
+
+#ifdef HAVE_MMAP
+#include <sys/mman.h>
+
+static int
+_tiffMapProc(thandle_t fd, tdata_t* pbase, toff_t* psize)
+{
+	toff_t size = _tiffSizeProc(fd);
+	if (size != (toff_t) -1) {
+		*pbase = (tdata_t)
+		    mmap(0, size, PROT_READ, MAP_SHARED, (int) fd, 0);
+		if (*pbase != (tdata_t) -1) {
+			*psize = size;
+			return (1);
+		}
+	}
+	return (0);
+}
+
+static void
+_tiffUnmapProc(thandle_t fd, tdata_t base, toff_t size)
+{
+	(void) fd;
+	(void) munmap(base, (off_t) size);
+}
+#else /* !HAVE_MMAP */
+static int
+_tiffMapProc(thandle_t fd, tdata_t* pbase, toff_t* psize)
+{
+	(void) fd; (void) pbase; (void) psize;
+	return (0);
+}
+
+static void
+_tiffUnmapProc(thandle_t fd, tdata_t base, toff_t size)
+{
+	(void) fd; (void) base; (void) size;
+}
+#endif /* !HAVE_MMAP */
+
+/*
+ * Open a TIFF file descriptor for read/writing.
+ */
+TIFF*
+TIFFFdOpen(int fd, const char* name, const char* mode)
+{
+	TIFF* tif;
+
+	tif = TIFFClientOpen(name, mode,
+	    (thandle_t) fd,
+	    _tiffReadProc, _tiffWriteProc,
+	    _tiffSeekProc, _tiffCloseProc, _tiffSizeProc,
+	    _tiffMapProc, _tiffUnmapProc);
+	if (tif)
+		tif->tif_fd = fd;
+	return (tif);
+}
+
+/*
+ * Open a TIFF file for read/writing.
+ */
+TIFF*
+TIFFOpen(const char* name, const char* mode)
+{
+	static const char module[] = "TIFFOpen";
+	int m, fd;
+        TIFF* tif;
+
+	m = _TIFFgetMode(mode, module);
+	if (m == -1)
+		return ((TIFF*)0);
+
+/* for cygwin and mingw */
+#ifdef O_BINARY
+        m |= O_BINARY;
+#endif
+
+#ifdef _AM29K
+	fd = open(name, m);
+#else
+	fd = open(name, m, 0666);
+#endif
+	if (fd < 0) {
+		TIFFErrorExt(0, module, "%s: Cannot open", name);
+		return ((TIFF *)0);
+	}
+
+	tif = TIFFFdOpen((int)fd, name, mode);
+	if(!tif)
+		close(fd);
+	return tif;
+}
+
+#ifdef __WIN32__
+#include <windows.h>
+/*
+ * Open a TIFF file with a Unicode filename, for read/writing.
+ */
+TIFF*
+TIFFOpenW(const wchar_t* name, const char* mode)
+{
+	static const char module[] = "TIFFOpenW";
+	int m, fd;
+	int mbsize;
+	char *mbname;
+	TIFF* tif;
+
+	m = _TIFFgetMode(mode, module);
+	if (m == -1)
+		return ((TIFF*)0);
+
+/* for cygwin and mingw */
+#ifdef O_BINARY
+        m |= O_BINARY;
+#endif
+
+	fd = _wopen(name, m, 0666);
+	if (fd < 0) {
+		TIFFErrorExt(0, module, "%s: Cannot open", name);
+		return ((TIFF *)0);
+	}
+
+	mbname = NULL;
+	mbsize = WideCharToMultiByte(CP_ACP, 0, name, -1, NULL, 0, NULL, NULL);
+	if (mbsize > 0) {
+		mbname = _TIFFmalloc(mbsize);
+		if (!mbname) {
+			TIFFErrorExt(0, module,
+			"Can't allocate space for filename conversion buffer");
+			return ((TIFF*)0);
+		}
+
+		WideCharToMultiByte(CP_ACP, 0, name, -1, mbname, mbsize,
+				    NULL, NULL);
+	}
+
+	tif = TIFFFdOpen((int)fd, (mbname != NULL) ? mbname : "<unknown>",
+			 mode);
+
+	_TIFFfree(mbname);
+
+	if(!tif)
+		close(fd);
+	return tif;
+}
+#endif
+
+void*
+_TIFFmalloc(tsize_t s)
+{
+	return (malloc((size_t) s));
+}
+
+void
+_TIFFfree(tdata_t p)
+{
+	free(p);
+}
+
+void*
+_TIFFrealloc(tdata_t p, tsize_t s)
+{
+	return (realloc(p, (size_t) s));
+}
+
+void
+_TIFFmemset(tdata_t p, int v, tsize_t c)
+{
+	memset(p, v, (size_t) c);
+}
+
+void
+_TIFFmemcpy(tdata_t d, const tdata_t s, tsize_t c)
+{
+	memcpy(d, s, (size_t) c);
+}
+
+int
+_TIFFmemcmp(const tdata_t p1, const tdata_t p2, tsize_t c)
+{
+	return (memcmp(p1, p2, (size_t) c));
+}
+
+static void
+unixWarningHandler(const char* module, const char* fmt, va_list ap)
+{
+	if (module != NULL)
+		fprintf(stderr, "%s: ", module);
+	fprintf(stderr, "Warning, ");
+	vfprintf(stderr, fmt, ap);
+	fprintf(stderr, ".\n");
+}
+TIFFErrorHandler _TIFFwarningHandler = unixWarningHandler;
+
+static void
+unixErrorHandler(const char* module, const char* fmt, va_list ap)
+{
+	if (module != NULL)
+		fprintf(stderr, "%s: ", module);
+	vfprintf(stderr, fmt, ap);
+	fprintf(stderr, ".\n");
+}
+TIFFErrorHandler _TIFFerrorHandler = unixErrorHandler;
diff --git a/uppsrc/plugin/tif/lib/tif_version.c b/uppsrc/plugin/tif/lib/tif_version.c
new file mode 100644
index 000000000..3fbb4907a
--- /dev/null
+++ b/uppsrc/plugin/tif/lib/tif_version.c
@@ -0,0 +1,33 @@
+/* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/tif_version.c,v 1.2 2000/11/13 14:42:38 warmerda Exp $ */
+/*
+ * Copyright (c) 1992-1997 Sam Leffler
+ * Copyright (c) 1992-1997 Silicon Graphics, Inc.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and
+ * its documentation for any purpose is hereby granted without fee, provided
+ * that (i) the above copyright notices and this permission notice appear in
+ * all copies of the software and related documentation, and (ii) the names of
+ * Sam Leffler and Silicon Graphics may not be used in any advertising or
+ * publicity relating to the software without the specific, prior written
+ * permission of Sam Leffler and Silicon Graphics.
+ *
+ * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+ * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
+ * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
+ * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+ * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
+ * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.
+ */
+#include "tiffiop.h"
+
+static const char TIFFVersion[] = TIFFLIB_VERSION_STR;
+
+const char*
+TIFFGetVersion(void)
+{
+	return (TIFFVersion);
+}
diff --git a/uppsrc/plugin/tif/lib/tif_vms.c b/uppsrc/plugin/tif/lib/tif_vms.c
new file mode 100644
index 000000000..680cf6e9d
--- /dev/null
+++ b/uppsrc/plugin/tif/lib/tif_vms.c
@@ -0,0 +1,588 @@
+/* $Header: /cvsroot/upp/uppsrc/plugin/tif/lib/tif_vms.c,v 1.1 2005/02/07 00:26:06 rylek Exp $ */
+
+/*
+ * Copyright (c) 1988-1997 Sam Leffler
+ * Copyright (c) 1991-1997 Silicon Graphics, Inc.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and
+ * its documentation for any purpose is hereby granted without fee, provided
+ * that (i) the above copyright notices and this permission notice appear in
+ * all copies of the software and related documentation, and (ii) the names of
+ * Sam Leffler and Silicon Graphics may not be used in any advertising or
+ * publicity relating to the software without the specific, prior written
+ * permission of Sam Leffler and Silicon Graphics.
+ *
+ * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+ * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
+ * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
+ * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+ * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
+ * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.
+ */
+
+/*
+ * TIFF Library VMS-specific Routines.
+ */
+
+#include <stdlib.h>
+#include <unixio.h>
+#include "tiffiop.h"
+#if !HAVE_IEEEFP
+#include <math.h>
+#endif
+
+#ifdef VAXC
+#define	NOSHARE	noshare
+#else
+#define	NOSHARE
+#endif
+
+#ifdef __alpha
+/* Dummy entry point for backwards compatibility */
+void TIFFModeCCITTFax3(void){}
+#endif
+
+static tsize_t
+_tiffReadProc(thandle_t fd, tdata_t buf, tsize_t size)
+{
+	return (read((int) fd, buf, size));
+}
+
+static tsize_t
+_tiffWriteProc(thandle_t fd, tdata_t buf, tsize_t size)
+{
+	return (write((int) fd, buf, size));
+}
+
+static toff_t
+_tiffSeekProc(thandle_t fd, toff_t off, int whence)
+{
+	return ((toff_t) lseek((int) fd, (off_t) off, whence));
+}
+
+static int
+_tiffCloseProc(thandle_t fd)
+{
+	return (close((int) fd));
+}
+
+#include <sys/stat.h>
+
+static toff_t
+_tiffSizeProc(thandle_t fd)
+{
+	struct stat sb;
+	return (toff_t) (fstat((int) fd, &sb) < 0 ? 0 : sb.st_size);
+}
+
+#ifdef HAVE_MMAP
+#include <starlet.h>
+#include <fab.h>
+#include <secdef.h>
+
+/*
+ * Table for storing information on current open sections.
+ * (Should really be a linked list)
+ */
+#define MAX_MAPPED 100
+static int no_mapped = 0;
+static struct {
+	char *base;
+	char *top;
+	unsigned short channel;
+} map_table[MAX_MAPPED];
+
+/*
+ * This routine maps a file into a private section. Note that this
+ * method of accessing a file is by far the fastest under VMS.
+ * The routine may fail (i.e. return 0) for several reasons, for
+ * example:
+ * - There is no more room for storing the info on sections.
+ * - The process is out of open file quota, channels, ...
+ * - fd does not describe an opened file.
+ * - The file is already opened for write access by this process
+ *   or another process
+ * - There is no free "hole" in virtual memory that fits the
+ *   size of the file
+ */
+static int
+_tiffMapProc(thandle_t fd, tdata_t* pbase, toff_t* psize)
+{
+	char name[256];
+	struct FAB fab;
+	unsigned short channel;
+	char *inadr[2], *retadr[2];
+	unsigned long status;
+	long size;
+
+	if (no_mapped >= MAX_MAPPED)
+		return(0);
+	/*
+	 * We cannot use a file descriptor, we
+	 * must open the file once more.
+	 */
+	if (getname((int)fd, name, 1) == NULL)
+		return(0);
+	/* prepare the FAB for a user file open */
+	fab = cc$rms_fab;
+	fab.fab$l_fop |= FAB$V_UFO;
+	fab.fab$b_fac = FAB$M_GET;
+	fab.fab$b_shr = FAB$M_SHRGET;
+	fab.fab$l_fna = name;
+	fab.fab$b_fns = strlen(name);
+	status = sys$open(&fab);	/* open file & get channel number */
+	if ((status&1) == 0)
+		return(0);
+	channel = (unsigned short)fab.fab$l_stv;
+	inadr[0] = inadr[1] = (char *)0; /* just an address in P0 space */
+	/*
+	 * Map the blocks of the file up to
+	 * the EOF block into virtual memory.
+	 */
+	size = _tiffSizeProc(fd);
+	status = sys$crmpsc(inadr, retadr, 0, SEC$M_EXPREG, 0,0,0, channel,
+		TIFFhowmany(size,512), 0,0,0);
+	if ((status&1) == 0){
+		sys$dassgn(channel);
+		return(0);
+	}
+	*pbase = (tdata_t) retadr[0];	/* starting virtual address */
+	/*
+	 * Use the size of the file up to the
+	 * EOF mark for UNIX compatibility.
+	 */
+	*psize = (toff_t) size;
+	/* Record the section in the table */
+	map_table[no_mapped].base = retadr[0];
+	map_table[no_mapped].top = retadr[1];
+	map_table[no_mapped].channel = channel;
+	no_mapped++;
+
+        return(1);
+}
+
+/*
+ * This routine unmaps a section from the virtual address space of
+ * the process, but only if the base was the one returned from a
+ * call to TIFFMapFileContents.
+ */
+static void
+_tiffUnmapProc(thandle_t fd, tdata_t base, toff_t size)
+{
+	char *inadr[2];
+	int i, j;
+
+	/* Find the section in the table */
+	for (i = 0;i < no_mapped; i++) {
+		if (map_table[i].base == (char *) base) {
+			/* Unmap the section */
+			inadr[0] = (char *) base;
+			inadr[1] = map_table[i].top;
+			sys$deltva(inadr, 0, 0);
+			sys$dassgn(map_table[i].channel);
+			/* Remove this section from the list */
+			for (j = i+1; j < no_mapped; j++)
+				map_table[j-1] = map_table[j];
+			no_mapped--;
+			return;
+		}
+	}
+}
+#else /* !HAVE_MMAP */
+static int
+_tiffMapProc(thandle_t fd, tdata_t* pbase, toff_t* psize)
+{
+	return (0);
+}
+
+static void
+_tiffUnmapProc(thandle_t fd, tdata_t base, toff_t size)
+{
+}
+#endif /* !HAVE_MMAP */
+
+/*
+ * Open a TIFF file descriptor for read/writing.
+ */
+TIFF*
+TIFFFdOpen(int fd, const char* name, const char* mode)
+{
+	TIFF* tif;
+
+	tif = TIFFClientOpen(name, mode,
+	    (thandle_t) fd,
+	    _tiffReadProc, _tiffWriteProc, _tiffSeekProc, _tiffCloseProc,
+	    _tiffSizeProc, _tiffMapProc, _tiffUnmapProc);
+	if (tif)
+		tif->tif_fd = fd;
+	return (tif);
+}
+
+/*
+ * Open a TIFF file for read/writing.
+ */
+TIFF*
+TIFFOpen(const char* name, const char* mode)
+{
+	static const char module[] = "TIFFOpen";
+	int m, fd;
+
+	m = _TIFFgetMode(mode, module);
+	if (m == -1)
+		return ((TIFF*)0);
+        if (m&O_TRUNC){
+                /*
+		 * There is a bug in open in VAXC. If you use
+		 * open w/ m=O_RDWR|O_CREAT|O_TRUNC the
+		 * wrong thing happens.  On the other hand
+		 * creat does the right thing.
+                 */
+                fd = creat((char *) /* bug in stdio.h */ name, 0666,
+		    "alq = 128", "deq = 64", "mbc = 32",
+		    "fop = tef");
+	} else if (m&O_RDWR) {
+		fd = open(name, m, 0666,
+		    "deq = 64", "mbc = 32", "fop = tef", "ctx = stm");
+	} else
+		fd = open(name, m, 0666, "mbc = 32", "ctx = stm");
+	if (fd < 0) {
+		TIFFError(module, "%s: Cannot open", name);
+		return ((TIFF*)0);
+	}
+	return (TIFFFdOpen(fd, name, mode));
+}
+
+tdata_t
+_TIFFmalloc(tsize_t s)
+{
+	return (malloc((size_t) s));
+}
+
+void
+_TIFFfree(tdata_t p)
+{
+	free(p);
+}
+
+tdata_t
+_TIFFrealloc(tdata_t p, tsize_t s)
+{
+	return (realloc(p, (size_t) s));
+}
+
+void
+_TIFFmemset(tdata_t p, int v, tsize_t c)
+{
+	memset(p, v, (size_t) c);
+}
+
+void
+_TIFFmemcpy(tdata_t d, const tdata_t s, tsize_t c)
+{
+	memcpy(d, s, (size_t) c);
+}
+
+int
+_TIFFmemcmp(const tdata_t p1, const tdata_t p2, tsize_t c)
+{
+	return (memcmp(p1, p2, (size_t) c));
+}
+
+/*
+ * On the VAX, we need to make those global, writable pointers
+ * non-shareable, otherwise they would be made shareable by default.
+ * On the AXP, this brain damage has been corrected.
+ *
+ * I (Karsten Spang, krs@kampsax.dk) have dug around in the GCC
+ * manual and the GAS code and have come up with the following
+ * construct, but I don't have GCC on my VAX, so it is untested.
+ * Please tell me if it does not work.
+ */
+
+static void
+vmsWarningHandler(const char* module, const char* fmt, va_list ap)
+{
+	if (module != NULL)
+		fprintf(stderr, "%s: ", module);
+	fprintf(stderr, "Warning, ");
+	vfprintf(stderr, fmt, ap);
+	fprintf(stderr, ".\n");
+}
+
+NOSHARE TIFFErrorHandler _TIFFwarningHandler = vmsWarningHandler
+#if defined(VAX) && defined(__GNUC__)
+asm("_$$PsectAttributes_NOSHR$$_TIFFwarningHandler")
+#endif
+;
+
+static void
+vmsErrorHandler(const char* module, const char* fmt, va_list ap)
+{
+	if (module != NULL)
+		fprintf(stderr, "%s: ", module);
+	vfprintf(stderr, fmt, ap);
+	fprintf(stderr, ".\n");
+}
+
+NOSHARE TIFFErrorHandler _TIFFerrorHandler = vmsErrorHandler
+#if defined(VAX) && defined(__GNUC__)
+asm("_$$PsectAttributes_NOSHR$$_TIFFerrorHandler")
+#endif
+;
+
+
+#if !HAVE_IEEEFP
+/* IEEE floting point handling */
+
+typedef	struct ieeedouble {
+	u_long	mant2;			/* fix NDR: full 8-byte swap */
+	u_long	mant	: 20,
+		exp	: 11,
+		sign	: 1;
+} ieeedouble;
+typedef	struct ieeefloat {
+	u_long	mant	: 23,
+		exp	: 8,
+		sign	: 1;
+} ieeefloat;
+
+/*
+ * NB: These are D_FLOAT's, not G_FLOAT's. A G_FLOAT is
+ *  simply a reverse-IEEE float/double.
+ */
+
+typedef	struct {
+	u_long	mant1	: 7,
+		exp	: 8,
+		sign	: 1,
+		mant2	: 16,
+		mant3   : 16,
+		mant4   : 16;
+} nativedouble;
+typedef	struct {
+	u_long	mant1	: 7,
+		exp	: 8,
+		sign	: 1,
+		mant2	: 16;
+} nativefloat;
+
+typedef	union {
+	ieeedouble	ieee;
+	nativedouble	native;
+	char		b[8];
+	uint32		l[2];
+	double		d;
+} double_t;
+
+typedef	union {
+	ieeefloat	ieee;
+	nativefloat	native;
+	char		b[4];
+	uint32		l;
+	float		f;
+} float_t;
+
+#if defined(VAXC) || defined(DECC)
+#pragma inline(ieeetod,dtoieee)
+#endif
+
+/*
+ * Convert an IEEE double precision number to native double precision.
+ * The source is contained in two longwords, the second holding the sign,
+ * exponent and the higher order bits of the mantissa, and the first
+ * holding the rest of the mantissa as follows:
+ * (Note: It is assumed that the number has been eight-byte swapped to
+ * LSB first.)
+ *
+ * First longword:
+ *	32 least significant bits of mantissa
+ * Second longword:
+ *	0-19:	20 most significant bits of mantissa
+ *	20-30:	exponent
+ *	31:	sign
+ * The exponent is stored as excess 1023.
+ * The most significant bit of the mantissa is implied 1, and not stored.
+ * If the exponent and mantissa are zero, the number is zero.
+ * If the exponent is 0 (i.e. -1023) and the mantissa is non-zero, it is an
+ * unnormalized number with the most significant bit NOT implied.
+ * If the exponent is 2047, the number is invalid, in case the mantissa is zero,
+ * this means overflow (+/- depending of the sign bit), otherwise
+ * it simply means invalid number.
+ *
+ * If the number is too large for the machine or was specified as overflow,
+ * +/-HUGE_VAL is returned.
+ */
+INLINE static void
+ieeetod(double *dp)
+{
+	double_t source;
+	long sign,exp,mant;
+	double dmant;
+
+	source.ieee = ((double_t*)dp)->ieee;
+	sign = source.ieee.sign;
+	exp = source.ieee.exp;
+	mant = source.ieee.mant;
+
+	if (exp == 2047) {
+		if (mant)			/* Not a Number (NAN) */
+			*dp = HUGE_VAL;
+		else				/* +/- infinity */
+			*dp = (sign ? -HUGE_VAL : HUGE_VAL);
+		return;
+	}
+	if (!exp) {
+		if (!(mant || source.ieee.mant2)) {	/* zero */
+			*dp=0;
+			return;
+		} else {			/* Unnormalized number */
+			/* NB: not -1023, the 1 bit is not implied */
+			exp= -1022;
+		}
+	} else {
+		mant |= 1<<20;
+		exp -= 1023;
+	}
+	dmant = (((double) mant) +
+		((double) source.ieee.mant2) / (((double) (1<<16)) *
+		((double) (1<<16)))) / (double) (1<<20);
+	dmant = ldexp(dmant, exp);
+	if (sign)
+		dmant= -dmant;
+	*dp = dmant;
+}
+
+INLINE static void
+dtoieee(double *dp)
+{
+	double_t num;
+	double x;
+	int exp;
+
+	num.d = *dp;
+	if (!num.d) {			/* Zero is just binary all zeros */
+		num.l[0] = num.l[1] = 0;
+		return;
+	}
+
+	if (num.d < 0) {		/* Sign is encoded separately */
+		num.d = -num.d;
+		num.ieee.sign = 1;
+	} else {
+		num.ieee.sign = 0;
+	}
+
+	/* Now separate the absolute value into mantissa and exponent */
+	x = frexp(num.d, &exp);
+
+	/*
+	 * Handle cases where the value is outside the
+	 * range for IEEE floating point numbers.
+	 * (Overflow cannot happen on a VAX, but underflow
+	 * can happen for G float.)
+	 */
+	if (exp < -1022) {		/* Unnormalized number */
+		x = ldexp(x, -1023-exp);
+		exp = 0;
+	} else if (exp > 1023) {	/* +/- infinity */
+		x = 0;
+		exp = 2047;
+	} else {			/* Get rid of most significant bit */
+		x *= 2;
+		x -= 1;
+		exp += 1022; /* fix NDR: 1.0 -> x=0.5, exp=1 -> ieee.exp = 1023 */
+	}
+	num.ieee.exp = exp;
+
+	x *= (double) (1<<20);
+	num.ieee.mant = (long) x;
+	x -= (double) num.ieee.mant;
+	num.ieee.mant2 = (long) (x*((double) (1<<16)*(double) (1<<16)));
+
+	if (!(num.ieee.mant || num.ieee.exp || num.ieee.mant2)) {
+		/* Avoid negative zero */
+		num.ieee.sign = 0;
+	}
+	((double_t*)dp)->ieee = num.ieee;
+}
+
+/*
+ * Beware, these do not handle over/under-flow
+ * during conversion from ieee to native format.
+ */
+#define	NATIVE2IEEEFLOAT(fp) { \
+    float_t t; \
+    if (t.ieee.exp = (fp)->native.exp) \
+	t.ieee.exp += -129 + 127; \
+    t.ieee.sign = (fp)->native.sign; \
+    t.ieee.mant = ((fp)->native.mant1<<16)|(fp)->native.mant2; \
+    *(fp) = t; \
+}
+#define	IEEEFLOAT2NATIVE(fp) { \
+    float_t t; int v = (fp)->ieee.exp; \
+    if (v) v += -127 + 129;		/* alter bias of exponent */\
+    t.native.exp = v;			/* implicit truncation of exponent */\
+    t.native.sign = (fp)->ieee.sign; \
+    v = (fp)->ieee.mant; \
+    t.native.mant1 = v >> 16; \
+    t.native.mant2 = v;\
+    *(fp) = t; \
+}
+
+#define IEEEDOUBLE2NATIVE(dp) ieeetod(dp)
+
+#define NATIVE2IEEEDOUBLE(dp) dtoieee(dp)
+
+
+/*
+ * These unions are used during floating point
+ * conversions.  The above macros define the
+ * conversion operations.
+ */
+void
+TIFFCvtIEEEFloatToNative(TIFF* tif, u_int n, float* f)
+{
+	float_t* fp = (float_t*) f;
+
+	while (n-- > 0) {
+		IEEEFLOAT2NATIVE(fp);
+		fp++;
+	}
+}
+
+void
+TIFFCvtNativeToIEEEFloat(TIFF* tif, u_int n, float* f)
+{
+	float_t* fp = (float_t*) f;
+
+	while (n-- > 0) {
+		NATIVE2IEEEFLOAT(fp);
+		fp++;
+	}
+}
+void
+TIFFCvtIEEEDoubleToNative(TIFF* tif, u_int n, double* f)
+{
+	double_t* fp = (double_t*) f;
+
+	while (n-- > 0) {
+		IEEEDOUBLE2NATIVE(fp);
+		fp++;
+	}
+}
+
+void
+TIFFCvtNativeToIEEEDouble(TIFF* tif, u_int n, double* f)
+{
+	double_t* fp = (double_t*) f;
+
+	while (n-- > 0) {
+		NATIVE2IEEEDOUBLE(fp);
+		fp++;
+	}
+}
+#endif
diff --git a/uppsrc/plugin/tif/lib/tif_warning.c b/uppsrc/plugin/tif/lib/tif_warning.c
new file mode 100644
index 000000000..0c63535ba
--- /dev/null
+++ b/uppsrc/plugin/tif/lib/tif_warning.c
@@ -0,0 +1,72 @@
+/* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/tif_warning.c,v 1.2 2005/12/23 01:18:59 joris Exp $ */
+
+/*
+ * Copyright (c) 1988-1997 Sam Leffler
+ * Copyright (c) 1991-1997 Silicon Graphics, Inc.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and
+ * its documentation for any purpose is hereby granted without fee, provided
+ * that (i) the above copyright notices and this permission notice appear in
+ * all copies of the software and related documentation, and (ii) the names of
+ * Sam Leffler and Silicon Graphics may not be used in any advertising or
+ * publicity relating to the software without the specific, prior written
+ * permission of Sam Leffler and Silicon Graphics.
+ *
+ * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+ * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
+ * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
+ * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+ * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
+ * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.
+ */
+
+/*
+ * TIFF Library.
+ */
+#include "tiffiop.h"
+
+TIFFErrorHandlerExt _TIFFwarningHandlerExt = NULL;
+
+TIFFErrorHandler
+TIFFSetWarningHandler(TIFFErrorHandler handler)
+{
+	TIFFErrorHandler prev = _TIFFwarningHandler;
+	_TIFFwarningHandler = handler;
+	return (prev);
+}
+
+TIFFErrorHandlerExt
+TIFFSetWarningHandlerExt(TIFFErrorHandlerExt handler)
+{
+	TIFFErrorHandlerExt prev = _TIFFwarningHandlerExt;
+	_TIFFwarningHandlerExt = handler;
+	return (prev);
+}
+
+void
+TIFFWarning(const char* module, const char* fmt, ...)
+{
+	va_list ap;
+	va_start(ap, fmt);
+	if (_TIFFwarningHandler)
+		(*_TIFFwarningHandler)(module, fmt, ap);
+	if (_TIFFwarningHandlerExt)
+		(*_TIFFwarningHandlerExt)(0, module, fmt, ap);
+	va_end(ap);
+}
+
+void
+TIFFWarningExt(thandle_t fd, const char* module, const char* fmt, ...)
+{
+	va_list ap;
+	va_start(ap, fmt);
+	if (_TIFFwarningHandler)
+		(*_TIFFwarningHandler)(module, fmt, ap);
+	if (_TIFFwarningHandlerExt)
+		(*_TIFFwarningHandlerExt)(fd, module, fmt, ap);
+	va_end(ap);
+}
diff --git a/uppsrc/plugin/tif/lib/tif_win3.c b/uppsrc/plugin/tif/lib/tif_win3.c
new file mode 100644
index 000000000..1df8842ba
--- /dev/null
+++ b/uppsrc/plugin/tif/lib/tif_win3.c
@@ -0,0 +1,225 @@
+/* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/tif_win3.c,v 1.2 2005/12/21 12:23:13 joris Exp $ */
+
+/*
+ * Copyright (c) 1988-1997 Sam Leffler
+ * Copyright (c) 1991-1997 Silicon Graphics, Inc.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and
+ * its documentation for any purpose is hereby granted without fee, provided
+ * that (i) the above copyright notices and this permission notice appear in
+ * all copies of the software and related documentation, and (ii) the names of
+ * Sam Leffler and Silicon Graphics may not be used in any advertising or
+ * publicity relating to the software without the specific, prior written
+ * permission of Sam Leffler and Silicon Graphics.
+ *
+ * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+ * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
+ * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
+ * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+ * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
+ * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.
+ */
+
+/*
+ * TIFF Library Windows 3.x-specific Routines.
+ */
+#include "tiffiop.h"
+#if defined(__WATCOMC__) || defined(__BORLANDC__) || defined(_MSC_VER)
+#include <io.h>		/* for open, close, etc. function prototypes */
+#endif
+
+#include <windows.h>
+#include <windowsx.h>
+#include <memory.h>
+
+static tsize_t
+_tiffReadProc(thandle_t fd, tdata_t buf, tsize_t size)
+{
+	return (_hread(fd, buf, size));
+}
+
+static tsize_t
+_tiffWriteProc(thandle_t fd, tdata_t buf, tsize_t size)
+{
+	return (_hwrite(fd, buf, size));
+}
+
+static toff_t
+_tiffSeekProc(thandle_t fd, toff_t off, int whence)
+{
+	return (_llseek(fd, (off_t) off, whence));
+}
+
+static int
+_tiffCloseProc(thandle_t fd)
+{
+	return (_lclose(fd));
+}
+
+#include <sys/stat.h>
+
+static toff_t
+_tiffSizeProc(thandle_t fd)
+{
+	struct stat sb;
+	return (fstat((int) fd, &sb) < 0 ? 0 : sb.st_size);
+}
+
+static int
+_tiffMapProc(thandle_t fd, tdata_t* pbase, toff_t* psize)
+{
+	return (0);
+}
+
+static void
+_tiffUnmapProc(thandle_t fd, tdata_t base, toff_t size)
+{
+}
+
+/*
+ * Open a TIFF file descriptor for read/writing.
+ */
+TIFF*
+TIFFFdOpen(int fd, const char* name, const char* mode)
+{
+	TIFF* tif;
+
+	tif = TIFFClientOpen(name, mode,
+	    (thandle_t) fd,
+	    _tiffReadProc, _tiffWriteProc, _tiffSeekProc, _tiffCloseProc,
+	    _tiffSizeProc, _tiffMapProc, _tiffUnmapProc);
+	if (tif)
+		tif->tif_fd = fd;
+	return (tif);
+}
+
+/*
+ * Open a TIFF file for read/writing.
+ */
+TIFF*
+TIFFOpen(const char* name, const char* mode)
+{
+	static const char module[] = "TIFFOpen";
+	int m, fd;
+	OFSTRUCT of;
+	int mm = 0;
+
+	m = _TIFFgetMode(mode, module);
+	if (m == -1)
+		return ((TIFF*)0);
+	if (m & O_CREAT) {
+		if ((m & O_TRUNC) || OpenFile(name, &of, OF_EXIST) != HFILE_ERROR)
+			mm |= OF_CREATE;
+	}
+	if (m & O_WRONLY)
+		mm |= OF_WRITE;
+	if (m & O_RDWR)
+		mm |= OF_READWRITE;
+	fd = OpenFile(name, &of, mm);
+	if (fd < 0) {
+		TIFFErrorExt(0, module, "%s: Cannot open", name);
+		return ((TIFF*)0);
+	}
+	return (TIFFFdOpen(fd, name, mode));
+}
+
+tdata_t
+_TIFFmalloc(tsize_t s)
+{
+	return (tdata_t) GlobalAllocPtr(GHND, (DWORD) s);
+}
+
+void
+_TIFFfree(tdata_t p)
+{
+	GlobalFreePtr(p);
+}
+
+tdata_t
+_TIFFrealloc(tdata_t p, tsize_t s)
+{
+	return (tdata_t) GlobalReAllocPtr(p, (DWORD) s, GHND);
+}
+
+void
+_TIFFmemset(tdata_t p, int v, tsize_t c)
+{
+	char* pp = (char*) p;
+
+	while (c > 0) {
+		tsize_t chunk = 0x10000 - ((uint32) pp & 0xffff);/* What's left in segment */
+		if (chunk > 0xff00)				/* No more than 0xff00 */
+			chunk = 0xff00;
+		if (chunk > c)					/* No more than needed */
+			chunk = c;
+		memset(pp, v, chunk);
+		pp = (char*) (chunk + (char huge*) pp);
+		c -= chunk;
+	}
+}
+
+void
+_TIFFmemcpy(tdata_t d, const tdata_t s, tsize_t c)
+{
+	if (c > 0xFFFF)
+		hmemcpy((void _huge*) d, (void _huge*) s, c);
+	else
+		(void) memcpy(d, s, (size_t) c);
+}
+
+int
+_TIFFmemcmp(const tdata_t d, const tdata_t s, tsize_t c)
+{
+	char* dd = (char*) d;
+	char* ss = (char*) s;
+	tsize_t chunks, chunkd, chunk;
+	int result;
+
+	while (c > 0) {
+		chunks = 0x10000 - ((uint32) ss & 0xffff);	/* What's left in segment */
+		chunkd = 0x10000 - ((uint32) dd & 0xffff);	/* What's left in segment */
+		chunk = c;					/* Get the largest of     */
+		if (chunk > chunks)				/*   c, chunks, chunkd,   */
+			chunk = chunks;				/*   0xff00               */
+		if (chunk > chunkd)
+			chunk = chunkd;
+		if (chunk > 0xff00)
+			chunk = 0xff00;
+		result = memcmp(dd, ss, chunk);
+		if (result != 0)
+			return (result);
+		dd = (char*) (chunk + (char huge*) dd);
+		ss = (char*) (chunk + (char huge*) ss);
+		c -= chunk;
+	}
+	return (0);
+}
+
+static void
+win3WarningHandler(const char* module, const char* fmt, va_list ap)
+{
+	char e[512] = { '\0' };
+	if (module != NULL)
+		strcat(strcpy(e, module), ":");
+	vsprintf(e+strlen(e), fmt, ap);
+	strcat(e, ".");
+	MessageBox(GetActiveWindow(), e, "LibTIFF Warning",
+	    MB_OK|MB_ICONEXCLAMATION);
+}
+TIFFErrorHandler _TIFFwarningHandler = win3WarningHandler;
+
+static void
+win3ErrorHandler(const char* module, const char* fmt, va_list ap)
+{
+	char e[512] = { '\0' };
+	if (module != NULL)
+		strcat(strcpy(e, module), ":");
+	vsprintf(e+strlen(e), fmt, ap);
+	strcat(e, ".");
+	MessageBox(GetActiveWindow(), e, "LibTIFF Error", MB_OK|MB_ICONSTOP);
+}
+TIFFErrorHandler _TIFFerrorHandler = win3ErrorHandler;
diff --git a/uppsrc/plugin/tif/lib/tif_win32.c b/uppsrc/plugin/tif/lib/tif_win32.c
new file mode 100644
index 000000000..fa4349896
--- /dev/null
+++ b/uppsrc/plugin/tif/lib/tif_win32.c
@@ -0,0 +1,392 @@
+/* $Id: tif_win32.c,v 1.18 2006/02/07 11:03:29 dron Exp $ */
+
+/*
+ * Copyright (c) 1988-1997 Sam Leffler
+ * Copyright (c) 1991-1997 Silicon Graphics, Inc.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and
+ * its documentation for any purpose is hereby granted without fee, provided
+ * that (i) the above copyright notices and this permission notice appear in
+ * all copies of the software and related documentation, and (ii) the names of
+ * Sam Leffler and Silicon Graphics may not be used in any advertising or
+ * publicity relating to the software without the specific, prior written
+ * permission of Sam Leffler and Silicon Graphics.
+ *
+ * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+ * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
+ * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
+ * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+ * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
+ * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.
+ */
+
+/*
+ * TIFF Library Win32-specific Routines.  Adapted from tif_unix.c 4/5/95 by
+ * Scott Wagner (wagner@itek.com), Itek Graphix, Rochester, NY USA
+ */
+#include "tiffiop.h"
+
+static tsize_t
+_tiffReadProc(thandle_t fd, tdata_t buf, tsize_t size)
+{
+	DWORD dwSizeRead;
+	if (!ReadFile(fd, buf, size, &dwSizeRead, NULL))
+		return(0);
+	return ((tsize_t) dwSizeRead);
+}
+
+static tsize_t
+_tiffWriteProc(thandle_t fd, tdata_t buf, tsize_t size)
+{
+	DWORD dwSizeWritten;
+	if (!WriteFile(fd, buf, size, &dwSizeWritten, NULL))
+		return(0);
+	return ((tsize_t) dwSizeWritten);
+}
+
+static toff_t
+_tiffSeekProc(thandle_t fd, toff_t off, int whence)
+{
+	DWORD dwMoveMethod, dwMoveHigh;
+
+        /* we use this as a special code, so avoid accepting it */
+        if( off == 0xFFFFFFFF )
+            return 0xFFFFFFFF;
+
+	switch(whence)
+	{
+	case SEEK_SET:
+		dwMoveMethod = FILE_BEGIN;
+		break;
+	case SEEK_CUR:
+		dwMoveMethod = FILE_CURRENT;
+		break;
+	case SEEK_END:
+		dwMoveMethod = FILE_END;
+		break;
+	default:
+		dwMoveMethod = FILE_BEGIN;
+		break;
+	}
+        dwMoveHigh = 0;
+	return ((toff_t)SetFilePointer(fd, (LONG) off, (PLONG)&dwMoveHigh,
+                                       dwMoveMethod));
+}
+
+static int
+_tiffCloseProc(thandle_t fd)
+{
+	return (CloseHandle(fd) ? 0 : -1);
+}
+
+static toff_t
+_tiffSizeProc(thandle_t fd)
+{
+	return ((toff_t)GetFileSize(fd, NULL));
+}
+
+#ifdef __BORLANDC__
+#pragma argsused
+#endif
+static int
+_tiffDummyMapProc(thandle_t fd, tdata_t* pbase, toff_t* psize)
+{
+	return (0);
+}
+
+/*
+ * From "Hermann Josef Hill" <lhill@rhein-zeitung.de>:
+ *
+ * Windows uses both a handle and a pointer for file mapping,
+ * but according to the SDK documentation and Richter's book
+ * "Advanced Windows Programming" it is safe to free the handle
+ * after obtaining the file mapping pointer
+ *
+ * This removes a nasty OS dependency and cures a problem
+ * with Visual C++ 5.0
+ */
+static int
+_tiffMapProc(thandle_t fd, tdata_t* pbase, toff_t* psize)
+{
+	toff_t size;
+	HANDLE hMapFile;
+
+	if ((size = _tiffSizeProc(fd)) == 0xFFFFFFFF)
+		return (0);
+	hMapFile = CreateFileMapping(fd, NULL, PAGE_READONLY, 0, size, NULL);
+	if (hMapFile == NULL)
+		return (0);
+	*pbase = MapViewOfFile(hMapFile, FILE_MAP_READ, 0, 0, 0);
+	CloseHandle(hMapFile);
+	if (*pbase == NULL)
+		return (0);
+	*psize = size;
+	return(1);
+}
+
+#ifdef __BORLANDC__
+#pragma argsused
+#endif
+static void
+_tiffDummyUnmapProc(thandle_t fd, tdata_t base, toff_t size)
+{
+}
+
+static void
+_tiffUnmapProc(thandle_t fd, tdata_t base, toff_t size)
+{
+	UnmapViewOfFile(base);
+}
+
+/*
+ * Open a TIFF file descriptor for read/writing.
+ * Note that TIFFFdOpen and TIFFOpen recognise the character 'u' in the mode
+ * string, which forces the file to be opened unmapped.
+ */
+TIFF*
+TIFFFdOpen(int ifd, const char* name, const char* mode)
+{
+	TIFF* tif;
+	BOOL fSuppressMap = (mode[1] == 'u' || (mode[1]!=0 && mode[2] == 'u'));
+
+	tif = TIFFClientOpen(name, mode, (thandle_t)ifd,
+			_tiffReadProc, _tiffWriteProc,
+			_tiffSeekProc, _tiffCloseProc, _tiffSizeProc,
+			fSuppressMap ? _tiffDummyMapProc : _tiffMapProc,
+			fSuppressMap ? _tiffDummyUnmapProc : _tiffUnmapProc);
+	if (tif)
+		tif->tif_fd = ifd;
+	return (tif);
+}
+
+/*
+ * Open a TIFF file for read/writing.
+ */
+TIFF*
+TIFFOpen(const char* name, const char* mode)
+{
+	static const char module[] = "TIFFOpen";
+	thandle_t fd;
+	int m;
+	DWORD dwMode;
+	TIFF* tif;
+
+	m = _TIFFgetMode(mode, module);
+
+	switch(m)
+	{
+	case O_RDONLY:
+		dwMode = OPEN_EXISTING;
+		break;
+	case O_RDWR:
+		dwMode = OPEN_ALWAYS;
+		break;
+	case O_RDWR|O_CREAT:
+		dwMode = OPEN_ALWAYS;
+		break;
+	case O_RDWR|O_TRUNC:
+		dwMode = CREATE_ALWAYS;
+		break;
+	case O_RDWR|O_CREAT|O_TRUNC:
+		dwMode = CREATE_ALWAYS;
+		break;
+	default:
+		return ((TIFF*)0);
+	}
+	fd = (thandle_t)CreateFileA(name,
+		(m == O_RDONLY)?GENERIC_READ:(GENERIC_READ | GENERIC_WRITE),
+		FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, dwMode,
+		(m == O_RDONLY)?FILE_ATTRIBUTE_READONLY:FILE_ATTRIBUTE_NORMAL,
+		NULL);
+	if (fd == INVALID_HANDLE_VALUE) {
+		TIFFErrorExt(0, module, "%s: Cannot open", name);
+		return ((TIFF *)0);
+	}
+
+	tif = TIFFFdOpen((int)fd, name, mode);
+	if(!tif)
+		CloseHandle(fd);
+	return tif;
+}
+
+/*
+ * Open a TIFF file with a Unicode filename, for read/writing.
+ */
+TIFF*
+TIFFOpenW(const wchar_t* name, const char* mode)
+{
+	static const char module[] = "TIFFOpenW";
+	thandle_t fd;
+	int m;
+	DWORD dwMode;
+	int mbsize;
+	char *mbname;
+	TIFF *tif;
+
+	m = _TIFFgetMode(mode, module);
+
+	switch(m) {
+		case O_RDONLY:			dwMode = OPEN_EXISTING; break;
+		case O_RDWR:			dwMode = OPEN_ALWAYS;   break;
+		case O_RDWR|O_CREAT:		dwMode = OPEN_ALWAYS;   break;
+		case O_RDWR|O_TRUNC:		dwMode = CREATE_ALWAYS; break;
+		case O_RDWR|O_CREAT|O_TRUNC:	dwMode = CREATE_ALWAYS; break;
+		default:			return ((TIFF*)0);
+	}
+
+	fd = (thandle_t)CreateFileW(name,
+		(m == O_RDONLY)?GENERIC_READ:(GENERIC_READ|GENERIC_WRITE),
+		FILE_SHARE_READ, NULL, dwMode,
+		(m == O_RDONLY)?FILE_ATTRIBUTE_READONLY:FILE_ATTRIBUTE_NORMAL,
+		NULL);
+	if (fd == INVALID_HANDLE_VALUE) {
+		TIFFErrorExt(0, module, "%S: Cannot open", name);
+		return ((TIFF *)0);
+	}
+
+	mbname = NULL;
+	mbsize = WideCharToMultiByte(CP_ACP, 0, name, -1, NULL, 0, NULL, NULL);
+	if (mbsize > 0) {
+		mbname = (char *)_TIFFmalloc(mbsize);
+		if (!mbname) {
+			TIFFErrorExt(0, module,
+			"Can't allocate space for filename conversion buffer");
+			return ((TIFF*)0);
+		}
+
+		WideCharToMultiByte(CP_ACP, 0, name, -1, mbname, mbsize,
+				    NULL, NULL);
+	}
+
+	tif = TIFFFdOpen((int)fd,
+			 (mbname != NULL) ? mbname : "<unknown>", mode);
+	if(!tif)
+		CloseHandle(fd);
+
+	_TIFFfree(mbname);
+
+	return tif;
+}
+
+tdata_t
+_TIFFmalloc(tsize_t s)
+{
+	return ((tdata_t)GlobalAlloc(GMEM_FIXED, s));
+}
+
+void
+_TIFFfree(tdata_t p)
+{
+	GlobalFree(p);
+	return;
+}
+
+tdata_t
+_TIFFrealloc(tdata_t p, tsize_t s)
+{
+        void* pvTmp;
+        tsize_t old;
+
+        if(p == NULL)
+                return ((tdata_t)GlobalAlloc(GMEM_FIXED, s));
+
+        old = GlobalSize(p);
+
+        if (old>=s) {
+                if ((pvTmp = GlobalAlloc(GMEM_FIXED, s)) != NULL) {
+	                CopyMemory(pvTmp, p, s);
+	                GlobalFree(p);
+                }
+        } else {
+                if ((pvTmp = GlobalAlloc(GMEM_FIXED, s)) != NULL) {
+	                CopyMemory(pvTmp, p, old);
+	                GlobalFree(p);
+                }
+        }
+        return ((tdata_t)pvTmp);
+}
+
+void
+_TIFFmemset(void* p, int v, tsize_t c)
+{
+	FillMemory(p, c, (BYTE)v);
+}
+
+void
+_TIFFmemcpy(void* d, const tdata_t s, tsize_t c)
+{
+	CopyMemory(d, s, c);
+}
+
+int
+_TIFFmemcmp(const tdata_t p1, const tdata_t p2, tsize_t c)
+{
+	register const BYTE *pb1 = (const BYTE *) p1;
+	register const BYTE *pb2 = (const BYTE *) p2;
+	register DWORD dwTmp = c;
+	register int iTmp;
+	for (iTmp = 0; dwTmp-- && !iTmp; iTmp = (int)*pb1++ - (int)*pb2++)
+		;
+	return (iTmp);
+}
+
+static void
+Win32WarningHandler(const char* module, const char* fmt, va_list ap)
+{
+#ifndef TIF_PLATFORM_CONSOLE
+	LPTSTR szTitle;
+	LPTSTR szTmp;
+	LPCTSTR szTitleText = "%s Warning";
+	LPCTSTR szDefaultModule = "LIBTIFF";
+	LPCTSTR szTmpModule = (module == NULL) ? szDefaultModule : module;
+	if ((szTitle = (LPTSTR)LocalAlloc(LMEM_FIXED, (strlen(szTmpModule) +
+		strlen(szTitleText) + strlen(fmt) + 128)*sizeof(char))) == NULL)
+		return;
+	sprintf(szTitle, szTitleText, szTmpModule);
+	szTmp = szTitle + (strlen(szTitle)+2)*sizeof(char);
+	vsprintf(szTmp, fmt, ap);
+	MessageBoxA(GetFocus(), szTmp, szTitle, MB_OK | MB_ICONINFORMATION);
+	LocalFree(szTitle);
+	return;
+#else
+	if (module != NULL)
+		fprintf(stderr, "%s: ", module);
+	fprintf(stderr, "Warning, ");
+	vfprintf(stderr, fmt, ap);
+	fprintf(stderr, ".\n");
+#endif
+}
+TIFFErrorHandler _TIFFwarningHandler = Win32WarningHandler;
+
+static void
+Win32ErrorHandler(const char* module, const char* fmt, va_list ap)
+{
+#ifndef TIF_PLATFORM_CONSOLE
+	LPTSTR szTitle;
+	LPTSTR szTmp;
+	LPCTSTR szTitleText = "%s Error";
+	LPCTSTR szDefaultModule = "LIBTIFF";
+	LPCTSTR szTmpModule = (module == NULL) ? szDefaultModule : module;
+	if ((szTitle = (LPTSTR)LocalAlloc(LMEM_FIXED, (strlen(szTmpModule) +
+		strlen(szTitleText) + strlen(fmt) + 128)*sizeof(char))) == NULL)
+		return;
+	sprintf(szTitle, szTitleText, szTmpModule);
+	szTmp = szTitle + (strlen(szTitle)+2)*sizeof(char);
+	vsprintf(szTmp, fmt, ap);
+	MessageBoxA(GetFocus(), szTmp, szTitle, MB_OK | MB_ICONEXCLAMATION);
+	LocalFree(szTitle);
+	return;
+#else
+	if (module != NULL)
+		fprintf(stderr, "%s: ", module);
+	vfprintf(stderr, fmt, ap);
+	fprintf(stderr, ".\n");
+#endif
+}
+TIFFErrorHandler _TIFFerrorHandler = Win32ErrorHandler;
+
+/* vim: set ts=8 sts=8 sw=8 noet: */
diff --git a/uppsrc/plugin/tif/lib/tif_write.c b/uppsrc/plugin/tif/lib/tif_write.c
new file mode 100644
index 000000000..ca8cda309
--- /dev/null
+++ b/uppsrc/plugin/tif/lib/tif_write.c
@@ -0,0 +1,725 @@
+/* $Id: tif_write.c,v 1.21 2006/02/27 14:29:20 dron Exp $ */
+
+/*
+ * Copyright (c) 1988-1997 Sam Leffler
+ * Copyright (c) 1991-1997 Silicon Graphics, Inc.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and
+ * its documentation for any purpose is hereby granted without fee, provided
+ * that (i) the above copyright notices and this permission notice appear in
+ * all copies of the software and related documentation, and (ii) the names of
+ * Sam Leffler and Silicon Graphics may not be used in any advertising or
+ * publicity relating to the software without the specific, prior written
+ * permission of Sam Leffler and Silicon Graphics.
+ *
+ * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+ * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
+ * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
+ * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+ * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
+ * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.
+ */
+
+/*
+ * TIFF Library.
+ *
+ * Scanline-oriented Write Support
+ */
+#include "tiffiop.h"
+#include <stdio.h>
+
+#define	STRIPINCR	20		/* expansion factor on strip array */
+
+#define	WRITECHECKSTRIPS(tif, module)				\
+	(((tif)->tif_flags&TIFF_BEENWRITING) || TIFFWriteCheck((tif),0,module))
+#define	WRITECHECKTILES(tif, module)				\
+	(((tif)->tif_flags&TIFF_BEENWRITING) || TIFFWriteCheck((tif),1,module))
+#define	BUFFERCHECK(tif)					\
+	((((tif)->tif_flags & TIFF_BUFFERSETUP) && tif->tif_rawdata) ||	\
+	    TIFFWriteBufferSetup((tif), NULL, (tsize_t) -1))
+
+static	int TIFFGrowStrips(TIFF*, int, const char*);
+static	int TIFFAppendToStrip(TIFF*, tstrip_t, tidata_t, tsize_t);
+
+int
+TIFFWriteScanline(TIFF* tif, tdata_t buf, uint32 row, tsample_t sample)
+{
+	static const char module[] = "TIFFWriteScanline";
+	register TIFFDirectory *td;
+	int status, imagegrew = 0;
+	tstrip_t strip;
+
+	if (!WRITECHECKSTRIPS(tif, module))
+		return (-1);
+	/*
+	 * Handle delayed allocation of data buffer.  This
+	 * permits it to be sized more intelligently (using
+	 * directory information).
+	 */
+	if (!BUFFERCHECK(tif))
+		return (-1);
+	td = &tif->tif_dir;
+	/*
+	 * Extend image length if needed
+	 * (but only for PlanarConfig=1).
+	 */
+	if (row >= td->td_imagelength) {	/* extend image */
+		if (td->td_planarconfig == PLANARCONFIG_SEPARATE) {
+			TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
+		"Can not change \"ImageLength\" when using separate planes");
+			return (-1);
+		}
+		td->td_imagelength = row+1;
+		imagegrew = 1;
+	}
+	/*
+	 * Calculate strip and check for crossings.
+	 */
+	if (td->td_planarconfig == PLANARCONFIG_SEPARATE) {
+		if (sample >= td->td_samplesperpixel) {
+			TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
+			    "%d: Sample out of range, max %d",
+			    sample, td->td_samplesperpixel);
+			return (-1);
+		}
+		strip = sample*td->td_stripsperimage + row/td->td_rowsperstrip;
+	} else
+		strip = row / td->td_rowsperstrip;
+	/*
+	 * Check strip array to make sure there's space. We don't support
+	 * dynamically growing files that have data organized in separate
+	 * bitplanes because it's too painful.  In that case we require that
+	 * the imagelength be set properly before the first write (so that the
+	 * strips array will be fully allocated above).
+	 */
+	if (strip >= td->td_nstrips && !TIFFGrowStrips(tif, 1, module))
+		return (-1);
+	if (strip != tif->tif_curstrip) {
+		/*
+		 * Changing strips -- flush any data present.
+		 */
+		if (!TIFFFlushData(tif))
+			return (-1);
+		tif->tif_curstrip = strip;
+		/*
+		 * Watch out for a growing image.  The value of strips/image
+		 * will initially be 1 (since it can't be deduced until the
+		 * imagelength is known).
+		 */
+		if (strip >= td->td_stripsperimage && imagegrew)
+			td->td_stripsperimage =
+			    TIFFhowmany(td->td_imagelength,td->td_rowsperstrip);
+		tif->tif_row =
+		    (strip % td->td_stripsperimage) * td->td_rowsperstrip;
+		if ((tif->tif_flags & TIFF_CODERSETUP) == 0) {
+			if (!(*tif->tif_setupencode)(tif))
+				return (-1);
+			tif->tif_flags |= TIFF_CODERSETUP;
+		}
+
+		tif->tif_rawcc = 0;
+		tif->tif_rawcp = tif->tif_rawdata;
+
+		if( td->td_stripbytecount[strip] > 0 )
+		{
+			/* if we are writing over existing tiles, zero length */
+			td->td_stripbytecount[strip] = 0;
+
+			/* this forces TIFFAppendToStrip() to do a seek */
+			tif->tif_curoff = 0;
+		}
+
+		if (!(*tif->tif_preencode)(tif, sample))
+			return (-1);
+		tif->tif_flags |= TIFF_POSTENCODE;
+	}
+	/*
+	 * Ensure the write is either sequential or at the
+	 * beginning of a strip (or that we can randomly
+	 * access the data -- i.e. no encoding).
+	 */
+	if (row != tif->tif_row) {
+		if (row < tif->tif_row) {
+			/*
+			 * Moving backwards within the same strip:
+			 * backup to the start and then decode
+			 * forward (below).
+			 */
+			tif->tif_row = (strip % td->td_stripsperimage) *
+			    td->td_rowsperstrip;
+			tif->tif_rawcp = tif->tif_rawdata;
+		}
+		/*
+		 * Seek forward to the desired row.
+		 */
+		if (!(*tif->tif_seek)(tif, row - tif->tif_row))
+			return (-1);
+		tif->tif_row = row;
+	}
+
+        /* swab if needed - note that source buffer will be altered */
+        tif->tif_postdecode( tif, (tidata_t) buf, tif->tif_scanlinesize );
+
+	status = (*tif->tif_encoderow)(tif, (tidata_t) buf,
+	    tif->tif_scanlinesize, sample);
+
+        /* we are now poised at the beginning of the next row */
+	tif->tif_row = row + 1;
+	return (status);
+}
+
+/*
+ * Encode the supplied data and write it to the
+ * specified strip.
+ *
+ * NB: Image length must be setup before writing.
+ */
+tsize_t
+TIFFWriteEncodedStrip(TIFF* tif, tstrip_t strip, tdata_t data, tsize_t cc)
+{
+	static const char module[] = "TIFFWriteEncodedStrip";
+	TIFFDirectory *td = &tif->tif_dir;
+	tsample_t sample;
+
+	if (!WRITECHECKSTRIPS(tif, module))
+		return ((tsize_t) -1);
+	/*
+	 * Check strip array to make sure there's space.
+	 * We don't support dynamically growing files that
+	 * have data organized in separate bitplanes because
+	 * it's too painful.  In that case we require that
+	 * the imagelength be set properly before the first
+	 * write (so that the strips array will be fully
+	 * allocated above).
+	 */
+	if (strip >= td->td_nstrips) {
+		if (td->td_planarconfig == PLANARCONFIG_SEPARATE) {
+			TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
+		"Can not grow image by strips when using separate planes");
+			return ((tsize_t) -1);
+		}
+		if (!TIFFGrowStrips(tif, 1, module))
+			return ((tsize_t) -1);
+		td->td_stripsperimage =
+		    TIFFhowmany(td->td_imagelength, td->td_rowsperstrip);
+	}
+	/*
+	 * Handle delayed allocation of data buffer.  This
+	 * permits it to be sized according to the directory
+	 * info.
+	 */
+	if (!BUFFERCHECK(tif))
+		return ((tsize_t) -1);
+	tif->tif_curstrip = strip;
+	tif->tif_row = (strip % td->td_stripsperimage) * td->td_rowsperstrip;
+	if ((tif->tif_flags & TIFF_CODERSETUP) == 0) {
+		if (!(*tif->tif_setupencode)(tif))
+			return ((tsize_t) -1);
+		tif->tif_flags |= TIFF_CODERSETUP;
+	}
+
+	tif->tif_rawcc = 0;
+	tif->tif_rawcp = tif->tif_rawdata;
+
+        if( td->td_stripbytecount[strip] > 0 )
+        {
+            /* if we are writing over existing tiles, zero length. */
+            td->td_stripbytecount[strip] = 0;
+
+            /* this forces TIFFAppendToStrip() to do a seek */
+            tif->tif_curoff = 0;
+        }
+
+	tif->tif_flags &= ~TIFF_POSTENCODE;
+	sample = (tsample_t)(strip / td->td_stripsperimage);
+	if (!(*tif->tif_preencode)(tif, sample))
+		return ((tsize_t) -1);
+
+        /* swab if needed - note that source buffer will be altered */
+        tif->tif_postdecode( tif, (tidata_t) data, cc );
+
+	if (!(*tif->tif_encodestrip)(tif, (tidata_t) data, cc, sample))
+		return ((tsize_t) 0);
+	if (!(*tif->tif_postencode)(tif))
+		return ((tsize_t) -1);
+	if (!isFillOrder(tif, td->td_fillorder) &&
+	    (tif->tif_flags & TIFF_NOBITREV) == 0)
+		TIFFReverseBits(tif->tif_rawdata, tif->tif_rawcc);
+	if (tif->tif_rawcc > 0 &&
+	    !TIFFAppendToStrip(tif, strip, tif->tif_rawdata, tif->tif_rawcc))
+		return ((tsize_t) -1);
+	tif->tif_rawcc = 0;
+	tif->tif_rawcp = tif->tif_rawdata;
+	return (cc);
+}
+
+/*
+ * Write the supplied data to the specified strip.
+ *
+ * NB: Image length must be setup before writing.
+ */
+tsize_t
+TIFFWriteRawStrip(TIFF* tif, tstrip_t strip, tdata_t data, tsize_t cc)
+{
+	static const char module[] = "TIFFWriteRawStrip";
+	TIFFDirectory *td = &tif->tif_dir;
+
+	if (!WRITECHECKSTRIPS(tif, module))
+		return ((tsize_t) -1);
+	/*
+	 * Check strip array to make sure there's space.
+	 * We don't support dynamically growing files that
+	 * have data organized in separate bitplanes because
+	 * it's too painful.  In that case we require that
+	 * the imagelength be set properly before the first
+	 * write (so that the strips array will be fully
+	 * allocated above).
+	 */
+	if (strip >= td->td_nstrips) {
+		if (td->td_planarconfig == PLANARCONFIG_SEPARATE) {
+			TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
+		"Can not grow image by strips when using separate planes");
+			return ((tsize_t) -1);
+		}
+		/*
+		 * Watch out for a growing image.  The value of
+		 * strips/image will initially be 1 (since it
+		 * can't be deduced until the imagelength is known).
+		 */
+		if (strip >= td->td_stripsperimage)
+			td->td_stripsperimage =
+			    TIFFhowmany(td->td_imagelength,td->td_rowsperstrip);
+		if (!TIFFGrowStrips(tif, 1, module))
+			return ((tsize_t) -1);
+	}
+	tif->tif_curstrip = strip;
+	tif->tif_row = (strip % td->td_stripsperimage) * td->td_rowsperstrip;
+	return (TIFFAppendToStrip(tif, strip, (tidata_t) data, cc) ?
+	    cc : (tsize_t) -1);
+}
+
+/*
+ * Write and compress a tile of data.  The
+ * tile is selected by the (x,y,z,s) coordinates.
+ */
+tsize_t
+TIFFWriteTile(TIFF* tif,
+    tdata_t buf, uint32 x, uint32 y, uint32 z, tsample_t s)
+{
+	if (!TIFFCheckTile(tif, x, y, z, s))
+		return (-1);
+	/*
+	 * NB: A tile size of -1 is used instead of tif_tilesize knowing
+	 *     that TIFFWriteEncodedTile will clamp this to the tile size.
+	 *     This is done because the tile size may not be defined until
+	 *     after the output buffer is setup in TIFFWriteBufferSetup.
+	 */
+	return (TIFFWriteEncodedTile(tif,
+	    TIFFComputeTile(tif, x, y, z, s), buf, (tsize_t) -1));
+}
+
+/*
+ * Encode the supplied data and write it to the
+ * specified tile.  There must be space for the
+ * data.  The function clamps individual writes
+ * to a tile to the tile size, but does not (and
+ * can not) check that multiple writes to the same
+ * tile do not write more than tile size data.
+ *
+ * NB: Image length must be setup before writing; this
+ *     interface does not support automatically growing
+ *     the image on each write (as TIFFWriteScanline does).
+ */
+tsize_t
+TIFFWriteEncodedTile(TIFF* tif, ttile_t tile, tdata_t data, tsize_t cc)
+{
+	static const char module[] = "TIFFWriteEncodedTile";
+	TIFFDirectory *td;
+	tsample_t sample;
+
+	if (!WRITECHECKTILES(tif, module))
+		return ((tsize_t) -1);
+	td = &tif->tif_dir;
+	if (tile >= td->td_nstrips) {
+		TIFFErrorExt(tif->tif_clientdata, module, "%s: Tile %lu out of range, max %lu",
+		    tif->tif_name, (unsigned long) tile, (unsigned long) td->td_nstrips);
+		return ((tsize_t) -1);
+	}
+	/*
+	 * Handle delayed allocation of data buffer.  This
+	 * permits it to be sized more intelligently (using
+	 * directory information).
+	 */
+	if (!BUFFERCHECK(tif))
+		return ((tsize_t) -1);
+	tif->tif_curtile = tile;
+
+	tif->tif_rawcc = 0;
+	tif->tif_rawcp = tif->tif_rawdata;
+
+        if( td->td_stripbytecount[tile] > 0 )
+        {
+            /* if we are writing over existing tiles, zero length. */
+            td->td_stripbytecount[tile] = 0;
+
+            /* this forces TIFFAppendToStrip() to do a seek */
+            tif->tif_curoff = 0;
+        }
+
+	/*
+	 * Compute tiles per row & per column to compute
+	 * current row and column
+	 */
+	tif->tif_row = (tile % TIFFhowmany(td->td_imagelength, td->td_tilelength))
+		* td->td_tilelength;
+	tif->tif_col = (tile % TIFFhowmany(td->td_imagewidth, td->td_tilewidth))
+		* td->td_tilewidth;
+
+	if ((tif->tif_flags & TIFF_CODERSETUP) == 0) {
+		if (!(*tif->tif_setupencode)(tif))
+			return ((tsize_t) -1);
+		tif->tif_flags |= TIFF_CODERSETUP;
+	}
+	tif->tif_flags &= ~TIFF_POSTENCODE;
+	sample = (tsample_t)(tile/td->td_stripsperimage);
+	if (!(*tif->tif_preencode)(tif, sample))
+		return ((tsize_t) -1);
+	/*
+	 * Clamp write amount to the tile size.  This is mostly
+	 * done so that callers can pass in some large number
+	 * (e.g. -1) and have the tile size used instead.
+	 */
+	if ( cc < 1 || cc > tif->tif_tilesize)
+		cc = tif->tif_tilesize;
+
+        /* swab if needed - note that source buffer will be altered */
+        tif->tif_postdecode( tif, (tidata_t) data, cc );
+
+	if (!(*tif->tif_encodetile)(tif, (tidata_t) data, cc, sample))
+		return ((tsize_t) 0);
+	if (!(*tif->tif_postencode)(tif))
+		return ((tsize_t) -1);
+	if (!isFillOrder(tif, td->td_fillorder) &&
+	    (tif->tif_flags & TIFF_NOBITREV) == 0)
+		TIFFReverseBits((unsigned char *)tif->tif_rawdata, tif->tif_rawcc);
+	if (tif->tif_rawcc > 0 && !TIFFAppendToStrip(tif, tile,
+	    tif->tif_rawdata, tif->tif_rawcc))
+		return ((tsize_t) -1);
+	tif->tif_rawcc = 0;
+	tif->tif_rawcp = tif->tif_rawdata;
+	return (cc);
+}
+
+/*
+ * Write the supplied data to the specified strip.
+ * There must be space for the data; we don't check
+ * if strips overlap!
+ *
+ * NB: Image length must be setup before writing; this
+ *     interface does not support automatically growing
+ *     the image on each write (as TIFFWriteScanline does).
+ */
+tsize_t
+TIFFWriteRawTile(TIFF* tif, ttile_t tile, tdata_t data, tsize_t cc)
+{
+	static const char module[] = "TIFFWriteRawTile";
+
+	if (!WRITECHECKTILES(tif, module))
+		return ((tsize_t) -1);
+	if (tile >= tif->tif_dir.td_nstrips) {
+		TIFFErrorExt(tif->tif_clientdata, module, "%s: Tile %lu out of range, max %lu",
+		    tif->tif_name, (unsigned long) tile,
+		    (unsigned long) tif->tif_dir.td_nstrips);
+		return ((tsize_t) -1);
+	}
+	return (TIFFAppendToStrip(tif, tile, (tidata_t) data, cc) ?
+	    cc : (tsize_t) -1);
+}
+
+#define	isUnspecified(tif, f) \
+    (TIFFFieldSet(tif,f) && (tif)->tif_dir.td_imagelength == 0)
+
+int
+TIFFSetupStrips(TIFF* tif)
+{
+	TIFFDirectory* td = &tif->tif_dir;
+
+	if (isTiled(tif))
+		td->td_stripsperimage =
+		    isUnspecified(tif, FIELD_TILEDIMENSIONS) ?
+			td->td_samplesperpixel : TIFFNumberOfTiles(tif);
+	else
+		td->td_stripsperimage =
+		    isUnspecified(tif, FIELD_ROWSPERSTRIP) ?
+			td->td_samplesperpixel : TIFFNumberOfStrips(tif);
+	td->td_nstrips = td->td_stripsperimage;
+	if (td->td_planarconfig == PLANARCONFIG_SEPARATE)
+		td->td_stripsperimage /= td->td_samplesperpixel;
+	td->td_stripoffset = (uint32 *)
+	    _TIFFmalloc(td->td_nstrips * sizeof (uint32));
+	td->td_stripbytecount = (uint32 *)
+	    _TIFFmalloc(td->td_nstrips * sizeof (uint32));
+	if (td->td_stripoffset == NULL || td->td_stripbytecount == NULL)
+		return (0);
+	/*
+	 * Place data at the end-of-file
+	 * (by setting offsets to zero).
+	 */
+	_TIFFmemset(td->td_stripoffset, 0, td->td_nstrips*sizeof (uint32));
+	_TIFFmemset(td->td_stripbytecount, 0, td->td_nstrips*sizeof (uint32));
+	TIFFSetFieldBit(tif, FIELD_STRIPOFFSETS);
+	TIFFSetFieldBit(tif, FIELD_STRIPBYTECOUNTS);
+	return (1);
+}
+#undef isUnspecified
+
+/*
+ * Verify file is writable and that the directory
+ * information is setup properly.  In doing the latter
+ * we also "freeze" the state of the directory so
+ * that important information is not changed.
+ */
+int
+TIFFWriteCheck(TIFF* tif, int tiles, const char* module)
+{
+	if (tif->tif_mode == O_RDONLY) {
+		TIFFErrorExt(tif->tif_clientdata, module, "%s: File not open for writing",
+		    tif->tif_name);
+		return (0);
+	}
+	if (tiles ^ isTiled(tif)) {
+		TIFFErrorExt(tif->tif_clientdata, tif->tif_name, tiles ?
+		    "Can not write tiles to a stripped image" :
+		    "Can not write scanlines to a tiled image");
+		return (0);
+	}
+
+	/*
+	 * On the first write verify all the required information
+	 * has been setup and initialize any data structures that
+	 * had to wait until directory information was set.
+	 * Note that a lot of our work is assumed to remain valid
+	 * because we disallow any of the important parameters
+	 * from changing after we start writing (i.e. once
+	 * TIFF_BEENWRITING is set, TIFFSetField will only allow
+	 * the image's length to be changed).
+	 */
+	if (!TIFFFieldSet(tif, FIELD_IMAGEDIMENSIONS)) {
+		TIFFErrorExt(tif->tif_clientdata, module,
+		    "%s: Must set \"ImageWidth\" before writing data",
+		    tif->tif_name);
+		return (0);
+	}
+	if (tif->tif_dir.td_samplesperpixel == 1) {
+		/*
+		 * Planarconfiguration is irrelevant in case of single band
+		 * images and need not be included. We will set it anyway,
+		 * because this field is used in other parts of library even
+		 * in the single band case.
+		 */
+		tif->tif_dir.td_planarconfig = PLANARCONFIG_CONTIG;
+	} else {
+		if (!TIFFFieldSet(tif, FIELD_PLANARCONFIG)) {
+			TIFFErrorExt(tif->tif_clientdata, module,
+		    "%s: Must set \"PlanarConfiguration\" before writing data",
+			    tif->tif_name);
+			return (0);
+		}
+	}
+	if (tif->tif_dir.td_stripoffset == NULL && !TIFFSetupStrips(tif)) {
+		tif->tif_dir.td_nstrips = 0;
+		TIFFErrorExt(tif->tif_clientdata, module, "%s: No space for %s arrays",
+		    tif->tif_name, isTiled(tif) ? "tile" : "strip");
+		return (0);
+	}
+	tif->tif_tilesize = isTiled(tif) ? TIFFTileSize(tif) : (tsize_t) -1;
+	tif->tif_scanlinesize = TIFFScanlineSize(tif);
+	tif->tif_flags |= TIFF_BEENWRITING;
+	return (1);
+}
+
+/*
+ * Setup the raw data buffer used for encoding.
+ */
+int
+TIFFWriteBufferSetup(TIFF* tif, tdata_t bp, tsize_t size)
+{
+	static const char module[] = "TIFFWriteBufferSetup";
+
+	if (tif->tif_rawdata) {
+		if (tif->tif_flags & TIFF_MYBUFFER) {
+			_TIFFfree(tif->tif_rawdata);
+			tif->tif_flags &= ~TIFF_MYBUFFER;
+		}
+		tif->tif_rawdata = NULL;
+	}
+	if (size == (tsize_t) -1) {
+		size = (isTiled(tif) ?
+		    tif->tif_tilesize : TIFFStripSize(tif));
+		/*
+		 * Make raw data buffer at least 8K
+		 */
+		if (size < 8*1024)
+			size = 8*1024;
+		bp = NULL;			/* NB: force malloc */
+	}
+	if (bp == NULL) {
+		bp = _TIFFmalloc(size);
+		if (bp == NULL) {
+			TIFFErrorExt(tif->tif_clientdata, module, "%s: No space for output buffer",
+			    tif->tif_name);
+			return (0);
+		}
+		tif->tif_flags |= TIFF_MYBUFFER;
+	} else
+		tif->tif_flags &= ~TIFF_MYBUFFER;
+	tif->tif_rawdata = (tidata_t) bp;
+	tif->tif_rawdatasize = size;
+	tif->tif_rawcc = 0;
+	tif->tif_rawcp = tif->tif_rawdata;
+	tif->tif_flags |= TIFF_BUFFERSETUP;
+	return (1);
+}
+
+/*
+ * Grow the strip data structures by delta strips.
+ */
+static int
+TIFFGrowStrips(TIFF* tif, int delta, const char* module)
+{
+	TIFFDirectory	*td = &tif->tif_dir;
+	uint32		*new_stripoffset, *new_stripbytecount;
+
+	assert(td->td_planarconfig == PLANARCONFIG_CONTIG);
+	new_stripoffset = (uint32*)_TIFFrealloc(td->td_stripoffset,
+		(td->td_nstrips + delta) * sizeof (uint32));
+	new_stripbytecount = (uint32*)_TIFFrealloc(td->td_stripbytecount,
+		(td->td_nstrips + delta) * sizeof (uint32));
+	if (new_stripoffset == NULL || new_stripbytecount == NULL) {
+		if (new_stripoffset)
+			_TIFFfree(new_stripoffset);
+		if (new_stripbytecount)
+			_TIFFfree(new_stripbytecount);
+		td->td_nstrips = 0;
+		TIFFErrorExt(tif->tif_clientdata, module, "%s: No space to expand strip arrays",
+			  tif->tif_name);
+		return (0);
+	}
+	td->td_stripoffset = new_stripoffset;
+	td->td_stripbytecount = new_stripbytecount;
+	_TIFFmemset(td->td_stripoffset + td->td_nstrips,
+		    0, delta*sizeof (uint32));
+	_TIFFmemset(td->td_stripbytecount + td->td_nstrips,
+		    0, delta*sizeof (uint32));
+	td->td_nstrips += delta;
+	return (1);
+}
+
+/*
+ * Append the data to the specified strip.
+ */
+static int
+TIFFAppendToStrip(TIFF* tif, tstrip_t strip, tidata_t data, tsize_t cc)
+{
+	TIFFDirectory *td = &tif->tif_dir;
+	static const char module[] = "TIFFAppendToStrip";
+
+	if (td->td_stripoffset[strip] == 0 || tif->tif_curoff == 0) {
+		/*
+		 * No current offset, set the current strip.
+		 */
+		assert(td->td_nstrips > 0);
+		if (td->td_stripoffset[strip] != 0) {
+			/*
+			 * Prevent overlapping of the data chunks. We need
+                         * this to enable in place updating of the compressed
+                         * images. Larger blocks will be moved at the end of
+                         * the file without any optimization of the spare
+                         * space, so such scheme is not too much effective.
+			 */
+			if (td->td_stripbytecountsorted) {
+				if (strip == td->td_nstrips - 1
+				    || td->td_stripoffset[strip + 1] <
+					td->td_stripoffset[strip] + cc) {
+					td->td_stripoffset[strip] =
+						TIFFSeekFile(tif, (toff_t)0,
+							     SEEK_END);
+				}
+			} else {
+				tstrip_t i;
+				for (i = 0; i < td->td_nstrips; i++) {
+					if (td->td_stripoffset[i] >
+						td->td_stripoffset[strip]
+					    && td->td_stripoffset[i] <
+						td->td_stripoffset[strip] + cc) {
+						td->td_stripoffset[strip] =
+							TIFFSeekFile(tif,
+								     (toff_t)0,
+								     SEEK_END);
+					}
+				}
+			}
+
+			if (!SeekOK(tif, td->td_stripoffset[strip])) {
+				TIFFErrorExt(tif->tif_clientdata, module,
+					  "%s: Seek error at scanline %lu",
+					  tif->tif_name,
+					  (unsigned long)tif->tif_row);
+				return (0);
+			}
+		} else
+			td->td_stripoffset[strip] =
+			    TIFFSeekFile(tif, (toff_t) 0, SEEK_END);
+		tif->tif_curoff = td->td_stripoffset[strip];
+	}
+
+	if (!WriteOK(tif, data, cc)) {
+		TIFFErrorExt(tif->tif_clientdata, module, "%s: Write error at scanline %lu",
+		    tif->tif_name, (unsigned long) tif->tif_row);
+		return (0);
+	}
+	tif->tif_curoff += cc;
+	td->td_stripbytecount[strip] += cc;
+	return (1);
+}
+
+/*
+ * Internal version of TIFFFlushData that can be
+ * called by ``encodestrip routines'' w/o concern
+ * for infinite recursion.
+ */
+int
+TIFFFlushData1(TIFF* tif)
+{
+	if (tif->tif_rawcc > 0) {
+		if (!isFillOrder(tif, tif->tif_dir.td_fillorder) &&
+		    (tif->tif_flags & TIFF_NOBITREV) == 0)
+			TIFFReverseBits((unsigned char *)tif->tif_rawdata,
+			    tif->tif_rawcc);
+		if (!TIFFAppendToStrip(tif,
+		    isTiled(tif) ? tif->tif_curtile : tif->tif_curstrip,
+		    tif->tif_rawdata, tif->tif_rawcc))
+			return (0);
+		tif->tif_rawcc = 0;
+		tif->tif_rawcp = tif->tif_rawdata;
+	}
+	return (1);
+}
+
+/*
+ * Set the current write offset.  This should only be
+ * used to set the offset to a known previous location
+ * (very carefully), or to 0 so that the next write gets
+ * appended to the end of the file.
+ */
+void
+TIFFSetWriteOffset(TIFF* tif, toff_t off)
+{
+	tif->tif_curoff = off;
+}
+
+/* vim: set ts=8 sts=8 sw=8 noet: */
diff --git a/uppsrc/plugin/tif/lib/tif_zip.c b/uppsrc/plugin/tif/lib/tif_zip.c
new file mode 100644
index 000000000..5e3bf2ecb
--- /dev/null
+++ b/uppsrc/plugin/tif/lib/tif_zip.c
@@ -0,0 +1,378 @@
+/* $Id: tif_zip.c,v 1.10 2006/03/16 12:38:24 dron Exp $ */
+
+/*
+ * Copyright (c) 1995-1997 Sam Leffler
+ * Copyright (c) 1995-1997 Silicon Graphics, Inc.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and
+ * its documentation for any purpose is hereby granted without fee, provided
+ * that (i) the above copyright notices and this permission notice appear in
+ * all copies of the software and related documentation, and (ii) the names of
+ * Sam Leffler and Silicon Graphics may not be used in any advertising or
+ * publicity relating to the software without the specific, prior written
+ * permission of Sam Leffler and Silicon Graphics.
+ *
+ * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+ * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
+ * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
+ * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+ * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
+ * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.
+ */
+
+#include "tiffiop.h"
+#ifdef ZIP_SUPPORT
+/*
+ * TIFF Library.
+ *
+ * ZIP (aka Deflate) Compression Support
+ *
+ * This file is simply an interface to the zlib library written by
+ * Jean-loup Gailly and Mark Adler.  You must use version 1.0 or later
+ * of the library: this code assumes the 1.0 API and also depends on
+ * the ability to write the zlib header multiple times (one per strip)
+ * which was not possible with versions prior to 0.95.  Note also that
+ * older versions of this codec avoided this bug by supressing the header
+ * entirely.  This means that files written with the old library cannot
+ * be read; they should be converted to a different compression scheme
+ * and then reconverted.
+ *
+ * The data format used by the zlib library is described in the files
+ * zlib-3.1.doc, deflate-1.1.doc and gzip-4.1.doc, available in the
+ * directory ftp://ftp.uu.net/pub/archiving/zip/doc.  The library was
+ * last found at ftp://ftp.uu.net/pub/archiving/zip/zlib/zlib-0.99.tar.gz.
+ */
+#include "tif_predict.h"
+#include <plugin/z/lib/zlib.h>
+
+#include <stdio.h>
+
+/*
+ * Sigh, ZLIB_VERSION is defined as a string so there's no
+ * way to do a proper check here.  Instead we guess based
+ * on the presence of #defines that were added between the
+ * 0.95 and 1.0 distributions.
+ */
+#if !defined(Z_NO_COMPRESSION) || !defined(Z_DEFLATED)
+#error "Antiquated ZLIB software; you must use version 1.0 or later"
+#endif
+
+/*
+ * State block for each open TIFF
+ * file using ZIP compression/decompression.
+ */
+typedef	struct {
+	TIFFPredictorState predict;
+	z_stream	stream;
+	int		zipquality;		/* compression level */
+	int		state;			/* state flags */
+#define	ZSTATE_INIT	0x1		/* zlib setup successfully */
+
+	TIFFVGetMethod	vgetparent;		/* super-class method */
+	TIFFVSetMethod	vsetparent;		/* super-class method */
+} ZIPState;
+
+#define	ZState(tif)		((ZIPState*) (tif)->tif_data)
+#define	DecoderState(tif)	ZState(tif)
+#define	EncoderState(tif)	ZState(tif)
+
+static	int ZIPEncode(TIFF*, tidata_t, tsize_t, tsample_t);
+static	int ZIPDecode(TIFF*, tidata_t, tsize_t, tsample_t);
+
+static int
+ZIPSetupDecode(TIFF* tif)
+{
+	ZIPState* sp = DecoderState(tif);
+	static const char module[] = "ZIPSetupDecode";
+
+	assert(sp != NULL);
+	if (inflateInit(&sp->stream) != Z_OK) {
+		TIFFErrorExt(tif->tif_clientdata, module, "%s: %s", tif->tif_name, sp->stream.msg);
+		return (0);
+	} else {
+		sp->state |= ZSTATE_INIT;
+		return (1);
+	}
+}
+
+/*
+ * Setup state for decoding a strip.
+ */
+static int
+ZIPPreDecode(TIFF* tif, tsample_t s)
+{
+	ZIPState* sp = DecoderState(tif);
+
+	(void) s;
+	assert(sp != NULL);
+	sp->stream.next_in = tif->tif_rawdata;
+	sp->stream.avail_in = tif->tif_rawcc;
+	return (inflateReset(&sp->stream) == Z_OK);
+}
+
+static int
+ZIPDecode(TIFF* tif, tidata_t op, tsize_t occ, tsample_t s)
+{
+	ZIPState* sp = DecoderState(tif);
+	static const char module[] = "ZIPDecode";
+
+	(void) s;
+	assert(sp != NULL);
+	sp->stream.next_out = op;
+	sp->stream.avail_out = occ;
+	do {
+		int state = inflate(&sp->stream, Z_PARTIAL_FLUSH);
+		if (state == Z_STREAM_END)
+			break;
+		if (state == Z_DATA_ERROR) {
+			TIFFErrorExt(tif->tif_clientdata, module,
+			    "%s: Decoding error at scanline %d, %s",
+			    tif->tif_name, tif->tif_row, sp->stream.msg);
+			if (inflateSync(&sp->stream) != Z_OK)
+				return (0);
+			continue;
+		}
+		if (state != Z_OK) {
+			TIFFErrorExt(tif->tif_clientdata, module, "%s: zlib error: %s",
+			    tif->tif_name, sp->stream.msg);
+			return (0);
+		}
+	} while (sp->stream.avail_out > 0);
+	if (sp->stream.avail_out != 0) {
+		TIFFErrorExt(tif->tif_clientdata, module,
+		    "%s: Not enough data at scanline %d (short %d bytes)",
+		    tif->tif_name, tif->tif_row, sp->stream.avail_out);
+		return (0);
+	}
+	return (1);
+}
+
+static int
+ZIPSetupEncode(TIFF* tif)
+{
+	ZIPState* sp = EncoderState(tif);
+	static const char module[] = "ZIPSetupEncode";
+
+	assert(sp != NULL);
+	if (deflateInit(&sp->stream, sp->zipquality) != Z_OK) {
+		TIFFErrorExt(tif->tif_clientdata, module, "%s: %s", tif->tif_name, sp->stream.msg);
+		return (0);
+	} else {
+		sp->state |= ZSTATE_INIT;
+		return (1);
+	}
+}
+
+/*
+ * Reset encoding state at the start of a strip.
+ */
+static int
+ZIPPreEncode(TIFF* tif, tsample_t s)
+{
+	ZIPState *sp = EncoderState(tif);
+
+	(void) s;
+	assert(sp != NULL);
+	sp->stream.next_out = tif->tif_rawdata;
+	sp->stream.avail_out = tif->tif_rawdatasize;
+	return (deflateReset(&sp->stream) == Z_OK);
+}
+
+/*
+ * Encode a chunk of pixels.
+ */
+static int
+ZIPEncode(TIFF* tif, tidata_t bp, tsize_t cc, tsample_t s)
+{
+	ZIPState *sp = EncoderState(tif);
+	static const char module[] = "ZIPEncode";
+
+	(void) s;
+	sp->stream.next_in = bp;
+	sp->stream.avail_in = cc;
+	do {
+		if (deflate(&sp->stream, Z_NO_FLUSH) != Z_OK) {
+			TIFFErrorExt(tif->tif_clientdata, module, "%s: Encoder error: %s",
+			    tif->tif_name, sp->stream.msg);
+			return (0);
+		}
+		if (sp->stream.avail_out == 0) {
+			tif->tif_rawcc = tif->tif_rawdatasize;
+			TIFFFlushData1(tif);
+			sp->stream.next_out = tif->tif_rawdata;
+			sp->stream.avail_out = tif->tif_rawdatasize;
+		}
+	} while (sp->stream.avail_in > 0);
+	return (1);
+}
+
+/*
+ * Finish off an encoded strip by flushing the last
+ * string and tacking on an End Of Information code.
+ */
+static int
+ZIPPostEncode(TIFF* tif)
+{
+	ZIPState *sp = EncoderState(tif);
+	static const char module[] = "ZIPPostEncode";
+	int state;
+
+	sp->stream.avail_in = 0;
+	do {
+		state = deflate(&sp->stream, Z_FINISH);
+		switch (state) {
+		case Z_STREAM_END:
+		case Z_OK:
+		    if ((int)sp->stream.avail_out != (int)tif->tif_rawdatasize)
+                    {
+			    tif->tif_rawcc =
+				tif->tif_rawdatasize - sp->stream.avail_out;
+			    TIFFFlushData1(tif);
+			    sp->stream.next_out = tif->tif_rawdata;
+			    sp->stream.avail_out = tif->tif_rawdatasize;
+		    }
+		    break;
+		default:
+			TIFFErrorExt(tif->tif_clientdata, module, "%s: zlib error: %s",
+			tif->tif_name, sp->stream.msg);
+		    return (0);
+		}
+	} while (state != Z_STREAM_END);
+	return (1);
+}
+
+static void
+ZIPCleanup(TIFF* tif)
+{
+	ZIPState* sp = ZState(tif);
+
+	assert(sp != 0);
+
+	(void)TIFFPredictorCleanup(tif);
+
+	tif->tif_tagmethods.vgetfield = sp->vgetparent;
+	tif->tif_tagmethods.vsetfield = sp->vsetparent;
+
+	if (sp->state&ZSTATE_INIT) {
+		/* NB: avoid problems in the library */
+		if (tif->tif_mode == O_RDONLY)
+			inflateEnd(&sp->stream);
+		else
+			deflateEnd(&sp->stream);
+	}
+	_TIFFfree(sp);
+	tif->tif_data = NULL;
+
+	_TIFFSetDefaultCompressionState(tif);
+}
+
+static int
+ZIPVSetField(TIFF* tif, ttag_t tag, va_list ap)
+{
+	ZIPState* sp = ZState(tif);
+	static const char module[] = "ZIPVSetField";
+
+	switch (tag) {
+	case TIFFTAG_ZIPQUALITY:
+		sp->zipquality = va_arg(ap, int);
+		if (tif->tif_mode != O_RDONLY && (sp->state&ZSTATE_INIT)) {
+			if (deflateParams(&sp->stream,
+			    sp->zipquality, Z_DEFAULT_STRATEGY) != Z_OK) {
+				TIFFErrorExt(tif->tif_clientdata, module, "%s: zlib error: %s",
+				    tif->tif_name, sp->stream.msg);
+				return (0);
+			}
+		}
+		return (1);
+	default:
+		return (*sp->vsetparent)(tif, tag, ap);
+	}
+	/*NOTREACHED*/
+}
+
+static int
+ZIPVGetField(TIFF* tif, ttag_t tag, va_list ap)
+{
+	ZIPState* sp = ZState(tif);
+
+	switch (tag) {
+	case TIFFTAG_ZIPQUALITY:
+		*va_arg(ap, int*) = sp->zipquality;
+		break;
+	default:
+		return (*sp->vgetparent)(tif, tag, ap);
+	}
+	return (1);
+}
+
+static const TIFFFieldInfo zipFieldInfo[] = {
+    { TIFFTAG_ZIPQUALITY,	 0, 0,	TIFF_ANY,	FIELD_PSEUDO,
+      TRUE,	FALSE,	"" },
+};
+
+int
+TIFFInitZIP(TIFF* tif, int scheme)
+{
+	ZIPState* sp;
+
+	assert( (scheme == COMPRESSION_DEFLATE)
+		|| (scheme == COMPRESSION_ADOBE_DEFLATE));
+
+	/*
+	 * Allocate state block so tag methods have storage to record values.
+	 */
+	tif->tif_data = (tidata_t) _TIFFmalloc(sizeof (ZIPState));
+	if (tif->tif_data == NULL)
+		goto bad;
+	sp = ZState(tif);
+	sp->stream.zalloc = NULL;
+	sp->stream.zfree = NULL;
+	sp->stream.opaque = NULL;
+	sp->stream.data_type = Z_BINARY;
+
+	/*
+	 * Merge codec-specific tag information and
+	 * override parent get/set field methods.
+	 */
+	_TIFFMergeFieldInfo(tif, zipFieldInfo, TIFFArrayCount(zipFieldInfo));
+	sp->vgetparent = tif->tif_tagmethods.vgetfield;
+	tif->tif_tagmethods.vgetfield = ZIPVGetField; /* hook for codec tags */
+	sp->vsetparent = tif->tif_tagmethods.vsetfield;
+	tif->tif_tagmethods.vsetfield = ZIPVSetField; /* hook for codec tags */
+
+	/* Default values for codec-specific fields */
+	sp->zipquality = Z_DEFAULT_COMPRESSION;	/* default comp. level */
+	sp->state = 0;
+
+	/*
+	 * Install codec methods.
+	 */
+	tif->tif_setupdecode = ZIPSetupDecode;
+	tif->tif_predecode = ZIPPreDecode;
+	tif->tif_decoderow = ZIPDecode;
+	tif->tif_decodestrip = ZIPDecode;
+	tif->tif_decodetile = ZIPDecode;
+	tif->tif_setupencode = ZIPSetupEncode;
+	tif->tif_preencode = ZIPPreEncode;
+	tif->tif_postencode = ZIPPostEncode;
+	tif->tif_encoderow = ZIPEncode;
+	tif->tif_encodestrip = ZIPEncode;
+	tif->tif_encodetile = ZIPEncode;
+	tif->tif_cleanup = ZIPCleanup;
+	/*
+	 * Setup predictor setup.
+	 */
+	(void) TIFFPredictorInit(tif);
+	return (1);
+bad:
+	TIFFErrorExt(tif->tif_clientdata, "TIFFInitZIP",
+		     "No space for ZIP state block");
+	return (0);
+}
+#endif /* ZIP_SUPORT */
+
+/* vim: set ts=8 sts=8 sw=8 noet: */
diff --git a/uppsrc/plugin/tif/lib/tiff.h b/uppsrc/plugin/tif/lib/tiff.h
new file mode 100644
index 000000000..f9bb7e78e
--- /dev/null
+++ b/uppsrc/plugin/tif/lib/tiff.h
@@ -0,0 +1,649 @@
+/* $Id: tiff.h,v 1.42 2005/12/23 15:10:45 dron Exp $ */
+
+/*
+ * Copyright (c) 1988-1997 Sam Leffler
+ * Copyright (c) 1991-1997 Silicon Graphics, Inc.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and
+ * its documentation for any purpose is hereby granted without fee, provided
+ * that (i) the above copyright notices and this permission notice appear in
+ * all copies of the software and related documentation, and (ii) the names of
+ * Sam Leffler and Silicon Graphics may not be used in any advertising or
+ * publicity relating to the software without the specific, prior written
+ * permission of Sam Leffler and Silicon Graphics.
+ *
+ * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+ * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
+ * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
+ * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+ * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
+ * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.
+ */
+
+#ifndef _TIFF_
+#define	_TIFF_
+
+#include <string.h>
+
+#include "tiffconf.h"
+
+/*
+ * Tag Image File Format (TIFF)
+ *
+ * Based on Rev 6.0 from:
+ *    Developer's Desk
+ *    Aldus Corporation
+ *    411 First Ave. South
+ *    Suite 200
+ *    Seattle, WA  98104
+ *    206-622-5500
+ *
+ *    (http://partners.adobe.com/asn/developer/PDFS/TN/TIFF6.pdf)
+ *
+ * For Big TIFF design notes see the following link
+ *    http://gdal.maptools.org/twiki/bin/view/libtiff/BigTIFFDesign
+ */
+#define	TIFF_VERSION	        42
+#define TIFF_BIGTIFF_VERSION    43
+
+#define	TIFF_BIGENDIAN		0x4d4d
+#define	TIFF_LITTLEENDIAN	0x4949
+#define	MDI_LITTLEENDIAN        0x5045
+#define	MDI_BIGENDIAN           0x4550
+/*
+ * Intrinsic data types required by the file format:
+ *
+ * 8-bit quantities	int8/uint8
+ * 16-bit quantities	int16/uint16
+ * 32-bit quantities	int32/uint32
+ * strings		unsigned char*
+ */
+
+#ifndef HAVE_INT8
+typedef	signed char int8;	/* NB: non-ANSI compilers may not grok */
+#endif
+typedef	unsigned char uint8;
+#ifndef HAVE_INT16
+typedef	short int16;
+#endif
+typedef	unsigned short uint16;	/* sizeof (uint16) must == 2 */
+#if SIZEOF_INT == 4
+#ifndef HAVE_INT32
+typedef	int int32;
+#endif
+typedef	unsigned int uint32;	/* sizeof (uint32) must == 4 */
+#elif SIZEOF_LONG == 4
+#ifndef HAVE_INT32
+typedef	long int32;
+#endif
+typedef	unsigned long uint32;	/* sizeof (uint32) must == 4 */
+#endif
+
+/* For TIFFReassignTagToIgnore */
+enum TIFFIgnoreSense /* IGNORE tag table */
+{
+	TIS_STORE,
+	TIS_EXTRACT,
+	TIS_EMPTY
+};
+
+/*
+ * TIFF header.
+ */
+typedef	struct {
+	uint16	tiff_magic;	/* magic number (defines byte order) */
+#define TIFF_MAGIC_SIZE		2
+	uint16	tiff_version;	/* TIFF version number */
+#define TIFF_VERSION_SIZE	2
+	uint32	tiff_diroff;	/* byte offset to first directory */
+#define TIFF_DIROFFSET_SIZE	4
+} TIFFHeader;
+
+
+/*
+ * TIFF Image File Directories are comprised of a table of field
+ * descriptors of the form shown below.  The table is sorted in
+ * ascending order by tag.  The values associated with each entry are
+ * disjoint and may appear anywhere in the file (so long as they are
+ * placed on a word boundary).
+ *
+ * If the value is 4 bytes or less, then it is placed in the offset
+ * field to save space.  If the value is less than 4 bytes, it is
+ * left-justified in the offset field.
+ */
+typedef	struct {
+	uint16		tdir_tag;	/* see below */
+	uint16		tdir_type;	/* data type; see below */
+	uint32		tdir_count;	/* number of items; length in spec */
+	uint32		tdir_offset;	/* byte offset to field data */
+} TIFFDirEntry;
+
+/*
+ * NB: In the comments below,
+ *  - items marked with a + are obsoleted by revision 5.0,
+ *  - items marked with a ! are introduced in revision 6.0.
+ *  - items marked with a % are introduced post revision 6.0.
+ *  - items marked with a $ are obsoleted by revision 6.0.
+ *  - items marked with a & are introduced by Adobe DNG specification.
+ */
+
+/*
+ * Tag data type information.
+ *
+ * Note: RATIONALs are the ratio of two 32-bit integer values.
+ */
+typedef	enum {
+	TIFF_NOTYPE	= 0,	/* placeholder */
+	TIFF_BYTE	= 1,	/* 8-bit unsigned integer */
+	TIFF_ASCII	= 2,	/* 8-bit bytes w/ last byte null */
+	TIFF_SHORT	= 3,	/* 16-bit unsigned integer */
+	TIFF_LONG	= 4,	/* 32-bit unsigned integer */
+	TIFF_RATIONAL	= 5,	/* 64-bit unsigned fraction */
+	TIFF_SBYTE	= 6,	/* !8-bit signed integer */
+	TIFF_UNDEFINED	= 7,	/* !8-bit untyped data */
+	TIFF_SSHORT	= 8,	/* !16-bit signed integer */
+	TIFF_SLONG	= 9,	/* !32-bit signed integer */
+	TIFF_SRATIONAL	= 10,	/* !64-bit signed fraction */
+	TIFF_FLOAT	= 11,	/* !32-bit IEEE floating point */
+	TIFF_DOUBLE	= 12,	/* !64-bit IEEE floating point */
+	TIFF_IFD	= 13	/* %32-bit unsigned integer (offset) */
+} TIFFDataType;
+
+/*
+ * TIFF Tag Definitions.
+ */
+#define	TIFFTAG_SUBFILETYPE		254	/* subfile data descriptor */
+#define	    FILETYPE_REDUCEDIMAGE	0x1	/* reduced resolution version */
+#define	    FILETYPE_PAGE		0x2	/* one page of many */
+#define	    FILETYPE_MASK		0x4	/* transparency mask */
+#define	TIFFTAG_OSUBFILETYPE		255	/* +kind of data in subfile */
+#define	    OFILETYPE_IMAGE		1	/* full resolution image data */
+#define	    OFILETYPE_REDUCEDIMAGE	2	/* reduced size image data */
+#define	    OFILETYPE_PAGE		3	/* one page of many */
+#define	TIFFTAG_IMAGEWIDTH		256	/* image width in pixels */
+#define	TIFFTAG_IMAGELENGTH		257	/* image height in pixels */
+#define	TIFFTAG_BITSPERSAMPLE		258	/* bits per channel (sample) */
+#define	TIFFTAG_COMPRESSION		259	/* data compression technique */
+#define	    COMPRESSION_NONE		1	/* dump mode */
+#define	    COMPRESSION_CCITTRLE	2	/* CCITT modified Huffman RLE */
+#define	    COMPRESSION_CCITTFAX3	3	/* CCITT Group 3 fax encoding */
+#define     COMPRESSION_CCITT_T4        3       /* CCITT T.4 (TIFF 6 name) */
+#define	    COMPRESSION_CCITTFAX4	4	/* CCITT Group 4 fax encoding */
+#define     COMPRESSION_CCITT_T6        4       /* CCITT T.6 (TIFF 6 name) */
+#define	    COMPRESSION_LZW		5       /* Lempel-Ziv  & Welch */
+#define	    COMPRESSION_OJPEG		6	/* !6.0 JPEG */
+#define	    COMPRESSION_JPEG		7	/* %JPEG DCT compression */
+#define	    COMPRESSION_NEXT		32766	/* NeXT 2-bit RLE */
+#define	    COMPRESSION_CCITTRLEW	32771	/* #1 w/ word alignment */
+#define	    COMPRESSION_PACKBITS	32773	/* Macintosh RLE */
+#define	    COMPRESSION_THUNDERSCAN	32809	/* ThunderScan RLE */
+/* codes 32895-32898 are reserved for ANSI IT8 TIFF/IT <dkelly@apago.com) */
+#define	    COMPRESSION_IT8CTPAD	32895   /* IT8 CT w/padding */
+#define	    COMPRESSION_IT8LW		32896   /* IT8 Linework RLE */
+#define	    COMPRESSION_IT8MP		32897   /* IT8 Monochrome picture */
+#define	    COMPRESSION_IT8BL		32898   /* IT8 Binary line art */
+/* compression codes 32908-32911 are reserved for Pixar */
+#define     COMPRESSION_PIXARFILM	32908   /* Pixar companded 10bit LZW */
+#define	    COMPRESSION_PIXARLOG	32909   /* Pixar companded 11bit ZIP */
+#define	    COMPRESSION_DEFLATE		32946	/* Deflate compression */
+#define     COMPRESSION_ADOBE_DEFLATE   8       /* Deflate compression,
+						   as recognized by Adobe */
+/* compression code 32947 is reserved for Oceana Matrix <dev@oceana.com> */
+#define     COMPRESSION_DCS             32947   /* Kodak DCS encoding */
+#define	    COMPRESSION_JBIG		34661	/* ISO JBIG */
+#define     COMPRESSION_SGILOG		34676	/* SGI Log Luminance RLE */
+#define     COMPRESSION_SGILOG24	34677	/* SGI Log 24-bit packed */
+#define     COMPRESSION_JP2000          34712   /* Leadtools JPEG2000 */
+#define	TIFFTAG_PHOTOMETRIC		262	/* photometric interpretation */
+#define	    PHOTOMETRIC_MINISWHITE	0	/* min value is white */
+#define	    PHOTOMETRIC_MINISBLACK	1	/* min value is black */
+#define	    PHOTOMETRIC_RGB		2	/* RGB color model */
+#define	    PHOTOMETRIC_PALETTE		3	/* color map indexed */
+#define	    PHOTOMETRIC_MASK		4	/* $holdout mask */
+#define	    PHOTOMETRIC_SEPARATED	5	/* !color separations */
+#define	    PHOTOMETRIC_YCBCR		6	/* !CCIR 601 */
+#define	    PHOTOMETRIC_CIELAB		8	/* !1976 CIE L*a*b* */
+#define	    PHOTOMETRIC_ICCLAB		9	/* ICC L*a*b* [Adobe TIFF Technote 4] */
+#define	    PHOTOMETRIC_ITULAB		10	/* ITU L*a*b* */
+#define     PHOTOMETRIC_LOGL		32844	/* CIE Log2(L) */
+#define     PHOTOMETRIC_LOGLUV		32845	/* CIE Log2(L) (u',v') */
+#define	TIFFTAG_THRESHHOLDING		263	/* +thresholding used on data */
+#define	    THRESHHOLD_BILEVEL		1	/* b&w art scan */
+#define	    THRESHHOLD_HALFTONE		2	/* or dithered scan */
+#define	    THRESHHOLD_ERRORDIFFUSE	3	/* usually floyd-steinberg */
+#define	TIFFTAG_CELLWIDTH		264	/* +dithering matrix width */
+#define	TIFFTAG_CELLLENGTH		265	/* +dithering matrix height */
+#define	TIFFTAG_FILLORDER		266	/* data order within a byte */
+#define	    FILLORDER_MSB2LSB		1	/* most significant -> least */
+#define	    FILLORDER_LSB2MSB		2	/* least significant -> most */
+#define	TIFFTAG_DOCUMENTNAME		269	/* name of doc. image is from */
+#define	TIFFTAG_IMAGEDESCRIPTION	270	/* info about image */
+#define	TIFFTAG_MAKE			271	/* scanner manufacturer name */
+#define	TIFFTAG_MODEL			272	/* scanner model name/number */
+#define	TIFFTAG_STRIPOFFSETS		273	/* offsets to data strips */
+#define	TIFFTAG_ORIENTATION		274	/* +image orientation */
+#define	    ORIENTATION_TOPLEFT		1	/* row 0 top, col 0 lhs */
+#define	    ORIENTATION_TOPRIGHT	2	/* row 0 top, col 0 rhs */
+#define	    ORIENTATION_BOTRIGHT	3	/* row 0 bottom, col 0 rhs */
+#define	    ORIENTATION_BOTLEFT		4	/* row 0 bottom, col 0 lhs */
+#define	    ORIENTATION_LEFTTOP		5	/* row 0 lhs, col 0 top */
+#define	    ORIENTATION_RIGHTTOP	6	/* row 0 rhs, col 0 top */
+#define	    ORIENTATION_RIGHTBOT	7	/* row 0 rhs, col 0 bottom */
+#define	    ORIENTATION_LEFTBOT		8	/* row 0 lhs, col 0 bottom */
+#define	TIFFTAG_SAMPLESPERPIXEL		277	/* samples per pixel */
+#define	TIFFTAG_ROWSPERSTRIP		278	/* rows per strip of data */
+#define	TIFFTAG_STRIPBYTECOUNTS		279	/* bytes counts for strips */
+#define	TIFFTAG_MINSAMPLEVALUE		280	/* +minimum sample value */
+#define	TIFFTAG_MAXSAMPLEVALUE		281	/* +maximum sample value */
+#define	TIFFTAG_XRESOLUTION		282	/* pixels/resolution in x */
+#define	TIFFTAG_YRESOLUTION		283	/* pixels/resolution in y */
+#define	TIFFTAG_PLANARCONFIG		284	/* storage organization */
+#define	    PLANARCONFIG_CONTIG		1	/* single image plane */
+#define	    PLANARCONFIG_SEPARATE	2	/* separate planes of data */
+#define	TIFFTAG_PAGENAME		285	/* page name image is from */
+#define	TIFFTAG_XPOSITION		286	/* x page offset of image lhs */
+#define	TIFFTAG_YPOSITION		287	/* y page offset of image lhs */
+#define	TIFFTAG_FREEOFFSETS		288	/* +byte offset to free block */
+#define	TIFFTAG_FREEBYTECOUNTS		289	/* +sizes of free blocks */
+#define	TIFFTAG_GRAYRESPONSEUNIT	290	/* $gray scale curve accuracy */
+#define	    GRAYRESPONSEUNIT_10S	1	/* tenths of a unit */
+#define	    GRAYRESPONSEUNIT_100S	2	/* hundredths of a unit */
+#define	    GRAYRESPONSEUNIT_1000S	3	/* thousandths of a unit */
+#define	    GRAYRESPONSEUNIT_10000S	4	/* ten-thousandths of a unit */
+#define	    GRAYRESPONSEUNIT_100000S	5	/* hundred-thousandths */
+#define	TIFFTAG_GRAYRESPONSECURVE	291	/* $gray scale response curve */
+#define	TIFFTAG_GROUP3OPTIONS		292	/* 32 flag bits */
+#define	TIFFTAG_T4OPTIONS		292	/* TIFF 6.0 proper name alias */
+#define	    GROUP3OPT_2DENCODING	0x1	/* 2-dimensional coding */
+#define	    GROUP3OPT_UNCOMPRESSED	0x2	/* data not compressed */
+#define	    GROUP3OPT_FILLBITS		0x4	/* fill to byte boundary */
+#define	TIFFTAG_GROUP4OPTIONS		293	/* 32 flag bits */
+#define TIFFTAG_T6OPTIONS               293     /* TIFF 6.0 proper name */
+#define	    GROUP4OPT_UNCOMPRESSED	0x2	/* data not compressed */
+#define	TIFFTAG_RESOLUTIONUNIT		296	/* units of resolutions */
+#define	    RESUNIT_NONE		1	/* no meaningful units */
+#define	    RESUNIT_INCH		2	/* english */
+#define	    RESUNIT_CENTIMETER		3	/* metric */
+#define	TIFFTAG_PAGENUMBER		297	/* page numbers of multi-page */
+#define	TIFFTAG_COLORRESPONSEUNIT	300	/* $color curve accuracy */
+#define	    COLORRESPONSEUNIT_10S	1	/* tenths of a unit */
+#define	    COLORRESPONSEUNIT_100S	2	/* hundredths of a unit */
+#define	    COLORRESPONSEUNIT_1000S	3	/* thousandths of a unit */
+#define	    COLORRESPONSEUNIT_10000S	4	/* ten-thousandths of a unit */
+#define	    COLORRESPONSEUNIT_100000S	5	/* hundred-thousandths */
+#define	TIFFTAG_TRANSFERFUNCTION	301	/* !colorimetry info */
+#define	TIFFTAG_SOFTWARE		305	/* name & release */
+#define	TIFFTAG_DATETIME		306	/* creation date and time */
+#define	TIFFTAG_ARTIST			315	/* creator of image */
+#define	TIFFTAG_HOSTCOMPUTER		316	/* machine where created */
+#define	TIFFTAG_PREDICTOR		317	/* prediction scheme w/ LZW */
+#define     PREDICTOR_NONE		1	/* no prediction scheme used */
+#define     PREDICTOR_HORIZONTAL	2	/* horizontal differencing */
+#define     PREDICTOR_FLOATINGPOINT	3	/* floating point predictor */
+#define	TIFFTAG_WHITEPOINT		318	/* image white point */
+#define	TIFFTAG_PRIMARYCHROMATICITIES	319	/* !primary chromaticities */
+#define	TIFFTAG_COLORMAP		320	/* RGB map for pallette image */
+#define	TIFFTAG_HALFTONEHINTS		321	/* !highlight+shadow info */
+#define	TIFFTAG_TILEWIDTH		322	/* !tile width in pixels */
+#define	TIFFTAG_TILELENGTH		323	/* !tile height in pixels */
+#define TIFFTAG_TILEOFFSETS		324	/* !offsets to data tiles */
+#define TIFFTAG_TILEBYTECOUNTS		325	/* !byte counts for tiles */
+#define	TIFFTAG_BADFAXLINES		326	/* lines w/ wrong pixel count */
+#define	TIFFTAG_CLEANFAXDATA		327	/* regenerated line info */
+#define	    CLEANFAXDATA_CLEAN		0	/* no errors detected */
+#define	    CLEANFAXDATA_REGENERATED	1	/* receiver regenerated lines */
+#define	    CLEANFAXDATA_UNCLEAN	2	/* uncorrected errors exist */
+#define	TIFFTAG_CONSECUTIVEBADFAXLINES	328	/* max consecutive bad lines */
+#define	TIFFTAG_SUBIFD			330	/* subimage descriptors */
+#define	TIFFTAG_INKSET			332	/* !inks in separated image */
+#define	    INKSET_CMYK			1	/* !cyan-magenta-yellow-black color */
+#define	    INKSET_MULTIINK		2	/* !multi-ink or hi-fi color */
+#define	TIFFTAG_INKNAMES		333	/* !ascii names of inks */
+#define	TIFFTAG_NUMBEROFINKS		334	/* !number of inks */
+#define	TIFFTAG_DOTRANGE		336	/* !0% and 100% dot codes */
+#define	TIFFTAG_TARGETPRINTER		337	/* !separation target */
+#define	TIFFTAG_EXTRASAMPLES		338	/* !info about extra samples */
+#define	    EXTRASAMPLE_UNSPECIFIED	0	/* !unspecified data */
+#define	    EXTRASAMPLE_ASSOCALPHA	1	/* !associated alpha data */
+#define	    EXTRASAMPLE_UNASSALPHA	2	/* !unassociated alpha data */
+#define	TIFFTAG_SAMPLEFORMAT		339	/* !data sample format */
+#define	    SAMPLEFORMAT_UINT		1	/* !unsigned integer data */
+#define	    SAMPLEFORMAT_INT		2	/* !signed integer data */
+#define	    SAMPLEFORMAT_IEEEFP		3	/* !IEEE floating point data */
+#define	    SAMPLEFORMAT_VOID		4	/* !untyped data */
+#define	    SAMPLEFORMAT_COMPLEXINT	5	/* !complex signed int */
+#define	    SAMPLEFORMAT_COMPLEXIEEEFP	6	/* !complex ieee floating */
+#define	TIFFTAG_SMINSAMPLEVALUE		340	/* !variable MinSampleValue */
+#define	TIFFTAG_SMAXSAMPLEVALUE		341	/* !variable MaxSampleValue */
+#define	TIFFTAG_CLIPPATH		343	/* %ClipPath
+						   [Adobe TIFF technote 2] */
+#define	TIFFTAG_XCLIPPATHUNITS		344	/* %XClipPathUnits
+						   [Adobe TIFF technote 2] */
+#define	TIFFTAG_YCLIPPATHUNITS		345	/* %YClipPathUnits
+						   [Adobe TIFF technote 2] */
+#define	TIFFTAG_INDEXED			346	/* %Indexed
+						   [Adobe TIFF Technote 3] */
+#define	TIFFTAG_JPEGTABLES		347	/* %JPEG table stream */
+#define	TIFFTAG_OPIPROXY		351	/* %OPI Proxy [Adobe TIFF technote] */
+/*
+ * Tags 512-521 are obsoleted by Technical Note #2 which specifies a
+ * revised JPEG-in-TIFF scheme.
+ */
+#define	TIFFTAG_JPEGPROC		512	/* !JPEG processing algorithm */
+#define	    JPEGPROC_BASELINE		1	/* !baseline sequential */
+#define	    JPEGPROC_LOSSLESS		14	/* !Huffman coded lossless */
+#define	TIFFTAG_JPEGIFOFFSET		513	/* !pointer to SOI marker */
+#define	TIFFTAG_JPEGIFBYTECOUNT		514	/* !JFIF stream length */
+#define	TIFFTAG_JPEGRESTARTINTERVAL	515	/* !restart interval length */
+#define	TIFFTAG_JPEGLOSSLESSPREDICTORS	517	/* !lossless proc predictor */
+#define	TIFFTAG_JPEGPOINTTRANSFORM	518	/* !lossless point transform */
+#define	TIFFTAG_JPEGQTABLES		519	/* !Q matrice offsets */
+#define	TIFFTAG_JPEGDCTABLES		520	/* !DCT table offsets */
+#define	TIFFTAG_JPEGACTABLES		521	/* !AC coefficient offsets */
+#define	TIFFTAG_YCBCRCOEFFICIENTS	529	/* !RGB -> YCbCr transform */
+#define	TIFFTAG_YCBCRSUBSAMPLING	530	/* !YCbCr subsampling factors */
+#define	TIFFTAG_YCBCRPOSITIONING	531	/* !subsample positioning */
+#define	    YCBCRPOSITION_CENTERED	1	/* !as in PostScript Level 2 */
+#define	    YCBCRPOSITION_COSITED	2	/* !as in CCIR 601-1 */
+#define	TIFFTAG_REFERENCEBLACKWHITE	532	/* !colorimetry info */
+#define	TIFFTAG_XMLPACKET		700	/* %XML packet
+						   [Adobe XMP Specification,
+						   January 2004 */
+#define TIFFTAG_OPIIMAGEID		32781	/* %OPI ImageID
+						   [Adobe TIFF technote] */
+/* tags 32952-32956 are private tags registered to Island Graphics */
+#define TIFFTAG_REFPTS			32953	/* image reference points */
+#define TIFFTAG_REGIONTACKPOINT		32954	/* region-xform tack point */
+#define TIFFTAG_REGIONWARPCORNERS	32955	/* warp quadrilateral */
+#define TIFFTAG_REGIONAFFINE		32956	/* affine transformation mat */
+/* tags 32995-32999 are private tags registered to SGI */
+#define	TIFFTAG_MATTEING		32995	/* $use ExtraSamples */
+#define	TIFFTAG_DATATYPE		32996	/* $use SampleFormat */
+#define	TIFFTAG_IMAGEDEPTH		32997	/* z depth of image */
+#define	TIFFTAG_TILEDEPTH		32998	/* z depth/data tile */
+/* tags 33300-33309 are private tags registered to Pixar */
+/*
+ * TIFFTAG_PIXAR_IMAGEFULLWIDTH and TIFFTAG_PIXAR_IMAGEFULLLENGTH
+ * are set when an image has been cropped out of a larger image.
+ * They reflect the size of the original uncropped image.
+ * The TIFFTAG_XPOSITION and TIFFTAG_YPOSITION can be used
+ * to determine the position of the smaller image in the larger one.
+ */
+#define TIFFTAG_PIXAR_IMAGEFULLWIDTH    33300   /* full image size in x */
+#define TIFFTAG_PIXAR_IMAGEFULLLENGTH   33301   /* full image size in y */
+ /* Tags 33302-33306 are used to identify special image modes and data
+  * used by Pixar's texture formats.
+  */
+#define TIFFTAG_PIXAR_TEXTUREFORMAT	33302	/* texture map format */
+#define TIFFTAG_PIXAR_WRAPMODES		33303	/* s & t wrap modes */
+#define TIFFTAG_PIXAR_FOVCOT		33304	/* cotan(fov) for env. maps */
+#define TIFFTAG_PIXAR_MATRIX_WORLDTOSCREEN 33305
+#define TIFFTAG_PIXAR_MATRIX_WORLDTOCAMERA 33306
+/* tag 33405 is a private tag registered to Eastman Kodak */
+#define TIFFTAG_WRITERSERIALNUMBER      33405   /* device serial number */
+/* tag 33432 is listed in the 6.0 spec w/ unknown ownership */
+#define	TIFFTAG_COPYRIGHT		33432	/* copyright string */
+/* IPTC TAG from RichTIFF specifications */
+#define TIFFTAG_RICHTIFFIPTC		33723
+/* 34016-34029 are reserved for ANSI IT8 TIFF/IT <dkelly@apago.com) */
+#define TIFFTAG_IT8SITE			34016	/* site name */
+#define TIFFTAG_IT8COLORSEQUENCE	34017	/* color seq. [RGB,CMYK,etc] */
+#define TIFFTAG_IT8HEADER		34018	/* DDES Header */
+#define TIFFTAG_IT8RASTERPADDING	34019	/* raster scanline padding */
+#define TIFFTAG_IT8BITSPERRUNLENGTH	34020	/* # of bits in short run */
+#define TIFFTAG_IT8BITSPEREXTENDEDRUNLENGTH 34021/* # of bits in long run */
+#define TIFFTAG_IT8COLORTABLE		34022	/* LW colortable */
+#define TIFFTAG_IT8IMAGECOLORINDICATOR	34023	/* BP/BL image color switch */
+#define TIFFTAG_IT8BKGCOLORINDICATOR	34024	/* BP/BL bg color switch */
+#define TIFFTAG_IT8IMAGECOLORVALUE	34025	/* BP/BL image color value */
+#define TIFFTAG_IT8BKGCOLORVALUE	34026	/* BP/BL bg color value */
+#define TIFFTAG_IT8PIXELINTENSITYRANGE	34027	/* MP pixel intensity value */
+#define TIFFTAG_IT8TRANSPARENCYINDICATOR 34028	/* HC transparency switch */
+#define TIFFTAG_IT8COLORCHARACTERIZATION 34029	/* color character. table */
+#define TIFFTAG_IT8HCUSAGE		34030	/* HC usage indicator */
+#define TIFFTAG_IT8TRAPINDICATOR	34031	/* Trapping indicator
+						   (untrapped=0, trapped=1) */
+#define TIFFTAG_IT8CMYKEQUIVALENT	34032	/* CMYK color equivalents */
+/* tags 34232-34236 are private tags registered to Texas Instruments */
+#define TIFFTAG_FRAMECOUNT              34232   /* Sequence Frame Count */
+/* tag 34377 is private tag registered to Adobe for PhotoShop */
+#define TIFFTAG_PHOTOSHOP		34377
+/* tags 34665, 34853 and 40965 are documented in EXIF specification */
+#define TIFFTAG_EXIFIFD			34665	/* Pointer to EXIF private directory */
+/* tag 34750 is a private tag registered to Adobe? */
+#define TIFFTAG_ICCPROFILE		34675	/* ICC profile data */
+/* tag 34750 is a private tag registered to Pixel Magic */
+#define	TIFFTAG_JBIGOPTIONS		34750	/* JBIG options */
+#define TIFFTAG_GPSIFD			34853	/* Pointer to GPS private directory */
+/* tags 34908-34914 are private tags registered to SGI */
+#define	TIFFTAG_FAXRECVPARAMS		34908	/* encoded Class 2 ses. parms */
+#define	TIFFTAG_FAXSUBADDRESS		34909	/* received SubAddr string */
+#define	TIFFTAG_FAXRECVTIME		34910	/* receive time (secs) */
+#define	TIFFTAG_FAXDCS			34911	/* encoded fax ses. params, Table 2/T.30 */
+/* tags 37439-37443 are registered to SGI <gregl@sgi.com> */
+#define TIFFTAG_STONITS			37439	/* Sample value to Nits */
+/* tag 34929 is a private tag registered to FedEx */
+#define	TIFFTAG_FEDEX_EDR		34929	/* unknown use */
+#define TIFFTAG_INTEROPERABILITYIFD	40965	/* Pointer to Interoperability private directory */
+/* Adobe Digital Negative (DNG) format tags */
+#define TIFFTAG_DNGVERSION		50706	/* &DNG version number */
+#define TIFFTAG_DNGBACKWARDVERSION	50707	/* &DNG compatibility version */
+#define TIFFTAG_UNIQUECAMERAMODEL	50708	/* &name for the camera model */
+#define TIFFTAG_LOCALIZEDCAMERAMODEL	50709	/* &localized camera model
+						   name */
+#define TIFFTAG_CFAPLANECOLOR		50710	/* &CFAPattern->LinearRaw space
+						   mapping */
+#define TIFFTAG_CFALAYOUT		50711	/* &spatial layout of the CFA */
+#define TIFFTAG_LINEARIZATIONTABLE	50712	/* &lookup table description */
+#define TIFFTAG_BLACKLEVELREPEATDIM	50713	/* &repeat pattern size for
+						   the BlackLevel tag */
+#define TIFFTAG_BLACKLEVEL		50714	/* &zero light encoding level */
+#define TIFFTAG_BLACKLEVELDELTAH	50715	/* &zero light encoding level
+						   differences (columns) */
+#define TIFFTAG_BLACKLEVELDELTAV	50716	/* &zero light encoding level
+						   differences (rows) */
+#define TIFFTAG_WHITELEVEL		50717	/* &fully saturated encoding
+						   level */
+#define TIFFTAG_DEFAULTSCALE		50718	/* &default scale factors */
+#define TIFFTAG_DEFAULTCROPORIGIN	50719	/* &origin of the final image
+						   area */
+#define TIFFTAG_DEFAULTCROPSIZE		50720	/* &size of the final image
+						   area */
+#define TIFFTAG_COLORMATRIX1		50721	/* &XYZ->reference color space
+						   transformation matrix 1 */
+#define TIFFTAG_COLORMATRIX2		50722	/* &XYZ->reference color space
+						   transformation matrix 2 */
+#define TIFFTAG_CAMERACALIBRATION1	50723	/* &calibration matrix 1 */
+#define TIFFTAG_CAMERACALIBRATION2	50724	/* &calibration matrix 2 */
+#define TIFFTAG_REDUCTIONMATRIX1	50725	/* &dimensionality reduction
+						   matrix 1 */
+#define TIFFTAG_REDUCTIONMATRIX2	50726	/* &dimensionality reduction
+						   matrix 2 */
+#define TIFFTAG_ANALOGBALANCE		50727	/* &gain applied the stored raw
+						   values*/
+#define TIFFTAG_ASSHOTNEUTRAL		50728	/* &selected white balance in
+						   linear reference space */
+#define TIFFTAG_ASSHOTWHITEXY		50729	/* &selected white balance in
+						   x-y chromaticity
+						   coordinates */
+#define TIFFTAG_BASELINEEXPOSURE	50730	/* &how much to move the zero
+						   point */
+#define TIFFTAG_BASELINENOISE		50731	/* &relative noise level */
+#define TIFFTAG_BASELINESHARPNESS	50732	/* &relative amount of
+						   sharpening */
+#define TIFFTAG_BAYERGREENSPLIT		50733	/* &how closely the values of
+						   the green pixels in the
+						   blue/green rows track the
+						   values of the green pixels
+						   in the red/green rows */
+#define TIFFTAG_LINEARRESPONSELIMIT	50734	/* &non-linear encoding range */
+#define TIFFTAG_CAMERASERIALNUMBER	50735	/* &camera's serial number */
+#define TIFFTAG_LENSINFO		50736	/* info about the lens */
+#define TIFFTAG_CHROMABLURRADIUS	50737	/* &chroma blur radius */
+#define TIFFTAG_ANTIALIASSTRENGTH	50738	/* &relative strength of the
+						   camera's anti-alias filter */
+#define TIFFTAG_SHADOWSCALE		50739	/* &used by Adobe Camera Raw */
+#define TIFFTAG_DNGPRIVATEDATA		50740	/* &manufacturer's private data */
+#define TIFFTAG_MAKERNOTESAFETY		50741	/* &whether the EXIF MakerNote
+						   tag is safe to preserve
+						   along with the rest of the
+						   EXIF data */
+#define	TIFFTAG_CALIBRATIONILLUMINANT1	50778	/* &illuminant 1 */
+#define TIFFTAG_CALIBRATIONILLUMINANT2	50779	/* &illuminant 2 */
+#define TIFFTAG_BESTQUALITYSCALE	50780	/* &best quality multiplier */
+#define TIFFTAG_RAWDATAUNIQUEID		50781	/* &unique identifier for
+						   the raw image data */
+#define TIFFTAG_ORIGINALRAWFILENAME	50827	/* &file name of the original
+						   raw file */
+#define TIFFTAG_ORIGINALRAWFILEDATA	50828	/* &contents of the original
+						   raw file */
+#define TIFFTAG_ACTIVEAREA		50829	/* &active (non-masked) pixels
+						   of the sensor */
+#define TIFFTAG_MASKEDAREAS		50830	/* &list of coordinates
+						   of fully masked pixels */
+#define TIFFTAG_ASSHOTICCPROFILE	50831	/* &these two tags used to */
+#define TIFFTAG_ASSHOTPREPROFILEMATRIX	50832	/* map cameras's color space
+						   into ICC profile space */
+#define TIFFTAG_CURRENTICCPROFILE	50833	/* & */
+#define TIFFTAG_CURRENTPREPROFILEMATRIX	50834	/* & */
+/* tag 65535 is an undefined tag used by Eastman Kodak */
+#define TIFFTAG_DCSHUESHIFTVALUES       65535   /* hue shift correction data */
+
+/*
+ * The following are ``pseudo tags'' that can be used to control
+ * codec-specific functionality.  These tags are not written to file.
+ * Note that these values start at 0xffff+1 so that they'll never
+ * collide with Aldus-assigned tags.
+ *
+ * If you want your private pseudo tags ``registered'' (i.e. added to
+ * this file), please post a bug report via the tracking system at
+ * http://www.remotesensing.org/libtiff/bugs.html with the appropriate
+ * C definitions to add.
+ */
+#define	TIFFTAG_FAXMODE			65536	/* Group 3/4 format control */
+#define	    FAXMODE_CLASSIC	0x0000		/* default, include RTC */
+#define	    FAXMODE_NORTC	0x0001		/* no RTC at end of data */
+#define	    FAXMODE_NOEOL	0x0002		/* no EOL code at end of row */
+#define	    FAXMODE_BYTEALIGN	0x0004		/* byte align row */
+#define	    FAXMODE_WORDALIGN	0x0008		/* word align row */
+#define	    FAXMODE_CLASSF	FAXMODE_NORTC	/* TIFF Class F */
+#define	TIFFTAG_JPEGQUALITY		65537	/* Compression quality level */
+/* Note: quality level is on the IJG 0-100 scale.  Default value is 75 */
+#define	TIFFTAG_JPEGCOLORMODE		65538	/* Auto RGB<=>YCbCr convert? */
+#define	    JPEGCOLORMODE_RAW	0x0000		/* no conversion (default) */
+#define	    JPEGCOLORMODE_RGB	0x0001		/* do auto conversion */
+#define	TIFFTAG_JPEGTABLESMODE		65539	/* What to put in JPEGTables */
+#define	    JPEGTABLESMODE_QUANT 0x0001		/* include quantization tbls */
+#define	    JPEGTABLESMODE_HUFF	0x0002		/* include Huffman tbls */
+/* Note: default is JPEGTABLESMODE_QUANT | JPEGTABLESMODE_HUFF */
+#define	TIFFTAG_FAXFILLFUNC		65540	/* G3/G4 fill function */
+#define	TIFFTAG_PIXARLOGDATAFMT		65549	/* PixarLogCodec I/O data sz */
+#define	    PIXARLOGDATAFMT_8BIT	0	/* regular u_char samples */
+#define	    PIXARLOGDATAFMT_8BITABGR	1	/* ABGR-order u_chars */
+#define	    PIXARLOGDATAFMT_11BITLOG	2	/* 11-bit log-encoded (raw) */
+#define	    PIXARLOGDATAFMT_12BITPICIO	3	/* as per PICIO (1.0==2048) */
+#define	    PIXARLOGDATAFMT_16BIT	4	/* signed short samples */
+#define	    PIXARLOGDATAFMT_FLOAT	5	/* IEEE float samples */
+/* 65550-65556 are allocated to Oceana Matrix <dev@oceana.com> */
+#define TIFFTAG_DCSIMAGERTYPE           65550   /* imager model & filter */
+#define     DCSIMAGERMODEL_M3           0       /* M3 chip (1280 x 1024) */
+#define     DCSIMAGERMODEL_M5           1       /* M5 chip (1536 x 1024) */
+#define     DCSIMAGERMODEL_M6           2       /* M6 chip (3072 x 2048) */
+#define     DCSIMAGERFILTER_IR          0       /* infrared filter */
+#define     DCSIMAGERFILTER_MONO        1       /* monochrome filter */
+#define     DCSIMAGERFILTER_CFA         2       /* color filter array */
+#define     DCSIMAGERFILTER_OTHER       3       /* other filter */
+#define TIFFTAG_DCSINTERPMODE           65551   /* interpolation mode */
+#define     DCSINTERPMODE_NORMAL        0x0     /* whole image, default */
+#define     DCSINTERPMODE_PREVIEW       0x1     /* preview of image (384x256) */
+#define TIFFTAG_DCSBALANCEARRAY         65552   /* color balance values */
+#define TIFFTAG_DCSCORRECTMATRIX        65553   /* color correction values */
+#define TIFFTAG_DCSGAMMA                65554   /* gamma value */
+#define TIFFTAG_DCSTOESHOULDERPTS       65555   /* toe & shoulder points */
+#define TIFFTAG_DCSCALIBRATIONFD        65556   /* calibration file desc */
+/* Note: quality level is on the ZLIB 1-9 scale. Default value is -1 */
+#define	TIFFTAG_ZIPQUALITY		65557	/* compression quality level */
+#define	TIFFTAG_PIXARLOGQUALITY		65558	/* PixarLog uses same scale */
+/* 65559 is allocated to Oceana Matrix <dev@oceana.com> */
+#define TIFFTAG_DCSCLIPRECTANGLE	65559	/* area of image to acquire */
+#define TIFFTAG_SGILOGDATAFMT		65560	/* SGILog user data format */
+#define     SGILOGDATAFMT_FLOAT		0	/* IEEE float samples */
+#define     SGILOGDATAFMT_16BIT		1	/* 16-bit samples */
+#define     SGILOGDATAFMT_RAW		2	/* uninterpreted data */
+#define     SGILOGDATAFMT_8BIT		3	/* 8-bit RGB monitor values */
+#define TIFFTAG_SGILOGENCODE		65561 /* SGILog data encoding control*/
+#define     SGILOGENCODE_NODITHER	0     /* do not dither encoded values*/
+#define     SGILOGENCODE_RANDITHER	1     /* randomly dither encd values */
+
+/*
+ * EXIF tags
+ */
+#define EXIFTAG_EXPOSURETIME		33434	/* Exposure time */
+#define EXIFTAG_FNUMBER			33437	/* F number */
+#define EXIFTAG_EXPOSUREPROGRAM		34850	/* Exposure program */
+#define EXIFTAG_SPECTRALSENSITIVITY	34852	/* Spectral sensitivity */
+#define EXIFTAG_ISOSPEEDRATINGS		34855	/* ISO speed rating */
+#define EXIFTAG_OECF			34856	/* Optoelectric conversion
+						   factor */
+#define EXIFTAG_EXIFVERSION		36864	/* Exif version */
+#define EXIFTAG_DATETIMEORIGINAL	36867	/* Date and time of original
+						   data generation */
+#define EXIFTAG_DATETIMEDIGITIZED	36868	/* Date and time of digital
+						   data generation */
+#define EXIFTAG_COMPONENTSCONFIGURATION	37121	/* Meaning of each component */
+#define EXIFTAG_COMPRESSEDBITSPERPIXEL	37122	/* Image compression mode */
+#define EXIFTAG_SHUTTERSPEEDVALUE	37377	/* Shutter speed */
+#define EXIFTAG_APERTUREVALUE		37378	/* Aperture */
+#define EXIFTAG_BRIGHTNESSVALUE		37379	/* Brightness */
+#define EXIFTAG_EXPOSUREBIASVALUE	37380	/* Exposure bias */
+#define EXIFTAG_MAXAPERTUREVALUE	37381	/* Maximum lens aperture */
+#define EXIFTAG_SUBJECTDISTANCE		37382	/* Subject distance */
+#define EXIFTAG_METERINGMODE		37383	/* Metering mode */
+#define EXIFTAG_LIGHTSOURCE		37384	/* Light source */
+#define EXIFTAG_FLASH			37385	/* Flash */
+#define EXIFTAG_FOCALLENGTH		37386	/* Lens focal length */
+#define EXIFTAG_SUBJECTAREA		37396	/* Subject area */
+#define EXIFTAG_MAKERNOTE		37500	/* Manufacturer notes */
+#define EXIFTAG_USERCOMMENT		37510	/* User comments */
+#define EXIFTAG_SUBSECTIME		37520	/* DateTime subseconds */
+#define EXIFTAG_SUBSECTIMEORIGINAL	37521	/* DateTimeOriginal subseconds */
+#define EXIFTAG_SUBSECTIMEDIGITIZED	37522	/* DateTimeDigitized subseconds */
+#define EXIFTAG_FLASHPIXVERSION		40960	/* Supported Flashpix version */
+#define EXIFTAG_COLORSPACE		40961	/* Color space information */
+#define EXIFTAG_PIXELXDIMENSION		40962	/* Valid image width */
+#define EXIFTAG_PIXELYDIMENSION		40963	/* Valid image height */
+#define EXIFTAG_RELATEDSOUNDFILE	40964	/* Related audio file */
+#define EXIFTAG_FLASHENERGY		41483	/* Flash energy */
+#define EXIFTAG_SPATIALFREQUENCYRESPONSE 41484	/* Spatial frequency response */
+#define EXIFTAG_FOCALPLANEXRESOLUTION	41486	/* Focal plane X resolution */
+#define EXIFTAG_FOCALPLANEYRESOLUTION	41487	/* Focal plane Y resolution */
+#define EXIFTAG_FOCALPLANERESOLUTIONUNIT 41488	/* Focal plane resolution unit */
+#define EXIFTAG_SUBJECTLOCATION		41492	/* Subject location */
+#define EXIFTAG_EXPOSUREINDEX		41493	/* Exposure index */
+#define EXIFTAG_SENSINGMETHOD		41495	/* Sensing method */
+#define EXIFTAG_FILESOURCE		41728	/* File source */
+#define EXIFTAG_SCENETYPE		41729	/* Scene type */
+#define EXIFTAG_CFAPATTERN		41730	/* CFA pattern */
+#define EXIFTAG_CUSTOMRENDERED		41985	/* Custom image processing */
+#define EXIFTAG_EXPOSUREMODE		41986	/* Exposure mode */
+#define EXIFTAG_WHITEBALANCE		41987	/* White balance */
+#define EXIFTAG_DIGITALZOOMRATIO	41988	/* Digital zoom ratio */
+#define EXIFTAG_FOCALLENGTHIN35MMFILM	41989	/* Focal length in 35 mm film */
+#define EXIFTAG_SCENECAPTURETYPE	41990	/* Scene capture type */
+#define EXIFTAG_GAINCONTROL		41991	/* Gain control */
+#define EXIFTAG_CONTRAST		41992	/* Contrast */
+#define EXIFTAG_SATURATION		41993	/* Saturation */
+#define EXIFTAG_SHARPNESS		41994	/* Sharpness */
+#define EXIFTAG_DEVICESETTINGDESCRIPTION 41995	/* Device settings description */
+#define EXIFTAG_SUBJECTDISTANCERANGE	41996	/* Subject distance range */
+#define EXIFTAG_GAINCONTROL		41991	/* Gain control */
+#define EXIFTAG_GAINCONTROL		41991	/* Gain control */
+#define EXIFTAG_IMAGEUNIQUEID		42016	/* Unique image ID */
+
+#endif /* _TIFF_ */
+
+/* vim: set ts=8 sts=8 sw=8 noet: */
diff --git a/uppsrc/plugin/tif/lib/tiffcomp.h b/uppsrc/plugin/tif/lib/tiffcomp.h
new file mode 100644
index 000000000..3918adf7c
--- /dev/null
+++ b/uppsrc/plugin/tif/lib/tiffcomp.h
@@ -0,0 +1,214 @@
+/* $Header: /cvsroot/upp/uppsrc/plugin/tif/lib/tiffcomp.h,v 1.1 2005/02/07 00:26:06 rylek Exp $ */
+
+/*
+ * Copyright (c) 1990-1997 Sam Leffler
+ * Copyright (c) 1991-1997 Silicon Graphics, Inc.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and
+ * its documentation for any purpose is hereby granted without fee, provided
+ * that (i) the above copyright notices and this permission notice appear in
+ * all copies of the software and related documentation, and (ii) the names of
+ * Sam Leffler and Silicon Graphics may not be used in any advertising or
+ * publicity relating to the software without the specific, prior written
+ * permission of Sam Leffler and Silicon Graphics.
+ *
+ * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+ * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
+ * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
+ * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+ * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
+ * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.
+ */
+
+#ifndef _COMPAT_
+#define	_COMPAT_
+/*
+ * This file contains a hodgepodge of definitions and
+ * declarations that are needed to provide compatibility
+ * between the native system and the base implementation
+ * that the library assumes.
+ *
+ * NB: This file is a mess.
+ */
+
+/*
+ * Setup basic type definitions and function declaratations.
+ */
+
+/*
+ * Simplify Acorn RISC OS identifier (to avoid confusion with Acorn RISC iX
+ * and with defunct Unix Risc OS)
+ * No need to specify __arm - hey, Acorn might port the OS, no problem here!
+ */
+#ifdef __acornriscos
+#undef __acornriscos
+#endif
+#if defined(__acorn) && defined(__riscos)
+#define __acornriscos
+#endif
+
+#if defined(__MWERKS__) || defined(THINK_C)
+#include <unix.h>
+#include <math.h>
+#endif
+
+#include <stdio.h>
+
+#if defined(__PPCC__) || defined(__SC__) || defined(__MRC__)
+#include <types.h>
+#elif !defined(__MWERKS__) && !defined(THINK_C) && !defined(__acornriscos) && !defined(applec)
+#include <sys/types.h>
+#endif
+
+#if defined(VMS)
+#include <file.h>
+#include <unixio.h>
+#elif !defined(__acornriscos)
+#include <fcntl.h>
+#endif
+
+/*
+ * This maze of checks controls defines or not the
+ * target system has BSD-style typdedefs declared in
+ * an include file and/or whether or not to include
+ * <unistd.h> to get the SEEK_* definitions.  Some
+ * additional includes are also done to pull in the
+ * appropriate definitions we're looking for.
+ */
+#if defined(__MWERKS__) || defined(THINK_C) || defined(__PPCC__) || defined(__SC__) || defined(__MRC__)
+#include <stdlib.h>
+#define	BSDTYPES
+#define	HAVE_UNISTD_H	0
+#elif (defined(_WINDOWS) || defined(__WIN32__) || defined(_Windows) || defined(_WIN32)) && !defined(unix)
+#define	BSDTYPES
+#elif defined(OS2_16) || defined(OS2_32)
+#define	BSDTYPES
+#elif defined(__acornriscos)
+#include <stdlib.h>
+#define	BSDTYPES
+#define	HAVE_UNISTD_H	0
+#elif defined(VMS)
+#define	HAVE_UNISTD_H	0
+#else
+#define	HAVE_UNISTD_H	1
+#endif
+
+/*
+ * The library uses the ANSI C/POSIX SEEK_*
+ * definitions that should be defined in unistd.h
+ * (except on system where they are in stdio.h and
+ * there is no unistd.h).
+ */
+#if !defined(SEEK_SET) && HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+/*
+ * The library uses memset, memcpy, and memcmp.
+ * ANSI C and System V define these in string.h.
+ */
+#include <string.h>
+
+/*
+ * The BSD typedefs are used throughout the library.
+ * If your system doesn't have them in <sys/types.h>,
+ * then define BSDTYPES in your Makefile.
+ */
+#if defined(BSDTYPES)
+typedef	unsigned char u_char;
+typedef	unsigned short u_short;
+typedef	unsigned int u_int;
+typedef	unsigned long u_long;
+#endif
+
+/*
+ * dblparam_t is the type that a double precision
+ * floating point value will have on the parameter
+ * stack (when coerced by the compiler).
+ */
+/* Note: on MacPowerPC "extended" is undefined. So only use it for 68K-Macs */
+#if defined(__SC__) || defined(THINK_C)
+typedef extended dblparam_t;
+#else
+typedef double dblparam_t;
+#endif
+
+/*
+ * If your compiler supports inline functions, then
+ * set INLINE appropriately to get the known hotspots
+ * in the library expanded inline.
+ */
+#if defined(__GNUC__)
+#if defined(__STRICT_ANSI__)
+#define	INLINE	__inline__
+#else
+#define	INLINE	inline
+#endif
+#else /* !__GNUC__ */
+#define	INLINE
+#endif
+
+/*
+ * GLOBALDATA is a macro that is used to define global variables
+ * private to the library.  We use this indirection to hide
+ * brain-damage in VAXC (and GCC) under VAX/VMS.  In these
+ * environments the macro places the variable in a non-shareable
+ * program section, which ought to be done by default (sigh!)
+ *
+ * Apparently DEC are aware of the problem as this behaviour is the
+ * default under VMS on AXP.
+ *
+ * The GNU C variant is untested.
+ */
+#if defined(VAX) && defined(VMS)
+#if defined(VAXC)
+#define GLOBALDATA(TYPE,NAME)	extern noshare TYPE NAME
+#endif
+#if defined(__GNUC__)
+#define GLOBALDATA(TYPE,NAME)	extern TYPE NAME \
+	asm("_$$PsectAttributes_NOSHR$$" #NAME)
+#endif
+#else	/* !VAX/VMS */
+#define GLOBALDATA(TYPE,NAME)	extern TYPE NAME
+#endif
+
+#if defined(__acornriscos)
+/*
+ * osfcn.h is part of C++Lib on Acorn C/C++, and as such can't be used
+ * on C alone. For that reason, the relevant functions are
+ * implemented in tif_acorn.c, and the elements from the header
+ * file are included here.
+ */
+#if defined(__cplusplus)
+#include <osfcn.h>
+#else
+#define	O_RDONLY	0
+#define	O_WRONLY	1
+#define	O_RDWR		2
+#define	O_APPEND	8
+#define	O_CREAT		0x200
+#define	O_TRUNC		0x400
+typedef long off_t;
+extern int open(const char *name, int flags, int mode);
+extern int close(int fd);
+extern int write(int fd, const char *buf, int nbytes);
+extern int read(int fd, char *buf, int nbytes);
+extern off_t lseek(int fd, off_t offset, int whence);
+extern int creat(const char *path, int mode);
+#endif /* __cplusplus */
+#endif /* __acornriscos */
+
+/* Bit and byte order, the default is MSB to LSB */
+#ifdef VMS
+#undef HOST_FILLORDER
+#undef HOST_BIGENDIAN
+#define HOST_FILLORDER FILLORDER_LSB2MSB
+#define HOST_BIGENDIAN	0
+#endif
+
+
+#endif /* _COMPAT_ */
diff --git a/uppsrc/plugin/tif/lib/tiffconf.h b/uppsrc/plugin/tif/lib/tiffconf.h
new file mode 100644
index 000000000..bf8893863
--- /dev/null
+++ b/uppsrc/plugin/tif/lib/tiffconf.h
@@ -0,0 +1,101 @@
+/* libtiff/tiffconf.h.  Generated by configure.  */
+/*
+  Configuration defines for installed libtiff.
+  This file maintained for backward compatibility. Do not use definitions
+  from this file in your programs.
+*/
+
+#ifndef _TIFFCONF_
+#define _TIFFCONF_
+
+/* Define to 1 if the system has the type `int16'. */
+/* #undef HAVE_INT16 */
+
+/* Define to 1 if the system has the type `int32'. */
+/* #undef HAVE_INT32 */
+
+/* Define to 1 if the system has the type `int8'. */
+/* #undef HAVE_INT8 */
+
+/* The size of a `int', as computed by sizeof. */
+#define SIZEOF_INT 4
+
+/* The size of a `long', as computed by sizeof. */
+#define SIZEOF_LONG 4
+
+/* Compatibility stuff. */
+
+/* Define as 0 or 1 according to the floating point format suported by the
+   machine */
+#define HAVE_IEEEFP 1
+
+/* Set the native cpu bit order (FILLORDER_LSB2MSB or FILLORDER_MSB2LSB) */
+#define HOST_FILLORDER FILLORDER_LSB2MSB
+
+/* Native cpu byte order: 1 if big-endian (Motorola) or 0 if little-endian
+   (Intel) */
+#define HOST_BIGENDIAN 0
+
+/* Support CCITT Group 3 & 4 algorithms */
+#define CCITT_SUPPORT 1
+
+/* Support JPEG compression (requires IJG JPEG library) */
+#define JPEG_SUPPORT 1
+
+/* Support LogLuv high dynamic range encoding */
+#define LOGLUV_SUPPORT 1
+
+/* Support LZW algorithm */
+#define LZW_SUPPORT 1
+
+/* Support NeXT 2-bit RLE algorithm */
+#define NEXT_SUPPORT 1
+
+/* Support Old JPEG compresson (read contrib/ojpeg/README first! Compilation
+   fails with unpatched IJG JPEG library) */
+/* #undef OJPEG_SUPPORT */
+
+/* Support Macintosh PackBits algorithm */
+#define PACKBITS_SUPPORT 1
+
+/* Support Pixar log-format algorithm (requires Zlib) */
+#define PIXARLOG_SUPPORT 1
+
+/* Support ThunderScan 4-bit RLE algorithm */
+#define THUNDER_SUPPORT 1
+
+/* Support Deflate compression */
+#define ZIP_SUPPORT 1
+
+/* Support strip chopping (whether or not to convert single-strip uncompressed
+   images to mutiple strips of ~8Kb to reduce memory usage) */
+#define STRIPCHOP_DEFAULT TIFF_STRIPCHOP
+
+/* Enable SubIFD tag (330) support */
+#define SUBIFD_SUPPORT 1
+
+/* Treat extra sample as alpha (default enabled). The RGBA interface will
+   treat a fourth sample with no EXTRASAMPLE_ value as being ASSOCALPHA. Many
+   packages produce RGBA files but don't mark the alpha properly. */
+#define DEFAULT_EXTRASAMPLE_AS_ALPHA 1
+
+/* Pick up YCbCr subsampling info from the JPEG data stream to support files
+   lacking the tag (default enabled). */
+#define CHECK_JPEG_YCBCR_SUBSAMPLING 1
+
+/* Support MS MDI magic number files as TIFF */
+#define MDI_SUPPORT 1
+
+/*
+ * Feature support definitions.
+ * XXX: These macros are obsoleted. Don't use them in your apps!
+ * Macros stays here for backward compatibility and should be always defined.
+ */
+#define COLORIMETRY_SUPPORT
+#define YCBCR_SUPPORT
+#define CMYK_SUPPORT
+#define ICC_SUPPORT
+#define PHOTOSHOP_SUPPORT
+#define IPTC_SUPPORT
+
+#endif /* _TIFFCONF_ */
diff --git a/uppsrc/plugin/tif/lib/tiffconf.h.in b/uppsrc/plugin/tif/lib/tiffconf.h.in
new file mode 100644
index 000000000..1b266e8db
--- /dev/null
+++ b/uppsrc/plugin/tif/lib/tiffconf.h.in
@@ -0,0 +1,100 @@
+/*
+  Configuration defines for installed libtiff.
+  This file maintained for backward compatibility. Do not use definitions
+  from this file in your programs.
+*/
+
+#ifndef _TIFFCONF_
+#define _TIFFCONF_
+
+/* Define to 1 if the system has the type `int16'. */
+#undef HAVE_INT16
+
+/* Define to 1 if the system has the type `int32'. */
+#undef HAVE_INT32
+
+/* Define to 1 if the system has the type `int8'. */
+#undef HAVE_INT8
+
+/* The size of a `int', as computed by sizeof. */
+#undef SIZEOF_INT
+
+/* The size of a `long', as computed by sizeof. */
+#undef SIZEOF_LONG
+
+/* Compatibility stuff. */
+
+/* Define as 0 or 1 according to the floating point format suported by the
+   machine */
+#undef HAVE_IEEEFP
+
+/* Set the native cpu bit order (FILLORDER_LSB2MSB or FILLORDER_MSB2LSB) */
+#undef HOST_FILLORDER
+
+/* Native cpu byte order: 1 if big-endian (Motorola) or 0 if little-endian
+   (Intel) */
+#undef HOST_BIGENDIAN
+
+/* Support CCITT Group 3 & 4 algorithms */
+#undef CCITT_SUPPORT
+
+/* Support JPEG compression (requires IJG JPEG library) */
+#undef JPEG_SUPPORT
+
+/* Support LogLuv high dynamic range encoding */
+#undef LOGLUV_SUPPORT
+
+/* Support LZW algorithm */
+#undef LZW_SUPPORT
+
+/* Support NeXT 2-bit RLE algorithm */
+#undef NEXT_SUPPORT
+
+/* Support Old JPEG compresson (read contrib/ojpeg/README first! Compilation
+   fails with unpatched IJG JPEG library) */
+#undef OJPEG_SUPPORT
+
+/* Support Macintosh PackBits algorithm */
+#undef PACKBITS_SUPPORT
+
+/* Support Pixar log-format algorithm (requires Zlib) */
+#undef PIXARLOG_SUPPORT
+
+/* Support ThunderScan 4-bit RLE algorithm */
+#undef THUNDER_SUPPORT
+
+/* Support Deflate compression */
+#undef ZIP_SUPPORT
+
+/* Support strip chopping (whether or not to convert single-strip uncompressed
+   images to mutiple strips of ~8Kb to reduce memory usage) */
+#undef STRIPCHOP_DEFAULT
+
+/* Enable SubIFD tag (330) support */
+#undef SUBIFD_SUPPORT
+
+/* Treat extra sample as alpha (default enabled). The RGBA interface will
+   treat a fourth sample with no EXTRASAMPLE_ value as being ASSOCALPHA. Many
+   packages produce RGBA files but don't mark the alpha properly. */
+#undef DEFAULT_EXTRASAMPLE_AS_ALPHA
+
+/* Pick up YCbCr subsampling info from the JPEG data stream to support files
+   lacking the tag (default enabled). */
+#undef CHECK_JPEG_YCBCR_SUBSAMPLING
+
+/* Support MS MDI magic number files as TIFF */
+#undef MDI_SUPPORT
+
+/*
+ * Feature support definitions.
+ * XXX: These macros are obsoleted. Don't use them in your apps!
+ * Macros stays here for backward compatibility and should be always defined.
+ */
+#define COLORIMETRY_SUPPORT
+#define YCBCR_SUPPORT
+#define CMYK_SUPPORT
+#define ICC_SUPPORT
+#define PHOTOSHOP_SUPPORT
+#define IPTC_SUPPORT
+
+#endif /* _TIFFCONF_ */
diff --git a/uppsrc/plugin/tif/lib/tiffconf.h.vc b/uppsrc/plugin/tif/lib/tiffconf.h.vc
new file mode 100644
index 000000000..18c0a1b3f
--- /dev/null
+++ b/uppsrc/plugin/tif/lib/tiffconf.h.vc
@@ -0,0 +1,97 @@
+/*
+  Configuration defines for installed libtiff.
+  This file maintained for backward compatibility. Do not use definitions
+  from this file in your programs.
+*/
+
+#ifndef _TIFFCONF_
+#define _TIFFCONF_
+
+/* Define to 1 if the system has the type `int16'. */
+/* #undef HAVE_INT16 */
+
+/* Define to 1 if the system has the type `int32'. */
+/* #undef HAVE_INT32 */
+
+/* Define to 1 if the system has the type `int8'. */
+/* #undef HAVE_INT8 */
+
+/* The size of a `int', as computed by sizeof. */
+#define SIZEOF_INT 4
+
+/* The size of a `long', as computed by sizeof. */
+#define SIZEOF_LONG 4
+
+/* Compatibility stuff. */
+
+/* Define as 0 or 1 according to the floating point format suported by the
+   machine */
+#define HAVE_IEEEFP 1
+
+/* Set the native cpu bit order (FILLORDER_LSB2MSB or FILLORDER_MSB2LSB) */
+#define HOST_FILLORDER FILLORDER_LSB2MSB
+
+/* Native cpu byte order: 1 if big-endian (Motorola) or 0 if little-endian
+   (Intel) */
+#define HOST_BIGENDIAN 0
+
+/* Support CCITT Group 3 & 4 algorithms */
+#define CCITT_SUPPORT 1
+
+/* Support JPEG compression (requires IJG JPEG library) */
+/* #undef JPEG_SUPPORT */
+
+/* Support LogLuv high dynamic range encoding */
+#define LOGLUV_SUPPORT 1
+
+/* Support LZW algorithm */
+#define LZW_SUPPORT 1
+
+/* Support NeXT 2-bit RLE algorithm */
+#define NEXT_SUPPORT 1
+
+/* Support Old JPEG compresson (read contrib/ojpeg/README first! Compilation
+   fails with unpatched IJG JPEG library) */
+/* #undef OJPEG_SUPPORT */
+
+/* Support Macintosh PackBits algorithm */
+#define PACKBITS_SUPPORT 1
+
+/* Support Pixar log-format algorithm (requires Zlib) */
+/* #undef PIXARLOG_SUPPORT */
+
+/* Support ThunderScan 4-bit RLE algorithm */
+#define THUNDER_SUPPORT 1
+
+/* Support Deflate compression */
+/* #undef ZIP_SUPPORT */
+
+/* Support strip chopping (whether or not to convert single-strip uncompressed
+   images to mutiple strips of ~8Kb to reduce memory usage) */
+#define STRIPCHOP_DEFAULT TIFF_STRIPCHOP
+
+/* Enable SubIFD tag (330) support */
+#define SUBIFD_SUPPORT 1
+
+/* Treat extra sample as alpha (default enabled). The RGBA interface will
+   treat a fourth sample with no EXTRASAMPLE_ value as being ASSOCALPHA. Many
+   packages produce RGBA files but don't mark the alpha properly. */
+#define DEFAULT_EXTRASAMPLE_AS_ALPHA 1
+
+/* Pick up YCbCr subsampling info from the JPEG data stream to support files
+   lacking the tag (default enabled). */
+#define CHECK_JPEG_YCBCR_SUBSAMPLING 1
+
+/*
+ * Feature support definitions.
+ * XXX: These macros are obsoleted. Don't use them in your apps!
+ * Macros stays here for backward compatibility and should be always defined.
+ */
+#define COLORIMETRY_SUPPORT
+#define YCBCR_SUPPORT
+#define CMYK_SUPPORT
+#define ICC_SUPPORT
+#define PHOTOSHOP_SUPPORT
+#define IPTC_SUPPORT
+
+#endif /* _TIFFCONF_ */
diff --git a/uppsrc/plugin/tif/lib/tiffio.h b/uppsrc/plugin/tif/lib/tiffio.h
new file mode 100644
index 000000000..4cd6965b3
--- /dev/null
+++ b/uppsrc/plugin/tif/lib/tiffio.h
@@ -0,0 +1,515 @@
+/* $Id: tiffio.h,v 1.50 2006/03/21 16:37:51 dron Exp $ */
+
+/*
+ * Copyright (c) 1988-1997 Sam Leffler
+ * Copyright (c) 1991-1997 Silicon Graphics, Inc.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and
+ * its documentation for any purpose is hereby granted without fee, provided
+ * that (i) the above copyright notices and this permission notice appear in
+ * all copies of the software and related documentation, and (ii) the names of
+ * Sam Leffler and Silicon Graphics may not be used in any advertising or
+ * publicity relating to the software without the specific, prior written
+ * permission of Sam Leffler and Silicon Graphics.
+ *
+ * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+ * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
+ * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
+ * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+ * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
+ * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.
+ */
+
+#ifndef _TIFFIO_
+#define	_TIFFIO_
+
+/*
+ * TIFF I/O Library Definitions.
+ */
+#include "tiff.h"
+#include "tiffvers.h"
+
+/*
+ * TIFF is defined as an incomplete type to hide the
+ * library's internal data structures from clients.
+ */
+typedef	struct tiff TIFF;
+
+/*
+ * The following typedefs define the intrinsic size of
+ * data types used in the *exported* interfaces.  These
+ * definitions depend on the proper definition of types
+ * in tiff.h.  Note also that the varargs interface used
+ * to pass tag types and values uses the types defined in
+ * tiff.h directly.
+ *
+ * NB: ttag_t is unsigned int and not unsigned short because
+ *     ANSI C requires that the type before the ellipsis be a
+ *     promoted type (i.e. one of int, unsigned int, pointer,
+ *     or double) and because we defined pseudo-tags that are
+ *     outside the range of legal Aldus-assigned tags.
+ * NB: tsize_t is int32 and not uint32 because some functions
+ *     return -1.
+ * NB: toff_t is not off_t for many reasons; TIFFs max out at
+ *     32-bit file offsets being the most important, and to ensure
+ *     that it is unsigned, rather than signed.
+ */
+typedef	uint32 ttag_t;		/* directory tag */
+typedef	uint16 tdir_t;		/* directory index */
+typedef	uint16 tsample_t;	/* sample number */
+typedef	uint32 tstrip_t;	/* strip number */
+typedef uint32 ttile_t;		/* tile number */
+typedef	int32 tsize_t;		/* i/o size in bytes */
+typedef	void* tdata_t;		/* image data ref */
+typedef	uint32 toff_t;		/* file offset */
+
+#if !defined(__WIN32__) && (defined(_WIN32) || defined(WIN32))
+#define __WIN32__
+#endif
+
+/*
+ * On windows you should define USE_WIN32_FILEIO if you are using tif_win32.c
+ * or AVOID_WIN32_FILEIO if you are using something else (like tif_unix.c).
+ *
+ * By default tif_unix.c is assumed.
+ */
+
+#if defined(_WINDOWS) || defined(__WIN32__) || defined(_Windows)
+#  if !defined(__CYGWIN) && !defined(AVOID_WIN32_FILEIO) && !defined(USE_WIN32_FILEIO)
+#    define AVOID_WIN32_FILEIO
+#  endif
+#endif
+
+#if defined(USE_WIN32_FILEIO)
+# define VC_EXTRALEAN
+# include <windows.h>
+# ifdef __WIN32__
+DECLARE_HANDLE(thandle_t);	/* Win32 file handle */
+# else
+typedef	HFILE thandle_t;	/* client data handle */
+# endif /* __WIN32__ */
+#else
+typedef	void* thandle_t;	/* client data handle */
+#endif /* USE_WIN32_FILEIO */
+
+#ifndef NULL
+# define NULL	(void *)0
+#endif
+
+/*
+ * Flags to pass to TIFFPrintDirectory to control
+ * printing of data structures that are potentially
+ * very large.   Bit-or these flags to enable printing
+ * multiple items.
+ */
+#define	TIFFPRINT_NONE		0x0		/* no extra info */
+#define	TIFFPRINT_STRIPS	0x1		/* strips/tiles info */
+#define	TIFFPRINT_CURVES	0x2		/* color/gray response curves */
+#define	TIFFPRINT_COLORMAP	0x4		/* colormap */
+#define	TIFFPRINT_JPEGQTABLES	0x100		/* JPEG Q matrices */
+#define	TIFFPRINT_JPEGACTABLES	0x200		/* JPEG AC tables */
+#define	TIFFPRINT_JPEGDCTABLES	0x200		/* JPEG DC tables */
+
+/*
+ * Colour conversion stuff
+ */
+
+/* reference white */
+#define D65_X0 (95.0470F)
+#define D65_Y0 (100.0F)
+#define D65_Z0 (108.8827F)
+
+#define D50_X0 (96.4250F)
+#define D50_Y0 (100.0F)
+#define D50_Z0 (82.4680F)
+
+/* Structure for holding information about a display device. */
+
+typedef	unsigned char TIFFRGBValue;		/* 8-bit samples */
+
+typedef struct {
+	float d_mat[3][3]; 		/* XYZ -> luminance matrix */
+	float d_YCR;			/* Light o/p for reference white */
+	float d_YCG;
+	float d_YCB;
+	uint32 d_Vrwr;			/* Pixel values for ref. white */
+	uint32 d_Vrwg;
+	uint32 d_Vrwb;
+	float d_Y0R;			/* Residual light for black pixel */
+	float d_Y0G;
+	float d_Y0B;
+	float d_gammaR;			/* Gamma values for the three guns */
+	float d_gammaG;
+	float d_gammaB;
+} TIFFDisplay;
+
+typedef struct {				/* YCbCr->RGB support */
+	TIFFRGBValue* clamptab;			/* range clamping table */
+	int*	Cr_r_tab;
+	int*	Cb_b_tab;
+	int32*	Cr_g_tab;
+	int32*	Cb_g_tab;
+        int32*  Y_tab;
+} TIFFYCbCrToRGB;
+
+typedef struct {				/* CIE Lab 1976->RGB support */
+	int	range;				/* Size of conversion table */
+#define CIELABTORGB_TABLE_RANGE 1500
+	float	rstep, gstep, bstep;
+	float	X0, Y0, Z0;			/* Reference white point */
+	TIFFDisplay display;
+	float	Yr2r[CIELABTORGB_TABLE_RANGE + 1];  /* Conversion of Yr to r */
+	float	Yg2g[CIELABTORGB_TABLE_RANGE + 1];  /* Conversion of Yg to g */
+	float	Yb2b[CIELABTORGB_TABLE_RANGE + 1];  /* Conversion of Yb to b */
+} TIFFCIELabToRGB;
+
+/*
+ * RGBA-style image support.
+ */
+typedef struct _TIFFRGBAImage TIFFRGBAImage;
+/*
+ * The image reading and conversion routines invoke
+ * ``put routines'' to copy/image/whatever tiles of
+ * raw image data.  A default set of routines are
+ * provided to convert/copy raw image data to 8-bit
+ * packed ABGR format rasters.  Applications can supply
+ * alternate routines that unpack the data into a
+ * different format or, for example, unpack the data
+ * and draw the unpacked raster on the display.
+ */
+typedef void (*tileContigRoutine)
+    (TIFFRGBAImage*, uint32*, uint32, uint32, uint32, uint32, int32, int32,
+	unsigned char*);
+typedef void (*tileSeparateRoutine)
+    (TIFFRGBAImage*, uint32*, uint32, uint32, uint32, uint32, int32, int32,
+	unsigned char*, unsigned char*, unsigned char*, unsigned char*);
+/*
+ * RGBA-reader state.
+ */
+struct _TIFFRGBAImage {
+	TIFF*	tif;				/* image handle */
+	int	stoponerr;			/* stop on read error */
+	int	isContig;			/* data is packed/separate */
+	int	alpha;				/* type of alpha data present */
+	uint32	width;				/* image width */
+	uint32	height;				/* image height */
+	uint16	bitspersample;			/* image bits/sample */
+	uint16	samplesperpixel;		/* image samples/pixel */
+	uint16	orientation;			/* image orientation */
+	uint16	req_orientation;		/* requested orientation */
+	uint16	photometric;			/* image photometric interp */
+	uint16*	redcmap;			/* colormap pallete */
+	uint16*	greencmap;
+	uint16*	bluecmap;
+						/* get image data routine */
+	int	(*get)(TIFFRGBAImage*, uint32*, uint32, uint32);
+	union {
+	    void (*any)(TIFFRGBAImage*);
+	    tileContigRoutine	contig;
+	    tileSeparateRoutine	separate;
+	} put;					/* put decoded strip/tile */
+	TIFFRGBValue* Map;			/* sample mapping array */
+	uint32** BWmap;				/* black&white map */
+	uint32** PALmap;			/* palette image map */
+	TIFFYCbCrToRGB* ycbcr;			/* YCbCr conversion state */
+        TIFFCIELabToRGB* cielab;		/* CIE L*a*b conversion state */
+
+        int	row_offset;
+        int     col_offset;
+};
+
+/*
+ * Macros for extracting components from the
+ * packed ABGR form returned by TIFFReadRGBAImage.
+ */
+#define	TIFFGetR(abgr)	((abgr) & 0xff)
+#define	TIFFGetG(abgr)	(((abgr) >> 8) & 0xff)
+#define	TIFFGetB(abgr)	(((abgr) >> 16) & 0xff)
+#define	TIFFGetA(abgr)	(((abgr) >> 24) & 0xff)
+
+/*
+ * A CODEC is a software package that implements decoding,
+ * encoding, or decoding+encoding of a compression algorithm.
+ * The library provides a collection of builtin codecs.
+ * More codecs may be registered through calls to the library
+ * and/or the builtin implementations may be overridden.
+ */
+typedef	int (*TIFFInitMethod)(TIFF*, int);
+typedef struct {
+	char*		name;
+	uint16		scheme;
+	TIFFInitMethod	init;
+} TIFFCodec;
+
+#include <stdio.h>
+#include <stdarg.h>
+
+/* share internal LogLuv conversion routines? */
+#ifndef LOGLUV_PUBLIC
+#define LOGLUV_PUBLIC		1
+#endif
+
+#if defined(c_plusplus) || defined(__cplusplus)
+extern "C" {
+#endif
+typedef	void (*TIFFErrorHandler)(const char*, const char*, va_list);
+typedef	void (*TIFFErrorHandlerExt)(thandle_t, const char*, const char*, va_list);
+typedef	tsize_t (*TIFFReadWriteProc)(thandle_t, tdata_t, tsize_t);
+typedef	toff_t (*TIFFSeekProc)(thandle_t, toff_t, int);
+typedef	int (*TIFFCloseProc)(thandle_t);
+typedef	toff_t (*TIFFSizeProc)(thandle_t);
+typedef	int (*TIFFMapFileProc)(thandle_t, tdata_t*, toff_t*);
+typedef	void (*TIFFUnmapFileProc)(thandle_t, tdata_t, toff_t);
+typedef	void (*TIFFExtendProc)(TIFF*);
+
+extern	const char* TIFFGetVersion(void);
+
+extern	const TIFFCodec* TIFFFindCODEC(uint16);
+extern	TIFFCodec* TIFFRegisterCODEC(uint16, const char*, TIFFInitMethod);
+extern	void TIFFUnRegisterCODEC(TIFFCodec*);
+extern  int TIFFIsCODECConfigured(uint16);
+extern	TIFFCodec* TIFFGetConfiguredCODECs(void);
+
+/*
+ * Auxiliary functions.
+ */
+
+extern	tdata_t _TIFFmalloc(tsize_t);
+extern	tdata_t _TIFFrealloc(tdata_t, tsize_t);
+extern	void _TIFFmemset(tdata_t, int, tsize_t);
+extern	void _TIFFmemcpy(tdata_t, const tdata_t, tsize_t);
+extern	int _TIFFmemcmp(const tdata_t, const tdata_t, tsize_t);
+extern	void _TIFFfree(tdata_t);
+
+/*
+** Stuff, related to tag handling and creating custom tags.
+*/
+extern  int  TIFFGetTagListCount( TIFF * );
+extern  ttag_t TIFFGetTagListEntry( TIFF *, int tag_index );
+
+#define	TIFF_ANY	TIFF_NOTYPE	/* for field descriptor searching */
+#define	TIFF_VARIABLE	-1		/* marker for variable length tags */
+#define	TIFF_SPP	-2		/* marker for SamplesPerPixel tags */
+#define	TIFF_VARIABLE2	-3		/* marker for uint32 var-length tags */
+
+#define FIELD_CUSTOM    65
+
+typedef	struct {
+	ttag_t	field_tag;		/* field's tag */
+	short	field_readcount;	/* read count/TIFF_VARIABLE/TIFF_SPP */
+	short	field_writecount;	/* write count/TIFF_VARIABLE */
+	TIFFDataType field_type;	/* type of associated data */
+        unsigned short field_bit;	/* bit in fieldsset bit vector */
+	unsigned char field_oktochange;	/* if true, can change while writing */
+	unsigned char field_passcount;	/* if true, pass dir count on set */
+	char	*field_name;		/* ASCII name */
+} TIFFFieldInfo;
+
+typedef struct _TIFFTagValue {
+    const TIFFFieldInfo  *info;
+    int             count;
+    void           *value;
+} TIFFTagValue;
+
+extern	void TIFFMergeFieldInfo(TIFF*, const TIFFFieldInfo[], int);
+extern	const TIFFFieldInfo* TIFFFindFieldInfo(TIFF*, ttag_t, TIFFDataType);
+extern  const TIFFFieldInfo* TIFFFindFieldInfoByName(TIFF* , const char *,
+						     TIFFDataType);
+extern	const TIFFFieldInfo* TIFFFieldWithTag(TIFF*, ttag_t);
+extern	const TIFFFieldInfo* TIFFFieldWithName(TIFF*, const char *);
+
+typedef	int (*TIFFVSetMethod)(TIFF*, ttag_t, va_list);
+typedef	int (*TIFFVGetMethod)(TIFF*, ttag_t, va_list);
+typedef	void (*TIFFPrintMethod)(TIFF*, FILE*, long);
+
+typedef struct {
+    TIFFVSetMethod	vsetfield;	/* tag set routine */
+    TIFFVGetMethod	vgetfield;	/* tag get routine */
+    TIFFPrintMethod	printdir;	/* directory print routine */
+} TIFFTagMethods;
+
+extern  TIFFTagMethods *TIFFAccessTagMethods( TIFF * );
+extern  void *TIFFGetClientInfo( TIFF *, const char * );
+extern  void TIFFSetClientInfo( TIFF *, void *, const char * );
+
+extern	void TIFFCleanup(TIFF*);
+extern	void TIFFClose(TIFF*);
+extern	int TIFFFlush(TIFF*);
+extern	int TIFFFlushData(TIFF*);
+extern	int TIFFGetField(TIFF*, ttag_t, ...);
+extern	int TIFFVGetField(TIFF*, ttag_t, va_list);
+extern	int TIFFGetFieldDefaulted(TIFF*, ttag_t, ...);
+extern	int TIFFVGetFieldDefaulted(TIFF*, ttag_t, va_list);
+extern	int TIFFReadDirectory(TIFF*);
+extern	int TIFFReadCustomDirectory(TIFF*, toff_t, const TIFFFieldInfo[],
+				    size_t);
+extern	int TIFFReadEXIFDirectory(TIFF*, toff_t);
+extern	tsize_t TIFFScanlineSize(TIFF*);
+extern	tsize_t TIFFRasterScanlineSize(TIFF*);
+extern	tsize_t TIFFStripSize(TIFF*);
+extern	tsize_t TIFFRawStripSize(TIFF*, tstrip_t);
+extern	tsize_t TIFFVStripSize(TIFF*, uint32);
+extern	tsize_t TIFFTileRowSize(TIFF*);
+extern	tsize_t TIFFTileSize(TIFF*);
+extern	tsize_t TIFFVTileSize(TIFF*, uint32);
+extern	uint32 TIFFDefaultStripSize(TIFF*, uint32);
+extern	void TIFFDefaultTileSize(TIFF*, uint32*, uint32*);
+extern	int TIFFFileno(TIFF*);
+extern  int TIFFSetFileno(TIFF*, int);
+extern  thandle_t TIFFClientdata(TIFF*);
+extern  thandle_t TIFFSetClientdata(TIFF*, thandle_t);
+extern	int TIFFGetMode(TIFF*);
+extern	int TIFFSetMode(TIFF*, int);
+extern	int TIFFIsTiled(TIFF*);
+extern	int TIFFIsByteSwapped(TIFF*);
+extern	int TIFFIsUpSampled(TIFF*);
+extern	int TIFFIsMSB2LSB(TIFF*);
+extern	int TIFFIsBigEndian(TIFF*);
+extern	TIFFReadWriteProc TIFFGetReadProc(TIFF*);
+extern	TIFFReadWriteProc TIFFGetWriteProc(TIFF*);
+extern	TIFFSeekProc TIFFGetSeekProc(TIFF*);
+extern	TIFFCloseProc TIFFGetCloseProc(TIFF*);
+extern	TIFFSizeProc TIFFGetSizeProc(TIFF*);
+extern	TIFFMapFileProc TIFFGetMapFileProc(TIFF*);
+extern	TIFFUnmapFileProc TIFFGetUnmapFileProc(TIFF*);
+extern	uint32 TIFFCurrentRow(TIFF*);
+extern	tdir_t TIFFCurrentDirectory(TIFF*);
+extern	tdir_t TIFFNumberOfDirectories(TIFF*);
+extern	uint32 TIFFCurrentDirOffset(TIFF*);
+extern	tstrip_t TIFFCurrentStrip(TIFF*);
+extern	ttile_t TIFFCurrentTile(TIFF*);
+extern	int TIFFReadBufferSetup(TIFF*, tdata_t, tsize_t);
+extern	int TIFFWriteBufferSetup(TIFF*, tdata_t, tsize_t);
+extern	int TIFFSetupStrips(TIFF *);
+extern  int TIFFWriteCheck(TIFF*, int, const char *);
+extern	void TIFFFreeDirectory(TIFF*);
+extern  int TIFFCreateDirectory(TIFF*);
+extern	int TIFFLastDirectory(TIFF*);
+extern	int TIFFSetDirectory(TIFF*, tdir_t);
+extern	int TIFFSetSubDirectory(TIFF*, uint32);
+extern	int TIFFUnlinkDirectory(TIFF*, tdir_t);
+extern	int TIFFSetField(TIFF*, ttag_t, ...);
+extern	int TIFFVSetField(TIFF*, ttag_t, va_list);
+extern	int TIFFWriteDirectory(TIFF *);
+extern	int TIFFCheckpointDirectory(TIFF *);
+extern	int TIFFRewriteDirectory(TIFF *);
+extern	int TIFFReassignTagToIgnore(enum TIFFIgnoreSense, int);
+
+#if defined(c_plusplus) || defined(__cplusplus)
+extern	void TIFFPrintDirectory(TIFF*, FILE*, long = 0);
+extern	int TIFFReadScanline(TIFF*, tdata_t, uint32, tsample_t = 0);
+extern	int TIFFWriteScanline(TIFF*, tdata_t, uint32, tsample_t = 0);
+extern	int TIFFReadRGBAImage(TIFF*, uint32, uint32, uint32*, int = 0);
+extern	int TIFFReadRGBAImageOriented(TIFF*, uint32, uint32, uint32*,
+				      int = ORIENTATION_BOTLEFT, int = 0);
+#else
+extern	void TIFFPrintDirectory(TIFF*, FILE*, long);
+extern	int TIFFReadScanline(TIFF*, tdata_t, uint32, tsample_t);
+extern	int TIFFWriteScanline(TIFF*, tdata_t, uint32, tsample_t);
+extern	int TIFFReadRGBAImage(TIFF*, uint32, uint32, uint32*, int);
+extern	int TIFFReadRGBAImageOriented(TIFF*, uint32, uint32, uint32*, int, int);
+#endif
+
+extern	int TIFFReadRGBAStrip(TIFF*, tstrip_t, uint32 * );
+extern	int TIFFReadRGBATile(TIFF*, uint32, uint32, uint32 * );
+extern	int TIFFRGBAImageOK(TIFF*, char [1024]);
+extern	int TIFFRGBAImageBegin(TIFFRGBAImage*, TIFF*, int, char [1024]);
+extern	int TIFFRGBAImageGet(TIFFRGBAImage*, uint32*, uint32, uint32);
+extern	void TIFFRGBAImageEnd(TIFFRGBAImage*);
+extern	TIFF* TIFFOpen(const char*, const char*);
+# ifdef __WIN32__
+extern	TIFF* TIFFOpenW(const wchar_t*, const char*);
+# endif /* __WIN32__ */
+extern	TIFF* TIFFFdOpen(int, const char*, const char*);
+extern	TIFF* TIFFClientOpen(const char*, const char*,
+	    thandle_t,
+	    TIFFReadWriteProc, TIFFReadWriteProc,
+	    TIFFSeekProc, TIFFCloseProc,
+	    TIFFSizeProc,
+	    TIFFMapFileProc, TIFFUnmapFileProc);
+extern	const char* TIFFFileName(TIFF*);
+extern	const char* TIFFSetFileName(TIFF*, const char *);
+extern	void TIFFError(const char*, const char*, ...);
+extern	void TIFFErrorExt(thandle_t, const char*, const char*, ...);
+extern	void TIFFWarning(const char*, const char*, ...);
+extern	void TIFFWarningExt(thandle_t, const char*, const char*, ...);
+extern	TIFFErrorHandler TIFFSetErrorHandler(TIFFErrorHandler);
+extern	TIFFErrorHandlerExt TIFFSetErrorHandlerExt(TIFFErrorHandlerExt);
+extern	TIFFErrorHandler TIFFSetWarningHandler(TIFFErrorHandler);
+extern	TIFFErrorHandlerExt TIFFSetWarningHandlerExt(TIFFErrorHandlerExt);
+extern	TIFFExtendProc TIFFSetTagExtender(TIFFExtendProc);
+extern	ttile_t TIFFComputeTile(TIFF*, uint32, uint32, uint32, tsample_t);
+extern	int TIFFCheckTile(TIFF*, uint32, uint32, uint32, tsample_t);
+extern	ttile_t TIFFNumberOfTiles(TIFF*);
+extern	tsize_t TIFFReadTile(TIFF*,
+	    tdata_t, uint32, uint32, uint32, tsample_t);
+extern	tsize_t TIFFWriteTile(TIFF*,
+	    tdata_t, uint32, uint32, uint32, tsample_t);
+extern	tstrip_t TIFFComputeStrip(TIFF*, uint32, tsample_t);
+extern	tstrip_t TIFFNumberOfStrips(TIFF*);
+extern	tsize_t TIFFReadEncodedStrip(TIFF*, tstrip_t, tdata_t, tsize_t);
+extern	tsize_t TIFFReadRawStrip(TIFF*, tstrip_t, tdata_t, tsize_t);
+extern	tsize_t TIFFReadEncodedTile(TIFF*, ttile_t, tdata_t, tsize_t);
+extern	tsize_t TIFFReadRawTile(TIFF*, ttile_t, tdata_t, tsize_t);
+extern	tsize_t TIFFWriteEncodedStrip(TIFF*, tstrip_t, tdata_t, tsize_t);
+extern	tsize_t TIFFWriteRawStrip(TIFF*, tstrip_t, tdata_t, tsize_t);
+extern	tsize_t TIFFWriteEncodedTile(TIFF*, ttile_t, tdata_t, tsize_t);
+extern	tsize_t TIFFWriteRawTile(TIFF*, ttile_t, tdata_t, tsize_t);
+extern	int TIFFDataWidth(TIFFDataType);    /* table of tag datatype widths */
+extern	void TIFFSetWriteOffset(TIFF*, toff_t);
+extern	void TIFFSwabShort(uint16*);
+extern	void TIFFSwabLong(uint32*);
+extern	void TIFFSwabDouble(double*);
+extern	void TIFFSwabArrayOfShort(uint16*, unsigned long);
+extern	void TIFFSwabArrayOfTriples(uint8*, unsigned long);
+extern	void TIFFSwabArrayOfLong(uint32*, unsigned long);
+extern	void TIFFSwabArrayOfDouble(double*, unsigned long);
+extern	void TIFFReverseBits(unsigned char *, unsigned long);
+extern	const unsigned char* TIFFGetBitRevTable(int);
+
+#ifdef LOGLUV_PUBLIC
+#define U_NEU		0.210526316
+#define V_NEU		0.473684211
+#define UVSCALE		410.
+extern	double LogL16toY(int);
+extern	double LogL10toY(int);
+extern	void XYZtoRGB24(float*, uint8*);
+extern	int uv_decode(double*, double*, int);
+extern	void LogLuv24toXYZ(uint32, float*);
+extern	void LogLuv32toXYZ(uint32, float*);
+#if defined(c_plusplus) || defined(__cplusplus)
+extern	int LogL16fromY(double, int = SGILOGENCODE_NODITHER);
+extern	int LogL10fromY(double, int = SGILOGENCODE_NODITHER);
+extern	int uv_encode(double, double, int = SGILOGENCODE_NODITHER);
+extern	uint32 LogLuv24fromXYZ(float*, int = SGILOGENCODE_NODITHER);
+extern	uint32 LogLuv32fromXYZ(float*, int = SGILOGENCODE_NODITHER);
+#else
+extern	int LogL16fromY(double, int);
+extern	int LogL10fromY(double, int);
+extern	int uv_encode(double, double, int);
+extern	uint32 LogLuv24fromXYZ(float*, int);
+extern	uint32 LogLuv32fromXYZ(float*, int);
+#endif
+#endif /* LOGLUV_PUBLIC */
+
+extern int TIFFCIELabToRGBInit(TIFFCIELabToRGB*, TIFFDisplay *, float*);
+extern void TIFFCIELabToXYZ(TIFFCIELabToRGB *, uint32, int32, int32,
+			    float *, float *, float *);
+extern void TIFFXYZToRGB(TIFFCIELabToRGB *, float, float, float,
+			 uint32 *, uint32 *, uint32 *);
+
+extern int TIFFYCbCrToRGBInit(TIFFYCbCrToRGB*, float*, float*);
+extern void TIFFYCbCrtoRGB(TIFFYCbCrToRGB *, uint32, int32, int32,
+			   uint32 *, uint32 *, uint32 *);
+
+#if defined(c_plusplus) || defined(__cplusplus)
+}
+#endif
+
+#endif /* _TIFFIO_ */
+
+/* vim: set ts=8 sts=8 sw=8 noet: */
diff --git a/uppsrc/plugin/tif/lib/tiffio.hxx b/uppsrc/plugin/tif/lib/tiffio.hxx
new file mode 100644
index 000000000..b21332a50
--- /dev/null
+++ b/uppsrc/plugin/tif/lib/tiffio.hxx
@@ -0,0 +1,42 @@
+/* $Id: tiffio.hxx,v 1.1 2004/11/21 16:12:08 dron Exp $ */
+
+/*
+ * Copyright (c) 1988-1997 Sam Leffler
+ * Copyright (c) 1991-1997 Silicon Graphics, Inc.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and
+ * its documentation for any purpose is hereby granted without fee, provided
+ * that (i) the above copyright notices and this permission notice appear in
+ * all copies of the software and related documentation, and (ii) the names of
+ * Sam Leffler and Silicon Graphics may not be used in any advertising or
+ * publicity relating to the software without the specific, prior written
+ * permission of Sam Leffler and Silicon Graphics.
+ *
+ * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+ * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
+ * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
+ * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+ * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
+ * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.
+ */
+
+#ifndef _TIFFIO_HXX_
+#define	_TIFFIO_HXX_
+
+/*
+ * TIFF I/O library definitions which provide C++ streams API.
+ */
+
+#include <iostream>
+#include "tiff.h"
+
+extern	TIFF* TIFFStreamOpen(const char*, std::ostream *);
+extern	TIFF* TIFFStreamOpen(const char*, std::istream *);
+
+#endif /* _TIFFIO_HXX_ */
+
+/* vim: set ts=8 sts=8 sw=8 noet: */
diff --git a/uppsrc/plugin/tif/lib/tiffiop.h b/uppsrc/plugin/tif/lib/tiffiop.h
new file mode 100644
index 000000000..cbd66356b
--- /dev/null
+++ b/uppsrc/plugin/tif/lib/tiffiop.h
@@ -0,0 +1,323 @@
+/* $Id: tiffiop.h,v 1.46 2006/03/16 12:22:27 dron Exp $ */
+
+/*
+ * Copyright (c) 1988-1997 Sam Leffler
+ * Copyright (c) 1991-1997 Silicon Graphics, Inc.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and
+ * its documentation for any purpose is hereby granted without fee, provided
+ * that (i) the above copyright notices and this permission notice appear in
+ * all copies of the software and related documentation, and (ii) the names of
+ * Sam Leffler and Silicon Graphics may not be used in any advertising or
+ * publicity relating to the software without the specific, prior written
+ * permission of Sam Leffler and Silicon Graphics.
+ *
+ * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+ * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
+ * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
+ * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+ * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
+ * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.
+ */
+
+#ifndef _TIFFIOP_
+#define	_TIFFIOP_
+/*
+ * ``Library-private'' definitions.
+ */
+
+#include "tif_config.h"
+
+#ifdef HAVE_FCNTL_H
+# include <fcntl.h>
+#endif
+
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+
+#ifdef HAVE_STRING_H
+# include <string.h>
+#endif
+
+#ifdef HAVE_ASSERT_H
+# include <assert.h>
+#else
+# define assert(x)
+#endif
+
+#ifdef HAVE_SEARCH_H
+# include <search.h>
+#else
+extern void *lfind(const void *, const void *, size_t *, size_t,
+		   int (*)(const void *, const void *));
+#endif
+
+#include "tiffio.h"
+#include "tif_dir.h"
+
+#ifndef STRIP_SIZE_DEFAULT
+# define STRIP_SIZE_DEFAULT 8192
+#endif
+
+#define    streq(a,b)      (strcmp(a,b) == 0)
+
+#ifndef TRUE
+#define	TRUE	1
+#define	FALSE	0
+#endif
+
+typedef struct client_info {
+    struct client_info *next;
+    void      *data;
+    char      *name;
+} TIFFClientInfoLink;
+
+/*
+ * Typedefs for ``method pointers'' used internally.
+ */
+typedef	unsigned char tidataval_t;	/* internal image data value type */
+typedef	tidataval_t* tidata_t;		/* reference to internal image data */
+
+typedef	void (*TIFFVoidMethod)(TIFF*);
+typedef	int (*TIFFBoolMethod)(TIFF*);
+typedef	int (*TIFFPreMethod)(TIFF*, tsample_t);
+typedef	int (*TIFFCodeMethod)(TIFF*, tidata_t, tsize_t, tsample_t);
+typedef	int (*TIFFSeekMethod)(TIFF*, uint32);
+typedef	void (*TIFFPostMethod)(TIFF*, tidata_t, tsize_t);
+typedef	uint32 (*TIFFStripMethod)(TIFF*, uint32);
+typedef	void (*TIFFTileMethod)(TIFF*, uint32*, uint32*);
+
+struct tiff {
+	char*		tif_name;	/* name of open file */
+	int		tif_fd;		/* open file descriptor */
+	int		tif_mode;	/* open mode (O_*) */
+	uint32		tif_flags;
+#define	TIFF_FILLORDER		0x0003	/* natural bit fill order for machine */
+#define	TIFF_DIRTYHEADER	0x0004	/* header must be written on close */
+#define	TIFF_DIRTYDIRECT	0x0008	/* current directory must be written */
+#define	TIFF_BUFFERSETUP	0x0010	/* data buffers setup */
+#define	TIFF_CODERSETUP		0x0020	/* encoder/decoder setup done */
+#define	TIFF_BEENWRITING	0x0040	/* written 1+ scanlines to file */
+#define	TIFF_SWAB		0x0080	/* byte swap file information */
+#define	TIFF_NOBITREV		0x0100	/* inhibit bit reversal logic */
+#define	TIFF_MYBUFFER		0x0200	/* my raw data buffer; free on close */
+#define	TIFF_ISTILED		0x0400	/* file is tile, not strip- based */
+#define	TIFF_MAPPED		0x0800	/* file is mapped into memory */
+#define	TIFF_POSTENCODE		0x1000	/* need call to postencode routine */
+#define	TIFF_INSUBIFD		0x2000	/* currently writing a subifd */
+#define	TIFF_UPSAMPLED		0x4000	/* library is doing data up-sampling */
+#define	TIFF_STRIPCHOP		0x8000	/* enable strip chopping support */
+#define	TIFF_HEADERONLY		0x10000	/* read header only, do not process */
+					/* the first directory */
+	toff_t		tif_diroff;	/* file offset of current directory */
+	toff_t		tif_nextdiroff;	/* file offset of following directory */
+	toff_t*		tif_dirlist;	/* list of offsets to already seen */
+					/* directories to prevent IFD looping */
+	uint16		tif_dirnumber;  /* number of already seen directories */
+	TIFFDirectory	tif_dir;	/* internal rep of current directory */
+	TIFFHeader	tif_header;	/* file's header block */
+	const int*	tif_typeshift;	/* data type shift counts */
+	const long*	tif_typemask;	/* data type masks */
+	uint32		tif_row;	/* current scanline */
+	tdir_t		tif_curdir;	/* current directory (index) */
+	tstrip_t	tif_curstrip;	/* current strip for read/write */
+	toff_t		tif_curoff;	/* current offset for read/write */
+	toff_t		tif_dataoff;	/* current offset for writing dir */
+/* SubIFD support */
+	uint16		tif_nsubifd;	/* remaining subifds to write */
+	toff_t		tif_subifdoff;	/* offset for patching SubIFD link */
+/* tiling support */
+	uint32 		tif_col;	/* current column (offset by row too) */
+	ttile_t		tif_curtile;	/* current tile for read/write */
+	tsize_t		tif_tilesize;	/* # of bytes in a tile */
+/* compression scheme hooks */
+	int		tif_decodestatus;
+	TIFFBoolMethod	tif_setupdecode;/* called once before predecode */
+	TIFFPreMethod	tif_predecode;	/* pre- row/strip/tile decoding */
+	TIFFBoolMethod	tif_setupencode;/* called once before preencode */
+	int		tif_encodestatus;
+	TIFFPreMethod	tif_preencode;	/* pre- row/strip/tile encoding */
+	TIFFBoolMethod	tif_postencode;	/* post- row/strip/tile encoding */
+	TIFFCodeMethod	tif_decoderow;	/* scanline decoding routine */
+	TIFFCodeMethod	tif_encoderow;	/* scanline encoding routine */
+	TIFFCodeMethod	tif_decodestrip;/* strip decoding routine */
+	TIFFCodeMethod	tif_encodestrip;/* strip encoding routine */
+	TIFFCodeMethod	tif_decodetile;	/* tile decoding routine */
+	TIFFCodeMethod	tif_encodetile;	/* tile encoding routine */
+	TIFFVoidMethod	tif_close;	/* cleanup-on-close routine */
+	TIFFSeekMethod	tif_seek;	/* position within a strip routine */
+	TIFFVoidMethod	tif_cleanup;	/* cleanup state routine */
+	TIFFStripMethod	tif_defstripsize;/* calculate/constrain strip size */
+	TIFFTileMethod	tif_deftilesize;/* calculate/constrain tile size */
+	tidata_t	tif_data;	/* compression scheme private data */
+/* input/output buffering */
+	tsize_t		tif_scanlinesize;/* # of bytes in a scanline */
+	tsize_t		tif_scanlineskew;/* scanline skew for reading strips */
+	tidata_t	tif_rawdata;	/* raw data buffer */
+	tsize_t		tif_rawdatasize;/* # of bytes in raw data buffer */
+	tidata_t	tif_rawcp;	/* current spot in raw buffer */
+	tsize_t		tif_rawcc;	/* bytes unread from raw buffer */
+/* memory-mapped file support */
+	tidata_t	tif_base;	/* base of mapped file */
+	toff_t		tif_size;	/* size of mapped file region (bytes) */
+	TIFFMapFileProc	tif_mapproc;	/* map file method */
+	TIFFUnmapFileProc tif_unmapproc;/* unmap file method */
+/* input/output callback methods */
+	thandle_t	tif_clientdata;	/* callback parameter */
+	TIFFReadWriteProc tif_readproc;	/* read method */
+	TIFFReadWriteProc tif_writeproc;/* write method */
+	TIFFSeekProc	tif_seekproc;	/* lseek method */
+	TIFFCloseProc	tif_closeproc;	/* close method */
+	TIFFSizeProc	tif_sizeproc;	/* filesize method */
+/* post-decoding support */
+	TIFFPostMethod	tif_postdecode;	/* post decoding routine */
+/* tag support */
+	TIFFFieldInfo**	tif_fieldinfo;	/* sorted table of registered tags */
+	size_t		tif_nfields;	/* # entries in registered tag table */
+	const TIFFFieldInfo *tif_foundfield;/* cached pointer to already found tag */
+        TIFFTagMethods  tif_tagmethods; /* tag get/set/print routines */
+        TIFFClientInfoLink *tif_clientinfo; /* extra client information. */
+};
+
+#define	isPseudoTag(t)	(t > 0xffff)	/* is tag value normal or pseudo */
+
+#define	isTiled(tif)	(((tif)->tif_flags & TIFF_ISTILED) != 0)
+#define	isMapped(tif)	(((tif)->tif_flags & TIFF_MAPPED) != 0)
+#define	isFillOrder(tif, o)	(((tif)->tif_flags & (o)) != 0)
+#define	isUpSampled(tif)	(((tif)->tif_flags & TIFF_UPSAMPLED) != 0)
+#define	TIFFReadFile(tif, buf, size) \
+	((*(tif)->tif_readproc)((tif)->tif_clientdata,buf,size))
+#define	TIFFWriteFile(tif, buf, size) \
+	((*(tif)->tif_writeproc)((tif)->tif_clientdata,buf,size))
+#define	TIFFSeekFile(tif, off, whence) \
+	((*(tif)->tif_seekproc)((tif)->tif_clientdata,(toff_t)(off),whence))
+#define	TIFFCloseFile(tif) \
+	((*(tif)->tif_closeproc)((tif)->tif_clientdata))
+#define	TIFFGetFileSize(tif) \
+	((*(tif)->tif_sizeproc)((tif)->tif_clientdata))
+#define	TIFFMapFileContents(tif, paddr, psize) \
+	((*(tif)->tif_mapproc)((tif)->tif_clientdata,paddr,psize))
+#define	TIFFUnmapFileContents(tif, addr, size) \
+	((*(tif)->tif_unmapproc)((tif)->tif_clientdata,addr,size))
+
+/*
+ * Default Read/Seek/Write definitions.
+ */
+#ifndef ReadOK
+#define	ReadOK(tif, buf, size) \
+	(TIFFReadFile(tif, (tdata_t) buf, (tsize_t)(size)) == (tsize_t)(size))
+#endif
+#ifndef SeekOK
+#define	SeekOK(tif, off) \
+	(TIFFSeekFile(tif, (toff_t) off, SEEK_SET) == (toff_t) off)
+#endif
+#ifndef WriteOK
+#define	WriteOK(tif, buf, size) \
+	(TIFFWriteFile(tif, (tdata_t) buf, (tsize_t) size) == (tsize_t) size)
+#endif
+
+/* NB: the uint32 casts are to silence certain ANSI-C compilers */
+#define TIFFhowmany(x, y) ((((uint32)(x))+(((uint32)(y))-1))/((uint32)(y)))
+#define TIFFhowmany8(x) (((x)&0x07)?((uint32)(x)>>3)+1:(uint32)(x)>>3)
+#define	TIFFroundup(x, y) (TIFFhowmany(x,y)*(y))
+
+#define TIFFmax(A,B) ((A)>(B)?(A):(B))
+#define TIFFmin(A,B) ((A)<(B)?(A):(B))
+
+#define TIFFArrayCount(a) (sizeof (a) / sizeof ((a)[0]))
+
+#if defined(__cplusplus)
+extern "C" {
+#endif
+extern	int _TIFFgetMode(const char*, const char*);
+extern	int _TIFFNoRowEncode(TIFF*, tidata_t, tsize_t, tsample_t);
+extern	int _TIFFNoStripEncode(TIFF*, tidata_t, tsize_t, tsample_t);
+extern	int _TIFFNoTileEncode(TIFF*, tidata_t, tsize_t, tsample_t);
+extern	int _TIFFNoRowDecode(TIFF*, tidata_t, tsize_t, tsample_t);
+extern	int _TIFFNoStripDecode(TIFF*, tidata_t, tsize_t, tsample_t);
+extern	int _TIFFNoTileDecode(TIFF*, tidata_t, tsize_t, tsample_t);
+extern	void _TIFFNoPostDecode(TIFF*, tidata_t, tsize_t);
+extern  int  _TIFFNoPreCode (TIFF*, tsample_t);
+extern	int _TIFFNoSeek(TIFF*, uint32);
+extern	void _TIFFSwab16BitData(TIFF*, tidata_t, tsize_t);
+extern	void _TIFFSwab24BitData(TIFF*, tidata_t, tsize_t);
+extern	void _TIFFSwab32BitData(TIFF*, tidata_t, tsize_t);
+extern	void _TIFFSwab64BitData(TIFF*, tidata_t, tsize_t);
+extern	int TIFFFlushData1(TIFF*);
+extern	int TIFFDefaultDirectory(TIFF*);
+extern	void _TIFFSetDefaultCompressionState(TIFF*);
+extern	int TIFFSetCompressionScheme(TIFF*, int);
+extern	int TIFFSetDefaultCompressionState(TIFF*);
+extern	uint32 _TIFFDefaultStripSize(TIFF*, uint32);
+extern	void _TIFFDefaultTileSize(TIFF*, uint32*, uint32*);
+extern	int _TIFFDataSize(TIFFDataType);
+
+extern	void _TIFFsetByteArray(void**, void*, uint32);
+extern	void _TIFFsetString(char**, char*);
+extern	void _TIFFsetShortArray(uint16**, uint16*, uint32);
+extern	void _TIFFsetLongArray(uint32**, uint32*, uint32);
+extern	void _TIFFsetFloatArray(float**, float*, uint32);
+extern	void _TIFFsetDoubleArray(double**, double*, uint32);
+
+extern	void _TIFFprintAscii(FILE*, const char*);
+extern	void _TIFFprintAsciiTag(FILE*, const char*, const char*);
+
+extern	TIFFErrorHandler _TIFFwarningHandler;
+extern	TIFFErrorHandler _TIFFerrorHandler;
+extern	TIFFErrorHandlerExt _TIFFwarningHandlerExt;
+extern	TIFFErrorHandlerExt _TIFFerrorHandlerExt;
+
+extern	tdata_t _TIFFCheckMalloc(TIFF*, size_t, size_t, const char*);
+
+extern	int TIFFInitDumpMode(TIFF*, int);
+#ifdef PACKBITS_SUPPORT
+extern	int TIFFInitPackBits(TIFF*, int);
+#endif
+#ifdef CCITT_SUPPORT
+extern	int TIFFInitCCITTRLE(TIFF*, int), TIFFInitCCITTRLEW(TIFF*, int);
+extern	int TIFFInitCCITTFax3(TIFF*, int), TIFFInitCCITTFax4(TIFF*, int);
+#endif
+#ifdef THUNDER_SUPPORT
+extern	int TIFFInitThunderScan(TIFF*, int);
+#endif
+#ifdef NEXT_SUPPORT
+extern	int TIFFInitNeXT(TIFF*, int);
+#endif
+#ifdef LZW_SUPPORT
+extern	int TIFFInitLZW(TIFF*, int);
+#endif
+#ifdef OJPEG_SUPPORT
+extern	int TIFFInitOJPEG(TIFF*, int);
+#endif
+#ifdef JPEG_SUPPORT
+extern	int TIFFInitJPEG(TIFF*, int);
+#endif
+#ifdef JBIG_SUPPORT
+extern	int TIFFInitJBIG(TIFF*, int);
+#endif
+#ifdef ZIP_SUPPORT
+extern	int TIFFInitZIP(TIFF*, int);
+#endif
+#ifdef PIXARLOG_SUPPORT
+extern	int TIFFInitPixarLog(TIFF*, int);
+#endif
+#ifdef LOGLUV_SUPPORT
+extern	int TIFFInitSGILog(TIFF*, int);
+#endif
+#ifdef VMS
+extern	const TIFFCodec _TIFFBuiltinCODECS[];
+#else
+extern	TIFFCodec _TIFFBuiltinCODECS[];
+#endif
+
+#if defined(__cplusplus)
+}
+#endif
+#endif /* _TIFFIOP_ */
+
+/* vim: set ts=8 sts=8 sw=8 noet: */
diff --git a/uppsrc/plugin/tif/lib/tiffvers.h b/uppsrc/plugin/tif/lib/tiffvers.h
new file mode 100644
index 000000000..9744f8d30
--- /dev/null
+++ b/uppsrc/plugin/tif/lib/tiffvers.h
@@ -0,0 +1,9 @@
+#define TIFFLIB_VERSION_STR "LIBTIFF, Version 3.8.2\nCopyright (c) 1988-1996 Sam Leffler\nCopyright (c) 1991-1996 Silicon Graphics, Inc."
+/*
+ * This define can be used in code that requires
+ * compilation-related definitions specific to a
+ * version or versions of the library.  Runtime
+ * version checking should be done based on the
+ * string returned by TIFFGetVersion.
+ */
+#define TIFFLIB_VERSION 20060323
diff --git a/uppsrc/plugin/tif/lib/uvcode.h b/uppsrc/plugin/tif/lib/uvcode.h
new file mode 100644
index 000000000..5b2d7d71f
--- /dev/null
+++ b/uppsrc/plugin/tif/lib/uvcode.h
@@ -0,0 +1,173 @@
+/* Version 1.0 generated April 7, 1997 by Greg Ward Larson, SGI */
+#define UV_SQSIZ	(float)0.003500
+#define UV_NDIVS	16289
+#define UV_VSTART	(float)0.016940
+#define UV_NVS		163
+static struct {
+	float	ustart;
+	short	nus, ncum;
+}	uv_row[UV_NVS] = {
+	{ (float)0.247663,	4,	0 },
+	{ (float)0.243779,	6,	4 },
+	{ (float)0.241684,	7,	10 },
+	{ (float)0.237874,	9,	17 },
+	{ (float)0.235906,	10,	26 },
+	{ (float)0.232153,	12,	36 },
+	{ (float)0.228352,	14,	48 },
+	{ (float)0.226259,	15,	62 },
+	{ (float)0.222371,	17,	77 },
+	{ (float)0.220410,	18,	94 },
+	{ (float)0.214710,	21,	112 },
+	{ (float)0.212714,	22,	133 },
+	{ (float)0.210721,	23,	155 },
+	{ (float)0.204976,	26,	178 },
+	{ (float)0.202986,	27,	204 },
+	{ (float)0.199245,	29,	231 },
+	{ (float)0.195525,	31,	260 },
+	{ (float)0.193560,	32,	291 },
+	{ (float)0.189878,	34,	323 },
+	{ (float)0.186216,	36,	357 },
+	{ (float)0.186216,	36,	393 },
+	{ (float)0.182592,	38,	429 },
+	{ (float)0.179003,	40,	467 },
+	{ (float)0.175466,	42,	507 },
+	{ (float)0.172001,	44,	549 },
+	{ (float)0.172001,	44,	593 },
+	{ (float)0.168612,	46,	637 },
+	{ (float)0.168612,	46,	683 },
+	{ (float)0.163575,	49,	729 },
+	{ (float)0.158642,	52,	778 },
+	{ (float)0.158642,	52,	830 },
+	{ (float)0.158642,	52,	882 },
+	{ (float)0.153815,	55,	934 },
+	{ (float)0.153815,	55,	989 },
+	{ (float)0.149097,	58,	1044 },
+	{ (float)0.149097,	58,	1102 },
+	{ (float)0.142746,	62,	1160 },
+	{ (float)0.142746,	62,	1222 },
+	{ (float)0.142746,	62,	1284 },
+	{ (float)0.138270,	65,	1346 },
+	{ (float)0.138270,	65,	1411 },
+	{ (float)0.138270,	65,	1476 },
+	{ (float)0.132166,	69,	1541 },
+	{ (float)0.132166,	69,	1610 },
+	{ (float)0.126204,	73,	1679 },
+	{ (float)0.126204,	73,	1752 },
+	{ (float)0.126204,	73,	1825 },
+	{ (float)0.120381,	77,	1898 },
+	{ (float)0.120381,	77,	1975 },
+	{ (float)0.120381,	77,	2052 },
+	{ (float)0.120381,	77,	2129 },
+	{ (float)0.112962,	82,	2206 },
+	{ (float)0.112962,	82,	2288 },
+	{ (float)0.112962,	82,	2370 },
+	{ (float)0.107450,	86,	2452 },
+	{ (float)0.107450,	86,	2538 },
+	{ (float)0.107450,	86,	2624 },
+	{ (float)0.107450,	86,	2710 },
+	{ (float)0.100343,	91,	2796 },
+	{ (float)0.100343,	91,	2887 },
+	{ (float)0.100343,	91,	2978 },
+	{ (float)0.095126,	95,	3069 },
+	{ (float)0.095126,	95,	3164 },
+	{ (float)0.095126,	95,	3259 },
+	{ (float)0.095126,	95,	3354 },
+	{ (float)0.088276,	100,	3449 },
+	{ (float)0.088276,	100,	3549 },
+	{ (float)0.088276,	100,	3649 },
+	{ (float)0.088276,	100,	3749 },
+	{ (float)0.081523,	105,	3849 },
+	{ (float)0.081523,	105,	3954 },
+	{ (float)0.081523,	105,	4059 },
+	{ (float)0.081523,	105,	4164 },
+	{ (float)0.074861,	110,	4269 },
+	{ (float)0.074861,	110,	4379 },
+	{ (float)0.074861,	110,	4489 },
+	{ (float)0.074861,	110,	4599 },
+	{ (float)0.068290,	115,	4709 },
+	{ (float)0.068290,	115,	4824 },
+	{ (float)0.068290,	115,	4939 },
+	{ (float)0.068290,	115,	5054 },
+	{ (float)0.063573,	119,	5169 },
+	{ (float)0.063573,	119,	5288 },
+	{ (float)0.063573,	119,	5407 },
+	{ (float)0.063573,	119,	5526 },
+	{ (float)0.057219,	124,	5645 },
+	{ (float)0.057219,	124,	5769 },
+	{ (float)0.057219,	124,	5893 },
+	{ (float)0.057219,	124,	6017 },
+	{ (float)0.050985,	129,	6141 },
+	{ (float)0.050985,	129,	6270 },
+	{ (float)0.050985,	129,	6399 },
+	{ (float)0.050985,	129,	6528 },
+	{ (float)0.050985,	129,	6657 },
+	{ (float)0.044859,	134,	6786 },
+	{ (float)0.044859,	134,	6920 },
+	{ (float)0.044859,	134,	7054 },
+	{ (float)0.044859,	134,	7188 },
+	{ (float)0.040571,	138,	7322 },
+	{ (float)0.040571,	138,	7460 },
+	{ (float)0.040571,	138,	7598 },
+	{ (float)0.040571,	138,	7736 },
+	{ (float)0.036339,	142,	7874 },
+	{ (float)0.036339,	142,	8016 },
+	{ (float)0.036339,	142,	8158 },
+	{ (float)0.036339,	142,	8300 },
+	{ (float)0.032139,	146,	8442 },
+	{ (float)0.032139,	146,	8588 },
+	{ (float)0.032139,	146,	8734 },
+	{ (float)0.032139,	146,	8880 },
+	{ (float)0.027947,	150,	9026 },
+	{ (float)0.027947,	150,	9176 },
+	{ (float)0.027947,	150,	9326 },
+	{ (float)0.023739,	154,	9476 },
+	{ (float)0.023739,	154,	9630 },
+	{ (float)0.023739,	154,	9784 },
+	{ (float)0.023739,	154,	9938 },
+	{ (float)0.019504,	158,	10092 },
+	{ (float)0.019504,	158,	10250 },
+	{ (float)0.019504,	158,	10408 },
+	{ (float)0.016976,	161,	10566 },
+	{ (float)0.016976,	161,	10727 },
+	{ (float)0.016976,	161,	10888 },
+	{ (float)0.016976,	161,	11049 },
+	{ (float)0.012639,	165,	11210 },
+	{ (float)0.012639,	165,	11375 },
+	{ (float)0.012639,	165,	11540 },
+	{ (float)0.009991,	168,	11705 },
+	{ (float)0.009991,	168,	11873 },
+	{ (float)0.009991,	168,	12041 },
+	{ (float)0.009016,	170,	12209 },
+	{ (float)0.009016,	170,	12379 },
+	{ (float)0.009016,	170,	12549 },
+	{ (float)0.006217,	173,	12719 },
+	{ (float)0.006217,	173,	12892 },
+	{ (float)0.005097,	175,	13065 },
+	{ (float)0.005097,	175,	13240 },
+	{ (float)0.005097,	175,	13415 },
+	{ (float)0.003909,	177,	13590 },
+	{ (float)0.003909,	177,	13767 },
+	{ (float)0.002340,	177,	13944 },
+	{ (float)0.002389,	170,	14121 },
+	{ (float)0.001068,	164,	14291 },
+	{ (float)0.001653,	157,	14455 },
+	{ (float)0.000717,	150,	14612 },
+	{ (float)0.001614,	143,	14762 },
+	{ (float)0.000270,	136,	14905 },
+	{ (float)0.000484,	129,	15041 },
+	{ (float)0.001103,	123,	15170 },
+	{ (float)0.001242,	115,	15293 },
+	{ (float)0.001188,	109,	15408 },
+	{ (float)0.001011,	103,	15517 },
+	{ (float)0.000709,	97,	15620 },
+	{ (float)0.000301,	89,	15717 },
+	{ (float)0.002416,	82,	15806 },
+	{ (float)0.003251,	76,	15888 },
+	{ (float)0.003246,	69,	15964 },
+	{ (float)0.004141,	62,	16033 },
+	{ (float)0.005963,	55,	16095 },
+	{ (float)0.008839,	47,	16150 },
+	{ (float)0.010490,	40,	16197 },
+	{ (float)0.016994,	31,	16237 },
+	{ (float)0.023659,	21,	16268 },
+};
diff --git a/uppsrc/plugin/tif/tif.h b/uppsrc/plugin/tif/tif.h
new file mode 100644
index 000000000..c77626374
--- /dev/null
+++ b/uppsrc/plugin/tif/tif.h
@@ -0,0 +1,54 @@
+#ifndef _plugin_tif_tif_h_
+#define _plugin_tif_tif_h_
+
+#include <Draw/Draw.h>
+
+
+NAMESPACE_UPP
+
+class TIFRaster : public StreamRaster {
+public:
+	struct Data;
+	One<Data> data;
+
+public:
+	TIFRaster();
+	~TIFRaster();
+
+	virtual bool                Create();
+	virtual Size                GetSize();
+	virtual Info                GetInfo();
+	virtual Line                GetLine(int line);
+	virtual int                 GetPaletteCount();
+	virtual const RGBA         *GetPalette();
+	virtual const RasterFormat *GetFormat();
+
+	virtual int                 GetPageCount();
+	virtual void                SeekPage(int n);
+
+private:
+	bool                        Init();
+};
+
+class TIFEncoder : public StreamRasterEncoder {
+public:
+	class Data;
+	One<Data> data;
+
+public:
+	TIFEncoder(int bpp = 24);
+	~TIFEncoder();
+
+	TIFEncoder&  Bpp(int b)       { bpp = b; return *this; }
+
+	virtual int  GetPaletteCount();
+	virtual void Start(Size sz);
+	virtual void WriteLineRaw(const byte *s);
+
+private:
+	int bpp;
+};
+
+END_UPP_NAMESPACE
+
+#endif
diff --git a/uppsrc/plugin/tif/tif.upp b/uppsrc/plugin/tif/tif.upp
new file mode 100644
index 000000000..4b00f7133
--- /dev/null
+++ b/uppsrc/plugin/tif/tif.upp
@@ -0,0 +1,93 @@
+description "TIFF image file format";
+
+uses
+	plugin\jpg;
+
+options
+	-DSTDC,
+	-DCHECK_JPEG_YCBCR_SUBSAMPLING,
+	-DDEFAULT_EXTRASAMPLE_AS_ALPHA,
+	-DSTRIPCHOP_DEFAULT=TIFF_STRIPCHOP,
+	-DPIXARLOG_SUPPORT,
+	-DZIP_SUPPORT,
+	-DOJPEG_SUPPORT,
+	-DJPEG_SUPPORT,
+	-DLOGLUV_SUPPORT,
+	-DNEXT_SUPPORT,
+	-DTHUNDER_SUPPORT,
+	-DLZW_SUPPORT,
+	-DPACKBITS_SUPPORT,
+	-DCCITT_SUPPORT;
+
+file
+	tif.h,
+	tifupp.cpp,
+	tifreg.icpp,
+	lib readonly separator,
+	lib\Copyright,
+	lib\jerror.h,
+	lib\jpeg.patch1,
+	lib\jpeg.patch2,
+	lib\jpeglib.h,
+	lib\libtiff.def,
+	lib\Makefile.am,
+	lib\Makefile.in,
+	lib\Makefile.lcc,
+	lib\Makefile.vc,
+	lib\ojpeg.patch,
+	lib\Readme,
+	lib\Release-date,
+	lib\t4.h,
+	lib\tif_aux.c,
+	lib\tif_close.c,
+	lib\tif_codec.c,
+	lib\tif_color.c,
+	lib\tif_compress.c,
+	lib\tif_config.h,
+	lib\tif_config.h.in,
+	lib\tif_config.h.vc,
+	lib\tif_dir.c,
+	lib\tif_dir.h,
+	lib\tif_dirinfo.c,
+	lib\tif_dirread.c,
+	lib\tif_dirwrite.c,
+	lib\tif_dumpmode.c,
+	lib\tif_error.c,
+	lib\tif_extension.c,
+	lib\tif_fax3.c,
+	lib\tif_fax3.h,
+	lib\tif_fax3sm.c,
+	lib\tif_flush.c,
+	lib\tif_getimage.c,
+	lib\tif_jpeg.c,
+	lib\tif_luv.c,
+	lib\tif_lzw.c,
+	lib\tif_next.c,
+	lib\tif_ojpeg.c,
+	lib\tif_open.c,
+	lib\tif_packbits.c,
+	lib\tif_pixarlog.c,
+	lib\tif_predict.c,
+	lib\tif_predict.h,
+	lib\tif_print.c,
+	lib\tif_read.c,
+	lib\tif_strip.c,
+	lib\tif_swab.c,
+	lib\tif_thunder.c,
+	lib\tif_tile.c,
+	lib\tif_version.c,
+	lib\tif_warning.c,
+	lib\tif_write.c,
+	lib\tif_zip.c,
+	lib\tiff.h,
+	lib\tiffcomp.h,
+	lib\tiffconf.h,
+	lib\tiffconf.h.in,
+	lib\tiffconf.h.vc,
+	lib\tiffio.h,
+	lib\tiffio.hxx,
+	lib\tiffiop.h,
+	lib\tiffvers.h,
+	lib\uvcode.h,
+	lib\Version,
+	end readonly separator;
diff --git a/uppsrc/plugin/tif/tifreg.icpp b/uppsrc/plugin/tif/tifreg.icpp
new file mode 100644
index 000000000..750769e50
--- /dev/null
+++ b/uppsrc/plugin/tif/tifreg.icpp
@@ -0,0 +1,9 @@
+#include "tif.h"
+
+NAMESPACE_UPP
+
+INITBLOCK {
+	StreamRaster::Register<TIFRaster>();
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/plugin/tif/tifupp.cpp b/uppsrc/plugin/tif/tifupp.cpp
new file mode 100644
index 000000000..1c74db479
--- /dev/null
+++ b/uppsrc/plugin/tif/tifupp.cpp
@@ -0,0 +1,1057 @@
+#include <Draw/Draw.h>
+#include "tif.h"
+
+#define int8 tif_int8
+#define int32 tif_int32
+#define uint32 tif_uint32
+#include <plugin/tif/lib/tiffio.h>
+#undef int32
+#undef uint32
+
+#define LLOG(x) // LOG(x)
+
+// #define DBGALLOC 1
+
+NAMESPACE_UPP
+
+#if DBGALLOC
+double total_allocated = 0, total_freed = 0;
+unsigned alloc_calls = 0, free_calls = 0, realloc_calls = 0;
+Index<tsize_t> size_index;
+Vector<int> size_alloc_calls, size_free_calls;
+int op_id;
+
+void dbgAddAlloc(void *p, tsize_t s)
+{
+	++op_id;
+	total_allocated += s;
+	int i = size_index.Find(s);
+	if(i >= 0)
+		size_alloc_calls[i]++;
+	else
+	{
+		size_index.Add(s);
+		size_alloc_calls.Add(1);
+		size_free_calls.Add(0);
+	}
+	LLOG(op_id << " tAlloc(" << s << ") = " << p << ": blks: " << alloc_calls - free_calls << ", alloc = " << total_allocated << ", free = " << total_freed << ", diff = " << (total_allocated - total_freed));
+}
+
+void dbgAddFree(void *p, tsize_t s)
+{
+	++op_id;
+	total_freed += s;
+	int i = size_index.Find(s);
+	if(i >= 0)
+		size_free_calls[i]++;
+	else
+	{
+		size_index.Add(s);
+		size_alloc_calls.Add(0);
+		size_free_calls.Add(1);
+	}
+	LLOG(op_id << " tFree(" << p << ") = " << s << ": blks: " << alloc_calls - free_calls << ", alloc = " << total_allocated << ", free = " << total_freed << ", diff = " << (total_allocated - total_freed));
+}
+
+void TiffAllocStat()
+{
+	for(int i = 0; i < size_index.GetCount(); i++)
+		if(size_alloc_calls[i] != size_free_calls[i])
+			LOG("Alloc/free mismatch: size = " << size_index[i]
+			<< ", alloc = " << size_alloc_calls[i] << ", frees = " << size_free_calls[i]);
+}
+#endif
+
+extern "C" tdata_t _TIFFmalloc(tsize_t s)
+{
+	byte *p = new byte[s + 4];
+	Poke32le(p, s);
+#if DBGALLOC
+	alloc_calls++;
+	dbgAddAlloc(p, s);
+#endif
+	return (tdata_t)(p + 4);
+}
+
+extern "C" void    _TIFFfree(tdata_t p)
+{
+	if(p) {
+		byte *rawp = (byte *)p - 4;
+#if DBGALLOC
+		free_calls++;
+		dbgAddFree(p, Peek32le(rawp));
+#endif
+		delete[] (rawp);
+	}
+}
+
+extern "C" tdata_t _TIFFrealloc(tdata_t p, tsize_t s)
+{
+	int oldsize = (p ? Peek32le((const byte *)p - 4) : 0);
+	if(s <= oldsize) {
+		Poke32le((byte *)p - 4, s);
+		return p;
+	}
+	byte *newptr = new byte[s + 4];
+#if DBGALLOC
+	alloc_calls++;
+	dbgAddAlloc(newptr, s);
+#endif
+	if(oldsize) {
+		memcpy(newptr + 4, p, min<int>(oldsize, s));
+#if DBGALLOC
+		free_calls++;
+		dbgAddFree(newptr, oldsize);
+#endif
+		delete[] ((byte *)p - 4);
+	}
+	Poke32le(newptr, s);
+	return (tdata_t)(newptr + 4);
+}
+
+extern "C" void _TIFFmemset(void* p, int v, tsize_t c)           { memset(p, v, c); }
+extern "C" void _TIFFmemcpy(void* d, const tdata_t s, tsize_t c) { memcpy(d, s, c); }
+extern "C" int  _TIFFmemcmp(const tdata_t p1, const tdata_t p2, tsize_t c) { return memcmp(p1, p2, c); }
+
+static void Blt2to4(byte *dest, const byte *src, unsigned count)
+{
+	byte b;
+
+#define BLT2_4_4(o) \
+	b = src[(o)]; \
+	dest[2 * (o) + 0] = ((b >> 2) & 0x30) | ((b >> 4) & 0x03); \
+	dest[2 * (o) + 1] = ((b << 2) & 0x30) | (b & 0x03);
+
+	for(unsigned rep = count >> 5; rep; rep--) {
+		BLT2_4_4(0) BLT2_4_4(1) BLT2_4_4(2) BLT2_4_4(3)
+		BLT2_4_4(4) BLT2_4_4(5) BLT2_4_4(6) BLT2_4_4(7)
+		dest += 8 * 2;
+		src += 8;
+	}
+	if(count & 16) {
+		BLT2_4_4(0) BLT2_4_4(1) BLT2_4_4(2) BLT2_4_4(3)
+		dest += 4 * 2;
+		src += 4;
+	}
+	if(count & 8) {
+		BLT2_4_4(0) BLT2_4_4(1)
+		dest += 2 * 2;
+		src += 2;
+	}
+	if(count & 4) {
+		BLT2_4_4(0)
+		dest += 2;
+		src++;
+	}
+	switch(count & 3) {
+	case 0:
+		break;
+
+	case 1:
+		*dest = ((*src >> 2) & 0x30);
+		break;
+
+	case 2:
+		*dest = ((*src >> 2) & 0x30) | ((*src >> 4) & 0x03);
+		break;
+
+	case 3:
+		*dest++ = ((*src >> 2) & 0x30) | ((*src >> 4) & 0x03);
+		*dest = (*src << 2) & 0x30;
+		break;
+	}
+}
+
+static void BltPack11(byte *dest, const byte *src, byte bit_shift, unsigned count)
+{
+	if(bit_shift == 0)
+	{ // simple case
+#if defined(CPU_IA32)
+#define BLT_PACK_11_4(o) *(unsigned *)(dest + (o)) = *(const unsigned *)(src + (o));
+#else
+#define BLT_PACK_11_4(o) dest[(o) + 0] = src[(o) + 0]; dest[(o) + 1] = src[(o) + 1]; \
+	dest[(o) + 2] = src[(o) + 2]; dest[(o) + 3] = src[(o) + 3];
+#endif
+		for(unsigned rep = count >> 7; rep; rep--)
+		{
+			BLT_PACK_11_4(0) BLT_PACK_11_4(4) BLT_PACK_11_4(8) BLT_PACK_11_4(12)
+			dest += 16;
+			src += 16;
+		}
+		if(count & 0x40)
+		{
+			BLT_PACK_11_4(0) BLT_PACK_11_4(4)
+			dest += 8;
+			src += 8;
+		}
+		if(count & 0x20)
+		{
+			BLT_PACK_11_4(0)
+			dest += 4;
+			src += 4;
+		}
+		if(count & 0x10)
+		{
+			dest[0] = src[0]; dest[1] = src[1];
+			dest += 2;
+			src += 2;
+		}
+		if(count & 8)
+			*dest++ = *src++;
+		switch(count & 7)
+		{
+		case 0: break;
+		case 1: *dest = (*src & 0x80) | (*dest | 0x7f); break;
+		case 2: *dest = (*src & 0xc0) | (*dest | 0x3f); break;
+		case 3: *dest = (*src & 0xe0) | (*dest | 0x1f); break;
+		case 4: *dest = (*src & 0xf0) | (*dest | 0x0f); break;
+		case 5: *dest = (*src & 0xf8) | (*dest | 0x07); break;
+		case 6: *dest = (*src & 0xfc) | (*dest | 0x03); break;
+		case 7: *dest = (*src & 0xfe) | (*dest | 0x01); break;
+		}
+	}
+	else
+	{
+		const byte shift1 = bit_shift, shift2 = 8 - bit_shift;
+		byte mask;
+		if(count + shift1 <= 8)
+		{ // touch just 1 byte
+			mask = ((1 << count) - 1) << (8 - count - shift1);
+			*dest = (*dest & ~mask) | ((*src >> shift1) & mask);
+			return;
+		}
+		mask = 0xff00 >> shift1;
+		*dest = (*dest & ~mask) | ((*src >> shift1) & mask);
+		dest++;
+		count -= shift2;
+#define BLT_SHIFT_11_1(o) dest[(o)] = (src[(o)] << shift2) | (src[(o) + 1] >> shift1);
+#define BLT_SHIFT_11_4(o) BLT_SHIFT_11_1((o)) BLT_SHIFT_11_1((o) + 1) BLT_SHIFT_11_1((o) + 2) BLT_SHIFT_11_1((o) + 3)
+		for(unsigned rep = count >> 6; rep; rep--)
+		{
+			BLT_SHIFT_11_4(0) BLT_SHIFT_11_4(4)
+			dest += 8;
+			src += 8;
+		}
+		if(count & 0x20)
+		{
+			BLT_SHIFT_11_4(0)
+			dest += 4;
+			src += 4;
+		}
+		if(count & 0x10)
+		{
+			BLT_SHIFT_11_1(0) BLT_SHIFT_11_1(1)
+			dest += 2;
+			src += 2;
+		}
+		if(count & 8)
+		{
+			BLT_SHIFT_11_1(0)
+			dest++;
+			src++;
+		}
+		if(count &= 7)
+		{
+			byte data = (count <= shift1 ? src[1] << shift2 : (src[1] << shift2) | (src[2] >> shift1));
+			mask = 0xff00 >> count;
+			*dest = (*dest & ~mask) | (data & mask);
+		}
+	}
+}
+
+static void BltPack44(byte *dest, const byte *src, bool shift, unsigned count)
+{
+//	RTIMING("BltPack44");
+	ASSERT(count > 0);
+	if(shift)
+	{
+		byte c = *src++, d;
+		*dest = (*dest & 0xF0) | (c >> 4);
+		dest++;
+		count--;
+		while(count >= 8)
+		{
+			d = src[0]; dest[0] = (c << 4) | (d >> 4);
+			c = src[1]; dest[1] = (d << 4) | (c >> 4);
+			d = src[2]; dest[2] = (c << 4) | (d >> 4);
+			c = src[3]; dest[3] = (d << 4) | (c >> 4);
+			src += 4;
+			dest += 4;
+			count -= 8;
+		}
+		if(count & 4)
+		{
+			d = src[0]; dest[0] = (c << 4) | (d >> 4);
+			c = src[1]; dest[1] = (d << 4) | (c >> 4);
+			src += 2;
+			dest += 2;
+		}
+		if(count & 2)
+		{
+			d = src[0]; dest[0] = (c << 4) | (d >> 4);
+			c = d;
+			src++;
+			dest++;
+		}
+		if(count & 1)
+			dest[0] = (dest[0] & 15) | (c << 4);
+	}
+	else
+	{
+		unsigned c2 = count >> 1;
+		if(c2)
+			memcpy(dest, src, c2);
+		if(count & 1)
+			dest[c2] = (dest[c2] & 15) | (src[c2] & 0xF0);
+	}
+}
+
+static void BltPack4(byte *dest, const byte *src, unsigned count)
+{
+#define BLT_PACK_4_4(o) dest[(o)] = src[4 * (o)]; dest[(o) + 1] = src[4 * (o) + 4]; \
+	dest[(o) + 2] = src[4 * (o) + 8]; dest[(o) + 3] = src[4 * (o) + 12];
+	for(unsigned rep = count >> 4; rep; rep--)
+	{
+		BLT_PACK_4_4(0) BLT_PACK_4_4(4) BLT_PACK_4_4(8) BLT_PACK_4_4(12)
+		dest += 16;
+		src += 4 * 16;
+	}
+	if(count & 8)
+	{
+		BLT_PACK_4_4(0) BLT_PACK_4_4(4)
+		dest += 8;
+		src += 4 * 8;
+	}
+	if(count & 4)
+	{
+		BLT_PACK_4_4(0)
+		dest += 4;
+		src += 4 * 4;
+	}
+	if(count & 2)
+	{
+		dest[0] = src[0]; dest[1] = src[4];
+		dest += 2;
+		src += 4 * 2;
+	}
+	if(count & 1)
+		dest[0] = src[0];
+}
+
+struct TIFRaster::Data : public TIFFRGBAImage {
+	Data(Stream& stream);
+	~Data();
+
+	bool             Create();
+	Raster::Info     GetInfo();
+	Raster::Line     GetLine(int i);
+	bool             SeekPage(int page);
+
+	static void      Warning(const char* module, const char* fmt, va_list ap);
+	static void      Error(const char* module, const char* fmt, va_list ap);
+
+	RasterFormat     format;
+
+	Stream&          stream;
+	TIFF             *tiff;
+
+	static tsize_t   ReadStream(thandle_t fd, tdata_t buf, tsize_t size);
+	static tsize_t   WriteStream(thandle_t fd, tdata_t buf, tsize_t size);
+	static toff_t    SeekStream(thandle_t fd, toff_t off, int whence);
+	static int       CloseStream(thandle_t fd);
+	static toff_t    SizeStream(thandle_t fd);
+	static int       MapStream(thandle_t fd, tdata_t *pbase, toff_t *psize);
+	static void      UnmapStream(thandle_t fd, tdata_t base, toff_t size);
+
+	struct Page {
+		uint32       width, height;
+		uint16       bits_per_sample;
+		uint16       samples_per_pixel;
+		uint16       photometric;
+		Size         dot_size;
+		bool         alpha;
+	};
+	Array<Page>      pages;
+	int              page_index;
+
+	byte *MapDown(int x, int y, int count, bool read);
+	byte *MapUp(int x, int y, int count, bool read);
+	void  Flush();
+	void  Flush(int y);
+
+	Size size;
+	int bpp;
+	int row_bytes;
+	int cache_size;
+	bool alpha;
+	Vector<byte> imagebuf;
+	FileStream filebuffer;
+	struct Row {
+		Row() : x(0), size(0) {}
+
+		Buffer<byte> mapping;
+		int x, size;
+	};
+	enum { MAX_CACHE_SIZE = 50000000 };
+	RGBA palette[256];
+	int palette_count;
+	Buffer<Row> rows;
+	int64 mapping_offset;
+	int mapping_size;
+	Vector<uint32> buffer;
+	tileContigRoutine contig;
+	tileSeparateRoutine separate;
+	int skewfac;
+//	void (*pack)(TIFFImageHelper *helper, uint32 x, uint32 y, uint32 w, uint32 h);
+//	String warnings;
+//	String errors;
+};
+
+extern "C" {
+
+TIFFErrorHandler _TIFFwarningHandler = TIFRaster::Data::Warning;
+TIFFErrorHandler _TIFFerrorHandler   = TIFRaster::Data::Error;
+
+};
+static void packTileRGB(TIFRaster::Data *helper, uint32 x, uint32 y, uint32 w, uint32 h)
+{
+	if(helper->alpha) {
+		int x4 = 4 * x, w4 = 4 * w;
+	//	byte *dest = helper->dest.GetUpScan(y) + 3 * x;
+		const byte *src = (const byte *)helper->buffer.Begin();
+	//	unsigned srow = sizeof(uint32) * w; //, drow = helper->dest.GetUpRowBytes();
+		for(; h; h--, /*src += srow,*/ /*dest += drow*/ y++) {
+			for(byte *dest = helper->MapUp(x4, y, w4, false), *end = dest + w4; dest < end; dest += 4, src += 4) {
+				dest[0] = src[2];
+				dest[1] = src[1];
+				dest[2] = src[0];
+				dest[3] = src[3];
+			}
+		}
+	}
+	else {
+		int x3 = 3 * x, w3 = 3 * w;
+	//	byte *dest = helper->dest.GetUpScan(y) + 3 * x;
+		const byte *src = (const byte *)helper->buffer.Begin();
+	//	unsigned srow = sizeof(uint32) * w; //, drow = helper->dest.GetUpRowBytes();
+		for(; h; h--, /*src += srow,*/ /*dest += drow*/ y++) {
+			for(byte *dest = helper->MapUp(x3, y, w3, false), *end = dest + w3; dest < end; dest += 3, src += 4) {
+				dest[0] = src[2];
+				dest[1] = src[1];
+				dest[2] = src[0];
+			}
+		}
+	}
+}
+
+static void putContig1(TIFFRGBAImage *img, tif_uint32 *cp,
+	tif_uint32 x, tif_uint32 y, tif_uint32 w, tif_uint32 h,
+	tif_int32 fromskew, tif_int32 toskew, byte *pp)
+{
+	TIFRaster::Data *helper = (TIFRaster::Data *)img;
+	Size size = helper->size;
+	int iw = toskew + w;
+	bool keep_y = (iw >= 0);
+	int x8 = x >> 3;
+	int w8 = ((x + w + 7) >> 3) - x8;
+	bool read = !!((x | w) & 7) && (int)w < helper->size.cx;
+//	byte *dest = helper->dest.GetUpScan(y) + (x >> 3);
+//	int drow = (keep_y ? helper->dest.GetUpRowBytes() : -helper->dest.GetUpRowBytes());
+	int drow = keep_y ? 1 : -1;
+	const byte *src = pp;
+	int srow = (fromskew + w - 1) / helper->skewfac + 1;
+	for(; h; h--, y += drow /*dest += drow*/, src += srow)
+		BltPack11(helper->MapUp(x8, y, w8, read), src, (byte)(x & 7), w);
+}
+
+static void putContig4(TIFFRGBAImage *img, tif_uint32 *cp,
+	tif_uint32 x, tif_uint32 y, tif_uint32 w, tif_uint32 h,
+	tif_int32 fromskew, tif_int32 toskew, byte *pp)
+{
+	TIFRaster::Data *helper = (TIFRaster::Data *)img;
+	Size size = helper->size; //dest.GetSize();
+	int iw = toskew + w;
+	bool keep_y = (iw >= 0);
+	int x2 = x >> 1;
+	int w2 = ((x + w + 1) >> 1) - x2;
+	bool read = !!((x | w) & 1) && (int)w < helper->size.cx;
+//	byte *dest = helper->dest.GetUpScan(y) + (x >> 1);
+	bool shift = (x & 1);
+//	int drow = (keep_y ? helper->dest.GetUpRowBytes() : -helper->dest.GetUpRowBytes());
+	int drow = (keep_y ? 1 : -1);
+	const byte *src = pp;
+	int srow = (fromskew + w - 1) / helper->skewfac + 1;
+	for(; h; h--, y /*dest*/ += drow, src += srow)
+		BltPack44(helper->MapUp(x2, y, w2, read), src, shift, w);
+}
+
+static void putContig8(TIFFRGBAImage *img, tif_uint32 *cp,
+	tif_uint32 x, tif_uint32 y, tif_uint32 w, tif_uint32 h,
+	tif_int32 fromskew, tif_int32 toskew, byte *pp)
+{
+	TIFRaster::Data *helper = (TIFRaster::Data *)img;
+	Size size = helper->size;
+	int iw = toskew + w;
+	bool keep_y = (iw >= 0);
+//	byte *dest = helper->dest.GetUpScan(y) + x;
+//	int drow = (keep_y ? helper->dest.GetUpRowBytes() : -helper->dest.GetUpRowBytes());
+	int drow = (keep_y ? 1 : -1);
+	const byte *src = pp;
+	int srow = (fromskew + w - 1) / helper->skewfac + 1;
+	for(; h; h--, y /*dest*/ += drow, src += srow)
+		memcpy(helper->MapUp(x, y, w, false), src, w);
+}
+
+static void putContigRGB(TIFFRGBAImage *img, tif_uint32 *cp, tif_uint32 x, tif_uint32 y, tif_uint32 w, tif_uint32 h,
+	tif_int32 fromskew, tif_int32 toskew, byte *pp)
+{
+	TIFRaster::Data *helper = (TIFRaster::Data *)img;
+	Size size = helper->size;
+	int iw = toskew + w;
+	int wh = w * h;
+	if(wh > helper->buffer.GetCount())
+		helper->buffer.SetCount(wh);
+	bool keep_y = (iw >= 0);
+	helper->contig(img, (tif_uint32 *)(keep_y ? &helper->buffer[0] : &helper->buffer[0] + w * (h - 1)),
+		0, 0, w, h, fromskew, keep_y ? 0 : -2 * (int)w, pp);
+	packTileRGB(helper, x, keep_y ? y : y - h + 1, w, h);
+}
+
+static void putSeparate(TIFFRGBAImage *img, tif_uint32 *cp,
+	tif_uint32 x, tif_uint32 y, tif_uint32 w, tif_uint32 h,
+	tif_int32 fromskew, tif_int32 toskew, byte *r, byte *g, byte *b, byte *a)
+{
+	TIFRaster::Data *helper = (TIFRaster::Data *)img;
+	Size size = helper->size;
+	int wh = w * h;
+	if(wh > helper->buffer.GetCount())
+		helper->buffer.SetCount(wh);
+	int iw = toskew + w;
+	bool keep_y = (iw >= 0);
+	helper->separate(img, (tif_uint32 *)(keep_y ? &helper->buffer[0] : &helper->buffer[0] + w * (h - 1)),
+		0, 0, w, h, fromskew, keep_y ? 0 : -2 * (int)w, r, g, b, a);
+	packTileRGB(helper, x, keep_y ? y : y - h + 1, w, h);
+}
+
+byte *TIFRaster::Data::MapUp(int x, int y, int count, bool read)
+{
+	return MapDown(x, size.cy - 1 - y, count, read);
+}
+
+byte *TIFRaster::Data::MapDown(int x, int y, int count, bool read)
+{
+	if(!imagebuf.IsEmpty())
+		return &imagebuf[row_bytes * y] + x;
+	else {
+		ASSERT(filebuffer.IsOpen());
+		Row& row = rows[y];
+		if(row.size >= count && row.x <= x && row.x + row.size >= x + count)
+			return &row.mapping[x - row.x];
+		if(cache_size + count >= MAX_CACHE_SIZE)
+			Flush();
+		row.mapping.Alloc(count);
+		row.x = x;
+		row.size = count;
+		cache_size += count;
+		if(read) {
+			filebuffer.Seek(row_bytes * y + x);
+			filebuffer.GetAll(row.mapping, count);
+		}
+		return row.mapping;
+	}
+}
+
+void TIFRaster::Data::Flush()
+{
+	LLOG("Flush, cache size = " << cache_size);
+	for(int y = 0; y < size.cy; y++)
+		Flush(y);
+	ASSERT(cache_size == 0);
+}
+
+void TIFRaster::Data::Flush(int y)
+{
+	Row& row = rows[y];
+	if(filebuffer.IsOpen() && row.size > 0) {
+		int64 fpos = row_bytes * y + row.x;
+//		RLOG("writing row " << y << " from " << fpos << " + " << row.size << " = " << (fpos + row.size));
+		filebuffer.Seek(fpos);
+		filebuffer.Put(row.mapping, row.size);
+		cache_size -= row.size;
+		row.size = 0;
+		row.mapping.Clear();
+	}
+}
+
+void TIFRaster::Data::Warning(const char *fn, const char *fmt, va_list ap)
+{
+	if(!memcmp(fn, "tiff@", 5) && IsDigit(fn[5])) {
+		int addr = stou(fn + 5);
+		if(addr != -1 && addr != 0) {
+			TIFRaster::Data& wrapper = *reinterpret_cast<TIFRaster::Data *>(addr);
+			LLOG("TIF warning: " << VFormat(fmt, ap));
+//			RLOG("TiffWrapper::Warning: " << wrapper.errors);
+		}
+	}
+}
+
+void TIFRaster::Data::Error(const char *fn, const char *fmt, va_list ap)
+{
+	if(!memcmp(fn, "tiff@", 5) && IsDigit(fn[5])) {
+		int addr = stou(fn + 5);
+		if(addr != -1 && addr != 0) {
+			Data& wrapper = *reinterpret_cast<Data *>(addr);
+			LLOG("TIF error: " << VFormat(fmt, ap));
+//			RLOG("TiffWrapper::Error: " << wrapper.errors);
+		}
+	}
+}
+
+tsize_t TIFRaster::Data::ReadStream(thandle_t fd, tdata_t buf, tsize_t size)
+{
+	Data& wrapper = *reinterpret_cast<Data *>(fd);
+	ASSERT(wrapper.stream.IsOpen());
+//	RLOG("TiffStream::TIFRaster::Data & " << (int)wrapper.stream.GetPos() << ", count = " << size
+//		<< ", end = " << (int)(wrapper.stream.GetPos() + size));
+	return wrapper.stream.Get(buf, size);
+}
+
+tsize_t TIFRaster::Data::WriteStream(thandle_t fd, tdata_t buf, tsize_t size)
+{
+	NEVER();
+	return 0;
+}
+
+toff_t TIFRaster::Data::SeekStream(thandle_t fd, toff_t off, int whence)
+{
+	Data& wrapper = *reinterpret_cast<Data *>(fd);
+	ASSERT(wrapper.stream.IsOpen());
+	toff_t size = (toff_t)wrapper.stream.GetSize();
+	toff_t destpos = (toff_t)(off + (whence == 1 ? wrapper.stream.GetPos() : whence == 2 ? size : 0));
+	wrapper.stream.Seek(destpos);
+//	RLOG("TIFRaster::Data::SeekStream -> " << (int)off << ", whence = " << whence << " -> pos = " << (int)wrapper.stream.GetPos());
+	return (toff_t)wrapper.stream.GetPos();
+}
+
+int TIFRaster::Data::CloseStream(thandle_t fd)
+{
+	return 0;
+}
+
+toff_t TIFRaster::Data::SizeStream(thandle_t fd)
+{
+	Data& wrapper = *reinterpret_cast<Data *>(fd);
+	ASSERT(wrapper.stream.IsOpen());
+//	RLOG("TIFRaster::Data::SizeStream -> " << (int)wrapper.stream.GetSize());
+	return (toff_t)wrapper.stream.GetSize();
+}
+
+int TIFRaster::Data::MapStream(thandle_t fd, tdata_t *pbase, toff_t *psize)
+{
+	return 0;
+}
+
+void TIFRaster::Data::UnmapStream(thandle_t fd, tdata_t base, toff_t size)
+{
+}
+
+TIFRaster::Data::Data(Stream& stream)
+: stream(stream)
+{
+	tiff = NULL;
+	page_index = 0;
+}
+
+TIFRaster::Data::~Data()
+{
+	if(tiff)
+		TIFFClose(tiff);
+}
+
+bool TIFRaster::Data::Create()
+{
+	tiff = TIFFClientOpen("tiff@" + Format64((intptr_t)this), "r", reinterpret_cast<thandle_t>(this),
+		ReadStream, WriteStream, SeekStream, CloseStream, SizeStream, MapStream, UnmapStream);
+	if(!tiff)
+		return false;
+
+	int count = TIFFNumberOfDirectories(tiff);
+	if(count <= 0)
+		return false;
+	for(int i = 0; i < count; i++) {
+		Page& page = pages.Add();
+		TIFFSetDirectory(tiff, i);
+		TIFFGetField(tiff, TIFFTAG_IMAGEWIDTH, &page.width);
+		TIFFGetField(tiff, TIFFTAG_IMAGELENGTH, &page.height);
+		float xres, yres;
+		TIFFGetFieldDefaulted(tiff, TIFFTAG_XRESOLUTION, &xres);
+		TIFFGetFieldDefaulted(tiff, TIFFTAG_YRESOLUTION, &yres);
+		uint16 resunit;
+		TIFFGetFieldDefaulted(tiff, TIFFTAG_RESOLUTIONUNIT, &resunit);
+		TIFFGetFieldDefaulted(tiff, TIFFTAG_BITSPERSAMPLE, &page.bits_per_sample);
+		TIFFGetFieldDefaulted(tiff, TIFFTAG_SAMPLESPERPIXEL, &page.samples_per_pixel);
+		TIFFGetFieldDefaulted(tiff, TIFFTAG_PHOTOMETRIC, &page.photometric);
+		double dots_per_unit = (resunit == RESUNIT_INCH ? 600.0 : resunit == RESUNIT_CENTIMETER
+			? 600.0 / 2.54 : 0);
+		page.dot_size.cx = (xres ? fround(page.width * dots_per_unit / xres) : 0);
+		page.dot_size.cy = (yres ? fround(page.height * dots_per_unit / yres) : 0);
+		page.alpha = false;
+		uint16 extrasamples, *sampletypes;
+		TIFFGetFieldDefaulted(tiff, TIFFTAG_EXTRASAMPLES, &extrasamples, &sampletypes);
+		for(int e = 0; e < extrasamples; e++)
+			if(sampletypes[e] == EXTRASAMPLE_ASSOCALPHA) {
+				page.alpha = true;
+				break;
+			}
+	}
+	return SeekPage(0);
+}
+
+bool TIFRaster::Data::SeekPage(int page)
+{
+	TIFFSetDirectory(tiff, page_index = page);
+	char emsg[1024];
+	if(!TIFFRGBAImageBegin(this, tiff, 0, emsg)) {
+		TIFFError(TIFFFileName(tiff), emsg);
+		return false;
+	}
+
+	if(isContig) {
+		contig = put.contig;
+		put.contig = putContigRGB;
+	}
+	else {
+		separate = put.separate;
+		put.separate = putSeparate;
+	}
+	if(alpha = pages[page_index].alpha) {
+		format.Set32le(0xFF << 16, 0xFF << 8, 0xFF, 0xFF << 24);
+		bpp = 32;
+	}
+	else {
+		format.Set24le(0xFF << 16, 0xFF << 8, 0xFF);
+		bpp = 24;
+	}
+	palette_count = 0;
+	if(isContig	&& (photometric == PHOTOMETRIC_PALETTE
+	|| photometric == PHOTOMETRIC_MINISWHITE || photometric == PHOTOMETRIC_MINISBLACK)
+	&& (bitspersample == 1 || bitspersample == 2 || bitspersample == 4 || bitspersample == 8)) {
+		bpp = 8;
+		tif_uint32 **ppal = (photometric == PHOTOMETRIC_PALETTE ? PALmap : BWmap);
+		ASSERT(ppal);
+//		byte rshift = 8 - img.bitspersample;
+		palette_count = 1 << min<int>(bitspersample, 8);
+		byte mask = (1 << bitspersample) - 1;
+		int part_last = 8 / bitspersample - 1;
+		int i;
+		for(i = 0; i <= mask; i++) {
+			uint32 rgba = ppal[i][part_last];
+			palette[i].r = (byte)TIFFGetR(rgba);
+			palette[i].g = (byte)TIFFGetG(rgba);
+			palette[i].b = (byte)TIFFGetB(rgba);
+			palette[i].a = 255;
+		}
+		put.contig = putContig8;
+		switch(bitspersample) {
+		case 1: bpp = 1; put.contig = putContig1; format.Set1mf(); break;
+		case 2: bpp = 4; put.contig = putContig4; format.Set4mf(); break;
+		case 4: bpp = 4; put.contig = putContig4; format.Set4mf(); break;
+		case 8: format.Set8(); break;
+		default: NEVER();
+		}
+		skewfac = 8 / bitspersample;
+	}
+
+	size = Size(width, height);
+	row_bytes = (bpp * width + 31) >> 5 << 2;
+	int64 bytes = row_bytes * (int64)height;
+	String tmpfile;
+	if(bytes >= 100000000) {
+		tmpfile = GetTempFileName();
+		if(!filebuffer.Open(tmpfile, FileStream::CREATE))
+			return false;
+		filebuffer.SetSize(bytes);
+		if(filebuffer.IsError()) {
+			filebuffer.Close();
+			FileDelete(tmpfile);
+			return false;
+		}
+		rows.Alloc(size.cy);
+	}
+	else
+		imagebuf.SetCount(size.cy * row_bytes, 0);
+
+//	RTIMING("TiffWrapper::GetArray/RGBAImageGet");
+
+	bool res = TIFFRGBAImageGet(this, 0, width, height);
+	TIFFRGBAImageEnd(this);
+
+	if(filebuffer.IsOpen()) {
+		Flush();
+		if(filebuffer.IsError() || !res) {
+			filebuffer.Close();
+			FileDelete(tmpfile);
+			return false;
+		}
+		imagebuf.SetCount(size.cy * row_bytes);
+		filebuffer.Seek(0);
+		filebuffer.GetAll(imagebuf.Begin(), imagebuf.GetCount());
+		filebuffer.Close();
+		FileDelete(tmpfile);
+	}
+//	imagebuf.SetDotSize(pages[page_index].dot_size);
+//	dest_image.palette = palette;
+//	return dest_image;
+	return true;
+}
+
+Raster::Info TIFRaster::Data::GetInfo()
+{
+	const Page& page = pages[page_index];
+	Raster::Info out;
+	out.kind = (page.alpha ? IMAGE_ALPHA : IMAGE_OPAQUE);
+	out.bpp = bpp;
+	out.colors = 0;
+	out.dots = page.dot_size;
+	out.hotspot = Null;
+	return out;
+}
+
+TIFRaster::TIFRaster()
+{
+}
+
+TIFRaster::~TIFRaster()
+{
+}
+
+bool TIFRaster::Create()
+{
+	data = new Data(GetStream());
+	return data->Create();
+}
+
+Size TIFRaster::GetSize()
+{
+	return data->size;
+}
+
+Raster::Info TIFRaster::GetInfo()
+{
+	return data->GetInfo();
+}
+
+Raster::Line TIFRaster::GetLine(int line)
+{
+	return Raster::Line(&data->imagebuf[data->row_bytes * line], this, false);
+}
+
+int TIFRaster::GetPaletteCount()
+{
+	return data->palette_count;
+}
+
+const RGBA *TIFRaster::GetPalette()
+{
+	return data->palette;
+}
+
+const RasterFormat *TIFRaster::GetFormat()
+{
+	return &data->format;
+}
+
+int TIFRaster::GetPageCount()
+{
+	return data->pages.GetCount();
+}
+
+void TIFRaster::SeekPage(int n)
+{
+	data->SeekPage(n);
+}
+
+class TIFEncoder::Data {
+public:
+	Data(Stream& stream, RasterFormat& format);
+	~Data();
+
+	void             Start(Size size, int bpp, const RGBA *palette);
+	void             WriteLineRaw(const byte *line);
+
+private:
+	Stream&          stream;
+	TIFF             *tiff;
+	Size             size;
+	int              bpp;
+	const RGBA       *palette;
+	Vector<byte>     rowbuf;
+	int              linebytes;
+	RasterFormat&    format;
+	int              line;
+
+	static tsize_t   ReadStream(thandle_t fd, tdata_t buf, tsize_t size);
+	static tsize_t   WriteStream(thandle_t fd, tdata_t buf, tsize_t size);
+	static toff_t    SeekStream(thandle_t fd, toff_t off, int whence);
+	static int       CloseStream(thandle_t fd);
+	static toff_t    SizeStream(thandle_t fd);
+	static int       MapStream(thandle_t fd, tdata_t *pbase, toff_t *psize);
+	static void      UnmapStream(thandle_t fd, tdata_t base, toff_t size);
+};
+
+TIFEncoder::Data::Data(Stream& stream, RasterFormat& format)
+: stream(stream), format(format)
+{
+	tiff = NULL;
+}
+
+TIFEncoder::Data::~Data()
+{
+	if(tiff) TIFFClose(tiff);
+}
+
+tsize_t TIFEncoder::Data::ReadStream(thandle_t fd, tdata_t buf, tsize_t size)
+{
+	Data& wrapper = *reinterpret_cast<Data *>(fd);
+	ASSERT(wrapper.stream.IsOpen());
+//	RLOG("TiffStream::ReadStream & " << (int)wrapper.stream.GetPos() << ", count = " << size
+//		<< ", end = " << (int)(wrapper.stream.GetPos() + size));
+	return wrapper.stream.Get(buf, size);
+	return 0;
+}
+
+tsize_t TIFEncoder::Data::WriteStream(thandle_t fd, tdata_t buf, tsize_t size)
+{
+	Data& wrapper = *reinterpret_cast<Data *>(fd);
+	ASSERT(wrapper.stream.IsOpen());
+//	RLOG("TIFRaster::Data::WriteStream & " << (int)wrapper.stream.GetPos() << ", count = " << (int)size
+//		<< ", end = " << (int)(wrapper.stream.GetPos() + size));
+	wrapper.stream.Put(buf, size);
+	return size;
+}
+
+toff_t TIFEncoder::Data::SeekStream(thandle_t fd, toff_t off, int whence)
+{
+	Data& wrapper = *reinterpret_cast<Data *>(fd);
+	ASSERT(wrapper.stream.IsOpen());
+	toff_t size = (toff_t)wrapper.stream.GetSize();
+	toff_t destpos = (toff_t)(off + (whence == 1 ? wrapper.stream.GetPos() : whence == 2 ? size : 0));
+	if(destpos > size) {
+		wrapper.stream.Seek(size);
+		wrapper.stream.Put((int)0, (int)(destpos - size));
+	}
+	else
+		wrapper.stream.Seek(destpos);
+//	RLOG("TIFRaster::Data::SeekStream -> " << (int)off << ", whence = " << whence << " -> pos = " << (int)wrapper.stream.GetPos());
+	return (toff_t)wrapper.stream.GetPos();
+}
+
+int TIFEncoder::Data::CloseStream(thandle_t fd)
+{
+	return 0;
+}
+
+toff_t TIFEncoder::Data::SizeStream(thandle_t fd)
+{
+	Data& wrapper = *reinterpret_cast<Data *>(fd);
+	ASSERT(wrapper.stream.IsOpen());
+//	RLOG("TIFRaster::Data::SizeStream -> " << (int)wrapper.stream.GetSize());
+	return (toff_t)wrapper.stream.GetSize();
+}
+
+int TIFEncoder::Data::MapStream(thandle_t fd, tdata_t *pbase, toff_t *psize)
+{
+	return 0;
+}
+
+void TIFEncoder::Data::UnmapStream(thandle_t fd, tdata_t base, toff_t size)
+{
+}
+
+void TIFEncoder::Data::Start(Size sz, int bpp_, const RGBA *palette)
+{
+	size = sz;
+	bpp = bpp_;
+	line = 0;
+
+	tiff = TIFFClientOpen("tiff@" + Format64((intptr_t)this), "w", reinterpret_cast<thandle_t>(this),
+		ReadStream, WriteStream, SeekStream, CloseStream, SizeStream, MapStream, UnmapStream);
+
+	TIFFSetField(tiff, TIFFTAG_IMAGEWIDTH, size.cx);
+	TIFFSetField(tiff, TIFFTAG_IMAGELENGTH, size.cy);
+	TIFFSetField(tiff, TIFFTAG_BITSPERSAMPLE, min<int>(bpp, 8));
+	TIFFSetField(tiff, TIFFTAG_COMPRESSION, COMPRESSION_PACKBITS);
+	TIFFSetField(tiff, TIFFTAG_PHOTOMETRIC, bpp <= 8 ? PHOTOMETRIC_PALETTE : PHOTOMETRIC_RGB);
+	TIFFSetField(tiff, TIFFTAG_SAMPLESPERPIXEL, bpp <= 8 ? 1 : bpp != 32 ? 3 : 4);
+	TIFFSetField(tiff, TIFFTAG_ROWSPERSTRIP, 1);
+	TIFFSetField(tiff, TIFFTAG_PLANARCONFIG, PLANARCONFIG_CONTIG);
+	if(bpp == 32) {
+		uint16 es = EXTRASAMPLE_ASSOCALPHA;
+		TIFFSetField(tiff, TIFFTAG_EXTRASAMPLES, 1, &es);
+	}
+//	TIFFSetField(tiff, TIFFTAG_REFERENCEBLACKWHITE, refblackwhite);
+//	TIFFSetField(tiff, TIFFTAG_TRANSFERFUNCTION, gray);
+//	TIFFSetField(tiff, TIFFTAG_RESOLUTIONUNIT, RESUNIT_NONE);
+	switch(bpp) {
+		case 1: format.Set1mf(); break;
+		case 2: format.Set2mf(); break;
+		case 4: format.Set4mf(); break;
+		case 8: format.Set8(); break;
+		default: NEVER();
+		case 24: format.Set24le(0xFF, 0xFF << 8, 0xFF << 16); break;
+		case 32: format.Set32le(0xFF, 0xFF << 8, 0xFF << 16, 0xFF << 24); break;
+	}
+	if(bpp <= 8) {
+		uint16 rpal[256], gpal[256], bpal[256];
+		int c = 1 << bpp;
+		memset(rpal, 0, sizeof(uint16) * c);
+		memset(gpal, 0, sizeof(uint16) * c);
+		memset(bpal, 0, sizeof(uint16) * c);
+		for(int i = 0; i < c; i++) {
+			rpal[i] = palette[i].r << 8;
+			gpal[i] = palette[i].g << 8;
+			bpal[i] = palette[i].b << 8;
+		}
+		TIFFSetField(tiff, TIFFTAG_COLORMAP, rpal, gpal, bpal);
+	}
+	int rowbytes = (bpp * size.cx + 31) >> 5 << 2;
+	rowbuf.SetCount(rowbytes);
+	linebytes = format.GetByteCount(size.cx);
+}
+
+void TIFEncoder::Data::WriteLineRaw(const byte *s)
+{
+	memcpy(rowbuf.Begin(), s, linebytes);
+	TIFFWriteScanline(tiff, rowbuf.Begin(), line, 0);
+	if(++line >= size.cy) {
+		TIFFClose(tiff);
+		tiff = NULL;
+	}
+}
+
+TIFEncoder::TIFEncoder(int bpp)
+: bpp(bpp)
+{
+}
+
+TIFEncoder::~TIFEncoder()
+{
+}
+
+int TIFEncoder::GetPaletteCount()
+{
+	return (bpp > 8 ? 0 : 1 << bpp);
+}
+
+void TIFEncoder::Start(Size sz)
+{
+	data = new Data(GetStream(), format);
+	data->Start(sz, bpp, bpp <= 8 ? GetPalette() : NULL);
+}
+
+void TIFEncoder::WriteLineRaw(const byte *s)
+{
+	data->WriteLineRaw(s);
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/plugin/z/init b/uppsrc/plugin/z/init
new file mode 100644
index 000000000..01193ba8e
--- /dev/null
+++ b/uppsrc/plugin/z/init
@@ -0,0 +1,3 @@
+#ifndef _plugin_z_icpp_init_stub
+#define _plugin_z_icpp_init_stub
+#endif
diff --git a/uppsrc/plugin/z/lib/README b/uppsrc/plugin/z/lib/README
new file mode 100644
index 000000000..df95ae13f
--- /dev/null
+++ b/uppsrc/plugin/z/lib/README
@@ -0,0 +1,126 @@
+ZLIB DATA COMPRESSION LIBRARY
+
+zlib 1.2.2 is a general purpose data compression library.  All the code is
+thread safe.  The data format used by the zlib library is described by RFCs
+(Request for Comments) 1950 to 1952 in the files
+http://www.ietf.org/rfc/rfc1950.txt (zlib format), rfc1951.txt (deflate format)
+and rfc1952.txt (gzip format). These documents are also available in other
+formats from ftp://ftp.uu.net/graphics/png/documents/zlib/zdoc-index.html
+
+All functions of the compression library are documented in the file zlib.h
+(volunteer to write man pages welcome, contact zlib@gzip.org). A usage example
+of the library is given in the file example.c which also tests that the library
+is working correctly. Another example is given in the file minigzip.c. The
+compression library itself is composed of all source files except example.c and
+minigzip.c.
+
+To compile all files and run the test program, follow the instructions given at
+the top of Makefile. In short "make test; make install" should work for most
+machines. For Unix: "./configure; make test; make install" For MSDOS, use one
+of the special makefiles such as Makefile.msc. For VMS, use Make_vms.com or
+descrip.mms.
+
+Questions about zlib should be sent to <zlib@gzip.org>, or to Gilles Vollant
+<info@winimage.com> for the Windows DLL version. The zlib home page is
+http://www.zlib.org or http://www.gzip.org/zlib/ Before reporting a problem,
+please check this site to verify that you have the latest version of zlib;
+otherwise get the latest version and check whether the problem still exists or
+not.
+
+PLEASE read the zlib FAQ http://www.gzip.org/zlib/zlib_faq.html before asking
+for help.
+
+Mark Nelson <markn@ieee.org> wrote an article about zlib for the Jan. 1997
+issue of  Dr. Dobb's Journal; a copy of the article is available in
+http://dogma.net/markn/articles/zlibtool/zlibtool.htm
+
+The changes made in version 1.2.2 are documented in the file ChangeLog.
+
+Unsupported third party contributions are provided in directory "contrib".
+
+A Java implementation of zlib is available in the Java Development Kit
+http://java.sun.com/j2se/1.4.2/docs/api/java/util/zip/package-summary.html
+See the zlib home page http://www.zlib.org for details.
+
+A Perl interface to zlib written by Paul Marquess <pmqs@cpan.org> is in the
+CPAN (Comprehensive Perl Archive Network) sites
+http://www.cpan.org/modules/by-module/Compress/
+
+A Python interface to zlib written by A.M. Kuchling <amk@amk.ca> is
+available in Python 1.5 and later versions, see
+http://www.python.org/doc/lib/module-zlib.html
+
+A zlib binding for TCL written by Andreas Kupries <a.kupries@westend.com> is
+availlable at http://www.oche.de/~akupries/soft/trf/trf_zip.html
+
+An experimental package to read and write files in .zip format, written on top
+of zlib by Gilles Vollant <info@winimage.com>, is available in the
+contrib/minizip directory of zlib.
+
+
+Notes for some targets:
+
+- For Windows DLL versions, please see win32/DLL_FAQ.txt
+
+- For 64-bit Irix, deflate.c must be compiled without any optimization. With
+  -O, one libpng test fails. The test works in 32 bit mode (with the -n32
+  compiler flag). The compiler bug has been reported to SGI.
+
+- zlib doesn't work with gcc 2.6.3 on a DEC 3000/300LX under OSF/1 2.1 it works
+  when compiled with cc.
+
+- On Digital Unix 4.0D (formely OSF/1) on AlphaServer, the cc option -std1 is
+  necessary to get gzprintf working correctly. This is done by configure.
+
+- zlib doesn't work on HP-UX 9.05 with some versions of /bin/cc. It works with
+  other compilers. Use "make test" to check your compiler.
+
+- gzdopen is not supported on RISCOS, BEOS and by some Mac compilers.
+
+- For PalmOs, see http://palmzlib.sourceforge.net/
+
+- When building a shared, i.e. dynamic library on Mac OS X, the library must be
+  installed before testing (do "make install" before "make test"), since the
+  library location is specified in the library.
+
+
+Acknowledgments:
+
+  The deflate format used by zlib was defined by Phil Katz. The deflate
+  and zlib specifications were written by L. Peter Deutsch. Thanks to all the
+  people who reported problems and suggested various improvements in zlib;
+  they are too numerous to cite here.
+
+Copyright notice:
+
+ (C) 1995-2004 Jean-loup Gailly and Mark Adler
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  Jean-loup Gailly        Mark Adler
+  jloup@gzip.org          madler@alumni.caltech.edu
+
+If you use the zlib library in a product, we would appreciate *not*
+receiving lengthy legal documents to sign. The sources are provided
+for free but without warranty of any kind.  The library has been
+entirely written by Jean-loup Gailly and Mark Adler; it does not
+include third-party code.
+
+If you redistribute modified sources, we would appreciate that you include
+in the file ChangeLog history information documenting your changes. Please
+read the FAQ for more information on the distribution of modified source
+versions.
diff --git a/uppsrc/plugin/z/lib/adler32.c b/uppsrc/plugin/z/lib/adler32.c
new file mode 100644
index 000000000..b334d7915
--- /dev/null
+++ b/uppsrc/plugin/z/lib/adler32.c
@@ -0,0 +1,48 @@
+/* adler32.c -- compute the Adler-32 checksum of a data stream
+ * Copyright (C) 1995-2002 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/* @(#) $Id: adler32.c,v 1.1 2005/02/07 00:26:07 rylek Exp $ */
+
+#include "zlib.h"
+
+#define BASE 65521L /* largest prime smaller than 65536 */
+#define NMAX 5552
+/* NMAX is the largest n such that 255n(n+1)/2 + (n+1)(BASE-1) <= 2^32-1 */
+
+#define DO1(buf,i)  {s1 += buf[i]; s2 += s1;}
+#define DO2(buf,i)  DO1(buf,i); DO1(buf,i+1);
+#define DO4(buf,i)  DO2(buf,i); DO2(buf,i+2);
+#define DO8(buf,i)  DO4(buf,i); DO4(buf,i+4);
+#define DO16(buf)   DO8(buf,0); DO8(buf,8);
+
+/* ========================================================================= */
+uLong ZEXPORT adler32(adler, buf, len)
+    uLong adler;
+    const Bytef *buf;
+    uInt len;
+{
+    unsigned long s1 = adler & 0xffff;
+    unsigned long s2 = (adler >> 16) & 0xffff;
+    int k;
+
+    if (buf == Z_NULL) return 1L;
+
+    while (len > 0) {
+        k = len < NMAX ? len : NMAX;
+        len -= k;
+        while (k >= 16) {
+            DO16(buf);
+	    buf += 16;
+            k -= 16;
+        }
+        if (k != 0) do {
+            s1 += *buf++;
+	    s2 += s1;
+        } while (--k);
+        s1 %= BASE;
+        s2 %= BASE;
+    }
+    return (s2 << 16) | s1;
+}
diff --git a/uppsrc/plugin/z/lib/compress.c b/uppsrc/plugin/z/lib/compress.c
new file mode 100644
index 000000000..ddea3eaff
--- /dev/null
+++ b/uppsrc/plugin/z/lib/compress.c
@@ -0,0 +1,68 @@
+/* compress.c -- compress a memory buffer
+ * Copyright (C) 1995-2002 Jean-loup Gailly.
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/* @(#) $Id: compress.c,v 1.1 2005/02/07 00:26:07 rylek Exp $ */
+
+#include "zlib.h"
+
+/* ===========================================================================
+     Compresses the source buffer into the destination buffer. The level
+   parameter has the same meaning as in deflateInit.  sourceLen is the byte
+   length of the source buffer. Upon entry, destLen is the total size of the
+   destination buffer, which must be at least 0.1% larger than sourceLen plus
+   12 bytes. Upon exit, destLen is the actual size of the compressed buffer.
+
+     compress2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
+   memory, Z_BUF_ERROR if there was not enough room in the output buffer,
+   Z_STREAM_ERROR if the level parameter is invalid.
+*/
+int ZEXPORT compress2 (dest, destLen, source, sourceLen, level)
+    Bytef *dest;
+    uLongf *destLen;
+    const Bytef *source;
+    uLong sourceLen;
+    int level;
+{
+    z_stream stream;
+    int err;
+
+    stream.next_in = (Bytef*)source;
+    stream.avail_in = (uInt)sourceLen;
+#ifdef MAXSEG_64K
+    /* Check for source > 64K on 16-bit machine: */
+    if ((uLong)stream.avail_in != sourceLen) return Z_BUF_ERROR;
+#endif
+    stream.next_out = dest;
+    stream.avail_out = (uInt)*destLen;
+    if ((uLong)stream.avail_out != *destLen) return Z_BUF_ERROR;
+
+    stream.zalloc = (alloc_func)0;
+    stream.zfree = (free_func)0;
+    stream.opaque = (voidpf)0;
+
+    err = deflateInit(&stream, level);
+    if (err != Z_OK) return err;
+
+    err = deflate(&stream, Z_FINISH);
+    if (err != Z_STREAM_END) {
+        deflateEnd(&stream);
+        return err == Z_OK ? Z_BUF_ERROR : err;
+    }
+    *destLen = stream.total_out;
+
+    err = deflateEnd(&stream);
+    return err;
+}
+
+/* ===========================================================================
+ */
+int ZEXPORT compress (dest, destLen, source, sourceLen)
+    Bytef *dest;
+    uLongf *destLen;
+    const Bytef *source;
+    uLong sourceLen;
+{
+    return compress2(dest, destLen, source, sourceLen, Z_DEFAULT_COMPRESSION);
+}
diff --git a/uppsrc/plugin/z/lib/crc32.c b/uppsrc/plugin/z/lib/crc32.c
new file mode 100644
index 000000000..24230e7ef
--- /dev/null
+++ b/uppsrc/plugin/z/lib/crc32.c
@@ -0,0 +1,162 @@
+/* crc32.c -- compute the CRC-32 of a data stream
+ * Copyright (C) 1995-2002 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/* @(#) $Id: crc32.c,v 1.1 2005/02/07 00:26:07 rylek Exp $ */
+
+#include "zlib.h"
+
+#define local static
+
+#ifdef DYNAMIC_CRC_TABLE
+
+local int crc_table_empty = 1;
+local uLongf crc_table[256];
+local void make_crc_table OF((void));
+
+/*
+  Generate a table for a byte-wise 32-bit CRC calculation on the polynomial:
+  x^32+x^26+x^23+x^22+x^16+x^12+x^11+x^10+x^8+x^7+x^5+x^4+x^2+x+1.
+
+  Polynomials over GF(2) are represented in binary, one bit per coefficient,
+  with the lowest powers in the most significant bit.  Then adding polynomials
+  is just exclusive-or, and multiplying a polynomial by x is a right shift by
+  one.  If we call the above polynomial p, and represent a byte as the
+  polynomial q, also with the lowest power in the most significant bit (so the
+  byte 0xb1 is the polynomial x^7+x^3+x+1), then the CRC is (q*x^32) mod p,
+  where a mod b means the remainder after dividing a by b.
+
+  This calculation is done using the shift-register method of multiplying and
+  taking the remainder.  The register is initialized to zero, and for each
+  incoming bit, x^32 is added mod p to the register if the bit is a one (where
+  x^32 mod p is p+x^32 = x^26+...+1), and the register is multiplied mod p by
+  x (which is shifting right by one and adding x^32 mod p if the bit shifted
+  out is a one).  We start with the highest power (least significant bit) of
+  q and repeat for all eight bits of q.
+
+  The table is simply the CRC of all possible eight bit values.  This is all
+  the information needed to generate CRC's on data a byte at a time for all
+  combinations of CRC register values and incoming bytes.
+*/
+local void make_crc_table()
+{
+  uLong c;
+  int n, k;
+  uLong poly;            /* polynomial exclusive-or pattern */
+  /* terms of polynomial defining this crc (except x^32): */
+  static const Byte p[] = {0,1,2,4,5,7,8,10,11,12,16,22,23,26};
+
+  /* make exclusive-or pattern from polynomial (0xedb88320L) */
+  poly = 0L;
+  for (n = 0; n < sizeof(p)/sizeof(Byte); n++)
+    poly |= 1L << (31 - p[n]);
+
+  for (n = 0; n < 256; n++)
+  {
+    c = (uLong)n;
+    for (k = 0; k < 8; k++)
+      c = c & 1 ? poly ^ (c >> 1) : c >> 1;
+    crc_table[n] = c;
+  }
+  crc_table_empty = 0;
+}
+#else
+/* ========================================================================
+ * Table of CRC-32's of all single-byte values (made by make_crc_table)
+ */
+local const uLongf crc_table[256] = {
+  0x00000000L, 0x77073096L, 0xee0e612cL, 0x990951baL, 0x076dc419L,
+  0x706af48fL, 0xe963a535L, 0x9e6495a3L, 0x0edb8832L, 0x79dcb8a4L,
+  0xe0d5e91eL, 0x97d2d988L, 0x09b64c2bL, 0x7eb17cbdL, 0xe7b82d07L,
+  0x90bf1d91L, 0x1db71064L, 0x6ab020f2L, 0xf3b97148L, 0x84be41deL,
+  0x1adad47dL, 0x6ddde4ebL, 0xf4d4b551L, 0x83d385c7L, 0x136c9856L,
+  0x646ba8c0L, 0xfd62f97aL, 0x8a65c9ecL, 0x14015c4fL, 0x63066cd9L,
+  0xfa0f3d63L, 0x8d080df5L, 0x3b6e20c8L, 0x4c69105eL, 0xd56041e4L,
+  0xa2677172L, 0x3c03e4d1L, 0x4b04d447L, 0xd20d85fdL, 0xa50ab56bL,
+  0x35b5a8faL, 0x42b2986cL, 0xdbbbc9d6L, 0xacbcf940L, 0x32d86ce3L,
+  0x45df5c75L, 0xdcd60dcfL, 0xabd13d59L, 0x26d930acL, 0x51de003aL,
+  0xc8d75180L, 0xbfd06116L, 0x21b4f4b5L, 0x56b3c423L, 0xcfba9599L,
+  0xb8bda50fL, 0x2802b89eL, 0x5f058808L, 0xc60cd9b2L, 0xb10be924L,
+  0x2f6f7c87L, 0x58684c11L, 0xc1611dabL, 0xb6662d3dL, 0x76dc4190L,
+  0x01db7106L, 0x98d220bcL, 0xefd5102aL, 0x71b18589L, 0x06b6b51fL,
+  0x9fbfe4a5L, 0xe8b8d433L, 0x7807c9a2L, 0x0f00f934L, 0x9609a88eL,
+  0xe10e9818L, 0x7f6a0dbbL, 0x086d3d2dL, 0x91646c97L, 0xe6635c01L,
+  0x6b6b51f4L, 0x1c6c6162L, 0x856530d8L, 0xf262004eL, 0x6c0695edL,
+  0x1b01a57bL, 0x8208f4c1L, 0xf50fc457L, 0x65b0d9c6L, 0x12b7e950L,
+  0x8bbeb8eaL, 0xfcb9887cL, 0x62dd1ddfL, 0x15da2d49L, 0x8cd37cf3L,
+  0xfbd44c65L, 0x4db26158L, 0x3ab551ceL, 0xa3bc0074L, 0xd4bb30e2L,
+  0x4adfa541L, 0x3dd895d7L, 0xa4d1c46dL, 0xd3d6f4fbL, 0x4369e96aL,
+  0x346ed9fcL, 0xad678846L, 0xda60b8d0L, 0x44042d73L, 0x33031de5L,
+  0xaa0a4c5fL, 0xdd0d7cc9L, 0x5005713cL, 0x270241aaL, 0xbe0b1010L,
+  0xc90c2086L, 0x5768b525L, 0x206f85b3L, 0xb966d409L, 0xce61e49fL,
+  0x5edef90eL, 0x29d9c998L, 0xb0d09822L, 0xc7d7a8b4L, 0x59b33d17L,
+  0x2eb40d81L, 0xb7bd5c3bL, 0xc0ba6cadL, 0xedb88320L, 0x9abfb3b6L,
+  0x03b6e20cL, 0x74b1d29aL, 0xead54739L, 0x9dd277afL, 0x04db2615L,
+  0x73dc1683L, 0xe3630b12L, 0x94643b84L, 0x0d6d6a3eL, 0x7a6a5aa8L,
+  0xe40ecf0bL, 0x9309ff9dL, 0x0a00ae27L, 0x7d079eb1L, 0xf00f9344L,
+  0x8708a3d2L, 0x1e01f268L, 0x6906c2feL, 0xf762575dL, 0x806567cbL,
+  0x196c3671L, 0x6e6b06e7L, 0xfed41b76L, 0x89d32be0L, 0x10da7a5aL,
+  0x67dd4accL, 0xf9b9df6fL, 0x8ebeeff9L, 0x17b7be43L, 0x60b08ed5L,
+  0xd6d6a3e8L, 0xa1d1937eL, 0x38d8c2c4L, 0x4fdff252L, 0xd1bb67f1L,
+  0xa6bc5767L, 0x3fb506ddL, 0x48b2364bL, 0xd80d2bdaL, 0xaf0a1b4cL,
+  0x36034af6L, 0x41047a60L, 0xdf60efc3L, 0xa867df55L, 0x316e8eefL,
+  0x4669be79L, 0xcb61b38cL, 0xbc66831aL, 0x256fd2a0L, 0x5268e236L,
+  0xcc0c7795L, 0xbb0b4703L, 0x220216b9L, 0x5505262fL, 0xc5ba3bbeL,
+  0xb2bd0b28L, 0x2bb45a92L, 0x5cb36a04L, 0xc2d7ffa7L, 0xb5d0cf31L,
+  0x2cd99e8bL, 0x5bdeae1dL, 0x9b64c2b0L, 0xec63f226L, 0x756aa39cL,
+  0x026d930aL, 0x9c0906a9L, 0xeb0e363fL, 0x72076785L, 0x05005713L,
+  0x95bf4a82L, 0xe2b87a14L, 0x7bb12baeL, 0x0cb61b38L, 0x92d28e9bL,
+  0xe5d5be0dL, 0x7cdcefb7L, 0x0bdbdf21L, 0x86d3d2d4L, 0xf1d4e242L,
+  0x68ddb3f8L, 0x1fda836eL, 0x81be16cdL, 0xf6b9265bL, 0x6fb077e1L,
+  0x18b74777L, 0x88085ae6L, 0xff0f6a70L, 0x66063bcaL, 0x11010b5cL,
+  0x8f659effL, 0xf862ae69L, 0x616bffd3L, 0x166ccf45L, 0xa00ae278L,
+  0xd70dd2eeL, 0x4e048354L, 0x3903b3c2L, 0xa7672661L, 0xd06016f7L,
+  0x4969474dL, 0x3e6e77dbL, 0xaed16a4aL, 0xd9d65adcL, 0x40df0b66L,
+  0x37d83bf0L, 0xa9bcae53L, 0xdebb9ec5L, 0x47b2cf7fL, 0x30b5ffe9L,
+  0xbdbdf21cL, 0xcabac28aL, 0x53b39330L, 0x24b4a3a6L, 0xbad03605L,
+  0xcdd70693L, 0x54de5729L, 0x23d967bfL, 0xb3667a2eL, 0xc4614ab8L,
+  0x5d681b02L, 0x2a6f2b94L, 0xb40bbe37L, 0xc30c8ea1L, 0x5a05df1bL,
+  0x2d02ef8dL
+};
+#endif
+
+/* =========================================================================
+ * This function can be used by asm versions of crc32()
+ */
+const uLongf * ZEXPORT get_crc_table()
+{
+#ifdef DYNAMIC_CRC_TABLE
+  if (crc_table_empty) make_crc_table();
+#endif
+  return (const uLongf *)crc_table;
+}
+
+/* ========================================================================= */
+#define DO1(buf) crc = crc_table[((int)crc ^ (*buf++)) & 0xff] ^ (crc >> 8);
+#define DO2(buf)  DO1(buf); DO1(buf);
+#define DO4(buf)  DO2(buf); DO2(buf);
+#define DO8(buf)  DO4(buf); DO4(buf);
+
+/* ========================================================================= */
+uLong ZEXPORT crc32(crc, buf, len)
+    uLong crc;
+    const Bytef *buf;
+    uInt len;
+{
+    if (buf == Z_NULL) return 0L;
+#ifdef DYNAMIC_CRC_TABLE
+    if (crc_table_empty)
+      make_crc_table();
+#endif
+    crc = crc ^ 0xffffffffL;
+    while (len >= 8)
+    {
+      DO8(buf);
+      len -= 8;
+    }
+    if (len) do {
+      DO1(buf);
+    } while (--len);
+    return crc ^ 0xffffffffL;
+}
diff --git a/uppsrc/plugin/z/lib/deflate.c b/uppsrc/plugin/z/lib/deflate.c
new file mode 100644
index 000000000..bbac9118c
--- /dev/null
+++ b/uppsrc/plugin/z/lib/deflate.c
@@ -0,0 +1,1350 @@
+/* deflate.c -- compress data using the deflation algorithm
+ * Copyright (C) 1995-2002 Jean-loup Gailly.
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/*
+ *  ALGORITHM
+ *
+ *      The "deflation" process depends on being able to identify portions
+ *      of the input text which are identical to earlier input (within a
+ *      sliding window trailing behind the input currently being processed).
+ *
+ *      The most straightforward technique turns out to be the fastest for
+ *      most input files: try all possible matches and select the longest.
+ *      The key feature of this algorithm is that insertions into the string
+ *      dictionary are very simple and thus fast, and deletions are avoided
+ *      completely. Insertions are performed at each input character, whereas
+ *      string matches are performed only when the previous match ends. So it
+ *      is preferable to spend more time in matches to allow very fast string
+ *      insertions and avoid deletions. The matching algorithm for small
+ *      strings is inspired from that of Rabin & Karp. A brute force approach
+ *      is used to find longer strings when a small match has been found.
+ *      A similar algorithm is used in comic (by Jan-Mark Wams) and freeze
+ *      (by Leonid Broukhis).
+ *         A previous version of this file used a more sophisticated algorithm
+ *      (by Fiala and Greene) which is guaranteed to run in linear amortized
+ *      time, but has a larger average cost, uses more memory and is patented.
+ *      However the F&G algorithm may be faster for some highly redundant
+ *      files if the parameter max_chain_length (described below) is too large.
+ *
+ *  ACKNOWLEDGEMENTS
+ *
+ *      The idea of lazy evaluation of matches is due to Jan-Mark Wams, and
+ *      I found it in 'freeze' written by Leonid Broukhis.
+ *      Thanks to many people for bug reports and testing.
+ *
+ *  REFERENCES
+ *
+ *      Deutsch, L.P.,"DEFLATE Compressed Data Format Specification".
+ *      Available in ftp://ds.internic.net/rfc/rfc1951.txt
+ *
+ *      A description of the Rabin and Karp algorithm is given in the book
+ *         "Algorithms" by R. Sedgewick, Addison-Wesley, p252.
+ *
+ *      Fiala,E.R., and Greene,D.H.
+ *         Data Compression with Finite Windows, Comm.ACM, 32,4 (1989) 490-595
+ *
+ */
+
+/* @(#) $Id: deflate.c,v 1.1 2005/02/07 00:26:07 rylek Exp $ */
+
+#include "deflate.h"
+
+const char deflate_copyright[] =
+   " deflate 1.1.4 Copyright 1995-2002 Jean-loup Gailly ";
+/*
+  If you use the zlib library in a product, an acknowledgment is welcome
+  in the documentation of your product. If for some reason you cannot
+  include such an acknowledgment, I would appreciate that you keep this
+  copyright string in the executable of your product.
+ */
+
+/* ===========================================================================
+ *  Function prototypes.
+ */
+typedef enum {
+    need_more,      /* block not completed, need more input or more output */
+    block_done,     /* block flush performed */
+    finish_started, /* finish started, need only more output at next deflate */
+    finish_done     /* finish done, accept no more input or output */
+} block_state;
+
+typedef block_state (*compress_func) OF((deflate_state *s, int flush));
+/* Compression function. Returns the block state after the call. */
+
+local void fill_window    OF((deflate_state *s));
+local block_state deflate_stored OF((deflate_state *s, int flush));
+local block_state deflate_fast   OF((deflate_state *s, int flush));
+local block_state deflate_slow   OF((deflate_state *s, int flush));
+local void lm_init        OF((deflate_state *s));
+local void putShortMSB    OF((deflate_state *s, uInt b));
+local void flush_pending  OF((z_streamp strm));
+local int read_buf        OF((z_streamp strm, Bytef *buf, unsigned size));
+#ifdef ASMV
+      void match_init OF((void)); /* asm code initialization */
+      uInt longest_match  OF((deflate_state *s, IPos cur_match));
+#else
+local uInt longest_match  OF((deflate_state *s, IPos cur_match));
+#endif
+
+#ifdef DEBUG
+local  void check_match OF((deflate_state *s, IPos start, IPos match,
+                            int length));
+#endif
+
+/* ===========================================================================
+ * Local data
+ */
+
+#define NIL 0
+/* Tail of hash chains */
+
+#ifndef TOO_FAR
+#  define TOO_FAR 4096
+#endif
+/* Matches of length 3 are discarded if their distance exceeds TOO_FAR */
+
+#define MIN_LOOKAHEAD (MAX_MATCH+MIN_MATCH+1)
+/* Minimum amount of lookahead, except at the end of the input file.
+ * See deflate.c for comments about the MIN_MATCH+1.
+ */
+
+/* Values for max_lazy_match, good_match and max_chain_length, depending on
+ * the desired pack level (0..9). The values given below have been tuned to
+ * exclude worst case performance for pathological files. Better values may be
+ * found for specific files.
+ */
+typedef struct config_s {
+   ush good_length; /* reduce lazy search above this match length */
+   ush max_lazy;    /* do not perform lazy search above this match length */
+   ush nice_length; /* quit search above this match length */
+   ush max_chain;
+   compress_func func;
+} config;
+
+local const config configuration_table[10] = {
+/*      good lazy nice chain */
+/* 0 */ {0,    0,  0,    0, deflate_stored},  /* store only */
+/* 1 */ {4,    4,  8,    4, deflate_fast}, /* maximum speed, no lazy matches */
+/* 2 */ {4,    5, 16,    8, deflate_fast},
+/* 3 */ {4,    6, 32,   32, deflate_fast},
+
+/* 4 */ {4,    4, 16,   16, deflate_slow},  /* lazy matches */
+/* 5 */ {8,   16, 32,   32, deflate_slow},
+/* 6 */ {8,   16, 128, 128, deflate_slow},
+/* 7 */ {8,   32, 128, 256, deflate_slow},
+/* 8 */ {32, 128, 258, 1024, deflate_slow},
+/* 9 */ {32, 258, 258, 4096, deflate_slow}}; /* maximum compression */
+
+/* Note: the deflate() code requires max_lazy >= MIN_MATCH and max_chain >= 4
+ * For deflate_fast() (levels <= 3) good is ignored and lazy has a different
+ * meaning.
+ */
+
+#define EQUAL 0
+/* result of memcmp for equal strings */
+
+struct static_tree_desc_s {int dummy;}; /* for buggy compilers */
+
+/* ===========================================================================
+ * Update a hash value with the given input byte
+ * IN  assertion: all calls to to UPDATE_HASH are made with consecutive
+ *    input characters, so that a running hash key can be computed from the
+ *    previous key instead of complete recalculation each time.
+ */
+#define UPDATE_HASH(s,h,c) (h = (((h)<<s->hash_shift) ^ (c)) & s->hash_mask)
+
+
+/* ===========================================================================
+ * Insert string str in the dictionary and set match_head to the previous head
+ * of the hash chain (the most recent string with same hash key). Return
+ * the previous length of the hash chain.
+ * If this file is compiled with -DFASTEST, the compression level is forced
+ * to 1, and no hash chains are maintained.
+ * IN  assertion: all calls to to INSERT_STRING are made with consecutive
+ *    input characters and the first MIN_MATCH bytes of str are valid
+ *    (except for the last MIN_MATCH-1 bytes of the input file).
+ */
+#ifdef FASTEST
+#define INSERT_STRING(s, str, match_head) \
+   (UPDATE_HASH(s, s->ins_h, s->window[(str) + (MIN_MATCH-1)]), \
+    match_head = s->head[s->ins_h], \
+    s->head[s->ins_h] = (Pos)(str))
+#else
+#define INSERT_STRING(s, str, match_head) \
+   (UPDATE_HASH(s, s->ins_h, s->window[(str) + (MIN_MATCH-1)]), \
+    s->prev[(str) & s->w_mask] = match_head = s->head[s->ins_h], \
+    s->head[s->ins_h] = (Pos)(str))
+#endif
+
+/* ===========================================================================
+ * Initialize the hash table (avoiding 64K overflow for 16 bit systems).
+ * prev[] will be initialized on the fly.
+ */
+#define CLEAR_HASH(s) \
+    s->head[s->hash_size-1] = NIL; \
+    zmemzero((Bytef *)s->head, (unsigned)(s->hash_size-1)*sizeof(*s->head));
+
+/* ========================================================================= */
+int ZEXPORT deflateInit_(strm, level, version, stream_size)
+    z_streamp strm;
+    int level;
+    const char *version;
+    int stream_size;
+{
+    return deflateInit2_(strm, level, Z_DEFLATED, MAX_WBITS, DEF_MEM_LEVEL,
+			 Z_DEFAULT_STRATEGY, version, stream_size);
+    /* To do: ignore strm->next_in if we use it as window */
+}
+
+/* ========================================================================= */
+int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy,
+		  version, stream_size)
+    z_streamp strm;
+    int  level;
+    int  method;
+    int  windowBits;
+    int  memLevel;
+    int  strategy;
+    const char *version;
+    int stream_size;
+{
+    deflate_state *s;
+    int noheader = 0;
+    static const char* my_version = ZLIB_VERSION;
+
+    ushf *overlay;
+    /* We overlay pending_buf and d_buf+l_buf. This works since the average
+     * output size for (length,distance) codes is <= 24 bits.
+     */
+
+    if (version == Z_NULL || version[0] != my_version[0] ||
+        stream_size != sizeof(z_stream)) {
+	return Z_VERSION_ERROR;
+    }
+    if (strm == Z_NULL) return Z_STREAM_ERROR;
+
+    strm->msg = Z_NULL;
+    if (strm->zalloc == Z_NULL) {
+	strm->zalloc = zcalloc;
+	strm->opaque = (voidpf)0;
+    }
+    if (strm->zfree == Z_NULL) strm->zfree = zcfree;
+
+    if (level == Z_DEFAULT_COMPRESSION) level = 6;
+#ifdef FASTEST
+    level = 1;
+#endif
+
+    if (windowBits < 0) { /* undocumented feature: suppress zlib header */
+        noheader = 1;
+        windowBits = -windowBits;
+    }
+    if (memLevel < 1 || memLevel > MAX_MEM_LEVEL || method != Z_DEFLATED ||
+        windowBits < 9 || windowBits > 15 || level < 0 || level > 9 ||
+	strategy < 0 || strategy > Z_HUFFMAN_ONLY) {
+        return Z_STREAM_ERROR;
+    }
+    s = (deflate_state *) ZALLOC(strm, 1, sizeof(deflate_state));
+    if (s == Z_NULL) return Z_MEM_ERROR;
+    strm->state = (struct internal_state FAR *)s;
+    s->strm = strm;
+
+    s->noheader = noheader;
+    s->w_bits = windowBits;
+    s->w_size = 1 << s->w_bits;
+    s->w_mask = s->w_size - 1;
+
+    s->hash_bits = memLevel + 7;
+    s->hash_size = 1 << s->hash_bits;
+    s->hash_mask = s->hash_size - 1;
+    s->hash_shift =  ((s->hash_bits+MIN_MATCH-1)/MIN_MATCH);
+
+    s->window = (Bytef *) ZALLOC(strm, s->w_size, 2*sizeof(Byte));
+    s->prev   = (Posf *)  ZALLOC(strm, s->w_size, sizeof(Pos));
+    s->head   = (Posf *)  ZALLOC(strm, s->hash_size, sizeof(Pos));
+
+    s->lit_bufsize = 1 << (memLevel + 6); /* 16K elements by default */
+
+    overlay = (ushf *) ZALLOC(strm, s->lit_bufsize, sizeof(ush)+2);
+    s->pending_buf = (uchf *) overlay;
+    s->pending_buf_size = (ulg)s->lit_bufsize * (sizeof(ush)+2L);
+
+    if (s->window == Z_NULL || s->prev == Z_NULL || s->head == Z_NULL ||
+        s->pending_buf == Z_NULL) {
+        strm->msg = (char*)ERR_MSG(Z_MEM_ERROR);
+        deflateEnd (strm);
+        return Z_MEM_ERROR;
+    }
+    s->d_buf = overlay + s->lit_bufsize/sizeof(ush);
+    s->l_buf = s->pending_buf + (1+sizeof(ush))*s->lit_bufsize;
+
+    s->level = level;
+    s->strategy = strategy;
+    s->method = (Byte)method;
+
+    return deflateReset(strm);
+}
+
+/* ========================================================================= */
+int ZEXPORT deflateSetDictionary (strm, dictionary, dictLength)
+    z_streamp strm;
+    const Bytef *dictionary;
+    uInt  dictLength;
+{
+    deflate_state *s;
+    uInt length = dictLength;
+    uInt n;
+    IPos hash_head = 0;
+
+    if (strm == Z_NULL || strm->state == Z_NULL || dictionary == Z_NULL ||
+        strm->state->status != INIT_STATE) return Z_STREAM_ERROR;
+
+    s = strm->state;
+    strm->adler = adler32(strm->adler, dictionary, dictLength);
+
+    if (length < MIN_MATCH) return Z_OK;
+    if (length > MAX_DIST(s)) {
+	length = MAX_DIST(s);
+#ifndef USE_DICT_HEAD
+	dictionary += dictLength - length; /* use the tail of the dictionary */
+#endif
+    }
+    zmemcpy(s->window, dictionary, length);
+    s->strstart = length;
+    s->block_start = (long)length;
+
+    /* Insert all strings in the hash table (except for the last two bytes).
+     * s->lookahead stays null, so s->ins_h will be recomputed at the next
+     * call of fill_window.
+     */
+    s->ins_h = s->window[0];
+    UPDATE_HASH(s, s->ins_h, s->window[1]);
+    for (n = 0; n <= length - MIN_MATCH; n++) {
+	INSERT_STRING(s, n, hash_head);
+    }
+    if (hash_head) hash_head = 0;  /* to make compiler happy */
+    return Z_OK;
+}
+
+/* ========================================================================= */
+int ZEXPORT deflateReset (strm)
+    z_streamp strm;
+{
+    deflate_state *s;
+
+    if (strm == Z_NULL || strm->state == Z_NULL ||
+        strm->zalloc == Z_NULL || strm->zfree == Z_NULL) return Z_STREAM_ERROR;
+
+    strm->total_in = strm->total_out = 0;
+    strm->msg = Z_NULL; /* use zfree if we ever allocate msg dynamically */
+    strm->data_type = Z_UNKNOWN;
+
+    s = (deflate_state *)strm->state;
+    s->pending = 0;
+    s->pending_out = s->pending_buf;
+
+    if (s->noheader < 0) {
+        s->noheader = 0; /* was set to -1 by deflate(..., Z_FINISH); */
+    }
+    s->status = s->noheader ? BUSY_STATE : INIT_STATE;
+    strm->adler = 1;
+    s->last_flush = Z_NO_FLUSH;
+
+    _tr_init(s);
+    lm_init(s);
+
+    return Z_OK;
+}
+
+/* ========================================================================= */
+int ZEXPORT deflateParams(strm, level, strategy)
+    z_streamp strm;
+    int level;
+    int strategy;
+{
+    deflate_state *s;
+    compress_func func;
+    int err = Z_OK;
+
+    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+    s = strm->state;
+
+    if (level == Z_DEFAULT_COMPRESSION) {
+	level = 6;
+    }
+    if (level < 0 || level > 9 || strategy < 0 || strategy > Z_HUFFMAN_ONLY) {
+	return Z_STREAM_ERROR;
+    }
+    func = configuration_table[s->level].func;
+
+    if (func != configuration_table[level].func && strm->total_in != 0) {
+	/* Flush the last buffer: */
+	err = deflate(strm, Z_PARTIAL_FLUSH);
+    }
+    if (s->level != level) {
+	s->level = level;
+	s->max_lazy_match   = configuration_table[level].max_lazy;
+	s->good_match       = configuration_table[level].good_length;
+	s->nice_match       = configuration_table[level].nice_length;
+	s->max_chain_length = configuration_table[level].max_chain;
+    }
+    s->strategy = strategy;
+    return err;
+}
+
+/* =========================================================================
+ * Put a short in the pending buffer. The 16-bit value is put in MSB order.
+ * IN assertion: the stream state is correct and there is enough room in
+ * pending_buf.
+ */
+local void putShortMSB (s, b)
+    deflate_state *s;
+    uInt b;
+{
+    put_byte(s, (Byte)(b >> 8));
+    put_byte(s, (Byte)(b & 0xff));
+}
+
+/* =========================================================================
+ * Flush as much pending output as possible. All deflate() output goes
+ * through this function so some applications may wish to modify it
+ * to avoid allocating a large strm->next_out buffer and copying into it.
+ * (See also read_buf()).
+ */
+local void flush_pending(strm)
+    z_streamp strm;
+{
+    unsigned len = strm->state->pending;
+
+    if (len > strm->avail_out) len = strm->avail_out;
+    if (len == 0) return;
+
+    zmemcpy(strm->next_out, strm->state->pending_out, len);
+    strm->next_out  += len;
+    strm->state->pending_out  += len;
+    strm->total_out += len;
+    strm->avail_out  -= len;
+    strm->state->pending -= len;
+    if (strm->state->pending == 0) {
+        strm->state->pending_out = strm->state->pending_buf;
+    }
+}
+
+/* ========================================================================= */
+int ZEXPORT deflate (strm, flush)
+    z_streamp strm;
+    int flush;
+{
+    int old_flush; /* value of flush param for previous deflate call */
+    deflate_state *s;
+
+    if (strm == Z_NULL || strm->state == Z_NULL ||
+	flush > Z_FINISH || flush < 0) {
+        return Z_STREAM_ERROR;
+    }
+    s = strm->state;
+
+    if (strm->next_out == Z_NULL ||
+        (strm->next_in == Z_NULL && strm->avail_in != 0) ||
+	(s->status == FINISH_STATE && flush != Z_FINISH)) {
+        ERR_RETURN(strm, Z_STREAM_ERROR);
+    }
+    if (strm->avail_out == 0) ERR_RETURN(strm, Z_BUF_ERROR);
+
+    s->strm = strm; /* just in case */
+    old_flush = s->last_flush;
+    s->last_flush = flush;
+
+    /* Write the zlib header */
+    if (s->status == INIT_STATE) {
+
+        uInt header = (Z_DEFLATED + ((s->w_bits-8)<<4)) << 8;
+        uInt level_flags = (s->level-1) >> 1;
+
+        if (level_flags > 3) level_flags = 3;
+        header |= (level_flags << 6);
+	if (s->strstart != 0) header |= PRESET_DICT;
+        header += 31 - (header % 31);
+
+        s->status = BUSY_STATE;
+        putShortMSB(s, header);
+
+	/* Save the adler32 of the preset dictionary: */
+	if (s->strstart != 0) {
+	    putShortMSB(s, (uInt)(strm->adler >> 16));
+	    putShortMSB(s, (uInt)(strm->adler & 0xffff));
+	}
+	strm->adler = 1L;
+    }
+
+    /* Flush as much pending output as possible */
+    if (s->pending != 0) {
+        flush_pending(strm);
+        if (strm->avail_out == 0) {
+	    /* Since avail_out is 0, deflate will be called again with
+	     * more output space, but possibly with both pending and
+	     * avail_in equal to zero. There won't be anything to do,
+	     * but this is not an error situation so make sure we
+	     * return OK instead of BUF_ERROR at next call of deflate:
+             */
+	    s->last_flush = -1;
+	    return Z_OK;
+	}
+
+    /* Make sure there is something to do and avoid duplicate consecutive
+     * flushes. For repeated and useless calls with Z_FINISH, we keep
+     * returning Z_STREAM_END instead of Z_BUFF_ERROR.
+     */
+    } else if (strm->avail_in == 0 && flush <= old_flush &&
+	       flush != Z_FINISH) {
+        ERR_RETURN(strm, Z_BUF_ERROR);
+    }
+
+    /* User must not provide more input after the first FINISH: */
+    if (s->status == FINISH_STATE && strm->avail_in != 0) {
+        ERR_RETURN(strm, Z_BUF_ERROR);
+    }
+
+    /* Start a new block or continue the current one.
+     */
+    if (strm->avail_in != 0 || s->lookahead != 0 ||
+        (flush != Z_NO_FLUSH && s->status != FINISH_STATE)) {
+        block_state bstate;
+
+	bstate = (*(configuration_table[s->level].func))(s, flush);
+
+        if (bstate == finish_started || bstate == finish_done) {
+            s->status = FINISH_STATE;
+        }
+        if (bstate == need_more || bstate == finish_started) {
+	    if (strm->avail_out == 0) {
+	        s->last_flush = -1; /* avoid BUF_ERROR next call, see above */
+	    }
+	    return Z_OK;
+	    /* If flush != Z_NO_FLUSH && avail_out == 0, the next call
+	     * of deflate should use the same flush parameter to make sure
+	     * that the flush is complete. So we don't have to output an
+	     * empty block here, this will be done at next call. This also
+	     * ensures that for a very small output buffer, we emit at most
+	     * one empty block.
+	     */
+	}
+        if (bstate == block_done) {
+            if (flush == Z_PARTIAL_FLUSH) {
+                _tr_align(s);
+            } else { /* FULL_FLUSH or SYNC_FLUSH */
+                _tr_stored_block(s, (char*)0, 0L, 0);
+                /* For a full flush, this empty block will be recognized
+                 * as a special marker by inflate_sync().
+                 */
+                if (flush == Z_FULL_FLUSH) {
+                    CLEAR_HASH(s);             /* forget history */
+                }
+            }
+            flush_pending(strm);
+	    if (strm->avail_out == 0) {
+	      s->last_flush = -1; /* avoid BUF_ERROR at next call, see above */
+	      return Z_OK;
+	    }
+        }
+    }
+    Assert(strm->avail_out > 0, "bug2");
+
+    if (flush != Z_FINISH) return Z_OK;
+    if (s->noheader) return Z_STREAM_END;
+
+    /* Write the zlib trailer (adler32) */
+    putShortMSB(s, (uInt)(strm->adler >> 16));
+    putShortMSB(s, (uInt)(strm->adler & 0xffff));
+    flush_pending(strm);
+    /* If avail_out is zero, the application will call deflate again
+     * to flush the rest.
+     */
+    s->noheader = -1; /* write the trailer only once! */
+    return s->pending != 0 ? Z_OK : Z_STREAM_END;
+}
+
+/* ========================================================================= */
+int ZEXPORT deflateEnd (strm)
+    z_streamp strm;
+{
+    int status;
+
+    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+
+    status = strm->state->status;
+    if (status != INIT_STATE && status != BUSY_STATE &&
+	status != FINISH_STATE) {
+      return Z_STREAM_ERROR;
+    }
+
+    /* Deallocate in reverse order of allocations: */
+    TRY_FREE(strm, strm->state->pending_buf);
+    TRY_FREE(strm, strm->state->head);
+    TRY_FREE(strm, strm->state->prev);
+    TRY_FREE(strm, strm->state->window);
+
+    ZFREE(strm, strm->state);
+    strm->state = Z_NULL;
+
+    return status == BUSY_STATE ? Z_DATA_ERROR : Z_OK;
+}
+
+/* =========================================================================
+ * Copy the source state to the destination state.
+ * To simplify the source, this is not supported for 16-bit MSDOS (which
+ * doesn't have enough memory anyway to duplicate compression states).
+ */
+int ZEXPORT deflateCopy (dest, source)
+    z_streamp dest;
+    z_streamp source;
+{
+#ifdef MAXSEG_64K
+    return Z_STREAM_ERROR;
+#else
+    deflate_state *ds;
+    deflate_state *ss;
+    ushf *overlay;
+
+
+    if (source == Z_NULL || dest == Z_NULL || source->state == Z_NULL) {
+        return Z_STREAM_ERROR;
+    }
+
+    ss = source->state;
+
+    *dest = *source;
+
+    ds = (deflate_state *) ZALLOC(dest, 1, sizeof(deflate_state));
+    if (ds == Z_NULL) return Z_MEM_ERROR;
+    dest->state = (struct internal_state FAR *) ds;
+    *ds = *ss;
+    ds->strm = dest;
+
+    ds->window = (Bytef *) ZALLOC(dest, ds->w_size, 2*sizeof(Byte));
+    ds->prev   = (Posf *)  ZALLOC(dest, ds->w_size, sizeof(Pos));
+    ds->head   = (Posf *)  ZALLOC(dest, ds->hash_size, sizeof(Pos));
+    overlay = (ushf *) ZALLOC(dest, ds->lit_bufsize, sizeof(ush)+2);
+    ds->pending_buf = (uchf *) overlay;
+
+    if (ds->window == Z_NULL || ds->prev == Z_NULL || ds->head == Z_NULL ||
+        ds->pending_buf == Z_NULL) {
+        deflateEnd (dest);
+        return Z_MEM_ERROR;
+    }
+    /* following zmemcpy do not work for 16-bit MSDOS */
+    zmemcpy(ds->window, ss->window, ds->w_size * 2 * sizeof(Byte));
+    zmemcpy(ds->prev, ss->prev, ds->w_size * sizeof(Pos));
+    zmemcpy(ds->head, ss->head, ds->hash_size * sizeof(Pos));
+    zmemcpy(ds->pending_buf, ss->pending_buf, (uInt)ds->pending_buf_size);
+
+    ds->pending_out = ds->pending_buf + (ss->pending_out - ss->pending_buf);
+    ds->d_buf = overlay + ds->lit_bufsize/sizeof(ush);
+    ds->l_buf = ds->pending_buf + (1+sizeof(ush))*ds->lit_bufsize;
+
+    ds->l_desc.dyn_tree = ds->dyn_ltree;
+    ds->d_desc.dyn_tree = ds->dyn_dtree;
+    ds->bl_desc.dyn_tree = ds->bl_tree;
+
+    return Z_OK;
+#endif
+}
+
+/* ===========================================================================
+ * Read a new buffer from the current input stream, update the adler32
+ * and total number of bytes read.  All deflate() input goes through
+ * this function so some applications may wish to modify it to avoid
+ * allocating a large strm->next_in buffer and copying from it.
+ * (See also flush_pending()).
+ */
+local int read_buf(strm, buf, size)
+    z_streamp strm;
+    Bytef *buf;
+    unsigned size;
+{
+    unsigned len = strm->avail_in;
+
+    if (len > size) len = size;
+    if (len == 0) return 0;
+
+    strm->avail_in  -= len;
+
+    if (!strm->state->noheader) {
+        strm->adler = adler32(strm->adler, strm->next_in, len);
+    }
+    zmemcpy(buf, strm->next_in, len);
+    strm->next_in  += len;
+    strm->total_in += len;
+
+    return (int)len;
+}
+
+/* ===========================================================================
+ * Initialize the "longest match" routines for a new zlib stream
+ */
+local void lm_init (s)
+    deflate_state *s;
+{
+    s->window_size = (ulg)2L*s->w_size;
+
+    CLEAR_HASH(s);
+
+    /* Set the default configuration parameters:
+     */
+    s->max_lazy_match   = configuration_table[s->level].max_lazy;
+    s->good_match       = configuration_table[s->level].good_length;
+    s->nice_match       = configuration_table[s->level].nice_length;
+    s->max_chain_length = configuration_table[s->level].max_chain;
+
+    s->strstart = 0;
+    s->block_start = 0L;
+    s->lookahead = 0;
+    s->match_length = s->prev_length = MIN_MATCH-1;
+    s->match_available = 0;
+    s->ins_h = 0;
+#ifdef ASMV
+    match_init(); /* initialize the asm code */
+#endif
+}
+
+/* ===========================================================================
+ * Set match_start to the longest match starting at the given string and
+ * return its length. Matches shorter or equal to prev_length are discarded,
+ * in which case the result is equal to prev_length and match_start is
+ * garbage.
+ * IN assertions: cur_match is the head of the hash chain for the current
+ *   string (strstart) and its distance is <= MAX_DIST, and prev_length >= 1
+ * OUT assertion: the match length is not greater than s->lookahead.
+ */
+#ifndef ASMV
+/* For 80x86 and 680x0, an optimized version will be provided in match.asm or
+ * match.S. The code will be functionally equivalent.
+ */
+#ifndef FASTEST
+local uInt longest_match(s, cur_match)
+    deflate_state *s;
+    IPos cur_match;                             /* current match */
+{
+    unsigned chain_length = s->max_chain_length;/* max hash chain length */
+    register Bytef *scan = s->window + s->strstart; /* current string */
+    register Bytef *match;                       /* matched string */
+    register int len;                           /* length of current match */
+    int best_len = s->prev_length;              /* best match length so far */
+    int nice_match = s->nice_match;             /* stop if match long enough */
+    IPos limit = s->strstart > (IPos)MAX_DIST(s) ?
+        s->strstart - (IPos)MAX_DIST(s) : NIL;
+    /* Stop when cur_match becomes <= limit. To simplify the code,
+     * we prevent matches with the string of window index 0.
+     */
+    Posf *prev = s->prev;
+    uInt wmask = s->w_mask;
+
+#ifdef UNALIGNED_OK
+    /* Compare two bytes at a time. Note: this is not always beneficial.
+     * Try with and without -DUNALIGNED_OK to check.
+     */
+    register Bytef *strend = s->window + s->strstart + MAX_MATCH - 1;
+    register ush scan_start = *(ushf*)scan;
+    register ush scan_end   = *(ushf*)(scan+best_len-1);
+#else
+    register Bytef *strend = s->window + s->strstart + MAX_MATCH;
+    register Byte scan_end1  = scan[best_len-1];
+    register Byte scan_end   = scan[best_len];
+#endif
+
+    /* The code is optimized for HASH_BITS >= 8 and MAX_MATCH-2 multiple of 16.
+     * It is easy to get rid of this optimization if necessary.
+     */
+    Assert(s->hash_bits >= 8 && MAX_MATCH == 258, "Code too clever");
+
+    /* Do not waste too much time if we already have a good match: */
+    if (s->prev_length >= s->good_match) {
+        chain_length >>= 2;
+    }
+    /* Do not look for matches beyond the end of the input. This is necessary
+     * to make deflate deterministic.
+     */
+    if ((uInt)nice_match > s->lookahead) nice_match = s->lookahead;
+
+    Assert((ulg)s->strstart <= s->window_size-MIN_LOOKAHEAD, "need lookahead");
+
+    do {
+        Assert(cur_match < s->strstart, "no future");
+        match = s->window + cur_match;
+
+        /* Skip to next match if the match length cannot increase
+         * or if the match length is less than 2:
+         */
+#if (defined(UNALIGNED_OK) && MAX_MATCH == 258)
+        /* This code assumes sizeof(unsigned short) == 2. Do not use
+         * UNALIGNED_OK if your compiler uses a different size.
+         */
+        if (*(ushf*)(match+best_len-1) != scan_end ||
+            *(ushf*)match != scan_start) continue;
+
+        /* It is not necessary to compare scan[2] and match[2] since they are
+         * always equal when the other bytes match, given that the hash keys
+         * are equal and that HASH_BITS >= 8. Compare 2 bytes at a time at
+         * strstart+3, +5, ... up to strstart+257. We check for insufficient
+         * lookahead only every 4th comparison; the 128th check will be made
+         * at strstart+257. If MAX_MATCH-2 is not a multiple of 8, it is
+         * necessary to put more guard bytes at the end of the window, or
+         * to check more often for insufficient lookahead.
+         */
+        Assert(scan[2] == match[2], "scan[2]?");
+        scan++, match++;
+        do {
+        } while (*(ushf*)(scan+=2) == *(ushf*)(match+=2) &&
+                 *(ushf*)(scan+=2) == *(ushf*)(match+=2) &&
+                 *(ushf*)(scan+=2) == *(ushf*)(match+=2) &&
+                 *(ushf*)(scan+=2) == *(ushf*)(match+=2) &&
+                 scan < strend);
+        /* The funny "do {}" generates better code on most compilers */
+
+        /* Here, scan <= window+strstart+257 */
+        Assert(scan <= s->window+(unsigned)(s->window_size-1), "wild scan");
+        if (*scan == *match) scan++;
+
+        len = (MAX_MATCH - 1) - (int)(strend-scan);
+        scan = strend - (MAX_MATCH-1);
+
+#else /* UNALIGNED_OK */
+
+        if (match[best_len]   != scan_end  ||
+            match[best_len-1] != scan_end1 ||
+            *match            != *scan     ||
+            *++match          != scan[1])      continue;
+
+        /* The check at best_len-1 can be removed because it will be made
+         * again later. (This heuristic is not always a win.)
+         * It is not necessary to compare scan[2] and match[2] since they
+         * are always equal when the other bytes match, given that
+         * the hash keys are equal and that HASH_BITS >= 8.
+         */
+        scan += 2, match++;
+        Assert(*scan == *match, "match[2]?");
+
+        /* We check for insufficient lookahead only every 8th comparison;
+         * the 256th check will be made at strstart+258.
+         */
+        do {
+        } while (*++scan == *++match && *++scan == *++match &&
+                 *++scan == *++match && *++scan == *++match &&
+                 *++scan == *++match && *++scan == *++match &&
+                 *++scan == *++match && *++scan == *++match &&
+                 scan < strend);
+
+        Assert(scan <= s->window+(unsigned)(s->window_size-1), "wild scan");
+
+        len = MAX_MATCH - (int)(strend - scan);
+        scan = strend - MAX_MATCH;
+
+#endif /* UNALIGNED_OK */
+
+        if (len > best_len) {
+            s->match_start = cur_match;
+            best_len = len;
+            if (len >= nice_match) break;
+#ifdef UNALIGNED_OK
+            scan_end = *(ushf*)(scan+best_len-1);
+#else
+            scan_end1  = scan[best_len-1];
+            scan_end   = scan[best_len];
+#endif
+        }
+    } while ((cur_match = prev[cur_match & wmask]) > limit
+             && --chain_length != 0);
+
+    if ((uInt)best_len <= s->lookahead) return (uInt)best_len;
+    return s->lookahead;
+}
+
+#else /* FASTEST */
+/* ---------------------------------------------------------------------------
+ * Optimized version for level == 1 only
+ */
+local uInt longest_match(s, cur_match)
+    deflate_state *s;
+    IPos cur_match;                             /* current match */
+{
+    register Bytef *scan = s->window + s->strstart; /* current string */
+    register Bytef *match;                       /* matched string */
+    register int len;                           /* length of current match */
+    register Bytef *strend = s->window + s->strstart + MAX_MATCH;
+
+    /* The code is optimized for HASH_BITS >= 8 and MAX_MATCH-2 multiple of 16.
+     * It is easy to get rid of this optimization if necessary.
+     */
+    Assert(s->hash_bits >= 8 && MAX_MATCH == 258, "Code too clever");
+
+    Assert((ulg)s->strstart <= s->window_size-MIN_LOOKAHEAD, "need lookahead");
+
+    Assert(cur_match < s->strstart, "no future");
+
+    match = s->window + cur_match;
+
+    /* Return failure if the match length is less than 2:
+     */
+    if (match[0] != scan[0] || match[1] != scan[1]) return MIN_MATCH-1;
+
+    /* The check at best_len-1 can be removed because it will be made
+     * again later. (This heuristic is not always a win.)
+     * It is not necessary to compare scan[2] and match[2] since they
+     * are always equal when the other bytes match, given that
+     * the hash keys are equal and that HASH_BITS >= 8.
+     */
+    scan += 2, match += 2;
+    Assert(*scan == *match, "match[2]?");
+
+    /* We check for insufficient lookahead only every 8th comparison;
+     * the 256th check will be made at strstart+258.
+     */
+    do {
+    } while (*++scan == *++match && *++scan == *++match &&
+	     *++scan == *++match && *++scan == *++match &&
+	     *++scan == *++match && *++scan == *++match &&
+	     *++scan == *++match && *++scan == *++match &&
+	     scan < strend);
+
+    Assert(scan <= s->window+(unsigned)(s->window_size-1), "wild scan");
+
+    len = MAX_MATCH - (int)(strend - scan);
+
+    if (len < MIN_MATCH) return MIN_MATCH - 1;
+
+    s->match_start = cur_match;
+    return len <= s->lookahead ? len : s->lookahead;
+}
+#endif /* FASTEST */
+#endif /* ASMV */
+
+#ifdef DEBUG
+/* ===========================================================================
+ * Check that the match at match_start is indeed a match.
+ */
+local void check_match(s, start, match, length)
+    deflate_state *s;
+    IPos start, match;
+    int length;
+{
+    /* check that the match is indeed a match */
+    if (zmemcmp(s->window + match,
+                s->window + start, length) != EQUAL) {
+        fprintf(stderr, " start %u, match %u, length %d\n",
+		start, match, length);
+        do {
+	    fprintf(stderr, "%c%c", s->window[match++], s->window[start++]);
+	} while (--length != 0);
+        z_error("invalid match");
+    }
+    if (z_verbose > 1) {
+        fprintf(stderr,"\\[%d,%d]", start-match, length);
+        do { putc(s->window[start++], stderr); } while (--length != 0);
+    }
+}
+#else
+#  define check_match(s, start, match, length)
+#endif
+
+/* ===========================================================================
+ * Fill the window when the lookahead becomes insufficient.
+ * Updates strstart and lookahead.
+ *
+ * IN assertion: lookahead < MIN_LOOKAHEAD
+ * OUT assertions: strstart <= window_size-MIN_LOOKAHEAD
+ *    At least one byte has been read, or avail_in == 0; reads are
+ *    performed for at least two bytes (required for the zip translate_eol
+ *    option -- not supported here).
+ */
+local void fill_window(s)
+    deflate_state *s;
+{
+    register unsigned n, m;
+    register Posf *p;
+    unsigned more;    /* Amount of free space at the end of the window. */
+    uInt wsize = s->w_size;
+
+    do {
+        more = (unsigned)(s->window_size -(ulg)s->lookahead -(ulg)s->strstart);
+
+        /* Deal with !@#$% 64K limit: */
+        if (more == 0 && s->strstart == 0 && s->lookahead == 0) {
+            more = wsize;
+
+        } else if (more == (unsigned)(-1)) {
+            /* Very unlikely, but possible on 16 bit machine if strstart == 0
+             * and lookahead == 1 (input done one byte at time)
+             */
+            more--;
+
+        /* If the window is almost full and there is insufficient lookahead,
+         * move the upper half to the lower one to make room in the upper half.
+         */
+        } else if (s->strstart >= wsize+MAX_DIST(s)) {
+
+            zmemcpy(s->window, s->window+wsize, (unsigned)wsize);
+            s->match_start -= wsize;
+            s->strstart    -= wsize; /* we now have strstart >= MAX_DIST */
+            s->block_start -= (long) wsize;
+
+            /* Slide the hash table (could be avoided with 32 bit values
+               at the expense of memory usage). We slide even when level == 0
+               to keep the hash table consistent if we switch back to level > 0
+               later. (Using level 0 permanently is not an optimal usage of
+               zlib, so we don't care about this pathological case.)
+             */
+	    n = s->hash_size;
+	    p = &s->head[n];
+	    do {
+		m = *--p;
+		*p = (Pos)(m >= wsize ? m-wsize : NIL);
+	    } while (--n);
+
+	    n = wsize;
+#ifndef FASTEST
+	    p = &s->prev[n];
+	    do {
+		m = *--p;
+		*p = (Pos)(m >= wsize ? m-wsize : NIL);
+		/* If n is not on any hash chain, prev[n] is garbage but
+		 * its value will never be used.
+		 */
+	    } while (--n);
+#endif
+            more += wsize;
+        }
+        if (s->strm->avail_in == 0) return;
+
+        /* If there was no sliding:
+         *    strstart <= WSIZE+MAX_DIST-1 && lookahead <= MIN_LOOKAHEAD - 1 &&
+         *    more == window_size - lookahead - strstart
+         * => more >= window_size - (MIN_LOOKAHEAD-1 + WSIZE + MAX_DIST-1)
+         * => more >= window_size - 2*WSIZE + 2
+         * In the BIG_MEM or MMAP case (not yet supported),
+         *   window_size == input_size + MIN_LOOKAHEAD  &&
+         *   strstart + s->lookahead <= input_size => more >= MIN_LOOKAHEAD.
+         * Otherwise, window_size == 2*WSIZE so more >= 2.
+         * If there was sliding, more >= WSIZE. So in all cases, more >= 2.
+         */
+        Assert(more >= 2, "more < 2");
+
+        n = read_buf(s->strm, s->window + s->strstart + s->lookahead, more);
+        s->lookahead += n;
+
+        /* Initialize the hash value now that we have some input: */
+        if (s->lookahead >= MIN_MATCH) {
+            s->ins_h = s->window[s->strstart];
+            UPDATE_HASH(s, s->ins_h, s->window[s->strstart+1]);
+#if MIN_MATCH != 3
+            Call UPDATE_HASH() MIN_MATCH-3 more times
+#endif
+        }
+        /* If the whole input has less than MIN_MATCH bytes, ins_h is garbage,
+         * but this is not important since only literal bytes will be emitted.
+         */
+
+    } while (s->lookahead < MIN_LOOKAHEAD && s->strm->avail_in != 0);
+}
+
+/* ===========================================================================
+ * Flush the current block, with given end-of-file flag.
+ * IN assertion: strstart is set to the end of the current match.
+ */
+#define FLUSH_BLOCK_ONLY(s, eof) { \
+   _tr_flush_block(s, (s->block_start >= 0L ? \
+                   (charf *)&s->window[(unsigned)s->block_start] : \
+                   (charf *)Z_NULL), \
+		(ulg)((long)s->strstart - s->block_start), \
+		(eof)); \
+   s->block_start = s->strstart; \
+   flush_pending(s->strm); \
+   Tracev((stderr,"[FLUSH]")); \
+}
+
+/* Same but force premature exit if necessary. */
+#define FLUSH_BLOCK(s, eof) { \
+   FLUSH_BLOCK_ONLY(s, eof); \
+   if (s->strm->avail_out == 0) return (eof) ? finish_started : need_more; \
+}
+
+/* ===========================================================================
+ * Copy without compression as much as possible from the input stream, return
+ * the current block state.
+ * This function does not insert new strings in the dictionary since
+ * uncompressible data is probably not useful. This function is used
+ * only for the level=0 compression option.
+ * NOTE: this function should be optimized to avoid extra copying from
+ * window to pending_buf.
+ */
+local block_state deflate_stored(s, flush)
+    deflate_state *s;
+    int flush;
+{
+    /* Stored blocks are limited to 0xffff bytes, pending_buf is limited
+     * to pending_buf_size, and each stored block has a 5 byte header:
+     */
+    ulg max_block_size = 0xffff;
+    ulg max_start;
+
+    if (max_block_size > s->pending_buf_size - 5) {
+        max_block_size = s->pending_buf_size - 5;
+    }
+
+    /* Copy as much as possible from input to output: */
+    for (;;) {
+        /* Fill the window as much as possible: */
+        if (s->lookahead <= 1) {
+
+            Assert(s->strstart < s->w_size+MAX_DIST(s) ||
+		   s->block_start >= (long)s->w_size, "slide too late");
+
+            fill_window(s);
+            if (s->lookahead == 0 && flush == Z_NO_FLUSH) return need_more;
+
+            if (s->lookahead == 0) break; /* flush the current block */
+        }
+	Assert(s->block_start >= 0L, "block gone");
+
+	s->strstart += s->lookahead;
+	s->lookahead = 0;
+
+	/* Emit a stored block if pending_buf will be full: */
+ 	max_start = s->block_start + max_block_size;
+        if (s->strstart == 0 || (ulg)s->strstart >= max_start) {
+	    /* strstart == 0 is possible when wraparound on 16-bit machine */
+	    s->lookahead = (uInt)(s->strstart - max_start);
+	    s->strstart = (uInt)max_start;
+            FLUSH_BLOCK(s, 0);
+	}
+	/* Flush if we may have to slide, otherwise block_start may become
+         * negative and the data will be gone:
+         */
+        if (s->strstart - (uInt)s->block_start >= MAX_DIST(s)) {
+            FLUSH_BLOCK(s, 0);
+	}
+    }
+    FLUSH_BLOCK(s, flush == Z_FINISH);
+    return flush == Z_FINISH ? finish_done : block_done;
+}
+
+/* ===========================================================================
+ * Compress as much as possible from the input stream, return the current
+ * block state.
+ * This function does not perform lazy evaluation of matches and inserts
+ * new strings in the dictionary only for unmatched strings or for short
+ * matches. It is used only for the fast compression options.
+ */
+local block_state deflate_fast(s, flush)
+    deflate_state *s;
+    int flush;
+{
+    IPos hash_head = NIL; /* head of the hash chain */
+    int bflush;           /* set if current block must be flushed */
+
+    for (;;) {
+        /* Make sure that we always have enough lookahead, except
+         * at the end of the input file. We need MAX_MATCH bytes
+         * for the next match, plus MIN_MATCH bytes to insert the
+         * string following the next match.
+         */
+        if (s->lookahead < MIN_LOOKAHEAD) {
+            fill_window(s);
+            if (s->lookahead < MIN_LOOKAHEAD && flush == Z_NO_FLUSH) {
+	        return need_more;
+	    }
+            if (s->lookahead == 0) break; /* flush the current block */
+        }
+
+        /* Insert the string window[strstart .. strstart+2] in the
+         * dictionary, and set hash_head to the head of the hash chain:
+         */
+        if (s->lookahead >= MIN_MATCH) {
+            INSERT_STRING(s, s->strstart, hash_head);
+        }
+
+        /* Find the longest match, discarding those <= prev_length.
+         * At this point we have always match_length < MIN_MATCH
+         */
+        if (hash_head != NIL && s->strstart - hash_head <= MAX_DIST(s)) {
+            /* To simplify the code, we prevent matches with the string
+             * of window index 0 (in particular we have to avoid a match
+             * of the string with itself at the start of the input file).
+             */
+            if (s->strategy != Z_HUFFMAN_ONLY) {
+                s->match_length = longest_match (s, hash_head);
+            }
+            /* longest_match() sets match_start */
+        }
+        if (s->match_length >= MIN_MATCH) {
+            check_match(s, s->strstart, s->match_start, s->match_length);
+
+            _tr_tally_dist(s, s->strstart - s->match_start,
+                           s->match_length - MIN_MATCH, bflush);
+
+            s->lookahead -= s->match_length;
+
+            /* Insert new strings in the hash table only if the match length
+             * is not too large. This saves time but degrades compression.
+             */
+#ifndef FASTEST
+            if (s->match_length <= s->max_insert_length &&
+                s->lookahead >= MIN_MATCH) {
+                s->match_length--; /* string at strstart already in hash table */
+                do {
+                    s->strstart++;
+                    INSERT_STRING(s, s->strstart, hash_head);
+                    /* strstart never exceeds WSIZE-MAX_MATCH, so there are
+                     * always MIN_MATCH bytes ahead.
+                     */
+                } while (--s->match_length != 0);
+                s->strstart++;
+            } else
+#endif
+	    {
+                s->strstart += s->match_length;
+                s->match_length = 0;
+                s->ins_h = s->window[s->strstart];
+                UPDATE_HASH(s, s->ins_h, s->window[s->strstart+1]);
+#if MIN_MATCH != 3
+                Call UPDATE_HASH() MIN_MATCH-3 more times
+#endif
+                /* If lookahead < MIN_MATCH, ins_h is garbage, but it does not
+                 * matter since it will be recomputed at next deflate call.
+                 */
+            }
+        } else {
+            /* No match, output a literal byte */
+            Tracevv((stderr,"%c", s->window[s->strstart]));
+            _tr_tally_lit (s, s->window[s->strstart], bflush);
+            s->lookahead--;
+            s->strstart++;
+        }
+        if (bflush) FLUSH_BLOCK(s, 0);
+    }
+    FLUSH_BLOCK(s, flush == Z_FINISH);
+    return flush == Z_FINISH ? finish_done : block_done;
+}
+
+/* ===========================================================================
+ * Same as above, but achieves better compression. We use a lazy
+ * evaluation for matches: a match is finally adopted only if there is
+ * no better match at the next window position.
+ */
+local block_state deflate_slow(s, flush)
+    deflate_state *s;
+    int flush;
+{
+    IPos hash_head = NIL;    /* head of hash chain */
+    int bflush;              /* set if current block must be flushed */
+
+    /* Process the input block. */
+    for (;;) {
+        /* Make sure that we always have enough lookahead, except
+         * at the end of the input file. We need MAX_MATCH bytes
+         * for the next match, plus MIN_MATCH bytes to insert the
+         * string following the next match.
+         */
+        if (s->lookahead < MIN_LOOKAHEAD) {
+            fill_window(s);
+            if (s->lookahead < MIN_LOOKAHEAD && flush == Z_NO_FLUSH) {
+	        return need_more;
+	    }
+            if (s->lookahead == 0) break; /* flush the current block */
+        }
+
+        /* Insert the string window[strstart .. strstart+2] in the
+         * dictionary, and set hash_head to the head of the hash chain:
+         */
+        if (s->lookahead >= MIN_MATCH) {
+            INSERT_STRING(s, s->strstart, hash_head);
+        }
+
+        /* Find the longest match, discarding those <= prev_length.
+         */
+        s->prev_length = s->match_length, s->prev_match = s->match_start;
+        s->match_length = MIN_MATCH-1;
+
+        if (hash_head != NIL && s->prev_length < s->max_lazy_match &&
+            s->strstart - hash_head <= MAX_DIST(s)) {
+            /* To simplify the code, we prevent matches with the string
+             * of window index 0 (in particular we have to avoid a match
+             * of the string with itself at the start of the input file).
+             */
+            if (s->strategy != Z_HUFFMAN_ONLY) {
+                s->match_length = longest_match (s, hash_head);
+            }
+            /* longest_match() sets match_start */
+
+            if (s->match_length <= 5 && (s->strategy == Z_FILTERED ||
+                 (s->match_length == MIN_MATCH &&
+                  s->strstart - s->match_start > TOO_FAR))) {
+
+                /* If prev_match is also MIN_MATCH, match_start is garbage
+                 * but we will ignore the current match anyway.
+                 */
+                s->match_length = MIN_MATCH-1;
+            }
+        }
+        /* If there was a match at the previous step and the current
+         * match is not better, output the previous match:
+         */
+        if (s->prev_length >= MIN_MATCH && s->match_length <= s->prev_length) {
+            uInt max_insert = s->strstart + s->lookahead - MIN_MATCH;
+            /* Do not insert strings in hash table beyond this. */
+
+            check_match(s, s->strstart-1, s->prev_match, s->prev_length);
+
+            _tr_tally_dist(s, s->strstart -1 - s->prev_match,
+			   s->prev_length - MIN_MATCH, bflush);
+
+            /* Insert in hash table all strings up to the end of the match.
+             * strstart-1 and strstart are already inserted. If there is not
+             * enough lookahead, the last two strings are not inserted in
+             * the hash table.
+             */
+            s->lookahead -= s->prev_length-1;
+            s->prev_length -= 2;
+            do {
+                if (++s->strstart <= max_insert) {
+                    INSERT_STRING(s, s->strstart, hash_head);
+                }
+            } while (--s->prev_length != 0);
+            s->match_available = 0;
+            s->match_length = MIN_MATCH-1;
+            s->strstart++;
+
+            if (bflush) FLUSH_BLOCK(s, 0);
+
+        } else if (s->match_available) {
+            /* If there was no match at the previous position, output a
+             * single literal. If there was a match but the current match
+             * is longer, truncate the previous match to a single literal.
+             */
+            Tracevv((stderr,"%c", s->window[s->strstart-1]));
+	    _tr_tally_lit(s, s->window[s->strstart-1], bflush);
+	    if (bflush) {
+                FLUSH_BLOCK_ONLY(s, 0);
+            }
+            s->strstart++;
+            s->lookahead--;
+            if (s->strm->avail_out == 0) return need_more;
+        } else {
+            /* There is no previous match to compare with, wait for
+             * the next step to decide.
+             */
+            s->match_available = 1;
+            s->strstart++;
+            s->lookahead--;
+        }
+    }
+    Assert (flush != Z_NO_FLUSH, "no flush?");
+    if (s->match_available) {
+        Tracevv((stderr,"%c", s->window[s->strstart-1]));
+        _tr_tally_lit(s, s->window[s->strstart-1], bflush);
+        s->match_available = 0;
+    }
+    FLUSH_BLOCK(s, flush == Z_FINISH);
+    return flush == Z_FINISH ? finish_done : block_done;
+}
diff --git a/uppsrc/plugin/z/lib/deflate.h b/uppsrc/plugin/z/lib/deflate.h
new file mode 100644
index 000000000..a20c3a567
--- /dev/null
+++ b/uppsrc/plugin/z/lib/deflate.h
@@ -0,0 +1,318 @@
+/* deflate.h -- internal compression state
+ * Copyright (C) 1995-2002 Jean-loup Gailly
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/* WARNING: this file should *not* be used by applications. It is
+   part of the implementation of the compression library and is
+   subject to change. Applications should only use zlib.h.
+ */
+
+/* @(#) $Id: deflate.h,v 1.1 2005/02/07 00:26:07 rylek Exp $ */
+
+#ifndef _DEFLATE_H
+#define _DEFLATE_H
+
+#include "zutil.h"
+
+/* ===========================================================================
+ * Internal compression state.
+ */
+
+#define LENGTH_CODES 29
+/* number of length codes, not counting the special END_BLOCK code */
+
+#define LITERALS  256
+/* number of literal bytes 0..255 */
+
+#define L_CODES (LITERALS+1+LENGTH_CODES)
+/* number of Literal or Length codes, including the END_BLOCK code */
+
+#define D_CODES   30
+/* number of distance codes */
+
+#define BL_CODES  19
+/* number of codes used to transfer the bit lengths */
+
+#define HEAP_SIZE (2*L_CODES+1)
+/* maximum heap size */
+
+#define MAX_BITS 15
+/* All codes must not exceed MAX_BITS bits */
+
+#define INIT_STATE    42
+#define BUSY_STATE   113
+#define FINISH_STATE 666
+/* Stream status */
+
+
+/* Data structure describing a single value and its code string. */
+typedef struct ct_data_s {
+    union {
+        ush  freq;       /* frequency count */
+        ush  code;       /* bit string */
+    } fc;
+    union {
+        ush  dad;        /* father node in Huffman tree */
+        ush  len;        /* length of bit string */
+    } dl;
+} FAR ct_data;
+
+#define Freq fc.freq
+#define Code fc.code
+#define Dad  dl.dad
+#define Len  dl.len
+
+typedef struct static_tree_desc_s  static_tree_desc;
+
+typedef struct tree_desc_s {
+    ct_data *dyn_tree;           /* the dynamic tree */
+    int     max_code;            /* largest code with non zero frequency */
+    static_tree_desc *stat_desc; /* the corresponding static tree */
+} FAR tree_desc;
+
+typedef ush Pos;
+typedef Pos FAR Posf;
+typedef unsigned IPos;
+
+/* A Pos is an index in the character window. We use short instead of int to
+ * save space in the various tables. IPos is used only for parameter passing.
+ */
+
+typedef struct internal_state {
+    z_streamp strm;      /* pointer back to this zlib stream */
+    int   status;        /* as the name implies */
+    Bytef *pending_buf;  /* output still pending */
+    ulg   pending_buf_size; /* size of pending_buf */
+    Bytef *pending_out;  /* next pending byte to output to the stream */
+    int   pending;       /* nb of bytes in the pending buffer */
+    int   noheader;      /* suppress zlib header and adler32 */
+    Byte  data_type;     /* UNKNOWN, BINARY or ASCII */
+    Byte  method;        /* STORED (for zip only) or DEFLATED */
+    int   last_flush;    /* value of flush param for previous deflate call */
+
+                /* used by deflate.c: */
+
+    uInt  w_size;        /* LZ77 window size (32K by default) */
+    uInt  w_bits;        /* log2(w_size)  (8..16) */
+    uInt  w_mask;        /* w_size - 1 */
+
+    Bytef *window;
+    /* Sliding window. Input bytes are read into the second half of the window,
+     * and move to the first half later to keep a dictionary of at least wSize
+     * bytes. With this organization, matches are limited to a distance of
+     * wSize-MAX_MATCH bytes, but this ensures that IO is always
+     * performed with a length multiple of the block size. Also, it limits
+     * the window size to 64K, which is quite useful on MSDOS.
+     * To do: use the user input buffer as sliding window.
+     */
+
+    ulg window_size;
+    /* Actual size of window: 2*wSize, except when the user input buffer
+     * is directly used as sliding window.
+     */
+
+    Posf *prev;
+    /* Link to older string with same hash index. To limit the size of this
+     * array to 64K, this link is maintained only for the last 32K strings.
+     * An index in this array is thus a window index modulo 32K.
+     */
+
+    Posf *head; /* Heads of the hash chains or NIL. */
+
+    uInt  ins_h;          /* hash index of string to be inserted */
+    uInt  hash_size;      /* number of elements in hash table */
+    uInt  hash_bits;      /* log2(hash_size) */
+    uInt  hash_mask;      /* hash_size-1 */
+
+    uInt  hash_shift;
+    /* Number of bits by which ins_h must be shifted at each input
+     * step. It must be such that after MIN_MATCH steps, the oldest
+     * byte no longer takes part in the hash key, that is:
+     *   hash_shift * MIN_MATCH >= hash_bits
+     */
+
+    long block_start;
+    /* Window position at the beginning of the current output block. Gets
+     * negative when the window is moved backwards.
+     */
+
+    uInt match_length;           /* length of best match */
+    IPos prev_match;             /* previous match */
+    int match_available;         /* set if previous match exists */
+    uInt strstart;               /* start of string to insert */
+    uInt match_start;            /* start of matching string */
+    uInt lookahead;              /* number of valid bytes ahead in window */
+
+    uInt prev_length;
+    /* Length of the best match at previous step. Matches not greater than this
+     * are discarded. This is used in the lazy match evaluation.
+     */
+
+    uInt max_chain_length;
+    /* To speed up deflation, hash chains are never searched beyond this
+     * length.  A higher limit improves compression ratio but degrades the
+     * speed.
+     */
+
+    uInt max_lazy_match;
+    /* Attempt to find a better match only when the current match is strictly
+     * smaller than this value. This mechanism is used only for compression
+     * levels >= 4.
+     */
+#   define max_insert_length  max_lazy_match
+    /* Insert new strings in the hash table only if the match length is not
+     * greater than this length. This saves time but degrades compression.
+     * max_insert_length is used only for compression levels <= 3.
+     */
+
+    int level;    /* compression level (1..9) */
+    int strategy; /* favor or force Huffman coding*/
+
+    uInt good_match;
+    /* Use a faster search when the previous match is longer than this */
+
+    int nice_match; /* Stop searching when current match exceeds this */
+
+                /* used by trees.c: */
+    /* Didn't use ct_data typedef below to supress compiler warning */
+    struct ct_data_s dyn_ltree[HEAP_SIZE];   /* literal and length tree */
+    struct ct_data_s dyn_dtree[2*D_CODES+1]; /* distance tree */
+    struct ct_data_s bl_tree[2*BL_CODES+1];  /* Huffman tree for bit lengths */
+
+    struct tree_desc_s l_desc;               /* desc. for literal tree */
+    struct tree_desc_s d_desc;               /* desc. for distance tree */
+    struct tree_desc_s bl_desc;              /* desc. for bit length tree */
+
+    ush bl_count[MAX_BITS+1];
+    /* number of codes at each bit length for an optimal tree */
+
+    int heap[2*L_CODES+1];      /* heap used to build the Huffman trees */
+    int heap_len;               /* number of elements in the heap */
+    int heap_max;               /* element of largest frequency */
+    /* The sons of heap[n] are heap[2*n] and heap[2*n+1]. heap[0] is not used.
+     * The same heap array is used to build all trees.
+     */
+
+    uch depth[2*L_CODES+1];
+    /* Depth of each subtree used as tie breaker for trees of equal frequency
+     */
+
+    uchf *l_buf;          /* buffer for literals or lengths */
+
+    uInt  lit_bufsize;
+    /* Size of match buffer for literals/lengths.  There are 4 reasons for
+     * limiting lit_bufsize to 64K:
+     *   - frequencies can be kept in 16 bit counters
+     *   - if compression is not successful for the first block, all input
+     *     data is still in the window so we can still emit a stored block even
+     *     when input comes from standard input.  (This can also be done for
+     *     all blocks if lit_bufsize is not greater than 32K.)
+     *   - if compression is not successful for a file smaller than 64K, we can
+     *     even emit a stored file instead of a stored block (saving 5 bytes).
+     *     This is applicable only for zip (not gzip or zlib).
+     *   - creating new Huffman trees less frequently may not provide fast
+     *     adaptation to changes in the input data statistics. (Take for
+     *     example a binary file with poorly compressible code followed by
+     *     a highly compressible string table.) Smaller buffer sizes give
+     *     fast adaptation but have of course the overhead of transmitting
+     *     trees more frequently.
+     *   - I can't count above 4
+     */
+
+    uInt last_lit;      /* running index in l_buf */
+
+    ushf *d_buf;
+    /* Buffer for distances. To simplify the code, d_buf and l_buf have
+     * the same number of elements. To use different lengths, an extra flag
+     * array would be necessary.
+     */
+
+    ulg opt_len;        /* bit length of current block with optimal trees */
+    ulg static_len;     /* bit length of current block with static trees */
+    uInt matches;       /* number of string matches in current block */
+    int last_eob_len;   /* bit length of EOB code for last block */
+
+#ifdef DEBUG
+    ulg compressed_len; /* total bit length of compressed file mod 2^32 */
+    ulg bits_sent;      /* bit length of compressed data sent mod 2^32 */
+#endif
+
+    ush bi_buf;
+    /* Output buffer. bits are inserted starting at the bottom (least
+     * significant bits).
+     */
+    int bi_valid;
+    /* Number of valid bits in bi_buf.  All bits above the last valid bit
+     * are always zero.
+     */
+
+} FAR deflate_state;
+
+/* Output a byte on the stream.
+ * IN assertion: there is enough room in pending_buf.
+ */
+#define put_byte(s, c) {s->pending_buf[s->pending++] = (c);}
+
+
+#define MIN_LOOKAHEAD (MAX_MATCH+MIN_MATCH+1)
+/* Minimum amount of lookahead, except at the end of the input file.
+ * See deflate.c for comments about the MIN_MATCH+1.
+ */
+
+#define MAX_DIST(s)  ((s)->w_size-MIN_LOOKAHEAD)
+/* In order to simplify the code, particularly on 16 bit machines, match
+ * distances are limited to MAX_DIST instead of WSIZE.
+ */
+
+        /* in trees.c */
+void _tr_init         OF((deflate_state *s));
+int  _tr_tally        OF((deflate_state *s, unsigned dist, unsigned lc));
+void _tr_flush_block  OF((deflate_state *s, charf *buf, ulg stored_len,
+			  int eof));
+void _tr_align        OF((deflate_state *s));
+void _tr_stored_block OF((deflate_state *s, charf *buf, ulg stored_len,
+                          int eof));
+
+#define d_code(dist) \
+   ((dist) < 256 ? _dist_code[dist] : _dist_code[256+((dist)>>7)])
+/* Mapping from a distance to a distance code. dist is the distance - 1 and
+ * must not have side effects. _dist_code[256] and _dist_code[257] are never
+ * used.
+ */
+
+#ifndef DEBUG
+/* Inline versions of _tr_tally for speed: */
+
+#if defined(GEN_TREES_H) || !defined(STDC)
+  extern uch _length_code[];
+  extern uch _dist_code[];
+#else
+  extern const uch _length_code[];
+  extern const uch _dist_code[];
+#endif
+
+# define _tr_tally_lit(s, c, flush) \
+  { uch cc = (c); \
+    s->d_buf[s->last_lit] = 0; \
+    s->l_buf[s->last_lit++] = cc; \
+    s->dyn_ltree[cc].Freq++; \
+    flush = (s->last_lit == s->lit_bufsize-1); \
+   }
+# define _tr_tally_dist(s, distance, length, flush) \
+  { uch len = (length); \
+    ush dist = (distance); \
+    s->d_buf[s->last_lit] = dist; \
+    s->l_buf[s->last_lit++] = len; \
+    dist--; \
+    s->dyn_ltree[_length_code[len]+LITERALS+1].Freq++; \
+    s->dyn_dtree[d_code(dist)].Freq++; \
+    flush = (s->last_lit == s->lit_bufsize-1); \
+  }
+#else
+# define _tr_tally_lit(s, c, flush) flush = _tr_tally(s, 0, c)
+# define _tr_tally_dist(s, distance, length, flush) \
+              flush = _tr_tally(s, distance, length)
+#endif
+
+#endif
diff --git a/uppsrc/plugin/z/lib/example.c b/uppsrc/plugin/z/lib/example.c
new file mode 100644
index 000000000..574e5baaa
--- /dev/null
+++ b/uppsrc/plugin/z/lib/example.c
@@ -0,0 +1,556 @@
+/* example.c -- usage example of the zlib compression library
+ * Copyright (C) 1995-2002 Jean-loup Gailly.
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/* @(#) $Id: example.c,v 1.1 2005/02/07 00:26:07 rylek Exp $ */
+
+#include <stdio.h>
+#include "zlib.h"
+
+#ifdef STDC
+#  include <string.h>
+#  include <stdlib.h>
+#else
+   extern void exit  OF((int));
+#endif
+
+#if defined(VMS) || defined(RISCOS)
+#  define TESTFILE "foo-gz"
+#else
+#  define TESTFILE "foo.gz"
+#endif
+
+#define CHECK_ERR(err, msg) { \
+    if (err != Z_OK) { \
+        fprintf(stderr, "%s error: %d\n", msg, err); \
+        exit(1); \
+    } \
+}
+
+const char hello[] = "hello, hello!";
+/* "hello world" would be more standard, but the repeated "hello"
+ * stresses the compression code better, sorry...
+ */
+
+const char dictionary[] = "hello";
+uLong dictId; /* Adler32 value of the dictionary */
+
+void test_compress      OF((Byte *compr, uLong comprLen,
+		            Byte *uncompr, uLong uncomprLen));
+void test_gzio          OF((const char *out, const char *in,
+		            Byte *uncompr, int uncomprLen));
+void test_deflate       OF((Byte *compr, uLong comprLen));
+void test_inflate       OF((Byte *compr, uLong comprLen,
+		            Byte *uncompr, uLong uncomprLen));
+void test_large_deflate OF((Byte *compr, uLong comprLen,
+		            Byte *uncompr, uLong uncomprLen));
+void test_large_inflate OF((Byte *compr, uLong comprLen,
+		            Byte *uncompr, uLong uncomprLen));
+void test_flush         OF((Byte *compr, uLong *comprLen));
+void test_sync          OF((Byte *compr, uLong comprLen,
+		            Byte *uncompr, uLong uncomprLen));
+void test_dict_deflate  OF((Byte *compr, uLong comprLen));
+void test_dict_inflate  OF((Byte *compr, uLong comprLen,
+		            Byte *uncompr, uLong uncomprLen));
+int  main               OF((int argc, char *argv[]));
+
+/* ===========================================================================
+ * Test compress() and uncompress()
+ */
+void test_compress(compr, comprLen, uncompr, uncomprLen)
+    Byte *compr, *uncompr;
+    uLong comprLen, uncomprLen;
+{
+    int err;
+    uLong len = strlen(hello)+1;
+
+    err = compress(compr, &comprLen, (const Bytef*)hello, len);
+    CHECK_ERR(err, "compress");
+
+    strcpy((char*)uncompr, "garbage");
+
+    err = uncompress(uncompr, &uncomprLen, compr, comprLen);
+    CHECK_ERR(err, "uncompress");
+
+    if (strcmp((char*)uncompr, hello)) {
+        fprintf(stderr, "bad uncompress\n");
+	exit(1);
+    } else {
+        printf("uncompress(): %s\n", (char *)uncompr);
+    }
+}
+
+/* ===========================================================================
+ * Test read/write of .gz files
+ */
+void test_gzio(out, in, uncompr, uncomprLen)
+    const char *out; /* compressed output file */
+    const char *in;  /* compressed input file */
+    Byte *uncompr;
+    int  uncomprLen;
+{
+    int err;
+    int len = strlen(hello)+1;
+    gzFile file;
+    z_off_t pos;
+
+    file = gzopen(out, "wb");
+    if (file == NULL) {
+        fprintf(stderr, "gzopen error\n");
+        exit(1);
+    }
+    gzputc(file, 'h');
+    if (gzputs(file, "ello") != 4) {
+        fprintf(stderr, "gzputs err: %s\n", gzerror(file, &err));
+	exit(1);
+    }
+    if (gzprintf(file, ", %s!", "hello") != 8) {
+        fprintf(stderr, "gzprintf err: %s\n", gzerror(file, &err));
+	exit(1);
+    }
+    gzseek(file, 1L, SEEK_CUR); /* add one zero byte */
+    gzclose(file);
+
+    file = gzopen(in, "rb");
+    if (file == NULL) {
+        fprintf(stderr, "gzopen error\n");
+    }
+    strcpy((char*)uncompr, "garbage");
+
+    uncomprLen = gzread(file, uncompr, (unsigned)uncomprLen);
+    if (uncomprLen != len) {
+        fprintf(stderr, "gzread err: %s\n", gzerror(file, &err));
+	exit(1);
+    }
+    if (strcmp((char*)uncompr, hello)) {
+        fprintf(stderr, "bad gzread: %s\n", (char*)uncompr);
+	exit(1);
+    } else {
+        printf("gzread(): %s\n", (char *)uncompr);
+    }
+
+    pos = gzseek(file, -8L, SEEK_CUR);
+    if (pos != 6 || gztell(file) != pos) {
+	fprintf(stderr, "gzseek error, pos=%ld, gztell=%ld\n",
+		(long)pos, (long)gztell(file));
+	exit(1);
+    }
+
+    if (gzgetc(file) != ' ') {
+	fprintf(stderr, "gzgetc error\n");
+	exit(1);
+    }
+
+    gzgets(file, (char*)uncompr, uncomprLen);
+    uncomprLen = strlen((char*)uncompr);
+    if (uncomprLen != 6) { /* "hello!" */
+        fprintf(stderr, "gzgets err after gzseek: %s\n", gzerror(file, &err));
+	exit(1);
+    }
+    if (strcmp((char*)uncompr, hello+7)) {
+        fprintf(stderr, "bad gzgets after gzseek\n");
+	exit(1);
+    } else {
+        printf("gzgets() after gzseek: %s\n", (char *)uncompr);
+    }
+
+    gzclose(file);
+}
+
+/* ===========================================================================
+ * Test deflate() with small buffers
+ */
+void test_deflate(compr, comprLen)
+    Byte *compr;
+    uLong comprLen;
+{
+    z_stream c_stream; /* compression stream */
+    int err;
+    int len = strlen(hello)+1;
+
+    c_stream.zalloc = (alloc_func)0;
+    c_stream.zfree = (free_func)0;
+    c_stream.opaque = (voidpf)0;
+
+    err = deflateInit(&c_stream, Z_DEFAULT_COMPRESSION);
+    CHECK_ERR(err, "deflateInit");
+
+    c_stream.next_in  = (Bytef*)hello;
+    c_stream.next_out = compr;
+
+    while (c_stream.total_in != (uLong)len && c_stream.total_out < comprLen) {
+        c_stream.avail_in = c_stream.avail_out = 1; /* force small buffers */
+        err = deflate(&c_stream, Z_NO_FLUSH);
+        CHECK_ERR(err, "deflate");
+    }
+    /* Finish the stream, still forcing small buffers: */
+    for (;;) {
+        c_stream.avail_out = 1;
+        err = deflate(&c_stream, Z_FINISH);
+        if (err == Z_STREAM_END) break;
+        CHECK_ERR(err, "deflate");
+    }
+
+    err = deflateEnd(&c_stream);
+    CHECK_ERR(err, "deflateEnd");
+}
+
+/* ===========================================================================
+ * Test inflate() with small buffers
+ */
+void test_inflate(compr, comprLen, uncompr, uncomprLen)
+    Byte *compr, *uncompr;
+    uLong comprLen, uncomprLen;
+{
+    int err;
+    z_stream d_stream; /* decompression stream */
+
+    strcpy((char*)uncompr, "garbage");
+
+    d_stream.zalloc = (alloc_func)0;
+    d_stream.zfree = (free_func)0;
+    d_stream.opaque = (voidpf)0;
+
+    d_stream.next_in  = compr;
+    d_stream.avail_in = 0;
+    d_stream.next_out = uncompr;
+
+    err = inflateInit(&d_stream);
+    CHECK_ERR(err, "inflateInit");
+
+    while (d_stream.total_out < uncomprLen && d_stream.total_in < comprLen) {
+        d_stream.avail_in = d_stream.avail_out = 1; /* force small buffers */
+        err = inflate(&d_stream, Z_NO_FLUSH);
+        if (err == Z_STREAM_END) break;
+        CHECK_ERR(err, "inflate");
+    }
+
+    err = inflateEnd(&d_stream);
+    CHECK_ERR(err, "inflateEnd");
+
+    if (strcmp((char*)uncompr, hello)) {
+        fprintf(stderr, "bad inflate\n");
+	exit(1);
+    } else {
+        printf("inflate(): %s\n", (char *)uncompr);
+    }
+}
+
+/* ===========================================================================
+ * Test deflate() with large buffers and dynamic change of compression level
+ */
+void test_large_deflate(compr, comprLen, uncompr, uncomprLen)
+    Byte *compr, *uncompr;
+    uLong comprLen, uncomprLen;
+{
+    z_stream c_stream; /* compression stream */
+    int err;
+
+    c_stream.zalloc = (alloc_func)0;
+    c_stream.zfree = (free_func)0;
+    c_stream.opaque = (voidpf)0;
+
+    err = deflateInit(&c_stream, Z_BEST_SPEED);
+    CHECK_ERR(err, "deflateInit");
+
+    c_stream.next_out = compr;
+    c_stream.avail_out = (uInt)comprLen;
+
+    /* At this point, uncompr is still mostly zeroes, so it should compress
+     * very well:
+     */
+    c_stream.next_in = uncompr;
+    c_stream.avail_in = (uInt)uncomprLen;
+    err = deflate(&c_stream, Z_NO_FLUSH);
+    CHECK_ERR(err, "deflate");
+    if (c_stream.avail_in != 0) {
+        fprintf(stderr, "deflate not greedy\n");
+	exit(1);
+    }
+
+    /* Feed in already compressed data and switch to no compression: */
+    deflateParams(&c_stream, Z_NO_COMPRESSION, Z_DEFAULT_STRATEGY);
+    c_stream.next_in = compr;
+    c_stream.avail_in = (uInt)comprLen/2;
+    err = deflate(&c_stream, Z_NO_FLUSH);
+    CHECK_ERR(err, "deflate");
+
+    /* Switch back to compressing mode: */
+    deflateParams(&c_stream, Z_BEST_COMPRESSION, Z_FILTERED);
+    c_stream.next_in = uncompr;
+    c_stream.avail_in = (uInt)uncomprLen;
+    err = deflate(&c_stream, Z_NO_FLUSH);
+    CHECK_ERR(err, "deflate");
+
+    err = deflate(&c_stream, Z_FINISH);
+    if (err != Z_STREAM_END) {
+        fprintf(stderr, "deflate should report Z_STREAM_END\n");
+	exit(1);
+    }
+    err = deflateEnd(&c_stream);
+    CHECK_ERR(err, "deflateEnd");
+}
+
+/* ===========================================================================
+ * Test inflate() with large buffers
+ */
+void test_large_inflate(compr, comprLen, uncompr, uncomprLen)
+    Byte *compr, *uncompr;
+    uLong comprLen, uncomprLen;
+{
+    int err;
+    z_stream d_stream; /* decompression stream */
+
+    strcpy((char*)uncompr, "garbage");
+
+    d_stream.zalloc = (alloc_func)0;
+    d_stream.zfree = (free_func)0;
+    d_stream.opaque = (voidpf)0;
+
+    d_stream.next_in  = compr;
+    d_stream.avail_in = (uInt)comprLen;
+
+    err = inflateInit(&d_stream);
+    CHECK_ERR(err, "inflateInit");
+
+    for (;;) {
+        d_stream.next_out = uncompr;            /* discard the output */
+	d_stream.avail_out = (uInt)uncomprLen;
+        err = inflate(&d_stream, Z_NO_FLUSH);
+        if (err == Z_STREAM_END) break;
+        CHECK_ERR(err, "large inflate");
+    }
+
+    err = inflateEnd(&d_stream);
+    CHECK_ERR(err, "inflateEnd");
+
+    if (d_stream.total_out != 2*uncomprLen + comprLen/2) {
+        fprintf(stderr, "bad large inflate: %ld\n", d_stream.total_out);
+	exit(1);
+    } else {
+        printf("large_inflate(): OK\n");
+    }
+}
+
+/* ===========================================================================
+ * Test deflate() with full flush
+ */
+void test_flush(compr, comprLen)
+    Byte *compr;
+    uLong *comprLen;
+{
+    z_stream c_stream; /* compression stream */
+    int err;
+    int len = strlen(hello)+1;
+
+    c_stream.zalloc = (alloc_func)0;
+    c_stream.zfree = (free_func)0;
+    c_stream.opaque = (voidpf)0;
+
+    err = deflateInit(&c_stream, Z_DEFAULT_COMPRESSION);
+    CHECK_ERR(err, "deflateInit");
+
+    c_stream.next_in  = (Bytef*)hello;
+    c_stream.next_out = compr;
+    c_stream.avail_in = 3;
+    c_stream.avail_out = (uInt)*comprLen;
+    err = deflate(&c_stream, Z_FULL_FLUSH);
+    CHECK_ERR(err, "deflate");
+
+    compr[3]++; /* force an error in first compressed block */
+    c_stream.avail_in = len - 3;
+
+    err = deflate(&c_stream, Z_FINISH);
+    if (err != Z_STREAM_END) {
+        CHECK_ERR(err, "deflate");
+    }
+    err = deflateEnd(&c_stream);
+    CHECK_ERR(err, "deflateEnd");
+
+    *comprLen = c_stream.total_out;
+}
+
+/* ===========================================================================
+ * Test inflateSync()
+ */
+void test_sync(compr, comprLen, uncompr, uncomprLen)
+    Byte *compr, *uncompr;
+    uLong comprLen, uncomprLen;
+{
+    int err;
+    z_stream d_stream; /* decompression stream */
+
+    strcpy((char*)uncompr, "garbage");
+
+    d_stream.zalloc = (alloc_func)0;
+    d_stream.zfree = (free_func)0;
+    d_stream.opaque = (voidpf)0;
+
+    d_stream.next_in  = compr;
+    d_stream.avail_in = 2; /* just read the zlib header */
+
+    err = inflateInit(&d_stream);
+    CHECK_ERR(err, "inflateInit");
+
+    d_stream.next_out = uncompr;
+    d_stream.avail_out = (uInt)uncomprLen;
+
+    inflate(&d_stream, Z_NO_FLUSH);
+    CHECK_ERR(err, "inflate");
+
+    d_stream.avail_in = (uInt)comprLen-2;   /* read all compressed data */
+    err = inflateSync(&d_stream);           /* but skip the damaged part */
+    CHECK_ERR(err, "inflateSync");
+
+    err = inflate(&d_stream, Z_FINISH);
+    if (err != Z_DATA_ERROR) {
+        fprintf(stderr, "inflate should report DATA_ERROR\n");
+        /* Because of incorrect adler32 */
+	exit(1);
+    }
+    err = inflateEnd(&d_stream);
+    CHECK_ERR(err, "inflateEnd");
+
+    printf("after inflateSync(): hel%s\n", (char *)uncompr);
+}
+
+/* ===========================================================================
+ * Test deflate() with preset dictionary
+ */
+void test_dict_deflate(compr, comprLen)
+    Byte *compr;
+    uLong comprLen;
+{
+    z_stream c_stream; /* compression stream */
+    int err;
+
+    c_stream.zalloc = (alloc_func)0;
+    c_stream.zfree = (free_func)0;
+    c_stream.opaque = (voidpf)0;
+
+    err = deflateInit(&c_stream, Z_BEST_COMPRESSION);
+    CHECK_ERR(err, "deflateInit");
+
+    err = deflateSetDictionary(&c_stream,
+			       (const Bytef*)dictionary, sizeof(dictionary));
+    CHECK_ERR(err, "deflateSetDictionary");
+
+    dictId = c_stream.adler;
+    c_stream.next_out = compr;
+    c_stream.avail_out = (uInt)comprLen;
+
+    c_stream.next_in = (Bytef*)hello;
+    c_stream.avail_in = (uInt)strlen(hello)+1;
+
+    err = deflate(&c_stream, Z_FINISH);
+    if (err != Z_STREAM_END) {
+        fprintf(stderr, "deflate should report Z_STREAM_END\n");
+	exit(1);
+    }
+    err = deflateEnd(&c_stream);
+    CHECK_ERR(err, "deflateEnd");
+}
+
+/* ===========================================================================
+ * Test inflate() with a preset dictionary
+ */
+void test_dict_inflate(compr, comprLen, uncompr, uncomprLen)
+    Byte *compr, *uncompr;
+    uLong comprLen, uncomprLen;
+{
+    int err;
+    z_stream d_stream; /* decompression stream */
+
+    strcpy((char*)uncompr, "garbage");
+
+    d_stream.zalloc = (alloc_func)0;
+    d_stream.zfree = (free_func)0;
+    d_stream.opaque = (voidpf)0;
+
+    d_stream.next_in  = compr;
+    d_stream.avail_in = (uInt)comprLen;
+
+    err = inflateInit(&d_stream);
+    CHECK_ERR(err, "inflateInit");
+
+    d_stream.next_out = uncompr;
+    d_stream.avail_out = (uInt)uncomprLen;
+
+    for (;;) {
+        err = inflate(&d_stream, Z_NO_FLUSH);
+        if (err == Z_STREAM_END) break;
+	if (err == Z_NEED_DICT) {
+	    if (d_stream.adler != dictId) {
+		fprintf(stderr, "unexpected dictionary");
+		exit(1);
+	    }
+	    err = inflateSetDictionary(&d_stream, (const Bytef*)dictionary,
+				       sizeof(dictionary));
+	}
+        CHECK_ERR(err, "inflate with dict");
+    }
+
+    err = inflateEnd(&d_stream);
+    CHECK_ERR(err, "inflateEnd");
+
+    if (strcmp((char*)uncompr, hello)) {
+        fprintf(stderr, "bad inflate with dict\n");
+	exit(1);
+    } else {
+        printf("inflate with dictionary: %s\n", (char *)uncompr);
+    }
+}
+
+/* ===========================================================================
+ * Usage:  example [output.gz  [input.gz]]
+ */
+
+int main(argc, argv)
+    int argc;
+    char *argv[];
+{
+    Byte *compr, *uncompr;
+    uLong comprLen = 10000*sizeof(int); /* don't overflow on MSDOS */
+    uLong uncomprLen = comprLen;
+    static const char* myVersion = ZLIB_VERSION;
+
+    if (zlibVersion()[0] != myVersion[0]) {
+        fprintf(stderr, "incompatible zlib version\n");
+        exit(1);
+
+    } else if (strcmp(zlibVersion(), ZLIB_VERSION) != 0) {
+        fprintf(stderr, "warning: different zlib version\n");
+    }
+
+    compr    = (Byte*)calloc((uInt)comprLen, 1);
+    uncompr  = (Byte*)calloc((uInt)uncomprLen, 1);
+    /* compr and uncompr are cleared to avoid reading uninitialized
+     * data and to ensure that uncompr compresses well.
+     */
+    if (compr == Z_NULL || uncompr == Z_NULL) {
+        printf("out of memory\n");
+	exit(1);
+    }
+    test_compress(compr, comprLen, uncompr, uncomprLen);
+
+    test_gzio((argc > 1 ? argv[1] : TESTFILE),
+              (argc > 2 ? argv[2] : TESTFILE),
+	      uncompr, (int)uncomprLen);
+
+    test_deflate(compr, comprLen);
+    test_inflate(compr, comprLen, uncompr, uncomprLen);
+
+    test_large_deflate(compr, comprLen, uncompr, uncomprLen);
+    test_large_inflate(compr, comprLen, uncompr, uncomprLen);
+
+    test_flush(compr, &comprLen);
+    test_sync(compr, comprLen, uncompr, uncomprLen);
+    comprLen = uncomprLen;
+
+    test_dict_deflate(compr, comprLen);
+    test_dict_inflate(compr, comprLen, uncompr, uncomprLen);
+
+    exit(0);
+    return 0; /* to avoid warning */
+}
diff --git a/uppsrc/plugin/z/lib/gzio.c b/uppsrc/plugin/z/lib/gzio.c
new file mode 100644
index 000000000..dcf6737ee
--- /dev/null
+++ b/uppsrc/plugin/z/lib/gzio.c
@@ -0,0 +1,881 @@
+/* gzio.c -- IO on .gz files
+ * Copyright (C) 1995-2002 Jean-loup Gailly.
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ *
+ * Compile this file with -DNO_DEFLATE to avoid the compression code.
+ */
+
+/* @(#) $Id: gzio.c,v 1.1 2005/02/07 00:26:07 rylek Exp $ */
+
+#include <stdio.h>
+
+#include "zutil.h"
+
+struct internal_state {int dummy;}; /* for buggy compilers */
+
+#ifndef Z_BUFSIZE
+#  ifdef MAXSEG_64K
+#    define Z_BUFSIZE 4096 /* minimize memory usage for 16-bit DOS */
+#  else
+#    define Z_BUFSIZE 16384
+#  endif
+#endif
+#ifndef Z_PRINTF_BUFSIZE
+#  define Z_PRINTF_BUFSIZE 4096
+#endif
+
+#define ALLOC(size) malloc(size)
+#define TRYFREE(p) {if (p) free(p);}
+
+static int gz_magic[2] = {0x1f, 0x8b}; /* gzip magic header */
+
+/* gzip flag byte */
+#define ASCII_FLAG   0x01 /* bit 0 set: file probably ascii text */
+#define HEAD_CRC     0x02 /* bit 1 set: header CRC present */
+#define EXTRA_FIELD  0x04 /* bit 2 set: extra field present */
+#define ORIG_NAME    0x08 /* bit 3 set: original file name present */
+#define COMMENT      0x10 /* bit 4 set: file comment present */
+#define RESERVED     0xE0 /* bits 5..7: reserved */
+
+typedef struct gz_stream {
+    z_stream stream;
+    int      z_err;   /* error code for last stream operation */
+    int      z_eof;   /* set if end of input file */
+    FILE     *file;   /* .gz file */
+    Byte     *inbuf;  /* input buffer */
+    Byte     *outbuf; /* output buffer */
+    uLong    crc;     /* crc32 of uncompressed data */
+    char     *msg;    /* error message */
+    char     *path;   /* path name for debugging only */
+    int      transparent; /* 1 if input file is not a .gz file */
+    char     mode;    /* 'w' or 'r' */
+    long     startpos; /* start of compressed data in file (header skipped) */
+} gz_stream;
+
+
+// local gzFile gz_open      OF((const char *path, const char *mode, int  fd));
+// local int do_flush        OF((gzFile file, int flush));
+local int    get_byte     OF((gz_stream *s));
+local void   check_header OF((gz_stream *s));
+local int    destroy      OF((gz_stream *s));
+//local void   putLong      OF((FILE *file, uLong x));
+local uLong  getLong      OF((gz_stream *s));
+
+/* ===========================================================================
+     Opens a gzip (.gz) file for reading or writing. The mode parameter
+   is as in fopen ("rb" or "wb"). The file is given either by file descriptor
+   or path name (if fd == -1).
+     gz_open return NULL if the file could not be opened or if there was
+   insufficient memory to allocate the (de)compression state; errno
+   can be checked to distinguish the two cases (if errno is zero, the
+   zlib error is Z_MEM_ERROR).
+*/
+#if 0
+local gzFile gz_open (path, mode, fd)
+    const char *path;
+    const char *mode;
+    int  fd;
+{
+    int err;
+    int level = Z_DEFAULT_COMPRESSION; /* compression level */
+    int strategy = Z_DEFAULT_STRATEGY; /* compression strategy */
+    char *p = (char*)mode;
+    gz_stream *s;
+    char fmode[80]; /* copy of mode, without the compression level */
+    char *m = fmode;
+
+    if (!path || !mode) return Z_NULL;
+
+    s = (gz_stream *)ALLOC(sizeof(gz_stream));
+    if (!s) return Z_NULL;
+
+    s->stream.zalloc = (alloc_func)0;
+    s->stream.zfree = (free_func)0;
+    s->stream.opaque = (voidpf)0;
+    s->stream.next_in = s->inbuf = Z_NULL;
+    s->stream.next_out = s->outbuf = Z_NULL;
+    s->stream.avail_in = s->stream.avail_out = 0;
+    s->file = NULL;
+    s->z_err = Z_OK;
+    s->z_eof = 0;
+    s->crc = crc32(0L, Z_NULL, 0);
+    s->msg = NULL;
+    s->transparent = 0;
+
+    s->path = (char*)ALLOC(strlen(path)+1);
+    if (s->path == NULL) {
+        return destroy(s), (gzFile)Z_NULL;
+    }
+    strcpy(s->path, path); /* do this early for debugging */
+
+    s->mode = '\0';
+    do {
+        if (*p == 'r') s->mode = 'r';
+        if (*p == 'w' || *p == 'a') s->mode = 'w';
+        if (*p >= '0' && *p <= '9') {
+	    level = *p - '0';
+	} else if (*p == 'f') {
+	  strategy = Z_FILTERED;
+	} else if (*p == 'h') {
+	  strategy = Z_HUFFMAN_ONLY;
+	} else {
+	    *m++ = *p; /* copy the mode */
+	}
+    } while (*p++ && m != fmode + sizeof(fmode));
+    if (s->mode == '\0') return destroy(s), (gzFile)Z_NULL;
+
+    if (s->mode == 'w') {
+#ifdef NO_DEFLATE
+        err = Z_STREAM_ERROR;
+#else
+        err = deflateInit2(&(s->stream), level,
+                           Z_DEFLATED, -MAX_WBITS, DEF_MEM_LEVEL, strategy);
+        /* windowBits is passed < 0 to suppress zlib header */
+
+        s->stream.next_out = s->outbuf = (Byte*)ALLOC(Z_BUFSIZE);
+#endif
+        if (err != Z_OK || s->outbuf == Z_NULL) {
+            return destroy(s), (gzFile)Z_NULL;
+        }
+    } else {
+        s->stream.next_in  = s->inbuf = (Byte*)ALLOC(Z_BUFSIZE);
+
+        err = inflateInit2(&(s->stream), -MAX_WBITS);
+        /* windowBits is passed < 0 to tell that there is no zlib header.
+         * Note that in this case inflate *requires* an extra "dummy" byte
+         * after the compressed stream in order to complete decompression and
+         * return Z_STREAM_END. Here the gzip CRC32 ensures that 4 bytes are
+         * present after the compressed stream.
+         */
+        if (err != Z_OK || s->inbuf == Z_NULL) {
+            return destroy(s), (gzFile)Z_NULL;
+        }
+    }
+    s->stream.avail_out = Z_BUFSIZE;
+
+    errno = 0;
+    s->file = fd < 0 ? F_OPEN(path, fmode) : (FILE*)fdopen(fd, fmode);
+
+    if (s->file == NULL) {
+        return destroy(s), (gzFile)Z_NULL;
+    }
+    if (s->mode == 'w') {
+        /* Write a very simple .gz header:
+         */
+        fprintf(s->file, "%c%c%c%c%c%c%c%c%c%c", gz_magic[0], gz_magic[1],
+             Z_DEFLATED, 0 /*flags*/, 0,0,0,0 /*time*/, 0 /*xflags*/, OS_CODE);
+	s->startpos = 10L;
+	/* We use 10L instead of ftell(s->file) to because ftell causes an
+         * fflush on some systems. This version of the library doesn't use
+         * startpos anyway in write mode, so this initialization is not
+         * necessary.
+         */
+    } else {
+	check_header(s); /* skip the .gz header */
+	s->startpos = (ftell(s->file) - s->stream.avail_in);
+    }
+
+    return (gzFile)s;
+}
+
+/* ===========================================================================
+     Opens a gzip (.gz) file for reading or writing.
+*/
+gzFile ZEXPORT gzopen (path, mode)
+    const char *path;
+    const char *mode;
+{
+    return gz_open (path, mode, -1);
+}
+
+/* ===========================================================================
+     Associate a gzFile with the file descriptor fd. fd is not dup'ed here
+   to mimic the behavio(u)r of fdopen.
+*/
+gzFile ZEXPORT gzdopen (fd, mode)
+    int fd;
+    const char *mode;
+{
+    char name[20];
+
+    if (fd < 0) return (gzFile)Z_NULL;
+    sprintf(name, "<fd:%d>", fd); /* for debugging */
+
+    return gz_open (name, mode, fd);
+}
+
+/* ===========================================================================
+ * Update the compression level and strategy
+ */
+int ZEXPORT gzsetparams (file, level, strategy)
+    gzFile file;
+    int level;
+    int strategy;
+{
+    gz_stream *s = (gz_stream*)file;
+
+    if (s == NULL || s->mode != 'w') return Z_STREAM_ERROR;
+
+    /* Make room to allow flushing */
+    if (s->stream.avail_out == 0) {
+
+	s->stream.next_out = s->outbuf;
+	if (fwrite(s->outbuf, 1, Z_BUFSIZE, s->file) != Z_BUFSIZE) {
+	    s->z_err = Z_ERRNO;
+	}
+	s->stream.avail_out = Z_BUFSIZE;
+    }
+
+    return deflateParams (&(s->stream), level, strategy);
+}
+#endif
+
+/* ===========================================================================
+     Read a byte from a gz_stream; update next_in and avail_in. Return EOF
+   for end of file.
+   IN assertion: the stream s has been sucessfully opened for reading.
+*/
+local int get_byte(s)
+    gz_stream *s;
+{
+    if (s->z_eof) return EOF;
+    if (s->stream.avail_in == 0) {
+	errno = 0;
+	s->stream.avail_in = (unsigned)fread(s->inbuf, 1, Z_BUFSIZE, s->file);
+	if (s->stream.avail_in == 0) {
+	    s->z_eof = 1;
+	    if (ferror(s->file)) s->z_err = Z_ERRNO;
+	    return EOF;
+	}
+	s->stream.next_in = s->inbuf;
+    }
+    s->stream.avail_in--;
+    return *(s->stream.next_in)++;
+}
+
+/* ===========================================================================
+      Check the gzip header of a gz_stream opened for reading. Set the stream
+    mode to transparent if the gzip magic header is not present; set s->err
+    to Z_DATA_ERROR if the magic header is present but the rest of the header
+    is incorrect.
+    IN assertion: the stream s has already been created sucessfully;
+       s->stream.avail_in is zero for the first time, but may be non-zero
+       for concatenated .gz files.
+*/
+local void check_header(s)
+    gz_stream *s;
+{
+    int method; /* method byte */
+    int flags;  /* flags byte */
+    uInt len;
+    int c;
+
+    /* Check the gzip magic header */
+    for (len = 0; len < 2; len++) {
+	c = get_byte(s);
+	if (c != gz_magic[len]) {
+	    if (len != 0) s->stream.avail_in++, s->stream.next_in--;
+	    if (c != EOF) {
+		s->stream.avail_in++, s->stream.next_in--;
+		s->transparent = 1;
+	    }
+	    s->z_err = s->stream.avail_in != 0 ? Z_OK : Z_STREAM_END;
+	    return;
+	}
+    }
+    method = get_byte(s);
+    flags = get_byte(s);
+    if (method != Z_DEFLATED || (flags & RESERVED) != 0) {
+	s->z_err = Z_DATA_ERROR;
+	return;
+    }
+
+    /* Discard time, xflags and OS code: */
+    for (len = 0; len < 6; len++) (void)get_byte(s);
+
+    if ((flags & EXTRA_FIELD) != 0) { /* skip the extra field */
+	len  =  (uInt)get_byte(s);
+	len += ((uInt)get_byte(s))<<8;
+	/* len is garbage if EOF but the loop below will quit anyway */
+	while (len-- != 0 && get_byte(s) != EOF) ;
+    }
+    if ((flags & ORIG_NAME) != 0) { /* skip the original file name */
+	while ((c = get_byte(s)) != 0 && c != EOF) ;
+    }
+    if ((flags & COMMENT) != 0) {   /* skip the .gz file comment */
+	while ((c = get_byte(s)) != 0 && c != EOF) ;
+    }
+    if ((flags & HEAD_CRC) != 0) {  /* skip the header crc */
+	for (len = 0; len < 2; len++) (void)get_byte(s);
+    }
+    s->z_err = s->z_eof ? Z_DATA_ERROR : Z_OK;
+}
+
+ /* ===========================================================================
+ * Cleanup then free the given gz_stream. Return a zlib error code.
+   Try freeing in the reverse order of allocations.
+ */
+local int destroy (s)
+    gz_stream *s;
+{
+    int err = Z_OK;
+
+    if (!s) return Z_STREAM_ERROR;
+
+    TRYFREE(s->msg);
+
+    if (s->stream.state != NULL) {
+	if (s->mode == 'w') {
+#ifdef NO_DEFLATE
+	    err = Z_STREAM_ERROR;
+#else
+	    err = deflateEnd(&(s->stream));
+#endif
+	} else if (s->mode == 'r') {
+	    err = inflateEnd(&(s->stream));
+	}
+    }
+    if (s->file != NULL && fclose(s->file)) {
+#ifdef ESPIPE
+	if (errno != ESPIPE) /* fclose is broken for pipes in HP/UX */
+#endif
+	    err = Z_ERRNO;
+    }
+    if (s->z_err < 0) err = s->z_err;
+
+    TRYFREE(s->inbuf);
+    TRYFREE(s->outbuf);
+    TRYFREE(s->path);
+    TRYFREE(s);
+    return err;
+}
+
+/* ===========================================================================
+     Reads the given number of uncompressed bytes from the compressed file.
+   gzread returns the number of bytes actually read (0 for end of file).
+*/
+
+#if 0
+int ZEXPORT gzread (file, buf, len)
+    gzFile file;
+    voidp buf;
+    unsigned len;
+{
+    gz_stream *s = (gz_stream*)file;
+    Bytef *start = (Bytef*)buf; /* starting point for crc computation */
+    Byte  *next_out; /* == stream.next_out but not forced far (for MSDOS) */
+
+    if (s == NULL || s->mode != 'r') return Z_STREAM_ERROR;
+
+    if (s->z_err == Z_DATA_ERROR || s->z_err == Z_ERRNO) return -1;
+    if (s->z_err == Z_STREAM_END) return 0;  /* EOF */
+
+    next_out = (Byte*)buf;
+    s->stream.next_out = (Bytef*)buf;
+    s->stream.avail_out = len;
+
+    while (s->stream.avail_out != 0) {
+
+	if (s->transparent) {
+	    /* Copy first the lookahead bytes: */
+	    uInt n = s->stream.avail_in;
+	    if (n > s->stream.avail_out) n = s->stream.avail_out;
+	    if (n > 0) {
+		zmemcpy(s->stream.next_out, s->stream.next_in, n);
+		next_out += n;
+		s->stream.next_out = next_out;
+		s->stream.next_in   += n;
+		s->stream.avail_out -= n;
+		s->stream.avail_in  -= n;
+	    }
+	    if (s->stream.avail_out > 0) {
+		s->stream.avail_out -= fread(next_out, 1, s->stream.avail_out,
+					     s->file);
+	    }
+	    len -= s->stream.avail_out;
+	    s->stream.total_in  += (uLong)len;
+	    s->stream.total_out += (uLong)len;
+            if (len == 0) s->z_eof = 1;
+	    return (int)len;
+	}
+        if (s->stream.avail_in == 0 && !s->z_eof) {
+
+            errno = 0;
+            s->stream.avail_in = fread(s->inbuf, 1, Z_BUFSIZE, s->file);
+            if (s->stream.avail_in == 0) {
+                s->z_eof = 1;
+		if (ferror(s->file)) {
+		    s->z_err = Z_ERRNO;
+		    break;
+		}
+            }
+            s->stream.next_in = s->inbuf;
+        }
+        s->z_err = inflate(&(s->stream), Z_NO_FLUSH);
+
+	if (s->z_err == Z_STREAM_END) {
+	    /* Check CRC and original size */
+	    s->crc = crc32(s->crc, start, (uInt)(s->stream.next_out - start));
+	    start = s->stream.next_out;
+
+	    if (getLong(s) != s->crc) {
+		s->z_err = Z_DATA_ERROR;
+	    } else {
+	        (void)getLong(s);
+                /* The uncompressed length returned by above getlong() may
+                 * be different from s->stream.total_out) in case of
+		 * concatenated .gz files. Check for such files:
+		 */
+		check_header(s);
+		if (s->z_err == Z_OK) {
+		    uLong total_in = s->stream.total_in;
+		    uLong total_out = s->stream.total_out;
+
+		    inflateReset(&(s->stream));
+		    s->stream.total_in = total_in;
+		    s->stream.total_out = total_out;
+		    s->crc = crc32(0L, Z_NULL, 0);
+		}
+	    }
+	}
+	if (s->z_err != Z_OK || s->z_eof) break;
+    }
+    s->crc = crc32(s->crc, start, (uInt)(s->stream.next_out - start));
+
+    return (int)(len - s->stream.avail_out);
+}
+
+
+/* ===========================================================================
+      Reads one byte from the compressed file. gzgetc returns this byte
+   or -1 in case of end of file or error.
+*/
+int ZEXPORT gzgetc(file)
+    gzFile file;
+{
+    unsigned char c;
+
+    return gzread(file, &c, 1) == 1 ? c : -1;
+}
+
+
+/* ===========================================================================
+      Reads bytes from the compressed file until len-1 characters are
+   read, or a newline character is read and transferred to buf, or an
+   end-of-file condition is encountered.  The string is then terminated
+   with a null character.
+      gzgets returns buf, or Z_NULL in case of error.
+
+      The current implementation is not optimized at all.
+*/
+char * ZEXPORT gzgets(file, buf, len)
+    gzFile file;
+    char *buf;
+    int len;
+{
+    char *b = buf;
+    if (buf == Z_NULL || len <= 0) return Z_NULL;
+
+    while (--len > 0 && gzread(file, buf, 1) == 1 && *buf++ != '\n') ;
+    *buf = '\0';
+    return b == buf && len > 0 ? Z_NULL : b;
+}
+
+
+#ifndef NO_DEFLATE
+/* ===========================================================================
+     Writes the given number of uncompressed bytes into the compressed file.
+   gzwrite returns the number of bytes actually written (0 in case of error).
+*/
+int ZEXPORT gzwrite (file, buf, len)
+    gzFile file;
+    const voidp buf;
+    unsigned len;
+{
+    gz_stream *s = (gz_stream*)file;
+
+    if (s == NULL || s->mode != 'w') return Z_STREAM_ERROR;
+
+    s->stream.next_in = (Bytef*)buf;
+    s->stream.avail_in = len;
+
+    while (s->stream.avail_in != 0) {
+
+        if (s->stream.avail_out == 0) {
+
+            s->stream.next_out = s->outbuf;
+            if (fwrite(s->outbuf, 1, Z_BUFSIZE, s->file) != Z_BUFSIZE) {
+                s->z_err = Z_ERRNO;
+                break;
+            }
+            s->stream.avail_out = Z_BUFSIZE;
+        }
+        s->z_err = deflate(&(s->stream), Z_NO_FLUSH);
+        if (s->z_err != Z_OK) break;
+    }
+    s->crc = crc32(s->crc, (const Bytef *)buf, len);
+
+    return (int)(len - s->stream.avail_in);
+}
+
+/* ===========================================================================
+     Converts, formats, and writes the args to the compressed file under
+   control of the format string, as in fprintf. gzprintf returns the number of
+   uncompressed bytes actually written (0 in case of error).
+*/
+#ifdef STDC
+#include <stdarg.h>
+
+int ZEXPORTVA gzprintf (gzFile file, const char *format, /* args */ ...)
+{
+    char buf[Z_PRINTF_BUFSIZE];
+    va_list va;
+    int len;
+
+    va_start(va, format);
+#ifdef HAS_vsnprintf
+    (void)vsnprintf(buf, sizeof(buf), format, va);
+#else
+    (void)vsprintf(buf, format, va);
+#endif
+    va_end(va);
+    len = strlen(buf); /* some *sprintf don't return the nb of bytes written */
+    if (len <= 0) return 0;
+
+    return gzwrite(file, buf, (unsigned)len);
+}
+#else /* not ANSI C */
+
+int ZEXPORTVA gzprintf (file, format, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10,
+	               a11, a12, a13, a14, a15, a16, a17, a18, a19, a20)
+    gzFile file;
+    const char *format;
+    int a1, a2, a3, a4, a5, a6, a7, a8, a9, a10,
+	a11, a12, a13, a14, a15, a16, a17, a18, a19, a20;
+{
+    char buf[Z_PRINTF_BUFSIZE];
+    int len;
+
+#ifdef HAS_snprintf
+    snprintf(buf, sizeof(buf), format, a1, a2, a3, a4, a5, a6, a7, a8,
+	     a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);
+#else
+    sprintf(buf, format, a1, a2, a3, a4, a5, a6, a7, a8,
+	    a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);
+#endif
+    len = strlen(buf); /* old sprintf doesn't return the nb of bytes written */
+    if (len <= 0) return 0;
+
+    return gzwrite(file, buf, len);
+}
+#endif
+
+/* ===========================================================================
+      Writes c, converted to an unsigned char, into the compressed file.
+   gzputc returns the value that was written, or -1 in case of error.
+*/
+int ZEXPORT gzputc(file, c)
+    gzFile file;
+    int c;
+{
+    unsigned char cc = (unsigned char) c; /* required for big endian systems */
+
+    return gzwrite(file, &cc, 1) == 1 ? (int)cc : -1;
+}
+
+
+/* ===========================================================================
+      Writes the given null-terminated string to the compressed file, excluding
+   the terminating null character.
+      gzputs returns the number of characters written, or -1 in case of error.
+*/
+int ZEXPORT gzputs(file, s)
+    gzFile file;
+    const char *s;
+{
+    return gzwrite(file, (char*)s, (unsigned)strlen(s));
+}
+
+
+/* ===========================================================================
+     Flushes all pending output into the compressed file. The parameter
+   flush is as in the deflate() function.
+*/
+local int do_flush (file, flush)
+    gzFile file;
+    int flush;
+{
+    uInt len;
+    int done = 0;
+    gz_stream *s = (gz_stream*)file;
+
+    if (s == NULL || s->mode != 'w') return Z_STREAM_ERROR;
+
+    s->stream.avail_in = 0; /* should be zero already anyway */
+
+    for (;;) {
+        len = Z_BUFSIZE - s->stream.avail_out;
+
+        if (len != 0) {
+            if ((uInt)fwrite(s->outbuf, 1, len, s->file) != len) {
+                s->z_err = Z_ERRNO;
+                return Z_ERRNO;
+            }
+            s->stream.next_out = s->outbuf;
+            s->stream.avail_out = Z_BUFSIZE;
+        }
+        if (done) break;
+        s->z_err = deflate(&(s->stream), flush);
+
+	/* Ignore the second of two consecutive flushes: */
+	if (len == 0 && s->z_err == Z_BUF_ERROR) s->z_err = Z_OK;
+
+        /* deflate has finished flushing only when it hasn't used up
+         * all the available space in the output buffer:
+         */
+        done = (s->stream.avail_out != 0 || s->z_err == Z_STREAM_END);
+
+        if (s->z_err != Z_OK && s->z_err != Z_STREAM_END) break;
+    }
+    return  s->z_err == Z_STREAM_END ? Z_OK : s->z_err;
+}
+
+int ZEXPORT gzflush (file, flush)
+     gzFile file;
+     int flush;
+{
+    gz_stream *s = (gz_stream*)file;
+    int err = do_flush (file, flush);
+
+    if (err) return err;
+    fflush(s->file);
+    return  s->z_err == Z_STREAM_END ? Z_OK : s->z_err;
+}
+#endif /* NO_DEFLATE */
+
+/* ===========================================================================
+      Sets the starting position for the next gzread or gzwrite on the given
+   compressed file. The offset represents a number of bytes in the
+      gzseek returns the resulting offset location as measured in bytes from
+   the beginning of the uncompressed stream, or -1 in case of error.
+      SEEK_END is not implemented, returns error.
+      In this version of the library, gzseek can be extremely slow.
+*/
+z_off_t ZEXPORT gzseek (file, offset, whence)
+    gzFile file;
+    z_off_t offset;
+    int whence;
+{
+    gz_stream *s = (gz_stream*)file;
+
+    if (s == NULL || whence == SEEK_END ||
+	s->z_err == Z_ERRNO || s->z_err == Z_DATA_ERROR) {
+	return -1L;
+    }
+
+    if (s->mode == 'w') {
+#ifdef NO_DEFLATE
+	return -1L;
+#else
+	if (whence == SEEK_SET) {
+	    offset -= s->stream.total_in;
+	}
+	if (offset < 0) return -1L;
+
+	/* At this point, offset is the number of zero bytes to write. */
+	if (s->inbuf == Z_NULL) {
+	    s->inbuf = (Byte*)ALLOC(Z_BUFSIZE); /* for seeking */
+	    zmemzero(s->inbuf, Z_BUFSIZE);
+	}
+	while (offset > 0)  {
+	    uInt size = Z_BUFSIZE;
+	    if (offset < Z_BUFSIZE) size = (uInt)offset;
+
+	    size = gzwrite(file, s->inbuf, size);
+	    if (size == 0) return -1L;
+
+	    offset -= size;
+	}
+	return (z_off_t)s->stream.total_in;
+#endif
+    }
+    /* Rest of function is for reading only */
+
+    /* compute absolute position */
+    if (whence == SEEK_CUR) {
+	offset += s->stream.total_out;
+    }
+    if (offset < 0) return -1L;
+
+    if (s->transparent) {
+	/* map to fseek */
+	s->stream.avail_in = 0;
+	s->stream.next_in = s->inbuf;
+        if (fseek(s->file, offset, SEEK_SET) < 0) return -1L;
+
+	s->stream.total_in = s->stream.total_out = (uLong)offset;
+	return offset;
+    }
+
+    /* For a negative seek, rewind and use positive seek */
+    if ((uLong)offset >= s->stream.total_out) {
+	offset -= s->stream.total_out;
+    } else if (gzrewind(file) < 0) {
+	return -1L;
+    }
+    /* offset is now the number of bytes to skip. */
+
+    if (offset != 0 && s->outbuf == Z_NULL) {
+	s->outbuf = (Byte*)ALLOC(Z_BUFSIZE);
+    }
+    while (offset > 0)  {
+	int size = Z_BUFSIZE;
+	if (offset < Z_BUFSIZE) size = (int)offset;
+
+	size = gzread(file, s->outbuf, (uInt)size);
+	if (size <= 0) return -1L;
+	offset -= size;
+    }
+    return (z_off_t)s->stream.total_out;
+}
+
+/* ===========================================================================
+     Rewinds input file.
+*/
+int ZEXPORT gzrewind (file)
+    gzFile file;
+{
+    gz_stream *s = (gz_stream*)file;
+
+    if (s == NULL || s->mode != 'r') return -1;
+
+    s->z_err = Z_OK;
+    s->z_eof = 0;
+    s->stream.avail_in = 0;
+    s->stream.next_in = s->inbuf;
+    s->crc = crc32(0L, Z_NULL, 0);
+
+    if (s->startpos == 0) { /* not a compressed file */
+	rewind(s->file);
+	return 0;
+    }
+
+    (void) inflateReset(&s->stream);
+    return fseek(s->file, s->startpos, SEEK_SET);
+}
+
+/* ===========================================================================
+     Returns the starting position for the next gzread or gzwrite on the
+   given compressed file. This position represents a number of bytes in the
+   uncompressed data stream.
+*/
+z_off_t ZEXPORT gztell (file)
+    gzFile file;
+{
+    return gzseek(file, 0L, SEEK_CUR);
+}
+
+/* ===========================================================================
+     Returns 1 when EOF has previously been detected reading the given
+   input stream, otherwise zero.
+*/
+int ZEXPORT gzeof (file)
+    gzFile file;
+{
+    gz_stream *s = (gz_stream*)file;
+
+    return (s == NULL || s->mode != 'r') ? 0 : s->z_eof;
+}
+
+/* ===========================================================================
+   Outputs a long in LSB order to the given file
+*/
+local void putLong (file, x)
+    FILE *file;
+    uLong x;
+{
+    int n;
+    for (n = 0; n < 4; n++) {
+        fputc((int)(x & 0xff), file);
+        x >>= 8;
+    }
+}
+#endif
+/* ===========================================================================
+   Reads a long in LSB order from the given gz_stream. Sets z_err in case
+   of error.
+*/
+local uLong getLong (s)
+    gz_stream *s;
+{
+    uLong x = (uLong)get_byte(s);
+    int c;
+
+    x += ((uLong)get_byte(s))<<8;
+    x += ((uLong)get_byte(s))<<16;
+    c = get_byte(s);
+    if (c == EOF) s->z_err = Z_DATA_ERROR;
+    x += ((uLong)c)<<24;
+    return x;
+}
+
+/* ===========================================================================
+     Flushes all pending output if necessary, closes the compressed file
+   and deallocates all the (de)compression state.
+*/
+#if 0
+int ZEXPORT gzclose (file)
+    gzFile file;
+{
+    int err;
+    gz_stream *s = (gz_stream*)file;
+
+    if (s == NULL) return Z_STREAM_ERROR;
+
+    if (s->mode == 'w') {
+#ifdef NO_DEFLATE
+	return Z_STREAM_ERROR;
+#else
+        err = do_flush (file, Z_FINISH);
+        if (err != Z_OK) return destroy((gz_stream*)file);
+
+        putLong (s->file, s->crc);
+        putLong (s->file, s->stream.total_in);
+#endif
+    }
+    return destroy((gz_stream*)file);
+}
+
+/* ===========================================================================
+     Returns the error message for the last error which occured on the
+   given compressed file. errnum is set to zlib error number. If an
+   error occured in the file system and not in the compression library,
+   errnum is set to Z_ERRNO and the application may consult errno
+   to get the exact error code.
+*/
+const char*  ZEXPORT gzerror (file, errnum)
+    gzFile file;
+    int *errnum;
+{
+    char *m;
+    gz_stream *s = (gz_stream*)file;
+
+    if (s == NULL) {
+        *errnum = Z_STREAM_ERROR;
+        return (const char*)ERR_MSG(Z_STREAM_ERROR);
+    }
+    *errnum = s->z_err;
+    if (*errnum == Z_OK) return (const char*)"";
+
+    m =  (char*)(*errnum == Z_ERRNO ? zstrerror(errno) : s->stream.msg);
+
+    if (m == NULL || *m == '\0') m = (char*)ERR_MSG(s->z_err);
+
+    TRYFREE(s->msg);
+    s->msg = (char*)ALLOC(strlen(s->path) + strlen(m) + 3);
+    strcpy(s->msg, s->path);
+    strcat(s->msg, ": ");
+    strcat(s->msg, m);
+    return (const char*)s->msg;
+}
+#endif
diff --git a/uppsrc/plugin/z/lib/infblock.c b/uppsrc/plugin/z/lib/infblock.c
new file mode 100644
index 000000000..4e4e2e15d
--- /dev/null
+++ b/uppsrc/plugin/z/lib/infblock.c
@@ -0,0 +1,403 @@
+/* infblock.c -- interpret and process block types to last block
+ * Copyright (C) 1995-2002 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+#include "zutil.h"
+#include "infblock.h"
+#include "inftrees.h"
+#include "infcodes.h"
+#include "infutil.h"
+
+struct inflate_codes_state {int dummy;}; /* for buggy compilers */
+
+/* simplify the use of the inflate_huft type with some defines */
+#define exop word.what.Exop
+#define bits word.what.Bits
+
+/* Table for deflate from PKZIP's appnote.txt. */
+local const uInt border[] = { /* Order of the bit length code lengths */
+        16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15};
+
+/*
+   Notes beyond the 1.93a appnote.txt:
+
+   1. Distance pointers never point before the beginning of the output
+      stream.
+   2. Distance pointers can point back across blocks, up to 32k away.
+   3. There is an implied maximum of 7 bits for the bit length table and
+      15 bits for the actual data.
+   4. If only one code exists, then it is encoded using one bit.  (Zero
+      would be more efficient, but perhaps a little confusing.)  If two
+      codes exist, they are coded using one bit each (0 and 1).
+   5. There is no way of sending zero distance codes--a dummy must be
+      sent if there are none.  (History: a pre 2.0 version of PKZIP would
+      store blocks with no distance codes, but this was discovered to be
+      too harsh a criterion.)  Valid only for 1.93a.  2.04c does allow
+      zero distance codes, which is sent as one code of zero bits in
+      length.
+   6. There are up to 286 literal/length codes.  Code 256 represents the
+      end-of-block.  Note however that the static length tree defines
+      288 codes just to fill out the Huffman codes.  Codes 286 and 287
+      cannot be used though, since there is no length base or extra bits
+      defined for them.  Similarily, there are up to 30 distance codes.
+      However, static trees define 32 codes (all 5 bits) to fill out the
+      Huffman codes, but the last two had better not show up in the data.
+   7. Unzip can check dynamic Huffman blocks for complete code sets.
+      The exception is that a single code would not be complete (see #4).
+   8. The five bits following the block type is really the number of
+      literal codes sent minus 257.
+   9. Length codes 8,16,16 are interpreted as 13 length codes of 8 bits
+      (1+6+6).  Therefore, to output three times the length, you output
+      three codes (1+1+1), whereas to output four times the same length,
+      you only need two codes (1+3).  Hmm.
+  10. In the tree reconstruction algorithm, Code = Code + Increment
+      only if BitLength(i) is not zero.  (Pretty obvious.)
+  11. Correction: 4 Bits: # of Bit Length codes - 4     (4 - 19)
+  12. Note: length code 284 can represent 227-258, but length code 285
+      really is 258.  The last length deserves its own, short code
+      since it gets used a lot in very redundant files.  The length
+      258 is special since 258 - 3 (the min match length) is 255.
+  13. The literal/length and distance code bit lengths are read as a
+      single stream of lengths.  It is possible (and advantageous) for
+      a repeat code (16, 17, or 18) to go across the boundary between
+      the two sets of lengths.
+ */
+
+
+void inflate_blocks_reset(s, z, c)
+inflate_blocks_statef *s;
+z_streamp z;
+uLongf *c;
+{
+  if (c != Z_NULL)
+    *c = s->check;
+  if (s->mode == BTREE || s->mode == DTREE)
+    ZFREE(z, s->sub.trees.blens);
+  if (s->mode == CODES)
+    inflate_codes_free(s->sub.decode.codes, z);
+  s->mode = TYPE;
+  s->bitk = 0;
+  s->bitb = 0;
+  s->read = s->write = s->window;
+  if (s->checkfn != Z_NULL)
+    z->adler = s->check = (*s->checkfn)(0L, (const Bytef *)Z_NULL, 0);
+  Tracev((stderr, "inflate:   blocks reset\n"));
+}
+
+
+inflate_blocks_statef *inflate_blocks_new(z, c, w)
+z_streamp z;
+check_func c;
+uInt w;
+{
+  inflate_blocks_statef *s;
+
+  if ((s = (inflate_blocks_statef *)ZALLOC
+       (z,1,sizeof(struct inflate_blocks_state))) == Z_NULL)
+    return s;
+  if ((s->hufts =
+       (inflate_huft *)ZALLOC(z, sizeof(inflate_huft), MANY)) == Z_NULL)
+  {
+    ZFREE(z, s);
+    return Z_NULL;
+  }
+  if ((s->window = (Bytef *)ZALLOC(z, 1, w)) == Z_NULL)
+  {
+    ZFREE(z, s->hufts);
+    ZFREE(z, s);
+    return Z_NULL;
+  }
+  s->end = s->window + w;
+  s->checkfn = c;
+  s->mode = TYPE;
+  Tracev((stderr, "inflate:   blocks allocated\n"));
+  inflate_blocks_reset(s, z, Z_NULL);
+  return s;
+}
+
+
+int inflate_blocks(s, z, r)
+inflate_blocks_statef *s;
+z_streamp z;
+int r;
+{
+  uInt t;               /* temporary storage */
+  uLong b;              /* bit buffer */
+  uInt k;               /* bits in bit buffer */
+  Bytef *p;             /* input data pointer */
+  uInt n;               /* bytes available there */
+  Bytef *q;             /* output window write pointer */
+  uInt m;               /* bytes to end of window or read pointer */
+
+  /* copy input/output information to locals (UPDATE macro restores) */
+  LOAD
+
+  /* process input based on current state */
+  while (1) switch (s->mode)
+  {
+    case TYPE:
+      NEEDBITS(3)
+      t = (uInt)b & 7;
+      s->last = t & 1;
+      switch (t >> 1)
+      {
+        case 0:                         /* stored */
+          Tracev((stderr, "inflate:     stored block%s\n",
+                 s->last ? " (last)" : ""));
+          DUMPBITS(3)
+          t = k & 7;                    /* go to byte boundary */
+          DUMPBITS(t)
+          s->mode = LENS;               /* get length of stored block */
+          break;
+        case 1:                         /* fixed */
+          Tracev((stderr, "inflate:     fixed codes block%s\n",
+                 s->last ? " (last)" : ""));
+          {
+            uInt bl, bd;
+            inflate_huft *tl, *td;
+
+            inflate_trees_fixed(&bl, &bd, &tl, &td, z);
+            s->sub.decode.codes = inflate_codes_new(bl, bd, tl, td, z);
+            if (s->sub.decode.codes == Z_NULL)
+            {
+              r = Z_MEM_ERROR;
+              LEAVE
+            }
+          }
+          DUMPBITS(3)
+          s->mode = CODES;
+          break;
+        case 2:                         /* dynamic */
+          Tracev((stderr, "inflate:     dynamic codes block%s\n",
+                 s->last ? " (last)" : ""));
+          DUMPBITS(3)
+          s->mode = TABLE;
+          break;
+        case 3:                         /* illegal */
+          DUMPBITS(3)
+          s->mode = BAD;
+          z->msg = (char*)"invalid block type";
+          r = Z_DATA_ERROR;
+          LEAVE
+      }
+      break;
+    case LENS:
+      NEEDBITS(32)
+      if ((((~b) >> 16) & 0xffff) != (b & 0xffff))
+      {
+        s->mode = BAD;
+        z->msg = (char*)"invalid stored block lengths";
+        r = Z_DATA_ERROR;
+        LEAVE
+      }
+      s->sub.left = (uInt)b & 0xffff;
+      b = k = 0;                      /* dump bits */
+      Tracev((stderr, "inflate:       stored length %u\n", s->sub.left));
+      s->mode = s->sub.left ? STORED : (s->last ? DRY : TYPE);
+      break;
+    case STORED:
+      if (n == 0)
+        LEAVE
+      NEEDOUT
+      t = s->sub.left;
+      if (t > n) t = n;
+      if (t > m) t = m;
+      zmemcpy(q, p, t);
+      p += t;  n -= t;
+      q += t;  m -= t;
+      if ((s->sub.left -= t) != 0)
+        break;
+      Tracev((stderr, "inflate:       stored end, %lu total out\n",
+              z->total_out + (q >= s->read ? q - s->read :
+              (s->end - s->read) + (q - s->window))));
+      s->mode = s->last ? DRY : TYPE;
+      break;
+    case TABLE:
+      NEEDBITS(14)
+      s->sub.trees.table = t = (uInt)b & 0x3fff;
+#ifndef PKZIP_BUG_WORKAROUND
+      if ((t & 0x1f) > 29 || ((t >> 5) & 0x1f) > 29)
+      {
+        s->mode = BAD;
+        z->msg = (char*)"too many length or distance symbols";
+        r = Z_DATA_ERROR;
+        LEAVE
+      }
+#endif
+      t = 258 + (t & 0x1f) + ((t >> 5) & 0x1f);
+      if ((s->sub.trees.blens = (uIntf*)ZALLOC(z, t, sizeof(uInt))) == Z_NULL)
+      {
+        r = Z_MEM_ERROR;
+        LEAVE
+      }
+      DUMPBITS(14)
+      s->sub.trees.index = 0;
+      Tracev((stderr, "inflate:       table sizes ok\n"));
+      s->mode = BTREE;
+    case BTREE:
+      while (s->sub.trees.index < 4 + (s->sub.trees.table >> 10))
+      {
+        NEEDBITS(3)
+        s->sub.trees.blens[border[s->sub.trees.index++]] = (uInt)b & 7;
+        DUMPBITS(3)
+      }
+      while (s->sub.trees.index < 19)
+        s->sub.trees.blens[border[s->sub.trees.index++]] = 0;
+      s->sub.trees.bb = 7;
+      t = inflate_trees_bits(s->sub.trees.blens, &s->sub.trees.bb,
+                             &s->sub.trees.tb, s->hufts, z);
+      if (t != Z_OK)
+      {
+        r = t;
+        if (r == Z_DATA_ERROR)
+        {
+          ZFREE(z, s->sub.trees.blens);
+          s->mode = BAD;
+        }
+        LEAVE
+      }
+      s->sub.trees.index = 0;
+      Tracev((stderr, "inflate:       bits tree ok\n"));
+      s->mode = DTREE;
+    case DTREE:
+      while (t = s->sub.trees.table,
+             s->sub.trees.index < 258 + (t & 0x1f) + ((t >> 5) & 0x1f))
+      {
+        inflate_huft *h;
+        uInt i, j, c;
+
+        t = s->sub.trees.bb;
+        NEEDBITS(t)
+        h = s->sub.trees.tb + ((uInt)b & inflate_mask[t]);
+        t = h->bits;
+        c = h->base;
+        if (c < 16)
+        {
+          DUMPBITS(t)
+          s->sub.trees.blens[s->sub.trees.index++] = c;
+        }
+        else /* c == 16..18 */
+        {
+          i = c == 18 ? 7 : c - 14;
+          j = c == 18 ? 11 : 3;
+          NEEDBITS(t + i)
+          DUMPBITS(t)
+          j += (uInt)b & inflate_mask[i];
+          DUMPBITS(i)
+          i = s->sub.trees.index;
+          t = s->sub.trees.table;
+          if (i + j > 258 + (t & 0x1f) + ((t >> 5) & 0x1f) ||
+              (c == 16 && i < 1))
+          {
+            ZFREE(z, s->sub.trees.blens);
+            s->mode = BAD;
+            z->msg = (char*)"invalid bit length repeat";
+            r = Z_DATA_ERROR;
+            LEAVE
+          }
+          c = c == 16 ? s->sub.trees.blens[i - 1] : 0;
+          do {
+            s->sub.trees.blens[i++] = c;
+          } while (--j);
+          s->sub.trees.index = i;
+        }
+      }
+      s->sub.trees.tb = Z_NULL;
+      {
+        uInt bl, bd;
+        inflate_huft *tl, *td;
+        inflate_codes_statef *c;
+
+        bl = 9;         /* must be <= 9 for lookahead assumptions */
+        bd = 6;         /* must be <= 9 for lookahead assumptions */
+        t = s->sub.trees.table;
+        t = inflate_trees_dynamic(257 + (t & 0x1f), 1 + ((t >> 5) & 0x1f),
+                                  s->sub.trees.blens, &bl, &bd, &tl, &td,
+                                  s->hufts, z);
+        if (t != Z_OK)
+        {
+          if (t == (uInt)Z_DATA_ERROR)
+          {
+            ZFREE(z, s->sub.trees.blens);
+            s->mode = BAD;
+          }
+          r = t;
+          LEAVE
+        }
+        Tracev((stderr, "inflate:       trees ok\n"));
+        if ((c = inflate_codes_new(bl, bd, tl, td, z)) == Z_NULL)
+        {
+          r = Z_MEM_ERROR;
+          LEAVE
+        }
+        s->sub.decode.codes = c;
+      }
+      ZFREE(z, s->sub.trees.blens);
+      s->mode = CODES;
+    case CODES:
+      UPDATE
+      if ((r = inflate_codes(s, z, r)) != Z_STREAM_END)
+        return inflate_flush(s, z, r);
+      r = Z_OK;
+      inflate_codes_free(s->sub.decode.codes, z);
+      LOAD
+      Tracev((stderr, "inflate:       codes end, %lu total out\n",
+              z->total_out + (q >= s->read ? q - s->read :
+              (s->end - s->read) + (q - s->window))));
+      if (!s->last)
+      {
+        s->mode = TYPE;
+        break;
+      }
+      s->mode = DRY;
+    case DRY:
+      FLUSH
+      if (s->read != s->write)
+        LEAVE
+      s->mode = DONE;
+    case DONE:
+      r = Z_STREAM_END;
+      LEAVE
+    case BAD:
+      r = Z_DATA_ERROR;
+      LEAVE
+    default:
+      r = Z_STREAM_ERROR;
+      LEAVE
+  }
+}
+
+
+int inflate_blocks_free(s, z)
+inflate_blocks_statef *s;
+z_streamp z;
+{
+  inflate_blocks_reset(s, z, Z_NULL);
+  ZFREE(z, s->window);
+  ZFREE(z, s->hufts);
+  ZFREE(z, s);
+  Tracev((stderr, "inflate:   blocks freed\n"));
+  return Z_OK;
+}
+
+
+void inflate_set_dictionary(s, d, n)
+inflate_blocks_statef *s;
+const Bytef *d;
+uInt  n;
+{
+  zmemcpy(s->window, d, n);
+  s->read = s->write = s->window + n;
+}
+
+
+/* Returns true if inflate is currently at the end of a block generated
+ * by Z_SYNC_FLUSH or Z_FULL_FLUSH.
+ * IN assertion: s != Z_NULL
+ */
+int inflate_blocks_sync_point(s)
+inflate_blocks_statef *s;
+{
+  return s->mode == LENS;
+}
diff --git a/uppsrc/plugin/z/lib/infblock.h b/uppsrc/plugin/z/lib/infblock.h
new file mode 100644
index 000000000..8176340aa
--- /dev/null
+++ b/uppsrc/plugin/z/lib/infblock.h
@@ -0,0 +1,39 @@
+/* infblock.h -- header to use infblock.c
+ * Copyright (C) 1995-2002 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/* WARNING: this file should *not* be used by applications. It is
+   part of the implementation of the compression library and is
+   subject to change. Applications should only use zlib.h.
+ */
+
+struct inflate_blocks_state;
+typedef struct inflate_blocks_state FAR inflate_blocks_statef;
+
+extern inflate_blocks_statef * inflate_blocks_new OF((
+    z_streamp z,
+    check_func c,               /* check function */
+    uInt w));                   /* window size */
+
+extern int inflate_blocks OF((
+    inflate_blocks_statef *,
+    z_streamp ,
+    int));                      /* initial return code */
+
+extern void inflate_blocks_reset OF((
+    inflate_blocks_statef *,
+    z_streamp ,
+    uLongf *));                  /* check value on output */
+
+extern int inflate_blocks_free OF((
+    inflate_blocks_statef *,
+    z_streamp));
+
+extern void inflate_set_dictionary OF((
+    inflate_blocks_statef *s,
+    const Bytef *d,  /* dictionary */
+    uInt  n));       /* dictionary length */
+
+extern int inflate_blocks_sync_point OF((
+    inflate_blocks_statef *s));
diff --git a/uppsrc/plugin/z/lib/infcodes.c b/uppsrc/plugin/z/lib/infcodes.c
new file mode 100644
index 000000000..0af7a5be7
--- /dev/null
+++ b/uppsrc/plugin/z/lib/infcodes.c
@@ -0,0 +1,251 @@
+/* infcodes.c -- process literals and length/distance pairs
+ * Copyright (C) 1995-2002 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+#include "zutil.h"
+#include "inftrees.h"
+#include "infblock.h"
+#include "infcodes.h"
+#include "infutil.h"
+#include "inffast.h"
+
+/* simplify the use of the inflate_huft type with some defines */
+#define exop word.what.Exop
+#define bits word.what.Bits
+
+typedef enum {        /* waiting for "i:"=input, "o:"=output, "x:"=nothing */
+      START,    /* x: set up for LEN */
+      LEN,      /* i: get length/literal/eob next */
+      LENEXT,   /* i: getting length extra (have base) */
+      DIST,     /* i: get distance next */
+      DISTEXT,  /* i: getting distance extra */
+      COPY,     /* o: copying bytes in window, waiting for space */
+      LIT,      /* o: got literal, waiting for output space */
+      WASH,     /* o: got eob, possibly still output waiting */
+      END,      /* x: got eob and all data flushed */
+      BADCODE}  /* x: got error */
+inflate_codes_mode;
+
+/* inflate codes private state */
+struct inflate_codes_state {
+
+  /* mode */
+  inflate_codes_mode mode;      /* current inflate_codes mode */
+
+  /* mode dependent information */
+  uInt len;
+  union {
+    struct {
+      inflate_huft *tree;       /* pointer into tree */
+      uInt need;                /* bits needed */
+    } code;             /* if LEN or DIST, where in tree */
+    uInt lit;           /* if LIT, literal */
+    struct {
+      uInt get;                 /* bits to get for extra */
+      uInt dist;                /* distance back to copy from */
+    } copy;             /* if EXT or COPY, where and how much */
+  } sub;                /* submode */
+
+  /* mode independent information */
+  Byte lbits;           /* ltree bits decoded per branch */
+  Byte dbits;           /* dtree bits decoder per branch */
+  inflate_huft *ltree;          /* literal/length/eob tree */
+  inflate_huft *dtree;          /* distance tree */
+
+};
+
+
+inflate_codes_statef *inflate_codes_new(bl, bd, tl, td, z)
+uInt bl, bd;
+inflate_huft *tl;
+inflate_huft *td; /* need separate declaration for Borland C++ */
+z_streamp z;
+{
+  inflate_codes_statef *c;
+
+  if ((c = (inflate_codes_statef *)
+       ZALLOC(z,1,sizeof(struct inflate_codes_state))) != Z_NULL)
+  {
+    c->mode = START;
+    c->lbits = (Byte)bl;
+    c->dbits = (Byte)bd;
+    c->ltree = tl;
+    c->dtree = td;
+    Tracev((stderr, "inflate:       codes new\n"));
+  }
+  return c;
+}
+
+
+int inflate_codes(s, z, r)
+inflate_blocks_statef *s;
+z_streamp z;
+int r;
+{
+  uInt j;               /* temporary storage */
+  inflate_huft *t;      /* temporary pointer */
+  uInt e;               /* extra bits or operation */
+  uLong b;              /* bit buffer */
+  uInt k;               /* bits in bit buffer */
+  Bytef *p;             /* input data pointer */
+  uInt n;               /* bytes available there */
+  Bytef *q;             /* output window write pointer */
+  uInt m;               /* bytes to end of window or read pointer */
+  Bytef *f;             /* pointer to copy strings from */
+  inflate_codes_statef *c = s->sub.decode.codes;  /* codes state */
+
+  /* copy input/output information to locals (UPDATE macro restores) */
+  LOAD
+
+  /* process input and output based on current state */
+  while (1) switch (c->mode)
+  {             /* waiting for "i:"=input, "o:"=output, "x:"=nothing */
+    case START:         /* x: set up for LEN */
+#ifndef SLOW
+      if (m >= 258 && n >= 10)
+      {
+        UPDATE
+        r = inflate_fast(c->lbits, c->dbits, c->ltree, c->dtree, s, z);
+        LOAD
+        if (r != Z_OK)
+        {
+          c->mode = r == Z_STREAM_END ? WASH : BADCODE;
+          break;
+        }
+      }
+#endif /* !SLOW */
+      c->sub.code.need = c->lbits;
+      c->sub.code.tree = c->ltree;
+      c->mode = LEN;
+    case LEN:           /* i: get length/literal/eob next */
+      j = c->sub.code.need;
+      NEEDBITS(j)
+      t = c->sub.code.tree + ((uInt)b & inflate_mask[j]);
+      DUMPBITS(t->bits)
+      e = (uInt)(t->exop);
+      if (e == 0)               /* literal */
+      {
+        c->sub.lit = t->base;
+        Tracevv((stderr, t->base >= 0x20 && t->base < 0x7f ?
+                 "inflate:         literal '%c'\n" :
+                 "inflate:         literal 0x%02x\n", t->base));
+        c->mode = LIT;
+        break;
+      }
+      if (e & 16)               /* length */
+      {
+        c->sub.copy.get = e & 15;
+        c->len = t->base;
+        c->mode = LENEXT;
+        break;
+      }
+      if ((e & 64) == 0)        /* next table */
+      {
+        c->sub.code.need = e;
+        c->sub.code.tree = t + t->base;
+        break;
+      }
+      if (e & 32)               /* end of block */
+      {
+        Tracevv((stderr, "inflate:         end of block\n"));
+        c->mode = WASH;
+        break;
+      }
+      c->mode = BADCODE;        /* invalid code */
+      z->msg = (char*)"invalid literal/length code";
+      r = Z_DATA_ERROR;
+      LEAVE
+    case LENEXT:        /* i: getting length extra (have base) */
+      j = c->sub.copy.get;
+      NEEDBITS(j)
+      c->len += (uInt)b & inflate_mask[j];
+      DUMPBITS(j)
+      c->sub.code.need = c->dbits;
+      c->sub.code.tree = c->dtree;
+      Tracevv((stderr, "inflate:         length %u\n", c->len));
+      c->mode = DIST;
+    case DIST:          /* i: get distance next */
+      j = c->sub.code.need;
+      NEEDBITS(j)
+      t = c->sub.code.tree + ((uInt)b & inflate_mask[j]);
+      DUMPBITS(t->bits)
+      e = (uInt)(t->exop);
+      if (e & 16)               /* distance */
+      {
+        c->sub.copy.get = e & 15;
+        c->sub.copy.dist = t->base;
+        c->mode = DISTEXT;
+        break;
+      }
+      if ((e & 64) == 0)        /* next table */
+      {
+        c->sub.code.need = e;
+        c->sub.code.tree = t + t->base;
+        break;
+      }
+      c->mode = BADCODE;        /* invalid code */
+      z->msg = (char*)"invalid distance code";
+      r = Z_DATA_ERROR;
+      LEAVE
+    case DISTEXT:       /* i: getting distance extra */
+      j = c->sub.copy.get;
+      NEEDBITS(j)
+      c->sub.copy.dist += (uInt)b & inflate_mask[j];
+      DUMPBITS(j)
+      Tracevv((stderr, "inflate:         distance %u\n", c->sub.copy.dist));
+      c->mode = COPY;
+    case COPY:          /* o: copying bytes in window, waiting for space */
+      f = q - c->sub.copy.dist;
+      while (f < s->window)             /* modulo window size-"while" instead */
+        f += s->end - s->window;        /* of "if" handles invalid distances */
+      while (c->len)
+      {
+        NEEDOUT
+        OUTBYTE(*f++)
+        if (f == s->end)
+          f = s->window;
+        c->len--;
+      }
+      c->mode = START;
+      break;
+    case LIT:           /* o: got literal, waiting for output space */
+      NEEDOUT
+      OUTBYTE(c->sub.lit)
+      c->mode = START;
+      break;
+    case WASH:          /* o: got eob, possibly more output */
+      if (k > 7)        /* return unused byte, if any */
+      {
+        Assert(k < 16, "inflate_codes grabbed too many bytes")
+        k -= 8;
+        n++;
+        p--;            /* can always return one */
+      }
+      FLUSH
+      if (s->read != s->write)
+        LEAVE
+      c->mode = END;
+    case END:
+      r = Z_STREAM_END;
+      LEAVE
+    case BADCODE:       /* x: got error */
+      r = Z_DATA_ERROR;
+      LEAVE
+    default:
+      r = Z_STREAM_ERROR;
+      LEAVE
+  }
+#ifdef NEED_DUMMY_RETURN
+  return Z_STREAM_ERROR;  /* Some dumb compilers complain without this */
+#endif
+}
+
+
+void inflate_codes_free(c, z)
+inflate_codes_statef *c;
+z_streamp z;
+{
+  ZFREE(z, c);
+  Tracev((stderr, "inflate:       codes free\n"));
+}
diff --git a/uppsrc/plugin/z/lib/infcodes.h b/uppsrc/plugin/z/lib/infcodes.h
new file mode 100644
index 000000000..1188f6b68
--- /dev/null
+++ b/uppsrc/plugin/z/lib/infcodes.h
@@ -0,0 +1,26 @@
+/* infcodes.h -- header to use infcodes.c
+ * Copyright (C) 1995-2002 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/* WARNING: this file should *not* be used by applications. It is
+   part of the implementation of the compression library and is
+   subject to change. Applications should only use zlib.h.
+ */
+
+struct inflate_codes_state;
+typedef struct inflate_codes_state FAR inflate_codes_statef;
+
+extern inflate_codes_statef *inflate_codes_new OF((
+    uInt, uInt,
+    inflate_huft *, inflate_huft *,
+    z_streamp ));
+
+extern int inflate_codes OF((
+    inflate_blocks_statef *,
+    z_streamp ,
+    int));
+
+extern void inflate_codes_free OF((
+    inflate_codes_statef *,
+    z_streamp ));
diff --git a/uppsrc/plugin/z/lib/inffast.c b/uppsrc/plugin/z/lib/inffast.c
new file mode 100644
index 000000000..4e918dbdc
--- /dev/null
+++ b/uppsrc/plugin/z/lib/inffast.c
@@ -0,0 +1,183 @@
+/* inffast.c -- process literals and length/distance pairs fast
+ * Copyright (C) 1995-2002 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+#include "zutil.h"
+#include "inftrees.h"
+#include "infblock.h"
+#include "infcodes.h"
+#include "infutil.h"
+#include "inffast.h"
+
+struct inflate_codes_state {int dummy;}; /* for buggy compilers */
+
+/* simplify the use of the inflate_huft type with some defines */
+#define exop word.what.Exop
+#define bits word.what.Bits
+
+/* macros for bit input with no checking and for returning unused bytes */
+#define GRABBITS(j) {while(k<(j)){b|=((uLong)NEXTBYTE)<<k;k+=8;}}
+#define UNGRAB {c=z->avail_in-n;c=(k>>3)<c?k>>3:c;n+=c;p-=c;k-=c<<3;}
+
+/* Called with number of bytes left to write in window at least 258
+   (the maximum string length) and number of input bytes available
+   at least ten.  The ten bytes are six bytes for the longest length/
+   distance pair plus four bytes for overloading the bit buffer. */
+
+int inflate_fast(bl, bd, tl, td, s, z)
+uInt bl, bd;
+inflate_huft *tl;
+inflate_huft *td; /* need separate declaration for Borland C++ */
+inflate_blocks_statef *s;
+z_streamp z;
+{
+  inflate_huft *t;      /* temporary pointer */
+  uInt e;               /* extra bits or operation */
+  uLong b;              /* bit buffer */
+  uInt k;               /* bits in bit buffer */
+  Bytef *p;             /* input data pointer */
+  uInt n;               /* bytes available there */
+  Bytef *q;             /* output window write pointer */
+  uInt m;               /* bytes to end of window or read pointer */
+  uInt ml;              /* mask for literal/length tree */
+  uInt md;              /* mask for distance tree */
+  uInt c;               /* bytes to copy */
+  uInt d;               /* distance back to copy from */
+  Bytef *r;             /* copy source pointer */
+
+  /* load input, output, bit values */
+  LOAD
+
+  /* initialize masks */
+  ml = inflate_mask[bl];
+  md = inflate_mask[bd];
+
+  /* do until not enough input or output space for fast loop */
+  do {                          /* assume called with m >= 258 && n >= 10 */
+    /* get literal/length code */
+    GRABBITS(20)                /* max bits for literal/length code */
+    if ((e = (t = tl + ((uInt)b & ml))->exop) == 0)
+    {
+      DUMPBITS(t->bits)
+      Tracevv((stderr, t->base >= 0x20 && t->base < 0x7f ?
+                "inflate:         * literal '%c'\n" :
+                "inflate:         * literal 0x%02x\n", t->base));
+      *q++ = (Byte)t->base;
+      m--;
+      continue;
+    }
+    do {
+      DUMPBITS(t->bits)
+      if (e & 16)
+      {
+        /* get extra bits for length */
+        e &= 15;
+        c = t->base + ((uInt)b & inflate_mask[e]);
+        DUMPBITS(e)
+        Tracevv((stderr, "inflate:         * length %u\n", c));
+
+        /* decode distance base of block to copy */
+        GRABBITS(15);           /* max bits for distance code */
+        e = (t = td + ((uInt)b & md))->exop;
+        do {
+          DUMPBITS(t->bits)
+          if (e & 16)
+          {
+            /* get extra bits to add to distance base */
+            e &= 15;
+            GRABBITS(e)         /* get extra bits (up to 13) */
+            d = t->base + ((uInt)b & inflate_mask[e]);
+            DUMPBITS(e)
+            Tracevv((stderr, "inflate:         * distance %u\n", d));
+
+            /* do the copy */
+            m -= c;
+            r = q - d;
+            if (r < s->window)                  /* wrap if needed */
+            {
+              do {
+                r += s->end - s->window;        /* force pointer in window */
+              } while (r < s->window);          /* covers invalid distances */
+              e = s->end - r;
+              if (c > e)
+              {
+                c -= e;                         /* wrapped copy */
+                do {
+                    *q++ = *r++;
+                } while (--e);
+                r = s->window;
+                do {
+                    *q++ = *r++;
+                } while (--c);
+              }
+              else                              /* normal copy */
+              {
+                *q++ = *r++;  c--;
+                *q++ = *r++;  c--;
+                do {
+                    *q++ = *r++;
+                } while (--c);
+              }
+            }
+            else                                /* normal copy */
+            {
+              *q++ = *r++;  c--;
+              *q++ = *r++;  c--;
+              do {
+                *q++ = *r++;
+              } while (--c);
+            }
+            break;
+          }
+          else if ((e & 64) == 0)
+          {
+            t += t->base;
+            e = (t += ((uInt)b & inflate_mask[e]))->exop;
+          }
+          else
+          {
+            z->msg = (char*)"invalid distance code";
+            UNGRAB
+            UPDATE
+            return Z_DATA_ERROR;
+          }
+        } while (1);
+        break;
+      }
+      if ((e & 64) == 0)
+      {
+        t += t->base;
+        if ((e = (t += ((uInt)b & inflate_mask[e]))->exop) == 0)
+        {
+          DUMPBITS(t->bits)
+          Tracevv((stderr, t->base >= 0x20 && t->base < 0x7f ?
+                    "inflate:         * literal '%c'\n" :
+                    "inflate:         * literal 0x%02x\n", t->base));
+          *q++ = (Byte)t->base;
+          m--;
+          break;
+        }
+      }
+      else if (e & 32)
+      {
+        Tracevv((stderr, "inflate:         * end of block\n"));
+        UNGRAB
+        UPDATE
+        return Z_STREAM_END;
+      }
+      else
+      {
+        z->msg = (char*)"invalid literal/length code";
+        UNGRAB
+        UPDATE
+        return Z_DATA_ERROR;
+      }
+    } while (1);
+  } while (m >= 258 && n >= 10);
+
+  /* not enough input or output--restore pointers and return */
+  UNGRAB
+  UPDATE
+  return Z_OK;
+}
diff --git a/uppsrc/plugin/z/lib/inffast.h b/uppsrc/plugin/z/lib/inffast.h
new file mode 100644
index 000000000..ec13e0931
--- /dev/null
+++ b/uppsrc/plugin/z/lib/inffast.h
@@ -0,0 +1,17 @@
+/* inffast.h -- header to use inffast.c
+ * Copyright (C) 1995-2002 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/* WARNING: this file should *not* be used by applications. It is
+   part of the implementation of the compression library and is
+   subject to change. Applications should only use zlib.h.
+ */
+
+extern int inflate_fast OF((
+    uInt,
+    uInt,
+    inflate_huft *,
+    inflate_huft *,
+    inflate_blocks_statef *,
+    z_streamp ));
diff --git a/uppsrc/plugin/z/lib/inffixed.h b/uppsrc/plugin/z/lib/inffixed.h
new file mode 100644
index 000000000..77f7e7631
--- /dev/null
+++ b/uppsrc/plugin/z/lib/inffixed.h
@@ -0,0 +1,151 @@
+/* inffixed.h -- table for decoding fixed codes
+ * Generated automatically by the maketree.c program
+ */
+
+/* WARNING: this file should *not* be used by applications. It is
+   part of the implementation of the compression library and is
+   subject to change. Applications should only use zlib.h.
+ */
+
+local uInt fixed_bl = 9;
+local uInt fixed_bd = 5;
+local inflate_huft fixed_tl[] = {
+    {{{96,7}},256}, {{{0,8}},80}, {{{0,8}},16}, {{{84,8}},115},
+    {{{82,7}},31}, {{{0,8}},112}, {{{0,8}},48}, {{{0,9}},192},
+    {{{80,7}},10}, {{{0,8}},96}, {{{0,8}},32}, {{{0,9}},160},
+    {{{0,8}},0}, {{{0,8}},128}, {{{0,8}},64}, {{{0,9}},224},
+    {{{80,7}},6}, {{{0,8}},88}, {{{0,8}},24}, {{{0,9}},144},
+    {{{83,7}},59}, {{{0,8}},120}, {{{0,8}},56}, {{{0,9}},208},
+    {{{81,7}},17}, {{{0,8}},104}, {{{0,8}},40}, {{{0,9}},176},
+    {{{0,8}},8}, {{{0,8}},136}, {{{0,8}},72}, {{{0,9}},240},
+    {{{80,7}},4}, {{{0,8}},84}, {{{0,8}},20}, {{{85,8}},227},
+    {{{83,7}},43}, {{{0,8}},116}, {{{0,8}},52}, {{{0,9}},200},
+    {{{81,7}},13}, {{{0,8}},100}, {{{0,8}},36}, {{{0,9}},168},
+    {{{0,8}},4}, {{{0,8}},132}, {{{0,8}},68}, {{{0,9}},232},
+    {{{80,7}},8}, {{{0,8}},92}, {{{0,8}},28}, {{{0,9}},152},
+    {{{84,7}},83}, {{{0,8}},124}, {{{0,8}},60}, {{{0,9}},216},
+    {{{82,7}},23}, {{{0,8}},108}, {{{0,8}},44}, {{{0,9}},184},
+    {{{0,8}},12}, {{{0,8}},140}, {{{0,8}},76}, {{{0,9}},248},
+    {{{80,7}},3}, {{{0,8}},82}, {{{0,8}},18}, {{{85,8}},163},
+    {{{83,7}},35}, {{{0,8}},114}, {{{0,8}},50}, {{{0,9}},196},
+    {{{81,7}},11}, {{{0,8}},98}, {{{0,8}},34}, {{{0,9}},164},
+    {{{0,8}},2}, {{{0,8}},130}, {{{0,8}},66}, {{{0,9}},228},
+    {{{80,7}},7}, {{{0,8}},90}, {{{0,8}},26}, {{{0,9}},148},
+    {{{84,7}},67}, {{{0,8}},122}, {{{0,8}},58}, {{{0,9}},212},
+    {{{82,7}},19}, {{{0,8}},106}, {{{0,8}},42}, {{{0,9}},180},
+    {{{0,8}},10}, {{{0,8}},138}, {{{0,8}},74}, {{{0,9}},244},
+    {{{80,7}},5}, {{{0,8}},86}, {{{0,8}},22}, {{{192,8}},0},
+    {{{83,7}},51}, {{{0,8}},118}, {{{0,8}},54}, {{{0,9}},204},
+    {{{81,7}},15}, {{{0,8}},102}, {{{0,8}},38}, {{{0,9}},172},
+    {{{0,8}},6}, {{{0,8}},134}, {{{0,8}},70}, {{{0,9}},236},
+    {{{80,7}},9}, {{{0,8}},94}, {{{0,8}},30}, {{{0,9}},156},
+    {{{84,7}},99}, {{{0,8}},126}, {{{0,8}},62}, {{{0,9}},220},
+    {{{82,7}},27}, {{{0,8}},110}, {{{0,8}},46}, {{{0,9}},188},
+    {{{0,8}},14}, {{{0,8}},142}, {{{0,8}},78}, {{{0,9}},252},
+    {{{96,7}},256}, {{{0,8}},81}, {{{0,8}},17}, {{{85,8}},131},
+    {{{82,7}},31}, {{{0,8}},113}, {{{0,8}},49}, {{{0,9}},194},
+    {{{80,7}},10}, {{{0,8}},97}, {{{0,8}},33}, {{{0,9}},162},
+    {{{0,8}},1}, {{{0,8}},129}, {{{0,8}},65}, {{{0,9}},226},
+    {{{80,7}},6}, {{{0,8}},89}, {{{0,8}},25}, {{{0,9}},146},
+    {{{83,7}},59}, {{{0,8}},121}, {{{0,8}},57}, {{{0,9}},210},
+    {{{81,7}},17}, {{{0,8}},105}, {{{0,8}},41}, {{{0,9}},178},
+    {{{0,8}},9}, {{{0,8}},137}, {{{0,8}},73}, {{{0,9}},242},
+    {{{80,7}},4}, {{{0,8}},85}, {{{0,8}},21}, {{{80,8}},258},
+    {{{83,7}},43}, {{{0,8}},117}, {{{0,8}},53}, {{{0,9}},202},
+    {{{81,7}},13}, {{{0,8}},101}, {{{0,8}},37}, {{{0,9}},170},
+    {{{0,8}},5}, {{{0,8}},133}, {{{0,8}},69}, {{{0,9}},234},
+    {{{80,7}},8}, {{{0,8}},93}, {{{0,8}},29}, {{{0,9}},154},
+    {{{84,7}},83}, {{{0,8}},125}, {{{0,8}},61}, {{{0,9}},218},
+    {{{82,7}},23}, {{{0,8}},109}, {{{0,8}},45}, {{{0,9}},186},
+    {{{0,8}},13}, {{{0,8}},141}, {{{0,8}},77}, {{{0,9}},250},
+    {{{80,7}},3}, {{{0,8}},83}, {{{0,8}},19}, {{{85,8}},195},
+    {{{83,7}},35}, {{{0,8}},115}, {{{0,8}},51}, {{{0,9}},198},
+    {{{81,7}},11}, {{{0,8}},99}, {{{0,8}},35}, {{{0,9}},166},
+    {{{0,8}},3}, {{{0,8}},131}, {{{0,8}},67}, {{{0,9}},230},
+    {{{80,7}},7}, {{{0,8}},91}, {{{0,8}},27}, {{{0,9}},150},
+    {{{84,7}},67}, {{{0,8}},123}, {{{0,8}},59}, {{{0,9}},214},
+    {{{82,7}},19}, {{{0,8}},107}, {{{0,8}},43}, {{{0,9}},182},
+    {{{0,8}},11}, {{{0,8}},139}, {{{0,8}},75}, {{{0,9}},246},
+    {{{80,7}},5}, {{{0,8}},87}, {{{0,8}},23}, {{{192,8}},0},
+    {{{83,7}},51}, {{{0,8}},119}, {{{0,8}},55}, {{{0,9}},206},
+    {{{81,7}},15}, {{{0,8}},103}, {{{0,8}},39}, {{{0,9}},174},
+    {{{0,8}},7}, {{{0,8}},135}, {{{0,8}},71}, {{{0,9}},238},
+    {{{80,7}},9}, {{{0,8}},95}, {{{0,8}},31}, {{{0,9}},158},
+    {{{84,7}},99}, {{{0,8}},127}, {{{0,8}},63}, {{{0,9}},222},
+    {{{82,7}},27}, {{{0,8}},111}, {{{0,8}},47}, {{{0,9}},190},
+    {{{0,8}},15}, {{{0,8}},143}, {{{0,8}},79}, {{{0,9}},254},
+    {{{96,7}},256}, {{{0,8}},80}, {{{0,8}},16}, {{{84,8}},115},
+    {{{82,7}},31}, {{{0,8}},112}, {{{0,8}},48}, {{{0,9}},193},
+    {{{80,7}},10}, {{{0,8}},96}, {{{0,8}},32}, {{{0,9}},161},
+    {{{0,8}},0}, {{{0,8}},128}, {{{0,8}},64}, {{{0,9}},225},
+    {{{80,7}},6}, {{{0,8}},88}, {{{0,8}},24}, {{{0,9}},145},
+    {{{83,7}},59}, {{{0,8}},120}, {{{0,8}},56}, {{{0,9}},209},
+    {{{81,7}},17}, {{{0,8}},104}, {{{0,8}},40}, {{{0,9}},177},
+    {{{0,8}},8}, {{{0,8}},136}, {{{0,8}},72}, {{{0,9}},241},
+    {{{80,7}},4}, {{{0,8}},84}, {{{0,8}},20}, {{{85,8}},227},
+    {{{83,7}},43}, {{{0,8}},116}, {{{0,8}},52}, {{{0,9}},201},
+    {{{81,7}},13}, {{{0,8}},100}, {{{0,8}},36}, {{{0,9}},169},
+    {{{0,8}},4}, {{{0,8}},132}, {{{0,8}},68}, {{{0,9}},233},
+    {{{80,7}},8}, {{{0,8}},92}, {{{0,8}},28}, {{{0,9}},153},
+    {{{84,7}},83}, {{{0,8}},124}, {{{0,8}},60}, {{{0,9}},217},
+    {{{82,7}},23}, {{{0,8}},108}, {{{0,8}},44}, {{{0,9}},185},
+    {{{0,8}},12}, {{{0,8}},140}, {{{0,8}},76}, {{{0,9}},249},
+    {{{80,7}},3}, {{{0,8}},82}, {{{0,8}},18}, {{{85,8}},163},
+    {{{83,7}},35}, {{{0,8}},114}, {{{0,8}},50}, {{{0,9}},197},
+    {{{81,7}},11}, {{{0,8}},98}, {{{0,8}},34}, {{{0,9}},165},
+    {{{0,8}},2}, {{{0,8}},130}, {{{0,8}},66}, {{{0,9}},229},
+    {{{80,7}},7}, {{{0,8}},90}, {{{0,8}},26}, {{{0,9}},149},
+    {{{84,7}},67}, {{{0,8}},122}, {{{0,8}},58}, {{{0,9}},213},
+    {{{82,7}},19}, {{{0,8}},106}, {{{0,8}},42}, {{{0,9}},181},
+    {{{0,8}},10}, {{{0,8}},138}, {{{0,8}},74}, {{{0,9}},245},
+    {{{80,7}},5}, {{{0,8}},86}, {{{0,8}},22}, {{{192,8}},0},
+    {{{83,7}},51}, {{{0,8}},118}, {{{0,8}},54}, {{{0,9}},205},
+    {{{81,7}},15}, {{{0,8}},102}, {{{0,8}},38}, {{{0,9}},173},
+    {{{0,8}},6}, {{{0,8}},134}, {{{0,8}},70}, {{{0,9}},237},
+    {{{80,7}},9}, {{{0,8}},94}, {{{0,8}},30}, {{{0,9}},157},
+    {{{84,7}},99}, {{{0,8}},126}, {{{0,8}},62}, {{{0,9}},221},
+    {{{82,7}},27}, {{{0,8}},110}, {{{0,8}},46}, {{{0,9}},189},
+    {{{0,8}},14}, {{{0,8}},142}, {{{0,8}},78}, {{{0,9}},253},
+    {{{96,7}},256}, {{{0,8}},81}, {{{0,8}},17}, {{{85,8}},131},
+    {{{82,7}},31}, {{{0,8}},113}, {{{0,8}},49}, {{{0,9}},195},
+    {{{80,7}},10}, {{{0,8}},97}, {{{0,8}},33}, {{{0,9}},163},
+    {{{0,8}},1}, {{{0,8}},129}, {{{0,8}},65}, {{{0,9}},227},
+    {{{80,7}},6}, {{{0,8}},89}, {{{0,8}},25}, {{{0,9}},147},
+    {{{83,7}},59}, {{{0,8}},121}, {{{0,8}},57}, {{{0,9}},211},
+    {{{81,7}},17}, {{{0,8}},105}, {{{0,8}},41}, {{{0,9}},179},
+    {{{0,8}},9}, {{{0,8}},137}, {{{0,8}},73}, {{{0,9}},243},
+    {{{80,7}},4}, {{{0,8}},85}, {{{0,8}},21}, {{{80,8}},258},
+    {{{83,7}},43}, {{{0,8}},117}, {{{0,8}},53}, {{{0,9}},203},
+    {{{81,7}},13}, {{{0,8}},101}, {{{0,8}},37}, {{{0,9}},171},
+    {{{0,8}},5}, {{{0,8}},133}, {{{0,8}},69}, {{{0,9}},235},
+    {{{80,7}},8}, {{{0,8}},93}, {{{0,8}},29}, {{{0,9}},155},
+    {{{84,7}},83}, {{{0,8}},125}, {{{0,8}},61}, {{{0,9}},219},
+    {{{82,7}},23}, {{{0,8}},109}, {{{0,8}},45}, {{{0,9}},187},
+    {{{0,8}},13}, {{{0,8}},141}, {{{0,8}},77}, {{{0,9}},251},
+    {{{80,7}},3}, {{{0,8}},83}, {{{0,8}},19}, {{{85,8}},195},
+    {{{83,7}},35}, {{{0,8}},115}, {{{0,8}},51}, {{{0,9}},199},
+    {{{81,7}},11}, {{{0,8}},99}, {{{0,8}},35}, {{{0,9}},167},
+    {{{0,8}},3}, {{{0,8}},131}, {{{0,8}},67}, {{{0,9}},231},
+    {{{80,7}},7}, {{{0,8}},91}, {{{0,8}},27}, {{{0,9}},151},
+    {{{84,7}},67}, {{{0,8}},123}, {{{0,8}},59}, {{{0,9}},215},
+    {{{82,7}},19}, {{{0,8}},107}, {{{0,8}},43}, {{{0,9}},183},
+    {{{0,8}},11}, {{{0,8}},139}, {{{0,8}},75}, {{{0,9}},247},
+    {{{80,7}},5}, {{{0,8}},87}, {{{0,8}},23}, {{{192,8}},0},
+    {{{83,7}},51}, {{{0,8}},119}, {{{0,8}},55}, {{{0,9}},207},
+    {{{81,7}},15}, {{{0,8}},103}, {{{0,8}},39}, {{{0,9}},175},
+    {{{0,8}},7}, {{{0,8}},135}, {{{0,8}},71}, {{{0,9}},239},
+    {{{80,7}},9}, {{{0,8}},95}, {{{0,8}},31}, {{{0,9}},159},
+    {{{84,7}},99}, {{{0,8}},127}, {{{0,8}},63}, {{{0,9}},223},
+    {{{82,7}},27}, {{{0,8}},111}, {{{0,8}},47}, {{{0,9}},191},
+    {{{0,8}},15}, {{{0,8}},143}, {{{0,8}},79}, {{{0,9}},255}
+  };
+local inflate_huft fixed_td[] = {
+    {{{80,5}},1}, {{{87,5}},257}, {{{83,5}},17}, {{{91,5}},4097},
+    {{{81,5}},5}, {{{89,5}},1025}, {{{85,5}},65}, {{{93,5}},16385},
+    {{{80,5}},3}, {{{88,5}},513}, {{{84,5}},33}, {{{92,5}},8193},
+    {{{82,5}},9}, {{{90,5}},2049}, {{{86,5}},129}, {{{192,5}},24577},
+    {{{80,5}},2}, {{{87,5}},385}, {{{83,5}},25}, {{{91,5}},6145},
+    {{{81,5}},7}, {{{89,5}},1537}, {{{85,5}},97}, {{{93,5}},24577},
+    {{{80,5}},4}, {{{88,5}},769}, {{{84,5}},49}, {{{92,5}},12289},
+    {{{82,5}},13}, {{{90,5}},3073}, {{{86,5}},193}, {{{192,5}},24577}
+  };
diff --git a/uppsrc/plugin/z/lib/inflate.c b/uppsrc/plugin/z/lib/inflate.c
new file mode 100644
index 000000000..3ac2efb90
--- /dev/null
+++ b/uppsrc/plugin/z/lib/inflate.c
@@ -0,0 +1,366 @@
+/* inflate.c -- zlib interface to inflate modules
+ * Copyright (C) 1995-2002 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+#include "zutil.h"
+#include "infblock.h"
+
+struct inflate_blocks_state {int dummy;}; /* for buggy compilers */
+
+typedef enum {
+      METHOD,   /* waiting for method byte */
+      FLAG,     /* waiting for flag byte */
+      DICT4,    /* four dictionary check bytes to go */
+      DICT3,    /* three dictionary check bytes to go */
+      DICT2,    /* two dictionary check bytes to go */
+      DICT1,    /* one dictionary check byte to go */
+      DICT0,    /* waiting for inflateSetDictionary */
+      BLOCKS,   /* decompressing blocks */
+      CHECK4,   /* four check bytes to go */
+      CHECK3,   /* three check bytes to go */
+      CHECK2,   /* two check bytes to go */
+      CHECK1,   /* one check byte to go */
+      DONE,     /* finished check, done */
+      BAD}      /* got an error--stay here */
+inflate_mode;
+
+/* inflate private state */
+struct internal_state {
+
+  /* mode */
+  inflate_mode  mode;   /* current inflate mode */
+
+  /* mode dependent information */
+  union {
+    uInt method;        /* if FLAGS, method byte */
+    struct {
+      uLong was;                /* computed check value */
+      uLong need;               /* stream check value */
+    } check;            /* if CHECK, check values to compare */
+    uInt marker;        /* if BAD, inflateSync's marker bytes count */
+  } sub;        /* submode */
+
+  /* mode independent information */
+  int  nowrap;          /* flag for no wrapper */
+  uInt wbits;           /* log2(window size)  (8..15, defaults to 15) */
+  inflate_blocks_statef
+    *blocks;            /* current inflate_blocks state */
+
+};
+
+
+int ZEXPORT inflateReset(z)
+z_streamp z;
+{
+  if (z == Z_NULL || z->state == Z_NULL)
+    return Z_STREAM_ERROR;
+  z->total_in = z->total_out = 0;
+  z->msg = Z_NULL;
+  z->state->mode = z->state->nowrap ? BLOCKS : METHOD;
+  inflate_blocks_reset(z->state->blocks, z, Z_NULL);
+  Tracev((stderr, "inflate: reset\n"));
+  return Z_OK;
+}
+
+
+int ZEXPORT inflateEnd(z)
+z_streamp z;
+{
+  if (z == Z_NULL || z->state == Z_NULL || z->zfree == Z_NULL)
+    return Z_STREAM_ERROR;
+  if (z->state->blocks != Z_NULL)
+    inflate_blocks_free(z->state->blocks, z);
+  ZFREE(z, z->state);
+  z->state = Z_NULL;
+  Tracev((stderr, "inflate: end\n"));
+  return Z_OK;
+}
+
+
+int ZEXPORT inflateInit2_(z, w, version, stream_size)
+z_streamp z;
+int w;
+const char *version;
+int stream_size;
+{
+  if (version == Z_NULL || version[0] != ZLIB_VERSION[0] ||
+      stream_size != sizeof(z_stream))
+      return Z_VERSION_ERROR;
+
+  /* initialize state */
+  if (z == Z_NULL)
+    return Z_STREAM_ERROR;
+  z->msg = Z_NULL;
+  if (z->zalloc == Z_NULL)
+  {
+    z->zalloc = zcalloc;
+    z->opaque = (voidpf)0;
+  }
+  if (z->zfree == Z_NULL) z->zfree = zcfree;
+  if ((z->state = (struct internal_state FAR *)
+       ZALLOC(z,1,sizeof(struct internal_state))) == Z_NULL)
+    return Z_MEM_ERROR;
+  z->state->blocks = Z_NULL;
+
+  /* handle undocumented nowrap option (no zlib header or check) */
+  z->state->nowrap = 0;
+  if (w < 0)
+  {
+    w = - w;
+    z->state->nowrap = 1;
+  }
+
+  /* set window size */
+  if (w < 8 || w > 15)
+  {
+    inflateEnd(z);
+    return Z_STREAM_ERROR;
+  }
+  z->state->wbits = (uInt)w;
+
+  /* create inflate_blocks state */
+  if ((z->state->blocks =
+      inflate_blocks_new(z, z->state->nowrap ? Z_NULL : adler32, (uInt)1 << w))
+      == Z_NULL)
+  {
+    inflateEnd(z);
+    return Z_MEM_ERROR;
+  }
+  Tracev((stderr, "inflate: allocated\n"));
+
+  /* reset state */
+  inflateReset(z);
+  return Z_OK;
+}
+
+
+int ZEXPORT inflateInit_(z, version, stream_size)
+z_streamp z;
+const char *version;
+int stream_size;
+{
+  return inflateInit2_(z, DEF_WBITS, version, stream_size);
+}
+
+
+#define NEEDBYTE {if(z->avail_in==0)return r;r=f;}
+#define NEXTBYTE (z->avail_in--,z->total_in++,*z->next_in++)
+
+int ZEXPORT inflate(z, f)
+z_streamp z;
+int f;
+{
+  int r;
+  uInt b;
+
+  if (z == Z_NULL || z->state == Z_NULL || z->next_in == Z_NULL)
+    return Z_STREAM_ERROR;
+  f = f == Z_FINISH ? Z_BUF_ERROR : Z_OK;
+  r = Z_BUF_ERROR;
+  while (1) switch (z->state->mode)
+  {
+    case METHOD:
+      NEEDBYTE
+      if (((z->state->sub.method = NEXTBYTE) & 0xf) != Z_DEFLATED)
+      {
+        z->state->mode = BAD;
+        z->msg = (char*)"unknown compression method";
+        z->state->sub.marker = 5;       /* can't try inflateSync */
+        break;
+      }
+      if ((z->state->sub.method >> 4) + 8 > z->state->wbits)
+      {
+        z->state->mode = BAD;
+        z->msg = (char*)"invalid window size";
+        z->state->sub.marker = 5;       /* can't try inflateSync */
+        break;
+      }
+      z->state->mode = FLAG;
+    case FLAG:
+      NEEDBYTE
+      b = NEXTBYTE;
+      if (((z->state->sub.method << 8) + b) % 31)
+      {
+        z->state->mode = BAD;
+        z->msg = (char*)"incorrect header check";
+        z->state->sub.marker = 5;       /* can't try inflateSync */
+        break;
+      }
+      Tracev((stderr, "inflate: zlib header ok\n"));
+      if (!(b & PRESET_DICT))
+      {
+        z->state->mode = BLOCKS;
+        break;
+      }
+      z->state->mode = DICT4;
+    case DICT4:
+      NEEDBYTE
+      z->state->sub.check.need = (uLong)NEXTBYTE << 24;
+      z->state->mode = DICT3;
+    case DICT3:
+      NEEDBYTE
+      z->state->sub.check.need += (uLong)NEXTBYTE << 16;
+      z->state->mode = DICT2;
+    case DICT2:
+      NEEDBYTE
+      z->state->sub.check.need += (uLong)NEXTBYTE << 8;
+      z->state->mode = DICT1;
+    case DICT1:
+      NEEDBYTE
+      z->state->sub.check.need += (uLong)NEXTBYTE;
+      z->adler = z->state->sub.check.need;
+      z->state->mode = DICT0;
+      return Z_NEED_DICT;
+    case DICT0:
+      z->state->mode = BAD;
+      z->msg = (char*)"need dictionary";
+      z->state->sub.marker = 0;       /* can try inflateSync */
+      return Z_STREAM_ERROR;
+    case BLOCKS:
+      r = inflate_blocks(z->state->blocks, z, r);
+      if (r == Z_DATA_ERROR)
+      {
+        z->state->mode = BAD;
+        z->state->sub.marker = 0;       /* can try inflateSync */
+        break;
+      }
+      if (r == Z_OK)
+        r = f;
+      if (r != Z_STREAM_END)
+        return r;
+      r = f;
+      inflate_blocks_reset(z->state->blocks, z, &z->state->sub.check.was);
+      if (z->state->nowrap)
+      {
+        z->state->mode = DONE;
+        break;
+      }
+      z->state->mode = CHECK4;
+    case CHECK4:
+      NEEDBYTE
+      z->state->sub.check.need = (uLong)NEXTBYTE << 24;
+      z->state->mode = CHECK3;
+    case CHECK3:
+      NEEDBYTE
+      z->state->sub.check.need += (uLong)NEXTBYTE << 16;
+      z->state->mode = CHECK2;
+    case CHECK2:
+      NEEDBYTE
+      z->state->sub.check.need += (uLong)NEXTBYTE << 8;
+      z->state->mode = CHECK1;
+    case CHECK1:
+      NEEDBYTE
+      z->state->sub.check.need += (uLong)NEXTBYTE;
+
+      if (z->state->sub.check.was != z->state->sub.check.need)
+      {
+        z->state->mode = BAD;
+        z->msg = (char*)"incorrect data check";
+        z->state->sub.marker = 5;       /* can't try inflateSync */
+        break;
+      }
+      Tracev((stderr, "inflate: zlib check ok\n"));
+      z->state->mode = DONE;
+    case DONE:
+      return Z_STREAM_END;
+    case BAD:
+      return Z_DATA_ERROR;
+    default:
+      return Z_STREAM_ERROR;
+  }
+#ifdef NEED_DUMMY_RETURN
+  return Z_STREAM_ERROR;  /* Some dumb compilers complain without this */
+#endif
+}
+
+
+int ZEXPORT inflateSetDictionary(z, dictionary, dictLength)
+z_streamp z;
+const Bytef *dictionary;
+uInt  dictLength;
+{
+  uInt length = dictLength;
+
+  if (z == Z_NULL || z->state == Z_NULL || z->state->mode != DICT0)
+    return Z_STREAM_ERROR;
+
+  if (adler32(1L, dictionary, dictLength) != z->adler) return Z_DATA_ERROR;
+  z->adler = 1L;
+
+  if (length >= ((uInt)1<<z->state->wbits))
+  {
+    length = (1<<z->state->wbits)-1;
+    dictionary += dictLength - length;
+  }
+  inflate_set_dictionary(z->state->blocks, dictionary, length);
+  z->state->mode = BLOCKS;
+  return Z_OK;
+}
+
+
+int ZEXPORT inflateSync(z)
+z_streamp z;
+{
+  uInt n;       /* number of bytes to look at */
+  Bytef *p;     /* pointer to bytes */
+  uInt m;       /* number of marker bytes found in a row */
+  uLong r, w;   /* temporaries to save total_in and total_out */
+
+  /* set up */
+  if (z == Z_NULL || z->state == Z_NULL)
+    return Z_STREAM_ERROR;
+  if (z->state->mode != BAD)
+  {
+    z->state->mode = BAD;
+    z->state->sub.marker = 0;
+  }
+  if ((n = z->avail_in) == 0)
+    return Z_BUF_ERROR;
+  p = z->next_in;
+  m = z->state->sub.marker;
+
+  /* search */
+  while (n && m < 4)
+  {
+    static const Byte mark[4] = {0, 0, 0xff, 0xff};
+    if (*p == mark[m])
+      m++;
+    else if (*p)
+      m = 0;
+    else
+      m = 4 - m;
+    p++, n--;
+  }
+
+  /* restore */
+  z->total_in += p - z->next_in;
+  z->next_in = p;
+  z->avail_in = n;
+  z->state->sub.marker = m;
+
+  /* return no joy or set up to restart on a new block */
+  if (m != 4)
+    return Z_DATA_ERROR;
+  r = z->total_in;  w = z->total_out;
+  inflateReset(z);
+  z->total_in = r;  z->total_out = w;
+  z->state->mode = BLOCKS;
+  return Z_OK;
+}
+
+
+/* Returns true if inflate is currently at the end of a block generated
+ * by Z_SYNC_FLUSH or Z_FULL_FLUSH. This function is used by one PPP
+ * implementation to provide an additional safety check. PPP uses Z_SYNC_FLUSH
+ * but removes the length bytes of the resulting empty stored block. When
+ * decompressing, PPP checks that at the end of input packet, inflate is
+ * waiting for these length bytes.
+ */
+int ZEXPORT inflateSyncPoint(z)
+z_streamp z;
+{
+  if (z == Z_NULL || z->state == Z_NULL || z->state->blocks == Z_NULL)
+    return Z_STREAM_ERROR;
+  return inflate_blocks_sync_point(z->state->blocks);
+}
diff --git a/uppsrc/plugin/z/lib/inftrees.c b/uppsrc/plugin/z/lib/inftrees.c
new file mode 100644
index 000000000..a64a23ff6
--- /dev/null
+++ b/uppsrc/plugin/z/lib/inftrees.c
@@ -0,0 +1,454 @@
+/* inftrees.c -- generate Huffman trees for efficient decoding
+ * Copyright (C) 1995-2002 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+#include "zutil.h"
+#include "inftrees.h"
+
+#if !defined(BUILDFIXED) && !defined(STDC)
+#  define BUILDFIXED   /* non ANSI compilers may not accept inffixed.h */
+#endif
+
+const char inflate_copyright[] =
+   " inflate 1.1.4 Copyright 1995-2002 Mark Adler ";
+/*
+  If you use the zlib library in a product, an acknowledgment is welcome
+  in the documentation of your product. If for some reason you cannot
+  include such an acknowledgment, I would appreciate that you keep this
+  copyright string in the executable of your product.
+ */
+struct internal_state  {int dummy;}; /* for buggy compilers */
+
+/* simplify the use of the inflate_huft type with some defines */
+#define exop word.what.Exop
+#define bits word.what.Bits
+
+
+local int huft_build OF((
+    uIntf *,            /* code lengths in bits */
+    uInt,               /* number of codes */
+    uInt,               /* number of "simple" codes */
+    const uIntf *,      /* list of base values for non-simple codes */
+    const uIntf *,      /* list of extra bits for non-simple codes */
+    inflate_huft * FAR*,/* result: starting table */
+    uIntf *,            /* maximum lookup bits (returns actual) */
+    inflate_huft *,     /* space for trees */
+    uInt *,             /* hufts used in space */
+    uIntf * ));         /* space for values */
+
+/* Tables for deflate from PKZIP's appnote.txt. */
+local const uInt cplens[31] = { /* Copy lengths for literal codes 257..285 */
+        3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17, 19, 23, 27, 31,
+        35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0};
+        /* see note #13 above about 258 */
+local const uInt cplext[31] = { /* Extra bits for literal codes 257..285 */
+        0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2,
+        3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5, 0, 112, 112}; /* 112==invalid */
+local const uInt cpdist[30] = { /* Copy offsets for distance codes 0..29 */
+        1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193,
+        257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145,
+        8193, 12289, 16385, 24577};
+local const uInt cpdext[30] = { /* Extra bits for distance codes */
+        0, 0, 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6,
+        7, 7, 8, 8, 9, 9, 10, 10, 11, 11,
+        12, 12, 13, 13};
+
+/*
+   Huffman code decoding is performed using a multi-level table lookup.
+   The fastest way to decode is to simply build a lookup table whose
+   size is determined by the longest code.  However, the time it takes
+   to build this table can also be a factor if the data being decoded
+   is not very long.  The most common codes are necessarily the
+   shortest codes, so those codes dominate the decoding time, and hence
+   the speed.  The idea is you can have a shorter table that decodes the
+   shorter, more probable codes, and then point to subsidiary tables for
+   the longer codes.  The time it costs to decode the longer codes is
+   then traded against the time it takes to make longer tables.
+
+   This results of this trade are in the variables lbits and dbits
+   below.  lbits is the number of bits the first level table for literal/
+   length codes can decode in one step, and dbits is the same thing for
+   the distance codes.  Subsequent tables are also less than or equal to
+   those sizes.  These values may be adjusted either when all of the
+   codes are shorter than that, in which case the longest code length in
+   bits is used, or when the shortest code is *longer* than the requested
+   table size, in which case the length of the shortest code in bits is
+   used.
+
+   There are two different values for the two tables, since they code a
+   different number of possibilities each.  The literal/length table
+   codes 286 possible values, or in a flat code, a little over eight
+   bits.  The distance table codes 30 possible values, or a little less
+   than five bits, flat.  The optimum values for speed end up being
+   about one bit more than those, so lbits is 8+1 and dbits is 5+1.
+   The optimum values may differ though from machine to machine, and
+   possibly even between compilers.  Your mileage may vary.
+ */
+
+
+/* If BMAX needs to be larger than 16, then h and x[] should be uLong. */
+#define BMAX 15         /* maximum bit length of any code */
+
+local int huft_build(b, n, s, d, e, t, m, hp, hn, v)
+uIntf *b;               /* code lengths in bits (all assumed <= BMAX) */
+uInt n;                 /* number of codes (assumed <= 288) */
+uInt s;                 /* number of simple-valued codes (0..s-1) */
+const uIntf *d;         /* list of base values for non-simple codes */
+const uIntf *e;         /* list of extra bits for non-simple codes */
+inflate_huft * FAR *t;  /* result: starting table */
+uIntf *m;               /* maximum lookup bits, returns actual */
+inflate_huft *hp;       /* space for trees */
+uInt *hn;               /* hufts used in space */
+uIntf *v;               /* working area: values in order of bit length */
+/* Given a list of code lengths and a maximum table size, make a set of
+   tables to decode that set of codes.  Return Z_OK on success, Z_BUF_ERROR
+   if the given code set is incomplete (the tables are still built in this
+   case), or Z_DATA_ERROR if the input is invalid. */
+{
+
+  uInt a;                       /* counter for codes of length k */
+  uInt c[BMAX+1];               /* bit length count table */
+  uInt f;                       /* i repeats in table every f entries */
+  int g;                        /* maximum code length */
+  int h;                        /* table level */
+  register uInt i;              /* counter, current code */
+  register uInt j;              /* counter */
+  register int k;               /* number of bits in current code */
+  int l;                        /* bits per table (returned in m) */
+  uInt mask;                    /* (1 << w) - 1, to avoid cc -O bug on HP */
+  register uIntf *p;            /* pointer into c[], b[], or v[] */
+  inflate_huft *q;              /* points to current table */
+  struct inflate_huft_s r;      /* table entry for structure assignment */
+  inflate_huft *u[BMAX];        /* table stack */
+  register int w;               /* bits before this table == (l * h) */
+  uInt x[BMAX+1];               /* bit offsets, then code stack */
+  uIntf *xp;                    /* pointer into x */
+  int y;                        /* number of dummy codes added */
+  uInt z;                       /* number of entries in current table */
+
+
+  /* Generate counts for each bit length */
+  p = c;
+#define C0 *p++ = 0;
+#define C2 C0 C0 C0 C0
+#define C4 C2 C2 C2 C2
+  C4                            /* clear c[]--assume BMAX+1 is 16 */
+  p = b;  i = n;
+  do {
+    c[*p++]++;                  /* assume all entries <= BMAX */
+  } while (--i);
+  if (c[0] == n)                /* null input--all zero length codes */
+  {
+    *t = (inflate_huft *)Z_NULL;
+    *m = 0;
+    return Z_OK;
+  }
+
+
+  /* Find minimum and maximum length, bound *m by those */
+  l = *m;
+  for (j = 1; j <= BMAX; j++)
+    if (c[j])
+      break;
+  k = j;                        /* minimum code length */
+  if ((uInt)l < j)
+    l = j;
+  for (i = BMAX; i; i--)
+    if (c[i])
+      break;
+  g = i;                        /* maximum code length */
+  if ((uInt)l > i)
+    l = i;
+  *m = l;
+
+
+  /* Adjust last length count to fill out codes, if needed */
+  for (y = 1 << j; j < i; j++, y <<= 1)
+    if ((y -= c[j]) < 0)
+      return Z_DATA_ERROR;
+  if ((y -= c[i]) < 0)
+    return Z_DATA_ERROR;
+  c[i] += y;
+
+
+  /* Generate starting offsets into the value table for each length */
+  x[1] = j = 0;
+  p = c + 1;  xp = x + 2;
+  while (--i) {                 /* note that i == g from above */
+    *xp++ = (j += *p++);
+  }
+
+
+  /* Make a table of values in order of bit lengths */
+  p = b;  i = 0;
+  do {
+    if ((j = *p++) != 0)
+      v[x[j]++] = i;
+  } while (++i < n);
+  n = x[g];                     /* set n to length of v */
+
+
+  /* Generate the Huffman codes and for each, make the table entries */
+  x[0] = i = 0;                 /* first Huffman code is zero */
+  p = v;                        /* grab values in bit order */
+  h = -1;                       /* no tables yet--level -1 */
+  w = -l;                       /* bits decoded == (l * h) */
+  u[0] = (inflate_huft *)Z_NULL;        /* just to keep compilers happy */
+  q = (inflate_huft *)Z_NULL;   /* ditto */
+  z = 0;                        /* ditto */
+
+  /* go through the bit lengths (k already is bits in shortest code) */
+  for (; k <= g; k++)
+  {
+    a = c[k];
+    while (a--)
+    {
+      /* here i is the Huffman code of length k bits for value *p */
+      /* make tables up to required level */
+      while (k > w + l)
+      {
+        h++;
+        w += l;                 /* previous table always l bits */
+
+        /* compute minimum size table less than or equal to l bits */
+        z = g - w;
+        z = z > (uInt)l ? l : z;        /* table size upper limit */
+        if ((f = 1 << (j = k - w)) > a + 1)     /* try a k-w bit table */
+        {                       /* too few codes for k-w bit table */
+          f -= a + 1;           /* deduct codes from patterns left */
+          xp = c + k;
+          if (j < z)
+            while (++j < z)     /* try smaller tables up to z bits */
+            {
+              if ((f <<= 1) <= *++xp)
+                break;          /* enough codes to use up j bits */
+              f -= *xp;         /* else deduct codes from patterns */
+            }
+        }
+        z = 1 << j;             /* table entries for j-bit table */
+
+        /* allocate new table */
+        if (*hn + z > MANY)     /* (note: doesn't matter for fixed) */
+          return Z_DATA_ERROR;  /* overflow of MANY */
+        u[h] = q = hp + *hn;
+        *hn += z;
+
+        /* connect to last table, if there is one */
+        if (h)
+        {
+          x[h] = i;             /* save pattern for backing up */
+          r.bits = (Byte)l;     /* bits to dump before this table */
+          r.exop = (Byte)j;     /* bits in this table */
+          j = i >> (w - l);
+          r.base = (uInt)(q - u[h-1] - j);   /* offset to this table */
+          u[h-1][j] = r;        /* connect to last table */
+        }
+        else
+          *t = q;               /* first table is returned result */
+      }
+
+      /* set up table entry in r */
+      r.bits = (Byte)(k - w);
+      if (p >= v + n)
+        r.exop = 128 + 64;      /* out of values--invalid code */
+      else if (*p < s)
+      {
+        r.exop = (Byte)(*p < 256 ? 0 : 32 + 64);     /* 256 is end-of-block */
+        r.base = *p++;          /* simple code is just the value */
+      }
+      else
+      {
+        r.exop = (Byte)(e[*p - s] + 16 + 64);/* non-simple--look up in lists */
+        r.base = d[*p++ - s];
+      }
+
+      /* fill code-like entries with r */
+      f = 1 << (k - w);
+      for (j = i >> w; j < z; j += f)
+        q[j] = r;
+
+      /* backwards increment the k-bit code i */
+      for (j = 1 << (k - 1); i & j; j >>= 1)
+        i ^= j;
+      i ^= j;
+
+      /* backup over finished tables */
+      mask = (1 << w) - 1;      /* needed on HP, cc -O bug */
+      while ((i & mask) != x[h])
+      {
+        h--;                    /* don't need to update q */
+        w -= l;
+        mask = (1 << w) - 1;
+      }
+    }
+  }
+
+
+  /* Return Z_BUF_ERROR if we were given an incomplete table */
+  return y != 0 && g != 1 ? Z_BUF_ERROR : Z_OK;
+}
+
+
+int inflate_trees_bits(c, bb, tb, hp, z)
+uIntf *c;               /* 19 code lengths */
+uIntf *bb;              /* bits tree desired/actual depth */
+inflate_huft * FAR *tb; /* bits tree result */
+inflate_huft *hp;       /* space for trees */
+z_streamp z;            /* for messages */
+{
+  int r;
+  uInt hn = 0;          /* hufts used in space */
+  uIntf *v;             /* work area for huft_build */
+
+  if ((v = (uIntf*)ZALLOC(z, 19, sizeof(uInt))) == Z_NULL)
+    return Z_MEM_ERROR;
+  r = huft_build(c, 19, 19, (uIntf*)Z_NULL, (uIntf*)Z_NULL,
+                 tb, bb, hp, &hn, v);
+  if (r == Z_DATA_ERROR)
+    z->msg = (char*)"oversubscribed dynamic bit lengths tree";
+  else if (r == Z_BUF_ERROR || *bb == 0)
+  {
+    z->msg = (char*)"incomplete dynamic bit lengths tree";
+    r = Z_DATA_ERROR;
+  }
+  ZFREE(z, v);
+  return r;
+}
+
+
+int inflate_trees_dynamic(nl, nd, c, bl, bd, tl, td, hp, z)
+uInt nl;                /* number of literal/length codes */
+uInt nd;                /* number of distance codes */
+uIntf *c;               /* that many (total) code lengths */
+uIntf *bl;              /* literal desired/actual bit depth */
+uIntf *bd;              /* distance desired/actual bit depth */
+inflate_huft * FAR *tl; /* literal/length tree result */
+inflate_huft * FAR *td; /* distance tree result */
+inflate_huft *hp;       /* space for trees */
+z_streamp z;            /* for messages */
+{
+  int r;
+  uInt hn = 0;          /* hufts used in space */
+  uIntf *v;             /* work area for huft_build */
+
+  /* allocate work area */
+  if ((v = (uIntf*)ZALLOC(z, 288, sizeof(uInt))) == Z_NULL)
+    return Z_MEM_ERROR;
+
+  /* build literal/length tree */
+  r = huft_build(c, nl, 257, cplens, cplext, tl, bl, hp, &hn, v);
+  if (r != Z_OK || *bl == 0)
+  {
+    if (r == Z_DATA_ERROR)
+      z->msg = (char*)"oversubscribed literal/length tree";
+    else if (r != Z_MEM_ERROR)
+    {
+      z->msg = (char*)"incomplete literal/length tree";
+      r = Z_DATA_ERROR;
+    }
+    ZFREE(z, v);
+    return r;
+  }
+
+  /* build distance tree */
+  r = huft_build(c + nl, nd, 0, cpdist, cpdext, td, bd, hp, &hn, v);
+  if (r != Z_OK || (*bd == 0 && nl > 257))
+  {
+    if (r == Z_DATA_ERROR)
+      z->msg = (char*)"oversubscribed distance tree";
+    else if (r == Z_BUF_ERROR) {
+#ifdef PKZIP_BUG_WORKAROUND
+      r = Z_OK;
+    }
+#else
+      z->msg = (char*)"incomplete distance tree";
+      r = Z_DATA_ERROR;
+    }
+    else if (r != Z_MEM_ERROR)
+    {
+      z->msg = (char*)"empty distance tree with lengths";
+      r = Z_DATA_ERROR;
+    }
+    ZFREE(z, v);
+    return r;
+#endif
+  }
+
+  /* done */
+  ZFREE(z, v);
+  return Z_OK;
+}
+
+
+/* build fixed tables only once--keep them here */
+#ifdef BUILDFIXED
+local int fixed_built = 0;
+#define FIXEDH 544      /* number of hufts used by fixed tables */
+local inflate_huft fixed_mem[FIXEDH];
+local uInt fixed_bl;
+local uInt fixed_bd;
+local inflate_huft *fixed_tl;
+local inflate_huft *fixed_td;
+#else
+#include "inffixed.h"
+#endif
+
+
+int inflate_trees_fixed(bl, bd, tl, td, z)
+uIntf *bl;               /* literal desired/actual bit depth */
+uIntf *bd;               /* distance desired/actual bit depth */
+inflate_huft * FAR *tl;  /* literal/length tree result */
+inflate_huft * FAR *td;  /* distance tree result */
+z_streamp z;             /* for memory allocation */
+{
+#ifdef BUILDFIXED
+  /* build fixed tables if not already */
+  if (!fixed_built)
+  {
+    int k;              /* temporary variable */
+    uInt f = 0;         /* number of hufts used in fixed_mem */
+    uIntf *c;           /* length list for huft_build */
+    uIntf *v;           /* work area for huft_build */
+
+    /* allocate memory */
+    if ((c = (uIntf*)ZALLOC(z, 288, sizeof(uInt))) == Z_NULL)
+      return Z_MEM_ERROR;
+    if ((v = (uIntf*)ZALLOC(z, 288, sizeof(uInt))) == Z_NULL)
+    {
+      ZFREE(z, c);
+      return Z_MEM_ERROR;
+    }
+
+    /* literal table */
+    for (k = 0; k < 144; k++)
+      c[k] = 8;
+    for (; k < 256; k++)
+      c[k] = 9;
+    for (; k < 280; k++)
+      c[k] = 7;
+    for (; k < 288; k++)
+      c[k] = 8;
+    fixed_bl = 9;
+    huft_build(c, 288, 257, cplens, cplext, &fixed_tl, &fixed_bl,
+               fixed_mem, &f, v);
+
+    /* distance table */
+    for (k = 0; k < 30; k++)
+      c[k] = 5;
+    fixed_bd = 5;
+    huft_build(c, 30, 0, cpdist, cpdext, &fixed_td, &fixed_bd,
+               fixed_mem, &f, v);
+
+    /* done */
+    ZFREE(z, v);
+    ZFREE(z, c);
+    fixed_built = 1;
+  }
+#endif
+  *bl = fixed_bl;
+  *bd = fixed_bd;
+  *tl = fixed_tl;
+  *td = fixed_td;
+  return Z_OK;
+}
diff --git a/uppsrc/plugin/z/lib/inftrees.h b/uppsrc/plugin/z/lib/inftrees.h
new file mode 100644
index 000000000..b4a5d6f9e
--- /dev/null
+++ b/uppsrc/plugin/z/lib/inftrees.h
@@ -0,0 +1,58 @@
+/* inftrees.h -- header to use inftrees.c
+ * Copyright (C) 1995-2002 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/* WARNING: this file should *not* be used by applications. It is
+   part of the implementation of the compression library and is
+   subject to change. Applications should only use zlib.h.
+ */
+
+/* Huffman code lookup table entry--this entry is four bytes for machines
+   that have 16-bit pointers (e.g. PC's in the small or medium model). */
+
+typedef struct inflate_huft_s FAR inflate_huft;
+
+struct inflate_huft_s {
+  union {
+    struct {
+      Byte Exop;        /* number of extra bits or operation */
+      Byte Bits;        /* number of bits in this code or subcode */
+    } what;
+    uInt pad;           /* pad structure to a power of 2 (4 bytes for */
+  } word;               /*  16-bit, 8 bytes for 32-bit int's) */
+  uInt base;            /* literal, length base, distance base,
+                           or table offset */
+};
+
+/* Maximum size of dynamic tree.  The maximum found in a long but non-
+   exhaustive search was 1004 huft structures (850 for length/literals
+   and 154 for distances, the latter actually the result of an
+   exhaustive search).  The actual maximum is not known, but the
+   value below is more than safe. */
+#define MANY 1440
+
+extern int inflate_trees_bits OF((
+    uIntf *,                    /* 19 code lengths */
+    uIntf *,                    /* bits tree desired/actual depth */
+    inflate_huft * FAR *,       /* bits tree result */
+    inflate_huft *,             /* space for trees */
+    z_streamp));                /* for messages */
+
+extern int inflate_trees_dynamic OF((
+    uInt,                       /* number of literal/length codes */
+    uInt,                       /* number of distance codes */
+    uIntf *,                    /* that many (total) code lengths */
+    uIntf *,                    /* literal desired/actual bit depth */
+    uIntf *,                    /* distance desired/actual bit depth */
+    inflate_huft * FAR *,       /* literal/length tree result */
+    inflate_huft * FAR *,       /* distance tree result */
+    inflate_huft *,             /* space for trees */
+    z_streamp));                /* for messages */
+
+extern int inflate_trees_fixed OF((
+    uIntf *,                    /* literal desired/actual bit depth */
+    uIntf *,                    /* distance desired/actual bit depth */
+    inflate_huft * FAR *,       /* literal/length tree result */
+    inflate_huft * FAR *,       /* distance tree result */
+    z_streamp));                /* for memory allocation */
diff --git a/uppsrc/plugin/z/lib/infutil.c b/uppsrc/plugin/z/lib/infutil.c
new file mode 100644
index 000000000..b31896420
--- /dev/null
+++ b/uppsrc/plugin/z/lib/infutil.c
@@ -0,0 +1,87 @@
+/* inflate_util.c -- data and routines common to blocks and codes
+ * Copyright (C) 1995-2002 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+#include "zutil.h"
+#include "infblock.h"
+#include "inftrees.h"
+#include "infcodes.h"
+#include "infutil.h"
+
+struct inflate_codes_state {int dummy;}; /* for buggy compilers */
+
+/* And'ing with mask[n] masks the lower n bits */
+uInt inflate_mask[17] = {
+    0x0000,
+    0x0001, 0x0003, 0x0007, 0x000f, 0x001f, 0x003f, 0x007f, 0x00ff,
+    0x01ff, 0x03ff, 0x07ff, 0x0fff, 0x1fff, 0x3fff, 0x7fff, 0xffff
+};
+
+
+/* copy as much as possible from the sliding window to the output area */
+int inflate_flush(s, z, r)
+inflate_blocks_statef *s;
+z_streamp z;
+int r;
+{
+  uInt n;
+  Bytef *p;
+  Bytef *q;
+
+  /* local copies of source and destination pointers */
+  p = z->next_out;
+  q = s->read;
+
+  /* compute number of bytes to copy as far as end of window */
+  n = (uInt)((q <= s->write ? s->write : s->end) - q);
+  if (n > z->avail_out) n = z->avail_out;
+  if (n && r == Z_BUF_ERROR) r = Z_OK;
+
+  /* update counters */
+  z->avail_out -= n;
+  z->total_out += n;
+
+  /* update check information */
+  if (s->checkfn != Z_NULL)
+    z->adler = s->check = (*s->checkfn)(s->check, q, n);
+
+  /* copy as far as end of window */
+  zmemcpy(p, q, n);
+  p += n;
+  q += n;
+
+  /* see if more to copy at beginning of window */
+  if (q == s->end)
+  {
+    /* wrap pointers */
+    q = s->window;
+    if (s->write == s->end)
+      s->write = s->window;
+
+    /* compute bytes to copy */
+    n = (uInt)(s->write - q);
+    if (n > z->avail_out) n = z->avail_out;
+    if (n && r == Z_BUF_ERROR) r = Z_OK;
+
+    /* update counters */
+    z->avail_out -= n;
+    z->total_out += n;
+
+    /* update check information */
+    if (s->checkfn != Z_NULL)
+      z->adler = s->check = (*s->checkfn)(s->check, q, n);
+
+    /* copy */
+    zmemcpy(p, q, n);
+    p += n;
+    q += n;
+  }
+
+  /* update pointers */
+  z->next_out = p;
+  s->read = q;
+
+  /* done */
+  return r;
+}
diff --git a/uppsrc/plugin/z/lib/infutil.h b/uppsrc/plugin/z/lib/infutil.h
new file mode 100644
index 000000000..9e4f939b4
--- /dev/null
+++ b/uppsrc/plugin/z/lib/infutil.h
@@ -0,0 +1,98 @@
+/* infutil.h -- types and macros common to blocks and codes
+ * Copyright (C) 1995-2002 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/* WARNING: this file should *not* be used by applications. It is
+   part of the implementation of the compression library and is
+   subject to change. Applications should only use zlib.h.
+ */
+
+#ifndef _INFUTIL_H
+#define _INFUTIL_H
+
+typedef enum {
+      TYPE,     /* get type bits (3, including end bit) */
+      LENS,     /* get lengths for stored */
+      STORED,   /* processing stored block */
+      TABLE,    /* get table lengths */
+      BTREE,    /* get bit lengths tree for a dynamic block */
+      DTREE,    /* get length, distance trees for a dynamic block */
+      CODES,    /* processing fixed or dynamic block */
+      DRY,      /* output remaining window bytes */
+      DONE,     /* finished last block, done */
+      BAD}      /* got a data error--stuck here */
+inflate_block_mode;
+
+/* inflate blocks semi-private state */
+struct inflate_blocks_state {
+
+  /* mode */
+  inflate_block_mode  mode;     /* current inflate_block mode */
+
+  /* mode dependent information */
+  union {
+    uInt left;          /* if STORED, bytes left to copy */
+    struct {
+      uInt table;               /* table lengths (14 bits) */
+      uInt index;               /* index into blens (or border) */
+      uIntf *blens;             /* bit lengths of codes */
+      uInt bb;                  /* bit length tree depth */
+      inflate_huft *tb;         /* bit length decoding tree */
+    } trees;            /* if DTREE, decoding info for trees */
+    struct {
+      inflate_codes_statef
+         *codes;
+    } decode;           /* if CODES, current state */
+  } sub;                /* submode */
+  uInt last;            /* true if this block is the last block */
+
+  /* mode independent information */
+  uInt bitk;            /* bits in bit buffer */
+  uLong bitb;           /* bit buffer */
+  inflate_huft *hufts;  /* single malloc for tree space */
+  Bytef *window;        /* sliding window */
+  Bytef *end;           /* one byte after sliding window */
+  Bytef *read;          /* window read pointer */
+  Bytef *write;         /* window write pointer */
+  check_func checkfn;   /* check function */
+  uLong check;          /* check on output */
+
+};
+
+
+/* defines for inflate input/output */
+/*   update pointers and return */
+#define UPDBITS {s->bitb=b;s->bitk=k;}
+#define UPDIN {z->avail_in=n;z->total_in+=p-z->next_in;z->next_in=p;}
+#define UPDOUT {s->write=q;}
+#define UPDATE {UPDBITS UPDIN UPDOUT}
+#define LEAVE {UPDATE return inflate_flush(s,z,r);}
+/*   get bytes and bits */
+#define LOADIN {p=z->next_in;n=z->avail_in;b=s->bitb;k=s->bitk;}
+#define NEEDBYTE {if(n)r=Z_OK;else LEAVE}
+#define NEXTBYTE (n--,*p++)
+#define NEEDBITS(j) {while(k<(j)){NEEDBYTE;b|=((uLong)NEXTBYTE)<<k;k+=8;}}
+#define DUMPBITS(j) {b>>=(j);k-=(j);}
+/*   output bytes */
+#define WAVAIL (uInt)(q<s->read?s->read-q-1:s->end-q)
+#define LOADOUT {q=s->write;m=(uInt)WAVAIL;}
+#define WRAP {if(q==s->end&&s->read!=s->window){q=s->window;m=(uInt)WAVAIL;}}
+#define FLUSH {UPDOUT r=inflate_flush(s,z,r); LOADOUT}
+#define NEEDOUT {if(m==0){WRAP if(m==0){FLUSH WRAP if(m==0) LEAVE}}r=Z_OK;}
+#define OUTBYTE(a) {*q++=(Byte)(a);m--;}
+/*   load local pointers */
+#define LOAD {LOADIN LOADOUT}
+
+/* masks for lower bits (size given to avoid silly warnings with Visual C++) */
+extern uInt inflate_mask[17];
+
+/* copy as much as possible from the sliding window to the output area */
+extern int inflate_flush OF((
+    inflate_blocks_statef *,
+    z_streamp ,
+    int));
+
+struct internal_state      {int dummy;}; /* for buggy compilers */
+
+#endif
diff --git a/uppsrc/plugin/z/lib/maketree.c b/uppsrc/plugin/z/lib/maketree.c
new file mode 100644
index 000000000..6eea67ed6
--- /dev/null
+++ b/uppsrc/plugin/z/lib/maketree.c
@@ -0,0 +1,85 @@
+/* maketree.c -- make inffixed.h table for decoding fixed codes
+ * Copyright (C) 1995-2002 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/* WARNING: this file should *not* be used by applications. It is
+   part of the implementation of the compression library and is
+   subject to change. Applications should only use zlib.h.
+ */
+
+/* This program is included in the distribution for completeness.
+   You do not need to compile or run this program since inffixed.h
+   is already included in the distribution.  To use this program
+   you need to compile zlib with BUILDFIXED defined and then compile
+   and link this program with the zlib library.  Then the output of
+   this program can be piped to inffixed.h. */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include "zutil.h"
+#include "inftrees.h"
+
+/* simplify the use of the inflate_huft type with some defines */
+#define exop word.what.Exop
+#define bits word.what.Bits
+
+/* generate initialization table for an inflate_huft structure array */
+void maketree(uInt b, inflate_huft *t)
+{
+  int i, e;
+
+  i = 0;
+  while (1)
+  {
+    e = t[i].exop;
+    if (e && (e & (16+64)) == 0)        /* table pointer */
+    {
+      fprintf(stderr, "maketree: cannot initialize sub-tables!\n");
+      exit(1);
+    }
+    if (i % 4 == 0)
+      printf("\n   ");
+    printf(" {{{%u,%u}},%u}", t[i].exop, t[i].bits, t[i].base);
+    if (++i == (1<<b))
+      break;
+    putchar(',');
+  }
+  puts("");
+}
+
+/* create the fixed tables in C initialization syntax */
+void main(void)
+{
+  int r;
+  uInt bl, bd;
+  inflate_huft *tl, *td;
+  z_stream z;
+
+  z.zalloc = zcalloc;
+  z.opaque = (voidpf)0;
+  z.zfree = zcfree;
+  r = inflate_trees_fixed(&bl, &bd, &tl, &td, &z);
+  if (r)
+  {
+    fprintf(stderr, "inflate_trees_fixed error %d\n", r);
+    return;
+  }
+  puts("/* inffixed.h -- table for decoding fixed codes");
+  puts(" * Generated automatically by the maketree.c program");
+  puts(" */");
+  puts("");
+  puts("/* WARNING: this file should *not* be used by applications. It is");
+  puts("   part of the implementation of the compression library and is");
+  puts("   subject to change. Applications should only use zlib.h.");
+  puts(" */");
+  puts("");
+  printf("local uInt fixed_bl = %d;\n", bl);
+  printf("local uInt fixed_bd = %d;\n", bd);
+  printf("local inflate_huft fixed_tl[] = {");
+  maketree(bl, tl);
+  puts("  };");
+  printf("local inflate_huft fixed_td[] = {");
+  maketree(bd, td);
+  puts("  };");
+}
diff --git a/uppsrc/plugin/z/lib/minigzip.c b/uppsrc/plugin/z/lib/minigzip.c
new file mode 100644
index 000000000..30999bd28
--- /dev/null
+++ b/uppsrc/plugin/z/lib/minigzip.c
@@ -0,0 +1,320 @@
+/* minigzip.c -- simulate gzip using the zlib compression library
+ * Copyright (C) 1995-2002 Jean-loup Gailly.
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/*
+ * minigzip is a minimal implementation of the gzip utility. This is
+ * only an example of using zlib and isn't meant to replace the
+ * full-featured gzip. No attempt is made to deal with file systems
+ * limiting names to 14 or 8+3 characters, etc... Error checking is
+ * very limited. So use minigzip only for testing; use gzip for the
+ * real thing. On MSDOS, use only on file names without extension
+ * or in pipe mode.
+ */
+
+/* @(#) $Id: minigzip.c,v 1.1 2005/02/07 00:26:07 rylek Exp $ */
+
+#include <stdio.h>
+#include "zlib.h"
+
+#ifdef STDC
+#  include <string.h>
+#  include <stdlib.h>
+#else
+   extern void exit  OF((int));
+#endif
+
+#ifdef USE_MMAP
+#  include <sys/types.h>
+#  include <sys/mman.h>
+#  include <sys/stat.h>
+#endif
+
+#if defined(MSDOS) || defined(OS2) || defined(WIN32)
+#  include <fcntl.h>
+#  include <io.h>
+#  define SET_BINARY_MODE(file) setmode(fileno(file), O_BINARY)
+#else
+#  define SET_BINARY_MODE(file)
+#endif
+
+#ifdef VMS
+#  define unlink delete
+#  define GZ_SUFFIX "-gz"
+#endif
+#ifdef RISCOS
+#  define unlink remove
+#  define GZ_SUFFIX "-gz"
+#  define fileno(file) file->__file
+#endif
+#if defined(__MWERKS__) && __dest_os != __be_os && __dest_os != __win32_os
+#  include <unix.h> /* for fileno */
+#endif
+
+#ifndef WIN32 /* unlink already in stdio.h for WIN32 */
+  extern int unlink OF((const char *));
+#endif
+
+#ifndef GZ_SUFFIX
+#  define GZ_SUFFIX ".gz"
+#endif
+#define SUFFIX_LEN (sizeof(GZ_SUFFIX)-1)
+
+#define BUFLEN      16384
+#define MAX_NAME_LEN 1024
+
+#ifdef MAXSEG_64K
+#  define local static
+   /* Needed for systems with limitation on stack size. */
+#else
+#  define local
+#endif
+
+char *prog;
+
+void error            OF((const char *msg));
+void gz_compress      OF((FILE   *in, gzFile out));
+#ifdef USE_MMAP
+int  gz_compress_mmap OF((FILE   *in, gzFile out));
+#endif
+void gz_uncompress    OF((gzFile in, FILE   *out));
+void file_compress    OF((char  *file, char *mode));
+void file_uncompress  OF((char  *file));
+int  main             OF((int argc, char *argv[]));
+
+/* ===========================================================================
+ * Display error message and exit
+ */
+void error(msg)
+    const char *msg;
+{
+    fprintf(stderr, "%s: %s\n", prog, msg);
+    exit(1);
+}
+
+/* ===========================================================================
+ * Compress input to output then close both files.
+ */
+
+void gz_compress(in, out)
+    FILE   *in;
+    gzFile out;
+{
+    local char buf[BUFLEN];
+    int len;
+    int err;
+
+#ifdef USE_MMAP
+    /* Try first compressing with mmap. If mmap fails (minigzip used in a
+     * pipe), use the normal fread loop.
+     */
+    if (gz_compress_mmap(in, out) == Z_OK) return;
+#endif
+    for (;;) {
+        len = fread(buf, 1, sizeof(buf), in);
+        if (ferror(in)) {
+            perror("fread");
+            exit(1);
+        }
+        if (len == 0) break;
+
+        if (gzwrite(out, buf, (unsigned)len) != len) error(gzerror(out, &err));
+    }
+    fclose(in);
+    if (gzclose(out) != Z_OK) error("failed gzclose");
+}
+
+#ifdef USE_MMAP /* MMAP version, Miguel Albrecht <malbrech@eso.org> */
+
+/* Try compressing the input file at once using mmap. Return Z_OK if
+ * if success, Z_ERRNO otherwise.
+ */
+int gz_compress_mmap(in, out)
+    FILE   *in;
+    gzFile out;
+{
+    int len;
+    int err;
+    int ifd = fileno(in);
+    caddr_t buf;    /* mmap'ed buffer for the entire input file */
+    off_t buf_len;  /* length of the input file */
+    struct stat sb;
+
+    /* Determine the size of the file, needed for mmap: */
+    if (fstat(ifd, &sb) < 0) return Z_ERRNO;
+    buf_len = sb.st_size;
+    if (buf_len <= 0) return Z_ERRNO;
+
+    /* Now do the actual mmap: */
+    buf = mmap((caddr_t) 0, buf_len, PROT_READ, MAP_SHARED, ifd, (off_t)0);
+    if (buf == (caddr_t)(-1)) return Z_ERRNO;
+
+    /* Compress the whole file at once: */
+    len = gzwrite(out, (char *)buf, (unsigned)buf_len);
+
+    if (len != (int)buf_len) error(gzerror(out, &err));
+
+    munmap(buf, buf_len);
+    fclose(in);
+    if (gzclose(out) != Z_OK) error("failed gzclose");
+    return Z_OK;
+}
+#endif /* USE_MMAP */
+
+/* ===========================================================================
+ * Uncompress input to output then close both files.
+ */
+void gz_uncompress(in, out)
+    gzFile in;
+    FILE   *out;
+{
+    local char buf[BUFLEN];
+    int len;
+    int err;
+
+    for (;;) {
+        len = gzread(in, buf, sizeof(buf));
+        if (len < 0) error (gzerror(in, &err));
+        if (len == 0) break;
+
+        if ((int)fwrite(buf, 1, (unsigned)len, out) != len) {
+	    error("failed fwrite");
+	}
+    }
+    if (fclose(out)) error("failed fclose");
+
+    if (gzclose(in) != Z_OK) error("failed gzclose");
+}
+
+
+/* ===========================================================================
+ * Compress the given file: create a corresponding .gz file and remove the
+ * original.
+ */
+void file_compress(file, mode)
+    char  *file;
+    char  *mode;
+{
+    local char outfile[MAX_NAME_LEN];
+    FILE  *in;
+    gzFile out;
+
+    strcpy(outfile, file);
+    strcat(outfile, GZ_SUFFIX);
+
+    in = fopen(file, "rb");
+    if (in == NULL) {
+        perror(file);
+        exit(1);
+    }
+    out = gzopen(outfile, mode);
+    if (out == NULL) {
+        fprintf(stderr, "%s: can't gzopen %s\n", prog, outfile);
+        exit(1);
+    }
+    gz_compress(in, out);
+
+    unlink(file);
+}
+
+
+/* ===========================================================================
+ * Uncompress the given file and remove the original.
+ */
+void file_uncompress(file)
+    char  *file;
+{
+    local char buf[MAX_NAME_LEN];
+    char *infile, *outfile;
+    FILE  *out;
+    gzFile in;
+    int len = strlen(file);
+
+    strcpy(buf, file);
+
+    if (len > SUFFIX_LEN && strcmp(file+len-SUFFIX_LEN, GZ_SUFFIX) == 0) {
+        infile = file;
+        outfile = buf;
+        outfile[len-3] = '\0';
+    } else {
+        outfile = file;
+        infile = buf;
+        strcat(infile, GZ_SUFFIX);
+    }
+    in = gzopen(infile, "rb");
+    if (in == NULL) {
+        fprintf(stderr, "%s: can't gzopen %s\n", prog, infile);
+        exit(1);
+    }
+    out = fopen(outfile, "wb");
+    if (out == NULL) {
+        perror(file);
+        exit(1);
+    }
+
+    gz_uncompress(in, out);
+
+    unlink(infile);
+}
+
+
+/* ===========================================================================
+ * Usage:  minigzip [-d] [-f] [-h] [-1 to -9] [files...]
+ *   -d : decompress
+ *   -f : compress with Z_FILTERED
+ *   -h : compress with Z_HUFFMAN_ONLY
+ *   -1 to -9 : compression level
+ */
+
+int main(argc, argv)
+    int argc;
+    char *argv[];
+{
+    int uncompr = 0;
+    gzFile file;
+    char outmode[20];
+
+    strcpy(outmode, "wb6 ");
+
+    prog = argv[0];
+    argc--, argv++;
+
+    while (argc > 0) {
+      if (strcmp(*argv, "-d") == 0)
+	uncompr = 1;
+      else if (strcmp(*argv, "-f") == 0)
+	outmode[3] = 'f';
+      else if (strcmp(*argv, "-h") == 0)
+	outmode[3] = 'h';
+      else if ((*argv)[0] == '-' && (*argv)[1] >= '1' && (*argv)[1] <= '9' &&
+	       (*argv)[2] == 0)
+	outmode[2] = (*argv)[1];
+      else
+	break;
+      argc--, argv++;
+    }
+    if (argc == 0) {
+        SET_BINARY_MODE(stdin);
+        SET_BINARY_MODE(stdout);
+        if (uncompr) {
+            file = gzdopen(fileno(stdin), "rb");
+            if (file == NULL) error("can't gzdopen stdin");
+            gz_uncompress(file, stdout);
+        } else {
+            file = gzdopen(fileno(stdout), outmode);
+            if (file == NULL) error("can't gzdopen stdout");
+            gz_compress(stdin, file);
+        }
+    } else {
+        do {
+            if (uncompr) {
+                file_uncompress(*argv);
+            } else {
+                file_compress(*argv, outmode);
+            }
+        } while (argv++, --argc);
+    }
+    exit(0);
+    return 0; /* to avoid warning */
+}
diff --git a/uppsrc/plugin/z/lib/trees.c b/uppsrc/plugin/z/lib/trees.c
new file mode 100644
index 000000000..897202c2d
--- /dev/null
+++ b/uppsrc/plugin/z/lib/trees.c
@@ -0,0 +1,1214 @@
+/* trees.c -- output deflated data using Huffman coding
+ * Copyright (C) 1995-2002 Jean-loup Gailly
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/*
+ *  ALGORITHM
+ *
+ *      The "deflation" process uses several Huffman trees. The more
+ *      common source values are represented by shorter bit sequences.
+ *
+ *      Each code tree is stored in a compressed form which is itself
+ * a Huffman encoding of the lengths of all the code strings (in
+ * ascending order by source values).  The actual code strings are
+ * reconstructed from the lengths in the inflate process, as described
+ * in the deflate specification.
+ *
+ *  REFERENCES
+ *
+ *      Deutsch, L.P.,"'Deflate' Compressed Data Format Specification".
+ *      Available in ftp.uu.net:/pub/archiving/zip/doc/deflate-1.1.doc
+ *
+ *      Storer, James A.
+ *          Data Compression:  Methods and Theory, pp. 49-50.
+ *          Computer Science Press, 1988.  ISBN 0-7167-8156-5.
+ *
+ *      Sedgewick, R.
+ *          Algorithms, p290.
+ *          Addison-Wesley, 1983. ISBN 0-201-06672-6.
+ */
+
+/* @(#) $Id: trees.c,v 1.1 2005/02/07 00:26:07 rylek Exp $ */
+
+/* #define GEN_TREES_H */
+
+#include "deflate.h"
+
+#ifdef DEBUG
+#  include <ctype.h>
+#endif
+
+/* ===========================================================================
+ * Constants
+ */
+
+#define MAX_BL_BITS 7
+/* Bit length codes must not exceed MAX_BL_BITS bits */
+
+#define END_BLOCK 256
+/* end of block literal code */
+
+#define REP_3_6      16
+/* repeat previous bit length 3-6 times (2 bits of repeat count) */
+
+#define REPZ_3_10    17
+/* repeat a zero length 3-10 times  (3 bits of repeat count) */
+
+#define REPZ_11_138  18
+/* repeat a zero length 11-138 times  (7 bits of repeat count) */
+
+local const int extra_lbits[LENGTH_CODES] /* extra bits for each length code */
+   = {0,0,0,0,0,0,0,0,1,1,1,1,2,2,2,2,3,3,3,3,4,4,4,4,5,5,5,5,0};
+
+local const int extra_dbits[D_CODES] /* extra bits for each distance code */
+   = {0,0,0,0,1,1,2,2,3,3,4,4,5,5,6,6,7,7,8,8,9,9,10,10,11,11,12,12,13,13};
+
+local const int extra_blbits[BL_CODES]/* extra bits for each bit length code */
+   = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,3,7};
+
+local const uch bl_order[BL_CODES]
+   = {16,17,18,0,8,7,9,6,10,5,11,4,12,3,13,2,14,1,15};
+/* The lengths of the bit length codes are sent in order of decreasing
+ * probability, to avoid transmitting the lengths for unused bit length codes.
+ */
+
+#define Buf_size (8 * 2*sizeof(char))
+/* Number of bits used within bi_buf. (bi_buf might be implemented on
+ * more than 16 bits on some systems.)
+ */
+
+/* ===========================================================================
+ * Local data. These are initialized only once.
+ */
+
+#define DIST_CODE_LEN  512 /* see definition of array dist_code below */
+
+#if defined(GEN_TREES_H) || !defined(STDC)
+/* non ANSI compilers may not accept trees.h */
+
+local ct_data static_ltree[L_CODES+2];
+/* The static literal tree. Since the bit lengths are imposed, there is no
+ * need for the L_CODES extra codes used during heap construction. However
+ * The codes 286 and 287 are needed to build a canonical tree (see _tr_init
+ * below).
+ */
+
+local ct_data static_dtree[D_CODES];
+/* The static distance tree. (Actually a trivial tree since all codes use
+ * 5 bits.)
+ */
+
+uch _dist_code[DIST_CODE_LEN];
+/* Distance codes. The first 256 values correspond to the distances
+ * 3 .. 258, the last 256 values correspond to the top 8 bits of
+ * the 15 bit distances.
+ */
+
+uch _length_code[MAX_MATCH-MIN_MATCH+1];
+/* length code for each normalized match length (0 == MIN_MATCH) */
+
+local int base_length[LENGTH_CODES];
+/* First normalized length for each code (0 = MIN_MATCH) */
+
+local int base_dist[D_CODES];
+/* First normalized distance for each code (0 = distance of 1) */
+
+#else
+#  include "trees.h"
+#endif /* GEN_TREES_H */
+
+struct static_tree_desc_s {
+    const ct_data *static_tree;  /* static tree or NULL */
+    const intf *extra_bits;      /* extra bits for each code or NULL */
+    int     extra_base;          /* base index for extra_bits */
+    int     elems;               /* max number of elements in the tree */
+    int     max_length;          /* max bit length for the codes */
+};
+
+local static_tree_desc  static_l_desc =
+{static_ltree, extra_lbits, LITERALS+1, L_CODES, MAX_BITS};
+
+local static_tree_desc  static_d_desc =
+{static_dtree, extra_dbits, 0,          D_CODES, MAX_BITS};
+
+local static_tree_desc  static_bl_desc =
+{(const ct_data *)0, extra_blbits, 0,   BL_CODES, MAX_BL_BITS};
+
+/* ===========================================================================
+ * Local (static) routines in this file.
+ */
+
+local void tr_static_init OF((void));
+local void init_block     OF((deflate_state *s));
+local void pqdownheap     OF((deflate_state *s, ct_data *tree, int k));
+local void gen_bitlen     OF((deflate_state *s, tree_desc *desc));
+local void gen_codes      OF((ct_data *tree, int max_code, ushf *bl_count));
+local void build_tree     OF((deflate_state *s, tree_desc *desc));
+local void scan_tree      OF((deflate_state *s, ct_data *tree, int max_code));
+local void send_tree      OF((deflate_state *s, ct_data *tree, int max_code));
+local int  build_bl_tree  OF((deflate_state *s));
+local void send_all_trees OF((deflate_state *s, int lcodes, int dcodes,
+                              int blcodes));
+local void compress_block OF((deflate_state *s, ct_data *ltree,
+                              ct_data *dtree));
+local void set_data_type  OF((deflate_state *s));
+local unsigned bi_reverse OF((unsigned value, int length));
+local void bi_windup      OF((deflate_state *s));
+local void bi_flush       OF((deflate_state *s));
+local void copy_block     OF((deflate_state *s, charf *buf, unsigned len,
+                              int header));
+
+#ifdef GEN_TREES_H
+local void gen_trees_header OF((void));
+#endif
+
+#ifndef DEBUG
+#  define send_code(s, c, tree) send_bits(s, tree[c].Code, tree[c].Len)
+   /* Send a code of the given tree. c and tree must not have side effects */
+
+#else /* DEBUG */
+#  define send_code(s, c, tree) \
+     { if (z_verbose>2) fprintf(stderr,"\ncd %3d ",(c)); \
+       send_bits(s, tree[c].Code, tree[c].Len); }
+#endif
+
+/* ===========================================================================
+ * Output a short LSB first on the stream.
+ * IN assertion: there is enough room in pendingBuf.
+ */
+#define put_short(s, w) { \
+    put_byte(s, (uch)((w) & 0xff)); \
+    put_byte(s, (uch)((ush)(w) >> 8)); \
+}
+
+/* ===========================================================================
+ * Send a value on a given number of bits.
+ * IN assertion: length <= 16 and value fits in length bits.
+ */
+#ifdef DEBUG
+local void send_bits      OF((deflate_state *s, int value, int length));
+
+local void send_bits(s, value, length)
+    deflate_state *s;
+    int value;  /* value to send */
+    int length; /* number of bits */
+{
+    Tracevv((stderr," l %2d v %4x ", length, value));
+    Assert(length > 0 && length <= 15, "invalid length");
+    s->bits_sent += (ulg)length;
+
+    /* If not enough room in bi_buf, use (valid) bits from bi_buf and
+     * (16 - bi_valid) bits from value, leaving (width - (16-bi_valid))
+     * unused bits in value.
+     */
+    if (s->bi_valid > (int)Buf_size - length) {
+        s->bi_buf |= (value << s->bi_valid);
+        put_short(s, s->bi_buf);
+        s->bi_buf = (ush)value >> (Buf_size - s->bi_valid);
+        s->bi_valid += length - Buf_size;
+    } else {
+        s->bi_buf |= value << s->bi_valid;
+        s->bi_valid += length;
+    }
+}
+#else /* !DEBUG */
+
+#define send_bits(s, value, length) \
+{ int len = length;\
+  if (s->bi_valid > (int)Buf_size - len) {\
+    int val = value;\
+    s->bi_buf |= (val << s->bi_valid);\
+    put_short(s, s->bi_buf);\
+    s->bi_buf = (ush)val >> (Buf_size - s->bi_valid);\
+    s->bi_valid += len - Buf_size;\
+  } else {\
+    s->bi_buf |= (value) << s->bi_valid;\
+    s->bi_valid += len;\
+  }\
+}
+#endif /* DEBUG */
+
+
+#define MAX(a,b) (a >= b ? a : b)
+/* the arguments must not have side effects */
+
+/* ===========================================================================
+ * Initialize the various 'constant' tables.
+ */
+local void tr_static_init()
+{
+#if defined(GEN_TREES_H) || !defined(STDC)
+    static int static_init_done = 0;
+    int n;        /* iterates over tree elements */
+    int bits;     /* bit counter */
+    int length;   /* length value */
+    int code;     /* code value */
+    int dist;     /* distance index */
+    ush bl_count[MAX_BITS+1];
+    /* number of codes at each bit length for an optimal tree */
+
+    if (static_init_done) return;
+
+    /* For some embedded targets, global variables are not initialized: */
+    static_l_desc.static_tree = static_ltree;
+    static_l_desc.extra_bits = extra_lbits;
+    static_d_desc.static_tree = static_dtree;
+    static_d_desc.extra_bits = extra_dbits;
+    static_bl_desc.extra_bits = extra_blbits;
+
+    /* Initialize the mapping length (0..255) -> length code (0..28) */
+    length = 0;
+    for (code = 0; code < LENGTH_CODES-1; code++) {
+        base_length[code] = length;
+        for (n = 0; n < (1<<extra_lbits[code]); n++) {
+            _length_code[length++] = (uch)code;
+        }
+    }
+    Assert (length == 256, "tr_static_init: length != 256");
+    /* Note that the length 255 (match length 258) can be represented
+     * in two different ways: code 284 + 5 bits or code 285, so we
+     * overwrite length_code[255] to use the best encoding:
+     */
+    _length_code[length-1] = (uch)code;
+
+    /* Initialize the mapping dist (0..32K) -> dist code (0..29) */
+    dist = 0;
+    for (code = 0 ; code < 16; code++) {
+        base_dist[code] = dist;
+        for (n = 0; n < (1<<extra_dbits[code]); n++) {
+            _dist_code[dist++] = (uch)code;
+        }
+    }
+    Assert (dist == 256, "tr_static_init: dist != 256");
+    dist >>= 7; /* from now on, all distances are divided by 128 */
+    for ( ; code < D_CODES; code++) {
+        base_dist[code] = dist << 7;
+        for (n = 0; n < (1<<(extra_dbits[code]-7)); n++) {
+            _dist_code[256 + dist++] = (uch)code;
+        }
+    }
+    Assert (dist == 256, "tr_static_init: 256+dist != 512");
+
+    /* Construct the codes of the static literal tree */
+    for (bits = 0; bits <= MAX_BITS; bits++) bl_count[bits] = 0;
+    n = 0;
+    while (n <= 143) static_ltree[n++].Len = 8, bl_count[8]++;
+    while (n <= 255) static_ltree[n++].Len = 9, bl_count[9]++;
+    while (n <= 279) static_ltree[n++].Len = 7, bl_count[7]++;
+    while (n <= 287) static_ltree[n++].Len = 8, bl_count[8]++;
+    /* Codes 286 and 287 do not exist, but we must include them in the
+     * tree construction to get a canonical Huffman tree (longest code
+     * all ones)
+     */
+    gen_codes((ct_data *)static_ltree, L_CODES+1, bl_count);
+
+    /* The static distance tree is trivial: */
+    for (n = 0; n < D_CODES; n++) {
+        static_dtree[n].Len = 5;
+        static_dtree[n].Code = bi_reverse((unsigned)n, 5);
+    }
+    static_init_done = 1;
+
+#  ifdef GEN_TREES_H
+    gen_trees_header();
+#  endif
+#endif /* defined(GEN_TREES_H) || !defined(STDC) */
+}
+
+/* ===========================================================================
+ * Genererate the file trees.h describing the static trees.
+ */
+#ifdef GEN_TREES_H
+#  ifndef DEBUG
+#    include <stdio.h>
+#  endif
+
+#  define SEPARATOR(i, last, width) \
+      ((i) == (last)? "\n};\n\n" :    \
+       ((i) % (width) == (width)-1 ? ",\n" : ", "))
+
+void gen_trees_header()
+{
+    FILE *header = fopen("trees.h", "w");
+    int i;
+
+    Assert (header != NULL, "Can't open trees.h");
+    fprintf(header,
+	    "/* header created automatically with -DGEN_TREES_H */\n\n");
+
+    fprintf(header, "local const ct_data static_ltree[L_CODES+2] = {\n");
+    for (i = 0; i < L_CODES+2; i++) {
+	fprintf(header, "{{%3u},{%3u}}%s", static_ltree[i].Code,
+		static_ltree[i].Len, SEPARATOR(i, L_CODES+1, 5));
+    }
+
+    fprintf(header, "local const ct_data static_dtree[D_CODES] = {\n");
+    for (i = 0; i < D_CODES; i++) {
+	fprintf(header, "{{%2u},{%2u}}%s", static_dtree[i].Code,
+		static_dtree[i].Len, SEPARATOR(i, D_CODES-1, 5));
+    }
+
+    fprintf(header, "const uch _dist_code[DIST_CODE_LEN] = {\n");
+    for (i = 0; i < DIST_CODE_LEN; i++) {
+	fprintf(header, "%2u%s", _dist_code[i],
+		SEPARATOR(i, DIST_CODE_LEN-1, 20));
+    }
+
+    fprintf(header, "const uch _length_code[MAX_MATCH-MIN_MATCH+1]= {\n");
+    for (i = 0; i < MAX_MATCH-MIN_MATCH+1; i++) {
+	fprintf(header, "%2u%s", _length_code[i],
+		SEPARATOR(i, MAX_MATCH-MIN_MATCH, 20));
+    }
+
+    fprintf(header, "local const int base_length[LENGTH_CODES] = {\n");
+    for (i = 0; i < LENGTH_CODES; i++) {
+	fprintf(header, "%1u%s", base_length[i],
+		SEPARATOR(i, LENGTH_CODES-1, 20));
+    }
+
+    fprintf(header, "local const int base_dist[D_CODES] = {\n");
+    for (i = 0; i < D_CODES; i++) {
+	fprintf(header, "%5u%s", base_dist[i],
+		SEPARATOR(i, D_CODES-1, 10));
+    }
+
+    fclose(header);
+}
+#endif /* GEN_TREES_H */
+
+/* ===========================================================================
+ * Initialize the tree data structures for a new zlib stream.
+ */
+void _tr_init(s)
+    deflate_state *s;
+{
+    tr_static_init();
+
+    s->l_desc.dyn_tree = s->dyn_ltree;
+    s->l_desc.stat_desc = &static_l_desc;
+
+    s->d_desc.dyn_tree = s->dyn_dtree;
+    s->d_desc.stat_desc = &static_d_desc;
+
+    s->bl_desc.dyn_tree = s->bl_tree;
+    s->bl_desc.stat_desc = &static_bl_desc;
+
+    s->bi_buf = 0;
+    s->bi_valid = 0;
+    s->last_eob_len = 8; /* enough lookahead for inflate */
+#ifdef DEBUG
+    s->compressed_len = 0L;
+    s->bits_sent = 0L;
+#endif
+
+    /* Initialize the first block of the first file: */
+    init_block(s);
+}
+
+/* ===========================================================================
+ * Initialize a new block.
+ */
+local void init_block(s)
+    deflate_state *s;
+{
+    int n; /* iterates over tree elements */
+
+    /* Initialize the trees. */
+    for (n = 0; n < L_CODES;  n++) s->dyn_ltree[n].Freq = 0;
+    for (n = 0; n < D_CODES;  n++) s->dyn_dtree[n].Freq = 0;
+    for (n = 0; n < BL_CODES; n++) s->bl_tree[n].Freq = 0;
+
+    s->dyn_ltree[END_BLOCK].Freq = 1;
+    s->opt_len = s->static_len = 0L;
+    s->last_lit = s->matches = 0;
+}
+
+#define SMALLEST 1
+/* Index within the heap array of least frequent node in the Huffman tree */
+
+
+/* ===========================================================================
+ * Remove the smallest element from the heap and recreate the heap with
+ * one less element. Updates heap and heap_len.
+ */
+#define pqremove(s, tree, top) \
+{\
+    top = s->heap[SMALLEST]; \
+    s->heap[SMALLEST] = s->heap[s->heap_len--]; \
+    pqdownheap(s, tree, SMALLEST); \
+}
+
+/* ===========================================================================
+ * Compares to subtrees, using the tree depth as tie breaker when
+ * the subtrees have equal frequency. This minimizes the worst case length.
+ */
+#define smaller(tree, n, m, depth) \
+   (tree[n].Freq < tree[m].Freq || \
+   (tree[n].Freq == tree[m].Freq && depth[n] <= depth[m]))
+
+/* ===========================================================================
+ * Restore the heap property by moving down the tree starting at node k,
+ * exchanging a node with the smallest of its two sons if necessary, stopping
+ * when the heap property is re-established (each father smaller than its
+ * two sons).
+ */
+local void pqdownheap(s, tree, k)
+    deflate_state *s;
+    ct_data *tree;  /* the tree to restore */
+    int k;               /* node to move down */
+{
+    int v = s->heap[k];
+    int j = k << 1;  /* left son of k */
+    while (j <= s->heap_len) {
+        /* Set j to the smallest of the two sons: */
+        if (j < s->heap_len &&
+            smaller(tree, s->heap[j+1], s->heap[j], s->depth)) {
+            j++;
+        }
+        /* Exit if v is smaller than both sons */
+        if (smaller(tree, v, s->heap[j], s->depth)) break;
+
+        /* Exchange v with the smallest son */
+        s->heap[k] = s->heap[j];  k = j;
+
+        /* And continue down the tree, setting j to the left son of k */
+        j <<= 1;
+    }
+    s->heap[k] = v;
+}
+
+/* ===========================================================================
+ * Compute the optimal bit lengths for a tree and update the total bit length
+ * for the current block.
+ * IN assertion: the fields freq and dad are set, heap[heap_max] and
+ *    above are the tree nodes sorted by increasing frequency.
+ * OUT assertions: the field len is set to the optimal bit length, the
+ *     array bl_count contains the frequencies for each bit length.
+ *     The length opt_len is updated; static_len is also updated if stree is
+ *     not null.
+ */
+local void gen_bitlen(s, desc)
+    deflate_state *s;
+    tree_desc *desc;    /* the tree descriptor */
+{
+    ct_data *tree        = desc->dyn_tree;
+    int max_code         = desc->max_code;
+    const ct_data *stree = desc->stat_desc->static_tree;
+    const intf *extra    = desc->stat_desc->extra_bits;
+    int base             = desc->stat_desc->extra_base;
+    int max_length       = desc->stat_desc->max_length;
+    int h;              /* heap index */
+    int n, m;           /* iterate over the tree elements */
+    int bits;           /* bit length */
+    int xbits;          /* extra bits */
+    ush f;              /* frequency */
+    int overflow = 0;   /* number of elements with bit length too large */
+
+    for (bits = 0; bits <= MAX_BITS; bits++) s->bl_count[bits] = 0;
+
+    /* In a first pass, compute the optimal bit lengths (which may
+     * overflow in the case of the bit length tree).
+     */
+    tree[s->heap[s->heap_max]].Len = 0; /* root of the heap */
+
+    for (h = s->heap_max+1; h < HEAP_SIZE; h++) {
+        n = s->heap[h];
+        bits = tree[tree[n].Dad].Len + 1;
+        if (bits > max_length) bits = max_length, overflow++;
+        tree[n].Len = (ush)bits;
+        /* We overwrite tree[n].Dad which is no longer needed */
+
+        if (n > max_code) continue; /* not a leaf node */
+
+        s->bl_count[bits]++;
+        xbits = 0;
+        if (n >= base) xbits = extra[n-base];
+        f = tree[n].Freq;
+        s->opt_len += (ulg)f * (bits + xbits);
+        if (stree) s->static_len += (ulg)f * (stree[n].Len + xbits);
+    }
+    if (overflow == 0) return;
+
+    Trace((stderr,"\nbit length overflow\n"));
+    /* This happens for example on obj2 and pic of the Calgary corpus */
+
+    /* Find the first bit length which could increase: */
+    do {
+        bits = max_length-1;
+        while (s->bl_count[bits] == 0) bits--;
+        s->bl_count[bits]--;      /* move one leaf down the tree */
+        s->bl_count[bits+1] += 2; /* move one overflow item as its brother */
+        s->bl_count[max_length]--;
+        /* The brother of the overflow item also moves one step up,
+         * but this does not affect bl_count[max_length]
+         */
+        overflow -= 2;
+    } while (overflow > 0);
+
+    /* Now recompute all bit lengths, scanning in increasing frequency.
+     * h is still equal to HEAP_SIZE. (It is simpler to reconstruct all
+     * lengths instead of fixing only the wrong ones. This idea is taken
+     * from 'ar' written by Haruhiko Okumura.)
+     */
+    for (bits = max_length; bits != 0; bits--) {
+        n = s->bl_count[bits];
+        while (n != 0) {
+            m = s->heap[--h];
+            if (m > max_code) continue;
+            if (tree[m].Len != (unsigned) bits) {
+                Trace((stderr,"code %d bits %d->%d\n", m, tree[m].Len, bits));
+                s->opt_len += ((long)bits - (long)tree[m].Len)
+                              *(long)tree[m].Freq;
+                tree[m].Len = (ush)bits;
+            }
+            n--;
+        }
+    }
+}
+
+/* ===========================================================================
+ * Generate the codes for a given tree and bit counts (which need not be
+ * optimal).
+ * IN assertion: the array bl_count contains the bit length statistics for
+ * the given tree and the field len is set for all tree elements.
+ * OUT assertion: the field code is set for all tree elements of non
+ *     zero code length.
+ */
+local void gen_codes (tree, max_code, bl_count)
+    ct_data *tree;             /* the tree to decorate */
+    int max_code;              /* largest code with non zero frequency */
+    ushf *bl_count;            /* number of codes at each bit length */
+{
+    ush next_code[MAX_BITS+1]; /* next code value for each bit length */
+    ush code = 0;              /* running code value */
+    int bits;                  /* bit index */
+    int n;                     /* code index */
+
+    /* The distribution counts are first used to generate the code values
+     * without bit reversal.
+     */
+    for (bits = 1; bits <= MAX_BITS; bits++) {
+        next_code[bits] = code = (code + bl_count[bits-1]) << 1;
+    }
+    /* Check that the bit counts in bl_count are consistent. The last code
+     * must be all ones.
+     */
+    Assert (code + bl_count[MAX_BITS]-1 == (1<<MAX_BITS)-1,
+            "inconsistent bit counts");
+    Tracev((stderr,"\ngen_codes: max_code %d ", max_code));
+
+    for (n = 0;  n <= max_code; n++) {
+        int len = tree[n].Len;
+        if (len == 0) continue;
+        /* Now reverse the bits */
+        tree[n].Code = bi_reverse(next_code[len]++, len);
+
+        Tracecv(tree != static_ltree, (stderr,"\nn %3d %c l %2d c %4x (%x) ",
+             n, (isgraph(n) ? n : ' '), len, tree[n].Code, next_code[len]-1));
+    }
+}
+
+/* ===========================================================================
+ * Construct one Huffman tree and assigns the code bit strings and lengths.
+ * Update the total bit length for the current block.
+ * IN assertion: the field freq is set for all tree elements.
+ * OUT assertions: the fields len and code are set to the optimal bit length
+ *     and corresponding code. The length opt_len is updated; static_len is
+ *     also updated if stree is not null. The field max_code is set.
+ */
+local void build_tree(s, desc)
+    deflate_state *s;
+    tree_desc *desc; /* the tree descriptor */
+{
+    ct_data *tree         = desc->dyn_tree;
+    const ct_data *stree  = desc->stat_desc->static_tree;
+    int elems             = desc->stat_desc->elems;
+    int n, m;          /* iterate over heap elements */
+    int max_code = -1; /* largest code with non zero frequency */
+    int node;          /* new node being created */
+
+    /* Construct the initial heap, with least frequent element in
+     * heap[SMALLEST]. The sons of heap[n] are heap[2*n] and heap[2*n+1].
+     * heap[0] is not used.
+     */
+    s->heap_len = 0, s->heap_max = HEAP_SIZE;
+
+    for (n = 0; n < elems; n++) {
+        if (tree[n].Freq != 0) {
+            s->heap[++(s->heap_len)] = max_code = n;
+            s->depth[n] = 0;
+        } else {
+            tree[n].Len = 0;
+        }
+    }
+
+    /* The pkzip format requires that at least one distance code exists,
+     * and that at least one bit should be sent even if there is only one
+     * possible code. So to avoid special checks later on we force at least
+     * two codes of non zero frequency.
+     */
+    while (s->heap_len < 2) {
+        node = s->heap[++(s->heap_len)] = (max_code < 2 ? ++max_code : 0);
+        tree[node].Freq = 1;
+        s->depth[node] = 0;
+        s->opt_len--; if (stree) s->static_len -= stree[node].Len;
+        /* node is 0 or 1 so it does not have extra bits */
+    }
+    desc->max_code = max_code;
+
+    /* The elements heap[heap_len/2+1 .. heap_len] are leaves of the tree,
+     * establish sub-heaps of increasing lengths:
+     */
+    for (n = s->heap_len/2; n >= 1; n--) pqdownheap(s, tree, n);
+
+    /* Construct the Huffman tree by repeatedly combining the least two
+     * frequent nodes.
+     */
+    node = elems;              /* next internal node of the tree */
+    do {
+        pqremove(s, tree, n);  /* n = node of least frequency */
+        m = s->heap[SMALLEST]; /* m = node of next least frequency */
+
+        s->heap[--(s->heap_max)] = n; /* keep the nodes sorted by frequency */
+        s->heap[--(s->heap_max)] = m;
+
+        /* Create a new node father of n and m */
+        tree[node].Freq = tree[n].Freq + tree[m].Freq;
+        s->depth[node] = (uch) (MAX(s->depth[n], s->depth[m]) + 1);
+        tree[n].Dad = tree[m].Dad = (ush)node;
+#ifdef DUMP_BL_TREE
+        if (tree == s->bl_tree) {
+            fprintf(stderr,"\nnode %d(%d), sons %d(%d) %d(%d)",
+                    node, tree[node].Freq, n, tree[n].Freq, m, tree[m].Freq);
+        }
+#endif
+        /* and insert the new node in the heap */
+        s->heap[SMALLEST] = node++;
+        pqdownheap(s, tree, SMALLEST);
+
+    } while (s->heap_len >= 2);
+
+    s->heap[--(s->heap_max)] = s->heap[SMALLEST];
+
+    /* At this point, the fields freq and dad are set. We can now
+     * generate the bit lengths.
+     */
+    gen_bitlen(s, (tree_desc *)desc);
+
+    /* The field len is now set, we can generate the bit codes */
+    gen_codes ((ct_data *)tree, max_code, s->bl_count);
+}
+
+/* ===========================================================================
+ * Scan a literal or distance tree to determine the frequencies of the codes
+ * in the bit length tree.
+ */
+local void scan_tree (s, tree, max_code)
+    deflate_state *s;
+    ct_data *tree;   /* the tree to be scanned */
+    int max_code;    /* and its largest code of non zero frequency */
+{
+    int n;                     /* iterates over all tree elements */
+    int prevlen = -1;          /* last emitted length */
+    int curlen;                /* length of current code */
+    int nextlen = tree[0].Len; /* length of next code */
+    int count = 0;             /* repeat count of the current code */
+    int max_count = 7;         /* max repeat count */
+    int min_count = 4;         /* min repeat count */
+
+    if (nextlen == 0) max_count = 138, min_count = 3;
+    tree[max_code+1].Len = (ush)0xffff; /* guard */
+
+    for (n = 0; n <= max_code; n++) {
+        curlen = nextlen; nextlen = tree[n+1].Len;
+        if (++count < max_count && curlen == nextlen) {
+            continue;
+        } else if (count < min_count) {
+            s->bl_tree[curlen].Freq += count;
+        } else if (curlen != 0) {
+            if (curlen != prevlen) s->bl_tree[curlen].Freq++;
+            s->bl_tree[REP_3_6].Freq++;
+        } else if (count <= 10) {
+            s->bl_tree[REPZ_3_10].Freq++;
+        } else {
+            s->bl_tree[REPZ_11_138].Freq++;
+        }
+        count = 0; prevlen = curlen;
+        if (nextlen == 0) {
+            max_count = 138, min_count = 3;
+        } else if (curlen == nextlen) {
+            max_count = 6, min_count = 3;
+        } else {
+            max_count = 7, min_count = 4;
+        }
+    }
+}
+
+/* ===========================================================================
+ * Send a literal or distance tree in compressed form, using the codes in
+ * bl_tree.
+ */
+local void send_tree (s, tree, max_code)
+    deflate_state *s;
+    ct_data *tree; /* the tree to be scanned */
+    int max_code;       /* and its largest code of non zero frequency */
+{
+    int n;                     /* iterates over all tree elements */
+    int prevlen = -1;          /* last emitted length */
+    int curlen;                /* length of current code */
+    int nextlen = tree[0].Len; /* length of next code */
+    int count = 0;             /* repeat count of the current code */
+    int max_count = 7;         /* max repeat count */
+    int min_count = 4;         /* min repeat count */
+
+    /* tree[max_code+1].Len = -1; */  /* guard already set */
+    if (nextlen == 0) max_count = 138, min_count = 3;
+
+    for (n = 0; n <= max_code; n++) {
+        curlen = nextlen; nextlen = tree[n+1].Len;
+        if (++count < max_count && curlen == nextlen) {
+            continue;
+        } else if (count < min_count) {
+            do { send_code(s, curlen, s->bl_tree); } while (--count != 0);
+
+        } else if (curlen != 0) {
+            if (curlen != prevlen) {
+                send_code(s, curlen, s->bl_tree); count--;
+            }
+            Assert(count >= 3 && count <= 6, " 3_6?");
+            send_code(s, REP_3_6, s->bl_tree); send_bits(s, count-3, 2);
+
+        } else if (count <= 10) {
+            send_code(s, REPZ_3_10, s->bl_tree); send_bits(s, count-3, 3);
+
+        } else {
+            send_code(s, REPZ_11_138, s->bl_tree); send_bits(s, count-11, 7);
+        }
+        count = 0; prevlen = curlen;
+        if (nextlen == 0) {
+            max_count = 138, min_count = 3;
+        } else if (curlen == nextlen) {
+            max_count = 6, min_count = 3;
+        } else {
+            max_count = 7, min_count = 4;
+        }
+    }
+}
+
+/* ===========================================================================
+ * Construct the Huffman tree for the bit lengths and return the index in
+ * bl_order of the last bit length code to send.
+ */
+local int build_bl_tree(s)
+    deflate_state *s;
+{
+    int max_blindex;  /* index of last bit length code of non zero freq */
+
+    /* Determine the bit length frequencies for literal and distance trees */
+    scan_tree(s, (ct_data *)s->dyn_ltree, s->l_desc.max_code);
+    scan_tree(s, (ct_data *)s->dyn_dtree, s->d_desc.max_code);
+
+    /* Build the bit length tree: */
+    build_tree(s, (tree_desc *)(&(s->bl_desc)));
+    /* opt_len now includes the length of the tree representations, except
+     * the lengths of the bit lengths codes and the 5+5+4 bits for the counts.
+     */
+
+    /* Determine the number of bit length codes to send. The pkzip format
+     * requires that at least 4 bit length codes be sent. (appnote.txt says
+     * 3 but the actual value used is 4.)
+     */
+    for (max_blindex = BL_CODES-1; max_blindex >= 3; max_blindex--) {
+        if (s->bl_tree[bl_order[max_blindex]].Len != 0) break;
+    }
+    /* Update opt_len to include the bit length tree and counts */
+    s->opt_len += 3*(max_blindex+1) + 5+5+4;
+    Tracev((stderr, "\ndyn trees: dyn %ld, stat %ld",
+            s->opt_len, s->static_len));
+
+    return max_blindex;
+}
+
+/* ===========================================================================
+ * Send the header for a block using dynamic Huffman trees: the counts, the
+ * lengths of the bit length codes, the literal tree and the distance tree.
+ * IN assertion: lcodes >= 257, dcodes >= 1, blcodes >= 4.
+ */
+local void send_all_trees(s, lcodes, dcodes, blcodes)
+    deflate_state *s;
+    int lcodes, dcodes, blcodes; /* number of codes for each tree */
+{
+    int rank;                    /* index in bl_order */
+
+    Assert (lcodes >= 257 && dcodes >= 1 && blcodes >= 4, "not enough codes");
+    Assert (lcodes <= L_CODES && dcodes <= D_CODES && blcodes <= BL_CODES,
+            "too many codes");
+    Tracev((stderr, "\nbl counts: "));
+    send_bits(s, lcodes-257, 5); /* not +255 as stated in appnote.txt */
+    send_bits(s, dcodes-1,   5);
+    send_bits(s, blcodes-4,  4); /* not -3 as stated in appnote.txt */
+    for (rank = 0; rank < blcodes; rank++) {
+        Tracev((stderr, "\nbl code %2d ", bl_order[rank]));
+        send_bits(s, s->bl_tree[bl_order[rank]].Len, 3);
+    }
+    Tracev((stderr, "\nbl tree: sent %ld", s->bits_sent));
+
+    send_tree(s, (ct_data *)s->dyn_ltree, lcodes-1); /* literal tree */
+    Tracev((stderr, "\nlit tree: sent %ld", s->bits_sent));
+
+    send_tree(s, (ct_data *)s->dyn_dtree, dcodes-1); /* distance tree */
+    Tracev((stderr, "\ndist tree: sent %ld", s->bits_sent));
+}
+
+/* ===========================================================================
+ * Send a stored block
+ */
+void _tr_stored_block(s, buf, stored_len, eof)
+    deflate_state *s;
+    charf *buf;       /* input block */
+    ulg stored_len;   /* length of input block */
+    int eof;          /* true if this is the last block for a file */
+{
+    send_bits(s, (STORED_BLOCK<<1)+eof, 3);  /* send block type */
+#ifdef DEBUG
+    s->compressed_len = (s->compressed_len + 3 + 7) & (ulg)~7L;
+    s->compressed_len += (stored_len + 4) << 3;
+#endif
+    copy_block(s, buf, (unsigned)stored_len, 1); /* with header */
+}
+
+/* ===========================================================================
+ * Send one empty static block to give enough lookahead for inflate.
+ * This takes 10 bits, of which 7 may remain in the bit buffer.
+ * The current inflate code requires 9 bits of lookahead. If the
+ * last two codes for the previous block (real code plus EOB) were coded
+ * on 5 bits or less, inflate may have only 5+3 bits of lookahead to decode
+ * the last real code. In this case we send two empty static blocks instead
+ * of one. (There are no problems if the previous block is stored or fixed.)
+ * To simplify the code, we assume the worst case of last real code encoded
+ * on one bit only.
+ */
+void _tr_align(s)
+    deflate_state *s;
+{
+    send_bits(s, STATIC_TREES<<1, 3);
+    send_code(s, END_BLOCK, static_ltree);
+#ifdef DEBUG
+    s->compressed_len += 10L; /* 3 for block type, 7 for EOB */
+#endif
+    bi_flush(s);
+    /* Of the 10 bits for the empty block, we have already sent
+     * (10 - bi_valid) bits. The lookahead for the last real code (before
+     * the EOB of the previous block) was thus at least one plus the length
+     * of the EOB plus what we have just sent of the empty static block.
+     */
+    if (1 + s->last_eob_len + 10 - s->bi_valid < 9) {
+        send_bits(s, STATIC_TREES<<1, 3);
+        send_code(s, END_BLOCK, static_ltree);
+#ifdef DEBUG
+        s->compressed_len += 10L;
+#endif
+        bi_flush(s);
+    }
+    s->last_eob_len = 7;
+}
+
+/* ===========================================================================
+ * Determine the best encoding for the current block: dynamic trees, static
+ * trees or store, and output the encoded block to the zip file.
+ */
+void _tr_flush_block(s, buf, stored_len, eof)
+    deflate_state *s;
+    charf *buf;       /* input block, or NULL if too old */
+    ulg stored_len;   /* length of input block */
+    int eof;          /* true if this is the last block for a file */
+{
+    ulg opt_lenb, static_lenb; /* opt_len and static_len in bytes */
+    int max_blindex = 0;  /* index of last bit length code of non zero freq */
+
+    /* Build the Huffman trees unless a stored block is forced */
+    if (s->level > 0) {
+
+	 /* Check if the file is ascii or binary */
+	if (s->data_type == Z_UNKNOWN) set_data_type(s);
+
+	/* Construct the literal and distance trees */
+	build_tree(s, (tree_desc *)(&(s->l_desc)));
+	Tracev((stderr, "\nlit data: dyn %ld, stat %ld", s->opt_len,
+		s->static_len));
+
+	build_tree(s, (tree_desc *)(&(s->d_desc)));
+	Tracev((stderr, "\ndist data: dyn %ld, stat %ld", s->opt_len,
+		s->static_len));
+	/* At this point, opt_len and static_len are the total bit lengths of
+	 * the compressed block data, excluding the tree representations.
+	 */
+
+	/* Build the bit length tree for the above two trees, and get the index
+	 * in bl_order of the last bit length code to send.
+	 */
+	max_blindex = build_bl_tree(s);
+
+	/* Determine the best encoding. Compute first the block length in bytes*/
+	opt_lenb = (s->opt_len+3+7)>>3;
+	static_lenb = (s->static_len+3+7)>>3;
+
+	Tracev((stderr, "\nopt %lu(%lu) stat %lu(%lu) stored %lu lit %u ",
+		opt_lenb, s->opt_len, static_lenb, s->static_len, stored_len,
+		s->last_lit));
+
+	if (static_lenb <= opt_lenb) opt_lenb = static_lenb;
+
+    } else {
+        Assert(buf != (char*)0, "lost buf");
+	opt_lenb = static_lenb = stored_len + 5; /* force a stored block */
+    }
+
+#ifdef FORCE_STORED
+    if (buf != (char*)0) { /* force stored block */
+#else
+    if (stored_len+4 <= opt_lenb && buf != (char*)0) {
+                       /* 4: two words for the lengths */
+#endif
+        /* The test buf != NULL is only necessary if LIT_BUFSIZE > WSIZE.
+         * Otherwise we can't have processed more than WSIZE input bytes since
+         * the last block flush, because compression would have been
+         * successful. If LIT_BUFSIZE <= WSIZE, it is never too late to
+         * transform a block into a stored block.
+         */
+        _tr_stored_block(s, buf, stored_len, eof);
+
+#ifdef FORCE_STATIC
+    } else if (static_lenb >= 0) { /* force static trees */
+#else
+    } else if (static_lenb == opt_lenb) {
+#endif
+        send_bits(s, (STATIC_TREES<<1)+eof, 3);
+        compress_block(s, (ct_data *)static_ltree, (ct_data *)static_dtree);
+#ifdef DEBUG
+        s->compressed_len += 3 + s->static_len;
+#endif
+    } else {
+        send_bits(s, (DYN_TREES<<1)+eof, 3);
+        send_all_trees(s, s->l_desc.max_code+1, s->d_desc.max_code+1,
+                       max_blindex+1);
+        compress_block(s, (ct_data *)s->dyn_ltree, (ct_data *)s->dyn_dtree);
+#ifdef DEBUG
+        s->compressed_len += 3 + s->opt_len;
+#endif
+    }
+    Assert (s->compressed_len == s->bits_sent, "bad compressed size");
+    /* The above check is made mod 2^32, for files larger than 512 MB
+     * and uLong implemented on 32 bits.
+     */
+    init_block(s);
+
+    if (eof) {
+        bi_windup(s);
+#ifdef DEBUG
+        s->compressed_len += 7;  /* align on byte boundary */
+#endif
+    }
+    Tracev((stderr,"\ncomprlen %lu(%lu) ", s->compressed_len>>3,
+           s->compressed_len-7*eof));
+}
+
+/* ===========================================================================
+ * Save the match info and tally the frequency counts. Return true if
+ * the current block must be flushed.
+ */
+int _tr_tally (s, dist, lc)
+    deflate_state *s;
+    unsigned dist;  /* distance of matched string */
+    unsigned lc;    /* match length-MIN_MATCH or unmatched char (if dist==0) */
+{
+    s->d_buf[s->last_lit] = (ush)dist;
+    s->l_buf[s->last_lit++] = (uch)lc;
+    if (dist == 0) {
+        /* lc is the unmatched char */
+        s->dyn_ltree[lc].Freq++;
+    } else {
+        s->matches++;
+        /* Here, lc is the match length - MIN_MATCH */
+        dist--;             /* dist = match distance - 1 */
+        Assert((ush)dist < (ush)MAX_DIST(s) &&
+               (ush)lc <= (ush)(MAX_MATCH-MIN_MATCH) &&
+               (ush)d_code(dist) < (ush)D_CODES,  "_tr_tally: bad match");
+
+        s->dyn_ltree[_length_code[lc]+LITERALS+1].Freq++;
+        s->dyn_dtree[d_code(dist)].Freq++;
+    }
+
+#ifdef TRUNCATE_BLOCK
+    /* Try to guess if it is profitable to stop the current block here */
+    if ((s->last_lit & 0x1fff) == 0 && s->level > 2) {
+        /* Compute an upper bound for the compressed length */
+        ulg out_length = (ulg)s->last_lit*8L;
+        ulg in_length = (ulg)((long)s->strstart - s->block_start);
+        int dcode;
+        for (dcode = 0; dcode < D_CODES; dcode++) {
+            out_length += (ulg)s->dyn_dtree[dcode].Freq *
+                (5L+extra_dbits[dcode]);
+        }
+        out_length >>= 3;
+        Tracev((stderr,"\nlast_lit %u, in %ld, out ~%ld(%ld%%) ",
+               s->last_lit, in_length, out_length,
+               100L - out_length*100L/in_length));
+        if (s->matches < s->last_lit/2 && out_length < in_length/2) return 1;
+    }
+#endif
+    return (s->last_lit == s->lit_bufsize-1);
+    /* We avoid equality with lit_bufsize because of wraparound at 64K
+     * on 16 bit machines and because stored blocks are restricted to
+     * 64K-1 bytes.
+     */
+}
+
+/* ===========================================================================
+ * Send the block data compressed using the given Huffman trees
+ */
+local void compress_block(s, ltree, dtree)
+    deflate_state *s;
+    ct_data *ltree; /* literal tree */
+    ct_data *dtree; /* distance tree */
+{
+    unsigned dist;      /* distance of matched string */
+    int lc;             /* match length or unmatched char (if dist == 0) */
+    unsigned lx = 0;    /* running index in l_buf */
+    unsigned code;      /* the code to send */
+    int extra;          /* number of extra bits to send */
+
+    if (s->last_lit != 0) do {
+        dist = s->d_buf[lx];
+        lc = s->l_buf[lx++];
+        if (dist == 0) {
+            send_code(s, lc, ltree); /* send a literal byte */
+            Tracecv(isgraph(lc), (stderr," '%c' ", lc));
+        } else {
+            /* Here, lc is the match length - MIN_MATCH */
+            code = _length_code[lc];
+            send_code(s, code+LITERALS+1, ltree); /* send the length code */
+            extra = extra_lbits[code];
+            if (extra != 0) {
+                lc -= base_length[code];
+                send_bits(s, lc, extra);       /* send the extra length bits */
+            }
+            dist--; /* dist is now the match distance - 1 */
+            code = d_code(dist);
+            Assert (code < D_CODES, "bad d_code");
+
+            send_code(s, code, dtree);       /* send the distance code */
+            extra = extra_dbits[code];
+            if (extra != 0) {
+                dist -= base_dist[code];
+                send_bits(s, dist, extra);   /* send the extra distance bits */
+            }
+        } /* literal or match pair ? */
+
+        /* Check that the overlay between pending_buf and d_buf+l_buf is ok: */
+        Assert(s->pending < s->lit_bufsize + 2*lx, "pendingBuf overflow");
+
+    } while (lx < s->last_lit);
+
+    send_code(s, END_BLOCK, ltree);
+    s->last_eob_len = ltree[END_BLOCK].Len;
+}
+
+/* ===========================================================================
+ * Set the data type to ASCII or BINARY, using a crude approximation:
+ * binary if more than 20% of the bytes are <= 6 or >= 128, ascii otherwise.
+ * IN assertion: the fields freq of dyn_ltree are set and the total of all
+ * frequencies does not exceed 64K (to fit in an int on 16 bit machines).
+ */
+local void set_data_type(s)
+    deflate_state *s;
+{
+    int n = 0;
+    unsigned ascii_freq = 0;
+    unsigned bin_freq = 0;
+    while (n < 7)        bin_freq += s->dyn_ltree[n++].Freq;
+    while (n < 128)    ascii_freq += s->dyn_ltree[n++].Freq;
+    while (n < LITERALS) bin_freq += s->dyn_ltree[n++].Freq;
+    s->data_type = (Byte)(bin_freq > (ascii_freq >> 2) ? Z_BINARY : Z_ASCII);
+}
+
+/* ===========================================================================
+ * Reverse the first len bits of a code, using straightforward code (a faster
+ * method would use a table)
+ * IN assertion: 1 <= len <= 15
+ */
+local unsigned bi_reverse(code, len)
+    unsigned code; /* the value to invert */
+    int len;       /* its bit length */
+{
+    register unsigned res = 0;
+    do {
+        res |= code & 1;
+        code >>= 1, res <<= 1;
+    } while (--len > 0);
+    return res >> 1;
+}
+
+/* ===========================================================================
+ * Flush the bit buffer, keeping at most 7 bits in it.
+ */
+local void bi_flush(s)
+    deflate_state *s;
+{
+    if (s->bi_valid == 16) {
+        put_short(s, s->bi_buf);
+        s->bi_buf = 0;
+        s->bi_valid = 0;
+    } else if (s->bi_valid >= 8) {
+        put_byte(s, (Byte)s->bi_buf);
+        s->bi_buf >>= 8;
+        s->bi_valid -= 8;
+    }
+}
+
+/* ===========================================================================
+ * Flush the bit buffer and align the output on a byte boundary
+ */
+local void bi_windup(s)
+    deflate_state *s;
+{
+    if (s->bi_valid > 8) {
+        put_short(s, s->bi_buf);
+    } else if (s->bi_valid > 0) {
+        put_byte(s, (Byte)s->bi_buf);
+    }
+    s->bi_buf = 0;
+    s->bi_valid = 0;
+#ifdef DEBUG
+    s->bits_sent = (s->bits_sent+7) & ~7;
+#endif
+}
+
+/* ===========================================================================
+ * Copy a stored block, storing first the length and its
+ * one's complement if requested.
+ */
+local void copy_block(s, buf, len, header)
+    deflate_state *s;
+    charf    *buf;    /* the input data */
+    unsigned len;     /* its length */
+    int      header;  /* true if block header must be written */
+{
+    bi_windup(s);        /* align on byte boundary */
+    s->last_eob_len = 8; /* enough lookahead for inflate */
+
+    if (header) {
+        put_short(s, (ush)len);
+        put_short(s, (ush)~len);
+#ifdef DEBUG
+        s->bits_sent += 2*16;
+#endif
+    }
+#ifdef DEBUG
+    s->bits_sent += (ulg)len<<3;
+#endif
+    while (len--) {
+        put_byte(s, *buf++);
+    }
+}
diff --git a/uppsrc/plugin/z/lib/trees.h b/uppsrc/plugin/z/lib/trees.h
new file mode 100644
index 000000000..aadfa16de
--- /dev/null
+++ b/uppsrc/plugin/z/lib/trees.h
@@ -0,0 +1,127 @@
+/* header created automatically with -DGEN_TREES_H */
+
+local const ct_data static_ltree[L_CODES+2] = {
+{{ 12},{  8}}, {{140},{  8}}, {{ 76},{  8}}, {{204},{  8}}, {{ 44},{  8}},
+{{172},{  8}}, {{108},{  8}}, {{236},{  8}}, {{ 28},{  8}}, {{156},{  8}},
+{{ 92},{  8}}, {{220},{  8}}, {{ 60},{  8}}, {{188},{  8}}, {{124},{  8}},
+{{252},{  8}}, {{  2},{  8}}, {{130},{  8}}, {{ 66},{  8}}, {{194},{  8}},
+{{ 34},{  8}}, {{162},{  8}}, {{ 98},{  8}}, {{226},{  8}}, {{ 18},{  8}},
+{{146},{  8}}, {{ 82},{  8}}, {{210},{  8}}, {{ 50},{  8}}, {{178},{  8}},
+{{114},{  8}}, {{242},{  8}}, {{ 10},{  8}}, {{138},{  8}}, {{ 74},{  8}},
+{{202},{  8}}, {{ 42},{  8}}, {{170},{  8}}, {{106},{  8}}, {{234},{  8}},
+{{ 26},{  8}}, {{154},{  8}}, {{ 90},{  8}}, {{218},{  8}}, {{ 58},{  8}},
+{{186},{  8}}, {{122},{  8}}, {{250},{  8}}, {{  6},{  8}}, {{134},{  8}},
+{{ 70},{  8}}, {{198},{  8}}, {{ 38},{  8}}, {{166},{  8}}, {{102},{  8}},
+{{230},{  8}}, {{ 22},{  8}}, {{150},{  8}}, {{ 86},{  8}}, {{214},{  8}},
+{{ 54},{  8}}, {{182},{  8}}, {{118},{  8}}, {{246},{  8}}, {{ 14},{  8}},
+{{142},{  8}}, {{ 78},{  8}}, {{206},{  8}}, {{ 46},{  8}}, {{174},{  8}},
+{{110},{  8}}, {{238},{  8}}, {{ 30},{  8}}, {{158},{  8}}, {{ 94},{  8}},
+{{222},{  8}}, {{ 62},{  8}}, {{190},{  8}}, {{126},{  8}}, {{254},{  8}},
+{{  1},{  8}}, {{129},{  8}}, {{ 65},{  8}}, {{193},{  8}}, {{ 33},{  8}},
+{{161},{  8}}, {{ 97},{  8}}, {{225},{  8}}, {{ 17},{  8}}, {{145},{  8}},
+{{ 81},{  8}}, {{209},{  8}}, {{ 49},{  8}}, {{177},{  8}}, {{113},{  8}},
+{{241},{  8}}, {{  9},{  8}}, {{137},{  8}}, {{ 73},{  8}}, {{201},{  8}},
+{{ 41},{  8}}, {{169},{  8}}, {{105},{  8}}, {{233},{  8}}, {{ 25},{  8}},
+{{153},{  8}}, {{ 89},{  8}}, {{217},{  8}}, {{ 57},{  8}}, {{185},{  8}},
+{{121},{  8}}, {{249},{  8}}, {{  5},{  8}}, {{133},{  8}}, {{ 69},{  8}},
+{{197},{  8}}, {{ 37},{  8}}, {{165},{  8}}, {{101},{  8}}, {{229},{  8}},
+{{ 21},{  8}}, {{149},{  8}}, {{ 85},{  8}}, {{213},{  8}}, {{ 53},{  8}},
+{{181},{  8}}, {{117},{  8}}, {{245},{  8}}, {{ 13},{  8}}, {{141},{  8}},
+{{ 77},{  8}}, {{205},{  8}}, {{ 45},{  8}}, {{173},{  8}}, {{109},{  8}},
+{{237},{  8}}, {{ 29},{  8}}, {{157},{  8}}, {{ 93},{  8}}, {{221},{  8}},
+{{ 61},{  8}}, {{189},{  8}}, {{125},{  8}}, {{253},{  8}}, {{ 19},{  9}},
+{{275},{  9}}, {{147},{  9}}, {{403},{  9}}, {{ 83},{  9}}, {{339},{  9}},
+{{211},{  9}}, {{467},{  9}}, {{ 51},{  9}}, {{307},{  9}}, {{179},{  9}},
+{{435},{  9}}, {{115},{  9}}, {{371},{  9}}, {{243},{  9}}, {{499},{  9}},
+{{ 11},{  9}}, {{267},{  9}}, {{139},{  9}}, {{395},{  9}}, {{ 75},{  9}},
+{{331},{  9}}, {{203},{  9}}, {{459},{  9}}, {{ 43},{  9}}, {{299},{  9}},
+{{171},{  9}}, {{427},{  9}}, {{107},{  9}}, {{363},{  9}}, {{235},{  9}},
+{{491},{  9}}, {{ 27},{  9}}, {{283},{  9}}, {{155},{  9}}, {{411},{  9}},
+{{ 91},{  9}}, {{347},{  9}}, {{219},{  9}}, {{475},{  9}}, {{ 59},{  9}},
+{{315},{  9}}, {{187},{  9}}, {{443},{  9}}, {{123},{  9}}, {{379},{  9}},
+{{251},{  9}}, {{507},{  9}}, {{  7},{  9}}, {{263},{  9}}, {{135},{  9}},
+{{391},{  9}}, {{ 71},{  9}}, {{327},{  9}}, {{199},{  9}}, {{455},{  9}},
+{{ 39},{  9}}, {{295},{  9}}, {{167},{  9}}, {{423},{  9}}, {{103},{  9}},
+{{359},{  9}}, {{231},{  9}}, {{487},{  9}}, {{ 23},{  9}}, {{279},{  9}},
+{{151},{  9}}, {{407},{  9}}, {{ 87},{  9}}, {{343},{  9}}, {{215},{  9}},
+{{471},{  9}}, {{ 55},{  9}}, {{311},{  9}}, {{183},{  9}}, {{439},{  9}},
+{{119},{  9}}, {{375},{  9}}, {{247},{  9}}, {{503},{  9}}, {{ 15},{  9}},
+{{271},{  9}}, {{143},{  9}}, {{399},{  9}}, {{ 79},{  9}}, {{335},{  9}},
+{{207},{  9}}, {{463},{  9}}, {{ 47},{  9}}, {{303},{  9}}, {{175},{  9}},
+{{431},{  9}}, {{111},{  9}}, {{367},{  9}}, {{239},{  9}}, {{495},{  9}},
+{{ 31},{  9}}, {{287},{  9}}, {{159},{  9}}, {{415},{  9}}, {{ 95},{  9}},
+{{351},{  9}}, {{223},{  9}}, {{479},{  9}}, {{ 63},{  9}}, {{319},{  9}},
+{{191},{  9}}, {{447},{  9}}, {{127},{  9}}, {{383},{  9}}, {{255},{  9}},
+{{511},{  9}}, {{  0},{  7}}, {{ 64},{  7}}, {{ 32},{  7}}, {{ 96},{  7}},
+{{ 16},{  7}}, {{ 80},{  7}}, {{ 48},{  7}}, {{112},{  7}}, {{  8},{  7}},
+{{ 72},{  7}}, {{ 40},{  7}}, {{104},{  7}}, {{ 24},{  7}}, {{ 88},{  7}},
+{{ 56},{  7}}, {{120},{  7}}, {{  4},{  7}}, {{ 68},{  7}}, {{ 36},{  7}},
+{{100},{  7}}, {{ 20},{  7}}, {{ 84},{  7}}, {{ 52},{  7}}, {{116},{  7}},
+{{  3},{  8}}, {{131},{  8}}, {{ 67},{  8}}, {{195},{  8}}, {{ 35},{  8}},
+{{163},{  8}}, {{ 99},{  8}}, {{227},{  8}}
+};
+
+local const ct_data static_dtree[D_CODES] = {
+{{ 0},{ 5}}, {{16},{ 5}}, {{ 8},{ 5}}, {{24},{ 5}}, {{ 4},{ 5}},
+{{20},{ 5}}, {{12},{ 5}}, {{28},{ 5}}, {{ 2},{ 5}}, {{18},{ 5}},
+{{10},{ 5}}, {{26},{ 5}}, {{ 6},{ 5}}, {{22},{ 5}}, {{14},{ 5}},
+{{30},{ 5}}, {{ 1},{ 5}}, {{17},{ 5}}, {{ 9},{ 5}}, {{25},{ 5}},
+{{ 5},{ 5}}, {{21},{ 5}}, {{13},{ 5}}, {{29},{ 5}}, {{ 3},{ 5}},
+{{19},{ 5}}, {{11},{ 5}}, {{27},{ 5}}, {{ 7},{ 5}}, {{23},{ 5}}
+};
+
+const uch _dist_code[DIST_CODE_LEN] = {
+ 0,  1,  2,  3,  4,  4,  5,  5,  6,  6,  6,  6,  7,  7,  7,  7,  8,  8,  8,  8,
+ 8,  8,  8,  8,  9,  9,  9,  9,  9,  9,  9,  9, 10, 10, 10, 10, 10, 10, 10, 10,
+10, 10, 10, 10, 10, 10, 10, 10, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
+11, 11, 11, 11, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12,
+12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 13, 13, 13, 13,
+13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+13, 13, 13, 13, 13, 13, 13, 13, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
+14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
+14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
+14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 15, 15, 15, 15, 15, 15, 15, 15,
+15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
+15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
+15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,  0,  0, 16, 17,
+18, 18, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 22, 22, 22, 22, 22, 22, 22, 22,
+23, 23, 23, 23, 23, 23, 23, 23, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
+24, 24, 24, 24, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
+26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
+26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 27, 27, 27, 27, 27, 27, 27, 27,
+27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27,
+27, 27, 27, 27, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28,
+28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28,
+28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28,
+28, 28, 28, 28, 28, 28, 28, 28, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
+29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
+29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
+29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29
+};
+
+const uch _length_code[MAX_MATCH-MIN_MATCH+1]= {
+ 0,  1,  2,  3,  4,  5,  6,  7,  8,  8,  9,  9, 10, 10, 11, 11, 12, 12, 12, 12,
+13, 13, 13, 13, 14, 14, 14, 14, 15, 15, 15, 15, 16, 16, 16, 16, 16, 16, 16, 16,
+17, 17, 17, 17, 17, 17, 17, 17, 18, 18, 18, 18, 18, 18, 18, 18, 19, 19, 19, 19,
+19, 19, 19, 19, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 22, 22, 22, 22,
+22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 23, 23, 23, 23, 23, 23, 23, 23,
+23, 23, 23, 23, 23, 23, 23, 23, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
+24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
+25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
+25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 26, 26, 26, 26, 26, 26, 26, 26,
+26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
+26, 26, 26, 26, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27,
+27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 28
+};
+
+local const int base_length[LENGTH_CODES] = {
+0, 1, 2, 3, 4, 5, 6, 7, 8, 10, 12, 14, 16, 20, 24, 28, 32, 40, 48, 56,
+64, 80, 96, 112, 128, 160, 192, 224, 0
+};
+
+local const int base_dist[D_CODES] = {
+    0,     1,     2,     3,     4,     6,     8,    12,    16,    24,
+   32,    48,    64,    96,   128,   192,   256,   384,   512,   768,
+ 1024,  1536,  2048,  3072,  4096,  6144,  8192, 12288, 16384, 24576
+};
diff --git a/uppsrc/plugin/z/lib/uncompr.c b/uppsrc/plugin/z/lib/uncompr.c
new file mode 100644
index 000000000..a93440419
--- /dev/null
+++ b/uppsrc/plugin/z/lib/uncompr.c
@@ -0,0 +1,58 @@
+/* uncompr.c -- decompress a memory buffer
+ * Copyright (C) 1995-2002 Jean-loup Gailly.
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/* @(#) $Id: uncompr.c,v 1.1 2005/02/07 00:26:07 rylek Exp $ */
+
+#include "zlib.h"
+
+/* ===========================================================================
+     Decompresses the source buffer into the destination buffer.  sourceLen is
+   the byte length of the source buffer. Upon entry, destLen is the total
+   size of the destination buffer, which must be large enough to hold the
+   entire uncompressed data. (The size of the uncompressed data must have
+   been saved previously by the compressor and transmitted to the decompressor
+   by some mechanism outside the scope of this compression library.)
+   Upon exit, destLen is the actual size of the compressed buffer.
+     This function can be used to decompress a whole file at once if the
+   input file is mmap'ed.
+
+     uncompress returns Z_OK if success, Z_MEM_ERROR if there was not
+   enough memory, Z_BUF_ERROR if there was not enough room in the output
+   buffer, or Z_DATA_ERROR if the input data was corrupted.
+*/
+int ZEXPORT uncompress (dest, destLen, source, sourceLen)
+    Bytef *dest;
+    uLongf *destLen;
+    const Bytef *source;
+    uLong sourceLen;
+{
+    z_stream stream;
+    int err;
+
+    stream.next_in = (Bytef*)source;
+    stream.avail_in = (uInt)sourceLen;
+    /* Check for source > 64K on 16-bit machine: */
+    if ((uLong)stream.avail_in != sourceLen) return Z_BUF_ERROR;
+
+    stream.next_out = dest;
+    stream.avail_out = (uInt)*destLen;
+    if ((uLong)stream.avail_out != *destLen) return Z_BUF_ERROR;
+
+    stream.zalloc = (alloc_func)0;
+    stream.zfree = (free_func)0;
+
+    err = inflateInit(&stream);
+    if (err != Z_OK) return err;
+
+    err = inflate(&stream, Z_FINISH);
+    if (err != Z_STREAM_END) {
+        inflateEnd(&stream);
+        return err == Z_OK ? Z_BUF_ERROR : err;
+    }
+    *destLen = stream.total_out;
+
+    err = inflateEnd(&stream);
+    return err;
+}
diff --git a/uppsrc/plugin/z/lib/zconf.h b/uppsrc/plugin/z/lib/zconf.h
new file mode 100644
index 000000000..4fde7eb64
--- /dev/null
+++ b/uppsrc/plugin/z/lib/zconf.h
@@ -0,0 +1,279 @@
+/* zconf.h -- configuration of the zlib compression library
+ * Copyright (C) 1995-2002 Jean-loup Gailly.
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/* @(#) $Id: zconf.h,v 1.1 2005/02/07 00:26:07 rylek Exp $ */
+
+#ifndef _ZCONF_H
+#define _ZCONF_H
+
+/*
+ * If you *really* need a unique prefix for all types and library functions,
+ * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it.
+ */
+#ifdef Z_PREFIX
+#  define deflateInit_	z_deflateInit_
+#  define deflate	z_deflate
+#  define deflateEnd	z_deflateEnd
+#  define inflateInit_ 	z_inflateInit_
+#  define inflate	z_inflate
+#  define inflateEnd	z_inflateEnd
+#  define deflateInit2_	z_deflateInit2_
+#  define deflateSetDictionary z_deflateSetDictionary
+#  define deflateCopy	z_deflateCopy
+#  define deflateReset	z_deflateReset
+#  define deflateParams	z_deflateParams
+#  define inflateInit2_	z_inflateInit2_
+#  define inflateSetDictionary z_inflateSetDictionary
+#  define inflateSync	z_inflateSync
+#  define inflateSyncPoint z_inflateSyncPoint
+#  define inflateReset	z_inflateReset
+#  define compress	z_compress
+#  define compress2	z_compress2
+#  define uncompress	z_uncompress
+#  define adler32	z_adler32
+#  define crc32		z_crc32
+#  define get_crc_table z_get_crc_table
+
+#  define Byte		z_Byte
+#  define uInt		z_uInt
+#  define uLong		z_uLong
+#  define Bytef	        z_Bytef
+#  define charf		z_charf
+#  define intf		z_intf
+#  define uIntf		z_uIntf
+#  define uLongf	z_uLongf
+#  define voidpf	z_voidpf
+#  define voidp		z_voidp
+#endif
+
+#if (defined(_WIN32) || defined(__WIN32__)) && !defined(WIN32)
+#  define WIN32
+#endif
+#if defined(__GNUC__) || defined(WIN32) || defined(__386__) || defined(i386)
+#  ifndef __32BIT__
+#    define __32BIT__
+#  endif
+#endif
+#if defined(__MSDOS__) && !defined(MSDOS)
+#  define MSDOS
+#endif
+
+/*
+ * Compile with -DMAXSEG_64K if the alloc function cannot allocate more
+ * than 64k bytes at a time (needed on systems with 16-bit int).
+ */
+#if defined(MSDOS) && !defined(__32BIT__)
+#  define MAXSEG_64K
+#endif
+#ifdef MSDOS
+#  define UNALIGNED_OK
+#endif
+
+#if (defined(MSDOS) || defined(_WINDOWS) || defined(WIN32))  && !defined(STDC)
+#  define STDC
+#endif
+#if defined(__STDC__) || defined(__cplusplus) || defined(__OS2__)
+#  ifndef STDC
+#    define STDC
+#  endif
+#endif
+
+#ifndef STDC
+#  ifndef const /* cannot use !defined(STDC) && !defined(const) on Mac */
+#    define const
+#  endif
+#endif
+
+/* Some Mac compilers merge all .h files incorrectly: */
+#if defined(__MWERKS__) || defined(applec) ||defined(THINK_C) ||defined(__SC__)
+#  define NO_DUMMY_DECL
+#endif
+
+/* Old Borland C incorrectly complains about missing returns: */
+#if defined(__BORLANDC__) && (__BORLANDC__ < 0x500)
+#  define NEED_DUMMY_RETURN
+#endif
+
+
+/* Maximum value for memLevel in deflateInit2 */
+#ifndef MAX_MEM_LEVEL
+#  ifdef MAXSEG_64K
+#    define MAX_MEM_LEVEL 8
+#  else
+#    define MAX_MEM_LEVEL 9
+#  endif
+#endif
+
+/* Maximum value for windowBits in deflateInit2 and inflateInit2.
+ * WARNING: reducing MAX_WBITS makes minigzip unable to extract .gz files
+ * created by gzip. (Files created by minigzip can still be extracted by
+ * gzip.)
+ */
+#ifndef MAX_WBITS
+#  define MAX_WBITS   15 /* 32K LZ77 window */
+#endif
+
+/* The memory requirements for deflate are (in bytes):
+            (1 << (windowBits+2)) +  (1 << (memLevel+9))
+ that is: 128K for windowBits=15  +  128K for memLevel = 8  (default values)
+ plus a few kilobytes for small objects. For example, if you want to reduce
+ the default memory requirements from 256K to 128K, compile with
+     make CFLAGS="-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7"
+ Of course this will generally degrade compression (there's no free lunch).
+
+   The memory requirements for inflate are (in bytes) 1 << windowBits
+ that is, 32K for windowBits=15 (default value) plus a few kilobytes
+ for small objects.
+*/
+
+                        /* Type declarations */
+
+#ifndef OF /* function prototypes */
+#  ifdef STDC
+#    define OF(args)  args
+#  else
+#    define OF(args)  ()
+#  endif
+#endif
+
+/* The following definitions for FAR are needed only for MSDOS mixed
+ * model programming (small or medium model with some far allocations).
+ * This was tested only with MSC; for other MSDOS compilers you may have
+ * to define NO_MEMCPY in zutil.h.  If you don't need the mixed model,
+ * just define FAR to be empty.
+ */
+#if (defined(M_I86SM) || defined(M_I86MM)) && !defined(__32BIT__)
+   /* MSC small or medium model */
+#  define SMALL_MEDIUM
+#  ifdef _MSC_VER
+#    define FAR _far
+#  else
+#    define FAR far
+#  endif
+#endif
+#if defined(__BORLANDC__) && (defined(__SMALL__) || defined(__MEDIUM__))
+#  ifndef __32BIT__
+#    define SMALL_MEDIUM
+#    define FAR _far
+#  endif
+#endif
+
+/* Compile with -DZLIB_DLL for Windows DLL support */
+#if defined(ZLIB_DLL)
+#  if defined(_WINDOWS) || defined(WINDOWS)
+#    ifdef FAR
+#      undef FAR
+#    endif
+#    include <windows.h>
+#    define ZEXPORT  WINAPI
+#    ifdef WIN32
+#      define ZEXPORTVA  WINAPIV
+#    else
+#      define ZEXPORTVA  FAR _cdecl _export
+#    endif
+#  endif
+#  if defined (__BORLANDC__)
+#    if (__BORLANDC__ >= 0x0500) && defined (WIN32)
+#      include <windows.h>
+#      define ZEXPORT __declspec(dllexport) WINAPI
+#      define ZEXPORTRVA __declspec(dllexport) WINAPIV
+#    else
+#      if defined (_Windows) && defined (__DLL__)
+#        define ZEXPORT _export
+#        define ZEXPORTVA _export
+#      endif
+#    endif
+#  endif
+#endif
+
+#if defined (__BEOS__)
+#  if defined (ZLIB_DLL)
+#    define ZEXTERN extern __declspec(dllexport)
+#  else
+#    define ZEXTERN extern __declspec(dllimport)
+#  endif
+#endif
+
+#ifndef ZEXPORT
+#  define ZEXPORT
+#endif
+#ifndef ZEXPORTVA
+#  define ZEXPORTVA
+#endif
+#ifndef ZEXTERN
+#  define ZEXTERN extern
+#endif
+
+#ifndef FAR
+#   define FAR
+#endif
+
+#if !defined(MACOS) && !defined(TARGET_OS_MAC)
+typedef unsigned char  Byte;  /* 8 bits */
+#endif
+typedef unsigned int   uInt;  /* 16 bits or more */
+typedef unsigned long  uLong; /* 32 bits or more */
+
+#ifdef SMALL_MEDIUM
+   /* Borland C/C++ and some old MSC versions ignore FAR inside typedef */
+#  define Bytef Byte FAR
+#else
+   typedef Byte  FAR Bytef;
+#endif
+typedef char  FAR charf;
+typedef int   FAR intf;
+typedef uInt  FAR uIntf;
+typedef uLong FAR uLongf;
+
+#ifdef STDC
+   typedef void FAR *voidpf;
+   typedef void     *voidp;
+#else
+   typedef Byte FAR *voidpf;
+   typedef Byte     *voidp;
+#endif
+
+#ifdef HAVE_UNISTD_H
+#  include <sys/types.h> /* for off_t */
+#  include <unistd.h>    /* for SEEK_* and off_t */
+#  define z_off_t  off_t
+#endif
+#ifndef SEEK_SET
+#  define SEEK_SET        0       /* Seek from beginning of file.  */
+#  define SEEK_CUR        1       /* Seek from current position.  */
+#  define SEEK_END        2       /* Set file pointer to EOF plus "offset" */
+#endif
+#ifndef z_off_t
+#  define  z_off_t long
+#endif
+
+/* MVS linker does not support external names larger than 8 bytes */
+#if defined(__MVS__)
+#   pragma map(deflateInit_,"DEIN")
+#   pragma map(deflateInit2_,"DEIN2")
+#   pragma map(deflateEnd,"DEEND")
+#   pragma map(inflateInit_,"ININ")
+#   pragma map(inflateInit2_,"ININ2")
+#   pragma map(inflateEnd,"INEND")
+#   pragma map(inflateSync,"INSY")
+#   pragma map(inflateSetDictionary,"INSEDI")
+#   pragma map(inflate_blocks,"INBL")
+#   pragma map(inflate_blocks_new,"INBLNE")
+#   pragma map(inflate_blocks_free,"INBLFR")
+#   pragma map(inflate_blocks_reset,"INBLRE")
+#   pragma map(inflate_codes_free,"INCOFR")
+#   pragma map(inflate_codes,"INCO")
+#   pragma map(inflate_fast,"INFA")
+#   pragma map(inflate_flush,"INFLU")
+#   pragma map(inflate_mask,"INMA")
+#   pragma map(inflate_set_dictionary,"INSEDI2")
+#   pragma map(inflate_copyright,"INCOPY")
+#   pragma map(inflate_trees_bits,"INTRBI")
+#   pragma map(inflate_trees_dynamic,"INTRDY")
+#   pragma map(inflate_trees_fixed,"INTRFI")
+#   pragma map(inflate_trees_free,"INTRFR")
+#endif
+
+#endif /* _ZCONF_H */
diff --git a/uppsrc/plugin/z/lib/zlib.h b/uppsrc/plugin/z/lib/zlib.h
new file mode 100644
index 000000000..aefea316b
--- /dev/null
+++ b/uppsrc/plugin/z/lib/zlib.h
@@ -0,0 +1,894 @@
+/* zlib.h -- interface of the 'zlib' general purpose compression library
+  version 1.1.4, March 11th, 2002
+
+  Copyright (C) 1995-2002 Jean-loup Gailly and Mark Adler
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  Jean-loup Gailly        Mark Adler
+  jloup@gzip.org          madler@alumni.caltech.edu
+
+
+  The data format used by the zlib library is described by RFCs (Request for
+  Comments) 1950 to 1952 in the files ftp://ds.internic.net/rfc/rfc1950.txt
+  (zlib format), rfc1951.txt (deflate format) and rfc1952.txt (gzip format).
+*/
+
+#ifndef _ZLIB_H
+#define _ZLIB_H
+
+#include "zconf.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define ZLIB_VERSION "1.1.4"
+
+/*
+     The 'zlib' compression library provides in-memory compression and
+  decompression functions, including integrity checks of the uncompressed
+  data.  This version of the library supports only one compression method
+  (deflation) but other algorithms will be added later and will have the same
+  stream interface.
+
+     Compression can be done in a single step if the buffers are large
+  enough (for example if an input file is mmap'ed), or can be done by
+  repeated calls of the compression function.  In the latter case, the
+  application must provide more input and/or consume the output
+  (providing more output space) before each call.
+
+     The library also supports reading and writing files in gzip (.gz) format
+  with an interface similar to that of stdio.
+
+     The library does not install any signal handler. The decoder checks
+  the consistency of the compressed data, so the library should never
+  crash even in case of corrupted input.
+*/
+
+typedef voidpf (*alloc_func) OF((voidpf opaque, uInt items, uInt size));
+typedef void   (*free_func)  OF((voidpf opaque, voidpf address));
+
+struct internal_state;
+
+typedef struct z_stream_s {
+    Bytef    *next_in;  /* next input byte */
+    uInt     avail_in;  /* number of bytes available at next_in */
+    uLong    total_in;  /* total nb of input bytes read so far */
+
+    Bytef    *next_out; /* next output byte should be put there */
+    uInt     avail_out; /* remaining free space at next_out */
+    uLong    total_out; /* total nb of bytes output so far */
+
+    char     *msg;      /* last error message, NULL if no error */
+    struct internal_state FAR *state; /* not visible by applications */
+
+    alloc_func zalloc;  /* used to allocate the internal state */
+    free_func  zfree;   /* used to free the internal state */
+    voidpf     opaque;  /* private data object passed to zalloc and zfree */
+
+    int     data_type;  /* best guess about the data type: ascii or binary */
+    uLong   adler;      /* adler32 value of the uncompressed data */
+    uLong   reserved;   /* reserved for future use */
+} z_stream;
+
+typedef z_stream FAR *z_streamp;
+
+/*
+   The application must update next_in and avail_in when avail_in has
+   dropped to zero. It must update next_out and avail_out when avail_out
+   has dropped to zero. The application must initialize zalloc, zfree and
+   opaque before calling the init function. All other fields are set by the
+   compression library and must not be updated by the application.
+
+   The opaque value provided by the application will be passed as the first
+   parameter for calls of zalloc and zfree. This can be useful for custom
+   memory management. The compression library attaches no meaning to the
+   opaque value.
+
+   zalloc must return Z_NULL if there is not enough memory for the object.
+   If zlib is used in a multi-threaded application, zalloc and zfree must be
+   thread safe.
+
+   On 16-bit systems, the functions zalloc and zfree must be able to allocate
+   exactly 65536 bytes, but will not be required to allocate more than this
+   if the symbol MAXSEG_64K is defined (see zconf.h). WARNING: On MSDOS,
+   pointers returned by zalloc for objects of exactly 65536 bytes *must*
+   have their offset normalized to zero. The default allocation function
+   provided by this library ensures this (see zutil.c). To reduce memory
+   requirements and avoid any allocation of 64K objects, at the expense of
+   compression ratio, compile the library with -DMAX_WBITS=14 (see zconf.h).
+
+   The fields total_in and total_out can be used for statistics or
+   progress reports. After compression, total_in holds the total size of
+   the uncompressed data and may be saved for use in the decompressor
+   (particularly if the decompressor wants to decompress everything in
+   a single step).
+*/
+
+                        /* constants */
+
+#define Z_NO_FLUSH      0
+#define Z_PARTIAL_FLUSH 1 /* will be removed, use Z_SYNC_FLUSH instead */
+#define Z_SYNC_FLUSH    2
+#define Z_FULL_FLUSH    3
+#define Z_FINISH        4
+/* Allowed flush values; see deflate() below for details */
+
+#define Z_OK            0
+#define Z_STREAM_END    1
+#define Z_NEED_DICT     2
+#define Z_ERRNO        (-1)
+#define Z_STREAM_ERROR (-2)
+#define Z_DATA_ERROR   (-3)
+#define Z_MEM_ERROR    (-4)
+#define Z_BUF_ERROR    (-5)
+#define Z_VERSION_ERROR (-6)
+/* Return codes for the compression/decompression functions. Negative
+ * values are errors, positive values are used for special but normal events.
+ */
+
+#define Z_NO_COMPRESSION         0
+#define Z_BEST_SPEED             1
+#define Z_BEST_COMPRESSION       9
+#define Z_DEFAULT_COMPRESSION  (-1)
+/* compression levels */
+
+#define Z_FILTERED            1
+#define Z_HUFFMAN_ONLY        2
+#define Z_DEFAULT_STRATEGY    0
+/* compression strategy; see deflateInit2() below for details */
+
+#define Z_BINARY   0
+#define Z_ASCII    1
+#define Z_UNKNOWN  2
+/* Possible values of the data_type field */
+
+#define Z_DEFLATED   8
+/* The deflate compression method (the only one supported in this version) */
+
+#define Z_NULL  0  /* for initializing zalloc, zfree, opaque */
+
+#define zlib_version zlibVersion()
+/* for compatibility with versions < 1.0.2 */
+
+                        /* basic functions */
+
+ZEXTERN const char * ZEXPORT zlibVersion OF((void));
+/* The application can compare zlibVersion and ZLIB_VERSION for consistency.
+   If the first character differs, the library code actually used is
+   not compatible with the zlib.h header file used by the application.
+   This check is automatically made by deflateInit and inflateInit.
+ */
+
+/*
+ZEXTERN int ZEXPORT deflateInit OF((z_streamp strm, int level));
+
+     Initializes the internal stream state for compression. The fields
+   zalloc, zfree and opaque must be initialized before by the caller.
+   If zalloc and zfree are set to Z_NULL, deflateInit updates them to
+   use default allocation functions.
+
+     The compression level must be Z_DEFAULT_COMPRESSION, or between 0 and 9:
+   1 gives best speed, 9 gives best compression, 0 gives no compression at
+   all (the input data is simply copied a block at a time).
+   Z_DEFAULT_COMPRESSION requests a default compromise between speed and
+   compression (currently equivalent to level 6).
+
+     deflateInit returns Z_OK if success, Z_MEM_ERROR if there was not
+   enough memory, Z_STREAM_ERROR if level is not a valid compression level,
+   Z_VERSION_ERROR if the zlib library version (zlib_version) is incompatible
+   with the version assumed by the caller (ZLIB_VERSION).
+   msg is set to null if there is no error message.  deflateInit does not
+   perform any compression: this will be done by deflate().
+*/
+
+
+ZEXTERN int ZEXPORT deflate OF((z_streamp strm, int flush));
+/*
+    deflate compresses as much data as possible, and stops when the input
+  buffer becomes empty or the output buffer becomes full. It may introduce some
+  output latency (reading input without producing any output) except when
+  forced to flush.
+
+    The detailed semantics are as follows. deflate performs one or both of the
+  following actions:
+
+  - Compress more input starting at next_in and update next_in and avail_in
+    accordingly. If not all input can be processed (because there is not
+    enough room in the output buffer), next_in and avail_in are updated and
+    processing will resume at this point for the next call of deflate().
+
+  - Provide more output starting at next_out and update next_out and avail_out
+    accordingly. This action is forced if the parameter flush is non zero.
+    Forcing flush frequently degrades the compression ratio, so this parameter
+    should be set only when necessary (in interactive applications).
+    Some output may be provided even if flush is not set.
+
+  Before the call of deflate(), the application should ensure that at least
+  one of the actions is possible, by providing more input and/or consuming
+  more output, and updating avail_in or avail_out accordingly; avail_out
+  should never be zero before the call. The application can consume the
+  compressed output when it wants, for example when the output buffer is full
+  (avail_out == 0), or after each call of deflate(). If deflate returns Z_OK
+  and with zero avail_out, it must be called again after making room in the
+  output buffer because there might be more output pending.
+
+    If the parameter flush is set to Z_SYNC_FLUSH, all pending output is
+  flushed to the output buffer and the output is aligned on a byte boundary, so
+  that the decompressor can get all input data available so far. (In particular
+  avail_in is zero after the call if enough output space has been provided
+  before the call.)  Flushing may degrade compression for some compression
+  algorithms and so it should be used only when necessary.
+
+    If flush is set to Z_FULL_FLUSH, all output is flushed as with
+  Z_SYNC_FLUSH, and the compression state is reset so that decompression can
+  restart from this point if previous compressed data has been damaged or if
+  random access is desired. Using Z_FULL_FLUSH too often can seriously degrade
+  the compression.
+
+    If deflate returns with avail_out == 0, this function must be called again
+  with the same value of the flush parameter and more output space (updated
+  avail_out), until the flush is complete (deflate returns with non-zero
+  avail_out).
+
+    If the parameter flush is set to Z_FINISH, pending input is processed,
+  pending output is flushed and deflate returns with Z_STREAM_END if there
+  was enough output space; if deflate returns with Z_OK, this function must be
+  called again with Z_FINISH and more output space (updated avail_out) but no
+  more input data, until it returns with Z_STREAM_END or an error. After
+  deflate has returned Z_STREAM_END, the only possible operations on the
+  stream are deflateReset or deflateEnd.
+
+    Z_FINISH can be used immediately after deflateInit if all the compression
+  is to be done in a single step. In this case, avail_out must be at least
+  0.1% larger than avail_in plus 12 bytes.  If deflate does not return
+  Z_STREAM_END, then it must be called again as described above.
+
+    deflate() sets strm->adler to the adler32 checksum of all input read
+  so far (that is, total_in bytes).
+
+    deflate() may update data_type if it can make a good guess about
+  the input data type (Z_ASCII or Z_BINARY). In doubt, the data is considered
+  binary. This field is only for information purposes and does not affect
+  the compression algorithm in any manner.
+
+    deflate() returns Z_OK if some progress has been made (more input
+  processed or more output produced), Z_STREAM_END if all input has been
+  consumed and all output has been produced (only when flush is set to
+  Z_FINISH), Z_STREAM_ERROR if the stream state was inconsistent (for example
+  if next_in or next_out was NULL), Z_BUF_ERROR if no progress is possible
+  (for example avail_in or avail_out was zero).
+*/
+
+
+ZEXTERN int ZEXPORT deflateEnd OF((z_streamp strm));
+/*
+     All dynamically allocated data structures for this stream are freed.
+   This function discards any unprocessed input and does not flush any
+   pending output.
+
+     deflateEnd returns Z_OK if success, Z_STREAM_ERROR if the
+   stream state was inconsistent, Z_DATA_ERROR if the stream was freed
+   prematurely (some input or output was discarded). In the error case,
+   msg may be set but then points to a static string (which must not be
+   deallocated).
+*/
+
+
+/*
+ZEXTERN int ZEXPORT inflateInit OF((z_streamp strm));
+
+     Initializes the internal stream state for decompression. The fields
+   next_in, avail_in, zalloc, zfree and opaque must be initialized before by
+   the caller. If next_in is not Z_NULL and avail_in is large enough (the exact
+   value depends on the compression method), inflateInit determines the
+   compression method from the zlib header and allocates all data structures
+   accordingly; otherwise the allocation will be deferred to the first call of
+   inflate.  If zalloc and zfree are set to Z_NULL, inflateInit updates them to
+   use default allocation functions.
+
+     inflateInit returns Z_OK if success, Z_MEM_ERROR if there was not enough
+   memory, Z_VERSION_ERROR if the zlib library version is incompatible with the
+   version assumed by the caller.  msg is set to null if there is no error
+   message. inflateInit does not perform any decompression apart from reading
+   the zlib header if present: this will be done by inflate().  (So next_in and
+   avail_in may be modified, but next_out and avail_out are unchanged.)
+*/
+
+
+ZEXTERN int ZEXPORT inflate OF((z_streamp strm, int flush));
+/*
+    inflate decompresses as much data as possible, and stops when the input
+  buffer becomes empty or the output buffer becomes full. It may some
+  introduce some output latency (reading input without producing any output)
+  except when forced to flush.
+
+  The detailed semantics are as follows. inflate performs one or both of the
+  following actions:
+
+  - Decompress more input starting at next_in and update next_in and avail_in
+    accordingly. If not all input can be processed (because there is not
+    enough room in the output buffer), next_in is updated and processing
+    will resume at this point for the next call of inflate().
+
+  - Provide more output starting at next_out and update next_out and avail_out
+    accordingly.  inflate() provides as much output as possible, until there
+    is no more input data or no more space in the output buffer (see below
+    about the flush parameter).
+
+  Before the call of inflate(), the application should ensure that at least
+  one of the actions is possible, by providing more input and/or consuming
+  more output, and updating the next_* and avail_* values accordingly.
+  The application can consume the uncompressed output when it wants, for
+  example when the output buffer is full (avail_out == 0), or after each
+  call of inflate(). If inflate returns Z_OK and with zero avail_out, it
+  must be called again after making room in the output buffer because there
+  might be more output pending.
+
+    If the parameter flush is set to Z_SYNC_FLUSH, inflate flushes as much
+  output as possible to the output buffer. The flushing behavior of inflate is
+  not specified for values of the flush parameter other than Z_SYNC_FLUSH
+  and Z_FINISH, but the current implementation actually flushes as much output
+  as possible anyway.
+
+    inflate() should normally be called until it returns Z_STREAM_END or an
+  error. However if all decompression is to be performed in a single step
+  (a single call of inflate), the parameter flush should be set to
+  Z_FINISH. In this case all pending input is processed and all pending
+  output is flushed; avail_out must be large enough to hold all the
+  uncompressed data. (The size of the uncompressed data may have been saved
+  by the compressor for this purpose.) The next operation on this stream must
+  be inflateEnd to deallocate the decompression state. The use of Z_FINISH
+  is never required, but can be used to inform inflate that a faster routine
+  may be used for the single inflate() call.
+
+     If a preset dictionary is needed at this point (see inflateSetDictionary
+  below), inflate sets strm-adler to the adler32 checksum of the
+  dictionary chosen by the compressor and returns Z_NEED_DICT; otherwise
+  it sets strm->adler to the adler32 checksum of all output produced
+  so far (that is, total_out bytes) and returns Z_OK, Z_STREAM_END or
+  an error code as described below. At the end of the stream, inflate()
+  checks that its computed adler32 checksum is equal to that saved by the
+  compressor and returns Z_STREAM_END only if the checksum is correct.
+
+    inflate() returns Z_OK if some progress has been made (more input processed
+  or more output produced), Z_STREAM_END if the end of the compressed data has
+  been reached and all uncompressed output has been produced, Z_NEED_DICT if a
+  preset dictionary is needed at this point, Z_DATA_ERROR if the input data was
+  corrupted (input stream not conforming to the zlib format or incorrect
+  adler32 checksum), Z_STREAM_ERROR if the stream structure was inconsistent
+  (for example if next_in or next_out was NULL), Z_MEM_ERROR if there was not
+  enough memory, Z_BUF_ERROR if no progress is possible or if there was not
+  enough room in the output buffer when Z_FINISH is used. In the Z_DATA_ERROR
+  case, the application may then call inflateSync to look for a good
+  compression block.
+*/
+
+
+ZEXTERN int ZEXPORT inflateEnd OF((z_streamp strm));
+/*
+     All dynamically allocated data structures for this stream are freed.
+   This function discards any unprocessed input and does not flush any
+   pending output.
+
+     inflateEnd returns Z_OK if success, Z_STREAM_ERROR if the stream state
+   was inconsistent. In the error case, msg may be set but then points to a
+   static string (which must not be deallocated).
+*/
+
+                        /* Advanced functions */
+
+/*
+    The following functions are needed only in some special applications.
+*/
+
+/*
+ZEXTERN int ZEXPORT deflateInit2 OF((z_streamp strm,
+                                     int  level,
+                                     int  method,
+                                     int  windowBits,
+                                     int  memLevel,
+                                     int  strategy));
+
+     This is another version of deflateInit with more compression options. The
+   fields next_in, zalloc, zfree and opaque must be initialized before by
+   the caller.
+
+     The method parameter is the compression method. It must be Z_DEFLATED in
+   this version of the library.
+
+     The windowBits parameter is the base two logarithm of the window size
+   (the size of the history buffer).  It should be in the range 8..15 for this
+   version of the library. Larger values of this parameter result in better
+   compression at the expense of memory usage. The default value is 15 if
+   deflateInit is used instead.
+
+     The memLevel parameter specifies how much memory should be allocated
+   for the internal compression state. memLevel=1 uses minimum memory but
+   is slow and reduces compression ratio; memLevel=9 uses maximum memory
+   for optimal speed. The default value is 8. See zconf.h for total memory
+   usage as a function of windowBits and memLevel.
+
+     The strategy parameter is used to tune the compression algorithm. Use the
+   value Z_DEFAULT_STRATEGY for normal data, Z_FILTERED for data produced by a
+   filter (or predictor), or Z_HUFFMAN_ONLY to force Huffman encoding only (no
+   string match).  Filtered data consists mostly of small values with a
+   somewhat random distribution. In this case, the compression algorithm is
+   tuned to compress them better. The effect of Z_FILTERED is to force more
+   Huffman coding and less string matching; it is somewhat intermediate
+   between Z_DEFAULT and Z_HUFFMAN_ONLY. The strategy parameter only affects
+   the compression ratio but not the correctness of the compressed output even
+   if it is not set appropriately.
+
+      deflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
+   memory, Z_STREAM_ERROR if a parameter is invalid (such as an invalid
+   method). msg is set to null if there is no error message.  deflateInit2 does
+   not perform any compression: this will be done by deflate().
+*/
+
+ZEXTERN int ZEXPORT deflateSetDictionary OF((z_streamp strm,
+                                             const Bytef *dictionary,
+                                             uInt  dictLength));
+/*
+     Initializes the compression dictionary from the given byte sequence
+   without producing any compressed output. This function must be called
+   immediately after deflateInit, deflateInit2 or deflateReset, before any
+   call of deflate. The compressor and decompressor must use exactly the same
+   dictionary (see inflateSetDictionary).
+
+     The dictionary should consist of strings (byte sequences) that are likely
+   to be encountered later in the data to be compressed, with the most commonly
+   used strings preferably put towards the end of the dictionary. Using a
+   dictionary is most useful when the data to be compressed is short and can be
+   predicted with good accuracy; the data can then be compressed better than
+   with the default empty dictionary.
+
+     Depending on the size of the compression data structures selected by
+   deflateInit or deflateInit2, a part of the dictionary may in effect be
+   discarded, for example if the dictionary is larger than the window size in
+   deflate or deflate2. Thus the strings most likely to be useful should be
+   put at the end of the dictionary, not at the front.
+
+     Upon return of this function, strm->adler is set to the Adler32 value
+   of the dictionary; the decompressor may later use this value to determine
+   which dictionary has been used by the compressor. (The Adler32 value
+   applies to the whole dictionary even if only a subset of the dictionary is
+   actually used by the compressor.)
+
+     deflateSetDictionary returns Z_OK if success, or Z_STREAM_ERROR if a
+   parameter is invalid (such as NULL dictionary) or the stream state is
+   inconsistent (for example if deflate has already been called for this stream
+   or if the compression method is bsort). deflateSetDictionary does not
+   perform any compression: this will be done by deflate().
+*/
+
+ZEXTERN int ZEXPORT deflateCopy OF((z_streamp dest,
+                                    z_streamp source));
+/*
+     Sets the destination stream as a complete copy of the source stream.
+
+     This function can be useful when several compression strategies will be
+   tried, for example when there are several ways of pre-processing the input
+   data with a filter. The streams that will be discarded should then be freed
+   by calling deflateEnd.  Note that deflateCopy duplicates the internal
+   compression state which can be quite large, so this strategy is slow and
+   can consume lots of memory.
+
+     deflateCopy returns Z_OK if success, Z_MEM_ERROR if there was not
+   enough memory, Z_STREAM_ERROR if the source stream state was inconsistent
+   (such as zalloc being NULL). msg is left unchanged in both source and
+   destination.
+*/
+
+ZEXTERN int ZEXPORT deflateReset OF((z_streamp strm));
+/*
+     This function is equivalent to deflateEnd followed by deflateInit,
+   but does not free and reallocate all the internal compression state.
+   The stream will keep the same compression level and any other attributes
+   that may have been set by deflateInit2.
+
+      deflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source
+   stream state was inconsistent (such as zalloc or state being NULL).
+*/
+
+ZEXTERN int ZEXPORT deflateParams OF((z_streamp strm,
+				      int level,
+				      int strategy));
+/*
+     Dynamically update the compression level and compression strategy.  The
+   interpretation of level and strategy is as in deflateInit2.  This can be
+   used to switch between compression and straight copy of the input data, or
+   to switch to a different kind of input data requiring a different
+   strategy. If the compression level is changed, the input available so far
+   is compressed with the old level (and may be flushed); the new level will
+   take effect only at the next call of deflate().
+
+     Before the call of deflateParams, the stream state must be set as for
+   a call of deflate(), since the currently available input may have to
+   be compressed and flushed. In particular, strm->avail_out must be non-zero.
+
+     deflateParams returns Z_OK if success, Z_STREAM_ERROR if the source
+   stream state was inconsistent or if a parameter was invalid, Z_BUF_ERROR
+   if strm->avail_out was zero.
+*/
+
+/*
+ZEXTERN int ZEXPORT inflateInit2 OF((z_streamp strm,
+                                     int  windowBits));
+
+     This is another version of inflateInit with an extra parameter. The
+   fields next_in, avail_in, zalloc, zfree and opaque must be initialized
+   before by the caller.
+
+     The windowBits parameter is the base two logarithm of the maximum window
+   size (the size of the history buffer).  It should be in the range 8..15 for
+   this version of the library. The default value is 15 if inflateInit is used
+   instead. If a compressed stream with a larger window size is given as
+   input, inflate() will return with the error code Z_DATA_ERROR instead of
+   trying to allocate a larger window.
+
+      inflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
+   memory, Z_STREAM_ERROR if a parameter is invalid (such as a negative
+   memLevel). msg is set to null if there is no error message.  inflateInit2
+   does not perform any decompression apart from reading the zlib header if
+   present: this will be done by inflate(). (So next_in and avail_in may be
+   modified, but next_out and avail_out are unchanged.)
+*/
+
+ZEXTERN int ZEXPORT inflateSetDictionary OF((z_streamp strm,
+                                             const Bytef *dictionary,
+                                             uInt  dictLength));
+/*
+     Initializes the decompression dictionary from the given uncompressed byte
+   sequence. This function must be called immediately after a call of inflate
+   if this call returned Z_NEED_DICT. The dictionary chosen by the compressor
+   can be determined from the Adler32 value returned by this call of
+   inflate. The compressor and decompressor must use exactly the same
+   dictionary (see deflateSetDictionary).
+
+     inflateSetDictionary returns Z_OK if success, Z_STREAM_ERROR if a
+   parameter is invalid (such as NULL dictionary) or the stream state is
+   inconsistent, Z_DATA_ERROR if the given dictionary doesn't match the
+   expected one (incorrect Adler32 value). inflateSetDictionary does not
+   perform any decompression: this will be done by subsequent calls of
+   inflate().
+*/
+
+ZEXTERN int ZEXPORT inflateSync OF((z_streamp strm));
+/*
+    Skips invalid compressed data until a full flush point (see above the
+  description of deflate with Z_FULL_FLUSH) can be found, or until all
+  available input is skipped. No output is provided.
+
+    inflateSync returns Z_OK if a full flush point has been found, Z_BUF_ERROR
+  if no more input was provided, Z_DATA_ERROR if no flush point has been found,
+  or Z_STREAM_ERROR if the stream structure was inconsistent. In the success
+  case, the application may save the current current value of total_in which
+  indicates where valid compressed data was found. In the error case, the
+  application may repeatedly call inflateSync, providing more input each time,
+  until success or end of the input data.
+*/
+
+ZEXTERN int ZEXPORT inflateReset OF((z_streamp strm));
+/*
+     This function is equivalent to inflateEnd followed by inflateInit,
+   but does not free and reallocate all the internal decompression state.
+   The stream will keep attributes that may have been set by inflateInit2.
+
+      inflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source
+   stream state was inconsistent (such as zalloc or state being NULL).
+*/
+
+
+                        /* utility functions */
+
+/*
+     The following utility functions are implemented on top of the
+   basic stream-oriented functions. To simplify the interface, some
+   default options are assumed (compression level and memory usage,
+   standard memory allocation functions). The source code of these
+   utility functions can easily be modified if you need special options.
+*/
+
+ZEXTERN int ZEXPORT compress OF((Bytef *dest,   uLongf *destLen,
+                                 const Bytef *source, uLong sourceLen));
+/*
+     Compresses the source buffer into the destination buffer.  sourceLen is
+   the byte length of the source buffer. Upon entry, destLen is the total
+   size of the destination buffer, which must be at least 0.1% larger than
+   sourceLen plus 12 bytes. Upon exit, destLen is the actual size of the
+   compressed buffer.
+     This function can be used to compress a whole file at once if the
+   input file is mmap'ed.
+     compress returns Z_OK if success, Z_MEM_ERROR if there was not
+   enough memory, Z_BUF_ERROR if there was not enough room in the output
+   buffer.
+*/
+
+ZEXTERN int ZEXPORT compress2 OF((Bytef *dest,   uLongf *destLen,
+                                  const Bytef *source, uLong sourceLen,
+                                  int level));
+/*
+     Compresses the source buffer into the destination buffer. The level
+   parameter has the same meaning as in deflateInit.  sourceLen is the byte
+   length of the source buffer. Upon entry, destLen is the total size of the
+   destination buffer, which must be at least 0.1% larger than sourceLen plus
+   12 bytes. Upon exit, destLen is the actual size of the compressed buffer.
+
+     compress2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
+   memory, Z_BUF_ERROR if there was not enough room in the output buffer,
+   Z_STREAM_ERROR if the level parameter is invalid.
+*/
+
+ZEXTERN int ZEXPORT uncompress OF((Bytef *dest,   uLongf *destLen,
+                                   const Bytef *source, uLong sourceLen));
+/*
+     Decompresses the source buffer into the destination buffer.  sourceLen is
+   the byte length of the source buffer. Upon entry, destLen is the total
+   size of the destination buffer, which must be large enough to hold the
+   entire uncompressed data. (The size of the uncompressed data must have
+   been saved previously by the compressor and transmitted to the decompressor
+   by some mechanism outside the scope of this compression library.)
+   Upon exit, destLen is the actual size of the compressed buffer.
+     This function can be used to decompress a whole file at once if the
+   input file is mmap'ed.
+
+     uncompress returns Z_OK if success, Z_MEM_ERROR if there was not
+   enough memory, Z_BUF_ERROR if there was not enough room in the output
+   buffer, or Z_DATA_ERROR if the input data was corrupted.
+*/
+
+#if 0 // not needed, not supported by WIN CE
+typedef voidp gzFile;
+
+ZEXTERN gzFile ZEXPORT gzopen  OF((const char *path, const char *mode));
+/*
+     Opens a gzip (.gz) file for reading or writing. The mode parameter
+   is as in fopen ("rb" or "wb") but can also include a compression level
+   ("wb9") or a strategy: 'f' for filtered data as in "wb6f", 'h' for
+   Huffman only compression as in "wb1h". (See the description
+   of deflateInit2 for more information about the strategy parameter.)
+
+     gzopen can be used to read a file which is not in gzip format; in this
+   case gzread will directly read from the file without decompression.
+
+     gzopen returns NULL if the file could not be opened or if there was
+   insufficient memory to allocate the (de)compression state; errno
+   can be checked to distinguish the two cases (if errno is zero, the
+   zlib error is Z_MEM_ERROR).  */
+
+ZEXTERN gzFile ZEXPORT gzdopen  OF((int fd, const char *mode));
+/*
+     gzdopen() associates a gzFile with the file descriptor fd.  File
+   descriptors are obtained from calls like open, dup, creat, pipe or
+   fileno (in the file has been previously opened with fopen).
+   The mode parameter is as in gzopen.
+     The next call of gzclose on the returned gzFile will also close the
+   file descriptor fd, just like fclose(fdopen(fd), mode) closes the file
+   descriptor fd. If you want to keep fd open, use gzdopen(dup(fd), mode).
+     gzdopen returns NULL if there was insufficient memory to allocate
+   the (de)compression state.
+*/
+
+ZEXTERN int ZEXPORT gzsetparams OF((gzFile file, int level, int strategy));
+/*
+     Dynamically update the compression level or strategy. See the description
+   of deflateInit2 for the meaning of these parameters.
+     gzsetparams returns Z_OK if success, or Z_STREAM_ERROR if the file was not
+   opened for writing.
+*/
+
+ZEXTERN int ZEXPORT    gzread  OF((gzFile file, voidp buf, unsigned len));
+/*
+     Reads the given number of uncompressed bytes from the compressed file.
+   If the input file was not in gzip format, gzread copies the given number
+   of bytes into the buffer.
+     gzread returns the number of uncompressed bytes actually read (0 for
+   end of file, -1 for error). */
+
+ZEXTERN int ZEXPORT    gzwrite OF((gzFile file,
+				   const voidp buf, unsigned len));
+/*
+     Writes the given number of uncompressed bytes into the compressed file.
+   gzwrite returns the number of uncompressed bytes actually written
+   (0 in case of error).
+*/
+
+ZEXTERN int ZEXPORTVA   gzprintf OF((gzFile file, const char *format, ...));
+/*
+     Converts, formats, and writes the args to the compressed file under
+   control of the format string, as in fprintf. gzprintf returns the number of
+   uncompressed bytes actually written (0 in case of error).
+*/
+
+ZEXTERN int ZEXPORT gzputs OF((gzFile file, const char *s));
+/*
+      Writes the given null-terminated string to the compressed file, excluding
+   the terminating null character.
+      gzputs returns the number of characters written, or -1 in case of error.
+*/
+
+ZEXTERN char * ZEXPORT gzgets OF((gzFile file, char *buf, int len));
+/*
+      Reads bytes from the compressed file until len-1 characters are read, or
+   a newline character is read and transferred to buf, or an end-of-file
+   condition is encountered.  The string is then terminated with a null
+   character.
+      gzgets returns buf, or Z_NULL in case of error.
+*/
+
+ZEXTERN int ZEXPORT    gzputc OF((gzFile file, int c));
+/*
+      Writes c, converted to an unsigned char, into the compressed file.
+   gzputc returns the value that was written, or -1 in case of error.
+*/
+
+ZEXTERN int ZEXPORT    gzgetc OF((gzFile file));
+/*
+      Reads one byte from the compressed file. gzgetc returns this byte
+   or -1 in case of end of file or error.
+*/
+
+ZEXTERN int ZEXPORT    gzflush OF((gzFile file, int flush));
+/*
+     Flushes all pending output into the compressed file. The parameter
+   flush is as in the deflate() function. The return value is the zlib
+   error number (see function gzerror below). gzflush returns Z_OK if
+   the flush parameter is Z_FINISH and all output could be flushed.
+     gzflush should be called only when strictly necessary because it can
+   degrade compression.
+*/
+
+ZEXTERN z_off_t ZEXPORT    gzseek OF((gzFile file,
+				      z_off_t offset, int whence));
+/*
+      Sets the starting position for the next gzread or gzwrite on the
+   given compressed file. The offset represents a number of bytes in the
+   uncompressed data stream. The whence parameter is defined as in lseek(2);
+   the value SEEK_END is not supported.
+     If the file is opened for reading, this function is emulated but can be
+   extremely slow. If the file is opened for writing, only forward seeks are
+   supported; gzseek then compresses a sequence of zeroes up to the new
+   starting position.
+
+      gzseek returns the resulting offset location as measured in bytes from
+   the beginning of the uncompressed stream, or -1 in case of error, in
+   particular if the file is opened for writing and the new starting position
+   would be before the current position.
+*/
+
+ZEXTERN int ZEXPORT    gzrewind OF((gzFile file));
+/*
+     Rewinds the given file. This function is supported only for reading.
+
+   gzrewind(file) is equivalent to (int)gzseek(file, 0L, SEEK_SET)
+*/
+
+ZEXTERN z_off_t ZEXPORT    gztell OF((gzFile file));
+/*
+     Returns the starting position for the next gzread or gzwrite on the
+   given compressed file. This position represents a number of bytes in the
+   uncompressed data stream.
+
+   gztell(file) is equivalent to gzseek(file, 0L, SEEK_CUR)
+*/
+
+ZEXTERN int ZEXPORT gzeof OF((gzFile file));
+/*
+     Returns 1 when EOF has previously been detected reading the given
+   input stream, otherwise zero.
+*/
+
+ZEXTERN int ZEXPORT    gzclose OF((gzFile file));
+/*
+     Flushes all pending output if necessary, closes the compressed file
+   and deallocates all the (de)compression state. The return value is the zlib
+   error number (see function gzerror below).
+*/
+
+ZEXTERN const char * ZEXPORT gzerror OF((gzFile file, int *errnum));
+/*
+     Returns the error message for the last error which occurred on the
+   given compressed file. errnum is set to zlib error number. If an
+   error occurred in the file system and not in the compression library,
+   errnum is set to Z_ERRNO and the application may consult errno
+   to get the exact error code.
+*/
+
+                        /* checksum functions */
+
+/*
+     These functions are not related to compression but are exported
+   anyway because they might be useful in applications using the
+   compression library.
+*/
+#endif
+
+ZEXTERN uLong ZEXPORT adler32 OF((uLong adler, const Bytef *buf, uInt len));
+
+/*
+     Update a running Adler-32 checksum with the bytes buf[0..len-1] and
+   return the updated checksum. If buf is NULL, this function returns
+   the required initial value for the checksum.
+   An Adler-32 checksum is almost as reliable as a CRC32 but can be computed
+   much faster. Usage example:
+
+     uLong adler = adler32(0L, Z_NULL, 0);
+
+     while (read_buffer(buffer, length) != EOF) {
+       adler = adler32(adler, buffer, length);
+     }
+     if (adler != original_adler) error();
+*/
+
+ZEXTERN uLong ZEXPORT crc32   OF((uLong crc, const Bytef *buf, uInt len));
+/*
+     Update a running crc with the bytes buf[0..len-1] and return the updated
+   crc. If buf is NULL, this function returns the required initial value
+   for the crc. Pre- and post-conditioning (one's complement) is performed
+   within this function so it shouldn't be done by the application.
+   Usage example:
+
+     uLong crc = crc32(0L, Z_NULL, 0);
+
+     while (read_buffer(buffer, length) != EOF) {
+       crc = crc32(crc, buffer, length);
+     }
+     if (crc != original_crc) error();
+*/
+
+
+                        /* various hacks, don't look :) */
+
+/* deflateInit and inflateInit are macros to allow checking the zlib version
+ * and the compiler's view of z_stream:
+ */
+ZEXTERN int ZEXPORT deflateInit_ OF((z_streamp strm, int level,
+                                     const char *version, int stream_size));
+ZEXTERN int ZEXPORT inflateInit_ OF((z_streamp strm,
+                                     const char *version, int stream_size));
+ZEXTERN int ZEXPORT deflateInit2_ OF((z_streamp strm, int  level, int  method,
+                                      int windowBits, int memLevel,
+                                      int strategy, const char *version,
+                                      int stream_size));
+ZEXTERN int ZEXPORT inflateInit2_ OF((z_streamp strm, int  windowBits,
+                                      const char *version, int stream_size));
+#define deflateInit(strm, level) \
+        deflateInit_((strm), (level),       ZLIB_VERSION, sizeof(z_stream))
+#define inflateInit(strm) \
+        inflateInit_((strm),                ZLIB_VERSION, sizeof(z_stream))
+#define deflateInit2(strm, level, method, windowBits, memLevel, strategy) \
+        deflateInit2_((strm),(level),(method),(windowBits),(memLevel),\
+                      (strategy),           ZLIB_VERSION, sizeof(z_stream))
+#define inflateInit2(strm, windowBits) \
+        inflateInit2_((strm), (windowBits), ZLIB_VERSION, sizeof(z_stream))
+
+
+#if !defined(_Z_UTIL_H) && !defined(NO_DUMMY_DECL)
+    struct internal_state {int dummy;}; /* hack for buggy compilers */
+#endif
+
+ZEXTERN const char   * ZEXPORT zError           OF((int err));
+ZEXTERN int            ZEXPORT inflateSyncPoint OF((z_streamp z));
+ZEXTERN const uLongf * ZEXPORT get_crc_table    OF((void));
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _ZLIB_H */
diff --git a/uppsrc/plugin/z/lib/zutil.c b/uppsrc/plugin/z/lib/zutil.c
new file mode 100644
index 000000000..c6478c8fd
--- /dev/null
+++ b/uppsrc/plugin/z/lib/zutil.c
@@ -0,0 +1,225 @@
+/* zutil.c -- target dependent utility functions for the compression library
+ * Copyright (C) 1995-2002 Jean-loup Gailly.
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/* @(#) $Id: zutil.c,v 1.1 2005/02/07 00:26:07 rylek Exp $ */
+
+#include "zutil.h"
+
+struct internal_state      {int dummy;}; /* for buggy compilers */
+
+#ifndef STDC
+extern void exit OF((int));
+#endif
+
+const char *z_errmsg[10] = {
+"need dictionary",     /* Z_NEED_DICT       2  */
+"stream end",          /* Z_STREAM_END      1  */
+"",                    /* Z_OK              0  */
+"file error",          /* Z_ERRNO         (-1) */
+"stream error",        /* Z_STREAM_ERROR  (-2) */
+"data error",          /* Z_DATA_ERROR    (-3) */
+"insufficient memory", /* Z_MEM_ERROR     (-4) */
+"buffer error",        /* Z_BUF_ERROR     (-5) */
+"incompatible version",/* Z_VERSION_ERROR (-6) */
+""};
+
+
+const char * ZEXPORT zlibVersion()
+{
+    return ZLIB_VERSION;
+}
+
+#ifdef DEBUG
+
+#  ifndef verbose
+#    define verbose 0
+#  endif
+int z_verbose = verbose;
+
+void z_error (m)
+    char *m;
+{
+    fprintf(stderr, "%s\n", m);
+    exit(1);
+}
+#endif
+
+/* exported to allow conversion of error code to string for compress() and
+ * uncompress()
+ */
+const char * ZEXPORT zError(err)
+    int err;
+{
+    return ERR_MSG(err);
+}
+
+
+#ifndef HAVE_MEMCPY
+
+void zmemcpy(dest, source, len)
+    Bytef* dest;
+    const Bytef* source;
+    uInt  len;
+{
+    if (len == 0) return;
+    do {
+        *dest++ = *source++; /* ??? to be unrolled */
+    } while (--len != 0);
+}
+
+int zmemcmp(s1, s2, len)
+    const Bytef* s1;
+    const Bytef* s2;
+    uInt  len;
+{
+    uInt j;
+
+    for (j = 0; j < len; j++) {
+        if (s1[j] != s2[j]) return 2*(s1[j] > s2[j])-1;
+    }
+    return 0;
+}
+
+void zmemzero(dest, len)
+    Bytef* dest;
+    uInt  len;
+{
+    if (len == 0) return;
+    do {
+        *dest++ = 0;  /* ??? to be unrolled */
+    } while (--len != 0);
+}
+#endif
+
+#ifdef __TURBOC__
+#if (defined( __BORLANDC__) || !defined(SMALL_MEDIUM)) && !defined(__32BIT__)
+/* Small and medium model in Turbo C are for now limited to near allocation
+ * with reduced MAX_WBITS and MAX_MEM_LEVEL
+ */
+#  define MY_ZCALLOC
+
+/* Turbo C malloc() does not allow dynamic allocation of 64K bytes
+ * and farmalloc(64K) returns a pointer with an offset of 8, so we
+ * must fix the pointer. Warning: the pointer must be put back to its
+ * original form in order to free it, use zcfree().
+ */
+
+#define MAX_PTR 10
+/* 10*64K = 640K */
+
+local int next_ptr = 0;
+
+typedef struct ptr_table_s {
+    voidpf org_ptr;
+    voidpf new_ptr;
+} ptr_table;
+
+local ptr_table table[MAX_PTR];
+/* This table is used to remember the original form of pointers
+ * to large buffers (64K). Such pointers are normalized with a zero offset.
+ * Since MSDOS is not a preemptive multitasking OS, this table is not
+ * protected from concurrent access. This hack doesn't work anyway on
+ * a protected system like OS/2. Use Microsoft C instead.
+ */
+
+voidpf zcalloc (voidpf opaque, unsigned items, unsigned size)
+{
+    voidpf buf = opaque; /* just to make some compilers happy */
+    ulg bsize = (ulg)items*size;
+
+    /* If we allocate less than 65520 bytes, we assume that farmalloc
+     * will return a usable pointer which doesn't have to be normalized.
+     */
+    if (bsize < 65520L) {
+        buf = farmalloc(bsize);
+        if (*(ush*)&buf != 0) return buf;
+    } else {
+        buf = farmalloc(bsize + 16L);
+    }
+    if (buf == NULL || next_ptr >= MAX_PTR) return NULL;
+    table[next_ptr].org_ptr = buf;
+
+    /* Normalize the pointer to seg:0 */
+    *((ush*)&buf+1) += ((ush)((uch*)buf-0) + 15) >> 4;
+    *(ush*)&buf = 0;
+    table[next_ptr++].new_ptr = buf;
+    return buf;
+}
+
+void  zcfree (voidpf opaque, voidpf ptr)
+{
+    int n;
+    if (*(ush*)&ptr != 0) { /* object < 64K */
+        farfree(ptr);
+        return;
+    }
+    /* Find the original pointer */
+    for (n = 0; n < next_ptr; n++) {
+        if (ptr != table[n].new_ptr) continue;
+
+        farfree(table[n].org_ptr);
+        while (++n < next_ptr) {
+            table[n-1] = table[n];
+        }
+        next_ptr--;
+        return;
+    }
+    ptr = opaque; /* just to make some compilers happy */
+    Assert(0, "zcfree: ptr not found");
+}
+#endif
+#endif /* __TURBOC__ */
+
+
+#if defined(M_I86) && !defined(__32BIT__)
+/* Microsoft C in 16-bit mode */
+
+#  define MY_ZCALLOC
+
+#if (!defined(_MSC_VER) || (_MSC_VER <= 600))
+#  define _halloc  halloc
+#  define _hfree   hfree
+#endif
+
+voidpf zcalloc (voidpf opaque, unsigned items, unsigned size)
+{
+    if (opaque) opaque = 0; /* to make compiler happy */
+    return _halloc((long)items, size);
+}
+
+void  zcfree (voidpf opaque, voidpf ptr)
+{
+    if (opaque) opaque = 0; /* to make compiler happy */
+    _hfree(ptr);
+}
+
+#endif /* MSC */
+
+
+#ifndef MY_ZCALLOC /* Any system without a special alloc function */
+
+#ifndef STDC
+extern voidp  calloc OF((uInt items, uInt size));
+extern void   free   OF((voidpf ptr));
+#endif
+
+voidpf zcalloc (opaque, items, size)
+    voidpf opaque;
+    unsigned items;
+    unsigned size;
+{
+    if (opaque) items += size - size; /* make compiler happy */
+    return (voidpf)calloc(items, size);
+}
+
+void  zcfree (opaque, ptr)
+    voidpf opaque;
+    voidpf ptr;
+{
+    free(ptr);
+    if (opaque) return; /* make compiler happy */
+}
+
+#endif /* MY_ZCALLOC */
diff --git a/uppsrc/plugin/z/lib/zutil.h b/uppsrc/plugin/z/lib/zutil.h
new file mode 100644
index 000000000..3d9d27e30
--- /dev/null
+++ b/uppsrc/plugin/z/lib/zutil.h
@@ -0,0 +1,220 @@
+/* zutil.h -- internal interface and configuration of the compression library
+ * Copyright (C) 1995-2002 Jean-loup Gailly.
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/* WARNING: this file should *not* be used by applications. It is
+   part of the implementation of the compression library and is
+   subject to change. Applications should only use zlib.h.
+ */
+
+/* @(#) $Id: zutil.h,v 1.1 2005/02/07 00:26:07 rylek Exp $ */
+
+#ifndef _Z_UTIL_H
+#define _Z_UTIL_H
+
+#include "zlib.h"
+
+#ifdef STDC
+#  include <stddef.h>
+#  include <string.h>
+#  include <stdlib.h>
+#endif
+#ifdef NO_ERRNO_H
+    extern int errno;
+#else
+#   include <errno.h>
+#endif
+
+#ifndef local
+#  define local static
+#endif
+/* compile with -Dlocal if your debugger can't find static symbols */
+
+typedef unsigned char  uch;
+typedef uch FAR uchf;
+typedef unsigned short ush;
+typedef ush FAR ushf;
+typedef unsigned long  ulg;
+
+extern const char *z_errmsg[10]; /* indexed by 2-zlib_error */
+/* (size given to avoid silly warnings with Visual C++) */
+
+#define ERR_MSG(err) z_errmsg[Z_NEED_DICT-(err)]
+
+#define ERR_RETURN(strm,err) \
+  return (strm->msg = (char*)ERR_MSG(err), (err))
+/* To be used only when the state is known to be valid */
+
+        /* common constants */
+
+#ifndef DEF_WBITS
+#  define DEF_WBITS MAX_WBITS
+#endif
+/* default windowBits for decompression. MAX_WBITS is for compression only */
+
+#if MAX_MEM_LEVEL >= 8
+#  define DEF_MEM_LEVEL 8
+#else
+#  define DEF_MEM_LEVEL  MAX_MEM_LEVEL
+#endif
+/* default memLevel */
+
+#define STORED_BLOCK 0
+#define STATIC_TREES 1
+#define DYN_TREES    2
+/* The three kinds of block type */
+
+#define MIN_MATCH  3
+#define MAX_MATCH  258
+/* The minimum and maximum match lengths */
+
+#define PRESET_DICT 0x20 /* preset dictionary flag in zlib header */
+
+        /* target dependencies */
+
+#ifdef MSDOS
+#  define OS_CODE  0x00
+#  if defined(__TURBOC__) || defined(__BORLANDC__)
+#    if(__STDC__ == 1) && (defined(__LARGE__) || defined(__COMPACT__))
+       /* Allow compilation with ANSI keywords only enabled */
+       void _Cdecl farfree( void *block );
+       void *_Cdecl farmalloc( unsigned long nbytes );
+#    else
+#     include <alloc.h>
+#    endif
+#  else /* MSC or DJGPP */
+#    include <malloc.h>
+#  endif
+#endif
+
+#ifdef OS2
+#  define OS_CODE  0x06
+#endif
+
+#ifdef WIN32 /* Window 95 & Windows NT */
+#  define OS_CODE  0x0b
+#endif
+
+#if defined(VAXC) || defined(VMS)
+#  define OS_CODE  0x02
+#  define F_OPEN(name, mode) \
+     fopen((name), (mode), "mbc=60", "ctx=stm", "rfm=fix", "mrs=512")
+#endif
+
+#ifdef AMIGA
+#  define OS_CODE  0x01
+#endif
+
+#if defined(ATARI) || defined(atarist)
+#  define OS_CODE  0x05
+#endif
+
+#if defined(MACOS) || defined(TARGET_OS_MAC)
+#  define OS_CODE  0x07
+#  if defined(__MWERKS__) && __dest_os != __be_os && __dest_os != __win32_os
+#    include <unix.h> /* for fdopen */
+#  else
+#    ifndef fdopen
+#      define fdopen(fd,mode) NULL /* No fdopen() */
+#    endif
+#  endif
+#endif
+
+#ifdef __50SERIES /* Prime/PRIMOS */
+#  define OS_CODE  0x0F
+#endif
+
+#ifdef TOPS20
+#  define OS_CODE  0x0a
+#endif
+
+#if defined(_BEOS_) || defined(RISCOS)
+#  define fdopen(fd,mode) NULL /* No fdopen() */
+#endif
+
+#if (defined(_MSC_VER) && (_MSC_VER > 600))
+#  define fdopen(fd,type)  _fdopen(fd,type)
+#endif
+
+
+        /* Common defaults */
+
+#ifndef OS_CODE
+#  define OS_CODE  0x03  /* assume Unix */
+#endif
+
+#ifndef F_OPEN
+#  define F_OPEN(name, mode) fopen((name), (mode))
+#endif
+
+         /* functions */
+
+#ifdef HAVE_STRERROR
+   extern char *strerror OF((int));
+#  define zstrerror(errnum) strerror(errnum)
+#else
+#  define zstrerror(errnum) ""
+#endif
+
+#if defined(pyr)
+#  define NO_MEMCPY
+#endif
+#if defined(SMALL_MEDIUM) && !defined(_MSC_VER) && !defined(__SC__)
+ /* Use our own functions for small and medium model with MSC <= 5.0.
+  * You may have to use the same strategy for Borland C (untested).
+  * The __SC__ check is for Symantec.
+  */
+#  define NO_MEMCPY
+#endif
+#if defined(STDC) && !defined(HAVE_MEMCPY) && !defined(NO_MEMCPY)
+#  define HAVE_MEMCPY
+#endif
+#ifdef HAVE_MEMCPY
+#  ifdef SMALL_MEDIUM /* MSDOS small or medium model */
+#    define zmemcpy _fmemcpy
+#    define zmemcmp _fmemcmp
+#    define zmemzero(dest, len) _fmemset(dest, 0, len)
+#  else
+#    define zmemcpy memcpy
+#    define zmemcmp memcmp
+#    define zmemzero(dest, len) memset(dest, 0, len)
+#  endif
+#else
+   extern void zmemcpy  OF((Bytef* dest, const Bytef* source, uInt len));
+   extern int  zmemcmp  OF((const Bytef* s1, const Bytef* s2, uInt len));
+   extern void zmemzero OF((Bytef* dest, uInt len));
+#endif
+
+/* Diagnostic functions */
+#ifdef DEBUG
+#  include <stdio.h>
+   extern int z_verbose;
+   extern void z_error    OF((char *m));
+#  define Assert(cond,msg) {if(!(cond)) z_error(msg);}
+#  define Trace(x) {if (z_verbose>=0) fprintf x ;}
+#  define Tracev(x) {if (z_verbose>0) fprintf x ;}
+#  define Tracevv(x) {if (z_verbose>1) fprintf x ;}
+#  define Tracec(c,x) {if (z_verbose>0 && (c)) fprintf x ;}
+#  define Tracecv(c,x) {if (z_verbose>1 && (c)) fprintf x ;}
+#else
+#  define Assert(cond,msg)
+#  define Trace(x)
+#  define Tracev(x)
+#  define Tracevv(x)
+#  define Tracec(c,x)
+#  define Tracecv(c,x)
+#endif
+
+
+typedef uLong (ZEXPORT *check_func) OF((uLong check, const Bytef *buf,
+				       uInt len));
+voidpf zcalloc OF((voidpf opaque, unsigned items, unsigned size));
+void   zcfree  OF((voidpf opaque, voidpf ptr));
+
+#define ZALLOC(strm, items, size) \
+           (*((strm)->zalloc))((strm)->opaque, (items), (size))
+#define ZFREE(strm, addr)  (*((strm)->zfree))((strm)->opaque, (voidpf)(addr))
+#define TRY_FREE(s, p) {if (p) ZFREE(s, p);}
+
+#endif /* _Z_UTIL_H */
diff --git a/uppsrc/plugin/z/z.h b/uppsrc/plugin/z/z.h
new file mode 100644
index 000000000..f8c0e4065
--- /dev/null
+++ b/uppsrc/plugin/z/z.h
@@ -0,0 +1,6 @@
+#ifndef _plugin_z_z_h_
+#define _plugin_z_z_h_
+
+// empty - moved to Core
+
+#endif
diff --git a/uppsrc/plugin/z/z.upp b/uppsrc/plugin/z/z.upp
new file mode 100644
index 000000000..7de9775a5
--- /dev/null
+++ b/uppsrc/plugin/z/z.upp
@@ -0,0 +1,37 @@
+description "zlib compressor/decompressor and its U++ encapsulation";
+
+optimize_speed;
+
+flags(NOTMFC) "!GUI !CONSOLE";
+
+options(MSC8ARM) -DNO_ERRNO_H;
+
+file
+	z.h,
+	"Original files" readonly separator,
+	lib/adler32.c,
+	lib/compress.c,
+	lib/crc32.c,
+	lib/deflate.c tabsize 8,
+	lib/deflate.h,
+	lib/gzio.c,
+	lib/infblock.c,
+	lib/infblock.h,
+	lib/infcodes.c,
+	lib/infcodes.h,
+	lib/inffixed.h,
+	lib/inffast.c,
+	lib/inffast.h,
+	lib/inflate.c,
+	lib/inftrees.c,
+	lib/inftrees.h,
+	lib/infutil.c,
+	lib/infutil.h,
+	lib/trees.h,
+	lib/trees.c,
+	lib/uncompr.c,
+	lib/zconf.h,
+	lib/zlib.h,
+	lib/zutil.c,
+	lib/zutil.h;
+
diff --git a/uppsrc/plugin/zip/UnZip.cpp b/uppsrc/plugin/zip/UnZip.cpp
new file mode 100644
index 000000000..52638d979
--- /dev/null
+++ b/uppsrc/plugin/zip/UnZip.cpp
@@ -0,0 +1,138 @@
+#include "zip.h"
+
+NAMESPACE_UPP
+
+void UnZip::ReadHeader()
+{
+	if(zip->Get32le() != 0x04034b50) {
+		eof = true;
+		return;
+	}
+	if(zip->Get16le() > 20) {
+		SetError();
+		return;
+	}
+	bit = zip->Get16le();
+	method = zip->Get16le();
+
+	dword dt = zip->Get32le();
+
+	time.year = int16(((dt >> 25) & 0x7f) + 1980);
+	time.month = byte((dt >> 21) & 0x0f);
+	time.day = byte((dt >> 16) & 0x1f);
+	time.hour = byte((dt >> 11) & 0x1f);
+	time.minute = byte((dt >> 5) & 0x3f);
+	time.second = byte((dt << 1) & 0x3e);
+
+	crc32 = zip->Get32le();
+	csize = zip->Get32le();
+	usize = zip->Get32le();
+
+	dword filelen = zip->Get16le();
+	dword extralen = zip->Get16le();
+	path = zip->Get(filelen);
+	zip->SeekCur(extralen);
+
+	done += 5 * 2 + 5 * 4;
+}
+
+void UnZip::SkipFile()
+{
+	zip->SeekCur(csize);
+	done += csize;
+	ReadHeader();
+}
+
+bool UnZip::ReadFile(Stream& out, Gate2<int, int> progress)
+{
+	dword crc;
+	int l;
+	if(method == 0) {
+		Buffer<byte> temp(65536);
+		int loaded;
+		int count = csize;
+		Crc32 crc32;
+		while(count > 0 && (loaded = zip->Get(temp, (int)min<int64>(count, 65536))) > 0) {
+			out.Put(temp, loaded);
+			crc32.Put(temp, loaded);
+			count -= loaded;
+		}
+		if(count > 0) {
+			SetError();
+			return false;
+		}
+		l = csize;
+		crc = crc32;
+	}
+	else
+	if(method == 8)
+		l = ZDecompress(out, *zip, csize, progress, true, &crc);
+	else {
+		SetError();
+		return false;
+	}
+	if(crc != crc32 || l != usize) {
+		SetError();
+		return false;
+	}
+	done += csize;
+	ReadHeader();
+	return true;
+}
+
+String UnZip::ReadFile(Gate2<int, int> progress)
+{
+	StringStream ss;
+	return ReadFile(ss, progress) ? ss.GetResult() : String::GetVoid();
+}
+
+void UnZip::Create(Stream& _zip)
+{
+	eof = error = false;
+	zip = &_zip;
+	done = 0;
+	ReadHeader();
+}
+
+bool UnZip::IsEof() const
+{
+	return eof || !zip || eof || error || zip->IsEof();
+}
+
+bool UnZip::IsFolder() const
+{
+	return *path.Last() == '/';
+}
+
+UnZip::UnZip(Stream& in)
+{
+	Create(in);
+}
+
+UnZip::UnZip()
+{
+	error = true;
+	zip = NULL;
+}
+
+bool FileUnZip::Create(const char *name)
+{
+	if(!zip.Open(name))
+		return false;
+	UnZip::Create(zip);
+	return true;
+}
+
+void MemUnZip::Create(const void *ptr, int count)
+{
+	zip.Create(ptr, count);
+	UnZip::Create(zip);
+}
+
+void StringUnZip::Create(const String& s)
+{
+	zip.Open(s);
+	UnZip::Create(zip);
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/plugin/zip/Zip.cpp b/uppsrc/plugin/zip/Zip.cpp
new file mode 100644
index 000000000..7c90b5bc8
--- /dev/null
+++ b/uppsrc/plugin/zip/Zip.cpp
@@ -0,0 +1,140 @@
+#include "zip.h"
+
+NAMESPACE_UPP
+
+void Zip::WriteFolder(const char *path, Time tm)
+{
+	String p = UnixPath(path);
+	if(*p.Last() != '/')
+		p.Cat('/');
+	WriteFile(~p, 0, p, false, tm);
+}
+
+void Zip::WriteFile(const void *ptr, int size, const char *path, Gate2<int, int> progress, Time tm)
+{
+	File& f = file.Add();
+	f.path = UnixPath(path);
+	StringStream ss;
+	MemReadStream ms(ptr, size);
+	dword crc;
+	ZCompress(ss, ms, size, progress, true, &crc);
+	String data = ss.GetResult();
+	const void *r = ~data;
+	int   csize = data.GetLength();
+	zip->Put32le(0x04034b50);
+	zip->Put16le(20);
+	zip->Put16le(0);
+	if(data.GetLength() >= size) {
+		r = ptr;
+		csize = size;
+		zip->Put16le(f.method = 0);
+	}
+	else
+		zip->Put16le(f.method = 8);
+	zip->Put32le(f.time = (tm.day << 16) | (tm.month << 21) | ((tm.year - 1980) << 25) |
+	                      (tm.hour << 11) | (tm.minute << 5) | (tm.second >> 1));
+	zip->Put32le(f.crc = crc);
+	zip->Put32le(f.csize = csize);
+	zip->Put32le(f.usize = size);
+	zip->Put16le(strlen(f.path));
+	zip->Put16le(0);
+	zip->Put(f.path);
+	zip->Put(r, csize);
+	done += 5 * 2 + 5 * 4 + data.GetCount() + f.path.GetCount();
+}
+
+void Zip::WriteFile(const String& s, const char *path, Gate2<int, int> progress, Time tm)
+{
+	WriteFile(~s, s.GetCount(), path, progress, tm);
+}
+
+void Zip::Create(Stream& out)
+{
+	Finish();
+	done = 0;
+	zip = &out;
+}
+
+void Zip::Finish()
+{
+	if(!zip)
+		return;
+	dword off = done;
+	for(int i = 0; i < file.GetCount(); i++) {
+		File& f = file[i];
+		zip->Put32le(0x02014b50);
+		zip->Put16le(20);
+		zip->Put16le(20);
+		zip->Put16le(0);  // general purpose bit flag
+        zip->Put16le(f.method);
+        zip->Put32le(f.time);
+        zip->Put32le(f.crc);
+        zip->Put32le(f.csize);
+        zip->Put32le(f.usize);
+        zip->Put16le(f.path.GetCount());
+		zip->Put16le(0); // extra field length              2 bytes
+        zip->Put16le(0); // file comment length             2 bytes
+        zip->Put16le(0); // disk number start               2 bytes
+        zip->Put16le(0); // internal file attributes        2 bytes
+        zip->Put32le(0); // external file attributes        4 bytes
+        zip->Put32le(0); // relative offset of local header 4 bytes
+        zip->Put(f.path);
+        done += 7 * 4 + 9 * 2 + f.path.GetCount();
+	}
+	zip->Put32le(0x06054b50);
+	zip->Put16le(0);  // number of this disk
+	zip->Put16le(0);  // number of the disk with the start of the central directory
+	zip->Put16le(file.GetCount()); // total number of entries in the central directory on this disk
+	zip->Put16le(file.GetCount()); // total number of entries in the central directory
+	zip->Put32le(done - off); // size of the central directory
+	zip->Put32le(off); //offset of start of central directory with respect to the starting disk number
+	zip->Put16le(0);
+	zip = NULL;
+}
+
+Zip::Zip()
+{
+	done = 0;
+	zip = NULL;
+}
+
+Zip::Zip(Stream& out)
+{
+	Create(out);
+}
+
+Zip::~Zip()
+{
+	Finish();
+}
+
+bool FileZip::Create(const char *name)
+{
+	if(!zip.Open(name))
+		return false;
+	Zip::Create(zip);
+	return true;
+}
+
+bool FileZip::Finish()
+{
+	if(zip.IsOpen()) {
+		Zip::Finish();
+		zip.Close();
+		return !zip.IsError();
+	}
+	return false;
+}
+
+void StringZip::Create()
+{
+	zip.Create();
+}
+
+String StringZip::Finish()
+{
+	Zip::Finish();
+	return zip.GetResult();
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc/plugin/zip/init b/uppsrc/plugin/zip/init
new file mode 100644
index 000000000..41d606d28
--- /dev/null
+++ b/uppsrc/plugin/zip/init
@@ -0,0 +1,3 @@
+#ifndef _plugin_zip_icpp_init_stub
+#define _plugin_zip_icpp_init_stub
+#endif
diff --git a/uppsrc/plugin/zip/zip.h b/uppsrc/plugin/zip/zip.h
new file mode 100644
index 000000000..4323d810c
--- /dev/null
+++ b/uppsrc/plugin/zip/zip.h
@@ -0,0 +1,133 @@
+#ifndef _zip_zip_h
+#define _zip_zip_h
+
+#include <Core/Core.h>
+
+NAMESPACE_UPP
+
+class UnZip {
+	Stream *zip;
+
+	bool   error;
+	bool   eof;
+	String path;
+	word   bit;
+	word   method;
+	Time   time;
+	dword  crc32;
+	dword  csize;
+	dword  usize;
+	dword  done;
+
+	void   Init();
+	void   ReadHeader();
+	void   SetError()           { error = true; }
+
+public:
+	bool   IsEof() const;
+	operator bool() const       { return !IsEof(); }
+
+	bool   IsError() const      { return error; }
+
+	bool   IsFolder() const;
+	String GetPath() const      { return path; }
+	int    GetLength() const    { return usize; }
+	Time   GetTime() const      { return time; }
+
+	void   SkipFile();
+	bool   ReadFile(Stream& out, Gate2<int, int> progress = false);
+	String ReadFile(Gate2<int, int> progress = false);
+
+	dword  GetPos()             { return done; }
+
+	void   Create(Stream& in);
+
+	UnZip(Stream& in);
+	UnZip();
+};
+
+class FileUnZip : public UnZip {
+	FileIn zip;
+
+public:
+	bool Create(const char *name);
+
+	FileUnZip(const char *name)                 { Create(name); }
+};
+
+class MemUnZip : public UnZip {
+	MemReadStream zip;
+
+public:
+	void Create(const void *ptr, int count);
+
+	MemUnZip(const void *ptr, int count)   { Create(ptr, count); }
+};
+
+class StringUnZip : public UnZip {
+	StringStream zip;
+
+public:
+	void Create(const String& s);
+
+	StringUnZip(const String& s)                { Create(s); }
+};
+
+class Zip {
+	Stream *zip;
+
+	struct File {
+		String path;
+		dword  time;
+		int    method;
+		dword  crc;
+		dword  csize;
+		dword  usize;
+	};
+	Array<File> file;
+
+	dword   done;
+
+	void WriteFile0(const void *ptr, int size, const char *path, Gate2<int, int> progress, Time tm, int method);
+
+public:
+	void WriteFolder(const char *path, Time tm);
+	void WriteFile(const void *ptr, int size, const char *path, Gate2<int, int> progress = false, Time tm = GetSysTime());
+	void WriteFile(const String& s, const char *path, Gate2<int, int> progress = false, Time tm = GetSysTime());
+
+	void Create(Stream& out);
+	void Finish();
+
+	bool IsError()                           { return zip && zip->IsError(); }
+
+	dword  GetLength() const                 { return done; }
+
+	Zip();
+	Zip(Stream& out);
+	~Zip();
+};
+
+class FileZip : public Zip {
+	FileOut zip;
+
+public:
+	bool Create(const char *name);
+	bool Finish();
+
+	FileZip(const char *name)                 { Create(name); }
+	~FileZip()                                { Finish(); }
+};
+
+class StringZip : public Zip {
+	StringStream zip;
+
+public:
+	void   Create();
+	String Finish();
+
+	StringZip()                               { Create(); }
+};
+
+END_UPP_NAMESPACE
+
+#endif
diff --git a/uppsrc/plugin/zip/zip.upp b/uppsrc/plugin/zip/zip.upp
new file mode 100644
index 000000000..7bbc4adac
--- /dev/null
+++ b/uppsrc/plugin/zip/zip.upp
@@ -0,0 +1,4 @@
+file
+	zip.h,
+	Zip.cpp,
+	UnZip.cpp;
diff --git a/uppsrc/rw/AUTHORS b/uppsrc/rw/AUTHORS
new file mode 100644
index 000000000..f782e5b62
--- /dev/null
+++ b/uppsrc/rw/AUTHORS
@@ -0,0 +1,2 @@
+Mirek Fidler <cxl@ntllib.org>
+Tomas Rylek  <rylek@volny.cz>
\ No newline at end of file
diff --git a/uppsrc/rw/Alias.cpp b/uppsrc/rw/Alias.cpp
new file mode 100644
index 000000000..de9f35438
--- /dev/null
+++ b/uppsrc/rw/Alias.cpp
@@ -0,0 +1,174 @@
+#include "Designer.h"
+
+String AliasMap::StdFileName()
+{
+	return ConfigFile("rw.ali");
+}
+
+bool AliasMap::Load(const char *path)
+{
+	String file = LoadFile(path);
+	if(file.IsVoid())
+		return false;
+	obj_source.Clear();
+	obj_dest.Clear();
+	for(const char *s = file; *s;)
+	{
+		bool is_dest = (*s == ' ' || *s == '\t');
+		while(*s == ' ' || *s == '\t')
+			s++;
+		const char *b = s;
+		while(*s && *s != '\n')
+			s++;
+		const char *e = s;
+		while(e > b && (byte)e[-1] <= ' ')
+			e--;
+		String part(b, e);
+		if(is_dest)
+		{
+			while(obj_dest.GetCount() < obj_source.GetCount())
+				obj_dest.Add(part);
+		}
+		else
+			obj_source.Add(part);
+		if(*s)
+			s++;
+	}
+	if(obj_dest.GetCount() < obj_source.GetCount())
+		obj_source.SetCount(obj_dest.GetCount());
+	IndexSort(obj_source, obj_dest, StdLess<String>());
+	return true;
+}
+
+bool AliasMap::Save(const char *path)
+{
+	IndexSort(obj_dest, obj_source, StdLess<String>());
+	String out;
+	for(int i = 0; i < obj_source.GetCount(); i++)
+	{
+		out.Cat(obj_source[i]);
+		out.Cat("\r\n");
+		if(i + 1 >= obj_source.GetCount() || obj_dest[i + 1] != obj_dest[i])
+		{
+			out.Cat('\t');
+			out.Cat(obj_dest[i]);
+			out.Cat("\r\n");
+		}
+	}
+	IndexSort(obj_source, obj_dest, StdLess<String>());
+	return SaveFile(path, out);
+}
+
+void AliasMap::SetDefault()
+{
+	obj_source.Add("WithKeyMap<*>");         obj_dest.Add("@1");
+	obj_source.Add("WithDropChoice<*>");     obj_dest.Add("@1");
+	obj_source.Add("WithChoiceList<*>");     obj_dest.Add("@1");
+	obj_source.Add("EditDoubleSpin");        obj_dest.Add("EditDouble");
+	obj_source.Add("EditDoubleNotNullSpin"); obj_dest.Add("EditDouble");
+	obj_source.Add("Ctrl");                  obj_dest.Add("Label");
+	obj_source.Add("NotNullCtrl<*>");        obj_dest.Add("@1");
+	obj_source.Add("SqlArray");              obj_dest.Add("ArrayCtrl");
+	obj_source.Add("DataPusher");            obj_dest.Add("EditField");
+}
+
+static bool MatchAlias(const char *s, const char *t, Vector<String>& a)
+{
+	while(*t)
+		switch(*t++)
+		{
+		case '*':
+			{
+				const char *b = s;
+				do
+				{
+					a.Add(String(b, s));
+					if(MatchAlias(s, t, a))
+						return true;
+					a.Drop();
+				}
+				while(*s++);
+				return false;
+			}
+
+		default:
+			if(t[-1] != *s++)
+				return false;
+			break;
+		}
+	return !*s;
+}
+
+String AliasMap::Convert(const String& name) const
+{
+	for(int i = 0; i < obj_source.GetCount(); i++)
+	{
+		Vector<String> args;
+		if(MatchAlias(name, obj_source[i], args))
+		{
+			const char *s = obj_dest[i];
+			String out;
+			while(*s)
+				if(*s == '@' && (s[1] >= '1' && s[1] < '1' + min(args.GetCount(), 10)))
+				{
+					s += 2;
+					out.Cat(args[s[-1] - '1']);
+				}
+				else
+					out.Cat(*s++);
+			return out;
+		}
+	}
+	return name;
+}
+
+class DlgAlias : public WithAliasLayout<TopWindow>
+{
+public:
+	typedef DlgAlias CLASSNAME;
+	DlgAlias();
+
+	bool Run(AliasMap& map);
+
+private:
+	EditStringNotNull obj_source;
+	EditStringNotNull obj_dest;
+};
+
+bool AliasMap::Edit()
+{
+	return DlgAlias().Run(*this);
+}
+
+DlgAlias::DlgAlias()
+{
+	CtrlLayoutOKCancel(*this, "Object alias map");
+	list.AutoHideSb();
+	list.AddColumn("Source object").Edit(obj_source);
+	list.AddColumn("Alias object").Edit(obj_dest);
+	list.Inserting().Removing().NoAskRemove();
+}
+
+bool DlgAlias::Run(AliasMap& map)
+{
+	list.SetCount(map.obj_source.GetCount());
+	int i;
+	for(i = 0; i < map.obj_source.GetCount(); i++)
+	{
+		list.Set(i, 0, map.obj_source[i]);
+		list.Set(i, 1, map.obj_dest[i]);
+	}
+	if(!map.obj_source.IsEmpty())
+		list.SetCursor(0);
+	if(TopWindow::Run() != IDOK)
+		return false;
+	int n = list.GetCount();
+	map.obj_source.SetCount(n);
+	map.obj_dest.SetCount(n);
+	for(i = 0; i < n; i++)
+	{
+		map.obj_source[i] = list.Get(i, 0);
+		map.obj_dest[i]   = list.Get(i, 1);
+	}
+	return true;
+}
diff --git a/uppsrc/rw/COPYING b/uppsrc/rw/COPYING
new file mode 100644
index 000000000..33aa39102
--- /dev/null
+++ b/uppsrc/rw/COPYING
@@ -0,0 +1,30 @@
+Copyright (C) 2005 Mirek Fidler, Tomas Rylek and various contributors (see AUTHORS)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to
+deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies of the Software and its Copyright notices. In addition publicly
+documented acknowledgment must be given that this software has been used if no
+source code of this software is made available publicly. This includes
+acknowledgments in either Copyright notices, Manuals, Publicity and Marketing
+documents or any documentation provided with any product containing this
+software. This License does not apply to any software that links to the
+libraries provided by this software (statically or dynamically), but only to
+the software provided.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+-----------
+
+Please see the COPYING.PLAIN for a plain-english explanation of this notice
+and it's intent.
diff --git a/uppsrc/rw/COPYING-PLAIN b/uppsrc/rw/COPYING-PLAIN
new file mode 100644
index 000000000..770a8132f
--- /dev/null
+++ b/uppsrc/rw/COPYING-PLAIN
@@ -0,0 +1,33 @@
+Plain English Copyright Notice
+
+This file is not intended to be the actual License. The reason this file
+exists is that we here are programmers and engineers. We aren't lawyers. We
+provide licenses that we THINK say the right things, but we have our own
+intentions at heart. This is a plain-english explanation of what those
+intentions are, and if you follow them you will be within the "spirit" of
+the license.
+
+The intent is for us to enjoy writing software that is useful to us (the
+AUTHORS) and allow others to use it freely and also benefit from the work we
+put into making it. We don't want to restrict others using it. They should
+not *HAVE* to make the source code of the applications they write that
+simply link to these libraries (be that statically or dynamically), or for
+them to be limited as to what license they choose to use (be it open, closed
+or anything else). But we would like to know you are using these libraries.
+We simply would like to know that it has been useful to someone. This is why
+we ask for acknowledgement of some sort.
+
+You can do what you want with the source of this software - it doesn't
+matter. We still have it here for ourselves and it is open and free to use
+and download and play with. It can't be taken away. We don't really mind what
+you do with the source to your software. We would simply like to know that
+you are using it - especially if it makes it to a commerical product. If you
+simply e-mail all the AUTHORS (see COPYING and AUTHORS files) telling us, and
+then make sure you include a paragraph or page in the manual or in the "About.."
+box for the product with the copyright notice and state that you used this
+software, we will be very happy. If you want to contribute back modifications
+and fixes you may have made we will welcome those too with open arms (generally).
+If you want help with changes needed, ports needed or features to be added,
+arrangements can be easily made with some dialogue.
+
+Mirek Fidler <cxl@ntllib.org>
diff --git a/uppsrc/rw/Designer.cpp b/uppsrc/rw/Designer.cpp
new file mode 100644
index 000000000..57e152bec
--- /dev/null
+++ b/uppsrc/rw/Designer.cpp
@@ -0,0 +1,1217 @@
+#include "Designer.h"
+#pragma hdrstop
+
+#define  IMAGEFILE <rw/rw.iml>
+#include <Draw/iml_source.h>
+
+#define LLOG(x) // LOG(x)
+
+int LayoutDesigner::GetTrack(int a, int b, int type) {
+	return type == LEFT   ? a - TRACKERSIZE :
+	       type == CENTER ? (a + b - TRACKERSIZE) / 2 :
+	                        b;
+}
+
+Image LayoutDesigner::GetTrackShape(Point track) {
+	const Image& (*id[3][3])() = {
+		{ CtrlImg::SizeHoVe0, CtrlImg::SizeVert0, CtrlImg::SizeVeHo0 },
+		{ CtrlImg::SizeHorz0, Image::SizeAll,     CtrlImg::SizeHorz0 },
+		{ CtrlImg::SizeVeHo0, CtrlImg::SizeVert0, CtrlImg::SizeHoVe0 }
+	};
+	if(track.x == FORM)
+		return CtrlImg::SizeHoVe0();
+	if(track.x >= 0 && track.x <= 4 && track.y >= 0 && track.y <= 4)
+		return (*id[track.y][track.x])();
+	return Image::Arrow();
+}
+
+Rect LayoutDesigner::GetTracker(Point track) {
+	if(track.x == FORM) {
+		Rect r = form.GetRect() + sb;
+		return RectC(r.right, r.bottom, TRACKERSIZE, TRACKERSIZE);
+	}
+	Rect actual = GetActual();
+	return RectC(GetTrack(actual.left, actual.right, track.x),
+		         GetTrack(actual.top, actual.bottom, track.y),
+				 TRACKERSIZE, TRACKERSIZE);
+}
+
+Rect LayoutDesigner::GetSpringRect(int i) {
+	Rect r = form.GetRect() + sb;
+	r.Inflate(10, 10);
+	Rect actual = GetActual();
+	if(i == SLEFT || i == SRIGHT) {
+		r.top = actual.top + actual.Height() / 4 - TRACKERSIZE;
+		r.bottom = r.top + 2 * TRACKERSIZE;
+		if(i == SLEFT)
+			r.right = actual.left;
+		else {
+			int h2 = actual.Height() / 2;
+			r.top += h2;
+			r.bottom += h2;
+			r.left = actual.right;
+		}
+	}
+	if(i == STOP || i == SBOTTOM) {
+		r.left = actual.left + actual.Width() / 4 - TRACKERSIZE;
+		r.right = r.left + 2 * TRACKERSIZE;
+		if(i == STOP)
+			r.bottom = actual.top;
+		else {
+			int w2 = actual.Width() / 2;
+			r.left += w2;
+			r.right += w2;
+			r.top = actual.bottom;
+		}
+	}
+	return r;
+}
+
+Rect LayoutDesigner::GetCtrlRect(int i) {
+	return ctrl[i].GetRect();
+}
+
+Rect LayoutDesigner::GetActualRect() {
+	return itemi.IsEmpty() ? Rect(-INT_MAX, -INT_MAX, -INT_MAX, -INT_MAX)
+		                   : GetCtrlRect(itemi.Top());
+}
+
+Rect LayoutDesigner::GetActual() {
+	return GetActualRect() + Point(10, 10);
+}
+
+bool LayoutDesigner::GetSpring(int im, int i) {
+	LogPos p = ctrl[im].GetPos();
+	switch(i) {
+	case SLEFT:
+		return p.x.GetAlign() == Ctrl::LEFT || p.x.GetAlign() == Ctrl::SIZE;
+	case SRIGHT:
+		return p.x.GetAlign() == Ctrl::RIGHT || p.x.GetAlign() == Ctrl::SIZE;
+	case STOP:
+		return p.y.GetAlign() == Ctrl::TOP || p.y.GetAlign() == Ctrl::SIZE;
+	case SBOTTOM:
+		return p.y.GetAlign() == Ctrl::BOTTOM || p.y.GetAlign() == Ctrl::SIZE;
+	};
+	return false;
+}
+
+bool LayoutDesigner::GetSpring(int i) {
+	if(itemi.IsEmpty()) return false;
+	return GetSpring(itemi.Top(), i);
+}
+
+void LayoutDesigner::Paint(Draw& w) {
+	Size sz = GetSize();
+	w.DrawRect(0, 0, sz.cx, sz.cy, layouti < 0 ? SLtGray : SWhite);
+	if(layouti >= 0) {
+		Rect r = form.GetRect();
+		DrawFatFrame(w, r, SBlack, -1);
+		w.DrawRect(r.right, r.bottom, TRACKERSIZE, TRACKERSIZE, SLtBlue);
+	}
+}
+
+bool LayoutDesigner::IsMoving() {
+	return HasCapture() && track.x == CENTER && track.y == CENTER && cltm;
+}
+
+void LayoutDesigner::DrawHorzSpring(Draw& w, int i) {
+	Rect r = GetSpringRect(i) - sb;
+	bool spring = GetSpring(i);
+	int wd = r.Width();
+	int y = (r.top + r.bottom) / 2;
+	Point p1 = Point(r.left, y);
+	if(!spring)
+		for(int i = 1; i < 10; i++) {
+			Point p2 = Point(r.left + i * wd / 10, y + (1 - 2 * (i & 1)) * (TRACKERSIZE - 1));
+			w.DrawLine(p1, p2, 1, SGray);
+			p1 = p2;
+		}
+	w.DrawLine(p1, Point(r.right - spring, y), 1 + spring, spring ? SRed : SGray);
+}
+
+void LayoutDesigner::DrawVertSpring(Draw& w, int i) {
+	Rect r = GetSpringRect(i) - sb;
+	bool spring = GetSpring(i);
+	int hg = r.Height();
+	int x = (r.left + r.right) / 2;
+	Point p1 = Point(x, r.top);
+	if(!spring)
+		for(int i = 1; i < 10; i++) {
+			Point p2 = Point(x + (1 - 2 * (i & 1)) * (TRACKERSIZE - 1), r.top + i * hg / 10);
+			w.DrawLine(p1, p2, 1, SGray);
+			p1 = p2;
+		}
+	w.DrawLine(p1, Point(x, r.bottom - spring), 1 + spring, spring ? SRed : SGray);
+}
+
+void LayoutDesigner::PaintTrack(Draw& w) {
+	if(track.x == SELECTRECT) {
+		Rect m = selectrect;
+		m.Normalize();
+		if(!m.IsEmpty())
+			DrawFrame(w, m, SLtRed, SLtRed);
+	}
+	else
+	if(!itemi.IsEmpty() && !IsMoving()) {
+		SetBar();
+		Point p = sb;
+		for(int i = 0; i < itemi.GetCount() - 1; i++) {
+			Rect r = ctrl[itemi[i]].GetRect() + (Point(10, 10) - p);
+			DrawFatFrame(w, r.left, r.top, r.Width(), r.Height(), SBrown, -3);
+		}
+		Rect actual = GetActual() - p;
+		DrawFatFrame(w, actual.left, actual.top, actual.Width(), actual.Height(), SCyan, -3);
+		DrawHorzSpring(w, SLEFT);
+		DrawHorzSpring(w, SRIGHT);
+		DrawVertSpring(w, STOP);
+		DrawVertSpring(w, SBOTTOM);
+		for(int h = LEFT; h <= RIGHT; h++)
+			for(int v = TOP; v <= BOTTOM; v++)
+				if(h != CENTER || v != CENTER)
+					w.DrawRect(GetTracker(Point(h, v)) - p, SLtBlue);
+	}
+}
+
+void LayoutDesigner::PaintForm(Draw& w) {
+	Size sz = form.GetRect().Size();
+	w.DrawRect(0, 0, sz.cx, sz.cy, SLtGray);
+	for(Ctrl *q = form.GetFirstChild(); q; q = q->GetNext())
+		if(q->IsTransparent())
+			DrawFrame(w, q->GetRect(), SWhiteGray, SWhiteGray);
+}
+
+Point LayoutDesigner::FindTracker(Point p) {
+	Point track;
+	for(track.x = LEFT; track.x <= FORM; track.x++)
+		for(track.y = TOP; track.y <= BOTTOM; track.y++)
+			if((track.x != CENTER || track.y != CENTER) && GetTracker(track).Contains(p))
+				return track;
+	return Point(-1, -1);
+}
+
+int   LayoutDesigner::FindItem(Point p) {
+	int i;
+	int mini = -1;
+	int min = INT_MAX;
+	p += Point(-10, -10);
+	for(i = 0; i < ctrl.GetCount(); i++) {
+		Rect r = ctrl[i].GetRect();
+		if(r.Contains(p)) {
+			int m = r.Width() * r.Height();
+			if(m < min) {
+				mini = i;
+				min = m;
+			}
+		}
+	}
+	return mini;
+}
+
+void LayoutDesigner::SetItemPos(int i, const Rect& r, int chi, bool val, bool sync) {
+	bool l = chi == SLEFT   ? val : GetSpring(i, SLEFT);
+	bool p = chi == SRIGHT  ? val : GetSpring(i, SRIGHT);
+	bool t = chi == STOP    ? val : GetSpring(i, STOP);
+	bool b = chi == SBOTTOM ? val : GetSpring(i, SBOTTOM);
+	Ctrl& q = ctrl[i];
+	Size sz = form.GetSize();
+	if(l)
+		if(p) q.HSizePos(r.left, sz.cx - r.right);
+		else  q.LeftPos(r.left, r.Width());
+	else
+		if(p) q.RightPos(sz.cx - r.right, r.Width());
+		else  q.HCenterPos(r.Width(), (r.left + r.right - sz.cx) / 2);
+	if(t)
+		if(b) q.VSizePos(r.top, sz.cy - r.bottom);
+		else  q.TopPos(r.top, r.Height());
+	else
+		if(b) q.BottomPos(sz.cy - r.bottom, r.Height());
+		else  q.VCenterPos(r.Height(), (r.top + r.bottom - sz.cy) / 2);
+	Item(i).pos = q.GetPos();
+	if(sync) {
+		{ TIMING("SetItemPos::Status");
+		ShowStatus();
+		}
+		{ TIMING("SetItemPos::Layout");
+		Layout();
+		}
+		{ TIMING("SetItemPos::Sync");
+		Sync();
+		}
+	}
+}
+
+void LayoutDesigner::SetActualPos(const Rect& r, int chi, bool val) {
+	if(itemi.GetCount())
+		SetItemPos(itemi.Top(), r, chi, val);
+}
+
+/*
+void LayoutDesigner::SetAutoItemPos(int i, const Rect& r) {
+	Ctrl& q = ctrl[i];
+	Size sz = form.GetSize();
+	if(r.left < sz.cx / 2)
+		if(r.right < sz.cx / 2)
+			q.LeftPos(r.left, r.Width());
+		else
+			q.HSizePos(r.left, sz.cx - r.right);
+	else
+		q.RightPos(sz.cx - r.right, r.Width());
+	if(r.top < sz.cy / 2)
+		if(r.bottom < sz.cy / 2)
+			q.TopPos(r.top, r.Height());
+		else
+			q.VSizePos(r.top, sz.cy - r.bottom);
+	else
+		q.BottomPos(sz.cy - r.bottom, r.Height());
+	Item(i).pos = q.GetPos();
+	ShowStatus();
+	Layout();
+	Sync();
+}
+*/
+
+Image LayoutDesigner::CursorImage(Point p, dword keyflags) {
+	p += sb;
+	if(IsMoving())
+		return CrossCursor();
+	if(HasCapture())
+		return track.x == SELECTRECT ? Image::Arrow() : GetTrackShape(track);
+	if(GetActual().Contains(p))
+		return Image::SizeAll();
+	Point track = FindTracker(p);
+	if(track.x >= 0)
+		return GetTrackShape(track);
+	return Image::Arrow();
+}
+
+void LayoutDesigner::RefreshActual() {
+	if(itemi.GetCount()) {
+		Rect r = GetActual();
+		r.Inflate(TRACKERSIZE, TRACKERSIZE);
+		Refresh(r - sb);
+		for(int i = SLEFT; i <= SBOTTOM; i++)
+			Refresh(GetSpringRect(i) - sb);
+	}
+}
+
+void LayoutDesigner::RefreshSelect(int i) {
+	if(i == itemi.GetCount() - 1)
+		RefreshActual();
+	else {
+		Rect r = ctrl[itemi[i]].GetRect() + Point(10, 10);
+		r.Inflate(TRACKERSIZE, TRACKERSIZE);
+		Refresh(r - sb);
+	}
+}
+
+int  LayoutDesigner::FindSelect(int im) {
+	for(int i = 0; i < itemi.GetCount(); i++)
+		if(itemi[i] == im) return i;
+	return -1;
+}
+
+void LayoutDesigner::UnselectItem(int im) {
+	int i = FindSelect(im);
+	if(i < 0) return;
+	RefreshSelect(i);
+	itemi.Remove(i);
+	RefreshActual();
+	if(itemi.GetCount() == 0)
+		ClearSelection();
+	else
+		SelectItem(itemi.Top());
+}
+
+void LayoutDesigner::ClearSelection0() {
+	for(int i = 0; i < itemi.GetCount(); i++) {
+		RefreshSelect(i);
+		itab.SetDisplay(itemi[i], 0, StdDisplay());
+		itab.SetDisplay(itemi[i], 1, VarLblDisplay(false));
+	}
+	itemi.Clear();
+	classname.Disable();
+	classname.Clear();
+	variable.Disable();
+	variable.Clear();
+	label.Disable();
+	label.Set("");
+	help.Disable();
+	help.Set("");
+	ShowStatus();
+	SetBar();
+}
+
+void LayoutDesigner::ShowHideLayouts()
+{
+	if(layouti < 0)
+		return;
+	Vector<int> layouts;
+	String dummy;
+	int i;
+	for(i = 0; i < ItemCount(); i++)
+		if(ParseLayoutRef(Item(i).classname, dummy) >= 0)
+			layouts.Add(i);
+	for(i = 0; i < layouts.GetCount(); i++)
+	{
+		int li = layouts[i];
+		Rect rc = ctrl[li].GetRect();
+		bool show = (FindIndex(itemi, li) >= 0);
+		if(!show)
+		{
+			show = true;
+			for(int p = 0; p < layouts.GetCount(); p++)
+				if(p != i && (ctrl[layouts[p]].GetRect() && rc) && (p < i || FindIndex(itemi, layouts[p]) >= 0))
+				{
+					show = false;
+					break;
+				}
+		}
+		ctrl[li].Show(show);
+	}
+	SynchronizeMnemonic();
+}
+
+void LayoutDesigner::ClearSelection() {
+	ClearSelection0();
+	itab.SetCursor(-1);
+}
+
+void LayoutDesigner::SelectItem(int im) {
+	if(im < 0) return;
+	RefreshActual();
+	UnselectItem(im);
+	itemi.Add(im);
+	RefreshActual();
+	itab.SetCursor(im);
+	itab.SetDisplay(im, 0, SelDisplay);
+	itab.SetDisplay(im, 1, VarLblDisplay(true));
+	classname.Enable();
+	variable.Enable();
+	label.Enable();
+	help.Enable();
+	ItemInfo& ii = Item(im);
+	classname <<= ii.classname;
+	variable <<= ii.variable;
+	label <<= Lng(ii.label);
+	help <<= Lng(ii.help);
+	ShowHideLayouts();
+	ShowStatus();
+	SetBar();
+}
+
+void LayoutDesigner::SelectOneItem(int im) {
+	ClearSelection0();
+	if(im < ctrl.GetCount())
+		SelectItem(im);
+}
+
+int FilterName(int c) {
+	return IsAlNum(c) ? ToLower(c) : 0;
+}
+
+void LayoutDesigner::WhenITab() {
+	if(itab.GetCursor() >= 0)
+		if(::GetCtrl() || ::GetShift())
+			SelectItem(itab.GetCursor());
+		else
+			SelectOneItem(itab.GetCursor());
+	SetFocus();
+}
+
+void LayoutDesigner::SetFormSize(Size sz) {
+	Point p = sb;
+	form.SetRect(-p.x + 10, -p.y + 10, sz.cx, sz.cy);
+	ActualForm().size = sz;
+	Refresh();
+	Layout();
+	Sync();
+}
+
+void LayoutDesigner::NewCtrl(int i) {
+	String clss = i < 0 ? String() : ClassMap().GetKey(i);
+	AddCtrl(clss, String(), String(), String());
+	Size sz = ctrl[itemi.Top()].GetMinSize();
+	SetActualPos(RectC(newctrl.x, newctrl.y, sz.cx * 8, sz.cy));
+}
+
+void LayoutDesigner::ClassMenu(Bar& menu) {
+	menu.Add("User class", classset[-1]);
+	menu.Separator();
+	for(int i = 0; i < ClassMap().GetCount(); i++) {
+		Bar::Item& m = menu.Add(ClassMap().GetKey(i), classset[i]);
+		if((i + 2) % 16 == 0) menu.Break();
+	}
+}
+
+void LayoutDesigner::RightDown(Point p, dword keyflags) {
+	if(layouti < 0) return;
+	newctrl = p;
+	MenuBar bar;
+	bar.SetFont(Arial(10)).LeftGap(2);
+	ClassMenu(bar);
+	bar.Execute();
+}
+
+void LayoutDesigner::RefreshSelectRect() {
+	Rect m = selectrect;
+	m.Normalize();
+	Refresh(m.left, m.top, 1, m.Height());
+	Refresh(m.left, m.top, m.Width(), 1);
+	Refresh(m.left, m.bottom - 1, m.Width(), 1);
+	Refresh(m.right - 1, m.top, 1, m.Height());
+}
+
+void LayoutDesigner::StartMoving(Point p) {
+	Rect actual = GetActualRect();
+	delta = p - actual.TopLeft();
+	melta.SetCount(itemi.GetCount() - 1);
+	for(int i = 0; i < itemi.GetCount() - 1; i++)
+		melta[i] = GetCtrlRect(itemi[i]).TopLeft() - actual.TopLeft();
+	track.x = track.y = CENTER;
+	SetCapture();
+}
+
+void LayoutDesigner::DoMoving() {
+	cltm = true;
+	for(int i = 0; i < itemi.GetCount(); i++)
+		RefreshSelect(i);
+}
+
+void LayoutDesigner::LeftDown(Point p, dword keyflags) {
+	LOG("@@ LeftDown");
+	if(layouti < 0) return;
+	int i;
+	moved = cltm = false;
+	p += sb;
+	SetFocus();
+	Rect actual = GetActual();
+	if(actual.Contains(p)) {
+		if((keyflags & K_SHIFT) && itemi.GetCount()) {
+			UnselectItem(itemi.Top());
+			return;
+		}
+		StartMoving(p);
+		DoMoving();
+		return;
+	}
+	track = FindTracker(p);
+	if(track.x >= 0) {
+		Rect fr = form.GetRect();
+		delta = Point(p.x - (track.x == FORM ? fr.right :
+		                     track.x == LEFT ? actual.left : actual.right),
+				      p.y - (track.x == FORM ? fr.bottom :
+							 track.y == TOP ? actual.top : actual.bottom));
+		SetCapture();
+		return;
+	}
+	i = FindItem(p);
+	if(i >= 0) {
+		if(keyflags & K_SHIFT)
+			if(ItemSelected(i))
+				UnselectItem(i);
+			else
+				SelectItem(i);
+		else
+			if(!ItemSelected(i))
+				SelectOneItem(i);
+		StartMoving(p);
+		DoMoving();
+		return;
+	}
+	for(i = SLEFT; i <= SBOTTOM; i++)
+		if(GetSpringRect(i).Contains(p)) {
+			RefreshActual();
+			SetActualPos(GetActualRect(), i, !GetSpring(i));
+			return;
+		}
+	if(!(keyflags & (K_SHIFT|K_CTRL)))
+		ClearSelection();
+	track.x = SELECTRECT;
+	selectrect.Set(p.x, p.y, p.x, p.y);
+	RefreshSelectRect();
+	SetCapture();
+}
+
+void LayoutDesigner::LeftRepeat(Point p, dword keyflags) {
+	if(!cltm) DoMoving();
+}
+
+void LayoutDesigner::MouseMove(Point p, dword keyflags) {
+	p += sb;
+	if(track.x == SELECTRECT && HasCapture()) {
+		RefreshSelectRect();
+		selectrect.right = p.x;
+		selectrect.bottom = p.y;
+		RefreshSelectRect();
+		return;
+	}
+	int gx = GridX();
+	int gy = GridY();
+	if(IsMoving() && itemi.GetCount()) {
+		LLOG("LayoutDesigner::MouseMove -> " << p);
+		bool m = false;
+		Size sz = GetActualRect().Size();
+		if(!moved) {
+			RefreshSelect(itemi.GetCount() - 1);
+			m = true;
+		}
+		Rect cr = RectC((p.x - delta.x) / gx * gx, (p.y - delta.y) / gy * gy, sz.cx, sz.cy);
+		for(int i = 0; i < itemi.GetCount() - 1; i++) {
+			int im = itemi[i];
+			if(!moved) {
+				RefreshSelect(i);
+				m = true;
+			}
+			Size sz = GetCtrlRect(im).Size();
+			SetItemPos(im, RectC(cr.left + melta[i].x, cr.top + melta[i].y, sz.cx, sz.cy), -1, false, false);
+		}
+		SetItemPos(itemi.Top(), cr, -1, false, true);
+		if(m) moved = true;
+		return;
+	}
+	p -= delta;
+	if(HasCapture()) {
+		if(track.x == FORM) {
+			Size sz = Size(max(0, p.x - 10), max(0, p.y - 10));
+			sz.cx = sz.cx / gx * gx;
+			sz.cy = sz.cy / gy * gy;
+			SetFormSize(sz);
+			ShowStatus();
+			return;
+		}
+		if(itemi.GetCount()) {
+			Rect actual = GetActualRect();
+			RefreshActual();
+			p.Offset(-10, -10);
+			if(track.x == LEFT) actual.left = min(actual.right, p.x) / gx * gx;
+			if(track.x == RIGHT) actual.right = max(actual.left, p.x) / gy * gy;
+			if(track.y == TOP) actual.top = min(actual.bottom, p.y) / gx * gx;
+			if(track.y == BOTTOM) actual.bottom = max(actual.top, p.y) / gy * gy;
+			if(!ignoremin) {
+				Size sz = ctrl[itemi.Top()].GetMinSize();
+				actual.right = max(actual.left + sz.cx, actual.right);
+				actual.bottom = max(actual.top + sz.cy, actual.bottom);
+			}
+			SetActualPos(actual);
+			RefreshActual();
+			moved = true;
+		}
+	}
+}
+
+void LayoutDesigner::LeftUp(Point p, dword keyflags) {
+	LOG("@@@ LeftUp");
+	for(int i = 0; i < itemi.GetCount(); i++)
+		RefreshSelect(i);
+	if(track.x == SELECTRECT) {
+		if(!(keyflags & (K_SHIFT|K_CTRL)))
+			ClearSelection();
+		Rect m = selectrect;
+		m.Normalize();
+		m.Offset(-10, -10);
+		m += sb;
+		for(int i = 0; i < ctrl.GetCount(); i++) {
+			Rect r = ctrl[i].GetRect();
+			if(r.left >= m.left && r.right <= m.right && r.top >= m.top && r.bottom <= m.bottom)
+				SelectItem(i);
+		}
+		track.x = -1;
+		RefreshSelectRect();
+		return;
+	}
+	if(!(keyflags & K_SHIFT) && !(keyflags & K_CTRL) && !moved) {
+		int i = FindItem(p + sb);
+		if(i >= 0)
+			SelectOneItem(i);
+	}
+}
+
+void LayoutDesigner::Scroll() {
+	SetFormSize(form.GetSize());
+}
+
+void LayoutDesigner::NewClass() {
+	if(itemi.IsEmpty()) return;
+	for(int i = 0; i < itemi.GetCount(); i++) {
+		int im = itemi[i];
+		Item(im).classname = classname;
+		SetClass(im);
+		RefreshActual();
+	}
+}
+
+void LayoutDesigner::NewVariable() {
+	if(itemi.IsEmpty()) return;
+	itab.Set(itemi.Top(), 1, Item(itemi.Top()).variable = variable);
+}
+
+static int FilterOutCr(int c) {
+	return c == '\r' ? 0 : c;
+}
+
+void LayoutDesigner::NewLabel() {
+	if(itemi.IsEmpty()) return;
+	ItemLabel(itemi.Top()) = Filter(label.Get(), FilterOutCr);
+	SynchronizeCtrl();
+	SynchronizeMnemonic();
+}
+
+void LayoutDesigner::NewHelp() {
+	if(itemi.IsEmpty()) return;
+	Help(itemi.Top()) = Filter(help.Get(), FilterOutCr);
+	SynchronizeCtrl();
+}
+
+void LayoutDesigner::Layout() {
+	sb.SetPage(GetSize());
+	Size sz = form.GetSize() + Size(20, 20);
+	for(int i = 0; i < ctrl.GetCount(); i++) {
+		sz.cx = max(ctrl[i].GetRect().right + TRACKERSIZE + 20, sz.cx);
+		sz.cy = max(ctrl[i].GetRect().bottom + TRACKERSIZE + 20, sz.cy);
+	}
+	sb.SetTotal(sz);
+	int cx = frame.GetSize().cx;
+//	menubar.LeftPos(0, cx / 2);
+	status.Width(cx >> 1);
+}
+
+void LayoutDesigner::ShowStatus() {
+	String s;
+	if(layouti >= 0) {
+		Size sz = form.GetRect().Size();
+		s = "Layout size: " + ::AsString(sz);
+		if(itemi.GetCount()) {
+			Rect r = ctrl[itemi.Top()].GetRect();
+			s << "  Item: " << ::AsString(r) <<
+				 " - {" << sz.cx - r.right << ", " << sz.cy - r.bottom << '}';
+		}
+	}
+	status.SetLabelText(s);
+}
+
+static int RoundStep(int org, int d, int g)
+{
+	return d ? itimesfloor(org + d * g + (d > 0 ? 0 : g - 1), g) - org : 0;
+}
+
+void LayoutDesigner::KeyMove(int dx, int dy, int sx, int sy) {
+	if(itemi.IsEmpty())
+		return;
+	Rect main = GetCtrlRect(itemi.Top()), shift;
+	int gx = GridX(), gy = GridY();
+	shift.left = shift.right = RoundStep(main.left, dx, gx);
+	shift.top = shift.bottom = RoundStep(main.top, dy, gy);
+	shift.right += RoundStep(main.Width(), sx, gx);
+	shift.bottom += RoundStep(main.Height(), sy, gy);
+	for(int i = itemi.GetCount(); --i >= 0;) {
+		RefreshSelect(i);
+		SetItemPos(itemi[i], GetCtrlRect(itemi[i]) + shift, -1, false, i == 0);
+		RefreshSelect(i);
+	}
+}
+
+bool LayoutDesigner::Key(dword key, int count) {
+	switch(key) {
+	case K_RIGHT:
+	case K_DOWN:
+		if(itemi.IsEmpty())
+			SelectOneItem(ctrl.GetCount() - 1);
+		else
+		if(itemi.Top() < ctrl.GetCount() - 1)
+			SelectOneItem(itemi.Top() + 1);
+		return true;
+	case K_LEFT:
+	case K_UP:
+		if(itemi.IsEmpty())
+			SelectOneItem(0);
+		else
+		if(itemi.Top() > 0)
+			SelectOneItem(itemi.Top() - 1);
+		return true;
+	case K_PAGEUP:
+		if(layouti > 0 && layout.GetCount() - 1)
+			SetLayout(layouti - 1);
+		break;
+	case K_PAGEDOWN:
+		if(layouti < layout.GetCount() - 1)
+			SetLayout(layouti + 1);
+		break;
+	case K_HOME:
+		SelectOneItem(0);
+		break;
+	case K_END:
+		SelectOneItem(ctrl.GetCount() - 1);
+		break;
+	case K_SHIFT_LEFT:
+		KeyMove(-1, 0, 0, 0);
+		break;
+	case K_SHIFT_RIGHT:
+		KeyMove(1, 0, 0, 0);
+		break;
+	case K_SHIFT_UP:
+		KeyMove(0, -1, 0, 0);
+		break;
+	case K_SHIFT_DOWN:
+		KeyMove(0, 1, 0, 0);
+		break;
+	case K_SHIFT_CTRL_LEFT:
+		KeyMove(0, 0, -1, 0);
+		break;
+	case K_SHIFT_CTRL_RIGHT:
+		KeyMove(0, 0, 1, 0);
+		break;
+	case K_SHIFT_CTRL_UP:
+		KeyMove(0, 0, 0, -1);
+		break;
+	case K_SHIFT_CTRL_DOWN:
+		KeyMove(0, 0, 0, 1);
+		break;
+	default:
+		if(key >= ' ' && key < 256) {
+			label.SetFocus();
+			return label.Key(key, count);
+		}
+		return menubar.HotKey(key);
+	}
+	SetFocus();
+	return true;
+}
+
+void LayoutDesigner::AddItem() {
+	if(layouti < 0) return;
+	AddCtrl(String(), String(), String(), String());
+}
+
+void LayoutDesigner::MoveUp() {
+#ifdef _DEBUG
+	if(GetFocusCtrl())
+		GetFocusCtrl()->Dump();
+#endif
+	if(itemi.GetCount()) {
+		int sc = itab.GetCursorSc();
+		Vector<int> ilist(itemi, 0), sorted(itemi, 0);
+		Sort(sorted);
+		if(sorted[0] == 0)
+		{
+			BeepExclamation();
+			return;
+		}
+		ClearSelection();
+		int i;
+		for(i = 0; i < sorted.GetCount(); i++)
+			Swap(sorted[i], sorted[i] - 1);
+		for(i = 0; i < ilist.GetCount(); i++)
+			SelectItem(ilist[i] - 1);
+		itab.ScCursor(sc - itab.GetLineCy());
+		itab.ScrollIntoCursor();
+	}
+}
+
+void LayoutDesigner::MoveDown() {
+	if(itemi.GetCount()) {
+		int sc = itab.GetCursorSc();
+		Vector<int> ilist(itemi, 0), sorted(itemi, 0);
+		Sort(sorted);
+		if(sorted.Top() >= ctrl.GetCount() - 1)
+		{
+			BeepExclamation();
+			return;
+		}
+		ClearSelection();
+		int i;
+		for(i = sorted.GetCount(); --i >= 0;)
+			Swap(sorted[i], sorted[i] + 1);
+		for(i = 0; i < ilist.GetCount(); i++)
+			SelectItem(ilist[i] + 1);
+		itab.ScCursor(sc + itab.GetLineCy());
+		itab.ScrollIntoCursor();
+	}
+}
+
+void LayoutDesigner::ToggleIgnoreMin() {
+	ignoremin = !ignoremin;
+}
+
+void LayoutDesigner::ToggleQLIB2Output() {
+	qlib2_output = !qlib2_output;
+}
+
+void LayoutDesigner::ItemPos(int xy)
+{
+	ITEMPOS xpos = (ITEMPOS)LOWORD(xy), ypos = (ITEMPOS)HIWORD(xy);
+	Size sz = form.GetSize(), half = sz >> 1;
+
+	for(int i = 0; i < itemi.GetCount(); i++)
+	{
+		RefreshSelect(i);
+		Ctrl& q = ctrl[itemi[i]];
+		Rect r = q.GetRect();
+
+		ITEMPOS axpos = xpos;
+		if(axpos == POS_AUTO)
+			axpos = (r.left < half.cy ? r.right < half.cy ? POS_LEFT : POS_SIZE : POS_RIGHT);
+		switch(axpos)
+		{
+		case POS_LEFT:   q.LeftPos(r.left, r.Width()); break;
+		case POS_RIGHT:  q.RightPos(sz.cx - r.right, r.Width()); break;
+		case POS_CENTER: q.HCenterPos(r.Width(), (r.left + r.right - sz.cx) >> 1); break;
+		case POS_SIZE:   q.HSizePos(r.left, sz.cx - r.right); break;
+		}
+
+		ITEMPOS aypos = ypos;
+		if(aypos == POS_AUTO)
+			aypos = (r.top < half.cy ? r.bottom < half.cy ? POS_TOP : POS_SIZE : POS_BOTTOM);
+		switch(aypos)
+		{
+		case POS_TOP:    q.TopPos(r.top, r.Height()); break;
+		case POS_BOTTOM: q.BottomPos(sz.cy - r.bottom, r.Height()); break;
+		case POS_CENTER: q.VCenterPos(r.Height(), (r.top + r.bottom - sz.cy) >> 1); break;
+		case POS_SIZE:   q.VSizePos(r.top, sz.cy - r.bottom); break;
+		}
+
+		SetItemPos(itemi[i], r);
+		RefreshSelect(i);
+	}
+}
+
+int LayoutDesigner::GetItemPosMask() const
+{
+	int xbits = 0, ybits = 0;
+	for(int i = 0; i < itemi.GetCount(); i++)
+	{
+		LogPos pos = ctrl[itemi[i]].GetPos();
+		switch(pos.x.GetAlign())
+		{
+		case Ctrl::LEFT:   xbits |= 1 << POS_LEFT; break;
+		case Ctrl::RIGHT:  xbits |= 1 << POS_RIGHT; break;
+		case Ctrl::CENTER: xbits |= 1 << POS_CENTER; break;
+		case Ctrl::SIZE:   xbits |= 1 << POS_SIZE; break;
+		}
+		switch(pos.y.GetAlign())
+		{
+		case Ctrl::LEFT:   ybits |= 1 << POS_TOP; break;
+		case Ctrl::RIGHT:  ybits |= 1 << POS_BOTTOM; break;
+		case Ctrl::CENTER: ybits |= 1 << POS_CENTER; break;
+		case Ctrl::SIZE:   ybits |= 1 << POS_SIZE; break;
+		}
+	}
+	return MAKELONG(xbits, ybits);
+}
+
+/*
+void LayoutDesigner::AutoPos() {
+	for(int i = 0; i < itemi.GetCount(); i++) {
+		int im = itemi[i];
+		Rect r = GetCtrlRect(im);
+		SetAutoItemPos(im, r);
+		RefreshSelect(i);
+	}
+}
+
+void LayoutDesigner::NormalPos() {
+	for(int i = 0; i < itemi.GetCount(); i++) {
+		int im = itemi[i];
+		Rect r = GetCtrlRect(im);
+		ctrl[im].TopPos(0, 0).LeftPos(0, 0);
+		SetItemPos(im, r);
+		RefreshSelect(i);
+	}
+}
+*/
+
+void LayoutDesigner::VertCenter() {
+	for(int i = 0; i < itemi.GetCount(); i++) {
+		int im = itemi[i];
+		RefreshSelect(i);
+		Rect r = GetCtrlRect(im);
+		ctrl[im].VCenterPos(0, 0);
+		int h = r.Height();
+		r.top = (form.GetSize().cy - h) / 2;
+		r.bottom = r.top + h;
+		SetItemPos(im, r);
+		RefreshSelect(i);
+	}
+}
+
+void LayoutDesigner::HorzCenter() {
+	for(int i = 0; i < itemi.GetCount(); i++) {
+		int im = itemi[i];
+		RefreshSelect(i);
+		Rect r = GetCtrlRect(im);
+		ctrl[im].HCenterPos(0, 0);
+		int w = r.Width();
+		r.left = (form.GetSize().cx - w) / 2;
+		r.right = r.left + w;
+		SetItemPos(im, r);
+		RefreshSelect(i);
+	}
+}
+
+void LayoutDesigner::AlignLeft() {
+	if(!itemi.GetCount()) return;
+	int ax = GetCtrlRect(itemi.Top()).left;
+	for(int i = 0; i < itemi.GetCount() - 1; i++) {
+		int im = itemi[i];
+		RefreshSelect(i);
+		Rect r = GetCtrlRect(im);
+		r.Offset(ax - r.left, 0);
+		SetItemPos(im, r);
+		RefreshSelect(i);
+	}
+}
+
+void LayoutDesigner::AlignRight() {
+	if(!itemi.GetCount()) return;
+	int ax = GetCtrlRect(itemi.Top()).right;
+	for(int i = 0; i < itemi.GetCount() - 1; i++) {
+		int im = itemi[i];
+		RefreshSelect(i);
+		Rect r = GetCtrlRect(im);
+		r.Offset(ax - r.right, 0);
+		SetItemPos(im, r);
+		RefreshSelect(i);
+	}
+}
+
+void LayoutDesigner::AlignTop() {
+	if(!itemi.GetCount()) return;
+	int ay = GetCtrlRect(itemi.Top()).top;
+	for(int i = 0; i < itemi.GetCount() - 1; i++) {
+		int im = itemi[i];
+		RefreshSelect(i);
+		Rect r = GetCtrlRect(im);
+		r.Offset(0, ay - r.top);
+		SetItemPos(im, r);
+		RefreshSelect(i);
+	}
+}
+
+void LayoutDesigner::AlignBottom() {
+	if(!itemi.GetCount()) return;
+	int ay = GetCtrlRect(itemi.Top()).bottom;
+	for(int i = 0; i < itemi.GetCount() - 1; i++) {
+		int im = itemi[i];
+		RefreshSelect(i);
+		Rect r = GetCtrlRect(im);
+		r.Offset(0, ay - r.bottom);
+		SetItemPos(im, r);
+		RefreshSelect(i);
+	}
+}
+
+void LayoutDesigner::AlignVCenter() {
+	if(!itemi.GetCount()) return;
+	Rect dr = GetCtrlRect(itemi.Top());
+	for(int i = 0; i < itemi.GetCount() - 1; i++) {
+		int im = itemi[i];
+		RefreshSelect(i);
+		Rect r = GetCtrlRect(im);
+		r.Offset(0, dr.top + (dr.Height() - r.Height()) / 2 - r.top);
+		SetItemPos(im, r);
+		RefreshSelect(i);
+	}
+}
+
+void LayoutDesigner::AlignHCenter() {
+	if(!itemi.GetCount()) return;
+	Rect dr = GetCtrlRect(itemi.Top());
+	for(int i = 0; i < itemi.GetCount() - 1; i++) {
+		int im = itemi[i];
+		RefreshSelect(i);
+		Rect r = GetCtrlRect(im);
+		r.Offset(dr.left + (dr.Width() - r.Width()) / 2 - r.left, 0);
+		SetItemPos(im, r);
+		RefreshSelect(i);
+	}
+}
+
+void LayoutDesigner::AlignLbl() {
+	if(!itemi.GetCount()) return;
+	for(int i = 0; i < itemi.GetCount(); i++) {
+		int im = itemi[i];
+		if(Item(im).classname == "Label") {
+			Ctrl *ref = NULL;
+			if(im + 1 >= ItemCount() || Item(im + 1).classname == "Label") {
+				if(im > 0 && Item(im - 1).classname != "Label")
+					ref = &ctrl[im - 1];
+			}
+			else
+				ref = &ctrl[im + 1];
+			if(ref) {
+				Rect dr = ref->GetRect();
+				RefreshSelect(i);
+				Rect r = GetCtrlRect(im);
+				r.Offset(0, dr.top + (dr.Height() - r.Height()) / 2 - r.top);
+				SetItemPos(im, r);
+				RefreshSelect(i);
+			}
+		}
+	}
+}
+
+void LayoutDesigner::SameWidth() {
+	if(!itemi.GetCount()) return;
+	int ax = GetCtrlRect(itemi.Top()).Width();
+	for(int i = 0; i < itemi.GetCount() - 1; i++) {
+		int im = itemi[i];
+		RefreshSelect(i);
+		Rect r = GetCtrlRect(im);
+		r.right = r.left + ax;
+		SetItemPos(im, r);
+		RefreshSelect(i);
+	}
+}
+
+void LayoutDesigner::SameHeight() {
+	if(!itemi.GetCount()) return;
+	int ay = GetCtrlRect(itemi.Top()).Height();
+	for(int i = 0; i < itemi.GetCount() - 1; i++) {
+		int im = itemi[i];
+		RefreshSelect(i);
+		Rect r = GetCtrlRect(im);
+		r.bottom = r.top + ay;
+		SetItemPos(im, r);
+		RefreshSelect(i);
+	}
+}
+
+void LayoutDesigner::SameSize() {
+	if(!itemi.GetCount()) return;
+	Rect m = GetCtrlRect(itemi.Top());
+	for(int i = 0; i < itemi.GetCount() - 1; i++) {
+		int im = itemi[i];
+		RefreshSelect(i);
+		Rect r = GetCtrlRect(im);
+		r.right = r.left + m.Width();
+		r.bottom = r.top + m.Height();
+		SetItemPos(im, r);
+		RefreshSelect(i);
+	}
+}
+
+void LayoutDesigner::MinHeight() {
+	for(int i = 0; i < itemi.GetCount(); i++) {
+		int im = itemi[i];
+		RefreshSelect(i);
+		Rect r = GetCtrlRect(im);
+		Size sz = ctrl[im].GetMinSize();
+		r.bottom = r.top + sz.cy;
+		SetItemPos(im, r);
+		RefreshSelect(i);
+	}
+}
+
+void LayoutDesigner::MinWidth() {
+	for(int i = 0; i < itemi.GetCount(); i++) {
+		int im = itemi[i];
+		RefreshSelect(i);
+		Rect r = GetCtrlRect(im);
+		Size sz = ctrl[im].GetMinSize();
+		r.right = r.left + sz.cx;
+		SetItemPos(im, r);
+		RefreshSelect(i);
+	}
+}
+
+void LayoutDesigner::Cut() {
+	Copy();
+	Delete();
+}
+
+void LayoutDesigner::Copy() {
+	String out;
+	for(int i = 0; i < itemi.GetCount(); i++)
+		out << SaveCtrl(Item(itemi[i]), i, "", false);
+//	EmptyClipboard();
+//	WriteClipboard(CF_TEXT, out);
+	WriteClipboardText(out, true);
+}
+
+void LayoutDesigner::SelectToEnd(int i) {
+	ClearSelection();
+	while(i < ctrl.GetCount())
+		SelectItem(i++);
+}
+
+void LayoutDesigner::Paste() {
+	int i = ctrl.GetCount();
+	try {
+		String s = ReadClipboardText();
+		CParser p(s);
+		for(;;)
+			LoadCtrl(p, ActualForm().item.Add(), langi);
+	}
+	catch(CParser::Error&) {
+		ActualForm().item.Drop();
+	}
+	SynchronizeCtrls();
+	SelectToEnd(i);
+}
+
+void LayoutDesigner::SelectAll() {
+	SelectToEnd(0);
+}
+
+int FindIndex(const Vector<int>& c, int ii) {
+	for(int i = 0; i < c.GetCount(); i++)
+		if(c[i] == ii) return i;
+	return -1;
+}
+
+void LayoutDesigner::Delete() {
+	for(int ii = ctrl.GetCount(); ii >= 0; ii--)
+		if(FindIndex(itemi, ii) >= 0) {
+			UnselectItem(ii);
+			ctrl.Remove(ii);
+			ActualForm().item.Remove(ii);
+			itab.Remove(ii);
+		}
+	Refresh();
+}
+
+void LayoutDesigner::DoDuplicate(const Vector<int>& imi, int dx, int dy) {
+	if(layouti < 0) return;
+	for(int i = 0; i < imi.GetCount(); i++) {
+		int im = imi[i];
+		const ItemInfo& ii = Item(im);
+		const Ctrl& q = ctrl[im];
+		AddCtrl(ii.classname, String(), Lng(ii.label), Lng(ii.help));
+		SetItemPos(ctrl.GetCount() - 1, q.GetRect() + Point(dx, dy));
+	}
+}
+
+void LayoutDesigner::Duplicate() {
+	int si = ctrl.GetCount();
+	Vector<int> imi(itemi, 1);
+	ClearSelection();
+	DoDuplicate(imi, 16, 16);
+	SelectToEnd(si);
+}
+
+void LayoutDesigner::Matrix() {
+	if(!itemi.GetCount()) return;
+	if(matrix.Execute() != IDOK) return;
+	int si = ctrl.GetCount();
+	Vector<int> imi(itemi, 1);
+	Rect br = GetActualRect();
+	ClearSelection();
+	for(int i = 0; i < imi.GetCount() - 1; i++)
+		br |= GetCtrlRect(imi[i]);
+	for(int x = 0; x < (int)~matrix.x; x++)
+		for(int y = 0; y < (int)~matrix.y; y++)
+			if(x > 0 || y > 0)
+				DoDuplicate(imi, x * (br.Width() + (int)~matrix.hspace),
+								 y * (br.Height() + (int)~matrix.vspace));
+	SelectToEnd(si);
+}
+
+void LayoutDesigner::ToggleGrid() {
+	usegrid = !usegrid;
+	SetBar();
+}
+
+void LayoutDesigner::SetupAlias() {
+	if(alias_map.Edit() && !alias_map.Save(alias_map_file))
+		Exclamation(NFormat("Error saving alias file [* \1%s\1].", alias_map_file));
+	UpdateClassList();
+}
diff --git a/uppsrc/rw/Designer.h b/uppsrc/rw/Designer.h
new file mode 100644
index 000000000..67d635715
--- /dev/null
+++ b/uppsrc/rw/Designer.h
@@ -0,0 +1,401 @@
+#include <CtrlLib/CtrlLib.h>
+
+#define  LAYOUTFILE <rw/Designer.lay>
+#include <CtrlCore/lay.h>
+
+#define  IMAGEFILE <rw/rw.iml>
+#include <Draw/iml_header.h>
+
+const Display& VarLblDisplay(bool selected);
+
+typedef Ctrl *(*CtrlCreator)();
+
+class AliasMap {
+public:
+	AliasMap() {}
+
+	static String  StdFileName();
+
+	bool           IsEmpty() const { return obj_source.IsEmpty(); }
+
+	bool           Edit();
+
+	bool           Load(const char *path);
+	bool           Save(const char *path);
+	void           SetDefault();
+
+	String         Convert(const String& name) const;
+
+public:
+	Vector<String> obj_source;
+	Vector<String> obj_dest;
+};
+
+class SelectedDisplay : public Display {
+	virtual void Paint(Draw& w, const Rect& r, const Value& q, Color i, Color p, dword s) const;
+};
+
+extern const SelectedDisplay SelDisplay;
+
+class LayoutDesigner : public Ctrl {
+public:
+	virtual void  Paint(Draw& w);
+	virtual Image CursorImage(Point p, dword keyflags);
+	virtual void  LeftDown(Point p, dword keyflags);
+	virtual void  LeftRepeat(Point p, dword keyflags);
+	virtual void  LeftUp(Point p, dword keyflags);
+	virtual void  RightDown(Point p, dword keyflags);
+	virtual void  MouseMove(Point p, dword keyflags);
+	virtual bool  Key(dword key, int count);
+	virtual void  Layout();
+	virtual void  Serialize(Stream& s);
+
+protected:
+	enum {
+		LEFT,
+		CENTER,
+		RIGHT,
+		TOP     = LEFT,
+		BOTTOM  = RIGHT,
+		FORM,
+		SELECTRECT,
+
+		TRACKERSIZE = 6,
+
+		SLEFT = 0,
+		SRIGHT,
+		STOP,
+		SBOTTOM,
+	};
+
+	enum ITEMPOS
+	{
+		POS_NONE,
+		POS_AUTO,
+		POS_LEFT,
+		POS_CENTER,
+		POS_RIGHT,
+		POS_SIZE,
+		POS_TOP = POS_LEFT,
+		POS_BOTTOM = POS_RIGHT,
+	};
+
+	struct ItemInfo {
+		LogPos         pos;
+		String         classname;
+		String         variable;
+		String         labelid;
+		String         helpid;
+		Vector<String> label;
+		Vector<String> help;
+		dword          hotkey;
+	};
+
+	struct Form {
+		String          name;
+		Size            size;
+		Array<ItemInfo> item;
+	};
+
+	Array<Form> layout;
+	int         layouti;
+	int         langi;
+
+	DropList         layoutlist;
+	DropList         langlist;
+
+	CallbackArg<int>   classset;
+	Point              newctrl;
+
+	WithGridLayout<TopWindow> grid;
+	bool        usegrid;
+	bool        ignoremin;
+	bool        qlib2_output;
+
+	WithMatrixLayout<TopWindow> matrix;
+
+	String        filename;
+	FileSel       filesel;
+	LRUList       LruList;
+
+	AliasMap      alias_map;
+	String        alias_map_file;
+
+	Rect          selectrect;
+	Point         track;
+	Vector<int>   itemi;
+	Vector<Point> melta;
+	Point         delta;
+	bool          moved;
+	bool          cltm;
+
+	Ctrl            design;
+	Splitter        splital;
+
+	ArrayCtrl       itab;
+
+	Splitter                   props;
+	Splitter                   label_help_split;
+	Ctrl                       class_var_lbl;
+	WithDropChoice<EditString> classname;
+	EditString                 variable;
+	DocEdit                    label;
+	DocEdit                    help;
+
+	struct DesignForm;
+	friend struct DesignForm;
+	struct DesignForm : public Ctrl {
+		virtual void Paint(Draw& w)                               { ld->PaintForm(w); }
+		LayoutDesigner *ld;
+	};
+
+	DesignForm      form;
+	Array<Ctrl>     ctrl;
+	Array<Ctrl>     ref_ctrl;
+	Array<Ctrl>     mnem_ctrl;
+
+	ScrollBars      sb;
+
+	struct AfterPaint;
+	friend struct AfterPaint;
+
+	struct AfterPaint : public Ctrl {
+		virtual void Paint(Draw& w)                               { ld->PaintTrack(w); }
+		LayoutDesigner *ld;
+	};
+
+	AfterPaint  apaint;
+
+	MenuBar     menubar;
+	ToolBar     toolbar;
+	FrameRight<Label> status;
+
+	static VectorMap<String, CtrlCreator>& ClassMap();
+
+	struct Frame;
+	friend struct Frame;
+	struct Frame : public TopWindow {
+		void WindowClose()       { ld->CloseFile(); }
+		virtual bool Key(dword k, int c) { return ld->Key(k, c) ? true : TopWindow::Key(k, c); }
+		LayoutDesigner *ld;
+
+		Frame() { WhenClose = callback(this, &Frame::WindowClose); }
+	};
+
+	Frame frame;
+
+	static int   GetTrack(int a, int b, int type);
+	static Image GetTrackShape(Point track);
+
+	String&   Lng(Vector<String>& x)          { return x.At(langi); }
+	String    Lng(const Vector<String>& x) const;
+	Form&     ActualForm()                    { return layout[layouti]; }
+	const Form& ActualForm() const            { return layout[layouti]; }
+	ItemInfo& Item(int i)                     { return ActualForm().item[i]; }
+	const ItemInfo& Item(int i) const         { return ActualForm().item[i]; }
+	int       ItemCount()                     { return ActualForm().item.GetCount(); }
+//G++ bug
+	String&   ItemLabel(int i);
+	String    ItemLabel(int i) const;
+	String&   Help(int i);
+	String    Help(int i) const;
+
+	Ctrl     *CreateCtrl(const String& classname);
+	Ctrl     *CreateCtrl(const String& classname, Index<String>& recursed);
+	Ctrl     *CreateLayoutCtrl(String classname, Index<String>& recursed);
+
+	int    ParseLayoutRef(String cls, String& base) const;
+	bool   IsLayoutRef(String cls) const { String dummy; return ParseLayoutRef(cls, dummy) >= 0; }
+	void   SynchronizeCtrl(int im);
+	void   SynchronizeCtrl(Ctrl& ctrl, const ItemInfo& ii);
+	void   SynchronizeCtrl();
+	void   SynchronizeCtrls();
+	void   SynchronizeMnemonic();
+	void   CleanRefCtrl();
+	void   AddCtrl(const String& cls, const String& var, const String& lbl, const String& hlp);
+	void   SetClass(int im);
+	void   UpdateClassList();
+
+	void   LoadCtrl(CParser& p, ItemInfo& ii, int langi = 0);
+	String SaveCtrl(const ItemInfo& ii, int i, const String& name, bool lang) const;
+
+	Rect   GetSpringRect(int i);
+	Rect   GetTracker(Point track);
+	Point  FindTracker(Point p);
+	Rect   GetCtrlRect(int i);
+	Rect   GetActualRect();
+	Rect   GetActual();
+	void   RefreshActual();
+	int    FindItem(Point p);
+	void   DrawHorzSpring(Draw& w, int i);
+	void   DrawVertSpring(Draw& w, int i);
+	void   PaintTrack(Draw& w);
+	void   PaintForm(Draw& w);
+	void   StartMoving(Point p);
+	void   DoMoving();
+	bool   IsMoving();
+	bool   GetSpring(int im, int i);
+	bool   GetSpring(int i);
+	void   SetItemPos(int i, const Rect& r, int chi = -1, bool val = false, bool sync = true);
+	void   SetActualPos(const Rect& r, int chi = -1, bool val = false);
+	void   ShowHideLayouts();
+//	void   SetAutoItemPos(int i, const Rect& r);
+	void   WhenITab();
+	void   NewClass();
+	void   NewVariable();
+	void   NewLabel();
+	void   NewHelp();
+	void   SetFormSize(Size sz);
+	void   ClassMenu(Bar& menu);
+	void   NewCtrl(int i);
+
+	int    FindSelect(int im);
+	void   SelectItem(int im);
+	void   SelectOneItem(int im);
+	void   UnselectItem(int im);
+	bool   ItemSelected(int im)                                { return FindSelect(im) >= 0; }
+	void   ClearSelection();
+	void   ClearSelection0();
+	void   RefreshSelect(int i);
+	void   SelectToEnd(int i);
+
+	void   RefreshSelectRect();
+
+	void   Swap(int i1, int i2);
+	void   SetLayout(int i, int li);
+	void   SetLayout(int i)                                    { SetLayout(i, langi); }
+	void   EnterLayout();
+	void   EnterLanguage();
+	void   Scroll();
+	void   ItemPos(int xy_long);
+	int    GetItemPosMask() const;
+
+	void   SetupLayoutList();
+	void   NewLayout();
+	void   RemoveLayout();
+	void   RenameLayout();
+	void   PrevLayout();
+	void   NextLayout();
+
+	bool   SaveLayoutFileAs();
+
+	bool   DoSave();
+	bool   PromptSave();
+	void   LruOpen(const String& s);
+	void   MakeCaption();
+	void   OpenFile();
+	void   SaveFile();
+	void   SaveFileAs();
+	void   CloseFile();
+	void   NewFile();
+
+#ifdef flagIDERW
+	void   CloseDesigner();
+#endif
+
+	void   SetupAlias();
+	void   SetupGrid();
+	void   ToggleGrid();
+	void   ToggleIgnoreMin();
+	void   ToggleQLIB2Output();
+	int    GridX()                           { return usegrid ? max((int)~grid.x, 1) : 1; }
+	int    GridY()                           { return usegrid ? max((int)~grid.y, 1) : 1; }
+
+	void   AddItem();
+	void   MoveUp();
+	void   MoveDown();
+
+	void   DoDuplicate(const Vector<int>& imi, int dx, int dy);
+	void   KeyMove(int dx, int dy, int sx, int sy);
+
+	void   Copy();
+	void   Cut();
+	void   Paste();
+	void   Delete();
+	void   Duplicate();
+	void   SelectAll();
+
+	void   VertCenter();
+	void   HorzCenter();
+	void   AlignLeft();
+	void   AlignRight();
+	void   AlignTop();
+	void   AlignBottom();
+	void   AlignHCenter();
+	void   AlignVCenter();
+	void   SameWidth();
+	void   SameHeight();
+	void   SameSize();
+	void   MinWidth();
+	void   MinHeight();
+	void   Matrix();
+	void   AlignLbl();
+
+	void   ShowStatus();
+
+	Vector<String> CoreLangs();
+	void   AddLang(const String& lang, bool copy);
+	void   NewLanguage();
+	void   RenameLanguage();
+	void   RemoveLanguage();
+	void   AddCoreLanguages();
+	void   NextLang();
+	void   PrevLang();
+
+	void   FileBar(Bar& bar);
+	void   LayoutBar(Bar& bar);
+	void   SpringsBar(Bar& bar);
+	void   AlignBar(Bar& bar);
+	void   SizeBar(Bar& bar);
+	void   ItemBar(Bar& bar);
+	void   OptionsBar(Bar& bar);
+	void   EditBar(Bar& bar);
+	void   LangBar(Bar& bar);
+	void   MainBar(Bar& bar);
+
+	void   Tool(Bar& bar);
+
+	void   SetBar();
+
+public:
+	static void Register(const String& classname, CtrlCreator creator);
+
+	void   LoadLayoutFile(const char *s);
+	bool   SaveLayoutFile();
+	bool   CloseLayoutFile();
+	String GetLayoutFile() const;
+	String GetFileName() const              { return filename; }
+
+	void   Execute();
+	void   OpenWindow();
+
+	LayoutDesigner();
+
+	typedef LayoutDesigner CLASSNAME;
+};
+
+template <class T>
+class CtrlClassRegistrator {
+public:
+	static Ctrl *Create()                   { return new T; }
+
+	CtrlClassRegistrator(const char *name)  { LayoutDesigner::Register(name, Create); }
+};
+
+class UrgCtrl : public Ctrl {
+public:
+	virtual void SetLabelText(const char *s);
+	virtual void Paint(Draw& w);
+
+protected:
+	String label;
+	String classname;
+
+public:
+	UrgCtrl(const String& classname) : classname(classname) { SetFrame(InsetFrame()); }
+};
+
+
+#define REGCTRLCLASS(x)  static CtrlClassRegistrator<x > MK__s (#x);
+
+void DesignLayout();
diff --git a/uppsrc/rw/Designer.lay b/uppsrc/rw/Designer.lay
new file mode 100644
index 000000000..b5fe2ae26
--- /dev/null
+++ b/uppsrc/rw/Designer.lay
@@ -0,0 +1,46 @@
+#ifdef LAYOUTFILE
+
+LAYOUT(LayoutLayout, 220, 60)
+	ITEM(Label, label1, SetLabel("&Layout:").LeftPosZ(4, 46).TopPosZ(4, 20))
+	ITEM(EditString, layout, HSizePosZ(52, 4).TopPosZ(4, 19))
+	ITEM(Button, ok, SetLabel("OK").RightPosZ(88, 80).BottomPosZ(4, 22))
+	ITEM(Button, cancel, SetLabel("Cancel").RightPosZ(4, 80).BottomPosZ(4, 22))
+END_LAYOUT
+
+LAYOUT(GridLayout, 172, 64)
+	ITEM(Label, dv___0, SetLabel("&X:").LeftPosZ(4, 12).TopPosZ(4, 20))
+	ITEM(EditIntSpin, x, LeftPosZ(18, 40).TopPosZ(4, 20))
+	ITEM(Label, dv___2, SetLabel("&Y:").LeftPosZ(90, 16).TopPosZ(4, 20))
+	ITEM(EditIntSpin, y, LeftPosZ(108, 40).TopPosZ(4, 20))
+	ITEM(Button, ok, SetLabel("OK").RightPosZ(88, 80).BottomPosZ(4, 22))
+	ITEM(Button, cancel, SetLabel("Cancel").RightPosZ(4, 80).BottomPosZ(4, 22))
+END_LAYOUT
+
+LAYOUT(MatrixLayout, 202, 86)
+	ITEM(Label, dv___0, SetLabel("&Horizontal").LeftPosZ(4, 54).TopPosZ(4, 19))
+	ITEM(EditIntSpin, x, LeftPosZ(60, 42).TopPosZ(4, 19))
+	ITEM(Label, dv___2, SetLabel("&spacing").LeftPosZ(108, 50).TopPosZ(4, 19))
+	ITEM(EditIntSpin, hspace, LeftPosZ(156, 42).TopPosZ(4, 19))
+	ITEM(Label, dv___4, SetLabel("&Vertical").LeftPosZ(4, 54).TopPosZ(28, 19))
+	ITEM(EditIntSpin, y, LeftPosZ(60, 42).TopPosZ(28, 19))
+	ITEM(Label, dv___6, SetLabel("s&pacing").LeftPosZ(108, 50).TopPosZ(28, 19))
+	ITEM(EditIntSpin, vspace, LeftPosZ(156, 42).TopPosZ(28, 19))
+	ITEM(Button, ok, SetLabel("OK").RightPosZ(88, 80).BottomPosZ(4, 22))
+	ITEM(Button, cancel, SetLabel("Cancel").RightPosZ(4, 80).BottomPosZ(4, 22))
+END_LAYOUT
+
+LAYOUT(LangLayout, 212, 82)
+	ITEM(Label, label1, SetLabel("&New language:").LeftPosZ(4, 76).TopPosZ(4, 19))
+	ITEM(WithDropChoice<EditString>, language, LeftPosZ(82, 126).TopPosZ(4, 19))
+	ITEM(Option, copy, SetLabel("&Copy current language").HSizePosZ(4, 4).TopPosZ(28, 18))
+	ITEM(Button, ok, SetLabel("OK").HSizePosZ(44, 88).BottomPosZ(4, 22))
+	ITEM(Button, cancel, SetLabel("Cancel").RightPosZ(4, 80).BottomPosZ(4, 22))
+END_LAYOUT
+
+LAYOUT(AliasLayout, 400, 400)
+	ITEM(ArrayCtrl, list, HSizePosZ(4, 4).VSizePosZ(4, 34))
+	ITEM(Button, ok, SetLabel("OK").RightPosZ(88, 80).BottomPosZ(4, 22))
+	ITEM(Button, cancel, SetLabel("Cancel").RightPosZ(4, 80).BottomPosZ(4, 22))
+END_LAYOUT
+
+#endif
diff --git a/uppsrc/rw/DesignerFile.cpp b/uppsrc/rw/DesignerFile.cpp
new file mode 100644
index 000000000..478c1e4ee
--- /dev/null
+++ b/uppsrc/rw/DesignerFile.cpp
@@ -0,0 +1,421 @@
+#include "Designer.h"
+
+static Point sReadAB(CParser& p) {
+	Point pt;
+	p.PassChar('(');
+	pt.x = p.ReadInt();
+	p.PassChar(',');
+	pt.y = p.ReadInt();
+	p.PassChar(')');
+	return pt;
+}
+
+static String ReadVar(CParser& p) {
+	String var;
+	for(;;) {
+		if(p.IsId())
+			var << p.ReadId();
+		else
+		if(p.IsInt())
+			var << p.ReadInt();
+		else
+		if(p.Char('.'))
+			var << '.';
+		else
+		if(p.Char('['))
+			var << '[';
+		else
+		if(p.Char(']'))
+			var << ']';
+		else
+			return var;
+	}
+}
+
+void LayoutDesigner::LoadCtrl(CParser& p, ItemInfo& ii, int li) {
+	if(p.Id("ITEM")) {
+		p.PassChar('(');
+		if(p.IsId()) ii.classname = p.ReadIdt();
+		p.PassChar(',');
+	}
+	else
+	if(p.Id("UNTYPED"))
+		p.PassChar('(');
+	else
+		p.ThrowError("Bad item.");
+	if(p.IsId()) ii.variable = ReadVar(p);
+	if(strncmp(ii.variable, "dv___", 5) == 0)
+		ii.variable.Clear();
+	p.PassChar(',');
+	LogPos pos;
+	do {
+		if(p.Id("LeftPosZ") || p.Id("LeftPos")) {
+			Point pt = sReadAB(p);
+			pos.x = PosLeft(pt.x, pt.y);
+		}
+		else
+		if(p.Id("RightPosZ") || p.Id("RightPos")) {
+			Point pt = sReadAB(p);
+			pos.x = PosRight(pt.x, pt.y);
+		}
+		else
+		if(p.Id("HSizePosZ") || p.Id("HSizePos")) {
+			Point pt = sReadAB(p);
+			pos.x = PosSize(pt.x, pt.y);
+		}
+		else
+		if(p.Id("HCenterPosZ") || p.Id("HCenterPos")) {
+			Point pt = sReadAB(p);
+			pos.x = PosCenter(pt.x, pt.y);
+		}
+		else
+		if(p.Id("TopPosZ") || p.Id("TopPos")) {
+			Point pt = sReadAB(p);
+			pos.y = PosLeft(pt.x, pt.y);
+		}
+		else
+		if(p.Id("BottomPosZ") || p.Id("BottomPos")) {
+			Point pt = sReadAB(p);
+			pos.y = PosRight(pt.x, pt.y);
+		}
+		else
+		if(p.Id("VSizePosZ") || p.Id("VSizePos")) {
+			Point pt = sReadAB(p);
+			pos.y = PosSize(pt.x, pt.y);
+		}
+		else
+		if(p.Id("VCenterPosZ") || p.Id("VCenterPos")) {
+			Point pt = sReadAB(p);
+			pos.y = PosCenter(pt.x, pt.y);
+		}
+		else
+		if(p.Id("SetLabel")) {
+			p.PassChar('(');
+			if(p.IsString())
+				ii.label.At(li) = p.ReadString();
+			else
+				ii.labelid = p.ReadId();
+			p.PassChar(')');
+		}
+		else
+		if(p.Id("HelpC") || p.Id("Help") || p.Id("Description")) {
+			p.PassChar('(');
+			if(p.IsString())
+				ii.help.At(li) = p.ReadString();
+			else
+				ii.helpid = p.ReadId();
+			p.PassChar(')');
+		}
+		else
+		if(p.Id("Hide")) {
+			p.PassChar('(');
+			p.PassChar(')');
+		}
+		else
+			p.ThrowError("Invalid item modifier.");
+	}
+	while(p.Char('.'));
+	p.PassChar(')');
+	ii.pos = pos;
+}
+
+void LayoutDesigner::LoadLayoutFile(const char *_filename) {
+	SetLayout(-1);
+	layout.Clear();
+	langlist.Clear();
+	try {
+		filename = _filename;
+		String s = LoadFile(filename);
+		CParser p(s);
+		if(p.Id("#ifdef"))
+			p.Id("LAYOUTFILE");
+		while(p.Id("LAYOUT")) {
+			p.PassChar('(');
+			String name = p.ReadId();
+			p.PassChar(',');
+			int cx = p.ReadInt();
+			p.PassChar(',');
+			int cy = p.ReadInt();
+			p.PassChar(')');
+			const char *a = p.GetPtr();
+			const char *b = a;
+			Form& l = layout.Add();
+			l.name = name;
+			l.size = Size(cx, cy);
+			while(!p.IsEof() && !p.Id("END_LAYOUT"))
+				LoadCtrl(p, l.item.Add());
+			while(*a == '\n' || *a == '\r')
+				a++;
+		}
+		p.Id("#endif");
+		while(p.Id("#if")) {
+			p.PassId("LANGUAGE");
+			p.PassChar2('=', '=');
+			String langid = p.ReadId();
+			CParser::Pos idpos = p.GetPos();
+			if(*idpos.ptr == '(')
+			{
+				const char *b = idpos.ptr;
+				while(*idpos.ptr && *idpos.ptr++ != ')')
+					;
+				langid.Cat(b, idpos.ptr - b);
+				p.SetPos(idpos);
+			}
+			langlist.Add(langlist.GetCount(), langid);
+			VectorMap<String, String> map;
+			while(p.Id("txt")) {
+				p.PassChar('(');
+				String& txt = map.Add("txt" + p.ReadId());
+				p.PassChar(',');
+				txt = p.ReadString();
+				p.PassChar(')');
+			}
+			p.PassId("#endif");
+			for(int i = 0; i < layout.GetCount(); i++) {
+				Form& l = layout[i];
+				for(int i = 0; i < l.item.GetCount(); i++) {
+					ItemInfo& ii = l.item[i];
+					ii.label.Add(map.Get(ii.labelid, String()));
+					ii.help.Add(map.Get(ii.helpid, String()));
+				}
+			}
+		}
+	}
+	catch(CParser::Error& e) {
+		Exclamation(e);
+		filename.Clear();
+	}
+	MakeCaption();
+	SetupLayoutList();
+	SetLayout(layout.GetCount() ? 0 : -1, 0);
+}
+
+String SaveText(String mod, const Vector<String>& txt, bool lang, const String& name, int ii) {
+	mod = '.' + mod +  '(';
+	if(lang) {
+		for(int i = 0; i < txt.GetCount(); i++)
+			if(!txt[i].IsEmpty())
+				return mod + name + Format("_%d", ii) + ')';
+		return String();
+	}
+	return txt.GetCount() && !txt[0].IsEmpty() ? mod + AsCString(txt[0]) + ')' : String();
+}
+
+String LayoutDesigner::SaveCtrl(const ItemInfo& ii, int i, const String& name, bool lang) const {
+	String out;
+	if(ii.classname.IsEmpty())
+		out << "\tUNTYPED(";
+	else
+		out << "\tITEM(" << ii.classname << ", ";
+	out << (ii.variable.IsEmpty() ? Format("dv___%d", i) : ii.variable) << ", ";
+	LogPos p = ii.pos;
+	const char *zfix = (qlib2_output ? "" : "Z");
+	switch(p.x.GetAlign()) {
+	case Ctrl::LEFT:   out << Format("LeftPos%s(%d, %d).", zfix, p.x.GetA(), p.x.GetB()); break;
+	case Ctrl::RIGHT:  out << Format("RightPos%s(%d, %d).", zfix, p.x.GetA(), p.x.GetB()); break;
+	case Ctrl::SIZE:   out << Format("HSizePos%s(%d, %d).", zfix, p.x.GetA(), p.x.GetB()); break;
+	case Ctrl::CENTER: out << Format("HCenterPos%s(%d, %d).", zfix, p.x.GetB(), p.x.GetA()); break;
+	}
+	switch(p.y.GetAlign()) {
+	case Ctrl::TOP:    out << Format("TopPos%s(%d, %d)", zfix, p.y.GetA(), p.y.GetB()); break;
+	case Ctrl::BOTTOM: out << Format("BottomPos%s(%d, %d)", zfix, p.y.GetA(), p.y.GetB()); break;
+	case Ctrl::SIZE:   out << Format("VSizePos%s(%d, %d)", zfix, p.y.GetA(), p.y.GetB()); break;
+	case Ctrl::CENTER: out << Format("VCenterPos%s(%d, %d)", zfix, p.y.GetB(), p.y.GetA()); break;
+	}
+	out << SaveText("SetLabel", ii.label, lang, "txt" + name, i);
+	out << SaveText(qlib2_output ? "HelpC" : "Description", ii.help, lang, "txt" + name + "_HLP", i);
+	if(IsLayoutRef(ii.classname) && ii.variable.IsEmpty())
+		out << ".Hide()";
+	out << ")\n";
+	return out;
+}
+
+String txtSave(int li, const Vector<String>& txt, int ii, String name) {
+	for(int i = 0; i < txt.GetCount(); i++)
+		if(!txt[i].IsEmpty()) {
+			String s;
+			if(li < txt.GetCount())
+				s = txt[li];
+			return "txt(" + name + Format("_%d", ii) + ", " + AsCString(s) + ")\n";
+		}
+	return String();
+}
+
+String LayoutDesigner::GetLayoutFile() const {
+	int i;
+	Vector<int> layindex;
+	layindex.SetCount(layout.GetCount());
+	for(i = 0; i < layout.GetCount(); i++)
+		layindex[i] = i;
+	int maxswaps = layout.GetCount() * layout.GetCount();
+	for(i = 0; maxswaps > 0 && i < layindex.GetCount(); i++)
+	{
+		int lx = layindex[i];
+		const Form& l = layout[lx];
+		int maxref = -1;
+		String dummy;
+		for(int c = 0; c < l.item.GetCount(); c++)
+			maxref = max(maxref, FindIndex(layindex, ParseLayoutRef(l.item[c].classname, dummy)));
+		if(maxref > i)
+		{
+			layindex.Remove(i);
+			layindex.Insert(maxref, lx);
+			i--;
+			maxswaps--;
+		}
+	}
+
+	StringStream out;
+	out << "#ifdef LAYOUTFILE\n\n";
+	for(i = 0; i < layindex.GetCount(); i++) {
+		const Form& l = layout[layindex[i]];
+		out << "LAYOUT(" << l.name << ", " << l.size.cx << ", " << l.size.cy << ")\n";
+		for(int c = 0; c < l.item.GetCount(); c++)
+			out << SaveCtrl(l.item[c], c, l.name, langlist.GetCount());
+		out << "END_LAYOUT\n\n";
+	}
+	out << "#endif\n";
+	for(int li = 0; li < langlist.GetCount(); li++) {
+		out << "\n#if LANGUAGE == " << String(langlist.GetValue(li)) << "\n\n";
+		for(int i = 0; i < layindex.GetCount(); i++) {
+			const Form& l = layout[layindex[i]];
+			for(int c = 0; c < l.item.GetCount(); c++) {
+				out << txtSave(li, l.item[c].label, c, l.name);
+				out << txtSave(li, l.item[c].help, c, l.name + "_HLP");
+			}
+			out << '\n';
+		}
+		out << "#endif\n";
+	}
+	return out;
+}
+
+bool LayoutDesigner::SaveLayoutFile() {
+	String lf = GetLayoutFile();
+	if(::LoadFile(filename) != lf && !::SaveFile(filename, lf)) {
+		Exclamation("Error storing output file " + filename);
+		return false;
+	}
+	return true;
+}
+
+const char exts[] =
+	"Layout files (*.lay)|*.lay|"
+	"All files (*.*)|*.*|"
+;
+
+void LayoutDesigner::MakeCaption() {
+	String s;
+	if(layouti >= 0) {
+		s.Cat(layout[layouti].name);
+		if(!s.IsEmpty())
+			s.Cat(" - ");
+	}
+	s.Cat(filename.IsEmpty() ? "New layout file" : filename);
+	frame.Title(s);
+}
+
+bool LayoutDesigner::DoSave() {
+	if(filename.IsEmpty()) {
+		if(!SaveLayoutFileAs()) return false;
+	}
+	else
+		if(!SaveLayoutFile()) return false;
+	return true;
+}
+
+bool LayoutDesigner::PromptSave() {
+	return layout.GetCount() == 0
+	|| (!filename.IsEmpty() && GetLayoutFile() == LoadFile(filename))
+	|| !PromptYesNo("Save current file ?") || DoSave();
+}
+
+void LayoutDesigner::NewFile() {
+	if(!PromptSave()) return;
+	SetLayout(-1);
+	layout.Clear();
+	filename.Clear();
+	frame.Refresh();
+	MakeCaption();
+	SetupLayoutList();
+}
+
+void LayoutDesigner::OpenFile() {
+	if(!PromptSave()) return;
+	if(filesel.ExecuteOpen()) {
+		LoadLayoutFile(~filesel);
+		LruList.NewEntry(filename);
+	}
+}
+
+bool LayoutDesigner::SaveLayoutFileAs() {
+	filesel = filename;
+	if(!filesel.ExecuteSaveAs(NULL)) return false;
+	filename = filesel;
+	bool r = SaveLayoutFile();
+	if(r) LruList.NewEntry(filename);
+	MakeCaption();
+	return r;
+}
+
+void LayoutDesigner::SaveFileAs() {
+	SaveLayoutFileAs();
+}
+
+void LayoutDesigner::SaveFile() {
+	DoSave();
+}
+
+void LayoutDesigner::CloseFile() {
+	if(CloseLayoutFile())
+	{
+#ifdef flagIDERW
+		SetTimeCallback(0, THISBACK(CloseDesigner), 555);
+#endif
+	}
+}
+
+bool LayoutDesigner::CloseLayoutFile() {
+	if(layout.GetCount() && (filename.IsEmpty() || LoadFile(filename) != GetLayoutFile()))
+		switch(PromptYesNoCancel("Save current file ?")) {
+		case 1:
+			if(!DoSave()) return false;
+		case 0:
+			break;
+		default:
+			return false;
+		}
+	frame.Close();
+	return true;
+}
+
+void LayoutDesigner::LruOpen(const String& s) {
+	if(!PromptSave()) return;
+	LoadLayoutFile(s);
+}
+
+void LayoutDesigner::Serialize(Stream& s) {
+	int version = 1;
+	s.Magic();
+	s / version;
+	s % filesel;
+	LruList.Serialize(s);
+	splital.Serialize(s);
+	if(version == 0) {
+		Splitter d;
+		d.Serialize(s);
+	}
+	itab.SerializeHeader(s);
+	if(version >= 1)
+		frame.SerializePlacement(s);
+	else {
+		Rect r = frame.GetRect();
+		s % r;
+		frame.SetRect(r);
+	}
+	s % grid.x % grid.y;
+	s % ignoremin;
+	s % matrix.x % matrix.y % matrix.hspace % matrix.vspace;
+	s % usegrid;
+	s.Magic();
+}
diff --git a/uppsrc/rw/DesignerLayt.cpp b/uppsrc/rw/DesignerLayt.cpp
new file mode 100644
index 000000000..220dced5f
--- /dev/null
+++ b/uppsrc/rw/DesignerLayt.cpp
@@ -0,0 +1,106 @@
+#include "Designer.h"
+
+void LayoutDesigner::SetLayout(int i, int li) {
+	ClearSelection();
+	layouti = i;
+	layoutlist = i;
+	langi = li;
+	if(langlist.GetCount())
+		langlist = li;
+	itab.Clear();
+	if(layouti >= 0) {
+		Form& l = layout[layouti];
+		SetFormSize(l.size);
+		SynchronizeCtrls();
+	}
+	else {
+		ctrl.Clear();
+		ref_ctrl.Clear();
+		mnem_ctrl.Clear();
+		form.Hide();
+		itab.Clear();
+	}
+	sb = Point(0, 0);
+	form.Show(layouti >= 0);
+	MakeCaption();
+	ShowStatus();
+	langlist.Enable(langlist.GetCount());
+	SynchronizeMnemonic();
+}
+
+void LayoutDesigner::EnterLayout() {
+	SetLayout(~layoutlist, langlist.GetCount() ? langlist.GetIndex() : 0);
+}
+
+void LayoutDesigner::EnterLanguage() {
+	int i = -1;
+	if(itemi.GetCount())
+		i = itemi.Top();
+	EnterLayout();
+	SelectOneItem(i);
+}
+
+void LayoutDesigner::SetupLayoutList() {
+	layoutlist.Clear();
+	int i;
+	for(i = 0; i < layout.GetCount(); i++)
+		layoutlist.Add(i, layout[i].name);
+	layoutlist.Enable(i);
+}
+
+int FilterCid(int c) {
+	return IsAlNum(c) || c == '_' ? c : 0;
+}
+
+void LayoutDesigner::NewLayout() {
+	WithLayoutLayout<TopWindow> dlg;
+	CtrlLayoutOKCancel(dlg, "New Layout");
+	dlg.layout.SetFilter(FilterCid);
+	dlg.ActiveFocus(dlg.layout);
+	if(dlg.Run() == IDOK) {
+		int i = layout.GetCount();
+		Form& l = layout.Add();
+		l.name = dlg.layout;
+		l.size = Size(400, 200);
+		SetupLayoutList();
+		SetLayout(i);
+	}
+}
+
+void LayoutDesigner::RemoveLayout() {
+	if(layouti < 0) return;
+	if(PromptYesNo("Remove current layout ?")) {
+		int i = layouti;
+		SetLayout(-1);
+		layout.Remove(i);
+		SetupLayoutList();
+		SetLayout(min(i, layout.GetCount() - 1));
+		Refresh();
+	}
+}
+
+void LayoutDesigner::RenameLayout() {
+	if(layouti < 0) return;
+	WithLayoutLayout<TopWindow> dlg;
+	CtrlLayoutOKCancel(dlg, "Rename Layout");
+	dlg.ActiveFocus(dlg.layout);
+	dlg.layout.SetFilter(FilterCid);
+	dlg.layout = layout[layouti].name;
+	if(dlg.Run() == IDOK) {
+		layout[layouti].name = dlg.layout;
+		SetupLayoutList();
+		SetLayout(layouti);
+	}
+}
+
+void  LayoutDesigner::NextLayout() {
+	if(layoutlist.GetCount() == 0) return;
+	layoutlist.SetIndex((layoutlist.GetIndex() + 1) % layoutlist.GetCount());
+	EnterLayout();
+}
+
+void  LayoutDesigner::PrevLayout() {
+	if(layoutlist.GetCount() == 0) return;
+	layoutlist.SetIndex((layoutlist.GetIndex() + layoutlist.GetCount() - 1) % layoutlist.GetCount());
+	EnterLayout();
+}
diff --git a/uppsrc/rw/DesignerWin.cpp b/uppsrc/rw/DesignerWin.cpp
new file mode 100644
index 000000000..bf238209d
--- /dev/null
+++ b/uppsrc/rw/DesignerWin.cpp
@@ -0,0 +1,374 @@
+#include "Designer.h"
+#pragma hdrstop
+#include "iderw.h"
+
+void LayoutDesigner::SetupGrid() {
+	CtrlLayoutOKCancel(grid, "Grid settings");
+	grid.x.MinMax(1, 32);
+	grid.y.MinMax(1, 32);
+	grid.Backup();
+	grid.Execute();
+}
+
+void LayoutDesigner::FileBar(Bar& bar) {
+	bar.Add("New", THISBACK(NewFile))
+		.Key(K_CTRL_N);
+	bar.Add("Open..", THISBACK(OpenFile))
+		.Key(K_CTRL_O);
+	bar.Add("Save", THISBACK(SaveFile))
+		.Key(K_CTRL_S);
+	bar.Add("Save as..", THISBACK(SaveFileAs));
+	LruList(bar);
+	bar.MenuSeparator();
+	bar.Add(
+#ifdef flagIDERW
+	"Close"
+#else
+	"Exit"
+#endif
+	, THISBACK(CloseFile));
+}
+
+void LayoutDesigner::EditBar(Bar& bar) {
+	bar.Add("Cut", CtrlImg::cut(), THISBACK(Cut))
+		.Key(K_CTRL_X);
+	bar.Add("Copy", CtrlImg::copy(), THISBACK(Copy))
+		.Key(K_CTRL_C);
+	bar.Add("Paste", CtrlImg::paste(), THISBACK(Paste))
+		.Key(K_CTRL_V);
+	bar.Add("Duplicate", THISBACK(Duplicate))
+		.Key(K_CTRL_D);
+	bar.Add("Delete", CtrlImg::remove(), THISBACK(Delete))
+		.Key(K_DELETE);
+	bar.MenuSeparator();
+	bar.Add("Select All", THISBACK(SelectAll))
+		.Key(K_CTRL_A);
+}
+
+void LayoutDesigner::LayoutBar(Bar& bar) {
+	bar.Add("New layout..", THISBACK(NewLayout));
+	bar.Add(layoutlist.GetCount(), "Remove layout", THISBACK(RemoveLayout));
+	bar.Add(layoutlist.GetCount(), "Rename layout..", THISBACK(RenameLayout));
+	if(layoutlist.GetCount() > 1) {
+		bar.Separator();
+		bar.Add("Previous layout", THISBACK(PrevLayout))
+			.Key(K_ALT_UP);
+		bar.Add("Next layout", THISBACK(NextLayout))
+			.Key(K_ALT_DOWN);
+	}
+}
+
+void LayoutDesigner::LangBar(Bar& bar) {
+	bar.Add("New language..", THISBACK(NewLanguage));
+	bar.Add(langlist.GetCount(), "Remove language", THISBACK(RemoveLanguage));
+	bar.Add(langlist.GetCount(), "Rename language..", THISBACK(RenameLanguage));
+	if(langlist.GetCount() > 1) {
+		bar.Separator();
+		bar.Add("Previous language", THISBACK(PrevLang))
+			.Key(K_ALT_LEFT);
+		bar.Add("Next language", THISBACK(NextLang))
+			.Key(K_ALT_RIGHT);
+	}
+}
+
+void LayoutDesigner::OptionsBar(Bar& bar) {
+	bar.Add("Alias map", THISBACK(SetupAlias));
+	bar.Add("Use grid", TB_GRID(), THISBACK(ToggleGrid))
+		.Check(usegrid);
+	bar.Add("Grid settings..", THISBACK(SetupGrid));
+	bar.Add("Ignore min size", THISBACK(ToggleIgnoreMin))
+		.Check(ignoremin);
+	bar.Add("QLIB2 output", THISBACK(ToggleQLIB2Output))
+		.Check(qlib2_output);
+}
+
+void LayoutDesigner::AlignBar(Bar& bar) {
+	int m = itemi.GetCount();
+	bar.Add(m, "Vertical center in layout", TB_VERTCENTER(), THISBACK(VertCenter))
+		.Key(K_CTRL_F9);
+	bar.Add(m, "Align label", TB_ALIGNLBL(), THISBACK(AlignLbl))
+		.Key(K_ALT_F9);
+	bar.Add(m, "Horizontal center in layout", TB_HORZCENTER(), THISBACK(HorzCenter))
+		.Key(K_CTRL|K_SHIFT_F9);
+	bar.Separator();
+	bar.Add(m > 1, "Left", TB_ALIGNLEFT(), THISBACK(AlignLeft))
+		.Key(K_ALT_LEFT);
+	bar.Add(m > 1, "Horizontal center", TB_ALIGNHCENTER(), THISBACK(AlignHCenter))
+		.Key(K_SHIFT_F9);
+	bar.Add(m > 1, "Right", TB_ALIGNRIGHT(), THISBACK(AlignRight))
+		.Key(K_ALT_RIGHT);
+	bar.Separator();
+	bar.Add(m > 1, "Top", TB_ALIGNTOP(), THISBACK(AlignTop))
+		.Key(K_ALT_UP);
+	bar.Add(m > 1, "Vertical center", TB_ALIGNVCENTER(), THISBACK(AlignVCenter))
+		.Key(K_F9);
+	bar.Add(m > 1, "Bottom", TB_ALIGNBOTTOM(), THISBACK(AlignBottom))
+		.Key(K_ALT_DOWN);
+}
+
+void LayoutDesigner::SizeBar(Bar& bar) {
+	int m = itemi.GetCount();
+	bar.Add(m > 1, "Same width", TB_SAMEWIDTH(), THISBACK(SameWidth))
+		.Key(K_SHIFT_F8);
+	bar.Add(m > 1, "Same height", TB_SAMEHEIGHT(), THISBACK(SameHeight))
+		.Key(K_CTRL_F8);
+	bar.Add(m > 1, "Same size", TB_SAMESIZE(), THISBACK(SameSize))
+		.Key(K_F8);
+	bar.Add(m, "Minimal width", TB_MINWIDTH(), THISBACK(MinWidth))
+		.Key(K_SHIFT_F7);
+	bar.Add(m, "Minimal height", TB_MINHEIGHT(), THISBACK(MinHeight))
+		.Key(K_CTRL_F7);
+}
+
+void LayoutDesigner::SpringsBar(Bar& bar) {
+	bool m = !itemi.IsEmpty();
+	int im = GetItemPosMask();
+	bar.Add(m, "Left", TB_SPRINGLEFT(), THISBACK1(ItemPos, MAKELONG(POS_LEFT, POS_NONE)))
+		.Check(im & MAKELONG(1 << POS_LEFT, 0));
+	bar.Add(m, "Right", TB_SPRINGRIGHT(), THISBACK1(ItemPos, MAKELONG(POS_RIGHT, POS_NONE)))
+		.Check(im & MAKELONG(1 << POS_RIGHT, 0));
+	bar.Add(m, "Horz size", TB_SPRINGHSIZE(), THISBACK1(ItemPos, MAKELONG(POS_SIZE, POS_NONE)))
+		.Check(im & MAKELONG(1 << POS_SIZE, 0));
+	bar.Add(m, "Horz center", TB_SPRINGHCENTER(), THISBACK1(ItemPos, MAKELONG(POS_CENTER, POS_NONE)))
+		.Check(im & MAKELONG(1 << POS_CENTER, 0));
+	bar.Separator();
+	bar.Add(m, "Top", TB_SPRINGTOP(), THISBACK1(ItemPos, MAKELONG(POS_NONE, POS_TOP)))
+		.Check(im & MAKELONG(0, 1 << POS_TOP));
+	bar.Add(m, "Bottom", TB_SPRINGBOTTOM(), THISBACK1(ItemPos, MAKELONG(POS_NONE, POS_BOTTOM)))
+		.Check(im & MAKELONG(0, 1 << POS_BOTTOM));
+	bar.Add(m, "Vert size", TB_SPRINGVSIZE(), THISBACK1(ItemPos, MAKELONG(POS_NONE, POS_SIZE)))
+		.Check(im & MAKELONG(0, 1 << POS_SIZE));
+	bar.Add(m, "Vert center", TB_SPRINGVCENTER(), THISBACK1(ItemPos, MAKELONG(POS_NONE, POS_CENTER)))
+		.Check(im & MAKELONG(0, 1 << POS_CENTER));
+	bar.Separator();
+	bar.Add(m, "Auto springs", TB_SPRINGAUTO(), THISBACK1(ItemPos, MAKELONG(POS_AUTO, POS_AUTO)))
+		.Key(K_CTRL_R);
+	bar.Add(m, "Topleft springs", TB_SPRINGTOPLEFT(), THISBACK1(ItemPos, MAKELONG(POS_LEFT, POS_TOP)))
+		.Key(im == MAKELONG(1 << POS_LEFT, 1 << POS_TOP));
+}
+
+void LayoutDesigner::ItemBar(Bar& bar) {
+	int m = itemi.GetCount();
+	bar.Add(layouti >= 0, "New item", THISBACK(AddItem))
+		.Key(K_ENTER);
+	bar.Add(m, "Remove item", THISBACK(Delete))
+		.Key(K_DELETE);
+	bar.Add(m, "Move item up", THISBACK(MoveUp))
+		.Key(K_CTRL_UP);
+	bar.Add(m, "Move item down", THISBACK(MoveDown))
+		.Key(K_CTRL_DOWN);
+	bar.MenuSeparator();
+	bar.Add("Alignment", THISBACK(AlignBar));
+	bar.Add("Size", THISBACK(SizeBar));
+	bar.Add("Springs", THISBACK(SpringsBar));
+	bar.MenuSeparator();
+	bar.Add(m, "Matrix..", THISBACK(Matrix))
+		.Key(K_CTRL_M);
+}
+
+void LayoutDesigner::MainBar(Bar& bar) {
+	bar.Add("File", THISBACK(FileBar));
+	bar.Add("Edit", THISBACK(EditBar));
+	bar.Add("Layout", THISBACK(LayoutBar));
+	bar.Add("Language", THISBACK(LangBar));
+	bar.Add("Item", THISBACK(ItemBar));
+	bar.Add("Options", THISBACK(OptionsBar));
+}
+
+void LayoutDesigner::Tool(Bar& bar) {
+	EditBar(bar);
+//	bar.Separator();
+	ItemBar(bar);
+	bar.Separator();
+	OptionsBar(bar);
+	bar.Break();
+	bar.Add(layoutlist, 200);
+	bar.Gap();
+	bar.Add(langlist, 100);
+}
+
+void LayoutDesigner::OpenWindow() {
+	if(!frame.IsOpen()) {
+		alias_map_file = AliasMap::StdFileName();
+		alias_map.Load(alias_map_file);
+		if(alias_map.IsEmpty())
+			alias_map.SetDefault();
+		UpdateClassList();
+		frame.OpenMain();
+		MakeCaption();
+	}
+}
+
+void LayoutDesigner::Execute() {
+//	frame.SetRect(100, 100, 700, 500);
+#ifndef flagIDERW
+	LoadFromFile(*this);
+#endif
+	OpenWindow();
+	frame.Run();
+#ifndef flagIDERW
+	StoreToFile(*this);
+#endif
+	if(!alias_map.Save(alias_map_file))
+		Exclamation(NFormat("Error updating alias file [* \1%s\1].", alias_map_file));
+}
+
+void LayoutDesigner::UpdateClassList() {
+	Vector<String> avail_classes;
+	Append(avail_classes, ClassMap().GetKeys());
+	Append(avail_classes, alias_map.obj_source);
+	Sort(avail_classes, StdLess<String>());
+	classname.ClearList();
+	for(int i = 0; i < avail_classes.GetCount(); i++)
+		classname.AddList(avail_classes[i]);
+}
+
+void LayoutDesigner::SetBar()
+{
+	toolbar.Set(THISBACK(Tool));
+}
+
+LayoutDesigner::LayoutDesigner() {
+	int ehg = EditField::GetStdHeight();
+	VSizePos(0, 0).HSizePos(0, 0);
+	form.IgnoreMouse();
+	form.ld = this;
+	Add(form);
+	apaint.VSizePos(0, 0).HSizePos(0, 0).Transparent().IgnoreMouse();
+	apaint.ld = this;
+	itab.NoWantFocus();
+	itab.AddColumn("class");
+	itab.AddColumn("var / label").SetDisplay(VarLblDisplay(false)).Add(2);
+	itab.AddIndex();
+	itab.WhenLeftClick = THISBACK(WhenITab);
+	props.Vert(itab, label_help_split);
+	props.SetPos(6000);
+	class_var_lbl.NoWantFocus().Transparent();
+	class_var_lbl.Add(classname.TopPos(0, ehg).HSizePos(0, 88));
+	class_var_lbl.Add(variable.TopPos(0, ehg).RightPos(0, 80));
+	class_var_lbl.Add(label.VSizePos(ehg + 4, 0).HSizePos());
+	label_help_split.Vert(class_var_lbl, help);
+//	props.Add(itab.VSizePos(0, ehg + 8 + 60 + 8 + 60 + 8).HSizePos());
+//	props.Add(classname.BottomPos(60 + 8 + 60 + 8, STDSIZE).HSizePos(0, 88));
+//	props.Add(variable.BottomPos(60 + 8 + 60 + 8, STDSIZE).RightPos(0, 80));
+//	props.Add(label.BottomPos(60 + 8, 60).HSizePos());
+//	props.Add(help.BottomPos(0, 60).HSizePos());
+	classname.WhenAction = THISBACK(NewClass);
+	classname.SetDropLines(24);
+	variable.WhenAction = THISBACK(NewVariable);
+	variable.ClickSelect();
+	label.WhenAction = THISBACK(NewLabel);
+	help.WhenAction = THISBACK(NewHelp);
+	classset = THISBACK(NewCtrl);
+	layoutlist.WhenAction = THISBACK(EnterLayout);
+	layoutlist.SizePos();
+//	layoutlist.LeftPos(0, 150).TopPos(ehg + 11, ehg);
+	layouti = -1;
+
+	langlist.WhenAction = THISBACK(EnterLanguage);
+	langlist.SizePos();
+//	langlist.LeftPos(150, 150).TopPos(ehg + 11, ehg);
+	langi = 0;
+
+	form.Hide();
+	sb.WhenScroll = THISBACK(Scroll);
+//	menubar.TopPos(0, ehg + 4).HSizePos(0, 0);
+//	toolbar.HSizePos(300, 0).TopPos(ehg + 8, 24).SetFrame(NullFrame());
+	frame.ld = this;
+	frame.Sizeable().Zoomable().Icon(RwIconSmall(), RwIconLarge()); //.HelpBox(); // todo? or not to do?
+	frame.AddFrame(menubar);
+	frame.AddFrame(toolbar);
+	frame.WhenClose = THISBACK(CloseFile);
+//	status.TopPos(0, ehg + 4).HSizePos(0, 0);
+	status.NoTransparent();
+	menubar.AddFrame(status);
+	SetBar();
+	menubar.Set(THISBACK(MainBar));
+	design.SetFrame(InsetFrame());
+	design.AddFrame(sb);
+	design.Add(*this);
+	design.Add(apaint);
+//	splital.VSizePos(2 * EditField::GetStdHeight() + 16, 0);
+	splital.Horz(props, design);
+	splital.SetPos(3000);
+	frame.Add(splital.SizePos());
+	SetLayout(-1);
+	LruList.WhenSelect = THISBACK(LruOpen);
+	grid.x <<= grid.y <<= 2;
+	matrix.x <<= matrix.y <<= 1;
+	matrix.vspace <<= matrix.hspace <<= 0;
+	CtrlLayoutOKCancel(matrix, "Matrix duplication");
+	matrix.x.MinMax(1, 10);
+	matrix.y.MinMax(1, 10);
+	ignoremin = false;
+	qlib2_output = false;
+	moved = false;
+	usegrid = true;
+//	frame.HelpBox().CommentBox(); // todo? or not to do?
+	filesel.Type("Layout files (*.lay)", "*.lay").Type("All files (*.*)", "*.*")
+		   .DefaultExt("lay");
+	layoutlist.Disable();
+}
+
+static Array<LayoutDesigner>& GetDesigners() {
+	static Array<LayoutDesigner> list;
+	return list;
+}
+
+#ifdef flagIDERW
+void LayoutDesigner::CloseDesigner() {
+	Array<LayoutDesigner>& list = GetDesigners();
+	for(int i = 0; i < list.GetCount(); i++)
+		if(&list[i] == this)
+		{
+			list.Remove(i);
+			return;
+		}
+}
+#endif
+
+bool CloseDesignLayout() {
+	Array<LayoutDesigner>& list = GetDesigners();
+	while(!list.IsEmpty())
+	{
+		if(!list[0].CloseLayoutFile())
+			return false;
+		list.Remove(0);
+	}
+	return true;
+}
+
+bool SaveDesignLayout() {
+	Array<LayoutDesigner>& list = GetDesigners();
+	bool is_ok = true;
+	for(int i = 0; i < list.GetCount(); i++)
+		if(!list[i].SaveLayoutFile())
+			is_ok = false;
+	return is_ok;
+}
+
+void DesignLayout(String open_file) {
+	Array<LayoutDesigner>& list = GetDesigners();
+	for(int i = 0; i < list.GetCount(); i++)
+		if(!CompareNoCase(list[i].GetFileName(), open_file))
+		{
+			list[i].SetWantFocus();
+			return;
+		}
+	LayoutDesigner& ld = list.Add();
+	ld.OpenWindow();
+	ld.LoadLayoutFile(open_file);
+}
+
+Image GetRwIcon() {
+	return RwIconSmall();
+}
+
+#ifndef flagIDERW
+void AppMain()
+{
+	SetDefaultCharset(CHARSET_WIN1250);
+	LayoutDesigner ld;
+	ld.Execute();
+}
+#endif//flagIDERW
diff --git a/uppsrc/rw/ItemCtrl.cpp b/uppsrc/rw/ItemCtrl.cpp
new file mode 100644
index 000000000..2230bb29d
--- /dev/null
+++ b/uppsrc/rw/ItemCtrl.cpp
@@ -0,0 +1,295 @@
+#include "Designer.h"
+//#include <TCtrlLib/TCtrlLib.h>
+
+typedef VectorMap<String, CtrlCreator> CtrlCreatorMap;
+GLOBAL_VAR(CtrlCreatorMap, LayoutDesigner::ClassMap);
+
+void LayoutDesigner::Register(const String& classname, CtrlCreator creator) {
+	ClassMap().GetAdd(classname) = creator;
+}
+
+String    LayoutDesigner::Lng(const Vector<String>& x) const {
+	return langi < x.GetCount() ? x[langi] : String();
+}
+
+String&   LayoutDesigner::ItemLabel(int i) {
+	return Lng(Item(i).label);
+}
+
+String    LayoutDesigner::ItemLabel(int i) const {
+	return Lng(Item(i).label);
+}
+
+String&   LayoutDesigner::Help(int i) {
+	return Lng(Item(i).help);
+}
+
+String    LayoutDesigner::Help(int i) const {
+	return Lng(Item(i).help);
+}
+
+void LayoutDesigner::SynchronizeCtrl(int im) {
+	const ItemInfo& ii = Item(im);
+	SynchronizeCtrl(ctrl[im], ii);
+	itab.Set(im, 0, ii.classname);
+	itab.Set(im, 1, ii.variable);
+	itab.Set(im, 2, (langi < ii.label.GetCount() ? ii.label[langi] : String()));
+}
+
+void LayoutDesigner::SynchronizeCtrl(Ctrl& q, const ItemInfo& ii)
+{
+	q.SetLabel(Lng(ii.label));
+//	q.Help(Help(im));
+	q.Tip(Lng(ii.help));
+	q.DesignMode();
+	q.SetPos(ii.pos);
+}
+
+void LayoutDesigner::SynchronizeCtrl() {
+	SynchronizeCtrl(itemi.Top());
+}
+
+void LayoutDesigner::SynchronizeCtrls() {
+	mnem_ctrl.Clear();
+	ref_ctrl.Clear();
+	ctrl.Clear();
+	for(int i = 0; i < ItemCount(); i++) {
+		ItemInfo& ii = Item(i);
+		Ctrl& q = ctrl.Add(CreateCtrl(ii.classname));
+		form.Add(q);
+		SynchronizeCtrl(i);
+	}
+	ShowHideLayouts();
+}
+
+int LayoutDesigner::ParseLayoutRef(String cls, String& base) const
+{
+	const char *p = cls;
+	if(p[0] != 'W' || p[1] != 'i' || p[2] != 't' || p[3] != 'h')
+		return -1;
+	const char *b = (p += 4);
+	while(IsAlNum(*p) || *p == '_')
+		p++;
+	if(p <= b)
+		return -1;
+	String layoutid(b, p);
+	int fi = FindFieldIndex(layout, &Form::name, layoutid);
+	if(fi < 0)
+		return -1;
+	while(*p && (byte)*p <= ' ')
+		p++;
+	if(*p++ != '<')
+		return -1;
+	while(*p && (byte)*p <= ' ')
+		p++;
+	const char *e = cls.End();
+	while(e > p && (byte)e[-1] <= ' ')
+		e--;
+	if(e > p && e[-1] == '>')
+		e--;
+	while(e > p && (byte)e[-1] <= ' ')
+		e--;
+	base = String(p, e);
+	return fi;
+}
+
+Ctrl *LayoutDesigner::CreateLayoutCtrl(String classname, Index<String>& recursed)
+{
+	String base;
+	int fi = ParseLayoutRef(classname, base);
+	if(fi < 0 || recursed.Find(layout[fi].name) >= 0 || recursed.Find(base) >= 0)
+		return NULL;
+	recursed.Add(layout[fi].name);
+	recursed.Add(base);
+	Ctrl *ctrl = CreateCtrl(base, recursed);
+	if(!ctrl)
+	{
+		ctrl = new Ctrl();
+		ctrl->Transparent();
+	}
+	const Form& form = layout[fi];
+	for(int i = 0; i < form.item.GetCount(); i++) {
+		const ItemInfo& ii = form.item[i];
+		Ctrl *q = CreateCtrl(ii.classname, recursed);
+		if(!q)
+		{
+			q = new UrgCtrl(ii.classname);
+			q->DesignMode();
+		}
+		ref_ctrl.Add(q);
+		ctrl -> Add(*q);
+		SynchronizeCtrl(*q, ii);
+	}
+	recursed.Drop();
+	recursed.Drop();
+	return ctrl;
+}
+
+Ctrl *LayoutDesigner::CreateCtrl(const String& classname, Index<String>& recursed)
+{
+	Ctrl *q = CreateLayoutCtrl(classname, recursed);
+	if(q)
+		return q;
+	int ci = ClassMap().Find(alias_map.Convert(classname));
+	if(ci >= 0)
+	{
+		q = ClassMap()[ci]();
+		q->DesignMode();
+	}
+	return q;
+}
+
+Ctrl *LayoutDesigner::CreateCtrl(const String& classname) {
+	Index<String> temp;
+	Ctrl *q = CreateCtrl(classname, temp);
+	if(!q)
+	{
+		q = new UrgCtrl(~classname);
+		q->DesignMode();
+	}
+	return q;
+}
+
+void LayoutDesigner::AddCtrl(const String& cls, const String& var, const String& lbl,
+							 const String& help) {
+	int imi = ctrl.GetCount();
+	ItemInfo& ii = ActualForm().item.Add();
+	ii.classname = cls;
+	ii.variable = var;
+	Lng(ii.label) = lbl;
+	Lng(ii.help) = help;
+	Ctrl& q = ctrl.Add(CreateCtrl(cls));
+	q.TopPos(0, max(10, q.GetStdSize().cy)).LeftPos(0, 50);
+	ii.pos = q.GetPos();
+	q.SetLabel(lbl);
+//	q.Help(help);
+	q.Tip(help);
+	q.DesignMode();
+	form.Add(q);
+	Refresh();
+	itab.Add(cls, var, lbl);
+	SelectOneItem(imi);
+}
+
+class MnemCtrl : public Ctrl
+{
+public:
+	MnemCtrl(char letter, Font font) : letter(letter), font(font) {}
+
+public:
+	virtual void Paint(Draw& draw)
+	{
+		draw.DrawRect(draw.GetClip(), LtRed);
+		draw.DrawText(1, 0, &letter, font, SBlack, 1);
+	}
+
+private:
+	char letter;
+	Font font;
+};
+
+static void AddMnemonic(VectorMap< int, Vector<Ctrl *> >& out, Array<Ctrl>& in)
+{
+	for(int i = in.GetCount(); --i >= 0;)
+	{
+		Ctrl& c = in[i];
+		int m;
+		if(c.GetParent() && c.GetParent() -> IsShown() && (m = c.GetMnemonic()) != 0)
+			out.GetAdd(ToUpper(m)).Add(&c);
+	}
+}
+
+void LayoutDesigner::SynchronizeMnemonic()
+{
+	mnem_ctrl.Clear();
+
+	VectorMap< int, Vector<Ctrl *> > mnemonic;
+	AddMnemonic(mnemonic, ctrl);
+	AddMnemonic(mnemonic, ref_ctrl);
+	Point p = sb;
+	Size shift = Point(10, 10) - p;
+	Font mfont = StdFont().Bold();
+	FontInfo minfo = ScreenInfo().GetFontInfo(mfont);
+	int mht = minfo.GetHeight();
+	for(int m = 0; m < mnemonic.GetCount(); m++)
+		if(mnemonic[m].GetCount() >= 2)
+		{
+			const Vector<Ctrl *>& mdup = mnemonic[m];
+			for(int c = 0; c < mdup.GetCount(); c++)
+			{
+				char mnem = mnemonic.GetKey(m);
+				int mwd = minfo[(byte)mnem];
+				Ctrl& mctrl = mnem_ctrl.Add(new MnemCtrl(mnem, mfont));
+				mdup[c] -> Add(mctrl.RightPos(0, mwd + 2).BottomPos(0, mht));
+			}
+		}
+}
+
+void LayoutDesigner::CleanRefCtrl()
+{
+	for(int i = ref_ctrl.GetCount(); --i >= 0;)
+		if(!ref_ctrl[i].GetParent())
+			ref_ctrl.Remove(i);
+}
+
+void LayoutDesigner::SetClass(int im) {
+	Ctrl& q = ctrl.Set(im, CreateCtrl(Item(im).classname));
+	CleanRefCtrl();
+	form.Add(q);
+	SynchronizeCtrl(im);
+}
+
+void LayoutDesigner::Swap(int i1, int i2) {
+	ActualForm().item.Swap(i1, i2);
+	SetClass(i1);
+	SetClass(i2);
+}
+
+REGCTRLCLASS(Button)
+REGCTRLCLASS(EditField)
+REGCTRLCLASS(EditInt)
+REGCTRLCLASS(EditDouble)
+REGCTRLCLASS(EditDate)
+//REGCTRLCLASS(EditTime)
+REGCTRLCLASS(EditIntNotNull)
+REGCTRLCLASS(EditDoubleNotNull)
+REGCTRLCLASS(EditDateNotNull)
+REGCTRLCLASS(EditIntSpin)
+REGCTRLCLASS(EditString)
+REGCTRLCLASS(EditStringNotNull)
+//REGCTRLCLASS(TableArray)
+REGCTRLCLASS(ArrayCtrl)
+REGCTRLCLASS(Option)
+REGCTRLCLASS(Switch)
+REGCTRLCLASS(Label)
+REGCTRLCLASS(LabelBox)
+REGCTRLCLASS(WithDropChoice<EditString>)
+REGCTRLCLASS(DropList)
+REGCTRLCLASS(ScrollBar)
+REGCTRLCLASS(DocEdit)
+REGCTRLCLASS(QtfCtrl)
+REGCTRLCLASS(StaticRect)
+REGCTRLCLASS(Icon)
+REGCTRLCLASS(ProgressIndicator)
+/*
+REGCTRLCLASS(Picture)
+REGCTRLCLASS(SqlTable)
+REGCTRLCLASS(SqlArray)
+REGCTRLCLASS(SqlOption)
+*/
+REGCTRLCLASS(ToolBar)
+REGCTRLCLASS(MenuBar)
+//REGCTRLCLASS(InfoBar)
+/*
+REGCTRLCLASS(TableCheck)
+REGCTRLCLASS(ValueOption)
+REGCTRLCLASS(FileCtrl)
+REGCTRLCLASS(MenuButton)
+REGCTRLCLASS(DragDropCtrl)
+REGCTRLCLASS(ScrollTable)
+REGCTRLCLASS(StaticCtrl)
+*/
+REGCTRLCLASS(DataPusher)
+//REGCTRLCLASS(ColorCtrl)
+REGCTRLCLASS(TabCtrl)
+//REGCTRLCLASS(OldTreeCtrl)
diff --git a/uppsrc/rw/Lang.cpp b/uppsrc/rw/Lang.cpp
new file mode 100644
index 000000000..6f63c54e2
--- /dev/null
+++ b/uppsrc/rw/Lang.cpp
@@ -0,0 +1,117 @@
+#include "Designer.h"
+
+int FindDlIndex(const DropList& d, const Value& val) {
+	for(int i = 0; i < d.GetCount(); i++)
+		if(d.GetValue(i) == val) return i;
+	return -1;
+}
+
+Vector<String> LayoutDesigner::CoreLangs() {
+	Vector<String> r;
+	return r;
+}
+
+void LayoutDesigner::AddLang(const String& lang, bool copy) {
+	int li = langlist.GetCount();
+	langlist.Add(li, lang);
+	if(copy)
+		for(int i = 0; i < layout.GetCount(); i++) {
+			Form& l = layout[i];
+			for(int i = 0; i < l.item.GetCount(); i++) {
+				String s = l.item[i].label.At(langi);
+				l.item[i].label.At(li) = s;
+				s = l.item[i].help.At(langi);
+				l.item[i].help.At(li) = s;
+			}
+		}
+	SetLayout(~layoutlist, li);
+}
+
+void  LayoutDesigner::NewLanguage() {
+	WithLangLayout<TopWindow> dlg;
+	CtrlLayoutOKCancel(dlg, "New language");
+	dlg.copy = true;
+	Vector<String> cl = CoreLangs();
+	dlg.language.AddList("LNG_ALBANIAN");
+	dlg.language.AddList("LNG_BELARUSIAN");
+	dlg.language.AddList("LNG_BULGARIAN");
+	dlg.language.AddList("LNG_CROATIAN");
+	dlg.language.AddList("LNG_CZECH");
+	dlg.language.AddList("LNG_DANISH");
+	dlg.language.AddList("LNG_DUTCH");
+	dlg.language.AddList("LNG_ENGLISH");
+	dlg.language.AddList("LNG_ESTONIAN");
+	dlg.language.AddList("LNG_FINNISH");
+	dlg.language.AddList("LNG_FRENCH");
+	dlg.language.AddList("LNG_GERMAN");
+	dlg.language.AddList("LNG_GREEK");
+	dlg.language.AddList("LNG_HUNGARIAN");
+	dlg.language.AddList("LNG_ICELANDIC");
+	dlg.language.AddList("LNG_ITALIAN");
+	dlg.language.AddList("LNG_LATVIAN");
+	dlg.language.AddList("LNG_LITHUANIAN");
+	dlg.language.AddList("LNG_MACEDONIAN");
+	dlg.language.AddList("LNG_NORWEGIAN");
+	dlg.language.AddList("LNG_POLISH");
+	dlg.language.AddList("LNG_PORTUGUESE");
+	dlg.language.AddList("LNG_ROMANIAN");
+	dlg.language.AddList("LNG_RUSSIAN");
+	dlg.language.AddList("LNG_SERBIAN");
+	dlg.language.AddList("LNG_SLOVAK");
+	dlg.language.AddList("LNG_SLOVENIAN");
+	dlg.language.AddList("LNG_SPANISH");
+	dlg.language.AddList("LNG_SWEDISH");
+	dlg.language.AddList("LNG_TURKISH");
+	dlg.language.AddList("LNG_UKRAINIAN");
+	if(dlg.Run() != IDOK) return;
+	AddLang(dlg.language, dlg.copy);
+}
+
+void  LayoutDesigner::RenameLanguage() {
+	if(langlist.GetCount() == 0) return;
+	String s = langlist.GetValue();
+	if(!EditText(s, "P�ejmenovat jazyk", "Nov� jazyk")) return;
+	langlist.SetValue(s);
+}
+
+void  LayoutDesigner::RemoveLanguage() {
+	if(langlist.GetCount() == 0) return;
+	if(!PromptYesNo("Remove current language ?")) return;
+	int i;
+	Vector<String> s;
+	for(i = 0; i < langlist.GetCount(); i++)
+		if(i != langi)
+			s.Add(langlist.GetValue(i));
+	if(langlist.GetCount() > 1)
+		for(i = 0; i < layout.GetCount(); i++) {
+			Form& l = layout[i];
+			for(int i = 0; i < l.item.GetCount(); i++) {
+				l.item[i].label.Remove(langi);
+				l.item[i].help.Remove(langi);
+			}
+		}
+	langlist.Clear();
+	for(i = 0; i < s.GetCount(); i++)
+		langlist.Add(i, s[i]);
+	SetLayout(~layoutlist, 0);
+}
+
+void  LayoutDesigner::AddCoreLanguages() {
+	int id = PromptYesNoCancel("Copy current language ?");
+	if(id == IDCANCEL) return;
+	Vector<String> cl = CoreLangs();
+	for(int i = 0; i < cl.GetCount(); i++)
+		AddLang(cl[i], id == IDYES);
+}
+
+void  LayoutDesigner::PrevLang() {
+	if(langlist.GetCount() == 0) return;
+	langlist.SetIndex((langlist.GetIndex() + 1) % langlist.GetCount());
+	EnterLanguage();
+}
+
+void  LayoutDesigner::NextLang() {
+	if(langlist.GetCount() == 0) return;
+	langlist.SetIndex((langlist.GetIndex() + langlist.GetCount() - 1) % langlist.GetCount());
+	EnterLanguage();
+}
diff --git a/uppsrc/rw/StdCtrls.cpp b/uppsrc/rw/StdCtrls.cpp
new file mode 100644
index 000000000..2b9d23e81
--- /dev/null
+++ b/uppsrc/rw/StdCtrls.cpp
@@ -0,0 +1 @@
+#include "Designer.h"
diff --git a/uppsrc/rw/Util.cpp b/uppsrc/rw/Util.cpp
new file mode 100644
index 000000000..509e989ec
--- /dev/null
+++ b/uppsrc/rw/Util.cpp
@@ -0,0 +1,61 @@
+#include "Designer.h"
+
+struct VarLblDisplayCls : public Display
+{
+	VarLblDisplayCls(bool selected) : selected(selected) {}
+
+	virtual void Paint(Draw& draw, const Rect& rc, const Value& value, Color i, Color p, dword style) const
+	{
+		ValueArray va(value);
+		if(selected && !(style & CURSOR))
+			i = SLtBlue;
+		if(va.GetCount() <= 1 || !IsNull(va[0]))
+			StdDisplay().Paint(draw, rc, va[0], i, p, style);
+		else
+		{
+			if(!(style & CURSOR))
+				i = Color(64, 160, selected ? 255 : 64);
+			StdDisplay().Paint(draw, rc, va[1], i, p, style);
+		}
+	}
+
+	bool selected;
+};
+
+const Display& VarLblDisplay(bool selected)
+{
+	if(selected)
+	{
+		static VarLblDisplayCls vls(true);
+		return vls;
+	}
+	else
+	{
+		static VarLblDisplayCls vln(false);
+		return vln;
+	}
+}
+
+void SelectedDisplay::Paint(Draw& w, const Rect& r, const Value& q, Color ink, Color paper,
+		                    dword style) const {
+	w.DrawRect(r, paper);
+	DrawSmartText(w, r.left, r.top, r.Width(),
+	              IsString(q) ? String(q) : StdFormat(q), StdFont(),
+	              (style & CURSOR) ? ink : SLtBlue);
+}
+
+const SelectedDisplay SelDisplay;
+
+void UrgCtrl::SetLabelText(const char *s) {
+	label = s;
+	Refresh();
+}
+
+void UrgCtrl::Paint(Draw& w) {
+	Size sz = GetSize();
+	w.DrawRect(0, 0, sz.cx, sz.cy, SLtCyan);
+	DrawSmartText(w, 0, 0, sz.cx, label);
+	Size tsz = w.GetTextSize(classname, Arial(11));
+	w.DrawRect(sz.cx - tsz.cx, sz.cy - tsz.cy, tsz.cx, tsz.cy, SBlue);
+	w.DrawText(sz.cx - tsz.cx, sz.cy - tsz.cy, classname, Arial(11), SYellow);
+}
diff --git a/uppsrc/rw/doc.dpp/AppDoc_RW_NewFeatures_EN-US.dpp b/uppsrc/rw/doc.dpp/AppDoc_RW_NewFeatures_EN-US.dpp
new file mode 100644
index 000000000..f98cb4b09
--- /dev/null
+++ b/uppsrc/rw/doc.dpp/AppDoc_RW_NewFeatures_EN-US.dpp
@@ -0,0 +1,23 @@
+ITEM("AppDoc", "RW", "NewFeatures", "EN-US") EXTERNAL
+TEXT("[{_} ")
+TEXT("[s0; [*2 May 27, 2003]]")
+TEXT("&")
+TEXT("[s0;2 ]")
+TEXT("&")
+TEXT("[s0; [* Graphical warnings on duplicate ][*_ m][* ne][*_ m][* on")
+TEXT("ic ")
+TEXT("keys]]")
+TEXT("&")
+TEXT("[s0;2 ]")
+TEXT("&")
+TEXT("[s0; [2 Layout editor displays a ][/2 red block with letter][2  ")
+TEXT("in ")
+TEXT("the bottomright corner of each set of layout controls sharing ")
+TEXT("the same mnemonic hotkey (underlined letter marked by `& in the ")
+TEXT("label text string). This helps the designer catch situations ")
+TEXT("in which multiple controls are assigned the same hotkey which ")
+TEXT("is annoying to the end application user.]]")
+TEXT("&")
+TEXT("[s0;2 ]")
+TEXT("]")
+END_ITEM
diff --git a/uppsrc/rw/doc.dpp/links b/uppsrc/rw/doc.dpp/links
new file mode 100644
index 000000000..e69de29bb
diff --git a/uppsrc/rw/iderw.h b/uppsrc/rw/iderw.h
new file mode 100644
index 000000000..42c2c0550
--- /dev/null
+++ b/uppsrc/rw/iderw.h
@@ -0,0 +1,4 @@
+bool  CloseDesignLayout();
+bool  SaveDesignLayout();
+void  DesignLayout(String open_file);
+Image GetRwIcon();
diff --git a/uppsrc/rw/prj.aux b/uppsrc/rw/prj.aux
new file mode 100644
index 000000000..eaac141fb
--- /dev/null
+++ b/uppsrc/rw/prj.aux
@@ -0,0 +1,4 @@
+file
+	e:\out\cxlsrc\rw\DEBUG-GUI-MAIN-MSC-ST-WIN32\rw.log,
+	G:\upp2out\rw\Debug-gui-main-msc-st-win32\rw.log,
+	F:\uppsrc\Core\core.upp;
diff --git a/uppsrc/rw/rw.ico b/uppsrc/rw/rw.ico
new file mode 100644
index 000000000..30df9afc1
Binary files /dev/null and b/uppsrc/rw/rw.ico differ
diff --git a/uppsrc/rw/rw.iml b/uppsrc/rw/rw.iml
new file mode 100644
index 000000000..04e3b4dbb
--- /dev/null
+++ b/uppsrc/rw/rw.iml
@@ -0,0 +1,497 @@
+IMAGE_BEGIN(CrossCursor)
+	IMAGE_SCAN("�\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0")
+	IMAGE_SCAN("�\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0")
+IMAGE_PACKED(CrossCursor, "\2\20\0\0\0\20\0\0\0\4\0\0\0\4\0\0\0\0\0\0\0")
+IMAGE_BEGIN(RwIconSmall)
+	IMAGE_SCAN("")
+	IMAGE_SCAN("����")
+	IMAGE_SCAN("\1����\377\0\0\1���")
+	IMAGE_SCAN("\1����\377\0\0\1���")
+	IMAGE_SCAN("\1�������\1���")
+	IMAGE_SCAN("\2�������\377\377\377\1\0\0\0�\377\377\377����\1���")
+	IMAGE_SCAN("\2�������\377\377\377�\0\0\0�\377\377\377����\1���")
+	IMAGE_SCAN("\1�������\3\0\0\0003�\377\0\0\0����\1���")
+	IMAGE_SCAN("\1�������\1\0\0\0�3�\377\1\0\0\0����\1���")
+	IMAGE_SCAN("\1�������\1\0\0\0�3�\377\1\0\0\0����\1���")
+	IMAGE_SCAN("\1�������\1\0\0\0�3�\377�\0\0\0����")
+	IMAGE_SCAN("\1�������\1\0\0\0�3�\377\1\0\0\0����\1�����������")
+	IMAGE_SCAN("\1�������\6\0\0\0hhh\0\0\0003�\377\0\0\0�������")
+	IMAGE_SCAN("����\5\0\0\0���\0\0\0003�\377\0\0\0����")
+	IMAGE_SCAN("�\3\0\0\0003�\377\0\0\0")
+	IMAGE_SCAN("�\1����\0\0\0")
+IMAGE_PACKED(RwIconSmall, "\2\20\0\0\0\20\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(RwIconLarge)
+	IMAGE_SCAN("")
+	IMAGE_SCAN("")
+	IMAGE_SCAN("")
+	IMAGE_SCAN("�����")
+	IMAGE_SCAN("�\1����\377\0\0\1���")
+	IMAGE_SCAN("�\4���\377\0\0\377\377\377\377\0\0�\377\377\377\1����\377\0\0\3\377\377\377\377\0\0\377\377\377�\377\0\0\1���")
+	IMAGE_SCAN("�\3���\377\0\0\377\377\377�\377\0\0\6\377\377\377���\377\377\377\377\0\0\377\377\377\377\0\0�\377\377\377�\377\0\0\1���")
+	IMAGE_SCAN("�\1����\377\0\0\1���")
+	IMAGE_SCAN("�\1�������\1���")
+	IMAGE_SCAN("�\1�������\1���")
+	IMAGE_SCAN("�\1���������������\1���")
+	IMAGE_SCAN("�\1�������\1����\377\377\377\1��ދ���\1���")
+	IMAGE_SCAN("�\1�������\1����\377\377\377\1��ދ���\1���")
+	IMAGE_SCAN("�\1����������ދ���\1���")
+	IMAGE_SCAN("�\1�������\1���")
+	IMAGE_SCAN("�\1�������\1���")
+	IMAGE_SCAN("�\1��������NNN����\2�������\0\0\0����\1���")
+	IMAGE_SCAN("�\1�������\3NNN����������\4���\0\0\0003�\377\0\0\0����\1���")
+	IMAGE_SCAN("�\1�������\1\0\0\0�3�\377\1\0\0\0����\1���")
+	IMAGE_SCAN("�\1�������\1\0\0\0�3�\377\1\0\0\0����\1���")
+	IMAGE_SCAN("�\1�������\1\0\0\0�3�\377\1\0\0\0����\1���")
+	IMAGE_SCAN("�\1�������\1\0\0\0�3�\377\1\0\0\0����\1���")
+	IMAGE_SCAN("�\1�������\1\0\0\0�3�\377\1\0\0\0����\1���")
+	IMAGE_SCAN("�\1�������\1\0\0\0�3�\377�\0\0\0����\1���")
+	IMAGE_SCAN("�\1�������\1\0\0\0�3�\377\3\0\0\0003�\377\0\0\0�������ނ���\1���")
+	IMAGE_SCAN("�\1�������\2\0\0\0003�\377�\0\0\0�3�\377\1\0\0\0����\3���������������������\3���������")
+	IMAGE_SCAN("�\1��������\0\0\0\2���\0\0\0�3�\377\1\0\0\0����\2����������\2����������\3���������")
+	IMAGE_SCAN("�\1�������\1\0\0\0����\1\0\0\0�3�\377\1\0\0\0��������\2������")
+	IMAGE_SCAN("�\1�������\1\0\0\0�3�\377\1\0\0\0����\1���")
+	IMAGE_SCAN("��\0\0\0\0013�\377�\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0")
+IMAGE_PACKED(RwIconLarge, "\2 \0\0\0 \0\0\0\0\0\0\0\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(TB_ALIGNLEFT)
+	IMAGE_SCAN("\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0��\0\0\0�\1�\0\0")
+	IMAGE_SCAN("\1\0\0\0�\7\0\0\0\377\377\377���\377\377\377���\377\377\377\0\0\0‚�\0\0")
+	IMAGE_SCAN("\1\0\0\0�\7\0\0\0���\377\377\377���\377\377\377���\0\0\0���\0\0")
+	IMAGE_SCAN("\1\0\0\0�\7\0\0\0\377\377\377���\377\377\377���\377\377\377\0\0\0‚�\0\0")
+	IMAGE_SCAN("\1\0\0\0��\0\0\0�\1�\0\0")
+	IMAGE_SCAN("\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0ƒ\0\0\0�\1�\0\0")
+	IMAGE_SCAN("\1\0\0\0�\5\0\0\0\377\377\377���\377\377\377\0\0\0‚�\0\0")
+	IMAGE_SCAN("\1\0\0\0�\5\0\0\0���\377\377\377���\0\0\0���\0\0")
+	IMAGE_SCAN("\1\0\0\0�\5\0\0\0\377\377\377���\377\377\377\0\0\0‚�\0\0")
+	IMAGE_SCAN("\1\0\0\0ƒ\0\0\0�\1�\0\0")
+	IMAGE_SCAN("\1\0\0\0")
+IMAGE_PACKED(TB_ALIGNLEFT, "\2\20\0\0\0\20\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(TB_ALIGNRIGHT)
+	IMAGE_SCAN("�\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0")
+	IMAGE_SCAN("�\1�\0\0Ç\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("‚�\0\0�\7\0\0\0\377\377\377���\377\377\377���\377\377\377\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("��\0\0�\7\0\0\0���\377\377\377���\377\377\377���\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("‚�\0\0�\7\0\0\0\377\377\377���\377\377\377���\377\377\377\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("�\1�\0\0Ç\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0")
+	IMAGE_SCAN("�\1�\0\0ă\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("�\0\0�\5\0\0\0\377\377\377���\377\377\377\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("��\0\0�\5\0\0\0���\377\377\377���\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("�\0\0�\5\0\0\0\377\377\377���\377\377\377\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("�\1�\0\0ă\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0")
+IMAGE_PACKED(TB_ALIGNRIGHT, "\2\20\0\0\0\20\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(TB_ALIGNTOP)
+	IMAGE_SCAN("�\0\0\0")
+	IMAGE_SCAN("")
+	IMAGE_SCAN("ƒ\0\0\0‡\0\0\0")
+	IMAGE_SCAN("�\5\0\0\0\377\377\377���\377\377\377\0\0\0�\7\0\0\0\377\377\377���\377\377\377���\377\377\377\0\0\0")
+	IMAGE_SCAN("�\5\0\0\0���\377\377\377���\0\0\0�\7\0\0\0���\377\377\377���\377\377\377���\0\0\0")
+	IMAGE_SCAN("�\5\0\0\0\377\377\377���\377\377\377\0\0\0�\7\0\0\0\377\377\377���\377\377\377���\377\377\377\0\0\0")
+	IMAGE_SCAN("ƒ\0\0\0‡\0\0\0")
+	IMAGE_SCAN("")
+	IMAGE_SCAN("�\1�\0\0�\1�\0\0")
+	IMAGE_SCAN("ƒ�\0\0ă�\0\0")
+	IMAGE_SCAN("���\0\0…�\0\0")
+	IMAGE_SCAN("�\1�\0\0�\1�\0\0")
+	IMAGE_SCAN("�\1�\0\0�\1�\0\0")
+	IMAGE_SCAN("�\1�\0\0�\1�\0\0")
+	IMAGE_SCAN("�\1�\0\0�\1�\0\0")
+IMAGE_PACKED(TB_ALIGNTOP, "\2\20\0\0\0\20\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(TB_ALIGNBOTTOM)
+	IMAGE_SCAN("�\1�\0\0�\1�\0\0")
+	IMAGE_SCAN("�\1�\0\0�\1�\0\0")
+	IMAGE_SCAN("�\1�\0\0�\1�\0\0")
+	IMAGE_SCAN("�\1�\0\0�\1�\0\0")
+	IMAGE_SCAN("���\0\0�\0\0")
+	IMAGE_SCAN("ƒ�\0\0Ń�\0\0")
+	IMAGE_SCAN("�\1�\0\0�\1�\0\0")
+	IMAGE_SCAN("")
+	IMAGE_SCAN("ƒ\0\0\0Ç\0\0\0")
+	IMAGE_SCAN("�\5\0\0\0\377\377\377���\377\377\377\0\0\0�\7\0\0\0\377\377\377���\377\377\377���\377\377\377\0\0\0")
+	IMAGE_SCAN("�\5\0\0\0���\377\377\377���\0\0\0�\7\0\0\0���\377\377\377���\377\377\377���\0\0\0")
+	IMAGE_SCAN("�\5\0\0\0\377\377\377���\377\377\377\0\0\0�\7\0\0\0\377\377\377���\377\377\377���\377\377\377\0\0\0")
+	IMAGE_SCAN("ƒ\0\0\0Ç\0\0\0")
+	IMAGE_SCAN("")
+	IMAGE_SCAN("�\0\0\0")
+IMAGE_PACKED(TB_ALIGNBOTTOM, "\2\20\0\0\0\20\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(TB_VERTCENTER)
+	IMAGE_SCAN("�\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\1�\0\0�\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0Ņ�\0\0�\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0ƃ�\0\0�\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\1�\0\0�\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0Š\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\12\0\0\0\377\377\377���\377\377\377���\377\377\377���\377\377\377���\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\12\0\0\0���\377\377\377���\377\377\377���\377\377\377���\377\377\377\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0Š\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\1�\0\0�\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0ƃ�\0\0�\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0Ņ�\0\0�\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\1�\0\0�\1\0\0\0")
+	IMAGE_SCAN("�\0\0\0")
+IMAGE_PACKED(TB_VERTCENTER, "\2\20\0\0\0\20\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(TB_HORZCENTER)
+	IMAGE_SCAN("�\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0ń\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\4\0\0\0\377\377\377���\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\4\0\0\0���\377\377\377\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\1�\0\0�\4\0\0\0\377\377\377���\0\0\0�\1�\0\0�\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0‚�\0\0�\4\0\0\0���\377\377\377\0\0\0���\0\0�\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0��\0\0\4\0\0\0\377\377\377���\0\0\0��\0\0\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0‚�\0\0�\4\0\0\0���\377\377\377\0\0\0���\0\0�\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\1�\0\0�\4\0\0\0\377\377\377���\0\0\0�\1�\0\0�\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\4\0\0\0���\377\377\377\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0ń\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("�\0\0\0")
+IMAGE_PACKED(TB_HORZCENTER, "\2\20\0\0\0\20\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(TB_ESPACEHORZ)
+	IMAGE_SCAN("")
+	IMAGE_SCAN("�\0\0\0Ƀ\0\0\0")
+	IMAGE_SCAN("\3\377\377\377���\0\0\0�\3\0\0\0\377\377\377���")
+	IMAGE_SCAN("\3���\377\377\377\0\0\0�\3\0\0\0���\377\377\377")
+	IMAGE_SCAN("\3\377\377\377���\0\0\0�\3\0\0\0\377\377\377���")
+	IMAGE_SCAN("\3���\377\377\377\0\0\0�\1�\0\0�\1�\0\0�\3\0\0\0���\377\377\377")
+	IMAGE_SCAN("\3\377\377\377���\0\0\0���\0\0�\0\0�\3\0\0\0\377\377\377���")
+	IMAGE_SCAN("\3���\377\377\377\0\0\0��\0\0\3\0\0\0���\377\377\377")
+	IMAGE_SCAN("\3\377\377\377���\0\0\0���\0\0�\0\0�\3\0\0\0\377\377\377���")
+	IMAGE_SCAN("\3���\377\377\377\0\0\0�\1�\0\0�\1�\0\0�\3\0\0\0���\377\377\377")
+	IMAGE_SCAN("\3\377\377\377���\0\0\0�\3\0\0\0\377\377\377���")
+	IMAGE_SCAN("\3���\377\377\377\0\0\0�\3\0\0\0���\377\377\377")
+	IMAGE_SCAN("�\0\0\0Ƀ\0\0\0")
+IMAGE_PACKED(TB_ESPACEHORZ, "\2\20\0\0\0\20\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(TB_ESPACEVERT)
+	IMAGE_SCAN("\14\0\0\0\377\377\377���\377\377\377���\377\377\377���\377\377\377���\377\377\377���\0\0\0")
+	IMAGE_SCAN("\14\0\0\0���\377\377\377���\377\377\377���\377\377\377���\377\377\377���\377\377\377\0\0\0")
+	IMAGE_SCAN("�\0\0\0")
+	IMAGE_SCAN("�\1�\0\0")
+	IMAGE_SCAN("�\0\0")
+	IMAGE_SCAN("ą�\0\0")
+	IMAGE_SCAN("�\1�\0\0")
+	IMAGE_SCAN("�\1�\0\0")
+	IMAGE_SCAN("�\1�\0\0")
+	IMAGE_SCAN("ą�\0\0")
+	IMAGE_SCAN("�\0\0")
+	IMAGE_SCAN("�\1�\0\0")
+	IMAGE_SCAN("�\0\0\0")
+	IMAGE_SCAN("\14\0\0\0���\377\377\377���\377\377\377���\377\377\377���\377\377\377���\377\377\377\0\0\0")
+	IMAGE_SCAN("\14\0\0\0\377\377\377���\377\377\377���\377\377\377���\377\377\377���\377\377\377���\0\0\0")
+IMAGE_PACKED(TB_ESPACEVERT, "\2\20\0\0\0\20\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(TB_SAMEWIDTH)
+	IMAGE_SCAN("")
+	IMAGE_SCAN("")
+	IMAGE_SCAN("")
+	IMAGE_SCAN("�\0\0\0")
+	IMAGE_SCAN("\17\0\0\0\377\377\377���\377\377\377���\377\377\377���\377\377\377���\377\377\377���\377\377\377���\377\377\377\0\0\0")
+	IMAGE_SCAN("\17\0\0\0���\377\377\377�\0\0\377\377\377���\377\377\377���\377\377\377���\377\377\377�\0\0\377\377\377���\0\0\0")
+	IMAGE_SCAN("\2\0\0\0\377\377\377��\0\0\7���\377\377\377���\377\377\377���\377\377\377�����\0\0\2\377\377\377\0\0\0")
+	IMAGE_SCAN("\1\0\0\0��\0\0\1\0\0\0")
+	IMAGE_SCAN("\2\0\0\0\377\377\377��\0\0\7���\377\377\377���\377\377\377���\377\377\377�����\0\0\2\377\377\377\0\0\0")
+	IMAGE_SCAN("\17\0\0\0���\377\377\377�\0\0\377\377\377���\377\377\377���\377\377\377���\377\377\377�\0\0\377\377\377���\0\0\0")
+	IMAGE_SCAN("\17\0\0\0\377\377\377���\377\377\377���\377\377\377���\377\377\377���\377\377\377���\377\377\377���\377\377\377\0\0\0")
+	IMAGE_SCAN("�\0\0\0")
+IMAGE_PACKED(TB_SAMEWIDTH, "\2\20\0\0\0\20\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(TB_SAMEHEIGHT)
+	IMAGE_SCAN("")
+	IMAGE_SCAN("É\0\0\0")
+	IMAGE_SCAN("�\11\0\0\0\377\377\377���\377\377\377�\0\0\377\377\377���\377\377\377\0\0\0")
+	IMAGE_SCAN("�\3\0\0\0���\377\377\377��\0\0\3\377\377\377���\0\0\0")
+	IMAGE_SCAN("�\2\0\0\0\377\377\377��\0\0\2\377\377\377\0\0\0")
+	IMAGE_SCAN("�\11\0\0\0���\377\377\377����\0\0���\377\377\377���\0\0\0")
+	IMAGE_SCAN("�\11\0\0\0\377\377\377���\377\377\377�\0\0\377\377\377���\377\377\377\0\0\0")
+	IMAGE_SCAN("�\11\0\0\0���\377\377\377����\0\0���\377\377\377���\0\0\0")
+	IMAGE_SCAN("�\11\0\0\0\377\377\377���\377\377\377�\0\0\377\377\377���\377\377\377\0\0\0")
+	IMAGE_SCAN("�\11\0\0\0���\377\377\377����\0\0���\377\377\377���\0\0\0")
+	IMAGE_SCAN("�\2\0\0\0\377\377\377��\0\0\2\377\377\377\0\0\0")
+	IMAGE_SCAN("�\3\0\0\0���\377\377\377��\0\0\3\377\377\377���\0\0\0")
+	IMAGE_SCAN("�\11\0\0\0\377\377\377���\377\377\377�\0\0\377\377\377���\377\377\377\0\0\0")
+	IMAGE_SCAN("É\0\0\0")
+IMAGE_PACKED(TB_SAMEHEIGHT, "\2\20\0\0\0\20\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(TB_SAMESIZE)
+	IMAGE_SCAN("")
+	IMAGE_SCAN("�\0\0\0")
+	IMAGE_SCAN("\17\0\0\0\377\377\377���\377\377\377���\377\377\377����\0\0���\377\377\377���\377\377\377���\377\377\377\0\0\0")
+	IMAGE_SCAN("\6\0\0\0���\377\377\377���\377\377\377�����\0\0\6���\377\377\377���\377\377\377���\0\0\0")
+	IMAGE_SCAN("\5\0\0\0\377\377\377���\377\377\377�����\0\0\5���\377\377\377���\377\377\377\0\0\0")
+	IMAGE_SCAN("\17\0\0\0���\377\377\377�\0\0\377\377\377���\377\377\377�\0\0\377\377\377���\377\377\377�\0\0\377\377\377���\0\0\0")
+	IMAGE_SCAN("\2\0\0\0\377\377\377��\0\0\7���\377\377\377����\0\0���\377\377\377�����\0\0\2\377\377\377\0\0\0")
+	IMAGE_SCAN("\1\0\0\0��\0\0\1\0\0\0")
+	IMAGE_SCAN("\2\0\0\0\377\377\377��\0\0\7���\377\377\377����\0\0���\377\377\377�����\0\0\2\377\377\377\0\0\0")
+	IMAGE_SCAN("\17\0\0\0���\377\377\377�\0\0\377\377\377���\377\377\377�\0\0\377\377\377���\377\377\377�\0\0\377\377\377���\0\0\0")
+	IMAGE_SCAN("\5\0\0\0\377\377\377���\377\377\377�����\0\0\5���\377\377\377���\377\377\377\0\0\0")
+	IMAGE_SCAN("\6\0\0\0���\377\377\377���\377\377\377�����\0\0\6���\377\377\377���\377\377\377���\0\0\0")
+	IMAGE_SCAN("\17\0\0\0\377\377\377���\377\377\377���\377\377\377����\0\0���\377\377\377���\377\377\377���\377\377\377\0\0\0")
+	IMAGE_SCAN("�\0\0\0")
+IMAGE_PACKED(TB_SAMESIZE, "\2\20\0\0\0\20\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(TB_GRID)
+	IMAGE_SCAN("")
+	IMAGE_SCAN("\1\0\0\0�\1\0\0\0�\1\0\0\0�\1\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("")
+	IMAGE_SCAN("")
+	IMAGE_SCAN("\1\0\0\0�\1\0\0\0�\1\0\0\0�\1\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("")
+	IMAGE_SCAN("")
+	IMAGE_SCAN("\1\0\0\0�\1\0\0\0�\1\0\0\0�\1\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("")
+	IMAGE_SCAN("")
+	IMAGE_SCAN("\1\0\0\0�\1\0\0\0�\1\0\0\0�\1\0\0\0�\1\0\0\0")
+	IMAGE_SCAN("")
+	IMAGE_SCAN("")
+	IMAGE_SCAN("\1\0\0\0�\1\0\0\0�\1\0\0\0�\1\0\0\0�\1\0\0\0")
+IMAGE_PACKED(TB_GRID, "\2\20\0\0\0\20\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(TB_ALIGNHCENTER)
+	IMAGE_SCAN("�\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0")
+	IMAGE_SCAN("�\1�\0\0‡\0\0\0�\1�\0\0")
+	IMAGE_SCAN("���\0\0�\7\0\0\0\377\377\377���\0\0\0���\377\377\377\0\0\0���\0\0")
+	IMAGE_SCAN("��\0\0\7\0\0\0���\377\377\377\0\0\0\377\377\377���\0\0\0��\0\0")
+	IMAGE_SCAN("���\0\0�\7\0\0\0\377\377\377���\0\0\0���\377\377\377\0\0\0���\0\0")
+	IMAGE_SCAN("�\1�\0\0‡\0\0\0�\1�\0\0")
+	IMAGE_SCAN("�\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0")
+	IMAGE_SCAN("�\1�\0\0Ã\0\0\0�\1�\0\0")
+	IMAGE_SCAN("‚�\0\0�\5\0\0\0\377\377\377\0\0\0\377\377\377\0\0\0���\0\0")
+	IMAGE_SCAN("��\0\0\5\0\0\0���\0\0\0���\0\0\0��\0\0")
+	IMAGE_SCAN("‚�\0\0�\5\0\0\0\377\377\377\0\0\0\377\377\377\0\0\0���\0\0")
+	IMAGE_SCAN("�\1�\0\0Ã\0\0\0�\1�\0\0")
+	IMAGE_SCAN("�\1\0\0\0")
+IMAGE_PACKED(TB_ALIGNHCENTER, "\2\20\0\0\0\20\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(TB_ALIGNVCENTER)
+	IMAGE_SCAN("�\1�\0\0�\1�\0\0")
+	IMAGE_SCAN("�\1�\0\0ą�\0\0")
+	IMAGE_SCAN("…�\0\0Ã�\0\0")
+	IMAGE_SCAN("�\0\0�\1�\0\0")
+	IMAGE_SCAN("�\1�\0\0ą\0\0\0")
+	IMAGE_SCAN("Ã\0\0\0�\5\0\0\0\377\377\377���\377\377\377\0\0\0")
+	IMAGE_SCAN("�\5\0\0\0\377\377\377���\377\377\377\0\0\0�\5\0\0\0���\377\377\377���\0\0\0")
+	IMAGE_SCAN("��\0\0\0")
+	IMAGE_SCAN("�\5\0\0\0\377\377\377���\377\377\377\0\0\0�\5\0\0\0���\377\377\377���\0\0\0")
+	IMAGE_SCAN("Ã\0\0\0�\5\0\0\0\377\377\377���\377\377\377\0\0\0")
+	IMAGE_SCAN("�\1�\0\0ą\0\0\0")
+	IMAGE_SCAN("�\0\0�\1�\0\0")
+	IMAGE_SCAN("…�\0\0Ã�\0\0")
+	IMAGE_SCAN("�\1�\0\0ą�\0\0")
+	IMAGE_SCAN("�\1�\0\0�\1�\0\0")
+IMAGE_PACKED(TB_ALIGNVCENTER, "\2\20\0\0\0\20\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(TB_MINHEIGHT)
+	IMAGE_SCAN("")
+	IMAGE_SCAN("�\1�\0\0")
+	IMAGE_SCAN("�\1�\0\0")
+	IMAGE_SCAN("Ņ�\0\0")
+	IMAGE_SCAN("ƃ�\0\0")
+	IMAGE_SCAN("�\1�\0\0")
+	IMAGE_SCAN("��\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\0\0\377\1\0\0\0")
+	IMAGE_SCAN("��\0\0\0")
+	IMAGE_SCAN("�\1�\0\0")
+	IMAGE_SCAN("ƃ�\0\0")
+	IMAGE_SCAN("Ņ�\0\0")
+	IMAGE_SCAN("�\1�\0\0")
+	IMAGE_SCAN("�\1�\0\0")
+IMAGE_PACKED(TB_MINHEIGHT, "\2\20\0\0\0\20\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(TB_MINWIDTH)
+	IMAGE_SCAN("")
+	IMAGE_SCAN("ƃ\0\0\0")
+	IMAGE_SCAN("�\3\0\0\0\0\0\377\0\0\0")
+	IMAGE_SCAN("�\3\0\0\0\0\0\377\0\0\0")
+	IMAGE_SCAN("�\3\0\0\0\0\0\377\0\0\0")
+	IMAGE_SCAN("�\1�\0\0�\3\0\0\0\0\0\377\0\0\0�\1�\0\0")
+	IMAGE_SCAN("�\0\0�\3\0\0\0\0\0\377\0\0\0���\0\0")
+	IMAGE_SCAN("���\0\0\3\0\0\0\0\0\377\0\0\0��\0\0")
+	IMAGE_SCAN("�\0\0�\3\0\0\0\0\0\377\0\0\0���\0\0")
+	IMAGE_SCAN("�\1�\0\0�\3\0\0\0\0\0\377\0\0\0�\1�\0\0")
+	IMAGE_SCAN("�\3\0\0\0\0\0\377\0\0\0")
+	IMAGE_SCAN("�\3\0\0\0\0\0\377\0\0\0")
+	IMAGE_SCAN("�\3\0\0\0\0\0\377\0\0\0")
+	IMAGE_SCAN("ƃ\0\0\0")
+IMAGE_PACKED(TB_MINWIDTH, "\2\20\0\0\0\20\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(TB_ALIGNLBL)
+	IMAGE_SCAN("")
+	IMAGE_SCAN("�\1�\0\0")
+	IMAGE_SCAN("˃�\0\0")
+	IMAGE_SCAN("ʅ�\0\0")
+	IMAGE_SCAN("\1\0\0\0‚\0\0\0�\1\0\0\0�\1�\0\0")
+	IMAGE_SCAN("\1\0\0\0�\1\0\0\0�\1\0\0\0�\1\0\0\0�\1�\0\0")
+	IMAGE_SCAN("\1\0\0\0�\1\0\0\0�\1\0\0\0�\1\0\0\0�\1�\0\0")
+	IMAGE_SCAN("\1\0\0\0‚\0\0\0�\1\0\0\0��\377\0\0")
+	IMAGE_SCAN("\1\0\0\0�\1\0\0\0�\1\0\0\0�\1\0\0\0�\1�\0\0")
+	IMAGE_SCAN("\1\0\0\0�\1\0\0\0�\1\0\0\0�\1\0\0\0�\1�\0\0")
+	IMAGE_SCAN("�\0\0\0��\0\0\0‚\0\0\0�\1�\0\0")
+	IMAGE_SCAN("ʅ�\0\0")
+	IMAGE_SCAN("˃�\0\0")
+	IMAGE_SCAN("�\1�\0\0")
+IMAGE_PACKED(TB_ALIGNLBL, "\2\20\0\0\0\20\0\0\0\377\377\377\377\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(TB_SPRINGLEFT)
+	IMAGE_SCAN("")
+	IMAGE_SCAN("")
+	IMAGE_SCAN("")
+	IMAGE_SCAN("")
+	IMAGE_SCAN("�\1\377\0\0")
+	IMAGE_SCAN("\1\377\0\0‡\0\0\0�\1\377\0\0")
+	IMAGE_SCAN("\1\377\0\0�\1\0\0\0�\377\377\377\1\0\0\0��\377\0\0")
+	IMAGE_SCAN("�\377\0\0\1\0\0\0�\377\377\377\1\0\0\0�\377\0\0�\1\377\0\0�\1\377\0\0")
+	IMAGE_SCAN("\1\377\0\0�\1\0\0\0�\377\377\377\1\0\0\0Ã\377\0\0")
+	IMAGE_SCAN("\1\377\0\0‡\0\0\0�\1\377\0\0")
+	IMAGE_SCAN("�\1\377\0\0")
+IMAGE_PACKED(TB_SPRINGLEFT, "\2\20\0\0\0\20\0\0\0\377\377\377\377\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(TB_SPRINGHSIZE)
+	IMAGE_SCAN("")
+	IMAGE_SCAN("")
+	IMAGE_SCAN("")
+	IMAGE_SCAN("")
+	IMAGE_SCAN("")
+	IMAGE_SCAN("\1\377\0\0Š\0\0\0�\1\377\0\0")
+	IMAGE_SCAN("\1\377\0\0�\1\0\0\0�\377\377\377\1\0\0\0�\1\377\0\0")
+	IMAGE_SCAN("�\377\0\0\1\0\0\0�\377\377\377\1\0\0\0�\377\0\0")
+	IMAGE_SCAN("\1\377\0\0�\1\0\0\0�\377\377\377\1\0\0\0�\1\377\0\0")
+	IMAGE_SCAN("\1\377\0\0Š\0\0\0�\1\377\0\0")
+IMAGE_PACKED(TB_SPRINGHSIZE, "\2\20\0\0\0\20\0\0\0\377\377\377\377\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(TB_SPRINGHCENTER)
+	IMAGE_SCAN("")
+	IMAGE_SCAN("")
+	IMAGE_SCAN("")
+	IMAGE_SCAN("")
+	IMAGE_SCAN("�\1\377\0\0�\1\377\0\0")
+	IMAGE_SCAN("�\1\377\0\0��\0\0\0�\1\377\0\0")
+	IMAGE_SCAN("ƒ\377\0\0\1\0\0\0�\377\377\377\1\0\0\0ƒ\377\0\0")
+	IMAGE_SCAN("\1\377\0\0�\1\377\0\0�\2\377\0\0\0\0\0�\377\377\377\2\0\0\0\377\0\0�\1\377\0\0�\1\377\0\0")
+	IMAGE_SCAN("�\377\0\0�\1\0\0\0�\377\377\377\1\0\0\0�\377\0\0")
+	IMAGE_SCAN("�\1\377\0\0Æ\0\0\0�\1\377\0\0")
+	IMAGE_SCAN("�\1\377\0\0�\1\377\0\0")
+IMAGE_PACKED(TB_SPRINGHCENTER, "\2\20\0\0\0\20\0\0\0\377\377\377\377\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(TB_SPRINGRIGHT)
+	IMAGE_SCAN("")
+	IMAGE_SCAN("")
+	IMAGE_SCAN("")
+	IMAGE_SCAN("")
+	IMAGE_SCAN("�\1\377\0\0")
+	IMAGE_SCAN("�\1\377\0\0‡\0\0\0�\1\377\0\0")
+	IMAGE_SCAN("ƒ\377\0\0�\1\0\0\0�\377\377\377\1\0\0\0�\1\377\0\0")
+	IMAGE_SCAN("\1\377\0\0�\1\377\0\0��\377\0\0\1\0\0\0�\377\377\377\1\0\0\0�\377\0\0")
+	IMAGE_SCAN("�\377\0\0�\1\0\0\0�\377\377\377\1\0\0\0�\1\377\0\0")
+	IMAGE_SCAN("�\1\377\0\0ć\0\0\0�\1\377\0\0")
+	IMAGE_SCAN("�\1\377\0\0")
+IMAGE_PACKED(TB_SPRINGRIGHT, "\2\20\0\0\0\20\0\0\0\377\377\377\377\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(TB_SPRINGTOP)
+	IMAGE_SCAN("Ņ\377\0\0")
+	IMAGE_SCAN("�\1\377\0\0")
+	IMAGE_SCAN("�\1\377\0\0")
+	IMAGE_SCAN("Ņ\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377\377\377\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377\377\377\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377\377\377\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377\377\377\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377\377\377\1\0\0\0")
+	IMAGE_SCAN("Ņ\0\0\0")
+	IMAGE_SCAN("�\1\377\0\0")
+	IMAGE_SCAN("ǂ\377\0\0")
+	IMAGE_SCAN("ȃ\377\0\0")
+	IMAGE_SCAN("ƃ\377\0\0")
+	IMAGE_SCAN("ă\377\0\0")
+	IMAGE_SCAN("Ƃ\377\0\0")
+IMAGE_PACKED(TB_SPRINGTOP, "\2\20\0\0\0\20\0\0\0\377\377\377\377\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(TB_SPRINGVSIZE)
+	IMAGE_SCAN("Ņ\377\0\0")
+	IMAGE_SCAN("�\1\377\0\0")
+	IMAGE_SCAN("�\1\377\0\0")
+	IMAGE_SCAN("Ņ\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377\377\377\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377\377\377\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377\377\377\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377\377\377\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377\377\377\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377\377\377\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377\377\377\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377\377\377\1\0\0\0")
+	IMAGE_SCAN("Ņ\0\0\0")
+	IMAGE_SCAN("�\1\377\0\0")
+	IMAGE_SCAN("�\1\377\0\0")
+	IMAGE_SCAN("Ņ\377\0\0")
+IMAGE_PACKED(TB_SPRINGVSIZE, "\2\20\0\0\0\20\0\0\0\377\377\377\377\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(TB_SPRINGVCENTER)
+	IMAGE_SCAN("Ƃ\377\0\0")
+	IMAGE_SCAN("ă\377\0\0")
+	IMAGE_SCAN("ƃ\377\0\0")
+	IMAGE_SCAN("ȃ\377\0\0")
+	IMAGE_SCAN("ǂ\377\0\0")
+	IMAGE_SCAN("Ņ\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377\377\377\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377\377\377\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377\377\377\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377\377\377\1\0\0\0")
+	IMAGE_SCAN("Ņ\0\0\0")
+	IMAGE_SCAN("Ƃ\377\0\0")
+	IMAGE_SCAN("ă\377\0\0")
+	IMAGE_SCAN("ƃ\377\0\0")
+	IMAGE_SCAN("ȃ\377\0\0")
+	IMAGE_SCAN("ǂ\377\0\0")
+IMAGE_PACKED(TB_SPRINGVCENTER, "\2\20\0\0\0\20\0\0\0\377\377\377\377\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(TB_SPRINGBOTTOM)
+	IMAGE_SCAN("Ƃ\377\0\0")
+	IMAGE_SCAN("ă\377\0\0")
+	IMAGE_SCAN("ƃ\377\0\0")
+	IMAGE_SCAN("ȃ\377\0\0")
+	IMAGE_SCAN("ǂ\377\0\0")
+	IMAGE_SCAN("�\1\377\0\0")
+	IMAGE_SCAN("Ņ\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377\377\377\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377\377\377\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377\377\377\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377\377\377\1\0\0\0")
+	IMAGE_SCAN("�\1\0\0\0�\377\377\377\1\0\0\0")
+	IMAGE_SCAN("Ņ\0\0\0")
+	IMAGE_SCAN("�\1\377\0\0")
+	IMAGE_SCAN("�\1\377\0\0")
+	IMAGE_SCAN("Ņ\377\0\0")
+IMAGE_PACKED(TB_SPRINGBOTTOM, "\2\20\0\0\0\20\0\0\0\377\377\377\377\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(TB_SPRINGTOPLEFT)
+	IMAGE_SCAN("ą\377\0\0")
+	IMAGE_SCAN("�\1\377\0\0")
+	IMAGE_SCAN("�\1\377\0\0")
+	IMAGE_SCAN("Ç\0\0\0�\1\377\0\0")
+	IMAGE_SCAN("\1\377\0\0�\1\0\0\0�\377\377\377\1\0\0\0�\1\377\0\0")
+	IMAGE_SCAN("\1\377\0\0�\1\0\0\0�\377\377\377\1\0\0\0��\377\0\0")
+	IMAGE_SCAN("�\377\0\0\1\0\0\0�\377\377\377\1\0\0\0�\377\0\0�\1\377\0\0�\1\377\0\0")
+	IMAGE_SCAN("\1\377\0\0�\1\0\0\0�\377\377\377\1\0\0\0Ã\377\0\0")
+	IMAGE_SCAN("\1\377\0\0�\1\0\0\0�\377\377\377\1\0\0\0�\1\377\0\0")
+	IMAGE_SCAN("Ç\0\0\0�\1\377\0\0")
+	IMAGE_SCAN("�\1\377\0\0")
+	IMAGE_SCAN("Ƃ\377\0\0")
+	IMAGE_SCAN("ǃ\377\0\0")
+	IMAGE_SCAN("Ń\377\0\0")
+	IMAGE_SCAN("Ã\377\0\0")
+	IMAGE_SCAN("ł\377\0\0")
+IMAGE_PACKED(TB_SPRINGTOPLEFT, "\2\20\0\0\0\20\0\0\0\377\377\377\377\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(TB_SPRINGAUTO)
+	IMAGE_SCAN("Å\377\0\0")
+	IMAGE_SCAN("�\1\377\0\0")
+	IMAGE_SCAN("�\1\377\0\0")
+	IMAGE_SCAN("\1\377\0\0…\0\0\0")
+	IMAGE_SCAN("\1\377\0\0�\1\0\0\0�\377\377\377\1\0\0\0�\1\377\0\0�\1\377\0\0")
+	IMAGE_SCAN("�\377\0\0\1\0\0\0�\377\377\377\1\0\0\0�\377\0\0�\1\377\0\0�\1\377\0\0�\1\377\0\0")
+	IMAGE_SCAN("\1\377\0\0�\1\0\0\0�\377\377\377\1\0\0\0�\1\377\0\0")
+	IMAGE_SCAN("\1\377\0\0…\0\0\0")
+	IMAGE_SCAN("ȅ\0\0\0�\1\377\0\0")
+	IMAGE_SCAN("�\1\377\0\0�\1\377\0\0�\1\0\0\0�\377\377\377\1\0\0\0�\1\377\0\0")
+	IMAGE_SCAN("\1\377\0\0�\1\377\0\0�\1\377\0\0��\377\0\0\1\0\0\0�\377\377\377\1\0\0\0�\377\0\0")
+	IMAGE_SCAN("�\1\377\0\0�\1\0\0\0�\377\377\377\1\0\0\0�\1\377\0\0")
+	IMAGE_SCAN("ȅ\0\0\0�\1\377\0\0")
+	IMAGE_SCAN("�\1\377\0\0")
+	IMAGE_SCAN("�\1\377\0\0")
+	IMAGE_SCAN("ȅ\377\0\0")
+IMAGE_PACKED(TB_SPRINGAUTO, "\2\20\0\0\0\20\0\0\0\377\377\377\377\0\0\0\0\0\0\0\0")
diff --git a/uppsrc/rw/rw.rc b/uppsrc/rw/rw.rc
new file mode 100644
index 000000000..1fa70e29d
--- /dev/null
+++ b/uppsrc/rw/rw.rc
@@ -0,0 +1 @@
+5555 ICON "rw.ico"
\ No newline at end of file
diff --git a/uppsrc/rw/rw.upp b/uppsrc/rw/rw.upp
new file mode 100644
index 000000000..2089daa89
--- /dev/null
+++ b/uppsrc/rw/rw.upp
@@ -0,0 +1,28 @@
+uses
+	CtrlLib;
+
+acceptflags
+	IDERW;
+
+file
+	Designer.h,
+	Designer.lay,
+	Designer.cpp,
+	DesignerFile.cpp,
+	DesignerLayt.cpp,
+	DesignerWin.cpp,
+	iderw.h,
+	Alias.cpp,
+	ItemCtrl.cpp,
+	Lang.cpp,
+	StdCtrls.cpp,
+	Util.cpp,
+	rw.iml,
+	rw.rc,
+	Info readonly separator,
+	COPYING,
+	COPYING-PLAIN,
+	AUTHORS;
+
+mainconfig
+	"" = "";
diff --git a/uppsrc/umk/umk.cpp b/uppsrc/umk/umk.cpp
new file mode 100644
index 000000000..aab74e3ef
--- /dev/null
+++ b/uppsrc/umk/umk.cpp
@@ -0,0 +1,42 @@
+#include "stdio.h"
+#include "Windows.h"
+
+int main(int argc, const char *argv[])
+{
+	SECURITY_ATTRIBUTES sa;
+	sa.nLength = sizeof(SECURITY_ATTRIBUTES);
+	sa.lpSecurityDescriptor = NULL;
+	sa.bInheritHandle = TRUE;
+
+	PROCESS_INFORMATION pi;
+	STARTUPINFO si;
+	ZeroMemory(&si, sizeof(STARTUPINFO));
+	si.cb = sizeof(STARTUPINFO);
+	si.dwFlags = STARTF_USESTDHANDLES;
+	si.wShowWindow = SW_HIDE;
+	si.hStdInput  = GetStdHandle(STD_INPUT_HANDLE);
+	si.hStdOutput = GetStdHandle(STD_OUTPUT_HANDLE);
+	si.hStdError  = GetStdHandle(STD_ERROR_HANDLE);
+
+	char cmd[16384];
+	GetModuleFileName(NULL, cmd, _MAX_PATH);
+#ifdef flagDEBUG
+	strcpy(strrchr(cmd, '\\'), "\\debugide.exe");
+#else
+	strcpy(strrchr(cmd, '\\'), "\\theide.exe");
+#endif
+	for(int i = 1; i < argc; i++) {
+		strcat(cmd, " ");
+		strcat(cmd, argv[i]);
+	}
+	if(!CreateProcess(NULL, cmd, &sa, &sa, TRUE, NORMAL_PRIORITY_CLASS, NULL, NULL, &si, &pi))
+		return 255;
+
+	HANDLE hProcess = pi.hProcess;
+	CloseHandle(pi.hThread);
+	WaitForSingleObject(hProcess, INFINITE);
+	DWORD ExitCode;
+	GetExitCodeProcess(hProcess, &ExitCode);
+	CloseHandle(pi.hProcess);
+	return ExitCode;
+}
diff --git a/uppsrc/umk/umk.upp b/uppsrc/umk/umk.upp
new file mode 100644
index 000000000..225e05ff1
--- /dev/null
+++ b/uppsrc/umk/umk.upp
@@ -0,0 +1,8 @@
+description "Utility to build U++ projects from the commandline";
+
+file
+	umk.cpp;
+
+mainconfig
+	"" = "CONSOLE";
+
diff --git a/uppsrc/unrefined.doc b/uppsrc/unrefined.doc
new file mode 100644
index 000000000..c6fb2014f
--- /dev/null
+++ b/uppsrc/unrefined.doc
@@ -0,0 +1,456 @@
+TheIDE Builder overview
+See your 'distribution'. There should be "examples" directory and "uppsrc" directory. I am still developing the right terminology, but let us call these directories "nest".
+Package is basically a directory containing source files. Package can have defined dependency on other packages.
+Nest contains subdirectories with packages.
+When you start TheIDE, you can choose (in the left area) something that we probably will call "assembly" (you can see "examples" and "uppsrc").
+Assembly is related but not equal to the nest. In fact, assembly is an ordered set of one or more nests. When you select assembly (at TheIDE startup), you can see all "main" packages of first nest of assembly. "Main" package is one that has configuration(s) for building target(s). Each package defines what other packages it uses.
+And now things get funny - when searching for dependent packages, TheIDE searches nests of assembly from first to last until it finds right package.
+Now this has some advantages: In our development, we have e.g. uppsrc and uppstable nests containing almost identical packages. "uppsrc" is something like development sandbox, "uppstable" is a little bit conservative version. Now some "production" code I keep in "cxlsrc" nest, but I have two assemblies: cxlsrc: "cxlsrc;uppsrc" and cxlstable: "cxlsrc;uppstable". This way I can easily change from stable to development setup and back...
+Well, back to includes. What TheIDE does is that it adds nest directories to the beginning of include path (using compiler commandline options). That way any source can refer to any other package include, using name of other package, like
+#include <Core/Core.h>
+(Note that this will include "uppsrc/Core/Core.h" in my cxlsrc assembly and "uppstable/Core/Core.h" in my cxlstable).
+Include files are kept with sources this way and any manipulation is extremely easy - whole package is always contained in a single directory.
+Each main package has associated one or more configuration.
+It is basically a set of identifiers like
+MSC DEBUG WIN32 ST GUI
+Above means "use MSC compiler, build debug mode, single threaded, WIN32 GUIapplication".
+Some of these flags are predefined and eventually detected by TheIDE builder, but you can add your own at your will. These flags can be tested by package and linker and compiler options added according to them, additional libraries added and so on (see "Workspace/Package Organizer...".
+Moreover,these options are reflected in complied sources as defined macros (in this case flagMSC, flagDEBUG, flagST, flagGUI, flagWIN32).
+Now there are two kinds of options: ambient and dotted. Ambient options reflect in all compiled packages. Dotted are introduced by '.' (like GNU LINUX ST GUI .XFT - XFT is dotted) and reflect only in main package (unconditionally) and in packages that accept them (this is mainly to reduce size of outputdirectory).
+BTW, have I mentioned that you can use main package as non-main ? That way it is possible to add package testing code to it and use #ifdef flagMAIN to compile it only if package is used as main (for development reasons).
+You can also define custom build steps based on file's extension(see "Workspace/Custom steps.."). Note that custom steps are associated with packages and conditioned by configuration.
+Example is compilation of .RC files, which is associated with CtrlCore package and conditioned to Windows/MSC compiler. That means that as long as your main package depends on CtrlCore (directly or indirectly) and you are building Win32 app, .rc files get translated (anyway, another thing is that upp does use .rc files only to define program icon and just because there is not other way how to do it :).
+
+=======================================================================================
+
+Creating a new application
+	In this example we will create a simple "Hello world" application which contains two packages, called Main and Util.
+	U++ requires that we store our source files under a root directory called a nest. The nest directory will contain other directories that will hold the source files. The directories contained in the nest directory will become package directories as we create our application.
+	U++ requires one of our packages to be a main package. We will see shortly how to create a main package.
+	Start TheIDE. A dialog will appear titled Select main package. A list of assemblies appears on the left. Right click over the list of assemblies and select New assembly.
+	A dialog will appear titled Assembly setup. First, give the assembly a name in the field titled Assembly name. A good choice is the name of the application, which we will call "Hello".
+	Next, provide a list of nest directories in the field titled Package nests. The first directory must be the directory we want to contain the application's files. If you needed to use packages stored elsewhere, you would provide the names of the nests that contain them, separating the name of each directory with a semi-colon.
+	We don't want to do this, so you should only provide the name of our application's source nest. So in the Package nest field, type "c:/Hello".
+	The two other fields in this dialog can be left with their default settings. Exit the dialog by clicking the OK button.
+	At this stage, U++ will have created the nest directory "c:/Hello". We now want to create two packages called Main and Util. Click on the New button to start the Create new package dialog and give the package the name "Main" . TheIDE will start, showing package Main at the top left of the display.
+	We now want to make Main a main package, because it is this package that must produce our target application. Right click on Main and select Main package configuration or select Workspace|Main package configuration... through the menu bar.
+	Now let's create package Util and add it to package Main.
+
+========================================================
+
+> How can I switch between mingw and vc71 builds ?
+
+Well, depends. If you have installed regular upp release to machine with
+already installed MSC71, all you have to do is to click to left "drop down"
+button of toolbar combo displaying output mode - and switch from "GCC DEBUG"
+to "MSC71 debug".
+
+> In dir "out\Core\MINGW-CONSOLE-GCC-MSC-OPTIMIZE-RELEASE-ST-WIN32-WIN32",
+> what means "MSC" ?
+
+Sorry, outdated package (it is that NTL export package I sent you, is not it
+?). Just edit main config and replace config by simple "GUI ST" (GUI
+SingleThreaded application - rest is set in output mode).
+
+========================================================
+
+> I also find using Doc++ quite slow. I think there need to be some keyboard
+> shortcuts for applying "in-line" formatting such as bold;
+
+Ctrl+B
+
+> Some more fonts would be good as well.
+
+Well, there is a good reason for staying with that limited set - platform
+portability. I can easily provide Arial/Times New Roman/Courier equivalents
+on Linux, but any other font would cause a problem....
+
+========================================================
+
+> I suggest that I create a plan for the documentation of theIDE. This will
+> need to reflect the way that documentation is organised in upp but because
+I
+> don't yet understand that, I'll start with some headings. Something like
+>
+>     Location                                    Contents
+>     ===================================================
+>     AppDoc/IDE/Overview            Brief overview: what upp is for
+>     AppDoc/IDE/Getting started    Getting started
+>     AppDoc/IDE/Concepts            Packages, assemblies, nests, ...
+>     AppDoc/IDE/Build                   The build process
+>     ...
+>     ===================================================
+
+I think that you already got a clue about "Location" - this seems all right
+to me.
+
+Just to explain a little bit more about Doc++ system - each package has
+"doc.dpp" directory, in which are contained various text resource files that
+are coupled with package. These resources are  organized _across_ packages
+in three-level structure, using "namespace", "nesting" and "item".
+
+When Doc++ is used to document C++ sources (one of possible uses),
+"namespace" corresponds (no wonder) to C++ namespace, "nesting" corresponds
+to struct/class/union (or is "<global>") and "item" is description of
+method, data declaration, function etc. Sometimes, however, item is just a
+link to other resource, typically class is documented in single document and
+methods are realized as links to it.
+
+Anyway, in this moment you will likely work with "external" documents, these
+are documents that are unrelated to concrete C++ elements - like application
+docs etc... Still they follow same main organization.
+
+As all text resources are kept inside package directories and their format
+is maintained in a way that makes converting them into C++ quite easy, it is
+very easy to "get" them into actual application. Usually it involves
+selecting the namespace you want to include into C++ application and
+performing #include - see "ide" package, "About.cpp" file to see how that
+can be done. Well, this is not something you would absolutely need to know
+to write docs, but it will certainly help to understand how things are
+organized.
+
+Important note - as writing docs using Doc++ stores text documents inside
+these directories as described above, uninstalling U++ package would delete
+them! So you better backup before it, or maintain separate nest for uppsrc
+(like uppsrcdev) outside of distribution directory.
+
+========================================================
+
+BTW, it is not so uncommon that certain package can be used both as main or
+not-main (we should forge some term for non-main packages...) . One example
+is adding debuging sources, so that when compiled as main, those sources are
+included and run, otherwise package is used and test code is not needed
+anymore. Or, for some reasons, whole standalone application can be included
+in another application.
+
+========================================================
+
+Please, do not use html format for email, as it makes quoting and replying
+somewhat difficult... I will use ">>>>>" for distringusihing yours and mine
+text...
+
+>>>>
+I haven't yet discovered everything about what Ultimate++ is. I'm
+concentrating on packages/assemblies at the moment. I've read your
+documentation, but I haven't understood it.
+
+I get the impression from the example applications that one of the things
+Ultimate++ offers is an application framework: a set of classes that can be
+used to build applications. Assuming that's the case, does this feature need
+a name (ultimate application framework/UFC/UAF)?
+<<<<
+
+Actually, framework is named "Ultimate++". You can also consider TheIDE as
+part of framework - in the end, it is nothing else than a (main) package...
+
+>>>>
+Leaving aside how packages, nests and assemblies are implemented, this is
+what I know - or think I know - about them. Perhaps you could add to this
+and correct anything I've got wrong.
+packages are containers
+<<<<
+
+Well, it could be said so. Simply put, package is a directory (which IS a
+container) that contains related files. When compiled, it turns to library.
+It is also important that package files are ALWAYS stared only in that
+directory - so (re)moving package etc. is quite easy.
+
+>>>>>
+packages can contain source files and other packages
+<<<<<
+
+It can contain source and other kinds of files (including that text
+resources contained in upp directory). It does NOT CONTAIN other packages -
+but it can use them (be dependent on them).
+
+>>>>
+a "main" package contains everything needed to build an executable or a
+library. If the package builds an executable, it will have a "main" function
+<<<<
+
+This is mostly correct. The main package really compiles to the
+application - and it has some kind of "main" function.
+
+I think that we can explain it on some example:
+
+See examples/AddressBook. Now AddressBook is main package. If you would open
+"Package organizer", you should see that it uses "CtrlLib" package (it
+contains most GUI widgets). "CtrlLib" package uses "CtrlCore" (contains
+basic widget functionality), "CtrlCore" uses "Draw" (contains Drawing
+routines) and Draw uses "DocTypes" (contains some formating) and "Core"
+(contains containers, streams, string etc.).
+
+So in other sense, main package is a root of hierarchy too.
+
+Now the important part is that what package "uses" is always described in
+package itself. That means that when I was creating AddressBook, I have
+added only CtrlLib - and rest packages where added indirectly. Also, when
+DocTypes will become obsolete and replaced by RichText package (which
+actually is a plan :), I will only change "uses" of Draw package - and
+DocTypes will be replaced across ALL applications.
+
+Purpose of all this mess is that I want to have packages logically grouped.
+I disliked "old" times with Visual C++, when I needed to add sets of
+libraries for related applications all over again.
+
+I recommend you also to browse through distribution directories and examine
+what files are included, and eventually see contents of ".upp" files (these
+are package description files). TheIDE normally takes care about them, but
+knowing about them gives a lot of hints.
+
+>>>>
+a "main" package has one or more configurations that provide information
+about what is being built, etc.
+<<<<<
+Correct.
+
+>>>>>
+an assembly is an ordered set of packages
+<<<<<
+
+Incorrect. Assembly is an ordered set of nests (or whatever new term we will
+find). Nest is a directory that contains packages.
+
+E.g. imagine you want to work on refactoring CtrlLib package - e.g. you
+would want to improve MenuBar, but not to change anything else than CtrlLib
+package and want to have older version still available (because work is long
+and you might need to build some other application with original CtrlLib
+meanwhile). Now you might do following: Create new nest directory
+
+c:/dev-uppsrc
+
+and new assembly "dev-examples"
+
+c:/upp/examples;c:/dev-uppsrc;c:/upp/uppsrc
+
+and copy c:/upp/uppsrc/CtrlLib to c:/dev-uppsrc
+
+Now when you will load "dev-examples"/Menu, TheIDE will load Menu from
+c:/upp/examples, CtrlLib from c:/dev-uppsrc and rest of packages from
+c:/upp/uppsrc (whenever it does not find a package in first nest directory,
+it tries to search it in next etc...)
+
+That was pretty complicated example, so what about something simpler - you
+want to use U++ to develop some application, but you will likely not want to
+put your package(s) to distribution's "uppsrc" nest - so you will probably
+create something like
+
+c:\MyUppApps
+
+and "MyApps" assembly
+
+c:\MyUppApps;c:\upp\uppsrc
+
+This way you will have your package in separate nest directory, but still
+will be able to use all "uppsrc" packages. (BTW, in next distribution(s),
+something like "MyApps" will be created by install process...)
+
+===================================================
+
+ PACKAGE ORGANISER DIALOG
+> I notice references to symbols such as WIN32. Are these set by the system
+or
+> by the user? I can see some correspondence between symbols and options in
+> the dialog "Main package configuration(s)/Configuration flags".
+
+That is correct. Time to describe: What you setup in main package
+configuration are basic compilation flags (typically, it is GUI vs. CONSOLE
+and MT vs. ST (single/multithreaded). Anyway, you can also add any
+"user-defined" flags not generated or recognised by build system.
+
+When you start building, build system complements these flags with some
+other, like WIN32 for target, DEBUG meaning debug mode, level of debug mode
+(DEBUG_MINIMAL, DEBUG_FULL), MSC71 for compiler type, BLITZ indicating
+blitz-build etc. When building main package, MAIN is added.
+
+Thinking about it, we should introduce new terms "main package
+configuration" and "effective configuration" here.
+
+All these flags then condition build. Some of them are understand by
+builders (by builder I mean compiler specific code to build target), all are
+reflected as flagXXXX macro defines in sources, so that you can use #ifdef
+to exclude/include parts of sources based on effective configuration.
+
+Now look at the "out" directory - that should help you understand how
+specific intermediate files are stored based on sorted set of compilation
+flags.
+
+> In the Package organiser dialog, what is the "Accepts" property for?
+
+User flags can be "dotted", e.g. ".XFT". These flags reflect only in main
+package (always) and then just in packages that have these flags listed in
+"Accepts" property. This is mainly to reduce the size of "out" directory.
+
+> Could I try you out on the purpose of the "When" tables?
+
+Well, now during compiling, you often need to add some additional
+informations like libraries etc. for package - but apparently there are not
+same libraries on Linux and Windows, or there are other reasons to add/not
+add specific libarry. So you can condition adding library (or anything else)
+by that "When" column. Format is simple - all flags not prepended by "!"
+must be present, "!" must not... Like "LINUX !XFT" will be valid only if
+LINUX is in effective configuration and XFT is NOT in effective
+configuration.
+
+> o I assume that "When/Additional libraries", "When/Compiler options" and
+> "When/Linker options" have the obvious meanings. Examples seem to confirm
+> this.
+
+Yes :)
+
+> o "When/Add or remove flag(s)". Is the purpose to define equivalences? I
+> notice one example When==NOTMFC, Add or remove flag(s)==!GUI !CONSOLE.
+Does
+> this mean "if NOTMFC is set, unset GUI and CONSOLE"?
+
+Yes. In when, as described above, "!" means not present, in add/remove it
+means remove.
+
+> o "When/Target file override". I haven't seen any examples. What's it for?
+
+Well, it is somewhat obsolete now. You could use it to override target file
+of compilation (either .lib for sub-package or .exe for main package),
+anyway you can do the same thing in the "Build.." pane.
+
+Note to TOMAS: Do you think we should remove "Target file override" ?
+
+> PACKAGES
+> I think it's the case that a newly created package will not appear in its
+> assembly's list of packages until it's been given a main package
+> configuration. Is that correct?
+
+It is correct for main package select dialog (one that appears upon startup
+of TheIDE) - but you can set "All modules" (damn it, should be "All
+packages" ) to see it. Only package with main config is considered main.
+
+Anyway, when adding package to "uses", you should see all packages.
+
+> I spent a long time trying to add a new
+> package to an assembly and puzzling over why it didn't appear when I next
+> tried "Set main package".
+
+Sorry:) Right today I finished system of package templates that should do
+this for you automagically...
+
+===================================================
+Summary of packages:
+
+Core - core components, like streams, string, containers etc...
+CtrlCore - basic GUI widget functionality, including X11 and Win32 interfaces
+CtrlLib - standard library of GUI widgets
+DocTypes - typesetting and documents, including Qtf. In future, it is planed to be obsoleted by RichText.
+Draw - drawing routines, including X11 and Win32 interfaces
+Esc - ESC scripting language interpreter (Embedded SCripting language)
+Geom - advanced FP geometry and graphics
+Image - advanced raster image operations (bilinear rescaling etc...)
+MySql - MySQL interface
+Ole - some OLE routines (TOM, please specify :)
+OleDB - OLE DB interace (dtto)
+Oracle - Oracle interface
+Plugin - contains packages for working with bz2, gif, jpeg, png, tiff, zim and zlib formats.
+RichEdit - wordprocessor
+RichText - data model for wordprocessor - scheduled to replace DocTypes when support for tables is added
+Sql - basic SQL functionality
+SqlCommander - application: SQL console
+SqlCtrl - SQL GUI widgets
+TCore, TDraw, TCtrlLib, TSql - can be considered as "candidate" packages
+Updater - automatic exe deployment application
+Web - html, TCP/IP and remote process support
+
+Parts of TheIDE:
+
+Browser - Doc++ implementation
+Builders - builders for GCC, MSVC and Java
+Debuggers - GDB visual interface
+Docpp - simple C++ parser for documentation purposes
+IconDes - raster image designer
+ide - TheIDE main package
+IdeEditor - source file editor
+LayDes - layout designer
+
+=========================================
+> How to add a library at linktime ?
+
+> I would like to add the OpenGL libraries at linktime
+> libopengl32.a
+> libglut32.a
+> libglu32.a
+
+Using package organizer. Just add opengl32, glut32 and glu32 to the package that uses them.
+Open "Workspace"/"Package organizer".
+
+You should see "Aditional libraries" pane - rightclick and add "opengl32 glut32 glu32".
+For now ignore "When" column - you would want to use it for conditioning these libraries for e.g.
+mingw build.
+
+As libraries you mention are part of mingw (and this way are already on library path),
+not further problem should appear. If they would be in some directory not already known to
+TheIDE, you can add it in "Setup"/"Build methods".
+
+==========================================
+> b) How to get it into program so that Windows sees the icon. This one is a
+> little bit more compilacated and indeed it requires creating .rc and
+> converting icon to .ico format. In fact, this is the ONLY use for .rc left
+> in Ultimate++ (we may even remove it later). To convert to .ico you can use
+> some third-party tool, or you can setup ImageDes to do it for you
+> automatically (somewhat not so logically, the option is in properties dialog
+> of Image designer).
+
+A little more on application icons: if Windows is to know about the
+application icon, it must be stored as an icon resource. Under Windows 98,
+first resource of icon type is taken, under Windows NT icon with lowest ID
+is used (or vice versa, I'm not exactly sure now; however the icon
+identification method differs a little among the various Windows clones, so
+usually it's a good idea to keep the icon resource at the beginning of the
+RC file and give it the lowest ID as well).
+
+Another thing to keep in mind is that an ICON is actually a collection of
+(masked) bitmaps - there can be a series of icons with different sizes and
+color models (bit depths). Most commercial applications have at least a pair
+of icons - large icon (32x32) and small icon (16x16). The large icon is
+shown when you put your application on the desktop, in file explorer with
+large icons on or when switching among applications using Alt+Tab. The small
+icon shows on the taskbar, in the topleft corner of the application window,
+in explorer in small icons mode and in other file management software like
+winzip or Windows Commander.
+
+Actually the above definition is not precise: the application window icon
+and the icon on the taskbar are set programmatically, although usually they
+display the same small application icon image. Therefore these two icons can
+be set without any icon resources. The icon resources are needed only for
+icons that are to be displayed from "outside", i.e. without any
+programmatical cooperation from the application itself.
+
+To setup RC for this purpose, you have to define an ICON resource, like
+this:
+
+5555 ICON DISCARDABLE "ide.ico"
+
+(Borland resource compiler supports embedded icons with the binary contents
+of the ICO file written as binhex directly into the RC file. Microsoft
+resource compiler doesn't support this feature so the icon has to be kept in
+a separate file. Usually it's easiest to have the icon in the same directory
+as the resource. You can make the built-in image designer in IDE generate
+this ICO file for you. In the setup dialog, the bottommost section
+"Application icon" lets you enter the name of the desired ICO output file
+and the image identifiers of the large (32x32) and small (16x16) application
+icons. Naturally images with these names must exist in the IML file. You can
+also select color format for the icon, which is usually 16 or 256 colors.
+I'm not sure now but I'm afraid there are certain limitations concerning
+color formats supported in various Windows versions. 16 and 256 should be OK
+everywhere, I'm not very optimistic about hicolor and truecolor.
+
+To make the long story short, first paint the large and small icon in the
+image designer. Enter their names into the setup dialog together with the
+ICO file name and put an ICON resource line (with the same file name) into
+your RC. This should do for the application icon to start working.
+
+Good luck
+
+Tomas
+
+==========================================
+==========================================
+==========================================
+==========================================
+==========================================
diff --git a/uppsrc/upp_config.h b/uppsrc/upp_config.h
new file mode 100644
index 000000000..932cfd99c
--- /dev/null
+++ b/uppsrc/upp_config.h
@@ -0,0 +1 @@
+#define flagNOGTK
diff --git a/uppsrc/upt/Console.upt b/uppsrc/upt/Console.upt
new file mode 100644
index 000000000..928bebf5d
--- /dev/null
+++ b/uppsrc/upt/Console.upt
@@ -0,0 +1,16 @@
+template "Console application (no U++)" main;
+
+@@<:PACKAGE:>.cpp
+#include "stdio.h"
+
+int main(int argc, const char *argv[])
+{
+	return 0;
+}
+
+@@<:PACKAGE:>.upp
+file
+	<:PACKAGE:>.cpp;
+
+mainconfig
+	"" = "";
diff --git a/uppsrc/upt/SDLCore.upt b/uppsrc/upt/SDLCore.upt
new file mode 100644
index 000000000..98c033cfa
--- /dev/null
+++ b/uppsrc/upt/SDLCore.upt
@@ -0,0 +1,98 @@
+template "SDL with Core package" main;
+
+option "Create header" header;
+option "Initialize video" video;
+option "Double buffering" doublebuff;
+option "Full screen" fullscreen;
+option "Event loop" loop;
+
+@@<:PACKAGE:>.h
+??header
+#ifndef _<:PACKAGE:>_<:PACKAGE:>_h
+#define _<:PACKAGE:>_<:PACKAGE:>_h
+
+#include <Core/Core.h>
+#include <SDL.h>
+
+using namespace Upp;
+
+#endif
+@@<:PACKAGE:>.cpp
+<:?header:>#include "<:PACKAGE:>.h"
+<:/:>#include <Core/Core.h>
+#include <plugin/SDL/SDL.h><:.:>
+<:?video:>
+SDL_Surface * OpenScreen(const int width, const int height, const int bpp, const int flags)
+{
+	SDL_Surface * screen = SDL_SetVideoMode(width, height, bpp, flags);
+	if(!screen)
+	{
+		Cout() << Format("Couldn't set display mode: %s\n", SDL_GetError());
+		return NULL;
+	}
+	return screen;
+}
+<:.:><:(loop && video ? "
+void Paint(SDL_Surface * surface)
+{
+	/* Put your painting code here */
+}
+" : ""):>
+CONSOLE_APP_MAIN
+{
+	if(SDL_Init(SDL_INIT_VIDEO) < 0)
+		return;
+<:?video:>
+	int videoflags = SDL_HWSURFACE | SDL_HWACCEL<:(fullscreen || doublebuff ? fullscreen ? doublebuff ? " | SDL_FULLSCREEN | SDL_DOUBLEBUF" : " | SDL_FULLSCREEN" : doublebuff ? " | SDL_DOUBLEBUF" : "" : ""):>;
+	SDL_Surface * screen = OpenScreen(1024, 768, 32, videoflags);
+	if(!screen)
+		return;
+<:.:><:?loop:>
+	SDL_Event event;
+	bool done = false;
+
+	while(!done)
+	{
+		if(SDL_PollEvent(&event))
+		{
+			switch (event.type)
+			{
+				case SDL_KEYDOWN:
+					if(event.key.keysym.sym == SDLK_LALT || event.key.keysym.sym == SDLK_TAB)
+						break;
+					<:(video ? "if(event.key.keysym.sym == SDLK_RETURN)
+					{
+						videoflags ^= SDL_FULLSCREEN;
+						screen = OpenScreen(screen->w, screen->h, screen->format->BitsPerPixel, videoflags);
+						if(!screen)
+							done = true;
+						break;
+					}" : ""):>
+				case SDL_QUIT:
+					done = true;
+					break;
+				default:
+					break;
+			}
+		}
+		<:(video ? "else
+		{
+			Paint(screen);
+			SDL_Flip(screen);
+		}" : ""):>
+	}<:.:><:?video:>
+	SDL_FreeSurface(screen);<:.:>
+	SDL_Quit();
+}
+@@<:PACKAGE:>.upp
+uses
+	Core;
+
+file <:?header:>"<:PACKAGE:>.h",<:.:>
+	"<:PACKAGE:>.cpp";
+
+library(MSC) "SDL SDLmain";
+library(GCC WIN32) "SDL.dll SDLmain";
+
+mainconfig
+	"" = "";
diff --git a/uppsrc/upt/SDLPure.upt b/uppsrc/upt/SDLPure.upt
new file mode 100644
index 000000000..d73564f14
--- /dev/null
+++ b/uppsrc/upt/SDLPure.upt
@@ -0,0 +1,91 @@
+template "SDL project (no U++)" main;
+
+option "Create header" header;
+option "Initialize video" video;
+option "Double buffering" doublebuff;
+option "Full screen" fullscreen;
+option "Event loop" loop;
+
+@@<:PACKAGE:>.h
+??header
+#ifndef _<:PACKAGE:>_<:PACKAGE:>_h
+#define _<:PACKAGE:>_<:PACKAGE:>_h
+
+#include <SDL.h>
+
+#endif
+@@<:PACKAGE:>.cpp
+<:?header:>#include "<:PACKAGE:>.h"<:/:>#include <plugin/SDL/SDL.h><:.:>
+<:?video:>
+SDL_Surface * OpenScreen(const int width, const int height, const int bpp, const int flags)
+{
+	SDL_Surface * screen = SDL_SetVideoMode(width, height, bpp, flags);
+	if(!screen) 
+	{
+		printf("Couldn't set display mode: %s\n", SDL_GetError());
+		return NULL;
+	}
+	return screen;
+}
+<:.:><:(loop && video ? "
+void Paint(SDL_Surface * surface)
+{
+	/* Put your painting code here */
+}
+" : ""):>
+int main(int argc, char **argv)
+{
+	if(SDL_Init(SDL_INIT_VIDEO) < 0)
+		return 1;
+<:?video:>
+	int videoflags = SDL_HWSURFACE | SDL_HWACCEL<:(fullscreen || doublebuff ? fullscreen ? doublebuff ? " | SDL_FULLSCREEN | SDL_DOUBLEBUF" : " | SDL_FULLSCREEN" : doublebuff ? " | SDL_DOUBLEBUF" : "" : ""):>;
+	SDL_Surface * screen = OpenScreen(1024, 768, 32, videoflags);
+	if(!screen) 
+		return 1;
+<:.:><:?loop:>
+	SDL_Event event;
+	bool done = false;
+	
+	while(!done)
+	{       
+		if(SDL_PollEvent(&event))
+		{
+			switch (event.type) 
+			{                    
+				case SDL_KEYDOWN:
+					if(event.key.keysym.sym == SDLK_LALT || event.key.keysym.sym == SDLK_TAB)
+						break;
+					<:(video ? "if(event.key.keysym.sym == SDLK_RETURN)
+					{
+						videoflags ^= SDL_FULLSCREEN;
+						screen = OpenScreen(screen->w, screen->h, screen->format->BitsPerPixel, videoflags);
+						if(!screen) 
+							done = true;
+						break;
+					}" : ""):>
+				case SDL_QUIT:
+					done = true;
+					break;
+				default:
+					break;
+			}
+		}
+		<:(video ? "else
+		{
+			Paint(screen);
+			SDL_Flip(screen);
+		}" : ""):>
+	}<:.:><:?video:>
+	SDL_FreeSurface(screen);<:.:>
+	SDL_Quit();
+	return 0;
+}
+@@<:PACKAGE:>.upp
+file <:?header:>"<:PACKAGE:>.h",<:.:>
+	"<:PACKAGE:>.cpp";
+
+library(MSC) "SDL SDLmain";
+library(GCC WIN32) "SDL.dll SDLmain";
+
+mainconfig
+	"" = "";
diff --git a/uppsrc/upt/Win32.upt b/uppsrc/upt/Win32.upt
new file mode 100644
index 000000000..d99ae5d94
--- /dev/null
+++ b/uppsrc/upt/Win32.upt
@@ -0,0 +1,190 @@
+template "Win32 API project (no U++)" main;
+
+option "Main menu" menu;
+option "Program icon" icon;
+option "Hello World" hello;
+
+@@resource.h
+<:?icon:>#define IDI_BIG         100
+#define IDI_SMALL       101
+<:.:>
+<:?menu:>#define IDD_ABOUT       102
+#define IDM_ABOUT       103
+#define IDM_EXIT        104
+#define IDC_WIN32APP    105
+#define IDC_MYICON      -2
+#define IDC_STATIC      -1<:.:>
+@@<:PACKAGE:>.rc
+#include "resource.h"
+#include <windows.h>
+
+<:?icon:>
+// Put your program icon into the package directory
+IDI_SMALL ICON DISCARDABLE "icon.ico"
+IDI_BIG   ICON DISCARDABLE "icon.ico"
+<:.:>
+<:?menu:>
+IDC_WIN32APP MENU DISCARDABLE
+BEGIN
+    POPUP "&File"
+    BEGIN
+        MENUITEM "E&xit", IDM_EXIT
+    END
+    POPUP "&Help"
+    BEGIN
+        MENUITEM "&About...", IDM_ABOUT
+    END
+END
+IDC_WIN32APP ACCELERATORS MOVEABLE PURE
+BEGIN
+    "?", IDM_ABOUT, ASCII, ALT
+    "/", IDM_ABOUT, ASCII, ALT
+END
+IDD_ABOUT DIALOG DISCARDABLE 0, 0, 150, 55
+STYLE DS_MODALFRAME | DS_CENTER | WS_CAPTION | WS_SYSMENU
+CAPTION "About"
+FONT 8, "Microsoft Sans Serif"
+BEGIN
+    ICON            IDI_BIG,IDC_MYICON,20,9,16,16
+    LTEXT           "Ultimate application v.1.0",IDC_STATIC,49,10,119,8,SS_NOPREFIX
+    LTEXT           "upp.sourceforge.net",IDC_STATIC,49,20,119,8
+    DEFPUSHBUTTON   "OK",IDOK,55,35,40,15,WS_GROUP
+END<:.:>
+@@<:PACKAGE:>.cpp
+#include <windows.h>
+#include "resource.h"
+<:?menu:>
+HINSTANCE hInst;
+
+LRESULT CALLBACK About(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
+{
+    switch(message)
+    {
+        case WM_INITDIALOG:
+            return TRUE;
+
+        case WM_COMMAND:
+            if(LOWORD(wParam) == IDOK || LOWORD(wParam) == IDCANCEL) 
+            {
+                EndDialog(hDlg, LOWORD(wParam));
+                return TRUE;
+            }
+            break;
+    }
+    return FALSE;
+}
+<:.:>
+LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
+{<:?menu:>
+    int wmId, wmEvent;<:.:>
+    PAINTSTRUCT ps;
+    HDC hdc;
+    <:?hello:>
+    const TCHAR szHello[] = "Hello World!";<:.:>
+
+    switch (message) 
+    {<:?menu:>
+        case WM_COMMAND:
+        
+            wmId    = LOWORD(wParam); 
+            wmEvent = HIWORD(wParam); 
+
+            switch(wmId)
+            {
+                case IDM_ABOUT:
+                   DialogBox(hInst, (LPCTSTR) IDD_ABOUT, hWnd, (DLGPROC) About);
+                   break;
+                
+                case IDM_EXIT:
+                   DestroyWindow(hWnd);
+                   break;
+                   
+                default:
+                   return DefWindowProc(hWnd, message, wParam, lParam);
+            }
+            break;
+        <:.:>
+        case WM_PAINT:
+            hdc = BeginPaint(hWnd, &ps);
+            
+            /* Put your drawing code here */
+            <:?hello:>
+            RECT rt;
+            GetClientRect(hWnd, &rt);
+            DrawText(hdc, szHello, strlen(szHello), &rt, DT_CENTER | DT_VCENTER | DT_SINGLELINE);<:.:>
+            EndPaint(hWnd, &ps);
+            break;
+            
+        case WM_DESTROY:
+            PostQuitMessage(0);
+            break;
+            
+        default:
+            return DefWindowProc(hWnd, message, wParam, lParam);
+   }
+   return 0;
+}
+
+int APIENTRY WinMain(HINSTANCE hInstance,
+                     HINSTANCE hPrevInstance,
+                     LPSTR     lpCmdLine,
+                     int       nCmdShow)
+{
+    
+    WNDCLASSEX wcex;
+
+    wcex.cbSize = sizeof(WNDCLASSEX); 
+
+    wcex.style          = CS_HREDRAW | CS_VREDRAW;
+    wcex.lpfnWndProc    = (WNDPROC) WndProc;
+    wcex.cbClsExtra     = 0;
+    wcex.cbWndExtra     = 0;
+    wcex.hInstance      = hInstance;<:?icon:>
+    // Put your program icon into the package directory
+    wcex.hIconSm        = LoadIcon(hInstance, (LPCTSTR) IDI_SMALL);
+    wcex.hIcon          = LoadIcon(hInstance, (LPCTSTR) IDI_BIG);<:.:>
+    wcex.hCursor        = LoadCursor(NULL, IDC_ARROW);
+    wcex.hbrBackground  = (HBRUSH) (COLOR_WINDOW + 1);
+    wcex.lpszMenuName   = <:menu ? "(LPCSTR) IDC_WIN32APP;" : "0;":>
+    wcex.lpszClassName  = "UPPW32APP";
+
+    if(RegisterClassEx(&wcex) == 0)
+        return FALSE;
+    <:?menu:>   
+    hInst = hInstance;
+    <:.:>
+    HWND hWnd = CreateWindow(wcex.lpszClassName, "Ultimate application", WS_OVERLAPPEDWINDOW, 
+                             CW_USEDEFAULT, 0, CW_USEDEFAULT, 0, 
+                             NULL, NULL, hInstance, NULL);
+    if(!hWnd)
+        return FALSE;
+    
+    ShowWindow(hWnd, nCmdShow);
+    UpdateWindow(hWnd);
+    <:?menu:>
+    HACCEL hAccelTable = LoadAccelerators(hInstance, (LPCTSTR) IDC_WIN32APP);
+    <:.:>
+    MSG msg;
+    while(GetMessage(&msg, NULL, 0, 0))
+    {<:?menu:>
+        if(!TranslateAccelerator(msg.hwnd, hAccelTable, &msg)) 
+        {
+            TranslateMessage(&msg);
+            DispatchMessage(&msg);
+        }
+        <:/:>
+        TranslateMessage(&msg);
+        DispatchMessage(&msg);<:.:>
+    }
+
+    return msg.wParam;
+}
+@@<:PACKAGE:>.upp
+library(WIN32) "kernel32 user32 advapi32 shell32 winmm";
+
+file resource.h, 
+     <:PACKAGE:>.rc,
+     <:PACKAGE:>.cpp;
+
+mainconfig
+    "" = "GUI";
diff --git a/uppsrc/upt/Win32dll.upt b/uppsrc/upt/Win32dll.upt
new file mode 100644
index 000000000..ce1e507ca
--- /dev/null
+++ b/uppsrc/upt/Win32dll.upt
@@ -0,0 +1,49 @@
+template "Win32 DLL project (no U++)" main;
+
+option "Multithreaded" mt;
+
+@@<:PACKAGE:>.h
+#ifndef _<:PACKAGE:>_<:PACKAGE:>_h
+#define _<:PACKAGE:>_<:PACKAGE:>_h
+
+#define DllImport extern "C" __declspec(dllimport)
+#define DllExport extern "C" __declspec(dllexport)
+
+#ifdef flagDLL
+	#define DLLIMPORT __declspec(dllexport)
+#else
+	#define DLLIMPORT __declspec(dllimport)
+#endif
+
+#endif
+
+@@<:PACKAGE:>.cpp
+#include <windows.h>
+#include "<:PACKAGE:>.h"
+
+BOOL APIENTRY DllMain(HANDLE hModule, DWORD reason,  LPVOID lpReserved)
+{
+	switch (reason) {
+	case DLL_PROCESS_ATTACH:
+		break;
+	case DLL_PROCESS_DETACH:
+		break;
+	case DLL_THREAD_ATTACH:
+		break;
+	case DLL_THREAD_DETACH:
+		break;
+	}
+	return TRUE;
+}
+
+@@<:PACKAGE:>.upp
+library(WIN32) "kernel32 user32 advapi32 shell32 winmm";
+
+target "<:PACKAGE:>.dll";
+
+file
+	<:PACKAGE:>.h,
+	<:PACKAGE:>.cpp;
+
+mainconfig
+	"" = "DLL <:?mt:>MT<:.:>";
diff --git a/uppsrc/x86disas/AUTHORS b/uppsrc/x86disas/AUTHORS
new file mode 100644
index 000000000..f782e5b62
--- /dev/null
+++ b/uppsrc/x86disas/AUTHORS
@@ -0,0 +1,2 @@
+Mirek Fidler <cxl@ntllib.org>
+Tomas Rylek  <rylek@volny.cz>
\ No newline at end of file
diff --git a/uppsrc/x86disas/COPYING b/uppsrc/x86disas/COPYING
new file mode 100644
index 000000000..33aa39102
--- /dev/null
+++ b/uppsrc/x86disas/COPYING
@@ -0,0 +1,30 @@
+Copyright (C) 2005 Mirek Fidler, Tomas Rylek and various contributors (see AUTHORS)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to
+deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies of the Software and its Copyright notices. In addition publicly
+documented acknowledgment must be given that this software has been used if no
+source code of this software is made available publicly. This includes
+acknowledgments in either Copyright notices, Manuals, Publicity and Marketing
+documents or any documentation provided with any product containing this
+software. This License does not apply to any software that links to the
+libraries provided by this software (statically or dynamically), but only to
+the software provided.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+-----------
+
+Please see the COPYING.PLAIN for a plain-english explanation of this notice
+and it's intent.
diff --git a/uppsrc/x86disas/COPYING-PLAIN b/uppsrc/x86disas/COPYING-PLAIN
new file mode 100644
index 000000000..770a8132f
--- /dev/null
+++ b/uppsrc/x86disas/COPYING-PLAIN
@@ -0,0 +1,33 @@
+Plain English Copyright Notice
+
+This file is not intended to be the actual License. The reason this file
+exists is that we here are programmers and engineers. We aren't lawyers. We
+provide licenses that we THINK say the right things, but we have our own
+intentions at heart. This is a plain-english explanation of what those
+intentions are, and if you follow them you will be within the "spirit" of
+the license.
+
+The intent is for us to enjoy writing software that is useful to us (the
+AUTHORS) and allow others to use it freely and also benefit from the work we
+put into making it. We don't want to restrict others using it. They should
+not *HAVE* to make the source code of the applications they write that
+simply link to these libraries (be that statically or dynamically), or for
+them to be limited as to what license they choose to use (be it open, closed
+or anything else). But we would like to know you are using these libraries.
+We simply would like to know that it has been useful to someone. This is why
+we ask for acknowledgement of some sort.
+
+You can do what you want with the source of this software - it doesn't
+matter. We still have it here for ourselves and it is open and free to use
+and download and play with. It can't be taken away. We don't really mind what
+you do with the source to your software. We would simply like to know that
+you are using it - especially if it makes it to a commerical product. If you
+simply e-mail all the AUTHORS (see COPYING and AUTHORS files) telling us, and
+then make sure you include a paragraph or page in the manual or in the "About.."
+box for the product with the copyright notice and state that you used this
+software, we will be very happy. If you want to contribute back modifications
+and fixes you may have made we will welcome those too with open arms (generally).
+If you want help with changes needed, ports needed or features to be added,
+arrangements can be easily made with some dialogue.
+
+Mirek Fidler <cxl@ntllib.org>
diff --git a/uppsrc/x86disas/main.cpp b/uppsrc/x86disas/main.cpp
new file mode 100644
index 000000000..ad637e44b
--- /dev/null
+++ b/uppsrc/x86disas/main.cpp
@@ -0,0 +1,16 @@
+#include "x86disas.h"
+#include <plugin/ndisasm/ndisasm.h>
+
+CONSOLE_APP_MAIN
+{
+	byte *q = (byte *)main;
+	dword ip = (dword) q;
+
+	for(int i = 0; i < 50000; i++) {
+		char h[256];
+		int size = NDisassemble(h, q, ip);
+		LOG(FormatIntHex(ip) << "  " << h);
+		ip += size;
+		q += size;
+	}
+}
\ No newline at end of file
diff --git a/uppsrc/x86disas/mnemonics.i b/uppsrc/x86disas/mnemonics.i
new file mode 100644
index 000000000..ed877cf66
--- /dev/null
+++ b/uppsrc/x86disas/mnemonics.i
@@ -0,0 +1,547 @@
+DO(aaa)
+DO(aad)
+DO(aam)
+DO(aas)
+DO(adc)
+DO(add)
+DO(addpd)
+DO(addps)
+DO(addsd)
+DO(addss)
+DO(and)
+DO(andnpd)
+DO(andnps)
+DO(andpd)
+DO(andps)
+DO(arpl)
+DO(bound)
+DO(bsf)
+DO(bsr)
+DO(bswap)
+DO(bt)
+DO(btc)
+DO(btr)
+DO(bts)
+DO(call)
+DO(cbw)
+DO(cdq)
+DO(cdqe)
+DO(clc)
+DO(cld)
+DO(clflush)
+DO(cli)
+DO(clts)
+DO(cmc)
+DO(cmovo)
+DO(cmovno)
+DO(cmovb)
+DO(cmovnb)
+DO(cmovz)
+DO(cmovnz)
+DO(cmovbe)
+DO(cmovnbe)
+DO(cmovs)
+DO(cmovns)
+DO(cmovp)
+DO(cmovnp)
+DO(cmovl)
+DO(cmovnl)
+DO(cmovle)
+DO(cmovnle)
+DO(cmp)
+DO(cmppd)
+DO(cmpps)
+DO(cmps)
+DO(cmpsb)
+DO(cmpsd)
+DO(cmpsq)
+DO(cmpss)
+DO(cmpsw)
+DO(cmpxchg)
+DO(cmpxchg8b)
+DO(comisd)
+DO(comiss)
+DO(cpuid)
+DO(cqd)
+DO(cqo)
+DO(cvtdq2pd)
+DO(cvtdq2ps)
+DO(cvtpd2dq)
+DO(cvtpd2pi)
+DO(cvtpd2ps)
+DO(cvtpi2pd)
+DO(cvtpi2ps)
+DO(cvtps2dq)
+DO(cvtps2pd)
+DO(cvtps2pi)
+DO(cvtsd2si)
+DO(cvtsd2ss)
+DO(cvtsi2sd)
+DO(cvtsi2ss)
+DO(cvtss2sd)
+DO(cvtss2si)
+DO(cvttpd2dq)
+DO(cvttpd2pi)
+DO(cvttps2dq)
+DO(cvttps2pi)
+DO(cvttsd2si)
+DO(cvttsi2sd)
+DO(cvttsi2ss)
+DO(cvttss2si)
+DO(cwd)
+DO(cwde)
+DO(daa)
+DO(das)
+DO(dec)
+DO(div)
+DO(divpd)
+DO(divps)
+DO(divsd)
+DO(divss)
+DO(emms)
+DO(enter)
+DO(esc)
+DO(f2xm1)
+DO(fsxm1)
+DO(fabs)
+DO(fadd)
+DO(faddp)
+DO(fbld)
+DO(fbstp)
+DO(fchs)
+DO(fclex)
+DO(fcmovb)
+DO(fcmovbe)
+DO(fcmove)
+DO(fcmovnb)
+DO(fcmovnbe)
+DO(fcmovne)
+DO(fcmovnu)
+DO(fcmovu)
+DO(fcom)
+DO(fcomi)
+DO(fcomp)
+DO(fcomip)
+DO(fcompp)
+DO(fcos)
+DO(fdecstp)
+DO(fdiv)
+DO(fdivp)
+DO(fdivr)
+DO(fdivrp)
+DO(femms)
+DO(ffree)
+DO(fiadd)
+DO(ficom)
+DO(ficomp)
+DO(fidiv)
+DO(fidivr)
+DO(fidw)
+DO(fidwr)
+DO(fild)
+DO(fimul)
+DO(fincstp)
+DO(finit)
+DO(fist)
+DO(fistp)
+DO(fisub)
+DO(fisubr)
+DO(fld)
+DO(fld1)
+DO(fldcw)
+DO(fldenv)
+DO(fldl2e)
+DO(fldl2t)
+DO(fldlg2)
+DO(fldln2)
+DO(fldlpi)
+DO(fldx)
+DO(fldz)
+DO(fmul)
+DO(fmulp)
+DO(fnclex)
+DO(fncstp)
+DO(fninit)
+DO(fnop)
+DO(fnsave)
+DO(fnstcw)
+DO(fnstenv)
+DO(fnstsw)
+DO(fpatan)
+DO(fprem)
+DO(fprem1)
+DO(fptan)
+DO(fpxtract)
+DO(frndint)
+DO(frstor)
+DO(fsave)
+DO(fscale)
+DO(fsin)
+DO(fsincos)
+DO(fsqrt)
+DO(fst)
+DO(fstcw)
+DO(fstenv)
+DO(fstp)
+DO(fstsw)
+DO(fsub)
+DO(fsubp)
+DO(fsubr)
+DO(fsubrp)
+DO(ftst)
+DO(fucom)
+DO(fucomi)
+DO(fucomip)
+DO(fucomp)
+DO(fucompp)
+DO(fwait)
+DO(fxam)
+DO(fxch)
+DO(fxrstor)
+DO(fxsave)
+DO(fxtract)
+DO(fyl2x)
+DO(fyl2xp1)
+DO(hlt)
+DO(idiv)
+DO(imul)
+DO(in)
+DO(inc)
+DO(ins)
+DO(insb)
+DO(insd)
+DO(insw)
+DO(int)
+DO(into)
+DO(invd)
+DO(invlpg)
+DO(iret)
+DO(iretd)
+DO(iretq)
+DO(jcxz)
+DO(jecxz)
+DO(jmp)
+DO(jrcxz)
+DO(jo)
+DO(jno)
+DO(jb)
+DO(jnb)
+DO(jz)
+DO(jnz)
+DO(jbe)
+DO(jnbe)
+DO(js)
+DO(jns)
+DO(jp)
+DO(jnp)
+DO(jl)
+DO(jnl)
+DO(jle)
+DO(jnle)
+DO(lahf)
+DO(lar)
+DO(ldmxcsr)
+DO(lds)
+DO(lea)
+DO(leave)
+DO(les)
+DO(lfence)
+DO(lfs)
+DO(lgdt)
+DO(lgs)
+DO(lidt)
+DO(lldt)
+DO(lmsw)
+DO(lock)
+DO(lods)
+DO(lodsb)
+DO(lodsd)
+DO(lodsq)
+DO(lodsw)
+DO(loop)
+DO(loope)
+DO(loopn)
+DO(loopne)
+DO(loopnz)
+DO(loopz)
+DO(lsl)
+DO(lss)
+DO(ltr)
+DO(maskmovdqu)
+DO(maskmovq)
+DO(maxpd)
+DO(maxps)
+DO(maxsd)
+DO(maxss)
+DO(mfence)
+DO(minpd)
+DO(minps)
+DO(minsd)
+DO(minss)
+DO(mov)
+DO(movapd)
+DO(movaps)
+DO(movd)
+DO(movdq2q)
+DO(movdqa)
+DO(movdqu)
+DO(movhlps)
+DO(movhpd)
+DO(movhps)
+DO(movlhps)
+DO(movlpd)
+DO(movlps)
+DO(movmskpd)
+DO(movmskps)
+DO(movnig)
+DO(movntdq)
+DO(movnti)
+DO(movntpd)
+DO(movntps)
+DO(movntq)
+DO(movq)
+DO(movq2dq)
+DO(movqa)
+DO(movs)
+DO(movsb)
+DO(movsd)
+DO(movsq)
+DO(movss)
+DO(movsw)
+DO(movsx)
+DO(movsxd)
+DO(movupd)
+DO(movups)
+DO(movzx)
+DO(mul)
+DO(mulpd)
+DO(mulps)
+DO(mulsd)
+DO(mulss)
+DO(neg)
+DO(nop)
+DO(not)
+DO(or)
+DO(orpd)
+DO(orps)
+DO(out)
+DO(outs)
+DO(outsb)
+DO(outsd)
+DO(outsw)
+DO(packssdw)
+DO(packsswb)
+DO(packusdw)
+DO(packuswb)
+DO(paddb)
+DO(paddd)
+DO(paddq)
+DO(paddsb)
+DO(paddsw)
+DO(paddusb)
+DO(paddusw)
+DO(paddw)
+DO(pand)
+DO(pandn)
+DO(pavgb)
+DO(pavgusb)
+DO(pavgw)
+DO(pcmpeqb)
+DO(pcmpeqd)
+DO(pcmpeqw)
+DO(pcmpgtb)
+DO(pcmpgtd)
+DO(pcmpgtw)
+DO(pextrw)
+DO(pf2id)
+DO(pf2iw)
+DO(pfacc)
+DO(pfadd)
+DO(pfcmpeq)
+DO(pfcmpge)
+DO(pfcmpgt)
+DO(pfmax)
+DO(pfmin)
+DO(pfmul)
+DO(pfnacc)
+DO(pfpnacc)
+DO(pfrcp)
+DO(pfrcpit1)
+DO(pfrcpit2)
+DO(pfrsqit1)
+DO(pfrsqrt)
+DO(pfsub)
+DO(pfsubr)
+DO(pi2fd)
+DO(pi2fw)
+DO(pinsrw)
+DO(pmaddwd)
+DO(pmaxsw)
+DO(pmaxub)
+DO(pminsw)
+DO(pminub)
+DO(pmovmskb)
+DO(pmulhrw)
+DO(pmulhuw)
+DO(pmulhw)
+DO(pmullw)
+DO(pmuludq)
+DO(pop)
+DO(popa)
+DO(popad)
+DO(popf)
+DO(popfd)
+DO(popfq)
+DO(por)
+DO(prefetch)
+DO(psadbw)
+DO(pshufd)
+DO(pshufhw)
+DO(pshuflw)
+DO(pshufw)
+DO(pslld)
+DO(pslldq)
+DO(psllq)
+DO(psllw)
+DO(psrad)
+DO(psraw)
+DO(psraq)
+DO(psrld)
+DO(psrldq)
+DO(psrlq)
+DO(psrlw)
+DO(psubb)
+DO(psubd)
+DO(psubq)
+DO(psubsb)
+DO(psubsw)
+DO(psubusb)
+DO(psubusw)
+DO(psubw)
+DO(pswapd)
+DO(punpckhbw)
+DO(punpckhdq)
+DO(punpckhqdq)
+DO(punpckhwd)
+DO(punpcklbw)
+DO(punpckldq)
+DO(punpcklqdq)
+DO(punpcklwd)
+DO(push)
+DO(pusha)
+DO(pushad)
+DO(pushf)
+DO(pushfd)
+DO(pushfq)
+DO(pxor)
+DO(rcl)
+DO(rcpps)
+DO(rcpss)
+DO(rcr)
+DO(rdivisr)
+DO(rdmsr)
+DO(rdpmc)
+DO(rdtsc)
+DO(rep)
+DO(repne)
+DO(ret)
+DO(retf)
+DO(rol)
+DO(ror)
+DO(rsm)
+DO(rsqrtps)
+DO(rsqrtss)
+DO(sahf)
+DO(sal)
+DO(salc)
+DO(sar)
+DO(sbb)
+DO(scas)
+DO(scasb)
+DO(scasd)
+DO(scasq)
+DO(scasw)
+DO(seto)
+DO(setno)
+DO(setb)
+DO(setnb)
+DO(setz)
+DO(setnz)
+DO(setbe)
+DO(setnbe)
+DO(sets)
+DO(setns)
+DO(setp)
+DO(setnp)
+DO(setl)
+DO(setnl)
+DO(setle)
+DO(setnle)
+DO(sfence)
+DO(sgdt)
+DO(shl)
+DO(shld)
+DO(shr)
+DO(shrd)
+DO(shufpd)
+DO(shufps)
+DO(sidt)
+DO(sldt)
+DO(smsw)
+DO(sqrtpd)
+DO(sqrtps)
+DO(sqrtsd)
+DO(sqrtss)
+DO(stc)
+DO(std)
+DO(sti)
+DO(stmxcsr)
+DO(stos)
+DO(stosb)
+DO(stosw)
+DO(stosd)
+DO(str)
+DO(sub)
+DO(subpd)
+DO(subps)
+DO(subsd)
+DO(subss)
+DO(swapgs)
+DO(syscall)
+DO(sysenter)
+DO(sysexit)
+DO(sysret)
+DO(test)
+DO(ucomisd)
+DO(ucomiss)
+DO(ud2)
+DO(unpckhpd)
+DO(unpckhps)
+DO(unpcklpd)
+DO(unpcklps)
+DO(verr)
+DO(verw)
+DO(wait)
+DO(wbinvd)
+DO(wrmsr)
+DO(xadd)
+DO(xchg)
+DO(xlat)
+DO(xlatb)
+DO(xor)
+DO(xorpd)
+DO(xorps)
+DO(invalid)
+DO(grp)
+DO(a32)
+DO(o32)
+DO(es)
+DO(fs)
+DO(gs)
+DO(cs)
+DO(ds)
+DO(ss)
+DO(x87)
+DO(3dnow)
+DO(db)
+DO(none)
diff --git a/uppsrc/x86disas/opcmap.cpp b/uppsrc/x86disas/opcmap.cpp
new file mode 100644
index 000000000..339fa13df
--- /dev/null
+++ b/uppsrc/x86disas/opcmap.cpp
@@ -0,0 +1,2676 @@
+/*
+ *  opcmap.c - Opcode Maps for x86,x87,sse,mmx,3dnow
+ *
+ *  Copyright (c) 2002,2003 Vivek Mohan <vivek@sig9.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 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 General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
+
+#include "x86disas.h"
+
+/* operand types */
+#define Ap	{	OP_A,	SZ_p	}
+#define M	{	OP_M,	0	}
+#define Md	{	OP_M,	SZ_d	}
+#define Mb	{	OP_M,	SZ_b	}
+#define Mw	{	OP_M,	SZ_w	}
+#define Ms	{	OP_M,	SZ_w	}
+#define Mq	{	OP_M,	SZ_q	}
+#define E	{	OP_E,	0	}
+#define Eb	{	OP_E,	SZ_b	}
+#define Ew	{	OP_E,	SZ_w	}
+#define Ev	{	OP_E,	SZ_v	}
+#define Evw	{	OP_E,	SZ_vw	}
+#define Ed	{	OP_E,	SZ_d	}
+#define Ex	{	OP_E,	SZ_x	}
+#define Ep	{	OP_E,	SZ_p	}
+#define Ez	{	OP_E,	SZ_z	}
+#define G	{	OP_G,	0	}
+#define Gx	{	OP_G,	SZ_x	}
+#define Gb	{	OP_G,	SZ_b	}
+#define Gw	{	OP_I,	SZ_w	}
+#define Gv	{	OP_G,	SZ_v	}
+#define Gd	{	OP_G,	SZ_d	}
+#define Gvw	{	OP_G,	SZ_vw	}
+#define	I1	{	OP_I1,	0	}
+#define	I3	{	OP_I3,	0	}
+#define Ib	{	OP_I,	SZ_b	}
+#define Isb	{	OP_I,	SZ_sb	}
+#define Iw	{	OP_I,	SZ_w	}
+#define Iv	{	OP_I,	SZ_v	}
+#define Iz	{	OP_I,	SZ_z	}
+#define Jv	{	OP_J,	SZ_v	}
+#define Jz	{	OP_J,	SZ_z	}
+#define Jb	{	OP_J,	SZ_b	}
+#define Jsb	{	OP_J,	SZ_sb	}
+#define Jw	{	OP_J,	SZ_w	}
+#define R	{	OP_R,	SZ_m	}
+#define C	{	OP_C,	0	}
+#define D	{	OP_D,	0	}
+#define S	{	OP_S,	0	}
+#define Ob	{	OP_O,	SZ_b	}
+#define Ow	{	OP_O,	SZ_w	}
+#define Ov	{	OP_O,	SZ_v	}
+#define V	{	OP_V,	0	}
+#define W	{	OP_W,	0	}
+#define P	{	OP_P,	0	}
+#define Q	{	OP_Q,	0	}
+#define VR	{	OP_VR,	0	}
+#define PR	{	OP_PR,	0	}
+#define AL	{	OP_AL,	0	}
+#define CL	{	OP_CL,	0	}
+#define DL	{	OP_DL,	0	}
+#define BL	{	OP_BL,	0	}
+#define AH	{	OP_AH,	0	}
+#define CH	{	OP_CH,	0	}
+#define DH	{	OP_DH,	0	}
+#define BH	{	OP_BH,	0	}
+#define AX	{	OP_AX,	0	}
+#define CX	{	OP_CX,	0	}
+#define DX	{	OP_DX,	0	}
+#define BX	{	OP_BX,	0	}
+#define SI	{	OP_SI,	0	}
+#define DI	{	OP_DI,	0	}
+#define SP	{	OP_SP,	0	}
+#define BP	{	OP_BP,	0	}
+#define eAX	{	OP_eAX,	0	}
+#define eCX	{	OP_eCX,	0	}
+#define eDX	{	OP_eDX,	0	}
+#define eBX	{	OP_eBX,	0	}
+#define eSI	{	OP_eSI,	0	}
+#define eDI	{	OP_eDI,	0	}
+#define eSP	{	OP_eSP,	0	}
+#define eBP	{	OP_eBP,	0	}
+#define rAX	{	OP_rAX,	0	}
+#define rCX	{	OP_rCX,	0	}
+#define rBX	{	OP_rDX,	0	}
+#define rDX	{	OP_rDX,	0	}
+#define rSI	{	OP_rSI,	0	}
+#define rDI	{	OP_rDI,	0	}
+#define rSP	{	OP_rSP,	0	}
+#define rBP	{	OP_rBP,	0	}
+#define ES	{	OP_ES,	0	}
+#define CS	{	OP_CS,	0	}
+#define DS	{	OP_DS,	0	}
+#define SS	{	OP_SS,	0	}
+#define GS	{	OP_GS,	0	}
+#define FS	{	OP_FS,	0	}
+#define ST0	{	OP_ST0,	0	}
+#define ST1	{	OP_ST1,	0	}
+#define ST2	{	OP_ST2,	0	}
+#define ST3	{	OP_ST3,	0	}
+#define ST4	{	OP_ST4,	0	}
+#define ST5	{	OP_ST5,	0	}
+#define ST6	{	OP_ST6,	0	}
+#define ST7	{	OP_ST7,	0	}
+#define NOARG	{	0,	0	}
+#define ALr8b	{	OP_ALr8b,0	}
+#define CLr9b	{	OP_CLr9b,0	}
+#define DLr10b	{	OP_DLr10b,0	}
+#define BLr11b	{	OP_BLr11b,0	}
+#define AHr12b	{	OP_AHr12b,0	}
+#define CHr13b	{	OP_CHr13b,0	}
+#define DHr14b	{	OP_DHr14b,0	}
+#define BHr15b	{	OP_BHr15b,0	}
+#define rAXr8	{	OP_rAXr8,0	}
+#define rCXr9	{	OP_rCXr9,0	}
+#define rDXr10	{	OP_rDXr10,0	}
+#define rBXr11	{	OP_rBXr11,0	}
+#define rSPr12	{	OP_rSPr12,0	}
+#define rBPr13	{	OP_rBPr13,0	}
+#define rSIr14	{	OP_rSIr14,0	}
+#define rDIr15	{	OP_rDIr15,0	}
+
+
+/* Instruction Prefixes */
+#define Pnone	0x00
+#define Pa32	0x01
+#define Po32	0x02
+#define Prex	0x04
+#define Pdef64	0x08
+#define Pinv64	0x10
+#define Psuff	0x20
+
+/* REX (AMD64) */
+#define _W	8
+#define _R	4
+#define _X	2
+#define _B	1
+#define REX(c)	((40 | c) << 16)
+
+/* 1 byte opcode */
+x86_TableEntry insntbl_1byte[0x100] = {
+
+	/* Instruction, op1, op2, op3, Valid Prefixes */
+
+/* 00 */ { Iadd,	Eb,	Gb,	NOARG,	Pa32 | REX(_X|_B) },
+/* 01 */ { Iadd,	Ev,	Gv,	NOARG,	Pa32 | Po32 | REX(_W|_R|_X|_B) },
+/* 02 */ { Iadd,	Gb,	Eb,	NOARG,	Pa32 | REX(_X|_B) },
+/* 03 */ { Iadd,	Gv,	Ev,	NOARG,	Pa32 | Po32 | REX(_W|_R|_X|_B) },
+/* 04 */ { Iadd,	AL,	Ib,	NOARG,	Pnone },
+/* 05 */ { Iadd,	rAX,	Iv,	NOARG,	Prex | Po32 | REX(_W) },
+/* 06 */ { Ipush,	ES,	NOARG,	NOARG,	Pnone },
+/* 07 */ { Ipop,	ES,	NOARG,	NOARG,	Pnone },
+/* 08 */ { Ior,		Eb,	Gb,	NOARG,	Prex | Pa32 | REX(_X|_B) },
+/* 09 */ { Ior,		Ev,	Gv,	NOARG,	Prex | Pa32 | Po32 | REX(_W|_R|_X|_B) },
+/* 0A */ { Ior,		Gb,	Eb,	NOARG,	Prex | Pa32 | REX(_X|_B)},
+/* 0B */ { Ior,		Gv,	Ev,	NOARG,	Prex | Pa32 | Po32 | REX(_W|_R|_X|_B) },
+/* 0C */ { Ior,		AL,	Ib,	NOARG,	Pnone },
+/* 0D */ { Ior,		rAX,	Iv,	NOARG,	Prex | Po32 | REX(_W) },
+/* 0E */ { Ipush,	CS,	NOARG,	NOARG,	Pnone },
+/* 0F */ { Iesc,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 10 */ { Iadc,	Eb,	Gb,	NOARG,	Pa32 | REX(_X|_B)  },
+/* 11 */ { Iadc,	Ev,	Gv,	NOARG,	Pa32 | Po32 | REX(_W|_R|_X|_B) },
+/* 12 */ { Iadc,	Gb,	Eb,	NOARG,	Pa32 | REX(_X|_B)  },
+/* 13 */ { Iadc,	Gv,	Ev,	NOARG,	Pa32 | Po32 | REX(_W|_R|_X|_B) },
+/* 14 */ { Iadc,	AL,	Ib,	NOARG,	Pnone },
+/* 15 */ { Iadc,	rAX,	Iv,	NOARG,	Prex | Po32 | REX(_W) },
+/* 16 */ { Ipush,	SS,	NOARG,	NOARG,	Pnone },
+/* 17 */ { Ipop,	SS,	NOARG,	NOARG,	Pnone },
+/* 18 */ { Isbb,	Eb,	Gb,	NOARG,	Pa32 | REX(_X|_B)  },
+/* 19 */ { Isbb,	Ev,	Gv,	NOARG,	Pa32 | Po32 | REX(_W|_R|_X|_B) },
+/* 1A */ { Isbb,	Gb,	Eb,	NOARG,	Pa32 | REX(_X|_B)  },
+/* 1B */ { Isbb,	Gv,	Ev,	NOARG,	Pa32 | Po32 | REX(_W|_R|_X|_B) },
+/* 1C */ { Isbb,	AL,	Ib,	NOARG,	Pnone },
+/* 1D */ { Isbb,	rAX,	Iv,	NOARG,	Prex | Po32 | REX(_W) },
+/* 1E */ { Ipush,	DS,	NOARG,	NOARG,	Pnone },
+/* 1F */ { Ipop,	DS,	NOARG,	NOARG,	Pnone },
+/* 20 */ { Iand,	Eb,	Gb,	NOARG,	Pa32 | REX(_X|_B)  },
+/* 21 */ { Iand,	Ev,	Gv,	NOARG,	Pa32 | Po32 | REX(_W|_R|_X|_B) },
+/* 22 */ { Iand,	Gb,	Eb,	NOARG,	Pa32 | REX(_X|_B)  },
+/* 23 */ { Iand,	Gv,	Ev,	NOARG,	Pa32 | Po32 | REX(_W|_R|_X|_B) },
+/* 24 */ { Iand,	AL,	Ib,	NOARG,	Pnone },
+/* 25 */ { Iand,	rAX,	Iv,	NOARG,	Prex | Po32 | REX(_W) },
+/* 26 */ { Ies,		ES,	NOARG,	NOARG,	Pnone },
+/* 27 */ { Idaa,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 28 */ { Isub,	Eb,	Gb,	NOARG,	Pa32 | REX(_X|_B)  },
+/* 29 */ { Isub,	Ev,	Gv,	NOARG,	Pa32 | Po32 | REX(_W|_R|_X|_B) },
+/* 2A */ { Isub,	Gb,	Eb,	NOARG,	Pa32 | REX(_X|_B)  },
+/* 2B */ { Isub,	Gv,	Ev,	NOARG,	Pa32 | Po32 | REX(_W|_R|_X|_B) },
+/* 2C */ { Isub,	AL,	Ib,	NOARG,	Pnone },
+/* 2D */ { Isub,	rAX,	Iv,	NOARG,	Prex | Po32 | REX(_W) },
+/* 2E */ { Ics,		CS,	NOARG,	NOARG,	Pnone },
+/* 2F */ { Idas,	NOARG,	NOARG,	NOARG,	Prex | Po32 | REX(_W) },
+/* 30 */ { Ixor,	Eb,	Gb,	NOARG,	Pa32 | REX(_X|_B)  },
+/* 31 */ { Ixor,	Ev,	Gv,	NOARG,	Pa32 | Po32 | REX(_W|_R|_X|_B) },
+/* 32 */ { Ixor,	Gb,	Eb,	NOARG,	Pa32 | REX(_X|_B)  },
+/* 33 */ { Ixor,	Gv,	Ev,	NOARG,	Pa32 | Po32 | REX(_W|_R|_X|_B) },
+/* 34 */ { Ixor,	AL,	Ib,	NOARG,	Pnone },
+/* 35 */ { Ixor,	rAX,	Iv,	NOARG,	Prex | Po32 | REX(_W) },
+/* 36 */ { Iss,		ES,	NOARG,	NOARG,	Pnone },
+/* 37 */ { Iaaa,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 38 */ { Icmp,	Eb,	Gb,	NOARG,	Pa32 | REX(_X|_B)  },
+/* 39 */ { Icmp,	Ev,	Gv,	NOARG,	Pa32 | Po32 | REX(_W|_R|_X|_B) },
+/* 3A */ { Icmp,	Gb,	Eb,	NOARG,	Pa32 | REX(_X|_B)  },
+/* 3B */ { Icmp,	Gv,	Ev,	NOARG,	Pa32 | Po32 | REX(_W|_R|_X|_B) },
+/* 3C */ { Icmp,	AL,	Ib,	NOARG,	Pnone },
+/* 3D */ { Icmp,	rAX,	Iv,	NOARG,	Prex | Po32 | REX(_W) },
+/* 3E */ { Ids,		ES,	NOARG,	NOARG,	Pnone },
+/* 3F */ { Iaas,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 40 */ { Iinc,	eAX,	NOARG,	NOARG,	Po32 },
+/* 41 */ { Iinc,	eCX,	NOARG,	NOARG,	Po32 },
+/* 42 */ { Iinc,	eDX,	NOARG,	NOARG,	Po32 },
+/* 43 */ { Iinc,	eBX,	NOARG,	NOARG,	Po32 },
+/* 44 */ { Iinc,	eSP,	NOARG,	NOARG,	Po32 },
+/* 45 */ { Iinc,	eBP,	NOARG,	NOARG,	Po32 },
+/* 46 */ { Iinc,	eSI,	NOARG,	NOARG,	Po32 },
+/* 47 */ { Iinc,	eDI,	NOARG,	NOARG,	Po32 },
+/* 48 */ { Idec,	eAX,	NOARG,	NOARG,	Po32 },
+/* 49 */ { Idec,	eCX,	NOARG,	NOARG,	Po32 },
+/* 4A */ { Idec,	eDX,	NOARG,	NOARG,	Po32 },
+/* 4B */ { Idec,	eBX,	NOARG,	NOARG,	Po32 },
+/* 4C */ { Idec,	eSP,	NOARG,	NOARG,	Po32 },
+/* 4D */ { Idec,	eBP,	NOARG,	NOARG,	Po32 },
+/* 4E */ { Idec,	eSI,	NOARG,	NOARG,	Po32 },
+/* 4F */ { Idec,	eDI,	NOARG,	NOARG,	Po32 },
+/* 50 */ { Ipush,	rAXr8,	NOARG,	NOARG,	Po32 | Pdef64 | REX(_B) },
+/* 51 */ { Ipush,	rCXr9,	NOARG,	NOARG,	Po32 | Pdef64 | REX(_B) },
+/* 52 */ { Ipush,	rDXr10,	NOARG,	NOARG,	Po32 | Pdef64 | REX(_B) },
+/* 53 */ { Ipush,	rBXr11,	NOARG,	NOARG,	Po32 | Pdef64 | REX(_B) },
+/* 54 */ { Ipush,	rSPr12,	NOARG,	NOARG,	Po32 | Pdef64 | REX(_B) },
+/* 55 */ { Ipush,	rBPr13,	NOARG,	NOARG,	Po32 | Pdef64 | REX(_B) },
+/* 56 */ { Ipush,	rSIr14,	NOARG,	NOARG,	Po32 | Pdef64 | REX(_B) },
+/* 57 */ { Ipush,	rDIr15,	NOARG,	NOARG,	Po32 | Pdef64 | REX(_B) },
+/* 58 */ { Ipop,	rAXr8,	NOARG,	NOARG,	Po32 | Pdef64 | REX(_B) },
+/* 59 */ { Ipop,	rCXr9,	NOARG,	NOARG,	Po32 | Pdef64 | REX(_B) },
+/* 5A */ { Ipop,	rDXr10,	NOARG,	NOARG,	Po32 | Pdef64 | REX(_B) },
+/* 5B */ { Ipop,	rBXr11,	NOARG,	NOARG,	Po32 | Pdef64 | REX(_B) },
+/* 5C */ { Ipop,	rSPr12,	NOARG,	NOARG,	Po32 | Pdef64 | REX(_B) },
+/* 5D */ { Ipop,	rBPr13,	NOARG,	NOARG,	Po32 | Pdef64 | REX(_B) },
+/* 5E */ { Ipop,	rSIr14,	NOARG,	NOARG,	Po32 | Pdef64 | REX(_B) },
+/* 5F */ { Ipop,	rDIr15,	NOARG,	NOARG,	Po32 | Pdef64 | REX(_B) },
+/* 60 */ { Ipusha,	NOARG,	NOARG,	NOARG,	Po32 | Pinv64 | Psuff },
+/* 61 */ { Ipopa,	NOARG,	NOARG,	NOARG,	Po32 | Pinv64 | Psuff },
+/* 62 */ { Ibound,	Gv,	E,	NOARG,	Po32 | Pa32 | Pinv64 },
+/* 63 */ { Iarpl,	Ew,	Gw,	NOARG,	Pa32 | Pinv64 },
+/* 64 */ { Ifs,		ES,	NOARG,	NOARG,	Pnone },
+/* 65 */ { Igs,		GS,	NOARG,	NOARG,	Pnone },
+/* 66 */ { Ia32,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 67 */ { Io32,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 68 */ { Ipush,	Iv,	NOARG,	NOARG,	Po32 },
+/* 69 */ { Iimul,	Gv,	Ev,	Iv,	Po32 | Pa32 | REX(_W|_R|_X|_B) },
+/* 6A */ { Ipush,	Ib,	NOARG,	NOARG,	Pnone },
+/* 6B */ { Iimul,	Gv,	Ev,	Isb,	Po32 | Po32 | REX(_W|_R|_X|_B) },
+/* 6C */ { Iinsb,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 6D */ { Iins,	NOARG,	NOARG,	NOARG,	Po32 | Psuff },
+/* 6E */ { Ioutsb,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 6F */ { Iouts,	NOARG,	NOARG,	NOARG,	Po32 | Psuff },
+/* 70 */ { Ijo,		Jb,	NOARG,	NOARG,	Pnone },
+/* 71 */ { Ijno,	Jb,	NOARG,	NOARG,	Pnone },
+/* 72 */ { Ijb,		Jb,	NOARG,	NOARG,	Pnone },
+/* 73 */ { Ijnb,	Jb,	NOARG,	NOARG,	Pnone },
+/* 74 */ { Ijz,		Jb,	NOARG,	NOARG,	Pnone },
+/* 75 */ { Ijnz,	Jb,	NOARG,	NOARG,	Pnone },
+/* 76 */ { Ijbe,	Jb,	NOARG,	NOARG,	Pnone },
+/* 77 */ { Ijnbe,	Jb,	NOARG,	NOARG,	Pnone },
+/* 78 */ { Ijs,		Jb,	NOARG,	NOARG,	Pnone },
+/* 79 */ { Ijns,	Jb,	NOARG,	NOARG,	Pnone },
+/* 7A */ { Ijp,		Jb,	NOARG,	NOARG,	Pnone },
+/* 7B */ { Ijnp,	Jb,	NOARG,	NOARG,	Pnone },
+/* 7C */ { Ijl,		Jb,	NOARG,	NOARG,	Pnone },
+/* 7D */ { Ijnl,	Jb,	NOARG,	NOARG,	Pnone },
+/* 7E */ { Ijle,	Jb,	NOARG,	NOARG,	Pnone },
+/* 7F */ { Ijnle,	Jb,	NOARG,	NOARG,	Pnone },
+/* 80 */ { Igrp,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 81 */ { Igrp,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 82 */ { Igrp,	NOARG,	NOARG,	NOARG,	Pinv64 },
+/* 83 */ { Igrp,	Ev,	Isb,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 84 */ { Itest,	Eb,	Gb,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 85 */ { Itest,	Ev,	Gv,	NOARG,	Pa32 | REX(_W|_R|_X|_B) },
+/* 86 */ { Ixchg,	Eb,	Gb,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 87 */ { Ixchg,	Ev,	Gv,	NOARG,	Pa32 | REX(_W|_R|_X|_B) },
+/* 88 */ { Imov,	Eb,	Gb,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 89 */ { Imov,	Ev,	Gv,	NOARG,	Pa32 | REX(_W|_R|_X|_B) },
+/* 8A */ { Imov,	Gb,	Eb,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 8B */ { Imov,	Gv,	Ev,	NOARG,	Pa32 | REX(_W|_R|_X|_B) },
+/* 8C */ { Imov,	Ev,	S,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 8D */ { Ilea,	Gv,	E,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 8E */ { Imov,	S,	Ev,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 8F */ { Ipop,	Ev,	NOARG,	NOARG,	Pa32 | REX(_W|_R|_X|_B) },
+/* 90 */ { Ixchg,	rAXr8,	rAX,	NOARG,	Po32 | REX(_W|_B) },
+/* 91 */ { Ixchg,	rCXr9,	rAX,	NOARG,	Po32 | REX(_W|_B) },
+/* 92 */ { Ixchg,	rDXr10,	rAX,	NOARG,	Po32 | REX(_W|_B) },
+/* 93 */ { Ixchg,	rBXr11,	rAX,	NOARG,	Po32 | REX(_W|_B) },
+/* 94 */ { Ixchg,	rSPr12,	rAX,	NOARG,	Po32 | REX(_W|_B) },
+/* 95 */ { Ixchg,	rBPr13,	rAX,	NOARG,	Po32 | REX(_W|_B) },
+/* 96 */ { Ixchg,	rSIr14,	rAX,	NOARG,	Po32 | REX(_W|_B) },
+/* 97 */ { Ixchg,	rDIr15,	rAX,	NOARG,	Po32 | REX(_W|_B) },
+/* 98 */ { Icbw,	NOARG,	NOARG,	NOARG,	Po32 },
+/* 99 */ { Icwd,	NOARG,	NOARG,	NOARG,	Po32 },
+/* 9A */ { Icall,	Ap,	NOARG,	NOARG,	Pa32 | Pinv64 },
+/* 9B */ { Iwait,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 9C */ { Ipushf,	NOARG,	NOARG,	NOARG,	Po32 | Psuff },
+/* 9D */ { Ipopf,	NOARG,	NOARG,	NOARG,	Po32 | Psuff },
+/* 9E */ { Isahf,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 9F */ { Ilahf,	NOARG,	NOARG,	NOARG,	Pnone },
+/* A0 */ { Imov,	AL,	Ob,	NOARG,	Pnone },
+/* A1 */ { Imov,	rAX,	Ov,	NOARG,	Po32 },
+/* A2 */ { Imov,	Ob,	AL,	NOARG,	Pnone },
+/* A3 */ { Imov,	Ov,	rAX, 	NOARG,	Po32 },
+/* A4 */ { Imovsb,	NOARG,	NOARG,	NOARG,	Pnone },
+/* A5 */ { Imovs,	NOARG,	NOARG,	NOARG,	Psuff | REX(_W) },
+/* A6 */ { Icmpsb,	NOARG,	NOARG,	NOARG,	Pnone },
+/* A7 */ { Icmps,	NOARG,	NOARG,	NOARG,	Psuff | REX(_W) },
+/* A8 */ { Itest,	AL,	Ib,	NOARG,	Pnone },
+/* A9 */ { Itest,	rAX,	Iv,	NOARG,	Po32 | REX(_W) },
+/* AA */ { Istosb,	NOARG,	NOARG,	NOARG,	Pnone },
+/* AB */ { Istos,	NOARG,	NOARG,	NOARG,	Psuff | REX(_W) },
+/* AC */ { Ilodsb,	NOARG,	NOARG,	NOARG,	Pnone },
+/* AD */ { Ilods,	NOARG,	NOARG,	NOARG,	Psuff | REX(_W) },
+/* AE */ { Iscasb,	NOARG,	NOARG,	NOARG,	Pnone },
+/* AF */ { Iscas,	NOARG,	NOARG,	NOARG,	Psuff | REX(_W) },
+/* B0 */ { Imov,	ALr8b,	Ib,	NOARG,	REX(_B) },
+/* B1 */ { Imov,	CLr9b,	Ib,	NOARG,	REX(_B) },
+/* B2 */ { Imov,	DLr10b,	Ib,	NOARG,	REX(_B) },
+/* B3 */ { Imov,	BLr11b,	Ib,	NOARG,	REX(_B) },
+/* B4 */ { Imov,	AHr12b,	Ib,	NOARG,	REX(_B) },
+/* B5 */ { Imov,	CHr13b,	Ib,	NOARG,	REX(_B) },
+/* B6 */ { Imov,	DHr14b,	Ib,	NOARG,	REX(_B) },
+/* B7 */ { Imov,	BHr15b,	Ib,	NOARG,	REX(_B) },
+/* B8 */ { Imov,	rAXr8,	Iv,	NOARG,	Po32 | REX(_W|_B) },
+/* B9 */ { Imov,	rCXr9,	Iv,	NOARG,	Po32 | REX(_W|_B) },
+/* BA */ { Imov,	rDXr10,	Iv,	NOARG,	Po32 | REX(_W|_B) },
+/* BB */ { Imov,	rBXr11,	Iv,	NOARG,	Po32 | REX(_W|_B) },
+/* BC */ { Imov,	rSPr12,	Iv,	NOARG,	Po32 | REX(_W|_B) },
+/* BD */ { Imov,	rBPr13,	Iv,	NOARG,	Po32 | REX(_W|_B) },
+/* BE */ { Imov,	rSIr14,	Iv,	NOARG,	Po32 | REX(_W|_B) },
+/* BF */ { Imov,	rDIr15,	Iv,	NOARG,	Po32 | REX(_W|_B) },
+/* C0 */ { Igrp,	NOARG,	NOARG,	NOARG,	Pnone },
+/* C1 */ { Igrp,	NOARG,	NOARG,	NOARG,	Pnone },
+/* C2 */ { Iret,	Iw,	NOARG,	NOARG,	Pnone },
+/* C3 */ { Iret,	NOARG,	NOARG,	NOARG,	Pnone },
+/* C4 */ { Iles,	Gv,	E,	NOARG,	Po32 | Pa32 | Pinv64 },
+/* C5 */ { Ilds,	Gv,	E,	NOARG,	Po32 | Pa32 | Pinv64 },
+/* C6 */ { Igrp,	NOARG,	NOARG,	NOARG,	Pnone },
+/* C7 */ { Igrp,	NOARG,	NOARG,	NOARG,	Pnone },
+/* C8 */ { Ienter,	Iw,	Ib,	NOARG,	Pnone },
+/* C9 */ { Ileave,	NOARG,	NOARG,	NOARG,	Pnone },
+/* CA */ { Iretf,	Iw,	NOARG,	NOARG,	Pnone },
+/* CB */ { Iretf,	NOARG,	NOARG,	NOARG,	Pnone },
+/* CC */ { Iint,	I3,	NOARG,	NOARG,	Pnone },
+/* CD */ { Iint,	Ib,	NOARG,	NOARG,	Pnone },
+/* CE */ { Iinto,	NOARG,	NOARG,	NOARG,	Pinv64 },
+/* CF */ { Iiret,	NOARG,	NOARG,	NOARG,	Psuff | REX(_W) },
+/* D0 */ { Igrp,	NOARG,	NOARG,	NOARG,	Pnone },
+/* D1 */ { Igrp,	NOARG,	NOARG,	NOARG,	Pnone },
+/* D2 */ { Igrp,	NOARG,	NOARG,	NOARG,	Pnone },
+/* D3 */ { Igrp,	NOARG,	NOARG,	NOARG,	Pnone },
+/* D4 */ { Iaam,	Ib,	NOARG,	NOARG,	Pinv64 },
+/* D5 */ { Iaad,	Ib,	NOARG,	NOARG,	Pinv64 },
+/* D6 */ { Isalc,	NOARG,	NOARG,	NOARG,	Pinv64 },
+/* D7 */ { Ixlat,	NOARG,	NOARG,	NOARG,	Pnone },
+/* D8 */ { Ix87,	NOARG,	NOARG,	NOARG,	Pnone },
+/* D9 */ { Ix87,	NOARG,	NOARG,	NOARG,	Pnone },
+/* DA */ { Ix87,	NOARG,	NOARG,	NOARG,	Pnone },
+/* DB */ { Ix87,	NOARG,	NOARG,	NOARG,	Pnone },
+/* DC */ { Ix87,	NOARG,	NOARG,	NOARG,	Pnone },
+/* DD */ { Ix87,	NOARG,	NOARG,	NOARG,	Pnone },
+/* DE */ { Ix87,	NOARG,	NOARG,	NOARG,	Pnone },
+/* DF */ { Ix87,	NOARG,	NOARG,	NOARG,	Pnone },
+/* E0 */ { Iloopn,	Jb,	NOARG,	NOARG,	Pnone },
+/* E1 */ { Iloope,	Jb,	NOARG,	NOARG,	Pnone },
+/* E2 */ { Iloop,	Jb,	NOARG,	NOARG,	Pnone },
+/* E3 */ { Ijcxz,	Jb,	NOARG,	NOARG,	Pnone },
+/* E4 */ { Iin,		AL,	Ib,	NOARG,	Pnone },
+/* E5 */ { Iin,		eAX,	Ib,	NOARG,	Pnone },
+/* E6 */ { Iout,	Ib,	AL,	NOARG,	Pnone },
+/* E7 */ { Iout,	Ib,	eAX,	NOARG,	Pnone },
+/* E8 */ { Icall,	Jv,	NOARG,	NOARG,	Po32  },
+/* E9 */ { Ijmp,	Jv,	NOARG,	NOARG,	Po32  },
+/* EA */ { Ijmp,	Ap,	NOARG,	NOARG,	Pinv64 },
+/* EB */ { Ijmp,	Jb,	NOARG,	NOARG,	Pnone },
+/* EC */ { Iin,		AL,	DX,	NOARG,	Pnone },
+/* ED */ { Iin,		eAX,	DX,	NOARG,	Pnone },
+/* EE */ { Iout,	DX,	AL,	NOARG,	Pnone },
+/* ED */ { Iout,	DX,	eAX,	NOARG,	Pnone },
+/* F0 */ { Ilock,	NOARG,	NOARG,	NOARG,	Pnone },
+/* F1 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* F2 */ { Irepne,	NOARG,	NOARG,	NOARG,	Pnone },
+/* F3 */ { Irep,	NOARG,	NOARG,	NOARG,	Pnone },
+/* F4 */ { Ihlt,	NOARG,	NOARG,	NOARG,	Pnone },
+/* F5 */ { Icmc,	NOARG,	NOARG,	NOARG,	Pnone },
+/* F6 */ { Igrp,	NOARG,	NOARG,	NOARG,	Pnone },
+/* F7 */ { Igrp,	NOARG,	NOARG,	NOARG,	Pnone },
+/* F8 */ { Iclc,	NOARG,	NOARG,	NOARG,	Pnone },
+/* F9 */ { Istc,	NOARG,	NOARG,	NOARG,	Pnone },
+/* FA */ { Icli,	NOARG,	NOARG,	NOARG,	Pnone },
+/* FB */ { Isti,	NOARG,	NOARG,	NOARG,	Pnone },
+/* FC */ { Icld,	NOARG,	NOARG,	NOARG,	Pnone },
+/* FD */ { Istd,	NOARG,	NOARG,	NOARG,	Pnone },
+/* FE */ { Igrp,	NOARG,	NOARG,	NOARG,	Pnone },
+/* FF */ { Igrp,	NOARG,	NOARG,	NOARG,	Pnone }
+
+};
+
+
+/* prefix n/a
+   This is the table for 2byte no-prefix opcodes
+ */
+x86_TableEntry insntbl_2byte[0x100] = {
+
+	/* Instruction, op1, op2, op3, Valid Prefixes */
+
+/* 00 */ { Igrp,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 01 */ { Igrp,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 02 */ { Ilar,	Gv,	Ew,	NOARG,	Po32  },
+/* 03 */ { Ilsl,	Gv,	Ew,	NOARG,	Po32  },
+/* 04 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 05 */ { Isyscall,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 06 */ { Iclts,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 07 */ { Isysret,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 08 */ { Iinvd,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 09 */ { Iwbinvd,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 0A */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 0B */ { Iud2,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 0C */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 0D */ { Igrp,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 0E */ { Ifemms,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 0F */ { I3dnow,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 10 */ { Imovups,	V,	W,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 11 */ { Imovups,	W,	V,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 12 */ { Imovlps,	V,	M,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 13 */ { Imovlps,	M,	V,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 14 */ { Iunpcklps,	V,	W,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 15 */ { Iunpckhps,	V,	W,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 16 */ { Imovhps,	V,	M,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 17 */ { Imovhps,	M,	V,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 18 */ { Igrp,	NOARG,	NOARG,	NOARG,	Pnone  },
+/* 19 */ { Inop,	NOARG,	NOARG,	NOARG,	Pinv64 },
+/* 1A */ { Inop,	NOARG,	NOARG,	NOARG,	Pinv64 },
+/* 1B */ { Inop,	NOARG,	NOARG,	NOARG,	Pinv64 },
+/* 1C */ { Inop,	NOARG,	NOARG,	NOARG,	Pinv64 },
+/* 1D */ { Inop,	NOARG,	NOARG,	NOARG,	Pinv64 },
+/* 1E */ { Inop,	NOARG,	NOARG,	NOARG,	Pinv64 },
+/* 1F */ { Inop,	NOARG,	NOARG,	NOARG,	Pinv64 },
+/* 20 */ { Imov,	R,	C,	NOARG,	Pnone },
+/* 21 */ { Imov,	R,	D,	NOARG,	Pnone },
+/* 22 */ { Imov,	C,	R,	NOARG,	Pnone },
+/* 23 */ { Imov,	D,	R,	NOARG,	Pnone },
+/* 24 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 25 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 26 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 27 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 28 */ { Imovaps,	V,	W,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 29 */ { Imovaps,	W,	V,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 2A */ { Icvtpi2ps,	V,	Q,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 2B */ { Imovntps,	M,	V,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 2C */ { Icvttps2pi,	P,	W,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 2D */ { Icvtps2pi,	P,	W,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 2E */ { Iucomiss,	V,	W,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 2F */ { Icomiss,	V,	W,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 30 */ { Iwrmsr,	NOARG,	NOARG,	NOARG,	},
+/* 31 */ { Irdtsc,	NOARG,	NOARG,	NOARG,	},
+/* 32 */ { Irdmsr,	NOARG,	NOARG,	NOARG,	},
+/* 33 */ { Irdpmc,	NOARG,	NOARG,	NOARG,	},
+/* 34 */ { Isysenter,	NOARG,	NOARG,	NOARG,	Pinv64 },
+/* 35 */ { Isysexit,	NOARG,	NOARG,	NOARG,	Pinv64 },
+/* 36 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 37 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 38 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 39 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 3A */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 3B */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 3C */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 3D */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 3E */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 3F */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 40 */ { Icmovo,	Gv,	Ev,	NOARG,	Po32 | Pa32 | REX(_W|_R|_X|_B) },
+/* 41 */ { Icmovno,	Gv,	Ev,	NOARG,	Po32 | Pa32 | REX(_W|_R|_X|_B) },
+/* 42 */ { Icmovb,	Gv,	Ev,	NOARG,	Po32 | Pa32 | REX(_W|_R|_X|_B) },
+/* 43 */ { Icmovnb,	Gv,	Ev,	NOARG,	Po32 | Pa32 | REX(_W|_R|_X|_B) },
+/* 44 */ { Icmovz,	Gv,	Ev,	NOARG,	Po32 | Pa32 | REX(_W|_R|_X|_B) },
+/* 45 */ { Icmovnz,	Gv,	Ev,	NOARG,	Po32 | Pa32 | REX(_W|_R|_X|_B) },
+/* 46 */ { Icmovbe,	Gv,	Ev,	NOARG,	Po32 | Pa32 | REX(_W|_R|_X|_B) },
+/* 47 */ { Icmovnbe,	Gv,	Ev,	NOARG,	Po32 | Pa32 | REX(_W|_R|_X|_B) },
+/* 48 */ { Icmovs,	Gv,	Ev,	NOARG,	Po32 | Pa32 | REX(_W|_R|_X|_B) },
+/* 49 */ { Icmovns,	Gv,	Ev,	NOARG,	Po32 | Pa32 | REX(_W|_R|_X|_B) },
+/* 4A */ { Icmovp,	Gv,	Ev,	NOARG,	Po32 | Pa32 | REX(_W|_R|_X|_B) },
+/* 4B */ { Icmovnp,	Gv,	Ev,	NOARG,	Po32 | Pa32 | REX(_W|_R|_X|_B) },
+/* 4C */ { Icmovl,	Gv,	Ev,	NOARG,	Po32 | Pa32 | REX(_W|_R|_X|_B) },
+/* 4D */ { Icmovnl,	Gv,	Ev,	NOARG,	Po32 | Pa32 | REX(_W|_R|_X|_B) },
+/* 4E */ { Icmovle,	Gv,	Ev,	NOARG,	Po32 | Pa32 | REX(_W|_R|_X|_B) },
+/* 4F */ { Icmovnle,	Gv,	Ev,	NOARG,	Po32 | Pa32 | REX(_W|_R|_X|_B) },
+/* 50 */ { Imovmskps,	Gv,	VR,	NOARG,	Po32 | REX(_W|_R|_B) },
+/* 51 */ { Isqrtps,	V,	W,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 52 */ { Irsqrtps,	V,	W,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 53 */ { Ircpps,	V,	W,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 54 */ { Iandps,	V,	W,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 55 */ { Iandnps,	V,	W,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 56 */ { Iorps,	V,	W,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 57 */ { Ixorps,	V,	W,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 58 */ { Iaddps,	V,	W,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 59 */ { Imulps,	V,	W,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 5A */ { Icvtps2pd,	V,	W,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 5B */ { Icvtdq2ps,	V,	W,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 5C */ { Isubps,	V,	W,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 5D */ { Iminps,	V,	W,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 5E */ { Idivps,	V,	W,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 5F */ { Imaxps,	V,	W,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 60 */ { Ipunpcklbw,	P,	Q,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 61 */ { Ipunpcklwd,	P,	Q,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 62 */ { Ipunpckldq,	P,	Q,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 63 */ { Ipackusdw,	P,	Q,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 64 */ { Ipcmpgtb,	P,	Q,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 65 */ { Ipcmpgtw,	P,	Q,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 66 */ { Ipcmpgtd,	P,	Q,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 67 */ { Ipacksswb,	P,	Q,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 68 */ { Ipunpckhbw,	P,	Q,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 69 */ { Ipunpckhwd,	P,	Q,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 6A */ { Ipunpckhdq,	P,	Q,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 6B */ { Ipackssdw,	P,	Q,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 6C */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 6D */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 6E */ { Imovd,	P,	Ex,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 6F */ { Imovq,	P,	Q,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 70 */ { Ipshufw,	P,	Q,	Ib,	Pa32 | REX(_R|_X|_B) },
+/* 71 */ { Igrp,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 72 */ { Igrp,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 73 */ { Igrp,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 74 */ { Ipcmpeqb,	P,	Q,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 75 */ { Ipcmpeqw,	P,	Q,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 76 */ { Ipcmpeqd,	P,	Q,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 77 */ { Iemms,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 78 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 79 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 7A */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 7B */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 7C */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 7D */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 7E */ { Imovd,	Ex,	P,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 7F */ { Imovq,	Q,	P,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 80 */ { Ijo,		Jz,	NOARG,	NOARG,	Po32 },
+/* 81 */ { Ijno,	Jz,	NOARG,	NOARG,	Po32 },
+/* 82 */ { Ijb,		Jz,	NOARG,	NOARG,	Po32 },
+/* 83 */ { Ijnb,	Jz,	NOARG,	NOARG,	Po32 },
+/* 84 */ { Ijz,		Jz,	NOARG,	NOARG,	Po32 },
+/* 85 */ { Ijnz,	Jz,	NOARG,	NOARG,	Po32 },
+/* 86 */ { Ijbe,	Jz,	NOARG,	NOARG,	Po32 },
+/* 87 */ { Ijnbe,	Jz,	NOARG,	NOARG,	Po32 },
+/* 88 */ { Ijs,		Jz,	NOARG,	NOARG,	Po32 },
+/* 89 */ { Ijns,	Jz,	NOARG,	NOARG,	Po32 },
+/* 8A */ { Ijp,		Jz,	NOARG,	NOARG,	Po32 },
+/* 8B */ { Ijnp,	Jz,	NOARG,	NOARG,	Po32 },
+/* 8C */ { Ijl,		Jz,	NOARG,	NOARG,	Po32 },
+/* 8D */ { Ijnl,	Jz,	NOARG,	NOARG,	Po32 },
+/* 8E */ { Ijle,	Jz,	NOARG,	NOARG,	Po32 },
+/* 8F */ { Ijnle,	Jz,	NOARG,	NOARG,	Po32 },
+/* 90 */ { Iseto,	Eb,	NOARG,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 91 */ { Isetno,	Eb,	NOARG,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 92 */ { Isetb,	Eb,	NOARG,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 93 */ { Isetnb,	Eb,	NOARG,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 94 */ { Isetz,	Eb,	NOARG,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 95 */ { Isetnz,	Eb,	NOARG,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 96 */ { Isetbe,	Eb,	NOARG,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 97 */ { Isetnbe,	Eb,	NOARG,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 98 */ { Isets,	Eb,	NOARG,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 99 */ { Isetns,	Eb,	NOARG,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 9A */ { Isetp,	Eb,	NOARG,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 9B */ { Isetnp,	Eb,	NOARG,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 9C */ { Isetl,	Eb,	NOARG,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 9D */ { Isetnl,	Eb,	NOARG,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 9E */ { Isetle,	Eb,	NOARG,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 9F */ { Isetnle,	Eb,	NOARG,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* A0 */ { Ipush,	FS,	NOARG,	NOARG,	Pnone },
+/* A1 */ { Ipop,	FS,	NOARG,	NOARG,	Pnone },
+/* A2 */ { Icpuid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* A3 */ { Ibt,		Ev,	Gv,	NOARG,	Po32 | Pa32 | REX(_W|_R|_X|_B) },
+/* A4 */ { Ishld,	Ev,	Gv,	Ib,	Po32 | Pa32 | REX(_W|_R|_X|_B) },
+/* A5 */ { Ishld,	Ev,	Gv,	CL,	Po32 | Pa32 | REX(_W|_R|_X|_B) },
+/* A6 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* A7 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* A8 */ { Ipush,	GS,	NOARG,	NOARG,	Pnone },
+/* A9 */ { Ipop,	GS,	NOARG,	NOARG,	Pnone },
+/* AA */ { Irsm,	NOARG,	NOARG,	NOARG,	Pnone },
+/* AB */ { Ibts,	Ev,	Gv,	NOARG,	Po32 | Pa32 | REX(_W|_R|_X|_B) },
+/* AC */ { Ishrd,	Ev,	Gv,	Ib,	Po32 | Pa32 | REX(_W|_R|_X|_B) },
+/* AD */ { Ishrd,	Ev,	Gv,	CL,	Po32 | Pa32 | REX(_W|_R|_X|_B) },
+/* AE */ { Igrp,	NOARG,	NOARG,	NOARG,	Pnone },
+/* AF */ { Iimul,	Gv,	Ev,	NOARG,	Po32 | Pa32 | REX(_W|_R|_X|_B) },
+/* B0 */ { Icmpxchg,	Eb,	Gb,	NOARG,	Pa32 | REX(_W|_R|_X|_B) },
+/* B1 */ { Icmpxchg,	Ev,	Gv,	NOARG,	Po32 | Pa32 | REX(_W|_R|_X|_B) },
+/* B2 */ { Ilss,	Gv,	E,	NOARG,	Po32 | Pa32 | REX(_W|_R|_X|_B) },
+/* B3 */ { Ibtr,	Ev,	Gv,	NOARG,	Po32 | Pa32 | REX(_W|_R|_X|_B) },
+/* B4 */ { Ilfs,	Gv,	E,	NOARG,	Po32 | Pa32 | REX(_W|_R|_X|_B) },
+/* B5 */ { Ilgs,	Gv,	E,	NOARG,	Po32 | Pa32 | REX(_W|_R|_X|_B) },
+/* B6 */ { Imovzx,	Gv,	Eb,	NOARG,	Po32 | Pa32 | REX(_W|_R|_X|_B) },
+/* B7 */ { Imovzx,	Gv,	Ew,	NOARG,	Po32 | Pa32 | REX(_W|_R|_X|_B) },
+/* B8 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* B9 */ { Igrp,	NOARG,	NOARG,	NOARG,	Pnone },
+/* BA */ { Igrp,	NOARG,	NOARG,	NOARG,	Pnone },
+/* BB */ { Ibtc,	Ev,	Gv,	NOARG,	Po32 | Pa32 | REX(_W|_R|_X|_B) },
+/* BC */ { Ibsf,	Ev,	Gv,	NOARG,	Po32 | Pa32 | REX(_W|_R|_X|_B) },
+/* BD */ { Ibsr,	Ev,	Gv,	NOARG,	Po32 | Pa32 | REX(_W|_R|_X|_B) },
+/* BE */ { Imovsx,	Gv,	Eb,	NOARG,	Po32 | Pa32 | REX(_W|_R|_X|_B) },
+/* BF */ { Imovsx,	Gv,	Ew,	NOARG,	Po32 | Pa32 | REX(_W|_R|_X|_B) },
+/* C0 */ { Ixadd,	Eb,	Gb,	NOARG,	Po32 | Pa32 | REX(_W|_R|_X|_B) },
+/* C1 */ { Ixadd,	Ev,	Gv,	NOARG,	Po32 | Pa32 | REX(_W|_R|_X|_B) },
+/* C2 */ { Icmpps,	V,	W,	Ib,	Pa32 | REX(_R|_X|_B) },
+/* C3 */ { Imovnti,	M,	Gx,	NOARG,	Pa32 | REX(_W|_R|_X|_B) },
+/* C4 */ { Ipinsrw,	P,	Ew,	Ib,	Po32 | Pa32 | REX(_W|_R|_X|_B) },
+/* C5 */ { Ipextrw,	Gd,	PR,	Ib,	Po32 | Pa32 | REX(_W|_R|_X|_B) },
+/* C6 */ { Ishufps,	V,	W,	Ib,	Pa32 | REX(_R|_X|_B) },
+/* C7 */ { Igrp,	NOARG,	NOARG,	NOARG,	Pnone },
+/* C8 */ { Ibswap,	rAXr8,	NOARG,	NOARG,	Po32 | REX(_W|_B) },
+/* C9 */ { Ibswap,	rCXr9,	NOARG,	NOARG,	Po32 | REX(_W|_B) },
+/* CA */ { Ibswap,	rDXr10,	NOARG,	NOARG,	Po32 | REX(_W|_B) },
+/* CB */ { Ibswap,	rBXr11,	NOARG,	NOARG,	Po32 | REX(_W|_B) },
+/* CC */ { Ibswap,	rSPr12,	NOARG,	NOARG,	Po32 | REX(_W|_B) },
+/* CD */ { Ibswap,	rBPr13,	NOARG,	NOARG,	Po32 | REX(_W|_B) },
+/* CE */ { Ibswap,	rSIr14,	NOARG,	NOARG,	Po32 | REX(_W|_B) },
+/* CF */ { Ibswap,	rDIr15,	NOARG,	NOARG,	Po32 | REX(_W|_B) },
+/* D0 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* D1 */ { Ipsrlw,	P,	Q,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* D2 */ { Ipsrld,	P,	Q,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* D3 */ { Ipsrlq,	P,	Q,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* D4 */ { Ipaddq,	P,	Q,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* D5 */ { Ipmullw,	P,	Q,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* D6 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* D7 */ { Ipmovmskb,	Gd,	PR,	NOARG,	Pnone },
+/* D8 */ { Ipsubusb,	P,	Q,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* D9 */ { Ipsubusw,	P,	Q,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* DA */ { Ipminub,	P,	Q,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* DB */ { Ipand,	P,	Q,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* DC */ { Ipaddusb,	P,	Q,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* DD */ { Ipaddusw,	P,	Q,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* DE */ { Ipmaxub,	P,	Q,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* DF */ { Ipandn,	P,	Q,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* E0 */ { Ipavgb,	P,	Q,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* E1 */ { Ipsraw,	P,	Q,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* E2 */ { Ipsrad,	P,	Q,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* E3 */ { Ipavgw,	P,	Q,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* E4 */ { Ipmulhuw,	P,	Q,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* E5 */ { Ipmulhw,	P,	Q,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* E6 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* E7 */ { Imovntq,	M,	P,	NOARG,	Pnone },
+/* E8 */ { Ipsubsb,	P,	Q,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* E9 */ { Ipsubsw,	P,	Q,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* EA */ { Ipminsw,	P,	Q,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* EB */ { Ipor,	P,	Q,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* EC */ { Ipaddsb,	P,	Q,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* ED */ { Ipaddsw,	P,	Q,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* EE */ { Ipmaxsw,	P,	Q,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* EF */ { Ipxor,	P,	Q,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* F0 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* F1 */ { Ipsllw,	P,	Q,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* F2 */ { Ipslld,	P,	Q,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* F3 */ { Ipsllq,	P,	Q,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* F4 */ { Ipmuludq,	P,	Q,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* F5 */ { Ipmaddwd,	P,	Q,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* F6 */ { Ipsadbw,	P,	Q,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* F7 */ { Imaskmovq,	P,	Q,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* F8 */ { Ipsubb,	P,	Q,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* F9 */ { Ipsubw,	P,	Q,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* FA */ { Ipsubd,	P,	Q,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* FB */ { Ipsubq,	P,	Q,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* FC */ { Ipaddb,	P,	Q,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* FD */ { Ipaddw,	P,	Q,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* FE */ { Ipaddd,	P,	Q,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* FF */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone }
+};
+
+x86_TableEntry insntbl_2byte_prefixF3[0x100] = {
+/* 00 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 01 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 02 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 03 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 04 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 05 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 06 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 07 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 08 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 09 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 0A */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 0B */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 0C */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 0D */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 0E */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 0F */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 10 */ { Imovss,	V,	W,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 11 */ { Imovss,	W,	V,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 12 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 13 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 14 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 15 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 16 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 17 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 18 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 19 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 1A */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 1B */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 1C */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 1D */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 1E */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 1F */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 20 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 21 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 22 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 23 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 24 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 25 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 26 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 27 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 28 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 29 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 2A */ { Icvtsi2ss,	V,	Evw,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 2B */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 2C */ { Icvttsi2ss,	Gvw,	W,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 2D */ { Icvtss2si,	Gvw,	W,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 2E */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 2F */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 30 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 31 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 32 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 33 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 34 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 35 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 36 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 37 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 38 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 39 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 3A */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 3B */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 3C */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 3D */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 3E */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 3F */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 40 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 41 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 42 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 43 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 44 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 45 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 46 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 47 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 48 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 49 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 4A */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 4B */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 4C */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 4D */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 4E */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 4F */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 50 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 51 */ { Isqrtss,	V,	W,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 52 */ { Irsqrtss,	V,	W,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 53 */ { Ircpss,	V,	W,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 54 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 55 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 56 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 57 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 58 */ { Iaddss,	V,	W,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 59 */ { Imulss,	V,	W,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 5A */ { Icvtss2sd,	V,	W,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 5B */ { Icvttps2dq,	V,	W,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 5C */ { Isubss,	V,	W,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 5D */ { Iminss,	V,	W,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 5E */ { Idivss,	V,	W,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 5F */ { Imaxss,	V,	W,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 60 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 61 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 62 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 63 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 64 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 65 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 66 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 67 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 68 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 69 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 6A */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 6B */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 6C */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 6D */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 6E */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 6F */ { Imovdqu,	V,	W,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 70 */ { Ipshufhw,	V,	W,	Ib,	Pa32 | REX(_R|_X|_B) },
+/* 71 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 72 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 73 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 74 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 75 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 76 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 77 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 78 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 79 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 7A */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 7B */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 7C */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 7D */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 7E */ { Imovq,	V,	W,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 7F */ { Imovdqu,	W,	V,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 80 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 81 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 82 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 83 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 84 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 85 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 86 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 87 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 88 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 89 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 8A */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 8B */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 8C */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 8D */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 8E */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 8F */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 90 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 91 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 92 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 93 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 94 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 95 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 96 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 97 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 98 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 99 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 9A */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 9B */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 9C */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 9D */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 9E */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 9F */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* A0 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* A1 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* A2 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* A3 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* A4 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* A5 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* A6 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* A7 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* A8 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* A9 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* AA */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* AB */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* AC */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* AD */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* AE */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* AF */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* B0 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* B1 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* B2 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* B3 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* B4 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* B5 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* B6 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* B7 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* B8 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* B9 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* BA */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* BB */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* BC */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* BD */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* BE */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* BF */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* C0 */ { Ixadd,	Eb,	Gb,	NOARG,	Pa32 | REX(_W|_R|_X|_B) },
+/* C1 */ { Ixadd,	Ev,	Gv,	NOARG,	Pa32 | REX(_W|_R|_X|_B) },
+/* C2 */ { Icmpss,	V,	W,	Ib,	Pa32 | REX(_R|_X|_B) },
+/* C3 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* C4 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* C5 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* C6 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* C7 */ { Igrp,	NOARG,	NOARG,	NOARG,	Pnone },
+/* C8 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* C9 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* CA */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* CB */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* CC */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* CD */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* CE */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* CF */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* D0 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* D1 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* D2 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* D3 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* D4 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* D5 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* D6 */ { Imovq2dq,	V,	PR,	NOARG,	Pa32  },
+/* D7 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* D8 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* D9 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* DA */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* DB */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* DC */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* DD */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* DE */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* CF */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* E0 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* E1 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* E2 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* E3 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* E4 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* E5 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* E6 */ { Icvtdq2pd,	V,	W,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* E7 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* E8 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* E9 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* EA */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* EB */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* EC */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* ED */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* EE */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* EF */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* F0 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* F1 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* F2 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* F3 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* F4 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* F5 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* F6 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* F7 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* F8 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* F9 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* FA */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* FB */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* FC */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* FD */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* FE */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* FF */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone }
+};
+
+x86_TableEntry insntbl_2byte_prefix66[0x100] = {
+/* 00 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 01 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 02 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 03 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 04 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 05 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 06 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 07 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 08 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 09 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 0A */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 0B */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 0C */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 0D */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 0E */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 0F */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 10 */ { Imovupd,	V,	W,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 11 */ { Imovupd,	W,	V,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 12 */ { Imovlpd,	V,	M,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 13 */ { Imovlpd,	M,	V,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 14 */ { Iunpcklps,	V,	W,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 15 */ { Iunpckhps,	V,	W,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 16 */ { Imovhps,	V,	M,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 17 */ { Imovhps,	M,	V,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 18 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 19 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 1A */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 1B */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 1C */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 1D */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 1E */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 1F */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 20 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 21 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 22 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 23 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 24 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 25 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 26 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 27 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 28 */ { Imovapd,	V,	W,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 29 */ { Imovapd,	W,	V,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 2A */ { Icvtpi2pd,	V,	Q,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 2B */ { Imovntpd,	M,	V,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 2C */ { Icvttpd2pi,	P,	W,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 2D */ { Icvtpd2pi,	P,	W,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 2E */ { Iucomisd,	V,	W,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 2F */ { Icomisd,	V,	W,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 30 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 31 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 32 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 33 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 34 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 35 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 36 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 37 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 38 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 39 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 3A */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 3B */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 3C */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 3D */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 3E */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 3F */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 40 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 41 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 42 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 43 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 44 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 45 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 46 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 47 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 48 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 49 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 4A */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 4B */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 4C */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 4D */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 4E */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 4F */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 50 */ { Imovmskpd,	Gv,	VR,	NOARG,	Po32 | REX(_W|_R|_B) },
+/* 51 */ { Isqrtpd,	V,	W,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 52 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 53 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 54 */ { Iandpd,	V,	W,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 55 */ { Iandnpd,	V,	W,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 56 */ { Iorpd,	V,	W,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 57 */ { Ixorpd,	V,	W,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 58 */ { Iaddpd,	V,	W,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 59 */ { Imulpd,	V,	W,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 5A */ { Icvtpd2ps,	V,	W,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 5B */ { Icvtps2dq,	V,	W,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 5C */ { Isubpd,	V,	W,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 5D */ { Iminpd,	V,	W,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 5E */ { Idivpd,	V,	W,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 5F */ { Imaxpd,	V,	W,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 60 */ { Ipunpcklbw,	V,	W,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 61 */ { Ipunpcklwd,	V,	W,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 62 */ { Ipunpckldq,	V,	W,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 63 */ { Ipackusdw,	V,	W,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 64 */ { Ipcmpgtb,	V,	W,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 65 */ { Ipcmpgtw,	V,	W,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 66 */ { Ipcmpgtd,	V,	W,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 67 */ { Ipacksswb,	V,	W,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 68 */ { Ipunpckhbw,	V,	W,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 69 */ { Ipunpckhwd,	V,	W,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 6A */ { Ipunpckhdq,	V,	W,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 6B */ { Ipackssdw,	V,	W,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 6C */ { Ipunpcklqdq,	V,	W,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 6D */ { Ipunpckhqdq,	V,	W,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 6E */ { Imovd,	V,	Ex,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 6F */ { Imovqa,	V,	W,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 70 */ { Ipshufd,	V,	W,	Ib,	Pa32 | REX(_R|_X|_B) },
+/* 71 */ { Igrp,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 72 */ { Igrp,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 73 */ { Igrp,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 74 */ { Ipcmpeqb,	V,	W,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 75 */ { Ipcmpeqw,	V,	W,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 76 */ { Ipcmpeqd,	V,	W,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 77 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 78 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 79 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 7A */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 7B */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 7C */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 7D */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 7E */ { Imovd,	Evw,	V,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 7F */ { Imovdqa,	W,	V,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 80 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 81 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 82 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 83 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 84 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 85 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 86 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 87 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 88 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 89 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 8A */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 8B */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 8C */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 8D */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 8E */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 8F */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 90 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 91 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 92 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 93 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 94 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 95 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 96 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 97 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 98 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 99 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 9A */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 9B */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 9C */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 9D */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 9E */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 9F */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* A0 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* A1 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* A2 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* A3 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* A4 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* A5 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* A6 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* A7 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* A8 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* A9 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* AA */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* AB */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* AC */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* AD */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* AE */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* AF */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* B0 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* B1 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* B2 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* B3 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* B4 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* B5 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* B6 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* B7 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* B8 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* B9 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* BA */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* BB */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* BC */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* BD */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* BE */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* BF */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* C0 */ { Ixadd,	Eb,	Gb,	NOARG,	Pa32 | REX(_W|_R|_X|_B) },
+/* C1 */ { Ixadd,	Ev,	Gv,	NOARG,	Po32 | Pa32 | REX(_W|_R|_X|_B) },
+/* C2 */ { Icmppd,	V,	W,	Ib,	Pa32 | REX(_R|_X|_B) },
+/* C3 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* C4 */ { Ipinsrw,	V,	Ew,	Ib,	Pa32 | REX(_W|_R|_X|_B) },
+/* C5 */ { Ipextrw,	Gd,	VR,	Ib,	Pa32  },
+/* C6 */ { Ishufpd,	V,	W,	Ib,	Pa32 | REX(_R|_X|_B) },
+/* C7 */ { Igrp,	NOARG,	NOARG,	NOARG,	Pnone },
+/* C8 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* C9 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* CA */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* CB */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* CC */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* CD */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* CE */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* CF */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* D0 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* D1 */ { Ipsrlw,	V,	W,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* D2 */ { Ipsrld,	V,	W,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* D3 */ { Ipsrlq,	V,	W,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* D4 */ { Ipaddq,	V,	W,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* D5 */ { Ipmullw,	V,	W,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* D6 */ { Iinvalid,	W,	V,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* D7 */ { Ipmovmskb,	Gd,	VR,	NOARG,	Pnone },
+/* D8 */ { Ipsubusb,	V,	W,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* D9 */ { Ipsubusw,	V,	W,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* DA */ { Ipminub,	V,	W,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* DB */ { Ipand,	V,	W,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* DC */ { Ipaddusb,	V,	W,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* DD */ { Ipaddusw,	V,	W,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* DE */ { Ipmaxub,	V,	W,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* DF */ { Ipandn,	V,	W,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* E0 */ { Ipavgb,	V,	W,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* E1 */ { Ipsraw,	V,	W,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* E2 */ { Ipsrad,	V,	W,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* E3 */ { Ipavgw,	V,	W,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* E4 */ { Ipmulhuw,	V,	W,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* E5 */ { Ipmulhw,	V,	W,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* E6 */ { Icvttpd2dq,	V,	W,	NOARG,	Pnone },
+/* E7 */ { Imovntdq,	M,	V,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* E8 */ { Ipsubsb,	V,	W,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* E9 */ { Ipsubsw,	V,	W,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* EA */ { Ipminsw,	V,	W,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* EB */ { Ipor,	V,	W,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* EC */ { Ipaddsb,	V,	W,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* ED */ { Ipaddsw,	V,	W,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* EE */ { Ipmaxsw,	V,	W,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* EF */ { Ipxor,	V,	W,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* F0 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* F1 */ { Ipsllw,	V,	W,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* F2 */ { Ipslld,	V,	W,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* F3 */ { Ipsllq,	V,	W,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* F4 */ { Ipmuludq,	V,	W,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* F5 */ { Ipmaddwd,	V,	W,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* F6 */ { Ipsadbw,	V,	W,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* F7 */ { Imaskmovq,	V,	W,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* F8 */ { Ipsubb,	V,	W,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* F9 */ { Ipsubw,	V,	W,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* FA */ { Ipsubd,	V,	W,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* FB */ { Ipsubq,	V,	W,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* FC */ { Ipaddb,	V,	W,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* FD */ { Ipaddw,	V,	W,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* FE */ { Ipaddd,	V,	W,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* FF */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone }
+};
+
+x86_TableEntry insntbl_2byte_prefixF2[0x100] = {
+/* 00 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 01 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 02 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 03 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 04 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 05 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 06 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 07 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 08 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 09 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 0A */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 0B */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 0C */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 0D */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 0E */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 0F */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 10 */ { Imovsd,	V,	W,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 11 */ { Imovsd,	W,	V,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 12 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 13 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 14 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 15 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 16 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 17 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 18 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 19 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 1A */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 1B */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 1C */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 1D */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 1E */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 1F */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 20 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 21 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 22 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 23 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 24 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 25 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 26 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 27 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 28 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 29 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 2A */ { Icvtsi2sd,	V,	Evw,	NOARG,	Pa32 | REX(_W|_R|_X|_B) },
+/* 2B */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 2C */ { Icvttsi2sd,	Gvw,	W,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 2D */ { Icvtsd2si,	Gvw,	W,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 2E */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 2F */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 30 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 31 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 32 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 33 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 34 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 35 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 36 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 37 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 38 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 39 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 3A */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 3B */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 3C */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 3D */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 3E */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 3F */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 40 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 41 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 42 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 43 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 44 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 45 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 46 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 47 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 48 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 49 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 4A */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 4B */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 4C */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 4D */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 4E */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 4F */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 50 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 51 */ { Isqrtsd,	V,	W,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 52 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 53 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 54 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 55 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 56 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 57 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 58 */ { Iaddsd,	V,	W,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 59 */ { Imulsd,	V,	W,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 5A */ { Icvtsd2ss,	V,	W,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 5B */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 5C */ { Isubsd,	V,	W,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 5D */ { Iminsd,	V,	W,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 5E */ { Idivsd,	V,	W,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 5F */ { Imaxsd,	V,	W,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* 60 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 61 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 62 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 63 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 64 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 65 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 66 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 67 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 68 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 69 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 6A */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 6B */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 6C */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 6D */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 6E */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 6F */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 70 */ { Ipshuflw,	V,	W,	Ib,	Pa32 | REX(_R|_X|_B) },
+/* 71 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 72 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 73 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 74 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 75 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 76 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 77 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 78 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 79 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 7A */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 7B */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 7C */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 7D */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 7E */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 7F */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 80 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 81 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 82 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 83 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 84 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 85 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 86 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 87 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 88 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 89 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 8A */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 8B */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 8C */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 8D */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 8E */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 8F */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 90 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 91 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 92 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 93 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 94 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 95 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 96 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 97 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 98 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 99 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 9A */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 9B */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 9C */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 9D */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 9E */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* 9F */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* A0 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* A1 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* A2 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* A3 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* A4 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* A5 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* A6 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* A7 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* A8 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* A9 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* AA */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* AB */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* AC */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* AD */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* AE */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* AF */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* B0 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* B1 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* B2 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* B3 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* B4 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* B5 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* B6 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* B7 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* B8 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* B9 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* BA */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* BB */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* BC */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* BD */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* BE */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* BF */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* C0 */ { Ixadd,	Eb,	Gb,	NOARG,	Pa32 | REX(_W|_R|_X|_B) },
+/* C1 */ { Ixadd,	Ev,	Gv,	NOARG,	Po32 | Pa32 | REX(_R|_X|_B) },
+/* C2 */ { Icmpsd,	V,	W,	Ib,	Pa32 | REX(_R|_X|_B) },
+/* C3 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* C4 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* C5 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* C6 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* C7 */ { Igrp,	NOARG,	NOARG,	NOARG,	Pnone },
+/* C8 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* C9 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* CA */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* CB */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* CC */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* CD */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* CE */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* CF */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* D0 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* D1 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* D2 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* D3 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* D4 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* D5 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* D6 */ { Imovdq2q,	P,	VR,	NOARG,	Pa32  },
+/* D7 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* D8 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* D9 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* DA */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* DB */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* DC */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* DD */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* DE */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* DF */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* E0 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* E1 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* E2 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* E3 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* E4 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* E5 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* E6 */ { Icvtpd2dq,	V,	W,	NOARG,	Pa32 | REX(_R|_X|_B) },
+/* E7 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* E8 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* E9 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* EA */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* EB */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* EC */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* ED */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* EE */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* EF */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* F0 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* F1 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* F2 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* F3 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* F4 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* F5 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* F6 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* F7 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* F8 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* F9 */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* FA */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* FB */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* FC */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* FD */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* FE */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+/* FF */ { Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone }
+};
+
+x86_TableEntry insntbl_group1_op80[0x8] = {
+	{ Iadd,		Eb,	Ib,	NOARG,	Pa32 | REX(_W|_R|_X|_B) },
+	{ Ior,		Eb,	Ib,	NOARG,	Pa32 | REX(_W|_R|_X|_B) },
+	{ Iadc,		Eb,	Ib,	NOARG,	Pa32 | REX(_W|_R|_X|_B) },
+	{ Isbb,		Eb,	Ib,	NOARG,	Pa32 | REX(_W|_R|_X|_B) },
+	{ Iand,		Eb,	Ib,	NOARG,	Pa32 | REX(_W|_R|_X|_B) },
+	{ Isub,		Eb,	Ib,	NOARG,	Pa32 | REX(_W|_R|_X|_B) },
+	{ Ixor,		Eb,	Ib,	NOARG,	Pa32 | REX(_W|_R|_X|_B) },
+	{ Icmp,		Eb,	Ib,	NOARG,	Pa32 | REX(_W|_R|_X|_B) }
+};
+
+x86_TableEntry insntbl_group1_op81[0x8] = {
+	{ Iadd,		Ez,	Iz,	NOARG,	Po32 | Pa32 | REX(_W|_R|_X|_B) },
+	{ Ior,		Ez,	Iz,	NOARG,	Po32 | Pa32 | REX(_W|_R|_X|_B) },
+	{ Iadc,		Ez,	Iz,	NOARG,	Po32 | Pa32 | REX(_W|_R|_X|_B) },
+	{ Isbb,		Ez,	Iz,	NOARG,	Po32 | Pa32 | REX(_W|_R|_X|_B) },
+	{ Iand,		Ez,	Iz,	NOARG,	Po32 | Pa32 | REX(_W|_R|_X|_B) },
+	{ Isub,		Ez,	Iz,	NOARG,	Po32 | Pa32 | REX(_W|_R|_X|_B) },
+	{ Ixor,		Ez,	Iz,	NOARG,	Po32 | Pa32 | REX(_W|_R|_X|_B) },
+	{ Icmp,		Ez,	Iz,	NOARG,	Po32 | Pa32 | REX(_W|_R|_X|_B) }
+};
+
+x86_TableEntry insntbl_group1_op82[0x8] = {
+	{ Iadd,		Eb,	Ib,	NOARG,	Pinv64 | Pa32 | REX(_W|_R|_X|_B) },
+	{ Ior,		Eb,	Ib,	NOARG,	Pinv64 | Pa32 | REX(_W|_R|_X|_B) },
+	{ Iadc,		Eb,	Ib,	NOARG,	Pinv64 | Pa32 | REX(_W|_R|_X|_B) },
+	{ Isbb,		Eb,	Ib,	NOARG,	Pinv64 | Pa32 | REX(_W|_R|_X|_B) },
+	{ Iand,		Eb,	Ib,	NOARG,	Pinv64 | Pa32 | REX(_W|_R|_X|_B) },
+	{ Isub,		Eb,	Ib,	NOARG,	Pinv64 | Pa32 | REX(_W|_R|_X|_B) },
+	{ Ixor,		Eb,	Ib,	NOARG,	Pinv64 | Pa32 | REX(_W|_R|_X|_B) },
+	{ Icmp,		Eb,	Ib,	NOARG,	Pinv64 | Pa32 | REX(_W|_R|_X|_B) }
+};
+
+x86_TableEntry insntbl_group1A_op8F[0x8] = {
+	{ Ipop,		Ev,	NOARG,	NOARG,	Po32 | Pa32 | REX(_W|_R|_X|_B) },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone }
+};
+
+
+x86_TableEntry insntbl_group1_op83[0x8] = {
+	{ Iadd,		Ev,	Ib,	NOARG,	Po32 | Pa32 | REX(_R|_X|_B) },
+	{ Ior,		Ev,	Ib,	NOARG,	Po32 | Pa32 | REX(_R|_X|_B) },
+	{ Iadc,		Ev,	Ib,	NOARG,	Po32 | Pa32 | REX(_R|_X|_B) },
+	{ Isbb,		Ev,	Ib,	NOARG,	Po32 | Pa32 | REX(_R|_X|_B) },
+	{ Iand,		Ev,	Ib,	NOARG,	Po32 | Pa32 | REX(_R|_X|_B) },
+	{ Isub,		Ev,	Ib,	NOARG,	Po32 | Pa32 | REX(_R|_X|_B) },
+	{ Ixor,		Ev,	Ib,	NOARG,	Po32 | Pa32 | REX(_R|_X|_B) },
+	{ Icmp,		Ev,	Ib,	NOARG,	Po32 | Pa32 | REX(_R|_X|_B) }
+};
+
+x86_TableEntry insntbl_group2_opC0[0x8] = {
+	{ Iror,		Eb,	Ib,	NOARG,	Pa32 | REX(_W|_R|_X|_B) },
+	{ Irol,		Eb,	Ib,	NOARG,	Pa32 | REX(_W|_R|_X|_B) },
+	{ Ircl,		Eb,	Ib,	NOARG,	Pa32 | REX(_W|_R|_X|_B) },
+	{ Ircr,		Eb,	Ib,	NOARG,	Pa32 | REX(_W|_R|_X|_B) },
+	{ Ishl,		Eb,	Ib,	NOARG,	Pa32 | REX(_W|_R|_X|_B) },
+	{ Ishr,		Eb,	Ib,	NOARG,	Pa32 | REX(_W|_R|_X|_B) },
+	{ Isal,		Eb,	Ib,	NOARG,	Pa32 | REX(_W|_R|_X|_B) },
+	{ Isar,		Eb,	Ib,	NOARG,	Pa32 | REX(_W|_R|_X|_B) }
+};
+
+x86_TableEntry insntbl_group2_opC1[0x8] = {
+	{ Iror,		Ev,	Ib,	NOARG,	Po32 | Pa32 | REX(_W|_R|_X|_B) },
+	{ Irol,		Ev,	Ib,	NOARG,	Po32 | Pa32 | REX(_W|_R|_X|_B) },
+	{ Ircl,		Ev,	Ib,	NOARG,	Po32 | Pa32 | REX(_W|_R|_X|_B) },
+	{ Ircr,		Ev,	Ib,	NOARG,	Po32 | Pa32 | REX(_W|_R|_X|_B) },
+	{ Ishl,		Ev,	Ib,	NOARG,	Po32 | Pa32 | REX(_W|_R|_X|_B) },
+	{ Ishr,		Ev,	Ib,	NOARG,	Po32 | Pa32 | REX(_W|_R|_X|_B) },
+	{ Isal,		Ev,	Ib,	NOARG,	Po32 | Pa32 | REX(_W|_R|_X|_B) },
+	{ Isar,		Ev,	Ib,	NOARG,	Po32 | Pa32 | REX(_W|_R|_X|_B) }
+};
+
+x86_TableEntry insntbl_group2_opD0[0x8] = {
+	{ Iror,		Eb,	I1,	NOARG,	Pa32 | REX(_W|_R|_X|_B) },
+	{ Irol,		Eb,	I1,	NOARG,	Pa32 | REX(_W|_R|_X|_B) },
+	{ Ircl,		Eb,	I1,	NOARG,	Pa32 | REX(_W|_R|_X|_B) },
+	{ Ircr,		Eb,	I1,	NOARG,	Pa32 | REX(_W|_R|_X|_B) },
+	{ Ishl,		Eb,	I1,	NOARG,	Pa32 | REX(_W|_R|_X|_B) },
+	{ Ishr,		Eb,	I1,	NOARG,	Pa32 | REX(_W|_R|_X|_B) },
+	{ Isal,		Eb,	I1,	NOARG,	Pa32 | REX(_W|_R|_X|_B) },
+	{ Isar,		Eb,	I1,	NOARG,	Pa32 | REX(_W|_R|_X|_B) }
+};
+
+x86_TableEntry insntbl_group2_opD1[0x8] = {
+	{ Iror,		Ev,	I1,	NOARG,	Po32 | Pa32 | REX(_W|_R|_X|_B) },
+	{ Irol,		Ev,	I1,	NOARG,	Po32 | Pa32 | REX(_W|_R|_X|_B) },
+	{ Ircl,		Ev,	I1,	NOARG,	Po32 | Pa32 | REX(_W|_R|_X|_B) },
+	{ Ircr,		Ev,	I1,	NOARG,	Po32 | Pa32 | REX(_W|_R|_X|_B) },
+	{ Ishl,		Ev,	I1,	NOARG,	Po32 | Pa32 | REX(_W|_R|_X|_B) },
+	{ Ishr,		Ev,	I1,	NOARG,	Po32 | Pa32 | REX(_W|_R|_X|_B) },
+	{ Isal,		Ev,	I1,	NOARG,	Po32 | Pa32 | REX(_W|_R|_X|_B) },
+	{ Isar,		Ev,	I1,	NOARG,	Po32 | Pa32 | REX(_W|_R|_X|_B) }
+};
+
+x86_TableEntry insntbl_group2_opD2[0x8] = {
+	{ Iror,		Eb,	CL,	NOARG,	Pa32 | REX(_W|_R|_X|_B) },
+	{ Irol,		Eb,	CL,	NOARG,	Pa32 | REX(_W|_R|_X|_B) },
+	{ Ircl,		Eb,	CL,	NOARG,	Pa32 | REX(_W|_R|_X|_B) },
+	{ Ircr,		Eb,	CL,	NOARG,	Pa32 | REX(_W|_R|_X|_B) },
+	{ Ishl,		Eb,	CL,	NOARG,	Pa32 | REX(_W|_R|_X|_B) },
+	{ Ishr,		Eb,	CL,	NOARG,	Pa32 | REX(_W|_R|_X|_B) },
+	{ Isal,		Eb,	CL,	NOARG,	Pa32 | REX(_W|_R|_X|_B) },
+	{ Isar,		Eb,	CL,	NOARG,	Pa32 | REX(_W|_R|_X|_B) }
+};
+
+x86_TableEntry insntbl_group2_opD3[0x8] = {
+	{ Iror,		Ev,	CL,	NOARG,	Po32 | Pa32 | REX(_W|_R|_X|_B) },
+	{ Irol,		Ev,	CL,	NOARG,	Po32 | Pa32 | REX(_W|_R|_X|_B) },
+	{ Ircl,		Ev,	CL,	NOARG,	Po32 | Pa32 | REX(_W|_R|_X|_B) },
+	{ Ircr,		Ev,	CL,	NOARG,	Po32 | Pa32 | REX(_W|_R|_X|_B) },
+	{ Ishl,		Ev,	CL,	NOARG,	Po32 | Pa32 | REX(_W|_R|_X|_B) },
+	{ Ishr,		Ev,	CL,	NOARG,	Po32 | Pa32 | REX(_W|_R|_X|_B) },
+	{ Isal,		Ev,	CL,	NOARG,	Po32 | Pa32 | REX(_W|_R|_X|_B) },
+	{ Isar,		Ev,	CL,	NOARG,	Po32 | Pa32 | REX(_W|_R|_X|_B) }
+};
+
+x86_TableEntry insntbl_group3_opF6[0x8] = {
+	{ Itest,	Eb,	Ib,	NOARG,	Pa32 | REX(_W|_R|_X|_B) },
+	{ Itest,	Eb,	Ib,	NOARG,	Pa32 | REX(_W|_R|_X|_B) },
+	{ Inot,		Eb,	NOARG,	NOARG,	Pa32 | REX(_W|_R|_X|_B) },
+	{ Ineg,		Eb,	NOARG,	NOARG,	Pa32 | REX(_W|_R|_X|_B) },
+	{ Imul,		Eb,	NOARG,	NOARG,	Pa32 | REX(_W|_R|_X|_B) },
+	{ Iimul,	Eb,	NOARG,	NOARG,	Pa32 | REX(_W|_R|_X|_B) },
+	{ Idiv,		Eb,	NOARG,	NOARG,	Pa32 | REX(_W|_R|_X|_B) },
+	{ Iidiv,	Eb,	NOARG,	NOARG,	Pa32 | REX(_W|_R|_X|_B) }
+};
+
+x86_TableEntry insntbl_group3_opF7[0x8] = {
+	{ Itest,	Ev,	Iz,	NOARG,	Po32 | Pa32 | REX(_W|_R|_X|_B) },
+	{ Itest,	Ev,	Iz,	NOARG,	Po32 | Pa32 | REX(_W|_R|_X|_B) },
+	{ Inot,		Ev,	NOARG,	NOARG,	Po32 | Pa32 | REX(_W|_R|_X|_B) },
+	{ Ineg,		Ev,	NOARG,	NOARG,	Po32 | Pa32 | REX(_W|_R|_X|_B) },
+	{ Imul,		Ev,	NOARG,	NOARG,	Po32 | Pa32 | REX(_W|_R|_X|_B) },
+	{ Iimul,	Ev,	NOARG,	NOARG,	Po32 | Pa32 | REX(_W|_R|_X|_B) },
+	{ Idiv,		Ev,	NOARG,	NOARG,	Po32 | Pa32 | REX(_W|_R|_X|_B) },
+	{ Iidiv,	Ev,	NOARG,	NOARG,	Po32 | Pa32 | REX(_W|_R|_X|_B) }
+};
+
+x86_TableEntry insntbl_group4_opFE[0x8] = {
+	{ Iinc,		Eb,	NOARG,	NOARG,	Pa32 | REX(_W|_R|_X|_B) },
+	{ Idec,		Eb,	NOARG,	NOARG,	Pa32 | REX(_W|_R|_X|_B) },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone }
+};
+
+x86_TableEntry insntbl_group5_opFF[0x8] = {
+	{ Iinc,		Evw,	NOARG,	NOARG,	Po32 | Pa32 | REX(_W|_R|_X|_B) },
+	{ Idec,		Evw,	NOARG,	NOARG,	Po32 | Pa32 | REX(_W|_R|_X|_B) },
+	{ Icall,	Evw,	NOARG,	NOARG,	Po32 | Pa32 | REX(_W|_R|_X|_B) },
+	{ Icall,	Ep,	NOARG,	NOARG,	Po32 | Pa32 | REX(_W|_R|_X|_B) },
+	{ Ijmp,		Evw,	NOARG,	NOARG,	Po32 | Pa32 | REX(_W|_R|_X|_B) },
+	{ Ijmp,		Ep,	NOARG,	NOARG,	Po32 | Pa32 | REX(_W|_R|_X|_B) },
+	{ Ipush,	Evw,	NOARG,	NOARG,	Po32 | Pa32 | REX(_W|_R|_X|_B) },
+	{ Iinvalid,	NOARG, 	NOARG,	NOARG,	Pnone }
+};
+
+/* group 6 */
+x86_TableEntry insntbl_group6_op0F00[0x8] = {
+	{ Isldt,	E,	NOARG,	NOARG,	Po32 | Pa32 | REX(_R|_X|_B) },
+	{ Istr,		E,	NOARG,	NOARG,	Po32 | Pa32 | REX(_R|_X|_B) },
+	{ Illdt,	E,	NOARG,	NOARG,	Pa32 | REX(_R|_X|_B) },
+	{ Iltr,		E,	NOARG,	NOARG,	Pa32 | REX(_R|_X|_B) },
+	{ Iverr,	E,	NOARG,	NOARG,	Pa32 | REX(_R|_X|_B) },
+	{ Iverw,	E,	NOARG,	NOARG,	Pa32 | REX(_R|_X|_B) },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone }
+};
+
+
+/* group 7  */
+x86_TableEntry insntbl_group7_op0F01[0x8] = {
+	{ Isgdt,	M,	NOARG,	NOARG,	Pa32 | REX(_R|_X|_B) },
+	{ Isidt,	M,	NOARG,	NOARG,	Pa32 | REX(_R|_X|_B) },
+	{ Ilgdt,	M,	NOARG,	NOARG,	Pa32 | REX(_R|_X|_B) },
+	{ Ilidt,	M,	NOARG,	NOARG,	Pa32 | REX(_R|_X|_B) },
+	{ Ismsw,	E,	NOARG,	NOARG,	Pa32 | REX(_R|_X|_B) },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Ilmsw,	E,	NOARG,	NOARG,	Pa32 | REX(_R|_X|_B) },
+	{ Iinvlpg,	M,	NOARG,	NOARG,	Pa32 | REX(_R|_X|_B) }
+};
+
+/* group 8  */
+x86_TableEntry insntbl_group8_op0FBA[0x8] = {
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Ibt,		Ev,	Ib,	NOARG,	Po32 | Pa32 | REX(_W|_R|_X|_B) },
+	{ Ibts,		Ev,	Ib,	NOARG,	Po32 | Pa32 | REX(_W|_R|_X|_B) },
+	{ Ibtr,		Ev,	Ib,	NOARG,	Po32 | Pa32 | REX(_W|_R|_X|_B) },
+	{ Ibtc,		Ev,	Ib,	NOARG,	Po32 | Pa32 | REX(_W|_R|_X|_B) },
+};
+
+/* group 9  */
+x86_TableEntry insntbl_group9_op0FC7[0x8] = {
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Icmpxchg8b,	Mq,	NOARG,	NOARG,	Pa32 | REX(_R|_X|_B) },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+};
+
+/* group A  */
+x86_TableEntry insntbl_groupA_op0FB9[0x8] = {
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+};
+
+/* group B  */
+x86_TableEntry insntbl_groupB_opC6[0x8] = {
+	{ Imov,		Eb,	Ib,	NOARG,	Pa32 | REX(_W|_R|_X|_B) },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+};
+
+/* group B  */
+x86_TableEntry insntbl_groupB_opC7[0x8] = {
+	{ Imov,		Ev,	Iz,	NOARG,	Po32 | Pa32 | REX(_W|_R|_X|_B) },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+};
+
+/* group C  */
+x86_TableEntry insntbl_groupC_op0F71[0x8] = {
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Ipsrlw,	PR,	Ib,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Ipsraw,	PR,	Ib,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Ipsllw,	PR,	Ib,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+};
+
+/* group C  */
+x86_TableEntry insntbl_groupC_op0F71_prefix66[0x8] = {
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Ipsrlw,	VR,	Ib,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Ipsraw,	VR,	Ib,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Ipsllw,	VR,	Ib,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+};
+
+/* group D  */
+x86_TableEntry insntbl_groupD_op0F72[0x8] = {
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Ipsrld,	PR,	Ib,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Ipsrad,	PR,	Ib,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Ipslld,	PR,	Ib,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+};
+
+/* group D, prefixed by 0x66  */
+x86_TableEntry insntbl_groupD_op0F72_prefix66[0x8] = {
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Ipsrld,	VR,	Ib,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Ipsrad,	VR,	Ib,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Ipslld,	VR,	Ib,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+};
+
+/* group E  */
+x86_TableEntry insntbl_groupE_op0F73[0x8] = {
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Ipsrlq,	PR,	Ib,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Ipsraq,	PR,	Ib,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Ipsllq,	PR,	Ib,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+};
+
+/* group F  */
+x86_TableEntry insntbl_groupF_op0FAE[0x8] = {
+	{ Ifxsave,	M,	NOARG,	NOARG,	Pa32 | REX(_W|_R|_X|_B) },
+	{ Ifxrstor,	M,	NOARG,	NOARG,	Pa32 | REX(_W|_R|_X|_B) },
+	{ Ildmxcsr,	Md,	NOARG,	NOARG,	Pa32 | REX(_W|_R|_X|_B) },
+	{ Istmxcsr,	Md,	NOARG,	NOARG,	Pa32 | REX(_W|_R|_X|_B) },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+};
+
+/* group E, prefixed by 0x66  */
+x86_TableEntry insntbl_groupE_op0F73_prefix66[0x8] = {
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Ipsrlq,	VR,	Ib,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Ipsraq,	VR,	Ib,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Ipsllq,	VR,	Ib,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+};
+
+/* D8 Opcode Map */
+x86_TableEntry insntbl_x87_opD8reg[0x8] = {
+	{ Ifadd,	Md,	NOARG,	NOARG,	Pa32 | REX(_R|_X|_B) },
+	{ Ifmul,	Md,	NOARG,	NOARG,	Pa32 | REX(_R|_X|_B) },
+	{ Ifcom,	Md,	NOARG,	NOARG,	Pa32 | REX(_R|_X|_B) },
+	{ Ifcomp,	Md,	NOARG,	NOARG,	Pa32 | REX(_R|_X|_B) },
+	{ Ifsub,	Md,	NOARG,	NOARG,	Pa32 | REX(_R|_X|_B) },
+	{ Ifsubr,	Md,	NOARG,	NOARG,	Pa32 | REX(_R|_X|_B) },
+	{ Ifdiv,	Md,	NOARG,	NOARG,	Pa32 | REX(_R|_X|_B) },
+	{ Ifdivr,	Md,	NOARG,	NOARG,	Pa32 | REX(_R|_X|_B) }
+};
+
+/* D9 Opcode Map */
+x86_TableEntry insntbl_x87_opD9reg[0x8] = {
+	{ Ifld,		Md,	NOARG,	NOARG,	Pa32 | REX(_R|_X|_B) },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Ifst,		Md,	NOARG,	NOARG,	Pa32 | REX(_R|_X|_B) },
+	{ Ifstp,	Md,	NOARG,	NOARG,	Pa32 | REX(_R|_X|_B) },
+	{ Ifldenv,	M,	NOARG,	NOARG,	Pa32 | REX(_R|_X|_B) },
+	{ Ifldcw,	Mw,	NOARG,	NOARG,	Pa32 | REX(_R|_X|_B) },
+	{ Ifstenv,	M,	NOARG,	NOARG,	Pa32 | REX(_R|_X|_B) },
+	{ Ifstcw,	Mw,	NOARG,	NOARG,	Pa32 | REX(_R|_X|_B) }
+};
+
+/* DA Opcode Map */
+x86_TableEntry insntbl_x87_opDAreg[0x8] = {
+	{ Ifiadd,	Md,	NOARG,	NOARG,	Pa32 | REX(_R|_X|_B) },
+	{ Ifimul,	Md,	NOARG,	NOARG,	Pa32 | REX(_R|_X|_B) },
+	{ Ificom,	Md,	NOARG,	NOARG,	Pa32 | REX(_R|_X|_B) },
+	{ Ificomp,	Md,	NOARG,	NOARG,	Pa32 | REX(_R|_X|_B) },
+	{ Ifisub,	Md,	NOARG,	NOARG,	Pa32 | REX(_R|_X|_B) },
+	{ Ifisubr,	Md,	NOARG,	NOARG,	Pa32 | REX(_R|_X|_B) },
+	{ Ifidiv,	Md,	NOARG,	NOARG,	Pa32 | REX(_R|_X|_B) },
+	{ Ifidivr,	Md,	NOARG,	NOARG,	Pa32 | REX(_R|_X|_B) }
+};
+
+/* DB Opcode Map */
+x86_TableEntry insntbl_x87_opDBreg[0x8] = {
+	{ Ifild,	Md,	NOARG,	NOARG,	Pa32 | REX(_R|_X|_B) },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Ifist,	Md,	NOARG,	NOARG,	Pa32 | REX(_R|_X|_B) },
+	{ Ifistp,	Md,	NOARG,	NOARG,	Pa32 | REX(_R|_X|_B) },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Ifld,		M,	NOARG,	NOARG,	Pa32 | REX(_R|_X|_B) },
+	{ Iinvalid,  	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Ifstp,	M,	NOARG,	NOARG,	Pa32 | REX(_R|_X|_B) }
+};
+
+/* DC Opcode Map */
+x86_TableEntry insntbl_x87_opDCreg[0x8] = {
+	{ Ifadd,	Mq,	NOARG,	NOARG,	Pa32 | REX(_R|_X|_B) },
+	{ Ifmul,	Mq,	NOARG,	NOARG,	Pa32 | REX(_R|_X|_B) },
+	{ Ifcom,	Mq,	NOARG,	NOARG,	Pa32 | REX(_R|_X|_B) },
+	{ Ifcomp,	Mq,	NOARG,	NOARG,	Pa32 | REX(_R|_X|_B) },
+	{ Ifsub,	Mq,	NOARG,	NOARG,	Pa32 | REX(_R|_X|_B) },
+	{ Ifsubr,	Mq,	NOARG,	NOARG,	Pa32 | REX(_R|_X|_B) },
+	{ Ifdiv,	Mq,	NOARG,	NOARG,	Pa32 | REX(_R|_X|_B) },
+	{ Ifdivr,	Mq,	NOARG,	NOARG,	Pa32 | REX(_R|_X|_B) }
+};
+
+/* DD Opcode Map */
+x86_TableEntry insntbl_x87_opDDreg[0x8] = {
+	{ Ifld,		Mq,	NOARG,	NOARG,	Pa32 | REX(_R|_X|_B) },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Ifst,		Mq,	NOARG,	NOARG,	Pa32 | REX(_R|_X|_B) },
+	{ Ifstp,	Mq,	NOARG,	NOARG,	Pa32 | REX(_R|_X|_B) },
+	{ Ifrstor,	M,	NOARG,	NOARG,	Pa32 | REX(_R|_X|_B) },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Ifsave,	M,	NOARG,	NOARG,	Pa32 | REX(_R|_X|_B) },
+	{ Ifstsw,	M,	NOARG,	NOARG,	Pa32 | REX(_R|_X|_B) }
+};
+
+/* DE Opcode Map */
+x86_TableEntry insntbl_x87_opDEreg[0x8] = {
+	{ Ifiadd,	Mw,	NOARG,	NOARG,	Pa32 | REX(_R|_X|_B) },
+	{ Ifimul,	Mw,	NOARG,	NOARG,	Pa32 | REX(_R|_X|_B) },
+	{ Ificom,	Mw,	NOARG,	NOARG,	Pa32 | REX(_R|_X|_B) },
+	{ Ificomp,	Mw,	NOARG,	NOARG,	Pa32 | REX(_R|_X|_B) },
+	{ Ifisub,	Mw,	NOARG,	NOARG,	Pa32 | REX(_R|_X|_B) },
+	{ Ifisubr,	Mw,	NOARG,	NOARG,	Pa32 | REX(_R|_X|_B) },
+	{ Ifidiv,	Mw,	NOARG,	NOARG,	Pa32 | REX(_R|_X|_B) },
+	{ Ifidivr,	Mw,	NOARG,	NOARG,	Pa32 | REX(_R|_X|_B) }
+};
+
+/* DF Opcode Map */
+x86_TableEntry insntbl_x87_opDFreg[0x8] = {
+	{ Ifild,	Mw,	NOARG,	NOARG,	Pa32 | REX(_R|_X|_B) },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Ifist,	Mw,	NOARG,	NOARG,	Pa32 | REX(_R|_X|_B) },
+	{ Ifistp,	Mw,	NOARG,	NOARG,	Pa32 | REX(_R|_X|_B) },
+	{ Ifbld,	M,	NOARG,	NOARG,	Pa32 | REX(_R|_X|_B) },
+	{ Ifild,	Mq,	NOARG,	NOARG,	Pa32 | REX(_R|_X|_B) },
+	{ Ifbstp,	M,	NOARG,	NOARG,	Pa32 | REX(_R|_X|_B) },
+	{ Ifistp,	Mq,	NOARG,	NOARG,	Pa32 | REX(_R|_X|_B) }
+};
+
+/* D8 Opcode Map */
+x86_TableEntry insntbl_x87_opD8[0x8*0x8] = {
+	{ Ifadd,	ST0,	ST0,	NOARG,	Pnone },
+	{ Ifadd,	ST0,	ST1,	NOARG,	Pnone },
+	{ Ifadd,	ST0,	ST2,	NOARG,	Pnone },
+	{ Ifadd,	ST0,	ST3,	NOARG,	Pnone },
+	{ Ifadd,	ST0,	ST4,	NOARG,	Pnone },
+	{ Ifadd,	ST0,	ST5,	NOARG,	Pnone },
+	{ Ifadd,	ST0,	ST6,	NOARG,	Pnone },
+	{ Ifadd,	ST0,	ST7,	NOARG,	Pnone },
+	{ Ifmul,	ST0,	ST0,	NOARG,	Pnone },
+	{ Ifmul,	ST0,	ST1,	NOARG,	Pnone },
+	{ Ifmul,	ST0,	ST2,	NOARG,	Pnone },
+	{ Ifmul,	ST0,	ST3,	NOARG,	Pnone },
+	{ Ifmul,	ST0,	ST4,	NOARG,	Pnone },
+	{ Ifmul,	ST0,	ST5,	NOARG,	Pnone },
+	{ Ifmul,	ST0,	ST6,	NOARG,	Pnone },
+	{ Ifmul,	ST0,	ST7,	NOARG,	Pnone },
+  	{ Ifcom,	ST0,	ST0,	NOARG,	Pnone },
+	{ Ifcom,	ST0,	ST1,	NOARG,	Pnone },
+	{ Ifcom,	ST0,	ST2,	NOARG,	Pnone },
+	{ Ifcom,	ST0,	ST3,	NOARG,	Pnone },
+	{ Ifcom,	ST0,	ST4,	NOARG,	Pnone },
+	{ Ifcom,	ST0,	ST5,	NOARG,	Pnone },
+	{ Ifcom,	ST0,	ST6,	NOARG,	Pnone },
+	{ Ifcom,	ST0,	ST7,	NOARG,	Pnone },
+	{ Ifcomp,	ST0,	ST0,	NOARG,	Pnone },
+	{ Ifcomp,	ST0,	ST1,	NOARG,	Pnone },
+	{ Ifcomp,	ST0,	ST2,	NOARG,	Pnone },
+	{ Ifcomp,	ST0,	ST3,	NOARG,	Pnone },
+	{ Ifcomp,	ST0,	ST4,	NOARG,	Pnone },
+	{ Ifcomp,	ST0,	ST5,	NOARG,	Pnone },
+	{ Ifcomp,	ST0,	ST6,	NOARG,	Pnone },
+	{ Ifcomp,	ST0,	ST7,	NOARG,	Pnone },
+	{ Ifsub,	ST0,	ST0,	NOARG,	Pnone },
+	{ Ifsub,	ST0,	ST1,	NOARG,	Pnone },
+	{ Ifsub,	ST0,	ST2,	NOARG,	Pnone },
+	{ Ifsub,	ST0,	ST3,	NOARG,	Pnone },
+	{ Ifsub,	ST0,	ST4,	NOARG,	Pnone },
+	{ Ifsub,	ST0,	ST5,	NOARG,	Pnone },
+	{ Ifsub,	ST0,	ST6,	NOARG,	Pnone },
+	{ Ifsub,	ST0,	ST7,	NOARG,	Pnone },
+	{ Ifsubr,	ST0,	ST0,	NOARG,	Pnone },
+	{ Ifsubr,	ST0,	ST1,	NOARG,	Pnone },
+	{ Ifsubr,	ST0,	ST2,	NOARG,	Pnone },
+	{ Ifsubr,	ST0,	ST3,	NOARG,	Pnone },
+	{ Ifsubr,	ST0,	ST4,	NOARG,	Pnone },
+	{ Ifsubr,	ST0,	ST5,	NOARG,	Pnone },
+	{ Ifsubr,	ST0,	ST6,	NOARG,	Pnone },
+	{ Ifsubr,	ST0,	ST7,	NOARG,	Pnone },
+	{ Ifdiv,	ST0,	ST0,	NOARG,	Pnone },
+	{ Ifdiv,	ST0,	ST1,	NOARG,	Pnone },
+	{ Ifdiv,	ST0,	ST2,	NOARG,	Pnone },
+	{ Ifdiv,	ST0,	ST3,	NOARG,	Pnone },
+	{ Ifdiv,	ST0,	ST4,	NOARG,	Pnone },
+	{ Ifdiv,	ST0,	ST5,	NOARG,	Pnone },
+	{ Ifdiv,	ST0,	ST6,	NOARG,	Pnone },
+	{ Ifdiv,	ST0,	ST7,	NOARG,	Pnone },
+	{ Ifdivr,	ST0,	ST0,	NOARG,	Pnone },
+	{ Ifdivr,	ST0,	ST1,	NOARG,	Pnone },
+	{ Ifdivr,	ST0,	ST2,	NOARG,	Pnone },
+	{ Ifdivr,	ST0,	ST3,	NOARG,	Pnone },
+	{ Ifdivr,	ST0,	ST4,	NOARG,	Pnone },
+	{ Ifdivr,	ST0,	ST5,	NOARG,	Pnone },
+	{ Ifdivr,	ST0,	ST6,	NOARG,	Pnone },
+	{ Ifdivr,	ST0,	ST7,	NOARG,	Pnone }
+};
+
+/* D9 Opcode Map */
+x86_TableEntry insntbl_x87_opD9[0x8*0x8] = {
+	{ Ifld,		ST0,	ST0,	NOARG,	Pnone },
+	{ Ifld,		ST0,	ST1,	NOARG,	Pnone },
+	{ Ifld,		ST0,	ST2,	NOARG,	Pnone },
+	{ Ifld,		ST0,	ST3,	NOARG,	Pnone },
+	{ Ifld,		ST0,	ST4,	NOARG,	Pnone },
+	{ Ifld,		ST0,	ST5,	NOARG,	Pnone },
+	{ Ifld,		ST0,	ST6,	NOARG,	Pnone },
+	{ Ifld,		ST0,	ST7,	NOARG,	Pnone },
+	{ Ifxch,	ST0,	ST0,	NOARG,	Pnone },
+	{ Ifxch,	ST0,	ST1,	NOARG,	Pnone },
+	{ Ifxch,	ST0,	ST2,	NOARG,	Pnone },
+	{ Ifxch,	ST0,	ST3,	NOARG,	Pnone },
+	{ Ifxch,	ST0,	ST4,	NOARG,	Pnone },
+	{ Ifxch,	ST0,	ST5,	NOARG,	Pnone },
+	{ Ifxch,	ST0,	ST6,	NOARG,	Pnone },
+	{ Ifxch,	ST0,	ST7,	NOARG,	Pnone },
+	{ Ifnop,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Inone,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Inone,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Inone,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Inone,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Inone,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Inone,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Inone,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Inone,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Ifchs,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Ifabs,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iftst,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Ifxam,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Ifld1,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Ifldl2t,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Ifldl2e,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Ifldlpi,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Ifldlg2,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Ifldln2,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Ifldz,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ If2xm1,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Ifyl2x,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Ifptan,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Ifpatan,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Ifpxtract,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Ifprem1,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Ifdecstp,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Ifncstp,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Ifprem,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Ifyl2xp1,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Ifsqrt,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Ifsincos,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Ifrndint,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Ifscale,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Ifsin,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Ifcos,	NOARG,	NOARG,	NOARG,	Pnone }
+};
+
+/* DA Opcode Map */
+x86_TableEntry insntbl_x87_opDA[0x8*0x8] = {
+	{ Ifcmovb,	ST0,	ST0,	NOARG,	Pnone },
+	{ Ifcmovb,	ST0,	ST1,	NOARG,	Pnone },
+	{ Ifcmovb,	ST0,	ST2,	NOARG,	Pnone },
+	{ Ifcmovb,	ST0,	ST3,	NOARG,	Pnone },
+	{ Ifcmovb,	ST0,	ST4,	NOARG,	Pnone },
+	{ Ifcmovb,	ST0,	ST5,	NOARG,	Pnone },
+	{ Ifcmovb,	ST0,	ST6,	NOARG,	Pnone },
+	{ Ifcmovb,	ST0,	ST7,	NOARG,	Pnone },
+	{ Ifcmove,	ST0,	ST0,	NOARG,	Pnone },
+	{ Ifcmove,	ST0,	ST1,	NOARG,	Pnone },
+	{ Ifcmove,	ST0,	ST2,	NOARG,	Pnone },
+	{ Ifcmove,	ST0,	ST3,	NOARG,	Pnone },
+	{ Ifcmove,	ST0,	ST4,	NOARG,	Pnone },
+	{ Ifcmove,	ST0,	ST5,	NOARG,	Pnone },
+	{ Ifcmove,	ST0,	ST6,	NOARG,	Pnone },
+	{ Ifcmove,	ST0,	ST7,	NOARG,	Pnone },
+	{ Ifcmovbe,	ST0,	ST0,	NOARG,	Pnone },
+	{ Ifcmovbe,	ST0,	ST1,	NOARG,	Pnone },
+	{ Ifcmovbe,	ST0,	ST2,	NOARG,	Pnone },
+	{ Ifcmovbe,	ST0,	ST3,	NOARG,	Pnone },
+	{ Ifcmovbe,	ST0,	ST4,	NOARG,	Pnone },
+	{ Ifcmovbe,	ST0,	ST5,	NOARG,	Pnone },
+	{ Ifcmovbe,	ST0,	ST6,	NOARG,	Pnone },
+	{ Ifcmovbe,	ST0,	ST7,	NOARG,	Pnone },
+	{ Ifcmovu,	ST0,	ST0,	NOARG,	Pnone },
+	{ Ifcmovu,	ST0,	ST1,	NOARG,	Pnone },
+	{ Ifcmovu,	ST0,	ST2,	NOARG,	Pnone },
+	{ Ifcmovu,	ST0,	ST3,	NOARG,	Pnone },
+	{ Ifcmovu,	ST0,	ST4,	NOARG,	Pnone },
+	{ Ifcmovu,	ST0,	ST5,	NOARG,	Pnone },
+	{ Ifcmovu,	ST0,	ST6,	NOARG,	Pnone },
+	{ Ifcmovu,	ST0,	ST7,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Ifucompp,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone }
+};
+
+/* DB Opcode Map */
+x86_TableEntry insntbl_x87_opDB[0x8*0x8] = {
+	{ Ifcmovnb,	ST0,	ST0,	NOARG,	Pnone },
+	{ Ifcmovnb,	ST0,	ST1,	NOARG,	Pnone },
+	{ Ifcmovnb,	ST0,	ST2,	NOARG,	Pnone },
+	{ Ifcmovnb,	ST0,	ST3,	NOARG,	Pnone },
+	{ Ifcmovnb,	ST0,	ST4,	NOARG,	Pnone },
+	{ Ifcmovnb,	ST0,	ST5,	NOARG,	Pnone },
+	{ Ifcmovnb,	ST0,	ST6,	NOARG,	Pnone },
+	{ Ifcmovnb,	ST0,	ST7,	NOARG,	Pnone },
+	{ Ifcmovne,	ST0,	ST0,	NOARG,	Pnone },
+	{ Ifcmovne,	ST0,	ST1,	NOARG,	Pnone },
+	{ Ifcmovne,	ST0,	ST2,	NOARG,	Pnone },
+	{ Ifcmovne,	ST0,	ST3,	NOARG,	Pnone },
+	{ Ifcmovne,	ST0,	ST4,	NOARG,	Pnone },
+	{ Ifcmovne,	ST0,	ST5,	NOARG,	Pnone },
+	{ Ifcmovne,	ST0,	ST6,	NOARG,	Pnone },
+	{ Ifcmovne,	ST0,	ST7,	NOARG,	Pnone },
+	{ Ifcmovnbe,	ST0,	ST0,	NOARG,	Pnone },
+	{ Ifcmovnbe,	ST0,	ST1,	NOARG,	Pnone },
+	{ Ifcmovnbe,	ST0,	ST2,	NOARG,	Pnone },
+	{ Ifcmovnbe,	ST0,	ST3,	NOARG,	Pnone },
+	{ Ifcmovnbe,	ST0,	ST4,	NOARG,	Pnone },
+	{ Ifcmovnbe,	ST0,	ST5,	NOARG,	Pnone },
+	{ Ifcmovnbe,	ST0,	ST6,	NOARG,	Pnone },
+	{ Ifcmovnbe,	ST0,	ST7,	NOARG,	Pnone },
+	{ Ifcmovnu,	ST0,	ST0,	NOARG,	Pnone },
+	{ Ifcmovnu,	ST0,	ST1,	NOARG,	Pnone },
+	{ Ifcmovnu,	ST0,	ST2,	NOARG,	Pnone },
+	{ Ifcmovnu,	ST0,	ST3,	NOARG,	Pnone },
+	{ Ifcmovnu,	ST0,	ST4,	NOARG,	Pnone },
+	{ Ifcmovnu,	ST0,	ST5,	NOARG,	Pnone },
+	{ Ifcmovnu,	ST0,	ST6,	NOARG,	Pnone },
+	{ Ifcmovnu,	ST0,	ST7,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Ifclex,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Ifinit,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Ifucomi,	ST0,	ST0,	NOARG,	Pnone },
+	{ Ifucomi,	ST0,	ST1,	NOARG,	Pnone },
+	{ Ifucomi,	ST0,	ST2,	NOARG,	Pnone },
+	{ Ifucomi,	ST0,	ST3,	NOARG,	Pnone },
+	{ Ifucomi,	ST0,	ST4,	NOARG,	Pnone },
+	{ Ifucomi,	ST0,	ST5,	NOARG,	Pnone },
+	{ Ifucomi,	ST0,	ST6,	NOARG,	Pnone },
+	{ Ifucomi,	ST0,	ST7,	NOARG,	Pnone },
+	{ Ifcomi,	ST0,	ST0,	NOARG,	Pnone },
+	{ Ifcomi,	ST0,	ST1,	NOARG,	Pnone },
+	{ Ifcomi,	ST0,	ST2,	NOARG,	Pnone },
+	{ Ifcomi,	ST0,	ST3,	NOARG,	Pnone },
+	{ Ifcomi,	ST0,	ST4,	NOARG,	Pnone },
+	{ Ifcomi,	ST0,	ST5,	NOARG,	Pnone },
+	{ Ifcomi,	ST0,	ST6,	NOARG,	Pnone },
+	{ Ifcomi,	ST0,	ST7,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone }
+};
+
+/* DC Opcode Map */
+x86_TableEntry insntbl_x87_opDC[0x8*0x8] = {
+	{ Ifadd,	ST0,	ST0,	NOARG,	Pnone },
+	{ Ifadd,	ST1,	ST0,	NOARG,	Pnone },
+	{ Ifadd,	ST2,	ST0,	NOARG,	Pnone },
+	{ Ifadd,	ST3,	ST0,	NOARG,	Pnone },
+	{ Ifadd,	ST4,	ST0,	NOARG,	Pnone },
+	{ Ifadd,	ST5,	ST0,	NOARG,	Pnone },
+	{ Ifadd,	ST6,	ST0,	NOARG,	Pnone },
+	{ Ifadd,	ST7,	ST0,	NOARG,	Pnone },
+	{ Ifmul,	ST0,	ST0,	NOARG,	Pnone },
+	{ Ifmul,	ST1,	ST0,	NOARG,	Pnone },
+	{ Ifmul,	ST2,	ST0,	NOARG,	Pnone },
+	{ Ifmul,	ST3,	ST0,	NOARG,	Pnone },
+	{ Ifmul,	ST4,	ST0,	NOARG,	Pnone },
+	{ Ifmul,	ST5,	ST0,	NOARG,	Pnone },
+	{ Ifmul,	ST6,	ST0,	NOARG,	Pnone },
+	{ Ifmul,	ST7,	ST0,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Ifsubr,	ST0,	ST0,	NOARG,	Pnone },
+	{ Ifsubr,	ST1,	ST0,	NOARG,	Pnone },
+	{ Ifsubr,	ST2,	ST0,	NOARG,	Pnone },
+	{ Ifsubr,	ST3,	ST0,	NOARG,	Pnone },
+	{ Ifsubr,	ST4,	ST0,	NOARG,	Pnone },
+	{ Ifsubr,	ST5,	ST0,	NOARG,	Pnone },
+	{ Ifsubr,	ST6,	ST0,	NOARG,	Pnone },
+	{ Ifsubr,	ST7,	ST0,	NOARG,	Pnone },
+	{ Ifsub,	ST0,	ST0,	NOARG,	Pnone },
+	{ Ifsub,	ST1,	ST0,	NOARG,	Pnone },
+	{ Ifsub,	ST2,	ST0,	NOARG,	Pnone },
+	{ Ifsub,	ST3,	ST0,	NOARG,	Pnone },
+	{ Ifsub,	ST4,	ST0,	NOARG,	Pnone },
+	{ Ifsub,	ST5,	ST0,	NOARG,	Pnone },
+	{ Ifsub,	ST6,	ST0,	NOARG,	Pnone },
+	{ Ifsub,	ST7,	ST0,	NOARG,	Pnone },
+	{ Ifdivr,	ST0,	ST0,	NOARG,	Pnone },
+	{ Ifdivr,	ST1,	ST0,	NOARG,	Pnone },
+	{ Ifdivr,	ST2,	ST0,	NOARG,	Pnone },
+	{ Ifdivr,	ST3,	ST0,	NOARG,	Pnone },
+	{ Ifdivr,	ST4,	ST0,	NOARG,	Pnone },
+	{ Ifdivr,	ST5,	ST0,	NOARG,	Pnone },
+	{ Ifdivr,	ST6,	ST0,	NOARG,	Pnone },
+	{ Ifdivr,	ST7,	ST0,	NOARG,	Pnone },
+	{ Ifdiv,	ST0,	ST0,	NOARG,	Pnone },
+	{ Ifdiv,	ST1,	ST0,	NOARG,	Pnone },
+	{ Ifdiv,	ST2,	ST0,	NOARG,	Pnone },
+	{ Ifdiv,	ST3,	ST0,	NOARG,	Pnone },
+	{ Ifdiv,	ST4,	ST0,	NOARG,	Pnone },
+	{ Ifdiv,	ST5,	ST0,	NOARG,	Pnone },
+	{ Ifdiv,	ST6,	ST0,	NOARG,	Pnone },
+	{ Ifdiv,	ST7,	ST0,	NOARG,	Pnone }
+};
+
+/* DD Opcode Map */
+x86_TableEntry insntbl_x87_opDD[0x8*0x8] = {
+	{ Iffree,	ST0,	NOARG,	NOARG,	Pnone },
+	{ Iffree,	ST1,	NOARG,	NOARG,	Pnone },
+	{ Iffree,	ST2,	NOARG,	NOARG,	Pnone },
+	{ Iffree,	ST3,	NOARG,	NOARG,	Pnone },
+	{ Iffree,	ST4,	NOARG,	NOARG,	Pnone },
+	{ Iffree,	ST5,	NOARG,	NOARG,	Pnone },
+	{ Iffree,	ST6,	NOARG,	NOARG,	Pnone },
+	{ Iffree,	ST7,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Ifst,		ST0,	NOARG,	NOARG,	Pnone },
+	{ Ifst,		ST1,	NOARG,	NOARG,	Pnone },
+	{ Ifst,		ST2,	NOARG,	NOARG,	Pnone },
+	{ Ifst,		ST3,	NOARG,	NOARG,	Pnone },
+	{ Ifst,		ST4,	NOARG,	NOARG,	Pnone },
+	{ Ifst,		ST5,	NOARG,	NOARG,	Pnone },
+	{ Ifst,		ST6,	NOARG,	NOARG,	Pnone },
+	{ Ifst,		ST7,	NOARG,	NOARG,	Pnone },
+	{ Ifstp,	ST0,	NOARG,	NOARG,	Pnone },
+	{ Ifstp,	ST1,	NOARG,	NOARG,	Pnone },
+	{ Ifstp,	ST2,	NOARG,	NOARG,	Pnone },
+	{ Ifstp,	ST3,	NOARG,	NOARG,	Pnone },
+	{ Ifstp,	ST4,	NOARG,	NOARG,	Pnone },
+	{ Ifstp,	ST5,	NOARG,	NOARG,	Pnone },
+	{ Ifstp,	ST6,	NOARG,	NOARG,	Pnone },
+	{ Ifstp,	ST7,	NOARG,	NOARG,	Pnone },
+	{ Ifucom,	ST0,	NOARG,	NOARG,	Pnone },
+	{ Ifucom,	ST1,	NOARG,	NOARG,	Pnone },
+	{ Ifucom,	ST2,	NOARG,	NOARG,	Pnone },
+	{ Ifucom,	ST3,	NOARG,	NOARG,	Pnone },
+	{ Ifucom,	ST4,	NOARG,	NOARG,	Pnone },
+	{ Ifucom,	ST5,	NOARG,	NOARG,	Pnone },
+	{ Ifucom,	ST6,	NOARG,	NOARG,	Pnone },
+	{ Ifucom,	ST7,	NOARG,	NOARG,	Pnone },
+	{ Ifucomp,	ST0,	NOARG,	NOARG,	Pnone },
+	{ Ifucomp,	ST1,	NOARG,	NOARG,	Pnone },
+	{ Ifucomp,	ST2,	NOARG,	NOARG,	Pnone },
+	{ Ifucomp,	ST3,	NOARG,	NOARG,	Pnone },
+	{ Ifucomp,	ST4,	NOARG,	NOARG,	Pnone },
+	{ Ifucomp,	ST5,	NOARG,	NOARG,	Pnone },
+	{ Ifucomp,	ST6,	NOARG,	NOARG,	Pnone },
+	{ Ifucomp,	ST7,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone }
+};
+
+/* DE Opcode Map */
+x86_TableEntry insntbl_x87_opDE[0x8*0x8] = {
+	{ Ifaddp,	ST0,	ST0,	NOARG,	Pnone },
+	{ Ifaddp,	ST1,	ST0,	NOARG,	Pnone },
+	{ Ifaddp,	ST2,	ST0,	NOARG,	Pnone },
+	{ Ifaddp,	ST3,	ST0,	NOARG,	Pnone },
+	{ Ifaddp,	ST4,	ST0,	NOARG,	Pnone },
+	{ Ifaddp,	ST5,	ST0,	NOARG,	Pnone },
+	{ Ifaddp,	ST6,	ST0,	NOARG,	Pnone },
+	{ Ifaddp,	ST7,	ST0,	NOARG,	Pnone },
+	{ Ifmulp,	ST0,	ST0,	NOARG,	Pnone },
+	{ Ifmulp,	ST1,	ST0,	NOARG,	Pnone },
+	{ Ifmulp,	ST2,	ST0,	NOARG,	Pnone },
+	{ Ifmulp,	ST3,	ST0,	NOARG,	Pnone },
+	{ Ifmulp,	ST4,	ST0,	NOARG,	Pnone },
+	{ Ifmulp,	ST5,	ST0,	NOARG,	Pnone },
+	{ Ifmulp,	ST6,	ST0,	NOARG,	Pnone },
+	{ Ifmulp,	ST7,	ST0,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Ifcompp,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Ifsubrp,	ST0,	ST0,	NOARG,	Pnone },
+	{ Ifsubrp,	ST1,	ST0,	NOARG,	Pnone },
+	{ Ifsubrp,	ST2,	ST0,	NOARG,	Pnone },
+	{ Ifsubrp,	ST3,	ST0,	NOARG,	Pnone },
+	{ Ifsubrp,	ST4,	ST0,	NOARG,	Pnone },
+	{ Ifsubrp,	ST5,	ST0,	NOARG,	Pnone },
+	{ Ifsubrp,	ST6,	ST0,	NOARG,	Pnone },
+	{ Ifsubrp,	ST7,	ST0,	NOARG,	Pnone },
+	{ Ifsubp,	ST0,	ST0,	NOARG,	Pnone },
+	{ Ifsubp,	ST1,	ST0,	NOARG,	Pnone },
+	{ Ifsubp,	ST2,	ST0,	NOARG,	Pnone },
+	{ Ifsubp,	ST3,	ST0,	NOARG,	Pnone },
+	{ Ifsubp,	ST4,	ST0,	NOARG,	Pnone },
+	{ Ifsubp,	ST5,	ST0,	NOARG,	Pnone },
+	{ Ifsubp,	ST6,	ST0,	NOARG,	Pnone },
+	{ Ifsubp,	ST7,	ST0,	NOARG,	Pnone },
+	{ Ifdivrp,	ST0,	ST0,	NOARG,	Pnone },
+	{ Ifdivrp,	ST1,	ST0,	NOARG,	Pnone },
+	{ Ifdivrp,	ST2,	ST0,	NOARG,	Pnone },
+	{ Ifdivrp,	ST3,	ST0,	NOARG,	Pnone },
+	{ Ifdivrp,	ST4,	ST0,	NOARG,	Pnone },
+	{ Ifdivrp,	ST5,	ST0,	NOARG,	Pnone },
+	{ Ifdivrp,	ST6,	ST0,	NOARG,	Pnone },
+	{ Ifdivrp,	ST7,	ST0,	NOARG,	Pnone },
+	{ Ifdivp,	ST0,	ST0,	NOARG,	Pnone },
+	{ Ifdivp,	ST1,	ST0,	NOARG,	Pnone },
+	{ Ifdivp,	ST2,	ST0,	NOARG,	Pnone },
+	{ Ifdivp,	ST3,	ST0,	NOARG,	Pnone },
+	{ Ifdivp,	ST4,	ST0,	NOARG,	Pnone },
+	{ Ifdivp,	ST5,	ST0,	NOARG,	Pnone },
+	{ Ifdivp,	ST6,	ST0,	NOARG,	Pnone },
+	{ Ifdivp,	ST7,	ST0,	NOARG,	Pnone }
+};
+
+/* DF Opcode Map */
+x86_TableEntry insntbl_x87_opDF[0x8*0x8] = {
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Ifstsw,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Ifucomip,	ST0,	ST0,	NOARG,	Pnone },
+	{ Ifucomip,	ST0,	ST1,	NOARG,	Pnone },
+	{ Ifucomip,	ST0,	ST2,	NOARG,	Pnone },
+	{ Ifucomip,	ST0,	ST3,	NOARG,	Pnone },
+	{ Ifucomip,	ST0,	ST4,	NOARG,	Pnone },
+	{ Ifucomip,	ST0,	ST5,	NOARG,	Pnone },
+	{ Ifucomip,	ST0,	ST6,	NOARG,	Pnone },
+	{ Ifucomip,	ST0,	ST7,	NOARG,	Pnone },
+	{ Ifcomip,	ST0,	ST0,	NOARG,	Pnone },
+	{ Ifcomip,	ST0,	ST1,	NOARG,	Pnone },
+	{ Ifcomip,	ST0,	ST2,	NOARG,	Pnone },
+	{ Ifcomip,	ST0,	ST3,	NOARG,	Pnone },
+	{ Ifcomip,	ST0,	ST4,	NOARG,	Pnone },
+	{ Ifcomip,	ST0,	ST5,	NOARG,	Pnone },
+	{ Ifcomip,	ST0,	ST6,	NOARG,	Pnone },
+	{ Ifcomip,	ST0,	ST7,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone },
+	{ Iinvalid,	NOARG,	NOARG,	NOARG,	Pnone }
+};
+
+/* AMD 3DNow! Instructions */
+x86_TableEntry insntbl_3DNow =
+	{ I3dnow,	P,	Q,	NOARG  };
+
+/* 3D Now instructions with suffix */
+unsigned X86Disas::Get3DNowInsnMnemonic(unsigned char suffix)
+{
+  switch(suffix) {
+	case 0x0C: return Ipi2fw;
+	case 0x0D: return Ipi2fd;
+	case 0x1C: return Ipf2iw;
+	case 0x1D: return Ipf2id;
+	case 0x8A: return Ipfnacc;
+	case 0x90: return Ipfcmpge;
+	case 0x94: return Ipfmin;
+	case 0x96: return Ipfrcp;
+	case 0x97: return Ipfrsqrt;
+	case 0x9A: return Ipfsub;
+	case 0x9E: return Ipfadd;
+	case 0xA0: return Ipfcmpgt;
+	case 0xA4: return Ipfmax;
+	case 0xA6: return Ipfrcpit1;
+	case 0xA7: return Ipfrsqit1;
+	case 0xAA: return Ipfsubr;
+	case 0xAE: return Ipfacc;
+	case 0xB0: return Ipfcmpeq;
+	case 0xB4: return Ipfmul;
+	case 0xB6: return Ipfrcpit2;
+	case 0xB7: return Ipmulhrw;
+	case 0xBB: return Ipswapd;
+	case 0xBF: return Ipavgusb;
+  }
+  return NULL;
+}
+
+x86_TableEntry *insntbl_x87_reg[] = {
+	insntbl_x87_opD8reg,
+	insntbl_x87_opD9reg,
+	insntbl_x87_opDAreg,
+	insntbl_x87_opDBreg,
+	insntbl_x87_opDCreg,
+	insntbl_x87_opDDreg,
+	insntbl_x87_opDEreg,
+	insntbl_x87_opDFreg
+};
+
+x86_TableEntry *insntbl_x87[] = {
+	insntbl_x87_opD8,
+	insntbl_x87_opD9,
+	insntbl_x87_opDA,
+	insntbl_x87_opDB,
+	insntbl_x87_opDC,
+	insntbl_x87_opDD,
+	insntbl_x87_opDE,
+	insntbl_x87_opDF
+};
+
+#define MODRM_REG(b) (((b)>>3) & 7)
+#define MODRM_NNN(b) (((b)>>3) & 7)
+#define MODRM_MOD(b) (((b)>>6) & 3)
+#define MODRM_RM(b)   ((b) &7)
+
+/* udis86_GetInsnEntry(...)
+   Searches the x86 opcode table for the instruction corresponding
+   to the opcode given by `*src'. The `*te' is pointed to the table
+   entry and the src pointer is returned.
+ */
+unsigned char *X86Disas::GetInsnEntry(unsigned char *src, x86_TableEntry **te) {
+  *te = NULL;
+  /* check for two byte opcodes (0x0F) */
+  if (0x0F == *src) {
+	/* move to next byte */
+	src++;
+	/* check instruct for prefix 0x66 */
+	if (G_opr_prfx) {
+		/* get table entry */
+		*te = &insntbl_2byte_prefix66[*src];
+		if ((*te)->mnm != Iinvalid)
+			G_opr_prfx = 0;
+		else	*te = NULL;
+	}
+	/* check for prefixe 0xF3 */
+	if ((*te) == NULL && G_rep_prfx) {
+		/* get table entry */
+		*te = &insntbl_2byte_prefixF3[*src];
+		if ((*te)->mnm != Iinvalid)
+			G_rep_prfx = 0;
+		else	*te = NULL;
+	}
+	/* check for prefixe 0xF2 */
+	if ((*te) == NULL && G_repne_prfx) {
+		/* get table entry */
+		*te = &insntbl_2byte_prefixF2[*src];
+		if ((*te)->mnm != Iinvalid)
+			G_repne_prfx = 0;
+		else	*te = NULL;
+	}
+	/* no prefix */
+	if ((*te) == NULL)	/* get table entry */
+		*te = &insntbl_2byte[*src];
+
+	/* check if the opcode points to a group */
+	if ((*te)->mnm == Igrp) {
+		switch (*src) {
+			/* group 6 */
+			case 0x00:
+				*te = &insntbl_group6_op0F00[MODRM_REG(*(src+1))];
+				break;
+			/* group 7 */
+			case 0x01:
+				*te = &insntbl_group7_op0F01[MODRM_REG(*(src+1))];
+				break;
+			/* group 8 */
+			case 0xBA:
+				*te = &insntbl_group8_op0FBA[MODRM_REG(*(src+1))];
+				break;
+			/* group 9 */
+			case 0xC7:
+				*te = &insntbl_group9_op0FC7[MODRM_REG(*(src+1))];
+				break;
+			/* group A */
+			case 0xB9:
+				*te = &insntbl_groupA_op0FB9[MODRM_REG(*(src+1))];
+				break;
+			/* group C */
+			case 0x71:
+				if (G_opr_prfx) {
+					*te = &insntbl_groupC_op0F71_prefix66[MODRM_REG(*(src+1))];
+					G_opr_prfx = 0;
+				}
+				else	*te = &insntbl_groupC_op0F71[MODRM_REG(*(src+1))];
+				break;
+			/* group D */
+			case 0x72:
+				if (G_opr_prfx) {
+					*te = &insntbl_groupD_op0F72_prefix66[MODRM_REG(*(src+1))];
+					G_opr_prfx = 0;
+				}
+				else	*te = &insntbl_groupD_op0F72[MODRM_REG(*(src+1))];
+				break;
+			/* group E */
+			case 0x73:
+				if (G_opr_prfx) {
+					*te = &insntbl_groupE_op0F73_prefix66[MODRM_REG(*(src+1))];
+					G_opr_prfx = 0;
+				}
+				else	*te = &insntbl_groupE_op0F73[MODRM_REG(*(src+1))];
+				break;
+			/* group F */
+			case 0xAE:
+				*te = &insntbl_groupF_op0FAE[MODRM_REG(*(src+1))];
+				break;
+		}
+	}
+	else
+	/* check if the opcode points to a group */
+	if ((*te)->mnm == I3dnow)
+		*te = &insntbl_3DNow;
+  }
+  /* else its a 1byte opcode */
+  else {
+	*te = &insntbl_1byte[*src];
+	/* check if the opcode points to a group */
+	if ((*te)->mnm == Igrp) {
+		switch(*src) {
+			/* group 1 */
+			case 0x80:
+				*te = &insntbl_group1_op80[MODRM_REG(*(src+1))];
+				break;
+			case 0x81:
+				*te = &insntbl_group1_op81[MODRM_REG(*(src+1))];
+				break;
+			case 0x82:
+				*te = &insntbl_group1_op82[MODRM_REG(*(src+1))];
+				break;
+			case 0x83:
+				*te = &insntbl_group1_op83[MODRM_REG(*(src+1))];
+				break;
+			case 0x8F:
+				*te = &insntbl_group1A_op8F[MODRM_REG(*(src+1))];
+				break;
+			/* group 2 */
+			case 0xC0:
+				*te = &insntbl_group2_opC0[MODRM_REG(*(src+1))];
+				break;
+			case 0xC1:
+				*te = &insntbl_group2_opC1[MODRM_REG(*(src+1))];
+				break;
+			/* group 11 */
+			case 0xC6:
+				*te = &insntbl_groupB_opC6[MODRM_REG(*(src+1))];
+				break;
+			case 0xC7:
+				*te = &insntbl_groupB_opC7[MODRM_REG(*(src+1))];
+				break;
+			case 0xD0:
+				*te = &insntbl_group2_opD0[MODRM_REG(*(src+1))];
+				break;
+			case 0xD1:
+				*te = &insntbl_group2_opD1[MODRM_REG(*(src+1))];
+				break;
+			case 0xD2:
+				*te = &insntbl_group2_opD2[MODRM_REG(*(src+1))];
+				break;
+			case 0xD3:
+				*te = &insntbl_group2_opD3[MODRM_REG(*(src+1))];
+				break;
+			/* group 3 */
+			case 0xF6:
+				*te = &insntbl_group3_opF6[MODRM_REG(*(src+1))];
+				break;
+			case 0xF7:
+				*te = &insntbl_group3_opF7[MODRM_REG(*(src+1))];
+				break;
+			/* group 4 */
+			case 0xFE:
+				*te = &insntbl_group4_opFE[MODRM_REG(*(src+1))];
+				break;
+			/* group 5 */
+			case 0xFF:
+				*te = &insntbl_group5_opFF[MODRM_REG(*(src+1))];
+				break;
+		}
+	}
+	else
+	/* check if the opcode points to an x87 instruction */
+	if ((*te)->mnm == Ix87) {
+		/* When the ModRM byte value falls within the range of
+		   0x00 - 0xBF, then the reg field selects the inst.
+		 */
+		if (*(src+1) <= 0xBF)
+			*te = &insntbl_x87_reg[(*src)-0xD8][MODRM_REG(*(src+1))];
+		else {
+			*te = &insntbl_x87[(*src)-0xD8][(*(src+1)) - 0xC0];
+			++src;
+		}
+	}
+  }
+
+  return src;
+}
diff --git a/uppsrc/x86disas/syntax.cpp b/uppsrc/x86disas/syntax.cpp
new file mode 100644
index 000000000..04bebd2ae
--- /dev/null
+++ b/uppsrc/x86disas/syntax.cpp
@@ -0,0 +1,566 @@
+/*
+ *  syntax.c - Ouput/syntax
+ *
+ *  Copyright (c) 2002,2003 Vivek Mohan <vivek@sig9.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 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 General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
+
+#include "X86Disas.h"
+
+#define DO(x) #x,
+
+char *mnemonics[] = {
+	#include "mnemonics.i"
+};
+
+#undef DO
+
+typedef signed char 	s8b ;
+typedef unsigned char 	u8b ;
+typedef signed short 	s16b;
+typedef unsigned short 	u16b;
+typedef signed long 	s32b;
+typedef unsigned long	u32b;
+
+struct OperandDecoderMap {
+    unsigned code;	/* operand code */
+    char    *scr;	/* script */
+};
+
+static unsigned char  n_scal[] = { 1, 2, 4, 8 };
+
+/* this structure defines the decoder script for a particular
+   ouput syntax.
+ */
+
+/* Decoder Script Directives (In Octal Number System)
+
+   \1  - verbatim print delimiter
+   \2  - print  8 bit sign extended offset
+   \3  - print 16 bit offset
+   \4  - print 32 bit offset
+   \5  - print rel offset
+   \6  - print seg override
+   \7  - print rel cast
+   \10 - print 64 bit offset
+   \12 - print 8bit imm
+   \13 - print 16bit imm
+   \14 - print 32bit imm
+
+   \20 - print SIB
+   \21 - print SID
+   \22 - print RSIB
+   \23 - print RSID
+
+   \26 - print ptr cast
+
+   \30 - print 16 bit segment of ptr32
+   \31 - print 16 bit offset of ptr32
+   \32 - print 16 bit segment of ptr48
+   \33 - print 32 bit offset of ptr48
+
+   \40 - print 16b offset
+   \41 - print 32b offset
+   \42 - print 64b offset
+
+   \50 - print lval
+
+   \60 - print operand cast
+   \61 - print jmp cast
+
+*/
+
+/* ---- INTEL Syntax ---- */
+
+/* The Intel Syntax Operand Decoder Map
+   WARNING -- Make sure the order of declaration is the same as
+   that of the enumeration of operand codes in x86.h
+ */
+static OperandDecoderMap odm[] = {
+  { M_BX_SI,		"\60\1[\1\6\1bx+si]\1" },
+  { M_BX_DI,		"\60\1[\1\6\1bx+di]\1" },
+  { M_BP_SI,		"\60\1[\1\6\1bp+si]\1" },
+  { M_BP_DI,		"\60\1[\1\6\1bp+di]\1" },
+  { M_SI,		"\60\1[\1\6\1si]\1" },
+  { M_DI,		"\60\1[\1\6\1di]\1" },
+  { M_OFF16,		"\60\1[\1\6\1\1\3\1]\1" },
+  { M_BX,		"\60\1[\1\6\1bx]\1" },
+  { M_BX_SI_OFF8,	"\60\1[\1\6\1bx+si\1\2\1]\1" },
+  { M_BX_DI_OFF8, 	"\60\1[\1\6\1bx+di\1\2\1]\1" },
+  { M_BP_SI_OFF8,	"\60\1[\1\6\1bp+si\1\2\1]\1" },
+  { M_BP_DI_OFF8,	"\60\1[\1\6\1bp+di\1\2\1]\1" },
+  { M_SI_OFF8, 		"\60\1[\1\6\1si\1\2\1]\1" },
+  { M_DI_OFF8, 		"\60\1[\1\6\1di\1\2\1]\1" },
+  { M_BP_OFF8, 		"\60\1[\1\6\1bp\1\2\1]\1" },
+  { M_BX_OFF8,		"\60\1[\1\6\1bx\1\2\1]\1" },
+  { M_BX_SI_OFF16, 	"\60\1[\1\6\1bx+si+\1\3\1]\1" },
+  { M_BX_DI_OFF16, 	"\60\1[\1\6\1bx+di+\1\3\1]\1" },
+  { M_BP_SI_OFF16, 	"\60\1[\1\6\1bp+si+\1\3\1]\1" },
+  { M_BP_DI_OFF16,	"\60\1[\1\6\1bp+di+\1\3\1]\1" },
+  { M_SI_OFF16, 	"\60\1[\1\6\1si+\1\3\1]\1" },
+  { M_DI_OFF16, 	"\60\1[\1\6\1di+\1\3\1]\1" },
+  { M_BP_OFF16, 	"\60\1[\1\6\1bp+\1\3\1]\1" },
+  { M_BX_OFF16,		"\60\1[\1\6\1bx+\1\3\1]\1" },
+  { M_EAX,		"\60\1[\1\6\1eax]\1" },
+  { M_ECX,		"\60\1[\1\6\1ecx]\1" },
+  { M_EDX,		"\60\1[\1\6\1edx]\1" },
+  { M_EBX,		"\60\1[\1\6\1ebx]\1" },
+  { M_SIB,		"\60\1[\1\6\020\1]\1" },
+  { M_OFF32,		"\60\1[\1\6\4\1]\1" },
+  { M_ESI, 		"\60\1[\1\6\1esi]\1" },
+  { M_EDI,		"\60\1[\1\6\1edi]\1" },
+  { M_EAX_OFF8, 	"\60\1[\1\6\1eax\1\2\1]\1" },
+  { M_ECX_OFF8, 	"\60\1[\1\6\1ecx\1\2\1]\1" },
+  { M_EDX_OFF8, 	"\60\1[\1\6\1edx\1\2\1]\1" },
+  { M_EBX_OFF8, 	"\60\1[\1\6\1ebx\1\2\1]\1" },
+  { M_SIB_OFF8,		"\60\1[\1\6\020\2\1]\1" },
+  { M_EBP_OFF8, 	"\60\1[\1\6\1ebp\1\2\1]\1" },
+  { M_ESI_OFF8, 	"\60\1[\1\6\1esi\1\2\1]\1" },
+  { M_EDI_OFF8, 	"\60\1[\1\6\1edi\1\2\1]\1" },
+  { M_EAX_OFF32, 	"\60\1[\1\6\1eax+\1\4\1]\1" },
+  { M_ECX_OFF32, 	"\60\1[\1\6\1ecx+\1\4\1]\1" },
+  { M_EDX_OFF32, 	"\60\1[\1\6\1edx+\1\4\1]\1" },
+  { M_EBX_OFF32, 	"\60\1[\1\6\1ebx+\1\4\1]\1" },
+  { M_SIB_OFF32,	"\60\1[\1\6\020\1+\1\4\1]\1" },
+  { M_EBP_OFF32, 	"\60\1[\1\6\1ebp+\1\4\1]\1" },
+  { M_ESI_OFF32, 	"\60\1[\1\6\1esi+\1\4\1]\1" },
+  { M_EDI_OFF32, 	"\60\1[\1\6\1edi+\1\4\1]\1" },
+  { M_SID,		"\60\1[\1\6\021\1+\1\4\1]\1" },
+  { M_RAX,		"\60\1[\1\6\1rax]\1" },
+  { M_RCX,		"\60\1[\1\6\1rcx]\1" },
+  { M_RDX,		"\60\1[\1\6\1rdx]\1" },
+  { M_RBX,		"\60\1[\1\6\1rbx]\1" },
+  { M_RSIB,		"\60\1[\1\6\022\1]\1" },
+  { M_ROFF32,		"\60\1[\1\6\4\1]\1" },
+  { M_RSI, 		"\60\1[\1\6\1rsi]\1" },
+  { M_RDI,		"\60\1[\1\6\1rdi]\1" },
+  { M_R8,		"\60\1[\1\6\1r8]\1" },
+  { M_R9,		"\60\1[\1\6\1r9]\1" },
+  { M_R10,		"\60\1[\1\6\1r10]\1" },
+  { M_R11,		"\60\1[\1\6\1r11]\1" },
+  { M_R12,		"\60\1[\1\6\1r12]\1" },
+  { M_R13,		"\60\1[\1\6\1r13]\1" },
+  { M_R14, 		"\60\1[\1\6\1r14]\1" },
+  { M_R15,		"\60\1[\1\6\1r15]\1" },
+  { M_RAX_OFF8, 	"\60\1[\1\6\1rax\1\2\1]\1" },
+  { M_RCX_OFF8, 	"\60\1[\1\6\1rcx\1\2\1]\1" },
+  { M_RDX_OFF8, 	"\60\1[\1\6\1rdx\1\2\1]\1" },
+  { M_RBX_OFF8, 	"\60\1[\1\6\1rbx\1\2\1]\1" },
+  { M_RSIB_OFF8,	"\60\1[\1\6\022\2\1]\1" },
+  { M_RBP_OFF8, 	"\60\1[\1\6\1rbp\1\2\1]\1" },
+  { M_RSI_OFF8, 	"\60\1[\1\6\1rsi\1\2\1]\1" },
+  { M_RDI_OFF8, 	"\60\1[\1\6\1rdi\1\2\1]\1" },
+  { M_R8_OFF8,		"\60\1[\1\6\1r8\1\2\1]\1" },
+  { M_R9_OFF8,		"\60\1[\1\6\1r9\1\2\1]\1" },
+  { M_R10_OFF8, 	"\60\1[\1\6\1r10\1\2\1]\1" },
+  { M_R11_OFF8, 	"\60\1[\1\6\1r11\1\2\1]\1" },
+  { M_R12_OFF8,		"\60\1[\1\6\1r12\1\2\1]\1" },
+  { M_R13_OFF8, 	"\60\1[\1\6\1r13\1\2\1]\1" },
+  { M_R14_OFF8, 	"\60\1[\1\6\1r14\1\2\1]\1" },
+  { M_R15_OFF8, 	"\60\1[\1\6\1r15\1\2\1]\1" },
+  { M_RAX_OFF32, 	"\60\1[\1\6\1rax+\1\4\1]\1" },
+  { M_RCX_OFF32, 	"\60\1[\1\6\1rcx+\1\4\1]\1" },
+  { M_RDX_OFF32, 	"\60\1[\1\6\1rdx+\1\4\1]\1" },
+  { M_RBX_OFF32, 	"\60\1[\1\6\1rbx+\1\4\1]\1" },
+  { M_SIB_OFF32,	"\60\1[\1\6\022\1+\1\4\1]\1" },
+  { M_RBP_OFF32, 	"\60\1[\1\6\1rbp+\1\4\1]\1" },
+  { M_RSI_OFF32, 	"\60\1[\1\6\1rsi+\1\4\1]\1" },
+  { M_RDI_OFF32, 	"\60\1[\1\6\1rdi+\1\4\1]\1" },
+  { M_R8_OFF32, 	"\60\1[\1\6\1r8+\1\4\1]\1" },
+  { M_R9_OFF32, 	"\60\1[\1\6\1r9+\1\4\1]\1" },
+  { M_R10_OFF32, 	"\60\1[\1\6\1r10+\1\4\1]\1" },
+  { M_R11_OFF32, 	"\60\1[\1\6\1r11+\1\4\1]\1" },
+  { M_R12_OFF32,	"\60\1[\1\6\1r12+\1\4\1]\1" },
+  { M_R13_OFF32, 	"\60\1[\1\6\1r13+\1\4\1]\1" },
+  { M_R14_OFF32, 	"\60\1[\1\6\1r14+\1\4\1]\1" },
+  { M_R15_OFF32, 	"\60\1[\1\6\1r15+\1\4\1]\1" },
+  { M_RSID,		"\60\1[\1\6\023\1+\1\4\1]\1" },
+  { OFFSET16,		"\1[\1\40\1]\1" },
+  { OFFSET32,		"\1[\1\41\1]\1" },
+  { OFFSET64,		"\1[\1\42\1]\1" },
+  { R_AL, 		"\1al\1" },
+  { R_CL, 		"\1cl\1" },
+  { R_DL, 		"\1dl\1" },
+  { R_BL, 		"\1bl\1" },
+  { R_AH, 		"\1ah\1" },
+  { R_CH, 		"\1ch\1" },
+  { R_DH, 		"\1dh\1" },
+  { R_BH, 		"\1bh\1" },
+  { R_SPL,		"\1spl\1"},
+  { R_BPL,		"\1bpl\1"},
+  { R_SIL,		"\1sil\1"},
+  { R_DIL,		"\1dil\1"},
+  { R_R8B,		"\1r8b\1"},
+  { R_R9B,		"\1r9b\1"},
+  { R_R10B,		"\1r10b\1"},
+  { R_R11B,		"\1r11b\1"},
+  { R_R12B,		"\1r12b\1"},
+  { R_R13B,		"\1r13b\1"},
+  { R_R14B,		"\1r14b\1"},
+  { R_R15B,		"\1r15b\1"},
+  { R_AX, 		"\1ax\1" },
+  { R_CX, 		"\1cx\1" },
+  { R_DX, 		"\1dx\1" },
+  { R_BX, 		"\1bx\1" },
+  { R_SP, 		"\1sp\1" },
+  { R_BP, 		"\1bp\1" },
+  { R_SI, 		"\1si\1" },
+  { R_DI, 		"\1di\1" },
+  { R_R8W,		"\1r8w\1"},
+  { R_R9W,		"\1r9w\1"},
+  { R_R10W,		"\1r10w\1"},
+  { R_R11W,		"\1r11w\1"},
+  { R_R12W,		"\1r12w\1"},
+  { R_R13W,		"\1r13w\1"},
+  { R_R14W,		"\1r14w\1"},
+  { R_R15W,		"\1r15w\1"},
+  { R_EAX, 		"\1eax\1"},
+  { R_ECX, 		"\1ecx\1"},
+  { R_EDX, 		"\1edx\1"},
+  { R_EBX, 		"\1ebx\1"},
+  { R_ESP, 		"\1esp\1"},
+  { R_EBP, 		"\1ebp\1"},
+  { R_ESI, 		"\1esi\1"},
+  { R_EDI, 		"\1edi\1"},
+  { R_R8D,		"\1r8d\1"},
+  { R_R9D,		"\1r9d\1"},
+  { R_R10D,		"\1r10d\1"},
+  { R_R11D,		"\1r11d\1"},
+  { R_R12D,		"\1r12d\1"},
+  { R_R13D,		"\1r13d\1"},
+  { R_R14D,		"\1r14d\1"},
+  { R_R15D,		"\1r15d\1"},
+  { R_RAX, 		"\1rax\1"},
+  { R_RCX, 		"\1rcx\1"},
+  { R_RDX, 		"\1rdx\1"},
+  { R_RBX, 		"\1rbx\1"},
+  { R_RSP, 		"\1rsp\1"},
+  { R_RBP, 		"\1rbp\1"},
+  { R_RSI, 		"\1rsi\1"},
+  { R_RDI, 		"\1rdi\1"},
+  { R_R8,		"\1r8\1"},
+  { R_R9,		"\1r9\1"},
+  { R_R10,		"\1r10\1"},
+  { R_R11,		"\1r11\1"},
+  { R_R12,		"\1r12\1"},
+  { R_R13,		"\1r13\1"},
+  { R_R14,		"\1r14\1"},
+  { R_R15,		"\1r15\1"},
+  { R_ES,		"\1es\1" },
+  { R_CS,		"\1cs\1" },
+  { R_SS,		"\1ss\1" },
+  { R_DS,		"\1ds\1" },
+  { R_FS,		"\1fs\1" },
+  { R_GS,		"\1gs\1" },
+  { R_CR0,		"\1cr0\1" },
+  { R_CR1,		"\1cr1\1" },
+  { R_CR2,		"\1cr2\1" },
+  { R_CR3,		"\1cr3\1" },
+  { R_CR4,		"\1cr4\1" },
+  { R_CR5_INV,		"\0" },
+  { R_CR6_INV,		"\0" },
+  { R_CR7_INV,		"\0" },
+  { R_DR0,		"\1dr0\1" },
+  { R_DR1,		"\1dr1\1" },
+  { R_DR2,		"\1dr2\1" },
+  { R_DR3,		"\1dr3\1" },
+  { R_DR4_INV,		"\0" },
+  { R_DR5_INV,		"\0" },
+  { R_DR6,		"\1dr6\1" },
+  { R_DR7,		"\1dr7\1" },
+  { R_MM0,		"\1mm0\1" },
+  { R_MM1,		"\1mm1\1" },
+  { R_MM2,		"\1mm2\1" },
+  { R_MM3,		"\1mm3\1" },
+  { R_MM4,		"\1mm4\1" },
+  { R_MM5,		"\1mm5\1" },
+  { R_MM6,		"\1mm6\1" },
+  { R_MM7,		"\1mm7\1" },
+  { R_ST0,		"\1st0\1" },
+  { R_ST1,		"\1st1\1" },
+  { R_ST2,		"\1st2\1" },
+  { R_ST3,		"\1st3\1" },
+  { R_ST4,		"\1st4\1" },
+  { R_ST5,		"\1st5\1" },
+  { R_ST6,		"\1st6\1" },
+  { R_ST7,		"\1st7\1" },
+  { R_XMM0,		"\1xmm0\1" },
+  { R_XMM1,		"\1xmm1\1" },
+  { R_XMM2,		"\1xmm2\1" },
+  { R_XMM3,		"\1xmm3\1" },
+  { R_XMM4,		"\1xmm4\1" },
+  { R_XMM5,		"\1xmm5\1" },
+  { R_XMM6,		"\1xmm6\1" },
+  { R_XMM7,		"\1xmm7\1" },
+  { R_XMM8,		"\1xmm8\1" },
+  { R_XMM9,		"\1xmm9\1" },
+  { R_XMM10,		"\1xmm10\1" },
+  { R_XMM11,		"\1xmm11\1" },
+  { R_XMM12,		"\1xmm12\1" },
+  { R_XMM13,		"\1xmm13\1" },
+  { R_XMM14,		"\1xmm14\1" },
+  { R_XMM15,		"\1xmm15\1" },
+  { I_BYTE, 		"\60\12"  },
+  { I_WORD,		"\60\13"  },
+  { I_DWRD,		"\60\14"  },
+  { J_IMM, 		"\60\5"	  },
+  { P_32,		"\60\30\1:\1\31" },
+  { P_48,		"\60\32\1:\1\33" },
+  { PRINT_I,		"\50"},
+};
+
+/* 64bit regs */
+static char *q_regs[] = {
+  "rax",  "rcx",  "rdx",  "rbx",  "rsp",  "rbp",  "rsi",  "rdi",
+  "r8", "r9", "r10", "r11", "r12", "r13", "r14", "r15"
+};
+
+/* 32bit regs */
+static char *d_regs[] = {
+  "eax",  "ecx",  "edx",  "ebx",  "esp",  "ebp",  "esi",  "edi",
+  "r8d", "r9d", "r10d", "r11d", "r12d", "r13d", "r14d", "r15d"
+};
+
+/* segment registers */
+static char *s_regs[] = {
+  "es", "cs",  "ss",  "ds",  "fs",  "gs"
+};
+
+/* Operand Cast */
+void X86Disas::print_opr_cast(unsigned char sz)
+{
+  if(cast) {
+	switch(sz) {
+		case SZ_sb:
+		case SZ_b : operands << Sprintf("byte " ); break;
+		case SZ_w : operands << Sprintf("word " ); break;
+		case SZ_d : operands << Sprintf("dword "); break;
+		case SZ_wp: operands << Sprintf("word far "); break;
+		case SZ_dp: operands << Sprintf("dword far "); break;
+		case SZ_q : operands << Sprintf("qword "); break;
+	}
+	cast--;
+  }
+}
+
+/* Relative offset cast */
+void X86Disas::print_rel_cast(unsigned char sz)
+{
+  switch(sz) {
+	case SZ_b: operands << Sprintf( "short "); break;
+	case SZ_w: operands << Sprintf( "near " ); break;
+	case SZ_d: operands << Sprintf( "dword "); break;
+    }
+}
+
+/* SIB */
+void X86Disas::print_sib(x86_Insn *ip, unsigned n)
+{
+  operands << Sprintf("%s+%s", d_regs[(ip->op[n].sib.base)], d_regs[(ip->op[n].sib.indx)]);
+  if (n_scal[ip->op[n].sib.scal] > 1)
+	operands << Sprintf( "*%d", n_scal[ip->op[n].sib.scal]);
+}
+
+/* SIB(64) */
+void X86Disas::print_rsib(x86_Insn *ip, unsigned n)
+{
+  operands << Sprintf("%s+%s", q_regs[(ip->op[n].sib.base)], q_regs[(ip->op[n].sib.indx)]);
+  if (n_scal[ip->op[n].sib.scal] > 1)
+	operands << Sprintf( "*%d", n_scal[ip->op[n].sib.scal]);
+}
+
+/* SI */
+void X86Disas::print_si(x86_Insn *ip, unsigned n)
+{
+  operands << Sprintf("%s*%d", d_regs[(ip->op[n].sib.indx)], n_scal[ip->op[n].sib.scal]);
+}
+
+/* SIB(64) */
+void X86Disas::print_rsi(x86_Insn *ip, unsigned n)
+{
+  operands << Sprintf("%s*%d", q_regs[(ip->op[n].sib.indx)], n_scal[ip->op[n].sib.scal]);
+}
+
+#define LVAL(c, lp)	( *( (c*)(lp) ) )
+#define PBW(sz, lp)			\
+  do {					\
+    unsigned _sz = sz;			\
+    for(; _sz >= 0; _sz -= 8);		\
+      operands << Sprintf("%x", *(u8b*)(lp+sz));	\
+  } while(0)
+
+/* operand script interpreter */
+void X86Disas::opscript(x86_Insn *ip, unsigned n, char *script)
+{
+  for (;*(script); ++script) {
+	switch (*script) {
+		case 01: /* verbatim print delimiter */
+			for (++script;*(script) != 01; ++script)
+				operands << Sprintf("%c", *script);
+			break;
+		case 02: /* print 8 bit offet (sign extended) */
+			if ( LVAL(s8b,ip->op[n].lvalp) < 0 )
+				operands << Sprintf("-0x%x", -1 * LVAL(s8b,ip->op[n].lvalp) );
+			else
+				operands << Sprintf("+0x%x",  LVAL(s8b,ip->op[n].lvalp) );
+			break;
+		case 03: /* print 16 bit offset */
+			operands << Sprintf("0x%x", LVAL(u16b,ip->op[n].lvalp) );
+			break;
+		case 04: /* print 32 bit offset */
+			operands << Sprintf("0x%lx", LVAL(u32b,ip->op[n].lvalp) );
+			break;
+		case 010:/* print 64 bit offset */
+			PBW(64, ip->op[n].lvalp);
+			break;
+		case 05:/* relative offset */
+			switch(ip->op[n].size) {
+				case SZ_jb:
+					operands << Sprintf("0x%lx",G_prg_ctr+LVAL(s8b,ip->op[n].lvalp));
+					break;
+				case SZ_jw:
+					operands << Sprintf("0x%lx",G_prg_ctr+LVAL(s16b,ip->op[n].lvalp));
+					break;
+				case SZ_jd:
+					operands << Sprintf("0x%lx",G_prg_ctr+LVAL(s32b,ip->op[n].lvalp));
+					break;
+				default :
+					operands << Sprintf(":%d", ip->op[n].size);
+			}
+			break;
+		case 06: /* print segment override */
+			if (ip->seg)
+				operands << Sprintf( "%s:", s_regs[(ip->seg)-R_ES]);
+			break;
+		case 07: /* relative cast */
+			print_rel_cast(ip->op[n].size);
+			break;
+		case 012: /* print 8bit imm */
+			if (ip->op[n].size == SZ_sb) {
+				if ( LVAL(s8b,ip->op[n].lvalp) < 0 )
+					operands << Sprintf("-0x%x", -1 * LVAL(s8b,ip->op[n].lvalp) );
+				else
+					operands << Sprintf("+0x%x",  LVAL(s8b,ip->op[n].lvalp) );
+			}
+			else	operands << Sprintf("0x%x", LVAL(u8b,ip->op[n].lvalp));
+			break;
+		case 013: /* print 16bit imm */
+			operands << Sprintf("0x%x",LVAL(u16b,ip->op[n].lvalp));
+			break;
+		case 014: /* print 32bit imm */
+			operands << Sprintf("0x%lx",LVAL(u32b,ip->op[n].lvalp));
+			break;
+		case 020: /* print sib */
+			print_sib(ip, n);
+			break;
+		case 021: /* print si */
+			print_si(ip, n);
+			break;
+		case 022: /* print rsib */
+			print_rsib(ip, n);
+			break;
+		case 023: /* print rsi */
+			print_rsi(ip, n);
+			break;
+		case 030: /* print 16 bit segment of ptr32 */
+			operands << Sprintf("0x%x", (u16b)(LVAL(u32b,ip->op[n].lvalp)>>16));
+			break;
+		case 031: /* print 16 bit offset of ptr32 */
+			operands << Sprintf("0x%x", (u16b)(LVAL(u32b,ip->op[n].lvalp)&0xFFFF));
+			break;
+		case 032: /* print 16 bit segment of ptr48 */
+			operands << Sprintf("0x%x", (u16b)(LVAL(u32b,ip->op[n].lvalp+4)));
+			break;
+		case 033: /* print 32 bit offset of ptr48 */
+			operands << Sprintf("0x%lx", LVAL(u32b,ip->op[n].lvalp));
+			break;
+		case 040: /* print offset 16b */
+			operands << Sprintf("0x%x",LVAL(u16b,ip->op[n].lvalp));
+			break;
+		case 041: /* print offset 32b */
+			operands << Sprintf("0x%lx",LVAL(u32b,ip->op[n].lvalp));
+			break;
+		case 042: /* print offset 64b */
+			PBW(64, ip->op[n].lvalp);
+			break;
+		case 050: /* print lval */
+			operands << Sprintf("0x%lx",ip->op[n].lval[0]);
+			break;
+		case 060: /* print operand cast */
+			print_opr_cast(ip->op[n].size);
+			break;
+	}
+  }
+}
+
+/* disasms the passed instruction pointer to intel syntax */
+void X86Disas::Disasm(x86_Insn *ip)
+{
+  cast = 1;
+  if (ip->op[0].size != ip->op[1].size && ip->op[2].type == -1)
+	cast = 2;
+  else
+  if ( ip->op[2].type != -1 && ((ip->op[0].size != ip->op[1].size) ||
+      (ip->op[1].size != ip->op[2].size) || (ip->op[0].size != ip->op[2].size)) )
+	cast = 2;
+
+  /* address mode override */
+  if (G_opr_prfx)
+	mnemonic << Sprintf( "o32 ");
+  /* operand mode override */
+  if (G_adr_prfx)
+	mnemonic << Sprintf( "a32 ");
+  /* lock prefix */
+  if (G_lock_prfx)
+	mnemonic << Sprintf( "lock ");
+  /* rep prefix */
+  if (G_rep_prfx)
+	mnemonic << Sprintf( "rep ");
+  /* repne prefix */
+  if (G_repne_prfx)
+	mnemonic << Sprintf( "repne ");
+
+  /* print the instruction mnemonic */
+  mnemonic << Sprintf("%s",mnemonics[ip->mnm]);
+
+  /* string operation suffix */
+  if (G_suff) {
+	switch(ip->op[0].size) {
+		case SZ_w : mnemonic << Sprintf("w"); break;
+		case SZ_d : mnemonic << Sprintf("d"); break;
+		case SZ_q : mnemonic << Sprintf("q"); break;
+	}
+  }
+
+  /* space between insn menmonic and operands */
+  mnemonic << Sprintf(" ");
+
+  /* operand 1 */
+  if (ip->op[0].type != -1) {
+	opscript(ip,0, odm[ip->op[0].type].scr);
+	/* operand 2 */
+	if (ip->op[1].type != -1) {
+		operands << Sprintf(", ");
+		opscript(ip, 1, odm[ip->op[1].type].scr);
+		/* operand 3 */
+		if (ip->op[2].type != -1) {
+			operands << Sprintf(", ");
+			opscript(ip, 2, odm[ip->op[2].type].scr);
+		}
+	}
+  }
+}
diff --git a/uppsrc/x86disas/x86.cpp b/uppsrc/x86disas/x86.cpp
new file mode 100644
index 000000000..9164c828a
--- /dev/null
+++ b/uppsrc/x86disas/x86.cpp
@@ -0,0 +1,852 @@
+/*
+ *  x86.c - x86 Decoder Functions
+ *
+ *  Copyright (c) 2002,2003 Vivek Mohan <vivek@sig9.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 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 General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
+
+#include "x86disas.h"
+
+/* the max nr of prefixes */
+#define MAX_PREFIXES	15
+
+/* register types */
+#define T_NONE	0
+#define T_GPR	1
+#define T_MMX	2
+#define T_CRG	3
+#define T_DBG	4
+#define T_SEG	5
+#define T_XMM	6
+
+/* REX, bit manip */
+#define REX_W(r) ((0xF & (r))  >> 3)
+#define REX_R(r) ((0x7 & (r))  >> 2)
+#define REX_X(r) ((0x3 & (r))  >> 1)
+#define REX_B(r) ((0x1 & (r))  >> 0)
+#define REX_MASK(n) (0xF & (n >> 16))
+
+/* SIB, bit manip */
+#define SIB_S(b) ((b) >> 6)
+#define SIB_I(b) (((b) >> 3) & 7)
+#define SIB_B(b) ((b)  & 7)
+
+/* MODRM, bit manip */
+#define MODRM_REG(b) (((b)>>3) & 7)
+#define MODRM_NNN(b) (((b)>>3) & 7)
+#define MODRM_MOD(b) (((b)>>6) & 3)
+#define MODRM_RM(b)   ((b) &7)
+
+#define DEF64(n) (((n) >> 3) & 1)
+#define INV64(n) (((n) >> 4) & 1)
+#define SUFF(n) (((n) >> 5) & 1)
+#define O32(n) (((n) >> 1) & 1)
+#define A32(n) ((n) & 1)
+
+/* literal values */
+#define LVAL8(lvalp, src)  do { lvalp = src; src++;    } while(0)
+#define LVAL16(lvalp, src) do { lvalp = src; src += 2; } while(0)
+#define LVAL32(lvalp, src) do { lvalp = src; src += 4; } while(0)
+#define LVAL64(lvalp, src) do { lvalp = src; src += 8; } while(0)
+
+/* ResolveOpSize(..)
+   resolves the size of operand depending on the current
+   disassembly mode and the prefixes.
+ */
+unsigned char X86Disas::ResolveOpSize(unsigned char sz)
+{
+  if (sz == SZ_vw && G_dis_mode == 64)
+	return (G_opr_prfx) ? SZ_w : SZ_q;
+  else
+  if (sz == SZ_v  && G_dis_mode == 64) {
+	if (REX_W(G_rex))
+		return SZ_q;
+	else	return (G_opr_prfx) ? SZ_w : SZ_d;
+  }
+  else if (sz == SZ_v || sz == SZ_vw || sz == SZ_z)
+	return (G_opr_mode == 16) ? SZ_w : SZ_d;
+  else if (sz == SZ_p)
+	return (G_opr_mode == 16) ? SZ_wp : SZ_dp;
+  else return sz;
+}
+
+/* DecodeA(..)
+   Decodes operands of the type seg:offset
+ */
+unsigned char* X86Disas::DecodeA( unsigned char sz, unsigned char *src, x86_InsnOperand *op)
+{
+  /* seg16:off16 */
+  if (G_opr_mode == 16) {
+	op->type = P_32;
+	op->size = SZ_w;
+	op->lvalp= src;
+	src += 4;	/* 32 bits */
+  }
+  /* seg16:off32 */
+  else {
+	op->type = P_48;
+	op->size = SZ_d;
+	op->lvalp= src;
+	src += 6;	/* 16 : 32 = 48 bits */
+  }
+  return src;
+}
+
+/* returns decoded GPR */
+unsigned int X86Disas::DecodeGPR(unsigned char sz, unsigned char rm)
+{
+  /* Mode dependent, operand prefix independent, size
+     specifier: SZ_m. In 64 bits mode, the GPR is 64bits
+     in all other cases its 32 bits.
+   */
+  if (sz == SZ_m)
+	return (G_dis_mode == 64) ? R_RAX + rm : R_EAX + rm;
+
+  /* byte sized operand, in 64 bit mode. In this mode, 16 different
+     8 bit registers can be chosen.
+   */
+  if (sz == SZ_b && G_dis_mode == 64) {
+	/* is it > bl ? if so, then the next register will
+	   be sil instead of ah (in 64 bits)
+	*/
+	if (rm >= 4)
+		return R_SPL + (rm-4);
+	else return R_AL + rm;
+  }
+  else if (sz == SZ_b)
+	return R_AL + rm;
+
+  /* word/dword/qword sized operands, in 64 bit mode. In this mode,
+     16 different 16 bit registers can be chosen.
+  */
+  else if ((sz == SZ_x || sz == SZ_v) && G_dis_mode == 64) {
+	/* if REX.W is specified then select a quad register */
+	if (REX_W(G_rex))
+		return R_RAX + rm;
+	/* in 64 bit mode, 0x66 means a 16 bit register */
+	else if (G_opr_prfx)
+		return R_AX  + rm;
+	/* default, 32 bit register */
+	else	return R_EAX + rm;
+  }
+  else if ((sz == SZ_d || sz == SZ_x) || (sz == SZ_v && G_opr_mode == 32))
+	/* if mode is 32its then select 32bit registers */
+	return R_EAX + rm;
+  else if ((sz == SZ_w) || (sz == SZ_v && G_opr_mode == 16))
+	/* if mode is 16bits then select 16bit registers */
+	return R_AX + rm;
+  else	return 0;
+}
+
+/* ResolveGPR64 (...)
+   Resolves any ambiguity in register(including 64bit) selection.
+ */
+unsigned int X86Disas::ResolveGPR64 (unsigned int gpr_op)
+{
+  /* in 64, the defualt register is 32bits, but if a REX
+     prefix is specified, then it its a 64 bits register
+   */
+  if (G_dis_mode == 64) {
+
+	/* extensible 64 bit gprs */
+	if (gpr_op >= OP_rAXr8 && gpr_op <= OP_rDIr15)
+		gpr_op = gpr_op | (REX_B(G_rex) << 3);
+
+	/* is it a default 64 bit instruction ? */
+	if (G_def_64)
+		return (gpr_op-OP_rAX) + R_RAX;
+	else
+	/* is W bit of REX = 1 ? */
+	if (REX_W(G_rex))
+		/* its a 64 bits reg */
+		return (gpr_op-OP_rAX) + R_RAX;
+	else
+	if (G_opr_prfx)
+		/* if prefixed by 0x66 */
+		return (gpr_op-OP_rAX) + R_AX;
+		/* else, its a 32 bits reg */
+	else	return (gpr_op-OP_rAX) + R_EAX;
+  }
+  else 	{
+  	/* is operand mode 16 ? */
+	if (G_opr_mode == 16) {
+		/* extensible 64 bit gprs */
+		if (gpr_op >= OP_rAXr8 && gpr_op <= OP_rDIr15)
+			return (gpr_op-OP_rAXr8) + R_AX;
+		/* if so, return a 16 bit reg */
+		return (gpr_op-OP_rAX) + R_AX;
+	}
+		/* else, return a 32 bit reg */
+	else {
+		/* extensible 64 bit gprs */
+		if (gpr_op >= OP_rAXr8 && gpr_op <= OP_rDIr15)
+			return (gpr_op-OP_rAXr8) + R_EAX;
+		return (gpr_op-OP_rAX) + R_EAX;
+	}
+ }
+}
+
+/* ResolveGPR32 (...)
+   Resolves any ambiguity in register(excluding 64bit) selection.
+ */
+unsigned int X86Disas::ResolveGPR32 (unsigned int gpr_op)
+{
+  /* in 64, the defualt register is 32bits, but if a REX
+     prefix is specified, then it its a 64 bits register
+   */
+  if (G_dis_mode == 64) {
+	if (G_opr_prfx)
+		/* if prefixed by 0x66 */
+		return (gpr_op-OP_eAX) + R_AX;
+		/* else, its a 32 bits reg */
+	else	return (gpr_op-OP_eAX) + R_EAX;
+  }
+  else 	{
+  	/* is operand mode 16 ? */
+	if (G_opr_mode == 16)
+		/* if so, return a 16 bit reg */
+		return (gpr_op-OP_eAX) + R_AX;
+		/* else, return a 32 bit reg */
+	else	return (gpr_op-OP_eAX) + R_EAX;
+ }
+}
+
+/* ResolveReg(...)
+   Auxiliary function for Resolving the register type
+   and returning the corresponding reg vaue.
+ */
+unsigned int X86Disas::ResolveReg(unsigned type, unsigned rm) {
+  switch (type) {
+	case T_MMX :	/* mmx register */
+		return R_MM0 + rm;
+	case T_XMM :	/*xmm register */
+		return R_XMM0 + rm;
+	case T_CRG :	/* control register */
+		return R_CR0 + rm;
+	case T_DBG :	/* debug register */
+		return R_DR0 + rm;
+	case T_NONE:
+	default:
+		return 0;
+  }
+}
+
+
+/* DecodeImm(...)
+   Decodes Immediate values
+ */
+unsigned char* X86Disas::DecodeImm(unsigned char sz, unsigned char *src, x86_InsnOperand *op)
+{
+  /* byte sized immediate */
+  if (sz == SZ_b || sz == SZ_sb) {
+	op->type = I_BYTE;
+	LVAL8(op->lvalp, src);
+  }
+
+  /* if disassembler mode is 64 bits, then a 0x66 prefix means
+     a 16 bit immediate value for SZ_v */
+  if(sz == SZ_z && G_dis_mode == 64) {
+	/* if prefixed by 0x66, then a 16bit immediate */
+	if (G_opr_prfx) {
+		op->type = I_WORD;
+		LVAL16(op->lvalp, src);
+	}
+	/* else its dword */
+	else {
+		op->type = I_DWRD;
+		LVAL32(op->lvalp, src);
+	}
+  }
+  else /* if SZ_w or in 16bits operand mode */
+  if (sz == SZ_w || (sz == SZ_z && G_opr_mode == 16)) {
+	op->type = I_WORD;
+	LVAL16(op->lvalp, src);
+  }
+  else /* if SZ_d or in 32bits operand mode */
+  /*if (sz == SZ_d || (sz == SZ_z && G_opr_mode == 32))*/ {
+	op->type = I_DWRD;
+	LVAL32(op->lvalp, src);
+  }
+
+  /* get size of operand */
+  op->size = ResolveOpSize(sz);
+  return src;
+}
+
+/* DecodeModRM(...)
+   Decodes ModRM
+ */
+unsigned char* X86Disas::DecodeModRM(
+	unsigned char *src,	/* source */
+	x86_InsnOperand *op,	/* ptr to instruction operand struct */
+	unsigned char sz,	/* operand sz */
+	unsigned char rm_type,	/* the type of operand specified by rm, if mod = 11b */
+	x86_InsnOperand *opreg,	/* ptr to instruction operand struct for reg operand */
+	unsigned char reg_sz,	/* the size of operand specified by reg */
+	unsigned char reg_type	/* the type of operand specified by reg */
+	)
+{
+  /* get mod, r/m and reg fields */
+  unsigned char mod = MODRM_MOD(*src);
+  unsigned char rm  = (REX_B(G_rex) << 3) | MODRM_RM(*src);
+  unsigned char reg = (REX_R(G_rex) << 3) | MODRM_REG(*src);
+
+  /* move to next byte in source */
+  ++src;
+
+  /* if mod is 11b, then the r_m field specifies a general
+     purpose register or mmx/sse/control/debug register
+   */
+  if (mod == 3) {
+	if (rm_type == 	T_GPR)	/* general purpose register */
+		op->type = DecodeGPR(sz, rm);
+	else	op->type = ResolveReg(rm_type, rm);
+  }
+  else {
+	/* if in 64 bit mode, only 32/64 bit reg addressing is allowed. */
+	if (G_dis_mode == 64)	{
+		/* if the lower 3 bits of rm = 4 then the next byte is an
+		   SIB byte */
+		if ((rm & 7) == 4) {
+			op->type = (mod * 8) + M_RAX + rm;
+			op->sib.scal = SIB_S(*src);
+			op->sib.indx = SIB_I(*src) + REX_X(G_rex);
+			op->sib.base = SIB_B(*src) + REX_B(G_rex);
+			/* if lower 3 bits of base = 5, then its scale * index */
+			if ((op->sib.base & 7) == 5 && op->type == M_RSIB)
+				op->type = M_RSID;
+			++src;
+		}
+		else
+		/* An address size prefix denotes the use of 32 bit registers */
+		if (G_adr_prfx)
+			op->type = (mod * 8) + M_EAX + rm;
+		/* By default its 64 bit registers */
+		else	op->type = (mod * 16) + M_RAX + rm;
+	} else {
+		/* 16 bit addressing */
+		if (G_adr_mode == 16) {
+			op->type = (mod * 8) + M_BX_SI + rm;
+		}
+		/* 32 bit addressing */
+		else {
+			op->type = (mod * 8) + M_EAX + rm;
+			/* if the lower 3 bits of rm = 4 then the next byte is an
+			   SIB byte */
+			if (rm == 4) {
+				op->sib.scal = SIB_S(*src);
+				op->sib.indx = SIB_I(*src);
+				op->sib.base = SIB_B(*src);
+				/* if lower 3 bits of base = 5, then its scale * index */
+				if (op->sib.base == 5 && op->type == M_SIB)
+					op->type = M_SID;
+				++src;
+			}
+		}
+	}
+  }
+
+  /* 8 bit displacements */
+  if ((M_BX_SI_OFF8 <= op->type && op->type <= M_BX_OFF8) ||
+      (M_EAX_OFF8 <= op->type && op->type <= M_EDI_OFF8)  ||
+      (M_RAX_OFF8 <= op->type && op->type <= M_R15_OFF8) )
+	LVAL8(op->lvalp, src);
+  else
+  /* 16 bit displacements */
+  if ((M_BX_SI_OFF16 <= op->type && op->type <= M_BX_OFF16) ||
+      (M_OFF16 == op->type) )
+	LVAL16(op->lvalp, src);
+  else
+  /* 32 bit displacements */
+  if ((M_EAX_OFF32 <= op->type && op->type <= M_EDI_OFF32) ||
+      (M_RAX_OFF32 <= op->type && op->type <= M_R15_OFF32) ||
+      (M_OFF32 == op->type) ||
+      (M_SID   == op->type) ||
+      (M_RSID  == op->type) )
+	LVAL32(op->lvalp, src);
+
+  if (opreg) {
+	/* resolve register encoded in reg field */
+	if (reg_type == T_GPR) /* general purpose register */
+		opreg->type = DecodeGPR(reg_sz, reg);
+	else	opreg->type = ResolveReg(reg_type, reg);
+  }
+
+  /* determine the operand sizes */
+  op->size = ResolveOpSize(sz);
+  if (opreg) opreg->size = ResolveOpSize(reg_sz);
+
+  return src;
+}
+
+/* DecodeO(..)
+   Decodes offset
+ */
+unsigned char* X86Disas::DecodeO( unsigned char sz, unsigned char *src, x86_InsnOperand *op)
+{
+  /* In 64bits mode */
+  if (G_dis_mode == 64) {
+	/* if 0x67, the offest is 32bits long */
+	if (G_adr_prfx) {
+		LVAL32(op->lvalp, src);
+		op->type = OFFSET32;
+
+	}
+	/* else its 64bits long */
+	else {
+		LVAL64(op->lvalp, src);
+		op->type = OFFSET64;
+	}
+  }
+  else
+  /* if the addressing mode is 16bits, so is offset */
+  if (G_adr_mode == 16) {
+	LVAL16(op->lvalp, src);
+	op->type = OFFSET16;
+  }
+  /* if the addressing mode is 32bits, so is offset */
+  else {
+	LVAL32(op->lvalp, src);
+	op->type = OFFSET32;
+  }
+
+  op->size = ResolveOpSize(sz);
+  return src;
+}
+
+
+/*
+ DisasmOperands(...)
+  Arguments
+  	src  -> source buffer ptr
+  	ip   -> instruction pointer
+  	insn -> instruction table entry pointer
+
+*/
+unsigned char* X86Disas::DisasmOperands( unsigned char *src, x86_Insn *ip, x86_TableEntry *insn)
+{
+
+/* Some macros for clarity of code */
+/* TE_OP - Table Entry, Operand Types*/
+#define TE_OP1T insn->op1[0]
+#define TE_OP2T insn->op2[0]
+#define TE_OP3T insn->op3[0]
+#define TE_OP1S insn->op1[1]
+#define TE_OP2S insn->op2[1]
+#define TE_OP3S insn->op3[1]
+/* DI_OP - Disassembled Instruction Pointer, Operand */
+#define DI_OP1  ip->op[0]
+#define DI_OP2  ip->op[1]
+#define DI_OP3  ip->op[2]
+#define DI_OP1T ip->op[0].type
+#define DI_OP2T ip->op[1].type
+#define DI_OP3T ip->op[2].type
+#define DI_OP1S ip->op[0].size
+#define DI_OP2S ip->op[1].size
+#define DI_OP3S ip->op[2].size
+
+  switch(TE_OP1T) {
+	case OP_A :
+		src = DecodeA(TE_OP1S, src, &(DI_OP1));
+		break;
+	/* M[b] */
+	case OP_M :
+		if (MODRM_RM(*src) == 3)
+			G_err = 1;
+	/* E, G/P/V/I/CL/1 */
+	case OP_E :
+		if (TE_OP2T == OP_G)	/* E, G */
+			src = DecodeModRM(src, &(DI_OP1), TE_OP1S, T_GPR, &(DI_OP2), TE_OP2S, T_GPR);
+		else
+		if (TE_OP2T == OP_P)	/* E, P */
+			src = DecodeModRM(src, &(DI_OP1), TE_OP1S, T_GPR, &(DI_OP2), TE_OP2S, T_MMX);
+		else
+		if (TE_OP2T == OP_V)	/* E, V */
+			src = DecodeModRM(src, &(DI_OP1), TE_OP1S, T_GPR, &(DI_OP2), TE_OP2S, T_XMM);
+		else {	/* E */
+			src = DecodeModRM(src, &(DI_OP1), TE_OP1S, T_GPR, NULL, 0, T_NONE);
+			if (TE_OP2T == OP_CL) {	/* E, CL */
+				DI_OP2T = R_CL;
+				DI_OP2S = SZ_b;
+			}
+			else
+			if (TE_OP2T == OP_I1) {	/* E, 1 */
+				DI_OP2T = PRINT_I;
+				G_temp = 1;
+				DI_OP2.lvalp = (unsigned char*) (&G_temp);
+			}
+			else
+			if (TE_OP2T == OP_I)	/* E, I */
+				src = DecodeImm(TE_OP2S, src, &(DI_OP2));
+		}
+		break;
+
+	/* G, E/PR[,I]/VR */
+	case OP_G :
+		if (TE_OP2T == OP_E)	/* G, E */
+			src = DecodeModRM(src, &(DI_OP2), TE_OP2S, T_GPR, &(DI_OP1), TE_OP1S, T_GPR);
+		else
+		if (TE_OP2T == OP_PR) {	/* G, PR */
+			/* the mod field ought to be zero */
+			if (MODRM_RM(*src) != 3)
+				G_err = 1;
+			src = DecodeModRM(src, &(DI_OP2), TE_OP2S, T_MMX, &(DI_OP1), TE_OP1S, T_GPR);
+			if (TE_OP3T == OP_I) /* G, PR, I */
+				src = DecodeImm(TE_OP3S, src, &(DI_OP3));
+		}
+		else
+		if (TE_OP2T == OP_VR) {	/* G, VR */
+			/* the mod field ought to be zero */
+			if (MODRM_RM(*src) != 3)
+				G_err = 1;
+			src = DecodeModRM(src, &(DI_OP2), TE_OP2S, T_XMM, &(DI_OP1), TE_OP1S, T_GPR);
+		}
+		break;
+
+	/* AL..BH, I/O/DX] */
+	case OP_AL : case OP_CL : case OP_DL : case OP_BL :
+	case OP_AH : case OP_CH : case OP_DH : case OP_BH :
+		DI_OP1T = R_AL + (TE_OP1T - OP_AL);
+		DI_OP1S = SZ_b;
+		if (TE_OP2T == OP_I)	/* AL..BH, Ib */
+			src = DecodeImm(TE_OP2S, src, &(DI_OP2));
+		else
+		if (TE_OP2T == OP_DX)	/* AL..BH, DX */
+			DI_OP2T = R_DX;
+		else
+		if (TE_OP2T == OP_O)	/* AL..BH, O */
+			src = DecodeO(TE_OP2S, src, &(DI_OP2));
+		break;
+
+	/* rAX[r8]..rDI[r15], I/rAX..rDI/O */
+	case OP_rAXr8 : case OP_rCXr9 : case OP_rDXr10 : case OP_rBXr11 :
+	case OP_rSPr12: case OP_rBPr13: case OP_rSIr14 : case OP_rDIr15 :
+	case OP_rAX : case OP_rCX : case OP_rDX : case OP_rBX :
+	case OP_rSP : case OP_rBP : case OP_rSI : case OP_rDI :
+		DI_OP1T = ResolveGPR64(TE_OP1T);
+		if (TE_OP2T == OP_I)	/* rAX[r8]..rDI[r15], I */
+			src = DecodeImm(TE_OP2S, src, &(DI_OP2));
+		else	/* rAX[r8]..rDI[r15], rAX..rDI */
+		if (TE_OP2T >= OP_rAX && TE_OP2T <= OP_rDI)
+			DI_OP2T = ResolveGPR64(TE_OP2T);
+		else
+		if (TE_OP2T == OP_O)	/* rAX[r8]..rDI[r15], O */
+			src = DecodeO( insn->op2[1], src, &(DI_OP2));
+		break;
+
+	/* AL[r8b]..BH[r15b], I */
+	case OP_ALr8b : case OP_CLr9b : case OP_DLr10b : case OP_BLr11b :
+	case OP_AHr12b: case OP_CHr13b: case OP_DHr14b : case OP_BHr15b :
+	{
+		unsigned long gpr = TE_OP1T;
+		/* extensible 8 bit gprs */
+		if (TE_OP1T >= OP_ALr8b && TE_OP1T <= OP_BHr15b)
+			gpr = gpr | (REX_B(G_rex) << 3);
+		DI_OP1T = (gpr - OP_AL) + R_AL;
+		if (TE_OP2T == OP_I)	/* AL[r8b]..BH[r15b], I */
+			src = DecodeImm(TE_OP2S, src, &(DI_OP2));
+		break;
+	}
+
+	/* eAX..eDX, DX/I */
+	case OP_eAX : case OP_eCX : case OP_eDX : case OP_eBX :
+	case OP_eSP : case OP_eBP : case OP_eSI : case OP_eDI :
+		DI_OP1T = ResolveGPR32(TE_OP1T);
+		if (TE_OP2T == OP_DX)	/* eAX..eDX, DX */
+			DI_OP2T = R_DX;
+		else
+		if (TE_OP2T == OP_I)	/* eAX..eDX, I */
+			src = DecodeImm(TE_OP2S, src, &(DI_OP2));
+		break;
+
+	/* ES..GS */
+	case OP_ES : case OP_CS : case OP_DS :
+	case OP_SS : case OP_FS : case OP_GS :
+		/* in 64bits mode, only fs and gs are allowed */
+		if (G_dis_mode == 64)
+			if (TE_OP1T != OP_FS && TE_OP1T != OP_GS)
+				G_err = 1;
+		DI_OP1T = (TE_OP1T - OP_ES) + R_ES;
+		break;
+
+	/* J */
+	case OP_J :
+		src =  DecodeImm( TE_OP1S, src, &(DI_OP1));
+		DI_OP1T = J_IMM;
+		switch(DI_OP1S) {
+			case SZ_b : DI_OP1S = SZ_jb; break;
+			case SZ_w : DI_OP1S = SZ_jw; break;
+			case SZ_d : DI_OP1S = SZ_jd; break;
+		}
+		break ;
+
+	/* P, Q/W/E[,I] */
+	case OP_P :
+		if (TE_OP2T == OP_Q)	/* P, Q */
+			src = DecodeModRM (src, &(DI_OP2), TE_OP2S, T_MMX, &(DI_OP1), TE_OP1S, T_MMX);
+		else
+		if (TE_OP2T == OP_W)	/* P, W */
+			src = DecodeModRM(src, &(DI_OP2), TE_OP2S, T_XMM, &(DI_OP1), TE_OP1S, T_MMX);
+		else
+		if (TE_OP2T == OP_E) {	/* P, E */
+			src = DecodeModRM(src, &(DI_OP2), TE_OP2S, T_GPR, &(DI_OP1), TE_OP1S, T_MMX);
+			if (TE_OP3T == OP_I)	/* P, E, I */
+				src = DecodeImm(TE_OP3S, src, &(DI_OP3));
+		}
+		break;
+
+	/* R, C/D */
+	case OP_R :
+		if (TE_OP2T == OP_C)	/* R, C */
+			src = DecodeModRM(src, &(DI_OP1), TE_OP1S, T_GPR, &(DI_OP2), TE_OP2S, T_CRG);
+		else
+		if (TE_OP2T == OP_D)	/* R, D */
+			src = DecodeModRM(src, &(DI_OP1), TE_OP1S, T_GPR, &(DI_OP2), TE_OP2S, T_DBG);
+		break;
+
+	/* C, R */
+	case OP_C :
+		src = DecodeModRM (src, &(DI_OP2), TE_OP2S, T_GPR, &(DI_OP1), TE_OP1S, T_CRG);
+		break;
+
+	/* D, R */
+	case OP_D :
+		src = DecodeModRM (src, &(DI_OP2), TE_OP2S, T_GPR, &(DI_OP1), TE_OP1S, T_DBG);
+		break;
+
+	/* Q, P */
+	case OP_Q :
+		src = DecodeModRM (src, &(DI_OP1), TE_OP1S, T_MMX, &(DI_OP2), TE_OP2S, T_MMX);
+		break;
+
+	/* W, V */
+	case OP_W :
+		src = DecodeModRM (src, &(DI_OP1), TE_OP1S, T_XMM, &(DI_OP2), TE_OP2S, T_XMM);
+		break;
+
+	/* V, W[,I]/Q */
+	case OP_V :
+		if (TE_OP2T == OP_W) {	/* V, W */
+			src = DecodeModRM (src, &(DI_OP2), TE_OP2S, T_XMM, &(DI_OP1), TE_OP1S, T_XMM);
+			if (TE_OP3T == OP_I)	/* V, W, I */
+				src = DecodeImm(TE_OP3S, src, &(DI_OP3));
+		}
+		else
+		if (TE_OP2T == OP_Q)	/* V, Q */
+			src = DecodeModRM (src, &(DI_OP2), TE_OP2S, T_MMX, &(DI_OP1), TE_OP1S, T_XMM);
+		break;
+
+	/* DX, eAX/AL */
+	case OP_DX :
+		DI_OP1T = R_DX;
+		if (TE_OP2T == OP_eAX)	/* DX, eAX */
+			DI_OP2T = ResolveGPR32(TE_OP2T);
+		else
+		if (TE_OP2T == OP_AL)	/* DX, AL */
+			DI_OP2T = R_AL;
+		break;
+
+	/* I, I/AL/eAX */
+	case OP_I :
+		src = DecodeImm( TE_OP1S, src, &(DI_OP1));
+		if (TE_OP2T == OP_I)	/* I, I */
+			src = DecodeImm( TE_OP2S, src, &(DI_OP2));
+		else
+		if (TE_OP2T == OP_AL)	/* I, AL */
+			DI_OP2T = R_AL;
+		else
+		if (TE_OP2T == OP_eAX)	/* I, eAX */
+			DI_OP2T = ResolveGPR32(TE_OP2T);
+		break;
+
+	/* O, AL/eAX */
+	case OP_O :
+		src = DecodeO(TE_OP1S, src, &(DI_OP1));
+		if (TE_OP2T == OP_AL)	/* O, AL */
+			DI_OP2T = R_AL;
+		else
+		if (TE_OP2T == OP_eAX)	/* O, eAX */
+			DI_OP2T = ResolveGPR32(TE_OP2T);
+		break;
+
+	/* 3 */
+	case OP_I3 :
+		DI_OP2T = PRINT_I;
+		G_temp = 3;
+		DI_OP2.lvalp = (unsigned char*)(&G_temp);
+		break;
+	case OP_ST0 : case OP_ST1 : case OP_ST2 : case OP_ST3 :
+	case OP_ST4 : case OP_ST5 : case OP_ST6 : case OP_ST7 :
+		DI_OP1T = (TE_OP1T-OP_ST0)  + R_ST0;
+		if (TE_OP2T >= OP_ST0 && TE_OP2T <= OP_ST7)
+			DI_OP2T = (TE_OP2T-OP_ST0) + R_ST0;
+		break;
+
+	/* none */
+	default :
+		DI_OP1T = DI_OP2T =
+		DI_OP3T = -1;
+  }
+  return src;
+
+/* undefine macros, their services are no
+   longer required
+ */
+#undef TE_OP1T
+#undef TE_OP2T
+#undef TE_OP3T
+#undef TE_OP1S
+#undef TE_OP2S
+#undef TE_OP3S
+#undef DI_OP1
+#undef DI_OP2
+#undef DI_OP3
+#undef DI_OP1T
+#undef DI_OP2T
+#undef DI_OP3T
+#undef DI_OP1S
+#undef DI_OP2S
+#undef DI_OP3S
+
+}
+
+/* clear instruction pointer */
+void X86Disas::Clear(x86_Insn *ip)
+{
+  ip->mnm         = 0;
+  ip->seg         = 0;
+  ip->a32         = 0;
+  ip->o32         = 0;
+  ip->op[0].size  = 0;
+  ip->op[1].size  = 0;
+  ip->op[2].size  = 0;
+  ip->op[0].type  = (-1);
+  ip->op[1].type  = (-1);
+  ip->op[2].type  = (-1);
+  G_rex           = 0;
+  G_rep_prfx	  = 0;
+  G_repne_prfx	  = 0;
+  G_lock_prfx	  = 0;
+  G_opr_prfx	  = 0;
+  G_adr_prfx	  = 0;
+  G_err           = 0;
+  G_suff          = 0;
+}
+
+/* x86_DisasmInsn(...)  */
+unsigned char* X86Disas::DisasmInsn (unsigned char *src, x86_Insn *ip)
+{
+  /* save the value of the ptr.. so tat we can calculate the number of
+     bytes diassembled in the end.
+   */
+  unsigned char *srcref = src;
+  unsigned char  prfxflag = 0;
+  unsigned i;
+  /* ptr to instruction in table */
+  x86_TableEntry *insn = NULL;
+  /* initialize instruction pointer (ip) */
+  Clear(ip);
+  /* search for prefixes */
+  for (i =0; prfxflag == 0; ++i) {
+	if (0x40 <= *src && *src <= 0x4F) {
+		if (G_dis_mode == 64) {
+			G_rex = *src;
+			++src;
+		}
+		else prfxflag = 1;
+	}
+	else switch(*src) {
+		case 0x2E : ip->seg = R_CS; src++; break;
+		case 0x36 : ip->seg = R_SS; src++; break;
+		case 0x3E : ip->seg = R_DS; src++; break;
+		case 0x26 : ip->seg = R_ES; src++; break;
+		case 0x64 : ip->seg = R_FS; src++; break;
+		case 0x65 : ip->seg = R_GS; src++; break;
+		case 0x66 : G_opr_prfx  = 0x66; src++ ; break ;
+		case 0x67 : G_adr_prfx  = 0x67; src++ ; break ;
+		case 0xF0 : G_lock_prfx = 0xF0; src++ ; break;
+		case 0xF2 : G_repne_prfx= 0xF2; src++ ; break;
+		case 0xF3 : G_rep_prfx  = 0xF3; src++ ; break;
+		default :  prfxflag = 1;
+	}
+	/* if > MAX_PREFIXES, disintegrate */
+	if (i >= MAX_PREFIXES) {
+		G_err = 1;
+		break;	/* break from loop */
+	}
+  }
+  /* search map for instruction */
+  src = GetInsnEntry(src, &insn);
+  /* assign instruction mnemonic code */
+  ip->mnm = insn->mnm;
+  /* if invalid set error */
+  if (ip->mnm == Iinvalid) G_err = 1;
+
+  /* PREFIXES */
+  G_rex = G_rex & REX_MASK(insn->prfx);		/* rex */
+  G_def_64 = DEF64(insn->prfx);			/* set the default 64 flag */
+  G_suff = SUFF(insn->prfx);			/* set the suffix flag */
+  /* check if the instruction is invalid in 64 bits mode */
+  if (G_dis_mode == 64 && INV64(insn->prfx))
+	G_err = 1;
+  /* set operand mode */
+  if (G_opr_prfx) {
+	if (G_dis_mode == 64)
+		G_opr_mode = 16;
+	else	G_opr_mode = (G_opr_mode == 32)	? 16 : 32 ;
+  }
+  /* set address mode */
+  if (G_adr_prfx) {
+	if (G_dis_mode == 64)
+		G_adr_mode = 16;
+	else	G_adr_mode = (G_adr_mode == 32)	? 16 : 32 ;
+  }
+  /* increment source value */
+  ++src;
+  /* disassemble operands */
+  src = DisasmOperands(src, ip, insn);
+
+  /* get suffix size */
+  if (G_suff)
+	ip->op[0].size = ResolveOpSize(SZ_v);
+  /* check if o32 prefix was used */
+  if (O32(insn->prfx) && G_opr_prfx)
+  	G_opr_prfx = 0;
+  /* check if a32 prefix was used */
+  if (A32(insn->prfx) && G_adr_prfx)
+  	G_adr_prfx = 0;
+  /* if its a 3dnow! instruction, get mnemonic code based
+     on the suffix */
+  if (ip->mnm == I3dnow) {
+	ip->mnm = Get3DNowInsnMnemonic(*src);
+	++src;
+  }
+  /* check for G_err */
+  if (G_err) {
+	Clear(ip);
+	/* init as define byte */
+	ip->mnm = Idb;
+	ip->op[0].type = I_BYTE;
+	ip->op[0].size = 0;
+	/* the first byte as operand */
+	ip->op[0].lvalp = srcref;
+	src = srcref + 1;
+  }
+  /* increase program counter */
+  G_prg_ctr += (unsigned long)((src)-(srcref));
+  return src;
+}
diff --git a/uppsrc/x86disas/x86disas.cpp b/uppsrc/x86disas/x86disas.cpp
new file mode 100644
index 000000000..0cecc7b55
--- /dev/null
+++ b/uppsrc/x86disas/x86disas.cpp
@@ -0,0 +1,28 @@
+#include "x86disas.h"
+
+X86Disas::X86Disas(dword ip, byte *data)
+{
+	G_dis_mode = 32;	/* disassembly mode, (16/32/64) */
+	G_opr_mode = 32;	/* operand mode, (16/32) */
+	G_adr_mode = 32;	/* address mode, (16/32) */
+	G_opr_prfx =  0;	/* 0x66 prefix flag */
+	G_adr_prfx =  0;	/* 0x67 prefix flag */
+	G_lock_prfx=  0;	/* 0xF0 (lock) prefix flag */
+	G_rep_prfx =  0;	/* 0xF3 (rep) prefix flag */
+	G_repe_prfx=  0;	/* 0xF3 (repe) prefix flag */
+	G_repne_prfx= 0;	/* 0xF2 (repne) prefix flag */
+	G_prg_ctr  =  0;	/* program counter */
+	G_err      =  0;	/* disassembly abort flag */
+	G_rex      =  0;	/* REX prefix for 64bit mode */
+	G_suff	   =  0;  /* instruction suffix flag */
+	G_def_64   =  0;	/* default mode 64 flag */
+	G_temp	   =  0;  /* a temp global var */
+
+	G_prg_ctr = ip;
+
+	x86_Insn ins;
+	DisasmInsn(data, &ins);
+	size = G_prg_ctr - ip;
+	Disasm(&ins);
+	iscall = ins.mnm == Icall;
+}
diff --git a/uppsrc/x86disas/x86disas.h b/uppsrc/x86disas/x86disas.h
new file mode 100644
index 000000000..f3b640f5d
--- /dev/null
+++ b/uppsrc/x86disas/x86disas.h
@@ -0,0 +1,239 @@
+#ifndef _x86disas_x86disas_h
+#define _x86disas_x86disas_h
+
+#include <Core/Core.h>
+
+/*
+ *  x86.c - x86 Decoder Functions
+ *
+ *  Copyright (c) 2002,2003 Vivek Mohan <vivek@sig9.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 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 General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
+
+struct x86_TableEntry {
+	unsigned int  mnm;	/* instruction mnemonic code */
+	unsigned char op1[2];	/* operand 1, code/sz */
+	unsigned char op2[2];	/* operand 2, code/sz */
+	unsigned char op3[2];	/* operand 3, code/sz */
+	unsigned int  prfx;	/* allowed prefixes   */
+};
+
+enum {
+	OP_NONE,
+	OP_A,
+	OP_E,
+	OP_M,
+	OP_G,
+	OP_I,
+	OP_AL, OP_CL, OP_DL, OP_BL, OP_AH, OP_CH, OP_DH, OP_BH,
+	OP_ALr8b, OP_CLr9b, OP_DLr10b, OP_BLr11b, OP_AHr12b, OP_CHr13b, OP_DHr14b, OP_BHr15b,
+	OP_AX, OP_CX, OP_DX, OP_BX, OP_SI, OP_DI, OP_SP, OP_BP,
+	OP_rAX, OP_rCX, OP_rDX, OP_rBX, OP_rSP, OP_rBP, OP_rSI, OP_rDI,
+	OP_rAXr8, OP_rCXr9, OP_rDXr10, OP_rBXr11, OP_rSPr12, OP_rBPr13, OP_rSIr14, OP_rDIr15,
+	OP_eAX, OP_eCX, OP_eDX, OP_eBX, OP_eSI, OP_eDI, OP_eSP, OP_eBP,
+	OP_ES, OP_CS, OP_DS, OP_SS, OP_FS, OP_GS,
+	OP_ST0, OP_ST1, OP_ST2, OP_ST3, OP_ST4, OP_ST5, OP_ST6, OP_ST7,
+	OP_J,
+	OP_S,
+	OP_O,
+	OP_I1, OP_I3,
+	OP_V,
+	OP_W,
+	OP_Q,
+	OP_P,
+	OP_R,
+	OP_C,
+	OP_D,
+	OP_VR,
+	OP_PR
+};
+
+/* operand sizes enumerated */
+
+enum {
+	SZ_b = 1, SZ_w, SZ_z, SZ_v, SZ_vw, SZ_d, SZ_q, SZ_p, SZ_wp, SZ_dp, SZ_sb,
+	SZ_jb, SZ_jw, SZ_jd, SZ_x, SZ_m
+};
+
+/* WARNING - Make sure the order of enumeration is same as order
+   of operand script declarations in syntax.c
+ */
+
+enum {
+
+ /* 16 bit addressing modes */
+ M_BX_SI = 0, M_BX_DI, M_BP_SI, M_BP_DI, M_SI, M_DI, M_OFF16, M_BX,
+ M_BX_SI_OFF8, M_BX_DI_OFF8, M_BP_SI_OFF8, M_BP_DI_OFF8,
+ M_SI_OFF8, M_DI_OFF8, M_BP_OFF8, M_BX_OFF8,
+ M_BX_SI_OFF16, M_BX_DI_OFF16, M_BP_SI_OFF16, M_BP_DI_OFF16,
+ M_SI_OFF16, M_DI_OFF16, M_BP_OFF16, M_BX_OFF16,
+
+ /* 32 bit addressing modes */
+ M_EAX, M_ECX, M_EDX, M_EBX, M_SIB, M_OFF32, M_ESI, M_EDI,
+ M_EAX_OFF8, M_ECX_OFF8, M_EDX_OFF8, M_EBX_OFF8, M_SIB_OFF8,
+ M_EBP_OFF8, M_ESI_OFF8, M_EDI_OFF8,
+ M_EAX_OFF32, M_ECX_OFF32, M_EDX_OFF32, M_EBX_OFF32, M_SIB_OFF32,
+ M_EBP_OFF32, M_ESI_OFF32, M_EDI_OFF32,
+ M_SID,
+
+ /* (amd)64 bit addressing modes */
+ M_RAX, M_RCX, M_RDX, M_RBX, M_RSIB, M_ROFF32, M_RSI, M_RDI,
+ M_R8, M_R9, M_R10, M_R11, M_R12, M_R13, M_R14, M_R15,
+ M_RAX_OFF8, M_RCX_OFF8, M_RDX_OFF8, M_RBX_OFF8, M_RSIB_OFF8,
+ M_RBP_OFF8, M_RSI_OFF8, M_RDI_OFF8,
+ M_R8_OFF8, M_R9_OFF8, M_R10_OFF8, M_R11_OFF8, M_R12_OFF8,
+ M_R13_OFF8, M_R14_OFF8, M_R15_OFF8,
+ M_RAX_OFF32, M_RCX_OFF32, M_RDX_OFF32, M_RBX_OFF32, M_RSIB_OFF32,
+ M_RBP_OFF32, M_RSI_OFF32, M_RDI_OFF32,
+ M_R8_OFF32, M_R9_OFF32, M_R10_OFF32, M_R11_OFF32, M_R12_OFF32,
+ M_R13_OFF32, M_R14_OFF32, M_R15_OFF32,
+ M_RSID,
+
+ /* mem offset */
+ OFFSET16, OFFSET32, OFFSET64,
+
+ /* 8 bit GPRs */
+ R_AL, R_CL, R_DL, R_BL, R_AH, R_CH, R_DH, R_BH, R_SPL, R_BPL, R_SIL, R_DIL,
+ R_R8B, R_R9B, R_R10B, R_R11B, R_R12B, R_R13B, R_R14B, R_R15B,
+ /* 16 bit GPRs */
+ R_AX, R_CX, R_DX, R_BX, R_SP, R_BP, R_SI, R_DI,
+ R_R8W, R_R9W, R_R10W, R_R11W, R_R12W, R_R13W, R_R14W, R_R15W,
+ /* 32 bit GPRs */
+ R_EAX, R_ECX, R_EDX, R_EBX, R_ESP, R_EBP, R_ESI, R_EDI,
+ R_R8D, R_R9D, R_R10D, R_R11D, R_R12D, R_R13D, R_R14D, R_R15D,
+ /* 64 bit GPRs */
+ R_RAX, R_RCX, R_RDX, R_RBX, R_RSP, R_RBP, R_RSI, R_RDI,
+ R_R8, R_R9, R_R10, R_R11, R_R12, R_R13, R_R14, R_R15,
+
+ /* segment registers */
+ R_ES, R_CS, R_SS, R_DS, R_FS, R_GS,
+ /* control registers*/
+ R_CR0, R_CR1, R_CR2, R_CR3, R_CR4, R_CR5_INV, R_CR6_INV, R_CR7_INV,
+ /* debug registers */
+ R_DR0, R_DR1, R_DR2, R_DR3, R_DR4_INV, R_DR5_INV, R_DR6, R_DR7,
+ /* mmx registers */
+ R_MM0, R_MM1, R_MM2, R_MM3, R_MM4, R_MM5, R_MM6, R_MM7,
+ /* x87 registers */
+ R_ST0, R_ST1, R_ST2, R_ST3, R_ST4, R_ST5, R_ST6, R_ST7,
+ /* extended multimedia registers */
+ R_XMM0, R_XMM1, R_XMM2, R_XMM3, R_XMM4, R_XMM5, R_XMM6, R_XMM7,
+ R_XMM8, R_XMM9, R_XMM10, R_XMM11, R_XMM12, R_XMM13, R_XMM14, R_XMM15,
+
+ I_BYTE, I_WORD, I_DWRD,
+ J_IMM,
+ P_32, P_48,
+ PRINT_I,
+ STRING
+};
+
+extern char *mnemonics[];
+
+#define DO(x)      I##x,
+
+enum {
+#include "mnemonics.i"
+};
+
+#undef DO
+
+class X86Disas {
+	struct x86_InsnOperand {
+		unsigned char size;		/* operand size */
+		signed type;			/* operand type */
+		unsigned char *lvalp;
+		unsigned long lval[2];		/* literal values */
+		struct	{			/* SIB decoded */
+			unsigned char base;	/* - Base  */
+			unsigned char indx;	/* - Index */
+			unsigned char scal;	/* - Scale */
+		} sib;
+	};
+
+	typedef struct x86_Insn {
+		unsigned mnm;		/* the mnemonic code */
+		unsigned char seg;	/* segment override */
+		unsigned char a32;	/* address 32 prefix */
+		unsigned char o32;	/* operand 32 prefix */
+		x86_InsnOperand op[3];	/* 3 operands for instruction */
+	};
+
+	/* operand types enumerated */
+
+	unsigned char G_dis_mode;	/* disassembly mode, (16/32/64) */
+	unsigned char G_opr_mode;	/* operand mode, (16/32) */
+	unsigned char G_adr_mode;	/* address mode, (16/32) */
+	unsigned char G_opr_prfx;	/* 0x66 prefix flag */
+	unsigned char G_adr_prfx;	/* 0x67 prefix flag */
+	unsigned char G_lock_prfx;	/* 0xF0 (lock) prefix flag */
+	unsigned char G_rep_prfx;	/* 0xF3 (rep) prefix flag */
+	unsigned char G_repe_prfx;	/* 0xF3 (repe) prefix flag */
+	unsigned char G_repne_prfx;	/* 0xF2 (repne) prefix flag */
+	unsigned long G_prg_ctr;	/* program counter */
+	unsigned char G_err;	/* disassembly abort flag */
+	unsigned char G_rex;	/* REX prefix for 64bit mode */
+	unsigned char G_suff;  /* instruction suffix flag */
+	unsigned char G_def_64;	/* default mode 64 flag */
+	unsigned long G_temp;  /* a temp global var */
+
+	// from opcmap.cpp
+	unsigned       Get3DNowInsnMnemonic(unsigned char suffix);
+	unsigned char *GetInsnEntry(unsigned char *src, x86_TableEntry **te);
+
+	// from x86.cpp
+	unsigned char  ResolveOpSize(unsigned char sz);
+	unsigned char* DecodeA( unsigned char sz, unsigned char *src, x86_InsnOperand *op);
+	unsigned int   DecodeGPR(unsigned char sz, unsigned char rm);
+	unsigned int   ResolveGPR64 (unsigned int gpr_op);
+	unsigned int   ResolveGPR32 (unsigned int gpr_op);
+	unsigned int   ResolveReg(unsigned type, unsigned rm);
+	unsigned char* DecodeO( unsigned char sz, unsigned char *src, x86_InsnOperand *op);
+	unsigned char* DecodeImm(unsigned char sz, unsigned char *src, x86_InsnOperand *op);
+	unsigned char* DecodeModRM(
+		unsigned char *src,	/* source */
+		x86_InsnOperand *op,	/* ptr to instruction operand struct */
+		unsigned char sz,	/* operand sz */
+		unsigned char rm_type,	/* the type of operand specified by rm, if mod = 11b */
+		x86_InsnOperand *opreg,	/* ptr to instruction operand struct for reg operand */
+		unsigned char reg_sz,	/* the size of operand specified by reg */
+		unsigned char reg_type	/* the type of operand specified by reg */
+	);
+	unsigned char* DisasmOperands( unsigned char *src, x86_Insn *ip, x86_TableEntry *insn);
+	void           Clear(x86_Insn *ip);
+	unsigned char* DisasmInsn (unsigned char *src, x86_Insn *ip);
+
+	// from syntax.cpp
+	unsigned long cast;
+
+	void print_opr_cast(unsigned char sz);
+	void print_rel_cast(unsigned char sz);
+	void print_si(x86_Insn *ip, unsigned n);
+	void print_sib(x86_Insn *ip, unsigned n);
+	void print_rsib(x86_Insn *ip, unsigned n);
+	void print_rsi(x86_Insn *ip, unsigned n);
+	void opscript(x86_Insn *ip, unsigned n, char *script);
+	void Disasm(x86_Insn *ip);
+
+public:
+	String mnemonic;
+	String operands;
+	bool   iscall;
+	int    size;
+
+	X86Disas(dword ip, byte *data);
+};
+
+#endif
diff --git a/uppsrc/x86disas/x86disas.upp b/uppsrc/x86disas/x86disas.upp
new file mode 100644
index 000000000..80614d867
--- /dev/null
+++ b/uppsrc/x86disas/x86disas.upp
@@ -0,0 +1,19 @@
+uses
+	Core,
+	plugin\ndisasm;
+
+file
+	x86disas.h,
+	mnemonics.i,
+	opcmap.cpp,
+	x86.cpp,
+	syntax.cpp,
+	x86disas.cpp,
+	main.cpp,
+	Info readonly separator,
+	COPYING,
+	COPYING-PLAIN,
+	AUTHORS;
+
+mainconfig
+	"" = "";